diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index 8f266283..00000000
--- a/.dockerignore
+++ /dev/null
@@ -1,11 +0,0 @@
-.git
-.github
-.gitignore
-contrib
-init-scripts
-package
-pylintrc
-snap
-*.md
-!CHANGELOG*.md
-start.bat
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index 79319ae1..00000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-github: JonnyWong16 
-patreon: Tautulli
-custom: ["https://bit.ly/2InPp15", "https://bit.ly/2WTq83m"]
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml
deleted file mode 100644
index 34f617df..00000000
--- a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml
+++ /dev/null
@@ -1,103 +0,0 @@
-name: Bug Report
-description: Please do not use bug reports for support issues.
-labels: ['status:awaiting-triage', 'type:bug']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        **THIS IS NOT THE PLACE TO ASK FOR SUPPORT!** Please use [Discord](https://tautulli.com/discord) for support issues.
-  - type: textarea
-    id: description
-    attributes:
-      label: Describe the Bug
-      description: A clear and concise description of the bug.
-    validations:
-      required: true
-  - type: textarea
-    id: steps
-    attributes:
-      label: Steps to Reproduce
-      description: List each action required in order to reproduce the issue.
-      placeholder: |
-        1. Go to '...'
-        2. Click on '...'
-        3. Scroll down to '...'
-        4. See error
-  - type: textarea
-    id: expected
-    attributes:
-      label: Expected Behavior
-      description: A clear and concise description of what you expected to happen.
-  - type: textarea
-    id: screenshots
-    attributes:
-      label: Screenshots
-      description: Provide screenshots to help explain your problem.
-  - type: textarea
-    id: relevant
-    attributes:
-      label: Relevant Settings
-      description: Include all settings/configuration that are relevant to your issue. For example, Plex Media Server, newsletter, or notification settings.
-      placeholder: |
-        - eg. Plex Media Server IP address/port/checkboxes/proxy/etc.
-        - eg. Notification agent configuration/triggers/conditions/text/delay/grouping/etc.
-        - eg. Newsletter agent configuration/checkboxes/template/etc.
-        - Other settings
-  - type: input
-    id: version
-    attributes:
-      label: Tautulli Version
-      description: Check Tautulli Settings > Help & Info page.
-      placeholder: eg. v2.7.5
-    validations:
-      required: true
-  - type: input
-    id: branch
-    attributes:
-      label: Git Branch
-      description: Check Tautulli Settings > Help & Info page.
-      placeholder: eg. master
-    validations:
-      required: true
-  - type: input
-    id: hash
-    attributes:
-      label: Git Commit Hash
-      description: Check Tautulli Settings > Help & Info page.
-      placeholder: eg. 2cc5bf812fe05e0666aeaeb37ed550c59816fb4c
-    validations:
-      required: true
-  - type: input
-    id: platform
-    attributes:
-      label: Platform and Version
-      description: Check Tautulli Settings > Help & Info page.
-      placeholder: eg. Windows 10
-    validations:
-      required: true
-  - type: input
-    id: python
-    attributes:
-      label: Python Version
-      description: Check Tautulli Settings > Help & Info page.
-      placeholder: eg. 3.8.10
-    validations:
-      required: true
-  - type: input
-    id: browser
-    attributes:
-      label: Browser and Version
-      placeholder: eg. Chrome 88
-    validations:
-      required: true
-  - type: input
-    id: logs
-    attributes:
-      label: Link to Logs
-      description: Include a link to your **FULL** logs (not just a few lines) on [Gist](http://gist.github.com).
-    validations:
-      required: true
-  - type: markdown
-    attributes:
-      value: |
-        Make sure to close your issue when it's solved! If you found the solution yourself please comment so that others benefit from it.
diff --git a/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml b/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml
deleted file mode 100644
index 70e2ab33..00000000
--- a/.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Feature Request
-description: Suggest a new feature for Tautulli.
-labels: ['status:awaiting-triage', 'type:enhancement']
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to help improve Tautulli!
-  - type: textarea
-    id: problem
-    attributes:
-      label: Is your feature request related to a problem?
-      description: If so, please provide clear and concise description of the problem.
-      placeholder: eg. I'm always frustrated when '...'
-  - type: textarea
-    id: feature
-    attributes:
-      label: What is your feature request?
-      description: A clear and concise description of the feature.
-    validations:
-      required: true
-  - type: textarea
-    id: workaround
-    attributes:
-      label: Are there any workarounds?
-      description: A clear and concise description of any alternative solutions or features you've considered.
-  - type: textarea
-    id: additional
-    attributes:
-      label: Additional Context
-      description: Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
deleted file mode 100644
index 16aef760..00000000
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Tautulli Wiki
-    url: https://github.com/Tautulli/Tautulli/wiki
-    about: Please check the wiki to see if your question has already been answered.
-  - name: Discord
-    url: https://tautulli.com/discord
-    about: Please use Discord to ask for support.
diff --git a/.github/codeql-config.yml b/.github/codeql-config.yml
deleted file mode 100644
index 574f9b33..00000000
--- a/.github/codeql-config.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-name: CodeQL Config
-
-paths-ignore:
-  - lib
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
deleted file mode 100644
index 1028cc5a..00000000
--- a/.github/dependabot.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "daily"
-    target-branch: "nightly"
-    open-pull-requests-limit: 20
-
-  - package-ecosystem: "pip"
-    directory: "/"
-    schedule:
-      interval: "daily"
-    target-branch: "nightly"
-    open-pull-requests-limit: 20
diff --git a/.github/label-actions.yml b/.github/label-actions.yml
deleted file mode 100644
index ae236e9a..00000000
--- a/.github/label-actions.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-# Configuration for Label Actions - https://github.com/dessant/label-actions
-
-added:
-  comment: >
-    This feature has been added and will be available in the next release of Tautulli.
-    This issue will be automatically closed once the update is available.
-
-fixed:
-  comment: >
-    This bug has been fixed and will be available in the next release of Tautulli.
-    This issue will be automatically closed once the update is available.
-
-invalid:duplicate:
-  comment: >
-    :wave: @{issue-author}, this appears to be a duplicate of a pre-existing issue.
-  close: true
-  lock: true
-  unlabel: 'status:awaiting-triage'
-
--invalid:duplicate:
-  reopen: true
-  unlock: true
-
-invalid:support:
-  comment: >
-    :wave: @{issue-author}, we use the issue tracker exclusively for bug reports.
-    However, this issue appears to be a support request. Please use our
-    [Discord Server](https://tautulli.com/discord) to get help with Tautulli. Thanks.
-  close: true
-  lock: true
-  lock-reason: 'off-topic'
-  unlabel: 'status:awaiting-triage'
-
--invalid:support:
-  reopen: true
-  unlock: true
-
-invalid:template-incomplete:
-  issues:
-    comment: >
-      :wave: @{issue-author}, please edit your issue to complete the template with
-      all the required info. Your issue will be automatically closed in 5 days if
-      the template is not completed. Thanks.
-  prs:
-    comment: >
-      :wave: @{issue-author}, please edit your PR to complete the template with
-      all the required info. Your PR will be automatically closed in 5 days if
-      the template is not completed. Thanks.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
deleted file mode 100644
index 63ab24be..00000000
--- a/.github/pull_request_template.md
+++ /dev/null
@@ -1,26 +0,0 @@
-## Description
-
-Please include a summary of the changes.
-
-### Screenshot
-
-Include screenshots if the changes are UI-related.
-
-### Issues Fixed or Closed
-
-- Fixes #(issue)
-
-## Type of Change
-
-Please delete options that are not relevant.
-
-- [ ] Bug fix (non-breaking change which fixes an issue)
-- [ ] New feature (non-breaking change which adds functionality)
-- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
-
-## Checklist
-
-- [ ] My code follows the style guidelines of this project
-- [ ] I have performed a self-review of my own code
-- [ ] I have commented my code, particularly in hard-to-understand areas
-- [ ] I have added or updated the docstring for new or existing methods
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
deleted file mode 100644
index e9c8e05d..00000000
--- a/.github/workflows/codeql.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: CodeQL
-
-on:
-  push:
-    branches: [nightly]
-  pull_request:
-    branches: [nightly]
-  schedule:
-    - cron: '05 10 * * 1'
-
-jobs:
-  codeql-analysis:
-    name: CodeQL Analysis
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: ['javascript', 'python']
-
-    steps:
-    - name: Checkout Code
-      uses: actions/checkout@v4
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        config-file: ./.github/codeql-config.yml
-        languages: ${{ matrix.language }}
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
-      with:
-        category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/issues-stale.yml b/.github/workflows/issues-stale.yml
deleted file mode 100644
index b805e266..00000000
--- a/.github/workflows/issues-stale.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-name: Stale Issues / PRs
-
-on:
-  schedule:
-    - cron: '00 19 * * *'
-
-jobs:
-  stale:
-    name: Check Issues / PRs
-    runs-on: ubuntu-latest
-    steps:
-      - name: Stale
-        uses: actions/stale@v9
-        with:
-          stale-issue-message: >
-            This issue is stale because it has been open for 30 days with no activity.
-            Remove the stale label or comment, otherwise this will be closed in 5 days.
-          close-issue-message: >
-            This issue was closed because it has been stalled for 5 days with no activity.
-          stale-issue-label: 'stale'
-          exempt-issue-labels: 'added,fixed,type:enhancement,status:awaiting-triage,status:in-progress'
-          stale-pr-message: >
-            This PR is stale because it has been open for 30 days with no activity.
-            Remove the stale label or comment, otherwise this will be closed in 5 days.
-          close-pr-message: >
-            This PR was closed because it has been stalled for 5 days with no activity.
-          stale-pr-label: 'stale'
-          exempt-pr-labels: 'status:in-progress,status:in-review,dependencies'
-          days-before-stale: 30
-          days-before-close: 5
-
-      - name: Invalid Template
-        uses: actions/stale@v9
-        with:
-          stale-issue-message: >
-            Invalid issues template.
-          close-issue-message: >
-            This issue was closed because the the template was not completed after 5 days.
-          stale-issue-label: 'invalid:template-incomplete'
-          stale-pr-message: >
-            Invalid PR template.
-          close-pr-message: >
-            This PR was closed because the the template was not completed after 5 days.
-          stale-pr-label: 'invalid:template-incomplete'
-          exempt-pr-labels: 'status:in-progress,status:in-review,dependencies'
-          only-labels: 'invalid:template-incomplete'
-          days-before-stale: 0
-          days-before-close: 5
diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml
deleted file mode 100644
index a60987f5..00000000
--- a/.github/workflows/issues.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: Issues
-
-on:
-  issues:
-    types: [labeled, unlabeled]
-
-jobs:
-  label:
-    name: Label Issues
-    runs-on: ubuntu-latest
-    steps:
-      - name: Label Issues
-        uses: dessant/label-actions@v4
-        with:
-          github-token: ${{ github.token }}
diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
deleted file mode 100644
index 62c3f86c..00000000
--- a/.github/workflows/publish-docker.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-name: Publish Docker
-
-on:
-  workflow_dispatch: ~
-  push:
-    branches: [master, beta, nightly]
-    tags: [v*]
-
-jobs:
-  build-docker:
-    name: Build Docker Image
-    runs-on: ubuntu-latest
-    if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Prepare
-        id: prepare
-        run: |
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-            echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
-          elif [[ $GITHUB_REF == refs/heads/master ]]; then
-            echo "tag=latest" >> $GITHUB_OUTPUT
-          else
-            echo "tag=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
-          fi
-          if [[ $GITHUB_REF == refs/tags/*-beta ]]; then
-            echo "branch=beta" >> $GITHUB_OUTPUT
-          elif [[ $GITHUB_REF == refs/tags/* ]]; then
-            echo "branch=master" >> $GITHUB_OUTPUT
-          else
-            echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT
-          fi
-          echo "commit=${GITHUB_SHA}" >> $GITHUB_OUTPUT
-          echo "docker_platforms=linux/amd64,linux/arm64/v8,linux/arm/v7,linux/arm/v6" >> $GITHUB_OUTPUT
-          echo "docker_image=${{ secrets.DOCKER_REPO }}/tautulli" >> $GITHUB_OUTPUT
-
-      - name: Set Up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        id: buildx
-        with:
-          version: latest
-
-      - name: Cache Docker Layers
-        uses: actions/cache@v4
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        if: success()
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        if: success()
-        with:
-          registry: ghcr.io
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.GHCR_TOKEN }}
-
-      - name: Extract Docker Metadata
-        id: metadata
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ steps.prepare.outputs.docker_image }}
-
-      - name: Docker Build and Push
-        uses: docker/build-push-action@v6
-        if: success()
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          platforms: ${{ steps.prepare.outputs.docker_platforms }}
-          build-args: |
-            TAG=${{ steps.prepare.outputs.tag }}
-            BRANCH=${{ steps.prepare.outputs.branch }}
-            COMMIT=${{ steps.prepare.outputs.commit }}
-          tags: |
-            ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.tag }}
-            ghcr.io/${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.tag }}
-          labels: ${{ steps.metadata.outputs.labels }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
-
-  discord:
-    name: Discord Notification
-    needs: build-docker
-    if: always() && !contains(github.event.head_commit.message, '[skip ci]')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Post Status to Discord
-        uses: sarisia/actions-status-discord@v1
-        with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK }}
-          status: ${{ needs.build-docker.result == 'success' && 'success' || contains(needs.*.result, 'failure') && 'failure' || 'cancelled' }}
-          title: ${{ github.workflow }}
-          nofail: true
diff --git a/.github/workflows/publish-installers.yml b/.github/workflows/publish-installers.yml
deleted file mode 100644
index b4a66960..00000000
--- a/.github/workflows/publish-installers.yml
+++ /dev/null
@@ -1,178 +0,0 @@
-name: Publish Installers
-
-on:
-  workflow_dispatch: ~
-  push:
-    branches: [master, beta, nightly]
-    tags: [v*]
-
-env:
-  PYTHON_VERSION: '3.11'
-
-jobs:
-  build-installer:
-    name: Build ${{ matrix.os_upper }} Installer
-    runs-on: ${{ matrix.os }}-${{ matrix.os_version }}
-    if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: 'windows'
-            os_upper: 'Windows'
-            os_version: 'latest'
-            arch: 'x64'
-            ext: 'exe'
-          - os: 'macos'
-            os_upper: 'MacOS'
-            os_version: '14'
-            arch: 'universal'
-            ext: 'pkg'
-
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Set Release Version
-        id: get_version
-        shell: bash
-        run: |
-          if [[ $GITHUB_REF == refs/tags/* ]]; then
-            echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
-            VERSION_NSIS=${GITHUB_REF#refs/tags/v}.1
-            echo "VERSION_NSIS=${VERSION_NSIS/%-beta.1/.0}" >> $GITHUB_OUTPUT
-            echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
-            echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
-          else
-            echo "VERSION=0.0.0" >> $GITHUB_ENV
-            echo "VERSION_NSIS=0.0.0.0" >> $GITHUB_OUTPUT
-            echo "VERSION=0.0.0" >> $GITHUB_OUTPUT
-            echo "RELEASE_VERSION=${GITHUB_SHA::7}" >> $GITHUB_OUTPUT
-          fi
-          if [[ $GITHUB_REF == refs/tags/*-beta ]]; then
-            echo "beta" > branch.txt
-          elif [[ $GITHUB_REF == refs/tags/* ]]; then
-            echo "master" > branch.txt
-          else
-            echo ${GITHUB_REF#refs/heads/} > branch.txt
-          fi
-          echo $GITHUB_SHA > version.txt
-
-      - name: Set Up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-          cache: pip
-          cache-dependency-path: '**/requirements*.txt'
-
-      - name: Install Dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r package/requirements-package.txt --no-binary cffi
-
-      - name: Build Package
-        run: |
-          pyinstaller -y ./package/Tautulli-${{ matrix.os }}.spec
-
-      - name: Create Windows Installer
-        uses: joncloud/makensis-action@v4.1
-        if: matrix.os == 'windows'
-        with:
-          script-file: ./package/Tautulli.nsi
-          arguments: >
-            /DVERSION=${{ steps.get_version.outputs.VERSION_NSIS }}
-            /DINSTALLER_NAME=..\Tautulli-${{ matrix.os }}-${{ steps.get_version.outputs.RELEASE_VERSION }}-${{ matrix.arch }}.${{ matrix.ext }}
-          additional-plugin-paths: package/nsis-plugins
-
-      - name: Create MacOS Installer
-        if: matrix.os == 'macos'
-        run: |
-          sudo pkgbuild \
-            --install-location /Applications \
-            --version ${{ steps.get_version.outputs.VERSION }} \
-            --component ./dist/Tautulli.app \
-            --scripts ./package/macos-scripts \
-            Tautulli-${{ matrix.os }}-${{ steps.get_version.outputs.RELEASE_VERSION }}-${{ matrix.arch }}.${{ matrix.ext }}
-
-      - name: Upload Installer
-        uses: actions/upload-artifact@v4
-        with:
-          name: Tautulli-${{ matrix.os }}-installer
-          path: Tautulli-${{ matrix.os }}-${{ steps.get_version.outputs.RELEASE_VERSION }}-${{ matrix.arch }}.${{ matrix.ext }}
-
-  virus-total:
-    name: VirusTotal Scan
-    needs: build-installer
-    if: needs.build-installer.result == 'success' && !contains(github.event.head_commit.message, '[skip ci]')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download Installers
-        if: needs.build-installer.result == 'success'
-        uses: actions/download-artifact@v4
-
-      - name: Upload to VirusTotal
-        uses: crazy-max/ghaction-virustotal@v4
-        with:
-          vt_api_key: ${{ secrets.VT_API_KEY }}
-          files: |
-            Tautulli-windows-installer/Tautulli-windows-*-x64.exe
-            Tautulli-macos-installer/Tautulli-macos-*-universal.pkg
-
-  release:
-    name: Release Installers
-    needs: build-installer
-    if: always() && startsWith(github.ref, 'refs/tags/') && !contains(github.event.head_commit.message, '[skip ci]')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Set Release Version
-        id: get_version
-        run: |
-          echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
-
-      - name: Download Installers
-        if: needs.build-installer.result == 'success'
-        uses: actions/download-artifact@v4
-
-      - name: Get Changelog
-        id: get_changelog
-        run: |
-          CHANGELOG="$( sed -n '/^## /{p; :loop n; p; /^## /q; b loop}' CHANGELOG.md \
-            | sed '$d' | sed '$d' | sed '$d' )"
-          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
-          echo "CHANGELOG<<$EOF" >> $GITHUB_OUTPUT
-          echo "$CHANGELOG" >> $GITHUB_OUTPUT
-          echo "$EOF" >> $GITHUB_OUTPUT
-
-      - name: Create Release
-        uses: softprops/action-gh-release@v2
-        id: create_release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GHACTIONS_TOKEN }}
-        with:
-          tag_name: ${{ steps.get_version.outputs.RELEASE_VERSION }}
-          name: Tautulli ${{ steps.get_version.outputs.RELEASE_VERSION }}
-          body: |
-            ## Changelog
-            
-            ##${{ steps.get_changelog.outputs.CHANGELOG }}
-          prerelease: ${{ endsWith(steps.get_version.outputs.RELEASE_VERSION, '-beta') }}
-          files: |
-            Tautulli-windows-installer/Tautulli-windows-${{ steps.get_version.outputs.RELEASE_VERSION }}-x64.exe
-            Tautulli-macos-installer/Tautulli-macos-${{ steps.get_version.outputs.RELEASE_VERSION }}-universal.pkg
-
-  discord:
-    name: Discord Notification
-    needs: [build-installer, release]
-    if: always() && !contains(github.event.head_commit.message, '[skip ci]')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Post Status to Discord
-        uses: sarisia/actions-status-discord@v1
-        with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK }}
-          status: ${{ needs.build-installer.result == 'success' && 'success' || contains(needs.*.result, 'failure') && 'failure' || 'cancelled' }}
-          title: ${{ github.workflow }}
-          nofail: true
diff --git a/.github/workflows/publish-snap.yml b/.github/workflows/publish-snap.yml
deleted file mode 100644
index b3898a38..00000000
--- a/.github/workflows/publish-snap.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-name: Publish Snap
-
-on:
-  workflow_dispatch: ~
-  push:
-    branches: [master, beta, nightly]
-    tags: [v*]
-
-jobs:
-  build-snap:
-    name: Build Snap Package (${{ matrix.architecture }})
-    runs-on: ubuntu-latest
-    if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
-    strategy:
-      fail-fast: false
-      matrix:
-        architecture:
-          - amd64
-          - arm64
-          - armhf
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Prepare
-        id: prepare
-        run: |
-          git fetch --prune --unshallow --tags
-          if [[ $GITHUB_REF == refs/tags/*-beta || $GITHUB_REF == refs/heads/beta ]]; then
-            echo "RELEASE=beta" >> $GITHUB_OUTPUT
-          elif [[ $GITHUB_REF == refs/tags/* || $GITHUB_REF == refs/heads/master ]]; then
-            echo "RELEASE=stable" >> $GITHUB_OUTPUT
-          else
-            echo "RELEASE=edge" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Set Up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Build Snap Package
-        uses: diddlesnaps/snapcraft-multiarch-action@master
-        id: build
-        with:
-          architecture: ${{ matrix.architecture }}
-
-      - name: Upload Snap Package
-        uses: actions/upload-artifact@v4
-        with:
-          name: Tautulli-snap-package-${{ matrix.architecture }}
-          path: ${{ steps.build.outputs.snap }}
-
-      - name: Review Snap Package
-        uses: diddlesnaps/snapcraft-review-tools-action@master
-        with:
-          snap: ${{ steps.build.outputs.snap }}
-
-      - name: Publish Snap Package
-        uses: snapcore/action-publish@v1
-        if: startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/nightly'
-        env:
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_LOGIN }}
-        with:
-          snap: ${{ steps.build.outputs.snap }}
-          release: ${{ steps.prepare.outputs.RELEASE }}
-
-  discord:
-    name: Discord Notification
-    needs: build-snap
-    if: always() && !contains(github.event.head_commit.message, '[skip ci]')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Post Status to Discord
-        uses: sarisia/actions-status-discord@v1
-        with:
-          webhook: ${{ secrets.DISCORD_WEBHOOK }}
-          status: ${{ needs.build-snap.result == 'success' && 'success' || contains(needs.*.result, 'failure') && 'failure' || 'cancelled' }}
-          title: ${{ github.workflow }}
-          nofail: true
diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml
deleted file mode 100644
index ac550fe2..00000000
--- a/.github/workflows/pull-requests.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Pull Requests
-
-on:
-  pull_request_target:
-    types: [opened, synchronize, edited, reopened]
-
-jobs:
-  check-branch:
-    name: Check Pull Request
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Code
-        uses: actions/checkout@v4
-
-      - name: Comment on Pull Request
-        uses: mshick/add-pr-comment@v2
-        if: github.base_ref != 'nightly'
-        with:
-          message: Pull requests must be made to the `nightly` branch. Thanks.
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Fail Workflow
-        if: github.base_ref != 'nightly'
-        run: |
-          echo Base: "$GITHUB_BASE_REF"
-          echo Head: "$GITHUB_HEAD_REF"
-          exit 1
diff --git a/.github/workflows/submit-winget.yml b/.github/workflows/submit-winget.yml
deleted file mode 100644
index efa6cee7..00000000
--- a/.github/workflows/submit-winget.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Submit winget
-
-on:
-  workflow_dispatch: ~
-  release:
-    types: [published]
-
-jobs:
-  winget:
-    name: Submit Winget Package
-    runs-on: windows-latest
-    if: ${{ !github.event.release.prerelease }}
-    steps:
-      - name: Sync Winget Fork
-        run: gh repo sync ${{ secrets.WINGET_USERNAME }}/winget-pkgs -b master
-        env:
-          GH_TOKEN: ${{ secrets.WINGET_TOKEN }}
-
-      - name: Submit package to Windows Package Manager Community Repository
-        run: |
-          $wingetPackage = "Tautulli.Tautulli"
-          $gitToken = "${{ secrets.WINGET_TOKEN }}"
-
-          $github = Invoke-RestMethod -uri "https://api.github.com/repos/Tautulli/Tautulli/releases/latest"
-          $installerUrl = $github | Select -ExpandProperty assets -First 1 | Where-Object -Property name -match "Tautulli-windows-.*-x64.exe" | Select -ExpandProperty browser_download_url
-          $version = "$($github.tag_name.Trim('v')).1"
-          
-          # getting latest wingetcreate file
-          iwr https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe
-          .\wingetcreate.exe update $wingetPackage -s -v $version -u $installerUrl -t $gitToken
-
-  virus-total:
-    name: VirusTotal Scan
-    runs-on: ubuntu-latest
-    steps:
-      - name: Upload to VirusTotal
-        uses: crazy-max/ghaction-virustotal@v4
-        with:
-          vt_api_key: ${{ secrets.VT_API_KEY }}
-          github_token: ${{ secrets.GHACTIONS_TOKEN }}
-          update_release_body: true
-          files: |
-            .exe$
-            .pkg$
diff --git a/.gitignore b/.gitignore
index 1e54132b..f3297290 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 
 # Compiled source #
 ###################
-__pycache__
 *.pyc
 *.py~
 *.pyproj
@@ -13,34 +12,15 @@ __pycache__
 *.db*
 *.db-journal
 *.ini
-release.lock
 version.lock
-lib/*.dist-info
-lib/*.egg-info
-lib/*.pth
-lib/*/*.pyd
-lib/_distutils_hack
-lib/pkg_resources
-lib/setuptools
 logs/*
-backups/*
 cache/*
-exports/*
-newsletters/*
-*.mmdb
-version.txt
-branch.txt
-.TEST
 
 # HTTPS Cert/Key #
 ##################
-/*.crt
-/*.key
-/*.csr
-/*.pem
-
-# Mergetool
-*.orgin
+*.crt
+*.key
+*.csr
 
 # OS generated files #
 ######################
@@ -51,10 +31,7 @@ Icon?
 Thumbs.db
 
 #Ignore files generated by PyCharm
-*.idea/*
-
-#Ignore files generated by VSCode
-*.vscode/*
+.idea/*
 
 #Ignore files generated by vi
 *.swp
@@ -76,6 +53,7 @@ Thumbs.db
 *.bak
 *.cache
 *.ilk
+*.log
 [Bb]in
 [Dd]ebug*/
 *.lib
@@ -88,16 +66,3 @@ _ReSharper*/
 /logs
 .project
 .pydevproject
-
-#Ignore files generated by pyinstaller
-/build
-/dist
-
-#snapcraft specifics
-/parts/
-/stage/
-/prime/
-*.snap
-.snapcraft
-*_source.tar.bz2
-snap/.snapcraft
\ No newline at end of file
diff --git a/API.md b/API.md
index 827c7c6b..ecdc127b 100644
--- a/API.md
+++ b/API.md
@@ -1,3 +1,80 @@
 # API Reference
+The API is still pretty new and needs some serious cleaning up on the backend but should be reasonably functional. There are no error codes yet.
 
-Tautulli API documentation has been moved to the [wiki page](https://github.com/Tautulli/Tautulli/wiki/Tautulli-API-Reference).
\ No newline at end of file
+## General structure
+The API endpoint is `http://ip:port + HTTP_ROOT + /api?apikey=$apikey&cmd=$command`
+
+Response example
+```
+{
+    "response": {
+        "data": [
+            {
+                "loglevel": "INFO",
+                "msg": "Signal 2 caught, saving and exiting...",
+                "thread": "MainThread",
+                "time": "22-sep-2015 01:42:56 "
+            }
+        ],
+        "message": null,
+        "result": "success"
+    }
+}
+```
+
+General parameters:
+	out_type: 'xml',
+	callback: 'pong',
+	'debug': 1
+
+
+## API methods
+
+### getLogs
+Possible params: sort='', search='', order='desc', regex='', start=0, end=0
+Returns the plexpy log
+
+### getApikey
+Possible params: username='', password='' (required if auth is enabled)
+Returns the apikey
+
+### getSettings
+No params
+Returns the config file
+
+### getVersion
+No params
+Returns some version information: git_path, install_type, current_version, installed_version, commits_behind
+
+### getHistory
+possible params: user=None, user_id=None, ,rating_key='', parent_rating_key='', grandparent_rating_key='', start_date=''
+Returns
+
+### getMetadata
+Required params: rating_key
+Returns metadata about a file
+
+### getSync
+Possible params: machine_id=None, user_id=None,
+Returns
+
+### getUserips
+Possible params: user_id=None, user=None
+
+### getPlayby
+Possible params: time_range=30, y_axis='plays', playtype='total_plays_per_month'
+
+### checkGithub
+Updates the version information above and returns getVersion data
+
+### shutdown
+No params
+Shut down plexpy
+
+### restart
+No params
+Restart plexpy
+
+### update
+No params
+Update plexpy - you may want to check the install type in get version and not allow this if type==exe
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b349b355..958a8c44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,2762 +1,5 @@
 # Changelog
 
-## v2.15.3 (2025-08-03)
-
-* Exporter:
-  * New: Added hearingImpaired for subtitles and visualImpaired for audio attributes to exporter fields.
-* Graphs:
-  * Fix: Remove duplicate "Total" entry in graph tooltips. (Thanks @zdimension) (#2534)
-* UI:
-  * Fix: Failing to retrieve collections / playlists with over 1000 items.
-  * Fix: Scrollbar not showing on macosx and webkit browsers. (#2221)
-  * Fix: Incorrect rounding of minutes in global stats play duration.
-  * Fix: Disable browser autocomplete for notification agent and newsletter agent configurations. (#2557)
-* API:
-  * New: Added ability to return svg files using pms_image_proxy API command.
-* Other:
-  * New: Added ability to set config values using environment variables. (Thanks @komuw) (#2309, #2543)
-
-
-## v2.15.2 (2025-04-12)
-
-* Activity:
-  * New: Added link to library by clicking media type icon.
-  * New: Added stream count to tab title on homepage. (#2517)
-* History:
-  * Fix: Check stream watched status before stream stopped status. (#2506)
-* Notifications:
-  * Fix: ntfy notifications failing to send if provider link is blank.
-  * Fix: Check Pushover notification attachment is under 5MB limit. (#2396)
-  * Fix: Track URLs redirecting to the correct media page. (#2513)
-  * New: Added audio profile notification parameters.
-  * New: Added PATCH method for Webhook notifications.
-* Graphs:
-  * New: Added Total line to daily streams graph. (Thanks @zdimension) (#2497)
-* UI:
-  * Fix: Do not redirect API requests to the login page. (#2490)
-  * Change: Swap source and stream columns in stream info modal.
-* Other:
-  * Fix: Various typos. (Thanks @luzpaz) (#2520)
-  * Fix: CherryPy CORS response header not being set correctly. (#2279)
-
-
-## v2.15.1 (2025-01-11)
-
-* Activity:
-  * Fix: Detection of HDR transcodes. (Thanks @cdecker08) (#2412, #2466)
-* Newsletters:
-  * Fix: Disable basic authentication for /newsletter and /image endpoints. (#2472)
-* Exporter:
-  * New: Added logos to season and episode exports.
-* Other:
-  * Fix: Docker container https health check.
-
-
-## v2.15.0 (2024-11-24)
-
-* Notes:
-  * Support for Python 3.8 has been dropped. The minimum Python version is now 3.9.
-* Notifications:
-  * New: Allow Telegram blockquote and tg-emoji HTML tags. (Thanks @MythodeaLoL) (#2427)
-  * New: Added Plex slug and Plex Watch URL notification parameters. (#2420)
-  * Change: Update OneSignal API calls to use the new API endpoint for Tautulli Remote App notifications.
-* Newsletters:
-  * Fix: Dumping custom dates in raw newsletter json.
-* History:
-  * Fix: Unable to fix match for artists. (#2429)
-* Exporter:
-  * New: Added movie and episode hasVoiceActivity attribute to exporter fields.
-  * New: Added subtitle canAutoSync attribute to exporter fields.
-  * New: Added logos to the exporter fields.
-* UI:
-  * New: Add friendly name to the top bar of config modals. (Thanks @peagravel) (#2432)
-* API:
-  * New: Added plex slugs to metadata in the get_metadata API command.
-* Other:
-  * Fix: Tautulli failing to start with Python 3.13. (#2426)
-
-
-## v2.14.6 (2024-10-12)
-
-* Newsletters:
-  * Fix: Allow formatting newsletter date parameters.
-  * Change: Support apscheduler compatible cron expressions.
-* UI:
-  * Fix: Round runtime before converting to human duration.
-  * Fix: Make recently added/watched rows touch scrollable.
-* Other:
-  * Fix: Auto-updater not running.
-
-
-## v2.14.5 (2024-09-20)
-
-* Activity:
-  * Fix: Display of 2k resolution on activity card.
-* Notifications:
-  * Fix: ntfy notifications with special characters failing to send.
-* Other:
-  * Fix: Memory leak with database closing. (#2404)
-
-
-## v2.14.4 (2024-08-10)
-
-* Notifications:
-  * Fix: Update Slack notification info card.
-  * New: Added ntfy notification agent. (Thanks @nwithan8) (#2356, #2000)
-* UI:
-  * Fix: macOS platform capitalization.
-* Other:
-  * Fix: Remove deprecated getdefaultlocale. (Thanks @teodorstelian) (#2364, #2345)
-
-
-## v2.14.3 (2024-06-19)
-
-* Graphs:
-  * Fix: History table not loading when clicking on the graphs in some instances.
-* UI:
-  * Fix: Scheduled tasks table not loading when certain tasks are disabled.
-  * Removed: Unnecessary Remote Server checkbox from the settings page.
-* Other:
-  * Fix: Webserver not restarting after the setup wizard.
-  * Fix: Workaround webserver crashing in some instances.
-
-
-## v2.14.2 (2024-05-18)
-
-* History:
-  * Fix: Live TV activity not logging to history.
-  * Fix: Incorrect grouping of live TV history.
-* Notifications:
-  * Fix: Pushover configuration settings refreshing after entering a token.
-  * Fix: Plex remote access down notifications not triggering.
-  * Fix: Deleting all images from Cloudinary only deleting 1000 images.
-  * New: Added platform version and product version notification parameters. (#2244)
-  * New: Added LAN streams and WAN streams notification parameters. (#2276)
-  * New: Added Dolby Vision notification parameters. (#2240)
-  * New: Added live TV channel notification parameters.
-  * Change: Improved Tautulli Remote App notification encryption method.
-    * Note: Requires Tautulli Remote App version 3.2.4.
-* Exporter:
-  * New: Added slug attribute to exporter fields.
-  * New: Added track genres to exporter fields.
-  * New: Added playlist source URI to exporter fields.
-  * New: Added artProvider and thumbProvider to exporter fields.
-* UI:
-  * Fix: Mask deleted usernames in the logs.
-  * Fix: Live TV watch stats not showing on the media info page.
-  * Fix: Users without access to Plex server not showing as inactive.
-  * Removed: Deprecated synced item pages.
-  * Removed: Anonymous redirect settings. Links now use browser no-referrer policy instead.
-* API:
-  * New: Added Dolby Vision info to the get_metadata API command.
-  * New: Added before and after parameters to the get_home_stats API command. (#2231)
-* Packages:
-  * New: Universal binary for macOS for Apple silicon.
-  * New: Bump Snap package to core22.
-* Other:
-  * Change: Login cookie expires changed to max-age.
-  * Change: Improved key generation for login password. It is recommended to reenter your HTTP Password in the settings after upgrading.
-  * Removed: Python 2 compatibility code. (#2098, #2226) (Thanks @zdimension)
-
-
-## v2.13.4 (2023-12-07)
-
-* UI:
-  * Fix: Tautulli configuration settings page not loading when system language is None.
-  * Fix: Login cookie expiring too quickly.
-
-
-## v2.13.3 (2023-12-03)
-
-* Notifications:
-  * New: Added duration_time notification parameter.
-  * New: Added file_size_bytes notification parameter.
-  * New: Added time formats notification text modifiers.
-  * New: Added support for thetvdb_url for movies.
-* UI:
-  * Fix: Activity card overflowing due to screen scaling. (#2033)
-  * Fix: Stream duration on activity card not being updated on track changes in some cases. (#2206)
-
-
-## v2.13.2 (2023-10-26)
-
-* History:
-  * New: Added quarter values icons for history watch status. (#2179, #2156) (Thanks @herby2212)
-* Graphs:
-  * New: Added concurrent streams per day graph. (#2046) (Thanks @herby2212)
-* Exporter:
-  * New: Added metadata directory to exporter fields.
-  * Removed: Banner exporter fields for tv shows.
-* UI:
-  * New: Added last triggered time to notification agents and newsletter agent lists.
-* Other:
-  * New: Added X-Plex-Language header override to config file.
-
-
-## v2.13.1 (2023-08-25)
-
-* Notes:
-  * Support for Python 3.7 has been dropped. The minimum Python version is now 3.8.
-* Other:
-  * Fix: Tautulli failing to start on some systems.
-
-
-## v2.13.0 (2023-08-25)
-
-* Notes:
-  * Support for Python 3.7 has been dropped. The minimum Python version is now 3.8.
-* Notifications:
-  * Fix: Improved watched notification trigger description. (#2104)
-  * New: Added notification image option for iOS Tautulli Remote app.
-* Exporter:
-  * New: Added track chapter export fields.
-  * New: Added on-demand subtitle export fields.
-
-
-## v2.12.5 (2023-07-13)
-
-* Activity:
-  * New: Added d3d11va to list of hardware decoders.
-* History:
-  * Fix: Incorrect grouping of play history.
-  * New: Added button in settings to regroup play history.
-* Notifications:
-  * Fix: Incorrect concurrent streams notifications by IP addresss for IPv6 addresses (#2096) (Thanks @pooley182)
-* UI:
-  * Fix: Occasional UI crashing on Python 3.11.
-  * New: Added multiselect user filters to History and Graphs pages. (#2090) (Thanks @zdimension)
-* API:
-  * New: Added regroup_history API command.
-  * Change: Updated graph API commands to accept a comma separated list of user IDs.
-
-
-## v2.12.4 (2023-05-23)
-
-* History:
-  * Fix: Set view offset equal to duration if a stream is stopped within the last 10 sec.
-* Other:
-  * Fix: Database import may fail for some older databases.
-  * Fix: Double-quoted strings for newer versions of SQLite. (#2015, #2057)
-* API:
-  * Change: Return the ID for async API calls (export_metadata, notify, notify_newsletter).
-
-
-## v2.12.3 (2023-04-14)
-
-* Activity:
-  * Fix: Incorrect subtitle decision shown when subtitles are transcoded.
-* History:
-  * Fix: Incorrect order when sorting by the duration column in the history tables.
-* Notifications:
-  * Fix: Logging error when running scripts that use PlexAPI.
-* UI:
-  * Fix: Calculate file sizes setting causing the media info table to fail to load.
-  * Fix: Incorrect artwork and thumbnail shown for Live TV on the Most Active Libraries statistics card.
-* API:
-  * Change: Renamed duration to play_duration in the get_history API response. (Note: duration kept for backwards compatibility.)
-
-
-## v2.12.2 (2023-03-16)
-
-* Other:
-  * Fix: Tautulli not starting on FreeBSD jails.
-
-
-## v2.12.1 (2023-03-14)
-
-* Activity:
-  * Fix: Stop checking for deprecated sync items sessions.
-  * Change: Do not show audio language on activity cards for music.
-* Other:
-  * Fix: Tautulli not starting on macOS.
-
-
-## v2.12.0 (2023-03-13)
-
-* Notifications:
-  * New: Added support for Telegram group topics. (#1980)
-  * New: Added anidb_id and anidb_url notification parameters. (#1973)
-  * New: Added notification triggers for Intro Marker, Commercial Marker, and Credits Marker.
-  * New: Added various intro, commercial, and credits marker notification parameters.
-  * New: Allow setting a custom Pushover notification sound. (#2005)
-  * Change: Notification images are now uploaded directly to Discord without the need for a 3rd party image hosting service.
-  * Change: Automatically strip whitespace from notification condition values.
-  * Change: Trigger watched notifications based on the video watched completion behaviour setting.
-* Exporter:
-  * Fix: Unable to run exporter when using the Snap package. (#2007)
-  * New: Added credits marker, and audio/subtitle settings to export fields.
-* UI:
-  * Fix: Incorrect styling and missing content for collection media info pages.
-  * New: Added edition details field on movie media info pages. (#1957) (Thanks @herby2212)
-  * New: Added setting to change the video watched completion behaviour.
-  * New: Added watch time and user statistics to collection and playlist media info pages. (#1982, #2012) (Thanks @herby2212)
-  * New: Added history table to collection and playlist media info pages.
-  * New: Dynamically change watched status in the UI based on video watched completion behaviour setting.
-  * New: Added hidden setting to override server name.
-  * Change: Move track artist to a details field instead of in the title on track media info pages.
-* API:
-  * New: Added section_id and user_id parameters to get_home_stats API command. (#1944)
-  * New: Added marker info to get_metadata API command results.
-  * New: Added media_type parameter to get_item_watch_time_stats and get_item_user_stats API commands. (#1982) (Thanks @herby2212)
-  * New: Added last_refreshed timestamp to get_library_media_info API command response.
-* Other:
-  * Change: Migrate analytics to Google Analytics 4.
-
-
-## v2.11.1 (2022-12-22)
-
-* Activity:
-  * Fix: Use source language instead of stream language on activity cards.
-* Notifications:
-  * Fix: Blank start time notification parameters causing recently added notifications to fail. (#1940)
-* Other:
-  * Fix: Tautulli failing to start when using python 3.7.
-  * Fix: Snap install failing to start. (#1941)
-  * Fix: Update check crashing when git is missing. (#1943) (Thanks @Minituff)
-
-
-## v2.11.0 (2022-12-22)
-
-* Activity:
-  * New: Added audio and subtitle language to activity cards. (#1831, #1900) (Thanks @fscorrupt)
-* History:
-  * New: Log subtitle language and subtitle forced to database. (#1826)
-* Notifications:
-  * Fix: Validating condition operators would fail with a blank parameter.
-  * New: Added start time and stop time notification parameters. (#1931)
-  * New: Added session_key to LunaSea notification payload. (#1929) (Thanks @JagandeepBrar)
-* Newsletters:
-  * Fix: Allow CSS to support light and dark themes.
-* Exporter:
-  * New: Added editionTitle to movie exporter fields.
-  * Change: m3u8 export changed to .m3u file extension. File is still encoded using UTF-8.
-* UI:
-  * Fix: Link watch statistics to media page using metadata from history. (#1882)
-  * New: Show subtitle language and subtitle forced flag in stream data modal.
-* Other:
-  * Fix: Mask more user and metadata fields for guest access. (#1913)
-  * Change: Disable TLS 1.0 and 1.1 for the webserver. Minimum TLS version is 1.2. (#1870)
-  * Change: Use system language for requests to Plex Media Server.
-
-
-## v2.10.5 (2022-11-07)
-
-* Notifications:
-  * New: Added edition_title notification parameter. (#1838)
-  * Change: Track notifications link to MusicBrainz track instead of album.
-* Newsletters:
-  * New: Added months time frame for newsletters. (#1876)
-* UI:
-  * Fix: Broken link on library statistic cards. (#1852)
-  * Fix: Check for IPv6 host when generating QR code for app registration.
-  * Fix: Missing padding on condition operator dropdown on small screens.
-* Other:
-  * Fix: Launching browser when webserver is bound to IPv6.
-  * New: Tautulli can be installed via the Windows Package Manager (winget).
-  * Change: Separate stdout and stderr console logging. (#1874)
-* API:
-  * Fix: API not returning 400 response code.
-  * New: Added edition_title to get_metadata API response.
-  * New: Added collections to get_children_metadata API response.
-  * New: Added user_thumb to get_history API response.
-  * New: Validate custom notification conditions before saving notification agents. (#1846)
-  * Change: Fallback to parent_thumb for seasons in get_metadata API response.
-
-
-## v2.10.4 (2022-09-05)
-
-* Activity:
-  * New: Added tooltip for quality profile on activity cards.
-* Notifications:
-  * New: Added "does not begin with" and "does not end with" condition operators.
-* UI:
-  * Fix: Album count showing 0 on library statistics.
-  * Fix: Library statistics not showing up for libraries without any history.
-
-
-## v2.10.3 (2022-08-09)
-
-* Notifications:
-  * New: Added JSON support for MQTT notifications. (#1763)
-  * New: Added show year notification parameter.
-* Exporter:
-  * New: Added guids to artist, album, and track metadata export fields.
-  * New: Added languageTag to stream media info export fields.
-* UI:
-  * Fix: Long channel identifier overflowing activity card. (#1802) 
-  * Change: Use the last played item's artwork for library statistics cards. 
-* Other:
-  * Fix: Username log filter causing database to lock up. (#1705)
-  * Change: Username log filter only applies to usernames longer than 3 characters. (#1806)
-* API:
-  * New: Added parent_year and grandparent_year to get_metadata_details API command.
-  * New: Added last played metadata to top_libraries and top_users in get_home_stats API command.
-  * New: Allow fallback to another PMS image in pms_image_proxy API command.
-
-
-## v2.10.2 (2022-07-03)
-
-* Activity:
-  * Fix: Incorrect audio stream info shown on the activity card when playing a secondary audio track.
-* UI:
-  * Fix: Usernames not showing on the home statistics cards.
-  * Fix: Do not save a user's friendly name if it is the same as the username.
-  * Change: Update library icons to the latest Plex style.
-
-
-## v2.10.1 (2022-06-01)
-
-* Notifications:
-  * New: Added support for MusicBrainz (mbid://) guids in notification parameters without MusicBrainz lookup enabled. Requires Plex Media Server 1.27.0 or newer with refreshed Plex Music agent metadata.
-* Mobile App:
-  * Fix: OneSignal validation failing when registering a device.
-* API:
-  * New: Added grandparent_guids and parent_guids to get_metadata API command.
-  * Change: Updated continent in get_geoip_lookup API command.
-  * Change: Removed server_token from from get_users API command.
-  * Change: shared_libraries changed to a list instead of a string for get_users API command.
-
-
-## v2.10.0 (2022-05-23)
-
-* Activity:
-  * Fix: Detection of Dolby Vision missing for PMS 1.26.1.
-* Notifications:
-  * Fix: Parsing of filename notification parameter incorrect for Windows PMS.
-* Exporter:
-  * New: Added additional theme and label export fields.
-* UI:
-  * Fix: Slow loading of collections and playlists tables.
-  * Change: Update default user thumbnail image to match Plex Web.
-* API:
-  * Change: Values for get_users_table and get_libraries_table return an integer instead of "Checked". 
-
-
-## v2.9.7 (2022-04-11)
-
-* UI:
-  * Fix: Managed user missing the username in the Users table. 
-
-
-## v2.9.6 (2022-04-10)
-
-* Activity:
-  * New: Improved display of dynamic range on the activity cards. (Thanks @herby2212)
-* Notifications:
-  * Change: Make include summary option apply to all media types for Discord and Slack notifications.
-* UI:
-  * Fix: Validating Plex login in the setup wizard. (#1697)
-  * New: Added hidden username, email, and full name columns to users table. 
-* Other:
-  * Fix: Apply pms_timeout setting to websocket connection.
-  * Fix: Importing of Plex username instead of the full name. (#1710)
-
-
-## v2.9.5 (2022-03-26)
-
-* Note:
-  * Updated Snap packages are currently unavailable due to an upstream issue.
-* Activity:
-  * Change: Improve calculation for transcode progress bar percentage on the activity cards.
-* History:
-  * Fix: Live TV history filter not working. (#1691) 
-* Newsletter:
-  * Fix: Newsletter not showing different album types. (#1559) 
-* UI:
-  * Fix: Display season summary on the media info page if available with a fallback to show summary. (#1657)
-  * Change: Colour active filter buttons to improve contrast. (#1663)
-* API:
-  * New: Added transcode offset keys to get_activity command.
-* Other:
-  * Fix: Reschedule backup task after changing backup interval. (#1662)
-  * Fix: Dynamic anonymous redirect setting not being enabled by default after the setup wizard.
-  * Fix: Usernames with special characters not being filtered in the logs.
-
-
-## v2.9.4 (2022-02-12)
-
-* UI:
-  * Fix: Setup wizard appearing when restarting after saving settings.
-* Other:
-  * Fix: Stop Tautulli from starting multiple instances on Windows after a clean reinstall. Check the startup items in Windows Task Manager if it is still occurring.
-
-
-## v2.9.3 (2022-02-09)
-
-* UI:
-  * Fix: Setup wizard looping.
-* Other:
-  * Fix: Logger username masking preventing Tautulli from starting on new installs.
-
-
-## v2.9.2 (2022-02-08)
-
-* Notification:
-  * New: Added support for additional Telegram HTML tags.
-  * Removed: Revert Telegram defaulting to MarkdownV2 and only support HTML. (#1635)
-* Other:
-  * Fix: The Local user being masked in the logs.
-
-
-## v2.9.1 (2022-02-07)
-
-* Other:
-  * Fix: Incorrect changelog version number and date.
-
-
-## v2.9.0 (2022-02-07)
-
-* Notification:
-  * New: Added track disc number notification parameter. 
-  * Change: Default Telegram messages to MarkdownV2 when HTML is disabled. (#1635)
-* Exporter:
-  * Fix: Images not being included in export zip file download.
-* UI:
-  * Fix: Favicon missing from the newsletter authentication page.
-  * Fix: IPv6 details not being shown in IP address modal. (#1629)
-  * Fix: PWA not respecting device rotation settings. (#1633)
-  * New: Added intermediary login page to the Plex XML shortcuts.
-  * New: Added setting to mask usernames in logs (enabled by default).
-  * New: Added location, secure connection, and Plex Relay details to IP address modal.
-  * Change: Remove Plex token from the settings page.
-  * Change: Increase verifying server timeout to 30 seconds.
-* API:
-  * New: Added get_tautulli_info API command.
-  * New: Added location, secure, and relayed to get_history API response.
-  * Change: Null pms_token and jwt_token in the response of the get_settings API command. (#1616)
-* Other:
-  * Fix: Better validation of config when saving settings.
-  * Fix: Correct section_id and prevent rating_key collisions when updating metadata. (#1640)
-  * Change: Proxy Plex token check and Plex downloads json through the Tautulli server.
-  * Change: Remove tokens from downloaded database and config files.
-  * Change: Do not import pms_token or jwt_secret when importing a config file.
-
-
-## v2.8.1 (2022-01-04)
-
-* API:
-  * New: Added grouping and query_days parameters to the get_item_watch_time_stats API command.
-  * New: Added grouping parameter to the get_item_user_stats API command.
-  * New: Added total_time to the get_library_user_stats, get_user_player_stats, and get_item_user_stats API command responses.
-  * Removed: media_type parameter no longer required for the get_item_watch_time_stats, and get_item_user_stats API commands. The media type is determined automatically.
-* Other:
-  * Fix: Clean .pyc files automatically after updating.
-  * New: Allow Snap package to access /media and /mnt locations. Refer to the FAQ for instructions on how to enable access.
-
-
-## v2.8.0 (2021-12-15)
-
-* History:
-  * Fix: Live TV history filter not working correctly when combined with other filters.
-  * Fix: Direct Stream history filter not remembering the state when reloading the page.
-  * Fix: History table not loading when no filters are selected.
-  * New: Added watch time and user stats to media info pages. (Thanks @herby2212) (#1417, #1471)
-* Notifications:
-  * New: Added Microsoft Teams notification agent. (#1514)
-  * New: Added Gotify notification agent. (#1584)
-  * New: Add warning message that passwords are not copied when duplicating a notification or newsletter agent. (#1540)
-* Newsletters:
-  * Fix: Different album types not shown on newsletter. (#1559)
-* Exporter:
-  * New: Added album formats, subformats, and sonic analysis export fields.
-* UI:
-  * Fix: Docker config volume message overlapping modal windows. (#1567)
-  * Fix: Different album types not shown on artist media info page.
-  * New: Added show more/less toggle for summaries on media info pages. (#1546)
-  * Change: Do not save datatable page or search states when reloading the page. (#1532)
-  * Change: Improve the Plex log reader.
-* API:
-  * New: Added before and after parameters to the get_history API command.
-* Other:
-  * Fix: Updated Python dependencies. (#1499)
-  * Fix: Some websocket connections not respecting the verify SSL setting. (Thanks @nmaggioni) (#1541)
-  * New: Support for Python 3.10. (#1522)
-  * New: Added dynamic anonymous redirect service setting. (#1526)
-
-
-## v2.7.7 (2021-10-14)
-
-* Notifications:
-  * Fix: Colons and exclamation marks being replaced outside of expressions.
-  * New: Added LunaSea notification agent. Note: Requires a future LunaSea app update to function.
-* Newsletters:
-  * Fix: Star rating not showing on newsletter with the new Plex metadata agents. (#1511)
-* UI:
-  * Fix: Sorting of mobile devices table with uppercase and lowercase device names.
-  * Fix: Various dropdown menus with centered text to left-aligned text.
-* Other:
-  * Fix: Plex.tv account token not changing when fetching a new token.
-  * New: Added check and warning message for missing Docker container volume mount.
-
-
-## v2.7.6 (2021-08-31)
-
-* Notifications:
-  * Fix: Unable to parse colons (:) and exclamation marks (!) in notification text eval strings.
-* Exporter:
-  * Fix: Unable to export playlists and collections from a library. (#1484)
-  * New: Added new episode export fields.
-* Mobile App:
-  * Fix: Unable to scan QR code with dark mode enabled.
-  * New: Tautulli Remote App is out of beta for iOS and can be downloaded in the App Store.
-* Other:
-  * New: Update PlexAPI to 4.6.3.
-  * New: Added popup alert message for Windows and macOS when Tautulli fails to start.
-
-
-## v2.7.5 (2021-07-15)
-
-* History:
-  * Fix: Guest users were unable to view history.
-  * Fix: Most Active Library statistics was counting deleted libraries.
-* Newsletters:
-  * Fix: Incorrect padding on the newsletter configuration modal.
-* Mobile App:
-  * New: Tautulli Remote App is out of beta on Android. The iOS app is available for beta testing on TestFlight.
-* API:
-  * New: Added mobile device platform and version to device registration.
-* Other:
-  * Fix: Unable to remove authentication.
-  * Change: Improve API key and device token security on Python 3.
-  * Remove: Basic Authentication setting.
-
-
-## v2.7.4 (2021-06-19)
-
-* Activity:
-  * Fix: Incorrect quality profile shown on the activity card.
-* Notifications:
-  * New: Added ability to evaluate Python expressions in notification parameters.
-  * New: Added tilde (~) to represent blank notification condition values.
-* Exporter:
-  * Fix: Blank fields missing from csv and json exports. 
-  * New: Added some new exporter fields.
-* Graphs:
-  * Fix: Play counts and durations not matching the homepage statistics.
-* UI:
-  * New: Show search bar in the collapsed menu on the mobile layout. (#1446)
-  * Change: Do not show seconds for total played duration on Users and Libraries tables.
-* Other:
-  * Fix: Check the Tautulli data folder is writable on startup. (#1441)
-  * New: Update PlexAPI to 4.6.1.
-  * Change: Always hash HTTP password in config file.
-
-
-## v2.7.3 (2021-05-22)
-
-* Activity:
-  * Fix: Incorrect quality profile being shown when transcoding to a higher bitrate.
-* Notifications:
-  * New: Added notification parameters for duration values in seconds. (#1434)
-  * New: Added setting to allow repeat Tautulli update notifications. By default the Tautulli update notification will only notify once.
-  * New: Added setting to allow repeat Plex Media Server update notifications. By default the Plex Media Server update notification will only notify once.
-  * New: Added setting to configure the Tautulli update check interval.
-* UI:
-  * Fix: Prevent accidentally closing modals when dragging the mouse outside the window.
-  * Fix: Recently added queue modal not loading. (#1429)
-  * New: Show collections tab in music libraries. (#1421)
-  * New: Added method to logout of active Tautulli sessions from the login logs.
-* API:
-  * Fix: Update edit_user and edit_library doc strings for required parameters. (#1432)
-* Other:
-  * New: Added advanced hidden setting for CherryPy thread pool size. (Thanks @psaab #1425)
-
-
-## v2.7.2 (2021-04-24)
-
-* UI:
-  * New: Show smart collections in the library collections tab.
-
-
-## v2.7.1 (2021-04-22)
-
-* Notifications:
-  * Fix: Recently added single episode being sent as a show notification. (#1420)
-* Newsletters:
-  * Change: Ignore items with incorrect added at dates in the future.
-* Exporter:
-  * Fix: Exporting not working for libraries, collections, and playlists. (#1408)
-* UI:
-  * Fix: Collections and playlist tabs not loading on library and user pages. (#1408)
-  * Fix: Header overlapping graphs tabs on mobile layout. 
-  * Change: Rename "Plays by Period" graph tab to "Media Type".
-  * Removed: Clear logs button removed from main Tautulli logs.
-
-
-## v2.7.0 (2021-04-10)
-
-* History:
-  * New: Added transcode decision filter added to history tables.
-  * New: History table filters changed to allow multiple selections.
-* Notifications:
-  * Fix: Recently added notifications failing due to metadata not being available yet on the Plex server. (#1392)
-  * New: Added separate SSL/TLS support for Email notifications.
-  * New: Added notification image type setting for Tautulli Remote App notifications.
-  * New: Added guid notification parameter.
-  * New: Added a Plex server down notification threshold setting.
-* Newsletters:
-  * Fix: Newsletters would fail if an episode was missing a season number.
-* UI:
-  * Fix: Fixed spacing of rating images on the media info pages.
-  * Fix: Fixed refreshing cached image in the browser.
-  * Fix: Bootstrap tooltips logging javascript errors in some instances.
-  * Fix: Activity card progress bar not filling at 100%. (#1404)
-  * New: Added blurred background to the Most Active Users statistics card.
-  * New: Added transcode decision filter for all history tables.
-  * New: Added an error popup message if the Plex.tv token is no longer valid when visiting the settings page.
-  * New: Added Amazon Alexa platform logo.
-  * Change: Improved loading times for the homepage watch statistics.
-  * Change: Improved loading times for user and library watch time statistics.
-  * Change: Improved loading of the graph's history modal popup.
-  * Change: Automatically trim trailing slashes from the Tautulli Public Domain setting.
-  * Change: Renamed the Plex Media Server "Use SSL" setting to "Use Secure Connection".
-  * Change: Update Microsoft Edge platform logo.
-  * Change: Consider link local IP addresses as local addresses.
-  * Change: Reveal token fields if they are blank to make it easier to input new values.
-* Mobile App:
-  * New: Accept disabled OneSignal ID during device registration.
-* API:
-  * New: Added user fallback image option to the pms_image_proxy command.
-  * New: Added optional include_last_seen parameter to the get_user command.
-  * New: Added optional include_last_accessed parameter to the get_library command.
-  * New: Allow comma separated filter values for the get_history command.
-* Other:
-  * Fix: Importing the newsletter table would fail when manually repairing a corrupted database.
-  * Fix: Make fix match in Tautulli for music case-insensitive.
-  * New: Update PlexAPI to 4.5.2.
-  * Change: Migrate section_id from the session_history_metadata database table to session_history.
-  * Change: Copy the database file to the cache folder when importing a database using the browse option.
-  * Change: Delete the cached database file after successfully importing.
-
-
-## v2.6.10 (2021-03-17)
-
-* Other:
-  * Fix: Configuration upgrade would fail if the Most Active User card was disabled. (#1395)
-
-
-## v2.6.9 (2021-03-17)
-
-* Notifications:
-  * New: Added tautulli_update_exe and tautulli_update_exe notification parameters for Tautulli update notifications.
-* Exporter:
-  * New: Added new TV show export fields for the beta Plex TV agent.
-* UI:
-  * Fix: Some popover images not showing up on hover. (#1391)
-  * Remove: HTTP Host setting removed from the UI. This setting may still be changed in the config file.
-  * New: Added a Most Active Libraries statistics card to the homepage. (Thanks @herby2212) 
-  * New: Mask sensitive text fields in the settings. Settings can be revealed by clicking on the eye icon.
-* Mobile App:
-  * Change: Make OneSignal validation asynchronous to help timeout issues when registering a device.
-* API:
-  * Added top_libraries stat_id option to get_home_stats API commaand.
-* Ohter:
-  * New: Updated PlexAPI to 4.4.1.
-
-
-## v2.6.8 (2021-03-08)
-
-* Mobile App:
-  * New: An all new Tautulli Remote App 2.0. Go to the Google Play link in the settings to download the new version.
-  * Fix: Registering the new app would fail if OneSignal is blocked.
-
-
-## v2.6.7 (2021-03-07)
-
-* History:
-  * New: Added audio language to detailed stream info. (Thanks @herby2212)
-* Notifications:
-  * New: Added season_name notification parameter.
-  * New: Update notifications to support custom season titles.
-* Newsletters:
-  * New: Update recently added newsletter template to support custom season titles.
-* Exporter:
-  * New: Added originalTitle and bannerFile to TV show export fields.
-* UI:
-  * New: Added TVDB rating image to info page for the new Plex TV agent.
-  * New: Update the UI to support custom season titles.
-* API:
-  * Fix: Return rating key for collections/playlists in get_synced_items.
-  * Fix: Return error when delete_synced_item fails.
-  * New: Return sync_media_type for collections/playlist in get_synced_items.
-  * New: Update pms_image_proxy to support playlist composite images.
-* Other:
-  * Remove: Auto-updater for the Windows exe installer due to it being flagged by antivirus software.
-  * New: Updated PlexAPI to 4.4.0.
-
-
-## v2.6.6 (2021-02-06)
-
-* Exporter:
-  * Fix: Exporting failed with long file paths on Windows.
-  * New: Updated various exporter fields.
-  * Change: Renamed collection children to collection items.
-* UI:
-  * Fix: Client side login redirect changed to server side.
-  * Change: Renamed "Fix Metadata" button to "Fix Match".
-* API:
-  * New: Added get_children_metadata API command.
-  * New: Return more metadata from the get_home_stats API command.
-* Other:
-  * New: Updated PlexAPI to 4.3.1.
-
-
-## v2.6.5 (2021-01-09)
-
-* Other:
-  * Fix: Some IP addresses not being masked in the logs.
-  * New: Auto-updater for Windows exe installer.
-  * Change: Allow Snap package to access the user home directory.
-  * Change: Migrate Snap user data to a persistent location that is retained if Tautulli is reinstalled.
-
-
-## v2.6.4 (2020-12-20)
-
-* Other:
-  * Fix: Restore Snap data folder from previous installs.
-
-
-## v2.6.3 (2020-12-19)
-
-* Announcements:
-  * This is the last Tautulli version to support Python 2. Python 3 will be required to continue receiving updates. You can check your Python version on the settings page.
-* Exporter:
-  * Fix: Accessible and exists attributes were blank for media info export level 9.
-* UI:
-  * Fix: Guest usernames were not masked on mouse hover.
-* Other:
-  * Fix: macOS menu bar icon for light and dark mode.
-  * New: Tautulli can officially be installed on Linux using a Snap package. See the installation wiki for details.
-
-
-## v2.6.2 (2020-12-05)
-
-* Notifications:
-  * Change: Send a notification of a user new device for the first time only. This can be toggled off in the settings.
-* Exporter:
-  * Fix: Allow exporting child fields only without requiring the parent fields as well.
-  * Fix: Exporting individual collection would fail.
-  * Change: Remove accessible and exists fields from the default media info export levels. This prevents the Plex server from reading the media files unnecessarily. 
-* Other:
-  * Fix: Enable high resolution for the macOS system tray icon and menu.
-  * New: Added rate limiting for failed login attempts.
-  * Change: Use a white logo for the macOS system tray icon.
-* API:
-  * New: Added machine_id to the get_history API response.
-
-
-## v2.6.1 (2020-11-03)
-
-* Other:
-  * Fix: High CPU/memory usage in some instances.
-  * Fix: Logger error preventing Tautulli from starting.
-  * Fix: Database issue with non-unique image hashes.
-
-
-## v2.6.0 (2020-10-31)
-
-* Exporter:
-  * New: New exporter feature that allows you to export the metadata and images for any library, collection, playlist, or media item to csv, json, xml, or m3u8. Refer to the Exporter Guide in the wiki for more details.
-* UI:
-  * Fix: Margin on the homepage activity and statistic/library cards. (Thanks @dotsam)
-  * Fix: Movie ratings not showing on the info page for the new Plex Movie agent.
-  * New: Added ability to browse collections and playlists from the library and user pages.
-  * Change: Updated platform brand logos and colours.
-* API:
-  * New: Added export_metadata, download_export, and delete_export API commands.
-  * New: Added get_collections_table, and get_playlists_table API commands.
-  * New: Added min_version parameter to the register_device API command.
-  * New: Added include_activity parameter to the get_history API command.
-  * New: Added sync_id parameter to the get_metadata API command.
-  * New: Added delete_synced_item API command.
-  * New: Added a stat_id and stats_start parameters to the get_home_stats API command.
-  * New: Allow deleting a mobile device using the registration device_id for the delete_mobile_device API command.
-  * Change: Return Plex server info and Tautulli info from the register_device command.
-* Other:
-  * New: The Docker container is now also built for the arm32v6 architecture.
-  * New: The Docker container is also published to the GitHub Container Registry at ghcr.io/tautulli/tautulli.
-  * Change: Tautulli is now using a forked version of plexapi 3.6.0. This is to support the exporter feature while still maintaining Python 2 compatibility.
-  * Change: Updated systemd script to remove process forking. (Thanks @MichaIng)
-  * Change: Cache GitHub update check on startup.
-
-
-## v2.5.6 (2020-10-02)
-
-* Activity:
-  * Change: Renamed container "Transcode" to "Converting" on activity cards.
-* Notifications:
-  * New: Added a silent notification option for Telegram. (Thanks @JohnnyKing94)
-  * New: Added container_decision notification parameter.
-  * New: Added notification trigger for Playback Error.
-  * New: Added remote access down notification threshold setting.
-* Newsletter:
-  * Change: Stop flooring newsletter start date.
-* UI:
-  * Fix: Unable to purge history from the library edit modal.
-  * Fix: QR code not showing up for localhost address when trying to register a device.
-  * New: Added library name to the fix metadata modal.
-* API:
-  * New: Added default thumb and art to the Live TV library.
-* Other:
-  * Fix: Synced items not loading for guest access.
-  * New: Schedule some more automatic database optimizations.
-  * Change: Added automatic uninstall before installing to the Windows installer.
-
-
-## v2.5.5 (2020-09-06)
-
-* Activity:
-  * Fix: Filter out TV show background theme music sessions.
-* Notifications:
-  * New: Check Plex external guids for notification metadata provider links.
-* UI:
-  * Fix: Incorrect sorting for user/library recently played items.
-* API:
-  * Fix: get_synced_items API command returning error with empty result.
-  * Fix: Download API commands not returning the file.
-  * Fix: get_logs API command encoding error.
-  * Fix: get_user_player_stats API command returning error instead of empty result.
-  * New: Added get_server_info API command.
-  * New: Added external guids to get_metadata API command.
-  * New: Added support for multi-column sorting for datatable API commands.
-  * Change: get_activity API command return thumbnail override for clips.
-  * Change: get_libraries_table API command return custom library artwork.
-* Other:
-  * Fix: Tautulli failed to run with a stale pid file.
-  * New: Added scheduled task to optimize the Tautulli database.
-  * Change: Update plexapi to 3.6.0.
-  * Change: Update some libraries for Python 3 compatibility.
-
-
-## v2.5.4 (2020-07-31)
-
-* Monitoring:
-  * Change: Montitoring remote access changed to use websockets. Refer to Tautulli/Tautulli-Issues#251 for details.
-* Notifications:
-  * Fix: Uploading images to Cloudinary failed for titles with non-ASCII characters on Python 2.
-  * New: Added plex_id notification parameter.
-  * Remove: Running .exe files directly using script notifications is no longer supported.
-  * Remove: php, perl, and ruby prefix overrides for script notifications is no longer supported.
-  * Change: Stricter checking of file extensions for script notifications.
-  * Change: Fallback to The Movie Database lookup using title and year.
-  * Change: Fallback to TVmaze lookup using title.
-* UI:
-  * New: Added ability to import a previous Tautullli configuration file in the settings.
-  * New: Added a browse button for settings which require a folder or file input.
-  * New: Added first streamed column to user IP addresses table. (Thanks @dotsam)
-  * New: Added The Movie Database rating image to media page.
-  * Change: Different icon to represent direct stream in the history tables.
-* API:
-  * New: Updated API docs for importing a database and configuration file.
-
-
-## v2.5.3 (2020-07-10)
-
-* History:
-  * Fix: Unable to delete more than 1000 history entries at the same time.
-* Notifications:
-  * Change: Python script notifications to run using the same Python interpreter as Tautulli.
-* Newsletters:
-  * Fix: Unable to view newsletters with special characters.
-* Other:
-  * Fix: Tautulli failing to start after enabling HTTPS when installed using the Windows / macOS installers.
-  * Fix: Startup script not working on macOS.
-  * Fix: Unable to hide dock icon on macOS with the pkg install. Refer to the FAQ regarding the Python rocket dock icon.
-  * Change: Added path to Python interpreter in system startup (daemon) scripts.
-  * Change: Added Python version to Google analytics.
-
-
-## v2.5.2 (2020-07-01)
-
-* Announcements:
-  * Tautulli now supports Python 3!
-  * Python 2 is still supported for the time being, but it is recommended to upgrade to Python 3.
-* Notifications:
-  * Fix: Error uploading images to Cloudinary on Python 2.
-  * Fix: Testing browser notifications alert not disappearing.
-  * Change: Default recently added notification delay set to 300 seconds.
-* UI: 
-  * Fix: MacOS menu bar icon causing Tautulli to fail to start.
-  * Fix: Unable to login to Tautulli on Python 2.
-  * New: Windows and MacOS setting to enable Tautulli to start automatically when you login.
-  * New: Added menu bar icon for MacOS.
-  * New: Ability to import a Tautulli database in the settings.
-  * New: Added Tautulli news area on the settings page.
-  * New: Added platform icon for LG devices.
-  * Remove: Ability to login to Tautulli using a Plex username and password has been removed. Login using a Plex.tv account is only supported via OAuth.
-* Mobile App:
-  * Fix: Improved API security and validation when registering the Android app.
-* Docker:
-  * Fix: Docker container not respecting the PUID and PGID environment variables.
-* Other:
-  * Fix: Error creating self-signed certificates on Python 3.
-  * Fix: Tautulli login session cookie not set on the HTTP root path.
-  * New: Windows and MacOS app installers to install Tautulli without needing Python installed.
-
-
-## v2.2.4 (2020-05-16)
-
-* Monitoring:
-  * Fix: Show "None" as the subtitle source on the activity card for user selected subtitles.
-* UI:
-  * Fix: Deleted libraries were showing up on the homepage library cards.
-  * Fix: Libraries could get stuck as inactive in the database in some instances.
-* API:
-  * Fix: Incorrect title was being returned for the get_history API command.
-* Other:
-  * Fix: Plex remote access check was not being rescheduled after changing the settings.
-
-
-## v2.2.3 (2020-05-01)
-
-* Notifications:
-  * Fix: Notification grouping by season/album and show/artist not enabled by default.
-  * Fix: The rating key notification parameter was being overwritten when 3rd party lookup was enabled.
-  * Fix: Missing artist value for Musicbrainz lookup in certain situations. 
-  * New: Added notification trigger for Tautulli database corruption.
-  * New: Added TAUTULLI_PYTHON_VERSION to script notification environment variables.
-  * New: Added Plex Android / iOS App notification agent.
-  * New: Added bandwidth notification parameters.
-  * New: Added user thumb to notification parameters.
-  * New: Added initial stream notification parameter and threshold setting to determine if a stream is the first stream of a continuous streaming session.
-  * New: Added Plex remote access notification parameters.
-  * Change: The file size notification parameter is now reported in SI units. (Thanks @aaronldunlap)
-* UI:
-  * Fix: Delete lookup info from the media info page failing.
-  * Fix: XBMC platform icon not being redirected to the Kodi platform icon.
-  * Fix: History table was not being refreshed after deleting entries.
-  * New: Added icon on the users table to indicate if the user is not on the Plex server.
-  * New: Added icon on the libraries table to indicate if the library is not on the Plex server.
-  * Change: Improved deleting libraries so libraries with the same section ID are not also deleted.
-* Mobile App:
-  * Fix: Temporary device token was not being invalidated after cancelling device registration.
-* API:
-  * Fix: Returning XML from the API failing due to unicode characters.
-  * Fix: Grouping parameter for various API commands not falling back to default setting.
-  * New: Added time_queries parameter to get_library_watch_time_stats and get_user_watch_time_stats API command. (Thanks @KaasKop97)
-  * New: Added an "is_active" return value to the get_user, get_users, get_library, and get_libraries API commands which indicates if the user or library is on the Plex server.
-  * New: Added delete_history API command.
-  * Change: Added optional parameter for row_ids for delete_library, delete_user, delete_all_library_history, and delete_all_user_history API commands.
-* Other:
-  * Fix: Update failing on CentOS due to an older git version.
-  * Fix: Manifest file for creating a web app had incorrect info.
-  * Fix: Auto-updater was not scheduled when enabling the setting unless Tautulli was restarted.
-  * New: Docker images updated to support ARM platforms.
-  * Change: Remove the unnecessary optional Plex logs volume from the Docker image.
-  * Change: Use Plex.tv for GeoIP lookup instead of requiring the MaxMind GeoLite2 database.
-
-
-## v2.2.1 (2020-03-28)
-
-* Notifications:
-  * Fix: File size notification parameter incorrectly truncated to an integer.
-  * Fix: Notification grouping by season/album not enabled by default.
-  * New: Added transcode decision counts to notification parameters.
-  * Change: Tags (<>) are no longer stripped from from Webhook notification text.
-* Newsletter:
-  * New: Added favicon to newsletter template when viewing as a web page.
-* UI:
-  * Fix: Username missing from the Synced Items table.
-  * Fix: Windows system tray icon not enabled by default.
-  * Fix: Saving a mobile device with a blank friendly name caused an error.
-  * New: Added IMDb and Rotten Tomato Ratings to info pages.
-  * New: Added button in settings to delete all 3rd party metadata lookup info in the database.
-  * New: Added button in settings to flush recently added items in the database.
-* API:
-  * New: Added delete_recenly_added API command to flush recently added items.
-  * Change: Updated delete_lookup_info API command parameters to allow deleteing all 3rd party metadata lookup info.
-
-
-## v2.2.0 (2020-03-08)
-
-* Important Note!
-  * All Live TV changes requires Plex Media Server 1.18.7 or higher. 
-* Monitoring:
-  * Fix: Improved IPv6 display on the activity cards. (Thanks @felixbuenemann)
-  * New: Added Live TV metadata and posters to the activity cards.
-  * Change: Show bandwidth in Gbps when greater than 1000 Mbps.
-* History:
-  * New: Added history logging for Live TV sessions.
-  * New: Added a fake "Live TV" library to collect Live TV history.
-    * Note: This library will show up the first time that Live TV is played.
-  * New: Added the ability to filter history by Live TV.
-* Graphs:
-  * New: Added Live TV series to the "Plays by Period" and "Play Totals" graphs.
-  * Change: Media type series on the graphs are only shown if the corresponding library type is present.
-* Notifications:
-  * Fix: Race condition causing stream count to be incorrect for playback stop notifications.
-  * New: Added Live TV channel notification parameters.
-  * New: Added Plex background art notification parameter.
-    * Note: This is the Plex API endpoint to retrieve the background art, not the actual image.
-  * New: Added poster images for clip notifications.
-  * Change: Default Webhook notification method to POST.
-* UI:
-  * Fix: Windows platform showing up twice on the Most Active Platforms statistics card.
-  * New: Added option to change the background art for library sections when editing a library.
-  * New: Added button to reset Tautulli git installation in settings to fix failed git updates.
-* API:
-  * New: Added ability to filter history using a "live" media type and by guid for the get_history API command.
-  * New: Added cutsom_art parameter to the edit_library API command.
-* Other:
-  * Change: Add crossorigin use-credentials attribute to manifest tags. (Thanks @pkoenig10)
-  * Change: Disable automatic updates for Docker containers. Updates are now handled by updating the Docker container.
-    * Note: If you are using an old Docker container created before v2.2.0, then you may need to completely remove and recreate the container to update for the first time.
-    * Note: Use the ":latest" Docker tag for the newest stable release, or the ":beta" or ":nightly" tags to access the beta or nightly branches.
-
-
-## v2.1.44 (2020-02-05)
-
-* Monitoring:
-  * Fix: SDR source video being identified as HDR stream video.
-* Notifications:
-  * Fix: Unable to select condition operator for video color parameters.
-* UI:
-  * Fix: Capitalization for platforms on history tables.
-
-
-## v2.1.43 (2020-02-03)
-
-* Monitoring:
-  * New: Added HDR indicator on activity card.
-  * New: Added dynamic range to history steam info modal.
-* Notifications:
-  * Fix: Webhook notification body sent as incorrect data type when Content-Type header is overridden.
-  * Fix: Telegram notification character limit incorrect for unicode characters.
-  * New: Added color and dynamic range notification parameters.
-* Newsletters:
-  * Fix: Episodes and Albums plural spelling on recently added newsletter section headers.
-* UI:
-  * Fix: Windows and macOS platform capitalization.
-  * Fix: Season number 0 not shown for episodes on history tables.
-* Other:
-  * Change: Mask email addresses in logs.
-  * Change: Update deprecated GitHub access token URL parameter to Authorization header.  
-
-
-## v2.1.42 (2020-01-04)
-
-* Other:
-  * Fix: SSL certificate error when installing GeoLite2 database.
-  * Change: Verify MaxMind license key and GeoLite2 database path before installing.
-  * Change: Disable GeoLite2 database uninstall button when it is not installed.
-
-
-## v2.1.41 (2019-12-30)
-
-* Other:
-  * Fix: Failing to extract the GeoLite2 database on Windows.
-
-
-## v2.1.40 (2019-12-30)
-
-* UI:
-  * Change: Moved 3rd Party API settings to new tab in the settings.
-* Graphs:
-  * Change: Improve calculating month ranges for Play Totals graphs.
-* Other:
-  * Fix: Failing to verify a Plex Media Server using a hostname.
-  * Change: A license key is now required to install the MaxMind GeoLite2 database for IP geolocation. Please follow the guide in the wiki to reinstall the GeoLite2 database.
-  * Change: The GeoLite2 database will now automatically update periodically if installed.
-
-
-## v2.1.39 (2019-12-08)
-
-* UI:
-  * New: Added creating admin username and password to setup wizard.
-* API:
-  * Change: Remove default notification subject and body for notify API command.
-* Other:
-  * Change: Check for database corruption when making backup.
-
-
-## v2.1.38 (2019-11-17)
-
-* Notifications:
-  * New: Added custom JSON headers to the webhook notification agent.
-* UI:
-  * Fix: Homepage recently watched card not showing grouped history.
-* Other:
-  * New: Added GitHub sponsor donation option.
-  * Change: Improve resolving hostnames.
-
-
-## v2.1.37 (2019-10-11)
-
-* Notifications:
-  * Fix: Last.fm URLs linking to artist page instead of the album page.
-  * New: Added option for MusicBrainz lookup for music notifications. Option must be enabled under 3rd Party APIs in the settings.
-  * New: Added MusicBrainz ID and MusicBrainz URL notification parameters.
-  * Change: Automatically truncate Discord description summary to 2048 characters.
-
-
-## v2.1.36-beta (2019-10-05)
-
-* Monitoring:
-  * Fix: Activity card title not updating after pre-rolls or auto-play.
-* History:
-  * Fix: Display correct interlaced or progressive video scan type on stream data modal.
-* Graphs:
-  * New: Separate interlaced and progressive video scan type on source and stream resolution graphs.
-* API:
-  * New: Added parent_guid and grandparent_guid to get_activity and get_metadata commands.
-
-
-## v2.1.35-beta (2019-09-24)
-
-* Monitoring:
-  * Fix: Audio shown as blank on activity cards when changing audio tracks during direct play.
-  * Fix: Display correct interlaced or progressive video scan type on activity cards.
-  * New: Added flag for Nvidia hardware decoding on activity cards.
-* Notifications:
-  * Fix: Notification parameter prefix and suffix were not substituted correctly.
-  * Fix: Release Date notification parameter was incorrectly casted to an integer instead of a string.
-  * New: Added video scan type and full resolution notification parameters.
-* UI:
-  * Fix: Movies with the same title but different year being grouped on the homepage stats cards.
-* API:
-  * New: Added video scan type and full resolution values to get_activity command.
-* Other:
-  * Fix: Tautulli logging out every time after saving settings and restarting.
-
-
-## v2.1.34 (2019-09-03)
-
-* History:
-  * New: Added Product column to history tables.
-* Notifications:
-  * Fix: IMDB/TMDb/TVDB/TVmaze ID notification parameters showing blank values after lookup.
-* UI:
-  * Fix: Libraries and Users tables did not respect the group history setting.
-* API:
-  * Fix: Title field was not searchable in get_library_media_info command.
-  * New: Added grouping option to get_libraries_table and get_users_table commands.
-  * New: Added product value to get_history command.
-* Other:
-  * Fix: Could not verify Plex Media Server with unpublished hostnames.
-  * Change: Automatically logout all Tautulli instances when changing the admin password.
-
-
-## v2.1.33 (2019-07-27)
-
-* Notifications:
-  * Change: Mask notification agent password fields.
-  * Change: Enable searching by email address in dropdown menu.
-* Other:
-  * Fix: Version number being overwritten with "None" which prevented updating in some instances.
-  * Change: Update Plex OAuth request headers.
-
-
-## v2.1.32 (2019-06-26)
-
-* Newsletters:
-  * Fix: Newsletter scheduler issue for QNAP devices using an invalid "local" timezone preventing Tautulli from starting.
-
-
-## v2.1.31 (2019-06-24)
-
-* No additional changes from v2.1.31-beta.
-
-
-## v2.1.31-beta (2019-06-13)
-
-* Monitoring:
-  * Fix: Synced content showing incorrect stream info.
-* Other:
-  * Fix: Unable to view database status when authentication is enabled.
-  * Change: Default database synchronous mode changed to prevent database corruption. Database response may be slower.
-
-
-## v2.1.30-beta (2019-05-11)
-
-* Monitoring:
-  * Fix: Activity crashing with Plex's Artist TV feature.
-  * New: Added setting for Plex Media Server Update Check Interval. (Thanks @abiacco)
-* Notifications:
-  * New: Added secure and relayed connection notification parameters.
-  * New: Added PLEX_USER_TOKEN to script environment variables.
-  * Change: Schedule notifications using UTC to prevent missing notifications due to misconfigured timezones.
-* API:
-  * New: Added status API command to check the status of Tautulli.
-
-
-## v2.1.29 (2019-05-11)
-
-* No additional changes from v2.1.29-beta.
-
-
-## v2.1.29-beta (2019-04-14)
-
-* Monitoring:
-  * Change: "Required Bandwidth" changed to "Reserved Bandwidth" in order to match the Plex dashboard.
-* Notifications:
-  * New: Added prefix and suffix notification text modifiers. See the "Notification Text Modifiers" help modal for details.
-* UI:
-  * New: Added "Undelete" button to the edit library and edit user modals.
-  * Fix: User IP address history table showing incorrect "Last Seen" values.
-* API:
-  * Fix: Search API only returning 3 results.
-  * Fix: Terminate stream API failing when both session_key and session_id were provided.
-  * Change: Improved API response HTTP status codes and error messages.
-
-
-## v2.1.28 (2019-03-10)
-
-* Monitoring:
-  * New: Added secure/insecure connection icon on the activity cards. Requires Plex Media Server v1.15+.
-* Other:
-  * Change: Improved mass deleting of all images from Cloudinary. Requires all previous images on Cloudinary to be manually tagged with "tautulli". New uploads are automatically tagged.
-
-
-## v2.1.27-beta (2019-03-03)
-
-* Monitoring:
-  * Fix: Error when playing synced optimized versions.
-  * Change: Show message to complete the setup wizard instead of error communicating with server message.
-  * Change: URL changed on Plex.tv for Plex Media Server beta updates.
-* Notifications:
-  * New: Show the media type exclusion tags in the text preview modal.
-  * Fix: Unicode error in the Email notification failed response message.
-  * Fix: Error when a notification agent response is missing the "Content-Type" header.
-* UI:
-  * Fix: Usernames were not being sanitized in dropdown selectors.
-  * Change: Different display of "All" recently added items on the homepage due to change in the Plex Media Server v1.15+ API.
-* API:
-  * New: Added current Tautulli version to update_check API response.
-  * Change: API no longer returns sanitized HTML response data.
-* Other:
-  * New: Added auto-restart to systemd init script.
-  * Fix: Patreon donation URL.
-  * Remove: Crypto donation options.
-
-
-## v2.1.26 (2018-12-01)
-
-* Monitoring:
-  * Fix: Resume event not being triggered after buffering.
-* Notifications:
-  * New: Added user email as a notification parameter.
-* Graphs:
-  * Fix: History model showing no results for stream info graph.
-* API:
-  * Fix: API returning error when missing a cmd.
-
-
-## v2.1.25 (2018-11-03)
-
-* Monitoring:
-  * Fix: Audio and video codec showing up as * on the activity cards.
-  * New: Poster and background image on the activity cards for live TV.
-* UI:
-  * Fix: Alert message for invalid Tautulli Public Domain setting.
-
-
-## v2.1.24-beta (2018-10-29)
-
-* Monitoring:
-  * Fix: Transcode change events creating invalid sessions in the database.
-* Notifications:
-  * Change: Update Telegram character limit to 1024.
-* History:
-  * Fix: Save history table states separately for multiple Tautulli instances.
-* Graphs:
-  * Fix: Save graphs states separately for multiple Tautulli instances.
-  * Change: Version graphs to bypass browser cache.
-* UI:
-  * New: Added queued tasks modals to the scheduled tasks table for debugging.
-* Other:
-  * Change: Updated timezone info and display in configuration table.
-
-
-## v2.1.23-beta (2018-10-14)
-
-* Monitoring:
-  * Fix: Buffer events not being triggered properly.
-  * Fix: Watched progress sometimes not saved correctly. (Thanks @Sheigutn)
-* Notifications:
-  * New: Added notification trigger for transcode decision change.
-  * Fix: Multiple buffer notifications being triggered within the same second.
-  * Change: Default buffer notification threshold changed to 10 for buffer thresholds less than 10.
-* Newsletter:
-  * New: Added Other Video libraries to the newsletter.
-* Homepage:
-  * New: Added Other Video type to recently added on the homepage.
-  * Change: Save homepage recently added media type toggle state.
-  * Change: Save homepage stats config to local storage instead of the server.
-* History:
-  * Change: Save history table media type toggle state.
-* Graphs:
-  * Change: Save series visibility state when toggling the legend.
-  * Change: Save graph config to local storage instead of the server.
-* UI:
-  * New: Show the remote app device token and id in the edit device modal.
-  * Change: Lock certain settings if using the Tautulli docker container.
-* API:
-  * Fix: download_config, download_database, download_log, and download_plex_log API commands not working.
-  * Change: get_recently_added command 'type' parameter renamed to 'media_type'. Backwards compatibility is maintained.
-  * Change: get_home_stats command 'stats_type' parameter change to string 'plays' or 'duration'. Backwards compatibility is maintained.
-
-
-## v2.1.22 (2018-10-05)
-
-* Notifications:
-  * Fix: Notification agent settings not loading when failed to retrieve some data.
-* UI:
-  * Fix: Incorrectly showing localhost server in the setup wizard.
-* Other:
-  * Fix: Incorrect redirect to HTTP when HTTPS proxy header is present.
-  * Fix: Websocket not connecting automatically after the setup wizard.
-
-
-## v2.1.21 (2018-09-21)
-
-* Notifications:
-  * Fix: Content Rating notification condition always evaluating to True. (Thanks @Arcanemagus)
-  * Fix: Script arguments not showing substituted values in the notification logs.
-* UI:
-  * New: Unsupported browser warning when using IE or Edge.
-  * Fix: Misaligned refresh image icon in album search results. (Thanks @Sheigutn)
-  * Fix: Music history showing as pre-Tautulli in stream info modal.
-* Other:
-  * Fix: Typo in Systemd init script group value. (Thanks @ldumont)
-  * Fix: Execute permissions in Fedora/CentOS and Systemd init scripts. (Thanks @wilmardo)
-  * Fix: Systemd init script instructions per Linux distro. (Thanks @samwiseg00)
-  * Change: Fallback to Tautulli data directory if logs/backup/cache/newsletter directories are not writable.
-  * Change: Check for alternative reverse proxy headers if X-Forwarded-Host is missing.
-
-
-## v2.1.20 (2018-09-05)
-
-* No additional changes from v2.1.20-beta.
-
-
-## v2.1.20-beta (2018-09-02)
-
-* Monitoring:
-  * Fix: Fetch messing season info when "Hide Seasons" is enabled for a show.
-  * Fix: Video and Audio details sometimes missing on activity cards.
-* Notifications:
-  * New: Added UTC timestamp to notification parameters. (Thanks @samwiseg00)
-  * New: Added TAUTULLI_PUBLIC_URL to script environment variables. (Thanks @samwiseg00)
-* UI:
-  * Change: Automatically redirect '/' to HTTP root if enabled.
-* API:
-  * New: Added return_hash parameter to pms_image_proxy command.
-  * New: Added session_id parameter to get_activity command.
-* Other:
-  * Change: Linux systemd startup script to use the "tautulli" group permission. (Thanks @samwiseg00)
-
-
-## v2.1.19-beta (2018-08-19)
-
-* Notifications:
-  * New: Added Webhook notification agent.
-  * Fix: Scripts failing due to unicode characters in substituted script arguments.
-  * Change: Ability to override PYTHONPATH for scripts.
-  * Remove: Notify My Android notification agent.
-* Newsletters:
-  * New: Added option for threaded newsletter emails.
-  * Fix: Missing space in newsletter format.
-* UI:
-  * New: Added Windows system tray icon.
-  * Fix: Plex OAuth not working with Plex remote access disabled. (Thanks @samwiseg00)
-* API:
-  * Fix: SQL command creating a database backup every time. (Thanks @samwiseg00)
-
-
-## v2.1.18 (2018-07-27)
-
-* Monitoring:
-  * Fix: Progress bar on activity cards showing incorrect 100% when starting a stream.
-* Notifications:
-  * Fix: Notification text boxes scrolling to top when inputting text.
-  * Change: Skip formatting invalid notification parameters instead of returning default text.
-* UI:
-  * Fix: Padding around search bar causing the navigation bar to break on smaller screens.
-
-
-## v2.1.17-beta (2018-07-22)
-
-* Notifications:
-  * Change: Use default selected stream for media info in notifications.
-* UI:
-  * New: Automatically discover localhost Plex servers in server selection dropdown.
-  * Change: Save Datatables state indefinitely.
-
-
-## v2.1.16-beta (2018-07-06)
-
-* Monitoring:
-  * Fix: Plex server not detected as down during sudden network loss.
-* Notifications:
-  * Fix: Incorrect rounding of percentages in some cases.
-  * Fix: Incorrect stream duration value for playback start notifications.
-  * New: Added critic rating parameter for Rotten Tomatoes ratings.
-* Newsletters:
-  * Fix: Typo in "seasons" when there is only one additional season.
-* UI:
-  * New: Added ability to use Plex OAuth to login to Tautulli.
-* API:
-  * Fix: Unicode characters causing get_logs command to return bad data.
-  * New: Added rating_image and audience_rating_image to get_activity and get_metadata commands.
-
-
-## v2.1.15-beta (2018-07-01)
-
-* Monitoring:
-  * Fix: Progress percent displaying NaN for live TV.
-  * Fix: Unable to terminate sessions with unicode characters in the message.
-  * Change: Tizen platform to display the Samsung icon.
-* Notifications:
-  * New: Added PYTHONPATH to script environment variables so scripts can automatically import from Tautulli libraries.
-  * Fix: Proper handling of unicode script arguments.
-  * Fix: Incorrect TAUTULLI_URL environment variable if the HTTP host setting is changed.
-  * Fix: Email addresses selectize box not expanding.
-* Newsletters:
-  * Change: HTTPS URLS for images hosted on tautulli.com.
-* Graphs:
-  * Fix: SD resolution sometimes not grouped together.
-
-
-## v2.1.14 (2018-06-21)
-
-* Notifications:
-  * Fix: Parsing script arguments in quotes.
-* UI:
-  * Fix: Slow loading due to Font Awesome 5 javascript.
-  * Change: Play counts on user an library pages now respect the history grouping setting.
-* API:
-  * New: Added optional grouping parameter to user and library watch statistics.
-
-
-## v2.1.13 (2018-06-16)
-
-* Monitoring:
-  * Fix: Soft crash when viewing photos not in an album.
-* Notifications:
-  * New: Added current date and time notification parameters.
-* UI:
-  * New: Added support page with embedded Discord chat using WidgetBot.
-
-
-## v2.1.12 (2018-06-08)
-
-* Notifications:
-  * Change: Blank notification link source means disabled instead of default.
-* Newsletters:
-  * New: Make collection tags available in the raw newsletter data for custom templates.
-* API:
-  * New: Ability to terminate a stream using the session key.
-
-
-## v2.1.11-beta (2018-06-02)
-
-* Monitoring:
-  * Fix: Activity progress bar not updating in some cases.
-  * Fix: Monitory Remote Access setting disabled due to Plex Media Server API changes.
-  * Change: Improved logic for grouping history items without being successive plays.
-* Notifications:
-  * New: Added filename to notification parameters.
-* Other:
-  * Fix: Update metadata failing for tracks without track numbers.
-
-
-## v2.1.10-beta (2018-05-28)
-
-* Monitoring:
-  * Fix: Improved monitoring of live tv sessions.
-  * Change: Use track artist instead of album artist.
-* Notifications:
-  * New: Added timestamp to Discord notification embeds. (Thanks @samwiseg00)
-  * New: Enable notifications for "clip" media types.
-  * Fix: Actually add the "live" notification parameter.
-  * Change: Update Twitter for 280 characters.
-  * Change: Use HTTPS url for Cloudinary images.
-* Newsletters:
-  * Fix: Artist summaries not showing up on newsletter cards.
-  * Change: Do not send the newsletter if the template fails to render.
-
-
-## v2.1.9 (2018-05-21)
-
-* Notifications:
-  * New: Added "live" to notification parameters.
-
-
-## v2.1.8-beta (2018-05-19)
-
-* Newsletters:
-  * New: Added authentication options for self-hosted newsletters.
-  * Change: Check if the Tautulli footer has been removed in custom newsletter templates.
-* Notifications:
-  * Fix: Cloudinary images not working for Twitter notifications.
-* API:
-  * Fix: Return proper HTTP status codes for errors.
-
-
-## v2.1.7-beta (2018-05-13)
-
-* Newsletters:
-  * New: Option to toggle between inline or internal CSS style templates.
-  * New: Button to delete all uploaded images from Imgur/Cloudinary.
-  * Fix: Long titles overflowing the newsletter cards.
-  * Change: Self-hosted images on newsletters to use the /image endpoint instead of proxying through /newsletter/image.
-  * Change: Strip whitespace from newsletter for smaller file size before sending to email.
-* API:
-  * New: Added get_stream_data command to API.
-  * New: Added newsletter API commands to documentation.
-
-
-## v2.1.6-beta (2018-05-09)
-
-* Newsletters:
-  * Change: Setting to specify static URL ID name instead of using the newsletter ID number.
-  * Change: Reorganize newsletter config options.
-
-
-## v2.1.5-beta (2018-05-07)
-
-* Newsletters:
-  * New: Added setting for a custom newsletter template folder.
-  * New: Added option to enable static newsletter URLs to retrieve the last sent scheduled newsletter.
-  * New: Added ability to change the newsletter output directory and filenames.
-  * New: Added option to save the newsletter file without sending it to a notification agent.
-  * Fix: Check for disabled image hosting setting.
-  * Fix: Cache newsletter images when refreshing the page.
-  * Fix: Refresh image from the Plex server when uploading to image hosting.
-  * Change: Allow all image hosting options with self-hosted newsletters.
-* UI:
-  * Change: Don't retrieve recently added on the homepage if the Plex Cloud server is sleeping.
-* Other:
-  * Fix: Imgur database upgrade migration.
-
-
-## v2.1.4 (2018-05-05)
-
-* Newsletters:
-  * Fix: Newsletter URL without an HTTP root.
-
-
-## v2.1.3-beta (2018-05-04)
-
-* Newsletters:
-  * Fix: HTTP root doubled in newsletter URL.
-  * Fix: Configuration would not open with failed hostname resolution.
-  * Fix: Schedule one day off when using weekday names in cron.
-  * Fix: Images not refreshing when changed in Plex.
-  * Fix: Cloudinary upload with non-ASCII image titles.
-* Other:
-  * Fix: Potential XSS vulnerability in search.
-
-
-## v2.1.2-beta (2018-05-01)
-
-* Newsletters:
-  * New: Added Cloudinary option for image hosting.
-* Notifications:
-  * New: Added Message-ID to Email header (Thanks @Dam64)
-  * Fix: Posters not showing up on Twitter with self-hosted images.
-  * Fix: Incorrect action parameter for new device notifications.
-  * Change: Hardcode Pushover sound list instead of fetching the list every time.
-* API:
-  * Fix: Success result for empty response data.
-  * Change: Do not send notification when checking for Tautulli updates via the API.
-
-
-## v2.1.1-beta (2018-04-11)
-
-* Monitoring:
-  * Fix: Live TV transcoding showing incorrectly as direct play.
-* Newsletters:
-  * New: Added week number as parameter. (Thanks @samip5)
-  * Fix: Fallback to cover art on the newsletter cards.
-  * Change: Option to set newsletter time frame by calendar days or hours.
-* Notifications:
-  * New: Added week number as parameter. (Thanks @samip5)
-* Other:
-  * New: Added plexapi library for custom scripts.
-
-
-## v2.1.0-beta (2018-04-07)
-
-* Newsletters:
-  * New: A completely new scheduled newsletter system.
-    * Beautiful HTML formatted newsletter for recently added movies, TV shows, or music.
-    * Send newsletters on a daily, weekly, or monthly schedule to your users.
-    * Customize the number of days of recently added content and the libraries to include on the newsletter.
-    * Add a custom message to be included on the newsletter.
-    * Option to either send an HTML formatted email, or a link to a self-hosted newsletter on your own domain to any notification agent.
-* Notifications:
-  * New: Ability to use self-hosted images on your own domain instead of using Imgur.
-
-
-## v2.0.28 (2018-04-02)
-
-* Monitoring:
-  * Fix: Homepage activity header text.
-
-
-## v2.0.27 (2018-04-02)
-
-* Monitoring:
-  * Change: Move activity refresh interval setting to the settings page.
-
-
-## v2.0.26-beta (2018-03-30)
-
-* Monitoring:
-  * New: Setting to change the refresh interval on the homepage.
-  * Fix: Identify extras correctly on the activity cards.
-* Notifications:
-  * Change: Send Telegram image and text separately if the caption is longer than 200 characters.
-* UI:
-  * Fix: Error when clicking on synced playlist links.
-
-
-## v2.0.25 (2018-03-22)
-
-* Monitoring:
-  * Fix: Websocket not reconnecting causing activity monitoring and notifications to not work.
-  * Fix: Error checking for synced streams without Plex Pass.
-
-
-## v2.0.24 (2018-03-18)
-
-* Monitoring:
-  * Fix: Fix stream data not showing for history recorded before v2.
-* Notifications:
-  * Fix: Set all environment variables for scripts.
-  * Change: Moved all notification agent instructions to the wiki.
-  * Change: XBMC notification agent renamed to Kodi.
-  * Change: OSX Notify notification agent renamed to macOS Notification Center.
-
-
-## v2.0.23-beta (2018-03-16)
-
-* Monitoring:
-  * Fix: Certain transcode stream showing incorrectly as direct play in history. Fix is not retroactive.
-* Notifications:
-  * New: Added season/episode/album/track count to notification parameters.
-  * New: Added "Value 3" setting for IFTTT notifications.
-  * New: Set PLEX_URL, PLEX_TOKEN, TAUTULLI_URL, and TAUTULLI_APIKEY environment variables for scripts.
-  * Fix: Notifications failing to send with invalid custom conditions json.
-  * Fix: Email notifications failing with unicode username/passwords.
-  * Change: Facebook Graph API version updated to v2.12.
-* UI:
-  * New: Show the Plex Server URL in the settings.
-  * Fix: Incorrect info displayed in the Tautulli login logs.
-* API:
-  * Fix: API returning empty data if a message was in the original data.
-  * Change: get_server_id command returns json instead of string.
-* Other:
-  * Fix: Forgot git pull when changing branches in the web UI.
-
-
-## v2.0.22 (2018-03-10)
-
-* Tautulli v2 release!
-
-
-## v2.0.22-beta (2018-03-09)
-
-* Notifications:
-  * Fix: Pushover notifications failing with priority 2 is set.
-  * Fix: Expanding selectize box for some notification agent settings.
-* Other:
-  * Fix: Update check failing when an update is available.
-  * Fix: Item count incorrect for photo libraries.
-
-
-## v2.0.21-beta (2018-03-04)
-
-* Monitoring:
-  * New: Identify if a stream is using Plex Relay.
-  * Change: Don't ping the Plex server if the websocket is disconnected.
-* Notifications:
-  * Fix: Pause/resume state not being sent correctly in some instances.
-* Other:
-  * New: Add Patreon donation method.
-  * Fix: Catch failure to send analytics.
-  * Fix: IP address connection lookup error when the country is missing.
-  * Change: Updated all init scripts to Tautulli.
-  * Change: Move database to tautulli.db.
-  * Change: Move logs to tautulli.log.
-  * Change: Move startup file to Tautulli.py.
-
-
-## v2.0.20-beta (2018-02-24)
-
-* Notifications:
-  * New: Add poster support for Pushover notifications.
-  * New: Add poster support for Pushbullet notifications.
-  * Fix: Incorrect Plex/Tautulli update notification parameter types.
-  * Change: Poster and text sent as a single message for Telegram.
-  * Change: Posters uploaded directly to Telegram without Imgur.
-* UI:
-  * New: Add "Delete" button to synced items table on user pages.
-  * Fix: Button spacing/positioning on mobile site.
-  * Fix: Music statistic cards not using the fallback thumbnail.
-  * Fix: Logo not showing up when using an SVG.
-  * Change: Graphs now respect the "Group History" setting.
-* API:
-  * New: Add grouping to graph API commands.
-* Other:
-  * New: Added Google Analytics to collect installation metrics.
-  * Fix: Reconnecting to the Plex server when server settings are not changed.
-
-
-## v2.0.19-beta (2018-02-16)
-
-* Monitoring:
-  * Fix: Connect to Plex Cloud server without keeping it awake.
-  * Fix: Reconnect to Plex Cloud server after the server wakes up from sleeping.
-* Notifications:
-  * Fix: Don't send Plex Server Up/Down notifications when Tautulli starts up.
-  * Change: Better handling of Watched notifications.
-* UI:
-  * New: Added Plex server selection dropdown in the settings.
-  * Fix: Libraries and Users tables not refreshing properly.
-  * Change: Updated the masked info shown to guests.
-  * Change: Check for updates without refreshing to the homepage.
-* API:
-  * New: Added update_check to the API.
-  * Fix: delete_media_info_cache not deleting the cache.
-  * Change: Document "refresh" parameter for get_library_media_info.
-* Other:
-  * Fix: Show the full changelog since v2 on a fresh install.
-
-
-## v2.0.18-beta (2018-02-12)
-
-* Notifications:
-  * Fix: Default text for Tautulli update notifications using the wrong parameter.
-  * Fix: Playback pause and resume notifications only triggering once.
-  * Change: Negative operators for custom conditions now use "and" instead of "or".
-* UI:
-  * New: Added button to delete the 3rd party lookup info from the info pages.
-  * Fix: Missing host info in the login logs when logging in using Firefox.
-  * Change: Cleaned up settings. Advanced settings are now hidden behind a toggle.
-* API:
-  * New: Updated API documentation for v2.
-* Other:
-  * Fix: DeprecationWarning when using HTTPS with self-signed certificates.
-  * Change: Deleting the Imgur poster URL also deletes the poster from Imgur (only available for new uploads).
-  * Change: GitHub repository moved to Tautulli/Tautulli. Old GitHub URLs will still work.
-
-
-## v2.0.17-beta (2018-02-03)
-
-* Notifications:
-  * Fix: Unable to use @ mentions tags for Discord and Slack.
-  * New: Added Zapier notification agent.
-* API:
-  * Fix: get_synced_items returning no results.
-  * Fix: get_library_media_info returning incorrect media type for photo albums.
-  * Fix: get_library_media_info not being able to sort by title.
-
-
-## v2.0.16-beta (2018-01-30)
-
-* Monitoring:
-  * Fix: Timestamp sometimes showing as "0:60" on the activity cards.
-  * Fix: Incorrect session information being shown for playback of synced content.
-  * Fix: Sessions not being stopped when "Playback Stopped" notifications were enabled.
-* UI:
-  * Fix: Stream resolution showing up as "unknown" on the graphs.
-  * New: Added user filter to the Synced Items table.
-* Other:
-  * New: Option to use the Plex server update channel when checking for updates.
-
-
-## v2.0.15-beta (2018-01-27)
-
-* Monitoring:
-  * Fix: Live TV sessions not being stopped in History.
-  * Fix: Stream location showing as "unknown" on the activity cards.
-  * New: Improved Live TV details on the activity cards.
-* Notifications:
-  * New: Added labels and collections to notification parameters.
-  * New: Added more server details to notification parameters.
-  * Change: Renamed "PlexPy" update notification parameters to "Tautulli".
-
-
-## v2.0.14-beta (2018-01-20)
-
-* Monitoring:
-  * Change: Added "Cellular" bandwidth to "WAN" in activity header.
-* Notifications:
-  * Fix: Plex Web URL for tracks now go to the album page.
-  * Fix: Recently added notifications being sent for the entire library when DVR EPG data was refreshed.
-  * Fix: Notifier settings not loading with an apostrophe in the custom condition values.
-  * Fix: Custom email addresses not being saved when closing the notifier settings.
-  * Change: Re-enabled Browser notifications.
-  * Change: Renamed "PlexPy" update notification parameters to "Tautulli".
-  * Change: Emails no longer automatically insert HTML line breaks.
-  * Change: "Date" header added to email notifications.
-* UI:
-  * Change: Show all changelogs since the previous version when updating.
-
-
-## v2.0.13-beta (2018-01-13)
-
-* Notifications:
-  * New: Added dropdown selection for email addresses of shared users.
-  * New: Added more notification options for Join.
-  * Change: Show "OR" between custom condition values.
-* Other:
-  * New: Use JSON Web Tokens for authentication. Login now works with SSO applications.
-  * New: Allow the Plex server admin to login as a Tautulli admin using their Plex.tv account.
-
-
-## v2.0.12-beta (2018-01-07)
-
-* Notifications:
-  * Fix: Incorrect Plex URL parameter value.
-  * Change: Custom condition logic is now optional. An implicit "and" is applied between all conditions if the logic is blank.
-* UI:
-  * New: Added separate required LAN/WAN bandwidth in the activity header.
-* API:
-  * Fix: Notify API command not sending notifications.
-
-
-## v2.0.11-beta (2018-01-05)
-
-* Notifications:
-  * Fix: Some notification parameters showing up blank.
-* UI:
-  * Fix: Stream data showing up as "None" for pre-v2 history.
-* Other:
-  * Fix: Ability to login using the hashed password.
-
-
-## v2.0.10-beta (2018-01-04)
-
-* Monitoring:
-  * Fix: HW transcoding indicator on activity cards incorrect after refreshing.
-* Notifications:
-  * Remove: Notification toggles from library and user settings. Use custom conditions to filter out notifications instead.
-* UI:
-  * Fix: Incorrect examples for some date format options. Also added a few missing date format options. (Thanks @Tommatheussen)
-
-
-## v2.0.9-beta (2018-01-03)
-
-* Notifications:
-  * Fix: Notifications failing due to incorrect season/episode number types.
-
-
-## v2.0.8-beta (2018-01-03)
-
-* Monitoring:
-  * Fix: Incorrect HW transcoding indicator on activity cards.
-  * Fix: Long product/player names hidden behind platform icon on activity cards.
-* Notifications:
-  * Fix: Notifications failing due to some missing notification parameters.
-
-
-## v2.0.7-beta (2018-01-01)
-
-* Monitoring:
-  * Fix: Incorrect LAN/WAN location on activity cards.
-  * Fix: Paused time not recording correctly.
-* Other:
-  * Fix: Failed to retrieve synced items when there are special characters in the title.
-
-
-## v2.0.6-beta (2017-12-31)
-
-* Monitoring:
-  * New: Beta Plex Cloud support.
-  * Fix: Update paused time while still paused.
-* UI:
-  * Fix: Stopped time showing as "n/a" on history table.
-
-
-## v2.0.5-beta (2017-12-31)
-
-* Monitoring:
-  * Fix: IPv6 addresses overflowing on the activity cards.
-* Notifications:
-  * Fix: Error sending Join notifications.
-* UI:
-  * New: Added total required bandwidth in the activity header.
-* Other:
-  * Fix: Failing to retrieve releases from GitHub.
-  * Fix: CherryPy SSL connection warning. (Thanks @felixbuenemann)
-  * Fix: Sanitize script output in logs.
-  * Change: Login sessions persists across server restarts.
-
-
-## v2.0.4-beta (2017-12-29)
-
-* Monitoring:
-  * Fix: Current activity cards duplicating on the homepage.
-* Notifications:
-  * Fix: Concurrent stream notifications being sent when there is an incorrect number of streams.
-* UI:
-  * New: Info pages for collections.
-  * New: Button to test Plex Web URL override.
-  * Fix: Library and User pages return to the correct tab when pressing back.
-
-
-## v2.0.3-beta (2017-12-25)
-
-* Monitoring:
-  * Fix: Missing sync ID error causing logging to crash.
-  * Fix: Incorrect optimized version title column name causing logging to crash.
-* Notifications:
-  * Fix: Report correct beta version for Tautulli update notifications.
-* UI:
-  * Fix: Missing CSS for stream info modal.
-
-
-## v2.0.2-beta (2017-12-24)
-
-* Monitoring:
-  * Fix: Websocket connection fails to start with existing streams when upgrading to v2.
-  * Fix: Long request URI for refreshing current activity on the homepage.
-  * Fix: Missing subtitle database columns.
-  * Fix: Details for synced and optimized versions reporting incorrectly.
-* Notifications:
-  * Fix: Recently added notifications sending for previously added items. It is now limited to past 24 hours only.
-  * Fix: Source video/audio/subtitle parameters showing up as blank.
-  * Change: Validate condition logic when saving a notification agent.
-* API:
-  * Change: API is enabled by default on new installs.
-* UI:
-  * New: Add logo svg files. (Thanks @Fish2)
-  * New: Updated stream info modal.
-  * Change: Media info tables sort by sort title instead of title.
-* Other:
-  * Fix: Updating library IDs message on libraries page.
-  * Fix: Wtched percentage settings not saving after restart.
-  * Remove: Video Preview Thumbnails setting no longer used.
-  * Change: Add back HTTP Proxy setting under the Web Interface settings tab.
-  * Change: "Group Table and Watch Statistics History" and "Current Activity in History Tables" enabled by default on new installs.
-
-
-## v2.0.1-beta (2017-12-19)
-
-* Monitoring:
-  * Fix: Missing video_height database column.
-* Notifications:
-  * Fix: Join API key.
-  * Change: Temporarily disable broken browser notifications.
-* UI:
-  * Fix: Incorrect fallback image for music watch statistics.
-
-
-## v2.0.0-beta (2017-12-18)
-
-* Monitoring:
-  * New: More detailed stream info including subtitles, bitrates, bandwidth, and quality profiles.
-  * New: Terminate sessions from the current activity (Plex Pass only).
-  * Change: Monitoring uses websockets only now.
-* Notifications:
-  * New: Completely new notification system.
-    * Allow adding multiple of the same notification agent and/or duplicating existing notification agents.
-    * Each notification agent has it's own notification triggers and notification text.
-    * Notification agents are stored in the database instead of the config file. Some notification configurations may have been lost in the transfer. Sorry.
-  * New: Discord notification agent.
-  * New: GroupMe notification agent.
-  * New: MQTT notification agent.
-  * New: More customizable info cards for Discord, Facebook, Hipchat, and Slack.
-  * New: Script notifications are configured individually per script with separate arguments for each notification action.
-  * New: Icon and duration options for Plex Home Theater and XBMC notifications.
-  * New: Notification for Tautulli updates.
-  * New: Added &lt;show&gt;, &lt;season&gt;, &lt;artist&gt;, and &lt;album&gt; notification exclusion tags.
-    * &lt;tv&gt; is renamed to &lt;episode&gt;, and &lt;music&gt; is renamed to &lt;track&gt;
-  * New: Preview notification text in the notifier settings.
-  * New: Properly group recently added notifications when adding a batch of media.
-    * The {season_num}, {episode_num}, and {track_num} parameters will be substituted with the range (e.g. 06-10)
-  * New: Option to group recently added notifications by show/artist or season/album.
-  * New: More detailed media info (video, audio, subtitle, file, etc.) notification options available.
-  * New: Added notification text modifiers to change case and slice lists.
-  * New: Custom notification conditions using parameters to filter notifications.
-  * New: Button to trigger manual recently added notifications from the info pages.
-  * New: Lookup TVMaze and TheMovieDatabase links.
-  * Remove: The shared Imgur client ID has been removed. Please enter your own client ID in the settings to continue uploading posters.
-  * Change: Notifications with a blank subject or body will no longer be sent at all.
-  * Change: Line breaks inserted automatically in Email notification text.
-  * Change: Notifications for season/episodes now use the season poster and album/track now use the album art.
-  * Change: The {action} parameter is no longer capitalized.
-  * Change: Notification success or failure added to notification logs.
-* API:
-  * New: Added check for Plex Media Server updates with the Tautulli API.
-  * New: Added show/artist and episode/track titles to the "get_history" API command.
-  * New: Added manual trigger for recently added notifications.
-  * Remove: Defunct API v1.
-  * Change: The "notify" API command now requires a notifier_id instead of an agent_id. The notifier ID can be found in the settings for each notification agent.
-  * Change: The returned json for the "get_metadata" API command is no longer nested under the "metadata" key.
-* UI:
-  * New: Updated current activity, watch statistics, and library statistics cards on the home page.
-  * New: Toggle stats and recently added categories directly on the homepage.
-  * New: Ability to delete synced items from the Synced Items page.
-  * New: Updated platform icons to a uniform style.
-  * Remove: Setting for number of top items for watch statistic cards.
-  * Change: Separate API and websocket logs.
-* Android Tautulli Remote App (beta):
-  * New: Download the Tautulli Remote app on Google Play!
-    * Link the app using a QR code in the Tautulli settings.
-  * New: Push notifications directly to the Tautulli Remote app.
-* Other:
-  * New: Option to update Tautulli automatically when an update is available.
-  * New: Option to switch the tracking git remote and branch.
-  * New: Option to change the path to your git environment variable.
-  * New: Option to use a HTTPS certificate chain.
-  * New: Option to override the Plex Web URL for click-through links.
-  * New: Separate watched percentage for movies, episodes, and tracks.
-  * New: Show changelog after updating Tautulli.
-  * New: Support for IPv6 geolocation lookup.
-  * New: Download the Tautulli configuration file or database from the settings.
-  * New: Log failed Tautulli login attempts.
-  * Fix: Modal popups not working on mobile Safari.
-  * Fix: Prevent password managers from autofilling the password in the settings.
-  * Fix: Unable to search with special characters.
-  * Remove: Some unused options have been removed from the settings page.
-  * Change: The database schema has been changed, and reverting back to PlexPy v1 will not work.
-  * Change: The dev branch has been depreciated. A master/beta/nightly system is used instead.
-
-  
-## v1.4.25 (2017-10-02)
-
-* Fix: Tab instead of spaces preventing startup.
-
-
-## v1.4.24 (2017-10-01)
-
-* Fix: New Plex Web urls. (Thanks @Joshua1337)
-* Fix: Fallback to the product name if the player title is blank.
-* New: Added no forking option to startup arguments. (Thanks @Vashypooh)
-
-
-## v1.4.23 (2017-09-30)
-
-* Fix: Playstation 4 platform name.
-* Fix: PlexWatch and Plexivity import.
-* Fix: Pushbullet authorization header.
-
-
-## v1.4.22 (2017-08-19)
-
-* Fix: Cleaning up of old config backups.
-* Fix: Temporary fix for incorrect source media info.
-
-
-## v1.4.21 (2017-07-01)
-
-* New: Updated donation methods.
-
-
-## v1.4.20 (2017-06-24)
-
-* New: Added platform image for the PlexTogether player.
-* Fix: Corrected math used to calculate human duration. (Thanks @senepa)
-* Fix: Sorting of 4k in media info tables.
-* Fix: Update file sizes when refreshing media info tables.
-* Fix: Support a custom port for Mattermost (Slack) notifications.
-
-
-## v1.4.19 (2017-05-31)
-
-* Fix: Video resolution not showing up for transcoded streams on PMS 1.7.x.
-
-
-## v1.4.18 (2017-04-22)
-
-* New: Added some new Arnold quotes. (Thanks @senepa)
-* Fix: Text wrapping in datatable footers.
-* Fix: API command get_apikey. (Thanks @Hellowlol)
-
-
-## v1.4.17 (2017-03-04)
-
-* New: Configurable month range for the Plays by month graph. (Thanks @Pbaboe)
-* New: Option to chanage the week to start on Monday for the the Plays by day of week graph. (Thanks @Pbaboe)
-* Fix: Invalid iOS icon file paths. (Thanks @demonbane)
-* Fix: Plex Web 3.0 URLs on info pages and notifications.
-* Fix: Update bitcoin donation link to Coinbase.
-* Fix: Update init scripts. (Thanks @ampsonic)
-
-
-## v1.4.16 (2016-11-25)
-
-* Fix: Websocket for new json response on PMS 1.3.0.
-* Fix: Update stream and transcoder tooltip percent.
-* Fix: Typo in the edit user modal.
-
-
-## v1.4.15 (2016-11-11)
-
-* New: Add stream and transcoder progress percent to the current activity tooltip.
-* Fix: Refreshing of images in the cache when authentication is disabled.
-* Fix: Plex.tv authentication with special characters in the username or password.
-* Fix: Line breaks in the info page summaries.
-* Fix: Redirect to the proper http root when restarting.
-* Fix: API result type and responses showing incorrectly. (Thanks @Hellowlol)
-* Change: Use https URL for app.plex.tv.
-* Change: Show API traceback errors in the browser with debugging enabled. (Thanks @Hellowlol)
-* Change: Increase table width on mobile devices and max width set to 1750px. (Thanks @XusBadia)
-
-
-## v1.4.14 (2016-10-12)
-
-* Fix: History logging locking up if media is removed from Plex before PlexPy can save the session.
-* Fix: Unable to save API key in the settings.
-* Fix: Some typos in the settings. (Thanks @Leafar3456)
-* Change: Disable script timeout by setting timeout to 0 seconds.
-
-
-## v1.4.13 (2016-10-08)
-
-* New: Option to set the number of days to keep PlexPy backups.
-* New: Option to add a supplementary url to Pushover notifications.
-* New: Option to set a timeout duration for script notifications.
-* New: Added flush temporary sessions button to extra settings for emergency use.
-* New: Added pms_image_proxy to the API.
-* Fix: Insanely long play durations being recorded when connection to the Plex server is lost.
-* Fix: Script notification output not being sent to the logger.
-* Fix: New libraries not being added to homepage automatically.
-* Fix: Success message shown incorrectly when sending a test notification.
-* Fix: PlexPy log level filter not working.
-* Fix: Admin username not shown in login logs.
-* Fix: FeatHub link in readme document.
-* Change: Posters disabled by default for all notification agents.
-* Change: Disable manual changing of the PlexPy API key.
-* Change: Force refresh the Plex.tv token when fetching a new token.
-* Change: Script notifications run in a new thread with the timeout setting.
-* Change: Watched percent moved to general settings.
-* Change: Use human readable file sizes to the media info tables. (Thanks @logaritmisk)
-* Change: Update pytz library.
-
-
-## v1.4.12 (2016-09-18)
-
-* Fix: PMS update check not working for MacOSX.
-* Fix: Square covers for music stats on homepage.
-* Fix: Card width on the homepage for iPhone 6/7 Plus. (Thanks @XusBadia)
-* Fix: Check for running PID when starting PlexPy. (Thanks @spolyack)
-* Fix: FreeBSD service script not stopping PlexPy properly.
-* Fix: Some web UI cleanup.
-* Change: GitHub repostitory moved.
-
-
-## v1.4.11 (2016-09-02)
-
-* Fix: PlexWatch and Plexivity import errors.
-* Fix: Searching in history datatables.
-* Fix: Notifications not sending for Local user.
-
-
-## v1.4.10 (2016-08-15)
-
-* Fix: Missing python ipaddress module preventing PlexPy from starting.
-
-
-## v1.4.9 (2016-08-14)
-
-* New: Option to include current activity in the history tables.
-* New: ISP lookup info in the IP address modal.
-* New: Option to disable web page previews for Telegram notifications.
-* Fix: Send correct JSON header for Slack/Mattermost notifications.
-* Fix: Twitter and Facebook test notifications incorrectly showing as "failed".
-* Fix: Current activity progress bars extending past 100%.
-* Fix: Typo in the setup wizard. (Thanks @wopian)
-* Fix: Update PMS server version before checking for a new update.
-* Change: Compare distro and build when checking for server updates.
-* Change: Nicer y-axis intervals when viewing "Play Duration" graphs.
-
-
-## v1.4.8 (2016-07-16)
-
-* New: Setting to specify PlexPy backup interval.
-* Fix: User Concurrent Streams Notifications by IP Address checkbox not working.
-* Fix: Substitute {update_version} in fallback PMS update notification text.
-* Fix: Check version for automatic IP logging setting.
-* Fix: Use library refresh interval.
-
-
-## v1.4.7 (2016-07-14)
-
-* New: Use MaxMind GeoLite2 for IP address lookup.
-  * Note: The GeoLite2 database must be installed from the settings page.
-* New: Check for Plex updates using plex.tv downloads instead of the server API.
-  * Note: Check for Plex updates has been disabled and must be re-enabled in the settings.
-* New: More notification options for Plex updates.
-* New: Notifications for concurrent streams by a single user.
-* New: Notifications for user streaming from a new device.
-* New: HipChat notification agent. (Thanks @aboron)
-* Fix: Username showing as blank when friendly name is blank.
-* Fix: Direct stream count wrong in the current activity header.
-* Fix: Current activity reporting direct stream when reducing the stream quality switches to transcoding.
-* Fix: Apostophe in an Arnold quote causing the shutdown/restart page to crash.
-* Fix: Disable refreshing posters in guest mode.
-* Fix: PlexWatch/Plexivity import unable to select the "grouped" database table.
-* Change: Updated Facebook notification instructions.
-* Change: Subject line optional for Join notifications.
-* Change: Line break between subject and body text instead of a colon for Facebook, Slack, Twitter, and Telegram.
-* Change: Allow Mattermost notifications using the Slack config.
-* Change: Better formatting for Slack poster notifications.
-* Change: Telegram only notifies once instead of twice when posters are enabled.
-* Change: Host Open Sans font locally instead of querying Google Fonts.
-
-
-## v1.4.6 (2016-06-11)
-
-* New: Added User and Library statistics to the API.
-* New: Ability to refresh individual poster images without clearing the entire cache. (Thanks @Hellowlol)
-* New: Added {added_date}, {updated_date}, and {last_viewed_date} to metadata notification options.
-* New: Log level filter for Plex logs. (Thanks @sanderploegsma)
-* New: Log level filter for PlexPy logs.
-* New: Button to download Plex logs directly from the web interface.
-* New: Advanced setting in the config file to change the number of Plex log lines retrieved.
-* Fix: FreeBSD and FreeNAS init scripts to reflect the path in the installation guide. (Thanks @nortron)
-* Fix: Monitoring crashing when failed to retrieve current activity.
-
-
-## v1.4.5 (2016-05-25)
-
-* Fix: PlexPy unable to start if failed to get shared libraries for a user.
-* Fix: Matching port number when retrieving the PMS url.
-* Fix: Extract mapped IPv4 address in Plexivity import.
-* Change: Revert back to internal url when retrieving PMS images.
-
-
-## v1.4.4 (2016-05-24)
-
-* Fix: Image queries crashing the PMS when playing clips from channels.
-* Fix: Plexivity import if IP address is missing.
-* Fix: Tooltips shown behind the datatable headers.
-* Fix: Current activity instances rendered in a random order causing them to jump around.
-
-
-## v1.4.3 (2016-05-22)
-
-* Fix: PlexPy not starting without any authentication method.
-
-
-## v1.4.2 (2016-05-22)
-
-* New: Option to use HTTP basic authentication instead of the HTML login form.
-* Fix: Unable to save settings when enabling the HTTP proxy setting.
-* Change: Match the PMS port when retrieving the PMS url.
-
-
-## v1.4.1 (2016-05-20)
-
-* New: HTTP Proxy checkbox in the settings. Enable this if using an SSL enabled reverse proxy in front of PlexPy.
-* Fix: Check for blank username/password on login.
-* Fix: Persist current activity artwork blur across refreshes when transcoding details are visible.
-* Fix: Send notifications to multiple XBMC/Plex Home Theater devices.
-* Fix: Reset PMS identifier when clicking verify server button in settings.
-* Fix: Crash when trying to group current activity session in database.
-* Fix: Check current activity returns sessions when refreshing.
-* Fix: Logs sorted out of order.
-* Fix: Resolution reported incorrectly in the stream info modal.
-* Fix: PlexPy crashing when hashing password in the config file.
-* Fix: CherryPy doubling the port number when accessing PlexPy locally with http_proxy enabled.
-* Change: Sort by most recent for ties in watch statistics.
-* Change: Refresh Join devices when changing the API key.
-* Change: Format the Join device IDs.
-* Change: Join notifications now sent with Python Requests module.
-* Change: Add paging for recently added in the API.
-
-
-## v1.4.0 (2016-05-15)
-
-* New: An HTML form login page with sessions support.
-* New: Guest access control for shared users using Plex.tv authentication.
-  * Enable the option in the settings and toggle guest access per user from Users > Edit mode.
-  * Guests can only view their own user data. Other user info is removed/masked.
-  * Guests can only view media from libraries that are shared with them (content rating and label filters are respected). Other libraries are removed/masked.
-  * All settings and admin controls are restricted from guests.
-  * All current activity on the server is shown, but with masked user/metadata info.
-* New: Login logs table on the User and Logs pages.
-* New: Filter the history table by user.
-* New: Filter the graphs by user. (Thanks @Otger)
-* New: Option to hash the admin passowrd in the config file.
-* New: Options to enable/disable/rearrange each section on the homepage
-* New: Toggle media types for recently added items on the homepage.
-* New: Option to enter an Imgur API client ID for uploading posters.
-  * Note: The shared Imgur client id will be removed in a future PlexPy update! Please enter your own client id in the settings to continue uploading posters!
-* New: HTML support for Email.
-* New: Posters and HTML support for Telegram.
-* New: Poster support for Slack.
-* New: Poster support for Twitter.
-* New: Re-added Plex Home Theater notification agent.
-* New: Browser notification agent (experimental).
-* New: Added {plex_url} as a notification option.
-* New: Added transcode decision to the activity header.
-* New: Documentation for APIv2 (see API.md for details).
-* New: Import a Plexivity database into PlexPy.
-* New: Prettier fallback image for art/episodes.
-* New: Prettier confirm modal dialogues.
-* New: Cache images to reduce Plex API calls. This can be disabled in the under Settings > Extra Settings. (Thanks @Hellowlol)
-* New: Scheduled backups of the config file.
-* New: Button to clear the PlexPy cache/images in the settings.
-* New: Button to manually backup the PlexPy database/config in the settings.
-* New: Button to clear the PlexPy logs in the settings.
-* New: Button to download PlexPy log file on the Logs tab.
-* New: Advanced setting in config file to change the Plex API timeout value.
-* Fix: Mixed content HTTP request in settings (for reverse proxies with SSL).
-* Fix: Rename recently "watched" music to "played".
-* Change: Current activity details now persists across refreshes.
-* Change: Smoother transitions between preview thumbnails in current activity.
-* Change: Datatables now display all columns and scroll horizontally on smaller screens.
-* Change: Ability to change the base URL for reverse proxies in the web interface.
-* Change: Added a "Verify Server" button in the settings.
-* Change: Added request status code in the logs for notifer errors.
-* Change: Remove in-memory logs and read lines from log file instead. (Thanks @Hellowlol)
-* Change: Limit number of failed attempts to write sessions to history. Default is 5 attempts.
-* Change: A bunch of UI updates.
-* Change: A bunch of backend code cleanup.
-* Removed: All unused Python packages.
-
-
-## v1.3.16 (2016-05-01)
-
-* Fix: Viewing photos crashing PlexPy.
-* Fix: Persist Users > Edit mode on datatable page change.
-* Fix: PMS update notifications broken.
-* Change: Cache notifications poster with thread ID to avoid overwritting images.
-
-
-## v1.3.15 (2016-04-18)
-
-* Fix: Slack notifications failing when using and icon URL.
-* Fix: 127.0.0.1 showing as an external IP address on the history tables.
-* Fix: Regression file sizes not shown in the media info table footer.
-* Fix: Retrieving proper PMS URL when multiple connections are published to plex.tv.
-* Fix: Some typos in the logger.
-* Fix: Some other typos in the WebUI. (Thanks @xtjoeytx)
-* Change: Optimized mobile web app icons and spash screens. (Thanks @alotufo)
-
-
-## v1.3.14 (2016-03-29)
-
-* Fix: Regression for missing notify_action for script notifications.
-* Fix: Typo for home stats cards in the settings.
-
-
-## v1.3.13 (2016-03-27)
-
-* Fix: Only mask strings longer than 5 characters in logs.
-
-
-## v1.3.12 (2016-03-27)
-
-* Fix: "Check GitHub for updates" not rescheduling when toggling setting.
-* Fix: Bug where notifications would fail if metadata is not found.
-* Fix: Bug where notifications would fail if unable to upload poster to Imgur.
-* Fix: PlexPy will now start properly for different Python environment variables.
-* New: Feature requests moved to FeatHub.
-* New: Ability to specify a GitHub API token for updates (optional).
-* New: Mask out sensitive information from the logs.
-* New: New and updated Arnold quotes. (Thanks @Vilsol & @Chrisophogus)
-* New: "First" and "Last" page buttons to datatables.
-* New: Access log file from the "Help & Info" page.
-* New: CherryPy environment options (for development). (Thanks @codedecay)
-* New: PlexPy development environment (for development only).
-* Change: Facebook posts with a posters now include a summary.
-* Change: Facebook posts now use a default poster if the poster is not found or unable to upload to Imgur.
-* Change: IFTTT events can be fromatted with the {action} name.
-* Change: Logs now use ISO date format to avoid locale encoding errors. (Thanks @alshain)
-* Remove: Non-functioning Plex notification agent.
-
-
-## v1.3.11 (2016-03-15)
-
-* Fix: Typo preventing history logging for websockets.
-
-
-## v1.3.10 (2016-03-12)
-
-* Fix: Actually allow HTML tags for Pushover.
-* Fix: PlexPy not restarting on Windows if there is a space in the folder path.
-* Fix: Reconnect websocket when changing PMS SSL setting.
-* Fix: Datatables not loading when view_offset or duration is blank.
-* Fix: Bug when checking the PMS version in the settings.
-* Fix: Auto-refreshing of log tables.
-* Fix: Logging of IPv6 addresses. (PMS version >0.9.14 only.)
-* Fix: Hide days selection from the Play Totals graph page.
-* Fix: PlexPy overwriting user's own SSL certificate/key.
-* Fix: Multiple watched notifications when using websocket.
-* Fix: Some missing python library imports.
-* Fix: Some typos in settings and PlexWatch importer.
-* New: Ability to get notified of PMS updates.
-* New: Ability to disable the link to Plex Web with Facebook notifications and use IMDB, TVDB, TMDb, or Last.fm instead.
-* New: Ability to reset Imgur poster url from the info page if the poster is changed.
-* New: Tooltips on the current activity progress bars.
-* New: Side scrolling of Recently Added/Recently Played items.
-* New: Document all date/time format options.
-* New: Button to clear notification logs.
-* New: Customizable backup, cache, and log directories.
-* Change: Retry writing sessions to history if it fails, so sessions don't get lost. (Activity pinger only, not availble for websocket.)
-* Change: Save any unknown sessions to the "Local" user.
-* Change: History table modal is filtered depending on which graph series is clicked.
-* Change: Revert back to saving the state of datatables (search, sorting, entries per page, etc.).
-* Change: Newlines are not longer stripped from notification text which allows for finer control of how notifications look.
-* Change: Updated FreeNAS/FreeBSD init scripts. (Must have updated jails.) (Thanks @chiviak)
-
-
-## v1.3.9 (2016-02-21)
-
-* Fix: Recently added notification not sent to all notification agents.
-* New: Pushover HTML support. (Thanks @elseym)
-
-
-## v1.3.8 (2016-02-21)
-
-* Fix: Regression unable to clear HTTP password.
-* Fix: Remove media tags from script arguments for server notifications.
-* Fix: Encode poster titles to UTF-8 for Imgur upload.
-* Fix: Allow notifications to send without poster if Imgur upload fails.
-* New: Notification Logs table in the Logs tab.
-* New: Toggle in settings to enable posters in notifications. (Disabled by default.)
-* Change: Save Imgur poster URL to database so upload is not needed every time.
-* Change: Notify log in database to log each event as a separate entry.
-* Change: Monitor remote access is unchecked if remote access is disabled on server.
-
-
-## v1.3.7 (2016-02-20)
-
-* Fix: Verifying server with SSL enabled.
-* Fix: Regression where {stream_duration} reported as 0.
-* Fix: Video metadata flags showing up for track info.
-* Fix: Custom library icons not applied to Library Statistics.
-* Fix: Typos in the Web UI.
-* New: ETA to Current Activity overlay.
-* New: Total duration to Libraries and Users tables.
-* New: {machine_id} to notification options.
-* New: IMDB, TVDB, TMDb, Last.fm, and Trackt IDs/URLs to notification options.
-* New: {poster_url} to notification options using Imgur.
-* New: Poster and link for Facebook notifications.
-* New: Log javascript errors from the Web UI.
-* New: Configuration and Scheduler info to the settings page.
-* New: Schedule background task to backup the PlexPy database.
-* New: URL anonymizer for external links.
-* New: Plex Media Scanner log file to Log viewer.
-* New: API v2 (sill very experimental). (Thanks @Hellowlol)
-* Change: Allow secure websocket connections.
-* Change: History grouping now accounts for the view offset.
-* Change: Subject line can be toggled off for Facebook, Slack, Telegram, and Twitter.
-* Change: Create self-signed SSL certificates when enabling HTTPS.
-* Change: Revert homepage "Last Played" to "Last Watched".
-* Change: Disable monitor remote access checkbox if remote access is not enabled on the PMS.
-* Change: Disable IP logging checkbox if PMS version is 0.9.14 or greater.
-
-
-## v1.3.6 (2016-02-03)
-
-* Fix: Regression where {duration} not reported in minutes.
-* Fix: Proper daemonizing in FreeBSD and FreeNAS init scripts.
-* Change: Update readme documentation.
-
-
-## v1.3.5 (2016-02-02)
-
-* Fix: Removing unique constraints from database.
-* Fix: Unable to expand media info table when missing "Added At" date.
-* Fix: Server verification for unpublished servers.
-* Fix: Updating PMS identifier for server change.
-* New: {stream_time}, {remaining_time}, and {progress_time} to notification options.
-* New: Powershell script support. (Thanks @Hellowlol)
-* New: Method to delete duplicate libraries.
-* Change: Daemonize before running start up tasks.
-
-
-## v1.3.4 (2016-01-29)
-
-* Fix: Activity checker not starting with library update (history not logging).
-* Fix: Libraries duplicated in database.
-* Fix: Buffer notifications even when disabled when using websockets.
-* Fix: Libraries and Users lists not refreshing.
-* Fix: Server verification in settings.
-* Fix: Empty libraries not added to database.
-* New: Unique identifiers to notification options.
-* Remove: Requirement of media type toggles for recently added notifications.
-* Remove: Built in Twitter key and secret.
-* Change: Unnecessary quoting of script arguments.
-* Change: Facebook notification instructions.
-
-
-## v1.3.3 (2016-01-26)
-
-* Fix: Plays by Month graph not loading.
-* Change: Disable caching for datatables.
-* Change: Improved updating library data in the database again.
-
-
-## v1.3.2 (2016-01-24)
-
-* Fix: 'datestamp' and 'timestamp' for server notifications.
-* Change: New method for updating library data in database.
-
-
-## v1.3.1 (2016-01-23)
-
-* Fix: Notifiers authorization popups for reverse proxies.
-* Fix: Empty brackets in titles on tables.
-* Fix: Star rating overlapping text.
-* Fix: Unable to startup when library refresh fails.
-* Fix: Unable to parse 'datestamp' and 'timestamp' format.
-* Change: Rename "Last Watched" to "Last Played".
-* Change: More descriptive libraries updating message.
-
-
-## v1.3.0 (2016-01-23)
-
-* New: Brand new Libraries section.
-* New: Lots of new library statistics.
-* New: Media info table for libraries.
-* New: Web app for Android and iOS. (Thanks @zobe123)
-* New: Slack notification agent. (Thanks @richipargo)
-* New: Facebook notification agent.
-* New: Custom script notification agent. (Thanks @Hellowlol)
-* New: Custom "From Name" to email notification agent.
-* New: Ability to test notifications / send custom one-off notifications.
-* New: 'datestamp' and 'timestamp' notification options.
-* New: More concurrent stream statistics.
-* New: Media info flags on the info pages.
-* New: Ability to fix broken metadata if the item has been moved in Plex.
-* New: Ability to rearrange the homepage statistics cards.
-* New: CentOS startup script (Thanks @PHoSawyer)
-* Fix: Server name blank after first run wizard.
-* Fix: Incorrect duration for grouped home stats.
-* Fix: Allow SSL when verifying server in settings.
-* Fix: Metadata for grouped recently added notifications.
-* Fix: Unable to access settings with missing changelog file.
-* Fix: Month name localization on play totals graphs.
-* Fix: Get new PMS identifier when changing servers.
-* Fix: Websocket log spam when there is no active session.
-* Fix: Logs and cache folder not created in the data directory.
-* Fix: Title links on sync table.
-* Fix: Other various minor bugs and graphical glitches.
-* Change: Prettier thumbnail popovers on tables.
-* Change: Star ratings to use css/font-awesome.
-* Change: More detailed logging info to warnings and errors.
-* Change: Better PlexPy process restart handling (Thanks @jackwilsdon)
-* Change: Massive behind the scenes code cleanup.
-* Remove: Built in Pushover API token (User's own API token is now required).
-
-
-## v1.2.16 (2015-12-22)
-
-* Fix Most Concurrent stream stat for emtpy databases
-* Change logs to 50 lines by default
-
-
-## v1.2.15 (2015-12-20)
-
-* Fix navbar covering current activity on smaller screens.
-* Fix metadata for grouped recently added notifications.
-* Fix Growl notification agent not working.
-* Change graph days selection.
-* Change watch statistics to match table history grouping.
-* Add automatic discovery of Pushbullet devices.
-* Add Most Concurrent Streams watch statistic.
-* Add precentage to current activity progress bars.
-* Add a bunch of stream details to notification options.
-* Add notification for Plex Remote Access/Plex Media Server back up.
-* Add CC/BCC and multiple recipients to email notification agent.
-* Add total watch time to history table footer.
-
-
-## v1.2.14 (2015-12-07)
-
-* Fix regression with PlexWatch db importer and buffer warnings.
-
-
-## v1.2.13 (2015-12-06)
-
-* Fix match newlines between tags in notification text.
-* Fix current activity not showing on PMS 0.9.12.
-
-
-## v1.2.12 (2015-12-06)
-
-* Fix for "too many open files" error.
-
-
-## v1.2.11 (2015-12-06)
-
-* Fix more regressions (sorry).
-
-
-## v1.2.10 (2015-12-06)
-
-* Fix broken count graphs regression.
-
-
-## v1.2.9 (2015-12-06)
-
-* Fix and improve text sanitization.
-
-
-## v1.2.8 (2015-12-06)
-
-* Fix sanitize player names
-* Fix recently added notification delay
-* Fix recently added metadata queries
-* Fix multiple lines in notification body text
-* Fix UTF-8 encoding in Prowl notifications subject line
-* Change to only log IPv4 addresses
-* Add global toggle for recently added notifcations
-* Add feature to delete users
-* Add channel support for Telegram notification agent
-* Add icon for Apple tvOS
-* Add icon for Microsoft Edge
-
-
-## v1.2.7 (2015-11-27)
-
-* Fix IP address option in notifications
-
-
-## v1.2.6 (2015-11-27)
-
-* Fixes for IP logging in PMS < 0.9.14.x.
-* Fix issue in plexWatch importer when trying to import item with no ratingKey.
-
-
-## v1.2.5 (2015-11-25)
-
-* Add video_decision and audio_decision to notification options
-* Fix IP address logging
-* Fix log spam if notifications disabled 
-
-
-## v1.2.4 (2015-11-24)
-
-* Add filtering by media type in the history table
-* Add IFTTT notification agent
-* Add Telegram notification agent
-* Add notifications for recently added media
-* Add notifications for server down and remote access down
-* Add more metadata to notifications options
-* Add IP address to notification options (for PMS 0.9.14 and above)
-* Add server uptime to notification options
-* Add IP address to current activity
-* Add IPv6 address logging
-* Add PMS server name to the page title
-* Fix bug in "Last Watched" statistic
-* Fix bug in search query
-* Fix bug on user pages for usernames with single quotes
-* Fix name for new Plex Media Center
-* Fix Pushover notifications with unicode characters
-* Fix bug with showing old usernames in datatables
-* Fix bug with "Please verify your server" in settings
-* Change IP lookup provider
-* Change notifications custom body text to larger text box
-* Change movie/tv logging and notifications into individual options
-
-
-## v1.2.3 (2015-10-18)
-
-* Added "remaining time" as notification substitution.
-* Fix bug on home stats cards.
-* Fix visual bug on user page.
-
-
 ## v1.2.2 (2015-10-12)
 
 * Add server discovery on first run.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 46a644e5..146b1cfe 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,20 +1,28 @@
-# Contributing to Tautulli
+# Contributing to PlexPy
+
+## Issues
+In case you read this because you are posting an issue, please take a minute and conside the things below. The issue tracker is not a support forum. It is primarily intended to submit bugs, improvements or feature requests. However, we are glad to help you, and make sure the problem is not caused by PlexPy, but don't expect step-by-step answers.
+
+* Use the search function. Chances are that your problem is already discussed. Do not append to (closed) issues if your problem does not fit the discussion.
+* Visit the [Troubleshooting](../../wiki/TroubleShooting) wiki first.
+* Use [proper formatting](https://help.github.com/articles/github-flavored-markdown/). Paste your logs in code blocks.
+* Close your issue if you resolved it.
 
 ## Pull Requests
-If you think you can contribute code to the Tautulli repository, do not hesitate to submit a pull request.
+If you think you can contribute code to the PlexPy repository, do not hesitate to submit a pull request.
 
 ### Branches
-All pull requests should be based on the `nightly` branch, to minimize cross merges. When you want to develop a new feature, clone the repository with `git clone origin/nightly -b FEATURE_NAME`. Use meaningful commit messages.
+All pull requests should be based on the `dev` branch, to minimize cross merges. When you want to develop a new feature, clone the repository with `git clone origin/dev -b FEATURE_NAME`. Use meaningful commit messages.
 
 ### Python Code
 
 #### Compatibility
-The code should work with Python 3.8+. Note that Tautulli runs on many different platforms.
+The code should work with Python 2.6 and 2.7. Note that PlexPy runs on different platforms, including Network Attached Storage devices such as Synology.
 
 Re-use existing code. Do not hesitate to add logging in your code. You can the logger module `plexpy.logger.*` for this. Web requests are invoked via `plexpy.request.*` and derived ones. Use these methods to automatically add proper and meaningful error handling.
 
 #### Code conventions
-Although Tautulli did not adopt a code convention in the past, we try to follow [PEP8](http://legacy.python.org/dev/peps/pep-0008/) conventions for future code. A short summary to remind you (copied from http://wiki.ros.org/PyStyleGuide):
+Although PlexPy did not adapt a code convention in the past, we try to follow the [PEP8](http://legacy.python.org/dev/peps/pep-0008/) conventions for future code. A short summary to remind you (copied from http://wiki.ros.org/PyStyleGuide):
 
  * 4 space indentation
  * 80 characters per line
@@ -29,13 +37,16 @@ Although Tautulli did not adopt a code convention in the past, we try to follow
 #### Documentation
 Document your code. Use docstrings See [PEP-257](https://www.python.org/dev/peps/pep-0257/) for more information.
 
+#### Continuous Integration
+PlexPy has a configuration file for [travis-ci](https://travis-ci.org/). You can add your forked repo to Travis to have it check your code against PEP8, PyLint, and PyFlakes for you. Your pull request will show a green check mark or a red cross on each tested commit, depending on if linting passes.
+
 ### HTML/Template code
 
 #### Compatibility
-HTML5 compatible browsers are targeted.
+HTML5 compatible browsers are targetted. There is no specific mobile version of PlexPy yet.
 
 #### Conventions
 * 4 space indentation
 * `methodName`
 * `variableName`
-* `ClassName`
+* `ClassName`
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 8d8c324b..00000000
--- a/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM ghcr.io/tautulli/tautulli-baseimage:python3
-
-LABEL maintainer="Tautulli"
-
-ARG BRANCH
-ARG COMMIT
-
-ENV TAUTULLI_DOCKER=True
-ENV TZ=UTC
-
-WORKDIR /app
-COPY . /app
-RUN \
-  groupadd -g 1000 tautulli && \
-  useradd -u 1000 -g 1000 tautulli && \
-  echo ${BRANCH} > /app/branch.txt && \
-  echo ${COMMIT} > /app/version.txt
-
-RUN \
-  mkdir /config && \
-  touch /config/DOCKER
-VOLUME /config
-
-CMD [ "python", "Tautulli.py", "--datadir", "/config" ]
-ENTRYPOINT [ "./start.sh" ]
-
-EXPOSE 8181
-HEALTHCHECK --start-period=90s CMD curl -ILfks https://localhost:8181/status > /dev/null || curl -ILfs http://localhost:8181/status > /dev/null || exit 1
diff --git a/PlexPy.py b/PlexPy.py
index eb9ceea4..cafb7804 100755
--- a/PlexPy.py
+++ b/PlexPy.py
@@ -1,24 +1,232 @@
 #!/usr/bin/env python
-
 # -*- coding: utf-8 -*-
 
-# This file is part of Tautulli.
+# This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
-from Tautulli import main
+import os
+import sys
 
-# Call main() from Tautulli.py
+# Ensure lib added to path, before any other imports
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'lib/'))
+
+from plexpy import webstart, logger, web_socket
+
+import locale
+import time
+import signal
+import argparse
+import plexpy
+
+# Register signals, such as CTRL + C
+signal.signal(signal.SIGINT, plexpy.sig_handler)
+signal.signal(signal.SIGTERM, plexpy.sig_handler)
+
+
+def main():
+    """
+    PlexPy application entry point. Parses arguments, setups encoding and
+    initializes the application.
+    """
+
+    # Fixed paths to PlexPy
+    if hasattr(sys, 'frozen'):
+        plexpy.FULL_PATH = os.path.abspath(sys.executable)
+    else:
+        plexpy.FULL_PATH = os.path.abspath(__file__)
+
+    plexpy.PROG_DIR = os.path.dirname(plexpy.FULL_PATH)
+    plexpy.ARGS = sys.argv[1:]
+
+    # From sickbeard
+    plexpy.SYS_PLATFORM = sys.platform
+    plexpy.SYS_ENCODING = None
+
+    try:
+        locale.setlocale(locale.LC_ALL, "")
+        plexpy.SYS_ENCODING = locale.getpreferredencoding()
+    except (locale.Error, IOError):
+        pass
+
+    # for OSes that are poorly configured I'll just force UTF-8
+    if not plexpy.SYS_ENCODING or plexpy.SYS_ENCODING in ('ANSI_X3.4-1968', 'US-ASCII', 'ASCII'):
+        plexpy.SYS_ENCODING = 'UTF-8'
+
+    # Set up and gather command line arguments
+    parser = argparse.ArgumentParser(
+        description='A Python based monitoring and tracking tool for Plex Media Server.')
+
+    parser.add_argument(
+        '-v', '--verbose', action='store_true', help='Increase console logging verbosity')
+    parser.add_argument(
+        '-q', '--quiet', action='store_true', help='Turn off console logging')
+    parser.add_argument(
+        '-d', '--daemon', action='store_true', help='Run as a daemon')
+    parser.add_argument(
+        '-p', '--port', type=int, help='Force PlexPy to run on a specified port')
+    parser.add_argument(
+        '--datadir', help='Specify a directory where to store your data files')
+    parser.add_argument('--config', help='Specify a config file to use')
+    parser.add_argument('--nolaunch', action='store_true',
+                        help='Prevent browser from launching on startup')
+    parser.add_argument(
+        '--pidfile', help='Create a pid file (only relevant when running as a daemon)')
+
+    args = parser.parse_args()
+
+    if args.verbose:
+        plexpy.VERBOSE = True
+    if args.quiet:
+        plexpy.QUIET = True
+
+    # Do an intial setup of the logger.
+    logger.initLogger(console=not plexpy.QUIET, log_dir=False,
+                      verbose=plexpy.VERBOSE)
+
+    if args.daemon:
+        if sys.platform == 'win32':
+            sys.stderr.write(
+                "Daemonizing not supported under Windows, starting normally\n")
+        else:
+            plexpy.DAEMON = True
+            plexpy.QUIET = True
+
+    if args.pidfile:
+        plexpy.PIDFILE = str(args.pidfile)
+
+        # If the pidfile already exists, plexpy may still be running, so
+        # exit
+        if os.path.exists(plexpy.PIDFILE):
+            raise SystemExit("PID file '%s' already exists. Exiting." %
+                             plexpy.PIDFILE)
+
+        # The pidfile is only useful in daemon mode, make sure we can write the
+        # file properly
+        if plexpy.DAEMON:
+            plexpy.CREATEPID = True
+
+            try:
+                with open(plexpy.PIDFILE, 'w') as fp:
+                    fp.write("pid\n")
+            except IOError as e:
+                raise SystemExit("Unable to write PID file: %s", e)
+        else:
+            logger.warn("Not running in daemon mode. PID file creation " \
+                        "disabled.")
+
+    # Determine which data directory and config file to use
+    if args.datadir:
+        plexpy.DATA_DIR = args.datadir
+    else:
+        plexpy.DATA_DIR = plexpy.PROG_DIR
+
+    if args.config:
+        config_file = args.config
+    else:
+        config_file = os.path.join(plexpy.DATA_DIR, 'config.ini')
+
+    # Try to create the DATA_DIR if it doesn't exist
+    if not os.path.exists(plexpy.DATA_DIR):
+        try:
+            os.makedirs(plexpy.DATA_DIR)
+        except OSError:
+            raise SystemExit(
+                'Could not create data directory: ' + plexpy.DATA_DIR + '. Exiting....')
+
+    # Make sure the DATA_DIR is writeable
+    if not os.access(plexpy.DATA_DIR, os.W_OK):
+        raise SystemExit(
+            'Cannot write to the data directory: ' + plexpy.DATA_DIR + '. Exiting...')
+
+    # Put the database in the DATA_DIR
+    plexpy.DB_FILE = os.path.join(plexpy.DATA_DIR, 'plexpy.db')
+
+    # Read config and start logging
+    plexpy.initialize(config_file)
+
+    if plexpy.DAEMON:
+        plexpy.daemonize()
+
+    # Force the http port if neccessary
+    if args.port:
+        http_port = args.port
+        logger.info('Using forced web server port: %i', http_port)
+    else:
+        http_port = int(plexpy.CONFIG.HTTP_PORT)
+
+    # Check if pyOpenSSL is installed. It is required for certificate generation
+    # and for CherryPy.
+    if plexpy.CONFIG.ENABLE_HTTPS:
+        try:
+            import OpenSSL
+        except ImportError:
+            logger.warn("The pyOpenSSL module is missing. Install this " \
+                        "module to enable HTTPS. HTTPS will be disabled.")
+            plexpy.CONFIG.ENABLE_HTTPS = False
+
+    # Try to start the server. Will exit here is address is already in use.
+    web_config = {
+        'http_port': http_port,
+        'http_host': plexpy.CONFIG.HTTP_HOST,
+        'http_root': plexpy.CONFIG.HTTP_ROOT,
+        'http_proxy': plexpy.CONFIG.HTTP_PROXY,
+        'enable_https': plexpy.CONFIG.ENABLE_HTTPS,
+        'https_cert': plexpy.CONFIG.HTTPS_CERT,
+        'https_key': plexpy.CONFIG.HTTPS_KEY,
+        'http_username': plexpy.CONFIG.HTTP_USERNAME,
+        'http_password': plexpy.CONFIG.HTTP_PASSWORD,
+    }
+    webstart.initialize(web_config)
+
+    # Start the background threads
+    plexpy.start()
+
+    # Open connection for websocket
+    if plexpy.CONFIG.MONITORING_USE_WEBSOCKET:
+        try:
+            web_socket.start_thread()
+        except:
+            logger.warn(u"Websocket :: Unable to open connection.")
+            # Fallback to polling
+            plexpy.POLLING_FAILOVER = True
+            plexpy.initialize_scheduler()
+
+    # Open webbrowser
+    if plexpy.CONFIG.LAUNCH_BROWSER and not args.nolaunch:
+        plexpy.launch_browser(plexpy.CONFIG.HTTP_HOST, http_port,
+                              plexpy.CONFIG.HTTP_ROOT)
+
+    # Wait endlessy for a signal to happen
+    while True:
+        if not plexpy.SIGNAL:
+            try:
+                time.sleep(1)
+            except KeyboardInterrupt:
+                plexpy.SIGNAL = 'shutdown'
+        else:
+            logger.info('Received signal: %s', plexpy.SIGNAL)
+
+            if plexpy.SIGNAL == 'shutdown':
+                plexpy.shutdown()
+            elif plexpy.SIGNAL == 'restart':
+                plexpy.shutdown(restart=True)
+            else:
+                plexpy.shutdown(restart=True, update=True)
+
+            plexpy.SIGNAL = None
+
+# Call main()
 if __name__ == "__main__":
     main()
diff --git a/README.md b/README.md
index 37829290..3bbd6a6c 100644
--- a/README.md
+++ b/README.md
@@ -1,163 +1,125 @@
-# Tautulli
+#PlexPy
 
-A python based web application for monitoring, analytics and notifications for 
-[Plex Media Server](https://plex.tv).
+[![Join the chat at https://gitter.im/drzoidberg33/plexpy](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/drzoidberg33/plexpy?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-This project is based on code from [Headphones](https://github.com/rembo10/headphones)
-and [PlexWatchWeb](https://github.com/ecleese/plexWatchWeb).
+A python based web application for monitoring, analytics and notifications for Plex Media Server (www.plex.tv).
 
-## Features
+This project is based on code from Headphones (https://github.com/rembo10/headphones) and PlexWatchWeb (https://github.com/ecleese/plexWatchWeb).
 
--   Responsive web design viewable on desktop, tablet and mobile web browsers.
--   Themed to complement Plex/Web.
--   Easy configuration setup (no separate web server required).
--   Monitor current Plex Media Server activity.
--   Fully customizable notifications for stream activity and recently added media.
--   Top statistics on home page with configurable duration and measurement metric.
--   Global watching history with search/filtering & dynamic column sorting.
--   Full user list with general information and comparison stats.
--   Individual user information including devices IP addresses.
--   Complete library statistics and media file information.
--   Rich analytics presented using Highcharts graphing.
--   Beautiful content information pages.
--   Full sync list data on all users syncing items from your library.
--   And many more!!
+* plexPy forum thread: https://forums.plex.tv/discussion/169591/plexpy-another-plex-monitoring-program
 
-## Preview
+If you'd like to buy me a beer, hit the donate button below. All donations go to the project maintainer (primarily for the procurement of liquid refreshment).
 
-[Full preview gallery available on our website][Tautulli]
+[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=G9HZK9BDJLKT6)
 
-![Tautulli Homepage](https://tautulli.com/images/screenshots/activity-compressed.jpg?v=2)
 
-## Installation
+###Support
+-----------
+* PlexPy Wiki: https://github.com/drzoidberg33/plexpy/wiki
 
-[![Python][badge-python]][Python]
-[![Docker Pulls][badge-docker-pulls]][DockerHub]
-[![Docker Stars][badge-docker-stars]][DockerHub]
-[![Downloads][badge-downloads]][Releases Latest]
 
-[badge-python]: https://img.shields.io/badge/python->=3.9-blue?style=flat-square
-[badge-docker-pulls]: https://img.shields.io/docker/pulls/tautulli/tautulli?style=flat-square
-[badge-docker-stars]: https://img.shields.io/docker/stars/tautulli/tautulli?style=flat-square
-[badge-downloads]: https://img.shields.io/github/downloads/Tautulli/Tautulli/total?style=flat-square
+###Features
+-----------
+* Responsive web design viewable on desktop, tablet and mobile web browsers
 
-| Status | Branch: `master` | Branch: `beta` | Branch: `nightly` |
-| --- | --- | --- | --- |
-| Release   | [![Release@master][badge-release-master]][Releases Latest] <br> [![Release Date@master][badge-release-master-date]][Releases Latest] | [![Release@beta][badge-release-beta]][Releases] <br> [![Commits@beta][badge-release-beta-commits]][Commits Beta] | [![Last Commits@nightly][badge-release-nightly-last-commit]][commits Nightly] <br> [![Commits@nightly][badge-release-nightly-commits]][Commits Nightly] |
-| Docker    | [![Docker@master][badge-docker-master]][DockerHub] <br> [![Docker Build@master][badge-docker-master-ci]][Publish Docker Master] | [![Docker@beta][badge-docker-beta]][DockerHub] <br> [![Docker Build@beta][badge-docker-beta-ci]][Publish Docker Beta] | [![Docker@nightly][badge-docker-nightly]][DockerHub] <br> [![Docker Build@nightly][badge-docker-nightly-ci]][Publish Docker Nightly] |
-| Snap      | [![Snap@master][badge-snap-master]][Snapcraft] <br> [![Snap Build@master][badge-snap-master-ci]][Publish Snap Master] | [![Snap@beta][badge-snap-beta]][Snapcraft] <br> [![Snap Build@beta][badge-snap-beta-ci]][Publish Snap Beta] | [![Snap@nightly][badge-snap-nightly]][Snapcraft] <br> [![Snap Build@nightly][badge-snap-nightly-ci]][Publish Snap Nightly] |
-| Installer | [![Windows@master][badge-installer-master-win]][Releases Latest] <br> [![MacOS@master][badge-installer-master-macos]][Releases Latest] <br> [![Installer Build@master][badge-installer-master-ci]][Publish Installer Master] | [![Windows@beta][badge-installer-beta-win]][Releases] <br> [![MacOS@beta][badge-installer-beta-macos]][Releases] <br> [![Installer Build@beta][badge-installer-beta-ci]][Publish Installer Beta] | [![Installer Build@nightly][badge-installer-nightly-ci]][Publish Installer Nightly] |
+* Themed to complement Plex/Web
 
-Read the [Installation Guides][Installation] for instructions on how to install Tautulli.
+* Easy configuration setup via html form
 
-[badge-release-master]: https://img.shields.io/github/v/release/Tautulli/Tautulli?style=flat-square
-[badge-release-master-date]: https://img.shields.io/github/release-date/Tautulli/Tautulli?style=flat-square&color=blue
-[badge-release-beta]: https://img.shields.io/github/v/release/Tautulli/Tautulli?include_prereleases&style=flat-square
-[badge-release-beta-commits]: https://img.shields.io/github/commits-since/Tautulli/Tautulli/latest/beta?style=flat-square&color=blue
-[badge-release-nightly-last-commit]: https://img.shields.io/github/last-commit/Tautulli/Tautulli/nightly?style=flat-square&color=blue
-[badge-release-nightly-commits]: https://img.shields.io/github/commits-since/Tautulli/Tautulli/latest/nightly?style=flat-square&color=blue
-[badge-docker-master]: https://img.shields.io/badge/docker-latest-blue?style=flat-square
-[badge-docker-master-ci]: https://img.shields.io/github/actions/workflow/status/Tautulli/Tautulli/.github/workflows/publish-docker.yml?style=flat-square&branch=master
-[badge-docker-beta]: https://img.shields.io/badge/docker-beta-blue?style=flat-square
-[badge-docker-beta-ci]: https://img.shields.io/github/actions/workflow/status/Tautulli/Tautulli/.github/workflows/publish-docker.yml?style=flat-square&branch=beta
-[badge-docker-nightly]: https://img.shields.io/badge/docker-nightly-blue?style=flat-square
-[badge-docker-nightly-ci]: https://img.shields.io/github/actions/workflow/status/Tautulli/Tautulli/.github/workflows/publish-docker.yml?style=flat-square&branch=nightly
-[badge-snap-master]: https://img.shields.io/badge/snap-stable-blue?style=flat-square
-[badge-snap-master-ci]: https://img.shields.io/github/actions/workflow/status/Tautulli/Tautulli/.github/workflows/publish-snap.yml?style=flat-square&branch=master
-[badge-snap-beta]: https://img.shields.io/badge/snap-beta-blue?style=flat-square
-[badge-snap-beta-ci]: https://img.shields.io/github/actions/workflow/status/Tautulli/Tautulli/.github/workflows/publish-snap.yml?style=flat-square&branch=beta
-[badge-snap-nightly]: https://img.shields.io/badge/snap-edge-blue?style=flat-square
-[badge-snap-nightly-ci]: https://img.shields.io/github/actions/workflow/status/Tautulli/Tautulli/.github/workflows/publish-snap.yml?style=flat-square&branch=nightly
-[badge-installer-master-win]: https://img.shields.io/github/v/release/Tautulli/Tautulli?label=windows&style=flat-square
-[badge-installer-master-macos]: https://img.shields.io/github/v/release/Tautulli/Tautulli?label=macos&style=flat-square
-[badge-installer-master-ci]: https://img.shields.io/github/actions/workflow/status/Tautulli/Tautulli/.github/workflows/publish-installers.yml?style=flat-square&branch=master
-[badge-installer-beta-win]: https://img.shields.io/github/v/release/Tautulli/Tautulli?label=windows&include_prereleases&style=flat-square
-[badge-installer-beta-macos]: https://img.shields.io/github/v/release/Tautulli/Tautulli?label=macos&include_prereleases&style=flat-square
-[badge-installer-beta-ci]: https://img.shields.io/github/actions/workflow/status/Tautulli/Tautulli/.github/workflows/publish-installers.yml?style=flat-square&branch=beta
-[badge-installer-nightly-ci]: https://img.shields.io/github/actions/workflow/status/Tautulli/Tautulli/.github/workflows/publish-installers.yml?style=flat-square&branch=nightly
+* Current Plex Media Server viewing activity including:
+	* number of current users
+	* title
+	* progress
+	* platform
+	* user
+	* state (playing, paused, buffering, etc)
+	* stream type (direct, transcoded)
+	* video type & resolution
+	* audio type & channel count.
+	
+* Top statistics on home page with configurable duration and measurement metric:
+	* Most watched TV
+	* Most popular TV
+	* Most watched Movie
+	* Most popular Movie
+	* Most active user
+	* Most active platform
 
-## Support
+* Recently added media and how long ago it was added
 
-[![Wiki][badge-wiki]][Wiki]
-[![Discord][badge-discord]][Discord]
-[![Reddit][badge-reddit]][Reddit]
-[![Plex Forums][badge-forums]][Plex Forums]
-[![Issues][badge-issues]][Issues]
+* Global watching history with search/filtering & dynamic column sorting
+	* date
+	* user
+	* platform
+	* ip address
+	* title
+	* stream information details
+	* start time
+	* paused duration length
+	* stop time
+	* duration length
+	* watched progress
+	* show/hide columns
+	* delete mode - allows deletion of specific history items
 
-[badge-wiki]: https://img.shields.io/badge/github-wiki-black?style=flat-square
-[badge-discord]: https://img.shields.io/discord/183396325142822912?label=discord&style=flat-square&color=7289DA
-[badge-reddit]: https://img.shields.io/reddit/subreddit-subscribers/tautulli?label=reddit&style=flat-square&color=FF5700
-[badge-forums]: https://img.shields.io/badge/plex%20forums-discussion-E5A00D?style=flat-square
-[badge-issues]: https://img.shields.io/badge/github-issues-black?style=flat-square
+* Full user list with general information and comparison stats 
 
-If you think you've found a bug in Tautulli make sure you have read the [FAQ][]
-first to make sure it hasn't been covered by one of the questions there. If your
-problem isn't answered in the FAQ try the following first:
+* Individual user information
+	* username and gravatar (if available)
+	* daily, weekly, monthly, all time stats for play count and duration length
+	* individual platform stats for each user
+	* public ip address history with last seen date and geo tag location
+	* recently watched content
+	* watching history
+	* synced items
+	* assign users custom friendly names within PlexPy
+	* assign users custom avatar URL within PlexPy
+	* disable history logging per user
+	* disable notifications per user
+	* option to purge all history per user.
 
--   Update to the latest version of Tautulli.
--   Turning your device off and on again.
--   Analyzing your logs, you just might find the solution yourself!
--   Using the **search** function to see if this issue has already been reported/solved.
--   Checking the [Wiki][] for [Installation][] instructions and reading the [FAQs][FAQ].
--   For basic questions try asking on [Discord][], [Reddit][], 
-    or the [Plex Forums][] first before opening an issue.
+* Rich analytics presented using Highcharts graphing
+	* user-selectable time periods of 30, 90 or 365 days
+	* daily watch count and duration
+	* totals by day of week and hours of the day
+	* totals by top 10 platform
+	* totals by top 10 users
+	* detailed breakdown by transcode decision
+	* source and stream resolutions
+	* transcode decision counts by user and platform
+	* total monthly counts
+	
+* Content information pages
+	* movies (includes watching history)
+	* tv shows (includes watching history)
+	* tv seasons
+	* tv episodes (includes watching history)
 
-**If nothing has worked:**
+* Full sync list data on all users syncing items from your library
 
-1.  Please check the [issues tracker][Issues] to see if someone else has already reported the bug.
-2.  If this is a new bug, open a [bug report][Issue New] on the issues tracker.
-3.  Provide a clear title to easily help identify your problem.
-4.  Use proper [Markdown syntax][] to structure your post (i.e. code/log in code blocks).
-5.  Make sure to fill out the required information on the issue template.
-6.  Close your issue when it's solved! If you found the solution yourself please
-    comment so that others benefit from it.
+## Installation and Notes
 
-## Feature Requests
+* [Installation page](../../wiki/Installation) shows you how to install PlexPy.
+* [Usage guide](../../wiki/Usage-guide) introduces you to PlexPy.
+* [Troubleshooting page](../../wiki/TroubleShooting) in the wiki can help you with common problems.
 
-1.  Pleases check the [issues tracker][Issues] to see if someone else has already requested the feature.
-    If a similar idea has already been requested, _give it a thumbs up_. **Do not comment
-    with `+1` or something similar as it creates unnecessary spam.**
-2.  If this is a new feature request, open a [feature request][Issue New] on the issues tracker.
+**Issues** can be reported on the GitHub issue tracker considering these rules:
+
+1. Analyze your log, you just might find the solution yourself!
+2. You read the wiki and searched existing issues, but this is not solving your problem.
+3. Post the issue with a clear title, description and the HP log and use [proper markdown syntax](https://help.github.com/articles/github-flavored-markdown) to structure your text (code/log in code blocks). 
+4. Close your issue when it's solved! If you found the solution yourself please comment so that others benefit from it.
+
+**Feature requests** can be reported on the GitHub issue tracker too:
+
+1. Search for similar existing 'issues', feature requests can be recognized by the label 'Request'.
+2. If a similar Request exists, post a comment (+1, or add a new idea to the existing request), otherwise you can create a new one.
+
+If you **comply with these rules** you can [post your request/issue](http://github.com/drzoidberg33/plexpy/issues).
+
+**Support** the project by implementing new features, solving support tickets and provide bug fixes.
 
 ## License
+This is free software under the GPL v3 open source license. Feel free to do with it what you wish, but any modification must be open sourced. A copy of the license is included.
 
-[![License][badge-license]][License]
-
-[badge-license]: https://img.shields.io/github/license/Tautulli/Tautulli?style=flat-square
-
-This is free software under the GPL v3 open source license. Feel free to do with it what you wish,
-but any modification must be open sourced. A copy of the license is included.
-
-This software includes Highsoft software libraries which you may freely distribute for 
-non-commercial use. Commercial users must licence this software, for more information visit
-https://shop.highsoft.com/faq/non-commercial#non-commercial-redistribution.
-
-
-[Python]: https://python.org/downloads
-[DockerHub]: https://hub.docker.com/r/tautulli/tautulli
-[Releases]: https://github.com/Tautulli/Tautulli/releases
-[Releases Latest]: https://github.com/Tautulli/Tautulli/releases/latest
-[License]: https://github.com/Tautulli/Tautulli/blob/master/LICENSE
-[FAQ]: https://github.com/Tautulli/Tautulli/wiki/Frequently-Asked-Questions
-[Installation]: https://github.com/Tautulli/Tautulli/wiki/Installation
-[Issues]: https://github.com/Tautulli/Tautulli/issues
-[Issue New]: https://github.com/Tautulli/Tautulli/issues/new/choose
-[Markdown syntax]: https://help.github.com/articles/github-flavored-markdown
-[Tautulli]: http://tautulli.com
-[Wiki]: https://github.com/Tautulli/Tautulli/wiki
-[Discord]: https://tautulli.com/discord
-[Reddit]: https://reddit.com/r/Tautulli
-[Plex Forums]: https://forums.plex.tv/t/tautulli-monitor-your-plex-media-server/225242
-[Snapcraft]: https://snapcraft.io/tautulli
-[Commits Beta]: https://github.com/Tautulli/Tautulli/commits/beta
-[Commits Nightly]: https://github.com/Tautulli/Tautulli/commits/nightly
-
-[Publish Docker Master]: https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Docker"+branch%3Amaster
-[Publish Docker Beta]: https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Docker"+branch%3Abeta
-[Publish Docker Nightly]: https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Docker"+branch%3Anightly
-[Publish Snap Master]: https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Snap"+branch%3Amaster
-[Publish Snap Beta]: https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Snap"+branch%3Abeta
-[Publish Snap Nightly]: https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Snap"+branch%3Anightly
-[Publish Installer Master]: https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Installers"+branch%3Amaster
-[Publish Installer Beta]: https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Installers"+branch%3Abeta
-[Publish Installer Nightly]: https://github.com/Tautulli/Tautulli/actions?query=workflow%3A"Publish+Installers"+branch%3Anightly
+This software includes Highsoft software libraries which you may freely distribute for non-commercial use. Commerical users must licence this software, for more information visit https://shop.highsoft.com/faq/non-commercial#non-commercial-redistribution.
diff --git a/Tautulli.py b/Tautulli.py
deleted file mode 100755
index b3cf4736..00000000
--- a/Tautulli.py
+++ /dev/null
@@ -1,342 +0,0 @@
-#!/usr/bin/env python
-
-# -*- coding: utf-8 -*-
-
-# This file is part of Tautulli.
-#
-#  Tautulli is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  Tautulli 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-import sys
-
-# Ensure lib added to path, before any other imports
-sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), 'lib'))
-
-
-import argparse
-import datetime
-import locale
-import platformdirs
-import pytz
-import signal
-import shutil
-import time
-import threading
-import tzlocal
-import ctypes
-
-import plexpy
-from plexpy import common, config, database, helpers, logger, webstart
-if common.PLATFORM == 'Windows':
-    from plexpy import windows
-elif common.PLATFORM == 'Darwin':
-    from plexpy import macos
-
-# Register signals, such as CTRL + C
-signal.signal(signal.SIGINT, plexpy.sig_handler)
-signal.signal(signal.SIGTERM, plexpy.sig_handler)
-
-
-def main():
-    """
-    Tautulli application entry point. Parses arguments, setups encoding and
-    initializes the application.
-    """
-
-    # Fixed paths to Tautulli
-    if hasattr(sys, 'frozen') and hasattr(sys, '_MEIPASS'):
-        plexpy.FROZEN = True
-        plexpy.FULL_PATH = os.path.abspath(sys.executable)
-        plexpy.PROG_DIR = sys._MEIPASS
-    else:
-        plexpy.FULL_PATH = os.path.abspath(__file__)
-        plexpy.PROG_DIR = os.path.dirname(plexpy.FULL_PATH)
-
-    plexpy.ARGS = sys.argv[1:]
-
-    # From sickbeard
-    plexpy.SYS_PLATFORM = sys.platform
-    plexpy.SYS_ENCODING = None
-
-    try:
-
-        # Attempt to get the system's locale settings
-        language_code, encoding = locale.getlocale()
-
-        # Special handling for Windows platform
-        if sys.platform == 'win32':
-            # Get the user's current language settings on Windows
-            windll = ctypes.windll.kernel32
-            lang_id = windll.GetUserDefaultLCID()
-
-            # Map Windows language ID to locale identifier
-            language_code = locale.windows_locale.get(lang_id, '')
-
-        # Get the preferred encoding
-        encoding = locale.getpreferredencoding()
-
-        # Assign values to application-specific variable
-        plexpy.SYS_LANGUAGE = language_code
-        plexpy.SYS_ENCODING = encoding
-
-    except (locale.Error, IOError):
-        pass
-
-    # for OSes that are poorly configured I'll just force UTF-8
-    if not plexpy.SYS_ENCODING or plexpy.SYS_ENCODING in ('ANSI_X3.4-1968', 'US-ASCII', 'ASCII'):
-        plexpy.SYS_ENCODING = 'UTF-8'
-
-    # Set up and gather command line arguments
-    parser = argparse.ArgumentParser(
-        description='A Python based monitoring and tracking tool for Plex Media Server.')
-
-    parser.add_argument(
-        '-v', '--verbose', action='store_true', help='Increase console logging verbosity')
-    parser.add_argument(
-        '-q', '--quiet', action='store_true', help='Turn off console logging')
-    parser.add_argument(
-        '-d', '--daemon', action='store_true', help='Run as a daemon')
-    parser.add_argument(
-        '-p', '--port', type=int, help='Force Tautulli to run on a specified port')
-    parser.add_argument(
-        '--dev', action='store_true', help='Start Tautulli in the development environment')
-    parser.add_argument(
-        '--datadir', help='Specify a directory where to store your data files')
-    parser.add_argument(
-        '--config', help='Specify a config file to use')
-    parser.add_argument(
-        '--nolaunch', action='store_true', help='Prevent browser from launching on startup')
-    parser.add_argument(
-        '--pidfile', help='Create a pid file (only relevant when running as a daemon)')
-    parser.add_argument(
-        '--nofork', action='store_true', help='Start Tautulli as a service, do not fork when restarting')
-
-    args = parser.parse_args()
-
-    if args.verbose:
-        plexpy.VERBOSE = True
-    if args.quiet:
-        plexpy.QUIET = True
-
-    # Do an initial setup of the logger.
-    # Require verbose for pre-initilization to see critical errors
-    logger.initLogger(console=not plexpy.QUIET, log_dir=False, verbose=True)
-
-    try:
-        plexpy.SYS_TIMEZONE = tzlocal.get_localzone()
-    except (pytz.UnknownTimeZoneError, LookupError, ValueError) as e:
-        logger.error("Could not determine system timezone: %s" % e)
-        plexpy.SYS_TIMEZONE = pytz.UTC
-
-    plexpy.SYS_UTC_OFFSET = datetime.datetime.now(plexpy.SYS_TIMEZONE).strftime('%z')
-
-    if helpers.bool_true(os.getenv('TAUTULLI_DOCKER', False)):
-        plexpy.DOCKER = True
-        plexpy.DOCKER_MOUNT = not os.path.isfile('/config/DOCKER')
-    if helpers.bool_true(os.getenv('TAUTULLI_SNAP', False)):
-        plexpy.SNAP = True
-
-    if args.dev:
-        plexpy.DEV = True
-        logger.debug("Tautulli is running in the dev environment.")
-
-    if args.daemon:
-        if sys.platform == 'win32':
-            logger.warn("Daemonizing not supported under Windows, starting normally")
-        else:
-            plexpy.DAEMON = True
-            plexpy.QUIET = True
-
-    if args.nofork:
-        plexpy.NOFORK = True
-        logger.info("Tautulli is running as a service, it will not fork when restarted.")
-
-    if args.pidfile:
-        plexpy.PIDFILE = str(args.pidfile)
-
-        # If the pidfile already exists, plexpy may still be running, so
-        # exit
-        if os.path.exists(plexpy.PIDFILE):
-            try:
-                with open(plexpy.PIDFILE, 'r') as fp:
-                    pid = int(fp.read())
-            except IOError as e:
-                raise SystemExit("Unable to read PID file: %s", e)
-
-            try:
-                os.kill(pid, 0)
-            except OSError:
-                logger.warn("PID file '%s' already exists, but PID %d is "
-                            "not running. Ignoring PID file." %
-                            (plexpy.PIDFILE, pid))
-            else:
-                # The pidfile exists and points to a live PID. plexpy may
-                # still be running, so exit.
-                raise SystemExit("PID file '%s' already exists. Exiting." %
-                                 plexpy.PIDFILE)
-
-        # The pidfile is only useful in daemon mode, make sure we can write the
-        # file properly
-        if plexpy.DAEMON:
-            plexpy.CREATEPID = True
-
-            try:
-                with open(plexpy.PIDFILE, 'w') as fp:
-                    fp.write("pid\n")
-            except IOError as e:
-                raise SystemExit("Unable to write PID file: %s", e)
-        else:
-            logger.warn("Not running in daemon mode. PID file creation " \
-                        "disabled.")
-
-    # Determine which data directory and config file to use
-    if args.datadir:
-        plexpy.DATA_DIR = args.datadir
-    elif plexpy.FROZEN:
-        plexpy.DATA_DIR = platformdirs.user_data_dir("Tautulli", False)
-    else:
-        plexpy.DATA_DIR = plexpy.PROG_DIR
-
-    # Migrate Snap data dir
-    if plexpy.SNAP:
-        snap_common = os.environ['SNAP_COMMON']
-        old_data_dir = os.path.join(snap_common, 'Tautulli')
-        if os.path.exists(old_data_dir) and os.listdir(old_data_dir):
-            plexpy.SNAP_MIGRATE = True
-            logger.info("Migrating Snap user data.")
-            shutil.move(old_data_dir, plexpy.DATA_DIR)
-
-    if args.config:
-        config_file = args.config
-    else:
-        config_file = os.path.join(plexpy.DATA_DIR, config.FILENAME)
-
-    # Try to create the DATA_DIR if it doesn't exist
-    if not os.path.exists(plexpy.DATA_DIR):
-        try:
-            os.makedirs(plexpy.DATA_DIR)
-        except OSError:
-            raise SystemExit(
-                'Could not create data directory: ' + plexpy.DATA_DIR + '. Exiting....')
-
-    # Make sure the DATA_DIR is writeable
-    test_file = os.path.join(plexpy.DATA_DIR, '.TEST')
-    try:
-        with open(test_file, 'w'):
-            pass
-    except IOError:
-        raise SystemExit(
-            'Cannot write to the data directory: ' + plexpy.DATA_DIR + '. Exiting...')
-    finally:
-        try:
-            os.remove(test_file)
-        except OSError:
-            pass
-
-    # Put the database in the DATA_DIR
-    plexpy.DB_FILE = os.path.join(plexpy.DATA_DIR, database.FILENAME)
-
-    # Move 'plexpy.db' to 'tautulli.db'
-    if os.path.isfile(os.path.join(plexpy.DATA_DIR, 'plexpy.db')) and \
-            not os.path.isfile(os.path.join(plexpy.DATA_DIR, plexpy.DB_FILE)):
-        try:
-            os.rename(os.path.join(plexpy.DATA_DIR, 'plexpy.db'), plexpy.DB_FILE)
-        except OSError as e:
-            raise SystemExit("Unable to rename plexpy.db to tautulli.db: %s", e)
-
-    if plexpy.DAEMON:
-        plexpy.daemonize()
-
-    # Read config and start logging
-    plexpy.initialize(config_file)
-
-    # Start the background threads
-    plexpy.start()
-
-    # Force the http port if necessary
-    if args.port:
-        plexpy.HTTP_PORT = args.port
-        logger.info('Using forced web server port: %i', plexpy.HTTP_PORT)
-    else:
-        plexpy.HTTP_PORT = int(plexpy.CONFIG.HTTP_PORT)
-
-    # Try to start the server. Will exit here is address is already in use.
-    webstart.start()
-
-    if common.PLATFORM == 'Windows':
-        if plexpy.CONFIG.SYS_TRAY_ICON:
-            plexpy.WIN_SYS_TRAY_ICON = windows.WindowsSystemTray()
-            plexpy.WIN_SYS_TRAY_ICON.start()
-        windows.set_startup()
-    elif common.PLATFORM == 'Darwin':
-        macos.set_startup()
-
-    # Open webbrowser
-    if plexpy.CONFIG.LAUNCH_BROWSER and not args.nolaunch and not plexpy.DEV:
-        plexpy.launch_browser(plexpy.CONFIG.HTTP_HOST, plexpy.HTTP_PORT,
-                              plexpy.HTTP_ROOT)
-
-    if common.PLATFORM == 'Darwin' and plexpy.CONFIG.SYS_TRAY_ICON:
-        if not macos.HAS_PYOBJC:
-            logger.warn("The pyobjc module is missing. Install this "
-                        "module to enable the MacOS menu bar icon.")
-            plexpy.CONFIG.SYS_TRAY_ICON = False
-
-        if plexpy.CONFIG.SYS_TRAY_ICON:
-            # MacOS menu bar icon must be run on the main thread and is blocking
-            # Start the rest of Tautulli on a new thread
-            thread = threading.Thread(target=wait)
-            thread.daemon = True
-            thread.start()
-
-            plexpy.MAC_SYS_TRAY_ICON = macos.MacOSSystemTray()
-            plexpy.MAC_SYS_TRAY_ICON.start()
-        else:
-            wait()
-    else:
-        wait()
-
-
-def wait():
-    logger.info("Tautulli is ready!")
-
-    # Wait endlessly for a signal to happen
-    while True:
-        if not plexpy.SIGNAL:
-            try:
-                time.sleep(1)
-            except KeyboardInterrupt:
-                plexpy.SIGNAL = 'shutdown'
-        else:
-            logger.info('Received signal: %s', plexpy.SIGNAL)
-
-            if plexpy.SIGNAL == 'shutdown':
-                plexpy.shutdown()
-            elif plexpy.SIGNAL == 'restart':
-                plexpy.shutdown(restart=True)
-            elif plexpy.SIGNAL == 'checkout':
-                plexpy.shutdown(restart=True, checkout=True)
-            elif plexpy.SIGNAL == 'reset':
-                plexpy.shutdown(restart=True, reset=True)
-            elif plexpy.SIGNAL == 'update':
-                plexpy.shutdown(restart=True, update=True)
-            else:
-                logger.error('Unknown signal. Shutting down...')
-                plexpy.shutdown()
-
-            plexpy.SIGNAL = None
-
-
-if __name__ == "__main__":
-    main()
diff --git a/contrib/clean_pyc.bat b/contrib/clean_pyc.bat
deleted file mode 100755
index e4436dea..00000000
--- a/contrib/clean_pyc.bat
+++ /dev/null
@@ -1,11 +0,0 @@
-@echo off
-:: Display information
-echo This script will remove *.pyc files. These files are generated by Python, but they can cause conflicts after an upgrade. It's safe to remove them, because they will be regenerated.
-echo Press enter to continue, or CTRL + C to quit.
-pause
-
-cd ..\
-:: Remove *.pyc files
-del /S *.pyc
-:: Remove __pycache__ folders
-for /d /r . %%d in (__pycache__) do @if exist "%%d" rd /s /q "%%d"
\ No newline at end of file
diff --git a/contrib/clean_pyc.sh b/contrib/clean_pyc.sh
index ea555159..e3d47e44 100755
--- a/contrib/clean_pyc.sh
+++ b/contrib/clean_pyc.sh
@@ -1,11 +1,9 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 # Display information
 echo "This script will remove *.pyc files. These files are generated by Python, but they can cause conflicts after an upgrade. It's safe to remove them, because they will be regenerated."
 echo "Press enter to continue, or CTRL + C to quit."
 read
 
-# Remove *.pyc files
-find "`dirname $0`/.." -type f -name "*.pyc" -exec rm -rf {} \;
-# Remove __pycache__ folders
-find "`dirname $0`/.." -type d -name "__pycache__" -exec rm -rf {} \;
\ No newline at end of file
+# Remove the *.pyc
+find "`dirname $0`/.." -type f -name "*.pyc" -exec rm -rf {} \;
\ No newline at end of file
diff --git a/contrib/downgrade.sh b/contrib/downgrade.sh
index e4822c46..edd4779e 100755
--- a/contrib/downgrade.sh
+++ b/contrib/downgrade.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 # Parameter check
 if [ -z "$1" ]; then
diff --git a/data/interfaces/default/app_import.html b/data/interfaces/default/app_import.html
deleted file mode 100644
index 74af4313..00000000
--- a/data/interfaces/default/app_import.html
+++ /dev/null
@@ -1,201 +0,0 @@
-<div class="modal-dialog" role="document">
-    <div class="modal-content">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-            <h4 class="modal-title">Import ${app} Database</h4>
-        </div>
-        <div class="modal-body" id="modal-text">
-            <form id="import_database_form" enctype="multipart/form-data" method="post" name="import_database_form">
-                <input type="hidden" id="import_app" name="import_app" value="${app.lower()}" />
-                % if app in ('PlexWatch', 'Plexivity'):
-                <p class="help-block">
-                    <%
-                        v = ''
-                        if app == 'PlexWatch':
-                            v = '0.3.2'
-                        elif app == 'Plexivity':
-                            v = '0.9.8'
-                    %>
-                    <strong>Please ensure your ${app} database is at version ${v} or higher.</strong>
-                </p>
-                % endif
-                <div class="form-group">
-                    <label for="import_database_file">Option 1: Upload a Database File</label>
-                    <div class="row">
-                        <div class="col-xs-12">
-                            <div class="input-group">
-                                <label for="import_database_file" class="input-group-btn">
-                                    <span class="btn btn-form">Upload</span>
-                                    <input type="file" style="display: none;" id="import_database_file" name="import_database_file" required>
-                                </label>
-                                <input id="import_database_file_name" type="text" class="form-control" placeholder="tautulli.db" disabled>
-                            </div>
-                        </div>
-                    </div>
-                    <p class="help-block">Upload the ${app} database file you wish to import (max file size is 1GB).</p>
-                </div>
-                <div class="form-group">
-                    <label for="import_database_path">Option 2: Browse for a Database File</label>
-                    <div class="row">
-                        <div class="col-xs-12">
-                            <div class="input-group">
-                                <span class="input-group-btn">
-                                    <button class="btn btn-form" type="button" id="import_database_path_browse" data-toggle="browse" data-description="Database File" data-filter=".db" data-target="#import_database_path">Browse</button>
-                                </span>
-                                <input type="text" class="form-control" id="import_database_path" name="import_database_path" value="" placeholder="tautulli.db" required disabled>
-                            </div>
-                        </div>
-                    </div>
-                    <p class="help-block">Browse for the ${app} database file you wish to import.</p>
-                </div>
-                % if app == 'Tautulli':
-                <div class="form-group">
-                    <label for="table_name">Import Method</label>
-                    <div class="row">
-                        <div class="col-xs-4">
-                            <select class="form-control" id="import_method" name="import_method">
-                                <option value="merge">Merge</option>
-                                <option value="overwrite">Overwrite</option>
-                            </select>
-                        </div>
-                    </div>
-                    <p class="help-block">Select how you would like to import the Tautulli history.</p>
-                    <ul class="help-block" style="padding-inline-start: 15px;">
-                        <li><strong>Merge</strong> will add all history and remove any duplicates from the imported database into the current database.</li>
-                        <li><strong>Overwrite</strong> will replace all history in the current database with the imported database.</li>
-                    </ul>
-                </div>
-                <div class="checkbox">
-                    <label>
-                        <input type="checkbox" name="import_backup_db" id="import_backup_db" value="1" checked> Backup Current Database
-                    </label>
-                    <p class="help-block">Automatically create a backup of the current database before importing.</p>
-                </div>
-                <div class="form-group">
-                    <label>Import Notes</label>
-                    <p class="help-block">The following data will also be imported:</p>
-                    <ul class="help-block" style="padding-inline-start: 15px;">
-                        <li>Libraries and Users</li>
-                        <li>Notification / Newsletter Agents</li>
-                        <li>Registered Mobile Devices</li>
-                    </ul>
-                </div>
-                % else:
-                <div class="form-group">
-                    <label for="import_table_name">Table Name</label>
-                    <div class="row">
-                        <div class="col-xs-4">
-                            <select class="form-control" id="import_table_name" name="import_table_name">
-                                <option value="processed">Processed</option>
-                                <option value="grouped">Grouped</option>
-                            </select>
-                        </div>
-                    </div>
-                    <p class="help-block">Select the table name from which you wish to import. Only import one of these, importing both will result in duplicated data.</p>
-                </div>
-                <div class="form-group">
-                    <label for="import_ignore_interval">Ignore Interval</label>
-                    <div class="row">
-                        <div class="col-xs-2">
-                            <input type="text" class="form-control" id="import_ignore_interval" name="import_ignore_interval" value="120" required>
-                        </div>
-                    </div>
-                    <p class="help-block">Enter the minimum duration (in seconds) an item must have been active for. Set to 0 to import all.</p>
-                </div>
-                % endif
-            </form>
-        </div>
-        <div class="modal-footer">
-            <div>
-                <span id="status-message" style="padding-right: 25px;"></span>
-                <input type="button" id="import_db" class="btn btn-bright" value="Import">
-            </div>
-        </div>
-    </div>
-</div>
-<script>
-    $("#import_database_file").change(function() {
-        if ($(this)[0].files[0]) {
-            $("#import_database_file_name").val($(this)[0].files[0].name);
-        }
-    });
-
-    $("#import_db").click(function() {
-        $(this).prop('disabled', true);
-
-        var app = $("#import_app").val();
-        var database_file = $("#import_database_file")[0].files[0];
-        var database_path = $("#import_database_path").val();
-        var method = $("#import_method").val();
-        var backup = $("#import_backup_db").is(':checked');
-        var table_name = $("#import_table_name").val();
-        var ignore_interval = $("#import_ignore_interval").val();
-
-        var content_type;
-        var process_data;
-        var data;
-
-        if (database_file) {
-            content_type = false;
-            process_data = false;
-            data = new FormData();
-            data.append('app', app);
-            data.append('database_file', database_file);
-            data.append('method', method);
-            data.append('backup', backup);
-            data.append('table_name', table_name);
-            data.append('ignore_interval', ignore_interval);
-        } else {
-            content_type = 'application/x-www-form-urlencoded; charset=UTF-8';
-            process_data = true;
-            data = {
-                app: app,
-                database_path: database_path,
-                method: method,
-                backup: backup,
-                table_name: table_name,
-                ignore_interval: ignore_interval
-            }
-        }
-
-        if (database_file) {
-            $("#status-message").html('<i class="fa fa-fw fa-spin fa-refresh"></i>&nbsp; Uploading database file...');
-        } else {
-            $("#status-message").html('<i class="fa fa-fw fa-spin fa-refresh"></i>');
-        }
-
-        $.ajax({
-            url: 'import_database',
-            type: 'POST',
-            data: data,
-            cache: false,
-            async: true,
-            contentType: content_type,
-            processData: process_data,
-            success: function(data) {
-                var msg;
-                if (data.result === 'success') {
-                    msg = "<i class='fa fa-check'></i>&nbsp; " + data.message;
-                } else {
-                    msg = "<i class='fa fa-exclamation-triangle'></i>&nbsp; " + data.message;
-                }
-                $("#status-message").html(msg);
-                $("#import_database_file").val(null);
-                $("#import_database_file_name").val('');
-                $("#import_database_path").val('');
-            },
-            error: function (xhr) {
-                var msg = "<i class='fa fa-exclamation-triangle'></i>&nbsp; Error (" + xhr.status + "): ";
-                if (xhr.status === 413) {
-                    msg += "file is too large to upload"
-                } else {
-                    msg += 'try again'
-                }
-                $("#status-message").html(msg);
-            },
-            complete: function(xhr) {
-                $("#import_db").prop('disabled', false);
-            }
-        });
-    });
-</script>
\ No newline at end of file
diff --git a/data/interfaces/default/base.html b/data/interfaces/default/base.html
index d6c9f859..8d721dad 100644
--- a/data/interfaces/default/base.html
+++ b/data/interfaces/default/base.html
@@ -1,76 +1,46 @@
 <%
-    import plexpy
-    from plexpy import version
-    from plexpy.helpers import anon_url
-    from plexpy.notifiers import BROWSER_NOTIFIERS
+import plexpy
+from plexpy import version
 %>
 <!doctype html>
 
 <html lang="en">
 <head>
     <meta charset="utf-8">
-    <title>Tautulli - ${title} | ${server_name}</title>
+    <title>PlexPy - ${title}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <meta name="referrer" content="no-referrer">
-    <link href="${http_root}css/bootstrap3/bootstrap.min.css" rel="stylesheet">
-    <link href="${http_root}css/pnotify.custom.min.css" rel="stylesheet" />
-    <link href="${http_root}css/selectize.bootstrap3.css" rel="stylesheet" />
-    <link href="${http_root}css/selectize.min.css" rel="stylesheet" />
-    <link href="${http_root}css/tautulli.css${cache_param}" rel="stylesheet">
-    <link href="${http_root}css/opensans.min.css" rel="stylesheet">
-    <link href="${http_root}css/font-awesome.all.min.css" rel="stylesheet">
-    <link href="${http_root}css/font-awesome.v4-shims.min.css" rel="stylesheet">
+    <link href="interfaces/default/css/bootstrap3/bootstrap.css" rel="stylesheet">
+    <link href="interfaces/default/css/plexpy.css" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet" type="text/css">
+    <link href="interfaces/default/css/font-awesome.min.css" rel="stylesheet">
     ${next.headIncludes()}
 
-    <!-- Favicons -->
-    <link rel="icon" type="image/png" sizes="32x32" href="${http_root}images/favicon/favicon-32x32.png?v=2.6.0">
-    <link rel="icon" type="image/png" sizes="16x16" href="${http_root}images/favicon/favicon-16x16.png?v=2.6.0">
-    <link rel="shortcut icon" href="${http_root}images/favicon/favicon.ico?v=2.6.0">
-
-    <!-- ICONS -->
-    <!-- Android -->
-    <link rel="manifest" href="${http_root}images/favicon/manifest.json?v=2.9.0" crossorigin="use-credentials">
-    <meta name="theme-color" content="#282a2d">
-    <!-- Apple -->
-    <link rel="apple-touch-icon" sizes="180x180" href="${http_root}images/favicon/apple-touch-icon.png?v=2.6.0">
-    <link rel="mask-icon" href="${http_root}images/favicon/safari-pinned-tab.svg?v=2.6.0" color="#282a2d">
-    <meta name="apple-mobile-web-app-title" content="Tautulli">
-    <!-- Microsoft -->
-    <meta name="application-name" content="Tautulli">
-    <meta name="msapplication-config" content="${http_root}images/favicon/browserconfig.xml?v=2.6.0">
+    <link rel="icon" type="image/x-icon" href="interfaces/default/images/favicon.ico"/>
+    <!-- touch icons -->
+    <link rel="shortcut icon" href="interfaces/default/images/favicon.png">
+    <link rel="apple-touch-icon" href="interfaces/default/images/icon_iphone.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="interfaces/default/images/icon_ipad.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="interfaces/default/images/icon_iphone@2x.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="interfaces/default/images/icon_ipad@2x.png">
 </head>
 
 <body class="content">
 <div class="container">
     <div id="ajaxMsg" class="ajaxMsg"></div>
-    % if _session['user_group'] == 'admin':
-    % if plexpy.CONFIG.CHECK_GITHUB and plexpy.UPDATE_AVAILABLE is not False:
+    % if plexpy.CONFIG.CHECK_GITHUB and not plexpy.CURRENT_VERSION:
     <div id="updatebar" style="display: none;">
-        % if plexpy.UPDATE_AVAILABLE is None:
-        You are running an unknown version of Tautulli.<br />
-        % elif plexpy.UPDATE_AVAILABLE == 'release':
-        A <a href="${anon_url('https://github.com/%s/%s/releases/tag/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.LATEST_RELEASE))}" target="_blank" rel="noreferrer">
-        new release (${plexpy.LATEST_RELEASE})</a> of Tautulli is available!<br />
-        % elif plexpy.UPDATE_AVAILABLE == 'commit':
-        A <a href="${anon_url('https://github.com/%s/%s/compare/%s...%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.CURRENT_VERSION, plexpy.LATEST_VERSION))}" target="_blank" rel="noreferrer">
-        newer version</a> of Tautulli is available!<br />
-        You are ${plexpy.COMMITS_BEHIND} commit${'s' if plexpy.COMMITS_BEHIND > 1 else ''} behind.<br />
-        % endif
-        % if plexpy.INSTALL_TYPE == 'docker':
-        Update your Docker container or <a href="#" id="updateDismiss">Dismiss</a>
-        % elif plexpy.INSTALL_TYPE == 'snap':
-        Update your Snap package or <a href="#" id="updateDismiss">Dismiss</a>
-        % elif plexpy.INSTALL_TYPE in ('windows', 'macos'):
-        <a href="${anon_url('https://github.com/%s/%s/releases/tag/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.LATEST_RELEASE))}" target="_blank" rel="noreferrer">Download</a> and install the latest version or <a href="#" id="updateDismiss">Dismiss</a>
-        % else:
-        <a href="update">Update</a> or <a href="#" id="updateDismiss">Dismiss</a>
-        % endif
+        You're running an unknown version of PlexPy. <a href="update">Update</a> or
+        <a href="#" id="updateDismiss">Close</a>
+    </div>
+    % elif plexpy.CONFIG.CHECK_GITHUB and plexpy.CURRENT_VERSION != plexpy.LATEST_VERSION and plexpy.COMMITS_BEHIND > 0 and plexpy.INSTALL_TYPE != 'win':
+    <div id="updatebar" style="display: none;">
+        A <a
+            href="https://github.com/${plexpy.CONFIG.GIT_USER}/plexpy/compare/${plexpy.CURRENT_VERSION}...${plexpy.LATEST_VERSION}" target="_blank">
+        newer version</a> is available. You're ${plexpy.COMMITS_BEHIND} commits behind. <a href="update">Update</a> or
+        <a href="#" id="updateDismiss">Close</a>
     </div>
-    % else:
-    <div id="updatebar" style="display: none;"></div>
-    % endif
     % endif
     <nav class="navbar navbar-fixed-top">
         <div class="container-fluid">
@@ -81,8 +51,8 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a class="navbar-brand" href="home" title="Tautulli">
-                    <img src="${http_root}images/logo-tautulli-45.png" height="45" alt="Tautulli">
+                <a class="navbar-brand" href="home">
+                    <img alt="PlexPy" src="interfaces/default/images/logo-plexpy@2x.png" height="40">
                 </a>
             </div>
             <div class="collapse navbar-collapse navbar-right" id="navbar-collapse-1">
@@ -91,7 +61,7 @@
                         <form action="search" method="post" class="form" id="search_form">
                             <div class="input-group">
                                 <span class="input-textbox">
-                                    <input type="text" class="form-control" name="query" id="query" aria-label="Search" placeholder="Search Plex library..."/>
+                                    <input type="text" class="form-control" name="search_query" id="search_query" aria-label="Search" placeholder="Search..."/>
                                 </span>
                                 <span class="input-group-btn">
                                     <button class="btn btn-dark btn-inactive" type="submit" id="search_button"><i class="fa fa-search"></i></button>
@@ -99,62 +69,41 @@
                             </div>
                         </form>
                     </li>
-                    % if title == "Home":
-                    <li class="active"><a href="home"><i class="fa fa-lg fa-home"></i></a></li>
+                    % if title=="Home":
+                        <li class="active"><a href="home"><i class="fa fa-lg fa-home"></i></a></li>
                     % else:
-                    <li><a href="home"><i class="fa fa-lg fa-home"></i></a></li>
+                        <li><a href="home"><i class="fa fa-lg fa-home"></i></a></li>
                     % endif
-                    % if title == "Libraries" or title == "Library" or title == "Info":
-                    <li class="active"><a href="libraries">Libraries</a></li>
+                    % if title=="Users" or title=="User":
+                        <li class="active"><a href="users">Users</a></li>
                     % else:
-                    <li><a href="libraries">Libraries</a></li>
+                        <li><a href="users">Users</a></li>
                     % endif
-                    % if title == "Users" or title == "User":
-                    <li class="active"><a href="users">Users</a></li>
-                    % else:
-                    <li><a href="users">Users</a></li>
-                    % endif
-                    % if title == "History":
+                    % if title=="History":
                     <li class="active"><a href="history">History</a></li>
                     % else:
                     <li><a href="history">History</a></li>
                     % endif
-                    % if title == "Graphs":
-                    <li class="active"><a href="graphs">Graphs</a></li>
+                    % if title=="Graphs":
+                        <li class="active"><a href="graphs">Graphs</a></li>
                     % else:
-                    <li><a href="graphs">Graphs</a></li>
+                        <li><a href="graphs">Graphs</a></li>
                     % endif
-                    % if title == "Settings":
-                    <li class="dropdown active">
+                    % if title=="Synced Items":
+                        <li class="active"><a href="sync">Synced Items</a></li>
                     % else:
-                    <li class="dropdown">
+                        <li><a href="sync">Synced Items</a></li>
+                    % endif
+                    % if title=="Log":
+                        <li class="active"><a href="logs">Logs</a></li>
+                    % else:
+                        <li><a href="logs">Logs</a></li>
+                    % endif
+                    % if title=="Settings":
+                        <li class="active"><a href="settings">Settings</a></li>
+                    % else:
+                        <li><a href="settings">Settings</a></li>
                     % endif
-                        <% href = 'settings' if _session['user_group'] == 'admin' else '#' %>
-                        <a href="#" class="dropdown-toggle" aria-haspopup="true" data-toggle="dropdown" data-hover="dropdown" data-href="${href}"><i class="fa fa-lg fa-cogs"></i> <span class="caret"></span></a>
-                        <ul class="dropdown-menu" id="settings-dropdown-menu">
-                            % if _session['user_group'] == 'admin':
-                            <li><a href="settings"><i class="fa fa-fw fa-cogs"></i> Settings</a></li>
-                            <li role="separator" class="divider"></li>
-                            <li><a href="logs"><i class="fa fa-fw fa-list-alt"></i> View Logs</a></li>
-                            <li><a href="${anon_url('https://github.com/%s/%s/wiki/Frequently-Asked-Questions' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank" rel="noreferrer"><i class="fa fa-fw fa-question-circle"></i> FAQ</a></li>
-                            <li><a href="support"><i class="fa fa-fw fa-comment"></i> Support</a></li>
-                            <li role="separator" class="divider"></li>
-                            <li><a href="#" data-target="#donate-modal" data-toggle="modal"><i class="fa fa-fw fa-heart"></i> Donate</a></li>
-                            <li role="separator" class="divider"></li>
-                            % if plexpy.CONFIG.CHECK_GITHUB:
-                            <li><a href="#" id="nav-update"><i class="fa fa-fw fa-arrow-alt-circle-up"></i> Check for Updates</a></li>
-                            % endif
-                            <li><a href="#" id="nav-restart"><i class="fa fa-fw fa-refresh"></i> Restart</a></li>
-                            <li><a href="#" id="nav-shutdown"><i class="fa fa-fw fa-power-off"></i> Shutdown</a></li>
-                            % else:
-                            <li><a href="#" data-target="#admin-login-modal" data-toggle="modal"><i class="fa fa-fw fa-lock"></i> Admin Login</a></li>
-                            <li role="separator" class="divider"></li>
-                            % endif
-                            % if _session['exp']:
-                            <li><a href="${http_root}auth/logout"><i class="fa fa-fw fa-sign-out"></i> Sign Out</a></li>
-                            % endif
-                        </ul>
-                    </li>
                 </ul>
             </div>
         </div>
@@ -162,407 +111,50 @@
 </div>
 
 ${next.headerIncludes()}
-
 <div class="body-container">
     ${next.body()}
 </div>
 
-${next.modalIncludes()}
-
-% if _session['user_group'] != 'admin':
-<div id="admin-login-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="admin-login-modal">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <form id="login-form">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                    <h4 class="modal-title">Admin Login</h4>
-                </div>
-                <div class="modal-body">
-                    <div class="col-md-6" style="margin: auto;">
-                        <div class="form-group">
-                            <label for="username" class="control-label">
-                                Username
-                            </label>
-                            <input type="text" id="username" name="username" class="form-control" autocorrect="off" autocapitalize="off">
-                        </div>
-                        <div class="form-group">
-                            <label for="password" class="control-label">
-                                Password
-                            </label>
-                            <input type="password" id="password" name="password" class="form-control">
-                        </div>
-                        <div class="form-footer">
-                            <div class="remember-group">
-                                <label class="control-label">
-                                    <input type="checkbox" id="remember_me" name="remember_me" title="for 30 days" value="1" checked="checked" /> Remember me
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <span id="sign-in-alert" style="padding-right: 25px; display: none;"></span>
-                    <button id="sign-in" type="submit" class="btn btn-bright login-button"><i class="fa fa-sign-in"></i>&nbsp; Sign In</button>
-                </div>
-                <input type="hidden" id="admin_login" name="admin_login" value="1" />
-            </form>
-        </div>
-    </div>
-</div>
-% else:
-<div id="donate-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="donate-modal">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title">Tautulli Donation</h4>
-            </div>
-            <div class="modal-body">
-                <div class="row">
-                    <div class="col-md-12" style="text-align: center;">
-                        <h4>
-                            <strong>Thank you for supporting Tautulli!</strong>
-                        </h4>
-                        <p>
-                            Please select a donation method.
-                        </p>
-                    </div>
-                </div>
-                <ul id="donation_type" class="nav nav-pills" role="tablist" style="display: flex; justify-content: center; margin: 10px 0;">
-                    <li class="active"><a href="#github-donation" role="tab" data-toggle="tab">GitHub</a></li>
-                    <li><a href="#patreon-donation" role="tab" data-toggle="tab">Patreon</a></li>
-                    <li><a href="#stripe-donation" role="tab" data-toggle="tab">Stripe</a></li>
-                    <li><a href="#paypal-donation" role="tab" data-toggle="tab">PayPal</a></li>
-                    <li><a href="#crypto-donation" role="tab" data-toggle="tab" id="crypto-donation-tab">Crypto</a></li>
-                </ul>
-                <div class="tab-content">
-                    <div role="tabpanel" class="tab-pane active" id="github-donation" style="text-align: center">
-                        <p>
-                            Click the button below to continue to GitHub.
-                        </p>
-                        <p>
-                            <a href="${anon_url('https://github.com/sponsors/JonnyWong16')}" target="_blank" rel="noreferrer" class="btn btn-sm btn-default" style="font-weight: 600;">
-                                <i class="fa fa-heart fa-sm" style="color: #ea4aaa;"></i>&nbsp; Sponsor
-                            </a>
-                        </p>
-                        <p class="small-muted">(GitHub does not have a fee)</p>
-                    </div>
-                    <div role="tabpanel" class="tab-pane" id="patreon-donation" style="text-align: center">
-                        <p>
-                            Click the button below to continue to Patreon.
-                        </p>
-                        <p>
-                            <a href="${anon_url('https://www.patreon.com/join/tautulli')}" target="_blank" rel="noreferrer">
-                                <img src="images/become_a_patron_button.png" alt="Become a Patron" width="170" height="40">
-                            </a>
-                        </p>
-                        <p class="small-muted">(Patreon has a fee)</p>
-                    </div>
-                    <div role="tabpanel" class="tab-pane" id="stripe-donation" style="text-align: center">
-                        <p>
-                            Click the button below to continue to Stripe.
-                        </p>
-                        <p>
-                            <a href="${anon_url('https://donate.stripe.com/5kA7vnb7dczVbxC9AA')}" target="_blank" rel="noreferrer">
-                                <img src="images/Stripe_wordmark_-_white_small_28px.png" alt="Stripe" style="background-color: #7068fe; border-radius: 3px; padding: 3px;">
-                            </a>
-                        </p>
-                        <p class="small-muted">(Stripe has a fee)</p>
-                    </div>
-                    <div role="tabpanel" class="tab-pane" id="paypal-donation" style="text-align: center">
-                        <p>
-                            Click the button below to continue to PayPal.
-                        </p>
-                        <p>
-                            <a href="${anon_url('https://www.paypal.com/donate/?hosted_button_id=CUHSQ99KAKC5Q')}" target="_blank" rel="noreferrer">
-                                <img src="images/gold-rect-paypal-34px.png" alt="PayPal">
-                            </a>
-                        </p>
-                        <p class="small-muted">(PayPal has a fee)</p>
-                    </div>
-                    <div role="tabpanel" class="tab-pane" id="crypto-donation" style="text-align: center">
-                        <p>
-                            Select a cryptocurrency.
-                        </p>
-                        <select class="form-control" id="crypto-select"></select>
-                        <div id="crypto-qrcode"></div>
-                        <div id="crypto-address" class="form-group">
-                            <label>Address:</label>
-                            <span class="inline-pre" id="crypto-address-value"></span>
-                        </div>
-                        <p>
-                            Or click the button below to continue to Coinbase.
-                        </p>
-                        <a href="${anon_url('https://commerce.coinbase.com/checkout/8a9fa08c-8a38-409e-9220-868124c4ba0c')}" target="_blank" rel="noreferrer" class="donate-with-crypto">
-                            <span>Donate with Crypto</span>
-                        </a>
-                    </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <input type="button" class="btn btn-bright" data-dismiss="modal" value="Close">
-            </div>
-        </div>
-    </div>
-</div>
-% endif
-
-<div id="confirm-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="confirm-modal">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title">Confirm</h4>
-            </div>
-            <div class="modal-body">
-                <div id="confirm-message" style="text-align: center; margin-top: 20px; margin-bottom: 20px;">
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-dark" data-dismiss="modal">Cancel</button>
-                <button type="button" class="btn btn-danger btn-ok" data-dismiss="modal" id="confirm-button">Confirm</button>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script src="${http_root}js/jquery-3.6.0.min.js"></script>
-<script src="${http_root}js/bootstrap.min.js"></script>
-<script src="${http_root}js/bootstrap-hover-dropdown.min.js"></script>
-<script src="${http_root}js/moment-with-locales.min.js"></script>
-<script src="${http_root}js/moment-duration-format.min.js"></script>
-<script src="${http_root}js/pnotify.custom.min.js"></script>
-<script src="${http_root}js/platform.min.js"></script>
-<script src="${http_root}js/ipaddr.min.js"></script>
-<script src="${http_root}js/selectize.min.js"></script>
-<script src="${http_root}js/jquery.tripleclick.min.js"></script>
-<script src="${http_root}js/blurhash_pure_js_port.min.js"></script>
-<script src="${http_root}js/script.js${cache_param}"></script>
-<script src="${http_root}js/ajaxNotifications.js"></script>
-<script src="${http_root}js/kjua.min.js"></script>
+<script src="interfaces/default/js/jquery-2.1.4.min.js"></script>
+<script src="interfaces/default/js/bootstrap3/bootstrap.min.js"></script>
+<script src="interfaces/default/js/script.js"></script>
 <script>
-    % if _session['user_group'] == 'admin':
-    $('body').on('click', '#updateDismiss', function() {
-        $('#updatebar').fadeOut();
+    $('#updateDismiss').click(function() {
+        $('#updatebar').slideUp('slow');
         // Set cookie to remember dismiss decision for 1 hour.
         setCookie('updateDismiss', 'true', 1/24);
     });
 
     if (!getCookie('updateDismiss')) {
-        if ($('#updatebar').html().length > 0) {
-            $('#updatebar').show();
-        }
+        $('#updatebar').show();
     }
-
-    function checkUpdate(_callback) {
-        // Allow the update bar to show again if previously dismissed.
-        setCookie('updateDismiss', 'true', 0);
-        $.ajax({
-            url: 'update_check',
-            complete: function (xhr, status) {
-                var result = $.parseJSON(xhr.responseText);
-                var msg = '';
-                if (result.update === false) {
-                    showMsg('<i class="fa fa-check"></i> ' + result.message, false, true, 2000);
-                } else {
-                    if (result.update === null) {
-                        msg = 'You are running an unknown version of Tautulli.<br />';
-                    } else if (result.update === true && result.release === true) {
-                        msg = 'A <a href="' + result.release_url + '" target="_blank" rel="noreferrer">new release (' + result.latest_release + ')</a> of Tautulli is available!<br />';
-                    } else if (result.update === true && result.release === false) {
-                        msg = 'A <a href="' + result.compare_url + '" target="_blank" rel="noreferrer">newer version</a> of Tautulli is available!<br />' +
-                            'You are '+ result.commits_behind + ' commit' + (result.commits_behind > 1 ? 's' : '') + ' behind.<br />';
-                    }
-                    if (result.install_type === 'docker') {
-                        msg += 'Update your Docker container or <a href="#" id="updateDismiss">Dismiss</a>';
-                    } else if (result.install_type === 'snap') {
-                        msg += 'Update your Snap package or <a href="#" id="updateDismiss">Dismiss</a>';
-                    } else if (result.install_type === 'windows' || result.install_type === 'macos') {
-                        msg += '<a href="' + result.release_url + '" target="_blank" rel="noreferrer">Download</a> and install the latest version or <a href="#" id="updateDismiss">Dismiss</a>'
-                    } else {
-                        msg += '<a href="update">Update</a> or <a href="#" id="updateDismiss">Dismiss</a>';
-                    }
-                    $('#updatebar').html(msg).fadeIn();
-                }
-
-                if (_callback) {
-                    _callback();
-                }
-            }
-        });
-    }
-
-    $("#nav-shutdown").click(function() {
-        $("#confirm-message").text("Are you sure you want to shutdown Tautulli?");
-        $('#confirm-modal').modal();
-        $('#confirm-modal').one('click', '#confirm-button', function () {
-            window.location.href = "shutdown";
-        });
-    });
-
-    $("#nav-restart").click(function() {
-        $("#confirm-message").text("Are you sure you want to restart Tautulli?");
-        $('#confirm-modal').modal();
-        $('#confirm-modal').one('click', '#confirm-button', function () {
-            window.location.href = "restart";
-        });
-    });
-
-    $('#nav-update').click(function () {
-        $(this).html('<i class="fa fa-fw fa-spin fa-refresh"></i> Checking');
-        checkUpdate(function () { $('#nav-update').html('<i class="fa fa-fw fa-arrow-alt-circle-up"></i> Check for Updates'); });
-    });
-
-    $('#crypto-donation-tab').one('shown.bs.tab', function (e) {
-        $.ajax({
-            url: 'https://tautulli.com/donate/crypto-addresses.json',
-            type: 'GET',
-            dataType: 'json',
-            cache: false,
-            async: true,
-            success: function (data) {
-                $('#crypto-select').empty().append('<option selected disabled>Select Cryptocurrency</option>');
-                $.each(data, function (index, crypto) {
-                    $('<option/>', {
-                        text: crypto.name + ' (' + crypto.symbol + ')',
-                        value: crypto.address
-                    }).appendTo('#crypto-select');
-                });
-            },
-            error: function () {
-                $('#crypto-select').empty().append('<option selected disabled>Error: Unable to load addresses</option>');
-            }
-        });
-    });
-
-    $('#crypto-select').change(function() {
-        var address = $(this).val();
-        $('#crypto-qrcode').empty().kjua({
-            text: address,
-            render: 'canvas',
-            ecLevel: 'H',
-            size: 256,
-            fill: '#000',
-            back: '#eee'
-        }).show();
-        $('#crypto-address-value').text(address);
-        $('#crypto-address').show();
-    })
-
-    % endif
-
-    $('.dropdown-toggle').click(function (e) {
-        if (!(('ontouchstart' in window) || (navigator.MaxTouchPoints > 0) || (navigator.msMaxTouchPoints > 0))) {
-            window.location.href = $(this).data('href');
-        }
-    });
-
-    function displaySearch() {
-        if ($(this).width() < 768) {
-            $('#search_button').removeClass('btn-inactive');
-            $('#query').css({ right: 0, width: '100%' })
-        } else if ($('#query').val().trim() == '') {
-            $('#search_button').addClass('btn-inactive');
-            $('#query').css({ right: '-200px', width: '0' })
-        }
-    }
-    displaySearch();
-    $(window).resize(function() {
-        displaySearch();
-    });
-
+</script>
+<script>
     $('#search_form').submit(function (e) {
-        if ($('#query').val().trim() != '') {
+        if ($('#search_query').hasClass('active') && $('#search_query').val().trim() != '') {
             $.ajax({
                 type: 'post',
                 url: 'search',
-                data: { query: $('#query').val() }
+                data: { 'query': $('#search_query').val() }
             })
         } else {
             e.preventDefault();
-            if ($(window).width() >= 768) {
-                $('#search_button').removeClass('btn-inactive');
-                $('#query').clearQueue().val('').animate({ right: '0', width: '200px' }).addClass('active').focus();
-            }
+            $('#search_button').removeClass('btn-inactive');
+            $('#search_query').clearQueue().val('').animate({ right: '0', width: '250px' }).addClass('active').focus();
         }
     })
-    $('#query').on('blur', function (e) {
-        if ($(this).val().trim() == '' && $(window).width() >= 768) {
-            $(this).delay(200).animate({ right: '-200px', width: '0' }, function () {
-                displaySearch();
+    $('#search_query').on('blur', function (e) {
+        if ($(this).val().trim() == '') {
+            $(this).delay(200).animate({ right: '-250px', width: '0' }, function () {
+                $('#search_button').addClass('btn-inactive');
             }).removeClass('active');
         }
     });
-
-    $(document).ready(function () {
-        // Work around for iOS web app links opening in Safari
-        if (("standalone" in window.navigator) && window.navigator.standalone) {
-            // For iOS Apps
-            $('a').on('click', function (e) {
-                e.preventDefault();
-                var new_location = $(this).attr('href');
-                if (new_location != undefined && new_location.substr(0, 1) != '#' && $(this).attr('data-method') == undefined) {
-                    window.location = new_location;
-                }
-            });
-        }
-
-        // Allow stacked bootstrap modals
-        $(document).on('show.bs.modal', '.modal', function (event) {
-            var zIndex = 1040 + (10 * $('.modal:visible').length);
-            $(this).css('z-index', zIndex);
-            setTimeout(function() {
-                $('.modal-backdrop').not('.modal-stack').css('z-index', zIndex - 1).addClass('modal-stack');
-            }, 0);
-        });
-        $(document).on('hidden.bs.modal', '.modal', function () {
-            $('.modal:visible').length && $(document.body).addClass('modal-open');
-        });
-
-        % if _session['user_group'] == 'admin' and BROWSER_NOTIFIERS:
-        check_notifications();
-        % endif
-    });
-
-    % if _session['user_group'] != 'admin':
-    $('#admin-login-modal').on('shown.bs.modal', function () {
-        $('#admin-login-modal #username').focus()
-    })
-
-    $('#login-form').submit(function(event) {
-        event.preventDefault();
-        $('#sign-in').prop('disabled', true).html('<i class="fa fa-refresh fa-spin"></i>&nbsp; Sign In');
-        $.ajax({
-            url: '${http_root}auth/signin',
-            type: 'POST',
-            data: $(this).serialize(),
-            dataType: 'json',
-            statusCode: {
-                200: function(xhr, status) {
-                   window.location = "${http_root}";
-                },
-                401: function(xhr, status) {
-                    $('#sign-in-alert').text('Incorrect username or password.').show();
-                    $('#username').focus();
-                },
-                429: function(xhr, status) {
-                    var retry = Math.ceil(xhr.getResponseHeader('Retry-After') / 60)
-                    $('#sign-in-alert').text('Too many login attempts. Try again in ' + retry + ' minute(s).').show();
-                }
-            },
-            complete: function() {
-                $('#sign-in').prop('disabled', false).html('<i class="fa fa-sign-in"></i>&nbsp; Sign In');
-            }
-        });
-    });
-    % endif
 </script>
 ${next.javascriptIncludes()}
 </body>
 </html>
 
-<%def name="modalIncludes()"></%def>
 <%def name="javascriptIncludes()"></%def>
 <%def name="headIncludes()"></%def>
 <%def name="headerIncludes()"></%def>
diff --git a/data/interfaces/default/config_import.html b/data/interfaces/default/config_import.html
deleted file mode 100644
index 984e482f..00000000
--- a/data/interfaces/default/config_import.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<div class="modal-dialog" role="document">
-    <div class="modal-content">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-            <h4 class="modal-title">${title}</h4>
-        </div>
-        <div class="modal-body" id="modal-text">
-            <form id="import_config_form" enctype="multipart/form-data" method="post" name="import_config_form">
-                <div class="form-group">
-                    <label for="import_config_file">Option 1: Upload a Configuration File</label>
-                    <div class="row">
-                        <div class="col-xs-12">
-                            <div class="input-group">
-                                <label for="import_config_file" class="input-group-btn">
-                                    <span class="btn btn-form">Upload</span>
-                                    <input type="file" style="display: none;" id="import_config_file" name="import_config_file" required>
-                                </label>
-                                <input id="import_config_file_name" type="text" class="form-control" placeholder="config.ini" disabled>
-                            </div>
-                        </div>
-                    </div>
-                    <p class="help-block">Upload the Tautulli configuration file you wish to import.</p>
-                </div>
-                <div class="form-group">
-                    <label for="import_config_path">Option 2: Browse for a Configuration File</label>
-                    <div class="row">
-                        <div class="col-xs-12">
-                            <div class="input-group">
-                                <span class="input-group-btn">
-                                    <button class="btn btn-form" type="button" id="import_config_path_browse" data-toggle="browse" data-description="Configuration File" data-filter=".ini" data-target="#import_config_path">Browse</button>
-                                </span>
-                                <input type="text" class="form-control" id="import_config_path" name="import_config_path" value="" placeholder="config.ini" required disabled>
-                            </div>
-                        </div>
-                    </div>
-                    <p class="help-block">Browse for the Tautulli configuration file you wish to import.</p>
-                </div>
-                <div class="checkbox">
-                    <label>
-                        <input type="checkbox" name="import_backup_config" id="import_backup_config" value="1" checked> Backup Current Configuration
-                    </label>
-                    <p class="help-block">Automatically create a backup of the current configuration before importing.</p>
-                </div>
-                <div class="form-group">
-                    <label>Import Notes</label>
-                    <p class="help-block">The following settings will <em>not</em> be imported:</p>
-                    <ul class="help-block" style="padding-inline-start: 15px;">
-                        <li>Git Path, Log / Backup / Cache Directory, Plex Logs Folder</li>
-                        <li>Custom Newsletter Templates Folder, Newsletter Output Directory</li>
-                        <li>HTTP Host / Port / Root / Username / Password</li>
-                        <li>Enable HTTPS, HTTPS Certificate / Certificate Chain / Key</li>
-                    </ul>
-                </div>
-            </form>
-        </div>
-        <div class="modal-footer">
-            <div>
-                <span id="status-message" style="padding-right: 25px;"></span>
-                <input type="button" id="import_config" class="btn btn-bright" value="Import">
-            </div>
-        </div>
-    </div>
-</div>
-<script>
-    $("#import_config_file").change(function() {
-        if ($(this)[0].files[0]) {
-            $("#import_config_file_name").val($(this)[0].files[0].name);
-        }
-    });
-
-    $("#import_config").click(function() {
-        $(this).prop('disabled', true);
-
-        var config_file = $("#import_config_file")[0].files[0];
-        var config_path = $("#import_config_path").val();
-        var backup = $("#import_backup_config").is(':checked');
-
-        var content_type;
-        var process_data;
-        var data;
-
-        if (config_file) {
-            content_type = false;
-            process_data = false;
-            data = new FormData();
-            data.append('config_file', config_file);
-            data.append('backup', backup);
-        } else {
-            content_type = 'application/x-www-form-urlencoded; charset=UTF-8';
-            process_data = true;
-            data = {
-                config_path: config_path,
-                backup: backup
-            }
-        }
-
-        if (config_file) {
-            $("#status-message").html('<i class="fa fa-fw fa-spin fa-refresh"></i>&nbsp; Uploading config file...');
-        } else {
-            $("#status-message").html('<i class="fa fa-fw fa-spin fa-refresh"></i>');
-        }
-
-        $.ajax({
-            url: 'import_config',
-            type: 'POST',
-            data: data,
-            cache: false,
-            async: true,
-            contentType: content_type,
-            processData: process_data,
-            success: function(data) {
-                var msg;
-                if (data.result === 'success') {
-                    msg = "<i class='fa fa-check'></i>&nbsp; " + data.message;
-                    window.location.href = 'restart_import_config';
-                } else {
-                    msg = "<i class='fa fa-exclamation-triangle'></i>&nbsp; " + data.message;
-                }
-                $("#status-message").html(msg);
-                $("#import_config_file").val(null);
-                $("#import_config_file_name").val('');
-                $("#import_config_path").val('');
-            },
-            error: function (xhr) {
-                var msg = "<i class='fa fa-exclamation-triangle'></i>&nbsp; Error (" + xhr.status + "): ";
-                if (xhr.status === 413) {
-                    msg += "file is too large to upload"
-                } else {
-                    msg += 'try again'
-                }
-                $("#status-message").html(msg);
-            },
-            complete: function(xhr) {
-                $("#import_config").prop('disabled', false);
-            }
-        });
-    });
-</script>
\ No newline at end of file
diff --git a/data/interfaces/default/configuration_table.html b/data/interfaces/default/configuration_table.html
deleted file mode 100644
index e0f3155d..00000000
--- a/data/interfaces/default/configuration_table.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<%doc>
-USAGE DOCUMENTATION :: PLEASE LEAVE THIS AT THE TOP OF THIS FILE
-
-For Mako templating syntax documentation please visit: http://docs.makotemplates.org/en/latest/
-
-Filename:           configuration_table.html
-Version:            0.1
-
-DOCUMENTATION :: END
-</%doc>
-
-<%!
-    import os
-    import sqlite3
-    import sys
-    import plexpy
-    from plexpy import common, logger
-    from plexpy.helpers import anon_url
-%>
-
-<table class="config-info-table small-muted">
-    <tbody>
-        % if plexpy.CURRENT_VERSION:
-        <tr>
-            <td>Git Branch:</td>
-            <td><a class="no-highlight" href="${anon_url('https://github.com/%s/%s/tree/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.CONFIG.GIT_BRANCH))}" target="_blank" rel="noreferrer">${plexpy.CONFIG.GIT_BRANCH}</a></td>
-        </tr>
-        <tr>
-            <td>Git Commit Hash:</td>
-            <td><a class="no-highlight" href="${anon_url('https://github.com/%s/%s/commit/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO, plexpy.CURRENT_VERSION))}" target="_blank" rel="noreferrer">${plexpy.CURRENT_VERSION}</a></td>
-        </tr>
-        % endif
-        <tr>
-            <td>Configuration File:</td>
-            <td><a class="no-highlight" href="download_config" data-toggle="tooltip" data-placement="right" title="Download Configuration">${plexpy.CONFIG_FILE}</a></td>
-        </tr>
-        <tr>
-            <td>Database File:</td>
-            <td><a class="no-highlight" href="download_database" data-toggle="tooltip" data-placement="right" title="Download Database">${plexpy.DB_FILE}</a> | <a class="no-highlight" href="status/database">Status</a></td>
-        </tr>
-        <tr>
-            <td>Log File:</td>
-            <td><a class="no-highlight" href="download_log" data-toggle="tooltip" data-placement="right" title="Download Log">${os.path.join(plexpy.CONFIG.LOG_DIR, logger.FILENAME)}</a></td>
-        </tr>
-        <tr>
-            <td>Backup Directory:</td>
-            <td>${plexpy.CONFIG.BACKUP_DIR}</td>
-        </tr>
-        <tr>
-            <td>Cache Directory:</td>
-            <td>${plexpy.CONFIG.CACHE_DIR}</td>
-        </tr>
-        <tr>
-            <td>Export Directory:</td>
-            <td>${plexpy.CONFIG.EXPORT_DIR}</td>
-        </tr>
-        <tr>
-            <td>Newsletter Directory:</td>
-            <td>${plexpy.CONFIG.NEWSLETTER_DIR}</td>
-        </tr>
-        % if plexpy.ARGS:
-        <tr>
-            <td>Arguments:</td>
-            <td>${plexpy.ARGS}</td>
-        </tr>
-        % endif
-        <tr>
-            <td>Platform:</td>
-            <td>${'[Docker] ' if plexpy.DOCKER else ''}${common.PLATFORM} ${common.PLATFORM_RELEASE} (${common.PLATFORM_VERSION + (' - {}'.format(common.PLATFORM_LINUX_DISTRO) if common.PLATFORM_LINUX_DISTRO else '')})</td>
-        </tr>
-        <tr>
-            <td>System Timezone:</td>
-            <td>${str(plexpy.SYS_TIMEZONE)} (${'UTC{}'.format(plexpy.SYS_UTC_OFFSET)})
-        </tr>
-        <tr>
-            <td>System Language:</td>
-            <td>${plexpy.SYS_LANGUAGE}${' (override {})'.format(plexpy.CONFIG.PMS_LANGUAGE) if plexpy.CONFIG.PMS_LANGUAGE else ''}</td>
-        </tr>
-        <tr>
-            <td>Python Version:</td>
-            <td>${sys.version}</td>
-        </tr>
-        <tr>
-            <td>SQLite Version:</td>
-            <td>${sqlite3.sqlite_version}</td>
-        </tr>
-        <tr>
-            <td class="top-line">Resources:</td>
-            <td class="top-line">
-                <a class="no-highlight" href="${anon_url('https://tautulli.com')}" target="_blank" rel="noreferrer">Tautulli Website</a> |
-                <a class="no-highlight" href="${anon_url('https://github.com/%s/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank" rel="noreferrer">Source</a> |
-                <a class="no-highlight" href="${anon_url('https://github.com/%s/%s/wiki' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank" rel="noreferrer">Wiki</a> |
-                <a class="no-highlight guidelines-modal-link" href="${anon_url('https://github.com/%s/%s/issues' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" rel="noreferrer" data-id="issue">Bug Reports</a> |
-                <a class="no-highlight guidelines-modal-link" href="${anon_url('https://github.com/%s/%s/issues' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" rel="noreferrer" data-id="feature request">Feature Requests</a>
-            </td>
-        </tr>
-        <tr>
-            <td>Support:</td>
-            <td>
-                <a class="no-highlight support-modal-link" href="${anon_url('https://tautulli.com/discord')}" target="_blank" rel="noreferrer">Tautulli Discord Server</a> |
-                <a class="no-highlight support-modal-link" href="${anon_url('https://www.reddit.com/r/Tautulli')}" target="_blank" rel="noreferrer">Tautulli Subreddit</a> |
-                <a class="no-highlight support-modal-link" href="${anon_url('https://forums.plex.tv/t/tautulli-monitor-your-plex-media-server/225242')}" target="_blank" rel="noreferrer">Plex Forums</a>
-            </td>
-        </tr>
-    </tbody>
-</table>
-
-<script>
-    $(document).ready(function () {
-        $('.guidelines-modal-link').on('click', function (e) {
-            e.preventDefault();
-            $('#guidelines-type').text($(this).data('id'))
-            $('#guidelines-modal').modal();
-            $('#guidelines-continue').attr('href', $(this).attr('href')).on('click', function () {
-                $('#guidelines-modal').modal('hide');
-            });
-        });
-        $('.support-modal-link').on('click', function (e) {
-            e.preventDefault();
-            $('#support-modal').modal();
-            $('#support-continue').attr('href', $(this).attr('href')).on('click', function () {
-                $('#support-modal').modal('hide');
-            });
-        });
-
-        $('body').tooltip({
-            selector: '[data-toggle="tooltip"]',
-            container: 'body'
-        });
-
-    });
-</script>
\ No newline at end of file
diff --git a/data/interfaces/default/css/bootstrap-select.min.css b/data/interfaces/default/css/bootstrap-select.min.css
deleted file mode 100644
index d22faa63..00000000
--- a/data/interfaces/default/css/bootstrap-select.min.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/*!
- * Bootstrap-select v1.13.14 (https://developer.snapappointments.com/bootstrap-select)
- *
- * Copyright 2012-2020 SnapAppointments, LLC
- * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
- */@-webkit-keyframes bs-notify-fadeOut{0%{opacity:.9}100%{opacity:0}}@-o-keyframes bs-notify-fadeOut{0%{opacity:.9}100%{opacity:0}}@keyframes bs-notify-fadeOut{0%{opacity:.9}100%{opacity:0}}.bootstrap-select>select.bs-select-hidden,select.bs-select-hidden,select.selectpicker{display:none!important}.bootstrap-select{width:220px\0;vertical-align:middle}.bootstrap-select>.dropdown-toggle{position:relative;width:100%;text-align:right;white-space:nowrap;display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}.bootstrap-select>.dropdown-toggle:after{margin-top:-1px}.bootstrap-select>.dropdown-toggle.bs-placeholder,.bootstrap-select>.dropdown-toggle.bs-placeholder:active,.bootstrap-select>.dropdown-toggle.bs-placeholder:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder:hover{color:#999}.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-danger:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-dark:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-info:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-primary:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-secondary:hover,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:active,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:focus,.bootstrap-select>.dropdown-toggle.bs-placeholder.btn-success:hover{color:rgba(255,255,255,.5)}.bootstrap-select>select{position:absolute!important;bottom:0;left:50%;display:block!important;width:.5px!important;height:100%!important;padding:0!important;opacity:0!important;border:none;z-index:0!important}.bootstrap-select>select.mobile-device{top:0;left:0;display:block!important;width:100%!important;z-index:2!important}.bootstrap-select.is-invalid .dropdown-toggle,.error .bootstrap-select .dropdown-toggle,.has-error .bootstrap-select .dropdown-toggle,.was-validated .bootstrap-select select:invalid+.dropdown-toggle{border-color:#b94a48}.bootstrap-select.is-valid .dropdown-toggle,.was-validated .bootstrap-select select:valid+.dropdown-toggle{border-color:#28a745}.bootstrap-select.fit-width{width:auto!important}.bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn){width:220px}.bootstrap-select .dropdown-toggle:focus,.bootstrap-select>select.mobile-device:focus+.dropdown-toggle{outline:thin dotted #333!important;outline:5px auto -webkit-focus-ring-color!important;outline-offset:-2px}.bootstrap-select.form-control{margin-bottom:0;padding:0;border:none;height:auto}:not(.input-group)>.bootstrap-select.form-control:not([class*=col-]){width:100%}.bootstrap-select.form-control.input-group-btn{float:none;z-index:auto}.form-inline .bootstrap-select,.form-inline .bootstrap-select.form-control:not([class*=col-]){width:auto}.bootstrap-select:not(.input-group-btn),.bootstrap-select[class*=col-]{float:none;display:inline-block;margin-left:0}.bootstrap-select.dropdown-menu-right,.bootstrap-select[class*=col-].dropdown-menu-right,.row .bootstrap-select[class*=col-].dropdown-menu-right{float:right}.form-group .bootstrap-select,.form-horizontal .bootstrap-select,.form-inline .bootstrap-select{margin-bottom:0}.form-group-lg .bootstrap-select.form-control,.form-group-sm .bootstrap-select.form-control{padding:0}.form-group-lg .bootstrap-select.form-control .dropdown-toggle,.form-group-sm .bootstrap-select.form-control .dropdown-toggle{height:100%;font-size:inherit;line-height:inherit;border-radius:inherit}.bootstrap-select.form-control-lg .dropdown-toggle,.bootstrap-select.form-control-sm .dropdown-toggle{font-size:inherit;line-height:inherit;border-radius:inherit}.bootstrap-select.form-control-sm .dropdown-toggle{padding:.25rem .5rem}.bootstrap-select.form-control-lg .dropdown-toggle{padding:.5rem 1rem}.form-inline .bootstrap-select .form-control{width:100%}.bootstrap-select.disabled,.bootstrap-select>.disabled{cursor:not-allowed}.bootstrap-select.disabled:focus,.bootstrap-select>.disabled:focus{outline:0!important}.bootstrap-select.bs-container{position:absolute;top:0;left:0;height:0!important;padding:0!important}.bootstrap-select.bs-container .dropdown-menu{z-index:1060}.bootstrap-select .dropdown-toggle .filter-option{position:static;top:0;left:0;float:left;height:100%;width:100%;text-align:left;overflow:hidden;-webkit-box-flex:0;-webkit-flex:0 1 auto;-ms-flex:0 1 auto;flex:0 1 auto}.bs3.bootstrap-select .dropdown-toggle .filter-option{padding-right:inherit}.input-group .bs3-has-addon.bootstrap-select .dropdown-toggle .filter-option{position:absolute;padding-top:inherit;padding-bottom:inherit;padding-left:inherit;float:none}.input-group .bs3-has-addon.bootstrap-select .dropdown-toggle .filter-option .filter-option-inner{padding-right:inherit}.bootstrap-select .dropdown-toggle .filter-option-inner-inner{overflow:hidden}.bootstrap-select .dropdown-toggle .filter-expand{width:0!important;float:left;opacity:0!important;overflow:hidden}.bootstrap-select .dropdown-toggle .caret{position:absolute;top:50%;right:12px;margin-top:-2px;vertical-align:middle}.input-group .bootstrap-select.form-control .dropdown-toggle{border-radius:inherit}.bootstrap-select[class*=col-] .dropdown-toggle{width:100%}.bootstrap-select .dropdown-menu{min-width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bootstrap-select .dropdown-menu>.inner:focus{outline:0!important}.bootstrap-select .dropdown-menu.inner{position:static;float:none;border:0;padding:0;margin:0;border-radius:0;-webkit-box-shadow:none;box-shadow:none}.bootstrap-select .dropdown-menu li{position:relative}.bootstrap-select .dropdown-menu li.active small{color:rgba(255,255,255,.5)!important}.bootstrap-select .dropdown-menu li.disabled a{cursor:not-allowed}.bootstrap-select .dropdown-menu li a{cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.bootstrap-select .dropdown-menu li a.opt{position:relative;padding-left:2.25em}.bootstrap-select .dropdown-menu li a span.check-mark{display:none}.bootstrap-select .dropdown-menu li a span.text{display:inline-block}.bootstrap-select .dropdown-menu li small{padding-left:.5em}.bootstrap-select .dropdown-menu .notify{position:absolute;bottom:5px;width:96%;margin:0 2%;min-height:26px;padding:3px 5px;background:#f5f5f5;border:1px solid #e3e3e3;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05);pointer-events:none;opacity:.9;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bootstrap-select .dropdown-menu .notify.fadeOut{-webkit-animation:.3s linear 750ms forwards bs-notify-fadeOut;-o-animation:.3s linear 750ms forwards bs-notify-fadeOut;animation:.3s linear 750ms forwards bs-notify-fadeOut}.bootstrap-select .no-results{padding:3px;background:#f5f5f5;margin:0 5px;white-space:nowrap}.bootstrap-select.fit-width .dropdown-toggle .filter-option{position:static;display:inline;padding:0}.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner,.bootstrap-select.fit-width .dropdown-toggle .filter-option-inner-inner{display:inline}.bootstrap-select.fit-width .dropdown-toggle .bs-caret:before{content:'\00a0'}.bootstrap-select.fit-width .dropdown-toggle .caret{position:static;top:auto;margin-top:-1px}.bootstrap-select.show-tick .dropdown-menu .selected span.check-mark{position:absolute;display:inline-block;right:15px;top:5px}.bootstrap-select.show-tick .dropdown-menu li a span.text{margin-right:34px}.bootstrap-select .bs-ok-default:after{content:'';display:block;width:.5em;height:1em;border-style:solid;border-width:0 .26em .26em 0;-webkit-transform:rotate(45deg);-ms-transform:rotate(45deg);-o-transform:rotate(45deg);transform:rotate(45deg)}.bootstrap-select.show-menu-arrow.open>.dropdown-toggle,.bootstrap-select.show-menu-arrow.show>.dropdown-toggle{z-index:1061}.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:before{content:'';border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid rgba(204,204,204,.2);position:absolute;bottom:-4px;left:9px;display:none}.bootstrap-select.show-menu-arrow .dropdown-toggle .filter-option:after{content:'';border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;bottom:-4px;left:10px;display:none}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:before{bottom:auto;top:-4px;border-top:7px solid rgba(204,204,204,.2);border-bottom:0}.bootstrap-select.show-menu-arrow.dropup .dropdown-toggle .filter-option:after{bottom:auto;top:-4px;border-top:6px solid #fff;border-bottom:0}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:before{right:12px;left:auto}.bootstrap-select.show-menu-arrow.pull-right .dropdown-toggle .filter-option:after{right:13px;left:auto}.bootstrap-select.show-menu-arrow.open>.dropdown-toggle .filter-option:after,.bootstrap-select.show-menu-arrow.open>.dropdown-toggle .filter-option:before,.bootstrap-select.show-menu-arrow.show>.dropdown-toggle .filter-option:after,.bootstrap-select.show-menu-arrow.show>.dropdown-toggle .filter-option:before{display:block}.bs-actionsbox,.bs-donebutton,.bs-searchbox{padding:4px 8px}.bs-actionsbox{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bs-actionsbox .btn-group button{width:50%}.bs-donebutton{float:left;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.bs-donebutton .btn-group button{width:100%}.bs-searchbox+.bs-actionsbox{padding:0 8px 4px}.bs-searchbox .form-control{margin-bottom:0;width:100%;float:none}
\ No newline at end of file
diff --git a/data/interfaces/default/css/bootstrap3/bootstrap.min.css b/data/interfaces/default/css/bootstrap3/bootstrap.min.css
index c5887780..d65c66b1 100644
--- a/data/interfaces/default/css/bootstrap3/bootstrap.min.css
+++ b/data/interfaces/default/css/bootstrap3/bootstrap.min.css
@@ -2,4 +2,4 @@
  * Bootstrap v3.3.5 (http://getbootstrap.com)
  * Copyright 2011-2015 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="#"]:after,a[href^="javascript:"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{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 #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../../fonts/bootstrap3/glyphicons-halflings-regular.eot);src:url(../../fonts/bootstrap3/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../../fonts/bootstrap3/glyphicons-halflings-regular.woff2) format('woff2'),url(../../fonts/bootstrap3/glyphicons-halflings-regular.woff) format('woff'),url(../../fonts/bootstrap3/glyphicons-halflings-regular.ttf) format('truetype'),url(../../fonts/bootstrap3/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:transparent}body{font-family:'Open Sans',sans-serif;font-size:14px;line-height:1.42857143;color:#fff;background-color:#1f1f1f}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}.uneditable-input,input[type=color],input[type=date],input[type=datetime-local],input[type=datetime],input[type=email],input[type=month],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=time],input[type=url],input[type=week],textarea{margin-top:5px;color:#fff;border:0 solid #444;background:#333;height:30px;padding:2px 5px 2px 12px;background-color:#3a3a3a;border-radius:14.5px;transition:background-color .3s}.uneditable-input:focus,input[type=color]:focus,input[type=date]:focus,input[type=datetime-local]:focus,input[type=datetime]:focus,input[type=email]:focus,input[type=month]:focus,input[type=number]:focus,input[type=password]:focus,input[type=search]:focus,input[type=tel]:focus,input[type=text]:focus,input[type=time]:focus,input[type=url]:focus,input[type=week]:focus,textarea:focus{outline:0;color:#555;background-color:#fff;transition:background-color .3s}a{text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.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-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-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-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.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{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.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{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.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{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=checkbox]:focus,input[type=file]:focus,input[type=radio]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=datetime-local].form-control,input[type=month].form-control,input[type=time].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],.input-group-sm input[type=time],input[type=date].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm,input[type=time].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],.input-group-lg input[type=time],input[type=date].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg,input[type=time].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:14.333333px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;-webkit-box-shadow:none;box-shadow:none;opacity:.65}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default.disabled.active,.btn-default.disabled.focus,.btn-default.disabled:active,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled],.btn-default[disabled].active,.btn-default[disabled].focus,.btn-default[disabled]:active,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default,fieldset[disabled] .btn-default.active,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:active,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled.focus,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled].focus,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled.focus,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled].focus,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled.focus,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled].focus,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled.focus,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled].focus,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled.focus,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled].focus,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.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:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:3;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:2;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-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-image:-o-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-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);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-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-image:-o-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-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)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-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-image:-o-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-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)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-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-image:-o-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-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)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-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-image:-o-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-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)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.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-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.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.in{opacity:.5}.modal-header{min-height:16.42857143px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;opacity:0;line-break:auto}.tooltip.in{opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);line-break:auto}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;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;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-15px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-15px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-15px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}}
\ No newline at end of file
+ *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{margin:.67em 0;font-size:2em}mark{color:#000;background:#ff0}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{height:0;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{margin:0;font:inherit;color:inherit}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}input{line-height:normal}input[type=checkbox],input[type=radio]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid silver}legend{padding:0;border:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-spacing:0;border-collapse:collapse}td,th{padding:0}/*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */@media print{*,:after,:before{color:#000!important;text-shadow:none!important;background:0 0!important;-webkit-box-shadow:none!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}blockquote,pre{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}h2,h3,p{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{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 #ddd!important}}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff2) format('woff2'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-eur:before,.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.glyphicon-cd:before{content:"\e201"}.glyphicon-save-file:before{content:"\e202"}.glyphicon-open-file:before{content:"\e203"}.glyphicon-level-up:before{content:"\e204"}.glyphicon-copy:before{content:"\e205"}.glyphicon-paste:before{content:"\e206"}.glyphicon-alert:before{content:"\e209"}.glyphicon-equalizer:before{content:"\e210"}.glyphicon-king:before{content:"\e211"}.glyphicon-queen:before{content:"\e212"}.glyphicon-pawn:before{content:"\e213"}.glyphicon-bishop:before{content:"\e214"}.glyphicon-knight:before{content:"\e215"}.glyphicon-baby-formula:before{content:"\e216"}.glyphicon-tent:before{content:"\26fa"}.glyphicon-blackboard:before{content:"\e218"}.glyphicon-bed:before{content:"\e219"}.glyphicon-apple:before{content:"\f8ff"}.glyphicon-erase:before{content:"\e221"}.glyphicon-hourglass:before{content:"\231b"}.glyphicon-lamp:before{content:"\e223"}.glyphicon-duplicate:before{content:"\e224"}.glyphicon-piggy-bank:before{content:"\e225"}.glyphicon-scissors:before{content:"\e226"}.glyphicon-bitcoin:before{content:"\e227"}.glyphicon-btc:before{content:"\e227"}.glyphicon-xbt:before{content:"\e227"}.glyphicon-yen:before{content:"\00a5"}.glyphicon-jpy:before{content:"\00a5"}.glyphicon-ruble:before{content:"\20bd"}.glyphicon-rub:before{content:"\20bd"}.glyphicon-scale:before{content:"\e230"}.glyphicon-ice-lolly:before{content:"\e231"}.glyphicon-ice-lolly-tasted:before{content:"\e232"}.glyphicon-education:before{content:"\e233"}.glyphicon-option-horizontal:before{content:"\e234"}.glyphicon-option-vertical:before{content:"\e235"}.glyphicon-menu-hamburger:before{content:"\e236"}.glyphicon-modal-window:before{content:"\e237"}.glyphicon-oil:before{content:"\e238"}.glyphicon-grain:before{content:"\e239"}.glyphicon-sunglasses:before{content:"\e240"}.glyphicon-text-size:before{content:"\e241"}.glyphicon-text-color:before{content:"\e242"}.glyphicon-text-background:before{content:"\e243"}.glyphicon-object-align-top:before{content:"\e244"}.glyphicon-object-align-bottom:before{content:"\e245"}.glyphicon-object-align-horizontal:before{content:"\e246"}.glyphicon-object-align-left:before{content:"\e247"}.glyphicon-object-align-vertical:before{content:"\e248"}.glyphicon-object-align-right:before{content:"\e249"}.glyphicon-triangle-right:before{content:"\e250"}.glyphicon-triangle-left:before{content:"\e251"}.glyphicon-triangle-bottom:before{content:"\e252"}.glyphicon-triangle-top:before{content:"\e253"}.glyphicon-console:before{content:"\e254"}.glyphicon-superscript:before{content:"\e255"}.glyphicon-subscript:before{content:"\e256"}.glyphicon-menu-left:before{content:"\e257"}.glyphicon-menu-right:before{content:"\e258"}.glyphicon-menu-down:before{content:"\e259"}.glyphicon-menu-up:before{content:"\e260"}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}button,input,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:focus,a:hover{color:#23527c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.carousel-inner>.item>a>img,.carousel-inner>.item>img,.img-responsive,.thumbnail a>img,.thumbnail>img{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;max-width:100%;height:auto;padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role=button]{cursor:pointer}.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#777}.h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}.h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}.h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-size:75%}.h1,h1{font-size:36px}.h2,h2{font-size:30px}.h3,h3{font-size:24px}.h4,h4{font-size:18px}.h5,h5{font-size:14px}.h6,h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}.small,small{font-size:85%}.mark,mark{padding:.2em;background-color:#fcf8e3}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-nowrap{white-space:nowrap}.text-lowercase{text-transform:lowercase}.text-uppercase{text-transform:uppercase}.text-capitalize{text-transform:capitalize}.text-muted{color:#777}.text-primary{color:#337ab7}a.text-primary:focus,a.text-primary:hover{color:#286090}.text-success{color:#3c763d}a.text-success:focus,a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:focus,a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:focus,a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:focus,a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#337ab7}a.bg-primary:focus,a.bg-primary:hover{background-color:#286090}.bg-success{background-color:#dff0d8}a.bg-success:focus,a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:focus,a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:focus,a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:focus,a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ol,ul{margin-top:0;margin-bottom:10px}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;margin-left:-5px;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-top:0;margin-bottom:20px}dd,dt{line-height:1.42857143}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #777}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote ol:last-child,blockquote p:last-child,blockquote ul:last-child{margin-bottom:0}blockquote .small,blockquote footer,blockquote small{display:block;font-size:80%;line-height:1.42857143;color:#777}blockquote .small:before,blockquote footer:before,blockquote small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;text-align:right;border-right:5px solid #eee;border-left:0}.blockquote-reverse .small:before,.blockquote-reverse footer:before,.blockquote-reverse small:before,blockquote.pull-right .small:before,blockquote.pull-right footer:before,blockquote.pull-right small:before{content:''}.blockquote-reverse .small:after,.blockquote-reverse footer:after,.blockquote-reverse small:after,blockquote.pull-right .small:after,blockquote.pull-right footer:after,blockquote.pull-right small:after{content:'\00A0 \2014'}address{margin-bottom:20px;font-style:normal;line-height:1.42857143}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.25);box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}kbd kbd{padding:0;font-size:100%;font-weight:700;-webkit-box-shadow:none;box-shadow:none}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.42857143;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.row{margin-right:-15px;margin-left:-15px}.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-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-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-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666667%}.col-xs-10{width:83.33333333%}.col-xs-9{width:75%}.col-xs-8{width:66.66666667%}.col-xs-7{width:58.33333333%}.col-xs-6{width:50%}.col-xs-5{width:41.66666667%}.col-xs-4{width:33.33333333%}.col-xs-3{width:25%}.col-xs-2{width:16.66666667%}.col-xs-1{width:8.33333333%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666667%}.col-xs-pull-10{right:83.33333333%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666667%}.col-xs-pull-7{right:58.33333333%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666667%}.col-xs-pull-4{right:33.33333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.66666667%}.col-xs-pull-1{right:8.33333333%}.col-xs-pull-0{right:auto}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666667%}.col-xs-push-10{left:83.33333333%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666667%}.col-xs-push-7{left:58.33333333%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666667%}.col-xs-push-4{left:33.33333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.66666667%}.col-xs-push-1{left:8.33333333%}.col-xs-push-0{left:auto}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666667%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.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{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666667%}.col-sm-10{width:83.33333333%}.col-sm-9{width:75%}.col-sm-8{width:66.66666667%}.col-sm-7{width:58.33333333%}.col-sm-6{width:50%}.col-sm-5{width:41.66666667%}.col-sm-4{width:33.33333333%}.col-sm-3{width:25%}.col-sm-2{width:16.66666667%}.col-sm-1{width:8.33333333%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666667%}.col-sm-pull-10{right:83.33333333%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666667%}.col-sm-pull-7{right:58.33333333%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666667%}.col-sm-pull-4{right:33.33333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.66666667%}.col-sm-pull-1{right:8.33333333%}.col-sm-pull-0{right:auto}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666667%}.col-sm-push-10{left:83.33333333%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666667%}.col-sm-push-7{left:58.33333333%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666667%}.col-sm-push-4{left:33.33333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.66666667%}.col-sm-push-1{left:8.33333333%}.col-sm-push-0{left:auto}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666667%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.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{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666667%}.col-md-10{width:83.33333333%}.col-md-9{width:75%}.col-md-8{width:66.66666667%}.col-md-7{width:58.33333333%}.col-md-6{width:50%}.col-md-5{width:41.66666667%}.col-md-4{width:33.33333333%}.col-md-3{width:25%}.col-md-2{width:16.66666667%}.col-md-1{width:8.33333333%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666667%}.col-md-pull-10{right:83.33333333%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666667%}.col-md-pull-7{right:58.33333333%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666667%}.col-md-pull-4{right:33.33333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.66666667%}.col-md-pull-1{right:8.33333333%}.col-md-pull-0{right:auto}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666667%}.col-md-push-10{left:83.33333333%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666667%}.col-md-push-7{left:58.33333333%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666667%}.col-md-push-4{left:33.33333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.66666667%}.col-md-push-1{left:8.33333333%}.col-md-push-0{left:auto}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666667%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.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{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666667%}.col-lg-10{width:83.33333333%}.col-lg-9{width:75%}.col-lg-8{width:66.66666667%}.col-lg-7{width:58.33333333%}.col-lg-6{width:50%}.col-lg-5{width:41.66666667%}.col-lg-4{width:33.33333333%}.col-lg-3{width:25%}.col-lg-2{width:16.66666667%}.col-lg-1{width:8.33333333%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666667%}.col-lg-pull-10{right:83.33333333%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666667%}.col-lg-pull-7{right:58.33333333%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666667%}.col-lg-pull-4{right:33.33333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.66666667%}.col-lg-pull-1{right:8.33333333%}.col-lg-pull-0{right:auto}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666667%}.col-lg-push-10{left:83.33333333%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666667%}.col-lg-push-7{left:58.33333333%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666667%}.col-lg-push-4{left:33.33333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.66666667%}.col-lg-push-1{left:8.33333333%}.col-lg-push-0{left:auto}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666667%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-0{margin-left:0}}table{background-color:transparent}caption{padding-top:8px;padding-bottom:8px;color:#777;text-align:left}th{text-align:left}.table{width:100%;max-width:100%;margin-bottom:20px}.table>tbody>tr>td,.table>tbody>tr>th,.table>tfoot>tr>td,.table>tfoot>tr>th,.table>thead>tr>td,.table>thead>tr>th{padding:8px;line-height:1.42857143;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>td,.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>td,.table>thead:first-child>tr:first-child>th{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>tbody>tr>td,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>td,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>thead>tr>th{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>tbody>tr>td,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>td,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border:1px solid #ddd}.table-bordered>thead>tr>td,.table-bordered>thead>tr>th{border-bottom-width:2px}.table-striped>tbody>tr:nth-of-type(odd){background-color:#f9f9f9}.table-hover>tbody>tr:hover{background-color:#f5f5f5}table col[class*=col-]{position:static;display:table-column;float:none}table td[class*=col-],table th[class*=col-]{position:static;display:table-cell;float:none}.table>tbody>tr.active>td,.table>tbody>tr.active>th,.table>tbody>tr>td.active,.table>tbody>tr>th.active,.table>tfoot>tr.active>td,.table>tfoot>tr.active>th,.table>tfoot>tr>td.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>thead>tr.active>th,.table>thead>tr>td.active,.table>thead>tr>th.active{background-color:#f5f5f5}.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th,.table-hover>tbody>tr:hover>.active,.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover{background-color:#e8e8e8}.table>tbody>tr.success>td,.table>tbody>tr.success>th,.table>tbody>tr>td.success,.table>tbody>tr>th.success,.table>tfoot>tr.success>td,.table>tfoot>tr.success>th,.table>tfoot>tr>td.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>thead>tr.success>th,.table>thead>tr>td.success,.table>thead>tr>th.success{background-color:#dff0d8}.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th,.table-hover>tbody>tr:hover>.success,.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover{background-color:#d0e9c6}.table>tbody>tr.info>td,.table>tbody>tr.info>th,.table>tbody>tr>td.info,.table>tbody>tr>th.info,.table>tfoot>tr.info>td,.table>tfoot>tr.info>th,.table>tfoot>tr>td.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>thead>tr.info>th,.table>thead>tr>td.info,.table>thead>tr>th.info{background-color:#d9edf7}.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th,.table-hover>tbody>tr:hover>.info,.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover{background-color:#c4e3f3}.table>tbody>tr.warning>td,.table>tbody>tr.warning>th,.table>tbody>tr>td.warning,.table>tbody>tr>th.warning,.table>tfoot>tr.warning>td,.table>tfoot>tr.warning>th,.table>tfoot>tr>td.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>thead>tr.warning>th,.table>thead>tr>td.warning,.table>thead>tr>th.warning{background-color:#fcf8e3}.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th,.table-hover>tbody>tr:hover>.warning,.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover{background-color:#faf2cc}.table>tbody>tr.danger>td,.table>tbody>tr.danger>th,.table>tbody>tr>td.danger,.table>tbody>tr>th.danger,.table>tfoot>tr.danger>td,.table>tfoot>tr.danger>th,.table>tfoot>tr>td.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>thead>tr.danger>th,.table>thead>tr>td.danger,.table>thead>tr>th.danger{background-color:#f2dede}.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th,.table-hover>tbody>tr:hover>.danger,.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover{background-color:#ebcccc}.table-responsive{min-height:.01%;overflow-x:auto}@media screen and (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>td,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>thead>tr>th{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;max-width:100%;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=checkbox]:focus,input[type=radio]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.42857143;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.42857143;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{background-color:#eee;opacity:1}.form-control[disabled],fieldset[disabled] .form-control{cursor:not-allowed}textarea.form-control{height:auto}input[type=search]{-webkit-appearance:none}@media screen and (-webkit-min-device-pixel-ratio:0){input[type=date].form-control,input[type=time].form-control,input[type=datetime-local].form-control,input[type=month].form-control{line-height:34px}.input-group-sm input[type=date],.input-group-sm input[type=time],.input-group-sm input[type=datetime-local],.input-group-sm input[type=month],input[type=date].input-sm,input[type=time].input-sm,input[type=datetime-local].input-sm,input[type=month].input-sm{line-height:30px}.input-group-lg input[type=date],.input-group-lg input[type=time],.input-group-lg input[type=datetime-local],.input-group-lg input[type=month],input[type=date].input-lg,input[type=time].input-lg,input[type=datetime-local].input-lg,input[type=month].input-lg{line-height:46px}}.form-group{margin-bottom:15px}.checkbox,.radio{position:relative;display:block;margin-top:10px;margin-bottom:10px}.checkbox label,.radio label{min-height:20px;padding-left:20px;margin-bottom:0;font-weight:400;cursor:pointer}.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox],.radio input[type=radio],.radio-inline input[type=radio]{position:absolute;margin-top:4px\9;margin-left:-20px}.checkbox+.checkbox,.radio+.radio{margin-top:-5px}.checkbox-inline,.radio-inline{position:relative;display:inline-block;padding-left:20px;margin-bottom:0;font-weight:400;vertical-align:middle;cursor:pointer}.checkbox-inline+.checkbox-inline,.radio-inline+.radio-inline{margin-top:0;margin-left:10px}fieldset[disabled] input[type=checkbox],fieldset[disabled] input[type=radio],input[type=checkbox].disabled,input[type=checkbox][disabled],input[type=radio].disabled,input[type=radio][disabled]{cursor:not-allowed}.checkbox-inline.disabled,.radio-inline.disabled,fieldset[disabled] .checkbox-inline,fieldset[disabled] .radio-inline{cursor:not-allowed}.checkbox.disabled label,.radio.disabled label,fieldset[disabled] .checkbox label,fieldset[disabled] .radio label{cursor:not-allowed}.form-control-static{min-height:34px;padding-top:7px;padding-bottom:7px;margin-bottom:0}.form-control-static.input-lg,.form-control-static.input-sm{padding-right:0;padding-left:0}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}select[multiple].input-sm,textarea.input-sm{height:auto}.form-group-sm .form-control{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.form-group-sm select.form-control{height:30px;line-height:30px}.form-group-sm select[multiple].form-control,.form-group-sm textarea.form-control{height:auto}.form-group-sm .form-control-static{height:30px;min-height:32px;padding:6px 10px;font-size:12px;line-height:1.5}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-lg{height:46px;line-height:46px}select[multiple].input-lg,textarea.input-lg{height:auto}.form-group-lg .form-control{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.form-group-lg select.form-control{height:46px;line-height:46px}.form-group-lg select[multiple].form-control,.form-group-lg textarea.form-control{height:auto}.form-group-lg .form-control-static{height:46px;min-height:38px;padding:11px 16px;font-size:18px;line-height:1.3333333}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.form-control-feedback{position:absolute;top:0;right:0;z-index:2;display:block;width:34px;height:34px;line-height:34px;text-align:center;pointer-events:none}.form-group-lg .form-control+.form-control-feedback,.input-group-lg+.form-control-feedback,.input-lg+.form-control-feedback{width:46px;height:46px;line-height:46px}.form-group-sm .form-control+.form-control-feedback,.input-group-sm+.form-control-feedback,.input-sm+.form-control-feedback{width:30px;height:30px;line-height:30px}.has-success .checkbox,.has-success .checkbox-inline,.has-success .control-label,.has-success .help-block,.has-success .radio,.has-success .radio-inline,.has-success.checkbox label,.has-success.checkbox-inline label,.has-success.radio label,.has-success.radio-inline label{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.has-success .form-control-feedback{color:#3c763d}.has-warning .checkbox,.has-warning .checkbox-inline,.has-warning .control-label,.has-warning .help-block,.has-warning .radio,.has-warning .radio-inline,.has-warning.checkbox label,.has-warning.checkbox-inline label,.has-warning.radio label,.has-warning.radio-inline label{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .checkbox,.has-error .checkbox-inline,.has-error .control-label,.has-error .help-block,.has-error .radio,.has-error .radio-inline,.has-error.checkbox label,.has-error.checkbox-inline label,.has-error.radio label,.has-error.radio-inline label{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-error .form-control-feedback{color:#a94442}.has-feedback label~.form-control-feedback{top:25px}.has-feedback label.sr-only~.form-control-feedback{top:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-static{display:inline-block}.form-inline .input-group{display:inline-table;vertical-align:middle}.form-inline .input-group .form-control,.form-inline .input-group .input-group-addon,.form-inline .input-group .input-group-btn{width:auto}.form-inline .input-group>.form-control{width:100%}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .checkbox,.form-inline .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.form-inline .checkbox label,.form-inline .radio label{padding-left:0}.form-inline .checkbox input[type=checkbox],.form-inline .radio input[type=radio]{position:relative;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .checkbox,.form-horizontal .checkbox-inline,.form-horizontal .radio,.form-horizontal .radio-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .checkbox,.form-horizontal .radio{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.form-horizontal .control-label{padding-top:7px;margin-bottom:0;text-align:right}}.form-horizontal .has-feedback .form-control-feedback{right:15px}@media (min-width:768px){.form-horizontal .form-group-lg .control-label{padding-top:14.33px;font-size:18px}}@media (min-width:768px){.form-horizontal .form-group-sm .control-label{padding-top:6px;font-size:12px}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:400;line-height:1.42857143;text-align:center;white-space:nowrap;vertical-align:middle;-ms-touch-action:manipulation;touch-action:manipulation;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-image:none;border:1px solid transparent;border-radius:4px}.btn.active.focus,.btn.active:focus,.btn.focus,.btn:active.focus,.btn:active:focus,.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.focus,.btn:focus,.btn:hover{color:#333;text-decoration:none}.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none;opacity:.65}a.btn.disabled,fieldset[disabled] a.btn{pointer-events:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default.focus,.btn-default:focus{color:#333;background-color:#e6e6e6;border-color:#8c8c8c}.btn-default:hover{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{color:#333;background-color:#e6e6e6;border-color:#adadad}.btn-default.active.focus,.btn-default.active:focus,.btn-default.active:hover,.btn-default:active.focus,.btn-default:active:focus,.btn-default:active:hover,.open>.dropdown-toggle.btn-default.focus,.open>.dropdown-toggle.btn-default:focus,.open>.dropdown-toggle.btn-default:hover{color:#333;background-color:#d4d4d4;border-color:#8c8c8c}.btn-default.active,.btn-default:active,.open>.dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default.disabled.active,.btn-default.disabled.focus,.btn-default.disabled:active,.btn-default.disabled:focus,.btn-default.disabled:hover,.btn-default[disabled],.btn-default[disabled].active,.btn-default[disabled].focus,.btn-default[disabled]:active,.btn-default[disabled]:focus,.btn-default[disabled]:hover,fieldset[disabled] .btn-default,fieldset[disabled] .btn-default.active,fieldset[disabled] .btn-default.focus,fieldset[disabled] .btn-default:active,fieldset[disabled] .btn-default:focus,fieldset[disabled] .btn-default:hover{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#337ab7;border-color:#2e6da4}.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#286090;border-color:#122b40}.btn-primary:hover{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{color:#fff;background-color:#286090;border-color:#204d74}.btn-primary.active.focus,.btn-primary.active:focus,.btn-primary.active:hover,.btn-primary:active.focus,.btn-primary:active:focus,.btn-primary:active:hover,.open>.dropdown-toggle.btn-primary.focus,.open>.dropdown-toggle.btn-primary:focus,.open>.dropdown-toggle.btn-primary:hover{color:#fff;background-color:#204d74;border-color:#122b40}.btn-primary.active,.btn-primary:active,.open>.dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary.disabled.active,.btn-primary.disabled.focus,.btn-primary.disabled:active,.btn-primary.disabled:focus,.btn-primary.disabled:hover,.btn-primary[disabled],.btn-primary[disabled].active,.btn-primary[disabled].focus,.btn-primary[disabled]:active,.btn-primary[disabled]:focus,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary,fieldset[disabled] .btn-primary.active,fieldset[disabled] .btn-primary.focus,fieldset[disabled] .btn-primary:active,fieldset[disabled] .btn-primary:focus,fieldset[disabled] .btn-primary:hover{background-color:#337ab7;border-color:#2e6da4}.btn-primary .badge{color:#337ab7;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success.focus,.btn-success:focus{color:#fff;background-color:#449d44;border-color:#255625}.btn-success:hover{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{color:#fff;background-color:#449d44;border-color:#398439}.btn-success.active.focus,.btn-success.active:focus,.btn-success.active:hover,.btn-success:active.focus,.btn-success:active:focus,.btn-success:active:hover,.open>.dropdown-toggle.btn-success.focus,.open>.dropdown-toggle.btn-success:focus,.open>.dropdown-toggle.btn-success:hover{color:#fff;background-color:#398439;border-color:#255625}.btn-success.active,.btn-success:active,.open>.dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success.disabled.active,.btn-success.disabled.focus,.btn-success.disabled:active,.btn-success.disabled:focus,.btn-success.disabled:hover,.btn-success[disabled],.btn-success[disabled].active,.btn-success[disabled].focus,.btn-success[disabled]:active,.btn-success[disabled]:focus,.btn-success[disabled]:hover,fieldset[disabled] .btn-success,fieldset[disabled] .btn-success.active,fieldset[disabled] .btn-success.focus,fieldset[disabled] .btn-success:active,fieldset[disabled] .btn-success:focus,fieldset[disabled] .btn-success:hover{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info.focus,.btn-info:focus{color:#fff;background-color:#31b0d5;border-color:#1b6d85}.btn-info:hover{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{color:#fff;background-color:#31b0d5;border-color:#269abc}.btn-info.active.focus,.btn-info.active:focus,.btn-info.active:hover,.btn-info:active.focus,.btn-info:active:focus,.btn-info:active:hover,.open>.dropdown-toggle.btn-info.focus,.open>.dropdown-toggle.btn-info:focus,.open>.dropdown-toggle.btn-info:hover{color:#fff;background-color:#269abc;border-color:#1b6d85}.btn-info.active,.btn-info:active,.open>.dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info.disabled.active,.btn-info.disabled.focus,.btn-info.disabled:active,.btn-info.disabled:focus,.btn-info.disabled:hover,.btn-info[disabled],.btn-info[disabled].active,.btn-info[disabled].focus,.btn-info[disabled]:active,.btn-info[disabled]:focus,.btn-info[disabled]:hover,fieldset[disabled] .btn-info,fieldset[disabled] .btn-info.active,fieldset[disabled] .btn-info.focus,fieldset[disabled] .btn-info:active,fieldset[disabled] .btn-info:focus,fieldset[disabled] .btn-info:hover{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning.focus,.btn-warning:focus{color:#fff;background-color:#ec971f;border-color:#985f0d}.btn-warning:hover{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{color:#fff;background-color:#ec971f;border-color:#d58512}.btn-warning.active.focus,.btn-warning.active:focus,.btn-warning.active:hover,.btn-warning:active.focus,.btn-warning:active:focus,.btn-warning:active:hover,.open>.dropdown-toggle.btn-warning.focus,.open>.dropdown-toggle.btn-warning:focus,.open>.dropdown-toggle.btn-warning:hover{color:#fff;background-color:#d58512;border-color:#985f0d}.btn-warning.active,.btn-warning:active,.open>.dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning.disabled.active,.btn-warning.disabled.focus,.btn-warning.disabled:active,.btn-warning.disabled:focus,.btn-warning.disabled:hover,.btn-warning[disabled],.btn-warning[disabled].active,.btn-warning[disabled].focus,.btn-warning[disabled]:active,.btn-warning[disabled]:focus,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning,fieldset[disabled] .btn-warning.active,fieldset[disabled] .btn-warning.focus,fieldset[disabled] .btn-warning:active,fieldset[disabled] .btn-warning:focus,fieldset[disabled] .btn-warning:hover{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c9302c;border-color:#761c19}.btn-danger:hover{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{color:#fff;background-color:#c9302c;border-color:#ac2925}.btn-danger.active.focus,.btn-danger.active:focus,.btn-danger.active:hover,.btn-danger:active.focus,.btn-danger:active:focus,.btn-danger:active:hover,.open>.dropdown-toggle.btn-danger.focus,.open>.dropdown-toggle.btn-danger:focus,.open>.dropdown-toggle.btn-danger:hover{color:#fff;background-color:#ac2925;border-color:#761c19}.btn-danger.active,.btn-danger:active,.open>.dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger.disabled.active,.btn-danger.disabled.focus,.btn-danger.disabled:active,.btn-danger.disabled:focus,.btn-danger.disabled:hover,.btn-danger[disabled],.btn-danger[disabled].active,.btn-danger[disabled].focus,.btn-danger[disabled]:active,.btn-danger[disabled]:focus,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger,fieldset[disabled] .btn-danger.active,fieldset[disabled] .btn-danger.focus,fieldset[disabled] .btn-danger:active,fieldset[disabled] .btn-danger:focus,fieldset[disabled] .btn-danger:hover{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{font-weight:400;color:#337ab7;border-radius:0}.btn-link,.btn-link.active,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:active,.btn-link:focus,.btn-link:hover{border-color:transparent}.btn-link:focus,.btn-link:hover{color:#23527c;text-decoration:underline;background-color:transparent}.btn-link[disabled]:focus,.btn-link[disabled]:hover,fieldset[disabled] .btn-link:focus,fieldset[disabled] .btn-link:hover{color:#777;text-decoration:none}.btn-group-lg>.btn,.btn-lg{padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}.btn-group-sm>.btn,.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-xs>.btn,.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:5px}input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}tr.collapse.in{display:table-row}tbody.collapse.in{display:table-row-group}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition-timing-function:ease;-o-transition-timing-function:ease;transition-timing-function:ease;-webkit-transition-duration:.35s;-o-transition-duration:.35s;transition-duration:.35s;-webkit-transition-property:height,visibility;-o-transition-property:height,visibility;transition-property:height,visibility}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px dashed;border-top:4px solid\9;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown,.dropup{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;text-align:left;list-style:none;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175)}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.42857143;color:#333;white-space:nowrap}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;background-color:#337ab7;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#777}.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{right:0;left:auto}.dropdown-menu-left{right:auto;left:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.42857143;color:#777;white-space:nowrap}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{content:"";border-top:0;border-bottom:4px dashed;border-bottom:4px solid\9}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:2px}@media (min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}.navbar-right .dropdown-menu-left{right:auto;left:0}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group-vertical>.btn,.btn-group>.btn{position:relative;float:left}.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:hover,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus,.btn-group>.btn:hover{z-index:2}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn,.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-bottom-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.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:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-left-radius:0;border-top-right-radius:0;border-bottom-left-radius:4px}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-left-radius:0;border-top-right-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}.btn-group-justified>.btn-group .dropdown-menu{left:auto}[data-toggle=buttons]>.btn input[type=checkbox],[data-toggle=buttons]>.btn input[type=radio],[data-toggle=buttons]>.btn-group>.btn input[type=checkbox],[data-toggle=buttons]>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-right:0;padding-left:0}.input-group .form-control{position:relative;z-index:2;float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.3333333;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn,textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn,textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group .form-control,.input-group-addon,.input-group-btn{display:table-cell}.input-group .form-control:not(:first-child):not(:last-child),.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=checkbox],.input-group-addon input[type=radio]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn-group:not(:last-child)>.btn,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn-group:not(:first-child)>.btn,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:active,.input-group-btn>.btn:focus,.input-group-btn>.btn:hover{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#777}.nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#777;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#eee;border-color:#337ab7}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.42857143;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:focus,.nav-tabs>li.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:focus,.nav-tabs.nav-justified>.active>a:hover{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:focus,.nav-pills>li.active>a:hover{color:#fff;background-color:#337ab7}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:focus,.nav-tabs-justified>.active>a:hover{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{padding-right:15px;padding-left:15px;overflow-x:visible;-webkit-overflow-scrolling:touch;border-top:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1)}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;-webkit-box-shadow:none;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse{padding-right:0;padding-left:0}}.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:340px}@media (max-device-width:480px) and (orientation:landscape){.navbar-fixed-bottom .navbar-collapse,.navbar-fixed-top .navbar-collapse{max-height:200px}}.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container-fluid>.navbar-collapse,.container-fluid>.navbar-header,.container>.navbar-collapse,.container>.navbar-header{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-bottom,.navbar-fixed-top{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-bottom,.navbar-fixed-top{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;height:50px;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-nav .open .dropdown-menu .dropdown-header,.navbar-nav .open .dropdown-menu>li>a{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:focus,.navbar-nav .open .dropdown-menu>li>a:hover{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1)}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .form-control-static{display:inline-block}.navbar-form .input-group{display:inline-table;vertical-align:middle}.navbar-form .input-group .form-control,.navbar-form .input-group .input-group-addon,.navbar-form .input-group .input-group-btn{width:auto}.navbar-form .input-group>.form-control{width:100%}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .checkbox,.navbar-form .radio{display:inline-block;margin-top:0;margin-bottom:0;vertical-align:middle}.navbar-form .checkbox label,.navbar-form .radio label{padding-left:0}.navbar-form .checkbox input[type=checkbox],.navbar-form .radio input[type=radio]{position:relative;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}.navbar-form .form-group:last-child{margin-bottom:0}}@media (min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-left-radius:0;border-top-right-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{margin-bottom:0;border-top-left-radius:4px;border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important;margin-right:-15px}.navbar-right~.navbar-right{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:focus,.navbar-default .navbar-brand:hover{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:focus,.navbar-default .navbar-nav>.open>a:hover{color:#555;background-color:#e7e7e7}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-default .btn-link{color:#777}.navbar-default .btn-link:focus,.navbar-default .btn-link:hover{color:#333}.navbar-default .btn-link[disabled]:focus,.navbar-default .btn-link[disabled]:hover,fieldset[disabled] .navbar-default .btn-link:focus,fieldset[disabled] .navbar-default .btn-link:hover{color:#ccc}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#9d9d9d}.navbar-inverse .navbar-brand:focus,.navbar-inverse .navbar-brand:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav>li>a:focus,.navbar-inverse .navbar-nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:focus,.navbar-inverse .navbar-nav>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:focus,.navbar-inverse .navbar-nav>.disabled>a:hover{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:focus,.navbar-inverse .navbar-toggle:hover{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:focus,.navbar-inverse .navbar-nav>.open>a:hover{color:#fff;background-color:#080808}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#9d9d9d}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#9d9d9d}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .btn-link{color:#9d9d9d}.navbar-inverse .btn-link:focus,.navbar-inverse .btn-link:hover{color:#fff}.navbar-inverse .btn-link[disabled]:focus,.navbar-inverse .btn-link[disabled]:hover,fieldset[disabled] .navbar-inverse .btn-link:focus,fieldset[disabled] .navbar-inverse .btn-link:hover{color:#444}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#777}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.42857143;color:#337ab7;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-top-left-radius:4px;border-bottom-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:focus,.pagination>li>a:hover,.pagination>li>span:focus,.pagination>li>span:hover{z-index:3;color:#23527c;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>a:focus,.pagination>.active>a:hover,.pagination>.active>span,.pagination>.active>span:focus,.pagination>.active>span:hover{z-index:2;color:#fff;cursor:default;background-color:#337ab7;border-color:#337ab7}.pagination>.disabled>a,.pagination>.disabled>a:focus,.pagination>.disabled>a:hover,.pagination>.disabled>span,.pagination>.disabled>span:focus,.pagination>.disabled>span:hover{color:#777;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px;line-height:1.3333333}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-top-left-radius:6px;border-bottom-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px;line-height:1.5}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-top-left-radius:3px;border-bottom-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:focus,.pager li>a:hover{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:focus,.pager .disabled>a:hover,.pager .disabled>span{color:#777;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}a.label:focus,a.label:hover{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#777}.label-default[href]:focus,.label-default[href]:hover{background-color:#5e5e5e}.label-primary{background-color:#337ab7}.label-primary[href]:focus,.label-primary[href]:hover{background-color:#286090}.label-success{background-color:#5cb85c}.label-success[href]:focus,.label-success[href]:hover{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:focus,.label-info[href]:hover{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:focus,.label-warning[href]:hover{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:focus,.label-danger[href]:hover{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:middle;background-color:#777;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-group-xs>.btn .badge,.btn-xs .badge{top:0;padding:1px 5px}a.badge:focus,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#337ab7;background-color:#fff}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding-top:30px;padding-bottom:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron .h1,.jumbotron h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.jumbotron>hr{border-top-color:#d5d5d5}.container .jumbotron,.container-fluid .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron,.container-fluid .jumbotron{padding-right:60px;padding-left:60px}.jumbotron .h1,.jumbotron h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:border .2s ease-in-out;-o-transition:border .2s ease-in-out;transition:border .2s ease-in-out}.thumbnail a>img,.thumbnail>img{margin-right:auto;margin-left:auto}a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#337ab7}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#337ab7;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress-bar-striped,.progress-striped .progress-bar{background-image:-webkit-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-image:-o-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-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);-webkit-background-size:40px 40px;background-size:40px 40px}.progress-bar.active,.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-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-image:-o-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-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)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-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-image:-o-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-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)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-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-image:-o-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-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)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-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-image:-o-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-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)}.media{margin-top:15px}.media:first-child{margin-top:0}.media,.media-body{overflow:hidden;zoom:1}.media-body{width:10000px}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right,.media>.pull-right{padding-left:10px}.media-left,.media>.pull-left{padding-right:10px}.media-body,.media-left,.media-right{display:table-cell;vertical-align:top}.media-middle{vertical-align:middle}.media-bottom{vertical-align:bottom}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-left-radius:4px;border-top-right-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}a.list-group-item,button.list-group-item{color:#555}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}button.list-group-item{width:100%;text-align:left}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#777;cursor:not-allowed;background-color:#eee}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#777}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#337ab7;border-color:#337ab7}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading>small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#c7ddef}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-left-radius:3px;border-top-right-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>.small,.panel-title>.small>a,.panel-title>a,.panel-title>small,.panel-title>small>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.list-group,.panel>.panel-collapse>.list-group{margin-bottom:0}.panel>.list-group .list-group-item,.panel>.panel-collapse>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group:first-child .list-group-item:first-child,.panel>.panel-collapse>.list-group:first-child .list-group-item:first-child{border-top:0;border-top-left-radius:3px;border-top-right-radius:3px}.panel>.list-group:last-child .list-group-item:last-child,.panel>.panel-collapse>.list-group:last-child .list-group-item:last-child{border-bottom:0;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.panel-heading+.panel-collapse>.list-group .list-group-item:first-child{border-top-left-radius:0;border-top-right-radius:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.list-group+.panel-footer{border-top-width:0}.panel>.panel-collapse>.table,.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-collapse>.table caption,.panel>.table caption,.panel>.table-responsive>.table caption{padding-right:15px;padding-left:15px}.panel>.table-responsive:first-child>.table:first-child,.panel>.table:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child,.panel>.table:first-child>thead:first-child>tr:first-child{border-top-left-radius:3px;border-top-right-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table-responsive:last-child>.table:last-child,.panel>.table:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive,.panel>.table+.panel-body,.panel>.table-responsive+.panel-body{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child td,.panel>.table>tbody:first-child>tr:first-child th{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child{border-left:0}.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child{border-right:0}.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th{border-bottom:0}.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse>.list-group,.panel-group .panel-heading+.panel-collapse>.panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ddd}.panel-default>.panel-heading .badge{color:#f5f5f5;background-color:#333}.panel-default>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#337ab7}.panel-primary>.panel-heading{color:#fff;background-color:#337ab7;border-color:#337ab7}.panel-primary>.panel-heading+.panel-collapse>.panel-body{border-top-color:#337ab7}.panel-primary>.panel-heading .badge{color:#337ab7;background-color:#fff}.panel-primary>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#337ab7}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse>.panel-body{border-top-color:#d6e9c6}.panel-success>.panel-heading .badge{color:#dff0d8;background-color:#3c763d}.panel-success>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse>.panel-body{border-top-color:#bce8f1}.panel-info>.panel-heading .badge{color:#d9edf7;background-color:#31708f}.panel-info>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse>.panel-body{border-top-color:#faebcc}.panel-warning>.panel-heading .badge{color:#fcf8e3;background-color:#8a6d3b}.panel-warning>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse>.panel-body{border-top-color:#ebccd1}.panel-danger>.panel-heading .badge{color:#f2dede;background-color:#a94442}.panel-danger>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#ebccd1}.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.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-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;filter:alpha(opacity=20);opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;filter:alpha(opacity=50);opacity:.5}button.close{-webkit-appearance:none;padding:0;cursor:pointer;background:0 0;border:0}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;display:none;overflow:hidden;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out;-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);-o-transform:translate(0,-25%);transform:translate(0,-25%)}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);-o-transform:translate(0,0);transform:translate(0,0)}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5)}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{filter:alpha(opacity=0);opacity:0}.modal-backdrop.in{filter:alpha(opacity=50);opacity:.5}.modal-header{min-height:16.43px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.42857143}.modal-body{position:relative;padding:15px}.modal-footer{padding:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}}@media (min-width:992px){.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1070;display:block;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:12px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;filter:alpha(opacity=0);opacity:0;line-break:auto}.tooltip.in{filter:alpha(opacity=90);opacity:.9}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{right:5px;bottom:0;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;left:5px;margin-bottom:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;right:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;left:5px;margin-top:-5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1060;display:none;max-width:276px;padding:1px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;font-style:normal;font-weight:400;line-height:1.42857143;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;word-wrap:normal;white-space:normal;background-color:#fff;-webkit-background-clip:padding-box;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);line-break:auto}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover>.arrow,.popover>.arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover>.arrow{border-width:11px}.popover>.arrow:after{content:"";border-width:10px}.popover.top>.arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,.25);border-bottom-width:0}.popover.top>.arrow:after{bottom:1px;margin-left:-10px;content:" ";border-top-color:#fff;border-bottom-width:0}.popover.right>.arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,.25);border-left-width:0}.popover.right>.arrow:after{bottom:-10px;left:1px;content:" ";border-right-color:#fff;border-left-width:0}.popover.bottom>.arrow{top:-11px;left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25)}.popover.bottom>.arrow:after{top:1px;margin-left:-10px;content:" ";border-top-width:0;border-bottom-color:#fff}.popover.left>.arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left>.arrow:after{right:1px;bottom:-10px;content:" ";border-right-width:0;border-left-color:#fff}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>a>img,.carousel-inner>.item>img{line-height:1}@media all and (transform-3d),(-webkit-transform-3d){.carousel-inner>.item{-webkit-transition:-webkit-transform .6s ease-in-out;-o-transition:-o-transform .6s ease-in-out;transition:transform .6s ease-in-out;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-perspective:1000px;perspective:1000px}.carousel-inner>.item.active.right,.carousel-inner>.item.next{left:0;-webkit-transform:translate3d(100%,0,0);transform:translate3d(100%,0,0)}.carousel-inner>.item.active.left,.carousel-inner>.item.prev{left:0;-webkit-transform:translate3d(-100%,0,0);transform:translate3d(-100%,0,0)}.carousel-inner>.item.active,.carousel-inner>.item.next.left,.carousel-inner>.item.prev.right{left:0;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0)}}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6);filter:alpha(opacity=50);opacity:.5}.carousel-control.left{background-image:-webkit-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.5)),to(rgba(0,0,0,.0001)));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);background-repeat:repeat-x}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-o-linear-gradient(left,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-image:-webkit-gradient(linear,left top,right top,from(rgba(0,0,0,.0001)),to(rgba(0,0,0,.5)));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);background-repeat:repeat-x}.carousel-control:focus,.carousel-control:hover{color:#fff;text-decoration:none;filter:alpha(opacity=90);outline:0;opacity:.9}.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{position:absolute;top:50%;z-index:5;display:inline-block;margin-top:-10px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{left:50%;margin-left:-10px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{right:50%;margin-right:-10px}.carousel-control .icon-next,.carousel-control .icon-prev{width:20px;height:20px;font-family:serif;line-height:1}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000\9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;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;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next,.carousel-control .icon-prev{width:30px;height:30px;margin-top:-15px;font-size:30px}.carousel-control .glyphicon-chevron-left,.carousel-control .icon-prev{margin-left:-15px}.carousel-control .glyphicon-chevron-right,.carousel-control .icon-next{margin-right:-15px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{display:table;content:" "}.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.form-horizontal .form-group:after,.modal-footer:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-lg,.visible-md,.visible-sm,.visible-xs{display:none!important}.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table!important}tr.visible-xs{display:table-row!important}td.visible-xs,th.visible-xs{display:table-cell!important}}@media (max-width:767px){.visible-xs-block{display:block!important}}@media (max-width:767px){.visible-xs-inline{display:inline!important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table!important}tr.visible-sm{display:table-row!important}td.visible-sm,th.visible-sm{display:table-cell!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline!important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table!important}tr.visible-md{display:table-row!important}td.visible-md,th.visible-md{display:table-cell!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline!important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block!important}}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table!important}tr.visible-lg{display:table-row!important}td.visible-lg,th.visible-lg{display:table-cell!important}}@media (min-width:1200px){.visible-lg-block{display:block!important}}@media (min-width:1200px){.visible-lg-inline{display:inline!important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block!important}}@media (max-width:767px){.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table!important}tr.visible-print{display:table-row!important}td.visible-print,th.visible-print{display:table-cell!important}}.visible-print-block{display:none!important}@media print{.visible-print-block{display:block!important}}.visible-print-inline{display:none!important}@media print{.visible-print-inline{display:inline!important}}.visible-print-inline-block{display:none!important}@media print{.visible-print-inline-block{display:inline-block!important}}@media print{.hidden-print{display:none!important}}
\ No newline at end of file
diff --git a/data/interfaces/default/css/dataTables.bootstrap.css b/data/interfaces/default/css/dataTables.bootstrap.css
new file mode 100644
index 00000000..033c6522
--- /dev/null
+++ b/data/interfaces/default/css/dataTables.bootstrap.css
@@ -0,0 +1,371 @@
+div.dataTables_length label {
+	font-weight: normal;
+	text-align: left;
+	white-space: nowrap;
+}
+
+div.dataTables_length select {
+	width: 75px;
+	display: inline-block;
+}
+
+div.dataTables_filter {
+	text-align: right;
+}
+
+div.dataTables_filter label {
+	font-weight: normal;
+	white-space: nowrap;
+	text-align: left;
+}
+
+div.dataTables_filter input {
+	margin-left: 0.5em;
+	display: inline-block;
+	width: auto;
+}
+
+div.dataTables_info {
+	padding-top: 8px;
+	white-space: nowrap;
+}
+
+div.dataTables_paginate {
+	margin: 0;
+	white-space: nowrap;
+	text-align: right;
+}
+
+div.dataTables_paginate ul.pagination {
+	margin: 2px 0;
+	white-space: nowrap;
+}
+
+@media screen and (max-width: 767px) {
+	div.dataTables_wrapper > div.row > div,
+	div.dataTables_length,
+	div.dataTables_filter,
+	div.dataTables_info,
+	div.dataTables_paginate {
+		text-align: center;
+	}
+
+	div.DTTT {
+		margin-bottom: 0.5em;
+	}
+}
+
+
+table.dataTable td,
+table.dataTable th {
+	-webkit-box-sizing: content-box;
+	-moz-box-sizing: content-box;
+	box-sizing: content-box;
+}
+
+
+table.dataTable {
+	clear: both;
+	margin-top: 6px !important;
+	margin-bottom: 6px !important;
+	max-width: none !important;
+}
+
+table.dataTable thead .sorting,
+table.dataTable thead .sorting_asc,
+table.dataTable thead .sorting_desc,
+table.dataTable thead .sorting_asc_disabled,
+table.dataTable thead .sorting_desc_disabled {
+	cursor: pointer;
+	position: relative;
+}
+
+table.dataTable thead .sorting:after,
+table.dataTable thead .sorting_asc:after,
+table.dataTable thead .sorting_desc:after {
+	position: absolute;
+	top: 8px;
+	right: 8px;
+	display: block;
+	font-family: 'Glyphicons Halflings';
+	opacity: 0.5;
+}
+table.dataTable thead .sorting:after {
+	opacity: 0.2;
+	content: "\e150"; /* sort */
+}
+table.dataTable thead .sorting_asc:after {
+	content: "\e155"; /* sort-by-attributes */
+}
+table.dataTable thead .sorting_desc:after {
+	content: "\e156"; /* sort-by-attributes-alt */
+}
+div.dataTables_scrollBody table.dataTable thead .sorting:after,
+div.dataTables_scrollBody table.dataTable thead .sorting_asc:after,
+div.dataTables_scrollBody table.dataTable thead .sorting_desc:after {
+	display: none;
+}
+
+table.dataTable thead .sorting_asc_disabled:after,
+table.dataTable thead .sorting_desc_disabled:after {
+	color: #eee;
+}
+
+table.dataTable thead > tr > th {
+	padding-right: 30px;
+}
+
+table.dataTable th:active {
+	outline: none;
+}
+
+
+/* Condensed */
+table.dataTable.table-condensed thead > tr > th {
+	padding-right: 20px;
+}
+
+table.dataTable.table-condensed thead .sorting:after,
+table.dataTable.table-condensed thead .sorting_asc:after,
+table.dataTable.table-condensed thead .sorting_desc:after {
+	top: 6px;
+	right: 6px;
+}
+
+/* Scrolling */
+div.dataTables_scrollHead table {
+	margin-bottom: 0 !important;
+	border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
+}
+
+div.dataTables_scrollHead table thead tr:last-child th:first-child,
+div.dataTables_scrollHead table thead tr:last-child td:first-child {
+	border-bottom-left-radius: 0 !important;
+	border-bottom-right-radius: 0 !important;
+}
+
+div.dataTables_scrollBody table {
+	border-top: none;
+	margin-top: 0 !important;
+	margin-bottom: 0 !important;
+}
+
+div.dataTables_scrollBody tbody tr:first-child th,
+div.dataTables_scrollBody tbody tr:first-child td {
+	border-top: none;
+}
+
+div.dataTables_scrollFoot table {
+	margin-top: 0 !important;
+	border-top: none;
+}
+
+/* Frustratingly the border-collapse:collapse used by Bootstrap makes the column
+   width calculations when using scrolling impossible to align columns. We have
+   to use separate
+ */
+table.table-bordered.dataTable {
+	border-collapse: separate !important;
+}
+table.table-bordered thead th,
+table.table-bordered thead td {
+	border-left-width: 0;
+	border-top-width: 0;
+}
+table.table-bordered tbody th,
+table.table-bordered tbody td {
+	border-left-width: 0;
+	border-bottom-width: 0;
+}
+table.table-bordered tfoot th,
+table.table-bordered tfoot td {
+    border-left-width: 0;
+    border-bottom-width: 0;
+}
+table.table-bordered th:last-child,
+table.table-bordered td:last-child {
+	border-right-width: 0;
+}
+div.dataTables_scrollHead table.table-bordered {
+	border-bottom-width: 0;
+}
+
+
+
+
+/*
+ * TableTools styles
+ */
+.table.dataTable tbody tr.active td,
+.table.dataTable tbody tr.active th {
+	background-color: #08C;
+	color: white;
+}
+
+.table.dataTable tbody tr.active:hover td,
+.table.dataTable tbody tr.active:hover th {
+	background-color: #0075b0 !important;
+}
+
+.table.dataTable tbody tr.active th > a,
+.table.dataTable tbody tr.active td > a {
+	color: white;
+}
+
+.table-striped.dataTable tbody tr.active:nth-child(odd) td,
+.table-striped.dataTable tbody tr.active:nth-child(odd) th {
+	background-color: #017ebc;
+}
+
+table.DTTT_selectable tbody tr {
+	cursor: pointer;
+}
+
+div.DTTT .btn:hover {
+	text-decoration: none !important;
+}
+
+ul.DTTT_dropdown.dropdown-menu {
+  z-index: 2003;
+}
+
+ul.DTTT_dropdown.dropdown-menu a {
+	color: #333 !important; /* needed only when demo_page.css is included */
+}
+
+ul.DTTT_dropdown.dropdown-menu li {
+	position: relative;
+}
+
+ul.DTTT_dropdown.dropdown-menu li:hover a {
+	background-color: #0088cc;
+	color: white !important;
+}
+
+div.DTTT_collection_background {
+	z-index: 2002;
+}
+
+/* TableTools information display */
+div.DTTT_print_info {
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	width: 400px;
+	height: 150px;
+	margin-left: -200px;
+	margin-top: -75px;
+	text-align: center;
+	color: #333;
+	padding: 10px 30px;
+	opacity: 0.95;
+
+	background-color: white;
+	border: 1px solid rgba(0, 0, 0, 0.2);
+	border-radius: 6px;
+
+	-webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.5);
+	        box-shadow: 0 3px 7px rgba(0, 0, 0, 0.5);
+}
+
+div.DTTT_print_info h6 {
+	font-weight: normal;
+	font-size: 28px;
+	line-height: 28px;
+	margin: 1em;
+}
+
+div.DTTT_print_info p {
+	font-size: 14px;
+	line-height: 20px;
+}
+
+div.dataTables_processing {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 100%;
+    height: 60px;
+    margin-left: -50%;
+    margin-top: -25px;
+    padding-top: 20px;
+    padding-bottom: 20px;
+    text-align: center;
+    font-size: 1.2em;
+    background-color: white;
+    background: -webkit-gradient(linear, left top, right top, color-stop(0%, rgba(255,255,255,0)), color-stop(25%, rgba(255,255,255,0.9)), color-stop(75%, rgba(255,255,255,0.9)), color-stop(100%, rgba(255,255,255,0)));
+    background: -webkit-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
+    background: -moz-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
+    background: -ms-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
+    background: -o-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
+    background: linear-gradient(to right, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);
+}
+
+
+
+/*
+ * FixedColumns styles
+ */
+div.DTFC_LeftHeadWrapper table,
+div.DTFC_LeftFootWrapper table,
+div.DTFC_RightHeadWrapper table,
+div.DTFC_RightFootWrapper table,
+table.DTFC_Cloned tr.even {
+    background-color: white;
+    margin-bottom: 0;
+}
+
+div.DTFC_RightHeadWrapper table ,
+div.DTFC_LeftHeadWrapper table {
+	border-bottom: none !important;
+    margin-bottom: 0 !important;
+    border-top-right-radius: 0 !important;
+    border-bottom-left-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
+}
+
+div.DTFC_RightHeadWrapper table thead tr:last-child th:first-child,
+div.DTFC_RightHeadWrapper table thead tr:last-child td:first-child,
+div.DTFC_LeftHeadWrapper table thead tr:last-child th:first-child,
+div.DTFC_LeftHeadWrapper table thead tr:last-child td:first-child {
+    border-bottom-left-radius: 0 !important;
+    border-bottom-right-radius: 0 !important;
+}
+
+div.DTFC_RightBodyWrapper table,
+div.DTFC_LeftBodyWrapper table {
+    border-top: none;
+    margin: 0 !important;
+}
+
+div.DTFC_RightBodyWrapper tbody tr:first-child th,
+div.DTFC_RightBodyWrapper tbody tr:first-child td,
+div.DTFC_LeftBodyWrapper tbody tr:first-child th,
+div.DTFC_LeftBodyWrapper tbody tr:first-child td {
+    border-top: none;
+}
+
+div.DTFC_RightFootWrapper table,
+div.DTFC_LeftFootWrapper table {
+    border-top: none;
+    margin-top: 0 !important;
+}
+
+
+div.DTFC_LeftBodyWrapper table.dataTable thead .sorting:after,
+div.DTFC_LeftBodyWrapper table.dataTable thead .sorting_asc:after,
+div.DTFC_LeftBodyWrapper table.dataTable thead .sorting_desc:after,
+div.DTFC_RightBodyWrapper table.dataTable thead .sorting:after,
+div.DTFC_RightBodyWrapper table.dataTable thead .sorting_asc:after,
+div.DTFC_RightBodyWrapper table.dataTable thead .sorting_desc:after {
+	display: none;
+}
+
+
+/*
+ * FixedHeader styles
+ */
+div.FixedHeader_Cloned table {
+	margin: 0 !important
+}
diff --git a/data/interfaces/default/css/dataTables.bootstrap.min.css b/data/interfaces/default/css/dataTables.bootstrap.min.css
deleted file mode 100644
index 1d319758..00000000
--- a/data/interfaces/default/css/dataTables.bootstrap.min.css
+++ /dev/null
@@ -1 +0,0 @@
-td.dt-control{background:url("https://www.datatables.net/examples/resources/details_open.png") no-repeat center center;cursor:pointer}tr.dt-hasChild td.dt-control{background:url("https://www.datatables.net/examples/resources/details_close.png") no-repeat center center}table.dataTable th.dt-left,table.dataTable td.dt-left{text-align:left}table.dataTable th.dt-center,table.dataTable td.dt-center,table.dataTable td.dataTables_empty{text-align:center}table.dataTable th.dt-right,table.dataTable td.dt-right{text-align:right}table.dataTable th.dt-justify,table.dataTable td.dt-justify{text-align:justify}table.dataTable th.dt-nowrap,table.dataTable td.dt-nowrap{white-space:nowrap}table.dataTable thead th.dt-head-left,table.dataTable thead td.dt-head-left,table.dataTable tfoot th.dt-head-left,table.dataTable tfoot td.dt-head-left{text-align:left}table.dataTable thead th.dt-head-center,table.dataTable thead td.dt-head-center,table.dataTable tfoot th.dt-head-center,table.dataTable tfoot td.dt-head-center{text-align:center}table.dataTable thead th.dt-head-right,table.dataTable thead td.dt-head-right,table.dataTable tfoot th.dt-head-right,table.dataTable tfoot td.dt-head-right{text-align:right}table.dataTable thead th.dt-head-justify,table.dataTable thead td.dt-head-justify,table.dataTable tfoot th.dt-head-justify,table.dataTable tfoot td.dt-head-justify{text-align:justify}table.dataTable thead th.dt-head-nowrap,table.dataTable thead td.dt-head-nowrap,table.dataTable tfoot th.dt-head-nowrap,table.dataTable tfoot td.dt-head-nowrap{white-space:nowrap}table.dataTable tbody th.dt-body-left,table.dataTable tbody td.dt-body-left{text-align:left}table.dataTable tbody th.dt-body-center,table.dataTable tbody td.dt-body-center{text-align:center}table.dataTable tbody th.dt-body-right,table.dataTable tbody td.dt-body-right{text-align:right}table.dataTable tbody th.dt-body-justify,table.dataTable tbody td.dt-body-justify{text-align:justify}table.dataTable tbody th.dt-body-nowrap,table.dataTable tbody td.dt-body-nowrap{white-space:nowrap}table.dataTable{clear:both;margin-top:6px !important;margin-bottom:6px !important;max-width:none !important;border-collapse:separate !important}table.dataTable td,table.dataTable th{-webkit-box-sizing:content-box;box-sizing:content-box}table.dataTable td.dataTables_empty,table.dataTable th.dataTables_empty{text-align:center}table.dataTable.nowrap th,table.dataTable.nowrap td{white-space:nowrap}div.dataTables_wrapper div.dataTables_length label{font-weight:normal;text-align:left;white-space:nowrap}div.dataTables_wrapper div.dataTables_length select{width:75px;display:inline-block}div.dataTables_wrapper div.dataTables_filter{text-align:right}div.dataTables_wrapper div.dataTables_filter label{font-weight:normal;white-space:nowrap;text-align:left}div.dataTables_wrapper div.dataTables_filter input{margin-left:.5em;display:inline-block;width:auto}div.dataTables_wrapper div.dataTables_info{padding-top:8px;white-space:nowrap}div.dataTables_wrapper div.dataTables_paginate{margin:0;white-space:nowrap;text-align:right}div.dataTables_wrapper div.dataTables_paginate ul.pagination{margin:2px 0;white-space:nowrap}div.dataTables_wrapper div.dataTables_processing{position:absolute;top:50%;left:50%;width:200px;margin-left:-100px;margin-top:-26px;text-align:center;padding:1em 0}table.dataTable thead>tr>th.sorting_asc,table.dataTable thead>tr>th.sorting_desc,table.dataTable thead>tr>th.sorting,table.dataTable thead>tr>td.sorting_asc,table.dataTable thead>tr>td.sorting_desc,table.dataTable thead>tr>td.sorting{padding-right:30px}table.dataTable thead>tr>th:active,table.dataTable thead>tr>td:active{outline:none}table.dataTable thead .sorting,table.dataTable thead .sorting_asc,table.dataTable thead .sorting_desc,table.dataTable thead .sorting_asc_disabled,table.dataTable thead .sorting_desc_disabled{cursor:pointer;position:relative}table.dataTable thead .sorting:after,table.dataTable thead .sorting_asc:after,table.dataTable thead .sorting_desc:after,table.dataTable thead .sorting_asc_disabled:after,table.dataTable thead .sorting_desc_disabled:after{position:absolute;bottom:8px;right:8px;display:block;font-family:"Glyphicons Halflings";opacity:.5}table.dataTable thead .sorting:after{opacity:.2;content:"î…�"}table.dataTable thead .sorting_asc:after{opacity:.5;content:"î…•"}table.dataTable thead .sorting_desc:after{opacity:.5;content:"î…–"}table.dataTable thead .sorting_asc_disabled:after,table.dataTable thead .sorting_desc_disabled:after{color:#eee}div.dataTables_scrollHead table.dataTable{margin-bottom:0 !important}div.dataTables_scrollBody>table{border-top:none;margin-top:0 !important;margin-bottom:0 !important}div.dataTables_scrollBody>table>thead .sorting:after,div.dataTables_scrollBody>table>thead .sorting_asc:after,div.dataTables_scrollBody>table>thead .sorting_desc:after{display:none}div.dataTables_scrollBody>table>tbody>tr:first-child>th,div.dataTables_scrollBody>table>tbody>tr:first-child>td{border-top:none}div.dataTables_scrollFoot>.dataTables_scrollFootInner{box-sizing:content-box}div.dataTables_scrollFoot>.dataTables_scrollFootInner>table{margin-top:0 !important;border-top:none}@media screen and (max-width: 767px){div.dataTables_wrapper div.dataTables_length,div.dataTables_wrapper div.dataTables_filter,div.dataTables_wrapper div.dataTables_info,div.dataTables_wrapper div.dataTables_paginate{text-align:center}}table.dataTable.table-condensed>thead>tr>th{padding-right:20px}table.dataTable.table-condensed .sorting:after,table.dataTable.table-condensed .sorting_asc:after,table.dataTable.table-condensed .sorting_desc:after{top:6px;right:6px}table.table-bordered.dataTable{border-right-width:0}table.table-bordered.dataTable th,table.table-bordered.dataTable td{border-left-width:0}table.table-bordered.dataTable th:last-child,table.table-bordered.dataTable th:last-child,table.table-bordered.dataTable td:last-child,table.table-bordered.dataTable td:last-child{border-right-width:1px}table.table-bordered.dataTable tbody th,table.table-bordered.dataTable tbody td{border-bottom-width:0}div.dataTables_scrollHead table.table-bordered{border-bottom-width:0}div.table-responsive>div.dataTables_wrapper>div.row{margin:0}div.table-responsive>div.dataTables_wrapper>div.row>div[class^=col-]:first-child{padding-left:0}div.table-responsive>div.dataTables_wrapper>div.row>div[class^=col-]:last-child{padding-right:0}
diff --git a/data/interfaces/default/css/dataTables.colVis.css b/data/interfaces/default/css/dataTables.colVis.css
index dcbfa76f..10d62649 100644
--- a/data/interfaces/default/css/dataTables.colVis.css
+++ b/data/interfaces/default/css/dataTables.colVis.css
@@ -21,7 +21,7 @@ ul.ColVis_collection li {
 
 .ColVis_Button:hover,
 ul.ColVis_collection li:hover {
-    color: #E5A00D;
+    color: #F9AA03;
 }
 
 button.ColVis_Button {
@@ -71,7 +71,7 @@ ul.ColVis_collection {
 	list-style: none;
 	width: 150px;
 	padding: 8px 8px 4px 8px;
-	margin: 10px 0px 10px 0px;
+	margin: 10px 0px 0px 0px;
 	background-color: #444;
 	overflow: hidden;
 	z-index: 2002;
diff --git a/data/interfaces/default/css/font-awesome.all.min.css b/data/interfaces/default/css/font-awesome.all.min.css
deleted file mode 100644
index 92613e20..00000000
--- a/data/interfaces/default/css/font-awesome.all.min.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*!
- * Font Awesome Free 5.1.0 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
- */
-.fa,.fab,.fal,.far,.fas{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:inline-block;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:.08em solid #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fab.fa-pull-left,.fal.fa-pull-left,.far.fa-pull-left,.fas.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fab.fa-pull-right,.fal.fa-pull-right,.far.fa-pull-right,.fas.fa-pull-right{margin-left:.3em}.fa-spin{animation:a 2s infinite linear}.fa-pulse{animation:a 1s infinite steps(8)}@keyframes a{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";transform:scaleX(-1)}.fa-flip-vertical{transform:scaleY(-1)}.fa-flip-horizontal.fa-flip-vertical,.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)"}.fa-flip-horizontal.fa-flip-vertical{transform:scale(-1)}:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270{-webkit-filter:none;filter:none}.fa-stack{display:inline-block;height:2em;line-height:2em;position:relative;vertical-align:middle;width:2em}.fa-stack-1x,.fa-stack-2x{left:0;position:absolute;text-align:center;width:100%}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-500px:before{content:"\f26e"}.fa-accessible-icon:before{content:"\f368"}.fa-accusoft:before{content:"\f369"}.fa-address-book:before{content:"\f2b9"}.fa-address-card:before{content:"\f2bb"}.fa-adjust:before{content:"\f042"}.fa-adn:before{content:"\f170"}.fa-adversal:before{content:"\f36a"}.fa-affiliatetheme:before{content:"\f36b"}.fa-algolia:before{content:"\f36c"}.fa-align-center:before{content:"\f037"}.fa-align-justify:before{content:"\f039"}.fa-align-left:before{content:"\f036"}.fa-align-right:before{content:"\f038"}.fa-allergies:before{content:"\f461"}.fa-amazon:before{content:"\f270"}.fa-amazon-pay:before{content:"\f42c"}.fa-ambulance:before{content:"\f0f9"}.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-amilia:before{content:"\f36d"}.fa-anchor:before{content:"\f13d"}.fa-android:before{content:"\f17b"}.fa-angellist:before{content:"\f209"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-down:before{content:"\f107"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angry:before{content:"\f556"}.fa-angrycreative:before{content:"\f36e"}.fa-angular:before{content:"\f420"}.fa-app-store:before{content:"\f36f"}.fa-app-store-ios:before{content:"\f370"}.fa-apper:before{content:"\f371"}.fa-apple:before{content:"\f179"}.fa-apple-pay:before{content:"\f415"}.fa-archive:before{content:"\f187"}.fa-archway:before{content:"\f557"}.fa-arrow-alt-circle-down:before{content:"\f358"}.fa-arrow-alt-circle-left:before{content:"\f359"}.fa-arrow-alt-circle-right:before{content:"\f35a"}.fa-arrow-alt-circle-up:before{content:"\f35b"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-down:before{content:"\f063"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrows-alt:before{content:"\f0b2"}.fa-arrows-alt-h:before{content:"\f337"}.fa-arrows-alt-v:before{content:"\f338"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asterisk:before{content:"\f069"}.fa-asymmetrik:before{content:"\f372"}.fa-at:before{content:"\f1fa"}.fa-atlas:before{content:"\f558"}.fa-audible:before{content:"\f373"}.fa-audio-description:before{content:"\f29e"}.fa-autoprefixer:before{content:"\f41c"}.fa-avianex:before{content:"\f374"}.fa-aviato:before{content:"\f421"}.fa-award:before{content:"\f559"}.fa-aws:before{content:"\f375"}.fa-backspace:before{content:"\f55a"}.fa-backward:before{content:"\f04a"}.fa-balance-scale:before{content:"\f24e"}.fa-ban:before{content:"\f05e"}.fa-band-aid:before{content:"\f462"}.fa-bandcamp:before{content:"\f2d5"}.fa-barcode:before{content:"\f02a"}.fa-bars:before{content:"\f0c9"}.fa-baseball-ball:before{content:"\f433"}.fa-basketball-ball:before{content:"\f434"}.fa-bath:before{content:"\f2cd"}.fa-battery-empty:before{content:"\f244"}.fa-battery-full:before{content:"\f240"}.fa-battery-half:before{content:"\f242"}.fa-battery-quarter:before{content:"\f243"}.fa-battery-three-quarters:before{content:"\f241"}.fa-bed:before{content:"\f236"}.fa-beer:before{content:"\f0fc"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-bell:before{content:"\f0f3"}.fa-bell-slash:before{content:"\f1f6"}.fa-bezier-curve:before{content:"\f55b"}.fa-bicycle:before{content:"\f206"}.fa-bimobject:before{content:"\f378"}.fa-binoculars:before{content:"\f1e5"}.fa-birthday-cake:before{content:"\f1fd"}.fa-bitbucket:before{content:"\f171"}.fa-bitcoin:before{content:"\f379"}.fa-bity:before{content:"\f37a"}.fa-black-tie:before{content:"\f27e"}.fa-blackberry:before{content:"\f37b"}.fa-blender:before{content:"\f517"}.fa-blind:before{content:"\f29d"}.fa-blogger:before{content:"\f37c"}.fa-blogger-b:before{content:"\f37d"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-bold:before{content:"\f032"}.fa-bolt:before{content:"\f0e7"}.fa-bomb:before{content:"\f1e2"}.fa-bong:before{content:"\f55c"}.fa-book:before{content:"\f02d"}.fa-book-open:before{content:"\f518"}.fa-bookmark:before{content:"\f02e"}.fa-bowling-ball:before{content:"\f436"}.fa-box:before{content:"\f466"}.fa-box-open:before{content:"\f49e"}.fa-boxes:before{content:"\f468"}.fa-braille:before{content:"\f2a1"}.fa-briefcase:before{content:"\f0b1"}.fa-briefcase-medical:before{content:"\f469"}.fa-broadcast-tower:before{content:"\f519"}.fa-broom:before{content:"\f51a"}.fa-brush:before{content:"\f55d"}.fa-btc:before{content:"\f15a"}.fa-bug:before{content:"\f188"}.fa-building:before{content:"\f1ad"}.fa-bullhorn:before{content:"\f0a1"}.fa-bullseye:before{content:"\f140"}.fa-burn:before{content:"\f46a"}.fa-buromobelexperte:before{content:"\f37f"}.fa-bus:before{content:"\f207"}.fa-bus-alt:before{content:"\f55e"}.fa-buysellads:before{content:"\f20d"}.fa-calculator:before{content:"\f1ec"}.fa-calendar:before{content:"\f133"}.fa-calendar-alt:before{content:"\f073"}.fa-calendar-check:before{content:"\f274"}.fa-calendar-minus:before{content:"\f272"}.fa-calendar-plus:before{content:"\f271"}.fa-calendar-times:before{content:"\f273"}.fa-camera:before{content:"\f030"}.fa-camera-retro:before{content:"\f083"}.fa-cannabis:before{content:"\f55f"}.fa-capsules:before{content:"\f46b"}.fa-car:before{content:"\f1b9"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-caret-square-down:before{content:"\f150"}.fa-caret-square-left:before{content:"\f191"}.fa-caret-square-right:before{content:"\f152"}.fa-caret-square-up:before{content:"\f151"}.fa-caret-up:before{content:"\f0d8"}.fa-cart-arrow-down:before{content:"\f218"}.fa-cart-plus:before{content:"\f217"}.fa-cc-amazon-pay:before{content:"\f42d"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-apple-pay:before{content:"\f416"}.fa-cc-diners-club:before{content:"\f24c"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-cc-visa:before{content:"\f1f0"}.fa-centercode:before{content:"\f380"}.fa-certificate:before{content:"\f0a3"}.fa-chalkboard:before{content:"\f51b"}.fa-chalkboard-teacher:before{content:"\f51c"}.fa-chart-area:before{content:"\f1fe"}.fa-chart-bar:before{content:"\f080"}.fa-chart-line:before{content:"\f201"}.fa-chart-pie:before{content:"\f200"}.fa-check:before{content:"\f00c"}.fa-check-circle:before{content:"\f058"}.fa-check-double:before{content:"\f560"}.fa-check-square:before{content:"\f14a"}.fa-chess:before{content:"\f439"}.fa-chess-bishop:before{content:"\f43a"}.fa-chess-board:before{content:"\f43c"}.fa-chess-king:before{content:"\f43f"}.fa-chess-knight:before{content:"\f441"}.fa-chess-pawn:before{content:"\f443"}.fa-chess-queen:before{content:"\f445"}.fa-chess-rook:before{content:"\f447"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-down:before{content:"\f078"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-chevron-up:before{content:"\f077"}.fa-child:before{content:"\f1ae"}.fa-chrome:before{content:"\f268"}.fa-church:before{content:"\f51d"}.fa-circle:before{content:"\f111"}.fa-circle-notch:before{content:"\f1ce"}.fa-clipboard:before{content:"\f328"}.fa-clipboard-check:before{content:"\f46c"}.fa-clipboard-list:before{content:"\f46d"}.fa-clock:before{content:"\f017"}.fa-clone:before{content:"\f24d"}.fa-closed-captioning:before{content:"\f20a"}.fa-cloud:before{content:"\f0c2"}.fa-cloud-download-alt:before{content:"\f381"}.fa-cloud-upload-alt:before{content:"\f382"}.fa-cloudscale:before{content:"\f383"}.fa-cloudsmith:before{content:"\f384"}.fa-cloudversify:before{content:"\f385"}.fa-cocktail:before{content:"\f561"}.fa-code:before{content:"\f121"}.fa-code-branch:before{content:"\f126"}.fa-codepen:before{content:"\f1cb"}.fa-codiepie:before{content:"\f284"}.fa-coffee:before{content:"\f0f4"}.fa-cog:before{content:"\f013"}.fa-cogs:before{content:"\f085"}.fa-coins:before{content:"\f51e"}.fa-columns:before{content:"\f0db"}.fa-comment:before{content:"\f075"}.fa-comment-alt:before{content:"\f27a"}.fa-comment-dots:before{content:"\f4ad"}.fa-comment-slash:before{content:"\f4b3"}.fa-comments:before{content:"\f086"}.fa-compact-disc:before{content:"\f51f"}.fa-compass:before{content:"\f14e"}.fa-compress:before{content:"\f066"}.fa-concierge-bell:before{content:"\f562"}.fa-connectdevelop:before{content:"\f20e"}.fa-contao:before{content:"\f26d"}.fa-cookie:before{content:"\f563"}.fa-cookie-bite:before{content:"\f564"}.fa-copy:before{content:"\f0c5"}.fa-copyright:before{content:"\f1f9"}.fa-couch:before{content:"\f4b8"}.fa-cpanel:before{content:"\f388"}.fa-creative-commons:before{content:"\f25e"}.fa-creative-commons-by:before{content:"\f4e7"}.fa-creative-commons-nc:before{content:"\f4e8"}.fa-creative-commons-nc-eu:before{content:"\f4e9"}.fa-creative-commons-nc-jp:before{content:"\f4ea"}.fa-creative-commons-nd:before{content:"\f4eb"}.fa-creative-commons-pd:before{content:"\f4ec"}.fa-creative-commons-pd-alt:before{content:"\f4ed"}.fa-creative-commons-remix:before{content:"\f4ee"}.fa-creative-commons-sa:before{content:"\f4ef"}.fa-creative-commons-sampling:before{content:"\f4f0"}.fa-creative-commons-sampling-plus:before{content:"\f4f1"}.fa-creative-commons-share:before{content:"\f4f2"}.fa-credit-card:before{content:"\f09d"}.fa-crop:before{content:"\f125"}.fa-crop-alt:before{content:"\f565"}.fa-crosshairs:before{content:"\f05b"}.fa-crow:before{content:"\f520"}.fa-crown:before{content:"\f521"}.fa-css3:before{content:"\f13c"}.fa-css3-alt:before{content:"\f38b"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-cut:before{content:"\f0c4"}.fa-cuttlefish:before{content:"\f38c"}.fa-d-and-d:before{content:"\f38d"}.fa-dashcube:before{content:"\f210"}.fa-database:before{content:"\f1c0"}.fa-deaf:before{content:"\f2a4"}.fa-delicious:before{content:"\f1a5"}.fa-deploydog:before{content:"\f38e"}.fa-deskpro:before{content:"\f38f"}.fa-desktop:before{content:"\f108"}.fa-deviantart:before{content:"\f1bd"}.fa-diagnoses:before{content:"\f470"}.fa-dice:before{content:"\f522"}.fa-dice-five:before{content:"\f523"}.fa-dice-four:before{content:"\f524"}.fa-dice-one:before{content:"\f525"}.fa-dice-six:before{content:"\f526"}.fa-dice-three:before{content:"\f527"}.fa-dice-two:before{content:"\f528"}.fa-digg:before{content:"\f1a6"}.fa-digital-ocean:before{content:"\f391"}.fa-digital-tachograph:before{content:"\f566"}.fa-discord:before{content:"\f392"}.fa-discourse:before{content:"\f393"}.fa-divide:before{content:"\f529"}.fa-dizzy:before{content:"\f567"}.fa-dna:before{content:"\f471"}.fa-dochub:before{content:"\f394"}.fa-docker:before{content:"\f395"}.fa-dollar-sign:before{content:"\f155"}.fa-dolly:before{content:"\f472"}.fa-dolly-flatbed:before{content:"\f474"}.fa-donate:before{content:"\f4b9"}.fa-door-closed:before{content:"\f52a"}.fa-door-open:before{content:"\f52b"}.fa-dot-circle:before{content:"\f192"}.fa-dove:before{content:"\f4ba"}.fa-download:before{content:"\f019"}.fa-draft2digital:before{content:"\f396"}.fa-drafting-compass:before{content:"\f568"}.fa-dribbble:before{content:"\f17d"}.fa-dribbble-square:before{content:"\f397"}.fa-dropbox:before{content:"\f16b"}.fa-drum:before{content:"\f569"}.fa-drum-steelpan:before{content:"\f56a"}.fa-drupal:before{content:"\f1a9"}.fa-dumbbell:before{content:"\f44b"}.fa-dyalog:before{content:"\f399"}.fa-earlybirds:before{content:"\f39a"}.fa-ebay:before{content:"\f4f4"}.fa-edge:before{content:"\f282"}.fa-edit:before{content:"\f044"}.fa-eject:before{content:"\f052"}.fa-elementor:before{content:"\f430"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-ember:before{content:"\f423"}.fa-empire:before{content:"\f1d1"}.fa-envelope:before{content:"\f0e0"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-square:before{content:"\f199"}.fa-envira:before{content:"\f299"}.fa-equals:before{content:"\f52c"}.fa-eraser:before{content:"\f12d"}.fa-erlang:before{content:"\f39d"}.fa-ethereum:before{content:"\f42e"}.fa-etsy:before{content:"\f2d7"}.fa-euro-sign:before{content:"\f153"}.fa-exchange-alt:before{content:"\f362"}.fa-exclamation:before{content:"\f12a"}.fa-exclamation-circle:before{content:"\f06a"}.fa-exclamation-triangle:before{content:"\f071"}.fa-expand:before{content:"\f065"}.fa-expand-arrows-alt:before{content:"\f31e"}.fa-expeditedssl:before{content:"\f23e"}.fa-external-link-alt:before{content:"\f35d"}.fa-external-link-square-alt:before{content:"\f360"}.fa-eye:before{content:"\f06e"}.fa-eye-dropper:before{content:"\f1fb"}.fa-eye-slash:before{content:"\f070"}.fa-facebook:before{content:"\f09a"}.fa-facebook-f:before{content:"\f39e"}.fa-facebook-messenger:before{content:"\f39f"}.fa-facebook-square:before{content:"\f082"}.fa-fast-backward:before{content:"\f049"}.fa-fast-forward:before{content:"\f050"}.fa-fax:before{content:"\f1ac"}.fa-feather:before{content:"\f52d"}.fa-feather-alt:before{content:"\f56b"}.fa-female:before{content:"\f182"}.fa-fighter-jet:before{content:"\f0fb"}.fa-file:before{content:"\f15b"}.fa-file-alt:before{content:"\f15c"}.fa-file-archive:before{content:"\f1c6"}.fa-file-audio:before{content:"\f1c7"}.fa-file-code:before{content:"\f1c9"}.fa-file-contract:before{content:"\f56c"}.fa-file-download:before{content:"\f56d"}.fa-file-excel:before{content:"\f1c3"}.fa-file-export:before{content:"\f56e"}.fa-file-image:before{content:"\f1c5"}.fa-file-import:before{content:"\f56f"}.fa-file-invoice:before{content:"\f570"}.fa-file-invoice-dollar:before{content:"\f571"}.fa-file-medical:before{content:"\f477"}.fa-file-medical-alt:before{content:"\f478"}.fa-file-pdf:before{content:"\f1c1"}.fa-file-powerpoint:before{content:"\f1c4"}.fa-file-prescription:before{content:"\f572"}.fa-file-signature:before{content:"\f573"}.fa-file-upload:before{content:"\f574"}.fa-file-video:before{content:"\f1c8"}.fa-file-word:before{content:"\f1c2"}.fa-fill:before{content:"\f575"}.fa-fill-drip:before{content:"\f576"}.fa-film:before{content:"\f008"}.fa-filter:before{content:"\f0b0"}.fa-fingerprint:before{content:"\f577"}.fa-fire:before{content:"\f06d"}.fa-fire-extinguisher:before{content:"\f134"}.fa-firefox:before{content:"\f269"}.fa-first-aid:before{content:"\f479"}.fa-first-order:before{content:"\f2b0"}.fa-first-order-alt:before{content:"\f50a"}.fa-firstdraft:before{content:"\f3a1"}.fa-fish:before{content:"\f578"}.fa-flag:before{content:"\f024"}.fa-flag-checkered:before{content:"\f11e"}.fa-flask:before{content:"\f0c3"}.fa-flickr:before{content:"\f16e"}.fa-flipboard:before{content:"\f44d"}.fa-flushed:before{content:"\f579"}.fa-fly:before{content:"\f417"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-font:before{content:"\f031"}.fa-font-awesome:before{content:"\f2b4"}.fa-font-awesome-alt:before{content:"\f35c"}.fa-font-awesome-flag:before{content:"\f425"}.fa-font-awesome-logo-full:before{content:"\f4e6"}.fa-fonticons:before{content:"\f280"}.fa-fonticons-fi:before{content:"\f3a2"}.fa-football-ball:before{content:"\f44e"}.fa-fort-awesome:before{content:"\f286"}.fa-fort-awesome-alt:before{content:"\f3a3"}.fa-forumbee:before{content:"\f211"}.fa-forward:before{content:"\f04e"}.fa-foursquare:before{content:"\f180"}.fa-free-code-camp:before{content:"\f2c5"}.fa-freebsd:before{content:"\f3a4"}.fa-frog:before{content:"\f52e"}.fa-frown:before{content:"\f119"}.fa-frown-open:before{content:"\f57a"}.fa-fulcrum:before{content:"\f50b"}.fa-futbol:before{content:"\f1e3"}.fa-galactic-republic:before{content:"\f50c"}.fa-galactic-senate:before{content:"\f50d"}.fa-gamepad:before{content:"\f11b"}.fa-gas-pump:before{content:"\f52f"}.fa-gavel:before{content:"\f0e3"}.fa-gem:before{content:"\f3a5"}.fa-genderless:before{content:"\f22d"}.fa-get-pocket:before{content:"\f265"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-gift:before{content:"\f06b"}.fa-git:before{content:"\f1d3"}.fa-git-square:before{content:"\f1d2"}.fa-github:before{content:"\f09b"}.fa-github-alt:before{content:"\f113"}.fa-github-square:before{content:"\f092"}.fa-gitkraken:before{content:"\f3a6"}.fa-gitlab:before{content:"\f296"}.fa-gitter:before{content:"\f426"}.fa-glass-martini:before{content:"\f000"}.fa-glass-martini-alt:before{content:"\f57b"}.fa-glasses:before{content:"\f530"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-globe:before{content:"\f0ac"}.fa-globe-africa:before{content:"\f57c"}.fa-globe-americas:before{content:"\f57d"}.fa-globe-asia:before{content:"\f57e"}.fa-gofore:before{content:"\f3a7"}.fa-golf-ball:before{content:"\f450"}.fa-goodreads:before{content:"\f3a8"}.fa-goodreads-g:before{content:"\f3a9"}.fa-google:before{content:"\f1a0"}.fa-google-drive:before{content:"\f3aa"}.fa-google-play:before{content:"\f3ab"}.fa-google-plus:before{content:"\f2b3"}.fa-google-plus-g:before{content:"\f0d5"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-wallet:before{content:"\f1ee"}.fa-graduation-cap:before{content:"\f19d"}.fa-gratipay:before{content:"\f184"}.fa-grav:before{content:"\f2d6"}.fa-greater-than:before{content:"\f531"}.fa-greater-than-equal:before{content:"\f532"}.fa-grimace:before{content:"\f57f"}.fa-grin:before{content:"\f580"}.fa-grin-alt:before{content:"\f581"}.fa-grin-beam:before{content:"\f582"}.fa-grin-beam-sweat:before{content:"\f583"}.fa-grin-hearts:before{content:"\f584"}.fa-grin-squint:before{content:"\f585"}.fa-grin-squint-tears:before{content:"\f586"}.fa-grin-stars:before{content:"\f587"}.fa-grin-tears:before{content:"\f588"}.fa-grin-tongue:before{content:"\f589"}.fa-grin-tongue-squint:before{content:"\f58a"}.fa-grin-tongue-wink:before{content:"\f58b"}.fa-grin-wink:before{content:"\f58c"}.fa-grip-horizontal:before{content:"\f58d"}.fa-grip-vertical:before{content:"\f58e"}.fa-gripfire:before{content:"\f3ac"}.fa-grunt:before{content:"\f3ad"}.fa-gulp:before{content:"\f3ae"}.fa-h-square:before{content:"\f0fd"}.fa-hacker-news:before{content:"\f1d4"}.fa-hacker-news-square:before{content:"\f3af"}.fa-hand-holding:before{content:"\f4bd"}.fa-hand-holding-heart:before{content:"\f4be"}.fa-hand-holding-usd:before{content:"\f4c0"}.fa-hand-lizard:before{content:"\f258"}.fa-hand-paper:before{content:"\f256"}.fa-hand-peace:before{content:"\f25b"}.fa-hand-point-down:before{content:"\f0a7"}.fa-hand-point-left:before{content:"\f0a5"}.fa-hand-point-right:before{content:"\f0a4"}.fa-hand-point-up:before{content:"\f0a6"}.fa-hand-pointer:before{content:"\f25a"}.fa-hand-rock:before{content:"\f255"}.fa-hand-scissors:before{content:"\f257"}.fa-hand-spock:before{content:"\f259"}.fa-hands:before{content:"\f4c2"}.fa-hands-helping:before{content:"\f4c4"}.fa-handshake:before{content:"\f2b5"}.fa-hashtag:before{content:"\f292"}.fa-hdd:before{content:"\f0a0"}.fa-heading:before{content:"\f1dc"}.fa-headphones:before{content:"\f025"}.fa-headphones-alt:before{content:"\f58f"}.fa-headset:before{content:"\f590"}.fa-heart:before{content:"\f004"}.fa-heartbeat:before{content:"\f21e"}.fa-helicopter:before{content:"\f533"}.fa-highlighter:before{content:"\f591"}.fa-hips:before{content:"\f452"}.fa-hire-a-helper:before{content:"\f3b0"}.fa-history:before{content:"\f1da"}.fa-hockey-puck:before{content:"\f453"}.fa-home:before{content:"\f015"}.fa-hooli:before{content:"\f427"}.fa-hornbill:before{content:"\f592"}.fa-hospital:before{content:"\f0f8"}.fa-hospital-alt:before{content:"\f47d"}.fa-hospital-symbol:before{content:"\f47e"}.fa-hot-tub:before{content:"\f593"}.fa-hotel:before{content:"\f594"}.fa-hotjar:before{content:"\f3b1"}.fa-hourglass:before{content:"\f254"}.fa-hourglass-end:before{content:"\f253"}.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-start:before{content:"\f251"}.fa-houzz:before{content:"\f27c"}.fa-html5:before{content:"\f13b"}.fa-hubspot:before{content:"\f3b2"}.fa-i-cursor:before{content:"\f246"}.fa-id-badge:before{content:"\f2c1"}.fa-id-card:before{content:"\f2c2"}.fa-id-card-alt:before{content:"\f47f"}.fa-image:before{content:"\f03e"}.fa-images:before{content:"\f302"}.fa-imdb:before{content:"\f2d8"}.fa-inbox:before{content:"\f01c"}.fa-indent:before{content:"\f03c"}.fa-industry:before{content:"\f275"}.fa-infinity:before{content:"\f534"}.fa-info:before{content:"\f129"}.fa-info-circle:before{content:"\f05a"}.fa-instagram:before{content:"\f16d"}.fa-internet-explorer:before{content:"\f26b"}.fa-ioxhost:before{content:"\f208"}.fa-italic:before{content:"\f033"}.fa-itunes:before{content:"\f3b4"}.fa-itunes-note:before{content:"\f3b5"}.fa-java:before{content:"\f4e4"}.fa-jedi-order:before{content:"\f50e"}.fa-jenkins:before{content:"\f3b6"}.fa-joget:before{content:"\f3b7"}.fa-joint:before{content:"\f595"}.fa-joomla:before{content:"\f1aa"}.fa-js:before{content:"\f3b8"}.fa-js-square:before{content:"\f3b9"}.fa-jsfiddle:before{content:"\f1cc"}.fa-key:before{content:"\f084"}.fa-keybase:before{content:"\f4f5"}.fa-keyboard:before{content:"\f11c"}.fa-keycdn:before{content:"\f3ba"}.fa-kickstarter:before{content:"\f3bb"}.fa-kickstarter-k:before{content:"\f3bc"}.fa-kiss:before{content:"\f596"}.fa-kiss-beam:before{content:"\f597"}.fa-kiss-wink-heart:before{content:"\f598"}.fa-kiwi-bird:before{content:"\f535"}.fa-korvue:before{content:"\f42f"}.fa-language:before{content:"\f1ab"}.fa-laptop:before{content:"\f109"}.fa-laravel:before{content:"\f3bd"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-laugh:before{content:"\f599"}.fa-laugh-beam:before{content:"\f59a"}.fa-laugh-squint:before{content:"\f59b"}.fa-laugh-wink:before{content:"\f59c"}.fa-leaf:before{content:"\f06c"}.fa-leanpub:before{content:"\f212"}.fa-lemon:before{content:"\f094"}.fa-less:before{content:"\f41d"}.fa-less-than:before{content:"\f536"}.fa-less-than-equal:before{content:"\f537"}.fa-level-down-alt:before{content:"\f3be"}.fa-level-up-alt:before{content:"\f3bf"}.fa-life-ring:before{content:"\f1cd"}.fa-lightbulb:before{content:"\f0eb"}.fa-line:before{content:"\f3c0"}.fa-link:before{content:"\f0c1"}.fa-linkedin:before{content:"\f08c"}.fa-linkedin-in:before{content:"\f0e1"}.fa-linode:before{content:"\f2b8"}.fa-linux:before{content:"\f17c"}.fa-lira-sign:before{content:"\f195"}.fa-list:before{content:"\f03a"}.fa-list-alt:before{content:"\f022"}.fa-list-ol:before{content:"\f0cb"}.fa-list-ul:before{content:"\f0ca"}.fa-location-arrow:before{content:"\f124"}.fa-lock:before{content:"\f023"}.fa-lock-open:before{content:"\f3c1"}.fa-long-arrow-alt-down:before{content:"\f309"}.fa-long-arrow-alt-left:before{content:"\f30a"}.fa-long-arrow-alt-right:before{content:"\f30b"}.fa-long-arrow-alt-up:before{content:"\f30c"}.fa-low-vision:before{content:"\f2a8"}.fa-luggage-cart:before{content:"\f59d"}.fa-lyft:before{content:"\f3c3"}.fa-magento:before{content:"\f3c4"}.fa-magic:before{content:"\f0d0"}.fa-magnet:before{content:"\f076"}.fa-mailchimp:before{content:"\f59e"}.fa-male:before{content:"\f183"}.fa-mandalorian:before{content:"\f50f"}.fa-map:before{content:"\f279"}.fa-map-marked:before{content:"\f59f"}.fa-map-marked-alt:before{content:"\f5a0"}.fa-map-marker:before{content:"\f041"}.fa-map-marker-alt:before{content:"\f3c5"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-marker:before{content:"\f5a1"}.fa-mars:before{content:"\f222"}.fa-mars-double:before{content:"\f227"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mastodon:before{content:"\f4f6"}.fa-maxcdn:before{content:"\f136"}.fa-medal:before{content:"\f5a2"}.fa-medapps:before{content:"\f3c6"}.fa-medium:before{content:"\f23a"}.fa-medium-m:before{content:"\f3c7"}.fa-medkit:before{content:"\f0fa"}.fa-medrt:before{content:"\f3c8"}.fa-meetup:before{content:"\f2e0"}.fa-megaport:before{content:"\f5a3"}.fa-meh:before{content:"\f11a"}.fa-meh-blank:before{content:"\f5a4"}.fa-meh-rolling-eyes:before{content:"\f5a5"}.fa-memory:before{content:"\f538"}.fa-mercury:before{content:"\f223"}.fa-microchip:before{content:"\f2db"}.fa-microphone:before{content:"\f130"}.fa-microphone-alt:before{content:"\f3c9"}.fa-microphone-alt-slash:before{content:"\f539"}.fa-microphone-slash:before{content:"\f131"}.fa-microsoft:before{content:"\f3ca"}.fa-minus:before{content:"\f068"}.fa-minus-circle:before{content:"\f056"}.fa-minus-square:before{content:"\f146"}.fa-mix:before{content:"\f3cb"}.fa-mixcloud:before{content:"\f289"}.fa-mizuni:before{content:"\f3cc"}.fa-mobile:before{content:"\f10b"}.fa-mobile-alt:before{content:"\f3cd"}.fa-modx:before{content:"\f285"}.fa-monero:before{content:"\f3d0"}.fa-money-bill:before{content:"\f0d6"}.fa-money-bill-alt:before{content:"\f3d1"}.fa-money-bill-wave:before{content:"\f53a"}.fa-money-bill-wave-alt:before{content:"\f53b"}.fa-money-check:before{content:"\f53c"}.fa-money-check-alt:before{content:"\f53d"}.fa-monument:before{content:"\f5a6"}.fa-moon:before{content:"\f186"}.fa-mortar-pestle:before{content:"\f5a7"}.fa-motorcycle:before{content:"\f21c"}.fa-mouse-pointer:before{content:"\f245"}.fa-music:before{content:"\f001"}.fa-napster:before{content:"\f3d2"}.fa-neuter:before{content:"\f22c"}.fa-newspaper:before{content:"\f1ea"}.fa-nimblr:before{content:"\f5a8"}.fa-nintendo-switch:before{content:"\f418"}.fa-node:before{content:"\f419"}.fa-node-js:before{content:"\f3d3"}.fa-not-equal:before{content:"\f53e"}.fa-notes-medical:before{content:"\f481"}.fa-npm:before{content:"\f3d4"}.fa-ns8:before{content:"\f3d5"}.fa-nutritionix:before{content:"\f3d6"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-old-republic:before{content:"\f510"}.fa-opencart:before{content:"\f23d"}.fa-openid:before{content:"\f19b"}.fa-opera:before{content:"\f26a"}.fa-optin-monster:before{content:"\f23c"}.fa-osi:before{content:"\f41a"}.fa-outdent:before{content:"\f03b"}.fa-page4:before{content:"\f3d7"}.fa-pagelines:before{content:"\f18c"}.fa-paint-brush:before{content:"\f1fc"}.fa-paint-roller:before{content:"\f5aa"}.fa-palette:before{content:"\f53f"}.fa-palfed:before{content:"\f3d8"}.fa-pallet:before{content:"\f482"}.fa-paper-plane:before{content:"\f1d8"}.fa-paperclip:before{content:"\f0c6"}.fa-parachute-box:before{content:"\f4cd"}.fa-paragraph:before{content:"\f1dd"}.fa-parking:before{content:"\f540"}.fa-passport:before{content:"\f5ab"}.fa-paste:before{content:"\f0ea"}.fa-patreon:before{content:"\f3d9"}.fa-pause:before{content:"\f04c"}.fa-pause-circle:before{content:"\f28b"}.fa-paw:before{content:"\f1b0"}.fa-paypal:before{content:"\f1ed"}.fa-pen:before{content:"\f304"}.fa-pen-alt:before{content:"\f305"}.fa-pen-fancy:before{content:"\f5ac"}.fa-pen-nib:before{content:"\f5ad"}.fa-pen-square:before{content:"\f14b"}.fa-pencil-alt:before{content:"\f303"}.fa-pencil-ruler:before{content:"\f5ae"}.fa-people-carry:before{content:"\f4ce"}.fa-percent:before{content:"\f295"}.fa-percentage:before{content:"\f541"}.fa-periscope:before{content:"\f3da"}.fa-phabricator:before{content:"\f3db"}.fa-phoenix-framework:before{content:"\f3dc"}.fa-phoenix-squadron:before{content:"\f511"}.fa-phone:before{content:"\f095"}.fa-phone-slash:before{content:"\f3dd"}.fa-phone-square:before{content:"\f098"}.fa-phone-volume:before{content:"\f2a0"}.fa-php:before{content:"\f457"}.fa-pied-piper:before{content:"\f2ae"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-pied-piper-hat:before{content:"\f4e5"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-piggy-bank:before{content:"\f4d3"}.fa-pills:before{content:"\f484"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-p:before{content:"\f231"}.fa-pinterest-square:before{content:"\f0d3"}.fa-plane:before{content:"\f072"}.fa-plane-arrival:before{content:"\f5af"}.fa-plane-departure:before{content:"\f5b0"}.fa-play:before{content:"\f04b"}.fa-play-circle:before{content:"\f144"}.fa-playstation:before{content:"\f3df"}.fa-plug:before{content:"\f1e6"}.fa-plus:before{content:"\f067"}.fa-plus-circle:before{content:"\f055"}.fa-plus-square:before{content:"\f0fe"}.fa-podcast:before{content:"\f2ce"}.fa-poo:before{content:"\f2fe"}.fa-portrait:before{content:"\f3e0"}.fa-pound-sign:before{content:"\f154"}.fa-power-off:before{content:"\f011"}.fa-prescription:before{content:"\f5b1"}.fa-prescription-bottle:before{content:"\f485"}.fa-prescription-bottle-alt:before{content:"\f486"}.fa-print:before{content:"\f02f"}.fa-procedures:before{content:"\f487"}.fa-product-hunt:before{content:"\f288"}.fa-project-diagram:before{content:"\f542"}.fa-pushed:before{content:"\f3e1"}.fa-puzzle-piece:before{content:"\f12e"}.fa-python:before{content:"\f3e2"}.fa-qq:before{content:"\f1d6"}.fa-qrcode:before{content:"\f029"}.fa-question:before{content:"\f128"}.fa-question-circle:before{content:"\f059"}.fa-quidditch:before{content:"\f458"}.fa-quinscape:before{content:"\f459"}.fa-quora:before{content:"\f2c4"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-r-project:before{content:"\f4f7"}.fa-random:before{content:"\f074"}.fa-ravelry:before{content:"\f2d9"}.fa-react:before{content:"\f41b"}.fa-readme:before{content:"\f4d5"}.fa-rebel:before{content:"\f1d0"}.fa-receipt:before{content:"\f543"}.fa-recycle:before{content:"\f1b8"}.fa-red-river:before{content:"\f3e3"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-alien:before{content:"\f281"}.fa-reddit-square:before{content:"\f1a2"}.fa-redo:before{content:"\f01e"}.fa-redo-alt:before{content:"\f2f9"}.fa-registered:before{content:"\f25d"}.fa-rendact:before{content:"\f3e4"}.fa-renren:before{content:"\f18b"}.fa-reply:before{content:"\f3e5"}.fa-reply-all:before{content:"\f122"}.fa-replyd:before{content:"\f3e6"}.fa-researchgate:before{content:"\f4f8"}.fa-resolving:before{content:"\f3e7"}.fa-retweet:before{content:"\f079"}.fa-ribbon:before{content:"\f4d6"}.fa-road:before{content:"\f018"}.fa-robot:before{content:"\f544"}.fa-rocket:before{content:"\f135"}.fa-rocketchat:before{content:"\f3e8"}.fa-rockrms:before{content:"\f3e9"}.fa-rss:before{content:"\f09e"}.fa-rss-square:before{content:"\f143"}.fa-ruble-sign:before{content:"\f158"}.fa-ruler:before{content:"\f545"}.fa-ruler-combined:before{content:"\f546"}.fa-ruler-horizontal:before{content:"\f547"}.fa-ruler-vertical:before{content:"\f548"}.fa-rupee-sign:before{content:"\f156"}.fa-sad-cry:before{content:"\f5b3"}.fa-sad-tear:before{content:"\f5b4"}.fa-safari:before{content:"\f267"}.fa-sass:before{content:"\f41e"}.fa-save:before{content:"\f0c7"}.fa-schlix:before{content:"\f3ea"}.fa-school:before{content:"\f549"}.fa-screwdriver:before{content:"\f54a"}.fa-scribd:before{content:"\f28a"}.fa-search:before{content:"\f002"}.fa-search-minus:before{content:"\f010"}.fa-search-plus:before{content:"\f00e"}.fa-searchengin:before{content:"\f3eb"}.fa-seedling:before{content:"\f4d8"}.fa-sellcast:before{content:"\f2da"}.fa-sellsy:before{content:"\f213"}.fa-server:before{content:"\f233"}.fa-servicestack:before{content:"\f3ec"}.fa-share:before{content:"\f064"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-share-square:before{content:"\f14d"}.fa-shekel-sign:before{content:"\f20b"}.fa-shield-alt:before{content:"\f3ed"}.fa-ship:before{content:"\f21a"}.fa-shipping-fast:before{content:"\f48b"}.fa-shirtsinbulk:before{content:"\f214"}.fa-shoe-prints:before{content:"\f54b"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-shopping-cart:before{content:"\f07a"}.fa-shopware:before{content:"\f5b5"}.fa-shower:before{content:"\f2cc"}.fa-shuttle-van:before{content:"\f5b6"}.fa-sign:before{content:"\f4d9"}.fa-sign-in-alt:before{content:"\f2f6"}.fa-sign-language:before{content:"\f2a7"}.fa-sign-out-alt:before{content:"\f2f5"}.fa-signal:before{content:"\f012"}.fa-signature:before{content:"\f5b7"}.fa-simplybuilt:before{content:"\f215"}.fa-sistrix:before{content:"\f3ee"}.fa-sitemap:before{content:"\f0e8"}.fa-sith:before{content:"\f512"}.fa-skull:before{content:"\f54c"}.fa-skyatlas:before{content:"\f216"}.fa-skype:before{content:"\f17e"}.fa-slack:before{content:"\f198"}.fa-slack-hash:before{content:"\f3ef"}.fa-sliders-h:before{content:"\f1de"}.fa-slideshare:before{content:"\f1e7"}.fa-smile:before{content:"\f118"}.fa-smile-beam:before{content:"\f5b8"}.fa-smile-wink:before{content:"\f4da"}.fa-smoking:before{content:"\f48d"}.fa-smoking-ban:before{content:"\f54d"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-snowflake:before{content:"\f2dc"}.fa-solar-panel:before{content:"\f5ba"}.fa-sort:before{content:"\f0dc"}.fa-sort-alpha-down:before{content:"\f15d"}.fa-sort-alpha-up:before{content:"\f15e"}.fa-sort-amount-down:before{content:"\f160"}.fa-sort-amount-up:before{content:"\f161"}.fa-sort-down:before{content:"\f0dd"}.fa-sort-numeric-down:before{content:"\f162"}.fa-sort-numeric-up:before{content:"\f163"}.fa-sort-up:before{content:"\f0de"}.fa-soundcloud:before{content:"\f1be"}.fa-spa:before{content:"\f5bb"}.fa-space-shuttle:before{content:"\f197"}.fa-speakap:before{content:"\f3f3"}.fa-spinner:before{content:"\f110"}.fa-splotch:before{content:"\f5bc"}.fa-spotify:before{content:"\f1bc"}.fa-spray-can:before{content:"\f5bd"}.fa-square:before{content:"\f0c8"}.fa-square-full:before{content:"\f45c"}.fa-squarespace:before{content:"\f5be"}.fa-stack-exchange:before{content:"\f18d"}.fa-stack-overflow:before{content:"\f16c"}.fa-stamp:before{content:"\f5bf"}.fa-star:before{content:"\f005"}.fa-star-half:before{content:"\f089"}.fa-star-half-alt:before{content:"\f5c0"}.fa-staylinked:before{content:"\f3f5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-steam-symbol:before{content:"\f3f6"}.fa-step-backward:before{content:"\f048"}.fa-step-forward:before{content:"\f051"}.fa-stethoscope:before{content:"\f0f1"}.fa-sticker-mule:before{content:"\f3f7"}.fa-sticky-note:before{content:"\f249"}.fa-stop:before{content:"\f04d"}.fa-stop-circle:before{content:"\f28d"}.fa-stopwatch:before{content:"\f2f2"}.fa-store:before{content:"\f54e"}.fa-store-alt:before{content:"\f54f"}.fa-strava:before{content:"\f428"}.fa-stream:before{content:"\f550"}.fa-street-view:before{content:"\f21d"}.fa-strikethrough:before{content:"\f0cc"}.fa-stripe:before{content:"\f429"}.fa-stripe-s:before{content:"\f42a"}.fa-stroopwafel:before{content:"\f551"}.fa-studiovinari:before{content:"\f3f8"}.fa-stumbleupon:before{content:"\f1a4"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-subscript:before{content:"\f12c"}.fa-subway:before{content:"\f239"}.fa-suitcase:before{content:"\f0f2"}.fa-suitcase-rolling:before{content:"\f5c1"}.fa-sun:before{content:"\f185"}.fa-superpowers:before{content:"\f2dd"}.fa-superscript:before{content:"\f12b"}.fa-supple:before{content:"\f3f9"}.fa-surprise:before{content:"\f5c2"}.fa-swatchbook:before{content:"\f5c3"}.fa-swimmer:before{content:"\f5c4"}.fa-swimming-pool:before{content:"\f5c5"}.fa-sync:before{content:"\f021"}.fa-sync-alt:before{content:"\f2f1"}.fa-syringe:before{content:"\f48e"}.fa-table:before{content:"\f0ce"}.fa-table-tennis:before{content:"\f45d"}.fa-tablet:before{content:"\f10a"}.fa-tablet-alt:before{content:"\f3fa"}.fa-tablets:before{content:"\f490"}.fa-tachometer-alt:before{content:"\f3fd"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-tape:before{content:"\f4db"}.fa-tasks:before{content:"\f0ae"}.fa-taxi:before{content:"\f1ba"}.fa-teamspeak:before{content:"\f4f9"}.fa-telegram:before{content:"\f2c6"}.fa-telegram-plane:before{content:"\f3fe"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-terminal:before{content:"\f120"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-th:before{content:"\f00a"}.fa-th-large:before{content:"\f009"}.fa-th-list:before{content:"\f00b"}.fa-themeco:before{content:"\f5c6"}.fa-themeisle:before{content:"\f2b2"}.fa-thermometer:before{content:"\f491"}.fa-thermometer-empty:before{content:"\f2cb"}.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thumbs-down:before{content:"\f165"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbtack:before{content:"\f08d"}.fa-ticket-alt:before{content:"\f3ff"}.fa-times:before{content:"\f00d"}.fa-times-circle:before{content:"\f057"}.fa-tint:before{content:"\f043"}.fa-tint-slash:before{content:"\f5c7"}.fa-tired:before{content:"\f5c8"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-toolbox:before{content:"\f552"}.fa-tooth:before{content:"\f5c9"}.fa-trade-federation:before{content:"\f513"}.fa-trademark:before{content:"\f25c"}.fa-train:before{content:"\f238"}.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-trash:before{content:"\f1f8"}.fa-trash-alt:before{content:"\f2ed"}.fa-tree:before{content:"\f1bb"}.fa-trello:before{content:"\f181"}.fa-tripadvisor:before{content:"\f262"}.fa-trophy:before{content:"\f091"}.fa-truck:before{content:"\f0d1"}.fa-truck-loading:before{content:"\f4de"}.fa-truck-moving:before{content:"\f4df"}.fa-tshirt:before{content:"\f553"}.fa-tty:before{content:"\f1e4"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-tv:before{content:"\f26c"}.fa-twitch:before{content:"\f1e8"}.fa-twitter:before{content:"\f099"}.fa-twitter-square:before{content:"\f081"}.fa-typo3:before{content:"\f42b"}.fa-uber:before{content:"\f402"}.fa-uikit:before{content:"\f403"}.fa-umbrella:before{content:"\f0e9"}.fa-umbrella-beach:before{content:"\f5ca"}.fa-underline:before{content:"\f0cd"}.fa-undo:before{content:"\f0e2"}.fa-undo-alt:before{content:"\f2ea"}.fa-uniregistry:before{content:"\f404"}.fa-universal-access:before{content:"\f29a"}.fa-university:before{content:"\f19c"}.fa-unlink:before{content:"\f127"}.fa-unlock:before{content:"\f09c"}.fa-unlock-alt:before{content:"\f13e"}.fa-untappd:before{content:"\f405"}.fa-upload:before{content:"\f093"}.fa-usb:before{content:"\f287"}.fa-user:before{content:"\f007"}.fa-user-alt:before{content:"\f406"}.fa-user-alt-slash:before{content:"\f4fa"}.fa-user-astronaut:before{content:"\f4fb"}.fa-user-check:before{content:"\f4fc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-clock:before{content:"\f4fd"}.fa-user-cog:before{content:"\f4fe"}.fa-user-edit:before{content:"\f4ff"}.fa-user-friends:before{content:"\f500"}.fa-user-graduate:before{content:"\f501"}.fa-user-lock:before{content:"\f502"}.fa-user-md:before{content:"\f0f0"}.fa-user-minus:before{content:"\f503"}.fa-user-ninja:before{content:"\f504"}.fa-user-plus:before{content:"\f234"}.fa-user-secret:before{content:"\f21b"}.fa-user-shield:before{content:"\f505"}.fa-user-slash:before{content:"\f506"}.fa-user-tag:before{content:"\f507"}.fa-user-tie:before{content:"\f508"}.fa-user-times:before{content:"\f235"}.fa-users:before{content:"\f0c0"}.fa-users-cog:before{content:"\f509"}.fa-ussunnah:before{content:"\f407"}.fa-utensil-spoon:before{content:"\f2e5"}.fa-utensils:before{content:"\f2e7"}.fa-vaadin:before{content:"\f408"}.fa-vector-square:before{content:"\f5cb"}.fa-venus:before{content:"\f221"}.fa-venus-double:before{content:"\f226"}.fa-venus-mars:before{content:"\f228"}.fa-viacoin:before{content:"\f237"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-vial:before{content:"\f492"}.fa-vials:before{content:"\f493"}.fa-viber:before{content:"\f409"}.fa-video:before{content:"\f03d"}.fa-video-slash:before{content:"\f4e2"}.fa-vimeo:before{content:"\f40a"}.fa-vimeo-square:before{content:"\f194"}.fa-vimeo-v:before{content:"\f27d"}.fa-vine:before{content:"\f1ca"}.fa-vk:before{content:"\f189"}.fa-vnv:before{content:"\f40b"}.fa-volleyball-ball:before{content:"\f45f"}.fa-volume-down:before{content:"\f027"}.fa-volume-off:before{content:"\f026"}.fa-volume-up:before{content:"\f028"}.fa-vuejs:before{content:"\f41f"}.fa-walking:before{content:"\f554"}.fa-wallet:before{content:"\f555"}.fa-warehouse:before{content:"\f494"}.fa-weebly:before{content:"\f5cc"}.fa-weibo:before{content:"\f18a"}.fa-weight:before{content:"\f496"}.fa-weight-hanging:before{content:"\f5cd"}.fa-weixin:before{content:"\f1d7"}.fa-whatsapp:before{content:"\f232"}.fa-whatsapp-square:before{content:"\f40c"}.fa-wheelchair:before{content:"\f193"}.fa-whmcs:before{content:"\f40d"}.fa-wifi:before{content:"\f1eb"}.fa-wikipedia-w:before{content:"\f266"}.fa-window-close:before{content:"\f410"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-windows:before{content:"\f17a"}.fa-wine-glass:before{content:"\f4e3"}.fa-wine-glass-alt:before{content:"\f5ce"}.fa-wix:before{content:"\f5cf"}.fa-wolf-pack-battalion:before{content:"\f514"}.fa-won-sign:before{content:"\f159"}.fa-wordpress:before{content:"\f19a"}.fa-wordpress-simple:before{content:"\f411"}.fa-wpbeginner:before{content:"\f297"}.fa-wpexplorer:before{content:"\f2de"}.fa-wpforms:before{content:"\f298"}.fa-wrench:before{content:"\f0ad"}.fa-x-ray:before{content:"\f497"}.fa-xbox:before{content:"\f412"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-y-combinator:before{content:"\f23b"}.fa-yahoo:before{content:"\f19e"}.fa-yandex:before{content:"\f413"}.fa-yandex-international:before{content:"\f414"}.fa-yelp:before{content:"\f1e9"}.fa-yen-sign:before{content:"\f157"}.fa-yoast:before{content:"\f2b1"}.fa-youtube:before{content:"\f167"}.fa-youtube-square:before{content:"\f431"}.sr-only{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}@font-face{font-family:"Font Awesome 5 Brands";font-style:normal;font-weight:normal;src:url(../fonts/font-awesome/fa-brands-400.eot);src:url(../fonts/font-awesome/fa-brands-400.eot?#iefix) format("embedded-opentype"),url(../fonts/font-awesome/fa-brands-400.woff2) format("woff2"),url(../fonts/font-awesome/fa-brands-400.woff) format("woff"),url(../fonts/font-awesome/fa-brands-400.ttf) format("truetype"),url(../fonts/font-awesome/fa-brands-400.svg#fontawesome) format("svg")}.fab{font-family:"Font Awesome 5 Brands"}@font-face{font-family:"Font Awesome 5 Free";font-style:normal;font-weight:400;src:url(../fonts/font-awesome/fa-regular-400.eot);src:url(../fonts/font-awesome/fa-regular-400.eot?#iefix) format("embedded-opentype"),url(../fonts/font-awesome/fa-regular-400.woff2) format("woff2"),url(../fonts/font-awesome/fa-regular-400.woff) format("woff"),url(../fonts/font-awesome/fa-regular-400.ttf) format("truetype"),url(../fonts/font-awesome/fa-regular-400.svg#fontawesome) format("svg")}.far{font-weight:400}@font-face{font-family:"Font Awesome 5 Free";font-style:normal;font-weight:900;src:url(../fonts/font-awesome/fa-solid-900.eot);src:url(../fonts/font-awesome/fa-solid-900.eot?#iefix) format("embedded-opentype"),url(../fonts/font-awesome/fa-solid-900.woff2) format("woff2"),url(../fonts/font-awesome/fa-solid-900.woff) format("woff"),url(../fonts/font-awesome/fa-solid-900.ttf) format("truetype"),url(../fonts/font-awesome/fa-solid-900.svg#fontawesome) format("svg")}.fa,.far,.fas{font-family:"Font Awesome 5 Free"}.fa,.fas{font-weight:900}
\ No newline at end of file
diff --git a/data/interfaces/default/css/font-awesome.min.css b/data/interfaces/default/css/font-awesome.min.css
new file mode 100644
index 00000000..ee4e9782
--- /dev/null
+++ b/data/interfaces/default/css/font-awesome.min.css
@@ -0,0 +1,4 @@
+/*!
+ *  Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.4.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.4.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.4.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.4.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.4.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.4.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}
diff --git a/data/interfaces/default/css/font-awesome.v4-shims.min.css b/data/interfaces/default/css/font-awesome.v4-shims.min.css
deleted file mode 100644
index a47c8e25..00000000
--- a/data/interfaces/default/css/font-awesome.v4-shims.min.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*!
- * Font Awesome Free 5.1.0 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
- */
-.fa.fa-glass:before{content:"\f000"}.fa.fa-meetup{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-star-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-o:before{content:"\f005"}.fa.fa-close:before,.fa.fa-remove:before{content:"\f00d"}.fa.fa-gear:before{content:"\f013"}.fa.fa-trash-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-trash-o:before{content:"\f2ed"}.fa.fa-file-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-o:before{content:"\f15b"}.fa.fa-clock-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-clock-o:before{content:"\f017"}.fa.fa-arrow-circle-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-down:before{content:"\f358"}.fa.fa-arrow-circle-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-up:before{content:"\f35b"}.fa.fa-play-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-play-circle-o:before{content:"\f144"}.fa.fa-repeat:before,.fa.fa-rotate-right:before{content:"\f01e"}.fa.fa-refresh:before{content:"\f021"}.fa.fa-list-alt{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-dedent:before{content:"\f03b"}.fa.fa-video-camera:before{content:"\f03d"}.fa.fa-picture-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-picture-o:before{content:"\f03e"}.fa.fa-photo{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-photo:before{content:"\f03e"}.fa.fa-image{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-image:before{content:"\f03e"}.fa.fa-pencil:before{content:"\f303"}.fa.fa-map-marker:before{content:"\f3c5"}.fa.fa-pencil-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-pencil-square-o:before{content:"\f044"}.fa.fa-share-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-share-square-o:before{content:"\f14d"}.fa.fa-check-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-check-square-o:before{content:"\f14a"}.fa.fa-arrows:before{content:"\f0b2"}.fa.fa-times-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-times-circle-o:before{content:"\f057"}.fa.fa-check-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-check-circle-o:before{content:"\f058"}.fa.fa-mail-forward:before{content:"\f064"}.fa.fa-eye,.fa.fa-eye-slash{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-warning:before{content:"\f071"}.fa.fa-calendar:before{content:"\f073"}.fa.fa-arrows-v:before{content:"\f338"}.fa.fa-arrows-h:before{content:"\f337"}.fa.fa-bar-chart{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bar-chart:before{content:"\f080"}.fa.fa-bar-chart-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bar-chart-o:before{content:"\f080"}.fa.fa-facebook-square,.fa.fa-twitter-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-gears:before{content:"\f085"}.fa.fa-thumbs-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-thumbs-o-up:before{content:"\f164"}.fa.fa-thumbs-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-thumbs-o-down:before{content:"\f165"}.fa.fa-heart-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-heart-o:before{content:"\f004"}.fa.fa-sign-out:before{content:"\f2f5"}.fa.fa-linkedin-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-linkedin-square:before{content:"\f08c"}.fa.fa-thumb-tack:before{content:"\f08d"}.fa.fa-external-link:before{content:"\f35d"}.fa.fa-sign-in:before{content:"\f2f6"}.fa.fa-github-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-lemon-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-lemon-o:before{content:"\f094"}.fa.fa-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-square-o:before{content:"\f0c8"}.fa.fa-bookmark-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bookmark-o:before{content:"\f02e"}.fa.fa-facebook,.fa.fa-twitter{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-facebook:before{content:"\f39e"}.fa.fa-facebook-f{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-facebook-f:before{content:"\f39e"}.fa.fa-github{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-credit-card{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-feed:before{content:"\f09e"}.fa.fa-hdd-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hdd-o:before{content:"\f0a0"}.fa.fa-hand-o-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-right:before{content:"\f0a4"}.fa.fa-hand-o-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-left:before{content:"\f0a5"}.fa.fa-hand-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-up:before{content:"\f0a6"}.fa.fa-hand-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-down:before{content:"\f0a7"}.fa.fa-arrows-alt:before{content:"\f31e"}.fa.fa-group:before{content:"\f0c0"}.fa.fa-chain:before{content:"\f0c1"}.fa.fa-scissors:before{content:"\f0c4"}.fa.fa-files-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-files-o:before{content:"\f0c5"}.fa.fa-floppy-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-floppy-o:before{content:"\f0c7"}.fa.fa-navicon:before,.fa.fa-reorder:before{content:"\f0c9"}.fa.fa-google-plus,.fa.fa-google-plus-square,.fa.fa-pinterest,.fa.fa-pinterest-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-google-plus:before{content:"\f0d5"}.fa.fa-money{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-money:before{content:"\f3d1"}.fa.fa-unsorted:before{content:"\f0dc"}.fa.fa-sort-desc:before{content:"\f0dd"}.fa.fa-sort-asc:before{content:"\f0de"}.fa.fa-linkedin{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-linkedin:before{content:"\f0e1"}.fa.fa-rotate-left:before{content:"\f0e2"}.fa.fa-legal:before{content:"\f0e3"}.fa.fa-dashboard:before,.fa.fa-tachometer:before{content:"\f3fd"}.fa.fa-comment-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-comment-o:before{content:"\f075"}.fa.fa-comments-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-comments-o:before{content:"\f086"}.fa.fa-flash:before{content:"\f0e7"}.fa.fa-clipboard,.fa.fa-paste{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-paste:before{content:"\f328"}.fa.fa-lightbulb-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-lightbulb-o:before{content:"\f0eb"}.fa.fa-exchange:before{content:"\f362"}.fa.fa-cloud-download:before{content:"\f381"}.fa.fa-cloud-upload:before{content:"\f382"}.fa.fa-bell-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bell-o:before{content:"\f0f3"}.fa.fa-cutlery:before{content:"\f2e7"}.fa.fa-file-text-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-text-o:before{content:"\f15c"}.fa.fa-building-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-building-o:before{content:"\f1ad"}.fa.fa-hospital-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hospital-o:before{content:"\f0f8"}.fa.fa-tablet:before{content:"\f3fa"}.fa.fa-mobile-phone:before,.fa.fa-mobile:before{content:"\f3cd"}.fa.fa-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-circle-o:before{content:"\f111"}.fa.fa-mail-reply:before{content:"\f3e5"}.fa.fa-github-alt{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-folder-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-folder-o:before{content:"\f07b"}.fa.fa-folder-open-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-folder-open-o:before{content:"\f07c"}.fa.fa-smile-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-smile-o:before{content:"\f118"}.fa.fa-frown-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-frown-o:before{content:"\f119"}.fa.fa-meh-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-meh-o:before{content:"\f11a"}.fa.fa-keyboard-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-keyboard-o:before{content:"\f11c"}.fa.fa-flag-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-flag-o:before{content:"\f024"}.fa.fa-mail-reply-all:before{content:"\f122"}.fa.fa-star-half-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-half-o:before{content:"\f089"}.fa.fa-star-half-empty{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-half-empty:before{content:"\f089"}.fa.fa-star-half-full{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-half-full:before{content:"\f089"}.fa.fa-code-fork:before{content:"\f126"}.fa.fa-chain-broken:before{content:"\f127"}.fa.fa-shield:before{content:"\f3ed"}.fa.fa-calendar-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-o:before{content:"\f133"}.fa.fa-css3,.fa.fa-html5,.fa.fa-maxcdn{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-ticket:before{content:"\f3ff"}.fa.fa-minus-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-minus-square-o:before{content:"\f146"}.fa.fa-level-up:before{content:"\f3bf"}.fa.fa-level-down:before{content:"\f3be"}.fa.fa-pencil-square:before{content:"\f14b"}.fa.fa-external-link-square:before{content:"\f360"}.fa.fa-compass{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-down:before{content:"\f150"}.fa.fa-toggle-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-down:before{content:"\f150"}.fa.fa-caret-square-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-up:before{content:"\f151"}.fa.fa-toggle-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-up:before{content:"\f151"}.fa.fa-caret-square-o-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-right:before{content:"\f152"}.fa.fa-toggle-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-right:before{content:"\f152"}.fa.fa-eur:before,.fa.fa-euro:before{content:"\f153"}.fa.fa-gbp:before{content:"\f154"}.fa.fa-dollar:before,.fa.fa-usd:before{content:"\f155"}.fa.fa-inr:before,.fa.fa-rupee:before{content:"\f156"}.fa.fa-cny:before,.fa.fa-jpy:before,.fa.fa-rmb:before,.fa.fa-yen:before{content:"\f157"}.fa.fa-rouble:before,.fa.fa-rub:before,.fa.fa-ruble:before{content:"\f158"}.fa.fa-krw:before,.fa.fa-won:before{content:"\f159"}.fa.fa-bitcoin,.fa.fa-btc{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bitcoin:before{content:"\f15a"}.fa.fa-file-text:before{content:"\f15c"}.fa.fa-sort-alpha-asc:before{content:"\f15d"}.fa.fa-sort-alpha-desc:before{content:"\f15e"}.fa.fa-sort-amount-asc:before{content:"\f160"}.fa.fa-sort-amount-desc:before{content:"\f161"}.fa.fa-sort-numeric-asc:before{content:"\f162"}.fa.fa-sort-numeric-desc:before{content:"\f163"}.fa.fa-xing,.fa.fa-xing-square,.fa.fa-youtube,.fa.fa-youtube-play,.fa.fa-youtube-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-youtube-play:before{content:"\f167"}.fa.fa-adn,.fa.fa-bitbucket,.fa.fa-bitbucket-square,.fa.fa-dropbox,.fa.fa-flickr,.fa.fa-instagram,.fa.fa-stack-overflow{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bitbucket-square:before{content:"\f171"}.fa.fa-tumblr,.fa.fa-tumblr-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-long-arrow-down:before{content:"\f309"}.fa.fa-long-arrow-up:before{content:"\f30c"}.fa.fa-long-arrow-left:before{content:"\f30a"}.fa.fa-long-arrow-right:before{content:"\f30b"}.fa.fa-android,.fa.fa-apple,.fa.fa-dribbble,.fa.fa-foursquare,.fa.fa-gittip,.fa.fa-gratipay,.fa.fa-linux,.fa.fa-skype,.fa.fa-trello,.fa.fa-windows{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-gittip:before{content:"\f184"}.fa.fa-sun-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-sun-o:before{content:"\f185"}.fa.fa-moon-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-moon-o:before{content:"\f186"}.fa.fa-pagelines,.fa.fa-renren,.fa.fa-stack-exchange,.fa.fa-vk,.fa.fa-weibo{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-arrow-circle-o-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-right:before{content:"\f35a"}.fa.fa-arrow-circle-o-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-left:before{content:"\f359"}.fa.fa-caret-square-o-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-left:before{content:"\f191"}.fa.fa-toggle-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-left:before{content:"\f191"}.fa.fa-dot-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-dot-circle-o:before{content:"\f192"}.fa.fa-vimeo-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-try:before,.fa.fa-turkish-lira:before{content:"\f195"}.fa.fa-plus-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-plus-square-o:before{content:"\f0fe"}.fa.fa-openid,.fa.fa-slack,.fa.fa-wordpress{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bank:before,.fa.fa-institution:before{content:"\f19c"}.fa.fa-mortar-board:before{content:"\f19d"}.fa.fa-delicious,.fa.fa-digg,.fa.fa-drupal,.fa.fa-google,.fa.fa-joomla,.fa.fa-pied-piper-alt,.fa.fa-pied-piper-pp,.fa.fa-reddit,.fa.fa-reddit-square,.fa.fa-stumbleupon,.fa.fa-stumbleupon-circle,.fa.fa-yahoo{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-spoon:before{content:"\f2e5"}.fa.fa-behance,.fa.fa-behance-square,.fa.fa-steam,.fa.fa-steam-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-automobile:before{content:"\f1b9"}.fa.fa-cab:before{content:"\f1ba"}.fa.fa-envelope-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-envelope-o:before{content:"\f0e0"}.fa.fa-deviantart,.fa.fa-soundcloud{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-file-pdf-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-pdf-o:before{content:"\f1c1"}.fa.fa-file-word-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-word-o:before{content:"\f1c2"}.fa.fa-file-excel-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-excel-o:before{content:"\f1c3"}.fa.fa-file-powerpoint-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-powerpoint-o:before{content:"\f1c4"}.fa.fa-file-image-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-image-o:before{content:"\f1c5"}.fa.fa-file-photo-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-photo-o:before{content:"\f1c5"}.fa.fa-file-picture-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-picture-o:before{content:"\f1c5"}.fa.fa-file-archive-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-archive-o:before{content:"\f1c6"}.fa.fa-file-zip-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-zip-o:before{content:"\f1c6"}.fa.fa-file-audio-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-audio-o:before{content:"\f1c7"}.fa.fa-file-sound-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-sound-o:before{content:"\f1c7"}.fa.fa-file-video-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-video-o:before{content:"\f1c8"}.fa.fa-file-movie-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-movie-o:before{content:"\f1c8"}.fa.fa-file-code-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-code-o:before{content:"\f1c9"}.fa.fa-codepen,.fa.fa-jsfiddle,.fa.fa-vine{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-life-bouy,.fa.fa-life-ring{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-life-bouy:before{content:"\f1cd"}.fa.fa-life-buoy{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-life-buoy:before{content:"\f1cd"}.fa.fa-life-saver{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-life-saver:before{content:"\f1cd"}.fa.fa-support{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-support:before{content:"\f1cd"}.fa.fa-circle-o-notch:before{content:"\f1ce"}.fa.fa-ra,.fa.fa-rebel{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-ra:before{content:"\f1d0"}.fa.fa-resistance{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-resistance:before{content:"\f1d0"}.fa.fa-empire,.fa.fa-ge{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-ge:before{content:"\f1d1"}.fa.fa-git,.fa.fa-git-square,.fa.fa-hacker-news,.fa.fa-y-combinator-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-y-combinator-square:before{content:"\f1d4"}.fa.fa-yc-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-yc-square:before{content:"\f1d4"}.fa.fa-qq,.fa.fa-tencent-weibo,.fa.fa-wechat,.fa.fa-weixin{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-wechat:before{content:"\f1d7"}.fa.fa-send:before{content:"\f1d8"}.fa.fa-paper-plane-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-paper-plane-o:before{content:"\f1d8"}.fa.fa-send-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-send-o:before{content:"\f1d8"}.fa.fa-circle-thin{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-circle-thin:before{content:"\f111"}.fa.fa-header:before{content:"\f1dc"}.fa.fa-sliders:before{content:"\f1de"}.fa.fa-futbol-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-futbol-o:before{content:"\f1e3"}.fa.fa-soccer-ball-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-soccer-ball-o:before{content:"\f1e3"}.fa.fa-slideshare,.fa.fa-twitch,.fa.fa-yelp{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-newspaper-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-newspaper-o:before{content:"\f1ea"}.fa.fa-cc-amex,.fa.fa-cc-discover,.fa.fa-cc-mastercard,.fa.fa-cc-paypal,.fa.fa-cc-stripe,.fa.fa-cc-visa,.fa.fa-google-wallet,.fa.fa-paypal{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bell-slash-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bell-slash-o:before{content:"\f1f6"}.fa.fa-trash:before{content:"\f2ed"}.fa.fa-copyright{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-eyedropper:before{content:"\f1fb"}.fa.fa-area-chart:before{content:"\f1fe"}.fa.fa-pie-chart:before{content:"\f200"}.fa.fa-line-chart:before{content:"\f201"}.fa.fa-angellist,.fa.fa-ioxhost,.fa.fa-lastfm,.fa.fa-lastfm-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-cc{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-cc:before{content:"\f20a"}.fa.fa-ils:before,.fa.fa-shekel:before,.fa.fa-sheqel:before{content:"\f20b"}.fa.fa-meanpath{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-meanpath:before{content:"\f2b4"}.fa.fa-buysellads,.fa.fa-connectdevelop,.fa.fa-dashcube,.fa.fa-forumbee,.fa.fa-leanpub,.fa.fa-sellsy,.fa.fa-shirtsinbulk,.fa.fa-simplybuilt,.fa.fa-skyatlas{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-diamond{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-diamond:before{content:"\f3a5"}.fa.fa-intersex:before{content:"\f224"}.fa.fa-facebook-official{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-facebook-official:before{content:"\f09a"}.fa.fa-pinterest-p,.fa.fa-whatsapp{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-hotel:before{content:"\f236"}.fa.fa-medium,.fa.fa-viacoin,.fa.fa-y-combinator,.fa.fa-yc{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-yc:before{content:"\f23b"}.fa.fa-expeditedssl,.fa.fa-opencart,.fa.fa-optin-monster{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-battery-4:before,.fa.fa-battery:before{content:"\f240"}.fa.fa-battery-3:before{content:"\f241"}.fa.fa-battery-2:before{content:"\f242"}.fa.fa-battery-1:before{content:"\f243"}.fa.fa-battery-0:before{content:"\f244"}.fa.fa-object-group,.fa.fa-object-ungroup,.fa.fa-sticky-note-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-sticky-note-o:before{content:"\f249"}.fa.fa-cc-diners-club,.fa.fa-cc-jcb{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-clone,.fa.fa-hourglass-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hourglass-o:before{content:"\f254"}.fa.fa-hourglass-1:before{content:"\f251"}.fa.fa-hourglass-2:before{content:"\f252"}.fa.fa-hourglass-3:before{content:"\f253"}.fa.fa-hand-rock-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-rock-o:before{content:"\f255"}.fa.fa-hand-grab-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-grab-o:before{content:"\f255"}.fa.fa-hand-paper-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-paper-o:before{content:"\f256"}.fa.fa-hand-stop-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-stop-o:before{content:"\f256"}.fa.fa-hand-scissors-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-scissors-o:before{content:"\f257"}.fa.fa-hand-lizard-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-lizard-o:before{content:"\f258"}.fa.fa-hand-spock-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-spock-o:before{content:"\f259"}.fa.fa-hand-pointer-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-pointer-o:before{content:"\f25a"}.fa.fa-hand-peace-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-peace-o:before{content:"\f25b"}.fa.fa-registered{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-chrome,.fa.fa-creative-commons,.fa.fa-firefox,.fa.fa-get-pocket,.fa.fa-gg,.fa.fa-gg-circle,.fa.fa-internet-explorer,.fa.fa-odnoklassniki,.fa.fa-odnoklassniki-square,.fa.fa-opera,.fa.fa-safari,.fa.fa-tripadvisor,.fa.fa-wikipedia-w{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-television:before{content:"\f26c"}.fa.fa-500px,.fa.fa-amazon,.fa.fa-contao{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-calendar-plus-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-plus-o:before{content:"\f271"}.fa.fa-calendar-minus-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-minus-o:before{content:"\f272"}.fa.fa-calendar-times-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-times-o:before{content:"\f273"}.fa.fa-calendar-check-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-check-o:before{content:"\f274"}.fa.fa-map-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-map-o:before{content:"\f279"}.fa.fa-commenting{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-commenting:before{content:"\f4ad"}.fa.fa-commenting-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-commenting-o:before{content:"\f4ad"}.fa.fa-houzz,.fa.fa-vimeo{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-vimeo:before{content:"\f27d"}.fa.fa-black-tie,.fa.fa-edge,.fa.fa-fonticons,.fa.fa-reddit-alien{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-credit-card-alt:before{content:"\f09d"}.fa.fa-codiepie,.fa.fa-fort-awesome,.fa.fa-mixcloud,.fa.fa-modx,.fa.fa-product-hunt,.fa.fa-scribd,.fa.fa-usb{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-pause-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-pause-circle-o:before{content:"\f28b"}.fa.fa-stop-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-stop-circle-o:before{content:"\f28d"}.fa.fa-bluetooth,.fa.fa-bluetooth-b,.fa.fa-envira,.fa.fa-gitlab,.fa.fa-wheelchair-alt,.fa.fa-wpbeginner,.fa.fa-wpforms{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-wheelchair-alt:before{content:"\f368"}.fa.fa-question-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-question-circle-o:before{content:"\f059"}.fa.fa-volume-control-phone:before{content:"\f2a0"}.fa.fa-asl-interpreting:before{content:"\f2a3"}.fa.fa-deafness:before,.fa.fa-hard-of-hearing:before{content:"\f2a4"}.fa.fa-glide,.fa.fa-glide-g{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-signing:before{content:"\f2a7"}.fa.fa-first-order,.fa.fa-google-plus-official,.fa.fa-pied-piper,.fa.fa-snapchat,.fa.fa-snapchat-ghost,.fa.fa-snapchat-square,.fa.fa-themeisle,.fa.fa-viadeo,.fa.fa-viadeo-square,.fa.fa-yoast{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-google-plus-official:before{content:"\f2b3"}.fa.fa-google-plus-circle{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-google-plus-circle:before{content:"\f2b3"}.fa.fa-fa,.fa.fa-font-awesome{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-fa:before{content:"\f2b4"}.fa.fa-handshake-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-handshake-o:before{content:"\f2b5"}.fa.fa-envelope-open-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-envelope-open-o:before{content:"\f2b6"}.fa.fa-linode{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-address-book-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-address-book-o:before{content:"\f2b9"}.fa.fa-vcard:before{content:"\f2bb"}.fa.fa-address-card-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-address-card-o:before{content:"\f2bb"}.fa.fa-vcard-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-vcard-o:before{content:"\f2bb"}.fa.fa-user-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-user-circle-o:before{content:"\f2bd"}.fa.fa-user-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-user-o:before{content:"\f007"}.fa.fa-id-badge{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-drivers-license:before{content:"\f2c2"}.fa.fa-id-card-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-id-card-o:before{content:"\f2c2"}.fa.fa-drivers-license-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-drivers-license-o:before{content:"\f2c2"}.fa.fa-free-code-camp,.fa.fa-quora,.fa.fa-telegram{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-thermometer-4:before,.fa.fa-thermometer:before{content:"\f2c7"}.fa.fa-thermometer-3:before{content:"\f2c8"}.fa.fa-thermometer-2:before{content:"\f2c9"}.fa.fa-thermometer-1:before{content:"\f2ca"}.fa.fa-thermometer-0:before{content:"\f2cb"}.fa.fa-bathtub:before,.fa.fa-s15:before{content:"\f2cd"}.fa.fa-window-maximize,.fa.fa-window-restore{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-times-rectangle:before{content:"\f410"}.fa.fa-window-close-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-window-close-o:before{content:"\f410"}.fa.fa-times-rectangle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-times-rectangle-o:before{content:"\f410"}.fa.fa-bandcamp,.fa.fa-eercast,.fa.fa-etsy,.fa.fa-grav,.fa.fa-imdb,.fa.fa-ravelry{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-eercast:before{content:"\f2da"}.fa.fa-snowflake-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-snowflake-o:before{content:"\f2dc"}.fa.fa-spotify,.fa.fa-superpowers,.fa.fa-wpexplorer{font-family:"Font Awesome 5 Brands";font-weight:400}
\ No newline at end of file
diff --git a/data/interfaces/default/css/jquery.scrollbar.css b/data/interfaces/default/css/jquery.scrollbar.css
deleted file mode 100644
index e0a7df51..00000000
--- a/data/interfaces/default/css/jquery.scrollbar.css
+++ /dev/null
@@ -1,904 +0,0 @@
-/*************** SCROLLBAR BASE CSS ***************/
-.scroll-wrapper {
-  overflow: hidden !important;
-  padding: 0 !important;
-  position: relative;
-}
-.scroll-wrapper > .scroll-content {
-  border: none !important;
-  box-sizing: content-box !important;
-  height: auto;
-  left: 0;
-  margin: 0;
-  max-height: none;
-  max-width: none !important;
-  overflow: scroll !important;
-  padding: 0;
-  position: relative !important;
-  top: 0;
-  width: auto !important;
-}
-.scroll-wrapper > .scroll-content::-webkit-scrollbar {
-  height: 0;
-  width: 0;
-}
-.scroll-wrapper.scroll--rtl {
-  direction: rtl;
-}
-
-.scroll-element {
-  box-sizing: content-box;
-  display: none;
-}
-.scroll-element div {
-  box-sizing: content-box;
-}
-.scroll-element .scroll-bar,
-.scroll-element .scroll-arrow {
-  cursor: default;
-}
-.scroll-element.scroll-x.scroll-scrollx_visible, .scroll-element.scroll-y.scroll-scrolly_visible {
-  display: block;
-}
-
-.scroll-textarea {
-  border: 1px solid #cccccc;
-  border-top-color: #999999;
-}
-.scroll-textarea > .scroll-content {
-  overflow: hidden !important;
-}
-.scroll-textarea > .scroll-content > textarea {
-  border: none !important;
-  box-sizing: border-box;
-  height: 100% !important;
-  margin: 0;
-  max-height: none !important;
-  max-width: none !important;
-  overflow: scroll !important;
-  outline: none;
-  padding: 2px;
-  position: relative !important;
-  top: 0;
-  width: 100% !important;
-}
-.scroll-textarea > .scroll-content > textarea::-webkit-scrollbar {
-  height: 0;
-  width: 0;
-}
-
-/*************** SIMPLE INNER SCROLLBAR ***************/
-.scrollbar-inner > .scroll-element,
-.scrollbar-inner > .scroll-element div {
-  border: none;
-  margin: 0;
-  padding: 0;
-  position: absolute;
-  z-index: 10;
-}
-
-.scrollbar-inner > .scroll-element div {
-  display: block;
-  height: 100%;
-  left: 0;
-  top: 0;
-  width: 100%;
-}
-
-.scrollbar-inner > .scroll-element.scroll-x {
-  bottom: 2px;
-  height: 8px;
-  left: 0;
-  width: 100%;
-}
-
-.scrollbar-inner > .scroll-element.scroll-y {
-  height: 100%;
-  right: 2px;
-  top: 0;
-  width: 8px;
-}
-
-.scrollbar-inner > .scroll-element .scroll-element_outer {
-  overflow: hidden;
-}
-
-.scrollbar-inner > .scroll-element .scroll-element_outer,
-.scrollbar-inner > .scroll-element .scroll-element_track,
-.scrollbar-inner > .scroll-element .scroll-bar {
-  -webkit-border-radius: 8px;
-  -moz-border-radius: 8px;
-  border-radius: 8px;
-}
-
-.scrollbar-inner > .scroll-element .scroll-element_track,
-.scrollbar-inner > .scroll-element .scroll-bar {
-  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=40)";
-  filter: alpha(opacity=40);
-  opacity: 0.4;
-}
-
-.scrollbar-inner > .scroll-element .scroll-element_track {
-  background-color: #e0e0e0;
-}
-
-.scrollbar-inner > .scroll-element .scroll-bar {
-  background-color: #c2c2c2;
-}
-
-.scrollbar-inner > .scroll-element:hover .scroll-bar {
-  background-color: #919191;
-}
-
-.scrollbar-inner > .scroll-element.scroll-draggable .scroll-bar {
-  background-color: #919191;
-}
-
-/* update scrollbar offset if both scrolls are visible */
-.scrollbar-inner > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_track {
-  left: -12px;
-}
-
-.scrollbar-inner > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_track {
-  top: -12px;
-}
-
-.scrollbar-inner > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_size {
-  left: -12px;
-}
-
-.scrollbar-inner > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_size {
-  top: -12px;
-}
-
-/*************** SIMPLE OUTER SCROLLBAR ***************/
-.scrollbar-outer > .scroll-element,
-.scrollbar-outer > .scroll-element div {
-  border: none;
-  margin: 0;
-  padding: 0;
-  position: absolute;
-  z-index: 10;
-}
-
-.scrollbar-outer > .scroll-element {
-  background-color: #ffffff;
-}
-
-.scrollbar-outer > .scroll-element div {
-  display: block;
-  height: 100%;
-  left: 0;
-  top: 0;
-  width: 100%;
-}
-
-.scrollbar-outer > .scroll-element.scroll-x {
-  bottom: 0;
-  height: 12px;
-  left: 0;
-  width: 100%;
-}
-
-.scrollbar-outer > .scroll-element.scroll-y {
-  height: 100%;
-  right: 0;
-  top: 0;
-  width: 12px;
-}
-
-.scrollbar-outer > .scroll-element.scroll-x .scroll-element_outer {
-  height: 8px;
-  top: 2px;
-}
-
-.scrollbar-outer > .scroll-element.scroll-y .scroll-element_outer {
-  left: 2px;
-  width: 8px;
-}
-
-.scrollbar-outer > .scroll-element .scroll-element_outer {
-  overflow: hidden;
-}
-
-.scrollbar-outer > .scroll-element .scroll-element_track {
-  background-color: #eeeeee;
-}
-
-.scrollbar-outer > .scroll-element .scroll-element_outer,
-.scrollbar-outer > .scroll-element .scroll-element_track,
-.scrollbar-outer > .scroll-element .scroll-bar {
-  -webkit-border-radius: 8px;
-  -moz-border-radius: 8px;
-  border-radius: 8px;
-}
-
-.scrollbar-outer > .scroll-element .scroll-bar {
-  background-color: #d9d9d9;
-}
-
-.scrollbar-outer > .scroll-element .scroll-bar:hover {
-  background-color: #c2c2c2;
-}
-
-.scrollbar-outer > .scroll-element.scroll-draggable .scroll-bar {
-  background-color: #919191;
-}
-
-/* scrollbar height/width & offset from container borders */
-.scrollbar-outer > .scroll-content.scroll-scrolly_visible {
-  left: -12px;
-  margin-left: 12px;
-}
-
-.scrollbar-outer > .scroll-content.scroll-scrollx_visible {
-  top: -12px;
-  margin-top: 12px;
-}
-
-.scrollbar-outer > .scroll-element.scroll-x .scroll-bar {
-  min-width: 10px;
-}
-
-.scrollbar-outer > .scroll-element.scroll-y .scroll-bar {
-  min-height: 10px;
-}
-
-/* update scrollbar offset if both scrolls are visible */
-.scrollbar-outer > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_track {
-  left: -14px;
-}
-
-.scrollbar-outer > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_track {
-  top: -14px;
-}
-
-.scrollbar-outer > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_size {
-  left: -14px;
-}
-
-.scrollbar-outer > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_size {
-  top: -14px;
-}
-
-/*************** SCROLLBAR MAC OS X ***************/
-.scrollbar-macosx > .scroll-element,
-.scrollbar-macosx > .scroll-element div {
-  background: none;
-  border: none;
-  margin: 0;
-  padding: 0;
-  position: absolute;
-  z-index: 10;
-}
-
-.scrollbar-macosx > .scroll-element div {
-  display: block;
-  height: 100%;
-  left: 0;
-  top: 0;
-  width: 100%;
-}
-
-.scrollbar-macosx > .scroll-element .scroll-element_track {
-  display: none;
-}
-
-.scrollbar-macosx > .scroll-element .scroll-bar {
-  background-color: #6C6E71;
-  display: block;
-  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-  filter: alpha(opacity=0);
-  opacity: 0;
-  -webkit-border-radius: 7px;
-  -moz-border-radius: 7px;
-  border-radius: 7px;
-  -webkit-transition: opacity 0.2s linear;
-  -moz-transition: opacity 0.2s linear;
-  -o-transition: opacity 0.2s linear;
-  -ms-transition: opacity 0.2s linear;
-  transition: opacity 0.2s linear;
-}
-
-.scrollbar-macosx:hover > .scroll-element .scroll-bar,
-.scrollbar-macosx > .scroll-element.scroll-draggable .scroll-bar {
-  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
-  filter: alpha(opacity=70);
-  opacity: 0.7;
-}
-
-.scrollbar-macosx > .scroll-element.scroll-x {
-  bottom: 0px;
-  height: 0px;
-  left: 0;
-  min-width: 100%;
-  overflow: visible;
-  width: 100%;
-}
-
-.scrollbar-macosx > .scroll-element.scroll-y {
-  height: 100%;
-  min-height: 100%;
-  right: 0px;
-  top: 0;
-  width: 0px;
-}
-
-/* scrollbar height/width & offset from container borders */
-.scrollbar-macosx > .scroll-element.scroll-x .scroll-bar {
-  height: 7px;
-  min-width: 10px;
-  top: -9px;
-}
-
-.scrollbar-macosx > .scroll-element.scroll-y .scroll-bar {
-  left: -9px;
-  min-height: 10px;
-  width: 7px;
-}
-
-.scrollbar-macosx > .scroll-element.scroll-x .scroll-element_outer {
-  left: 2px;
-}
-
-.scrollbar-macosx > .scroll-element.scroll-x .scroll-element_size {
-  left: -4px;
-}
-
-.scrollbar-macosx > .scroll-element.scroll-y .scroll-element_outer {
-  top: 2px;
-}
-
-.scrollbar-macosx > .scroll-element.scroll-y .scroll-element_size {
-  top: -4px;
-}
-
-/* update scrollbar offset if both scrolls are visible */
-.scrollbar-macosx > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_size {
-  left: -11px;
-}
-
-.scrollbar-macosx > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_size {
-  top: -11px;
-}
-
-/*************** SCROLLBAR LIGHT ***************/
-.scrollbar-light > .scroll-element,
-.scrollbar-light > .scroll-element div {
-  border: none;
-  margin: 0;
-  overflow: hidden;
-  padding: 0;
-  position: absolute;
-  z-index: 10;
-}
-
-.scrollbar-light > .scroll-element {
-  background-color: #ffffff;
-}
-
-.scrollbar-light > .scroll-element div {
-  display: block;
-  height: 100%;
-  left: 0;
-  top: 0;
-  width: 100%;
-}
-
-.scrollbar-light > .scroll-element .scroll-element_outer {
-  -webkit-border-radius: 10px;
-  -moz-border-radius: 10px;
-  border-radius: 10px;
-}
-
-.scrollbar-light > .scroll-element .scroll-element_size {
-  background: #dbdbdb;
-  background: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIxMDAlIiB5Mj0iMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2RiZGJkYiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNlOGU4ZTgiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+");
-  background: -moz-linear-gradient(left, #dbdbdb 0%, #e8e8e8 100%);
-  background: -webkit-gradient(linear, left top, right top, color-stop(0%, #dbdbdb), color-stop(100%, #e8e8e8));
-  background: -webkit-linear-gradient(left, #dbdbdb 0%, #e8e8e8 100%);
-  background: -o-linear-gradient(left, #dbdbdb 0%, #e8e8e8 100%);
-  background: -ms-linear-gradient(left, #dbdbdb 0%, #e8e8e8 100%);
-  background: linear-gradient(to right, #dbdbdb 0%, #e8e8e8 100%);
-  -webkit-border-radius: 10px;
-  -moz-border-radius: 10px;
-  border-radius: 10px;
-}
-
-.scrollbar-light > .scroll-element.scroll-x {
-  bottom: 0;
-  height: 17px;
-  left: 0;
-  min-width: 100%;
-  width: 100%;
-}
-
-.scrollbar-light > .scroll-element.scroll-y {
-  height: 100%;
-  min-height: 100%;
-  right: 0;
-  top: 0;
-  width: 17px;
-}
-
-.scrollbar-light > .scroll-element .scroll-bar {
-  background: #fefefe;
-  background: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIxMDAlIiB5Mj0iMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZlZmVmZSIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmNWY1ZjUiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+");
-  background: -moz-linear-gradient(left, #fefefe 0%, #f5f5f5 100%);
-  background: -webkit-gradient(linear, left top, right top, color-stop(0%, #fefefe), color-stop(100%, #f5f5f5));
-  background: -webkit-linear-gradient(left, #fefefe 0%, #f5f5f5 100%);
-  background: -o-linear-gradient(left, #fefefe 0%, #f5f5f5 100%);
-  background: -ms-linear-gradient(left, #fefefe 0%, #f5f5f5 100%);
-  background: linear-gradient(to right, #fefefe 0%, #f5f5f5 100%);
-  border: 1px solid #dbdbdb;
-  -webkit-border-radius: 10px;
-  -moz-border-radius: 10px;
-  border-radius: 10px;
-}
-
-/* scrollbar height/width & offset from container borders */
-.scrollbar-light > .scroll-content.scroll-scrolly_visible {
-  left: -17px;
-  margin-left: 17px;
-}
-
-.scrollbar-light > .scroll-content.scroll-scrollx_visible {
-  top: -17px;
-  margin-top: 17px;
-}
-
-.scrollbar-light > .scroll-element.scroll-x .scroll-bar {
-  height: 10px;
-  min-width: 10px;
-  top: 0px;
-}
-
-.scrollbar-light > .scroll-element.scroll-y .scroll-bar {
-  left: 0px;
-  min-height: 10px;
-  width: 10px;
-}
-
-.scrollbar-light > .scroll-element.scroll-x .scroll-element_outer {
-  height: 12px;
-  left: 2px;
-  top: 2px;
-}
-
-.scrollbar-light > .scroll-element.scroll-x .scroll-element_size {
-  left: -4px;
-}
-
-.scrollbar-light > .scroll-element.scroll-y .scroll-element_outer {
-  left: 2px;
-  top: 2px;
-  width: 12px;
-}
-
-.scrollbar-light > .scroll-element.scroll-y .scroll-element_size {
-  top: -4px;
-}
-
-/* update scrollbar offset if both scrolls are visible */
-.scrollbar-light > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_size {
-  left: -19px;
-}
-
-.scrollbar-light > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_size {
-  top: -19px;
-}
-
-.scrollbar-light > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_track {
-  left: -19px;
-}
-
-.scrollbar-light > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_track {
-  top: -19px;
-}
-
-/*************** SCROLLBAR RAIL ***************/
-.scrollbar-rail > .scroll-element,
-.scrollbar-rail > .scroll-element div {
-  border: none;
-  margin: 0;
-  overflow: hidden;
-  padding: 0;
-  position: absolute;
-  z-index: 10;
-}
-
-.scrollbar-rail > .scroll-element {
-  background-color: #ffffff;
-}
-
-.scrollbar-rail > .scroll-element div {
-  display: block;
-  height: 100%;
-  left: 0;
-  top: 0;
-  width: 100%;
-}
-
-.scrollbar-rail > .scroll-element .scroll-element_size {
-  background-color: #999;
-  background-color: rgba(0, 0, 0, 0.3);
-}
-
-.scrollbar-rail > .scroll-element .scroll-element_outer:hover .scroll-element_size {
-  background-color: #666;
-  background-color: rgba(0, 0, 0, 0.5);
-}
-
-.scrollbar-rail > .scroll-element.scroll-x {
-  bottom: 0;
-  height: 12px;
-  left: 0;
-  min-width: 100%;
-  padding: 3px 0 2px;
-  width: 100%;
-}
-
-.scrollbar-rail > .scroll-element.scroll-y {
-  height: 100%;
-  min-height: 100%;
-  padding: 0 2px 0 3px;
-  right: 0;
-  top: 0;
-  width: 12px;
-}
-
-.scrollbar-rail > .scroll-element .scroll-bar {
-  background-color: #d0b9a0;
-  -webkit-border-radius: 2px;
-  -moz-border-radius: 2px;
-  border-radius: 2px;
-  box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.5);
-}
-
-.scrollbar-rail > .scroll-element .scroll-element_outer:hover .scroll-bar {
-  box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.6);
-}
-
-/* scrollbar height/width & offset from container borders */
-.scrollbar-rail > .scroll-content.scroll-scrolly_visible {
-  left: -17px;
-  margin-left: 17px;
-}
-
-.scrollbar-rail > .scroll-content.scroll-scrollx_visible {
-  margin-top: 17px;
-  top: -17px;
-}
-
-.scrollbar-rail > .scroll-element.scroll-x .scroll-bar {
-  height: 10px;
-  min-width: 10px;
-  top: 1px;
-}
-
-.scrollbar-rail > .scroll-element.scroll-y .scroll-bar {
-  left: 1px;
-  min-height: 10px;
-  width: 10px;
-}
-
-.scrollbar-rail > .scroll-element.scroll-x .scroll-element_outer {
-  height: 15px;
-  left: 5px;
-}
-
-.scrollbar-rail > .scroll-element.scroll-x .scroll-element_size {
-  height: 2px;
-  left: -10px;
-  top: 5px;
-}
-
-.scrollbar-rail > .scroll-element.scroll-y .scroll-element_outer {
-  top: 5px;
-  width: 15px;
-}
-
-.scrollbar-rail > .scroll-element.scroll-y .scroll-element_size {
-  left: 5px;
-  top: -10px;
-  width: 2px;
-}
-
-/* update scrollbar offset if both scrolls are visible */
-.scrollbar-rail > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_size {
-  left: -25px;
-}
-
-.scrollbar-rail > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_size {
-  top: -25px;
-}
-
-.scrollbar-rail > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_track {
-  left: -25px;
-}
-
-.scrollbar-rail > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_track {
-  top: -25px;
-}
-
-/*************** SCROLLBAR DYNAMIC ***************/
-.scrollbar-dynamic > .scroll-element,
-.scrollbar-dynamic > .scroll-element div {
-  background: none;
-  border: none;
-  margin: 0;
-  padding: 0;
-  position: absolute;
-  z-index: 10;
-}
-
-.scrollbar-dynamic > .scroll-element div {
-  display: block;
-  height: 100%;
-  left: 0;
-  top: 0;
-  width: 100%;
-}
-
-.scrollbar-dynamic > .scroll-element.scroll-x {
-  bottom: 2px;
-  height: 7px;
-  left: 0;
-  min-width: 100%;
-  width: 100%;
-}
-
-.scrollbar-dynamic > .scroll-element.scroll-y {
-  height: 100%;
-  min-height: 100%;
-  right: 2px;
-  top: 0;
-  width: 7px;
-}
-
-.scrollbar-dynamic > .scroll-element .scroll-element_outer {
-  opacity: 0.3;
-  -webkit-border-radius: 12px;
-  -moz-border-radius: 12px;
-  border-radius: 12px;
-}
-
-.scrollbar-dynamic > .scroll-element .scroll-element_size {
-  background-color: #cccccc;
-  opacity: 0;
-  -webkit-border-radius: 12px;
-  -moz-border-radius: 12px;
-  border-radius: 12px;
-  -webkit-transition: opacity 0.2s;
-  -moz-transition: opacity 0.2s;
-  -o-transition: opacity 0.2s;
-  -ms-transition: opacity 0.2s;
-  transition: opacity 0.2s;
-}
-
-.scrollbar-dynamic > .scroll-element .scroll-bar {
-  background-color: #6c6e71;
-  -webkit-border-radius: 7px;
-  -moz-border-radius: 7px;
-  border-radius: 7px;
-}
-
-/* scrollbar height/width & offset from container borders */
-.scrollbar-dynamic > .scroll-element.scroll-x .scroll-bar {
-  bottom: 0;
-  height: 7px;
-  min-width: 24px;
-  top: auto;
-}
-
-.scrollbar-dynamic > .scroll-element.scroll-y .scroll-bar {
-  left: auto;
-  min-height: 24px;
-  right: 0;
-  width: 7px;
-}
-
-.scrollbar-dynamic > .scroll-element.scroll-x .scroll-element_outer {
-  bottom: 0;
-  top: auto;
-  left: 2px;
-  -webkit-transition: height 0.2s;
-  -moz-transition: height 0.2s;
-  -o-transition: height 0.2s;
-  -ms-transition: height 0.2s;
-  transition: height 0.2s;
-}
-
-.scrollbar-dynamic > .scroll-element.scroll-y .scroll-element_outer {
-  left: auto;
-  right: 0;
-  top: 2px;
-  -webkit-transition: width 0.2s;
-  -moz-transition: width 0.2s;
-  -o-transition: width 0.2s;
-  -ms-transition: width 0.2s;
-  transition: width 0.2s;
-}
-
-.scrollbar-dynamic > .scroll-element.scroll-x .scroll-element_size {
-  left: -4px;
-}
-
-.scrollbar-dynamic > .scroll-element.scroll-y .scroll-element_size {
-  top: -4px;
-}
-
-/* update scrollbar offset if both scrolls are visible */
-.scrollbar-dynamic > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_size {
-  left: -11px;
-}
-
-.scrollbar-dynamic > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_size {
-  top: -11px;
-}
-
-/* hover & drag */
-.scrollbar-dynamic > .scroll-element:hover .scroll-element_outer,
-.scrollbar-dynamic > .scroll-element.scroll-draggable .scroll-element_outer {
-  overflow: hidden;
-  -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
-  filter: alpha(opacity=70);
-  opacity: 0.7;
-}
-
-.scrollbar-dynamic > .scroll-element:hover .scroll-element_outer .scroll-element_size,
-.scrollbar-dynamic > .scroll-element.scroll-draggable .scroll-element_outer .scroll-element_size {
-  opacity: 1;
-}
-
-.scrollbar-dynamic > .scroll-element:hover .scroll-element_outer .scroll-bar,
-.scrollbar-dynamic > .scroll-element.scroll-draggable .scroll-element_outer .scroll-bar {
-  height: 100%;
-  width: 100%;
-  -webkit-border-radius: 12px;
-  -moz-border-radius: 12px;
-  border-radius: 12px;
-}
-
-.scrollbar-dynamic > .scroll-element.scroll-x:hover .scroll-element_outer,
-.scrollbar-dynamic > .scroll-element.scroll-x.scroll-draggable .scroll-element_outer {
-  height: 20px;
-  min-height: 7px;
-}
-
-.scrollbar-dynamic > .scroll-element.scroll-y:hover .scroll-element_outer,
-.scrollbar-dynamic > .scroll-element.scroll-y.scroll-draggable .scroll-element_outer {
-  min-width: 7px;
-  width: 20px;
-}
-
-/*************** SCROLLBAR GOOGLE CHROME ***************/
-.scrollbar-chrome > .scroll-element,
-.scrollbar-chrome > .scroll-element div {
-  border: none;
-  margin: 0;
-  overflow: hidden;
-  padding: 0;
-  position: absolute;
-  z-index: 10;
-}
-
-.scrollbar-chrome > .scroll-element {
-  background-color: #ffffff;
-}
-
-.scrollbar-chrome > .scroll-element div {
-  display: block;
-  height: 100%;
-  left: 0;
-  top: 0;
-  width: 100%;
-}
-
-.scrollbar-chrome > .scroll-element .scroll-element_track {
-  background: #f1f1f1;
-  border: 1px solid #dbdbdb;
-}
-
-.scrollbar-chrome > .scroll-element.scroll-x {
-  bottom: 0;
-  height: 16px;
-  left: 0;
-  min-width: 100%;
-  width: 100%;
-}
-
-.scrollbar-chrome > .scroll-element.scroll-y {
-  height: 100%;
-  min-height: 100%;
-  right: 0;
-  top: 0;
-  width: 16px;
-}
-
-.scrollbar-chrome > .scroll-element .scroll-bar {
-  background-color: #d9d9d9;
-  border: 1px solid #bdbdbd;
-  cursor: default;
-  -webkit-border-radius: 2px;
-  -moz-border-radius: 2px;
-  border-radius: 2px;
-}
-
-.scrollbar-chrome > .scroll-element .scroll-bar:hover {
-  background-color: #c2c2c2;
-  border-color: #a9a9a9;
-}
-
-.scrollbar-chrome > .scroll-element.scroll-draggable .scroll-bar {
-  background-color: #919191;
-  border-color: #7e7e7e;
-}
-
-/* scrollbar height/width & offset from container borders */
-.scrollbar-chrome > .scroll-content.scroll-scrolly_visible {
-  left: -16px;
-  margin-left: 16px;
-}
-
-.scrollbar-chrome > .scroll-content.scroll-scrollx_visible {
-  top: -16px;
-  margin-top: 16px;
-}
-
-.scrollbar-chrome > .scroll-element.scroll-x .scroll-bar {
-  height: 8px;
-  min-width: 10px;
-  top: 3px;
-}
-
-.scrollbar-chrome > .scroll-element.scroll-y .scroll-bar {
-  left: 3px;
-  min-height: 10px;
-  width: 8px;
-}
-
-.scrollbar-chrome > .scroll-element.scroll-x .scroll-element_outer {
-  border-left: 1px solid #dbdbdb;
-}
-
-.scrollbar-chrome > .scroll-element.scroll-x .scroll-element_track {
-  height: 14px;
-  left: -3px;
-}
-
-.scrollbar-chrome > .scroll-element.scroll-x .scroll-element_size {
-  height: 14px;
-  left: -4px;
-}
-
-.scrollbar-chrome > .scroll-element.scroll-y .scroll-element_outer {
-  border-top: 1px solid #dbdbdb;
-}
-
-.scrollbar-chrome > .scroll-element.scroll-y .scroll-element_track {
-  top: -3px;
-  width: 14px;
-}
-
-.scrollbar-chrome > .scroll-element.scroll-y .scroll-element_size {
-  top: -4px;
-  width: 14px;
-}
-
-/* update scrollbar offset if both scrolls are visible */
-.scrollbar-chrome > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_size {
-  left: -19px;
-}
-
-.scrollbar-chrome > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_size {
-  top: -19px;
-}
-
-.scrollbar-chrome > .scroll-element.scroll-x.scroll-scrolly_visible .scroll-element_track {
-  left: -19px;
-}
-
-.scrollbar-chrome > .scroll-element.scroll-y.scroll-scrollx_visible .scroll-element_track {
-  top: -19px;
-}
diff --git a/data/interfaces/default/css/opensans.min.css b/data/interfaces/default/css/opensans.min.css
deleted file mode 100644
index 6d4f3a9c..00000000
--- a/data/interfaces/default/css/opensans.min.css
+++ /dev/null
@@ -1 +0,0 @@
-@font-face{font-family:'Open Sans';font-weight:400;font-style:normal;src:url(../fonts/Open-Sans-regular/Open-Sans-regular.eot);src:url(../fonts/Open-Sans-regular/Open-Sans-regular.eot?#iefix) format('embedded-opentype'),local('Open Sans'),local('Open-Sans-regular'),url(../fonts/Open-Sans-regular/Open-Sans-regular.woff2) format('woff2'),url(../fonts/Open-Sans-regular/Open-Sans-regular.woff) format('woff'),url(../fonts/Open-Sans-regular/Open-Sans-regular.ttf) format('truetype'),url(../fonts/Open-Sans-regular/Open-Sans-regular.svg#OpenSans) format('svg')}@font-face{font-family:'Open Sans';font-weight:600;font-style:normal;src:url(../fonts/Open-Sans-600/Open-Sans-600.eot);src:url(../fonts/Open-Sans-600/Open-Sans-600.eot?#iefix) format('embedded-opentype'),local('Open Sans Semibold'),local('Open-Sans-600'),url(../fonts/Open-Sans-600/Open-Sans-600.woff2) format('woff2'),url(../fonts/Open-Sans-600/Open-Sans-600.woff) format('woff'),url(../fonts/Open-Sans-600/Open-Sans-600.ttf) format('truetype'),url(../fonts/Open-Sans-600/Open-Sans-600.svg#OpenSans) format('svg')}
\ No newline at end of file
diff --git a/data/interfaces/default/css/plexpy-dataTables.css b/data/interfaces/default/css/plexpy-dataTables.css
new file mode 100644
index 00000000..3386c531
--- /dev/null
+++ b/data/interfaces/default/css/plexpy-dataTables.css
@@ -0,0 +1,335 @@
+/*
+ *  File:         demo_table.css
+ *  CVS:          $Id$
+ *  Description:  CSS descriptions for DataTables demo pages
+ *  Author:       Allan Jardine
+ *  Created:      Tue May 12 06:47:22 BST 2009
+ *  Modified:     $Date$ by $Author$
+ *  Language:     CSS
+ *  Project:      DataTables
+ *
+ *  Copyright 2009 Allan Jardine. All Rights Reserved.
+ *
+ * ***************************************************************************
+ * DESCRIPTION
+ *
+ * The styles given here are suitable for the demos that are used with the standard DataTables
+ * distribution (see www.datatables.net). You will most likely wish to modify these styles to
+ * meet the layout requirements of your site.
+ *
+ * Common issues:
+ *   'full_numbers' pagination - I use an extra selector on the body tag to ensure that there is
+ *     no conflict between the two pagination types. If you want to use full_numbers pagination
+ *     ensure that you either have "example_alt_pagination" as a body class name, or better yet,
+ *     modify that selector.
+ *   Note that the path used for Images is relative. All images are by default located in
+ *     ../images/ - relative to this CSS file.
+ */
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * DataTables display
+ */
+table.display {
+	margin: 0 auto;
+	clear: both;
+	width: 100%;
+	font-size: 14px;
+	line-height: 25px;
+	/* Note Firefox 3.5 and before have a bug with border-collapse
+	 * ( https://bugzilla.mozilla.org/show%5Fbug.cgi?id=155955 )
+	 * border-spacing: 0; is one possible option. Conditional-css.com is
+	 * useful for this kind of thing
+	 *
+	 * Further note IE 6/7 has problems when calculating widths with border width.
+	 * It subtracts one px relative to the other browsers from the first column, and
+	 * adds one to the end...
+	 *
+	 * If you want that effect I'd suggest setting a border-top/left on th/td's and
+	 * then filling in the gaps with other borders.
+	 */
+}
+table.display thead th {
+	white-space:nowrap;
+	padding: 0px 0px 0px 5px;
+	cursor: pointer;
+	color: #999;
+	background-color: #212121;
+	font-size: 11px;
+}
+table.display thead th i {
+	margin-top: -1px;
+}
+table.display thead .sorting,
+table.display thead .sorting_asc,
+table.display thead .sorting_desc {
+	cursor: pointer;
+	*cursor: hand;
+	height: 35px;
+}
+table.display thead .sorting,
+table.display thead .sorting_asc,
+table.display thead .sorting_desc,
+table.display thead .sorting_asc_disabled,
+table.display thead .sorting_desc_disabled {
+	background-repeat: no-repeat;
+	background-position: left;
+}
+table.display tfoot th {
+	padding: 3px 18px 3px 10px;
+	border-top: 1px solid black;
+	font-weight: bold;
+}
+table.display tr.heading2 td {
+	border-bottom: 1px solid #aaa;
+}
+table.display td {
+	padding: 5px 0 5px 5px;
+}
+table.display td.title {
+	padding: 5px;
+	white-space: normal;
+	min-width: 400px;
+}
+table.display td.center {
+	text-align: center;
+}
+table.display tr:hover {
+	background-color: rgba(255,255,255,0.075);
+}
+table.display tr:hover a {
+	text-decoration:none;
+}
+table.display td:hover a {
+	color: #F9AA03;
+}
+table.display thead tr:hover {
+	background-color: #212121;
+}
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * DataTables row classes
+ */
+table.display tr.odd.gradeA {
+	background-color: #ddffdd;
+}
+table.display tr.even.gradeA {
+	background-color: #eeffee;
+}
+table.display tr.odd.gradeC {
+	background-color: #ddddff;
+}
+table.display tr.even.gradeC {
+	background-color: #eeeeff;
+}
+table.display tr.odd.gradeX {
+	background-color: #ffdddd;
+}
+table.display tr.even.gradeX {
+	background-color: #ffeeee;
+}
+table.display tr.odd.gradeU {
+	background-color: #ddd;
+}
+table.display tr.even.gradeU {
+	background-color: #eee;
+}
+tr.odd {
+	border-top: 0px solid #343434;
+	border-bottom: 0px solid #343434;
+	background-color: rgba(255,255,255,0.010);
+}
+tr.even {
+	border-top: 0px solid #343434;
+	border-bottom: 0px solid #343434;
+	background-color: rgba(255,255,255,0.035);
+}
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Misc
+ */
+.dataTables_scroll {
+	clear: both;
+}
+.dataTables_scrollBody {
+	*margin-top: -1px;
+	-webkit-overflow-scrolling: touch;
+}
+tfoot input {
+	margin: 0.5em 0;
+	width: 100%;
+	color: #444;
+}
+tfoot input.search_init {
+	color: #999;
+}
+td.group {
+	background-color: #d1cfd0;
+	border-bottom: 2px solid #A19B9E;
+	border-top: 2px solid #A19B9E;
+}
+td.details {
+	background-color: #d1cfd0;
+	border: 2px solid #A19B9E;
+}
+table.display tr.even.row_selected td {
+	background-color: #B0BED9;
+}
+table.display tr.odd.row_selected td {
+	background-color: #9FAFD1;
+}
+.dataTables_empty {
+	text-align: center;
+}
+/* For the Conditional-CSS grading rows */
+/*
+ 	Colour calculations (based off the main row colours)
+  Level 1:
+		dd > c4
+		ee > d5
+	Level 2:
+	  dd > d1
+	  ee > e2
+ */
+tr.odd.gradeA td.sorting_1 {
+	background-color: #c4ffc4;
+}
+tr.odd.gradeA td.sorting_2 {
+	background-color: #d1ffd1;
+}
+tr.odd.gradeA td.sorting_3 {
+	background-color: #d1ffd1;
+}
+tr.even.gradeA td.sorting_1 {
+	background-color: #d5ffd5;
+}
+tr.even.gradeA td.sorting_2 {
+	background-color: #e2ffe2;
+}
+tr.even.gradeA td.sorting_3 {
+	background-color: #e2ffe2;
+}
+tr.odd.gradeC td.sorting_1 {
+	background-color: #c4c4ff;
+}
+tr.odd.gradeC td.sorting_2 {
+	background-color: #d1d1ff;
+}
+tr.odd.gradeC td.sorting_3 {
+	background-color: #d1d1ff;
+}
+tr.even.gradeC td.sorting_1 {
+	background-color: #d5d5ff;
+}
+tr.even.gradeC td.sorting_2 {
+	background-color: #e2e2ff;
+}
+tr.even.gradeC td.sorting_3 {
+	background-color: #e2e2ff;
+}
+tr.odd.gradeX td.sorting_1 {
+	background-color: #ffc4c4;
+}
+tr.odd.gradeX td.sorting_2 {
+	background-color: #ffd1d1;
+}
+tr.odd.gradeX td.sorting_3 {
+	background-color: #ffd1d1;
+}
+tr.even.gradeX td.sorting_1 {
+	background-color: #ffd5d5;
+}
+tr.even.gradeX td.sorting_2 {
+	background-color: #ffe2e2;
+}
+tr.even.gradeX td.sorting_3 {
+	background-color: #ffe2e2;
+}
+tr.odd.gradeU td.sorting_1 {
+	background-color: #c4c4c4;
+}
+tr.odd.gradeU td.sorting_2 {
+	background-color: #d1d1d1;
+}
+tr.odd.gradeU td.sorting_3 {
+	background-color: #d1d1d1;
+}
+tr.even.gradeU td.sorting_1 {
+	background-color: #d5d5d5;
+}
+tr.even.gradeU td.sorting_2 {
+	background-color: #e2e2e2;
+}
+tr.even.gradeU td.sorting_3 {
+	background-color: #e2e2e2;
+}
+
+
+/*
+ * Row highlighting example
+ */
+.ex_highlight #example tbody tr.even:hover, #example tbody tr.even td.highlighted {
+	background-color: #ECFFB3;
+}
+.ex_highlight #example tbody tr.odd:hover, #example tbody tr.odd td.highlighted {
+	background-color: #E6FF99;
+}
+.ex_highlight_row #example tr.even:hover {
+	background-color: #ECFFB3;
+}
+.ex_highlight_row #example tr.even:hover td.sorting_1 {
+	background-color: #DDFF75;
+}
+.ex_highlight_row #example tr.even:hover td.sorting_2 {
+	background-color: #E7FF9E;
+}
+.ex_highlight_row #example tr.even:hover td.sorting_3 {
+	background-color: #E2FF89;
+}
+.ex_highlight_row #example tr.odd:hover {
+	background-color: #E6FF99;
+}
+.ex_highlight_row #example tr.odd:hover td.sorting_1 {
+	background-color: #D6FF5C;
+}
+.ex_highlight_row #example tr.odd:hover td.sorting_2 {
+	background-color: #E0FF84;
+}
+.ex_highlight_row #example tr.odd:hover td.sorting_3 {
+	background-color: #DBFF70;
+}
+
+
+/*
+ * KeyTable
+ */
+table.KeyTable td {
+	border: 3px solid transparent;
+}
+table.KeyTable td.focus {
+	border: 3px solid #3366FF;
+}
+table.display tr.gradeA {
+	background-color: #eeffee;
+}
+table.display tr.gradeC {
+	background-color: #ddddff;
+}
+table.display tr.gradeX {
+	background-color: #ffdddd;
+}
+table.display tr.gradeU {
+	background-color: #ddd;
+}
+div.box {
+	height: 100px;
+	padding: 10px;
+	overflow: auto;
+	border: 1px solid #8080FF;
+	background-color: #E5E5FF;
+}
+td.no-wrap, th.no-wrap {
+	white-space:nowrap;
+}
\ No newline at end of file
diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css
new file mode 100644
index 00000000..22e749c2
--- /dev/null
+++ b/data/interfaces/default/css/plexpy.css
@@ -0,0 +1,2496 @@
+body {
+    font-family: 'Open Sans', sans-serif;
+    color: #fff;
+    margin-top: 50px;
+    overflow: hidden;
+}
+a {
+    color: #eee;
+}
+a:hover,
+a:focus {
+    color: #f9aa03;
+    text-decoration: none;
+    outline: none;
+}
+select {
+    margin: 5px 0 5px 0;
+    border: 2px solid #444;
+    background: #333;
+    -webkit-border-radius: 2px;
+    -moz-border-radius: 2px;
+    border-radius: 2px;
+    color: #999;
+    outline: none;
+}
+select.input-sm {
+    margin: 5px 0 5px 0;
+    border: 2px solid #444;
+    background: #333;
+    -webkit-border-radius: 2px;
+    -moz-border-radius: 2px;
+    border-radius: 2px;
+    color: #999;
+    outline: none;
+}
+select[multiple] {
+    height: 125px;
+    margin: 5px 0 5px 0;
+    color: #fff;
+    border: 0px solid #444;
+    background: #555;
+    padding: 2px 2px;
+    background-color: #555;
+    border-radius: 3px;
+    transition: background-color .3s;
+}
+select[multiple]:focus {
+    outline: 0;
+    outline: thin dotted \9;
+    color: #555;
+    background-color: #fff;
+    transition: background-color .3s;
+}
+select[multiple]:focus::-webkit-scrollbar-thumb {
+    background-color: rgba(0,0,0,.15);
+}
+select[multiple] option {
+    padding: 6px 10px;
+    -webkit-border-radius: 2px;
+    -moz-border-radius: 2px;
+    border-radius: 2px;
+}
+img {
+    -webkit-box-sizing: content-box;
+    -moz-box-sizing: content-box;
+    box-sizing: content-box;
+}
+.navbar {
+    background: #000;
+    -webkit-box-shadow: 0 0 0 3px rgba(0,0,0,.2);
+    -moz-box-shadow: 0 0 0 3px rgba(0,0,0,.2);
+    box-shadow: 0 0 0 3px rgba(0,0,0,.2);
+}
+.navbar-brand {
+    padding: 5px 5px;
+}
+.nav > li > a {
+    color: #999;
+    -webkit-transition: all 0.3s ease;
+    -o-transition: all 0.3s ease;
+    transition: all 0.3s ease;
+}
+.nav > li > a:hover,
+.nav > li > a:focus {
+    text-decoration: none;
+    background-color: #282828;
+    color: #eee;
+}
+.nav > li.active > a,
+.nav > li.active > a:hover,
+.nav > li.active > a:focus {
+    color: #f9aa03;
+    background-color: #282828;
+}
+.navbar-toggle {
+    background-color: #282828;
+}
+.navbar-toggle:hover,
+.navbar-toggle:focus {
+    background-color: #2f2f2f;
+}
+.icon-bar {
+    background-color: #999;
+}
+.padded-header {
+    margin: 25px 0 25px 0;
+}
+.padded-header h1,h2,h3,h4,h5,h6 {
+    color: #eee;
+}
+.padded-header h3 {
+    font-size: 20px;
+}
+.btn {
+    outline:0px !important;
+    -webkit-appearance:none;
+}
+.btn-dark {
+    color: #d7d7d7;
+    background-color: #3B3B3B;
+    border-color: transparent;
+}
+.btn-dark:focus,
+.btn-dark.focus {
+  color: #d7d7d7;
+  background-color: #3B3B3B;
+}
+.btn-dark:hover {
+  color: #fff;
+  background-color: #333;
+  border-color: #444;
+}
+.btn-dark:active,
+.btn-dark.active,
+.open > .dropdown-toggle.btn-dark {
+  color: #fff;
+  background-color: #333;
+  border-color: #444;
+}
+.btn-dark:active:hover,
+.btn-dark.active:hover,
+.open > .dropdown-toggle.btn-dark:hover,
+.btn-dark:active:focus,
+.btn-dark.active:focus,
+.open > .dropdown-toggle.btn-dark:focus,
+.btn-dark:active.focus,
+.btn-dark.active.focus,
+.open > .dropdown-toggle.btn-dark.focus {
+  color: #fff;
+  background-color: #333;
+}
+.btn-dark:active,
+.btn-dark.active,
+.open > .dropdown-toggle.btn-dark {
+  background-image: none;
+}
+.btn-dark.disabled,
+.btn-dark[disabled],
+fieldset[disabled] .btn-dark,
+.btn-dark.disabled:hover,
+.btn-dark[disabled]:hover,
+fieldset[disabled] .btn-dark:hover,
+.btn-dark.disabled:focus,
+.btn-dark[disabled]:focus,
+fieldset[disabled] .btn-dark:focus,
+.btn-dark.disabled.focus,
+.btn-dark[disabled].focus,
+fieldset[disabled] .btn-dark.focus,
+.btn-dark.disabled:active,
+.btn-dark[disabled]:active,
+fieldset[disabled] .btn-dark:active,
+.btn-dark.disabled.active,
+.btn-dark[disabled].active,
+fieldset[disabled] .btn-dark.active {
+  background-color: #333;
+  color: #aaa;
+}
+.btn-dark .badge {
+  color: #e5e5e5;
+  background-color: #3B3B3B;
+}
+.btn-bright {
+    color: #fff;
+    background-color: #eb8600;
+    border-color: transparent;
+}
+.btn-bright:focus,
+.btn-bright.focus {
+  color: #fff;
+  background-color: #eb8600;
+}
+.btn-bright:hover {
+  color: #fff;
+  background-color: #E69400;
+  border-color: #f9aa03;
+}
+.btn-bright:active,
+.btn-bright.active,
+.open > .dropdown-toggle.btn-bright {
+  color: #fff;
+  background-color: #eb8600;
+}
+.btn-bright:active:hover,
+.btn-bright.active:hover,
+.open > .dropdown-toggle.btn-bright:hover,
+.btn-bright:active:focus,
+.btn-bright.active:focus,
+.open > .dropdown-toggle.btn-bright:focus,
+.btn-bright:active.focus,
+.btn-bright.active.focus,
+.open > .dropdown-toggle.btn-bright.focus {
+  color: #fff;
+  background-color: #eb8600;
+}
+.btn-bright:active,
+.btn-bright.active,
+.open > .dropdown-toggle.btn-bright {
+  background-image: none;
+}
+.btn-bright.disabled,
+.btn-bright[disabled],
+fieldset[disabled] .btn-bright,
+.btn-bright.disabled:hover,
+.btn-bright[disabled]:hover,
+fieldset[disabled] .btn-bright:hover,
+.btn-bright.disabled:focus,
+.btn-bright[disabled]:focus,
+fieldset[disabled] .btn-bright:focus,
+.btn-bright.disabled.focus,
+.btn-bright[disabled].focus,
+fieldset[disabled] .btn-bright.focus,
+.btn-bright.disabled:active,
+.btn-bright[disabled]:active,
+fieldset[disabled] .btn-bright:active,
+.btn-bright.disabled.active,
+.btn-bright[disabled].active,
+fieldset[disabled] .btn-bright.active {
+  background-color: #5cb85c;
+  border-color: #4cae4c;
+}
+.btn-bright .badge {
+  color: #fff;
+  background-color: #eb8600;
+}
+.btn-danger.btn-edit {
+    color: #d7d7d7;
+    background-color: #3B3B3B;
+    border-color: transparent;
+    float: right;
+    margin-right: 5px;
+}
+.btn-danger.btn-edit:hover {
+    color: #fff;
+    background-color: #c9302c;
+    border-color: #ac2925;
+}
+.btn-danger.btn-edit.active {
+  color: #fff;
+  background-color: #c9302c;
+  border-color: #ac2925;
+}
+.btn-danger.btn-edit.active:hover {
+  color: #fff;
+  background-color: #ac2925;
+  border-color: #761c19;
+}
+.alert-edit {
+    display: none;
+    float: right;
+    margin-bottom: 0;
+    margin-right: 5px;
+    padding: 6px 15px;
+}
+.modal-header {
+    padding: 15px 20px;
+    background-color: #323232;
+    border-radius: 3px 3px 0 0;
+    border-bottom: 1px solid #1C1C1C;
+}
+.modal-body {
+    position: relative;
+    overflow-y: auto;
+    max-height: 600px;
+    padding: 15px;
+    background-color: #222222;
+}
+.modal-body table {
+    color: #fff;
+}
+.modal-body li {
+    margin-top: 7px;
+    margin-left: 4px;
+    color: #aaa;
+}
+.modal-body li strong {
+    color: #eee;
+}
+.modal-body i {
+    color: #F9AA03;
+}
+.modal-body i.fa {
+    color: #fff;
+}
+.modal-body td:hover a .fa,
+.modal-body a:focus i.fa {
+    color: #f9aa03;
+}
+.modal-body strong {
+    color: #F9AA03;
+}
+.modal-footer {
+    padding: 15px 20px;
+    margin-top: 0;
+    background-color: #323232;
+    border-radius: 0 0 3px 3px;
+    border-top: 1px solid #1C1C1C;
+}
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+    margin: 5px 0 5px 0;
+    color: #fff;
+    border: 0px solid #444;
+    background: #555;
+    height: 32px;
+    padding: 6px 12px;
+    background-color: #555;
+    border-radius: 3px;
+    transition: background-color .3s;
+}
+.pagination > li > a,
+.pagination > li > span {
+    position: relative;
+    float: left;
+    padding: 6px 12px;
+    margin-left: -1px;
+    line-height: 1.42857143;
+    color: #fff;
+    text-decoration: none;
+    background-color: #262626;
+    border: 1px solid #444444;
+}
+.pagination > li > a:hover,
+.pagination > li > span:hover,
+.pagination > li > a:focus,
+.pagination > li > span:focus {
+    background-color: #F9AA03;
+    border: 1px solid #444444;
+}
+.pagination > .active > a,
+.pagination > .active > span,
+.pagination > .active > a:hover,
+.pagination > .active > span:hover,
+.pagination > .active > a:focus,
+.pagination > .active > span:focus {
+    z-index: 2;
+    color: #fff;
+    cursor: default;
+    background-color: #F9AA03;
+    border-color: #444444;
+}
+.pagination > .disabled > span,
+.pagination > .disabled > span:hover,
+.pagination > .disabled > span:focus,
+.pagination > .disabled > a,
+.pagination > .disabled > a:hover,
+.pagination > .disabled > a:focus {
+    color: #444444;
+    cursor: not-allowed;
+    background-color: #262626;
+    border-color: #444444;
+}
+.nav-pills > li.active > a,
+.nav-pills > li.active > a:hover,
+.nav-pills > li.active > a:focus {
+    color: #fff;
+    background-color: #af6c17;
+}
+.nav-pills > li > a {
+    border-radius: 3px;
+    padding: 5px 10px;
+    margin: 0 0 20px 0;
+}
+.btn-form {
+    padding: 4px 12px;
+    margin: 5px 0 5px 0;
+    font-size: 14px;
+    font-weight: normal;
+    height: 32px;
+    line-height: 1.42857143;
+    text-align: center;
+    white-space: nowrap;
+    vertical-align: middle;
+    -ms-touch-action: manipulation;
+      touch-action: manipulation;
+    cursor: pointer;
+    -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none;
+    background-image: none;
+    background-color: #3B3B3B;
+    color: #e5e5e5;
+    border: 1px solid transparent;
+    border-radius: 3px;
+    outline:0px !important;
+    -webkit-appearance:none;
+}
+.btn-form:hover {
+    color: #fff;
+    background-color: #333;
+}
+.btn-form:focus {
+    color: #fff;
+}
+.form-control-feedback {
+    position: absolute;
+    color: #F9AA03;
+    top: 0;
+    right: 0;
+    margin: 5px 10px 5px 0;
+    z-index: 2;
+    display: block;
+    width: 32px;
+    height: 32px;
+    line-height: 32px;
+    text-align: center;
+    pointer-events: none;
+}
+.poster {
+    position: relative;
+    height: 225px;
+}
+.poster-face {
+    background-position: center;
+    background-size: cover;
+    height: 225px;
+    width: 150px;
+    position: relative;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    overflow: hidden;
+}
+.cover-face {
+    background-position: center;
+    background-size: cover;
+    height: 150px;
+    width: 150px;
+    position: absolute;
+    bottom: 0;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+}
+.users-poster-face {
+    overflow: hidden;
+    float: left;
+    background-size: contain;
+    height: 40px;
+    width: 40px;
+    -webkit-border-radius: 50%;
+    -moz-border-radius: 50%;
+    border-radius: 50%;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+}
+a .poster-face:hover,
+a .cover-face:hover,
+a .users-poster-face:hover {
+    webkit-box-shadow: inset 0 0 0 2px #e9a049;
+    -moz-box-shadow: inset 0 0 0 2px #e9a049;
+    box-shadow: inset 0 0 0 2px #e9a049;
+}
+.users-name {
+    position: relative;
+}
+.platform {
+    padding-bottom: 0px;
+    margin-bottom: 0px;
+    margin-left: 5px;
+    float: left;
+}
+.dashboard-instance {
+    float: left;
+    position: relative;
+    height: 260px;
+    width: 350px;
+    margin-right: 20px;
+    margin-bottom: 20px;
+}
+.dashboard-activity-poster {
+    height: 200px;
+    width: 100%;
+    position: relative;
+    overflow: hidden;
+}
+a:hover .dashboard-activity-poster {
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 2px #e9a049;
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 2px #e9a049;
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 2px #e9a049;
+}
+.dashboard-activity-poster-face {
+    background-position: center;
+    background-size: cover;
+    height: 100%;
+    width: 100%;
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    z-index: -3;
+}
+.dashboard-activity-cover-face-bg {
+    background-position: center;
+    background-size: cover;
+    background-repeat: no-repeat;
+    height: 100%;
+    width: 100%;
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -webkit-filter: blur(5px);
+    -moz-filter: blur(5px);
+    filter: blur(5px);
+    opacity: 0.75;
+    z-index: -3;
+}
+.dashboard-activity-cover-face {
+    background-position: center;
+    background-size: cover;
+    background-repeat: no-repeat;
+    height: 100%;
+    width: 200px;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    position: absolute;
+    top: 0;
+    left: calc(50% - 100px);
+    z-index: -3;
+}
+.dashboard-activity-clip-face-bg {
+    background-position: center;
+    background-size: cover;
+    background-repeat: no-repeat;
+    height: 100%;
+    width: 100%;
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -webkit-filter: blur(5px);
+    -moz-filter: blur(5px);
+    filter: blur(5px);
+    opacity: 0.75;
+    z-index: -3;
+}
+.dashboard-activity-clip-face {
+    background-position: center;
+    background-size: cover;
+    background-repeat: no-repeat;
+    height: 100%;
+    width: 130px;
+    position: relative;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    position: absolute;
+    top: 0;
+    left: calc(50% - 65px);
+    z-index: -3;
+}
+.dashboard-activity-info-details-overlay {
+    text-align: left;
+    background-image: -webkit-gradient(linear,left 0,left 100%,from(rgba(0,0,0,.6)),to(rgba(0,0,0,.8)));
+    background-image: -webkit-linear-gradient(top,rgba(0,0,0,.6),0,rgba(0,0,0,.8),100%);
+    background-image: -moz-linear-gradient(top,rgba(0,0,0,.6) 0,rgba(0,0,0,.8) 100%);
+    background-image: linear-gradient(to bottom,rgba(0,0,0,.6) 0,rgba(0,0,0,.8) 100%);
+    background-repeat: repeat-x;
+    position: absolute;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    display: none;
+    z-index: -1;
+}
+.dashboard-activity-button-info {
+    width: 50px;
+    height: 50px;
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    z-index: 1;
+}
+.btn-activity-info,
+.btn-activity-info:focus {
+    color: #999;
+    background-color: rgba(0,0,0,0.5);
+}
+.btn-activity-info:hover {
+    color: #fff;
+}
+.dashboard-activity-info-details-content {
+    height: 200px;
+    width: 100%;
+    line-height: 25px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    color: #aaa;
+    padding: 10px;
+}
+.dashboard-activity-info-details-content strong {
+    color: #fff;
+    font-weight: normal;
+}
+.dashboard-activity-info-platform {
+    width: 100%;
+    height: 50px;
+    margin-bottom: 10px;
+}
+.dashboard-activity-info-platform-box {
+    float: left;
+    background-position: center;
+    background-size: cover;
+    width: 50px;
+    height: 50px;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
+    margin-right: 10px;
+}
+.dashboard-activity-poster-info-bar {
+    position:absolute;
+    width: 100%;
+    height: 100%;
+    background-image: -webkit-gradient(linear,left 30%,left 100%,from(rgba(0,0,0,0)),to(rgba(0,0,0,0.75)));
+    background-image: -webkit-linear-gradient(top,rgba(0,0,0,0),30%,rgba(0,0,0,0.75),100%);
+    background-image: -moz-linear-gradient(top,rgba(0,0,0,0) 30%,rgba(0,0,0,0.75) 100%);
+    background-image: linear-gradient(to bottom,rgba(0,0,0,0) 30%,rgba(0,0,0,0.75) 100%);
+    opacity: 0;
+    -webkit-transition: all .2s;
+    transition: all .2s;
+    z-index: -2;
+}
+.dashboard-activity-poster:hover .dashboard-activity-poster-info-bar {
+    opacity: 1;
+}
+.dashboard-activity-poster-info-text {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    float: left;
+    text-align: left;
+    padding: 5px 8px;
+    font-size: 12px;
+    color: #eee;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    width: 150px;
+}
+.dashboard-activity-poster-info-time {
+    position: absolute;
+    bottom: 5px;
+    right: 10px;
+    text-align: right;
+    font-size: 12px;
+    color: #eee;
+}
+.dashboard-activity-progress {
+    width: 100%;
+    height: 5px;
+    margin-bottom: 5px;
+}
+.dashboard-activity-progress-bar {
+    overflow: hidden;
+    height: 5px;
+    background-color: #111;
+    width: 100%;
+    z-index: -1;
+    -webkit-transition: all 0s;
+    transition: all 0s;
+}
+.dashboard-activity-progress .bufferbar {
+    padding-top: 6px;
+    background-color: #444;
+    position: absolute;
+    height: 6px;
+    overflow: hidden;
+}
+.dashboard-activity-progress .bar {
+    padding-top: 6px;
+    background-color: #faa732;
+    background-image: -moz-linear-gradient(top, #fbb450, #f89406);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
+    background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
+    background-image: -o-linear-gradient(top, #fbb450, #f89406);
+    background-image: linear-gradient(to bottom, #fbb450, #f89406);
+    background-repeat: repeat-x;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
+    position: absolute;
+    height: 6px;
+    overflow: hidden;
+}
+.dashboard-activity-metadata-wrapper {
+    position: relative;
+    width: 100%;
+    height: 50px;
+    font-size: 13px;
+    padding: 0 3px;
+}
+.dashboard-activity-metadata-title {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    font-size: 14px;
+    line-height: 25px;
+    color: #fff;
+    max-width: 300px;
+}
+.dashboard-activity-metadata-subtitle {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    font-size: 14px;
+    line-height: 25px;
+    color: #999;
+    max-width: 172px;
+    float: left;
+}
+.dashboard-activity-metadata-user {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    font-size: 14px;
+    line-height: 25px;
+    color: #999;
+    text-align: right;
+    max-width: 122px;
+    float: right;
+}
+.dashboard-activity-metadata-user-thumb {
+    background-position: center;
+    background-size: cover;
+    margin-top: 5px;
+    margin-left: 10px;
+    height: 40px;
+    width: 40px;
+    position: relative;
+    -webkit-border-radius: 50%;
+    -moz-border-radius: 50%;
+    border-radius: 50%;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    overflow: hidden;
+    float: right;
+}
+a .dashboard-activity-metadata-user-thumb:hover {
+    -webkit-box-shadow: inset 0 0 0 2px #e9a049;
+    -moz-box-shadow: inset 0 0 0 2px #e9a049;
+    box-shadow: inset 0 0 0 2px #e9a049;
+}
+.dashboard-activity-metadata-user a {
+    color: #999;
+}
+.dashboard-activity-metadata-user a:hover {
+    color: #F9AA03;
+}
+.dashboard-activity-metadata-title a:hover {
+    color: #F9AA03;
+}
+.dashboard-activity-metadata-progress-wrapper {
+    margin-bottom: 20px;
+    font-size: 12px;
+    font-weight: bold;
+    color: #F9AA03;
+}
+.dashboard-recent-media-row {
+    width: 100%;
+    margin:0 auto;
+    text-align: center;
+    position: relative;
+    z-index: 0;
+}
+.dashboard-recent-media {
+    width: 100%;
+    margin: auto;
+    list-style: none;
+}
+.dashboard-recent-media li {
+    float: left;
+    position: relative;
+    left: 0px;
+    margin-right: 25px;
+    margin-bottom: 25px;
+}
+.dashboard-recent-media-poster {
+    position: relative;
+    float: left;
+}
+.dashboard-recent-media-cover {
+    position: relative;
+    margin-top: 75px;
+    float: left;
+}
+a:hover .dashboard-recent-media-poster,
+a:hover .dashboard-recent-media-cover {
+    webkit-box-shadow: inset 0 0 0 2px #e9a049;
+    -moz-box-shadow: inset 0 0 0 2px #e9a049;
+    box-shadow: inset 0 0 0 2px #e9a049;
+}
+.dashboard-recent-media-poster-face {
+    background-position: center;
+    background-size: cover;
+    height: 225px;
+    width: 150px;
+    position: relative;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    z-index: -2;
+}
+.dashboard-recent-media-cover-face {
+    background-position: center;
+    background-size: cover;
+    height: 150px;
+    width: 150px;
+    position: relative;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    z-index: -2;
+}
+.dashboard-recent-media-overlay {
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    text-align: left;
+    background: -moz-linear-gradient(top,  rgba(0,0,0,0) 30%, rgba(0,0,0,1) 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(30%,rgba(0,0,0,0)), color-stop(100%,rgba(0,0,0,1)));
+    background: -webkit-linear-gradient(top,  rgba(0,0,0,0) 30%,rgba(0,0,0,1) 100%);
+    background: -o-linear-gradient(top,  rgba(0,0,0,0) 30%,rgba(0,0,0,1) 100%);
+    background: -ms-linear-gradient(top,  rgba(0,0,0,0) 30%,rgba(0,0,0,1) 100%);
+    background: linear-gradient(to bottom,  rgba(0,0,0,0) 30%,rgba(0,0,0,1) 100%);
+    height: 100%;
+    z-index: -1;
+}
+.dashboard-recent-media-overlay-text {
+    color: #aaa;
+    font-size: 12px;
+    float: left;
+    position: absolute;
+    left: 8px;
+    bottom: 5px;
+}
+.dashboard-recent-media-metacontainer {
+    width: 150px;
+    font-size: 13px;
+    clear: both;
+}
+.dashboard-recent-media-metacontainer h3 {
+    padding: 5px 3px 0 3px;
+    color: #fff;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    position: relative;
+    font-size: 13px;
+    margin: 0;
+    line-height: 15px;
+    font-weight: normal;
+    width: 150px;
+    white-space: nowrap;
+    text-align: left;
+    clear: both;
+}
+.dashboard-recent-media-metacontainer h3.text-muted {
+    color: #777;
+}
+.dashboard-recent-media-metacontainer .text-muted {
+    padding: 5px 3px 0 3px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    position: relative;
+    white-space: nowrap;
+    text-align: left;
+}
+.art-face {
+    background-repeat: no-repeat;
+    background-position: center center;
+    background-attachment: scroll;
+    background-size: cover;
+    opacity: 0;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    width: 100%;
+}
+.art-music-face {
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: cover;
+    width: 250px;
+    position: relative;
+    top: 0;
+    bottom: 0;
+}
+.summary-container {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    overflow-x: hidden;
+    overflow-y: auto;
+}
+.summary-container .table-card-header,
+.summary-container .table-card-back {
+    opacity: 0.90;
+}
+.summary-navbar {
+    background-color: rgba(255,255,255,.03);
+    height: 50px;
+    line-height: 50px;
+    max-height: 50px;
+    overflow: hidden;
+}
+.summary-navbar-list {
+    padding: 0 25px;
+    color: #999;
+    white-space: nowrap;
+    overflow: hidden;
+}
+.summary-navbar-list .breadcrumb {
+    padding: 0;
+    margin: 0;
+    background: none;
+}
+.summary-navbar-list .breadcrumb > li + li:before {
+    color: #444;
+    font-family: FontAwesome;
+    content: "\f054";
+    padding: 0 15px;
+}
+.summary-navbar-list .breadcrumb > .active {
+    color: #eee;
+}
+.summary-navbar-list .breadcrumb a {
+    color: #999;
+}
+.summary-navbar-list .breadcrumb a:hover {
+    color: #F9AA03;
+}
+.summary-content-title-wrapper {
+    height: 150px;
+    padding-top: 50px;
+}
+.summary-content-title {
+    overflow: hidden;
+    position: relative;
+    max-height: 100px;
+}
+.summary-content-title h1 {
+    margin-top: 0;
+    margin-bottom: 10px;
+    color: #F9AA03;
+    font-size: 28px;
+    line-height: 40px;
+    float: left;
+    clear: left;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    width: 100%;
+}
+.summary-content-title h1 a {
+    color: #F9AA03;
+}
+.summary-content-title h1 a:hover {
+    color: #F9AA03;
+    text-decoration: underline;
+}
+.summary-content-title h2 {
+    margin-top: 0;
+    margin-bottom: 10px;
+    color: #fff;
+    font-size: 28px;
+    line-height: 40px;
+    float: left;
+    clear: left;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    width: 100%;
+}
+.summary-content-title h3 {
+    margin-top: 0;
+    margin-bottom: 10px;
+    color: #999;
+    font-size: 28px;
+    line-height: 40px;
+    position: absolute;
+    bottom: 0;
+    right: 0;
+}
+.summary-content-title h3 a:hover {
+    text-decoration: underline;
+}
+.summary-content-title h3 a {
+    color: #999;
+}
+.summary-content-wrapper {
+    background-image: linear-gradient(rgba(0,0,0,.4),rgba(19,19,19,.4) 50%,rgba(26,26,26,.4));
+    background-clip: content-box;
+    min-height: calc(100% - 200px);
+    position: inherit;
+    width: 100%;
+}
+.summary-content-poster {
+    float: left;
+    width: 250px;
+    margin: 0 40px 0 25px;
+    height: 100px;
+    overflow: visible;
+}
+.summary-poster-face {
+    background-position: center;
+    background-size: cover;
+    height: 375px;
+    width: 250px;
+    position: relative;
+    webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    overflow: hidden;
+    z-index: 1;
+}
+.summary-poster-face-episode {
+    background-position: center;
+    background-size: cover;
+    height: 140px;
+    width: 250px;
+    position: relative;
+    webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    overflow: hidden;
+    z-index: 1;
+}
+.summary-poster-face-track {
+    background-position: center;
+    background-size: cover;
+    height: 250px;
+    width: 250px;
+    position: relative;
+    webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    overflow: hidden;
+    z-index: 1;
+}
+.summary-poster-face-overlay {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    background-image: -webkit-gradient(linear,left 0,left 100%,from(rgba(0,0,0,.7)),to(rgba(0,0,0,.9)));
+    background-image: -webkit-linear-gradient(top,rgba(0,0,0,.7),0,rgba(0,0,0,.9),100%);
+    background-image: -moz-linear-gradient(top,rgba(0,0,0,.7) 0,rgba(0,0,0,.9) 100%);
+    background-image: linear-gradient(to bottom,rgba(0,0,0,.7) 0,rgba(0,0,0,.9) 100%);
+    background-repeat: repeat-x;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b3000000', endColorstr='#e6000000', GradientType=0);
+    webkit-box-shadow: inset 0 0 0 2px #e9a049;
+    -moz-box-shadow: inset 0 0 0 2px #e9a049;
+    box-shadow: inset 0 0 0 2px #e9a049;
+    opacity: 0;
+    transition: opacity .2s;
+}
+.summary-poster-face-overlay span {
+    display: block;
+    width: 100%;
+    height: 100%;
+    background-image: url(../images/plex-logo-light-small.png);
+    background-size: 100px;
+    background-repeat: no-repeat;
+    background-position: center;
+    opacity: 0;
+    transition: opacity .3s;
+}
+a:hover .summary-poster-face .summary-poster-face-overlay,
+a:hover .summary-poster-face-episode .summary-poster-face-overlay,
+a:hover .summary-poster-face-track .summary-poster-face-overlay,
+a:hover .summary-poster-face .summary-poster-face-overlay span,
+a:hover .summary-poster-face-episode .summary-poster-face-overlay span,
+a:hover .summary-poster-face-track .summary-poster-face-overlay span {
+    opacity: 1;
+}
+.summary-content-padding {
+    float: left;
+    width: 250px;
+    height: 1px;
+    margin: 0 40px 20px 25px;
+}
+.summary-content {
+    position: relative;
+    color: #999;
+    overflow: hidden;
+    padding-right: 10px;
+    margin-bottom: 20px;
+}
+.summary-content-details-wrapper {
+    width: 100%;
+    padding: 10px 0 15px 0;
+    position: relative;
+    float: left;
+}
+.summary-content-details-tag {
+    float: left;
+    line-height: 24px;
+}
+.summary-content-details-tag strong {
+    color: #fff;
+    margin-left: 2px;
+    margin-right: 10px;
+}
+.summary-content-summary {
+    overflow: hidden;
+    color: #fff;
+    float: left;
+    position: relative;
+    clear: both;
+    height: auto;
+    max-height: 160px;
+    padding-bottom: 0px;
+}
+.summary-content-people-wrapper {
+    margin-right: 20px;
+    float: left;
+}
+.summary-content-people-wrapper hidden-phone hidden-tablet {
+    overflow: hidden;
+    height: auto;
+    min-height: 0px;
+}
+.summary-content-actors {
+    margin-top: 13px;
+    font-size: 12px;
+    line-height: 18px;
+    color: #999;
+    overflow: hidden;
+}
+.summary-content-actors ul {
+    padding-left:20px;
+    margin-bottom: 0;
+}
+.summary-content-actors li {
+    list-style: none;
+    list-style-image: none;
+    display: block;
+    font-size: 12px;
+    line-height: 18px;
+    color: #fff;
+}
+.summary-content-genres {
+    margin-top: 13px;
+    font-size: 12px;
+    line-height: 18px;
+    color: #999;
+    overflow: hidden;
+}
+.summary-content-genres ul {
+    padding-left:20px;
+    margin-bottom: 0;
+}
+.summary-content-genres li {
+    list-style: none;
+    list-style-image: none;
+    display: block;
+    font-size: 12px;
+    line-height: 18px;
+    color: #fff;
+}
+.summary-content-writers {
+    margin-top: 13px;
+    font-size: 12px;
+    line-height: 18px;
+    color: #999;
+    overflow: hidden;
+}
+.summary-content-writers ul {
+    padding-left: 20px;
+    margin-bottom: 0;
+}
+.summary-content-writers li {
+    list-style: none;
+    list-style-image: none;
+    display: block;
+    font-size: 12px;
+    line-height: 18px;
+    color: #fff;
+}
+.rateit {
+    display: -moz-inline-box;
+    display: inline-block;
+    -webkit-user-select: none;
+    -khtml-user-select: none;
+    -moz-user-select: none;
+    -o-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    -webkit-touch-callout: none;
+    overflow: hidden;
+    white-space: nowrap;
+    float: right;
+    margin-top: 3px;
+    height: 21px;
+}
+.rateit .rateit-range {
+    background: url(../images/star-gray-32.png);
+    background-size: contain;
+    height: 16px;
+}
+.rateit .rateit-selected {
+    background: url(../images/star-32.png);
+    background-size: contain;
+    height: 16px;
+}
+#children-list, #search-results-list {
+    position: relative;
+    z-index: 0;
+}
+.item-children-wrapper {
+}
+.item-children-section-title {
+    position: relative;
+    padding: 10px;
+    background-color: #2c2c2c;
+    border-bottom: 1px solid #3d3d3d;
+    border-top: 1px solid #282828;
+    height: 50px;
+    line-height: 22px;
+    padding: 13px 20px;
+    margin: 20px 0;
+}
+.item-children-section-title h4 {
+    position: relative;
+    margin: 0;
+    line-height: 22px;
+    color: #fff;
+    font-size: 16px;
+    text-align: center;
+    text-transform: uppercase;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+.item-children-instance {
+    list-style: none;
+    margin: 0;
+    overflow: hidden;
+}
+.item-children-instance li {
+    float: left;
+    position: relative;
+    left: 0px;
+    margin-right: 25px;
+    margin-bottom: 25px;
+}
+.item-children-instance li.item-children-list-item {
+    width: 100%;
+    height: 35px;
+    margin-right: 0;
+    margin-bottom: 0;
+}
+.item-children-poster {
+    float: left;
+    position: relative;
+    left: 0px;
+}
+a:hover .item-children-poster {
+    webkit-box-shadow: inset 0 0 0 2px #e9a049;
+    -moz-box-shadow: inset 0 0 0 2px #e9a049;
+    box-shadow: inset 0 0 0 2px #e9a049;
+}
+.item-children-poster-face {
+    background-position: center;
+    background-size: cover;
+    position: relative;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    z-index: -2;
+}
+.item-children-poster-face.season-poster {
+    width: 150px;
+    height: 225px;
+}
+.item-children-poster-face.episode-poster {
+    width: 250px;
+    height: 140px;
+}
+.item-children-poster-face.album-poster {
+    width: 150px;
+    height: 150px;
+}
+.item-children-card-overlay {
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    text-align: left;
+    background: -moz-linear-gradient(top,  rgba(0,0,0,0) 30%, rgba(0,0,0,1) 100%);
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(30%,rgba(0,0,0,0)), color-stop(100%,rgba(0,0,0,1)));
+    background: -webkit-linear-gradient(top,  rgba(0,0,0,0) 30%,rgba(0,0,0,1) 100%);
+    background: -o-linear-gradient(top,  rgba(0,0,0,0) 30%,rgba(0,0,0,1) 100%);
+    background: -ms-linear-gradient(top,  rgba(0,0,0,0) 30%,rgba(0,0,0,1) 100%);
+    background: linear-gradient(to bottom,  rgba(0,0,0,0) 30%,rgba(0,0,0,1) 100%);
+    height: 100%;
+    z-index: -1;
+}
+.item-children-overlay-text {
+    color: #aaa;
+    font-size: 12px;
+    float: left;
+    position: absolute;
+    left: 8px;
+    bottom: 5px;
+}
+.item-children-instance-text-wrapper {
+    font-size: 13px;
+    margin-bottom: 20px;
+    clear: both;
+}
+.item-children-instance-text-wrapper.season-item {
+    width: 150px;
+}
+.item-children-instance-text-wrapper.episode-item {
+    width: 250px;
+}
+.item-children-instance-text-wrapper.album-item {
+    width: 150px;
+}
+.item-children-instance-text-wrapper h3 {
+    width: 100%;
+    padding: 5px 3px 0 3px;
+    color: #fff;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    position: relative;
+    font-size: 13px;
+    margin: 0;
+    line-height: 15px;
+    font-weight: normal;
+    white-space: nowrap;
+    text-align: left;
+    clear: both;
+}
+.item-children-instance-text-wrapper h3.text-muted {
+    color: #777;
+}
+.item-children-list-item-odd {
+    border-top: 0px solid #343434;
+    border-bottom: 0px solid #343434;
+    background-color: rgba(255,255,255,0.010);
+    height: 100%;
+    font-size: 13px;
+    padding-top: 10px;
+}
+.item-children-list-item-even {
+    border-top: 0px solid #343434;
+    border-bottom: 0px solid #343434;
+    background-color: rgba(255,255,255,0.035);
+    height: 100%;
+    font-size: 13px;
+    padding-top: 10px;
+}
+.item-children-list-item-odd:hover,
+.item-children-list-item-even:hover {
+    background-color: rgba(255,255,255,0.075);
+}
+.item-children-list-item-index {
+    float: left;
+    color: #777;
+    text-align: right;
+    display: inline-block;
+    width: 35px;
+    margin-right: 10px;
+}
+.item-children-list-item-title {
+    display: inline-block;
+    width: calc(100% - 110px);
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+}
+.item-children-list-item-duration {
+    float: right;
+    color: #777;
+    text-align: right;
+    display: inline-block;
+    width: 40px;
+    margin-right: 20px;
+}
+#new_title h3 {
+    color: #F9AA03;
+    font-size: 14px;
+    line-height: 1.42857143;
+    font-weight: bold;
+    margin: 0;
+}
+.settings-alert {
+    float: left;
+    padding: 0;
+    margin: 5px 0;
+    border: 0;
+    position: relative;
+}
+.settings-alert ul {
+    padding: 0;
+}
+.settings-alert ul li {
+    list-style: none;
+    padding: 5px 12px 5px 35px;
+    margin: 0;
+    border: 1px solid #ebccd1;
+    border-radius: 4px;
+}
+.settings-alert ul li:before {
+    content: "\f071";
+    font-family: FontAwesome;
+    font-style: normal;
+    font-weight: normal;
+    text-decoration: inherit;
+    font-size: 18px;
+    position: absolute;
+    top: 5px;
+    left: 12px;
+}
+.user-info-wrapper {
+    height: 113px;
+}
+.user-info-poster-face {
+    float: left;
+    margin-top: 15px;
+    margin-right: 15px;
+    background-size: contain;
+    height: 80px;
+    width: 80px;
+    -webkit-border-radius: 50%;
+    -moz-border-radius: 50%;
+    border-radius: 50%;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+}
+.user-info-username {
+    font-size: 24px;
+    color: #fff;
+    position: relative;
+    top: 27px;
+}
+.user-info-nav {
+    position: relative;
+    top: 15px;
+    left: -5px;
+}
+.user-info-nav > .active > a, .nav-tabs > .active > a:hover, .nav-tabs > .active > a:focus {
+    color: #F9AA03;
+}
+.user-info-nav a:hover {
+    text-decoration: none;
+}
+.user-info-nav ul {
+    list-style: none;
+}
+.user-info-nav li {
+    float: left;
+    margin-left: 10px;
+    margin-right: 10px;
+}
+.user-overview-stats-wrapper {
+}
+.user-overview-stats-wrapper ul {
+    list-style: none;
+    padding: 0;
+    margin: 0px 0px 0px 0px;
+}
+.user-overview-stats-instance {
+    float: left;
+    width: 350px;
+    height: 80px;
+    margin-bottom: 25px;
+}
+.user-overview-stats-instance-device_icon {
+    float: left;
+    padding-right: 15px;
+}
+.user-overview-stats-instance-device_icon img{
+}
+.user-overview-stats-instance li {
+    float: left;
+    list-style: none;
+    width: 340px;
+    height: 90px;
+}
+.user-overview-stats-instance-text {
+    position: relative;
+    top: 0px;
+    left: 0px;
+}
+.user-overview-stats-instance p {
+    color: #aaa;
+    font-size: 12px;
+    float: left;
+    position: relative;
+    top: 15px;
+    left: 0px;
+}
+.user-overview-stats-instance h3 strong{
+    color: #fff;
+}
+.user-overview-stats-instance h3 {
+    font-size: 30px;
+    font-weight: bold;
+    color: #F9AA03;
+    line-height: 22px;
+    position: relative;
+    top: 5px;
+    margin: 0 5px 0 10px;
+    float: left;
+}
+.user-overview-stats-instance h4 {
+    color: #fff;
+    margin-bottom: 25px;
+}
+.user-overview-stats-instance h1 {
+    font-size: 54px;
+    font-weight: normal;
+    float: left;
+    color: #333;
+    color: rgba(255,255,255,0.05);
+    text-shadow: none;
+    position: relative;
+    top: 3px;
+    left: 3px;
+}
+.user-player ul {
+    list-style: none;
+    margin: 0;
+}
+.user-player-instance {
+    float: left;
+    width: 240px;
+    height: 80px;
+    margin-bottom: 25px;
+}
+.user-player-instance li {
+}
+.user-player-instance-box {
+    float: left;
+    width: 75px;
+    border-radius: 3px;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    background-size: contain;
+    position: relative;
+    height: 80px;
+    width: 80px;
+}
+.user-player-instance-name {
+    float: left;
+    padding-top: 14px;
+    color: #fff;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    position: relative;
+    font-size: 13px;
+    line-height: 15px;
+    font-weight: normal;
+    width: 140px;
+    margin-left: 10px;
+}
+.user-player-instance-playcount h3 {
+    font-size: 30px;
+    font-weight: bold;
+    color: #F9AA03;
+    line-height: 22px;
+    position: relative;
+    top: 5px;
+    margin: 0 5px 0 10px;
+    float: left;
+}
+.user-player-instance-playcount p {
+    color: #aaa;
+    font-size: 12px;
+    float: left;
+    position: relative;
+    top: 15px;
+    left: 0px;
+}
+.home-platforms {
+}
+.home-platforms ul {
+    list-style: none;
+    margin: 0;
+}
+.home-platforms-instance {
+    background-color: #282828;
+    position: relative;
+    float: left;
+    width: 330px;
+    padding: 10px;
+    margin-right: 20px;
+    margin-bottom: 20px;
+    -webkit-box-sizing: content-box;
+    box-sizing: content-box;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    white-space: nowrap;
+}
+.home-platforms-instance li {
+    position: relative;
+}
+.home-platforms-instance-info {
+    float: left;
+    position: relative;
+    padding-left: 80px;
+    width: 100%;
+    height: 120px;
+}
+.home-platforms-instance-name {
+    color: #fff;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    position: relative;
+    font-size: 13px;
+    line-height: 15px;
+    font-weight: bold;
+    width: 100%;
+    padding: 0 0 0 20px;
+}
+.home-platforms-instance-name h4 {
+    margin: 10px 0 4px 0;
+}
+.home-platforms-instance-playcount {
+    display: inline-block;
+    position: relative;
+    padding: 6px 0 0 20px;
+    max-width: 100%;
+}
+.home-platforms-instance-playcount h4 {
+    font-size: 14px;
+    line-height: 16px;
+    margin: 10px 0 10px 0;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+.home-platforms-instance-playcount h3 {
+    font-size: 30px;
+    font-weight: bold;
+    color: #F9AA03;
+    line-height: 22px;
+    position: relative;
+    top: 5px;
+    margin: 0 5px 0 0;
+    float: left;
+}
+.home-platforms-instance-playcount p {
+    color: #aaa;
+    font-size: 12px;
+    float: left;
+    position: relative;
+    top: 15px;
+    left: 0px;
+    margin-right: 5px;
+}
+.home-platforms-instance-last-user {
+    float: left;
+    position: relative;
+    padding: 6px 0 0 20px;
+    width: 100%;
+}
+.home-platforms-instance-last-user h4 {
+    font-size: 14px;
+    line-height: 16px;
+    margin: 10px 0 10px 0;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+.home-platforms-instance-last-user h5 {
+    font-size: 12px;
+    position: relative;
+    margin: 0 0 2px 0;
+    float: left;
+}
+.home-platforms-instance-last-user p {
+    color: #aaa;
+    font-size: 12px;
+    float: left;
+    clear: left;
+    position: relative;
+    width: 100%;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+.home-platforms-instance-poster {
+    margin-left: 0px;
+    position: absolute;
+}
+.home-platforms-instance-poster .home-platforms-poster-face {
+    background-position: center;
+    background-size: cover;
+    height: 120px;
+    width: 80px;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+}
+.home-platforms-instance-poster .home-platforms-library-thumb {
+    background-position: center;
+    background-size: cover;
+    height: 80px;
+    width: 80px;
+    margin-top: 20px;
+}
+.home-platforms-instance-box {
+    background-position: center;
+    background-size: cover;
+    margin: 20px 0 0 0px;
+    height: 80px;
+    width: 80px;
+    position: relative;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    overflow: hidden;
+}
+.home-platforms-instance-oval {
+    background-position: center;
+    background-size: cover;
+    margin: 20px 0 0 0px;
+    height: 80px;
+    width: 80px;
+    position: relative;
+    -webkit-border-radius: 50%;
+    -moz-border-radius: 50%;
+    border-radius: 50%;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    overflow: hidden;
+}
+.home-platforms-instance-list {
+    float: left;
+    position: relative;
+    width: 100%;
+    padding: 0 10px 25px 10px;
+}
+.home-platforms-instance-list li {
+    margin-top: 25px;
+    position: relative;
+    height: 60px;
+}
+.home-platforms-instance-list-number {
+    background-color: #eb8600;
+    float: left;
+    position: absolute;
+    top: -10px;
+    left: 10px;
+    height: 20px;
+    width: 20px;
+    display: block;
+    text-align: center;
+    padding-top: 1px;
+    -webkit-border-radius: 50%;
+    -moz-border-radius: 50%;
+    border-radius: 50%;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+}
+.home-platforms-instance-list-number h4 {
+    color: #000;
+    font-size: 15px;
+    font-weight: bold;
+    margin: 0;
+}
+.home-platforms-instance-list-info {
+    float: left;
+    position: relative;
+    padding-left: 75px;
+    width: 100%;
+    height: 60px;
+}
+.home-platforms-instance-list-name {
+    float: left;
+    color: #fff;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    position: relative;
+    font-size: 13px;
+    line-height: 15px;
+    font-weight: bold;
+    width: 100%;
+    padding: 2px 0 0 10px;
+}
+.home-platforms-instance-list-name h5 {
+    margin: 5px 0px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+.home-platforms-instance-list-playcount {
+    float: left;
+    position: relative;
+    padding: 4px 0 0 10px;
+    width: 100%;
+}
+.home-platforms-instance-list-playcount h3 {
+    font-size: 20px;
+    font-weight: bold;
+    color: #F9AA03;
+    line-height: 22px;
+    position: relative;
+    margin: 0 5px 0 0;
+    float: left;
+}
+.home-platforms-instance-list-playcount p {
+    color: #aaa;
+    font-size: 12px;
+    float: left;
+    position: relative;
+    top: 5px;
+    left: 0px;
+    margin-right: 5px;
+}
+.home-platforms-instance-list-last-user {
+    float: left;
+    position: relative;
+    padding: 0 0 0 10px;
+    width: 100%;
+}
+.home-platforms-instance-list-last-user h5 {
+    font-size: 12px;
+    position: relative;
+    margin: 0 0 2px 0;
+    float: left;
+}
+.home-platforms-instance-list-last-user p {
+    color: #aaa;
+    font-size: 12px;
+    float: left;
+    clear: left;
+    position: relative;
+    width: 100%;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+.home-platforms-instance-list-poster {
+    position: absolute;
+    left: 20px;
+}
+.home-platforms-instance-list-poster .home-platforms-list-poster-face {
+    background-position: center;
+    background-size: cover;
+    height: 60px;
+    width: 40px;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+}
+.home-platforms-instance-list-box {
+    background-position: center;
+    background-size: cover;
+    margin: 10px 0 0 20px;
+    height: 40px;
+    width: 40px;
+    position: relative;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    overflow: hidden;
+}
+.home-platforms-instance-list-oval {
+    background-position: center;
+    background-size: cover;
+    margin: 10px 0 0 20px;
+    height: 40px;
+    width: 40px;
+    position: relative;
+    -webkit-border-radius: 50%;
+    -moz-border-radius: 50%;
+    border-radius: 50%;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    overflow: hidden;
+}
+.home-platforms-instance-list-chevron {
+    position: absolute;
+    top: 105px;
+    right: 0;
+    cursor: pointer;
+}
+.home-platforms-instance-list-chevron i {
+    color: #999;
+    font-size: 16px;
+    -webkit-transition: all 0.3s ease;
+    -o-transition: all 0.3s ease;
+    transition: all 0.3s ease;
+}
+.home-platforms-instance-list-chevron i:hover {
+    color: #eb8600;
+}
+.home-platforms-instance-list-chevron.active i.fa-chevron-down{
+    color: #eb8600;
+    -webkit-transform: rotate(180deg);
+    -ms-transform: rotate(180deg);
+    -o-transform: rotate(180deg);
+    transform: rotate(180deg);
+}
+a .home-platforms-instance-box:hover,
+a .home-platforms-instance-oval:hover,
+a .home-platforms-instance-list-box:hover,
+a .home-platforms-instance-list-oval:hover,
+.home-platforms-poster-face:hover,
+.home-platforms-list-poster-face:hover
+ {
+    -webkit-box-shadow: inset 0 0 0 2px #e9a049;
+    -moz-box-shadow: inset 0 0 0 2px #e9a049;
+    box-shadow: inset 0 0 0 2px #e9a049;
+}
+.home-platforms-instance .slider {
+    background-color: #2d2d2d;
+    width: calc(100% + 20px);
+    display: none;
+    position: absolute;
+    top: 128px;
+    left: -10px;
+    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
+    z-index: 1;
+    clip: rect(1px, 354px, 1000px, -2px);
+}
+.history-table-title {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    max-width: 350px;
+}
+.graphs-instance {
+    height: 330px;
+    padding: 20px;
+    background-color: #333;
+    margin-bottom: 20px;
+    border-radius: 8px;
+}
+.watch-chart {
+    margin-top: 10px;
+    height: 300px;
+    width: 100%;
+}
+.graphs-load {
+    color: #999999;
+    text-align: center;
+    line-height: 300px;
+}
+.card-back {
+    padding: 16px;
+    background-color: #282828;
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 20px;
+    margin-bottom: 20px;
+    width: 80%;
+    overflow: hidden;
+}
+.card-back-full {
+    padding: 20px;
+    background-color: #282828;
+    margin-top: 20px;
+    margin-bottom: 20px;
+    overflow: hidden;
+}
+.table-card-back {
+    padding: 16px 16px 16px 16px;
+    background-color: #282828;
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 20px;
+    margin-bottom: 20px;
+    width: 90%;
+    overflow: hidden;
+}
+.table-card-header {
+    padding: 16px 16px 16px 16px;
+    background-color: #2c2c2c;
+    border-bottom: 1px solid #3d3d3d;
+    border-top: 1px solid #282828;
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 20px;
+    margin-bottom: -20px;
+    width: 90%;
+    overflow: hidden;
+}
+.table-card-back td {
+    font-size: 12px;
+}
+.header-bar {
+    float: left;
+}
+.header-bar span {
+    font-size: 22px;
+    line-height: 34px;
+}
+.button-bar {
+    float: right;
+}
+.colvis-button-bar,
+.refresh-users-button {
+    float: right;
+}
+.nav-settings,
+.nav-settings ul {
+    margin: 0px 0px 20px 0px;
+}
+.nav-settings > li {
+    list-style: none;
+    background-color: #282828;
+    width: 100%;
+    max-width: 340px;
+    min-width: 200px;
+    border-top: 1px solid #2d2d2d;
+}
+.nav-settings > li > a {
+    display: block;
+    padding: 15px 15px 15px 15px;
+    color: #999;
+    -webkit-transition: all 0.3s ease;
+      -o-transition: all 0.3s ease;
+      transition: all 0.3s ease;
+}
+.nav-settings > li > a:hover,
+.nav-settings > li > a:focus {
+    color: #eee;
+    background-color: #2f2f2f;
+}
+.nav-settings > .active > a,
+.nav-settings > .active > a:hover,
+.nav-settings > .active > a:focus {
+    color: #eb8600;
+    background-color: #2f2f2f;
+}
+.stacked-configs,
+.stacked-configs ul {
+    margin: 0px 0px 20px 0px;
+}
+.stacked-configs > li {
+    list-style: none;
+    background-color: #282828;
+    width: 100%;
+    min-width: 320px;
+    max-width: 900px;
+}
+.stacked-configs > li > span {
+    display: block;
+    padding: 8px 20px 8px 15px;
+    color: #eee;
+    border-left: 2px solid #444;
+    border-top: 1px solid #2d2d2d;
+    -webkit-transition: all 0.3s ease;
+      -o-transition: all 0.3s ease;
+      transition: all 0.3s ease;
+}
+.stacked-configs > li > span:hover,
+.stacked-configs > li > span:focus {
+    color: #eee;
+    background-color: #2f2f2f;
+}
+.stacked-configs > li > span > a.toggle-right {
+    float: right;
+    color: #999;
+    padding-left: 10px;
+}
+.stacked-configs > li > span > a.toggle-left {
+    color: #444;
+    padding-right: 8px;
+}
+.stacked-configs > li > span > a:hover {
+    color: #eee;
+}
+.stacked-configs > li > span > a.active {
+    color: #eb8600;
+}
+.accordion {
+    width: 100%;
+    max-width: 900px;
+    margin: 0px 0px 20px 0px;
+    background: #282828;
+    list-style: none;
+}
+.accordion .link {
+    cursor: pointer;
+    display: block;
+    padding: 8px 20px 8px 30px;
+    color: #999;
+    border-bottom: 1px solid #2d2d2d;
+    position: relative;
+    -webkit-transition: all 0.3s ease;
+    -o-transition: all 0.3s ease;
+    transition: all 0.3s ease;
+}
+.accordion li:last-child .link {
+    border-bottom: 0;
+}
+.accordion li i {
+    position: absolute;
+    top: 10px;
+    left: 10px;
+    color: #999;
+    -webkit-transition: all 0.3s ease;
+    -o-transition: all 0.3s ease;
+    transition: all 0.3s ease;
+}
+.accordion li i.fa-chevron-down {
+    right: 12px;
+    left: auto;
+    font-size: 16px;
+}
+.accordion li .link:hover {
+    color: #FFF;
+    background: #2f2f2f;
+}
+.accordion li.open .link {
+    color: #eb8600;
+}
+.accordion li.open i {
+    color: #eb8600;
+}
+.accordion li.open i.fa-chevron-down {
+    -webkit-transform: rotate(180deg);
+    -ms-transform: rotate(180deg);
+    -o-transform: rotate(180deg);
+    transform: rotate(180deg);
+}
+.submenu {
+    display: none;
+    background: #2d2d2d;
+    list-style: none;
+    margin: 0px;
+    padding: 20px;
+}
+.submenu li {
+    border-bottom: 1px solid #2f2f2f;
+}
+.submenu a {
+    display: block;
+    text-decoration: none;
+    color: #d9d9d9;
+    padding: 12px;
+    -webkit-transition: all 0.25s ease;
+    -o-transition: all 0.25s ease;
+    transition: all 0.25s ease;
+}
+.submenu a:hover {
+    background: #eb8600;
+    color: #FFF;
+}
+.ajaxMsg {
+    background-color: rgba(255,255,255,0.075);
+    color: #999999;
+    display: none;
+    font-size: 14px;
+    right: 10px;
+    padding: 10px 10px;
+    position: fixed;
+    text-align: center;
+    bottom: 10px;
+    min-height: 32px;
+    width: 250px;
+    z-index: 9999;
+}
+.ajaxMsg .msg {
+    line-height: normal;
+    padding-left: 20px;
+}
+.ajaxMsg .loader {
+    position: relative;
+    top: 2px;
+}
+.ajaxMsg .success {
+    text-align: left;
+}
+.ajaxMsg .error {
+    background-color: rgba(255,0,0,0.5);
+    font-size: 20px;
+    text-align: left;
+}
+.ajaxMsg .ui-icon {
+    display: inline-block;
+    margin-left: -20px;
+    top: 2px;
+    position: relative;
+    margin-right: 3px;
+}
+.dataTables_processing {
+    background-color: grey;
+    display: none;
+    font-size: 14px;
+    right: 10px;
+    padding: 10px 10px;
+    position: fixed;
+    text-align: center;
+    bottom: 10px;
+    min-height: 32px;
+    width: 250px;
+    z-index: 9999;
+}
+.tooltip.top .tooltip-arrow {
+    border-top-color: #fff;
+}
+.tooltip.right .tooltip-arrow {
+    border-right-color: #fff;
+}
+.tooltip.bottom .tooltip-arrow {
+    border-bottom-color: #fff;
+}
+.tooltip.left .tooltip-arrow {
+    border-left-color: #fff;
+}
+.tooltip-inner {
+    color: #000;
+    background: #fff;
+    border: 0;
+    font-weight: bold;
+}
+.history-title .popover.right {
+    margin-left: 12px;
+    z-index: 5;
+}
+.history-title .popover.right .popover-content {
+    padding: 5px 8px;
+}
+.history-thumbnail {
+    background-position: center;
+    background-size: cover;
+    width: 80px;
+}
+.edit-user-toggles {
+    padding-right: 10px;
+}
+.edit-user-toggles > input[type='checkbox'] {
+    display: none;
+}
+.edit-user-toggles > input[type='checkbox'] + label {
+    color: #444;
+    cursor: pointer;
+}
+.edit-user-toggles > input[type='checkbox']:checked + label {
+    color: #fff;
+    cursor: pointer;
+}
+.edit-user-name > input[type='text'] {
+    margin: 0;
+}
+.popover {
+    z-index: 2;
+}
+.popover .popover-content {
+    color: #000;
+}
+.noTransition
+{
+    -moz-transition: none !important;
+    -webkit-transition: none !important;
+    -o-transition: none !important;
+    transition: none !important;
+}
+.settings-alert {
+    float: left;
+    padding: 0;
+    margin: 5px 0;
+    border: 0;
+    position: relative;
+}
+.settings-alert ul {
+    padding: 0;
+}
+.settings-alert ul li {
+    list-style: none;
+    padding: 5px 12px 5px 35px;
+    margin: 0;
+    border: 1px solid #ebccd1;
+    border-radius: 4px;
+}
+.settings-alert ul li:before {
+    content: "\f071";
+    font-family: FontAwesome;
+    font-style: normal;
+    font-weight: normal;
+    text-decoration: inherit;
+    font-size: 18px;
+    position: absolute;
+    top: 5px;
+    left: 12px;
+}
+#users-to-delete > li {
+    color: #e9a049;
+}
+#updatebar {
+    background-color: #444;
+    color: #999999;
+    display: none;
+    font-size: 14px;
+    right: 10px;
+    padding: 7px 10px;
+    position: fixed;
+    text-align: center;
+    bottom: 10px;
+    min-height: 22px;
+    width: 250px;
+    z-index: 9999;
+    display: block;
+}
+#updatebar .msg {
+    line-height: normal;
+    padding-left: 20px;
+}
+#updatebar .loader {
+    position: relative;
+    top: 2px;
+}
+#updatebar.success {
+    padding: 15px 10px;
+    text-align: left;
+}
+#updatebar.error {
+    padding: 15px 10px;
+    text-align: left;
+}
+#updatebar .ui-icon {
+    display: inline-block;
+    margin-left: -20px;
+    top: 2px;
+    position: relative;
+    margin-right: 3px;
+}
+#updatebar a:hover {
+    color: #F9AA03;
+}
+.body-container {
+    position: absolute;
+    top: 50px;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    overflow-x: hidden;
+    overflow-y: auto;
+    
+}
+::-webkit-scrollbar {
+    width: 15px;
+}
+::-webkit-scrollbar-track {
+    background-color: rgba(0,0,0,.2);
+}
+::-webkit-scrollbar-thumb {
+    min-height: 50px;
+    background-color: rgba(255,255,255,.15);
+    border: 3px solid transparent;
+    border-radius: 8px;
+    background-clip: padding-box;
+}
+
+@media only screen 
+  and (min-device-width: 300px) 
+  and (max-device-width: 400px) {
+    .home-platforms-instance {
+        width: calc(100% - 20px);
+    }
+    .dashboard-instance {
+        width: 100%;
+    }
+}
+table.display tr.shown + tr div.slider {
+    display: none;
+}
+table.display tr.shown + tr > td {
+    padding-top: 0;
+    padding-bottom: 0;
+}
+table.display tr.shown + tr:hover {
+    background-color: rgba(255,255,255,0);
+}
+table.display tr.shown + tr:hover a,
+table.display tr.shown + tr td:hover a,
+table.display tr.shown + tr .pagination > .active > a,
+table.display tr.shown + tr .pagination > .active > a:hover {
+    color: #fff;
+}
+table.display tr.shown + tr table[id^='history_child'] td:hover a {
+    color: #F9AA03;
+}
+table.display tr.shown + tr .pagination > .disabled > a {
+    color: #444444;
+}
+table.display tr.shown + tr .pagination > li > a:hover {
+    color: #23527c;
+}
+table[id^='history_child'] {
+    margin-top: 0;
+    margin-left: -4px;
+    opacity: .6;
+}
+table[id^='history_child'] thead th {
+    line-height: 0;
+    height: 0 !important;
+    overflow: hidden;
+}
+#search_form {
+    width: 350px;
+    padding: 8px 15px;
+}
+#search_form span.input-textbox {
+    overflow: hidden;
+    width: 250px;
+    height: 34px;
+    display: inline-flex;
+    float: right;
+}
+#search_form #search_query {
+    width: 0;
+    height: 34px;
+    margin-top: 0;
+    float: right;
+    position: relative;
+    right: -250px;
+    border-radius: 3px 0 0 3px;
+}
+#search_form #search_query.active {
+    width: 250px;
+    right: 0px;
+}
+#search_form #search_button.btn-inactive {
+    background-color: #000;
+    border: 1px solid rgba(0,0,0,0);
+    -webkit-transition: background 0.3s;
+    -moz-transition: background 0.3s;
+    -ms-transition: background 0.3s;
+    -o-transition: background 0.3s;
+    transition: background 0.3s;
+}
\ No newline at end of file
diff --git a/data/interfaces/default/css/pnotify.custom.min.css b/data/interfaces/default/css/pnotify.custom.min.css
deleted file mode 100644
index 2d6056a2..00000000
--- a/data/interfaces/default/css/pnotify.custom.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.ui-pnotify{top:36px;right:36px;position:absolute;height:auto;z-index:2}body>.ui-pnotify{position:fixed;z-index:100040}.ui-pnotify-modal-overlay{background-color:rgba(0,0,0,.4);top:0;left:0;position:absolute;height:100%;width:100%;z-index:1}body>.ui-pnotify-modal-overlay{position:fixed;z-index:100039}.ui-pnotify.ui-pnotify-in{display:block!important}.ui-pnotify.ui-pnotify-move{transition:left .5s ease,top .5s ease,right .5s ease,bottom .5s ease}.ui-pnotify.ui-pnotify-fade-slow{transition:opacity .6s linear;opacity:0}.ui-pnotify.ui-pnotify-fade-slow.ui-pnotify.ui-pnotify-move{transition:opacity .6s linear,left .5s ease,top .5s ease,right .5s ease,bottom .5s ease}.ui-pnotify.ui-pnotify-fade-normal{transition:opacity .4s linear;opacity:0}.ui-pnotify.ui-pnotify-fade-normal.ui-pnotify.ui-pnotify-move{transition:opacity .4s linear,left .5s ease,top .5s ease,right .5s ease,bottom .5s ease}.ui-pnotify.ui-pnotify-fade-fast{transition:opacity .2s linear;opacity:0}.ui-pnotify.ui-pnotify-fade-fast.ui-pnotify.ui-pnotify-move{transition:opacity .2s linear,left .5s ease,top .5s ease,right .5s ease,bottom .5s ease}.ui-pnotify.ui-pnotify-fade-in{opacity:1}.ui-pnotify .ui-pnotify-shadow{-webkit-box-shadow:0 6px 28px 0 rgba(0,0,0,.1);-moz-box-shadow:0 6px 28px 0 rgba(0,0,0,.1);box-shadow:0 6px 28px 0 rgba(0,0,0,.1)}.ui-pnotify-container{background-position:0 0;padding:.8em;height:100%;margin:0}.ui-pnotify-container:after{content:" ";visibility:hidden;display:block;height:0;clear:both}.ui-pnotify-container.ui-pnotify-sharp{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.ui-pnotify-title{display:block;margin-bottom:.4em;margin-top:0}.ui-pnotify-text{display:block}.ui-pnotify-icon,.ui-pnotify-icon span{display:block;float:left;margin-right:.2em}.ui-pnotify.stack-bottomleft,.ui-pnotify.stack-topleft{left:25px;right:auto}.ui-pnotify.stack-bottomleft,.ui-pnotify.stack-bottomright{bottom:25px;top:auto}.ui-pnotify.stack-modal{left:50%;right:auto;margin-left:-150px}.ui-pnotify-closer,.ui-pnotify-sticker{float:right;margin-left:.2em}.ui-pnotify-container{position:relative;left:0}@media (max-width:480px){.ui-pnotify-mobile-able.ui-pnotify{position:fixed;top:0;right:0;left:0;width:auto!important;font-size:1.2em;-webkit-font-smoothing:antialiased;-moz-font-smoothing:antialiased;-ms-font-smoothing:antialiased;font-smoothing:antialiased}.ui-pnotify-mobile-able.ui-pnotify .ui-pnotify-shadow{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;border-bottom-width:5px}.ui-pnotify-mobile-able .ui-pnotify-container{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.ui-pnotify-mobile-able.ui-pnotify.stack-bottomleft,.ui-pnotify-mobile-able.ui-pnotify.stack-topleft{left:0;right:0}.ui-pnotify-mobile-able.ui-pnotify.stack-bottomleft,.ui-pnotify-mobile-able.ui-pnotify.stack-bottomright{left:0;right:0;bottom:0;top:auto}.ui-pnotify-mobile-able.ui-pnotify.stack-bottomleft .ui-pnotify-shadow,.ui-pnotify-mobile-able.ui-pnotify.stack-bottomright .ui-pnotify-shadow{border-top-width:5px;border-bottom-width:1px}}
\ No newline at end of file
diff --git a/data/interfaces/default/css/selectize.min.css b/data/interfaces/default/css/selectize.min.css
deleted file mode 100644
index 0b3ba701..00000000
--- a/data/interfaces/default/css/selectize.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.react-selectize{color:#000}.react-selectize.root-node{position:relative;width:300px;}.react-selectize.root-node.disabled{pointer-events:none}.react-selectize.root-node .react-selectize-control{cursor:pointer;display:-webkit-box;display:-moz-box;display:-webkit-flex;display:-ms-flexbox;display:box;display:flex;-webkit-box-align:start;-moz-box-align:start;-o-box-align:start;-ms-flex-align:start;-webkit-align-items:flex-start;align-items:flex-start;position:relative;padding:2px;}.react-selectize.root-node .react-selectize-control .react-selectize-placeholder{display:block;line-height:30px;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;vertical-align:middle;white-space:nowrap;position:absolute;max-width:calc(100% - 56px)}.react-selectize.root-node .react-selectize-control .react-selectize-search-field-and-selected-values{display:-webkit-box;display:-moz-box;display:-webkit-flex;display:-ms-flexbox;display:box;display:flex;min-height:30px;-webkit-box-flex:1;-moz-box-flex:1;-o-box-flex:1;-ms-box-flex:1;box-flex:1;-webkit-flex-grow:1;flex-grow:1;-webkit-box-lines:multiple;-moz-box-lines:multiple;-o-box-lines:multiple;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;}.react-selectize.root-node .react-selectize-control .react-selectize-search-field-and-selected-values .resizable-input{background:none;border:none;outline:none;font-size:1em;margin:2px;padding:4px 0;vertical-align:middle;width:0}.react-selectize.root-node .react-selectize-control .react-selectize-search-field-and-selected-values .value-wrapper{display:-webkit-box;display:-moz-box;display:-webkit-flex;display:-ms-flexbox;display:box;display:flex;-webkit-box-align:center;-moz-box-align:center;-o-box-align:center;-ms-flex-align:center;-webkit-align-items:center;align-items:center}.react-selectize.root-node .react-selectize-control .react-selectize-reset-button-container,.react-selectize.root-node .react-selectize-control .react-selectize-toggle-button-container{-webkit-box-flex:0;-moz-box-flex:0;-o-box-flex:0;-ms-box-flex:0;box-flex:0;-webkit-flex-grow:0;flex-grow:0;-webkit-flex-shrink:0;flex-shrink:0;cursor:pointer;display:-webkit-box;display:-moz-box;display:-webkit-flex;display:-ms-flexbox;display:box;display:flex;-webkit-box-align:center;-moz-box-align:center;-o-box-align:center;-ms-flex-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-moz-box-pack:center;-o-box-pack:center;-ms-flex-pack:center;-webkit-justify-content:center;justify-content:center;height:30px}.react-selectize.root-node .react-selectize-control .react-selectize-reset-button-container{width:16px}.react-selectize.root-node .react-selectize-control .react-selectize-toggle-button-container{width:32px}.react-selectize.root-node .react-selectize-control .react-selectize-reset-button-container:hover .react-selectize-reset-button path{stroke:#c0392b}.react-selectize.root-node .react-selectize-control .react-selectize-reset-button path{-webkit-transition:stroke 0.5s 0s ease;-moz-transition:stroke 0.5s 0s ease;-o-transition:stroke 0.5s 0s ease;-ms-transition:stroke 0.5s 0s ease;transition:stroke 0.5s 0s ease;stroke:#999;stroke-linecap:square;stroke-linejoin:mitter}.react-selectize.root-node .react-selectize-control .react-selectize-toggle-button path{fill:#999}.react-selectize.dropdown-menu-wrapper{position:absolute;}.react-selectize.dropdown-menu-wrapper.tethered{min-width:300px}.react-selectize.dropdown-menu-wrapper:not(.tethered){width:100%}.react-selectize.dropdown-menu{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;overflow:auto;position:absolute;max-height:200px;z-index:10;}.react-selectize.dropdown-menu.tethered{min-width:300px}.react-selectize.dropdown-menu:not(.tethered){width:100%}.react-selectize.dropdown-menu .groups.as-columns{display:-webkit-box;display:-moz-box;display:-webkit-flex;display:-ms-flexbox;display:box;display:flex;}.react-selectize.dropdown-menu .groups.as-columns > div{-webkit-box-flex:1;-moz-box-flex:1;-o-box-flex:1;box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}.react-selectize.dropdown-menu .option-wrapper{cursor:pointer;outline:none}.multi-select.react-selectize.root-node .simple-value{display:inline-block;margin:2px;vertical-align:middle;}.multi-select.react-selectize.root-node .simple-value span{display:inline-block;padding:2px 5px 4px;vertical-align:center}.simple-select.react-selectize.root-node .simple-value{margin:2px;}.simple-select.react-selectize.root-node .simple-value span{display:inline-block;vertical-align:center}.react-selectize.default{font-family:Helvetica Neue,Helvetica,Arial,sans-serif}.react-selectize.default.root-node .react-selectize-control{background-color:#fff;border:1px solid;border-color:#d9d9d9 #ccc #b3b3b3;-webkit-border-radius:4px;border-radius:4px;font-size:1em;}.react-selectize.default.root-node .react-selectize-control .react-selectize-placeholder{color:#aaa;text-indent:8px}.react-selectize.default.root-node .react-selectize-control .react-selectize-search-field-and-selected-values{padding-left:5px}.react-selectize.default.root-node.open.flipped .react-selectize-control{border-bottom-left-radius:4px;border-bottom-right-radius:4px;border-top-left-radius:0;border-top-right-radius:0}.react-selectize.default.root-node.open:not(.flipped) .react-selectize-control{border-bottom-left-radius:0;border-bottom-right-radius:0;border-top-left-radius:4px;border-top-right-radius:4px}.react-selectize.dropdown-menu-wrapper.default{overflow:hidden;}.react-selectize.dropdown-menu-wrapper.default .dropdown-menu.custom-enter-active,.react-selectize.dropdown-menu-wrapper.default .dropdown-menu.custom-leave-active{-webkit-transition:-webkit-transform 0.2s 0s ease;-moz-transition:-moz-transform 0.2s 0s ease;-o-transition:-o-transform 0.2s 0s ease;-ms-transition:-ms-transform 0.2s 0s ease;transition:transform 0.2s 0s ease}.react-selectize.dropdown-menu-wrapper.default .dropdown-menu.flipped.custom-enter{-webkit-transform:translateY(100%);-moz-transform:translateY(100%);-o-transform:translateY(100%);-ms-transform:translateY(100%);transform:translateY(100%)}.react-selectize.dropdown-menu-wrapper.default .dropdown-menu.flipped.custom-enter-active{-webkit-transform:translateY(0%);-moz-transform:translateY(0%);-o-transform:translateY(0%);-ms-transform:translateY(0%);transform:translateY(0%)}.react-selectize.dropdown-menu-wrapper.default .dropdown-menu.flipped.custom-leave{-webkit-transform:translateY(0%);-moz-transform:translateY(0%);-o-transform:translateY(0%);-ms-transform:translateY(0%);transform:translateY(0%)}.react-selectize.dropdown-menu-wrapper.default .dropdown-menu.flipped.custom-leave-active{-webkit-transform:translateY(100%);-moz-transform:translateY(100%);-o-transform:translateY(100%);-ms-transform:translateY(100%);transform:translateY(100%)}.react-selectize.dropdown-menu-wrapper.default .dropdown-menu:not(.flipped).custom-enter{-webkit-transform:translateY(-100%);-moz-transform:translateY(-100%);-o-transform:translateY(-100%);-ms-transform:translateY(-100%);transform:translateY(-100%)}.react-selectize.dropdown-menu-wrapper.default .dropdown-menu:not(.flipped).custom-enter-active{-webkit-transform:translateY(0%);-moz-transform:translateY(0%);-o-transform:translateY(0%);-ms-transform:translateY(0%);transform:translateY(0%)}.react-selectize.dropdown-menu-wrapper.default .dropdown-menu:not(.flipped).custom-leave{-webkit-transform:translateY(0%);-moz-transform:translateY(0%);-o-transform:translateY(0%);-ms-transform:translateY(0%);transform:translateY(0%)}.react-selectize.dropdown-menu-wrapper.default .dropdown-menu:not(.flipped).custom-leave-active{-webkit-transform:translateY(-100%);-moz-transform:translateY(-100%);-o-transform:translateY(-100%);-ms-transform:translateY(-100%);transform:translateY(-100%)}.react-selectize.dropdown-menu.default{background:#fff;border:1px solid #ccc;margin-top:-1px;}.react-selectize.dropdown-menu.default.flipped{border-top-left-radius:4px;border-top-right-radius:4px}.react-selectize.dropdown-menu.default:not(.flipped){border-color:#b3b3b3 #ccc #d9d9d9;border-bottom-left-radius:4px;border-bottom-right-radius:4px}.react-selectize.dropdown-menu.default .no-results-found{color:#aaa !important;font-style:oblique;padding:8px 10px}.react-selectize.dropdown-menu.default .simple-group-title{background-color:#fafafa;padding:8px 8px}.react-selectize.dropdown-menu.default .option-wrapper.highlight{background:#f2f9fc;color:#333}.react-selectize.dropdown-menu.default .option-wrapper .simple-option{color:#666;cursor:pointer;padding:8px 10px;}.react-selectize.dropdown-menu.default .option-wrapper .simple-option.not-selectable{background-color:#f8f8f8;color:#999;cursor:default;font-style:oblique;text-shadow:0 1px 0 #fff}.multi-select.react-selectize.default.root-node .simple-value{background:#f2f9fc;border:1px solid #c9e6f2;-webkit-border-radius:2px;border-radius:2px;color:#08c}.simple-select.react-selectize.default.root-node.open .react-selectize-control{background-color:#fff}.simple-select.react-selectize.default.root-node:not(.open) .react-selectize-control{background-color:#f9f9f9;background-image:-webkit-linear-gradient(top, #fefefe, #f2f2f2);background-image:-moz-linear-gradient(top, #fefefe, #f2f2f2);background-image:-o-linear-gradient(top, #fefefe, #f2f2f2);background-image:-ms-linear-gradient(top, #fefefe, #f2f2f2);background-image:linear-gradient(to bottom, #fefefe, #f2f2f2)}.react-selectize.bootstrap3{font-family:Helvetica Neue,Helvetica,Arial,sans-serif}.react-selectize.bootstrap3.root-node.open .react-selectize-control{background-color:#fff;border:1px solid #66afe9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6)}.react-selectize.bootstrap3.root-node .react-selectize-control{border:1px solid;border-color:#d9d9d9 #ccc #b3b3b3;-webkit-border-radius:4px;border-radius:4px;font-size:1em;}.react-selectize.bootstrap3.root-node .react-selectize-control .react-selectize-placeholder{color:#aaa;text-indent:8px}.react-selectize.bootstrap3.root-node .react-selectize-control .react-selectize-search-field-and-selected-values{padding-left:5px}.react-selectize.bootstrap3.dropdown-menu-wrapper.flipped{margin-bottom:5px}.react-selectize.bootstrap3.dropdown-menu-wrapper:not(.flipped){margin-top:5px}.react-selectize.bootstrap3.dropdown-menu-wrapper .dropdown-menu.custom-enter-active,.react-selectize.bootstrap3.dropdown-menu-wrapper .dropdown-menu.custom-leave-active{-webkit-transition:opacity 0.2s 0s ease;-moz-transition:opacity 0.2s 0s ease;-o-transition:opacity 0.2s 0s ease;-ms-transition:opacity 0.2s 0s ease;transition:opacity 0.2s 0s ease}.react-selectize.bootstrap3.dropdown-menu-wrapper .dropdown-menu.custom-enter{opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";filter:alpha(opacity=0)}.react-selectize.bootstrap3.dropdown-menu-wrapper .dropdown-menu.custom-enter-active{opacity:1;-ms-filter:none;filter:none}.react-selectize.bootstrap3.dropdown-menu-wrapper .dropdown-menu.custom-leave{opacity:1;-ms-filter:none;filter:none}.react-selectize.bootstrap3.dropdown-menu-wrapper .dropdown-menu.custom-leave-active{opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";filter:alpha(opacity=0)}.react-selectize.bootstrap3.dropdown-menu{background:#fff;border:1px solid #ccc;-webkit-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);}.react-selectize.bootstrap3.dropdown-menu.flipped{margin-bottom:5px}.react-selectize.bootstrap3.dropdown-menu:not(.flipped){margin-top:5px}.react-selectize.bootstrap3.dropdown-menu .no-results-found{color:#aaa !important;font-style:oblique;padding:8px 10px}.react-selectize.bootstrap3.dropdown-menu .groups:not(.as-columns) > div:not(:first-child){border-top:1px solid #e5e5e5;margin:12px 0 0 0}.react-selectize.bootstrap3.dropdown-menu .simple-group-title{background-color:#fff;color:#999;padding:8px 8px;text-shadow:0 1px 0 rgba(0,0,0,0.05)}.react-selectize.bootstrap3.dropdown-menu .option-wrapper.highlight{background:#428bca;}.react-selectize.bootstrap3.dropdown-menu .option-wrapper.highlight .simple-option{color:#fff}.react-selectize.bootstrap3.dropdown-menu .option-wrapper .simple-option{color:#333;cursor:pointer;padding:8px 10px;}.react-selectize.bootstrap3.dropdown-menu .option-wrapper .simple-option.not-selectable{background-color:#f8f8f8;color:#999;cursor:default;font-style:oblique;text-shadow:0 1px 0 #fff}.multi-select.react-selectize.bootstrap3.root-node .simple-value{background:#efefef;-webkit-border-radius:4px;border-radius:4px;color:#333}.react-selectize.material{font-family:Roboto,sans-serif}.react-selectize.material.root-node.open .react-selectize-control:after{-webkit-transform:scaleX(1);-moz-transform:scaleX(1);-o-transform:scaleX(1);-ms-transform:scaleX(1);transform:scaleX(1)}.react-selectize.material.root-node .react-selectize-control{border-bottom:1px solid rgba(0,0,0,0.3);}.react-selectize.material.root-node .react-selectize-control:after{background-color:#00bcd4;content:"";-webkit-transform:scaleX(0);-moz-transform:scaleX(0);-o-transform:scaleX(0);-ms-transform:scaleX(0);transform:scaleX(0);-webkit-transition:-webkit-transform 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;-moz-transition:-moz-transform 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;-o-transition:-o-transform 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;-ms-transition:-ms-transform 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;transition:transform 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;position:absolute;left:0;bottom:-1px;width:100%;height:2px}.react-selectize.material.root-node .react-selectize-control .react-selectize-placeholder{color:rgba(0,0,0,0.3);text-indent:4px}.react-selectize.material.dropdown-menu-wrapper.flipped{margin-bottom:8px;}.react-selectize.material.dropdown-menu-wrapper.flipped .dropdown-menu{-webkit-transform-origin:100% 100%;-moz-transform-origin:100% 100%;-o-transform-origin:100% 100%;-ms-transform-origin:100% 100%;transform-origin:100% 100%}.react-selectize.material.dropdown-menu-wrapper:not(.flipped){margin-top:8px;}.react-selectize.material.dropdown-menu-wrapper:not(.flipped) .dropdown-menu{-webkit-transform-origin:0% 0%;-moz-transform-origin:0% 0%;-o-transform-origin:0% 0%;-ms-transform-origin:0% 0%;transform-origin:0% 0%}.react-selectize.material.dropdown-menu-wrapper .dropdown-menu.custom-enter-active,.react-selectize.material.dropdown-menu-wrapper .dropdown-menu.custom-leave-active{-webkit-transition:-webkit-transform 250ms cubic-bezier(0.23, 1, 0.32, 1) 0ms, opacity 250ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;-moz-transition:-moz-transform 250ms cubic-bezier(0.23, 1, 0.32, 1) 0ms, opacity 250ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;-o-transition:-o-transform 250ms cubic-bezier(0.23, 1, 0.32, 1) 0ms, opacity 250ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;-ms-transition:-ms-transform 250ms cubic-bezier(0.23, 1, 0.32, 1) 0ms, opacity 250ms cubic-bezier(0.23, 1, 0.32, 1) 0ms;transition:transform 250ms cubic-bezier(0.23, 1, 0.32, 1) 0ms, opacity 250ms cubic-bezier(0.23, 1, 0.32, 1) 0ms}.react-selectize.material.dropdown-menu-wrapper .dropdown-menu.custom-enter{opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";filter:alpha(opacity=0);-webkit-transform:scale(0,0);-moz-transform:scale(0,0);-o-transform:scale(0,0);-ms-transform:scale(0,0);transform:scale(0,0)}.react-selectize.material.dropdown-menu-wrapper .dropdown-menu.custom-enter-active{opacity:1;-ms-filter:none;filter:none;-webkit-transform:scale(1,1);-moz-transform:scale(1,1);-o-transform:scale(1,1);-ms-transform:scale(1,1);transform:scale(1,1)}.react-selectize.material.dropdown-menu-wrapper .dropdown-menu.custom-leave{opacity:1;-ms-filter:none;filter:none;-webkit-transform:scale(1,1);-moz-transform:scale(1,1);-o-transform:scale(1,1);-ms-transform:scale(1,1);transform:scale(1,1)}.react-selectize.material.dropdown-menu-wrapper .dropdown-menu.custom-leave-active{opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";filter:alpha(opacity=0)}.react-selectize.material.dropdown-menu{background-color:#fff;-webkit-border-radius:2px;border-radius:2px;-webkit-box-shadow:rgba(0,0,0,0.118) 0 1px 6px,rgba(0,0,0,0.118) 0 1px 4px;box-shadow:rgba(0,0,0,0.118) 0 1px 6px,rgba(0,0,0,0.118) 0 1px 4px;max-height:250px;padding:8px 0;}.react-selectize.material.dropdown-menu.flipped{margin-bottom:8px}.react-selectize.material.dropdown-menu:not(.flipped){margin-top:8px}.react-selectize.material.dropdown-menu .no-results-found{font-style:oblique;font-size:16px;height:32px;padding:0 16px;display:-webkit-box;display:-moz-box;display:-webkit-flex;display:-ms-flexbox;display:box;display:flex;-webkit-box-align:center;-moz-box-align:center;-o-box-align:center;-ms-flex-align:center;-webkit-align-items:center;align-items:center}.react-selectize.material.dropdown-menu .groups:not(.as-columns) > div:not(:last-child){border-bottom:1px solid #e5e5e5}.react-selectize.material.dropdown-menu .simple-group-title{color:#8f8f8f;display:-webkit-box;display:-moz-box;display:-webkit-flex;display:-ms-flexbox;display:box;display:flex;-webkit-box-align:center;-moz-box-align:center;-o-box-align:center;-ms-flex-align:center;-webkit-align-items:center;align-items:center;font-size:14px;height:48px;padding:0 10px}.react-selectize.material.dropdown-menu .option-wrapper.highlight{background-color:rgba(0,0,0,0.098)}.react-selectize.material.dropdown-menu .option-wrapper .simple-option{color:rgba(0,0,0,0.875);cursor:pointer;display:-webkit-box;display:-moz-box;display:-webkit-flex;display:-ms-flexbox;display:box;display:flex;-webkit-box-orient:vertical;-moz-box-orient:vertical;-o-box-orient:vertical;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:start;-moz-box-align:start;-o-box-align:start;-ms-flex-align:start;-webkit-align-items:flex-start;align-items:flex-start;-webkit-box-pack:center;-moz-box-pack:center;-o-box-pack:center;-ms-flex-pack:center;-webkit-justify-content:center;justify-content:center;font-size:16px;height:48px;padding:0 16px;}.react-selectize.material.dropdown-menu .option-wrapper .simple-option.not-selectable{background-color:#f8f8f8;color:#999;cursor:default;font-style:oblique;text-shadow:0 1px 0 #fff}.multi-select.react-selectize.material.root-node .simple-value span{padding:0;}.multi-select.react-selectize.material.root-node .simple-value span:after{content:","}.simple-select.react-selectize.material.root-node .simple-value{margin:4px 3px 3px 2px}
\ No newline at end of file
diff --git a/data/interfaces/default/css/tautulli-dataTables.css b/data/interfaces/default/css/tautulli-dataTables.css
deleted file mode 100644
index 248a7de8..00000000
--- a/data/interfaces/default/css/tautulli-dataTables.css
+++ /dev/null
@@ -1,419 +0,0 @@
-/*
- *  File:         demo_table.css
- *  CVS:          $Id$
- *  Description:  CSS descriptions for DataTables demo pages
- *  Author:       Allan Jardine
- *  Created:      Tue May 12 06:47:22 BST 2009
- *  Modified:     $Date$ by $Author$
- *  Language:     CSS
- *  Project:      DataTables
- *
- *  Copyright 2009 Allan Jardine. All Rights Reserved.
- *
- * ***************************************************************************
- * DESCRIPTION
- *
- * The styles given here are suitable for the demos that are used with the standard DataTables
- * distribution (see www.datatables.net). You will most likely wish to modify these styles to
- * meet the layout requirements of your site.
- *
- * Common issues:
- *   'full_numbers' pagination - I use an extra selector on the body tag to ensure that there is
- *     no conflict between the two pagination types. If you want to use full_numbers pagination
- *     ensure that you either have "example_alt_pagination" as a body class name, or better yet,
- *     modify that selector.
- *   Note that the path used for Images is relative. All images are by default located in
- *     ../images/ - relative to this CSS file.
- */
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * DataTables display
- */
-table.display {
-	margin: 0 auto;
-	clear: both;
-	width: 100%;
-	font-size: 12px;
-	line-height: 25px;
-	/* Note Firefox 3.5 and before have a bug with border-collapse
-	 * ( https://bugzilla.mozilla.org/show%5Fbug.cgi?id=155955 )
-	 * border-spacing: 0; is one possible option. Conditional-css.com is
-	 * useful for this kind of thing
-	 *
-	 * Further note IE 6/7 has problems when calculating widths with border width.
-	 * It subtracts one px relative to the other browsers from the first column, and
-	 * adds one to the end...
-	 *
-	 * If you want that effect I'd suggest setting a border-top/left on th/td's and
-	 * then filling in the gaps with other borders.
-	 */
-}
-table.display thead th {
-	white-space:nowrap;
-	padding: 0px 0px 0px 5px;
-	cursor: pointer;
-	color: #999;
-	background-color: #212121;
-	font-size: 11px;
-}
-table.display thead th i {
-	margin-top: -1px;
-}
-table.display thead .sorting,
-table.display thead .sorting_asc,
-table.display thead .sorting_desc {
-	cursor: pointer;
-	*cursor: hand;
-	height: 35px;
-}
-table.display thead .sorting,
-table.display thead .sorting_asc,
-table.display thead .sorting_desc,
-table.display thead .sorting_asc_disabled,
-table.display thead .sorting_desc_disabled {
-	background-repeat: no-repeat;
-	background-position: left;
-}
-table.display tfoot th {
-	padding: 3px 18px 3px 10px;
-	border-top: 1px solid black;
-	font-weight: bold;
-}
-table.display tr.heading2 td {
-	border-bottom: 1px solid #aaa;
-}
-table.display td {
-	padding: 5px 0 5px 5px;
-}
-table.display td.title {
-	padding: 5px;
-	white-space: normal;
-	min-width: 400px;
-}
-table.display td.center {
-	text-align: center;
-}
-table.display tr:hover {
-	background-color: rgba(255,255,255,0.075);
-}
-table.display tr:hover a {
-	text-decoration:none;
-}
-table.display td:hover a {
-	color: #E5A00D;
-}
-table.display thead tr:hover {
-	background-color: #212121;
-}
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * DataTables row classes
- */
-table.display tr.odd.gradeA {
-	background-color: #ddffdd;
-}
-table.display tr.even.gradeA {
-	background-color: #eeffee;
-}
-table.display tr.odd.gradeC {
-	background-color: #ddddff;
-}
-table.display tr.even.gradeC {
-	background-color: #eeeeff;
-}
-table.display tr.odd.gradeX {
-	background-color: #ffdddd;
-}
-table.display tr.even.gradeX {
-	background-color: #ffeeee;
-}
-table.display tr.odd.gradeU {
-	background-color: #ddd;
-}
-table.display tr.even.gradeU {
-	background-color: #eee;
-}
-tr.odd {
-	border-top: 0px solid #343434;
-	border-bottom: 0px solid #343434;
-	background-color: rgba(255,255,255,0.010);
-}
-tr.even {
-	border-top: 0px solid #343434;
-	border-bottom: 0px solid #343434;
-	background-color: rgba(255,255,255,0.035);
-}
-
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * Misc
- */
-.dataTables_scroll {
-	clear: both;
-}
-.dataTables_scrollBody {
-	*margin-top: -1px;
-	-webkit-overflow-scrolling: touch;
-}
-tfoot input {
-	margin: 0.5em 0;
-	width: 100%;
-	color: #444;
-}
-tfoot input.search_init {
-	color: #999;
-}
-td.group {
-	background-color: #d1cfd0;
-	border-bottom: 2px solid #A19B9E;
-	border-top: 2px solid #A19B9E;
-}
-td.details {
-	background-color: #d1cfd0;
-	border: 2px solid #A19B9E;
-}
-table.display tr.even.row_selected td {
-	background-color: #B0BED9;
-}
-table.display tr.odd.row_selected td {
-	background-color: #9FAFD1;
-}
-.dataTables_empty {
-	text-align: center;
-}
-/* For the Conditional-CSS grading rows */
-/*
- 	Colour calculations (based off the main row colours)
-  Level 1:
-		dd > c4
-		ee > d5
-	Level 2:
-	  dd > d1
-	  ee > e2
- */
-tr.odd.gradeA td.sorting_1 {
-	background-color: #c4ffc4;
-}
-tr.odd.gradeA td.sorting_2 {
-	background-color: #d1ffd1;
-}
-tr.odd.gradeA td.sorting_3 {
-	background-color: #d1ffd1;
-}
-tr.even.gradeA td.sorting_1 {
-	background-color: #d5ffd5;
-}
-tr.even.gradeA td.sorting_2 {
-	background-color: #e2ffe2;
-}
-tr.even.gradeA td.sorting_3 {
-	background-color: #e2ffe2;
-}
-tr.odd.gradeC td.sorting_1 {
-	background-color: #c4c4ff;
-}
-tr.odd.gradeC td.sorting_2 {
-	background-color: #d1d1ff;
-}
-tr.odd.gradeC td.sorting_3 {
-	background-color: #d1d1ff;
-}
-tr.even.gradeC td.sorting_1 {
-	background-color: #d5d5ff;
-}
-tr.even.gradeC td.sorting_2 {
-	background-color: #e2e2ff;
-}
-tr.even.gradeC td.sorting_3 {
-	background-color: #e2e2ff;
-}
-tr.odd.gradeX td.sorting_1 {
-	background-color: #ffc4c4;
-}
-tr.odd.gradeX td.sorting_2 {
-	background-color: #ffd1d1;
-}
-tr.odd.gradeX td.sorting_3 {
-	background-color: #ffd1d1;
-}
-tr.even.gradeX td.sorting_1 {
-	background-color: #ffd5d5;
-}
-tr.even.gradeX td.sorting_2 {
-	background-color: #ffe2e2;
-}
-tr.even.gradeX td.sorting_3 {
-	background-color: #ffe2e2;
-}
-tr.odd.gradeU td.sorting_1 {
-	background-color: #c4c4c4;
-}
-tr.odd.gradeU td.sorting_2 {
-	background-color: #d1d1d1;
-}
-tr.odd.gradeU td.sorting_3 {
-	background-color: #d1d1d1;
-}
-tr.even.gradeU td.sorting_1 {
-	background-color: #d5d5d5;
-}
-tr.even.gradeU td.sorting_2 {
-	background-color: #e2e2e2;
-}
-tr.even.gradeU td.sorting_3 {
-	background-color: #e2e2e2;
-}
-
-
-/*
- * Row highlighting example
- */
-.ex_highlight #example tbody tr.even:hover, #example tbody tr.even td.highlighted {
-	background-color: #ECFFB3;
-}
-.ex_highlight #example tbody tr.odd:hover, #example tbody tr.odd td.highlighted {
-	background-color: #E6FF99;
-}
-.ex_highlight_row #example tr.even:hover {
-	background-color: #ECFFB3;
-}
-.ex_highlight_row #example tr.even:hover td.sorting_1 {
-	background-color: #DDFF75;
-}
-.ex_highlight_row #example tr.even:hover td.sorting_2 {
-	background-color: #E7FF9E;
-}
-.ex_highlight_row #example tr.even:hover td.sorting_3 {
-	background-color: #E2FF89;
-}
-.ex_highlight_row #example tr.odd:hover {
-	background-color: #E6FF99;
-}
-.ex_highlight_row #example tr.odd:hover td.sorting_1 {
-	background-color: #D6FF5C;
-}
-.ex_highlight_row #example tr.odd:hover td.sorting_2 {
-	background-color: #E0FF84;
-}
-.ex_highlight_row #example tr.odd:hover td.sorting_3 {
-	background-color: #DBFF70;
-}
-
-
-/*
- * KeyTable
- */
-table.KeyTable td {
-	border: 3px solid transparent;
-}
-table.KeyTable td.focus {
-	border: 3px solid #3366FF;
-}
-table.display tr.gradeA {
-	background-color: #eeffee;
-}
-table.display tr.gradeC {
-	background-color: #ddddff;
-}
-table.display tr.gradeX {
-	background-color: #ffdddd;
-}
-table.display tr.gradeU {
-	background-color: #ddd;
-}
-div.box {
-	height: 100px;
-	padding: 10px;
-	overflow: auto;
-	border: 1px solid #8080FF;
-	background-color: #E5E5FF;
-}
-td.no-wrap, th.no-wrap {
-	white-space:nowrap;
-}
-
-
-
-/*
- * Custom styles
- */
-
-table.display,
-table.display tr.shown + tr table[id^='history_child'],
-table.display tr.shown + tr table[id^='media_info_child'],
-table.display tr.shown + tr table[id^='media_info_child'] tr.shown + tr table[id^='media_info_child'] {
-    table-layout: auto;
-}
-table.display tr.shown + tr div.slider {
-    display: none;
-}
-table.display tr.shown + tr > td {
-    padding-top: 0;
-    padding-bottom: 0;
-    padding-left: 0;
-}
-table.display tr.shown + tr:hover {
-    background-color: rgba(255,255,255,0);
-}
-table.display tr.shown + tr:hover a,
-table.display tr.shown + tr td:hover a,
-table.display tr.shown + tr td:hover a .fa,
-table.display tr.shown + tr .pagination > .active > a,
-table.display tr.shown + tr .pagination > .active > a:hover {
-    color: #fff;
-}
-table.display tr.shown + tr table[id^='history_child'] td:hover a, 
-table.display tr.shown + tr table[id^='history_child'] td:hover a .fa,
-table.display tr.shown + tr table[id^='media_info_child'] > tr > td:hover a,
-table.display tr.shown + tr table[id^='media_info_child'] tr.shown + tr table[id^='media_info_child'] td:hover a {
-    color: #cc7b19;
-}
-table.display tr.shown + tr .pagination > .disabled > a,
-table.display tr.shown + tr .pagination > .disabled > a:hover {
-    color: #444444;
-}
-table.display tr.shown + tr .pagination > li > a:hover {
-    color: #e9a049;
-}
-table.display tr.odd td,
-table.display tr.even td {
-    padding: 5px 10px !important;
-}
-table[id^='history_child'] {
-    margin-top: 0;
-    opacity: .6;
-}
-table[id^='media_info_child'] {
-    margin-top: 0;
-}
-div[id^='history_child'] thead th,
-div[id^='media_info_child'] thead th {
-    line-height: 0;
-    height: 0 !important;
-    overflow: hidden;
-}
-div[id^='history_child'] div.row,
-div[id^='media_info_child'] div.row {
-    margin: 0;
-}
-div[id^='history_child'] div.col-sm-12,
-div[id^='media_info_child'] div.col-sm-12 {
-    padding: 0;
-}
-div[id^='history_child'] div.dataTables_scrollBody,
-div[id^='media_info_child'] div.dataTables_scrollBody {
-    overflow: hidden !important;
-}
-div[id^='media_info_child'] div[id^='media_info_child'] div.dataTables_scrollHead thead th {
-    line-height: 25px;
-    height: 35px !important;
-    overflow: hidden;
-}
-.current-activity-row {
-    background-color: rgba(255,255,255,.1) !important;
-}
-.current-activity-row:hover {
-    background-color: rgba(255,255,255,0.125) !important;
-}
diff --git a/data/interfaces/default/css/tautulli.css b/data/interfaces/default/css/tautulli.css
deleted file mode 100644
index ceb9b91c..00000000
--- a/data/interfaces/default/css/tautulli.css
+++ /dev/null
@@ -1,4613 +0,0 @@
-body {
-    font-family: 'Open Sans', Arial, sans-serif;
-    color: #eee;
-    margin-top: 50px;
-    overflow: hidden;
-}
-a {
-    color: #eee;
-}
-a:hover,
-a:focus {
-    color: #e9a049;
-    text-decoration: none;
-    outline: none;
-}
-select, .react-selectize.bootstrap3.root-node .react-selectize-control {
-    margin: 5px 0 5px 0;
-    border: 2px solid #444;
-    background: #333;
-    -webkit-border-radius: 2px;
-    -moz-border-radius: 2px;
-    border-radius: 2px;
-    color: #999;
-    outline: none;
-}
-select.input-sm {
-    margin: 5px 0 5px 0;
-    border: 2px solid #444;
-    background: #333;
-    -webkit-border-radius: 2px;
-    -moz-border-radius: 2px;
-    border-radius: 2px;
-    color: #999;
-    outline: none;
-}
-select[multiple] {
-    height: 125px;
-    margin: 5px 0 5px 0;
-    color: #eee;
-    border: 0px solid #444;
-    background: #555;
-    padding: 2px 2px;
-    background-color: #555;
-    border-radius: 3px;
-    transition: background-color .3s;
-}
-select[multiple]:focus {
-    outline: 0;
-    outline: thin dotted \9;
-    color: #555;
-    background-color: #eee;
-    transition: background-color .3s;
-}
-select[multiple]:focus::-webkit-scrollbar-thumb {
-    background-color: rgba(0,0,0,.15);
-}
-select[multiple] option {
-    padding: 6px 10px;
-    -webkit-border-radius: 2px;
-    -moz-border-radius: 2px;
-    border-radius: 2px;
-}
-select.form-control,
-div.form-control .selectize-input {
-    margin: 5px 0 5px 0;
-    color: #eee;
-    border: 0px solid #444;
-    background: #555;
-    padding: 6px 12px;
-    background-color: #555;
-    border-radius: 3px;
-    transition: background-color .3s;
-}
-select.form-control {
-    height: 32px !important;
-}
-.react-selectize.root-node .react-selectize-control,
-.selectize-control.form-control .selectize-input {
-    color: #eee !important;
-    border: 0px solid #444 !important;
-    background: #555 !important;
-    transition: background-color .3s;
-}
-.selectize-control.form-control .selectize-input {
-    display: flex !important;
-    align-items: center;
-    flex-wrap: wrap;
-    margin-bottom: 4px;
-}
-.selectize-control.form-control.selectize-pms-ip .selectize-input {
-    padding-left: 12px !important;
-    border-top-left-radius: 3px;
-    border-bottom-left-radius: 3px;
-    min-height: 32px !important;
-    height: 32px !important;
-}
-.input-group .selectize-control.form-control.selectize-pms-ip .selectize-input > div {
-    max-width: 450px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-.wizard-input-section p.welcome-message {
-    margin: 20px 0;
-}
-.wizard-input-section .selectize-control.form-control.selectize-pms-ip .selectize-input > div {
-    max-width: 360px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-#selectize-pms-ip-container .selectize-dropdown.form-control.selectize-pms-ip {
-    margin-left: 15px;
-}
-.wizard-input-section .selectize-control.form-control.selectize-pms-ip .selectize-dropdown .selectize-dropdown-content {
-    max-height: 150px;
-}
-.wizard-input-section .selectize-dropdown.form-control.selectize-pms-ip {
-    margin-top: 0 !important;
-}
-#condition-widget .fa-plus,
-#condition-widget .fa-minus {
-    cursor: pointer;
-}
-#condition-widget .condition-operator-col {
-    padding-left: 0;
-    padding-right: 0;
-}
-@media (max-width: 767px) {
-    #condition-widget .condition-operator-col {
-        padding-left: 15px;
-        padding-right: 15px;
-    }
-}
-.react-selectize.root-node .react-selectize-control .react-selectize-placeholder {
-    color: #eee !important;
-}
-.react-selectize.root-node .react-selectize-control .react-selectize-toggle-button path {
-    fill: #eee !important;
-}
-.react-selectize.root-node .simple-value,
-.selectize-control.multi .selectize-input > div {
-    background: #444 !important;
-    color: #eee !important;
-    padding-bottom: 2px !important;
-    transition: background-color .3s;
-}
-.react-selectize.root-node .simple-value span,
-.selectize-control.multi .selectize-input > div {
-    padding-bottom: 2px !important;
-    padding-left: 5px !important;
-}
-.react-selectize.root-node .react-selectize-control .react-selectize-search-field-and-selected-values .value-wrapper:not(:first-child):before {
-    content: "or";
-    padding: 0 3px;
-    text-transform: uppercase;
-    font-size: 10px;
-}
-.react-selectize.root-node .react-selectize-control .react-selectize-search-field-and-selected-values .resizable-input {
-    padding-top: 3px !important;
-    padding-bottom: 3px !important;
-}
-select.form-control:focus,
-.react-selectize.root-node.open .react-selectize-control,
-.selectize-control.form-control .selectize-input.focus {
-    outline: 0;
-    outline: thin dotted \9;
-    color: #555 !important;
-    background-color: #eee !important;
-    transition: background-color .3s;
-}
-.react-selectize.root-node.open .simple-value,
-.selectize-control.multi .selectize-input.focus > div,
-.selectize-control.multi .selectize-input > div.active {
-    background: #efefef !important;
-    color: #333333 !important;
-    transition: background-color .3s;
-}
-.react-selectize.root-node.open .react-selectize-control .react-selectize-toggle-button path {
-    fill: #999 !important;
-}
-.selectize-input > div .item-text {
-    white-space: nowrap;
-}
-.selectize-input > div .item-value {
-    opacity: 0.8;
-    font-size: 12px;
-    white-space: nowrap;
-}
-.selectize-input > div .item-text + .item-value {
-    margin-left: 5px;
-}
-.selectize-input > div .item-value:before {
-    content: '<';
-    opacity: 0.8;
-    font-size: 12px;
-}
-.selectize-input > div .item-value:after {
-    content: '>';
-    opacity: 0.8;
-    font-size: 12px;
-}
-.selectize-dropdown .caption {
-    font-size: 12px;
-    display: block;
-    color: #a0a0a0;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-.selectize-dropdown .select-all,
-.selectize-dropdown .remove-all {
-    font-weight: bold;
-}
-.selectize-dropdown .border-all {
-    pointer-events: none;
-    display: block;
-    height: 1px;
-    margin: 9px -12px 9px -12px;
-    padding: 0 !important;
-    overflow: hidden;
-    background-color: #e5e5e5;
-}
-.selectize-dropdown .border-all:last-child {
-    display: none;
-}
-.selectize-dropdown .optgroup-header {
-    font-weight: bold;
-}
-.selectize-dropdown [data-selectable].option-disabled {
-  color: #aaa;
-  cursor: default;
-}
-select.form-control option {
-    color: #555;
-    background-color: #eee;
-}
-select.btn {
-    text-align: left;
-}
-img {
-    -webkit-box-sizing: content-box;
-    -moz-box-sizing: content-box;
-    box-sizing: content-box;
-}
-object {
-    pointer-events: none;
-}
-.navbar {
-    background: #000;
-    -webkit-box-shadow: 0 0 0 3px rgba(0,0,0,.2);
-    -moz-box-shadow: 0 0 0 3px rgba(0,0,0,.2);
-    box-shadow: 0 0 0 3px rgba(0,0,0,.2);
-}
-.navbar-brand {
-    padding: 3px 3px;
-}
-.nav > li > a {
-    color: #999;
-    -webkit-transition: all 0.3s ease;
-    -o-transition: all 0.3s ease;
-    transition: all 0.3s ease;
-}
-.nav > li > a:hover,
-.nav > li > a:focus {
-    text-decoration: none;
-    background-color: #282828;
-    color: #eee;
-}
-.nav > li.active > a,
-.nav > li.active > a:hover,
-.nav > li.active > a:focus {
-    color: #f9be03;
-    background-color: #282828;
-}
-.navbar-toggle {
-    background-color: #282828;
-}
-.navbar-toggle:hover,
-.navbar-toggle:focus {
-    background-color: #2f2f2f;
-}
-.nav .open > a, .nav .open > a:hover, .nav .open > a:focus {
-    background-color: #2f2f2f;
-    border-color: unset;
-}
-.dropdown-menu {
-  background-color: #282828;
-}
-.dropdown-menu .divider {
-  background-color: #777;
-}
-.dropdown-menu > li > a {
-  color: #999;
-}
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus {
-  color: #eee;
-  background-color: #2f2f2f;
-}
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover,
-.dropdown-menu > .active > a:focus {
-  color: #eee;
-  background-color: #2f2f2f;
-}
-.dropdown-menu > .disabled > a,
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
-  color: #999;
-}
-.icon-bar {
-    background-color: #999;
-}
-.padded-header {
-    margin: 25px 0 25px 0;
-}
-.padded-header h1,h2,h3,h4,h5,h6 {
-    color: #eee;
-}
-.padded-header h3 {
-    font-size: 16px;
-    font-weight: bold;
-    text-transform: uppercase;
-}
-.padded-header h3 small {
-    font-size: 13px;
-    text-transform: none;
-}
-.btn {
-    outline:0px !important;
-}
-.btn:not(select) {
-    -webkit-appearance:none;
-}
-.btn-dark {
-    color: #d7d7d7;
-    background-color: #3B3B3B;
-    border-color: transparent;
-}
-.btn-dark:focus,
-.btn-dark.focus {
-    color: #d7d7d7;
-    background-color: #3B3B3B;
-}
-.btn-dark:hover {
-    color: #eee;
-    background-color: #333;
-    border-color: #444;
-}
-.btn-dark:active,
-.btn-dark.active,
-.open > .dropdown-toggle.btn-dark {
-    color: #eee;
-    background-color: #333;
-    border-color: #444;
-}
-.btn-dark:active:hover,
-.btn-dark.active:hover,
-.open > .dropdown-toggle.btn-dark:hover,
-.btn-dark:active:focus,
-.btn-dark.active:focus,
-.open > .dropdown-toggle.btn-dark:focus,
-.btn-dark:active.focus,
-.btn-dark.active.focus,
-.open > .dropdown-toggle.btn-dark.focus {
-    color: #eee;
-    background-color: #333;
-}
-.btn-dark:active,
-.btn-dark.active,
-.open > .dropdown-toggle.btn-dark {
-    background-image: none;
-}
-.btn-dark.disabled,
-.btn-dark[disabled],
-fieldset[disabled] .btn-dark,
-.btn-dark.disabled:hover,
-.btn-dark[disabled]:hover,
-fieldset[disabled] .btn-dark:hover,
-.btn-dark.disabled:focus,
-.btn-dark[disabled]:focus,
-fieldset[disabled] .btn-dark:focus,
-.btn-dark.disabled.focus,
-.btn-dark[disabled].focus,
-fieldset[disabled] .btn-dark.focus,
-.btn-dark.disabled:active,
-.btn-dark[disabled]:active,
-fieldset[disabled] .btn-dark:active,
-.btn-dark.disabled.active,
-.btn-dark[disabled].active,
-fieldset[disabled] .btn-dark.active {
-    background-color: #333;
-    color: #aaa;
-}
-.btn-dark.inactive:hover {
-    color: #d7d7d7;
-    background-color: #3B3B3B;
-    border-color: transparent;
-    cursor: default;
-}
-.btn-dark .badge {
-    color: #e5e5e5;
-    background-color: #3B3B3B;
-}
-.btn-bright {
-    color: #eee;
-    background-color: #cc7b19;
-    box-shadow: inset 0 1px 0 #e7993b;
-}
-.btn-bright:focus,
-.btn-bright.focus {
-    color: #eee;
-    background-color: #eb8600;
-}
-.btn-bright:hover {
-    color: #eee;
-    background-color: #e59029;
-    box-shadow: inset 0 1px 0 #ebac60;
-}
-.btn-bright:active,
-.btn-bright.active,
-.open > .dropdown-toggle.btn-bright {
-    color: #eee;
-    background-color: #cc7b19;
-    box-shadow: inset 0 1px 0 #e7993b;
-}
-.btn-bright:active:hover,
-.btn-bright.active:hover,
-.open > .dropdown-toggle.btn-bright:hover,
-.btn-bright:active:focus,
-.btn-bright.active:focus,
-.open > .dropdown-toggle.btn-bright:focus,
-.btn-bright:active.focus,
-.btn-bright.active.focus,
-.open > .dropdown-toggle.btn-bright.focus {
-    color: #eee;
-    background-color: #cc7b19;
-    box-shadow: inset 0 1px 0 #e7993b;
-}
-.btn-bright:active,
-.btn-bright.active,
-.open > .dropdown-toggle.btn-bright {
-    background-image: none;
-}
-.btn-bright.disabled,
-.btn-bright[disabled],
-fieldset[disabled] .btn-bright,
-.btn-bright.disabled:hover,
-.btn-bright[disabled]:hover,
-fieldset[disabled] .btn-bright:hover,
-.btn-bright.disabled:focus,
-.btn-bright[disabled]:focus,
-fieldset[disabled] .btn-bright:focus,
-.btn-bright.disabled.focus,
-.btn-bright[disabled].focus,
-fieldset[disabled] .btn-bright.focus,
-.btn-bright.disabled:active,
-.btn-bright[disabled]:active,
-fieldset[disabled] .btn-bright:active,
-.btn-bright.disabled.active,
-.btn-bright[disabled].active,
-fieldset[disabled] .btn-bright.active {
-    background-color: #cc7b19;
-    border-color: #b56d16;
-}
-.btn-bright .badge {
-    color: #eee;
-    background-color: #cc7b19;
-    box-shadow: inset 0 1px 0 #e7993b;
-}
-.btn-danger.btn-edit {
-    color: #d7d7d7;
-    background-color: #3B3B3B;
-    border-color: transparent;
-    float: right;
-}
-.btn-danger.btn-edit:hover {
-    color: #eee;
-    background-color: #c9302c;
-    border-color: #ac2925;
-}
-.btn-danger.btn-edit.active {
-    color: #eee;
-    background-color: #c9302c;
-    border-color: #ac2925;
-}
-.btn-danger.btn-edit.active:hover {
-    color: #eee;
-    background-color: #ac2925;
-    border-color: #761c19;
-}
-.btn-group select {
-    margin-top: 0;
-    height: 34px;
-}
-.btn-group label {
-    margin-bottom: 0;
-}
-.input-group-addon-form {
-    display: inline-block;
-    line-height: 1.42857143;
-    color: #e5e5e5;
-    background-color: #3B3B3B;
-    border: 1px solid transparent;
-    border-top-right-radius: 3px !important;
-    border-bottom-right-radius: 3px !important;
-    height: 32px;
-    width: 100%;
-    margin-top: 5px;
-}
-.alert-edit {
-    display: none;
-    float: left;
-    margin-bottom: 0;
-    /*margin-right: 5px;*/
-    padding: 6px 15px;
-}
-.modal-header {
-    padding: 15px 20px;
-    background-color: #323232;
-    border-radius: 3px 3px 0 0;
-    border-bottom: 1px solid #1C1C1C;
-}
-.modal-body {
-    position: relative;
-    overflow-y: auto;
-    max-height: 600px;
-    padding: 15px;
-    background-color: #222222;
-}
-.modal-body table {
-    color: #eee;
-}
-.modal-body li {
-    margin-top: 7px;
-    margin-left: 4px;
-    color: #aaa;
-}
-.modal-body li strong {
-    color: #eee;
-}
-.modal-body i {
-    color: #E5A00D;
-}
-.modal-body i.fa {
-    color: #eee;
-}
-.modal-body td:hover a .fa,
-.modal-body a:focus i.fa {
-    color: #f9aa03;
-}
-.modal-body strong,
-.modal-body strong i.fa {
-    color: #E5A00D;
-}
-.modal-footer {
-    padding: 15px 20px;
-    margin-top: 0;
-    background-color: #323232;
-    border-radius: 0 0 3px 3px;
-    border-top: 1px solid #1C1C1C;
-}
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.uneditable-input {
-    margin: 5px 0 5px 0;
-    color: #eee;
-    border: 0px solid #444;
-    background: #555;
-    height: 32px;
-    padding: 6px 12px;
-    background-color: #555;
-    border-radius: 3px;
-    transition: background-color .3s;
-}
-textarea.form-control {
-    height: initial;
-    margin: 5px 0 5px 0;
-    color: #eee;
-    border: 0px solid #444;
-    background: #555;
-    padding: 6px 12px;
-    background-color: #555;
-    border-radius: 3px;
-    transition: background-color .3s;
-    resize: none;
-}
-textarea.form-control:focus {
-    outline: 0;
-    color: #555;
-    background-color: #eee;
-    transition: background-color .3s;
-}
-.pagination > li > a,
-.pagination > li > span {
-    position: relative;
-    float: left;
-    padding: 6px 12px;
-    margin-left: -1px;
-    line-height: 1.42857143;
-    color: #eee;
-    text-decoration: none;
-    background-color: #262626;
-    border: 1px solid #444444;
-}
-.pagination > li > a:hover,
-.pagination > li > span:hover,
-.pagination > li > a:focus,
-.pagination > li > span:focus {
-    background-color: #cc7b19;
-    border: 1px solid #444444;
-}
-.pagination > .active > a,
-.pagination > .active > span,
-.pagination > .active > a:hover,
-.pagination > .active > span:hover,
-.pagination > .active > a:focus,
-.pagination > .active > span:focus {
-    z-index: 2;
-    color: #eee;
-    cursor: default;
-    background-color: #cc7b19;
-    border-color: #444444;
-}
-.pagination > .disabled > span,
-.pagination > .disabled > span:hover,
-.pagination > .disabled > span:focus,
-.pagination > .disabled > a,
-.pagination > .disabled > a:hover,
-.pagination > .disabled > a:focus {
-    color: #444444;
-    cursor: not-allowed;
-    background-color: #262626;
-    border-color: #444444;
-}
-.nav-pills > li.active > a,
-.nav-pills > li.active > a:hover,
-.nav-pills > li.active > a:focus {
-    color: #eee;
-    background-color: #cc7b19;
-}
-.nav-pills > li > a {
-    border-radius: 3px;
-    padding: 5px 10px;
-    margin: 0 0 20px 0;
-}
-.btn-form {
-    padding: 4px 12px;
-    margin: 5px 0 5px 0;
-    font-size: 14px;
-    font-weight: normal;
-    height: 32px;
-    line-height: 1.42857143;
-    text-align: center;
-    white-space: nowrap;
-    vertical-align: middle;
-    -ms-touch-action: manipulation;
-    touch-action: manipulation;
-    cursor: pointer;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-    background-image: none;
-    background-color: #3B3B3B;
-    color: #e5e5e5;
-    border: 1px solid transparent;
-    border-radius: 3px;
-    outline:0px !important;
-    -webkit-appearance:none;
-}
-.btn-form:hover {
-    color: #eee;
-    background-color: #333;
-}
-.btn-form:focus {
-    color: #eee;
-}
-.btn-filter.active,
-.btn-filter.active.focus {
-    background-color: #b7800a !important;
-}
-.btn-filter.active:hover {
-    background-color: #896007 !important;
-}
-.form-control-feedback {
-    color: #E5A00D;
-    margin: 5px 40px 5px 0;
-}
-.form-control[disabled],
-.form-control[readonly],
-fieldset[disabled] .form-control {
-    background-color: #555;
-}
-.form-control[readonly]:focus {
-    background-color: #eee;
-}
-.poster {
-    position: relative;
-    height: 225px;
-}
-.poster-face {
-    background-position: center;
-    background-size: cover;
-    height: 225px;
-    width: 150px;
-    position: relative;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    overflow: hidden;
-}
-.cover-face {
-    background-position: center;
-    background-size: cover;
-    height: 150px;
-    width: 150px;
-    position: absolute;
-    bottom: 0;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-}
-.users-poster-face {
-    float: left;
-    background-size: cover;
-    background-position: center;
-    height: 40px;
-    width: 40px;
-    -webkit-border-radius: 50%;
-    -moz-border-radius: 50%;
-    border-radius: 50%;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-}
-.libraries-poster-face {
-    overflow: hidden;
-    float: left;
-    background-size: cover;
-    background-position: center;
-    height: 40px;
-    width: 40px;
-    /*-webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);*/
-}
-a .poster-face:hover,
-a .cover-face:hover,
-a .users-poster-face:hover {
-    -webkit-box-shadow: inset 0 0 0 2px #e9a049;
-    -moz-box-shadow: inset 0 0 0 2px #e9a049;
-    box-shadow: inset 0 0 0 2px #e9a049;
-}
-.users-name {
-    position: relative;
-}
-#dashboard-checking-activity,
-#dashboard-no-activity,
-#dashboard-checking-recently-added,
-#dashboard-no-recently-added {
-    margin-bottom: 20px;
-}
-.dashboard-activity-instance {
-    float: left;
-    position: relative;
-    height: 290px;
-    max-width: 500px;
-    margin-left: 25px;
-    margin-bottom: 25px;
-}
-.dashboard-activity-container {
-    height: 240px;
-    width: 100%;
-    position: relative;
-    margin-bottom: 5px;
-    padding: 0px;
-    -webkit-transition: all .2s ease-in-out;
-    transition: all .2s ease-in-out;
-    overflow: hidden;
-}
-.dashboard-activity-background {
-    background-color: #282828;
-    background-position: center;
-    background-size: cover;
-    display: -webkit-flex;
-    display: flex;
-    -webkit-flex-wrap: nowrap;
-    flex-wrap: nowrap;
-    height: 235px;
-    width: 100%;
-    padding: 5px;
-    overflow: hidden;
-    -webkit-transition: background 1s linear;
-    transition: background 1s linear;
-    -webkit-backface-visibility: hidden;
-    backface-visibility: hidden;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3), inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3), inset 0 0 0 1px rgba(255,255,255,.1);
-}
-.dashboard-activity-poster-container {
-    background-color: #282828;
-    height: 225px;
-    width: 150px;
-    margin-right: 5px;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3), inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3), inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3), inset 0 0 0 1px rgba(255,255,255,.1);
-    -webkit-flex-shrink: 0;
-    flex-shrink: 0;
-    z-index: 1;
-}
-.dashboard-activity-poster {
-    background-position: center;
-    background-size: cover;
-    height: 225px;
-    width: 150px;
-    -webkit-transition: background 1s linear;
-    transition: background 1s linear;
-    -webkit-backface-visibility: hidden;
-    backface-visibility: hidden;
-    z-index: 2;
-}
-.dashboard-activity-poster-blur {
-    background-color: #282828;
-    background-position: center;
-    background-size: cover;
-    height: 225px;
-    width: 150px;
-    opacity: 0.60;
-    -webkit-filter: blur(3px);
-    -moz-filter: blur(3px);
-    filter: blur(3px);
-    -webkit-transition: background .2s ease-in-out;
-    transition: background .2s ease-in-out;
-    -webkit-backface-visibility: hidden;
-    backface-visibility: hidden;
-    z-index: 2;
-}
-.dashboard-activity-cover {
-    background-position: center;
-    background-size: cover;
-    height: 150px;
-    width: 150px;
-    margin-top: 37.5px;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3), inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3), inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3), inset 0 0 0 1px rgba(255,255,255,.1);
-    -webkit-transition: background 1s linear;
-    transition: background 1s linear;
-    -webkit-backface-visibility: hidden;
-    backface-visibility: hidden;
-    position: absolute;
-    top: 0;
-    z-index: 3;
-}
-.dashboard-activity-info-icon {
-    width: 50px;
-    height: 50px;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
-    border-radius: 3px;
-    position: absolute;
-    top: 10px;
-    right: 10px;
-    overflow: hidden;
-    z-index: 2;
-}
-.dashboard-activity-info-platform {
-    background-position: center;
-    background-size: cover;
-    width: 50px;
-    height: 50px;
-    opacity: 1;
-    -webkit-transition: all .2s ease-in-out;
-    transition: all .2s ease-in-out;
-}
-.dashboard-activity-info-platform-no-terminate {
-    background-position: center;
-    background-size: cover;
-    width: 50px;
-    height: 50px;
-    opacity: 1;
-    -webkit-transition: all .2s ease-in-out;
-    transition: all .2s ease-in-out;
-}
-.dashboard-activity-terminate-session {
-    width: 100%;
-    height: 100%;
-    font-size: 31px;
-    color: #eee;
-    text-align: center;
-    opacity: 0;
-    position: absolute;
-    top: 0;
-    left: 0;
-    -webkit-transition: all .2s ease-in-out;
-    transition: all .2s ease-in-out;
-}
-.dashboard-activity-terminate-session:hover {
-    color: #e9a049;
-}
-.dashboard-activity-info-container {
-    display: -webkit-flex;
-    display: flex;
-    flex-direction: column;
-    height: 225px;
-    width: 385px;
-    overflow: hidden;
-}
-.dashboard-activity-info-scroller {
-    height: 225px;
-    width: 100%;
-    -webkit-flex-grow: 1;
-    flex-grow: 1;
-    z-index: 1;
-}
-.dashboard-activity-info-scroller.scrollbar-macosx > .scroll-element.scroll-y {
-    left: 10px;
-}
-.dashboard-activity-info-scroller.scrollbar-macosx > .scroll-element .scroll-bar {
-    background-color: #999;
-}
-.dashboard-activity-info {
-    width: 100%;
-    font-size: 12px;
-    padding: 5px 5px 5px 15px;
-    position: relative;
-}
-.dashboard-activity-info-list {
-    margin-bottom: 20px;
-    padding-right: 0;
-}
-.dashboard-activity-info-list:last-of-type {
-    margin-bottom: 0;
-}
-.dashboard-activity-info-item {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-    align-items: baseline;
-    width: 100%;
-    margin-bottom: 5px;
-}
-.dashboard-activity-info-item:last-of-type {
-    margin-bottom: 0;
-}
-.dashboard-activity-info-item .sub-heading {
-    height: 100%;
-    width: 60px;
-    color: #aaa;
-    font-size: 10px;
-    text-align: right;
-    text-transform: uppercase;
-    line-height: 10px;
-    -webkit-flex-shrink: 0;
-    flex-shrink: 0;
-}
-.dashboard-activity-info-item .sub-value {
-    margin-left: 10px;
-    text-align: left;
-    line-height: 14px;
-    -webkit-flex-grow: 1;
-    flex-grow: 1;
-}
-.dashboard-activity-info-item .sub-value.platform-right {
-    margin-right: 55px;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-}
-.dashboard-activity-info-item .sub-value.time-right {
-    margin-right: 60px;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-}
-.dashboard-activity-info-item .sub-value .ip-container {
-    display: inline-flex;
-}
-.dashboard-activity-info-item .sub-value .ip-address {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    max-width: 125px;
-}
-.dashboard-activity-info-time {
-    position: absolute;
-    top: 200px;
-    right: 10px;
-    text-align: right;
-    font-size: 10px;
-    z-index: 2;
-}
-.dashboard-activity-info-channel {
-    display: inline-block;
-    max-width: 75px;
-    text-overflow: ellipsis;
-    overflow: hidden;
-}
-.dashboard-activity-progress {
-    width: 100%;
-    height: 5px;
-    -webkit-transition: all .2s ease-in-out;
-    transition: all .2s ease-in-out;
-	transform-origin: top;
-    overflow: hidden;
-}
-.dashboard-activity-progress-bar {
-    background-color: #111;
-    height: 100%;
-    width: 100%;
-    position: relative;
-    overflow: hidden;
-}
-.dashboard-activity-progress .buffer-bar {
-    padding-right: 3px;
-    font-size: x-small;
-    text-align: right;
-    line-height: 14px;
-    color: rgba(255, 255, 255, 0);
-    background-color: #444;
-    position: absolute;
-    height: 100%;
-    max-width: 100%;
-    overflow: hidden;
-}
-.dashboard-activity-progress .progress-bar {
-    padding-right: 3px;
-    font-size: x-small;
-    text-align: right;
-    line-height: 14px;
-    color: rgba(255, 255, 255, 0);
-    background-color: #faa732;
-    background-image: -moz-linear-gradient(top, #fbb450, #f89406);
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
-    background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
-    background-image: -o-linear-gradient(top, #fbb450, #f89406);
-    background-image: linear-gradient(to bottom, #fbb450, #f89406);
-    background-repeat: repeat-x;
-    position: absolute;
-    height: 100%;
-    max-width: 100%;
-    overflow: hidden;
-}
-.dashboard-activity-container:hover {
-    height: 249px;
-}
-.dashboard-activity-container:hover .dashboard-activity-progress {
-    height: 14px;
-}
-.dashboard-activity-container:hover .progress-bar {
-    color: rgba(255, 255, 255, 1);
-    background-image: -webkit-linear-gradient(left,rgba(0,0,0,0.25) 0%,rgba(0,0,0,0) 50px);
-    background-image: -moz-linear-gradient(left,rgba(0,0,0,0.25) 0%,rgba(0,0,0,0) 50px);
-    background-image: linear-gradient(to left,rgba(0,0,0,0.25) 0%,rgba(0,0,0,0) 50px);
-}
-.dashboard-activity-container:hover .buffer-bar {
-    color: rgba(255, 255, 255, 1);
-    background-image: -webkit-linear-gradient(left,rgba(0,0,0,0.25) 0%,rgba(0,0,0,0) 50px);
-    background-image: -moz-linear-gradient(left,rgba(0,0,0,0.25) 0%,rgba(0,0,0,0) 50px);
-    background-image: linear-gradient(to left,rgba(0,0,0,0.25) 0%,rgba(0,0,0,0) 50px);
-}
-a:hover .dashboard-activity-poster,
-a:hover .dashboard-activity-cover {
-    -webkit-box-shadow: inset 0 0 0 2px #e9a049;
-    -moz-box-shadow: inset 0 0 0 2px #e9a049;
-    box-shadow: inset 0 0 0 2px #e9a049;
-}
-.dashboard-activity-container:hover .dashboard-activity-info-platform {
-    opacity: 0;
-}
-.dashboard-activity-container:hover .dashboard-activity-terminate-session {
-    background-color: rgba(0, 0, 0, 0.25);
-    opacity: 1;
-    cursor: pointer;
-}
-.dashboard-activity-metadata-wrapper {
-    position: relative;
-    width: 100%;
-    height: 50px;
-    font-size: 13px;
-    padding: 0px 3px 0 3px;
-}
-.dashboard-activity-metadata-title-container {
-    display: flex;
-    flex-direction: row;
-    font-size: 13px;
-    font-weight: bold;
-    line-height: 25px;
-    color: #eee;
-}
-.dashboard-activity-metadata-play_state-icon {
-    flex-basis: 25px;
-    -webkit-flex-shrink: 0;
-    flex-shrink: 0;
-}
-.dashboard-activity-metadata-title {
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-    width: 350px;
-    -webkit-flex-grow: 1;
-    flex-grow: 1;
-}
-.dashboard-activity-metadata-subtitle-container {
-    display: flex;
-    flex-direction: row;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-    font-size: 13px;
-    font-weight: bold;
-    line-height: 25px;
-    color: #999;
-}
-.dashboard-activity-metadata-media_type-icon {
-    flex-basis: 25px;
-    -webkit-flex-shrink: 0;
-    flex-shrink: 0;
-}
-.dashboard-activity-metadata-subtitle {
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-    -webkit-flex-grow: 1;
-    flex-grow: 1;
-}
-.dashboard-activity-metadata-user {
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-    text-align: right;
-    max-width: 124px;
-    flex-basis: 124px;
-    -webkit-flex-shrink: 0;
-    flex-shrink: 0;
-}
-.dashboard-activity-metadata-user-thumb {
-    background-color: #282828;
-    background-position: center;
-    background-size: cover;
-    margin-top: 5px;
-    margin-left: 10px;
-    height: 40px;
-    width: 40px;
-    position: relative;
-    -webkit-border-radius: 50%;
-    -moz-border-radius: 50%;
-    border-radius: 50%;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    overflow: hidden;
-    float: right;
-}
-a .dashboard-activity-metadata-user-thumb:hover {
-    -webkit-box-shadow: inset 0 0 0 2px #e9a049;
-    -moz-box-shadow: inset 0 0 0 2px #e9a049;
-    box-shadow: inset 0 0 0 2px #e9a049;
-}
-.dashboard-activity-metadata-user a {
-    color: #999;
-}
-.dashboard-activity-metadata-user a:hover {
-    color: #e9a049;
-}
-.dashboard-activity-metadata-title a:hover {
-    color: #e9a049;
-}
-.dashboard-stats-instance {
-    float: left;
-    position: relative;
-    height: 160px;
-    max-width: 500px;
-    margin-left: 25px;
-    margin-bottom: 25px;
-}
-.dashboard-stats-container {
-    height: 160px;
-    width: 100%;
-    position: relative;
-    padding: 0px;
-    -webkit-transition: all .2s ease-in-out;
-    transition: all .2s ease-in-out;
-    overflow: hidden;
-}
-.dashboard-stats-background {
-    background-color: #282828;
-    background-position: center;
-    background-size: cover;
-    display: -webkit-flex;
-    display: flex;
-    -webkit-flex-wrap: nowrap;
-    flex-wrap: nowrap;
-    height: 160px;
-    width: 100%;
-    padding: 5px;
-    overflow: hidden;
-    -webkit-transition: background .2s ease-in-out;
-    transition: background .2s ease-in-out;
-    -webkit-backface-visibility: hidden;
-    backface-visibility: hidden;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3), inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3), inset 0 0 0 1px rgba(255,255,255,.1);
-}
-.dashboard-stats-background.flat {
-    opacity: 1;
-}
-.dashboard-stats-poster-container {
-    background-color: #282828;
-    height: 150px;
-    width: 100px;
-    margin-right: 5px;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3), inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3), inset 0 0 0 1px rgba(255,255,255,.1);
-    -webkit-flex-shrink: 0;
-    flex-shrink: 0;
-    position: relative;
-    overflow: hidden;
-    z-index: 1;
-}
-.dashboard-stats-poster {
-    background-color: #282828;
-    background-position: center;
-    background-size: cover;
-    height: 150px;
-    width: 100px;
-    -webkit-transition: background .2s ease-in-out;
-    transition: background .2s ease-in-out;
-    -webkit-backface-visibility: hidden;
-    backface-visibility: hidden;
-    z-index: 2;
-}
-.dashboard-stats-cover {
-    background-position: center;
-    background-size: cover;
-    height: 100px;
-    width: 100px;
-    margin-top: 25px;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3), inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3), inset 0 0 0 1px rgba(255,255,255,.1);
-    -webkit-transition: background .2s ease-in-out;
-    transition: background .2s ease-in-out;
-    -webkit-backface-visibility: hidden;
-    backface-visibility: hidden;
-    position: absolute;
-    top: 0;
-    z-index: 3;
-}
-.dashboard-stats-circle {
-    background-position: center;
-    background-size: cover;
-    height: 100px;
-    width: 100px;
-    margin-top: 25px;
-    margin-right: 5px;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3), inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3), inset 0 0 0 1px rgba(255,255,255,.1);
-    -webkit-flex-shrink: 0;
-    flex-shrink: 0;
-    -webkit-transition: background .2s ease-in-out;
-    transition: background .2s ease-in-out;
-    -webkit-backface-visibility: hidden;
-    backface-visibility: hidden;
-    z-index: 1;
-    -webkit-border-radius: 50%;
-    -moz-border-radius: 50%;
-    border-radius: 350%;
-    overflow: hidden;
-}
-.dashboard-stats-square {
-    background-position: center;
-    background-size: cover;
-    height: 100px;
-    width: 100px;
-    margin-top: 25px;
-    margin-right: 5px;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3), inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3), inset 0 0 0 1px rgba(255,255,255,.1);
-    -webkit-flex-shrink: 0;
-    flex-shrink: 0;
-    -webkit-transition: background .2s ease-in-out;
-    transition: background .2s ease-in-out;
-    -webkit-backface-visibility: hidden;
-    backface-visibility: hidden;
-    z-index: 1;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-    overflow: hidden;
-}
-.dashboard-stats-flat {
-    background-position: center;
-    background-size: cover;
-    height: 100px;
-    width: 100px;
-    margin-top: 25px;
-    margin-right: 5px;
-    -webkit-flex-shrink: 0;
-    flex-shrink: 0;
-    -webkit-transition: background .2s ease-in-out;
-    transition: background .2s ease-in-out;
-    -webkit-backface-visibility: hidden;
-    backface-visibility: hidden;
-    z-index: 1;
-    overflow: hidden;
-}
-.dashboard-stats-info-container {
-    display: -webkit-flex;
-    display: flex;
-    flex-direction: column;
-    height: 150px;
-    width: 385px;
-    overflow: hidden;
-}
-.dashboard-stats-info-title {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-    align-items: baseline;
-    height: 30px;
-    width: 100%;
-    padding: 5px 5px 5px 10px;
-    line-height: 20px;
-    text-transform: uppercase;
-    border-bottom: 1px solid rgba(255,255,255,.1);
-    -webkit-flex-grow: 1;
-    flex-grow: 1;
-    z-index: 1;
-}
-.dashboard-stats-info-title h4 {
-    margin: 0;
-    font-size: 15px;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-    -webkit-flex-grow: 1;
-    flex-grow: 1;
-}
-.dashboard-stats-info-title .dashboard-stats-stats-units {
-    color: #aaa;
-    font-size: 12px;
-    text-align: right;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-}
-.dashboard-stats-info-scroller {
-    height: 120px;
-    width: 100%;
-    -webkit-flex-grow: 1;
-    flex-grow: 1;
-    z-index: 1;
-}
-.dashboard-stats-info-scroller.scrollbar-macosx > .scroll-element.scroll-y {
-    left: 10px;
-}
-.dashboard-stats-info-scroller.scrollbar-macosx > .scroll-element .scroll-bar {
-    background-color: #999;
-}
-.dashboard-stats-info {
-    width: 100%;
-    font-size: 12px;
-    padding: 3px 0 0 15px;
-    position: relative;
-}
-.dashboard-stats-info-list {
-    margin-bottom: 20px;
-    padding-right: 0;
-}
-.dashboard-stats-info-list:last-of-type {
-    margin-bottom: 0;
-}
-.dashboard-stats-info-item {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-    align-items: baseline;
-    width: 100%;
-    padding: 2.5px 5px;
-    line-height: 14px;
-    border-bottom: 1px solid rgba(255,255,255,0.05);
-    cursor: default;
-}
-.dashboard-stats-info-item:last-of-type {
-    margin-bottom: 0;
-}
-.dashboard-stats-info-item .sub-list {
-    height: 100%;
-    width: 15px;
-    color: #aaa;
-    font-size: 10px;
-    text-align: left;
-    text-transform: uppercase;
-    -webkit-flex-shrink: 0;
-    flex-shrink: 0;
-}
-.dashboard-stats-info-item .sub-value {
-    height: 100%;
-    font-size: 12px;
-    text-align: left;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    -webkit-flex-grow: 1;
-    flex-grow: 1;
-}
-.dashboard-stats-info-item .sub-count {
-    height: 100%;
-    margin-left: 5px;
-    color: #f9be03;
-    font-size: 12px;
-    text-align: right;
-    white-space: nowrap;
-    overflow: hidden;
-    -webkit-flex-shrink: 0;
-    flex-shrink: 0;
-}
-.dashboard-stats-info-item .sub-divider {
-    height: 100%;
-    margin-left: 5px;
-    color: #aaa;
-    font-size: 12px;
-    text-align: left;
-    text-transform: uppercase;
-    -webkit-flex-shrink: 0;
-    flex-shrink: 0;
-}
-.dashboard-stats-info-item.expanded {
-    padding: 5px 5px;
-    line-height: 20px;
-}
-.dashboard-stats-info-item.expanded .sub-heading {
-    font-size: 13px;
-}
-.dashboard-stats-info-item.expanded .sub-value {
-    font-size: 16px;
-}
-.dashboard-stats-info-item.expanded .sub-count {
-    font-size: 16px;
-}
-.dashboard-stats-info-item.expanded .sub-divider {
-    font-size: 16px;
-}
-.dashboard-stats-info-item:hover {
-    background-color: rgba(255,255,255,0.05);
-}
-a:hover .dashboard-stats-poster,
-a:hover .dashboard-stats-cover,
-a:hover .dashboard-stats-circle,
-a:hover .dashboard-stats-square {
-    -webkit-box-shadow: inset 0 0 0 2px #e9a049;
-    -moz-box-shadow: inset 0 0 0 2px #e9a049;
-    box-shadow: inset 0 0 0 2px #e9a049;
-}
-.dashboard-recent-media-row {
-    width: 100%;
-    margin: 0 auto;
-    text-align: center;
-    position: relative;
-    z-index: 0;
-    overflow: auto;
-    scrollbar-width: none;
-}
-.dashboard-recent-media {
-    width: 100%;
-    margin: auto;
-    list-style: none;
-}
-.dashboard-recent-media li {
-    float: left;
-    position: relative;
-    left: 0px;
-    margin-right: 25px;
-    margin-bottom: 25px;
-}
-.dashboard-recent-media-poster {
-    position: relative;
-    float: left;
-}
-.dashboard-recent-media-cover {
-    position: relative;
-    margin-top: 75px;
-    float: left;
-}
-a:hover .dashboard-recent-media-poster,
-a:hover .dashboard-recent-media-cover {
-    webkit-box-shadow: inset 0 0 0 2px #e9a049;
-    -moz-box-shadow: inset 0 0 0 2px #e9a049;
-    box-shadow: inset 0 0 0 2px #e9a049;
-}
-.dashboard-recent-media-poster-face {
-    background-position: center;
-    background-size: cover;
-    height: 225px;
-    width: 150px;
-    position: relative;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    z-index: -2;
-}
-.dashboard-recent-media-cover-face {
-    background-position: center;
-    background-size: cover;
-    height: 150px;
-    width: 150px;
-    position: relative;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    z-index: -2;
-}
-.dashboard-recent-media-overlay {
-    position: absolute;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    text-align: left;
-    background: -moz-linear-gradient(top,  rgba(0,0,0,0) 30%, rgba(0,0,0,1) 100%);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(30%,rgba(0,0,0,0)), color-stop(100%,rgba(0,0,0,1)));
-    background: -webkit-linear-gradient(top,  rgba(0,0,0,0) 30%,rgba(0,0,0,1) 100%);
-    background: -o-linear-gradient(top,  rgba(0,0,0,0) 30%,rgba(0,0,0,1) 100%);
-    background: -ms-linear-gradient(top,  rgba(0,0,0,0) 30%,rgba(0,0,0,1) 100%);
-    background: linear-gradient(to bottom,  rgba(0,0,0,0) 30%,rgba(0,0,0,1) 100%);
-    height: 100%;
-    z-index: -1;
-}
-.dashboard-recent-media-overlay-text {
-    color: #aaa;
-    font-size: 12px;
-    font-weight: bold;
-    float: left;
-    position: absolute;
-    left: 8px;
-    bottom: 5px;
-}
-.dashboard-recent-media-metacontainer {
-    width: 150px;
-    font-size: 13px;
-    clear: both;
-}
-.dashboard-recent-media-metacontainer h3 {
-    padding: 5px 3px 0 3px;
-    color: #eee;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    position: relative;
-    font-size: 13px;
-    font-weight: bold;
-    margin: 0;
-    line-height: 16px;
-    width: 150px;
-    white-space: nowrap;
-    text-align: left;
-    clear: both;
-}
-.dashboard-recent-media-metacontainer h3.text-muted {
-    color: #777;
-}
-.dashboard-recent-media-metacontainer h3.text-muted a {
-    color: #777;
-}
-.dashboard-recent-media-metacontainer h3.text-muted a:hover {
-    color: #e9a049;
-}
-.art-face {
-    background-repeat: no-repeat;
-    background-position: center center;
-    background-attachment: scroll;
-    background-size: cover;
-    opacity: 0;
-    position: fixed;
-    top: 0;
-    bottom: 0;
-    width: 100%;
-}
-.art-music-face {
-    background-repeat: no-repeat;
-    background-position: center;
-    background-size: cover;
-    width: 250px;
-    position: relative;
-    top: 0;
-    bottom: 0;
-}
-.summary-container {
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    overflow-x: hidden;
-    overflow-y: auto;
-    -webkit-overflow-scrolling: touch;
-}
-.summary-container .table-card-header,
-.summary-container .table-card-back {
-    background: rgba(40,40,40, 0.9);
-}
-.summary-navbar {
-    background-color: rgba(255,255,255,.03);
-    height: 50px;
-    line-height: 50px;
-    max-height: 50px;
-    overflow: hidden;
-}
-.summary-navbar-list {
-    padding: 0 25px;
-    color: #999;
-    white-space: nowrap;
-    overflow: hidden;
-}
-.summary-navbar-list .breadcrumb {
-    padding: 0;
-    margin: 0;
-    background: none;
-}
-.summary-navbar-list .breadcrumb > .breadcrumb-arrow {
-    color: #444;
-    padding: 0 15px;
-}
-.summary-navbar-list .breadcrumb > .active {
-    color: #eee;
-}
-.summary-navbar-list .breadcrumb a {
-    color: #999;
-}
-.summary-navbar-list .breadcrumb a:hover {
-    color: #f9be03;
-}
-.summary-content-title-wrapper {
-    height: 150px;
-    padding-top: 50px;
-}
-.summary-content-title {
-    overflow: hidden;
-    position: relative;
-    max-height: 100px;
-}
-.summary-content-title h1 {
-    margin-top: 0;
-    margin-bottom: 10px;
-    color: #f9be03;
-    font-size: 28px;
-    line-height: 40px;
-    float: left;
-    clear: left;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-    width: 100%;
-}
-.summary-content-title h1 a {
-    color: #f9be03;
-}
-.summary-content-title h1 a:hover {
-    color: #eee;
-}
-.summary-content-title h2 {
-    margin-top: 0;
-    margin-bottom: 10px;
-    color: #eee;
-    font-size: 28px;
-    line-height: 40px;
-    float: left;
-    clear: left;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-    width: 100%;
-}
-.summary-content-title h3 {
-    margin-top: 0;
-    margin-bottom: 10px;
-    color: #999;
-    font-size: 28px;
-    line-height: 40px;
-    position: absolute;
-    bottom: 0;
-    right: 0;
-}
-.summary-content-title h3 a:hover {
-    text-decoration: underline;
-}
-.summary-content-title h3 a {
-    color: #999;
-}
-.summary-content-wrapper {
-    background: rgba(0,0,0,.4);
-    background: -webkit-linear-gradient(top, rgba(0,0,0,.4), rgba(10,10,10,.4));
-    background: -o-linear-gradient(bottom, rgba(0,0,0,.4), rgba(10,10,10,.4));
-    background: -moz-linear-gradient(bottom, rgba(0,0,0,.4), rgba(10,10,10,.4));
-    background: linear-gradient(to bottom, rgba(0,0,0,.4), rgba(10,10,10,.4));
-    background-clip: content-box;
-    min-height: calc(100% - 200px);
-    position: inherit;
-    width: 100%;
-}
-.summary-content-poster {
-    float: left;
-    width: 250px;
-    margin: 0 40px 0 25px;
-    height: 100px;
-    overflow: visible;
-    position: relative;
-}
-.summary-poster-face {
-    background-position: center;
-    background-size: cover;
-    height: 375px;
-    width: 250px;
-    position: relative;
-    webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    overflow: hidden;
-    z-index: 1;
-}
-.summary-poster-face-episode {
-    background-position: center;
-    background-size: cover;
-    height: 140px;
-    width: 250px;
-    position: relative;
-    webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    overflow: hidden;
-    z-index: 1;
-}
-.summary-poster-face-track {
-    background-position: center;
-    background-size: cover;
-    height: 250px;
-    width: 250px;
-    position: relative;
-    webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    overflow: hidden;
-    z-index: 1;
-}
-.summary-poster-face-overlay {
-    position: absolute;
-    left: 0;
-    right: 0;
-    top: 0;
-    bottom: 0;
-    background-image: -webkit-gradient(linear,left 0,left 100%,from(rgba(0,0,0,.7)),to(rgba(0,0,0,.9)));
-    background-image: -webkit-linear-gradient(top,rgba(0,0,0,.7) 0,rgba(0,0,0,.9) 100%);
-    background-image: -moz-linear-gradient(top,rgba(0,0,0,.7) 0,rgba(0,0,0,.9) 100%);
-    background-image: linear-gradient(to bottom,rgba(0,0,0,.7) 0,rgba(0,0,0,.9) 100%);
-    background-repeat: repeat-x;
-    webkit-box-shadow: inset 0 0 0 2px #e9a049;
-    -moz-box-shadow: inset 0 0 0 2px #e9a049;
-    box-shadow: inset 0 0 0 2px #e9a049;
-    opacity: 0;
-    transition: opacity .2s;
-    z-index: 2;
-}
-.summary-poster-face-overlay span {
-    display: block;
-    width: 100%;
-    height: 100%;
-    background-image: url(../images/plex-logo-light.svg);
-    background-size: 100px;
-    background-repeat: no-repeat;
-    background-position: center;
-    opacity: 0;
-    transition: opacity .3s;
-}
-.summary-poster-face-overlay span:before {
-    content: "View On";
-    color: #999;
-    font-size: 13px;
-    font-weight: bold;
-    text-transform: uppercase;
-    text-align: center;
-    display: block;
-    position: absolute;
-    top: calc(50% - 34px);
-    width: 100%;
-}
-a:hover .summary-poster-face .summary-poster-face-overlay,
-a:hover .summary-poster-face-episode .summary-poster-face-overlay,
-a:hover .summary-poster-face-track .summary-poster-face-overlay,
-a:hover .summary-poster-face .summary-poster-face-overlay span,
-a:hover .summary-poster-face-episode .summary-poster-face-overlay span,
-a:hover .summary-poster-face-track .summary-poster-face-overlay span {
-    opacity: 1;
-}
-.summary-content-padding {
-    float: left;
-    width: 250px;
-    height: 1px;
-    margin: 0 40px 20px 25px;
-    position: relative;
-}
-.summary-content {
-    position: relative;
-    color: #999;
-    overflow: hidden;
-    padding-right: 10px;
-    margin-bottom: 20px;
-}
-.summary-content-details-wrapper {
-    width: 100%;
-    padding: 10px 0 15px 0;
-    position: relative;
-    float: left;
-}
-.summary-content-details-tag {
-    float: left;
-    line-height: 24px;
-}
-.summary-content-details-tag strong {
-    color: #eee;
-    margin-left: 2px;
-    margin-right: 10px;
-}
-.summary-content-media-info-wrapper {
-    width: 100%;
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    text-align: center;
-}
-.summary-content-media-flag {
-    width: auto;
-    height: auto;
-    max-width: 75pt;
-    max-height: 15px;
-    margin: 0 5px;
-}
-.summary-content-text {
-    overflow: hidden;
-    color: #eee;
-    float: left;
-    position: relative;
-    clear: both;
-    padding-bottom: 0;
-}
-.summary-content-tagline {
-    font-weight: bold;
-}
-.summary-content-summary {
-    height: 60px;
-}
-.summary-content-summary p {
-    margin-bottom: 0;
-}
-.summary-toggle {
-    display: none;
-    margin-top: 10px;
-    font-size: 12px;
-    font-weight: bold;
-    text-transform: uppercase;
-}
-.summary-toggle a {
-    color: #999;
-}
-.summary-content-people-wrapper {
-    margin-right: 20px;
-    float: left;
-}
-.summary-content-people-wrapper hidden-phone hidden-tablet {
-    overflow: hidden;
-    height: auto;
-    min-height: 0px;
-}
-.summary-content-actors {
-    margin-top: 13px;
-    font-size: 12px;
-    line-height: 18px;
-    color: #999;
-    overflow: hidden;
-}
-.summary-content-actors ul {
-    padding-left:20px;
-    margin-bottom: 0;
-}
-.summary-content-actors li {
-    list-style: none;
-    list-style-image: none;
-    display: block;
-    font-size: 12px;
-    line-height: 18px;
-    color: #eee;
-}
-.summary-content-genres {
-    margin-top: 13px;
-    font-size: 12px;
-    line-height: 18px;
-    color: #999;
-    overflow: hidden;
-}
-.summary-content-genres ul {
-    padding-left:20px;
-    margin-bottom: 0;
-}
-.summary-content-genres li {
-    list-style: none;
-    list-style-image: none;
-    display: block;
-    font-size: 12px;
-    line-height: 18px;
-    color: #eee;
-}
-.summary-content-writers {
-    margin-top: 13px;
-    font-size: 12px;
-    line-height: 18px;
-    color: #999;
-    overflow: hidden;
-}
-.summary-content-writers ul {
-    padding-left: 20px;
-    margin-bottom: 0;
-}
-.summary-content-writers li {
-    list-style: none;
-    list-style-image: none;
-    display: block;
-    font-size: 12px;
-    line-height: 18px;
-    color: #eee;
-}
-.star-rating {
-    display: inline-block;
-    font-size: 15px;
-    overflow: hidden;
-    white-space: nowrap;
-    margin-top: 3px;
-    height: 21px;
-    float: right;
-}
-.star-rating .star-icon {
-    width: auto;
-    margin-left: 2px;
-    color: #f9be03;
-}
-.star-rating .star-icon-o {
-    width: auto;
-    margin-left: 2px;
-    color: #999;
-}
-.critic-rating {
-    display: flex;
-    font-size: 14px;
-    overflow: hidden;
-    white-space: nowrap;
-    margin-top: 2px;
-    height: 20px;
-    line-height: 20px;
-    float: right;
-}
-.children-list,
-.search-results-list {
-    position: relative;
-    z-index: 0;
-}
-.item-children-wrapper {
-}
-.item-children-section-title {
-    position: relative;
-    padding: 10px;
-    background-color: #2c2c2c;
-    border-bottom: 1px solid #3d3d3d;
-    border-top: 1px solid #282828;
-    height: 50px;
-    line-height: 22px;
-    padding: 13px 20px;
-    margin: 20px 0;
-}
-.item-children-section-title h4 {
-    position: relative;
-    margin: 0;
-    line-height: 22px;
-    color: #eee;
-    font-size: 16px;
-    text-align: center;
-    text-transform: uppercase;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-.item-children-instance {
-    list-style: none;
-    margin: 0;
-    overflow: auto;
-}
-.item-children-instance.max-height {
-    max-height: 700px;
-}
-.item-children-instance li {
-    float: left;
-    position: relative;
-    left: 0px;
-    margin-right: 25px;
-    margin-bottom: 25px;
-}
-.item-children-instance li.item-children-list-item {
-    width: 100%;
-    height: 35px;
-    margin-right: 0;
-    margin-bottom: 0;
-}
-.item-children-poster {
-    float: left;
-    position: relative;
-    left: 0px;
-}
-a:hover .item-children-poster {
-    webkit-box-shadow: inset 0 0 0 2px #e9a049;
-    -moz-box-shadow: inset 0 0 0 2px #e9a049;
-    box-shadow: inset 0 0 0 2px #e9a049;
-}
-.item-children-poster-face {
-    background-position: center;
-    background-size: cover;
-    position: relative;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    z-index: -2;
-}
-.item-children-poster-face.poster-item {
-    width: 150px;
-    height: 225px;
-}
-.item-children-poster-face.episode-item {
-    width: 250px;
-    height: 140px;
-}
-.item-children-poster-face.cover-item {
-    width: 150px;
-    height: 150px;
-}
-.item-children-card-overlay {
-    position: absolute;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    text-align: left;
-    background: -moz-linear-gradient(top,  rgba(0,0,0,0) 30%, rgba(0,0,0,1) 100%);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(30%,rgba(0,0,0,0)), color-stop(100%,rgba(0,0,0,1)));
-    background: -webkit-linear-gradient(top,  rgba(0,0,0,0) 30%,rgba(0,0,0,1) 100%);
-    background: -o-linear-gradient(top,  rgba(0,0,0,0) 30%,rgba(0,0,0,1) 100%);
-    background: -ms-linear-gradient(top,  rgba(0,0,0,0) 30%,rgba(0,0,0,1) 100%);
-    background: linear-gradient(to bottom,  rgba(0,0,0,0) 30%,rgba(0,0,0,1) 100%);
-    height: 100%;
-    z-index: -1;
-}
-.item-children-overlay-text {
-    color: #aaa;
-    font-size: 12px;
-    font-weight: bold;
-    float: left;
-    position: absolute;
-    left: 8px;
-    bottom: 5px;
-}
-.item-children-instance-text-wrapper {
-    font-size: 13px;
-    margin-bottom: 20px;
-    clear: both;
-}
-.item-children-instance-text-wrapper.poster-item,
-.item-children-instance-text-wrapper.cover-item {
-    width: 150px;
-}
-.item-children-instance-text-wrapper.episode-item {
-    width: 250px;
-}
-.item-children-instance-text-wrapper h3 {
-    width: 100%;
-    padding: 5px 3px 0 3px;
-    color: #eee;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    position: relative;
-    font-size: 13px;
-    font-weight: bold;
-    margin: 0;
-    line-height: 16px;
-    white-space: nowrap;
-    text-align: left;
-    clear: both;
-}
-.item-children-instance-text-wrapper h3.text-muted {
-    color: #777;
-}
-.item-children-instance-text-wrapper h3.text-muted a {
-    color: #777;
-}
-.item-children-instance-text-wrapper h3.text-muted a:hover {
-    color: #e9a049;
-}
-.item-children-list-item-odd {
-    border-top: 0px solid #343434;
-    border-bottom: 0px solid #343434;
-    background-color: rgba(255,255,255,0.010);
-    height: 100%;
-    font-size: 13px;
-    padding-top: 10px;
-}
-.item-children-list-item-even {
-    border-top: 0px solid #343434;
-    border-bottom: 0px solid #343434;
-    background-color: rgba(255,255,255,0.035);
-    height: 100%;
-    font-size: 13px;
-    padding-top: 10px;
-}
-.item-children-list-item-odd:hover,
-.item-children-list-item-even:hover {
-    background-color: rgba(255,255,255,0.075);
-}
-.item-children-list-item-index {
-    float: left;
-    color: #777;
-    text-align: right;
-    display: inline-block;
-    width: 35px;
-    margin-right: 10px;
-}
-.item-children-list-item-title {
-    display: inline-block;
-    width: calc(100% - 125px);
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-}
-.item-children-list-item-duration {
-    float: right;
-    color: #777;
-    text-align: right;
-    display: inline-block;
-    width: 60px;
-    margin-right: 20px;
-}
-.nav-list {
-    float: left;
-    list-style: none;
-    padding: 0;
-}
-.nav-list.nav-pills > li > a {
-    margin-bottom: 0;
-}
-#new_title h3 {
-    color: #E5A00D;
-    font-size: 14px;
-    line-height: 1.42857143;
-    font-weight: bold;
-    margin: 0;
-}
-.settings-alert {
-    float: left;
-    padding: 0;
-    margin: 5px 0;
-    border: 0;
-    position: relative;
-}
-.settings-alert ul {
-    padding: 0;
-}
-.settings-alert ul li {
-    list-style: none;
-    padding: 5px 12px;
-    margin: 0;
-    border: 1px solid #ebccd1;
-    border-radius: 4px;
-}
-.settings-alert ul li:before {
-    content: "\f071";
-    font-family: "Font Awesome 5 Free";
-    font-weight: 900;
-    margin-right: 5px;
-}
-.settings-warning {
-    color: #eb8600;
-}
-span.settings-warning {
-    padding-left: 10px;
-}
-#menu_link_show_advanced_settings.active {
-    color: #eee;
-    background-color: #cc7b19;
-}
-#configUpdate .form-group,
-#configUpdate .checkbox{
-    padding-left: 10px;
-    margin-left: -10px;
-}
-.hidden-settings {
-    overflow: hidden;
-    padding-left: 10px;
-    margin-left: -10px;
-}
-#newsletter_agent_options.hidden-settings {
-    padding-left: 15px;
-    margin-left: 0;
-}
-.advanced-setting {
-    display: none;
-}
-div.advanced-setting {
-    border-left: 1px solid #cc7b19;
-}
-li.advanced-setting {
-    border-left: 1px solid #cc7b19;
-}
-.setting-message {
-    color: #cc7b19;
-    margin-left: 10px;
-}
-.user-info-wrapper {
-}
-.user-info-poster-face {
-    float: left;
-    margin: 15px 15px 15px 0;
-    background-size: cover;
-    background-position: center;
-    height: 80px;
-    width: 80px;
-    -webkit-border-radius: 50%;
-    -moz-border-radius: 50%;
-    border-radius: 50%;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-}
-.user-info-username {
-    font-size: 24px;
-    color: #eee;
-    padding-top: 15px;
-    padding-left: 105px;
-}
-.user-info-nav {
-    margin-top: 15px;
-    padding-left: 105px;
-}
-.nav-tabs > .active > a:hover,
-.nav-tabs > .active > a:focus {
-    color: #e9a049;
-}
-.user-overview-stats-wrapper {
-}
-.user-overview-stats-wrapper ul {
-    list-style: none;
-    padding: 0;
-    margin: 0px 0px 0px 0px;
-}
-.user-overview-stats-instance {
-    float: left;
-    width: 400px;
-    height: 80px;
-    margin-bottom: 25px;
-}
-.user-overview-stats-instance-device_icon {
-    float: left;
-    padding-right: 15px;
-}
-.user-overview-stats-instance-device_icon img{
-}
-.user-overview-stats-instance li {
-    float: left;
-    list-style: none;
-    width: 100%;
-    height: 90px;
-}
-.user-overview-stats-instance-text {
-    position: relative;
-    top: 0px;
-    left: 0px;
-}
-.user-overview-stats-instance p {
-    color: #aaa;
-    font-size: 12px;
-    float: left;
-    position: relative;
-    top: 15px;
-    left: 0px;
-}
-.user-overview-stats-instance h3 strong{
-    color: #eee;
-}
-.user-overview-stats-instance h3 {
-    font-size: 30px;
-    font-weight: bold;
-    color: #f9be03;
-    line-height: 22px;
-    position: relative;
-    top: 5px;
-    margin: 0 5px 0 10px;
-    float: left;
-}
-.user-overview-stats-instance h4 {
-    color: #eee;
-    margin-bottom: 25px;
-}
-.user-overview-stats-instance h1 {
-    font-size: 54px;
-    font-weight: normal;
-    float: left;
-    color: #333;
-    color: rgba(255,255,255,0.05);
-    text-shadow: none;
-    position: relative;
-    top: 3px;
-    left: 3px;
-}
-.user-player ul {
-    list-style: none;
-    margin: 0;
-}
-.user-player-instance {
-    float: left;
-    width: 240px;
-    height: 80px;
-    margin-bottom: 25px;
-}
-.user-player-instance li {
-}
-.user-player-instance-box {
-    float: left;
-    border-radius: 3px;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    background-size: contain;
-    position: relative;
-    height: 80px;
-    width: 80px;
-}
-.user-player-instance-name {
-    float: left;
-    padding-top: 14px;
-    color: #eee;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    position: relative;
-    font-size: 14px;
-    line-height: 16px;
-    font-weight: normal;
-    width: 140px;
-    margin-left: 10px;
-    margin-bottom: 10px;
-    white-space: nowrap;
-}
-.user-player-instance-playcount h3 {
-    font-size: 30px;
-    font-weight: bold;
-    color: #f9be03;
-    line-height: 22px;
-    position: relative;
-    top: 5px;
-    margin: 0 5px 0 10px;
-    float: left;
-}
-.user-player-instance-playcount p {
-    color: #aaa;
-    font-size: 12px;
-    float: left;
-    position: relative;
-    top: 15px;
-    left: 0px;
-}
-.library-info-poster-face {
-    float: left;
-    margin: 15px 15px 15px 0;
-    background-size: cover;
-    background-position: center;
-    height: 80px;
-    width: 80px;
-    /*-webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);*/
-}
-.library-user-instance-box {
-    float: left;
-    -webkit-border-radius: 50%;
-    -moz-border-radius: 50%;
-    border-radius: 50%;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    background-size: contain;
-    position: relative;
-    height: 80px;
-    width: 80px;
-}
-a .library-user-instance-box:hover {
-    -webkit-box-shadow: inset 0 0 0 2px #e9a049;
-    -moz-box-shadow: inset 0 0 0 2px #e9a049;
-    box-shadow: inset 0 0 0 2px #e9a049;
-}
-.home-padded-header {
-    margin: 25px 0;
-    height: 34px;
-}
-.home-padded-header h3 {
-    margin-top: 9px;
-    width: 175px;
-}
-.home-padded-header .button-bar {
-    float: left;
-}
-.home-platforms {
-}
-.home-platforms ul,
-.library-platforms ul {
-    list-style: none;
-    margin: 0;
-}
-.home-platforms-instance {
-    position: relative;
-    float: left;
-    width: 340px;
-    padding: 5px;
-    margin-right: 20px;
-    margin-bottom: 20px;
-    -webkit-box-sizing: content-box;
-    box-sizing: content-box;
-    white-space: nowrap;
-}
-.home-platforms-instance-overlay {
-    height: 130px;
-    width: 100%;
-    padding: 5px;
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    overflow: hidden;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3), inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3), inset 0 0 0 1px rgba(255,255,255,.1);
-    z-index: 0;
-}
-.home-platforms-instance-background {
-    background-color: #282828;
-    background-position: center;
-    background-size: cover;
-    height: 130px;
-    width: 100%;
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    opacity: 0.15;
-    -webkit-filter: blur(3px);
-    -moz-filter: blur(3px);
-    filter: blur(3px);
-    -webkit-transition: background 1s linear;
-    transition: background 1s linear;
-    -webkit-backface-visibility: hidden;
-    backface-visibility: hidden;
-    z-index: -1;
-}
-.home-platforms-instance li {
-    position: relative;
-}
-.home-platforms-instance-info {
-    float: left;
-    position: relative;
-    padding-left: 80px;
-    width: 100%;
-    height: 120px;
-    overflow: hidden;
-}
-.home-platforms-instance-name {
-    color: #eee;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    position: relative;
-    font-size: 14px;
-    line-height: 16px;
-    font-weight: bold;
-    width: 100%;
-    padding: 0 0 0 20px;
-}
-.home-platforms-instance-name h4 {
-    margin: 10px 0 4px 0;
-}
-.home-platforms-instance-playcount {
-    display: inline-block;
-    position: relative;
-    padding: 6px 0 0 20px;
-    max-width: 100%;
-}
-.home-platforms-instance-playcount h4 {
-    font-size: 14px;
-    line-height: 16px;
-    margin: 10px 0 10px 0;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-.home-platforms-instance-playcount h3 {
-    font-size: 30px;
-    font-weight: bold;
-    color: #f9be03;
-    line-height: 22px;
-    position: relative;
-    top: 5px;
-    margin: 0 5px 0 0;
-    float: left;
-}
-.home-platforms-instance-playcount p {
-    color: #aaa;
-    font-size: 12px;
-    float: left;
-    position: relative;
-    top: 15px;
-    left: 0px;
-    margin-right: 5px;
-}
-.home-platforms-instance-last-user {
-    float: left;
-    position: relative;
-    padding: 6px 0 0 20px;
-    width: 100%;
-}
-.home-platforms-instance-last-user h4 {
-    font-size: 14px;
-    line-height: 16px;
-    margin: 10px 0 10px 0;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-.home-platforms-instance-last-user h5 {
-    font-size: 12px;
-    position: relative;
-    margin: 0 0 2px 0;
-    float: left;
-}
-.home-platforms-instance-last-user p {
-    color: #aaa;
-    font-size: 12px;
-    float: left;
-    clear: left;
-    position: relative;
-    width: 100%;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-.home-platforms-instance-poster {
-    margin-left: 0px;
-    position: absolute;
-    overflow: hidden;
-}
-.home-platforms-instance-cover {
-    margin-left: 0px;
-    position: absolute;
-    top: 20px;
-    overflow: hidden;
-}
-.home-platforms-instance-poster .home-platforms-poster-face {
-    background-position: center;
-    background-size: cover;
-    height: 120px;
-    width: 80px;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-}
-.home-platforms-instance-cover .home-platforms-cover-face {
-    background-position: center;
-    background-size: cover;
-    height: 80px;
-    width: 80px;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-}
-.home-platforms-instance-poster .home-platforms-library-thumb {
-    background-position: center;
-    background-size: cover;
-    height: 80px;
-    width: 80px;
-    margin-top: 20px;
-}
-.home-platforms-instance-box {
-    background-position: center;
-    background-size: cover;
-    margin: 20px 0 0 0px;
-    height: 80px;
-    width: 80px;
-    position: relative;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
-    border-radius: 3px;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    overflow: hidden;
-}
-.home-platforms-instance-oval {
-    background-position: center;
-    background-size: cover;
-    margin: 20px 0 0 0px;
-    height: 80px;
-    width: 80px;
-    position: relative;
-    -webkit-border-radius: 50%;
-    -moz-border-radius: 50%;
-    border-radius: 50%;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    overflow: hidden;
-}
-.home-platforms-instance-list {
-    float: left;
-    position: relative;
-    width: 100%;
-    padding: 0 10px 25px 10px;
-}
-.home-platforms-instance-list li {
-    margin-top: 25px;
-    position: relative;
-    height: 60px;
-}
-.home-platforms-instance-list-number {
-    background-color: #f9be03;
-    float: left;
-    position: absolute;
-    top: -10px;
-    left: 10px;
-    height: 20px;
-    width: 20px;
-    display: block;
-    text-align: center;
-    padding-top: 1px;
-    -webkit-border-radius: 50%;
-    -moz-border-radius: 50%;
-    border-radius: 50%;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-}
-.home-platforms-instance-list-number h4 {
-    color: #000;
-    font-size: 15px;
-    font-weight: bold;
-    margin: 0;
-}
-.home-platforms-instance-list-info {
-    float: left;
-    position: relative;
-    padding-left: 75px;
-    width: 100%;
-    height: 60px;
-}
-.home-platforms-instance-list-name {
-    float: left;
-    color: #eee;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    position: relative;
-    font-size: 13px;
-    line-height: 15px;
-    font-weight: bold;
-    width: 100%;
-    padding: 2px 0 0 10px;
-}
-.home-platforms-instance-list-name h5 {
-    margin: 5px 0px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-.home-platforms-instance-list-playcount {
-    float: left;
-    position: relative;
-    padding: 4px 0 0 10px;
-    width: 100%;
-}
-.home-platforms-instance-list-playcount h3 {
-    font-size: 20px;
-    font-weight: bold;
-    color: #f9be03;
-    line-height: 22px;
-    position: relative;
-    margin: 0 5px 0 0;
-    float: left;
-}
-.home-platforms-instance-list-playcount p {
-    color: #aaa;
-    font-size: 12px;
-    float: left;
-    position: relative;
-    top: 5px;
-    left: 0px;
-    margin-right: 5px;
-}
-.home-platforms-instance-list-last-user {
-    float: left;
-    position: relative;
-    padding: 0 0 0 10px;
-    width: 100%;
-}
-.home-platforms-instance-list-last-user h5 {
-    font-size: 12px;
-    position: relative;
-    margin: 0 0 2px 0;
-    float: left;
-}
-.home-platforms-instance-list-last-user p {
-    color: #aaa;
-    font-size: 12px;
-    float: left;
-    clear: left;
-    position: relative;
-    width: 100%;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-.home-platforms-instance-list-poster {
-    position: absolute;
-    left: 20px;
-    overflow: hidden;
-}
-.home-platforms-instance-list-cover {
-    position: absolute;
-    top: 10px;
-    left: 20px;
-    overflow: hidden;
-}
-.home-platforms-instance-list-poster .home-platforms-list-poster-face {
-    background-position: center;
-    background-size: cover;
-    height: 60px;
-    width: 40px;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-}
-.home-platforms-instance-list-cover .home-platforms-list-cover-face {
-    background-position: center;
-    background-size: cover;
-    height: 40px;
-    width: 40px;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-}
-.home-platforms-instance-list-box {
-    background-position: center;
-    background-size: cover;
-    margin: 10px 0 0 20px;
-    height: 40px;
-    width: 40px;
-    position: relative;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
-    border-radius: 3px;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    overflow: hidden;
-}
-.home-platforms-instance-list-oval {
-    background-position: center;
-    background-size: cover;
-    margin: 10px 0 0 20px;
-    height: 40px;
-    width: 40px;
-    position: relative;
-    -webkit-border-radius: 50%;
-    -moz-border-radius: 50%;
-    border-radius: 50%;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    overflow: hidden;
-}
-.home-platforms-instance-list-chevron {
-    position: absolute;
-    top: 100px;
-    right: 5px;
-    cursor: pointer;
-}
-.home-platforms-instance-list-chevron i {
-    color: #999;
-    font-size: 16px;
-    -webkit-transition: all 0.3s ease;
-    -o-transition: all 0.3s ease;
-    transition: all 0.3s ease;
-}
-.home-platforms-instance-list-chevron i:hover {
-    color: #f9be03;
-}
-.home-platforms-instance-list-chevron.active i.fa-chevron-down{
-    color: #f9be03;
-    -webkit-transform: rotate(180deg);
-    -ms-transform: rotate(180deg);
-    -o-transform: rotate(180deg);
-    transform: rotate(180deg);
-}
-a .home-platforms-instance-box:hover,
-a .home-platforms-instance-oval:hover,
-a .home-platforms-instance-list-box:hover,
-a .home-platforms-instance-list-oval:hover,
-a .home-platforms-poster-face:hover,
-a .home-platforms-cover-face:hover,
-a .home-platforms-list-poster-face:hover,
-a .home-platforms-list-cover-face:hover
- {
-    -webkit-box-shadow: inset 0 0 0 2px #e9a049;
-    -moz-box-shadow: inset 0 0 0 2px #e9a049;
-    box-shadow: inset 0 0 0 2px #e9a049;
-}
-.home-platforms-instance .slider {
-    background-color: #2d2d2d;
-    width: calc(100% + 20px);
-    display: none;
-    position: absolute;
-    top: 124px;
-    left: -5px;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3), inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3), inset 0 0 0 1px rgba(255,255,255,.1);
-    z-index: 1;
-    clip: rect(1px, 350px, 1000px, -2px);
-}
-.history-table-title {
-    text-overflow: ellipsis;
-    overflow: hidden;
-    max-width: 350px;
-}
-.circle {
-    width: 1.55rem;
-    height: 1.55rem;
-    border-radius: 50%;
-    border: 0.2rem solid #eeeeee;
-}
-.circle-quarter {
-    background-image:
-    linear-gradient(00deg, #2b2b2b 50%, transparent 50%),
-    linear-gradient(270deg, #eeeeee 50%, transparent 50%);
-}
-.circle-half {
-    background-image:
-    linear-gradient(90deg, #2b2b2b 50%, transparent 50%),
-    linear-gradient(-90deg, #eeeeee 50%, transparent 50%);
-    }
-.circle-three-quarter {
-    background-image:
-    linear-gradient(180deg, transparent 50%, #eeeeee 50%),
-    linear-gradient(-90deg, #eeeeee 50%, transparent 50%);
-}
-.circle-full {
-    background: #eeeeee;
-}
-#graph-tabs {
-    padding-bottom: 10px;
-    float: none;
-}
-.graphs-instance {
-    height: 330px;
-    padding: 20px;
-    background-color: #333;
-    margin-bottom: 20px;
-    border-radius: 8px;
-}
-.watch-chart {
-    margin-top: 10px;
-    height: 300px;
-    width: 100%;
-}
-.graphs-load {
-    color: #999999;
-    text-align: center;
-    line-height: 300px;
-}
-.card-back {
-    padding: 16px;
-    background-color: #282828;
-    margin-left: auto;
-    margin-right: auto;
-    margin-top: 20px;
-    margin-bottom: 20px;
-    width: 80%;
-    overflow: hidden;
-}
-.card-back-full {
-    padding: 20px;
-    background-color: #282828;
-    margin-top: 20px;
-    margin-bottom: 20px;
-    overflow: hidden;
-}
-.table-card-back {
-    padding: 16px 16px 16px 16px;
-    background-color: #282828;
-    margin-left: auto;
-    margin-right: auto;
-    margin-top: 20px;
-    margin-bottom: 20px;
-    width: 100%;
-    max-width: 1750px;
-    overflow: hidden;
-}
-.table-card-header {
-    padding: 16px 16px 16px 16px;
-    background-color: #2c2c2c;
-    border-bottom: 1px solid #3d3d3d;
-    border-top: 1px solid #282828;
-    margin-left: auto;
-    margin-right: auto;
-    margin-top: 20px;
-    margin-bottom: -20px;
-    width: 100%;
-    max-width: 1750px;
-    display: flow-root;
-}
-.table-card-back td {
-    font-size: 12px;
-}
-.header-bar {
-    float: left;
-}
-.header-bar span {
-    font-size: 22px;
-    font-weight: bold;
-    line-height: 34px;
-}
-.button-bar {
-    float: right;
-}
-.colvis-button-bar,
-.refresh-users-button,
-.refresh-libraries-button {
-    /*float: right;*/
-}
-.refresh-users-button,
-.refresh-libraries-button {
-    /*margin-right: 5px;*/
-}
-.nav-settings,
-.nav-settings ul {
-    margin: 0px 0px 20px 0px;
-}
-.nav-settings > li {
-    list-style: none;
-    background-color: #282828;
-    width: 100%;
-    max-width: 340px;
-    min-width: 200px;
-    border-top: 1px solid #2d2d2d;
-}
-.nav-settings > li > a {
-    border-bottom: 1px solid #232323;
-    display: block;
-    padding: 15px 15px 15px 15px;
-    color: #999;
-    -webkit-transition: all 0.3s ease;
-    -o-transition: all 0.3s ease;
-    transition: all 0.3s ease;
-}
-.nav-settings > li > a:hover,
-.nav-settings > li > a:focus {
-    color: #eee;
-    background-color: #2f2f2f;
-}
-.nav-settings > .active > a,
-.nav-settings > .active > a:hover,
-.nav-settings > .active > a:focus {
-    color: #f9be03;
-    background-color: #2f2f2f;
-}
-.stacked-configs,
-.stacked-configs ul {
-    margin: 0px 0px 20px 0px;
-}
-.stacked-configs > li {
-    margin: 0;
-    list-style: none;
-    background-color: #282828;
-    width: 100%;
-    min-width: 320px;
-    max-width: 900px;
-}
-.stacked-configs > li > span {
-    display: inline-block;
-    width: inherit;
-    padding: 8px 20px 8px 15px;
-    color: #eee;
-    border-left: 2px solid #444;
-    border-top: 1px solid #2d2d2d;
-    -webkit-transition: all 0.3s ease;
-    -o-transition: all 0.3s ease;
-    transition: all 0.3s ease;
-}
-.stacked-configs > li > span:hover,
-.stacked-configs > li > span:focus {
-    color: #eee;
-    background-color: #2f2f2f;
-}
-.stacked-configs > li > span > a.toggle-right,
-.stacked-configs > li > span > span.toggle-right {
-    float: right;
-    color: #999;
-    padding-left: 10px;
-}
-.stacked-configs > li > span > a.toggle-left,
-.stacked-configs > li > span > span.toggle-left {
-    float: left;
-    color: #444;
-    padding-right: 8px;
-}
-.stacked-configs > li > span > a:hover {
-    color: #eee;
-}
-.stacked-configs > li > span > a.active,
-.stacked-configs > li > span > span.active {
-    color: #f9be03;
-}
-.stacked-configs > li.mobile-device > span > a.toggle-left,
-.stacked-configs > li.mobile-device > span > span.toggle-left {
-    color: #999;
-}
-.accordion {
-    width: 100%;
-    max-width: 900px;
-    margin: 0px 0px 20px 0px;
-    background: #282828;
-    list-style: none;
-}
-.accordion li {
-    margin: 0;
-}
-.accordion li .link {
-    cursor: pointer;
-    display: block;
-    padding: 8px 12px 8px 12px;
-    color: #999;
-    border-bottom: 1px solid #2d2d2d;
-    position: relative;
-    -webkit-transition: all 0.3s ease;
-    -o-transition: all 0.3s ease;
-    transition: all 0.3s ease;
-}
-.accordion li .link:hover,
-.accordion li .link:hover i.fa {
-    background: #2f2f2f;
-}
-.accordion li .link i.fa {
-    color: #999;
-}
-.accordion li .link span.toggle-left {
-    padding-right: 5px;
-}
-.accordion li .link span.toggle-right {
-    float: right;
-    padding-left: 10px;
-}
-.accordion li:last-child .link {
-    border-bottom: 0;
-}
-.accordion li .fa-chevron-down {
-    color: #999;
-    -webkit-transition: all 0.3s ease;
-    -o-transition: all 0.3s ease;
-    transition: all 0.3s ease;
-}
-.accordion li.open .link,
-.accordion li.open .link i.fa {
-    color: #f9be03;
-}
-.accordion li.open .fa-chevron-down {
-    color: #f9be03;
-    -webkit-transform: rotate(180deg);
-    -ms-transform: rotate(180deg);
-    -o-transform: rotate(180deg);
-    transform: rotate(180deg);
-}
-.submenu {
-    display: none;
-    background: #2d2d2d;
-    list-style: none;
-    margin: 0px;
-    padding: 20px;
-}
-.submenu li {
-    border-bottom: 1px solid #2f2f2f;
-}
-.submenu a {
-    display: block;
-    text-decoration: none;
-    color: #d9d9d9;
-    padding: 12px;
-    -webkit-transition: all 0.25s ease;
-    -o-transition: all 0.25s ease;
-    transition: all 0.25s ease;
-}
-.submenu a:hover {
-    background: #f9be03;
-    color: #eee;
-}
-.ajaxMsg {
-    background-color: rgba(255,255,255,0.075);
-    color: #999999;
-    display: none;
-    font-size: 14px;
-    right: 10px;
-    padding: 10px 10px;
-    position: fixed;
-    text-align: center;
-    bottom: 10px;
-    min-height: 32px;
-    width: 400px;
-    z-index: 9999;
-}
-.ajaxMsg .msg {
-    line-height: normal;
-    padding-left: 20px;
-}
-.ajaxMsg .loader {
-    position: relative;
-    top: 2px;
-}
-.ajaxMsg .success {
-    text-align: left;
-}
-.ajaxMsg .error {
-    background-color: rgba(255,0,0,0.5);
-    font-size: 20px;
-    text-align: left;
-}
-.ajaxMsg .ui-icon {
-    display: inline-block;
-    margin-left: -20px;
-    top: 2px;
-    position: relative;
-    margin-right: 3px;
-}
-.dataTables_processing {
-    background-color: grey;
-    display: none;
-    font-size: 14px;
-    right: 10px;
-    padding: 10px 10px;
-    position: fixed;
-    text-align: center;
-    bottom: 10px;
-    min-height: 32px;
-    width: 250px;
-    z-index: 9999;
-}
-.dataTables_paginate li {
-    margin: 0;
-}
-div.dataTables_info {
-    white-space: normal !important;
-}
-.tooltip.top .tooltip-arrow {
-    border-top-color: #eee;
-}
-.tooltip.right .tooltip-arrow {
-    border-right-color: #eee;
-}
-.tooltip.bottom .tooltip-arrow {
-    border-bottom-color: #eee;
-}
-.tooltip.left .tooltip-arrow {
-    border-left-color: #eee;
-}
-.tooltip-inner {
-    max-width: 250px;
-    color: #000;
-    background: #eee;
-    border: 0;
-    font-weight: bold;
-    border-radius: 2px;
-}
-.inactive-library-tooltip,
-.inactive-user-tooltip {
-    display: inline-block;
-    position: relative;
-    width: 100%;
-    height: 100%;
-}
-.inactive-library-tooltip i.fa,
-.inactive-user-tooltip i.fa {
-    color: #E5A00D;
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    text-shadow: 0 0 2px rgba(0,0,0,.5);
-}
-.sign-out-tooltip:hover {
-    color: #E5A00D;
-    cursor: pointer;
-}
-.history-thumbnail-popover {
-    z-index: 2000;
-    padding: 0;
-    border: 0;
-}
-.history-thumbnail-popover.popover.left {
-    margin-left: -15px;
-}
-.history-thumbnail-popover.popover.right {
-    margin-left: 15px;
-}
-.history-thumbnail-popover .popover-content {
-    color: #000;
-    padding: 0;
-}
-.history-thumbnail {
-    background-position: center;
-    background-size: cover;
-    width: 80px;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
-    border-radius: 3px;
-    -webkit-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    -moz-box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
-}
-.channel-thumbnail-popover {
-    z-index: 2000;
-    padding: 0;
-    border: 0;
-}
-.channel-thumbnail-popover.popover.left {
-    margin-left: -15px;
-}
-.channel-thumbnail-popover.popover.right {
-    margin-left: 15px;
-}
-.channel-thumbnail-popover .popover-content {
-    color: #000;
-    padding: 0;
-}
-.channel-thumbnail {
-    background-color: #868b8b;
-    background-position: center;
-    background-size: contain;
-    background-origin: content-box;
-    background-repeat: no-repeat;
-    height: 50px;
-    width: 50px;
-    padding: 3px;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
-    border-radius: 3px;
-}
-.channel-thumbnail-popover .arrow:after {
-    border-right-color: #868b8b !important;
-}
-.edit-user-toggles,
-.edit-library-toggles {
-    padding-right: 10px;
-}
-.edit-user-toggles > input[type='checkbox'],
-.edit-library-toggles > input[type='checkbox'] {
-    display: none;
-}
-.edit-user-toggles > input[type='checkbox'] + label,
-.edit-library-toggles > input[type='checkbox'] + label {
-    color: #444;
-    cursor: pointer;
-}
-.edit-user-toggles > input[type='checkbox']:checked + label,
-.edit-library-toggles > input[type='checkbox']:checked + label {
-    color: #eee;
-    cursor: pointer;
-}
-.edit-user-name > input[type='text'] {
-    margin: 0;
-}
-.noTransition
-{
-    -moz-transition: none !important;
-    -webkit-transition: none !important;
-    -o-transition: none !important;
-    transition: none !important;
-}
-#users-to-delete > li,
-#users-to-purge > li,
-#libraries-to-delete > li,
-#libraries-to-purge > li {
-    color: #e9a049;
-}
-#updatebar, #token_error_bar  {
-    background-color: #444;
-    opacity: 0.95;
-    color: #999999;
-    font-size: 14px;
-    right: 10px;
-    padding: 10px 10px;
-    position: fixed;
-    text-align: center;
-    bottom: 10px;
-    min-height: 22px;
-    width: 400px;
-    z-index: 9999;
-    display: block;
-}
-#updatebar .msg, #token_error_bar .msg {
-    line-height: normal;
-    padding-left: 20px;
-}
-#updatebar .loader, #token_error_bar .loader {
-    position: relative;
-    top: 2px;
-}
-#updatebar.success, #token_error_bar.success {
-    padding: 15px 10px;
-    text-align: left;
-}
-#updatebar.error, #token_error_bar.error {
-    padding: 15px 10px;
-    text-align: left;
-}
-#updatebar .ui-icon, #token_error_bar .ui-icon {
-    display: inline-block;
-    margin-left: -20px;
-    top: 2px;
-    position: relative;
-    margin-right: 3px;
-}
-#updatebar a:hover, #token_error_bar a:hover {
-    color: #e9a049;
-}
-#token_error_bar {
-    background-color: rgba(255,0,0,0.5) !important;
-}
-.body-container {
-    position: absolute;
-    top: 50px;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    overflow: auto;
-    -webkit-overflow-scrolling: touch;
-}
-::-webkit-scrollbar {
-    width: 15px;
-}
-::-webkit-scrollbar-track {
-    background-color: rgba(0,0,0,.2);
-}
-::-webkit-scrollbar-thumb {
-    min-height: 50px;
-    background-color: rgba(255,255,255,.15);
-    border: 3px solid transparent;
-    border-radius: 8px;
-    background-clip: padding-box;
-}
-pre::-webkit-scrollbar-track {
-    background-color: rgba(255,255,255,.2);
-}
-pre::-webkit-scrollbar-thumb {
-    background-color: rgba(0,0,0,.15);
-}
-#currentActivity,
-#home-stats,
-#library-stats {
-    margin-left: -25px;
-}
-#currentActivity > *,
-#home-stats > *,
-#library-stats > * {
-    margin-left: 25px;
-}
-
-@media only screen
-  and (min-width: 300px)
-  and (max-width: 450px) {
-    .home-platforms-instance {
-        width: calc(100% - 20px);
-    }
-    .dashboard-activity-instance,
-    .dashboard-stats-instance {
-        width: 100%;
-    }
-    #currentActivity,
-    #home-stats,
-    #library-stats {
-        margin-right: 25px;
-    }
-}
-@media only screen
-  and (min-width: 300px)
-  and (max-width: 740px) {
-    .header-bar {
-        display: block;
-        float: none !important;
-    }
-    .button-bar {
-        float: left !important;
-        clear: both;
-        margin-top: 5px;
-    }
-    .button-bar > div,
-    .button-bar > button,
-    .button-bar > span {
-        float: left !important;
-        clear: both !important;
-        margin-top: 10px;
-    }
-    .button-bar > div > button.btn {
-        float: left !important;
-        clear: both !important;
-    }
-    .home-padded-header .button-bar {
-        margin-top: 0;
-        margin-bottom: 15px;
-    }
-}
-@media only screen
-  and (min-width: 740px)
-  and (max-width: 1280px) {
-    .header-bar {
-        display: block;
-        float: none !important;
-    }
-    .button-bar {
-        float: left !important;
-        clear: both;
-        margin-top: 5px;
-    }
-    .button-bar .btn-group,
-    .button-bar > button.btn {
-        margin-right: 3px;
-    }
-    .button-bar > div,
-    .button-bar > button,
-    .button-bar > span {
-        float: left !important;
-        margin-top: 10px;
-    }
-    .button-bar > div > button.btn {
-        float: left !important;
-        clear: both !important;
-    }
-    .home-padded-header .button-bar {
-        float: left !important;
-        margin-top: 0;
-        margin-bottom: 15px;
-    }
-}
-#search_form {
-    width: 270px;
-    padding: 8px 15px;
-}
-#search_form span.input-textbox {
-    overflow: hidden;
-    width: 200px;
-    height: 34px;
-    display: inline-flex;
-    float: right;
-}
-#search_form #query {
-    width: 0;
-    height: 34px;
-    margin-top: 0;
-    float: right;
-    position: relative;
-    right: -200px;
-    border-radius: 3px 0 0 3px;
-}
-#search_form #query.active {
-    width: 200px;
-    right: 0px;
-}
-#search_form #search_button.btn-inactive {
-    background-color: #000;
-    border: 1px solid rgba(0,0,0,0);
-    -webkit-transition: background 0.3s;
-    -moz-transition: background 0.3s;
-    -ms-transition: background 0.3s;
-    -o-transition: background 0.3s;
-    transition: background 0.3s;
-}
-@media (max-width: 767px) {
-    #search_form {
-        width: 100%;
-    }
-    #search_form span.input-textbox {
-        width: 100%;
-    }
-    #search_form #query {
-        width: 100%;
-        right: 0;
-    }
-    #search_form #query.active {
-        width: 100%;
-        right: 0px;
-    }
-}
-#update_search_form div.input-group {
-    display: inline-table;
-    vertical-align: middle;
-    max-width: 250px;
-}
-#update_search_form #update_query {
-    margin: 5px 0 0 0.5em;
-}
-.notification-params {
-    width: 100%;
-    margin-top: 10px;
-    background-color: #282828;
-}
-.notification-params th {
-    padding-left: 10px;
-    height: 30px;
-}
-.notification-params td {
-    height: 25px;
-}
-.notification-params td:first-child {
-    padding-left: 10px;
-    width: 250px;
-}
-.notification-params.time-options td:first-child {
-    padding-left: 10px;
-    width: 125px;
-}
-.notification-params.time-options td:nth-child(2) {
-    padding-left: 10px;
-    width: 275px;
-}
-.notification-params td:not(:first-child) {
-    padding-right: 10px;
-}
-.notification-params tr:nth-child(odd) td {
-    background-color: rgba(255,255,255,0.035);
-}
-.notification-params tr:nth-child(even) td {
-    background-color: rgba(255,255,255,0.010);
-}
-.activity-queue {
-    width: 100%;
-    margin-top: 10px;
-    background-color: #282828;
-}
-.activity-queue th {
-    padding-left: 10px;
-    height: 30px;
-}
-.activity-queue th:first-child {
-    width: 268px;
-}
-.activity-queue th:nth-child(2) {
-    width: 125px;
-}
-.activity-queue th:nth-child(3) {
-    width: 175px;
-}
-.activity-queue td {
-    height: 25px;
-    padding: 5px 10px;
-}
-.activity-queue tr:nth-child(odd) td {
-    background-color: rgba(255,255,255,0.035);
-}
-.activity-queue tr:nth-child(even) td {
-    background-color: rgba(255,255,255,0.010);
-}
-.card-sortable {
-    height: 36px;
-    padding: 0 20px 0 0;
-    line-height: 34px;
-    cursor: move;
-    cursor: -webkit-grab;
-    cursor: grab;
-    border-bottom: 1px solid #232323;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    -o-user-select: none;
-    user-select: none;
-}
-.card {
-    position: relative;
-    background-color: #282828;
-    border-top: 1px solid #2d2d2d;
-}
-.card label {
-    font-weight: normal;
-}
-.card-handle {
-    display: inline-block;
-    width: 30px;
-    margin-right: 10px;
-    color: #444;
-    text-align: center;
-    background-color: #2f2f2f;
-}
-.selectize-input input[type='text'] {
-    height: 20px;
-}
-.selectize-input.disabled, .selectize-input.disabled * {
-    cursor: not-allowed !important;
-}
-.small-muted {
-    font-size: small;
-    color: #777;
-}
-.config-info-table,
-.config-scheduler-table {
-    width: 100%
-}
-.config-info-table td,
-.config-info-table th,
-.config-scheduler-table td,
-.config-scheduler-table th {
-    padding-bottom: 5px;
-}
-.config-info-table td:first-child {
-    width: 150px;
-}
-.config-scheduler-table td:first-child {
-    width: 225px;
-}
-.config-scheduler-table th {
-    color: #eee;
-}
-a.no-highlight {
-    color: #777;
-}
-a.no-highlight:hover {
-    color: #eee;
-}
-.top-line {
-    border-top: 1px dotted #777;
-    padding-top: 5px;
-}
-.help-bold {
-    font-weight: bold;
-    color: #eee;
-}
-.save-button {
-    margin-top: 15px;
-}
-.nav-dashboard > li {
-    float: left;
-}
-.btn-gray.disabled,
-.btn-gray.disabled:focus,
-.btn-gray.disabled:hover,
-.btn-gray.disabled:active {
-    color: #323232;
-    cursor: default;
-}
-.nav-header > li > a:focus,
-.nav-header > li > a:hover {
-    background-color: transparent;
-}
-#recently-added-row-scroller,
-#recently-watched-row-scroller {
-    position: relative;
-    height: 265px;
-    margin-bottom: 25px;
-}
-
-@media (min-width: 768px) {
-    .login-container {
-        max-width: 750px;
-    }
-    .modal.wide .modal-dialog {
-        width: 750px;
-    }
-}
-@media (min-width: 992px) {
-    .login-container {
-        max-width: 970px;
-    }
-}
-@media (min-width: 1200px) {
-    .login-container {
-        max-width: 1170px;
-    }
-}
-.login-body-container {
-    margin: 50px 0;
-}
-.login-container {
-    margin-right: auto;
-    margin-left: auto;
-    padding-left: 15px;
-    padding-right: 15px;
-}
-.login {
-    margin: 0 auto;
-}
-.login-logo {
-    margin: 0 auto 50px auto;
-    text-align: center;
-}
-.login-container .login-method-header {
-    text-align: center;
-    font-weight: 600;
-    text-transform: uppercase;
-}
-.login-container .form-group {
-    margin-bottom: 20px;
-}
-.login-container .form-control {
-    height: 38px;
-    line-height: 1.5em;
-}
-.login-container .form-footer {
-    margin-top: 40px;
-}
-.login-container .login-button {
-    float: right;
-    text-transform: uppercase;
-    text-shadow: 0 -1px 1px rgba(0,0,0,.4),0 0 15px rgba(0,0,0,.2);
-}
-.login-container .remember-group {
-    color: #999;
-    display: inline-block;
-    margin-top: 7.5px;
-}
-.login-container .remember-group .control-label {
-    display: inline;
-    margin-bottom: 0;
-    font-weight: 400;
-    cursor: pointer;
-}
-.login-divider {
-    text-align: center;
-    border-bottom: 1px solid #555;
-    line-height: 0.1em;
-    margin: 50px auto;
-    max-width: 400px;
-    text-transform: uppercase;
-}
-.login-divider span {
-    background: #1f1f1f;
-    padding: 0 15px;
-    color: #999;
-}
-.login-button-plex {
-    text-align: center;
-}
-.login-button-plex .remember-group {
-    margin-top: 20px;
-}
-.login-button-plex button#sign-in-plex {
-    float: none;
-}
-.login-alert {
-    text-align: center;
-    padding: 8px;
-    display: none;
-}
-#admin-login-modal .form-group label {
-    font-weight: 400;
-    color: #999;
-}
-#admin-login-modal .remember-group {
-    float: left;
-    color: #999;
-}
-#admin-login-modal .remember-group .control-label {
-    display: inline;
-    margin-bottom: 0;
-    font-weight: 400;
-    cursor: pointer;
-}
-.datatable-wrap {
-    min-width: 150px;
-    max-width: 250px;
-}
-.inline-pre {
-    font-family: monospace;
-    margin: 0 2px;
-    padding: 2px 5px;
-    font-size: 13px;
-    color: #eee;
-    background-color: #555;
-    border: 0px solid #444;
-    border-radius: 3px;
-}
-.overlay-refresh-image {
-    opacity: 0;
-    color: #000;
-    font-size: 16px;
-    float: left;
-    position: absolute;
-    top: 0px;
-    right: 10px;
-    z-index: 1;
-    transition: all .1s cubic-bezier(.4,0,1,1);
-    -webkit-transition: all .1s cubic-bezier(.4,0,1,1);
-    -moz-transition: all .1s cubic-bezier(.4,0,1,1);
-    -o-transition: all .1s cubic-bezier(.4,0,1,1);
-    text-shadow: -1px -1px 0 #eee, 1px -1px 0 #eee, -1px 1px 0 #eee, 1px 1px 0 #eee;
-}
-.overlay-refresh-image.left {
-    left: 10px;
-}
-.overlay-refresh-image.info-art {
-    color: #999;
-    top: 15px;
-    right: 25px;
-    opacity: 1;
-    text-shadow: none;
-    cursor: pointer;
-}
-.overlay-refresh-image.info-art:hover {
-    color: #eee;
-    text-shadow: none;
-}
-a:hover .overlay-refresh-image {
-    opacity: .25;
-    top: 8px;
-}
-a:hover .overlay-refresh-image:hover {
-    opacity: .9;
-}
-.smart-collection-image,
-.smart-playlist-image {
-    float: left;
-    position: absolute;
-    top: 5px;
-    left: 5px;
-    background-color: #8e6191;
-    border-radius: 4px;
-    color: #fff;
-    font-size: 16px;
-    z-index: 1;
-    width: 32px;
-    padding: 5px;
-    text-align: center;
-}
-#ip_error, #isp_error {
-    color: #aaa;
-    display: none;
-    text-align: center;
-    padding-top: 10px;
-    padding-bottom: 10px;
-}
-#plexpy-notifiers-table .friendly_name,
-#notifier-config-modal span.notifier_id,
-#plexpy-newsletters-table .friendly_name,
-#newsletter-config-modal span.newsletter_id,
-#plexpy-mobile-devices-table .friendly_name,
-#mobile-device-config-modal span.notifier_id {
-    color: #777;
-}
-#notifier-config-modal .nav-tabs,
-#newsletter-config-modal .nav-tabs {
-    margin-bottom: 10px;
-    padding-left: 15px;
-    border-bottom: 1px solid #444;
-}
-#notifier-config-modal .nav-tabs > li,
-#newsletter-config-modal .nav-tabs > li {
-    margin: 0 0 -1px 0;
-}
-#notifier-config-modal .nav-tabs > li > a,
-#newsletter-config-modal .nav-tabs > li > a {
-    padding: 5px 10px;
-    color: #737373;
-}
-#notifier-config-modal .nav-tabs > li > a:hover,
-#newsletter-config-modal .nav-tabs > li > a:hover {
-    border-color: #444;
-    background: #222;
-}
-#notifier-config-modal .nav-tabs > li.active > a,
-#notifier-config-modal .nav-tabs > li.active > a:hover,
-#notifier-config-modal .nav-tabs > li.active > a:focus,
-#newsletter-config-modal .nav-tabs > li.active > a,
-#newsletter-config-modal .nav-tabs > li.active > a:hover,
-#newsletter-config-modal .nav-tabs > li.active > a:focus {
-    color: #eee;
-    background: #222;
-}
-#notifier-config-modal .nav-tabs > li.active > a,
-#notifier-config-modal .nav-tabs > li.active > a:hover,
-#notifier-config-modal .nav-tabs > li.active > a:focus,
-#newsletter-config-modal .nav-tabs > li.active > a,
-#newsletter-config-modal .nav-tabs > li.active > a:hover,
-#newsletter-config-modal .nav-tabs > li.active > a:focus {
-    border: 1px solid #444;
-    border-bottom-color: transparent;
-}
-#newsletter-config-modal #custom_cron {
-    display: inline-block;
-    width: initial;
-    height: 32px;
-    margin-right: 5px;
-    margin-top: 4px;
-}
-#newsletter-config-modal #cron-widget {
-    display: inline-block;
-    margin-top: 1px;
-}
-#newsletter-config-modal #cron-widget select.cron-select {
-    width: initial;
-    display: inline;
-    height: 32px;
-    margin-top: 4px;
-}
-#newsletter-config-modal #cron-widget select.cron-select[name=cron-period] option[value=minute],
-#newsletter-config-modal #cron-widget select.cron-select[name=cron-period] option[value=hour] {
-    display: none !important;
-}
-.git-group input.form-control {
-    width: 50%;
-}
-.git-group select.form-control {
-    width: 50%;
-    height: 32px;
-}
-#changelog-modal .modal-body > h2 {
-    margin-bottom: 10px;
-    padding-bottom: 10px;
-    border-bottom: 1px solid #444;
-    font-size: 18px;
-}
-#changelog-modal .modal-body > ul {
-    padding-left: 25px;
-    margin-bottom: 30px;
-}
-#changelog-modal ul {
-    padding-left: 20px;
-}
-.app-badge {
-    float: left;
-    display: inline-block;
-    height: 46px;
-    margin-right: 10px;
-    margin-bottom: 5px;
-}
-.app-badge img {
-    height: 46px;
-    vertical-align: middle;
-}
-
-.svg-icon {
-    background-size: calc(100% - 20px) calc(100% - 20px) !important;
-    background-origin: content-box !important;
-    background-repeat: no-repeat !important;
-    background-position: center !important;
-}
-.platform-alexa {
-    background-color: #00caff;
-    background-image: url(../images/platforms/alexa.svg);
-}
-.platform-android {
-    background-color: #3ddc84;
-    background-image: url(../images/platforms/android.svg);
-}
-.platform-atv {
-    background-color: #a2aaad;
-    background-image: url(../images/platforms/atv.svg);
-}
-.platform-chrome {
-    background-color: #db4437;
-    background-image: url(../images/platforms/chrome.svg);
-}
-.platform-chromecast {
-    background-color: #4285f4;
-    background-image: url(../images/platforms/chromecast.svg);
-}
-.platform-default {
-    background-color: #e5a00d;
-    background-image: url(../images/platforms/default.svg);
-}
-.platform-dlna {
-    background-color: #4ba32f;
-    background-image: url(../images/platforms/dlna.svg);
-}
-.platform-firefox {
-    background-color: #ff7139;
-    background-image: url(../images/platforms/firefox.svg);
-}
-.platform-gtv {
-    background-color: #008bcf;
-    background-image: url(../images/platforms/gtv.svg);
-}
-.platform-ie {
-    background-color: #18bcef;
-    background-image: url(../images/platforms/ie.svg);
-}
-.platform-ios {
-    background-color: #a2aaad;
-    background-image: url(../images/platforms/ios.svg);
-}
-.platform-kodi {
-    background-color: #30aada;
-    background-image: url(../images/platforms/kodi.svg);
-}
-.platform-lg {
-    background-color: #990033;
-    background-image: url(../images/platforms/lg.svg);
-}
-.platform-linux {
-    background-color: #0099cc;
-    background-image: url(../images/platforms/linux.svg);
-}
-.platform-macos {
-    background-color: #a2aaad;
-    background-image: url(../images/platforms/macos.svg);
-}
-.platform-msedge {
-    background-color: #0078d7;
-    background-image: url(../images/platforms/msedge.svg);
-}
-.platform-opera {
-    background-color: #fa1e4e;
-    background-image: url(../images/platforms/opera.svg);
-}
-.platform-playstation {
-    background-color: #003087;
-    background-image: url(../images/platforms/playstation.svg);
-}
-.platform-plex {
-    background-color: #e5a00d;
-    background-image: url(../images/platforms/plex.svg);
-}
-.platform-plexamp {
-    background-color: #e5a00d;
-    background-image: url(../images/platforms/plexamp.svg);
-}
-.platform-roku {
-    background-color: #673293;
-    background-image: url(../images/platforms/roku.svg);
-}
-.platform-safari {
-    background-color: #00d3f9;
-    background-image: url(../images/platforms/safari.svg);
-}
-.platform-samsung {
-    background-color: #034ea2;
-    background-image: url(../images/platforms/samsung.svg);
-}
-.platform-synclounge {
-    background-color: #151924;
-    background-image: url(../images/platforms/synclounge.svg);
-}
-.platform-tivo {
-    background-color: #00a7e1;
-    background-image: url(../images/platforms/tivo.svg);
-}
-.platform-wiiu {
-    background-color: #03a9f4;
-    background-image: url(../images/platforms/wiiu.svg);
-}
-.platform-windows {
-    background-color: #0078d7;
-    background-image: url(../images/platforms/windows.svg);
-}
-.platform-wp {
-    background-color: #68217a;
-    background-image: url(../images/platforms/windows.svg);
-}
-.platform-xbmc {
-    background-color: #3b4872;
-    background-image: url(../images/platforms/kodi.svg);
-}
-.platform-xbox {
-    background-color: #107c10;
-    background-image: url(../images/platforms/xbox.svg);
-}
-.platform-alexa-rgba {
-    background-color: rgba(0, 202, 255, 0.40);
-}
-.platform-android-rgba {
-    background-color: rgba(61, 220, 132, 0.40);
-}
-.platform-atv-rgba {
-    background-color: rgba(162, 170, 173, 0.40);
-}
-.platform-chrome-rgba {
-    background-color: rgba(219, 68, 55, 0.40);
-}
-.platform-chromecast-rgba {
-    background-color: rgba(66, 133, 244, 0.40);
-}
-.platform-default-rgba {
-    background-color: rgba(229, 160, 13, 0.40);
-}
-.platform-dlna-rgba {
-    background-color: rgba(75, 163, 47, 0.40);
-}
-.platform-firefox-rgba {
-    background-color: rgba(255, 113, 57, 0.40);
-}
-.platform-gtv-rgba {
-    background-color: rgba(0, 139, 207, 0.40);
-}
-.platform-ie-rgba {
-    background-color: rgba(24, 188, 239, 0.40);
-}
-.platform-ios-rgba {
-    background-color: rgba(162, 170, 173, 0.40);
-}
-.platform-kodi-rgba {
-    background-color: rgba(48, 170, 218, 0.40);
-}
-.platform-lg-rgba {
-    background-color: rgba(153, 0, 51, 0.40);
-}
-.platform-linux-rgba {
-    background-color: rgba(0, 153, 204, 0.40);
-}
-.platform-macos-rgba {
-    background-color: rgba(162, 170, 173, 0.40);
-}
-.platform-msedge-rgba {
-    background-color: rgba(0, 120, 215, 0.40);
-}
-.platform-opera-rgba {
-    background-color: rgba(250, 30, 78, 0.40);
-}
-.platform-playstation-rgba {
-    background-color: rgba(0, 48, 135, 0.40);
-}
-.platform-plex-rgba {
-    background-color: rgba(229, 160, 13, 0.40);
-}
-.platform-plexamp-rgba {
-    background-color: rgba(229, 160, 13, 0.40);
-}
-.platform-roku-rgba {
-    background-color: rgba(103, 50, 147, 0.40);
-}
-.platform-safari-rgba {
-    background-color: rgba(0, 211, 249, 0.40);
-}
-.platform-samsung-rgba {
-    background-color: rgba(3, 78, 162, 0.40);
-}
-.platform-synclounge-rgba {
-    background-color: rgba(21, 25, 36, 0.40);
-}
-.platform-tivo-rgba {
-    background-color: rgba(0, 167, 225, 0.40);
-}
-.platform-wiiu-rgba {
-    background-color: rgba(3, 169, 244, 0.40);
-}
-.platform-windows-rgba {
-    background-color: rgba(0, 120, 215, 0.40);
-}
-.platform-wp-rgba {
-    background-color: rgba(104, 33, 122, 0.40);
-}
-.platform-xbmc-rgba {
-    background-color: rgba(59, 72, 114, 0.40);
-}
-.platform-xbox-rgba {
-    background-color: rgba(16, 124, 16, 0.40);
-}
-.library-movie {
-    background-image: url(../images/libraries/movie.svg);
-}
-.library-show {
-    background-image: url(../images/libraries/show.svg);
-}
-.library-artist {
-    background-image: url(../images/libraries/artist.svg);
-}
-.library-photo {
-    background-image: url(../images/libraries/photo.svg);
-}
-.library-video {
-    background-image: url(../images/libraries/video.svg);
-}
-.library-live {
-    background-image: url(../images/libraries/live.svg);
-}
-.stats-most_concurrent {
-    background-image: url(../images/icons/most-concurrent-streams.svg);
-}
-.rating-image {
-    height: 20px;
-    margin-left: 10px;
-    margin-right: 5px;
-    display: inline-block;
-    background-origin: content-box !important;
-    background-repeat: no-repeat !important;
-    background-position: left !important;
-}
-.rating-imdb {
-    width: 36px;
-    background-image: url(../images/rating/imdb.svg);
-    background-size: auto 20px;
-}
-.rating-themoviedb {
-    width: 38px;
-    background-image: url(../images/rating/themoviedb.svg);
-    background-size: auto 16px;
-}
-.rating-thetvdb {
-    width: 36px;
-    background-image: url(../images/rating/thetvdb.svg);
-    background-size: auto 36px;
-}
-.rating-rottentomatos-ripe {
-    width: 17px;
-    background-image: url(../images/rating/tomato-ripe.svg);
-    background-size: auto 20px;
-}
-.rating-rottentomatos-rotten {
-    width: 17px;
-    background-image: url(../images/rating/tomato-rotten.svg);
-    background-size: auto 20px;
-}
-.rating-rottentomatos-upright {
-    width: 16px;
-    background-image: url(../images/rating/popcorn-upright.svg);
-    background-size: auto 20px;
-}
-.rating-rottentomatos-spilled {
-    width: 19px;
-    background-image: url(../images/rating/popcorn-spilled.svg);
-    background-size: auto 20px;
-}
-.transparent {
-    background-color: transparent !important;
-}
-.no-image {
-    background-image: none !important;
-}
-#info-modal .stream-info-current {
-    color: #aaa;
-    text-align: center;
-    padding-bottom: 10px;
-}
-#info-modal .stream-info-item {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-    align-items: baseline;
-    width: 100%;
-    margin-bottom: 5px;
-}
-#info-modal .stream-info-item .sub-heading {
-    height: 100%;
-    width: 75px;
-    color: #aaa;
-    font-size: 10px;
-    text-align: right;
-    text-transform: uppercase;
-    line-height: 14px;
-    -webkit-flex-shrink: 0;
-    flex-shrink: 0;
-}
-#info-modal .stream-info-item .sub-value {
-    color: #eee;
-    font-weight: bold;
-    margin-left: 10px;
-    text-align: left;
-    line-height: 14px;
-    -webkit-flex-grow: 1;
-    flex-grow: 1;
-}
-.stream-info {
-    width: 100%;
-    margin-top: 10px;
-    background-color: #282828;
-    table-layout: fixed;
-}
-.stream-info .heading {
-    color: #E5A00D;
-    text-transform: uppercase;
-    font-size: 15px;
-    font-weight: bold !important;
-}
-.stream-info th:first-child {
-    width: 125px;
-    height: 30px;
-    color: #eee;
-    font-size: 12px;
-    text-align: right;
-    text-transform: uppercase;
-}
-.stream-info th:not(:first-child) {
-    text-align: center;
-    font-weight: normal;
-}
-.stream-info td {
-    height: 25px;
-}
-.stream-info td:first-child {
-    color: #aaa;
-    font-size: 10px;
-    text-align: right;
-    text-transform: uppercase;
-}
-.stream-info td:not(:first-child) {
-    text-align: center;
-}
-.stream-info tr:nth-child(odd) td {
-    background-color: rgba(255,255,255,0.035);
-}
-.stream-info tr:nth-child(even) td {
-    background-color: rgba(255,255,255,0.010);
-}
-.stream-info td:nth-child(3),
-.stream-info th:nth-child(3) {
-    width: 25px;
-}
-.number-input {
-    margin: 0 !important;
-    width: 55px !important;
-    height: 34px !important;
-    -moz-appearance: textfield;
-}
-.number-input::-webkit-inner-spin-button,
-.number-input::-webkit-outer-spin-button {
-    -webkit-appearance: none;
-    margin: 0;
-}
-.newsletter-time_frame .input-group-addon {
-    height: 32px;
-    width: 52px;
-    margin-top: 5px;
-    line-height: 1.42857143;
-}
-.newsletter-time_frame input.form-control {
-    width: calc(50% - 37px);
-}
-.newsletter-time_frame select.form-control  {
-    width: calc(50% - 15px);
-    height: 32px;
-}
-.newsletter-loader-container {
-    font-family: 'Open Sans', Arial, sans-serif;
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-}
-.newsletter-loader-message {
-    color: #282A2D;
-    text-align: center;
-    position: absolute;
-    left: 50%;
-    top: 25%;
-    transform: translate(-50%, -50%);
-}
-.newsletter-loader {
-    border: 5px solid #ccc;
-    -webkit-animation: spin 1s linear infinite;
-    animation: spin 1s linear infinite;
-    border-top: 5px solid #282A2D;
-    border-radius: 50%;
-    width: 50px;
-    height: 50px;
-    position: relative;
-    left: calc(50% - 25px);
-}
-@keyframes spin {
-    0% { transform: rotate(0deg); }
-    100% { transform: rotate(360deg); }
-}
-a[data-tab-destination] {
-    cursor: pointer;
-}
-.modal-config-section {
-    margin-top: 10px !important;
-    padding-top: 10px;
-    border-top: 1px solid #444;
-}
-.newsletter-logo {
-    margin: 0 auto 50px auto;
-    text-align: center;
-}
-.pointer {
-    cursor: pointer;
-}
-
-.iframe-container {
-    width: 100%;
-    height: calc(100vh - 200px);
-    position: relative;
-}
-.iframe-overlay {
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    background: url(../images/discord-overlay.png) no-repeat;
-    background-size: cover;
-    border: 1px solid #36393e;
-}
-.iframe-button-container {
-    margin: 0;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-}
-.iframe-button {
-    color: #eee;
-    border-radius: 20px;
-    text-align: center;
-    cursor: pointer;
-    font-size: 15px;
-    height: 28px;
-    line-height: 28px;
-    min-width: 200px;
-    transition: box-shadow 0.3s ease;
-    padding: 0 15px;
-    background: rgba(114, 137, 218, 0.4);
-    text-transform: uppercase;
-    text-decoration: none;
-    display: block;
-}
-.iframe-button:hover,
-.iframe-button:focus {
-    color: #eee;
-    box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 0px 99999px inset, rgba(0, 0, 0, 0.2) 0px 1px 5px 0px, rgba(0, 0, 0, 0.14) 0px 2px 2px 0px, rgba(0, 0, 0, 0.12) 0px 3px 1px -2px;
-}
-.iframe-button:active {
-    box-shadow: rgba(255, 255, 255, 0.1) 0px 0px 0px 99999px inset, rgba(0, 0, 0, 0.2) 0px 5px 5px -3px, rgba(0, 0, 0, 0.14) 0px 8px 10px 1px, rgba(0, 0, 0, 0.12) 0px 3px 14px 2px;
-}
-.iframe {
-    width: 100%;
-    height: 100%;
-    position: inherit;
-    display: block;
-    border: 0;
-}
-.fa-blank {
-    visibility: hidden;
-}
-
-#browser-warning {
-    height: 25px;
-    width: 100%;
-    background: #cc7b19;
-    text-align: center;
-    font-weight: bold;
-    padding: 2px 10px;
-    position: absolute;
-    top: 0;
-    z-index: 9999;
-}
-
-.help-block li {
-    margin-top: 0;
-    color: #737373;
-}
-
-#browse-path-list > li > span > i.fa {
-    color: #999;
-}
-
-#tautulli-news .open .news-title,
-#tautulli-news .open .news-date,
-#tautulli-news .accordion li.open .link i.fa {
-    color: #eee;
-}
-.news-title,
-.news-date {
-    color: #999;
-    padding-left: 5px;
-}
-.news-subtitle {
-    display: block;
-    color: #aaa;
-    font-weight: bold;
-    margin-bottom: 10px;
-}
-.news-body {
-    display: block;
-    color: #aaa;
-}
-.news-body p:last-of-type {
-    margin-bottom: 0;
-}
-.news-body a {
-    display: inline !important;
-    background: none !important;
-    padding: 0 !important;
-    color: #eee;
-}
-.news-body a:hover {
-    color: #f9be03;
-}
-
-a.donate-with-crypto,
-a.donate-with-crypto > span {
-    background: none;
-    border: none;
-    border-radius: 0;
-    box-sizing: border-box;
-    clear: none;
-    clip: auto;
-    cursor: default;
-    display: block;
-    float: none;
-    height: auto;
-    margin: 0;
-    max-height: none;
-    min-height: none;
-    padding: 0;
-    opacity: 1;
-    text-shadow: none;
-    vertical-align: baseline;
-    visibility: visible;
-    width: auto;
-}
-a.donate-with-crypto {
-    user-select: none;
-    user-drag: none;
-    -webkit-user-drag: none;
-    text-decoration: none;
-    background: #1652f0 linear-gradient(#1652f0, #0655ab);
-    cursor: pointer;
-    transition: background 0.2s ease-in-out, padding 0.2s;
-    border-radius: 6px;
-    display: inline-block;
-    height: 40px;
-    padding: 9px 15px 11px 15px;
-    position: relative;
-    min-width: 160px;
-}
-a.donate-with-crypto:hover {
-    background: #1652f0;
-}
-a.donate-with-crypto > span {
-    color: white;
-    font: normal 500 14px/20px -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', 'San Francisco', 'Roboto', 'Segoe UI', 'Helvetica Neue', 'Lucida Grande', sans-serif;
-    letter-spacing: 0;
-    overflow: hidden;
-    text-align: center;
-    text-overflow: ellipsis;
-    text-shadow: 0 1px 0 rgba(0, 0, 0, 0.15);
-    white-space: nowrap;
-}
-a.donate-with-crypto::after {
-    border-radius: 6px;
-    box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.2);
-    content: '';
-    display: block;
-    width: 100%;
-    height: 100%;
-    position: absolute;
-    opacity: 1;
-    top: 0;
-    left: 0;
-}
-#crypto-select {
-    width: 280px;
-    margin: 15px auto;
-}
-#crypto-qrcode {
-    width: 258px;
-    padding: 0;
-    margin: 15px auto;
-    line-height: 0;
-    text-align: center;
-    background-color: #eee;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    display: none;
-}
-#crypto-address {
-    margin: 15px auto;
-    text-align: center;
-    display: none;
-}
-
-#api_qr_code {
-    width: 100%;
-    padding: 0;
-    margin: 0 0 10px;
-    line-height: 0;
-    text-align: center;
-    background-color: #eee;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-}
-
-.docker-mount {
-    margin: 20px auto 0 auto;
-    position: relative;
-}
\ No newline at end of file
diff --git a/data/interfaces/default/current_activity.html b/data/interfaces/default/current_activity.html
new file mode 100644
index 00000000..b118d47f
--- /dev/null
+++ b/data/interfaces/default/current_activity.html
@@ -0,0 +1,283 @@
+<%doc>
+USAGE DOCUMENTATION :: PLEASE LEAVE THIS AT THE TOP OF THIS FILE
+
+For Mako templating syntax documentation please visit: http://docs.makotemplates.org/en/latest/
+
+Filename:           current_activity.html
+Version:            0.1
+Variable names:     data [list]
+
+data :: Usable parameters
+
+data['stream_count']    Returns the current number of active streams
+data['sessions']        Returns an array containing session data
+
+data[sessions] :: Usable parameters
+
+== Global keys ==
+session_key                 Returns a unique session id for the active stream
+rating_key                  Returns the unique identifier for the media item.
+media_index                 Returns the index of the media item.
+parent_media_index          Returns the index of the media item's parent.
+media_type                  Returns the type of session. Either 'track', 'episode' or 'movie'.
+thumb                       Returns the location of the item's thumbnail. Use with pms_image_proxy.
+bif_thumb                   Returns the location of the item's bif thumbnail. Use with pms_image_proxy.
+art                         Returns the location of the item's artwork
+progress_percent            Returns the current progress of the item. 0 to 100.
+user                        Returns the name of the user owning the session.
+user_id                     Returns the Plex user id if available.
+machine_id                  Returns the machine id of the players being used.
+friendly_name               Returns the friendlly name of the user owning the session.
+user_thumb                  Returns the profile picture of the user owning the session.
+state                       Returns the state of the current session. Either 'playing', 'paused' or 'buffering'.
+title                       Returns the name of the episode, movie or music track.
+year                        Returns the year of the episode, movie, or clip.
+player                      Returns the name of the platform used to play the stream.
+platform                    Returns the type of platform used to play the stream.
+throttled                   Returns true if the transcode session is throttled.
+transcode_progress          Returns the current transcode progress of the item. 0 to 100.
+transcode_speed             Returns the current transcode speed of the item.
+audio_decision              Returns the audio transcode decision. Either 'transcode', 'copy' or 'direct play'.
+audio_codec                 Returns the name of the audio codec.
+audio_channels              Returns the number of audio channels.
+grandparent_title           Returns the title of the item's grandparent.
+parent_title                Returns the title of the item's parent.
+video_decision              Returns the video transcode decision. Either 'transcode', 'copy' or 'direct play'.
+video_codec                 Returns the name of the video codec.
+height                      Returns the value of the video height.
+width                       Returns the value of the video width.
+container                   Returns the value of the media container.
+bitrate                     Returns the value of the media bitrate.
+video_resolution            Returns the value of the video resolution.
+video_framerate             Returns the value of the video framerate.
+video_aspect_ratio          Returns the value of the video aspect ratio.
+transcode_audio_channels    Returns the amount of audio channels if there is a transcode session.
+transcode_audio_codec       Returns the name of the audio codec if there is a transcode session.
+transcode_video_codec       Returns the name of the video codec if there is a transcode session.
+transcode_width             Returns the video width if there is a transcode session.
+transcode_height            Returns the video height if there is a transcode session.
+transcode_container         Returns the value of media container if there is a transcode session.
+transcode_protocol          Returns the value of media protocol if there is a transcode session.
+indexes                     Returns true if the media has media indexes and are enabled
+
+DOCUMENTATION :: END
+</%doc>
+
+% if data is not None:
+% if data['stream_count'] != '0':
+% for a in data['sessions']:
+<div class="dashboard-instance" id="instance-${a['session_key']}">
+    % if a['media_type'] == 'movie' or a['media_type'] == 'episode' or a['media_type'] == 'track':
+    <a href="info?item_id=${a['rating_key']}">
+    % endif
+        <div class="dashboard-activity-poster">
+            % if a['media_type'] == 'movie' and not a['indexes']:
+            <div class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${a['art']}&width=500&height=280);"></div>
+            % elif a['media_type'] == 'episode' and not a['indexes']:
+            <div class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${a['art']}&width=500&height=280);"></div>
+            % elif a['indexes']:
+            <div class="dashboard-activity-poster-face bif" style="background-image: url(pms_image_proxy?img=${a['bif_thumb']}&width=500&height=280); display: none;"></div>
+            % else:
+                % if a['media_type'] == 'track':
+                <div class="dashboard-activity-cover-face-bg" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=300&height=300);"></div>
+                <div class="dashboard-activity-cover-face" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=300&height=300);"></div>
+                % elif a['media_type'] == 'clip':
+                    % if a['art'][:4] == 'http':
+                    <div class="dashboard-activity-poster-face" style="background-image: url(${a['art']});"></div>
+                    % elif a['thumb'][:4] == 'http':
+                    <div class="dashboard-activity-poster-face" style="background-image: url(${a['thumb']});"></div>
+                    % else:
+                        % if a['art']:
+                        <div class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${a['art']}&width=500&height=280);"></div>
+                        % else:
+                        <div class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=500&height=280);"></div>
+                        % endif
+                    % endif
+                % elif a['media_type'] == 'photo':
+                <div class="dashboard-activity-poster-face bif" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=500&height=500);"></div>
+                % else:
+                <div class="dashboard-activity-cover-face" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=300&height=300&fallback=cover);"></div>
+                % endif
+            % endif
+            <div class="dashboard-activity-button-info">
+                <button type="button" class="btn btn-activity-info btn-lg" data-target="#stream-${a['session_key']}">
+                    <i class="fa fa-info-circle"></i>
+                </button>
+            </div>
+            <div id="stream-${a['session_key']}" class="dashboard-activity-info-details-overlay">
+                <div class="dashboard-activity-info-details-content">
+                    <div id="platform-${a['session_key']}" title="${a['platform']}">
+                        <script>
+                            $("#platform-${a['session_key']}").html("<div class='dashboard-activity-info-platform-box' style='background-image: url(" + getPlatformImagePath('${a['platform']}') + ");'>");
+                        </script>
+                    </div>
+                    <div class="dashboard-activity-info-platform">
+                        <strong>${a['player']}</strong><br />
+                        % if a['state'] == 'playing':
+                        State &nbsp;<strong>Playing</strong>
+                        % elif a['state'] == 'paused':
+                        State &nbsp;<strong>Paused</strong>
+                        % elif a['state'] == 'buffering':
+                        State &nbsp;<strong>Buffering</strong>
+                        % endif
+                    </div>
+                    % if a['media_type'] == 'track':
+                        % if a['audio_decision'] == 'direct play':
+                        Stream &nbsp;<strong>Direct Play</strong>
+                        % elif a['audio_decision'] == 'copy':
+                        Stream &nbsp;<strong>Direct Stream</strong>
+                        % else:
+                        Stream &nbsp;<strong>Transcoding
+                            (Speed: ${a['transcode_speed']})
+                            % if a['throttled'] == '1':
+                            (Throttled)
+                            % endif
+                        </strong>
+                        % endif
+                        <br />
+                        % if a['audio_decision'] == 'direct play':
+                        Audio &nbsp;<strong>Direct Play (${a['audio_codec']}) (${a['audio_channels']}ch)</strong>
+                        % elif a['audio_decision'] == 'copy':
+                        Audio &nbsp;<strong>Direct Stream (${a['transcode_audio_codec']}) (${a['transcode_audio_channels']}ch)</strong>
+                        % elif a['audio_decision'] == 'transcode':
+                        Audio &nbsp;<strong>Transcode (${a['transcode_audio_codec']}) (${a['transcode_audio_channels']}ch)</strong>
+                        % endif
+                    % elif a['media_type'] == 'episode' or a['media_type'] == 'movie' or a['media_type'] == 'clip':
+                        % if a['video_decision'] == 'direct play' and a['audio_decision'] == 'direct play':
+                        Stream &nbsp;<strong>Direct Play</strong>
+                        % elif a['video_decision'] == 'copy' and a['audio_decision'] == 'copy':
+                        Stream &nbsp;<strong>Direct Stream</strong>
+                        % else:
+                        Stream &nbsp;<strong>Transcoding
+                            (Speed: ${a['transcode_speed']})
+                            % if a['throttled'] == '1':
+                            (Throttled)
+                            % endif
+                        </strong>
+                        % endif
+                        <br />
+                        % if a['video_decision'] == 'direct play':
+                        Video &nbsp;<strong>Direct Play (${a['video_codec']}) (${a['width']}x${a['height']})</strong>
+                        % elif a['video_decision'] == 'copy':
+                        Video &nbsp;<strong>Direct Stream (${a['transcode_video_codec']}) (${a['width']}x${a['height']})</strong>
+                        % elif a['video_decision'] == 'transcode':
+                        Video &nbsp;<strong>Transcode (${a['transcode_video_codec']}) (${a['transcode_width']}x${a['transcode_height']})</strong>
+                        % endif
+                        <br />
+                        % if a['audio_decision'] == 'direct play':
+                        Audio &nbsp;<strong>Direct Play (${a['audio_codec']}) (${a['audio_channels']}ch)</strong>
+                        % elif a['audio_decision'] == 'copy':
+                        Audio &nbsp;<strong>Direct Stream (${a['transcode_audio_codec']}) (${a['transcode_audio_channels']}ch)</strong>
+                        % elif a['audio_decision'] == 'transcode':
+                        Audio &nbsp;<strong>Transcode (${a['transcode_audio_codec']}) (${a['transcode_audio_channels']}ch)</strong>
+                        % endif
+                    % elif a['media_type'] == 'photo':
+                        % if a['video_decision'] == 'direct play':
+                        Stream &nbsp;<strong>Direct Play</strong>
+                        % elif a['video_decision'] == 'copy':
+                        Stream &nbsp;<strong>Direct Stream</strong>
+                        % else:
+                        Stream &nbsp;<strong>
+                            Transcoding
+                            (Speed: ${a['transcode_speed']})
+                            % if a['throttled'] == '1':
+                            (Throttled)
+                            % endif
+                        </strong>
+                        % endif
+                    % endif
+                    <br>
+                </div>
+            </div>
+            % if a['media_type'] != 'photo':
+            <div class="dashboard-activity-poster-info-bar">
+                <div class="dashboard-activity-poster-info-time">
+                    <span class="progress_time">${a['view_offset']}</span>/<span class="progress_time">${a['duration']}</span>
+                </div>
+            </div>
+            % endif
+        </div>
+    % if a['media_type'] == 'movie' or a['media_type'] == 'episode' or a['media_type'] == 'track':
+    </a>
+    % endif
+    <div class="dashboard-activity-progress">
+        <div class="dashboard-activity-progress-bar">
+            <div class="bufferbar" style="width: ${a['transcode_progress']}%">${a['transcode_progress']}%</div>
+            <div class="bar" style="width: ${a['progress_percent']}%">${a['progress_percent']}%</div>
+        </div>
+    </div>
+    <div class="dashboard-activity-metadata-wrapper">
+        <a href="user?user_id=${a['user_id']}">
+            <div class="dashboard-activity-metadata-user-thumb" style="background-image: url(${a['user_thumb']});"></div>
+        </a>
+        <div class="dashboard-activity-metadata-title">
+            % if a['state'] == 'playing':
+            <i class="fa fa-play"></i>&nbsp;
+            % elif a['state'] == 'paused':
+            <i class="fa fa-pause"></i>&nbsp;
+            % elif a['state'] == 'buffering':
+            <i class="fa fa-spinner"></i>&nbsp;
+            % endif
+            % if a['media_type'] == 'episode':
+            <a href="info?item_id=${a['rating_key']}" title="${a['grandparent_title']} - ${a['title']}">${a['grandparent_title']} - ${a['title']}</a>
+            % elif a['media_type'] == 'movie':
+            <a href="info?item_id=${a['rating_key']}" title="${a['title']}">${a['title']}</a>
+            % elif a['media_type'] == 'clip':
+            <span title="${a['title']}">${a['title']}</span>
+            % elif a['media_type'] == 'track':
+            <a href="info?item_id=${a['rating_key']}" title="${a['grandparent_title']} - ${a['title']}">${a['grandparent_title']} - ${a['title']}</a>
+            % elif a['media_type'] == 'photo':
+            <span title="${a['parent_title']}">${a['parent_title']}</span>
+            % else:
+            <span title="${a['title']}">${a['title']}</span>
+            % endif
+        </div>
+        <div class="dashboard-activity-metadata-subtitle">
+            % if a['media_type'] == 'episode':
+            <span title="S${a['parent_media_index']} &middot; E${a['media_index']}">S${a['parent_media_index']} &middot; E${a['media_index']}</span>
+            % elif a['media_type'] == 'movie':
+            <span title="${a['year']}">${a['year']}</span>
+            % elif a['media_type'] == 'track':
+            <a href="info?item_id=${a['parent_rating_key']}" title="${a['parent_title']}">${a['parent_title']}</a>
+            % elif a['media_type'] == 'photo':
+            <span title="${a['title']}">${a['title']}</span>
+            % else:
+            <span title="${a['year']}">${a['year']}</span>
+            % endif
+        </div>
+        <div class="dashboard-activity-metadata-user">
+            % if a['user_id']:
+            <a href="user?user_id=${a['user_id']}" title="${a['friendly_name']}">${a['friendly_name']}</a>
+            % else:
+            <a href="user?user=${a['user']}" title="${a['friendly_name']}">${a['friendly_name']}</a>
+            % endif
+        </div>
+</div>
+</div>
+
+% endfor
+<script>
+    // When using bif indexes make the image transition a little smoother.
+    $('.bif').each(function() {
+        $(this).hide().fadeIn(1000);
+    });
+
+    // Convert timestamps to readable times
+    $('.progress_time').each(function(index) {
+        $(this).html(millisecondsToMinutes($(this).text(), false));
+    });
+
+    // Show/Hide activity info
+    $('.btn-activity-info').on('click', function(e) {
+        e.preventDefault();
+        $($(this).attr('data-target')).toggle();
+    });
+</script>
+% else:
+<div class="text-muted">Nothing is currently being watched.</div><br>
+% endif
+% else:
+<div class="text-muted">There was an error communicating with your Plex Server. Please check your <a
+        href="settings">settings</a>.
+</div><br>
+% endif
diff --git a/data/interfaces/default/current_activity_header.html b/data/interfaces/default/current_activity_header.html
index 042450b1..897a99af 100644
--- a/data/interfaces/default/current_activity_header.html
+++ b/data/interfaces/default/current_activity_header.html
@@ -15,24 +15,11 @@ DOCUMENTATION :: END
 </%doc>
 
 % if data != None:
-<%
-    s = '('
-    if data['direct_play']:
-        s += str(data['direct_play']) + ' direct play' + ('s' if data['direct_play'] > 1 else '') + ', '
-    if data['direct_stream']:
-        s += str(data['direct_stream']) + ' direct stream' + ('s' if data['direct_stream'] > 1 else '') + ', '
-    if data['transcode']:
-        s += str(data['transcode']) + ' transcode' + ('s' if data['transcode'] > 1 else '') + ', '
-    s = s.rstrip(', ')
-    s += ')'
-%>
-	% if data['stream_count'] == '0':
-	<h3>Activity</h3>
-	% elif data['stream_count'] == '1':
-	<h3>Activity &nbsp;&nbsp;<small>${data['stream_count']} stream ${s}</small></h3>
-	% else:
-	<h3>Activity &nbsp;&nbsp;<small>${data['stream_count']} streams ${s}</small></h3>
-	% endif
+% if data == '0':
+<h3>Activity</h3>
+% else:
+<h3>Activity <small>${data} stream(s)</small></h3>
+% endif
 % else:
 <h3>Activity</h3>
-% endif
+% endif
\ No newline at end of file
diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html
deleted file mode 100644
index 64d6f25e..00000000
--- a/data/interfaces/default/current_activity_instance.html
+++ /dev/null
@@ -1,550 +0,0 @@
-<%doc>
-USAGE DOCUMENTATION :: PLEASE LEAVE THIS AT THE TOP OF THIS FILE
-
-For Mako templating syntax documentation please visit: http://docs.makotemplates.org/en/latest/
-
-Filename:           current_activity_instance.html
-Version:            0.1
-Variable names:     data {dict}
-
-data :: Usable parameters
-
-== Global keys ==
-session_key                 Returns a unique session id for the active stream
-rating_key                  Returns the unique identifier for the media item.
-media_index                 Returns the index of the media item.
-parent_media_index          Returns the index of the media item's parent.
-media_type                  Returns the type of session. Either 'track', 'episode' or 'movie'.
-thumb                       Returns the location of the item's thumbnail. Use with pms_image_proxy.
-bif_thumb                   Returns the location of the item's bif thumbnail. Use with pms_image_proxy.
-art                         Returns the location of the item's artwork
-progress_percent            Returns the current progress of the item. 0 to 100.
-user                        Returns the name of the user owning the session.
-user_id                     Returns the Plex user id if available.
-machine_id                  Returns the machine id of the players being used.
-friendly_name               Returns the friendlly name of the user owning the session.
-user_thumb                  Returns the profile picture of the user owning the session.
-state                       Returns the state of the current session. Either 'playing', 'paused' or 'buffering'.
-title                       Returns the name of the episode, movie or music track.
-year                        Returns the year of the episode, movie, or clip.
-ip_address                  Returns the ip address of the stream.
-player                      Returns the name of the platform used to play the stream.
-platform                    Returns the type of platform used to play the stream.
-transcode_throttled         Returns true if the transcode session is throttled.
-transcode_progress          Returns the current transcode progress of the item. 0 to 100.
-transcode_speed             Returns the current transcode speed of the item.
-audio_decision              Returns the audio transcode decision. Either 'transcode', 'copy' or 'direct play'.
-audio_codec                 Returns the name of the audio codec.
-audio_channels              Returns the number of audio channels.
-grandparent_title           Returns the title of the item's grandparent.
-parent_title                Returns the title of the item's parent.
-video_decision              Returns the video transcode decision. Either 'transcode', 'copy' or 'direct play'.
-video_codec                 Returns the name of the video codec.
-height                      Returns the value of the video height.
-width                       Returns the value of the video width.
-container                   Returns the value of the media container.
-bitrate                     Returns the value of the media bitrate.
-video_resolution            Returns the value of the video resolution.
-video_framerate             Returns the value of the video framerate.
-video_aspect_ratio          Returns the value of the video aspect ratio.
-transcode_audio_channels    Returns the amount of audio channels if there is a transcode session.
-transcode_audio_codec       Returns the name of the audio codec if there is a transcode session.
-transcode_video_codec       Returns the name of the video codec if there is a transcode session.
-transcode_width             Returns the video width if there is a transcode session.
-transcode_height            Returns the video height if there is a transcode session.
-transcode_container         Returns the value of media container if there is a transcode session.
-transcode_protocol          Returns the value of media protocol if there is a transcode session.
-indexes                     Returns true if the media has media indexes and are enabled
-
-DOCUMENTATION :: END
-</%doc>
-
-% if session is not None:
-<%
-    from collections import defaultdict
-    from plexpy.helpers import cast_to_int, get_percent, page, short_season
-    from plexpy.common import VIDEO_RESOLUTION_OVERRIDES, AUDIO_CODEC_OVERRIDES, EXTRA_TYPES
-    import plexpy
-%>
-<%
-    data = defaultdict(lambda: 'Unknown', **session)
-    sk = data['session_key']
-
-    href = page('info', data['rating_key'])
-    parent_href = page('info', data['parent_rating_key'])
-    grandparent_href = page('info', data['grandparent_rating_key'])
-    user_href = page('user', data['user_id']) if data['user_id'] else '#'
-    library_href = page('library', data['section_id']) if data['section_id'] else '#'
-    season = short_season(data['parent_title'])
-%>
-<div class="dashboard-activity-instance" id="activity-instance-${sk}" data-key="${sk}" data-id="${data['session_id']}"
-    data-rating_key="${data['rating_key']}" data-parent_rating_key="${data['parent_rating_key']}" data-grandparent_rating_key="${data['grandparent_rating_key']}"
-    data-guid="${data['guid']}">
-    <div class="dashboard-activity-container">
-        <%
-            if data['live']:
-                background_url = page('pms_image_proxy', data['art'], data['rating_key'], 500, 280, 40, '282828', 3, fallback='art-live', refresh=True)
-            elif data['channel_stream'] == 0:
-                background_url = page('pms_image_proxy', data['art'], data['rating_key'], 500, 280, 40, '282828', 3, fallback='art', refresh=True)
-            else:
-                background_url = page('pms_image_proxy', data['art'] or data['thumb'], data['rating_key'], 500, 280, 40, '282828', 3, fallback='art', refresh=True, clip=True)
-        %>
-        <div id="background-${sk}" class="dashboard-activity-background" style="background-image: url(${background_url});">
-            <div class="dashboard-activity-poster-container hidden-xs">
-                % if data['media_type'] == 'track':
-                <div id="poster-${sk}-bg" class="dashboard-activity-poster" style="background-image: url(${page('pms_image_proxy', data['parent_thumb'], data['parent_rating_key'], 300, 300, 60, '282828', 3, fallback='cover', refresh=True)});"></div>
-                % endif
-                % if data['live']:
-                    % if data['media_type'] == 'movie':
-                    <a id="poster-url-${sk}" href="${href}" title="${data['title']}">
-                        <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(${page('pms_image_proxy', data['thumb'], data['rating_key'], 300, 450, fallback='poster-live', refresh=True)});"></div>
-                    </a>
-                    % elif data['media_type'] == 'episode':
-                    <a id="poster-url-${sk}" href="${href}" title="${data['grandparent_title']}">
-                        <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(${page('pms_image_proxy', data['grandparent_thumb'], data['rating_key'], 300, 450, fallback='poster-live', refresh=True)});"></div>
-                    </a>
-                    % else:
-                    <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(${page('pms_image_proxy', data['grandparent_thumb'] or data['thumb'], data['rating_key'], 300, 450, fallback='poster-live', refresh=True)});"></div>
-                    % endif
-                % elif data['channel_stream'] == 0:
-                    % if data['media_type'] == 'movie':
-                    <a id="poster-url-${sk}" href="${href}" title="${data['title']}">
-                        <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(${page('pms_image_proxy', data['thumb'], data['rating_key'], 300, 450, fallback='poster', refresh=True)});"></div>
-                    </a>
-                    % elif data['media_type'] == 'episode':
-                    <a id="poster-url-${sk}" href="${grandparent_href}" title="${data['grandparent_title']}">
-                        <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(${page('pms_image_proxy', data['grandparent_thumb'], data['grandparent_rating_key'], 300, 450, fallback='poster', refresh=True)});"></div>
-                    </a>
-                    % elif data['media_type'] == 'track':
-                    <a id="poster-url-${sk}" href="${parent_href}" title="${data['parent_title']}">
-                        <div id="poster-${sk}" class="dashboard-activity-cover" style="background-image: url(${page('pms_image_proxy', data['parent_thumb'], data['parent_rating_key'], 300, 300, fallback='cover', refresh=True)});"></div>
-                    </a>
-                    % elif data['media_type'] in ('photo', 'clip'):
-                        % if data['parent_thumb']:
-                        <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(${page('pms_image_proxy', data['parent_thumb'], data['parent_rating_key'], 300, 450, fallback='poster', refresh=True)});"></div>
-                        % else:
-                        <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(${page('pms_image_proxy', data['thumb'], data['rating_key'], 300, 450, fallback='poster', refresh=True)});"></div>
-                        % endif
-                    % else:
-                    <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(images/poster.png);"></div>
-                    % endif
-                % else:
-                    <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(${page('pms_image_proxy', data['channel_icon'], data['rating_key'], 300, 300, 60, '282828', 3, fallback='cover', refresh=True)});"></div>
-                    <div id="poster-${sk}" class="dashboard-activity-cover" style="background-image: url(${page('pms_image_proxy', data['channel_icon'], data['rating_key'], 300, 300, fallback='cover', refresh=True)});"></div>
-                % endif
-            </div>
-            <div class="dashboard-activity-info-icon">
-                <%
-                    if not _session['user_group'] == 'admin' or not data['session_id']:
-                        no_terminate = '-no-terminate'
-                    else:
-                        no_terminate = ''
-                %>
-                <div id="platform-${sk}" class="dashboard-activity-info-platform${no_terminate} svg-icon platform-${data['platform_name']}" title="${data['platform']}"></div>
-                % if _session['user_group'] == 'admin' and plexpy.CONFIG.PMS_PLEXPASS and data['session_id']:
-                <div class="dashboard-activity-terminate-session" id="terminate-button-${sk}" data-key="${sk}" data-id="${data['session_id']}" data-toggle="tooltip" title="Terminate Stream">
-                    <i class="fa fa-times" style="padding-top: 10px;"></i>
-                </div>
-                % endif
-            </div>
-            <div class="dashboard-activity-info-container">
-                <div class="dashboard-activity-info-scroller scrollbar-macosx">
-                    <div class="dashboard-activity-info scoller-content">
-                        <ul class="list-unstyled dashboard-activity-info-list">
-                            <li class="dashboard-activity-info-item">
-                                <div class="sub-heading">Product</div>
-                                <div class="sub-value platform-right">${data['product']}</div>
-                            </li>
-                            <li class="dashboard-activity-info-item">
-                                <div class="sub-heading">Player</div>
-                                <div class="sub-value platform-right">${data['player']}</div>
-                            </li>
-                            <li class="dashboard-activity-info-item">
-                                <div class="sub-heading">Quality</div>
-                                <div class="sub-value platform-right">
-                                    <span id="stream_quality-${sk}">
-                                    % if data['media_type'] != 'photo' and data['quality_profile'] != 'Unknown':
-                                    <%
-                                        br = cast_to_int(data['stream_bitrate']) or ''
-                                        if br:
-                                            if br > 1000:
-                                                br = '(' + str(round(br / 1000.0, 1)) + ' Mbps)'
-                                            else:
-                                                br = '(' + str(br) + ' kbps)'
-                                    %>
-                                    ${data['quality_profile']} ${br}
-                                    % else:
-                                    ${data['quality_profile']}
-                                    % endif
-                                    </span>
-                                    <span data-toggle="tooltip" title="Quality profile is only an estimate based on bitrate and may be incorrect"><i class="fa fa-exclamation-circle"></i></span>
-                                </div>
-                            </li>
-                            % if data['optimized_version'] == 1:
-                            <li class="dashboard-activity-info-item">
-                                <div class="sub-heading">Optimized</div>
-                                <div class="sub-value" id="optimized_version-${sk}">
-                                    ${data['optimized_version_profile']} (${data['optimized_version_title']})
-                                </div>
-                            </li>
-                            % endif
-                            % if data['synced_version'] == 1:
-                            <li class="dashboard-activity-info-item">
-                                <div class="sub-heading">Synced</div>
-                                <div class="sub-value" id="synced_version-${sk}">
-                                    ${data['synced_version_profile']}
-                                </div>
-                            </li>
-                            % endif
-                        </ul>
-                        <ul class="list-unstyled dashboard-activity-info-list">
-                            <li class="dashboard-activity-info-item">
-                                % if _session['user_group'] == 'admin':
-                                <div class="sub-heading"><span class="raw-stream-info-modal" data-toggle="modal" data-target="#raw-stream-info-modal" data-key="${sk}">Stream</span></div>
-                                % else:
-                                <div class="sub-heading">Stream</div>
-                                % endif
-                                <div class="sub-value" id="transcode_decision-${sk}">
-                                    % if data['transcode_decision'] == 'transcode':
-                                    Transcode
-                                        % if data['transcode_throttled'] == 1:
-                                        (Throttled)
-                                        % else:
-                                        (Speed: ${data['transcode_speed']})
-                                        % endif
-                                    % elif data['transcode_decision'] == 'copy':
-                                    Direct Stream
-                                    % else:
-                                    Direct Play
-                                    % endif
-                                </div>
-                            </li>
-                            <li class="dashboard-activity-info-item">
-                                <div class="sub-heading">Container</div>
-                                <div class="sub-value" id="transcode_container-${sk}">
-                                    % if data['stream_container_decision'] == 'transcode':
-                                    Converting (${data['container'].upper()} <i class="fa fa-long-arrow-right"></i> ${data['stream_container'].upper()})
-                                    % else:
-                                    Direct Play (${data['stream_container'].upper()})
-                                    % endif
-                                </div>
-                            </li>
-                            % if data['media_type'] in ('movie', 'episode', 'clip', 'photo'):
-                            <li class="dashboard-activity-info-item">
-                                <div class="sub-heading">Video</div>
-                                <div class="sub-value" id="video_decision-${sk}">
-                                    % if data['media_type'] in ('movie', 'episode', 'clip') and data['stream_video_decision']:
-                                        <%
-                                            if data['video_dynamic_range'] != 'SDR':
-                                                video_dynamic_range = ' ' + data['video_dynamic_range']
-                                            else:
-                                                video_dynamic_range = ''
-                                            if data['stream_video_dynamic_range'] != 'SDR' or video_dynamic_range:
-                                                stream_video_dynamic_range = ' ' + data['stream_video_dynamic_range']
-                                            else:
-                                                stream_video_dynamic_range = ''
-                                        %>
-                                        % if data['stream_video_decision'] == 'transcode':
-                                        <%
-                                            hw_d = ' (HW)' if data['transcode_hw_decoding'] else ''
-                                            hw_e = ' (HW)' if data['transcode_hw_encoding'] else ''
-                                        %>
-                                        Transcode (${data['video_codec'].upper()}${hw_d} ${data['video_full_resolution']}${video_dynamic_range} <i class="fa fa-long-arrow-right"></i> ${data['stream_video_codec'].upper()}${hw_e} ${data['stream_video_full_resolution']}${stream_video_dynamic_range})
-                                        % elif data['stream_video_decision'] == 'copy':
-                                        Direct Stream (${data['stream_video_codec'].upper()} ${data['stream_video_full_resolution']}${stream_video_dynamic_range})
-                                        % else:
-                                        Direct Play (${data['stream_video_codec'].upper()} ${data['stream_video_full_resolution']}${stream_video_dynamic_range})
-                                        % endif
-                                    % elif data['media_type'] == 'photo':
-                                    Direct Play (${data['width']}x${data['height']})
-                                    % endif
-                                </div>
-                            </li>
-                            % endif
-                            % if data['media_type'] in ('movie', 'episode', 'clip', 'track'):
-                            <li class="dashboard-activity-info-item">
-                                <div class="sub-heading">Audio</div>
-                                <div class="sub-value" id="audio_decision-${sk}">
-                                    % if data['stream_audio_decision']:
-                                        <%
-                                            audio_language = (data['audio_language'] or 'Unknown') +  ' - ' if data['media_type'] != 'track' else ''
-                                        %>
-                                        % if data['stream_audio_decision'] == 'transcode':
-                                        Transcode (${audio_language}${AUDIO_CODEC_OVERRIDES.get(data['audio_codec'], data['audio_codec'].upper())} ${data['audio_channel_layout'].split('(')[0].capitalize()} <i class="fa fa-long-arrow-right"></i> ${AUDIO_CODEC_OVERRIDES.get(data['stream_audio_codec'], data['stream_audio_codec'].upper())} ${data['stream_audio_channel_layout'].split('(')[0].capitalize()})
-                                        % elif data['stream_audio_decision'] == 'copy':
-                                        Direct Stream (${audio_language}${AUDIO_CODEC_OVERRIDES.get(data['stream_audio_codec'], data['stream_audio_codec'].upper())} ${data['stream_audio_channel_layout'].split('(')[0].capitalize()})
-                                        % else:
-                                        Direct Play (${audio_language}${AUDIO_CODEC_OVERRIDES.get(data['stream_audio_codec'], data['stream_audio_codec'].upper())} ${data['stream_audio_channel_layout'].split('(')[0].capitalize()})
-                                        % endif
-                                    % endif
-                                </div>
-                            </li>
-                            % endif
-                            % if data['media_type'] in ('movie', 'episode', 'clip'):
-                            <li class="dashboard-activity-info-item">
-                                <div class="sub-heading">Subtitle</div>
-                                <div class="sub-value" id="subtitle_decision-${sk}">
-                                    % if data['subtitles'] == 1:
-                                        <%
-                                            subtitle_codec = 'None' if data['stream_subtitle_codec'] and data['stream_subtitle_transient'] else data['subtitle_codec'].upper()
-                                        %>
-                                        % if data['stream_subtitle_decision'] == 'transcode':
-                                        Transcode (${data['subtitle_language'] or 'Unknown'} - ${subtitle_codec} <i class="fa fa-long-arrow-right"></i> ${data['stream_subtitle_codec'].upper()})
-                                        % elif data['stream_subtitle_decision'] == 'copy':
-                                        Direct Stream (${data['subtitle_language'] or 'Unknown'} - ${subtitle_codec})
-                                        % elif data['stream_subtitle_decision'] == 'burn':
-                                        Burn (${data['subtitle_language'] or 'Unknown'} - ${subtitle_codec})
-                                        % else:
-                                        Direct Play (${data['subtitle_language'] or 'Unknown'} - ${subtitle_codec if data['synced_version'] else data['stream_subtitle_codec'].upper()})
-                                        % endif
-                                    % else:
-                                    None
-                                    % endif
-                                </div>
-                            </li>
-                            % endif
-                        </ul>
-                        <ul class="list-unstyled dashboard-activity-info-list">
-                            <li class="dashboard-activity-info-item">
-                                <div class="sub-heading">Location</div>
-                                <div class="sub-value time-right">
-                                    % if data['secure'] is not None:
-                                    % if data['secure']:
-                                    <span data-toggle="tooltip" title="Secure Connection"><i class="fa fa-lock"></i></span>
-                                    % else:
-                                    <span data-toggle="tooltip" title="Insecure Connection"><i class="fa fa-unlock"></i></span>
-                                    % endif
-                                    % endif
-                                    <span id="location-${sk}">${data['location'].upper()}</span>:
-                                    % if data['ip_address'] != 'N/A':
-                                        % if len(data['ip_address']) > 20:
-                                        <span class="ip-container"><span class="ip-address" data-toggle="tooltip" title="${data['ip_address']}">${data['ip_address']}</span></span>
-                                        % else:
-                                        <span class="ip-container"><span class="ip-address">${data['ip_address']}</span></span>
-                                        % endif
-                                        % if data['relayed']:
-                                        <span data-toggle="tooltip" title="Plex Relay"><i class="fa fa-exclamation-circle"></i></span>
-                                        % else:
-                                        <a href="#" class="external_ip-modal" data-toggle="modal" data-target="#ip-info-modal"
-                                            data-ip="${data['ip_address']}" data-location="${data['location']}" data-secure="${data['secure']}" data-relayed="${data['relayed']}">
-                                            <span id="external_ip-${sk}" class="external-ip-tooltip" data-toggle="tooltip" title="Lookup External IP" style="display: none;"><i class="fa fa-map-marker"></i></span>
-                                        </a>
-                                        <script>
-                                            isPrivateIP("${data['ip_address']}").then(function () {
-                                                $("#external_ip-${sk}").hide();
-                                            }, function () {
-                                                $("#external_ip-${sk}").show();
-                                            });
-                                        </script>
-                                        % endif
-                                    % else:
-                                    N/A
-                                    % endif
-                                </div>
-                            </li>
-                            <li class="dashboard-activity-info-item">
-                                <div class="sub-heading">Bandwidth</div>
-                                <div class="sub-value time-right">
-                                    % if data['media_type'] != 'photo' and data['bandwidth'] != 'Unknown':
-                                    <%
-                                        bw = cast_to_int(data['bandwidth'])
-                                        if bw > 1000000:
-                                            bw = str(round(bw / 1000000.0, 1)) + ' Gbps'
-                                        elif bw > 1000:
-                                            bw = str(round(bw / 1000.0, 1)) + ' Mbps'
-                                        else:
-                                            bw = str(bw) + ' kbps'
-                                    %>
-                                    <span id="stream-bandwidth-${sk}">${bw}</span>
-                                    <span id="streaming-brain-${sk}" data-toggle="tooltip" title="Streaming Brain Estimate (Reserved Bandwidth)"><i class="fa fa-info-circle"></i></span>
-                                    % elif data['synced_version'] == 1 or data['channel_stream'] == 1:
-                                    <span id="stream-bandwidth-${sk}">None</span>
-                                    % else:
-                                    <span id="stream-bandwidth-${sk}">Unknown</span>
-                                    % endif
-                                </div>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-                % if data['media_type'] != 'photo':
-                <div class="dashboard-activity-info-time">
-                    % if data['live']:
-                    <br /><span class="thumb-tooltip dashboard-activity-info-channel" data-toggle="popover" data-img="${data['channel_thumb']}" data-height="40" data-width="40">${data['channel_title'] or (data['channel_vcn'] + ' ' + data['channel_call_sign'])}</span>
-                    % elif data['view_offset']:
-                    ETA:
-                    <span id="stream-eta-${sk}">
-                        <script>
-                            $("#stream-eta-${sk}").html(moment().add(parseInt("${data['stream_duration']}") - parseInt("${data['view_offset']}"), 'milliseconds').format(time_format));
-                        </script>
-                    </span><br /><span class="progress_time_offset" id="stream-view-offset-${sk}" data-last_view_offset="${data['view_offset']}" data-view_offset="${data['view_offset']}" data-stream_duration="${data['stream_duration']}" data-state="${data['state']}">
-                        <script>
-                            $("#stream-view-offset-${sk}").html(millisecondsToMinutes(parseInt("${data['view_offset']}"), false));
-                        </script>
-                    </span> / <span class="progress_time_total" id="stream-duration-${sk}">
-                        <script>
-                            $("#stream-duration-${sk}").html(millisecondsToMinutes(parseInt("${data['stream_duration']}"), false));
-                        </script>
-                    </span>
-                    % else:
-                    ETA: Unknown<br />0:00 / <span class="progress_time_total" id="stream-duration-${sk}">
-                        <script>
-                            $("#stream-duration-${sk}").html(millisecondsToMinutes(parseInt("${data['stream_duration']}"), false));
-                        </script>
-                    </span>
-                    % endif
-                </div>
-                % endif
-            </div>
-        </div>
-        <div class="dashboard-activity-progress">
-            <div class="dashboard-activity-progress-bar">
-                % if data['live']:
-                <div id="progress-bar-${sk}" class="progress-bar" style="width: 100%" data-state="live" data-toggle="tooltip" title="Stream Progress Live">Live</div>
-                % else:
-                <%  transcode_progress = get_percent(data['transcode_max_offset_available'] * 1000, data['duration']) or data['transcode_progress'] %>
-                <div id="buffer-bar-${sk}" class="buffer-bar" style="width: ${transcode_progress}%" data-toggle="tooltip" title="Transcoder Progress ${transcode_progress}%">${transcode_progress}%</div>
-                <div id="progress-bar-${sk}" class="progress-bar" style="width: ${data['progress_percent']}%" data-last_view_offset="${data['view_offset']}" data-view_offset="${data['view_offset']}" data-stream_duration="${data['stream_duration']}" data-state="${data['state']}" data-toggle="tooltip" title="Stream Progress ${data['progress_percent']}%">${data['progress_percent']}%</div>
-                % endif
-            </div>
-        </div>
-    </div>
-    <div class="dashboard-activity-metadata-wrapper">
-        <a href="${user_href}" title="${data['username']}">
-            <div class="dashboard-activity-metadata-user-thumb" style="background-image: url(${page('pms_image_proxy', data['user_thumb'], None, 80, 80, fallback='user')});"></div>
-        </a>
-        <div class="dashboard-activity-metadata-title-container">
-            <div id="play-state-${sk}" class="dashboard-activity-metadata-play_state-icon" title="${data['state'].capitalize()}">
-                % if data['state'] == 'playing':
-                <i class="fa fa-fw fa-play"></i>&nbsp;
-                % elif data['state'] == 'paused':
-                <i class="fa fa-fw fa-pause"></i>&nbsp;
-                % elif data['state'] == 'buffering':
-                <i class="fa fa-fw fa-spinner"></i>&nbsp;
-                % elif data['state'] == 'error':
-                <i class="fa fa-fw fa-exclamation-triangle"></i>&nbsp;
-                % else:
-                <i class="fa fa-fw fa-question-circle"></i>&nbsp;
-                % endif
-            </div>
-            <div class="dashboard-activity-metadata-title">
-                % if data['live']:
-                    % if data['media_type'] == 'movie':
-                    <a href="${href}" title="${data['title']}">${data['title']}</a>
-                    % elif data['media_type'] == 'episode':
-                    <a href="${href}" title="${data['grandparent_title']}">${data['grandparent_title']}</a>
-                    - <a href="${href}" title="${data['title']}">${data['title']}</a>
-                    % else:
-                    <span title="${data['title']}">${data['title']}</span>
-                    % endif
-                % elif data['channel_stream'] == 0:
-                    % if data['media_type'] == 'movie':
-                    <a href="${href}" title="${data['title']}">${data['title']}</a>
-                    % elif data['media_type'] == 'episode':
-                    <a href="${grandparent_href}" title="${data['grandparent_title']}">${data['grandparent_title']}</a>
-                    - <a href="${href}" title="${data['title']}">${data['title']}</a>
-                    % elif data['media_type'] == 'track':
-                    <a id="metadata-title-${sk}" href="${href}" title="${data['title']}">${data['title']}</a>
-                    - <a id="metadata-grandparent_title-${sk}" href="${grandparent_href}" title="${data['original_title'] or data['grandparent_title']}">${data['original_title'] or data['grandparent_title']}</a>
-                    % elif data['media_type'] == 'photo':
-                    <span title="${data['parent_title']}">${data['parent_title']}</span>
-                    % elif data['media_type'] == 'clip':
-                    <span title="${data['title']}">${data['title']}</span>
-                    % else:
-                    <span title="${data['title']}">${data['title']}</span>
-                    % endif
-                % elif data['media_type'] == 'episode' and data['grandparent_title']:
-                <span title="${data['grandparent_title']}">${data['grandparent_title']}</span>
-                - <span title="${data['title']}">${data['title']}</span>
-                % else:
-                <span title="${data['title']}">${data['title']}</span>
-                % endif
-            </div>
-        </div>
-        <div class="dashboard-activity-metadata-subtitle-container">
-            % if data['live']:
-            <div id="media-type-${sk}" class="dashboard-activity-metadata-media_type-icon" title="Live TV">
-                <a href="${library_href}">
-                    <i class="fa fa-fw fa-broadcast-tower"></i>
-                </a>&nbsp;
-            </div>
-            % elif data['channel_stream'] == 0:
-            <div id="media-type-${sk}" class="dashboard-activity-metadata-media_type-icon" title="${data['media_type'].capitalize()}">
-                <a href="${library_href}">
-                    % if data['media_type'] == 'movie':
-                    <i class="fa fa-fw fa-film"></i>
-                    % elif data['media_type'] == 'episode':
-                    <i class="fa fa-fw fa-television"></i>
-                    % elif data['media_type'] == 'track':
-                    <i class="fa fa-fw fa-music"></i>
-                    % elif data['media_type'] == 'photo':
-                    <i class="fa fa-fw fa-picture-o"></i>
-                    % elif data['media_type'] == 'clip':
-                    <i class="fa fa-fw fa-video-camera"></i>
-                    % else:
-                    <i class="fa fa-fw fa-question-circle"></i>
-                    % endif
-                </a>&nbsp;
-            </div>
-            % else:
-            <div id="media-type-${sk}" class="dashboard-activity-metadata-media_type-icon" title="Channel">
-                <i class="fa fa-fw fa-cloud"></i>&nbsp;
-            </div>
-            % endif
-            <div class="dashboard-activity-metadata-subtitle">
-                % if data['live']:
-                    % if data['media_type'] == 'movie':
-                    <span title="${data['year']}" class="sub-heading">${data['year']}</span>
-                    % elif data['media_type'] == 'episode':
-                    % if data['media_index']:
-                    <a href="${href}" title="${data['parent_title']}" class="sub-heading">${season}</a>
-                    &middot; <a href="${href}" title="Episode ${data['media_index']}" class="sub-heading">E${data['media_index']}</a>
-                    % else:
-                    <a href="${href}" title="${data['originally_available_at']}" class="sub-heading">${data['originally_available_at']}</a>
-                    % endif
-                    % else:
-                    <span title="Live TV" class="sub-heading">Live TV</span>
-                    % endif
-                % elif data['channel_stream'] == 0:
-                    % if data['media_type'] == 'movie':
-                    <span title="${data['year']}" class="sub-heading">${data['year']}</span>
-                    % elif data['media_type'] == 'episode':
-                    <a href="${parent_href}" title="${data['parent_title']}" class="sub-heading">${season}</a>
-                    &middot; <a href="${href}" title="Episode ${data['media_index']}" class="sub-heading">E${data['media_index']}</a>
-                    % elif data['media_type'] == 'track':
-                    <a id="metadata-parent_title-${sk}" href="${parent_href}" title="${data['parent_title']}" class="sub-heading">${data['parent_title']}</a>
-                    % elif data['media_type'] == 'photo':
-                    <span title="${data['title']}" class="sub-heading">${data['title']}</span>
-                    % else:
-                        % if data['extra_type']:
-                        <% extra_type = EXTRA_TYPES.get(data['extra_type'], data['sub_type'].capitalize()) %>
-                        <span title="${data['year']} (${extra_type})" class="sub-heading">${data['year']} (${extra_type})</span>
-                        % else:
-                        <span title="${data['year']}" class="sub-heading">${data['year']}</span>
-                        % endif
-                    % endif
-                % elif data['channel_title']:
-                <span title="${data['channel_title']}" class="sub-heading">${data['channel_title']}</span>
-                    % if data['media_type'] == 'episode' and data['parent_media_index'] and data['media_index']:
-                    (<span title="${data['parent_title']}" class="sub-heading">${season}</span>
-                    &middot; <span title="Episode ${data['media_index']}" class="sub-heading">E${data['media_index']}</span>)
-                    % elif data['media_type'] == 'episode' and data['originally_available_at']:
-                    (<span title="${data['originally_available_at']}" class="sub-heading">${data['originally_available_at']}</span>)
-                    % endif
-                % else:
-                <span title="Channel" class="sub-heading">Channel</span>
-                    % if data['media_type'] == 'episode' and data['parent_media_index'] and data['media_index']:
-                    (<span title="${data['parent_title']}" class="sub-heading">${season}</span>
-                    &middot; <span title="Episode ${data['media_index']}" class="sub-heading">E${data['media_index']}</span>)
-                    % elif data['media_type'] == 'episode' and data['originally_available_at']:
-                    (<span title="${data['originally_available_at']}" class="sub-heading">${data['originally_available_at']}</span>)
-                    % endif
-                % endif
-            </div>
-            <div class="dashboard-activity-metadata-user">
-                <a href="${user_href}" title="${data['username']}">${data['friendly_name']}</a>
-            </div>
-        </div>
-    </div>
-</div>
-% endif
diff --git a/data/interfaces/default/edit_library.html b/data/interfaces/default/edit_library.html
deleted file mode 100644
index 8e6d38b1..00000000
--- a/data/interfaces/default/edit_library.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<%doc>
-USAGE DOCUMENTATION :: PLEASE LEAVE THIS AT THE TOP OF THIS FILE
-
-For Mako templating syntax documentation please visit: http://docs.makotemplates.org/en/latest/
-
-Filename:           edit_library.html
-Version:            0.1
-Variable names:     data [list]
-
-data :: Usable parameters
-
-== Global keys ==
-section_id          Returns the library id of the library.
-section_name        Returns the name of the library.
-section_type        Returns the type of the library.
-library_thumb       Returns the thumbnail for the library.
-custom_thumb        Returns the custom thumbnail for the library.
-library_art         Returns the artwork for the library.
-count               Returns the item count for the library.
-parent_count        Returns the parent item count for the library.
-child_count         Returns the child item count for the library.
-do_notify           Returns bool value for whether to send notifications for the library.
-keep_history        Returns bool value for whether to keep history for the library.
-deleted_section     Returns bool value for whether the library is marked as deleted.
-
-DOCUMENTATION :: END
-</%doc>
-
-<%!
-    from plexpy import helpers
-%>
-
-% if data != None:
-<div class="modal-dialog" role="document">
-    <div class="modal-content">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-            <h4 class="modal-title">Edit library <strong>${data['section_name']}</strong></h4>
-        </div>
-        <div class="modal-body" id="modal-text">
-            <fieldset>
-                <div class="form-group">
-                    <label for="profile_url">Library Thumbnail URL</label>
-                    <div class="row">
-                        <div class="col-md-8">
-                            <input type="text" class="form-control" id="custom_thumb_url" name="custom_thumb_url" value="${data['library_thumb']}">
-                        </div>
-                    </div>
-                    <p class="help-block">Change the library's thumbnail in Tautulli. To reset to default, leave this field empty and save.</p>
-                </div>
-                <div class="form-group">
-                    <label for="profile_url">Library Background Art URL</label>
-                    <div class="row">
-                        <div class="col-md-8">
-                            <input type="text" class="form-control" id="custom_art_url" name="custom_art_url" value="${data['library_art']}">
-                        </div>
-                    </div>
-                    <p class="help-block">Change the library's background art in Tautulli. To reset to default, leave this field empty and save.</p>
-                </div>
-                <div class="checkbox">
-                    <label>
-                        <input type="checkbox" id="keep_history" name="keep_history" value="1" ${helpers.checked(data['keep_history'])}> Keep history
-                    </label>
-                    <p class="help-block">Uncheck this if you do not want to keep any history on this library's activity.</p>
-                </div>
-                % if data['section_id']:
-                <div class="form-group">
-                    <button class="btn btn-danger" id="delete-all-history">Purge</button>
-                    <p class="help-block">DANGER ZONE! Click the purge button to remove all history logged for this library. This is permanent!</p>
-                </div>
-                % endif
-                % if data['deleted_section']:
-                <div class="form-group">
-                    <button class="btn btn-bright" id="undelete-library">Undelete</button>
-                    <p class="help-block">Click to re-add the library to the Tautulli libraries list.</p>
-                </div>
-                % endif
-            </fieldset>
-        </div>
-        <div class="modal-footer">
-            <div>
-                <span id="edit-library-status-message"></span>
-                <input type="button" id="save_library" class="btn btn-bright" value="Save">
-            </div>
-        </div>
-    </div>
-</div>
-<script>
-    // Save library options
-    $("#save_library").on('click', function () {
-        var custom_thumb = $("#custom_thumb_url").val();
-        var custom_art = $("#custom_art_url").val();
-        var keep_history = 0;
-        if ($("#keep_history").is(":checked")) {
-            keep_history = 1;
-        }
-
-        $.ajax({
-            url: 'edit_library',
-            data: {
-                section_id: '${data["section_id"]}',
-                custom_thumb: custom_thumb,
-                custom_art: custom_art,
-                keep_history: keep_history
-            },
-            cache: false,
-            async: true,
-            success: function (data) {
-                location.reload();
-            }
-        });
-    });
-
-    $('#delete-all-history').click(function () {
-        var msg = 'Are you REALLY sure you want to purge all history for the <strong>${data["section_name"]}</strong> library?<br>' + 
-            'This is permanent and cannot be undone!';
-        var url = 'delete_all_library_history';
-        confirmAjaxCall(url, msg, { server_id: '${server_id}', section_id: '${data["section_id"]}' }, null, function () { location.reload(); });
-    });
-
-    $('#undelete-library').click(function () {
-        var msg = 'Are you sure you want to undelete this library?';
-        var url = 'undelete_library';
-        confirmAjaxCall(url, msg, { section_id: '${data["section_id"]}' }, null, function () { location.reload(); });
-    });
-</script>
-% endif
\ No newline at end of file
diff --git a/data/interfaces/default/edit_user.html b/data/interfaces/default/edit_user.html
index ebb18867..1e19b66e 100644
--- a/data/interfaces/default/edit_user.html
+++ b/data/interfaces/default/edit_user.html
@@ -10,32 +10,21 @@ Variable names:     data [list]
 data :: Usable parameters
 
 == Global keys ==
-user_id             Returns the user id of the user.
-username            Returns the user's username.
-friendly_name       Returns the friendly name of the user.
-email               Returns the user's email address.
-user_thumb          Returns the thumbnail for the user.
-is_home_user        Returns bool value for whether the user is part of a Plex Home.
-is_allow_sync       Returns bool value for whether the user has sync rights.
-is_restricted       Returns bool value for whether the user account is restricted.
-do_notify           Returns bool value for whether to send notifications for the user.
-keep_history        Returns bool value for whether to keep history for the user.
-allow_guest         Returns bool value for whether to allow guest access for the user.
-deleted_user        Returns bool value for whether the user is marked as deleted.
+user                Return the real Plex username
+user_id             Return the Plex user_id
+friendly_name       Returns the friendly edited Plex username
+do_notify           Returns bool value for whether the user should trigger notifications
+keep_history        Returns bool value for whether the user's activity should be logged
 
 DOCUMENTATION :: END
 </%doc>
 
-<%!
-    from plexpy import helpers
-%>
-
-% if data != None:
+% if data is not None:
 <div class="modal-dialog" role="document">
     <div class="modal-content">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-            <h4 class="modal-title">Edit user <strong>${data['username']}</strong></h4>
+            <h4 class="modal-title">Edit user <strong>${data['user']}</strong></h4>
         </div>
         <div class="modal-body" id="modal-text">
             <fieldset>
@@ -46,28 +35,28 @@ DOCUMENTATION :: END
                             <input type="text" class="form-control" id="friendly_name" name="friendly_name" value="${data['friendly_name']}" size="30">
                         </div>
                     </div>
-                    <p class="help-block">Replace all occurrences of the username with this name.</p>
+                    <p class="help-block">Replace all occurances of the username with this name.</p>
                 </div>
                 <div class="form-group">
                     <label for="profile_url">Profile Picture URL</label>
                     <div class="row">
                         <div class="col-md-8">
-                            <input type="text" class="form-control" id="custom_avatar_url" name="custom_avatar_url" value="${data['user_thumb']}">
+                            <input type="text" class="form-control" id="profile_url" name="profile_url" value="${data['thumb']}">
                         </div>
                     </div>
-                    <p class="help-block">Change the users profile picture in Tautulli. To reset to default, leave this field empty and save.</p>
+                    <p class="help-block">Change the users profile picture in PlexPy. To reset to default, leave this field empty and save then perform a user refresh.</p>
                 </div>
                 <div class="checkbox">
                     <label>
-                        <input type="checkbox" id="keep_history" name="keep_history" value="1" ${helpers.checked(data['keep_history'])}> Keep history
+                        <input type="checkbox" id="do_notify" name="do_notify" value="1" ${data['do_notify']}> Enable notifications
                     </label>
-                    <p class="help-block">Uncheck this if you do not want to keep any history on this user's activity.</p>
+                    <p class="help-block">Uncheck this if you do not want to receive notifications for this user's activity.</p>
                 </div>
                 <div class="checkbox">
                     <label>
-                        <input type="checkbox" id="allow_guest" name="allow_guest" value="1" ${helpers.checked(data['allow_guest'])}> Allow Guest Access
+                        <input type="checkbox" id="keep_history" name="keep_history" value="1" ${data['keep_history']}> Keep history
                     </label>
-                    <p class="help-block">Uncheck this if you do not want to allow this user to login to Tautulli.</p>
+                    <p class="help-block">Uncheck this if you do not want this keep any history on this user's activity.</p>
                 </div>
                 % if data['user_id']:
                 <div class="form-group">
@@ -75,64 +64,120 @@ DOCUMENTATION :: END
                     <p class="help-block">DANGER ZONE! Click the purge button to remove all history logged for this user. This is permanent!</p>
                 </div>
                 % endif
-                % if data['deleted_user']:
-                <div class="form-group">
-                    <button class="btn btn-bright" id="undelete-user">Undelete</button>
-                    <p class="help-block">Click to re-add the user to the Tautulli users list.</p>
-                </div>
-                % endif
             </fieldset>
         </div>
         <div class="modal-footer">
             <div>
                 <span id="edit-user-status-message"></span>
-                <input type="button" id="save_user" class="btn btn-bright" value="Save">
+                <input type="button" id="save_user_name" class="btn btn-bright" value="Save">
+            </div>
+        </div>
+    </div>
+</div>
+<div id="confirm-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="confirm-modal">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
+                <h4 class="modal-title" id="myModalLabel">Confirm Purge</h4>
+            </div>
+            <div class="modal-body" style="text-align: center;">
+                <p>Are you REALLY sure you want to purge all history for this user?</p>
+                <p>This is permanent and cannot be undone!</p>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-dark" data-dismiss="modal">Cancel</button>
+                <button type="button" class="btn btn-danger btn-ok" data-dismiss="modal" id="confirm-purge">Purge</button>
             </div>
         </div>
     </div>
 </div>
 <script>
-    // Set user options
-    $("#save_user").on('click', function () {
-        var friendly_name = $("input#friendly_name").val();
-        var custom_thumb = $("#custom_avatar_url").val();
+    // Set new friendly name
+    $("#save_user_name").click(function() {
+        var friendly_name = $("#friendly_name").val();
+        var thumb = $("#profile_url").val();
+        var do_notify = 0;
         var keep_history = 0;
-        var allow_guest = 0;
+        if ($("#do_notify").is(":checked")) {
+            do_notify = 1;
+        }
         if ($("#keep_history").is(":checked")) {
             keep_history = 1;
         }
-        if ($("#allow_guest").is(":checked")) {
-            allow_guest = 1;
-        }
 
-        $.ajax({
-            url: 'edit_user',
-            data: {
-                user_id: '${data["user_id"]}',
-                friendly_name: friendly_name,
-                custom_thumb: custom_thumb,
-                keep_history: keep_history,
-                allow_guest: allow_guest
-            },
-            cache: false,
-            async: true,
-            success: function(data) {
-                location.reload();
-            }
+        % if data['user_id']:
+            $.ajax({
+                url: 'edit_user',
+                data: {user_id: '${data['user_id']}', friendly_name: friendly_name, do_notify: do_notify, keep_history: keep_history, thumb: thumb},
+                cache: false,
+                async: true,
+                success: function(data) {
+                    $("#edit-user-status-message").html(data);
+                    if ($.trim(friendly_name) !== '') {
+                        $(".set-username").html(friendly_name);
+                    }
+                    $("#user-profile-thumb").attr('src', thumb);
+                }
+            });
+        % else:
+            $.ajax({
+                url: 'edit_user',
+                data: {user: '${data['user']}', friendly_name: friendly_name, do_notify: do_notify, keep_history: keep_history, thumb: thumb},
+                cache: false,
+                async: true,
+                success: function(data) {
+                    $("#edit-user-status-message").html(data);
+                    if ($.trim(friendly_name) !== '') {
+                        $(".set-username").html(friendly_name);
+                    }
+                    $("#user-profile-thumb").attr('src', thumb);
+                }
+            });
+        % endif
+    });
+
+    $("#delete-all-history").on('click', function() {
+        $('#confirm-modal').modal();
+        $('#confirm-modal').one('click', '#confirm-purge', function () {
+            $.ajax({
+                url: 'delete_all_user_history',
+                data: {user_id: '${data['user_id']}'},
+                cache: false,
+                async: true,
+                success: function(data) {
+                    location.reload();
+                }
+            });
         });
     });
+        
+    $(document).ready(function() {
+        // Move #confirm-modal to parent container
+        if(!($('#edit-user-modal').next().is('#confirm-modal'))) {
+            $('#confirm-modal').appendTo($('#edit-user-modal').parent()); }
+        $('#edit-user-modal > #confirm-modal').remove();
 
-    $('#delete-all-history').click(function () {
-        var msg = 'Are you REALLY sure you want to purge all history for the <strong>${data["username"]}</strong> user?<br>' +
-            'This is permanent and cannot be undone!';
-        var url = 'delete_all_user_history';
-        confirmAjaxCall(url, msg, { user_id: '${data["user_id"]}' }, null, function () { location.reload(); });
-    });
+        $('#edit-user-modal').css('z-index', '1050');
+        $('.modal-backdrop').not('.modal-backdrop-stack').css('z-index', '1049');
+        $('.modal-backdrop').not('.modal-backdrop-stack').addClass('modal-backdrop-stack');
 
-    $('#undelete-user').click(function () {
-        var msg = 'Are you sure you want to undelete this user?';
-        var url = 'undelete_user';
-        confirmAjaxCall(url, msg, { user_id: '${data["user_id"]}' }, null, function () { location.reload(); });
+        $('#confirm-modal').on('show.bs.modal', function () {
+            // Fix position to match parent modal
+            var currentPadding = parseInt($('body').css('padding-right'));
+            $(this).children('.modal-dialog').css('left', -currentPadding/2);
+            $('#edit-user-modal').css('overflow-y', 'hidden');
+        });
+        $('#confirm-modal').on('shown.bs.modal', function () {
+            $(this).css('z-index', '1060');
+            $('.modal-backdrop').not('.modal-backdrop-stack').css('z-index', '1059');
+            $('.modal-backdrop').not('.modal-backdrop-stack').addClass('modal-backdrop-stack'); 
+        });
+        $('#confirm-modal').on('hidden.bs.modal', function() {
+            $('body').addClass('modal-open');
+            $('#edit-user-modal').css('overflow-y', 'auto');
+        });
     });
 </script>
+
 % endif
\ No newline at end of file
diff --git a/data/interfaces/default/export_modal.html b/data/interfaces/default/export_modal.html
deleted file mode 100644
index 390ee268..00000000
--- a/data/interfaces/default/export_modal.html
+++ /dev/null
@@ -1,310 +0,0 @@
-<%doc>
-USAGE DOCUMENTATION :: PLEASE LEAVE THIS AT THE TOP OF THIS FILE
-
-For Mako templating syntax documentation please visit: http://docs.makotemplates.org/en/latest/
-
-Filename:           export_modal.html
-Version:            0.1
-Variable names:     data [list]
-
-data :: Usable parameters
-
-== Global keys ==
-
-DOCUMENTATION :: END
-</%doc>
-<%
-    import plexpy
-    from plexpy import exporter
-    from plexpy.helpers import anon_url
-    export = exporter.Export()
-    thumb_media_types = ', '.join([export.PLURAL_MEDIA_TYPES[k] for k, v in export.MEDIA_TYPES.items() if v[0]])
-    art_media_types = ', '.join([export.PLURAL_MEDIA_TYPES[k] for k, v in export.MEDIA_TYPES.items() if v[1]])
-    logo_media_types = ', '.join([export.PLURAL_MEDIA_TYPES[k] for k, v in export.MEDIA_TYPES.items() if v[2]])
-%>
-<div class="modal-dialog" role="document">
-    <div class="modal-content">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            <h4 class="modal-title" id="info-modal-title">
-                ${title}
-            </h4>
-        </div>
-        <div class="modal-body">
-            <form method="post" class="form" id="export_metadata_form">
-                <input type="hidden" id="export_section_id" name="export_section_id" value="${section_id or ''}" />
-                <input type="hidden" id="export_user_id" name="export_user_id" value="${user_id or ''}" />
-                <input type="hidden" id="export_rating_key" name="export_rating_key" value="${rating_key or ''}" />
-                <input type="hidden" id="export_media_type" name="export_media_type" value="${media_type or ''}" />
-                <input type="hidden" id="export_sub_media_type" name="export_sub_media_type" value="${sub_media_type or ''}" />
-                <input type="hidden" id="export_export_type" name="export_export_type" value="${export_type or ''}" />
-                <div class="form-group">
-                    <label>Instructions</label>
-                    <p class="help-block">
-                        Please see the <a href="${anon_url('https://github.com/%s/%s/wiki/Exporter-Guide' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank" rel="noreferrer">Exporter Guide</a> for more details about each option.
-                    </p>
-                </div>
-                <div class="form-group">
-                    <label for="export_file_format">Data File Format</label>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <select class="form-control" id="export_file_format" name="export_file_format">
-                                % for format in file_formats:
-                                <option value="${format}">${format.upper()}</option>
-                                % endfor
-                            </select>
-                        </div>
-                    </div>
-                    <p class="help-block">Select the export data file format.</p>
-                </div>
-                % if not rating_key:
-                <div class="checkbox">
-                    <label>
-                        <input type="checkbox" id="export_individual_files" name="export_individual_files" value="1"> Export Individual Files
-                    </label>
-                    <p class="help-block">Enable to export one file for each ${media_type} instead of a single file containing all ${media_type}s.</p>
-                </div>
-                % endif
-                <div class="form-group">
-                    <label for="export_metadata_level">Metadata Export Level</label>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <select class="form-control" id="export_metadata_level" name="export_metadata_level">
-                                <option value="0">Level 0 - None / Custom</option>
-                                <option value="1" selected>Level 1 - Basic Metadata</option>
-                                <option value="2">Level 2 - Extended Metadata</option>
-                                <option value="3">Level 3 - Advanced Metadata</option>
-                                <option value="9">Level 9 - All Metadata</option>
-                            </select>
-                        </div>
-                    </div>
-                    <p class="help-block">Select the metadata export level. Higher levels include all fields from the lower levels.</p>
-                </div>
-                <div class="form-group">
-                    <label for="export_custom_metadata_fields">Custom Metadata Fields</label>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <input type="text" class="form-control" id="export_custom_metadata_fields" name="export_custom_metadata_fields" data-field_type="Metadata">
-                        </div>
-                    </div>
-                    <p class="help-block">Add additional fields to the selected metadata export level.</p>
-                </div>
-                <div class="form-group">
-                    <label for="export_media_info_level">Media Info Export Level</label>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <select class="form-control" id="export_media_info_level" name="export_media_info_level">
-                                <option value="0">Level 0 - None / Custom</option>
-                                <option value="1" selected>Level 1 - Basic Media Info</option>
-                                <option value="2">Level 2 - Extended Media Info</option>
-                                <option value="3">Level 3 - Advanced Media Info</option>
-                                <option value="9">Level 9 - All Media Info</option>
-                            </select>
-                        </div>
-                    </div>
-                    <p class="help-block">Select the media info export level. Higher levels include all fields from the lower levels.</p>
-                </div>
-                <div class="form-group">
-                    <label for="export_custom_media_info_fields">Custom Media Info Fields</label>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <input type="text" class="form-control" id="export_custom_media_info_fields" name="export_custom_media_info_fields" data-field_type="Media Info">
-                        </div>
-                    </div>
-                    <p class="help-block">Add additional fields to the selected media info export level.</p>
-                </div>
-                <div class="form-group">
-                    <label for="export_thumb_level">Poster and Cover Image Export Level</label>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <select class="form-control" id="export_thumb_level" name="export_thumb_level">
-                                <option value="0" selected>Level 0 - None / Custom</option>
-                                <option value="1">Level 1 - Uploaded and Selected Posters and Covers Only</option>
-                                <option value="2">Level 2 - Selected and Locked Posters and Covers Only</option>
-                                <option value="9">Level 9 - All Selected Posters and Covers</option>
-                            </select>
-                        </div>
-                    </div>
-                    <p class="help-block">
-                        Select the level to export poster and cover image files.<br>Note: Only applies to ${thumb_media_types}.
-                    </p>
-                </div>
-                <div class="form-group">
-                    <label for="export_art_level">Background Artwork Image Export Level</label>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <select class="form-control" id="export_art_level" name="export_art_level">
-                                <option value="0" selected>Level 0 - None / Custom</option>
-                                <option value="1">Level 1 - Uploaded and Selected Artwork Only</option>
-                                <option value="2">Level 2 - Selected and Locked Artwork Only</option>
-                                <option value="9">Level 9 - All Selected Artwork</option>
-                            </select>
-                        </div>
-                    </div>
-                    <p class="help-block">
-                        Select the level to export background artwork image files.<br>Note: Only applies to ${art_media_types}.
-                    </p>
-                </div>
-                <div class="form-group">
-                    <label for="export_logo_level">Logo Image Export Level</label>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <select class="form-control" id="export_logo_level" name="export_logo_level">
-                                <option value="0" selected>Level 0 - None / Custom</option>
-                                <option value="1">Level 1 - Uploaded and Selected Logos Only</option>
-                                <option value="2">Level 2 - Selected and Locked Logos Only</option>
-                                <option value="9">Level 9 - All Selected Logos</option>
-                            </select>
-                        </div>
-                    </div>
-                    <p class="help-block">
-                        Select the level to export logo image files.<br>Note: Only applies to ${logo_media_types}.
-                    </p>
-                </div>
-                <p class="help-block">
-                    Warning: Exporting images may take a long time! Images will be saved to a folder alongside the data file.
-                </p>
-            </form>
-        </div>
-        <div class="modal-footer">
-            <div>
-                <input type="button" class="btn btn-bright btn-ok" data-dismiss="modal" id="export_metadata" value="Export">
-            </div>
-        </div>
-    </div>
-</div>
-<script src="${http_root}js/selectize.plugin.disable-options.js"></script>
-<script>
-    $('#export_metadata_form').submit(function(e) {
-        e.preventDefault();
-    })
-
-    var optgroups = (function () {
-        var optgroups = [];
-        for (var i = 0; i <= 9; i++) {
-            optgroups.push({$order: i+1, value: i});
-        }
-        return optgroups
-    })()
-
-    var $export_custom_fields = $('#export_custom_metadata_fields, #export_custom_media_info_fields').selectize({
-        plugins: {
-            'remove_button': {},
-            'disable_options': {
-                disableField: 'level'
-            }
-        },
-        maxItems: null,
-        valueField: 'field',
-        labelField: 'field',
-        sortField: 'field',
-        searchField: ['field'],
-        optgroupField: 'level',
-        optgroups: optgroups,
-        lockOptgroupOrder: true,
-        render: {
-            optgroup_header: function(data, escape) {
-                return '<div class="optgroup-header">' + escape(this.$input.data('field_type') + ' Level: ' + data.value) + '</div>';
-            },
-            option: function (item, escape) {
-                return '<div data-field="' + escape(item.field) + '" data-level="' + escape(item.level) + '">' + escape(item.field) +'</div>';
-            }
-        }
-    });
-    var export_custom_metadata_fields = $export_custom_fields[0].selectize;
-    var export_custom_media_info_fields = $export_custom_fields[1].selectize;
-
-    function setDisabledFields() {
-        var metadata_export_level = $('#export_metadata_level option:selected').val();
-        var media_info_export_level = $('#export_media_info_level option:selected').val();
-        export_custom_metadata_fields.setDisabledOptions([...Array(parseInt(metadata_export_level) + 1).keys()]);
-        export_custom_media_info_fields.setDisabledOptions([...Array(parseInt(media_info_export_level) + 1).keys()]);
-    }
-
-    $('#export_metadata_level, #export_media_info_level').on('change', setDisabledFields);
-
-    function getExportFields() {
-        $.ajax({
-            url: 'get_export_fields',
-            async: true,
-            data: {
-                media_type: $('#export_media_type').val(),
-                sub_media_type: $('#export_sub_media_type').val()
-            },
-            success: function (result) {
-                if (result) {
-                    export_custom_metadata_fields.addOption(result.metadata_fields);
-                    export_custom_media_info_fields.addOption(result.media_info_fields);
-                    setDisabledFields();
-                }
-            }
-        })
-    }
-    getExportFields();
-
-    $('#export_file_format').on('change', function() {
-        if ($(this).val() === 'm3u') {
-            $('#export_metadata_level').prop('disabled', true);
-            $('#export_media_info_level').prop('disabled', true);
-            $("#export_thumb_level").prop('disabled', true);
-            $("#export_art_level").prop('disabled', true);
-            $("#export_logo_level").prop('disabled', true);
-            export_custom_metadata_fields.disable();
-            export_custom_media_info_fields.disable();
-        } else {
-            $('#export_metadata_level').prop('disabled', false);
-            $('#export_media_info_level').prop('disabled', false);
-            $("#export_thumb_level").prop('disabled', false);
-            $("#export_art_level").prop('disabled', false);
-            $("#export_logo_level").prop('disabled', false);
-            export_custom_metadata_fields.enable();
-            export_custom_media_info_fields.enable();
-        }
-    })
-
-    $("#export_metadata").click(function() {
-        var section_id = $('#export_section_id').val();
-        var user_id = $('#export_user_id').val();
-        var rating_key = $('#export_rating_key').val();
-        var metadata_export_level = $('#export_metadata_level option:selected').val();
-        var media_info_export_level = $('#export_media_info_level option:selected').val();
-        var file_format = $('#export_file_format option:selected').val();
-        var thumb_level = $("#export_thumb_level option:selected").val();
-        var art_level = $("#export_art_level option:selected").val();
-        var logo_level = $("#export_logo_level option:selected").val();
-        var custom_fields = [
-            $('#export_custom_metadata_fields').val(),
-            $('#export_custom_media_info_fields').val()
-        ].filter(Boolean).join(',');
-        var export_type = $('#export_export_type').val()
-        var individual_files = $('#export_individual_files').is(':checked')
-
-        $.ajax({
-            url: 'export_metadata',
-            data: {
-                section_id: section_id,
-                user_id: user_id,
-                rating_key: rating_key,
-                metadata_level: metadata_export_level,
-                media_info_level: media_info_export_level,
-                file_format: file_format,
-                thumb_level: thumb_level,
-                art_level: art_level,
-                logo_level: logo_level,
-                custom_fields: custom_fields,
-                export_type: export_type,
-                individual_files: individual_files
-            },
-            async: true,
-            success: function (data) {
-                if (data.result === 'success') {
-                    $("#nav-tabs-export").click();
-                    redrawExportTable();
-                    showMsg('<i class="fa fa-check"></i> ' + data.message, false, true, 5000);
-                } else {
-                    showMsg('<i class="fa fa-exclamation-circle"></i> ' + data.message, false, true, 5000, true);
-                }
-            }
-        });
-    });
-</script>
\ No newline at end of file
diff --git a/data/interfaces/default/fonts/FontAwesome.otf b/data/interfaces/default/fonts/FontAwesome.otf
new file mode 100644
index 00000000..681bdd4d
Binary files /dev/null and b/data/interfaces/default/fonts/FontAwesome.otf differ
diff --git a/data/interfaces/default/fonts/Open-Sans-600/LICENSE.txt b/data/interfaces/default/fonts/Open-Sans-600/LICENSE.txt
deleted file mode 100644
index d6456956..00000000
--- a/data/interfaces/default/fonts/Open-Sans-600/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   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.
diff --git a/data/interfaces/default/fonts/Open-Sans-600/Open-Sans-600.eot b/data/interfaces/default/fonts/Open-Sans-600/Open-Sans-600.eot
deleted file mode 100644
index cbbfa5b0..00000000
Binary files a/data/interfaces/default/fonts/Open-Sans-600/Open-Sans-600.eot and /dev/null differ
diff --git a/data/interfaces/default/fonts/Open-Sans-600/Open-Sans-600.svg b/data/interfaces/default/fonts/Open-Sans-600/Open-Sans-600.svg
deleted file mode 100644
index 7a3f2dd9..00000000
--- a/data/interfaces/default/fonts/Open-Sans-600/Open-Sans-600.svg
+++ /dev/null
@@ -1,1637 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg">
-<defs >
-<font id="OpenSans" horiz-adv-x="1250" ><font-face
-    font-family="Open Sans Semibold"
-    units-per-em="2048"
-    panose-1="2 11 7 6 3 8 4 2 2 4"
-    ascent="2189"
-    descent="-600"
-    alphabetic="0" />
-<glyph unicode=" " glyph-name="space" horiz-adv-x="532" />
-<glyph unicode="!" glyph-name="exclam" horiz-adv-x="565" d="M371 444H197L145 1462H422L371 444ZM133 125Q133 199 172 237T283 276Q354 276 392 236T430 125Q430 54 392 13T283 -29Q212 -29 173 11T133 125Z" />
-<glyph unicode="&quot;" glyph-name="quotedbl" horiz-adv-x="893" d="M365 1462L324 934H174L133 1462H365ZM760 1462L719 934H569L528 1462H760Z" />
-<glyph unicode="#" glyph-name="numbersign" horiz-adv-x="1323" d="M989 870L934 586H1204V418H901L821 0H643L723 418H475L395 0H221L297 418H47V586H330L387 870H123V1038H416L496 1460H676L596 1038H848L928 1460H1102L1022 1038H1274V870H989ZM506 586H756L813
-870H563L506 586Z" />
-<glyph unicode="$" glyph-name="dollar" horiz-adv-x="1169" d="M1063 453Q1063 308 957 214T651 98V-119H518V92Q270 96 111 168V379Q197 337 312 309T518 279V653L434 684Q270 747 195 834T119 1051Q119 1189 226 1278T518 1386V1554H651V1389Q854 1382 1036
-1307L963 1124Q806 1186 651 1198V834L727 805Q917 732 990 651T1063 453ZM827 438Q827 496 787 533T651 606V287Q827 314 827 438ZM354 1053Q354 996 389 958T518 883V1194Q438 1182 396 1145T354 1053Z" />
-<glyph unicode="%" glyph-name="percent" horiz-adv-x="1765" d="M279 1024Q279 875 308 802T403 729Q535 729 535 1024Q535 1319 403 1319Q337 1319 308 1246T279 1024ZM729 1026Q729 796 647 681T403 565Q251 565 168 684T84 1026Q84 1483 403 1483Q560 1483
-644 1365T729 1026ZM1231 440Q1231 291 1260 217T1356 143Q1487 143 1487 440Q1487 733 1356 733Q1290 733 1261 661T1231 440ZM1681 440Q1681 210 1598 95T1356 -20Q1204 -20 1120 98T1036 440Q1036 897 1356 897Q1510 897 1595 779T1681 440ZM1384 1462L573 0H379L1190
-1462H1384Z" />
-<glyph unicode="&amp;" glyph-name="ampersand" horiz-adv-x="1516" d="M451 1147Q451 1084 484 1028T578 909Q691 973 736 1028T782 1153Q782 1218 739 1257T623 1296Q544 1296 498 1256T451 1147ZM600 182Q783 182 913 289L530 666Q424 598 384 539T344 403Q344
-305 413 244T600 182ZM96 387Q96 518 160 615T391 809Q296 920 262 996T227 1155Q227 1307 335 1395T627 1483Q804 1483 905 1398T1006 1167Q1006 1053 939 960T713 774L1059 440Q1140 547 1194 754H1436Q1366 470 1212 291L1513 0H1210L1061 145Q959 63 844 22T588
--20Q358 -20 227 89T96 387Z" />
-<glyph unicode="&apos;" glyph-name="quotesingle" horiz-adv-x="498" d="M365 1462L324 934H174L133 1462H365Z" />
-<glyph unicode="(" glyph-name="parenleft" horiz-adv-x="649" d="M82 561Q82 826 159 1057T383 1462H588Q449 1274 375 1041T301 563Q301 319 375 90T586 -324H383Q236 -154 159 73T82 561Z" />
-<glyph unicode=")" glyph-name="parenright" horiz-adv-x="649" d="M567 561Q567 298 490 71T266 -324H63Q201 -137 274 91T348 563Q348 808 274 1040T61 1462H266Q413 1287 490 1056T567 561Z" />
-<glyph unicode="*" glyph-name="asterisk" horiz-adv-x="1122" d="M672 1556L631 1174L1016 1282L1044 1065L684 1036L920 725L721 618L555 956L406 618L201 725L432 1036L74 1065L109 1282L485 1174L444 1556H672Z" />
-<glyph unicode="+" glyph-name="plus" horiz-adv-x="1169" d="M494 633H96V811H494V1219H674V811H1073V633H674V227H494V633Z" />
-<glyph unicode="," glyph-name="comma" horiz-adv-x="547" d="M412 215Q364 29 236 -264H63Q132 6 166 238H397L412 215Z" />
-<glyph unicode="-" glyph-name="hyphen" horiz-adv-x="659" d="M72 449V649H586V449H72Z" />
-<glyph unicode="." glyph-name="period" horiz-adv-x="563" d="M133 125Q133 198 171 237T281 276Q354 276 392 236T430 125Q430 54 392 13T281 -29Q209 -29 171 12T133 125Z" />
-<glyph unicode="/" glyph-name="slash" horiz-adv-x="799" d="M782 1462L238 0H16L561 1462H782Z" />
-<glyph unicode="0" glyph-name="zero" horiz-adv-x="1169" d="M1081 731Q1081 350 959 165T584 -20Q340 -20 214 171T88 731Q88 1118 210 1301T584 1485Q829 1485 955 1293T1081 731ZM326 731Q326 432 387 304T584 176Q719 176 781 306T844 731Q844 1025 782 1156T584
-1288Q449 1288 388 1159T326 731Z" />
-<glyph unicode="1" glyph-name="one" horiz-adv-x="1169" d="M780 0H545V944Q545 1113 553 1212Q530 1188 497 1159T272 975L154 1124L584 1462H780V0Z" />
-<glyph unicode="2" glyph-name="two" horiz-adv-x="1169" d="M1081 0H90V178L467 557Q634 728 688 799T768 934T793 1069Q793 1168 734 1225T569 1282Q485 1282 407 1251T225 1139L98 1294Q220 1397 335 1440T580 1483Q784 1483 907 1377T1030 1090Q1030 991 995
-902T886 719T641 463L387 217V207H1081V0Z" />
-<glyph unicode="3" glyph-name="three" horiz-adv-x="1169" d="M1026 1126Q1026 987 945 895T717 770V762Q893 740 981 653T1069 420Q1069 209 920 95T496 -20Q253 -20 86 59V268Q179 222 283 197T483 172Q653 172 737 235T821 430Q821 547 728 602T436 657H309V848H438Q788
-848 788 1090Q788 1184 727 1235T547 1286Q464 1286 387 1263T205 1171L90 1335Q291 1483 557 1483Q778 1483 902 1388T1026 1126Z" />
-<glyph unicode="4" glyph-name="four" horiz-adv-x="1169" d="M1133 319H936V0H707V319H39V500L707 1466H936V514H1133V319ZM707 514V881Q707 1077 717 1202H709Q681 1136 621 1042L258 514H707Z" />
-<glyph unicode="5" glyph-name="five" horiz-adv-x="1169" d="M586 913Q807 913 936 796T1065 477Q1065 243 919 112T502 -20Q257 -20 117 59V272Q198 226 303 201T498 176Q657 176 740 247T823 455Q823 717 489 717Q442 717 373 708T252 686L147 748L203 1462H963V1253H410L377
-891Q412 897 462 905T586 913Z" />
-<glyph unicode="6" glyph-name="six" horiz-adv-x="1169" d="M94 623Q94 1481 793 1481Q903 1481 979 1464V1268Q903 1290 803 1290Q568 1290 450 1164T322 760H334Q381 841 466 885T666 930Q865 930 976 808T1087 477Q1087 247 959 114T608 -20Q451 -20 335 55T157
-275T94 623ZM604 174Q725 174 790 252T856 475Q856 601 795 673T610 745Q534 745 470 713T369 624T332 508Q332 367 408 271T604 174Z" />
-<glyph unicode="7" glyph-name="seven" horiz-adv-x="1169" d="M256 0L834 1253H74V1460H1085V1296L510 0H256Z" />
-<glyph unicode="8" glyph-name="eight" horiz-adv-x="1169" d="M584 1481Q792 1481 913 1386T1034 1130Q1034 905 764 772Q936 686 1008 591T1081 379Q1081 198 948 89T588 -20Q350 -20 219 82T88 371Q88 493 156 590T381 764Q247 844 190 933T133 1133Q133 1292
-258 1386T584 1481ZM313 379Q313 275 386 218T584 160Q713 160 784 219T856 381Q856 462 790 529T590 653L561 666Q429 608 371 539T313 379ZM582 1300Q482 1300 421 1251T360 1116Q360 1064 382 1023T446 949T588 868Q708 921 757 979T807 1116Q807 1201 746 1250T582
-1300Z" />
-<glyph unicode="9" glyph-name="nine" horiz-adv-x="1169" d="M1079 838Q1079 406 905 193T381 -20Q248 -20 190 -4V193Q279 168 369 168Q607 168 724 296T852 698H840Q781 608 698 568T502 528Q308 528 197 649T86 981Q86 1210 214 1345T565 1481Q721 1481 837
-1405T1016 1185T1079 838ZM569 1286Q447 1286 382 1207T317 983Q317 858 377 787T561 715Q680 715 761 786T842 952Q842 1041 808 1118T711 1241T569 1286Z" />
-<glyph unicode=":" glyph-name="colon" horiz-adv-x="563" d="M133 125Q133 198 171 237T281 276Q354 276 392 236T430 125Q430 54 392 13T281 -29Q209 -29 171 12T133 125ZM133 979Q133 1130 281 1130Q356 1130 393 1090T430 979Q430 908 392 867T281 825Q209
-825 171 866T133 979Z" />
-<glyph unicode=";" glyph-name="semicolon" horiz-adv-x="569" d="M397 238L412 215Q364 29 236 -264H63Q132 6 166 238H397ZM131 979Q131 1130 279 1130Q354 1130 391 1090T428 979Q428 908 390 867T279 825Q207 825 169 866T131 979Z" />
-<glyph unicode="&lt;" glyph-name="less" horiz-adv-x="1169" d="M1073 221L96 651V772L1073 1260V1065L340 721L1073 418V221Z" />
-<glyph unicode="=" glyph-name="equal" horiz-adv-x="1169" d="M102 831V1010H1065V831H102ZM102 432V610H1065V432H102Z" />
-<glyph unicode="&gt;" glyph-name="greater" horiz-adv-x="1169" d="M96 418L829 721L96 1065V1260L1073 772V651L96 221V418Z" />
-<glyph unicode="?" glyph-name="question" horiz-adv-x="928" d="M283 444V508Q283 618 323 691T463 842Q582 936 616 988T651 1112Q651 1196 595 1241T434 1286Q339 1286 258 1259T100 1194L16 1370Q219 1483 451 1483Q647 1483 762 1387T877 1122Q877 1047 855
-989T789 877T635 739Q542 666 511 618T479 489V444H283ZM242 125Q242 276 389 276Q461 276 499 237T537 125Q537 54 499 13T389 -29Q318 -29 280 11T242 125Z" />
-<glyph unicode="@" glyph-name="at" horiz-adv-x="1839" d="M1726 739Q1726 596 1681 478T1555 293T1366 227Q1287 227 1229 269T1151 383H1139Q1090 305 1018 266T856 227Q693 227 600 332T506 616Q506 822 630 950T963 1079Q1039 1079 1131 1066T1296 1028L1274
-563V539Q1274 379 1378 379Q1457 379 1503 481T1550 741Q1550 912 1480 1041T1281 1241T985 1311Q772 1311 615 1223T374 972T291 592Q291 302 446 146T891 -10Q1112 -10 1352 80V-84Q1142 -170 895 -170Q525 -170 318 29T111 586Q111 847 223 1050T533 1362T983
-1470Q1200 1470 1369 1380T1632 1124T1726 739ZM698 612Q698 379 881 379Q1074 379 1092 672L1104 911Q1041 928 969 928Q841 928 770 843T698 612Z" />
-<glyph unicode="A" glyph-name="A" horiz-adv-x="1354" d="M1100 0L954 406H395L252 0H0L547 1468H807L1354 0H1100ZM891 612L754 1010Q739 1050 713 1136T676 1262Q649 1139 597 993L465 612H891Z" />
-<glyph unicode="B" glyph-name="B" horiz-adv-x="1352" d="M193 1462H627Q929 1462 1063 1374T1198 1096Q1198 968 1132 883T942 776V766Q1096 737 1168 652T1241 420Q1241 223 1104 112T721 0H193V1462ZM432 858H662Q812 858 881 905T950 1067Q950 1170 876 1216T639
-1262H432V858ZM432 664V201H686Q836 201 912 258T989 440Q989 554 911 609T674 664H432Z" />
-<glyph unicode="C" glyph-name="C" horiz-adv-x="1298" d="M815 1278Q609 1278 491 1132T373 729Q373 460 486 322T815 184Q908 184 995 202T1176 250V45Q1004 -20 786 -20Q465 -20 293 174T121 731Q121 959 204 1130T446 1392T817 1483Q1041 1483 1231 1389L1145
-1190Q1071 1225 989 1251T815 1278Z" />
-<glyph unicode="D" glyph-name="D" horiz-adv-x="1503" d="M1382 745Q1382 383 1181 192T602 0H193V1462H645Q994 1462 1188 1274T1382 745ZM1130 737Q1130 1262 639 1262H432V201H602Q1130 201 1130 737Z" />
-<glyph unicode="E" glyph-name="E" horiz-adv-x="1143" d="M1020 0H193V1462H1020V1260H432V862H983V662H432V203H1020V0Z" />
-<glyph unicode="F" glyph-name="F" horiz-adv-x="1090" d="M430 0H193V1462H1018V1260H430V803H981V600H430V0Z" />
-<glyph unicode="G" glyph-name="G" horiz-adv-x="1487" d="M791 793H1329V59Q1197 16 1076 -2T813 -20Q481 -20 301 176T121 731Q121 1084 324 1283T883 1483Q1112 1483 1317 1395L1233 1196Q1055 1278 877 1278Q643 1278 507 1131T371 729Q371 461 493 322T846
-182Q962 182 1094 211V588H791V793Z" />
-<glyph unicode="H" glyph-name="H" horiz-adv-x="1538" d="M1346 0H1106V659H432V0H193V1462H432V864H1106V1462H1346V0Z" />
-<glyph unicode="I" glyph-name="I" horiz-adv-x="625" d="M193 0V1462H432V0H193Z" />
-<glyph unicode="J" glyph-name="J" horiz-adv-x="612" d="M8 -408Q-90 -408 -156 -383V-182Q-72 -203 -10 -203Q186 -203 186 45V1462H426V53Q426 -171 320 -289T8 -408Z" />
-<glyph unicode="K" glyph-name="K" horiz-adv-x="1309" d="M1309 0H1032L573 662L432 547V0H193V1462H432V764Q530 884 627 995L1022 1462H1294Q911 1012 745 821L1309 0Z" />
-<glyph unicode="L" glyph-name="L" horiz-adv-x="1110" d="M193 0V1462H432V205H1051V0H193Z" />
-<glyph unicode="M" glyph-name="M" horiz-adv-x="1890" d="M825 0L401 1221H393Q410 949 410 711V0H193V1462H530L936 299H942L1360 1462H1698V0H1468V723Q1468 832 1473 1007T1483 1219H1475L1036 0H825Z" />
-<glyph unicode="N" glyph-name="N" horiz-adv-x="1604" d="M1411 0H1118L399 1165H391L396 1100Q410 914 410 760V0H193V1462H483L1200 303H1206Q1204 326 1198 470T1192 696V1462H1411V0Z" />
-<glyph unicode="O" glyph-name="O" horiz-adv-x="1612" d="M1491 733Q1491 376 1313 178T807 -20Q476 -20 299 176T121 735Q121 1097 299 1291T809 1485Q1135 1485 1313 1288T1491 733ZM375 733Q375 463 484 324T807 184Q1020 184 1128 322T1237 733Q1237 1002
-1130 1141T809 1280Q594 1280 485 1141T375 733Z" />
-<glyph unicode="P" glyph-name="P" horiz-adv-x="1260" d="M1161 1020Q1161 791 1011 669T584 547H432V0H193V1462H614Q888 1462 1024 1350T1161 1020ZM432 748H559Q743 748 829 812T915 1012Q915 1138 838 1200T598 1262H432V748Z" />
-<glyph unicode="Q" glyph-name="Q" horiz-adv-x="1612" d="M1491 733Q1491 467 1390 285T1094 29L1444 -348H1122L846 -20H807Q476 -20 299 176T121 735Q121 1097 299 1291T809 1485Q1135 1485 1313 1288T1491 733ZM375 733Q375 463 484 324T807 184Q1020 184
-1128 322T1237 733Q1237 1002 1130 1141T809 1280Q594 1280 485 1141T375 733Z" />
-<glyph unicode="R" glyph-name="R" horiz-adv-x="1309" d="M432 782H598Q765 782 840 844T915 1028Q915 1152 834 1206T590 1260H432V782ZM432 584V0H193V1462H606Q889 1462 1025 1356T1161 1036Q1161 763 877 647L1290 0H1018L668 584H432Z" />
-<glyph unicode="S" glyph-name="S" horiz-adv-x="1126" d="M1036 397Q1036 202 895 91T506 -20Q258 -20 100 57V283Q200 236 312 209T522 182Q664 182 731 236T799 381Q799 463 737 520T481 655Q281 736 199 840T117 1090Q117 1273 247 1378T596 1483Q806 1483
-1014 1391L938 1196Q743 1278 590 1278Q474 1278 414 1228T354 1094Q354 1037 378 997T457 920T655 825Q816 758 891 700T1001 569T1036 397Z" />
-<glyph unicode="T" glyph-name="T" horiz-adv-x="1159" d="M698 0H459V1257H29V1462H1128V1257H698V0Z" />
-<glyph unicode="U" glyph-name="U" horiz-adv-x="1520" d="M1339 1462V516Q1339 354 1270 233T1069 46T754 -20Q482 -20 331 124T180 520V1462H420V537Q420 356 504 270T762 184Q1100 184 1100 539V1462H1339Z" />
-<glyph unicode="V" glyph-name="V" horiz-adv-x="1274" d="M1026 1462H1274L762 0H510L0 1462H246L551 553Q575 488 602 386T637 233Q650 309 677 409T721 557L1026 1462Z" />
-<glyph unicode="W" glyph-name="W" horiz-adv-x="1937" d="M1542 0H1282L1034 872Q1018 929 994 1036T965 1186Q955 1122 933 1020T895 868L653 0H393L204 732L12 1462H256L465 610Q514 405 535 248Q546 333 568 438T608 608L846 1462H1083L1327 604Q1362 485
-1401 248Q1416 391 1473 612L1681 1462H1923L1542 0Z" />
-<glyph unicode="X" glyph-name="X" horiz-adv-x="1274" d="M1270 0H995L629 598L260 0H4L489 758L35 1462H301L639 909L977 1462H1235L778 754L1270 0Z" />
-<glyph unicode="Y" glyph-name="Y" horiz-adv-x="1212" d="M606 795L952 1462H1212L725 567V0H485V559L0 1462H260L606 795Z" />
-<glyph unicode="Z" glyph-name="Z" horiz-adv-x="1178" d="M1112 0H66V166L803 1257H86V1462H1092V1294L352 205H1112V0Z" />
-<glyph unicode="[" glyph-name="bracketleft" horiz-adv-x="676" d="M625 -324H154V1462H625V1286H369V-147H625V-324Z" />
-<glyph unicode="\" glyph-name="backslash" horiz-adv-x="799" d="M238 1462L782 0H561L16 1462H238Z" />
-<glyph unicode="]" glyph-name="bracketright" horiz-adv-x="676" d="M51 -147H307V1286H51V1462H520V-324H51V-147Z" />
-<glyph unicode="^" glyph-name="asciicircum" horiz-adv-x="1100" d="M29 535L465 1470H586L1071 535H877L528 1229L221 535H29Z" />
-<glyph unicode="_" glyph-name="underscore" horiz-adv-x="879" d="M883 -319H-4V-184H883V-319Z" />
-<glyph unicode="`" glyph-name="grave" horiz-adv-x="1212" d="M690 1241Q621 1293 516 1391T362 1548V1569H635Q673 1499 738 1408T848 1266V1241H690Z" />
-<glyph unicode="a" glyph-name="a" horiz-adv-x="1188" d="M860 0L813 154H805Q725 53 644 17T436 -20Q273 -20 182 68T90 317Q90 488 217 575T604 670L795 676V735Q795 841 746 893T592 946Q507 946 429 921T279 862L203 1030Q293 1077 400 1101T602 1126Q813
-1126 920 1034T1028 745V0H860ZM510 160Q638 160 715 231T793 432V528L651 522Q485 516 410 467T334 315Q334 241 378 201T510 160Z" />
-<glyph unicode="b" glyph-name="b" horiz-adv-x="1276" d="M733 1126Q940 1126 1055 976T1171 555Q1171 283 1054 132T729 -20Q519 -20 403 131H387L344 0H168V1556H403V1186Q403 1145 399 1064T393 961H403Q515 1126 733 1126ZM672 934Q530 934 468 851T403 571V555Q403
-353 467 263T676 172Q801 172 865 271T930 557Q930 934 672 934Z" />
-<glyph unicode="c" glyph-name="c" horiz-adv-x="1014" d="M614 -20Q363 -20 233 126T102 547Q102 826 238 976T633 1126Q808 1126 948 1061L877 872Q728 930 631 930Q344 930 344 549Q344 363 415 270T625 176Q782 176 922 254V49Q859 12 788 -4T614 -20Z" />
-<glyph unicode="d" glyph-name="d" horiz-adv-x="1276" d="M541 -20Q334 -20 218 130T102 551Q102 823 219 974T545 1126Q763 1126 877 965H889Q872 1084 872 1153V1556H1108V0H924L883 145H872Q759 -20 541 -20ZM604 170Q749 170 815 251T883 516V549Q883 758
-815 846T602 934Q478 934 411 834T344 547Q344 363 409 267T604 170Z" />
-<glyph unicode="e" glyph-name="e" horiz-adv-x="1180" d="M651 -20Q393 -20 248 130T102 545Q102 816 237 971T608 1126Q827 1126 954 993T1081 627V500H344Q349 339 431 253T662 166Q760 166 844 184T1026 246V55Q940 14 852 -3T651 -20ZM608 948Q496 948 429
-877T348 670H850Q848 807 784 877T608 948Z" />
-<glyph unicode="f" glyph-name="f" horiz-adv-x="743" d="M723 928H453V0H217V928H35V1038L217 1110V1182Q217 1378 309 1472T590 1567Q714 1567 834 1526L772 1348Q685 1376 606 1376Q526 1376 490 1327T453 1178V1106H723V928Z" />
-<glyph unicode="g" glyph-name="g" horiz-adv-x="1139" d="M1102 1106V977L913 942Q939 907 956 856T973 748Q973 577 855 479T530 381Q477 381 434 389Q358 342 358 279Q358 241 393 222T524 203H717Q900 203 995 125T1090 -100Q1090 -288 935 -390T487 -492Q261
--492 142 -412T23 -184Q23 -82 87 -13T268 84Q221 104 191 148T160 242Q160 304 195 347T299 432Q213 469 160 552T106 748Q106 928 219 1027T543 1126Q590 1126 641 1120T719 1106H1102ZM233 -172Q233 -248 301 -289T494 -330Q686 -330 780 -275T874 -129Q874
--57 823 -27T631 4H453Q352 4 293 -43T233 -172ZM334 748Q334 644 387 588T541 532Q745 532 745 750Q745 858 695 916T541 975Q439 975 387 917T334 748Z" />
-<glyph unicode="h" glyph-name="h" horiz-adv-x="1300" d="M1141 0H905V680Q905 808 854 871T690 934Q542 934 473 846T403 549V0H168V1556H403V1161Q403 1066 391 958H406Q454 1038 539 1082T739 1126Q1141 1126 1141 721V0Z" />
-<glyph unicode="i" glyph-name="i" horiz-adv-x="571" d="M403 0H168V1106H403V0ZM154 1399Q154 1462 188 1496T287 1530Q349 1530 383 1496T418 1399Q418 1339 384 1305T287 1270Q223 1270 189 1304T154 1399Z" />
-<glyph unicode="j" glyph-name="j" horiz-adv-x="571" d="M55 -492Q-51 -492 -121 -467V-281Q-53 -299 18 -299Q168 -299 168 -129V1106H403V-145Q403 -316 314 -404T55 -492ZM154 1399Q154 1462 188 1496T287 1530Q349 1530 383 1496T418 1399Q418 1339 384 1305T287
-1270Q223 1270 189 1304T154 1399Z" />
-<glyph unicode="k" glyph-name="k" horiz-adv-x="1171" d="M395 584L528 750L862 1106H1133L688 631L1161 0H885L530 485L401 379V0H168V1556H401V797L389 584H395Z" />
-<glyph unicode="l" glyph-name="l" horiz-adv-x="571" d="M403 0H168V1556H403V0Z" />
-<glyph unicode="m" glyph-name="m" horiz-adv-x="1958" d="M1100 0H864V682Q864 809 816 871T666 934Q530 934 467 846T403 551V0H168V1106H352L385 961H397Q443 1040 530 1083T723 1126Q978 1126 1061 952H1077Q1126 1034 1215 1080T1419 1126Q1617 1126 1707
-1026T1798 721V0H1563V682Q1563 809 1515 871T1364 934Q1227 934 1164 849T1100 586V0Z" />
-<glyph unicode="n" glyph-name="n" horiz-adv-x="1300" d="M1141 0H905V680Q905 808 854 871T690 934Q541 934 472 846T403 551V0H168V1106H352L385 961H397Q447 1040 539 1083T743 1126Q1141 1126 1141 721V0Z" />
-<glyph unicode="o" glyph-name="o" horiz-adv-x="1251" d="M1149 555Q1149 284 1010 132T623 -20Q468 -20 349 50T166 251T102 555Q102 824 240 975T629 1126Q869 1126 1009 972T1149 555ZM344 555Q344 172 627 172Q907 172 907 555Q907 934 625 934Q477 934 411
-836T344 555Z" />
-<glyph unicode="p" glyph-name="p" horiz-adv-x="1276" d="M729 -20Q519 -20 403 131H389Q403 -9 403 -39V-492H168V1106H358Q366 1075 391 958H403Q513 1126 733 1126Q940 1126 1055 976T1171 555Q1171 284 1054 132T729 -20ZM672 934Q532 934 468 852T403 590V555Q403
-353 467 263T676 172Q798 172 864 272T930 557Q930 743 865 838T672 934Z" />
-<glyph unicode="q" glyph-name="q" horiz-adv-x="1276" d="M606 168Q754 168 818 253T883 512V549Q883 754 817 844T602 934Q476 934 410 834T344 547Q344 168 606 168ZM539 -20Q334 -20 218 130T102 551Q102 821 220 973T545 1126Q649 1126 731 1088T879 961H887L913
-1106H1108V-492H872V-23Q872 21 876 70T883 145H870Q766 -20 539 -20Z" />
-<glyph unicode="r" glyph-name="r" horiz-adv-x="883" d="M729 1126Q800 1126 846 1116L823 897Q773 909 719 909Q578 909 491 817T403 578V0H168V1106H352L383 911H395Q450 1010 538 1068T729 1126Z" />
-<glyph unicode="s" glyph-name="s" horiz-adv-x="997" d="M911 315Q911 153 793 67T455 -20Q234 -20 100 47V250Q295 160 463 160Q680 160 680 291Q680 333 656 361T577 419T424 487Q233 561 166 635T98 827Q98 969 212 1047T524 1126Q719 1126 893 1047L817 870Q638
-944 516 944Q330 944 330 838Q330 786 378 750T590 651Q727 598 789 554T881 453T911 315Z" />
-<glyph unicode="t" glyph-name="t" horiz-adv-x="805" d="M580 170Q666 170 752 197V20Q713 3 652 -8T524 -20Q190 -20 190 332V928H39V1032L201 1118L281 1352H426V1106H741V928H426V336Q426 251 468 211T580 170Z" />
-<glyph unicode="u" glyph-name="u" horiz-adv-x="1300" d="M948 0L915 145H903Q854 68 764 24T557 -20Q356 -20 257 80T158 383V1106H395V424Q395 297 447 234T610 170Q758 170 827 258T897 555V1106H1133V0H948Z" />
-<glyph unicode="v" glyph-name="v" horiz-adv-x="1096" d="M420 0L0 1106H248L473 463Q531 301 543 201H551Q560 273 621 463L846 1106H1096L674 0H420Z" />
-<glyph unicode="w" glyph-name="w" horiz-adv-x="1673" d="M1075 0L932 516Q906 598 838 897H829Q771 627 737 514L590 0H330L20 1106H260L401 561Q449 359 469 215H475Q485 288 505 382T541 524L709 1106H967L1130 524Q1145 475 1167 374T1194 217H1202Q1217
-340 1272 561L1415 1106H1651L1339 0H1075Z" />
-<glyph unicode="x" glyph-name="x" horiz-adv-x="1128" d="M414 565L43 1106H311L563 719L817 1106H1083L711 565L1102 0H836L563 414L291 0H25L414 565Z" />
-<glyph unicode="y" glyph-name="y" horiz-adv-x="1098" d="M0 1106H256L481 479Q532 345 549 227H557Q566 282 590 360T844 1106H1098L625 -147Q496 -492 195 -492Q117 -492 43 -475V-289Q96 -301 164 -301Q334 -301 403 -104L444 0L0 1106Z" />
-<glyph unicode="z" glyph-name="z" horiz-adv-x="979" d="M907 0H68V145L627 926H102V1106H891V942L344 180H907V0Z" />
-<glyph unicode="{" glyph-name="braceleft" horiz-adv-x="791" d="M311 287Q311 473 45 473V664Q180 664 245 709T311 848V1159Q311 1315 419 1388T745 1462V1280Q631 1275 580 1234T528 1110V813Q528 614 299 575V563Q528 527 528 326V27Q528 -55 579 -97T745
--141V-324Q514 -322 413 -246T311 2V287Z" />
-<glyph unicode="|" glyph-name="bar" horiz-adv-x="1128" d="M473 1552H653V-481H473V1552Z" />
-<glyph unicode="}" glyph-name="braceright" horiz-adv-x="760" d="M463 -20Q463 -176 364 -249T45 -324V-141Q140 -140 193 -103T246 27V289Q246 410 299 476T475 563V575Q246 614 246 813V1110Q246 1192 201 1233T45 1280V1462Q268 1462 365 1386T463 1135V848Q463
-748 526 706T715 664V473Q592 473 528 431T463 287V-20Z" />
-<glyph unicode="~" glyph-name="asciitilde" horiz-adv-x="1169" d="M330 692Q280 692 219 662T96 571V762Q195 870 346 870Q412 870 471 857T618 807Q749 752 838 752Q890 752 952 783T1073 872V682Q968 571 823 571Q758 571 696 586T549 637Q422 692 330 692Z" />
-<glyph unicode="&#xa0;" glyph-name="nbspace" horiz-adv-x="532" />
-<glyph unicode="&#xa1;" glyph-name="exclamdown" horiz-adv-x="565" d="M193 645H367L418 -371H141L193 645ZM430 965Q430 891 393 852T281 813Q209 813 171 852T133 965Q133 1034 171 1076T281 1118Q353 1118 391 1078T430 965Z" />
-<glyph unicode="&#xa2;" glyph-name="cent" horiz-adv-x="1169" d="M987 238Q868 179 729 174V-20H573V180Q366 211 266 351T166 741Q166 995 266 1138T573 1313V1483H731V1321Q883 1316 1014 1255L944 1067Q798 1126 694 1126Q548 1126 478 1031T408 743Q408
-549 480 460T690 371Q765 371 832 386T987 438V238Z" />
-<glyph unicode="&#xa3;" glyph-name="sterling" horiz-adv-x="1169" d="M690 1481Q884 1481 1065 1399L989 1217Q827 1288 705 1288Q500 1288 500 1069V825H897V653H500V471Q500 380 467 316T354 207H1110V0H72V195Q170 225 217 291T264 469V653H76V825H264V1081Q264
-1269 377 1375T690 1481Z" />
-<glyph unicode="&#xa4;" glyph-name="currency" horiz-adv-x="1169" d="M186 723Q186 832 250 936L117 1069L238 1188L369 1059Q469 1122 584 1122Q699 1122 797 1057L930 1188L1051 1071L920 938Q983 838 983 723Q983 604 920 506L1049 377L930 258L797 387Q698
-326 584 326Q458 326 369 387L238 260L119 379L250 508Q186 607 186 723ZM354 723Q354 625 422 559T584 492Q681 492 749 558T817 723Q817 820 749 888T584 956Q491 956 423 888T354 723Z" />
-<glyph unicode="&#xa5;" glyph-name="yen" horiz-adv-x="1169" d="M584 797L905 1462H1149L750 702H977V551H696V397H977V244H696V0H471V244H188V397H471V551H188V702H412L18 1462H264L584 797Z" />
-<glyph unicode="&#xa6;" glyph-name="brokenbar" horiz-adv-x="1128" d="M473 1552H653V758H473V1552ZM473 315H653V-481H473V315Z" />
-<glyph unicode="&#xa7;" glyph-name="section" horiz-adv-x="1026" d="M129 807Q129 887 167 952T279 1061Q133 1144 133 1296Q133 1425 242 1498T537 1571Q628 1571 711 1554T893 1495L825 1333Q709 1383 649 1396T528 1409Q334 1409 334 1300Q334 1246 389 1207T580
-1116Q755 1048 830 970T905 782Q905 605 766 516Q905 436 905 293Q905 151 787 69T461 -14Q249 -14 115 57V236Q192 196 288 171T465 145Q700 145 700 276Q700 319 679 346T608 400T461 465Q320 520 255 566T160 671T129 807ZM313 827Q313 782 337 747T415 678T610
-588Q719 653 719 756Q719 831 657 882T436 987Q382 971 348 926T313 827Z" />
-<glyph unicode="&#xa8;" glyph-name="dieresis" horiz-adv-x="1212" d="M293 1399Q293 1461 326 1488T408 1516Q461 1516 492 1485T524 1399Q524 1346 492 1314T408 1282Q360 1282 327 1311T293 1399ZM686 1399Q686 1461 719 1488T801 1516Q854 1516 886 1485T918
-1399Q918 1345 885 1314T801 1282Q753 1282 720 1311T686 1399Z" />
-<glyph unicode="&#xa9;" glyph-name="copyright" horiz-adv-x="1704" d="M893 1034Q782 1034 722 954T662 731Q662 584 716 505T893 426Q948 426 1011 441T1120 477V319Q1005 268 885 268Q688 268 580 388T471 731Q471 945 581 1068T887 1192Q1025 1192 1161 1122L1096
-979Q990 1034 893 1034ZM100 731Q100 931 200 1106T475 1382T852 1483Q1052 1483 1227 1383T1503 1108T1604 731Q1604 534 1507 361T1235 84T852 -20Q645 -20 470 83T198 360T100 731ZM223 731Q223 561 307 416T538 186T852 102Q1022 102 1168 187T1397 417T1481
-731Q1481 899 1397 1045T1166 1276T852 1360Q684 1360 540 1277T309 1048T223 731Z" />
-<glyph unicode="&#xaa;" glyph-name="ordfeminine" horiz-adv-x="754" d="M547 782L518 879Q472 824 413 797T283 770Q170 770 114 822T57 981Q57 1085 141 1140T393 1202L500 1206Q500 1278 466 1314T362 1350Q272 1350 152 1294L98 1409Q242 1479 383 1479Q521
-1479 590 1417T659 1229V782H547ZM401 1098Q330 1096 276 1064T221 983Q221 895 317 895Q408 895 454 936T500 1059V1102L401 1098Z" />
-<glyph unicode="&#xab;" glyph-name="guillemotleft" horiz-adv-x="1139" d="M82 561L438 993L606 899L324 549L606 201L438 104L82 535V561ZM532 561L889 993L1057 899L774 549L1057 201L889 104L532 535V561Z" />
-<glyph unicode="&#xac;" glyph-name="logicalnot" horiz-adv-x="1169" d="M1073 256H895V633H96V811H1073V256Z" />
-<glyph unicode="&#xad;" glyph-name="uni00AD" horiz-adv-x="659" d="M72 449V649H586V449H72Z" />
-<glyph unicode="&#xae;" glyph-name="registered" horiz-adv-x="1704" d="M748 770H817Q891 770 929 805T967 905Q967 977 931 1005T815 1034H748V770ZM1157 909Q1157 738 1004 676L1241 279H1030L838 625H748V279H559V1182H821Q995 1182 1076 1114T1157 909ZM100
-731Q100 931 200 1106T475 1382T852 1483Q1052 1483 1227 1383T1503 1108T1604 731Q1604 534 1507 361T1235 84T852 -20Q645 -20 470 83T198 360T100 731ZM223 731Q223 561 307 416T538 186T852 102Q1022 102 1168 187T1397 417T1481 731Q1481 899 1397 1045T1166
-1276T852 1360Q684 1360 540 1277T309 1048T223 731Z" />
-<glyph unicode="&#xaf;" glyph-name="overscore" horiz-adv-x="1024" d="M1030 1556H-6V1720H1030V1556Z" />
-<glyph unicode="&#xb0;" glyph-name="degree" horiz-adv-x="877" d="M109 1153Q109 1288 204 1385T438 1483Q576 1483 671 1387T766 1153Q766 1014 670 920T438 825Q350 825 274 868T153 988T109 1153ZM262 1153Q262 1083 313 1031T438 979Q512 979 563 1030T614
-1153Q614 1229 562 1280T438 1331Q366 1331 314 1279T262 1153Z" />
-<glyph unicode="&#xb1;" glyph-name="plusminus" horiz-adv-x="1169" d="M494 664H96V842H494V1249H674V842H1073V664H674V258H494V664ZM96 0V178H1073V0H96Z" />
-<glyph unicode="&#xb2;" glyph-name="twosuperior" horiz-adv-x="743" d="M678 586H51V721L281 946Q398 1058 430 1111T463 1223Q463 1275 431 1302T348 1329Q255 1329 147 1241L53 1362Q192 1481 362 1481Q498 1481 573 1415T649 1235Q649 1152 603 1077T420
-874L281 745H678V586Z" />
-<glyph unicode="&#xb3;" glyph-name="threesuperior" horiz-adv-x="743" d="M645 1251Q645 1176 605 1129T485 1042Q579 1021 626 966T674 834Q674 707 581 638T315 569Q167 569 45 631V788Q190 709 315 709Q494 709 494 844Q494 969 295 969H180V1102H285Q469
-1102 469 1231Q469 1283 435 1311T344 1339Q287 1339 239 1319T133 1262L49 1376Q110 1422 183 1451T354 1481Q488 1481 566 1420T645 1251Z" />
-<glyph unicode="&#xb4;" glyph-name="acute" horiz-adv-x="1212" d="M362 1241V1266Q419 1336 479 1422T575 1569H848V1548Q796 1487 693 1391T518 1241H362Z" />
-<glyph unicode="&#xb5;" glyph-name="mu" horiz-adv-x="1309" d="M403 422Q403 170 621 170Q767 170 836 258T905 555V1106H1141V0H958L924 147H911Q863 64 792 22T616 -20Q476 -20 397 70H393Q396 42 399 -47T403 -172V-492H168V1106H403V422Z" />
-<glyph unicode="&#xb6;" glyph-name="paragraph" horiz-adv-x="1341" d="M1143 -260H1006V1403H815V-260H678V559Q616 541 532 541Q316 541 215 666T113 1042Q113 1302 222 1429T563 1556H1143V-260Z" />
-<glyph unicode="&#xb7;" glyph-name="middot" horiz-adv-x="563" d="M133 723Q133 796 171 835T281 874Q354 874 392 834T430 723Q430 652 392 611T281 569Q209 569 171 610T133 723Z" />
-<glyph unicode="&#xb8;" glyph-name="cedilla" horiz-adv-x="442" d="M426 -270Q426 -492 121 -492Q55 -492 0 -477V-340Q54 -354 123 -354Q177 -354 208 -338T240 -276Q240 -191 61 -166L145 0H297L256 -88Q336 -109 381 -156T426 -270Z" />
-<glyph unicode="&#xb9;" glyph-name="onesuperior" horiz-adv-x="743" d="M532 586H346V1098L349 1201L354 1292Q337 1274 314 1252T172 1141L84 1253L365 1462H532V586Z" />
-<glyph unicode="&#xba;" glyph-name="ordmasculine" horiz-adv-x="780" d="M719 1124Q719 960 632 865T387 770Q237 770 149 865T61 1124Q61 1293 149 1386T391 1479Q543 1479 631 1385T719 1124ZM223 1124Q223 1013 262 958T389 903Q477 903 516 958T555 1124Q555
-1237 516 1291T389 1346Q301 1346 262 1292T223 1124Z" />
-<glyph unicode="&#xbb;" glyph-name="guillemotright" horiz-adv-x="1139" d="M1057 535L698 104L530 201L813 549L530 899L698 993L1057 561V535ZM606 535L248 104L80 201L362 549L80 899L248 993L606 561V535Z" />
-<glyph unicode="&#xbc;" glyph-name="onequarter" horiz-adv-x="1700" d="M1333 1462L477 0H285L1143 1462H1333ZM764 586H578V1098L581 1201L586 1292Q569 1274 546 1252T404 1141L316 1253L597 1462H764V586ZM1585 177H1460V1H1268V177H876V304L1272 883H1460V320H1585V177ZM1268
-320V498Q1268 595 1274 695Q1222 591 1186 537L1038 320H1268Z" />
-<glyph unicode="&#xbd;" glyph-name="onehalf" horiz-adv-x="1700" d="M1298 1462L442 0H250L1108 1462H1298ZM750 586H564V1098L567 1201L572 1292Q555 1274 532 1252T390 1141L302 1253L583 1462H750V586ZM1608 1H981V136L1211 361Q1328 473 1360 526T1393 638Q1393
-690 1361 717T1278 744Q1185 744 1077 656L983 777Q1122 896 1292 896Q1428 896 1503 830T1579 650Q1579 567 1533 492T1350 289L1211 160H1608V1Z" />
-<glyph unicode="&#xbe;" glyph-name="threequarters" horiz-adv-x="1700" d="M1415 1462L559 0H367L1225 1462H1415ZM1640 177H1515V1H1323V177H931V304L1327 883H1515V320H1640V177ZM1323 320V498Q1323 595 1329 695Q1277 591 1241 537L1093 320H1323ZM655 1251Q655
-1176 615 1129T495 1042Q589 1021 636 966T684 834Q684 707 591 638T325 569Q177 569 55 631V788Q200 709 325 709Q504 709 504 844Q504 969 305 969H190V1102H295Q479 1102 479 1231Q479 1283 445 1311T354 1339Q297 1339 249 1319T143 1262L59 1376Q120 1422
-193 1451T364 1481Q498 1481 576 1420T655 1251Z" />
-<glyph unicode="&#xbf;" glyph-name="questiondown" horiz-adv-x="928" d="M651 645V582Q651 476 610 401T467 246Q343 148 312 99T281 -25Q281 -103 335 -150T496 -197Q586 -197 670 -170T836 -104L918 -283Q698 -393 494 -393Q287 -393 171 -298T55 -33Q55 40
-76 97T140 206T297 348Q391 424 422 472T453 600V645H651ZM692 965Q692 891 655 852T543 813Q471 813 433 852T395 965Q395 1034 433 1076T543 1118Q615 1118 653 1078T692 965Z" />
-<glyph unicode="&#xc0;" glyph-name="Agrave" horiz-adv-x="1354" d="M1100 0L954 406H395L252 0H0L547 1468H807L1354 0H1100ZM891 612L754 1010Q739 1050 713 1136T676 1262Q649 1139 597 993L465 612H891ZM662 1579Q593 1631 488 1729T334 1886V1907H607Q645
-1837 710 1746T820 1604V1579H662Z" />
-<glyph unicode="&#xc1;" glyph-name="Aacute" horiz-adv-x="1354" d="M1100 0L954 406H395L252 0H0L547 1468H807L1354 0H1100ZM891 612L754 1010Q739 1050 713 1136T676 1262Q649 1139 597 993L465 612H891ZM532 1579V1604Q589 1674 649 1760T745 1907H1018V1886Q966
-1825 863 1729T688 1579H532Z" />
-<glyph unicode="&#xc2;" glyph-name="Acircumflex" horiz-adv-x="1354" d="M1100 0L954 406H395L252 0H0L547 1468H807L1354 0H1100ZM891 612L754 1010Q739 1050 713 1136T676 1262Q649 1139 597 993L465 612H891ZM897 1579Q774 1652 669 1759Q566 1656 444 1579H286V1604Q477
-1802 540 1907H800Q863 1797 1056 1604V1579H897Z" />
-<glyph unicode="&#xc3;" glyph-name="Atilde" horiz-adv-x="1354" d="M1100 0L954 406H395L252 0H0L547 1468H807L1354 0H1100ZM891 612L754 1010Q739 1050 713 1136T676 1262Q649 1139 597 993L465 612H891ZM821 1579Q779 1579 739 1596T659 1635T583 1674T512
-1692Q431 1692 403 1577H281Q293 1716 358 1789T526 1862Q569 1862 610 1845T690 1806T765 1767T836 1749Q915 1749 942 1864H1067Q1055 1730 990 1655T821 1579Z" />
-<glyph unicode="&#xc4;" glyph-name="Adieresis" horiz-adv-x="1354" d="M1100 0L954 406H395L252 0H0L547 1468H807L1354 0H1100ZM891 612L754 1010Q739 1050 713 1136T676 1262Q649 1139 597 993L465 612H891ZM363 1737Q363 1799 396 1826T478 1854Q531 1854
-562 1823T594 1737Q594 1684 562 1652T478 1620Q430 1620 397 1649T363 1737ZM756 1737Q756 1799 789 1826T871 1854Q924 1854 956 1823T988 1737Q988 1683 955 1652T871 1620Q823 1620 790 1649T756 1737Z" />
-<glyph unicode="&#xc5;" glyph-name="Aring" horiz-adv-x="1354" d="M1100 0L954 406H395L252 0H0L547 1468H807L1354 0H1100ZM891 612L754 1010Q739 1050 713 1136T676 1262Q649 1139 597 993L465 612H891ZM913 1577Q913 1475 848 1412T674 1348Q566 1348 502
-1410T438 1575Q438 1676 501 1738T674 1801Q778 1801 845 1739T913 1577ZM780 1575Q780 1625 750 1653T674 1682Q627 1682 597 1654T567 1575Q567 1469 674 1469Q720 1469 750 1496T780 1575Z" />
-<glyph unicode="&#xc6;" glyph-name="AE" horiz-adv-x="1868" d="M1747 0H936V406H432L244 0H-2L676 1462H1747V1260H1176V862H1708V662H1176V203H1747V0ZM522 612H936V1253H813L522 612Z" />
-<glyph unicode="&#xc7;" glyph-name="Ccedilla" horiz-adv-x="1298" d="M815 1278Q609 1278 491 1132T373 729Q373 460 486 322T815 184Q908 184 995 202T1176 250V45Q1004 -20 786 -20Q465 -20 293 174T121 731Q121 959 204 1130T446 1392T817 1483Q1041 1483
-1231 1389L1145 1190Q1071 1225 989 1251T815 1278ZM952 -270Q952 -492 647 -492Q581 -492 526 -477V-340Q580 -354 649 -354Q703 -354 734 -338T766 -276Q766 -191 587 -166L671 0H823L782 -88Q862 -109 907 -156T952 -270Z" />
-<glyph unicode="&#xc8;" glyph-name="Egrave" horiz-adv-x="1143" d="M1020 0H193V1462H1020V1260H432V862H983V662H432V203H1020V0ZM617 1579Q548 1631 443 1729T289 1886V1907H562Q600 1837 665 1746T775 1604V1579H617Z" />
-<glyph unicode="&#xc9;" glyph-name="Eacute" horiz-adv-x="1143" d="M1020 0H193V1462H1020V1260H432V862H983V662H432V203H1020V0ZM440 1579V1604Q497 1674 557 1760T653 1907H926V1886Q874 1825 771 1729T596 1579H440Z" />
-<glyph unicode="&#xca;" glyph-name="Ecircumflex" horiz-adv-x="1143" d="M1020 0H193V1462H1020V1260H432V862H983V662H432V203H1020V0ZM831 1579Q708 1652 603 1759Q500 1656 378 1579H220V1604Q411 1802 474 1907H734Q797 1797 990 1604V1579H831Z" />
-<glyph unicode="&#xcb;" glyph-name="Edieresis" horiz-adv-x="1143" d="M1020 0H193V1462H1020V1260H432V862H983V662H432V203H1020V0ZM297 1737Q297 1799 330 1826T412 1854Q465 1854 496 1823T528 1737Q528 1684 496 1652T412 1620Q364 1620 331 1649T297 1737ZM690
-1737Q690 1799 723 1826T805 1854Q858 1854 890 1823T922 1737Q922 1683 889 1652T805 1620Q757 1620 724 1649T690 1737Z" />
-<glyph unicode="&#xcc;" glyph-name="Igrave" horiz-adv-x="625" d="M193 0V1462H432V0H193ZM322 1579Q253 1631 148 1729T-6 1886V1907H267Q305 1837 370 1746T480 1604V1579H322Z" />
-<glyph unicode="&#xcd;" glyph-name="Iacute" horiz-adv-x="625" d="M193 0V1462H432V0H193ZM179 1579V1604Q236 1674 296 1760T392 1907H665V1886Q613 1825 510 1729T335 1579H179Z" />
-<glyph unicode="&#xce;" glyph-name="Icircumflex" horiz-adv-x="625" d="M193 0V1462H432V0H193ZM536 1579Q413 1652 308 1759Q205 1656 83 1579H-75V1604Q116 1802 179 1907H439Q502 1797 695 1604V1579H536Z" />
-<glyph unicode="&#xcf;" glyph-name="Idieresis" horiz-adv-x="625" d="M193 0V1462H432V0H193ZM1 1737Q1 1799 34 1826T116 1854Q169 1854 200 1823T232 1737Q232 1684 200 1652T116 1620Q68 1620 35 1649T1 1737ZM394 1737Q394 1799 427 1826T509 1854Q562 1854
-594 1823T626 1737Q626 1683 593 1652T509 1620Q461 1620 428 1649T394 1737Z" />
-<glyph unicode="&#xd0;" glyph-name="Eth" horiz-adv-x="1497" d="M1374 745Q1374 385 1173 193T594 0H193V623H47V823H193V1462H639Q986 1462 1180 1274T1374 745ZM1122 737Q1122 997 998 1129T629 1262H432V823H739V623H432V201H592Q1122 201 1122 737Z" />
-<glyph unicode="&#xd1;" glyph-name="Ntilde" horiz-adv-x="1604" d="M1411 0H1118L399 1165H391L396 1100Q410 914 410 760V0H193V1462H483L1200 303H1206Q1204 326 1198 470T1192 696V1462H1411V0ZM954 1579Q912 1579 872 1596T792 1635T716 1674T645 1692Q564
-1692 536 1577H414Q426 1716 491 1789T659 1862Q702 1862 743 1845T823 1806T898 1767T969 1749Q1048 1749 1075 1864H1200Q1188 1730 1123 1655T954 1579Z" />
-<glyph unicode="&#xd2;" glyph-name="Ograve" horiz-adv-x="1612" d="M1491 733Q1491 376 1313 178T807 -20Q476 -20 299 176T121 735Q121 1097 299 1291T809 1485Q1135 1485 1313 1288T1491 733ZM375 733Q375 463 484 324T807 184Q1020 184 1128 322T1237 733Q1237
-1002 1130 1141T809 1280Q594 1280 485 1141T375 733ZM809 1579Q740 1631 635 1729T481 1886V1907H754Q792 1837 857 1746T967 1604V1579H809Z" />
-<glyph unicode="&#xd3;" glyph-name="Oacute" horiz-adv-x="1612" d="M1491 733Q1491 376 1313 178T807 -20Q476 -20 299 176T121 735Q121 1097 299 1291T809 1485Q1135 1485 1313 1288T1491 733ZM375 733Q375 463 484 324T807 184Q1020 184 1128 322T1237 733Q1237
-1002 1130 1141T809 1280Q594 1280 485 1141T375 733ZM657 1579V1604Q714 1674 774 1760T870 1907H1143V1886Q1091 1825 988 1729T813 1579H657Z" />
-<glyph unicode="&#xd4;" glyph-name="Ocircumflex" horiz-adv-x="1612" d="M1491 733Q1491 376 1313 178T807 -20Q476 -20 299 176T121 735Q121 1097 299 1291T809 1485Q1135 1485 1313 1288T1491 733ZM375 733Q375 463 484 324T807 184Q1020 184 1128 322T1237
-733Q1237 1002 1130 1141T809 1280Q594 1280 485 1141T375 733ZM1024 1579Q901 1652 796 1759Q693 1656 571 1579H413V1604Q604 1802 667 1907H927Q990 1797 1183 1604V1579H1024Z" />
-<glyph unicode="&#xd5;" glyph-name="Otilde" horiz-adv-x="1612" d="M1491 733Q1491 376 1313 178T807 -20Q476 -20 299 176T121 735Q121 1097 299 1291T809 1485Q1135 1485 1313 1288T1491 733ZM375 733Q375 463 484 324T807 184Q1020 184 1128 322T1237 733Q1237
-1002 1130 1141T809 1280Q594 1280 485 1141T375 733ZM950 1579Q908 1579 868 1596T788 1635T712 1674T641 1692Q560 1692 532 1577H410Q422 1716 487 1789T655 1862Q698 1862 739 1845T819 1806T894 1767T965 1749Q1044 1749 1071 1864H1196Q1184 1730 1119 1655T950
-1579Z" />
-<glyph unicode="&#xd6;" glyph-name="Odieresis" horiz-adv-x="1612" d="M1491 733Q1491 376 1313 178T807 -20Q476 -20 299 176T121 735Q121 1097 299 1291T809 1485Q1135 1485 1313 1288T1491 733ZM375 733Q375 463 484 324T807 184Q1020 184 1128 322T1237
-733Q1237 1002 1130 1141T809 1280Q594 1280 485 1141T375 733ZM496 1737Q496 1799 529 1826T611 1854Q664 1854 695 1823T727 1737Q727 1684 695 1652T611 1620Q563 1620 530 1649T496 1737ZM889 1737Q889 1799 922 1826T1004 1854Q1057 1854 1089 1823T1121 1737Q1121
-1683 1088 1652T1004 1620Q956 1620 923 1649T889 1737Z" />
-<glyph unicode="&#xd7;" glyph-name="multiply" horiz-adv-x="1169" d="M457 723L131 1049L256 1176L584 850L913 1176L1038 1053L709 723L1034 395L911 270L582 596L258 270L133 395L457 723Z" />
-<glyph unicode="&#xd8;" glyph-name="Oslash" horiz-adv-x="1612" d="M1491 733Q1491 376 1313 178T807 -20Q594 -20 446 61L352 -76L211 18L309 162Q121 358 121 735Q121 1097 299 1291T809 1485Q1008 1485 1163 1403L1253 1532L1395 1440L1296 1300Q1491 1101
-1491 733ZM1237 733Q1237 958 1157 1094L571 244Q668 184 807 184Q1020 184 1128 322T1237 733ZM375 733Q375 502 453 371L1040 1221Q948 1280 809 1280Q594 1280 485 1141T375 733Z" />
-<glyph unicode="&#xd9;" glyph-name="Ugrave" horiz-adv-x="1520" d="M1339 1462V516Q1339 354 1270 233T1069 46T754 -20Q482 -20 331 124T180 520V1462H420V537Q420 356 504 270T762 184Q1100 184 1100 539V1462H1339ZM745 1579Q676 1631 571 1729T417 1886V1907H690Q728
-1837 793 1746T903 1604V1579H745Z" />
-<glyph unicode="&#xda;" glyph-name="Uacute" horiz-adv-x="1520" d="M1339 1462V516Q1339 354 1270 233T1069 46T754 -20Q482 -20 331 124T180 520V1462H420V537Q420 356 504 270T762 184Q1100 184 1100 539V1462H1339ZM600 1579V1604Q657 1674 717 1760T813
-1907H1086V1886Q1034 1825 931 1729T756 1579H600Z" />
-<glyph unicode="&#xdb;" glyph-name="Ucircumflex" horiz-adv-x="1520" d="M1339 1462V516Q1339 354 1270 233T1069 46T754 -20Q482 -20 331 124T180 520V1462H420V537Q420 356 504 270T762 184Q1100 184 1100 539V1462H1339ZM977 1579Q854 1652 749 1759Q646
-1656 524 1579H366V1604Q557 1802 620 1907H880Q943 1797 1136 1604V1579H977Z" />
-<glyph unicode="&#xdc;" glyph-name="Udieresis" horiz-adv-x="1520" d="M1339 1462V516Q1339 354 1270 233T1069 46T754 -20Q482 -20 331 124T180 520V1462H420V537Q420 356 504 270T762 184Q1100 184 1100 539V1462H1339ZM445 1737Q445 1799 478 1826T560 1854Q613
-1854 644 1823T676 1737Q676 1684 644 1652T560 1620Q512 1620 479 1649T445 1737ZM838 1737Q838 1799 871 1826T953 1854Q1006 1854 1038 1823T1070 1737Q1070 1683 1037 1652T953 1620Q905 1620 872 1649T838 1737Z" />
-<glyph unicode="&#xdd;" glyph-name="Yacute" horiz-adv-x="1212" d="M606 795L952 1462H1212L725 567V0H485V559L0 1462H260L606 795ZM450 1579V1604Q507 1674 567 1760T663 1907H936V1886Q884 1825 781 1729T606 1579H450Z" />
-<glyph unicode="&#xde;" glyph-name="Thorn" horiz-adv-x="1268" d="M1169 776Q1169 549 1023 427T600 305H432V0H193V1462H432V1219H629Q897 1219 1033 1107T1169 776ZM432 504H565Q752 504 838 567T924 770Q924 897 846 958T596 1020H432V504Z" />
-<glyph unicode="&#xdf;" glyph-name="germandbls" horiz-adv-x="1364" d="M1149 1253Q1149 1179 1111 1113T1006 995Q916 926 889 897T862 840Q862 810 884 785T964 721L1059 657Q1151 595 1194 548T1260 444T1282 317Q1282 152 1175 66T864 -20Q674 -20 565 45V244Q623
-207 704 183T852 158Q1044 158 1044 309Q1044 370 1010 414T854 532Q735 605 683 667T631 813Q631 876 665 928T770 1034Q845 1089 877 1131T909 1225Q909 1297 842 1337T664 1378Q537 1378 470 1324T403 1165V0H168V1169Q168 1362 296 1464T664 1567Q889 1567
-1019 1483T1149 1253Z" />
-<glyph unicode="&#xe0;" glyph-name="agrave" horiz-adv-x="1188" d="M860 0L813 154H805Q725 53 644 17T436 -20Q273 -20 182 68T90 317Q90 488 217 575T604 670L795 676V735Q795 841 746 893T592 946Q507 946 429 921T279 862L203 1030Q293 1077 400 1101T602
-1126Q813 1126 920 1034T1028 745V0H860ZM510 160Q638 160 715 231T793 432V528L651 522Q485 516 410 467T334 315Q334 241 378 201T510 160ZM843 1241Q774 1293 669 1391T515 1548V1569H788Q826 1499 891 1408T1001 1266V1241H843Z" />
-<glyph unicode="&#xe1;" glyph-name="aacute" horiz-adv-x="1188" d="M860 0L813 154H805Q725 53 644 17T436 -20Q273 -20 182 68T90 317Q90 488 217 575T604 670L795 676V735Q795 841 746 893T592 946Q507 946 429 921T279 862L203 1030Q293 1077 400 1101T602
-1126Q813 1126 920 1034T1028 745V0H860ZM510 160Q638 160 715 231T793 432V528L651 522Q485 516 410 467T334 315Q334 241 378 201T510 160ZM438 1241V1266Q495 1336 555 1422T651 1569H924V1548Q872 1487 769 1391T594 1241H438Z" />
-<glyph unicode="&#xe2;" glyph-name="acircumflex" horiz-adv-x="1188" d="M860 0L813 154H805Q725 53 644 17T436 -20Q273 -20 182 68T90 317Q90 488 217 575T604 670L795 676V735Q795 841 746 893T592 946Q507 946 429 921T279 862L203 1030Q293 1077 400 1101T602
-1126Q813 1126 920 1034T1028 745V0H860ZM510 160Q638 160 715 231T793 432V528L651 522Q485 516 410 467T334 315Q334 241 378 201T510 160ZM1070 1241Q947 1314 842 1421Q739 1318 617 1241H459V1266Q650 1464 713 1569H973Q1036 1459 1229 1266V1241H1070Z"
-/>
-<glyph unicode="&#xe3;" glyph-name="atilde" horiz-adv-x="1188" d="M860 0L813 154H805Q725 53 644 17T436 -20Q273 -20 182 68T90 317Q90 488 217 575T604 670L795 676V735Q795 841 746 893T592 946Q507 946 429 921T279 862L203 1030Q293 1077 400 1101T602
-1126Q813 1126 920 1034T1028 745V0H860ZM510 160Q638 160 715 231T793 432V528L651 522Q485 516 410 467T334 315Q334 241 378 201T510 160ZM1004 1241Q962 1241 922 1258T842 1297T766 1336T695 1354Q614 1354 586 1239H464Q476 1378 541 1451T709 1524Q752 1524
-793 1507T873 1468T948 1429T1019 1411Q1098 1411 1125 1526H1250Q1238 1392 1173 1317T1004 1241Z" />
-<glyph unicode="&#xe4;" glyph-name="adieresis" horiz-adv-x="1188" d="M860 0L813 154H805Q725 53 644 17T436 -20Q273 -20 182 68T90 317Q90 488 217 575T604 670L795 676V735Q795 841 746 893T592 946Q507 946 429 921T279 862L203 1030Q293 1077 400 1101T602
-1126Q813 1126 920 1034T1028 745V0H860ZM510 160Q638 160 715 231T793 432V528L651 522Q485 516 410 467T334 315Q334 241 378 201T510 160ZM538 1399Q538 1461 571 1488T653 1516Q706 1516 737 1485T769 1399Q769 1346 737 1314T653 1282Q605 1282 572 1311T538
-1399ZM931 1399Q931 1461 964 1488T1046 1516Q1099 1516 1131 1485T1163 1399Q1163 1345 1130 1314T1046 1282Q998 1282 965 1311T931 1399Z" />
-<glyph unicode="&#xe5;" glyph-name="aring" horiz-adv-x="1188" d="M860 0L813 154H805Q725 53 644 17T436 -20Q273 -20 182 68T90 317Q90 488 217 575T604 670L795 676V735Q795 841 746 893T592 946Q507 946 429 921T279 862L203 1030Q293 1077 400 1101T602
-1126Q813 1126 920 1034T1028 745V0H860ZM510 160Q638 160 715 231T793 432V528L651 522Q485 516 410 467T334 315Q334 241 378 201T510 160ZM841 1468Q841 1366 776 1303T602 1239Q494 1239 430 1301T366 1466Q366 1567 429 1629T602 1692Q706 1692 773 1630T841
-1468ZM708 1466Q708 1516 678 1544T602 1573Q555 1573 525 1545T495 1466Q495 1360 602 1360Q648 1360 678 1387T708 1466Z" />
-<glyph unicode="&#xe6;" glyph-name="ae" horiz-adv-x="1817" d="M90 317Q90 489 211 575T582 670L770 676V752Q770 946 569 946Q428 946 262 864L188 1030Q276 1077 380 1101T584 1126Q825 1126 924 971Q1044 1126 1270 1126Q1476 1126 1598 992T1720 629V502H1008Q1018
-166 1309 166Q1493 166 1665 246V55Q1579 14 1494 -3T1298 -20Q1158 -20 1050 34T874 199Q780 74 684 27T442 -20Q277 -20 184 70T90 317ZM334 315Q334 160 500 160Q624 160 696 232T768 432V528L633 522Q478 516 406 468T334 315ZM1266 948Q1154 948 1089 879T1014
-670H1487Q1487 800 1429 874T1266 948Z" />
-<glyph unicode="&#xe7;" glyph-name="ccedilla" horiz-adv-x="1014" d="M614 -20Q363 -20 233 126T102 547Q102 826 238 976T633 1126Q808 1126 948 1061L877 872Q728 930 631 930Q344 930 344 549Q344 363 415 270T625 176Q782 176 922 254V49Q859 12 788 -4T614
--20ZM782 -270Q782 -492 477 -492Q411 -492 356 -477V-340Q410 -354 479 -354Q533 -354 564 -338T596 -276Q596 -191 417 -166L501 0H653L612 -88Q692 -109 737 -156T782 -270Z" />
-<glyph unicode="&#xe8;" glyph-name="egrave" horiz-adv-x="1180" d="M651 -20Q393 -20 248 130T102 545Q102 816 237 971T608 1126Q827 1126 954 993T1081 627V500H344Q349 339 431 253T662 166Q760 166 844 184T1026 246V55Q940 14 852 -3T651 -20ZM608 948Q496
-948 429 877T348 670H850Q848 807 784 877T608 948ZM865 1241Q796 1293 691 1391T537 1548V1569H810Q848 1499 913 1408T1023 1266V1241H865Z" />
-<glyph unicode="&#xe9;" glyph-name="eacute" horiz-adv-x="1180" d="M651 -20Q393 -20 248 130T102 545Q102 816 237 971T608 1126Q827 1126 954 993T1081 627V500H344Q349 339 431 253T662 166Q760 166 844 184T1026 246V55Q940 14 852 -3T651 -20ZM608 948Q496
-948 429 877T348 670H850Q848 807 784 877T608 948ZM458 1241V1266Q515 1336 575 1422T671 1569H944V1548Q892 1487 789 1391T614 1241H458Z" />
-<glyph unicode="&#xea;" glyph-name="ecircumflex" horiz-adv-x="1180" d="M651 -20Q393 -20 248 130T102 545Q102 816 237 971T608 1126Q827 1126 954 993T1081 627V500H344Q349 339 431 253T662 166Q760 166 844 184T1026 246V55Q940 14 852 -3T651 -20ZM608
-948Q496 948 429 877T348 670H850Q848 807 784 877T608 948ZM838 1241Q715 1314 610 1421Q507 1318 385 1241H227V1266Q418 1464 481 1569H741Q804 1459 997 1266V1241H838Z" />
-<glyph unicode="&#xeb;" glyph-name="edieresis" horiz-adv-x="1180" d="M651 -20Q393 -20 248 130T102 545Q102 816 237 971T608 1126Q827 1126 954 993T1081 627V500H344Q349 339 431 253T662 166Q760 166 844 184T1026 246V55Q940 14 852 -3T651 -20ZM608 948Q496
-948 429 877T348 670H850Q848 807 784 877T608 948ZM307 1399Q307 1461 340 1488T422 1516Q475 1516 506 1485T538 1399Q538 1346 506 1314T422 1282Q374 1282 341 1311T307 1399ZM700 1399Q700 1461 733 1488T815 1516Q868 1516 900 1485T932 1399Q932 1345 899
-1314T815 1282Q767 1282 734 1311T700 1399Z" />
-<glyph unicode="&#xec;" glyph-name="igrave" horiz-adv-x="571" d="M403 0H168V1106H403V0ZM259 1241Q190 1293 85 1391T-69 1548V1569H204Q242 1499 307 1408T417 1266V1241H259Z" />
-<glyph unicode="&#xed;" glyph-name="iacute" horiz-adv-x="571" d="M403 0H168V1106H403V0ZM156 1241V1266Q213 1336 273 1422T369 1569H642V1548Q590 1487 487 1391T312 1241H156Z" />
-<glyph unicode="&#xee;" glyph-name="icircumflex" horiz-adv-x="571" d="M403 0H168V1106H403V0ZM511 1241Q388 1314 283 1421Q180 1318 58 1241H-100V1266Q91 1464 154 1569H414Q477 1459 670 1266V1241H511Z" />
-<glyph unicode="&#xef;" glyph-name="idieresis" horiz-adv-x="571" d="M403 0H168V1106H403V0ZM-25 1399Q-25 1461 8 1488T90 1516Q143 1516 174 1485T206 1399Q206 1346 174 1314T90 1282Q42 1282 9 1311T-25 1399ZM368 1399Q368 1461 401 1488T483 1516Q536
-1516 568 1485T600 1399Q600 1345 567 1314T483 1282Q435 1282 402 1311T368 1399Z" />
-<glyph unicode="&#xf0;" glyph-name="eth" horiz-adv-x="1243" d="M1149 567Q1149 288 1012 134T623 -20Q388 -20 245 116T102 481Q102 712 233 846T584 981Q798 981 885 870L893 874Q831 1063 666 1219L416 1069L328 1202L532 1321Q446 1380 365 1423L449 1569Q589
-1506 707 1425L938 1563L1026 1434L838 1321Q990 1181 1069 991T1149 567ZM909 522Q909 649 834 724T627 799Q476 799 409 717T342 477Q342 324 416 243T627 162Q775 162 842 253T909 522Z" />
-<glyph unicode="&#xf1;" glyph-name="ntilde" horiz-adv-x="1300" d="M1141 0H905V680Q905 808 854 871T690 934Q541 934 472 846T403 551V0H168V1106H352L385 961H397Q447 1040 539 1083T743 1126Q1141 1126 1141 721V0ZM809 1241Q767 1241 727 1258T647 1297T571
-1336T500 1354Q419 1354 391 1239H269Q281 1378 346 1451T514 1524Q557 1524 598 1507T678 1468T753 1429T824 1411Q903 1411 930 1526H1055Q1043 1392 978 1317T809 1241Z" />
-<glyph unicode="&#xf2;" glyph-name="ograve" horiz-adv-x="1251" d="M1149 555Q1149 284 1010 132T623 -20Q468 -20 349 50T166 251T102 555Q102 824 240 975T629 1126Q869 1126 1009 972T1149 555ZM344 555Q344 172 627 172Q907 172 907 555Q907 934 625 934Q477
-934 411 836T344 555ZM877 1241Q808 1293 703 1391T549 1548V1569H822Q860 1499 925 1408T1035 1266V1241H877Z" />
-<glyph unicode="&#xf3;" glyph-name="oacute" horiz-adv-x="1251" d="M1149 555Q1149 284 1010 132T623 -20Q468 -20 349 50T166 251T102 555Q102 824 240 975T629 1126Q869 1126 1009 972T1149 555ZM344 555Q344 172 627 172Q907 172 907 555Q907 934 625 934Q477
-934 411 836T344 555ZM473 1241V1266Q530 1336 590 1422T686 1569H959V1548Q907 1487 804 1391T629 1241H473Z" />
-<glyph unicode="&#xf4;" glyph-name="ocircumflex" horiz-adv-x="1251" d="M1149 555Q1149 284 1010 132T623 -20Q468 -20 349 50T166 251T102 555Q102 824 240 975T629 1126Q869 1126 1009 972T1149 555ZM344 555Q344 172 627 172Q907 172 907 555Q907 934 625
-934Q477 934 411 836T344 555ZM850 1241Q727 1314 622 1421Q519 1318 397 1241H239V1266Q430 1464 493 1569H753Q816 1459 1009 1266V1241H850Z" />
-<glyph unicode="&#xf5;" glyph-name="otilde" horiz-adv-x="1251" d="M1149 555Q1149 284 1010 132T623 -20Q468 -20 349 50T166 251T102 555Q102 824 240 975T629 1126Q869 1126 1009 972T1149 555ZM344 555Q344 172 627 172Q907 172 907 555Q907 934 625 934Q477
-934 411 836T344 555ZM1031 1241Q989 1241 949 1258T869 1297T793 1336T722 1354Q641 1354 613 1239H491Q503 1378 568 1451T736 1524Q779 1524 820 1507T900 1468T975 1429T1046 1411Q1125 1411 1152 1526H1277Q1265 1392 1200 1317T1031 1241Z" />
-<glyph unicode="&#xf6;" glyph-name="odieresis" horiz-adv-x="1251" d="M1149 555Q1149 284 1010 132T623 -20Q468 -20 349 50T166 251T102 555Q102 824 240 975T629 1126Q869 1126 1009 972T1149 555ZM344 555Q344 172 627 172Q907 172 907 555Q907 934 625
-934Q477 934 411 836T344 555ZM311 1399Q311 1461 344 1488T426 1516Q479 1516 510 1485T542 1399Q542 1346 510 1314T426 1282Q378 1282 345 1311T311 1399ZM704 1399Q704 1461 737 1488T819 1516Q872 1516 904 1485T936 1399Q936 1345 903 1314T819 1282Q771
-1282 738 1311T704 1399Z" />
-<glyph unicode="&#xf7;" glyph-name="divide" horiz-adv-x="1169" d="M96 633V811H1073V633H96ZM457 373Q457 437 488 472T584 508Q645 508 677 472T709 373Q709 310 675 273T584 236Q524 236 491 271T457 373ZM457 1071Q457 1135 488 1170T584 1206Q645 1206
-677 1170T709 1071Q709 1008 675 971T584 934Q524 934 491 969T457 1071Z" />
-<glyph unicode="&#xf8;" glyph-name="oslash" horiz-adv-x="1251" d="M1149 555Q1149 284 1010 132T623 -20Q479 -20 373 37L297 -72L162 18L244 135Q102 290 102 555Q102 824 240 975T629 1126Q773 1126 887 1063L956 1163L1092 1071L1014 963Q1149 811 1149
-555ZM344 555Q344 420 381 336L772 895Q712 934 625 934Q477 934 411 836T344 555ZM907 555Q907 676 874 758L487 205Q541 172 627 172Q907 172 907 555Z" />
-<glyph unicode="&#xf9;" glyph-name="ugrave" horiz-adv-x="1300" d="M948 0L915 145H903Q854 68 764 24T557 -20Q356 -20 257 80T158 383V1106H395V424Q395 297 447 234T610 170Q758 170 827 258T897 555V1106H1133V0H948ZM873 1241Q804 1293 699 1391T545 1548V1569H818Q856
-1499 921 1408T1031 1266V1241H873Z" />
-<glyph unicode="&#xfa;" glyph-name="uacute" horiz-adv-x="1300" d="M948 0L915 145H903Q854 68 764 24T557 -20Q356 -20 257 80T158 383V1106H395V424Q395 297 447 234T610 170Q758 170 827 258T897 555V1106H1133V0H948ZM501 1241V1266Q558 1336 618 1422T714
-1569H987V1548Q935 1487 832 1391T657 1241H501Z" />
-<glyph unicode="&#xfb;" glyph-name="ucircumflex" horiz-adv-x="1300" d="M948 0L915 145H903Q854 68 764 24T557 -20Q356 -20 257 80T158 383V1106H395V424Q395 297 447 234T610 170Q758 170 827 258T897 555V1106H1133V0H948ZM871 1241Q748 1314 643 1421Q540
-1318 418 1241H260V1266Q451 1464 514 1569H774Q837 1459 1030 1266V1241H871Z" />
-<glyph unicode="&#xfc;" glyph-name="udieresis" horiz-adv-x="1300" d="M948 0L915 145H903Q854 68 764 24T557 -20Q356 -20 257 80T158 383V1106H395V424Q395 297 447 234T610 170Q758 170 827 258T897 555V1106H1133V0H948ZM332 1399Q332 1461 365 1488T447
-1516Q500 1516 531 1485T563 1399Q563 1346 531 1314T447 1282Q399 1282 366 1311T332 1399ZM725 1399Q725 1461 758 1488T840 1516Q893 1516 925 1485T957 1399Q957 1345 924 1314T840 1282Q792 1282 759 1311T725 1399Z" />
-<glyph unicode="&#xfd;" glyph-name="yacute" horiz-adv-x="1098" d="M0 1106H256L481 479Q532 345 549 227H557Q566 282 590 360T844 1106H1098L625 -147Q496 -492 195 -492Q117 -492 43 -475V-289Q96 -301 164 -301Q334 -301 403 -104L444 0L0 1106ZM401 1241V1266Q458
-1336 518 1422T614 1569H887V1548Q835 1487 732 1391T557 1241H401Z" />
-<glyph unicode="&#xfe;" glyph-name="thorn" horiz-adv-x="1276" d="M403 961Q464 1047 545 1086T733 1126Q939 1126 1055 975T1171 555Q1171 283 1055 132T733 -20Q514 -20 403 129H389L397 57L403 -35V-492H168V1556H403V1126L396 988L393 961H403ZM674 934Q532
-934 468 852T403 592V555Q403 353 467 263T676 172Q930 172 930 557Q930 747 869 840T674 934Z" />
-<glyph unicode="&#xff;" glyph-name="ydieresis" horiz-adv-x="1098" d="M0 1106H256L481 479Q532 345 549 227H557Q566 282 590 360T844 1106H1098L625 -147Q496 -492 195 -492Q117 -492 43 -475V-289Q96 -301 164 -301Q334 -301 403 -104L444 0L0 1106ZM495
-1399Q495 1461 528 1488T610 1516Q663 1516 694 1485T726 1399Q726 1346 694 1314T610 1282Q562 1282 529 1311T495 1399ZM888 1399Q888 1461 921 1488T1003 1516Q1056 1516 1088 1485T1120 1399Q1120 1345 1087 1314T1003 1282Q955 1282 922 1311T888 1399Z" />
-<glyph unicode="&#x2013;" glyph-name="endash" horiz-adv-x="1024" d="M82 455V645H942V455H82Z" />
-<glyph unicode="&#x2014;" glyph-name="emdash" horiz-adv-x="2048" d="M82 455V645H1966V455H82Z" />
-<glyph unicode="&#x2018;" glyph-name="quoteleft" horiz-adv-x="395" d="M37 961L25 983Q45 1066 96 1207T201 1462H371Q307 1206 270 961H37Z" />
-<glyph unicode="&#x2019;" glyph-name="quoteright" horiz-adv-x="395" d="M356 1462L371 1440Q318 1231 195 961H25Q94 1250 125 1462H356Z" />
-<glyph unicode="&#x201a;" glyph-name="quotesinglbase" horiz-adv-x="549" d="M412 215Q364 29 236 -264H63Q132 6 166 238H397L412 215Z" />
-<glyph unicode="&#x201c;" glyph-name="quotedblleft" horiz-adv-x="813" d="M440 983Q493 1186 618 1462H788Q719 1166 688 961H455L440 983ZM25 983Q45 1066 96 1207T201 1462H371Q307 1206 270 961H37L25 983Z" />
-<glyph unicode="&#x201d;" glyph-name="quotedblright" horiz-adv-x="813" d="M371 1440Q318 1231 195 961H25Q94 1250 125 1462H356L371 1440ZM788 1440Q735 1231 612 961H440Q509 1232 543 1462H774L788 1440Z" />
-<glyph unicode="&#x201e;" glyph-name="quotedblbase" horiz-adv-x="944" d="M391 215Q336 1 215 -264H43Q109 -4 145 238H377L391 215ZM809 215Q761 29 633 -264H461Q527 -4 563 238H795L809 215Z" />
-<glyph unicode="&#x2022;" glyph-name="bullet" horiz-adv-x="770" d="M131 748Q131 886 197 958T385 1030Q506 1030 572 958T639 748Q639 613 572 539T385 465Q265 465 198 537T131 748Z" />
-<glyph unicode="&#x2039;" glyph-name="guilsinglleft" horiz-adv-x="688" d="M82 561L438 993L606 899L324 549L606 201L438 104L82 535V561Z" />
-<glyph unicode="&#x203a;" glyph-name="guilsinglright" horiz-adv-x="688" d="M606 535L248 104L80 201L362 549L80 899L248 993L606 561V535Z" />
-<hkern g1="quotedbl" g2="A" k="143" />
-<hkern g1="quotedbl" g2="T" k="-41" />
-<hkern g1="quotedbl" g2="V" k="-41" />
-<hkern g1="quotedbl" g2="W" k="-41" />
-<hkern g1="quotedbl" g2="Y" k="-20" />
-<hkern g1="quotedbl" g2="a" k="82" />
-<hkern g1="quotedbl" g2="c" k="123" />
-<hkern g1="quotedbl" g2="d" k="123" />
-<hkern g1="quotedbl" g2="e" k="123" />
-<hkern g1="quotedbl" g2="g" k="61" />
-<hkern g1="quotedbl" g2="m" k="61" />
-<hkern g1="quotedbl" g2="n" k="61" />
-<hkern g1="quotedbl" g2="o" k="123" />
-<hkern g1="quotedbl" g2="p" k="61" />
-<hkern g1="quotedbl" g2="q" k="123" />
-<hkern g1="quotedbl" g2="r" k="61" />
-<hkern g1="quotedbl" g2="s" k="61" />
-<hkern g1="quotedbl" g2="u" k="61" />
-<hkern g1="quotedbl" g2="Agrave" k="143" />
-<hkern g1="quotedbl" g2="Aacute" k="143" />
-<hkern g1="quotedbl" g2="Acircumflex" k="143" />
-<hkern g1="quotedbl" g2="Atilde" k="143" />
-<hkern g1="quotedbl" g2="Adieresis" k="143" />
-<hkern g1="quotedbl" g2="Aring" k="143" />
-<hkern g1="quotedbl" g2="Yacute" k="-20" />
-<hkern g1="quotedbl" g2="agrave" k="123" />
-<hkern g1="quotedbl" g2="aacute" k="82" />
-<hkern g1="quotedbl" g2="acircumflex" k="82" />
-<hkern g1="quotedbl" g2="atilde" k="82" />
-<hkern g1="quotedbl" g2="adieresis" k="82" />
-<hkern g1="quotedbl" g2="aring" k="82" />
-<hkern g1="quotedbl" g2="ae" k="82" />
-<hkern g1="quotedbl" g2="ccedilla" k="123" />
-<hkern g1="quotedbl" g2="egrave" k="123" />
-<hkern g1="quotedbl" g2="eacute" k="123" />
-<hkern g1="quotedbl" g2="ecircumflex" k="123" />
-<hkern g1="quotedbl" g2="edieresis" k="123" />
-<hkern g1="quotedbl" g2="ograve" k="123" />
-<hkern g1="quotedbl" g2="oacute" k="123" />
-<hkern g1="quotedbl" g2="ocircumflex" k="123" />
-<hkern g1="quotedbl" g2="otilde" k="123" />
-<hkern g1="quotedbl" g2="odieresis" k="123" />
-<hkern g1="quotedbl" g2="oslash" k="123" />
-<hkern g1="quotedbl" g2="ugrave" k="61" />
-<hkern g1="quotedbl" g2="uacute" k="61" />
-<hkern g1="quotedbl" g2="ucircumflex" k="61" />
-<hkern g1="quotedbl" g2="udieresis" k="61" />
-<hkern g1="quotedbl" g2="oe" k="123" />
-<hkern g1="quotesingle" g2="A" k="143" />
-<hkern g1="quotesingle" g2="T" k="-41" />
-<hkern g1="quotesingle" g2="V" k="-41" />
-<hkern g1="quotesingle" g2="W" k="-41" />
-<hkern g1="quotesingle" g2="Y" k="-20" />
-<hkern g1="quotesingle" g2="a" k="82" />
-<hkern g1="quotesingle" g2="c" k="123" />
-<hkern g1="quotesingle" g2="d" k="123" />
-<hkern g1="quotesingle" g2="e" k="123" />
-<hkern g1="quotesingle" g2="g" k="61" />
-<hkern g1="quotesingle" g2="m" k="61" />
-<hkern g1="quotesingle" g2="n" k="61" />
-<hkern g1="quotesingle" g2="o" k="123" />
-<hkern g1="quotesingle" g2="p" k="61" />
-<hkern g1="quotesingle" g2="q" k="123" />
-<hkern g1="quotesingle" g2="r" k="61" />
-<hkern g1="quotesingle" g2="s" k="61" />
-<hkern g1="quotesingle" g2="u" k="61" />
-<hkern g1="quotesingle" g2="Agrave" k="143" />
-<hkern g1="quotesingle" g2="Aacute" k="143" />
-<hkern g1="quotesingle" g2="Acircumflex" k="143" />
-<hkern g1="quotesingle" g2="Atilde" k="143" />
-<hkern g1="quotesingle" g2="Adieresis" k="143" />
-<hkern g1="quotesingle" g2="Aring" k="143" />
-<hkern g1="quotesingle" g2="Yacute" k="-20" />
-<hkern g1="quotesingle" g2="agrave" k="123" />
-<hkern g1="quotesingle" g2="aacute" k="82" />
-<hkern g1="quotesingle" g2="acircumflex" k="82" />
-<hkern g1="quotesingle" g2="atilde" k="82" />
-<hkern g1="quotesingle" g2="adieresis" k="82" />
-<hkern g1="quotesingle" g2="aring" k="82" />
-<hkern g1="quotesingle" g2="ae" k="82" />
-<hkern g1="quotesingle" g2="ccedilla" k="123" />
-<hkern g1="quotesingle" g2="egrave" k="123" />
-<hkern g1="quotesingle" g2="eacute" k="123" />
-<hkern g1="quotesingle" g2="ecircumflex" k="123" />
-<hkern g1="quotesingle" g2="edieresis" k="123" />
-<hkern g1="quotesingle" g2="ograve" k="123" />
-<hkern g1="quotesingle" g2="oacute" k="123" />
-<hkern g1="quotesingle" g2="ocircumflex" k="123" />
-<hkern g1="quotesingle" g2="otilde" k="123" />
-<hkern g1="quotesingle" g2="odieresis" k="123" />
-<hkern g1="quotesingle" g2="oslash" k="123" />
-<hkern g1="quotesingle" g2="ugrave" k="61" />
-<hkern g1="quotesingle" g2="uacute" k="61" />
-<hkern g1="quotesingle" g2="ucircumflex" k="61" />
-<hkern g1="quotesingle" g2="udieresis" k="61" />
-<hkern g1="quotesingle" g2="oe" k="123" />
-<hkern g1="parenleft" g2="J" k="-184" />
-<hkern g1="comma" g2="C" k="102" />
-<hkern g1="comma" g2="G" k="102" />
-<hkern g1="comma" g2="O" k="102" />
-<hkern g1="comma" g2="Q" k="102" />
-<hkern g1="comma" g2="T" k="143" />
-<hkern g1="comma" g2="U" k="41" />
-<hkern g1="comma" g2="V" k="123" />
-<hkern g1="comma" g2="W" k="123" />
-<hkern g1="comma" g2="Y" k="123" />
-<hkern g1="comma" g2="Ccedilla" k="102" />
-<hkern g1="comma" g2="Ograve" k="102" />
-<hkern g1="comma" g2="Oacute" k="102" />
-<hkern g1="comma" g2="Ocircumflex" k="102" />
-<hkern g1="comma" g2="Otilde" k="102" />
-<hkern g1="comma" g2="Odieresis" k="102" />
-<hkern g1="comma" g2="Oslash" k="102" />
-<hkern g1="comma" g2="Ugrave" k="41" />
-<hkern g1="comma" g2="Uacute" k="41" />
-<hkern g1="comma" g2="Ucircumflex" k="41" />
-<hkern g1="comma" g2="Udieresis" k="41" />
-<hkern g1="comma" g2="Yacute" k="123" />
-<hkern g1="comma" g2="OE" k="102" />
-<hkern g1="hyphen" g2="T" k="82" />
-<hkern g1="period" g2="C" k="102" />
-<hkern g1="period" g2="G" k="102" />
-<hkern g1="period" g2="O" k="102" />
-<hkern g1="period" g2="Q" k="102" />
-<hkern g1="period" g2="T" k="143" />
-<hkern g1="period" g2="U" k="41" />
-<hkern g1="period" g2="V" k="123" />
-<hkern g1="period" g2="W" k="123" />
-<hkern g1="period" g2="Y" k="123" />
-<hkern g1="period" g2="Ccedilla" k="102" />
-<hkern g1="period" g2="Ograve" k="102" />
-<hkern g1="period" g2="Oacute" k="102" />
-<hkern g1="period" g2="Ocircumflex" k="102" />
-<hkern g1="period" g2="Otilde" k="102" />
-<hkern g1="period" g2="Odieresis" k="102" />
-<hkern g1="period" g2="Oslash" k="102" />
-<hkern g1="period" g2="Ugrave" k="41" />
-<hkern g1="period" g2="Uacute" k="41" />
-<hkern g1="period" g2="Ucircumflex" k="41" />
-<hkern g1="period" g2="Udieresis" k="41" />
-<hkern g1="period" g2="Yacute" k="123" />
-<hkern g1="period" g2="OE" k="102" />
-<hkern g1="A" g2="quotedbl" k="143" />
-<hkern g1="A" g2="quotesingle" k="143" />
-<hkern g1="A" g2="C" k="41" />
-<hkern g1="A" g2="G" k="41" />
-<hkern g1="A" g2="J" k="-266" />
-<hkern g1="A" g2="O" k="41" />
-<hkern g1="A" g2="Q" k="41" />
-<hkern g1="A" g2="T" k="143" />
-<hkern g1="A" g2="V" k="82" />
-<hkern g1="A" g2="W" k="82" />
-<hkern g1="A" g2="Y" k="123" />
-<hkern g1="A" g2="Ccedilla" k="41" />
-<hkern g1="A" g2="Ograve" k="41" />
-<hkern g1="A" g2="Oacute" k="41" />
-<hkern g1="A" g2="Ocircumflex" k="41" />
-<hkern g1="A" g2="Otilde" k="41" />
-<hkern g1="A" g2="Odieresis" k="41" />
-<hkern g1="A" g2="Oslash" k="41" />
-<hkern g1="A" g2="Yacute" k="123" />
-<hkern g1="A" g2="OE" k="41" />
-<hkern g1="A" g2="quoteright" k="143" />
-<hkern g1="A" g2="quotedblright" k="143" />
-<hkern g1="B" g2="comma" k="82" />
-<hkern g1="B" g2="period" k="82" />
-<hkern g1="B" g2="A" k="41" />
-<hkern g1="B" g2="T" k="61" />
-<hkern g1="B" g2="V" k="20" />
-<hkern g1="B" g2="W" k="20" />
-<hkern g1="B" g2="X" k="41" />
-<hkern g1="B" g2="Y" k="20" />
-<hkern g1="B" g2="Z" k="20" />
-<hkern g1="B" g2="Agrave" k="41" />
-<hkern g1="B" g2="Aacute" k="41" />
-<hkern g1="B" g2="Acircumflex" k="41" />
-<hkern g1="B" g2="Atilde" k="41" />
-<hkern g1="B" g2="Adieresis" k="41" />
-<hkern g1="B" g2="Aring" k="41" />
-<hkern g1="B" g2="Yacute" k="20" />
-<hkern g1="B" g2="quotesinglbase" k="82" />
-<hkern g1="B" g2="quotedblbase" k="82" />
-<hkern g1="C" g2="C" k="41" />
-<hkern g1="C" g2="G" k="41" />
-<hkern g1="C" g2="O" k="41" />
-<hkern g1="C" g2="Q" k="41" />
-<hkern g1="C" g2="Ccedilla" k="41" />
-<hkern g1="C" g2="Ograve" k="41" />
-<hkern g1="C" g2="Oacute" k="41" />
-<hkern g1="C" g2="Ocircumflex" k="41" />
-<hkern g1="C" g2="Otilde" k="41" />
-<hkern g1="C" g2="Odieresis" k="41" />
-<hkern g1="C" g2="Oslash" k="41" />
-<hkern g1="C" g2="OE" k="41" />
-<hkern g1="D" g2="comma" k="82" />
-<hkern g1="D" g2="period" k="82" />
-<hkern g1="D" g2="A" k="41" />
-<hkern g1="D" g2="T" k="61" />
-<hkern g1="D" g2="V" k="20" />
-<hkern g1="D" g2="W" k="20" />
-<hkern g1="D" g2="X" k="41" />
-<hkern g1="D" g2="Y" k="20" />
-<hkern g1="D" g2="Z" k="20" />
-<hkern g1="D" g2="Agrave" k="41" />
-<hkern g1="D" g2="Aacute" k="41" />
-<hkern g1="D" g2="Acircumflex" k="41" />
-<hkern g1="D" g2="Atilde" k="41" />
-<hkern g1="D" g2="Adieresis" k="41" />
-<hkern g1="D" g2="Aring" k="41" />
-<hkern g1="D" g2="Yacute" k="20" />
-<hkern g1="D" g2="quotesinglbase" k="82" />
-<hkern g1="D" g2="quotedblbase" k="82" />
-<hkern g1="E" g2="J" k="-123" />
-<hkern g1="F" g2="comma" k="123" />
-<hkern g1="F" g2="period" k="123" />
-<hkern g1="F" g2="question" k="-41" />
-<hkern g1="F" g2="A" k="41" />
-<hkern g1="F" g2="Agrave" k="41" />
-<hkern g1="F" g2="Aacute" k="41" />
-<hkern g1="F" g2="Acircumflex" k="41" />
-<hkern g1="F" g2="Atilde" k="41" />
-<hkern g1="F" g2="Adieresis" k="41" />
-<hkern g1="F" g2="Aring" k="41" />
-<hkern g1="F" g2="quotesinglbase" k="123" />
-<hkern g1="F" g2="quotedblbase" k="123" />
-<hkern g1="K" g2="C" k="41" />
-<hkern g1="K" g2="G" k="41" />
-<hkern g1="K" g2="O" k="41" />
-<hkern g1="K" g2="Q" k="41" />
-<hkern g1="K" g2="Ccedilla" k="41" />
-<hkern g1="K" g2="Ograve" k="41" />
-<hkern g1="K" g2="Oacute" k="41" />
-<hkern g1="K" g2="Ocircumflex" k="41" />
-<hkern g1="K" g2="Otilde" k="41" />
-<hkern g1="K" g2="Odieresis" k="41" />
-<hkern g1="K" g2="Oslash" k="41" />
-<hkern g1="K" g2="OE" k="41" />
-<hkern g1="L" g2="quotedbl" k="164" />
-<hkern g1="L" g2="quotesingle" k="164" />
-<hkern g1="L" g2="C" k="41" />
-<hkern g1="L" g2="G" k="41" />
-<hkern g1="L" g2="O" k="41" />
-<hkern g1="L" g2="Q" k="41" />
-<hkern g1="L" g2="T" k="41" />
-<hkern g1="L" g2="U" k="20" />
-<hkern g1="L" g2="V" k="41" />
-<hkern g1="L" g2="W" k="41" />
-<hkern g1="L" g2="Y" k="61" />
-<hkern g1="L" g2="Ccedilla" k="41" />
-<hkern g1="L" g2="Ograve" k="41" />
-<hkern g1="L" g2="Oacute" k="41" />
-<hkern g1="L" g2="Ocircumflex" k="41" />
-<hkern g1="L" g2="Otilde" k="41" />
-<hkern g1="L" g2="Odieresis" k="41" />
-<hkern g1="L" g2="Oslash" k="41" />
-<hkern g1="L" g2="Ugrave" k="20" />
-<hkern g1="L" g2="Uacute" k="20" />
-<hkern g1="L" g2="Ucircumflex" k="20" />
-<hkern g1="L" g2="Udieresis" k="20" />
-<hkern g1="L" g2="Yacute" k="61" />
-<hkern g1="L" g2="OE" k="41" />
-<hkern g1="L" g2="quoteright" k="164" />
-<hkern g1="L" g2="quotedblright" k="164" />
-<hkern g1="O" g2="comma" k="82" />
-<hkern g1="O" g2="period" k="82" />
-<hkern g1="O" g2="A" k="41" />
-<hkern g1="O" g2="T" k="61" />
-<hkern g1="O" g2="V" k="20" />
-<hkern g1="O" g2="W" k="20" />
-<hkern g1="O" g2="X" k="41" />
-<hkern g1="O" g2="Y" k="20" />
-<hkern g1="O" g2="Z" k="20" />
-<hkern g1="O" g2="Agrave" k="41" />
-<hkern g1="O" g2="Aacute" k="41" />
-<hkern g1="O" g2="Acircumflex" k="41" />
-<hkern g1="O" g2="Atilde" k="41" />
-<hkern g1="O" g2="Adieresis" k="41" />
-<hkern g1="O" g2="Aring" k="41" />
-<hkern g1="O" g2="Yacute" k="20" />
-<hkern g1="O" g2="quotesinglbase" k="82" />
-<hkern g1="O" g2="quotedblbase" k="82" />
-<hkern g1="P" g2="comma" k="266" />
-<hkern g1="P" g2="period" k="266" />
-<hkern g1="P" g2="A" k="102" />
-<hkern g1="P" g2="X" k="41" />
-<hkern g1="P" g2="Z" k="20" />
-<hkern g1="P" g2="Agrave" k="102" />
-<hkern g1="P" g2="Aacute" k="102" />
-<hkern g1="P" g2="Acircumflex" k="102" />
-<hkern g1="P" g2="Atilde" k="102" />
-<hkern g1="P" g2="Adieresis" k="102" />
-<hkern g1="P" g2="Aring" k="102" />
-<hkern g1="P" g2="quotesinglbase" k="266" />
-<hkern g1="P" g2="quotedblbase" k="266" />
-<hkern g1="Q" g2="comma" k="82" />
-<hkern g1="Q" g2="period" k="82" />
-<hkern g1="Q" g2="A" k="41" />
-<hkern g1="Q" g2="T" k="61" />
-<hkern g1="Q" g2="V" k="20" />
-<hkern g1="Q" g2="W" k="20" />
-<hkern g1="Q" g2="X" k="41" />
-<hkern g1="Q" g2="Y" k="20" />
-<hkern g1="Q" g2="Z" k="20" />
-<hkern g1="Q" g2="Agrave" k="41" />
-<hkern g1="Q" g2="Aacute" k="41" />
-<hkern g1="Q" g2="Acircumflex" k="41" />
-<hkern g1="Q" g2="Atilde" k="41" />
-<hkern g1="Q" g2="Adieresis" k="41" />
-<hkern g1="Q" g2="Aring" k="41" />
-<hkern g1="Q" g2="Yacute" k="20" />
-<hkern g1="Q" g2="quotesinglbase" k="82" />
-<hkern g1="Q" g2="quotedblbase" k="82" />
-<hkern g1="T" g2="comma" k="123" />
-<hkern g1="T" g2="hyphen" k="82" />
-<hkern g1="T" g2="period" k="123" />
-<hkern g1="T" g2="question" k="-41" />
-<hkern g1="T" g2="A" k="143" />
-<hkern g1="T" g2="C" k="41" />
-<hkern g1="T" g2="G" k="41" />
-<hkern g1="T" g2="O" k="41" />
-<hkern g1="T" g2="Q" k="41" />
-<hkern g1="T" g2="T" k="-41" />
-<hkern g1="T" g2="a" k="164" />
-<hkern g1="T" g2="c" k="143" />
-<hkern g1="T" g2="d" k="143" />
-<hkern g1="T" g2="e" k="143" />
-<hkern g1="T" g2="g" k="143" />
-<hkern g1="T" g2="m" k="102" />
-<hkern g1="T" g2="n" k="102" />
-<hkern g1="T" g2="o" k="143" />
-<hkern g1="T" g2="p" k="102" />
-<hkern g1="T" g2="q" k="143" />
-<hkern g1="T" g2="r" k="102" />
-<hkern g1="T" g2="s" k="123" />
-<hkern g1="T" g2="u" k="102" />
-<hkern g1="T" g2="v" k="41" />
-<hkern g1="T" g2="w" k="41" />
-<hkern g1="T" g2="x" k="41" />
-<hkern g1="T" g2="y" k="41" />
-<hkern g1="T" g2="z" k="82" />
-<hkern g1="T" g2="Agrave" k="143" />
-<hkern g1="T" g2="Aacute" k="143" />
-<hkern g1="T" g2="Acircumflex" k="143" />
-<hkern g1="T" g2="Atilde" k="143" />
-<hkern g1="T" g2="Adieresis" k="143" />
-<hkern g1="T" g2="Aring" k="143" />
-<hkern g1="T" g2="Ccedilla" k="41" />
-<hkern g1="T" g2="Ograve" k="41" />
-<hkern g1="T" g2="Oacute" k="41" />
-<hkern g1="T" g2="Ocircumflex" k="41" />
-<hkern g1="T" g2="Otilde" k="41" />
-<hkern g1="T" g2="Odieresis" k="41" />
-<hkern g1="T" g2="Oslash" k="41" />
-<hkern g1="T" g2="agrave" k="143" />
-<hkern g1="T" g2="aacute" k="164" />
-<hkern g1="T" g2="acircumflex" k="164" />
-<hkern g1="T" g2="atilde" k="164" />
-<hkern g1="T" g2="adieresis" k="164" />
-<hkern g1="T" g2="aring" k="164" />
-<hkern g1="T" g2="ae" k="164" />
-<hkern g1="T" g2="ccedilla" k="143" />
-<hkern g1="T" g2="egrave" k="143" />
-<hkern g1="T" g2="eacute" k="143" />
-<hkern g1="T" g2="ecircumflex" k="143" />
-<hkern g1="T" g2="edieresis" k="143" />
-<hkern g1="T" g2="ograve" k="143" />
-<hkern g1="T" g2="oacute" k="143" />
-<hkern g1="T" g2="ocircumflex" k="143" />
-<hkern g1="T" g2="otilde" k="143" />
-<hkern g1="T" g2="odieresis" k="143" />
-<hkern g1="T" g2="oslash" k="143" />
-<hkern g1="T" g2="ugrave" k="102" />
-<hkern g1="T" g2="uacute" k="102" />
-<hkern g1="T" g2="ucircumflex" k="102" />
-<hkern g1="T" g2="udieresis" k="102" />
-<hkern g1="T" g2="yacute" k="41" />
-<hkern g1="T" g2="OE" k="41" />
-<hkern g1="T" g2="oe" k="143" />
-<hkern g1="T" g2="endash" k="82" />
-<hkern g1="T" g2="emdash" k="82" />
-<hkern g1="T" g2="quotesinglbase" k="123" />
-<hkern g1="T" g2="quotedblbase" k="123" />
-<hkern g1="U" g2="comma" k="41" />
-<hkern g1="U" g2="period" k="41" />
-<hkern g1="U" g2="A" k="20" />
-<hkern g1="U" g2="Agrave" k="20" />
-<hkern g1="U" g2="Aacute" k="20" />
-<hkern g1="U" g2="Acircumflex" k="20" />
-<hkern g1="U" g2="Atilde" k="20" />
-<hkern g1="U" g2="Adieresis" k="20" />
-<hkern g1="U" g2="Aring" k="20" />
-<hkern g1="U" g2="quotesinglbase" k="41" />
-<hkern g1="U" g2="quotedblbase" k="41" />
-<hkern g1="V" g2="comma" k="102" />
-<hkern g1="V" g2="period" k="102" />
-<hkern g1="V" g2="question" k="-41" />
-<hkern g1="V" g2="A" k="82" />
-<hkern g1="V" g2="C" k="20" />
-<hkern g1="V" g2="G" k="20" />
-<hkern g1="V" g2="O" k="20" />
-<hkern g1="V" g2="Q" k="20" />
-<hkern g1="V" g2="a" k="41" />
-<hkern g1="V" g2="c" k="41" />
-<hkern g1="V" g2="d" k="41" />
-<hkern g1="V" g2="e" k="41" />
-<hkern g1="V" g2="g" k="20" />
-<hkern g1="V" g2="m" k="20" />
-<hkern g1="V" g2="n" k="20" />
-<hkern g1="V" g2="o" k="41" />
-<hkern g1="V" g2="p" k="20" />
-<hkern g1="V" g2="q" k="41" />
-<hkern g1="V" g2="r" k="20" />
-<hkern g1="V" g2="s" k="20" />
-<hkern g1="V" g2="u" k="20" />
-<hkern g1="V" g2="Agrave" k="82" />
-<hkern g1="V" g2="Aacute" k="82" />
-<hkern g1="V" g2="Acircumflex" k="82" />
-<hkern g1="V" g2="Atilde" k="82" />
-<hkern g1="V" g2="Adieresis" k="82" />
-<hkern g1="V" g2="Aring" k="82" />
-<hkern g1="V" g2="Ccedilla" k="20" />
-<hkern g1="V" g2="Ograve" k="20" />
-<hkern g1="V" g2="Oacute" k="20" />
-<hkern g1="V" g2="Ocircumflex" k="20" />
-<hkern g1="V" g2="Otilde" k="20" />
-<hkern g1="V" g2="Odieresis" k="20" />
-<hkern g1="V" g2="Oslash" k="20" />
-<hkern g1="V" g2="agrave" k="41" />
-<hkern g1="V" g2="aacute" k="41" />
-<hkern g1="V" g2="acircumflex" k="41" />
-<hkern g1="V" g2="atilde" k="41" />
-<hkern g1="V" g2="adieresis" k="41" />
-<hkern g1="V" g2="aring" k="41" />
-<hkern g1="V" g2="ae" k="41" />
-<hkern g1="V" g2="ccedilla" k="41" />
-<hkern g1="V" g2="egrave" k="41" />
-<hkern g1="V" g2="eacute" k="41" />
-<hkern g1="V" g2="ecircumflex" k="41" />
-<hkern g1="V" g2="edieresis" k="41" />
-<hkern g1="V" g2="ograve" k="41" />
-<hkern g1="V" g2="oacute" k="41" />
-<hkern g1="V" g2="ocircumflex" k="41" />
-<hkern g1="V" g2="otilde" k="41" />
-<hkern g1="V" g2="odieresis" k="41" />
-<hkern g1="V" g2="oslash" k="41" />
-<hkern g1="V" g2="ugrave" k="20" />
-<hkern g1="V" g2="uacute" k="20" />
-<hkern g1="V" g2="ucircumflex" k="20" />
-<hkern g1="V" g2="udieresis" k="20" />
-<hkern g1="V" g2="OE" k="20" />
-<hkern g1="V" g2="oe" k="41" />
-<hkern g1="V" g2="quotesinglbase" k="102" />
-<hkern g1="V" g2="quotedblbase" k="102" />
-<hkern g1="W" g2="comma" k="102" />
-<hkern g1="W" g2="period" k="102" />
-<hkern g1="W" g2="question" k="-41" />
-<hkern g1="W" g2="A" k="82" />
-<hkern g1="W" g2="C" k="20" />
-<hkern g1="W" g2="G" k="20" />
-<hkern g1="W" g2="O" k="20" />
-<hkern g1="W" g2="Q" k="20" />
-<hkern g1="W" g2="a" k="41" />
-<hkern g1="W" g2="c" k="41" />
-<hkern g1="W" g2="d" k="41" />
-<hkern g1="W" g2="e" k="41" />
-<hkern g1="W" g2="g" k="20" />
-<hkern g1="W" g2="m" k="20" />
-<hkern g1="W" g2="n" k="20" />
-<hkern g1="W" g2="o" k="41" />
-<hkern g1="W" g2="p" k="20" />
-<hkern g1="W" g2="q" k="41" />
-<hkern g1="W" g2="r" k="20" />
-<hkern g1="W" g2="s" k="20" />
-<hkern g1="W" g2="u" k="20" />
-<hkern g1="W" g2="Agrave" k="82" />
-<hkern g1="W" g2="Aacute" k="82" />
-<hkern g1="W" g2="Acircumflex" k="82" />
-<hkern g1="W" g2="Atilde" k="82" />
-<hkern g1="W" g2="Adieresis" k="82" />
-<hkern g1="W" g2="Aring" k="82" />
-<hkern g1="W" g2="Ccedilla" k="20" />
-<hkern g1="W" g2="Ograve" k="20" />
-<hkern g1="W" g2="Oacute" k="20" />
-<hkern g1="W" g2="Ocircumflex" k="20" />
-<hkern g1="W" g2="Otilde" k="20" />
-<hkern g1="W" g2="Odieresis" k="20" />
-<hkern g1="W" g2="Oslash" k="20" />
-<hkern g1="W" g2="agrave" k="41" />
-<hkern g1="W" g2="aacute" k="41" />
-<hkern g1="W" g2="acircumflex" k="41" />
-<hkern g1="W" g2="atilde" k="41" />
-<hkern g1="W" g2="adieresis" k="41" />
-<hkern g1="W" g2="aring" k="41" />
-<hkern g1="W" g2="ae" k="41" />
-<hkern g1="W" g2="ccedilla" k="41" />
-<hkern g1="W" g2="egrave" k="41" />
-<hkern g1="W" g2="eacute" k="41" />
-<hkern g1="W" g2="ecircumflex" k="41" />
-<hkern g1="W" g2="edieresis" k="41" />
-<hkern g1="W" g2="ograve" k="41" />
-<hkern g1="W" g2="oacute" k="41" />
-<hkern g1="W" g2="ocircumflex" k="41" />
-<hkern g1="W" g2="otilde" k="41" />
-<hkern g1="W" g2="odieresis" k="41" />
-<hkern g1="W" g2="oslash" k="41" />
-<hkern g1="W" g2="ugrave" k="20" />
-<hkern g1="W" g2="uacute" k="20" />
-<hkern g1="W" g2="ucircumflex" k="20" />
-<hkern g1="W" g2="udieresis" k="20" />
-<hkern g1="W" g2="OE" k="20" />
-<hkern g1="W" g2="oe" k="41" />
-<hkern g1="W" g2="quotesinglbase" k="102" />
-<hkern g1="W" g2="quotedblbase" k="102" />
-<hkern g1="X" g2="C" k="41" />
-<hkern g1="X" g2="G" k="41" />
-<hkern g1="X" g2="O" k="41" />
-<hkern g1="X" g2="Q" k="41" />
-<hkern g1="X" g2="Ccedilla" k="41" />
-<hkern g1="X" g2="Ograve" k="41" />
-<hkern g1="X" g2="Oacute" k="41" />
-<hkern g1="X" g2="Ocircumflex" k="41" />
-<hkern g1="X" g2="Otilde" k="41" />
-<hkern g1="X" g2="Odieresis" k="41" />
-<hkern g1="X" g2="Oslash" k="41" />
-<hkern g1="X" g2="OE" k="41" />
-<hkern g1="Y" g2="comma" k="123" />
-<hkern g1="Y" g2="period" k="123" />
-<hkern g1="Y" g2="question" k="-41" />
-<hkern g1="Y" g2="A" k="123" />
-<hkern g1="Y" g2="C" k="41" />
-<hkern g1="Y" g2="G" k="41" />
-<hkern g1="Y" g2="O" k="41" />
-<hkern g1="Y" g2="Q" k="41" />
-<hkern g1="Y" g2="a" k="102" />
-<hkern g1="Y" g2="c" k="102" />
-<hkern g1="Y" g2="d" k="102" />
-<hkern g1="Y" g2="e" k="102" />
-<hkern g1="Y" g2="g" k="41" />
-<hkern g1="Y" g2="m" k="61" />
-<hkern g1="Y" g2="n" k="61" />
-<hkern g1="Y" g2="o" k="102" />
-<hkern g1="Y" g2="p" k="61" />
-<hkern g1="Y" g2="q" k="102" />
-<hkern g1="Y" g2="r" k="61" />
-<hkern g1="Y" g2="s" k="82" />
-<hkern g1="Y" g2="u" k="61" />
-<hkern g1="Y" g2="z" k="41" />
-<hkern g1="Y" g2="Agrave" k="123" />
-<hkern g1="Y" g2="Aacute" k="123" />
-<hkern g1="Y" g2="Acircumflex" k="123" />
-<hkern g1="Y" g2="Atilde" k="123" />
-<hkern g1="Y" g2="Adieresis" k="123" />
-<hkern g1="Y" g2="Aring" k="123" />
-<hkern g1="Y" g2="Ccedilla" k="41" />
-<hkern g1="Y" g2="Ograve" k="41" />
-<hkern g1="Y" g2="Oacute" k="41" />
-<hkern g1="Y" g2="Ocircumflex" k="41" />
-<hkern g1="Y" g2="Otilde" k="41" />
-<hkern g1="Y" g2="Odieresis" k="41" />
-<hkern g1="Y" g2="Oslash" k="41" />
-<hkern g1="Y" g2="agrave" k="102" />
-<hkern g1="Y" g2="aacute" k="102" />
-<hkern g1="Y" g2="acircumflex" k="102" />
-<hkern g1="Y" g2="atilde" k="102" />
-<hkern g1="Y" g2="adieresis" k="102" />
-<hkern g1="Y" g2="aring" k="102" />
-<hkern g1="Y" g2="ae" k="102" />
-<hkern g1="Y" g2="ccedilla" k="102" />
-<hkern g1="Y" g2="egrave" k="102" />
-<hkern g1="Y" g2="eacute" k="102" />
-<hkern g1="Y" g2="ecircumflex" k="102" />
-<hkern g1="Y" g2="edieresis" k="102" />
-<hkern g1="Y" g2="ograve" k="102" />
-<hkern g1="Y" g2="oacute" k="102" />
-<hkern g1="Y" g2="ocircumflex" k="102" />
-<hkern g1="Y" g2="otilde" k="102" />
-<hkern g1="Y" g2="odieresis" k="102" />
-<hkern g1="Y" g2="oslash" k="102" />
-<hkern g1="Y" g2="ugrave" k="61" />
-<hkern g1="Y" g2="uacute" k="61" />
-<hkern g1="Y" g2="ucircumflex" k="61" />
-<hkern g1="Y" g2="udieresis" k="61" />
-<hkern g1="Y" g2="OE" k="41" />
-<hkern g1="Y" g2="oe" k="102" />
-<hkern g1="Y" g2="quotesinglbase" k="123" />
-<hkern g1="Y" g2="quotedblbase" k="123" />
-<hkern g1="Z" g2="C" k="20" />
-<hkern g1="Z" g2="G" k="20" />
-<hkern g1="Z" g2="O" k="20" />
-<hkern g1="Z" g2="Q" k="20" />
-<hkern g1="Z" g2="Ccedilla" k="20" />
-<hkern g1="Z" g2="Ograve" k="20" />
-<hkern g1="Z" g2="Oacute" k="20" />
-<hkern g1="Z" g2="Ocircumflex" k="20" />
-<hkern g1="Z" g2="Otilde" k="20" />
-<hkern g1="Z" g2="Odieresis" k="20" />
-<hkern g1="Z" g2="Oslash" k="20" />
-<hkern g1="Z" g2="OE" k="20" />
-<hkern g1="bracketleft" g2="J" k="-184" />
-<hkern g1="a" g2="quotedbl" k="20" />
-<hkern g1="a" g2="quotesingle" k="20" />
-<hkern g1="a" g2="quoteright" k="20" />
-<hkern g1="a" g2="quotedblright" k="20" />
-<hkern g1="b" g2="quotedbl" k="20" />
-<hkern g1="b" g2="quotesingle" k="20" />
-<hkern g1="b" g2="v" k="41" />
-<hkern g1="b" g2="w" k="41" />
-<hkern g1="b" g2="x" k="41" />
-<hkern g1="b" g2="y" k="41" />
-<hkern g1="b" g2="z" k="20" />
-<hkern g1="b" g2="yacute" k="41" />
-<hkern g1="b" g2="quoteright" k="20" />
-<hkern g1="b" g2="quotedblright" k="20" />
-<hkern g1="c" g2="quotedbl" k="-41" />
-<hkern g1="c" g2="quotesingle" k="-41" />
-<hkern g1="c" g2="quoteright" k="-41" />
-<hkern g1="c" g2="quotedblright" k="-41" />
-<hkern g1="e" g2="quotedbl" k="20" />
-<hkern g1="e" g2="quotesingle" k="20" />
-<hkern g1="e" g2="v" k="41" />
-<hkern g1="e" g2="w" k="41" />
-<hkern g1="e" g2="x" k="41" />
-<hkern g1="e" g2="y" k="41" />
-<hkern g1="e" g2="z" k="20" />
-<hkern g1="e" g2="yacute" k="41" />
-<hkern g1="e" g2="quoteright" k="20" />
-<hkern g1="e" g2="quotedblright" k="20" />
-<hkern g1="f" g2="quotedbl" k="-123" />
-<hkern g1="f" g2="quotesingle" k="-123" />
-<hkern g1="f" g2="quoteright" k="-123" />
-<hkern g1="f" g2="quotedblright" k="-123" />
-<hkern g1="h" g2="quotedbl" k="20" />
-<hkern g1="h" g2="quotesingle" k="20" />
-<hkern g1="h" g2="quoteright" k="20" />
-<hkern g1="h" g2="quotedblright" k="20" />
-<hkern g1="k" g2="c" k="41" />
-<hkern g1="k" g2="d" k="41" />
-<hkern g1="k" g2="e" k="41" />
-<hkern g1="k" g2="o" k="41" />
-<hkern g1="k" g2="q" k="41" />
-<hkern g1="k" g2="agrave" k="41" />
-<hkern g1="k" g2="ccedilla" k="41" />
-<hkern g1="k" g2="egrave" k="41" />
-<hkern g1="k" g2="eacute" k="41" />
-<hkern g1="k" g2="ecircumflex" k="41" />
-<hkern g1="k" g2="edieresis" k="41" />
-<hkern g1="k" g2="ograve" k="41" />
-<hkern g1="k" g2="oacute" k="41" />
-<hkern g1="k" g2="ocircumflex" k="41" />
-<hkern g1="k" g2="otilde" k="41" />
-<hkern g1="k" g2="odieresis" k="41" />
-<hkern g1="k" g2="oslash" k="41" />
-<hkern g1="k" g2="oe" k="41" />
-<hkern g1="m" g2="quotedbl" k="20" />
-<hkern g1="m" g2="quotesingle" k="20" />
-<hkern g1="m" g2="quoteright" k="20" />
-<hkern g1="m" g2="quotedblright" k="20" />
-<hkern g1="n" g2="quotedbl" k="20" />
-<hkern g1="n" g2="quotesingle" k="20" />
-<hkern g1="n" g2="quoteright" k="20" />
-<hkern g1="n" g2="quotedblright" k="20" />
-<hkern g1="o" g2="quotedbl" k="20" />
-<hkern g1="o" g2="quotesingle" k="20" />
-<hkern g1="o" g2="v" k="41" />
-<hkern g1="o" g2="w" k="41" />
-<hkern g1="o" g2="x" k="41" />
-<hkern g1="o" g2="y" k="41" />
-<hkern g1="o" g2="z" k="20" />
-<hkern g1="o" g2="yacute" k="41" />
-<hkern g1="o" g2="quoteright" k="20" />
-<hkern g1="o" g2="quotedblright" k="20" />
-<hkern g1="p" g2="quotedbl" k="20" />
-<hkern g1="p" g2="quotesingle" k="20" />
-<hkern g1="p" g2="v" k="41" />
-<hkern g1="p" g2="w" k="41" />
-<hkern g1="p" g2="x" k="41" />
-<hkern g1="p" g2="y" k="41" />
-<hkern g1="p" g2="z" k="20" />
-<hkern g1="p" g2="yacute" k="41" />
-<hkern g1="p" g2="quoteright" k="20" />
-<hkern g1="p" g2="quotedblright" k="20" />
-<hkern g1="r" g2="quotedbl" k="-82" />
-<hkern g1="r" g2="quotesingle" k="-82" />
-<hkern g1="r" g2="a" k="41" />
-<hkern g1="r" g2="c" k="41" />
-<hkern g1="r" g2="d" k="41" />
-<hkern g1="r" g2="e" k="41" />
-<hkern g1="r" g2="g" k="20" />
-<hkern g1="r" g2="o" k="41" />
-<hkern g1="r" g2="q" k="41" />
-<hkern g1="r" g2="agrave" k="41" />
-<hkern g1="r" g2="aacute" k="41" />
-<hkern g1="r" g2="acircumflex" k="41" />
-<hkern g1="r" g2="atilde" k="41" />
-<hkern g1="r" g2="adieresis" k="41" />
-<hkern g1="r" g2="aring" k="41" />
-<hkern g1="r" g2="ae" k="41" />
-<hkern g1="r" g2="ccedilla" k="41" />
-<hkern g1="r" g2="egrave" k="41" />
-<hkern g1="r" g2="eacute" k="41" />
-<hkern g1="r" g2="ecircumflex" k="41" />
-<hkern g1="r" g2="edieresis" k="41" />
-<hkern g1="r" g2="ograve" k="41" />
-<hkern g1="r" g2="oacute" k="41" />
-<hkern g1="r" g2="ocircumflex" k="41" />
-<hkern g1="r" g2="otilde" k="41" />
-<hkern g1="r" g2="odieresis" k="41" />
-<hkern g1="r" g2="oslash" k="41" />
-<hkern g1="r" g2="oe" k="41" />
-<hkern g1="r" g2="quoteright" k="-82" />
-<hkern g1="r" g2="quotedblright" k="-82" />
-<hkern g1="t" g2="quotedbl" k="-41" />
-<hkern g1="t" g2="quotesingle" k="-41" />
-<hkern g1="t" g2="quoteright" k="-41" />
-<hkern g1="t" g2="quotedblright" k="-41" />
-<hkern g1="v" g2="quotedbl" k="-82" />
-<hkern g1="v" g2="quotesingle" k="-82" />
-<hkern g1="v" g2="comma" k="82" />
-<hkern g1="v" g2="period" k="82" />
-<hkern g1="v" g2="question" k="-41" />
-<hkern g1="v" g2="quoteright" k="-82" />
-<hkern g1="v" g2="quotesinglbase" k="82" />
-<hkern g1="v" g2="quotedblright" k="-82" />
-<hkern g1="v" g2="quotedblbase" k="82" />
-<hkern g1="w" g2="quotedbl" k="-82" />
-<hkern g1="w" g2="quotesingle" k="-82" />
-<hkern g1="w" g2="comma" k="82" />
-<hkern g1="w" g2="period" k="82" />
-<hkern g1="w" g2="question" k="-41" />
-<hkern g1="w" g2="quoteright" k="-82" />
-<hkern g1="w" g2="quotesinglbase" k="82" />
-<hkern g1="w" g2="quotedblright" k="-82" />
-<hkern g1="w" g2="quotedblbase" k="82" />
-<hkern g1="x" g2="c" k="41" />
-<hkern g1="x" g2="d" k="41" />
-<hkern g1="x" g2="e" k="41" />
-<hkern g1="x" g2="o" k="41" />
-<hkern g1="x" g2="q" k="41" />
-<hkern g1="x" g2="agrave" k="41" />
-<hkern g1="x" g2="ccedilla" k="41" />
-<hkern g1="x" g2="egrave" k="41" />
-<hkern g1="x" g2="eacute" k="41" />
-<hkern g1="x" g2="ecircumflex" k="41" />
-<hkern g1="x" g2="edieresis" k="41" />
-<hkern g1="x" g2="ograve" k="41" />
-<hkern g1="x" g2="oacute" k="41" />
-<hkern g1="x" g2="ocircumflex" k="41" />
-<hkern g1="x" g2="otilde" k="41" />
-<hkern g1="x" g2="odieresis" k="41" />
-<hkern g1="x" g2="oslash" k="41" />
-<hkern g1="x" g2="oe" k="41" />
-<hkern g1="y" g2="quotedbl" k="-82" />
-<hkern g1="y" g2="quotesingle" k="-82" />
-<hkern g1="y" g2="comma" k="82" />
-<hkern g1="y" g2="period" k="82" />
-<hkern g1="y" g2="question" k="-41" />
-<hkern g1="y" g2="quoteright" k="-82" />
-<hkern g1="y" g2="quotesinglbase" k="82" />
-<hkern g1="y" g2="quotedblright" k="-82" />
-<hkern g1="y" g2="quotedblbase" k="82" />
-<hkern g1="braceleft" g2="J" k="-184" />
-<hkern g1="Agrave" g2="quotedbl" k="143" />
-<hkern g1="Agrave" g2="quotesingle" k="143" />
-<hkern g1="Agrave" g2="C" k="41" />
-<hkern g1="Agrave" g2="G" k="41" />
-<hkern g1="Agrave" g2="J" k="-266" />
-<hkern g1="Agrave" g2="O" k="41" />
-<hkern g1="Agrave" g2="Q" k="41" />
-<hkern g1="Agrave" g2="T" k="143" />
-<hkern g1="Agrave" g2="V" k="82" />
-<hkern g1="Agrave" g2="W" k="82" />
-<hkern g1="Agrave" g2="Y" k="123" />
-<hkern g1="Agrave" g2="Ccedilla" k="41" />
-<hkern g1="Agrave" g2="Ograve" k="41" />
-<hkern g1="Agrave" g2="Oacute" k="41" />
-<hkern g1="Agrave" g2="Ocircumflex" k="41" />
-<hkern g1="Agrave" g2="Otilde" k="41" />
-<hkern g1="Agrave" g2="Odieresis" k="41" />
-<hkern g1="Agrave" g2="Oslash" k="41" />
-<hkern g1="Agrave" g2="Yacute" k="123" />
-<hkern g1="Agrave" g2="OE" k="41" />
-<hkern g1="Agrave" g2="quoteright" k="143" />
-<hkern g1="Agrave" g2="quotedblright" k="143" />
-<hkern g1="Aacute" g2="quotedbl" k="143" />
-<hkern g1="Aacute" g2="quotesingle" k="143" />
-<hkern g1="Aacute" g2="C" k="41" />
-<hkern g1="Aacute" g2="G" k="41" />
-<hkern g1="Aacute" g2="J" k="-266" />
-<hkern g1="Aacute" g2="O" k="41" />
-<hkern g1="Aacute" g2="Q" k="41" />
-<hkern g1="Aacute" g2="T" k="143" />
-<hkern g1="Aacute" g2="V" k="82" />
-<hkern g1="Aacute" g2="W" k="82" />
-<hkern g1="Aacute" g2="Y" k="123" />
-<hkern g1="Aacute" g2="Ccedilla" k="41" />
-<hkern g1="Aacute" g2="Ograve" k="41" />
-<hkern g1="Aacute" g2="Oacute" k="41" />
-<hkern g1="Aacute" g2="Ocircumflex" k="41" />
-<hkern g1="Aacute" g2="Otilde" k="41" />
-<hkern g1="Aacute" g2="Odieresis" k="41" />
-<hkern g1="Aacute" g2="Oslash" k="41" />
-<hkern g1="Aacute" g2="Yacute" k="123" />
-<hkern g1="Aacute" g2="OE" k="41" />
-<hkern g1="Aacute" g2="quoteright" k="143" />
-<hkern g1="Aacute" g2="quotedblright" k="143" />
-<hkern g1="Acircumflex" g2="quotedbl" k="143" />
-<hkern g1="Acircumflex" g2="quotesingle" k="143" />
-<hkern g1="Acircumflex" g2="C" k="41" />
-<hkern g1="Acircumflex" g2="G" k="41" />
-<hkern g1="Acircumflex" g2="J" k="-266" />
-<hkern g1="Acircumflex" g2="O" k="41" />
-<hkern g1="Acircumflex" g2="Q" k="41" />
-<hkern g1="Acircumflex" g2="T" k="143" />
-<hkern g1="Acircumflex" g2="V" k="82" />
-<hkern g1="Acircumflex" g2="W" k="82" />
-<hkern g1="Acircumflex" g2="Y" k="123" />
-<hkern g1="Acircumflex" g2="Ccedilla" k="41" />
-<hkern g1="Acircumflex" g2="Ograve" k="41" />
-<hkern g1="Acircumflex" g2="Oacute" k="41" />
-<hkern g1="Acircumflex" g2="Ocircumflex" k="41" />
-<hkern g1="Acircumflex" g2="Otilde" k="41" />
-<hkern g1="Acircumflex" g2="Odieresis" k="41" />
-<hkern g1="Acircumflex" g2="Oslash" k="41" />
-<hkern g1="Acircumflex" g2="Yacute" k="123" />
-<hkern g1="Acircumflex" g2="OE" k="41" />
-<hkern g1="Acircumflex" g2="quoteright" k="143" />
-<hkern g1="Acircumflex" g2="quotedblright" k="143" />
-<hkern g1="Atilde" g2="quotedbl" k="143" />
-<hkern g1="Atilde" g2="quotesingle" k="143" />
-<hkern g1="Atilde" g2="C" k="41" />
-<hkern g1="Atilde" g2="G" k="41" />
-<hkern g1="Atilde" g2="J" k="-266" />
-<hkern g1="Atilde" g2="O" k="41" />
-<hkern g1="Atilde" g2="Q" k="41" />
-<hkern g1="Atilde" g2="T" k="143" />
-<hkern g1="Atilde" g2="V" k="82" />
-<hkern g1="Atilde" g2="W" k="82" />
-<hkern g1="Atilde" g2="Y" k="123" />
-<hkern g1="Atilde" g2="Ccedilla" k="41" />
-<hkern g1="Atilde" g2="Ograve" k="41" />
-<hkern g1="Atilde" g2="Oacute" k="41" />
-<hkern g1="Atilde" g2="Ocircumflex" k="41" />
-<hkern g1="Atilde" g2="Otilde" k="41" />
-<hkern g1="Atilde" g2="Odieresis" k="41" />
-<hkern g1="Atilde" g2="Oslash" k="41" />
-<hkern g1="Atilde" g2="Yacute" k="123" />
-<hkern g1="Atilde" g2="OE" k="41" />
-<hkern g1="Atilde" g2="quoteright" k="143" />
-<hkern g1="Atilde" g2="quotedblright" k="143" />
-<hkern g1="Adieresis" g2="quotedbl" k="143" />
-<hkern g1="Adieresis" g2="quotesingle" k="143" />
-<hkern g1="Adieresis" g2="C" k="41" />
-<hkern g1="Adieresis" g2="G" k="41" />
-<hkern g1="Adieresis" g2="J" k="-266" />
-<hkern g1="Adieresis" g2="O" k="41" />
-<hkern g1="Adieresis" g2="Q" k="41" />
-<hkern g1="Adieresis" g2="T" k="143" />
-<hkern g1="Adieresis" g2="V" k="82" />
-<hkern g1="Adieresis" g2="W" k="82" />
-<hkern g1="Adieresis" g2="Y" k="123" />
-<hkern g1="Adieresis" g2="Ccedilla" k="41" />
-<hkern g1="Adieresis" g2="Ograve" k="41" />
-<hkern g1="Adieresis" g2="Oacute" k="41" />
-<hkern g1="Adieresis" g2="Ocircumflex" k="41" />
-<hkern g1="Adieresis" g2="Otilde" k="41" />
-<hkern g1="Adieresis" g2="Odieresis" k="41" />
-<hkern g1="Adieresis" g2="Oslash" k="41" />
-<hkern g1="Adieresis" g2="Yacute" k="123" />
-<hkern g1="Adieresis" g2="OE" k="41" />
-<hkern g1="Adieresis" g2="quoteright" k="143" />
-<hkern g1="Adieresis" g2="quotedblright" k="143" />
-<hkern g1="Aring" g2="quotedbl" k="143" />
-<hkern g1="Aring" g2="quotesingle" k="143" />
-<hkern g1="Aring" g2="C" k="41" />
-<hkern g1="Aring" g2="G" k="41" />
-<hkern g1="Aring" g2="J" k="-266" />
-<hkern g1="Aring" g2="O" k="41" />
-<hkern g1="Aring" g2="Q" k="41" />
-<hkern g1="Aring" g2="T" k="143" />
-<hkern g1="Aring" g2="V" k="82" />
-<hkern g1="Aring" g2="W" k="82" />
-<hkern g1="Aring" g2="Y" k="123" />
-<hkern g1="Aring" g2="Ccedilla" k="41" />
-<hkern g1="Aring" g2="Ograve" k="41" />
-<hkern g1="Aring" g2="Oacute" k="41" />
-<hkern g1="Aring" g2="Ocircumflex" k="41" />
-<hkern g1="Aring" g2="Otilde" k="41" />
-<hkern g1="Aring" g2="Odieresis" k="41" />
-<hkern g1="Aring" g2="Oslash" k="41" />
-<hkern g1="Aring" g2="Yacute" k="123" />
-<hkern g1="Aring" g2="OE" k="41" />
-<hkern g1="Aring" g2="quoteright" k="143" />
-<hkern g1="Aring" g2="quotedblright" k="143" />
-<hkern g1="AE" g2="J" k="-123" />
-<hkern g1="Ccedilla" g2="C" k="41" />
-<hkern g1="Ccedilla" g2="G" k="41" />
-<hkern g1="Ccedilla" g2="O" k="41" />
-<hkern g1="Ccedilla" g2="Q" k="41" />
-<hkern g1="Ccedilla" g2="Ccedilla" k="41" />
-<hkern g1="Ccedilla" g2="Ograve" k="41" />
-<hkern g1="Ccedilla" g2="Oacute" k="41" />
-<hkern g1="Ccedilla" g2="Ocircumflex" k="41" />
-<hkern g1="Ccedilla" g2="Otilde" k="41" />
-<hkern g1="Ccedilla" g2="Odieresis" k="41" />
-<hkern g1="Ccedilla" g2="Oslash" k="41" />
-<hkern g1="Ccedilla" g2="OE" k="41" />
-<hkern g1="Egrave" g2="J" k="-123" />
-<hkern g1="Eacute" g2="J" k="-123" />
-<hkern g1="Ecircumflex" g2="J" k="-123" />
-<hkern g1="Edieresis" g2="J" k="-123" />
-<hkern g1="Eth" g2="comma" k="82" />
-<hkern g1="Eth" g2="period" k="82" />
-<hkern g1="Eth" g2="A" k="41" />
-<hkern g1="Eth" g2="T" k="61" />
-<hkern g1="Eth" g2="V" k="20" />
-<hkern g1="Eth" g2="W" k="20" />
-<hkern g1="Eth" g2="X" k="41" />
-<hkern g1="Eth" g2="Y" k="20" />
-<hkern g1="Eth" g2="Z" k="20" />
-<hkern g1="Eth" g2="Agrave" k="41" />
-<hkern g1="Eth" g2="Aacute" k="41" />
-<hkern g1="Eth" g2="Acircumflex" k="41" />
-<hkern g1="Eth" g2="Atilde" k="41" />
-<hkern g1="Eth" g2="Adieresis" k="41" />
-<hkern g1="Eth" g2="Aring" k="41" />
-<hkern g1="Eth" g2="Yacute" k="20" />
-<hkern g1="Eth" g2="quotesinglbase" k="82" />
-<hkern g1="Eth" g2="quotedblbase" k="82" />
-<hkern g1="Ograve" g2="comma" k="82" />
-<hkern g1="Ograve" g2="period" k="82" />
-<hkern g1="Ograve" g2="A" k="41" />
-<hkern g1="Ograve" g2="T" k="61" />
-<hkern g1="Ograve" g2="V" k="20" />
-<hkern g1="Ograve" g2="W" k="20" />
-<hkern g1="Ograve" g2="X" k="41" />
-<hkern g1="Ograve" g2="Y" k="20" />
-<hkern g1="Ograve" g2="Z" k="20" />
-<hkern g1="Ograve" g2="Agrave" k="41" />
-<hkern g1="Ograve" g2="Aacute" k="41" />
-<hkern g1="Ograve" g2="Acircumflex" k="41" />
-<hkern g1="Ograve" g2="Atilde" k="41" />
-<hkern g1="Ograve" g2="Adieresis" k="41" />
-<hkern g1="Ograve" g2="Aring" k="41" />
-<hkern g1="Ograve" g2="Yacute" k="20" />
-<hkern g1="Ograve" g2="quotesinglbase" k="82" />
-<hkern g1="Ograve" g2="quotedblbase" k="82" />
-<hkern g1="Oacute" g2="comma" k="82" />
-<hkern g1="Oacute" g2="period" k="82" />
-<hkern g1="Oacute" g2="A" k="41" />
-<hkern g1="Oacute" g2="T" k="61" />
-<hkern g1="Oacute" g2="V" k="20" />
-<hkern g1="Oacute" g2="W" k="20" />
-<hkern g1="Oacute" g2="X" k="41" />
-<hkern g1="Oacute" g2="Y" k="20" />
-<hkern g1="Oacute" g2="Z" k="20" />
-<hkern g1="Oacute" g2="Agrave" k="41" />
-<hkern g1="Oacute" g2="Aacute" k="41" />
-<hkern g1="Oacute" g2="Acircumflex" k="41" />
-<hkern g1="Oacute" g2="Atilde" k="41" />
-<hkern g1="Oacute" g2="Adieresis" k="41" />
-<hkern g1="Oacute" g2="Aring" k="41" />
-<hkern g1="Oacute" g2="Yacute" k="20" />
-<hkern g1="Oacute" g2="quotesinglbase" k="82" />
-<hkern g1="Oacute" g2="quotedblbase" k="82" />
-<hkern g1="Ocircumflex" g2="comma" k="82" />
-<hkern g1="Ocircumflex" g2="period" k="82" />
-<hkern g1="Ocircumflex" g2="A" k="41" />
-<hkern g1="Ocircumflex" g2="T" k="61" />
-<hkern g1="Ocircumflex" g2="V" k="20" />
-<hkern g1="Ocircumflex" g2="W" k="20" />
-<hkern g1="Ocircumflex" g2="X" k="41" />
-<hkern g1="Ocircumflex" g2="Y" k="20" />
-<hkern g1="Ocircumflex" g2="Z" k="20" />
-<hkern g1="Ocircumflex" g2="Agrave" k="41" />
-<hkern g1="Ocircumflex" g2="Aacute" k="41" />
-<hkern g1="Ocircumflex" g2="Acircumflex" k="41" />
-<hkern g1="Ocircumflex" g2="Atilde" k="41" />
-<hkern g1="Ocircumflex" g2="Adieresis" k="41" />
-<hkern g1="Ocircumflex" g2="Aring" k="41" />
-<hkern g1="Ocircumflex" g2="Yacute" k="20" />
-<hkern g1="Ocircumflex" g2="quotesinglbase" k="82" />
-<hkern g1="Ocircumflex" g2="quotedblbase" k="82" />
-<hkern g1="Otilde" g2="comma" k="82" />
-<hkern g1="Otilde" g2="period" k="82" />
-<hkern g1="Otilde" g2="A" k="41" />
-<hkern g1="Otilde" g2="T" k="61" />
-<hkern g1="Otilde" g2="V" k="20" />
-<hkern g1="Otilde" g2="W" k="20" />
-<hkern g1="Otilde" g2="X" k="41" />
-<hkern g1="Otilde" g2="Y" k="20" />
-<hkern g1="Otilde" g2="Z" k="20" />
-<hkern g1="Otilde" g2="Agrave" k="41" />
-<hkern g1="Otilde" g2="Aacute" k="41" />
-<hkern g1="Otilde" g2="Acircumflex" k="41" />
-<hkern g1="Otilde" g2="Atilde" k="41" />
-<hkern g1="Otilde" g2="Adieresis" k="41" />
-<hkern g1="Otilde" g2="Aring" k="41" />
-<hkern g1="Otilde" g2="Yacute" k="20" />
-<hkern g1="Otilde" g2="quotesinglbase" k="82" />
-<hkern g1="Otilde" g2="quotedblbase" k="82" />
-<hkern g1="Odieresis" g2="comma" k="82" />
-<hkern g1="Odieresis" g2="period" k="82" />
-<hkern g1="Odieresis" g2="A" k="41" />
-<hkern g1="Odieresis" g2="T" k="61" />
-<hkern g1="Odieresis" g2="V" k="20" />
-<hkern g1="Odieresis" g2="W" k="20" />
-<hkern g1="Odieresis" g2="X" k="41" />
-<hkern g1="Odieresis" g2="Y" k="20" />
-<hkern g1="Odieresis" g2="Z" k="20" />
-<hkern g1="Odieresis" g2="Agrave" k="41" />
-<hkern g1="Odieresis" g2="Aacute" k="41" />
-<hkern g1="Odieresis" g2="Acircumflex" k="41" />
-<hkern g1="Odieresis" g2="Atilde" k="41" />
-<hkern g1="Odieresis" g2="Adieresis" k="41" />
-<hkern g1="Odieresis" g2="Aring" k="41" />
-<hkern g1="Odieresis" g2="Yacute" k="20" />
-<hkern g1="Odieresis" g2="quotesinglbase" k="82" />
-<hkern g1="Odieresis" g2="quotedblbase" k="82" />
-<hkern g1="Oslash" g2="comma" k="82" />
-<hkern g1="Oslash" g2="period" k="82" />
-<hkern g1="Oslash" g2="A" k="41" />
-<hkern g1="Oslash" g2="T" k="61" />
-<hkern g1="Oslash" g2="V" k="20" />
-<hkern g1="Oslash" g2="W" k="20" />
-<hkern g1="Oslash" g2="X" k="41" />
-<hkern g1="Oslash" g2="Y" k="20" />
-<hkern g1="Oslash" g2="Z" k="20" />
-<hkern g1="Oslash" g2="Agrave" k="41" />
-<hkern g1="Oslash" g2="Aacute" k="41" />
-<hkern g1="Oslash" g2="Acircumflex" k="41" />
-<hkern g1="Oslash" g2="Atilde" k="41" />
-<hkern g1="Oslash" g2="Adieresis" k="41" />
-<hkern g1="Oslash" g2="Aring" k="41" />
-<hkern g1="Oslash" g2="Yacute" k="20" />
-<hkern g1="Oslash" g2="quotesinglbase" k="82" />
-<hkern g1="Oslash" g2="quotedblbase" k="82" />
-<hkern g1="Ugrave" g2="comma" k="41" />
-<hkern g1="Ugrave" g2="period" k="41" />
-<hkern g1="Ugrave" g2="A" k="20" />
-<hkern g1="Ugrave" g2="Agrave" k="20" />
-<hkern g1="Ugrave" g2="Aacute" k="20" />
-<hkern g1="Ugrave" g2="Acircumflex" k="20" />
-<hkern g1="Ugrave" g2="Atilde" k="20" />
-<hkern g1="Ugrave" g2="Adieresis" k="20" />
-<hkern g1="Ugrave" g2="Aring" k="20" />
-<hkern g1="Ugrave" g2="quotesinglbase" k="41" />
-<hkern g1="Ugrave" g2="quotedblbase" k="41" />
-<hkern g1="Uacute" g2="comma" k="41" />
-<hkern g1="Uacute" g2="period" k="41" />
-<hkern g1="Uacute" g2="A" k="20" />
-<hkern g1="Uacute" g2="Agrave" k="20" />
-<hkern g1="Uacute" g2="Aacute" k="20" />
-<hkern g1="Uacute" g2="Acircumflex" k="20" />
-<hkern g1="Uacute" g2="Atilde" k="20" />
-<hkern g1="Uacute" g2="Adieresis" k="20" />
-<hkern g1="Uacute" g2="Aring" k="20" />
-<hkern g1="Uacute" g2="quotesinglbase" k="41" />
-<hkern g1="Uacute" g2="quotedblbase" k="41" />
-<hkern g1="Ucircumflex" g2="comma" k="41" />
-<hkern g1="Ucircumflex" g2="period" k="41" />
-<hkern g1="Ucircumflex" g2="A" k="20" />
-<hkern g1="Ucircumflex" g2="Agrave" k="20" />
-<hkern g1="Ucircumflex" g2="Aacute" k="20" />
-<hkern g1="Ucircumflex" g2="Acircumflex" k="20" />
-<hkern g1="Ucircumflex" g2="Atilde" k="20" />
-<hkern g1="Ucircumflex" g2="Adieresis" k="20" />
-<hkern g1="Ucircumflex" g2="Aring" k="20" />
-<hkern g1="Ucircumflex" g2="quotesinglbase" k="41" />
-<hkern g1="Ucircumflex" g2="quotedblbase" k="41" />
-<hkern g1="Udieresis" g2="comma" k="41" />
-<hkern g1="Udieresis" g2="period" k="41" />
-<hkern g1="Udieresis" g2="A" k="20" />
-<hkern g1="Udieresis" g2="Agrave" k="20" />
-<hkern g1="Udieresis" g2="Aacute" k="20" />
-<hkern g1="Udieresis" g2="Acircumflex" k="20" />
-<hkern g1="Udieresis" g2="Atilde" k="20" />
-<hkern g1="Udieresis" g2="Adieresis" k="20" />
-<hkern g1="Udieresis" g2="Aring" k="20" />
-<hkern g1="Udieresis" g2="quotesinglbase" k="41" />
-<hkern g1="Udieresis" g2="quotedblbase" k="41" />
-<hkern g1="Yacute" g2="comma" k="123" />
-<hkern g1="Yacute" g2="period" k="123" />
-<hkern g1="Yacute" g2="question" k="-41" />
-<hkern g1="Yacute" g2="A" k="123" />
-<hkern g1="Yacute" g2="C" k="41" />
-<hkern g1="Yacute" g2="G" k="41" />
-<hkern g1="Yacute" g2="O" k="41" />
-<hkern g1="Yacute" g2="Q" k="41" />
-<hkern g1="Yacute" g2="a" k="102" />
-<hkern g1="Yacute" g2="c" k="102" />
-<hkern g1="Yacute" g2="d" k="102" />
-<hkern g1="Yacute" g2="e" k="102" />
-<hkern g1="Yacute" g2="g" k="41" />
-<hkern g1="Yacute" g2="m" k="61" />
-<hkern g1="Yacute" g2="n" k="61" />
-<hkern g1="Yacute" g2="o" k="102" />
-<hkern g1="Yacute" g2="p" k="61" />
-<hkern g1="Yacute" g2="q" k="102" />
-<hkern g1="Yacute" g2="r" k="61" />
-<hkern g1="Yacute" g2="s" k="82" />
-<hkern g1="Yacute" g2="u" k="61" />
-<hkern g1="Yacute" g2="z" k="41" />
-<hkern g1="Yacute" g2="Agrave" k="123" />
-<hkern g1="Yacute" g2="Aacute" k="123" />
-<hkern g1="Yacute" g2="Acircumflex" k="123" />
-<hkern g1="Yacute" g2="Atilde" k="123" />
-<hkern g1="Yacute" g2="Adieresis" k="123" />
-<hkern g1="Yacute" g2="Aring" k="123" />
-<hkern g1="Yacute" g2="Ccedilla" k="41" />
-<hkern g1="Yacute" g2="Ograve" k="41" />
-<hkern g1="Yacute" g2="Oacute" k="41" />
-<hkern g1="Yacute" g2="Ocircumflex" k="41" />
-<hkern g1="Yacute" g2="Otilde" k="41" />
-<hkern g1="Yacute" g2="Odieresis" k="41" />
-<hkern g1="Yacute" g2="Oslash" k="41" />
-<hkern g1="Yacute" g2="agrave" k="102" />
-<hkern g1="Yacute" g2="aacute" k="102" />
-<hkern g1="Yacute" g2="acircumflex" k="102" />
-<hkern g1="Yacute" g2="atilde" k="102" />
-<hkern g1="Yacute" g2="adieresis" k="102" />
-<hkern g1="Yacute" g2="aring" k="102" />
-<hkern g1="Yacute" g2="ae" k="102" />
-<hkern g1="Yacute" g2="ccedilla" k="102" />
-<hkern g1="Yacute" g2="egrave" k="102" />
-<hkern g1="Yacute" g2="eacute" k="102" />
-<hkern g1="Yacute" g2="ecircumflex" k="102" />
-<hkern g1="Yacute" g2="edieresis" k="102" />
-<hkern g1="Yacute" g2="ograve" k="102" />
-<hkern g1="Yacute" g2="oacute" k="102" />
-<hkern g1="Yacute" g2="ocircumflex" k="102" />
-<hkern g1="Yacute" g2="otilde" k="102" />
-<hkern g1="Yacute" g2="odieresis" k="102" />
-<hkern g1="Yacute" g2="oslash" k="102" />
-<hkern g1="Yacute" g2="ugrave" k="61" />
-<hkern g1="Yacute" g2="uacute" k="61" />
-<hkern g1="Yacute" g2="ucircumflex" k="61" />
-<hkern g1="Yacute" g2="udieresis" k="61" />
-<hkern g1="Yacute" g2="OE" k="41" />
-<hkern g1="Yacute" g2="oe" k="102" />
-<hkern g1="Yacute" g2="quotesinglbase" k="123" />
-<hkern g1="Yacute" g2="quotedblbase" k="123" />
-<hkern g1="Thorn" g2="comma" k="266" />
-<hkern g1="Thorn" g2="period" k="266" />
-<hkern g1="Thorn" g2="A" k="102" />
-<hkern g1="Thorn" g2="X" k="41" />
-<hkern g1="Thorn" g2="Z" k="20" />
-<hkern g1="Thorn" g2="Agrave" k="102" />
-<hkern g1="Thorn" g2="Aacute" k="102" />
-<hkern g1="Thorn" g2="Acircumflex" k="102" />
-<hkern g1="Thorn" g2="Atilde" k="102" />
-<hkern g1="Thorn" g2="Adieresis" k="102" />
-<hkern g1="Thorn" g2="Aring" k="102" />
-<hkern g1="Thorn" g2="quotesinglbase" k="266" />
-<hkern g1="Thorn" g2="quotedblbase" k="266" />
-<hkern g1="agrave" g2="quotedbl" k="20" />
-<hkern g1="agrave" g2="quotesingle" k="20" />
-<hkern g1="agrave" g2="quoteright" k="20" />
-<hkern g1="agrave" g2="quotedblright" k="20" />
-<hkern g1="aacute" g2="quotedbl" k="20" />
-<hkern g1="aacute" g2="quotesingle" k="20" />
-<hkern g1="aacute" g2="quoteright" k="20" />
-<hkern g1="aacute" g2="quotedblright" k="20" />
-<hkern g1="acircumflex" g2="quotedbl" k="20" />
-<hkern g1="acircumflex" g2="quotesingle" k="20" />
-<hkern g1="acircumflex" g2="quoteright" k="20" />
-<hkern g1="acircumflex" g2="quotedblright" k="20" />
-<hkern g1="atilde" g2="quotedbl" k="20" />
-<hkern g1="atilde" g2="quotesingle" k="20" />
-<hkern g1="atilde" g2="quoteright" k="20" />
-<hkern g1="atilde" g2="quotedblright" k="20" />
-<hkern g1="adieresis" g2="quotedbl" k="20" />
-<hkern g1="adieresis" g2="quotesingle" k="20" />
-<hkern g1="adieresis" g2="quoteright" k="20" />
-<hkern g1="adieresis" g2="quotedblright" k="20" />
-<hkern g1="aring" g2="quotedbl" k="20" />
-<hkern g1="aring" g2="quotesingle" k="20" />
-<hkern g1="aring" g2="quoteright" k="20" />
-<hkern g1="aring" g2="quotedblright" k="20" />
-<hkern g1="egrave" g2="quotedbl" k="20" />
-<hkern g1="egrave" g2="quotesingle" k="20" />
-<hkern g1="egrave" g2="v" k="41" />
-<hkern g1="egrave" g2="w" k="41" />
-<hkern g1="egrave" g2="x" k="41" />
-<hkern g1="egrave" g2="y" k="41" />
-<hkern g1="egrave" g2="z" k="20" />
-<hkern g1="egrave" g2="yacute" k="41" />
-<hkern g1="egrave" g2="quoteright" k="20" />
-<hkern g1="egrave" g2="quotedblright" k="20" />
-<hkern g1="eacute" g2="quotedbl" k="20" />
-<hkern g1="eacute" g2="quotesingle" k="20" />
-<hkern g1="eacute" g2="v" k="41" />
-<hkern g1="eacute" g2="w" k="41" />
-<hkern g1="eacute" g2="x" k="41" />
-<hkern g1="eacute" g2="y" k="41" />
-<hkern g1="eacute" g2="z" k="20" />
-<hkern g1="eacute" g2="yacute" k="41" />
-<hkern g1="eacute" g2="quoteright" k="20" />
-<hkern g1="eacute" g2="quotedblright" k="20" />
-<hkern g1="ecircumflex" g2="quotedbl" k="20" />
-<hkern g1="ecircumflex" g2="quotesingle" k="20" />
-<hkern g1="ecircumflex" g2="v" k="41" />
-<hkern g1="ecircumflex" g2="w" k="41" />
-<hkern g1="ecircumflex" g2="x" k="41" />
-<hkern g1="ecircumflex" g2="y" k="41" />
-<hkern g1="ecircumflex" g2="z" k="20" />
-<hkern g1="ecircumflex" g2="yacute" k="41" />
-<hkern g1="ecircumflex" g2="quoteright" k="20" />
-<hkern g1="ecircumflex" g2="quotedblright" k="20" />
-<hkern g1="edieresis" g2="quotedbl" k="20" />
-<hkern g1="edieresis" g2="quotesingle" k="20" />
-<hkern g1="edieresis" g2="v" k="41" />
-<hkern g1="edieresis" g2="w" k="41" />
-<hkern g1="edieresis" g2="x" k="41" />
-<hkern g1="edieresis" g2="y" k="41" />
-<hkern g1="edieresis" g2="z" k="20" />
-<hkern g1="edieresis" g2="yacute" k="41" />
-<hkern g1="edieresis" g2="quoteright" k="20" />
-<hkern g1="edieresis" g2="quotedblright" k="20" />
-<hkern g1="eth" g2="quotedbl" k="20" />
-<hkern g1="eth" g2="quotesingle" k="20" />
-<hkern g1="eth" g2="v" k="41" />
-<hkern g1="eth" g2="w" k="41" />
-<hkern g1="eth" g2="x" k="41" />
-<hkern g1="eth" g2="y" k="41" />
-<hkern g1="eth" g2="z" k="20" />
-<hkern g1="eth" g2="yacute" k="41" />
-<hkern g1="eth" g2="quoteright" k="20" />
-<hkern g1="eth" g2="quotedblright" k="20" />
-<hkern g1="ograve" g2="quotedbl" k="20" />
-<hkern g1="ograve" g2="quotesingle" k="20" />
-<hkern g1="ograve" g2="v" k="41" />
-<hkern g1="ograve" g2="w" k="41" />
-<hkern g1="ograve" g2="x" k="41" />
-<hkern g1="ograve" g2="y" k="41" />
-<hkern g1="ograve" g2="z" k="20" />
-<hkern g1="ograve" g2="yacute" k="41" />
-<hkern g1="ograve" g2="quoteright" k="20" />
-<hkern g1="ograve" g2="quotedblright" k="20" />
-<hkern g1="oacute" g2="quotedbl" k="20" />
-<hkern g1="oacute" g2="quotesingle" k="20" />
-<hkern g1="oacute" g2="v" k="41" />
-<hkern g1="oacute" g2="w" k="41" />
-<hkern g1="oacute" g2="x" k="41" />
-<hkern g1="oacute" g2="y" k="41" />
-<hkern g1="oacute" g2="z" k="20" />
-<hkern g1="oacute" g2="yacute" k="41" />
-<hkern g1="oacute" g2="quoteright" k="20" />
-<hkern g1="oacute" g2="quotedblright" k="20" />
-<hkern g1="ocircumflex" g2="quotedbl" k="20" />
-<hkern g1="ocircumflex" g2="quotesingle" k="20" />
-<hkern g1="ocircumflex" g2="v" k="41" />
-<hkern g1="ocircumflex" g2="w" k="41" />
-<hkern g1="ocircumflex" g2="x" k="41" />
-<hkern g1="ocircumflex" g2="y" k="41" />
-<hkern g1="ocircumflex" g2="z" k="20" />
-<hkern g1="ocircumflex" g2="yacute" k="41" />
-<hkern g1="ocircumflex" g2="quoteright" k="20" />
-<hkern g1="ocircumflex" g2="quotedblright" k="20" />
-<hkern g1="odieresis" g2="quotedbl" k="41" />
-<hkern g1="odieresis" g2="quotesingle" k="41" />
-<hkern g1="odieresis" g2="quoteright" k="41" />
-<hkern g1="odieresis" g2="quotedblright" k="41" />
-<hkern g1="oslash" g2="quotedbl" k="20" />
-<hkern g1="oslash" g2="quotesingle" k="20" />
-<hkern g1="oslash" g2="v" k="41" />
-<hkern g1="oslash" g2="w" k="41" />
-<hkern g1="oslash" g2="x" k="41" />
-<hkern g1="oslash" g2="y" k="41" />
-<hkern g1="oslash" g2="z" k="20" />
-<hkern g1="oslash" g2="yacute" k="41" />
-<hkern g1="oslash" g2="quoteright" k="20" />
-<hkern g1="oslash" g2="quotedblright" k="20" />
-<hkern g1="yacute" g2="quotedbl" k="-82" />
-<hkern g1="yacute" g2="quotesingle" k="-82" />
-<hkern g1="yacute" g2="comma" k="82" />
-<hkern g1="yacute" g2="period" k="82" />
-<hkern g1="yacute" g2="question" k="-41" />
-<hkern g1="yacute" g2="quoteright" k="-82" />
-<hkern g1="yacute" g2="quotesinglbase" k="82" />
-<hkern g1="yacute" g2="quotedblright" k="-82" />
-<hkern g1="yacute" g2="quotedblbase" k="82" />
-<hkern g1="thorn" g2="quotedbl" k="20" />
-<hkern g1="thorn" g2="quotesingle" k="20" />
-<hkern g1="thorn" g2="v" k="41" />
-<hkern g1="thorn" g2="w" k="41" />
-<hkern g1="thorn" g2="x" k="41" />
-<hkern g1="thorn" g2="y" k="41" />
-<hkern g1="thorn" g2="z" k="20" />
-<hkern g1="thorn" g2="yacute" k="41" />
-<hkern g1="thorn" g2="quoteright" k="20" />
-<hkern g1="thorn" g2="quotedblright" k="20" />
-<hkern g1="ydieresis" g2="quotedbl" k="-82" />
-<hkern g1="ydieresis" g2="quotesingle" k="-82" />
-<hkern g1="ydieresis" g2="comma" k="82" />
-<hkern g1="ydieresis" g2="period" k="82" />
-<hkern g1="ydieresis" g2="question" k="-41" />
-<hkern g1="ydieresis" g2="quoteright" k="-82" />
-<hkern g1="ydieresis" g2="quotesinglbase" k="82" />
-<hkern g1="ydieresis" g2="quotedblright" k="-82" />
-<hkern g1="ydieresis" g2="quotedblbase" k="82" />
-<hkern g1="OE" g2="J" k="-123" />
-</font>
-</defs>
-</svg>
diff --git a/data/interfaces/default/fonts/Open-Sans-600/Open-Sans-600.ttf b/data/interfaces/default/fonts/Open-Sans-600/Open-Sans-600.ttf
deleted file mode 100644
index 314e983a..00000000
Binary files a/data/interfaces/default/fonts/Open-Sans-600/Open-Sans-600.ttf and /dev/null differ
diff --git a/data/interfaces/default/fonts/Open-Sans-600/Open-Sans-600.woff b/data/interfaces/default/fonts/Open-Sans-600/Open-Sans-600.woff
deleted file mode 100644
index c7cdaffa..00000000
Binary files a/data/interfaces/default/fonts/Open-Sans-600/Open-Sans-600.woff and /dev/null differ
diff --git a/data/interfaces/default/fonts/Open-Sans-600/Open-Sans-600.woff2 b/data/interfaces/default/fonts/Open-Sans-600/Open-Sans-600.woff2
deleted file mode 100644
index 4001c52a..00000000
Binary files a/data/interfaces/default/fonts/Open-Sans-600/Open-Sans-600.woff2 and /dev/null differ
diff --git a/data/interfaces/default/fonts/Open-Sans-regular/LICENSE.txt b/data/interfaces/default/fonts/Open-Sans-regular/LICENSE.txt
deleted file mode 100644
index d6456956..00000000
--- a/data/interfaces/default/fonts/Open-Sans-regular/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   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.
diff --git a/data/interfaces/default/fonts/Open-Sans-regular/Open-Sans-regular.eot b/data/interfaces/default/fonts/Open-Sans-regular/Open-Sans-regular.eot
deleted file mode 100644
index 1d98e6ea..00000000
Binary files a/data/interfaces/default/fonts/Open-Sans-regular/Open-Sans-regular.eot and /dev/null differ
diff --git a/data/interfaces/default/fonts/Open-Sans-regular/Open-Sans-regular.svg b/data/interfaces/default/fonts/Open-Sans-regular/Open-Sans-regular.svg
deleted file mode 100644
index 052c59ff..00000000
--- a/data/interfaces/default/fonts/Open-Sans-regular/Open-Sans-regular.svg
+++ /dev/null
@@ -1,1637 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg">
-<defs >
-<font id="OpenSans" horiz-adv-x="1206" ><font-face
-    font-family="Open Sans"
-    units-per-em="2048"
-    panose-1="2 11 6 6 3 5 4 2 2 4"
-    ascent="2189"
-    descent="-600"
-    alphabetic="0" />
-<glyph unicode=" " glyph-name="space" horiz-adv-x="532" />
-<glyph unicode="!" glyph-name="exclam" horiz-adv-x="547" d="M326 403H221L170 1462H377L326 403ZM152 106Q152 242 272 242Q330 242 361 207T393 106Q393 42 361 7T272 -29Q220 -29 186 2T152 106Z" />
-<glyph unicode="&quot;" glyph-name="quotedbl" horiz-adv-x="821" d="M319 1462L279 934H174L133 1462H319ZM688 1462L647 934H543L502 1462H688Z" />
-<glyph unicode="#" glyph-name="numbersign" horiz-adv-x="1323" d="M981 899L915 559H1198V430H891L807 0H670L754 430H451L369 0H233L313 430H51V559H338L406 899H129V1026H428L510 1462H649L567 1026H872L956 1462H1090L1006 1026H1270V899H981ZM475 559H778L844
-899H541L475 559Z" />
-<glyph unicode="$" glyph-name="dollar" horiz-adv-x="1171" d="M1036 449Q1036 313 934 225T649 113V-119H520V104Q408 104 303 121T131 170V326Q214 289 322 266T520 242V682Q315 747 233 833T150 1055Q150 1186 251 1270T520 1372V1554H649V1374Q833 1369 1004
-1300L952 1169Q803 1228 649 1239V805Q806 755 884 708T999 599T1036 449ZM866 436Q866 508 822 552T649 641V252Q866 282 866 436ZM319 1057Q319 981 364 935T520 848V1235Q421 1219 370 1173T319 1057Z" />
-<glyph unicode="%" glyph-name="percent" horiz-adv-x="1686" d="M242 1026Q242 856 279 771T399 686Q563 686 563 1026Q563 1364 399 1364Q316 1364 279 1280T242 1026ZM700 1026Q700 798 624 682T399 565Q259 565 182 684T104 1026Q104 1253 178 1368T399 1483Q544
-1483 622 1364T700 1026ZM1122 440Q1122 269 1159 185T1280 100Q1364 100 1404 183T1444 440Q1444 611 1404 693T1280 776Q1196 776 1159 694T1122 440ZM1581 440Q1581 213 1505 97T1280 -20Q1138 -20 1062 99T985 440Q985 667 1059 782T1280 897Q1422 897 1501
-780T1581 440ZM1323 1462L512 0H365L1176 1462H1323Z" />
-<glyph unicode="&amp;" glyph-name="ampersand" horiz-adv-x="1495" d="M414 1171Q414 1102 450 1040T573 889Q702 964 752 1027T803 1174Q803 1251 752 1299T614 1348Q525 1348 470 1300T414 1171ZM569 129Q810 129 969 283L532 707Q421 639 375 595T307 499T285
-383Q285 266 362 198T569 129ZM113 379Q113 509 182 609T432 811Q347 906 317 955T268 1057T250 1167Q250 1317 348 1401T621 1485Q783 1485 876 1402T969 1169Q969 1062 901 972T676 788L1083 397Q1139 459 1172 542T1229 725H1397Q1329 439 1192 291L1491 0H1262L1077
-178Q959 72 837 26T565 -20Q350 -20 232 86T113 379Z" />
-<glyph unicode="&apos;" glyph-name="quotesingle" horiz-adv-x="453" d="M319 1462L279 934H174L133 1462H319Z" />
-<glyph unicode="(" glyph-name="parenleft" horiz-adv-x="606" d="M82 561Q82 826 159 1057T383 1462H545Q401 1269 329 1038T256 563Q256 323 330 94T543 -324H383Q236 -154 159 73T82 561Z" />
-<glyph unicode=")" glyph-name="parenright" horiz-adv-x="606" d="M524 561Q524 298 447 71T223 -324H63Q202 -136 276 93T350 563Q350 807 278 1038T61 1462H223Q370 1287 447 1056T524 561Z" />
-<glyph unicode="*" glyph-name="asterisk" horiz-adv-x="1130" d="M657 1556L614 1161L1012 1272L1038 1090L657 1059L905 733L733 639L557 1001L397 639L221 733L463 1059L86 1090L115 1272L506 1161L463 1556H657Z" />
-<glyph unicode="+" glyph-name="plus" horiz-adv-x="1171" d="M653 791H1065V653H653V227H514V653H104V791H514V1219H653V791Z" />
-<glyph unicode="," glyph-name="comma" horiz-adv-x="502" d="M350 238L365 215Q339 115 290 -17T188 -264H63Q90 -160 122 -7T168 238H350Z" />
-<glyph unicode="-" glyph-name="hyphen" horiz-adv-x="659" d="M84 473V625H575V473H84Z" />
-<glyph unicode="." glyph-name="period" horiz-adv-x="545" d="M152 106Q152 173 182 207T270 242Q328 242 360 208T393 106Q393 41 360 6T270 -29Q219 -29 186 2T152 106Z" />
-<glyph unicode="/" glyph-name="slash" horiz-adv-x="752" d="M731 1462L186 0H20L565 1462H731Z" />
-<glyph unicode="0" glyph-name="zero" horiz-adv-x="1171" d="M1069 733Q1069 354 950 167T584 -20Q348 -20 225 171T102 733Q102 1115 221 1300T584 1485Q822 1485 945 1292T1069 733ZM270 733Q270 414 345 269T584 123Q750 123 824 270T899 733Q899 1048 825
-1194T584 1341Q420 1341 345 1197T270 733Z" />
-<glyph unicode="1" glyph-name="one" horiz-adv-x="1171" d="M715 0H553V1042Q553 1172 561 1288Q540 1267 514 1244T276 1049L188 1163L575 1462H715V0Z" />
-<glyph unicode="2" glyph-name="two" horiz-adv-x="1171" d="M1061 0H100V143L485 530Q661 708 717 784T801 932T829 1087Q829 1204 758 1272T561 1341Q470 1341 389 1311T207 1202L119 1315Q321 1483 559 1483Q765 1483 882 1378T999 1094Q999 955 921 819T629
-475L309 162V154H1061V0Z" />
-<glyph unicode="3" glyph-name="three" horiz-adv-x="1171" d="M1006 1118Q1006 978 928 889T705 770V762Q881 740 966 650T1051 414Q1051 205 906 93T494 -20Q378 -20 282 -3T94 59V217Q189 170 296 146T500 121Q879 121 879 418Q879 684 461 684H317V827H463Q634
-827 734 902T834 1112Q834 1219 761 1280T561 1341Q465 1341 380 1315T186 1219L102 1331Q192 1402 309 1442T557 1483Q770 1483 888 1386T1006 1118Z" />
-<glyph unicode="4" glyph-name="four" horiz-adv-x="1171" d="M1130 336H913V0H754V336H43V481L737 1470H913V487H1130V336ZM754 487V973Q754 1116 764 1296H756Q708 1200 666 1137L209 487H754Z" />
-<glyph unicode="5" glyph-name="five" horiz-adv-x="1171" d="M557 893Q788 893 920 779T1053 465Q1053 238 909 109T510 -20Q263 -20 133 59V219Q203 174 307 149T512 123Q688 123 785 206T883 446Q883 752 508 752Q413 752 254 723L168 778L223 1462H950V1309H365L328
-870Q443 893 557 893Z" />
-<glyph unicode="6" glyph-name="six" horiz-adv-x="1171" d="M117 625Q117 1056 284 1269T780 1483Q893 1483 958 1464V1321Q881 1346 782 1346Q547 1346 423 1200T287 739H299Q409 911 647 911Q844 911 957 792T1071 469Q1071 241 947 111T610 -20Q383 -20 250
-150T117 625ZM608 121Q750 121 828 210T907 469Q907 614 834 697T616 780Q526 780 451 743T332 641T287 506Q287 403 327 314T440 173T608 121Z" />
-<glyph unicode="7" glyph-name="seven" horiz-adv-x="1171" d="M285 0L891 1309H94V1462H1067V1329L469 0H285Z" />
-<glyph unicode="8" glyph-name="eight" horiz-adv-x="1171" d="M584 1483Q784 1483 901 1390T1018 1133Q1018 1025 951 936T737 774Q915 689 990 596T1065 379Q1065 197 938 89T590 -20Q356 -20 230 82T104 373Q104 624 410 764Q272 842 212 932T152 1135Q152
-1294 269 1388T584 1483ZM268 369Q268 249 351 182T586 115Q735 115 818 185T901 377Q901 474 823 549T551 696Q402 632 335 555T268 369ZM582 1348Q457 1348 386 1288T315 1128Q315 1036 374 970T592 838Q735 898 794 967T854 1128Q854 1229 782 1288T582 1348Z"
-/>
-<glyph unicode="9" glyph-name="nine" horiz-adv-x="1171" d="M1061 838Q1061 -20 397 -20Q281 -20 213 0V143Q293 117 395 117Q635 117 757 265T891 721H879Q824 638 733 595T528 551Q334 551 220 667T106 991Q106 1219 233 1351T569 1483Q718 1483 829 1407T1001
-1184T1061 838ZM569 1341Q426 1341 348 1249T270 993Q270 849 342 767T561 684Q652 684 728 721T849 822T893 956Q893 1061 852 1150T738 1290T569 1341Z" />
-<glyph unicode=":" glyph-name="colon" horiz-adv-x="545" d="M152 106Q152 173 182 207T270 242Q328 242 360 208T393 106Q393 41 360 6T270 -29Q219 -29 186 2T152 106ZM152 989Q152 1124 270 1124Q393 1124 393 989Q393 924 360 889T270 854Q219 854 186 885T152 989Z" />
-<glyph unicode=";" glyph-name="semicolon" horiz-adv-x="545" d="M350 238L365 215Q339 115 290 -17T188 -264H63Q90 -160 122 -7T168 238H350ZM147 989Q147 1124 266 1124Q389 1124 389 989Q389 924 356 889T266 854Q208 854 178 889T147 989Z" />
-<glyph unicode="&lt;" glyph-name="less" horiz-adv-x="1171" d="M1065 242L104 664V762L1065 1241V1092L283 721L1065 393V242Z" />
-<glyph unicode="=" glyph-name="equal" horiz-adv-x="1171" d="M119 858V995H1049V858H119ZM119 449V586H1049V449H119Z" />
-<glyph unicode="&gt;" glyph-name="greater" horiz-adv-x="1171" d="M104 393L887 719L104 1092V1241L1065 762V664L104 242V393Z" />
-<glyph unicode="?" glyph-name="question" horiz-adv-x="879" d="M289 403V457Q289 574 325 649T459 809Q595 924 630 982T666 1122Q666 1224 601 1279T412 1335Q333 1335 258 1317T86 1249L27 1384Q216 1483 422 1483Q613 1483 719 1389T825 1124Q825 1051 806
-996T748 891T584 731Q483 645 451 588T418 436V403H289ZM240 106Q240 242 360 242Q418 242 449 207T481 106Q481 42 449 7T360 -29Q308 -29 274 2T240 106Z" />
-<glyph unicode="@" glyph-name="at" horiz-adv-x="1841" d="M1720 729Q1720 587 1676 469T1552 286T1368 221Q1282 221 1223 273T1153 406H1145Q1105 319 1031 270T854 221Q704 221 620 323T535 602Q535 806 653 933T963 1061Q1031 1061 1117 1049T1272 1014L1247
-544V522Q1247 344 1380 344Q1471 344 1528 451T1585 731Q1585 912 1511 1048T1301 1257T987 1331Q764 1331 599 1239T347 975T260 578Q260 273 421 109T885 -55Q1095 -55 1321 31V-102Q1129 -186 885 -186Q522 -186 322 13T121 571Q121 831 228 1034T533 1348T987
-1460Q1202 1460 1369 1370T1628 1113T1720 729ZM686 598Q686 344 881 344Q1088 344 1106 657L1120 918Q1048 938 963 938Q833 938 760 848T686 598Z" />
-<glyph unicode="A" glyph-name="A" horiz-adv-x="1296" d="M1120 0L938 465H352L172 0H0L578 1468H721L1296 0H1120ZM885 618L715 1071Q682 1157 647 1282Q625 1186 584 1071L412 618H885Z" />
-<glyph unicode="B" glyph-name="B" horiz-adv-x="1327" d="M201 1462H614Q905 1462 1035 1375T1165 1100Q1165 970 1093 886T881 776V766Q1214 709 1214 416Q1214 220 1082 110T711 0H201V1462ZM371 836H651Q831 836 910 892T989 1083Q989 1206 901 1260T621 1315H371V836ZM371
-692V145H676Q853 145 942 213T1032 428Q1032 564 941 628T662 692H371Z" />
-<glyph unicode="C" glyph-name="C" horiz-adv-x="1292" d="M827 1331Q586 1331 447 1171T307 731Q307 444 441 288T825 131Q978 131 1174 186V37Q1022 -20 799 -20Q476 -20 301 176T125 733Q125 959 209 1129T453 1391T829 1483Q1059 1483 1231 1399L1159 1253Q993
-1331 827 1331Z" />
-<glyph unicode="D" glyph-name="D" horiz-adv-x="1493" d="M1368 745Q1368 383 1172 192T606 0H201V1462H649Q990 1462 1179 1273T1368 745ZM1188 739Q1188 1025 1045 1170T618 1315H371V147H578Q882 147 1035 296T1188 739Z" />
-<glyph unicode="E" glyph-name="E" horiz-adv-x="1139" d="M1016 0H201V1462H1016V1311H371V840H977V690H371V152H1016V0Z" />
-<glyph unicode="F" glyph-name="F" horiz-adv-x="1057" d="M371 0H201V1462H1016V1311H371V776H977V625H371V0Z" />
-<glyph unicode="G" glyph-name="G" horiz-adv-x="1491" d="M844 766H1341V55Q1225 18 1105 -1T827 -20Q495 -20 310 177T125 731Q125 959 216 1130T480 1392T883 1483Q1117 1483 1319 1397L1253 1247Q1055 1331 872 1331Q605 1331 455 1172T305 731Q305 435 449
-282T874 129Q1026 129 1171 164V614H844V766Z" />
-<glyph unicode="H" glyph-name="H" horiz-adv-x="1511" d="M1311 0H1141V688H371V0H201V1462H371V840H1141V1462H1311V0Z" />
-<glyph unicode="I" glyph-name="I" horiz-adv-x="571" d="M201 0V1462H371V0H201Z" />
-<glyph unicode="J" glyph-name="J" horiz-adv-x="547" d="M-12 -385Q-106 -385 -160 -358V-213Q-89 -233 -12 -233Q87 -233 138 -173T190 0V1462H360V14Q360 -176 264 -280T-12 -385Z" />
-<glyph unicode="K" glyph-name="K" horiz-adv-x="1257" d="M1257 0H1057L524 709L371 573V0H201V1462H371V737L1034 1462H1235L647 827L1257 0Z" />
-<glyph unicode="L" glyph-name="L" horiz-adv-x="1063" d="M201 0V1462H371V154H1016V0H201Z" />
-<glyph unicode="M" glyph-name="M" horiz-adv-x="1849" d="M848 0L352 1296H344Q358 1142 358 930V0H201V1462H457L920 256H928L1395 1462H1649V0H1479V942Q1479 1104 1493 1294H1485L985 0H848Z" />
-<glyph unicode="N" glyph-name="N" horiz-adv-x="1544" d="M1343 0H1149L350 1227H342Q358 1011 358 831V0H201V1462H393L1190 240H1198Q1196 267 1189 413T1184 623V1462H1343V0Z" />
-<glyph unicode="O" glyph-name="O" horiz-adv-x="1595" d="M1470 733Q1470 382 1293 181T799 -20Q476 -20 301 177T125 735Q125 1092 301 1288T801 1485Q1116 1485 1293 1285T1470 733ZM305 733Q305 436 431 283T799 129Q1042 129 1166 282T1290 733Q1290 1028
-1167 1180T801 1333Q558 1333 432 1180T305 733Z" />
-<glyph unicode="P" glyph-name="P" horiz-adv-x="1233" d="M1128 1036Q1128 814 977 695T543 575H371V0H201V1462H580Q1128 1462 1128 1036ZM371 721H524Q750 721 851 794T952 1028Q952 1173 857 1244T561 1315H371V721Z" />
-<glyph unicode="Q" glyph-name="Q" horiz-adv-x="1595" d="M1470 733Q1470 452 1357 266T1038 14L1386 -348H1139L854 -18L799 -20Q476 -20 301 177T125 735Q125 1092 301 1288T801 1485Q1116 1485 1293 1285T1470 733ZM305 733Q305 436 431 283T799 129Q1042
-129 1166 282T1290 733Q1290 1028 1167 1180T801 1333Q558 1333 432 1180T305 733Z" />
-<glyph unicode="R" glyph-name="R" horiz-adv-x="1266" d="M371 608V0H201V1462H602Q871 1462 999 1359T1128 1049Q1128 759 834 657L1231 0H1030L676 608H371ZM371 754H604Q784 754 868 825T952 1040Q952 1185 867 1249T592 1313H371V754Z" />
-<glyph unicode="S" glyph-name="S" horiz-adv-x="1124" d="M1026 389Q1026 196 886 88T506 -20Q246 -20 106 47V211Q196 173 302 151T512 129Q682 129 768 193T854 373Q854 449 824 497T722 587T504 680Q300 753 213 853T125 1114Q125 1283 252 1383T588 1483Q806
-1483 989 1403L936 1255Q755 1331 584 1331Q449 1331 373 1273T297 1112Q297 1036 325 988T419 899T623 809Q853 727 939 633T1026 389Z" />
-<glyph unicode="T" glyph-name="T" horiz-adv-x="1133" d="M651 0H481V1311H18V1462H1114V1311H651V0Z" />
-<glyph unicode="U" glyph-name="U" horiz-adv-x="1491" d="M1305 1462V516Q1305 266 1154 123T739 -20Q475 -20 331 124T186 520V1462H356V508Q356 325 456 227T750 129Q935 129 1035 227T1135 510V1462H1305Z" />
-<glyph unicode="V" glyph-name="V" horiz-adv-x="1219" d="M1036 1462H1219L692 0H524L0 1462H180L516 516Q574 353 608 199Q644 361 702 522L1036 1462Z" />
-<glyph unicode="W" glyph-name="W" horiz-adv-x="1896" d="M1477 0H1309L1014 979Q993 1044 967 1143T940 1262Q918 1130 870 973L584 0H416L27 1462H207L438 559Q486 369 508 215Q535 398 588 573L850 1462H1030L1305 565Q1353 410 1386 215Q1405 357 1458 561L1688
-1462H1868L1477 0Z" />
-<glyph unicode="X" glyph-name="X" horiz-adv-x="1182" d="M1174 0H981L588 643L188 0H8L494 764L41 1462H229L592 883L958 1462H1139L686 770L1174 0Z" />
-<glyph unicode="Y" glyph-name="Y" horiz-adv-x="1147" d="M573 731L963 1462H1147L659 567V0H487V559L0 1462H186L573 731Z" />
-<glyph unicode="Z" glyph-name="Z" horiz-adv-x="1169" d="M1087 0H82V133L858 1309H106V1462H1065V1329L289 154H1087V0Z" />
-<glyph unicode="[" glyph-name="bracketleft" horiz-adv-x="674" d="M623 -324H166V1462H623V1321H334V-182H623V-324Z" />
-<glyph unicode="\" glyph-name="backslash" horiz-adv-x="752" d="M186 1462L733 0H567L23 1462H186Z" />
-<glyph unicode="]" glyph-name="bracketright" horiz-adv-x="674" d="M51 -182H340V1321H51V1462H508V-324H51V-182Z" />
-<glyph unicode="^" glyph-name="asciicircum" horiz-adv-x="1110" d="M49 551L483 1473H582L1059 551H907L535 1296L201 551H49Z" />
-<glyph unicode="_" glyph-name="underscore" horiz-adv-x="918" d="M922 -315H-4V-184H922V-315Z" />
-<glyph unicode="`" glyph-name="grave" horiz-adv-x="1182" d="M786 1241H676Q611 1293 522 1389T393 1548V1569H596Q628 1500 685 1410T786 1266V1241Z" />
-<glyph unicode="a" glyph-name="a" horiz-adv-x="1139" d="M850 0L817 156H809Q727 53 646 17T442 -20Q279 -20 187 64T94 303Q94 635 625 651L811 657V725Q811 854 756 915T578 977Q441 977 268 893L217 1020Q298 1064 394 1089T588 1114Q784 1114 878 1027T973
-748V0H850ZM475 117Q630 117 718 202T807 440V539L641 532Q443 525 356 471T268 301Q268 211 322 164T475 117Z" />
-<glyph unicode="b" glyph-name="b" horiz-adv-x="1255" d="M686 1114Q902 1114 1021 967T1141 549Q1141 279 1021 130T686 -20Q579 -20 491 19T342 141H330L295 0H176V1556H342V1178Q342 1051 334 950H342Q458 1114 686 1114ZM662 975Q492 975 417 878T342 549Q342
-318 419 219T666 119Q819 119 894 230T969 551Q969 765 894 870T662 975Z" />
-<glyph unicode="c" glyph-name="c" horiz-adv-x="975" d="M614 -20Q376 -20 246 126T115 541Q115 816 247 966T625 1116Q704 1116 783 1099T907 1059L856 918Q801 940 736 954T621 969Q287 969 287 543Q287 341 368 233T610 125Q747 125 891 184V37Q781 -20 614 -20Z" />
-<glyph unicode="d" glyph-name="d" horiz-adv-x="1255" d="M922 147H913Q798 -20 569 -20Q354 -20 235 127T115 545Q115 816 235 966T569 1116Q792 1116 911 954H924L917 1033L913 1110V1556H1079V0H944L922 147ZM590 119Q760 119 836 211T913 510V545Q913 778
-836 877T588 977Q442 977 365 864T287 543Q287 333 364 226T590 119Z" />
-<glyph unicode="e" glyph-name="e" horiz-adv-x="1149" d="M639 -20Q396 -20 256 128T115 539Q115 804 245 960T596 1116Q802 1116 922 981T1042 623V518H287Q292 325 384 225T645 125Q822 125 995 199V51Q907 13 829 -3T639 -20ZM594 977Q462 977 384 891T291
-653H864Q864 810 794 893T594 977Z" />
-<glyph unicode="f" glyph-name="f" horiz-adv-x="694" d="M670 967H391V0H225V967H29V1042L225 1102V1163Q225 1567 578 1567Q665 1567 782 1532L739 1399Q643 1430 575 1430Q481 1430 436 1368T391 1167V1096H670V967Z" />
-<glyph unicode="g" glyph-name="g" horiz-adv-x="1122" d="M1073 1096V991L870 967Q898 932 920 876T942 748Q942 587 832 491T530 395Q481 395 438 403Q332 347 332 262Q332 217 369 196T496 174H690Q868 174 963 99T1059 -119Q1059 -301 913 -396T487 -492Q272
--492 156 -412T39 -186Q39 -86 103 -13T283 86Q241 105 213 145T184 238Q184 298 216 343T317 430Q232 465 179 549T125 741Q125 921 233 1018T539 1116Q625 1116 694 1096H1073ZM199 -184Q199 -273 274 -319T489 -365Q698 -365 798 -303T899 -133Q899 -44 844
--10T637 25H438Q325 25 262 -29T199 -184ZM289 745Q289 630 354 571T535 512Q778 512 778 748Q778 995 532 995Q415 995 352 932T289 745Z" />
-<glyph unicode="h" glyph-name="h" horiz-adv-x="1257" d="M926 0V709Q926 843 865 909T674 975Q501 975 422 881T342 573V0H176V1556H342V1085Q342 1000 334 944H344Q393 1023 483 1068T690 1114Q891 1114 991 1019T1092 715V0H926Z" />
-<glyph unicode="i" glyph-name="i" horiz-adv-x="518" d="M342 0H176V1096H342V0ZM162 1393Q162 1450 190 1476T260 1503Q300 1503 329 1476T358 1393Q358 1337 329 1310T260 1282Q218 1282 190 1309T162 1393Z" />
-<glyph unicode="j" glyph-name="j" horiz-adv-x="518" d="M43 -492Q-52 -492 -111 -467V-332Q-42 -352 25 -352Q103 -352 139 -310T176 -180V1096H342V-168Q342 -492 43 -492ZM162 1393Q162 1450 190 1476T260 1503Q300 1503 329 1476T358 1393Q358 1337 329 1310T260
-1282Q218 1282 190 1309T162 1393Z" />
-<glyph unicode="k" glyph-name="k" horiz-adv-x="1075" d="M340 561Q383 622 471 721L825 1096H1022L578 629L1053 0H852L465 518L340 410V0H176V1556H340V731Q340 676 332 561H340Z" />
-<glyph unicode="l" glyph-name="l" horiz-adv-x="518" d="M342 0H176V1556H342V0Z" />
-<glyph unicode="m" glyph-name="m" horiz-adv-x="1905" d="M1573 0V713Q1573 844 1517 909T1343 975Q1188 975 1114 886T1040 612V0H874V713Q874 844 818 909T643 975Q487 975 415 882T342 575V0H176V1096H311L338 946H346Q393 1026 478 1071T670 1116Q927 1116
-1006 930H1014Q1063 1016 1156 1066T1368 1116Q1554 1116 1646 1021T1739 715V0H1573Z" />
-<glyph unicode="n" glyph-name="n" horiz-adv-x="1257" d="M926 0V709Q926 843 865 909T674 975Q502 975 422 882T342 575V0H176V1096H311L338 946H346Q397 1027 489 1071T694 1116Q892 1116 992 1021T1092 715V0H926Z" />
-<glyph unicode="o" glyph-name="o" horiz-adv-x="1237" d="M1122 549Q1122 281 987 131T614 -20Q467 -20 353 49T177 247T115 549Q115 817 249 966T621 1116Q851 1116 986 963T1122 549ZM287 549Q287 339 371 229T618 119Q781 119 865 228T950 549Q950 758 866
-866T616 975Q453 975 370 868T287 549Z" />
-<glyph unicode="p" glyph-name="p" horiz-adv-x="1255" d="M686 -20Q579 -20 491 19T342 141H330Q342 45 342 -41V-492H176V1096H311L334 946H342Q406 1036 491 1076T686 1116Q904 1116 1022 967T1141 549Q1141 279 1021 130T686 -20ZM662 975Q494 975 419 882T342
-586V549Q342 318 419 219T666 119Q808 119 888 234T969 551Q969 756 889 865T662 975Z" />
-<glyph unicode="q" glyph-name="q" horiz-adv-x="1255" d="M590 119Q756 119 832 208T913 508V545Q913 775 835 876T588 977Q442 977 365 864T287 543Q287 336 363 228T590 119ZM565 -20Q353 -20 234 129T115 545Q115 814 235 965T569 1116Q794 1116 915 946H924L948
-1096H1079V-492H913V-23Q913 77 924 147H911Q796 -20 565 -20Z" />
-<glyph unicode="r" glyph-name="r" horiz-adv-x="836" d="M676 1116Q749 1116 807 1104L784 950Q716 965 664 965Q531 965 437 857T342 588V0H176V1096H313L332 893H340Q401 1000 487 1058T676 1116Z" />
-<glyph unicode="s" glyph-name="s" horiz-adv-x="977" d="M883 299Q883 146 769 63T449 -20Q231 -20 109 49V203Q188 163 278 140T453 117Q583 117 653 158T723 285Q723 349 668 394T451 502Q298 559 234 601T138 698T106 827Q106 961 215 1038T514 1116Q691 1116
-860 1044L801 909Q636 977 502 977Q384 977 324 940T264 838Q264 794 286 763T359 704T551 623Q746 552 814 480T883 299Z" />
-<glyph unicode="t" glyph-name="t" horiz-adv-x="723" d="M530 117Q574 117 615 123T680 137V10Q653 -3 601 -11T506 -20Q188 -20 188 315V967H31V1047L188 1116L258 1350H354V1096H672V967H354V322Q354 223 401 170T530 117Z" />
-<glyph unicode="u" glyph-name="u" horiz-adv-x="1257" d="M332 1096V385Q332 251 393 185T584 119Q756 119 835 213T915 520V1096H1081V0H944L920 147H911Q860 66 770 23T563 -20Q363 -20 264 75T164 379V1096H332Z" />
-<glyph unicode="v" glyph-name="v" horiz-adv-x="1026" d="M416 0L0 1096H178L414 446Q494 218 508 150H516Q527 203 585 369T848 1096H1026L610 0H416Z" />
-<glyph unicode="w" glyph-name="w" horiz-adv-x="1593" d="M1071 0L870 643Q851 702 799 911H791Q751 736 721 641L514 0H322L23 1096H197Q303 683 358 467T422 176H430Q441 233 465 323T508 467L709 1096H889L1085 467Q1141 295 1161 178H1169Q1173 214 1190
-289T1399 1096H1571L1268 0H1071Z" />
-<glyph unicode="x" glyph-name="x" horiz-adv-x="1073" d="M440 561L59 1096H248L537 676L825 1096H1012L631 561L1032 0H844L537 444L227 0H39L440 561Z" />
-<glyph unicode="y" glyph-name="y" horiz-adv-x="1032" d="M2 1096H180L420 471Q499 257 518 162H526Q539 213 580 336T852 1096H1030L559 -152Q489 -337 396 -414T166 -492Q90 -492 16 -475V-342Q71 -354 139 -354Q310 -354 383 -162L444 -6L2 1096Z" />
-<glyph unicode="z" glyph-name="z" horiz-adv-x="958" d="M877 0H82V113L680 967H119V1096H862V967L272 129H877V0Z" />
-<glyph unicode="{" glyph-name="braceleft" horiz-adv-x="776" d="M475 12Q475 -90 533 -136T705 -184V-324Q515 -322 411 -237T307 2V305Q307 409 244 453T61 498V639Q191 641 249 687T307 829V1135Q307 1290 415 1376T705 1462V1323Q475 1317 475 1124V829Q475
-614 252 575V563Q475 524 475 309V12Z" />
-<glyph unicode="|" glyph-name="bar" horiz-adv-x="1128" d="M494 1556H635V-496H494V1556Z" />
-<glyph unicode="}" glyph-name="braceright" horiz-adv-x="776" d="M522 575Q299 614 299 829V1124Q299 1317 72 1323V1462Q256 1462 361 1375T467 1135V829Q467 732 526 687T715 639V498Q593 498 530 454T467 305V2Q467 -151 365 -236T72 -324V-184Q183 -182
-241 -136T299 12V309Q299 423 354 483T522 563V575Z" />
-<glyph unicode="~" glyph-name="asciitilde" horiz-adv-x="1171" d="M338 713Q285 713 222 680T104 592V743Q204 852 348 852Q416 852 472 838T618 786Q684 758 733 745T829 731Q883 731 947 763T1065 852V702Q963 592 821 592Q749 592 686 608T551 657Q476 689
-431 701T338 713Z" />
-<glyph unicode="&#xa0;" glyph-name="nbspace" horiz-adv-x="532" />
-<glyph unicode="&#xa1;" glyph-name="exclamdown" horiz-adv-x="547" d="M219 684H324L375 -373H168L219 684ZM393 983Q393 848 272 848Q212 848 182 883T152 983Q152 1046 183 1082T272 1118Q323 1118 358 1086T393 983Z" />
-<glyph unicode="&#xa2;" glyph-name="cent" horiz-adv-x="1171" d="M971 240Q866 186 719 180V-20H586V186Q383 218 287 354T190 741Q190 1249 586 1311V1483H721V1319Q796 1316 867 1300T987 1260L938 1120Q805 1171 696 1171Q524 1171 443 1066T362 743Q362
-531 441 430T688 328Q829 328 971 387V240Z" />
-<glyph unicode="&#xa3;" glyph-name="sterling" horiz-adv-x="1171" d="M682 1481Q872 1481 1042 1397L981 1264Q827 1341 684 1341Q561 1341 499 1279T436 1077V782H858V655H436V434Q436 334 404 266T297 154H1092V0H63V141Q268 188 268 432V655H70V782H268V1098Q268
-1276 380 1378T682 1481Z" />
-<glyph unicode="&#xa4;" glyph-name="currency" horiz-adv-x="1171" d="M184 723Q184 845 258 952L123 1092L217 1184L352 1051Q456 1124 586 1124Q713 1124 815 1051L952 1184L1047 1092L913 954Q987 841 987 723Q987 592 913 489L1044 354L952 262L815 395Q713
-324 586 324Q452 324 352 397L217 264L125 356L258 492Q184 599 184 723ZM313 723Q313 611 391 531T586 451Q702 451 781 530T860 723Q860 837 780 918T586 999Q470 999 392 917T313 723Z" />
-<glyph unicode="&#xa5;" glyph-name="yen" horiz-adv-x="1171" d="M584 735L963 1462H1137L721 692H983V565H666V395H983V268H666V0H502V268H186V395H502V565H186V692H442L31 1462H209L584 735Z" />
-<glyph unicode="&#xa6;" glyph-name="brokenbar" horiz-adv-x="1128" d="M494 1556H635V780H494V1556ZM494 281H635V-496H494V281Z" />
-<glyph unicode="&#xa7;" glyph-name="section" horiz-adv-x="1057" d="M139 809Q139 895 182 963T303 1069Q229 1109 187 1164T145 1305Q145 1426 248 1495T549 1565Q643 1565 722 1551T899 1497L846 1366Q748 1405 681 1418T537 1432Q421 1432 363 1403T305 1309Q305
-1249 366 1207T582 1110Q768 1042 843 967T918 784Q918 694 877 624T762 512Q915 431 915 285Q915 145 798 69T469 -8Q251 -8 123 57V205Q201 168 298 146T477 123Q611 123 681 161T752 270Q752 316 728 345T650 403T481 475Q339 527 272 572T172 674T139 809ZM285
-829Q285 752 351 700T584 586L633 567Q770 647 770 758Q770 841 697 897T438 1010Q370 991 328 941T285 829Z" />
-<glyph unicode="&#xa8;" glyph-name="dieresis" horiz-adv-x="1182" d="M309 1393Q309 1445 335 1468T399 1491Q437 1491 464 1468T492 1393Q492 1343 465 1319T399 1294Q362 1294 336 1318T309 1393ZM690 1393Q690 1445 716 1468T780 1491Q817 1491 844 1468T872
-1393Q872 1343 845 1319T780 1294Q743 1294 717 1318T690 1393Z" />
-<glyph unicode="&#xa9;" glyph-name="copyright" horiz-adv-x="1704" d="M893 1059Q768 1059 701 972T633 731Q633 563 696 482T891 401Q977 401 1102 446V322Q1054 302 1004 288T883 274Q689 274 585 394T481 731Q481 940 591 1063T893 1186Q1021 1186 1139 1126L1081
-1008Q973 1059 893 1059ZM100 731Q100 931 200 1106T475 1382T852 1483Q1052 1483 1227 1383T1503 1108T1604 731Q1604 534 1507 361T1235 84T852 -20Q645 -20 470 83T198 360T100 731ZM205 731Q205 558 292 408T529 171T852 84Q1026 84 1175 171T1411 406T1499
-731Q1499 905 1412 1054T1177 1290T852 1378Q678 1378 529 1291T293 1056T205 731Z" />
-<glyph unicode="&#xaa;" glyph-name="ordfeminine" horiz-adv-x="725" d="M532 801L508 885Q416 788 276 788Q181 788 126 837T70 989Q70 1091 147 1143T389 1202L506 1206V1245Q506 1378 358 1378Q258 1378 154 1327L111 1423Q225 1479 358 1479Q488 1479 556
-1427T625 1253V801H532ZM193 989Q193 889 305 889Q506 889 506 1069V1118L408 1114Q296 1110 245 1082T193 989Z" />
-<glyph unicode="&#xab;" glyph-name="guillemotleft" horiz-adv-x="1018" d="M82 551L424 958L543 889L254 539L543 188L424 117L82 524V551ZM477 551L821 958L938 889L651 539L938 188L821 117L477 524V551Z" />
-<glyph unicode="&#xac;" glyph-name="logicalnot" horiz-adv-x="1171" d="M1065 791V264H928V653H104V791H1065Z" />
-<glyph unicode="&#xad;" glyph-name="uni00AD" horiz-adv-x="659" d="M84 473V625H575V473H84Z" />
-<glyph unicode="&#xae;" glyph-name="registered" horiz-adv-x="1704" d="M723 762H831Q911 762 959 803T1008 909Q1008 984 965 1016T829 1049H723V762ZM1157 913Q1157 833 1115 772T995 680L1233 285H1065L858 639H723V285H575V1176H836Q1002 1176 1079 1111T1157
-913ZM100 731Q100 931 200 1106T475 1382T852 1483Q1052 1483 1227 1383T1503 1108T1604 731Q1604 534 1507 361T1235 84T852 -20Q645 -20 470 83T198 360T100 731ZM205 731Q205 558 292 408T529 171T852 84Q1026 84 1175 171T1411 406T1499 731Q1499 905 1412
-1054T1177 1290T852 1378Q678 1378 529 1291T293 1056T205 731Z" />
-<glyph unicode="&#xaf;" glyph-name="overscore" horiz-adv-x="1024" d="M1030 1556H-6V1683H1030V1556Z" />
-<glyph unicode="&#xb0;" glyph-name="degree" horiz-adv-x="877" d="M127 1171Q127 1301 217 1392T438 1483Q568 1483 659 1393T750 1171Q750 1087 709 1016T595 902T438 860Q308 860 218 950T127 1171ZM242 1171Q242 1089 300 1032T440 975Q520 975 577 1031T635
-1171Q635 1255 579 1311T440 1368Q357 1368 300 1311T242 1171Z" />
-<glyph unicode="&#xb1;" glyph-name="plusminus" horiz-adv-x="1171" d="M653 791H1065V653H653V227H514V653H104V791H514V1219H653V791ZM104 1V139H1065V1H104Z" />
-<glyph unicode="&#xb2;" glyph-name="twosuperior" horiz-adv-x="711" d="M653 586H49V690L285 920Q374 1006 415 1054T472 1141T489 1233Q489 1301 449 1335T346 1370Q294 1370 245 1351T127 1282L61 1370Q192 1481 344 1481Q476 1481 549 1416T623 1239Q623
-1159 579 1084T387 870L213 705H653V586Z" />
-<glyph unicode="&#xb3;" glyph-name="threesuperior" horiz-adv-x="711" d="M627 1255Q627 1175 586 1124T477 1049Q653 1002 653 840Q653 712 561 641T301 569Q149 569 33 625V748Q180 680 303 680Q514 680 514 842Q514 987 283 987H166V1094H285Q388 1094 437
-1133T487 1241Q487 1302 447 1336T340 1370Q274 1370 218 1349T106 1292L37 1382Q100 1427 170 1454T334 1481Q470 1481 548 1422T627 1255Z" />
-<glyph unicode="&#xb4;" glyph-name="acute" horiz-adv-x="1182" d="M393 1266Q441 1328 496 1416T584 1569H786V1548Q742 1483 655 1388T504 1241H393V1266Z" />
-<glyph unicode="&#xb5;" glyph-name="mu" horiz-adv-x="1268" d="M342 381Q342 119 596 119Q767 119 846 213T926 520V1096H1092V0H956L930 147H920Q809 -20 580 -20Q430 -20 342 72H332Q342 -12 342 -172V-492H176V1096H342V381Z" />
-<glyph unicode="&#xb6;" glyph-name="paragraph" horiz-adv-x="1341" d="M1120 -260H1006V1452H793V-260H678V559Q616 541 532 541Q316 541 215 666T113 1042Q113 1302 222 1429T563 1556H1120V-260Z" />
-<glyph unicode="&#xb7;" glyph-name="middot" horiz-adv-x="545" d="M152 723Q152 789 183 823T270 858Q328 858 360 824T393 723Q393 658 360 623T270 588Q219 588 186 619T152 723Z" />
-<glyph unicode="&#xb8;" glyph-name="cedilla" horiz-adv-x="465" d="M436 -289Q436 -386 360 -439T133 -492Q82 -492 37 -483V-377Q82 -385 141 -385Q220 -385 260 -365T301 -291Q301 -248 262 -222T113 -178L201 0H311L256 -115Q436 -154 436 -289Z" />
-<glyph unicode="&#xb9;" glyph-name="onesuperior" horiz-adv-x="711" d="M338 1462H481V586H348V1165Q348 1256 354 1346Q332 1324 305 1302T143 1184L76 1280L338 1462Z" />
-<glyph unicode="&#xba;" glyph-name="ordmasculine" horiz-adv-x="768" d="M702 1135Q702 971 617 880T381 788Q235 788 151 881T66 1135Q66 1298 150 1388T385 1479Q537 1479 619 1388T702 1135ZM188 1135Q188 1013 233 952T383 891Q488 891 534 952T580 1135Q580
-1258 534 1317T383 1376Q280 1376 234 1317T188 1135Z" />
-<glyph unicode="&#xbb;" glyph-name="guillemotright" horiz-adv-x="1018" d="M936 524L592 117L475 188L762 539L475 889L592 958L936 551V524ZM541 524L197 117L80 188L367 539L80 889L197 958L541 551V524Z" />
-<glyph unicode="&#xbc;" glyph-name="onequarter" horiz-adv-x="1597" d="M1298 1462L395 0H252L1155 1462H1298ZM593 1462H736V586H603V1165Q603 1256 609 1346Q587 1324 560 1302T398 1184L331 1280L593 1462ZM1489 203H1364V1H1219V203H817V304L1225 883H1364V320H1489V203ZM1219
-320V515Q1219 649 1225 724Q1220 712 1208 693T1181 651T1151 606T1125 566L957 320H1219Z" />
-<glyph unicode="&#xbd;" glyph-name="onehalf" horiz-adv-x="1597" d="M1230 1462L327 0H184L1087 1462H1230ZM564 1462H707V586H574V1165Q574 1256 580 1346Q558 1324 531 1302T369 1184L302 1280L564 1462ZM1499 1H895V105L1131 335Q1220 421 1261 469T1318
-556T1335 648Q1335 716 1295 750T1192 785Q1140 785 1091 766T973 697L907 785Q1038 896 1190 896Q1322 896 1395 831T1469 654Q1469 574 1425 499T1233 285L1059 120H1499V1Z" />
-<glyph unicode="&#xbe;" glyph-name="threequarters" horiz-adv-x="1597" d="M876 1255Q876 1175 835 1124T726 1049Q902 1002 902 840Q902 712 810 641T550 569Q398 569 282 625V748Q429 680 552 680Q763 680 763 842Q763 987 532 987H415V1094H534Q637 1094
-686 1133T736 1241Q736 1302 696 1336T589 1370Q523 1370 467 1349T355 1292L286 1382Q349 1427 419 1454T583 1481Q719 1481 797 1422T876 1255ZM1390 1462L487 0H344L1247 1462H1390ZM1569 203H1444V1H1299V203H897V304L1305 883H1444V320H1569V203ZM1299 320V515Q1299
-649 1305 724Q1300 712 1288 693T1261 651T1231 606T1205 566L1037 320H1299Z" />
-<glyph unicode="&#xbf;" glyph-name="questiondown" horiz-adv-x="879" d="M590 684V633Q590 511 553 437T418 279Q297 173 267 136T224 60T211 -35Q211 -135 277 -191T465 -248Q545 -248 620 -229T793 -162L852 -297Q655 -393 457 -393Q267 -393 159 -300T51
--37Q51 33 68 85T118 182T194 268T293 356Q394 444 426 502T459 653V684H590ZM639 983Q639 848 518 848Q459 848 428 882T397 983Q397 1047 430 1082T518 1118Q569 1118 604 1086T639 983Z" />
-<glyph unicode="&#xc0;" glyph-name="Agrave" horiz-adv-x="1296" d="M1120 0L938 465H352L172 0H0L578 1468H721L1296 0H1120ZM885 618L715 1071Q682 1157 647 1282Q625 1186 584 1071L412 618H885ZM724 1579H614Q549 1631 460 1727T331 1886V1907H534Q566 1838
-623 1748T724 1604V1579Z" />
-<glyph unicode="&#xc1;" glyph-name="Aacute" horiz-adv-x="1296" d="M1120 0L938 465H352L172 0H0L578 1468H721L1296 0H1120ZM885 618L715 1071Q682 1157 647 1282Q625 1186 584 1071L412 618H885ZM526 1604Q574 1666 629 1754T717 1907H919V1886Q875 1821 788
-1726T637 1579H526V1604Z" />
-<glyph unicode="&#xc2;" glyph-name="Acircumflex" horiz-adv-x="1296" d="M1120 0L938 465H352L172 0H0L578 1468H721L1296 0H1120ZM885 618L715 1071Q682 1157 647 1282Q625 1186 584 1071L412 618H885ZM303 1602Q430 1738 481 1802T555 1907H721Q743 1865 797
-1799T977 1602V1579H858Q770 1634 637 1765Q501 1631 418 1579H303V1602Z" />
-<glyph unicode="&#xc3;" glyph-name="Atilde" horiz-adv-x="1296" d="M1120 0L938 465H352L172 0H0L578 1468H721L1296 0H1120ZM885 618L715 1071Q682 1157 647 1282Q625 1186 584 1071L412 618H885ZM792 1581Q749 1581 708 1599T628 1640T552 1681T481 1700Q431
-1700 406 1670T366 1579H268Q281 1700 338 1768T487 1837Q533 1837 576 1819T658 1778T733 1737T801 1718Q850 1718 874 1747T913 1839H1012Q999 1718 943 1650T792 1581Z" />
-<glyph unicode="&#xc4;" glyph-name="Adieresis" horiz-adv-x="1296" d="M1120 0L938 465H352L172 0H0L578 1468H721L1296 0H1120ZM885 618L715 1071Q682 1157 647 1282Q625 1186 584 1071L412 618H885ZM364 1731Q364 1783 390 1806T454 1829Q492 1829 519 1806T547
-1731Q547 1681 520 1657T454 1632Q417 1632 391 1656T364 1731ZM745 1731Q745 1783 771 1806T835 1829Q872 1829 899 1806T927 1731Q927 1681 900 1657T835 1632Q798 1632 772 1656T745 1731Z" />
-<glyph unicode="&#xc5;" glyph-name="Aring" horiz-adv-x="1296" d="M1120 0L938 465H352L172 0H0L578 1468H721L1296 0H1120ZM885 618L715 1071Q682 1157 647 1282Q625 1186 584 1071L412 618H885ZM870 1587Q870 1489 809 1430T645 1370Q544 1370 484 1428T424
-1585Q424 1683 484 1740T645 1798Q746 1798 808 1739T870 1587ZM762 1585Q762 1641 729 1671T645 1702Q594 1702 561 1672T528 1585Q528 1529 558 1499T645 1468Q697 1468 729 1498T762 1585Z" />
-<glyph unicode="&#xc6;" glyph-name="AE" horiz-adv-x="1788" d="M1665 0H915V465H401L174 0H-2L696 1462H1665V1311H1085V840H1626V690H1085V152H1665V0ZM469 618H915V1311H797L469 618Z" />
-<glyph unicode="&#xc7;" glyph-name="Ccedilla" horiz-adv-x="1292" d="M827 1331Q586 1331 447 1171T307 731Q307 444 441 288T825 131Q978 131 1174 186V37Q1022 -20 799 -20Q476 -20 301 176T125 733Q125 959 209 1129T453 1391T829 1483Q1059 1483 1231 1399L1159
-1253Q993 1331 827 1331ZM950 -289Q950 -386 874 -439T647 -492Q596 -492 551 -483V-377Q596 -385 655 -385Q734 -385 774 -365T815 -291Q815 -248 776 -222T627 -178L715 0H825L770 -115Q950 -154 950 -289Z" />
-<glyph unicode="&#xc8;" glyph-name="Egrave" horiz-adv-x="1139" d="M1016 0H201V1462H1016V1311H371V840H977V690H371V152H1016V0ZM713 1579H603Q538 1631 449 1727T320 1886V1907H523Q555 1838 612 1748T713 1604V1579Z" />
-<glyph unicode="&#xc9;" glyph-name="Eacute" horiz-adv-x="1139" d="M1016 0H201V1462H1016V1311H371V840H977V690H371V152H1016V0ZM456 1604Q504 1666 559 1754T647 1907H849V1886Q805 1821 718 1726T567 1579H456V1604Z" />
-<glyph unicode="&#xca;" glyph-name="Ecircumflex" horiz-adv-x="1139" d="M1016 0H201V1462H1016V1311H371V840H977V690H371V152H1016V0ZM263 1602Q390 1738 441 1802T515 1907H681Q703 1865 757 1799T937 1602V1579H818Q730 1634 597 1765Q461 1631 378 1579H263V1602Z" />
-<glyph unicode="&#xcb;" glyph-name="Edieresis" horiz-adv-x="1139" d="M1016 0H201V1462H1016V1311H371V840H977V690H371V152H1016V0ZM327 1731Q327 1783 353 1806T417 1829Q455 1829 482 1806T510 1731Q510 1681 483 1657T417 1632Q380 1632 354 1656T327 1731ZM708
-1731Q708 1783 734 1806T798 1829Q835 1829 862 1806T890 1731Q890 1681 863 1657T798 1632Q761 1632 735 1656T708 1731Z" />
-<glyph unicode="&#xcc;" glyph-name="Igrave" horiz-adv-x="571" d="M201 0V1462H371V0H201ZM398 1579H288Q223 1631 134 1727T5 1886V1907H208Q240 1838 297 1748T398 1604V1579Z" />
-<glyph unicode="&#xcd;" glyph-name="Iacute" horiz-adv-x="571" d="M201 0V1462H371V0H201ZM179 1604Q227 1666 282 1754T370 1907H572V1886Q528 1821 441 1726T290 1579H179V1604Z" />
-<glyph unicode="&#xce;" glyph-name="Icircumflex" horiz-adv-x="571" d="M201 0V1462H371V0H201ZM-57 1602Q70 1738 121 1802T195 1907H361Q383 1865 437 1799T617 1602V1579H498Q410 1634 277 1765Q141 1631 58 1579H-57V1602Z" />
-<glyph unicode="&#xcf;" glyph-name="Idieresis" horiz-adv-x="571" d="M201 0V1462H371V0H201ZM5 1731Q5 1783 31 1806T95 1829Q133 1829 160 1806T188 1731Q188 1681 161 1657T95 1632Q58 1632 32 1656T5 1731ZM386 1731Q386 1783 412 1806T476 1829Q513 1829
-540 1806T568 1731Q568 1681 541 1657T476 1632Q439 1632 413 1656T386 1731Z" />
-<glyph unicode="&#xd0;" glyph-name="Eth" horiz-adv-x="1479" d="M1352 745Q1352 383 1156 192T590 0H201V649H47V799H201V1462H635Q972 1462 1162 1275T1352 745ZM1171 739Q1171 1315 602 1315H371V799H750V649H371V147H561Q1171 147 1171 739Z" />
-<glyph unicode="&#xd1;" glyph-name="Ntilde" horiz-adv-x="1544" d="M1343 0H1149L350 1227H342Q358 1011 358 831V0H201V1462H393L1190 240H1198Q1196 267 1189 413T1184 623V1462H1343V0ZM935 1581Q892 1581 851 1599T771 1640T695 1681T624 1700Q574 1700
-549 1670T509 1579H411Q424 1700 481 1768T630 1837Q676 1837 719 1819T801 1778T876 1737T944 1718Q993 1718 1017 1747T1056 1839H1155Q1142 1718 1086 1650T935 1581Z" />
-<glyph unicode="&#xd2;" glyph-name="Ograve" horiz-adv-x="1595" d="M1470 733Q1470 382 1293 181T799 -20Q476 -20 301 177T125 735Q125 1092 301 1288T801 1485Q1116 1485 1293 1285T1470 733ZM305 733Q305 436 431 283T799 129Q1042 129 1166 282T1290 733Q1290
-1028 1167 1180T801 1333Q558 1333 432 1180T305 733ZM907 1579H797Q732 1631 643 1727T514 1886V1907H717Q749 1838 806 1748T907 1604V1579Z" />
-<glyph unicode="&#xd3;" glyph-name="Oacute" horiz-adv-x="1595" d="M1470 733Q1470 382 1293 181T799 -20Q476 -20 301 177T125 735Q125 1092 301 1288T801 1485Q1116 1485 1293 1285T1470 733ZM305 733Q305 436 431 283T799 129Q1042 129 1166 282T1290 733Q1290
-1028 1167 1180T801 1333Q558 1333 432 1180T305 733ZM659 1604Q707 1666 762 1754T850 1907H1052V1886Q1008 1821 921 1726T770 1579H659V1604Z" />
-<glyph unicode="&#xd4;" glyph-name="Ocircumflex" horiz-adv-x="1595" d="M1470 733Q1470 382 1293 181T799 -20Q476 -20 301 177T125 735Q125 1092 301 1288T801 1485Q1116 1485 1293 1285T1470 733ZM305 733Q305 436 431 283T799 129Q1042 129 1166 282T1290
-733Q1290 1028 1167 1180T801 1333Q558 1333 432 1180T305 733ZM448 1602Q575 1738 626 1802T700 1907H866Q888 1865 942 1799T1122 1602V1579H1003Q915 1634 782 1765Q646 1631 563 1579H448V1602Z" />
-<glyph unicode="&#xd5;" glyph-name="Otilde" horiz-adv-x="1595" d="M1470 733Q1470 382 1293 181T799 -20Q476 -20 301 177T125 735Q125 1092 301 1288T801 1485Q1116 1485 1293 1285T1470 733ZM305 733Q305 436 431 283T799 129Q1042 129 1166 282T1290 733Q1290
-1028 1167 1180T801 1333Q558 1333 432 1180T305 733ZM942 1581Q899 1581 858 1599T778 1640T702 1681T631 1700Q581 1700 556 1670T516 1579H418Q431 1700 488 1768T637 1837Q683 1837 726 1819T808 1778T883 1737T951 1718Q1000 1718 1024 1747T1063 1839H1162Q1149
-1718 1093 1650T942 1581Z" />
-<glyph unicode="&#xd6;" glyph-name="Odieresis" horiz-adv-x="1595" d="M1470 733Q1470 382 1293 181T799 -20Q476 -20 301 177T125 735Q125 1092 301 1288T801 1485Q1116 1485 1293 1285T1470 733ZM305 733Q305 436 431 283T799 129Q1042 129 1166 282T1290
-733Q1290 1028 1167 1180T801 1333Q558 1333 432 1180T305 733ZM522 1731Q522 1783 548 1806T612 1829Q650 1829 677 1806T705 1731Q705 1681 678 1657T612 1632Q575 1632 549 1656T522 1731ZM903 1731Q903 1783 929 1806T993 1829Q1030 1829 1057 1806T1085 1731Q1085
-1681 1058 1657T993 1632Q956 1632 930 1656T903 1731Z" />
-<glyph unicode="&#xd7;" glyph-name="multiply" horiz-adv-x="1171" d="M940 1176L1036 1077L684 723L1034 371L938 272L584 623L236 272L135 371L485 723L133 1075L233 1176L586 821L940 1176Z" />
-<glyph unicode="&#xd8;" glyph-name="Oslash" horiz-adv-x="1595" d="M1470 733Q1470 382 1293 181T799 -20Q564 -20 416 80L315 -61L195 18L303 172Q125 370 125 735Q125 1092 301 1288T801 1485Q1010 1485 1167 1391L1264 1526L1384 1446L1278 1298Q1470 1096
-1470 733ZM1290 733Q1290 1005 1180 1159L508 211Q623 129 799 129Q1042 129 1166 282T1290 733ZM305 733Q305 471 406 317L1075 1260Q969 1333 801 1333Q558 1333 432 1180T305 733Z" />
-<glyph unicode="&#xd9;" glyph-name="Ugrave" horiz-adv-x="1491" d="M1305 1462V516Q1305 266 1154 123T739 -20Q475 -20 331 124T186 520V1462H356V508Q356 325 456 227T750 129Q935 129 1035 227T1135 510V1462H1305ZM856 1579H746Q681 1631 592 1727T463 1886V1907H666Q698
-1838 755 1748T856 1604V1579Z" />
-<glyph unicode="&#xda;" glyph-name="Uacute" horiz-adv-x="1491" d="M1305 1462V516Q1305 266 1154 123T739 -20Q475 -20 331 124T186 520V1462H356V508Q356 325 456 227T750 129Q935 129 1035 227T1135 510V1462H1305ZM600 1604Q648 1666 703 1754T791 1907H993V1886Q949
-1821 862 1726T711 1579H600V1604Z" />
-<glyph unicode="&#xdb;" glyph-name="Ucircumflex" horiz-adv-x="1491" d="M1305 1462V516Q1305 266 1154 123T739 -20Q475 -20 331 124T186 520V1462H356V508Q356 325 456 227T750 129Q935 129 1035 227T1135 510V1462H1305ZM393 1602Q520 1738 571 1802T645
-1907H811Q833 1865 887 1799T1067 1602V1579H948Q860 1634 727 1765Q591 1631 508 1579H393V1602Z" />
-<glyph unicode="&#xdc;" glyph-name="Udieresis" horiz-adv-x="1491" d="M1305 1462V516Q1305 266 1154 123T739 -20Q475 -20 331 124T186 520V1462H356V508Q356 325 456 227T750 129Q935 129 1035 227T1135 510V1462H1305ZM461 1731Q461 1783 487 1806T551 1829Q589
-1829 616 1806T644 1731Q644 1681 617 1657T551 1632Q514 1632 488 1656T461 1731ZM842 1731Q842 1783 868 1806T932 1829Q969 1829 996 1806T1024 1731Q1024 1681 997 1657T932 1632Q895 1632 869 1656T842 1731Z" />
-<glyph unicode="&#xdd;" glyph-name="Yacute" horiz-adv-x="1147" d="M573 731L963 1462H1147L659 567V0H487V559L0 1462H186L573 731ZM442 1604Q490 1666 545 1754T633 1907H835V1886Q791 1821 704 1726T553 1579H442V1604Z" />
-<glyph unicode="&#xde;" glyph-name="Thorn" horiz-adv-x="1251" d="M1145 784Q1145 557 994 438T555 319H371V0H201V1462H371V1206H586Q867 1206 1006 1103T1145 784ZM371 465H539Q765 465 866 536T967 772Q967 921 872 990T575 1059H371V465Z" />
-<glyph unicode="&#xdf;" glyph-name="germandbls" horiz-adv-x="1274" d="M1049 1266Q1049 1131 906 1016Q818 946 790 913T762 846Q762 814 775 793T824 744T938 664Q1078 569 1129 491T1180 311Q1180 151 1083 66T807 -20Q619 -20 512 49V203Q575 164 653 141T803
-117Q1018 117 1018 299Q1018 374 977 427T825 551Q698 633 650 694T602 840Q602 903 636 956T742 1062Q817 1119 849 1164T881 1262Q881 1342 813 1384T618 1427Q342 1427 342 1204V0H176V1202Q176 1380 286 1473T618 1567Q824 1567 936 1489T1049 1266Z" />
-<glyph unicode="&#xe0;" glyph-name="agrave" horiz-adv-x="1139" d="M850 0L817 156H809Q727 53 646 17T442 -20Q279 -20 187 64T94 303Q94 635 625 651L811 657V725Q811 854 756 915T578 977Q441 977 268 893L217 1020Q298 1064 394 1089T588 1114Q784 1114
-878 1027T973 748V0H850ZM475 117Q630 117 718 202T807 440V539L641 532Q443 525 356 471T268 301Q268 211 322 164T475 117ZM928 1241H818Q753 1293 664 1389T535 1548V1569H738Q770 1500 827 1410T928 1266V1241Z" />
-<glyph unicode="&#xe1;" glyph-name="aacute" horiz-adv-x="1139" d="M850 0L817 156H809Q727 53 646 17T442 -20Q279 -20 187 64T94 303Q94 635 625 651L811 657V725Q811 854 756 915T578 977Q441 977 268 893L217 1020Q298 1064 394 1089T588 1114Q784 1114
-878 1027T973 748V0H850ZM475 117Q630 117 718 202T807 440V539L641 532Q443 525 356 471T268 301Q268 211 322 164T475 117ZM436 1266Q484 1328 539 1416T627 1569H829V1548Q785 1483 698 1388T547 1241H436V1266Z" />
-<glyph unicode="&#xe2;" glyph-name="acircumflex" horiz-adv-x="1139" d="M850 0L817 156H809Q727 53 646 17T442 -20Q279 -20 187 64T94 303Q94 635 625 651L811 657V725Q811 854 756 915T578 977Q441 977 268 893L217 1020Q298 1064 394 1089T588 1114Q784
-1114 878 1027T973 748V0H850ZM475 117Q630 117 718 202T807 440V539L641 532Q443 525 356 471T268 301Q268 211 322 164T475 117ZM484 1264Q611 1400 662 1464T736 1569H902Q924 1527 978 1461T1158 1264V1241H1039Q951 1296 818 1427Q682 1293 599 1241H484V1264Z"
-/>
-<glyph unicode="&#xe3;" glyph-name="atilde" horiz-adv-x="1139" d="M850 0L817 156H809Q727 53 646 17T442 -20Q279 -20 187 64T94 303Q94 635 625 651L811 657V725Q811 854 756 915T578 977Q441 977 268 893L217 1020Q298 1064 394 1089T588 1114Q784 1114
-878 1027T973 748V0H850ZM475 117Q630 117 718 202T807 440V539L641 532Q443 525 356 471T268 301Q268 211 322 164T475 117ZM977 1243Q934 1243 893 1261T813 1302T737 1343T666 1362Q616 1362 591 1332T551 1241H453Q466 1362 523 1430T672 1499Q718 1499 761
-1481T843 1440T918 1399T986 1380Q1035 1380 1059 1409T1098 1501H1197Q1184 1380 1128 1312T977 1243Z" />
-<glyph unicode="&#xe4;" glyph-name="adieresis" horiz-adv-x="1139" d="M850 0L817 156H809Q727 53 646 17T442 -20Q279 -20 187 64T94 303Q94 635 625 651L811 657V725Q811 854 756 915T578 977Q441 977 268 893L217 1020Q298 1064 394 1089T588 1114Q784 1114
-878 1027T973 748V0H850ZM475 117Q630 117 718 202T807 440V539L641 532Q443 525 356 471T268 301Q268 211 322 164T475 117ZM535 1393Q535 1445 561 1468T625 1491Q663 1491 690 1468T718 1393Q718 1343 691 1319T625 1294Q588 1294 562 1318T535 1393ZM916 1393Q916
-1445 942 1468T1006 1491Q1043 1491 1070 1468T1098 1393Q1098 1343 1071 1319T1006 1294Q969 1294 943 1318T916 1393Z" />
-<glyph unicode="&#xe5;" glyph-name="aring" horiz-adv-x="1139" d="M850 0L817 156H809Q727 53 646 17T442 -20Q279 -20 187 64T94 303Q94 635 625 651L811 657V725Q811 854 756 915T578 977Q441 977 268 893L217 1020Q298 1064 394 1089T588 1114Q784 1114 878
-1027T973 748V0H850ZM475 117Q630 117 718 202T807 440V539L641 532Q443 525 356 471T268 301Q268 211 322 164T475 117ZM1060 1458Q1060 1360 999 1301T835 1241Q734 1241 674 1299T614 1456Q614 1554 674 1611T835 1669Q936 1669 998 1610T1060 1458ZM952 1456Q952
-1512 919 1542T835 1573Q784 1573 751 1543T718 1456Q718 1400 748 1370T835 1339Q887 1339 919 1369T952 1456Z" />
-<glyph unicode="&#xe6;" glyph-name="ae" horiz-adv-x="1757" d="M94 303Q94 464 218 553T596 651L780 657V725Q780 854 722 915T545 977Q401 977 238 893L186 1020Q260 1061 359 1087T557 1114Q687 1114 769 1071T893 932Q946 1020 1031 1068T1227 1116Q1419
-1116 1535 983T1651 627V520H950Q958 125 1272 125Q1363 125 1441 142T1604 199V51Q1518 13 1444 -3T1268 -20Q979 -20 854 213Q773 86 675 33T442 -20Q279 -20 187 65T94 303ZM268 301Q268 206 321 162T463 117Q608 117 692 201T776 440V539L618 532Q432 524 350
-470T268 301ZM1225 977Q1104 977 1035 894T954 653H1473Q1473 809 1409 893T1225 977Z" />
-<glyph unicode="&#xe7;" glyph-name="ccedilla" horiz-adv-x="975" d="M614 -20Q376 -20 246 126T115 541Q115 816 247 966T625 1116Q704 1116 783 1099T907 1059L856 918Q801 940 736 954T621 969Q287 969 287 543Q287 341 368 233T610 125Q747 125 891 184V37Q781
--20 614 -20ZM762 -289Q762 -386 686 -439T459 -492Q408 -492 363 -483V-377Q408 -385 467 -385Q546 -385 586 -365T627 -291Q627 -248 588 -222T439 -178L527 0H637L582 -115Q762 -154 762 -289Z" />
-<glyph unicode="&#xe8;" glyph-name="egrave" horiz-adv-x="1149" d="M639 -20Q396 -20 256 128T115 539Q115 804 245 960T596 1116Q802 1116 922 981T1042 623V518H287Q292 325 384 225T645 125Q822 125 995 199V51Q907 13 829 -3T639 -20ZM594 977Q462 977 384
-891T291 653H864Q864 810 794 893T594 977ZM967 1241H857Q792 1293 703 1389T574 1548V1569H777Q809 1500 866 1410T967 1266V1241Z" />
-<glyph unicode="&#xe9;" glyph-name="eacute" horiz-adv-x="1149" d="M639 -20Q396 -20 256 128T115 539Q115 804 245 960T596 1116Q802 1116 922 981T1042 623V518H287Q292 325 384 225T645 125Q822 125 995 199V51Q907 13 829 -3T639 -20ZM594 977Q462 977 384
-891T291 653H864Q864 810 794 893T594 977ZM471 1266Q519 1328 574 1416T662 1569H864V1548Q820 1483 733 1388T582 1241H471V1266Z" />
-<glyph unicode="&#xea;" glyph-name="ecircumflex" horiz-adv-x="1149" d="M639 -20Q396 -20 256 128T115 539Q115 804 245 960T596 1116Q802 1116 922 981T1042 623V518H287Q292 325 384 225T645 125Q822 125 995 199V51Q907 13 829 -3T639 -20ZM594 977Q462
-977 384 891T291 653H864Q864 810 794 893T594 977ZM515 1264Q642 1400 693 1464T767 1569H933Q955 1527 1009 1461T1189 1264V1241H1070Q982 1296 849 1427Q713 1293 630 1241H515V1264Z" />
-<glyph unicode="&#xeb;" glyph-name="edieresis" horiz-adv-x="1149" d="M639 -20Q396 -20 256 128T115 539Q115 804 245 960T596 1116Q802 1116 922 981T1042 623V518H287Q292 325 384 225T645 125Q822 125 995 199V51Q907 13 829 -3T639 -20ZM594 977Q462 977
-384 891T291 653H864Q864 810 794 893T594 977ZM319 1393Q319 1445 345 1468T409 1491Q447 1491 474 1468T502 1393Q502 1343 475 1319T409 1294Q372 1294 346 1318T319 1393ZM700 1393Q700 1445 726 1468T790 1491Q827 1491 854 1468T882 1393Q882 1343 855 1319T790
-1294Q753 1294 727 1318T700 1393Z" />
-<glyph unicode="&#xec;" glyph-name="igrave" horiz-adv-x="518" d="M342 0H176V1096H342V0ZM355 1241H245Q180 1293 91 1389T-38 1548V1569H165Q197 1500 254 1410T355 1266V1241Z" />
-<glyph unicode="&#xed;" glyph-name="iacute" horiz-adv-x="518" d="M342 0H176V1096H342V0ZM169 1266Q217 1328 272 1416T360 1569H562V1548Q518 1483 431 1388T280 1241H169V1266Z" />
-<glyph unicode="&#xee;" glyph-name="icircumflex" horiz-adv-x="518" d="M342 0H176V1096H342V0ZM-77 1264Q50 1400 101 1464T175 1569H341Q363 1527 417 1461T597 1264V1241H478Q390 1296 257 1427Q121 1293 38 1241H-77V1264Z" />
-<glyph unicode="&#xef;" glyph-name="idieresis" horiz-adv-x="518" d="M342 0H176V1096H342V0ZM-20 1393Q-20 1445 6 1468T70 1491Q108 1491 135 1468T163 1393Q163 1343 136 1319T70 1294Q33 1294 7 1318T-20 1393ZM361 1393Q361 1445 387 1468T451 1491Q488
-1491 515 1468T543 1393Q543 1343 516 1319T451 1294Q414 1294 388 1318T361 1393Z" />
-<glyph unicode="&#xf0;" glyph-name="eth" horiz-adv-x="1221" d="M1122 563Q1122 282 992 131T614 -20Q392 -20 253 114T113 475Q113 705 244 836T596 967Q822 967 922 846L930 850Q873 1064 668 1255L397 1100L324 1208L557 1341Q465 1403 371 1452L440 1569Q596
-1496 698 1421L936 1559L1012 1452L805 1333Q957 1190 1039 991T1122 563ZM954 512Q954 659 864 744T618 829Q281 829 281 469Q281 302 368 211T618 119Q793 119 873 219T954 512Z" />
-<glyph unicode="&#xf1;" glyph-name="ntilde" horiz-adv-x="1257" d="M926 0V709Q926 843 865 909T674 975Q502 975 422 882T342 575V0H176V1096H311L338 946H346Q397 1027 489 1071T694 1116Q892 1116 992 1021T1092 715V0H926ZM802 1243Q759 1243 718 1261T638
-1302T562 1343T491 1362Q441 1362 416 1332T376 1241H278Q291 1362 348 1430T497 1499Q543 1499 586 1481T668 1440T743 1399T811 1380Q860 1380 884 1409T923 1501H1022Q1009 1380 953 1312T802 1243Z" />
-<glyph unicode="&#xf2;" glyph-name="ograve" horiz-adv-x="1237" d="M1122 549Q1122 281 987 131T614 -20Q467 -20 353 49T177 247T115 549Q115 817 249 966T621 1116Q851 1116 986 963T1122 549ZM287 549Q287 339 371 229T618 119Q781 119 865 228T950 549Q950
-758 866 866T616 975Q453 975 370 868T287 549ZM998 1241H888Q823 1293 734 1389T605 1548V1569H808Q840 1500 897 1410T998 1266V1241Z" />
-<glyph unicode="&#xf3;" glyph-name="oacute" horiz-adv-x="1237" d="M1122 549Q1122 281 987 131T614 -20Q467 -20 353 49T177 247T115 549Q115 817 249 966T621 1116Q851 1116 986 963T1122 549ZM287 549Q287 339 371 229T618 119Q781 119 865 228T950 549Q950
-758 866 866T616 975Q453 975 370 868T287 549ZM479 1266Q527 1328 582 1416T670 1569H872V1548Q828 1483 741 1388T590 1241H479V1266Z" />
-<glyph unicode="&#xf4;" glyph-name="ocircumflex" horiz-adv-x="1237" d="M1122 549Q1122 281 987 131T614 -20Q467 -20 353 49T177 247T115 549Q115 817 249 966T621 1116Q851 1116 986 963T1122 549ZM287 549Q287 339 371 229T618 119Q781 119 865 228T950
-549Q950 758 866 866T616 975Q453 975 370 868T287 549ZM282 1264Q409 1400 460 1464T534 1569H700Q722 1527 776 1461T956 1264V1241H837Q749 1296 616 1427Q480 1293 397 1241H282V1264Z" />
-<glyph unicode="&#xf5;" glyph-name="otilde" horiz-adv-x="1237" d="M1122 549Q1122 281 987 131T614 -20Q467 -20 353 49T177 247T115 549Q115 817 249 966T621 1116Q851 1116 986 963T1122 549ZM287 549Q287 339 371 229T618 119Q781 119 865 228T950 549Q950
-758 866 866T616 975Q453 975 370 868T287 549ZM1029 1243Q986 1243 945 1261T865 1302T789 1343T718 1362Q668 1362 643 1332T603 1241H505Q518 1362 575 1430T724 1499Q770 1499 813 1481T895 1440T970 1399T1038 1380Q1087 1380 1111 1409T1150 1501H1249Q1236
-1380 1180 1312T1029 1243Z" />
-<glyph unicode="&#xf6;" glyph-name="odieresis" horiz-adv-x="1237" d="M1122 549Q1122 281 987 131T614 -20Q467 -20 353 49T177 247T115 549Q115 817 249 966T621 1116Q851 1116 986 963T1122 549ZM287 549Q287 339 371 229T618 119Q781 119 865 228T950 549Q950
-758 866 866T616 975Q453 975 370 868T287 549ZM336 1393Q336 1445 362 1468T426 1491Q464 1491 491 1468T519 1393Q519 1343 492 1319T426 1294Q389 1294 363 1318T336 1393ZM717 1393Q717 1445 743 1468T807 1491Q844 1491 871 1468T899 1393Q899 1343 872 1319T807
-1294Q770 1294 744 1318T717 1393Z" />
-<glyph unicode="&#xf7;" glyph-name="divide" horiz-adv-x="1171" d="M104 653V791H1065V653H104ZM471 373Q471 433 500 463T584 494Q636 494 665 463T694 373Q694 316 665 284T584 252Q532 252 502 283T471 373ZM471 1071Q471 1131 500 1161T584 1192Q636 1192
-665 1161T694 1071Q694 1014 665 982T584 950Q532 950 502 981T471 1071Z" />
-<glyph unicode="&#xf8;" glyph-name="oslash" horiz-adv-x="1237" d="M1122 549Q1122 281 987 131T614 -20Q460 -20 348 49L264 -68L150 10L244 141Q115 293 115 549Q115 817 249 966T621 1116Q775 1116 891 1040L975 1159L1092 1083L995 950Q1122 798 1122 549ZM287
-549Q287 378 340 276L805 922Q730 975 616 975Q453 975 370 868T287 549ZM950 549Q950 713 899 813L434 170Q505 119 618 119Q781 119 865 228T950 549Z" />
-<glyph unicode="&#xf9;" glyph-name="ugrave" horiz-adv-x="1257" d="M332 1096V385Q332 251 393 185T584 119Q756 119 835 213T915 520V1096H1081V0H944L920 147H911Q860 66 770 23T563 -20Q363 -20 264 75T164 379V1096H332ZM982 1241H872Q807 1293 718 1389T589
-1548V1569H792Q824 1500 881 1410T982 1266V1241Z" />
-<glyph unicode="&#xfa;" glyph-name="uacute" horiz-adv-x="1257" d="M332 1096V385Q332 251 393 185T584 119Q756 119 835 213T915 520V1096H1081V0H944L920 147H911Q860 66 770 23T563 -20Q363 -20 264 75T164 379V1096H332ZM506 1266Q554 1328 609 1416T697
-1569H899V1548Q855 1483 768 1388T617 1241H506V1266Z" />
-<glyph unicode="&#xfb;" glyph-name="ucircumflex" horiz-adv-x="1257" d="M332 1096V385Q332 251 393 185T584 119Q756 119 835 213T915 520V1096H1081V0H944L920 147H911Q860 66 770 23T563 -20Q363 -20 264 75T164 379V1096H332ZM286 1264Q413 1400 464 1464T538
-1569H704Q726 1527 780 1461T960 1264V1241H841Q753 1296 620 1427Q484 1293 401 1241H286V1264Z" />
-<glyph unicode="&#xfc;" glyph-name="udieresis" horiz-adv-x="1257" d="M332 1096V385Q332 251 393 185T584 119Q756 119 835 213T915 520V1096H1081V0H944L920 147H911Q860 66 770 23T563 -20Q363 -20 264 75T164 379V1096H332ZM342 1393Q342 1445 368 1468T432
-1491Q470 1491 497 1468T525 1393Q525 1343 498 1319T432 1294Q395 1294 369 1318T342 1393ZM723 1393Q723 1445 749 1468T813 1491Q850 1491 877 1468T905 1393Q905 1343 878 1319T813 1294Q776 1294 750 1318T723 1393Z" />
-<glyph unicode="&#xfd;" glyph-name="yacute" horiz-adv-x="1032" d="M2 1096H180L420 471Q499 257 518 162H526Q539 213 580 336T852 1096H1030L559 -152Q489 -337 396 -414T166 -492Q90 -492 16 -475V-342Q71 -354 139 -354Q310 -354 383 -162L444 -6L2 1096ZM411
-1266Q459 1328 514 1416T602 1569H804V1548Q760 1483 673 1388T522 1241H411V1266Z" />
-<glyph unicode="&#xfe;" glyph-name="thorn" horiz-adv-x="1255" d="M344 948Q410 1037 495 1076T686 1116Q901 1116 1021 966T1141 549Q1141 281 1021 131T686 -20Q464 -20 342 141H330L334 107Q342 30 342 -33V-492H176V1556H342V1090Q342 1038 336 948H344ZM664
-975Q496 975 420 883T342 590V549Q342 318 419 219T666 119Q969 119 969 551Q969 766 895 870T664 975Z" />
-<glyph unicode="&#xff;" glyph-name="ydieresis" horiz-adv-x="1032" d="M2 1096H180L420 471Q499 257 518 162H526Q539 213 580 336T852 1096H1030L559 -152Q489 -337 396 -414T166 -492Q90 -492 16 -475V-342Q71 -354 139 -354Q310 -354 383 -162L444 -6L2 1096ZM490
-1393Q490 1445 516 1468T580 1491Q618 1491 645 1468T673 1393Q673 1343 646 1319T580 1294Q543 1294 517 1318T490 1393ZM871 1393Q871 1445 897 1468T961 1491Q998 1491 1025 1468T1053 1393Q1053 1343 1026 1319T961 1294Q924 1294 898 1318T871 1393Z" />
-<glyph unicode="&#x2013;" glyph-name="endash" horiz-adv-x="1024" d="M82 473V625H942V473H82Z" />
-<glyph unicode="&#x2014;" glyph-name="emdash" horiz-adv-x="2048" d="M82 473V625H1966V473H82Z" />
-<glyph unicode="&#x2018;" glyph-name="quoteleft" horiz-adv-x="348" d="M37 961L25 983Q47 1073 96 1207T201 1462H324Q258 1208 221 961H37Z" />
-<glyph unicode="&#x2019;" glyph-name="quoteright" horiz-adv-x="348" d="M309 1462L324 1440Q298 1340 249 1208T147 961H25Q95 1246 127 1462H309Z" />
-<glyph unicode="&#x201a;" glyph-name="quotesinglbase" horiz-adv-x="502" d="M350 238L365 215Q339 115 290 -17T188 -264H63Q90 -160 122 -7T168 238H350Z" />
-<glyph unicode="&#x201c;" glyph-name="quotedblleft" horiz-adv-x="717" d="M406 961L391 983Q447 1198 569 1462H692Q662 1347 633 1203T590 961H406ZM37 961L25 983Q47 1073 96 1207T201 1462H324Q258 1208 221 961H37Z" />
-<glyph unicode="&#x201d;" glyph-name="quotedblright" horiz-adv-x="717" d="M309 1462L324 1440Q298 1340 249 1208T147 961H25Q95 1246 127 1462H309ZM678 1462L692 1440Q668 1349 620 1216T516 961H391Q417 1061 450 1215T496 1462H678Z" />
-<glyph unicode="&#x201e;" glyph-name="quotedblbase" horiz-adv-x="829" d="M309 238L324 216Q298 116 249 -16T147 -263H25Q95 22 127 238H309ZM678 238L692 216Q668 125 620 -8T516 -263H391Q417 -163 450 -9T496 238H678Z" />
-<glyph unicode="&#x2022;" glyph-name="bullet" horiz-adv-x="770" d="M164 748Q164 869 220 932T385 995Q490 995 548 933T606 748Q606 629 549 565T385 500Q278 500 221 565T164 748Z" />
-<glyph unicode="&#x2039;" glyph-name="guilsinglleft" horiz-adv-x="623" d="M82 551L424 958L543 889L254 539L543 188L424 117L82 524V551Z" />
-<glyph unicode="&#x203a;" glyph-name="guilsinglright" horiz-adv-x="623" d="M541 524L197 117L80 188L367 539L80 889L197 958L541 551V524Z" />
-<hkern g1="quotedbl" g2="A" k="143" />
-<hkern g1="quotedbl" g2="T" k="-41" />
-<hkern g1="quotedbl" g2="V" k="-41" />
-<hkern g1="quotedbl" g2="W" k="-41" />
-<hkern g1="quotedbl" g2="Y" k="-20" />
-<hkern g1="quotedbl" g2="a" k="82" />
-<hkern g1="quotedbl" g2="c" k="123" />
-<hkern g1="quotedbl" g2="d" k="123" />
-<hkern g1="quotedbl" g2="e" k="123" />
-<hkern g1="quotedbl" g2="g" k="61" />
-<hkern g1="quotedbl" g2="m" k="61" />
-<hkern g1="quotedbl" g2="n" k="61" />
-<hkern g1="quotedbl" g2="o" k="123" />
-<hkern g1="quotedbl" g2="p" k="61" />
-<hkern g1="quotedbl" g2="q" k="123" />
-<hkern g1="quotedbl" g2="r" k="61" />
-<hkern g1="quotedbl" g2="s" k="61" />
-<hkern g1="quotedbl" g2="u" k="61" />
-<hkern g1="quotedbl" g2="Agrave" k="143" />
-<hkern g1="quotedbl" g2="Aacute" k="143" />
-<hkern g1="quotedbl" g2="Acircumflex" k="143" />
-<hkern g1="quotedbl" g2="Atilde" k="143" />
-<hkern g1="quotedbl" g2="Adieresis" k="143" />
-<hkern g1="quotedbl" g2="Aring" k="143" />
-<hkern g1="quotedbl" g2="Yacute" k="-20" />
-<hkern g1="quotedbl" g2="agrave" k="123" />
-<hkern g1="quotedbl" g2="aacute" k="82" />
-<hkern g1="quotedbl" g2="acircumflex" k="82" />
-<hkern g1="quotedbl" g2="atilde" k="82" />
-<hkern g1="quotedbl" g2="adieresis" k="82" />
-<hkern g1="quotedbl" g2="aring" k="82" />
-<hkern g1="quotedbl" g2="ae" k="82" />
-<hkern g1="quotedbl" g2="ccedilla" k="123" />
-<hkern g1="quotedbl" g2="egrave" k="123" />
-<hkern g1="quotedbl" g2="eacute" k="123" />
-<hkern g1="quotedbl" g2="ecircumflex" k="123" />
-<hkern g1="quotedbl" g2="edieresis" k="123" />
-<hkern g1="quotedbl" g2="ograve" k="123" />
-<hkern g1="quotedbl" g2="oacute" k="123" />
-<hkern g1="quotedbl" g2="ocircumflex" k="123" />
-<hkern g1="quotedbl" g2="otilde" k="123" />
-<hkern g1="quotedbl" g2="odieresis" k="123" />
-<hkern g1="quotedbl" g2="oslash" k="123" />
-<hkern g1="quotedbl" g2="ugrave" k="61" />
-<hkern g1="quotedbl" g2="uacute" k="61" />
-<hkern g1="quotedbl" g2="ucircumflex" k="61" />
-<hkern g1="quotedbl" g2="udieresis" k="61" />
-<hkern g1="quotedbl" g2="oe" k="123" />
-<hkern g1="quotesingle" g2="A" k="143" />
-<hkern g1="quotesingle" g2="T" k="-41" />
-<hkern g1="quotesingle" g2="V" k="-41" />
-<hkern g1="quotesingle" g2="W" k="-41" />
-<hkern g1="quotesingle" g2="Y" k="-20" />
-<hkern g1="quotesingle" g2="a" k="82" />
-<hkern g1="quotesingle" g2="c" k="123" />
-<hkern g1="quotesingle" g2="d" k="123" />
-<hkern g1="quotesingle" g2="e" k="123" />
-<hkern g1="quotesingle" g2="g" k="61" />
-<hkern g1="quotesingle" g2="m" k="61" />
-<hkern g1="quotesingle" g2="n" k="61" />
-<hkern g1="quotesingle" g2="o" k="123" />
-<hkern g1="quotesingle" g2="p" k="61" />
-<hkern g1="quotesingle" g2="q" k="123" />
-<hkern g1="quotesingle" g2="r" k="61" />
-<hkern g1="quotesingle" g2="s" k="61" />
-<hkern g1="quotesingle" g2="u" k="61" />
-<hkern g1="quotesingle" g2="Agrave" k="143" />
-<hkern g1="quotesingle" g2="Aacute" k="143" />
-<hkern g1="quotesingle" g2="Acircumflex" k="143" />
-<hkern g1="quotesingle" g2="Atilde" k="143" />
-<hkern g1="quotesingle" g2="Adieresis" k="143" />
-<hkern g1="quotesingle" g2="Aring" k="143" />
-<hkern g1="quotesingle" g2="Yacute" k="-20" />
-<hkern g1="quotesingle" g2="agrave" k="123" />
-<hkern g1="quotesingle" g2="aacute" k="82" />
-<hkern g1="quotesingle" g2="acircumflex" k="82" />
-<hkern g1="quotesingle" g2="atilde" k="82" />
-<hkern g1="quotesingle" g2="adieresis" k="82" />
-<hkern g1="quotesingle" g2="aring" k="82" />
-<hkern g1="quotesingle" g2="ae" k="82" />
-<hkern g1="quotesingle" g2="ccedilla" k="123" />
-<hkern g1="quotesingle" g2="egrave" k="123" />
-<hkern g1="quotesingle" g2="eacute" k="123" />
-<hkern g1="quotesingle" g2="ecircumflex" k="123" />
-<hkern g1="quotesingle" g2="edieresis" k="123" />
-<hkern g1="quotesingle" g2="ograve" k="123" />
-<hkern g1="quotesingle" g2="oacute" k="123" />
-<hkern g1="quotesingle" g2="ocircumflex" k="123" />
-<hkern g1="quotesingle" g2="otilde" k="123" />
-<hkern g1="quotesingle" g2="odieresis" k="123" />
-<hkern g1="quotesingle" g2="oslash" k="123" />
-<hkern g1="quotesingle" g2="ugrave" k="61" />
-<hkern g1="quotesingle" g2="uacute" k="61" />
-<hkern g1="quotesingle" g2="ucircumflex" k="61" />
-<hkern g1="quotesingle" g2="udieresis" k="61" />
-<hkern g1="quotesingle" g2="oe" k="123" />
-<hkern g1="parenleft" g2="J" k="-184" />
-<hkern g1="comma" g2="C" k="102" />
-<hkern g1="comma" g2="G" k="102" />
-<hkern g1="comma" g2="O" k="102" />
-<hkern g1="comma" g2="Q" k="102" />
-<hkern g1="comma" g2="T" k="143" />
-<hkern g1="comma" g2="U" k="41" />
-<hkern g1="comma" g2="V" k="123" />
-<hkern g1="comma" g2="W" k="123" />
-<hkern g1="comma" g2="Y" k="123" />
-<hkern g1="comma" g2="Ccedilla" k="102" />
-<hkern g1="comma" g2="Ograve" k="102" />
-<hkern g1="comma" g2="Oacute" k="102" />
-<hkern g1="comma" g2="Ocircumflex" k="102" />
-<hkern g1="comma" g2="Otilde" k="102" />
-<hkern g1="comma" g2="Odieresis" k="102" />
-<hkern g1="comma" g2="Oslash" k="102" />
-<hkern g1="comma" g2="Ugrave" k="41" />
-<hkern g1="comma" g2="Uacute" k="41" />
-<hkern g1="comma" g2="Ucircumflex" k="41" />
-<hkern g1="comma" g2="Udieresis" k="41" />
-<hkern g1="comma" g2="Yacute" k="123" />
-<hkern g1="comma" g2="OE" k="102" />
-<hkern g1="hyphen" g2="T" k="82" />
-<hkern g1="period" g2="C" k="102" />
-<hkern g1="period" g2="G" k="102" />
-<hkern g1="period" g2="O" k="102" />
-<hkern g1="period" g2="Q" k="102" />
-<hkern g1="period" g2="T" k="143" />
-<hkern g1="period" g2="U" k="41" />
-<hkern g1="period" g2="V" k="123" />
-<hkern g1="period" g2="W" k="123" />
-<hkern g1="period" g2="Y" k="123" />
-<hkern g1="period" g2="Ccedilla" k="102" />
-<hkern g1="period" g2="Ograve" k="102" />
-<hkern g1="period" g2="Oacute" k="102" />
-<hkern g1="period" g2="Ocircumflex" k="102" />
-<hkern g1="period" g2="Otilde" k="102" />
-<hkern g1="period" g2="Odieresis" k="102" />
-<hkern g1="period" g2="Oslash" k="102" />
-<hkern g1="period" g2="Ugrave" k="41" />
-<hkern g1="period" g2="Uacute" k="41" />
-<hkern g1="period" g2="Ucircumflex" k="41" />
-<hkern g1="period" g2="Udieresis" k="41" />
-<hkern g1="period" g2="Yacute" k="123" />
-<hkern g1="period" g2="OE" k="102" />
-<hkern g1="A" g2="quotedbl" k="143" />
-<hkern g1="A" g2="quotesingle" k="143" />
-<hkern g1="A" g2="C" k="41" />
-<hkern g1="A" g2="G" k="41" />
-<hkern g1="A" g2="J" k="-266" />
-<hkern g1="A" g2="O" k="41" />
-<hkern g1="A" g2="Q" k="41" />
-<hkern g1="A" g2="T" k="143" />
-<hkern g1="A" g2="V" k="82" />
-<hkern g1="A" g2="W" k="82" />
-<hkern g1="A" g2="Y" k="123" />
-<hkern g1="A" g2="Ccedilla" k="41" />
-<hkern g1="A" g2="Ograve" k="41" />
-<hkern g1="A" g2="Oacute" k="41" />
-<hkern g1="A" g2="Ocircumflex" k="41" />
-<hkern g1="A" g2="Otilde" k="41" />
-<hkern g1="A" g2="Odieresis" k="41" />
-<hkern g1="A" g2="Oslash" k="41" />
-<hkern g1="A" g2="Yacute" k="123" />
-<hkern g1="A" g2="OE" k="41" />
-<hkern g1="A" g2="quoteright" k="143" />
-<hkern g1="A" g2="quotedblright" k="143" />
-<hkern g1="B" g2="comma" k="82" />
-<hkern g1="B" g2="period" k="82" />
-<hkern g1="B" g2="A" k="41" />
-<hkern g1="B" g2="T" k="61" />
-<hkern g1="B" g2="V" k="20" />
-<hkern g1="B" g2="W" k="20" />
-<hkern g1="B" g2="X" k="41" />
-<hkern g1="B" g2="Y" k="20" />
-<hkern g1="B" g2="Z" k="20" />
-<hkern g1="B" g2="Agrave" k="41" />
-<hkern g1="B" g2="Aacute" k="41" />
-<hkern g1="B" g2="Acircumflex" k="41" />
-<hkern g1="B" g2="Atilde" k="41" />
-<hkern g1="B" g2="Adieresis" k="41" />
-<hkern g1="B" g2="Aring" k="41" />
-<hkern g1="B" g2="Yacute" k="20" />
-<hkern g1="B" g2="quotesinglbase" k="82" />
-<hkern g1="B" g2="quotedblbase" k="82" />
-<hkern g1="C" g2="C" k="41" />
-<hkern g1="C" g2="G" k="41" />
-<hkern g1="C" g2="O" k="41" />
-<hkern g1="C" g2="Q" k="41" />
-<hkern g1="C" g2="Ccedilla" k="41" />
-<hkern g1="C" g2="Ograve" k="41" />
-<hkern g1="C" g2="Oacute" k="41" />
-<hkern g1="C" g2="Ocircumflex" k="41" />
-<hkern g1="C" g2="Otilde" k="41" />
-<hkern g1="C" g2="Odieresis" k="41" />
-<hkern g1="C" g2="Oslash" k="41" />
-<hkern g1="C" g2="OE" k="41" />
-<hkern g1="D" g2="comma" k="82" />
-<hkern g1="D" g2="period" k="82" />
-<hkern g1="D" g2="A" k="41" />
-<hkern g1="D" g2="T" k="61" />
-<hkern g1="D" g2="V" k="20" />
-<hkern g1="D" g2="W" k="20" />
-<hkern g1="D" g2="X" k="41" />
-<hkern g1="D" g2="Y" k="20" />
-<hkern g1="D" g2="Z" k="20" />
-<hkern g1="D" g2="Agrave" k="41" />
-<hkern g1="D" g2="Aacute" k="41" />
-<hkern g1="D" g2="Acircumflex" k="41" />
-<hkern g1="D" g2="Atilde" k="41" />
-<hkern g1="D" g2="Adieresis" k="41" />
-<hkern g1="D" g2="Aring" k="41" />
-<hkern g1="D" g2="Yacute" k="20" />
-<hkern g1="D" g2="quotesinglbase" k="82" />
-<hkern g1="D" g2="quotedblbase" k="82" />
-<hkern g1="E" g2="J" k="-123" />
-<hkern g1="F" g2="comma" k="123" />
-<hkern g1="F" g2="period" k="123" />
-<hkern g1="F" g2="question" k="-41" />
-<hkern g1="F" g2="A" k="41" />
-<hkern g1="F" g2="Agrave" k="41" />
-<hkern g1="F" g2="Aacute" k="41" />
-<hkern g1="F" g2="Acircumflex" k="41" />
-<hkern g1="F" g2="Atilde" k="41" />
-<hkern g1="F" g2="Adieresis" k="41" />
-<hkern g1="F" g2="Aring" k="41" />
-<hkern g1="F" g2="quotesinglbase" k="123" />
-<hkern g1="F" g2="quotedblbase" k="123" />
-<hkern g1="K" g2="C" k="41" />
-<hkern g1="K" g2="G" k="41" />
-<hkern g1="K" g2="O" k="41" />
-<hkern g1="K" g2="Q" k="41" />
-<hkern g1="K" g2="Ccedilla" k="41" />
-<hkern g1="K" g2="Ograve" k="41" />
-<hkern g1="K" g2="Oacute" k="41" />
-<hkern g1="K" g2="Ocircumflex" k="41" />
-<hkern g1="K" g2="Otilde" k="41" />
-<hkern g1="K" g2="Odieresis" k="41" />
-<hkern g1="K" g2="Oslash" k="41" />
-<hkern g1="K" g2="OE" k="41" />
-<hkern g1="L" g2="quotedbl" k="164" />
-<hkern g1="L" g2="quotesingle" k="164" />
-<hkern g1="L" g2="C" k="41" />
-<hkern g1="L" g2="G" k="41" />
-<hkern g1="L" g2="O" k="41" />
-<hkern g1="L" g2="Q" k="41" />
-<hkern g1="L" g2="T" k="41" />
-<hkern g1="L" g2="U" k="20" />
-<hkern g1="L" g2="V" k="41" />
-<hkern g1="L" g2="W" k="41" />
-<hkern g1="L" g2="Y" k="61" />
-<hkern g1="L" g2="Ccedilla" k="41" />
-<hkern g1="L" g2="Ograve" k="41" />
-<hkern g1="L" g2="Oacute" k="41" />
-<hkern g1="L" g2="Ocircumflex" k="41" />
-<hkern g1="L" g2="Otilde" k="41" />
-<hkern g1="L" g2="Odieresis" k="41" />
-<hkern g1="L" g2="Oslash" k="41" />
-<hkern g1="L" g2="Ugrave" k="20" />
-<hkern g1="L" g2="Uacute" k="20" />
-<hkern g1="L" g2="Ucircumflex" k="20" />
-<hkern g1="L" g2="Udieresis" k="20" />
-<hkern g1="L" g2="Yacute" k="61" />
-<hkern g1="L" g2="OE" k="41" />
-<hkern g1="L" g2="quoteright" k="164" />
-<hkern g1="L" g2="quotedblright" k="164" />
-<hkern g1="O" g2="comma" k="82" />
-<hkern g1="O" g2="period" k="82" />
-<hkern g1="O" g2="A" k="41" />
-<hkern g1="O" g2="T" k="61" />
-<hkern g1="O" g2="V" k="20" />
-<hkern g1="O" g2="W" k="20" />
-<hkern g1="O" g2="X" k="41" />
-<hkern g1="O" g2="Y" k="20" />
-<hkern g1="O" g2="Z" k="20" />
-<hkern g1="O" g2="Agrave" k="41" />
-<hkern g1="O" g2="Aacute" k="41" />
-<hkern g1="O" g2="Acircumflex" k="41" />
-<hkern g1="O" g2="Atilde" k="41" />
-<hkern g1="O" g2="Adieresis" k="41" />
-<hkern g1="O" g2="Aring" k="41" />
-<hkern g1="O" g2="Yacute" k="20" />
-<hkern g1="O" g2="quotesinglbase" k="82" />
-<hkern g1="O" g2="quotedblbase" k="82" />
-<hkern g1="P" g2="comma" k="266" />
-<hkern g1="P" g2="period" k="266" />
-<hkern g1="P" g2="A" k="102" />
-<hkern g1="P" g2="X" k="41" />
-<hkern g1="P" g2="Z" k="20" />
-<hkern g1="P" g2="Agrave" k="102" />
-<hkern g1="P" g2="Aacute" k="102" />
-<hkern g1="P" g2="Acircumflex" k="102" />
-<hkern g1="P" g2="Atilde" k="102" />
-<hkern g1="P" g2="Adieresis" k="102" />
-<hkern g1="P" g2="Aring" k="102" />
-<hkern g1="P" g2="quotesinglbase" k="266" />
-<hkern g1="P" g2="quotedblbase" k="266" />
-<hkern g1="Q" g2="comma" k="82" />
-<hkern g1="Q" g2="period" k="82" />
-<hkern g1="Q" g2="A" k="41" />
-<hkern g1="Q" g2="T" k="61" />
-<hkern g1="Q" g2="V" k="20" />
-<hkern g1="Q" g2="W" k="20" />
-<hkern g1="Q" g2="X" k="41" />
-<hkern g1="Q" g2="Y" k="20" />
-<hkern g1="Q" g2="Z" k="20" />
-<hkern g1="Q" g2="Agrave" k="41" />
-<hkern g1="Q" g2="Aacute" k="41" />
-<hkern g1="Q" g2="Acircumflex" k="41" />
-<hkern g1="Q" g2="Atilde" k="41" />
-<hkern g1="Q" g2="Adieresis" k="41" />
-<hkern g1="Q" g2="Aring" k="41" />
-<hkern g1="Q" g2="Yacute" k="20" />
-<hkern g1="Q" g2="quotesinglbase" k="82" />
-<hkern g1="Q" g2="quotedblbase" k="82" />
-<hkern g1="T" g2="comma" k="123" />
-<hkern g1="T" g2="hyphen" k="82" />
-<hkern g1="T" g2="period" k="123" />
-<hkern g1="T" g2="question" k="-41" />
-<hkern g1="T" g2="A" k="143" />
-<hkern g1="T" g2="C" k="41" />
-<hkern g1="T" g2="G" k="41" />
-<hkern g1="T" g2="O" k="41" />
-<hkern g1="T" g2="Q" k="41" />
-<hkern g1="T" g2="T" k="-41" />
-<hkern g1="T" g2="a" k="164" />
-<hkern g1="T" g2="c" k="143" />
-<hkern g1="T" g2="d" k="143" />
-<hkern g1="T" g2="e" k="143" />
-<hkern g1="T" g2="g" k="143" />
-<hkern g1="T" g2="m" k="102" />
-<hkern g1="T" g2="n" k="102" />
-<hkern g1="T" g2="o" k="143" />
-<hkern g1="T" g2="p" k="102" />
-<hkern g1="T" g2="q" k="143" />
-<hkern g1="T" g2="r" k="102" />
-<hkern g1="T" g2="s" k="123" />
-<hkern g1="T" g2="u" k="102" />
-<hkern g1="T" g2="v" k="41" />
-<hkern g1="T" g2="w" k="41" />
-<hkern g1="T" g2="x" k="41" />
-<hkern g1="T" g2="y" k="41" />
-<hkern g1="T" g2="z" k="82" />
-<hkern g1="T" g2="Agrave" k="143" />
-<hkern g1="T" g2="Aacute" k="143" />
-<hkern g1="T" g2="Acircumflex" k="143" />
-<hkern g1="T" g2="Atilde" k="143" />
-<hkern g1="T" g2="Adieresis" k="143" />
-<hkern g1="T" g2="Aring" k="143" />
-<hkern g1="T" g2="Ccedilla" k="41" />
-<hkern g1="T" g2="Ograve" k="41" />
-<hkern g1="T" g2="Oacute" k="41" />
-<hkern g1="T" g2="Ocircumflex" k="41" />
-<hkern g1="T" g2="Otilde" k="41" />
-<hkern g1="T" g2="Odieresis" k="41" />
-<hkern g1="T" g2="Oslash" k="41" />
-<hkern g1="T" g2="agrave" k="143" />
-<hkern g1="T" g2="aacute" k="164" />
-<hkern g1="T" g2="acircumflex" k="164" />
-<hkern g1="T" g2="atilde" k="164" />
-<hkern g1="T" g2="adieresis" k="164" />
-<hkern g1="T" g2="aring" k="164" />
-<hkern g1="T" g2="ae" k="164" />
-<hkern g1="T" g2="ccedilla" k="143" />
-<hkern g1="T" g2="egrave" k="143" />
-<hkern g1="T" g2="eacute" k="143" />
-<hkern g1="T" g2="ecircumflex" k="143" />
-<hkern g1="T" g2="edieresis" k="143" />
-<hkern g1="T" g2="ograve" k="143" />
-<hkern g1="T" g2="oacute" k="143" />
-<hkern g1="T" g2="ocircumflex" k="143" />
-<hkern g1="T" g2="otilde" k="143" />
-<hkern g1="T" g2="odieresis" k="143" />
-<hkern g1="T" g2="oslash" k="143" />
-<hkern g1="T" g2="ugrave" k="102" />
-<hkern g1="T" g2="uacute" k="102" />
-<hkern g1="T" g2="ucircumflex" k="102" />
-<hkern g1="T" g2="udieresis" k="102" />
-<hkern g1="T" g2="yacute" k="41" />
-<hkern g1="T" g2="OE" k="41" />
-<hkern g1="T" g2="oe" k="143" />
-<hkern g1="T" g2="endash" k="82" />
-<hkern g1="T" g2="emdash" k="82" />
-<hkern g1="T" g2="quotesinglbase" k="123" />
-<hkern g1="T" g2="quotedblbase" k="123" />
-<hkern g1="U" g2="comma" k="41" />
-<hkern g1="U" g2="period" k="41" />
-<hkern g1="U" g2="A" k="20" />
-<hkern g1="U" g2="Agrave" k="20" />
-<hkern g1="U" g2="Aacute" k="20" />
-<hkern g1="U" g2="Acircumflex" k="20" />
-<hkern g1="U" g2="Atilde" k="20" />
-<hkern g1="U" g2="Adieresis" k="20" />
-<hkern g1="U" g2="Aring" k="20" />
-<hkern g1="U" g2="quotesinglbase" k="41" />
-<hkern g1="U" g2="quotedblbase" k="41" />
-<hkern g1="V" g2="comma" k="102" />
-<hkern g1="V" g2="period" k="102" />
-<hkern g1="V" g2="question" k="-41" />
-<hkern g1="V" g2="A" k="82" />
-<hkern g1="V" g2="C" k="20" />
-<hkern g1="V" g2="G" k="20" />
-<hkern g1="V" g2="O" k="20" />
-<hkern g1="V" g2="Q" k="20" />
-<hkern g1="V" g2="a" k="41" />
-<hkern g1="V" g2="c" k="41" />
-<hkern g1="V" g2="d" k="41" />
-<hkern g1="V" g2="e" k="41" />
-<hkern g1="V" g2="g" k="20" />
-<hkern g1="V" g2="m" k="20" />
-<hkern g1="V" g2="n" k="20" />
-<hkern g1="V" g2="o" k="41" />
-<hkern g1="V" g2="p" k="20" />
-<hkern g1="V" g2="q" k="41" />
-<hkern g1="V" g2="r" k="20" />
-<hkern g1="V" g2="s" k="20" />
-<hkern g1="V" g2="u" k="20" />
-<hkern g1="V" g2="Agrave" k="82" />
-<hkern g1="V" g2="Aacute" k="82" />
-<hkern g1="V" g2="Acircumflex" k="82" />
-<hkern g1="V" g2="Atilde" k="82" />
-<hkern g1="V" g2="Adieresis" k="82" />
-<hkern g1="V" g2="Aring" k="82" />
-<hkern g1="V" g2="Ccedilla" k="20" />
-<hkern g1="V" g2="Ograve" k="20" />
-<hkern g1="V" g2="Oacute" k="20" />
-<hkern g1="V" g2="Ocircumflex" k="20" />
-<hkern g1="V" g2="Otilde" k="20" />
-<hkern g1="V" g2="Odieresis" k="20" />
-<hkern g1="V" g2="Oslash" k="20" />
-<hkern g1="V" g2="agrave" k="41" />
-<hkern g1="V" g2="aacute" k="41" />
-<hkern g1="V" g2="acircumflex" k="41" />
-<hkern g1="V" g2="atilde" k="41" />
-<hkern g1="V" g2="adieresis" k="41" />
-<hkern g1="V" g2="aring" k="41" />
-<hkern g1="V" g2="ae" k="41" />
-<hkern g1="V" g2="ccedilla" k="41" />
-<hkern g1="V" g2="egrave" k="41" />
-<hkern g1="V" g2="eacute" k="41" />
-<hkern g1="V" g2="ecircumflex" k="41" />
-<hkern g1="V" g2="edieresis" k="41" />
-<hkern g1="V" g2="ograve" k="41" />
-<hkern g1="V" g2="oacute" k="41" />
-<hkern g1="V" g2="ocircumflex" k="41" />
-<hkern g1="V" g2="otilde" k="41" />
-<hkern g1="V" g2="odieresis" k="41" />
-<hkern g1="V" g2="oslash" k="41" />
-<hkern g1="V" g2="ugrave" k="20" />
-<hkern g1="V" g2="uacute" k="20" />
-<hkern g1="V" g2="ucircumflex" k="20" />
-<hkern g1="V" g2="udieresis" k="20" />
-<hkern g1="V" g2="OE" k="20" />
-<hkern g1="V" g2="oe" k="41" />
-<hkern g1="V" g2="quotesinglbase" k="102" />
-<hkern g1="V" g2="quotedblbase" k="102" />
-<hkern g1="W" g2="comma" k="102" />
-<hkern g1="W" g2="period" k="102" />
-<hkern g1="W" g2="question" k="-41" />
-<hkern g1="W" g2="A" k="82" />
-<hkern g1="W" g2="C" k="20" />
-<hkern g1="W" g2="G" k="20" />
-<hkern g1="W" g2="O" k="20" />
-<hkern g1="W" g2="Q" k="20" />
-<hkern g1="W" g2="a" k="41" />
-<hkern g1="W" g2="c" k="41" />
-<hkern g1="W" g2="d" k="41" />
-<hkern g1="W" g2="e" k="41" />
-<hkern g1="W" g2="g" k="20" />
-<hkern g1="W" g2="m" k="20" />
-<hkern g1="W" g2="n" k="20" />
-<hkern g1="W" g2="o" k="41" />
-<hkern g1="W" g2="p" k="20" />
-<hkern g1="W" g2="q" k="41" />
-<hkern g1="W" g2="r" k="20" />
-<hkern g1="W" g2="s" k="20" />
-<hkern g1="W" g2="u" k="20" />
-<hkern g1="W" g2="Agrave" k="82" />
-<hkern g1="W" g2="Aacute" k="82" />
-<hkern g1="W" g2="Acircumflex" k="82" />
-<hkern g1="W" g2="Atilde" k="82" />
-<hkern g1="W" g2="Adieresis" k="82" />
-<hkern g1="W" g2="Aring" k="82" />
-<hkern g1="W" g2="Ccedilla" k="20" />
-<hkern g1="W" g2="Ograve" k="20" />
-<hkern g1="W" g2="Oacute" k="20" />
-<hkern g1="W" g2="Ocircumflex" k="20" />
-<hkern g1="W" g2="Otilde" k="20" />
-<hkern g1="W" g2="Odieresis" k="20" />
-<hkern g1="W" g2="Oslash" k="20" />
-<hkern g1="W" g2="agrave" k="41" />
-<hkern g1="W" g2="aacute" k="41" />
-<hkern g1="W" g2="acircumflex" k="41" />
-<hkern g1="W" g2="atilde" k="41" />
-<hkern g1="W" g2="adieresis" k="41" />
-<hkern g1="W" g2="aring" k="41" />
-<hkern g1="W" g2="ae" k="41" />
-<hkern g1="W" g2="ccedilla" k="41" />
-<hkern g1="W" g2="egrave" k="41" />
-<hkern g1="W" g2="eacute" k="41" />
-<hkern g1="W" g2="ecircumflex" k="41" />
-<hkern g1="W" g2="edieresis" k="41" />
-<hkern g1="W" g2="ograve" k="41" />
-<hkern g1="W" g2="oacute" k="41" />
-<hkern g1="W" g2="ocircumflex" k="41" />
-<hkern g1="W" g2="otilde" k="41" />
-<hkern g1="W" g2="odieresis" k="41" />
-<hkern g1="W" g2="oslash" k="41" />
-<hkern g1="W" g2="ugrave" k="20" />
-<hkern g1="W" g2="uacute" k="20" />
-<hkern g1="W" g2="ucircumflex" k="20" />
-<hkern g1="W" g2="udieresis" k="20" />
-<hkern g1="W" g2="OE" k="20" />
-<hkern g1="W" g2="oe" k="41" />
-<hkern g1="W" g2="quotesinglbase" k="102" />
-<hkern g1="W" g2="quotedblbase" k="102" />
-<hkern g1="X" g2="C" k="41" />
-<hkern g1="X" g2="G" k="41" />
-<hkern g1="X" g2="O" k="41" />
-<hkern g1="X" g2="Q" k="41" />
-<hkern g1="X" g2="Ccedilla" k="41" />
-<hkern g1="X" g2="Ograve" k="41" />
-<hkern g1="X" g2="Oacute" k="41" />
-<hkern g1="X" g2="Ocircumflex" k="41" />
-<hkern g1="X" g2="Otilde" k="41" />
-<hkern g1="X" g2="Odieresis" k="41" />
-<hkern g1="X" g2="Oslash" k="41" />
-<hkern g1="X" g2="OE" k="41" />
-<hkern g1="Y" g2="comma" k="123" />
-<hkern g1="Y" g2="period" k="123" />
-<hkern g1="Y" g2="question" k="-41" />
-<hkern g1="Y" g2="A" k="123" />
-<hkern g1="Y" g2="C" k="41" />
-<hkern g1="Y" g2="G" k="41" />
-<hkern g1="Y" g2="O" k="41" />
-<hkern g1="Y" g2="Q" k="41" />
-<hkern g1="Y" g2="a" k="102" />
-<hkern g1="Y" g2="c" k="102" />
-<hkern g1="Y" g2="d" k="102" />
-<hkern g1="Y" g2="e" k="102" />
-<hkern g1="Y" g2="g" k="41" />
-<hkern g1="Y" g2="m" k="61" />
-<hkern g1="Y" g2="n" k="61" />
-<hkern g1="Y" g2="o" k="102" />
-<hkern g1="Y" g2="p" k="61" />
-<hkern g1="Y" g2="q" k="102" />
-<hkern g1="Y" g2="r" k="61" />
-<hkern g1="Y" g2="s" k="82" />
-<hkern g1="Y" g2="u" k="61" />
-<hkern g1="Y" g2="z" k="41" />
-<hkern g1="Y" g2="Agrave" k="123" />
-<hkern g1="Y" g2="Aacute" k="123" />
-<hkern g1="Y" g2="Acircumflex" k="123" />
-<hkern g1="Y" g2="Atilde" k="123" />
-<hkern g1="Y" g2="Adieresis" k="123" />
-<hkern g1="Y" g2="Aring" k="123" />
-<hkern g1="Y" g2="Ccedilla" k="41" />
-<hkern g1="Y" g2="Ograve" k="41" />
-<hkern g1="Y" g2="Oacute" k="41" />
-<hkern g1="Y" g2="Ocircumflex" k="41" />
-<hkern g1="Y" g2="Otilde" k="41" />
-<hkern g1="Y" g2="Odieresis" k="41" />
-<hkern g1="Y" g2="Oslash" k="41" />
-<hkern g1="Y" g2="agrave" k="102" />
-<hkern g1="Y" g2="aacute" k="102" />
-<hkern g1="Y" g2="acircumflex" k="102" />
-<hkern g1="Y" g2="atilde" k="102" />
-<hkern g1="Y" g2="adieresis" k="102" />
-<hkern g1="Y" g2="aring" k="102" />
-<hkern g1="Y" g2="ae" k="102" />
-<hkern g1="Y" g2="ccedilla" k="102" />
-<hkern g1="Y" g2="egrave" k="102" />
-<hkern g1="Y" g2="eacute" k="102" />
-<hkern g1="Y" g2="ecircumflex" k="102" />
-<hkern g1="Y" g2="edieresis" k="102" />
-<hkern g1="Y" g2="ograve" k="102" />
-<hkern g1="Y" g2="oacute" k="102" />
-<hkern g1="Y" g2="ocircumflex" k="102" />
-<hkern g1="Y" g2="otilde" k="102" />
-<hkern g1="Y" g2="odieresis" k="102" />
-<hkern g1="Y" g2="oslash" k="102" />
-<hkern g1="Y" g2="ugrave" k="61" />
-<hkern g1="Y" g2="uacute" k="61" />
-<hkern g1="Y" g2="ucircumflex" k="61" />
-<hkern g1="Y" g2="udieresis" k="61" />
-<hkern g1="Y" g2="OE" k="41" />
-<hkern g1="Y" g2="oe" k="102" />
-<hkern g1="Y" g2="quotesinglbase" k="123" />
-<hkern g1="Y" g2="quotedblbase" k="123" />
-<hkern g1="Z" g2="C" k="20" />
-<hkern g1="Z" g2="G" k="20" />
-<hkern g1="Z" g2="O" k="20" />
-<hkern g1="Z" g2="Q" k="20" />
-<hkern g1="Z" g2="Ccedilla" k="20" />
-<hkern g1="Z" g2="Ograve" k="20" />
-<hkern g1="Z" g2="Oacute" k="20" />
-<hkern g1="Z" g2="Ocircumflex" k="20" />
-<hkern g1="Z" g2="Otilde" k="20" />
-<hkern g1="Z" g2="Odieresis" k="20" />
-<hkern g1="Z" g2="Oslash" k="20" />
-<hkern g1="Z" g2="OE" k="20" />
-<hkern g1="bracketleft" g2="J" k="-184" />
-<hkern g1="a" g2="quotedbl" k="20" />
-<hkern g1="a" g2="quotesingle" k="20" />
-<hkern g1="a" g2="quoteright" k="20" />
-<hkern g1="a" g2="quotedblright" k="20" />
-<hkern g1="b" g2="quotedbl" k="20" />
-<hkern g1="b" g2="quotesingle" k="20" />
-<hkern g1="b" g2="v" k="41" />
-<hkern g1="b" g2="w" k="41" />
-<hkern g1="b" g2="x" k="41" />
-<hkern g1="b" g2="y" k="41" />
-<hkern g1="b" g2="z" k="20" />
-<hkern g1="b" g2="yacute" k="41" />
-<hkern g1="b" g2="quoteright" k="20" />
-<hkern g1="b" g2="quotedblright" k="20" />
-<hkern g1="c" g2="quotedbl" k="-41" />
-<hkern g1="c" g2="quotesingle" k="-41" />
-<hkern g1="c" g2="quoteright" k="-41" />
-<hkern g1="c" g2="quotedblright" k="-41" />
-<hkern g1="e" g2="quotedbl" k="20" />
-<hkern g1="e" g2="quotesingle" k="20" />
-<hkern g1="e" g2="v" k="41" />
-<hkern g1="e" g2="w" k="41" />
-<hkern g1="e" g2="x" k="41" />
-<hkern g1="e" g2="y" k="41" />
-<hkern g1="e" g2="z" k="20" />
-<hkern g1="e" g2="yacute" k="41" />
-<hkern g1="e" g2="quoteright" k="20" />
-<hkern g1="e" g2="quotedblright" k="20" />
-<hkern g1="f" g2="quotedbl" k="-123" />
-<hkern g1="f" g2="quotesingle" k="-123" />
-<hkern g1="f" g2="quoteright" k="-123" />
-<hkern g1="f" g2="quotedblright" k="-123" />
-<hkern g1="h" g2="quotedbl" k="20" />
-<hkern g1="h" g2="quotesingle" k="20" />
-<hkern g1="h" g2="quoteright" k="20" />
-<hkern g1="h" g2="quotedblright" k="20" />
-<hkern g1="k" g2="c" k="41" />
-<hkern g1="k" g2="d" k="41" />
-<hkern g1="k" g2="e" k="41" />
-<hkern g1="k" g2="o" k="41" />
-<hkern g1="k" g2="q" k="41" />
-<hkern g1="k" g2="agrave" k="41" />
-<hkern g1="k" g2="ccedilla" k="41" />
-<hkern g1="k" g2="egrave" k="41" />
-<hkern g1="k" g2="eacute" k="41" />
-<hkern g1="k" g2="ecircumflex" k="41" />
-<hkern g1="k" g2="edieresis" k="41" />
-<hkern g1="k" g2="ograve" k="41" />
-<hkern g1="k" g2="oacute" k="41" />
-<hkern g1="k" g2="ocircumflex" k="41" />
-<hkern g1="k" g2="otilde" k="41" />
-<hkern g1="k" g2="odieresis" k="41" />
-<hkern g1="k" g2="oslash" k="41" />
-<hkern g1="k" g2="oe" k="41" />
-<hkern g1="m" g2="quotedbl" k="20" />
-<hkern g1="m" g2="quotesingle" k="20" />
-<hkern g1="m" g2="quoteright" k="20" />
-<hkern g1="m" g2="quotedblright" k="20" />
-<hkern g1="n" g2="quotedbl" k="20" />
-<hkern g1="n" g2="quotesingle" k="20" />
-<hkern g1="n" g2="quoteright" k="20" />
-<hkern g1="n" g2="quotedblright" k="20" />
-<hkern g1="o" g2="quotedbl" k="20" />
-<hkern g1="o" g2="quotesingle" k="20" />
-<hkern g1="o" g2="v" k="41" />
-<hkern g1="o" g2="w" k="41" />
-<hkern g1="o" g2="x" k="41" />
-<hkern g1="o" g2="y" k="41" />
-<hkern g1="o" g2="z" k="20" />
-<hkern g1="o" g2="yacute" k="41" />
-<hkern g1="o" g2="quoteright" k="20" />
-<hkern g1="o" g2="quotedblright" k="20" />
-<hkern g1="p" g2="quotedbl" k="20" />
-<hkern g1="p" g2="quotesingle" k="20" />
-<hkern g1="p" g2="v" k="41" />
-<hkern g1="p" g2="w" k="41" />
-<hkern g1="p" g2="x" k="41" />
-<hkern g1="p" g2="y" k="41" />
-<hkern g1="p" g2="z" k="20" />
-<hkern g1="p" g2="yacute" k="41" />
-<hkern g1="p" g2="quoteright" k="20" />
-<hkern g1="p" g2="quotedblright" k="20" />
-<hkern g1="r" g2="quotedbl" k="-82" />
-<hkern g1="r" g2="quotesingle" k="-82" />
-<hkern g1="r" g2="a" k="41" />
-<hkern g1="r" g2="c" k="41" />
-<hkern g1="r" g2="d" k="41" />
-<hkern g1="r" g2="e" k="41" />
-<hkern g1="r" g2="g" k="20" />
-<hkern g1="r" g2="o" k="41" />
-<hkern g1="r" g2="q" k="41" />
-<hkern g1="r" g2="agrave" k="41" />
-<hkern g1="r" g2="aacute" k="41" />
-<hkern g1="r" g2="acircumflex" k="41" />
-<hkern g1="r" g2="atilde" k="41" />
-<hkern g1="r" g2="adieresis" k="41" />
-<hkern g1="r" g2="aring" k="41" />
-<hkern g1="r" g2="ae" k="41" />
-<hkern g1="r" g2="ccedilla" k="41" />
-<hkern g1="r" g2="egrave" k="41" />
-<hkern g1="r" g2="eacute" k="41" />
-<hkern g1="r" g2="ecircumflex" k="41" />
-<hkern g1="r" g2="edieresis" k="41" />
-<hkern g1="r" g2="ograve" k="41" />
-<hkern g1="r" g2="oacute" k="41" />
-<hkern g1="r" g2="ocircumflex" k="41" />
-<hkern g1="r" g2="otilde" k="41" />
-<hkern g1="r" g2="odieresis" k="41" />
-<hkern g1="r" g2="oslash" k="41" />
-<hkern g1="r" g2="oe" k="41" />
-<hkern g1="r" g2="quoteright" k="-82" />
-<hkern g1="r" g2="quotedblright" k="-82" />
-<hkern g1="t" g2="quotedbl" k="-41" />
-<hkern g1="t" g2="quotesingle" k="-41" />
-<hkern g1="t" g2="quoteright" k="-41" />
-<hkern g1="t" g2="quotedblright" k="-41" />
-<hkern g1="v" g2="quotedbl" k="-82" />
-<hkern g1="v" g2="quotesingle" k="-82" />
-<hkern g1="v" g2="comma" k="82" />
-<hkern g1="v" g2="period" k="82" />
-<hkern g1="v" g2="question" k="-41" />
-<hkern g1="v" g2="quoteright" k="-82" />
-<hkern g1="v" g2="quotesinglbase" k="82" />
-<hkern g1="v" g2="quotedblright" k="-82" />
-<hkern g1="v" g2="quotedblbase" k="82" />
-<hkern g1="w" g2="quotedbl" k="-82" />
-<hkern g1="w" g2="quotesingle" k="-82" />
-<hkern g1="w" g2="comma" k="82" />
-<hkern g1="w" g2="period" k="82" />
-<hkern g1="w" g2="question" k="-41" />
-<hkern g1="w" g2="quoteright" k="-82" />
-<hkern g1="w" g2="quotesinglbase" k="82" />
-<hkern g1="w" g2="quotedblright" k="-82" />
-<hkern g1="w" g2="quotedblbase" k="82" />
-<hkern g1="x" g2="c" k="41" />
-<hkern g1="x" g2="d" k="41" />
-<hkern g1="x" g2="e" k="41" />
-<hkern g1="x" g2="o" k="41" />
-<hkern g1="x" g2="q" k="41" />
-<hkern g1="x" g2="agrave" k="41" />
-<hkern g1="x" g2="ccedilla" k="41" />
-<hkern g1="x" g2="egrave" k="41" />
-<hkern g1="x" g2="eacute" k="41" />
-<hkern g1="x" g2="ecircumflex" k="41" />
-<hkern g1="x" g2="edieresis" k="41" />
-<hkern g1="x" g2="ograve" k="41" />
-<hkern g1="x" g2="oacute" k="41" />
-<hkern g1="x" g2="ocircumflex" k="41" />
-<hkern g1="x" g2="otilde" k="41" />
-<hkern g1="x" g2="odieresis" k="41" />
-<hkern g1="x" g2="oslash" k="41" />
-<hkern g1="x" g2="oe" k="41" />
-<hkern g1="y" g2="quotedbl" k="-82" />
-<hkern g1="y" g2="quotesingle" k="-82" />
-<hkern g1="y" g2="comma" k="82" />
-<hkern g1="y" g2="period" k="82" />
-<hkern g1="y" g2="question" k="-41" />
-<hkern g1="y" g2="quoteright" k="-82" />
-<hkern g1="y" g2="quotesinglbase" k="82" />
-<hkern g1="y" g2="quotedblright" k="-82" />
-<hkern g1="y" g2="quotedblbase" k="82" />
-<hkern g1="braceleft" g2="J" k="-184" />
-<hkern g1="Agrave" g2="quotedbl" k="143" />
-<hkern g1="Agrave" g2="quotesingle" k="143" />
-<hkern g1="Agrave" g2="C" k="41" />
-<hkern g1="Agrave" g2="G" k="41" />
-<hkern g1="Agrave" g2="J" k="-266" />
-<hkern g1="Agrave" g2="O" k="41" />
-<hkern g1="Agrave" g2="Q" k="41" />
-<hkern g1="Agrave" g2="T" k="143" />
-<hkern g1="Agrave" g2="V" k="82" />
-<hkern g1="Agrave" g2="W" k="82" />
-<hkern g1="Agrave" g2="Y" k="123" />
-<hkern g1="Agrave" g2="Ccedilla" k="41" />
-<hkern g1="Agrave" g2="Ograve" k="41" />
-<hkern g1="Agrave" g2="Oacute" k="41" />
-<hkern g1="Agrave" g2="Ocircumflex" k="41" />
-<hkern g1="Agrave" g2="Otilde" k="41" />
-<hkern g1="Agrave" g2="Odieresis" k="41" />
-<hkern g1="Agrave" g2="Oslash" k="41" />
-<hkern g1="Agrave" g2="Yacute" k="123" />
-<hkern g1="Agrave" g2="OE" k="41" />
-<hkern g1="Agrave" g2="quoteright" k="143" />
-<hkern g1="Agrave" g2="quotedblright" k="143" />
-<hkern g1="Aacute" g2="quotedbl" k="143" />
-<hkern g1="Aacute" g2="quotesingle" k="143" />
-<hkern g1="Aacute" g2="C" k="41" />
-<hkern g1="Aacute" g2="G" k="41" />
-<hkern g1="Aacute" g2="J" k="-266" />
-<hkern g1="Aacute" g2="O" k="41" />
-<hkern g1="Aacute" g2="Q" k="41" />
-<hkern g1="Aacute" g2="T" k="143" />
-<hkern g1="Aacute" g2="V" k="82" />
-<hkern g1="Aacute" g2="W" k="82" />
-<hkern g1="Aacute" g2="Y" k="123" />
-<hkern g1="Aacute" g2="Ccedilla" k="41" />
-<hkern g1="Aacute" g2="Ograve" k="41" />
-<hkern g1="Aacute" g2="Oacute" k="41" />
-<hkern g1="Aacute" g2="Ocircumflex" k="41" />
-<hkern g1="Aacute" g2="Otilde" k="41" />
-<hkern g1="Aacute" g2="Odieresis" k="41" />
-<hkern g1="Aacute" g2="Oslash" k="41" />
-<hkern g1="Aacute" g2="Yacute" k="123" />
-<hkern g1="Aacute" g2="OE" k="41" />
-<hkern g1="Aacute" g2="quoteright" k="143" />
-<hkern g1="Aacute" g2="quotedblright" k="143" />
-<hkern g1="Acircumflex" g2="quotedbl" k="143" />
-<hkern g1="Acircumflex" g2="quotesingle" k="143" />
-<hkern g1="Acircumflex" g2="C" k="41" />
-<hkern g1="Acircumflex" g2="G" k="41" />
-<hkern g1="Acircumflex" g2="J" k="-266" />
-<hkern g1="Acircumflex" g2="O" k="41" />
-<hkern g1="Acircumflex" g2="Q" k="41" />
-<hkern g1="Acircumflex" g2="T" k="143" />
-<hkern g1="Acircumflex" g2="V" k="82" />
-<hkern g1="Acircumflex" g2="W" k="82" />
-<hkern g1="Acircumflex" g2="Y" k="123" />
-<hkern g1="Acircumflex" g2="Ccedilla" k="41" />
-<hkern g1="Acircumflex" g2="Ograve" k="41" />
-<hkern g1="Acircumflex" g2="Oacute" k="41" />
-<hkern g1="Acircumflex" g2="Ocircumflex" k="41" />
-<hkern g1="Acircumflex" g2="Otilde" k="41" />
-<hkern g1="Acircumflex" g2="Odieresis" k="41" />
-<hkern g1="Acircumflex" g2="Oslash" k="41" />
-<hkern g1="Acircumflex" g2="Yacute" k="123" />
-<hkern g1="Acircumflex" g2="OE" k="41" />
-<hkern g1="Acircumflex" g2="quoteright" k="143" />
-<hkern g1="Acircumflex" g2="quotedblright" k="143" />
-<hkern g1="Atilde" g2="quotedbl" k="143" />
-<hkern g1="Atilde" g2="quotesingle" k="143" />
-<hkern g1="Atilde" g2="C" k="41" />
-<hkern g1="Atilde" g2="G" k="41" />
-<hkern g1="Atilde" g2="J" k="-266" />
-<hkern g1="Atilde" g2="O" k="41" />
-<hkern g1="Atilde" g2="Q" k="41" />
-<hkern g1="Atilde" g2="T" k="143" />
-<hkern g1="Atilde" g2="V" k="82" />
-<hkern g1="Atilde" g2="W" k="82" />
-<hkern g1="Atilde" g2="Y" k="123" />
-<hkern g1="Atilde" g2="Ccedilla" k="41" />
-<hkern g1="Atilde" g2="Ograve" k="41" />
-<hkern g1="Atilde" g2="Oacute" k="41" />
-<hkern g1="Atilde" g2="Ocircumflex" k="41" />
-<hkern g1="Atilde" g2="Otilde" k="41" />
-<hkern g1="Atilde" g2="Odieresis" k="41" />
-<hkern g1="Atilde" g2="Oslash" k="41" />
-<hkern g1="Atilde" g2="Yacute" k="123" />
-<hkern g1="Atilde" g2="OE" k="41" />
-<hkern g1="Atilde" g2="quoteright" k="143" />
-<hkern g1="Atilde" g2="quotedblright" k="143" />
-<hkern g1="Adieresis" g2="quotedbl" k="143" />
-<hkern g1="Adieresis" g2="quotesingle" k="143" />
-<hkern g1="Adieresis" g2="C" k="41" />
-<hkern g1="Adieresis" g2="G" k="41" />
-<hkern g1="Adieresis" g2="J" k="-266" />
-<hkern g1="Adieresis" g2="O" k="41" />
-<hkern g1="Adieresis" g2="Q" k="41" />
-<hkern g1="Adieresis" g2="T" k="143" />
-<hkern g1="Adieresis" g2="V" k="82" />
-<hkern g1="Adieresis" g2="W" k="82" />
-<hkern g1="Adieresis" g2="Y" k="123" />
-<hkern g1="Adieresis" g2="Ccedilla" k="41" />
-<hkern g1="Adieresis" g2="Ograve" k="41" />
-<hkern g1="Adieresis" g2="Oacute" k="41" />
-<hkern g1="Adieresis" g2="Ocircumflex" k="41" />
-<hkern g1="Adieresis" g2="Otilde" k="41" />
-<hkern g1="Adieresis" g2="Odieresis" k="41" />
-<hkern g1="Adieresis" g2="Oslash" k="41" />
-<hkern g1="Adieresis" g2="Yacute" k="123" />
-<hkern g1="Adieresis" g2="OE" k="41" />
-<hkern g1="Adieresis" g2="quoteright" k="143" />
-<hkern g1="Adieresis" g2="quotedblright" k="143" />
-<hkern g1="Aring" g2="quotedbl" k="143" />
-<hkern g1="Aring" g2="quotesingle" k="143" />
-<hkern g1="Aring" g2="C" k="41" />
-<hkern g1="Aring" g2="G" k="41" />
-<hkern g1="Aring" g2="J" k="-266" />
-<hkern g1="Aring" g2="O" k="41" />
-<hkern g1="Aring" g2="Q" k="41" />
-<hkern g1="Aring" g2="T" k="143" />
-<hkern g1="Aring" g2="V" k="82" />
-<hkern g1="Aring" g2="W" k="82" />
-<hkern g1="Aring" g2="Y" k="123" />
-<hkern g1="Aring" g2="Ccedilla" k="41" />
-<hkern g1="Aring" g2="Ograve" k="41" />
-<hkern g1="Aring" g2="Oacute" k="41" />
-<hkern g1="Aring" g2="Ocircumflex" k="41" />
-<hkern g1="Aring" g2="Otilde" k="41" />
-<hkern g1="Aring" g2="Odieresis" k="41" />
-<hkern g1="Aring" g2="Oslash" k="41" />
-<hkern g1="Aring" g2="Yacute" k="123" />
-<hkern g1="Aring" g2="OE" k="41" />
-<hkern g1="Aring" g2="quoteright" k="143" />
-<hkern g1="Aring" g2="quotedblright" k="143" />
-<hkern g1="AE" g2="J" k="-123" />
-<hkern g1="Ccedilla" g2="C" k="41" />
-<hkern g1="Ccedilla" g2="G" k="41" />
-<hkern g1="Ccedilla" g2="O" k="41" />
-<hkern g1="Ccedilla" g2="Q" k="41" />
-<hkern g1="Ccedilla" g2="Ccedilla" k="41" />
-<hkern g1="Ccedilla" g2="Ograve" k="41" />
-<hkern g1="Ccedilla" g2="Oacute" k="41" />
-<hkern g1="Ccedilla" g2="Ocircumflex" k="41" />
-<hkern g1="Ccedilla" g2="Otilde" k="41" />
-<hkern g1="Ccedilla" g2="Odieresis" k="41" />
-<hkern g1="Ccedilla" g2="Oslash" k="41" />
-<hkern g1="Ccedilla" g2="OE" k="41" />
-<hkern g1="Egrave" g2="J" k="-123" />
-<hkern g1="Eacute" g2="J" k="-123" />
-<hkern g1="Ecircumflex" g2="J" k="-123" />
-<hkern g1="Edieresis" g2="J" k="-123" />
-<hkern g1="Eth" g2="comma" k="82" />
-<hkern g1="Eth" g2="period" k="82" />
-<hkern g1="Eth" g2="A" k="41" />
-<hkern g1="Eth" g2="T" k="61" />
-<hkern g1="Eth" g2="V" k="20" />
-<hkern g1="Eth" g2="W" k="20" />
-<hkern g1="Eth" g2="X" k="41" />
-<hkern g1="Eth" g2="Y" k="20" />
-<hkern g1="Eth" g2="Z" k="20" />
-<hkern g1="Eth" g2="Agrave" k="41" />
-<hkern g1="Eth" g2="Aacute" k="41" />
-<hkern g1="Eth" g2="Acircumflex" k="41" />
-<hkern g1="Eth" g2="Atilde" k="41" />
-<hkern g1="Eth" g2="Adieresis" k="41" />
-<hkern g1="Eth" g2="Aring" k="41" />
-<hkern g1="Eth" g2="Yacute" k="20" />
-<hkern g1="Eth" g2="quotesinglbase" k="82" />
-<hkern g1="Eth" g2="quotedblbase" k="82" />
-<hkern g1="Ograve" g2="comma" k="82" />
-<hkern g1="Ograve" g2="period" k="82" />
-<hkern g1="Ograve" g2="A" k="41" />
-<hkern g1="Ograve" g2="T" k="61" />
-<hkern g1="Ograve" g2="V" k="20" />
-<hkern g1="Ograve" g2="W" k="20" />
-<hkern g1="Ograve" g2="X" k="41" />
-<hkern g1="Ograve" g2="Y" k="20" />
-<hkern g1="Ograve" g2="Z" k="20" />
-<hkern g1="Ograve" g2="Agrave" k="41" />
-<hkern g1="Ograve" g2="Aacute" k="41" />
-<hkern g1="Ograve" g2="Acircumflex" k="41" />
-<hkern g1="Ograve" g2="Atilde" k="41" />
-<hkern g1="Ograve" g2="Adieresis" k="41" />
-<hkern g1="Ograve" g2="Aring" k="41" />
-<hkern g1="Ograve" g2="Yacute" k="20" />
-<hkern g1="Ograve" g2="quotesinglbase" k="82" />
-<hkern g1="Ograve" g2="quotedblbase" k="82" />
-<hkern g1="Oacute" g2="comma" k="82" />
-<hkern g1="Oacute" g2="period" k="82" />
-<hkern g1="Oacute" g2="A" k="41" />
-<hkern g1="Oacute" g2="T" k="61" />
-<hkern g1="Oacute" g2="V" k="20" />
-<hkern g1="Oacute" g2="W" k="20" />
-<hkern g1="Oacute" g2="X" k="41" />
-<hkern g1="Oacute" g2="Y" k="20" />
-<hkern g1="Oacute" g2="Z" k="20" />
-<hkern g1="Oacute" g2="Agrave" k="41" />
-<hkern g1="Oacute" g2="Aacute" k="41" />
-<hkern g1="Oacute" g2="Acircumflex" k="41" />
-<hkern g1="Oacute" g2="Atilde" k="41" />
-<hkern g1="Oacute" g2="Adieresis" k="41" />
-<hkern g1="Oacute" g2="Aring" k="41" />
-<hkern g1="Oacute" g2="Yacute" k="20" />
-<hkern g1="Oacute" g2="quotesinglbase" k="82" />
-<hkern g1="Oacute" g2="quotedblbase" k="82" />
-<hkern g1="Ocircumflex" g2="comma" k="82" />
-<hkern g1="Ocircumflex" g2="period" k="82" />
-<hkern g1="Ocircumflex" g2="A" k="41" />
-<hkern g1="Ocircumflex" g2="T" k="61" />
-<hkern g1="Ocircumflex" g2="V" k="20" />
-<hkern g1="Ocircumflex" g2="W" k="20" />
-<hkern g1="Ocircumflex" g2="X" k="41" />
-<hkern g1="Ocircumflex" g2="Y" k="20" />
-<hkern g1="Ocircumflex" g2="Z" k="20" />
-<hkern g1="Ocircumflex" g2="Agrave" k="41" />
-<hkern g1="Ocircumflex" g2="Aacute" k="41" />
-<hkern g1="Ocircumflex" g2="Acircumflex" k="41" />
-<hkern g1="Ocircumflex" g2="Atilde" k="41" />
-<hkern g1="Ocircumflex" g2="Adieresis" k="41" />
-<hkern g1="Ocircumflex" g2="Aring" k="41" />
-<hkern g1="Ocircumflex" g2="Yacute" k="20" />
-<hkern g1="Ocircumflex" g2="quotesinglbase" k="82" />
-<hkern g1="Ocircumflex" g2="quotedblbase" k="82" />
-<hkern g1="Otilde" g2="comma" k="82" />
-<hkern g1="Otilde" g2="period" k="82" />
-<hkern g1="Otilde" g2="A" k="41" />
-<hkern g1="Otilde" g2="T" k="61" />
-<hkern g1="Otilde" g2="V" k="20" />
-<hkern g1="Otilde" g2="W" k="20" />
-<hkern g1="Otilde" g2="X" k="41" />
-<hkern g1="Otilde" g2="Y" k="20" />
-<hkern g1="Otilde" g2="Z" k="20" />
-<hkern g1="Otilde" g2="Agrave" k="41" />
-<hkern g1="Otilde" g2="Aacute" k="41" />
-<hkern g1="Otilde" g2="Acircumflex" k="41" />
-<hkern g1="Otilde" g2="Atilde" k="41" />
-<hkern g1="Otilde" g2="Adieresis" k="41" />
-<hkern g1="Otilde" g2="Aring" k="41" />
-<hkern g1="Otilde" g2="Yacute" k="20" />
-<hkern g1="Otilde" g2="quotesinglbase" k="82" />
-<hkern g1="Otilde" g2="quotedblbase" k="82" />
-<hkern g1="Odieresis" g2="comma" k="82" />
-<hkern g1="Odieresis" g2="period" k="82" />
-<hkern g1="Odieresis" g2="A" k="41" />
-<hkern g1="Odieresis" g2="T" k="61" />
-<hkern g1="Odieresis" g2="V" k="20" />
-<hkern g1="Odieresis" g2="W" k="20" />
-<hkern g1="Odieresis" g2="X" k="41" />
-<hkern g1="Odieresis" g2="Y" k="20" />
-<hkern g1="Odieresis" g2="Z" k="20" />
-<hkern g1="Odieresis" g2="Agrave" k="41" />
-<hkern g1="Odieresis" g2="Aacute" k="41" />
-<hkern g1="Odieresis" g2="Acircumflex" k="41" />
-<hkern g1="Odieresis" g2="Atilde" k="41" />
-<hkern g1="Odieresis" g2="Adieresis" k="41" />
-<hkern g1="Odieresis" g2="Aring" k="41" />
-<hkern g1="Odieresis" g2="Yacute" k="20" />
-<hkern g1="Odieresis" g2="quotesinglbase" k="82" />
-<hkern g1="Odieresis" g2="quotedblbase" k="82" />
-<hkern g1="Oslash" g2="comma" k="82" />
-<hkern g1="Oslash" g2="period" k="82" />
-<hkern g1="Oslash" g2="A" k="41" />
-<hkern g1="Oslash" g2="T" k="61" />
-<hkern g1="Oslash" g2="V" k="20" />
-<hkern g1="Oslash" g2="W" k="20" />
-<hkern g1="Oslash" g2="X" k="41" />
-<hkern g1="Oslash" g2="Y" k="20" />
-<hkern g1="Oslash" g2="Z" k="20" />
-<hkern g1="Oslash" g2="Agrave" k="41" />
-<hkern g1="Oslash" g2="Aacute" k="41" />
-<hkern g1="Oslash" g2="Acircumflex" k="41" />
-<hkern g1="Oslash" g2="Atilde" k="41" />
-<hkern g1="Oslash" g2="Adieresis" k="41" />
-<hkern g1="Oslash" g2="Aring" k="41" />
-<hkern g1="Oslash" g2="Yacute" k="20" />
-<hkern g1="Oslash" g2="quotesinglbase" k="82" />
-<hkern g1="Oslash" g2="quotedblbase" k="82" />
-<hkern g1="Ugrave" g2="comma" k="41" />
-<hkern g1="Ugrave" g2="period" k="41" />
-<hkern g1="Ugrave" g2="A" k="20" />
-<hkern g1="Ugrave" g2="Agrave" k="20" />
-<hkern g1="Ugrave" g2="Aacute" k="20" />
-<hkern g1="Ugrave" g2="Acircumflex" k="20" />
-<hkern g1="Ugrave" g2="Atilde" k="20" />
-<hkern g1="Ugrave" g2="Adieresis" k="20" />
-<hkern g1="Ugrave" g2="Aring" k="20" />
-<hkern g1="Ugrave" g2="quotesinglbase" k="41" />
-<hkern g1="Ugrave" g2="quotedblbase" k="41" />
-<hkern g1="Uacute" g2="comma" k="41" />
-<hkern g1="Uacute" g2="period" k="41" />
-<hkern g1="Uacute" g2="A" k="20" />
-<hkern g1="Uacute" g2="Agrave" k="20" />
-<hkern g1="Uacute" g2="Aacute" k="20" />
-<hkern g1="Uacute" g2="Acircumflex" k="20" />
-<hkern g1="Uacute" g2="Atilde" k="20" />
-<hkern g1="Uacute" g2="Adieresis" k="20" />
-<hkern g1="Uacute" g2="Aring" k="20" />
-<hkern g1="Uacute" g2="quotesinglbase" k="41" />
-<hkern g1="Uacute" g2="quotedblbase" k="41" />
-<hkern g1="Ucircumflex" g2="comma" k="41" />
-<hkern g1="Ucircumflex" g2="period" k="41" />
-<hkern g1="Ucircumflex" g2="A" k="20" />
-<hkern g1="Ucircumflex" g2="Agrave" k="20" />
-<hkern g1="Ucircumflex" g2="Aacute" k="20" />
-<hkern g1="Ucircumflex" g2="Acircumflex" k="20" />
-<hkern g1="Ucircumflex" g2="Atilde" k="20" />
-<hkern g1="Ucircumflex" g2="Adieresis" k="20" />
-<hkern g1="Ucircumflex" g2="Aring" k="20" />
-<hkern g1="Ucircumflex" g2="quotesinglbase" k="41" />
-<hkern g1="Ucircumflex" g2="quotedblbase" k="41" />
-<hkern g1="Udieresis" g2="comma" k="41" />
-<hkern g1="Udieresis" g2="period" k="41" />
-<hkern g1="Udieresis" g2="A" k="20" />
-<hkern g1="Udieresis" g2="Agrave" k="20" />
-<hkern g1="Udieresis" g2="Aacute" k="20" />
-<hkern g1="Udieresis" g2="Acircumflex" k="20" />
-<hkern g1="Udieresis" g2="Atilde" k="20" />
-<hkern g1="Udieresis" g2="Adieresis" k="20" />
-<hkern g1="Udieresis" g2="Aring" k="20" />
-<hkern g1="Udieresis" g2="quotesinglbase" k="41" />
-<hkern g1="Udieresis" g2="quotedblbase" k="41" />
-<hkern g1="Yacute" g2="comma" k="123" />
-<hkern g1="Yacute" g2="period" k="123" />
-<hkern g1="Yacute" g2="question" k="-41" />
-<hkern g1="Yacute" g2="A" k="123" />
-<hkern g1="Yacute" g2="C" k="41" />
-<hkern g1="Yacute" g2="G" k="41" />
-<hkern g1="Yacute" g2="O" k="41" />
-<hkern g1="Yacute" g2="Q" k="41" />
-<hkern g1="Yacute" g2="a" k="102" />
-<hkern g1="Yacute" g2="c" k="102" />
-<hkern g1="Yacute" g2="d" k="102" />
-<hkern g1="Yacute" g2="e" k="102" />
-<hkern g1="Yacute" g2="g" k="41" />
-<hkern g1="Yacute" g2="m" k="61" />
-<hkern g1="Yacute" g2="n" k="61" />
-<hkern g1="Yacute" g2="o" k="102" />
-<hkern g1="Yacute" g2="p" k="61" />
-<hkern g1="Yacute" g2="q" k="102" />
-<hkern g1="Yacute" g2="r" k="61" />
-<hkern g1="Yacute" g2="s" k="82" />
-<hkern g1="Yacute" g2="u" k="61" />
-<hkern g1="Yacute" g2="z" k="41" />
-<hkern g1="Yacute" g2="Agrave" k="123" />
-<hkern g1="Yacute" g2="Aacute" k="123" />
-<hkern g1="Yacute" g2="Acircumflex" k="123" />
-<hkern g1="Yacute" g2="Atilde" k="123" />
-<hkern g1="Yacute" g2="Adieresis" k="123" />
-<hkern g1="Yacute" g2="Aring" k="123" />
-<hkern g1="Yacute" g2="Ccedilla" k="41" />
-<hkern g1="Yacute" g2="Ograve" k="41" />
-<hkern g1="Yacute" g2="Oacute" k="41" />
-<hkern g1="Yacute" g2="Ocircumflex" k="41" />
-<hkern g1="Yacute" g2="Otilde" k="41" />
-<hkern g1="Yacute" g2="Odieresis" k="41" />
-<hkern g1="Yacute" g2="Oslash" k="41" />
-<hkern g1="Yacute" g2="agrave" k="102" />
-<hkern g1="Yacute" g2="aacute" k="102" />
-<hkern g1="Yacute" g2="acircumflex" k="102" />
-<hkern g1="Yacute" g2="atilde" k="102" />
-<hkern g1="Yacute" g2="adieresis" k="102" />
-<hkern g1="Yacute" g2="aring" k="102" />
-<hkern g1="Yacute" g2="ae" k="102" />
-<hkern g1="Yacute" g2="ccedilla" k="102" />
-<hkern g1="Yacute" g2="egrave" k="102" />
-<hkern g1="Yacute" g2="eacute" k="102" />
-<hkern g1="Yacute" g2="ecircumflex" k="102" />
-<hkern g1="Yacute" g2="edieresis" k="102" />
-<hkern g1="Yacute" g2="ograve" k="102" />
-<hkern g1="Yacute" g2="oacute" k="102" />
-<hkern g1="Yacute" g2="ocircumflex" k="102" />
-<hkern g1="Yacute" g2="otilde" k="102" />
-<hkern g1="Yacute" g2="odieresis" k="102" />
-<hkern g1="Yacute" g2="oslash" k="102" />
-<hkern g1="Yacute" g2="ugrave" k="61" />
-<hkern g1="Yacute" g2="uacute" k="61" />
-<hkern g1="Yacute" g2="ucircumflex" k="61" />
-<hkern g1="Yacute" g2="udieresis" k="61" />
-<hkern g1="Yacute" g2="OE" k="41" />
-<hkern g1="Yacute" g2="oe" k="102" />
-<hkern g1="Yacute" g2="quotesinglbase" k="123" />
-<hkern g1="Yacute" g2="quotedblbase" k="123" />
-<hkern g1="Thorn" g2="comma" k="266" />
-<hkern g1="Thorn" g2="period" k="266" />
-<hkern g1="Thorn" g2="A" k="102" />
-<hkern g1="Thorn" g2="X" k="41" />
-<hkern g1="Thorn" g2="Z" k="20" />
-<hkern g1="Thorn" g2="Agrave" k="102" />
-<hkern g1="Thorn" g2="Aacute" k="102" />
-<hkern g1="Thorn" g2="Acircumflex" k="102" />
-<hkern g1="Thorn" g2="Atilde" k="102" />
-<hkern g1="Thorn" g2="Adieresis" k="102" />
-<hkern g1="Thorn" g2="Aring" k="102" />
-<hkern g1="Thorn" g2="quotesinglbase" k="266" />
-<hkern g1="Thorn" g2="quotedblbase" k="266" />
-<hkern g1="agrave" g2="quotedbl" k="20" />
-<hkern g1="agrave" g2="quotesingle" k="20" />
-<hkern g1="agrave" g2="quoteright" k="20" />
-<hkern g1="agrave" g2="quotedblright" k="20" />
-<hkern g1="aacute" g2="quotedbl" k="20" />
-<hkern g1="aacute" g2="quotesingle" k="20" />
-<hkern g1="aacute" g2="quoteright" k="20" />
-<hkern g1="aacute" g2="quotedblright" k="20" />
-<hkern g1="acircumflex" g2="quotedbl" k="20" />
-<hkern g1="acircumflex" g2="quotesingle" k="20" />
-<hkern g1="acircumflex" g2="quoteright" k="20" />
-<hkern g1="acircumflex" g2="quotedblright" k="20" />
-<hkern g1="atilde" g2="quotedbl" k="20" />
-<hkern g1="atilde" g2="quotesingle" k="20" />
-<hkern g1="atilde" g2="quoteright" k="20" />
-<hkern g1="atilde" g2="quotedblright" k="20" />
-<hkern g1="adieresis" g2="quotedbl" k="20" />
-<hkern g1="adieresis" g2="quotesingle" k="20" />
-<hkern g1="adieresis" g2="quoteright" k="20" />
-<hkern g1="adieresis" g2="quotedblright" k="20" />
-<hkern g1="aring" g2="quotedbl" k="20" />
-<hkern g1="aring" g2="quotesingle" k="20" />
-<hkern g1="aring" g2="quoteright" k="20" />
-<hkern g1="aring" g2="quotedblright" k="20" />
-<hkern g1="egrave" g2="quotedbl" k="20" />
-<hkern g1="egrave" g2="quotesingle" k="20" />
-<hkern g1="egrave" g2="v" k="41" />
-<hkern g1="egrave" g2="w" k="41" />
-<hkern g1="egrave" g2="x" k="41" />
-<hkern g1="egrave" g2="y" k="41" />
-<hkern g1="egrave" g2="z" k="20" />
-<hkern g1="egrave" g2="yacute" k="41" />
-<hkern g1="egrave" g2="quoteright" k="20" />
-<hkern g1="egrave" g2="quotedblright" k="20" />
-<hkern g1="eacute" g2="quotedbl" k="20" />
-<hkern g1="eacute" g2="quotesingle" k="20" />
-<hkern g1="eacute" g2="v" k="41" />
-<hkern g1="eacute" g2="w" k="41" />
-<hkern g1="eacute" g2="x" k="41" />
-<hkern g1="eacute" g2="y" k="41" />
-<hkern g1="eacute" g2="z" k="20" />
-<hkern g1="eacute" g2="yacute" k="41" />
-<hkern g1="eacute" g2="quoteright" k="20" />
-<hkern g1="eacute" g2="quotedblright" k="20" />
-<hkern g1="ecircumflex" g2="quotedbl" k="20" />
-<hkern g1="ecircumflex" g2="quotesingle" k="20" />
-<hkern g1="ecircumflex" g2="v" k="41" />
-<hkern g1="ecircumflex" g2="w" k="41" />
-<hkern g1="ecircumflex" g2="x" k="41" />
-<hkern g1="ecircumflex" g2="y" k="41" />
-<hkern g1="ecircumflex" g2="z" k="20" />
-<hkern g1="ecircumflex" g2="yacute" k="41" />
-<hkern g1="ecircumflex" g2="quoteright" k="20" />
-<hkern g1="ecircumflex" g2="quotedblright" k="20" />
-<hkern g1="edieresis" g2="quotedbl" k="20" />
-<hkern g1="edieresis" g2="quotesingle" k="20" />
-<hkern g1="edieresis" g2="v" k="41" />
-<hkern g1="edieresis" g2="w" k="41" />
-<hkern g1="edieresis" g2="x" k="41" />
-<hkern g1="edieresis" g2="y" k="41" />
-<hkern g1="edieresis" g2="z" k="20" />
-<hkern g1="edieresis" g2="yacute" k="41" />
-<hkern g1="edieresis" g2="quoteright" k="20" />
-<hkern g1="edieresis" g2="quotedblright" k="20" />
-<hkern g1="eth" g2="quotedbl" k="20" />
-<hkern g1="eth" g2="quotesingle" k="20" />
-<hkern g1="eth" g2="v" k="41" />
-<hkern g1="eth" g2="w" k="41" />
-<hkern g1="eth" g2="x" k="41" />
-<hkern g1="eth" g2="y" k="41" />
-<hkern g1="eth" g2="z" k="20" />
-<hkern g1="eth" g2="yacute" k="41" />
-<hkern g1="eth" g2="quoteright" k="20" />
-<hkern g1="eth" g2="quotedblright" k="20" />
-<hkern g1="ograve" g2="quotedbl" k="20" />
-<hkern g1="ograve" g2="quotesingle" k="20" />
-<hkern g1="ograve" g2="v" k="41" />
-<hkern g1="ograve" g2="w" k="41" />
-<hkern g1="ograve" g2="x" k="41" />
-<hkern g1="ograve" g2="y" k="41" />
-<hkern g1="ograve" g2="z" k="20" />
-<hkern g1="ograve" g2="yacute" k="41" />
-<hkern g1="ograve" g2="quoteright" k="20" />
-<hkern g1="ograve" g2="quotedblright" k="20" />
-<hkern g1="oacute" g2="quotedbl" k="20" />
-<hkern g1="oacute" g2="quotesingle" k="20" />
-<hkern g1="oacute" g2="v" k="41" />
-<hkern g1="oacute" g2="w" k="41" />
-<hkern g1="oacute" g2="x" k="41" />
-<hkern g1="oacute" g2="y" k="41" />
-<hkern g1="oacute" g2="z" k="20" />
-<hkern g1="oacute" g2="yacute" k="41" />
-<hkern g1="oacute" g2="quoteright" k="20" />
-<hkern g1="oacute" g2="quotedblright" k="20" />
-<hkern g1="ocircumflex" g2="quotedbl" k="20" />
-<hkern g1="ocircumflex" g2="quotesingle" k="20" />
-<hkern g1="ocircumflex" g2="v" k="41" />
-<hkern g1="ocircumflex" g2="w" k="41" />
-<hkern g1="ocircumflex" g2="x" k="41" />
-<hkern g1="ocircumflex" g2="y" k="41" />
-<hkern g1="ocircumflex" g2="z" k="20" />
-<hkern g1="ocircumflex" g2="yacute" k="41" />
-<hkern g1="ocircumflex" g2="quoteright" k="20" />
-<hkern g1="ocircumflex" g2="quotedblright" k="20" />
-<hkern g1="odieresis" g2="quotedbl" k="41" />
-<hkern g1="odieresis" g2="quotesingle" k="41" />
-<hkern g1="odieresis" g2="quoteright" k="41" />
-<hkern g1="odieresis" g2="quotedblright" k="41" />
-<hkern g1="oslash" g2="quotedbl" k="20" />
-<hkern g1="oslash" g2="quotesingle" k="20" />
-<hkern g1="oslash" g2="v" k="41" />
-<hkern g1="oslash" g2="w" k="41" />
-<hkern g1="oslash" g2="x" k="41" />
-<hkern g1="oslash" g2="y" k="41" />
-<hkern g1="oslash" g2="z" k="20" />
-<hkern g1="oslash" g2="yacute" k="41" />
-<hkern g1="oslash" g2="quoteright" k="20" />
-<hkern g1="oslash" g2="quotedblright" k="20" />
-<hkern g1="yacute" g2="quotedbl" k="-82" />
-<hkern g1="yacute" g2="quotesingle" k="-82" />
-<hkern g1="yacute" g2="comma" k="82" />
-<hkern g1="yacute" g2="period" k="82" />
-<hkern g1="yacute" g2="question" k="-41" />
-<hkern g1="yacute" g2="quoteright" k="-82" />
-<hkern g1="yacute" g2="quotesinglbase" k="82" />
-<hkern g1="yacute" g2="quotedblright" k="-82" />
-<hkern g1="yacute" g2="quotedblbase" k="82" />
-<hkern g1="thorn" g2="quotedbl" k="20" />
-<hkern g1="thorn" g2="quotesingle" k="20" />
-<hkern g1="thorn" g2="v" k="41" />
-<hkern g1="thorn" g2="w" k="41" />
-<hkern g1="thorn" g2="x" k="41" />
-<hkern g1="thorn" g2="y" k="41" />
-<hkern g1="thorn" g2="z" k="20" />
-<hkern g1="thorn" g2="yacute" k="41" />
-<hkern g1="thorn" g2="quoteright" k="20" />
-<hkern g1="thorn" g2="quotedblright" k="20" />
-<hkern g1="ydieresis" g2="quotedbl" k="-82" />
-<hkern g1="ydieresis" g2="quotesingle" k="-82" />
-<hkern g1="ydieresis" g2="comma" k="82" />
-<hkern g1="ydieresis" g2="period" k="82" />
-<hkern g1="ydieresis" g2="question" k="-41" />
-<hkern g1="ydieresis" g2="quoteright" k="-82" />
-<hkern g1="ydieresis" g2="quotesinglbase" k="82" />
-<hkern g1="ydieresis" g2="quotedblright" k="-82" />
-<hkern g1="ydieresis" g2="quotedblbase" k="82" />
-<hkern g1="OE" g2="J" k="-123" />
-</font>
-</defs>
-</svg>
diff --git a/data/interfaces/default/fonts/Open-Sans-regular/Open-Sans-regular.ttf b/data/interfaces/default/fonts/Open-Sans-regular/Open-Sans-regular.ttf
deleted file mode 100644
index 0dae9c3b..00000000
Binary files a/data/interfaces/default/fonts/Open-Sans-regular/Open-Sans-regular.ttf and /dev/null differ
diff --git a/data/interfaces/default/fonts/Open-Sans-regular/Open-Sans-regular.woff b/data/interfaces/default/fonts/Open-Sans-regular/Open-Sans-regular.woff
deleted file mode 100644
index ac2b2c65..00000000
Binary files a/data/interfaces/default/fonts/Open-Sans-regular/Open-Sans-regular.woff and /dev/null differ
diff --git a/data/interfaces/default/fonts/Open-Sans-regular/Open-Sans-regular.woff2 b/data/interfaces/default/fonts/Open-Sans-regular/Open-Sans-regular.woff2
deleted file mode 100644
index 402dfd77..00000000
Binary files a/data/interfaces/default/fonts/Open-Sans-regular/Open-Sans-regular.woff2 and /dev/null differ
diff --git a/data/interfaces/default/fonts/font-awesome/fa-brands-400.eot b/data/interfaces/default/fonts/font-awesome/fa-brands-400.eot
deleted file mode 100644
index f8e48185..00000000
Binary files a/data/interfaces/default/fonts/font-awesome/fa-brands-400.eot and /dev/null differ
diff --git a/data/interfaces/default/fonts/font-awesome/fa-brands-400.svg b/data/interfaces/default/fonts/font-awesome/fa-brands-400.svg
deleted file mode 100644
index 68eb65a1..00000000
--- a/data/interfaces/default/fonts/font-awesome/fa-brands-400.svg
+++ /dev/null
@@ -1,1127 +0,0 @@
-<?xml version="1.0" standalone="no"?> 
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<defs>
-  <font id="fontawesome-free" horiz-adv-x="640.4">
-    <font-face font-family="Font Awesome 5 Brands"
-      units-per-em="512" ascent="448"
-      descent="64"
-      font-weight="400"
-      font-style="Regular" />
-    <missing-glyph horiz-adv-x="0" />
-    <glyph glyph-name="500px"
-      unicode="&#xF26E;"
-      horiz-adv-x="448" d=" M103.3 103.7C96.8 117.9 96.4 122 110.7 126.8C136.3 134.8 118.7 117.6 153.9 77.6H154.2V171.5C155.4 221.7 198.2 263.7 251.9000000000001 263.7C305.8 263.7 349.6 220.2 349.6 166.9C349.6 103.5 288.8 53.7 221.1 73.6C210.6 77.8 219 105.3 229.6 102.2C282.6 102.2 319 112.3 319 166.6C319 227.6 241.9 256.2000000000001 202.1 211.2C178.6 184.8 184.5 169.1 184.5 53.6C235.2 22.6 302.8 31.6 344.9 73.7000000000001C369.7 98.5000000000001 383.4 131.7000000000001 383.4 166.7000000000001C383.4 201.9 369.6 234.9000000000001 344.6 260.0000000000001C319.8 284.8000000000001 286.8 298.5000000000001 251.3 298.5000000000001S182.5 284.7000000000001 157.8 260.0000000000001C157.5 259.7000000000001 141.8 243.5000000000001 136.6 236.1000000000001L136.1 235.5000000000001C132.8 230.8000000000001 129.8 226.4000000000001 116 229.4000000000001C109.1 231.1000000000001 101.7 235.2000000000001 101.7 241.2000000000001V428C101.7 433 105.6 438.5 112.2 438.5H353.5C361.8 438.5 361.8 426.9 361.8 423.4C361.8 419.5 361.8 408.3 353.5 408.3H130.3V275.4H130.6C234.8 385.2 413.4000000000001 311.4 413.4000000000001 166.5C413.4000000000001 -11.6 168.6 -53.8 103.3 103.7zM166.6 364.5C166.1 360.3 171.2 340 181.2 343.9C306 391.4 384 303.5 390.6 303.5C395.4000000000001 303.5 413.4000000000001 318.8 404.9000000000001 326.3C311.7000000000001 415.3 170.4 383.3 166.6 364.5zM393 33.3C283 -76.6 94 -27.5 61 137.5C61 149.7 30.6 144.9 32.1 134.2C56.1 -39.2 278.1 -122.7 413.7000000000001 12.9C420.6 20.7 401.1 41.3 393.0000000000001 33.3zM213.6 141.4C213.6 137.4 217.9 134.1 219.1 132.9C222.1 129.9 225.2 128.5 227.6 128.5C231.4 128.5 230.2 128.3 249.9 148C269.5 128.7 269 128.5 272.2 128.5C277.6 128.5 290.7 138.9 282.9 146.7L265.6 164L283.8 182.2C290.1 189 273.7 204 267.6 197.9L249.7 180C231.1 198.8 231.3 199.5 228.2 199.5C223.2 199.5 210.2 187.8 215.8 182.2L234 164C215.9 146.1 213.6 144.8 213.6 141.4z" />
-    <glyph glyph-name="accessible-icon"
-      unicode="&#xF368;"
-      horiz-adv-x="448" d=" M423.9 192.2L411 34.9C407.7 -5.8 347.1 -0.2 350.4 39.8L360.4 162.3L319.3 160C329.4 139.3 335.1 116.1 335.1 91.4999999999999C335.1 50.3 319 12.8 292.8 -15.0000000000001L253.5 24.3C311.3999999999999 87.9999999999999 266.6 191.5 179.5 191.5C153.5999999999999 191.5 130 181.6 112.2999999999999 165.5L73 204.8C95 225.5 123.1 239.9 154.4 245L229.7 330.7L187.1 355.5L135.5 309.5C105.5 282.7 64.9 328 95 354.9L163 415.6C172.8 424.4000000000001 187.1 425.8 198.5 419.2C198.5 419.2 337.8 338.3 338 338.1C354.2 328 358.7 302.1 344.1 285.5L285.7 219L391.8 224.9C410.3 226 425.4 210.5 423.9 192.2zM359 346.2C387.1 346.2 409.9 369 409.9 397.1C409.9 425.2 387.1 448 359 448C330.9 448 308.1 425.2 308.1 397.1C308.1 369 330.9000000000001 346.2 359 346.2zM179.6 -8.5C99 -8.5 52.2 82.1 96.9 147.6L57.2 187.3C36.4 161 24 127.7 24 91.6C24 -39.1 174.7 -109.7999999999999 275.4 -30.9L235.7 8.8C219.7 -2.1 200.4 -8.5 179.6 -8.5z" />
-    <glyph glyph-name="accusoft"
-      unicode="&#xF369;"
-      horiz-adv-x="640" d=" M482.2 75.9C476.5 82.8 250 373 242.3 382.5C228.6 399.7 242.3 399.3 261.5 399.4C271.2 399.5 367.8 400 378 400C402.1 400.1 406.7 399.4 416.4 387.2C418.5 384.5 621.5 141.4 623.5999999999999 138.9C629.0999999999999 132.2 638.8 119.8 630.8 115.5C628.4 114.2 516.1999999999999 67.8 513 66.6C502.9 62.6 495.5 59.8 482.2 75.9M596.9 81.5000000000001S481.9 31.1000000000001 479.4 29.9C463.4 22.6 452.5 33.1 442.7 44.5000000000001L385.6 118.5000000000001C380.2 119.4 325.2 128.1000000000001 320.3 127.8000000000001C317.2 127.6000000000001 310.7 127.0000000000001 305.9 124.9000000000001C301 122.8000000000001 160.7 72.1000000000001 155.7 70.2000000000001C150.6 68.2000000000001 144.3 66.6000000000001 144.6 62.6000000000001C144.8 60.1000000000001 146.6 60.0000000000001 149.2 59.1000000000001C151.9 58.3000000000001 450.1 -8.4999999999999 457.2 -9.9999999999999C472.8 -13.2999999999999 495.7 -20.4999999999999 510.8 -11.6999999999999C512.9 -10.4999999999999 634.6 64.7000000000002 636.6 66.1000000000001C642 70.1000000000001 640.9 72.9000000000002 634.9 74.3000000000001C632.6 74.6000000000001 610.3 79.0000000000001 596.9 81.5000000000001M270.9 262.8000000000002S258.9 261.2000000000002 245.9 247.7000000000002C236.9 238.4000000000001 3.8 8.6000000000001 2.5 6.8000000000001C-4.5 -3.1999999999999 4.1 1e-13 18.2 5.1000000000001C19 5.1000000000001 132.7 41.7000000000002 132.7 41.7000000000002C133.2 42.3000000000002 132.6 41.8000000000002 133.3 42.3000000000002C132.9 47.4000000000002 132.5 68.5000000000002 132.3 70.0000000000002C131.7 75.2000000000002 134.5 76.9000000000002 139.3 78.9000000000002L231.9 112.7000000000002C232.5 113.5000000000002 320.4 194.4000000000002 322.1 196.0000000000002V197.0000000000002L270.9 262.8000000000002" />
-    <glyph glyph-name="adn"
-      unicode="&#xF170;"
-      horiz-adv-x="496" d=" M248 280.5L312.9 181.7H183.1L248 280.5zM496 192C496 55.1 384.9 -56 248 -56S0 55.1 0 192S111.1 440 248 440S496 328.9 496 192zM396.2 109.3L248 332.5L99.8 109.3H130.2L163.8 161H332.4L366 109.3H396.2z" />
-    <glyph glyph-name="adversal"
-      unicode="&#xF36A;"
-      horiz-adv-x="512" d=" M482.1 416H28.7C5.8 416 0 410.1 0 387.1V-3.1C0 -26.4 5.8 -32 28.7 -32H482.1C506.4999999999999 -32 511.9999999999999 -26.8 511.9999999999999 -2.3V385.8C511.9999999999999 410.4 506.6 416 482.1 416zM178.4 227.7C150.9 247.9 106.3 236.4 94.2 204.3C89.9 193.2 84.9 194.8 76.7 196C67 197.5 59.5 199.2 54.2 201.5C25.4 212.9 62.8 256.8 79.1 265.8C120.2 287.2 162.5 288 204.4 270.6C245.3 253.8 238.9 211.4 238.9 142.1C241.6 116.3 234.6 83.8 248.2 53.3C250.1 48.9 248.6 45.4 245.5 42.6C237.1 35.9 206.2 40.4 198.9 49.9999999999999C197 52.1999999999999 197.1 53.6 195 56.1999999999999C191.4 60.0999999999999 187.7 58.3999999999999 183.1 55.1999999999999C125.7 18.8 42.8 33.8 36.1 98.4999999999999C33 127.8 48.5 155.6 75.7 169.5C113.9 189 187.9 181.3 189.7 200.4C190.8 210.5999999999999 187.8 220.5 178.4 227.7zM465.1 5.7C465.1 -9.4 454 -4.2 447.3 -4.2H52.4C45 -4.2 34.2 -9 34.6 6.5C35 20.4 45.1 15.6 51.7 15.6C184 16 316.2 16 448.5 15.6C455.3 15.6 465.1 20 465.1 5.7zM468.9 346.2V55.2C468.9 49.5 468.2 41.3 460.8 41.3C448.4000000000001 41.7 433.3 34.2 424.7 46.9C418.9 55.6 416.9 50.9 412.3 48.1C358.9000000000001 18.4 284.2000000000001 41 267.9 133.3C261.8 166.7 267.2 200.4 283.6 233.3C295.4 257.2000000000001 340.5 309.4 419.7 263.8V334.8C419.7 361 419.5999999999999 361 445.7 361C448.8 361 452.3 360.6 455.3999999999999 361C465.4999999999999 361.8 468.9999999999999 356.6 468.9999999999999 346.7000000000001C468.8999999999999 346.5 468.8999999999999 346.4000000000001 468.8999999999999 346.2000000000001zM417.4000000000001 113.9C397.9000000000001 66.3 344.5 70.6 327.4000000000001 108.7C312.3 142 311.9000000000001 176.9 327.8 210.2C344.1 244.3 387.5 245.9 409.3 215C429.9000000000001 186.2 424.2 130.4 417.4000000000001 113.9zM122.6 78.6C115.1 79.9 89.6 81.9 88.9 106.4C88.5 120.3 96.7 129.4 108.7 132.2C133.1 138.1 158 142.1 182.4 146.9C191.3000000000001 148.9 189.8000000000001 142.5 190.2000000000001 137.4C191.6000000000001 104.4 164.1000000000001 78.2 122.6000000000001 78.6z" />
-    <glyph glyph-name="affiliatetheme"
-      unicode="&#xF36B;"
-      horiz-adv-x="512" d=" M159.7 210.6C108.4 139.7 43.1 99.8 14 121.4C-15.2 143.1 2.8 218 54.2 288.9C105.5 359.8 170.8 399.7 199.9 378.1C229 356.5 211 281.5 159.7 210.6zM510.9 267.9C437.1 144.5 319 80.2 246.4 124.3C221.4 139.5 205.1 165.5 197.4 198.1C163.8 133.3 104.6 84.3 33.3 64.9C83.1 5.6 157.4 -32 240.3 -32C390.3 -32 511.9 91.1 511.9 242.9C512 251.4 511.6 259.7 510.9 267.9z" />
-    <glyph glyph-name="algolia"
-      unicode="&#xF36C;"
-      horiz-adv-x="448" d=" M229.3 265.4C180 265.4 140.1 225.5 140.1 176.2C140.1 126.9 180 87 229.3 87S318.5 126.9 318.5 176.2C318.5 225.5 278.5 265.4 229.3 265.4zM292 208.8L233.1 178.2C231.3 177.3 229.3 178.6 229.3 180.5V247C229.3 248.5 230.6 249.7 232 249.6C258.2 248.6 280.9 233.9 293.1 212.5C293.8 211.2 293.3 209.5 292 208.8zM389.1 416H58.9C26.4 416 0 389.6 0 357.1V27C0 -5.6 26.4 -32 58.9 -32H389C421.6 -32 447.9 -5.6 447.9 26.9V357.1C448 389.6 421.6 416 389.1 416zM186.5 331.3C186.5 342.1 195.2 350.8 206 350.8H251.3C262.1 350.8 270.8 342.1 270.8 331.3V315.9C270.8 314.1 269.1 312.9 267.5 313.4C255.2 316.8 242.4 318.5 229.4 318.5C215.9 318.5 202.7 316.7 190 313C188.3 312.5 186.6 313.8 186.6 315.5V331.3zM102.1 294.3L111.3 303.5C118.9 311.1 131.2 311.1 138.8 303.5L146.5 295.8C147.6 294.7000000000001 147.5 292.8 146.2 291.8C140 287.3 134.1 282.4 128.6 276.9C123.2 271.5 118.2 265.6 113.8 259.5C112.8 258.2 110.9 258 109.8 259.2L102.1 266.9C94.5 274.4 94.5 286.7 102.1 294.3zM229.3 49.5C159.3 49.5 102.7 106.2 102.7 176.1S159.4 302.7000000000001 229.3 302.7000000000001C299.3 302.7000000000001 355.9 246.1 355.9 176.1C355.9 106.3 299.2 49.5 229.3 49.5z" />
-    <glyph glyph-name="amazon-pay"
-      unicode="&#xF42C;"
-      horiz-adv-x="611.2" d=" M0 122.8C2.3 127 5.2 127.7 9.7 125.3C20.1 119.7 30.3 113.9 40.9 108.6C81.6 88.2000000000001 124.1 73 168.3 62.3C189.2 57.3 210.2 53.3 231.5 50.5C263 46.3 294.7 44.5 326.5 45.3C343.9 45.7 361.3 47.1 378.6 49.1C435 55.8 489.5 69.9 541.9000000000001 91.9C544.8000000000001 93.1 547.8000000000001 93.9 551.0000000000001 93.1C557.7000000000002 91.3 560.0000000000001 84.1 555.1000000000001 79.2000000000001C552.3000000000002 76.4 548.8000000000002 74.1 545.5000000000001 71.8000000000001C514.8000000000001 50.7 481.3000000000001 35.4000000000001 445.9000000000001 23.9000000000001C421.3000000000001 16.0000000000001 396.3000000000001 10.1000000000001 370.8000000000001 6.3000000000001C353.2000000000001 3.7 335.4000000000001 1.9000000000001 317.6000000000001 1.5000000000001C316.8000000000001 1.5000000000001 315.9000000000001 1.3000000000001 315.1000000000001 1.2H294C293.2 1.3000000000001 292.3 1.5000000000001 291.5 1.5000000000001C287.9 1.7 284.3 1.8000000000001 280.8 1.9C263.9000000000001 2.6 247.1 4.5000000000001 230.4 7.2C203 11.7 176.2 18.6 150 28.1C95.9 47.7 47.4 76.7000000000001 4.4 115.1C2.6 116.7000000000001 1.4 118.9 0 120.8V122.8zM158 383C156.6 382.8 155.1 382.6 153.7 382.4C139.7 380.7 127.1 375.5 115.7 367.3C113.3 365.6 111.1 363.8 108.6 361.9C108.4 362.4 108.2 362.9 108.2 363.3C107.8 366 107.4 368.8 106.9 371.5C106.2 376.1 103.9 378.1 99.3 378.1H87.8C80.9 378.1 79.6 376.8 79.6 369.9V160.6C79.6 159.6 79.6 158.6 79.7 157.6C79.9 154.6 81.7 152.7000000000001 84.6 152.6C91.6 152.5 98.7 152.5 105.7 152.6C108.6 152.6 110.4 154.6 110.7 157.6C110.8 158.6 110.8 159.6 110.8 160.6V233C111.9 232.1 112.5 231.6 113 231.1C130.9 216.2 151.5 211.3 174 215.7C194.4 219.7 208.6 232.2 217.8 250.6C224.8 264.5 227.7 279.3 228.1 294.7C228.6 311.8 226.9000000000001 328.6 220 344.5C211.5 364.1 197.4 377 176.1 381.4C172.9 382.1 169.6 382.4 166.3 382.9C163.5 383 160.8 383 158 383zM110.6 341.1C110.6 342.6 111 343.5 112.3 344.4C126 353.9 141.1 358.9 157.9 357.6C172.8 356.5 185 349.2 191.4 331.7C195.3 321 196.3 309.9 196.3 298.7C196.3 288.3 195.5 278.1 192.3 268.1C185.5 246.8 169.9 238.7 149.7 239.6C135.7 240.2 123.5 245.6 112.3 253.5C111.1 254.4 110.6 255.2 110.6 256.8C110.7 270.9 110.6 284.9 110.6 299C110.6 313 110.7 327 110.6 341.1zM316.3 383C315.3 382.9 314.3 382.7 313.4000000000001 382.6C303.6 382.1 294.0000000000001 380.9 284.5000000000001 378.5C278.4000000000001 376.9 272.5000000000001 374.7 266.6000000000001 372.7C263.0000000000001 371.5 261.2000000000001 368.9 261.3000000000001 365C261.4000000000001 361.7 261.2000000000001 358.4 261.3000000000001 355.1C261.4000000000001 350.3 263.4000000000001 349 268.1000000000001 350.2C275.9000000000001 352.2 283.7000000000001 354.4 291.6000000000001 355.9C303.9000000000001 358.2 316.3000000000001 359.2 328.8000000000001 357.3C335.3000000000001 356.3 341.4000000000001 354.4 345.6000000000001 348.9C349.3000000000001 344.1 350.7000000000001 338.4 350.9000000000001 332.5C351.2000000000001 324.2 351.1000000000001 315.9 351.2000000000001 307.6C351.2000000000001 307.2 351.1000000000001 306.7 351.0000000000001 306.2C350.5000000000001 306.3 350.1000000000002 306.2 349.7000000000001 306.3C339.2000000000001 308.8 328.6000000000001 310.6 317.7000000000001 311.2C306.4000000000001 311.8 295.2000000000001 311.1 284.4000000000001 307.3C271.5000000000001 302.8 261.1000000000001 295 255.0000000000001 282.4C250.3000000000001 272.6 249.6000000000001 262.2 251.1000000000001 251.7C253.1000000000001 237.7 260.1000000000001 226.9 272.5000000000001 220C284.4000000000001 213.4 297.3000000000001 212.6 310.4000000000001 214.6C325.5000000000001 216.9 338.9000000000001 223.3 350.7000000000001 233C351.1 233.4 351.6 233.7 352.3000000000001 234.1C352.9000000000001 230.3 353.4000000000001 226.7 354.1000000000001 223.1C354.7000000000001 220 356.6000000000001 218 359.5000000000001 217.9C364.9000000000001 217.8 370.4000000000001 217.8 375.8000000000001 217.9C378.5000000000001 218 380.3000000000001 219.8 380.6000000000001 222.6C380.7000000000001 223.5 380.7000000000001 224.5 380.7000000000001 225.4V331.4C380.7000000000001 335.7 380.5000000000001 340 379.8000000000002 344.3C377.9000000000002 357.2000000000001 372.4000000000002 367.8 360.8000000000002 374.7000000000001C354.1000000000002 378.7000000000001 346.7000000000001 380.7000000000001 339.0000000000001 381.8C335.4000000000001 382.3 331.8000000000002 382.6 328.2000000000001 383.1C324.3000000000002 383 320.3000000000002 383 316.3000000000002 383zM351.3 255.3C351.3 254 350.9000000000001 253.1 349.8 252.3C338.6 244.2 326.3 238.8 312.4000000000001 237.4C306.7000000000001 236.8 301.0000000000001 237 295.6 239.2C289.3 241.7 285.2000000000001 246.1 283.2000000000001 252.5000000000001S281.2000000000001 265.5 283.1 271.9000000000001C285.6 280.2000000000001 291.5 284.9000000000001 299.5 287.5C307.6 290.1 316 290.5 324.3 289.7000000000001C332.7 289 340.9000000000001 287.4 349.3 286.3C350.9000000000001 286.1 351.4000000000001 285.3 351.4000000000001 283.7000000000001C351.3 278.9 351.4000000000001 274.2000000000001 351.4000000000001 269.4C351.3 264.7000000000001 351.2000000000001 260 351.3 255.3zM611.2 125.9C610.2 130.9 606.4000000000001 132.8 602.1 134.2C595.3000000000001 136.5 588.2 137.5 581.1 138.1C568 139.2 554.9 138.6 541.9 136.2C527.6 133.5 514 128.9 501.9 120.6C500.5 119.6 499.1 118.5 498.2 117.1C497.5 116 497.3 114.3 497.7 113.1C498.1 111.6 499.8 111.2 501.3 111.3C502 111.3 502.8 111.3 503.5 111.4C511.3 112.2 519 113.1 526.8 113.9C538.1999999999999 115 549.6999999999999 115.7 561.0999999999999 114.8C565.8999999999999 114.5 570.8 113.4 575.4999999999999 112.1C580.5999999999999 110.7 582.8999999999999 106.9 583.0999999999999 101.7C583.4999999999999 93.7 581.6999999999999 86 579.5999999999999 78.4C575.4999999999999 63 569.5999999999999 48.1 563.8 33.3C563.4 32.3 563 31.3 562.8 30.3C562.3 27.4 564 25.4999999999999 566.9 26.1999999999999C568.6 26.5999999999999 570.5 27.4999999999999 571.6999999999999 28.6999999999999C576.0999999999999 32.9999999999999 580.5999999999999 37.3 584.4 42.0999999999999C597.1999999999999 58.4999999999999 604.6999999999999 77.3999999999999 609.1 97.6999999999999C609.9 101.3 610.5 104.9999999999999 611.2 108.5999999999999V125.8999999999999zM479.1 249.1C466.2 284.8 453.3 320.6 440.4000000000001 356.3C438.4000000000001 362 436.2000000000001 367.6 434.1 373.2C433 376.1 430.9000000000001 378 427.7000000000001 378C420.1 378.1 412.5000000000001 378.2 404.8000000000001 378.1C402.3000000000001 378.1 401.1000000000001 376.1 401.6000000000001 373.6C402.1000000000001 371.5 402.7000000000001 369.5 403.5000000000001 367.5C423.1000000000001 319 442.8000000000001 270.4 462.6000000000001 222C464.3000000000001 217.9 464.7000000000001 214.4 462.8000000000001 210.2C459.5000000000001 202.9 456.9000000000001 195.2 453.5000000000001 187.9C450.5000000000001 181.4 445.5000000000001 176.5 438.3000000000001 174.6C433.2000000000001 173.2 428.1000000000001 173 422.9000000000001 173.5C420.4000000000001 173.6999999999999 417.9000000000001 174.3 415.4000000000001 174.5C412.0000000000001 174.6999999999999 410.3000000000001 173.1999999999999 410.2000000000001 169.6999999999999C410.1000000000001 166.3999999999999 410.1000000000001 163.0999999999999 410.2000000000001 159.8C410.3000000000002 154.3 412.2000000000001 151.8 417.6000000000001 150.9C423.2000000000001 149.9 428.9000000000001 149 434.5000000000001 148.9C451.6000000000001 148.5 465.2 155.4 474.0000000000001 170.3C477.5000000000001 176.1999999999999 480.7 182.4 483.2 188.6999999999999C506.9 248.5 530.3000000000001 308.3999999999999 553.8000000000001 368.3C554.5000000000001 370.0999999999999 555.1 371.8999999999999 555.4000000000001 373.8C555.8000000000001 376.5999999999999 554.5000000000001 378.2 551.7 378.2C545.1 378.3 538.4000000000001 378.2 531.8000000000001 378.2C528.1 378.2 525.5000000000001 376.5999999999999 524.1 373C523.6 371.5999999999999 523 370.3 522.5 368.8999999999999C510.9 335.5999999999999 499.3 302.3 487.7 268.8999999999999C485.2 261.7 482.6 254.3999999999999 480 246.7C479.6 247.8 479.4 248.3999999999999 479.1 249.1z" />
-    <glyph glyph-name="amazon"
-      unicode="&#xF270;"
-      horiz-adv-x="448" d=" M257.2 285.3C208.5 283.5 87.7 269.8 87.7 167.8C87.7 58.3 226 53.8 271.2 124.6C277.7 114.4 306.6 87.1 316.5 77.8L373.3 133.8S341 159.1 341 186.6V333.7C341 359 316.5 416 228.7 416C140.7 416 94 361 94 311.7L167.5 304.9C183.8 354.4 221.7 354.4 221.7 354.4C262.4 354.5 257.2 324.6 257.2 285.3zM257.2 198.5C257.2 118.5 173 130.5 173 181.3C173 228.5 223.5 238 257.2 239.1V198.5zM393.2 35C385.5 25 323.2 -32 218.7 -32S34.2 39.5 9.7 69C2.9 76.7 10.7 80.3 15.2 77.3C88.5 32.8 203 -40.5 387.7 47C395.2 50.7 401 45 393.2 35zM433 32.8C426.5 17 417 6 411.8 1.8C406.3 -2.7 402.3 -0.9 405.3 5.6S424.6 52.1 418 60.6C411.5 68.9 381 64.9 370 63.8C359.2 62.8 357 61.8 356 64.1C353.7 69.8 377.7 79.6 393.5 81.6C409.2 83.4 434.5 82.4 439.5 75.9C443.2 70.8 439.5 48.8 433 32.8z" />
-    <glyph glyph-name="amilia"
-      unicode="&#xF36D;"
-      horiz-adv-x="448" d=" M240.1 416C178.2 416 108.6 399.1 55.9 360.6C50.8 357.5 46.8 351.4 48.7 341.2C49.8 336.1 53.8 313.8 58.9 301.6C63 291.4 73.1 291.4 79.2 295.5C111.7 317.8 175.7 343.2 231.5 343.2C289.4 343.2 290.4 314.8 290.4 270.1V231.6C203 220.3 78.2 197 46.7 183.8C11.2 167.5 16.3 90.3 16.3 72S31.5 -32 141.2 -32C189 -32 254.9000000000001 -11.3 294.5 10.1V-15.3C294.5 -18.3 296.6 -23.4999999999999 300.6 -24.4C303.7000000000001 -25.4 351.3 -26.4 360.5 -26.4S423 -26.7 427 -25.7C431.1 -24.7 432.1 -19.6 432.1 -16.6V280C432 360.3 374.2000000000001 416 240.1 416zM152.2 88.3C152.2 100.5 149.2 131 170.5 141.2C194.8 154.4 245.6 170.6 290.3 174.7V68C268.9000000000001 54.8 241.6 43.6 211.2 43.6C158.4 43.6 152.3 77.1 152.2 88.3" />
-    <glyph glyph-name="android"
-      unicode="&#xF17B;"
-      horiz-adv-x="448" d=" M89.6 243.5V127.7C89.6 112.3 77.5 100 62.1 100C46.8 100 32 112.4 32 127.7V243.5C32 258.6 46.8 271 62.1 271C77.2 271 89.6 258.6 89.6 243.5zM100.4 86.5C100.4 70.1 113.6 56.9 130 56.9H149.9L150.2 -4.2C150.2 -41.1 205.4 -40.8000000000001 205.4 -4.2V56.9H242.6V-4.2C242.6 -40.9 298.1 -41.0000000000001 298.1 -4.2V56.9H318.3C334.5 56.9 347.7 70.1 347.7 86.5V265.9H100.4V86.5zM348.4 275.6H99.3C99.3 318.4 124.9 355.6 162.9 375L143.8 410.3C141 415.2 148.1 418.3 150.5 414.1L169.9 378.5C204.8 394 244.9 393.2 278.2 378.5L297.5 414C300 418.3 307 415.1 304.2 410.2L285.1 375C322.8 355.6 348.4000000000001 318.4 348.4000000000001 275.6zM177.7 331.1C177.7 336.8 173.1 341.6 167.2 341.6C161.5 341.6 157 336.8 157 331.1S161.6 320.6 167.2 320.6C173.1 320.6 177.7 325.4 177.7 331.1zM291.1 331.1C291.1 336.8 286.5 341.6 280.9000000000001 341.6C275.0000000000001 341.6 270.4000000000001 336.8 270.4000000000001 331.1S275.0000000000001 320.6 280.9000000000001 320.6C286.5000000000001 320.6 291.1 325.4 291.1 331.1zM385.9000000000001 271C370.8 271 358.4000000000001 258.9 358.4000000000001 243.5V127.7C358.4000000000001 112.3 370.8 100 385.9000000000001 100C401.3 100 416.0000000000001 112.4 416.0000000000001 127.7V243.5C416.0000000000001 258.9 401.2000000000001 271 385.9000000000001 271z" />
-    <glyph glyph-name="angellist"
-      unicode="&#xF209;"
-      horiz-adv-x="448" d=" M347.1 232.6C358.8 265.2 392.5 359.5 392.5 389.7C392.5 416.3 376.8 438.6 348.8 438.6C304.2 438.6 264.2000000000001 306.9 251.7 275.5C242 304 196.6 448 156.6 448C125.5 448 110.9 425.1 110.9 396.3C110.9 361 145.1 269.5 157.5 234.3C151.2 236.6 144.4 238.6 137.5 238.6C114.1 238.6 89.2 209.5 89.2 186C89.2 177.1 94.1 164.6 97.2 156.3C60.3 146.3 46.1 121.7 46.1 84.6C46 12.4 114.4 -64 210.6 -64C328.6 -64 402 24.6 402 138.9C402 182 395.1 220.9 347.1 232.6zM311.7 340C315.7 352.3 332.8 404.3 348.8 404.3C357.4000000000001 404.3 359.7 395.4 359.7 388.3C359.7 369.2 321.1 263.7 312.6 240.3L278.6 246.3L311.7 340zM142.3 399.7C142.3 411.6 156.8 445.4 188.6 352.6L223.2 252.3C207.6 253.6 195.5 255.3 187.8 250.9C176.9 279.7000000000001 142.3 370.6 142.3 399.7000000000001zM140 204C169.3 204 207.1 109.4 207.1 96.6C207.1 91.5 202.2 85.2000000000001 196.5 85.2000000000001C175.6 85.2000000000001 119.6 162.1 119.6 182.9C119.7 190.6 132.3 204 140 204zM324.3 17.7C295.2 -14.3 258 -30.9 214.6 -30.9C155.2 -30.9 108.3 1.7 85.7 57.4C68.6 100.8 89.5 125.7 106.3 125.7C117.7 125.7 160.6 65.4 160.6 52.6C160.6 47.7 152.9 44.3 148.9 44.3C132.8000000000001 44.3 126.5 59.8 97.8 95.7C68.1 66 118.3000000000001 8.8 156.1 8.8C182.2 8.8 199.2 32.9999999999999 194.1 50.8C197.8 50.8 202.4 50.4999999999999 205.8 51.4C206.9 24.3 214.9 -8 247.5 -10.3C247.5 -9.4 249.5 -3.2 249.5 -2.9C249.5 14.4999999999999 238.9 29.7 238.9 47.4C238.9 75.7 260.6 103.1 282.6 119.1C290.6 125.1 300.3 128.8 309.7000000000001 132.2C319.4000000000001 135.9 329.7000000000001 140.2 337.1 147.6C336 158.8 331.4000000000001 168.7 320.2000000000001 168.7C292.5000000000001 168.7 199.6000000000001 164.7 199.6000000000001 208.4C199.6000000000001 215.1 199.7000000000001 221.5 217.0000000000001 221.5C249.3000000000001 221.5 331.3000000000001 213.5 355.3000000000001 192.4C373.4000000000001 176.3 379.6000000000001 79.2 324.3000000000001 17.7zM225.7 143.7C235.4 140.6 245.4 139.7 255.4 137.7C248 132.3 241.4 125.7 235.1 118.6C232.3 127.1 228.9 135.4 225.7 143.7z" />
-    <glyph glyph-name="angrycreative"
-      unicode="&#xF36E;"
-      horiz-adv-x="640" d=" M640 209.8L636.8 181.6L602.3 179.3L600.3 161.2L634.8 163.5L631.5999999999999 135.3L597.1999999999999 133.1L594.9 113L629.3 115.2L626.3 89.1L561.5999999999999 84.9999999999999L574.3 198.1999999999999L527 82.8L495.1 80.8L471.3 198.6L501.6 200.6L515.2 121.2000000000001L546.9000000000001 203.6000000000001L640.0000000000001 209.8000000000001zM426.8 76.5L455.1 78.3L468 198.4L439.6 196.5L426.8 76.5zM162 59.9L142.6 95.9L139.1 58.5L110.9 56.8L113.6 85.9C102.6 67.9 81.6 51.6 56.7 50.1C23.9 48.1 -3 71 0.3 108.3C2.9 137.6 27 171.1 67.8 173.7000000000001C105.5 176.1 115.4 150.5000000000001 119.1 144.9L121.9 175.7000000000001L160.8 178.2000000000001C180.9 179.5000000000001 199.5 174.5000000000001 203.3 154.5000000000001L205.9 181.1000000000001L270.7 185.3000000000001L268 157.4000000000001L231.6 155.0000000000001L229.9 137.1000000000001L266.3 139.4000000000002L263.6 111.5000000000002L227.2 109.2000000000002L225.3 89.3000000000002L261.6 91.6000000000002L259.5 70.8000000000002L314.5 188.0000000000002L338.3 189.6000000000002L370.4 79L379.3 164.6L357 163.2000000000001L359.8999999999999 191.1L434.8999999999999 196L431.8999999999999 168L407.5999999999999 166.4L397.8999999999999 74.5L339.8999999999999 70.8L335.5999999999999 86.4L296.2 83.9L288.2 67.6L162 59.9zM117.7 130.1L91.3 128.4C84.6 140.8 76.9 145 65 144.2C46 143 31.7 126.7 30.4 110.9C29 94.9 37.7 78.4 59.1 79.7C71.9 80.5 80.4 88.3 88 98.6L115 100.3L117.7 130.1zM173.8 137.8C175 150.6999999999999 166.2 151.4 147.7 150.1999999999999L145 121.6999999999999C159.2 122.5999999999999 172.5 123.8 173.8000000000001 137.8zM194.9 66.9999999999999L200.7 127C195.7 113.5 186 105.8999999999999 172.8 100.3999999999999L194.9 66.9999999999999zM330.3 111.9999999999999L322.4000000000001 149.8L306.6 110.4999999999999L330.3 111.9999999999999zM160.2 186.5999999999999L155.9 204.0999999999999L116.3 201.4999999999999L108.2 183.2999999999999L76.3 181.1999999999999L133.3 303.0999999999999L157.2 304.6999999999999L187.9 202.6999999999999L197.8 307.3999999999999L224.8 309.1999999999999L262.6 245.5999999999999L269.1 312.1999999999999L297.6 314.0999999999999L293.6 272.8999999999999C301 286.3999999999999 316.5 317.5999999999999 357.2000000000001 320.3999999999999C397.7000000000001 323.1999999999999 409.6 291.0999999999999 410.6 290.0999999999999L413.9000000000001 322.0999999999999L453.2 324.7999999999999C465.9 325.6999999999999 481.0000000000001 324.4999999999999 489.5000000000001 315.0999999999999L485.1000000000001 326.9999999999999L517.3000000000001 329.1999999999999L530.2 285.9999999999999L553.2 331.6999999999999L584.2 333.8999999999999L540.6 255.4999999999999L535.8000000000001 211.1999999999999L507.4000000000001 209.2999999999999L512.2 253.5999999999999L496.4 296.5999999999999C497.4 274.2999999999999 487.2 256.4999999999999 464.4 246.9999999999999L489.6 208.1999999999999L453.2 205.7999999999999L434.0000000000001 242.5999999999999L430.0000000000001 204.2999999999999L401.6000000000001 202.3999999999998L404.9000000000001 233.8999999999999C398.2000000000001 224.5999999999998 385.2000000000001 198.4999999999998 345.3000000000001 195.8999999999998C319.1000000000001 194.1999999999999 299.7000000000001 206.1999999999999 289.9000000000001 235.0999999999999L285.9000000000001 194.7999999999999L260.9000000000001 193.1999999999999L223.3000000000001 256.4999999999999L217.0000000000001 190.2999999999999L160.2000000000001 186.5999999999999zM436.8000000000001 268.7C447.0000000000001 269.3999999999999 454.3000000000001 270.7999999999999 458.4000000000001 272.9999999999999C462.9000000000001 275.3999999999999 465.4000000000001 279.3999999999999 466.0000000000001 285.0999999999999C466.6000000000001 290.3999999999999 465.4000000000001 293.8999999999999 462.6000000000001 295.4999999999999C459.0000000000001 297.5999999999999 452.0000000000001 298.3 439.7000000000002 297.4999999999999L436.8000000000002 268.7zM327.7 234C333.3 228.1 340.4 225.5 349 226.1C353.7 226.4 358.1 227.9 362.3 230.2C367.8 233.2 372.9000000000001 238.2 377.4000000000001 244.5L343.2000000000001 242.2L345.6 266.1L408.7000000000001 270.4L409.9000000000001 282.4L378.7000000000001 280.3C374.6 284 370.9000000000001 286.9 367.6 288.4C363.6 290.1 359.5 291.2000000000001 355.4000000000001 290.9C347.4000000000001 290.4 340.1 287.3 333.4000000000001 281.7000000000001C325.7000000000001 275.3 321.4000000000001 267.2000000000001 320.5000000000001 257.3C319.4000000000001 247.7 321.9000000000001 240 327.7000000000001 234zM126.4 225.8L150.2 227.4L141.9 265L126.4 225.8z" />
-    <glyph glyph-name="angular"
-      unicode="&#xF420;"
-      horiz-adv-x="415.6" d=" M169.7 179.9H245.9L207.8 271.5L169.7 179.9zM207.8 416L0 341.6L31.8 65.9L207.8 -32L383.8 65.9L415.6 341.6L207.8 416zM338 74.2H289.4L263.2 139.6H152.6L126.4 74.2000000000001H77.7L207.8 366.5L338 74.2z" />
-    <glyph glyph-name="app-store-ios"
-      unicode="&#xF370;"
-      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM127 63.5C121.5 53.9 109.2 50.7 99.7 56.2C90.1 61.7 86.9 74 92.4 83.5L106.7 108.2C122.8 113.1 136 109.3 146.3 96.8L127 63.5zM265.9 117.4H84C73 117.4 64 126.4 64 137.4S73 157.4 84 157.4H135L200.4 270.6L179.9 306C174.4 315.6 177.7 327.8 187.2 333.3C196.8 338.8 209 335.5 214.5 326L223.4 310.6L232.3000000000001 326C237.8000000000001 335.6 250.1000000000001 338.8 259.6 333.3C269.2000000000001 327.8 272.4000000000001 315.5 266.9000000000001 306L181.1 157.4H243.2C263.4000000000001 157.4 274.7000000000001 133.7 265.9000000000001 117.4zM364 117.4H335L354.6 83.5C360.1 73.9 356.8 61.7 347.3 56.2C337.7 50.7 325.5 54 320 63.5C287.1 120.4 262.5 163.2 246 191.6C229.3 220.6 241.2 249.6 253.1 259.4000000000001C266.2 236.7000000000001 285.8 202.7000000000001 312 157.4H364C375 157.4 384 148.4 384 137.4C384 126.3 375 117.4 364 117.4z" />
-    <glyph glyph-name="app-store"
-      unicode="&#xF36F;"
-      horiz-adv-x="512" d=" M255.9 327.1L265 342.8C270.6 352.6 283.1 355.9 292.9 350.3C302.7 344.7 306 332.2 300.4 322.4L212.9 170.9H276.2C296.7 170.9 308.2 146.8 299.3 130.1H113.8C102.5 130.1 93.4 139.2 93.4 150.5C93.4 161.8 102.5 170.8999999999999 113.8 170.8999999999999H165.8L232.4 286.3L211.6 322.3999999999999C206 332.2 209.3 344.5999999999999 219.1 350.3C228.9 355.8999999999999 241.3 352.5999999999999 247 342.8L255.9 327.0999999999999zM177.2 109.1L157.6 75.1C152 65.3 139.5 62 129.7 67.6C119.9 73.2000000000001 116.6 85.7000000000001 122.2 95.5L136.8 120.7C153.2 125.8 166.6 121.9 177.2 109.1zM346.1 170.8H399.2000000000001C410.5000000000001 170.8 419.6 161.7 419.6 150.4C419.6 139.1 410.5 130.0000000000001 399.2000000000001 130.0000000000001H369.7000000000001L389.6 95.5000000000001C395.2000000000001 85.7000000000001 391.9000000000001 73.3000000000001 382.1 67.6000000000001C372.3 62.0000000000001 359.9000000000001 65.3000000000001 354.2000000000001 75.1000000000001C320.7000000000001 133.2000000000001 295.5000000000001 176.7000000000001 278.8000000000001 205.7000000000001C261.7000000000001 235.2000000000001 273.9000000000001 264.8000000000001 286.0000000000001 274.8000000000001C299.4000000000001 251.8000000000001 319.4000000000001 217.1000000000001 346.1000000000001 170.8000000000001zM256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM472 192C472 73.3 375.9 -24 256 -24C137.3 -24 40 72.1 40 192C40 310.7 136.1 408 256 408C374.7 408 472 311.9 472 192z" />
-    <glyph glyph-name="apper"
-      unicode="&#xF371;"
-      horiz-adv-x="640" d=" M42.1 208.9C64.3 208.9 71.1 206.1 75.6 194.3H76.4V217.2C76.4 228.5000000000001 71.6 232.6 58.5 232.6C47.2 232.6 44.1 230.1 43.4 219.8H4.8C5.1 233.7 6.3 238.9 10.6 244.2C17.9 253 29.5 256 56.7 256C89.7 256 103.8 251 110.6 237.1C112.6 232.8 114.6 221.5 114.6 213.4V137.1H76.3L77.6 156.2000000000001H76.6C71.3 140.6 63 135.8000000000001 41.1 135.8000000000001C10.8 135.8000000000001 0 145.9000000000001 0 173.1000000000001C0 198.3000000000001 12.3 208.9000000000001 42.1 208.9000000000001zM59.2 160.8C72.3 160.8 76.1 163.8 76.1 174.2C76.1 183.3 71.8 185.8 56.5 185.8C43.4 185.8 38.6 182.8 38.6 173.7C38.5 163.3 42.3 160.8 59.2 160.8zM137 255.7H175.3L173.8 235.1H174.6C183.7 252.2 190.5 256 212.1 256C226.5000000000001 256 236.8 253.0000000000001 243.6 246.9000000000001C253.4000000000001 238.3000000000001 256.4000000000001 226.5000000000001 256.4000000000001 198.8000000000001C256.4000000000001 168.8000000000001 253.4000000000001 155.7000000000001 244.3000000000001 145.9C237.5000000000001 138.6 227.9000000000001 135.8 211.1 135.8C190.7 135.8 181.9 141.3 177.3 157H176.5V86.7H137V255.7zM217.9 195C217.9 222.5 214.6 227.5 197.2 227.5C180.3 227.5 176.5 222.5 176.5 198.8C176.5 170.8 180 165.3 197.7 165.3C214.1 165.3 217.9 170.9 217.9 195zM275.8 255.7H314.1L312.6 235.1H313.4000000000001C322.5000000000001 252.2 329.3 256 350.9000000000001 256C365.3 256 375.6 253 382.4000000000001 246.9C392.2000000000001 238.3 395.2000000000001 226.5 395.2000000000001 198.8C395.2000000000001 168.8 392.2000000000001 155.7 383.1 145.9C376.3 138.6 366.7000000000001 135.8 349.8 135.8C329.4000000000001 135.8 320.6 141.3 316 157H315.2V86.7H275.7V255.7zM356.7000000000001 195C356.7000000000001 222.5 353.4000000000001 227.5 336.0000000000001 227.5C319.1000000000001 227.5 315.3000000000001 222.5 315.3000000000001 198.8C315.3000000000001 170.8 318.8000000000001 165.3 336.5000000000001 165.3C352.9000000000001 165.3 356.7000000000001 170.9 356.7000000000001 195zM410.5000000000001 198.8C410.5000000000001 224.2 413.8000000000001 236.6 422.8000000000001 244.6C431.6000000000001 252.7 445.0000000000001 255.9000000000001 467.9000000000001 255.9000000000001C510.7000000000001 255.9000000000001 523.6000000000001 243.1 523.6000000000001 200.2000000000001V189.1H448.3000000000002C448.0000000000001 187.1 448.0000000000001 185.1 448.0000000000001 184.3C448.0000000000001 167.4 452.5000000000001 162.4 468.1000000000001 162.4C482.0000000000001 162.4 486.0000000000001 165.4 486.0000000000001 176.3H523.5000000000001V174C523.5000000000001 164.2 521.0000000000001 155.1 516.7000000000002 149.3C509.4000000000001 139.5 497.1000000000001 135.7 472.4000000000001 135.7C444.9000000000002 135.7 430.8000000000002 139 421.8000000000002 148C413.3000000000002 156.5 410.5000000000001 169.3 410.5000000000001 198.8zM486.9000000000001 210.4C486.6000000000001 212.2 486.6000000000001 213.7 486.6000000000001 214.2C486.6000000000001 226.5000000000001 483.3000000000001 228.8 467.0000000000001 228.8C452.6000000000001 228.8 449.9000000000001 225.8 448.9000000000001 213.7L448.6 210.4H486.9zM542.5000000000001 255.7H580.8000000000001L579.0000000000001 235.8H579.7000000000002C586.5000000000001 250.7 594.1000000000001 256 609.4000000000002 256C620.2000000000002 256 628.5000000000002 252.7 632.8000000000002 246.7C638.1000000000001 239.4 639.6000000000001 232.3 639.6000000000001 212.7C639.6000000000001 211.2 639.6000000000001 207.7 639.8000000000002 203.4H604.8000000000002C605.1000000000001 205.2 605.1000000000001 206.7 605.1000000000001 207.4C605.1000000000001 222.8 603.1000000000001 226.8 594.8000000000002 226.8C588.5000000000002 226.8 584.0000000000002 223.5 581.7000000000002 217.5C580.7000000000002 214.5 580.7000000000002 213.1999999999999 580.7000000000002 205.1999999999999V137.1999999999999H542.4000000000002V255.7z" />
-    <glyph glyph-name="apple-pay"
-      unicode="&#xF415;"
-      horiz-adv-x="640" d=" M116.9 289.5C109.4 280.6 97.4 273.6 85.4 274.6C83.9 286.6 89.8 299.4 96.7 307.2C104.2 316.3 117.3 322.8 128 323.3C129.2 310.9 124.3 298.6 116.9 289.5M127.8 272.3C110.4 273.3 95.5 262.4 87.3 262.4C78.9 262.4 66.3 271.8 52.5 271.5C34.6 271.2 18 261.1 8.9 245C-9.9 212.7 4 165 22.2 138.7C31.1 125.7 41.7 111.4 55.7 111.9C69 112.4 74.2 120.5 90.2 120.5C106.3 120.5 111 111.9 125 112.1C139.5 112.4 148.6 125.1 157.5 138.1C167.6 152.9 171.8 167.2000000000001 172 168C171.7 168.3 144 178.9 143.7 210.9C143.4 237.7 165.6 250.4 166.6 251.2C154.1 269.8 134.6 271.8 127.8 272.3M228.2 308.5V113.6H258.5V180.2000000000001H300.4C338.7 180.2000000000001 365.5 206.5000000000001 365.5 244.5000000000001S339.1 308.5000000000001 301.4 308.5000000000001H228.2zM258.5 283H293.4C319.7 283 334.7 269 334.7 244.4S319.7 205.6 293.3 205.6H258.5V283zM420.7 112.1C439.7 112.1 457.3 121.7000000000001 465.3 137H465.9V113.6H493.9V210.6C493.9 238.7 471.4 256.9000000000001 436.8 256.9000000000001C404.7 256.9000000000001 380.9000000000001 238.5000000000001 380 213.3000000000001H407.3C409.6 225.3000000000001 420.7 233.2000000000001 435.9000000000001 233.2000000000001C454.4 233.2000000000001 464.8 224.6000000000001 464.8 208.7000000000001V197.9L427 195.6C391.9 193.5 372.9 179.1 372.9 154.1C373 128.9 392.6 112.1 420.7 112.1zM428.9 135.2000000000001C412.8 135.2000000000001 402.5 143.0000000000001 402.5 154.8000000000001C402.5 167.1000000000001 412.4 174.2000000000001 431.3 175.3000000000001L464.9 177.4000000000001V166.4000000000001C464.9 148.2000000000001 449.4000000000001 135.2000000000001 428.9000000000001 135.2000000000001zM531.4 60.6C560.9 60.6 574.8 71.9 586.9 106L640 255H609.2L573.6 139.9H573L537.4 255H505.8L557 113.1L554.2 104.5C549.6 89.9 542.1 84.2 528.7 84.2C526.3000000000001 84.2 521.7 84.5 519.8000000000001 84.7V61.3C521.6 60.9 529.1 60.6 531.4000000000001 60.6z" />
-    <glyph glyph-name="apple"
-      unicode="&#xF179;"
-      horiz-adv-x="376.5" d=" M314.7 179.3C314.5 216 331.1 243.7 364.7 264.1C345.9 291 317.5 305.8 280 308.7000000000001C244.5 311.5 205.7 288 191.5 288C176.5 288 142.1 307.7000000000001 115.1 307.7000000000001C59.3 306.8 0 263.2 0 174.5C0 148.3 4.8 121.2 14.4 93.3C27.2 56.6 73.4 -33.4 121.6 -31.9C146.8 -31.3 164.6 -14 197.4 -14C229.2 -14 245.7 -31.9 273.8 -31.9C322.4000000000001 -31.2 364.2000000000001 50.6 376.4 87.4C311.2 118.1 314.7 177.4 314.7 179.3000000000001zM258.1 343.5C285.4 375.9 282.9 405.4 282.1 416C258 414.6 230.1 399.6 214.2 381.1C196.7 361.3 186.4 336.8 188.6 309.2C214.7 307.2 238.5 320.6 258.1 343.5z" />
-    <glyph glyph-name="asymmetrik"
-      unicode="&#xF372;"
-      horiz-adv-x="576" d=" M517.5 138.8C556.3 178.8 575.6 218.8 576 254.9C576.8 320.4 516.6 373.1 406.6 389.9C277.9 409.6 118.1 374.4 0 307.5C52 334 110.6 355.7 170.7 365.7C245.2 386.2 323.7 391.1 392 380.5C544.5 356.7 588.8 253 490.8 148.8C480.6 138 468.8 127.7 455.8 118.2L304.9 344.6L114.7 59.1C49.1 88.5 38.2 149.3 95.6 210.3C116.4 232.5 143.9 252.2 175.1 268.4C195.1 280.6 214.8 291 237.1 299.1C172 278.8 114.4 246.2 75.5 206.2C47.8 177.6 34.1 149.1 33.8 123.3C33.3 88.1999999999999 57.2 58.1999999999999 102.2 40.3L67.7 -11.4H169.3L191.3 22.9999999999999C213.5 21.9999999999999 236.6 22.9999999999999 259.9 25.6999999999999L237.1 -11.4000000000001H372.6L340 41.7C358.6 47 376.9 53.2 394.5 60.4L440.4 -11.4H542L468.6 99C487.1 111.1 503.6 124.5 517.5 138.8zM329.9 58.3L304.9 98.9L272.2 45.6C248.8 42.1 225.5 40.5 203 41.2L304.9 200.5000000000001L383.6 77.5000000000001C366.4 70.1000000000001 348.3 63.6000000000001 329.9 58.3000000000001z" />
-    <glyph glyph-name="audible"
-      unicode="&#xF373;"
-      horiz-adv-x="640" d=" M640 248.1V194.1L320 -5.9L0 194V248L320 48L640 248.1zM445.5 176.1L492.6 205.5C455.4 261.3 391.9000000000001 298.1 319.9000000000001 298.1C247.9000000000001 298.1 184.4 261.4000000000001 147.3000000000001 205.7H147.6000000000001C150.1000000000001 208 152.7000000000001 210.2 155.3000000000001 212.4C245.0000000000001 286.8 374.7000000000001 270.5 445.5 176.1zM225.4 157.3C242.3 169.2 261.9 176 282.8 176C317.2 176 348 157.6 369.2000000000001 128.4L414.6 156.8C393.7000000000001 186.6999999999999 359 206.3 319.8 206.3C280.9000000000001 206.3 246.4 186.9 225.4 157.3zM103.6 286.9C235.4 391.2 421.8 363.3 521.1 224.8L521.8000000000001 223.8L570.6 254.2C517.1 335.9 424.8 389.9 319.9 389.9C216.4 389.9 123.3 336.4 69.4 254.3C79.3 264.8 92.1 277.8 103.6 286.9zM570.6 254.2z" />
-    <glyph glyph-name="autoprefixer"
-      unicode="&#xF41C;"
-      horiz-adv-x="640" d=" M318.4 432L157.4 -48H234.9L260.3 33.4H379.8L405 -48H482.5L318.4 432zM278.1 90.1L319.3 220.5H320.8L361.7 90.1H278.0999999999999zM640 43L630 74.4L462.1 90L481.5 33.5L640 43zM177.9 90L10 74.3L0 43L158.5 33.6L177.9 90z" />
-    <glyph glyph-name="avianex"
-      unicode="&#xF374;"
-      horiz-adv-x="512" d=" M453.1 416H141.1C102.2 416 64.9 384.8 57.8 346.3L1.2 37.7C-5.9 -0.8 19.9 -32 58.9 -32H370.9C409.8 -32 447.1 -0.8 454.2 37.7L510.9 346.2C517.9 384.8 492.1 416 453.1 416zM394.9000000000001 68.7L362.9000000000001 55.2L247.5000000000001 165.2C232.8000000000001 155.2 218.3000000000001 145.7 205.8 138.1L227.9 73.9L210 61.2L169.4 122.2L117 170.3L132.7 185.7L190.7 154.6C200 165.1 211.5 177.2 223.5 189.5L203 219.1L134.2 318.9L153 347.8L161.9 352.6L265 240.2L269.9 235.7C289.3 254.5 303.7 268.1 303.7 268.1C311.4 274.6 325.2 271 334.4 260.2C343.4 249.7 345 235.5 337.1 228.9C335.3 227.6 321.6 217.5 301.8 203.3L306.3 196L401.2 76.6L394.8999999999999 68.7z" />
-    <glyph glyph-name="aviato"
-      unicode="&#xF421;"
-      horiz-adv-x="640" d=" M107.2 164.5L88.2 206.3H36.1L17.1 164.5H0L62.2 295.9L124.4 164.5H107.2zM62.2 262.6L42.6 220.1H81.8L62.2 262.6zM174.9 160.2L112.7 291.6H129.8L174.9 195.6L220 291.6H237L174.9 160.2zM255.5 164.5V291.6H271V164.5H255.5zM464.6 280.1V164.5H447.3V280.1H406.1V291.6H505.7V280.1H464.6zM640 229.2C640 220 638.3 211.4 634.9 203.4C631.5 195.4 626.6999999999999 188.3 620.6999999999999 182.3C614.6999999999999 176.3 607.5999999999999 171.5 599.5999999999999 168.1C591.5999999999999 164.7 582.9999999999999 163 573.8 163S556 164.6999999999999 548 168.1C540 171.5 532.9 176.3 526.9 182.3C520.9 188.3 516.1 195.3 512.6999999999999 203.4C509.3 211.4 507.5999999999999 220 507.5999999999999 229.2S509.2999999999999 247 512.6999999999999 255C516.0999999999999 263 520.9 270.1 526.9 276.1C532.9 282.1 539.9 284.5 548 288C556 291.4 564.6 293.1 573.8 293.1S591.5999999999999 291.4 599.5999999999999 288C607.5999999999999 284.6 614.6999999999999 282.2 620.6999999999999 276.1C626.6999999999999 270.1 631.4 263 634.9 255C638.3 247 640 238.4 640 229.2zM624.5 229.2C624.5 236.5 623.2 243.2 620.6 249.5C618 255.8 614.4 261.2 609.8000000000001 265.8C605.2 270.4 599.8000000000001 274 593.6 276.7000000000001C587.4 279.4 580.8000000000001 280.7000000000001 573.8000000000001 280.7000000000001S560.2 279.4 554.0000000000001 276.7000000000001C547.8000000000001 274 542.4000000000001 270.4 537.8000000000001 265.8C533.2 261.2000000000001 529.6 255.8 527.0000000000001 249.5C524.4000000000001 243.2 523.1000000000001 236.4 523.1000000000001 229.2C523.1000000000001 221.9 524.4000000000001 215.2 527.0000000000001 208.9C529.6000000000001 202.6 533.2000000000002 197.2 537.8000000000001 192.6C542.4000000000001 188 547.8000000000001 184.4 554.0000000000001 181.7C560.2000000000002 179 566.8000000000001 177.7 573.8000000000001 177.7S587.4000000000001 179 593.6 181.7C599.8000000000001 184.4 605.2 188 609.8000000000001 192.6C614.4000000000001 197.2 618.0000000000001 202.6 620.6 208.9C623.2 215.2 624.5 222 624.5 229.2zM529.7 132.5V138.8L618.6 148.8L375.7000000000001 135.4C376.3000000000001 137.6 376.8000000000001 140.0000000000001 377.1 142.6C377.4000000000001 144.6 377.6 146.8 377.7000000000001 149.1L442.5000000000001 157.2000000000001L377.6 155.3000000000001C377.6 155.7000000000001 377.5 156.0000000000001 377.5 156.4000000000001C374.7 173.6000000000001 352 180.1000000000001 352 180.1000000000001L350.9 206.4000000000001H374.7L393.7 164.6000000000001H410.8L348.6 296L286.4000000000001 164.6H303.5000000000001L322.5000000000001 206.4H346.1000000000001L345 180S322.3 173.5 319.5 156.3C319.4 156 319.4 155.6 319.4 155.2L254.5 157.1L319.3 149C319.4 146.6999999999999 319.6 144.6 319.9 142.5C320.2 139.8999999999999 320.7 137.5 321.3 135.3L78.4 148.8L167.3 138.8V132.5C161.4 131.6 156.8 126.5 156.8 120.3C156.8 113.5 162.4 107.9 169.2 107.9C176 107.9 181.6 113.5000000000001 181.6 120.3C181.6 126.5 177 131.6 171.1 132.5V138.3L251.4000000000001 129.3V123.9C245.7000000000001 122.8 241.5000000000001 117.7000000000001 241.5000000000001 111.8C241.5000000000001 105 247.1 101.6 253.9000000000001 101.6C260.7000000000001 101.6 266.3 105 266.3 111.8C266.3 117.8 262 122.8 256.4000000000001 123.9V128.8L284.8 125.6V101.9H278.9000000000001V88H284.8V94.6H289.8V88H295.7V101.8H289.8V125L328.1 120.7C336.2000000000001 109.3 347.1 107.1 347.1 107.1L347 100.4L341.9 100.2L341.8 88.1H345.9L346 93.1H351.2L351.3 88.1H355.4000000000001L355.3 100.2L350.2 100.4L350.1 107.1S361 109.2 369.1 120.7L407.4 125V101.8H401.5V88H407.4V94.6H412.4V88H418.3V101.8H412.4V125.5L440.8 128.7V123.8C435.1 122.7 430.9 117.6 430.9 111.7C430.9 104.9 436.5 101.5 443.3 101.5C450.1 101.5 455.6999999999999 104.9 455.6999999999999 111.7C455.6999999999999 117.7 451.3999999999999 122.7 445.8 123.8V129.2L526.0999999999999 138.2V132.4C520.1999999999999 131.5 515.5999999999999 126.4 515.5999999999999 120.2C515.5999999999999 113.4 521.1999999999999 107.8 527.9999999999999 107.8C534.7999999999998 107.8 540.3999999999999 113.4 540.3999999999999 120.2C540.1999999999998 126.5 535.6999999999998 131.6 529.6999999999998 132.5zM328.9000000000001 220.1L348.5000000000001 262.6L368.1000000000001 220.1H350.2000000000001L348.5000000000001 260.4L346.8000000000002 220.1H328.9000000000002z" />
-    <glyph glyph-name="aws"
-      unicode="&#xF375;"
-      horiz-adv-x="640" d=" M180.41 244.99C179.69 222.34 191.01 212.31 191.29 205.94A8.164 8.164 0 0 0 187.19 199.67L174.39 190.71A10.659999999999998 10.659999999999998 0 0 0 168.76 188.79C168.33 188.81 160.57 186.96 148.28 214.4A78.608 78.608 0 0 0 85.67 184.95C69.39 184.06 25.27 194.19 27.54 241.16C25.95 279.44 61.6 303.2200000000001 98.47 301.21C105.57 301.19 120.07 300.84 145.46 294.94V310.56C148.15 337.02 130.76 357.55 100.65 354.47C98.25 354.46 81.25 354.97 54.81 344.36C47.45 340.98 46.51 341.54 44.06 341.54C36.65 341.54 39.7 363.02 41.12 365.74C46.33 372.14 76.98 384.09 107.06 383.92A76.857 76.857 0 0 0 162.75 366.64A70.285 70.285 0 0 0 180.42 314.28L180.41 244.99zM93.99 212.6C126.42 213.07 140.15 232.57 143.28 243.07C145.74 253.12 145.33 259.48 145.33 270.4700000000001C135.66 272.79 121.74 275.32 105.77 275.3400000000001C90.62 276.48 62.95 269.7100000000001 64.03 243.08C62.79 226.29 75.15 211.68 93.99 212.6zM264.91 189.55C257.05 188.83 253.39 194.41 252.23 199.92L202.43 364.5700000000001C201.46 367.35 200.8199999999999 370.2200000000001 200.51 373.1500000000001A4.61 4.61 0 0 0 204.37 378.4000000000001C204.61 378.4400000000001 202.24 378.4000000000001 226.62 378.4000000000001C235.4 379.2800000000001 238.26 372.37 239.17 368.0300000000001L274.89 227.2L308.05 368.03C308.58 371.25 310.99 379.1 320.85 378.27H338.01C340.18 378.45 349.12 378.77 350.69 367.9L384.11 225.27L420.98 367.9C421.4600000000001 370.0800000000001 423.7000000000001 379.27 433.6600000000001 378.27H453.38C454.23 378.4 459.53 379.0800000000001 458.63 369.69C458.2 367.8400000000001 462.04 380.35 405.88 199.79C404.73 194.28 401.06 188.7000000000001 393.2 189.42H374.51C363.57 188.2700000000001 362 199.08 361.83 200.17L328.67 337.3L295.89 200.31C295.73 199.22 294.16 188.41 283.21 189.56H264.91zM538.39 183.92C532.51 183.91 504.47 184.22 481.03 196.21A12.802 12.802 0 0 0 473.22 208.12V218.87C473.22 227.32 479.42 225.77 482.05 224.76C492.09 220.7 498.53 217.62 510.86 215.16C547.51 207.63 563.63 217.46 567.5799999999999 219.64C580.7299999999999 227.45 581.77 245.32 572.8299999999999 254.59C562.3499999999999 263.38 557.3499999999999 263.71 519.6999999999999 275.59C515.06 276.88 475.9999999999999 289.2 475.9099999999999 327.95C475.2999999999999 356.19 500.9599999999999 384.13 545.43 383.9C558.0999999999999 383.91 591.8599999999999 379.77 601 368.28C602.35 366.19 603.02 363.73 602.92 361.24V351.13C602.92 346.69 601.3 344.47 598.05 344.47C590.3399999999999 345.33 576.66 355.64 548.89 355.22C542 355.58 509 354.31 510.48 330.25C510.05 311.29 537.09 304.18 540.1800000000001 303.36C576.6400000000001 292.39 588.83 290.57 603.3000000000001 273.78C620.44 251.53 611.2 225.48 607.6500000000001 218.34C588.57 180.85 539.2300000000001 183.9 538.3900000000001 183.92zM578.59 79.06C508.5600000000001 27.34 406.9000000000001 -0.19 320.1 -0.19A469.127 469.127 0 0 0 2.83 120.54C-3.7 126.43 2.06 134.5 10 130.0100000000001A637.37 637.37 0 0 1 326.88 45.89A630.22 630.22 0 0 1 568.47 95.4400000000001C580.25 100.4400000000001 590.24 87.64 578.59 79.0600000000001zM607.7800000000001 112.35C598.82 123.87 548.5000000000001 117.73 525.97 115.04C519.1800000000001 114.2700000000001 518.03 120.16 524.1800000000001 124.5100000000001C564.2500000000001 152.6800000000001 630.0600000000001 144.6100000000001 637.6200000000001 135.1400000000001C645.1700000000001 125.67 635.5700000000002 59.73 598.0600000000002 28.23C592.3000000000002 23.36 586.7900000000002 25.93 589.3500000000001 32.33C597.7900000000002 53.58 616.7400000000001 100.8200000000001 607.7800000000001 112.35z" />
-    <glyph glyph-name="bandcamp"
-      unicode="&#xF2D5;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM296.2 113.9H115.2L199.9 270H380.9L296.2 113.9z" />
-    <glyph glyph-name="behance-square"
-      unicode="&#xF1B5;"
-      horiz-adv-x="448" d=" M186.5 155C186.5 135.7 172.5 129.6 155.3 129.6H110.2V182.5H156.2C174.8 182.4 186.5 174.7 186.5 155zM178.8 237.3C178.8 255 165.1 259.2000000000001 149.9 259.2000000000001H110.3V214.4H153C168.1 214.4 178.8 221 178.8 237.3000000000001zM311.1 214.1C292.8 214.1 280.6 202.7 279.4000000000001 184.4H341.6C339.9000000000001 202.9 330.3 214.1 311.1 214.1zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM271.7 263H349.5V281.9H271.7V263zM228.7 152.7C228.7 176.8 217.3 197.6 193.7 204.3C210.9 212.5 219.9 222 219.9 241.3C219.9 279.5 191.4 288.8 158.5 288.8H68V96.8H161.1C196 96.9999999999999 228.7 113.6999999999999 228.7 152.6999999999999zM380 167.5C380 208.6 355.9 242.9 312.4 242.9C270 242.9 241.3 211.1 241.3 169.3C241.3 126 268.6 96.3 312.4 96.3C345.6 96.3 367.1 111.2 377.5 143.1H343.8C340.1 131.2000000000001 325.2 125 313.6 125C291.2000000000001 125 279.5 138.1 279.5 160.3H379.7C379.8 162.6 380 165.1 380 167.5z" />
-    <glyph glyph-name="behance"
-      unicode="&#xF1B4;"
-      horiz-adv-x="576" d=" M232 210.8C263.8 226 280.4 249 280.4 284.8C280.4 355.4 227.8 372.6 167.1 372.6H0V18.2H171.8C236.2 18.2 296.7000000000001 49.1 296.7000000000001 121.1C296.7000000000001 165.6 275.6 198.5 232.0000000000001 210.8zM77.9 312.1H151C179.1 312.1 204.4 304.2 204.4 271.6C204.4 241.5 184.7 229.4 156.9 229.4H77.9V312.1zM161.2 78.4H77.9V176H162.8C197.1 176 218.8 161.7 218.8 125.4C218.8 89.6 192.9 78.4 161.2 78.4zM519.7 319.1H376V354H519.7V319.1zM576 142.8C576 218.7 531.6 282 451.1 282C372.9000000000001 282 319.8 223.2 319.8 146.2C319.8 66.3 370.1 11.5 451.1 11.5C512.4 11.5 552.1 39.1 571.2 97.8H509C502.3 75.9 474.7 64.3 453.3 64.3C412 64.3 390.3 88.5 390.3 129.6H575.4C575.6999999999999 133.8 576 138.3 576 142.8zM390.4 174C392.7 207.7 415.1 228.8 448.9 228.8C484.3 228.8 502.1 208 505.1 174H390.4z" />
-    <glyph glyph-name="bimobject"
-      unicode="&#xF378;"
-      horiz-adv-x="448" d=" M416 416H32C14.4 416 0 401.6 0 384V0C0 -17.6 14.4 -32 32 -32H416C433.6 -32 448 -17.6 448 0V384C448 401.6 433.6 416 416 416zM352 158.6C352 109.2000000000001 340.6 76 248.2 76H231.3C187.2 76 168.9 90.9 160.9 114.8H160V80H96V312H160V237.3H161.1C165.7 267.8 200.8 276.1 230.8 276.1H248.1C340.5 276.1 351.9000000000001 243.0000000000001 351.9000000000001 193.6V158.6zM288 187.5V164.6C288 142.9 284.6 130.8 249.6 130.8H204.3C175.4 130.8 160.2 137.3 160.2 166.5V185.5C160.2 214.8 175.4 221.2 204.3 221.2H249.6C284.6 221.4 288 209.2 288 187.5z" />
-    <glyph glyph-name="bitbucket"
-      unicode="&#xF171;"
-      horiz-adv-x="512" d=" M23.1 416C14.2 416.1 7 409.1 6.9 400.2C6.9 399.3 7 398.4 7.1 397.4L74.9 -14C76.6 -24.4 85.6 -32 96.1 -32.1H421.2000000000001C429.1 -32.2 435.9000000000001 -26.5 437.2000000000001 -18.7L505.0000000000001 397.3C506.4 406 500.5000000000001 414.2 491.8000000000001 415.6C490.9000000000001 415.7 490.0000000000001 415.8 489.0000000000001 415.8L23.1 416zM308.4000000000001 118.7H204.6L176.5 265.5H333.5L308.4 118.7z" />
-    <glyph glyph-name="bitcoin"
-      unicode="&#xF379;"
-      horiz-adv-x="512" d=" M504 192C504 55.033 392.967 -56 256 -56S8 55.033 8 192S119.033 440 256 440S504 328.967 504 192zM362.349 227.33C367.286 260.329 342.158 278.069 307.799 289.903L318.945 334.605L291.732 341.386L280.881 297.862C273.727 299.645 266.379 301.326 259.078 302.992L270.007 346.802L242.809 353.583L231.656 308.897C225.734 310.246 219.9209999999999 311.579 214.279 312.981L214.31 313.121L176.78 322.491L169.541 293.429S189.732 288.802 189.3059999999999 288.516C200.3279999999999 285.765 202.3199999999999 278.472 201.9859999999999 272.691L189.2899999999999 221.766C190.0499999999999 221.572 191.0339999999999 221.293 192.119 220.859C191.2119999999999 221.084 190.243 221.332 189.243 221.572L171.447 150.2339999999999C170.098 146.8859999999999 166.68 141.8639999999999 158.976 143.7699999999999C159.2469999999999 143.375 139.196 148.7069999999999 139.196 148.7069999999999L125.6859999999999 117.56L161.0999999999999 108.733C167.6879999999999 107.0819999999999 174.1449999999999 105.3539999999999 180.5 103.727L169.238 58.514L196.4199999999999 51.733L207.5729999999999 96.466A1038.209 1038.209 0 0 1 229.26 90.8389999999999L218.1449999999999 46.3159999999999L245.3579999999999 39.5349999999999L256.6199999999999 84.6629999999999C303.0239999999999 75.8819999999999 337.9189999999999 79.4239999999999 352.6059999999999 121.3899999999999C364.4419999999999 155.1799999999999 352.0169999999999 174.6709999999999 327.6019999999999 187.3809999999999C345.3819999999999 191.4789999999999 358.7759999999999 203.1729999999999 362.3489999999999 227.3299999999999zM300.172 140.151C291.762 106.3609999999999 234.864 124.6279999999999 216.417 129.208L231.361 189.107C249.807 184.504 308.961 175.39 300.172 140.151zM308.589 227.818C300.916 197.082 253.558 212.698 238.196 216.526L251.744 270.853C267.107 267.025 316.58 259.88 308.589 227.818z" />
-    <glyph glyph-name="bity"
-      unicode="&#xF37A;"
-      horiz-adv-x="496" d=" M78.4 380.8C173.8 470 324.5 472 421.5 377C435.8 362.9 415.1 339.9 399.1 355.5C314.3 437.9 183.3 435.8 100.2000000000001 358.7C83.9000000000001 343.6 63.7000000000001 367 78.4000000000001 380.8zM177.3 -37.8C196.6 -43.5 206.6 -14.2 185.2 -7.8C73 26.1 9.4 141.9 37.7 253.2C42.7 272.8 12.8 281.3 7.5 260.3C-24.6 132.9 48.6 0.5 177.3 -37.8000000000001zM325.4 -35.8C447.3 4.4 518.3 131.1 489.8 255.2C485.3 274.9 454.9 269 459.8 247.3C483.9999999999999 139.6 422.7 29.4 316.6 -6.1C295.4 -13.1 306.2 -42.1 325.4 -35.8zM262.5 43.2L262.7 115C262.7 123.2 256.1 129.8 247.9 129.8C239.7 129.8 233.1 123.1 233.1 115L232.9 43.2C232.9 35 239.5 28.4 247.7 28.4S262.5 35 262.5 43.2zM333.5 312.2C335.6 221.3 338.2 180.3 248 179.7C155.5 180.4 161.1 224 162.5 312.2C162.5 334 130 331.8 130 312.2V240.6C130 171.3 190.7 149.7 248 150.5C305.3 149.7 366 171.3 366 240.6V312.2C366 331.8 333.5 334 333.5 312.2z" />
-    <glyph glyph-name="black-tie"
-      unicode="&#xF27E;"
-      horiz-adv-x="448" d=" M0 416V-32H448V416H0zM316.5 90.8L224 2.1L131.5 90.8L196 274.8L131.5 361.4H316.4L252 274.8L316.5 90.8z" />
-    <glyph glyph-name="blackberry"
-      unicode="&#xF37B;"
-      horiz-adv-x="512" d=" M166 331.1C166 307.7 149.6 282 93.5 282H23.4L44.4 370.8H112.2C154.3 370.8 166 347.5 166 331.1zM292.2 370.8H224.4L205.7 282H275.8C329.6 282 345.9 307.7 345.9 331.1C346 347.5 334.3 370.8 292.2 370.8zM88.8 239.9H21L0 151.1H70.1C126.2 151.1 142.6 174.5 142.6 200.2C142.6 216.5 130.9 239.9000000000001 88.8 239.9000000000001zM268.9 239.9H201.1L182.4 151.1H252.5C306.3 151.1 322.6 174.5 322.6 200.2C322.6 216.5 310.9 239.9000000000001 268.9 239.9000000000001zM458.2 293.7H390.4L371.7 204.9H441.8C495.6 204.9 511.9 228.3 511.9 254C512 270.3 500.3 293.7 458.2 293.7zM430.2 155.8H362.4L343.7 67H413.8C469.9 67 483.9 90.4 483.9 116.1C483.9 132.4 472.3 155.8 430.2 155.8zM240.8 102H173L154.3 13.2H224.4C280.5 13.2 294.5 38.9 294.5 62.3C294.6 78.6 282.9 102 240.8 102z" />
-    <glyph glyph-name="blogger-b"
-      unicode="&#xF37D;"
-      horiz-adv-x="448" d=" M446.6 225.3C444.8 233.3 439.8 240.7 434.1 243.8C432.3 244.8 421.1 246 409.1 246.5C389 247.4 386.8 247.8 380.4000000000001 251.5C370.3 257.4 367.6 263.8 367.5000000000001 281C367.4000000000001 314 353.7000000000001 344.7 326.6000000000001 372.3C307.3000000000001 392 285.7000000000001 405.3 261.1000000000001 412.8C255.2000000000001 414.6 242.0000000000001 415.2 197.8000000000001 415.7C128.4000000000001 416.5 113.0000000000001 415.1 89.4000000000001 405.7C45.9 388.5 14.7 351.9 3.3 305.1C1.2 296.3 0.7 282.2 0.2 201.2C-0.4 99.7 0.3 84.8 6.6 64.7C22.2 15.1 66.5 -21.6 111 -29.6C125.8 -32.3 308.3 -32.9 327 -30.4C359.5 -26.0000000000001 385 -12.9 408.9 11.4999999999999C426.2 29.1999999999999 437 48.3 444.1 73.6C449 91.2 448.6 216.4 446.6 225.3zM124.5 288.9C132.3 296.8 134.5 297.1 183.3 297.1C227.2 297.1 228.7 297 235.1 293.7C244.4000000000001 289 248.5000000000001 282.4 248.5000000000001 271.8C248.5000000000001 262.3 244.7 255.6 236.2 250.2C231.6 247.3 228.9 247.1 185.9 246.9C159.4 246.7 138.2000000000001 247.3 135.1 248.1C118.5 252.8 112.3 276.6 124.5 288.9zM316.3 89.1L301.4000000000001 86.7000000000001L223.9 85.8000000000001C155.8000000000001 85.0000000000001 136.6 86.2000000000001 133 87.8000000000001C125.9 90.9000000000001 119.2 99.5000000000001 118.1 107.2000000000001C117 114.5000000000001 120.7 124.5000000000001 126.3 129.6C133.4 136 136.5 136.2000000000001 223.6 136.3C313.2000000000001 136.4 312.7000000000001 136.4 321.2000000000001 128.5C333.3000000000001 117.2 330.7000000000001 97.3 316.3000000000001 89.1z" />
-    <glyph glyph-name="blogger"
-      unicode="&#xF37C;"
-      horiz-adv-x="448" d=" M162.4 252C167.2 256.9 168.6 257.1 198.8 257.1C226 257.1 226.9 257 230.9 255C236.7 252.1 239.2 248 239.2 241.4C239.2 235.5 236.8 231.4 231.6 228C228.8 226.2 227.1 226.1 200.5 225.9C184.1 225.8 171 226.1 169 226.7C158.7 229.6 154.9 244.4 162.4 252.0000000000001zM223.8 157.5C169.9 157.5 168 157.3 163.6 153.4C160.1 150.3 157.9 144 158.5 139.5C159.2 134.8 163.3000000000001 129.4 167.7 127.5C169.9 126.5 181.8 125.8 224 126.3L271.9 126.9L281.1 128.4C290.1 133.5000000000001 291.6 145.8 284.2 152.8C278.9 157.5 279.2 157.5 223.8 157.5zM447.2000000000001 27.4C443.7000000000001 -1 424.2000000000001 -23 396.1 -30.1C388.9000000000001 -31.9 386.4000000000001 -32 223.2 -31.9C65.4 -31.9 57.3 -31.8 51.2 -30.1C42.8 -27.9 35.6 -24.6 28.9 -20.1C23.3 -16.3 15 -8.3 11.9 -3.7C8.1 1.9 3.7 11.6 1.9 18.3C0.1 25 0 27.7 0 191.7C0 354.8 0 358.3 1.8 365.4C8.1 390.1 27.7 409 53 414.6C60.3 416.2 385.1 416.5 393 414.9C414.2 410.6 430.9 397.8 440.6 378.5C448.3 363.2 447.6 380 447.9000000000001 197.9C448.1 82.1 447.9000000000001 33.4 447.2000000000001 27.4zM361.8000000000001 212.6C360.7000000000001 217.6 357.6000000000001 222.2 354.1000000000001 224.1C353.0000000000001 224.7 346.1000000000001 225.4 338.6000000000001 225.8C326.2000000000001 226.4 324.8000000000001 226.6 320.8000000000001 228.9C314.6000000000001 232.5 312.9000000000001 236.5 312.8000000000001 247.2C312.8000000000001 267.6 304.3000000000001 286.6 287.5000000000001 303.7C275.5000000000001 315.9 262.2000000000001 324.2 246.9000000000001 328.8C243.3000000000001 329.9 235.1000000000001 330.3 207.7000000000001 330.6C164.8000000000001 331.1 155.2000000000001 330.2 140.6000000000001 324.4C113.6000000000001 313.7 94.3000000000001 291 87.2000000000001 262C85.9000000000001 256.5999999999999 85.6000000000001 247.8 85.3 197.6999999999999C84.9 134.8999999999999 85.3 125.5999999999999 89.3 113.1999999999999C99 82.4999999999999 126.4 59.8 153.9 54.8C163.1 53.1 276.1 52.6999999999999 287.6 54.3C307.7000000000001 56.9999999999999 323.5 65.1 338.3 80.1999999999999C349 91.0999999999999 355.7 102.9999999999999 360.1 118.6999999999999C363.3 129.5999999999999 363 207.0999999999999 361.8 212.5999999999999z" />
-    <glyph glyph-name="bluetooth-b"
-      unicode="&#xF294;"
-      horiz-adv-x="320" d=" M196.48 187.977L289.106 291.31L143.125 448V241.67L57.014 327.781L25.608 296.376L133.669 187.977L25.608 79.578L57.014 48.173L143.125 134.284L145.84 -64L294.392 84.644L196.48 187.977zM237.34 290.973L187.363 240.995L187.025 341.29L237.34 290.973zM187.363 134.96L237.34 84.982L187.025 34.6659999999999L187.363 134.9599999999999z" />
-    <glyph glyph-name="bluetooth"
-      unicode="&#xF293;"
-      horiz-adv-x="448" d=" M292.6 276.9L249.7 234L249.4 320L292.6 276.9M249.4 57.1L292.5 100.2000000000001L249.6 143.1L249.4 57.1zM416 188.6C416 -17 344.1 -64 230.9 -64S32 -17 32 188.6S115.4 448 228.6 448S416 394.1 416 188.6zM257.5 188.6L336.9 277.2000000000001L211.8 411.5V234.6L138 308.4L111 281.5L203.7 188.5L111 95.5L137.9 68.6L211.7 142.4L214 -27.6L341.4 99.9L257.5 188.6z" />
-    <glyph glyph-name="btc"
-      unicode="&#xF15A;"
-      horiz-adv-x="384" d=" M310.204 205.362C337.9340000000001 219.542 355.581 244.752 351.4840000000001 286.662C346.1260000000001 344.013 299.0260000000001 363.235 236.6340000000001 368.591V448H188.1060000000001V370.7970000000001C175.5010000000001 370.7970000000001 162.5810000000001 370.482 149.662 370.1670000000001V448H101.134V368.591C83.2920000000001 368.052 62.512 368.315 3.764 368.591V316.913C42.078 317.591 62.181 320.053 66.787 295.486V78.057C63.862 58.565 48.263 61.372 13.532 61.986L3.765 4.32C92.246 4.32 101.135 4.005 101.135 4.005V-64H149.663V3.06C162.897 2.745 175.817 2.745 188.107 2.745V-64H236.635V4.005C317.9340000000001 8.417 372.2820000000001 28.899 379.5300000000001 105.472C385.201 166.918 356.2100000000001 194.334 310.2040000000001 205.362zM150.608 313.447C178.023 313.447 263.7340000000001 321.954 263.7340000000001 264.919C263.7340000000001 210.404 178.0240000000001 216.707 150.608 216.707V313.447zM150.608 61.671V168.179C183.38 168.179 283.735 177.317 283.735 114.924C283.7340000000001 54.738 183.38 61.671 150.608 61.671z" />
-    <glyph glyph-name="buromobelexperte"
-      unicode="&#xF37F;"
-      horiz-adv-x="448" d=" M0 416V288H128V416H0zM120 296H8V408H120V296zM160 416V288H288V416H160zM280 296H168V408H280V296zM320 416V288H448V416H320zM440 296H328V408H440V296zM0 256V128H128V256H0zM120 136H8V248H120V136zM160 256V128H288V256H160zM280 136H168V248H280V136zM320 256V128H448V256H320zM440 136H328V248H440V136zM0 96V-32H128V96H0zM120 -24H8V88H120V-24zM160 96V-32H288V96H160zM280 -24H168V88H280V-24zM320 96V-32H448V96H320z" />
-    <glyph glyph-name="buysellads"
-      unicode="&#xF20D;"
-      horiz-adv-x="448" d=" M224 297.3L266.9 136.6H181.1L224 297.3zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM382.7 42.7L288.2 341.4H159.8L65.3 42.7H156L267.7 134.3L291.9 42.6999999999999H382.7z" />
-    <glyph glyph-name="cc-amazon-pay"
-      unicode="&#xF42D;"
-      horiz-adv-x="576" d=" M124.7 246.2C124.8 258 124.7 269.7 124.7 281.5V316.8C124.7 318.1 125.1 318.8 126.1 319.5C137.6 327.5 150.2 331.6 164.3 330.6C176.8 329.7 187 323.6 192.4 308.9C195.7 300 196.5 290.7000000000001 196.5 281.2000000000001C196.5 272.5 195.8 263.9 193.1 255.6C187.4 237.8 174.4 230.9000000000001 157.4 231.7C145.7 232.2 135.5 236.7 126 243.4C125.1 244.2 124.6 245 124.7 246.2zM279.6 231.6C284.2000000000001 229.8 288.9000000000001 229.6 293.7000000000001 230.1C305.3000000000001 231.3 315.6 235.8 325.0000000000001 242.6C325.9000000000001 243.2 326.3000000000001 243.9 326.3000000000001 245.1C326.2000000000001 249 326.3000000000001 253 326.3000000000001 256.9C326.3000000000001 260.9 326.2000000000001 264.9 326.3000000000001 268.9C326.3000000000001 270.3 325.9000000000001 270.9 324.5000000000001 271.1C317.5000000000001 272 310.6000000000001 273.3 303.6000000000001 274C296.6000000000001 274.6 289.6000000000001 274.3 282.8000000000001 272.1C276.1000000000001 269.9 271.1000000000001 265.9 269.1000000000001 259C267.5000000000001 253.6 267.5000000000001 248.2 269.2000000000001 242.8C270.8000000000002 237.3 274.4000000000001 233.6 279.6000000000001 231.6zM576 368V16C576 -10.5 554.5 -32 528 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H528C554.5 416 576 394.5 576 368zM368.5 344.1C368.9 342.4 369.4 340.7 370.1 339C386.6 298.4 403 257.7 419.6 217.1C421 213.6 421.3 210.7 419.8 207.2C417 201 414.9000000000001 194.6 412 188.5C409.4 183 405.3 179 399.3 177.3C395.1 176.2 390.8 176 386.4000000000001 176.4C384.3 176.6 382.2000000000001 177.1 380.1 177.2000000000001C377.3 177.4 375.9000000000001 176.1 375.8 173.2000000000001C375.7 170.4 375.7 167.6 375.8 164.9C375.9000000000001 160.3 377.4000000000001 158.2000000000001 382 157.4C386.7 156.6 391.4 155.8 396.2 155.7000000000001C410.5 155.4 421.9 161.1 429.3 173.6C432.2 178.5 434.9000000000001 183.7000000000001 437 189C456.8 239.1 476.5 289.3 496.2 339.5C496.8 341 497.3 342.5 497.5 344.1C497.9 346.5 496.8 347.7 494.4 347.8C488.8 347.9 483.3 347.8 477.7 347.8C474.6 347.8 472.4 346.4 471.3 343.5C470.9 342.4 470.4 341.2 470 340.1L440.9 256.4C438.8 250.3 436.7 244.3 434.4 237.8C434 238.7 433.8 239.2 433.6 239.7C422.8 269.6 412 299.6 401.2 329.5C399.5 334.2 397.7 339 395.9 343.7C395 346.2 393.2 347.7 390.5 347.7C384.1 347.8 377.7 347.9 371.3 347.8C369.1 347.8 368 346.2 368.5 344.1zM242.4 242C244.1 230.3 250 221.2 260.4 215.4C270.3 209.9 281.1 209.2 292.1 210.8C304.8 212.7 316 218.1 325.9 226.3C326.3 226.6 326.7 226.9 327.3 227.3C327.8 224.1 328.2 221.1 328.8 218.1C329.3 215.5 330.9 213.8 333.3 213.7C337.9 213.6 342.4 213.6 347 213.7C349.3 213.8 350.8 215.3 351 217.6C351.1 218.4 351.1 219.2 351.1 219.9V308.7000000000001C351.1 312.3000000000001 350.9 315.9000000000001 350.4 319.5000000000001C348.8 330.3000000000001 344.2 339.2000000000001 334.5 344.9000000000001C328.9 348.2000000000001 322.7 349.9000000000001 316.3 350.8000000000001C313.3 351.2000000000001 310.3 351.5000000000001 307.2 351.9000000000001H297.2C296.4 351.8000000000001 295.6 351.6000000000001 294.7 351.6000000000001C286.5 351.2000000000001 278.4 350.2000000000001 270.5 348.1000000000001C265.4 346.8000000000001 260.5 344.9000000000001 255.5 343.2000000000001C252.5 342.2000000000001 251 340.0000000000001 251.1 336.7000000000001C251.2 333.9000000000001 251 331.1000000000001 251.1 328.4000000000001C251.2 324.3000000000001 252.9 323.2000000000001 256.8 324.3000000000001C263.3 326.0000000000001 269.9000000000001 327.8000000000001 276.5 329.1000000000001C286.8 331.0000000000001 297.2 331.8000000000001 307.6 330.3000000000001C313 329.5000000000001 318.1 327.9000000000001 321.7000000000001 323.3000000000001C324.8000000000001 319.3000000000001 325.9000000000001 314.5000000000001 326.1 309.6000000000001C326.4000000000001 302.7000000000001 326.3 295.7000000000001 326.4000000000001 288.8000000000001C326.4000000000001 288.4000000000001 326.3 288.1000000000001 326.2000000000001 287.6000000000001C325.8000000000001 287.6000000000001 325.4000000000001 287.6000000000001 325.1 287.7000000000001C316.3 289.8000000000001 307.4000000000001 291.3000000000001 298.3 291.8000000000001C288.8 292.3000000000001 279.4000000000001 291.7000000000001 270.4000000000001 288.6000000000001C259.6 284.8000000000001 250.9000000000001 278.3000000000001 245.8000000000001 267.8000000000001C241.7000000000001 259.5000000000001 241.2000000000001 250.8000000000001 242.4000000000001 242.0000000000001zM98.7 341.1V165.8C98.7 165 98.7 164.1 98.8 163.3C99 160.8 100.5 159.1999999999999 102.9 159.1C108.8 159 114.7 159 120.6 159.1C123.1 159.1 124.6 160.8 124.7 163.2C124.8 164 124.8 164.9 124.8 165.7V226.4C125.7 225.7 126.2 225.2 126.7 224.8C141.7 212.3 158.9 208.2 177.8 211.9C194.9 215.3 206.7 225.8 214.5 241.1C220.3 252.7 222.8 265.2 223.2 278.1C223.7 292.4 222.2 306.5 216.4 319.8C209.3 336.2 197.5 347.1 179.7 350.7C177 351.3 174.2 351.5 171.5 351.9H164.5C163.3 351.7 162.1 351.6 160.9 351.4C149.2 350 138.6 345.6 129.1 338.7C127.1 337.3 125.2 335.7 123.2 334.2C123.1 334.7 122.9 335 122.8 335.4C122.4 337.7 122.1 340 121.7 342.3C121.1 346.2 119.2 347.8 115.3 347.9H105.6C99.7 348 98.7 346.9 98.7 341.1zM493.6 109C490.9 109.7 488.5 109 486 108C442.1 89.6 396.5 77.8 349.2 72.2C334.7 70.5 320.1 69.4 305.5 69C278.9 68.3 252.3 69.8 225.9 73.3C208.1 75.7 190.4 79 172.9 83.2C135.9 92.1 100.2 104.9 66.2 122C57.4 126.4 48.8 131.3 40.1 136C36.3 138.1 33.9 137.5 31.9 133.9V132.2C33.1 130.6 34.1 128.8 35.6 127.4C71.6 95.2 112.2 70.9 157.6 54.5C179.5 46.6 202 40.8 224.9 37C238.9 34.7 252.9 33.2 267.1 32.5C270.1 32.4 273.1 32.3 276.1 32.1C276.8 32.1 277.5 31.9 278.2 31.8H295.9C296.6 31.9 297.3 32.1 298 32.1C312.9 32.5 327.8 33.9 342.6 36.1C364 39.3 385 44.2 405.5 50.8C435.1 60.4 463.2 73.2 488.9 90.9C491.7 92.8 494.6 94.7000000000001 496.9 97.1C501.2 101.5 499.2 107.5 493.6 109zM544 136.7C543.2 140.9 540 142.5 536.4 143.7C530.6999999999999 145.6 524.8 146.5 518.8 147C507.8 147.9 496.8 147.4 485.9999999999999 145.4C473.9999999999999 143.2 462.6 139.3 452.4999999999999 132.3C451.3 131.5 450.1 130.5 449.3999999999999 129.3C448.7999999999999 128.4 448.7 127 448.8999999999999 125.9C449.2 124.6 450.5999999999999 124.3 451.8999999999999 124.4C452.4999999999999 124.4 453.0999999999999 124.4 453.6999999999999 124.5L473.1999999999999 126.6C482.8 127.5 492.3999999999999 128.1 501.9999999999999 127.4C506.1 127.1 510.1 126.2000000000001 514 125.2000000000001C518.3 124.1 520.2 120.8000000000001 520.4 116.5000000000001C520.6999999999999 109.8000000000001 519.1999999999999 103.4 517.5 97.0000000000001C514 84.1000000000001 509.2 71.6000000000001 504.2 59.2000000000001C503.9 58.4 503.5 57.5000000000001 503.4 56.7000000000001C503 54.2 504.4 52.7 506.8 53.2C508.1999999999999 53.5000000000001 509.8 54.3000000000001 510.8 55.3000000000001C514.5 58.9000000000001 518.3 62.5000000000001 521.4 66.5000000000001C532.1 80.3000000000001 538.4 96.1000000000001 542.1 113.1000000000001C542.8000000000001 116.1000000000001 543.3000000000001 119.2000000000001 543.8000000000001 122.2000000000001C544.0000000000001 126.9000000000001 544.0000000000001 131.8000000000001 544.0000000000001 136.7000000000001z" />
-    <glyph glyph-name="cc-amex"
-      unicode="&#xF1F3;"
-      horiz-adv-x="576" d=" M576 192.6C538.1 192.8 531.8 193.5 521.5 187.6V192.6C476.2 192.6 468 194.3 456.6 187.4V192.6H378.4000000000001V187.5C367.0000000000001 194 357.0000000000001 192.6 302.7000000000001 192.6V187C296.4000000000001 190.7 288.2000000000001 192.6 278.4000000000001 192.6H220.4C216.9 188.8 207.9 178.9 204.7000000000001 175.4C192.0000000000001 189.5 194.2000000000001 187 189.2000000000001 192.6H106.1000000000001V100.3H188.1000000000001C191.4000000000001 103.8 201.0000000000001 114.1999999999999 204.2000000000001 117.6999999999999C216.9 103.3999999999999 214.5000000000001 105.9999999999999 219.6000000000001 100.3H268.5000000000001C268.5000000000001 115 268.6000000000001 108.6 268.6000000000001 123.3C280.1000000000001 123.1 292.9000000000001 123.5 302.9000000000001 129.5C302.9000000000001 115.6 302.8000000000001 112.3999999999999 302.8000000000001 100.3H342.4000000000001C342.4000000000001 118.8 342.5000000000001 107.6999999999999 342.5000000000001 125.6C348.7000000000001 125.6 350.2000000000001 125.6 351.9000000000001 125.5C352.0000000000001 124.1999999999999 351.9000000000001 125.5 351.9000000000001 100.3C504.7000000000001 100.3 497.8000000000001 99.1999999999999 508.6000000000001 104.8V100.3C543.4000000000001 100.3 563.4000000000001 98.1 576.1000000000001 106.4V16C576.1000000000001 -10.5 554.6000000000001 -32 528.1000000000001 -32H48C21.5 -32 0 -10.5 0 16V219.7H26.6C30.8 229.8 28.8 225 33 235H52.2C56.4 225 54.4 229.8 58.6 219.7H111.5V231.1C113.7 226.1 112.6 228.6 116.6 219.7H146.1C148.5 225.2 148.7 225.5 151.2 231.1V219.7H286.7V244.8C293.1 244.8 294.7 244.9 296.5 244.6C296.5 244.6 296.3 233.7 296.6 219.8H363.1V228.7C370.5 222.8 380.5 219.8 392.8 219.8H419.6C423.8 229.9 421.8 225.1 426 235.1H445C451.5 220.1 445.2 234.6 451.6 219.8H504.4V241.7C516.2 222 512.2 228.8 517.6 219.8H559.2V311.8H519.3000000000001V293.4C507.1000000000001 313.6 513.0000000000001 303.8 508.1000000000001 311.8H464.8000000000001V291.2C458.6000000000001 305.8 460.2 302 456.0000000000001 311.8H423.6000000000001C423.2000000000001 311.8 421.3000000000001 311.6 421.3000000000001 312.1H393.7000000000001C380.9000000000001 312.1 370.6 308.9 363.0000000000001 302.8V312.1H323.1000000000001V306.8C312.3000000000001 312.9 302.4000000000001 311.9 258.7000000000001 312.1C258.6 312.1 247.1000000000001 312.2 247.1000000000001 312.1H144.1000000000001C141.6000000000001 306 137.3000000000001 295.7 131.5000000000001 282.1C128.7000000000001 288.1 120.5000000000001 305.9 117.6000000000001 312.1H71.6000000000001V291C64.2000000000001 308.4 66.9000000000001 302 62.6000000000001 312.1H22.9C19.5 304.2 9.2 280.1 -0.2 258.2V368C-0.2 394.5 21.3 416 47.8 416H527.8C554.3 416 575.8 394.5 575.8 368V192.6zM389.4 273.2C389.1 273 388 271 388 265.6C388 259.6 388.9 257.9 389.1 257.7C389.3 257.6 390.2000000000001 257.2 392.5 257.2L399.8 274.1C398.7 274.1 397.7 274.2 396.7 274.2C391.1 274.2 389.7 273.5 389.4 273.2zM369.5 142.3C378.7 139 380.5 132.8 380.5 123.9L380.4 110.1H363.8L363.9 121.6C363.9 133.4 360.1 135.4 349.1 135.4H331.5L331.3999999999999 110.1H314.7999999999999L314.8999999999999 179.4H354.2999999999999C367.2999999999999 179.4 381.3999999999999 177.1 381.3999999999999 160.7C381.2999999999999 153.1 377.2 145.4 369.5 142.3zM363.2 157.6999999999999C363.2 164.0999999999999 357.6 165.0999999999999 352.5 165.0999999999999H331.5V149.4999999999999H352.2C357.8 149.4999999999999 363.2 150.7999999999999 363.2 157.6999999999999zM544.9 164.8H575V179.4H542.1C529.3000000000001 179.4 518.3000000000001 172.8 518.3000000000001 158.7C518.3000000000001 125.7 561.0000000000001 145.9 561.0000000000001 131.3C561.0000000000001 126.2 556.7000000000002 124.9 552.6000000000001 124.9H520.6000000000001L520.5000000000001 110.1H552.5000000000001C560.9000000000001 110.1 570.1000000000001 111.9 575.0000000000001 119V144.8C564.5000000000001 158.6 535.7000000000002 146.1 535.7000000000002 158.3C535.7000000000002 164.1 540.3000000000002 164.8 544.9000000000002 164.8zM445.7 165.1V179.4H390.5L390.4 110.1H445.6L445.7 124.4L407.1 124.7V138.5H445V152.6H407.2V165.1H445.7zM487.9 125H455.7L455.6 110.1999999999999H487.8C502.6 110.1999999999999 514 115.8 514 132.1999999999999C514 165.3999999999999 471.1 143.3999999999999 471.1 158.5C471.1 164.1 476 164.8999999999999 480.3 164.8999999999999H510.7V179.5H477.5C464.7 179.5 454 172.8999999999999 454 158.8C454 125.8 496.7 146.3 496.7 131.4C496.6 126 492 125 487.9 125zM409.8 283.7C392.4 284 376.6 287.8 376.6 264C376.6 252.2 379.4 244.1 392.7 244.1H400.1L423.6 298.5999999999999H448.4L476.3 233.2V298.5999999999999H501.6L530.6999999999999 250.5V298.5999999999999H547.5999999999999V229.6H524L492.8 281.5V229.6H459.1L452.5 244.9H418.2L411.8 229.6H392.6C369.8 229.6 359.6 241.4 359.6 263.5999999999999C359.6 286.9 370.1 298.8999999999999 393.6 298.8999999999999H409.7000000000001V283.7zM424.1 259.2H446.9L435.7 286.8L424.1 259.2zM351.5 298.8H334.6V229.5H351.5V298.8zM313.4 261.5C322.9 258.2 324.4 252.3 324.4 243.1V229.6H307.8C307.5 244.4 311.4 254.7 293 254.7H275V229.6H258.6V298.8999999999999L297.7 298.5999999999999C311 298.5999999999999 325.1 296.5999999999999 325.1 280.2C325.2 272.2 320.8 264.4999999999999 313.4 261.4999999999999zM306.7 276.8C306.7 283.2 301.1 284.2 296 284.2H275V268.9H295.7C301.4 268.9 306.7 270.2 306.7 276.8zM247.2 284.2V298.8H191.7V229.5H247.2V243.8H208.3V257.6H246.1V271.7H208.3V284.2H247.2zM162.6 229.5V283.7L138.6 229.5H124L100 283.7V229.5H66.2L59.8 244.8H25.3L18.9 229.5H1L30.7 298.8H55.2L83.3 233.1V298.8H110.4L132.1 251.8L151.8 298.8H179.4V229.5H162.6zM53.9 259.2L42.4 286.8L31.2 259.2H53.9zM306.9 156.7C306.9 128.8 276.5 133.4 257.6 133.4L257.5 110.1H225.3L204.9 133.1L183.5999999999999 110.1H118.1999999999999L118.2999999999999 179.4H184.7999999999999L205.2999999999999 156.6L226.3 179.4H279C294.6 179.4 306.9 174 306.9 156.7zM194.2 144.9L176.3 165.1H134.6V152.6H170.9V138.5H134.6V124.6999999999999H175.2L194.2 144.8999999999999zM241 172L215.7 144.6L241 116.5V172zM289.3 156.7C289.3 162.8 284.7 165.1 279.1 165.1H257.6V147.5H278.8C284.7 147.5 289.3 150.3 289.3 156.6999999999999z" />
-    <glyph glyph-name="cc-apple-pay"
-      unicode="&#xF416;"
-      horiz-adv-x="576" d=" M302.2 229.6C302.2 212.4 291.7 202.5 273.2 202.5H248.9V256.7H273.3C291.7 256.7 302.2 246.9 302.2 229.6zM349.7 167C349.7 158.7 356.9 153.3 368.2 153.3C382.6 153.3 393.4 162.4 393.4 175.2V182.9L369.9 181.4C356.6 180.5 349.7 175.6 349.7 167zM576 369V17C576 -9.5 554.5 -31 528 -31H48C21.5 -31 0 -9.5 0 17V369C0 395.5 21.5 417 48 417H528C554.5 417 576 395.5 576 369zM127.8 250.8C136.2 250.1 144.6 255 149.9 261.2000000000001C155.1 267.6 158.5 276.2000000000001 157.6 284.9C150.2 284.6 141 280 135.7 273.6C130.9 268.1 126.8 259.2 127.8 250.8zM188.4 176.3C188.2 176.5 168.8 183.9 168.6 206.3C168.4 225 183.9 234 184.6 234.5C175.8 247.5 162.2 248.9 157.5 249.2C145.3 249.9 134.9 242.3 129.1 242.3C123.2 242.3 114.4 248.9 104.8 248.7C92.3 248.5 80.6 241.4 74.3 230.1C61.2 207.5 70.9 174.1 83.6 155.7C89.8 146.6 97.3 136.6 107.1 137C116.4 137.4 120.1 143 131.3 143C142.6 143 145.8 137 155.6 137.1C165.8 137.3 172.1 146.2000000000001 178.4 155.3C185.3 165.7 188.2 175.7 188.4 176.3zM323.8 229.7C323.8 256.3 305.3 274.5 278.9000000000001 274.5H227.7000000000001V138.1H248.9000000000001V184.7000000000001H278.2000000000001C305.0000000000001 184.7000000000001 323.8000000000001 203.1000000000001 323.8000000000001 229.7000000000001zM413.8 206C413.8 225.7 398 238.4000000000001 373.8 238.4000000000001C351.3 238.4000000000001 334.7 225.5000000000001 334.1 207.9H353.2000000000001C354.8000000000001 216.3000000000001 362.6 221.8000000000001 373.2000000000001 221.8000000000001C386.2000000000001 221.8000000000001 393.4000000000001 215.8000000000001 393.4000000000001 204.6000000000001V197.1000000000001L367.0000000000001 195.5000000000001C342.4000000000001 194.0000000000001 329.1000000000001 183.9 329.1000000000001 166.4C329.1000000000001 148.7000000000001 342.8000000000001 137.0000000000001 362.5000000000001 137.0000000000001C375.8000000000001 137.0000000000001 388.1000000000001 143.7000000000001 393.7000000000001 154.4H394.1V138H413.7000000000001V206zM516 237.1H494.5L469.6 156.5H469.2L444.3000000000001 237.1H422L457.9 137.8L456 131.8C452.8 121.6 447.5 117.6 438.1 117.6C436.4000000000001 117.6 433.2000000000001 117.8 431.9000000000001 117.9V101.5000000000001C433.1 101.1000000000001 438.4000000000001 101.0000000000001 440.0000000000001 101.0000000000001C460.7 101.0000000000001 470.4 108.9 478.9 132.8000000000001L516 237.1z" />
-    <glyph glyph-name="cc-diners-club"
-      unicode="&#xF24C;"
-      horiz-adv-x="576" d=" M239.7 368.1C142.8 368.1 63.9 289.5 63.9 192.3C63.9 95.4 142.8 16.5 239.7 16.5C336.9 16.5 415.5 95.4 415.5 192.3C415.5 289.5 336.9 368.1 239.7 368.1zM199.8 88.5C158.1 104.4 128.4 144.9 128.4 192.3S158.1 280.2000000000001 199.8 296.4V88.5zM279.6 88.2V296.4C321.3 280.2000000000001 351 239.7 351 192.3S321.3 104.4 279.6 88.2000000000001zM528 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H528C554.5 -32 576 -10.5 576 16V368C576 394.5 554.5 416 528 416zM329.7 0H239.4C133.2 0 45.6 85.5 45.6 190.2C45.6 304.8 133.2 384 239.4 384H329.7C434.7 384 530.4 304.8 530.4 190.2C530.4 85.5 434.7 0 329.7 0z" />
-    <glyph glyph-name="cc-discover"
-      unicode="&#xF1F2;"
-      horiz-adv-x="576" d=" M83 235.9C83 228 79.8 220.4 74.1 215.2C69.2 210.8 62.5 208.8 52.2 208.8H48V263H52.2C62.5 263 68.9 261.3 74.1 256.4C79.8 251.4 83 243.8 83 235.9zM504.8 264H499.9V239.1H504.6C514.9 239.1 520.4 243.5 520.4 251.9C520.4 259.8 514.9 264 504.8 264zM576 368V16C576 -10.5 554.5 -32 528 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H528C554.5 416 576 394.5 576 368zM428 195H473.3V208.8H444V231H472.3V244.8H444V263H473.3V277H428V195zM341.8 277L376.8 192.8H385.4000000000001L420.9000000000001 277H403.4000000000001L381.2000000000001 221.8L359.3000000000001 277H341.8000000000001zM258.8 235.4C258.8 210.8 278.7 190.8 303.4000000000001 190.8C328.0000000000001 190.8 348.0000000000001 210.7 348.0000000000001 235.4C348.0000000000001 260 328.1000000000001 280 303.4000000000001 280C278.8 280 258.8 260.1 258.8 235.4zM190.8 235.9C190.8 203.4 224.4 183.4 254.1 197.7V216.7C234.8 197.4 207.3 210.9 207.3 235.9C207.3 259.6 234 275 254.1 254.9V273.9C223.9 288.9 190.8 267.1 190.8 235.9zM156.9 207.6C149.3 207.6 143.1 211.3 139.4 218.4L129.1 208.5C146.9 182.4 185.7 190.3 185.7 219.8C185.7 232.9 180.3 238.8 162.1 245.4C152.5 248.8 149.8 251.3 149.8 255.7C149.8 264.4 164.3 269.8 174.7 258.2000000000001L183.1 269C164 286.1 133.4 277.9000000000001 133.4 254.7C133.4 243.4 138.6 237.5000000000001 153.6 232.0000000000001C179.3 222.9 168.3 207.6 156.9 207.6zM99.5 235.9C99.5 260 81.5 277 55.4 277H32V195H55.4C86.3 195 99.5 217.4 99.5 235.9zM122.9 277H106.9V195H122.9V277zM544 160C510.7 139.2 317.6 35.6 128 0H529C537.2 0 544 6.8 544 15V160zM544 195L518.1 229.5C530.2 232 536.8000000000001 240.1 536.8000000000001 252.7C536.8000000000001 281.2 506.5000000000001 277.1 483.9000000000001 277.1V195.1H499.9000000000001V227.9H502.1000000000001L524.3000000000001 195.1H544z" />
-    <glyph glyph-name="cc-jcb"
-      unicode="&#xF24B;"
-      horiz-adv-x="576" d=" M431.5 203.7V236C472.7 236 470 235.8 470 235.8C477.3 234.5 483.3 228.5 483.3 219.8C483.3 211 477.3 205.3 470 204C468.8 203.6 466.7 203.7 431.5 203.7zM474.3 183.5C471.5 184.2 471 184 431.5 184V149C471.1 149 471.5 148.8 474.3 149.5C481.8 151 487.8 157.5 487.8 166.5C487.8 175.2 481.8 182 474.3 183.5zM576 368V16C576 -10.5 554.5 -32 528 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H528C554.5 416 576 394.5 576 368zM182 255.7H125C125 188.6 135.7 146 89.2 146C69.7 146 50.4 151.7 32 160.8V132.8C62 124.5 100 124.5 100 124.5C197.9 124.5 182 172.2 182 255.7zM360.5 251.2C297.1 267.2 195.5 266.1 195.5 191.9C195.5 114.8 303.7 118.3 360.5 132.7V161C312.9 136.3 253 139 253 192S312.8 247.6 360.5 223.2V251.2zM544 161.5C544 180 527.5 192 506 193.5V194.3C525.5 197 536.3 209.8 536.3 224.5C536.3 243.5 520.5999999999999 254.5 499.3 255.5C499.3 255.5 505.6 255.8 379 255.8V128.3H501.6999999999999C525.9999999999999 128.2 543.9999999999999 141.2 543.9999999999999 161.5z" />
-    <glyph glyph-name="cc-mastercard"
-      unicode="&#xF1F1;"
-      horiz-adv-x="576" d=" M482.9 37.7C482.9 30.9 478.3 26 471.7 26C464.9 26 460.5 31.2 460.5 37.7C460.5 44.2 464.9 49.4 471.7 49.4C478.3 49.4 482.9 44.2 482.9 37.7zM172.1 49.4C165 49.4 160.9 44.2 160.9 37.7C160.9 31.2 165 26 172.1 26C178.6 26 183 30.9 183 37.7C182.9 44.2 178.6 49.4 172.1 49.4zM289.6 49.7C284.2 49.7 280.9 46.2 280.1 41H299.2C298.3 46.7 294.8 49.7 289.6 49.7zM397.4 49.4C390.6 49.4 386.5 44.2 386.5 37.7C386.5 31.2 390.6 26 397.4 26C404.2 26 408.6 30.9 408.6 37.7C408.6 44.2 404.2 49.4 397.4 49.4zM503.3 23.3C503.3 22.9999999999999 503.6 22.8 503.6 22.1999999999999C503.6 21.8999999999999 503.3 21.6999999999999 503.3 21.0999999999999C502.9999999999999 20.7999999999999 502.9999999999999 20.5999999999999 502.8 20.2999999999999C502.4999999999999 19.9999999999999 502.3 19.7999999999999 501.6999999999999 19.7999999999999C501.3999999999999 19.4999999999999 501.1999999999999 19.4999999999999 500.5999999999999 19.4999999999999C500.2999999999999 19.4999999999999 500.0999999999999 19.4999999999999 499.4999999999999 19.7999999999999C499.1999999999999 19.7999999999999 498.9999999999999 20.0999999999999 498.6999999999999 20.2999999999999C498.3999999999999 20.5999999999999 498.1999999999999 20.7999999999999 498.1999999999999 21.0999999999999C497.8999999999999 21.5999999999999 497.8999999999999 21.8999999999999 497.8999999999999 22.1999999999999C497.8999999999999 22.6999999999999 497.8999999999999 22.9999999999999 498.1999999999999 23.3C498.1999999999999 23.8 498.4999999999999 24.1 498.6999999999999 24.4C498.9999999999999 24.7 499.1999999999999 24.7 499.4999999999999 24.9C499.9999999999999 25.2 500.2999999999999 25.2 500.5999999999999 25.2C501.0999999999999 25.2 501.3999999999999 25.2 501.6999999999999 24.9C502.1999999999999 24.6 502.4999999999999 24.6 502.8 24.4S502.9999999999999 23.8 503.3 23.3zM501.1 21.9C501.6 21.9 501.6 22.2 501.9 22.2C502.2 22.5 502.2 22.7 502.2 23C502.2 23.3 502.2 23.5 501.9 23.8C501.6 23.8 501.4 24.1 500.8 24.1H499.1999999999999V20.6H499.9999999999999V22H500.3L501.4 20.6H502.2L501.1 21.9zM576 367V15C576 -11.5 554.5 -33 528 -33H48C21.5 -33 0 -11.5 0 15V367C0 393.5 21.5 415 48 415H528C554.5 415 576 393.5 576 367zM64 227.4C64 150.9 126.1 88.9 202.5 88.9C229.7 88.9 256.4 97.1 279 112C206.1 171.3 206.6 283.2 279 342.5C256.4 357.5 229.7 365.6 202.5 365.6C126.1 365.7 64 303.6 64 227.4zM288 118.6C358.5 173.6 358.2 280.8 288 336.1C217.8 280.8 217.5 173.5 288 118.6zM145.7 42.3C145.7 51 140 56.7 131 57C126.4 57 121.5 55.6 118.2 50.5C115.8 54.6 111.7 57 106 57C102.2 57 98.4 55.6 95.4 51.6V56H87.2V19.3H95.4C95.4 38.2 92.9 49.5 104.4 49.5C114.6 49.5 112.6 39.3 112.6 19.3H120.5C120.5 37.6 118 49.5 129.5 49.5C139.7 49.5 137.7 39.5 137.7 19.3H145.9V42.3zM190.6 56H182.7V51.6C180 54.9 176.2 57 171 57C160.7 57 152.8 48.8 152.8 37.7C152.8 26.5 160.7 18.4 171 18.4C176.2 18.4 180 20.3 182.7 23.8V19.1999999999999H190.6V56zM231.1 30.4C231.1 45.4 208.2 38.6 208.2 45.6C208.2 51.3 220.1 50.4 226.7 46.7L230 53.2C220.6 59.3 199.8 59.2 199.8 45C199.8 30.7 222.7 36.7 222.7 30C222.7 23.7 209.2 24.2 202 29.2L198.5 22.9C209.7 15.3 231.1 16.9 231.1 30.4zM266.5 21.1L264.3 27.9C260.5 25.8 252.1 23.5 252.1 32V48.6H265.2000000000001V56H252.1000000000001V67.2H243.9000000000001V56H236.3000000000001V48.7H243.9000000000001V32C243.9000000000001 14.4 261.2000000000001 17.6 266.5000000000001 21.1zM279.8 34.4999999999999H307.3C307.3 50.6999999999999 299.9000000000001 57.1 289.9000000000001 57.1C279.3 57.1 271.7000000000001 49.2 271.7000000000001 37.8C271.7000000000001 17.3 294.3000000000001 13.9 305.5000000000001 23.6L301.7000000000001 29.6C293.9000000000001 23.2 282.1 23.8 279.8000000000001 34.4999999999999zM338.9000000000001 55.9999999999999C334.3 57.9999999999999 327.3 57.8 323.7000000000001 51.6V56H315.5000000000001V19.3H323.7000000000001V40C323.7000000000001 51.6 333.2000000000001 50.1 336.5000000000001 48.4L338.9000000000001 56zM349.5000000000001 37.6999999999999C349.5000000000001 49.0999999999999 361.1000000000001 52.8 370.2000000000001 46.0999999999999L374.0000000000001 52.5999999999999C362.4000000000001 61.6999999999999 341.3000000000001 56.6999999999999 341.3000000000001 37.5999999999999C341.3000000000001 17.7999999999999 363.7000000000001 13.7999999999999 374.0000000000001 22.5999999999999L370.2000000000001 29.0999999999999C361.0000000000001 22.5999999999999 349.5000000000001 26.4999999999999 349.5000000000001 37.6999999999999zM416.2000000000001 55.9999999999999H408V51.6C399.7 62.6 378.1 56.4 378.1 37.7C378.1 18.5 400.5 13 408 23.8V19.2H416.2V56zM449.9000000000001 55.9999999999999C447.5000000000001 57.1999999999999 438.9000000000001 58.8999999999999 434.7000000000001 51.6V56H426.8000000000001V19.3H434.7000000000001V40C434.7000000000001 51 443.7000000000001 50.3 447.5000000000001 48.4L449.9000000000001 56zM490.2 70.8999999999999H482.3000000000001V51.5999999999999C474.1000000000001 62.4999999999999 452.4000000000001 56.6999999999999 452.4000000000001 37.6999999999999C452.4000000000001 18.3 474.9000000000001 13.0999999999999 482.3000000000001 23.8V19.1999999999999H490.2V70.8999999999999zM497.8000000000001 145.9999999999999V141.3999999999999H498.6000000000001V146H500.5000000000001V146.8H495.9V146H497.8zM504.4000000000001 22.1999999999999C504.4000000000001 22.6999999999999 504.4000000000001 23.2999999999999 504.1000000000001 23.7999999999999C503.8000000000001 24.0999999999999 503.6000000000001 24.5999999999999 503.3000000000001 24.8999999999999C503.0000000000001 25.1999999999999 502.5000000000001 25.3999999999999 502.2 25.6999999999999C501.7 25.6999999999999 501.1 25.9999999999999 500.6 25.9999999999999C500.3 25.9999999999999 499.8 25.6999999999999 499.2 25.6999999999999C498.7 25.3999999999999 498.4 25.1999999999999 498.1 24.8999999999999C497.6 24.5999999999999 497.3 24.0999999999999 497.3 23.7999999999999C497 23.2999999999999 497 22.6999999999999 497 22.1999999999999C497 21.8999999999999 497 21.3999999999999 497.3 20.7999999999999C497.3 20.4999999999999 497.6 19.9999999999999 498.1 19.6999999999999C498.4 19.3999999999999 498.6 19.1999999999999 499.2 18.8999999999999C499.7 18.5999999999999 500.3000000000001 18.5999999999999 500.6 18.5999999999999C501.1 18.5999999999999 501.7 18.5999999999999 502.2 18.8999999999999C502.5000000000001 19.1999999999999 503.0000000000001 19.3999999999999 503.3000000000001 19.6999999999999C503.6000000000001 19.9999999999999 503.8000000000001 20.4999999999999 504.1000000000001 20.7999999999999C504.4000000000001 21.3999999999999 504.4000000000001 21.8999999999999 504.4000000000001 22.1999999999999zM507.6000000000001 146.8999999999999H506.2000000000001L504.6000000000001 143.3999999999999L503.0000000000001 146.8999999999999H501.6000000000001V141.4999999999999H502.4000000000001V145.5999999999999L504.0000000000001 142.0999999999999H505.1000000000001L506.5000000000001 145.5999999999999V141.4999999999999H507.6000000000001V146.8999999999999zM512.0000000000001 227.3999999999999C512.0000000000001 303.5999999999999 449.9000000000001 365.6999999999999 373.5000000000001 365.6999999999999C346.3000000000002 365.6999999999999 319.6000000000002 357.4999999999999 297.0000000000001 342.5999999999999C369.1000000000002 283.2999999999999 370.2000000000001 171.0999999999999 297.0000000000001 112.0999999999999C319.6000000000002 97.0999999999999 346.5000000000001 88.9999999999999 373.5000000000001 88.9999999999999C449.9000000000001 88.8999999999999 512.0000000000001 150.8999999999999 512.0000000000001 227.3999999999999z" />
-    <glyph glyph-name="cc-paypal"
-      unicode="&#xF1F4;"
-      horiz-adv-x="576" d=" M186.3 189.8C186.3 177.6 176.6 168.3 164.3 168.3C155.1 168.3 148.3 173.5 148.3 183.3C148.3 195.5 157.8 205.3 170 205.3C179.3 205.3 186.3 199.6 186.3 189.8zM80.5 238.3H75.8C74.3 238.3 72.8 237.3 72.6 235.6L68.3 208.9L76.5 209.2000000000001C87.5 209.2000000000001 96 210.7000000000001 98 223.4C100.3 236.8000000000001 91.8 238.3000000000001 80.5 238.3000000000001zM364.5 238.3H360C358.2 238.3 357 237.3 356.8 235.6L352.6 208.9L360.6 209.2000000000001C373.6 209.2000000000001 382.6 212.2000000000001 382.6 227.2000000000001C382.5 237.8000000000001 373 238.3000000000001 364.5 238.3000000000001zM576 368V16C576 -10.5 554.5 -32 528 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H528C554.5 416 576 394.5 576 368zM128.3 232.6C128.3 253.6 112.1 260.6 93.6 260.6H53.6C51.1 260.6 48.6 258.6 48.4 255.9L32 153.8C31.7 151.8 33.2 149.8 35.2 149.8H54.2C56.9 149.8 59.4 152.7 59.7 155.5L64.2 182.1C65.2 189.3 77.4 186.8 82.2 186.8C110.8 186.8 128.3 203.8 128.3 232.6zM212.5 223.8H193.5C189.7 223.8 189.5 218.3 189.3 215.6C183.5 224.1 175.1 225.6 165.6 225.6C141.1 225.6 122.4 204.1 122.4 180.4C122.4 160.9 134.6 148.2 154.1 148.2C163.1 148.2 174.3 153.1 180.6 160.1C180.1 158.6 179.6 155.4 179.6 153.9C179.6 151.6 180.6 149.9 182.8 149.9H200C202.7 149.9 205 152.8 205.5 155.6L215.7 219.9C216 221.8 214.5 223.8 212.5 223.8zM253 125.9L316.7 218.5C317.2 219 317.2 219.5 317.2 220.2C317.2 221.9 315.7 223.7 314 223.7H294.8C293.1 223.7 291.3 222.7 290.3 221.2L263.8 182.1999999999999L252.8 219.6999999999999C252 221.8999999999999 249.8 223.6999999999999 247.3 223.6999999999999H228.6C226.9000000000001 223.6999999999999 225.4000000000001 221.8999999999999 225.4000000000001 220.1999999999999C225.4000000000001 219 244.9000000000001 163.3999999999999 246.6 158.0999999999999C243.9000000000001 154.2999999999999 226.1 129.4999999999999 226.1 126.4999999999999C226.1 124.6999999999999 227.6 123.2999999999999 229.3 123.2999999999999H248.5C250.3 123.3999999999999 252 124.3999999999999 253 125.8999999999999zM412.3 232.6C412.3 253.6 396.1 260.6 377.6 260.6H337.9000000000001C335.2000000000001 260.6 332.7000000000001 258.6 332.4000000000001 255.9L316.2000000000001 153.9C316.0000000000001 151.9 317.5000000000001 149.9 319.4000000000001 149.9H339.9000000000001C341.9000000000001 149.9 343.4000000000001 151.4 343.9000000000001 153.1L348.4000000000001 182.1C349.4000000000001 189.3 361.6 186.8 366.4000000000001 186.8C394.8 186.8 412.3 203.8 412.3 232.6zM496.5 223.8H477.5C473.7 223.8 473.5 218.3 473.2 215.6C467.7 224.1 459.2 225.6 449.5 225.6C425 225.6 406.3 204.1 406.3 180.4C406.3 160.9 418.5 148.2 438 148.2C447.3 148.2 458.5 153.1 464.5 160.1C464.2 158.6 463.5 155.4 463.5 153.9C463.5 151.6 464.5 149.9 466.7 149.9H484C486.7 149.9 489 152.8 489.5 155.6L499.7 219.9C500 221.8 498.5 223.8 496.5 223.8zM544 257.1C544 259.1 542.5 260.6 540.8 260.6H522.3C520.8 260.6 519.3 259.4 519.0999999999999 257.9L502.8999999999999 153.9L502.5999999999999 153.4C502.5999999999999 151.6 504.0999999999999 149.9 506.0999999999999 149.9H522.5999999999999C525.0999999999999 149.9 527.5999999999999 152.8 527.8 155.6L544 256.8V257.1zM454 205.3C441.8 205.3 432.3 195.6 432.3 183.3C432.3 173.6 439.3 168.3 448.5 168.3C460.5 168.3 470.2 177.5 470.2 189.8C470.3 199.6 463.3 205.3 454 205.3z" />
-    <glyph glyph-name="cc-stripe"
-      unicode="&#xF1F5;"
-      horiz-adv-x="576" d=" M396.9 191.5C396.9 172.4 388.1 158.1 375 158.1C366.7 158.1 361.7 161.1 358.2 164.8L358 217.6C361.7 221.7 366.8 224.6 375 224.6C387.9 224.7 396.9 210.1 396.9 191.5zM576 368V16C576 -10.5 554.5 -32 528 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H528C554.5 416 576 394.5 576 368zM122.2 166.9C122.2 209.2 67.9 201.6 67.9 217.6C67.9 223.1 72.5 225.3 80 225.3C90.8 225.3 104.5 222 115.3 216.2V249.6C103.5 254.3 91.8 256.1 80 256.1C51.2 256.1 32 241.1 32 215.9C32 176.6 86 183 86 166C86 159.4 80.3 157.3 72.4 157.3C60.6 157.3 45.5 162.2 33.5 168.6V134.7000000000001C46.7 129.0000000000001 60.1 126.6 72.3 126.6C101.9 126.8 122.2 141.3 122.2 166.9zM191.1 253.8H164.1V284.6L129.4 277.2L129.2000000000001 163.3C129.2000000000001 142.3 145.0000000000001 126.8 166.1000000000001 126.8C177.7000000000001 126.8 186.3000000000001 128.9 191.0000000000001 131.5V160.3999999999999C186.5000000000001 158.5999999999999 164.0000000000001 152.0999999999999 164.0000000000001 173V223.5H191.0000000000001V253.8zM264.9000000000001 253.8C260.2000000000001 255.5 243.6 258.6 235.3000000000001 243.3L233.1000000000001 253.8H202.4000000000001V129.3H237.9000000000001V213.7C246.3000000000001 224.7 260.5000000000001 222.6 265.0000000000001 221.1V253.8zM309.1 253.8H273.4000000000001V129.3H309.1V253.8zM309.1 301.1L273.4000000000001 293.5V264.6L309.1 272.2V301.1zM431.8 192.3C431.8 233.6 408.3 256.1 383.4000000000001 256.1C369.5000000000001 256.1 360.5000000000001 249.5 355.6 245L353.8 253.8H322.5V88L358 95.5L358.1 135.7C363.2000000000001 132 370.8 126.7 383.2000000000001 126.7C408.6 126.8 431.8000000000001 147.2 431.8000000000001 192.3zM544 191.1C544 227.5 526.4 256.2 492.7 256.2C458.9 256.2 438.4 227.5 438.4 191.3C438.4 148.5 462.6 126.8 497.2 126.8C514.2 126.8 526.9 130.6999999999999 536.6 136V164.6C526.9 159.7 515.8000000000001 156.7 501.7 156.7C487.9 156.7 475.7 161.6 474.1 178.2H543.6C543.7 180.2 544 187.6 544 191.1zM492.4 227.2C483.5 227.2 473.7 220.5 473.7 204.5H510.4C510.4 220.5 501.1 227.2 492.4 227.2z" />
-    <glyph glyph-name="cc-visa"
-      unicode="&#xF1F0;"
-      horiz-adv-x="576" d=" M470.1 216.7S477.7 179.5 479.4 171.7H446C449.3 180.6 462 215.2 462 215.2C461.8 214.9 465.3 224.3 467.3 230.1L470.1 216.7zM576 368V16C576 -10.5 554.5 -32 528 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H528C554.5 416 576 394.5 576 368zM152.5 116.8L215.7 272H173.2L133.9 166L129.6 187.5L115.6 258.9C113.3 268.8 106.2 271.6 97.4 272H32.7L32 268.9C47.8 264.9 61.9 259.1 74.2 251.8L110 116.8H152.5zM246.9 116.6L272.1 272H231.9000000000001L206.8000000000001 116.6H246.9000000000001zM386.8 167.4C387 185.1 376.2 198.6 353.1 209.7000000000001C339 216.8000000000001 330.4000000000001 221.6000000000001 330.4000000000001 228.9000000000001C330.6 235.5000000000001 337.7000000000001 242.3000000000001 353.5000000000001 242.3000000000001C366.6000000000001 242.6000000000001 376.2000000000001 239.5000000000001 383.4000000000001 236.4000000000001L387.0000000000001 234.7000000000001L392.5000000000001 268.3000000000001C384.6000000000001 271.4000000000001 372.0000000000001 274.9000000000001 356.5000000000001 274.9000000000001C316.8000000000001 274.9000000000001 288.9000000000001 253.7000000000001 288.7000000000001 223.5C288.4000000000001 201.2 308.7000000000001 188.8 323.9000000000001 181.3C339.4000000000001 173.7 344.7000000000001 168.7 344.7000000000001 162C344.5000000000001 151.6 332.1 146.8 320.6 146.8C304.6 146.8 296 149.3 282.9000000000001 155.1L277.6 157.6L272 122.7000000000001C281.4 118.4 298.8 114.6 316.8 114.4C359 114.3 386.5 135.2000000000001 386.8 167.4zM528 116.6L495.6 272H464.5C454.9 272 447.6 269.2 443.5 259.1L383.8 116.6H426S432.9 135.8 434.4 139.9H486C487.2 134.4 490.8 116.6 490.8 116.6H528z" />
-    <glyph glyph-name="centercode"
-      unicode="&#xF380;"
-      horiz-adv-x="512" d=" M329.2 179.4C325.4 144.2 293.8 118.8 258.6 122.6C223.4 126.4 198 158 201.8 193.2C205.6 228.4 237.2 253.8 272.4 250C307.5 246.2 333 214.5999999999999 329.2 179.4zM243.4 -55.7C96.7 -48 -8.2 82.5 10.1 223.7C21.3 310.3 75.9 380.6 149.2 415.7C310.2 492.8 498.9 378.3 503.9 199.1C508 52.1 385.5 -63.1 243.4 -55.7zM423.3 124.3C451.1999999999999 242.3 262.8 330.2 186.1 358.5C128.6 302.2 117 169.9 152.3 14.1C221.1 -1.7 321.4 40.4999999999999 423.3 124.3z" />
-    <glyph glyph-name="chrome"
-      unicode="&#xF268;"
-      horiz-adv-x="496" d=" M131.5 230.5L55.1 347.9C102.7 407.1 174.1 439.7 247.1 440C289.4 440.3 332.6 429.5 371.9 406.8C415.3 381.6 448.3 345.4 469.3 303.8L264 314.6C205.9 318 150.6 285.3 131.5 230.5zM164.4 192C164.4 145.8 201.8 108.4 248 108.4S331.6 145.8 331.6 192S294.2000000000001 275.6 248.0000000000001 275.6S164.4 238.3 164.4 192zM479.3 281.2L339.6 274C377.5 229.7 378.1 165.8 346.2000000000001 116.8L234.1 -55.6C280.6 -58.1 328.5 -47.9 371.9 -22.7C479.3 39.3 522.8 169.3 479.3 281.2zM133.7 144.4L40.4 327.9C14.9 288.9 0 242.1 0 192C0 68 90.8 -34.7 209.5 -52.9L273.2 71.9C215.6 61.1 160 92.7000000000001 133.7 144.4z" />
-    <glyph glyph-name="cloudscale"
-      unicode="&#xF383;"
-      horiz-adv-x="448" d=" M318.1 294L308.7000000000001 286.4C286.2000000000001 305.7000000000001 257.2000000000001 320 225.4000000000001 320C153.8 320 96 259.2 96 187.7C96 181.1 96.4 174.6 97.4 168.3C95.4 224.3 139.2 265.7000000000001 190 265.7000000000001C214.2 265.7000000000001 236.2 256.3 252.6 241.0000000000001L227.4 220.6C219.1 221.5 210.6 218.8 204.3 212.5C193.2 201.5 193.2 183.6 204.3 172.5C215.4 161.5 233.2 161.5 244.3 172.5C250.6 178.8 253.3 187.4 252.4 195.6L327.6 284.4C333.9000000000001 290.9 324.3 300.3 318.1 294zM234.3 182.5C228.7 177 219.7 177 214.1 182.5C208.5 188.1 208.5 197.1 214.1 202.7S228.7 208.3 234.3 202.7S239.9 188 234.3 182.5zM224 416C100.5 416 0 315.5 0 192S100.5 -32 224 -32S448 68.5 448 192S347.5 416 224 416zM224 32C135.8 32 64 103.8 64 192S135.8 352 224 352S384 280.2 384 192S312.2 32 224 32z" />
-    <glyph glyph-name="cloudsmith"
-      unicode="&#xF384;"
-      horiz-adv-x="332" d=" M332.5 28.1C332.5 -18.3 294.9 -56 248.5 -56S164.5 -18.3 164.5 28.1S202.1 112.1 248.5 112.1S332.5 74.5 332.5 28.1zM248.5 272C294.9 272 328.5 309.6 328.5 356S294.9 440 248.5 440S160.5 402.4000000000001 160.5 356S130.9 280 84.5 280S0.5 238.4000000000001 0.5 192S38.1 112 84.5 112S168.5 145.6 168.5 192S202.1 272 248.5 272z" />
-    <glyph glyph-name="cloudversify"
-      unicode="&#xF385;"
-      horiz-adv-x="616" d=" M148.6 144C156.8 75.5 216 28.5 294.6 32.7C345.8 -10.6 431.4000000000001 -13.1 481 38.3C550.2 37.2 599.5 82.9 612.5 137.8C627.3 200.3 594.3 270.3 520.4 292.9C487.4 381 389 394.4 333.9 377.9C276.6 360.6 249.6 324.7 234.6 268.2C226.8 265.5 208.1 259.3 189.6 244.1C201.3 244.1 204.8 235.2 204.8 224.6V204.2C204.8 193.5 196.1 184.7 185.3 184.7H165.1C154.4 184.7 145.6 190.7 145.6 201.4V208H98.8C95 208 88 203.7 88 196.1V155.7C88 149.3 93.3 143.9 99.7 143.9H148.6zM376 136C365.3 89.7 397.7 63.6 431.3 49.2C324.1 15.4 259.7 100 296 160C262.8 138.4 262.3 88.8 266.8 67.1C248.9 79.5 213 99.5 209.4 146.9C206.4 186.8 230.9 222.6 266.4 240.8000000000001C297 256.6 369.9 249.3 400 200C385.9 248 346.2 270.1 298.2 274.8C329.1 305.5 362.6 325.1 412.4 318.5C482.2 309.2 545.5999999999999 235.7 480.1 168C515.0999999999999 184.3 528.8 222.4 527.5999999999999 244.9L538.0999999999999 225.3C549.8999999999999 203.3 553.3 177.7 547.4999999999999 153.3C538.2999999999998 114.3 506.8999999999999 84.5 467.7999999999999 76.8C435.6999999999999 70.5 384.7 81.9 375.9999999999999 136zM128 240H88.2C79.3 240 72 247.3 72 256.2V295.8C72 304.7 79.3 312 88.2 312H128C136.9 312 144.2 304.7 144.2 295.8V256.2C144.2 247.3 136.9 240 128 240zM10.1 280C4.5 280 0 284.5 0 290.1V317.9C0 323.5 4.5 328 10.1 328H37.8C43.3 328 47.9 323.5 47.9 317.9V290.1C47.9 284.5 43.4 280 37.8 280H10.1zM168 305.3V326.7000000000001C168 331.8 172.2 336 177.3 336H198.7C203.8 336 208 331.8 208 326.7000000000001V305.3C208 300.2000000000001 203.8000000000001 296 198.7 296H177.3C172.2 296 168 300.2 168 305.3zM56 212.5V187.5C56 181.2 50.9 176 44.6 176H19.4C13.1 176 8 181.2 8 187.5V212.5C8 218.8 13.1 224 19.4 224H44.5C50.9 224 56 218.8 56 212.5z" />
-    <glyph glyph-name="codepen"
-      unicode="&#xF1CB;"
-      horiz-adv-x="512" d=" M502.285 288.296L268.2850000000001 444.296C260.298 449.211 251.7740000000001 449.256 243.7140000000001 444.296L9.714 288.296C3.714 284.2970000000001 0 277.153 0 270.011V114.012C0 106.869 3.714 99.726 9.715 95.726L243.715 -60.296C251.702 -65.211 260.226 -65.256 268.286 -60.296L502.286 95.726C508.286 99.725 512.001 106.869 512.001 114.012V270.011C512 277.153 508.286 284.2970000000001 502.285 288.296zM278 384.8690000000001L450.286 270.011L373.429 218.582L278 282.2970000000001V384.8690000000001zM234 384.8690000000001V282.2970000000001L138.571 218.582L61.714 270.011L234 384.8690000000001zM44 228.868L99.143 192.011L44 155.154V228.868zM234 -0.847L61.714 114.011L138.571 165.4400000000001L234 101.725V-0.847zM256 140.011L178.285 192.011L256 244.011L333.7150000000001 192.011L256 140.011zM278 -0.847V101.725L373.429 165.4400000000001L450.286 114.0110000000001L278 -0.847zM468 155.154L412.857 192.011L468 228.868V155.154z" />
-    <glyph glyph-name="codiepie"
-      unicode="&#xF284;"
-      horiz-adv-x="472" d=" M422.5 245.1C453.2 245.1 456 192 422.2 192H411.4V147.7H384.8V245.1H422.5zM472 95.4C429.9 3.5 350.4 -56 248 -56C111 -56 0 55 0 192S111 440 248 440C345.4 440 420.8 386.3 466.2 301.6L280.2 192.8L472 95.4zM433.5 82.9L373.2 113.6C346.1 69.3 302.8 42.1999999999999 250.8 42.1999999999999C168.3 42.1999999999999 101.6 108.8999999999999 101.6 191.0999999999999C101.6 273.5999999999999 168.3 340.2999999999999 250.8 340.2999999999999C299.2 340.2999999999999 339.7 316.7999999999999 367.7 276.8999999999999L427.2 311.4999999999999C386.5 374.0999999999999 322.5 411.4999999999999 248 411.4999999999999C126.8 411.4999999999999 28.5 313.1999999999999 28.5 191.9999999999999S126.8 -27.5 248 -27.5C326.6 -27.5 394.5 14.6 433.5 82.9z" />
-    <glyph glyph-name="connectdevelop"
-      unicode="&#xF20E;"
-      horiz-adv-x="576" d=" M550.5 207L500.411 293.786C501.482 295.928 502.286 298.339 502.286 301.0180000000001C502.286 309.054 495.59 315.751 487.554 316.019L432.107 411.9120000000001C432.643 413.519 433.178 415.126 433.178 416.733C433.178 425.304 426.214 432.001 417.91 432.001C413.089 432.001 409.071 429.858 406.124 426.376H299.518C296.839 429.857 292.8210000000001 432 288 432S279.161 429.857 276.482 426.375H170.411C167.464 429.857 163.447 432 158.625 432C150.322 432 143.357 425.304 143.357 416.732C143.357 415.125 143.893 413.25 144.429 411.911L88.446 314.678C83.09 312.2680000000001 79.339 307.178 79.339 301.017C79.339 300.482 79.607 299.9460000000001 79.607 299.41L26.303 207.267C19.071 205.928 13.713 199.767 13.713 192.267C13.713 185.035 18.802 178.874 25.767 177.267L80.946 81.909C80.41 80.302 80.142 78.963 80.142 77.088C80.142 69.8559999999999 85.231 63.6949999999999 92.196 62.356L143.893 -27.376C143.357 -28.983 142.822 -30.858 142.822 -32.733C142.822 -41.304 149.786 -48.001 158.09 -48.001C162.911 -48.001 166.929 -45.858 169.608 -42.6439999999999H276.483C279.161 -45.857 283.447 -48 288 -48S296.839 -45.857 299.5180000000001 -42.643H406.6610000000001C409.3390000000001 -45.589 413.3570000000001 -47.464 417.6430000000001 -47.464C426.2140000000001 -47.464 432.9110000000001 -40.5 432.9110000000001 -32.196C432.9110000000001 -30.589 432.6440000000001 -29.25 432.1080000000001 -27.911L483.8050000000001 62.357C490.7690000000001 63.696 495.859 69.857 495.859 77.0889999999999C495.859 78.696 495.5910000000001 80.3029999999999 495.0550000000001 81.91L549.9660000000001 177.268C556.9300000000002 178.607 562.2880000000001 184.768 562.2880000000001 192.268C562.2860000000002 199.5 557.1960000000001 205.661 550.5000000000001 207zM153.535 -2.732L109.875 73.071H153.535V-2.732zM153.535 81.107H109.875C109.607 82.178 109.071 83.249 108.536 84.321L153.535 131.731V81.107zM153.535 143.518L103.178 90.2139999999999C101.839 90.7499999999999 100.499 91.5539999999999 99.16 91.821L43.447 188.25C43.982 189.589 43.982 190.929 43.982 192.268S43.982 194.678 43.714 195.75L95.679 285.75C98.358 286.0180000000001 101.036 286.822 103.447 288.429L153.536 236.464V143.518zM153.535 245.84L107.732 293.25C109.071 295.393 109.875 298.071 109.875 301.017C109.875 301.285 109.607 301.821 109.607 302.089L153.535 317.893V245.84zM153.535 326.465L109.875 310.661L153.535 386.197V326.465zM480.054 287.357L480.8579999999999 286.018L445.5 118.875L381.75 186.107L479.786 287.625L480.054 287.357zM291.75 92.893L303.2680000000001 81.107H280.5L291.75 92.893zM291.4820000000001 104.143L208.179 189.589L287.7320000000001 273.964L370.7680000000001 186.375L291.4820000000001 104.1429999999999zM296.8390000000001 98.25L376.1250000000001 180.482L443.6250000000001 109.232L437.7330000000001 81.107H313.714L296.839 98.25zM410.411 403.607C411.4820000000001 403.0710000000001 412.553 402.535 413.8930000000001 402.267L471.75 301.553V301.017C471.75 298.0710000000001 472.553 295.3930000000001 473.893 293.25L376.393 192L293.358 279.589L410.411 403.607zM401.304 405.75L287.7320000000001 285.482L230.6780000000001 345.75L397.0170000000001 405.75H401.3040000000001zM277.821 405.75C280.499 403.072 283.981 401.4650000000001 288 401.4650000000001S295.5 403.072 298.1789999999999 405.75H373.1789999999999L224.786 352.179L173.893 405.75H277.8210000000001zM161.572 400.125L162.643 402.267A33.834 33.834 0 0 1 165.322 403.0710000000001L216.483 349.231L161.572 329.41V400.125zM161.572 320.839L222.375 342.803L282.107 279.589L202.554 195.482L161.572 237.535V320.839zM161.572 228.161L198 190.393L161.572 152.089V228.161zM161.572 140.303L203.625 184.767L286.393 98.785L269.25 81.107H161.572V140.303zM168.536 -21.75C166.929 -20.143 165.054 -19.072 162.643 -18.268L161.572 -16.6609999999999V73.071H261.482L169.875 -21.75H168.536zM298.447 -21.75C295.7680000000001 -19.34 292.019 -17.465 288 -17.465S280.233 -19.34 277.553 -21.75H181.124L272.731 73.071H311.035L402.642 -21.75H298.447zM418.447 -9.964L414.161 -17.464C412.822 -17.732 411.751 -18.267 410.679 -18.803L321.483 73.072H435.8589999999999L418.447 -9.964zM431.303 12.268L444.161 73.071H466.125L431.303 12.268zM466.125 81.107H445.7680000000001L450.3210000000001 102.2670000000001L467.4640000000001 84.0530000000001C466.929 83.2500000000001 466.393 82.179 466.1250000000001 81.107zM532.2860000000001 188.518L476.8390000000001 91.821C475.5000000000001 91.286 474.1600000000001 90.75 472.8210000000001 89.947L452.1960000000001 111.911L486.7500000000001 275.839L532.5530000000001 196.553C532.2860000000001 195.214 531.7500000000001 193.875 531.7500000000001 192.268C531.7500000000001 190.929 532.0180000000001 189.857 532.2860000000001 188.518z" />
-    <glyph glyph-name="contao"
-      unicode="&#xF26D;"
-      horiz-adv-x="512" d=" M45.4 143C59.8 75.9 71.8 14 113.6 -32H34C15.3 -32 0 -16.8 0 2V382C0 400.7 15.2 416 34 416H91.7C77.9 403.4 65.6 388.8 54.8 372.4C9.4 302.4 27.8 225.6 45.4 143zM478 416H387.8C409.2 394.6 427 366.5 440.5 331.9L303.4 302.6C288.5 331.6 265.6 355.9 220.8 346.5C196.2 341.2 179.8 327.2 172.5 311.9C163.7 293.2000000000001 159.3 272.1 180.7 171.6C201.8 71.4 214.4 53.9 230.2 40.4C243.1 29.3 263.6 23.4 288.5 28.7C333 38.1 344.2 69.4 345.9 101.9L483.3 131.5000000000001C486.4999999999999 60.0000000000001 464.6 6.3000000000001 425.9 -32.0999999999999H478C496.7 -32.0999999999999 512 -16.8999999999999 512 1.9000000000001V382C512 400.8 496.8 416 478 416z" />
-    <glyph glyph-name="cpanel"
-      unicode="&#xF388;"
-      horiz-adv-x="640" d=" M52.9 234.3H92.9L86.7 210.7C84.8 204.2 79.3 199.8 72.4 199.8H53.8C28.9 199.8 29.1 162.4 53.8 162.4H65.1C69.3 162.4 72.7 158.5000000000001 71.5 154.1L64.4 128H52C18.5 128 -7 159.4 1.7 193.2C9 220.2 30 234.3 52.9 234.3M73.1 128L108 258.1C109.8 264.5 115.2 269 122.3 269H159.3C183.4 269 204.7 252.6 210.3 227.8C216.9 198.7 195.8 162.5 158.6 162.5H126.6L133 186.3C134.8000000000001 192.5 140.3000000000001 197.1 147.3000000000001 197.1H157.6000000000001C170.0000000000001 197.1 178.4000000000001 208.8 175.9000000000001 219.7C173.8000000000001 228.9 166.0000000000001 234.5000000000001 157.6000000000001 234.5000000000001H137.8000000000001L112 138.8C110.1 132.6 104.6 128.1 97.8 128.1L73.1 128M293.7 197.4C294 198.4 295.6 202.7 291.6 202.7H234.1C224.4 202.7 217.5 211.6 219.9 221.2L223.4 234.6H301.3C320.1 234.6 334.6 217 329.8 197.8L315.8 146C313 135.4 303.6 128.2 292.4 128.2L234.9 128.4C192 128.4 196.4 192.2 235.6 192.2H284L280.5 179C278.6 172.8 273.1 168.2 266.3 168.2H244.7C239.4 168.2 239.4 160.3 244.7 160.3H279.6C284.2000000000001 160.3 284.7000000000001 164.2 285.1 165.6L293.7000000000001 197.4M396.8000000000001 234.3000000000001C431.2000000000001 234.3000000000001 456.1000000000001 202.0000000000001 447.1000000000001 168.9L438.3000000000001 135.8C437.1000000000001 130.9 432.6000000000001 128 428.0000000000001 128H408.9000000000001C404.4000000000001 128 401.3 132 402.5000000000001 136.3L413.1000000000001 176.3C416.4000000000001 187.9 407.5000000000001 199.7 395.0000000000001 199.7H375.2000000000001L358.0000000000001 135.7000000000001C356.8000000000001 130.9 352.4000000000001 127.9 347.6000000000001 127.9H328.7000000000001C324.5000000000001 127.9 321.1000000000001 131.8 322.3000000000002 136.2000000000001L348.5000000000001 234.2000000000001H396.8000000000002M498 196.4L490 166.4C489.1 163.1 491.5 159.7 495.1 159.7H568.4L562.6999999999999 138.7C560.8 132.5 555.3 128 548.4999999999999 128H481.7999999999999C461.7999999999999 128 448.4999999999999 147 453.4999999999999 164.7L464.2999999999999 204.7C469.0999999999999 222.3 484.9999999999999 234.3 502.8999999999999 234.3H550.1999999999999C569.1999999999999 234.3 583.4 216.6 578.4999999999999 197.5L575.2999999999998 185.5C572.3999999999999 174.5 562.5999999999998 167.9 552.0999999999998 167.9H498.6999999999998L502.1999999999998 180.9C503.7999999999998 187.1 509.3999999999998 191.7 516.3999999999999 191.7H538C540 191.7 541.3 192.7 541.9 194.7L542.6 197.3C543.3000000000001 200 541.3000000000001 202.4 538.7 202.4H505.8000000000001C501.7 202.4 498.9000000000001 200.3 498.0000000000001 196.4zM568.2 128L603.8000000000001 261.1C605.0000000000001 265.8 609.3000000000001 269 614.2 269H633.1C637.6 269 640.8000000000001 265 639.6 260.7L613.1 162.5C608 141.8 588.9 128 568.2 128" />
-    <glyph glyph-name="creative-commons-by"
-      unicode="&#xF4E7;"
-      horiz-adv-x="496" d=" M314.9 253.6V152.2H286.6V31.7H209.5V152.1H181.2V253.6C181.2 258 182.8 261.8 185.8 264.9C188.9 268 192.7 269.6 197.1 269.6H299C303.1 269.6 306.8 268 310.1 264.9C313.2000000000001 261.7000000000001 314.9000000000001 258 314.9000000000001 253.6zM213.4 317.3C213.4 340.6 224.9 352.3 247.9 352.3S282.4 340.6 282.4 317.3C282.4 294.3 270.9 282.8 247.9 282.8S213.4 294.3 213.4 317.3zM247.6 440C389.4 440 496 329.9 496 192C496 44.9 377.5 -56 247.6 -56C113.6 -56 0 53.5 0 192C0 324.9 104.7 440 247.6 440zM248.4 395.3C130.2 395.3 44.7 297.4 44.7 192C44.7 82.2 135.9 -10.8 248.4 -10.8C351.6 -10.8 451.2 70.3 451.2 192C451.3 305.8 361 395.3 248.4 395.3z" />
-    <glyph glyph-name="creative-commons-nc-eu"
-      unicode="&#xF4E9;"
-      horiz-adv-x="496" d=" M247.7 440C103.6 440 0 323.2 0 192C0 55.7 111.7 -56 247.7 -56C377.9 -56 496 44.9 496 192C496 331 388.4 440 247.7 440zM248.3 -10.7C136.3 -10.7 44.7 81.8 44.7 192C44.7 215.2 48.4 237.2 55.6 258L121.3 228.9H116.6V199.4H139.9C139.9 193.2 139.5 196.2 139.5 179.9H116.7V150.4H143.7C155.1 83.4 210.9 49.1 268.3 49.1C294.9 49.1 318.9 56.9999999999999 333.1 64.9L323.1 111C314.4 106.4 294.9 100.2 275.8 100.2C247.6 100.2 217.7 111.1 208.5 150.4H298.8L427.1 93.6C425.6 91.4999999999999 370.9 -10.7 248.3 -10.7zM231.6 179.9L231.1 180.3L232 179.9H231.6zM308.8 199.4H312.5V228.9H242.2L213.6 241.5C216.1 247 219 252 222.4 255.8C235.3 271.6 253.5 278.2 273.5 278.2C291.8 278.2 308.8 272.8 319.6 268.2L331.2000000000001 315.5C316.2000000000001 322.1 294.2000000000001 327.9 268.9000000000001 327.9C229.9000000000001 327.9 196.7000000000001 312.1 173 285.6C167.7 279.5 163.2 272.7000000000001 159.1 265.5L77.5 301.6C142.1 398.4000000000001 235.2 395.2000000000001 248.2 395.2000000000001C361.2000000000001 395.2000000000001 451.2 305 451.2 191.8C451.2 173.1 449.1 155.5 444.9000000000001 138.9L308.8000000000001 199.4z" />
-    <glyph glyph-name="creative-commons-nc-jp"
-      unicode="&#xF4EA;"
-      horiz-adv-x="496" d=" M247.7 440C103.6 440 0 323.2 0 192C0 55.6 111.8 -56 247.7 -56C377.9 -56 496 44.8 496 192C496 330.8 388.5 440 247.7 440zM248.3 -10.7C136.3 -10.7 44.7 81.8 44.7 192C44.7 213.1 47.7 233.2 53.7 252.3L180.7 195.8H152.8V157.2H210.9L216.6 145.4V126.7H152.8V88H216.6V32H278.3V88H342.5V123.7L423.5 87.6C422 85.4 366.3999999999999 -10.7 248.3 -10.7zM335.9 126.6H278.3V145.3L281.2 150.9L335.8999999999999 126.6zM342.4 178V195.8H303.8L366.8 311.8H301L257.6 215.8L234.6 226L195 311.7H129.2000000000001L156.5000000000001 260.7L74.6000000000001 297.2C102.4000000000001 341.3 157.2000000000001 395.3 248.3000000000001 395.3C361.1 395.3 451.3000000000001 305.3 451.3000000000001 191.9C451.3000000000001 170.9 448.6000000000001 151.3 443.4000000000001 132.9L342.4000000000001 178z" />
-    <glyph glyph-name="creative-commons-nc"
-      unicode="&#xF4E8;"
-      horiz-adv-x="496" d=" M247.6 440C387.4 440 496 332.1 496 192C496 44.8 377.5 -56 247.6 -56C113.1 -56 0 54.8 0 192C0 324.9 104.7 440 247.6 440zM55.8 258.9C48.4 238.5 44.7 216.2 44.7 192C44.7 81.1 136.8 -10.4 248.4 -10.4C370.8 -10.4 425.6 91.4 426.9 93.7000000000001L333.5 135.3000000000001C325.8 98.2000000000001 292.3 82.3000000000001 265.3 79.9000000000001V41.8000000000001H236.5V80C209 80.3 183.9 90.2 161.2 109.7L195.3 144.2C227 114.8 281.7 112.4 281.7 146.4C281.7 152.6 279.5 157.6 275.1 161.5C260.9 167.5 273.3 161.6 55.8 258.9zM248.4 395.7C210 395.7 136 387 77.9 302.7L172.7 260.2C182.7 291.5 213.1 303.1 236.5 304.5V342.6H265.3V304.5C288 303.3 308.7 295.6 327.3 281.5L295 248.3C252.3 278.2000000000001 211.5 256.3 225 237.2C278.4 213.1 268.8 217.4 318 195.6L445.1 138.9C449.2000000000001 156.3 451.3 174.0000000000001 451.3 192C451.3 249.0000000000001 431.5 297 392 335.9000000000001C352.7 375.8000000000001 304.8 395.7000000000001 248.4 395.7000000000001z" />
-    <glyph glyph-name="creative-commons-nd"
-      unicode="&#xF4EB;"
-      horiz-adv-x="496" d=" M247.6 440C389.4 440 496 329.9 496 192C496 44.9 377.5 -56 247.6 -56C113.6 -56 0 53.5 0 192C0 324.9 104.7 440 247.6 440zM248.4 395.3C130.2 395.3 44.7 297.4 44.7 192C44.7 82.2 135.9 -10.8 248.4 -10.8C351.6 -10.8 451.2 70.3 451.2 192C451.3 305.8 361 395.3 248.4 395.3zM342.4 251V208.5H162.1V251H342.4zM342.4 171.2V128.7H162.1V171.2H342.4z" />
-    <glyph glyph-name="creative-commons-pd-alt"
-      unicode="&#xF4ED;"
-      horiz-adv-x="496" d=" M247.6 440C389.4 440 496 329.9 496 192C496 44.9 377.5 -56 247.6 -56C113.6 -56 0 53.5 0 192C0 324.9 104.7 440 247.6 440zM248.4 395.3C130.2 395.3 44.7 297.4 44.7 192C44.7 82.2 135.9 -10.8 248.4 -10.8C351.6 -10.8 451.2 70.3 451.2 192C451.3 305.8 361 395.3 248.4 395.3zM135.5 124.7V262H203.7C237.4 262 254.2 246.5 254.2 215.5C254.2 206.5 251.2 169 197.1 169H170.1V124.7H135.5zM169.6 236.3V194.7H198.8C226.7 194.7 228.8 236.3 197.9 236.3H169.6zM263.5 124.7V262H316.7C338.1 262 386.7 256.8 386.7 193.4C386.7 129.9 338.1 124.8 316.7 124.8H263.5zM297.6 233.2V153.5H317.5C341.5 153.5 352 168.8 352 193.4C352 235.4 320.8 233.3 317 233.3L297.6 233.2z" />
-    <glyph glyph-name="creative-commons-pd"
-      unicode="&#xF4EC;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 328.9 0 192C0 55 111 -56 248 -56S496 55 496 192C496 328.9 385 440 248 440zM248 -9.5C108.8 -9.5 12.2 128.5 57.8 258.4L136.6 223.3C134.5 212.8 133.3 201.8 133.3 190.4C133.3 91.4 207.2 63.5 253.7 63.5C276.6 63.5 307.2000000000001 70.2 333.1 93L297 136.9C291.5 130.6 279.4 120.2 260.7 120.2C222.9 120.2 207 160.1 206.8 192.1C437.2 89.5 423.3 95.6 424.7 95.3C390.4 32.9 324.1 -9.5 248 -9.5zM442.2 140.5L218.2 240.5C237 274.5 273.1 271.2 292.9 251.5L333.3 293.1C306.2 316.4 275.3 320.6 255.2 320.6C207.8 320.6 174.3 300.1 154.5 269L79.5999999999999 302.4C115.6999999999999 357.3 177.6999999999999 393.6 248.1 393.6C359.2 393.6 449.5999999999999 303.2 449.5999999999999 192.1C449.5999999999999 174.1 447.2 156.7000000000001 442.7999999999999 140.1C442.4999999999999 140.2000000000001 442.3999999999999 140.3 442.1999999999999 140.5z" />
-    <glyph glyph-name="creative-commons-remix"
-      unicode="&#xF4EE;"
-      horiz-adv-x="496" d=" M247.6 440C389.4 440 496 329.9 496 192C496 44.9 377.5 -56 247.6 -56C113.6 -56 0 53.5 0 192C0 324.9 104.7 440 247.6 440zM248.4 395.3C130.2 395.3 44.7 297.4 44.7 192C44.7 82.2 135.9 -10.8 248.4 -10.8C351.6 -10.8 451.2 70.3 451.2 192C451.3 305.8 361 395.3 248.4 395.3zM410.1 187.6L415 185.4V115.4C407.8 111.8 351.6 87.9 347.7 86.6C341.2 88.4 234 133.4 210.4 142.8L146.2 116.2L82.9 143.7V207.5L142.2 232.3C141.5 233 141.8 227.3 141.8 302.7000000000001L209.1 332.4000000000001L361 269.5V207.9L410.1 187.6zM339.7000000000001 106.1V149.9H339.3000000000001V151.7000000000001L225.5000000000001 198.2000000000001V153L339.3000000000001 106.1V106.5L339.7000000000001 106.1zM347.2000000000001 163.7000000000001L387.1 180.1L350.3 195.6L311.3 179.2000000000001L347.2 163.7000000000001zM399.5000000000001 125.6V168.6L355.2 150V106.6L399.5 125.6z" />
-    <glyph glyph-name="creative-commons-sa"
-      unicode="&#xF4EF;"
-      horiz-adv-x="496" d=" M247.6 440C389.4 440 496 329.9 496 192C496 44.9 377.5 -56 247.6 -56C113.6 -56 0 53.5 0 192C0 324.9 104.7 440 247.6 440zM248.4 395.3C130.2 395.3 44.7 297.4 44.7 192C44.7 82.2 135.9 -10.8 248.4 -10.8C351.6 -10.8 451.2 70.3 451.2 192C451.3 305.8 361 395.3 248.4 395.3zM137.7 227C150.7 310.9 218.2 322.7 246.6 322.7C346.4 322.7 374.1 240.2 374.1 188.5C374.1 124.9 333.1 55.6 245.2 55.6C206.3 55.6 146.1 75.6 135.8 152.6H198.3C199.8 122.5 217.9 107.4 252.8 107.4C276.1 107.4 310.8 125.6 310.8 190.2000000000001C310.8 272.7000000000001 261.7 270.8000000000001 254.1 270.8000000000001C221 270.8000000000001 202.4 256.2000000000001 198.3 227.0000000000001H216.5L167.3 177.8000000000001L118.3 227.0000000000001H137.7z" />
-    <glyph glyph-name="creative-commons-sampling-plus"
-      unicode="&#xF4F1;"
-      horiz-adv-x="496" d=" M247.6 440C389.4 440 496 329.9 496 192C496 44.9 377.5 -56 247.6 -56C113.6 -56 0 53.5 0 192C0 324.9 104.7 440 247.6 440zM248.4 395.3C130.2 395.3 44.7 297.4 44.7 192C44.7 82.2 135.9 -10.8 248.4 -10.8C351.6 -10.8 451.2 70.3 451.2 192C451.3 305.8 361 395.3 248.4 395.3zM355.4 189.7C350.7 189.7 346.4 186.9 344.7 182.5L340.7 173L329.7 265.8C328 279.7000000000001 307.7 279.2000000000001 306.6 265.4L302.3 214L297.1 282.8C296 297.1 275 297 273.9 282.8L270.4 237.9L264.5 332.2C263.6 346.7 242.2 346.6 241.3 332.2L236.2 248.5L231.9 314.8C231 329.2000000000001 209.7 329.2000000000001 208.7 314.8L203.4 234.6L199.3 291.6C198.2 305.9000000000001 177.3 305.9000000000001 176.1 291.8L168.4 202L166.6 214.2C164.9 225.6 149.5 227.8 144.6 217.5L131.4 189.8H87.5V166.6H138.8C143.2 166.6 147.2 169.1 149.2 173L159.9 99.9C161.9 86.4 181.8 86.9 183 100.6L186.8 144.2L192.5 65.9C193.6 51.5 214.8 51.7 215.7 66L220.3 136.4L225.1 63.1C226 48.7 247.4 48.7 248.3 63.2L253.2 143.7L257.7 71.9C258.6 57.6 279.8 57.4 280.9 71.7L285.5 130.3L290.4 65.9C291.5 51.6 312.4 51.7 313.5 65.8L320.3 148.8L323 126.5C324.4 114.6999999999999 340.7 112.3999999999999 345.3 123.3999999999999L363.3 166.7999999999999H413.8V190L355.4000000000001 189.7zM277.4 184.5H255.5V162.6C255.5 158.5 252.2 155.1 248 155.1C243.9 155.1 240.5 158.4 240.5 162.6V184.5H218.6C214.5 184.5 211.1 187.8 211.1 192C211.1 196.1 214.5 199.5 218.6 199.5H240.5V221.4C240.5 225.5 243.9 228.9 248 228.9S255.5 225.6 255.5 221.4V199.5H277.4C281.5 199.5 284.9 196.2 284.9 192C284.9 187.9 281.5 184.5 277.4 184.5z" />
-    <glyph glyph-name="creative-commons-sampling"
-      unicode="&#xF4F0;"
-      horiz-adv-x="496" d=" M247.6 440C389.4 440 496 329.9 496 192C496 44.9 377.5 -56 247.6 -56C113.6 -56 0 53.5 0 192C0 324.9 104.7 440 247.6 440zM248.4 395.3C130.2 395.3 44.7 297.4 44.7 192C44.7 82.2 135.9 -10.8 248.4 -10.8C351.6 -10.8 451.2 70.3 451.2 192C451.3 305.8 361 395.3 248.4 395.3zM252 342.1C254.8 342.4 263.5 341.1 263.5 330.6L270.1 223.4L275 282.7C275 288.7 279.7 293.3 285.6 293.3C291.5 293.3 296.2000000000001 288.6 296.2000000000001 282.7C296.2000000000001 280.2 295.7000000000001 288.4 301.9000000000001 201.2L307.7000000000001 265.4C308.0000000000001 268.3 310.6 274.7 317.9000000000001 274.7C321.7000000000001 274.7 327.8 272.4 328.5000000000001 265.8L340.0000000000001 169.3L345.3000000000001 182.1C347.1000000000001 186.5 350.5000000000001 188.7 355.5000000000001 188.7H413.5000000000001V167.4H362.6000000000001L344.4000000000001 123.1C340.5000000000001 113.2 324.9000000000001 114 323.6000000000001 126.2L319.6000000000001 158.1L312.1000000000001 65.5C311.8000000000001 62.5 309.1000000000001 56.2 301.9000000000001 56.2C298.9000000000001 56.2 292.1000000000001 58.3 291.3000000000001 65.5C291.3000000000001 67.4 291.9000000000001 59.7 285.1000000000001 143.4L279.8000000000001 71.2C278.7000000000001 66.4 275.0000000000001 61.9 269.2000000000001 61.9C266.3000000000001 61.9 259.4000000000001 63.9 258.6 71.2C258.6 73.1 259.1 64.5 252.8 158.9L247 64.1C247 57.8 243.4 51.7 236.4 51.7C231.2 51.7 225.8 55.8 225.8 63.7L220 151.4C214.2 58.9 214.7 67.4 214.7 65.5C213.6 60.7 209.9 56.2 204.1 56.2C201.1 56.2 194.3 58.3 193.5 65.5C193.5 66.2 193.1 66.6 193.1 68.1L186.9 156.7000000000001L182 100C181.3 93.5 175.3 90.7 171.4 90.7C165.6 90.7 161.8 94.8 160.8 99.6L149.7 176C147.7 172 146.2 167.6 138.6 167.6H87.2V188.9H132L145.7 216.8000000000001C150.1 226.7000000000001 163.9 224 165.6 214.1000000000001L168.7 193.7000000000001L177.1 291.6C177.1 297.6 181.9 302.2000000000001 187.7 302.2000000000001C188.2 302.2000000000001 198.3 302.4000000000001 198.3 289.8000000000001L203.2 220.7000000000001L209.8 313.3000000000001C209.8 323.4000000000001 219.3 323.9000000000001 220 323.9000000000001C220.6 323.9000000000001 230.6 323.2000000000001 230.6 313.3000000000001L235.9 232.7000000000001L242.1 330.6C242.2 331.7000000000001 241.5 340.9000000000001 252 342.1z" />
-    <glyph glyph-name="creative-commons-share"
-      unicode="&#xF4F2;"
-      horiz-adv-x="496" d=" M247.6 440C389.4 440 496 329.9 496 192C496 44.9 377.5 -56 247.6 -56C113.6 -56 0 53.5 0 192C0 324.9 104.7 440 247.6 440zM248.4 395.3C130.2 395.3 44.7 297.4 44.7 192C44.7 82.2 135.9 -10.8 248.4 -10.8C351.6 -10.8 451.2 70.3 451.2 192C451.3 305.8 361 395.3 248.4 395.3zM349.4 262.9C357.2 262.9 363.1 256.8 363.1 249.2V66.7C363.1 59 357 53 349.4 53H214.3C206.6 53 200.6 59 200.6 66.7V120.7H146.6C138.8 120.7 132.9 126.7 132.9 134.4V316.9C132.9 325.1 139.5 329.6 145.3000000000001 330.6H281.7000000000001C289.4000000000001 330.6 295.4000000000001 324.6 295.4000000000001 316.9V262.9H349.4000000000001zM159.9 147.7H200.6V249.1C200.6 256.5 206.4 261.7 212.6 262.8H268.4000000000001V303.1H159.9V147.6999999999999zM336.1 235.8H227.6V80.4H336.1V235.8z" />
-    <glyph glyph-name="creative-commons"
-      unicode="&#xF25E;"
-      horiz-adv-x="496" d=" M245.83 233.13L212.61 215.85C203.18 235.43 187.37 235.78 185.15 235.78C163.02 235.78 151.93 221.17 151.93 191.94C151.93 168.37 161.14 148.1 185.15 148.1C199.62 148.1 209.8 155.19 215.72 169.36L246.27 153.86C240.1 142.35 220.58 114.88 181.17 114.88C158.57 114.88 107.21 125.2 107.21 191.93C107.21 250.62 150.21 268.99 179.84 268.99C210.56 269 232.54 257.04 245.8300000000001 233.13zM388.88 233.13L356.1 215.85C346.6 235.62 330.38 235.78 328.2000000000001 235.78C306.0600000000001 235.78 294.98 221.17 294.98 191.94C294.98 168.39 304.2100000000001 148.1 328.2000000000001 148.1C342.6500000000001 148.1 352.85 155.19 358.7400000000001 169.36L389.7400000000001 153.86C387.6400000000001 150.11 368.3500000000001 114.88 324.6500000000001 114.88C301.9600000000001 114.88 250.6900000000001 124.75 250.6900000000001 191.93C250.6900000000001 250.6 293.6600000000001 268.99 323.3200000000001 268.99C354.0300000000001 269 375.9000000000001 257.04 388.8800000000001 233.13zM247.56 439.95C104.74 439.95 0 324.89 0 191.95C0 53.46 113.6 -56.05 247.56 -56.05C377.49 -56.05 496 44.82 496 191.95C496 329.82 389.38 439.95 247.56 439.95zM248.43 -10.86C135.89 -10.86 44.73 82.18 44.73 191.95C44.73 297.37 130.16 395.2200000000001 248.45 395.2200000000001C360.98 395.2200000000001 451.27 305.76 451.27 191.96C451.26 70.27 351.59 -10.86 248.43 -10.86z" />
-    <glyph glyph-name="css3-alt"
-      unicode="&#xF38B;"
-      horiz-adv-x="384" d=" M0 416L34.9 20.2L192 -32L349.1 20.2L384 416H0zM313.1 336L308.3 288.7L193 239.4L192.7 239.3H304.2L291.4 92.7000000000001L193.2 64.0000000000001L94.4 93.2000000000001L88 167.1H136.9L140.1 128.8L192.7 115.5L247.4 130.9L251.1 192.5L84.8 193V193.1L84.6 193L81 239.3L193.1 286L199.6 288.7H76.7L70.9 336H313.1z" />
-    <glyph glyph-name="css3"
-      unicode="&#xF13C;"
-      horiz-adv-x="512" d=" M480 416L416 48L192.7 -32L0 48L19.6 142.8H101.6L93.6 102.2L210 57.8L344.1 102.2L362.9000000000001 199.3H29.5L45.5 281.3H379.2L389.7 334H56.3L72.6 416H480z" />
-    <glyph glyph-name="cuttlefish"
-      unicode="&#xF38C;"
-      horiz-adv-x="440" d=" M344 142.5C326.5 110.9 286.6 88 248 88C191.4 88 144 135.4 144 192S191.4 296 248 296C286.6 296 326.5 273.1 344 241.5C357.7 292.4 385.7 334.8 431 359.3C385.7 408.9 320.5 440 248 440C111 440 0 329 0 192S111 -56 248 -56C320.5 -56 385.7 -24.9 431 24.7C385.7 49.2 357.7 91.6 344 142.5z" />
-    <glyph glyph-name="d-and-d"
-      unicode="&#xF38D;"
-      horiz-adv-x="576" d=" M82.5 349.1C81.9 366.3 84.5 382.9 95.2 397.3C95.5 389.9 96.4 382.8 99.4 375.7C105.3 403.2 119.1 425 141.7 441.2C139.8 435.3 138.2 429.4 138.7 423.5C147.4 430.9 157.5 441.3 183.1 446.2C197.8 449 212.8 448.2 225.2 445.2C263.7 435.9 286.2 410.9 294.9 372.9C300.2 349.8 295.6 327.9 286.6 306.5C281.4 294.1 274.6 282.1 265.9 271.4C263.9 273.3 262 275.2000000000001 260.1 277C217.3 317.8 233.3 302.2 222.7 314.4C221.6 315.6 221.7 316.6 222.6 318C230.9 331.5 234.4 346.2 232.6 362C231.5 371.8 228.3 380.9 221.3 388.2C206.8 403.5 182.1 403.2 167.8 387.6C156.4 375.1 153.7 360.2 156.9 344C157.0999999999999 342.7 157.3 341.3 156.9 340.1C153.5 326.4 152.3 312.5 154.4 298.5C154.5 298 154.5 297.4 154.5 296.9C154.5 296.6 154.4 296.4 154.3 295.8C132.5 306.8 118.3 324.1 111.1 348C102.8 330.2000000000001 100 312.5 104.5 293.9C88.9 309.1 83.2 328.2 82.5 349.1zM552.1 225.9C540.5 237.5 527.1 246.3 512 252.5C499.2 257.7 486 260.4 472.1 259.6C462.1 259 452.5 256.5 443.1 253.2C440.6 252.3 438 251.6 435.4000000000001 251C430.5000000000001 249.8 428.1 254.1 430.7000000000001 257.8C433.9000000000001 262.4 434.1 262 445.7000000000001 269.8C446.3000000000001 270.2 446.9000000000001 270.6 447.9000000000001 271.3H445.4000000000001C444.8 271.3 444.2000000000001 271.1 443.5000000000001 271C424.2000000000001 267.7 412.8000000000001 255.5 394.6000000000001 241.4C384.2000000000001 233.3 380.8000000000001 237.6 382.6000000000001 241.9C384.0000000000001 245.4 385.9000000000001 248.6 387.7000000000001 251.9C388.7000000000001 253.7 390.0000000000001 255.3 391.2000000000001 257C391.0000000000001 257.2 390.7000000000001 257.3 390.5000000000001 257.5C363.5000000000001 239.2 343.8000000000002 215.1 332.8000000000002 184.2C333.1000000000002 183.9 333.5000000000001 183.6 333.8000000000002 183.3C334.1000000000002 183.9 334.3000000000002 184.5 334.7000000000001 185C345.1000000000001 197.1 357.5000000000001 206.8 371.3000000000002 214.8C389.5000000000001 225.4 408.8000000000002 233.1 430.0000000000001 235C434.3000000000002 235.4 438.7000000000001 235.1 443.1000000000002 235.1C441.3000000000002 234.4 439.6000000000002 234.2 437.8000000000002 234C419.3000000000002 231.6 402.3000000000002 225 386.3000000000002 215.5C356.1000000000002 197.6 331.8000000000002 173.3 311.2000000000002 145.1C310.9000000000002 144.7000000000001 310.8000000000002 144.2000000000001 310.5000000000002 143.8C325.0000000000002 138.5 334.5000000000002 126.5 346.6000000000002 118.2C346.8000000000002 118.3 346.9000000000002 118.4 347.0000000000002 118.6L348.2000000000002 121.3C360.4000000000002 148.1999999999999 375.2000000000002 173.6 394.9000000000002 195.8C411.6000000000002 214.6 432.9000000000002 221.1 457.4000000000001 215.8C463.3000000000001 214.5 468.8000000000001 211.4 474.6000000000001 209C476.9000000000001 210.4 479.7000000000002 212.1999999999999 482.6000000000001 213.6999999999999C491.0000000000001 218 500.0000000000001 220.6999999999999 509.3000000000001 222.6999999999999C524.0000000000001 225.8 538.8000000000002 227.6 553.8000000000002 224V224.5C553.3000000000002 224.9 552.6000000000001 225.3 552.1000000000001 225.9zM316.7 50.4C277.3 83.4 293.9 69.9 274 86C273.2 85.1 274 86.2 272.1 83C260.9000000000001 63.9 246.6 47.7 228.1 35.4C217.8 28.6 206.6 23.6 194 23.6C172.4 23.6 155.8 33.1 144.6 51.4C132.6 70.9 131.3 92.1 136.4 114C144.2000000000001 147.8 166.5 169.2 175 178.3C156.3000000000001 184.5 142 176.6 128.6 164.4C129.4 178.3 132.9 190.6 140.4 201.7000000000001C116.1 191.1 94.5 176.7000000000001 75.6 157.8000000000001C75.3 163.6000000000001 81 201.5000000000001 81.2 202.5000000000001C81.5 205.2000000000001 80.6 207.8000000000001 78.2 209.9000000000001C54 185.2000000000001 33.7 158.1000000000001 22.1 125.3000000000001C29.5 131.2000000000001 37 136.7000000000001 45.7 141.5000000000001C37.4 119.2000000000001 26.1 88.7000000000001 37.9 40.4000000000001C42.5 21.4000000000001 49.8 3.6000000000001 62 -11.8999999999999C64.9 -15.5999999999999 68.3 -18.7999999999999 71.5 -22.1999999999999C71.7 -21.9999999999999 71.9 -21.8999999999999 72.1 -21.6999999999999C70.7 -14.6999999999999 69.9 -7.5999999999999 70.6 0.2C72.8 -2.9999999999999 74.5 -5.8 76.5 -8.4C89.1 -24.4 105.2 -35.8 123.7 -44C148.7000000000001 -55.3 174.8000000000001 -57.3 201.6 -52.6C256.5 -42.9 292.3 -4 317.6 46.2C318.6 48 318.2000000000001 49.1 316.7000000000001 50.4zM488.7 96.8C479.2 99.9 466.5 100.9999999999999 460 99.6999999999999C469.9 95.6999999999999 474.1 93.0999999999999 478.8 87.6999999999999C491.4 73.3 489.2 52.9999999999999 473.4 42.0999999999999C461.7 33.9999999999999 448.5000000000001 31.5999999999999 434.5000000000001 32.9999999999999C433.3000000000001 33.0999999999999 432.2000000000001 33.3999999999999 431.5000000000001 33.5999999999999C434.3000000000001 37.2999999999999 437.5000000000001 40.5999999999999 439.6000000000001 44.3999999999999C449.0000000000001 61.1999999999999 445.0000000000001 86.4999999999999 430.9000000000001 100.4999999999999C428.8000000000001 102.6 426.3000000000001 104.3999999999999 423.9000000000001 106.3999999999999C423.6000000000001 105.0999999999999 423.8000000000001 104.2999999999999 424.0000000000001 103.5999999999999C428.2000000000001 86.9999999999999 415.9000000000001 71.1999999999999 399.2000000000001 71.7999999999999C391.6000000000001 72.0999999999999 385.3000000000002 75.5999999999999 379.6000000000001 80.2999999999999C360.1000000000001 96.3999999999999 340.5000000000001 112.3999999999999 321.1000000000001 128.5999999999999C315.2000000000001 133.4999999999999 308.6000000000001 136.6999999999999 301.0000000000001 137.2999999999999C296.4000000000001 137.6999999999999 291.7000000000001 137.8999999999999 287.1000000000001 138.1999999999999C281.2000000000001 138.5999999999999 278.3000000000001 140.9999999999999 276.7000000000001 146.5999999999999C275.8000000000002 149.9999999999998 275.2000000000001 153.3999999999999 274.5000000000001 156.7999999999999C273.0000000000001 164.8999999999999 268.3000000000002 169.7999999999999 260.2000000000001 170.9999999999998C255.8000000000001 171.6999999999998 251.3000000000001 171.9999999999998 246.9000000000001 172.4999999999998C233.9000000000001 173.8999999999998 227.1000000000001 179.8999999999998 224.3000000000001 192.7999999999999C219.3000000000001 181.7999999999999 222.7000000000001 170.3999999999999 231.6000000000001 162.8999999999999C236.1000000000001 159.0999999999999 240.9000000000001 155.5999999999999 245.4000000000001 151.6999999999999C250.0000000000001 147.8999999999999 252.8000000000002 142.9999999999999 253.3000000000002 136.8999999999999C253.7000000000002 132.1999999999999 254.1000000000002 127.3999999999999 255.1000000000002 122.7999999999999C257.3000000000002 112.1999999999998 264.0000000000001 104.3999999999999 272.1000000000002 97.6999999999998C288.6000000000002 83.9999999999998 305.1000000000002 70.3999999999998 321.6000000000002 56.5999999999998C339.5000000000001 41.5999999999998 335.5000000000001 23.7999999999998 334.6000000000002 0.5999999999998C333.7000000000002 -22.3000000000002 346.8000000000002 -42.3000000000002 368.1000000000002 -50.6000000000002C369.1000000000002 -51.0000000000002 370.1000000000002 -51.2000000000002 371.7000000000002 -51.7000000000002C356.0000000000002 -33.5000000000002 361.6000000000002 -7.6000000000002 372.4000000000002 0.5999999999998C372.7000000000002 -1.6000000000002 372.8000000000002 -3.7000000000002 373.3000000000002 -5.8000000000002C382.7000000000001 -49.9000000000002 418.7000000000001 -70.0000000000002 458.3000000000001 -62.7000000000002C474.3000000000001 -59.8000000000002 488.9000000000001 -53.8000000000002 501.2000000000001 -42.9000000000001C503.2000000000001 -41.1000000000001 504.9000000000001 -38.8000000000001 507.1000000000001 -36.4000000000001C487.8000000000001 -41.0000000000002 471.3000000000001 -36.5000000000002 456.2000000000001 -25.8000000000001C456.9000000000001 -25.5000000000001 457.5000000000001 -25.5000000000001 458.1000000000001 -25.5000000000001C479.4000000000001 -27.3000000000001 498.7000000000001 -22.1000000000001 515.1000000000001 -8.1000000000001C534.6000000000001 8.4999999999999 541.7000000000002 34.7999999999998 532.5000000000001 57.8999999999999C524.2000000000002 77.9999999999999 508.9000000000001 90.1999999999999 488.7000000000001 96.7999999999998zM99.4 268.7C94.1 277.9 86.2 284.3 77.3 290C91 290.5 103.9 289.8 116.9 286.3C109.9 298.5 108.4 311 111.9 325C117.2 313.1 125.6 304.9 135.5 298.2000000000001C155.2 285 171.2 278.6 182.2 268C185.6 264.7000000000001 188.5 260.9000000000001 191.8 257.1C191 259.2000000000001 190.4 261.2000000000001 189.6 263.1C184.6 273.7000000000001 176.6 281.7000000000001 167 288.1C165.2 289.3 164.2 290.6 163.6 292.6C160.3 305.1 160.6 317.7000000000001 162.9 330.2000000000001C163.9 335.7000000000001 165.7 341.1 167.4 346.5C168.2 348.9000000000001 169.7 351.1 171.4 353.1C172 346.2 171.4 327.6 191 307.1C201.8 295.8 213.4 285.2000000000001 224.9 274.4000000000001C233.9 265.9000000000001 243.2 257.7000000000001 250.4 247.6C251.5 246.0000000000001 252.6 244.3 254.2 242.9000000000001C249.2 255.9000000000001 240.0000000000001 267 230.0000000000001 276.7000000000001C220.4 286.0000000000001 210.6 295.1 200.8000000000001 304.1C197.5 307.1 196.2000000000001 310.8000000000001 195.7000000000001 315.0000000000001C194.5000000000001 325.4000000000001 195.7000000000001 335.6 200.0000000000001 345.2000000000001C200.5000000000001 346.2000000000001 201.1000000000001 347.2000000000001 201.9000000000001 348.5000000000001C202.4000000000001 344.3000000000001 202.5000000000001 340.6 203.3000000000001 336.9000000000001C208.1000000000001 313.8000000000001 223.7000000000001 300.6000000000001 252.6000000000001 273.4000000000001C262.6000000000001 264.0000000000001 271.9000000000001 254.2000000000001 278.2000000000001 241.8000000000001C283.0000000000001 232.5000000000001 285.5000000000001 222.8000000000001 283.9000000000001 212.2000000000001C283.8000000000001 211.6000000000001 284.4000000000001 210.5000000000001 285.0000000000001 210.2000000000001C291.2000000000001 207.6000000000001 295.0000000000001 203.3000000000001 294.7000000000001 195.9000000000001C302.4000000000001 198.5000000000001 307.2000000000001 203.9000000000001 311.1000000000001 210.4000000000001C315.3000000000001 190.2000000000001 302.0000000000001 160.1000000000001 283.9000000000001 151.7000000000001C284.3000000000001 156.2000000000001 288.9000000000001 175.1 267.4000000000001 179.4C260.6000000000001 180.7000000000001 254.6000000000001 180.7000000000001 244.5000000000001 181.5000000000001C249.2000000000001 190.5000000000001 254.9000000000001 202.1000000000001 245.0000000000001 203.9000000000001C220.1000000000001 208.5000000000001 192.2000000000001 202.0000000000001 187.2000000000001 199.3000000000001C195.4000000000001 198.9000000000001 203.5000000000001 198.3000000000001 210.7000000000001 196.0000000000001C208.7000000000001 189.5000000000001 206.7000000000001 183.3000000000001 204.9000000000001 177.1000000000001C203.0000000000001 170.6000000000001 207.0000000000001 162.5000000000001 214.2000000000001 167.5000000000001C215.4000000000001 168.4 216.5000000000001 169.4 217.5000000000001 170.2000000000001C214.4000000000001 152.3000000000001 214.6000000000001 154.3000000000001 214.7000000000001 151.9C215.0000000000001 141.7000000000001 224.2000000000001 144.1 230.4000000000001 144.6C227.9000000000001 132.8 200.9000000000001 117.3 185.0000000000001 118.8C192.0000000000001 123.5 197.7000000000001 129.1 200.9000000000001 136.7C194.4000000000001 135.9 188.0000000000001 135.1 181.7000000000001 134.3L181.4000000000001 135.2C186.1000000000001 138.6 189.4000000000001 143 191.6000000000001 148.3C200.3000000000001 169.4 188.0000000000001 186.3 166.6000000000001 188.2C157.5000000000001 189 148.8000000000001 187.4 140.7000000000001 182.7C146.9000000000001 198.3 157.9000000000001 209.3 173.3000000000001 217.2C158.1000000000001 221.5 164.4000000000001 219.9 148.7000000000001 223.5C163.3000000000001 232.8 178.9000000000001 236.7 195.2000000000001 238.1C190.0000000000001 241.3 147.1000000000001 241.7 125.0000000000001 217.2C132.9000000000001 215.8 140.5000000000001 214.4 148.2000000000001 213C124.4000000000001 206 104.2000000000001 193.3 85.8000000000001 177.4C86.9000000000001 182.2 88.5000000000001 186.9 89.1000000000001 191.7C89.7000000000001 196.2 89.9000000000001 200.9 89.2000000000001 205.3C87.7000000000001 214.7 80.3000000000001 220.4 69.5000000000001 221.6C61.6000000000001 222.5 53.9000000000001 221.5 46.2000000000001 220.3C45.3000000000001 220.2 44.5000000000001 220 43.3000000000001 220.3C59.1000000000001 235.1 79.3000000000001 242 96.4000000000001 253.8C102.4000000000001 258.3 103.2000000000001 262 99.4000000000001 268.7zM227.8 241.9C231.1 225.9 240.4 216.4 251.6 217.6C247.0000000000001 228.9 239.5000000000001 237.1 227.8 241.9z" />
-    <glyph glyph-name="dashcube"
-      unicode="&#xF210;"
-      horiz-adv-x="448" d=" M326.6 344H110.4C59.3 344 19.2 300.7 19.2 250.5V21C19.2 -29.5 59.3 -64 110.4 -64H337.6C388.7000000000001 -64 428.8 -29.5 428.8 21V448L326.6 344zM153.9 31.5C136.2 31.5 121.5 46.6 121.5 64.3V207.2C121.5 224.9 136.2 239.7 153.9 239.7H294.6C312.3 239.7 326.6 224.9 326.6 207.2V83.7L377.7000000000001 31.4H153.9z" />
-    <glyph glyph-name="delicious"
-      unicode="&#xF1A5;"
-      horiz-adv-x="448" d=" M446.5 380C446.1 381.5 445.6 383 445.1 384.5C444.2000000000001 387 443.1 389.3 441.8 391.6C440.4000000000001 394 438.8 396.4 437.1 398.5C435 401 432.7000000000001 403.3 430.2000000000001 405.3C429.1 406.2 428.0000000000001 407 426.9000000000001 407.8C425.6 408.7 424.3 409.5 422.9000000000001 410.2C421.1 411.2 419.3 412 417.4000000000001 412.7C415.7000000000001 413.4 413.9000000000001 414 412.0000000000001 414.4C408.2000000000001 415.4 404.1000000000001 415.9 400.0000000000001 415.9H48C21.5 416 0 394.5 0 368V16C0 11.9 0.5 7.8 1.5 4C3.5 -3.7 7.3 -10.6 12.5 -16.3C13.5 -17.4 14.6 -18.5 15.8 -19.6C21.5 -24.8 28.4 -28.6 36.1 -30.6C39.9 -31.6 44 -32.1 48.1 -32.1H400.1C426.6 -32.1 448.1 -10.6 448.1 15.9V368C448 372.1 447.5 376.2 446.5 380zM416 16C416 7.2 408.8 0 400 0H224V192H32V368C32 376.8 39.2 384 48 384H224V192H416V16z" />
-    <glyph glyph-name="deploydog"
-      unicode="&#xF38E;"
-      horiz-adv-x="512" d=" M382.2 312H433.9V72.4H382.2V93.1C362.4 68.3 329.4 68.9999999999999 308.4 78.4C282.2 90.1 264.1 116.5 264.1 150.2C264.1 180 278.9 208.1 307.4 221C327.6 230.1 360.1 231.6 382.2 208.1V312zM317.5 150.2C317.5 132 331.1 116.7 350.7 116.7C370.5 116.7 383.9 133.1 383.9 149.6C383.9 166.7 370.2 182.8 350.7 182.8C331.1 182.8 317.5 166.4 317.5 150.1999999999999zM188.5 312H240.2V72.4H188.5V93.1C168.7 68.3 135.7 68.9999999999999 114.7 78.4C88.5 90.1 70.4 116.5 70.4 150.2C70.4 180 85.2 208.1 113.7 221C133.9 230.1 166.4 231.6 188.5 208.1V312zM123.8 150.2C123.8 132 137.4 116.7 157 116.7C176.8 116.7 190.2 133.1 190.2 149.6C190.2 166.7 176.5 182.8 157 182.8C137.3 182.8 123.8 166.4 123.8 150.1999999999999zM448 352C465.5 352 480 337.6 480 320V64C480 46.5 465.6 32 448 32H64C46.5 32 32 46.4 32 64V320C32 337.5 46.4 352 64 352H448M448 384H64C28.8 384 0 355.2 0 320V64C0 28.8 28.8 0 64 0H448C483.2 0 512 28.8 512 64V320C512 355.2 483.2 384 448 384z" />
-    <glyph glyph-name="deskpro"
-      unicode="&#xF38F;"
-      horiz-adv-x="480" d=" M205.9 -64L237 -25.6C249.3 -25.4 262.6 -24.2 273.5 -19C312.4 -0.4 311.9 42.9 311.8 44.8C311.7 49.8 311 49.2 282.9000000000001 82.2H362C361.8 32.1 354.7 13.7 351.8 6.5C342.4000000000001 -17.2 307.9000000000001 -56.3 256.6 -62.9C247.9000000000001 -64 223.8 -64.1 205.9 -64zM406.3 103.7C444.9000000000001 103.7 464.8 117.3 480 134.6L304.5 134.9L287.1 103.6L406.3 103.7zM362.7 327.6V159.3H289.2L256.5 103.8H250C197.7 103.8 191.9 160.3 191.7 162.6999999999999C190.5 175.8999999999999 170.4 174.3 171.6 160.8999999999999C173 145.0999999999999 180.4 120.8999999999999 198 103.7999999999999H107C81.5 103.7999999999999 -3.8 130.5999999999999 0 217.7999999999999V431.1C0 447.1 9.7 447.7 15 447.9H97C97.2 447.9 97.3 447.8 97.5 447.8C101.8 448.2 147.6 449.9 147.6 404.1C147.6 390.8 167.8 390.7 167.8 404.1C167.8 422.3 162.3 436.9 152 447.8H236.2C344.9 448.2 362.7 368.4 362.7 327.6zM230.2 271.6L294.2 242.3C307.5 287.8 252 314 230.2 271.6z" />
-    <glyph glyph-name="deviantart"
-      unicode="&#xF1BD;"
-      horiz-adv-x="320" d=" M320 354.8L221.8 175.7L229.2 166.2H320V38.5H159.1L145.6 29.3L101.9 -54.7C101.6 -54.7 93.3 -63.3 92.7 -63.9H0V29.3L93.2 208.7L85.8 217.9H0V345.5H156L169.5 354.7L213.2 438.7C213.5 438.7 221.8 447.3 222.4 447.9H320V354.8z" />
-    <glyph glyph-name="digg"
-      unicode="&#xF1A6;"
-      horiz-adv-x="512" d=" M81.7 275.7H0V101.3H132.7V352H81.7V275.7zM81.7 142.3H50.9V234.6H81.7V142.3zM378.9 275.7V101.3H460.7V72.8H378.9V32H512V275.7H378.9zM460.7 142.3H429.9V234.6H460.7V142.3zM225.1 101.3H307.2V72.8H225.1V32H358.4V275.7H225.1V101.3zM276.3 234.6H307.1V142.3H276.3V234.6zM153.3 352H204.6V301H153.3V352zM153.3 275.7H204.6V101.3H153.3V275.7z" />
-    <glyph glyph-name="digital-ocean"
-      unicode="&#xF391;"
-      horiz-adv-x="512" d=" M256 -56V40.1C357.8 40.1 436.8 141 397.7 248.1C383.4 287.7000000000001 351.6 319.5 311.9 333.8C204.8 372.6 103.8 293.9000000000001 103.8 192.1H8C8 354.3 164.9 480.8 335 427.7C409.2 404.4 468.6 345.3 491.6 271.1C544.8 100.8 418.6 -56 256 -56zM256.3 135.4H160.7V39.8H256.3V135.4zM160.7 39.8H87V-33.8000000000001H160.7V39.8zM87 101.4H25.4V39.8H87V101.4z" />
-    <glyph glyph-name="discord"
-      unicode="&#xF392;"
-      horiz-adv-x="448" d=" M297.216 204.8C297.216 189.184 285.6960000000001 176.384 271.104 176.384C256.768 176.384 244.992 189.184 244.992 204.8S256.512 233.216 271.104 233.216C285.696 233.216 297.216 220.416 297.216 204.8zM177.664 233.216C163.072 233.216 151.552 220.416 151.552 204.8S163.328 176.384 177.664 176.384C192.256 176.384 203.776 189.184 203.776 204.8C204.032 220.416 192.256 233.216 177.664 233.216zM448 395.264V-64C383.506 -7.006 404.132 -25.872 329.216 43.776L342.784 -3.584H52.48C23.552 -3.584 0 19.968 0 49.152V395.264C0 424.448 23.552 448 52.48 448H395.5200000000001C424.448 448 448 424.448 448 395.264zM375.04 152.576C375.04 235.0080000000001 338.1760000000001 301.824 338.1760000000001 301.824C301.3120000000001 329.472 266.24 328.704 266.24 328.704L262.656 324.608C306.176 311.296 326.4 292.096 326.4 292.096C265.589 325.425 194.156 325.4310000000001 135.168 299.52C125.696 295.168 120.064 292.096 120.064 292.096S141.312 312.32 187.392 325.632L184.832 328.704S149.76 329.472 112.896 301.824C112.896 301.824 76.032 235.008 76.032 152.576C76.032 152.576 97.536 115.456 154.112 113.6640000000001C154.112 113.6640000000001 163.584 125.184 171.264 134.912C138.752 144.6400000000001 126.464 165.12 126.464 165.12C130.23 162.484 136.44 159.067 136.96 158.72C180.17 134.5220000000001 241.548 126.5940000000001 296.704 149.7600000000001C305.664 153.088 315.648 157.9520000000001 326.144 164.864C326.144 164.864 313.344 143.872 279.808 134.4C287.488 124.672 296.704 113.6640000000001 296.704 113.6640000000001C353.28 115.456 375.04 152.576 375.04 152.576z" />
-    <glyph glyph-name="discourse"
-      unicode="&#xF393;"
-      horiz-adv-x="448" d=" M225.9 416C103.3 416 0 317.5 0 195.9C0 192 0.1 -32 0.1 -32L225.9 -31.8C348.6 -31.8 448 70.5 448 192.1C448 313.7 348.6 416 225.9 416zM224 64C204.6 64 186.1 68.3 169.6 76.1L88.5 56L111.4 131C101.6 149.1 96 169.9 96 192C96 262.7 153.3 320 224 320S352 262.7 352 192S294.7 64 224 64z" />
-    <glyph glyph-name="dochub"
-      unicode="&#xF394;"
-      horiz-adv-x="416" d=" M397.9 288H256V428.4L397.9 288zM304 256V126C304 59.2 267.5 25.9 190.7 25.9H96V363.2H190.7C202.7 363.2 213.8 362.4 223.8 360.7V444.7C212.9 446.9 201.4 448 189.2 448H0V-64H189.2C329.7 -64 400 0.6 400 129.9V256H304z" />
-    <glyph glyph-name="docker"
-      unicode="&#xF395;"
-      horiz-adv-x="640" d=" M349.9 211.7H283.8V271.1H349.9V211.7zM349.9 416H283.8V355.3H349.9V416zM428.1 271.2H362V211.8H428.1V271.2zM271.8 343.3H205.7V283.2H271.8V343.3zM349.9 343.3H283.8V283.2H349.9V343.3zM626.7 243.3C612.3000000000001 253 579.1 256.5 553.6 251.7C550.3000000000001 275.7 536.9 296.6 512.5 315.4L498.5 324.7L489.2 310.7C470.8 282.9 465.8 237.1 485.5 206.9C476.8 202.2 459.7 195.8 437.1 196.2H2.4C-6.3 145.4 8.2 79.4 46.4 34.1C83.5 -9.8 139.1 -32.1 211.8 -32.1C369.2000000000001 -32.1 485.7 40.4 540.2 172.1C561.6 171.7000000000001 607.8000000000001 172 631.5 217.3C633 219.8 638.1 230.5 640 234.4L626.7 243.3zM115.6 271.2H49.6V211.8H115.7V271.2zM193.7 271.2H127.6V211.8H193.7V271.2zM271.8 271.2H205.7V211.8H271.8V271.2zM193.7 343.3H127.6V283.2H193.7V343.3z" />
-    <glyph glyph-name="draft2digital"
-      unicode="&#xF396;"
-      horiz-adv-x="480" d=" M369.9 22.6V77L417 49.8L369.9 22.6zM82.4 67.4C107.9 94.7 180.1 172.1 233.3 237.4C268.4000000000001 280.5 273.6 319.8 261.7 350.1C254.3 368.9 244.2 380.3 237.4 385.8C282.7 383.7 305.4 362.4 319.6 347.5C319.6 347.5 362 299.3 325.4 234.2C288.4 168.3 214.5 86.7 196.9 67.5H82.4zM134.2 286.6C134.2 274.2 124.2 264.2 111.8 264.2C99.4 264.2 89.4 274.2 89.4 286.6C89.4 299 99.4 309 111.8 309C124.2 309 134.2 298.9 134.2 286.6M336 132.1V67.4H244.7C275.5 102.4 326.5 163.3000000000001 356.5 216.7000000000001C391.7 279.3000000000001 372.6 340.1 343.7 370.0000000000001C339.3 374.6 281.5 432.9000000000001 177.7 411.2000000000001C118.6 398.8000000000001 88.3 367.8000000000001 73.4 343.9000000000001C60.3 323.0000000000001 56.4 304.1000000000001 55.2 296.2000000000001C49.7 263.2000000000001 74.6 229.1000000000001 111.9 229.1000000000001C143.6 229.1000000000001 169.2 254.8000000000001 169.2 286.5000000000001C169.2 313.6 149.5 338.6 121.2 343.3000000000001C123 350.6 138.9 364.4000000000001 147.5 368.0000000000001C188.6 385.3000000000001 225.5 362.8000000000001 230.8 334.5000000000001C239.1 290.2000000000001 193.7 244.1000000000001 161.1 206.9000000000001C84.5 119.9 18.3 51.2 0 32.1L336 32.2V-32L480 49.9L336 132.1z" />
-    <glyph glyph-name="dribbble-square"
-      unicode="&#xF397;"
-      horiz-adv-x="448" d=" M90.2 219.8C99.1 262.2000000000001 127.6 297.5 165.9 315.5C169.5 310.6 193.9 276.7 216.6 236.5C152.6 219.5 96.3 219.7 90.2 219.8zM314.6 294C281 323.8 235.3 335.1 192 324.6C195.8000000000001 319.5 220.6 285.7 243.0000000000001 244.6C291.6 262.9 312.1 290.5 314.6 294zM140.1 84C180.6 52.4 233.4 47.3 277.4 66C275.4 78 267.4 119.8 248.2 169.6C193.1 150.8 154.4 113.2000000000001 140.1 84zM238.9 192.2C235.5 200 231.7 207.7 227.8 215.4C159.6 195 93.4 195.8 87.4 196C87.4 194.6 87.3 193.2 87.3 191.8C87.3 156.7 100.6 124.7000000000001 122.4 100.4C144.6 138.3 189.5 178.3 238.9 192.2zM273.8 175.9C291.7 126.8 298.9 86.8 300.3 78.5C331 99.2 352.8 132.1 358.9 170.1C354.3 171.6 316.6 182.8 273.8 175.9zM253.5 224.3C258.3 214.5 261.8 206.5 265.5 197.5C311 203.2 356.2 194.1 360.7 193.1C360.3999999999999 225.4 348.8999999999999 255 329.8 278.2C326.9 274.3 304 245 253.5 224.3zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM384 192C384 280.2 312.2 352 224 352S64 280.2 64 192S135.8 32 224 32S384 103.8 384 192z" />
-    <glyph glyph-name="dribbble"
-      unicode="&#xF17D;"
-      horiz-adv-x="512" d=" M256 440C119.252 440 8 328.748 8 192S119.252 -56 256 -56S504 55.252 504 192S392.748 440 256 440zM419.9700000000001 325.634C449.473 289.588 467.3390000000001 243.677 467.805 193.679C460.821 195.156 390.7870000000001 209.361 320.303 200.497C314.551 214.538 309.122 226.89 301.686 242.111C380.007 274.088 415.504 319.593 419.97 325.634zM396.421 350.13C392.611 344.703 360.724 301.844 285.4 273.611C250.688 337.387 212.215 389.779 206.36 397.619C273.536 413.812 344.326 396.349 396.421 350.13zM165.941 383.38C171.526 375.721 209.379 323.264 244.478 260.871C145.391 234.558 58.118 234.937 48.644 235.062C62.38 300.795 106.678 355.427 165.941 383.38zM44.17 191.677C44.17 193.843 44.213 195.999 44.278 198.15C53.546 197.96 156.198 196.637 261.984 228.2960000000001C268.048 216.4280000000001 273.841 204.3810000000001 279.158 192.347C202.559 170.7720000000001 132.964 108.8200000000001 98.627 50.0410000000001C64.794 87.595 44.17 137.27 44.17 191.677zM125.977 24.564C148.104 69.797 208.155 128.186 293.5560000000001 157.3200000000001C323.2960000000001 80.037 335.5950000000001 15.2670000000001 338.7450000000001 -3.318C270.6330000000001 -32.331 188.7300000000001 -24.371 125.9770000000001 24.564zM374.357 16.075C372.186 28.9610000000001 360.911 90.972 333.205 167.1080000000001C399.585 177.734 457.905 160.3400000000001 465.152 158.0530000000001C455.71 99.1120000000001 421.879 48.2090000000001 374.357 16.075z" />
-    <glyph glyph-name="dropbox"
-      unicode="&#xF16B;"
-      horiz-adv-x="528" d=" M264.4 331.7L132.4 247.4L264.4 163.1L132.4 78.8L0 163.9L132.3 248.2L0 331.7L132.3 416L264.4 331.7zM131.6 52.3L263.6 136.6L395.6 52.3L263.6 -32L131.6 52.3zM264.4 163.9L396.4 248.2L264.4 331.8L395.7 416L528 331.7L395.7 247.4L528 163.2L395.7 78.9L264.4 163.9z" />
-    <glyph glyph-name="drupal"
-      unicode="&#xF1A9;"
-      horiz-adv-x="448" d=" M319.5 333.3C297.3 347.3 276 352.8 254.8 366.8C241.8 375.6 223.5 396.8 208.3 415.1C205.6 385.8 196.8 373.9 186.3 365.6C165 348.6 151.5 343.4 132.8 333.3C117 325 32 266.5 32 157.5C32 48.3 123.8 -32 225.8 -32C327.5 -32 416 42 416 154C416 266.3 333 325 319.5 333.3zM322 7.7C301.9 -12.4 231.9 -21 205.3 3.5C200.5 8.3 205.6 15.5 211.8 15.5C211.8 15.5 228.8 2.2 263.3 2.2C290.3 2.2 309.3 9.9 317.8 16.2C323.9000000000001 20.8 326.2 11.9 322 7.7zM267.5 60.3C276.2 63.9 296.5 64.1 304.3 59C308.4000000000001 56.2 320.4000000000001 40.2 310.5 35.3C302.1 31.1 309.3 51 284 51C269.3 51 264.5 45.8 257.3 40C250.3 34 247.5 32 245.1 35.3C239.1 43.5 261 57.6 267.5 60.3zM360 43C344.8 44 314.5 91.8 295 92.5C264.1 93.4 190.9 11.8 133.7 50.5C94.9 77.1 119.1 155.3 185.5 155.7C235 156.2 269.3 106.7 294 107.2C315.3 107.5 355.8 149 375.8 149C424.5 149 399.1 39.7 360 43z" />
-    <glyph glyph-name="dyalog"
-      unicode="&#xF399;"
-      horiz-adv-x="416" d=" M0 416V296.8H64V352H171.2C284.6 352 352 271.8 352 192.1C352 116 293.4 32 171.2 32H0V-32H171.2C331.9 -32 416 80.7 416 192.1C416 250.8 393.9 305.5 353.7 346.4C308.9 392 245.7 416 171.2 416H0z" />
-    <glyph glyph-name="earlybirds"
-      unicode="&#xF39A;"
-      horiz-adv-x="480" d=" M313.2 400.5C314.4 413.5 334.5 414.5 349.8 409.2C350.7 408.9 376 399.5 368.8 394C340.9000000000001 401.4 312.4000000000001 375.8 313.2 400.5zM112.2 393.6C142.9 401.7 174.2 373.6 173.3 400.7C172 414.9 149.9 416 133.1 410.3C132.1 410 104.4 399.8 112.2 393.6zM319.4 288C310.6 288 303.4 280.8 303.4 272S310.6 256 319.4 256S335.4 263.2 335.4 272S328.2 288 319.4 288zM159.7 288C150.9 288 143.7 280.8 143.7 272S150.9 256 159.7 256S175.7 263.2 175.7 272S168.5 288 159.7 288zM478.2 124.8C468.3 100.8 437.5 113.8 414.3 126C400.8 56.9 356.2 14.6 288 1.8C288.3 0.9 286 1.9 312 0.8C345.6 -0.6 375.8 3.9 409.4 8.8C389.6 22.6 398 45.9 399.6 46.9C401 47.8 414.3 45.2 421.2 35.4C429.8 47.9 449.6 50.2 451.4 49.0000000000001C453 47.9 458 28.1000000000001 444.5 14.4C449.2 15.3 452.7 16.0000000000001 454.3 16.5000000000001C456.9 17.3000000000001 472 5.2 457.4 3.2C443.1 0.9 434.8 -1.9 410.3 -7.6C364.4000000000001 -18.3 324.4 -19.4 292.6 -20.4L293.6 -32C297.4000000000001 -50.1 270.2000000000001 -56.3 266 -38.2C266.8 -56.1 238.9 -60 237.6 -37.2L237.1 -42.5C236.4 -60.9 208.7 -60.4 208.8 -41.9C201.3 -55.4 180.7 -48.7 182.4 -33.4L183.6 -21C146.9 -21.9 123.9 -24.1 121.8 -24.1C100.9 -24.1 100.9 7.5 121.8 7.5C124.2 7.5 149.5 6.2 185 4.7C123.9 20.2 81.3 59.7 70.1 122.9C45.1 110.1 12.6 96.1 1.9 122.1C-8.6 147.5 23.4 164.7 68.7 195.5C69.4 202.1 70.3 208.8 71.4 215.3C57 234.9 59.8 251.6 55.3 275.7C38.5 273.3 32.1 284.8 31.7 298.8C32 306.1 33.8 313.7 34.1 314.2C35.2 316 44.2 316.2 46.8 316.8C52.8 348.5 97.4 350 137.7 351.3C157.4 373.1 182.9 392.8 218.6 399.6C203.3 419 215.2 439.5 216.2 440C217.9 440.8 237.4 435.7 242.5 416.8C247.7 425.6 260.8 428.2 262.1 427.5C263.2000000000001 426.9 268.5 412.5 257.2000000000001 401.6C297.5000000000001 398.1 329.4000000000001 376.9 353.2000000000001 350.9C389.3000000000001 349.4 425.0000000000001 345 430.3000000000001 316.9C433.0000000000001 316.3 441.9000000000001 316.1 443.0000000000001 314.3C443.3000000000001 313.8 445.1000000000001 306.2000000000001 445.4000000000001 298.9C444.9000000000001 285 438.6 273.5 421.8 275.8C418.6 258.5 419.1 242.9 413.1 228.1C415.5 216.4 417.1 204.3 417.9000000000001 191.7000000000001C454.9 166.3000000000001 488.2 149.2000000000001 478.2 124.8000000000001zM207.4 288.1C208.3 332.1 169.5 330.3 128.8 328.4C107.1 327.4 89.9 326.5 83.3 314.5C71.9 293.6 89.2 221.6 106.5 213.3C116.3 208.6 179.9 205.4 192.8 220.4C201 229.8 207.8 269.8 207.4 288.1zM259.4 229.8C255.1 242.2 253.4 259.9 244.1 262.5C242.1 263 235.1 263 233.1 262.5C223.1 259.7 222.3 240.4 216.1 225.3C231.5 225.3 235.4 215.6 239.8 215.6C244.1 215.6 246.1 226.9000000000001 259.4 229.8zM395.1 314.5C388.5 326.6 370.3 327.4 348.6 328.4C308.4 330.3 270.4 332.2 271.3 288.1C270.8 269.8 276.3 229.8 284.5 220.3C297.5 205.4 361.0999999999999 208.5 370.8 213.2C386.6 220.8 407.3 292.1 395.1 314.5z" />
-    <glyph glyph-name="ebay"
-      unicode="&#xF4F4;"
-      horiz-adv-x="640" d=" M405.2 184.2C376.1 183.3 358 178 358 158.9C358 146.5 367.9 133.1 393 133.1C426.7 133.1 444.6 151.5 444.6 181.5V184.8C432.8 184.8 418.3 184.6999999999999 405.2000000000001 184.1999999999999M476.7 144.5C476.7 135.1999999999999 477.0000000000001 125.8999999999999 477.7 117.6999999999999H447.9000000000001C447.1 124.5999999999999 446.8 131.3 446.8 137.8999999999999C430.7 118.0999999999999 411.5 112.3999999999999 384.9000000000001 112.3999999999999C345.4000000000001 112.3999999999999 324.3 133.2999999999999 324.3 157.3999999999999C324.3 192.3999999999999 353.1 204.6999999999999 402.9 205.7999999999999C416.6 206.0999999999999 431.9 206.1999999999999 444.6 206.1999999999999V209.5999999999999C444.6 233 429.6 242.6 403.6 242.6C384.3 242.6 370 234.6 368.6 220.7999999999999H334.9C338.5 255.2 374.6 263.8999999999999 406.4 263.8999999999999C444.5 263.8999999999999 476.7 250.3999999999999 476.7 210.0999999999999V144.4999999999999zM127.7000000000001 201.3C125.4000000000001 256 40.2 257.9 33.3 201.3H127.7000000000001zM32.7 179.9C36.2 121.6 111.9000000000001 122.5 123.9000000000001 158.3H157C150.6 123.9 114 112.1999999999999 82.6 112.1999999999999C25.4 112.1999999999999 0.1 143.6999999999999 0.1 186.1999999999999C0.1 233 26.3 263.8 83.1 263.8C128.4 263.8 161.5 240.1 161.5 188.3999999999999V179.8999999999999H32.7zM243.7000000000001 134.2C273.5000000000001 134.2 293.9000000000001 155.7 293.9000000000001 188C293.9000000000001 220.4 273.5000000000001 241.8 243.7000000000001 241.8C214.1000000000001 241.8 193.5000000000001 220.4 193.5000000000001 188C193.5000000000001 155.7 214.1000000000001 134.2 243.7000000000001 134.2M161.5000000000001 320.2H193.6000000000001V239.6C209.3000000000001 258.3 231.0000000000001 263.8 252.3000000000001 263.8C288.0000000000001 263.8 327.7000000000001 239.7 327.7000000000001 187.6C327.7000000000001 144 296.2000000000001 112.1999999999999 251.7000000000001 112.1999999999999C228.4000000000001 112.1999999999999 206.6000000000001 120.5 193.0000000000001 137.0999999999999C193.0000000000001 130.4999999999999 192.6000000000001 123.8999999999999 191.9000000000001 117.5999999999999H160.4000000000001C160.9000000000001 127.7999999999999 161.5000000000001 140.3999999999999 161.5000000000001 150.6999999999999V320.2zM640 258.5L540.8 63.7H504.9L533.4 117.8L458.8 258.5H496.3L551.1999999999999 148.6L606 258.5H640z" />
-    <glyph glyph-name="edge"
-      unicode="&#xF282;"
-      horiz-adv-x="512" d=" M25.714 219.837C25.825 219.999 25.944 220.16 26.056 220.322C26.035 220.16 26.011 219.999 25.991 219.837H25.714zM486.286 204.329C486.286 248.361 478.532 288.794 457.485 326.734C416.498 400.121 343.912 439.999 258.893 439.999C118.962 440.276 40.617 334.786 26.056 220.321C68.485 281.633 143.129 341.697 246.431 345.287C246.431 345.287 356.097 345.287 345.85 240.33H169.997C176.366 277.716 188.551 299.316 204.336 319.256C129.288 284.363 82.486 223.16 83.594 130.941C84.424 59.493 133.718 -13.895 204.337 -41.035C287.694 -72.8820000000001 397.113 -48.235 444.469 -19.711V84.693C363.605 28.199 173.598 23.768 172.214 152.265H486.287V204.329z" />
-    <glyph glyph-name="elementor"
-      unicode="&#xF430;"
-      horiz-adv-x="448" d=" M425.6 416H22.4C10 416 0 406 0 393.6V-9.6C0 -22 10 -32 22.4 -32H425.6C438 -32 448 -22 448 -9.6V393.6C448 406 438 416 425.6 416M164.3 92.5H124.5V291.5H164.3V92.5zM323.6 92.5H204.1V132.3H323.6V92.5zM323.6 172.1H204.1V211.9H323.6V172.1zM323.6 251.8H204.1V291.6H323.6V251.8z" />
-    <glyph glyph-name="ember"
-      unicode="&#xF423;"
-      horiz-adv-x="640" d=" M639.9 193.4C638.8 204.1 629.1999999999999 200.2 629.1999999999999 200.2S613.5999999999999 188.1 599.9 189.5C586.1999999999999 190.8 590.5 221.5 590.5 221.5S593.5 249.6 585.4 251.9C577.3 254.3 567.4 244.6 567.4 244.6S555 230.9 549.1 213.4L547.5 212.9S549.4 243.5 547.2 250.5C545.6 254 530.8000000000001 253.7 528.4000000000001 247.5S514.2 198.3 513.4000000000001 180.3C513.4000000000001 180.3 490.3000000000001 160.7 470.1000000000001 157.5S445.1000000000001 166.9 445.1000000000001 166.9S499.9000000000001 182.2 498.0000000000001 226C496.1000000000001 269.8 453.8000000000001 253.6 449.0000000000001 250C444.4000000000001 246.5 419.6000000000001 231.6 412.4000000000001 190.3C412.2000000000001 188.9 411.7000000000001 182.8 411.7000000000001 182.8S390.5000000000001 168.6 378.7000000000001 164.8C378.7000000000001 164.8 411.7000000000001 220.4 371.4000000000001 245.7C353.1 256.7 338.6 233.6 338.6 233.6S393.1 294.3 381.1 345.6C375.3 370 363.1 372.7 351.9000000000001 368.7C334.9000000000001 362 328.4000000000001 352 328.4000000000001 352S306.4000000000001 320 301.3 272.5S288.7 167.4 288.7 167.4S278.2 157.2 268.5 156.7S263.1 185.4 263.1 185.4S270.6 230 270.1 237.5S269 249.1 260.2000000000001 251.7C251.3000000000001 254.4 241.7000000000001 243.1 241.7000000000001 243.1S216.2000000000001 204.4 214.0000000000001 198.5L212.7000000000001 196.1L211.4 197.7S229.4000000000001 250.4 212.2000000000001 251.2C195.0000000000001 252 183.7000000000001 232.4 183.7000000000001 232.4S164.1000000000001 199.6 163.3000000000001 195.9L162 197.5S170.1 235.7 168.4 245.1C166.8000000000001 254.5 157.9 252.6 157.9 252.6S146.6 253.9 143.7000000000001 246.7S130.0000000000001 191.3999999999999 128.7000000000001 176C128.7000000000001 176 100.5 155.8 81.9000000000001 155.6C63.4000000000001 155.3 65.2000000000001 167.4 65.2000000000001 167.4S133.2000000000001 190.7 114.6000000000001 236.6C106.3000000000001 248.4 96.6000000000001 252.1 82.9000000000001 251.9C69.2000000000001 251.6 52.6000000000001 243.3 41.6000000000001 218.6C36.3000000000001 206.8 34.8000000000001 195.6 33.8000000000001 187.1C33.8000000000001 187.1 21.5000000000001 184.7 15.0000000000001 190S5.0000000000001 190 5.0000000000001 190S-6.1999999999999 176 4.9000000000001 171.6999999999999S33.0000000000001 165.5999999999999 33.0000000000001 165.5999999999999C34.6000000000001 158.0999999999999 39.2000000000001 146.0999999999999 52.6000000000001 135.8999999999999C72.8000000000001 120.5999999999999 111.4000000000001 137.1999999999999 111.4000000000001 137.1999999999999L127.3000000000001 146S127.8000000000001 131.3999999999999 139.4000000000001 129.3C151.0000000000001 127.1999999999999 155.8000000000001 128.3 175.9000000000001 177.1999999999999C187.7000000000001 202.1999999999999 188.5000000000001 200.7999999999999 188.5000000000001 200.7999999999999L189.8000000000001 201.0999999999999S180.7000000000001 154.3 184.2000000000001 141.3999999999999C187.7 128.6 203 130 203 130S211.3 127.6 218 151.2C224.7 174.8 237.6 201.1 237.6 201.1H239.2S233.6 153 242.2 137.4C250.8 121.8 273.1 132.1 273.1 132.1S288.7 139.9 291.1 142.3C291.1 142.3 309.6 126.5 335.7 129.4C394 140.9 414.8 155.3 414.8 155.3S424.8 130.9 455.9 128.6C491.4 125.9 510.7 147.2 510.7 147.2S510.4 133.7 522.8 128.6C535.1999999999999 123.5 543.5 151.4 543.5 151.4L564.2 208.6H566.1S567.2 171.3 587.6 165.4S634.6 179.1 634.6 179.1S641 182.6 639.9 193.4zM61.9 188.1C62.7 220.1 83.7 234.0000000000001 90.9 227.1C98.2 220.1 95.5 205.1 81.8 195.7C68.1 186.2000000000001 61.9 188.1 61.9 188.1zM334.7 311.9000000000001S353.8 361.6 358.3 337.4000000000001S318.3 241.2000000000001 318.3 241.2000000000001C318.8 257.4000000000001 334.7 311.9000000000001 334.7 311.9000000000001zM357.5 173.5C344.9 140.5 314.2 153.9 314.2 153.9S310.7 165.7 320.6 198.8S353.9 219 353.9 219S370.1 206.6 357.5 173.5zM442.1 188.1S439.1 198.6 450.2000000000001 218.7C461.2 238.9 469.8000000000001 227.8 469.8000000000001 227.8S479.2 217.6 468.5000000000001 202.3S442.1000000000001 188.1 442.1000000000001 188.1z" />
-    <glyph glyph-name="empire"
-      unicode="&#xF1D1;"
-      horiz-adv-x="496" d=" M287.6 393.8C276.8 396 265.5 397.1 254.1 397.4V415.6C332.2000000000001 413.4 400.2000000000001 371.6 438.7000000000001 309L422.9000000000001 299.9C416.8 309.6 410.2000000000001 318.7000000000001 402.7000000000001 327L384.7000000000001 311.5C358.7000000000001 341.1 323.3000000000001 362.2 282.8000000000001 369.9L287.6000000000001 393.8zM53.4 125.6L76.4 133.3C70 151.6 66.4 171.5 66.4 192S69.7 232.4 76.1 250.7L53.4 258.4C57 269.2 61.7 279.7 67 289.4L51.2 298.5C34 267 24.1 230.5 24.1 192S34.1 117 51.2 85.4L67 94.5C61.7 104.5 57.3 114.8 53.4 125.6zM213.1 14C172.7 22 137.3 43.1 111.2 72.7L93.2 56.9C85.7 65.5 78.8 74.6 73 84.3L57 74.9C95.5 12.6 163.8 -29.4 241.9 -31.7V-13.4C230.6 -13.1 219.2 -11.7 208.4 -9.8L213.1 14zM93.3 327.1L111.3 311.6C137.3 341.2 172.7 362.3 213.2 370L208.5 393.8C219.3 396 230.6 397.1 242 397.4V415.6C163.9 413.4 95.9 371.6 57.4 309L73.2 299.9C79.2 309.6 85.8 318.8 93.3 327.1zM402.7 56.9L384.7 72.7C358.7 43.1 323.3 22 282.8 14L287.5 -9.8C276.7 -11.7 265.3999999999999 -13.1 254 -13.4V-31.7C332.0999999999999 -29.5000000000001 400.4 12.6 438.9 74.9L422.8 84.3C417.1 74.6 410.2 65.4999999999999 402.7 56.9zM496 192C496 55 385 -56 248 -56S0 55 0 192S111 440 248 440S496 329 496 192zM483.8 192C483.8 322.1 378.1 427.8 248 427.8S12.2 322.1 12.2 192S117.9 -43.8 248 -43.8S483.8 61.9 483.8 192zM444.8 298.6L429 289.5C434.3 279.8 439 269.3 442.6 258.5L419.9000000000001 250.8C426.3 232.5 429.6 212.6 429.6 192.1S426 151.7000000000001 419.6 133.4L442.6 125.7000000000001C438.7000000000001 114.9 434.3 104.7000000000001 429 94.7000000000001L444.8 85.6C462 117 471.9 153.5 471.9 192S462 267 444.8 298.6zM261.8 120.9C278.1 124.2 292.2 132.5 302.5 144.4L353.7 99.6C365.6 113.2 375 128.9 380.8 146.4L316.6 168.5C319.1 176 320.5 183.7 320.5 192S319.1 208.1 316.6 215.5L381.1 237.6C375 255 365.6 270.8 353.7000000000001 284.4L302.5000000000001 239.6C292.3000000000001 251.5 278.1000000000001 260.1 261.8000000000001 263.4L275.1000000000001 329.8C266.5000000000001 331.7 257.4000000000001 332.6 248.0000000000001 332.6C238.6000000000001 332.6 229.5000000000001 331.8 220.9000000000001 329.8L234.2000000000001 263.4C217.9000000000001 260.1 203.8000000000001 251.5 193.5000000000001 239.6L142.3000000000001 284.4C130.4000000000001 270.8 121.0000000000001 255.1 114.9000000000001 237.6L179.4000000000001 215.5C176.9000000000001 208 175.5000000000001 200.3 175.5000000000001 192S176.9000000000001 175.9 179.4000000000001 168.5L115.2000000000001 146.4C121.0000000000001 129 130.4000000000001 113.2 142.3000000000001 99.6L193.5000000000001 144.4C203.7000000000001 132.5 217.9000000000001 124.2 234.2000000000001 120.9L220.9000000000001 54.2C229.5000000000001 52.5 238.6000000000001 51.4 248.0000000000001 51.4C257.4000000000001 51.4 266.5000000000001 52.5 275.1000000000001 54.2L261.8000000000001 120.9z" />
-    <glyph glyph-name="envira"
-      unicode="&#xF299;"
-      horiz-adv-x="448" d=" M0 416C477.6 416 366.6 98.7 367.1 49.7L448 -32H422L351.6 39.2C312.6 35 227.2 4.7 137.2 76.2C47 147.7 52 233.3 0 416zM79.7 370C30 393.5 74.5 360.8 74.5 360.8C119.7 329.6 140.5 287.1 164.7 240.9C196.2 180.7 243.7 101.2 308.9 73.2C373.9 45.2 343.1 60.7 314.9 81.7C286.7 102.9 246.7 168.7 223.9 211.9C192.2 271.9 162.9 330.5 79.7 370z" />
-    <glyph glyph-name="erlang"
-      unicode="&#xF39D;"
-      horiz-adv-x="640" d=" M21.7 201.6C21.6 114.8 50.7 42.1 100.4 -10.5H0V394.5H87.2C45.7 344.3 21.6 278.3 21.7 201.6zM640 394.4H556.4C587.8 351.7 605.1 296.9 602.6 231.7C603.1 225.7 603.1 220 602.6 207.6H230.2C230 97.9 269.1 12.7 368.8 12.3C437.3 12.6 486.8 63.3 520.6999999999999 118.4L617.0999999999999 70.2C599.6999999999999 39.3 580.5999999999999 12.4 559.1999999999999 -10.6H640V394.4zM559.2 -10.6S559.2 -10.5 559.2 -10.6H559H559.2zM556.1 394.4H556.4L556.3 394.5L556.0999999999999 394.4zM325.4000000000001 384.8C279.5000000000001 384.7 240.3000000000001 351.3 236.2000000000001 301.6H406.1C405 351.3 371.6 384.7 325.4000000000001 384.8z" />
-    <glyph glyph-name="ethereum"
-      unicode="&#xF42E;"
-      horiz-adv-x="320" d=" M311.9 187.2L160 94.4L8 187.2L160 448L311.9 187.2zM160 64.6L8 157.4L160 -64L312 157.4L160 64.6z" />
-    <glyph glyph-name="etsy"
-      unicode="&#xF2D7;"
-      horiz-adv-x="384" d=" M384 100C382.25 89.25 370.25 -10 368.5 -32C250.621 -27.701 148.605 -27.257 0 -32V-6.5C45.457 2.448 60.627 1.519 61 28.75C62.793 101.072 64.524 272.8930000000001 61 350.75C59.971 379.2100000000001 48.87 377.515 0 386.75V412.25C73.886 409.892 255.933 403.699 362.999 416C359.499 377.75 355.249 289.5 355.249 289.5H332C320.947 332.335 313.241 380 277.25 380H140.25C130 380 129.5 376.5 129.5 370.25V206.5C187.5 206 218 209 218 209C247.77 209.951 245.56 217.502 258.75 274.251H284.5C280.093 172.9 280.59 212.422 282.75 114.001H257C247.845 154.087 247.935 175.046 217.499 175.501C217.499 175.501 195.999 177.501 129.499 177.501V38.501C129.499 12.501 143.749 0.251 173.749 0.251H263C326.636 0.251 329.564 25.247 361.751 100.001H384z" />
-    <glyph glyph-name="expeditedssl"
-      unicode="&#xF23E;"
-      horiz-adv-x="496" d=" M248 404.6C130.6 404.6 35.4 309.4 35.4 192S130.6 -20.6 248 -20.6S460.6 74.6 460.6 192S365.4 404.6 248 404.6zM150.6 271.7C150.6 325.4 194.3 369.1 248 369.1S345.4 325.4 345.4 271.7V245.1C345.4 240.1 341.5 236.2 336.5 236.2H318.8C313.8 236.2 309.9000000000001 240.1 309.9000000000001 245.1V271.7C309.9000000000001 353.8 185.9 353.8 185.9 271.7V245.1C185.9 240.1 182 236.2 177 236.2H159.3000000000001C154.3000000000001 236.2 150.4 240.1 150.4 245.1V271.7zM389.7 68C389.7 58.3 381.7 50.3 372 50.3H124C114.3 50.3 106.3 58.3 106.3 68V209.7C106.3 219.4 114.3 227.4 124 227.4H372C381.7 227.4 389.7 219.4 389.7 209.7V68zM141.7 205.3V72.4C141.7 69.9 139.8 68 137.3 68H128.4C125.9 68 124 69.9 124 72.4V205.3C124 207.8 125.9 209.7 128.4 209.7H137.3C139.8 209.7 141.7 207.8 141.7 205.3zM283.4 156.6C283.4 143.6 276.2 132.2000000000001 265.7 126.2000000000001V94.6C265.7 89.6 261.8 85.7000000000001 256.8 85.7000000000001H239.1C234.1 85.7000000000001 230.2 89.6 230.2 94.6V126.2000000000001C219.7 132.3000000000001 212.5 143.6 212.5 156.6C212.5 176.3 228.3000000000001 192 247.9000000000001 192S283.4000000000001 176.2000000000001 283.4000000000001 156.6zM248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -38.3C121 -38.3 17.7 65 17.7 192S121 422.3 248 422.3S478.3 319 478.3 192S375 -38.3 248 -38.3z" />
-    <glyph glyph-name="facebook-f"
-      unicode="&#xF39E;"
-      horiz-adv-x="264" d=" M76.7 -64V165H0V256H76.7V327.7C76.7 405.6 124.3 448 193.8 448C227.1 448 255.7 445.5 264 444.4V363H215.8C178 363 170.7 345 170.7 318.7V256H256L244.3 165H170.7V-64" />
-    <glyph glyph-name="facebook-messenger"
-      unicode="&#xF39F;"
-      horiz-adv-x="448" d=" M224 416C15.9 416 -77.5 170 84.6 47.4V-32L160.3 10C302.5 -29.8 445.7 69.9 445.7 208.7C445.8 323.2 346.5 416 224 416zM247.4 137.9L190 197.5L79.6 136.4L200.7 264.9L258.1 205.3L368.5 266.4L247.4 137.9z" />
-    <glyph glyph-name="facebook-square"
-      unicode="&#xF082;"
-      horiz-adv-x="448" d=" M448 368V16C448 -10.5 426.5 -32 400 -32H314.7V145.2H375.3L384 212.8H314.7V256C314.7 275.6 320.1 288.9 348.2 288.9H384V349.3C377.8 350.1 356.6 352 331.8 352C280.2 352 244.8 320.5 244.8 262.6V212.7H184V145.1H244.9V-32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368z" />
-    <glyph glyph-name="facebook"
-      unicode="&#xF09A;"
-      horiz-adv-x="448" d=" M448 391.3V-7.2C448 -20.9 436.9 -31.9 423.3 -31.9H309.1V141.5H367.3L376 209.1H309V252.3C309 271.9 314.4 285.2000000000001 342.5 285.2000000000001H378.3V345.7000000000001C372.1 346.5 350.9000000000001 348.4000000000001 326.1 348.4000000000001C274.5 348.4000000000001 239.1 316.9000000000001 239.1 259V209.1H180.7V141.5H239.1V-32H24.7C11.1 -32 0 -20.9 0 -7.3V391.3C0 404.9 11.1 416 24.7 416H423.2C436.9 416 448 404.9 448 391.3z" />
-    <glyph glyph-name="firefox"
-      unicode="&#xF269;"
-      horiz-adv-x="480" d=" M478.1 212.7C477.4 217.2 476.7 219.8 476.7 219.8S474.9 217.8 472.0000000000001 213.9C471.1000000000001 224.6 469.2 235.1 466.2 245.5C462.5000000000001 258.4 457.7 270.9 451.7 282.9C447.9000000000001 290.9 443.5000000000001 298.5 438.4000000000001 305.7C436.6 308.4 434.7000000000001 311.1 432.8 313.6C424 328 413.8 336.9 402.1 353.6C394.5 366.4 389.2000000000001 380.5 386.7000000000001 395.2C383.5000000000001 386.3 381.0000000000001 377.2 379.3000000000001 367.9C367.2000000000001 380.1 356.8000000000001 388.7 350.4000000000001 394.6C319.4 423.8 323 438.9 323 438.9S264.7 373.8 289.9 306C298.6 283 313.7 262.9 333.3 248.1C357.7 227.9 384.1 212.1 398 171.5C386.8 192.8 369.8999999999999 210.7 349.2 223C355.3999999999999 208.3 358.5999999999999 192.4 358.5 176.5C358.5 115.5 308.8999999999999 66 247.9 66.1C239.6 66.1 231.4 67 223.4 68.9C213.9 70.7000000000001 204.7 73.8 196 78.2000000000001C183.0999999999999 86.0000000000001 172 96.3000000000001 163.1999999999999 108.5000000000001L163 108.8000000000001L165 108.1000000000001C169.5999999999999 106.5000000000001 174.1999999999999 105.3000000000001 179 104.4000000000001C197.6999999999999 100.4000000000001 217.3 102.7000000000001 234.6 111.0000000000001C252.1 120.7000000000001 262.5999999999999 127.9000000000001 271.2 125.0000000000001H271.3999999999999C279.7999999999999 122.3000000000001 286.3999999999999 130.5000000000001 280.3999999999999 139.0000000000001C270 152.4000000000001 252.9999999999999 159.0000000000001 236.2 156.0000000000001C218.6999999999999 153.5000000000001 202.6999999999999 141.0000000000001 179.7999999999999 153.1000000000001C178.2999999999999 153.9000000000002 176.8999999999999 154.7000000000002 175.4999999999999 155.6000000000001C173.8999999999999 156.5000000000001 180.3999999999999 154.3000000000001 178.8999999999999 155.3000000000001C173.8999999999999 157.8000000000001 169.0999999999999 160.7000000000001 164.4999999999999 163.9000000000002C164.1999999999999 164.2000000000002 167.9999999999999 162.8000000000001 167.5999999999999 163.1000000000001C161.6999999999999 167.1000000000001 156.5999999999999 172.3000000000001 152.5999999999999 178.3000000000001C148.4999999999999 185.7000000000001 148.0999999999999 194.7000000000001 151.5999999999999 202.4000000000001C153.6999999999999 206.2000000000001 156.9999999999999 209.3000000000001 160.8999999999999 211.1000000000001C163.8999999999999 209.6000000000001 165.6999999999999 208.5000000000001 165.6999999999999 208.5000000000001S164.3999999999999 211.0000000000001 163.5999999999999 212.3000000000001C163.9 212.4000000000001 164.0999999999999 212.3000000000001 164.4 212.5000000000001C167 211.4000000000001 172.7 208.5000000000001 175.8 206.7000000000001C177.9 205.6000000000001 179.6 204.0000000000001 181 202.0000000000001C181 202.0000000000001 182 202.5000000000001 181.3 204.7000000000001C180.2 207.4000000000001 178.4 209.7000000000001 175.9 211.3000000000001H176.0999999999999C178.4 210.1000000000001 180.5999999999999 208.7000000000001 182.6999999999999 207.2000000000001C184.5999999999999 211.6000000000001 185.5 216.4000000000001 185.2999999999999 221.2000000000001C185.4999999999999 223.8000000000001 185.0999999999999 226.5000000000001 184.1999999999999 229.0000000000001C183.3999999999999 230.6000000000001 184.6999999999999 231.2000000000001 186.0999999999999 229.5000000000001C185.9 230.8000000000002 185.4 232.0000000000001 184.9 233.2000000000001V233.3000000000001S185.7 234.4000000000001 186.0999999999999 234.8000000000001C187.0999999999999 235.8000000000001 188.1999999999999 236.7000000000001 189.5 237.5000000000001C196.6999999999999 242.0000000000001 204.3 245.9000000000001 212.1999999999999 249.1000000000001C218.5999999999999 251.9000000000001 223.8999999999999 254.0000000000001 225 254.7000000000001C226.6 255.7000000000001 228.1 256.9000000000001 229.5 258.2000000000001C234.8 262.7000000000001 238.5 269.0000000000001 239.7 275.9000000000001C239.8 276.8000000000001 239.8999999999999 277.7000000000001 240 278.7000000000001V280.2000000000001C239.1 283.7000000000001 233.1 286.3000000000001 201.5999999999999 289.3000000000001C190.5 291.1000000000001 181.5999999999999 299.4000000000001 179.0999999999999 310.4000000000001V310.3000000000001C178.6999999999999 309.2000000000001 178.1999999999999 308.0000000000001 177.7999999999999 306.8000000000001C178.1999999999999 308.0000000000001 178.5999999999999 309.1000000000001 179.0999999999999 310.3000000000001V310.5000000000001C185.0999999999999 326.2000000000001 195.9 339.6 209.9 348.8000000000001C210.7 349.5000000000001 206.7 348.6 207.5 349.3000000000001C210.1999999999999 350.6 212.9 351.8000000000001 215.6999999999999 352.8000000000001C217.0999999999999 353.4000000000001 209.6999999999999 356.2000000000001 203.0999999999999 355.5000000000001C199.0999999999999 355.3000000000001 195.0999999999999 354.3000000000001 191.4 352.7000000000001C193 354.0000000000001 197.5999999999999 355.8000000000001 196.5 355.8000000000001C188.0999999999999 354.2000000000001 180 351.1 172.5999999999999 346.8000000000001C172.5999999999999 347.6 172.6999999999999 348.3000000000001 173.0999999999999 349.0000000000001C167.1999999999999 346.5000000000001 162.0999999999999 342.5000000000001 158.0999999999999 337.5000000000001C158.1999999999999 338.4000000000001 158.2999999999999 339.3000000000001 158.2999999999999 340.2000000000001C155.5999999999999 338.2000000000001 153.0999999999999 335.9000000000001 150.9999999999999 333.3000000000001L150.8999999999999 333.2000000000001C133.4999999999999 339.9000000000001 114.5999999999999 341.5000000000001 96.2999999999999 337.9000000000001L96.0999999999999 338.0000000000001H96.2999999999999C92.4999999999999 341.1 89.1999999999999 344.7000000000001 86.5999999999999 348.9000000000001L86.3999999999999 348.8000000000001L85.9999999999999 349.0000000000001C84.7999999999999 350.8000000000001 83.5999999999999 352.8000000000001 82.2999999999999 355.0000000000001C81.3999999999999 356.6000000000001 80.4999999999999 358.4000000000001 79.5999999999999 360.2000000000001C79.5999999999999 360.3000000000001 79.4999999999999 360.4000000000001 79.3999999999999 360.4000000000001C78.9999999999999 360.4000000000001 78.7999999999999 358.7000000000001 78.4999999999999 359.1000000000001V359.2000000000001C75.2999999999999 367.5000000000001 73.7999999999999 376.4000000000001 74.0999999999999 385.4000000000001L73.8999999999999 385.3000000000001C68.7999999999999 381.8000000000001 64.8999999999999 376.7000000000001 62.7999999999999 370.8000000000001C61.8999999999999 368.7000000000001 61.1999999999999 367.5000000000001 60.5999999999999 366.3000000000001V366.8000000000001C60.6999999999999 367.9000000000001 61.1999999999999 370.1000000000001 61.0999999999999 369.9000000000001C60.9999999999999 369.7000000000001 60.8999999999999 369.6000000000001 60.7999999999999 369.5000000000001C59.2999999999999 367.8000000000001 57.8999999999999 365.8000000000001 56.8999999999999 363.7000000000001C55.9999999999999 361.8000000000001 55.1999999999999 359.8000000000001 54.5999999999999 357.8000000000001C54.4999999999999 357.5000000000001 54.5999999999999 358.1 54.5999999999999 358.8000000000001S54.6999999999999 360.8000000000001 54.5999999999999 360.5000000000001L54.2999999999999 359.8000000000001C47.5999999999999 344.9000000000001 43.3999999999999 329.0000000000001 41.8999999999999 312.7000000000001C41.4999999999999 309.9000000000001 41.2999999999999 307.1 41.3999999999999 304.4000000000001V304.2000000000001C36.5999999999999 299.0000000000001 32.3999999999999 293.2000000000001 28.6999999999999 287.1C16.5999999999999 266.7000000000001 7.5999999999999 244.6000000000001 1.8999999999999 221.5000000000001C5.8999999999999 230.3000000000001 10.6999999999999 238.7000000000001 16.1999999999999 246.6000000000001C5.5 219.5 0 190.6 0 161.4C1.8 170 4.2 178.4 7 186.7C5.3 152.2 11.9 117.8 26.4 86.4C45.8 42.9 78 6.4 118.7 -18.3C135.3 -29.5 153.4 -38.2 172.5 -44.1C175 -45 177.6 -45.9 180.2 -46.8C179.4 -46.5 178.6 -46.1 177.8 -45.8C200.4 -52.6 224 -56.1 247.6 -56.1C331.3 -56.1 358.9 -24.2 361.4 -21.1C365.5 -17.4 368.9 -12.9 371.3 -7.8C372.9 -7.1 374.5 -6.4 376.2 -5.7L377.2 -5.2L379.0999999999999 -4.3C391.7 1.6 403.5999999999999 9.1 414.3999999999999 17.8C430.7 29.5 442.2999999999999 46.5 447.2999999999999 65.9C450.2999999999999 73.0000000000001 450.3999999999999 80.9 447.6999999999999 88.1C448.5999999999999 89.5 449.3999999999999 90.9 450.3999999999999 92.4C468.3999999999999 121.3 478.5999999999999 154.3 479.9999999999999 188.3000000000001V191.1000000000001C479.9999999999999 198.4000000000001 479.3999999999999 205.6000000000001 478.0999999999999 212.7000000000001z" />
-    <glyph glyph-name="first-order-alt"
-      unicode="&#xF50A;"
-      horiz-adv-x="496" d=" M248 440C111.03 440 0 328.9700000000001 0 192S111.03 -56 248 -56S496 55.03 496 192S384.9700000000001 440 248 440zM248 -48.21C115.34 -48.21 7.79 59.34 7.79 192S115.34 432.21 248 432.21S488.21 324.66 488.21 192S380.6600000000001 -48.21 248 -48.21zM248 411.7100000000001C126.66 411.71 28.29 313.3400000000001 28.29 192S126.66 -27.71 248 -27.71S467.71 70.66 467.71 192S369.34 411.71 248 411.71zM248 -19.51C131.19 -19.51 36.49 75.18 36.49 192S131.19 403.51 248 403.51S459.51 308.81 459.51 192S364.81 -19.51 248 -19.51zM434.23 143.47A191.613 191.613 0 0 0 414.1 94.78L339.9700000000001 130.66L401.4500000000001 75.84A193.515 193.515 0 0 0 364.2500000000001 38.55L309.4500000000001 100.12L345.3300000000001 25.85A190.94399999999996 190.94399999999996 0 0 0 296.7000000000001 5.62L269.4100000000001 84.09L274.2000000000001 1.16C265.5900000000001 -0.02 256.8000000000001 -0.64 247.8700000000001 -0.64S230.1500000000001 -0.02 221.5400000000001 1.16L226.3000000000001 83.62L199.1500000000001 5.59A191.365 191.365 0 0 0 150.5000000000001 25.79L186.4300000000001 100.13L131.5600000000001 38.49A193.85 193.85 0 0 0 94.3400000000001 75.77L155.9300000000001 130.67L81.6700000000001 94.74A191.638 191.638 0 0 0 61.5300000000001 143.43L139.3700000000001 170.54L57.1400000000001 165.78C55.9800000000001 174.35 55.3600000000001 183.1 55.3600000000001 191.99C55.3600000000001 200.99 55.9900000000001 209.83 57.1800000000001 218.5L139.5600000000001 213.7299999999999L61.6200000000001 240.89A191.726 191.726 0 0 0 81.8500000000001 289.56L156.0700000000001 253.64L94.55 308.5A193.85 193.85 0 0 0 131.8300000000001 345.7199999999999L186.59 284.19L150.7600000000001 358.36A191.48999999999998 191.48999999999998 0 0 0 199.4100000000001 378.49L226.2800000000001 301.24L221.5700000000001 382.85C230.1800000000001 384.03 238.9600000000001 384.65 247.8900000000001 384.65S265.6 384.03 274.2100000000001 382.85L269.4700000000001 300.69L296.5200000000001 378.45C313.79 373.95 330.1200000000001 367.1 345.1500000000001 358.28L309.3300000000001 284.16L364.0500000000001 345.63A193.12999999999997 193.12999999999997 0 0 0 401.2900000000001 308.4L339.8400000000001 253.63L413.9600000000001 289.49A191.51499999999996 191.51499999999996 0 0 0 434.1600000000001 240.84L356.3500000000001 213.74L438.5900000000001 218.49C439.7800000000001 209.83 440.4100000000001 200.99 440.4100000000001 192C440.4100000000001 183.12 439.8000000000001 174.37 438.6300000000001 165.81L356.5100000000001 170.56L434.2300000000002 143.47z" />
-    <glyph glyph-name="first-order"
-      unicode="&#xF2B0;"
-      horiz-adv-x="448" d=" M12.9 218.8C13 218.9 13.1 219.1 13.2 219.2C13.2 219.1 13.2 218.9 13.1 218.8H12.9zM224 351.4C216.9 351.4 209.4 350.8 202.6 349.7L206.3 282.3L184.3 346.3C170 342.6 156.6 336.9 144.3 329.7000000000001L173.7 268.3L128.6 319.2000000000001C117.2 310.3 106.9 300.1 98 288.3L148.6 242.9L87.5 272.6C80.4 260.3 74.6 246.9 70.9 232.6L135.2 210L67.2 214C66.3 206.9 65.8 199.4 65.8 192S66.4 177.4 67.2 170.3L134.9 174.3L70.9 151.7C74.6 137.4 80.3 124 87.5 111.4L148.6 141.1L97.7 96C106.6 84.3 116.8 73.7 128.6 65.1L173.5 116L144 54.6C156.3 47.2 169.7 41.5 184 37.7L206.3 102.3000000000001L202.3 34.3000000000001C209.4 33.2 216.9 32.6000000000001 224 32.6000000000001C231.4 32.6000000000001 238.6 33.2000000000001 245.7 34.3000000000001L241.7 102.9000000000001L264.3 37.8000000000001C278.6 41.8000000000001 292 47.2 304.3 54.7L274.9 116L319.8 65.1C331.5 74 341.8 84.2000000000001 350.4 96L299.8 141.1L360.9 111.7000000000001C368 124.0000000000001 373.8 137.4 377.5 152.0000000000001L313.5 174.3000000000001L380.9 170.3000000000001C382 177.4000000000001 382.3 184.6000000000001 382.3 192.0000000000001S382 206.9000000000001 380.9 214.0000000000001L313.2 210.0000000000001L377.2 232.3000000000001C373.5 246.6000000000001 368.1 260.3000000000001 360.6 272.6000000000001L299.7 242.9000000000001L350.3 288.3000000000001C341.4000000000001 300.0000000000001 331.2 310.3000000000001 319.7 319.2000000000001L274.6 268.3000000000001L304 329.4000000000001C291.7 336.8000000000001 278.3 342.5000000000001 264 346.3000000000001L241.7 282L245.7 349.7C238.6 350.9 231.4 351.4 224 351.4zM443.4 320V64L224 -64L4.6 64V320L224 448L443.4 320zM426.3 309.7L224 427.1L21.7 309.7V74.6L224 -43.1L426.3 74.6V309.7zM224 410.9L411.7 301.5V82.6L224 -26.9L36.3 82.6V301.4L224 410.9zM224 360C131.7 360 57.1 284.9 57.1 192C57.1 99.4 131.7 24.3 224 24.3C316 24.3 390.9 99.4 390.9 192C390.9 284.9 316 360 224 360z" />
-    <glyph glyph-name="firstdraft"
-      unicode="&#xF3A1;"
-      horiz-adv-x="384" d=" M384 256H320V128H192V0H0V25.6H166.4V153.6H294.4V281.6H384V256zM358.4 217.6V89.6H230.4V-38.4H64V-64H256V64H384V217.6H358.4zM384 25.6H294.4V-64H320V0H384V25.6zM0 448V64H128V192H256V320H384V448H0z" />
-    <glyph glyph-name="flickr"
-      unicode="&#xF16E;"
-      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM144.5 129C109.4 129 81 157.4 81 192.5S109.4 256 144.5 256S208 227.6 208 192.5S179.6 129 144.5 129zM303.5 129C268.4 129 240 157.4 240 192.5S268.4 256 303.5 256S367 227.6 367 192.5S338.6 129 303.5 129z" />
-    <glyph glyph-name="flipboard"
-      unicode="&#xF44D;"
-      horiz-adv-x="448" d=" M0 416V-32H448V416H0zM358.4 236.8H268.8V147.2000000000001H179.2V57.6H89.6V326.4H358.4V236.8z" />
-    <glyph glyph-name="fly"
-      unicode="&#xF417;"
-      horiz-adv-x="384" d=" M197.8 20.2C210.7 8.5 231.5 -13.1 231 -30.5C231 -31.3 230.9 -32.1 230.9 -33C229.1 -52.8 212.1 -64.1 191.8 -64C166.8 -63.9 151.9 -47.2 153.1 -28.2C154.1 -12 173.6 8.5 185.5 19.4C187.8000000000001 21.5000000000001 188.2 22.1 191.1 23.0000000000001C194.5 23.0000000000001 195 22.7 197.8 20.2zM331.9 380.7C315.6 406.4 293.3 421.3 268.6 432.8C243.1 443.5 214 448.2 192 448C147.9 448 120.8 434.8 110.9 430.7C57.3 402.8 26.5 360.8 28 289.4C35.1 207.2 125 113.4 183.8 55.6C185.5 54 188.3 51.1 190 50.5L193.3 50.4C195.4 51.1 195.1 50.9 196.8 52.5C249.1 101.7 337.5 198.3 352.7000000000001 268.2C359.7000000000001 307.4 355.8000000000001 340.7 331.9000000000001 380.7zM186.8 96.1C158.8 147.2000000000001 121.6 226.8 117.5 285.1C114.1 332.6 128.9 416.3 186.8 421.8V96.1zM328.7 268C312.3 211.2 251.4 140 209.8 97.7C237.6 149.6 275 231 277 289.6C278.6 335.5 267.2 395.4 229 421C317.8 402.7 344.5 322.9 328.7 268z" />
-    <glyph glyph-name="font-awesome-alt"
-      unicode="&#xF35C;"
-      horiz-adv-x="448" d=" M397.8 380.2C405.6 380.2 412.1 373.6 412.1 365.9V18.3C412.1 10.4999999999999 405.5 3.9999999999999 397.8 3.9999999999999H50.2C42.4 3.9999999999999 35.9 10.6 35.9 18.3V365.8C35.9 373.6 42.5 380.1 50.2 380.1H397.8M397.8 416H50.2C22.7 416 0 393.3 0 365.8V18.2C0 -9.3 22.7 -32 50.2 -32H397.8C425.3 -32 448 -9.3 448 18.2V365.8C448 393.3 425.3 416 397.8 416zM339.3 276.8C333.3 276.8 309.4000000000001 261.3 286.7 261.3C282.5 261.3 278.3 261.9 274.2 263.7000000000001C254.5 271.5 237.2 277.4 215.1 277.4C194.8 277.4 173.3 270.8 155.4 263.7000000000001C153.6 263.1 151.8 262.5 150.6 261.9V279.8C158.4 285.8 163.1 294.7000000000001 163.1 305.5C163.1 323.4 148.8 337.8 130.8 337.8S98.5 323.5 98.5 305.5C98.5 295.3 103.3 285.8 111 279.8V67.7000000000001C111 56.9 120 48.0000000000001 130.7 48.0000000000001C139.7 48.0000000000001 146.8 54.0000000000001 149.2 61.7000000000001V63C149.8 64.8 149.8 66 149.8 67.8V112C151 112 152.2 112.6 152.8 113.2C172.5 121.6 195.8 129.9 218.5 129.9C249.6 129.9 261.5 113.8 287.8 113.8C306.3 113.8 324.2 120.4 339.8 127.5C344 129.3 347 131.1 347 135.3V269.7C348.8 273.8 344.7 276.8 339.3 276.8z" />
-    <glyph glyph-name="font-awesome-flag"
-      unicode="&#xF425;"
-      horiz-adv-x="448" d=" M444.373 88.576C444.373 81.408 438.229 78.336 431.061 75.264C402.389 62.976 371.669 51.712 338.901 51.712C292.821 51.712 271.317 80.384 216.021 80.384C176.085 80.384 134.101 66.048 100.309 50.688C98.261 49.664 96.213 49.664 94.165 48.64V-29.184C94.165 -50.5890000000001 78.043 -64 60.373 -64C40.9169999999999 -64 25.5569999999999 -48.64 25.5569999999999 -29.184V345.6C12.245 355.8400000000001 3.029 372.224 3.029 390.656C3.029 422.4 28.629 448 60.373 448S117.717 422.4 117.717 390.656C117.717 372.224 109.525 355.8400000000001 95.189 345.6V313.856C99.313 315.23 153.957 342.528 209.877 342.528C275.147 342.528 307.553 314.88 336.853 314.88C375.765 314.88 418.773 342.528 429.0130000000001 342.528C437.2050000000001 342.528 444.3730000000001 336.384 444.3730000000001 329.216V88.576z" />
-    <glyph glyph-name="font-awesome"
-      unicode="&#xF2B4;"
-      horiz-adv-x="448" d=" M397.8 416H50.2C22.7 416 0 393.3 0 365.8V18.2C0 -9.3 22.7 -32 50.2 -32H397.8C425.3 -32 448 -9.3 448 18.2V365.8C448 393.3 425.3 416 397.8 416zM352.4000000000001 131.7C352.4000000000001 127.5 348.8 125.7 344.6 123.9C327.9000000000001 116.7 310 110.2 290.8 110.2C263.9000000000001 110.2 251.4 126.9 219.1 126.9C195.8 126.9 171.3 118.5 151.6 109.6C150.4 108.9999999999999 149.2 108.9999999999999 148 108.4V63C148 61.2 148 59.4 147.4 58.2V57C145 48.6 137.2000000000001 42.7 128.3000000000001 42.7C117.0000000000001 42.7 108 51.7 108 63V281.6C100.2000000000001 287.6 94.9000000000001 297.1 94.9000000000001 307.9C94.9000000000001 326.4 109.8000000000001 341.4 128.4 341.4C146.9 341.4 161.9 326.5 161.9 307.9C161.9 297.1 157.1 287.6 148.8000000000001 281.6V263.1C150.6000000000001 263.7 152.4 264.3 154.2000000000001 265.5C172.7000000000001 273.3 194.8000000000001 279.8 215.7000000000001 279.8C238.4000000000001 279.8 256.3000000000001 273.8 276.6 266.1C280.8 264.3 285 263.7000000000001 289.7000000000001 263.7000000000001C312.4000000000001 263.7000000000001 337.5000000000001 279.8 343.5000000000001 279.8C348.3000000000001 279.8 352.5000000000001 276.2000000000001 352.5000000000001 272V131.7z" />
-    <glyph glyph-name="fonticons-fi"
-      unicode="&#xF3A2;"
-      horiz-adv-x="384" d=" M114.4 224H206.8L191.6 172.8H115.2V15C115.2 7 112.4 5.8 119.6 5L179.2 -0.6V-35H0V0.2L29.2 3C36.4 3.8 38.4 6.2 38.4 13.8V169.6C38.4 172.8 34.4 172.8 30.4 172.8H0V224H38.4V252.8C38.4 320.8 74.8 348.8 144.4 348.8C191.2 348.8 233.2 337.6 233.2 276.4L163.6 268C164 293.6 157.6 299.6 141.2 299.6C116 299.6 115.2 286 115.2 262V230C115.2 226.8 110.4 224 114.4 224zM384 -35H243.2V-0.6L271.2 3C278.4 3.8 281.6 5.4 281.6 13V161C281.6 166.6 277.6 170.2 272.4 171.8L239.2 180.6L248.4 221H358.4V13C358.4 5 354.8 4.2 362.4 3L384 -0.6V-35zM354 312.2L366.4 266.6L356.4 256.6L313.6 279.4L270.8 256.6L260.8 266.6L273.2 312.2L243.2 348.6L248 358.6H286L307.2 397H320L341.2 358.6H379.2L384 345.4L354 312.2z" />
-    <glyph glyph-name="fonticons"
-      unicode="&#xF280;"
-      horiz-adv-x="448" d=" M0 416V-32H448V416H0zM167.4 220H234.8L223.7 182.7H168V69.8C168 63.9999999999999 166 63.1 171.2 62.4999999999999L214.7 58.3999999999999V33.2999999999999H84V59L105.3 61C110.5 61.6 112 63.3 112 68.9V180.3C112 182.6 109.1 182.6 106.2 182.6H84V220H112V241C112 290.6 138.5 311 189.3 311C223.4 311 254 302.8 254 258.2L203.3 252.1C203.6 270.8 198.9 275.1 187 275.1C168.6 275.1 168 265.2 168 247.7V224.4C168 222 164.5 220 167.4 220zM364 33.3H261.3V58.4L281.7 61.0000000000001C286.9 61.6000000000001 289.3 62.7000000000001 289.3 68.3000000000001V176.2C289.3 180.3 286.4000000000001 182.9 282.6 184.1L258.4000000000001 190.5L265.1 220H345.3V68.3C345.3 62.4999999999999 342.7 61.9 348.2 60.9999999999999L363.9 58.3999999999999V33.2999999999999zM342.1 288.8L351.1 255.6L343.8 248.3L312.6 264.9L281.4000000000001 248.3L274.1 255.6L283.1 288.8L261.3 313L264.8 322.6H292.5L308 350.6H317.3L332.8 322.6H360.5L364 313L342.1 288.8z" />
-    <glyph glyph-name="fort-awesome-alt"
-      unicode="&#xF3A3;"
-      horiz-adv-x="512" d=" M211.7 206.9V155.2C211.7 153.1 210.1 151.5 208 151.5H185.8C183.7 151.5 182.1 153.1 182.1 155.2V206.9C182.1 209 183.7 210.6 185.8 210.6H208C210.1 210.6 211.7 209 211.7 206.9zM326.2 210.6H304C301.9 210.6 300.3 209 300.3 206.9V155.2C300.3 153.1 301.9000000000001 151.5 304 151.5H326.2C328.3 151.5 329.9 153.1 329.9 155.2V206.9C329.8 209 328.2 210.6 326.2 210.6zM297.1 -52.6C296.2 -52.7 295.4 -52.9 294.5 -53C293.5 -53.2 292.3999999999999 -53.3 291.3999999999999 -53.5C290.5 -53.6 289.5999999999999 -53.8 288.5999999999999 -53.9C287.5999999999999 -54 286.5999999999999 -54.2 285.5999999999999 -54.3C284.5999999999999 -54.4 283.5999999999999 -54.4999999999999 282.7 -54.6C281.7 -54.7 280.8 -54.8 279.8 -54.9C278.8 -55 277.7 -55.1 276.7 -55.2C275.8 -55.3 274.8999999999999 -55.4 274 -55.4C272.8999999999999 -55.5 271.7 -55.5 270.6 -55.6C269.8 -55.6 268.9 -55.7 268.1 -55.7C266.8 -55.8 265.5 -55.8 264.2 -55.8C263.5 -55.8 262.8 -55.9 262.1 -55.9C260.1 -55.9 258.1 -56.0000000000001 256.1 -56.0000000000001S252.1 -56.0000000000001 250.1 -55.9C249.4 -55.9 248.7 -55.9 248 -55.8C246.7 -55.8 245.4 -55.7 244.1 -55.7C243.3 -55.7 242.4 -55.6 241.6 -55.6C240.5 -55.4999999999999 239.3 -55.4999999999999 238.2 -55.4C237.3 -55.3 236.4 -55.3 235.5 -55.2C234.5 -55.1 233.4 -55 232.4 -54.9C231.4 -54.8 230.5 -54.7 229.5 -54.6C228.5 -54.4999999999999 227.5 -54.4 226.6 -54.3C225.6 -54.1999999999999 224.6 -54.1 223.6 -53.9C222.7 -53.8 221.8 -53.6 220.8 -53.5C219.8 -53.4 218.7 -53.2 217.7 -53C216.8 -52.9 216 -52.7 215.1 -52.6C149.5 -41.7 92.6 -4.9 55.1 46.8C54.9 46.9999999999999 54.8 47.3 54.6 47.4999999999999C53.8 48.6 53 49.6999999999999 52.3 50.8C52 51.1999999999999 51.7 51.6 51.5 51.9999999999999C50.8 53.1 50.1 54.1 49.4 55.1999999999999C49.1 55.6999999999999 48.8 56.0999999999999 48.5 56.5999999999999C47.8 57.6999999999999 47.1 58.6999999999999 46.5 59.7999999999999C46.2 60.2999999999999 45.9 60.6999999999999 45.6 61.1999999999999C44.9 62.2999999999999 44.3 63.3999999999999 43.6 64.4999999999999C43.4 64.8999999999999 43.1 65.2999999999999 42.9 65.6999999999999C40.5 69.6999999999999 38.3 73.7999999999999 36.1 77.8999999999999C36 78.0999999999999 35.9 78.1999999999999 35.8 78.3999999999999C35.2 79.4999999999999 34.7 80.5999999999999 34.1 81.6999999999999C33.8 82.2999999999999 33.5 82.7999999999999 33.3 83.3999999999999C32.8 84.3999999999999 32.3 85.4999999999999 31.8 86.4999999999999C31.5 87.1999999999999 31.2 87.7999999999999 30.9 88.4999999999999C30.4 89.4999999999999 30 90.4999999999999 29.5 91.4999999999999L28.6 93.5999999999999C28.2 94.5999999999999 27.7 95.5999999999999 27.3 96.5999999999999C27 97.2999999999999 26.7 98.0999999999999 26.4 98.7999999999999L25.2 101.7999999999999C24.9 102.5999999999999 24.6 103.2999999999999 24.3 104.0999999999999C23.9 105.0999999999999 23.5 106.0999999999999 23.2 107.0999999999999C22.9 107.9999999999999 22.6 108.8999999999999 22.2 109.8999999999999C21.6 111.4999999999999 21.1 113.1999999999999 20.5 114.7999999999999C20.2 115.6999999999999 19.9 116.5999999999999 19.6 117.5999999999999C19.3 118.4999999999999 19.1 119.3999999999999 18.8 120.2999999999999C18.5 121.1999999999999 18.2 122.1999999999999 18 123.0999999999999C17.7 123.9999999999999 17.5 124.8999999999999 17.2 125.7999999999999C16.9 126.7999999999999 16.7 127.6999999999999 16.4 128.6999999999999C16.2 129.5999999999999 15.9 130.4999999999999 15.7 131.3999999999999C15.4 132.3999999999999 15.2 133.3999999999999 15 134.3999999999999C14.8 135.2999999999999 14.6 136.0999999999999 14.4 136.9999999999999C14.2 138.0999999999999 13.9 139.1999999999999 13.7 140.1999999999999C13.5 140.9999999999999 13.4 141.7999999999999 13.2 142.5999999999999C12.9 143.8999999999999 12.7 145.2999999999999 12.4 146.5999999999999C12.3 147.1999999999999 12.2 147.6999999999999 12.1 148.2999999999999L11.2 153.9999999999998C11.1 154.5999999999999 11 155.2999999999999 10.9 155.8999999999998C10.7 157.1999999999998 10.5 158.4999999999998 10.4 159.7999999999998C10.3 160.5999999999998 10.2 161.2999999999998 10.1 162.0999999999998C10 163.2999999999998 9.8 164.4999999999998 9.7 165.6999999999998C9.6 166.4999999999998 9.5 167.2999999999999 9.5 168.0999999999998C9.4 169.2999999999998 9.3 170.4999999999998 9.2 171.5999999999998C9.1 172.3999999999998 9.1 173.1999999999998 9 173.9999999999998C8.9 175.1999999999998 8.8 176.3999999999998 8.8 177.6999999999998C8.8 178.4999999999998 8.7 179.1999999999998 8.7 179.9999999999998C8.6 181.2999999999998 8.6 182.6999999999998 8.5 183.9999999999998C8.5 184.6999999999998 8.5 185.2999999999998 8.4 185.9999999999998C8.4 187.9999999999998 8.3 189.9999999999998 8.3 191.9999999999998C8.3 245.4999999999998 25.2 294.9999999999998 54.1 335.5999999999998C56.4 338.7999999999998 58.8 341.9999999999998 61.2 345.0999999999998C66.1 351.2999999999998 71.3 357.3999999999998 76.8 363.0999999999998C79.5 365.9999999999998 82.3 368.7999999999998 85.2 371.4999999999998C88.1 374.1999999999998 91 376.8999999999998 94 379.4999999999998C98.5 383.3999999999998 103.1 387.0999999999998 107.9 390.6999999999998C109.5 391.8999999999998 111.1 393.0999999999998 112.7 394.1999999999998C140 413.8 171.7 427.9 206 435C222.1 438.3 238.9 440 256 440S289.8 438.3 306 435C340.3 428 372 413.9 399.6 394.3C401.2000000000001 393.1 402.8 392 404.4000000000001 390.8C409.2000000000001 387.2 413.8 383.5 418.3 379.6C430.3 369.2 441.3 357.7 451.1 345.2C453.6 342.1 455.9 338.9 458.2 335.7C487.1 295 504 245.5 504 192C504 190 504 188 503.9 186C503.9 185.3 503.9 184.7 503.8 184C503.8 182.7 503.6999999999999 181.3 503.6 180C503.6 179.2 503.4999999999999 178.5 503.4999999999999 177.7C503.3999999999999 176.5 503.3999999999999 175.3 503.3 177C503.1999999999999 176.2 503.1999999999999 175.4 503.1 174.6C502.9999999999999 173.4 502.9 172.2000000000001 502.8 171.1C502.6999999999999 170.3 502.6 169.5 502.6 168.7000000000001C502.4999999999999 167.5000000000001 502.3 166.3000000000001 502.2 165.1C502.1 164.3 502 163.6 501.9 162.8C501.7 161.5 501.5 160.2 501.4 158.9C501.3 158.3 501.2 157.6 501.1 157.0000000000001L500.2 151.3000000000001C500.1 150.7000000000001 500 150.2000000000001 499.9 149.6000000000001C499.7 148.3000000000001 499.4 146.9000000000001 499.1 145.6000000000001C498.9 144.8000000000001 498.8 144.0000000000001 498.6 143.2000000000001C498.4 142.1000000000001 498.1 141.0000000000001 497.9 140.0000000000001C497.7 139.1000000000001 497.5 138.3000000000001 497.3 137.4000000000001C497.1 136.4000000000001 496.8 135.4000000000001 496.6 134.4000000000001C496.4 133.5000000000001 496.1 132.6000000000001 495.9 131.7000000000001C495.6 130.7000000000001 495.4 129.8000000000001 495.1 128.8000000000001C494.9 127.9000000000002 494.6 127.0000000000001 494.3 126.1000000000001C493.9999999999999 125.2000000000002 493.6999999999999 124.2000000000002 493.4999999999999 123.3000000000001C493.1999999999999 122.4000000000002 492.9999999999999 121.5000000000001 492.6999999999999 120.6000000000001C492.3999999999999 119.7000000000002 492.0999999999999 118.8000000000001 491.8 117.8000000000001C491.3 116.2000000000001 490.6999999999999 114.5000000000001 490.1 112.9000000000002C489.8 112.0000000000002 489.4999999999999 111.1000000000001 489.1 110.1000000000001C488.7 109.1000000000001 488.4 108.1000000000001 487.9999999999999 107.1000000000001C487.6999999999999 106.3000000000001 487.3999999999999 105.6000000000001 487.1 104.8000000000001L485.9 101.8000000000001C485.6 101.1000000000001 485.3 100.3000000000001 485 99.6000000000001C484.6 98.6000000000001 484.2 97.6000000000001 483.7 96.6000000000001L482.8 94.5000000000001C482.4 93.5000000000001 481.9 92.5000000000001 481.4 91.5000000000001C481.1 90.8000000000001 480.8 90.2000000000001 480.5000000000001 89.5000000000001C480.0000000000001 88.5000000000001 479.5000000000001 87.4000000000001 479.0000000000001 86.4000000000001C478.7 85.8000000000001 478.4 85.3000000000001 478.2 84.7000000000001C477.6 83.6000000000001 477.1 82.5000000000001 476.5000000000001 81.4000000000001C476.4 81.2000000000001 476.3000000000001 81.1000000000001 476.2 80.9000000000001C474.0000000000001 76.8000000000001 471.8000000000001 72.7000000000001 469.4 68.7000000000001C469.2 68.3000000000001 468.9 67.9000000000001 468.7 67.5000000000001C468.0000000000001 66.4000000000001 467.4 65.3000000000001 466.7 64.2000000000001C466.4 63.7000000000001 466.1 63.3000000000001 465.8000000000001 62.8000000000001C465.1000000000001 61.7000000000001 464.4000000000001 60.7000000000001 463.8000000000001 59.6000000000001C463.5000000000001 59.1000000000001 463.2 58.7000000000002 462.9000000000001 58.2000000000002C462.2000000000001 57.1000000000001 461.5000000000001 56.1000000000001 460.8000000000001 55.0000000000002C460.5000000000001 54.6000000000002 460.2 54.2000000000002 460.0000000000001 53.8000000000002C459.2 52.7000000000002 458.5000000000001 51.6000000000002 457.7 50.5000000000002C457.5000000000001 50.3000000000002 457.4 50.0000000000002 457.2 49.8000000000002C419.6 -4.8999999999998 362.7000000000001 -41.5999999999998 297.1 -52.5999999999998zM414.4 33.6C427.4 46.6 438.6 60.9999999999999 448 76.4999999999999V147.8C448 149.9 446.4 151.5 444.3 151.5H422.1C420 151.5 418.4000000000001 149.8999999999999 418.4000000000001 147.8V122H388.9000000000001V266C388.9000000000001 268.1 387.3 269.7 385.2000000000001 269.7H363.1C361 269.7 359.4000000000001 268.1 359.4000000000001 266V240.1H329.9000000000001V266C329.9000000000001 268.1 328.3 269.7 326.2000000000001 269.7H304C301.9 269.7 300.3 268.1 300.3 266V240.1H270.8V266C270.8 270.8 264.3 269.7 261.3 269.7V300.4C268 302 275.1 303.2 282.1 303.2C290.9000000000001 303.2 298.9000000000001 299.7 307.5 299.7C311.2 299.7 329.9 300.6 329.9 306.2V354.6C329.9 356.7 328.3 358.3 326.2 358.3C322 358.3 314 354.8 306.8 354.8C298.9000000000001 354.8 289.9000000000001 358.3 280.5 358.3C274 358.3 267.6 357.4 261.3 356V359.9C265.7 362 268.7 366.6 268.7 371.4C268.7 388.2 243.3 388.2 243.3 371.4C243.3 366.6 246.3 361.9 250.7 359.9V269.7C247.7 269.7 241.2 270.8 241.2 266V240.1H211.7V266C211.7 268.1 210.1 269.7 208 269.7H185.8C183.7 269.7 182.1 268.1 182.1 266V240.1H152.6V266C152.6 268.1 151 269.7 148.9 269.7H126.8000000000001C124.7000000000001 269.7 123.1 268.1 123.1 266V122H93.5V147.8C93.5 149.9 91.9 151.5 89.8 151.5H67.7C65.6 151.5 64 149.9 64 147.8V76.5C73.4 61 84.6 46.6 97.6 33.6C118.2 13 142.1 -3.1 168.8 -14.4C182.7 -20.3 197 -24.7 211.7 -27.6V48.2C211.7 106.8000000000001 300.3 106.8000000000001 300.3 48.2V-27.6C315 -24.7 329.3 -20.2 343.2 -14.4C369.9 -3.1 393.8 13 414.4 33.6" />
-    <glyph glyph-name="fort-awesome"
-      unicode="&#xF286;"
-      horiz-adv-x="512" d=" M489.2 160.1H461.8C459.2 160.1 457.2 158.1 457.2 155.5V123.5H420.6V301.8C420.6 304.4 418.6 306.4 416 306.4H388.6C386 306.4 384 304.4 384 301.8V269.8H347.3999999999999V301.8C347.3999999999999 304.4 345.3999999999999 306.4 342.7999999999999 306.4H315.3999999999999C312.7999999999999 306.4 310.7999999999999 304.4 310.7999999999999 301.8V269.8H274.1999999999999V301.8C274.1999999999999 307.8 266.1999999999999 306.4 262.4999999999999 306.4V344.4C270.7999999999999 346.4 279.5999999999999 347.8 288.1999999999999 347.8C299.0999999999999 347.8 309.0999999999999 343.5 319.5999999999999 343.5C324.1999999999999 343.5 347.2999999999999 344.6 347.2999999999999 351.5V411.5C347.2999999999999 414.1 345.2999999999999 416.1 342.6999999999998 416.1C337.5999999999998 416.1 327.5999999999998 411.8 318.6999999999998 411.8C308.9999999999999 411.8 297.7999999999999 416.1 286.0999999999998 416.1C278.0999999999998 416.1 270.0999999999998 415 262.3999999999998 413.2000000000001V418.1C267.7999999999998 420.7000000000001 271.4999999999999 426.4000000000001 271.4999999999999 432.4000000000001C271.4999999999999 453.1 240.0999999999998 453.2 240.0999999999998 432.4000000000001C240.0999999999998 426.4000000000001 243.7999999999998 420.7000000000001 249.1999999999998 418.1V306.4C245.4999999999999 306.4 237.4999999999999 307.8 237.4999999999999 301.8V269.8H200.8999999999998V301.8C200.8999999999998 304.4 198.8999999999998 306.4 196.2999999999999 306.4H168.8999999999998C166.2999999999999 306.4 164.2999999999999 304.4 164.2999999999999 301.8V269.8H128V301.8C128 304.4 126 306.4 123.4 306.4H96C93.4 306.4 91.4 304.4 91.4 301.8V123.5H54.8V155.5C54.8 158.1 52.8 160.1 50.2 160.1H22.8C20.2 160.1 18.2 158.1 18.2 155.5V-64H201.1V32C201.1 104.6 310.8 104.6 310.8 32V-64H493.7V155.5C493.8000000000001 158.1 491.8000000000001 160.1 489.2 160.1zM201.1 164.6C201.1 162 199.1 160 196.5 160H169.1C166.5 160 164.5 162 164.5 164.6V228.6C164.5 231.2 166.5 233.2 169.1 233.2H196.5C199.1 233.2 201.1 231.2 201.1 228.6V164.6zM347.5 164.6C347.5 162 345.5 160 342.9 160H315.5C312.9 160 310.9 162 310.9 164.6V228.6C310.9 231.2 312.9 233.2 315.5 233.2H342.9C345.5 233.2 347.5 231.2 347.5 228.6V164.6z" />
-    <glyph glyph-name="forumbee"
-      unicode="&#xF211;"
-      horiz-adv-x="448" d=" M5.8 138.3C2 155.3 0 172.5 0 189.7C0 313 99.8 413 223.1 413C239.7 413 256.4 411 272.4 407.5C149 360.5 51.9 262 5.8 138.3zM398.7 327.5C385 345 369 360.2 350.9 372.8C201.3 328.5 84.6 210.7 41.2 60.8C53.7 42.7 69.2 25.2 86.4 11.8C129.5 163.1 247.6 283.5 398.7 327.5zM414.5 74.8C429.7 99.9 439.9 128.5 444 157.6C364.6 114.7000000000001 299 47 256.4 -32.7C286.4 -28.3 315.3 -17.4 341 -1.4C376 -14.5 411.9 -25.7 448 -35C438.7 1.5 427.6 39.5 414.5 74.8zM444.2 220.3C441.6 239.8 436.3 259 428.4 277.1C290.5 231.3 182 120.5 137.1 -18C155.2 -25.6 174.1 -30.5 193.7 -33.2C240 80.9 330.5 173.6 444.2 220.3z" />
-    <glyph glyph-name="foursquare"
-      unicode="&#xF180;"
-      horiz-adv-x="368" d=" M323.1 445H49.9C12.4 445 0 416.7 0 398.9V-34.9C0 -55.2 12.1 -62.6 18.2 -65C24.4 -67.5 41 -69.6 51.1 -57.9C180 91.5 182.2 94 182.2 94C185.3 97.4 185.6 97.1 189 97.1H272.4C307.5 97.1 313 122.3 316.7 136.8L365.3 379.8C373.8 422.2 363.1 445 323.1 445zM306.8 371.2L295.4000000000001 311.5C294.2000000000001 305 285.9000000000001 298.3 278.5000000000001 298.3H172.1C160.1 298.3 151.5 290 151.5 278V265C151.5 253 160.1 244.4 172.1 244.4H262.5C270.8 244.4 279.1 235.2 277.3 226.2C275.5 217.3 266.8 172.4 265.9000000000001 167.4C265.0000000000001 162.5000000000001 259.1 153.9 249.0000000000001 153.9H175.5C162 153.9 158.3000000000001 152.1 149 141.3C149 141.3 140.1 129.9 59.5 33C58.6 32.1 57.7 32.4 57.7 33.3V372.1C57.7 379.8 64.5 388.7 74.3 388.7H293.3000000000001C301.5000000000001 388.7 308.9000000000001 381 306.8000000000001 371.2z" />
-    <glyph glyph-name="free-code-camp"
-      unicode="&#xF2C5;"
-      horiz-adv-x="576" d=" M69.3 303.5C28.3 235 32.9 140.5 70.3 76.5C92.5 38.3 120 24.1 120 10C120 3.2 114 -3 107.2 -3C87.7 -3 8 72.5 8 194.8C8 306.3 86 380.8 105.1 380.8C111.1 380.8 120 376 120 369.7000000000001C120 357 91.7 341.1 69.3 303.5zM265.1 89.7C269.6 87.9 277.4000000000001 84.5 277.4000000000001 90.9C277.4000000000001 93.6 275.2000000000001 93.8 273.1 94.5C264.6 97.9 259.1 102.2 254.0000000000001 109.7C245.8000000000001 121.8 243.9000000000001 133.9 243.9000000000001 148.3C243.9000000000001 180.4 288.1 186.2 288.1 218.3C288.1 230.6 280.4000000000001 234.2 280.4000000000001 237.6C280.4000000000001 239.8 281.1 239.8 283.3 239.8C291.3 239.8 302.4000000000001 226.5 305.8 220C308 215.4 308.2 214 308.2 208.9C308.2 201.9 307.5 194.7 307.5 187.6C307.5 160.6 339.4 167.8 339.4 180.8C339.4 186.8 335.8 192.4 335.8 198.2C335.8 198.9 335.8 199.4 336.5 199.4C339.8999999999999 199.4 345.8999999999999 191.7 347.6 189.3C353.4 180.4 356.1 168.5 356.1 157.9C356.1 125.5000000000001 326.6 108.9 326.6 101.9C326.6 100.9 329.5 94.2000000000001 338.7 100.0000000000001C368.4 115.1000000000001 391.8 147.6000000000001 391.8 189.8000000000001C391.8 223.4000000000001 383.1 247.5000000000001 359.7 272.4000000000001C355.8 276.5000000000001 343.3 289.3000000000001 337.2 289.3000000000001C329 289.3000000000001 344.4 270.7000000000001 344.4 258.1000000000001C344.4 250.9000000000001 339.6 245.8000000000001 332.1 245.8000000000001C320.5 245.8000000000001 317.6 271.2000000000001 316.2 279.1000000000001C310.4 312.9000000000001 303.4 337.3000000000001 269.8 353.2000000000001C259.4000000000001 358.2000000000001 233.3 365.0000000000001 233.3 355.4000000000001C233.3 353.0000000000001 236 351.3000000000001 237.9 350.3000000000001C247.1 344.7000000000001 257.5 328.9000000000001 257.5 312.1000000000001C257.5 266.0000000000001 199.8 223.9000000000001 199.8 175.9000000000001C199.6 135.6000000000001 227.9 103.3000000000001 265.1 89.7000000000001zM470.4 381C464.4 381 456 374.5 456 368.4C456 359.7 468.1 348.8 473.6 343C555.2 257.9 552.2 128.7 491.2 52C484.2 43.1 455.9 16.7 455.9 8.5C455.9 3.4 464.1 -2.9 469.1 -2.9C494.5 -2.9 567.9 77.9 567.9 182.8C568 302.1 491.8 381 470.4 381zM428.1 57.9H167C157.6 57.9 151.5 50.4 151.5 41.5C151.5 33 158.5 26 167 26H428.1C437.5 26 440 33.5 440 42.4C440 50.9 436.5 57.9 428.1 57.9z" />
-    <glyph glyph-name="freebsd"
-      unicode="&#xF3A4;"
-      horiz-adv-x="448" d=" M303.7 351.8C314.8 362.9 419.2 428.8 442.9 405C466.6 381.3 400.8 276.9 389.7 265.8C378.6 254.7 350.3 264.9 326.6 288.7000000000001C302.8 312.4 292.5 340.7000000000001 303.7 351.8zM109.9 379.9C73.6 400.5 22 423.4 5.6 406.9C-11 390.3 12.7 337.5 33.5 301.2C52 333.4 78.3 360.5 109.9 379.9zM406.7 274C410 262.7 409.4 253.3 404 247.9C383.7 227.6 316.5 274.9 294.7 318C276.7 350.3 283.6 371.4 309.6 366.7C315.3 370.3 321.9 374.3 329.2 378.3C299.4 393.8 265.6 402.6 229.7 402.6C110.6 402.6 14.1 306.1 14.1 187C14.1 68 110.6 -28.6 229.7 -28.6S445.3 67.9 445.3 187C445.3 225.4 435.2 261.5 417.6 292.8C413.7000000000001 285.8 410 279.5 406.7000000000001 274z" />
-    <glyph glyph-name="fulcrum"
-      unicode="&#xF50B;"
-      horiz-adv-x="269.66" d=" M70.75 283.86L35.37 240.31L0 283.86L35.38 327.4100000000001L70.75 283.86zM119.23 448L98.69 249.82L47.72 192L98.7 134.18L119.23 -64V147.11L78.15 192L119.23 236.89V448zM198.9 283.86L234.28 240.31L269.6600000000001 283.86L234.2800000000001 327.4100000000001L198.9 283.86zM150.42 236.89L191.5 192L150.42 147.11V-64L170.96 134.18L221.94 192L170.96 249.82L150.42 448V236.89z" />
-    <glyph glyph-name="galactic-republic"
-      unicode="&#xF50C;"
-      horiz-adv-x="496" d=" M248 -56C111.25 -56 0 55.25 0 192S111.25 440 248 440S496 328.75 496 192S384.75 -56 248 -56zM248 423.4700000000001C120.37 423.4700000000001 16.53 319.63 16.53 192S120.37 -39.47 248 -39.47S479.47 64.37 479.47 192S375.63 423.4700000000001 248 423.4700000000001zM275.62 401.6600000000001V377.04A185.933 185.933 0 0 0 359.19 342.5L376.58 359.86C347.83 381.92 313.28 396.75 275.62 401.6600000000001zM220.25 401.5900000000001C182.61 396.6500000000001 148.09 381.79 119.37 359.74L136.65 342.38H136.73C160.8 360.2200000000001 189.28 372.4400000000001 220.25 377.05V401.5900000000001zM232.5 351.42V268.55C222.46 266.52 213.08 262.61 204.83 257.13L146.21 315.7200000000001L124.28 293.79L182.95 235.12C177.48 226.89 173.5 217.53 171.48 207.5H88.58V176.5H171.48C173.5 166.48 177.49 157.19 182.95 148.96L124.28 90.27L146.21 68.34L204.83 126.96A77.873 77.873 0 0 1 232.5 115.49V32.5899999999999H263.5V115.4899999999999C273.55 117.5199999999999 282.87 121.5499999999999 291.12 127.0399999999999L349.79 68.3499999999999L371.7200000000001 90.2799999999999L313.05 148.9699999999999C318.51 157.1999999999999 322.5200000000001 166.4899999999999 324.55 176.5099999999999H407.42V207.5099999999999H324.55C322.5300000000001 217.53 318.5200000000001 226.89 313.05 235.13L371.7200000000001 293.8L349.79 315.73L291.12 257.06C282.87 262.55 273.55 266.53 263.5 268.56V351.42H232.5zM415.74 320.7000000000001L398.38 303.3400000000001A186.337 186.337 0 0 0 433.05 219.67H457.67C452.72 257.36 437.8400000000001 291.9600000000001 415.74 320.7000000000001zM80.19 320.5700000000001C58.13 291.85 43.28 257.3100000000001 38.34 219.66H62.99C67.59 250.6200000000001 79.75 279.11 97.58 303.18L80.19 320.57zM38.34 164.33C43.26 126.69 58.09 92.15 80.14 63.43L97.5 80.8199999999999C79.69 104.8899999999999 67.58 133.3899999999999 62.99 164.3399999999999H38.34zM433.04 164.33C428.43 133.34 416.24 104.83 398.37 80.73L415.73 63.37C437.81 92.11 452.71 126.66 457.66 164.33H433.04zM136.66 41.62L119.3 24.26C148.03 2.17 182.6 -12.72 220.26 -17.67V6.97C189.27 11.6 160.73 23.76 136.66 41.62zM359.19 41.57C335.1 23.73 306.61 11.49 275.62 6.9V-17.67C313.29 -12.75 347.83 2.12 376.58 24.18L359.27 41.57H359.19z" />
-    <glyph glyph-name="galactic-senate"
-      unicode="&#xF50D;"
-      horiz-adv-x="512" d=" M249.86 414.52V388.45C236.28 367.83 226 279.86 225.39 173.1C237.13 188.72 244.52 206.43 244.52 221.34V238.2200000000001C244.49 243.54 245.27 248.7500000000001 246.71 253.8700000000001C247.36 256.01 248.1 257.9500000000001 249.33 259.6900000000001C250.56 261.4400000000001 252.76 263.48 256.01 263.48C259.25 263.48 261.46 261.43 262.69 259.6900000000001C263.92 257.9400000000001 264.6600000000001 256.01 265.31 253.8700000000001C266.75 248.7500000000001 267.5300000000001 243.54 267.5 238.2200000000001V221.34C267.5 206.43 274.89 188.72 286.63 173.1C286 279.86 275.72 367.8300000000001 262.14 388.4500000000001V414.52H249.86zM223.52 266.75C214 264.6 204.82 261.56 196.06 257.67C204.96 241.55 205.82 225.03 197.77 220.38C189.77 215.76 175.92 224.61 166.41 240.2C154.83 231.41 144.53 220.88 135.85 209.11C150.58 199.49 158.74 186.19 154.17 178.45C149.63 170.75 134.14 171.31 118.7 179.41C112.92 166.16 108.95 151.9 107.05 136.99C116.73 136.81 125.72 134.61 133.23 130.9499999999999C151.01 131.25 166 132.9099999999999 173.72 135.17C179.2700000000001 161.52 196.7400000000001 183.4 220.04 194.68C220.77 220.23 221.92 244.35 223.52 266.75zM288.48 266.75C290.07 244.35 291.23 220.23 291.9500000000001 194.68C315.2400000000001 183.4 332.7200000000001 161.52 338.2700000000001 135.17C345.9900000000001 132.91 360.98 131.25 378.7600000000001 130.95C386.2700000000001 134.61 395.2600000000001 136.8 404.9400000000001 136.99C403.0400000000001 151.9 399.0800000000001 166.16 393.2900000000001 179.41C377.8500000000001 171.31 362.3600000000001 170.75 357.8200000000001 178.4500000000001C353.2500000000001 186.1900000000001 361.4200000000001 199.5000000000001 376.1400000000001 209.1100000000001C367.4600000000001 220.8800000000001 357.1600000000001 231.4100000000001 345.5800000000001 240.2000000000001C336.0700000000001 224.6100000000001 322.2200000000001 215.7600000000001 314.2200000000001 220.3800000000001C306.17 225.0300000000001 307.0300000000001 241.5400000000001 315.93 257.6700000000001A147.49 147.49 0 0 1 288.48 266.7500000000001zM256 258.15C252.77 258.15 250.14 249.34 249.91 238.22H249.86V221.34C249.86 179.92 200.85 126.3 156.37 126.3C104.37 126.3 33.62 127.75 0 97.13V94.62C9.42 77.5 20.58 61.45 33.18 46.65C45.7 67.74 84.77 87.6 141.2 88C186.88 86.98 220.23 67.67 231.96 47.13C231.97 47.12 231.95 47.09 231.96 47.08C239.63 44.94 247.81 43.85 256 43.87C264.19 43.85 272.37 44.94 280.04 47.08C280.05 47.09 280.03 47.12 280.04 47.13C291.78 67.67 325.12 86.98 370.8 88C427.23 87.61 466.29 67.74 478.8199999999999 46.65C491.42 61.45 502.5799999999999 77.51 511.9999999999999 94.62V97.13C478.3899999999999 127.75 407.63 126.3 355.63 126.3C311.1499999999999 126.3 262.14 179.92 262.14 221.34V238.2200000000001H262.0899999999999C261.8599999999999 249.3400000000001 259.2299999999999 258.1500000000001 255.9999999999999 258.1500000000001zM256 161.56C278.42 161.56 296.6 143.38 296.6 120.96S278.42 80.31 256 80.31S215.4 98.54 215.4 120.96C215.4 143.38 233.58 161.56 256 161.56zM256 153.92C237.81 153.92 223.04 139.15 223.04 120.96S237.81 88 256 88S288.96 102.77 288.96 120.96S274.19 153.92 256 153.92zM256 147.78C270.81 147.78 282.82 135.7700000000001 282.82 120.96S270.81 94.14 256 94.14S229.18 106.15 229.18 120.96S241.19 147.78 256 147.78zM141.2 81.11C131.01 81.04 119.6 80.75 110.7 79.45C111.13 75.03 112.21 60.82 117.81 49.69C126.92 52.25 136.17 53.59 145.43 53.59C186.71 52.65 216.91 19.24 223.69 -20.88L223.8 -25.58C234.2 -27.49 244.99 -28.52 256.01 -28.52C267.04 -28.52 277.82 -27.5 288.22 -25.58L288.33 -20.88C295.11 19.24 325.31 52.65 366.59 53.59C375.85 53.59 385.1 52.2500000000001 394.21 49.6900000000001C399.81 60.8200000000001 400.89 75.03 401.32 79.4500000000001C392.42 80.7500000000001 381 81.03 370.82 81.1100000000001C352.06 80.6900000000001 335.63 76.9400000000001 322.21 71.4400000000001C309.67 55.4100000000001 293.05 41.4100000000001 272.63 38.3700000000001C272.54 38.3500000000001 272.46 38.33 272.36 38.3200000000001C272.31 38.3100000000001 272.25 38.28 272.2 38.27C266.96 37.2 261.57 36.67 256.01 36.67C250.46 36.67 245.06 37.2 239.82 38.27C239.77 38.28 239.71 38.3100000000001 239.66 38.3200000000001C239.56 38.34 239.49 38.3600000000001 239.39 38.3700000000001C218.97 41.4 202.36 55.4100000000001 189.81 71.4400000000001C176.39 76.9300000000001 159.95 80.6900000000001 141.2 81.1100000000001z" />
-    <glyph glyph-name="get-pocket"
-      unicode="&#xF265;"
-      horiz-adv-x="448" d=" M407.6 384H40.6C18.5 384 0 365.5 0 343.4V208.2C0 83.5 99.7 -16 224.2 -16C348.2 -16 448 83.5 448 208.2V343.4C448 365.8 430.3 384 407.6 384zM245.6 115.5C233.2 103.7 214.2 104.4 203.2 115.5C89.5 224.4 88.3 220.6 88.3 238.7C88.3 255.6 102.1 269.4 119 269.4C136 269.4 135.1 265.6 224.2 180.1C314.8 267 312.8 269.4 329.7 269.4C346.6 269.4 360.4 255.6 360.4 238.7C360.4 220.9 357.5 223 245.6 115.5z" />
-    <glyph glyph-name="gg-circle"
-      unicode="&#xF261;"
-      horiz-adv-x="512" d=" M257 440C120 440 9 329 9 192S120 -56 257 -56S505 55 505 192S394 440 257 440zM207.5 65.2L81.8 190.9L207.5 316.6L242.7 281.2L218.5 257L207.4 268.1L130.2 190.9L207.4 113.7L234 140.3L180.9 193.2L205.3 217.6L282.5 140.4L207.5 65.2000000000001zM306.5 67.4L271.3 102.6L295.4000000000001 127L306.5000000000001 115.8999999999999L383.7000000000001 193.0999999999999L306.5000000000001 270.2999999999999L280.0000000000001 243.7999999999999L333.1000000000001 190.8999999999999L308.7000000000001 166.5L231.5000000000001 243.7L306.5000000000001 318.7L432.2 193L306.5 67.4z" />
-    <glyph glyph-name="gg"
-      unicode="&#xF260;"
-      horiz-adv-x="512" d=" M179.2 217.6L281.6 115.2L179.2 12.8L0 192L179.2 371.2L224 326.4L198.4 300.8L179.2 320L51.2 192L179.2 64L230.7 115.5L153.6 192L179.2 217.6zM332.8 371.2L230.4 268.8L332.8 166.4L358.4000000000001 192L281.3000000000001 268.5L332.8000000000001 320L460.8000000000001 192L332.8000000000001 64L313.6000000000001 83.2L288.0000000000001 57.6L332.8000000000001 12.8L512 192L332.8 371.2z" />
-    <glyph glyph-name="git-square"
-      unicode="&#xF1D2;"
-      horiz-adv-x="448" d=" M140.1 99.5C152.2 99.5 169.6 97.4 169.6 81.6C169.6 66.1 155.7 62.8 142.6 62.8C130.3 62.8 111.7 64.8 111.7 80.8S127.4 99.5 140.1 99.5zM115.4 216.1C115.4 201.3 122 192 137.7 192C153.2 192 158.9 202 158.9 216.5C159 250.9 115.4 251.3 115.4 216.1zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM207 274.3C194.7 269.5 181.5 265.9 168.1 265.9C129.6 288 77.4 265 77.4 216.4C77.4 198.4 89 173.5 107 167.5V166.8C93.6 160.9 89.9 130.7 107.7 119.8V119.1C88.2 112.7000000000001 75.4 100.3 75.4 78.9C75.4 42.1 110.2 31.9 140.8 31.9C177.9 31.9 205.6 45.3 205.6 86.2000000000001C205.6 136.6 133.5 118.0000000000001 133.5 145.3000000000001C133.5 154.9000000000001 138.7 158.7000000000001 147.6 160.5000000000001C177.2 166.0000000000001 195.8 189.1000000000001 195.8 219.2000000000001C195.8 224.4 194.7 229.4000000000001 192.9 234.2000000000001C197.7 235.3000000000001 202.4 236.5000000000001 207 238.1000000000001V274.3000000000001zM263.8 272.5H224.2C225.5000000000001 261.9 225.3 129.9 224.2 117H263.8C262.7 129.8 262.6 262.1 263.8 272.5zM268.3 325.8C268.3 339.2 258.3 352 244.2 352C229.9 352 219.6 339.5 219.6 325.8C219.6 312.2 230.1 299.9 244.2 299.9C257.9000000000001 299.9 268.3 312.4 268.3 325.8zM372.6 272.5H336.2000000000001C336.2000000000001 282.3 335.8000000000001 292.1 337.3000000000001 302H296.8000000000001C298.1000000000001 294.7 297.9000000000001 288.4 297.9000000000001 272.5H280.8000000000001V238.6C292.7000000000001 240.5 292.9000000000001 239.3 297.9000000000001 239.3V238.6H297.5000000000001V175.9C297.5000000000001 144.8 302.0000000000001 114.7 340.2000000000001 114.7C350.9000000000001 114.7 363.2000000000001 116.5 372.7000000000001 121.7V156.7C367.0000000000001 152.8 358.8000000000002 150.8 351.8000000000002 150.8C338.6000000000002 150.8 336.3000000000002 163.7 336.3000000000002 174.2V239.4C359.0000000000001 239.4 372.7000000000001 238.7 372.7000000000001 238.7V272.5z" />
-    <glyph glyph-name="git"
-      unicode="&#xF1D3;"
-      horiz-adv-x="448" d=" M18.8 226.3C18.8 201 35 166.3 60.3 157.8V156.8C41.5 148.5 36.3 106.2 61.3 91V90C34 81 16 63.7 16 33.8C16 -17.7 64.8 -32 107.5 -32C159.5 -32 198.2 -13.3 198.2 44C198.2 114.5 97.2 88.5 97.2 126.8C97.2 140.3 104.4 145.5 116.9 148.1C158.4 155.8 184.4 188.1 184.4 230.3C184.4 237.6 182.9 244.5 180.4 251.3C187.1 252.8 193.6 254.6 200.1 256.8V307.3C182.9 300.5 164.4 295.5 145.6 295.5C91.8 326.5 18.8 294.2 18.8 226.3zM106.5 62.5C123.5 62.5 147.7 59.5 147.7 37.5C147.7 15.7 128.2 11.2 110 11.2C92.7 11.2 66.7 13.9 66.7 36.4C66.8 58.7 88.8 62.5 106.5 62.5zM103.3 192C81.3 192 72 205 72 225.8C72 275.1 133 274.6 133 226.3C133 206 125 192 103.3 192zM432 142.5V93.5C418.7 86.2 401.5 83.7 386.5 83.7C333 83.7 326.7 125.9 326.7 169.4V257.1H327.2V258.1C320.2 258.1 319.9 259.7 303.2 257.1V304.6H327.2C327.2 326.9 327.5 335.6 325.7 345.8H382.4C380.4 332 380.9 318.3 380.9 304.6H431.9V257.1S412.6 258.1 380.9 258.1V167C380.9 152.2 384.2 134.2 402.7 134.2C412.5 134.2 424 137 432 142.5zM286 379.3C286 360.6 271.5 343.1 252.2 343.1C232.4 343.1 217.7 360.3 217.7 379.3C217.7 398.6 232.2 416 252.2 416C272 416 286 398 286 379.3zM279.8 304.8C278 290.2000000000001 278.2 105 279.8 87H224.3C225.9 105.1 226.1 290 224.3 304.8H279.8z" />
-    <glyph glyph-name="github-alt"
-      unicode="&#xF113;"
-      horiz-adv-x="480" d=" M186.1 119.3C186.1 98.4 175.2 64.2 149.4 64.2S112.7 98.4 112.7 119.3S123.6 174.4 149.4 174.4S186.1 140.2000000000001 186.1 119.3zM480 169.8C480 137.9 476.8 104.1 462.5 74.8C424.6 -1.8 320.4 0 245.8 0C170 0 59.6 -2.7 20.2 74.8C5.6 103.8 0 137.9 0 169.8C0 211.7 13.9 251.3 41.5 283.4C36.3 299.2000000000001 33.8 315.8 33.8 332.2C33.8 353.7 38.7 364.5 48.4 384C93.7 384 122.7 375 157.2 348C186.2 354.9 216 358 245.9000000000001 358C272.9000000000001 358 300.1 355.1 326.3000000000001 348.8C360.3000000000001 375.5 389.3000000000001 384 434.1000000000001 384C443.9000000000001 364.5 448.7000000000001 353.7 448.7000000000001 332.2C448.7000000000001 315.8 446.1000000000001 299.5 441.0000000000001 284C468.5000000000001 251.6 480.0000000000001 211.7 480.0000000000001 169.8zM415.7 119.3C415.7 163.2 389 201.9 342.2 201.9C323.3 201.9 305.2 198.5 286.2 195.9C271.3 193.6 256.4 192.7 241.1 192.7C225.9 192.7 211 193.6 196 195.9C177.3 198.5 159 201.9 140 201.9C93.2 201.9 66.5 163.2 66.5 119.3C66.5 31.5 146.9 18 216.9 18H265.1C335.4000000000001 18 415.7000000000001 31.4 415.7000000000001 119.3zM333.1 174.4C307.3 174.4 296.4000000000001 140.2000000000001 296.4000000000001 119.3S307.3 64.2 333.1 64.2S369.8 98.4 369.8 119.3S358.9000000000001 174.4 333.1 174.4z" />
-    <glyph glyph-name="github-square"
-      unicode="&#xF092;"
-      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM277.3 32.3C268.9000000000001 30.8 265.8 36 265.8 40.3C265.8 45.7 266 73.3 266 95.6C266 111.2000000000001 260.8 121.1 254.7 126.3C291.7 130.4 330.7 135.5 330.7 199.4C330.7 217.6 324.2 226.7 313.6 238.4C315.3 242.7 321 260.4 311.9 283.4C298 287.7000000000001 266.2 265.5 266.2 265.5C253 269.2 238.7 271.1 224.6 271.1C210.5 271.1 196.2 269.2 183 265.5C183 265.5 151.2 287.7 137.3 283.4C128.2 260.5 133.8 242.8 135.6 238.4C125 226.7 120 217.6 120 199.4C120 135.8 157.3 130.4 194.3 126.3C189.5 122 185.2 114.6 183.7 104C174.2 99.7 149.9 92.3 135.4 117.9C126.3000000000001 133.7 109.9 135 109.9 135C93.7 135.2 108.8 124.8 108.8 124.8C119.6 119.8 127.2000000000001 100.6 127.2000000000001 100.6C136.9 70.9 183.3000000000001 80.9 183.3000000000001 80.9C183.3000000000001 67.0000000000001 183.5 44.4 183.5 40.3C183.5 36 180.5 30.8 172 32.3C106 54.4 59.8 117.2000000000001 59.8 190.6C59.8 282.4000000000001 130 352.1 221.8 352.1S388 282.4 388 190.6C388.1 117.2000000000001 343.3 54.3 277.3 32.3zM179.2 93.4C177.3 93.0000000000001 175.5 93.8 175.3 95.1C175.1 96.6 176.4 97.9 178.3 98.3C180.2 98.5 182 97.7 182.2 96.4C182.5 95.1 181.2 93.8 179.2 93.4zM169.7 94.3C169.7 93 168.2 91.9 166.2 91.9C164 91.7000000000001 162.5 92.8 162.5 94.3C162.5 95.6 164 96.7 166 96.7C167.9 96.9 169.7 95.8 169.7 94.3zM156 95.4C155.6 94.1 153.6 93.5000000000001 151.9 94.1C150 94.5 148.7000000000001 96 149.1 97.3C149.5 98.6 151.5 99.2 153.2 98.8C155.2 98.2 156.5 96.7 156 95.4zM143.7 100.8C142.8 99.7 140.9 99.9 139.4 101.4C137.9 102.7000000000001 137.5 104.6 138.5 105.5000000000001C139.4 106.6000000000001 141.3 106.4 142.8 104.9C144.1 103.6 144.6 101.6 143.7 100.8zM134.6 109.9C133.7 109.3 132 109.9 130.9 111.4S129.8000000000001 114.6 130.9 115.3C132 116.2 133.7000000000001 115.5 134.6 114C135.7 112.5 135.7 110.7 134.6 109.9zM128.1 119.6C127.2 118.7000000000001 125.7 119.2000000000001 124.6 120.2000000000001C123.5 121.5000000000001 123.3 123.0000000000001 124.2 123.7000000000001C125.1 124.6 126.6 124.1 127.7 123.1C128.8 121.8 129 120.3 128.1 119.6zM121.4 127C121 126.1 119.7 125.9 118.6 126.6C117.3 127.2000000000001 116.7 128.3 117.1 129.2000000000001C117.5 129.8000000000001 118.6 130.1 119.9 129.6C121.2 128.9 121.8 127.8 121.4 127z" />
-    <glyph glyph-name="github"
-      unicode="&#xF09B;"
-      horiz-adv-x="496" d=" M165.9 50.6C165.9 48.6 163.6 47 160.7 47C157.4 46.7 155.1 48.3 155.1 50.6C155.1 52.6 157.4 54.2 160.3 54.2C163.3 54.5000000000001 165.9 52.9 165.9 50.6zM134.8 55.1C134.1 53.1 136.1 50.8 139.1 50.2C141.7 49.2 144.7 50.2 145.3 52.2S144 56.5000000000001 141 57.4C138.4 58.1 135.5 57.1 134.8 55.1zM179 56.8C176.1 56.1 174.1 54.2 174.4 51.9C174.7 49.9 177.3 48.6 180.3 49.3C183.2 50 185.2 51.9 184.9 53.9C184.6 55.8 181.9 57.1 179 56.8zM244.8 440C106.1 440 0 334.7 0 196C0 85.1 69.8 -9.8 169.5 -43.2C182.3 -45.5 186.8 -37.6 186.8 -31.1C186.8 -24.9 186.5 9.3 186.5 30.3C186.5 30.3 116.5 15.3 101.8 60.1C101.8 60.1 90.4 89.2000000000001 74 96.7000000000001C74 96.7000000000001 51.1 112.4 75.6 112.1C75.6 112.1 100.5 110.1 114.2 86.3C136.1 47.7 172.8 58.8 187.1 65.4C189.4 81.4 195.9 92.5000000000001 203.1 99.1C147.2 105.3 90.8 113.4 90.8 209.6C90.8 237.1 98.4 250.9000000000001 114.4 268.5C111.8 275 103.3 301.8 117 336.4000000000001C137.9 342.9000000000001 186 309.4000000000001 186 309.4000000000001C206 315 227.5 317.9000000000001 248.8 317.9000000000001S291.6 315 311.6 309.4000000000001C311.6 309.4000000000001 359.7000000000001 343 380.6 336.4000000000001C394.3 301.7000000000001 385.8 275 383.2000000000001 268.5C399.2000000000001 250.8000000000001 409.0000000000001 237.0000000000001 409.0000000000001 209.6C409.0000000000001 113.1 350.1000000000001 105.4 294.2000000000001 99.1C303.4000000000001 91.2000000000001 311.2000000000001 76.2000000000001 311.2000000000001 52.7C311.2000000000001 19.0000000000001 310.9000000000001 -22.6999999999999 310.9000000000001 -30.9C310.9000000000001 -37.4 315.5000000000001 -45.3 328.2000000000001 -43C428.2 -9.8 496 85.1 496 196C496 334.7 383.5 440 244.8 440zM97.2 95.1C95.9 94.1 96.2 91.8 97.9 89.9C99.5 88.3 101.8 87.6 103.1 88.9C104.4 89.9 104.1 92.2000000000001 102.4 94.1C100.8 95.7000000000001 98.5 96.4 97.2 95.1zM86.4 103.2000000000001C85.7 101.9 86.7 100.3000000000001 88.7 99.3000000000001C90.3 98.3000000000001 92.3 98.6000000000001 93 100.0000000000001C93.7 101.3000000000001 92.7 102.9 90.7 103.9C88.7 104.5000000000001 87.1 104.2000000000001 86.4 103.2000000000001zM118.8 67.6C117.2 66.3 117.8 63.3 120.1 61.4C122.4 59.1 125.3 58.8 126.6 60.4C127.9 61.7000000000001 127.3 64.7000000000001 125.3 66.6C123.1 68.9 120.1 69.2000000000001 118.8 67.6zM107.4 82.3C105.8 81.3 105.8 78.7 107.4 76.4C109 74.1 111.7 73.1 113 74.1C114.6 75.4 114.6 78 113 80.3C111.6 82.6 109 83.6 107.4 82.3z" />
-    <glyph glyph-name="gitkraken"
-      unicode="&#xF3A6;"
-      horiz-adv-x="592" d=" M565.7 329.9C563.4000000000001 336 556.4000000000001 339.1 550.4000000000001 336.5C544.7 334.1 541.9000000000001 327.6 544.1000000000001 321.9C555.0000000000001 292.9 561.0000000000001 261.4 561.0000000000001 228.6C561.0000000000001 94 460.7000000000001 -17.1 330.8000000000002 -34.1V89.6C338.7000000000001 91.1 346.3000000000002 93.2000000000001 353.8000000000002 95.8V-8.2C460.5000000000001 17.7 539.7000000000002 113.9 539.7000000000002 228.6C539.7000000000002 320.4000000000001 488.9000000000001 400.4000000000001 413.9000000000002 441.9000000000001C408.2000000000002 445.1 400.9000000000002 442.8 398.0000000000002 436.9000000000001C395.3000000000002 431.4000000000001 397.4000000000002 424.7000000000001 402.7000000000002 421.8C470.6000000000001 384.2000000000001 516.6000000000001 311.8000000000001 516.6000000000001 228.6000000000001C516.6000000000001 135.3000000000001 458.7000000000002 55.5000000000001 376.8000000000002 23.2V115.4C391.0000000000001 119.9 401.7000000000001 133.1 401.7000000000001 148.9C401.7000000000001 162.0000000000001 394.9000000000001 173.3 384.4000000000001 179.4C392.7000000000001 258.9000000000001 428.9000000000001 238.0000000000001 428.9000000000001 263.3000000000001V278C428.9000000000001 316 341.0000000000001 439.8 299.9000000000001 442.7C297.4000000000001 442.9 294.9000000000001 442.9 292.3000000000001 442.7C251.1 439.7 163.2 316 163.2 278V263.2C163.2 237.9 199.5 258.9 207.7 179.3C197.1 173.1999999999999 190.4 161.9 190.4 148.8C190.4 133 201 119.8 215.2 115.3V23.1C133.3 55.3 75.4 135.1 75.4 228.5C75.4 311.6 121.4 384 189.3 421.7C194.7 424.7 196.7 431.3 194 436.8C191.1 442.7 183.9 445 178.1 441.8C103.1 400.3 52.3 320.3 52.3 228.5C52.3 113.8 131.5 17.6999999999999 238.2 -8.3000000000001V95.6999999999999C245.8 93.1999999999999 253.3 91.0999999999999 261.2 89.4999999999999V-34.2C131.4 -17.2 31 93.9 31 228.5C31 261.3 37 292.8 47.9 321.8C50.1 327.6 47.3 334 41.6 336.4C35.6 339 28.6 336 26.3 329.8C14.5 298.3 8 264.2 8 228.5C8 73.4 130.6 -53.1 284.3 -59.3V86.6C291.1 86.2000000000001 299.3 86.1 307.7 86.6V-59.2C461.4 -53.1 584 73.4 584 228.5C584 264.2 577.5 298.3 565.7 329.9zM365.9 172.5C378.9 172.5 389.6 162 389.6 148.8C389.6 135.7 379 125.1 365.9 125.1C352.9 125.1 342.2 135.6 342.2 148.8C342.2 161.9 352.8 172.5 365.9 172.5zM226.1 125.2C212.9 125.2 202.4 135.9 202.4 148.9S212.9 172.6 226.1 172.6C239.2 172.6 249.8 162 249.8 148.9C249.8 135.9 239.3 125.2 226.1 125.2z" />
-    <glyph glyph-name="gitlab"
-      unicode="&#xF296;"
-      horiz-adv-x="512" d=" M29.782 248.268L256 -45.714L8.074 138.301C1.218 143.443 -1.638 152.297 0.933 160.294L29.782 248.268zM105.187 423.074C102.045 431.928 89.478 431.928 86.336 423.074L29.782 248.268H161.743L105.187 423.074zM161.743 248.268L256 -45.714L350.257 248.2680000000001H161.743zM511.067 160.294L482.218 248.268L256 -45.714L503.926 138.301C510.781 143.443 513.637 152.297 511.067 160.294zM425.663 423.074C422.521 431.928 409.954 431.928 406.812 423.074L350.257 248.268H482.218L425.663 423.074z" />
-    <glyph glyph-name="gitter"
-      unicode="&#xF426;"
-      horiz-adv-x="384" d=" M66.4 125.5H16V448H66.4V125.5zM166.9 371.9H116.5V-64H166.9V371.9zM267.5 371.9H217.1V-64H267.5V371.9zM368 372H317.6V125H368V372z" />
-    <glyph glyph-name="glide-g"
-      unicode="&#xF2A6;"
-      horiz-adv-x="448" d=" M407.1 236.8C403.6 238.2 395.5 240.6 391.7000000000001 240.6C354.6 240.6 329.5000000000001 223.8 298.2000000000001 206.1L297.3000000000001 207C304.3000000000001 254.3 320.8000000000001 298.9000000000001 320.8000000000001 347.4000000000001C320.8 418.9 282.6 448 212.4 448C97.3 448 39 334.3 39 249.6C39 161.7 90.3 113 177.6 113C189.6 113 188.6 114 188.6 109.2C171.7 -19.7 97.8 -23.9 97.8 14.6C97.8 53.8 142.8 73.2000000000001 143.3 75.6C143 87.8 96.3 103.2000000000001 84.4 103.2000000000001C50.5 103.1 32 52.0000000000001 32 23.9C32 -28 64.8 -64 117.5 -64C194.9 -64 251.5 13.8 268.9 81.4C284 141.9 280.1 144.7 288.6 149C320.8 165.2 346.1 176 382.4 176C400.2 176 412.9 172.3 441.3 167.6C444.2 167.6 448 170.5 448 173.4C448 181.4 414.6 233.9000000000001 407.1 236.8000000000001zM231.8 321.2000000000001C222.5 276.5 213.2 231.6 204 186.9C201.7 176.7 190.7 179.1 182 179.1C143.7 179.1 133 220.9 133 252.2C133 299.2 151 361.5 194.8 385.6C201.8 389.7 209.6 392.3 217.4 392.3C236 392.3 237.4 379 237.4 363.6C237.3 349.3 234.7 335.1 231.8 321.2z" />
-    <glyph glyph-name="glide"
-      unicode="&#xF2A5;"
-      horiz-adv-x="448" d=" M252.8 299.4C252.8 290.6 251.2 281.7000000000001 249.4 273C243.6 245.2 237.8 217.2 232.1 189.4C230.7 183.1 223.8 184.5 218.4 184.5C194.6 184.5 187.9 210.5 187.9 230C187.9 259.3 199.1 298.1 226.4 313.1C230.7 315.6 235.6 317.3 240.5 317.3C251.9 317.3 252.8 309 252.8 299.4zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM384 181C384 186.1 363.2 218.7 358.5 220.5C356.3 221.4 351.3 222.8 348.9 222.8C325.8 222.8 310.2 212.3 290.7 201.3L290.2 201.8C294.5 231.2 304.8 259 304.8 289.2000000000001C304.8 333.8 281 351.9000000000001 237.3 351.9000000000001C165.6 351.9000000000001 129.3 281.1 129.3 228.4000000000001C129.3 173.7000000000001 161.3 143.4 215.6 143.4C223.1 143.4 222.5 144.0000000000001 222.5 141.1C212 60.8 166 58.2000000000001 166 82.2000000000001C166 106.6 194 118.7000000000001 194.3000000000001 120.2000000000001C194.1000000000001 127.8000000000001 165 137.4 157.6 137.4C136.5 137.4 124.9 104.4 124.9 86.8C124.9 54.5 145.3 32.1 178.2 32.1C226.4000000000001 32.1 261.6 81.8 272.5 123.8C281.9 161.5 279.5 163.2 284.8 165.9C304.8 176.0000000000001 320.6 182.7000000000001 343.2 182.7000000000001C354.3 182.7000000000001 362.2 180.4 379.9 177.5000000000001C381.7 177.4 384 179.2000000000001 384 181.0000000000001z" />
-    <glyph glyph-name="gofore"
-      unicode="&#xF3A7;"
-      horiz-adv-x="400" d=" M324 128.2H310.8V93.5C286.3 70.4 254.5 57.7 220.9 57.7C147.7 57.7 88.5 117.9 88.5 192.1C88.5 266.2 147.7 326.5 220.9 326.5C256.2 326.5 289.5 312.5 314.5 287.1L376.8 350.4C335 392.7 279.7 416 220.7 416C98 416 0 315.4 0 192C0 69.5 97 -32 220.7 -32C283.9 -32 345.2 -5.8 391.7 50.5C389.7 78.1 378.3 128.2 324 128.2zM311.9 240.7H205.6V151.7H324C357.5 151.7 384.5 136.6 400 109.9V140.5C400 205.7 359.6 240.7 311.9 240.7z" />
-    <glyph glyph-name="goodreads-g"
-      unicode="&#xF3A9;"
-      horiz-adv-x="384" d=" M42.6 44.7H45.4C58.1 44.7 70.9 44.7 83.6 44.6C85.2 44.6 86.7 44.9999999999999 87.2 42.4999999999999C94.3 7.6 117.2 -12.1000000000001 150.1 -21.4C177 -29.0000000000001 204.2 -29.2 231.4 -23.2C265.2 -15.8000000000001 287.4 5.1 299.4 37.1999999999999C307.4 58.6999999999999 310.1 80.9999999999999 310.4 103.6999999999999C310.5 109.4999999999999 310.7 150.6999999999999 310.2 156.5L309.3 156.8C308.5 155.3 307.6 153.9 306.8 152.4C284.7 109.3 245.5 85 201.4 83.3C98.4 79.3 32 140.3 29.4 259.5C28.9 283.2 31.2 306.4 37.7 329.2C58.3 400.3 112.3 447.4 191.6 448C252.9 448.4 293.1 409.3 307.8 377.7C308.3 376.6 309.1 375.4 310.2 375.8V437.4H354.5C354.5 157.1 354.6 105.2 354.6 105.2C354.5 26.7 327.9000000000001 -38.5 251.6 -57C182.1 -73.9 92.6 -61.8 55.6 0.2C47.6 13.7 43.8 28.5 42.6 44.7zM188.9 411.5C136.4 412 80.4 370.8 73.9 277.7C69.8 218.7 88.7 155.5 145.4 129.1C173 116.2000000000001 219.7 114.1 253.7 137.8C301.3 171 316.4 234.8 308.5 291.8C298.8 362.9 260.7 411.8 188.9 411.5z" />
-    <glyph glyph-name="goodreads"
-      unicode="&#xF3A8;"
-      horiz-adv-x="448" d=" M299.9 256.8C305 219.5 295.2 177.8 264 156.1C241.7 140.6 211.2 142 193.2 150.4C156.1 167.7000000000001 143.7 209 146.4 247.6C150.7 308.5 187.3 335.5 221.7 335.1C268.6 335.3 293.5 303.3 299.9 256.8zM448 360V24C448 -6.9 422.9 -32 392 -32H56C25.1 -32 0 -6.9 0 24V360C0 390.9 25.1 416 56 416H392C422.9 416 448 390.9 448 360zM330 134.8S329.9 168.8 329.9 352.1H300.9V311.8C300.1 311.5 299.7 312.3 299.3 313C289.7 333.7 263.4 359.3 223.3 359C171.4 358.6 136.1 327.8 122.7 281.2C118.4 266.3 116.9 251.1 117.2 235.6C118.9 157.7 162.3 117.8 229.6 120.4C258.5 121.5 284.1 137.4 298.6 165.6C299.1 166.6 299.7 167.5 300.3 168.5C300.5 168.3999999999999 300.7 168.3999999999999 300.9 168.3C301.2 164.5 301.1 137.6 301 133.8C300.8 119 299 104.3 293.8 90.3C286 69.3 271.5 55.6 249.3 50.8C231.5 46.9 213.7 46.9999999999999 196.1 51.9999999999999C174.6 58.1 159.6 70.9999999999999 155 93.8C154.7 95.4 153.7 95.1 152.7 95.1H125.9C126.7 84.4999999999999 129.1 74.8 134.4 65.9C158.6 25.4 217.1 17.4 262.6 28.5C312.5 40.8 329.9000000000001 83.4 330 134.8z" />
-    <glyph glyph-name="google-drive"
-      unicode="&#xF3AA;"
-      horiz-adv-x="512" d=" M339 133.1L175.4 416H336.6L500.2 133.1H339zM201.5 109.5L120.9 -32H431.4L512 109.5H201.5zM154.1 380.6L0 109.5L80.6 -32L237 239.2L154.1 380.6z" />
-    <glyph glyph-name="google-play"
-      unicode="&#xF3AB;"
-      horiz-adv-x="512" d=" M325.3 213.7L104.6 435L385.4 273.8L325.3 213.7zM47 448C34 441.2 25.3 428.8 25.3 412.7V-28.6C25.3 -44.7 34 -57.1 47 -63.9L303.6 192.1L47 448zM472.2 222.4L413.3 256.5L347.6 192L413.3 127.5L473.4 161.6C491.4 175.9 491.4 208.1 472.2 222.4zM104.6 -51L385.4 110.2L325.3 170.3L104.6 -51z" />
-    <glyph glyph-name="google-plus-g"
-      unicode="&#xF0D5;"
-      horiz-adv-x="640" d=" M386.061 219.504C387.895 209.812 389.204 200.12 389.204 187.548C389.204 77.795 315.599 0 204.8 0C98.716 0 12.8 85.915 12.8 192S98.716 384 204.8 384C256.664 384 299.8830000000001 365.141 333.411 333.708L281.2850000000001 283.678C267.1400000000001 297.299 242.2570000000001 313.277 204.8 313.277C139.316 313.277 85.88 259.056 85.88 192C85.88 124.944 139.316 70.723 204.8 70.723C280.761 70.723 309.313 125.468 313.765 153.496H204.8V219.505H386.0610000000001zM571.467 213.067V268.8H515.466V213.067H459.733V157.066H515.466V101.333H571.467V157.066H627.2V213.067H571.4670000000001z" />
-    <glyph glyph-name="google-plus-square"
-      unicode="&#xF0D4;"
-      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM164 92C108.7 92 64 136.7 64 192S108.7 292 164 292C191 292 213.5 282.2 231 265.8L203.9 239.7C196.5 246.8 183.6 255.1 164.1 255.1C130 255.1 102.2 226.9000000000001 102.2 191.9C102.2 157.0000000000001 130 128.7000000000001 164.1 128.7000000000001C203.7 128.7000000000001 218.5 157.2000000000001 220.9 171.8000000000001H164V206.2000000000001H258.4C259.4 201.2000000000001 260 196.1000000000001 260 189.6000000000001C260 132.5000000000001 221.7 92.0000000000001 164 92.0000000000001zM384 173.8H355V144.8H325.8V173.8H296.8V203H325.8V232H355V203H384V173.8z" />
-    <glyph glyph-name="google-plus"
-      unicode="&#xF2B3;"
-      horiz-adv-x="496" d=" M248 440C111.1 440 0 328.9 0 192S111.1 -56 248 -56S496 55.1 496 192S384.9 440 248 440zM177.3 68C108.5 68 53.3 123.5 53.3 192S108.5 316 177.3 316C208.6 316 237.4 305 260.3 283.7L226.7 251.1C213.5 264 195.4 270.2 177.3 270.2C134.4 270.2 100.1 234.7 100.1 192.1S134.3 114 177.3 114C209.9 114 242.2 133.1 247.4 167.3H177.3V209.9H294.2000000000001C295.5000000000001 203.1 296.1 196.3 296.1 189.2C296.1 118.4 248.6 68 177.3 68zM407.5 174.2V138.7H372V174.2H336.5V209.7H372V245.2H407.5V209.7H442.7V174.2H407.5z" />
-    <glyph glyph-name="google-wallet"
-      unicode="&#xF1EE;"
-      horiz-adv-x="448" d=" M156.8 321.2C194.4 260.6 221 208.1 241.1 158.7C232.8 124.9 222.3 92.2 209.8 60.4C196.6 112.7 183.3 161.7 153.8 208.9C160.3 245.3 156.1 282.5 156.8 321.2zM109.3 248H16.1C9.6 248 5.6 240.5 9.6 235.3C51.8 181 81.3 117.5 101.3 48H204.8C188.6 117.7 166.1 181.7 122.3 241.5C119.3 245.5 114.3 248 109.3 248zM157.1 336C225.6 228 287.1 101.5 295.3 -32H409C397 106 340.6 233 265.8 336H157.1zM408.9 404.5C407.1 411.3 400.7 416 393.7 416H305.4C300.1 416 296.4 411 297.6 405.7C310.8 359.2 319.9 310.2 324.1 259.7C372.3 173.5 403.8 81.4 414.7 -11.1C430.5 49.4 440 122.4 440 191.9C440 265.5 427.8999999999999 337 408.8999999999999 404.5z" />
-    <glyph glyph-name="google"
-      unicode="&#xF1A0;"
-      horiz-adv-x="488" d=" M488 186.2C488 44.7 391.1 -56 248 -56C110.8 -56 0 54.8 0 192S110.8 440 248 440C314.8 440 371 415.5 414.3 375.1L346.8 310.2C258.5 395.4 94.3 331.4 94.3 192C94.3 105.5 163.4 35.4 248 35.4C346.2 35.4 383 105.8 388.8 142.3H248V227.6H484.1C486.4 214.9 488 202.7 488 186.2z" />
-    <glyph glyph-name="gratipay"
-      unicode="&#xF184;"
-      horiz-adv-x="496" d=" M248 440C111.1 440 0 328.9 0 192S111.1 -56 248 -56S496 55.1 496 192S384.9 440 248 440zM362.6 213.6L249.6 60.9L136.9 213.6C128.2000000000001 225.5 117.8000000000001 264 150.5 285.6C178.6 303.7 205.1 289.8 219 273.7C234.9000000000001 255.8 265.6 256.8 280.7000000000001 273.7C294.6 289.8 321.1 303.7 348.8000000000001 285.6C381.7000000000001 264 371.4000000000001 225.6 362.6000000000001 213.6z" />
-    <glyph glyph-name="grav"
-      unicode="&#xF2D6;"
-      horiz-adv-x="512" d=" M301.1 236C305.5 231.6 305.5 224.1 301.1 219.7L291.4000000000001 210C287.0000000000001 205.3 279.5000000000001 205.3 274.8 210L264.3 220.5C259.9000000000001 225.2 259.9000000000001 232.4 264.3 237.1L274 246.8C278.4 251.2 285.9 251.2 290.6 246.8L301.1 236zM270.9000000000001 255.7C273.9000000000001 258.7 273.9000000000001 263.5 270.9000000000001 266.2C268.1 269.2 263.4000000000001 269.2 260.4000000000001 266.2C257.6 263.4 257.6 258.7 260.4000000000001 255.7C263.5000000000001 252.9 268.2000000000001 252.9 270.9000000000001 255.7zM244.9000000000001 250.4C241.9000000000001 247.6 241.9000000000001 242.9 244.9000000000001 240.2C247.7000000000001 237.2 252.4000000000001 237.2 255.4000000000001 240.2C258.2000000000001 243 258.2000000000001 247.7 255.4000000000001 250.4C252.4000000000001 253.4 247.7000000000001 253.4 244.9000000000001 250.4zM317.4000000000001 263.7C297.5000000000001 278.1 283.6 306.9 305.5000000000001 331.8C327.1000000000001 356.7 346.2000000000001 349 365.3000000000001 331C377.2000000000001 319.7 394.6000000000001 306.1 382.5000000000001 282.8C370.0000000000001 259.3 337.4000000000001 249.6 317.4000000000001 263.7zM365.1 308.2C356.2000000000001 318.2 341.8 301.3 349.6 292.1C357 283.1 381.7000000000001 289.7 365.1 308.2zM504 192C504 55 393 -56 256 -56S8 55 8 192S119 440 256 440S504 329 504 192zM437.8 149.4C440.3 165.5 417.6 166 412.6 175.1C399 199.2 384.9000000000001 211.9 358.1 205.5C369.7000000000001 213.5 381.6 211.6 381.6 211.6C381.9000000000001 218 381.6 224.6 372.2000000000001 236.5C376.1 249 372.5000000000001 258.9 372.5000000000001 258.9C388.0000000000001 267.5 399.3000000000001 283.3 401.6000000000001 302.1C405.2000000000001 333.1 382.8000000000001 361.3 351.8000000000001 364.9C329.7000000000001 367.4 308.1000000000001 357.2 297.5000000000001 339.2C274.3000000000001 299.1 298.9000000000001 268.3 319.9000000000001 257.8C305.5000000000001 259.2 285.6 269.7 279.8 292.1C273.2 317.8 282.6 341.9 288.7 353.5C288.7 353.5 284.3 359.3 280.7 362.4C280.7 362.4 266.9 362.4 256.1 357.1C268 372.3 281.3 371.5 281.3 371.5C281.3 377.9 280.7 386.4 277.7 393.1C272.3 404.1 253.8999999999999 406 246 390.3C246.1 390.5 246.3 390.7 246.4 390.8C241.4 378.9 245.3 334.9 263.3 303.6C260.8 302.2 254.2 297.5 250.3 293.6C228.7 283.9 194.1 233.3 194.1 233.3C165.9 222.5 116.9 182.4 123.5 153.6C123.8 150.6 124.9 148.1 126.5 146.1C123.7 143.9 121 141.1 118.2 137.8C106.3 124 112.9 102.6 135.9 113.4C151.7 120.6 165.5 133.6 172.2 143.8C172.2 143.8 166.7 148.8 155.9 148.2C183.6 154.8 190.2 157.6 202.1 157.3C210.1 153.4 210.1 191.6 210.1 191.6C210.1 206.3 207.9 222.6 199 233.1C211.5 220.9 228.1 200.4 227 172.5C226.2 154.2 211.8 149.5 211.8 149.5C202.7 132.9 168.6 83.6 181.4 43.5C181.4 43.5 171.7 58.4 171.2 65.6C153.8 46.2 124.7 13.3 146.6 1.1C173.2 -13.6 255.4 89.7000000000001 272.8 143.4C307.4000000000001 164.2000000000001 328.2 190.7000000000001 336.7 208.4C358.7 164.9 432 113.9 437.8 149.4z" />
-    <glyph glyph-name="gripfire"
-      unicode="&#xF3AC;"
-      horiz-adv-x="384" d=" M171.8 -55.8C171.8 -50.5 176.6 -43.6 176.6 -33.5C176.6 -18.3 163.6 6.4 98.5 53.1C64.2 82.2 32 111.6 32 161.4C32 276.1 179.1 337.9 179.1 430C179.1 433.3 178.9 436.7 178.5 440C183.6 437.6 217.6 396.7 217.6 349.6C217.6 269.1 112.5 220.4 112.5 146.6C112.5 119.7000000000001 129.1 99.4 145.1 77.1C167.6 46.9 189.3 20.2 189.3 -9.4C189.2 -23.9 184.9 -39.1 171.8 -55.8zM317.8 185.6C319.3 177.2000000000001 320 169 320 161C320 109.2 290.6 63.5 252.7 24.2C251.7 23.2 250.5 21.8 249.5 21.8C245.9 21.8 214 63.4 214 75C214 75 255.8 130.7 255.8 171.9C255.8 182.7 253.1 193.6 246.7 205.3C245.2 173 191 117.6 188.6 117.6C185.9 117.6 170.7 139.6 170.7 159.7C170.7 165 171.7 170.4 173.9 175.5C176.3 181 230.5 247.5 230.5 292.2C230.5 298.4 229.5 304.2 227.1 309.3L223.1 316.5C239.8 310 305.7 252.4 317.8 185.6" />
-    <glyph glyph-name="grunt"
-      unicode="&#xF3AD;"
-      horiz-adv-x="384" d=" M61.3 258.7C60.2 248.7 66.5 239.6 66.5 239.6C67.2 247.1 68.7 252.4 70.5 256.2C70.9 245.9 73.7 232.7 83.3 222.1C90.2 214.5 118.9 198.8 138.2 216C139.2 213.6 140.3 210.7 141.2 207.5C144.1 197.2 138.5 182.2 138.5 182.2S153.6 199.3 152.4 214.7C163.2 215.2 173.8 223.1 173.5 234.2C173.5 234.2 154.6 223.8 138 243C128.3 254.2 97.1 285 54.9 274.8C59.2 273.8 63.8 272.4 68.4 270.7000000000001H68.3C64.1 268.7000000000001 61.8 263.6 61.3 258.7000000000001zM89.6 260.5C109.1 249.5 127 234.8 134.5 223.5C128.8 220.2 112.8 213.1 96.5 225.2C86.2 232.8 86.7 251.4 89.6 260.5zM168.8 26.8C171 24.5 170.3 21.5 169.7 20C168.6 17.3 164.2 8.4 156.7 0.2C154 -2.7 150.1 -4.4 145.7 -4.4C141.4 -4.4 137 -2.8 133.9 -0.1C131.6 2 123.7 9.4 120.2 18.5C118.9 21.9 119.2 24.6 121.1 26.6C122.4 27.9 125.1 29.5 130.6 29.5H160C164.1 29.5 167 28.6 168.8 26.8zM231.7 214.7C230.5000000000001 199.2 245.6 182.2000000000001 245.6 182.2000000000001S240.0000000000001 197.2000000000001 242.9000000000001 207.5000000000001C243.8000000000001 210.7000000000001 244.9000000000001 213.5000000000001 245.9000000000001 216.0000000000001C265.2000000000001 198.7000000000001 293.9000000000001 214.5000000000001 300.7000000000001 222.1000000000001C310.3000000000001 232.7000000000001 313.0000000000001 245.9000000000001 313.5000000000001 256.2000000000001C315.3000000000001 252.4000000000001 316.9000000000001 247.1000000000001 317.5000000000001 239.6000000000001C317.5000000000001 239.6000000000001 323.9000000000001 248.7000000000001 322.7000000000001 258.7000000000001C322.1 263.7000000000001 319.8000000000001 268.7000000000001 315.7000000000001 270.5000000000001H315.6C320.2000000000001 272.3000000000001 324.8 273.7000000000001 329.1 274.6C286.8 284.8000000000001 255.7 254.0000000000001 246.0000000000001 242.8000000000001C229.3000000000001 223.6000000000001 210.5 234.0000000000001 210.5 234.0000000000001C210.3000000000001 223.1 220.9 215.1 231.7 214.7zM249.5000000000001 223.5C257 234.9000000000001 274.9000000000001 249.5000000000001 294.4000000000001 260.5C297.4000000000001 251.4000000000001 297.8 232.8000000000001 287.4000000000001 225.1C271.1 213 255.2000000000001 220.1 249.5000000000001 223.5C249.4000000000001 223.4 249.5000000000001 223.5 249.5000000000001 223.5zM263 26.6C264.9 24.7 265.2 22 263.9 18.7C260.4 9.8000000000001 252.5 2.6 250.2 0.6C247.1 -2 242.8 -3.6 238.4 -3.6S230.1 -1.9999999999999 227.4 0.9C219.9 8.9 215.4 17.6 214.4 20.2C213.8 21.7 213.1 24.6 215.3 26.9C217 28.7 220 29.6 224.2 29.6H253.6C259 29.5 261.7 27.9 263 26.6zM164.7 278.1C174.6 272.1 183.5 270 192 269.8C200.5 270 209.4 272.1 219.3 278.1C219.3 278.1 204.8 260.4000000000001 192.1 260.3H191.9C179.2000000000001 260.5 164.7000000000001 278.1 164.7000000000001 278.1zM349.2 130.7000000000001C346.8 112.8000000000001 336.2 96.9 324.6 87.0000000000001C321.5 109.7000000000001 320.9 142.5000000000001 320.9 149.4C320.9 164.1 330.4 173.9 333.1 175.5000000000001C335.6 177.0000000000001 338.5 178.5000000000001 341.4 180.1000000000001C359.4 189.7000000000001 381.8 201.7000000000001 381.8 223.8000000000001C381.8 240.0000000000001 372.5 247.0000000000001 366.4 251.6000000000001C365.6 252.2000000000001 364.9 252.7000000000001 364.2 253.3000000000001C362.1 255.0000000000001 360.5 256.3000000000001 359.9 257.7000000000001C355.5 267.5000000000001 356.3 291.9000000000001 358.2 295.3000000000001C358.8 295.9000000000001 374.9 316.2000000000001 370 334.5000000000001C368 341.9000000000001 363.1 347.8000000000001 355.9 351.5000000000001C350.6 354.2000000000001 344 355.7000000000001 336.4 356.0000000000001C336.3 358.0000000000001 335.9 359.9000000000001 335.5 361.9000000000001C334.9 364.5000000000001 334.4 367.2000000000001 334.6 370.0000000000001C335 374.7000000000001 335.4000000000001 379.0000000000001 336.8 381.3000000000001C345.2 394.6000000000001 365.6 398.9000000000001 365.8 398.9000000000001L378.1 401.3000000000001L370 410.8000000000001C369.9 411.0000000000001 352.7 428.3000000000001 323.7 428.3000000000001C315.8 428.3000000000001 307.7 427.0000000000001 299.6 424.4000000000001C275.4 416.6000000000001 256.7 393.9000000000001 250.2 385.1000000000001C247.1 386.1000000000001 243.9 387.0000000000001 240.6 387.8000000000001C236.4 403.6000000000001 249.6 426.3000000000001 249.6 426.3000000000001S236 429.3000000000001 215.9 411.1000000000001C213.3 417.6000000000001 207.8 431.6000000000001 214.1 448.3000000000001C184.6 437.9 177.2 422 175 407.6C167.4 413 168.3 430.7 167.8 435.2C160.3 434.3 138.6 413.3 139.6 386.9C137.6 386.4 135.7 385.8 133.7 385.2C127.2 394 108.6 416.7 84.3 424.5C76.4 426.7 68.3 428 60.4 428C31.4 428 14.3 410.7 14.1 410.5L6 401.1L18.3 398.7C18.5 398.7 38.9 394.4 47.3 381.1C48.7 378.9 49.1 374.5 49.5 369.8C49.7 367 49.1 364.3 48.6 361.7C48.2 359.8 47.8 357.8 47.7 355.8C40 355.5 33.5 354 28.2 351.3C21 347.6 16.1 341.7 14.1 334.3C9.1 316.1 25.3 295.8 25.9 295.1C27.8 291.7 28.6 267.3 24.2 257.5C23.6 256.1 22 254.8 19.9 253.1C19.2 252.6 18.5 252 17.7 251.4C11.6 246.8 2.3 239.7 2.3 223.6C2.3 201.5 24.7 189.5 42.7 179.9C45.7 178.3 48.5 176.8 51 175.3C53.7 173.6999999999999 63.2 163.9 63.2 149.1999999999999C63.2 142.3 62.6 109.4999999999999 59.5 86.8C47.9 96.6999999999999 37.3 112.6999999999999 34.9 130.6C34.9 130.6 5.7 107.9999999999999 14.3 59.8C19.5 30.3 37.5 13.6999999999999 61.3 5.1C70.1 -14.0000000000001 90.7 -40.6 128.6 -44.5000000000001C143 -56.3 163 -64 192.2 -64H192.4C221.5 -64 241.5 -56.3 256 -44.5C293.9 -40.6 314.5 -14 323.3 5.1C347.1 13.8 365 30.3 370.3 59.8C378.5 108.2 349.2 130.7000000000001 349.2 130.7000000000001zM305.7 410.3C311.3 412.1 317.3 413 323.4 413C334.4 413 343.3 410 348.1 408C345 406.6 341.7 404.8 338.4 402.7C336 403.1 332.8 403.5 329.2 403.5C318.7 403.5 308.7 400.4 300.5 394.6C288.2 385.9 282.5 377.7 279.8 372.2C277.6 373.5 275.3 374.7 272.7 375.9C271.1 376.7 269.6 377.4 268 378.1C274.1 387.2 287.9 404.6 305.7 410.3zM326.7 392.1C325.9 391.1 325.1 390 324.4 388.9C321.1 383.7 320.5 377.3 320 371.1C319.5 364.7 318.9 358.6 315.6 354.1C311.4000000000001 353.3 307.5 352.4 304.1 351.4C301.8 354.5 298.5 358.4 293.6 362.6C295 367.4 299.1 378.7 307.1 385.1C312.7000000000001 389.4 319.3 391.8 326.7000000000001 392.1zM45.6 402.7C42.3 404.9 39 406.7 35.9 408C40.7 410 49.6 413 60.6 413C66.7 413 72.6 412.1 78.3 410.3C96.1 404.5 109.9 387.1 116 378.2C114.4 377.5 112.8 376.8 111.2 376C108.7 374.8 106.3 373.5 104.1 372.3C101.5 377.7 95.8 386 83.4 394.7C75.1 400.5 65.2 403.6 54.6 403.6C51.2 403.5 48 403.1 45.6 402.7zM90.3 362.6C85.4 358.4 82 354.6 79.8 351.4C76.4 352.3 72.5 353.3 68.3 354.1C65 358.5 64.5 364.6 64 371C63.5 377.2 62.9 383.6 59.6 388.8C58.9 389.9 58.1 391 57.3 392C64.7 391.7 71.3 389.4 76.8 385C84.8 378.7 88.9 367.4 90.3 362.6zM58.1 188.1C55.4 189.7000000000001 52.5 191.2000000000001 49.7 192.7C34.8 200.7 19.5 209 19.5 223.2C19.5 234.3 23.8 237.8 28.4 241.4L28.9 241.8C29.6 242.4 30.3 243 31.1 243.6C30.2 236.4000000000001 29.2 230.3 28.4 228.7C28.4 228.7 40.5 243.7 44.1 273C45.5 284.5 43 307.3 39 316C39.2 311.1 39 306.2 38.7 301.6C38.3 302.4 37.9 303.2 37.4 303.8C34.2 307.8 25.6 321.3 28 330.4C28.9 333.9 31.1 336.4 34.7 338.2C38.5 340.1 43.5 341.1 49.8 341.1C62.1 341.1 75.7 337.4 82.7 335.1C107.8 327.1 138.1 304.2 146.8 297.4C147 297.2 147.2 297.1 147.2 297.1L152.8 293.2L149.3 299C149.1 299.3 130.2 330.4 96.1 345.5C98.1 348.4 103.5 353.6 117.7 360.6C139.1 371.1 164.2 376.4 192 376.4C219.9 376.4 244.9 371.1 266.3 360.6C280.5 353.7 285.9000000000001 348.4 287.9000000000001 345.5C253.9000000000001 330.4 235.0000000000001 299.3 234.8000000000001 299L231.3000000000001 293.2L236.9000000000001 297.1S237.1 297.2 237.3000000000001 297.4C246.0000000000001 304.2 276.3000000000001 327.2 301.4000000000001 335.1C308.4000000000001 337.3 322.0000000000001 341.1 334.3 341.1C340.6 341.1 345.6 340.1 349.4000000000001 338.2C352.9000000000001 336.4 355.1 333.8 356.1 330.4C358.6 321.3 350 307.8 346.7000000000001 303.8C346.2000000000001 303.2 345.8000000000001 302.5 345.4000000000001 301.6C345.1 306.2 344.9000000000001 311.1 345.1 316C341.1 307.2 338.6 284.5 340 273C343.6 243.7 355.7 228.7 355.7 228.7C354.9 230.3 353.9 236.4 353 243.6C353.7 243 354.5 242.4 355.2 241.8L355.7 241.4C360.3 237.7 364.6 234.3 364.6 223.2C364.6 209 349.2 200.7 334.4 192.7C331.5 191.2 328.7 189.6 326 188.1C317.3 183.1 308 171.4 306.9 153.9C306 139.3 307.8 104 310.3 78C297.9 73.2 283.6 71.6 270.6 71.2C268.6 75.3 266.7 79.7 265.1 84.3C264.4 86.3 245.5 135.4 238.7 146.5C244.2 107.5 256.2 72.8 262.2 56.9C258.7 57.4 254.8999999999999 57.6 250.5 57.6H133.5C129.0999999999999 57.6 125.2 57.3 121.8 56.9C127.8 72.8 139.9 107.5 145.3 146.5C138.5 135.3 119.6 86.2 118.9 84.3C117.3 79.7 115.4 75.3 113.4 71.2C100.4 71.6 86.2 73.2 73.7 78C76.2 104 77.9999999999999 139.2 77.1 153.9C76.2 171.3 66.8 183.1 58.1 188.1zM34.8 43.4C22.7 63.4 26.1 97.5 31.1 102.5C42 68.1 78.3 58.2 105.5 57.1C102.8 52.9 100.3 49.5 98.5 47.1L97.1 45.7C89.9 37.9 88.5 27.2 93 13.9C70.3 14.0000000000001 46.7 23.7 34.8 43.4zM80.5 -0.1C86.5 -1.2 92.7 -2 99.1 -2.5C102.6 -10.5 106.5 -18.4 111.4 -25.6C97 -19.7 87 -9.6 80.5 -0.1zM192 -50.2C131.4 -50.1 113.7 -4.4 107.1 14.5C103.4 25 103.7 32.7 108 37.6C110.9 40.9 117.5 44.8 132.6 44.8H251.4C266.5 44.8 273.2 40.9 276 37.6C280.2 32.8 280.5 25 276.9 14.5C270.3 -4.3 252.6 -50.1 192 -50.2zM272.6 -25.6C277.5 -18.4 281.4000000000001 -10.4999999999999 284.9000000000001 -2.4999999999999C291.3 -1.9999999999999 297.5000000000001 -1.1999999999999 303.5000000000001 -0.1C297.0000000000001 -9.6 287.0000000000001 -19.7 272.6000000000001 -25.6zM349.2000000000001 43.4C337.2000000000001 23.7 313.6 14.1 291.1 13.7C295.6 27.0000000000001 294.2000000000001 37.8000000000001 287 45.5000000000001C286.6 46.0000000000001 286.1 46.5000000000001 285.6 47.0000000000001C283.8 49.4 281.3 52.8000000000001 278.6 57.0000000000001C305.8 58.2000000000001 342.1 68.0000000000001 353 102.4C358 97.4 361.4 63.3 349.2 43.4z" />
-    <glyph glyph-name="gulp"
-      unicode="&#xF3AE;"
-      horiz-adv-x="256" d=" M209.8 56.9L195.7 32.3L191.1 -47.9C191.1 -56.8 162.8 -64 128 -64S64.9 -56.8 64.9 -47.9L59.1 31.5L44.2 56.9C85.4 39.6 170.2000000000001 40.2 209.8000000000001 56.9zM13.8 310.2L27.4 184.7C33.3 204.7 48.2 231.7 67.4 239.9C73.7 242.6 80.1 242.6 86.1 239C91.3 236 95.7 229.7 96.2 227.2C97.4 220.7 94.2 218.1 91.7 218.1C88.7 218.1 86.4 222.7 84.9 225.4C80.8 232.7 74.6 233 68 228.2C61.1 223.2 55.1 214.8 50.9 207.5C45.8 198.7 41.5 189 38.9 179.3C37.4 173.7 36 164.7 38.3 159.4C39.3 157.2000000000001 40.8 155.8 43.2 155.8C48.2 155.8 55.5 162.4 59 165.9C63.5 170.4 69.3 177.4 71.5 181.9L76.7 197.4C79.3 204.2000000000001 86.6 203 86.6 197.4C86.6 187.2000000000001 82.9 183.8 76.6 162.7000000000001C70.8 143.2000000000001 69 136.9 69 136.9C68.3 134.1 65.6 129.4 62.7 129.4C61.5 129.4 60.6 129.8 60.1 130.6C59.1 132 59.2 135.9 59.3 136.9C59.5 140.1 65.6 159.1 66.6 162.1C64.6 159.9 62.5 157.7000000000001 60.2 155.5C54.8 150.4 46.1 143.7 38.7 143.7C35.3 143.7 33.1 144.6 31 146.1L38.6 66.5C40.6 61.5 77.8 49.4 126.8 49.4C175.9 49.4 213.1 61.6 215 66.5L225.9000000000001 161.1C220.2000000000001 155.9 213.6 149.5 206.3000000000001 146.3C200.9 144 188.9 142.5 188.9 152C188.9 157.2 198 166.8 203.3000000000001 173.5C204.7000000000001 175.2 208 179.4 208 181.6C208 184.5 202 183.8 196.3000000000001 179.1C193.1000000000001 176.4 190.1000000000001 172.8 187.6000000000001 169.4C183.3000000000001 163.4 181.0000000000001 158.2000000000001 179.1000000000001 153.9C172.9000000000001 139.7000000000001 175.0000000000001 145.3 170.0000000000001 131.9C165.0000000000001 118.6 165.8000000000001 120.1 164.8000000000001 117.9C163.9000000000001 116.0000000000001 162.6000000000001 114.4 160.8000000000001 113.4C158.9000000000001 112.4 156.3000000000001 112.5000000000001 154.7000000000001 113.7000000000001C153.8000000000001 114.3000000000001 153.4000000000001 115.6 153.4000000000001 117.4C153.4000000000001 118.3 153.5000000000001 119.2000000000001 153.7000000000001 120.1C155.2000000000001 126.2000000000001 161.5000000000001 138.2000000000001 168.7000000000001 154.4C170.3000000000001 158.1 169.7000000000001 157.0000000000001 169.5000000000001 156.7000000000001C163.3000000000001 150.7000000000001 158.6000000000001 147.8000000000001 155.1000000000001 146.2000000000001C149.3000000000001 143.6 142.1000000000001 143.6 140.6000000000001 150.3000000000001C140.5000000000001 150.7000000000001 140.5000000000001 151.1000000000001 140.4000000000001 151.5000000000001C128.6000000000001 142.3000000000001 116.1000000000001 139.8000000000001 120.4000000000001 159.6000000000001C115.8000000000001 151.4000000000001 107.8000000000001 144.7000000000001 98.0000000000001 144.7000000000001C93.9000000000001 144.7000000000001 90.9000000000001 146.1000000000001 89.4000000000001 149.8000000000001C87.1000000000001 155.3000000000001 90.7000000000001 164.7000000000001 94.0000000000001 173.6000000000001C95.7000000000001 178.1000000000001 98.0000000000001 183.5000000000001 101.1000000000001 189.8000000000001C102.7000000000001 193.2000000000001 105.3000000000001 195.2000000000001 108.7000000000001 194.3000000000001C109.3000000000001 194.1000000000001 109.8000000000001 193.9000000000001 110.3000000000001 193.6000000000001C112.9000000000001 191.8000000000001 111.9000000000001 189.1000000000001 110.6000000000001 186.4000000000002C106.8000000000001 178.9000000000002 103.5000000000001 173.4000000000002 101.3000000000001 165.6000000000001C100.4000000000001 162.3000000000001 99.3000000000001 156.6000000000001 102.8000000000001 156.6000000000001C105.2000000000001 156.6000000000001 107.5000000000001 157.4000000000002 109.7000000000001 159.0000000000001C114.3000000000001 162.4000000000001 118.0000000000001 167.5000000000001 120.8000000000001 172.5000000000001C122.8000000000001 176.1000000000001 125.2000000000001 180.8000000000001 126.4000000000001 184.8000000000001C126.9000000000001 186.5000000000001 127.5000000000001 188.1000000000001 128.2000000000001 189.6000000000001C129.3000000000001 192.1000000000001 130.8000000000001 194.7000000000001 133.4000000000001 194.7000000000001C134.7000000000001 194.7000000000001 135.8000000000001 194.2000000000001 136.6000000000001 193.2000000000001C138.3000000000001 191.0000000000001 137.9000000000001 188.7000000000002 137.0000000000001 186.3000000000001C135.0000000000001 180.7000000000001 132.3000000000001 175.7000000000001 130.1000000000001 169.6000000000001C128.8000000000001 166.1000000000001 127.4000000000001 161.6000000000001 127.4000000000001 157.9000000000002C127.4000000000001 154.5000000000002 131.1000000000001 155.3000000000001 134.2000000000001 156.7000000000002C136.6000000000001 157.8000000000002 139.0000000000001 159.5000000000002 141.0000000000001 161.2000000000002C142.2000000000001 166.1000000000001 141.9000000000001 165.0000000000002 167.4000000000001 229.4000000000002C168.7000000000001 232.7000000000002 171.1000000000001 234.1000000000002 173.5000000000001 234.1000000000002C174.7000000000001 234.1000000000002 175.7000000000001 233.7000000000002 176.7000000000001 233.0000000000002C178.4 231.7000000000002 178.4 228.9000000000002 177.7000000000001 226.8000000000002C177.0000000000001 224.9000000000002 177.1000000000001 225.5000000000002 173.2000000000001 216.3000000000002C168.0000000000001 204.2000000000002 164.6000000000001 195.5000000000002 160.0000000000001 184.4000000000002C158.1000000000001 179.8000000000001 152.3000000000001 165.5000000000002 151.3000000000001 162.1000000000001C150.7000000000001 159.9000000000002 150.0000000000001 156.3000000000001 152.3000000000001 156.3000000000001C157.7000000000001 156.3000000000001 171.6000000000001 169.4000000000002 175.4000000000001 173.3000000000001C175.6000000000001 173.6000000000001 175.9000000000001 173.7000000000001 176.3000000000001 173.9000000000002C176.9000000000001 175.8000000000001 177.5000000000001 177.6000000000001 178.0000000000001 179.4000000000002C179.4000000000001 183.2000000000002 180.7000000000001 187.6000000000001 183.3000000000001 190.7000000000002C184.1000000000001 191.7000000000002 185.0000000000001 192.3000000000002 186.0000000000001 192.3000000000002C188.8000000000001 192.3000000000002 190.2000000000001 191.1000000000001 190.2000000000001 188.3000000000002C190.2000000000001 187.2000000000002 189.5000000000001 183.2000000000002 189.1000000000001 182.1000000000002C190.5000000000001 183.6000000000002 192.0000000000001 185.1000000000002 193.6000000000001 186.6000000000002C208.6000000000001 200.5000000000002 219.3000000000001 193.4000000000002 219.3000000000001 186.4000000000002C219.3000000000001 179.0000000000002 210.4 168.7000000000002 205.5 163.0000000000002C203.9 161.1000000000003 200.6 157.6000000000003 200.5 156.6000000000003C200.5 155.3000000000003 201.4 154.8000000000003 202.7 154.8000000000003C204.7 154.8000000000003 209.1 158.3000000000003 210.7 159.5000000000002C215.7 163.4000000000002 222.5 169.4000000000002 227.3 173.6000000000003L242.1 310.4000000000003C211.6 293.3000000000003 44.5 293.2000000000003 13.8 310.2000000000003zM243.5 318.7C243.5 297.7 12.3 297.7 12.3 318.7C12.3 327.5 64.1 334.6 127.9 334.6C136.9 334.6 145.7 334.5 154.2 334.2L166.8 382.9L228.1 447.4C229.5 448.8 233.9 447.6 238 443.9S244.6 436 243.3 434.6L243.2 434.5L185.9 374L175.9 333.3C215.8 330.7 243.5 325.2 243.5 318.7zM174.1 314.1C174.1 314.9 173.2 315.6 171.6 316.2L171.4 315.4C171.4 314.1 166.4 313 160.3 313S149.2 314.1 149.2 315.4C149.2 315.5 149.2 315.6 149.3 315.7L149.5 316.4C147.7 315.8 146.5 315 146.5 314.1C146.5 312 152.7 310.4 160.2 310.4C167.9 310.3 174.1 312 174.1 314.1z" />
-    <glyph glyph-name="hacker-news-square"
-      unicode="&#xF3AF;"
-      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM21.2 218.8H21C21.1 218.9 21.2 219.1 21.3 219.2C21.3 219.1 21.3 218.9 21.2 218.8zM239.2 164.9V64H207.8V166.7L128 320H165.3C217.8 221.7 214.5 218.8 224.6 194.4C236.9000000000001 221.4 230.4000000000001 218.8 285.2000000000001 320H320L239.2 164.9z" />
-    <glyph glyph-name="hacker-news"
-      unicode="&#xF1D4;"
-      horiz-adv-x="448" d=" M0 416V-32H448V416H0zM21.2 218.8H21C21.1 218.9 21.2 219.1 21.3 219.2C21.3 219.1 21.3 218.9 21.2 218.8zM239.2 164.9V64H207.8V166.7L128 320H165.3C217.8 221.7 214.5 218.8 224.6 194.4C236.9000000000001 221.4 230.4000000000001 218.8 285.2000000000001 320H320L239.2 164.9z" />
-    <glyph glyph-name="hips"
-      unicode="&#xF452;"
-      horiz-adv-x="640" d=" M0 367.8C0 369.6 0.9 370.5 2.7 370.5H43.6C45.5 370.5 46.4 369.6 46.4 367.8V286.6C61.6 294.3 78.1 298.1 96.2 298C120.2 297.9 140.4 291.8 156.5 280C175.2 266.5 184.5 248.1 184.5 224.7V88.6C184.5 86.7000000000001 183.6 85.8 181.8 85.8H154.5C145.4 85.8 138.1 93.1 138.1 102.1V224.7C138.1 225.6 140.8 251.7 92.3 251.7C43.7 251.7 46.5 225.5 46.5 224.7V88.6C46.5 86.7000000000001 45.6 85.8 43.7 85.8H2.7C0.9 85.8 0 86.7 0 88.6V367.8zM497.7 146.3C511.4 136.1 531.8 127.2 556.1 127.2C579.4 127.2 588.9 131.7 592.6 140.8C595.6 148.7 592 156.9 580.4 162L526.8 185.5C505.4 194.9 492.9999999999999 209.5 489.6 229.1C483.9 262.8 511.8 282.4 512.3 282.8C525.5 292.4 544.3 298.2000000000001 570.8 298.2000000000001C589.8 298.2000000000001 608.1999999999999 294.9 625.9 288.3C627.1999999999999 287.8 627.8 287 627.8 285.7000000000001V241C627.8 238.9 625.5 237.6 623.8 238.6C584.0999999999999 259.3 547.1999999999999 250.9 539.8 245.4C533.1999999999999 240.5 533.8 232.9 542.4 229.3L600 204C616.5 196.9 628.1 185.6 634.9 169.9C640.4 157.3 641.5 144.3 638 130.8C628.4 93.9 593.1 85.3 592.4 84.9999999999999C581.9 81.8999999999999 568.8 80.6999999999999 556.1 80.6999999999999C539.5 80.6999999999999 523.5 83.3999999999999 507.9 88.8999999999999C498.2 92.2999999999999 493.3 99.1999999999999 493.3 109.5999999999999V144C493.3 146.1 495.6 147.7 497.7 146.3zM376.2 298.2C344.5 298.2 272 278.1 272 194.7V11.2C272 10.4 272.6 8.5 274.7 8.5H315.6C317.5 8.5 318.4 9.4 318.4 11.2V100C334.9 87.3 354.2 80.9 376.1 80.9C436.6 80.9 484.8 129.4 484.8 189.6C484.9 249.9 436.6 298.2 376.2 298.2zM376.2 127.3C359 127.3 344.3 133.4 332.2 145.5C320 157.6999999999999 314 172.3 314 189.5C314 224 341.6 251.7 376.2 251.7C410.7 251.7 438.4 224.0999999999999 438.4 189.5C438.5 155.1999999999999 411.1 127.3 376.2 127.3zM251.6 88.6C251.6 86.7 250.7 85.8 248.8 85.8H207.9C206.3 85.8 205.2 87.1999999999999 205.2 88.6V290.4C205.2 291.8 206.3 293.2000000000001 207.9 293.2000000000001H248.8C250.7 293.2000000000001 251.6 292.3 251.6 290.4V88.6M228.3 375.5C244.2 375.5 257.2 362.8 257.2 346.6C257.2 330.8 244.5 317.7 228.3 317.7S199.4 331 199.4 346.6C199.5 362.6 212.4 375.5 228.3 375.5" />
-    <glyph glyph-name="hire-a-helper"
-      unicode="&#xF3B0;"
-      horiz-adv-x="512" d=" M443.1 448H71.9C67.9 410.7 37.4 380.2 0 376.3V4.8C37.4 -0.1 66 -27.6 71.9 -64H444.1C447.1 -27.6 476.6 1.8 512 5.8V376.3C475.6 382.2 447 411.6 443.1 448zM406.1 43.1C369.8 43.1 387.3 45.1 351 45.1C315.2 45.1 330 43.1 294.9 43.1C289 43.1 290 51.3 294.9 52.9C317.7 60.5000000000001 317.8 63.1 319.5 65.7000000000001C329.9 81.3000000000001 325.4 148.7000000000001 325.4 178.7000000000001C325.4 184.0000000000001 319 191.5000000000001 311.6 191.5000000000001H200.4C193 191.5000000000001 186.6 184.0000000000001 186.6 178.7000000000001C186.6 148.7000000000001 182.1 81.3000000000001 192.5 65.7000000000001C194.2 63.2000000000001 194.3 60.5000000000001 217.1 52.9C222 51.3 223.1 43.1 217.1 43.1C182 43.1 196.8 45.1 161 45.1C124.7 45.1 142.2 43.1 105.9 43.1C98 43.1 100.1 53.9 105.9 53.9C116.1 57.3 119.4 57.4 127.6 67.7000000000001C135.3 80.6 135.5 112.1 135.5 195.5000000000001V296.7C135.5 318.9 123.3 325 106.9 329.1C98.1 331.3 102.9 340.9 107.9 340.9C144.4 340.9 128.5 338.9 165 338.9C197.7 338.9 181.5 340.9 214.2 340.9C217.5 340.9 222.7 332.6 215.2 330.1C210.3 328.5 187.6 326.4 187.6 290.8C187.6 245.2 187.4 235 188.6 222C188.6 220.7 190.9 209.2 201.4 209.2H310.6C321.1 209.2 323.4000000000001 220.7 323.4000000000001 222C324.6 235 324.4000000000001 245.2 324.4000000000001 290.8C324.4000000000001 326.4 301.7000000000001 328.5 296.8 330.1C289.3 332.6 294.5 340.9 297.8 340.9C330.5 340.9 314.3 338.9 347 338.9C383.5 338.9 367.6 340.9 404.1 340.9C409 340.9 414 331.3 405.1 329.1C388.7000000000001 325 376.5 318.8 376.5 296.7000000000001V195.5C376.5 112.1 376.6 80.6 384.4 67.7C392.6 57.5 395.8 57.3 406.1 53.9C411.9 53.9 413.9 43.1 406.1 43.1z" />
-    <glyph glyph-name="hooli"
-      unicode="&#xF427;"
-      horiz-adv-x="640" d=" M508.4 96H566.3V291.3L508.4 264V96zM582.1 206.5V96H640V206.5H582.1zM331.4000000000001 215.4C313.2000000000001 233.6 281.0000000000001 232.5 281.0000000000001 232.5S248.8000000000001 233.6 230.6000000000001 215.4C228.7000000000001 213.5 226.9000000000001 211.5 225.3000000000001 209.4C187.1 239 152.8000000000001 255.9 123.2000000000001 270.5V291.2L100.7000000000001 280.6C46.3000000000001 302.7 11.7 298.8 3.4 280.5C3.4 280.5 -21.4999999999999 247.7 65.3 169.6V200.6C16.5 255.2 26.3 276.7000000000001 30 279.8C43.5 291.2000000000001 67.5 287.8 94.4000000000001 277.7000000000001L65.2 264V200.7C78.3 186 95.7 169.2 118.7 150.3L123.2 146.7V176.5C123.2 183.4 124.9 194.7 134 194.7S144.6 187.8 144.6 179.7V131C162.6 118.8 181.9 108.9 202.3 101.4V195.3C202.3 214 188.9 232.7 161.7 232.7C145.9 232.8 131.2 224.5 123.2 210.8V265.1C165.1 244.2 207.1 218.6 223.1 206.8C212.9 192.2 213.8 178.6999999999999 213.8 163.1C213.8 144.4 212.4 128.8 230.6 110.6C248.8 92.4 281 93.4999999999999 281 93.4999999999999S313.3 92.3999999999999 331.4 110.6C349.6 128.8 348.1 144.4 348.1 163.1C348.1 181.6 349.6 197.3 331.4 215.4zM291.7000000000001 143.5C291.7000000000001 139.9 289.9000000000001 131 281.0000000000001 131C272.1000000000001 131 270.3000000000001 139.9 270.3000000000001 143.5V183.9C270.3000000000001 192.6 277.6000000000001 194.8 281.0000000000001 194.8C284.4000000000001 194.8 291.7000000000001 192.7 291.7000000000001 183.9V143.5zM477.4 215.4C459.2 233.6 427.0000000000001 232.5 427.0000000000001 232.5S394.7000000000001 233.6 376.6000000000001 215.4C358.4000000000001 197.2 359.8000000000001 181.5 359.8000000000001 162.8C359.8000000000001 144.1 358.4000000000001 128.5 376.6000000000001 110.3C394.8000000000001 92.1 427.0000000000001 93.2 427.0000000000001 93.2S459.3000000000001 92.1 477.4 110.3C495.6 128.5 494.2 144.1 494.2 162.8C494.1 181.6 495.5000000000001 197.3 477.4 215.4zM437.6 143.5C437.6 139.9 435.8 131 426.9000000000001 131C418.0000000000001 131 416.2000000000001 139.9 416.2000000000001 143.5V183.9C416.2000000000001 192.6 423.5000000000001 194.8 426.9000000000001 194.8C430.3 194.8 437.6 192.7 437.6 183.9V143.5zM611.1 216.5C627 216.5 640 229.4 640 245.4S627.1 269.9 611.1 269.9C595.2 269.9 582.2 261.3 582.2 245.4S595.1 216.5 611.1 216.5zM144.5 96L182.8 95.2C169.6 99.8 156.8 105.4 144.5 112V96zM123.1 96V124.6C116.6 128.8 110.1 133.3 103.7 138.2000000000001C88.9 149.4 76.2 159.9 65.2 169.7000000000001V96H123.1zM182.8 95.2C219.3 82.7 252.7 81 277.5 88C257.6 87.8 231.7 90.6 202.2 101.3V96L182.8 95.2z" />
-    <glyph glyph-name="hornbill"
-      unicode="&#xF592;"
-      horiz-adv-x="509.02" d=" M75.37 77.7C77.51 61.87 69.6 45.72 54.43 38.41C35.58 29.3099999999999 12.88 37.24 3.75 56.09C-5.33 74.92 2.62 97.67 21.45 106.74C28.5 110.1399999999999 36.08 111.16 43.3 110.12C-34.98 221.47 95.3 300.65 95.3 300.65C89.44 257.61 87.06 209.49 87.06 209.49C19.75 168.04 87.98 145.43 126.87 136.62C146.64 82.9999999999999 198.05 44.68 258.5300000000001 44.68C260.4500000000001 44.68 262.3 44.8899999999999 264.2000000000001 44.9599999999999L264.3100000000001 26.0999999999999C165.0900000000001 24.7099999999999 105.6100000000001 55.2399999999999 75.3700000000001 77.6999999999999zM183.38 405.4C184.27 412.4 183.28 419.73 179.99 426.55C170.89 445.39 148.17 453.33 129.33 444.24C110.47 435.14 102.53 412.41 111.64 393.56C118.62 379.0900000000001 133.66 371.14 148.82 372.33C126.27 342.42 94.99 282.76 96.4 182.3L118.24 182.45C118.22 183.35 118.1 184.22 118.1 185.13C118.1 244.08 154.47 294.46 205.95 315.29C213.96 353.04 236.6900000000001 429.59 279.79 359.58C279.79 359.58 327.93 357.2 370.9700000000001 351.34C370.9700000000001 351.35 293.13 479.37 183.38 405.4zM487.56 271.23C506.4 280.3200000000001 514.37 303.04 505.26 321.88C496.16 340.73 473.43 348.6500000000001 454.59 339.5700000000001C439.32 332.2000000000001 431.4 315.88 433.72 299.93C402.01 321.87 343.88 348.98 250.27 347.67L250.41 325.17C253.11 325.3200000000001 255.8 325.5800000000001 258.55 325.5800000000001C317.85 325.5800000000001 368.45 288.7800000000001 389.04 236.82C428.14 227.8 494.1 205.24 427.5 164.28C427.5 164.28 425.16 116.15 419.29 73.12C419.29 73.12 552.74 154.28 468.2499999999999 267.73C474.6799999999999 267.23 481.3199999999999 268.2200000000001 487.5599999999999 271.23zM373.05 11.76C394.48 44.22 419.4700000000001 101.45 418.19 191.42L398.67 191.28C398.75 189.22 398.9700000000001 187.21 398.9700000000001 185.13C398.9700000000001 124.86 360.92 73.58 307.5800000000001 53.68C298.73 14.73 276.1400000000001 -52.98 234.8100000000001 14.19C234.8100000000001 14.19 186.6900000000001 16.53 143.6200000000001 22.41C143.6200000000001 22.41 223.5400000000001 -108.9299999999999 335.5200000000001 -28.5599999999999C335.8300000000001 -33.28 336.9700000000001 -38.0099999999999 339.1600000000001 -42.53C348.2200000000001 -61.42 370.9600000000001 -69.3099999999999 389.8000000000001 -60.2399999999999C408.6600000000001 -51.1399999999999 416.5900000000001 -28.41 407.5000000000001 -9.59C400.9400000000001 4.03 387.2400000000001 11.84 373.0500000000001 11.76z" />
-    <glyph glyph-name="hotjar"
-      unicode="&#xF3B1;"
-      horiz-adv-x="448" d=" M414.9 286.5C340.2 419 121.1 448 121.1 448S222.2 337.6 93 250.3C11.3 195.2 -21 123.6 14 45.4C40.8 -14.5 97.5 -38.9 158.6 -48C129.4 7.1 152 74.4 154.5 81.6C211.6 -4.8 319.5 81.6 265.3 175.5C336.3 160.1 346.9 36.9 292.4000000000001 -40C372.9000000000001 -14.7 426.5 48.9 441.2000000000001 105.6C456.7 164.9 444.9000000000001 233.5000000000001 414.9000000000001 286.5z" />
-    <glyph glyph-name="houzz"
-      unicode="&#xF27C;"
-      horiz-adv-x="414.6" d=" M258.9 117.3H154.3V-32H0V416H109.5V311.5L414.6 225.9V-32H258.9V117.3z" />
-    <glyph glyph-name="html5"
-      unicode="&#xF13B;"
-      horiz-adv-x="384" d=" M0 416L34.9 20.2L191.5 -32L349.1 20.2L384 416H0zM308.2 288.1H124.4L128.5 238.7H304.1L290.5 90.3L192.6 63.3V62.9999999999999H191.5L92.8 90.3L86.8 166.1H134.5L138 128L191.5 113.5L245.2 128L251.2 190.2H84.3L71.5 335.8H312.6L308.2000000000001 288.1z" />
-    <glyph glyph-name="hubspot"
-      unicode="&#xF3B2;"
-      horiz-adv-x="512" d=" M267.4 236.4C242.3 212.7 226.6 179.1 226.6 141.8C226.6 112.5 236.3 85.5 252.6 63.8L203.1 14C198.7 15.6 194 16.5 189.1 16.5C178.3 16.5 168.2 12.3 160.6 4.7C153 -2.9 148.8 -13.1 148.8 -23.9S153 -44.8 160.6 -52.4C168.2 -60.0000000000001 178.4 -64 189.1 -64C199.9 -64 210 -60.1 217.7 -52.4C225.3 -44.8 229.5 -34.6 229.5 -23.9C229.5 -19.7 228.9 -15.7 227.6 -11.8L277.6 38.4C299.6 21.5000000000001 327 11.5000000000001 356.9000000000001 11.5000000000001C428.8000000000001 11.5000000000001 486.9 69.8000000000001 486.9 141.7000000000001C486.9 206.9 439.2000000000001 260.9000000000001 376.7000000000001 270.4000000000001V332C394.2000000000001 339.4 404.9000000000001 355.8 404.9000000000001 374.9C404.9000000000001 401 384.0000000000001 422.8 357.9000000000001 422.8S311.2 401 311.2 374.9C311.2 355.8 321.9 339.4 339.4 332V270.8C324.2 268.7000000000001 309.8 264.1 296.7 257.2000000000001C269.1 278.1 179.2 342.9000000000001 127.8 382C129 386.4000000000001 129.8 391 129.8 395.8C129.8 424.6 106.3 448 77.4 448C48.6 448 25.2 424.6 25.2 395.8C25.2 366.9 48.6 343.5 77.4 343.5C87.2 343.5 96.3 346.4 104.2 351.1L267.4 236.4zM356.9 72.8C318.8 72.8 287.9 103.7 287.9 141.8S318.8 210.8 356.9 210.8S425.9 179.9 425.9 141.8S395 72.8 356.9 72.8z" />
-    <glyph glyph-name="imdb"
-      unicode="&#xF2D8;"
-      horiz-adv-x="448" d=" M350.5 159.3C350.5 153.9 352.1 144.9 344.3 144.9C342.7 144.9 341.3 145.7000000000001 340.5 147.3C338.3 152.4 339.4 191.4 339.4 192C339.4 195.8 338.3 204.7 344.3 204.7C351.6 204.7 350.5 197.4 350.5 192V159.3zM265 218.1C265 227.8 266.6 234.1 254.7 234.1V150.4C266.9 150.1 265 159.1 265 168.8V218.1zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM21.3 219.2C21.2 219.1 21.1 218.9 21 218.8H21.3V219.2zM97 256H64V128.2H97V256zM210.3 256H167.2L159.6 196.1C156.9 216.1 154.2 236.2 150.9 256H108.1V128.2H137.1V212.7L149.3 128.2H169.9L181.5 214.6V128.2H210.2V256zM296.6 210.7C296.6 218.8 296.9000000000001 227.5 295.2000000000001 235.1C290.9000000000001 257.6 263.8000000000001 256 246.2000000000001 256H221.6000000000001V128.2C307.7000000000001 128.1 296.6 122.2 296.6 210.7zM382.5 193.4C382.5 210.7 381.7 223.5 360.3 223.5C351.4000000000001 223.5 345.4000000000001 220.8 339.4000000000001 214.3V256H307.7000000000001V128.2H337.5000000000001L339.4000000000001 136.3C345.1 129.5 351.3 126.5 360.3 126.5C380.1 126.5 382.5 141.7 382.5 157.4V193.4z" />
-    <glyph glyph-name="instagram"
-      unicode="&#xF16D;"
-      horiz-adv-x="448" d=" M224.1 307C160.5 307 109.2 255.7 109.2 192.1S160.5 77.2 224.1 77.2S339 128.5 339 192.1S287.7 307 224.1 307zM224.1 117.4C183 117.4 149.4 150.9 149.4 192.1S182.9 266.8 224.1 266.8S298.8 233.3 298.8 192.1S265.2 117.4 224.1 117.4zM370.5 311.7C370.5 296.8 358.5 284.9 343.7 284.9C328.8 284.9 316.9 296.9 316.9 311.7S328.9 338.5 343.7 338.5S370.5 326.5 370.5 311.7zM446.6 284.5C444.9000000000001 320.4 436.7000000000001 352.2 410.4000000000001 378.4C384.2000000000001 404.6 352.4000000000001 412.8 316.5 414.6C279.5 416.7 168.6 416.7 131.6 414.6C95.8 412.9 64 404.7 37.7 378.5S3.3 320.5 1.5 284.6C-0.6 247.6 -0.6 136.7 1.5 99.7C3.2 63.8 11.4 32 37.7 5.8S95.7 -28.6 131.6 -30.4C168.6 -32.5000000000001 279.5 -32.5000000000001 316.5 -30.4C352.4 -28.7 384.2 -20.5000000000001 410.4 5.8C436.6 31.9999999999999 444.8 63.8 446.6 99.6999999999999C448.7 136.6999999999999 448.7 247.5 446.6 284.5zM398.8 60C391 40.4 375.9000000000001 25.3 356.2 17.4C326.7 5.7 256.7 8.4 224.1 8.4S121.4 5.8 92 17.4C72.4 25.2 57.3 40.3 49.4 60C37.7 89.5 40.4 159.5 40.4 192.1S37.8 294.8 49.4 324.2C57.2 343.8 72.3 358.9 92 366.8C121.5 378.5 191.5 375.8 224.1 375.8S326.8 378.4 356.2 366.8C375.8 359 390.9 343.9 398.8 324.2C410.5 294.7 407.8 224.7 407.8 192.1S410.5 89.4 398.8 60z" />
-    <glyph glyph-name="internet-explorer"
-      unicode="&#xF26B;"
-      horiz-adv-x="512" d=" M483.049 288.294C493.904 312.8690000000001 504.473 348.7320000000001 504.473 376.165C504.473 448.887 424.832 474.536 294.8 414.742C187.168 421.923 83.579 341.072 57.7019999999999 228.2850000000001C88.554 263.1470000000001 135.973 310.5830000000001 179.679 329.4430000000001C125.404 281.15 79.128 219.998 43.992 156.275C23.246 118.349 0 57.06 0 11.253C0 -87.322 92.854 -75.2470000000001 180.251 -30.753C211.674 -46.183 246.81 -46.326 281.9460000000001 -46.326C379.0700000000001 -46.326 466.1950000000001 7.968 498.76 99.696H377.927C325.418 11.103 181.108 46.7 181.108 147.132H509.9C516.307 190.713 508.245 242.847 483.049 288.294zM64.559 101.123C82.27 49.973 118.262 5.252 164.825 -22.181C76.084 -71.1210000000001 -8.442 -51.277 64.559 101.1229999999999zM180.536 209.996C182.536 265.147 230.812 304.867 284.516 304.867C337.9340000000001 304.867 386.497 265.147 388.497 209.996H180.536zM365.072 397.596C386.497 407.883 413.635 419.599 437.63 419.599C469.052 419.599 491.904 397.882 491.904 365.877C491.904 345.874 484.477 316.87 477.335 298.01C451.0549999999999 340.302 411.349 379.594 365.072 397.596z" />
-    <glyph glyph-name="ioxhost"
-      unicode="&#xF208;"
-      horiz-adv-x="640" d=" M616 288H548.7C511.2 377.3 422.9 440 320 440C183 440 72 329 72 192C72 175.6 73.6 159.5 76.7 144H24C10.7 144 0 133.2 0 120C0 106.7 10.7 96 24 96H91.3C128.8 6.7 217.1 -56 320 -56C457 -56 568 55 568 192C568 208.4 566.4 224.5 563.3 240H616C629.3 240 640 250.8 640 264C640 277.3 629.3 288 616 288zM520 192C520 81.5 430.5 -8 320 -8C244.3 -8 178.4 34 144.5 96H424C437.3 96 448 106.8 448 120C448 133.3 437.3 144 424 144H125.8C122 159.4 120 175.4 120 192C120 302.5 209.5 392 320 392C395.7 392 461.6 350 495.5 288H216C202.7 288 192 277.2 192 264C192 250.7 202.7 240 216 240H514.2C518 224.6 520 208.6 520 192zM216 216H424C437.3 216 448 205.3 448 192C448 178.8 437.3 168 424 168H216C202.7 168 192 178.7 192 192C192 205.2 202.7 216 216 216z" />
-    <glyph glyph-name="itunes-note"
-      unicode="&#xF3B5;"
-      horiz-adv-x="384" d=" M381.9 59.8C375.5 32.4 354.7 17 326.8 11.8C302.3 7.3 281.9 6.2 262.3 22C238.4 42.1 238.1 75.4 259.6 96.4C276.6 112.6 300.5 115.9 336.4 122.2C342.4 123.3 347.6 124.7 352 129.6C358.4 136.8 356.4 133.7 356.4 292.8C356.4 304 350.9 307.1 339.4 305.1C331.2 303.7 153.7 270.5 153.7 270.5C143.5 268.3 140.3 265.3 140.3 253.8C140.3 19.1 141.4 29.9 137.8 14.3C133.6 -3.9 122.4 -17.6 107.6 -25.2C90.8 -34.5000000000001 60.4 -38.6 44.2 -35.6C1 -27.5 -14.2 22.4 15.1 51C32.1 67.2 56 70.5 91.9 76.8C97.9 77.9 103.1 79.3 107.5 84.2C117.6 95.7 109.3 340.8 112.7 354.4C113.5 359.6 115.7 364 119.8 367.3C124 370.8 131.6 372.8 133.2 372.8C337.2 411 362.1 415.9 365.6 415.9C377.1 416.7 383.7 409.9 383.7 398.3C383.9 53.8 384.8 72.3 381.9 59.8z" />
-    <glyph glyph-name="itunes"
-      unicode="&#xF3B4;"
-      horiz-adv-x="448" d=" M223.6 367.7C129 367.7 52.5 291 52.5 196.5S129 25.2 223.6 25.2S394.8 101.9 394.8 196.4C394.8 291 318.1 367.7 223.6 367.7zM303 127.7C299.8 114.1 289.5 106.5 275.7 103.9C263.6 101.7 253.5 101.1 243.8 108.9C232 118.9 231.8 135.3 242.4 145.7C250.8 153.7 262.7 155.3 280.4 158.5C283.4 159 286 159.7 288.1 162.2C291.3 165.8 290.3 164.2 290.3 243C290.3 248.6 287.6 250.1 281.9 249.1C277.9 248.4 190 232 190 232C185 230.9 183.3 229.4 183.3 223.7C183.3 107.6 183.8 112.9 182.1 105.2C180 96.2 174.5 89.4 167.2 85.6C158.9 80.9999999999999 143.8 78.9999999999999 135.8 80.4C114.4 84.4 106.9 109.1 121.4 123.3C129.8 131.3 141.7 132.9 159.4 136.1C162.4 136.6 165 137.3 167.1 139.8C172.1 145.5 168 266.8 169.7 273.5C170.1 276.0999999999999 171.2 278.3 173.2 279.9C175.3 281.5999999999999 179 282.5999999999999 179.9 282.5999999999999C280.9 301.5999999999999 293.2 304 295 304C300.7 304.4 304 301 304 295.3C303.8999999999999 124.6999999999999 304.3999999999999 133.9 303 127.6999999999999zM345.2 416H102.8C45.9 416 0 370.1 0 313.2V70.8C0 13.9 45.9 -32 102.8 -32H345.2C402.2 -32 448 13.9 448 70.8V313.2C448 370.1 402.1 416 345.2 416zM223.6 4C117.3 4 31.1 90.2 31.1 196.5S117.3 389 223.6 389S416.1 302.8 416.1 196.5S329.9 4 223.6 4z" />
-    <glyph glyph-name="java"
-      unicode="&#xF4E4;"
-      horiz-adv-x="377.6" d=" M121.6 52S102 40.6 135.5 36.8C176.1 32.2 196.8 32.8 241.5 41.3C241.5 41.3 253.3 33.9 269.7 27.5C169.5 -15.4 42.9 30 121.6 52M109.4 108.1S87.5 91.9 121 88.4C164.3 83.9 198.6 83.6 257.8 95.0000000000001C257.8 95.0000000000001 266 86.7000000000001 278.9000000000001 82.2000000000001C157.6 46.7 22.6 79.3000000000001 109.4 108.1M212.6 203.2C237.3 174.8 206.1 149.2000000000001 206.1 149.2000000000001S268.8 181.6 240.0000000000001 222.1000000000001C213.1 259.9000000000001 192.5 278.7000000000001 304.1 343.4000000000001C304.2000000000001 343.4000000000001 128.9 299.6 212.6 203.2000000000001M345.2000000000001 10.6S359.7000000000001 -1.3 329.3000000000001 -10.6C271.4000000000001 -28.1 88.5000000000001 -33.4 37.7 -11.3C19.4 -3.4 53.7 7.7 64.5 10.0000000000001C75.7000000000001 12.4 82.2000000000001 12.0000000000001 82.2000000000001 12.0000000000001C61.9000000000001 26.3000000000001 -49.1 -16.1 25.8 -28.1999999999999C230.0000000000001 -61.3999999999999 398.2000000000001 -13.3 345.2000000000001 10.6000000000001M131 166.2S37.9 144.1 98 136.1C123.4 132.7 174 133.5 221.1 137.4C259.6 140.6 298.3 147.6 298.3 147.6S284.7 141.8 274.9000000000001 135.1C180.4 110.2 -2.1 121.8 50.4 147.2C94.9 168.6 131 166.2 131 166.2M298 72.9C394.1 122.8 349.6 170.8 318.6 164.3C311 162.6999999999999 307.6 161.3 307.6 161.3S310.4000000000001 165.6999999999999 315.8 167.6C377.1 189.2 424.3 103.9999999999999 296 70.3C296 70.4 297.5 71.6999999999999 298 72.9M240 448S293.2 394.8 189.5 313C106.4 247.4 170.5 209.9 189.5 167.2C141 211 105.4 249.5 129.3 285.4C164.4 337.9 261.5 363.5 240 448M140.5 -62.4C232.7 -68.2999999999999 374.3 -59.1 377.6 -15.5C377.6 -15.5 371.2000000000001 -32 301.4000000000001 -45.2C222.7000000000001 -60 125.6 -58.3 68.1 -48.8C68.1 -48.7 79.9 -58.5 140.5 -62.4" />
-    <glyph glyph-name="jedi-order"
-      unicode="&#xF50E;"
-      horiz-adv-x="448" d=" M231.89 112.28L263.33 158.17L243.15 102.67L305.71 93.58L243.15 84.5L267.37 37.07S237.15 68.84 232.88 73.32C234.64 4.54 235.07 -12.38 235.07 -12.38S389.4700000000001 59.27 303.69 217.71C303.69 217.71 410.66 335.78 313.78 408.44C313.78 408.44 479.28 308.53 374.33 136.98C374.33 136.98 461.11 221.75 415.7 307.52C415.7 307.52 494.41 196.51 398.54 74.41C398.54 74.41 424.78 90.56 447.99 152.12C447.99 152.12 431.06 -31.14 226.03 -33.5400000000001V-33.5600000000001H221.9499999999999V-33.5400000000001C16.93 -31.14 0 152.12 0 152.12C23.21 90.56 49.44 74.41 49.44 74.41C-46.43 196.5200000000001 32.29 307.5200000000001 32.29 307.5200000000001C-13.12 221.7400000000001 73.67 136.98 73.67 136.98C-31.28 308.54 134.21 408.44 134.21 408.44C37.33 335.78 144.3 217.71 144.3 217.71C58.52 59.27 212.92 -12.38 212.92 -12.38S213.35 4.55 215.11 73.32L180.63 37.07L204.85 84.5L142.29 93.58L204.85 102.67L184.67 158.17L216.11 112.28C218.36 200.13 223.93 418.1 223.96 419.13L223.97 421.56L223.99 420.56L224.02 421.56L224.03 419.13C224.08 417.41 229.64 199.93 231.89 112.28z" />
-    <glyph glyph-name="jenkins"
-      unicode="&#xF3B6;"
-      horiz-adv-x="512" d=" M487.1 23C485.7 34.2 468.1 46.1 458.9 54.9C453.8 59.9 429.9000000000001 78 428.5000000000001 84.8C427.1000000000001 91.4 438.2000000000001 106.3 441.8000000000001 113.6999999999999C446.9000000000001 124.3999999999999 450.6000000000001 137.3999999999999 453.1000000000001 146.3C471.9000000000001 212.4 473.8000000000001 303.2 446.9000000000001 357.5C436.7000000000001 378.0999999999999 408.3000000000001 406.5 390.5000000000001 420C348.5000000000001 451.6999999999999 270.9000000000001 455.3 220.4000000000001 436.6C206.3000000000001 431.3999999999999 192.6000000000001 426.8 180.3000000000001 419.5C147.2000000000001 400.1 112.0000000000001 387 102.2000000000001 347.9C78.0000000000001 337.1 70.7000000000001 306.1 71.9000000000001 270.1C72.1000000000001 263.1 76.0000000000001 254.3 74.6000000000001 247.7C73.9000000000001 244.4 69.4000000000001 240.1 68.5000000000001 237.9C56.9000000000001 210.2 66.2000000000002 173.9 79.6000000000001 154.1999999999999C87.7000000000001 142.3 101.1000000000001 131.8 118.8000000000002 129C119.5000000000002 118.3999999999999 122.1000000000001 109.3 127.0000000000002 98.6C130.1000000000001 91.8 141.7000000000001 79.6 137.4000000000002 70.9C135.2000000000002 66.5 116.4000000000002 57.1 110.1000000000002 53.3C89 40.8 73.7 33 54.2 19C41.6 10 21.9 8.8 25 -12.1C27.1 -26.2 35.1 -43.7 39.7 -57.9C40.4 -59.9 41.1 -62.0000000000001 41.8 -63.9H463.8C468.7 -48.6 473.5 -33.0000000000001 478.4 -16.7C481.8 -5.3000000000001 488.6 11.1 487.1 22.9999999999999zM205.9 414.3C207.7 414.8 209.3 413.6 210.8 411.9C210.6 406.7 205.4 406.8 201.9 405.1C196.5 398.4 188.5 395.3 181.9 387.9C175.1 380.4 167.5 360.2 158.5 357.9C154 356.8 148.8 358.7 144.9 358.4C134.5 357.7 127.2 352.4 116.6 350.9C130.2 380.8 172.7 404.9 205.9 414.3zM101.1 320.7C114.6 335.6 133.2 344.8 155.9 346.6C167.6 316.9 147.5 281.6 155 249C157.3 239.1 165.2 223.6 152.6 223.3C152.9 251.6 117.8 269.6 91.3 252.9C89.5 274.4 86.4 304.6 101.1 320.7zM137.8 120.5C136.8 124.6 135.1 133.4 135.5 135.6C137.1 144.3 152.6 148.1 146.5 160.3C135.2 160.4 132.7 150.1 122.4 149C95.7 146.4 76.8 184.4 78 207.4C79 226.9 95.6 245.6 118.1 243.2C134.1 241.4 139.5 224 142.6 208.5C151.8 208 165.1 208.9 169.5 216.1C168.9 233.6 160.7 247.7 161.3 263.8C162.3 294.1 178.8 321.4 166.1 351.2000000000001C179.7 382.1 219.6 406.5 249.2 421.2000000000001C285.8 439.5 344.1 424.9000000000001 378.5 405.4000000000001C398.2 394.3 412.9 372.7000000000001 426.8 354.7000000000001C407.3 360.5 390.7 350.5 393.7 334.4000000000001C410 349.3 437.9 334.6 446.2 318C454.1 302.2000000000001 454 278.7000000000001 455.2 255.2000000000001C458.1 198.2000000000001 444.8 139.3000000000001 416.1 98.1C408.4 87.1 402 75.1 391.2 67.5C365.2 49.3 325.8 32.8 292 44.1C247.3 59.1 227 88.9 202.5 122.9C203.2 104.2000000000001 216.3 88.8 229.3 74.5000000000001C240.6 62.0000000000001 254.3 47.9 269 42.1000000000001C256.7 45.0000000000001 237.9 45.9000000000001 232.8 34.9000000000001C204.2 36.8000000000001 177.7 39.7000000000001 164.1 59.1000000000001C153.5 74.5000000000001 142.7 100.5000000000001 137.8 120.5000000000001zM359.8 -3.6C363.9000000000001 -0.6 370.9000000000001 -0.7 377.2 0C371.8 2.7 364.2 3.7 357.9 2.2C357.8 6.4 355.9 9 354.7 12.4C365.3 16.2 390.2 40.9 404.3 32.7C411 28.8 413.8 6.5 414.4000000000001 -4.3C414.8 -13.3 413.6 -22.3 409.9000000000001 -27.1C391.1 -26.5 374.1 -24.3 359.2000000000001 -20.1C360.1 -14 358.2000000000001 -8 359.8000000000001 -3.6zM342.6 16.4C325.8 15.6 316.6 17.6 304.3 27.2C304.5 28 305.7 27.7 305.8 28.6C323.8 20.6 346.6 31.9 364.8 33.4999999999999C356.9000000000001 28.3999999999999 350.2 21.8999999999999 342.6 16.3999999999999zM330.5 -16.8C328.9 -7.4 327 -4.8 327.7 3.4C352.7 20 357.4 -25.2 330.5 -16.8zM226 9.4C214.4 10.1 177.9 23.4 187.5 33.1C196.9 26.6 215 28.2 228.8 25.8C229.6 21.4 226 15.6 226 9.4zM57.7 -49.1C53.4 -36.4 48.5 -24 42.9 -12.2C73.7 11.6 108.2 36.6999999999999 145.1 51.3C147.9 52.4 168.3 25.9 171.3 23.6999999999999C187.8 11.9999999999999 208.3 2.6999999999999 227.5 -6.5000000000001C228.7 -15.3000000000001 231.4 -26.7 236.2 -42.0000000000001C236.9 -44.3000000000001 237.6 -46.7 238.4 -49.2H57.7zM298.3 -54.8H297.5C297.8 -54.6 298 -54.4 298.3 -54.3V-54.8zM305.8 -49.1C307.9000000000001 -47.7 310.1 -46.3 312.2 -44.8C313.3 -46.2 314.4 -47.6 315.4 -49.1H305.8zM320.9000000000001 -24.4C310.1 -31.7 300.3 -42.7 287.6 -49.6C281.6 -52.9 260.6 -61.3 254.2 -59.8C250.6 -59 250.3 -54.5 248.8 -50.3C245.7 -41.3 238.7 -26.9 238 -13.3C237.2 3.9 235.5 32.7 254 29.1C268.9 26.2 286.3 19.4 297.9 12.9999999999999C305 9.1 309 4.3999999999999 319.8 3.4999999999999C319.7 2.1 319.7 0.6999999999999 319.6 -0.8000000000001C313.7 -4.7 304.3 -4.6000000000001 297.8 -7.9000000000001C307.3 -8.3000000000001 314.8 -10.6000000000001 321.3 -13.8000000000001C321.2 -17.2 321 -20.8000000000001 320.9 -24.4000000000001zM374.3 -49.1H360.3C360.2 -45.9 357.5 -43.3 354.2 -43.3S348.3 -45.9 348.1 -49.1H330.7C327.9 -44.7 325 -40.5 321.8 -36.6C323.9000000000001 -34.4 325.8 -31.9 327.8 -29.7C336.8 -33.4 342.6 -24.8000000000001 349.5 -25.5000000000001C357.4 -26.3000000000001 363.7 -37.2 374.9 -36.5000000000001L374.3 -49.1000000000001zM383 -49.1C383.2 -45.1 383.4 -41.3 383.6 -37.6C399.2000000000001 -30.3 412.6 -38.9 419.3 -49.1H383zM466.4 -12.1C464.1 -23.3 460.6 -36.1 456.5 -49.2C456.3 -49.1 456.1 -49.1 455.9 -49.1H428C428.6 -48 429.2 -46.9 429.9 -45.8C427.3 -39.7 420.9 -37.1 419 -30.3C431.1 -7.6 425.5 63.1 394.8 48.2C399.1 54.5 410.4000000000001 59.7 415.6 67.5C428.6 57.1 436.4000000000001 47.2 448.8 36.1C455.6 30.1 468.8 22.8 470.2 13C471 7.5 467.6 -5.9 466.4 -12.1zM222.2 317.5C227.6 332.4 249.4 352.2 267.2 349.5C274.9 348.3 285.2 341.3 279.4 331.8C249.2 338.8 234.2 319.2 225 298.7C216.9 300.7 220.1 311.8 222.2 317.5zM406.3 254.4C414.5 258 428.7 255.1 435.9 259.7000000000001C431.7 271.2000000000001 425.6 281.1 426.6 297.4000000000001C427.1 297.4000000000001 427.6 297.4000000000001 428 297.3000000000001C434.8 283.1 440.7 268.1 449.3999999999999 255.6C443.7 242.1 405.7999999999999 230.2 406.2999999999999 254.4000000000001zM426.7 297.4zM309.5 251.7C302.7 262.6 290.5 284.2 295 297C301.5 285.1 303.6 272.6 312.8 263.7C316.9 259.7 325 254.7 321 243.5C320.1 240.8 313.2 234.9 309.3 233.8C294.9 229.5 261.4 232.9 272.7 250.9C284.5999999999999 250.2 300.5999999999999 243.1 309.5 251.7zM336.8 181.7C340.6 175.1 338.2 163 348.9 161.1C369.1 157.7 392.5 173.4 407 178.9C416 194.1 406.2 199.6 398.1 209.4C381.5 229.4 359.3 254.2 360.1 284.1C366.8 289 367.4000000000001 276.7 368.3 274.4C377 254.1 398.7 228.2 414.6 210.9C418.5 206.6 424.9000000000001 202.5 425.6 199.7C427.7000000000001 191.5 420.2000000000001 181.7 421.1 176.2C399.4000000000001 162.3 375.3 147.1 339.7000000000001 150.6C332.3000000000001 157.3 329.4000000000001 172 336.8000000000001 181.7zM135.5 190.9C128.6999999999999 194.8 127.0999999999999 211.9 119.0999999999999 212.3C107.6999999999999 213 109.7999999999999 190.1 109.7999999999999 176.8C101.9999999999999 183.9 100.5999999999999 205.9 106.2999999999999 217.1C99.7 220.3 96.7999999999999 213.5 93.2 211.2C97.9 245.3 143 227 135.5 190.9zM435.1 162.1C425 142.9 410.7 121.7 381.1 121.1C380.5 127.3 380 136.7 381.1 140.5C403.8 142.6999999999999 417.7 154.1999999999999 435.1 162.1zM293.2 149.7C312.0999999999999 139.8 346.8 138.7 372.5 139.5C373.8999999999999 133.9 373.8 126.9 373.8999999999999 120.1C340.8999999999999 118.3 301.8999999999999 126.5 293.2 149.7000000000001zM385.3999999999999 103C383.7 98.7 380.0999999999999 93.7 375.5999999999999 91.9C363.4999999999999 87 329.9999999999999 83.2 313.2 92.2C302.5 97.9 295.7 110.7 289.8 118.2C287 121.8 272.9 131.1 289.6 131.1C302.7 98.4 347.6 102.1 385.4 102.9999999999999z" />
-    <glyph glyph-name="joget"
-      unicode="&#xF3B7;"
-      horiz-adv-x="496" d=" M227.5 -20.7C218.5 -7.1 207.6 12.6 203.8 21.7C198.1 35.4 176.6 67.3 235 88.8C286.7 107.9 411.7 105.3 443.8 106.4C439.8 97.4 435.2 88.5 429.9000000000001 79.8C389.5000000000001 14.3 319.5 -21.7 247.9000000000001 -21.7C241.1 -21.7 234.3000000000001 -21.3000000000001 227.5000000000001 -20.7M66.1 304.1C128 404.6 259.6 435.8 360.1 373.9C434.9000000000001 327.8 471.3 243 459.4 161.2000000000001C434.5000000000001 161.7000000000001 280.1 164.8000000000001 229.1 166.1C173.6 167.5 147.4 186.9 170.6 214.3C193.8 241.7 221.7 255 239.5000000000001 265.5C257.4000000000001 276 266.8 299.2 215.9 295.2C87.3 286.5 48.6 195.9 37.6 155C28.8 204.7 37.5 257.7 66.1 304.1M36.9 322.1C-35 205.5 1.3 52.8 117.9 -19.1C234.5 -91 387.2 -54.7 459.1 61.8C531 178.4 494.7 331.2 378.1 403C337.6 428.1 292.6 440 248.2 440C165 440 83.8 398.1 36.9 322.1M281.3 211.7C249.8 191.2 216 180.4 216 180.4L385.5 182L432 205.4S435.6 214.9 412.9 220.9C390.2 226.9 355.9 209.6 326.2 193.7C296.5 177.9 295.1 185.5 295.1 185.5S335.3 213.6 345.8 220C356.3 226.4 377.7 234 359.2 244.6C356 246.4 352.5 247.3 348.8 247.3C331 247.3 307.3 228.6 281.3 211.7" />
-    <glyph glyph-name="joomla"
-      unicode="&#xF1AA;"
-      horiz-adv-x="448" d=" M0.6 355.9C0.6 389.2 27.4 416 60.4 416C90.4 416 114.9 394.1 119.6 365.8C152.2 373.4 186.7 365.2 216.1 335.8L171.8 291.5C151.3 312 129.2 307.8 116.4 295C102.1 280.7 102.1 257.1 116.4 242.8L215.9 143.3L171.9 99C84.2 186.2 122.2 148.7 72.1 198.7C45.3 225.2 37.1 263.5 47.3 297.6C20.4 303.4 0.6 327.3 0.6 355.9zM130.1 239.5L174.4 195.2C184.4 205.2 264.1 284.9 274.1 295C288.4 309.3 311.7 309.3 326 295C338.8 282.2 343 260 322.5 239.6L366.5 195.3C397.7 226.5 405 262.9 395.3999999999999 296.5C424.5999999999999 300.6 447.2999999999999 325.7 447.2999999999999 356C447.2999999999999 389.2 420.4999999999999 416.1 387.4999999999999 416.1C357.1999999999999 416.1 332.0999999999999 393.6 327.9999999999999 364.5C294.1999999999999 374.4 256.2999999999999 366 229.6999999999999 339.4C211.3999999999999 320.3 158.5999999999999 267.9 130.0999999999999 239.5zM396.4 87.3C404.6 120 395.5 155.8 370.1 181.2000000000001C358.3 193.4 375.1 176.5000000000001 270.6 280.9000000000001L226.3 236.6L326 136.9C340.3 122.6 340.3 99.3 326 85.0000000000001C313.2 72.2000000000001 291 68.0000000000001 270.6 88.5000000000001L226.6 44.2C254.2 14.0000000000001 294.6 5.4 329.3 16.2C334.8 -11.1999999999999 359 -31.9 388.2 -31.9C421.2 -31.9 448 -5.1 448 28.2C448 58.4 425.5 83.2000000000001 396.3999999999999 87.3000000000001zM312.1 140.4L268.1 184.7000000000001C181.1 98.3000000000001 217.7 134.3000000000001 168.4 84.9C154.1 70.6 130.8 70.6 116.5 84.9C103.4 98.3 99.6 120.2000000000001 119.7 140.3L75.7 184.6C45.5 154.4 37.7 119.4 46.2 86.3C19.5 80.3 0 56.4 0 28.1C0 -5.2 26.8 -32 59.8 -32C88.4 -32 112.3 -12.2 118.4 14.7C151.1 6.5 186.9 15.3 212.6 40.7C244.7 72.7 224.8 53.1 312.1 140.4z" />
-    <glyph glyph-name="js-square"
-      unicode="&#xF3B9;"
-      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM243.8 66.6C243.8 23 218.2 3.1 180.9 3.1C147.2 3.1 127.7 20.5 117.7 41.6L152 62.3C158.6 50.6 164.6 40.7 179.1 40.7C192.9 40.7 201.7 46.1 201.7 67.2V210.3H243.8V66.6zM343.4 3.1C304.3 3.1 279 21.7 266.7 46.1L301 65.9C310 51.2 321.8 40.3 342.5 40.3C359.9 40.3 371.1 49 371.1 61.1C371.1 75.5 359.7000000000001 80.6 340.4000000000001 89.1L329.9000000000001 93.6C299.5000000000001 106.5 279.4000000000001 122.8 279.4000000000001 157.1C279.4000000000001 188.7000000000001 303.5000000000001 212.7 341.0000000000001 212.7C367.8000000000001 212.7 387.0000000000001 203.4 400.8000000000001 179L368 158C360.8 170.9 353 176 340.9 176C328.6 176 320.8 168.2 320.8 158C320.8 145.4 328.6 140.3 346.7 132.4L357.2 127.9C393 112.6 413.0999999999999 96.9 413.0999999999999 61.7C413.0999999999999 23.9 383.2999999999999 3.1 343.3999999999999 3.1z" />
-    <glyph glyph-name="js"
-      unicode="&#xF3B8;"
-      horiz-adv-x="448" d=" M0 416V-32H448V416H0zM243.8 66.6C243.8 23 218.2 3.1 180.9 3.1C147.2 3.1 127.7 20.5 117.7 41.6L152 62.3C158.6 50.6 164.6 40.7 179.1 40.7C192.9 40.7 201.7 46.1 201.7 67.2V210.3H243.8V66.6zM343.4 3.1C304.3 3.1 279 21.7 266.7 46.1L301 65.9C310 51.2 321.8 40.3 342.5 40.3C359.9 40.3 371.1 49 371.1 61.1C371.1 75.5 359.7000000000001 80.6 340.4000000000001 89.1L329.9000000000001 93.6C299.5000000000001 106.5 279.4000000000001 122.8 279.4000000000001 157.1C279.4000000000001 188.7000000000001 303.5000000000001 212.7 341.0000000000001 212.7C367.8000000000001 212.7 387.0000000000001 203.4 400.8000000000001 179L368 158C360.8 170.9 353 176 340.9 176C328.6 176 320.8 168.2 320.8 158C320.8 145.4 328.6 140.3 346.7 132.4L357.2 127.9C393 112.6 413.0999999999999 96.9 413.0999999999999 61.7C413.0999999999999 23.9 383.2999999999999 3.1 343.3999999999999 3.1z" />
-    <glyph glyph-name="jsfiddle"
-      unicode="&#xF1CC;"
-      horiz-adv-x="576" d=" M510.634 210.538C505.907 213.159 504.97 216.286 504.253 221.314C501.9010000000001 237.802 500.7140000000001 254.933 495.1560000000001 270.409C459.2610000000001 370.366 341.1660000000001 413.795 248.3070000000001 362.055C220.9370000000001 346.805 199.3360000000001 325.6860000000001 182.8140000000001 298.1520000000001C179.6300000000001 299.6600000000001 177.3560000000001 300.862 174.9900000000001 301.838C144.8880000000001 314.259 115.9410000000001 311.9590000000001 89.6590000000001 292.6710000000001C64.1280000000001 273.9340000000001 53.2370000000001 248.123 56.9830000000001 216.263C57.3380000000001 213.238 55.0160000000001 208.642 52.4690000000001 206.7180000000001C12.7570000000001 176.7260000000001 -3.5619999999999 128.653 10.5670000000001 82.1030000000001C24.3980000000001 36.5340000000001 68.0810000000001 2.3070000000001 116.1750000000001 0.6700000000001C146.4660000000001 -0.3609999999999 176.8120000000001 0.1240000000001 207.1340000000001 0.1310000000001C291.1750000000001 0.1520000000001 375.2240000000001 -0.3999999999999 459.2540000000001 0.6110000000001C511.9180000000001 1.2450000000001 555.3620000000001 37.4840000000001 567.4660000000001 87.9040000000001C579.0060000000001 135.9780000000001 556.3220000000001 185.2040000000001 510.6340000000001 210.5380000000001zM531.741 53.658C513.511 31.226 489.398 18.405 460.461 18.008C403.587 17.227 346.694 17.778 289.8090000000001 17.778C289.8090000000001 17.078 126.781 17.619 126.081 17.624C82.22 17.956 49.342 37.39 30.906 77.619C12.004 118.864 26.902 168.4670000000001 65.092 193.725C74.274 199.798 77.597 205.291 75.188 216.861C69.698 243.222 79.641 264.817 101.608 279.842C124.595 295.5650000000001 149.03 295.988 173.642 282.925C183.911 277.475 188.249 271.361 195.84 285.452C210.0620000000001 311.851 230.3970000000001 332.179 256.511 346.746C353.971 401.112 484.881 339.178 486.751 214.049C486.873 205.899 489.163 201.621 496.599 198.155C554.1590000000001 171.326 571.0550000000001 102.033 531.7410000000001 53.658zM443.952 134.1570000000001C438.104 103.0000000000001 409.33 79.061 377.286 79.062C360.3330000000001 79.063 345.228 85.607 333.207 96.767C305.51 122.48 262.066 171.747 237.27 190.154C217.214 205.042 195.28 202.487 176.998 186.372C127.002 142.3010000000001 192.857 64.597 244.061 109.184C248.609 113.144 251.901 118.727 256.805 122.028C264.989 127.537 277.571 122.912 269.973 111.406C252.615 85.122 220.643 73.209 191.11 82.105C162.213 90.809 142.27 118.073 142.484 152.284C143.709 174.769 154.848 195.344 177.898 208.249C200.473 220.887 224.267 221.395 244.889 205.775C295.68 167.3 320.467 124.03 352.185 104.53C376.743 89.431 406.439 97.167 421.008 122.036C449.838 171.245 386.416 227.052 342.14 185.4959999999999C338.151 181.7519999999999 335.223 176.5639999999999 330.73 173.7759999999999C319.755 166.9649999999999 313.397 177.8889999999999 317.921 184.1289999999999C338.6239999999999 212.6829999999999 368.385 224.5689999999999 401.192 212.3429999999999C432.6209999999999 200.6289999999999 450.3 167.9769999999999 443.952 134.1569999999999z" />
-    <glyph glyph-name="keybase"
-      unicode="&#xF4F5;"
-      horiz-adv-x="412.3" d=" M177.2 17.1C177.2 7.3 169.2 -0.7 159.4 -0.7S141.6 7.3 141.6 17.1S149.6 34.9 159.4 34.9C169.2 35.0000000000001 177.2 27.0000000000001 177.2 17.1zM270 35C260.2 35 252.2 27 252.2 17.2S260.2 -0.6 270 -0.6S287.8 7.4 287.8 17.2S279.8 35 270 35zM412.3 71C412.3 32.1 404.7 -2.9 390.1 -32H362.8C386.3 6.7 393.3 62.8 385.2 102.3C369.1 72.8 333.1 63.7 299.3 73.5C171.5 111 106.8 53.8 64.7 23.2L83.6 82.5L43.7 40.2C48.5 13.5 59.4 -11.1 74.9 -32.1H46.1C36.4 -16.3 28.9 0.9 23.9 19.2L0.1 -6C0.1 68.9 -5.4 141.6 61.6 209.2C81.8 229.6 105.3 245.4 130.7 255.9C123.9 269.4 121.2 285.1 122.9 301.9L103 303.1C85.1 304.2 71.4 319.6 72.4 337.5V337.6L74 363.8C75.1 380.9 89.4 394.4 106.5 394.4C107.8 394.4 106.2 394.5 134.7 392.7C148.6 391.9 156.2 382.9 157.5 381.3C164.6 391.7 172 401.8 182.1 415.8L202.7 403.7C189.1 374.7 193.6 367.5 193.7 367.4C197.6 367.4 207.6 367.9 226.1 361.7C246 355.1 262 341 271 322C271.4 321.1 286.5 293 272.2 259.4C291.2 253.3 323.5 239.5 354.6 207.6C391.2000000000001 170 412.3 120.2000000000001 412.3 71zM128 325.7C131.2 335.7 135.7 345.4 141.1 355.1C141.2 357.1 143.3 368.2 133.3 368.9C104.8 370.7 107 370.5 106.6 370.5C102 370.5 98.3 367 98 362.4L96.4 336.2C96.1 331.5 99.8 327.4 104.5 327.1L128 325.7zM153.8 263.9C159.4 254.5 167.9 247.8 176.1 243.9C176.1 265.1 204.6 285.8 228.9000000000001 261.4L237.3000000000001 251.1C258.1 269.9 256.7000000000001 296.4 249.4000000000001 312C235.6 341.1 202.5 344 195.1 343.7C184.8 343.3 175.4 349.1 171.4 359C157.7000000000001 337.8 134.2000000000001 296.5 153.8000000000001 263.9zM236.7 195.5L217 179.4C215.1 177.8 214.8 175 216.4 173.1L225.3 162.2C226.3 161 229.1 159.5 231.6 161.6L251.2 177.6L256.7000000000001 170.8C261.6 164.8 270.5000000000001 172.1999999999999 265.7000000000001 178.1C202.1000000000001 256.4 224.2000000000001 229.2 210.4 246.2C205.7000000000001 252.2 196.5 244.8 201.4 238.9C203.3000000000001 236.6 219.8000000000001 216.3 221.2000000000001 214.5999999999999L211.6000000000001 206.6999999999999C207.0000000000001 202.8999999999999 214.2000000000001 193.3999999999999 219.0000000000001 197.2999999999999L228.7000000000001 205.2999999999999L236.7000000000001 195.4999999999999zM355.1 169.8C338.2000000000001 193.5 312.5 216.5 281.7000000000001 230.2C273.8000000000001 233.7 266.7000000000001 236.3 258.8000000000001 238.8C256.8000000000001 236.6 254.7000000000001 234.5 252.4000000000001 232.6L284.3000000000001 193.4C294.7000000000001 180.7000000000001 292.8000000000001 161.9 280.1000000000001 151.5000000000001C278.8000000000001 150.4 267.0000000000001 140.8000000000001 251.1000000000001 146.6000000000001C248.2000000000001 144.3000000000001 241.0000000000001 136.7000000000001 228.9000000000001 136.7000000000001C220.3000000000001 136.7000000000001 212.3000000000001 140.5000000000001 206.8000000000001 147.2000000000001L197.9000000000001 158.1000000000001C191.6000000000001 165.9000000000001 190.0000000000001 176.0000000000001 192.9000000000001 184.9000000000001C184.7000000000001 194.8000000000001 184.6000000000001 206.2000000000001 188.3000000000001 214.9000000000001C181.1000000000001 216.2000000000001 161.6000000000001 221.1000000000001 145.6000000000001 236.3000000000001C89.8000000000001 215.6000000000001 57.6000000000001 171.9000000000001 44.3000000000001 145.1000000000001C29.4000000000001 114.9000000000001 25.5000000000001 84.2000000000001 24.4000000000001 54.9000000000001C32.6000000000001 63.6000000000001 20.5000000000001 50.8000000000001 138.4000000000001 175.8000000000001L108.5000000000001 82.2000000000001C166.3000000000001 113.3000000000001 232.5000000000001 118.2000000000001 305.9000000000001 96.6C329.5000000000001 89.7000000000001 351.0000000000001 95 361.9000000000001 110.5C373.0000000000001 126.1 370.4000000000001 148.2 355.1000000000001 169.8zM110.6 340.7L126.2 339.7L127.2 355.3L111.6 356.3L110.6 340.7z" />
-    <glyph glyph-name="keycdn"
-      unicode="&#xF3BA;"
-      horiz-adv-x="512" d=" M63.8 38.7L124.3 97.7C156.4 54.9 195.4 31.7 250.9 30.3C281.4 29.6 311.2 37.3 337.3 52.6999999999999C342.4 47.3999999999999 355.8 33.1999999999999 358.2 30.6999999999999C326 9.9999999999999 288.5999999999999 -0.4000000000001 250.1 0.4999999999999C206.8 1.6 165.5 17.1999999999999 132.3999999999999 44.8999999999999C132.6999999999999 45.4999999999999 94.1999999999999 7.3999999999999 93.7999999999999 6.9999999999999C103.2999999999999 -22.8000000000001 80.6999999999999 -55.4 47.4999999999999 -55.4C20.7 -55.3 0 -33.7 0 -6.9C0 27.4 33.1 49.7 63.8 38.7zM418.7 291.1C437.8 259.8 448.3 223.7 447.4 187.1C446.3 142.3 428.4 99.6 398.8 66.1C399.1 65.8 422.6 40.9 422.9 40.6C432.5 41.9 442.1 38.6 448.8 31.5C460.1 19.5 459.6999999999999 0.6 447.7 -10.9C435.7 -22.2 416.8 -21.8 405.3 -9.8C398.6 -2.8 395.9 7.0000000000001 397.7 16.5000000000001C372.8 43.1000000000001 353.3 63.7000000000001 353.3 63.7000000000001C396 97.8000000000001 416.6 143.3000000000001 417.7 187.9C418.3999999999999 216.8000000000001 410.5 245.1 396.5999999999999 270.1L418.7 291.1zM104 394.9C110.7 387.9 113.4 378.1 111.6 368.6L157.5 320.5C152.8 316.7 144.2 310.1 134.7 299.2C109.3 270.7 95.1 234.4 94 196.3C93.3 167.4 100.1 139.1 114 113.9L92 92.4C72.7 124 63.1 160.1 64.2 197.1C65.2 241.7 82.5 284.7 111.7 318.2L86.4 344.6C76.8 343.3 67.2 346.6 60.5 353.7C49.2 365.7 49.6 384.6 61.6 396.1C73.5 407.3 92.2 407 104 394.9zM464.9 440C490.9 440 512 417.6 512 391.7S490.9 344 464.9 344C458.6 343.9 450.9 345.1 449 345.8L386.1 286.1C353.4000000000001 329.7 309.4000000000001 352 259.2000000000001 353.3C228.7000000000001 354 198.9 346.5 173.0000000000001 330.9L151.9000000000001 352.9C184.1 373.7 221.5 384 260 383.1C303.3 382 344.6 366.4 377.7 338.5L418.8 377.1C417.3 381.8 416.6 386.7 416.6 391.6C416.5 418.3 438.9 440 464.9 440zM256.7 334.6C262.2 334.6 267.6 334.2 273.1 333.5C351.2 323.7 406.5 252.4 396.9 174.4C387.1 96.3 315.8 41 237.8 50.6C159.7 60.4 104.4 131.6999999999999 114 209.8C123.3 282.2 184.1 334.4 256.7 334.6zM197.7 215.2C198.3 192.5 209.9 173.4 230.1 163L219.1 111.3H292.8L281.8 163C301.9000000000001 173.9 313.9000000000001 192 314.2 215.2C313.8 248 288.4 272.7 255.9 273.5C223.8 272.7 198.6 248.7 197.7 215.2zM256 288" />
-    <glyph glyph-name="kickstarter-k"
-      unicode="&#xF3BC;"
-      horiz-adv-x="384" d=" M147.3 333.6C147.3 389.8 114.8 416 73.9 416C26.2 416 0 379.8 0 334.6V51.6C0 4.3 25.3 -31.8 74.9 -31.8C114.7 -31.8 147.3 -6.1999999999999 147.3 51.6V128.1L259.4 -10.2C282.1 -37.4 331.5 -40.9 362.6 -10.2C389.6 17.4 389.9 57.2000000000001 370 82L279.2 196.8L354.0999999999999 304.2000000000001C371.4999999999999 328.9000000000001 371.5999999999999 367.3 343.7 394C313.3999999999999 423 261.3 425.6 230.1 381.2000000000001L147.3 263V333.6z" />
-    <glyph glyph-name="kickstarter"
-      unicode="&#xF3BB;"
-      horiz-adv-x="448" d=" M400 -32H48C21.6 -32 0 -10.4 0 16V368C0 394.4 21.6 416 48 416H400C426.4 416 448 394.4 448 368V16C448 -10.4 426.4 -32 400 -32zM199.6 269.5C199.6 300.2 182 314.6 159.9 314.6C134.1 314.6 119.9 294.8 119.9 270.1V115.3C119.9 89.4999999999999 133.6 69.6999999999999 160.4 69.6999999999999C181.9 69.6999999999999 199.6 83.6999999999999 199.6 115.3V157.1L260.2 81.4C272.5 66.5 299.2 64.6 316 81.4C330.6 96.5 330.8 118.2 320 131.8L270.9 194.6L311.4 253.3C320.8 266.8 320.9 287.8 305.8 302.4C289.4 318.3 261.2 319.7 244.4 295.4L199.6 230.7V269.5z" />
-    <glyph glyph-name="korvue"
-      unicode="&#xF42F;"
-      horiz-adv-x="446" d=" M386.5 414H59.5C26.8 414 0 387.2 0 354.5V27.4C0 -5.2 26.8 -32 59.5 -32H386.6C419.6 -32 446.1 -5.2 446.1 27.5V354.5C446 387.2 419.2 414 386.5 414zM87.1 327.2H183.1V211.2L244.9 327.2H355.8L274.6 195.2H87.1V327.2zM248.9 55.1L183.2 168.6999999999999V55.0999999999999H87.2V185.9H278.7L367.3 55.1H248.9z" />
-    <glyph glyph-name="laravel"
-      unicode="&#xF3BD;"
-      horiz-adv-x="640" d=" M637.5 206.4C633.3 211.2 574.7 284.5 564.4 296.9C554.1 309.3 549 307.1 542.6999999999999 306.2000000000001C536.3 305.3 462.1999999999999 292.8 453.5999999999999 291.4C444.9999999999999 289.9 439.5999999999999 286.5 444.8999999999999 279.1C449.5999999999999 272.5 498.2999999999999 203.4 509.0999999999999 188.2L315.3999999999999 141.8L161.2 399.3C155.1 408.4 153.8 411.6 139.8 410.9C125.8 410.3 18.9 401.4 11.3 400.7C3.7 400.1 -4.7 396.7 2.9 378.7S131.9 99.1 135.3 91.5C138.7 83.9 147.5 71.5 168.1 76.5C189.2 81.6 262.4 100.7 302.4 111.2C323.5 72.9 366.6 -4.7 374.6 -15.8C385.2 -30.7 392.6 -28.2 408.9 -23.2C421.7 -19.3 608.5 47.9 616.9 51.3C625.3 54.8 630.5 57.2 624.8 65.7C620.5999999999999 71.9 571.3 137.9 545.5 172.5C563.2 177.2 626.1 193.9 632.8 195.8C640.6999999999999 197.8 641.8 201.6 637.5 206.4zM285.3 134.4C283 133.9 174.5 107.9 168.7 106.6C162.9 105.3 162.9 105.9 162.2 107.9C161.5 109.9 33.2 374.6 31.4 377.9C29.6 381.2 29.7 383.8 31.4 383.8S133.9 392.8 137.4 393C141 393.2 140.6 392.4 141.9 390.2C141.9 390.2 284.1 144.8 286.5 140.5C289.1 136.2 287.6 134.9 285.3 134.4zM591.3 77C593 74.3 594.8 72.5 589.3 70.6C583.9 68.6 405.6 8.5 402.2 7C398.7 5.5 396 5 391.5999999999999 11.5S329.2 118.3 329.2 118.3L518 167.4C522.7 168.9 524.2 169.9 527.2 165.2C530.1 160.4 589.6 79.7 591.3000000000001 77zM603.4 211.1C599.1999999999999 210.2 529.8 193 529.8 193L473.1 270.8C471.4999999999999 273.1 470.2 275.3 474.2 275.8S542.6 288 545.5 288.6C548.4 289.3 550.9 290.1 554.5 285.2000000000001C558.1 280.3 607.1 218.2 609 215.8C610.8 213.5 607.6 212.1 603.4 211.1z" />
-    <glyph glyph-name="lastfm-square"
-      unicode="&#xF203;"
-      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM307.8 103.1C244.4 103.1 222.4 131.7000000000001 210.7 167.2000000000001C194.4 218.2000000000001 189.2 251.5000000000001 147.7 251.5000000000001C125.3 251.5000000000001 102.6 235.4000000000001 102.6 190.3000000000001C102.6 155.1000000000001 120.6 133.1000000000001 145.9 133.1000000000001C174.5 133.1000000000001 193.5 154.4000000000001 193.5 154.4000000000001L205.2 122.5000000000001S185.4 103.1000000000001 144 103.1000000000001C92.7 103.1000000000001 64.1 133.2000000000002 64.1 188.9000000000002C64.1 246.8000000000002 92.7 280.9000000000002 146.6 280.9000000000002C220.1 280.9000000000002 227.4 239.5000000000002 247.4 179.0000000000001C256.2 152.2000000000001 271.6 132.8000000000001 308.6 132.8000000000001C333.5 132.8000000000001 346.7 138.3000000000001 346.7 151.9000000000002C346.7 171.8000000000001 324.9 173.9000000000002 296.8 180.5000000000002C266.4000000000001 187.8000000000002 254.3 203.6000000000002 254.3 228.5000000000002C254.3 268.5000000000002 286.6 280.9000000000002 319.5 280.9000000000002C356.9 280.9000000000002 379.6 267.3000000000002 382.5 234.3000000000002L345.8 229.9000000000002C344.3 245.7000000000002 334.8 252.3000000000002 317.2 252.3000000000002C301.1 252.3000000000002 291.2 245.0000000000002 291.2 232.5000000000002C291.2 221.5000000000002 296 214.9000000000002 312.1 211.2000000000002C344.8 204.1000000000002 383.9 199.2000000000002 383.9 153.7000000000002C384 117.0000000000002 353.2 103.1000000000001 307.8 103.1000000000001z" />
-    <glyph glyph-name="lastfm"
-      unicode="&#xF202;"
-      horiz-adv-x="512" d=" M225.8 80.9L207 131.9S176.5 97.9 130.8 97.9C90.3 97.9 61.6 133.1 61.6 189.4C61.6 261.5 98 287.3 133.7 287.3C200.2 287.3 208.5 234 234.6 152.4C253.4 95.5 288.6 49.8 390 49.8C462.7 49.8 512 72.1 512 130.6999999999999C512 203.5999999999999 449.3 211.2999999999999 397 222.7999999999999C371.2 228.7 363.6 239.2 363.6 256.8C363.6 276.7 379.4000000000001 288.4999999999999 405.2000000000001 288.4999999999999C433.4000000000001 288.4999999999999 448.6 277.8999999999999 450.9 252.7L509.5000000000001 259.7C504.8000000000001 312.5 468.4 334.2 408.6 334.2C355.8 334.2 304.2000000000001 314.3 304.2000000000001 250.3C304.2000000000001 210.3999999999999 323.6 185.1999999999999 372.2000000000001 173.5C417.1 162.8999999999999 452.0000000000001 159.6999999999999 452.0000000000001 127.8C452.0000000000001 106.1 430.9000000000001 97.3 391.0000000000001 97.3C331.8000000000001 97.3 307.1 128.4 293.1 171.1999999999999C261.1 268 249.5000000000001 334.2 131.8 334.2C45.7 334.2 0 279.7 0 187C0 97.9 45.7 49.8 127.9 49.8C194.1 49.8 225.8 80.9 225.8 80.9z" />
-    <glyph glyph-name="leanpub"
-      unicode="&#xF212;"
-      horiz-adv-x="576" d=" M386.539 336.515L401.635 87.56L390.656 87.835C354.424 88.659 319.016 79.052 287.999 59.838C256.983 79.052 221.575 87.835 185.3420000000001 87.835C139.7780000000001 87.835 103.2720000000001 77.13 61.826 60.112L93.117 318.4C121.663 330.203 154.601 336.515 185.343 336.515C226.516 336.515 259.1790000000001 323.3400000000001 288 293.971C315.723 322.242 347.013 335.692 386.539 336.515zM569.07 0C543.5440000000001 0 521.585 5.215 498.528 15.645C464.218 31.29 428.5350000000001 40.623 390.6570000000001 40.623C351.6800000000001 40.623 315.7230000000001 27.722 288.0000000000001 0C260.2770000000001 27.723 224.3200000000001 40.623 185.3430000000001 40.623C147.4650000000001 40.623 111.7820000000001 31.29 77.4720000000001 15.645C55.239 5.764 32.731 0 8.303 0H6.93L49.475 349.141C88.726 371.374 136.486 384 181.775 384C218.83 384 256.984 376.315 288 354.905C319.016 376.315 357.17 384 394.225 384C439.514 384 487.274 371.374 526.5250000000001 349.141L569.07 0zM525.702 44.741L491.666 324.987C460.924 338.986 424.418 346.397 390.657 346.397C352.229 346.397 316.272 334.32 288 307.695C259.728 334.32 223.772 346.397 185.343 346.397C151.582 346.397 115.076 338.986 84.334 324.987L50.298 44.741C97.509 64.228 133.192 78.227 185.343 78.227C222.947 78.227 256.16 68.621 288 48.583C319.84 68.621 353.052 78.227 390.657 78.227C442.808 78.227 478.491 64.228 525.702 44.741z" />
-    <glyph glyph-name="less"
-      unicode="&#xF41D;"
-      horiz-adv-x="640" d=" M612.7 229C612.7 249.5 615.9000000000001 261.6 615.9000000000001 283.6C615.9000000000001 317.8 603.3000000000001 328.8 575.4000000000001 328.8H554.9000000000001V304.6H561.2C575.4000000000001 304.6 578.5 299.9 578.5 282.5C578.5 266.2 576.9 249.9 576.9 231C576.9 206.8 584.8 197.4 600.5 193.7V192.1C584.7 188.4 576.9 179 576.9 154.8C576.9 135.9 578.5 120.6 578.5 103.3C578.5 85.4 574.8 80.7 561.2 80.7V80.2H554.9000000000001V55H575.4000000000001C603.2 55 615.9000000000001 66 615.9000000000001 100.2C615.9000000000001 122.8 612.7 134.4 612.7 154.8C612.7 165.8 619.5 177.4 640 178.4V205.7000000000001C619.5 206.4 612.7 218.0000000000001 612.7 229.0000000000001zM507.1 197C491.3 203.3 476.6 207 476.6 217.5C476.6 225.4 482.9 230.1 494.5 230.1S516.6 225.4 528.1 217L549.1 244.8C536 254.8 518.1 265.3 493.9 265.3C458.2 265.3 434.0000000000001 244.8 434.0000000000001 215.9C434.0000000000001 190.2 456.6000000000001 177 475.5000000000001 169.7C491.8000000000001 163.4 507.6000000000001 158.1 507.6000000000001 147.6C507.6000000000001 139.7 501.3000000000001 134.5 487.1000000000001 134.5C474.0000000000001 134.5 460.8000000000001 139.8 446.6000000000001 150.8L425.6000000000001 120.3C441.4000000000001 107.1999999999999 465.5000000000001 98.1999999999999 485.5000000000001 98.1999999999999C527.5 98.1999999999999 550.1 120.3 550.1 149.1999999999999S527.6 190.1999999999999 507.1 197zM148.2000000000001 137.6C144.5000000000001 137.6 139.8000000000001 140.8 139.8000000000001 150.7000000000001V328.9H65.2C36.8 328.9 24.2 317.9 24.2 283.7C24.2 261.1 27.4 248.5 27.4 229.1C27.4 218.1 20.6 206.5 0.1 205.5V178.2C20.6 177.7 27.4 166.1 27.4 155.1C27.4 135.7 24.2 124.1 24.2 101.4999999999999C24.2 67.3 36.8 56.3 64.7 56.3H85.2V80.4999999999999H78.9C65.8 80.4999999999999 61.6 85.8 61.6 103.1S63.2 135.2 63.2 154.6C63.2 178.8 55.3 188.2 39.6 191.9V193.5C55.4 197.2 63.2 206.6 63.2 230.8C63.2 249.7 61.6 265 61.6 282.3S65.3 304.4 78.9 304.4H93V153.5999999999999C93 121.4999999999999 104 100.4999999999999 136.1 100.4999999999999C146.1 100.4999999999999 154 102.0999999999999 159.7 104.1999999999999L154.4 138.3999999999999C151.3 137.5999999999999 149.8 137.5999999999999 148.2 137.5999999999999zM379.9 197C363.6 203.3 348.9 207 348.9 217.5C348.9 225.4 355.2 230.1 366.8 230.1C378.4 230.1 388.9 225.4 400.4 217L421.4 244.8C408.3 254.8 390.4 265.3 366.2 265.3C330.5 265.3 306.3 244.8 306.3 215.9C306.3 190.2 328.9000000000001 177 347.8 169.7C364.1 163.4 379.9000000000001 158.1 379.9000000000001 147.6C379.9000000000001 139.7 373.6 134.5 359.4000000000001 134.5C346.3 134.5 333.1 139.8 318.9000000000001 150.8L298.4000000000001 120.3C314.2000000000001 107.1999999999999 338.3 98.1999999999999 358.3 98.1999999999999C400.3 98.1999999999999 422.9 120.3 422.9 149.1999999999999C423 178.0999999999999 400.4 190.1999999999999 379.9 197zM224.9 265.8C186.5 265.8 149.8 233.7 150.8 183.3C150.8 131.3 185 100.8 230.1 100.8C249 100.8 270 107.6 286.3 118.7L270.5 146.5C258.8999999999999 139.7 247.9 136.5 236.3 136.5C215.3 136.5 199 146.5 194.8 170.7H290C290.5 174.4 291.6 181.7 291.6 190.1C292.2000000000001 232.7 269 265.8 224.9 265.8zM194.9 199.6C198.1 220.6 210.7 230.6 225.4 230.6C244.3 230.6 251.7 217.5 251.7 199.6H194.9z" />
-    <glyph glyph-name="line"
-      unicode="&#xF3C0;"
-      horiz-adv-x="448" d=" M272.1 243.8V172.7000000000001C272.1 170.9 270.7000000000001 169.5000000000001 268.9000000000001 169.5000000000001H257.5000000000001C256.4000000000001 169.5000000000001 255.4000000000001 170.1000000000001 254.9000000000001 170.8000000000001L222.3000000000001 214.8000000000001V172.6000000000001C222.3000000000001 170.8000000000001 220.9000000000001 169.4000000000001 219.1000000000001 169.4000000000001H207.7000000000001C205.9000000000001 169.4000000000001 204.5000000000001 170.8000000000001 204.5000000000001 172.6000000000001V243.7000000000001C204.5000000000001 245.5000000000001 205.9000000000001 246.9000000000001 207.7000000000001 246.9000000000001H219C220 246.9000000000001 221.1 246.4000000000001 221.6 245.5000000000001L254.2 201.5000000000001V243.7000000000001C254.2 245.5000000000001 255.6 246.9000000000001 257.4 246.9000000000001H268.8C270.6 247.0000000000001 272.1 245.5000000000001 272.1 243.8000000000001zM190.1 247H178.7C176.9 247 175.5 245.6 175.5 243.8V172.7000000000001C175.5 170.9 176.9 169.5000000000001 178.7 169.5000000000001H190.1C191.9 169.5000000000001 193.3 170.9 193.3 172.7000000000001V243.8000000000001C193.3 245.5000000000001 191.9 247.0000000000001 190.1 247.0000000000001zM162.6 187.4H131.5V243.8C131.5 245.6 130.1 247 128.3000000000001 247H116.9C115.1 247 113.7 245.6 113.7 243.8V172.7C113.7 171.8 114 171.1 114.6 170.5C115.2 170 115.9 169.6 116.8000000000001 169.6H162.5000000000001C164.3000000000001 169.6 165.7000000000001 171 165.7000000000001 172.8V184.2C165.7000000000001 185.9 164.3000000000001 187.4 162.6000000000001 187.4zM332.1 247H286.4000000000001C284.7000000000001 247 283.2000000000001 245.6 283.2000000000001 243.8V172.7000000000001C283.2000000000001 171.0000000000001 284.6 169.5000000000001 286.4000000000001 169.5000000000001H332.1C333.9000000000001 169.5000000000001 335.3 170.9 335.3 172.7000000000001V184.1C335.3 185.9 333.9000000000001 187.3 332.1 187.3H301V199.3H332.1C333.9000000000001 199.3 335.3 200.7 335.3 202.5V214C335.3 215.8 333.9000000000001 217.2 332.1 217.2H301V229.2H332.1C333.9000000000001 229.2 335.3 230.6 335.3 232.4V243.8C335.2 245.5 333.8 247 332.1 247zM448 334.3V49C447.9 4.2 411.2 -32.1 366.3 -32H81C36.2 -31.9 -0.1 4.9 0 49.7V335C0.1 379.8 36.9 416.1 81.7 416H367C411.8 415.9 448.1 379.2 448 334.3zM386.4 211.7C386.4 284.7 313.2 344.1 223.3 344.1C133.4 344.1 60.2 284.7 60.2 211.7C60.2 146.3 118.2 91.5 196.6 81.1C215.7 77 213.5 70 209.2 44.3C208.5 40.2 205.9 28.2 223.3 35.5C240.7 42.8 317.2 90.8 351.5 130.2C375.1 156.2 386.4 182.5 386.4 211.7z" />
-    <glyph glyph-name="linkedin-in"
-      unicode="&#xF0E1;"
-      horiz-adv-x="448" d=" M100.3 -32H7.4V267.1H100.3V-32zM53.8 307.9C24.1 307.9 0 332.5 0 362.2C0 391.9 24.1 416 53.8 416C83.5 416 107.6 391.9 107.6 362.2C107.6 332.5 83.5 307.9 53.8 307.9zM448 -32H355.3V113.6C355.3 148.3 354.6 192.8 307 192.8C258.7 192.8 251.3 155.1 251.3 116.1V-32H158.5V267.1H247.6V226.3H248.9C261.3 249.8 291.6 274.6 336.8 274.6C430.8 274.6 448.1 212.7 448.1 132.3V-32z" />
-    <glyph glyph-name="linkedin"
-      unicode="&#xF08C;"
-      horiz-adv-x="448" d=" M416 416H31.9C14.3 416 0 401.5 0 383.7V0.3C0 -17.5 14.3 -32 31.9 -32H416C433.6 -32 448 -17.5 448 0.3V383.7C448 401.5 433.6 416 416 416zM135.4 32H69V245.8H135.5V32zM102.2 275C80.9 275 63.7 292.3 63.7 313.5S80.9 352 102.2 352C123.4 352 140.7 334.7 140.7 313.5C140.7 292.2 123.5 275 102.2 275zM384.3 32H317.9V136C317.9 160.8 317.4 192.7 283.4 192.7C248.8 192.7 243.5 165.7 243.5 137.8V32H177.1V245.8H240.8V216.6H241.7C250.6 233.4000000000001 272.3 251.1 304.6 251.1C371.8 251.1 384.3 206.8 384.3 149.2000000000001V32z" />
-    <glyph glyph-name="linode"
-      unicode="&#xF2B8;"
-      horiz-adv-x="448" d=" M437.4 221.7C437.1 222.6 436.5 223.1 436 223.7L366 262.3C365.1 262.9 364 262.9 362.9 262.3L304 226.3C303.1 225.7 302.6 224.6 302.6 223.7L301.7000000000001 192.3L277.7000000000001 208.3C276.8000000000001 208.9 275.4000000000001 208.9 274.6 208.3L240 187.1L238.6 222.2C238.6 223.1 238 224.2 237.2 224.5L201.2 248.8000000000001L234.9 266.2000000000001C236 266.8000000000001 236.6 267.9000000000001 236.6 269.1L230.9 401.4000000000001C230.9 402.3000000000001 230 403.4000000000001 229.2 404.0000000000001L138.6 447.7C137.7 448 136.9 448 136.3 448L12.6 409.4C11.2 408.8 10.3 407.4 10.6 405.7L38 272.6C38.9 269.2 72 245.2 76.6 241.7L49.7 228.8C48.3 227.9 47.7 226.5 48 225.4L68.6 125.1C69.2 122.2 92.3 101.9999999999999 95.7 98.8L78.3 88.1999999999999C77.4 87.5999999999999 76.6 86.1999999999999 76.9 85.0999999999999C78.3 77.9999999999999 92.3 7.3999999999999 93.8 5.9999999999999L158.9 -63.1000000000001C159.5 -63.7000000000002 160.3 -63.7000000000002 161.2 -64.0000000000001C161.8 -64.0000000000001 162.3 -63.7000000000001 162.9 -63.4000000000001L246.6 3.4999999999999C247.5 4.0999999999999 247.7 4.8999999999999 247.7 5.7999999999999L245.7 51.7999999999999L273.7 28.0999999999999C274.8 27.1999999999999 276.5999999999999 27.1999999999999 277.7 28.0999999999999L344.5999999999999 81.4999999999999C345.4999999999999 82.0999999999999 345.7 82.8999999999999 345.7 83.7999999999999L348 117.1999999999999L368.3 103.1999999999999C369.4 102.2999999999999 370.9 102.2999999999999 372 103.1999999999999L426.6 146.8999999999999C427.2 147.1999999999999 427.7 147.9999999999999 427.7 148.8999999999999C428.6 155.3999999999999 438 219.6999999999999 437.4 221.6999999999999zM232.6 216.9L236.6 124.3L146 63.1L132 159.6999999999999L232.6 216.8999999999999zM224.9 396.9L230.3 270.9L123.7 215.5L104 350.3L224.9 396.9zM44 274.9L18 400L97.7 350.6L117.1 217.7L44 274.9zM74.6 127.1L55.7 218L125.7 159.7L139.4 66.3L74.6 127.1zM98.9 9.4L85.2 76.5L146.9 15.6L156.6 -51.8L98.9 9.4zM163.4 -55.1L152.8 15.8000000000001L238.5 77.2000000000001L241.6 7.2L163.4 -55.1zM245.4 60C245.4 63.4 246.3 82.9 243.4 85.1L219.1 105.1L241.4 120C243.7 121.7 242.5 125.7 242.5 128L271.9 105.4L272.5 37.1L245.4 59.9999999999999zM339.7 85.4L278.8 36.8L278.2 105.4L343.9 152.3L339.7 85.4zM367.4 111.1L348.3 124.5L350.3 158.5C350.6 159.3999999999999 350 160.5 349.2 161.1L308 188.3L308.6 218.3L373.2000000000001 177.7L367.4000000000001 111.1zM422 150.9L373.7 112.6L379.4 177.6999999999999L430.5 214.2999999999999L422 150.8999999999999z" />
-    <glyph glyph-name="linux"
-      unicode="&#xF17C;"
-      horiz-adv-x="448" d=" M196.1 324.4C195.9 325.8 198 326.7 199.3 327.3C201 328 203.2 328.3 204.8 327.4C205.2 327.2 205.6 326.7 205.4 326.3C205 325.1 203 325.3 201.9 324.7000000000001C200.9 324.2000000000001 200.1 323 198.9 323C197.9 322.9000000000001 196.2 323.4000000000001 196.1 324.4000000000001zM220.8 324.7C221.8 324.2 222.6 323 223.8 323C224.9 323 226.6 323.4 226.7 324.5C226.9 325.9 224.8 326.8 223.5 327.4C221.8 328.1 219.6 328.4 218 327.5C217.6 327.3 217.2 326.8 217.4 326.4C217.7 325.1 219.7 325.3 220.8 324.7zM435.5 14.5C435 6.3 429 0.7 421.6 -3.8C406.7000000000001 -12.8 384.3 -19.6 370.7000000000001 -36L368.1 -33.8L370.7000000000001 -36C356.5000000000001 -52.9 339.0000000000001 -62.6 322.4000000000001 -63.9C305.9000000000001 -65.1999999999999 290.4000000000001 -57.6 282.1 -40.9V-40.8C281 -38.6999999999999 280.2000000000001 -36.4 279.6 -34.1C258.1 -35.3 239.4000000000001 -28.8 224.5 -29.9999999999999C202.5 -31.1999999999999 188.7000000000001 -36.4999999999999 176.2000000000001 -36.6C171.4 -47.2 161.9 -54.2 150.3000000000001 -56.7999999999999C134.3000000000001 -60.4999999999999 114.2000000000001 -56.7999999999999 94.4 -46.4L96 -43.4L94.4 -46.4C75.9 -36.6 52.4 -37.5 35.1 -33.9C26.4 -32.1 18.8 -28.9 15 -21.6C11.3 -14.3 12 -4.3 17.2 10.1C18.9 15.2 17.6 22.8 16.4 30.9C15.8 34.8 15.2 38.8 15.2 42.7C15.2 47.0000000000001 15.9 51.2 18 55.1C22.5 63.6 29.8 67.2000000000001 36.5 69.6C43.2 72 49.3 73.6 53.5 77.9C58.7 83.4 63.6 92.3 70.1 98.1C67.5 115.3 70.3 133.5 76.3 151.4C88.9 189.3 115.5000000000001 225.6 134.4 248.1C150.5 271 155.2000000000001 289.4000000000001 156.9 312.8C158 344.6 132.4 448.2 234.8 448C315.7000000000001 447.9 311.1 362.6 310.6 316.7C310.3 286.6 326.9000000000001 266.2 344 244.7C359.2 226.7 379.1 200.4 390.5 170.3C399.8 145.6999999999999 403.4 118.5 394.2 91.1999999999999C395.6 90.6999999999999 397 89.9999999999999 398.3 89.1999999999999C399.7 88.3999999999999 401 87.3999999999999 402.3 86.3C408.9000000000001 80.6999999999999 411 71.9999999999999 412.8 63.9C414.7 55.8 416.4000000000001 48.2 420 44.2C431.1 31.8 435.9 22.7 435.5 14.5zM220.8 338.9C224.4 338 229.7 336.5 233.8 334.5C231.7 346.7 238.3 358 245.6 357.5C254.5000000000001 357.2 259.5 342 254.7 330.2C253.9 328.3 251.9 326.8 250.8 325.6C257.5 323.3 261.8 321.5 263.4000000000001 320.7C271.3 330.2 274.2000000000001 346.9 267.7000000000001 361.1C257.9000000000001 382.5 233.5000000000001 382.9 223.7000000000001 360.7C220.5000000000001 353.5 219.8000000000001 345.8 220.8000000000001 338.9zM174.6 320.1C182.4 325.8 181.5 324.8 180.5 325.6C172.5 332.5 173.9 353 182.3000000000001 353.7000000000001C188.6000000000001 354.2000000000001 193.1000000000001 343 191.9 334.1C195 336.2000000000001 198.6 337.7000000000001 202.1 338.7000000000001C203.8 358 193.1 372.2000000000001 183 372.2000000000001C164.1 372.2000000000001 159 334.7000000000001 174.6 320.1zM165.2 299.2000000000001C166.7 294.3 171.3 288.7000000000001 179.9 283.9C187.7 279.3 191.9 272.4 199.9 268.9C202.5 267.8 205.6 267 209.5 266.8C227.9 265.7000000000001 236.6 278.1 247.7 281.7000000000001C259.4 285.4 267.8 292.7000000000001 270.4 299.8C273.6 308.3 268.3 314.5 259.9 318C248.6 322.9 243.6 323.2 237.3 327.3C227 333.9 218.5 336.2 211.4 336.2C197 336.2 188.2 326.4 183.5 322C183 321.5 175.6 316.1 169.4 311.5C165.2 308.2 163.8 304.1 165.2 299.2zM131.7 46.4L112.1 82C105.3 91.2 98.3 96.8 90.2 98C82.5 99.2 77.6 96.6 72.5 91.1C67.7 86 63.7 78.8 58.2 73.1C50.4 66.6 48.9 66.9 38.6 63.2000000000001C32.3 61.0000000000001 27.3 58.6 23.8 51.9C21.1 46.9 21.7 39.7 22.9 31.9C24.1 24.0000000000001 25.9 15.6 23.5 8.0000000000001V7.8000000000001C18.5 -5.8999999999999 18.5 -13.8999999999999 20.9 -18.5999999999999C28.8 -33.9999999999999 67.5 -24.6999999999999 97.4 -40.4999999999999C128.8 -56.8999999999999 170 -57.5999999999999 172.7 -22.4999999999999C174.8 -1.9999999999999 141.2 26.5000000000001 131.7 46.4000000000001zM285.6 10.6C288.8 21.6 291.9000000000001 31.9 292.4000000000001 39.6C293.2000000000001 54.8 294.0000000000001 68.3 296.8 79.4999999999999C299.9000000000001 92.1 306.1 102.6 318.2 106.8C320.5 127.9 336.9 127.9 356.5 119.3C375.4 110.8 382.5 103.3 379.3 93.1999999999999C380.3 93.1999999999999 381.3 93.3 383.5 93.1999999999999C388.7 110.0999999999999 369.2 121.1999999999999 352.8 128C355.7 140 355.2 152.1 352.4000000000001 163.6999999999999C346.4000000000001 189 329.8 211.5 317.2000000000001 222.6999999999999C314.9000000000001 222.7999999999999 315.1 220.7999999999999 319.8000000000001 216.1999999999999C331.4000000000001 205.5 356.9000000000001 167 343.1000000000001 131.3C339.2000000000001 132.3 335.5000000000001 132.8 332.2000000000001 132.6999999999999C326.9000000000001 161.8 314.7000000000001 185.8999999999999 308.6000000000001 197.2999999999999C297.1000000000001 218.6999999999999 279.1000000000001 262.5999999999999 271.4000000000001 293C266.9000000000001 286.5999999999999 259.0000000000001 281.0999999999999 249.1000000000001 278C244.4000000000001 276.5 239.4000000000001 272.5 233.2000000000001 269C219.3000000000001 261 203.2000000000001 260.2 190.8000000000001 270.2C186.3000000000001 273.8 182.8000000000001 277.8 178.2000000000001 280.5C176.6000000000001 281.4 173.1000000000001 283.8 172.0000000000001 284.5999999999999C170.0000000000001 246.8 144.7000000000001 199.3 132.7000000000001 171.8999999999999C124.4000000000001 152.1999999999999 119.5000000000001 131.0999999999999 118.9000000000001 110.3999999999999C97.1000000000001 139.5 113.0000000000001 176.6999999999999 121.5000000000001 192.7999999999999C131.0000000000001 210.3999999999999 132.5000000000001 215.2999999999999 130.2000000000001 213.5999999999999C121.6000000000001 199.5999999999999 108.2000000000001 177.3 103.0000000000001 154.3999999999999C100.3000000000001 142.5 99.8000000000001 130.3999999999999 103.3000000000001 119.1999999999999C106.8000000000001 107.9999999999999 114.4000000000001 97.6999999999999 127.9000000000001 89.3C127.9000000000001 89.3 152.7000000000001 74.9999999999999 166.2000000000001 56.8C173.6000000000001 46.8 175.9000000000001 38.1 173.6000000000001 31.9C171.1000000000001 25.2 164.0000000000001 23 156.9000000000001 23C161.7000000000001 17 167.2000000000001 10 171.3000000000001 3.4C208.9000000000001 -22.3 253.5000000000001 -12.3 285.6000000000002 10.6zM415 39.5C405 50.8 407.8 72.6 397.9 81.1C391 87.1 384.3 86.5 375.3 86.2000000000001C367.6 77.4 349.5 66.6 336.9 69.9C325.4 72.8 318.9 86.2000000000001 318.1 99.4C317.8 99.2000000000001 317.4 99.1 317.1 98.9C310 95.0000000000001 306 88.1 303.4 77.8C300.9 67.6 300 54.3 299.2 39.1C298.5 27.3 293 12.7 289.3 -1.5C285.8 -14.7 283.5 -26.7 288.2 -37.8C295.4 -52.3 307.7 -58.2 321.9 -57.1C336.1 -56 352.3 -47.3 365.5 -31.6C387.5 -5 427.8 -1.9 428.7 14.9C429 20 425.6 27.9 415 39.5zM173.3 299.3C175.3 297.4 178 294.8 181.3 292.2000000000001C187.9 287 197.1 281.6 208.6 281.6C220.2 281.6 231.1 287.5 240.4000000000001 292.4000000000001C245.3000000000001 295 251.3000000000001 299.4000000000001 255.2000000000001 302.8000000000001C259.1 306.2000000000001 261.1 309.1 258.3000000000001 309.4000000000001C255.5000000000001 309.7000000000001 255.7000000000001 306.8000000000001 252.3000000000001 304.3000000000001C247.9000000000001 301.1 242.6000000000001 296.9000000000001 238.4000000000001 294.5C231.0000000000001 290.3000000000001 218.9000000000001 284.3000000000001 208.5000000000001 284.3000000000001C198.1000000000001 284.3000000000001 189.8000000000001 289.1 183.6000000000001 294C180.5000000000001 296.5 177.9000000000001 299 175.9000000000001 300.9000000000001C174.4000000000001 302.3000000000001 174.0000000000001 305.5 171.6000000000001 305.8000000000001C170.2000000000001 305.9000000000001 169.8000000000001 302.1 173.3000000000001 299.3000000000001z" />
-    <glyph glyph-name="lyft"
-      unicode="&#xF3C3;"
-      horiz-adv-x="512" d=" M0 366.9H77.8V158.2000000000001C77.8 125.1 92.8 105.4 105 97.2000000000001C92.3 86.1 53.8 76.3000000000001 24.8 100.0000000000001C7.8 114 0 137.3 0 159V366.9zM485.9 193.4V215.4H509.7V292.2H483.6C473.4999999999999 338.5 432.4 372.9 383.3 372.9C326.7 372.9 280.6 326.9 280.6 270.2V91C296.6 88.7 316 91.3 332.3 105C349.4 119 357.1 142.2 357.1 164V170.7H395.9V247.5H357.1V270.8C357.1 305.4 409.3 305.4 409.3 270.8V193.7C409.3 137.1 455.3 91 511.9999999999999 91V167.5C497.4999999999999 167.5 485.8999999999999 179.2 485.8999999999999 193.4zM191.6 292.4V179.4C191.6 164 167.8 164 167.8 179.4V292.4H91V159.7C91 135.9 99 105.7 136 95.8C173 86 194.2 106.4 194.2 106.4C192.1 93.0000000000001 179.7 83.1 159.3 81.1C143.8 79.5 124.1 84.7000000000001 114.3 88.9V18.6C139.4 11.1 165.8 8.8 191.9 13.9C239 23.0000000000001 268.7 62.3 268.7 114.7000000000001V292.9H191.6V292.4z" />
-    <glyph glyph-name="magento"
-      unicode="&#xF3C4;"
-      horiz-adv-x="448" d=" M445.7 320.1V64L382.3 27.5V283.3L223.8 374.9L65.2 283.3L65.6 27.4L2.3 64V319.9L224.2 448L445.7 320.1zM255.6 27.5L224 9.1L192.2 27.3V283.3L128.9 246.7L129 -9.2L223.9 -64.1L319 -9.2V246.8L255.6 283.4V27.4999999999999z" />
-    <glyph glyph-name="mailchimp"
-      unicode="&#xF59E;"
-      horiz-adv-x="428.07" d=" M426.56 124.28C423.4700000000001 130.87 417.59 135.41 410.21 137.16C407.74 148.43 404.33 153.96 404.02 154.79C405.32 156.27 406.58 157.76 406.86 158.11C417.28 171.04 410.48 189.97 392.67 194.44C382.65 204.0799999999999 373.58 208.6099999999999 366.13 212.34C358.99 215.91 361.8399999999999 214.5099999999999 355.14 217.53C353.36 226.24 352.7699999999999 246.5 349.94 260.7199999999999C347.3999999999999 273.51 342.2799999999999 282.78 334.38 288.87C331.2199999999999 295.7099999999999 326.79 302.61 321.45 307.68C346.2899999999999 345.76 352.83 383.37 334.64 403.07C326.5399999999999 411.8399999999999 314.51 416 300.12 416C279.86 416 254.94 407.74 229.78 392.4599999999999C229.78 392.4599999999999 213.4 405.64 213.05 405.92C142.97 461.11 -55.23 217.22 14.73 163.92L32.79 150.12C21.45 118.5799999999999 37.22 80.98 70.08 68.91C77.34 66.24 85.22 64.9399999999999 93.39 65.4C93.39 65.4 146.48 -31.96 258.49 -31.99C388.07 -32.03 421.04 94.73 421.39 95.87C421.39 95.86 431.89 111.38 426.56 124.28zM20.12 180.05C5.92 204.01 30.63 253.24 48.21 281.2200000000001C91.66 350.37 163.98 404.94 196.82 397.15L205.85 400.61C205.88 400.58 230.52 379.76 230.55 379.74C247.52 389.93 269.13 400.31 289.35 402.38C277.05 399.61 262.06 393.23 244.3 382.37C243.87 382.12 202.28 354.05 176.87 328.85C163.02 315.12 107.42 248.44 107.4699999999999 248.5C117.63 267.73 124.33 277.17 140.41 297.4C149.5099999999999 308.8400000000001 159.22 319.9700000000001 169.15 330.24C173.76 335.01 178.43 339.6 183.0999999999999 343.9500000000001C186.31 346.94 189.5399999999999 349.8200000000001 192.75 352.5700000000001C194.2299999999999 353.8400000000001 195.71 355.0700000000001 197.18 356.2800000000001L197.19 356.29L164.6 383.2L166.32 371.14L190.01 350.27S169.05 336.16 158.62 327.26C116.83 291.6 75.82 236.86 60.56 183.57L61.29 183.6C53.69 179.41 46.15 172.69 39.56 163.55C39.4 163.59 22.52 175.98 20.12 180.05zM89.23 79.96C64.2 79.96 43.9 101.33 43.9 127.6800000000001C43.9 154.0400000000001 64.19 175.4000000000001 89.23 175.4000000000001C95.72 175.4000000000001 101.89 173.9600000000001 107.47 171.3800000000001C107.47 171.3800000000001 117.1 166.5200000000001 119.81 143.5700000000001C122.63 150.7400000000001 124.05 156.6300000000001 124.05 156.6300000000001C127.28 146.7500000000001 128.93 136.3700000000001 128.28 125.8700000000001C130.96 129.4300000000001 133.83 136.1400000000001 133.83 136.1400000000001C138.83 106.8100000000001 117.43 79.9600000000001 89.23 79.9600000000001zM145.03 248.4900000000001S164.52 285.5500000000001 207.36 310.0600000000001C204.17 310.5700000000001 196.37 309.5800000000001 195 309.4200000000001C202.78 316.11 217.24 320.5800000000001 227.23 322.61C224.31 324.4700000000001 217.34 324.9400000000001 213.89 325.0300000000001C212.87 325.0600000000001 212.88 325.0500000000001 211.67 325.0000000000001C221.07 330.2500000000001 238.49 333.3400000000001 254.32 330.5500000000001C252.33 333.1900000000001 247.82 335.12 244.65 336.0600000000001C244.37 336.1400000000001 243.13 336.4500000000001 243.13 336.4500000000001L244.32 336.73C253.86 338.5700000000001 265.01 336.5800000000001 273.82 333.0400000000001C272.82 335.36 270.37 338.0700000000001 268.53 339.7800000000001C268.34 339.9600000000001 267.24 340.7500000000001 267.24 340.7500000000001C276.46 338.8400000000001 285.3 334.8100000000001 291.95 330.2500000000001C291.05 332.0000000000001 288.81 334.9400000000001 287.26 336.5400000000001C296.07 334.0200000000001 305.9699999999999 327.73 310.2099999999999 318.7200000000001C310.31 318.5200000000001 310.58 317.7800000000001 310.6099999999999 317.6900000000001C293.9099999999999 330.5300000000001 245.1699999999999 326.8900000000001 196.3699999999999 295.2700000000001C174.0399999999999 280.7900000000001 157.6599999999999 264.9500000000001 145.0299999999999 248.4900000000001zM408.35 102.15C407.7600000000001 101.0000000000001 401.62 67.7500000000001 366.49 40.14C322.12 5.28 263.8300000000001 8.8100000000001 241.82 28.34C230.06 39.34 224.97 55.0700000000001 224.97 55.0700000000001S223.64 46.2 223.41 42.72C214.54 57.81 215.29 76.24 215.29 76.24S210.56 67.41 208.39 62.47C201.86 79.09 205.23 96.25 205.23 96.25L200.07 88.55S197.65 107.36 203.59 123.02C209.95 139.76 222.27 151.92 224.7 153.44C215.35 156.41 204.58 164.93 204.56 164.95C204.56 164.95 208.84 164.67 211.82 165.35C211.82 165.35 192.92 178.89 189.6 199.61C192.34 196.23 198.09 192.4 198.09 192.4C196.23 197.8199999999999 195.1 209.89 196.84 221.7599999999999L196.85 221.7699999999999C200.43 244.45 219.12 259.2199999999999 240.29 259.04C262.83 258.8399999999999 277.94 254.11 296.84 271.54C300.84 275.2299999999999 304.03 278.41 309.65 279.6499999999999C310.24 279.7799999999999 311.71 280.3999999999999 314.72 280.3999999999999C317.77 280.3999999999999 320.7 279.7099999999999 323.39 278.1099999999999C333.64 272.01 335.85 256.0999999999999 336.95 244.4299999999999C341.02 201.1499999999999 339.38 208.8599999999999 356.89 199.9399999999999C365.25 195.6899999999999 374.63 191.6499999999999 385.32 180.2199999999999C385.35 180.19 385.4 180.13 385.4 180.13H385.53C394.54 179.9099999999999 399.18 172.8199999999999 395.03 167.6599999999999C364.8 131.5599999999999 322.57 114.2699999999999 275.52 112.8199999999999C273.58 112.7699999999999 269.2 112.67 269.18 112.67C250.17 112.09 243.99 87.5099999999999 255.91 72.72C263.45 63.37 277.94 60.3 289.88 60.26L290.05 60.32C341.5 59.28 393.19 95.69 402.12 115.76C402.18 115.91 402.73 117.18 402.73 117.18C400.6600000000001 114.75 350.55 67.57 289.6500000000001 69.28C289.6500000000001 69.28 282.99 69.42 276.7200000000001 70.8800000000001C268.4500000000001 72.8000000000001 262.17 76.4400000000001 259.7700000000001 84.6800000000001C264.8200000000001 83.6700000000001 271.2200000000001 83.02 278.6400000000001 83.02C322.6 83.02 354.2700000000001 103.0000000000001 350.9700000000001 103.27C350.8400000000001 103.27 350.7100000000001 103.2400000000001 350.49 103.1900000000001C345.36 102.0000000000001 292.52 81.53 259.12 92.03C259.2 93.05 259.36 94.04 259.6 94.93C262.5700000000001 104.88 267.85 103.49 276.3900000000001 103.86C306.8700000000001 104.87 331.4600000000001 112.54 349.8900000000001 121.29C369.54 130.62 384.5200000000001 142.6400000000001 389.9200000000001 148.71C396.9200000000001 136.92 396.8800000000001 121.79 396.8800000000001 121.79S399.6200000000001 122.75 403.2600000000001 122.75C414.6400000000001 122.74 416.9900000000001 112.52 408.35 102.15zM259.0600000000001 88.4500000000001C259.0600000000001 88.5000000000001 259.0500000000001 88.5500000000001 259.0500000000001 88.6C259.0600000000001 88.55 259.0600000000001 88.5 259.0600000000001 88.4500000000001zM259.0500000000001 88.66C259.0400000000001 88.79 259.0400000000001 88.92 259.0300000000001 89.05C259.0100000000001 89.7 259.0000000000001 90.38 259.0300000000001 91.07C259.0100000000001 90.33 259.0100000000001 89.65 259.0300000000001 89.05C259.0400000000001 88.92 259.0400000000001 88.78 259.0500000000001 88.66zM259.1700000000001 87.2000000000001C259.1700000000001 87.1800000000001 259.1700000000001 87.16 259.1800000000001 87.14C259.1800000000001 87.16 259.1800000000001 87.1800000000001 259.1700000000001 87.2000000000001zM259.1900000000001 87.08C259.3900000000001 85.5000000000001 259.7000000000001 84.77 259.7400000000001 84.6800000000001C259.5100000000001 85.1700000000001 259.3200000000001 86.02 259.1900000000001 87.08zM193.96 388.32L196.83 397.15L201.71 379.43L195.68 381.38L193.96 388.32zM216.34 370.6L212.72 383.19L222.69 374.83C220.45 373.39 218.33 371.9700000000001 216.34 370.6zM259.05 88.66C259.04 88.79 259.04 88.92 259.0300000000001 89.05C259.04 88.92 259.04 88.78 259.05 88.66zM259.04 89.05C259.0200000000001 89.6999999999999 259.0100000000001 90.3799999999999 259.04 91.0699999999999C259.0100000000001 90.3199999999999 259.0100000000001 89.6499999999999 259.04 89.05zM259.06 88.4499999999999C259.06 88.4999999999999 259.05 88.55 259.05 88.5999999999999M259.18 87.1399999999999C259.18 87.1599999999999 259.18 87.18 259.17 87.1999999999999M259.19 87.0799999999999C259.39 85.4999999999999 259.7 84.7699999999999 259.74 84.68C259.51 85.17 259.32 86.0199999999999 259.19 87.0799999999999zM311.29 225.69C311.2200000000001 229.05 311.7600000000001 234.61 314.92 235.64H314.93C320.3400000000001 237.5199999999999 327.51 223.66 327.8400000000001 211.3599999999999C323.5600000000001 213.4999999999999 318.54 214.41 313.37 213.9599999999999C312.07 217.9299999999999 311.45 221.6599999999999 311.29 225.6899999999999zM205.38 362.73L191.79 374.11L212.36 367.83C209.71 365.95 207.36 364.23 205.38 362.73zM233.08 195.79C229.67 194.49 227.25 193.48 226.08 193.65C224.19 193.93 226.02 197.4 230.16 200.7600000000001C238.49 207.4 249.92 209.46 259.69 205.8300000000001C263.97 204.2600000000001 268.77 201.1100000000001 271.29 197.4400000000001C272.24 196.0500000000001 272.5 195.0000000000001 272.11 194.5600000000001C271.3400000000001 193.6600000000001 268.6 194.8700000000001 264.56 196.4500000000001C254.21 200.3100000000001 246.58 200.9 233.08 195.7900000000001zM247.63 181.2600000000001C245.32 180.3200000000001 243.82 179.6 243.21 180.09C242.59 180.5700000000001 243.2 182.5100000000001 245.36 184.6C247.24 186.41 249.1900000000001 187.43 251.43 188.37C251.78 188.52 252.15 188.65 252.53 188.75C253.57 189.03 254.62 189.38 255.76 189.55C264.88 191.1 271.56 186.04 270.69 184.57C270.3 183.88 268.61 184.04 266.09 184.21C260.86 184.57 255.38 184.48 247.63 181.26zM60.86 124.88zM85.16 150.66C83.31 150.27 84.35 150.49 82.52 149.98A7 7 0 0 1 81.75 149.73C81.17 149.46 80.64 149.28 80.13 149C79.7 148.7599999999999 76.06 147.1399999999999 73.1 143.5199999999999C69.11 138.5699999999999 67.66 132.0899999999999 67.91 125.8499999999999C68.15 119.7899999999999 69.93 116.4399999999999 70.26 115.6199999999999C71.64 112.6599999999999 68.41 112.0499999999999 65.47 115.2299999999999L65.46 115.2399999999999C63.11 117.7299999999999 61.6 121.5299999999999 60.86 124.8999999999999C57.88 138.8499999999999 64.1 152.8699999999999 78.47 158.4699999999999C79.27 158.7899999999999 80.21 158.9799999999999 80.97 159.1999999999999H80.96C82.43 159.6399999999999 87.68 160.6999999999999 93.03 159.87C98.9 158.9599999999999 104.07 156.0199999999999 107.36 152.1999999999999L107.37 152.19C109.9 149.3199999999999 111.8 145.2699999999999 111.46 141.66V141.65C111.33 140.15 110.67 138 109.32 137.44C108.82 137.23 108.31 137.34 107.96 137.69C106.98 138.65 107.74 140.62 105.36 143.99C102.19 148.46 95.05 152.75 85.16 150.66zM115.44 119.49C117.32 108.67 109.44 98.99 99.92 98.79C93.25 98.64 89.61 102.81 90.26 103.72C90.56 104.15 91.58 103.96 93.14 103.73C101.64 102.41 106.8 107.59 108.04 113.02C108.06 113.11 108.39 114.56 108.38 115.56C108.45 116.44 108.35 117.32 108.22 118.12C107.22 123.74 100.77 124.8 96.62 129.27C92.9 133.31 93.63 138.49 95.97 140.98C98.78 143.75 102.8 142.74 102.75 141.7599999999999C102.75 141.24 101.78 140.8499999999999 100.58 140.0199999999999C99.02 138.9199999999999 98.81 137.8599999999999 99.21 136.0399999999999C99.47 135.0399999999999 99.92 134.3899999999999 100.89 133.6199999999999C104.37 130.8599999999999 113.74 128.9199999999999 115.44 119.4899999999999zM328.31 200.96C330.89 200.56 332.5300000000001 197.37 331.98 193.83C331.43 190.29 328.8900000000001 187.75 326.31 188.16C323.73 188.56 322.09 191.75 322.64 195.29C323.2 198.82 325.73 201.36 328.31 200.96zM299.98 190.65C301.4000000000001 193.24 305.42 193.76 308.9700000000001 191.81C312.5200000000001 189.87 314.24 186.19 312.8300000000001 183.61C311.4100000000001 181.0200000000001 307.3900000000001 180.5 303.8400000000001 182.45C300.29 184.39 298.5600000000001 188.06 299.98 190.65z" />
-    <glyph glyph-name="mandalorian"
-      unicode="&#xF50F;"
-      horiz-adv-x="390.88" d=" M203.28 -63.89C202.3 -60.63 201.59 -48.06 201.89 -39.31C202.44 -23.42 202.87 -14.59 203.29 -10.55C203.93 -4.35 206.16 10.17 206.57 10.83C207.17 11.79 206.97 38.7 206.33 43.96C206.02 46.54 205.7 55.86 205.64 64.69C205.51 81.16 205.11 84.81 202.91 89.45C201.81 91.77 201.68 93.29 201.92 100.88C202.08 105.69 201.92 111.41 201.58 113.59C199.53 126.56 198.12 141.29 198.33 147.49C198.54 153.61 198.76 154.6399999999999 200.39 157.16C203.44 161.87 206.9 171.2 209.01 180.43C211.27 190.29 212.89 197.61 213.6 201.17C214.49 205.59 216.03 210.89 217.96 216.22C220.2300000000001 222.47 220.4500000000001 231.61 218.3300000000001 231.61C218.03 231.61 216.9500000000001 230.39 215.9200000000001 228.9C214.8900000000001 227.41 211.1600000000001 224.0999999999999 207.6300000000001 221.5399999999999C199.2600000000001 215.4599999999999 195.9300000000001 212.1499999999999 194.9700000000001 208.9599999999999C194.0400000000001 205.8499999999999 193.9500000000001 201.7299999999999 194.8100000000001 201.1999999999999C195.1500000000001 200.9899999999999 196.1000000000001 198.7999999999999 196.9200000000001 196.3199999999999C198.5400000000001 191.44 198.7900000000001 186.1999999999999 197.6400000000001 180.9599999999999C197.2500000000001 179.19 196.5900000000001 175.4899999999999 196.1800000000001 172.7299999999999C195.7700000000001 169.9699999999999 195.2000000000001 166.2699999999999 194.9300000000001 164.5099999999999C194.6500000000001 162.7499999999999 193.9600000000001 160.8299999999999 193.3800000000001 160.2499999999999C192.4200000000001 159.2899999999999 192.2400000000001 159.3399999999999 191.3300000000001 160.7799999999999C190.78 161.6499999999999 190.1300000000001 163.7899999999999 189.8900000000001 165.5299999999999C189.6400000000001 167.2699999999999 188.2600000000001 172.6399999999999 186.81 177.4599999999999C183.53 188.3599999999999 183.29 193.6099999999999 185.85 198.4199999999999C186.77 200.1499999999999 187.52 202.2299999999999 187.52 203.0299999999999C187.52 205.4199999999999 185.32 208.3499999999999 180.11 212.9199999999999C173.06 219.0999999999999 171.48 220.8399999999999 169.88 224.2199999999999C168.17 227.8199999999999 166.82 228.2799999999999 165.34 225.7599999999999C163.56 222.7499999999999 162.7400000000001 216.6499999999999 162.37 203.7399999999999L162.0200000000001 191.6099999999999L163.97 189.3599999999999C167.18 185.6599999999999 176.04 172.9099999999999 177.75 169.5299999999999C181.16 162.7899999999999 182.09 157.8399999999999 182.16 145.9699999999999C182.23 134.13 183.11 123.2199999999999 184.16 121.2599999999999C184.5200000000001 120.5999999999999 184.67 119.9099999999999 184.5 119.74C184.3300000000001 119.5699999999999 184.91 117.65 185.79 115.47C186.67 113.29 187.6 109.2499999999999 187.85 106.49C188.1 103.73 188.87 99.06 189.56 96.12C191.79 86.56 192.3300000000001 82.04 191.95 75.98C191.75 72.71 191.42 64.91 191.22 58.66C189.91 16.9 189.37 0.68 189.18 -2.55C189.06 -4.57 188.7900000000001 -14.06 188.5800000000001 -23.62C188.22 -39.92 187.28 -50.99 186.1600000000001 -52.27C185.5200000000001 -53 178.0900000000001 -47.36 173.6400000000001 -42.78C169.8900000000001 -38.91 169.62 -37.9899999999999 170.81 -32.83C171.51 -29.82 173.07 -14.54 174.1400000000001 -0.21C174.5000000000001 4.57 174.9500000000001 10.29 175.15 12.5C175.9800000000001 21.87 176.81 32.85 177.7600000000001 47.28C178.3200000000001 55.74 179.0900000000001 63.72 179.4800000000001 65.01C179.8600000000001 66.3 180.37 74.9 180.6100000000001 84.12L181.0400000000001 100.89L178.7800000000001 105.19C177.0600000000001 108.47 173.9100000000001 112.13 165.5600000000001 120.53C159.5300000000001 126.6 153.7200000000001 132.83 152.6500000000001 134.38L150.7000000000001 137.19L151.4500000000001 148.09C152.5400000000001 163.8 152.5500000000001 196.66 151.4700000000001 207.15L150.5800000000001 215.85L147.3000000000001 220.37C141.4400000000001 228.45 141.5000000000001 228.12 141.0800000000001 253.64C140.9800000000001 259.71 140.7000000000001 265.14 140.4500000000001 265.7C139.6200000000001 267.57 137.4000000000001 268.36 131.9100000000001 268.75C123.0500000000001 269.37 120.9500000000001 270.65 108.0600000000001 283.3C101.9100000000001 289.3400000000001 95.7200000000001 295.27 94.3100000000001 296.49C91.5000000000001 298.91 91.5200000000001 298.48 93.7500000000001 306.12L95.1000000000001 310.77L93.4100000000001 313.81C92.4800000000001 315.48 91.3200000000001 317.32 90.8200000000001 317.88C89.4900000000001 319.39 85.3200000000001 328.77 84.8300000000001 331.37C84.5200000000001 333.03 84.7400000000001 334.04 85.7000000000001 335.27C87.9300000000001 338.13 89.1000000000001 340.95 90.1500000000001 346C92.4800000000001 357.19 97.8900000000001 372.0900000000001 100.7500000000001 375.2200000000001C103.9300000000001 378.69 108.4500000000001 376.27 110.1600000000001 370.19C111.5000000000001 365.4 111.5300000000001 360.4 110.2600000000001 351.64C109.7300000000001 347.96 109.2800000000001 342.9600000000001 109.2700000000001 340.53C109.2500000000001 336.52 109.4600000000001 335.8400000000001 111.5200000000001 333.14C114.8500000000001 328.77 119.2500000000001 325.73 126.7200000000001 322.62C128.4200000000001 321.9100000000001 130.5400000000001 320.63 131.4400000000001 319.77C142.6100000000001 309.05 150.0600000000001 303.5900000000001 154.3900000000001 302.92C159.5700000000001 302.12 162.3700000000001 298.38 164.4300000000001 289.5300000000001C165.7400000000001 283.88 168.4300000000001 278.3900000000001 169.8900000000001 278.3900000000001C170.4800000000001 278.3900000000001 171.9800000000001 279.0200000000001 173.2200000000001 279.7800000000001C175.2000000000001 281 175.4700000000001 281.51 175.4700000000001 283.9600000000001C175.4600000000001 287.6700000000001 174.3000000000001 298.0400000000001 173.4700000000001 301.8000000000001C173.1000000000001 303.4600000000001 172.6900000000001 305.86 172.5400000000001 307.1500000000001C172.4000000000001 308.4400000000001 171.9300000000001 311 171.5100000000001 312.8400000000001C168.9600000000001 324 167.8600000000001 328.3000000000001 167.4100000000001 328.8900000000001C165.8600000000001 330.9100000000001 163.3300000000001 339.0900000000001 162.4800000000001 344.8100000000001C160.8400000000001 355.92 158.5200000000001 359.04 149.5700000000001 362.2000000000001C144.9300000000001 363.8400000000001 140.6800000000001 366.3200000000001 136.2500000000001 369.98C135.1000000000001 370.9300000000001 132.2400000000001 373.2000000000001 129.9000000000001 375.04C127.5500000000001 376.87 125.4900000000001 378.5700000000001 125.3000000000001 378.8000000000001C125.1200000000001 379.0300000000001 123.9100000000001 379.9400000000001 122.6100000000001 380.8200000000001C116.3700000000001 385.04 113.7700000000001 387.8000000000001 111.3500000000001 392.7800000000001L108.9100000000001 397.8000000000001L108.6900000000001 410.7800000000001L108.4700000000001 423.7600000000001L115.3800000000001 430.3100000000001C119.3300000000001 434.0600000000001 123.8600000000001 437.6600000000001 125.9700000000001 438.7400000000001C129.2800000000001 440.4300000000001 130.4200000000001 440.6300000000001 137.3400000000001 440.79C145.8700000000001 440.98 147.4600000000001 440.7700000000001 149.0000000000001 439.23C150.5300000000001 437.7000000000001 150.3600000000001 432.8300000000001 148.7100000000001 430.73C147.9700000000001 429.79 147.3700000000001 428.7500000000001 147.3700000000001 428.4100000000001C147.3700000000001 427.8300000000001 144.7600000000001 423.5000000000001 141.9500000000001 419.4200000000001C141.2700000000001 418.4300000000001 139.8200000000001 414.0700000000001 139.5800000000001 412.6C160.0200000000001 399.2100000000001 161.1300000000002 408.8300000000001 153.6500000000001 383.6200000000001L165.0500000000001 381.0800000000001C168.1600000000002 389.74 171.5200000000001 398.3400000000001 173.6600000000002 407.3000000000001C173.9500000000001 414.9300000000001 161.6800000000002 411.49 158.2600000000001 415.98C155.9300000000001 421.9100000000001 161.3900000000001 430.1600000000001 164.3200000000001 435.1800000000001C165.9200000000001 437.5200000000001 170.9400000000002 439.8800000000001 173.1400000000001 439.3300000000001C174.0200000000001 439.11 177.3000000000001 439.6800000000001 180.5100000000001 440.61C183.6900000000002 441.5300000000001 187.0900000000002 442.29 188.0600000000002 442.29C189.0300000000002 442.29 191.7200000000002 442.8700000000001 194.0400000000001 443.5800000000001C197.6900000000002 444.6900000000001 198.5400000000001 444.7500000000001 200.3900000000001 443.98C201.5600000000001 443.5000000000001 204.1800000000001 442.8900000000001 206.2100000000001 442.6200000000001C208.2300000000001 442.36 210.9300000000001 441.5000000000001 212.2100000000001 440.7100000000001C213.4900000000001 439.92 215.7400000000001 438.9400000000001 217.2300000000001 438.54C219.7400000000001 437.86 220.2300000000001 437.9700000000001 224.2800000000002 440.2100000000001L228.6300000000002 442.61L239.3300000000002 443.0200000000001C249.7700000000001 443.42 250.1400000000002 443.4900000000001 254.5900000000001 445.7000000000001L259.1700000000002 448.0000000000001L261.6300000000001 446.5700000000001C263.3900000000001 445.55 264.7700000000001 443.8400000000001 266.4800000000002 440.5900000000001C268.8400000000002 436.0800000000001 268.8600000000002 436.0100000000001 267.8500000000002 433.2200000000001C266.9700000000002 430.7800000000001 266.9600000000002 429.92 267.7500000000001 426.8300000000001C268.2500000000001 424.8700000000001 269.2000000000001 422.2100000000001 269.8500000000002 420.92C270.5000000000001 419.6300000000001 271.0900000000002 417.8300000000001 271.1600000000002 416.9100000000001C271.4700000000002 412.5800000000001 271.1300000000002 411.61 268.7500000000001 409.99C266.5800000000001 408.5200000000001 261.7700000000001 402.0800000000001 261.7700000000001 400.6500000000001C261.7700000000001 400.3300000000001 261.2900000000001 398.9600000000001 260.7000000000001 397.62C255.6600000000001 386.11 253.9400000000001 384.0600000000001 246.4400000000001 380.6400000000001C237.2400000000001 376.4400000000001 234.1400000000001 375.4500000000001 230.2300000000001 375.4500000000001C227.1300000000001 375.4500000000001 226.2300000000001 375.2000000000001 225.6900000000001 374.1900000000001C225.3200000000001 373.5 223.4800000000001 371.8200000000001 221.6000000000001 370.48C219.5600000000001 369.0100000000001 217.8000000000001 367.1 217.2200000000001 365.7000000000001C216.6800000000001 364.42 215.5600000000001 363.11 214.7300000000001 362.79C213.9000000000001 362.4700000000001 212.7900000000001 361.7100000000001 212.2800000000001 361.0800000000001C211.7600000000001 360.4600000000001 208.6200000000001 358.04 205.2800000000001 355.7000000000001C201.9500000000001 353.36 198.4100000000001 350.6800000000001 197.4100000000001 349.7400000000001C196.4100000000001 348.8000000000001 195.3400000000001 348.0300000000001 195.0200000000001 348.0300000000001S193.7400000000001 347.2900000000001 192.8900000000001 346.3800000000001C191.5800000000001 344.9900000000001 191.4000000000001 344.2700000000001 191.7500000000002 341.7800000000001C191.9700000000002 340.1500000000001 192.6100000000002 337.5100000000001 193.1700000000001 335.9000000000001C194.4900000000001 332.1000000000001 194.4800000000001 328.0400000000001 193.1200000000001 325.3300000000001C191.6900000000001 322.4700000000001 192.2300000000001 318.6800000000001 194.4700000000001 315.7400000000001C196.4800000000001 313.1100000000001 196.6300000000001 311.1800000000001 195.1800000000001 306.9000000000001C194.5700000000001 305.1 194.1300000000001 301.4500000000001 194.1200000000001 297.9900000000001C194.1000000000001 293.1100000000001 194.3400000000001 291.7100000000001 195.5800000000001 289.6100000000001C196.7800000000001 287.5700000000001 197.4000000000001 287.1300000000001 198.8200000000001 287.2900000000001C200.8000000000001 287.5200000000001 201.1200000000002 288.3400000000001 203.5300000000002 299.4100000000001C205.7100000000002 309.4400000000001 207.2400000000002 311.3300000000001 217.2900000000001 316.4900000000001C220.2300000000001 318.0000000000001 224.7500000000002 320.4500000000001 227.3200000000002 321.9300000000001C229.9000000000002 323.4100000000001 234.1100000000002 325.6200000000001 236.6900000000002 326.8400000000001C243.3600000000002 330.0000000000001 247.7400000000002 333.3600000000001 251.9100000000002 338.5100000000001C259.0200000000002 347.3000000000001 261.8900000000002 354.7300000000001 264.7600000000002 371.8100000000001C265.3100000000002 375.0900000000001 266.1900000000002 377.4600000000001 267.6200000000002 379.5400000000001C268.9100000000002 381.4100000000001 269.9900000000002 384.1600000000001 270.5100000000002 386.8500000000001C271.5300000000002 392.1500000000001 273.3600000000002 395.9300000000001 276.0900000000002 398.3600000000001C280.7900000000002 402.5400000000001 282.0900000000002 399.4500000000001 280.6800000000001 387.4900000000001C280.2200000000002 383.6300000000001 279.5800000000001 377.1600000000001 279.2400000000001 373.1100000000001L278.6300000000001 365.7500000000001L283.0800000000001 361.6600000000001L287.5300000000001 357.5700000000001L287.6400000000001 349.1500000000001C287.7000000000001 344.5200000000001 288.1100000000002 339.6200000000001 288.5600000000001 338.2600000000001L289.3800000000001 335.7900000000001L282.9500000000001 329.5100000000001C274.4100000000001 321.1800000000001 270.0700000000001 315.5800000000001 266.1900000000001 307.9000000000001C264.4200000000002 304.4100000000001 262.4500000000001 300.7900000000001 261.8100000000001 299.8700000000001C259.6300000000001 296.7600000000001 255.3500000000001 286.8600000000001 253.0500000000002 279.6100000000001L250.7600000000002 272.3900000000001L243.7900000000002 265.9000000000001C239.9600000000001 262.3300000000001 235.8300000000002 258.6500000000001 234.6200000000002 257.7300000000001C231.5700000000002 255.4100000000001 230.3600000000002 252.5800000000001 230.3600000000002 247.7400000000001C230.3600000000002 244.7600000000001 230.7900000000002 242.7800000000001 231.9500000000002 240.4800000000001C232.8200000000002 238.7400000000001 233.7600000000002 236.5700000000001 234.0400000000002 235.6500000000001C234.3200000000002 234.7300000000001 235.0200000000002 233.4300000000001 235.6100000000002 232.7600000000001C237.0100000000002 231.1700000000001 237.5300000000002 216.6400000000001 236.4400000000002 209.5400000000001C235.7600000000002 205.0600000000001 232.8100000000002 197.5200000000001 231.7400000000002 197.5200000000001C229.9500000000002 197.5200000000001 227.6800000000002 188.2500000000001 226.6700000000002 176.7800000000001C226.4900000000002 174.7600000000001 226.0500000000002 170.8400000000001 225.6900000000002 168.0800000000001C225.3300000000002 165.3200000000001 224.7300000000002 158.1000000000001 224.3400000000002 152.0300000000001C223.5700000000002 139.8100000000001 224.1500000000002 133.2600000000001 226.3900000000002 128.8800000000001C229.8000000000002 122.1900000000001 226.9100000000002 116.1900000000001 215.3600000000002 106.0400000000001L211.3900000000002 102.5500000000001L211.4600000000002 97.3600000000001C211.5000000000002 94.5000000000001 212.0100000000002 90.5100000000001 212.6000000000002 88.4900000000001C217.2100000000002 72.5100000000001 217.3300000000002 71.5700000000001 216.9800000000002 51.3600000000001C216.5200000000002 24.9600000000002 216.7200000000002 11.0900000000001 217.6100000000002 7.2100000000002C218.0300000000002 5.3700000000002 218.5200000000002 2.2100000000002 218.6900000000002 0.1900000000002C218.8600000000002 -1.8299999999998 219.3500000000002 -5.1399999999998 219.7700000000002 -7.1699999999998C220.2400000000002 -9.4299999999998 220.5500000000002 -18.1899999999998 220.5600000000002 -29.9099999999999L220.5800000000002 -48.9699999999999L218.7700000000002 -51.5999999999998C216.0600000000002 -55.5099999999999 203.6600000000002 -65.1399999999999 203.2800000000002 -63.8899999999999zM232.81 -18.78C232.63 -18.48 232.48 -11.91 232.48 -4.19C232.48 9.87 231.59 23.35 230.22 30.26C229.82 32.28 229.41 39.96 229.32 47.32C229.17 59.25 227.92 71.69 226.68 73.7C226.02 74.77 223.66 91.36 223.65 95C223.64 99.23 224.67 101 228.93 104.13C233.07 107.17 233.79 107.27 234.41 104.85C234.69 103.75 235.86 99.23 237.01 94.8200000000001C240.94 79.7000000000001 241.15 78.5500000000001 241.06 73.08C240.96 67.3000000000001 240.93 66.9500000000001 239.32 55.35C238.34 48.28 238.15 42.96 238.28 26.92C238.45 7.52 237.64 -8.81 236.24 -14.35C235.53 -17.1299999999999 233.44 -19.83 232.81 -18.78zM161.82 18.8C161.58 19.18 160.81 24.04 160.09 29.59C159.37 35.15 158.6 40.0000000000001 158.36 40.3800000000001C158.13 40.7600000000001 157.68 43.6800000000001 157.37 46.8700000000001C157.06 50.0600000000001 156.46 54.33 156.04 56.3500000000001C155.05 61.1400000000001 152.69 75.7000000000001 152.62 77.4200000000001C152.59 78.1600000000001 152.28 81.4700000000001 151.92 84.7800000000001C151.25 90.9900000000001 151.08 112.4500000000001 151.7 113.0700000000001C152.66 114.0300000000001 158.33 110.3100000000001 163.03 105.6400000000001L168.31 100.3900000000001L167.8600000000001 93.9200000000001C167.6100000000001 90.3600000000001 167.2600000000001 83.6900000000001 167.0800000000001 79.0900000000001C166.9 74.4900000000001 166.59 69.2200000000001 166.4100000000001 67.3800000000001C166.2300000000001 65.5400000000001 165.8000000000001 58.0200000000001 165.4700000000001 50.6600000000001C164.6800000000001 33.2500000000001 163.5300000000001 19.3700000000001 162.8200000000001 18.6600000000001C162.5000000000001 18.3600000000001 162.0600000000001 18.4200000000001 161.8200000000001 18.8000000000001zM74.63 285.39C95.7 272.6 92.47 271.24 103.12 267.73C116.13 263.44 121.99 260.6 126.27 250.86C82.61 214.72 57.26 192.96 49.56 180.04C18.54 128.03 43.57 78.4499999999999 112.31 92.83C98.13 63.6 34.34 64.2 13.63 97.73C-11.05 137.68 -8.46 216.03 74.63 285.39zM285.42 106.37C342.08 99.49 367.74 144.11 331.96 195.6C331.96 195.6 305.09 224.94 267.68 263.56C270.66 279.01 277.17 295.68 298.25 317.38C387.45 253.87 390.25 175.77 390.7099999999999 168.02C394.9799999999999 97.44 312.05 76.9 285.4199999999999 106.37z" />
-    <glyph glyph-name="mastodon"
-      unicode="&#xF4F6;"
-      horiz-adv-x="417.8" d=" M417.8 268.9C417.8 366.1 354.1 394.6 354.1 394.6C291.6 423.3 125.6 423 63.7000000000001 394.6C63.7000000000001 394.6 0 366.1 0 268.9C0 153.2 -6.6 9.5 105.6 -20.2C146.1 -30.9 180.9 -33.2 208.9 -31.6C259.7000000000001 -28.8 288.2000000000001 -13.5 288.2000000000001 -13.5L286.5000000000001 23.4S250.2000000000001 12 209.4000000000001 13.3C169.0000000000001 14.6999999999999 126.4000000000001 17.6999999999999 119.8000000000001 67.3C119.2000000000001 71.6999999999999 118.9000000000001 76.3 118.9000000000001 81.1999999999999C204.5000000000001 60.3 277.5000000000001 72.0999999999999 297.6 74.4999999999999C353.7000000000001 81.1999999999999 402.6 115.8 408.8 147.4C418.6 197.2 417.8 268.9 417.8 268.9zM342.7000000000001 143.7H296.1V257.9C296.1 307.6 232.1 309.5 232.1 251V188.5H185.8V251C185.8 309.5 121.8 307.6 121.8 257.9V143.7H75.1C75.1 265.8 69.9 291.6 93.5 318.7C119.4 347.6 173.3 349.5 197.3 312.6L208.9 293.1L220.5 312.6C244.6 349.7 298.6 347.4 324.3 318.7C348 291.4 342.7 265.7 342.7 143.7z" />
-    <glyph glyph-name="maxcdn"
-      unicode="&#xF136;"
-      horiz-adv-x="512" d=" M461.1 5.3H363.7000000000001L415.6 248C417.9000000000001 258.2 416.5 267.5 411.2000000000001 273.7C406.2000000000001 279.8 397.5000000000001 283.3 387.0000000000001 283.3H337.7000000000001L278.2000000000001 5.3H180.8000000000001L240.3000000000001 283.3H156.9L97.4 5.3H0L59.5 283.3L14.9 378.7H387C426.4 378.7 462.3 362.4 485.3 333.8C508.6 305.2 517.1 266.4 508.9 227.9L461.1 5.3z" />
-    <glyph glyph-name="medapps"
-      unicode="&#xF3C6;"
-      horiz-adv-x="320" d=" M118.3 209.6C121.8 222.1 125.2 243.2 131.5 243.2C139.8 241.4 141.1 219.8 150.1 206.6C154.7 230.1 155.4 291.7 164.2 293.3C173.2 294 183.9 226.8 186.2 215.8C196.1 211.7 235.1 209.2 235.1 209.2C237 201.9 211.1 201.6 195.1 201.4C190.5 186.6 189.7 173.7 183.7 173.4C179 173.2 175.5 202.2 166.2 223L156.8 157.5C152.4 144.5 141.3 180 134.9 196.8C131.6 196.9 72.5 198.4 87.3 204.6L118.3 209.6zM228 0C249.2 0 249.2 32 228 32H92C70.8 32 70.8 0 92 0H228zM204 -64C225.2 -64 225.2 -32 204 -32H116C94.8 -32 94.8 -64 116 -64H204zM238.2 77.5C241.4 96.4 243.4 113.9 250.1 126.3C258 141 266.2 154.4 274.1 167.3C298.7000000000001 207.7 320 242.5 320 292.8C320 378.4 248.2 448 160 448S0 378.4 0 292.8C0 242.6 21.3 207.7 45.9 167.3C53.8 154.4 61.9 141 69.9 126.3C76.6 113.8 78.6 96.5 81.8 77.4C85.3 56.4 117.9 61.7000000000001 114.4 82.5000000000001C110.8 104.2000000000001 108.8 123.2000000000001 99.1 141.1000000000001C66.5 201.5 33 236.7 33 292.8C33 360.7 90 416 160 416S287 360.7 287 292.8C287 236.7 253.5 201.5 220.9 141.2000000000001C211.2 123.2000000000001 209.2 103.8000000000001 205.6 82.6C202.2 62 234.6 56.2 238.2 77.5z" />
-    <glyph glyph-name="medium-m"
-      unicode="&#xF3C7;"
-      horiz-adv-x="512" d=" M71.5 305.7C72.1 311.6 69.8 317.5 65.4 321.5L20.3 375.9V384H160.5L268.9 146.3L364.2 384H497.9V375.9L459.3 338.9C455.9999999999999 336.4 454.3 332.2 454.9999999999999 328.1V56.1C454.3 52 455.9999999999999 47.8 459.3 45.3L496.9999999999999 8.3V0.2H307.3V8.3L346.4000000000001 46.2C350.2000000000001 50 350.2000000000001 51.2 350.2000000000001 57V276.8L241.5 0.9H226.8L100.4 276.8V91.9C99.3 84.1 101.9 76.3 107.4 70.7L158.2 9.1V0.9999999999999H14.2V8.9999999999999L65 70.7C70.4 76.3 72.9 84.2 71.5 91.9V305.7z" />
-    <glyph glyph-name="medium"
-      unicode="&#xF23A;"
-      horiz-adv-x="448" d=" M0 416V-32H448V416H0zM372.2 309.9L348.2 286.9C346.1 285.3 345.1 282.7000000000001 345.5 280.2000000000001V110.9C345.1 108.3 346.1 105.7 348.2 104.2L371.7 81.2V76.1H253.7V81L278 104.6C280.4 107 280.4 107.7000000000001 280.4 111.3V248.2L212.8 76.6H203.7L125 248.2V133.2C124.3 128.4 126 123.5 129.4 120L161 81.7V76.6H71.2V81.7L102.8 120C106.2 123.5 107.7 128.4 106.9 133.2V266.2C107.3 269.9 105.9 273.5 103.1 276L75 309.9V315H162.3L229.7 167L289 314.9H372.2V309.9z" />
-    <glyph glyph-name="medrt"
-      unicode="&#xF3C8;"
-      horiz-adv-x="544" d=" M113.7 192C113.7 70.2 197.6 -30.8 307.2 -49.1C288.5 -53.6 269 -56 249 -56C111.4 -56 0 55 0 192S111.4 440 248.9 440C269 440 288.5 437.6 307.1 433.1C197.5 414.8 113.7 313.8 113.7 192M411.1 91.7C333.4 36.3 231.5 44.2 170.7 106.3C176.2 92.2 183.4 78.6 192.4 65.8C254 -22.4 374.8 -43.5 462.0999999999999 18.8C549.3999999999999 81.1 570.1999999999999 203.1 508.5999999999999 291.4000000000001C499.5999999999999 304.3000000000001 489.2999999999999 315.7000000000001 478.0999999999999 325.6C515.4999999999999 246.8000000000001 488.7999999999999 147.1 411.0999999999999 91.7000000000001M192.2999999999999 335.7000000000001C190.8999999999999 334.7000000000001 189.5999999999999 333.6 188.2999999999999 332.6C252.5999999999999 350.4000000000001 324.2 328.6 367.2 272.1C402.8999999999999 225.1000000000001 410.0999999999999 165.5000000000001 391.5999999999999 114.1C448.2999999999999 170.3 459.1999999999999 256.2000000000001 413.8999999999999 315.9000000000001C363.8999999999999 381.4000000000001 264.8 390.3000000000001 192.2999999999999 335.7000000000001M296 224C291.6 224 288 227.6 288 232V272C288 276.4 284.4 280 280 280H232C227.6 280 224 276.4 224 272V232C224 227.6 220.4 224 216 224H176C171.6 224 168 220.4 168 216V168C168 163.6 171.6 160 176 160H216C220.4 160 224 156.4 224 152V112C224 107.6 227.6 104 232 104H280C284.4 104 288 107.6 288 112V152C288 156.4 291.6 160 296 160H336C340.4 160 344 163.6 344 168V216C344 220.4 340.4 224 336 224H296z" />
-    <glyph glyph-name="meetup"
-      unicode="&#xF2E0;"
-      horiz-adv-x="512" d=" M99 33.7C100.1 28 96.7 22.6 91 21.4C85.6 20.3 80.1 23.7 79 29.4C77.9 34.8 81.3 40.5 86.7 41.7C92.1 42.9 97.8 39.4 99 33.7zM242.1 -37.7C235.8 -42.3000000000001 234.1 -51.1 238.4 -57.7C243 -64.3000000000001 251.8 -66 258.4 -61.4C264.7 -56.8 266.4 -48.0000000000001 261.8 -41.4C257.6 -34.9 248.7 -33.1 242.1 -37.7zM156.1 424.6C162.4 426 166.4 432.3 165 438.6C163.9 445.2 157.6 449.2 151.3 447.7C145 446.3 141 440 142.2 433.7C143.6 427.1 149.8 423.1 156.1 424.6zM34.4 221.7C24.4 228.6 10.7 226 3.8 215.7C-3.1 205.7 -0.5 191.7 9.5 184.8C19.5 177.7 33.2 180.2 40.1 190.5C47 200.9 44.4 214.6 34.4 221.7zM306.4 392.6C317 398.9 320.1 412.6 314.1 422.9C307.8 433.5 294.4 436.9 284.1 430.6S270.4 410.6 276.7 400C282.7 389.7 296.1 386.3 306.4 392.6zM115.3 334.6C123 340 124.7 350.6 119.6 358.3S103.9 367.7 96.5 362.6C88.8 357.2 87.1 346.6 92.2 338.9C97.3 331.1 107.8 329.4 115.3 334.6zM487.6 178.6C480.2 176.9 475.3 169.5 477 161.7000000000001C478.4 154.3000000000001 485.9 149.4 493.3 151.1C500.7 152.5 505.6 160 503.9 167.7000000000001C502.4 175.1 495.0000000000001 180.0000000000001 487.6 178.6zM527.3000000000001 235.4000000000001C526.2 241.1 520.7 244.5000000000001 515.3000000000001 243.4000000000001C509.6000000000001 242.3000000000001 506.2 236.5000000000001 507.3000000000001 230.8000000000001C508.4000000000001 225.4000000000001 513.9000000000001 221.7000000000001 519.6 222.8000000000001C525 224.3000000000001 528.7 229.7000000000001 527.3000000000001 235.4000000000001zM447 309.1C438.4 303.1 436.4 291.4 442.1 282.8C447.8 274.2 459.5 272.2 468.1 277.9C476.4 283.9 478.4 295.6 472.7 304.2C467.0000000000001 312.9 455.3000000000001 315.1 447.0000000000001 309.1zM440.7 169.7C467 126.6 455.8 69.7 414.4 40.6C397 28.3 377.3 22.9 357.5 23.5C345.5 -23.6 288.1 -41.1 252.4 -9.1C251.3 -10 249.8 -10.8 248.7 -12C209.6 -39.1 156.4 -29.4 129.3 10.3C119.6 24.6 114.7 40.9 114.2 57.2C48.8 68.1 24.2 151.2 73.1 196.9C44.8 243.8 73.7 304.3 126.5 311.8C151.6 378 234.1 409.4 290.1 366C357.5 388.3 426.4000000000001 336.6 421 264.9C462.1 252.3 473.8 198 440.7 169.7zM370.7 95.4C367.6 116 329.8 100 327.6 122.5C324.5 154.5 371.3 223.6 367.6 250.5C364.2 274.5 348.2 279.6 334.2 279.9C320.8 280.2000000000001 317.3 277.9 312.8 275.3C309.9000000000001 273.6 306.2 270.4 301.1 275.6C294.8 281.6 290 287.3 281.7000000000001 288.5C269.4000000000001 290.5 264.0000000000001 286.5 255.1000000000001 278.8000000000001C251.7000000000001 275.9000000000001 243.1000000000001 265.9000000000001 235.1000000000001 269.7000000000001C231.7000000000001 271.4000000000001 219.7000000000001 277.4000000000001 211.1000000000001 281.1C194.8000000000001 288.2000000000001 171.1000000000001 276.5000000000001 162.5000000000001 261.1C149.6000000000001 238.2000000000001 124.5000000000001 148.0000000000001 120.8000000000001 136.0000000000001C112.2000000000001 109.4 131.7000000000001 87.4 157.7000000000001 88.9C168.8000000000001 89.5000000000001 176.0000000000001 93.5000000000001 183.1000000000001 106.3C187.1000000000001 113.7 224.8000000000001 214 227.7000000000001 218.9C229.7000000000001 222.3 236.6000000000001 226.9 242.3000000000001 224C248.0000000000001 220.9 249.2000000000001 214.6 248.3000000000001 208.9C247.2000000000001 199.2 220.3000000000001 138 219.4 131.2C216 108.3 246.3000000000001 104.6 258.0000000000001 127.2C261.7000000000001 134.3 303.7000000000001 219.8 307.4000000000001 225.5C311.7000000000001 231.8 314.8 233.8 319.1 233.5C322.2000000000001 233.5 327.4000000000001 232.6 326.2000000000001 222.6C324.8000000000001 213.2 291.1 150.3 287.3000000000001 134.9C282.7000000000001 114.3 293.9000000000001 93.5 312.2000000000001 84.3C323.6 78.6 374.7000000000001 68.6 370.7000000000001 95.4zM376.4 3.1C366.1 -4.3 363.5 -18.9 370.7 -29.5000000000001C377.8 -40.1000000000001 392.1 -42.6000000000001 402.7 -35.5000000000001C413.3 -28.1000000000001 415.8 -13.5000000000001 408.7 -2.9C401.3 7.7 387 10.6 376.4 3.1z" />
-    <glyph glyph-name="megaport"
-      unicode="&#xF5A3;"
-      horiz-adv-x="496" d=" M248 440C111.04 440 0 328.96 0 192C0 55.03 111.04 -56 248 -56C384.9600000000001 -56 496 55.03 496 192C496 328.96 384.96 440 248 440zM333.46 172.33L393.12 112.66V25.61L367.05 6.3799999999999L341 25.61V91.07L307.56 124.51L274.12 91.07V25.61L248 6.38L221.88 25.61V91.07L188.44 124.51L155 91.08V25.62L128.93 6.39L102.87 25.62V112.67L162.34 172.14V260L221.84 319.5V395.12L247.9 414.35L273.96 395.12V319.48L333.46 259.98M247.9 271.84L281.34 238.4V172L248 138.67L214.46 172.21V238.4100000000001L247.9 271.8400000000001z" />
-    <glyph glyph-name="microsoft"
-      unicode="&#xF3CA;"
-      horiz-adv-x="448" d=" M0 416H214.6V201.4H0V416zM233.4 416H448V201.4H233.4V416zM0 182.6H214.6V-32H0V182.6zM233.4 182.6H448V-32H233.4V182.6z" />
-    <glyph glyph-name="mix"
-      unicode="&#xF3CB;"
-      horiz-adv-x="448" d=" M0 384V35.1C0 -21.1 88 -23 88 35.1V273.7C95.9 326.6 176 324.1 176 267.2V91.9C176 34 272 33.9 272 91.9V208C277.3 262.7 360 260.5 360 203.7V179.9C360 120 448 123.3 448 179.9V384H0z" />
-    <glyph glyph-name="mixcloud"
-      unicode="&#xF289;"
-      horiz-adv-x="640" d=" M424.43 228.271C416.124 313.273 344.135 380 256.919 380C184.653 380 120.695 333.4840000000001 97.714 265.926C43.169 257.897 1.084 211.104 1.084 154.344C1.084 92.046 51.752 41.378 114.327 41.378H403.9409999999999C456.2699999999999 41.378 498.9099999999999 83.74 498.9099999999999 136.071C498.9099999999999 181.202 466.7919999999999 219.134 424.4299999999999 228.271zM403.9410000000001 83.741H114.327C75.287 83.741 43.446 115.305 43.446 154.345S75.287 224.949 114.327 224.949C133.154 224.949 150.875 217.474 164.165 204.183C184.128 184.22 214.298 214.41 194.345 234.363C179.67 248.761 161.673 258.728 142.292 263.712C162.227 308.012 207.082 337.638 256.92 337.638C326.416 337.638 382.899 281.155 382.899 211.936C382.899 198.368 380.6840000000001 185.079 376.53 172.342C367.587 144.825 408.663 133.403 416.677 159.052C419.446 167.358 421.661 175.941 423.046 184.524C442.4269999999999 177.048 456.5479999999999 158.221 456.5479999999999 136.0709999999999C456.5479999999999 107.2759999999999 433.0129999999999 83.7409999999999 403.9409999999999 83.7409999999999zM639.01 136.071C639.01 92.047 626.273 49.6849999999999 601.908 13.414C597.755 7.322 591.11 4 584.188 4C567.871 4 557.061 22.826 566.745 36.949C586.126 66.298 596.648 100.631 596.648 136.071S586.1270000000001 205.844 566.745 234.9160000000001C551.09 257.747 586.106 282.1560000000001 601.908 258.4500000000001C626.274 222.457 639.01 180.0940000000001 639.01 136.071zM568.13 136.071C568.13 104.506 558.9929999999999 74.05 541.273 47.746C537.12 41.655 530.475 38.61 523.553 38.61C506.352 38.61 496.531 57.5889999999999 506.11 71.5579999999999C519.123 90.6619999999999 525.768 112.8129999999999 525.768 136.0709999999999C525.768 159.0519999999999 519.123 181.4789999999999 506.11 200.5829999999999C490.349 223.5689999999999 525.118 247.6779999999999 541.273 224.1179999999999C558.9920000000001 198.0919999999999 568.13 167.6349999999999 568.13 136.0709999999999z" />
-    <glyph glyph-name="mizuni"
-      unicode="&#xF3CC;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 328.9 0 192C0 55 111 -56 248 -56S496 55 496 192C496 328.9 385 440 248 440zM168 88.1C136.6 77.5 109.2 60.8 88 39.9V312C88 334.1 105.9 352 128 352S168 334.1 168 312V88.1zM288 98C275.1 100 261.8 101.1 248.2 101.1C234.4 101.1 221 100 208 98V312C208 334.1 225.9 352 248 352S288 334.1 288 312V98zM408 40.3C386.8 61.1 359.4 77.7 328 88.3V312C328 334.1 345.9 352 368 352S408 334.1 408 312V40.3z" />
-    <glyph glyph-name="modx"
-      unicode="&#xF285;"
-      horiz-adv-x="448" d=" M356 206.2L392.7 182.5V-32L259.7 51.8L356 206.2zM440 373H226.3L203.3 335.2L356.8 238.7L440 373zM351 230.2L55.2 416V201.5L101.2 172.5L351 230.2zM97 153.8L8 11H221.7L346.7 211.5L97 153.8z" />
-    <glyph glyph-name="monero"
-      unicode="&#xF3D0;"
-      horiz-adv-x="496" d=" M352 64H460.4C417 -7.9 338.1 -56 248 -56S79 -7.9 35.6 64H144V191.8L248 87L352 192V64zM88 112V320L247.4 160.6L408 320V112H482.8C491.3 137.1 496 164 496 192C496 329 385 440 248 440S0 329 0 192C0 164 4.6 137.1 13.2 112H88z" />
-    <glyph glyph-name="napster"
-      unicode="&#xF3D2;"
-      horiz-adv-x="496" d=" M298.3 74.4C284.1 60.8 267 50.3 247.9 43.9C228.9 50.3 211.7 60.8 197.6 74.4H298.3zM342.3 274C362.3 290.9 385.9000000000001 303.2 411.9 310.2V149C411.9 -70.4 83.9 -68.6 83.9 148.7V310.3C109.8 303.4 133.5 290.7000000000001 153.4 273.9C210.2 313.9 285.9 313.8 342.3 274zM133.5 332.5C197.9 392.5 297.8 392.6 362.4 332.7C355.3 329.2 348.5 325.4 341.8 321.2C283.1 351.7 212.6 351.6 153.9 321.1C147.5999999999999 325.1 140 329.3 133.5 332.5zM43.8 354.8V285.5C-14.6 249 -14.6 164.4 43.9 127.2C70.3 -117.9 425.6 -113.1 451.5 125.7L451.8 127.4C510.5 163.7 510.7 249.1 452 285.6V354.8C434.7 354.3 418 351.8 401.9 347.4C319.9 438.9 176.4 438.9 94.4 347.3C78.1 351.7 61.3 354.3 43.8 354.8zM259.2 96S295.2 96.3 320.5 97.5C330.7 98 341.6 101.5 346 104C372.3 119.1 371.4 143.2 372.2 151.4C292.7 152 272.3 155.3 259.2 96zM123.7 151.3C124.5 143.1 123.6 119 149.9 103.9C154.3 101.4 165.1 97.9 175.4 97.4C200.7 96.3 236.7 95.9 236.7 95.9C223.5 155.3 203 152.0000000000001 123.7 151.3zM292.8 27.9C289.6 33.2 285.9 35.2 285.9 35.2C261.1 27.9 233.7 28.3 210 35.2C210 35.2 207.1 33.7 203.6 28.6C200.8 24.4999999999999 199.9 18.9999999999999 199.9 18.9999999999999C229 1.3999999999999 267 1.3999999999999 296.1 18.9999999999999C296 19.1 295.8 22.9999999999999 292.8 27.8999999999999z" />
-    <glyph glyph-name="nimblr"
-      unicode="&#xF5A8;"
-      horiz-adv-x="355.52" d=" M232.6 148.71C248.17 148.71 259.75 137.25 259.75 121.75C259.75 106.2 248.13 94.79 232.6 94.79C216.9 94.79 205.45 106.36 205.45 121.75C205.45 137.26 217.03 148.71 232.6 148.71zM99.01 121.75C99.01 137.36 110.69 148.71 126.16 148.71C141.73 148.71 153.31 137.25 153.31 121.75C153.31 106.34 141.84 94.79 126.16 94.79C110.72 94.79 99.01 106.1 99.01 121.75M177.76 289.05C143 289.05 75.45 269.23 45.25 221L0 448V112.52C0 14.87 79.61 -64 177.76 -64C276 -64 355.52 14.95 355.52 112.52C355.52 209.98 276.13 289.05 177.76 289.05zM177.76 -19.07C104.49 -19.07 45.25 39.83 45.25 112.52C45.25 185.2 104.49 244.11 177.76 244.11C251.03 244.11 310.27 185.2 310.27 112.52S251.02 -19.07 177.76 -19.07z" />
-    <glyph glyph-name="nintendo-switch"
-      unicode="&#xF418;"
-      horiz-adv-x="448" d=" M95.9 414.5C51.3 406.5 15.4 373.5 4.1 330.1C0 314.4 -0.3 305.2 0.2 183.6C0.4 72 0.5 69.4 2.4 60.7C12.7 14.2 45.7 -18.9 92.7 -29.8C98.8 -31.2 106.6 -31.5 156.8 -31.7C208.7 -32.1 214.1 -32 215.5 -30.6C216.9 -29.2 217 -11.3 217 191.6C217 342.1 216.7 412.9000000000001 216.1 414.2000000000001C215.2 415.9000000000001 213.6 416 159.2 415.9000000000001C115 415.8 101.7 415.5 95.9 414.5zM179.8 191.9V4L142 4.5C107.2 4.9 103.5 5.1 96.5 6.8C66.6 14.5 44.5 37.5 38.2 67.5C36.2 76.9 36.2 307.6 38.1 316.8C43.7 342.9 61.8 364.5 86.1 374.2000000000001C98.3 379.1 104 379.7000000000001 143.7 379.8L179.6 379.9V191.9zM103.9 323.1C98.1 322 89.2 317.5 84.4 313.4C74.7 305 69.8 293 70.6 278.9C71 271.6 71.4 269.6 74.4 263.7C78.8 254.7 85.3 248.1 94.3 243.7C100.5 240.6 102.1 240.3 110.2 240C117.5 239.7 120.1 240 125 241.7C145.1 248.5 157.3 268 153.8 288.1C149.9 311.8 127.2 327.8 103.9 323.1zM262.1 415.4C261.7000000000001 415.1 261.5 314.6 261.5 191.9C261.5 -10.4 261.6 -30.9 263 -31.5C265.5 -32.4 337.5 -32.1 346.4 -31.1C384.1 -26.8 417.4 -3.9 435.4 30.1C437.7 34.4999999999999 440.8 41.8 442.4 46.3C448.2 63.6999999999999 448.1 59.1 448.1 192.4C448.1 298.8 447.9 314.7 446.6 321.4C437.4 369.7 400.5 406.2 352.1 414.5C345.6 415.6 335.6 415.8999999999999 303.3 415.8999999999999C280.9 416 262.4 415.7 262.1 415.3999999999999zM361.2000000000001 213.3C375.7000000000001 209.5 387.5000000000001 198.5 392.4000000000001 184.4C395.5000000000001 175.7 395.4000000000001 162.9 392.3 154.9C386.6 140.2 375.5 129.9 361.2 126.1C338 120.1 313.3 134.1 306.6 157.1C304.6 164.1 304.7 176 307 183.3C313.8999999999999 206 338 219.4 361.2 213.3z" />
-    <glyph glyph-name="node-js"
-      unicode="&#xF3D3;"
-      horiz-adv-x="448" d=" M224 -60C217.3 -60 210.5 -58.2 204.6 -54.8L142.9 -18.3C133.7 -13.1 138.2 -11.3 141.2 -10.3C153.5 -6 156 -5.1 169.1 2.4C170.5 3.2 172.3 2.9 173.7 2L221.1 -26.1C222.8 -27.1 225.2 -27.1 226.8 -26.1L411.5 80.5C413.2 81.5 414.3 83.5 414.3 85.5V298.7C414.3 300.8 413.2 302.7 411.4000000000001 303.8L226.8 410.3C225.1 411.3 222.8 411.3 221.1 410.3L36.6 303.7C34.8 302.7 33.7 300.7 33.7 298.6V85.5C33.7 83.5 34.8 81.5 36.6 80.6L87.2 51.4C114.7 37.7 131.5 53.8 131.5 70.1V280.5C131.5 283.5 133.9 285.8 136.9 285.8H160.3C163.2 285.8 165.7 283.5 165.7 280.5V70C165.7 33.4 145.7 12.4 111 12.4C100.3 12.4 91.9 12.4 68.5 24L20.1 51.9C8.1 58.8 0.7 71.7 0.7 85.6V298.7C0.7 312.5 8.1 325.5 20.1 332.4L204.6 439C216.3 445.6 231.8 445.6 243.4 439L428.1 332.3C440.1 325.4 447.5 312.5 447.5 298.6V85.5C447.5 71.7 440.1 58.8 428.1 51.8L243.4 -54.8C237.5 -58.2 230.8 -60 224 -60zM373.1 150.1C373.1 190 346.1 200.6 289.4000000000001 208.1C232.0000000000001 215.7 226.2000000000001 219.6 226.2000000000001 233.0000000000001C226.2000000000001 244.1 231.1000000000001 258.9000000000001 273.6 258.9000000000001C311.5 258.9000000000001 325.5 250.7000000000001 331.3 225.1C331.8 222.7 334 220.9 336.5 220.9H360.5C362 220.9 363.4 221.5 364.4 222.6S365.9 225.2 365.8 226.7C362.1 270.8 332.8 291.3 273.6 291.3C220.9 291.3 189.5 269.1 189.5 231.8C189.5 191.4 220.8 180.2 271.3 175.2C331.8 169.3 336.5 160.4 336.5 148.5C336.5 127.9 319.8999999999999 119.1 281 119.1C232.1 119.1 221.4 131.4 217.8 155.7000000000001C217.4 158.3000000000001 215.2 160.2000000000001 212.5 160.2000000000001H188.5999999999999C185.5999999999999 160.2000000000001 183.2999999999999 157.8000000000001 183.2999999999999 154.9C183.2999999999999 123.8 200.1999999999999 86.7000000000001 281.0999999999999 86.7000000000001C339.4999999999999 86.8000000000001 373.0999999999999 109.9 373.0999999999999 150.1z" />
-    <glyph glyph-name="node"
-      unicode="&#xF419;"
-      horiz-adv-x="640" d=" M316.3 -4C314.2 -4 312.1 -3.4 310.2 -2.4L291 9C288.1 10.6 289.5 11.2 290.5 11.5C294.3 12.8 295.1 13.1 299.2 15.5C299.6 15.7 300.2 15.6 300.6 15.4L315.4 6.6C315.9 6.3 316.7 6.3 317.2 6.6L375 40C375.5 40.3 375.9 40.9 375.9 41.6V108.3C375.9 109 375.6 109.6 375 109.9L317.2 143.2000000000001C316.7 143.5000000000001 316 143.5000000000001 315.4 143.2000000000001L257.6 109.9C257 109.6 256.7 108.9 256.7 108.3V41.6C256.7 41 257.1 40.4 257.6 40.1L273.4 31C282 26.7 287.3 31.8 287.3 36.8V102.7000000000001C287.3 103.6 288 104.4 289 104.4H296.3C297.2 104.4 298 103.7000000000001 298 102.7000000000001V36.8000000000001C298 25.3000000000001 291.8 18.8000000000001 280.8999999999999 18.8000000000001C277.5999999999999 18.8000000000001 274.8999999999999 18.8000000000001 267.5999999999999 22.4000000000001L252.3999999999999 31.1000000000001C248.7 33.3000000000001 246.3 37.3000000000001 246.3 41.6000000000001V108.3000000000001C246.3 112.6000000000001 248.6 116.7000000000001 252.3999999999999 118.8000000000001L310.2 152.2000000000001C313.8999999999999 154.3000000000001 318.7 154.3000000000001 322.3 152.2000000000001L380.1 118.8000000000001C383.8 116.6000000000001 386.2 112.6000000000001 386.2 108.3000000000001V41.6000000000001C386.2 37.3000000000001 383.9 33.2000000000001 380.1 31.1000000000001L322.3 -2.2999999999999C320.6 -3.3999999999999 318.5 -3.9999999999999 316.3 -3.9999999999999zM363 61.8C363 74.3 354.6 77.6 336.8 80C318.8 82.4 317 83.6 317 87.8C317 91.3 318.5 95.9 331.8 95.9C343.7 95.9 348.1 93.3 349.9000000000001 85.3C350.1 84.5 350.7000000000001 84 351.5000000000001 84H359.0000000000001C359.5000000000001 84 359.9000000000001 84.2 360.2000000000001 84.5C360.5000000000001 84.9 360.7000000000001 85.3 360.6 85.8C359.4000000000001 99.6 350.3 106 331.8 106C315.3 106 305.5 99 305.5 87.4C305.5 74.7 315.3 71.3 331.1 69.7C350 67.8 351.5 65.1 351.5 61.4C351.5 54.9 346.3 52.2 334.1 52.2C318.8 52.2 315.4000000000001 56 314.3 63.6C314.2 64.4 313.5 64.9999999999999 312.6 64.9999999999999H305.1C304.2000000000001 64.9999999999999 303.4000000000001 64.3 303.4000000000001 63.3C303.4000000000001 53.6 308.7000000000001 41.9999999999999 334.0000000000001 41.9999999999999C352.5000000000001 41.9999999999999 363.0000000000001 49.1999999999999 363.0000000000001 61.8zM417.5 111.9C417.5 105.8 412.5 100.8 406.4 100.8S395.3 105.8 395.3 111.9C395.3 118.2000000000001 400.5 123.0000000000001 406.4 123.0000000000001C412.4 123.1000000000001 417.5 118.2000000000001 417.5 111.9zM415.7 111.9C415.7 117.1 411.5 121.2000000000001 406.3 121.2000000000001C401.2 121.2000000000001 397 117.1 397 111.9C397 106.7000000000001 401.2 102.5000000000001 406.3 102.5000000000001C411.5 102.6000000000001 415.7 106.8000000000001 415.7 111.9zM411.2 105.7000000000001H408.6C408.5 106.3000000000001 408.1 109.5000000000001 408.1 109.6C407.9 110.3 407.7 110.7000000000001 406.8 110.7000000000001H404.6V105.7000000000001H402.2V118.2000000000001H406.5C408 118.2000000000001 410.9 118.2000000000001 410.9 114.9C410.9 112.6 409.4 112.1 408.5 111.8C410.2 111.7 410.3 110.6 410.6 109C410.7000000000001 108 410.9000000000001 106.3 411.2000000000001 105.7zM408.4 114.5000000000001C408.4 116.2000000000001 407.2 116.2000000000001 406.6 116.2000000000001H404.6V112.7000000000001H406.5C408.1 112.7000000000001 408.3999999999999 113.8000000000001 408.3999999999999 114.5000000000001zM137.3 257C137.3 259.7 135.9 262.1 133.6 263.4L72.3 298.7C71.3 299.3 70.1 299.6 68.9 299.7H68.3C67.1 299.7 66 299.3 64.9 298.7L3.7 263.4C1.4 262.1 0 259.6 0 257L0.1 162C0.1 160.7 0.8 159.5 1.9 158.8C3 158.1 4.4 158.1 5.6 158.8L42 179.7C44.3 181.1 45.7 183.5 45.7 186.1V230.5C45.7 233.1 47.1 235.6 49.4 236.9L64.9 245.8C66.1 246.5 67.3 246.8 68.6 246.8C69.9 246.8 71.2 246.5 72.3 245.8L87.8 236.9C90.1 235.6 91.5 233.1 91.5 230.5V186.1C91.5 183.5 92.9 181 95.2 179.7L131.6 158.8C132.7 158.1 134.2 158.1 135.3 158.8C136.4 159.4 137.1 160.7 137.1 162L137.3 257zM472.5 360.7V184.3C472.5 181.7 471.1 179.2 468.8 177.9L407.5 142.5000000000001C405.2 141.2000000000001 402.4 141.2000000000001 400.1 142.5000000000001L338.8 177.9C336.5 179.2000000000001 335.1 181.7000000000001 335.1 184.3V255.1C335.1 257.7000000000001 336.5 260.2000000000001 338.8 261.5L400.1 296.9000000000001C402.4000000000001 298.2000000000001 405.2000000000001 298.2000000000001 407.5 296.9000000000001L422.8 288.1C424.5 287.1 426.7 288.4000000000001 426.7 290.3V384.3C426.7 387.1 429.7 388.9000000000001 432.2 387.5L468.7 367.1C471 365.9000000000001 472.5 363.4000000000001 472.5 360.7000000000001zM426.5 231.8C426.5 232.5 426.1 233.1 425.6 233.4L404.6 245.6C404 245.9 403.3 245.9 402.7000000000001 245.6L381.7000000000001 233.4C381.1 233.1 380.8000000000001 232.5 380.8000000000001 231.8V207.5C380.8000000000001 206.8 381.2000000000001 206.2 381.7000000000001 205.9L402.7000000000001 193.8C403.3000000000001 193.5 404.0000000000001 193.5 404.5000000000001 193.8L425.5000000000001 205.9C426.1000000000001 206.2 426.4000000000001 206.8 426.4000000000001 207.5V231.8zM636.3 232.5C638.5999999999999 233.8 640 236.3 640 238.9V256C640 258.6 638.6 261.1 636.3 262.4L575.4 297.8C573.1 299.1 570.3 299.1 568 297.8L506.7 262.4C504.4 261.1 503 258.6 503 256V185.2C503 182.5 504.4 180.1 506.7 178.8L567.6 144.1C569.8000000000001 142.8 572.6 142.8 574.9 144.1L611.6999999999999 164.6C614.1999999999999 166 614.1999999999999 169.6 611.6999999999999 171L550 206.4C548.8 207.1 548.1 208.3 548.1 209.6V231.8C548.1 233.1 548.8000000000001 234.3 550 235L569.2 246.1C570.3000000000001 246.8 571.8000000000001 246.8 572.9000000000001 246.1L592.1000000000001 235C593.2000000000002 234.3 594.0000000000001 233.1 594.0000000000001 231.8V214.4C594.0000000000001 211.6 597.1000000000001 209.8 599.6000000000001 211.2L636.3000000000002 232.5zM559 229C558.6 228.7 558.3 228.3 558.3 227.8V214.2C558.3 213.7 558.5999999999999 213.2 559 213L570.8 206.2C571.1999999999999 205.9 571.8 205.9 572.1999999999999 206.2L584 213C584.4 213.3 584.7 213.7 584.7 214.2V227.8C584.7 228.3 584.4000000000001 228.8 584 229L572.2 235.8C571.8000000000001 236.1 571.2 236.1 570.8000000000001 235.8L559 229zM304.8 185.5V255.9C304.8 258.5 303.2 261 300.9000000000001 262.3L239.8000000000001 297.5C237.7000000000001 298.7 234.8000000000001 298.9 232.4000000000001 297.5L171.3000000000001 262.3C169 261 167.4 258.6 167.4 255.9V185.5C167.4 182.7 169.3000000000001 180.3 171.4 179.1L232.6 143.9C235.0000000000001 142.5000000000001 237.8 142.6 240.0000000000001 143.9L301 179.1C302.8 180.1 304.1 181.8 304.6 183.8C304.7000000000001 184.3 304.8 184.9 304.8 185.5zM230.5 310.4L229.7 309.9H230.8L230.5 310.4zM306.7 180.2000000000001L306.3 180.9V180.0000000000001L306.7 180.2000000000001z" />
-    <glyph glyph-name="npm"
-      unicode="&#xF3D4;"
-      horiz-adv-x="576" d=" M288 160H256V224H288V160zM576 288V96H288V64H160V96H0V288H576zM160 256H32V128H96V224H128V128H160V256zM320 256H192V96H256V128H320V256zM544 256H352V128H416V224H448V128H480V224H512V128H544V256z" />
-    <glyph glyph-name="ns8"
-      unicode="&#xF3D5;"
-      horiz-adv-x="640" d=" M187.1 288.1L152.9 174.4L98.4 288.1H49L0 128H44.9L76 234.5L126.6 128H183.5L232 288.1H187.1zM639.6 289C636.7 307 615.7 317.1 597.5 320.3C552.9 328.1 495.6 304 509 261.5V261.4C465.2 252.7 434.7 234.6 414.8 213.2C411.8 223 401.2 229.8 380.8 229.8H293.2000000000001C283.9000000000001 229.8 280.3000000000001 232.1 281.7000000000001 237.2C283.3000000000001 242.7 283.6 244 285.4000000000001 249.4C287.5000000000001 255.8 293.2000000000001 256.5 298.7000000000001 256.5H432.2000000000001L441.9000000000001 288C302.2000000000001 288 297.4000000000001 288.5 281.8000000000001 286.8C269.5000000000001 285.5 258.3000000000001 282 251.2000000000001 271.8C244.4000000000001 261.9 236.8000000000001 236.2 233.6000000000001 224.7C228.2000000000001 205.3 233.0000000000001 196.1 266.4000000000001 196.1H353.7000000000001C361.5000000000001 196.1 362.5000000000001 193.4 361.4000000000001 189.5C360.3000000000001 185.1 358.6000000000001 179.5 356.9000000000001 174.9C355.3000000000001 170.7 352.2000000000001 167.5 343.1000000000001 167.5H216.3L204.7 128C344.6 128 350 128.6 365.6 130.3C372.2000000000001 131 378.6 132.4 384.1 135.2C384.3 131.5 384.6 127.9 385.3 124.4C390.7 93.9 412.7 72.1 442.1 64.9C490.7 53 550.8000000000001 81.7 577.2 132.9C595.9000000000001 169.1 591.3000000000001 209.1 573.8000000000001 238.4H573.9000000000001C603.5000000000001 244.3 644.2 260.4 639.6000000000001 289zM530.7 184.3C524.8000000000001 154.8 494.1 136.5 469.1 140.4C438.2000000000001 145.2000000000001 430.6 179.9 455 205.2000000000001C471.2 222.0000000000001 500.2 229.2000000000001 523.5 232.1000000000001C530.2 218.0000000000001 533.8 200.1000000000001 530.7 184.3000000000001zM552.5 267.4C548.3 273.4 542.7 285.9 550 293.7000000000001C556.7 300.9 570.9 303.8 581.8 301.4C597.0999999999999 298 601.5 285.5 586.6999999999999 277C575.9999999999999 270.9 563.0999999999999 268.9 552.4999999999999 267.4z" />
-    <glyph glyph-name="nutritionix"
-      unicode="&#xF3D6;"
-      horiz-adv-x="400" d=" M88 439.9S221.4 448.1 209 335.5C209 335.5 228.1 410.4 312 376.1C312 376.1 294.3 302.1 224 320.1C224 320.1 238.6 374.7 290.1 376.7C290.1 376.7 250.2 387 208 327.9C208 327.9 188.2 422.4 114.4 427.6C114.4 427.6 189.6 408.2 192 320.1C192 320 85.6 313.1 88 439.9zM400 124.3C400 75.8 390.3 28.9999999999999 368 -8.0000000000001C325.8 -38.9 263 -56.0000000000001 200 -56.0000000000001C137.1 -56.0000000000001 74.2 -38.9 32 -8.0000000000001C9.7 29 0 75.8 0 124.3C0 172.7 17.7 219 40 256C82.2 286.9 137.1 304.6 200 304.6C263 304.6 317.8 287 360 256C382.3 219 400 172.7 400 124.3zM120 20C120 35.5 107.5 48 92 48S64 35.5 64 20S76.5 -8 92 -8S120 4.5 120 20zM120 86.2C120 101.7 107.5 114.2 92 114.2S64 101.7 64 86.2S76.5 58.2 92 58.2S120 70.7 120 86.2zM120 152.4C120 167.9 107.5 180.4 92 180.4S64 167.9 64 152.4S76.5 124.4 92 124.4S120 136.9 120 152.4zM192 20C192 35.5 179.5 48 164 48S136 35.5 136 20S148.5 -8 164 -8S192 4.5 192 20zM192 86.2C192 101.7 179.5 114.2 164 114.2S136 101.7 136 86.2S148.5 58.2 164 58.2S192 70.7 192 86.2zM192 152.4C192 167.9 179.5 180.4 164 180.4S136 167.9 136 152.4S148.5 124.4 164 124.4S192 136.9 192 152.4zM264 20C264 35.5 251.5 48 236 48S208 35.5 208 20S220.5 -8 236 -8S264 4.5 264 20zM264 86.2C264 101.7 251.5 114.2 236 114.2S208 101.7 208 86.2S220.5 58.2 236 58.2S264 70.7 264 86.2zM264 152.4C264 167.9 251.5 180.4 236 180.4S208 167.9 208 152.4S220.5 124.4 236 124.4S264 136.9 264 152.4zM336 20C336 35.5 323.5 48 308 48S280 35.5 280 20S292.5 -8 308 -8S336 4.5 336 20zM336 86.2C336 101.7 323.5 114.2 308 114.2S280 101.7 280 86.2S292.5 58.2 308 58.2S336 70.7 336 86.2zM336 152.4C336 167.9 323.5 180.4 308 180.4S280 167.9 280 152.4S292.5 124.4 308 124.4S336 136.9 336 152.4zM360 192C355.2 214.3 352.6 228.9 344 248C305.2 267.9 253.5 280 200 280S94.8 267.9 56 248C47.2 228.5 44.8 214.1 40 192C82.2 199.9 138.7 206.8 200 206.8S317.8 199.9 360 192z" />
-    <glyph glyph-name="odnoklassniki-square"
-      unicode="&#xF264;"
-      horiz-adv-x="448" d=" M184.2 270.9C184.2 293 202.1 310.9 224 310.9S263.8 293 263.8 270.9C263.8 248.9 245.9 231.1 224 231.1S184.2 249.0000000000001 184.2 270.9000000000001zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM142.9 270.9C142.9 226.3 179.3 190 224 190S305.1 226.2 305.1 270.9C305.1 315.7 268.7 352 224 352S142.9 315.8 142.9 270.9zM317.4 180.2C312.8 189.3 300.1 197 283.3 183.8C283.3 183.8 260.6 165.8 224 165.8S164.6999999999999 183.8 164.6999999999999 183.8C147.8999999999999 197 135.1999999999999 189.3 130.5999999999999 180.2C122.6999999999999 164.1 131.6999999999999 156.5 152 143.2C169.3 132.1 193.1999999999999 128 208.5999999999999 126.4L195.6999999999999 113.5C177.5 95.5 160.1999999999999 78 148 65.8C130.4 48.2 158.6999999999999 20 176.4 37.2L224.1 85.1C242.3 66.9 259.8 49.4 271.8 37.2C289.4 20 317.8 47.9 300.4 65.8L252.7 113.5L239.7 126.4C255.2 128 278.8 132.3 295.9 143.2C316.3 156.5 325.2 164.2 317.4 180.2z" />
-    <glyph glyph-name="odnoklassniki"
-      unicode="&#xF263;"
-      horiz-adv-x="320" d=" M275.1 114C247.7 96.6 210 89.7 185.1 87.1L206 66.5L282.3 -9.8C310.2 -38.4 264.8 -83.1 236.6 -55.5C217.5 -36.1 189.5 -8.1 160.3 21.1L84 -55.4C55.8 -82.9 10.4 -37.8 38.6 -9.7C58 9.7 85.7 37.7 114.9 66.6L135.5 87.2000000000001C110.9 89.8000000000001 72.6 96.3000000000001 44.9 114.1C12.3 135.1 -2 147.4 10.6 173.1C18 187.7000000000001 38.3 200 65.2 178.8C65.2 178.8 101.5 149.9 160.1 149.9S255.0000000000001 178.8 255.0000000000001 178.8C281.9000000000001 199.9 302.1 187.7 309.6 173.1C322 147.4 307.7000000000001 135.1 275.1 114zM30.3 318.3C30.3 390 88.6 448 160 448S289.7 390 289.7 318.3C289.7 246.9 231.4 188.9 160 188.9S30.3 246.9 30.3 318.3zM96.3 318.3C96.3 283.2000000000001 124.9 254.6 160 254.6S223.7 283.2000000000001 223.7 318.3C223.7 353.7000000000001 195.1 382.3 160 382.3S96.3 353.7000000000001 96.3 318.3z" />
-    <glyph glyph-name="old-republic"
-      unicode="&#xF510;"
-      horiz-adv-x="496" d=" M235.76 437.77C243.26 438.08 250.76 438.05 258.26 437.86C261.87 437.7200000000001 265.46 437.46 269.05 437.13C273.9700000000001 436.86 278.8400000000001 436.1 283.7200000000001 435.51C286.6500000000001 435.08 289.55 434.53 292.4700000000001 434.05C300.37 432.72 308.1400000000001 430.77 315.86 428.65C328.1 425.18 340.05 420.73 351.62 415.44C378.18 403.2 402.56 386.23 423.25 365.56C443.28 345.4700000000001 459.97 322.01 472.14 296.37C473.27 293.78 474.58 291.27 475.61 288.63C478.42 282.2 481 275.66 483.19 269C487.33 256.67 490.53 244.01 492.61 231.17C493.18 228.0300000000001 493.65 224.87 494.01 221.7C494.56 217.87 494.95 214.01 495.19 210.14C496.02 201.8 496.03 193.41 495.96 185.04C495.89 180.07 495.7 175.1 495.21 170.15C494.97 166.7700000000001 494.7 163.3900000000001 494.23 160.03C493.84 157.31 493.6 154.5700000000001 493.1199999999999 151.86C492.22 146.71 491.42 141.55 490.2499999999999 136.45C486.1499999999999 117.95 479.9499999999999 99.9 471.74 82.82C455.97 49.99 432.91 20.65 404.62 -2.3A246.503 246.503 0 0 0 347.7099999999999 -37.16C341.5 -39.84 335.25 -42.41 328.8399999999999 -44.57C325.33 -45.7300000000001 321.83 -46.95 318.2699999999999 -47.96C311.6499999999999 -49.84 304.9799999999999 -51.6 298.2299999999999 -52.96C293.5699999999999 -53.8700000000001 288.89 -54.6900000000001 284.2 -55.4400000000001C278.95 -56.1000000000001 273.7 -56.88 268.4099999999999 -57.1800000000001C261.7199999999999 -57.8400000000001 254.9999999999999 -58.02 248.2899999999999 -57.9900000000001C241.4699999999999 -58.02 234.6399999999999 -57.8700000000001 227.8399999999999 -57.2C224.5499999999999 -56.97 221.2699999999999 -56.7 218.0099999999999 -56.2500000000001C215.2899999999999 -55.8600000000001 212.5499999999999 -55.6200000000001 209.8399999999999 -55.14C205.7199999999999 -54.42 201.5899999999999 -53.77 197.4899999999999 -52.92C193.2399999999999 -51.98 188.9999999999999 -51.03 184.7999999999999 -49.9C176.1699999999999 -47.73 167.7199999999999 -44.89 159.3899999999999 -41.77C148.8999999999999 -37.65 138.5999999999999 -33.02 128.75 -27.52C126.61 -26.3700000000001 124.47 -25.23 122.4 -23.95C111.18 -17.3700000000001 100.54 -9.85 90.48 -1.6100000000001C55.8 26.8 29.07 64.8199999999999 14.13 107.0899999999999C11.04 115.8299999999999 8.42 124.7399999999999 6.33 133.7699999999999C4.85 139.93 3.81 146.19 2.75 152.43C2.35 154.78 2.14 157.16 1.8 159.5199999999999C1.2 163.4799999999999 1.05 167.4799999999999 0.63 171.4599999999999C-0.17 180.93 -0.08 190.4499999999999 0.12 199.9499999999999C0.26 203.4599999999999 0.46 206.9599999999999 0.82 210.4599999999999C1.13 213.6299999999999 1.28 216.8299999999999 1.74 219.9799999999999C2.15 222.7899999999999 2.39 225.63 2.9 228.42C3.6 232.36 4.2 236.32 5.02 240.2399999999999C8.45 256.76 13.49 272.9699999999999 20.28 288.42C21.43 291.3399999999999 22.87 294.14 24.14 297.01C32.19 313.7199999999999 42.04 329.57 53.63 344.07C73.63 369.45 98.73 390.75 126.9 406.54C134.4 410.69 142.06 414.5899999999999 149.97 417.9099999999999C165.7899999999999 424.7899999999999 182.38 429.86 199.28 433.2899999999999C202.7899999999999 433.9599999999999 206.3199999999999 434.5299999999999 209.84 435.14C212.46 435.61 215.12 435.8399999999999 217.75 436.2199999999999C221.28 436.75 224.8499999999999 436.8999999999999 228.4 437.26C230.86 437.5 233.31 437.62 235.76 437.7699999999999M244.4 413.36C235.17 413.26 225.97 412.37 216.83 411.13C209.53 410.05 202.3 408.5299999999999 195.12 406.83C181.21 403.33 167.64 398.49 154.66 392.41C144.2 387.42 134.07 381.7099999999999 124.48 375.19C120.3 372.2699999999999 116.08 369.39 112.14 366.16C107.06 362.19 102.16 357.99 97.46 353.57C94.95 351.33 92.65 348.87 90.24 346.51C62.02 317.7199999999999 41.8 281.12 32.74 241.82C30.7 233.38 29.2 224.7999999999999 28.3 216.1699999999999C27.2 207.2799999999999 26.86 198.3199999999999 26.89 189.37C27 182.23 27.27 175.09 28.11 168C28.73 160.88 29.98 153.8399999999999 31.31 146.8199999999999C32.3799999999999 142.17 33.3399999999999 137.5 34.64 132.9099999999999C40.93 109.5299999999999 51.14 87.2099999999999 64.71 67.1599999999999C73.35 54.1799999999999 83.49 42.2299999999999 94.69 31.3899999999999C110.97 15.5699999999999 129.74 2.3499999999999 150.03 -7.83C157.31 -11.35 164.69 -14.7 172.3 -17.46C177.34 -19.22 182.36 -21.03 187.52 -22.4400000000001C198.78 -25.6700000000001 210.29 -28.0400000000001 221.91 -29.5000000000001C224.82 -29.7900000000001 227.72 -30.1100000000001 230.63 -30.4C244.45 -31.48 258.37 -31.4 272.17 -29.97C276.62 -29.37 281.09 -28.98 285.52 -28.1900000000001C289.15 -27.52 292.8 -26.9400000000001 296.39 -26.09C300.52 -25.11 304.67 -24.18 308.75 -23.02C335.25 -15.6800000000001 360.33 -3.3100000000001 382.33 13.18C398.11 24.9999999999999 412.29 38.9399999999999 424.45 54.4599999999999C427.71 58.4799999999999 430.62 62.7699999999999 433.58 67.0099999999999C436.97 72.0699999999999 440.16 77.2599999999999 443.18 82.55C445.58 86.99 447.92 91.46 450.13 95.9999999999999C455.82 108.05 460.41 120.62 463.88 133.49C466.47 143.5 468.63 153.65 469.78 163.94C471.55 177.41 471.72 191.04 471.07 204.59C470.78 208.4799999999999 470.4 212.36 470.07 216.25C467.84 235.33 463.28 254.16 456.25 272.05C450.3 287.18 442.7200000000001 301.68 433.64 315.18C420.95 333.98 405.4 350.86 387.67 365.01C362.62 385.01 333.2 399.56 302.02 407.0899999999999C294.24 409.0199999999999 286.33 410.43 278.39 411.54C274.48 412.13 270.54 412.36 266.62 412.78C259.23 413.35 251.81 413.5 244.4 413.36zM139.26 364.4700000000001C152.56 373.36 167.34 379.85 182.56 384.65C179.39 382.88 176.12 381.27 173.03 379.36C161.82 372.68 151.51 364.46 142.65 354.87C135.85 347.44 129.89 339.14 125.64 329.98C122.35 323.12 120 315.79 118.78 308.27C117.85 303.42 117.48 298.4600000000001 117.61 293.52C117.74 279.86 122.05 266.44 128.9 254.7C134.82 244.48 142.53 235.37 151.26 227.4400000000001C156.11 223.08 161.5 219.35 166.21 214.84C168.47 212.65 170.7 210.4200000000001 172.64 207.93C175.26 204.62 177.53 200.94 178.63 196.8300000000001C179.53 193.81 179.29 190.6300000000001 179.32 187.5200000000001C179.34 183.42 179.28 179.3200000000001 179.35 175.22C179.49 171.68 179.33 168.1300000000001 179.46 164.59C179.54 162.21 179.48 159.8300000000001 179.51 157.4500000000001C179.67 151.6800000000001 179.57 145.9200000000001 179.66 140.15C179.7700000000001 137.24 179.68 134.3300000000001 179.79 131.41C179.82 129.78 179.92 128.1300000000001 179.76 126.5C178.85 126.38 177.94 126.32 177.03 126.34C166.04 126.34 155.15 128.97 145.0800000000001 133.27C139.0800000000001 135.97 133.2700000000001 139.16 127.9900000000001 143.1C122.2400000000001 147.29 116.9 152.06 112.2000000000001 157.41C105.6700000000001 164.65 100.22 172.8 95.58 181.36C94.5100000000001 183.3899999999999 93.3400000000001 185.38 92.4 187.48C91.24 190.12 89.78 192.62 88.73 195.3C84.68 204.98 82.16 215.24 80.65 225.61C80.16 230.05 79.56 234.49 79.45 238.96C78.75 254.69 80.29 270.51 84.12 285.78C86.24 293.93 88.89 301.9599999999999 92.43 309.61C98.75 323.81 107.77 336.79 118.73 347.8C125.01 354 131.8600000000001 359.64 139.2600000000001 364.47zM314.63 384.5900000000001C317.37 383.85 320.04 382.85 322.72 381.91C329.08 379.58 335.4 377.07 341.43 373.95C354.54 367.51 366.74 359.14 377.25 348.98C387.45 339.03 395.99 327.38 402.39 314.64C403.6699999999999 311.89 405.0299999999999 309.18 406.2 306.38C412.51 291.28 416.2 275.12 417.43 258.81C417.84 254.27 417.87 249.72 417.88 245.17C417.95 233.5300000000001 416.39 221.92 413.58 210.64C411.6099999999999 203.37 409.2299999999999 196.15 405.7199999999999 189.46C402.5399999999999 182.8200000000001 399.0399999999999 176.3 394.88 170.22C387.94 159.75 379.2799999999999 150.35 369.06 143C358.58 135.36 346.42 129.98 333.66 127.62C330.15 126.93 326.58 126.54 323 126.41C321.1499999999999 126.35 319.2799999999999 126.25 317.44 126.5100000000001C317.16 128.66 317.44 130.8200000000001 317.43 132.97C317.4 136.7000000000001 317.57 140.42 317.53 144.1400000000001C317.72 151.16 317.55 158.1900000000001 317.74 165.21C317.7699999999999 167.59 317.71 169.97 317.7699999999999 172.35C317.94 177.42 317.7299999999999 182.49 317.9099999999999 187.56C318.01 190.55 317.6699999999999 193.6 318.4199999999999 196.52C319.08 199.02 320.1999999999999 201.38 321.5099999999999 203.6C325.9699999999999 210.91 332.5699999999999 216.56 339.1899999999999 221.86C344.5699999999999 226.04 349.6599999999999 230.63 354.2099999999999 235.7C361.8899999999999 244.07 368.3799999999999 253.58 372.9899999999999 263.9700000000001C375.4899999999999 269.9000000000001 377.5099999999999 276.0700000000001 378.5399999999999 282.4300000000001C379.3999999999999 286.8000000000001 379.5999999999999 291.2600000000001 379.5499999999999 295.7000000000001C379.5299999999999 303.5500000000001 378.1499999999999 311.35 375.9099999999999 318.8700000000001C374.1599999999999 324.6000000000001 371.64 330.0500000000001 368.82 335.3200000000001C364.95 342.2500000000001 360.17 348.6300000000001 354.86 354.5200000000001C344.92 365.3700000000001 333.11 374.4600000000001 320.26 381.6200000000001C318.4099999999999 382.6400000000001 316.42 383.4400000000001 314.63 384.5900000000001zM213.83 326.14C214.81 327.32 215.82 328.4700000000001 216.95 329.52C216.34 328.59 215.68 327.71 215 326.84C211.9 322.96 209.46 318.53 207.97 313.78C207.1 310.51 206.29 307.18 206.24 303.78C206.17 301.26 206.16 298.7100000000001 206.56 296.2100000000001C207.69 288.5800000000001 210.89 281.36 215.33 275.0900000000001C217.33 272.39 219.58 269.82 222.25 267.76C223.87 266.49 225.78 265.67 227.59 264.71C230.7 263.03 233.91 261.48 236.66 259.23C239.33 257.14 241.21 253.9 241.06 250.44C241.05 176.77 241.06 103.1 241.05 29.42C241.05 28.0699999999999 240.97 26.72 241.09 25.3799999999999C241.22 23.8999999999999 241.91 22.55 242.56 21.23C243.42 19.5699999999999 244.34 17.89 245.74 16.61C246.59 15.84 247.71 15.21 248.89 15.3699999999999C250.39 15.5699999999999 251.55 16.72 252.34 17.9399999999999C253.3 19.4499999999999 254.02 21.1 254.62 22.79C255.38 24.92 255.06 27.21 255.16 29.42C255.3 33.4499999999999 255.14 37.48 255.3 41.5099999999999C255.33 47.3999999999999 255.33 53.2799999999999 255.36 59.17C255.5 62.79 255.39 66.41 255.47 70.03C255.62 74.06 255.45 78.09 255.61 82.12C255.64 88.11 255.64 94.1 255.68 100.0899999999999C255.82 103.7099999999999 255.7 107.3299999999999 255.79 110.9499999999999C255.93 114.88 255.77 118.81 255.93 122.7299999999999C255.96 128.7199999999999 255.96 134.7099999999999 255.99 140.6999999999999C256.15 144.6399999999999 255.98 148.5799999999999 256.18 152.5199999999999C256.4700000000001 151.0799999999999 256.31 149.5999999999999 256.4000000000001 148.1399999999999C256.5900000000001 144.5299999999999 256.8200000000001 140.9099999999999 257.1600000000001 137.3C257.48 133.86 257.6 130.41 258.0200000000001 126.98C258.3900000000001 123.88 258.5300000000001 120.7599999999999 258.9700000000001 117.67C259.54 113.58 259.8400000000001 109.46 260.5100000000001 105.3799999999999C261.9700000000001 96.3399999999999 263.3400000000001 87.2699999999999 265.6 78.3899999999999C266.73 73.5699999999999 268 68.7799999999999 269.6 64.0899999999999C272.1400000000001 56.1899999999999 275.3200000000001 48.4199999999999 279.9100000000001 41.4699999999999C281.6400000000001 38.8299999999999 283.7800000000001 36.4899999999999 286.0100000000001 34.2599999999999C286.2800000000001 34.0099999999999 286.5600000000001 33.7499999999999 286.8900000000001 33.55C287.4900000000001 33.3 288.2000000000001 33.62 288.5900000000001 34.12C289.3 34.9999999999999 289.7600000000001 36.0599999999999 290.29 37.05C294.3400000000001 44.85 298.4700000000001 52.61 302.63 60.36C303.33 61.67 304.07 62.98 305.19 63.97C306.94 65.54 309.03 66.66 311.17 67.6C314.05 68.82 317.07 69.79 320.2 70.02C326.78 70.64 333.31 69.27 339.76 68.17C343.45 67.59 347.16 66.9999999999999 350.89 66.7599999999999C354.63 66.6599999999999 358.37 66.7099999999999 362.1 67.0399999999999C370.65 67.9599999999999 379.09 69.9999999999999 387.04 73.2899999999999C392.34 75.5299999999999 397.5 78.1199999999999 402.35 81.2199999999999C413.81 88.4299999999999 423.81 97.7899999999999 432.39 108.2299999999999C433.56 109.6499999999999 434.64 111.1299999999999 435.85 112.5099999999999C434.65 109.2699999999999 433.18 106.1399999999999 431.69 103.0299999999999C430.44 100.1299999999999 428.85 97.4199999999999 427.42 94.6099999999998C422.26 84.9799999999999 416.4 75.6999999999998 409.67 67.0899999999999C405.64 61.8799999999999 401.14 57.0399999999999 396.34 52.5199999999999C389.7 46.4699999999999 382.27 41.1499999999999 373.91 37.7599999999999C365.7 34.3899999999999 356.6 33.1299999999999 347.82 34.4699999999999C344.26 35.0499999999998 340.81 36.1599999999999 337.41 37.3499999999999C334.62 38.3199999999999 332.02 39.7299999999999 329.38 41.0399999999999C325.95 42.7499999999998 322.74 44.8499999999999 319.67 47.1199999999998C322.38 44.0599999999998 325.36 41.2599999999998 328.37 38.5099999999998C332.64 34.7499999999998 337.11 31.1999999999998 342 28.2799999999998C345.98 25.8299999999998 350.29 23.8799999999998 354.84 22.7699999999998C356.3 22.3999999999998 357.8 22.3099999999998 359.29 22.1699999999998C358.04 21.0699999999998 356.66 20.1299999999998 355.3 19.1899999999998C345.69 12.6499999999998 335.29 7.3299999999998 324.61 2.7599999999998C303.75 -5.9400000000002 281.44 -11.2100000000003 258.87 -12.5800000000002C254.21 -12.8200000000002 249.55 -12.9400000000002 244.89 -12.9400000000002C239.91 -12.8300000000002 234.92 -12.8100000000002 229.97 -12.2900000000002C218.77 -11.5300000000003 207.68 -9.5600000000002 196.8 -6.8600000000002C186.45 -4.1500000000003 176.25 -0.7400000000002 166.5 3.6899999999998C157.7899999999999 7.5499999999998 149.38 12.1099999999998 141.5099999999999 17.4799999999998C139.6799999999999 18.7899999999998 137.7699999999999 20.0099999999998 136.1399999999999 21.5599999999998C142.7399999999999 22.7499999999998 149.1699999999999 24.9499999999998 155.13 28.0399999999998C160.87 30.8999999999998 166.12 34.6999999999998 170.7599999999999 39.1099999999998C173 41.2999999999998 175.0499999999999 43.6999999999998 176.9499999999999 46.1999999999998C173.5199999999999 44.0699999999998 170.0199999999999 42.0499999999998 166.3299999999999 40.4199999999998C161.9199999999999 38.2599999999998 157.2599999999999 36.6499999999998 152.5199999999999 35.3999999999998C146.7899999999999 33.8799999999998 140.7799999999999 33.6699999999998 134.9099999999999 34.2599999999998C126.7799999999999 35.2099999999998 119.0499999999999 38.5299999999998 112.3999999999999 43.2399999999998C108.0799999999999 46.1799999999998 104.1799999999999 49.6699999999998 100.4399999999999 53.2999999999998C90.5099999999999 63.4599999999999 82.2399999999999 75.1099999999998 74.7799999999999 87.1599999999999C70.8399999999999 93.4299999999998 67.2499999999999 99.9099999999999 63.6599999999999 106.3799999999999C62.6099999999999 108.4199999999999 61.5099999999999 110.4299999999999 60.4799999999999 112.4799999999999C63.3299999999999 109.5599999999999 66.0499999999999 106.5099999999999 68.9099999999999 103.5999999999999C77.8999999999999 94.6299999999999 87.4699999999999 86.1599999999999 98.0699999999999 79.1199999999999C105.6199999999999 74.2199999999999 113.7399999999999 69.8899999999999 122.6299999999999 68.0899999999999C125.7399999999999 67.3599999999999 128.9499999999999 67.6199999999999 132.0999999999999 67.2799999999999C134.8699999999999 66.9999999999999 137.6599999999999 67.0799999999999 140.4399999999999 66.9799999999999C145.4899999999999 66.9199999999999 150.5499999999999 66.9399999999999 155.5999999999999 67.1399999999999C159.2499999999999 67.3 162.8699999999999 67.8 166.4899999999999 68.2299999999999C168.5599999999999 68.4799999999999 170.5999999999999 68.9399999999999 172.6299999999999 69.4299999999999C176.5099999999999 70.3799999999999 180.7399999999999 70.3899999999999 184.4599999999999 68.8199999999999C189.2199999999999 66.9699999999999 192.8999999999999 63.1799999999999 195.8399999999999 59.1099999999999C197.9999999999999 56.0899999999999 199.8999999999999 52.8899999999999 201.4999999999999 49.5299999999999C202.6599999999999 47.0999999999999 203.9599999999999 44.7399999999999 205.0499999999999 42.2699999999999C206.0499999999999 40.0299999999999 207.1999999999999 37.8499999999999 208.4699999999999 35.7499999999999C209.1399999999999 34.73 209.8699999999999 33.6 211.0899999999999 33.1999999999999C212.1499999999999 33.9499999999999 212.7999999999999 35.11 213.3699999999999 36.2299999999999C215.4699999999999 40.3899999999999 216.7899999999999 44.8799999999999 218.2599999999999 49.2799999999999C220.2799999999999 55.8699999999999 222.0399999999999 62.5499999999999 223.4499999999999 69.2999999999999C225.6599999999999 78.5499999999999 226.6999999999999 88.0199999999999 227.9899999999999 97.4299999999999C228.5499999999999 101.4099999999999 228.8199999999999 105.4199999999999 229.2999999999999 109.3999999999999C230.1699999999999 120.0399999999999 231.1999999999999 130.6699999999999 231.5399999999999 141.3399999999999C231.6199999999999 143.1999999999999 231.7799999999999 145.0499999999999 231.7899999999999 146.9099999999999C231.7999999999999 151.2599999999999 232.0399999999999 155.5999999999999 232.0099999999999 159.9399999999999C231.9999999999999 162.3199999999999 231.9999999999999 164.6999999999999 232.0099999999999 167.0699999999999C232.0599999999999 172.1399999999999 231.8099999999999 177.2099999999999 231.7899999999999 182.2799999999999C231.5899999999999 188.8899999999999 231.0799999999999 195.4799999999999 230.4999999999999 202.0599999999999C229.7699999999999 207.9399999999999 228.9499999999999 213.8399999999999 227.3799999999999 219.5699999999999C225.3299999999999 227.3199999999999 221.7899999999999 234.5999999999999 217.5799999999999 241.3899999999999C214.4199999999999 246.4599999999999 210.7899999999999 251.2699999999999 206.4899999999999 255.4199999999999C202.6099999999999 259.2799999999999 197.9099999999999 262.4999999999999 192.5499999999999 263.8699999999999C191.0499999999999 264.2799999999999 189.4899999999999 264.3199999999998 187.9599999999999 264.5099999999998C188.0299999999999 267.4999999999999 188.6599999999999 270.4399999999999 189.2199999999999 273.3599999999998C190.8099999999999 281.0699999999998 193.0199999999999 288.6599999999999 195.9799999999999 295.9599999999998C197.4999999999999 299.9899999999998 199.3899999999999 303.8599999999998 201.3699999999998 307.6799999999999C204.8199999999998 314.2399999999998 208.9899999999999 320.4699999999998 213.8299999999999 326.1399999999998zM245.1 324.44C245.45 324.5 245.81 324.56 246.17 324.63C246.36 322.84 246.26 321.05 246.27 319.26V281.13C246.26 279.39 246.4 277.64 246.12 275.91C245.76 275.94 245.41 275.9600000000001 245.06 275.9600000000001C244.11 279.7100000000001 243.34 283.51 242.44 287.27C242.06 288.8 241.86 290.36 241.37 291.86C239.67 292.1 237.94 292.03 236.22 292.06C231.16 292.07 226.09 292.06 221.03 292.07C219.37 292.08 217.71 291.98 216.05 292.1C216.02 292.49 215.79 293.01 216.21 293.28C217.49 293.93 218.93 294.16 220.27 294.63C223.7 295.77 227.15 296.79 230.58 297.94C231.97 298.42 233.48 298.66 234.74 299.48C234.78 300.04 234.76 300.61 234.69 301.16C233.46 301.7100000000001 232.16 302.03 230.88 302.44C227.75 303.4700000000001 224.59 304.4 221.47 305.4600000000001C219.68 306.0800000000001 217.8 306.4600000000001 216.06 307.25C216.03 307.62 215.99 307.98 215.95 308.3400000000001C221.04 308.53 226.15 308.28 231.25 308.4600000000001C234.61 308.5900000000001 237.98 308.38 241.34 308.53C241.46 308.92 241.6 309.3 241.71 309.69C242.79 314.63 244.04 319.52 245.1 324.44zM251.07 324.64C251.43 324.5900000000001 251.79 324.52 252.15 324.44C253.13 320.5900000000001 253.88 316.68 254.86 312.83C255.2200000000001 311.41 255.42 309.95 255.89 308.56C258.42 308.38 260.9600000000001 308.57 263.5 308.51C268.6600000000001 308.39 273.83 308.39 278.99 308.44C279.75 308.45 280.51 308.41 281.27 308.36C281.23 308 281.2 307.64 281.17 307.28C279.35 306.45 277.39 306.03 275.5 305.39C271.7699999999999 304.16 268.0199999999999 303 264.2799999999999 301.82C263.7099999999999 301.65 263.1599999999999 301.4 262.6099999999999 301.18C262.4599999999999 300.63 262.4299999999999 300.06 262.4899999999999 299.49C263.3599999999999 299.01 264.3099999999999 298.68 265.2599999999999 298.4C270.1399999999999 296.88 274.9899999999999 295.26 279.8899999999999 293.8C280.2699999999999 293.67 280.6699999999999 293.53 281.0199999999999 293.31C281.4199999999999 293.04 281.2499999999999 292.52 281.1699999999999 292.13C279.5099999999998 292 277.8599999999999 292.1 276.1999999999998 292.09C271.0299999999998 292.08 265.8699999999999 292.1 260.6999999999998 292.08C259.0899999999998 292.05 257.4799999999998 292.1 255.8799999999998 291.87C255.3599999999998 290.2 255.1599999999999 288.45 254.7099999999999 286.76C253.7699999999999 283.19 253.1899999999999 279.52 252.1699999999999 275.98C251.8099999999999 275.97 251.4599999999999 275.9599999999999 251.1099999999999 275.92C250.8199999999999 277.65 250.9599999999999 279.4 250.9599999999999 281.14V319.27C250.9799999999999 321.05 250.8799999999998 322.85 251.0699999999999 324.64zM65.05 279.67C66.17 281.82 67.13 284.07 68.42 286.13C66.6 278.57 65.51 270.86 64.8 263.13C64 255.42 63.95 247.64 64.26 239.9C65.31 219.96 69.8 200.07 78.49 182.02C81.48 176.03 84.84 170.19 88.99 164.91C95.11 157.44 101.52 150.15 108.83 143.82C113.63 139.72 118.82 136.04 124.37 133.02C127.64 131.37 130.88 129.63 134.31 128.34C139.32 126.31 144.5 124.73 149.73 123.4C153.56 122.44 157.51 121.99 161.25 120.69C166.25 119.12 170.72 116.08 174.28 112.26C179.21 107.03 182.37 100.39 184.48 93.59C185.47 90.69 186.07 87.68 186.65 84.67C186.8 83.92 186.87 83.15 186.81 82.3799999999999C180.31 79.6 173.55 77.3199999999999 166.55 76.1999999999999C162.44 75.42 158.26 75.2099999999999 154.09 75.12C143.84 74.8799999999999 133.62 76.8799999999999 123.97 80.24C120.23 81.66 116.48 83.09 112.94 84.96C104.88 88.8 97.3 93.66 90.48 99.42C87.56 101.97 84.65 104.55 82.08 107.4499999999999C72.92 117.2799999999999 65.78 128.86 60.29 141.0999999999999C57.9 146.6499999999999 55.68 152.2799999999999 53.92 158.0599999999999C52.75 161.9999999999999 51.56 165.9499999999999 50.66 169.9699999999999C49.91 172.9099999999999 49.44 175.9199999999999 48.79 178.8899999999999C48.33 181.0299999999999 48.1 183.2099999999999 47.76 185.37C46.91 190.8 46.48 196.3 46.43 201.8C46.54 207.98 46.68 214.17 47.5 220.3C47.9 223.16 48.17 226.04 48.65 228.9C49.63 234.6 50.79 240.27 52.36 245.83C55.45 257.48 59.84 268.78 65.05 279.67zM428.7800000000001 286.11C429.8800000000001 284.45 430.6900000000001 282.63 431.56 280.85C433.6600000000001 276.4 435.8 271.95 437.58 267.36C445.19 248.6 449.88 228.57 450.62 208.31C450.64 206.55 450.69 204.79 450.73 203.02C450.86 193.45 449.4600000000001 183.93 447.55 174.57C446.82 170.98 446.01 167.4 444.9700000000001 163.88C440.93 149.16 434.9700000000001 134.88 426.56 122.1C418.35 109.53 407.55 98.55 394.7200000000001 90.69C388.99 87.1 382.93 84.05 376.67 81.5C370.8900000000001 79.31 364.9600000000001 77.47 358.87 76.39C352.4700000000001 75.34 345.96 74.87 339.4700000000001 75.16C331.55 75.64 323.6900000000001 77.23 316.2600000000001 80.01C314.3200000000001 80.81 312.3200000000001 81.47 310.4200000000001 82.34C310.2100000000001 83.85 310.6700000000001 85.33 310.9500000000001 86.8C312.1100000000001 92.54 313.98 98.16 316.6500000000001 103.3799999999999C319.0200000000001 107.8899999999999 322.17 112.0299999999999 326.11 115.2799999999999C328.54 117.3299999999999 331.35 118.8899999999999 334.2700000000001 120.1099999999999C337.85 121.6099999999999 341.7400000000001 122.0799999999999 345.5100000000001 122.9399999999999C352.7400000000001 124.6499999999999 359.8800000000001 126.8699999999999 366.6600000000001 129.9399999999999C377.0100000000001 134.5899999999999 386.37 141.3199999999999 394.31 149.3999999999999C395.9 151.0099999999999 397.54 152.5799999999999 399.05 154.2699999999999C402.42 158.0299999999999 405.76 161.8399999999999 408.9000000000001 165.7999999999999C416.3800000000001 175.8699999999998 421.7200000000001 187.3899999999998 425.61 199.2799999999998C427.19 204.5799999999999 428.82 209.8799999999998 429.82 215.3299999999999C430.45 218.1999999999999 430.86 221.1099999999999 431.34 224.0099999999999C432.21 230.0999999999999 432.93 236.2299999999999 433.02 242.3899999999999C433.14 249.0399999999999 433.16 255.7099999999999 432.49 262.3299999999998C431.76 270.3199999999998 430.62 278.2899999999999 428.7800000000001 286.1099999999999z" />
-    <glyph glyph-name="opencart"
-      unicode="&#xF23D;"
-      horiz-adv-x="640" d=" M423.3 7.3C423.3 -18 403 -38.3 377.7 -38.3S331.9 -18 331.9 7.3S352.5 53.1 377.7 53.1C403.1 53.1 423.3 32.6 423.3 7.3zM169.4 53.1C144.1 53.1 123.8 32.5 123.8 7.3S144.1 -38.3 169.4 -38.3S215.2 -18 215.2 7.3S194.7 53.1 169.4 53.1zM461.1 323.1C158.9 323.1 81.9 335.9 0 422.3C34.4 370.6 53.3 273.4 373.1 278.1C706.4000000000001 283.1 503.1 192 443.9000000000001 89.2000000000001C630.6 255.9000000000001 763.3 323.1 461.1 323.1z" />
-    <glyph glyph-name="openid"
-      unicode="&#xF19B;"
-      horiz-adv-x="448" d=" M271.5 16L203.5 -16C88.5 -5.7 0 55.5 0 129.8C0 201.3 82.5 260.8 191.7 274.1V231.1C120.2 218.6 67.7 178.1 67.7 129.8C67.7 78.8 126.2 36.5 203.4 26.8V366.8L271.4 400V16zM448 157L316.7 185.5L353.5 206.2C334 217.7 310 226.2 283.5 231V274C329.7 268.5 371.2 254.5 403.8 234.7L438.8 254.5L448 157z" />
-    <glyph glyph-name="opera"
-      unicode="&#xF26A;"
-      horiz-adv-x="496" d=" M313.9 415.3C143.7 415.3 61.3 191.5 166.4 60.2C202.9 14.8 255 -15.4 313.9 -15.4C350.2 -15.4 384.2 -4.3 413.3 15C369.5 -24.2 311.4 -48 248 -48C244.1 -48 240 -48 236.1 -47.7C104.6 -41.6 0 66.9 0 200C0 337 111 448 248 448H248.8C311.9000000000001 447.7 369.5 423.9 413.2000000000001 384.9C384.2000000000001 404.3 350.1 415.3 313.9000000000001 415.3zM415.7 17.6C374.8 -7.1 325 -6 283.7 23.4C339.9 43.9 381.4 115 381.4 200C381.4 284.7000000000001 340.2 355.8000000000001 284 376.6C325.8 405.8 375.2 406.9000000000001 416.9 381.6C522.8 282.9000000000001 522.4 115.9 415.7 17.6z" />
-    <glyph glyph-name="optin-monster"
-      unicode="&#xF23C;"
-      horiz-adv-x="576" d=" M550.671 -2.303C550.671 -13.923 534.998 -21.76 518.513 -17.166C506.353 -13.923 487.167 0.399 482.302 10.128C476.628 21.748 486.356 42.826 501.218 40.934C516.892 39.313 550.671 15.533 550.671 -2.3030000000001zM372.86 372.777C369.077 444.928 272.064 452.495 246.932 396.2870000000001C291.5200000000001 420.608 337.189 411.9600000000001 372.86 372.777zM74.795 40.934C59.122 39.313 25.343 15.533 25.343 -2.303C25.343 -13.923 41.016 -21.76 57.5 -17.166C69.66 -13.923 88.576 0.399 93.44 10.128C99.386 21.748 89.658 42.826 74.795 40.934zM572.56 26.612C573.641 23.099 574.452 19.586 574.452 15.803C575.262 -15.813 530.135 -48.242 500.949 -49.322C483.654 -50.132 466.359 -40.945 458.253 -25.812C344.7560000000001 -29.865 231.2590000000001 -30.676 118.033 -25.812C109.656 -40.945 92.361 -49.862 75.066 -49.322C46.151 -48.241 1.023 -15.813 1.563 15.803C1.833 19.586 2.374 23.099 3.455 26.612C-2.111 36.075 -1.39 41.894 8.86 38.232C12.103 43.366 15.886 47.6900000000001 19.94 52.014C17.37 62.931 21.21 66.108 31.019 61.202C35.613 64.445 41.017 67.687 46.963 70.39C46.963 86.147 58.802 81.521 64.258 76.065C76.725 77.845 84.387 75.356 91.011 70.39V90.116C78.024 90.116 50.37 101.491 45.071 126.328C40.097 147.053 47.678 164.403 70.203 173.888C71.013 179.833 78.31 187.94 85.065 189.832C92.632 191.724 97.496 185.238 99.117 179.563C106.542 179.563 116.874 178.098 120.195 171.456C125.6 171.997 131.274 172.808 136.679 173.348C134.2470000000001 175.24 131.545 176.861 128.572 177.942C123.438 186.859 114.79 189.021 103.981 189.562C103.981 190.372 103.981 191.183 104.251 192.264C84.524 192.805 60.203 197.939 49.394 210.099C28.073 233.737 33.459 293.6760000000001 61.554 313.5970000000001C69.931 319.2720000000001 83.172 314.408 84.253 303.8690000000001C86.678 283.271 84.652 277.0360000000001 110.465 277.927C118.572 285.7630000000001 127.22 292.519 136.948 297.9240000000001C122.086 299.2760000000001 108.034 296.303 93.17 294.1410000000001C105.922 306.6210000000001 117.123 319.5830000000001 149.918 336.5680000000001C173.429 348.4580000000001 199.911 357.3760000000001 226.123 359.807C207.477 367.6440000000001 186.13 371.6980000000001 166.402 376.2910000000001C242.877 392.5050000000001 340.971 398.4500000000001 410.691 338.7290000000001C428.796 323.326 443.118 302.5180000000001 453.3869999999999 278.7370000000001C493.1859999999999 273.884 489.857 284.3180000000001 492.03 303.8690000000001C493.111 314.1380000000001 506.352 319.2720000000001 514.7289999999999 313.3270000000001C529.5909999999999 302.7880000000001 536.8879999999999 282.5210000000001 539.319 265.2260000000001C541.481 247.3910000000001 539.5889999999999 223.8810000000001 526.889 210.0990000000001C516.08 197.9390000000001 492.569 192.5340000000001 473.113 191.994V189.2910000000001C462.033 189.0210000000001 452.845 186.859 447.44 177.6710000000001C444.468 176.59 441.766 174.9680000000001 439.063 173.0770000000001C444.738 172.537 450.413 171.7260000000001 455.818 171.186C457.687 176.8050000000001 468.353 179.5630000000001 476.895 179.5630000000001C478.516 184.968 483.651 191.453 490.947 189.8320000000001S504.999 179.8340000000001 505.81 173.888C516.619 169.564 527.969 161.728 530.941 148.216C532.8330000000001 140.109 532.562 133.083 531.211 126.328C525.485 101.066 497.85 90.116 485.272 90.116C485.272 83.36 485.272 76.8750000000001 485.002 70.39C493.012 76.3960000000001 501.369 77.5480000000001 511.754 76.0650000000001C517.673 81.984 529.3190000000001 85.4750000000001 529.3190000000001 70.39C534.994 67.6870000000001 540.6680000000001 64.4450000000001 545.263 61.2020000000001C555.363 66.253 558.932 61.741 556.072 52.0140000000001C560.125 47.6910000000001 564.179 43.0970000000001 567.151 38.2320000000001C577.2869999999999 41.8520000000001 578.1719999999999 36.1540000000001 572.56 26.6120000000001zM498.7869999999999 280.6280000000001C516.0819999999999 273.872 524.9989999999999 258.4690000000001 529.0519999999999 244.9580000000001C530.1329999999999 255.497 526.3499999999999 284.4110000000001 515.2699999999999 296.0310000000001C507.9739999999999 303.327 501.2179999999998 301.165 501.2179999999998 295.221C501.2189999999998 289.005 499.8679999999998 283.601 498.7869999999999 280.6280000000001zM480.1409999999999 268.198C493.1119999999999 252.525 497.1649999999999 226.583 492.8409999999999 205.235C503.6499999999999 207.397 513.3779999999999 211.45 519.0529999999999 217.395C520.9449999999999 219.557 522.8359999999999 222.259 523.9169999999999 224.961C522.8359999999999 246.3090000000001 513.6479999999999 267.658 494.1919999999999 273.8730000000001C490.9499999999999 270.63 485.0049999999999 269.009 480.1409999999999 268.198zM458.2519999999999 267.387C465.8189999999999 246.85 470.6829999999999 224.691 472.5739999999999 202.802C476.0869999999999 202.802 480.1409999999999 203.072 484.1939999999999 203.613C490.1389999999999 227.9340000000001 483.9239999999999 255.2270000000001 470.1419999999999 267.117C466.3589999999999 267.117 462.0349999999999 267.117 458.2519999999999 267.3870000000001zM77.768 280.628C76.687 283.601 75.336 289.005 75.336 295.221C75.336 301.166 68.31 303.328 61.284 296.031C49.934 284.411 46.421 255.497 47.502 244.958C51.555 258.47 60.473 273.873 77.768 280.628zM83.443 205.234C79.119 226.582 83.173 252.525 96.144 268.197C91.279 269.008 85.335 270.629 82.092 273.872C62.635 267.657 53.717 246.309 52.366 224.96C53.717 222.258 55.338 219.556 57.23 217.394C62.905 211.179 72.633 207.396 83.443 205.234zM124.788 266.307C119.654 265.226 114.79 263.334 109.926 261.442L97.766 256.308V256.578C90.47 242.526 87.767 222.259 92.361 203.613C96.955 203.072 101.008 202.802 105.061 202.802C107.493 224.961 114.249 246.58 124.788 266.307zM212.883 289.546C212.883 247.391 247.202 213.341 289.088 213.341S365.293 247.391 365.293 289.546C365.293 331.432 330.974 365.481 289.088 365.481S212.883 331.432 212.883 289.546zM365.293 192.263C375.262 141.655 368.592 127.571 381.777 134.164C397.721 142.271 404.476 173.347 404.747 191.183C391.776 191.993 378.534 191.993 365.293 192.263zM293.682 192.804V193.074C293.4120000000001 187.94 293.952 154.971 298.0060000000001 151.999C309.0850000000001 146.594 337.4590000000001 147.405 349.079 150.918C354.484 152.5389999999999 351.511 187.94 350.7 192.804C331.784 193.074 312.598 193.074 293.682 192.804zM279.629 192.804V193.074C260.173 192.804 240.987 192.804 221.8 192.263C219.908 183.076 217.206 143.352 223.692 140.649C236.663 134.974 265.308 135.515 278.278 139.028C282.8730000000001 141.46 280.711 184.427 279.629 192.804zM193.967 135.244C199.372 132.812 202.614 132.812 203.695 139.568C205.587 148.215 206.127 176.32 208.56 191.723C196.4 191.453 183.969 190.912 171.808 190.102C166.403 170.375 172.078 144.973 193.967 135.244zM128.301 146.324C172.079 99.304 220.99 60.661 284.2240000000001 39.8539999999999C351.7820000000001 59.0399999999999 399.8830000000001 99.8449999999999 447.4430000000001 146.8649999999999C436.348 151.1799999999999 439.7280000000001 157.2279999999999 440.1470000000001 158.4849999999999C431.2290000000001 159.2949999999999 422.3120000000001 160.3769999999999 413.6640000000001 161.1869999999999C404.206 128.2189999999999 377.7240000000001 108.2219999999999 366.9140000000001 129.5709999999999C364.2120000000001 134.7049999999999 363.4010000000001 141.1909999999999 362.3200000000001 146.3249999999999C358.5370000000001 137.9479999999999 349.0780000000001 138.218 337.7290000000001 137.4069999999999C324.4880000000001 136.3259999999999 306.112 136.0559999999999 293.6810000000001 140.3789999999999C290.7090000000001 127.4079999999999 282.6020000000001 127.4079999999999 266.9290000000001 126.0569999999999C252.8770000000001 124.7049999999999 218.287 122.0029999999999 212.072 136.8659999999999C210.9910000000001 108.2219999999999 176.942 126.868 166.9430000000001 143.892C163.7000000000001 149.567 161.5380000000001 155.242 159.917 161.4569999999999C152.0800000000001 160.6469999999999 144.244 159.836 136.406 158.755C138.8490000000001 155.0919999999999 137.9550000000001 149.7029999999999 128.3010000000001 146.324zM115.6 -5.545C109.926 17.694 96.954 44.177 82.092 48.501C59.663 55.257 13.183 24.991 15.885 -6.085C28.586 -25.542 55.879 -41.755 75.066 -42.566C92.901 -43.376 111.006 -31.486 114.79 -13.652C115.329 -11.22 115.6 -8.518 115.6 -5.5450000000001zM122.896 0.399C156.405 19.856 192.075 36.07 228.827 47.419C190.184 67.956 160.729 95.25 131.544 124.435C129.382 123.083 126.41 122.003 123.708 120.922C122.071 116.012 132.426 115.5920000000001 129.113 108.491C126.951 104.4370000000001 120.465 100.924 113.98 99.3030000000001C111.819 96.6010000000001 108.846 94.4390000000001 106.144 92.818H105.874C105.604 79.307 105.604 65.794 106.144 52.283C115.083 36.319 121.57 18.969 122.896 0.399zM443.6600000000001 -12.301C406.908 9.047 369.6160000000001 29.044 328.0010000000001 40.664C314.2190000000001 34.449 300.168 29.315 285.846 25.261C283.6840000000001 24.45 283.6840000000001 24.45 281.522 25.261C269.632 29.044 258.283 33.3679999999999 246.663 38.502C206.398 26.8819999999999 169.377 9.317 134.247 -12.301H133.977V-12.571C134.247 -12.571 134.247 -12.571 134.247 -12.301C237.474 -16.355 340.702 -15.814 443.66 -12.301zM470.683 51.744L470.4130000000001 51.474C470.9540000000001 65.256 471.224 79.037 471.224 92.8190000000001C468.251 94.4400000000001 465.549 96.8730000000001 463.1170000000001 99.5750000000001C456.6320000000001 100.9260000000001 450.1460000000001 104.7090000000001 447.9840000000001 108.4930000000001C446.0920000000001 112.5460000000001 449.3350000000001 116.059 453.9290000000001 118.7620000000001C453.6590000000001 119.3030000000001 453.3880000000001 120.3830000000001 453.3880000000001 121.1940000000001C450.4160000000001 122.0050000000001 447.9830000000001 123.0860000000001 445.8210000000001 124.4370000000001C414.2050000000001 94.9820000000001 380.4250000000001 67.6880000000001 342.3230000000001 47.6910000000001C381.2370000000001 36.0710000000001 418.2580000000001 19.5870000000001 454.1980000000001 0.1300000000001C455.2480000000001 14.8220000000001 461.4290000000001 35.8790000000001 470.6830000000001 51.7440000000001zM493.9230000000001 48.5C479.33 44.177 466.0890000000001 17.694 460.414 -5.546C460.414 -29.372 481.6920000000001 -43.443 500.948 -42.568C520.134 -41.757 547.428 -25.544 560.129 -6.087C563.102 24.99 516.6220000000001 55.257 493.923 48.5zM290.709 313.867C290.754 313.867 290.798 313.8640000000001 290.843 313.8640000000001C290.889 313.8640000000001 290.933 313.867 290.9790000000001 313.867H290.7090000000001zM290.709 217.124C319.354 217.124 342.593 238.742 342.593 265.495C342.593 301.587 302.086 323.574 270.442 309.813C279.9000000000001 306.841 286.926 298.193 286.926 288.195C286.926 264.938 253.635 256.24 240.446 276.8450000000001C233.149 242.778 259.814 217.124 290.709 217.124zM68.039 -26.083C68.579 -32.569 80.199 -38.784 89.657 -35.5410000000001C96.413 -32.8380000000001 104.25 -25.0020000000001 106.952 -19.3270000000001C109.925 -12.301 105.871 0.67 97.224 -0.9520000000001C88.307 -2.573 67.499 -17.7060000000001 68.039 -26.0830000000001zM478.789 -0.952C470.412 0.669 466.358 -12.301 469.331 -19.327C471.763 -25.002 479.6 -32.838 486.626 -35.541C495.813 -38.784 507.704 -32.569 507.974 -26.083C508.785 -17.706 487.707 -2.573 478.789 -0.952z" />
-    <glyph glyph-name="osi"
-      unicode="&#xF41A;"
-      horiz-adv-x="495.8" d=" M0 188.8C2.3 324.6 97.4 421.2 213.8 436.9C352.6 455.5 469.4 361.1 491.8 235.8C513.1 117 447.8 5.8 340.2000000000001 -38.2C330.9000000000001 -42 325.8000000000001 -39.9 322.2000000000001 -30.5C304.4000000000001 15.8 286.6 62.2 268.8000000000001 108.5C265.7000000000001 116.6 267.8000000000001 121.7 275.8000000000001 125.3C300.0000000000001 136.3 315.1000000000001 154.7 319.1000000000001 181.1C325.5000000000001 223.5 294.6000000000001 259.8 254.6000000000001 263.3C215.6000000000001 266.7000000000001 182.8000000000001 239.6 177.1000000000001 203.6C171.9000000000001 170.6 188.2000000000001 139.9 219.0000000000001 125.9C228.6000000000001 121.5000000000001 230.5000000000001 117.3 226.8000000000001 107.5000000000001C208.9000000000001 60.9 191.0000000000001 14.3000000000001 173.1000000000001 -32.4C170.5000000000001 -39.3 164.8000000000001 -41.7 157.6000000000001 -38.9C105.0000000000001 -18.6 56.2000000000001 22.1 26.8000000000001 80.1C1.9 129.3 1.6 167.8 0 188.8zM20.9 190.7C21.3 184.1 21.5 176.4 22.2 168.6C28.5 96.6999999999999 71.8 25.1 153.2 -14.5C156.4 -16 157.6 -15.3 158.8 -12.2C173.7 26.9 188.7 66 203.8 105.1C205.1 108.4 204.4 109.9 201.4 111.8C169.8 131.7 154.1 160.3 155.8 197.8C156.8 219.4 165.1 238.3 179.6 254.1C209.6 286.8 256.6 293.9000000000001 295.1 271.7000000000001C327 253.3 344.6 217.9 340.3 181.3C336.7 150.7 321 127.4 294.6 111.5C291.9000000000001 109.9 291.1 108.6 292.3 105.5C307.5 66.3 322.5 27.1 337.5 -12.2C338.7 -15.3 339.9 -16 343.1 -14.5C378.6 2.1 408.3 25.8 431.2000000000001 57.5C466.0000000000001 105.7 480.3000000000001 159.4 473.5000000000001 218.5C459.8 336 354.1 433.3 218 416.5C111.9 403.5 22.7 314 20.9 190.7z" />
-    <glyph glyph-name="page4"
-      unicode="&#xF3D7;"
-      horiz-adv-x="496" d=" M248 -56C111 -56 0 55 0 192S111 440 248 440C268.9 440 289.3 437.4 308.7 432.5L42.3 56H248V-56zM248 87.6V301.2L98.6 87.6H248zM344 56V-36.7C389.7 -17.5 428.5 15 455.4 56H344zM401.4 194.2L380.2 185.8L401.4 177.5V194.2zM381.1 139.7C374.4 139.7 373.1 133.4 373.1 126.8V119.1H389.3V129.1C389.3 135 387 139.7000000000001 381.1 139.7000000000001zM496 192C496 154.7 487.8 119.3 473 87.6H344V420.7C433.3 383.2 496 294.9 496 192zM360.4 304.4H428.6V352H414.7V319.4H400.8V349H386.9000000000001V319.4H374.2000000000001V352H360.3000000000001V304.4zM428.5 119.1H402V130.1C402 145.5 396.4 155.3 381.1 155.3C365.7000000000001 155.3 360.4000000000001 144.7 360.4000000000001 129.4V104.1H428.6V119.1zM428.5 222.1L360.3 192.4V180L428.5 150.5V167.1L414.1 172.8V199.3L428.5 205.2V222.1zM423.7 290.6H388.1V264H402V276.2H413C421.6 260.4 414.3 240.9 394.4 240.9C371.9 240.9 366.1 266.2 378.9 278.6L367.3 289.2C351.1 271.7 355.1 225.3 394.4 225.3C428.4 225.3 439.1 261.2 423.7 290.6z" />
-    <glyph glyph-name="pagelines"
-      unicode="&#xF18C;"
-      horiz-adv-x="384" d=" M384 135.3C328.9 -1.4 196.9 81.3 196.9 81.3C156.4 -0.5 89.5 -53.1 12.3 -53.4C-3.8 -53.4 -4.3 -29 12.3 -29C76.7 -28.7 132.8 13.7 169.5 81.1C128.4 65.2000000000001 50.9 53.2 7.9 163.3C116.9 208.2 167 152.1 186.2 117.8C196.1 142.2 203.2 168.7 207.8 197.5C207.8 197.5 68.1 175.6 58.3 295.6C177.4 343.5 210.9 218.9 210.9 218.9C212.5 235.6 214.2 271.5 214.2 272.3C214.2 272.3 107.9 346 176.1 437.5C300.7000000000001 394.5 237.5000000000001 275.1 237.5000000000001 275.1C238.0000000000001 273.5 238.0000000000001 251.3 237.5000000000001 241.7C237.5000000000001 241.7 282.7000000000001 330.7 373.9000000000001 299.2C369.7000000000001 165.1999999999999 232.0000000000001 192.8 232.0000000000001 192.8C227.6 165.4 220.8000000000001 139.4 212 115.3C212 115.3 295 207.1 384 135.3z" />
-    <glyph glyph-name="palfed"
-      unicode="&#xF3D8;"
-      horiz-adv-x="576" d=" M384.9 254.1C384.9 301.5 329.7 298.3 289.5 283.9C288.2 244.5 287 203.2 286.5 164.1C287.2 161.3 289.1 157.9 301.6 157.9C338.4000000000001 157.9 385 200.7000000000001 384.9000000000001 254.1zM190.4 181.9C190.6 181.9 196.9 184.6 201.6 184.6C228.2 184.6 222.3 140.5 187.2 140.5C165.7 140.5 150.1 158.6 150.1 183.5C150.1 225.5 193 279.0999999999999 250.8 310C251.8 322.4 253.8 332 261.3 338.2C272.5 347.2 287.9 341.7 290.8 327.1C363 349.3 426 326.1 426 255.1C426 177.1999999999999 346.7 102.5 285.9 116.9C285.8 77.5 286.8 42.5 288.6 16.9V16.7C288.8 13.3 289.2 4.2 283.3 -2.4C273.7 -13.0000000000001 249.9 -12.4 246.9 19.9C242.8 64.3 247.1 226 248.3 262.4C226.8 247.4 189.8 212.1 189.8 186.5C190 184 190.2 182.5 190.4 181.9zM8 266.9S7.9 229.5 46.4 229.5H76.4L98.8 12.3S98.8 -32 143.5 -32H432.4S477.1 -31.6 477.1 12.3L499.4999999999999 229.5H529.5S567.9 228.3 567.9 266.9C567.9 266.9 568 304.3 529.5 304.3H499.4C492.1 329.9 469.2 378.6 380 378.6H352V397.7S349.3 416.1 330.9 416.1H245.1S224 416.1 224 397.7V378.6H195.9S90.9 374.4 75.4 304.3H46.4S8 305.5 8 266.9z" />
-    <glyph glyph-name="patreon"
-      unicode="&#xF3D9;"
-      horiz-adv-x="512" d=" M512 253.2C512 151.9 429.6 69.4 328.2 69.4C226.5 69.4 143.8 151.8 143.8 253.2C143.8 354.8 226.5 437.5 328.2 437.5C429.6 437.5 512 354.8 512 253.2zM0 -53.5H90V437.5H0V-53.5z" />
-    <glyph glyph-name="paypal"
-      unicode="&#xF1ED;"
-      horiz-adv-x="384" d=" M111.4 152.1C107.9 132.9 94 43.4 89.9 18.1C89.6 16.3 88.9 15.6 86.9 15.6H12.3C4.7 15.6 -0.8 22.2 0.2 29.5L58.8 401.4C60.3 411 68.9 418.3 78.8 418.3C231.1 418.3 243.9 422 282.8 406.9C342.9000000000001 383.6 348.4 327.4 326.8 266.6C305.3 204 254.3 177.1 186.7 176.3C143.3 175.6 117.2 183.3 111.4 152.1zM357.1 296C355.3 297.3 354.6 297.8 354.1 294.7C352.1 283.3 349 272.2 345.3 261.1C305.4000000000001 147.3 194.8 157.2 140.8 157.2C134.7 157.2 130.7 153.9 129.9 147.8C107.3 7.4 102.8 -21.9 102.8 -21.9C101.8 -29 106.3 -34.8 113.4 -34.8H176.9C185.5 -34.8 192.6 -28.4999999999999 194.3 -19.9C195 -14.5 193.2 -26 208.7 71.4C213.3 93.4 223 91.1 238.0000000000001 91.1C309 91.1 364.4000000000001 119.9 380.9000000000001 203.4C387.4000000000001 238.2000000000001 385.5000000000001 274.8000000000001 357.1 296z" />
-    <glyph glyph-name="periscope"
-      unicode="&#xF3DA;"
-      horiz-adv-x="448" d=" M370 384.4C331.4 425.4 280.5 448 226.6 448C111.9 448 18.5 351.8 18.5 233.6C18.5 158.5 76.3 73.8 101.2 40.9C137.8 -7.5 192.6 -64 226.6 -64C268.2 -64 339.5 30.2 347.5 41C372.1 74.1 429.5 159.3 429.5 233.6C429.5 290.1 408.4 343.7 370 384.4zM226.6 -45.9C184.1 -45.9 36.6 121.4 36.6 233.5C36.6 340.9 120.5 429.8 226.6 429.8C327.4 429.8 411.3 340.8 411.3 233.5C411.4 121.4 263.9 -45.9 226.6 -45.9zM338 241.2C338 182.1 286.9 131.5 227.2 131.5C126.6 131.5 76.5 239.7 134.3 313.3V312.9C134.3 288.4 154.4 268.5 179.1 268.5C203.8 268.5 223.9 288.4 223.9 312.9C223.9 331.1 212.8 346.7 197 353.6C273.6 372.8 338 314.3 338 241.2z" />
-    <glyph glyph-name="phabricator"
-      unicode="&#xF3DB;"
-      horiz-adv-x="496" d=" M323 185.9L322.9 198.9S344.6 218.7 344 220.1L334.5 240.1C333.9 241.5 305 240.6 305 240.6L295.6 249.9S295.8 278.4 294.4000000000001 279L274.3 288.2C272.9000000000001 288.8 253.6 267.2 253.6 267.2L240.5000000000001 267.4S220 288.8 218.6 288.2L198.6 279.9C197.2 279.4 198.8 251 198.8 251L189.7 241.9S160.5 242.8 160 241.5L151.9 221.6999999999999C151.3000000000001 220.2999999999999 172.9 200.6999999999999 172.9 200.6999999999999L173 187.8S151.3000000000001 168 151.9 166.6L161.4 146.6C162 145.2 190.9 146.1 190.9 146.1L200.3000000000001 136.8S200.1000000000001 104.9999999999999 201.5 104.4999999999999L221.6 96.1999999999999C223 95.5999999999999 242.3 119.6999999999999 242.3 119.6999999999999L255.4 119.5S275.9 95.6999999999999 277.2 96.1999999999999L297.2 103.6999999999999C298.6 104.3 297 135.8 297 135.8L306.1 144.9S335.3 144 335.8 145.4L343.9000000000001 165.2C344.6 166.3 323.0000000000001 185.9 323.0000000000001 185.9zM278.1 194.6C278.8 177.5 265.3 163 248.0000000000001 162.2C230.7 161.4 215.9 174.7 215.2000000000001 191.8C214.5000000000001 208.9 228.0000000000001 223.4 245.3000000000001 224.1C262.6 224.9 277.4000000000001 211.6 278.1 194.6zM479.3 232.5L382.3 329.5L382.2 329.4C307.1 402.7 186.8 402.2 112.4 327.8C61.5 276.8 84.6 299.9 16.7 232.5C-5.6 210.2 -5.6 173.8 16.7 151.5C86.6 82.1 63.1 105.5 114.1 54.5L114.2 54.6C189.3 -18.7 309.6 -18.3 384 56.2C435 107.1 411.9 84.1 479.3 151.5000000000001C501.6 173.8000000000001 501.6 210.2000000000001 479.3 232.5000000000001zM140.4 84.2C80.8 143.7 80.8 240.2 140.4 299.7C199.9 359.3 296.4 359.2 356 299.7C415.5 240.2 415.6 143.7 356 84.1C296.4 24.6 200 24.7 140.4 84.2000000000001z" />
-    <glyph glyph-name="phoenix-framework"
-      unicode="&#xF3DC;"
-      horiz-adv-x="640" d=" M212.9 103.7C216.7 103.8 235.7 105.1 238.5 105.9C236.1 108.5 194.9 106.9 170.5 155.5C166.2 164.1 163 173.1 164.1 183.1C167 208.6 197 213.1 216.1 201.6C252.1 180 279.4 110.3 329.8 104.1C366.8 99.6 414.4 121.1 438 149.5C437.4 149.6 437.2 149.7 437 149.6C436.6 149.5 436.2 149.4 435.9 149.3C402.6 137.2 341.6 139.6 301.2 164.1C263.6 186.9 248.1 222.8 249.4 238.7C251.2 260 272.3 261.9 285.3 258.3C299.7 254.4 309.7 240.7 324.2 230.9C339.8 220.5 357.0999999999999 217.2 375.5 220.6C390.3999999999999 223.3 409.8999999999999 232.9 412 235.1C410.8999999999999 235.2 410.2 235.2 409.5 235.3C403.3 235.9 397.1 236.1 391 237C279.8 253.5 262.1 400.6 138.5 410.1C94.2 413.5 39.1 402 2.2 375.1C1.4 374.5 0.7 373.9 0 373.3C0.1 373.1 0.1 373 0.2 372.8C1 372.8 1.8 372.9 2.6 373C8.9 374 15.1 373.8 21.3 372.7C45.1 368.4 69 349.6 77.2 296.2C82.5 261.9 76.5 245.4 85.2 210.1C104.2 133 176.2 102.5 212.9 103.7zM75.3 383.1C74.4 384.1 74.4 384.3 74 385.1C86.1 387.7 98.2 389.2 110.6 389.9C109.5 375.2 88.4 368.6 75.3 383.1zM272.2 32.6C229.4 31.4 180.2 59.3 148.7 94C144.1 99 131.9 114.2 130.1 117.4L130.5 117.8C137.1 113.6999999999999 156.2 99.1999999999999 185.3 90.8C209.5 83.8 233.4 84.4999999999999 256.9 94.1C279.6 103.4 297.9 94.6 300 91.2C281.5 87.4 279.9 86.8 276 83.3C270.9 78.9 271.4 71.6 283 66.1C309.2 53.7 346 68.9 380.2 40.7C382.6 38.7 388.3 32.9 390.3 30.0000000000001C390.2 29.8000000000001 390 29.7 389.9000000000001 29.5000000000001C385.1 31.0000000000001 373.5000000000001 37.0000000000001 349.7000000000001 38.8000000000001C325.0000000000001 40.8000000000001 303.4000000000001 33.5000000000001 272.2000000000001 32.6000000000001zM447 284.6C463.4 289.8 488.3 298 513.5 287.9000000000001C529.6 281.4000000000001 539.7 269.2000000000001 545.6 253.3000000000001C549.1 243.9000000000001 550.7 233.6000000000001 550.7 224.6000000000001C550.5 224.6000000000001 550.3000000000001 224.6000000000001 550.1 224.5000000000001C549.9 224.9000000000001 549.7 225.4000000000001 549.6 225.8000000000001C544.6 247.8000000000001 519.7 269.6000000000001 482 255.7000000000001C431.8 237.1000000000001 351.6 246.0000000000001 305.1 303.7000000000001C304.4000000000001 304.6000000000001 302.7000000000001 305.4000000000001 303.8 306.9000000000001C303.9000000000001 307.1 305.9000000000001 306.3000000000001 306.8 305.6C324.9000000000001 292.2000000000001 345.1 283.7000000000001 367.1 279.4000000000001C397.6 273.3000000000001 421.7000000000001 276.5000000000001 447 284.6zM549.7 167.1C517.3000000000001 166.9 515.9000000000001 117 446.1 102.7000000000001C427.9000000000001 99.0000000000001 407.4000000000001 98.1 401.2000000000001 98.5000000000001V98.9C404.0000000000001 100.4 415.9000000000001 101.5000000000001 430.9000000000001 115.5000000000001C438.8 122.8000000000001 446.2000000000001 130.6000000000001 453.7 138.4C473.2 158.6 495.1 180.6 535.6 177.4C558.7 175.6 564.9 169.2000000000001 571.7 164.7000000000001C572 164.5000000000001 572.1 164.2000000000001 572.4000000000001 163.8000000000001C571.9000000000001 163.8000000000001 571.7 163.7000000000001 571.5000000000001 163.8000000000001C564.5000000000001 166.5000000000001 557.2000000000002 167.1000000000001 549.7000000000002 167.1000000000001zM537.4000000000001 191.2000000000001C537.3000000000001 191.0000000000001 537.3000000000001 190.8000000000001 537.2 190.6C508.3000000000001 195 489.2 198.5 468.7 186.6C451.7 176.7000000000001 437.3000000000001 166.1 406.7000000000001 162.2000000000001C379.6 158.8000000000001 361.6 159.8000000000001 340.6 170.2000000000001C340.3 170.4 340 170.6 339.6 170.8000000000001C339.6 171.0000000000001 339.7000000000001 171.1000000000001 339.7000000000001 171.3000000000001C364.6 167.5000000000001 376.1 166.2000000000001 395.2000000000001 177.1000000000001C417.5000000000001 190.0000000000001 435.3000000000001 203.7000000000001 466.5000000000001 208.1000000000001C496.1000000000001 212.2000000000001 517.8000000000001 205.6000000000001 537.4000000000001 191.2000000000001zM268.6 350.7C268 351.3 267.5 351.9 266.5 353C274.1 353 296.2 354.2 319.9 344.6C339.6 336.6 352.1 323.6 370.1 311.7C381.2 304.4 393.5 302.4 406.5 303.6C410.8 304 415 304.8 419.3 305.3C419.7 305.4 420.2 305.3 420.8 305C420.2 304.6 419.6 304.1 419 303.8C410.8999999999999 299.8 402.3 297.5 393.3999999999999 296.7C367.2999999999999 294.1 343.0999999999999 300.4 319.9999999999999 312.1C300.6999999999999 322 283.5999999999999 335 268.5999999999999 350.7zM640 112.3C636.5 109.2 617.3 100.7 597.3 107C585 110.9 577.8 121.9 565.6999999999999 131.1C555.6999999999999 138.7000000000001 544.8 139 537.5999999999999 139.5C538.1999999999999 140.3 538.4999999999999 140.7 538.8 140.9C553.5999999999999 150.1 569.3 153.1 586.0999999999999 147.4C598.5999999999999 143.2 605.3 133.9 616.4999999999999 123.2C627.2999999999998 112.8 637.4999999999999 113.3 639.5999999999999 112.7C639.6999999999999 112.8 639.8 112.7 639.9999999999999 112.3zM427.5 -24.7C429.7 -25.9 429.1 -26.2 429 -26.7C410.5 -25.3 395.1 -19.1 382.2 -4.5C360.4 20.2 340.5 23.4 333.6 25.2C334.1 25.4 334.4 25.6 334.7 25.6C347.8 25.4999999999999 360.8 24.9 373.6 21.7C398.9 15.3 408.6 -3.7 415.2 -13.6C418.4 -18.4 422.5 -21.9 427.5 -24.7z" />
-    <glyph glyph-name="phoenix-squadron"
-      unicode="&#xF511;"
-      horiz-adv-x="513.52" d=" M96.24 385.19C142.91 421.43 202.15 441.43 261.28 439.92C290.95 440.3 320.57 434.54 348.45 424.55C324.25 429.19 299.27 430.9 274.85 427C231.85 421.65 191.59 399.77 162.69 367.65C168.38 368.64 173.5 371.3300000000001 178.76 373.53C196.95 381.42 216.36 386.82 236.1600000000001 388.4C255.9600000000001 390.54 275.9100000000001 388.83 295.61 386.4700000000001C281.1500000000001 383.68 266.4100000000001 381.89 252.5 376.86C217.97 365.75 187.04 343.6 165.95 314.04C152.11 294.27 142.25 271.05 141.21 246.71C140.86 230.17 146.44 211.8 161.1 202.54C172.23 195.88 185.95 193.15 198.73 195.78C214.22 198.25 228.89 204.45 242.46 212.16C254.01 219 265.19 226.75 274.51 236.48C278.31 239.71 277.05 244.96 277.14 249.31C275.01 249.65 272.74 250.42 270.82 249.01A203.975 203.975 0 0 0 234.89 233.59C214.8199999999999 227.4 192.6099999999999 225.11 172.6099999999999 232.81C185.44 231.08 198.75 232.5 210.4599999999999 238.27C230.7499999999999 248.02 247.38 263.54 265.06 277.15C292.8999999999999 298.44 322.7 317.26 354.23 332.62C380.01 344.63 407.32 355.47 436.04 356.82C420.36 343.06 403.79 330.22 389.12 315.31C374.57 301.27 361.58 285.73 348.89 270C345.36 265.39 339.9099999999999 263.04 335.2699999999999 259.81C313.0299999999999 244.78 294.6699999999999 223.85 283.2299999999999 199.53C273.8699999999999 179.79 268.6799999999999 157.56 271.4199999999999 135.69C273.3699999999999 121.9599999999999 280.1599999999999 108.0199999999999 292.3799999999999 100.68C305.3199999999999 92.6899999999999 321.5199999999999 92.59 335.9899999999999 95.5699999999999C368.8899999999999 103.04 397.5999999999999 124.54 417.2699999999999 151.5699999999999C437.7699999999999 179.17 447.8799999999999 213.9499999999999 446.5199999999999 248.2099999999999C445.9999999999999 255.73 444.9399999999999 263.2099999999999 444.8499999999999 270.76C452.8699999999998 251.22 459.7199999999999 230.93 461.5499999999998 209.75C463.5599999999998 195.43 462.2999999999998 180.91 459.9299999999998 166.73C458.0099999999998 155.71 454.2399999999998 145.15 452.1199999999998 134.1999999999999C472.4799999999998 156.93 486.2899999999998 185.44 491.5799999999998 215.5099999999999C497.2999999999998 250.88 492.1599999999998 287.87 477.3299999999998 320.4599999999999C498.1699999999998 288.3399999999999 509.7599999999998 250.67 513.1399999999999 212.66C513.6399999999999 199.8899999999999 513.6399999999999 187.0799999999999 513.1399999999999 174.3199999999999C510.2299999999998 140.06 500.1699999999998 106.37 483.3799999999999 76.3199999999999C457.1799999999999 28.8399999999999 415.1799999999999 -9.57 365.8399999999999 -32.0000000000001C287.3199999999999 -68.34 190.6399999999999 -63.4100000000001 117.1199999999999 -17.28C78.2799999999999 6.5 46.0599999999999 41.04 25.4399999999999 81.68C10.72 110.57 2.04 142.5 0 174.87V206.3C3.94 276.27 40.99 342.62 96.24 385.19M318.89 304.62C324.4 305.42 329.71 307.19 334.91 309.12C339.9 310.89 344.18 315.07 345.26 320.37C336.35 315.37 327.31 310.42 318.89 304.62z" />
-    <glyph glyph-name="php"
-      unicode="&#xF457;"
-      horiz-adv-x="640" d=" M320 343.5C491.4 343.5 623.2 271.3 623.2 192S491.3 40.5 320 40.5C148.6 40.5 16.8 112.7 16.8 192S148.7 343.5 320 343.5M320 360.3C143.3 360.3 0 285 0 192S143.3 23.7 320 23.7S640 99 640 192S496.7 360.3 320 360.3zM218.2 205.5C210.3 165 182.4 169.2 148.1 169.2L161.8 239.8C199.8 239.8 225.6 243.9 218.2 205.5zM97.4 97.7H134.1L142.8 142.5C183.9 142.5 209.4 139.5 233 161.6C259.1 185.6 265.9 228.3 247.3 249.7C237.6 260.9 222 266.4 200.8 266.4H130.1L97.4 97.7zM283.1 311.3H319.6L310.9000000000001 266.5C342.4000000000001 266.5 371.6 268.8 385.7000000000001 255.8C400.5000000000001 242.2 393.4000000000001 224.8 377.4000000000001 142.7000000000001H340.4000000000001C355.8 222.1000000000001 358.7000000000001 228.7000000000001 353.1 234.7000000000001C347.7000000000001 240.5000000000001 335.4000000000001 239.3000000000001 305.7000000000001 239.3000000000001L286.9000000000001 142.7000000000001H250.4000000000001L283.1 311.3000000000001zM505 205.5C497 164.4 468.3 169.2 434.9 169.2L448.6 239.8C486.8 239.8 512.4 243.9 504.9999999999999 205.5zM384.2 97.7H421L429.7 142.5C472.9 142.5 496.8 140 519.9 161.6C546 185.6 552.8 228.3 534.1999999999999 249.7C524.4999999999999 260.9 508.8999999999999 266.4 487.6999999999999 266.4H417L384.2 97.7000000000001z" />
-    <glyph glyph-name="pied-piper-alt"
-      unicode="&#xF1A8;"
-      horiz-adv-x="576" d=" M242 261C248.3 272.8 255.2 278 267.9 282.8C295.2 293.1 308.1 313.3 326.8 333.9C338.7 325.5 338.8 309.3 358.4 310.9V289.1L364.7 288.8C402.1 303.2 439.4 319 471.3 343.4C519.5999999999999 380.2 524.1999999999999 393.4 552.5999999999999 443.4L554.5999999999999 446C553.9999999999999 431.9 548.3 418.7 542.1999999999999 406.1C511.6999999999999 342.3 463.4999999999999 305.8 395.3999999999999 289.4C383 286.5 369 286.2 357.7999999999999 280.5C359.1999999999999 270.7 370.9999999999999 262.4 370.9999999999999 257.5C370.9999999999999 254.1 365.4999999999999 250.3 363.4999999999999 248.9C352.2999999999999 261.8 347.3999999999999 268.2 340.7999999999999 271C333.1999999999999 274.5 276.8999999999999 277.4 241.9999999999999 261zM379.9 4.1C360.9 4.1 315.8 -5.4 300 -15.7L306.9 -60.8C342.6 -66.9 377 -64.4 412.9 -51C408.1 -41 389.4 4.1 379.9 4.1zM244 202C240.8 204 237.7 204.9 233.9 204.9C227.3 204.9 221.3 201.7 214.6 201.2L216.3 196.3L244 202zM231.4 170.2L255.5 109L276.5 122.8L245.2 173.7L231.4 170.2zM555.5 448L554.9 446.9L554.6 446L555.2 446.6L555.5 448zM496.3 65.9C462.4 122.8 421 184.3 346.3 181.4L346 187.4C344.9 200.9 378.8 184.2 381.1 218.4L366.7000000000001 211.2C346.9000000000001 256.9 358.1 265.5 301.2000000000001 265.5C286.5000000000001 265.5 274.5000000000001 263.8 259.8000000000001 260.9C262.7000000000001 242.3 262.0000000000001 224.2 248.9000000000001 210.6L268.4000000000001 205.1C266.7000000000001 201.9 265.5000000000001 198.8 265.5000000000001 195.3C265.5000000000001 174.3 308.3000000000002 192.4 308.3000000000002 161.7C308.3000000000002 143.3 271.5000000000001 101.6 253.4000000000001 101.6C245.4000000000001 101.6 199.7000000000001 151.6 200.0000000000001 161.7L200.3000000000001 166.3L252.6000000000002 177.8C265.6000000000002 180.4 264.9000000000002 200.5 249.7000000000002 200.5C246.0000000000002 200.5 206.6000000000001 191.3 200.3000000000001 189.9C198.3000000000001 195.1 192.8000000000001 204 186.5000000000001 204C183.3000000000001 204 180.2000000000001 200.8 177.0000000000001 200C167.8000000000001 197.4 146.0000000000001 197.1 155.5000000000001 179.9L15.9 149.5C10.4 148.4 7 143.2 7 137.7C7 131.7 12.5 126.8 18.5 126.8C26.5 126.8 149.8 155.2 165.9 159C168.5 155.8 170.5 152.7 173.7 150.4C193.8 136 233.5 64.5 250.1 64.5C274.2000000000001 64.5 308.1 86.9 321.4000000000001 106.4C324.6 110.7 328.3 113.9 333.8 113.3C334.4000000000001 99.4999999999999 302.2 79.1 300.8 69.6C299.4000000000001 59.4 299.8 34.4 300.5 28.4999999999999C327.2 20.3999999999999 352.5 32.1 378.4 31.3999999999999C382.7 52.3999999999999 389 73.2999999999999 388.2 94.8999999999999L387.9 104.3999999999999C386.5 138.5999999999999 377 142.8999999999999 353.1 163C352 164.1 350.5 165.6 349.4 167C351.6 168.3999999999999 350.5 168 354 168.6999999999999C442.5 168.6999999999999 410.3 -14.9000000000001 465.5 -61.2C498.6 -46.2 538 -33.3000000000001 569 -14.0000000000001C540 11.6 516.4 31.6999999999999 496.3 65.9zM300.1 19.9V-7.4L311.9000000000001 -4.0000000000001L309.0000000000001 19.8H300.1000000000001zM376.2000000000001 17C376.2000000000001 18.4 375.6 20.2 375.3000000000001 21.6C348.5000000000001 21.6 338.4000000000001 17.8 315.8000000000001 15.3L317.8000000000001 2.9C326.8000000000001 4.4 376.2000000000001 9.5000000000001 376.2000000000001 17.0000000000001z" />
-    <glyph glyph-name="pied-piper-hat"
-      unicode="&#xF4E5;"
-      horiz-adv-x="640" d=" M640 423.1C559.2 369.5 550.6 330.6 543.6 318.7C536.9 306.5 531.9 258.4 520.3000000000001 235.1C508.6000000000001 211.5 466.1000000000001 192.9 454.2 185.1C442.5000000000001 177.3 425.9000000000001 147 412.3000000000001 120.9C304.2000000000001 125.3 244.9000000000001 82.1 153.1000000000001 27.3000000000001C182.5000000000001 37.0000000000001 196.4000000000001 44.0000000000001 196.4000000000001 44.0000000000001C290.6000000000001 80.0000000000001 335.7000000000001 112.3000000000001 477.5000000000001 93.2000000000001C478.6000000000001 93.2000000000001 479.4000000000001 92.6 480.3000000000001 92.4C484.2000000000001 90.2000000000001 485.6000000000001 85.5000000000001 483.4000000000001 81.6L429.5000000000002 -14.2C427.0000000000002 -18.9 421.7000000000002 -21.4 416.4000000000002 -20.3C289.6000000000002 3.5 189.5000000000002 -37.6 97.5000000000002 -38.9C24.1 -40 0 -5.4 0 -3.8C0 -2.7 0.6 -2.1 1.7 -2.1C1.7 -2.1 40 -2.1 104.8 13.2C178.4 153.5 244 202.6 315.4 202.6C315.4 202.6 387.1 202.6 406 140.7C428.8 180.4 434.3 189.9 434.3 189.9C439.6 199.3 469.3 267.1 520.7 331.3C572.2 395.3 611.1 411.2 640 423.1z" />
-    <glyph glyph-name="pied-piper-pp"
-      unicode="&#xF1A7;"
-      horiz-adv-x="448" d=" M205.3 273.4C205.3 252.3 191.1 235.3 173.6 235.3C166.5 235.3 160.8 236.5 156.4 239V307C160.8000000000001 309.7 166.5 311.2 173.6 311.2C191.1 311.2 205.3 294.3 205.3 273.4zM257.9000000000001 206.4C250.8000000000001 206.4 245.1 204.9 240.7000000000001 202.2V134.2000000000001C245.1000000000001 131.7000000000001 250.8000000000001 130.5000000000001 257.9000000000001 130.5000000000001C275.3 130.5000000000001 289.6 147.4 289.6 168.3000000000001C289.6 189.4000000000001 275.3 206.4000000000001 257.9000000000001 206.4000000000001zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM185 192.9C226 192.9 259.2 228.5 259.2 272.5C259.2 316.5 226 352.1 185 352.1C173 352.1 160.9 348.9 150.4 343.3H104.7V137L156.5 147.1V197.7C165.1 194.6 174.6 192.9 185 192.9zM343.4 167.6C343.4 211.6 310.2 247.2 269.5 247.2C266.3 247.2 263.1 247.0000000000001 259.9 246.5000000000001C256.2 234.0000000000001 249.8 222.7 240.7 213.1C226.9 198.1 208.5 189.3 188.9 188.3V32L240.7 42.1V92.7000000000001C249.3 89.5000000000001 258.9 88.0000000000001 269.4 88.0000000000001C310.2 88.0000000000001 343.4 123.6000000000001 343.4 167.6z" />
-    <glyph glyph-name="pied-piper"
-      unicode="&#xF2AE;"
-      horiz-adv-x="448" d=" M32 29L0 -31.2L0.8 296.8C0.8 362.7 54 416 120 416H447.2C354.2 387.1 257.3 321.8 193.3 247.4C122.7 166 82.6 110 32 29M448 416S305.2 349.2 261.6 248.9C238.4000000000001 195.3 232.7 130.8 190.6 90.3C161.7 62.5 120.8 52.1 85.3 34C62.1 22 18.9 -6.5 0.4 -32H328.8C394.8 -32 448.1 21.3 448.1 87.2C448 87.2 448 416 448 416z" />
-    <glyph glyph-name="pinterest-p"
-      unicode="&#xF231;"
-      horiz-adv-x="384" d=" M204 441.5C101.4 441.5 0 373.1 0 262.4C0 192 39.6 152 63.6 152C73.5 152 79.2 179.6 79.2 187.4C79.2 196.7 55.5 216.5 55.5 255.2C55.5 335.6 116.7 392.6 195.9 392.6C264 392.6 314.4 353.9 314.4 282.8C314.4 229.7 293.1 130.1 224.1 130.1C199.2 130.1 177.9 148.1 177.9 173.9C177.9 211.7000000000001 204.3 248.3000000000001 204.3 287.3000000000001C204.3 353.5000000000001 110.4 341.5000000000001 110.4 261.5C110.4 244.7 112.5 226.1 120 210.8C106.2 151.4 78 62.9 78 1.7C78 -17.1999999999999 80.7 -35.8 82.5 -54.6999999999999C85.9 -58.4999999999999 84.2 -58.0999999999999 89.4 -56.1999999999999C139.8 12.8000000000001 138 26.3000000000001 160.8 116.6000000000001C173.1 93.2000000000001 204.9 80.6000000000001 230.1 80.6000000000001C336.3 80.6000000000001 384 184.1000000000001 384 277.4000000000001C384 376.7 298.2 441.5 204 441.5z" />
-    <glyph glyph-name="pinterest-square"
-      unicode="&#xF0D3;"
-      horiz-adv-x="448" d=" M448 368V16C448 -10.5 426.5 -32 400 -32H154.4C164.2 -15.6 176.8 8 181.8 27.3C184.8 38.8 197.1 85.7 197.1 85.7C205.1 70.4 228.5000000000001 57.5 253.4000000000001 57.5C327.5 57.5 380.8000000000001 125.6 380.8000000000001 210.2C380.8000000000001 291.3 314.6000000000001 352 229.4000000000001 352C123.4000000000001 352 67.2000000000001 280.9 67.2000000000001 203.4C67.2000000000001 167.4 86.4000000000001 122.6 117.0000000000001 108.3C121.7000000000001 106.1 124.1000000000001 107.1 125.2000000000001 111.6C126.0000000000001 115 130.2000000000001 131.7000000000001 132.0000000000001 139.4C132.6000000000001 141.9 132.3000000000001 144.0000000000001 130.3000000000001 146.4C120.2000000000001 158.7000000000001 112.0000000000001 181.3 112.0000000000001 202.4C112.0000000000001 256.6 153.0000000000001 309 222.9000000000001 309C283.2000000000001 309 325.5000000000001 267.9000000000001 325.5000000000001 209.1C325.5000000000001 142.7000000000001 292.0000000000001 96.7000000000001 248.3000000000002 96.7000000000001C224.2000000000001 96.7000000000001 206.2000000000001 116.6 211.9000000000001 141.1C218.8000000000001 170.3 232.2000000000002 201.8 232.2000000000002 222.9C232.2000000000002 275.9000000000001 156.7000000000001 268.6 156.7000000000001 197.9C156.7000000000001 176.2000000000001 164.0000000000002 161.4 164.0000000000002 161.4C132.6000000000001 28.6 127.9000000000002 26.9 134.4000000000002 -31.1999999999999L136.6000000000001 -31.9999999999999H48C21.5 -31.9999999999999 0 -10.4999999999999 0 16.0000000000001V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368z" />
-    <glyph glyph-name="pinterest"
-      unicode="&#xF0D2;"
-      horiz-adv-x="496" d=" M496 192C496 55 385 -56 248 -56C222.4 -56 197.8 -52.1 174.6 -44.9C184.7 -28.4 199.8 -1.4 205.4 20.1C208.4 31.7 220.8 79.1 220.8 79.1C228.9 63.7000000000001 252.5 50.6 277.6 50.6C352.4000000000001 50.6 406.3 119.4 406.3 204.9C406.3 286.8000000000001 339.4 348.1 253.4 348.1C146.4 348.1 89.5 276.3 89.5 198C89.5 161.6 108.9 116.3 139.8 101.9C144.5 99.7000000000001 147 100.7000000000001 148.1 105.2000000000001C148.9 108.6 153.1 125.5000000000001 155 133.3000000000001C155.6 135.8000000000001 155.3000000000001 138.0000000000001 153.3000000000001 140.4000000000001C143.2000000000001 152.9000000000001 135 175.7000000000001 135 197.0000000000001C135 251.7000000000001 176.4 304.6000000000001 247.0000000000001 304.6000000000001C307.9000000000001 304.6000000000001 350.6 263.1000000000001 350.6 203.7000000000001C350.6 136.6000000000001 316.7000000000001 90.1000000000001 272.6 90.1000000000001C248.3 90.1000000000001 230.0000000000001 110.2000000000001 235.9000000000001 134.9000000000001C242.9000000000001 164.4000000000001 256.4000000000001 196.2000000000001 256.4000000000001 217.5000000000001C256.4000000000001 236.5000000000001 246.2000000000001 252.4000000000001 225 252.4000000000001C200.1 252.4000000000001 180.1 226.7000000000001 180.1 192.2000000000001C180.1 170.2000000000001 187.5 155.4000000000001 187.5 155.4000000000001S163 51.6000000000001 158.5 32.2000000000001C153.5 10.8000000000001 155.5 -19.3999999999999 157.6 -38.9999999999999C65.4 -2.9 0 86.9 0 192C0 329 111 440 248 440S496 329 496 192z" />
-    <glyph glyph-name="playstation"
-      unicode="&#xF3DF;"
-      horiz-adv-x="576" d=" M570.9 75.7C559.6 61.5 532.1 51.4 532.1 51.4L327 -22.2V32.1L477.9 85.9C495 92.0000000000001 497.7 100.7000000000001 483.7 105.3C469.8 109.9 444.6 108.6 427.5 102.4L327 66.9V123.3C350.2 131.1 374.1 136.9 402.7 140.1C443.6 144.6 493.6 139.5 532.9 124.6C577.1 110.6 582.1 89.9 570.9 75.7zM346.5 168.2V307.2C346.5 323.5 343.5 338.5 328.2 342.8C316.5 346.6 309.2 335.7 309.2 319.4V-28.5L215.4 1.3V416C255.3 408.6 313.4 391.1 344.6 380.6C424.1 353.3 451 319.3 451 242.8C451 168.3 405 140 346.5 168.2000000000001zM43.2 37.8C-2.2 50.6 -9.8 77.3 10.9 92.6C30 106.8 62.6 117.5 62.6 117.5L197.1 165.3V110.8L100.3 76.2C83.2 70.1 80.6 61.4 94.5 56.8C108.4 52.2 133.6 53.5 150.7000000000001 59.7L197.1000000000001 76.6V27.8C145.5000000000001 18.4999999999999 95.7000000000001 20.4999999999999 43.2 37.8z" />
-    <glyph glyph-name="product-hunt"
-      unicode="&#xF288;"
-      horiz-adv-x="512" d=" M326.3 229.2C326.3 208.7 309.6 192 289.1 192H218.8V266.4H289.1C309.6 266.4 326.3 249.7 326.3 229.2zM504 192C504 55 393 -56 256 -56S8 55 8 192S119 440 256 440S504 329 504 192zM375.9 229.2C375.9 277.1 337 316 289.1 316H169.2V68H218.8V142.4H289.1C337 142.4 375.9 181.3 375.9 229.2z" />
-    <glyph glyph-name="pushed"
-      unicode="&#xF3E1;"
-      horiz-adv-x="432" d=" M407 336.1L308.5 345.1L322.5 378.5C332.9 402 311.7 418.9 293.8 415.5L22.5 371.1C7.4 368.4 -3.5 352.8 1.1 334.5L106.2 -13.8C112.7 -35.1 142.9 -38 153.9 -20.8L189.2 60L424.4 291.3C440.8 308.1 428.7 334.2000000000001 407 336.1zM297.6 394.4C302.7000000000001 395.1 305.1 391.9 302.8 387L286 347.1L108.6 363.4L297.6 394.4zM22.7 340.1C19.6 345.2 23.7 350.1 28.8 349.2L277.5 326.5L180.6 95.8L22.7 340.1zM136 -8.4C133.4 -12.4 128.1 -11.5 126.6 -7.2L43.5 268.3L171.2 70.7000000000001C164.2 55.7 136 -8.4 136 -8.4zM408.8 306.1L210.1 110.7L299.8 324.4L406.2000000000001 314.7C410.2000000000001 313.6 411.9000000000001 309.4 408.8000000000001 306.1z" />
-    <glyph glyph-name="python"
-      unicode="&#xF3E2;"
-      horiz-adv-x="448" d=" M167.8 411.6C122.6 403.6 114.4 386.9 114.4 356V315.3H221.3V301.7000000000001H74.3C43.2 301.7000000000001 16 283 7.5 247.5C-2.3 206.8 -2.7 181.4 7.5 138.9C15.1 107.3 33.2 84.7 64.3 84.7H101V133.5C101 168.8 131.5 199.9 167.8 199.9H274.6C304.3 199.9 328 224.4 328 254.2V356.1C328 385.1 303.6 406.8 274.6 411.7C238.8 417.6 199.9 417.3 167.8 411.6zM161.1 383.2C172.1 383.2 181.2 374 181.2 362.8S172.2 342.5 161.1 342.5C150 342.5 141 351.6 141 362.8C141.1 374.1 150 383.2000000000001 161.1 383.2000000000001zM346.3 301.8V254.3C346.3 217.5 315.1 186.5 279.5 186.5H172.7C143.5 186.5 119.3 161.5 119.3 132.2V30.4C119.3 1.4 144.5 -15.6 172.7 -23.9C206.5 -33.8 239 -35.6 279.5 -23.9C306.4 -16.1 332.9 -0.4 332.9 30.4V71.1H226.2V84.7H386.4C417.5 84.7 429 106.4 439.8 138.9C450.9999999999999 172.4 450.4999999999999 204.6 439.8 247.5C432.1 278.4 417.5 301.7 386.4 301.7H346.3zM286.2 44C297.3 44 306.3 34.9 306.3 23.7C306.3 12.4 297.3 3.3 286.2 3.3C275.2 3.3 266.1 12.5 266.1 23.7C266.2 35 275.2 44 286.2 44z" />
-    <glyph glyph-name="qq"
-      unicode="&#xF1D6;"
-      horiz-adv-x="448" d=" M433.754 27.555C422.228 26.162 388.894 80.296 388.894 80.296C388.894 48.951 372.758 8.049 337.843 -21.49C354.685 -26.682 392.6860000000001 -40.657 383.646 -55.911C376.3300000000001 -68.254 258.136 -63.792 224.014 -59.948C189.892 -63.792 71.698 -68.254 64.382 -55.911C55.337 -40.661 93.3 -26.697 110.165 -21.496C75.245 8.043 59.106 48.949 59.106 80.2960000000001C59.106 80.2960000000001 25.772 26.162 14.247 27.5550000000001C8.877 28.205 1.823 57.1990000000001 23.594 127.2590000000001C33.855 160.2830000000001 45.589 187.7370000000001 63.738 233.0380000000001C60.683 349.937 108.982 447.9940000000001 224 448C337.737 447.9940000000001 387.156 351.867 384.264 233.037C402.382 187.814 414.176 160.187 424.408 127.259C446.1760000000001 57.199 439.124 28.206 433.754 27.555z" />
-    <glyph glyph-name="quinscape"
-      unicode="&#xF459;"
-      horiz-adv-x="489.1" d=" M301.9 -26.6H300.6C213.3 -26.6 142.5 44.2 142.5 131.5S213.3 289.6 300.6 289.6C395.5 289.6 468.8 206.5 457.6 113C461.6 107.9 465.8 103.4 468.8 97.7C482.1999999999999 128 489.1 160.1 489.1 195.4C489.1 330.5 379.6 440 244.5 440C109.5 440 0 330.5 0 195.4S109.5 -49.2 244.5 -49.2C269.3 -49.2 292.3 -46 314.9 -39.1C309.7 -35.6 305.9 -30.9 301.5 -26.4999999999999L301.9 -26.6zM280.7 43.2C280.7 98 325.1 142.4 379.9 142.4C434.7 142.4 479.1 98 479.1 43.2C479.1 -11.6 434.7 -56 379.9 -56C325.1 -56 280.7 -11.6 280.7 43.2" />
-    <glyph glyph-name="quora"
-      unicode="&#xF2C4;"
-      horiz-adv-x="448" d=" M440.5 61.3H411.2C409.7 47.8 400.7 30.5 378.2 30.5C357.7 30.5 342.9 44.7 328.7 66.3C372.9 100.5 403.4 153.8 403.4 219.3C403.5 336.8 306.8 416 205 416C105.3 416 7.3 336.3 7.3 219.3C7.3 85.2000000000001 138.6 -2.3 256.3 30.3C276 -3.3 302 -32 351.5 -32C433.3 -32 442.3 43.3 440.5 61.3zM297 118.8C277.5 148 253.3 171 205.5 171C175 171 151.2 161 136.5 148.2L148.7 123.9C154.9 126.9 161.7 127.9 168.5 127.9C204 127.9 222.2 97.1 237.7 66.6C227.7 63.6 217 62.4 205 62.4C130 62.4 97.5 115.4 97.5 219.1C97.5 323.5 130 377 205 377C281.2 377 313.7 323.5 313.7 219.3C313.8 177.5 308.3 143.7000000000001 297 118.8z" />
-    <glyph glyph-name="r-project"
-      unicode="&#xF4F7;"
-      horiz-adv-x="581" d=" M581 221.4C581 328.9 450.9 416 290.5 416S0 328.9 0 221.4C0 125.6 103.3 46 239.4 29.9V-32H338.5V29.5C362.8 32.2 386.1 36.9 407.9 43.4L448 -32H560L492.6 81.7C547.1 117.1 581 166.6 581 221.4zM114.2 206.9C114.2 280.4 213.1 339.9 335 339.9S546.9 299.2 546.9 206.9C546.9 156.8 520.4 121.9 476.6 100.5C474.2 102.1 471.9 103.4 470.2 104.2C460 109.4 442.4 114.7 442.4 114.7S529 121.1 529 207.4S438.4 295.3 438.4 295.3H239.4V87C165.3 108.5 114.2 154.1 114.2 206.9zM339.3 168.6V224.2C397.1 224.2 427.1 231.0000000000001 427.1 196.9C427.1 160.4 388.9 168.6 339.3 168.6zM338.4 96.1H365C375.8 96.1 383.9 84.4 389 76.9C372.9 75.0000000000001 356 74.1 338.4 74.0000000000001V96.1000000000001z" />
-    <glyph glyph-name="ravelry"
-      unicode="&#xF2D9;"
-      horiz-adv-x="512" d=" M407.4 386.5C331.6 425.9 257.8 417 182.9 382C171.6 376.8 167.4 371.4 163 363C152.7 343.8 146.8 325.6 143.1 310.3C121.9 284.7000000000001 106.7 254.2 99.8 220.4C89.2 202.4 78.9 179 76.7 149C76.7 149 76 141.4 76.2 141.1C40.9 145.7000000000001 0 168.1 0 168.1C9.1 153.6 61.3 135.8 76.3 130.2000000000001C76.3 130.2000000000001 78 32.2 140.8 -0.9999999999999C129.5 16.2 127.5 19.2 127.5 19.2S94.8 79 100.4 123.3C101.1 123.3 101.9 123.1 102.6 123.1C126.5 35.7 205.8 -28.3 299.5 -28.3C305.7 -28.3 311.6 -28.1 317.5 -27.6C331.5 -29.1 345.1 -28.1 357.6 -23.7C364.5 -21.5 371.4000000000001 -17.3 377.8 -12.9C448 26.2 478.7 69.1 500.9 134.8C506.3 150.8 509 170.3 510.7 187C519.4 269.3 480.1 348.6 407.4 386.5zM138.8 284.8S137.6 272.5 138.1 265.1C134.7 262.6 128 257 119.9 248.4000000000001C125.1 261.2000000000001 131.2 273.5 138.8 284.8000000000001zM107.6 162.9C112 180.1 120.9 202 137.4 218C137.4 218 139.1 170 153.2 127.9L111.8 134.8C109.6 144 108.3 153.3 107.6 162.9zM115.5 120.1C130.3 116.9 149.5 112.4999999999999 158.6 110.9999999999999C185.9 34.1999999999999 266.9000000000001 -13.3000000000001 266.9000000000001 -13.3000000000001C267.9000000000001 -13.8000000000001 268.6 -14.0000000000001 269.6 -14.3000000000001C196.5 -2.7 136.9 50.3999999999999 115.5 120.0999999999999zM386 3.9C371.5 -0.8 349.8 -4.5 321.3 0.2C321.3 0.2 230.2 23.3 193.8 108C232 107.3 246.2 108.2 271.8 111.9C311.2 117.6 350.8 128.1 386.8 144.9C398.6 150.3 397.9000000000001 164.3 396.4000000000001 174.7C394.4000000000001 187.5 385.3 186.8 375.0000000000001 179.4C375.0000000000001 179.4 293.0000000000001 120.8 185.2000000000001 125.7C166.5000000000001 157.7 158.4 236.5 158.4 236.5C199.8000000000001 271.7 241.6 296.1 326.8000000000001 288.9C327.0000000000001 295.3 329.8000000000001 316 306.4000000000001 317C306.4000000000001 317 212.9000000000001 328.1 160.4000000000001 283.5C162.9000000000001 300 166.3000000000001 312.8 171.5000000000001 322.9C205.7000000000001 353.7 250.5000000000001 372.4 299.8000000000001 372.4C406.2000000000001 372.4 492.8000000000001 285.3 492.8000000000001 177.9C492.6000000000001 101.9 449.0000000000001 35.9 386.0000000000001 3.9z" />
-    <glyph glyph-name="react"
-      unicode="&#xF41B;"
-      horiz-adv-x="512" d=" M418.2 270.8C412.8 272.6 407.4 274.3 402 275.9C402.9 279.6 403.7 283.3 404.5 287C416.8 346.6 408.7 394.5 381.4 410.3C355.1 425.4 312.2 409.7 268.8 371.9C264.5 368.2 260.3 364.3 256.3 360.4C253.6 363 250.8 365.6 248 368.1C202.5 408.5 156.9 425.5 129.5999999999999 409.6C103.3999999999999 394.4 95.5999999999999 349.3 106.5999999999999 292.9C107.6999999999999 287.3 108.8999999999999 281.8 110.2999999999999 276.2000000000001C103.8999999999999 274.4 97.5999999999999 272.4 91.6999999999999 270.3C38.3 251.8 0 222.6 0 192.4C0 161.2 40.8 129.9 96.3 110.9C100.8 109.4 105.3 107.9 109.9 106.6C108.4 100.6 107.1 94.7 105.9 88.6C95.4 33.1 103.6 -10.9 129.8 -26C156.8 -41.6 202.2 -25.6 246.4 13.1C249.9 16.2 253.4 19.4 256.9 22.8C261.3 18.5 265.9 14.4 270.5 10.4C313.3 -26.4 355.6 -41.3 381.7 -26.2C408.7 -10.6 417.5 36.7 406.1 94.3C405.2 98.7 404.2 103.2 403.1 107.8C406.3 108.7 409.4 109.7 412.5 110.7C470.1999999999999 129.8 511.9999999999999 160.7 511.9999999999999 192.4C511.9999999999999 222.7 472.6 252.1 418.2 270.8zM282.9 355.7C320.1 388.1 354.8 400.8 370.6 391.7C387.5 382 394 342.8 383.4 291.3C382.7 287.9 382 284.6 381.1 281.3C358.9 286.3 336.4 289.9 313.8 291.9C300.8 310.5 286.6 328.3 271.2 345C275.0999999999999 348.7 278.8999999999999 352.2 282.8999999999999 355.7zM152.9 166.6C157.5 157.8 162.2 149.1 167.2 140.5C172.3 131.8 177.5 123.1 183 114.6C167.4 116.3 151.9 118.8 136.6 122.1C141 136.5 146.5 151.4 152.9 166.6zM152.9 217.2C146.6 232.1 141.3 246.7 136.9 260.8C151.3 264 166.6 266.6 182.5 268.6C177.2 260.3 172 251.8 167.1 243.2C162.2 234.7 157.4 226.0000000000001 152.9 217.2zM164.3 191.9C170.9 205.7000000000001 178.1 219.2000000000001 185.7 232.5000000000001C193.3 245.8000000000001 201.5 258.7000000000001 210.1 271.4000000000001C225.1 272.5 240.4 273.1 256 273.1C271.6 273.1 287 272.5 301.9 271.4000000000001C310.4 258.8000000000001 318.5 245.9000000000001 326.2 232.7000000000001C333.9 219.5000000000001 341.1 206.0000000000001 347.9 192.3000000000001C341.2 178.5000000000001 334 164.9 326.3 151.5000000000001C318.7 138.2000000000001 310.6 125.3000000000001 302.1 112.5000000000001C287.2 111.4 271.7 110.9 256 110.9C240.3 110.9 225.1 111.4 210.4 112.3C201.7 125 193.5 138 185.8 151.3C178.1 164.6 171 178.1 164.3 191.9zM344.9 140.7000000000001C350 149.5000000000001 354.8 158.4 359.5 167.4C365.9 152.9 371.5 138.2000000000001 376.4 123.1C360.9 119.6 345.2 116.9 329.4 115.1C334.8 123.5 339.9 132.1 344.9 140.7000000000001zM359.3 217.2000000000001C354.6 226.0000000000001 349.8 234.8000000000001 344.8 243.4000000000001C339.9 251.9000000000001 334.8 260.3000000000001 329.5 268.6C345.6 266.6 361 263.9000000000001 375.3999999999999 260.6C370.7999999999999 245.8 365.3999999999999 231.4000000000001 359.2999999999999 217.2zM256.2 329.7C266.7 318.3 276.6 306.3 285.8 293.9C266 294.8 246.1 294.8 226.3 293.9C236.1 306.8 246.2 318.8 256.2 329.7zM140.2 391C157 400.8 194.3 386.8 233.6 352C236.1 349.8 238.6 347.4 241.2 345C225.7 328.3 211.4 310.5 198.3 291.9C175.7 289.9 153.3 286.4 131.1 281.5C129.8 286.6 128.7 291.8 127.6 297C118.2 345.4 124.4 381.9 140.2 391zM115.7 127.4C111.5 128.6 107.4 129.9 103.3 131.3C82 138 57.8 148.6 40.3 162.5C30.2 169.5 23.4 180.3 21.5 192.4C21.5 210.7 53.1 234.1 98.7 250C104.4 252 110.2 253.8 116 255.5C122.8 233.8 131 212.5 140.5 191.8999999999999C130.9 171 122.6 149.3999999999999 115.7 127.3999999999999zM232.3 29.4C215.8 14.3 196.7 2.3 175.9 -5.9C164.8 -11.2 152 -11.7 140.6 -7.2C124.7 1.9999999999999 118.1 37.3 127.1 84.8C128.2 90.4 129.4 95.9999999999999 130.8 101.4999999999999C153.2 96.6999999999999 175.8 93.3999999999999 198.7 91.6999999999999C211.9 72.9999999999999 226.4 55.0999999999999 241.9 38.3C238.7 35.1999999999999 235.5 32.1999999999999 232.3 29.4zM256.8 53.7C246.6 64.7 236.4 76.9 226.5 90C236.1 89.6 246 89.4 256 89.4C266.3 89.4 276.3999999999999 89.6 286.3999999999999 90.1C277.2 77.4 267.2999999999999 65.3 256.7999999999999 53.7zM387.5 23.7C386.6 11.5 380.6 0.1 371 -7.6C355.1 -16.8 321.2 -4.8 284.5999999999999 26.6C280.3999999999999 30.2 276.2 34.1 271.8999999999999 38.1C287.2 54.9999999999999 301.2999999999999 72.9 314.0999999999999 91.7C336.9999999999999 93.6 359.7999999999999 97.1 382.2999999999999 102.2C383.2999999999999 98.1 384.1999999999999 94 384.9999999999999 90C389.8999999999999 68.4 390.6999999999999 45.9 387.4999999999999 23.7zM405.7 131.2C402.8999999999999 130.3 400.0999999999999 129.4 397.2 128.6C390.2 150.4 381.5999999999999 171.7 371.7 192.4C381.3 212.8 389.3999999999999 233.8 396.2 255.3C401.3999999999999 253.8 406.3999999999999 252.2 411.2 250.6C457.8 234.6 490.4999999999999 210.8 490.4999999999999 192.6C490.4999999999999 173 455.6 147.7 405.7 131.2zM256 237.8C281.3 237.8 301.8 217.3 301.8 192C301.8 166.7 281.3 146.2 256 146.2C230.7 146.2 210.2 166.7 210.2 192C210.2 217.3 230.7 237.8 256 237.8" />
-    <glyph glyph-name="readme"
-      unicode="&#xF4D5;"
-      horiz-adv-x="576" d=" M528.3 401.5H388.5C340.4 401.5 298.6 368.2 288.1 321.2C277.5 368.2 235.8 401.5 187.7 401.5H48C21.5 401.5 0 380 0 353.5V107.7C0 81.2 21.5 59.7 48 59.7H137.7C239.9 59.7 270.4 35.3 285 -15.3C285.7 -18.1 290.2 -18.1 291 -15.3C305.7 35.3 336.2 59.7 438.3 59.7H528C554.5 59.7 576 81.2 576 107.7V353.4C576 379.8 554.7 401.3 528.3 401.5zM242 136.1C242 134.2000000000001 240.5 132.6 238.5 132.6H78.2C76.3 132.6 74.7 134.1 74.7 136.1V159C74.7 160.9 76.2 162.5 78.2 162.5H238.6C240.5000000000001 162.5 242.1 161 242.1 159V136.1zM242 197C242 195.1 240.5 193.5 238.5 193.5H78.2C76.3 193.5 74.7 195 74.7 197V219.9C74.7 221.8000000000001 76.2 223.4 78.2 223.4H238.6C240.5000000000001 223.4 242.1 221.9 242.1 219.9V197zM242 257.9000000000001C242 256 240.5 254.4000000000001 238.5 254.4000000000001H78.2C76.3 254.4000000000001 74.7 255.9000000000001 74.7 257.9000000000001V280.8000000000001C74.7 282.7000000000001 76.2 284.3000000000001 78.2 284.3000000000001H238.6C240.5000000000001 284.3000000000001 242.1 282.8000000000001 242.1 280.8000000000001V257.9000000000001zM501.3 136.2000000000001C501.3 134.3000000000001 499.8 132.7000000000001 497.8 132.7000000000001H337.5C335.6 132.7000000000001 334 134.2000000000001 334 136.2000000000001V159.1C334 161 335.5 162.6 337.5 162.6H497.9C499.8 162.6 501.4 161.1 501.4 159.1V136.2000000000001zM501.3 197.1000000000001C501.3 195.2000000000001 499.8 193.6000000000001 497.8 193.6000000000001H337.5C335.6 193.6000000000001 334 195.1000000000001 334 197.1000000000001V220C334 221.9 335.5 223.5 337.5 223.5H497.9C499.8 223.5 501.4 222 501.4 220V197.1zM501.3 258.0000000000001C501.3 256.1 499.8 254.5000000000001 497.8 254.5000000000001H337.5C335.6 254.5000000000001 334 256.0000000000001 334 258.0000000000001V280.8000000000001C334 282.7000000000001 335.5 284.3000000000001 337.5 284.3000000000001H497.9C499.8 284.3000000000001 501.4 282.8000000000001 501.4 280.8000000000001V258z" />
-    <glyph glyph-name="rebel"
-      unicode="&#xF1D0;"
-      horiz-adv-x="512" d=" M256.5 -56C117.2 -56 9 60.2 13.2 198.1C16 277.3 56.4 350.3 129.7 398.5C130 398.5 131.6 399.1 130.8 397.7C125 392.2 19.5 267.9 116.7 171.3C166.5 121.8 206.7 168.8 206.7 168.8C245.2 218.9 206.1 294.7000000000001 206.1 294.7000000000001C196.1 319.6 160.4 334.8 160.4 334.8L189.2 366.6C213.6 356.1 232.4 327.9 232.4 327.9C233.2 357.5 210.5 389.3 210.5 389.3L255.1 440L299.4 389.9C278.9 361.1 277.5 327.3 277.5 327.3C291.3 350.3 321 366.6 321 366.6L349.5 334.8C322.1 325.9 304.1 294.9 304.1 294.9C288.3 266.4 277 205.5 304.7000000000001 167.6C337.1 123 392.4000000000001 170.4 392.4000000000001 170.4C495.1 262.3000000000001 381.9000000000001 395.4000000000001 381.9000000000001 395.4000000000001C375.8 400.9000000000001 382.7000000000001 398.2000000000001 382.7000000000001 398.2000000000001C432.8000000000001 361.7000000000001 497.3000000000001 313.8 498.9 193.4C500.9 47.8 399 -56 256.5 -56z" />
-    <glyph glyph-name="red-river"
-      unicode="&#xF3E3;"
-      horiz-adv-x="448" d=" M353.2 416H94.8C42.4 416 0 373.6 0 321.2V62.8C0 10.4 42.4 -32 94.8 -32H353.2C405.6 -32 448 10.4 448 62.8V321.2C448 373.6 405.6 416 353.2 416zM144.9 247.1V190.8C144.9 163.8 123 141.9 96 141.9V296.1C96 309.3 106.7 320 119.9 320H274.1C274.1 293 252.2 271.1 225.2 271.1H168.9C156.6 271.7 144.3000000000001 259.5 144.9 247.1zM321.2000000000001 175.1H264.9000000000001C252.6 175.7000000000001 240.3000000000001 163.5 240.9000000000001 151.1V94.8C240.9000000000001 67.8 219 45.9 192 45.9V200.1C192 213.3 202.7 224 215.9 224H370.1C370.1 197 348.2000000000001 175.1 321.2000000000001 175.1z" />
-    <glyph glyph-name="reddit-alien"
-      unicode="&#xF281;"
-      horiz-adv-x="512" d=" M440.3 244.5C425.3 244.5 412.1 238.3 402.4000000000001 228.6C366.7000000000001 253.3 318.6 269.2 265.3000000000001 270.9L293 395.7L381.2 375.9C381.2 354.3 398.8 336.7 420.4 336.7C442.4 336.7 460.1 354.8 460.1 376.4S442.5 416.1 420.4 416.1C405 416.1 391.7 406.8 385.1 394.1L287.7 415.7C282.8 417 278 413.5 276.7 408.6L246.3 271C193.4 268.8 145.8 252.9 110 228.2C100.3 238.3 86.6 244.5 71.6 244.5C16 244.5 -2.2 169.9 48.7 144.4C46.9 136.5 46.1 128.1 46.1 119.7C46.1 35.9 140.5 -32 256.4 -32C372.8 -32 467.2 35.9 467.2 119.7C467.2 128.1 466.3 136.9 464.1 144.8C514 170.4 495.6 244.5 440.3 244.5zM129.4 139.1C129.4 161.1 147 178.8 169.1 178.8C190.7 178.8 208.3 161.2 208.3 139.1C208.3 117.5 190.7 99.9 169.1 99.9C147.1 99.8 129.4 117.5000000000001 129.4 139.1zM343.7000000000001 45.6C307.3000000000001 9.2 204.6000000000001 9.2 168.2000000000001 45.6C164.2000000000001 49.1 164.2000000000001 55.3 168.2000000000001 59.3C171.7000000000001 62.8 177.9 62.8 181.4 59.3C209.2000000000001 30.8 301.4000000000001 30.3 330.4000000000001 59.3C333.9000000000001 62.8 340.1 62.8 343.6 59.3C347.7000000000001 55.3 347.7000000000001 49.1 343.7000000000001 45.6zM342.9000000000001 99.8C321.3 99.8 303.7000000000001 117.4 303.7000000000001 139C303.7000000000001 161 321.3000000000001 178.7 342.9000000000001 178.7C364.9000000000001 178.7 382.6 161.1 382.6 139C382.5 117.5 364.9000000000001 99.8 342.9000000000001 99.8z" />
-    <glyph glyph-name="reddit-square"
-      unicode="&#xF1A2;"
-      horiz-adv-x="448" d=" M283.2 102.5C285.9 99.8 285.9 95.7 283.2 93.3C258.7 68.8 189.4 68.7 164.8 93.3C162.1 95.7 162.1 99.8 164.8 102.5C167.2 104.9 171.3 104.9 173.7 102.5C192.4 83.3 254.7 82.9 274.2 102.5C276.6 104.8 280.8 104.8 283.2 102.5zM191.9 156.3C191.9 171.2 180 183.1 165.4 183.1C150.5 183.1 138.6 171.2000000000001 138.6 156.3C138.6 141.7 150.5 129.8 165.4 129.8C180 129.8 191.9 141.7 191.9 156.3zM282.6 183.1C268 183.1 256.1 171.2000000000001 256.1 156.3C256.1 141.7 268 129.8 282.6 129.8C297.5 129.8 309.4 141.7 309.4 156.3C309.4 171.2 297.5 183.1 282.6 183.1zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM348.3 227.4C338.2 227.4 329.3 223.2 322.7 216.7C298.6 233.4 266.2 244.1 230.2 245.3L248.9 329.5L308.4 316.1C308.4 301.5 320.3 289.6 334.9 289.6C349.8 289.6 361.7 301.8 361.7 316.4000000000001C361.7 331 349.8 343.2000000000001 334.9 343.2000000000001C324.5 343.2000000000001 315.6 337 311.1 328.3L245.4 342.9000000000001C242.1 343.8 238.9 341.4000000000001 238 338.1L217.5 245.3C181.8 243.8 149.7 233.1 125.6 216.4C119.1 223.2 109.8 227.4 99.7 227.4C62.2 227.4 49.9 177 84.2 159.9C83 154.5 82.4 148.9 82.4 143.2C82.4 86.7 146.1 40.9 224.3 40.9C302.8 40.9 366.5 86.7 366.5 143.2C366.5 148.9 365.8999999999999 154.8 364.3999999999999 160.2C398 177.4 385.5999999999999 227.4 348.2999999999999 227.4z" />
-    <glyph glyph-name="reddit"
-      unicode="&#xF1A1;"
-      horiz-adv-x="512" d=" M201.5 142.5C187.7 142.5 176.6 153.6 176.6 167.1C176.6 180.9 187.7 192 201.5 192C215.1 192 226.1 180.9 226.1 167.1C226.1 153.5 215 142.5 201.5 142.5zM504 192C504 55 393 -56 256 -56S8 55 8 192S119 440 256 440S504 329 504 192zM371.7 233.2C362.3 233.2 354 229.3 347.9 223.2C325.5 238.7 295.3 248.7 261.8 249.8L279.2 328.1L334.5999999999999 315.6C334.5999999999999 302 345.7 291 359.2 291C373 291 384.0999999999999 302.3 384.0999999999999 315.9S372.9999999999999 340.8 359.2 340.8C349.5 340.8 341.2 335 337.0999999999999 327L275.8999999999999 340.6C272.8999999999999 341.4 269.7999999999999 339.2 269 336.2L249.9 249.8C216.6999999999999 248.4 186.8 238.5 164.4 223C158.3 229.4 149.7 233.2 140.3 233.2C105.4 233.2 94 186.3 125.9 170.3999999999999C124.8 165.3999999999999 124.2 160.1999999999999 124.2 154.8999999999999C124.2 102.2999999999999 183.4 59.6999999999999 256.2 59.6999999999999C329.3 59.6999999999999 388.5 102.3 388.5 154.8999999999999C388.5 160.1999999999999 387.8999999999999 165.6999999999999 386.6 170.6999999999999C417.9 186.6999999999999 406.4 233.2 371.7 233.2zM302.8 117C284.6 98.8 226.7 99.1 209.2 117C207 119.2 203.1 119.2 200.9 117C198.4 114.5 198.4 110.6 200.9 108.4C223.7 85.6 288.2 85.6 311.1 108.4C313.6 110.6 313.6 114.5 311.1 117C308.9000000000001 119.2 305 119.2 302.8 117zM310.5 192C296.9 192 285.9 180.9 285.9 167.1C285.9 153.5 297 142.5 310.5 142.5C324.3 142.5 335.4 153.6 335.4 167.1C335.4 180.9 324.4 192 310.5 192z" />
-    <glyph glyph-name="rendact"
-      unicode="&#xF3E4;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56C266.6 -56 284.7 -53.9 302.1 -50.1C296.5 -42.7 291.3 -35.7 286.2000000000001 -28.8C273.8000000000001 -30.9 261.0000000000001 -32.1 247.9000000000001 -32.1C124.3 -32 24 68.3 24 192S124.3 416 248 416S472 315.7 472 192C472 121 439 57.8 387.5 16.7C361.6 -2.1 348.4 -4.7 304 60.9C225.3 173.8 256 132 230.3 169.2C303.1 160.3 458.8 241.2 398.9 337.8C314 474.8 15 354.2 59.7 221.6C62.9 211.8 74.1 183 105.3 183C107.3 183 107.9 183.6 107.3 184.7C102.9 193.4 87.2 194.5 87.2 222.1C87.2 262.6 127.7 311.7 187.5 342.1C253.6 374.4 319.4 372.3 345.7 336.7C372.9 298.4 324.8 217.5 225.3 199.8C232.8 209.2 282.3 275 288.1 283.8C310.8 318.4 311.7 332.8 302.1 343C286.6 359.9 272.6 353.3 251.4 354.7C240.6 355.6 137.7 173.5 115 137.8C109.1 128.8 93.8 103.6999999999999 93.8 86.9C93.8 65.6 96.6 35.5 114.4 35.5C125 35.5 122.4 54.2 122.4 62.1C122.4 75 149.8 111.5 197.2 166.7000000000001C217.6 130.6 254.9 52.4 327.4 -42.9999999999999C425.4 -9.8999999999999 495.9 82.8000000000001 495.9 192.0000000000001C496 329 385 440 248 440z" />
-    <glyph glyph-name="renren"
-      unicode="&#xF18B;"
-      horiz-adv-x="512" d=" M214 278.9C214 168.5 153 73.5 66.4 31.5C30 74.8 8 130.3 8 191.4C8 314.1 97.1 415.8 214 435.5V278.9zM255 -56C212.1 -56 171.7 -45 136.5 -25.6C193.7 10.5 239.9 65.1 255 129C270.5 65.1 316.7 10.5 373.8 -25.7C338.7 -45 298.3 -56 255 -56zM445.6 31.5C359 73.5 298 168.4 298 278.9V435.5C414.9 415.8 504 314.1 504 191.4C504 130.3 482 74.8 445.6 31.5z" />
-    <glyph glyph-name="replyd"
-      unicode="&#xF3E6;"
-      horiz-adv-x="448" d=" M320 -32H128C57.6 -32 0 25.6 0 96V288C0 358.4 57.6 416 128 416H320C390.4 416 448 358.4 448 288V96C448 25.6 390.4 -32 320 -32zM193.4 174.8C187.3 176.8 181.8 177.9 177 177.9C169.8 177.9 163.5 176.0000000000001 158.1 172.3C152.7 168.6 148.5 163.3 145.3 156.5H144.2L140 174.8H112V35.9H148.1V125.6C149.6 131 152.5 135.4 156.8 138.8C161.1 142.1999999999999 166.6 143.9 173 143.9C177.6 143.9 182.8 142.9 188.6 140.8L193.4 174.8zM308.6 71.4C305.4000000000001 69 300.9000000000001 66.6 294.9000000000001 64.3C288.9000000000001 61.9999999999999 282.1 60.8 274.5000000000001 60.8C262.3000000000001 60.8 253.4000000000001 63.8 248.0000000000001 69.6999999999999C242.5000000000001 75.5999999999999 239.5000000000001 84.3999999999999 239.0000000000001 96.0999999999999H322.3000000000001C323.2000000000001 100.8999999999999 323.9000000000001 105.4999999999999 324.4000000000001 109.9999999999999C324.9000000000001 114.3999999999999 325.1000000000001 118.5999999999999 325.1000000000001 122.4999999999999C325.1000000000001 133.1999999999999 323.5000000000001 142.1999999999999 320.4000000000001 149.3999999999999C317.2000000000001 156.5999999999999 313.1000000000001 162.3999999999999 307.9000000000001 166.5999999999999C302.7000000000001 170.8999999999999 296.8000000000001 173.8999999999999 290.1000000000001 175.7999999999999C283.4000000000001 177.5999999999999 276.6000000000001 178.5999999999999 269.5000000000001 178.5999999999999C248.4000000000001 178.5999999999999 232.0000000000001 172.4999999999998 220.3000000000001 160.2999999999999S202.8000000000001 129.7999999999999 202.8000000000001 105.2999999999998C202.8000000000001 82.4999999999998 208.0000000000001 64.5999999999999 218.4000000000001 51.5999999999999C228.8000000000001 38.4999999999998 245.2000000000001 31.9999999999998 267.6000000000001 31.9999999999998C278.3000000000001 31.9999999999998 288.5000000000001 33.4999999999998 298.0000000000001 36.5999999999999C307.5000000000001 39.6999999999999 315.1000000000001 43.3999999999999 320.6000000000001 47.7999999999998L308.6000000000001 71.3999999999999zM286.8 141.7C290.6 136.3 292.1 128.6 291.4000000000001 118.6H239.7000000000001C240.6000000000001 128 243.4000000000001 135.6 247.9000000000001 141.2C252.4000000000001 146.8 259.4000000000001 149.7 268.9000000000001 149.7C277.1 149.8 283.0000000000001 147.1 286.8 141.7zM366.7000000000001 139.2C370.8000000000001 135.3 376.1 133.4 382.8000000000001 133.4C389.8000000000001 133.4 395.4000000000001 135.3 399.5000000000001 139.2S405.6000000000001 148.3 405.6000000000001 154.8S403.6000000000001 166.4 399.5000000000001 170.2C395.4000000000001 174 389.9000000000001 175.9 382.8000000000001 175.9C376.1000000000001 175.9 370.8000000000001 174 366.7000000000001 170.2C362.6 166.4 360.6 161.3 360.6 154.8S362.6 143.1 366.7000000000001 139.2zM366.7000000000001 38.7C370.8000000000001 34.8 376.1 32.9 382.8000000000001 32.9C389.8000000000001 32.9 395.4000000000001 34.8 399.5000000000001 38.7S405.6000000000001 47.8 405.6000000000001 54.3S403.6000000000001 65.9 399.5000000000001 69.7C395.4000000000001 73.5 389.9000000000001 75.4 382.8000000000001 75.4C376.1000000000001 75.4 370.8000000000001 73.5 366.7000000000001 69.7C362.6 65.9 360.6 60.8 360.6 54.3C360.6 47.7 362.6 42.6 366.7000000000001 38.7z" />
-    <glyph glyph-name="researchgate"
-      unicode="&#xF4F8;"
-      horiz-adv-x="448" d=" M0 416V-32H448V416H0zM262.2 81.6C255.6 78.6 229 75.6 212.2 95.8C203 106.4 186.9 129.1 170 159.4C161.1 159.4 155.3 159.4 148.6 160.0000000000001V113.6000000000001C148.6 90.1000000000001 154.6 92.4000000000001 174.4 89.7000000000001V81.6000000000001C167.5 81.9000000000001 151.3 82.4000000000001 138.8 82.4000000000001C125.7 82.4000000000001 112.7 81.8000000000001 105.2 81.6000000000001V89.7000000000001C120.7 92.6000000000001 127.2 91.0000000000001 127.2 113.6000000000001V223C127.2 245.6 120.8 244 105.2 246.9V255C131 254 158.3 255.6 176.1 255.6C207.8 255.6 232.0000000000001 241.2 232.0000000000001 210C232.0000000000001 188.9 215.3000000000001 167.8 192.8 162.5C206.4 138.3 222.8 116.9 235 103.6C242.2 95.8 252.2 88.9 262.2 88.9V81.6zM285.1 216.6C261.8 216.6 252.9 232.3 252.9 248.8V281C252.9 293.2 261.7 311.4 286.9 311.4S317.3 293.5 317.3 293.5L306.6 286.3S301.1 298.8 286.9 298.8C279 298.8 267.2 291.5 267.2 279.1V252.3C267.2 238.9 273.8 229 285.1 229C299.2 229 306.6 239.9 306.6 255.8H288.7V266.5H319.1C319.1 246 323.8 216.6 285.1 216.6zM168.6 171.9C159.2 171.9 155 172.2000000000001 148.6 172.7000000000001V242.4000000000001C155 243.0000000000001 163.6 243.0000000000001 171.1 243.0000000000001C194.4 243.0000000000001 208.3 230.8000000000001 208.3 208.5C208.3 186.6 193.3 171.9 168.6 171.9z" />
-    <glyph glyph-name="resolving"
-      unicode="&#xF3E7;"
-      horiz-adv-x="496" d=" M281.2 169.8C327.2 183.1 330.8 193.3 325.2 213.2L314 252.5C307.9 273.4 295.6 280.6 242.9 265.3L54.7 211.2L83.3 112.6L281.2000000000001 169.8zM248.5 440C131.4 440 33.2 359.3 7.2 250.5L229.1 314.4C263.9 324.6 283.3 326.1 308.4 322.6C344.7 316.5 361.1 297.6 369.8 267.4L380.5 229.6C388.7 201.5 381.5 179 357 156C337.6 138.6 325.8 131.5 295.6 122.8L203 96.2L423.4 69.1L433.1 34.9L385 21.6L98.1999999999999 58.9L121.1999999999999 -21.3C158 -43.3 201.5 -56 247.5 -56C384.5 -56 495.9999999999999 55.4 495.9999999999999 192.3C497 328.6 385.5 440 248.5 440zM38.3 59.4L0 191.2C0 142.7 14.3 97.8 38.3 59.4z" />
-    <glyph glyph-name="rocketchat"
-      unicode="&#xF3E8;"
-      horiz-adv-x="448" d=" M448 191.8C448 279 348.4 345.1 228.2 345.1C209.4 345.1 190.9 343.5 172.9 340.3C161.8 350.8 148.7 360.3 134.9 367.7000000000001C61.2 403.8 0 368.6 0 368.6S56.9 321.5 47.6 280.3C-4.7 228 -4.9 156.2000000000001 47.6 103.7000000000001C56.9 62.4 0 15.4 0 15.4S61.2 -19.8 134.9 16.2C148.7 23.7 161.8 33.1 172.9 43.6C190.9 40.4 209.4 38.8 228.2 38.8C348.5 38.9 448 104.6 448 191.8zM228.3 67.8C204.6 67.8 182 70.6 161 75.6C139.7 49.8 92.9 13.9 47.4 25.5C62.2 41.5 84.1 68.6 79.4 113.1C52.1 134.5 35.8 161.8 35.8 191.6C35.8 260 122 315.5 228.3 315.5S420.8 260 420.8 191.6C420.8 123.3 334.6 67.8 228.3 67.8zM253.9 191.7000000000001C253.9 177.5000000000001 242.4 165.9 228.3 165.9C214.2 165.9 202.7 177.4 202.7 191.7000000000001C202.7 205.9 214.2 217.5000000000001 228.3 217.5000000000001C242.4 217.5000000000001 253.9 205.9000000000001 253.9 191.7000000000001zM342.8 191.7000000000001C342.8 177.5000000000001 331.4000000000001 165.9 317.2 165.9C303.1 165.9 291.6 177.4 291.6 191.7000000000001C291.6 205.9 303 217.5000000000001 317.2 217.5000000000001C331.3 217.5000000000001 342.8 205.9000000000001 342.8 191.7000000000001zM164.9 191.7000000000001C164.9 177.5000000000001 153.5 165.9 139.3 165.9C125.2 165.9 113.7 177.4 113.7 191.7000000000001C113.7 205.9 125.1 217.5000000000001 139.3 217.5000000000001C153.5 217.5000000000001 164.9 205.9000000000001 164.9 191.7000000000001z" />
-    <glyph glyph-name="rockrms"
-      unicode="&#xF3E9;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM405.4 20.5H315.4L203.4 151.8C185.5 172.2 199.5 207.9 230 207.9H305.3L220.7 307.2L136.4 208.3H46.4L193.5 380.8C207.9 399.2 234.8 398.1 248 380.8L405.7 195.7C424.7 172.9 407.7 138.5 378.1 139.6C377.5 139.6 303.9 139.4 303.9 139.4L405.4 20.5z" />
-    <glyph glyph-name="safari"
-      unicode="&#xF267;"
-      horiz-adv-x="512" d=" M236.9 191.2C236.9 200.3 243.5 208.9 253.2 208.9C262.1 208.9 270.6 202.5 270.6 192.8C270.6 183.7 264.2000000000001 175.1 254.5000000000001 175.1C245.5000000000001 175.1 236.9000000000001 181.8 236.9000000000001 191.2zM504 192C504 55 393 -56 256 -56S8 55 8 192S119 440 256 440S504 329 504 192zM477.4 192C477.4 314.3 378.3 413.4 256 413.4S34.6 314.3 34.6 192S133.7 -29.4 256 -29.4S477.4 69.7 477.4 192zM404.9 95.4C404.9 91.8 417.9 85.2 421.2 83.2C393.8 41.7 351.4 11.8 303.3 -0.1L298.9 18.4C298.6 20.9 297 21.2 294.7 21.2C292.8 21.2 291.7 18.4 291.9 17L296.3 -1.8C283 -4.6 269.5 -6 255.9 -6C219.6 -6 183.9 4.2 152.9 23.1C154.5999999999999 25.9 165.0999999999999 41.1 165.0999999999999 43.3C165.0999999999999 45.2 163.4 46.9 161.5 46.9C157.5999999999999 46.9 149.3 30.3 146.8 27.0000000000001C105 54.7 74.8 97.6 63.2 146.6L82.3 150.8C84.5 151.4 85.1 153 85.1 155C85.1 156.9 82.3 158 80.7 157.8L62 153.5C59.5 166.2 58.1 179 58.1 192C58.1 229.1 68.6 265.6 88.3 296.9C91.1 295.2000000000001 104.4 286.1 106.6 286.1C108.5 286.1 110.2 287.5 110.2 289.4C110.2 293.3 95.5 300.7000000000001 92.2 303C120.4 344.2 163.3 373.9 212 384.9L216.2 366.4C216.8 364.2 218.4 363.6 220.4 363.6S223.4 366.4 223.2 368L219 386.3C231.2 388.5 243.6 389.9 256.1 389.9C293.2000000000001 389.9 329.4000000000001 379.4 361 359.7C359.1 356.9 350.2 343.9 350.2 341.7C350.2 339.8 351.6 338.1 353.5 338.1C357.4 338.1 364.8 352.5 366.8 355.8C407.8 328.1 437.1 285.8 448.5 237.6L433 234.3C430.5 233.7 430.2 232.1 430.2 229.9C430.2 228 433 226.9 434.4 227.1L450.2 230.7C452.7 218 454.1 205 454.1 192C454.1 155.7 444.1 120 425.3 89.3C422.5 90.7 410.9 99 408.7 99C406.5999999999999 99 404.8999999999999 97.3 404.8999999999999 95.4zM371.7 337.6C358.7 325.4 237.5 213.9 234.1 208.1L137.5 47.6C150.2 59.4999999999999 271.7 171.6 274.8 176.9L371.7000000000001 337.6z" />
-    <glyph glyph-name="sass"
-      unicode="&#xF41E;"
-      horiz-adv-x="640.4" d=" M551.1 156.1C528.7 156 509.3 150.6 493.1 142.6C487.2 154.5 481.1 164.9 480.1 172.7000000000001C478.9 181.8000000000001 477.6 187.2000000000001 479 198.0000000000001S486.7 224.1000000000001 486.6 225.2000000000001C486.5 226.3000000000001 485.2 231.8000000000001 472.3 231.9000000000001C459.4 232.0000000000001 448.3 229.4000000000001 447 226.0000000000001C445.7 222.6 443.2 214.9 441.7 206.9C439.4 195.2000000000001 415.9 153.4 402.6 131.6C398.2 140.1 394.5 147.6 393.7 153.6C392.5 162.7000000000001 391.2 168.1 392.6 178.9S400.3 205 400.2 206.1C400.1 207.2 398.8 212.7 385.9 212.8C373 212.9 361.9 210.3 360.6 206.9C359.3 203.5 357.9 195.5 355.3 187.8C352.7 180.1 321.4 110.5 313.2 92.4C309 83.2 305.3999999999999 75.8 302.8 70.8S302.6 70.4999999999999 302.4 69.9C300.2 65.6 298.9 63.2 298.9 63.2V63.1C297.2 59.9 295.3 56.9999999999999 294.4 56.9999999999999C293.8 56.9999999999999 292.5 65.3999999999999 294.7 76.8999999999999C299.4 101.0999999999999 310.5 138.6999999999999 310.4 140C310.3 140.6999999999999 312.5 147.1999999999999 303.1 150.6999999999999C294 154 290.7 148.5 289.9 148.5C289.1 148.5 288.5 146.5 288.5 146.5S298.6 188.8999999999999 269.1 188.8999999999999C250.7 188.8999999999999 225.1 168.6999999999999 212.5 150.3999999999999C204.6 146.0999999999999 187.5 136.7999999999999 169.5 126.8999999999999C162.6 123.0999999999999 155.5 119.1999999999999 148.8000000000001 115.5C148.3000000000001 116 147.9 116.5 147.4 117C111.6 155.1999999999999 45.5 182.1999999999999 48.3 233.5C49.3 252.2 55.8 301.3 175.4 360.9C273.4000000000001 409.7 351.8000000000001 396.3 365.3000000000001 366.5C384.7000000000001 324 323.4000000000001 244.9 221.6000000000001 233.5C182.8000000000001 229.2 162.4000000000001 244.2 157.3000000000001 249.8C152.0000000000001 255.7 151.2000000000001 256 149.2000000000001 254.9C145.9000000000001 253.1 148.0000000000001 247.9 149.2000000000001 244.8C152.2000000000001 236.9 164.7000000000001 222.9 186.0000000000001 215.9C204.7000000000001 209.8 250.2000000000001 206.4 305.2000000000001 227.7C367 251.5 415.1 317.8 401 373.3C386.6 429.7 293.1 448.2 204.6 416.8C151.9 398.1 94.9 368.7 53.9 330.4C5.2 284.8 -2.6 245.1 0.6 228.5C12 169.6 93.2 131.2 125.7 102.8C124.1 101.9 122.6 101.1 121.2 100.3C104.9 92.2 43 59.8 27.5 25.6C10 -13.2 30.4 -41 43.8 -44.8C85.6 -56.4 128.4 -35.4999999999999 151.4 -1.1999999999999S171.6 77.9000000000001 161 98.3000000000001C160.9 98.6000000000001 160.7 98.8000000000001 160.6 99.1000000000001C164.8 101.6000000000001 169.1 104.1000000000001 173.4 106.6000000000001C181.7 111.5000000000001 189.8 116.0000000000001 196.9 119.9000000000001C192.9 109.1000000000001 190 96.1000000000001 188.5 77.3000000000001C186.7 55.3000000000001 195.8 26.8000000000001 207.6 15.6000000000001C212.8 10.7000000000001 219.1 10.6000000000001 223 10.6000000000001C236.8 10.6000000000001 243 22.0000000000001 249.9 35.6000000000001C258.4 52.2000000000001 265.9 71.5000000000001 265.9 71.5000000000001S256.5 19.3000000000001 282.2 19.3000000000001C291.6 19.3000000000001 301 31.4000000000001 305.2 37.6000000000001V37.5000000000001S305.4 37.9 305.9 38.7C306.9 40.2 307.4 41.1 307.4 41.1V41.4C311.2 47.9 319.5 62.8 332 87.4C348.2 119.2000000000001 363.7 158.9 363.7 158.9S365.1 149.2000000000001 369.9 133.1C372.7 123.6 378.6 113.2000000000001 383.3 103.1C379.5 97.9 377.2 94.9 377.2 94.9S377.2 94.8 377.3 94.7000000000001C374.3 90.7000000000001 370.9 86.4 367.4 82.2000000000001C354.6 67.0000000000001 339.4 49.6 337.4 44.6C335 38.7 335.6 34.3 340.2 30.9C343.6 28.3 349.6 27.9 355.9 28.4C367.4 29.2 375.5 32.0000000000001 379.4 33.8C385.6 36 392.8 39.5 399.6 44.4C412.1 53.6 419.7 66.8 419 84.2000000000001C418.6 93.8000000000001 415.5 103.4 411.7 112.4C412.8 114.0000000000001 414 115.7000000000001 415.0999999999999 117.4C434.8999999999999 146.3 450.2 178.0000000000001 450.2 178.0000000000001S451.5999999999999 168.3000000000001 456.3999999999999 152.2000000000001C458.7999999999999 144.1 463.4999999999999 135.2000000000001 467.7999999999999 126.5000000000001C449.1999999999999 111.4 437.6999999999999 93.9 433.6999999999999 82.4C426.2999999999999 61.1 432.0999999999999 51.5000000000001 442.9999999999999 49.3C447.8999999999999 48.3 454.8999999999999 50.6 460.0999999999999 52.8C466.5999999999999 55 474.3999999999999 58.5 481.6999999999999 63.9C494.1999999999999 73.1 506.3 86.0000000000001 505.4999999999999 103.5000000000001C505.1999999999999 111.4 502.9999999999999 119.3000000000001 500.1 126.9C515.8 133.5000000000001 536.1999999999999 137.1 562.1999999999999 134.1C617.9 127.6 628.8 92.8 626.6999999999999 78.3C624.5999999999999 63.7 612.9 55.7 608.9999999999999 53.3C605.0999999999999 50.9 603.8999999999999 50 604.1999999999999 48.2C604.6999999999999 45.6 606.4999999999999 45.7 609.8 46.3C614.4 47.1 639 58.1 640.0999999999999 85C641.6999999999999 119 608.9999999999999 156.4 551.0999999999999 156.1zM121.8 11.4C103.4 -8.7 77.6 -16.3 66.5 -9.9C54.6 -3 59.3 26.6 82 48C95.8 61 113.6 73 125.4 80.4C128.1 82 132 84.4 136.8 87.3C137.6 87.8 138 87.9999999999999 138 87.9999999999999C138.9 88.6 139.9 89.1 140.9 89.6999999999999C149.2 59.3 141.2 32.4999999999999 121.8 11.3999999999999zM256.2 102.8C249.8 87.1 236.3 47.1 228.1 49.1999999999999C221.1 50.9999999999999 216.8 81.4999999999999 226.7 111.4999999999999C231.7 126.6 242.3 144.6 248.6 151.6C258.7 162.9 269.8 166.5 272.4 162C275.9 156.1 260.2 112.6 256.2 102.8zM367.2 49.8C364.5 48.4 362 47.4999999999999 360.8 48.1999999999999C359.9000000000001 48.6999999999999 361.9000000000001 50.5999999999999 361.9000000000001 50.5999999999999S375.8 65.4999999999999 381.3 72.2999999999999C384.5 76.2999999999999 388.2 80.9999999999999 392.2 86.1999999999999C392.2 85.6999999999999 392.3 85.1999999999999 392.3 84.5999999999999C392.2 66.6999999999999 375 54.5999999999999 367.2 49.7999999999998zM452.8 69.3C450.8 70.6999999999999 451.1 75.4 457.8 89.9999999999999C460.4 95.6999999999999 466.4 105.3 476.8 114.5C477.9999999999999 110.6999999999999 478.6999999999999 107.1 478.6999999999999 103.6999999999999C478.5999999999999 81.1999999999999 462.4999999999999 72.8 452.8 69.3z" />
-    <glyph glyph-name="schlix"
-      unicode="&#xF3EA;"
-      horiz-adv-x="448" d=" M350.5 290.3L296.3 336.4L369.7000000000001 375.4L448.0000000000001 331.2L350.5000000000001 290.3zM192 325.9L237.7 354.1L272.4 319.5L217 290.5L192 325.9zM126.9 319.3L158.8 341.4L176 313L139.3 290.5L126.9 319.3zM103.6 231.1L94.8 265.9000000000001L124.4 284.2000000000001L137.5 248.9000000000001L103.6 231.1zM82.4 314.8L106.3 332.9L115.2 308.9L88.5 290.6L82.4 314.8zM59 241.5L55.4 269.9L77.7 285.4L83.8 256.7000000000001L59 241.5zM28.4 224.9L49.2 237.7L52.5 204.3L29.6 192.3L28.4 224.9zM1.4 180L20.6 190.2L21 152L0 143.2L1.4 180zM60.5 120.7L32.2 112.4L30.6 159.2L55.7 169.9L60.5 120.7zM99 184.8L67.9 171.8L62.7 212.6L90.1 227L99 184.8zM123.2 71L81.6 65.1L73.5 128.6L108.7 139.4L123.2 71zM151.7 210.9L172.9 153.8L126.7 140.2L113 194.3L151.7 210.9zM237.4 -19.6L166.5 -16.3L142.2 79.5L197.4 88.1L237.4 -19.6zM152.5 260.1L194.7 282.5L222.7 236.6L171.9 215.3L152.5 260.1zM193.5 165.1999999999999L254.8 183.8999999999999L307.6 97.3L227.8 85.9999999999999L193.5 165.1999999999999zM244.9 250.8L312.2 279.5999999999999L377.7 214.1999999999999L289.1 188L244.9000000000001 250.8z" />
-    <glyph glyph-name="scribd"
-      unicode="&#xF28A;"
-      horiz-adv-x="384" d=" M42.3 195.3C26.2 214.3 17.6 241.2 17.5 275.2000000000001C17.5 375.6 92.7 428.3 184.7 428.3C283.3 429.9000000000001 341.5 379.3 369 357.7000000000001L318.5 285.6L281.2 310.2000000000001L308.1 348.8C271.6 372.8 228.7 385.3 185.1 384.6C134.4 385.4 73.4 357.4 73.4 308.4C73.4 289.7000000000001 84.6 287.7000000000001 102 292.8C125.3 298.1 143.9 292.2000000000001 157.8 278.8C184.2 254.5 181 211.2 157.1 186.9C127.9 157.4 71.9 159.6 42.3 195.3zM360 189.4C344.5 208.2000000000001 321.1 218.8000000000001 296.8 218C258.7 220 225.7 190 226.3 150.8C225.6 134 232.3 117.8 244.7 106.5C258.8 92.6 277.7000000000001 86.8 301 92.1C318.4 97.2000000000001 329.6 95.2000000000001 329.6 76.5C329.6 72.2 329.1 68 328.2000000000001 63.8C311.5000000000001 22.9 268.7000000000001 -0.6 206.8000000000001 -0.6C154.9 -0.8 104.4 15.8 62.7000000000001 46.7L96.4000000000001 86.1L60.8000000000001 113.5L0 41.7L15.4 27.9C67.9 -18.9 135.8 -44.6 206.1 -44.3C257.5 -44.3 300.5 -33.8 339.7 -0.2C396.8 51.2 393.9 149 360 189.4z" />
-    <glyph glyph-name="searchengin"
-      unicode="&#xF3EB;"
-      horiz-adv-x="460" d=" M220.6 317.7L153.4 289.5V404.8L98.7 214.5L153.4 238.7V108.4L220.6 317.7zM137.4 414.4L136.1 409.7L120.9 356.8C80.6 341.3 52 302.2 52 256.5C52 204.2 86.3 160.6 135.4 151V97.4C57.5 107.9 0 175.6 0 256.4C0 336.9 59.8 403.6 137.4 414.4zM448.8 -32.8C437.6 -44 425.7 -45.1 420.2 -43.3C414.8 -41.5 393.0999999999999 -23.4 359.8 1.1C326.5 25.7 326.2 36.8 316.8 57.8C307.4 78.6999999999999 286.4 100.4 259.3 110.1999999999999L249.6 124.8999999999999C224.9 107.9999999999999 196.6 97.9999999999999 168.3 96.1999999999999L170.4 102.8L186.3 152.3C232.8 164.1999999999999 267.2 206.3 267.2 256.5C267.2 311 228.8 358.5999999999999 171.1999999999999 363.5999999999999V415.7C254.4 410.6 320 341.2 320 256.4C320 222.8 308.8 191.7 291 166L305.6 156.4C315.4000000000001 129.3 337.1 108.4 358 99S390.2 89.3 414.8 56C439.4000000000001 22.8 457.5 1.1 459.3 -4.3S460 -21.6 448.8 -32.8zM438.9 -14.9C438.9 -10.5000000000001 435.3 -6.9 430.9 -6.9S422.9 -10.5000000000001 422.9 -14.9S426.5 -22.9 430.9 -22.9S438.9 -19.3 438.9 -14.9z" />
-    <glyph glyph-name="sellcast"
-      unicode="&#xF2DA;"
-      horiz-adv-x="448" d=" M353.4 416H94.7C42.6 416 0 373.4 0 321.4V62.7000000000001C0 10.6 42.6 -32 94.7 -32H353.4C405.5 -32 448.1 10.6 448.1 62.6V321.4C448.1 373.4 405.5 416 353.4 416zM303.4 99.6C275.5 51.4 213.5 34.7 165.2 62.4C142.3 22.6 110.3 53.8 122.9 75.6L138.6 102.8C144.5 113.1 157.8 116.7 168.1 110.7C186.7 99.9 168 110.8 186.6 100C214.2 84.1 250 93.7 266 121.3C281.9 148.9 272.3 184.7 244.7 200.7C226.9 210.9 244.1 201.1 226.1 211.3C201.5 225.5 222.7 263.2000000000001 247.7 248.8C266.3 238 247.6 248.9 266.2 238.1C314.6 210.1 331.3 147.8 303.4 99.6zM325.2 308.4000000000001C308.2 278.9000000000001 308.9 279.6 306.2 276.9000000000001C299.7 270.4000000000001 289.9 268.2000000000001 279.7 273.3000000000001C261.1 284.1 279.8 273.2000000000001 261.2 284C233.6 299.9000000000001 197.8 290.3000000000001 181.8 262.7000000000001S175.5 199.3 203.1 183.3C203.1 183.3 221.6 172.7 221.7 172.7C246.3 158.5 225.1 120.8 200.1 135.2C181.5 146 200.2 135.1 181.6 145.9C133.4 173.7 116.7 236 144.5 284.3C172.4 332.5 234.4 349.2 282.7 321.5L287.5 329.9C301.8 354.8 339.5 333.2 325.2 308.4z" />
-    <glyph glyph-name="sellsy"
-      unicode="&#xF213;"
-      horiz-adv-x="640" d=" M539.71 210.692C542.774 222.949 544 235.513 544 248.076C544 340.618 468.618 416 376.076 416C298.856 416 231.4420000000001 362.988 213.056 288.219C197.734 301.395 178.122 308.749 157.899 308.749C111.628 308.749 73.937 271.059 73.937 224.788C73.937 217.434 74.857 209.773 77.002 202.419C34.102 182.194 6.217 138.6810000000001 6.217 91.185C6.216 23.157 61.68 -32 129.401 -32H510.599C578.319 -32 633.783 23.157 633.783 91.184C633.784 147.568 594.867 197.209 539.71 210.692zM199.88 46.446C199.88 38.172 192.832 31.125 184.559 31.125H153.61C145.336 31.125 138.289 38.173 138.289 46.446V157.374C138.289 165.6470000000001 145.337 172.6950000000001 153.61 172.6950000000001H184.559C192.833 172.6950000000001 199.88 165.6470000000001 199.88 157.374V46.446zM289.357 46.446C289.357 38.172 282.309 31.125 274.035 31.125H243.086C234.812 31.125 227.765 38.173 227.765 46.446V177.904C227.765 186.178 234.813 193.225 243.086 193.225H274.035C282.309 193.225 289.357 186.177 289.357 177.904V46.446zM378.834 46.446C378.834 38.172 371.7869999999999 31.125 363.5129999999999 31.125H332.5639999999999C324.2899999999999 31.125 317.2419999999999 38.173 317.2419999999999 46.446V209.16C317.2419999999999 217.434 324.2899999999999 224.481 332.5639999999999 224.481H363.5129999999999C371.7869999999999 224.481 378.834 217.433 378.834 209.16V46.446zM465.8609999999999 46.446C465.8609999999999 38.172 458.8129999999999 31.125 450.5389999999999 31.125H422.0419999999999C413.7679999999999 31.125 406.7209999999999 38.173 406.7209999999999 46.446V271.059C406.7209999999999 279.6380000000001 413.7679999999999 286.687 422.0419999999999 286.687H450.5389999999999C458.8129999999999 286.687 465.8609999999999 279.639 465.8609999999999 271.0590000000001V46.446z" />
-    <glyph glyph-name="servicestack"
-      unicode="&#xF3EC;"
-      horiz-adv-x="496" d=" M88 232C169.7 221.8 361.7 129.7 392 0H0C99.5 8.1 184.5 137 88 232zM120 384C152.3 348.4 167.7 300.1 166.4 250.4C249.3 216.7 373.7 126.7 400 0H496C455.3 216.1 222.8 368.5 120 384z" />
-    <glyph glyph-name="shirtsinbulk"
-      unicode="&#xF214;"
-      horiz-adv-x="448" d=" M395.2080000000001 226.417H406V192.875H395.2080000000001V226.417zM395.2080000000001 236.042H406V269.584H395.2080000000001V236.042zM395.2080000000001 149.709H406V183.25H395.2080000000001V149.709zM358.75 312.75H325.208V302.25H358.75V312.75zM395.208 106.542H406V140.0840000000001H395.2080000000001V106.542zM311.5 312.75H277.958V302.25H311.5V312.75zM264.25 312.75H231V302.25H264.25V312.75zM217 312.75H183.75V302.25H217V312.75zM395.208 279.208H406V312.75H372.458V302.25H395.208V279.208zM139.416 20.208L170.041 6.791L174.416 16.708L143.791 30.1249999999999L139.416 20.208zM179.083 3L209.417 -10.708L213.791 -0.792L183.458 12.6249999999999L179.083 2.9999999999999zM395.208 63.375H406V96.917H395.2080000000001V63.375zM60.3749999999999 55.208L91 41.792L95.375 51.416L64.75 65.125L60.375 55.208zM100.0409999999999 37.709L130.666 24.292L135.041 34.209L104.4159999999999 47.625L100.0409999999999 37.709zM232.458 -0.792L236.833 -10.708L267.459 3L263.084 12.625L232.458 -0.792zM350.875 51.4160000000001L355.25 41.792L385.874 55.208L381.5 65.125L350.875 51.416zM311.5 34.209L315.875 24.292L346.5 37.709L342.126 47.625L311.5 34.209zM271.833 16.708L276.208 6.7910000000001L306.833 20.208L302.458 30.125L271.833 16.708zM311.5 401.4170000000001H277.958V390.9170000000001H311.5V401.4170000000001zM405.709 401.4170000000001H372.4580000000001V390.9170000000001H405.709V401.4170000000001zM217 401.4170000000001H183.75V390.9170000000001H217V401.4170000000001zM358.75 401.4170000000001H325.208V390.9170000000001H358.75V401.4170000000001zM264.25 401.4170000000001H231V390.9170000000001H264.25V401.4170000000001zM448 444.292V38.292L221.666 -60.292L0 38.292V444.292H448zM418.834 327.334H29.166V57.25L221.958 -28.5L418.833 57.25V327.334zM418.834 415.125H29.166V356.5H418.833V415.125zM75.542 401.4170000000001H42.291V390.9170000000001H75.542V401.4170000000001zM170.042 401.4170000000001H136.5V390.9170000000001H170.042V401.4170000000001zM122.791 401.4170000000001H89.25V390.9170000000001H122.792V401.4170000000001zM130.375 164.875C130.375 215.042 171.5 256.1670000000001 221.667 256.1670000000001C272.125 256.1670000000001 312.959 215.042 312.959 164.875C312.959 114.417 272.126 73.583 221.667 73.583C171.5 73.584 130.375 114.417 130.375 164.875zM251.125 146.791C251.125 133.666 227.208 132.5 218.459 132.5C206.209 132.5 188.709 135.125 182.584 147.375H181.709L172.666 129C187.542 119.667 201.833 116.75 219.916 116.75C239.458 116.75 270.958 122.583 270.958 147.959C270.958 196.084 192.5 164.292 192.5 185.875C192.5 199 213.208 200.75 222.25 200.75C233.041 200.75 251.416 197.542 257.833 187.626H258.708L267.459 204.542C252.292 210.667 240.042 216.501 223.125 216.501C203 216.501 173.542 210.084 173.542 184.709C173.542 140.375 251.125 172.75 251.125 146.791zM122.791 312.75H89.25V302.25H122.792V312.75zM52.792 302.25H75.542V312.75H42V279.208H52.792V302.25zM52.792 269.584H42V236.042H52.792V269.584zM170.042 312.75H136.5V302.25H170.042V312.75zM52.792 226.417H42V192.875H52.792V226.417zM52.792 140.083H42V106.5409999999999H52.792V140.083zM52.792 183.25H42V149.708H52.792V183.25zM52.792 96.917H42V63.375H52.792V96.917z" />
-    <glyph glyph-name="shopware"
-      unicode="&#xF5B5;"
-      horiz-adv-x="495.99" d=" M395.5 -7.27C352.55 -39.06 301.55 -55.86 248.02 -55.86C110.81 -55.86 0 55.14 0 192.14C0 329.33 111.04 440.14 248.02 440.14C309.32 440.14 368.1600000000001 417.59 413.7000000000001 376.64C416.3200000000001 374.28 414.2800000000001 370 410.8400000000001 370.46C393.17 372.89 374.0900000000001 374.12 354.1300000000001 374.12C224.7700000000001 374.12 131.7300000000001 320.65 131.7300000000001 218.77C131.7300000000001 109.73 223.8600000000001 72.89 308.5600000000001 40.04C342.2000000000001 26.9999999999999 373.9600000000001 14.68 395.5200000000001 -1.5500000000001C397.42 -2.9900000000001 397.4100000000001 -5.8600000000001 395.5000000000001 -7.2700000000001zM494.96 215.05C494.88 215.99 494.41 216.88 493.69 217.49C441.93 260.4500000000001 400.07 277.9700000000001 349.2100000000001 277.9700000000001C265.0800000000001 277.9700000000001 268.9600000000001 225.8 268.9600000000001 224.34C268.9600000000001 181.74 321.0200000000001 162.33 381.3000000000001 139.85C412.3700000000001 128.2600000000001 444.4900000000001 116.28 473.9800000000001 99.92C475.8600000000001 98.87 478.2400000000001 99.73 479.0300000000001 101.74C497.9200000000001 150.13 496.9700000000001 191.97 494.9600000000001 215.05z" />
-    <glyph glyph-name="simplybuilt"
-      unicode="&#xF215;"
-      horiz-adv-x="512" d=" M481.2 384H375.2C360.7 384 348.6 372.2 348.6 357.7V318.1H163.3V357.7C163.3 372.2 151.3 384 136.7 384H30.7C16.1 384 4.3 372.2 4.3 357.7V26.3C4.3 11.8 16.1 0 30.9 0H481.3C496.1 0 507.9 11.8 507.9 26.3V357.7C507.7 372.2 495.9 384 481.2 384zM149.8 92.2C113.2 92.2 83.4 121.9 83.4 158.6C83.4 195.5 113.1 225.2 149.8 225.2C186.7 225.2 216.4 195.5 216.4 158.6C216.4 121.9 186.7 92.2000000000001 149.8 92.2000000000001zM362.2000000000001 92.2C325.3000000000001 92.2 295.6 121.9 295.6 158.8C295.6 195.4 325.3 225.2 362.2000000000001 225.2C398.8000000000001 225.2 428.6 195.5 428.6 158.8C428.6 121.9 398.8 92.1999999999999 362.2000000000001 92.1999999999999z" />
-    <glyph glyph-name="sistrix"
-      unicode="&#xF3EE;"
-      horiz-adv-x="448" d=" M448 -1L301.2 147.8C321.2 175.7 333.1 210 333.1 247C333.1 340.1 258.4 415.9 166.6 415.9C74.7 416 0 340.2 0 247.1S74.7 78.2 166.5 78.2C206.3 78.2 242.8 92.4 271.5 116.1L417.5 -32L448 -1zM166.5 117.2C95.9 117.2 38.4 175.5 38.4 247.1S95.9 377 166.5 377S294.6 318.7 294.6 247.1S237.2 117.2 166.5 117.2z" />
-    <glyph glyph-name="sith"
-      unicode="&#xF512;"
-      horiz-adv-x="448" d=" M0 416L69.71 297.25L10.85 308.77L80.69 217.74A146.741 146.741 0 0 1 80.69 166.29L10.85 75.26L69.71 86.78L0 -32L118.75 37.71L107.23 -21.15L198.26 48.6899999999999C215.28 45.6499999999999 232.73 45.6499999999999 249.74 48.6899999999999L340.77 -21.1500000000001L329.25 37.7099999999999L448 -32L378.29 86.78L437.1500000000001 75.26L367.3100000000001 166.29C370.3400000000001 183.3 370.3500000000001 200.73 367.3100000000001 217.74L437.1500000000001 308.77L378.2900000000001 297.25L448 416L329.25 346.29L340.77 405.19L249.71 335.32C241.21 336.84 232.61 337.61 224 337.61S206.79 336.83 198.29 335.32L107.23 405.19L118.75 346.29L0 416zM224 316.2200000000001C255.8 316.2200000000001 287.6 304.1 311.85 279.85C360.35 231.35 360.3400000000001 152.64 311.85 104.15S184.65 55.69 136.15 104.18C87.65 152.68 87.66 231.39 136.15 279.88C160.3900000000001 304.13 192.2000000000001 316.2199999999999 224 316.2199999999999zM224 279.56C201.58 279.56 179.17 271.04 162.08 253.95C127.9 219.77 127.89 164.27 162.08 130.08S251.73 95.9 285.92 130.08C320.1 164.26 320.11 219.76 285.92 253.95C268.83 271.04 246.42 279.56 224 279.56z" />
-    <glyph glyph-name="skyatlas"
-      unicode="&#xF216;"
-      horiz-adv-x="640" d=" M640 118.7C640 52.8 587.5 4.3 522.5 4.3C356.6 4.3 325.9 254 162.8 254C15.9 254 15.7 41.8 168.4 41.8C210.9 41.8 259.3 59.6 293.7 84.3C299.3 88.4 310.6 100.6 316.5 100.6S327.4 95.6 327.4 89.7C327.4 81.9 314.3 70.6 308.7 65.6C267.8 29.9999999999999 208.4 4.4 154 4.4C70.6 4.3 0 63.4 0 149.3S67.5 298.4 152.8 298.4C338.1 298.4 375.3 52.4999999999999 514.7 52.4999999999999C614.6 52.4999999999999 609.5 192.1999999999999 518.1 192.1999999999999C500.6 192.1999999999999 483.1 180.5999999999999 471.2 180.5999999999999C462.8000000000001 180.5999999999999 455.3000000000001 187.7999999999999 455.3000000000001 196.1999999999999C455.3000000000001 207.7999999999999 460.6000000000001 219.8999999999999 460.6000000000001 232.4999999999999C460.6000000000001 299.0999999999999 409.7000000000001 347.1999999999999 343.7000000000001 347.1999999999999C290.6 347.1999999999999 263.7000000000001 310.2999999999999 254.9000000000001 310.2999999999999C248.7000000000001 310.2999999999999 243.7000000000001 315.2999999999999 243.7000000000001 321.4999999999999C243.7000000000001 327.0999999999999 247.8000000000001 331.7999999999999 251.5000000000001 335.8999999999999C276.8000000000001 364.7 316.2000000000001 379.5999999999999 354.3000000000001 379.5999999999999C433.7000000000001 379.5999999999999 493.4000000000001 321.2 493.4000000000001 241.7999999999999C493.4000000000001 234.8999999999999 493.1000000000001 228.0999999999999 492.2000000000001 221.1999999999999C504.1000000000001 224.2999999999999 516.3000000000001 225.8999999999999 528.1000000000001 225.8999999999999C588.8000000000002 225.8999999999999 640.0000000000001 180.5999999999999 640.0000000000001 118.6999999999999z" />
-    <glyph glyph-name="skype"
-      unicode="&#xF17E;"
-      horiz-adv-x="448" d=" M424.7 148.2C427.6 162.2 429.4 177.1 429.4 192C429.4 305.5 337.5 397.3 224.1 397.3C209.2 397.3 194.4 395.6 180.3 392.6C161.3 407.3 137.7 416 112 416C50.2 416 0 365.8 0 304C0 278.3 8.7 254.7 23.3 235.8C20.4 221.8 18.6 206.9 18.6 192C18.6 78.5 110.5 -13.3 223.9 -13.3C238.8 -13.3 253.6 -11.6 267.7 -8.6C286.7 -23.2 310.3 -31.9 335.9 -31.9C397.7 -31.9 447.9 18.3 447.9 80.1C448 105.7 439.3 129.3 424.7 148.1999999999999zM230.1 56.7C164.5 56.7 109.6 85.9 109.6 121.7C109.6 137.7 118.6 152.3 139.1 152.3C170.3 152.3 173.2 107.4 227.2 107.4C252.9 107.4 269.5 118.8 269.5 133.7000000000001C269.5 152.4 253.5 155.3000000000001 227.5 161.7000000000001C165 177.1 109.7 183.7000000000001 109.7 248.9000000000001C109.7 308.1 168.3 330 218.8 330C273.9000000000001 330 329.6 308.1 329.6 274.6C329.6 257.7000000000001 318.2000000000001 242.8 299.3 242.8C271 242.8 270.1 276.3 224.3 276.3C198.6 276.3 182.3 269.3 182.3 253.8C182.3 234 203.1 232 251.4 220.8C292.8 211.5 342.1 194 342.1 143.2000000000001C342.1 84.1 285 56.7000000000001 230.1 56.7000000000001z" />
-    <glyph glyph-name="slack-hash"
-      unicode="&#xF3EF;"
-      horiz-adv-x="448" d=" M446.2 177.6C440 196.6 419.3 206.7 400.2 200.5L354.8 185.4L324.5 275.4000000000001L369.9 290.5C389 296.7000000000001 399 317.3000000000001 392.9 336.4000000000001C386.7 355.4000000000001 366 365.5 346.9 359.3000000000001L301.5 344.2000000000001L285.8 391.2000000000001C279.6 410.2000000000001 258.9000000000001 420.3000000000001 239.8 414.1C220.7 407.9000000000001 210.7 387.3000000000001 216.8 368.2000000000001L232.5 321.2000000000001L139.1 290.0000000000001L123.4 337.0000000000001C117.2 356.0000000000001 96.5 366.1 77.4 359.9000000000001C58.3 353.7000000000001 48.3 333.1000000000001 54.4 314.0000000000001L70.1 267.0000000000001L24.8 252.0000000000001C5.7 245.8000000000001 -4.3 225.2000000000001 1.8 206.1000000000001C6.8 191.6 20.9 182.1 35.4 181.5000000000001C42.2 180.5000000000001 47.4 183.1000000000001 93.1 198.3000000000001L123.4 108.3000000000001L78 93.2C59 87 48.9 66.3 55 47.3C60 32.8 74.1 23.3 88.6 22.7C95.4 21.7 100.6 24.3 146.3 39.5L162 -7.5C167.9 -24.4 186.7 -36.5 208 -30.4C227.1 -24.2 237.1 -3.6 231 15.5L215.3 62.5L308.9 93.8L324.6 46.8C330.5 29.9 349.3 17.8 370.6 23.9C389.7 30.1 399.7 50.7 393.6 69.8L377.9 116.8L423.3 131.9C442.3 137.9 452.4 158.6 446.2 177.6zM192.1 130.4L161.8 220.6L255.3 251.9000000000001L285.6 161.7000000000001L192.1 130.4z" />
-    <glyph glyph-name="slack"
-      unicode="&#xF198;"
-      horiz-adv-x="448" d=" M244.2 230.5L263.5 172.8L203.7 152.8L184.4 210.5L244.2 230.5zM285.6 -13.2C131.6 -59.4 65 -23.6 18.8 130.4S8.4 351 162.4 397.2C316.4 443.4 383 407.6 429.2 253.6C475.4 99.6 439.6 33 285.6 -13.2zM366.2 183C362.3 195.2 349 201.6 336.8 197.7L307.8 188L288.5 245.7L317.5 255.4C329.7 259.3 336.1 272.6 332.2 284.8C328.3 297 315 303.4 302.8 299.5L273.8 289.8L263.8 319.9C259.9000000000001 332.1 246.6 338.5 234.4 334.6C222.2 330.7 215.8 317.4 219.7 305.2L229.7 275.1L169.9 255L159.9 285.1C156 297.3 142.7000000000001 303.7 130.5 299.8C118.3 295.9 111.9 282.6 115.8 270.4L125.8 240.3L96.8 230.6C84.6 226.7 78.2 213.4 82.1 201.2C85.3 191.9 94.3 185.8 103.6 185.4C107.9 184.8 111.3 186.4 140.5 196.1L159.8000000000001 138.4L130.8000000000001 128.7C118.6 124.8 112.2000000000001 111.5 116.1 99.3C119.3000000000001 90 128.3000000000001 83.9 137.6 83.5C141.9 82.9 145.3 84.5 174.5 94.2L184.5 64.1C188.2 53.3 200.3000000000001 45.4999999999999 213.9 49.4C226.1 53.3 232.5000000000001 66.6 228.6 78.8L218.6 108.9L278.4000000000001 129L288.4000000000001 98.9C292.1 88.1 304.2000000000001 80.3 317.8 84.2C330 88.1 336.4000000000001 101.4 332.5 113.6L322.5 143.7L351.5 153.4C363.7 157.6 370.1 170.9 366.2 183z" />
-    <glyph glyph-name="slideshare"
-      unicode="&#xF1E7;"
-      horiz-adv-x="512" d=" M249.429 236.564C249.429 204.848 221.714 178.847 187.712 178.847C153.711 178.847 125.996 204.848 125.996 236.564C125.996 268.565 153.711 294.28 187.712 294.28C221.713 294.28 249.429 268.565 249.429 236.564zM503.723 186.562C485.437 163.989 450.579 136.274 397.4340000000001 114.559C453.722 -77.163 260 -107.735 263.143 -9.446C263.143 -11.16 262.857 43.413 262.857 83.986C258.572 84.844 254.286 85.986 249.143 87.129C249.143 46.271 248.857 -11.16 248.857 -9.446C252 -107.735 58.278 -77.163 114.566 114.559C61.421 136.274 26.563 163.989 8.276 186.562C-0.867 200.276 9.134 214.849 24.277 204.277C26.277 202.849 28.562 201.42 30.562 199.992V398.284C30.563 425.713 51.135 448 76.565 448H435.722C461.151 448 481.724 425.713 481.724 398.284V199.991L487.724 204.276C502.867 214.849 512.867 200.276 503.723 186.562zM457.151 375.712C457.151 408.57 446.579 421.428 416.2920000000001 421.428H98.566C66.85 421.428 57.993 410.5700000000001 57.993 375.712V183.419C125.71 147.989 183.713 154.275 215.428 155.418C228.857 155.704 237.429 153.132 242.572 147.703C244.261 146.016 252.595 138.257 262.859 130.5600000000001C264.002 146.275 272.86 156.275 296.575 155.4180000000001C328.862 153.9900000000001 388.293 147.7030000000001 457.152 185.1340000000001V375.712zM331.146 294.28C297.144 294.28 269.43 268.565 269.43 236.564C269.43 204.848 297.145 178.847 331.146 178.847C365.433 178.847 392.862 204.848 392.862 236.564C392.862 268.565 365.4330000000001 294.28 331.146 294.28z" />
-    <glyph glyph-name="snapchat-ghost"
-      unicode="&#xF2AC;"
-      horiz-adv-x="512" d=" M510.846 55.327C505.635 43.17 483.607 34.238 443.486 28.009C441.422 25.223 439.711 13.323 436.979 4.053C435.354 -1.513 431.356 -4.816 424.851 -4.816L424.554 -4.811C415.159 -4.811 405.351 -0.4880000000001 385.702 -0.4880000000001C359.181 -0.4880000000001 350.04 -6.5310000000001 329.448 -21.0760000000001C307.616 -36.5140000000001 286.677 -49.8400000000001 255.421 -48.4750000000001C223.775 -50.8090000000001 197.396 -31.5670000000001 182.55 -21.0710000000001C161.836 -6.4280000000001 152.722 -0.4890000000001 126.309 -0.4890000000001C107.445 -0.4890000000001 95.573 -5.2090000000001 87.457 -5.2090000000001C79.384 -5.2090000000001 76.244 -0.2870000000001 75.035 3.8309999999999C72.332 13.0199999999999 70.631 25.0939999999999 68.512 27.9609999999999C47.833 31.1699999999999 1.202 39.3049999999999 0.014 60.1109999999999A10.627 10.627 0 0 0 8.891 71.1799999999999C78.474 82.6349999999999 109.815 154.0809999999999 111.118 157.1139999999999C111.192 157.2899999999999 111.273 157.4579999999999 111.355 157.6289999999999C115.068 165.1659999999999 115.899 171.4779999999999 113.818 176.3819999999999C108.768 188.2779999999999 86.946 192.5459999999999 77.765 196.1779999999999C54.05 205.5439999999999 50.75 216.3059999999999 52.153 223.6819999999999C54.59 236.5179999999999 73.878 244.4169999999999 85.155 239.1349999999999C94.074 234.9539999999999 101.998 232.8379999999999 108.702 232.8379999999999C113.724 232.8379999999999 116.914 234.0419999999999 118.662 235.0089999999999C116.619 270.9449999999999 111.561 322.2989999999999 124.349 350.9779999999999C158.122 426.6960000000001 229.705 432.58 250.826 432.58C251.77 432.58 259.967 432.669 260.936 432.669C313.084 432.669 363.19 405.889 387.659 351.026C400.436 322.376 395.408 271.234 393.354 235.017C394.936 234.145 397.711 233.075 401.953 232.878C408.35 233.164 415.768 235.267 424.022 239.135C430.107 241.981 438.428 241.596 444.502 239.077L444.531 239.067C454.007 235.682 459.97 228.852 460.12 221.197C460.304 211.45 451.598 203.032 434.242 196.179C432.124 195.344 429.548 194.524 426.808 193.654C417.011 190.548 402.208 185.849 398.192 176.383C396.113 171.479 396.9360000000001 165.172 400.652 157.635C400.739 157.467 400.818 157.293 400.891 157.12C402.192 154.09 433.506 82.66 503.121 71.186C509.548 70.128 514.284 63.309 510.846 55.3270000000001z" />
-    <glyph glyph-name="snapchat-square"
-      unicode="&#xF2AD;"
-      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM393.5 101.1C390 93 375.4 87.1 348.7 82.9C347.3 81.0000000000001 346.2 73.1 344.4 67.0000000000001C343.3 63.3000000000001 340.7 61.1000000000001 336.3 61.1000000000001H336.1C329.9 61.1000000000001 323.3 64.0000000000001 310.3 64.0000000000001C292.7 64.0000000000001 286.6 60.0000000000001 272.9 50.3000000000001C258.4 40.0000000000001 244.5 31.2 223.7 32.1000000000001C202.7 30.5000000000001 185.1 43.3000000000001 175.2 50.3000000000001C161.4 60.0000000000001 155.4 64.0000000000001 137.8 64.0000000000001C125.3 64.0000000000001 117.4 60.9 112 60.9C106.6 60.9 104.5 64.2000000000001 103.7 66.9C101.9 73.0000000000001 100.8 81.0000000000001 99.4 82.9C85.6 85.0000000000001 54.6 90.4 53.9 104.3C53.7 107.9 56.2 111.1 59.8 111.7C106.1 119.3 126.9 166.8 127.8 168.8C127.8 168.9 127.9 169 128 169.1C130.5 174.1 131 178.3 129.6 181.6C126.2 189.5 111.7 192.3 105.6 194.8C89.8 201 87.6 208.2 88.6 213.1C90.2 221.6 103 226.9000000000001 110.5 223.4C116.4 220.6 121.7 219.2000000000001 126.2 219.2000000000001C129.5 219.2000000000001 131.7 220.0000000000001 132.8 220.6000000000001C131.4 244.5000000000001 128.1 278.6 136.6 297.7000000000001C159.1 348 206.7 352 220.7 352C221.3 352 226.8 352.1 227.4 352.1C262.1 352.1 295.4 334.3 311.7 297.8C320.2 278.7000000000001 316.9 244.7 315.5 220.7C316.6 220.1 318.4 219.4 321.2 219.3C325.5 219.5 330.4 220.9 335.9 223.5C339.9 225.4 345.5 225.1 349.5 223.5C355.8 221.2 359.8 216.7 359.9 211.6C360 205.1 354.2 199.5 342.7 195C341.3 194.4 339.6 193.9 337.8 193.3C331.3 191.2 321.4000000000001 188.1 318.8 181.8C317.4000000000001 178.5 318 174.3 320.4000000000001 169.3C320.5000000000001 169.2 320.5000000000001 169.1 320.6 169C321.5 167 342.3 119.5 388.6 111.9C392.6 110.9 395.7000000000001 106.4 393.5 101.1z" />
-    <glyph glyph-name="snapchat"
-      unicode="&#xF2AB;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM417.5 101.1C414 93 399.4 87.1 372.7 82.9C371.3 81.0000000000001 370.2 73.1 368.4 67.0000000000001C367.3 63.3000000000001 364.7 61.1000000000001 360.3 61.1000000000001H360.1C353.9 61.1000000000001 347.3 64.0000000000001 334.3 64.0000000000001C316.7 64.0000000000001 310.6 60.0000000000001 296.9 50.3000000000001C282.4 40.0000000000001 268.5 31.2 247.7 32.1000000000001C226.7 30.5000000000001 209.1 43.3000000000001 199.2 50.3000000000001C185.4 60.0000000000001 179.4 64.0000000000001 161.8 64.0000000000001C149.3 64.0000000000001 141.4 60.9 136 60.9C130.6 60.9 128.5 64.2000000000001 127.7 66.9C125.9 73.0000000000001 124.8 81.0000000000001 123.4 82.9C109.6 85.0000000000001 78.6 90.4 77.9 104.3C77.7 107.9 80.2 111.1 83.8 111.7C130.1 119.3 150.9 166.8 151.8 168.8C151.8 168.9 151.9 169 152 169.1C154.5 174.1 155 178.3 153.6 181.6C150.2 189.5 135.7 192.3 129.6 194.8C113.8 201 111.6 208.2 112.6 213.1C114.2 221.6 127 226.9000000000001 134.5 223.4C140.4 220.6 145.7 219.2000000000001 150.2 219.2000000000001C153.5 219.2000000000001 155.7 220.0000000000001 156.8 220.6000000000001C155.4 244.5000000000001 152.1 278.6 160.6 297.7000000000001C183.1 348 230.7 352 244.7 352C245.3 352 250.8 352.1 251.4 352.1C286.1 352.1 319.4 334.3 335.7 297.8C344.2 278.7000000000001 340.9 244.7 339.5 220.7C340.6 220.1 342.4 219.4 345.2 219.3C349.5 219.5 354.4 220.9 359.9 223.5C363.9 225.4 369.5 225.1 373.5 223.5C379.8 221.2 383.8 216.7 383.9 211.6C384 205.1 378.2 199.5 366.7 195C365.3 194.4 363.6 193.9 361.8 193.3C355.3 191.2 345.4000000000001 188.1 342.8 181.8C341.4000000000001 178.5 342 174.3 344.4000000000001 169.3C344.5000000000001 169.2 344.5000000000001 169.1 344.6 169C345.5 167 366.3 119.5 412.6 111.9C416.6 110.9 419.7000000000001 106.4 417.5 101.1z" />
-    <glyph glyph-name="soundcloud"
-      unicode="&#xF1BE;"
-      horiz-adv-x="640" d=" M111.4 191.7L117.2 126.7L111.4 58.4C111.1 55.9 109.2 54 107 54S102.8 55.9 102.8 58.4L97.2 126.7L102.8 191.7C102.8 193.9 104.7 195.9 107 195.9C109.2 195.9 111.1 193.9 111.4 191.7zM132.8 237.3C130 237.3 128.1 235.1 127.8 232.3L122.8 126.7L127.8 58.4C128.1 55.6 130 53.4 132.8 53.4C135.3 53.4 137.5 55.6 137.5 58.4L143.3 126.7L137.5 232.3C137.5 235.1 135.3 237.3 132.8 237.3zM158.3 261.4C155.2 261.4 153 259.2 152.7 256.1L148.3 126.1L152.7 58.3C153 55.1999999999999 155.2 52.9999999999999 158.3 52.9999999999999C161.1 52.9999999999999 163.6 55.1999999999999 163.6 58.3L168.9 126.1L163.6 256.1C163.6 259.2 161.1 261.4 158.3 261.4zM7.2 164.8C5.8 164.8 5 163.7 4.7 162.3L0 126.7L4.7 91.7C5 90.3 5.8 89.2 7.2 89.2S9.4 90.3 9.7 91.7L15.3 126.7L9.7 162.3C9.4 163.7 8.6 164.8 7.2 164.8zM30.8 186.7C29.4 186.7 28.3 185.6 28.3 184.2L21.9 126.7L28.3 70.6C28.3 68.9 29.4 67.8 30.8 67.8S33.3 68.9 33.6 70.3L40.8 126.6999999999999L33.6 184.1999999999999C33.3 185.5999999999999 32.2 186.6999999999999 30.8 186.6999999999999zM56.1 198.1C54.4 198.1 53 196.7 52.8 194.8L47 126.7L52.8 60.9C53.1 59.2 54.5 57.8 56.1 57.8C57.8 57.8 59.2 59.1999999999999 59.2 60.9L66.1 126.7L59.2 194.8C59.2 196.7 57.8 198.1 56.1 198.1zM81.4 200.3C79.5 200.3 77.8 198.9 77.8 196.7L72 126.7L77.8 58.9C77.8 56.7 79.5 55.3 81.4 55.3S85 56.6999999999999 85.3 58.9L91.7 126.7L85.3 196.7C85 198.9 83.3 200.3 81.4 200.3zM322.8 311.2C321.7 312 320 312.6 318.6 312.6C316.4000000000001 312.6 314.4000000000001 311.8 313 310.7C311.1 309 309.9 306.5 309.7 304V303.2L306.4 126.5L308.1 94L309.8 62.3C310.1 57.6 314 53.7 318.7 53.7S327.3 57.6 327.3 62.3L331.2 126.5L327.3 304C326.9 307 325.3 309.8 322.8 311.2zM296.1 295.9C294.7000000000001 296.7 293.3 297.3 291.7000000000001 297.3S288.6 296.7 287.3000000000001 295.9C285.1000000000001 294.5 283.7000000000001 292 283.7000000000001 289.2L283.4000000000001 287.5L280.6 126.7S280.6 126.4 283.7000000000001 61.1V60.8C283.7000000000001 59.1 284.3000000000001 57.5 285.4000000000001 56.1C287.1 54.2 289.3 53 291.8 53C294 53 296 54.1 297.4000000000001 55.5C299.1 56.9 299.9000000000001 58.8 299.9000000000001 61.1L300.2000000000001 67.8L303.3000000000001 126.4L300.0000000000001 289.2000000000001C299.7000000000001 292.0000000000001 298.3000000000001 294.5000000000001 296.1000000000001 295.9000000000001zM184.7 273.4C181.6 273.4 178.9 270.6 178.9 267.3L174.5 126.7L178.9 59.5C179.2 56.2 181.7 53.7 184.7 53.7C188 53.7 190.5 56.2 190.8 59.5L195.8 126.7L190.8 267.3C190.6 270.6 188.1 273.4 184.7 273.4zM561.4 210.6C550.6 210.6 540.3 208.4 530.8 204.5C524.4 275.3 464.9999999999999 330.9 392.5 330.9C374.7 330.9 357.5 327.6 342.2 321.5C336.0999999999999 319.3 334.3999999999999 317.1 334.3999999999999 312.3V62.6C334.3999999999999 57.6 338.2999999999999 54 343 53.4H561.3C604.5999999999999 53.4 639.9 88.4 639.9 131.7000000000001C640 175.3000000000001 604.6999999999999 210.6000000000001 561.4 210.6000000000001zM264.7 270.9C260.5 270.9 257.2 267.6 256.9 263.1L253.6 126.4L256.9 60.8C257.2 56.6 260.5 53.3 264.7 53.3C268.9 53.3 272.2 56.6 272.2 60.8L276.1 126.4L272.2 263.1C271.9 267.6 268.9 270.9 264.7 270.9zM211.1 278.7C207.8 278.7 204.7 275.6 204.7 272L200.8 126.7L204.7 59.8C205 56.1999999999999 207.8 53.4 211.1 53.4C214.7 53.4 217.5 56.2 217.8 59.8L222.2 126.6999999999999L217.8 272C217.5 275.5999999999999 214.7 278.7 211.1 278.7zM237.8 275.3C233.9 275.3 230.9 272.2 230.9 268.4L227 126.7L230.9 60.3C231.2 56.4 234 53.4 237.8 53.4S244.7 56.5 244.7 60.3L248.9 126.6999999999999L244.7 268.3999999999999C244.7 272.3 241.7 275.3 237.8 275.3z" />
-    <glyph glyph-name="speakap"
-      unicode="&#xF3F3;"
-      horiz-adv-x="448" d=" M352 416H96C43.2 416 0 372.8 0 320V64C0 11.2 43.2 -32 96 -32H352C404.8 -32 448 11.2 448 64V320C448 372.8 404.8 416 352 416zM221 65.1C181.4 65.1 139.1 82.9 139.1 118.8V146H179V128.2C179 113.1 198.5 103.7 220.9 103.7C245.1 103.7 262.2 114.1 262.2 133.2C262.2 157 235 165.1 207.5 175.8C175.6 188.2 144.4 202 144.4 244.9C144.4 292.9 183 311.3 224.3 311.3C261.9000000000001 311.3 299.8 297.2000000000001 299.8 269.4V238.2H259.9000000000001V254.3C259.9000000000001 266.4 242.1 272.8 224.3000000000001 272.8C204.8000000000001 272.8 188.7000000000001 264.7000000000001 188.7000000000001 246.6C188.7000000000001 224.5 211.2000000000001 217.4 235.7000000000001 207.7C271.6 195.3 306.8000000000001 180.5 306.8000000000001 136.2000000000001C306.9000000000001 87.6 266.0000000000001 65.1 221.0000000000001 65.1z" />
-    <glyph glyph-name="spotify"
-      unicode="&#xF1BC;"
-      horiz-adv-x="496" d=" M248 440C111.1 440 0 328.9 0 192S111.1 -56 248 -56S496 55.1 496 192S384.9 440 248 440zM348.7 75.1C344.5 75.1 341.9 76.4 338 78.7000000000001C275.6 116.3000000000001 203 117.9 131.3 103.2000000000001C127.4 102.2000000000001 122.3 100.6 119.4 100.6C109.7 100.6 103.6 108.3 103.6 116.4C103.6 126.7000000000001 109.7 131.6 117.2 133.2000000000001C199.1 151.3000000000001 282.8 149.7000000000001 354.2 107.0000000000001C360.3 103.1000000000001 363.9 99.6000000000001 363.9 90.5000000000001S356.8 75.1000000000001 348.7 75.1000000000001zM375.6 140.7000000000001C370.4 140.7000000000001 366.9 143.0000000000001 363.3 144.9C300.8 181.9 207.6 196.8000000000001 124.7 174.3C119.9 173 117.3 171.7 112.8 171.7C102.1 171.7 93.4 180.4 93.4 191.1S98.6 208.9 108.9 211.8C136.7 219.6 165.1 225.4 206.6999999999999 225.4C271.5999999999999 225.4 334.3 209.3 383.7 179.9C391.8 175.1 395 168.9 395 160.2C394.8999999999999 149.4 386.5 140.7 375.6 140.7zM406.6 216.9C401.4 216.9 398.2 218.2000000000001 393.7 220.8000000000001C322.5 263.3000000000001 195.2 273.5000000000001 112.8 250.5000000000001C109.2 249.5000000000001 104.7 247.9000000000001 99.9 247.9000000000001C86.7 247.9000000000001 76.6 258.2000000000001 76.6 271.5C76.6 285.1 85 292.8000000000001 94 295.4000000000001C129.2 305.7000000000001 168.6 310.6 211.5 310.6C284.5 310.6 361 295.4000000000001 416.9 262.8C424.7 258.3 429.8 252.1 429.8 240.2C429.8 226.6 418.8 216.9 406.6 216.9z" />
-    <glyph glyph-name="squarespace"
-      unicode="&#xF5BE;"
-      horiz-adv-x="512" d=" M186.12 104.66C176.47 95.0100000000001 176.47 79.37 186.12 69.72C195.77 60.0700000000001 211.41 60.0700000000001 221.06 69.72L378.24 226.9C397.5300000000001 246.19 428.81 246.19 448.1 226.9S467.39 176.33 448.1 157.04L293.95 2.9C313.22 -16.39 344.48 -16.41 363.77 2.86L363.81 2.9L483.06 122.14C521.65 160.73 521.65 223.28 483.06 261.86C444.4700000000001 300.45 381.91 300.45 343.3400000000001 261.86L186.12 104.66zM430.65 209.46C421 219.1100000000001 405.36 219.1100000000001 395.72 209.46L238.52 52.28C219.25 32.99 187.99 32.97 168.7 52.23L168.65 52.28C159.01 61.92 143.38 61.93 133.73 52.29L133.72 52.28C124.07 42.64 124.06 27 133.7 17.35L133.72 17.33C172.3 -21.24 234.86 -21.24 273.44 17.33L430.64 174.53C440.2899999999999 184.18 440.2899999999999 199.82 430.6499999999999 209.46zM168.66 122.1300000000001L325.84 279.3100000000001C335.48 288.9600000000001 335.48 304.6 325.84 314.2500000000001C316.2 323.8900000000001 300.57 323.8900000000001 290.93 314.2500000000001L133.72 157.07C114.44 137.78 83.16 137.77 63.87 157.06L63.86 157.07C44.57 176.35 44.55 207.61 63.83 226.91L63.86 226.94L218.03 381.11C198.75 400.4 167.48 400.41 148.18 381.13L148.16 381.11L28.93 261.86C-9.65 223.27 -9.65 160.72 28.93 122.14C67.53 83.55 130.06 83.55 168.66 122.13zM81.33 174.53C90.97 164.8900000000001 106.6 164.8900000000001 116.24 174.53L273.45 331.7200000000001C292.73 351.01 324 351.0200000000001 343.29 331.74L343.31 331.7200000000001C352.9599999999999 322.0700000000001 368.6 322.0700000000001 378.24 331.7200000000001C387.89 341.37 387.89 357.01 378.24 366.6500000000001C339.65 405.24 277.11 405.24 238.52 366.6500000000001L81.33 209.46C71.68 199.82 71.68 184.18 81.32 174.53H81.33z" />
-    <glyph glyph-name="stack-exchange"
-      unicode="&#xF18D;"
-      horiz-adv-x="448" d=" M17.7 115.7H430.4V93.7C430.4 56 401.1 25.7 365.1 25.7H346.1L259.3 -64V25.7H83C47 25.7 17.7 56 17.7 93.7V115.7zM17.7 139.3H430.4V224.3H17.7V139.3zM17.7 248.7H430.4V333.7000000000001H17.7V248.7zM365 448H83C47 448 17.7 417.7 17.7 380.3V358H430.4V380.3C430.3 417.7 401 448 365 448z" />
-    <glyph glyph-name="stack-overflow"
-      unicode="&#xF16C;"
-      horiz-adv-x="384" d=" M293.7 148L112.5 232.5L129.2 269L310.5 184.3L293.7 148zM341.7 224L188.2 352.3L162.7 321.5L316.2 193.2L341.7 224zM381.3 255.7L262 416L230 392L349.3 231.7L381.3 255.7zM290.7 137L95 178.3L86.8 139L282.5 98L290.7 137zM322.3 8H42.7V128H2.7V-32H362.2V128H322.2V8zM282.5 88H82.5V48.3H282.5V88z" />
-    <glyph glyph-name="staylinked"
-      unicode="&#xF3F5;"
-      horiz-adv-x="440" d=" M201.6 320.6C205.7 323.8 211.9 323.6 215.4 320.1L385.4 152.8L382.7 155.5L427 114.1999999999999C430.7 110.6999999999999 430.3 105.1999999999999 426.3 101.9999999999999L228.3 -61.9000000000001C218.4 -69.5000000000001 211 -62.7000000000001 211 -62.7000000000001L2.3 133.4C-1.2 136.9 -0.7 142.4 3.5 145.6L49.3 180.5C53.5 183.6999999999999 59.7 183.5 63.2 180L215.1 32.4999999999999C218.8 28.9999999999999 225.1 28.8 229.3 32.1L322.5 106.1C326.6 109.3 327 114.8 323.4 118.3L239.4 199.6C235.8 203.1 229.5 203.3 225.4 200.1L225.3 200C221.2 196.8 214.9 197 211.3 200.5L143.2 264.8C139.7 268.3 140.1 273.8 144.3 277L201.6 320.5999999999999M216.4 63.3C220.1 59.8 226.5 59.6 230.7 62.9L280.9 101.7L280.6 102L288.3 108C292.5 111.2 292.9 116.7 289.2 120.2L232.1 174.6C228.5 178.1 222.0999999999999 178.3 217.9 175.1L217.8 175C213.6 171.8 207.3 171.8999999999999 203.6 175.3999999999999L109 267.2C105.4 270.7 105.9 276.1 110.1 279.4L202.3 350.9C206.4 354.1 212.6 353.9 216.2 350.4L376.6 191.4C380.3 187.9 386.6 187.7 390.7000000000001 190.9L436.5000000000001 226.7C440.6000000000001 229.9 440.9000000000001 235.4 437.2000000000001 238.9L226.7 445.5C225.2 446.7 218.7 451 210.4 444.4L3.6 282.3C-0.6 279.1 -1.2 273.6 2.4 270.1L44.7 228.4000000000001" />
-    <glyph glyph-name="steam-square"
-      unicode="&#xF1B7;"
-      horiz-adv-x="448" d=" M185.2 91.5C192.9 110 184.2 131.2 165.6 138.9L136.1 151.1C147.5 155.4 160.4 155.6 172.5 150.6C184.7 145.5 194.1 136 199.2 123.9C204.2 111.7 204.2 98.3 199.1 86.2C188.6 61.1 159.7 49.2 134.5 59.7C122.9 64.5 114.1 73.3 109.1 83.9L137.6 72.1C156.2 64.3 177.5 72.9999999999999 185.2 91.4999999999999zM400 416H48C21.5 416 0 394.5 0 368V207.3L116.6 159.2C128.6 167.4 142.8 171.3 157.3 170.5L212.7 250.7V251.8C212.7 300 252 339.3 300.3 339.3S387.9 300 387.9 251.8C387.9 202.6 347 163.1 298.3 164.3L219.3 107.9999999999999C220.9 69.4999999999999 190.2 39.1999999999999 153.6 39.1999999999999C121.8 39.1999999999999 95.1 61.8999999999999 89.1 91.8999999999999L0 128.8V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM300.3 193.5C268.1 193.5 241.9 219.6 241.9 251.8S268.1 310.1 300.3 310.1S358.7 283.9000000000001 358.7 251.8S332.5 193.5 300.3 193.5zM300.4000000000001 208.1C324.6 208.1 344.3 227.7 344.3 251.9C344.3 276.1 324.7 295.7 300.4000000000001 295.7C276.2000000000001 295.7 256.5000000000001 276.1 256.5000000000001 251.9C256.5000000000001 227.7 276.2000000000001 208.1 300.4000000000001 208.1z" />
-    <glyph glyph-name="steam-symbol"
-      unicode="&#xF3F6;"
-      horiz-adv-x="448" d=" M395.5 270.5C395.5 236.7 368 209.5 334.5 209.5C300.7 209.5 273.5 236.8 273.5 270.5S300.8 331.5 334.5 331.5C368 331.5 395.5 304.3 395.5 270.5zM448 270.3C448 207.3 397 156.5 334.3 156.5L225 76.7C221 33.7 184.5 -0.1 140.5 -0.1C100 -0.1 65.8 28.7 57.5 66.9L0 90V197.3L97.2 158C112.3 167.2 129.4 171.3 149.2 169.5L220.2 271.2C220.7 333.5 271.7 384 334.2 384C397 384 448 333 448 270.3zM203 85C203 119.7 175.2 147.5 140.5 147.5C136 147.5 131.5 147 127 146L153 135.5C178.5 125.3 191 96.5 180.7 71C170.5 45.5 141.5 33 116 43.5C105.8 47.5 95.5 51.8 85.3 55.7C95.8 36 116.5 22.5 140.5 22.5C175.2 22.5 203 50.3 203 85zM410.5 270.3C410.5 312.3 376.2 346.5 334.3 346.5C292 346.5 257.8 312.3 257.8 270.3C257.8 228.1 292.1 194.1 334.3 194.1C376.2 194 410.5 228.0000000000001 410.5 270.3z" />
-    <glyph glyph-name="steam"
-      unicode="&#xF1B6;"
-      horiz-adv-x="496" d=" M496 192C496 55 384.8 -56 247.6 -56C133.8 -56 38 20.3 8.6 124.4L103.8 85.1C110.2 52.9999999999999 138.7 28.7 172.7 28.7C211.9 28.7 244.6 61.1 242.9 102.2L327.4 162.4C379.5 161.1 423.2 203.3 423.2 255.9C423.2 307.5 381.2 349.4 329.5 349.4S235.8 307.4 235.8 255.9V254.7L176.6 169C161.1 169.9 145.9 165.6 133.1 156.9L0 211.9C10.2 339.6 117.1 440 247.6 440C384.8 440 496 329 496 192zM155.7 63.7L125.2 76.3A52.79 52.79 0 0 1 152.4 50.5C179.3 39.3 210.2 52.1 221.4 78.9C226.8 91.9 226.9 106.2 221.5 119.2C216.1 132.2 206 142.4 193 147.8C180.1 153.2 166.3 153 154.1 148.4L185.6 135.4C205.4 127.2000000000001 214.8 104.5000000000001 206.5 84.7000000000001C198.2 64.8000000000001 175.5 55.5000000000001 155.7 63.7000000000001zM329.5 193.6C295.1 193.6 267.1 221.6 267.1 255.9S295.1 318.2 329.5 318.2S391.9 290.2 391.9 255.9S364 193.6 329.5 193.6zM329.6 209.2C355.5 209.2 376.5 230.2 376.5 256C376.5 281.9 355.5 302.8 329.6 302.8S282.7000000000001 281.8 282.7000000000001 256C282.8000000000001 230.2 303.8000000000001 209.2 329.6 209.2z" />
-    <glyph glyph-name="sticker-mule"
-      unicode="&#xF3F7;"
-      horiz-adv-x="576" d=" M353.1 -61.8C347.2000000000001 -64.7 321 -65 316.6 -61.3C312.5 -58.3 314.4000000000001 -49.4 315.1 -46.3C317.3 -31.3 312.6 -38.4 305.3 -34.8C302.2 -33.3 301.2 -29.3 300.7 -24.8C300.2 -23.3 299.7 -22.3 299.2 -21.3C297.5 -10.6 306 12.3 307.4 22.1C312.3 45.8 306.7 59.3 308.9 68.9999999999999C312.6 85.1999999999999 313 72.4999999999999 313 98.8999999999999C311.6 124.7999999999999 316.3 135.7999999999999 313.5 137.7999999999999C298.7 137.7999999999999 249.2 127.0999999999999 201.3 135.7999999999999C155.2 144.6999999999999 141.9 164.7999999999999 135.9 166.6999999999999C125.6 171.1999999999999 112.7 166.1999999999999 108.6 159.6999999999999C108.5 159.5999999999999 73.6 89.0999999999999 69 71.8999999999999C62.8 51.3999999999999 68.5 24.4999999999999 73.1 5.0999999999999C73.1 4.9999999999998 77.6 -9.5000000000002 83.4 -14.4000000000001C85.5 -15.9000000000001 88.5 -16.9000000000001 90.6 -18.9000000000001C93.4 -21.6000000000001 100 -34.1000000000001 100.4 -34.9000000000001C103 -39.4000000000001 104 -42.9000000000001 98.9 -45.4000000000001C95.3 -47.4000000000001 89.6 -47.9000000000001 84.5 -47.9000000000001C81.9 -48.4000000000001 83 -51.4000000000001 81.4 -52.9000000000001C78.5 -55.7000000000002 60.7 -59.0000000000002 51.5 -55.4000000000001C48.9 -54.4000000000001 45.8 -52.4000000000001 45.3 -50.4000000000001C43.8 -46.4000000000001 47.4 -41.4000000000001 44.3 -37.9000000000001C39.8 -35.0000000000002 31.2 -35.9000000000001 27.3 -25.9000000000001C25.1 -20.5000000000002 24.7 -18.3000000000001 24.7 23.4999999999998C24.7 33.1999999999998 18.8 62.1999999999998 16.5 70.3999999999998C15 75.8999999999998 15 81.8999999999998 16.5 86.3999999999998C16.8 87.2999999999998 20.6 90.9999999999998 20.6 99.3999999999998C19.6 100.8999999999998 16 99.8999999999998 15.5 100.8999999999998C5.1 181.4999999999998 9.6 179.8999999999998 7.8 199.1999999999998C6.3 215.1999999999998 -3.1 243.0999999999998 1.1 263.4999999999999C1.6 265.8999999999999 4.5 284.4999999999999 25.3 302.3999999999999C56.3 329.0999999999999 73.7 340.6999999999998 184.3 313.8999999999999C185.4 313.4999999999999 250.6 292.7999999999999 295 322.8999999999999C310.5 334.1999999999998 323.8 334.1999999999998 330.5 338.8999999999999C330.6 338.9999999999999 392.2 390.9999999999999 417.5 404.1999999999998C464.7 433.5999999999999 487.4 420.8999999999998 492.6 422.1999999999998C497.3 423.1999999999998 506 447.9999999999999 509.6 447.9999999999999C515.1 447.9999999999999 511.2 427.7999999999999 513.2 422.0999999999999C513.7 420.0999999999999 516.8000000000001 417.0999999999999 519.4000000000001 417.0999999999999C521.7 417.0999999999999 521.1000000000001 417.8999999999999 529.7 422.0999999999999C538.1 427.4999999999999 544.6 439.6999999999998 550.3000000000001 439.0999999999999C562.0000000000001 437.4999999999999 531.3000000000001 397.4999999999999 531.3000000000001 392.1999999999998C531.3000000000001 390.1999999999998 531.5000000000001 391.3999999999999 535.9000000000001 382.6999999999998C538.5000000000001 377.1999999999998 540.5000000000001 369.1999999999998 542.1000000000001 362.6999999999998C550.4000000000001 332.9999999999999 547.8000000000002 348.0999999999999 555.5000000000001 325.7999999999999C575.7000000000002 275.6999999999998 576.1000000000001 280.5999999999999 576.1000000000001 272.8999999999999C576.1000000000001 265.3999999999999 572.0000000000001 261.8999999999999 568.9000000000001 256.3999999999999C567.4000000000001 253.3999999999999 564.3000000000001 248.8999999999999 561.7 248.3999999999999C559 247.6999999999999 568.7 249.8999999999999 548.3000000000001 245.8999999999999C541.1 244.8999999999999 534.9000000000001 250.3999999999999 533.4000000000001 255.3999999999999C531.8000000000001 260.0999999999998 536.2 265.4999999999999 521.6000000000001 278.2999999999999C511.3000000000001 288.2999999999999 500.5000000000001 289.5999999999999 489.7000000000002 295.2999999999999C479.9000000000001 300.9999999999999 477.8000000000002 294.2999999999999 471.7000000000002 287.2999999999999C453.7000000000002 264.3999999999999 437.7000000000002 240.3999999999999 419.7000000000002 217.4999999999998C407.9000000000002 202.4999999999998 395.5000000000002 187.0999999999999 386.2000000000002 170.0999999999999C382.3000000000002 163.2999999999999 376.7000000000002 141.9999999999998 375.9000000000002 140.1999999999999C369.7000000000002 122.4999999999999 370.4000000000002 114.3999999999999 359.4000000000002 71.8999999999999C356.3000000000002 61.8999999999999 353.7000000000002 50.4999999999999 350.7000000000002 39.4999999999999C348.5000000000002 32.6999999999999 343.3000000000002 -9.8000000000001 350.2000000000002 -19.9000000000001C352.3000000000002 -23.4000000000001 358.9000000000002 -24.4000000000001 361.5000000000002 -27.9000000000001C361.6000000000002 -28.0000000000001 371.1000000000002 -46.1000000000001 370.8000000000002 -47.9000000000001C370.8000000000002 -54.0000000000001 361.4000000000002 -53.5000000000001 359.5000000000002 -54.4000000000001C354.7000000000002 -57.3000000000001 355.7000000000002 -60.3000000000001 353.1000000000002 -61.8000000000001" />
-    <glyph glyph-name="strava"
-      unicode="&#xF428;"
-      horiz-adv-x="369.2" d=" M301.6 156L257.7000000000001 67.8L213.1000000000001 156H145.5000000000001L257.7000000000001 -64L369.2000000000001 156H301.6zM151.4 448L0 156H89.2L151.4 272.1L213.1 156H301.6L151.4 448z" />
-    <glyph glyph-name="stripe-s"
-      unicode="&#xF42A;"
-      horiz-adv-x="362.3" d=" M144.3 293.4C144.3 315.7000000000001 162.9 324.3 192.7 324.3C236.1 324.3 291.2000000000001 311 334.6 287.6V421.9C287.3 440.8 240.1 448 192.8 448C77.1 448 0 387.6 0 286.6C0 128.7 216.8 154.3 216.8 86.2C216.8 59.8 193.9 51.3 162.1 51.3C114.9 51.3 53.9 70.8 6 96.8V-31.7C59 -54.5 112.8 -64.1 162 -64.1C280.6 -64.1 362.3000000000001 -13.1 362.3000000000001 89.5C362.3000000000001 259.7 144.3000000000001 229.2 144.3000000000001 293.4" />
-    <glyph glyph-name="stripe"
-      unicode="&#xF429;"
-      horiz-adv-x="640" d=" M640 186.4C640 231.9 618 267.8 575.8 267.8S507.9 231.9 507.9 186.7C507.9 133.2 538.1999999999999 108.5 581.4 108.5C602.6 108.5 618.5 113.3 630.6 120V153.4C618.5 147.3 604.6 143.6 587 143.6C569.7 143.6 554.5 149.7 552.5 170.5H639.4C639.6 172.8 640 182.1 640 186.3999999999999M552.1 203.1999999999999C552.1 223.1999999999999 564.4 231.6 575.5 231.6C586.4 231.6 598 223.1999999999999 598 203.1999999999999H552.1zM439.2000000000001 267.8C421.8000000000001 267.8 410.6 259.5999999999999 404.4000000000001 253.8999999999999L402.1 264.8999999999999H363V60.0999999999999L407.4 69.4999999999999L407.5 119.6999999999999C413.9 114.9999999999999 423.4 108.4999999999999 438.9 108.4999999999999C470.7 108.4999999999999 499.7 131.6999999999999 499.7 188.0999999999999C499.8 239.6999999999999 470.4 267.7999999999999 439.2 267.7999999999999M428.6 145.2999999999999C418.2 145.2999999999999 412 149.0999999999999 407.7 153.6999999999999L407.4 219.6999999999999C412 224.7999999999999 418.4 228.4999999999999 428.6 228.4999999999999C444.8 228.4999999999999 455.9999999999999 210.2999999999999 455.9999999999999 187.0999999999999C456.1 163.1999999999999 445.1 145.2999999999999 428.6 145.2999999999999M346.4 324V287.8L301.8 278.3V314.5L346.4 324M301.9 264.8H346.5V111.6H301.9V264.8zM254.1 251.7C264.5 270.8 285.2 266.9 291.2 264.8V224C285.5 225.8 267.8 228.5 257.3 214.7V111.6H213V264.8H251.4L254.1 251.7M165.1 264.8H198.8V227H165.1V163.8C165.1 137.6 193.1 145.8 198.8 148.1V114.3C192.9 111.1 182.2 108.4 167.6 108.4C141.3 108.4 121.5 125.4 121.5 151.7000000000001L121.7 294.1L165 303.3000000000001L165.1 264.8000000000001zM44.9 219.7C44.9 199.7 112.8 209.2 112.8 156.3C112.8 124.3 87.4 108.5 50.5 108.5C35.2 108.5 18.5 111.5 2 118.6V158.6C16.9 150.5 35.9 144.4 50.6 144.4C60.5 144.4 67.6 147.1 67.6 155.3C67.6 176.5 0.1 168.5 0.1 217.7C0.1 249.1 24.1 267.9000000000001 60.1 267.9000000000001C74.8 267.9000000000001 89.5 265.6 104.2 259.8000000000001V218C90.7 225.3 73.5 229.4 60 229.4C50.7 229.3 44.9 226.6 44.9 219.7" />
-    <glyph glyph-name="studiovinari"
-      unicode="&#xF3F8;"
-      horiz-adv-x="512" d=" M480.3 260.3L484.5 232.3V204.3L459.4 160.2L419.6 81.8L363.5 14.3L284.4 -23.5000000000001L266.7 -48.0000000000001L259 -60.0000000000001L249.4 -64S266.7 -0.4 268.8 -0.4C270.9000000000001 -0.4 289.1 -1.1 289.1 -1.1L355.8 37.5000000000001L263.3 11.4L207.4 -25.4L184.6 -53.4L178 -54.8L198.8 18.8000000000001L205.7 24.3000000000001L226.4 11.4000000000001L314.7 56.6000000000001L371.5 108.1000000000001L386.3 176.5000000000001L260.9 153.2000000000001L276.1 171.4000000000001L102.7 224.7000000000001L184.6 235.2000000000001L18.6 358.1000000000002L133.5 340L32.2 448L285.1 321.4L253.6 359.4L378 285L234.7 384L253.4 345.6L203.8 363.7L158.3 448L352.9 326L310 381.8L418 285.4L430 294.3L409 310.7L413.2 348.5L451 358.9L480.2 334.2L491.7 330L484.7 323.8L493.2 311.8L480.1 304.4L469.8 284.2000000000001L480.3 260.3z" />
-    <glyph glyph-name="stumbleupon-circle"
-      unicode="&#xF1A3;"
-      horiz-adv-x="496" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM256 262.5C246.2 262.5 238.2 254.5 238.2 244.7V137.8C238.2 96.9 204.3 63.9 163.3 63.9C121.9 63.9 88.4 97.4 88.4 138.8V185.3H145.7V139.5C145.7 129.5 153.7 121.6999999999999 163.5 121.6999999999999S181.3 129.5999999999999 181.3 139.5V247.9C181.3 287.9 215.5 320 256 320C296.7 320 330.7 287.7 330.7 247.4V223.7L296.6 213.6L273.7 224.3V244.9C273.8 254.5 265.8 262.5 256 262.5zM423.6 138.9C423.6 97.5 390.1 64 348.7000000000001 64C307.5000000000001 64 273.8000000000001 97.2 273.8000000000001 138.2V185L296.7000000000001 174.3L330.8000000000001 184.4V137.3C330.8000000000001 127.5 338.8000000000001 119.7 348.6000000000001 119.7S366.4000000000001 127.6 366.4000000000001 137.3V185.3H423.7000000000001C423.6000000000001 139.4 423.6000000000001 138.9 423.6000000000001 138.9z" />
-    <glyph glyph-name="stumbleupon"
-      unicode="&#xF1A4;"
-      horiz-adv-x="512" d=" M502.9 182V112.3C502.9 50.2 452.6 -0.1 390.5 -0.1C328.7 -0.1 278.1 49.7 278.1 111.2V181.4L312.4000000000001 165.4L363.5000000000001 180.6V110C363.5000000000001 95.3 375.5000000000001 83.5 390.2000000000001 83.5S417 95.3 417 110V182H502.9zM278.2 240.2L312.5 224.2L363.6 239.4V275C363.6 335.5 312.5 384 251.5000000000001 384C190.7000000000001 384 139.4 335.8 139.4 275.8V113.4C139.4 98.5 127.4 86.7 112.7 86.7S86 98.5 86 113.4V182H0V112.3C0 50.3 50.3 0 112.4 0C174 0 224.8 49.5 224.8 110.8V271.1C224.8 285.8 236.8 297.8 251.5 297.8S278.2 285.8 278.2 271.1V240.2z" />
-    <glyph glyph-name="superpowers"
-      unicode="&#xF2DD;"
-      horiz-adv-x="448" d=" M448 416C364.7 405 281.2 394 198 383C106 370.5 34.7 296.3 29 203C25.7 147.5 47 93.5 86.8 54.8L0 -32C83.3 -21 166.5 -10 249.8 1C341.6 13.5 413.1 87.8 418.5 180.8C422 236.3 400.5 290.3 360.8 329L448 416zM368.3 183.7C364.1 104.2 294.3 44.5 215.5 49.2C136 53.9 74.8 120.2 79.2 200.2C83.7 279.4 153.5 339.5 232.2 334.7C311.5 330 372.7 263.7 368.3 183.7z" />
-    <glyph glyph-name="supple"
-      unicode="&#xF3F9;"
-      horiz-adv-x="640" d=" M640 185.5C640 121.4 531 69.4 396.5 69.4C371.7 69.4 347.9 71.2 325.4 74.4C333.1 74 340.9 73.8 348.8 73.8C483.3 73.8 592.3 130.6999999999999 592.3 200.9C592.3 230.3 573.1999999999999 257.3 541.0999999999999 278.9C601.0999999999999 257.8 639.9999999999999 223.8 639.9999999999999 185.5zM47.7 220.1C47.6 290.3 156.5 347.4 291 347.7C298.9 347.7 306.6 347.5 314.3 347.2C291.8 350.4 268 352.1 243.3 352.1C108.8 351.7 -0.1 299.5 0 235.4C0.1 197.1 39.1 163.1 99.3 142.1C67 163.6 47.8 190.7000000000001 47.7 220.1zM107.9 180.2S118.4 167 137.2 167C155.1 167 165.6 178.5 165.6 192.1C165.6 220.1 125.4 217.2 125.4 231.8C125.4 237.2 130.7 240.9 137.9 240.9C143.6 240.9 149.2000000000001 238.3 149.2000000000001 234.3V230.4H163.4V238.3C163.4 250.4 148 255.1 138 255.1C121.5 255.1 109.5 244.9000000000001 109.5 231.0000000000001C109.5 204.4 149.7000000000001 205.6 149.7000000000001 191.1C149.7000000000001 184.5 143.9 181 137.4 181C125.5 181 116.7 191.1 116.7 191.1L107.9 180.2000000000001zM228.7 253.8V199.4C228.7 188.1 221.6 181.6 210.9 181.6C200.2 181.6 193.1 188.1 193.1 199.3V253.8H177.3V198.8C177.3 179.9 190.7 166.9 211 166.9C231.1 166.9 244.4 179.9 244.4 198.8V253.8H228.7zM263.1 168.4H278.9V197.9H294.4C310.4 197.9 321.6 209.4 321.6 226S310.4 253.8 294.4 253.8H255.3V240.4H263.1V168.4zM278.9 211.4V240.5H291.8C300.5 240.5 305.5 234.8 305.5 226.1C305.5 217.2 300.3999999999999 211.4 291.5 211.4H278.8999999999999zM335.9 168.4H351.7V197.9H367.2C383.2 197.9 394.4 209.4 394.4 226S383.2 253.8 367.2 253.8H328.1V240.4H335.9V168.4zM351.6 211.4V240.5H364.5C373.2 240.5 378.2 234.8 378.2 226.1C378.2 217.2 373.2 211.4 364.2 211.4H351.5999999999999zM408.7 176.6C408.7 170.8 411.1 168.4 416.9 168.4H454.5C460.3 168.4 462.7 170.8 462.7 176.6V189.6H448.4V184.4C448.4 182.7 447.4 181.8 445.8 181.8H427.2C425.5 181.8 424.5999999999999 182.8 424.5999999999999 184.4V245.6C424.5999999999999 251.3 422.2 253.8 416.3999999999999 253.8H401V240.4H406.2C407.9 240.4 408.8 239.4 408.8 237.8V176.6zM472.1 176.6C472.1 170.8 474.4999999999999 168.4 480.3 168.4H519C524.7 168.4 527.2 170.8 527.2 176.6V189.6H512.9000000000001V184.4C512.9000000000001 182.7 511.9000000000001 181.8 510.3000000000001 181.8H490.6000000000001C488.9000000000001 181.8 488.0000000000001 182.8 488.0000000000001 184.4V204.7H515.7V218.1H488V240.5H507.2C508.9 240.5 509.8 239.5 509.8 237.9V232.7H524V245.7C524 251.4 521.5 253.9 515.8 253.9H464.1999999999999V240.5H471.9999999999999V176.6zM531 252.6V246.7H532.6V252.6H535.3000000000001V253.8H528.3000000000001V252.6H531.0000000000001zM536.7 253.8V246.7H538.2V252.4L540.5 246.7H541.8L544.0999999999999 252.4V246.7H545.5999999999999V253.8H543.3L541.1999999999999 248.7L539.0999999999999 253.8H536.6999999999999z" />
-    <glyph glyph-name="teamspeak"
-      unicode="&#xF4F9;"
-      horiz-adv-x="511.8" d=" M0.82 210.18C3.18 225.7 11.51 237.22 25.7 244.21C29.2 246.06 31.35 247.71 32.07 252.02C38.24 285.43 51.6 315.9600000000001 71.44 343.61C73.8 346.8 75.45 348.9600000000001 72.47 352.9600000000001C68.77 358.31 71.44 363.14 75.45 367.45C103.51 399.32 137.33 422.55 177.43 434.89C273.24 464.29 357.53 444.24 429.8 374.44C436.48 368.07 445.32 361.5900000000001 436.79 350.08C435.4500000000001 348.23 437.82 346.58 438.9500000000001 345.04C459.6100000000001 316.98 473.1800000000001 285.62 479.35 251.39C480.17 247.69 482.33 246.35 485.21 245.02C502.58 236.18 510.91 221.68 511.22 202.77C511.22 185.6 513.07 168.23 510.1900000000001 151.06C506.1800000000001 126.39 481.0000000000001 109.32 456.9400000000001 114.36C449.7400000000001 116 447.5900000000001 121.56 447.5900000000001 128.55C447.5900000000001 156.61 448.4100000000001 184.99 447.5900000000001 213.15C445.74 288.9100000000001 411.4100000000001 345.9600000000001 345.3100000000001 382.56C234.28 443.02 92.11 375.58 67.54 251.09C61.48 220.67 65.8 202.82 63.84 125.27C63.53 118.07 59.52 114.07 51.81 113.76C20.97 112.42 0 131.95 0 162.79V183.66M221.74 76.85C233.56 81.17 241.79 88.67 244.25 101.21C246.61 113.55 232.22 131.23 211.87 149.9400000000001C191 169.1600000000001 163.65 189.0000000000001 148.44 196.5100000000001C126.75 208.5400000000001 106.7 198.3600000000001 102.18 173.7900000000001C97.14 147.5800000000001 102.18 122.3900000000001 116.67 99.8800000000001C126.85 84.3600000000001 142.06 77.1600000000001 160.05 75.8300000000001C171.67 75.2100000000001 212.59 73.6700000000001 221.74 76.8500000000001M351.5700000000001 71.3000000000001C388.0700000000001 68.4900000000001 410.9000000000001 99.8500000000001 409.9600000000001 131.7500000000001C407.8200000000001 176.9200000000001 343.79 148.2300000000001 322.17 139.7700000000001C249.01 111.6300000000001 277.12 84.85 299.9700000000001 79.02M449.23 80.35C446.25 82.71 442.0300000000001 81.38 440.9000000000001 77.99C432.8800000000001 52.6 396.1800000000001 -34.47 268.8200000000001 -43.52C119.1500000000001 -54.01 349.1100000000001 -87.11 414.1800000000001 -37.15C436.9000000000001 -19.78 461.7800000000001 -2.1 460.7500000000001 48.28C460.4300000000001 58.35 455.9100000000001 75 449.2300000000001 80.35" />
-    <glyph glyph-name="telegram-plane"
-      unicode="&#xF3FE;"
-      horiz-adv-x="448" d=" M446.7 349.4L379.1 30.6C374 8.1 360.7000000000001 2.5 341.8 13.1L238.8 89L189.1 41.2C183.6 35.7 179 31.1 168.4 31.1L175.8000000000001 136L366.7000000000001 308.5C375.0000000000001 315.9 364.9000000000001 320 353.8000000000001 312.6L117.8 164L16.2 195.8C-5.9 202.7 -6.3 217.9 20.8 228.5L418.2 381.6C436.6 388.5 452.7 377.5 446.7 349.4z" />
-    <glyph glyph-name="telegram"
-      unicode="&#xF2C6;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM369.8 270.1L329.1 78.3C326.1 64.6999999999999 318 61.4 306.7000000000001 67.8L244.7000000000001 113.5L214.8000000000001 84.6999999999999C211.5 81.3999999999999 208.7000000000001 78.5999999999999 202.3000000000001 78.5999999999999L206.7000000000001 141.6999999999999L321.6 245.5C326.6 249.9 320.5 252.4 313.9000000000001 248L171.9 158.5999999999999L110.7 177.6999999999999C97.4 181.8999999999999 97.1 191 113.5 197.3999999999999L352.6 289.5999999999999C363.7000000000001 293.5999999999999 373.4000000000001 286.8999999999999 369.8 270.0999999999999z" />
-    <glyph glyph-name="tencent-weibo"
-      unicode="&#xF1D5;"
-      horiz-adv-x="384" d=" M72.3 -47.8C73.7 -67.7 44.7 -70 42.6 -50.7C31 79.2 73.7 188.8 144 262.5C128.4 296.5 153.2 339.6 194.6 339.6C224.9 339.6 249.7 315 249.7 284.5C249.7 240.5 200.2 213.7 162.8 239.4C97.1 168.1 61.4 69.6 72.3 -47.8zM192 447.9C66.1 447.9 -12.3 313.7 43.7 205.6C52.4 188.2 79 201.1 70 219C23.7 311.6 91 418.2 192 418.2C267.4 418.2 328.9 356.8 328.9 281.3C328.9 190.5 242 127.4 161.2 148.2C142.1 152.3 135.6 123.8 154.6 119.1C265.3 95.9 358.6 179.1 358.6 281.4C358.6 373.3 284 447.9 192 447.9z" />
-    <glyph glyph-name="themeco"
-      unicode="&#xF5C6;"
-      horiz-adv-x="441.03" d=" M199.74 435.71C209.48 441.35 225.33 441.44 235.13 435.92L423.26 329.9700000000001C433.07 324.45 441.02 310.83 441.02 299.5900000000001V85.72C441.02 74.46 433.09 60.83 423.31 55.2600000000001L235.09 -51.88C225.31 -57.45 209.51 -57.36 199.8 -51.67L17.58 55.05C7.87 60.74 0 74.48 0 85.73V299.5900000000001C0 310.85 7.9 324.55 17.63 330.18L199.74 435.71zM123.54 239C107.85 239 92.15 238.86 76.46 238.86V138.99H95.29V168.38H123.54C172.48 168.38 172.33 239 123.54 239zM261.5 140.27L231.25 174.37C267.65 181.76 265.51 238.58 220.55 238.86C204.71 238.86 188.88 239 173.04 239V138.99H191.87V172.37H210L239.1 138.99H261.5V140.27zM220.56 221.31C243.54 221.31 243.46 189.35 220.56 189.35H191.88V221.31H220.56zM126.49 222.88C147.34 222.88 147.27 184.64 126.49 184.64H94.68V222.87L126.49 222.88zM316.14 240.85C248.74 240.85 246.28 136.7 316.14 136.7C384.53 136.71 384.47 240.85 316.14 240.85zM316.14 223.73C359.57 223.73 360.24 153.97 316.14 153.97C272.02 153.97 272.4 223.73 316.14 223.73z" />
-    <glyph glyph-name="themeisle"
-      unicode="&#xF2B2;"
-      horiz-adv-x="512" d=" M208 359.714C208 369.714 214.286 381.428 225.715 381.428C236.857 381.428 243.429 369.714 243.429 359.714C243.429 349.429 236.857 338 225.715 338C214.286 338 208 349.429 208 359.714zM512 199.714C512 163.713 500.571 97.428 475.714 70C452.856 45.142 388.286 8.857 354.857 -0.572L353.714 -0.858V-33.429C353.714 -49.715 341.142 -64 324.5710000000001 -64C314.5710000000001 -64 305.1420000000001 -58.286 299.999 -49.714C294.572 -58.286 285.1430000000001 -64 275.1430000000001 -64C265.1430000000001 -64 255.7140000000001 -58.286 250.2850000000001 -49.714C245.1430000000001 -58.286 235.7140000000001 -64 225.7150000000001 -64C215.429 -64 206.286 -58.286 200.857 -49.714C195.714 -58.286 186.286 -64 176.286 -64C157.429 -64 146.857 -48.286 146.857 -31.143C130.571 -43.4280000000001 111.142 -50.571 90.286 -50.571C68.286 -50.571 46.857 -42.286 30 -27.7140000000001C40.285 -27.4280000000001 50.571 -25.4280000000001 60.285 -22.0000000000001C39.428 -16.2860000000001 20.857 -3.143 8.285 14.2859999999999C29.655 9.641 54.494 12.6129999999999 75.428 25.429C53.428 47.429 18.857 84.286 6.856 112.857C1.143 126.286 0 144.286 0 158.571C0 208.285 20.286 318.5710000000001 86.286 318.5710000000001C96.857 318.5710000000001 105.143 313.713 109.429 303.7140000000001A158.792 158.792 0 0 0 121.429 319.1420000000001C123.429 321.7140000000001 127.143 324.5710000000001 128.572 327.428C136.571 339.999 140.286 348.5700000000001 150.286 361.428C182.571 402.572 232 430.857 285.143 430.857C291.143 430.857 297.143 430.572 302.857 429.714C313.714 441.429 328.8570000000001 448 344.572 448C359.1430000000001 448 374.286 442 384.572 431.714C385.4290000000001 430.856 386 429.428 386 428.286C386 424.572 375.715 414.857 373.1430000000001 412C377.4290000000001 410.5710000000001 388.8570000000001 405.142 388.8570000000001 400C388.8570000000001 397.1430000000001 386 394.857 384.286 392.857C415.715 365.1430000000001 433.7150000000001 325.714 440.572 284.857C444.858 290 450.857 293.429 457.715 293.429C468.2860000000001 293.429 478.572 286.285 486.2860000000001 279.428C507.143 260.857 512 226.286 512 199.714zM188 358.572C188 340.286 200.571 321.429 220.286 321.429C240 321.429 252.571 340.286 252.571 358.572C252.571 376.572 240 395.429 220.286 395.429C200.571 395.429 188 376.5710000000001 188 358.572zM237.714 254C237.714 273.714 241.428 293.1430000000001 246.285 312.286C194.246 232.752 232.754 127.715 315.1430000000001 127.715C336.5710000000001 127.715 357.7140000000001 135.429 375.1430000000001 147.715C377.1430000000001 155.144 378.8570000000001 162.572 378.8570000000001 170.287C378.8570000000001 184.573 372.5710000000001 191.715 358.2850000000001 191.715C353.714 191.715 349.1420000000001 190.858 344.8560000000001 190.001C281.5130000000001 177.333 237.7140000000001 186.3320000000001 237.7140000000001 254.0000000000001zM196.572 -0.858C196.572 10.285 187.714 19.999 176.286 19.999C164.857 19.999 156.286 10.284 156.286 -0.8579999999999V-33.429C156.286 -44.572 164.857 -54.571 176.286 -54.571C187.714 -54.571 196.572 -44.856 196.572 -33.429V-0.8579999999999zM245.715 -0.858C245.715 10.285 237.143 19.999 225.715 19.999C214.286 19.999 205.429 10.284 205.429 -0.8579999999999V-33.429C205.429 -44.572 214.286 -54.571 225.715 -54.571C237.143 -54.571 245.715 -44.571 245.715 -33.429V-0.8579999999999zM295.428 -0.858C295.428 10.285 286.5710000000001 19.999 275.143 19.999C263.714 19.999 254.857 10.284 254.857 -0.8579999999999V-33.429C254.857 -44.572 263.714 -54.571 275.143 -54.571C286.571 -54.571 295.428 -44.856 295.428 -33.429V-0.8579999999999zM345.1430000000001 -0.858C345.1430000000001 10.285 336.2860000000001 19.999 324.8570000000001 19.999C313.4290000000001 19.999 304.5710000000001 10.284 304.5710000000001 -0.8579999999999V-33.429C304.5710000000001 -44.572 313.4290000000001 -54.571 324.8570000000001 -54.571C336.286 -54.571 345.1430000000001 -44.571 345.1430000000001 -33.429V-0.8579999999999zM421.714 162C390.857 102.858 331.429 59.428 263.1430000000001 59.428C166.572 59.428 102.572 144 102.572 236C102.572 252.857 104.572 269.429 108.572 285.714C88.572 251.999 78.858 213.142 78.858 174.285C78.858 113.999 103.715 52.5699999999999 150.287 13.428C155.43 23.142 165.144 29.714 176.287 29.714C186.287 29.714 195.715 24 200.858 15.428C206.287 23.999 215.429 29.714 225.7160000000001 29.714C235.7160000000001 29.714 245.1440000000001 24 250.2870000000001 15.428C255.7160000000001 23.999 265.144 29.714 275.1450000000001 29.714C285.1450000000001 29.714 294.5730000000001 24 300.0020000000001 15.428C305.1450000000001 23.999 314.5730000000001 29.714 324.5740000000001 29.714C335.4310000000001 29.714 345.4310000000001 23.142 350.2880000000001 13.714C393.7150000000001 50 418.8570000000001 105.714 421.7140000000001 162zM432.286 261.714C432.286 315.428 397.7150000000001 367.428 339.714 367.428C309.429 367.428 281.1430000000001 352.285 260.857 330.5710000000001C240.862 264.188 233.41 194 302.286 194C331.091 194 399.6430000000001 222.538 386.572 157.143C415.429 183.143 432.286 222.857 432.286 261.7140000000001z" />
-    <glyph glyph-name="trade-federation"
-      unicode="&#xF513;"
-      horiz-adv-x="496" d=" M202.45 339.58V257.9700000000001H38.94L87.16 196.06H201.89V-0.69H266.5V195.04H349.77V257.73H266.59V276.9H412.21V339.5800000000001H202.45zM207.31 333.58H405.0800000000001V282.9H259.44V251.97H342.62V201.04H259.36V5.31H206.63V202.06H89.86L49.91 251.97H207.31V333.58zM247.99 439.2C111.03 439.2 0 328.17 0 191.2S111.03 -56.8 247.99 -56.8S496 54.24 496 191.2S384.96 439.2 247.99 439.2zM248.01 425.96C377.67 425.96 482.77 320.8400000000001 482.77 191.18S377.67 -43.58 248.01 -43.58S13.23 61.53 13.23 191.19S118.35 425.96 248.01 425.96zM248.01 418.07C122.71 418.07 21.12 316.5 21.12 191.2S122.71 -35.69 248.01 -35.69S474.88 65.9 474.88 191.2S373.31 418.07 248.01 418.07zM247.99 404.77C365.94 404.77 461.55 309.15 461.55 191.21S365.93 -22.35 247.99 -22.35S34.43 73.25 34.43 191.2S130.04 404.77 247.99 404.77zM174.67 299.9700000000001L190.33 281.92L168.17 291.37L155.84 270.9L157.99 294.89L134.71 300.29L158.19 305.66L156.13 329.4700000000001L168.5 308.8L190.51 318.12L174.67 299.9700000000001zM127.53 346.51L135.54 334.11L148.23 339.97L138.91 328.52L148.41 318.27L134.64 323.59L127.82 311.39L128.63 326.13L114.92 328.84L129.19 332.62L127.53 346.51zM378.3 270.92L390.29 251.36L411.17 260.47L396.2700000000001 243.02L411.3800000000001 225.98L390.1800000000001 234.76L378.6400000000001 215.12L380.4400000000001 237.99L358.2000000000001 242.89L380.5100000000001 248.2500000000001L378.3000000000001 270.92zM271.25 172.47L285.11 175.69L283.8300000000001 189.86L291.1800000000001 177.68L304.2600000000001 183.27L294.9500000000001 172.52L304.3100000000001 161.81L291.2100000000001 167.35L283.92 155.1400000000001L285.1400000000001 169.3100000000001L271.2500000000001 172.4700000000001zM145.82 165.97L169.55 169.84L167.82 194.37L178.83 172.99L201.62 182.21L184.69 165.13L200.5 146.3L179.03 157.12L166.01 136.26L169.67 160.03L145.82 165.97zM209.26 331.63V250.02H54.16L90.88 204.01H208.58V7.26H257.4V202.99H340.67V250.02H257.4V284.85H403.13V331.63H209.26zM220.12 320.43H391.92V296.07H246.88V239.84H329.81V215.9H246.88V18.48H220.12V215.9H96.31L76.22 239.84H220.12V320.43z" />
-    <glyph glyph-name="trello"
-      unicode="&#xF181;"
-      horiz-adv-x="448" d=" M392 416H56C25.1 416 0 390.9 0 360V24C0 -6.9 25.1 -32 56 -32H392C422.9 -32 448 -6.9 448 24V360C448 390.9 422.9 416 392 416zM194.9 76.6C194.9 61.8 182.9 49.7 168 49.7H85.1C70.3 49.7 58.2 61.7000000000001 58.2 76.6V330.9C58.2 345.7 70.2 357.8 85.1 357.8H168C182.8 357.8 194.9 345.8 194.9 330.9V76.6zM389.8 188.6C389.8 173.8 377.8 161.7000000000001 362.9000000000001 161.7000000000001H280C265.2 161.7000000000001 253.1 173.7000000000001 253.1 188.6V330.9C253.1 345.7 265.1 357.8 280 357.8H362.9C377.7 357.8 389.8 345.8 389.8 330.9V188.6z" />
-    <glyph glyph-name="tripadvisor"
-      unicode="&#xF262;"
-      horiz-adv-x="576" d=" M166.4 167.479C166.4 154.243 155.67 143.513 142.434 143.513S118.468 154.243 118.468 167.479S129.198 191.445 142.434 191.445S166.4 180.716 166.4 167.479zM431.362 191.435C418.132 191.435 407.406 180.71 407.406 167.479C407.406 154.249 418.131 143.523 431.362 143.523C444.592 143.523 455.318 154.248 455.318 167.479C455.317 180.71 444.592 191.435 431.362 191.435zM520.75 51.945C458.083 2.841 367.474 13.836 318.371 76.504L287.392 30.179L256.709 76.1180000000001C208.432 15.7280000000001 121.087 4.227 58.824 50.063C-5.234 97.2210000000001 -18.935 187.379 28.223 251.4370000000001A186.76199999999997 186.76199999999997 0 0 1 0 308.584L90.286 308.634A358.48 358.48 0 0 0 287.351 362.664A350.382 350.382 0 0 0 479.532 309.3150000000001L575.75 309.241A185.71300000000002 185.71300000000002 0 0 1 547.398 251.592C594.191 188.845 582.3620000000001 100.222 520.75 51.9450000000001zM259.366 166.239C259.359 229.796 207.831 281.314 144.274 281.307C80.717 281.3 29.2 229.772 29.206 166.215C29.213 102.658 80.741 51.14 144.298 51.147C207.811 51.222 259.282 102.686 259.366 166.199V166.239zM287.957 176.694C293.39 250.134 353.467 307.578 427.077 309.716A339.146 339.146 0 0 1 287.35 337.528A356.31 356.31 0 0 1 147.186 310.275C221.53 308.693 282.485 250.851 287.957 176.694zM539.663 205.461C517.671 265.095 451.501 295.6089999999999 391.8680000000001 273.618C332.2340000000001 251.626 301.7200000000001 185.4559999999999 323.7110000000001 125.823V125.791C345.7490000000001 66.184 411.9090000000001 35.7 471.5380000000001 57.678C531.153 79.682 561.6510000000001 145.84 539.663 205.461zM213.624 167.4859999999999V167.3709999999999C213.567 128.0429999999999 181.638 96.2079999999999 142.31 96.2649999999999C102.982 96.322 71.147 128.2509999999999 71.204 167.579C71.261 206.907 103.19 238.742 142.518 238.685C181.7770000000001 238.569 213.56 206.745 213.624 167.4859999999999zM189.112 167.4859999999999V167.5699999999999C189.061 193.3539999999999 168.118 214.215 142.334 214.1639999999999C116.5500000000001 214.113 95.689 193.1699999999999 95.74 167.387C95.791 141.603 116.734 120.742 142.5170000000001 120.793C168.2430000000001 120.906 189.0540000000001 141.761 189.1120000000001 167.4859999999999zM502.535 167.4859999999999V167.4379999999999C502.515 128.1099999999999 470.617 96.2439999999999 431.288 96.2649999999999S360.094 128.1829999999999 360.115 167.512C360.135 206.84 392.033 238.706 431.362 238.685C470.652 238.619 502.483 206.776 502.535 167.4859999999999zM478.031 167.4939999999999C478.022 193.2779999999999 457.113 214.1729999999999 431.329 214.1639999999999C405.545 214.155 384.65 193.2459999999999 384.659 167.4619999999999C384.668 141.678 405.577 120.7839999999999 431.361 120.7919999999999C457.126 120.8379999999999 477.997 141.7199999999999 478.031 167.4849999999999V167.4939999999999z" />
-    <glyph glyph-name="tumblr-square"
-      unicode="&#xF174;"
-      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM317.7 51.8C309.2 42.7 286.5 32 256.8 32C181.3 32 164.9 87.5 164.9 119.9V209.9H135.2C131.8 209.9 129 212.7 129 216.1V258.6C129 263.1 131.8000000000001 267.1 136.1 268.6C174.9 282.3 187 316.1 188.8 341.8C189.3 348.7 192.9 352 198.8 352H243.1C246.5000000000001 352 249.3 349.2 249.3 345.8V273.8H301.2C304.6 273.8 307.4 271 307.4 267.6V216.5C307.4 213.1 304.6 210.3 301.2 210.3H249.1V127C249.1 105.6 263.9 93.5 291.6 104.6C294.6 105.8 297.2000000000001 106.6 299.6 106C301.8 105.5 303.2000000000001 103.9 304.2000000000001 101.1L318.0000000000001 60.9C319.0000000000001 57.7000000000001 320.0000000000001 54.2 317.7000000000001 51.8z" />
-    <glyph glyph-name="tumblr"
-      unicode="&#xF173;"
-      horiz-adv-x="320" d=" M309.8 -32.3C296.2 -46.8 259.8 -64 212.4 -64C91.6 -64 65.4 24.8 65.4 76.6V220.6H17.9C12.4 220.6 7.9 225.1 7.9 230.6V298.6C7.9 305.8 12.4 312.2000000000001 19.2 314.6C81.2 336.4000000000001 100.7 390.6 103.5 431.7000000000001C104.3 442.7000000000001 110 448 119.6 448H190.5C196 448 200.5 443.5 200.5 438V322.8H283.5C289 322.8 293.5 318.4 293.5 312.9V231.2C293.5 225.7 289 221.2 283.5 221.2H200.1V88C200.1 53.8 223.8 34.4 268.1 52.2C272.9000000000001 54.1 277.1 55.4 280.8 54.4C284.3 53.5 286.6 51 288.2 46.5L310.2 -17.8C312 -22.8 313.5 -28.4 309.8 -32.3z" />
-    <glyph glyph-name="twitch"
-      unicode="&#xF1E8;"
-      horiz-adv-x="448" d=" M40.1 416L10 339.1V24.8H117V-32H177.2L234 24.8H321L438 141.8V416H40.1zM397.9000000000001 161.9L331 95H224L167.2 38.2V95H76.9V375.9H397.9V161.9zM331 299V182.1H290.9V299H331zM224 299V182.1H183.9V299H224z" />
-    <glyph glyph-name="twitter-square"
-      unicode="&#xF081;"
-      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM351.1 257.2C351.3 254.4 351.3 251.5 351.3 248.7C351.3 162 285.3 62.1 164.7 62.1C127.5 62.1 93 72.9 64 91.5C69.3 90.9 74.4 90.7 79.8 90.7C110.5 90.7 138.7 101.1 161.2 118.7C132.4 119.3 108.2 138.2 99.9 164.2C110 162.7 119.1 162.7 129.5 165.4C99.5 171.5 77 197.9 77 229.8V230.6C85.7 225.7 95.9 222.7 106.6 222.3A65.447 65.447 0 0 0 77.4 276.9C77.4 289.1 80.6 300.3 86.3 310C118.6 270.2 167.1 244.2 221.5 241.4C212.2 285.9 245.5 322 285.5 322C304.4 322 321.4 314.1 333.4 301.3C348.2 304.1 362.4 309.6 375 317.1C370.1 301.9 359.8 289.1 346.2 281C359.4 282.4 372.2 286.1 384 291.2C375.1 278.1 363.9 266.5 351.1 257.2z" />
-    <glyph glyph-name="twitter"
-      unicode="&#xF099;"
-      horiz-adv-x="512" d=" M459.37 296.284C459.695 291.736 459.695 287.187 459.695 282.639C459.695 143.919 354.112 -15.919 161.137 -15.919C101.685 -15.919 46.457 1.3 0 31.187C8.447 30.213 16.568 29.888 25.34 29.888C74.395 29.888 119.553 46.456 155.614 74.72C109.482 75.6950000000001 70.822 105.908 57.502 147.492C64 146.518 70.497 145.868 77.32 145.868C86.741 145.868 96.163 147.168 104.934 149.441C56.853 159.188 20.791 201.421 20.791 252.426V253.725C34.76 245.928 51.005 241.055 68.222 240.406C39.958 259.249 21.441 291.411 21.441 327.7970000000001C21.441 347.289 26.638 365.1570000000001 35.735 380.751C87.39 317.076 165.035 275.493 252.1 270.944C250.4760000000001 278.741 249.5010000000001 286.862 249.5010000000001 294.9840000000001C249.5010000000001 352.812 296.283 399.918 354.4350000000001 399.918C384.6480000000001 399.918 411.9370000000001 387.248 431.1050000000001 366.781C454.8200000000001 371.329 477.5610000000001 380.101 497.7040000000001 392.121C489.9060000000001 367.755 473.3380000000001 347.288 451.5720000000001 334.294C472.6890000000001 336.567 493.1560000000001 342.416 511.998 350.5370000000001C497.7060000000001 329.746 479.837 311.2290000000001 459.3700000000001 296.284z" />
-    <glyph glyph-name="typo3"
-      unicode="&#xF42B;"
-      horiz-adv-x="433.3" d=" M330.8 107C323.8 104.7 319.2 104.7 312.3 104.7C255.1 104.7 171.7 303.2 171.7 369.6C171.7 394.3 177.1 402 185.6 409C116.1 400.5 36.3 375 9.3 342.6C3.9 334.9 0 321.8 0 305.5C0 202 106.8 -32 184.1 -32C220.4 -32 281.4 27.5 330.8 107M294.5 416C366.3 416 433.3 404.4 433.3 363.5C433.3 280.9 380.8 181.2 354.5 181.2C306.6 181.2 252.8 313.3 252.8 379.7C252.8 410.6 264.4000000000001 416 294.5 416" />
-    <glyph glyph-name="uber"
-      unicode="&#xF402;"
-      horiz-adv-x="448" d=" M414.1 416H33.9C15.2 416 0 400.8 0 382.1V2C0 -16.8 15.2 -32 33.9 -32H414C432.7 -32 447.9 -16.8 447.9 1.9V382.1C448 400.8 432.8 416 414.1 416zM237.6 56.9C163 49.4 96.4 103.8 88.9 178.4H183.3V158C183.3 154.3 186.3 151.2 190.1 151.2H258C261.7 151.2 264.8 154.2 264.8 158V225.9C264.8 229.6 261.8 232.7 258 232.7H190.1C186.4 232.7 183.3 229.7 183.3 225.9V205.5H88.9C95.9 274.9 154.3 327.7 224 327.7C293.7 327.7 352.1 274.9 359.1 205.5C366.6 131 312.2000000000001 64.4 237.6 56.9z" />
-    <glyph glyph-name="uikit"
-      unicode="&#xF403;"
-      horiz-adv-x="448" d=" M443.9 320V64L218 -64L0 64V278.3L87.6 233.2V116.2000000000001L221.1 40.7L356.9 116.2000000000001V267.2000000000001L255.8 324.8000000000001L343.4 377.9000000000001L443.9 320zM308.6 398.9L223.8 448L135.2 393.2L221.2 345.9L308.6 398.9z" />
-    <glyph glyph-name="uniregistry"
-      unicode="&#xF404;"
-      horiz-adv-x="384" d=" M281.1 227.9H384V242.7H281.1V227.9zM281.1 265H384V277.4H281.1V265zM281.1 190.8H384V208.1H281.1V190.8zM123.4 104.1H8.5C11.1 95.6 14.3 87.3 18.1 79.3H156.4C143.5 85 132.3 93.5 123.4 104.1M269.1 116.5H378.8C380.6 123.8 381.9000000000001 131.2 382.7 138.8H278.3C276.2 130.9 273.1 123.4 269.1 116.5M227.6 79.4H367C370.7 87.4 372.8 95.6 375.5 104.2H260.5C251.7 93.5 240.4 85 227.6 79.4M384 416H281.1V413.5H384V416zM192 -32C231.5 -32 268.2 -20.2 298.8 0.2H85.3C115.8 -20.2 152.5 -32 192 -32M281.1 302.2H384V312H281.1V302.2zM281.1 339.3H384V346.7H281.1V339.3zM281.1 376.4H384V381.3H281.1V376.4zM102.9 277.4H0V265H102.9V277.4zM38.8 42.3H344.1C350.8 50.8 356.7000000000001 59.9 361.9000000000001 69.5H23C28.2 59.9 32.2 50.8 38.8 42.3M102.9 161.1V173.5H0V161.1C0 158.6 0 156.1 0.1 153.7000000000001H103.2C103 156.1 102.9 158.6 102.9 161.1M281.1 161.1C281.1 158.6 281 156.1 280.7 153.7000000000001H383.8C383.9 156.2000000000001 384 158.6 384 161.1V173.5H281.1V161.1zM78.1 5.1H305.8C317.6 13.8 328.5 23.7 338 34.8H44.9C54.5 23.8 66.3 13.8 78.1 5.1M102.9 381.3H0V376.4H102.9V381.3zM102.9 416H0V413.5H102.9V416zM102.9 242.7H0V227.9H102.9V242.7zM102.9 208.1H0V190.8H102.9V208.1zM102.9 312H0V302.1H102.9V312zM102.9 346.7H0V339.3H102.9V346.7zM105.7 138.8H1.3C2.2 131.2 3.5 123.8 5.2 116.5H114.9C110.9 123.4 107.7 130.9 105.7 138.8" />
-    <glyph glyph-name="untappd"
-      unicode="&#xF405;"
-      horiz-adv-x="640" d=" M401.3 398.1C321.5 238 316.7000000000001 245.6 313.4 224.9L308.2 192.1C306.3 180.1 301.6 168.6 294.5 158.7000000000001L145.6 -49.1C138 -59.7 125.2 -65.3000000000001 112.2 -63.7C71.9 -58.7 34.4 -31.5000000000001 16.9 4.8C11.2 16.6 12.4 30.6 20 41.1999999999999L168.9 249.1C176 259 185.3 267.0999999999999 196.1 272.8L225.4 288.3C243.9 298.0999999999999 235.1 300.2 361 427.2C362 432 362 434.5 364.6 435.2C367.6 435.8999999999999 371.2000000000001 436.2 370.9000000000001 439.8L370.5000000000001 444.3999999999999C370.3000000000001 446.3 371.8000000000001 448 373.7000000000001 448C378.2000000000001 448.0999999999999 386.9000000000001 446.8 399.3000000000001 438C411.6000000000001 429.0999999999999 415.7000000000001 421.2 417.0000000000001 416.8999999999999C417.6000000000001 415.0999999999999 416.4000000000001 413.2 414.6000000000001 412.7L410.1000000000001 411.5999999999999C406.7000000000001 410.7 407.6000000000001 407.2 407.8000000000001 404.2C407.9000000000001 401.3999999999999 405.5000000000001 400.5999999999999 401.3000000000001 398.0999999999999zM230.1 411.6C233.5 410.7 232.6 407.2 232.4 404.2C232.2 401.5 234.5 400.7 238.8 398.2C246.7 382.3 254.1 367.7 261 354.2C261.7 352.9 263.3 352.7 264.3 353.7C275.5 365.7 288.9000000000001 379.9 304.8 396.3C306.1 397.7 306.2 399.8 304.9000000000001 401.2C296.9000000000001 409.4 288.4000000000001 418.1 279.3 427.3C278.3 432 278.3 434.6 275.7 435.3C272.7 436.1 269.1 436.3 269.4 439.9C269.7 443.2 270.8 448 266.6 448.1C262.1 448.2 253.4 447 241 438.1C228.7 429.2 224.6 421.3 223.3 417C221.9 412.8 226.9 412.4 230.1 411.6zM620 41.3L471.2 249.2C458 267.7 444.6 272.6 414.8 288.3C403.6 294.2 400.6 299.2 384.3 317.2C383.3 318.3 381.4000000000001 318.1 380.7 316.7C334.4 227.9 333.6 233.9 331.7 221.9C330 211.2 330.4 201.9 332 192.1C333.9 180.1 338.6 168.6 345.7 158.7L494.6 -49.2C502.2 -59.8000000000001 514.8000000000001 -65.4000000000001 527.7 -63.9C568 -59.0000000000001 605.7 -31.9 623.4000000000001 4.6999999999999C628.8000000000001 16.5999999999999 627.7 30.5999999999999 620.0000000000001 41.3z" />
-    <glyph glyph-name="usb"
-      unicode="&#xF287;"
-      horiz-adv-x="640" d=" M641.5 192C641.5 188.9 639.8 185.9 637 184.5L547.9 131C546.5 130.2 545.1 129.6 543.4 129.6C542 129.6 540.3 129.9 538.9 130.7000000000001C536.1 132.4 534.4 135.2000000000001 534.4 138.5000000000001V174.1000000000001H295.7C321 134.5000000000001 336.2 67.2000000000001 365.3 67.2000000000001H392V94C392 99 395.9 102.9 400.9 102.9H490C495 102.9 498.9 99 498.9 94V4.9C498.9 -0.1 495 -4 490 -4H400.9C395.9 -4 392 -0.1 392 4.9V31.6H365.3C289.9 31.6 284.2000000000001 174.1 240.6 174.1H140.3C132.2 143.5 104.4 120.6 71.3 120.6C32 120.7 0 152.7 0 192S32 263.3 71.3 263.3C104.4 263.3 132.3 240.5 140.3 209.8C179.4 209.8 184.2 200.3 214.9 270.2000000000001C255 359.3 273 352.3 323.8 352.3C331.3 373.2 350.8 387.9 374.2 387.9C403.7 387.9 427.7 364 427.7 334.4S403.8 280.9 374.2 280.9C350.8 280.9 331.3 295.7000000000001 323.8 316.5H294C264.9 316.5 249.7 249.1 224.4 209.6H534.5V245.2C534.5 248.5 536.2 251.3 539 253C541.8 254.7 545.4 254.4 547.9 252.7L637 199.2C639.8 198.1 641.5 195.1 641.5 192z" />
-    <glyph glyph-name="ussunnah"
-      unicode="&#xF407;"
-      horiz-adv-x="512" d=" M156.8 162.9L162.5 148.5H154.3C153 151.7 151.2 156.2 150.5 158C148 164.3 149.4 166.4 150.5 168C152.4 170.7 153.7 172.4 154.1 173.2C154.1 171 154.9 167.5 156.8 162.9zM454.1 144.1C452 130.3 448.4000000000001 117 443.6 104.4L486.6 81L441.8 99.8C436.5 86.6 429.8 74.2 421.9000000000001 62.6L456.1 32.4L419.3 58.8C410.9000000000001 47 401.3 36.2 390.6 26.5L415.5 -8.2L387.4 23.6C376.4 14 364.3 5.6 351.3 -1.5L367 -38.7L347.7 -3.4C334.5999999999999 -10.2 320.7 -15.5 306.0999999999999 -19.3L312.7999999999999 -57.6999999999999L302.2999999999999 -20.3C287.9999999999999 -23.6999999999999 273.0999999999999 -25.6 257.7999999999999 -25.6999999999999L256 -64L254.1 -25.6C238.8 -25.5 223.9 -23.6 209.6 -20.3L199 -57.6L205.7 -19.4C191.1 -15.7 177.1 -10.3 164 -3.6L144.8 -38.7L160.4 -1.7C147.4 5.3 135.2 13.6999999999999 124.2 23.4L96.3 -8.2L121 26.1999999999999C110.3 35.8999999999999 100.6 46.6999999999999 92.2 58.4999999999999L55.7 32.3L89.6 62.1999999999999C81.7 73.8 75 86.3 69.6 99.4999999999999L25.2 80.8L67.8 104C63 116.7 59.4 130.1 57.3 143.9L6.3 134.9L56.6 149.1C55.5 157.6 54.9 166.2 54.9 175C54.9 179.6999999999999 55.1 184.3999999999999 55.4 189.1L0 192L56 194.8C57.3 207.9 59.8 220.6 63.5 232.9L6.4 249L65.3 238.6C69.3 250.6 74.4 262.1 80.5 273L25.4 303L83.7 278.4C90 289 97.2 298.8 105.3 308L55.8 351.6L109.7 312.9C117.8 321.5 126.7 329.4 136.3 336.5L96.3 392.1L141.9 340.5C151.4 347.1 161.6 352.8 172.2 357.7L144.9 422.6L178.7 360.5C189.2 364.9 200.1 368.4 211.4 370.9L199 441.6L218.5 372.4C229.5 374.5 240.8 375.6 252.3 375.8L256 448L259.6 375.8C271.1 375.6 282.4000000000001 374.4 293.4000000000001 372.3L313 441.6L300.6 370.9C311.9000000000001 368.3 322.8 364.8 333.2000000000001 360.4L367.1 422.6L339.7000000000001 357.5C350.3000000000001 352.6 360.4000000000001 346.8 369.9000000000001 340.3L415.7000000000001 392.1L375.6 336.2C385.1 329.1 394 321.2 402.1 312.6L456.3 351.5L406.6 307.6C414.6 298.5 421.8 288.7 428.1 278.2L486.8 302.9L431.3 272.7C437.4000000000001 261.8 442.4000000000001 250.4 446.4000000000001 238.4L505.7 248.8L448.2000000000001 232.6C451.9 220.4 454.4 207.7 455.7 194.7L512 192L456 189.2C456.3 184.6 456.5 179.9 456.5 175.1C456.5 166.4 455.9 157.8 454.9 149.3L505.6 135L454.1 144.1zM432.3 175.1C432.3 272.6 353.3 351.6 255.8 351.6S79.3 272.6 79.3 175.1S158.3 -1.4 255.8 -1.4S432.3 77.6 432.3 175.1zM408.3 175.1C408.3 90.8 340 22.5 255.7 22.5S103.1 90.8 103.1 175.1S171.4 327.7000000000001 255.7 327.7000000000001S408.3 259.4000000000001 408.3 175.1zM195 207C195 204.9 196.3 203.2 198.6 201.9C201.9 200 204.8 197.3 206.8 193.7C209.6 199.4 211.1 203.2 211.1 204.9C211.1 207.1 210 209.3 207.9 211.9C205.8 214.4 204.7 217.1 204.6 219.6C198.1 212.8 195 208.7 195 207zM154.3 226C154.3 223.9 155.6 222.2 157.9 220.9C161.4 219 164.1 216.3 166.1 212.7C168.9 218.4 170.4 222.2 170.4 223.9C170.4 226.1 169.3 228.3 167.2 230.9C165.1 233.4 164 236.1 163.9 238.6C157.4 231.8 154.3 227.7 154.3 226zM135.3 226C135.3 223.9 136.6 222.2 138.9 220.9C142.2 219 145.1 216.3 147.1 212.7C149.9 218.4 151.4 222.2 151.4 223.9C151.4 226.1 150.3 228.3 148.2 230.9C146.1 233.4 145 236.1 144.9 238.6C138.5 231.8 135.3 227.7 135.3 226zM340.2000000000001 138.1C331.8000000000001 141.1 331.5000000000001 144.9 331.5000000000001 153.7000000000001V266C323.3000000000001 253.5 317.3000000000001 247.4 313.5000000000001 247.4C319.8000000000001 233 323.0000000000001 223.5 323.0000000000001 219.1V154.8C323.0000000000001 152.6 320.8000000000001 148.3 318.3000000000001 148.3H300.3000000000001C297.5000000000001 155.8 290.1000000000001 175.2 285.0000000000001 188.6C283.0000000000001 186.1 277.8000000000001 179.4 274.3000000000001 174.9C276.7000000000001 173.3 278.4000000000001 171.3 279.5000000000001 168.6C282.1000000000001 161.9 285.9000000000001 152.1 287.4000000000001 148.4H278.2000000000001C274.3000000000001 158.8 268.6 173.8 266.4000000000001 179.5000000000001C264.4000000000001 177.0000000000001 259.2000000000001 170.3000000000001 255.7000000000001 165.8000000000001C258.1 164.2000000000001 259.8000000000001 162.2000000000001 260.9000000000001 159.5000000000001C261.7000000000001 157.5000000000001 263.7000000000001 152.2000000000001 265.2000000000001 148.6000000000001H256C254.5 152.7000000000001 250.4 163.2000000000001 247.6 170.6000000000001C245.6 168.1000000000001 240.4 161.4000000000001 236.9 156.9000000000001C239.4 155.3000000000001 241.2 153.3000000000001 242.1 150.6000000000001C242.3 150.0000000000001 242.6 149.2000000000001 242.7 148.9000000000001H225C220.4 162.8000000000001 213.6 176.6000000000001 213.6 183.0000000000001C213.6 185.2000000000001 213.9 188.1000000000001 214.7 191.2000000000001C205.9 180.4000000000001 200.7 175.3000000000001 200.7 166.2000000000001C200.7 158.7000000000001 211.1 137.9000000000001 211.1 132.9000000000001C211.1 131.2000000000001 210.6 129.6000000000001 209.7 128.0000000000001C200.1 140.7000000000001 194.2 148.7000000000001 190.9 148.7000000000001H178.9L167.7 176.7000000000001C163.9 186.3000000000001 162 192.7000000000001 162 195.5000000000001C162 199.3000000000001 162.5 203.2000000000001 163.7 207.7000000000001C162.7 206.4000000000001 160 203.0000000000001 158.2 200.6000000000001C157.4 202.7000000000001 155.1 208.3000000000001 153.6 212.1000000000001C151.5 209.6000000000001 146.1 203.0000000000001 142.4 198.5000000000001C143.3 196.2000000000001 145.7 190.4000000000001 147.3 186.3000000000001C144.8 183.0000000000001 138.2 174.5000000000001 133.7 168.6000000000001C129.7 163.3000000000001 127.9 155.3000000000001 131 146.8000000000001C133.5 140.1000000000001 133 138.9000000000002 129.3000000000001 132.7000000000001H191C196.5 132.7000000000001 205.3 118.7000000000001 206.5 110.7000000000001C219.7 126.7000000000001 221.9 130.3000000000001 223.3 132.3000000000001H330.3C334.2 132.3000000000001 337.5 134.2000000000001 340.2 138.1000000000001zM360.3000000000001 164.7000000000001V266.3C351.3000000000001 253.8 344.4000000000001 247.7 339.6000000000001 247.7C346.7000000000001 233.3 350.3000000000001 223.8 350.3000000000001 219.4V153.1C350.3000000000001 135.6 358.9000000000001 132.7000000000001 374.3000000000001 132.7000000000001C382.4000000000001 132.7000000000001 386.8000000000001 133.5000000000001 388.0000000000001 135.4C383.7000000000001 137.0000000000001 380.4000000000001 137.9 378.1000000000001 138.7000000000001C370.0000000000001 141.9 360.3000000000001 146.1 360.3000000000001 164.7000000000001z" />
-    <glyph glyph-name="vaadin"
-      unicode="&#xF408;"
-      horiz-adv-x="448" d=" M224.5 307.3C226 324.9 229.4 360 274.3 360H372.9C393.6 360 405 367.8 405 381.6V393.9C405 406.1 414.3 416 426.5 416S448 406.1 448 393.9V357.4C448 314.5 426.5 295.4 381.2 295.4H280.7C250.6 295.4 247.7 280.7000000000001 247.7 268.3C247.7 267 247.6 265.8 247.5 264.6C246.8 252.3 236.6 242.4000000000001 224.1 242.4000000000001S201.4 252.2000000000001 200.7 264.6C200.6 265.8 200.5 267 200.5 268.3C200.5 280.6 197.5 295.4 167.5 295.4H66.8C21.5 295.4 0 314.5 0 357.4V393.9C0 406.1 9.4 416 21.6 416S43.1 406.1 43.1 393.9V381.6C43.1 367.8 54.5 360 75.2 360H173.8C218.6 360 222.1 324.9 223.6 307.3H224.5zM224 -8C235.5 -8 245.4 -1 249.7 8.3C250.8 10.1 346.8 177.9 347.9 179.7000000000001C359.8 199.3000000000001 344.7 224.0000000000001 320.7 224.0000000000001C306.8 224.0000000000001 297.4 217.6000000000001 290.9 203.7000000000001L224 86L157.1 203.7C150.7 217.6 141.2 224 127.3 224C103.3 224 88.2 199.4 100.1 179.7C101.2 177.8 197.2 10.1 198.3 8.3C202.6 -1.0000000000001 212.5 -8.0000000000001 224 -8.0000000000001z" />
-    <glyph glyph-name="viacoin"
-      unicode="&#xF237;"
-      horiz-adv-x="384" d=" M384 416H320L239.3 224H144.8L64 416H0L48 304H0V256H68.5L82.3 224H0V176H102.8L192 -32L281.2 176H384V224H301.7L315.5 256H384V304H336L384 416zM192 112L165 176H219L192 112z" />
-    <glyph glyph-name="viadeo-square"
-      unicode="&#xF2AA;"
-      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM280.7 66.8C238.3 20.6 160.7 20.2 118.3 66.8C50.3 140.4 98.5 262.9 199.5 262.9C212.8 262.9 226.1 260.8 238.6 256.2000000000001C234.3 247.8 231.3 238.6 230.2 229.1C220.5 233.2 210 235.1 199.5 235.1C150.7 235.1 114.9 193.4 114.9 146.2000000000001C114.9 103.2000000000001 143.4 67.5000000000001 184.4 60.3000000000001C245.9 84.3000000000001 257.3 177.9000000000001 257.3 235.3000000000001C257.3 242.6000000000001 257.3 250.1000000000001 256.7 257.4000000000001C245.5 290.3000000000001 230.1 322.0000000000001 212.5 351.9000000000001C239.6 333.6000000000001 254.4 289.4000000000001 256.7 257.8000000000001V257.4000000000001C264.4 234.9000000000001 268.5 211.2000000000001 268.5 187.4000000000001C268.5 133.3000000000001 246.6 88.4000000000001 200.2 59.2000000000001L197.8 59.0000000000001C247.8 58.0000000000001 284 97.6000000000001 284 146.2000000000001C284 158.4000000000001 281.9 170.5000000000001 277.1 181.9000000000001C286.6 183.8000000000001 295.6 187.5000000000001 303.5 192.4000000000001C318.8 155.8000000000001 316.1 105.1000000000001 280.7 66.8000000000001zM309 214.3C295.7 214.3 283.9 221.4 274.6 230.4C296.5 242.4 324.2000000000001 261.1 336.9000000000001 283.4C338.4000000000001 286.4 341.0000000000001 292 341.4000000000001 295.4C328.9000000000001 267.5 297.2000000000001 245.6 267.5 238.7C262.8 246 260 254.2 260 263C260 273.3 265.2 287.1 272.9 294.6C294.5 315.1 325.9 303.1 345.3 344.6C377.8 298.4 358.4 214.3 309 214.3z" />
-    <glyph glyph-name="viadeo"
-      unicode="&#xF2A9;"
-      horiz-adv-x="448" d=" M276.2 297.5V296.8C258.3 349.4 233.6 400.2 205.4 448C248.7 418.8 272.4 348 276.2 297.5zM308.9 175.8C316.5 157.6 319.9 138.3 319.9 118.8C319.9 41.1 262.1 -22.2 182.1 -20.6L185.9 -20.3C260.1 26.4 295.2 98.3 295.2 184.8C295.2 222.9 288.7 260.7 276.3 296.8C277.3 285.1 277.3 273.1 277.3 261.4C277.3 169.6 259.2 19.8 160.7 -18.6C95 -7.2 49.4 50 49.4 118.8C49.4 194.4 106.8 261.1 184.8 261.1C201.6 261.1 218.5 258 233.9 251.5000000000001C235.6 266.6 240.4 281.4000000000001 247.3 294.8C227.4 302 206.1 305.5 184.8 305.5C23.3 305.5 -53.9 109.6 54.9 -8.2C122.8 -82.7999999999999 246.9 -82.1 314.7000000000001 -8.2C371.3000000000001 53.1 375.6 134.2000000000001 351.1 192.8C338.4000000000001 184.8 324 178.9 308.9000000000001 175.8zM418.1 436.3C387.1 369.8 336.8 389.1 302.3 356.2C289.9000000000001 344.2 281.7 322.2 281.7 305.7C281.7 291.6 286.2 278.6 293.7 266.9C341.1 277.9 392 312.9 411.9 357.6C411.2 352.1 407.1 343.2 404.7 338.4C384.4 302.7 340.1 272.8 305 253.5C319.8 239.1 338.7 227.7 360 227.7C439 227.7 470.1 362.3 418.1 436.3z" />
-    <glyph glyph-name="viber"
-      unicode="&#xF409;"
-      horiz-adv-x="512" d=" M444 398.1C431.3 409.8 379.9 447.1 265.3 447.6C265.3 447.6 130.2 455.7 64.4 395.3C27.8 358.7 14.9 305 13.5 238.5C12.1 172 10.4 47.4 130.5 13.6H130.6L130.5 -38S129.7 -58.9 143.5 -63.1C160.1 -68.3000000000001 169.9 -52.4 185.8 -35.3C194.5 -25.9 206.5 -12.1 215.6 -1.6C297.8 -8.5 360.9000000000001 7.3 368.1 9.6C384.7000000000001 14.9999999999999 478.6 26.9999999999999 493.8 151.6C509.6 280.2 486.2 361.4 444 398.1zM457.9 161C445 57 368.9 50.4 354.9 45.9C348.9 44 293.4 30.2 223.7 34.7C223.7 34.7 171.7 -28 155.5 -44.3C150.2 -49.6 144.4 -49.1 144.5 -38.6C144.5 -31.7 144.9 47.1 144.9 47.1C144.8 47.1 144.8 47.1 144.9 47.1C43.1 75.3 49.1 181.4 50.2 236.9C51.3 292.4 61.8 337.9 92.8 368.5C148.5 419 263.2000000000001 411.5 263.2000000000001 411.5C360.1 411.1 406.5000000000001 381.9 417.3000000000001 372.1C453.0000000000001 341.5 471.2 268.3 457.9000000000001 161zM318.9 241.8C319.3 233.2 306.4 232.6 306 241.2C304.9 263.2000000000001 294.6 273.9000000000001 273.4 275.1C264.8 275.6 265.6 288.5 274.1 288C302 286.5 317.5 270.5 318.9 241.8zM339.2 230.5C340.2 272.9 313.7 306.1 263.4 309.8C254.9 310.4 255.8 323.3 264.3 322.7000000000001C322.3 318.5 353.2 278.6 352.1 230.2C352 221.6 339 222 339.2 230.5000000000001zM386.2 217.1C386.3 208.5 373.3 208.4 373.3 217C372.7 298.5 318.4000000000001 342.9 252.5 343.4C244 343.5 244 356.3 252.5 356.3C326.2 355.8 385.5 304.9 386.2 217.1zM374.9 119V118.8C364.1 99.8 343.9 78.8 323.1 85.5L322.9 85.8C301.8 91.7 252.1 117.3 220.7 142.3C204.5 155.1 189.7 170.2 178.3 184.7C168 197.6 157.6 212.9 147.5 231.3C126.2 269.8 121.5 287 121.5 287C114.8 307.8 135.7 328 154.8 338.8H155C164.1999999999999 343.6 173 342 178.9 334.9C178.9 334.9 191.3 320.1 196.5999999999999 312.8C201.5999999999999 306 208.2999999999999 295.1 211.7999999999999 289C217.8999999999999 278.1 214.0999999999999 267 208.0999999999999 262.4L196.0999999999999 252.8C190 247.9 190.7999999999999 238.8 190.7999999999999 238.8S208.5999999999999 171.5 275.0999999999999 154.5C275.0999999999999 154.5 284.2 153.7 289.0999999999999 159.8L298.7 171.8C303.3 177.8 314.3999999999999 181.6 325.3 175.5C340 167.2 358.7 154.3 371.1 142.6C378.1 136.9 379.7 128.2000000000001 374.9 119z" />
-    <glyph glyph-name="vimeo-square"
-      unicode="&#xF194;"
-      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM383.8 266.4C382.4000000000001 235.3 360.6 192.6 318.5 138.5C275 82 238.2 53.7 208.1 53.7C189.4 53.7 173.7 70.9 160.8 105.3C135.6 197.6 124.9 251.7 104.1 251.7C101.7 251.7 93.3 246.7 79 236.6L64 256C100.9 288.4 136.1 324.4 158.1 326.4C183 328.8 198.3 311.8 204.1 275.3C224.6 145.7000000000001 233.7 126.1 270.9 184.8C284.3 206 291.5 222 292.4 233.1C295.8 265.9000000000001 266.8 263.7000000000001 247.2 255.3C262.9 306.8 293 331.8 337.3 330.4C370.2 329.4 385.7 308 383.8 266.4z" />
-    <glyph glyph-name="vimeo-v"
-      unicode="&#xF27D;"
-      horiz-adv-x="448" d=" M447.8 294.4C445.8 250.8 415.4000000000001 191.1 356.4 115.3C295.5 36.1 244 -3.5 201.8 -3.5C175.7 -3.5 153.6 20.6 135.5 68.8C100.3 198 85.3 273.7 56.2 273.7C52.8 273.7 41.1 266.6 21 252.6L0 279.8C51.6 325.1 100.9 375.5 131.8 378.3C166.7 381.7000000000001 188.1 357.8 196.2 306.8C224.9 125.3 237.6 97.9 289.8 180.1C308.5 209.7 318.6 232.2 320 247.7C324.8 293.6 284.2 290.5 256.7 278.7000000000001C278.7 350.8 320.8 385.8 382.9 383.8C428.7 382.6 450.4 352.7000000000001 447.8 294.4z" />
-    <glyph glyph-name="vimeo"
-      unicode="&#xF40A;"
-      horiz-adv-x="448" d=" M403.2 416H44.8C20.1 416 0 395.9 0 371.2V12.8C0 -11.9 20.1 -32 44.8 -32H403.2C427.9 -32 448 -11.9 448 12.8V371.2C448 395.9 427.9 416 403.2 416zM377 267.2C375.6 235.7 353.6 192.5 311 137.8C267 80.6 229.7 51.9999999999999 199.3 51.9999999999999C180.4 51.9999999999999 164.5 69.3999999999999 151.4 104.3C125.9 197.6 115 252.3 94 252.3C91.6 252.3 83.1 247.2 68.6 237.1L53.4 256.7C90.7 289.5 126.3 325.9 148.6 327.9C173.8 330.3 189.3 313.1 195.1 276.2C215.8 145 225 125.1999999999999 262.7 184.6C276.2 206 283.5 222.3 284.5 233.5C288 266.7 258.6 264.4 238.7 255.9C254.6 308 285 333.3 329.9 331.9C363.2 331 378.9 309.4 377 267.2z" />
-    <glyph glyph-name="vine"
-      unicode="&#xF1CA;"
-      horiz-adv-x="384" d=" M384 193.3V141.2C365.6 137 347.1 135.1 331.9 135.1C295 57.6999999999999 228.9 -8.7 206.8 -21.1C192.8 -29 179.7 -29.5 164.1 -20.3C137 -4 34.2 80.3 0 345.3H74.5C93.2 186.2 139 104.6 189.3 43.5C217.2 71.4 244.1 108.6 264.9 150.4C215.1 175.7 184.8 231.3 184.8 296C184.8 361.6 222.5 411.1 287 411.1C401.9 411.1 393.2 283.2 368.6 229.6C368.6 229.6 322.2000000000001 220.4 305.1 250.1C308.5 261.4 313.3 280.9 313.3 298.6C313.3 329.9 302 345.2 284.9000000000001 345.2C266.7000000000001 345.2 254.1 328.1 254.1 295.2C254.2 216 313.5 176.5 384 193.3z" />
-    <glyph glyph-name="vk"
-      unicode="&#xF189;"
-      horiz-adv-x="576" d=" M545 330.3C548.7 342.8 545 352 527.2 352H468.3000000000001C453.3000000000001 352 446.4000000000001 344.1 442.7000000000001 335.3C442.7000000000001 335.3 412.7000000000001 262.2 370.3000000000001 214.8C356.6000000000001 201.1 350.3000000000001 196.7 342.8000000000001 196.7C339.1000000000001 196.7 333.4000000000001 201.1 333.4000000000001 213.6V330.3C333.4000000000001 345.3 329.2000000000001 352 316.8000000000001 352H224.2000000000001C214.8000000000001 352 209.2000000000001 345 209.2000000000001 338.5C209.2000000000001 324.3 230.4000000000001 321 232.6000000000001 281V194.2C232.6000000000001 175.2 229.2000000000001 171.7 221.7000000000001 171.7C201.7000000000001 171.7 153.1000000000001 245.1 124.3000000000001 329.1C118.5000000000001 345.4 112.8000000000001 352 97.7000000000001 352H38.8C22 352 18.6 344.1 18.6 335.3C18.6 319.7 38.6 242.2 111.7 139.8C160.4 69.9 229 32 291.4 32C328.9 32 333.5 40.4 333.5 54.9C333.5 121.7 330.1 128 348.9 128C357.6 128 372.6 123.6 407.6 89.9C447.6 49.9 454.2 32 476.6 32H535.5C552.3 32 560.8 40.4 555.9 57C544.6999999999999 91.9 469 163.7 465.6 168.5C456.9 179.7 459.4 184.7 465.6 194.7C465.7 194.8 537.5999999999999 296 545 330.3z" />
-    <glyph glyph-name="vnv"
-      unicode="&#xF40B;"
-      horiz-adv-x="640" d=" M104.9 96C70.8 96 58.5 126.4 58.5 126.4L2.6 237.9S-7.8 256 13 256H45.8C56.2 256 59 247.3 64.6 237.9L101.3 163.4S106.5 150.3 122.4 150.3S143.5 163.4 143.5 163.4L180.2 237.9C185.8 247.4 188.6 256 199 256H231.8C252.6 256 242.2 237.9 242.2 237.9L186.4 126.4S174.2 96 140 96H104.9zM499.9 96C465.8 96 453.5 126.4 453.5 126.4L397.6 237.9S387.2 256 408 256H440.8C451.2 256 454 247.3 459.6 237.9L496.3 163.4S501.5 150.3 517.4 150.3S538.5 163.4 538.5 163.4L575.3 237.9C580.9 247.4 583.6999999999999 256 594.0999999999999 256H627C647.8 256 637.4 237.9 637.4 237.9L581.5 126.4S569.3 96 535.1 96H499.9zM337.6 256C371.7000000000001 256 384 225.6 384 225.6L439.9 114.1S450.3 96 429.5 96H396.7C386.3 96 383.5 104.7 377.9 114.1L341.2 188.6S336 201.7 320.1 201.7C304.2 201.7 299 188.6 299 188.6L262.3 114.1C256.7 104.7000000000001 253.9 96 243.5 96H210.5999999999999C189.7999999999999 96 200.1999999999999 114.1 200.1999999999999 114.1L256.0999999999999 225.6S268.2999999999999 256 302.4999999999999 256H337.5999999999999z" />
-    <glyph glyph-name="vuejs"
-      unicode="&#xF41F;"
-      horiz-adv-x="448" d=" M356.9 383.7H280L224 295.1L176 383.7000000000001H0L224 0L448 383.7H356.9zM55.7 351.7H109.5L224 153.5L338.4 351.7H392.2L224 63.5L55.7 351.7z" />
-    <glyph glyph-name="weebly"
-      unicode="&#xF5CC;"
-      horiz-adv-x="512" d=" M425.09 382.17C385.21 382.17 351.81 356.44 341.43 317.8400000000001C323.2699999999999 375.9 275.93 382.17 256.48 382.17C236.7 382.17 189.68 375.89 171.2 317.8400000000001C160.82 356.44 127.75 382.17 87.54 382.17C38.59 382.17 0 348.28 0 304.9700000000001C0 276.01 4.18 271.7 77.17 71.49C99.54 10.92 144.94 2.14 169.91 2.14C209.14 2.14 239.95 21.6 255.84 56.12C271.73 21.29 302.53 1.83 341.77 1.83C366.74 1.83 412.13 10.93 434.51 71.5C511.06 280.15 512.01 277.0800000000001 512.01 298.7C512.64 347.02 476 382.17 425.09 382.17zM451.4299999999999 267.36L385.86 90.92C377.94 69.43 364.64 53.7 339.62 53.7C316.18 53.7 302.24 66.1100000000001 295.5899999999999 87.6L256.31 205.0200000000001H255.36L216.08 87.6C209.12 66.1 195.18 54 172.06 54C147.04 54 133.73 69.74 125.82 91.22L60.88 266.45C55.5 281.28 52.96 290.36 52.96 300.95C52.96 317.29 68.8 330.31 91.29 330.31C109.98 330.31 123.28 318.51 127.4 301.26L171.43 161.44H172.38L217.04 298.23C223.06 317.9 233.51 330.31 256 330.31S288.94 318.2 294.96 298.23L339.62 161.44H340.57L384.6 301.26C388.7200000000001 318.51 402.0200000000001 330.31 420.7100000000001 330.31C442.8800000000001 330.31 459.04 316.99 459.04 294.6C458.72 286.73 454.92 278.56 451.43 267.36z" />
-    <glyph glyph-name="weibo"
-      unicode="&#xF18A;"
-      horiz-adv-x="512" d=" M407 270.4C414.6 294.4 393.6 317.2 369.6 312.1C347.6 307.3 340.8 340.2000000000001 362.5 344.9000000000001C412.6 355.8 454.8 307.8 439 260.1C432.2 238.9000000000001 400.2 249.3 407 270.4000000000001zM214.8 1.3C108.5 1.3 0 52.7 0 137.6C0 181.9 28 233.0000000000001 76.3 281.3C176 381 279.5 382.2 249.9 287C245.9 273.9 262.2 281.3 262.2 281C341.7 314.6 402.7 297.8 376.2 229.6C372.5 220.2 377.3 218.7 384.5 216.5C520.2 174.2 419.3 1.3 214.8 1.3zM358.5 147.6C353.1 203.3 280 241.6 195.1 233.3C110.3 224.7 46.3 173 51.7 117.3S130.2 23.3 215.1 31.6C299.9 40.2 363.9 91.9 358.5 147.6zM347.9 412.9C322 407.3 331.1 369.2 356.2 374.6C428.5 389.8 491 321.8 467.9 250.6C460.5 226.4 497 213.6 505.3 238.6C537.1999999999999 338.4 450.2 434.5 347.9 412.9zM269.4 101.9C252.3 63.1 202.6 41.9 160.3 55.6C119.5 68.7 102.3 108.9999999999999 120 145.3C137.7 180.6999999999999 183.1 200.7 223.4 190.4C265.4 179.6 286.5 140.2 269.4 101.9zM183.1 131.9C170.2 137.3 153.1 131.6 145.1 119C136.8 106.1 140.8 91 153.7 85C166.8 79 184.5 84.7 192.8 97.9C200.8 111 196.5 126.2 183.1 131.9zM215.7 145.3C210.6 147 204.3 144.6999999999999 201.4 139.9C198.5 134.8 200 129.3 205.0999999999999 127C210.1999999999999 125 216.7999999999999 127.3 219.6999999999999 132.4C222.5 137.6 220.7999999999999 143.3 215.6999999999999 145.3z" />
-    <glyph glyph-name="weixin"
-      unicode="&#xF1D7;"
-      horiz-adv-x="576" d=" M385.2 280.4C391.6 280.4 397.8 280.1 404 279.3C387.4 357.7 303.3 416 207.7 416C100.5 416 13 343.2 13 250.6C13 197.2 42.3 153.1 90.9 119L71.6 60.4L139.6 94.5C164 89.7 183.4 84.8 207.8 84.8C214 84.8 219.9 85.1 226.1 85.6C222.1 98.5 219.9 112.2000000000001 219.9 126.4C219.8000000000001 211.3000000000001 292.8000000000001 280.4000000000001 385.2000000000001 280.4000000000001zM280.7 333.3C295.2 333.3 304.9 323.6 304.9 308.9C304.9 294.4 295.2 284.7000000000001 280.7 284.7000000000001C265.9 284.7000000000001 251.4 294.4 251.4 308.9C251.5 323.6 266 333.3 280.7 333.3zM144.3 284.7000000000001C129.8 284.7000000000001 115 294.4 115 308.9C115 323.7 129.8 333.3 144.3 333.3C159.1 333.3 168.7 323.6 168.7 308.9C168.7 294.3 159.1 284.7000000000001 144.3 284.7000000000001zM563 128.6C563 206.5 485.1 269.9000000000001 397.6 269.9000000000001C304.9000000000001 269.9000000000001 232.2 206.5 232.2 128.6S305 -12.7 397.6 -12.7C416.9000000000001 -12.7 436.5 -7.6 456.2 -2.8L509.6 -32.1L494.8 16.5C534 45.9 563 84.8 563 128.6zM343.9 153.1C334.2 153.1 324.6 162.8 324.6 172.7000000000001C324.6 182.4 334.3 192.0000000000001 343.9 192.0000000000001C358.7 192.0000000000001 368.3 182.3000000000001 368.3 172.7000000000001C368.3 162.7000000000001 358.6 153.1 343.9 153.1zM451 153.1C441.3 153.1 431.7 162.8 431.7 172.7000000000001C431.7 182.4 441.4 192.0000000000001 451 192.0000000000001C465.5 192.0000000000001 475.4 182.3000000000001 475.4 172.7000000000001C475.5 162.7000000000001 465.5 153.1 451 153.1z" />
-    <glyph glyph-name="whatsapp-square"
-      unicode="&#xF40C;"
-      horiz-adv-x="448" d=" M224 325.2C151.3 325.2 92.2 266.1 92.1 193.4C92.1 168.5 99.1 144.2 112.3 123.3L115.4 118.3L102.1 69.6999999999999L152 82.8L156.8 79.9C177 67.9 200.2 61.5 223.9 61.5H224C296.6 61.5 357.3 120.6 357.3 193.3C357.3 228.5 342.1 261.6 317.2 286.5C292.2 311.5 259.2 325.2 224 325.2zM301.5 136.8C298.2 127.5 282.4 119.1 274.8 118C262.2 116.1 252.4 117.1 227.3 127.9C187.6 145.1 161.6 185.1 159.6 187.7C157.6 190.3 143.4 209.2 143.4 228.7S153.6 257.8 157.3000000000001 261.8C160.9 265.8 165.2000000000001 266.8 167.9 266.8C170.5 266.8 173.2000000000001 266.8 175.5 266.7C177.9 266.6 181.2 267.6 184.4 259.9C187.7000000000001 252 195.6 232.5 196.6 230.5S198.3 226.2 196.9 223.6C189.3000000000001 208.4 181.2000000000001 209 185.3000000000001 202C200.6000000000001 175.7 215.9 166.6 239.2000000000001 154.9C243.2000000000001 152.9 245.5000000000001 153.2 247.8000000000001 155.9C250.1000000000001 158.5 257.7000000000001 167.5 260.3000000000001 171.4C262.9000000000001 175.4 265.6000000000001 174.7 269.2000000000001 173.4C272.8000000000001 172.1 292.3000000000001 162.5 296.3000000000001 160.5S302.9000000000001 157.5 303.9000000000001 155.9C304.8000000000001 154 304.8000000000001 146 301.5000000000001 136.8zM400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM223.9 34.8C197.3 34.8 171.2 41.5 148.1 54.1L64 32L86.5 114.2C72.6 138.2 65.3 165.5 65.3 193.5C65.4 280.9 136.5 352 223.9 352C266.3 352 306.1 335.5 336.1 305.5C366 275.5 384 235.7 384 193.3C384 105.9 311.3 34.8 223.9 34.8z" />
-    <glyph glyph-name="whatsapp"
-      unicode="&#xF232;"
-      horiz-adv-x="448" d=" M380.9 350.9C339 392.9 283.2 416 223.9 416C101.5 416 1.9 316.4 1.9 194C1.9 154.9 12.1 116.7 31.5 83L0 -32L117.7 -1.1C150.1 -18.8 186.6 -28.1 223.8 -28.1H223.9C346.2 -28.1 448 71.5 448 193.9C448 253.2 422.8 308.9 380.9 350.9zM223.9 9.3C190.7 9.3 158.2 18.1999999999999 129.9 34.9999999999999L123.2 38.9999999999999L53.4 20.6999999999999L72 88.8L67.6 95.8C49.1 125.2 39.4 159.1 39.4 194C39.4 295.7 122.2 378.5 224 378.5C273.3 378.5 319.6 359.3 354.4 324.4C389.2 289.5 410.6 243.2 410.5 193.9C410.5 92.1 325.6 9.3 223.9 9.3zM325.1 147.5C319.6 150.3 292.3 163.6999999999999 287.2 165.5C282.1 167.3999999999999 278.4 168.3 274.7 162.6999999999999C271 157.0999999999999 260.4 144.6999999999999 257.1 140.8999999999999C253.9 137.1999999999999 250.6 136.6999999999999 245.1 139.5C212.5 155.8 191.1 168.6 169.6 205.5C163.9 215.3 175.3 214.5999999999999 185.9 235.8C187.7 239.5 186.8 242.7 185.4 245.5C184 248.3 172.9 275.5999999999999 168.3 286.7C163.8 297.5 159.2 296 155.8 296.2C152.6 296.3999999999999 148.9 296.3999999999999 145.2 296.3999999999999C141.5 296.3999999999999 135.5 294.9999999999999 130.4 289.4999999999999C125.3 283.8999999999999 111 270.4999999999999 111 243.2C111 215.8999999999999 130.9 189.5 133.6 185.8C136.4 182.1 172.7 126.1 228.4 101.9999999999999C263.6 86.8 277.4 85.4999999999999 295 88.1C305.7 89.7 327.8 101.4999999999999 332.4 114.5C337 127.5 337 138.6 335.6 140.8999999999999C334.3 143.3999999999999 330.6 144.7999999999999 325.1 147.5z" />
-    <glyph glyph-name="whmcs"
-      unicode="&#xF40D;"
-      horiz-adv-x="448" d=" M448 287V308.3L419.5 317.1L417.3 327.5L437.4000000000001 348.2000000000001L427 367.6L398 360.1L390.8 367.6L398.3 395.8L379.2 407.4L357.9 386.4L347.2 389.6L340.2 416H317.6L311.4 389.6L299.3 386.4L279.6 407.4L260.2 396.4L268.3 368.7L260.2 360.3L231.7 367.8L220.7 348.7L241.4 327.7L238.5 317.3L210 309.5L209.7 287.8L238.5 280.3L240.9 268.2L220.8 248.3L231.2 229.8L260.8 237.3L268 228.7L259.9 201.8L279.8 190.2L299.2 210.6L310.8 207.7L317.5 179.2L340.1 178.9L346.8 207.7L358.4 211.2L379.1 189.6L399.5 201.7L390.7 229.7L398.5 237.8L427.3 229L437.6 249.1L416.7 267.9L418.9 280L448 287zM328.8 241.8C297.5 241.8 272 267.2000000000001 272 298.6S297.4 355.4000000000001 328.8 355.4000000000001S385.6 330 385.6 298.6C385.6 267.1 360.2000000000001 241.8 328.8 241.8zM401.1 225.4L448 210.9V171L392.9 157.6L388.8 134.9L427.7 99.6L408.5 61.7000000000001L354.5 78.4L339.8999999999999 63.2000000000001L356.5999999999999 10.7L318.2999999999999 -11.9999999999999L279.3999999999999 28.5000000000001L257.7 21.9L245.1 -32.1L202.6999999999999 -31.6L190.0999999999999 22.0000000000001L168.4 27.6000000000001L132 -10.7999999999999L94.5999999999999 10.9000000000001L109.7999999999999 61.4000000000001L96.0999999999999 77.5000000000001L40.5999999999999 63.4000000000001L20.8999999999999 98.2000000000001L58.7999999999999 135.6000000000001L53.9999999999999 158.4000000000001L-1e-13 172.5000000000001L0.4999999999999 213.4000000000001L54 228.1L59.7 247.8L20.8 287.2L41.5 323L95.1 308.9L110.3 324.6L95.1 376.6L131.5 397.3L168.3 357.9L191 364L202.6 416H245L256.6 370.1L234 376L227.7 377.7L224.4 372L213.4 352.9L210.1 347.3L214.7 342.7000000000001L231.9 325.3L231.6 324.3L207.7999999999999 317.8L201.5999999999999 316.1L201.5 309.7000000000001L201.3 296.8C153.8 286.4 118 244 118 193.3C118 135 165.3 87.6 223.7 87.6C274.2 87.6 316.4 123 326.9 170.4L340.1 170.2000000000001L347 170.1L348.6 176.8L354.2 200.8L356.1 201.4L373.2 183.6L377.9 178.7000000000001L383.7 182.1L404.1 194.2L409.9 197.7L407.9 204.2L401.1 225.4z" />
-    <glyph glyph-name="wikipedia-w"
-      unicode="&#xF266;"
-      horiz-adv-x="640" d=" M640 396.8L639.7 384.6C611.6 383.8 594.7 368.8 583.9000000000001 344.3C558.9000000000001 286.5 480.6000000000001 104.3 428.6000000000001 -14.3H415L333.1 178.8C300.6 115.1999999999999 264.8 48.8 233.9000000000001 -14.3000000000001C233.6 -14.6000000000001 218.9 -14.3000000000001 218.9 -14.0000000000001C172 95.7 122.8 204.6 75.8 314.6C64.4 341.3 26.4 384.6 0.2 384.3C0.2 387.4 -0.1 394.3 -0.1 398.5H161.8V384.6C142.6 383.5 109 371.3 118.5 350.4C140.4 300.7 222.1 110.1 244.1 61.8C259.1 91.4999999999999 301.9000000000001 171 319.4000000000001 204.6C305.5000000000001 232.9 260.8 338.5 246.6 364.6C236.9000000000001 382.4 210.5 384 190.8 384.3V398.2L333.3 397.9V384.8C313.9000000000001 384.2 295.2 377 303.9000000000001 358.7C322.8 318.7 334.5000000000001 290.6 352.0000000000001 254C357.6000000000001 264.8 386.7000000000001 323.4 400.1000000000001 354.8C409.0000000000001 375.4 396.2000000000001 383.4 361.5000000000001 384.2C361.8000000000001 387.8 361.5000000000001 394.5 361.8000000000001 397.8C406.2000000000001 398.1 472.9000000000001 398.1 484.9000000000001 398.4V384.8C462.4000000000001 384 439.1000000000001 372 426.8000000000001 353.1L367.6000000000001 230.3C374.0000000000001 214.2 430.9000000000001 87.5 436.8000000000001 73.6L559.2 356.2C550.6 379.3 522.8000000000001 384.3 512 384.5V398.4L639.8 397.3L640 396.8z" />
-    <glyph glyph-name="windows"
-      unicode="&#xF17A;"
-      horiz-adv-x="448" d=" M0 354.3L183.6 379.6V202.2H0V354.3zM0 29.7L183.6 4.4V179.6H0V29.7zM203.8 1.7L448 -32V179.6H203.8V1.7zM203.8 382.3V202.2H448V416L203.8 382.3z" />
-    <glyph glyph-name="wix"
-      unicode="&#xF5CF;"
-      horiz-adv-x="640" d=" M393.38 316.31C393.38 303.28 395.46 283.62 364.7 272.48C355.18 269.0300000000001 348.75 262.8200000000001 348.75 262.8200000000001C348.75 293.8200000000001 353.4700000000001 305.04 366.15 311.68C375.9 316.79 393.38 316.31 393.38 316.31zM277.58 280.77L243.34 148.11L214.86 256.68C207.17 288.67 194.05 305.2100000000001 166.43 305.2100000000001C139.06 305.2100000000001 125.77 289.03 118 256.68L89.52 148.11L55.28 280.77C49.73 307.49 23.86 319.04 0 316.04L65.57 68.11S87.2 66.55 98.03 72.07C112.25 79.32 119.01 84.91 127.62 118.64C135.29 148.71 156.73 237.05 158.74 243.34C163.5 258.28 169.83 257.15 174.14 243.34C176.11 237.04 197.59 148.71 205.26 118.64C213.86 84.91 220.63 79.32 234.85 72.07C245.67 66.55 267.31 68.11 267.31 68.11L332.88 316.04C308.46 319.11 283.06 307.11 277.58 280.77zM393.36 275.56S389.26 269.2200000000001 379.9000000000001 263.99C373.8900000000001 260.63 368.1200000000001 258.35 361.9300000000001 255.38C346.7900000000001 248.12 348.7500000000001 241.43 348.7500000000001 220.18V68.11S365.3000000000001 66.02 376.1200000000001 71.54C390.0500000000001 78.64 393.2500000000001 85.49 393.3800000000001 116.3200000000001V266.5900000000001L393.3600000000001 266.5800000000001V275.56zM556.8 191.48L640 315.2200000000001S604.89 321.2 587.5 305.37C574.2 293.27 563.09 275.82 533.32 232.9C532.85 232.17 527.07 222.36 520.25 232.9C490.96 275.13 479.45 293.19 466.07 305.37C448.68 321.2 413.57 315.2200000000001 413.57 315.2200000000001L496.77 191.48L413.8 68.12S450.3699999999999 63.5 467.7499999999999 79.33C479.24 89.79 485.3299999999999 99.7 520.26 150.05C527.0699999999999 160.5699999999999 532.83 150.8199999999999 533.33 150.05C562.73 107.67 572.5600000000001 91.99 586.47 79.3299999999999C603.86 63.4999999999999 639.7900000000001 68.12 639.7900000000001 68.12L556.8 191.48z" />
-    <glyph glyph-name="wolf-pack-battalion"
-      unicode="&#xF514;"
-      horiz-adv-x="456.58" d=" M239.73 -23.53L250.29 -39.3699999999999L255.57 -27.05L260.85 -34.09V-64C281.91 -56.08 281.96 2.86 286.36 33.21C290.98 65.1 285.48 126.02 367.73 182.32C358.85 205.93 355.73 231.75 365.09 262.37C392.96 259.03 419.03 251.79 428.43 208.27L398.08 199.91C409.2299999999999 176.87 415.0899999999999 153.15 411.2799999999999 127.7700000000001L384 134.82L377.84 101.39L359.37 108.43L350.57 75L331.22 82.04L357.61 60.93L366.41 89.08L391.04 83.8L398.08 119.43L424.47 104.91C424.72 124.93 431.44 162.97 415.67 189.36L442.06 184.0800000000001C446.05 206.15 439.68 223.2900000000001 434.14 240.8200000000001L456.5699999999999 231.1400000000001C456.1299999999999 256.2100000000001 426.63 287.9300000000001 394.99 289.6400000000001C374.77 290.73 338.25 314.8100000000001 340.89 341.5400000000001C342.8499999999999 361.4100000000001 358.3399999999999 384.1600000000001 384 391.2400000000001C340.01 354.73 374.32 323.9400000000001 389.2799999999999 317.7800000000001C393.6799999999999 329.2200000000001 406.82 386.8600000000001 389.2799999999999 447.98C348.81 425.1100000000001 299.5499999999999 382.8800000000001 296.0299999999999 300.1900000000001L237.9699999999999 261.48L234.4499999999999 168.23L341.7799999999999 228.05L348.82 221.01L331.23 217.49L287.24 178.78L271.4 184.06L243.25 134.8L239.73 15.16L260.84 -0.6799999999999L228.29 -16.5199999999999L195.74 -0.6799999999999L216.85 15.16L213.33 134.8L185.18 184.06L169.34 178.78L125.3499999999999 217.4900000000001L107.7599999999999 221.0100000000001L114.8 228.0500000000001L222.13 168.23L218.6099999999999 261.48L160.5499999999999 300.1900000000001C157.03 382.9 107.77 425.13 67.3 448C49.76 386.88 62.9 329.24 67.3 317.8C82.26 323.9600000000001 116.56 354.75 72.58 391.26C98.24 384.18 113.73 361.43 115.69 341.56C118.32 314.82 81.81 290.75 61.59 289.66C29.94 287.94 0.44 256.2200000000001 0 231.15L22.43 240.83C16.89 223.3 10.52 206.16 14.51 184.09L40.9 189.37C25.14 162.98 31.85 124.94 32.1 104.92L58.49 119.44L65.53 83.81L90.16 89.09L98.96 60.94L125.35 82.05L106.01 75L97.21 108.43L78.74 101.39L72.58 134.82L45.31 127.78C41.49 153.16 47.36 176.88 58.51 199.92L28.16 208.28C37.56 251.8 63.63 259.05 91.5 262.38C100.86 231.76 97.74 205.93 88.86 182.33C171.11 126.03 165.61 65.1 170.23 33.22C174.63 2.8699999999999 174.68 -56.07 195.74 -63.99V-34.08L201.02 -27.04L206.3 -39.36L216.86 -23.52L228.3 -44.63L239.73 -23.53zM318.9 71.48L303.06 82.04C310.5300000000001 86.4 316.82 90.46 322.4100000000001 94.36C321.81 87.1 322.1400000000001 80.48 318.9000000000001 71.48zM347.05 120.74C346.65 109.8 346.15 99.08 345.29 89.07C337.44 90.93 329.72 92.87 324.18 96.11C332.42 104.01 339.73 112.38 347.05 120.74zM371.68 115.46C371.66 128.8900000000001 369.63 139.67 366.4 148.8900000000001C361.02 139.8000000000001 355.17 130.71 347.93 121.6200000000001L371.68 115.46zM375.2 196.4C394.64 183.59 403 162.74 405.11 140.1C392.79 144.63 380.48 149.41 368.16 150.66C373.22 162.65 374.81 178.8 375.2 196.4zM373.44 242.1400000000001C374.25 227.8400000000001 375.2799999999999 213.3200000000001 375.2 199.9100000000001C394.42 208.0200000000001 404.9799999999999 209.6300000000001 419.19 213.9900000000001C408.5899999999999 232.9400000000001 391.9699999999999 239.5100000000001 373.44 242.1400000000001zM137.68 71.48L153.52 82.04C146.05 86.4 139.76 90.46 134.17 94.36C134.77 87.1 134.44 80.48 137.68 71.48zM109.53 120.74C109.93 109.8 110.43 99.08 111.29 89.07C119.14 90.93 126.86 92.87 132.4 96.11C124.16 104.01 116.85 112.38 109.53 120.74zM84.89 115.46C84.91 128.8900000000001 86.94 139.67 90.17 148.8900000000001C95.55 139.8000000000001 101.4 130.71 108.64 121.6200000000001L84.89 115.46zM81.37 196.4C61.93 183.59 53.57 162.74 51.46 140.1C63.78 144.63 76.09 149.41 88.41 150.66C83.36 162.65 81.76 178.8 81.37 196.4zM83.13 242.1400000000001C82.32 227.8400000000001 81.29 213.3200000000001 81.37 199.9100000000001C62.15 208.0200000000001 51.59 209.6300000000001 37.38 213.9900000000001C47.99 232.9400000000001 64.6 239.5100000000001 83.13 242.1400000000001z" />
-    <glyph glyph-name="wordpress-simple"
-      unicode="&#xF411;"
-      horiz-adv-x="512" d=" M256 440C119.3 440 8 328.8 8 192C8 55.3 119.3 -56 256 -56S504 55.3 504 192C504 328.8 392.7 440 256 440zM33 192C33 224.3 39.9 255 52.3 282.7L158.7 -8.7C84.3 27.5 33 103.8 33 192zM256 -31C234.1 -31 213 -27.8 193 -21.9L259.9 172.5L328.4 -15.3C328.9 -16.4 329.4 -17.4 330 -18.4C306.9 -26.5000000000001 282 -31.0000000000001 256 -31.0000000000001zM286.7 296.5C300.1 297.2 312.2 298.6 312.2 298.6C324.2 300 322.8 317.7 310.8 317C310.8 317 274.7 314.2 251.4 314.2C229.5 314.2 192.7 317 192.7 317C180.7 317.7 179.3 299.3 191.3 298.6C191.3 298.6 202.7 297.2 214.7 296.5L249.4 201.3L200.6 55L119.4 296.5C132.8 297.2 144.9 298.6 144.9 298.6C156.9 300 155.5 317.7 143.5 317C143.5 317 107.4 314.2 84.1 314.2C79.9 314.2 75 314.3 69.7 314.5C109.6 375 178.1 415 256 415C314 415 366.9 392.8 406.6 356.5C405.6 356.6 404.7000000000001 356.7 403.7000000000001 356.7C381.8000000000001 356.7 366.3000000000001 337.6 366.3000000000001 317.1C366.3000000000001 298.7 376.9000000000001 283.2 388.2000000000001 264.8C396.7000000000001 250 406.6 230.9 406.6 203.3C406.6 184.2 399.3 162.1 389.6 131.2000000000001L367.4000000000001 56.9L286.7000000000001 296.5zM368.1 -0.7L436.2000000000001 196.2C448.9000000000001 228.0000000000001 453.2 253.4000000000001 453.2 276.1C453.2 284.3 452.7 291.9000000000001 451.7 299C469.1 267.2000000000001 479.0000000000001 230.8 479.0000000000001 192C479.0000000000001 109.7000000000001 434.4000000000001 37.9 368.1 -0.6999999999999z" />
-    <glyph glyph-name="wordpress"
-      unicode="&#xF19A;"
-      horiz-adv-x="512" d=" M61.7 278.6L163.2 0.6C92.2 35 43.3 107.8 43.3 192C43.3 222.9 49.9 252.1 61.7 278.6zM399.6 202.7C399.6 229 390.2 247.2 382.1 261.4C371.3 278.9 361.2 293.8 361.2 311.3C361.2 330.9 376 349.1 396.9 349.1C397.8 349.1 398.7 349 399.7 348.9C361.8 383.6 311.4 404.8 256 404.8C181.7 404.8 116.3 366.7 78.2 308.9C83.2 308.7 87.9 308.6 91.9 308.6C114.1 308.6 148.6 311.3 148.6 311.3C160.1 312 161.4 295.1 150 293.8C150 293.8 138.5 292.5 125.7 291.8L203.2 61.4L249.8 201L216.7 291.8C205.2 292.5 194.4 293.8 194.4 293.8C182.9 294.5 184.3 312 195.7 311.3C195.7 311.3 230.8 308.6 251.7 308.6C273.9000000000001 308.6 308.4000000000001 311.3 308.4000000000001 311.3C319.9000000000001 312 321.2000000000001 295.1 309.8 293.8C309.8 293.8 298.3 292.5 285.5 291.8L362.4 63.1L383.6 134C392.6 163.4 399.6 184.5 399.6 202.7zM259.7 173.4L195.8999999999999 -12.1C214.9999999999999 -17.7 235.0999999999999 -20.8 255.9999999999999 -20.8C280.7999999999999 -20.8 304.4999999999999 -16.5 326.5999999999999 -8.7C325.9999999999999 -7.8 325.4999999999999 -6.8 325.0999999999999 -5.8L259.7 173.4zM442.7 294.1C443.5999999999999 287.3 444.0999999999999 280.1 444.0999999999999 272.2C444.0999999999999 250.6 440.0999999999999 226.4 427.8999999999999 196L362.8999999999999 8.0999999999999C426.2 45 468.7 113.5 468.7 192C468.7 229 459.3 263.8 442.7 294.1zM504 192C504 55.2 392.7 -56 256 -56C119.2 -56 8 55.3 8 192C8 328.8 119.2 440 256 440C392.7 440 504 328.8 504 192zM492.6 192C492.6 322.5 386.4000000000001 428.6 256 428.6C125.5 428.6 19.4 322.5 19.4 192S125.6 -44.6 256 -44.6C386.5 -44.6 492.6 61.5 492.6 192z" />
-    <glyph glyph-name="wpbeginner"
-      unicode="&#xF297;"
-      horiz-adv-x="512" d=" M462.799 125.626C519.01 61.318 466.961 -32 370.944 -32C331.3420000000001 -32 292.12 -14.313 270.802 18.04C263.915 17.684 248.1 17.684 241.212 18.04C219.848 -14.381 180.588 -32 141.069 -32C45.579 -32 -7.279 60.996 49.214 125.626C-29.925 257.477 80.479 416 256.006 416C431.638 416 541.876 257.374 462.799 125.626zM123.152 208.598H164.681V266.673H123.152V208.598zM340.332 122.526V146.365C279.826 125.4499999999999 207.977 137.167 152.743 180.336L152.989 155.439C204.09 109.072 284.735 97.564 340.332 122.526zM189.579 208.598H355.637V266.673H189.579V208.598z" />
-    <glyph glyph-name="wpexplorer"
-      unicode="&#xF2DE;"
-      horiz-adv-x="512" d=" M512 192C512 50.8 397.3 -64 256 -64C114.8 -64 0 50.7 0 192S114.7 448 256 448S512 333.3 512 192zM480 192C480 315.2 379.7 416 256 416C132.5 416 32 315.5 32 192S132.5 -32 256 -32S480 68.5 480 192zM160.9 323.4L247.8 286.3L210.7 199.4L123.8 236.5L160.9 323.4zM270.9 154.3L317.5 60.3H302.9L252.9 160.3L204 60.3H190L241.1 167.2000000000001L218.8 176.6L224.8 190.6L293.4 161.5L287.4 147.2L270.9 154.3zM259.1 270.6L327.7 241.2L298.3 172.9L230 202L259.1 270.6zM339.4 227.7L394 204.6L370.6 150.3L316.3 173.4L339.4000000000001 227.7000000000001z" />
-    <glyph glyph-name="wpforms"
-      unicode="&#xF298;"
-      horiz-adv-x="448" d=" M448 372.8V11.1C448 -13.2 429 -32.1 404.8 -32.1H43.2C19.3 -32 0 -13.4 0 11.2V372.8C0 396.9 18.8 416 43.2 416H404.9C428.9 416 448 397.2 448 372.8zM410.7 11.2V372.8C410.7 375.8 408.1 378.6 404.9 378.6H395.6L285.3 304L224 353.9L162.8 304L52.5 378.7H43.2C40 378.7 37.4 375.9 37.4 372.9V11.2C37.4 8.2 40 5.4 43.2 5.4H404.9C408.1 5.3 410.7 8.1 410.7 11.2zM150.2 262V225H76.7V262H150.2zM150.2 187.6V150.3H76.7V187.6H150.2zM161.3 334.9000000000001L215.3 378.6H96.8L161.3 334.9000000000001zM371.3 262V225H175.3V262H371.3zM371.3 187.6V150.3H175.3V187.6H371.3zM286.7 334.9000000000001L351.2 378.6H232.8L286.7 334.9000000000001zM371.3 113V75.7H271.9V113H371.3z" />
-    <glyph glyph-name="xbox"
-      unicode="&#xF412;"
-      horiz-adv-x="512" d=" M369.9 129.8C414.2 75.5 434.6 31 424.3 11.1C416.4 -4 367.6 -33.5 331.7 -44.8C302.0999999999999 -54.1 263.3 -58.1 231.3 -54.9999999999999C193.0999999999999 -51.3 154.3999999999999 -37.6 121.1999999999999 -15.9999999999999C93.3 2.2 87 9.7 87 24.6C87 54.5 119.9 106.9 176.2 166.7000000000001C208.2 200.6000000000001 252.7 240.4000000000001 257.6 239.3000000000001C267 237.2000000000001 341.9000000000001 164.2000000000001 369.9000000000001 129.8000000000001zM188.6 304.2C158.9 331.1 130.5 358.1 102.2 367.6C87 372.7 85.9 372.4 73.5 359.5C44.3 329.1 20 279.8 13.2 237.1C7.8 202.9 7.1 193.3 9 176.6C14.6 126.1 26.3 91.2000000000001 49.5 55.7C59 41.1 61.6 38.4 58.8 45.8000000000001C54.6 56.8000000000001 58.5 83.3000000000001 68.3 109.8000000000001C82.6 148.8000000000001 122.2 222.7000000000001 188.6 304.2000000000001zM500.2 240.7C483.3 320.7 432.7 371 425.6 371C418.3 371 401.4000000000001 364.5 389.6 357.1C366.3 342.6 348.6 325.7 325.3 304.3C367.7 251 427.5 164.9 448.2 102C455 81.3 457.9 60.9 455.6 49.7C453.9 41.2 453.9 41.2 456.9999999999999 45.1C463.1 52.8 476.8999999999999 76.4 482.3999999999999 88.6C489.7999999999999 104.8 497.3999999999999 128.8 500.9999999999999 147.3C505.3 169.8 504.8999999999999 218.1 500.1999999999999 240.7zM141.3 405C189 407.5 251 370.5 255.6 369.6C256.3 369.5 266 373.8 277.2 379.3C341.1 410.4 371.2 405.1 384.6 404.5C320.7000000000001 443.8 231.9000000000001 454.5 150.7 416.2C127.3 405.1 126.7 404.3 141.3 405z" />
-    <glyph glyph-name="xing-square"
-      unicode="&#xF169;"
-      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM140.4 127.8H93.8C88.3 127.8 85.1 133.1 87.8 138.1L137.1 224.8C137.2 224.8 137.2 224.9 137.1 225L105.7 279C102.7 284.6 105.9 289.1 111.7 289.1H158.3C163.5 289.1 167.8 286.2 171.2 280.4L203.1 225.1C201.8 222.8 185.1 193.4 153 136.9C149.5 130.7000000000001 145.3 127.8 140.4 127.8zM360.1 341.9L257.3 161.2V161L322.8 42C325.6 36.9 322.9000000000001 31.9 316.8 31.9H270.2C264.7 31.9 260.5 34.8 257.3 40.6L191.3 160.9C193.6 165 228.1 225.8 294.7000000000001 343.2C298.0000000000001 349 302.1 351.9 307.2000000000001 351.9H354.1C359.8 352 362.9000000000001 347.2 360.1 341.9z" />
-    <glyph glyph-name="xing"
-      unicode="&#xF168;"
-      horiz-adv-x="384" d=" M162.7 238C160.9 234.7 137.5 193.6 92.6 114.5C87.7 106.2 81.8 102 74.9 102H9.8C2.1 102 -2.3 109.5 1.3 116.4L70.3 237.7C70.5 237.7 70.5 237.8 70.3 238L26.4 313.6C22.1 321.4 26.7 327.7 34.9 327.7H100C107.3 327.7 113.3 323.6 118 315.5L162.7 238zM382.6 401.9L238.6 148.9V148.6L330.2 -18C334.1 -25.1 330.4 -32.1 321.7 -32.1H256.5C248.9 -32.1 242.9 -28.1 238.5 -19.9L146.1 148.6C149.4 154.4 197.6 239.4 290.9 403.8C295.5 411.9 301.3 416 308.4 416H374.1C382.1 416 386.4 409.3 382.6 401.9z" />
-    <glyph glyph-name="y-combinator"
-      unicode="&#xF23B;"
-      horiz-adv-x="448" d=" M448 416V-32H0V416H448zM236 160.5L313.5 306H280.8L235 215C230.3 205.7 226 196.7 222.2 188.2L210 215L164.8 306H129.8L206.5 162.2V67.7H236V160.5z" />
-    <glyph glyph-name="yahoo"
-      unicode="&#xF19E;"
-      horiz-adv-x="448" d=" M252 156L256 -64C243.3 -61.8 232.5 -60.1 223.7 -60.1C215.3 -60.1 204.5 -61.8 191.4 -64L195.4 156C140.4 250.8 85 352.8 21.4 448C33.3 444.9 44.4 444.1 54.6 444.1C63.6 444.1 75 444.9 88.7 448C129.6 375.8 170.8 309.3 223.7 222.5C261 284.1 314.8 366.6 358.6 448C369.7000000000001 445.1 380.6 444.1 391.5 444.1C403 444.1 414.7 445.1 426.5 448C392.1 400.1 294.9 231.1 252 156z" />
-    <glyph glyph-name="yandex-international"
-      unicode="&#xF414;"
-      horiz-adv-x="320" d=" M129.5 -64V102.1L18.5 400H74.3L156.1 170.3L250.2 448H301.5L180.8 100.2V-64H129.5z" />
-    <glyph glyph-name="yandex"
-      unicode="&#xF413;"
-      horiz-adv-x="256" d=" M153.1 132.2L65.7 -64H2L98 145.8C52.9 168.7 22.8 210.2 22.8 286.9C22.7 394.3 90.8 448 171.7 448H254V-64H198.9V132.2H153.1zM198.9 401.5H169.5C125.1 401.5 82.1 372.1 82.1 286.9C82.1 204.6 121.5 178.1 169.5 178.1H198.9V401.5z" />
-    <glyph glyph-name="yelp"
-      unicode="&#xF1E9;"
-      horiz-adv-x="384" d=" M136.9 120C135.9 119.7 27.7 84.3 21.1 84.3C5.9 85.2 2.6 100.5 1.2 115.5C-0.3 129.7 -0.2 145.3 1.5 162.3C3.4 181.1 7 207.4 25.7 206.3C30.5 206.3 92.8 180.4 138.4 161.9C155.5 155.1 157 126.1 136.9 120.0000000000001zM194.8 233.9C196.6 195.7 169.3 185.4 147.6 219.6L41.3 387.6C39.8 394.2 41.6 400 46.6 405C62.2 421.5 146 444.8 168.1 439.1C175.6 437.2 180.2 433 181.9 426.5C183.2 418.2 193.4 259.1 194.8 233.9zM193.4 69.1C193.4 64.5 193.6 -47.3 191.7 -52.4C189.4 -58.4 184.7 -62.1 177.4 -63.6C167.3 -65.2999999999999 150.3 -61.7 126.4 -52.9C104.4 -44.8 69.7 -31.4 77.1 -10.4C79.9 -3.5 128.5 52.4 154.4 83.2000000000001C166.4 98.4 194.2 88.7000000000001 193.4 69.1zM373.6 186.9C368 183.2000000000001 262.8 158.7000000000001 255.5000000000001 156.3L255.8000000000001 156.9C237.7000000000001 152.2000000000001 220.4 175.4 232.5000000000001 191.5000000000001C236.2 195.2000000000001 298.4000000000001 283.9000000000001 305.3 288.5000000000001C310.5 292.1 316.6 292.3000000000001 323.6 289.1C342 280.3000000000001 378.7000000000001 226.0000000000001 381 204.5000000000001C380.9 201.6000000000001 382.2 192.8000000000001 373.6 186.9zM383.7000000000001 56.2C381.0000000000001 35.6 339.2000000000001 -17.1999999999999 319.9000000000001 -24.8C313.0000000000001 -27.4 307.0000000000001 -26.8 302.2000000000001 -22.8C297.2000000000001 -19.3 240.4000000000001 74.3000000000001 237.3000000000001 79.5000000000001C226.4000000000001 95.7000000000001 244.1000000000001 119.3000000000001 262.9000000000001 112.7000000000001C262.9000000000001 112.7000000000001 373.4000000000001 77.0000000000001 377.6 73.3000000000001C382.8 69.2000000000001 384.8 63.5000000000001 383.7000000000001 56.2z" />
-    <glyph glyph-name="yoast"
-      unicode="&#xF2B1;"
-      horiz-adv-x="448" d=" M91.3 372H277.3L270.3 353.1H91.3C51.6 353.1 19.4 321.5 19.4 282.8V77.4C19.4 42 44.3 7.1 103.4 7.1V-12H91.3C41.2 -12 0 28.2 0 77.5V282.8C0 332.1 40.7 372 91.3 372zM320.4 428H386.9C243.1 49.9 241.2 29.1 202.2 -11.3C181.4 -32.9 152.9 -43 123.9 -44V7.1C173.1 14.8 188.5 57 188.5 82.4C188.5 102.5000000000001 189.1 95.0000000000001 106.4 305.6H167.8L218.2 149L320.4 428zM448 286.5V-12H234C240.6 -2.4 244.7 4.3 246.1 7.4H428.6V286.5C428.6 319 411.5 338.4 380.4000000000001 349.4L387.1 367C428.8 353.4 448 323.9 448 286.5z" />
-    <glyph glyph-name="youtube-square"
-      unicode="&#xF431;"
-      horiz-adv-x="448" d=" M186.8 245.9L282 191.8L186.8 137.7V245.9zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM406 191.7S406 251.3 398.4 279.9C394.2 295.7 381.9 308.1 366.2 312.3C337.9 320 224 320 224 320S110.1 320 81.8 312.3C66.1 308.1 53.8 295.7000000000001 49.6 279.9C42 251.4 42 191.7 42 191.7S42 132.1 49.6 103.5C53.8 87.7 66.1 75.8 81.8 71.6C110.1 64 224 64 224 64S337.9 64 366.2 71.7C381.9 75.9 394.2 87.8 398.4 103.6C406 132.1 406 191.6999999999999 406 191.6999999999999z" />
-    <glyph glyph-name="youtube"
-      unicode="&#xF167;"
-      horiz-adv-x="576" d=" M549.655 323.9170000000001C543.374 347.567 524.8679999999999 366.193 501.371 372.514C458.781 384 288 384 288 384S117.22 384 74.629 372.514C51.132 366.192 32.626 347.567 26.345 323.9170000000001C14.933 281.05 14.933 191.612 14.933 191.612S14.933 102.174 26.345 59.307C32.626 35.657 51.132 17.807 74.629 11.486C117.22 0 288 0 288 0S458.78 0 501.371 11.486C524.8679999999999 17.807 543.374 35.657 549.655 59.307C561.067 102.174 561.067 191.612 561.067 191.612S561.067 281.05 549.655 323.9170000000001zM232.145 110.409V272.815L374.884 191.61L232.145 110.409z" />
-  </font>
-</defs>
-</svg>
diff --git a/data/interfaces/default/fonts/font-awesome/fa-brands-400.ttf b/data/interfaces/default/fonts/font-awesome/fa-brands-400.ttf
deleted file mode 100644
index 2b00dae7..00000000
Binary files a/data/interfaces/default/fonts/font-awesome/fa-brands-400.ttf and /dev/null differ
diff --git a/data/interfaces/default/fonts/font-awesome/fa-brands-400.woff b/data/interfaces/default/fonts/font-awesome/fa-brands-400.woff
deleted file mode 100644
index 9e4b7e1c..00000000
Binary files a/data/interfaces/default/fonts/font-awesome/fa-brands-400.woff and /dev/null differ
diff --git a/data/interfaces/default/fonts/font-awesome/fa-brands-400.woff2 b/data/interfaces/default/fonts/font-awesome/fa-brands-400.woff2
deleted file mode 100644
index b9e58c5e..00000000
Binary files a/data/interfaces/default/fonts/font-awesome/fa-brands-400.woff2 and /dev/null differ
diff --git a/data/interfaces/default/fonts/font-awesome/fa-regular-400.eot b/data/interfaces/default/fonts/font-awesome/fa-regular-400.eot
deleted file mode 100644
index 5217c95f..00000000
Binary files a/data/interfaces/default/fonts/font-awesome/fa-regular-400.eot and /dev/null differ
diff --git a/data/interfaces/default/fonts/font-awesome/fa-regular-400.svg b/data/interfaces/default/fonts/font-awesome/fa-regular-400.svg
deleted file mode 100644
index 5f495431..00000000
--- a/data/interfaces/default/fonts/font-awesome/fa-regular-400.svg
+++ /dev/null
@@ -1,467 +0,0 @@
-<?xml version="1.0" standalone="no"?> 
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<defs>
-  <font id="fontawesome-free" horiz-adv-x="640">
-    <font-face font-family="Font Awesome 5 Free"
-      units-per-em="512" ascent="448"
-      descent="64"
-      font-weight="400"
-      font-style="Regular" />
-    <missing-glyph horiz-adv-x="0" />
-    <glyph glyph-name="address-book"
-      unicode="&#xF2B9;"
-      horiz-adv-x="448" d=" M436 288C442.6 288 448 293.4 448 300V340C448 346.6 442.6 352 436 352H416V400C416 426.5 394.5 448 368 448H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H368C394.5 -64 416 -42.5 416 -16V32H436C442.6 32 448 37.4 448 44V84C448 90.6 442.6 96 436 96H416V160H436C442.6 160 448 165.4 448 172V212C448 218.6 442.6 224 436 224H416V288H436zM368 -16H48V400H368V-16zM208 192C243.3 192 272 220.7 272 256S243.3 320 208 320S144 291.3 144 256S172.7 192 208 192zM118.4 64H297.6C310 64 320 72.6 320 83.2V102.4C320 134.2 289.9 160 252.8 160C242 160 234.1 152 208 152C181.1 152 174.6 160 163.2 160C126.1 160 96 134.2 96 102.4V83.2C96 72.6 106 64 118.4 64z" />
-    <glyph glyph-name="address-card"
-      unicode="&#xF2BB;"
-      horiz-adv-x="576" d=" M528 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H528C554.5 -32 576 -10.5 576 16V368C576 394.5 554.5 416 528 416zM528 16H48V368H528V16zM208 192C243.3 192 272 220.7 272 256S243.3 320 208 320S144 291.3 144 256S172.7 192 208 192zM118.4 64H297.6C310 64 320 72.6 320 83.2V102.4C320 134.2 289.9 160 252.8 160C242 160 234.1 152 208 152C181.1 152 174.6 160 163.2 160C126.1 160 96 134.2 96 102.4V83.2C96 72.6 106 64 118.4 64zM360 128H472C476.4 128 480 131.6 480 136V152C480 156.4 476.4 160 472 160H360C355.6 160 352 156.4 352 152V136C352 131.6 355.6 128 360 128zM360 192H472C476.4 192 480 195.6 480 200V216C480 220.4 476.4 224 472 224H360C355.6 224 352 220.4 352 216V200C352 195.6 355.6 192 360 192zM360 256H472C476.4 256 480 259.6 480 264V280C480 284.4 476.4 288 472 288H360C355.6 288 352 284.4 352 280V264C352 259.6 355.6 256 360 256z" />
-    <glyph glyph-name="angry"
-      unicode="&#xF556;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM248 136C214.4 136 182.8 121.2 161.2 95.4C152.7 85.2 154.1 70.1 164.3 61.6S189.6 54.4 198.1 64.6C222.9 94.3 273.1 94.3 297.9 64.6C306 54.9 321.1 52.7 331.7 61.6C341.9 70.1 343.2 85.2 334.8 95.4C313.2 121.2 281.6 136 248 136zM200 208C210.3 208 219.9 214.7 223 225.1C226.8 237.8 219.6 251.2 206.9 255L126.9 279C114.1 282.9 100.8 275.6 97 262.9C93.2 250.2 100.4 236.8 113.1 233L141.3 224.5C138.2 219.6 136 214.1 136 207.9C136 190.2 150.3 175.9 168 175.9S200 190.3 200 208zM399 262.9C395.2 275.6 381.9 282.8 369.1 279L289.1 255C276.4000000000001 251.2 269.2000000000001 237.8 273 225.1C276.1 214.7 285.7 208 296 208C296 190.3 310.3 176 328 176S360 190.3 360 208C360 214.2 357.8 219.7 354.7 224.6L382.9 233.1C395.6 236.8 402.8 250.2 399 262.9z" />
-    <glyph glyph-name="arrow-alt-circle-down"
-      unicode="&#xF358;"
-      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM256 -8C145.5 -8 56 81.5 56 192S145.5 392 256 392S456 302.5 456 192S366.5 -8 256 -8zM224 308V192H157C146.3 192 141 179.1 148.5 171.5L247.5 72.5C252.2 67.8 259.8 67.8 264.5 72.5L363.5 171.5C371.1 179.1 365.7 192 355 192H288V308C288 314.6 282.6 320 276 320H236C229.4 320 224 314.6 224 308z" />
-    <glyph glyph-name="arrow-alt-circle-left"
-      unicode="&#xF359;"
-      horiz-adv-x="512" d=" M8 192C8 55 119 -56 256 -56S504 55 504 192S393 440 256 440S8 329 8 192zM456 192C456 81.5 366.5 -8 256 -8S56 81.5 56 192S145.5 392 256 392S456 302.5 456 192zM384 212V172C384 165.4 378.6 160 372 160H256V93C256 82.3 243.1 77 235.5 84.5L136.5 183.5C131.8 188.2 131.8 195.8 136.5 200.5L235.5 299.5C243.1 307.1 256 301.7 256 291V224H372C378.6 224 384 218.6 384 212z" />
-    <glyph glyph-name="arrow-alt-circle-right"
-      unicode="&#xF35A;"
-      horiz-adv-x="512" d=" M504 192C504 329 393 440 256 440S8 329 8 192S119 -56 256 -56S504 55 504 192zM56 192C56 302.5 145.5 392 256 392S456 302.5 456 192S366.5 -8 256 -8S56 81.5 56 192zM128 172V212C128 218.6 133.4 224 140 224H256V291C256 301.7 268.9 307 276.5 299.5L375.5 200.5C380.2 195.8 380.2 188.2 375.5 183.5L276.5 84.5C268.9 76.9 256 82.3 256 93V160H140C133.4 160 128 165.4 128 172z" />
-    <glyph glyph-name="arrow-alt-circle-up"
-      unicode="&#xF35B;"
-      horiz-adv-x="512" d=" M256 -56C393 -56 504 55 504 192S393 440 256 440S8 329 8 192S119 -56 256 -56zM256 392C366.5 392 456 302.5 456 192S366.5 -8 256 -8S56 81.5 56 192S145.5 392 256 392zM276 64H236C229.4 64 224 69.4 224 76V192H157C146.3 192 141 204.9 148.5 212.5L247.5 311.5C252.2 316.2 259.8 316.2 264.5 311.5L363.5 212.5C371.1 204.9 365.7 192 355 192H288V76C288 69.4 282.6 64 276 64z" />
-    <glyph glyph-name="bell-slash"
-      unicode="&#xF1F6;"
-      horiz-adv-x="576" d=" M130.9 48C114.138 48 105.765 68.39 117.566 80.191C142.792 105.417 163.66 129.5290000000001 168.215 201.6710000000001L121.438 242.9450000000001A168.48 168.48 0 0 1 121.142 233.1430000000001C121.142 151.21 103.591 133.8510000000001 86.599 117.0650000000001C38.504 69.559 73.726 0 130.919 0H224C224 -35.346 252.654 -64 288 -64S352 -35.346 352 0H396.777L342.377 48H130.9zM288 -24C274.766 -24 264 -13.234 264 0H312C312 -13.234 301.234 -24 288 -24zM571.867 -24.553L503.936 35.018C517.04 59.136 515.4599999999999 91.336 489.404 117.0600000000001C472.415 133.8450000000001 454.858 151.2030000000001 454.858 233.1430000000001C454.858 316.1690000000001 393.9 385.2170000000001 314.391 397.9050000000001A31.848 31.848 0 0 1 320 416C320 433.673 305.673 448 288 448S256 433.673 256 416A31.848 31.848 0 0 1 261.609 397.905C220.138 391.287 183.718 369.334 158.36 338.064L36.459 444.963C31.401 449.399 23.682 448.919 19.219 443.892L3.056 425.687C-1.407 420.6600000000001 -0.925 412.988 4.134 408.553L539.542 -60.963C544.6 -65.399 552.3190000000001 -64.919 556.782 -59.892L572.945 -41.687C577.407 -36.66 576.9250000000001 -28.988 571.8670000000001 -24.553zM288 352C353.538 352 406.857 298.681 406.857 233.143C406.857 135.493 430.078 108.569 458.425 80.191C461.333 77.283 462.9979999999999 73.8630000000001 463.634 70.359L194.482 306.3880000000001C216.258 334.133 250.075 352 288 352z" />
-    <glyph glyph-name="bell"
-      unicode="&#xF0F3;"
-      horiz-adv-x="448" d=" M425.403 117.061C408.4140000000001 133.846 390.8570000000001 151.204 390.8570000000001 233.144C390.8570000000001 316.17 329.899 385.218 250.39 397.906A31.842999999999996 31.842999999999996 0 0 1 256 416C256 433.673 241.673 448 224 448S192 433.673 192 416A31.848 31.848 0 0 1 197.609 397.905C118.101 385.217 57.143 316.169 57.143 233.143C57.143 151.21 39.592 133.851 22.6 117.065C-25.496 69.559 9.726 0 66.919 0H160C160 -35.346 188.654 -64 224 -64C259.346 -64 288 -35.346 288 0H381.08C438.27 0 473.495 69.583 425.403 117.061zM224 -24C210.766 -24 200 -13.234 200 0H248C248 -13.234 237.234 -24 224 -24zM381.092 48H66.9C50.138 48 41.765 68.39 53.566 80.191C82.151 108.776 105.143 135.915 105.143 233.1430000000001C105.143 298.6810000000001 158.462 352 224 352S342.857 298.681 342.857 233.143C342.857 135.493 366.078 108.569 394.425 80.191C406.278 68.339 397.783 48 381.092 48z" />
-    <glyph glyph-name="bookmark"
-      unicode="&#xF02E;"
-      horiz-adv-x="384" d=" M336 448H48C21.49 448 0 426.51 0 400V-64L192 48L384 -64V400C384 426.51 362.51 448 336 448zM336 19.57L192 103.57L48 19.57V394A6 6 0 0 0 54 400H330C333.314 400 336 397.317 336 394.004V19.57z" />
-    <glyph glyph-name="building"
-      unicode="&#xF1AD;"
-      horiz-adv-x="448" d=" M128 300V340C128 346.6 133.4 352 140 352H180C186.6 352 192 346.6 192 340V300C192 293.4 186.6 288 180 288H140C133.4 288 128 293.4 128 300zM268 288H308C314.6 288 320 293.4 320 300V340C320 346.6 314.6 352 308 352H268C261.4 352 256 346.6 256 340V300C256 293.4 261.4 288 268 288zM140 192H180C186.6 192 192 197.4 192 204V244C192 250.6 186.6 256 180 256H140C133.4 256 128 250.6 128 244V204C128 197.4 133.4 192 140 192zM268 192H308C314.6 192 320 197.4 320 204V244C320 250.6 314.6 256 308 256H268C261.4 256 256 250.6 256 244V204C256 197.4 261.4 192 268 192zM192 108V148C192 154.6 186.6 160 180 160H140C133.4 160 128 154.6 128 148V108C128 101.4 133.4 96 140 96H180C186.6 96 192 101.4 192 108zM268 96H308C314.6 96 320 101.4 320 108V148C320 154.6 314.6 160 308 160H268C261.4 160 256 154.6 256 148V108C256 101.4 261.4 96 268 96zM448 -28V-64H0V-28C0 -21.4 5.4 -16 12 -16H31.5V424C31.5 437.3 42.2 448 55.5 448H392.5C405.8 448 416.5 437.3 416.5 424V-16H436C442.6 -16 448 -21.4 448 -28zM79.5 -15H192V52C192 58.6 197.4 64 204 64H244C250.6 64 256 58.6 256 52V-15H368.5V399L80 400L79.5 -15z" />
-    <glyph glyph-name="calendar-alt"
-      unicode="&#xF073;"
-      horiz-adv-x="448" d=" M148 160H108C101.4 160 96 165.4 96 172V212C96 218.6 101.4 224 108 224H148C154.6 224 160 218.6 160 212V172C160 165.4 154.6 160 148 160zM256 172V212C256 218.6 250.6 224 244 224H204C197.4 224 192 218.6 192 212V172C192 165.4 197.4 160 204 160H244C250.6 160 256 165.4 256 172zM352 172V212C352 218.6 346.6 224 340 224H300C293.4 224 288 218.6 288 212V172C288 165.4 293.4 160 300 160H340C346.6 160 352 165.4 352 172zM256 76V116C256 122.6 250.6 128 244 128H204C197.4 128 192 122.6 192 116V76C192 69.4 197.4 64 204 64H244C250.6 64 256 69.4 256 76zM160 76V116C160 122.6 154.6 128 148 128H108C101.4 128 96 122.6 96 116V76C96 69.4 101.4 64 108 64H148C154.6 64 160 69.4 160 76zM352 76V116C352 122.6 346.6 128 340 128H300C293.4 128 288 122.6 288 116V76C288 69.4 293.4 64 300 64H340C346.6 64 352 69.4 352 76zM448 336V-16C448 -42.5 426.5 -64 400 -64H48C21.5 -64 0 -42.5 0 -16V336C0 362.5 21.5 384 48 384H96V436C96 442.6 101.4 448 108 448H148C154.6 448 160 442.6 160 436V384H288V436C288 442.6 293.4 448 300 448H340C346.6 448 352 442.6 352 436V384H400C426.5 384 448 362.5 448 336zM400 -10V288H48V-10C48 -13.3 50.7 -16 54 -16H394C397.3 -16 400 -13.3 400 -10z" />
-    <glyph glyph-name="calendar-check"
-      unicode="&#xF274;"
-      horiz-adv-x="448" d=" M400 384H352V436C352 442.627 346.627 448 340 448H300C293.373 448 288 442.627 288 436V384H160V436C160 442.627 154.627 448 148 448H108C101.373 448 96 442.627 96 436V384H48C21.49 384 0 362.51 0 336V-16C0 -42.51 21.49 -64 48 -64H400C426.51 -64 448 -42.51 448 -16V336C448 362.51 426.51 384 400 384zM394 -16H54A6 6 0 0 0 48 -10V288H400V-10A6 6 0 0 0 394 -16zM341.151 184.65L198.842 43.481C194.137 38.814 186.539 38.844 181.871 43.549L106.78 119.248C102.113 123.953 102.143 131.551 106.848 136.219L129.567 158.755C134.272 163.422 141.87 163.392 146.537 158.686L190.641 114.225L301.713 224.406C306.418 229.073 314.016 229.043 318.6840000000001 224.3379999999999L341.2200000000001 201.62C345.887 196.9149999999999 345.8560000000001 189.317 341.151 184.65z" />
-    <glyph glyph-name="calendar-minus"
-      unicode="&#xF272;"
-      horiz-adv-x="448" d=" M124 120C117.4 120 112 125.4 112 132V156C112 162.6 117.4 168 124 168H324C330.6 168 336 162.6 336 156V132C336 125.4 330.6 120 324 120H124zM448 336V-16C448 -42.5 426.5 -64 400 -64H48C21.5 -64 0 -42.5 0 -16V336C0 362.5 21.5 384 48 384H96V436C96 442.6 101.4 448 108 448H148C154.6 448 160 442.6 160 436V384H288V436C288 442.6 293.4 448 300 448H340C346.6 448 352 442.6 352 436V384H400C426.5 384 448 362.5 448 336zM400 -10V288H48V-10C48 -13.3 50.7 -16 54 -16H394C397.3 -16 400 -13.3 400 -10z" />
-    <glyph glyph-name="calendar-plus"
-      unicode="&#xF271;"
-      horiz-adv-x="448" d=" M336 156V132C336 125.4 330.6 120 324 120H248V44C248 37.4 242.6 32 236 32H212C205.4 32 200 37.4 200 44V120H124C117.4 120 112 125.4 112 132V156C112 162.6 117.4 168 124 168H200V244C200 250.6 205.4 256 212 256H236C242.6 256 248 250.6 248 244V168H324C330.6 168 336 162.6 336 156zM448 336V-16C448 -42.5 426.5 -64 400 -64H48C21.5 -64 0 -42.5 0 -16V336C0 362.5 21.5 384 48 384H96V436C96 442.6 101.4 448 108 448H148C154.6 448 160 442.6 160 436V384H288V436C288 442.6 293.4 448 300 448H340C346.6 448 352 442.6 352 436V384H400C426.5 384 448 362.5 448 336zM400 -10V288H48V-10C48 -13.3 50.7 -16 54 -16H394C397.3 -16 400 -13.3 400 -10z" />
-    <glyph glyph-name="calendar-times"
-      unicode="&#xF273;"
-      horiz-adv-x="448" d=" M311.7 73.3L294.7 56.3C290 51.6 282.4 51.6 277.7 56.3L224 110.1L170.3 56.4C165.6 51.7 158 51.7 153.3 56.4L136.3 73.4C131.6 78.1 131.6 85.7000000000001 136.3 90.4L190 144.1L136.3 197.8C131.6 202.5 131.6 210.1 136.3 214.8L153.3 231.8C158 236.5 165.6 236.5 170.3 231.8L224 178.1L277.7 231.8C282.4 236.5 290 236.5 294.7 231.8L311.7 214.8C316.4 210.1 316.4 202.5 311.7 197.8L257.9 144L311.6 90.3C316.4 85.6 316.4 78 311.7 73.3zM448 336V-16C448 -42.5 426.5 -64 400 -64H48C21.5 -64 0 -42.5 0 -16V336C0 362.5 21.5 384 48 384H96V436C96 442.6 101.4 448 108 448H148C154.6 448 160 442.6 160 436V384H288V436C288 442.6 293.4 448 300 448H340C346.6 448 352 442.6 352 436V384H400C426.5 384 448 362.5 448 336zM400 -10V288H48V-10C48 -13.3 50.7 -16 54 -16H394C397.3 -16 400 -13.3 400 -10z" />
-    <glyph glyph-name="calendar"
-      unicode="&#xF133;"
-      horiz-adv-x="448" d=" M400 384H352V436C352 442.6 346.6 448 340 448H300C293.4 448 288 442.6 288 436V384H160V436C160 442.6 154.6 448 148 448H108C101.4 448 96 442.6 96 436V384H48C21.5 384 0 362.5 0 336V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V336C448 362.5 426.5 384 400 384zM394 -16H54C50.7 -16 48 -13.3 48 -10V288H400V-10C400 -13.3 397.3 -16 394 -16z" />
-    <glyph glyph-name="caret-square-down"
-      unicode="&#xF150;"
-      horiz-adv-x="448" d=" M125.1 240H322.9C333.6 240 339 227 331.4 219.5L232.5 121.2C227.8 116.5 220.3 116.5 215.6 121.2L116.7 219.5C109 227 114.4 240 125.1 240zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM400 22V362C400 365.3 397.3 368 394 368H54C50.7 368 48 365.3 48 362V22C48 18.7 50.7 16 54 16H394C397.3 16 400 18.7 400 22z" />
-    <glyph glyph-name="caret-square-left"
-      unicode="&#xF191;"
-      horiz-adv-x="448" d=" M272 290.9V93.1C272 82.4 259 77 251.5 84.6L153.2 183.5C148.5 188.2 148.5 195.7 153.2 200.4L251.5 299.3C259 307 272 301.6 272 290.9zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM400 22V362C400 365.3 397.3 368 394 368H54C50.7 368 48 365.3 48 362V22C48 18.7 50.7 16 54 16H394C397.3 16 400 18.7 400 22z" />
-    <glyph glyph-name="caret-square-right"
-      unicode="&#xF152;"
-      horiz-adv-x="448" d=" M176 93.1V290.9C176 301.6 189 307 196.5 299.4L294.8 200.5C299.5 195.8 299.5 188.3 294.8 183.6L196.5 84.7000000000001C189 77.0000000000001 176 82.4 176 93.1zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM400 22V362C400 365.3 397.3 368 394 368H54C50.7 368 48 365.3 48 362V22C48 18.7 50.7 16 54 16H394C397.3 16 400 18.7 400 22z" />
-    <glyph glyph-name="caret-square-up"
-      unicode="&#xF151;"
-      horiz-adv-x="448" d=" M322.9 144H125.1C114.4 144 109 157 116.6 164.5L215.5 262.8C220.2 267.5 227.7 267.5 232.4 262.8L331.3 164.5C339 157 333.6 144 322.9000000000001 144zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM400 22V362C400 365.3 397.3 368 394 368H54C50.7 368 48 365.3 48 362V22C48 18.7 50.7 16 54 16H394C397.3 16 400 18.7 400 22z" />
-    <glyph glyph-name="chart-bar"
-      unicode="&#xF080;"
-      horiz-adv-x="512" d=" M500 48C506.6 48 512 42.6 512 36V12C512 5.4 506.6 0 500 0H12C5.4 0 0 5.4 0 12V372C0 378.6 5.4 384 12 384H36C42.6 384 48 378.6 48 372V48H500zM144 108V180C144 186.6 138.6 192 132 192H108C101.4 192 96 186.6 96 180V108C96 101.4 101.4 96 108 96H132C138.6 96 144 101.4 144 108zM240 108V308C240 314.6 234.6 320 228 320H204C197.4 320 192 314.6 192 308V108C192 101.4 197.4 96 204 96H228C234.6 96 240 101.4 240 108zM336 108V244C336 250.6 330.6 256 324 256H300C293.4 256 288 250.6 288 244V108C288 101.4 293.4 96 300 96H324C330.6 96 336 101.4 336 108zM432 108V340C432 346.6 426.6 352 420 352H396C389.4 352 384 346.6 384 340V108C384 101.4 389.4 96 396 96H420C426.6 96 432 101.4 432 108z" />
-    <glyph glyph-name="check-circle"
-      unicode="&#xF058;"
-      horiz-adv-x="512" d=" M256 440C119.033 440 8 328.967 8 192S119.033 -56 256 -56S504 55.033 504 192S392.967 440 256 440zM256 392C366.532 392 456 302.549 456 192C456 81.468 366.549 -8 256 -8C145.468 -8 56 81.451 56 192C56 302.532 145.451 392 256 392M396.204 261.733L373.668 284.451C369.0010000000001 289.156 361.403 289.187 356.698 284.519L215.346 144.303L155.554 204.58C150.887 209.285 143.289 209.316 138.584 204.649L115.865 182.113C111.16 177.446 111.129 169.848 115.797 165.142L206.578 73.6259999999999C211.245 68.9209999999999 218.843 68.8899999999999 223.548 73.5579999999999L396.1370000000001 244.762C400.8410000000001 249.43 400.8710000000001 257.0279999999999 396.2040000000001 261.733z" />
-    <glyph glyph-name="check-square"
-      unicode="&#xF14A;"
-      horiz-adv-x="448" d=" M400 416H48C21.49 416 0 394.51 0 368V16C0 -10.51 21.49 -32 48 -32H400C426.51 -32 448 -10.51 448 16V368C448 394.51 426.51 416 400 416zM400 16H48V368H400V16zM364.136 257.724L191.547 86.52C186.842 81.853 179.244 81.883 174.577 86.588L83.796 178.104C79.129 182.809 79.159 190.407 83.865 195.075L106.584 217.611C111.289 222.278 118.887 222.248 123.554 217.542L183.346 157.265L324.698 297.481C329.403 302.148 337.001 302.118 341.668 297.413L364.204 274.695C368.871 269.9890000000001 368.841 262.391 364.136 257.724z" />
-    <glyph glyph-name="circle"
-      unicode="&#xF111;"
-      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM256 -8C145.5 -8 56 81.5 56 192S145.5 392 256 392S456 302.5 456 192S366.5 -8 256 -8z" />
-    <glyph glyph-name="clipboard"
-      unicode="&#xF328;"
-      horiz-adv-x="384" d=" M336 384H256C256 419.29 227.29 448 192 448S128 419.29 128 384H48C21.49 384 0 362.51 0 336V-16C0 -42.51 21.49 -64 48 -64H336C362.51 -64 384 -42.51 384 -16V336C384 362.51 362.51 384 336 384zM330 -16H54A6 6 0 0 0 48 -10V330A6 6 0 0 0 54 336H96V300C96 293.373 101.373 288 108 288H276C282.627 288 288 293.373 288 300V336H330A6 6 0 0 0 336 330V-10A6 6 0 0 0 330 -16zM192 408C205.255 408 216 397.255 216 384S205.255 360 192 360S168 370.745 168 384S178.745 408 192 408" />
-    <glyph glyph-name="clock"
-      unicode="&#xF017;"
-      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM256 -8C145.5 -8 56 81.5 56 192S145.5 392 256 392S456 302.5 456 192S366.5 -8 256 -8zM317.8 96.4L232.9 158.1C229.8 160.4 228 164 228 167.8V332C228 338.6 233.4 344 240 344H272C278.6 344 284 338.6 284 332V190.3L350.8 141.7C356.2 137.8 357.3 130.3 353.4000000000001 124.9L334.6 99C330.7000000000001 93.7 323.2000000000001 92.5 317.8 96.4z" />
-    <glyph glyph-name="clone"
-      unicode="&#xF24D;"
-      horiz-adv-x="512" d=" M464 448H144C117.49 448 96 426.51 96 400V352H48C21.49 352 0 330.51 0 304V-16C0 -42.51 21.49 -64 48 -64H368C394.51 -64 416 -42.51 416 -16V32H464C490.51 32 512 53.49 512 80V400C512 426.51 490.51 448 464 448zM362 -16H54A6 6 0 0 0 48 -10V298A6 6 0 0 0 54 304H96V80C96 53.49 117.49 32 144 32H368V-10A6 6 0 0 0 362 -16zM458 80H150A6 6 0 0 0 144 86V394A6 6 0 0 0 150 400H458A6 6 0 0 0 464 394V86A6 6 0 0 0 458 80z" />
-    <glyph glyph-name="closed-captioning"
-      unicode="&#xF20A;"
-      horiz-adv-x="512" d=" M464 384H48C21.5 384 0 362.5 0 336V48C0 21.5 21.5 0 48 0H464C490.5 0 512 21.5 512 48V336C512 362.5 490.5 384 464 384zM458 48H54C50.7 48 48 50.7 48 54V330C48 333.3 50.7 336 54 336H458C461.3 336 464 333.3 464 330V54C464 50.7 461.3 48 458 48zM246.9 133.7C248.6 131.3 248.4 128.1 246.4 126C192.8 69.2 73.6 93.9 73.6 193.9C73.6 291.2 195.3 313.4 246.1 264C248.2 262 248.6 260.8 247.1 258.3L229.6 227.8C227.7 224.7 223.4 223.8 220.5 226.1C179.7 258.1 125.9 241.0000000000001 125.9 194.9C125.9 146.9 176.9 124.4 218.1 162.3C220.9 164.8 225.2 164.4 227.3 161.4L246.9 133.7000000000001zM437.3 133.7C439 131.3 438.8 128.1 436.8 126C383.2 69.1 264 93.9 264 193.9C264 291.2 385.7 313.4 436.5 264C438.6 262 439 260.8 437.5 258.3L420 227.8C418.1 224.7 413.8 223.8 410.9 226.1C370.1 258.1 316.3 241.0000000000001 316.3 194.9C316.3 146.9 367.3 124.4 408.5 162.3C411.3 164.8 415.6 164.4 417.7 161.4L437.3 133.7000000000001z" />
-    <glyph glyph-name="comment-alt"
-      unicode="&#xF27A;"
-      horiz-adv-x="512" d=" M448 448H64C28.7 448 0 419.3 0 384V96C0 60.7 28.7 32 64 32H160V-52C160 -59.1 165.8 -64 172 -64C174.4 -64 176.9 -63.3 179.1 -61.6L304 32H448C483.3 32 512 60.7 512 96V384C512 419.3 483.3 448 448 448zM464 96C464 87.2 456.8 80 448 80H288L275.2 70.4L208 20V80H64C55.2 80 48 87.2 48 96V384C48 392.8 55.2 400 64 400H448C456.8 400 464 392.8 464 384V96z" />
-    <glyph glyph-name="comment-dots"
-      unicode="&#xF4AD;"
-      horiz-adv-x="512" d=" M144 240C126.3 240 112 225.7 112 208S126.3 176 144 176S176 190.3 176 208S161.7 240 144 240zM256 240C238.3 240 224 225.7 224 208S238.3 176 256 176S288 190.3 288 208S273.7 240 256 240zM368 240C350.3 240 336 225.7 336 208S350.3 176 368 176S400 190.3 400 208S385.7 240 368 240zM256 416C114.6 416 0 322.9 0 208C0 160.4 19.9 116.8 52.9 81.7C38 42.3 7 8.9 6.5 8.5C-0.1 1.5 -1.9 -8.7 1.9 -17.5S14.4 -32 24 -32C85.5 -32 134 -6.3 163.1 14.3C192 5.2 223.2 0 256 0C397.4 0 512 93.1 512 208S397.4 416 256 416zM256 48C229.3 48 202.9 52.1 177.6 60.1L154.9 67.3L135.4 53.5C121.1 43.4 101.5 32.1 77.9 24.5C85.2 36.6 92.3 50.2 97.8 64.7L108.4 92.8L87.8 114.6C69.7 133.9 48 165.8 48 208C48 296.2 141.3 368 256 368S464 296.2 464 208S370.7 48 256 48z" />
-    <glyph glyph-name="comment"
-      unicode="&#xF075;"
-      horiz-adv-x="512" d=" M256 416C114.6 416 0 322.9 0 208C0 160.4 19.9 116.8 52.9 81.7C38 42.3 7 8.9 6.5 8.5C-0.1 1.5 -1.9 -8.7 1.9 -17.5S14.4 -32 24 -32C85.5 -32 134 -6.3 163.1 14.3C192 5.2 223.2 0 256 0C397.4 0 512 93.1 512 208S397.4 416 256 416zM256 48C229.3 48 202.9 52.1 177.6 60.1L154.9 67.3L135.4 53.5C121.1 43.4 101.5 32.1 77.9 24.5C85.2 36.6 92.3 50.2 97.8 64.7L108.4 92.8L87.8 114.6C69.7 133.9 48 165.8 48 208C48 296.2 141.3 368 256 368S464 296.2 464 208S370.7 48 256 48z" />
-    <glyph glyph-name="comments"
-      unicode="&#xF086;"
-      horiz-adv-x="576" d=" M532 61.8C559.5 88.9 576 122.9 576 160C576 240 499.5 306.1 399.8 317.9C368.3 375.5 294.3 416 208 416C93.1 416 0 344.4 0 256C0 219 16.5 185 44 157.8C28.7 127.1 6.7 103.3 6.3 102.9C0 96.2000000000001 -1.8 86.4 1.9 77.9C5.5 69.4 13.9 63.9 23.1 63.9C76.6 63.9 119.8 84.1 148.3 102.7000000000001C157.5 100.6 167 99.0000000000001 176.7 97.8000000000001C208.1 40.4 281.8 0 368 0C388.8 0 408.8 2.4 427.8 6.8C456.3 -11.7 499.4 -32 553 -32C562.2 -32 570.5 -26.5 574.2 -18C577.8000000000001 -9.5 576.1 0.3 569.8000000000001 7C569.4000000000001 7.3 547.3000000000001 31.1 532.0000000000001 61.8zM139.2 154.1L122.1 143C108 133.9 93.6 126.7 79 121.6C81.7 126.3 84.4 131.3 87 136.4L102.5 167.5000000000001L77.7 192C64.2 205.4 48 227.3 48 256C48 316.7 121.3 368 208 368S368 316.7 368 256S294.7 144 208 144C191.5 144 175 145.9 159 149.6L139.2 154.1zM498.3 96L473.6 71.6L489.1 40.5C491.7 35.4 494.4 30.4 497.1 25.7C482.5 30.8 468.1 38 454 47.1L436.9 58.2L417 53.6C401 49.9 384.5 47.9999999999999 368 47.9999999999999C314 47.9999999999999 265.8 68.1 236.7 97.6999999999999C338 108.5 416 175.1 416 256C416 259.4 415.6 262.7 415.3 266C479.7 251.5 528 209.2 528 160C528 131.3 511.8 109.4 498.3 96z" />
-    <glyph glyph-name="compass"
-      unicode="&#xF14E;"
-      horiz-adv-x="512" d=" M256 440C119.033 440 8 328.967 8 192S119.033 -56 256 -56S504 55.033 504 192S392.967 440 256 440zM256 -8C145.468 -8 56 81.451 56 192C56 302.531 145.451 392 256 392C366.532 392 456 302.549 456 192C456 81.468 366.549 -8 256 -8zM347.326 304.131L313.9670000000001 166.352A24.005 24.005 0 0 0 307.1950000000001 154.623L204.5550000000001 56.844C187.4510000000001 40.551 158.9950000000001 56.41 164.6750000000001 79.868L198.0340000000001 217.647A23.997 23.997 0 0 0 204.8060000000001 229.376L307.4480000000001 327.155C324.7330000000001 343.625 352.9420000000001 327.33 347.3260000000001 304.131zM256 224C238.327 224 224 209.673 224 192S238.327 160 256 160S288 174.327 288 192S273.673 224 256 224z" />
-    <glyph glyph-name="copy"
-      unicode="&#xF0C5;"
-      horiz-adv-x="448" d=" M433.941 382.059L382.059 433.941A48 48 0 0 1 348.118 448H176C149.49 448 128 426.51 128 400V352H48C21.49 352 0 330.51 0 304V-16C0 -42.51 21.49 -64 48 -64H272C298.51 -64 320 -42.51 320 -16V32H400C426.51 32 448 53.49 448 80V348.118A48 48 0 0 1 433.941 382.059zM266 -16H54A6 6 0 0 0 48 -10V298A6 6 0 0 0 54 304H128V80C128 53.49 149.49 32 176 32H272V-10A6 6 0 0 0 266 -16zM394 80H182A6 6 0 0 0 176 86V394A6 6 0 0 0 182 400H288V312C288 298.745 298.745 288 312 288H400V86A6 6 0 0 0 394 80zM400 336H336V400H345.632C347.223 400 348.749 399.368 349.875 398.243L398.243 349.875A6 6 0 0 0 400 345.632V336z" />
-    <glyph glyph-name="copyright"
-      unicode="&#xF1F9;"
-      horiz-adv-x="512" d=" M256 440C119.033 440 8 328.967 8 192S119.033 -56 256 -56S504 55.033 504 192S392.967 440 256 440zM256 -8C145.468 -8 56 81.451 56 192C56 302.531 145.451 392 256 392C366.532 392 456 302.549 456 192C456 81.468 366.549 -8 256 -8zM363.351 93.064C353.737 83.352 317.8210000000001 51.668 259.286 51.668C176.856 51.668 118.802 113.093 118.802 193.235C118.802 272.387 179.077 332.636 258.564 332.636C314.095 332.636 347.302 306.016 356.157 297.857A11.965 11.965 0 0 0 358.093 282.535L339.938 254.422C336.097 248.472 327.972 247.14 322.439 251.501C313.844 258.277 290.625 274.039 260.731 274.039C212.428 274.039 182.815 238.709 182.815 193.957C182.815 152.368 209.703 110.265 261.092 110.265C293.749 110.265 317.935 129.304 326.818 137.49C332.088 142.347 340.414 141.529 344.638 135.752L364.503 108.582A11.947000000000001 11.947000000000001 0 0 0 363.351 93.064z" />
-    <glyph glyph-name="credit-card"
-      unicode="&#xF09D;"
-      horiz-adv-x="576" d=" M527.9 416H48.1C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48.1 -32H527.9C554.5 -32 576 -10.5 576 16V368C576 394.5 554.5 416 527.9 416zM54.1 368H521.9C525.1999999999999 368 527.9 365.3 527.9 362V320H48.1V362C48.1 365.3 50.8 368 54.1 368zM521.9 16H54.1C50.8 16 48.1 18.7 48.1 22V192H527.9V22C527.9 18.7 525.1999999999999 16 521.9 16zM192 116V76C192 69.4 186.6 64 180 64H108C101.4 64 96 69.4 96 76V116C96 122.6 101.4 128 108 128H180C186.6 128 192 122.6 192 116zM384 116V76C384 69.4 378.6 64 372 64H236C229.4 64 224 69.4 224 76V116C224 122.6 229.4 128 236 128H372C378.6 128 384 122.6 384 116z" />
-    <glyph glyph-name="dizzy"
-      unicode="&#xF567;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM214.2 209.9C222 217.7 222 230.4 214.2 238.2L196.3 256L214.2 273.9C222 281.7000000000001 222 294.4 214.2 302.2000000000001C206.4 310 193.7 310 185.9 302.2000000000001L168 284.3L150.2 302.1C142.4 309.9000000000001 129.7 309.9000000000001 121.9 302.1C114.1 294.3 114.1 281.6 121.9 273.8L139.8 255.9L121.9 238C114.1 230.2 114.1 217.5 121.9 209.7C129.7 201.9 142.4 201.9 150.2 209.7L168 227.5L185.8 209.7C193.7 202 206.3 202 214.2 209.9zM374.2 302.1C366.4 309.9000000000001 353.7 309.9000000000001 345.9 302.1L328 284.3L310.2 302.1C302.4 309.9000000000001 289.7 309.9000000000001 281.9 302.1C274.1 294.3 274.1 281.6 281.9 273.8L299.8 255.9L281.9 238C274.1 230.2 274.1 217.5 281.9 209.7C289.7 201.9 302.4 201.9 310.2 209.7L328 227.5L345.8 209.7C353.6 201.9 366.3 201.9 374.1 209.7C381.9000000000001 217.5 381.9000000000001 230.2 374.1 238L356.3 256L374.2 273.9C381.9 281.7000000000001 381.9 294.3 374.2 302.1zM248 176C212.7 176 184 147.3 184 112S212.7 48 248 48S312 76.7 312 112S283.3 176 248 176z" />
-    <glyph glyph-name="dot-circle"
-      unicode="&#xF192;"
-      horiz-adv-x="512" d=" M256 392C366.532 392 456 302.549 456 192C456 81.468 366.549 -8 256 -8C145.468 -8 56 81.451 56 192C56 302.532 145.451 392 256 392M256 440C119.033 440 8 328.967 8 192S119.033 -56 256 -56S504 55.033 504 192S392.967 440 256 440zM256 272C211.817 272 176 236.183 176 192S211.817 112 256 112S336 147.817 336 192S300.183 272 256 272z" />
-    <glyph glyph-name="edit"
-      unicode="&#xF044;"
-      horiz-adv-x="576" d=" M402.3 103.1L434.3 135.1C439.3 140.1 448 136.6 448 129.4V-16C448 -42.5 426.5 -64 400 -64H48C21.5 -64 0 -42.5 0 -16V336C0 362.5 21.5 384 48 384H321.5C328.6 384 332.2 375.4 327.2 370.3L295.2 338.3C293.7 336.8 291.7 336 289.5 336H48V-16H400V97.5C400 99.6 400.8 101.6 402.3 103.1zM558.9 304.9000000000001L296.3 42.3L205.9 32.3C179.7 29.4 157.4 51.5 160.3 77.9L170.3 168.3000000000001L432.9 430.9C455.8 453.8 492.8 453.8 515.6 430.9L558.8000000000001 387.7C581.7 364.8 581.7 327.7 558.9000000000001 304.9zM460.1 274L402 332.1L216.2 146.2L208.9 80.9L274.2 88.2L460.1 274zM524.9 353.7L481.7 396.9C477.6 401 470.9 401 466.9 396.9L436 366L494.1 307.9L525 338.8C529 343 529 349.6 524.9 353.7000000000001z" />
-    <glyph glyph-name="envelope-open"
-      unicode="&#xF2B6;"
-      horiz-adv-x="512" d=" M494.586 283.4840000000001C489.889 287.367 382.863 373.4340000000001 359.3350000000001 392.141C337.231 409.809 299.437 448 256 448C212.795 448 175.364 410.283 152.665 392.141C128.202 372.6910000000001 21.595 286.9460000000001 17.515 283.592A48.004000000000005 48.004000000000005 0 0 1 0 246.515V-16C0 -42.51 21.49 -64 48 -64H464C490.51 -64 512 -42.51 512 -16V246.491A48 48 0 0 1 494.586 283.4840000000001zM464 -10A6 6 0 0 0 458 -16H54A6 6 0 0 0 48 -10V243.653C48 245.466 48.816 247.179 50.226 248.318C66.096 261.132 159.019 335.872 182.59 354.611C200.755 369.12 232.398 400 256 400C279.693 400 311.857 368.631 329.41 354.611C352.983 335.87 445.913 261.118 461.776 248.295A5.99 5.99 0 0 0 463.9999999999999 243.632V-10zM432.009 177.704C436.2580000000001 172.545 435.474 164.909 430.264 160.723C401.289 137.44 370.99 113.126 359.3350000000001 103.86C336.636 85.717 299.205 48 256 48C212.548 48 174.713 86.237 152.665 103.86C141.386 112.827 110.921 137.273 81.738 160.725C76.528 164.912 75.745 172.547 79.993 177.706L95.251 196.234C99.429 201.307 106.908 202.077 112.03 197.96C140.648 174.959 170.596 150.925 182.59 141.389C200.143 127.369 232.307 96 256 96C279.602 96 311.246 126.88 329.41 141.389C341.404 150.924 371.354 174.959 399.973 197.957C405.095 202.073 412.574 201.303 416.751 196.23L432.009 177.704z" />
-    <glyph glyph-name="envelope"
-      unicode="&#xF0E0;"
-      horiz-adv-x="512" d=" M464 384H48C21.49 384 0 362.51 0 336V48C0 21.49 21.49 0 48 0H464C490.51 0 512 21.49 512 48V336C512 362.51 490.51 384 464 384zM464 336V295.195C441.578 276.936 405.832 248.544 329.413 188.705C312.572 175.458 279.212 143.633 256 144.004C232.792 143.629 199.421 175.463 182.587 188.705C106.18 248.535 70.425 276.933 48 295.195V336H464zM48 48V233.602C70.914 215.351 103.409 189.74 152.938 150.956C174.795 133.751 213.072 95.77 256 96.001C298.717 95.77 336.509 133.2000000000001 359.053 150.948C408.581 189.7310000000001 441.085 215.3490000000001 464 233.6010000000001V48H48z" />
-    <glyph glyph-name="eye-slash"
-      unicode="&#xF070;"
-      horiz-adv-x="576" d=" M272.702 88.861C192.219 97.872 136.49 175.747 155.772 255.903L272.702 88.861zM288 56C185.444 56 95.908 110.701 48 192C69.755 228.917 100.1 260.342 136.344 283.658L108.803 323.0010000000001C67.001 295.766 31.921 259.259 6.646 216.369A47.999 47.999 0 0 1 6.646 167.63C63.004 71.994 168.14 8 288 8A332.89 332.89 0 0 1 327.648 10.367L295.627 56.111A284.16 284.16 0 0 0 288 56zM569.354 167.631C536.1220000000001 111.237 485.933 65.889 425.8000000000001 38.139L473.9160000000001 -30.601C477.717 -36.03 476.3960000000001 -43.513 470.967 -47.313L450.23 -61.83C444.8010000000001 -65.631 437.3180000000001 -64.3099999999999 433.5180000000001 -58.881L102.084 414.601C98.283 420.03 99.604 427.513 105.033 431.313L125.77 445.83C131.199 449.631 138.682 448.31 142.482 442.881L198.008 363.556C226.612 371.657 256.808 376 288 376C407.86 376 512.996 312.006 569.354 216.369A48.00200000000001 48.00200000000001 0 0 0 569.354 167.631zM528 192C483.843 266.933 404.323 319.27 311.838 327.007C302.042 316.9220000000001 296 303.17 296 288C296 257.072 321.072 232 352 232S408 257.072 408 288L407.999 288.0420000000001C438.6310000000001 230.765 424.738 157.7820000000001 371.0710000000001 116.323L397.766 78.188C452.626 101.449 498.308 141.614 528 192z" />
-    <glyph glyph-name="eye"
-      unicode="&#xF06E;"
-      horiz-adv-x="576" d=" M569.354 216.369C512.97 312.051 407.81 376 288 376C168.14 376 63.004 312.006 6.646 216.369A47.999 47.999 0 0 1 6.646 167.63C63.031 71.949 168.19 8 288 8C407.86 8 512.996 71.994 569.354 167.631A47.997 47.997 0 0 1 569.354 216.369zM288 56C185.444 56 95.909 110.701 48 192C92.157 266.933 171.677 319.27 264.1620000000001 327.007C273.9580000000001 316.9220000000001 280 303.17 280 288C280 257.072 254.928 232 224 232S168 257.072 168 288L168.001 288.0420000000001C157.794 268.957 152 247.156 152 224C152 148.889 212.889 88 288 88S424 148.889 424 224C424 255.031 413.6 283.629 396.105 306.515C451.704 283.362 498.009 242.894 528 192C480.092 110.701 390.5560000000001 56 288 56z" />
-    <glyph glyph-name="file-alt"
-      unicode="&#xF15C;"
-      horiz-adv-x="384" d=" M288 200V172C288 165.4 282.6 160 276 160H108C101.4 160 96 165.4 96 172V200C96 206.6 101.4 212 108 212H276C282.6 212 288 206.6 288 200zM276 128H108C101.4 128 96 122.6 96 116V88C96 81.4 101.4 76 108 76H276C282.6 76 288 81.4 288 88V116C288 122.6 282.6 128 276 128zM384 316.1V-16C384 -42.5 362.5 -64 336 -64H48C21.5 -64 0 -42.5 0 -16V400C0 426.5 21.5 448 48 448H252.1C264.8 448 277 442.9 286 433.9L369.9 350C378.9 341.1 384 328.8 384 316.1zM256 396.1V320H332.1L256 396.1zM336 -16V272H232C218.7 272 208 282.7 208 296V400H48V-16H336z" />
-    <glyph glyph-name="file-archive"
-      unicode="&#xF1C6;"
-      horiz-adv-x="384" d=" M369.941 350.059L286.059 433.9410000000001A48 48 0 0 1 252.118 448H48C21.49 448 0 426.51 0 400V-16C0 -42.51 21.49 -64 48 -64H336C362.51 -64 384 -42.51 384 -16V316.118A48 48 0 0 1 369.941 350.059zM256 396.118L332.118 320H256V396.118zM336 -16H48V400H127.714V384H159.714V400H208V296C208 282.745 218.745 272 232 272H336V-16zM192.27 352H160.27V384H192.27V352zM160.27 352V320H128.27V352H160.27zM160.27 288V256H128.27V288H160.27zM192.27 288H160.27V320H192.27V288zM194.179 182.322A12 12 0 0 1 182.406 192H160.27V224H128.27V192L108.58 94.894C101.989 62.389 126.834 32 160 32C193.052 32 217.871 62.192 211.476 94.62L194.179 182.322zM160.27 57.927C142.352 57.927 127.826 70.032 127.826 84.963C127.826 99.895 142.351 111.999 160.27 111.999S192.714 99.894 192.714 84.963C192.714 70.032 178.188 57.927 160.27 57.927zM192.27 224H160.27V256H192.27V224z" />
-    <glyph glyph-name="file-audio"
-      unicode="&#xF1C7;"
-      horiz-adv-x="384" d=" M369.941 350.059L286.059 433.9410000000001A48 48 0 0 1 252.118 448H48C21.49 448 0 426.51 0 400V-16C0 -42.51 21.49 -64 48 -64H336C362.51 -64 384 -42.51 384 -16V316.118A48 48 0 0 1 369.941 350.059zM332.118 320H256V396.118L332.118 320zM48 -16V400H208V296C208 282.745 218.745 272 232 272H336V-16H48zM192 60.024C192 49.333 179.074 43.979 171.515 51.539L136 87.514H108C101.373 87.514 96 92.887 96 99.514V155.514C96 162.141 101.373 167.514 108 167.514H136L171.515 204.461C179.075 212.021 192 206.667 192 195.976V60.024zM233.201 107.154C242.252 116.451 242.261 131.287 233.202 140.593C211.053 163.345 245.437 196.839 267.597 174.074C294.795 146.134 294.809 101.63 267.598 73.673C245.805 51.287 210.651 83.988 233.201 107.154z" />
-    <glyph glyph-name="file-code"
-      unicode="&#xF1C9;"
-      horiz-adv-x="384" d=" M369.941 350.059L286.059 433.9410000000001A48 48 0 0 1 252.118 448H48C21.49 448 0 426.51 0 400V-16C0 -42.51 21.49 -64 48 -64H336C362.51 -64 384 -42.51 384 -16V316.118A48 48 0 0 1 369.941 350.059zM332.118 320H256V396.118L332.118 320zM48 -16V400H208V296C208 282.745 218.745 272 232 272H336V-16H48zM149.677 99.115L116.854 128L149.676 156.885A8.793 8.793 0 0 1 150.281 169.509L132.878 188.073C129.494 191.686 123.914 191.735 120.44 188.4740000000001L62.78 134.42C59.077 130.946 59.076 125.053 62.781 121.5800000000001L120.44 67.525A8.738 8.738 0 0 1 126.452 65.1440000000001A8.746 8.746 0 0 1 132.879 67.9260000000001L150.282 86.489A8.795 8.795 0 0 1 149.677 99.115zM233.961 226.965L209.56 234.049A8.796 8.796 0 0 1 198.655 228.051L144.04 39.939C142.687 35.279 145.378 30.387 150.038 29.0340000000001L174.441 21.95C179.121 20.595 183.998 23.304 185.346 27.948L239.958 216.06C241.312 220.72 238.621 225.612 233.961 226.9650000000001zM321.219 134.42L263.561 188.475C260.035 191.7820000000001 254.462 191.6400000000001 251.122 188.074L233.719 169.511A8.795 8.795 0 0 1 234.324 156.886L267.146 128L234.324 99.115A8.793 8.793 0 0 1 233.719 86.491L251.122 67.927A8.797 8.797 0 0 1 263.5610000000001 67.526H263.5600000000001L321.2200000000001 121.581C324.923 125.054 324.923 130.947 321.2190000000001 134.42z" />
-    <glyph glyph-name="file-excel"
-      unicode="&#xF1C3;"
-      horiz-adv-x="384" d=" M369.9 350.1L286 434C277 443 264.8 448.1 252.1 448.1H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V316.1C384 328.8 378.9 341.1 369.9 350.1zM332.1 320H256V396.1L332.1 320zM48 -16V400H208V296C208 282.7 218.7 272 232 272H336V-16H48zM260 224H231.2C226.8 224 222.8 221.6 220.7 217.7C202.7 184.6 198.5 175.3 192.1 160C178.2 189.1 185.2 177.3 163.5 217.7C161.4 221.6 157.3 224 152.9 224H124C114.7 224 109 214 113.6 206L159.9 128L113.6 50C108.9 42 114.7 32 124 32H152.9C157.3 32 161.3 34.4 163.4 38.3C185.1 78.3 186.4 83.3 192 96C206.9 65.8 197.9 80.1 220.6 38.3C222.7 34.4 226.8 32 231.2 32H260C269.3 32 275 42 270.4 50L224 128C224.7 129.1 254.3 178.5 270.3 206C275 214 269.2 224 260 224z" />
-    <glyph glyph-name="file-image"
-      unicode="&#xF1C5;"
-      horiz-adv-x="384" d=" M369.9 350.1L286 434C277 443 264.8 448.1 252.1 448.1H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V316.1C384 328.8 378.9 341.1 369.9 350.1zM332.1 320H256V396.1L332.1 320zM48 -16V400H208V296C208 282.7 218.7 272 232 272H336V-16H48zM80 32H304V160L280.5 183.5C275.8 188.2 268.2 188.2 263.5 183.5L176 96L136.5 135.5C131.8 140.2 124.2 140.2 119.5 135.5L80 96V32zM128 272C101.5 272 80 250.5 80 224S101.5 176 128 176S176 197.5 176 224S154.5 272 128 272z" />
-    <glyph glyph-name="file-pdf"
-      unicode="&#xF1C1;"
-      horiz-adv-x="384" d=" M369.9 350.1L286 434C277 443 264.8 448.1 252.1 448.1H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V316.1C384 328.8 378.9 341.1 369.9 350.1zM332.1 320H256V396.1L332.1 320zM48 -16V400H208V296C208 282.7 218.7 272 232 272H336V-16H48zM298.2 127.7C286 139.7 251.2 136.4 233.8 134.2C216.6 144.7 205.1 159.2 197 180.5C200.9 196.6 207.1 221.1 202.4 236.5C198.2 262.7 164.6 260.1 159.8 242.4C155.4 226.3 159.4 203.9 166.8 175.3C156.8 151.4 141.9 119.3 131.4 100.9C111.4 90.6 84.4 74.7 80.4 54.7C77.1 38.9 106.4 -0.5 156.5 85.9C178.9 93.3 203.3 102.4 224.9 106C243.8 95.8 265.9 89 280.7 89C306.2 89 308.7 117.2 298.2 127.7zM100.1 49.9C105.2 63.6 124.6 79.4 130.5 84.9C111.5 54.6 100.1 49.2 100.1 49.9zM181.7 240.5C189.1 240.5 188.4 208.4 183.5 199.7C179.1 213.6 179.2 240.5 181.7 240.5zM157.3 103.9C167 120.8 175.3 140.9 182 158.6C190.3 143.5 200.9 131.4 212.1 123.1C191.3 118.8 173.2 109.9999999999999 157.3 103.9zM288.9 108.9S283.9 102.9 251.6 116.7C286.7 119.3 292.5 111.3 288.9 108.9z" />
-    <glyph glyph-name="file-powerpoint"
-      unicode="&#xF1C4;"
-      horiz-adv-x="384" d=" M369.9 350.1L286 434C277 443 264.8 448.1 252.1 448.1H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V316.1C384 328.8 378.9 341.1 369.9 350.1zM332.1 320H256V396.1L332.1 320zM48 -16V400H208V296C208 282.7 218.7 272 232 272H336V-16H48zM120 44V212C120 218.6 125.4 224 132 224H201.2C237.9 224 264 197 264 157.7C264 83.4 195.3 91.2 168.5 91.2V44C168.5 37.4 163.1 32 156.5 32H132C125.4 32 120 37.4 120 44zM168.5 131.4H191.5C199.4 131.4 205.4 133.8 209.6 138.6C218.1 148.4 218 167.1 209.7 176.4C205.6 181 199.8 183.4 192.3 183.4H168.4V131.4z" />
-    <glyph glyph-name="file-video"
-      unicode="&#xF1C8;"
-      horiz-adv-x="384" d=" M369.941 350.059L286.059 433.9410000000001A48 48 0 0 1 252.118 448H48C21.49 448 0 426.51 0 400V-16C0 -42.51 21.49 -64 48 -64H336C362.51 -64 384 -42.51 384 -16V316.118A48 48 0 0 1 369.941 350.059zM332.118 320H256V396.118L332.118 320zM48 -16V400H208V296C208 282.745 218.745 272 232 272H336V-16H48zM276.687 195.303L224 142.626V180C224 191.046 215.046 200 204 200H100C88.954 200 80 191.046 80 180V76C80 64.954 88.954 56 100 56H204C215.046 56 224 64.954 224 76V113.374L276.687 60.7000000000001C286.704 50.682 304 57.72 304 72.014V183.989C304 198.3 286.691 205.308 276.687 195.303z" />
-    <glyph glyph-name="file-word"
-      unicode="&#xF1C2;"
-      horiz-adv-x="384" d=" M369.9 350.1L286 434C277 443 264.8 448.1 252.1 448.1H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V316.1C384 328.8 378.9 341.1 369.9 350.1zM332.1 320H256V396.1L332.1 320zM48 -16V400H208V296C208 282.7 218.7 272 232 272H336V-16H48zM268.1 192C262.4000000000001 192 257.5 188 256.4000000000001 182.5C235.8000000000001 84.8 236.0000000000001 87.1 235.4000000000001 79C235.2000000000001 80.2 235.0000000000001 81.6 234.7000000000001 83.3C233.9000000000001 88.4 235.0000000000001 83.1 211.1000000000001 182.8C209.8000000000001 188.2 205.0000000000001 192 199.4000000000001 192H186.1000000000001C180.6000000000001 192 175.8000000000001 188.2 174.4000000000001 182.9C150.0000000000001 83.9 150.4000000000001 86.7 149.6000000000001 79.2C149.5000000000001 80.3 149.4000000000001 81.7 149.1000000000001 83.4C148.4000000000001 88.6 135.0000000000001 156.7 130.0000000000001 182.4C128.9000000000001 188 124.0000000000001 192.1 118.2000000000001 192.1H101.4000000000001C93.6000000000001 192.1 87.9000000000001 184.8 89.7000000000001 177.3C97.7000000000001 144.6999999999999 116.4000000000001 67.8 122.9000000000001 41.3C124.2000000000001 35.9 129.0000000000001 32.1999999999999 134.6000000000001 32.1999999999999H159.8000000000001C165.3000000000001 32.1999999999999 170.1000000000001 35.8999999999999 171.4 41.3L189.3000000000001 112.6999999999999C190.8000000000001 118.8999999999999 191.8000000000001 124.6999999999999 192.3000000000001 130L195.2000000000001 112.6999999999999C195.3000000000001 112.3 207.8000000000001 62.1999999999999 213.1000000000001 41.3C214.4000000000001 35.9999999999999 219.2000000000001 32.1999999999999 224.7000000000001 32.1999999999999H249.4000000000001C254.9000000000001 32.1999999999999 259.7000000000001 35.8999999999999 261.0000000000001 41.3C281.8000000000001 123.1999999999999 291.2000000000001 160.3 295.5000000000001 177.3C297.4000000000001 184.9 291.7000000000001 192.2 283.9000000000001 192.2H268.1z" />
-    <glyph glyph-name="file"
-      unicode="&#xF15B;"
-      horiz-adv-x="384" d=" M369.9 350.1L286 434C277 443 264.8 448.1 252.1 448.1H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V316.1C384 328.8 378.9 341.1 369.9 350.1zM332.1 320H256V396.1L332.1 320zM48 -16V400H208V296C208 282.7 218.7 272 232 272H336V-16H48z" />
-    <glyph glyph-name="flag"
-      unicode="&#xF024;"
-      horiz-adv-x="512" d=" M336.174 368C287.042 368 242.869 400 174.261 400C142.96 400 115.958 393.5180000000001 93.54 384.832A48.04 48.04 0 0 1 95.682 405.559C93.067 428.425 74.167 446.406 51.201 447.896C23.242 449.71 0 427.569 0 400C0 382.236 9.657 366.738 24 358.438V-48C24 -56.837 31.163 -64 40 -64H56C64.837 -64 72 -56.837 72 -48V35.443C109.869 52.72 143.259 64 199.826 64C248.958 64 293.131 32 361.7390000000001 32C420.218 32 463.711 54.617 490.287 71.981C503.846 80.839 512 95.949 512 112.145V352.063C512 386.522 476.736 409.831 445.096 396.18C409.193 380.6910000000001 371.641 368 336.174 368zM464 112C442.217 96.588 403.176 80 361.7390000000001 80C301.7940000000001 80 259.737 112 199.826 112C156.465 112 103.447 102.597 72 88V320C93.784 335.4120000000001 132.824 352 174.261 352C234.206 352 276.2630000000001 320 336.1740000000001 320C379.4450000000001 320 432.4940000000001 337.366 464 352V112z" />
-    <glyph glyph-name="flushed"
-      unicode="&#xF579;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM344 304C299.8 304 264 268.2 264 224S299.8 144 344 144S424 179.8 424 224S388.2 304 344 304zM344 176C317.5 176 296 197.5 296 224S317.5 272 344 272S392 250.5 392 224S370.5 176 344 176zM344 248C330.7 248 320 237.3 320 224S330.7 200 344 200S368 210.7 368 224S357.3 248 344 248zM232 224C232 268.2 196.2 304 152 304S72 268.2 72 224S107.8 144 152 144S232 179.8 232 224zM152 176C125.5 176 104 197.5 104 224S125.5 272 152 272S200 250.5 200 224S178.5 176 152 176zM152 248C138.7 248 128 237.3 128 224S138.7 200 152 200S176 210.7 176 224S165.3 248 152 248zM312 104H184C170.8 104 160 93.2 160 80S170.8 56 184 56H312C325.2 56 336 66.8 336 80S325.2 104 312 104z" />
-    <glyph glyph-name="folder-open"
-      unicode="&#xF07C;"
-      horiz-adv-x="576" d=" M527.943 224H480V272C480 298.51 458.51 320 432 320H272L208 384H48C21.49 384 0 362.51 0 336V48C0 21.49 21.49 0 48 0H448A48.001 48.001 0 0 1 488.704 22.56L568.646 150.56C588.5939999999999 182.477 565.608 224 527.943 224zM54 336H188.118L252.118 272H426A6 6 0 0 0 432 266V224H152A48 48 0 0 1 110.902 200.798L48 96.551V330.007A5.993 5.993 0 0 0 54 336zM448 48H72L149.234 176H528L448 48z" />
-    <glyph glyph-name="folder"
-      unicode="&#xF07B;"
-      horiz-adv-x="512" d=" M464 320H272L208 384H48C21.49 384 0 362.51 0 336V48C0 21.49 21.49 0 48 0H464C490.51 0 512 21.49 512 48V272C512 298.51 490.51 320 464 320zM458 48H54C50.686 48 48 50.678 48 53.992V330.008A5.993 5.993 0 0 0 54 336H188.118L252.118 272H458A6 6 0 0 0 464 266V54A6 6 0 0 0 458 48z" />
-    <glyph glyph-name="frown-open"
-      unicode="&#xF57A;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM200 240C200 257.7 185.7 272 168 272S136 257.7 136 240S150.3 208 168 208S200 222.3 200 240zM328 272C310.3 272 296 257.7 296 240S310.3 208 328 208S360 222.3 360 240S345.7 272 328 272zM248 160C212.4 160 159.2 138.7 152.2 98.8C150.2 87 161.2 77.3 172.7 80.7C203.9 90.3 232.1 96 248 96S292.1 90.3 323.3 80.7C334.7 77.2 345.8 87 343.8 98.8C336.8 138.7 283.6 160 248 160z" />
-    <glyph glyph-name="frown"
-      unicode="&#xF119;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM168 208C185.7 208 200 222.3 200 240S185.7 272 168 272S136 257.7 136 240S150.3 208 168 208zM328 272C310.3 272 296 257.7 296 240S310.3 208 328 208S360 222.3 360 240S345.7 272 328 272zM248 144C207.8 144 170 126.3 144.2 95.4C135.7 85.2 137.1 70.1 147.3 61.6C157.5 53.2 172.6 54.4999999999999 181.1 64.7C197.7 84.6 222.1 96.1 248 96.1S298.3 84.7 314.9 64.7C323 55 338 52.8 348.7 61.6C358.9 70.1 360.2 85.2 351.8 95.4C326 126.3 288.2 144 248 144z" />
-    <glyph glyph-name="futbol"
-      unicode="&#xF1E3;"
-      horiz-adv-x="496" d=" M483.8 268.6C449.8 373.4 352.6 440 248.1 440C222.7 440 196.9 436.1 171.4 427.8C41.2 385.5 -30.1 245.6 12.2 115.4C46.2 10.6 143.4 -56 247.9 -56C273.3 -56 299.1 -52.1 324.6 -43.8C454.8 -1.5 526.1 138.4 483.8 268.6zM409.3 74.9L357.1 68.5L313.4000000000001 129.4L337.8 204.6L408.9 226.7L447.8 190.3C447.6 159.6 440.4 129.1999999999999 426.1 101.1C421.4 91.8 415.4 83.3 409.3 74.9zM409.3 310.3L398.9000000000001 257.2L328.2000000000001 235.2L264.0000000000001 281.7V355.5L311.4000000000001 381.7C350.6 368.7 384.8000000000001 343.7 409.3000000000001 310.3zM184.9 381.6L232 355.5V281.7L167.8 235.2L97.2 257.2L87.1 309.7C111.4 343.1 145 368.3 184.9 381.6zM139 68.5L85.9 75C71.5 95.1 48.6 134.6 48.1 190.3L87.1 226.7L158.2 204.5L182.5 130.2000000000001L139 68.5000000000001zM187.2 1.5L164.8 49.6L208.4 111.3H287L331.3 49.6L308.9000000000001 1.5C302.7000000000001 -0.3 251.3000000000001 -18.9 187.2000000000001 1.5z" />
-    <glyph glyph-name="gem"
-      unicode="&#xF3A5;"
-      horiz-adv-x="576" d=" M464 448H112C108 448 104.2 446 102 442.6L2 295.4C-0.9 291 -0.6 285.2000000000001 2.7 281.2000000000001L278.7 -59.6C283.5 -65.5 292.5 -65.5 297.3 -59.6L573.3 281.2C576.5999999999999 285.3 576.9 291 574 295.4L474.1 442.6C471.8 446 468.1 448 464 448zM444.7 400L508 304H439.6L387.9000000000001 400H444.7000000000001zM242.6 400H333.3L385 304H191L242.6 400zM131.3 400H188.1L136.4 304H68L131.3 400zM88.3 256H139.7L208 96L88.3 256zM191.2 256H384.8L288 12.7L191.2 256zM368 96L436.2 256H487.6L368 96z" />
-    <glyph glyph-name="grimace"
-      unicode="&#xF57F;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM168 208C185.7 208 200 222.3 200 240S185.7 272 168 272S136 257.7 136 240S150.3 208 168 208zM328 208C345.7 208 360 222.3 360 240S345.7 272 328 272S296 257.7 296 240S310.3 208 328 208zM344 192H152C125.5 192 104 170.5 104 144V112C104 85.5 125.5 64 152 64H344C370.5 64 392 85.5 392 112V144C392 170.5 370.5 192 344 192zM176 96H152C143.2 96 136 103.2 136 112V120H176V96zM176 136H136V144C136 152.8 143.2 160 152 160H176V136zM240 96H192V120H240V96zM240 136H192V160H240V136zM304 96H256V120H304V96zM304 136H256V160H304V136zM360 112C360 103.2 352.8 96 344 96H320V120H360V112zM360 136H320V160H344C352.8 160 360 152.8 360 144V136z" />
-    <glyph glyph-name="grin-alt"
-      unicode="&#xF581;"
-      horiz-adv-x="496" d=" M200.3 200C212.7 218.7 215.4 237.3 216 256C215.5 274.7 212.7 293.3 200.3 312C192.3 324 175.2 323.4 167.6 312C155.2 293.3 152.5 274.7 151.9 256C152.4 237.3 155.2000000000001 218.7 167.6 200C175.7 188 192.8 188.6 200.3 200zM328.3 200C340.7 218.7 343.4000000000001 237.3 344 256C343.5 274.7 340.7 293.3 328.3 312C320.3 324 303.2 323.4 295.6 312C283.2000000000001 293.3 280.5 274.7 279.9000000000001 256C280.4000000000001 237.3 283.2000000000001 218.7 295.6 200C303.7000000000001 188 320.8 188.6 328.3 200zM248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM353.6 143.4C327.7000000000001 135.1 289.2000000000001 130.3 248.0000000000001 130.3S168.4 135.1 142.4 143.4C132.5 146.5 123 138.1 124.7 128.1C132.6 80.9 196 48.1 248.0000000000001 48.1S363.3 80.9999999999999 371.3 128.1C372.9000000000001 137.9 363.6 146.5 353.6 143.4z" />
-    <glyph glyph-name="grin-beam-sweat"
-      unicode="&#xF583;"
-      horiz-adv-x="496" d=" M440 288C469.5 288 493.3 314.3 493.3 346.7C493.3 371.7 461.6 422.2 447.1 444C443.5 449.3 436.4000000000001 449.3 432.9000000000001 444C418.4000000000001 422.2 386.7000000000001 371.7 386.7000000000001 346.7C386.7000000000001 314.3 410.5000000000001 288 440.0000000000001 288zM248 48C299.9 48 363.3 80.9 371.3 128C373 137.9 363.6 146.5 353.6 143.3C327.7000000000001 135 289.2000000000001 130.2 248.0000000000001 130.2S168.4 135 142.4 143.3C132.6 146.4 123 138 124.7 128C132.7000000000001 80.9 196.1 48 248.0000000000001 48zM378.3 216.3C381.9000000000001 217.4 384.3 220.8 384 224.6C380.7 266.7000000000001 351.8 296 328 296S275.3 266.7000000000001 272 224.6C271.7 220.9 274.1 217.4 277.7 216.3C281.2 215.2 285.1 216.8 287 220L296.5 237C304.2 250.7 315.7 258.6 328 258.6S351.8 250.7 359.5 237L369 220C371.1 216.4 375.2 215.4 378.3 216.3zM483.6 269.2000000000001C459 253.5000000000001 437.6 256.3 437.2000000000001 256.3C444.1 236.1 448.0000000000001 214.5 448.0000000000001 192C448.0000000000001 81.7 358.3000000000001 -8 248.0000000000001 -8S48 81.7 48 192S137.7 392 248 392C287.8 392 324.8 380.2 356 360.1C357.7 369.6 362.3 384.2 373.2 405.8C336.4 427.4 293.7 440 248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192C496 219 491.6 244.9 483.6 269.2zM168 258.6C180.3 258.6 191.8 250.7 199.5 237L209 220C211.1 216.3 215.2 215.3 218.3 216.3C221.9 217.4 224.3 220.8 224 224.6C220.7 266.7000000000001 191.8 296 168 296S115.3 266.7000000000001 112 224.6C111.7 220.9 114.1 217.4 117.7 216.3C121.2 215.2 125.1 216.8 127 220L136.5 237C144.2 250.8 155.7 258.6 168 258.6z" />
-    <glyph glyph-name="grin-beam"
-      unicode="&#xF582;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM353.6 143.4C327.7000000000001 135.1 289.2000000000001 130.3 248.0000000000001 130.3S168.4 135.1 142.4 143.4C132.6 146.5 123 138.1 124.7 128.1C132.6 80.9999999999999 196 48.1 248.0000000000001 48.1S363.3 80.9999999999999 371.3 128.1C372.9000000000001 137.9 363.6 146.5 353.6 143.4zM117.7 216.3C121.2 215.2 125.1 216.8 127 220L136.5 237C144.2 250.7 155.7 258.6 168 258.6S191.8 250.7 199.5 237L209 220C211.1 216.3 215.2 215.3 218.3 216.3C221.9 217.4 224.3 220.8 224 224.6C220.7 266.7 191.8 296 168 296S115.3 266.7 112 224.6C111.7 220.9 114.1 217.4 117.7 216.3zM277.7000000000001 216.3C281.2000000000001 215.2 285.1 216.8 287.0000000000001 220L296.5000000000001 237C304.2000000000001 250.7 315.7000000000001 258.6 328.0000000000001 258.6S351.8000000000001 250.7 359.5000000000001 237L369.0000000000001 220C371.1000000000001 216.3 375.2000000000001 215.3 378.3000000000001 216.3C381.9000000000001 217.4 384.3000000000001 220.8 384.0000000000001 224.6C380.7000000000001 266.7 351.8000000000001 296 328.0000000000001 296S275.3000000000001 266.7 272.0000000000001 224.6C271.7000000000001 220.9 274.1000000000001 217.4 277.7000000000001 216.3z" />
-    <glyph glyph-name="grin-hearts"
-      unicode="&#xF584;"
-      horiz-adv-x="496" d=" M353.6 143.4C327.7000000000001 135.1 289.2000000000001 130.3 248.0000000000001 130.3S168.4 135.1 142.4 143.4C132.6 146.5 123 138.1 124.7 128.1C132.6 80.9 196 48.1 248.0000000000001 48.1S363.3 80.9999999999999 371.3 128.1C372.9000000000001 137.9 363.6 146.5 353.6 143.4zM200.8 192.3C205.3 191.1 210 193.8 211.3 198.3L230.7 268.2C236.3 288.5 223.3 309.3 201.9 312.7C183.3 315.7 165.5 302.9 160.4 284.8L158.4 277.7L151.3 279.6C133.1 284.3 113.1 275.3 106.4 257.6C98.7 237.4 110.2 215.7 130.6 210.4L200.8 192.3zM389.6 257.6C382.9000000000001 275.2 362.9000000000001 284.3 344.7000000000001 279.6L337.6 277.7L335.6 284.8C330.6 302.9 312.8 315.7 294.1 312.7C272.7000000000001 309.3 259.7000000000001 288.5 265.3 268.2L284.7 198.3C285.9 193.8 290.6 191.1 295.2 192.3L365.4 210.5C385.8 215.8 397.3 237.4 389.6 257.5999999999999zM248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8z" />
-    <glyph glyph-name="grin-squint-tears"
-      unicode="&#xF586;"
-      horiz-adv-x="512" d=" M117.1 63.9C91.3 60.2 33.1 50.2 16.2 33.3C-5.7 11.4 -5.3 -24.6 17.1 -47.0000000000001S75.4 -69.8000000000001 97.4 -47.9C114.3 -31 124.3 27.2 128 53C128.8 59.4 123.4 64.8 117.1 63.9zM75.9 105.6C40.3 180 53 271.9 114.6 333.4C152.4 371.2 202.6 392 256 392C292.2 392 326.8 382.2 357.2 364.3C361 384.6 365.2 400.4 369.2 412.6C333.8 430.8 294.9 440 256 440C192.5 440 129.1 415.8 80.6 367.4C6.5 293.3 -10.7 184 28.6 93.4C40.8 97.5 56.3 101.7 75.9 105.6zM428.2 293.2C473.2 216.6 463.1 116.3 397.4 50.6C359.6 12.8 309.4 -8.0000000000001 256 -8.0000000000001C225.5 -8.0000000000001 196.2 -1.0000000000001 169.6 11.8C165.7 -7.7 161.6 -23.2 157.4 -35.4C188.8 -49.0000000000001 222.4 -56.0000000000001 256.1 -56.0000000000001C319.6 -56.0000000000001 383 -31.8000000000001 431.5 16.5999999999999C509.6 94.6999999999999 524.6 211.9999999999999 476.7 305.2C464.4 301.2 448.5 297.0999999999999 428.2 293.2zM394.9 320.1C420.7 323.8 478.9 333.8 495.8 350.7C517.6999999999999 372.6 517.3 408.6 494.9 431S436.6 453.8 414.6 431.9C397.7 415 387.7 356.8 384 331C383.2 324.6 388.6 319.2 394.9 320.1zM207.9 211.8C204.9 214.8 200.7 216 196.5 215L106 192.3C100.3 190.9 96.5 185.6 96.9 179.7C97.4 173.9 102 169.2 107.8 168.7L160.1 163.9L164.9 111.6C165.4 105.8 170.1 101.2 175.9 100.7H176.8000000000001C182.3000000000001 100.7 187.1000000000001 104.4 188.5 109.8L211.1 200.3C212.1 204.5 210.9 208.8 207.9 211.8zM247.6 236.9L338.1 259.5C343.8 260.9 347.6 266.2 347.2 272.0999999999999C346.7 277.9 342.1 282.5999999999999 336.3 283.0999999999999L284 287.9L279.2 340.2C278.7 346 274 350.6 268.2 351.1C262.6 351.2 257 347.7 255.6 342L233 251.5C232 247.4 233.2 243.1 236.2 240.1C241.2 235.1 247.5 236.9 247.6 236.9zM299.6 148.4C270.5 119.3 239.9 95.5 215.7 83C206.5 78.2 205.7 65.5 214 59.6C252.9 31.9 321 53.4 357.7 90.2000000000001S416 195 388.3 233.9C382.5 242.1 369.8 241.5 364.9000000000001 232.2C352.6 208 328.7000000000001 177.5 299.6 148.4z" />
-    <glyph glyph-name="grin-squint"
-      unicode="&#xF585;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM353.6 143.4C327.7000000000001 135.1 289.2000000000001 130.3 248.0000000000001 130.3S168.4 135.1 142.4 143.4C132.5 146.5 123 138 124.7 128.1C132.6 80.9999999999999 196 48.1 248.0000000000001 48.1S363.3 80.9999999999999 371.3 128.1C372.9000000000001 137.9 363.6 146.5 353.6 143.4zM118.9 184.2C122.5 180 128.8000000000001 178.5 134.2000000000001 181.7L214.2000000000001 229.7C217.8000000000001 231.9 220.0000000000001 235.8 220.0000000000001 240S217.8000000000001 248.1 214.2000000000001 250.3L134.2000000000001 298.3C129.1000000000001 301.3 122.8000000000001 300.2000000000001 118.9000000000001 295.8C115.1000000000001 291.3 115.1000000000001 284.8 118.8000000000001 280.3L152.4000000000001 240L118.8000000000001 199.7C115.0000000000001 195.2 115.1000000000001 188.6 118.9000000000001 184.2zM361.8000000000001 181.7C367.2000000000001 178.5 373.5000000000001 180 377.1000000000001 184.2C380.9000000000001 188.7 380.9000000000001 195.2 377.2000000000001 199.7L343.6 240L377.2000000000001 280.3C381.0000000000001 284.8 380.9000000000001 291.3 377.1 295.8C373.3 300.2000000000001 366.9000000000001 301.2000000000001 361.8 298.3L281.8 250.3C278.2 248.1 276 244.2 276 240S278.2 231.9 281.8 229.7L361.8 181.7z" />
-    <glyph glyph-name="grin-stars"
-      unicode="&#xF587;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM353.6 143.4C327.7000000000001 135.1 289.2000000000001 130.3 248.0000000000001 130.3S168.4 135.1 142.4 143.4C132.6 146.5 123 138.1 124.7 128.1C132.6 80.9 196 48.1 248.0000000000001 48.1S363.3 80.9999999999999 371.3 128.1C372.9000000000001 137.9 363.6 146.5 353.6 143.4zM125.7 200.9C124.7 194.7 131.1 189.9 136.7 193L168 209.3L199.3000000000001 193C204.9 189.9 211.3000000000001 194.7 210.3000000000001 200.9L204.3000000000001 235.8L229.7000000000001 260.4C234.2000000000001 264.9 231.6000000000001 272.6 225.4000000000001 273.6L190.5 278.6L175 310.2C172.1 316 164 316 161.1 310.2L145.6 278.6L110.7 273.6C104.5 272.7 101.8 265 106.4 260.4L131.8 235.8L125.7 200.9zM385.4 273.6L350.5 278.6L335 310.2C332.1 316 324 316 321.1 310.2L305.6 278.6L270.7000000000001 273.6C264.5000000000001 272.7 261.8000000000001 265 266.4000000000001 260.4L291.8 235.8L285.8 200.9C284.8 194.7 291.2 189.9 296.8 193L328.1 209.3L359.4000000000001 193C365.0000000000001 189.9 371.4000000000001 194.7 370.4000000000001 200.9L364.4000000000001 235.8L389.8 260.4C394.3 265 391.6 272.6 385.4000000000001 273.6z" />
-    <glyph glyph-name="grin-tears"
-      unicode="&#xF588;"
-      horiz-adv-x="640" d=" M117.1 191.9C91.3 188.2 33.1 178.2 16.2 161.3C-5.7 139.4 -5.3 103.4 17.1 80.9999999999999S75.4 58.1999999999999 97.4 80.1C114.3 97 124.3 155.2 128 181C128.8 187.4 123.4 192.8 117.1 191.9zM623.8 161.3C606.9 178.1999999999999 548.6999999999999 188.1999999999999 522.9 191.9C516.6 192.8 511.2 187.4 512.1 181.1C515.8000000000001 155.3 525.8000000000001 97.1 542.7 80.1999999999999C564.6 58.3 600.6 58.6999999999999 623 81.0999999999999C645.3 103.3999999999999 645.7 139.3999999999999 623.8 161.2999999999999zM497.1999999999999 99.6C463.8 35.7 396.9 -8 320 -8C243.1 -8 176.2 35.7 142.8 99.6C130.3 62.2000000000001 117.6 55.7 114.5 53.1C159.1 -12.7 234.5 -56 320 -56S480.9 -12.7 525.5 53.1C522.3 55.8 509.6 62.3 497.2 99.6zM122.7 223.5C137.9 318.8 220.5 392 320 392C419.5 392 502.1 318.8 517.3 223.5C519.4 223.7 522.5 225.9 566.8 216.5C554.4 342 448.7 440 320 440S85.6 342 73.2 216.6C117.7 226 120.3 223.8 122.7 223.5zM320 48C371.9 48 435.3 80.9 443.3 128C445 137.9 435.6 146.5 425.6 143.3C399.7000000000001 135 361.2000000000001 130.2 320 130.2S240.4 135 214.4 143.3C204.6 146.4 195 138 196.7 128C204.7 80.9 268.1 48 320 48zM450.3 216.3C453.9 217.4 456.3 220.8 456 224.6C452.7 266.7000000000001 423.8 296 400 296S347.3 266.7000000000001 344 224.6C343.7 220.9 346.1 217.4 349.7 216.3C353.2 215.2 357.1 216.8 359 220L368.5 237C376.2 250.7 387.7 258.6 400 258.6S423.8 250.7 431.5 237L441 220C443.1 216.4 447.2 215.4 450.3 216.3zM240 258.6C252.3 258.6 263.8 250.7 271.5 237L281 220C283.1 216.3 287.2 215.3 290.3 216.3C293.9000000000001 217.4 296.3 220.8 296 224.6C292.7 266.7000000000001 263.8 296 240 296S187.3 266.7000000000001 184 224.6C183.7 220.9 186.1 217.4 189.7 216.3C193.2 215.2 197.1 216.8 199 220L208.5 237C216.2 250.8 227.7 258.6 240 258.6z" />
-    <glyph glyph-name="grin-tongue-squint"
-      unicode="&#xF58A;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM312 40C312 4.4 282.9 -24.5 247.1 -24C212 -23.5 184 5.8 184 41V83.8L201.7 92.6C216.7 100.1 233.2 90.9 236.6 76.1L239.4 64C241.5 54.8 254.6 54.8 256.7 64L259.5 76.1C262.9 90.9 279.3 100.2000000000001 294.4 92.6L312.1 83.8V40zM340.2 14.7C342.4 22.8 344 31.2 344 40V83.5C358.2 95.9 368.4 111 371.3 128C373 137.9 363.6 146.5 353.6 143.3C327.7000000000001 135 289.2000000000001 130.2 248.0000000000001 130.2S168.4 135 142.4 143.3C132.5 146.4 123 138 124.7 128C127.6 111 137.8000000000001 95.9 152 83.5V40C152 31.2 153.6 22.8 155.8000000000001 14.7C91.8 48.1 48 115 48 192C48 302.3 137.7 392 248 392S448 302.3 448 192C448 115 404.2 48.1 340.2 14.7zM377.1 295.8C373.3 300.2000000000001 366.8 301.3 361.8 298.3L281.8 250.3C278.2 248.1 276 244.2 276 240S278.2 231.9 281.8 229.7L361.8 181.7C367.2 178.5 373.5 180 377.1 184.2C380.9 188.7 380.9 195.2 377.2 199.7L343.6 240L377.2000000000001 280.3C381.0000000000001 284.8 380.9000000000001 291.4 377.1 295.8zM214.2 250.3L134.2 298.3C129.2 301.3 122.8 300.3 118.9 295.8C115.1 291.3 115.1 284.8 118.8 280.3L152.4 240L118.8 199.7C115 195.2 115.1 188.7 118.9 184.2C122.5 180 128.8 178.5 134.2 181.7L214.2 229.7C217.8 231.9 220 235.8 220 240S217.8 248.1 214.2 250.3z" />
-    <glyph glyph-name="grin-tongue-wink"
-      unicode="&#xF58B;"
-      horiz-adv-x="496" d=" M152 268C126.3 268 96.1 251.1 92.2 225.9C91.4 220.9 93.9 215.9 98.3 213.5C102.7 211.1 108.2 211.7 112 215.1L121.5 223.6C136.3 236.8 167.7 236.8 182.5 223.6L192 215.1C194.5 212.9 200 210.4 205.7 213.5C210.1 215.9 212.6 220.9 211.8 225.9C207.9 251.1 177.7 268 152 268zM328 320C283.8 320 248 284.2 248 240S283.8 160 328 160S408 195.8 408 240S372.2 320 328 320zM328 192C301.5 192 280 213.5 280 240S301.5 288 328 288S376 266.5 376 240S354.5 192 328 192zM328 264C314.7 264 304 253.3 304 240S314.7 216 328 216S352 226.7 352 240S341.3 264 328 264zM248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM312 40C312 4.4 282.9 -24.5 247.1 -24C212 -23.5 184 5.8 184 41V83.8L201.7 92.6C216.7 100.1 233.2 90.9 236.6 76.1L239.4 64C241.5 54.8 254.6 54.8 256.7 64L259.5 76.1C262.9 90.9 279.3 100.2000000000001 294.4 92.6L312.1 83.8V40zM340.2 14.7C342.4 22.8 344 31.2 344 40V83.5C358.2 95.9 368.4 111 371.3 128C373 137.9 363.6 146.5 353.6 143.3C327.7000000000001 135 289.2000000000001 130.2 248.0000000000001 130.2S168.4 135 142.4 143.3C132.5 146.4 123 138 124.7 128C127.6 111 137.8000000000001 95.9 152 83.5V40C152 31.2 153.6 22.8 155.8000000000001 14.7C91.8 48.1 48 115 48 192C48 302.3 137.7 392 248 392S448 302.3 448 192C448 115 404.2 48.1 340.2 14.7z" />
-    <glyph glyph-name="grin-tongue"
-      unicode="&#xF589;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM312 40C312 4.4 282.9 -24.5 247.1 -24C212 -23.5 184 5.8 184 41V83.8L201.7 92.6C216.7 100.1 233.2 90.9 236.6 76.1L239.4 64C241.5 54.8 254.6 54.8 256.7 64L259.5 76.1C262.9 90.9 279.3 100.2000000000001 294.4 92.6L312.1 83.8V40zM340.2 14.7C342.4 22.8 344 31.2 344 40V83.5C358.2 95.9 368.4 111 371.3 128C373 137.9 363.6 146.5 353.6 143.3C327.7000000000001 135 289.2000000000001 130.2 248.0000000000001 130.2S168.4 135 142.4 143.3C132.5 146.4 123 138 124.7 128C127.6 111 137.8000000000001 95.9 152 83.5V40C152 31.2 153.6 22.8 155.8000000000001 14.7C91.8 48.1 48 115 48 192C48 302.3 137.7 392 248 392S448 302.3 448 192C448 115 404.2 48.1 340.2 14.7zM168 272C150.3 272 136 257.7 136 240S150.3 208 168 208S200 222.3 200 240S185.7 272 168 272zM328 272C310.3 272 296 257.7 296 240S310.3 208 328 208S360 222.3 360 240S345.7 272 328 272z" />
-    <glyph glyph-name="grin-wink"
-      unicode="&#xF58C;"
-      horiz-adv-x="496" d=" M0 192C0 55 111 -56 248 -56S496 55 496 192S385 440 248 440S0 329 0 192zM200 240C200 222.3 185.7 208 168 208S136 222.3 136 240S150.3 272 168 272S200 257.7 200 240zM368 215L358.5 223.5C343.7 236.7 312.3 236.7 297.5 223.5L288 215C279.7 207.6 266.4 214.6 268.2 225.8C272.2 251 302.4 267.9 328.1 267.9S384 251 388 225.8C389.6 214.8 376.5 207.6 368 215zM124.9 127.2C155.1 117.5 200 112 248 112S340.9 117.5 371.1 127.2C382.4000000000001 130.9 393.7000000000001 121.2 391.8 109.3C382.6 54.3 308.6 16 248 16S113.5 54.3 104.2 109.3C102.2 121.2 113.5 130.9 124.9 127.2z" />
-    <glyph glyph-name="grin"
-      unicode="&#xF580;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM353.6 143.4C327.7000000000001 135.1 289.2000000000001 130.3 248.0000000000001 130.3S168.4 135.1 142.4 143.4C132.5 146.5 123 138 124.7 128.1C132.6 80.9999999999999 196 48.1 248.0000000000001 48.1S363.3 80.9999999999999 371.3 128.1C372.9000000000001 137.9 363.6 146.5 353.6 143.4zM168 208C185.7 208 200 222.3 200 240S185.7 272 168 272S136 257.7 136 240S150.3 208 168 208zM328 208C345.7 208 360 222.3 360 240S345.7 272 328 272S296 257.7 296 240S310.3 208 328 208z" />
-    <glyph glyph-name="hand-lizard"
-      unicode="&#xF258;"
-      horiz-adv-x="576" d=" M556.686 157.458L410.328 383.171C397.001 403.728 374.417 416 349.917 416H56C25.121 416 0 390.878 0 360V352C0 307.8880000000001 35.888 272 80 272H276.0420000000001L257.7090000000001 224H144C95.477 224 56 184.523 56 136C56 105.121 81.121 80 112 80H243.552C246.539 80 249.466 79.451 252.249 78.369L352 39.582V-32H576V92.171C576 115.396 569.321 137.972 556.686 157.458zM528 16H400V39.582C400 59.53 387.986 77.09 369.396 84.318L269.645 123.106A71.733 71.733 0 0 1 243.552 128H112C107.589 128 104 131.589 104 136C104 158.056 121.944 176 144 176H257.709C277.476 176 295.495 188.407 302.549 206.873L327.101 271.154C336.097 294.707 318.673 320 293.471 320H80C62.355 320 48 334.355 48 352V360C48 364.411 51.589 368 56 368H349.917C358.083 368 365.61 363.91 370.054 357.058L516.412 131.343A71.84 71.84 0 0 0 528 92.171V16z" />
-    <glyph glyph-name="hand-paper"
-      unicode="&#xF256;"
-      horiz-adv-x="448" d=" M372.57 335.359V346.184C372.57 389.796 332.05 422.875 289.531 411.73C263.902 461.23 195.441 459.18 171.549 410.983C130.269 421.544 89.144 390.055 89.144 346V219.87C69.191 227.297 45.836 224.938 27.061 210.999C-2.294 189.203 -8.733 147.666 12.511 117.846L132.48 -50.569A32 32 0 0 1 158.542 -64.001H381.439C396.343 -64.001 409.274 -53.712 412.621 -39.188L442.805 91.77A203.637 203.637 0 0 1 448 137.436V269C448 309.62 412.477 340.992 372.57 335.359zM399.997 137.437C399.997 125.706 398.663 113.968 396.0320000000001 102.551L368.707 -16H166.787L51.591 145.697C37.152 165.967 66.614 188.473 80.985 168.302L108.113 130.223C117.108 117.597 137.144 123.936 137.144 139.506V346C137.144 371.645 173.715 370.81 173.715 345.309V192C173.715 183.163 180.878 176 189.715 176H196.571C205.408 176 212.571 183.163 212.571 192V381C212.571 406.663 249.142 405.81 249.142 380.309V192C249.142 183.163 256.305 176 265.142 176H271.998C280.835 176 287.998 183.163 287.998 192V346.875C287.998 372.5470000000001 324.568 371.685 324.568 346.184V192C324.568 183.163 331.731 176 340.568 176H347.425C356.262 176 363.425 183.163 363.425 192V268.309C363.425 294.551 399.995 293.949 399.995 269V137.437z" />
-    <glyph glyph-name="hand-peace"
-      unicode="&#xF25B;"
-      horiz-adv-x="448" d=" M362.146 256.024C348.4360000000001 277.673 323.385 290.04 297.14 286.365V374C297.14 414.804 264.329 448 223.999 448C183.669 448 150.859 414.804 150.859 374L160 280L141.321 358.85C126.578 397.157 83.85 415.89 46.209 400.7920000000001C8.735 385.762 -9.571 343.0370000000001 5.008 305.15L60.765 160.223C30.208 135.267 16.771 102.414 36.032 68.005L90.885 -29.994C102.625 -50.97 124.73 -64 148.575 -64H354.277C385.021 -64 411.835 -42.56 418.832 -12.203L446.259 106.7960000000001A67.801 67.801 0 0 1 447.988 121.999L448 192C448 236.956 404.737 269.343 362.146 256.024zM399.987 122C399.987 120.512 399.8180000000001 119.023 399.485 117.577L372.058 -1.424C370.08 -10.006 362.768 -16 354.276 -16H148.575C142.089 -16 136.033 -12.379 132.77 -6.551L77.916 91.449C73.359 99.59 75.297 110.117 82.424 115.937L109.071 137.701A16 16 0 0 1 113.883 155.84L49.793 322.389C37.226 355.044 84.37 373.163 96.51 341.611L156.294 186.254A16 16 0 0 1 171.227 176H182.859C191.696 176 198.859 183.163 198.859 192V374C198.859 408.375 249.14 408.43 249.14 374V192C249.14 183.163 256.303 176 265.14 176H271.996C280.833 176 287.996 183.163 287.996 192V220C287.996 245.122 324.563 245.159 324.563 220V192C324.563 183.163 331.726 176 340.563 176H347.419C356.256 176 363.419 183.163 363.419 192C363.419 217.12 399.986 217.16 399.986 192V122z" />
-    <glyph glyph-name="hand-point-down"
-      unicode="&#xF0A7;"
-      horiz-adv-x="448" d=" M188.8 -64C234.416 -64 272 -26.235 272 19.2V54.847A93.148 93.148 0 0 1 294.064 62.776C316.0700000000001 60.269 339.0420000000001 66.2789999999999 356.855 78.761C409.342 79.9 448 116.159 448 178.701V200C448 260.063 408 298.512 408 327.2V329.879C412.952 335.626 416 343.415 416 351.999V416C416 433.673 403.106 448 387.2 448H156.8C140.894 448 128 433.673 128 416V352C128 343.416 131.048 335.627 136 329.88V327.201C136 320.237 129.807 312.339 112.332 297.0180000000001L112.184 296.889L112.038 296.7580000000001C102.101 287.9020000000001 91.197 278.642 78.785 270.9070000000001C48.537 252.202 0 240.514 0 195.2C0 138.272 35.286 103.2 83.2 103.2C91.226 103.2 98.689 104.014 105.6 105.376V19.2C105.6 -25.899 143.701 -64 188.8 -64zM188.8 -16C170.1 -16 153.6 0.775 153.6 19.2V177.6C136.275 177.6 118.4 151.2000000000001 83.2 151.2000000000001C56.8 151.2000000000001 48 171.8250000000001 48 195.2000000000001C48 203.9940000000001 80.712 215.6450000000001 104.1 230.1260000000001C118.675 239.2000000000001 131.325 249.6500000000001 143.975 260.9250000000001C162.349 277.0340000000001 180.608 294.761 183.571 320.0000000000001H360.3230000000001C364.087 277.2100000000001 400 245.491 400 200V178.701C400 138.177 377.803 121.577 338.675 128.1C330.6740000000001 113.488 304.6960000000001 103.949 285.05 115.175C266.825 95.81 238.669 97.388 224 110.225V19.2C224 0.225 207.775 -16 188.8 -16zM328 384C328 397.255 338.745 408 352 408S376 397.255 376 384S365.255 360 352 360S328 370.745 328 384z" />
-    <glyph glyph-name="hand-point-left"
-      unicode="&#xF0A5;"
-      horiz-adv-x="512" d=" M0 227.2C0 181.584 37.765 144 83.2 144H118.847A93.148 93.148 0 0 1 126.776 121.936C124.269 99.93 130.279 76.958 142.761 59.145C143.9 6.658 180.159 -32 242.701 -32H264C324.063 -32 362.512 8 391.2 8H393.879C399.626 3.048 407.415 0 415.999 0H479.999C497.672 0 511.999 12.894 511.999 28.8V259.2C511.999 275.106 497.672 288 479.999 288H415.999C407.415 288 399.626 284.952 393.879 280H391.2C384.236 280 376.338 286.193 361.017 303.668L360.888 303.8160000000001L360.757 303.962C351.901 313.899 342.641 324.803 334.906 337.215C316.202 367.463 304.514 416 259.2 416C202.272 416 167.2 380.714 167.2 332.8C167.2 324.774 168.014 317.3110000000001 169.376 310.4H83.2C38.101 310.4 0 272.299 0 227.2zM48 227.2C48 245.9 64.775 262.4 83.2 262.4H241.6C241.6 279.725 215.2 297.6 215.2 332.8C215.2 359.2 235.825 368 259.2000000000001 368C267.9940000000001 368 279.6450000000001 335.288 294.1260000000001 311.9C303.2000000000001 297.325 313.6500000000001 284.675 324.925 272.025C341.034 253.651 358.761 235.392 384 232.429V55.677C341.21 51.913 309.491 16 264 16H242.701C202.177 16 185.577 38.197 192.1 77.325C177.488 85.326 167.949 111.304 179.175 130.95C159.81 149.175 161.388 177.331 174.225 192H83.2C64.225 192 48 208.225 48 227.2zM448 88C461.255 88 472 77.255 472 64S461.255 40 448 40S424 50.745 424 64S434.745 88 448 88z" />
-    <glyph glyph-name="hand-point-right"
-      unicode="&#xF0A4;"
-      horiz-adv-x="512" d=" M428.8 310.4H342.623A115.52 115.52 0 0 1 344.799 332.8C344.799 380.714 309.727 416 252.799 416C207.485 416 195.797 367.463 177.092 337.216C169.357 324.803 160.098 313.899 151.241 303.963L151.11 303.817L150.981 303.6690000000001C135.662 286.193 127.764 280 120.8 280H118.121C112.374 284.952 104.585 288 96.001 288H32C14.327 288 0 275.106 0 259.2V28.8C0 12.894 14.327 0 32 0H96C104.584 0 112.373 3.048 118.12 8H120.799C149.487 8 187.936 -32 247.999 -32H269.298C331.8400000000001 -32 368.098 6.658 369.238 59.145C381.7200000000001 76.958 387.729 99.93 385.223 121.936A93.148 93.148 0 0 1 393.152 144H428.8C474.235 144 512 181.584 512 227.2C512 272.299 473.899 310.4 428.8 310.4zM428.8 192H337.774C350.611 177.331 352.189 149.175 332.824 130.95C344.051 111.304 334.511 85.326 319.899 77.325C326.423 38.197 309.823 16 269.299 16H248C202.509 16 170.79 51.913 128 55.676V232.429C153.239 235.393 170.966 253.651 187.075 272.025C198.35 284.675 208.8 297.3250000000001 217.874 311.9C232.355 335.288 244.006 368 252.8 368C276.175 368 296.8 359.2 296.8 332.8C296.8 297.6 270.4000000000001 279.725 270.4000000000001 262.4H428.8000000000001C447.2250000000001 262.4 464.0000000000001 245.9 464.0000000000001 227.2C464.0000000000001 208.225 447.7750000000001 192 428.8000000000001 192zM88 64C88 50.745 77.255 40 64 40S40 50.745 40 64S50.745 88 64 88S88 77.255 88 64z" />
-    <glyph glyph-name="hand-point-up"
-      unicode="&#xF0A6;"
-      horiz-adv-x="448" d=" M105.6 364.8V278.623A115.52 115.52 0 0 1 83.2 280.799C35.286 280.799 0 245.727 0 188.799C0 143.485 48.537 131.797 78.784 113.092C91.197 105.357 102.101 96.098 112.037 87.241L112.183 87.11L112.331 86.981C129.807 71.662 136 63.764 136 56.8V54.121C131.048 48.374 128 40.585 128 32.001V-31.999C128 -49.672 140.894 -63.999 156.8 -63.999H387.2000000000001C403.1060000000001 -63.999 416.0000000000001 -49.672 416.0000000000001 -31.999V32.001C416.0000000000001 40.585 412.9520000000001 48.374 408.0000000000001 54.121V56.8C408.0000000000001 85.488 448.0000000000001 123.937 448.0000000000001 184V205.299C448.0000000000001 267.841 409.3420000000001 304.099 356.8550000000001 305.2390000000001C339.0420000000001 317.721 316.0700000000001 323.73 294.0640000000001 321.224A93.148 93.148 0 0 1 272 329.153V364.8C272 410.235 234.416 448 188.8 448C143.701 448 105.6 409.899 105.6 364.8zM224 364.8V273.774C238.669 286.611 266.825 288.189 285.05 268.824C304.6960000000001 280.0510000000001 330.6740000000001 270.511 338.675 255.899C377.803 262.423 400 245.823 400 205.299V184C400 138.509 364.087 106.79 360.324 64H183.571C180.607 89.239 162.349 106.966 143.975 123.075C131.325 134.35 118.675 144.8 104.1 153.874C80.712 168.355 48 180.006 48 188.8C48 212.175 56.8 232.8 83.2 232.8C118.4 232.8 136.275 206.4 153.6 206.4V364.8C153.6 383.225 170.1 400 188.8 400C207.775 400 224 383.775 224 364.8zM352 24C365.255 24 376 13.255 376 0S365.255 -24 352 -24S328 -13.255 328 0S338.745 24 352 24z" />
-    <glyph glyph-name="hand-pointer"
-      unicode="&#xF25A;"
-      horiz-adv-x="448" d=" M358.182 268.639C338.689 293.4070000000001 305.5030000000001 300.584 278.31 287.737C263.183 303.4240000000001 242.128 310.2240000000001 221.715 307.366V381C221.715 417.944 191.979 448 155.429 448S89.143 417.944 89.143 381V219.871C69.234 227.281 45.871 224.965 27.06 210.999C-2.295 189.204 -8.733 147.6660000000001 12.51 117.847L122.209 -36.154C134.632 -53.59 154.741 -64 176 -64H354.286C385.088 -64 411.86 -42.5 418.843 -12.203L446.272 106.7960000000001A67.873 67.873 0 0 1 448 122V206C448 252.844 401.375 285.273 358.182 268.639zM80.985 168.303L108.111 130.224C117.106 117.598 137.142 123.937 137.142 139.507V381C137.142 406.12 173.713 406.16 173.713 381V206C173.713 197.164 180.876 190 189.713 190H196.57C205.407 190 212.57 197.164 212.57 206V241C212.57 266.12 249.141 266.16 249.141 241V206C249.141 197.164 256.304 190 265.141 190H272C280.837 190 288 197.164 288 206V227C288 252.12 324.5710000000001 252.16 324.5710000000001 227V206C324.5710000000001 197.164 331.7340000000001 190 340.5710000000001 190H347.4280000000001C356.2650000000001 190 363.4280000000001 197.164 363.4280000000001 206C363.4280000000001 231.121 399.999 231.16 399.999 206V122C399.999 120.512 399.8300000000001 119.023 399.497 117.577L372.067 -1.424C370.089 -10.006 362.777 -16 354.2850000000001 -16H176C170.231 -16 164.737 -13.122 161.303 -8.303L51.591 145.697C37.185 165.92 66.585 188.515 80.985 168.303zM176.143 48V144C176.143 152.837 182.411 160 190.143 160H196.143C203.875 160 210.143 152.837 210.143 144V48C210.143 39.163 203.875 32 196.143 32H190.143C182.41 32 176.143 39.163 176.143 48zM251.571 48V144C251.571 152.837 257.839 160 265.5710000000001 160H271.5710000000001C279.3030000000001 160 285.5710000000001 152.837 285.5710000000001 144V48C285.5710000000001 39.163 279.3030000000001 32 271.5710000000001 32H265.5710000000001C257.839 32 251.5710000000001 39.163 251.5710000000001 48zM327 48V144C327 152.837 333.268 160 341 160H347C354.7320000000001 160 361 152.837 361 144V48C361 39.163 354.7320000000001 32 347 32H341C333.268 32 327 39.163 327 48z" />
-    <glyph glyph-name="hand-rock"
-      unicode="&#xF255;"
-      horiz-adv-x="512" d=" M408.864 368.948C386.463 402.846 342.756 411.221 310.051 392.536C280.577 424.005 230.906 423.629 201.717 392.558C154.557 419.578 93.007 387.503 91.046 331.752C44.846 342.593 0 307.999 0 260.5710000000001V203.618C0 170.877 14.28 139.664 39.18 117.984L136.89 32.903C141.142 29.201 140 27.33 140 -1e-13C140 -17.6730000000001 154.327 -32.0000000000001 172 -32.0000000000001H424C441.673 -32.0000000000001 456 -17.6730000000001 456 -1e-13C456 23.5129999999999 454.985 30.745 459.982 42.37L502.817 142.026C508.911 156.203 512 171.198 512 186.5939999999999V301.0370000000001C512 353.876 457.686 389.699 408.8640000000001 368.948zM464 186.594A64.505 64.505 0 0 0 458.718 160.981L415.8830000000001 61.326C410.653 49.155 408.0000000000001 36.286 408.0000000000001 23.076V16H188V26.286C188 42.656 180.86 58.263 168.41 69.103L70.7 154.183C56.274 166.745 48 184.764 48 203.619V260.572C48 293.78 100 294.1090000000001 100 259.895V218.667A16 16 0 0 1 105.493 206.6L112.493 200.505A16 16 0 0 1 139 212.571V329.1430000000001C139 362.24 191 362.868 191 328.466V301.7150000000001C191 292.879 198.164 285.7150000000001 207 285.7150000000001H214C222.836 285.7150000000001 230 292.879 230 301.7150000000001V342.858C230 375.992 282 376.533 282 342.181V301.7150000000001C282 292.879 289.163 285.7150000000001 298 285.7150000000001H305C313.837 285.7150000000001 321 292.879 321 301.7150000000001V329.144C321 362.174 373 362.924 373 328.467V301.716C373 292.88 380.163 285.716 389 285.716H396C404.837 285.716 412 292.88 412 301.716C412 334.862 464 335.329 464 301.039V186.5940000000001z" />
-    <glyph glyph-name="hand-scissors"
-      unicode="&#xF257;"
-      horiz-adv-x="512" d=" M256 -32L326 -31.987C331.114 -31.987 336.231 -31.404 341.203 -30.258L460.202 -2.831C490.56 4.165 512 30.98 512 61.723V267.425C512 291.27 498.97 313.376 477.995 325.115L379.996 379.968C345.587 399.2290000000001 312.733 385.7920000000001 287.778 355.235L142.85 410.992C104.963 425.5710000000001 62.238 407.265 47.208 369.791C32.11 332.149 50.843 289.421 89.15 274.679L168 256L74 265.141C33.196 265.141 0 232.33 0 192.001C0 151.671 33.196 118.86 74 118.86H161.635C157.96 92.615 170.327 67.563 191.976 53.8539999999999C178.657 11.263 211.044 -32 256 -32zM256 16.013C230.84 16.013 230.88 52.58 256 52.58C264.837 52.58 272 59.743 272 68.58V75.436C272 84.273 264.837 91.436 256 91.436H228C202.841 91.436 202.878 128.003 228 128.003H256C264.837 128.003 272 135.166 272 144.003V150.859C272 159.696 264.837 166.859 256 166.859H74C39.57 166.859 39.625 217.14 74 217.14H256C264.837 217.14 272 224.303 272 233.14V244.772A16 16 0 0 1 261.746 259.705L106.389 319.49C74.837 331.63 92.957 378.773 125.611 366.207L292.16 302.116A16.001 16.001 0 0 1 310.299 306.928L332.063 333.5750000000001C337.883 340.702 348.411 342.639 356.551 338.0830000000001L454.551 283.2290000000001C460.379 279.966 464 273.911 464 267.424V61.723C464 53.232 458.006 45.919 449.424 43.941L330.423 16.514A19.743 19.743 0 0 0 326 16.012H256z" />
-    <glyph glyph-name="hand-spock"
-      unicode="&#xF259;"
-      horiz-adv-x="512" d=" M21.096 66.21L150.188 -55.303A32 32 0 0 1 172.12 -64.001H409.7200000000001C423.8900000000001 -64.001 436.3730000000001 -54.682 440.4000000000001 -41.097L472.215 66.216A115.955 115.955 0 0 1 477 99.189V136.028C477 140.079 477.476 144.132 478.414 148.073L510.144 281.4830000000001C520.243 323.8950000000001 487.828 364.221 444.6 364.0080000000001C440.456 388.8640000000001 422.057 411.1730000000001 394.75 418.0000000000001C358.947 426.9520000000001 322.523 405.3450000000001 313.5 369.25L296.599 264L274.924 395.99C266.638 432.06 230.621 454.562 194.62 446.286C165.004 439.4820000000001 144.482 413.897 142.738 384.991C100.101 384.16 69.283 344.428 78.667 303.147L109.707 166.639C82.513 189.154 42.423 186.631 18.225 160.917C-7.151 133.956 -5.873 91.592 21.096 66.21zM53.164 128.021L53.166 128.0219999999999C60.385 135.694 72.407 136.002 80.022 128.8349999999999L133.034 78.9409999999999C143.225 69.351 160 76.6 160 90.594V160.073C160 161.266 159.866 162.456 159.603 163.619L125.473 313.791C119.877 338.408 156.975 346.651 162.527 322.212L192.926 188.4549999999999A16 16 0 0 1 208.529 176.0009999999999H217.1330000000001C227.4090000000001 176.0009999999999 235.0270000000001 185.5679999999999 232.7270000000001 195.5839999999999L191.107 376.7369999999999C185.484 401.2059999999999 222.497 409.813 228.142 385.2449999999999L273.362 188.4169999999999A16 16 0 0 1 288.956 176H302.173A16 16 0 0 1 317.695 188.119L360.067 357.6090000000001C366.171 382.0310000000001 403.029 372.7680000000001 396.932 348.3920000000001L358.805 195.88C356.284 185.792 363.92 176 374.327 176H384.021A16 16 0 0 1 399.586 188.295L426.509 301.4C432.3300000000001 325.848 469.306 317.087 463.475 292.598L431.7200000000001 159.19A100.094 100.094 0 0 1 429 136.028V99.189C429 92.641 428.057 86.138 426.195 79.8610000000001L397.775 -16H178.465L53.978 101.164C46.349 108.344 45.984 120.393 53.164 128.021z" />
-    <glyph glyph-name="handshake"
-      unicode="&#xF2B5;"
-      horiz-adv-x="640" d=" M519.2 320.1L471.6 367.7A56.252 56.252 0 0 1 432 384H205.2C190.4 384 176.1 378.1 165.6 367.7L118 320.1H0V64.4H64C81.6 64.4 95.8 78.6 95.9 96.1H105L189.6 19.6999999999999C220.5 -5.4000000000001 263.4 -6.0000000000001 295.2 15.8999999999999C307.7 5.0999999999999 321.2 -1e-13 336.3 -1e-13C354.5 -1e-13 371.6 7.3999999999999 385.1 23.9999999999999C407.2000000000001 15.3 433.3 21.3999999999999 449.1 40.8L475.3 73.1C480.9 79.9999999999999 484.4 87.9 486.2 96.1H544.1C544.2 78.6 558.5 64.4 576 64.4H640V320.1H519.2zM48 96.4C39.2 96.4 32 103.6 32 112.4S39.2 128.4 48 128.4S64 121.2 64 112.4C64 103.5 56.8 96.4 48 96.4zM438 103.3L411.9 71.1C409.1 67.7 404.1 67.1 400.6 69.9L376.7 89.3L346.7 52.8C340.7 45.4999999999999 331.7 47.9999999999999 328.7 50.4L291.9 81.9L276.3 62.7C262.4 45.6 237.1 43 221 56.1L123.7 144.1H96V272.2H137.9L199.6 333.8C201.6 334.6 203.3 335.3 205.3 336.1H262L223.3 300.6C193.9 273.7 192.2 228.3 218.9 199.3C233.7 183.1 280.1 158.1 320.4 194.9L328.6 202.4L436.8 114.6C440.2 111.8 440.7 106.7 438 103.3zM544 144.1H474.8C472.5 146.9 469.9 149.5 467.1 151.8L364.4000000000001 235.2L376.9000000000001 246.6C383.4000000000001 252.6 383.9000000000001 262.7 377.9000000000001 269.2L367 280.9C361 287.4 350.9 287.8 344.4 281.9L289.2 231.3C279.7 222.6 263.5 221.9 254.6 231.3C245.3 241.2 246.1 256.4 255.8 265.2000000000001L321.4 325.3C328.8 332.1 338.4 335.8 348.4 335.8L432.1 336C434.2 336 436.2 335.2000000000001 437.6 333.7000000000001L499.3 272.1H544V144.1zM592 96.4C583.2 96.4 576 103.6 576 112.4S583.2 128.4 592 128.4S608 121.2 608 112.4C608 103.5 600.8 96.4 592 96.4z" />
-    <glyph glyph-name="hdd"
-      unicode="&#xF0A0;"
-      horiz-adv-x="576" d=" M567.403 212.358L462.323 363.411A48 48 0 0 1 422.919 384H153.081A48 48 0 0 1 113.677 363.411L8.597 212.358A48.001 48.001 0 0 1 0 184.946V48C0 21.49 21.49 0 48 0H528C554.51 0 576 21.49 576 48V184.946C576 194.747 573 204.312 567.403 212.358zM153.081 336H422.919L500.832 224H75.168L153.081 336zM528 48H48V176H528V48zM496 112C496 94.327 481.673 80 464 80S432 94.327 432 112S446.327 144 464 144S496 129.673 496 112zM400 112C400 94.327 385.673 80 368 80S336 94.327 336 112S350.327 144 368 144S400 129.673 400 112z" />
-    <glyph glyph-name="heart"
-      unicode="&#xF004;"
-      horiz-adv-x="512" d=" M458.4 383.7C400.6 432.3 311.3 425 256 368.7C200.7 425 111.4 432.4 53.6 383.7C-21.6 320.4 -10.6 217.2 43 162.5L218.4 -16.2C228.4 -26.4 241.8 -32.1 256 -32.1C270.3 -32.1 283.6 -26.4999999999999 293.6 -16.3L469 162.4C522.5 217.1 533.7 320.3 458.4 383.7zM434.8 196.2L259.4 17.5C257 15.1 255 15.1 252.6 17.5L77.2 196.2C40.7 233.4 33.3 303.8 84.5 346.9C123.4 379.6 183.4 374.7 221 336.4L256 300.7L291 336.4C328.8 374.9 388.8 379.6 427.5 347C478.6 303.9 471 233.1 434.8 196.2z" />
-    <glyph glyph-name="hospital"
-      unicode="&#xF0F8;"
-      horiz-adv-x="448" d=" M128 204V244C128 250.627 133.373 256 140 256H180C186.627 256 192 250.627 192 244V204C192 197.373 186.627 192 180 192H140C133.373 192 128 197.373 128 204zM268 192H308C314.627 192 320 197.373 320 204V244C320 250.627 314.627 256 308 256H268C261.373 256 256 250.627 256 244V204C256 197.373 261.373 192 268 192zM192 108V148C192 154.627 186.627 160 180 160H140C133.373 160 128 154.627 128 148V108C128 101.373 133.373 96 140 96H180C186.627 96 192 101.373 192 108zM268 96H308C314.627 96 320 101.373 320 108V148C320 154.627 314.627 160 308 160H268C261.373 160 256 154.627 256 148V108C256 101.373 261.373 96 268 96zM448 -28V-64H0V-28C0 -21.373 5.373 -16 12 -16H31.5V362.9650000000001C31.5 374.582 42.245 384 55.5 384H144V424C144 437.255 154.745 448 168 448H280C293.255 448 304 437.255 304 424V384H392.5C405.755 384 416.5 374.582 416.5 362.9650000000001V-16H436C442.627 -16 448 -21.373 448 -28zM79.5 -15H192V52C192 58.627 197.373 64 204 64H244C250.627 64 256 58.627 256 52V-15H368.5V336H304V312C304 298.745 293.255 288 280 288H168C154.745 288 144 298.745 144 312V336H79.5V-15zM266 384H240V410A6 6 0 0 1 234 416H214A6 6 0 0 1 208 410V384H182A6 6 0 0 1 176 378V358A6 6 0 0 1 182 352H208V326A6 6 0 0 1 214 320H234A6 6 0 0 1 240 326V352H266A6 6 0 0 1 272 358V378A6 6 0 0 1 266 384z" />
-    <glyph glyph-name="hourglass"
-      unicode="&#xF254;"
-      horiz-adv-x="384" d=" M368 400H372C378.627 400 384 405.373 384 412V436C384 442.627 378.627 448 372 448H12C5.373 448 0 442.627 0 436V412C0 405.373 5.373 400 12 400H16C16 319.4360000000001 48.188 234.193 113.18 192C47.899 149.619 16 64.1 16 -16H12C5.373 -16 0 -21.373 0 -28V-52C0 -58.627 5.373 -64 12 -64H372C378.627 -64 384 -58.627 384 -52V-28C384 -21.373 378.627 -16 372 -16H368C368 64.564 335.812 149.807 270.82 192C336.102 234.381 368 319.9 368 400zM64 400H320C320 298.38 262.693 216 192 216S64 298.379 64 400zM320 -16H64C64 85.62 121.308 168 192 168S320 85.62 320 -16z" />
-    <glyph glyph-name="id-badge"
-      unicode="&#xF2C1;"
-      horiz-adv-x="384" d=" M336 448H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V400C384 426.5 362.5 448 336 448zM336 -16H48V400H336V-16zM144 336H240C248.8 336 256 343.2 256 352S248.8 368 240 368H144C135.2 368 128 360.8 128 352S135.2 336 144 336zM192 160C227.3 160 256 188.7 256 224S227.3 288 192 288S128 259.3 128 224S156.7 160 192 160zM102.4 32H281.6C294 32 304 40.6 304 51.2V70.4C304 102.2 273.9 128 236.8 128C226 128 218.1 120 192 120C165.1 120 158.6 128 147.2 128C110.1 128 80 102.2 80 70.4V51.2C80 40.6 90 32 102.4 32z" />
-    <glyph glyph-name="id-card"
-      unicode="&#xF2C2;"
-      horiz-adv-x="576" d=" M528 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H528C554.5 -32 576 -10.5 576 16V368C576 394.5 554.5 416 528 416zM528 16H303.2C304.1 20.5 304 12.4 304 38.4C304 70.2 273.9 96 236.8 96C226 96 218.1 88 192 88C165.1 88 158.6 96 147.2 96C110.1 96 80 70.2 80 38.4C80 12.4 79.8 20.5 80.8 16H48V304H528V16zM360 96H472C476.4 96 480 99.6 480 104V120C480 124.4 476.4 128 472 128H360C355.6 128 352 124.4 352 120V104C352 99.6 355.6 96 360 96zM360 160H472C476.4 160 480 163.6 480 168V184C480 188.4 476.4 192 472 192H360C355.6 192 352 188.4 352 184V168C352 163.6 355.6 160 360 160zM360 224H472C476.4 224 480 227.6 480 232V248C480 252.4 476.4 256 472 256H360C355.6 256 352 252.4 352 248V232C352 227.6 355.6 224 360 224zM192 128C227.3 128 256 156.7 256 192S227.3 256 192 256S128 227.3 128 192S156.7 128 192 128z" />
-    <glyph glyph-name="image"
-      unicode="&#xF03E;"
-      horiz-adv-x="512" d=" M464 384H48C21.49 384 0 362.51 0 336V48C0 21.49 21.49 0 48 0H464C490.51 0 512 21.49 512 48V336C512 362.51 490.51 384 464 384zM458 48H54A6 6 0 0 0 48 54V330A6 6 0 0 0 54 336H458A6 6 0 0 0 464 330V54A6 6 0 0 0 458 48zM128 296C105.909 296 88 278.091 88 256S105.909 216 128 216S168 233.909 168 256S150.091 296 128 296zM96 96H416V176L328.485 263.515C323.7990000000001 268.201 316.201 268.201 311.514 263.515L192 144L152.485 183.515C147.799 188.201 140.201 188.201 135.514 183.515L96 144V96z" />
-    <glyph glyph-name="images"
-      unicode="&#xF302;"
-      horiz-adv-x="576" d=" M480 32V16C480 -10.51 458.51 -32 432 -32H48C21.49 -32 0 -10.51 0 16V272C0 298.51 21.49 320 48 320H64V272H54A6 6 0 0 1 48 266V22A6 6 0 0 1 54 16H426A6 6 0 0 1 432 22V32H480zM522 368H150A6 6 0 0 1 144 362V118A6 6 0 0 1 150 112H522A6 6 0 0 1 528 118V362A6 6 0 0 1 522 368zM528 416C554.51 416 576 394.51 576 368V112C576 85.49 554.51 64 528 64H144C117.49 64 96 85.49 96 112V368C96 394.51 117.49 416 144 416H528zM264 304C264 281.909 246.091 264 224 264S184 281.909 184 304S201.909 344 224 344S264 326.091 264 304zM192 208L231.515 247.515C236.201 252.201 243.799 252.201 248.486 247.515L288 208L391.515 311.515C396.201 316.201 403.799 316.201 408.486 311.515L480 240V160H192V208z" />
-    <glyph glyph-name="keyboard"
-      unicode="&#xF11C;"
-      horiz-adv-x="576" d=" M528 384H48C21.49 384 0 362.51 0 336V48C0 21.49 21.49 0 48 0H528C554.51 0 576 21.49 576 48V336C576 362.51 554.51 384 528 384zM536 48C536 43.589 532.411 40 528 40H48C43.589 40 40 43.589 40 48V336C40 340.411 43.589 344 48 344H528C532.411 344 536 340.411 536 336V48zM170 178V206C170 212.627 164.627 218 158 218H130C123.373 218 118 212.627 118 206V178C118 171.373 123.373 166 130 166H158C164.627 166 170 171.373 170 178zM266 178V206C266 212.627 260.627 218 254 218H226C219.373 218 214 212.627 214 206V178C214 171.373 219.373 166 226 166H254C260.627 166 266 171.373 266 178zM362 178V206C362 212.627 356.627 218 350 218H322C315.373 218 310 212.627 310 206V178C310 171.373 315.373 166 322 166H350C356.627 166 362 171.373 362 178zM458 178V206C458 212.627 452.627 218 446 218H418C411.373 218 406 212.627 406 206V178C406 171.373 411.373 166 418 166H446C452.627 166 458 171.373 458 178zM122 96V124C122 130.627 116.627 136 110 136H82C75.373 136 70 130.627 70 124V96C70 89.373 75.373 84 82 84H110C116.627 84 122 89.373 122 96zM506 96V124C506 130.627 500.627 136 494 136H466C459.373 136 454 130.627 454 124V96C454 89.373 459.373 84 466 84H494C500.627 84 506 89.373 506 96zM122 260V288C122 294.627 116.627 300 110 300H82C75.373 300 70 294.627 70 288V260C70 253.373 75.373 248 82 248H110C116.627 248 122 253.373 122 260zM218 260V288C218 294.627 212.627 300 206 300H178C171.373 300 166 294.627 166 288V260C166 253.373 171.373 248 178 248H206C212.627 248 218 253.373 218 260zM314 260V288C314 294.627 308.627 300 302 300H274C267.373 300 262 294.627 262 288V260C262 253.373 267.373 248 274 248H302C308.627 248 314 253.373 314 260zM410 260V288C410 294.627 404.627 300 398 300H370C363.373 300 358 294.627 358 288V260C358 253.373 363.373 248 370 248H398C404.627 248 410 253.373 410 260zM506 260V288C506 294.627 500.627 300 494 300H466C459.373 300 454 294.627 454 288V260C454 253.373 459.373 248 466 248H494C500.627 248 506 253.373 506 260zM408 102V118C408 124.627 402.627 130 396 130H180C173.373 130 168 124.627 168 118V102C168 95.373 173.373 90 180 90H396C402.627 90 408 95.373 408 102z" />
-    <glyph glyph-name="kiss-beam"
-      unicode="&#xF597;"
-      horiz-adv-x="496" d=" M168 296C144.2 296 115.3 266.7 112 224.6C111.7 220.9 114 217.4 117.6 216.3C121.1 215.3 125.1 216.8 126.9 220L136.4 237C144.1 250.7 155.6 258.6 167.9 258.6S191.7 250.7 199.4 237L208.9 220C211 216.3 215.1 215.3 218.2 216.3C221.8 217.4 224.1 220.8 223.8 224.6C220.7 266.7 191.8 296 168 296zM248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM304 140C304 159.2 275.2 181.5 232.5 184C228.7 184.4 225.1 181.6 224.3 177.8C223.4 174 225.4 170.1 229 168.6L245.9 161.4C258.9 155.9 266.7 147.9 266.7 139.9S258.9 123.9 246 118.4L229 111.2000000000001C223.3 108.8000000000001 223 99.0000000000001 229 96.4L245.9 89.2000000000001C258.9 83.7000000000001 266.7 75.7000000000001 266.7 67.7000000000001S258.9 51.7 246 46.2L229 39.0000000000001C225.4 37.5000000000001 223.4 33.6000000000001 224.3 29.8000000000001C225.1 26.2 228.4 23.6000000000001 232.1 23.6000000000001H232.6C275.4000000000001 26.1000000000001 304.1 48.4000000000001 304.1 67.6000000000001C304.1 80.6000000000001 290.7000000000001 94.9000000000001 268.9000000000001 103.6000000000001C290.6 112.7 304 127 304 140zM328 296C304.2 296 275.3 266.7 272 224.6C271.7 220.9 274 217.4 277.6 216.3C281.1 215.3 285.1 216.8 286.9000000000001 220L296.4000000000001 237C304.1 250.7 315.6 258.6 327.9000000000001 258.6S351.7000000000001 250.7 359.4000000000001 237L368.9000000000001 220C371.0000000000001 216.3 375.1 215.3 378.2000000000001 216.3C381.8000000000001 217.4 384.1 220.8 383.8000000000001 224.6C380.7000000000001 266.7 351.8000000000001 296 328.0000000000001 296z" />
-    <glyph glyph-name="kiss-wink-heart"
-      unicode="&#xF598;"
-      horiz-adv-x="504" d=" M304 139.5C304 158.7 275.2 181 232.5 183.5C228.7 183.9 225.1 181.1 224.3 177.3C223.4 173.5 225.4 169.6 229 168.1L245.9 160.9C258.9 155.4 266.7 147.4 266.7 139.4S258.9 123.4 246 117.9L229 110.7000000000001C223.3 108.3000000000001 223 98.5000000000001 229 95.9L245.9 88.7000000000001C258.9 83.2000000000001 266.7 75.2000000000001 266.7 67.2000000000001S258.9 51.2 246 45.7L229 38.5000000000001C225.4 37.0000000000001 223.4 33.1000000000001 224.3 29.3000000000001C225.1 25.7 228.4 23.1000000000001 232.1 23.1000000000001H232.6C275.4000000000001 25.6000000000001 304.1 47.9000000000001 304.1 67.1000000000001C304.1 80.1000000000001 290.7000000000001 94.4000000000001 268.9000000000001 103.1000000000001C290.6 112.2000000000001 304.0000000000001 126.5000000000001 304.0000000000001 139.5000000000001zM374.5 223L384 214.5C387.8 211.2 393.3 210.5 397.7 212.9C402.1 215.3 404.6 220.3 403.8 225.3C399.8 250.5 369.6 267.4 344 267.4S288.1 250.5 284.2 225.3C283.4 220.3 285.9 215.3 290.3 212.9C296.1 209.8 301.5 212.2 304 214.5L313.5 223C328.3 236.2 359.7 236.2 374.5 223zM136 239.5C136 221.8 150.3 207.5 168 207.5S200 221.8 200 239.5S185.7 271.5 168 271.5S136 257.2 136 239.5zM501.1 45.5C493.1 66.3 469.6 77 448 71.4L439.6 69.2L437.3 77.6C431.4000000000001 98.9999999999999 410.3 114.1 388.3 110.6C363.1 106.6 347.7 81.9999999999999 354.3 57.9999999999999L377.2 -24.6C378.7 -29.9 384.2 -33.1 389.6 -31.7L472.6 -10.2C496.7 -3.9 510.3 21.6 501.1 45.4999999999999zM334 11.7C307.9 -0.8 278.8 -8 248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192C448 169.9 444.3 148.7 437.6 128.8C446.6 122.4 454.6 114.6 460.2 104.9C466.6 104.8 472.8000000000001 103.5000000000001 478.8000000000001 102.0000000000001C489.7 129.9 495.9000000000001 160.2000000000001 495.9000000000001 192.0000000000001C496 329 385 440 248 440S0 329 0 192S111 -56 248 -56C283.4 -56 316.9 -48.5 347.4 -35.1C344.9 -27.8 351.7 -52.3 334 11.7z" />
-    <glyph glyph-name="kiss"
-      unicode="&#xF596;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -24C128.9 -24 32 72.9 32 192S128.9 408 248 408S464 311.1 464 192S367.1 -24 248 -24zM304 140C304 159.2 275.2 181.5 232.5 184C228.7 184.4 225.1 181.6 224.3 177.8C223.4 174 225.4 170.1 229 168.6L245.9 161.4C258.9 155.9 266.7 147.9 266.7 139.9S258.9 123.9 246 118.4L229 111.2000000000001C223.3 108.8000000000001 223 99.0000000000001 229 96.4L245.9 89.2000000000001C258.9 83.7000000000001 266.7 75.7000000000001 266.7 67.7000000000001S258.9 51.7 246 46.2L229 39.0000000000001C225.4 37.5000000000001 223.4 33.6000000000001 224.3 29.8000000000001C225.1 26.2 228.4 23.6000000000001 232.1 23.6000000000001H232.6C275.4000000000001 26.1000000000001 304.1 48.4000000000001 304.1 67.6000000000001C304.1 80.6000000000001 290.7000000000001 94.9000000000001 268.9000000000001 103.6000000000001C290.6 112.7 304 127 304 140zM168 272C150.3 272 136 257.7 136 240S150.3 208 168 208S200 222.3 200 240S185.7 272 168 272zM328 272C310.3 272 296 257.7 296 240S310.3 208 328 208S360 222.3 360 240S345.7 272 328 272z" />
-    <glyph glyph-name="laugh-beam"
-      unicode="&#xF59A;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM389.4 50.6C351.6 12.8 301.4 -8 248 -8S144.4 12.8 106.6 50.6S48 138.6 48 192S68.8 295.6 106.6 333.4S194.6 392 248 392S351.6 371.2 389.4 333.4S448 245.4 448 192S427.2 88.4 389.4 50.6zM328 296C304.2 296 275.3 266.7 272 224.6C271.3 216 282.8 212.7 286.9 220.1L296.4 237.1C304.1 250.8 315.6 258.7 327.9 258.7S351.7 250.8 359.4 237.1L368.9 220.1C373 212.7 384.5 216.1 383.8 224.6C380.7 266.7 351.8 296 328 296zM127 220.1L136.5 237.1C144.2 250.8 155.7 258.7 168 258.7S191.8 250.8 199.5 237.1L209 220.1C213.1 212.7 224.6 216.1 223.9 224.6C220.6 266.7 191.7 296 167.9 296S115.2 266.7 111.9 224.6C111.3 216.1 122.8 212.7 127 220.1zM362.4 160H133.6C125.4 160 119.1 153 120.1 145C127.6 85.8 179 40 241.2 40H254.8C317 40 368.4 85.8 375.9 145C376.9 153 370.6 160 362.4 160z" />
-    <glyph glyph-name="laugh-squint"
-      unicode="&#xF59B;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM389.4 50.6C351.6 12.8 301.4 -8 248 -8S144.4 12.8 106.6 50.6S48 138.6 48 192S68.8 295.6 106.6 333.4S194.6 392 248 392S351.6 371.2 389.4 333.4S448 245.4 448 192S427.2 88.4 389.4 50.6zM343.6 252L377.2000000000001 292.3C385.8000000000001 302.6 373.4000000000001 317.1 361.8000000000001 310.3L281.8000000000001 262.3C274.0000000000001 257.6 274.0000000000001 246.4 281.8000000000001 241.7L361.8000000000001 193.7C373.3000000000001 186.9 385.8000000000001 201.3 377.2000000000001 211.7L343.6 252zM134.2 193.7L214.2 241.7C222 246.4 222 257.6 214.2 262.3L134.2 310.3C122.6 317.2 110.2 302.6 118.8 292.3L152.4 252L118.8 211.7C110.1 201.3 122.6 186.9 134.2 193.7zM362.4 160H133.6C125.4 160 119.1 153 120.1 145C127.6 85.8 179 40 241.2 40H254.8C317 40 368.4 85.8 375.9 145C376.9 153 370.6 160 362.4 160z" />
-    <glyph glyph-name="laugh-wink"
-      unicode="&#xF59C;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM389.4 50.6C351.6 12.8 301.4 -8 248 -8S144.4 12.8 106.6 50.6C68.8 88.4 48 138.6 48 192S68.8 295.6 106.6 333.4C144.4 371.2 194.6 392 248 392S351.6 371.2 389.4 333.4C427.2 295.6 448 245.4 448 192S427.2 88.4 389.4 50.6zM328 284C302.3 284 272.1 267.1 268.1 241.9C266.4000000000001 230.7 279.6 223.7 287.9000000000001 231.1L297.4000000000001 239.6C312.2000000000001 252.8 343.6 252.8 358.4000000000001 239.6L367.9000000000001 231.1C376.4000000000001 223.7 389.5000000000001 230.8 387.7000000000001 241.9C383.9000000000001 267.1 353.7000000000001 284 328.0000000000001 284zM168 224C185.7 224 200 238.3 200 256S185.7 288 168 288S136 273.7 136 256S150.3 224 168 224zM362.4 160H133.6C125.4 160 119.1 153 120.1 145C127.6 85.8 179 40 241.2 40H254.8C317 40 368.4 85.8 375.9 145C376.9 153 370.6 160 362.4 160z" />
-    <glyph glyph-name="laugh"
-      unicode="&#xF599;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM389.4 50.6C351.6 12.8 301.4 -8 248 -8S144.4 12.8 106.6 50.6S48 138.6 48 192S68.8 295.6 106.6 333.4S194.6 392 248 392S351.6 371.2 389.4 333.4S448 245.4 448 192S427.2 88.4 389.4 50.6zM328 224C345.7 224 360 238.3 360 256S345.7 288 328 288S296 273.7 296 256S310.3 224 328 224zM168 224C185.7 224 200 238.3 200 256S185.7 288 168 288S136 273.7 136 256S150.3 224 168 224zM362.4 160H133.6C125.4 160 119.1 153 120.1 145C127.6 85.8 179 40 241.2 40H254.8C317 40 368.4 85.8 375.9 145C376.9 153 370.6 160 362.4 160z" />
-    <glyph glyph-name="lemon"
-      unicode="&#xF094;"
-      horiz-adv-x="512" d=" M484.112 420.111C455.989 448.233 416.108 456.057 387.0590000000001 439.135C347.604 416.152 223.504 489.111 91.196 356.803C-41.277 224.328 31.923 100.528 8.866 60.942C-8.056 31.891 -0.234 -7.99 27.888 -36.112C56.023 -64.247 95.899 -72.0499999999999 124.945 -55.133C164.368 -32.163 288.502 -105.102 420.803 27.196C553.277 159.673 480.076 283.473 503.134 323.057C520.056 352.1070000000001 512.234 391.988 484.112 420.111zM461.707 347.217C422.907 280.608 507.307 181.582 386.862 61.137C266.422 -59.306 167.387 25.089 100.786 -13.706C78.1069999999999 -26.913 36.751 13.535 50.2929999999999 36.782C89.0929999999999 103.391 4.6929999999999 202.417 125.138 322.862C245.573 443.298 344.616 358.914 411.219 397.708C433.949 410.948 475.224 370.42 461.707 347.217zM291.846 338.481C293.216 327.521 285.442 317.524 274.481 316.154C219.635 309.299 138.702 228.367 131.846 173.519C130.473 162.53 120.447 154.785 109.52 156.154C98.559 157.524 90.785 167.52 92.155 178.48C101.317 251.766 196.322 346.6950000000001 269.5200000000001 355.8450000000001C280.473 357.213 290.4760000000001 349.442 291.8460000000001 338.481z" />
-    <glyph glyph-name="life-ring"
-      unicode="&#xF1CD;"
-      horiz-adv-x="512" d=" M256 -56C392.967 -56 504 55.033 504 192S392.967 440 256 440S8 328.967 8 192S119.033 -56 256 -56zM152.602 20.72L206.013 74.131C237.819 60.625 274.141 60.609 305.987 74.131L359.398 20.72C296.1810000000001 -17.599 215.819 -17.599 152.602 20.72zM336 192C336 147.888 300.112 112 256 112S176 147.888 176 192S211.888 272 256 272S336 236.112 336 192zM427.28 88.602L373.869 142.013C387.374 173.819 387.391 210.141 373.869 241.987L427.28 295.398C465.599 232.181 465.599 151.819 427.28 88.602zM359.397 363.28L305.986 309.8690000000001C274.18 323.374 237.858 323.391 206.013 309.8690000000001L152.602 363.28C215.819 401.599 296.1810000000001 401.599 359.397 363.28zM84.72 295.398L138.131 241.987C124.625 210.181 124.609 173.859 138.131 142.013L84.72 88.602C46.401 151.819 46.401 232.181 84.72 295.398z" />
-    <glyph glyph-name="lightbulb"
-      unicode="&#xF0EB;"
-      horiz-adv-x="384" d=" M272 20V-8C272 -18.449 265.32 -27.334 256 -30.629V-40C256 -53.255 245.255 -64 232 -64H152C138.745 -64 128 -53.255 128 -40V-30.629C118.68 -27.334 112 -18.449 112 -8V20C112 26.627 117.373 32 124 32H260C266.627 32 272 26.627 272 20zM128 272C128 307.29 156.71 336 192 336C200.837 336 208 343.164 208 352S200.837 368 192 368C139.065 368 96 324.935 96 272C96 263.164 103.164 256 112 256S128 263.164 128 272zM192 400C262.734 400 320 342.746 320 272C320 194.398 282.617 211.523 239.02 112H144.98C101.318 211.67 64 194.131 64 272C64 342.735 121.254 400 192 400M192 448C94.805 448 16 369.197 16 272C16 170.269 67.697 180.459 106.516 79.326C110.066 70.077 118.986 64 128.892 64H255.107C265.013 64 273.933 70.078 277.483 79.326C316.303 180.459 368 170.269 368 272C368 369.197 289.195 448 192 448z" />
-    <glyph glyph-name="list-alt"
-      unicode="&#xF022;"
-      horiz-adv-x="512" d=" M464 416H48C21.49 416 0 394.51 0 368V16C0 -10.51 21.49 -32 48 -32H464C490.51 -32 512 -10.51 512 16V368C512 394.51 490.51 416 464 416zM458 16H54A6 6 0 0 0 48 22V362A6 6 0 0 0 54 368H458A6 6 0 0 0 464 362V22A6 6 0 0 0 458 16zM416 108V84C416 77.373 410.627 72 404 72H204C197.373 72 192 77.373 192 84V108C192 114.627 197.373 120 204 120H404C410.627 120 416 114.627 416 108zM416 204V180C416 173.373 410.627 168 404 168H204C197.373 168 192 173.373 192 180V204C192 210.627 197.373 216 204 216H404C410.627 216 416 210.627 416 204zM416 300V276C416 269.373 410.627 264 404 264H204C197.373 264 192 269.373 192 276V300C192 306.627 197.373 312 204 312H404C410.627 312 416 306.627 416 300zM164 288C164 268.118 147.882 252 128 252S92 268.118 92 288S108.118 324 128 324S164 307.882 164 288zM164 192C164 172.118 147.882 156 128 156S92 172.118 92 192S108.118 228 128 228S164 211.882 164 192zM164 96C164 76.118 147.882 60 128 60S92 76.118 92 96S108.118 132 128 132S164 115.882 164 96z" />
-    <glyph glyph-name="map"
-      unicode="&#xF279;"
-      horiz-adv-x="576" d=" M560.02 416C558.06 416 556.04 415.63 554.06 414.8400000000001L384.01 352H384L212 412.7200000000001A64.252 64.252 0 0 1 191.76 416C185.07 416 178.39 414.95 171.95 412.86L20.12 360.05A32.006 32.006 0 0 1 0 330.3400000000001V-15.98C0 -25.17 7.53 -32 15.99 -32C17.95 -32 19.96 -31.63 21.95 -30.84L192 32L364 -28.71A63.97999999999999 63.97999999999999 0 0 1 404.05 -28.86L555.88 23.95A31.996 31.996 0 0 1 576 53.66V399.98C576 409.17 568.47 416 560.02 416zM224 357.58L352 312.39V26.42L224 71.61V357.58zM48 29.95V318.93L176 363.4600000000001V77.26L175.36 77.03L48 29.95zM528 65.08L400 20.55V306.74L400.64 306.98L528 354.05V65.08z" />
-    <glyph glyph-name="meh-blank"
-      unicode="&#xF5A4;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM168 272C150.3 272 136 257.7 136 240S150.3 208 168 208S200 222.3 200 240S185.7 272 168 272zM328 272C310.3 272 296 257.7 296 240S310.3 208 328 208S360 222.3 360 240S345.7 272 328 272z" />
-    <glyph glyph-name="meh-rolling-eyes"
-      unicode="&#xF5A5;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM336 296C296.2 296 264 263.8 264 224S296.2 152 336 152S408 184.2 408 224S375.8 296 336 296zM336 184C313.9 184 296 201.9 296 224C296 237.6 303.3 249.1 313.7 256.3C312.7 253.7 312 251 312 248C312 234.7 322.7 224 336 224S360 234.7 360 248C360 250.9 359.3 253.7 358.3 256.3C368.7 249.1 376 237.6 376 224C376 201.9 358.1 184 336 184zM232 224C232 263.8 199.8 296 160 296S88 263.8 88 224S120.2 152 160 152S232 184.2 232 224zM120 224C120 237.6 127.3 249.1 137.7 256.3C136.7 253.7 136 251 136 248C136 234.7 146.7 224 160 224S184 234.7 184 248C184 250.9 183.3 253.7 182.3 256.3C192.7 249.1 200 237.6 200 224C200 201.9 182.1 184 160 184S120 201.9 120 224zM312 96H184C170.8 96 160 85.2 160 72S170.8 48 184 48H312C325.2 48 336 58.8 336 72S325.2 96 312 96z" />
-    <glyph glyph-name="meh"
-      unicode="&#xF11A;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM168 208C185.7 208 200 222.3 200 240S185.7 272 168 272S136 257.7 136 240S150.3 208 168 208zM328 272C310.3 272 296 257.7 296 240S310.3 208 328 208S360 222.3 360 240S345.7 272 328 272zM336 128H160C146.8 128 136 117.2 136 104S146.8 80 160 80H336C349.2 80 360 90.8 360 104S349.2 128 336 128z" />
-    <glyph glyph-name="minus-square"
-      unicode="&#xF146;"
-      horiz-adv-x="448" d=" M108 164C101.4 164 96 169.4 96 176V208C96 214.6 101.4 220 108 220H340C346.6 220 352 214.6 352 208V176C352 169.4 346.6 164 340 164H108zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM400 22V362C400 365.3 397.3 368 394 368H54C50.7 368 48 365.3 48 362V22C48 18.7 50.7 16 54 16H394C397.3 16 400 18.7 400 22z" />
-    <glyph glyph-name="money-bill-alt"
-      unicode="&#xF3D1;"
-      horiz-adv-x="640" d=" M320 304C266.98 304 224 253.86 224 192C224 130.15 266.98 80 320 80C373 80 416 130.13 416 192C416 253.86 373.02 304 320 304zM360 136C360 131.58 356.42 128 352 128H288C283.58 128 280 131.58 280 136V152C280 156.42 283.58 160 288 160H304V215.44L303.53 215.13A7.991999999999999 7.991999999999999 0 0 0 292.44 217.35L283.56 230.66A7.991999999999999 7.991999999999999 0 0 0 285.7800000000001 241.75L301.11 251.97A23.99 23.99 0 0 0 314.42 256H328C332.42 256 336 252.42 336 248V160H352C356.42 160 360 156.42 360 152V136zM608 384H32C14.33 384 0 369.67 0 352V32C0 14.33 14.33 0 32 0H608C625.67 0 640 14.33 640 32V352C640 369.67 625.67 384 608 384zM592 112C556.65 112 528 83.35 528 48H112C112 83.35 83.35 112 48 112V272C83.35 272 112 300.65 112 336H528C528 300.65 556.65 272 592 272V112z" />
-    <glyph glyph-name="moon"
-      unicode="&#xF186;"
-      horiz-adv-x="512" d=" M279.135 -64C357.891 -64 430.117 -28.196 477.979 30.775C506.249 65.606 475.421 116.497 431.73 108.176C349.382 92.493 273.458 155.444 273.458 238.968C273.458 287.392 299.518 331.26 340.892 354.804C379.637 376.854 369.891 435.592 325.87 443.723A257.936 257.936 0 0 1 279.135 448C137.775 448 23.135 333.425 23.135 192C23.135 50.64 137.711 -64 279.135 -64zM279.135 400C292.12 400 304.824 398.799 317.151 396.522C262.391 365.359 225.4580000000001 306.48 225.4580000000001 238.968C225.4580000000001 125.12 329.0990000000001 39.768 440.7100000000001 61.024C402.574 14.036 344.366 -16 279.135 -16C164.26 -16 71.135 77.125 71.135 192S164.26 400 279.135 400z" />
-    <glyph glyph-name="newspaper"
-      unicode="&#xF1EA;"
-      horiz-adv-x="576" d=" M552 384H112C91.142 384 73.357 370.623 66.752 352H24C10.745 352 0 341.255 0 328V56C0 25.072 25.072 0 56 0H552C565.255 0 576 10.745 576 24V360C576 373.255 565.255 384 552 384zM48 56V304H64V56C64 51.589 60.411 48 56 48S48 51.589 48 56zM528 48H111.422C111.796 50.614 112 53.283 112 56V336H528V48zM172 168H308C314.627 168 320 173.373 320 180V276C320 282.627 314.627 288 308 288H172C165.373 288 160 282.627 160 276V180C160 173.373 165.373 168 172 168zM200 248H280V208H200V248zM160 108V132C160 138.627 165.373 144 172 144H308C314.627 144 320 138.627 320 132V108C320 101.373 314.627 96 308 96H172C165.373 96 160 101.373 160 108zM352 108V132C352 138.627 357.373 144 364 144H468C474.627 144 480 138.627 480 132V108C480 101.373 474.627 96 468 96H364C357.373 96 352 101.373 352 108zM352 252V276C352 282.627 357.373 288 364 288H468C474.627 288 480 282.627 480 276V252C480 245.373 474.627 240 468 240H364C357.373 240 352 245.373 352 252zM352 180V204C352 210.627 357.373 216 364 216H468C474.627 216 480 210.627 480 204V180C480 173.373 474.627 168 468 168H364C357.373 168 352 173.373 352 180z" />
-    <glyph glyph-name="object-group"
-      unicode="&#xF247;"
-      horiz-adv-x="512" d=" M500 320C506.627 320 512 325.373 512 332V404C512 410.627 506.627 416 500 416H428C421.373 416 416 410.627 416 404V392H96V404C96 410.627 90.627 416 84 416H12C5.373 416 0 410.627 0 404V332C0 325.373 5.373 320 12 320H24V64H12C5.373 64 0 58.627 0 52V-20C0 -26.627 5.373 -32 12 -32H84C90.627 -32 96 -26.627 96 -20V-8H416V-20C416 -26.627 421.373 -32 428 -32H500C506.627 -32 512 -26.627 512 -20V52C512 58.627 506.627 64 500 64H488V320H500zM448 384H480V352H448V384zM32 384H64V352H32V384zM64 0H32V32H64V0zM480 0H448V32H480V0zM440 64H428C421.373 64 416 58.627 416 52V40H96V52C96 58.627 90.627 64 84 64H72V320H84C90.627 320 96 325.373 96 332V344H416V332C416 325.373 421.373 320 428 320H440V64zM404 256H320V308C320 314.628 314.627 320 308 320H108C101.373 320 96 314.628 96 308V140C96 133.372 101.373 128 108 128H192V76C192 69.372 197.373 64 204 64H404C410.627 64 416 69.372 416 76V244C416 250.628 410.627 256 404 256zM136 280H280V168H136V280zM376 104H232V128H308C314.627 128 320 133.372 320 140V216H376V104z" />
-    <glyph glyph-name="object-ungroup"
-      unicode="&#xF248;"
-      horiz-adv-x="576" d=" M564 224C570.627 224 576 229.373 576 236V308C576 314.627 570.627 320 564 320H492C485.373 320 480 314.627 480 308V296H392V320H404C410.627 320 416 325.373 416 332V404C416 410.627 410.627 416 404 416H332C325.373 416 320 410.627 320 404V392H96V404C96 410.627 90.627 416 84 416H12C5.373 416 0 410.627 0 404V332C0 325.373 5.373 320 12 320H24V160H12C5.373 160 0 154.627 0 148V76C0 69.373 5.373 64 12 64H84C90.627 64 96 69.373 96 76V88H184V64H172C165.373 64 160 58.627 160 52V-20C160 -26.627 165.373 -32 172 -32H244C250.627 -32 256 -26.627 256 -20V-8H480V-20C480 -26.627 485.373 -32 492 -32H564C570.627 -32 576 -26.627 576 -20V52C576 58.627 570.627 64 564 64H552V224H564zM352 384H384V352H352V384zM352 128H384V96H352V128zM64 96H32V128H64V96zM64 352H32V384H64V352zM96 136V148C96 154.627 90.627 160 84 160H72V320H84C90.627 320 96 325.373 96 332V344H320V332C320 325.373 325.373 320 332 320H344V160H332C325.373 160 320 154.627 320 148V136H96zM224 0H192V32H224V0zM504 64H492C485.373 64 480 58.627 480 52V40H256V52C256 58.627 250.627 64 244 64H232V88H320V76C320 69.373 325.373 64 332 64H404C410.627 64 416 69.373 416 76V148C416 154.627 410.627 160 404 160H392V248H480V236C480 229.373 485.373 224 492 224H504V64zM544 0H512V32H544V0zM544 256H512V288H544V256z" />
-    <glyph glyph-name="paper-plane"
-      unicode="&#xF1D8;"
-      horiz-adv-x="512" d=" M440 441.5L24 201.6C-10.4 181.7 -7.1 130.8 29.7 115.7L144 68.4V-16C144 -62.4 203.2 -81.5 230.6 -44.6L274.4 14.5L386.3 -31.7C392.2 -34.1 398.4 -35.3 404.6 -35.3C412.8 -35.3 420.9 -33.2 428.2 -29.1C441 -21.9 449.8 -9.1 452.1 5.4L511.4999999999999 392.6C517.5999999999999 432.7 474.6 461.4 440 441.5zM192 -16V48.6L228.6 33.5L192 -16zM404.6 12.7L250.8 76.2L391 278.5C401.7 294 381.5 312 367.3 299.7L155.8 115.4L48 160L464 400L404.6 12.7z" />
-    <glyph glyph-name="pause-circle"
-      unicode="&#xF28B;"
-      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM256 -8C145.5 -8 56 81.5 56 192S145.5 392 256 392S456 302.5 456 192S366.5 -8 256 -8zM352 272V112C352 103.2 344.8 96 336 96H288C279.2 96 272 103.2 272 112V272C272 280.8 279.2 288 288 288H336C344.8 288 352 280.8 352 272zM240 272V112C240 103.2 232.8 96 224 96H176C167.2 96 160 103.2 160 112V272C160 280.8 167.2 288 176 288H224C232.8 288 240 280.8 240 272z" />
-    <glyph glyph-name="play-circle"
-      unicode="&#xF144;"
-      horiz-adv-x="512" d=" M371.7 210L195.7 317C179.9 325.8 160 314.5 160 296V88C160 69.6 179.8 58.2 195.7 67L371.7 168C388.1 177.1 388.1 200.8 371.7 210zM504 192C504 329 393 440 256 440S8 329 8 192S119 -56 256 -56S504 55 504 192zM56 192C56 302.5 145.5 392 256 392S456 302.5 456 192S366.5 -8 256 -8S56 81.5 56 192z" />
-    <glyph glyph-name="plus-square"
-      unicode="&#xF0FE;"
-      horiz-adv-x="448" d=" M352 208V176C352 169.4 346.6 164 340 164H252V76C252 69.4 246.6 64 240 64H208C201.4 64 196 69.4 196 76V164H108C101.4 164 96 169.4 96 176V208C96 214.6 101.4 220 108 220H196V308C196 314.6 201.4 320 208 320H240C246.6 320 252 314.6 252 308V220H340C346.6 220 352 214.6 352 208zM448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM400 22V362C400 365.3 397.3 368 394 368H54C50.7 368 48 365.3 48 362V22C48 18.7 50.7 16 54 16H394C397.3 16 400 18.7 400 22z" />
-    <glyph glyph-name="question-circle"
-      unicode="&#xF059;"
-      horiz-adv-x="512" d=" M256 440C119.043 440 8 328.9170000000001 8 192C8 55.003 119.043 -56 256 -56S504 55.003 504 192C504 328.9170000000001 392.957 440 256 440zM256 -8C145.468 -8 56 81.431 56 192C56 302.495 145.472 392 256 392C366.491 392 456 302.529 456 192C456 81.47 366.569 -8 256 -8zM363.2440000000001 247.2C363.2440000000001 180.148 290.8230000000001 179.116 290.8230000000001 154.337V148C290.8230000000001 141.373 285.4500000000001 136 278.8230000000001 136H233.1760000000001C226.5490000000001 136 221.1760000000001 141.373 221.1760000000001 148V156.659C221.1760000000001 192.404 248.2760000000001 206.693 268.7550000000001 218.175C286.3160000000001 228.02 297.0790000000001 234.716 297.0790000000001 247.754C297.0790000000001 265 275.0800000000001 276.447 257.2950000000001 276.447C234.1060000000001 276.447 223.4010000000001 265.4700000000001 208.3530000000001 246.478C204.2960000000001 241.358 196.8930000000001 240.407 191.6870000000001 244.354L163.8630000000001 265.452C158.7560000000001 269.324 157.6120000000001 276.5180000000001 161.2190000000001 281.815C184.846 316.509 214.94 336 261.794 336C310.865 336 363.244 297.6960000000001 363.244 247.2zM298 80C298 56.841 279.159 38 256 38S214 56.841 214 80S232.841 122 256 122S298 103.159 298 80z" />
-    <glyph glyph-name="registered"
-      unicode="&#xF25D;"
-      horiz-adv-x="512" d=" M256 440C119.033 440 8 328.967 8 192S119.033 -56 256 -56S504 55.033 504 192S392.967 440 256 440zM256 -8C145.468 -8 56 81.451 56 192C56 302.531 145.451 392 256 392C366.532 392 456 302.549 456 192C456 81.468 366.549 -8 256 -8zM366.442 73.791C313.396 170.075 316.192 165.259 313.171 169.876C337.438 183.755 352.653 211.439 352.653 243.052C352.653 295.555 322.406 328.304 251.1550000000001 328.304H172.488C165.8710000000001 328.304 160.488 322.921 160.488 316.304V68C160.488 61.383 165.8710000000001 56 172.488 56H211.0560000000001C217.673 56 223.0560000000001 61.383 223.0560000000001 68V151.663H255.0140000000001L302.5290000000001 62.36A11.98 11.98 0 0 1 313.1220000000001 56H355.9320000000001C365.0720000000001 56 370.8460000000001 65.799 366.4420000000001 73.791zM256.933 208.094H223.058V272.234H250.435C282.852 272.234 289.3640000000001 260.101 289.3640000000001 240.525C289.3630000000001 219.612 277.846 208.094 256.9330000000001 208.094z" />
-    <glyph glyph-name="sad-cry"
-      unicode="&#xF5B3;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM392 53.6V168C392 181.2 381.2 192 368 192S344 181.2 344 168V16.6C315.5 1 282.8 -8 248 -8S180.5 1 152 16.6V168C152 181.2 141.2 192 128 192S104 181.2 104 168V53.6C69.4 89.6 48 138.3 48 192C48 302.3 137.7 392 248 392S448 302.3 448 192C448 138.3 426.6 89.5 392 53.6zM205.8 213.5C210.2 215.9 212.7 220.9 211.9 225.9C207.9 251.1 177.7 268 152.1 268S96.2 251.1 92.3 225.9C91.5 220.9 94 215.9 98.4 213.5C102.8 211.1 108.3 211.7 112.1 215.1L121.6 223.6C136.4 236.8 167.8 236.8 182.6 223.6L192.1 215.1C194.6 212.8 200 210.3 205.8 213.5zM344 268C318.3 268 288.1 251.1 284.2 225.9C283.4 220.9 285.9 215.9 290.3 213.5C294.8 211.1 300.2 211.7 304 215.1L313.5 223.6C328.3 236.8 359.7 236.8 374.5 223.6L384 215.1C386.5 212.9 392 210.4 397.7 213.5C402.1 215.9 404.6 220.9 403.8 225.9C399.9000000000001 251.1 369.7 268 344 268zM248 176C217.1 176 192 147.3 192 112S217.1 48 248 48S304 76.7 304 112S278.9 176 248 176z" />
-    <glyph glyph-name="sad-tear"
-      unicode="&#xF5B4;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM256 144C242.8 144 232 133.2 232 120S242.8 96 256 96C279.8 96 302.3 85.5 317.6 67.2C325.7000000000001 57.4 340.8 55.3 351.4000000000001 64.1C361.6 72.6 363.0000000000001 87.7 354.5000000000001 97.9C330 127.2 294.1 144 256 144zM168 208C185.7 208 200 222.3 200 240S185.7 272 168 272S136 257.7 136 240S150.3 208 168 208zM328 272C310.3 272 296 257.7 296 240S310.3 208 328 208S360 222.3 360 240S345.7 272 328 272zM162.4 173.2C151 157.9 126 122.6 126 105.1C126 82.4 144.8 64 168 64S210 82.4 210 105.1C210 122.6 185 157.9 173.6 173.2000000000001C170.8 176.9 165.2 176.9 162.4 173.2000000000001z" />
-    <glyph glyph-name="save"
-      unicode="&#xF0C7;"
-      horiz-adv-x="448" d=" M433.941 318.059L350.059 401.9410000000001A48 48 0 0 1 316.118 416H48C21.49 416 0 394.51 0 368V16C0 -10.51 21.49 -32 48 -32H400C426.51 -32 448 -10.51 448 16V284.118A48 48 0 0 1 433.941 318.059zM272 368V288H144V368H272zM394 16H54A6 6 0 0 0 48 22V362A6 6 0 0 0 54 368H96V264C96 250.745 106.745 240 120 240H296C309.255 240 320 250.745 320 264V364.118L398.243 285.875A6 6 0 0 0 400 281.632V22A6 6 0 0 0 394 16zM224 216C175.477 216 136 176.523 136 128S175.477 40 224 40S312 79.477 312 128S272.523 216 224 216zM224 88C201.944 88 184 105.944 184 128S201.944 168 224 168S264 150.056 264 128S246.056 88 224 88z" />
-    <glyph glyph-name="share-square"
-      unicode="&#xF14D;"
-      horiz-adv-x="576" d=" M561.938 289.94L417.94 433.908C387.926 463.922 336 442.903 336 399.968V342.77C293.55 340.89 251.97 336.2200000000001 215.24 324.7800000000001C180.07 313.8300000000001 152.17 297.2000000000001 132.33 275.36C108.22 248.8 96 215.4 96 176.06C96 114.363 129.178 63.605 180.87 31.3C218.416 7.792 266.118 43.951 251.89 87.04C236.375 134.159 234.734 157.963 336 165.8V112C336 69.007 387.968 48.087 417.94 78.06L561.938 222.06C580.688 240.8 580.688 271.2 561.938 289.94zM384 112V215.84C255.309 213.918 166.492 192.65 206.31 72C176.79 90.45 144 123.92 144 176.06C144 285.394 273.14 295.007 384 295.91V400L528 256L384 112zM408.74 27.507A82.658 82.658 0 0 1 429.714 36.81C437.69 41.762 448 35.984 448 26.596V-16C448 -42.51 426.51 -64 400 -64H48C21.49 -64 0 -42.51 0 -16V336C0 362.51 21.49 384 48 384H180C186.627 384 192 378.627 192 372V367.514C192 362.597 189.013 358.145 184.431 356.362C170.729 351.031 158.035 344.825 146.381 337.777A12.138 12.138 0 0 0 140.101 336H54A6 6 0 0 1 48 330V-10A6 6 0 0 1 54 -16H394A6 6 0 0 1 400 -10V15.966C400 21.336 403.579 26.025 408.74 27.507z" />
-    <glyph glyph-name="smile-beam"
-      unicode="&#xF5B8;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM332 135.4C311.2 110.4 280.5 96 248 96S184.8 110.3 164 135.4C155.5 145.6 140.4 146.9 130.2 138.5C120 130 118.7 114.9 127.1 104.7C157.1 68.7 201.2 48.1 248 48.1S338.9 68.7 368.9 104.7C377.4 114.9 376 130 365.8 138.5C355.6 146.9 340.5 145.6 332 135.4zM136.5 237C144.2 250.7 155.7 258.6 168 258.6S191.8 250.7 199.5 237L209 220C211.1 216.3 215.2 215.3 218.3 216.3C221.9 217.4 224.3 220.8 224 224.6C220.7 266.7000000000001 191.8 296 168 296S115.3 266.7000000000001 112 224.6C111.7 220.9 114.1 217.4 117.7 216.3C121.1 215.2 125.1 216.8 127 220L136.5 237zM328 296C304.2 296 275.3 266.7 272 224.6C271.7 220.9 274.1 217.4 277.7 216.3C281.2 215.2 285.1 216.8 287 220L296.5 237C304.2 250.7 315.7 258.6 328 258.6S351.8 250.7 359.5 237L369 220C371.1 216.3 375.2 215.3 378.3 216.3C381.9000000000001 217.4 384.3 220.8 384 224.6C380.7 266.7 351.8 296 328 296z" />
-    <glyph glyph-name="smile-wink"
-      unicode="&#xF4DA;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM365.8 138.4C355.6 146.9 340.5 145.5 332 135.3C311.2 110.3 280.5 95.9 248 95.9S184.8 110.2 164 135.3C155.5 145.5 140.3 146.8 130.2 138.4C120 129.9 118.7 114.8 127.1 104.6C157.1 68.6 201.2 47.9999999999999 248 47.9999999999999S338.9 68.6 368.9 104.6C377.4 114.8 376 129.9 365.8 138.4zM168 208C185.7 208 200 222.3 200 240S185.7 272 168 272S136 257.7 136 240S150.3 208 168 208zM328 268C302.3 268 272.1 251.1 268.1 225.9C266.4000000000001 214.7 279.6 207.7 287.9000000000001 215.1L297.4000000000001 223.6C312.2000000000001 236.8 343.6 236.8 358.4000000000001 223.6L367.9000000000001 215.1C376.4000000000001 207.7 389.5000000000001 214.8 387.7000000000001 225.9C383.9000000000001 251.1 353.7000000000001 268 328.0000000000001 268z" />
-    <glyph glyph-name="smile"
-      unicode="&#xF118;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM168 208C185.7 208 200 222.3 200 240S185.7 272 168 272S136 257.7 136 240S150.3 208 168 208zM328 208C345.7 208 360 222.3 360 240S345.7 272 328 272S296 257.7 296 240S310.3 208 328 208zM332 135.4C311.2 110.4 280.5 96 248 96S184.8 110.3 164 135.4C155.5 145.6 140.3 146.9 130.2 138.5C120 130 118.7 114.9 127.1 104.7C157.1 68.7 201.2 48.1 248 48.1S338.9 68.7 368.9 104.7C377.4 114.9 376 130 365.8 138.5C355.7 146.9 340.5 145.6 332 135.4z" />
-    <glyph glyph-name="snowflake"
-      unicode="&#xF2DC;"
-      horiz-adv-x="448" d=" M438.237 92.073L371.663 130.613L431.111 140.94C436.957 142.315 441.72 146.123 444.569 151.07C447.0490000000001 155.377 448.075 160.548 447.093 165.721C444.983 176.836 434.4070000000001 183.76 423.4720000000001 181.188L338.0490000000001 150.073L255.914 192L338.05 233.926L423.473 202.811C434.409 200.239 444.985 207.163 447.094 218.278C449.205 229.393 442.048 240.487 431.113 243.059L371.665 253.386L438.238 291.926C447.778 297.449 450.853 310.018 445.105 320C439.357 329.982 426.965 333.596 417.425 328.074L350.851 289.534L371.656 346.3210000000001C374.902 357.103 368.898 368.863 358.243 372.589C347.589 376.314 336.3209999999999 370.592 333.075 359.81L317.2369999999999 270.075L244.8139999999999 228.149V312L314.3989999999999 370.621C322.0879999999999 378.831 321.3959999999999 391.4770000000001 312.8509999999999 398.866C304.3059999999999 406.257 291.1459999999999 405.589 283.4569999999999 397.38L244.8129999999999 350.92V428C244.8129999999999 439.046 235.4949999999999 448 223.9999999999999 448S203.1869999999999 439.046 203.1869999999999 428V350.92L164.5429999999999 397.38C156.8539999999999 405.5900000000001 143.6939999999999 406.256 135.1489999999999 398.866C126.6049999999999 391.477 125.9129999999999 378.831 133.6019999999999 370.621L203.187 312V228.147L130.764 270.073L114.926 359.809C111.679 370.591 100.411 376.313 89.757 372.588C79.101 368.863 73.098 357.102 76.344 346.32L97.149 289.533L30.576 328.073C21.036 333.596 8.643 329.981 2.896 319.999S0.223 297.448 9.763 291.925L76.337 253.385L16.888 243.057C5.953 240.485 -1.202 229.391 0.907 218.276C3.017 207.162 13.593 200.238 24.529 202.81L109.951 233.925L192.086 192L109.95 150.074L24.527 181.189C13.591 183.761 3.016 176.8370000000001 0.905 165.723C-1.204 154.61 5.951 143.514 16.886 140.942L76.335 130.614L9.761 92.074C0.223 86.551 -2.852 73.982 2.896 64S21.036 50.403 30.576 55.926L97.15 94.466L76.345 37.68C74.61 31.916 75.517 25.875 78.365 20.929C80.845 16.622 84.798 13.145 89.757 11.412C100.412 7.687 111.68 13.409 114.926 24.191L130.764 113.927L203.187 155.853V72L133.602 13.379C125.912 5.169 126.605 -7.476 135.149 -14.866C143.693 -22.254 156.854 -21.589 164.543 -13.379L203.187 33.081V-44C203.187 -55.046 212.505 -64 224 -64S244.813 -55.046 244.813 -44V33.081L283.457 -13.379C287.568 -17.768 293.2389999999999 -19.9999999999999 298.935 -19.9999999999999C303.8949999999999 -19.9999999999999 308.874 -18.3059999999999 312.851 -14.8659999999999C321.396 -7.4759999999999 322.088 5.1690000000001 314.399 13.3790000000001L244.813 72V155.853L317.236 113.927L333.074 24.191C336.32 13.409 347.588 7.687 358.242 11.412C368.8950000000001 15.138 374.901 26.8990000000001 371.654 37.6800000000001L350.849 94.467L417.423 55.927C426.963 50.404 439.356 54.019 445.103 64.001C450.852 73.982 447.778 86.5510000000001 438.237 92.073z" />
-    <glyph glyph-name="square"
-      unicode="&#xF0C8;"
-      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM394 16H54C50.7 16 48 18.7 48 22V362C48 365.3 50.7 368 54 368H394C397.3 368 400 365.3 400 362V22C400 18.7 397.3 16 394 16z" />
-    <glyph glyph-name="star-half"
-      unicode="&#xF089;"
-      horiz-adv-x="576" d=" M288 62.7L163.7 -2.7L187.4 135.6999999999999L86.8 233.7L225.8 253.8999999999999L288 379.8999999999999V448C276.6 448 265.2 442.1 259.3 430.2L194 297.8L47.9 276.6C21.7 272.8 11.2 240.5 30.2 222L135.9 119L110.9 -26.5C106.4 -52.6 133.9 -72.5 157.3 -60.2L288 8.4V62.7z" />
-    <glyph glyph-name="star"
-      unicode="&#xF005;"
-      horiz-adv-x="576" d=" M528.1 276.5L382 297.8L316.7 430.2C305 453.8 271.1 454.1 259.3 430.2L194 297.8L47.9 276.5C21.7 272.7 11.2 240.4 30.2 221.9L135.9 118.9L110.9 -26.6C106.4 -52.9 134.1 -72.6 157.3 -60.3L288 8.4L418.7 -60.3C441.9 -72.5 469.6 -52.9 465.1 -26.6L440.1 118.9L545.8 221.9C564.8 240.4 554.3 272.7 528.0999999999999 276.5zM388.6 135.7L412.3 -2.7L288 62.6L163.7 -2.7L187.4 135.7000000000001L86.8 233.7000000000001L225.8 253.9000000000001L288 379.9000000000001L350.2 253.9000000000001L489.2 233.7000000000001L388.6 135.7000000000001z" />
-    <glyph glyph-name="sticky-note"
-      unicode="&#xF249;"
-      horiz-adv-x="448" d=" M448 99.894V368C448 394.51 426.51 416 400 416H48C21.49 416 0 394.51 0 368V16.012C0 -10.498 21.49 -31.988 48 -31.988H316.118A48 48 0 0 1 350.059 -17.929L433.941 65.953A48 48 0 0 1 448 99.894zM320 19.894V96.012H396.118L320 19.894zM400 368V144.012H296C282.745 144.012 272 133.267 272 120.012V16.012H48V368H400z" />
-    <glyph glyph-name="stop-circle"
-      unicode="&#xF28D;"
-      horiz-adv-x="512" d=" M504 192C504 329 393 440 256 440S8 329 8 192S119 -56 256 -56S504 55 504 192zM56 192C56 302.5 145.5 392 256 392S456 302.5 456 192S366.5 -8 256 -8S56 81.5 56 192zM352 272V112C352 103.2 344.8 96 336 96H176C167.2 96 160 103.2 160 112V272C160 280.8 167.2 288 176 288H336C344.8 288 352 280.8 352 272z" />
-    <glyph glyph-name="sun"
-      unicode="&#xF185;"
-      horiz-adv-x="512" d=" M220.116 -39.936L199.903 9.489A3.9920000000000004 3.9920000000000004 0 0 1 194.095 11.3750000000001L148.691 -16.7289999999999C119.225 -34.9689999999999 82.396 -8.2099999999999 90.637 25.45L103.336 77.3150000000001A3.9930000000000003 3.9930000000000003 0 0 1 99.746 82.256L46.495 86.2070000000001C11.941 88.7690000000001 -2.137 132.0620000000001 24.321 154.4540000000001L65.08 188.95A3.9920000000000004 3.9920000000000004 0 0 1 65.08 195.056L24.32 229.553C-2.13 251.937 11.93 295.235 46.494 297.799L99.745 301.75A3.9930000000000003 3.9930000000000003 0 0 1 103.335 306.691L90.637 358.557C82.398 392.213 119.218 418.977 148.691 400.736L194.094 372.632A3.9930000000000003 3.9930000000000003 0 0 1 199.902 374.519L220.115 423.944C233.231 456.015 278.753 456.025 291.873 423.944L312.085 374.52A3.9939999999999998 3.9939999999999998 0 0 1 317.894 372.6330000000001L363.2970000000001 400.737C392.761 418.973 429.5940000000001 392.224 421.351 358.558L408.652 306.693A3.9950000000000006 3.9950000000000006 0 0 1 412.242 301.752L465.4929999999999 297.8010000000001C500.0459999999999 295.2380000000001 514.126 251.947 487.6679999999999 229.555L446.908 195.058A3.9930000000000003 3.9930000000000003 0 0 1 446.908 188.951L487.6679999999999 154.455C514.179 132.014 499.99 88.766 465.4929999999999 86.208L412.242 82.257A3.9930000000000003 3.9930000000000003 0 0 1 408.653 77.3149999999999L421.351 25.451C429.592 -8.207 392.7679999999999 -34.97 363.2969999999999 -16.729L317.8939999999999 11.3749999999999A3.9939999999999998 3.9939999999999998 0 0 1 312.0849999999999 9.4879999999999L291.8729999999999 -39.936C278.7139999999999 -72.114 233.1979999999999 -71.9290000000001 220.1159999999999 -39.936zM236.93 24.632L255.994 -21.984L275.058 24.631C285.366 49.831 315.836 59.697 338.95 45.39L381.772 18.883L369.796 67.802C363.321 94.246 382.176 120.141 409.283 122.151L459.509 125.877L421.065 158.413C400.283 176.004 400.318 208.034 421.066 225.593L459.508 258.129L409.283 261.856C382.132 263.871 363.333 289.8040000000001 369.795 316.2050000000001L381.773 365.124L338.95 338.617C315.799 324.29 285.347 334.217 275.058 359.377L255.994 405.992L236.93 359.375C226.625 334.177 196.152 324.3090000000001 173.039 338.615L130.216 365.123L142.193 316.2050000000001C148.667 289.759 129.812 263.867 102.705 261.855L52.481 258.129L90.924 225.592C111.706 208.004 111.671 175.973 90.924 158.414L52.48 125.877L102.706 122.151C129.857 120.137 148.656 94.204 142.193 67.802L130.216 18.883L173.039 45.39C196.227 59.7450000000001 226.661 49.742 236.93 24.6320000000001zM256 64C185.42 64 128 121.421 128 192C128 262.58 185.42 320 256 320C326.579 320 384 262.58 384 192C384 121.421 326.579 64 256 64zM256 272C211.888 272 176 236.112 176 192S211.888 112 256 112S336 147.888 336 192S300.112 272 256 272z" />
-    <glyph glyph-name="surprise"
-      unicode="&#xF5C2;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM248 168C212.7 168 184 139.3 184 104S212.7 40 248 40S312 68.7 312 104S283.3 168 248 168zM200 240C200 257.7 185.7 272 168 272S136 257.7 136 240S150.3 208 168 208S200 222.3 200 240zM328 272C310.3 272 296 257.7 296 240S310.3 208 328 208S360 222.3 360 240S345.7 272 328 272z" />
-    <glyph glyph-name="thumbs-down"
-      unicode="&#xF165;"
-      horiz-adv-x="512" d=" M466.27 222.69C470.944 245.337 467.134 267.228 457.28 285.68C460.238 309.548 453.259 334.245 439.94 352.67C438.986 408.577 404.117 448 327 448C320 448 312 447.99 304.78 447.99C201.195 447.99 168.997 408 128 408H117.155C111.515 412.975 104.113 416 96 416H32C14.327 416 0 401.673 0 384V144C0 126.327 14.327 112 32 112H96C107.842 112 118.175 118.438 123.708 128H130.76C149.906 111.047 176.773 67.347 199.52 44.6C213.187 30.9330000000001 209.673 -64 271.28 -64C328.86 -64 366.55 -32.064 366.55 40.73C366.55 59.14 362.62 74.46 357.7 87.27H394.18C442.782 87.27 479.9999999999999 128.835 479.9999999999999 172.85C479.9999999999999 192 475.04 207.84 466.2699999999999 222.69zM64 152C50.745 152 40 162.745 40 176S50.745 200 64 200S88 189.255 88 176S77.255 152 64 152zM394.18 135.27H290.19C290.19 97.45 318.55 79.9 318.55 40.73C318.55 16.98 318.55 -16.0000000000001 271.2800000000001 -16.0000000000001C252.3700000000001 2.91 261.8200000000001 50.18 233.4600000000001 78.54C206.9 105.11 167.28 176 138.92 176H128V362.17C181.611 362.17 228.001 399.99 299.64 399.99H337.46C372.972 399.99 398.28 382.87 390.58 334.0900000000001C405.78 325.93 417.08 297.65 404.52 276.52C426.101 256.136 423.219 225.455 409.73 210.9C419.18 210.9 432.09 191.99 432 173.09C431.91 154.18 415.29 135.2700000000001 394.18 135.2700000000001z" />
-    <glyph glyph-name="thumbs-up"
-      unicode="&#xF164;"
-      horiz-adv-x="512" d=" M466.27 161.31C475.04 176.16 480 192 480 211.15C480 255.165 442.782 296.73 394.18 296.73H357.7C362.62 309.54 366.55 324.86 366.55 343.27C366.55 416.064 328.86 448 271.28 448C209.673 448 213.187 353.067 199.52 339.4C176.773 316.653 149.905 272.953 130.76 256H32C14.327 256 0 241.673 0 224V-16C0 -33.673 14.327 -48 32 -48H96C110.893 -48 123.408 -37.826 126.978 -24.05C171.487 -25.051 202.038 -63.99 304.78 -63.99C312 -63.99 320 -64 327 -64C404.117 -64 438.986 -24.577 439.94 31.33C453.259 49.755 460.239 74.452 457.28 98.32C467.134 116.772 470.944 138.663 466.27 161.31zM404.52 107.48C417.08 86.35 405.78 58.0700000000001 390.58 49.91C398.28 1.13 372.972 -15.99 337.46 -15.99H299.64C228.001 -15.99 181.611 21.83 128 21.83V208H138.92C167.28 208 206.9 278.89 233.46 305.46C261.82 333.82 252.37 381.09 271.28 400C318.55 400 318.55 367.02 318.55 343.27C318.55 304.1 290.19 286.55 290.19 248.73H394.18C415.29 248.73 431.91 229.82 432 210.91C432.0899999999999 192.01 419.18 173.1 409.73 173.1C423.219 158.545 426.101 127.864 404.52 107.48zM88 16C88 2.745 77.255 -8 64 -8S40 2.745 40 16S50.745 40 64 40S88 29.255 88 16z" />
-    <glyph glyph-name="times-circle"
-      unicode="&#xF057;"
-      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM256 -8C145.5 -8 56 81.5 56 192S145.5 392 256 392S456 302.5 456 192S366.5 -8 256 -8zM357.8 254.2L295.6 192L357.8 129.8C362.5 125.1 362.5 117.5 357.8 112.8L335.2 90.2C330.5 85.5 322.9 85.5 318.2 90.2L256 152.4L193.8 90.2C189.1 85.5 181.5 85.5 176.8 90.2L154.2 112.8C149.5 117.5 149.5 125.1 154.2 129.8L216.4 192L154.2000000000001 254.2C149.5000000000001 258.9 149.5000000000001 266.5 154.2000000000001 271.2L176.8000000000001 293.8C181.5 298.5 189.1000000000001 298.5 193.8000000000001 293.8L256.0000000000001 231.6L318.2000000000001 293.8C322.9000000000001 298.5 330.5000000000001 298.5 335.2000000000001 293.8L357.8000000000001 271.2C362.5000000000001 266.5 362.5000000000001 258.9 357.8000000000001 254.2z" />
-    <glyph glyph-name="tired"
-      unicode="&#xF5C8;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C137.7 -8 48 81.7 48 192S137.7 392 248 392S448 302.3 448 192S358.3 -8 248 -8zM377.1 295.8C373.3 300.2000000000001 366.8 301.2000000000001 361.8 298.3L281.8 250.3C278.2 248.1 276 244.2 276 240S278.2 231.9 281.8 229.7L361.8 181.7C367.2 178.5 373.6 180.1 377.1 184.2C380.9000000000001 188.7 381 195.2 377.2000000000001 199.7L343.6 240L377.2000000000001 280.3C381.0000000000001 284.8 380.9000000000001 291.4 377.1 295.8zM220 240C220 244.2 217.8 248.1 214.2 250.3L134.2 298.3C129.2 301.3 122.7 300.2000000000001 118.9 295.8C115.1 291.3 115 284.8 118.8 280.3L152.4 240L118.8 199.7C115 195.2 115.1 188.7 118.9 184.2C122.4 180.1 128.8 178.5 134.2 181.7L214.2 229.7C217.8 231.9 220 235.8 220 240zM248 176C202.6 176 147.1 137.7 140.2 82.7C138.7 70.9 147.1 61.1 155.7 64.8C178.4 74.5 212 80 248 80S317.6 74.5 340.3 64.8C348.8 61.1 357.3 70.8 355.8 82.7C348.9000000000001 137.7 293.4000000000001 176 248 176z" />
-    <glyph glyph-name="trash-alt"
-      unicode="&#xF2ED;"
-      horiz-adv-x="448" d=" M192 260V44C192 37.373 186.627 32 180 32H156C149.373 32 144 37.373 144 44V260C144 266.627 149.373 272 156 272H180C186.627 272 192 266.627 192 260zM292 272H268C261.373 272 256 266.627 256 260V44C256 37.373 261.373 32 268 32H292C298.627 32 304 37.373 304 44V260C304 266.627 298.627 272 292 272zM424 368C437.255 368 448 357.255 448 344V332C448 325.373 442.627 320 436 320H416V-16C416 -42.51 394.51 -64 368 -64H80C53.49 -64 32 -42.51 32 -16V320H12C5.373 320 0 325.373 0 332V344C0 357.255 10.745 368 24 368H98.411L132.429 424.6960000000001A48 48 0 0 0 173.589 448H274.412A48 48 0 0 0 315.572 424.6960000000001L349.589 368H424zM154.389 368H293.612L276.1600000000001 397.087A6 6 0 0 1 271.015 400H176.987A6 6 0 0 1 171.842 397.087L154.389 368zM368 320H80V-10A6 6 0 0 1 86 -16H362A6 6 0 0 1 368 -10V320z" />
-    <glyph glyph-name="user-circle"
-      unicode="&#xF2BD;"
-      horiz-adv-x="496" d=" M248 344C195 344 152 301 152 248S195 152 248 152S344 195 344 248S301 344 248 344zM248 200C221.5 200 200 221.5 200 248S221.5 296 248 296S296 274.5 296 248S274.5 200 248 200zM248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 -8C198.3 -8 152.9 10.3 117.9 40.4C132.8 63.4 158.3 79 187.5 79.9C208.3 73.5 228.1 70.3 248 70.3S287.7 73.4 308.5 79.9C337.7 78.9 363.2 63.4 378.1 40.4C343.1 10.3 297.7000000000001 -8 248.0000000000001 -8zM410.7 76.1C386.3 107.5 348.6 128 305.6 128C295.4000000000001 128 279.6 118.4 248.0000000000001 118.4C216.5 118.4 200.6 128 190.4 128C147.5 128 109.8 107.5 85.3 76.1C61.9 108.8 48 148.8 48 192C48 302.3 137.7 392 248 392S448 302.3 448 192C448 148.8 434.1 108.8 410.7 76.1z" />
-    <glyph glyph-name="user"
-      unicode="&#xF007;"
-      horiz-adv-x="448" d=" M313.6 144C284.9000000000001 144 271.1 128 224 128C176.9 128 163.2000000000001 144 134.4 144C60.2 144 0 83.8 0 9.6V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V9.6C448 83.8 387.8 144 313.6 144zM400 -16H48V9.6C48 57.2000000000001 86.8 96 134.4 96C149 96 172.7 80 224 80C275.7 80 298.9 96 313.6 96C361.2000000000001 96 400 57.2 400 9.6V-16zM224 160C303.5 160 368 224.5 368 304S303.5 448 224 448S80 383.5 80 304S144.5 160 224 160zM224 400C276.9 400 320 356.9 320 304S276.9 208 224 208S128 251.1 128 304S171.1 400 224 400z" />
-    <glyph glyph-name="window-close"
-      unicode="&#xF410;"
-      horiz-adv-x="512" d=" M464 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H464C490.5 -32 512 -10.5 512 16V368C512 394.5 490.5 416 464 416zM464 22C464 18.7 461.3 16 458 16H54C50.7 16 48 18.7 48 22V362C48 365.3 50.7 368 54 368H458C461.3 368 464 365.3 464 362V22zM356.5 253.4L295.1 192L356.5 130.6C361.1 126 361.1 118.5 356.5 113.8L334.2 91.5C329.6 86.9 322.1 86.9 317.4 91.5L256 152.9L194.6 91.5C190 86.9 182.5 86.9 177.8 91.5L155.5 113.8C150.9 118.4 150.9 125.9 155.5 130.6L216.9 192L155.5 253.4000000000001C150.9 258 150.9 265.5 155.5 270.2000000000001L177.8 292.5000000000001C182.4 297.1 189.9 297.1 194.6 292.5000000000001L256 231.1000000000001L317.4 292.5000000000001C322 297.1 329.5 297.1 334.2 292.5000000000001L356.5 270.2000000000001C361.2 265.6 361.2 258.1 356.5 253.4000000000001z" />
-    <glyph glyph-name="window-maximize"
-      unicode="&#xF2D0;"
-      horiz-adv-x="512" d=" M464 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H464C490.5 -32 512 -10.5 512 16V368C512 394.5 490.5 416 464 416zM464 22C464 18.7 461.3 16 458 16H54C50.7 16 48 18.7 48 22V256H464V22z" />
-    <glyph glyph-name="window-minimize"
-      unicode="&#xF2D1;"
-      horiz-adv-x="512" d=" M480 -32H32C14.3 -32 0 -17.7 0 0S14.3 32 32 32H480C497.7 32 512 17.7 512 0S497.7 -32 480 -32z" />
-    <glyph glyph-name="window-restore"
-      unicode="&#xF2D2;"
-      horiz-adv-x="512" d=" M464 448H144C117.5 448 96 426.5 96 400V352H48C21.5 352 0 330.5 0 304V-16C0 -42.5 21.5 -64 48 -64H368C394.5 -64 416 -42.5 416 -16V32H464C490.5 32 512 53.5 512 80V400C512 426.5 490.5 448 464 448zM368 -16H48V192H368V-16zM464 80H416V304C416 330.5 394.5 352 368 352H144V400H464V80z" />
-  </font>
-</defs>
-</svg>
diff --git a/data/interfaces/default/fonts/font-awesome/fa-regular-400.ttf b/data/interfaces/default/fonts/font-awesome/fa-regular-400.ttf
deleted file mode 100644
index cefbd50f..00000000
Binary files a/data/interfaces/default/fonts/font-awesome/fa-regular-400.ttf and /dev/null differ
diff --git a/data/interfaces/default/fonts/font-awesome/fa-regular-400.woff b/data/interfaces/default/fonts/font-awesome/fa-regular-400.woff
deleted file mode 100644
index 954b0593..00000000
Binary files a/data/interfaces/default/fonts/font-awesome/fa-regular-400.woff and /dev/null differ
diff --git a/data/interfaces/default/fonts/font-awesome/fa-regular-400.woff2 b/data/interfaces/default/fonts/font-awesome/fa-regular-400.woff2
deleted file mode 100644
index bd35950e..00000000
Binary files a/data/interfaces/default/fonts/font-awesome/fa-regular-400.woff2 and /dev/null differ
diff --git a/data/interfaces/default/fonts/font-awesome/fa-solid-900.eot b/data/interfaces/default/fonts/font-awesome/fa-solid-900.eot
deleted file mode 100644
index cc691d63..00000000
Binary files a/data/interfaces/default/fonts/font-awesome/fa-solid-900.eot and /dev/null differ
diff --git a/data/interfaces/default/fonts/font-awesome/fa-solid-900.svg b/data/interfaces/default/fonts/font-awesome/fa-solid-900.svg
deleted file mode 100644
index 1534b64b..00000000
--- a/data/interfaces/default/fonts/font-awesome/fa-solid-900.svg
+++ /dev/null
@@ -1,2231 +0,0 @@
-<?xml version="1.0" standalone="no"?> 
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<defs>
-  <font id="fontawesome-free" horiz-adv-x="640">
-    <font-face font-family="Font Awesome 5 Free"
-      units-per-em="512" ascent="448"
-      descent="64"
-      font-weight="900"
-      font-style="Solid" />
-    <missing-glyph horiz-adv-x="0" />
-    <glyph glyph-name="address-book"
-      unicode="&#xF2B9;"
-      horiz-adv-x="448" d=" M436 288C442.6 288 448 293.4 448 300V340C448 346.6 442.6 352 436 352H416V400C416 426.5 394.5 448 368 448H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H368C394.5 -64 416 -42.5 416 -16V32H436C442.6 32 448 37.4 448 44V84C448 90.6 442.6 96 436 96H416V160H436C442.6 160 448 165.4 448 172V212C448 218.6 442.6 224 436 224H416V288H436zM208 320C243.3 320 272 291.3 272 256S243.3 192 208 192S144 220.7 144 256S172.7 320 208 320zM320 83.2C320 72.6 310 64 297.6 64H118.4C106 64 96 72.6 96 83.2V102.4C96 134.2 126.1 160 163.2 160H168.2C180.5 154.9 193.9 152 208 152S235.6 154.9 247.8 160H252.8C289.9000000000001 160 320 134.2 320 102.4V83.2z" />
-    <glyph glyph-name="address-card"
-      unicode="&#xF2BB;"
-      horiz-adv-x="576" d=" M528 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H528C554.5 -32 576 -10.5 576 16V368C576 394.5 554.5 416 528 416zM176 320C211.3 320 240 291.3 240 256S211.3 192 176 192S112 220.7 112 256S140.7 320 176 320zM288 83.2C288 72.6 278 64 265.6 64H86.4C74 64 64 72.6 64 83.2V102.4C64 134.2 94.1 160 131.2 160H136.2C148.5 154.9 161.9 152 176 152S203.6 154.9 215.8 160H220.8C257.9000000000001 160 288 134.2 288 102.4V83.2zM512 136C512 131.6 508.4 128 504 128H360C355.6 128 352 131.6 352 136V152C352 156.4 355.6 160 360 160H504C508.4 160 512 156.4 512 152V136zM512 200C512 195.6 508.4 192 504 192H360C355.6 192 352 195.6 352 200V216C352 220.4 355.6 224 360 224H504C508.4 224 512 220.4 512 216V200zM512 264C512 259.6 508.4 256 504 256H360C355.6 256 352 259.6 352 264V280C352 284.4 355.6 288 360 288H504C508.4 288 512 284.4 512 280V264z" />
-    <glyph glyph-name="adjust"
-      unicode="&#xF042;"
-      horiz-adv-x="512" d=" M8 192C8 55.034 119.033 -56 256 -56S504 55.034 504 192S392.966 440 256 440S8 328.967 8 192zM256 8V376C357.705 376 440 293.689 440 192C440 90.295 357.689 8 256 8z" />
-    <glyph glyph-name="align-center"
-      unicode="&#xF037;"
-      horiz-adv-x="448" d=" M352 404V364C352 355.163 344.837 348 336 348H112C103.163 348 96 355.163 96 364V404C96 412.837 103.163 420 112 420H336C344.837 420 352 412.837 352 404zM16 220H432C440.837 220 448 227.163 448 236V276C448 284.837 440.837 292 432 292H16C7.163 292 0 284.837 0 276V236C0 227.163 7.163 220 16 220zM16 -36H432C440.837 -36 448 -28.837 448 -20V20C448 28.837 440.837 36 432 36H16C7.163 36 0 28.837 0 20V-20C0 -28.837 7.163 -36 16 -36zM336 164H112C103.163 164 96 156.837 96 148V108C96 99.163 103.163 92 112 92H336C344.837 92 352 99.163 352 108V148C352 156.837 344.837 164 336 164z" />
-    <glyph glyph-name="align-justify"
-      unicode="&#xF039;"
-      horiz-adv-x="448" d=" M0 364V404C0 412.837 7.163 420 16 420H432C440.837 420 448 412.837 448 404V364C448 355.163 440.837 348 432 348H16C7.163 348 0 355.163 0 364zM16 220H432C440.837 220 448 227.163 448 236V276C448 284.837 440.837 292 432 292H16C7.163 292 0 284.837 0 276V236C0 227.163 7.163 220 16 220zM16 -36H432C440.837 -36 448 -28.837 448 -20V20C448 28.837 440.837 36 432 36H16C7.163 36 0 28.837 0 20V-20C0 -28.837 7.163 -36 16 -36zM16 92H432C440.837 92 448 99.163 448 108V148C448 156.837 440.837 164 432 164H16C7.163 164 0 156.837 0 148V108C0 99.163 7.163 92 16 92z" />
-    <glyph glyph-name="align-left"
-      unicode="&#xF036;"
-      horiz-adv-x="448" d=" M288 404V364C288 355.163 280.837 348 272 348H16C7.163 348 0 355.163 0 364V404C0 412.837 7.163 420 16 420H272C280.837 420 288 412.837 288 404zM0 276V236C0 227.163 7.163 220 16 220H432C440.837 220 448 227.163 448 236V276C448 284.837 440.837 292 432 292H16C7.163 292 0 284.837 0 276zM16 -36H432C440.837 -36 448 -28.837 448 -20V20C448 28.837 440.837 36 432 36H16C7.163 36 0 28.837 0 20V-20C0 -28.837 7.163 -36 16 -36zM272 164H16C7.163 164 0 156.837 0 148V108C0 99.163 7.163 92 16 92H272C280.837 92 288 99.163 288 108V148C288 156.837 280.837 164 272 164z" />
-    <glyph glyph-name="align-right"
-      unicode="&#xF038;"
-      horiz-adv-x="448" d=" M160 364V404C160 412.837 167.163 420 176 420H432C440.837 420 448 412.837 448 404V364C448 355.163 440.837 348 432 348H176C167.163 348 160 355.163 160 364zM16 220H432C440.837 220 448 227.163 448 236V276C448 284.837 440.837 292 432 292H16C7.163 292 0 284.837 0 276V236C0 227.163 7.163 220 16 220zM16 -36H432C440.837 -36 448 -28.837 448 -20V20C448 28.837 440.837 36 432 36H16C7.163 36 0 28.837 0 20V-20C0 -28.837 7.163 -36 16 -36zM176 92H432C440.837 92 448 99.163 448 108V148C448 156.837 440.837 164 432 164H176C167.163 164 160 156.837 160 148V108C160 99.163 167.163 92 176 92z" />
-    <glyph glyph-name="allergies"
-      unicode="&#xF461;"
-      horiz-adv-x="448" d=" M416 336C398.4 336 384 321.6 384 304V232C384 227.6 380.4 224 376 224H360C355.6 224 352 227.6 352 232V384C352 401.6 337.6 416 320 416S288 401.6 288 384V232C288 227.6 284.4 224 280 224H264C259.6 224 256 227.6 256 232V416C256 433.6 241.6 448 224 448S192 433.6 192 416V232C192 227.6 188.4 224 184 224H168C163.6 224 160 227.6 160 232V384C160 401.6 145.6 416 128 416S96 401.6 96 384V143L72.4 175.5C59.4 193.4 34.4 197.3 16.5 184.3S-5.3 146.3 7.7 128.4L133.3 -44.3C142.3 -56.6999999999999 156.8 -64.0999999999999 172.1 -64.0999999999999H369.7000000000001C392.0000000000001 -64.0999999999999 411.3000000000001 -48.7999999999999 416.4000000000001 -27.0999999999999L442.9000000000001 85.6000000000001C446.1 99.3000000000001 447.8 113.9000000000001 448.0000000000001 127.9000000000001V304C448.0000000000001 321.6 433.6000000000001 336 416.0000000000001 336zM176 32C167.2 32 160 39.2 160 48S167.2 64 176 64S192 56.8 192 48S184.8 32 176 32zM176 128C167.2 128 160 135.2 160 144S167.2 160 176 160S192 152.8 192 144S184.8 128 176 128zM240 0C231.2 0 224 7.2 224 16S231.2 32 240 32S256 24.8 256 16S248.8 0 240 0zM240 96C231.2 96 224 103.2 224 112S231.2 128 240 128S256 120.8 256 112S248.8 96 240 96zM304 64C295.2 64 288 71.2 288 80S295.2 96 304 96S320 88.8 320 80S312.8 64 304 64zM336 0C327.2 0 320 7.2 320 16S327.2 32 336 32S352 24.8 352 16S344.8 0 336 0zM368 128C359.2 128 352 135.2 352 144S359.2 160 368 160S384 152.8 384 144S376.8 128 368 128z" />
-    <glyph glyph-name="ambulance"
-      unicode="&#xF0F9;"
-      horiz-adv-x="640" d=" M624 96H608V204.1C608 216.8 602.9 229 593.9 238L494 337.9C485 346.9 472.8 352 460.1 352H416V400C416 426.5 394.5 448 368 448H48C21.5 448 0 426.5 0 400V80C0 53.5 21.5 32 48 32H64C64 -21 107 -64 160 -64S256 -21 256 32H384C384 -21 427 -64 480 -64S576 -21 576 32H624C632.8 32 640 39.2 640 48V80C640 88.8 632.8 96 624 96zM160 -16C133.5 -16 112 5.5 112 32S133.5 80 160 80S208 58.5 208 32S186.5 -16 160 -16zM304 232C304 227.6 300.4 224 296 224H240V168C240 163.6 236.4 160 232 160H184C179.6 160 176 163.6 176 168V224H120C115.6 224 112 227.6 112 232V280C112 284.4 115.6 288 120 288H176V344C176 348.4 179.6 352 184 352H232C236.4 352 240 348.4 240 344V288H296C300.4 288 304 284.4 304 280V232zM480 -16C453.5 -16 432 5.5 432 32S453.5 80 480 80S528 58.5 528 32S506.5 -16 480 -16zM560 192H416V304H460.1L560 204.1V192z" />
-    <glyph glyph-name="american-sign-language-interpreting"
-      unicode="&#xF2A3;"
-      horiz-adv-x="640" d=" M290.5470000000001 258.961C270.252 269.11 246.4000000000001 270.1600000000001 225.808 262.851C268.4140000000001 262.851 297.016 242.376 311.386 212.275C319.9620000000001 194.376 306.238 174.204 287.769 174.204C306.198 174.204 319.98 154.068 311.386 136.1330000000001C296.661 105.287 265.2630000000001 85.2790000000001 231.088 85.2790000000001C230.5310000000001 85.2790000000001 136.617 93.8940000000001 136.617 93.8940000000001L70.211 60.5470000000001C60.827 55.8540000000001 50.396 60.1680000000001 46.316 68.3280000000001L1.86 157.253C-2.307 165.868 0.749 176.15 8.806 180.874L66.878 213.943L108 288.139C114.39 345.384 142.731 397.906 187.743 434.865C199.134 444.313 216.084 442.646 225.253 431.252C234.699 419.858 233.033 403.185 221.641 393.736C209.138 383.177 198.023 371.227 189.132 358.166C210.804 372.895 235.811 382.898 263.318 386.233C278.043 388.178 291.381 377.897 293.048 363.168C294.993 348.44 284.712 335.101 269.986 333.434C253.87 331.4890000000001 238.866 325.931 225.808 318.15C251.922 323.863 284.52 321.288 313.887 307.035C327.223 300.366 332.78 284.526 326.111 271.187C319.722 258.127 303.607 252.57 290.547 258.961zM263.3180000000001 189.489C257.206 201.994 244.9800000000001 209.775 231.0870000000001 209.775A35.46 35.46 0 0 1 195.5220000000001 174.2050000000001C195.5220000000001 152.7770000000001 213.3300000000001 138.6350000000001 231.0870000000001 138.6350000000001C244.9800000000001 138.6350000000001 257.206 146.4160000000001 263.3180000000001 158.9210000000001C267.7640000000001 168.3700000000001 276.932 173.927 286.6570000000001 174.2050000000001C276.932 174.482 267.764 180.04 263.3180000000001 189.489zM638.1390000000001 226.7260000000001C642.3070000000001 218.111 639.2500000000001 207.829 631.1930000000001 203.105L573.1220000000001 170.036L532 95.84C525.61 38.595 497.269 -13.927 452.257 -50.886C441.325 -59.998 424.4580000000001 -59.03 414.747 -47.273C405.301 -35.879 406.9670000000001 -19.206 418.36 -9.757C430.863 0.802 441.9770000000001 12.752 450.868 25.813C429.196 11.084 404.189 1.081 376.682 -2.254C366.661 -4.76 349.13 3.389 346.952 20.811C345.007 35.539 355.288 48.878 370.014 50.545C386.13 52.491 401.134 58.048 414.192 65.829C388.0780000000001 60.1159999999999 355.48 62.691 326.113 76.944C312.777 83.6129999999999 307.2200000000001 99.453 313.889 112.792C320.278 125.853 336.394 131.411 349.454 125.019C369.749 114.87 393.601 113.8199999999999 414.193 121.129C371.587 121.129 342.985 141.604 328.615 171.705C320.039 189.604 333.7630000000001 209.776 352.2320000000001 209.776C333.8030000000001 209.776 320.021 229.912 328.615 247.847C342.648 277.243 372.654 298.734 410.581 298.701L503.384 290.086L569.79 323.433C579.198 328.137 589.6179999999999 323.787 593.684 315.652L638.139 226.726zM408.9120000000002 245.344C395.0190000000001 245.344 382.7930000000001 237.563 376.6810000000002 225.058C372.2350000000002 215.609 363.0670000000002 210.052 353.3420000000002 209.774C363.0670000000002 209.4960000000001 372.2350000000002 203.938 376.6810000000002 194.4900000000001C382.7930000000002 181.985 395.0190000000002 174.2040000000001 408.9120000000002 174.2040000000001A35.46 35.46 0 0 1 444.4770000000002 209.7740000000001C444.4770000000002 231.2030000000001 426.6690000000002 245.3440000000001 408.9120000000002 245.3440000000001z" />
-    <glyph glyph-name="anchor"
-      unicode="&#xF13D;"
-      horiz-adv-x="576" d=" M12.971 96H45.365C67.172 -6.735 181.944 -64 288 -64C394.229 -64 508.853 -6.62 530.635 96H563.029C573.72 96 579.074 108.926 571.514 116.485L504.485 183.514C499.799 188.2 492.201 188.2 487.514 183.514L420.485 116.485C412.925 108.925 418.279 96 428.9700000000001 96H464.116C443.826 41.683 379.153 9.412 319.999 1.985V192H371.999C378.6260000000001 192 383.999 197.373 383.999 204V244C383.999 250.627 378.6260000000001 256 371.999 256H319.999V261.4700000000001C357.2800000000001 274.648 383.9940000000001 310.195 383.999 351.988C384.005 404.228 341.605 447.262 289.37 447.99C235.723 448.739 192 405.475 192 352C192 310.202 218.716 274.65 256 261.4700000000001V256H204C197.373 256 192 250.627 192 244V204C192 197.373 197.373 192 204 192H256V1.985C197.064 9.384 132.18 41.664 111.883 96H147.029C157.72 96 163.074 108.926 155.514 116.485L88.485 183.514C83.799 188.2 76.201 188.2 71.514 183.514L4.485 116.485C-3.074 108.926 2.28 96 12.971 96zM288 384C305.645 384 320 369.645 320 352S305.645 320 288 320S256 334.355 256 352S270.355 384 288 384z" />
-    <glyph glyph-name="angle-double-down"
-      unicode="&#xF103;"
-      horiz-adv-x="320" d=" M143 191.7L7 327.7C-2.4 337.1 -2.4 352.3 7 361.6L29.6 384.2C39 393.6 54.2 393.6 63.5 384.2L159.9 287.8L256.3 384.2C265.7 393.6 280.9000000000001 393.6 290.2 384.2L313 361.7C322.4 352.3 322.4 337.1 313 327.8L177 191.8C167.6 182.3 152.4 182.3 143 191.7zM177 -0.3L313 135.7C322.4 145.1 322.4 160.3 313 169.6L290.4 192.2C281 201.6 265.8 201.6 256.5 192.2L160 95.9L63.6 192.3C54.2 201.7 39 201.7 29.7 192.3L7 169.7C-2.4 160.3 -2.4 145.1 7 135.8L143 -0.2C152.4 -9.7 167.6 -9.7 177 -0.3z" />
-    <glyph glyph-name="angle-double-left"
-      unicode="&#xF100;"
-      horiz-adv-x="448" d=" M223.7 209L359.7 345C369.1 354.4 384.3 354.4 393.6 345L416.2 322.4C425.6 313 425.6 297.8 416.2 288.5L319.9 192L416.3 95.6C425.7 86.2000000000001 425.7 71 416.3 61.7000000000001L393.7 39C384.3 29.6 369.1 29.6 359.8 39L223.8 175C214.3 184.4 214.3 199.6 223.7 209zM31.7 175L167.7 39C177.1 29.6 192.3 29.6 201.6 39L224.2 61.6C233.6 71 233.6 86.2000000000001 224.2 95.5L127.9 192L224.3 288.4C233.7 297.8 233.7 313 224.3 322.3L201.7 345C192.3 354.4 177.1 354.4 167.8 345L31.8 209C22.3 199.6 22.3 184.4 31.7 175z" />
-    <glyph glyph-name="angle-double-right"
-      unicode="&#xF101;"
-      horiz-adv-x="448" d=" M224.3 175L88.3 39C78.9 29.6 63.7 29.6 54.4 39L31.8 61.6C22.4 71 22.4 86.2000000000001 31.8 95.5L128.2 191.9L31.8 288.3C22.4 297.7 22.4 312.9 31.8 322.2L54.3 345C63.7 354.4 78.9 354.4 88.2 345L224.2 209C233.7 199.6 233.7 184.4 224.3 175zM416.3 209L280.3 345C270.9000000000001 354.4 255.7 354.4 246.4 345L223.8 322.4C214.4 313 214.4 297.8 223.8 288.5L320.2000000000001 192.1L223.8000000000001 95.7C214.4 86.3 214.4 71.1 223.8000000000001 61.8L246.4000000000001 39.2C255.8000000000001 29.8 271.0000000000001 29.8 280.3 39.2L416.3 175.2C425.7 184.4 425.7 199.6 416.3 209z" />
-    <glyph glyph-name="angle-double-up"
-      unicode="&#xF102;"
-      horiz-adv-x="320" d=" M177 192.3L313 56.3C322.4 46.9 322.4 31.7 313 22.4L290.4 -0.2C281 -9.6 265.8 -9.6 256.5 -0.2L160 96.1L63.6 -0.3C54.2 -9.6999999999999 39 -9.6999999999999 29.7 -0.3L7 22.3C-2.4 31.7 -2.4 46.9 7 56.2L143 192.2C152.4 201.7 167.6 201.7 177 192.3zM143 384.3L7 248.3C-2.4 238.9 -2.4 223.7 7 214.4L29.6 191.8C39 182.4 54.2 182.4 63.5 191.8L159.9 288.2000000000001L256.3 191.8C265.7 182.4 280.9000000000001 182.4 290.2 191.8L312.8 214.4C322.2 223.8 322.2 239 312.8 248.3L176.8 384.3C167.6 393.7 152.4 393.7 143 384.3z" />
-    <glyph glyph-name="angle-down"
-      unicode="&#xF107;"
-      horiz-adv-x="320" d=" M143 95.7L7 231.7C-2.4 241.1 -2.4 256.3 7 265.6L29.6 288.2C39 297.6 54.2 297.6 63.5 288.2L159.9 191.8L256.3 288.2C265.7 297.6 280.9000000000001 297.6 290.2 288.2L312.8 265.6C322.2 256.2 322.2 241 312.8 231.7L176.8 95.6999999999999C167.6 86.3 152.4 86.3 143 95.6999999999999z" />
-    <glyph glyph-name="angle-left"
-      unicode="&#xF104;"
-      horiz-adv-x="256" d=" M31.7 209L167.7 345C177.1 354.4 192.3 354.4 201.6 345L224.2 322.4C233.6 313 233.6 297.8 224.2 288.5L127.9 192L224.3 95.6C233.7 86.2000000000001 233.7 71 224.3 61.7000000000001L201.7 39C192.3 29.6 177.1 29.6 167.8 39L31.8 175C22.3 184.4 22.3 199.6 31.7 209z" />
-    <glyph glyph-name="angle-right"
-      unicode="&#xF105;"
-      horiz-adv-x="256" d=" M224.3 175L88.3 39C78.9 29.6 63.7 29.6 54.4 39L31.8 61.6C22.4 71 22.4 86.2000000000001 31.8 95.5L128.2 191.9L31.8 288.3C22.4 297.7 22.4 312.9 31.8 322.2L54.3 345C63.7 354.4 78.9 354.4 88.2 345L224.2 209C233.7 199.6 233.7 184.4 224.3 175z" />
-    <glyph glyph-name="angle-up"
-      unicode="&#xF106;"
-      horiz-adv-x="320" d=" M177 288.3L313 152.3C322.4 142.9 322.4 127.7 313 118.4L290.4 95.8C281 86.4 265.8 86.4 256.5 95.8L160 192.1L63.6 95.7C54.2 86.3 39 86.3 29.7 95.7L7 118.3C-2.4 127.7 -2.4 142.9 7 152.2L143 288.2C152.4 297.7 167.6 297.7 177 288.3z" />
-    <glyph glyph-name="angry"
-      unicode="&#xF556;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM136 208C136 217.3 140.1 225.5 146.5 231.4L115.5 240.7C107 243.2 102.2 252.2 104.8 260.6C107.3 269.1 116.2 273.8 124.7 271.3L204.7 247.3C213.2 244.8 218 235.8 215.4 227.4C213.3 220.5 207 216 200.1 216C199.6 216 199 216.2 198.4 216.2C199.1 213.5 200.1 210.9 200.1 208C200.1 190.3 185.8 176 168.1 176S136 190.3 136 208zM304 53.8C276.2 87.2 219.8 87.2 191.9 53.8C178.4 37.5 153.7 58 167.3 74.3C187.3 98.3 216.7 112.1 247.9 112.1S308.5 98.3 328.5 74.3C342.3 57.8 317.4 37.7 304 53.8zM380.6 240.7L349.6 231.4C355.9000000000001 225.6 360.1 217.3 360.1 208C360.1 190.3 345.8 176 328.1 176S296.1 190.3 296.1 208C296.1 210.9 297 213.6 297.8 216.2C297.2 216.1 296.7 216 296.1 216C289.2000000000001 216 282.9000000000001 220.5 280.8 227.4C278.3 235.9 283.1 244.8 291.5 247.3L371.5 271.3C379.9 273.8 388.9 269 391.4 260.6C393.9 252.1 389.1 243.2 380.6 240.7z" />
-    <glyph glyph-name="archive"
-      unicode="&#xF187;"
-      horiz-adv-x="512" d=" M32 0C32 -17.7 46.3 -32 64 -32H448C465.7 -32 480 -17.7 480 0V288H32V0zM192 212C192 218.6 197.4 224 204 224H308C314.6 224 320 218.6 320 212V204C320 197.4 314.6 192 308 192H204C197.4 192 192 197.4 192 204V212zM480 416H32C14.3 416 0 401.7 0 384V336C0 327.2 7.2 320 16 320H496C504.8 320 512 327.2 512 336V384C512 401.7 497.7 416 480 416z" />
-    <glyph glyph-name="archway"
-      unicode="&#xF557;"
-      horiz-adv-x="576" d=" M560 0H544V352H32V0H16.02C7.18 0 0.02 -7.16 0.02 -16V-48C0.02 -56.84 7.18 -64 16.02 -64H176C184.84 -64 192 -56.84 192 -48V128C192 181.02 234.98 224 288 224S384 181.02 384 128L384.02 -32V-48C384.02 -56.84 391.18 -64 400.02 -64H560C568.84 -64 576 -56.84 576 -48V-16C576 -7.16 568.84 0 560 0zM560 448H16C7.16 448 0 440.84 0 432V400C0 391.16 7.16 384 16 384H560C568.84 384 576 391.16 576 400V432C576 440.84 568.84 448 560 448z" />
-    <glyph glyph-name="arrow-alt-circle-down"
-      unicode="&#xF358;"
-      horiz-adv-x="512" d=" M504 192C504 55 393 -56 256 -56S8 55 8 192S119 440 256 440S504 329 504 192zM212 308V192H141.1C130.4 192 125 179 132.6 171.5L247.5 57.2C252.2 52.5 259.7 52.5 264.4 57.2L379.3 171.5C386.9 179.1 381.5 192 370.8 192H300V308C300 314.6 294.6 320 288 320H224C217.4 320 212 314.6 212 308z" />
-    <glyph glyph-name="arrow-alt-circle-left"
-      unicode="&#xF359;"
-      horiz-adv-x="512" d=" M256 -56C119 -56 8 55 8 192S119 440 256 440S504 329 504 192S393 -56 256 -56zM372 236H256V306.9C256 317.6 243 323 235.5 315.4L121.2 200.5C116.5 195.8 116.5 188.3 121.2 183.6L235.5 68.7000000000001C243.1 61.1 256 66.5000000000001 256 77.2000000000001V148H372C378.6 148 384 153.4 384 160V224C384 230.6 378.6 236 372 236z" />
-    <glyph glyph-name="arrow-alt-circle-right"
-      unicode="&#xF35A;"
-      horiz-adv-x="512" d=" M256 440C393 440 504 329 504 192S393 -56 256 -56S8 55 8 192S119 440 256 440zM140 148H256V77.1C256 66.4 269 61 276.5 68.6L390.8 183.5C395.5 188.2 395.5 195.7 390.8 200.4L276.5 315.4C268.9 323 256 317.6 256 306.9V236H140C133.4 236 128 230.6 128 224V160C128 153.4 133.4 148 140 148z" />
-    <glyph glyph-name="arrow-alt-circle-up"
-      unicode="&#xF35B;"
-      horiz-adv-x="512" d=" M8 192C8 329 119 440 256 440S504 329 504 192S393 -56 256 -56S8 55 8 192zM300 76V192H370.9C381.6 192 387 205 379.4 212.5L264.5 326.8C259.8 331.5 252.3 331.5 247.6 326.8L132.6 212.5C125 204.9 130.4 192 141.1 192H212V76C212 69.4 217.4 64 224 64H288C294.6 64 300 69.4 300 76z" />
-    <glyph glyph-name="arrow-circle-down"
-      unicode="&#xF0AB;"
-      horiz-adv-x="512" d=" M504 192C504 55 393 -56 256 -56S8 55 8 192S119 440 256 440S504 329 504 192zM360.4 220.9L288 145.4V328C288 341.3 277.3 352 264 352H248C234.7 352 224 341.3 224 328V145.4L151.6 220.9C142.3 230.6 126.8 230.8 117.3 221.3L106.4 210.3C97 200.9 97 185.7 106.4 176.4L239 43.7C248.4 34.3 263.6 34.3 272.9 43.7L405.6 176.4C415 185.8 415 201 405.6 210.3L394.7 221.3C385.2 230.8 369.7 230.6 360.4 220.9z" />
-    <glyph glyph-name="arrow-circle-left"
-      unicode="&#xF0A8;"
-      horiz-adv-x="512" d=" M256 -56C119 -56 8 55 8 192S119 440 256 440S504 329 504 192S393 -56 256 -56zM284.9 87.6L209.4 160H392C405.3 160 416 170.7 416 184V200C416 213.3 405.3 224 392 224H209.4L284.9 296.4C294.6 305.7000000000001 294.8 321.2 285.3 330.7L274.3 341.6C264.9 351 249.7 351 240.4 341.6L107.7 209C98.3 199.6 98.3 184.4 107.7 175.1L240.4 42.4C249.8 33.0000000000001 265 33.0000000000001 274.3 42.4L285.3 53.3C294.8 62.8 294.6 78.3 284.9 87.6z" />
-    <glyph glyph-name="arrow-circle-right"
-      unicode="&#xF0A9;"
-      horiz-adv-x="512" d=" M256 440C393 440 504 329 504 192S393 -56 256 -56S8 55 8 192S119 440 256 440zM227.1 296.4L302.6 224H120C106.7 224 96 213.3 96 200V184C96 170.7 106.7 160 120 160H302.6L227.1 87.6C217.4 78.3 217.2 62.8 226.7 53.3L237.7 42.4C247.1 33.0000000000001 262.3 33.0000000000001 271.6 42.4L404.3 175C413.7 184.4 413.7 199.6 404.3 208.9L271.6 341.7C262.2000000000001 351.1 247.0000000000001 351.1 237.7 341.7L226.7 330.8C217.2 321.2 217.4 305.7 227.1 296.4z" />
-    <glyph glyph-name="arrow-circle-up"
-      unicode="&#xF0AA;"
-      horiz-adv-x="512" d=" M8 192C8 329 119 440 256 440S504 329 504 192S393 -56 256 -56S8 55 8 192zM151.6 163.1L224 238.6V56C224 42.7 234.7 32 248 32H264C277.3 32 288 42.7 288 56V238.6L360.4 163.1C369.7 153.4 385.2 153.2000000000001 394.7 162.7000000000001L405.6 173.7000000000001C415 183.1 415 198.3000000000001 405.6 207.6000000000001L273 340.3C263.6 349.7 248.4 349.7 239.1 340.3L106.3 207.6C96.9 198.2 96.9 183 106.3 173.7L117.2 162.7C126.8 153.2 142.3 153.4 151.6 163.1z" />
-    <glyph glyph-name="arrow-down"
-      unicode="&#xF063;"
-      horiz-adv-x="448" d=" M413.1 225.5L435.3 203.3C444.7 193.9 444.7 178.7 435.3 169.4L241 -25C231.6 -34.4 216.4 -34.4 207.1 -25L12.7 169.4C3.3 178.8 3.3 194 12.7 203.3L34.9 225.5C44.4 235 59.9 234.8 69.2 225.1L184 104.6V392C184 405.3 194.7 416 208 416H240C253.3 416 264 405.3 264 392V104.6L378.8 225.1C388.1 234.9000000000001 403.6 235.1 413.1 225.5000000000001z" />
-    <glyph glyph-name="arrow-left"
-      unicode="&#xF060;"
-      horiz-adv-x="448" d=" M257.5 2.9L235.3 -19.3C225.9 -28.7 210.7 -28.7 201.4 -19.3L7 175C-2.4 184.4 -2.4 199.6 7 208.9L201.4 403.3C210.8 412.7 226 412.7 235.3 403.3L257.5 381.1C267 371.6 266.8 356.1 257.1 346.8L136.6 232H424C437.3 232 448 221.3 448 208V176C448 162.7 437.3 152 424 152H136.6L257.1 37.2C266.9000000000001 27.9 267.1 12.4 257.5 2.9z" />
-    <glyph glyph-name="arrow-right"
-      unicode="&#xF061;"
-      horiz-adv-x="448" d=" M190.5 381.1L212.7 403.3C222.1 412.7 237.3 412.7 246.6 403.3L441 209C450.4 199.6 450.4 184.4 441 175.1L246.6 -19.3C237.2 -28.7 222 -28.7 212.7 -19.3L190.5 2.9C181 12.4 181.2 27.9 190.9 37.2L311.4 152H24C10.7 152 0 162.7 0 176V208C0 221.3 10.7 232 24 232H311.4L190.9 346.8C181.1 356.1 180.9 371.6 190.5 381.1z" />
-    <glyph glyph-name="arrow-up"
-      unicode="&#xF062;"
-      horiz-adv-x="448" d=" M34.9 158.5L12.7 180.7C3.3 190.1 3.3 205.3 12.7 214.6L207 409C216.4 418.4 231.6 418.4 240.9 409L435.2000000000001 214.7C444.6 205.3 444.6 190.1 435.2000000000001 180.8L413 158.6C403.5 149.1 388 149.3 378.7 159L264 279.4V-8C264 -21.3 253.3 -32 240 -32H208C194.7 -32 184 -21.3 184 -8V279.4L69.2 158.9C59.9 149.1 44.4 148.9 34.9 158.5z" />
-    <glyph glyph-name="arrows-alt-h"
-      unicode="&#xF337;"
-      horiz-adv-x="512" d=" M377.941 278.059V232H134.059V278.059C134.059 299.4410000000001 108.208 310.149 93.088 295.03L7.029 208.971C-2.344 199.598 -2.344 184.403 7.029 175.03L93.088 88.971C108.207 73.852 134.059 84.56 134.059 105.942V152H377.9410000000001V105.941C377.9410000000001 84.559 403.7920000000001 73.851 418.9120000000001 88.97L504.971 175.029C514.344 184.402 514.344 199.597 504.971 208.97L418.9120000000001 295.029C403.793 310.149 377.9410000000001 299.4410000000001 377.9410000000001 278.059z" />
-    <glyph glyph-name="arrows-alt-v"
-      unicode="&#xF338;"
-      horiz-adv-x="256" d=" M214.059 70.059H168V313.9410000000001H214.059C235.441 313.9410000000001 246.149 339.7920000000001 231.03 354.9120000000001L144.971 440.971C135.598 450.344 120.403 450.344 111.03 440.971L24.971 354.9120000000001C9.852 339.793 20.56 313.9410000000001 41.942 313.9410000000001H88V70.059H41.941C20.559 70.059 9.851 44.208 24.97 29.088L111.029 -56.971C120.402 -66.344 135.597 -66.344 144.97 -56.971L231.029 29.088C246.149 44.207 235.441 70.059 214.059 70.059z" />
-    <glyph glyph-name="arrows-alt"
-      unicode="&#xF0B2;"
-      horiz-adv-x="512" d=" M352.201 22.225L273.005 -56.971C263.632 -66.344 248.437 -66.344 239.064 -56.971L159.868 22.225C144.749 37.3440000000001 155.457 63.196 176.839 63.1950000000001H228.001L228 164H127.196V112.838C127.196 91.456 101.345 80.7480000000001 86.225 95.867L7.029 175.063C-2.344 184.436 -2.344 199.632 7.029 209.004L86.225 288.2C101.344 303.319 127.196 292.611 127.196 271.229V220H228V320.804H176.77C155.388 320.804 144.68 346.655 159.799 361.775L238.995 440.971C248.368 450.344 263.563 450.344 272.9360000000001 440.971L352.1320000000001 361.775C367.2510000000001 346.656 356.5430000000001 320.804 335.1610000000001 320.804H283.9990000000001V220H384.8030000000001V271.1620000000001C384.8030000000001 292.544 410.6540000000001 303.252 425.7730000000002 288.1330000000001L504.9690000000002 208.937C514.3420000000002 199.564 514.3420000000002 184.368 504.9690000000002 174.996L425.773 95.8C410.654 80.681 384.802 91.389 384.803 112.771V164H284V63.196H335.23C356.612 63.196 367.3200000000001 37.345 352.201 22.225z" />
-    <glyph glyph-name="assistive-listening-systems"
-      unicode="&#xF2A2;"
-      horiz-adv-x="512" d=" M216 188C216 172.536 203.464 160 188 160S160 172.536 160 188C160 232.112 195.888 268 240 268S320 232.112 320 188C320 172.536 307.464 160 292 160S264 172.536 264 188C264 201.234 253.233 212 240 212S216 201.234 216 188zM240 364C142.953 364 64 285.0470000000001 64 188C64 172.536 76.536 160 92 160S120 172.536 120 188C120 254.168 173.832 308 240 308S360 254.168 360 188C360 112.836 288.991 117.689 288.003 44.378L288 44C288 15.327 264.673 -8 236 -8C220.536 -8 208 -20.536 208 -36S220.536 -64 236 -64C295.475 -64 343.876 -15.672 344 43.774C344.5950000000001 78.202 416 92.014 416 188C416 285.0470000000001 337.0470000000001 364 240 364zM160 128C142.327 128 128 113.673 128 96S142.327 64 160 64S192 78.327 192 96S177.673 128 160 128zM32 0C14.327 0 0 -14.327 0 -32S14.327 -64 32 -64S64 -49.673 64 -32S49.673 0 32 0zM512 187.993C512 189.511 511.988 191.018 511.955 192.524C510.076 307.475 436.157 409.53 327.9940000000001 446.489C313.3610000000001 451.487 297.4450000000001 443.68 292.444 429.0470000000001C287.444 414.414 295.254 398.498 309.886 393.497C395.7920000000001 364.1430000000001 454.496 282.984 455.963 191.544L455.966 191.356C455.992 190.238 455.999 189.12 455.999 187.993C455.999 172.529 468.535 159.993 483.999 159.993S512 172.529 512 187.993zM152.971 8.971L72.971 88.971L39.03 55.03L119.03 -24.97L152.971 8.971z" />
-    <glyph glyph-name="asterisk"
-      unicode="&#xF069;"
-      horiz-adv-x="512" d=" M478.21 113.907L336 192L478.21 270.093C490.0050000000001 276.5700000000001 494.171 291.4770000000001 487.442 303.13L467.962 336.8710000000001C461.234 348.524 446.242 352.37 434.735 345.394L296 261.2820000000001L299.475 423.486C299.763 436.939 288.937 448 275.48 448H236.52C223.064 448 212.237 436.939 212.526 423.486L216 261.2820000000001L77.265 345.3930000000001C65.759 352.3690000000001 50.766 348.523 44.038 336.87L24.558 303.129C17.83 291.476 21.996 276.569 33.791 270.092L176 192L33.79 113.907C21.995 107.43 17.829 92.523 24.558 80.87L44.038 47.129C50.766 35.476 65.759 31.63 77.265 38.606L216 122.718L212.525 -39.486C212.237 -52.939 223.064 -64 236.52 -64H275.481C288.937 -64 299.764 -52.939 299.476 -39.486L296 122.718L434.735 38.607C446.241 31.631 461.234 35.477 467.962 47.1300000000001L487.442 80.871C494.17 92.5240000000001 490.005 107.4300000000001 478.21 113.9070000000001z" />
-    <glyph glyph-name="at"
-      unicode="&#xF1FA;"
-      horiz-adv-x="512" d=" M256 440C118.941 440 8 329.081 8 192C8 54.941 118.919 -56 256 -56C304.154 -56 351.342 -41.86 391.408 -15.777C403.413 -7.962 406.033 8.511 396.9600000000001 19.595L386.783 32.028C379.112 41.399 365.6040000000001 43.695 355.4100000000001 37.157C325.92 18.243 291.314 8 256 8C154.542 8 72 90.542 72 192S154.542 376 256 376C356.139 376 440 318.381 440 216C440 177.214 418.907 136.258 381.83 132.307C364.481 132.761 364.92 145.164 368.354 162.331L391.787 283.4410000000001C394.653 298.25 383.308 312 368.225 312H323.2440000000001A13.518 13.518 0 0 1 309.812 300.007L309.802 299.915C295.105 317.8160000000001 269.3540000000001 321.69 249.831 321.69C175.251 321.69 112 259.456 112 170.23C112 104.927 148.785 64.36 208 64.36C234.9840000000001 64.36 265.3690000000001 79.997 282.9910000000001 102.693C292.5130000000001 68.589 323.6040000000001 68.59 353.701 68.59C462.609 68.59 504 140.202 504 216C504 352.347 394.023 440 256 440zM234.32 135.57C212.071 135.57 198.25 151.193 198.25 176.341C198.25 221.334 229.029 249.07 256.88 249.07C279.1720000000001 249.07 292.481 233.829 292.481 208.3C292.481 163.239 258.606 135.57 234.32 135.57z" />
-    <glyph glyph-name="atlas"
-      unicode="&#xF558;"
-      horiz-adv-x="448" d=" M318.38 240H279.29C277.8 212.97 272.75 188.65 265.08 169.59C292.79 182.8300000000001 313.1 208.78 318.38 240.0000000000001zM318.38 272C313.09 303.2200000000001 292.79 329.17 265.08 342.41C272.76 323.35 277.8 299.03 279.29 272H318.38zM224 350.69C216.31 343.24 203.23 316.27 200.57 272H247.44C244.77 316.26 231.69 343.24 224 350.69zM182.92 342.41C155.21 329.17 134.9 303.2200000000001 129.62 272H168.71C170.2 299.03 175.24 323.35 182.92 342.41zM182.92 169.59C175.24 188.65 170.2 212.97 168.71 240.0000000000001H129.62C134.9 208.78 155.21 182.8300000000001 182.92 169.59zM247.43 240H200.56C203.22 195.74 216.3 168.76 223.99 161.31C231.69 168.76 244.77 195.74 247.43 240zM448 89.6V422.4C448 438.4 438.4 448 422.4 448H96C41.6 448 0 406.4 0 352V32C0 -22.4 41.6 -64 96 -64H422.4C435.2 -64 448 -54.4 448 -38.4V-22.4C448 -16 444.8 -9.6 438.4 -3.2C435.2 12.8 435.2 57.6 438.4 70.4C444.8 73.6 448 80 448 89.6zM224 384C294.69 384 352 326.69 352 256S294.69 128 224 128S96 185.31 96 256S153.31 384 224 384zM384 0H96C76.8 0 64 12.8 64 32S80 64 96 64H384V0z" />
-    <glyph glyph-name="audio-description"
-      unicode="&#xF29E;"
-      horiz-adv-x="512" d=" M162.925 209.291L171.747 178.636H146.141L155.182 209.288C156.459 213.709 157.833 219.282 159.054 224.533C160.274 219.282 161.648 213.71 162.9250000000001 209.291zM329.399 241.39H314.876V142.609H329.399C359.175 142.609 375.574 160.287 375.574 192.385C375.574 224.624 358.084 241.39 329.399 241.39zM512 336V48C512 21.49 490.51 0 464 0H48C21.49 0 0 21.49 0 48V336C0 362.51 21.49 384 48 384H464C490.51 384 512 362.51 512 336zM245.459 111.861L188.362 279.861A12.001000000000001 12.001000000000001 0 0 1 177 288H141.106A12.001000000000001 12.001000000000001 0 0 1 129.744 279.861L72.647 111.861C70.003 104.078 75.789 96 84.009 96H113.142A12 12 0 0 1 124.677 104.693L133.251 134.599H184.618L193.411 104.622A12 12 0 0 1 204.926 96H234.098C242.318 96 248.104 104.078 245.459 111.861zM430.16 192.386C430.16 251.363 392.241 288 331.2 288H273.834C267.207 288 261.834 282.627 261.834 276V108C261.834 101.373 267.207 96 273.834 96H331.2C392.241 96 430.16 132.933 430.16 192.386z" />
-    <glyph glyph-name="award"
-      unicode="&#xF559;"
-      horiz-adv-x="384" d=" M97.12 85.37L91.82 90.67A9.004 9.004 0 0 1 87.8 92.99L72 97.23C62.49 99.78 54.13 104.68 46.57 110.55L1.2 -0.7C-3.19 -11.47 5.01 -23.17 16.63 -22.73L69.32 -20.72L105.56 -59C113.56 -67.44 127.6 -64.8099999999999 131.99 -54.04L184.04 73.58C173.2 67.54 161.17 64 148.73 64C129.23 64 110.91 71.59 97.12 85.37zM382.8 -0.7L337.43 110.54C329.87 104.66 321.51 99.77 312 97.22L296.2 92.99A9.004 9.004 0 0 1 292.18 90.67L286.88 85.37C273.09 71.59 254.76 64 235.26 64C222.82 64 210.79 67.55 199.95 73.58L252 -54.04C256.39 -64.8100000000001 270.44 -67.44 278.43 -59L314.68 -20.72L367.37 -22.73C378.99 -23.17 387.19 -11.46 382.8 -0.7zM263 108L268.21 113.3C273.21 118.39 279.43 122.05 286.26 123.91L301.79 128.1400000000001C315.68 131.9300000000001 326.54 142.98 330.26 157.1200000000001L334.42 172.9300000000001A41.145 41.145 0 0 0 344.8400000000001 191.3000000000001L356.2100000000001 202.8700000000001C366.3800000000001 213.2200000000001 370.35 228.3100000000001 366.6300000000001 242.4500000000001L362.4700000000001 258.2600000000001A41.657 41.657 0 0 0 362.4700000000001 279.4700000000001L366.6300000000001 295.2800000000001C370.3500000000001 309.4200000000001 366.3800000000001 324.5100000000001 356.2100000000001 334.8600000000001L344.8400000000001 346.4300000000001C339.8400000000001 351.5200000000001 336.2500000000001 357.8500000000001 334.42 364.8000000000001L330.26 380.6000000000001C326.54 394.7400000000001 315.68 405.7900000000001 301.79 409.5800000000001L286.26 413.8200000000001C279.43 415.6800000000001 273.21 419.3400000000001 268.21 424.4300000000001L256.84 436C246.67 446.35 231.84 450.4 217.95 446.61L202.42 442.37A39.614 39.614 0 0 0 181.58 442.37L166.05 446.6C152.16 450.39 137.33 446.35 127.16 435.99L115.79 424.42C110.79 419.33 104.57 415.68 97.74 413.81L82.21 409.57C68.32 405.78 57.46 394.73 53.74 380.5900000000001L49.58 364.79A41.145 41.145 0 0 0 39.16 346.42L27.79 334.85C17.62 324.5 13.64 309.41 17.37 295.27L21.53 279.47A41.657 41.657 0 0 0 21.53 258.26L17.37 242.46C13.65 228.32 17.62 213.23 27.79 202.87L39.16 191.3C44.16 186.21 47.75 179.88 49.58 172.93L53.74 157.13C57.46 142.99 68.32 131.94 82.21 128.1499999999999L97.74 123.9199999999999C104.57 122.0599999999999 110.79 118.3999999999999 115.79 113.3099999999999L121 108C134.23 94.53 154.84 92.12 170.74 102.18A39.676 39.676 0 0 0 213.27 102.18C229.1600000000001 92.12 249.77 94.53 263 108zM97.66 272.04C97.66 325.07 139.9 368.06 192 368.06S286.3400000000001 325.07 286.3400000000001 272.04S244.1 176.02 192 176.02S97.66 219.01 97.66 272.04z" />
-    <glyph glyph-name="backspace"
-      unicode="&#xF55A;"
-      horiz-adv-x="640" d=" M576 384H205.26A63.97 63.97 0 0 1 160 365.25L9.37 214.63C-3.13 202.13 -3.13 181.87 9.37 169.38L160 18.75C172 6.75 188.28 0 205.25 0H576C611.35 0 640 28.65 640 64V320C640 355.35 611.35 384 576 384zM491.31 129.94C497.56 123.69 497.56 113.56 491.31 107.31L468.69 84.69C462.44 78.44 452.31 78.44 446.06 84.69L384 146.75L321.94 84.69C315.69 78.44 305.56 78.44 299.31 84.69L276.69 107.31C270.44 113.56 270.44 123.69 276.69 129.94L338.75 192L276.69 254.06C270.44 260.31 270.44 270.44 276.69 276.69L299.31 299.31C305.56 305.56 315.69 305.56 321.94 299.31L384 237.25L446.06 299.31C452.31 305.56 462.44 305.56 468.69 299.31L491.31 276.69C497.56 270.44 497.56 260.31 491.31 254.06L429.25 192L491.31 129.94z" />
-    <glyph glyph-name="backward"
-      unicode="&#xF04A;"
-      horiz-adv-x="512" d=" M11.5 167.4L203.5 7.4C224.1 -9.8 256 4.6 256 32V352C256 379.4 224.1 393.8 203.5 376.6L11.5 216.6C-3.8 203.8 -3.8 180.2 11.5 167.4zM267.5 167.4L459.5 7.4C480.1 -9.8 512 4.6 512 32V352C512 379.4 480.1 393.8 459.5 376.6L267.5 216.6C252.2 203.8 252.2 180.2 267.5 167.4z" />
-    <glyph glyph-name="balance-scale"
-      unicode="&#xF24E;"
-      horiz-adv-x="640" d=" M256 112H255.98C255.98 128.18 257.32 120.73 170.93 293.51C153.28 328.8 102.74 328.87 85.06 293.51C-2.06 119.25 0.02 127.67 0.02 112H0C0 67.82 57.31 32 128 32S256 67.82 256 112zM128 272L200 128H56L128 272zM639.98 112C639.98 128.18 641.32 120.73 554.9300000000001 293.51C537.2800000000001 328.8 486.7400000000001 328.87 469.0600000000001 293.51C381.9400000000001 119.25 384.0200000000001 127.67 384.0200000000001 112H384C384 67.82 441.31 32 512 32S640 67.82 640 112H639.98zM440 128L512 272L584 128H440zM528 0H352V294.75C375.51 305.04 393.16 326.23 398.39 352H528C536.84 352 544 359.16 544 368V400C544 408.8400000000001 536.84 416 528 416H383.64C369.04 435.32 346.09 448 320 448S270.96 435.32 256.36 416H112C103.16 416 96 408.8400000000001 96 400V368C96 359.16 103.16 352 112 352H241.61C246.84 326.24 264.48 305.04 288 294.75V0H112C103.16 0 96 -7.16 96 -16V-48C96 -56.84 103.16 -64 112 -64H528C536.84 -64 544 -56.84 544 -48V-16C544 -7.16 536.84 0 528 0z" />
-    <glyph glyph-name="ban"
-      unicode="&#xF05E;"
-      horiz-adv-x="512" d=" M256 440C119.034 440 8 328.967 8 192S119.034 -56 256 -56S504 55.034 504 192S392.967 440 256 440zM386.108 322.108C451.556 256.6600000000001 456.108 156.627 406.7850000000001 86.471L150.47 342.784C220.674 392.14 320.6960000000001 387.519 386.108 322.108zM125.892 61.892C60.444 127.34 55.892 227.373 105.215 297.529L361.53 41.216C291.327 -8.14 191.304 -3.52 125.892 61.892z" />
-    <glyph glyph-name="band-aid"
-      unicode="&#xF462;"
-      horiz-adv-x="640" d=" M0 288V96C0 60.7 28.7 32 64 32H160V352H64C28.7 352 0 323.3 0 288zM576 352H480V32H576C611.3 32 640 60.7 640 96V288C640 323.3 611.3 352 576 352zM192 32H448V352H192V32zM368 264C381.3 264 392 253.3 392 240S381.3 216 368 216S344 226.7 344 240S354.7 264 368 264zM368 168C381.3 168 392 157.3 392 144S381.3 120 368 120S344 130.7 344 144S354.7 168 368 168zM272 264C285.3 264 296 253.3 296 240S285.3 216 272 216S248 226.7 248 240S258.7 264 272 264zM272 168C285.3 168 296 157.3 296 144S285.3 120 272 120S248 130.7 248 144S258.7 168 272 168z" />
-    <glyph glyph-name="barcode"
-      unicode="&#xF02A;"
-      horiz-adv-x="512" d=" M0 0V384H18V0H0zM26.857 0.273V384H36V0.273H26.857zM54 0.273V384H62.857V0.273H54zM98.857 0.273V384H107.714V0.273H98.857zM134.857 0.273V384H152.571V0.273H134.857zM179.714 0.273V384H188.571V0.273H179.714zM197.714 0.273V384H206.571V0.273H197.714zM215.714 0.273V384H224.571V0.273H215.714zM251.429 0.273V384H269.429V0.273H251.429zM296.286 0.273V384H314.286V0.273H296.286zM332.2850000000001 0.273V384H350.286V0.273H332.2850000000001zM368.286 0.273V384H386.287V0.273H368.286zM395.1430000000001 0.273V384H413.1430000000001V0.273H395.1430000000001zM440.2860000000001 0.273V384H467.143V0.273H440.2860000000001zM476.0000000000001 0.273V384H485.143V0.273H476zM494.0000000000001 0V384H512V0H494z" />
-    <glyph glyph-name="bars"
-      unicode="&#xF0C9;"
-      horiz-adv-x="448" d=" M16 316H432C440.837 316 448 323.163 448 332V372C448 380.837 440.837 388 432 388H16C7.163 388 0 380.837 0 372V332C0 323.163 7.163 316 16 316zM16 156H432C440.837 156 448 163.163 448 172V212C448 220.837 440.837 228 432 228H16C7.163 228 0 220.837 0 212V172C0 163.163 7.163 156 16 156zM16 -4H432C440.837 -4 448 3.163 448 12V52C448 60.837 440.837 68 432 68H16C7.163 68 0 60.837 0 52V12C0 3.163 7.163 -4 16 -4z" />
-    <glyph glyph-name="baseball-ball"
-      unicode="&#xF433;"
-      horiz-adv-x="496" d=" M368.5 84.1L397.3 98C408.4000000000001 75.1 423.3 54.8 441.4000000000001 37.1C475.4 79.6 495.9 133.4 495.9 192C495.9 250.5000000000001 475.5000000000001 304.2000000000001 441.7000000000001 346.6C423.9000000000001 329.3 409.1 309.5 398.1 287.1L369.4000000000001 301.2000000000001C382.2000000000001 327.2000000000001 399.4000000000001 350.2000000000001 420.2000000000001 370.2000000000001C375.6 413.3 315 440 248 440C181.1 440 120.5 413.4 75.9 370.3C96.6 350.4 113.8 327.4 126.6 301.5L97.9 287.4C86.9 309.7000000000001 72.2 329.5 54.4 346.8C20.4 304.3 0 250.6 0 192C0 133.4 20.4 79.7 54.4 37.3C72.6 55 87.6 75.3 98.7 98.3L127.5 84.4C114.6 57.7000000000001 97.2 34.1 76 13.7C120.5 -29.4 181.1 -55.9999999999999 248 -55.9999999999999C314.8 -55.9999999999999 375.3 -29.4999999999999 419.9 13.5000000000001C398.8 33.9 381.4 57.4 368.5 84.1zM140.2 116.1L109.7 125.9C124.6 172.3 122.4 219.7000000000001 109.1 259.9000000000001L139.5 269.9000000000001C154.5 224.3000000000001 157.5 170 140.2 116.1zM356.5 269.5L386.9 259.5C373.7 219.4 371.4 172 386.3 125.5L355.8 115.7C338.5 169.7 341.5 224 356.5 269.5z" />
-    <glyph glyph-name="basketball-ball"
-      unicode="&#xF434;"
-      horiz-adv-x="496" d=" M212.3 437.7C168.5 431.4 126.1 413.6 90.1 383.9L167.5 306.5C195.3 342.3 210.8 387.7 212.3 437.7zM248 226L405.9 383.9C363.5 418.9 312.3 437.4 260.4 440C259.2 376.1 238.9 317.7000000000001 201.7 272.3L248 226zM56.1 349.9C26.4 313.9 8.6 271.5 2.3 227.7C52.3 229.2 97.8 244.7 133.5 272.5L56.1 349.9zM328.3 145.7000000000001C373.6 182.8000000000001 432 203.1000000000001 496 204.4C493.4 256.3000000000001 474.9 307.5 439.9 349.9000000000001L282 192L328.3 145.7zM248 158L90.1 0.1C132.5 -34.8 183.7 -53.4 235.6 -56C236.9 8 257.2 66.4 294.3 111.7L248 158zM439.9 34.1C469.6 70.1 487.4 112.5 493.7 156.3C443.6 154.7 398.2 139.2 362.5 111.5L439.9 34.1zM167.7 238.3C122.3 201.1 63.9 180.7 0 179.6C2.6 127.7000000000001 21.1 76.5 56.1 34.1L214 192L167.7 238.3zM283.7 -53.7C327.5 -47.4 369.9 -29.6 405.9 0.1L328.5 77.5C300.8 41.8 285.3 -3.7 283.7 -53.7z" />
-    <glyph glyph-name="bath"
-      unicode="&#xF2CD;"
-      horiz-adv-x="512" d=" M488 192H80V336C80 353.645 94.355 368 112 368C123.351 368 133.332 362.055 139.015 353.12C122.523 327.913 124.328 293.544 145.853 270.0850000000001C141.677 265.372 141.832 258.169 146.344 253.657L157.658 242.343C162.344 237.657 169.942 237.657 174.629 242.343L269.659 337.372C274.345 342.058 274.345 349.656 269.659 354.343L258.345 365.6570000000001C253.833 370.169 246.63 370.323 241.917 366.148C223.968 382.617 199.623 387.577 177.739 381.5130000000001C163.281 402.333 139.212 416 112 416C67.888 416 32 380.112 32 336V192H24C10.745 192 0 181.255 0 168V152C0 138.745 10.745 128 24 128H32V96C32 67.57 44.362 42.031 64 24.453V-8C64 -21.255 74.745 -32 88 -32H104C117.255 -32 128 -21.255 128 -8V0H384V-8C384 -21.255 394.745 -32 408 -32H424C437.255 -32 448 -21.255 448 -8V24.453C467.638 42.031 480 67.57 480 96V128H488C501.255 128 512 138.745 512 152V168C512 181.255 501.255 192 488 192z" />
-    <glyph glyph-name="battery-empty"
-      unicode="&#xF244;"
-      horiz-adv-x="640" d=" M544 288V224H576V160H544V96H64V288H544M560 352H48C21.49 352 0 330.51 0 304V80C0 53.49 21.49 32 48 32H560C586.51 32 608 53.49 608 80V96H616C629.255 96 640 106.745 640 120V264C640 277.255 629.255 288 616 288H608V304C608 330.51 586.51 352 560 352z" />
-    <glyph glyph-name="battery-full"
-      unicode="&#xF240;"
-      horiz-adv-x="640" d=" M544 288V224H576V160H544V96H64V288H544M560 352H48C21.49 352 0 330.51 0 304V80C0 53.49 21.49 32 48 32H560C586.51 32 608 53.49 608 80V96H616C629.255 96 640 106.745 640 120V264C640 277.255 629.255 288 616 288H608V304C608 330.51 586.51 352 560 352zM512 256H96V128H512V256z" />
-    <glyph glyph-name="battery-half"
-      unicode="&#xF242;"
-      horiz-adv-x="640" d=" M544 288V224H576V160H544V96H64V288H544M560 352H48C21.49 352 0 330.51 0 304V80C0 53.49 21.49 32 48 32H560C586.51 32 608 53.49 608 80V96H616C629.255 96 640 106.745 640 120V264C640 277.255 629.255 288 616 288H608V304C608 330.51 586.51 352 560 352zM320 256H96V128H320V256z" />
-    <glyph glyph-name="battery-quarter"
-      unicode="&#xF243;"
-      horiz-adv-x="640" d=" M544 288V224H576V160H544V96H64V288H544M560 352H48C21.49 352 0 330.51 0 304V80C0 53.49 21.49 32 48 32H560C586.51 32 608 53.49 608 80V96H616C629.255 96 640 106.745 640 120V264C640 277.255 629.255 288 616 288H608V304C608 330.51 586.51 352 560 352zM224 256H96V128H224V256z" />
-    <glyph glyph-name="battery-three-quarters"
-      unicode="&#xF241;"
-      horiz-adv-x="640" d=" M544 288V224H576V160H544V96H64V288H544M560 352H48C21.49 352 0 330.51 0 304V80C0 53.49 21.49 32 48 32H560C586.51 32 608 53.49 608 80V96H616C629.255 96 640 106.745 640 120V264C640 277.255 629.255 288 616 288H608V304C608 330.51 586.51 352 560 352zM416 256H96V128H416V256z" />
-    <glyph glyph-name="bed"
-      unicode="&#xF236;"
-      horiz-adv-x="640" d=" M176 192C220.11 192 256 227.89 256 272S220.11 352 176 352S96 316.11 96 272S131.89 192 176 192zM528 320H304C295.1600000000001 320 288 312.8400000000001 288 304V160H64V368C64 376.8400000000001 56.84 384 48 384H16C7.16 384 0 376.8400000000001 0 368V16C0 7.16 7.16 0 16 0H48C56.84 0 64 7.16 64 16V64H576V16C576 7.16 583.16 0 592 0H624C632.84 0 640 7.16 640 16V208C640 269.86 589.86 320 528 320z" />
-    <glyph glyph-name="beer"
-      unicode="&#xF0FC;"
-      horiz-adv-x="448" d=" M368 352H320V392C320 405.255 309.255 416 296 416H24C10.745 416 0 405.255 0 392V-8C0 -21.255 10.745 -32 24 -32H296C309.255 -32 320 -21.255 320 -8V34.11L400.606 70.087C429.396 82.937 448 111.612 448 143.14V272C448 316.112 412.112 352 368 352zM384 143.14A16.018 16.018 0 0 0 374.521 128.529L320 104.195V288H368C376.822 288 384 280.822 384 272V143.14zM208 64C199.164 64 192 71.164 192 80V304C192 312.836 199.164 320 208 320S224 312.836 224 304V80C224 71.164 216.836 64 208 64zM112 64C103.164 64 96 71.164 96 80V304C96 312.836 103.164 320 112 320S128 312.836 128 304V80C128 71.164 120.836 64 112 64z" />
-    <glyph glyph-name="bell-slash"
-      unicode="&#xF1F6;"
-      horiz-adv-x="576" d=" M78.107 81.941C47.958 51.792 69.325 0 112.048 0H224C224 -35.346 252.654 -64 288 -64C323.346 -64 352 -35.346 352 0H384.685L127.848 226.621C125.65 129.543 99.409 103.243 78.107 81.941zM264 0C264 -13.234 274.766 -24 288 -24A8 8 0 0 0 288 -40C265.944 -40 248 -22.056 248 0H264zM569.896 -43.733L559.134 -55.819C550.219 -65.831 534.801 -66.7860000000001 524.697 -57.952L8.256 393.607C-1.848 402.442 -2.811 417.7200000000001 6.104 427.733L16.865 439.819C25.781 449.831 41.199 450.786 51.303 441.951L165.113 342.439C189.13 371.217 223.059 391.435 261.663 397.829A31.85 31.85 0 0 0 256 416C256 433.673 270.327 448 288 448S320 433.673 320 416C320 409.25 317.905 402.992 314.337 397.83C390.169 385.269 448 319.394 448 240C448 131.882 475.634 104.191 497.884 81.941C510.033 69.792 513.807 54.165 511.214 39.8200000000001L567.744 -9.607C577.8480000000001 -18.4419999999999 578.811 -33.72 569.8960000000001 -43.7329999999999z" />
-    <glyph glyph-name="bell"
-      unicode="&#xF0F3;"
-      horiz-adv-x="448" d=" M433.884 81.941C411.634 104.191 384 131.882 384 240C384 319.394 326.169 385.269 250.337 397.8300000000001A31.845000000000002 31.845000000000002 0 0 1 256 416C256 433.673 241.673 448 224 448S192 433.673 192 416C192 409.25 194.095 402.992 197.663 397.83C121.831 385.269 64 319.394 64 240C64 131.882 36.357 104.191 14.107 81.941C-16.042 51.792 5.325 0 48.048 0H160C160 -35.346 188.654 -64 224 -64S288 -35.346 288 0H399.943C442.581 0 464.094 51.731 433.884 81.941zM224 -24A8 8 0 0 0 224 -40C201.944 -40 184 -22.056 184 0H200C200 -13.234 210.766 -24 224 -24z" />
-    <glyph glyph-name="bezier-curve"
-      unicode="&#xF55B;"
-      horiz-adv-x="640" d=" M368 416H272C254.33 416 240 401.67 240 384V288C240 270.33 254.33 256 272 256H368C385.67 256 400 270.3300000000001 400 288V384C400 401.67 385.67 416 368 416zM208 360H123.25C113.75 383.44 90.84 400 64 400C28.66 400 0 371.35 0 336S28.66 272 64 272C90.84 272 113.75 288.56 123.25 312H202.98C147.61 279.48 107.12 224.68 93.44 160H142.84C154.14 201.61 179.61 237.21 213.88 261.56C210.18 269.64 208 278.55 208 288V360zM160 128H64C46.33 128 32 113.67 32 96V0C32 -17.67 46.33 -32 64 -32H160C177.67 -32 192 -17.67 192 0V96C192 113.67 177.67 128 160 128zM576 400C549.16 400 526.25 383.44 516.75 360H432V288C432 278.55 429.81 269.64 426.12 261.56C460.39 237.21 485.86 201.61 497.16 160H546.5600000000001C532.8800000000001 224.68 492.39 279.48 437.0200000000001 312H516.75C526.25 288.56 549.16 272 576 272C611.34 272 640 300.65 640 336S611.34 400 576 400zM576 128H480C462.33 128 448 113.67 448 96V0C448 -17.67 462.33 -32 480 -32H576C593.67 -32 608 -17.67 608 0V96C608 113.67 593.67 128 576 128z" />
-    <glyph glyph-name="bicycle"
-      unicode="&#xF206;"
-      horiz-adv-x="640" d=" M512.509 255.999C496.136 256.063 480.479 253.044 466.073 247.504L388.3930000000001 372.657A24 24 0 0 1 368.001 384H304.001C295.164 384 288.001 376.837 288.001 368V352C288.001 343.163 295.164 336 304.001 336H354.65L369.546 312H256.002V328C256.002 336.837 248.839 344 240.002 344H152.543C139.102 344 127.766 333.001 128.007 319.563C128.239 306.519 138.883 296 152.002 296H200.728L171.311 248.48C157.878 253.31 143.407 255.963 128.319 256C58.094 256.17 0.412 198.988 0.002 128.764C-0.413 57.721 57.055 0 128.002 0C187.644 0 237.76 40.793 251.969 96H304.002A24 24 0 0 1 324.408 107.367L410.37 246.23L425.308 222.163C399.853 198.715 383.923 165.082 384.001 127.726C384.146 58.893 441.9 0.675 510.73 0.007C581.336 -0.678 638.911 55.81 639.9849999999999 126.003C641.0709999999999 196.944 583.459 255.723 512.5089999999999 255.999zM186.75 182.228C196.477 171.699 203.423 158.567 206.392 144H163.086L186.75 182.228zM128.002 48C83.89 48 48.002 83.888 48.002 128S83.89 208 128.002 208C133.871 208 139.588 207.347 145.101 206.141L99.596 132.632C89.715 116.673 101.213 96 120.002 96H201.302C188.932 67.775 160.74 48 128.002 48zM290.632 144H255.008C251.048 175.756 235.452 203.894 212.625 224.026L237.371 264H364.918L290.632 144zM507.689 48.114C466.653 50.2790000000001 433.64 83.806 432.062 124.869C431.25 145.99 438.695 165.3870000000001 451.3969999999999 180.132L495.8299999999999 108.546C500.49 101.038 510.3539999999999 98.73 517.862 103.39L531.456 111.827C538.964 116.487 541.273 126.351 536.612 133.859L492.1439999999999 205.502A79.901 79.901 0 0 0 512.002 207.999C556.1139999999999 207.999 592.002 172.111 592.002 127.999C592.001 82.459 553.75 45.683 507.689 48.114z" />
-    <glyph glyph-name="binoculars"
-      unicode="&#xF1E5;"
-      horiz-adv-x="512" d=" M192 344H96V392C96 405.255 106.745 416 120 416H168C181.255 416 192 405.255 192 392V344zM416 392C416 405.255 405.255 416 392 416H344C330.745 416 320 405.255 320 392V344H416V392zM0 -8C0 -21.255 10.745 -32 24 -32H144C157.255 -32 168 -21.255 168 -8V8H0V-8zM88 320C74.745 320 64 309.255 64 296C64 192 0 176 0 32H168V136C168 149.255 178.745 160 192 160V320H88zM344 -8C344 -21.255 354.745 -32 368 -32H488C501.255 -32 512 -21.255 512 -8V8H344V-8zM216 320V160H296V320H216zM344 32H512C512 176 448 192 448 296C448 309.255 437.255 320 424 320H320V160C333.255 160 344 149.255 344 136V32z" />
-    <glyph glyph-name="birthday-cake"
-      unicode="&#xF1FD;"
-      horiz-adv-x="448" d=" M448 64C419.98 64 416.74 96 373.5 96C330.07 96 326.675 64 298.75 64C271.055 64 267.296 96 224 96C181.158 96 176.782 64 149.5 64C121.352 64 118.298 96 74.75 96C31.203 96 28.097 64 0 64V144C0 170.5 21.5 192 48 192H64V336H128V192H192V336H256V192H320V336H384V192H400C426.5 192 448 170.5 448 144V64zM448 -64H0V32C43.356 32 46.767 64 74.75 64C102.701 64 106.003 32 149.5 32C192.343 32 196.717 64 224 64C252.148 64 255.201 32 298.75 32C342.107 32 345.517 64 373.5 64C400.988 64 404.752 32 448 32V-64zM96 352C78.25 352 64 366.25 64 384C64 415 96 407 96 448C108 448 128 418.5 128 392S113.75 352 96 352zM224 352C206.25 352 192 366.25 192 384C192 415 224 407 224 448C236 448 256 418.5 256 392S241.75 352 224 352zM352 352C334.25 352 320 366.25 320 384C320 415 352 407 352 448C364 448 384 418.5 384 392S369.75 352 352 352z" />
-    <glyph glyph-name="blender"
-      unicode="&#xF517;"
-      horiz-adv-x="512" d=" M416 64H160C124.65 64 96 35.35 96 0V-32C96 -49.67 110.33 -64 128 -64H448C465.67 -64 480 -49.67 480 -32V0C480 35.35 451.35 64 416 64zM288 -32C270.33 -32 256 -17.67 256 0S270.33 32 288 32S320 17.67 320 0S305.67 -32 288 -32zM328 384H494.54L512 448H48C21.49 448 0 426.51 0 400V240C0 213.49 21.49 192 48 192H151.27L160 96H416L433.46 160H328C323.58 160 320 163.58 320 168V184C320 188.42 323.58 192 328 192H442.18L459.64 256H328C323.58 256 320 259.5800000000001 320 264V280C320 284.42 323.58 288 328 288H468.36L485.82 352H328C323.58 352 320 355.58 320 360V376C320 380.42 323.58 384 328 384zM64 256V384H133.82L145.46 256H64z" />
-    <glyph glyph-name="blind"
-      unicode="&#xF29D;"
-      horiz-adv-x="384" d=" M380.15 -62.837A8 8 0 0 0 369.161 -60.15L243.831 146.2770000000001A31.923 31.923 0 0 1 256.7890000000001 155.7620000000001L382.8370000000001 -51.8459999999999A8 8 0 0 0 380.1500000000001 -62.8369999999999zM142.803 133.662L110.263 44.177L146.383 -44.1080000000001C153.076 -60.4680000000001 171.76 -68.3000000000001 188.116 -61.609C204.473 -54.917 212.309 -36.2330000000001 205.617 -19.8750000000001L142.803 133.6619999999999zM96 360C120.301 360 140 379.699 140 404S120.301 448 96 448S52 428.301 52 404S71.699 360 96 360zM250.837 190.872L130.837 342.872C126.104 348.867 119.087 351.98 112 351.9840000000001V352H80V351.974C72.854 351.971 65.783 348.813 61.056 342.7340000000001L0 264.2340000000001V168.54C0 155.085 11.011 143.749 24.464 144.004C37.505 144.252 48 154.9 48 168V247.766L64 268.337V127.639L9.927 -21.055C3.887 -37.664 12.455 -56.024 29.065 -62.064C45.667 -68.1030000000001 64.033 -59.54 70.074 -42.926L136 138.362V245.559L104.594 285.375A4 4 0 1 0 110.863 290.346L213.163 161.129C222.308 149.545 237.531 149.79 246.871 157.1640000000001C257.281 165.3800000000001 259.0300000000001 180.4980000000001 250.837 190.8720000000001z" />
-    <glyph glyph-name="bold"
-      unicode="&#xF032;"
-      horiz-adv-x="384" d=" M304.793 204.109C338.432 222.646 358.45 258.269 358.45 299.802C358.45 348.038 332.2 387.428 289.824 403.981C265.138 413.99 240.849 416 209.661 416H24C15.163 416 8 408.837 8 400V366.951C8 358.114 15.163 350.951 24 350.951H57.113V32.4210000000001H24C15.163 32.4210000000001 8 25.258 8 16.4210000000001V-16C8 -24.837 15.163 -32 24 -32H219.69C243.893 -32 264.524 -30.711 286.556 -24.416C337.52 -9.193 376 37.353 376 97.986C376 150.154 349.427 189.67 304.793 204.109zM142.217 347.1910000000001H209.661C225.955 347.1910000000001 237.197 345.1720000000001 247.186 340.474C263.014 331.995 272.092 313.972 272.092 291.028C272.092 255.999 251.772 234.2380000000001 219.063 234.2380000000001H142.217V347.1910000000001zM254.859 41.716C244.719 37.66 232.182 36.809 223.45 36.809H142.217V166.057H226.584C266.229 166.057 289.641 140.677 289.641 103C289.642 74.575 275.981 50.517 254.8590000000001 41.716z" />
-    <glyph glyph-name="bolt"
-      unicode="&#xF0E7;"
-      horiz-adv-x="320" d=" M295.973 288H180.572L215.19 417.816C219.25 433.044 207.756 448 192 448H56C43.971 448 33.8 439.0950000000001 32.211 427.1720000000001L0.215 187.172C-1.704 172.783 9.504 160 24.004 160H142.705L96.646 -34.466C93.05 -49.649 104.659 -64 119.992 -64C128.342 -64 136.368 -59.626 140.77 -52.022L316.7430000000001 251.975C325.9870000000001 267.942 314.4550000000001 288 295.9730000000001 288z" />
-    <glyph glyph-name="bomb"
-      unicode="&#xF1E2;"
-      horiz-adv-x="512" d=" M440.5 359.5L388.5 307.5L415 281C424.4 271.6 424.4 256.4 415 247.1L397.6 229.7C409.4000000000001 203.6 416 174.6 416 144.1C416 29.2 322.9 -63.9 208 -63.9S0 29.1 0 144S93.1 352 208 352C238.5 352 267.5 345.4 293.6 333.6L311 351C320.4 360.4 335.6 360.4 344.9 351L371.4 324.5L423.4 376.5L440.5 359.5zM500 388H476C469.4 388 464 382.6 464 376S469.4 364 476 364H500C506.6 364 512 369.4 512 376S506.6 388 500 388zM440 448C433.4 448 428 442.6 428 436V412C428 405.4 433.4 400 440 400S452 405.4 452 412V436C452 442.6 446.6 448 440 448zM473.9 393L490.9 410C495.6 414.7 495.6 422.3 490.9 427C486.2 431.7 478.6 431.7 473.9 427L456.9 410C452.2 405.3 452.2 397.7 456.9 393C461.7 388.3 469.3 388.3 473.9 393zM406.1 393C410.8 388.3 418.4 388.3 423.1 393C427.8 397.7 427.8 405.3 423.1 410L406.1 427C401.4 431.7 393.8 431.7 389.1 427C384.4 422.3 384.4 414.7 389.1 410L406.1 393zM473.9 359C469.2 363.7 461.6 363.7 456.9 359C452.2 354.3 452.2 346.7 456.9 342L473.9 325C478.6 320.3 486.2 320.3 490.9 325C495.6 329.7 495.6 337.3 490.9 342L473.9 359zM112 176C112 211.3 140.7 240 176 240C184.8 240 192 247.2 192 256S184.8 272 176 272C123.1 272 80 228.9 80 176C80 167.2 87.2 160 96 160S112 167.2 112 176z" />
-    <glyph glyph-name="bong"
-      unicode="&#xF55C;"
-      horiz-adv-x="448" d=" M302.5 -64C325.68 -64 346.93 -51.42 358.5 -31.34C374.69 -3.26 384 29.25 384 64C384 100.12 373.92 133.81 356.56 162.62L400 206.06L409.38 196.68C415.63 190.43 425.76 190.43 432.01 196.68L443.31 208C449.56 214.25 449.56 224.38 443.31 230.63L390.62 283.32C384.37 289.57 374.24 289.57 367.99 283.32L356.68 272.01C350.43 265.76 350.43 255.63 356.68 249.38L366.06 240L326.65 200.59C315.09 211.96 302.12 221.92 288 230.1V384.26L303.9700000000001 384.28C312.79 384.29 319.9400000000001 391.44 319.9500000000001 400.26L319.9900000000001 431.98C320 440.83 312.82 448.01 303.9700000000001 448L80.03 447.74C71.21 447.73 64.06 440.58 64.05 431.76L64.01 400.03C64 391.18 71.18 384.01 80.03 384.02L96 384.04V230.11C38.67 196.9 0 135.03 0 64C0 29.25 9.31 -3.27 25.5 -31.34C37.08 -51.42 58.33 -64 81.5 -64H302.5zM120.06 188.57L144 202.44V384.0900000000001L240 384.2V202.44L263.94 188.57C288.75 174.2 308.06 152.84 320.5 128H63.5C75.95 152.84 95.25 174.2 120.06 188.57z" />
-    <glyph glyph-name="book-open"
-      unicode="&#xF518;"
-      horiz-adv-x="576" d=" M542.22 415.95C487.42 412.8400000000001 378.5 401.52 311.26 360.36C306.62 357.52 303.99 352.4700000000001 303.99 347.19V-16.68C303.99 -28.23 316.62 -35.53 327.27 -30.17C396.45 4.65 496.5 14.15 545.97 16.75C562.86 17.64 575.99 31.18 575.99 47.41V385.25C576 402.96 560.64 416.99 542.22 415.95zM264.73 360.36C197.5 401.52 88.58 412.83 33.78 415.95C15.36 416.99 0 402.96 0 385.25V47.4C0 31.16 13.13 17.62 30.02 16.74C79.51 14.1399999999999 179.61 4.6299999999999 248.79 -30.21C259.4100000000001 -35.5600000000001 272 -28.27 272 -16.7500000000001V347.37C272 352.6600000000001 269.38 357.51 264.73 360.36z" />
-    <glyph glyph-name="book"
-      unicode="&#xF02D;"
-      horiz-adv-x="448" d=" M448 88V424C448 437.3 437.3 448 424 448H96C43 448 0 405 0 352V32C0 -21 43 -64 96 -64H424C437.3 -64 448 -53.3 448 -40V-24C448 -16.5 444.5 -9.7 439.1 -5.3C434.9000000000001 10.1 434.9000000000001 54 439.1 69.4C444.5 73.7 448 80.5 448 88zM128 314C128 317.3 130.7 320 134 320H346C349.3 320 352 317.3 352 314V294C352 290.7 349.3 288 346 288H134C130.7 288 128 290.7 128 294V314zM128 250C128 253.3 130.7 256 134 256H346C349.3 256 352 253.3 352 250V230C352 226.7 349.3 224 346 224H134C130.7 224 128 226.7 128 230V250zM381.4 0H96C78.3 0 64 14.3 64 32C64 49.6 78.4 64 96 64H381.4C379.5 46.9 379.5 17.1 381.4 0z" />
-    <glyph glyph-name="bookmark"
-      unicode="&#xF02E;"
-      horiz-adv-x="384" d=" M0 -64V400C0 426.51 21.49 448 48 448H336C362.51 448 384 426.51 384 400V-64L192 48L0 -64z" />
-    <glyph glyph-name="bowling-ball"
-      unicode="&#xF436;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM120 256C102.3 256 88 270.3 88 288S102.3 320 120 320S152 305.7 152 288S137.7 256 120 256zM184 352C184 369.7 198.3 384 216 384S248 369.7 248 352S233.7 320 216 320S184 334.3 184 352zM232 208C214.3 208 200 222.3 200 240S214.3 272 232 272S264 257.7 264 240S249.7 208 232 208z" />
-    <glyph glyph-name="box-open"
-      unicode="&#xF49E;"
-      horiz-adv-x="640" d=" M53.2 407L1.7 304.2C-2.9 295 2 284 11.8 281.2L209.7 224.7C216.8 222.7 224.4 225.7 228.2 232L320 384L69.8 415.9C62.9 416.7 56.3 413.2 53.2 407zM638.3000000000001 304.2L586.8 407C583.6999999999999 413.2 577 416.8 570.0999999999999 415.9L320 384L411.7 231.9C415.5 225.6 423.1 222.6 430.2 224.6L628.1 281.1C638 284 642.8000000000001 295 638.3000000000001 304.2zM425.7 192C408.8 192 392.9 201 384.3 215.4L320 322L255.8 215.4C247.1 200.9 231.2 191.9 214.3 191.9C209.8 191.9 205.3 192.5 201 193.8L64 233V55C64 40.3 74 27.5 88.2 24L304.4 -30.1C314.6 -32.6 325.3 -32.6 335.4 -30.1L551.8 24C566 27.6 576 40.4 576 55V233L439 193.9C434.7 192.6 430.2 192 425.7 192z" />
-    <glyph glyph-name="box"
-      unicode="&#xF466;"
-      horiz-adv-x="512" d=" M509.5 263.4L458.9 415.2C452.4 434.8 434.1 448 413.4 448H272V256H510.7C510.3 258.5 510.3 261 509.5 263.4zM240 448H98.6C77.9 448 59.6 434.8 53.1 415.2L2.5 263.4C1.7 261 1.7 258.5 1.3 256H240V448zM0 224V-16C0 -42.5 21.5 -64 48 -64H464C490.5 -64 512 -42.5 512 -16V224H0z" />
-    <glyph glyph-name="boxes"
-      unicode="&#xF468;"
-      horiz-adv-x="576" d=" M560 160H480V64L448 85.3L416 64V160H336C327.2 160 320 152.8 320 144V-48C320 -56.8 327.2 -64 336 -64H560C568.8 -64 576 -56.8 576 -48V144C576 152.8 568.8 160 560 160zM176 224H400C408.8 224 416 231.2 416 240V432C416 440.8 408.8 448 400 448H320V352L288 373.3L256 352V448H176C167.2 448 160 440.8 160 432V240C160 231.2 167.2 224 176 224zM240 160H160V64L128 85.3L96 64V160H16C7.2 160 0 152.8 0 144V-48C0 -56.8 7.2 -64 16 -64H240C248.8 -64 256 -56.8 256 -48V144C256 152.8 248.8 160 240 160z" />
-    <glyph glyph-name="braille"
-      unicode="&#xF2A1;"
-      horiz-adv-x="640" d=" M128 192C128 156.654 99.346 128 64 128S0 156.654 0 192S28.654 256 64 256S128 227.346 128 192zM64 64C46.327 64 32 49.673 32 32S46.327 0 64 0S96 14.327 96 32S81.673 64 64 64zM64 416C28.654 416 0 387.346 0 352S28.654 288 64 288S128 316.654 128 352S99.346 416 64 416zM224 224C206.327 224 192 209.673 192 192S206.327 160 224 160S256 174.327 256 192S241.673 224 224 224zM224 64C206.327 64 192 49.673 192 32S206.327 0 224 0S256 14.327 256 32S241.673 64 224 64zM224 416C188.654 416 160 387.346 160 352S188.654 288 224 288S288 316.654 288 352S259.346 416 224 416zM448 224C430.327 224 416 209.673 416 192S430.327 160 448 160S480 174.327 480 192S465.673 224 448 224zM448 64C430.327 64 416 49.673 416 32S430.327 0 448 0S480 14.327 480 32S465.673 64 448 64zM448 416C412.654 416 384 387.346 384 352S412.654 288 448 288S512 316.654 512 352S483.346 416 448 416zM608 224C590.327 224 576 209.673 576 192S590.327 160 608 160S640 174.327 640 192S625.673 224 608 224zM608 64C590.327 64 576 49.673 576 32S590.327 0 608 0S640 14.327 640 32S625.673 64 608 64zM608 384C590.327 384 576 369.673 576 352S590.327 320 608 320S640 334.327 640 352S625.673 384 608 384z" />
-    <glyph glyph-name="briefcase-medical"
-      unicode="&#xF469;"
-      horiz-adv-x="512" d=" M464 320H384V368C384 394.5 362.5 416 336 416H176C149.5 416 128 394.5 128 368V320H48C21.5 320 0 298.5 0 272V-16C0 -42.5 21.5 -64 48 -64H464C490.5 -64 512 -42.5 512 -16V272C512 298.5 490.5 320 464 320zM192 352H320V320H192V352zM352 104C352 99.6 348.4 96 344 96H288V40C288 35.6 284.4 32 280 32H232C227.6 32 224 35.6 224 40V96H168C163.6 96 160 99.6 160 104V152C160 156.4 163.6 160 168 160H224V216C224 220.4 227.6 224 232 224H280C284.4 224 288 220.4 288 216V160H344C348.4 160 352 156.4 352 152V104z" />
-    <glyph glyph-name="briefcase"
-      unicode="&#xF0B1;"
-      horiz-adv-x="512" d=" M320 160H512V16C512 -10.51 490.51 -32 464 -32H48C21.49 -32 0 -10.51 0 16V160H192V140C192 133.373 197.373 128 204 128H308C314.627 128 320 133.373 320 140V160zM512 272V192H0V272C0 298.51 21.49 320 48 320H128V368C128 394.51 149.49 416 176 416H336C362.51 416 384 394.51 384 368V320H464C490.51 320 512 298.51 512 272zM320 352H192V320H320V352z" />
-    <glyph glyph-name="broadcast-tower"
-      unicode="&#xF519;"
-      horiz-adv-x="640" d=" M150.94 256H184.67C195.68 256 203.28 266.8300000000001 199.53 277.18C194.6 290.76 191.98 305.16 191.98 320S194.6 349.24 199.53 362.82C203.29 373.17 195.68 384 184.67 384H150.94C143.93 384 137.48 379.51 135.53 372.77C130.64 355.79 128 338.12 128 320C128 301.88 130.64 284.2100000000001 135.54 267.24C137.48 260.5 143.93 256 150.94 256zM89.92 424.6600000000001C95.56 435.28 87.97 448 75.96 448H40.63C34.36 448 28.49 444.4100000000001 25.89 438.69C9.4 402.46 0 362.35 0 320C0 295.25 3.12 251.67 26.69 201.14C29.31 195.51 35.11 192 41.3 192H76.14C88.16 192 95.75 204.74 90.09 215.37C40.31 308.69 73.38 393.52 89.92 424.66zM614.06 438.71C611.46 444.42 605.6 448 599.33 448H563.9100000000001C551.9300000000001 448 544.2500000000001 435.34 549.8900000000001 424.75C568.1600000000001 390.46 598.3100000000001 305.33 550.1700000000001 215.52C544.45 204.84 551.97 192 564.08 192H599.3100000000001C605.58 192 611.44 195.58 614.0400000000001 201.29C630.57 237.52 640 277.64 640 320S630.58 402.48 614.06 438.71zM489.06 384H455.33C444.32 384 436.72 373.17 440.47 362.82C445.4 349.24 448.02 334.84 448.02 320S445.4 290.76 440.47 277.18C436.71 266.8300000000001 444.32 256 455.33 256H489.06C496.08 256 502.52 260.49 504.47 267.24C509.37 284.2100000000001 512 301.88 512 320C512 338.12 509.36 355.79 504.46 372.76C502.52 379.51 496.07 384 489.06 384zM372.76 283.88C379.81 294.17 383.96 306.5900000000001 383.96 320C383.96 355.35 355.33 384 320 384C284.68 384 256.04 355.35 256.04 320C256.04 306.5900000000001 260.19 294.17 267.24 283.88L136.74 -29.53C133.34 -37.68 137.2 -47.05 145.35 -50.45L174.86 -62.76C183.01 -66.1600000000001 192.38 -62.3000000000001 195.77 -54.15L244.96 64H395.03L444.23 -54.15C447.63 -62.31 456.99 -66.16 465.14 -62.76L494.65 -50.45C502.8 -47.05 506.65 -37.68 503.26 -29.53L372.76 283.8800000000001zM271.62 128L320 244.19L368.38 128H271.62z" />
-    <glyph glyph-name="broom"
-      unicode="&#xF51A;"
-      horiz-adv-x="512" d=" M10.8 200.8C-0.7 196.2 -3.7 181.3 5 172.6L59.8 117.8L133 142.2L108.6 69L236.6 -59C245.4 -67.7999999999999 260.2 -64.7 264.8 -53.2L362.9 190.5L254.5 298.9L10.8 200.8zM507.3 420.7L484.7 443.3C478.5 449.6 468.3 449.6 462.1 443.3L359.8 341.1L319.4000000000001 381.5C315.2000000000001 385.8 308.0000000000001 384.5 305.5000000000001 379L278.3000000000001 320.4L384.4000000000001 214.3L443.0000000000001 241.5C448.4000000000001 244 449.7000000000001 251.2 445.5000000000001 255.4L405.1000000000002 295.8L507.3 398.1C513.6 404.3 513.6 414.4 507.3 420.7z" />
-    <glyph glyph-name="brush"
-      unicode="&#xF55D;"
-      horiz-adv-x="384" d=" M352 448H32C14.33 448 0 433.67 0 416V192H384V416C384 433.67 369.67 448 352 448zM0 128C0 92.65 28.66 64 64 64H128V0C128 -35.35 156.66 -64 192 -64S256 -35.35 256 0V64H320C355.3400000000001 64 384 92.65 384 128V160H0V128zM192 24C205.25 24 216 13.26 216 0C216 -13.25 205.25 -24 192 -24S168 -13.25 168 0C168 13.26 178.75 24 192 24z" />
-    <glyph glyph-name="bug"
-      unicode="&#xF188;"
-      horiz-adv-x="512" d=" M511.988 159.1C511.51 141.67 496.771 128 479.335 128H424V112C424 90.136 419.118 69.416 410.4 50.855L470.628 -9.373C483.124 -21.87 483.124 -42.131 470.628 -54.628C458.13 -67.125 437.869 -67.124 425.372 -54.628L370.636 0.108C345.886 -19.965 314.351 -32 280 -32V212C280 218.627 274.627 224 268 224H244C237.373 224 232 218.627 232 212V-32C197.649 -32 166.114 -19.965 141.364 0.108L86.628 -54.628C74.13 -67.125 53.869 -67.124 41.372 -54.628C28.876 -42.131 28.876 -21.87 41.372 -9.373L101.6 50.855C92.882 69.416 88 90.136 88 112V128H32.666C15.23 128 0.491 141.67 0.013 159.1C-0.484 177.184 14.028 192 32 192H88V250.745L41.372 297.373C28.876 309.87 28.876 330.131 41.372 342.628C53.87 355.125 74.13 355.125 86.628 342.628L141.255 288H370.7440000000001L425.3710000000001 342.627C437.8690000000001 355.124 458.129 355.124 470.6270000000001 342.627C483.123 330.13 483.123 309.8690000000001 470.6270000000001 297.372L424 250.745V192H480C497.972 192 512.484 177.184 511.988 159.1zM257 448C195.144 448 145 397.856 145 336H369C369 397.856 318.856 448 257 448z" />
-    <glyph glyph-name="building"
-      unicode="&#xF1AD;"
-      horiz-adv-x="448" d=" M436 -32H416V424C416 437.255 405.255 448 392 448H56C42.745 448 32 437.255 32 424V-32H12C5.373 -32 0 -37.373 0 -44V-64H448V-44C448 -37.373 442.627 -32 436 -32zM128 372C128 378.627 133.373 384 140 384H180C186.627 384 192 378.627 192 372V332C192 325.373 186.627 320 180 320H140C133.373 320 128 325.373 128 332V372zM128 276C128 282.627 133.373 288 140 288H180C186.627 288 192 282.627 192 276V236C192 229.373 186.627 224 180 224H140C133.373 224 128 229.373 128 236V276zM180 128H140C133.373 128 128 133.373 128 140V180C128 186.627 133.373 192 140 192H180C186.627 192 192 186.627 192 180V140C192 133.373 186.627 128 180 128zM256 -32H192V52C192 58.627 197.373 64 204 64H244C250.627 64 256 58.627 256 52V-32zM320 140C320 133.373 314.627 128 308 128H268C261.373 128 256 133.373 256 140V180C256 186.627 261.373 192 268 192H308C314.627 192 320 186.627 320 180V140zM320 236C320 229.373 314.627 224 308 224H268C261.373 224 256 229.373 256 236V276C256 282.627 261.373 288 268 288H308C314.627 288 320 282.627 320 276V236zM320 332C320 325.373 314.627 320 308 320H268C261.373 320 256 325.373 256 332V372C256 378.627 261.373 384 268 384H308C314.627 384 320 378.627 320 372V332z" />
-    <glyph glyph-name="bullhorn"
-      unicode="&#xF0A1;"
-      horiz-adv-x="576" d=" M576 224C576 244.896 562.64 262.666 544 269.2580000000001V384C544 419.346 515.346 448 480 448C415.015 392 337.969 320 208 320H48C21.49 320 0 298.51 0 272V176C0 149.49 21.49 128 48 128H91.263C72.521 63.35 93.742 11.621 110.077 -39.44C111.779 -44.76 115.28 -49.333 119.999 -52.32C140.779 -65.475 188.354 -67.977 213.772 -57.471C229.818 -50.838 233.732 -30.048 221.294 -17.934C202.786 0.092 191.158 18.976 201.499 42.924A12.278 12.278 0 0 1 200.454 54.597C184.145 79.276 196.873 116.704 228.971 127.349C346.403 120.113 418.591 52.919 480 0C515.346 0 544 28.654 544 64V178.742C562.64 185.334 576 203.104 576 224zM480 84.145C425.391 129.124 354.967 177.085 256 189.127V258.874C354.967 270.916 425.391 318.876 480 363.856V84.145z" />
-    <glyph glyph-name="bullseye"
-      unicode="&#xF140;"
-      horiz-adv-x="512" d=" M256 376C357.689 376 440 293.705 440 192C440 90.311 357.705 8 256 8C154.311 8 72 90.295 72 192C72 293.689 154.295 376 256 376M256 440C119.033 440 8 328.967 8 192S119.033 -56 256 -56S504 55.033 504 192S392.967 440 256 440zM256 256C291.29 256 320 227.29 320 192S291.29 128 256 128S192 156.71 192 192S220.71 256 256 256M256 320C185.308 320 128 262.692 128 192S185.308 64 256 64S384 121.308 384 192S326.692 320 256 320z" />
-    <glyph glyph-name="burn"
-      unicode="&#xF46A;"
-      horiz-adv-x="384" d=" M192 448C79.7 346.7 0 227.1 0 147.5C0 23 79 -64 192 -64S384 23 384 147.5C384 227.4 303.8 347.1 192 448zM192 0C135.5 0 96 39 96 94.8C96 108.3 100.6 156.3 192 256C283.4 156.3 288 108.3 288 94.8C288 39 248.5 0 192 0z" />
-    <glyph glyph-name="bus-alt"
-      unicode="&#xF55E;"
-      horiz-adv-x="512" d=" M488 320H480V368C480 412.8 380.8 448 256 448S32 412.8 32 368V320H24C10.75 320 0 309.26 0 296V216C0 202.75 10.75 192 24 192H32V32C32 14.33 46.33 0 64 0V-32C64 -49.67 78.33 -64 96 -64H128C145.67 -64 160 -49.67 160 -32V0H352V-32C352 -49.67 366.33 -64 384 -64H416C433.67 -64 448 -49.67 448 -32V0H454.4C470.4 0 480 12.8 480 25.6V192H488C501.25 192 512 202.75 512 216V296C512 309.26 501.25 320 488 320zM160 376C160 380.42 163.58 384 168 384H344C348.42 384 352 380.42 352 376V360C352 355.58 348.42 352 344 352H168C163.58 352 160 355.58 160 360V376zM112 48C94.33 48 80 62.33 80 80S94.33 112 112 112S144 97.67 144 80S129.67 48 112 48zM240 160H128C110.33 160 96 174.33 96 192V288C96 305.67 110.33 320 128 320H240V160zM272 160V320H384C401.67 320 416 305.67 416 288V192C416 174.33 401.67 160 384 160H272zM400 48C382.33 48 368 62.33 368 80S382.33 112 400 112S432 97.67 432 80S417.67 48 400 48z" />
-    <glyph glyph-name="bus"
-      unicode="&#xF207;"
-      horiz-adv-x="512" d=" M488 320H480V368C480 412.8 380.8 448 256 448S32 412.8 32 368V320H24C10.75 320 0 309.26 0 296V216C0 202.75 10.75 192 24 192H32V32C32 14.33 46.33 0 64 0V-32C64 -49.67 78.33 -64 96 -64H128C145.67 -64 160 -49.67 160 -32V0H352V-32C352 -49.67 366.33 -64 384 -64H416C433.67 -64 448 -49.67 448 -32V0H454.4C470.4 0 480 12.8 480 25.6V192H488C501.25 192 512 202.75 512 216V296C512 309.26 501.25 320 488 320zM112 48C94.33 48 80 62.33 80 80S94.33 112 112 112S144 97.67 144 80S129.67 48 112 48zM128 160C110.33 160 96 174.33 96 192V320C96 337.67 110.33 352 128 352H384C401.67 352 416 337.67 416 320V192C416 174.33 401.67 160 384 160H128zM400 48C382.33 48 368 62.33 368 80S382.33 112 400 112S432 97.67 432 80S417.67 48 400 48z" />
-    <glyph glyph-name="calculator"
-      unicode="&#xF1EC;"
-      horiz-adv-x="448" d=" M0 -16V400C0 426.51 21.49 448 48 448H400C426.51 448 448 426.51 448 400V-16C448 -42.51 426.51 -64 400 -64H48C21.49 -64 0 -42.51 0 -16zM384 268V372C384 378.627 378.627 384 372 384H76C69.373 384 64 378.627 64 372V268C64 261.373 69.373 256 76 256H372C378.627 256 384 261.373 384 268zM128 140V180C128 186.627 122.627 192 116 192H76C69.373 192 64 186.627 64 180V140C64 133.373 69.373 128 76 128H116C122.627 128 128 133.373 128 140zM384 12V180C384 186.627 378.627 192 372 192H332C325.373 192 320 186.627 320 180V12C320 5.373 325.373 0 332 0H372C378.627 0 384 5.373 384 12zM128 12V52C128 58.627 122.627 64 116 64H76C69.373 64 64 58.627 64 52V12C64 5.373 69.373 0 76 0H116C122.627 0 128 5.373 128 12zM256 140V180C256 186.627 250.627 192 244 192H204C197.373 192 192 186.627 192 180V140C192 133.373 197.373 128 204 128H244C250.627 128 256 133.373 256 140zM256 12V52C256 58.627 250.627 64 244 64H204C197.373 64 192 58.627 192 52V12C192 5.373 197.373 0 204 0H244C250.627 0 256 5.373 256 12z" />
-    <glyph glyph-name="calendar-alt"
-      unicode="&#xF073;"
-      horiz-adv-x="448" d=" M436 288H12C5.4 288 0 293.4 0 300V336C0 362.5 21.5 384 48 384H96V436C96 442.6 101.4 448 108 448H148C154.6 448 160 442.6 160 436V384H288V436C288 442.6 293.4 448 300 448H340C346.6 448 352 442.6 352 436V384H400C426.5 384 448 362.5 448 336V300C448 293.4 442.6 288 436 288zM12 256H436C442.6 256 448 250.6 448 244V-16C448 -42.5 426.5 -64 400 -64H48C21.5 -64 0 -42.5 0 -16V244C0 250.6 5.4 256 12 256zM128 52C128 58.6 122.6 64 116 64H76C69.4 64 64 58.6 64 52V12C64 5.4 69.4 0 76 0H116C122.6 0 128 5.4 128 12V52zM128 180C128 186.6 122.6 192 116 192H76C69.4 192 64 186.6 64 180V140C64 133.4 69.4 128 76 128H116C122.6 128 128 133.4 128 140V180zM256 52C256 58.6 250.6 64 244 64H204C197.4 64 192 58.6 192 52V12C192 5.4 197.4 0 204 0H244C250.6 0 256 5.4 256 12V52zM256 180C256 186.6 250.6 192 244 192H204C197.4 192 192 186.6 192 180V140C192 133.4 197.4 128 204 128H244C250.6 128 256 133.4 256 140V180zM384 52C384 58.6 378.6 64 372 64H332C325.4 64 320 58.6 320 52V12C320 5.4 325.4 0 332 0H372C378.6 0 384 5.4 384 12V52zM384 180C384 186.6 378.6 192 372 192H332C325.4 192 320 186.6 320 180V140C320 133.4 325.4 128 332 128H372C378.6 128 384 133.4 384 140V180z" />
-    <glyph glyph-name="calendar-check"
-      unicode="&#xF274;"
-      horiz-adv-x="448" d=" M436 288H12C5.373 288 0 293.373 0 300V336C0 362.51 21.49 384 48 384H96V436C96 442.627 101.373 448 108 448H148C154.627 448 160 442.627 160 436V384H288V436C288 442.627 293.373 448 300 448H340C346.627 448 352 442.627 352 436V384H400C426.51 384 448 362.51 448 336V300C448 293.373 442.627 288 436 288zM12 256H436C442.627 256 448 250.627 448 244V-16C448 -42.51 426.51 -64 400 -64H48C21.49 -64 0 -42.51 0 -16V244C0 250.627 5.373 256 12 256zM345.296 160.053L317.127 188.451C312.4600000000001 193.156 304.862 193.187 300.1570000000001 188.519L194.12 83.335L148.14 129.687C143.473 134.392 135.874 134.423 131.169 129.755L102.772 101.5849999999999C98.067 96.918 98.036 89.3199999999999 102.704 84.6149999999999L185.305 1.3459999999999C189.972 -3.3590000000001 197.57 -3.3900000000001 202.275 1.2779999999999L345.228 143.0829999999999C349.933 147.7499999999999 349.964 155.3479999999999 345.296 160.0529999999999z" />
-    <glyph glyph-name="calendar-minus"
-      unicode="&#xF272;"
-      horiz-adv-x="448" d=" M436 288H12C5.4 288 0 293.4 0 300V336C0 362.5 21.5 384 48 384H96V436C96 442.6 101.4 448 108 448H148C154.6 448 160 442.6 160 436V384H288V436C288 442.6 293.4 448 300 448H340C346.6 448 352 442.6 352 436V384H400C426.5 384 448 362.5 448 336V300C448 293.4 442.6 288 436 288zM12 256H436C442.6 256 448 250.6 448 244V-16C448 -42.5 426.5 -64 400 -64H48C21.5 -64 0 -42.5 0 -16V244C0 250.6 5.4 256 12 256zM316 64C322.6 64 328 69.4 328 76V116C328 122.6 322.6 128 316 128H132C125.4 128 120 122.6 120 116V76C120 69.4 125.4 64 132 64H316z" />
-    <glyph glyph-name="calendar-plus"
-      unicode="&#xF271;"
-      horiz-adv-x="448" d=" M436 288H12C5.4 288 0 293.4 0 300V336C0 362.5 21.5 384 48 384H96V436C96 442.6 101.4 448 108 448H148C154.6 448 160 442.6 160 436V384H288V436C288 442.6 293.4 448 300 448H340C346.6 448 352 442.6 352 436V384H400C426.5 384 448 362.5 448 336V300C448 293.4 442.6 288 436 288zM12 256H436C442.6 256 448 250.6 448 244V-16C448 -42.5 426.5 -64 400 -64H48C21.5 -64 0 -42.5 0 -16V244C0 250.6 5.4 256 12 256zM328 116C328 122.6 322.6 128 316 128H256V188C256 194.6 250.6 200 244 200H204C197.4 200 192 194.6 192 188V128H132C125.4 128 120 122.6 120 116V76C120 69.4 125.4 64 132 64H192V4C192 -2.6 197.4 -8 204 -8H244C250.6 -8 256 -2.6 256 4V64H316C322.6 64 328 69.4 328 76V116z" />
-    <glyph glyph-name="calendar-times"
-      unicode="&#xF273;"
-      horiz-adv-x="448" d=" M436 288H12C5.4 288 0 293.4 0 300V336C0 362.5 21.5 384 48 384H96V436C96 442.6 101.4 448 108 448H148C154.6 448 160 442.6 160 436V384H288V436C288 442.6 293.4 448 300 448H340C346.6 448 352 442.6 352 436V384H400C426.5 384 448 362.5 448 336V300C448 293.4 442.6 288 436 288zM12 256H436C442.6 256 448 250.6 448 244V-16C448 -42.5 426.5 -64 400 -64H48C21.5 -64 0 -42.5 0 -16V244C0 250.6 5.4 256 12 256zM269.3 96L317.4000000000001 144.1C322.1 148.8 322.1 156.4 317.4000000000001 161.1L289.1 189.4C284.4000000000001 194.1 276.8 194.1 272.1 189.4L224 141.3L175.9 189.4C171.2 194.1 163.6 194.1 158.9 189.4L130.6 161.1C125.9 156.4 125.9 148.8 130.6 144.1L178.7 96L130.6 47.9C125.9 43.2 125.9 35.6 130.6 30.9L158.9 2.6C163.6 -2.1 171.2 -2.1 175.9 2.6L224 50.7L272.1 2.6C276.8 -2.1 284.4000000000001 -2.1 289.1 2.6L317.4000000000001 30.9C322.1 35.6 322.1 43.2 317.4000000000001 47.9L269.3 96z" />
-    <glyph glyph-name="calendar"
-      unicode="&#xF133;"
-      horiz-adv-x="448" d=" M12 256H436C442.6 256 448 250.6 448 244V-16C448 -42.5 426.5 -64 400 -64H48C21.5 -64 0 -42.5 0 -16V244C0 250.6 5.4 256 12 256zM448 300V336C448 362.5 426.5 384 400 384H352V436C352 442.6 346.6 448 340 448H300C293.4 448 288 442.6 288 436V384H160V436C160 442.6 154.6 448 148 448H108C101.4 448 96 442.6 96 436V384H48C21.5 384 0 362.5 0 336V300C0 293.4 5.4 288 12 288H436C442.6 288 448 293.4 448 300z" />
-    <glyph glyph-name="camera-retro"
-      unicode="&#xF083;"
-      horiz-adv-x="512" d=" M48 416C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H464C490.5 -32 512 -10.5 512 16V368C512 394.5 490.5 416 464 416H48zM48 384H154C157.3 384 160 381.3 160 378V358C160 354.7 157.3 352 154 352H38C34.7 352 32 354.7 32 358V368C32 376.8 39.2 384 48 384zM474 288H38C34.7 288 32 290.7 32 294V330C32 333.3 34.7 336 38 336H176L206.2 381.3C207.3 383 209.2 384 211.2 384H464C472.8 384 480 376.8 480 368V294C480 290.7 477.3 288 474 288zM256 24C189.8 24 136 77.8 136 144S189.8 264 256 264S376 210.2 376 144S322.2 24 256 24zM256 232C207.5 232 168 192.5 168 144S207.5 56 256 56S344 95.5 344 144S304.5 232 256 232zM208 128C199.2 128 192 135.2 192 144C192 179.3 220.7 208 256 208C264.8 208 272 200.8 272 192S264.8 176 256 176C238.4 176 224 161.6 224 144C224 135.2 216.8 128 208 128z" />
-    <glyph glyph-name="camera"
-      unicode="&#xF030;"
-      horiz-adv-x="512" d=" M512 304V16C512 -10.5 490.5 -32 464 -32H48C21.5 -32 0 -10.5 0 16V304C0 330.5 21.5 352 48 352H136L148.3 384.9C155.3 403.6 173.2 416 193.2 416H318.7000000000001C338.7000000000001 416 356.6 403.6 363.6 384.9L376 352H464C490.5 352 512 330.5 512 304zM376 160C376 226.2 322.2 280 256 280S136 226.2 136 160S189.8 40 256 40S376 93.8 376 160zM344 160C344 111.5 304.5 72 256 72S168 111.5 168 160S207.5 248 256 248S344 208.5 344 160z" />
-    <glyph glyph-name="cannabis"
-      unicode="&#xF55F;"
-      horiz-adv-x="512" d=" M503.47 87.75C501.91 88.57 471.08 104.64 426.6900000000001 113.56C490.9400000000001 188.68 510.7400000000001 275.23 511.6200000000001 279.2C512.8000000000001 284.53 511.1800000000001 290.1 507.3200000000001 293.9700000000001C504.2900000000001 297.01 500.2 298.67 496.0000000000001 298.67C494.8600000000001 298.67 493.71 298.55 492.5600000000001 298.29C488.6800000000001 297.44 406.0200000000001 278.7 331.98 218.53C331.99 219.99 331.99 221.46 331.99 222.93C331.99 341.72 272.01 436.65 269.4600000000001 440.63A15.973000000000003 15.973000000000003 0 0 1 256 448C250.55 448 245.47 445.2200000000001 242.53 440.63C239.98 436.65 180 341.7200000000001 180 222.93C180 221.46 180.01 219.99 180.01 218.53C105.98 278.69 23.32 297.43 19.43 298.29C18.29 298.54 17.14 298.67 15.99 298.67C11.79 298.67 7.7 297.01 4.67 293.9700000000001A15.986 15.986 0 0 1 0.38 279.2C1.26 275.23 21.06 188.68 85.31 113.56C40.92 104.64 10.1 88.57 8.53 87.75A16.003 16.003 0 0 1 8.51 59.46C10.96 58.17 69.27 27.74 142 27.74C148.14 27.74 153.96 27.84 159.5 28.05C148.13 5.82 142.98 -10.26 142.69 -11.17C140.89 -16.85 142.4 -23.0599999999999 146.6 -27.28A16.019 16.019 0 0 1 162.7 -31.27C164.53 -30.7 200.42 -19.28 240 8.02V-56C240 -60.42 243.58 -64 248 -64H264C268.42 -64 272 -60.42 272 -56V8.01C311.58 -19.29 347.4700000000001 -30.7 349.3 -31.28A16.019 16.019 0 0 1 365.4000000000001 -27.29C369.6 -23.07 371.11 -16.86 369.3100000000001 -11.18C369.0200000000001 -10.27 363.8600000000001 5.81 352.5000000000001 28.04C358.0400000000001 27.83 363.8700000000001 27.73 370.0000000000001 27.73C442.7200000000001 27.73 501.0400000000001 58.16 503.4900000000001 59.4499999999999C508.7300000000001 62.2299999999999 512.0100000000001 67.67 512.0000000000001 73.5999999999999C511.9900000000001 79.5399999999999 508.7100000000001 84.9899999999999 503.4700000000001 87.7499999999999z" />
-    <glyph glyph-name="capsules"
-      unicode="&#xF46B;"
-      horiz-adv-x="576" d=" M555.3 147.9L424.2 335.2C401.9 367 366.4 384 330.4 384C307.8 384 284.9 377.3 264.9 363.3C245.2 349.5 231.2 330.5 223.4 309.5C220.5 368.8 172 416 112 416C50.1 416 0 365.9 0 304V80C0 18.1 50.1 -32 112 -32S224 18.1 224 80V229.1C227.3 220.5 231.3 212 236.8 204.1L368 16.8C390.2 -15 425.7 -32 461.8 -32C484.5 -32 507.3 -25.3 527.3 -11.3C579 24.9 591.5 96.2 555.3 147.9zM160 192H64V304C64 330.5 85.5 352 112 352S160 330.5 160 304V192zM354.8 147.1L289.2000000000001 240.8C281.5000000000001 251.8 278.5000000000001 265.2000000000001 280.9000000000001 278.4C283.2000000000001 291.6 290.6 303.2000000000001 301.6 310.9C310.1 316.9 320.1 320 330.4000000000001 320C346.9000000000001 320 362.3 312 371.7000000000001 298.5L437.3000000000001 204.8L354.8000000000001 147.1z" />
-    <glyph glyph-name="car"
-      unicode="&#xF1B9;"
-      horiz-adv-x="512" d=" M499.991 280H445.176L437.322 300.944C428.13 325.457 411.897 346.295 390.38 361.207S343.651 384 317.472 384H194.528C168.348 384 143.137 376.118 121.62 361.207C100.102 346.295 83.87 325.457 74.678 300.944L66.824 280H12.009C3.818 280 -1.965 271.976 0.625 264.2050000000001L8.625 240.205A12 12 0 0 1 20.009 232H48.824L48.772 231.86C29.222 220.907 16 200.003 16 176V128C16 111.775 22.049 96.971 32 85.691V24C32 10.745 42.745 0 56 0H104C117.255 0 128 10.745 128 24V64H384V24C384 10.745 394.745 0 408 0H456C469.255 0 480 10.745 480 24V85.691C489.951 96.972 496 111.776 496 128V176C496 200.003 482.778 220.907 463.228 231.86L463.176 232H491.991A12 12 0 0 1 503.375 240.205L511.375 264.2050000000001C513.965 271.976 508.182 280 499.991 280zM134.603 278.472C143.918 303.3110000000001 168 320 194.528 320H317.472C344 320 368.082 303.3110000000001 377.397 278.472L391.824 240H120.176L134.603 278.472zM88 120C70.327 120 56 134.327 56 152C56 169.673 70.327 184 88 184S136 153.673 136 136S105.673 120 88 120zM424 120C406.327 120 376 118.327 376 136C376 153.673 406.327 184 424 184S456 169.673 456 152C456 134.327 441.673 120 424 120z" />
-    <glyph glyph-name="caret-down"
-      unicode="&#xF0D7;"
-      horiz-adv-x="320" d=" M31.3 256H288.6C306.4000000000001 256 315.3 234.5 302.7000000000001 221.9L174.1 93.2C166.3 85.4 153.6 85.4 145.8 93.2L17.2 221.9C4.6 234.5 13.5 256 31.3 256z" />
-    <glyph glyph-name="caret-left"
-      unicode="&#xF0D9;"
-      horiz-adv-x="192" d=" M192 320.6620000000001V63.338C192 45.52 170.457 36.597 157.858 49.196L29.196 177.858C21.386 185.668 21.386 198.332 29.196 206.142L157.858 334.804C170.457 347.404 192 338.48 192 320.6620000000001z" />
-    <glyph glyph-name="caret-right"
-      unicode="&#xF0DA;"
-      horiz-adv-x="192" d=" M0 63.338V320.6620000000001C0 338.48 21.543 347.403 34.142 334.804L162.804 206.142C170.614 198.332 170.614 185.668 162.804 177.858L34.142 49.196C21.543 36.596 0 45.52 0 63.338z" />
-    <glyph glyph-name="caret-square-down"
-      unicode="&#xF150;"
-      horiz-adv-x="448" d=" M448 368V16C448 -10.5 426.5 -32 400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368zM92.5 227.5L215.5 104.5C220.2 99.8 227.8 99.8 232.5 104.5L355.5 227.5C363.1 235.1 357.7 248 347 248H101C90.3 248 84.9 235.1 92.5 227.5z" />
-    <glyph glyph-name="caret-square-left"
-      unicode="&#xF191;"
-      horiz-adv-x="448" d=" M400 -32H48C21.49 -32 0 -10.51 0 16V368C0 394.51 21.49 416 48 416H400C426.51 416 448 394.51 448 368V16C448 -10.51 426.51 -32 400 -32zM259.515 323.515L136.485 200.485C131.799 195.799 131.799 188.201 136.485 183.514L259.514 60.485C267.074 52.925 279.999 58.279 279.999 68.97V315.029C280 325.7200000000001 267.074 331.074 259.5150000000001 323.515z" />
-    <glyph glyph-name="caret-square-right"
-      unicode="&#xF152;"
-      horiz-adv-x="448" d=" M48 416H400C426.51 416 448 394.51 448 368V16C448 -10.51 426.51 -32 400 -32H48C21.49 -32 0 -10.51 0 16V368C0 394.51 21.49 416 48 416zM188.485 60.485L311.514 183.514C316.2 188.2 316.2 195.798 311.514 200.485L188.485 323.515C180.925 331.0750000000001 168 325.721 168 315.0300000000001V68.971C168 58.28 180.926 52.926 188.485 60.485z" />
-    <glyph glyph-name="caret-square-up"
-      unicode="&#xF151;"
-      horiz-adv-x="448" d=" M0 16V368C0 394.51 21.49 416 48 416H400C426.51 416 448 394.51 448 368V16C448 -10.51 426.51 -32 400 -32H48C21.49 -32 0 -10.51 0 16zM355.515 156.485L232.485 279.515C227.799 284.201 220.201 284.201 215.514 279.515L92.485 156.485C84.925 148.925 90.279 136 100.97 136H347.029C357.72 136 363.074 148.926 355.515 156.485z" />
-    <glyph glyph-name="caret-up"
-      unicode="&#xF0D8;"
-      horiz-adv-x="320" d=" M288.662 96H31.338C13.52 96 4.597 117.543 17.196 130.142L145.858 258.804C153.668 266.6140000000001 166.332 266.6140000000001 174.142 258.804L302.804 130.142C315.404 117.543 306.48 96 288.662 96z" />
-    <glyph glyph-name="cart-arrow-down"
-      unicode="&#xF218;"
-      horiz-adv-x="576" d=" M504.717 128H211.572L218.117 96H486.535C501.936 96 513.351 81.699 509.938 66.681L504.421 42.405C523.112 33.332 536 14.172 536 -8C536 -39.202 510.481 -64.444 479.176 -63.994C449.353 -63.565 424.826 -39.3630000000001 424.021 -9.547C423.581 6.74 430.106 21.502 440.824 32.001H231.176C241.553 21.835 248 7.674 248 -8C248 -39.813 221.472 -65.431 189.33 -63.938C160.79 -62.613 137.579 -39.553 136.079 -11.021C134.921 11.013 146.515 30.434 164.13 40.5650000000001L93.883 384H24C10.745 384 0 394.745 0 408V424C0 437.255 10.745 448 24 448H126.529C137.93 448 147.757 439.979 150.042 428.81L159.208 384H551.99C567.391 384 578.806 369.699 575.393 354.681L528.12 146.681C525.637 135.754 515.923 128 504.717 128zM403.029 256H360V316C360 322.627 354.627 328 348 328H324C317.373 328 312 322.627 312 316V256H268.971C258.2800000000001 256 252.926 243.074 260.486 235.515L327.515 168.486C332.201 163.8 339.799 163.8 344.486 168.486L411.515 235.515C419.074 243.074 413.72 256 403.029 256z" />
-    <glyph glyph-name="cart-plus"
-      unicode="&#xF217;"
-      horiz-adv-x="576" d=" M504.717 128H211.572L218.117 96H486.535C501.936 96 513.351 81.699 509.938 66.681L504.421 42.405C523.112 33.332 536 14.172 536 -8C536 -39.202 510.481 -64.444 479.176 -63.994C449.353 -63.565 424.826 -39.3630000000001 424.021 -9.547C423.581 6.74 430.106 21.502 440.824 32.001H231.176C241.553 21.835 248 7.674 248 -8C248 -39.813 221.472 -65.431 189.33 -63.938C160.79 -62.613 137.579 -39.553 136.079 -11.021C134.921 11.013 146.515 30.434 164.13 40.5650000000001L93.883 384H24C10.745 384 0 394.745 0 408V424C0 437.255 10.745 448 24 448H126.529C137.93 448 147.757 439.979 150.042 428.81L159.208 384H551.99C567.391 384 578.806 369.699 575.393 354.681L528.12 146.681C525.637 135.754 515.923 128 504.717 128zM408 280H360V320C360 328.837 352.837 336 344 336H328C319.163 336 312 328.837 312 320V280H264C255.163 280 248 272.837 248 264V248C248 239.163 255.163 232 264 232H312V192C312 183.163 319.163 176 328 176H344C352.837 176 360 183.163 360 192V232H408C416.837 232 424 239.163 424 248V264C424 272.837 416.837 280 408 280z" />
-    <glyph glyph-name="certificate"
-      unicode="&#xF0A3;"
-      horiz-adv-x="512" d=" M458.622 192.08L504.607 237.085C518.315 250.062 511.923 273.124 493.943 277.424L431.2930000000001 293.414L448.9540000000001 355.4290000000001C453.9450000000001 373.2670000000001 437.1250000000001 390.092 419.2930000000001 385.1L357.2990000000001 367.433L341.3150000000001 430.1040000000001C337.085 447.803 313.765 454.276 300.99 440.772L256 394.43L211.011 440.771C198.381 454.122 174.964 448.005 170.686 430.103L154.702 367.432L92.707 385.099C74.87 390.093 58.056 373.262 63.046 355.428L80.707 293.413L18.057 277.423C0.069 273.122 -6.31 250.056 7.392 237.085L53.377 192.08L7.392 147.076C-6.316 134.0990000000001 0.076 111.037 18.056 106.737L80.706 90.747L63.045 28.732C58.054 10.894 74.874 -5.931 92.706 -0.939L154.7 16.7280000000001L170.684 -45.9429999999999C175.123 -64.5179999999999 198.38 -69.9609999999999 211.009 -56.6109999999999L256 -10.61L300.989 -56.611C313.489 -70.0989999999999 336.976 -64.097 341.314 -45.943L357.298 16.728L419.2919999999999 -0.939C437.128 -5.933 453.9429999999999 10.898 448.9529999999999 28.732L431.2919999999999 90.747L493.9419999999999 106.737C511.9289999999999 111.0390000000001 518.3079999999999 134.1040000000001 504.6059999999999 147.076L458.6219999999999 192.08z" />
-    <glyph glyph-name="chalkboard-teacher"
-      unicode="&#xF51C;"
-      horiz-adv-x="640" d=" M208 96C205.61 96 203.22 95.65 200.94 94.91C187.98 90.7 174.35 88 160 88C145.65 88 132.02 90.7 119.05 94.91C116.77 95.65 114.39 96 112 96C49.94 96 -0.33 45.52 0 -16.62C0.14 -42.88 21.73 -64 48 -64H272C298.27 -64 319.86 -42.88 320 -16.62C320.33 45.52 270.06 96 208 96zM160 128C213.02 128 256 170.98 256 224S213.02 320 160 320S64 277.02 64 224S106.98 128 160 128zM592 448H208C181.53 448 160 425.75 160 398.41V352C183.42 352 205.1 345.2200000000001 224 334.2V384H576V96H512V160H384V96H307.76C326.86 79.31 340.88 57.27 347.45 32H592C618.47 32 640 54.25 640 81.59V398.41C640 425.75 618.47 448 592 448z" />
-    <glyph glyph-name="chalkboard"
-      unicode="&#xF51B;"
-      horiz-adv-x="640" d=" M96 384H544V32H608V408C608 430.06 590.06 448 568 448H72C49.94 448 32 430.06 32 408V32H96V384zM624 0H480V64H288V0H16C7.16 0 0 -7.16 0 -16V-48C0 -56.84 7.16 -64 16 -64H624C632.84 -64 640 -56.84 640 -48V-16C640 -7.16 632.84 0 624 0z" />
-    <glyph glyph-name="chart-area"
-      unicode="&#xF1FE;"
-      horiz-adv-x="512" d=" M500 64C506.6 64 512 58.6 512 52V12C512 5.4 506.6 0 500 0H12C5.4 0 0 5.4 0 12V372C0 378.6 5.4 384 12 384H52C58.6 384 64 378.6 64 372V64H500zM372.7 288.5L288 232L202.7 345.7C197.6 352.5 187.2 352 182.8 344.7L96 200V96H480L390.1 283.8C386.9000000000001 290.3 378.7000000000001 292.5 372.7000000000001 288.5z" />
-    <glyph glyph-name="chart-bar"
-      unicode="&#xF080;"
-      horiz-adv-x="512" d=" M500 64C506.6 64 512 58.6 512 52V12C512 5.4 506.6 0 500 0H12C5.4 0 0 5.4 0 12V372C0 378.6 5.4 384 12 384H52C58.6 384 64 378.6 64 372V64H500zM192 108V180C192 186.6 186.6 192 180 192H140C133.4 192 128 186.6 128 180V108C128 101.4 133.4 96 140 96H180C186.6 96 192 101.4 192 108zM384 108V244C384 250.6 378.6 256 372 256H332C325.4 256 320 250.6 320 244V108C320 101.4 325.4 96 332 96H372C378.6 96 384 101.4 384 108zM288 108V308C288 314.6 282.6 320 276 320H236C229.4 320 224 314.6 224 308V108C224 101.4 229.4 96 236 96H276C282.6 96 288 101.4 288 108zM480 108V340C480 346.6 474.6 352 468 352H428C421.4 352 416 346.6 416 340V108C416 101.4 421.4 96 428 96H468C474.6 96 480 101.4 480 108z" />
-    <glyph glyph-name="chart-line"
-      unicode="&#xF201;"
-      horiz-adv-x="512" d=" M500 64C506.6 64 512 58.6 512 52V12C512 5.4 506.6 0 500 0H12C5.4 0 0 5.4 0 12V372C0 378.6 5.4 384 12 384H52C58.6 384 64 378.6 64 372V64H500zM456 352H344C322.6 352 311.9 326.1 327 311L359.9 278.1L287.9 205.2L232.3 260.8C227.6 265.5 220.1 265.5 215.4 260.8L96.4 143C91.7 138.4 91.6 130.8 96.2 126.1L124.7 96.7000000000001C129.4 91.9 137.1 91.8000000000001 141.8 96.6L223.9 178.7000000000001L279.4 123.2000000000001C284.1 118.5000000000001 291.7 118.5000000000001 296.4 123.2000000000001L405.6 232.4000000000001L439 199C454.1 183.9 480 194.6 480 216V328C480 341.3 469.3 352 456 352z" />
-    <glyph glyph-name="chart-pie"
-      unicode="&#xF200;"
-      horiz-adv-x="576" d=" M288 435.7V208H515.7C522.6 208 528 213.8 527.7 220.7C521.3000000000001 343.1 423.2000000000001 441.3 300.7000000000001 447.7C293.8000000000001 448 288.0000000000001 442.6 288.0000000000001 435.7zM552.7 160C559.6 160 565 154.2 564.7 147.3C561.9000000000001 94.1 541.5 41.7 503.5000000000001 -0.5C498.9 -5.6 490.9 -5.9 486.0000000000001 -1L325 160H552.7zM401 15C405.8 10.2 405.7 2.2 400.6 -2.3C358 -40.7 301.6 -64 239.8 -64C107.6 -63.9 -0.2 44.2 0 176.5C0.2 304.6 100.8 409.1 227.3 415.7C234.2 416.1 240 410.6 240 403.7V176L401 15z" />
-    <glyph glyph-name="check-circle"
-      unicode="&#xF058;"
-      horiz-adv-x="512" d=" M504 192C504 55.033 392.967 -56 256 -56S8 55.033 8 192S119.033 440 256 440S504 328.967 504 192zM227.314 60.686L411.314 244.686C417.562 250.934 417.562 261.065 411.314 267.313L388.687 289.94C382.439 296.189 372.308 296.189 366.059 289.94L216 139.882L145.941 209.941C139.693 216.189 129.562 216.189 123.313 209.941L100.686 187.314C94.438 181.066 94.438 170.935 100.686 164.687L204.686 60.687C210.935 54.438 221.065 54.438 227.314 60.686z" />
-    <glyph glyph-name="check-double"
-      unicode="&#xF560;"
-      horiz-adv-x="512" d=" M504.5 276.05L468.3 312.4600000000001C458.3 322.51 442.0900000000001 322.51 432.1 312.4600000000001L192 70.98L79.9 183.72C69.9 193.78 53.69 193.78 43.7 183.72L7.5 147.31C-2.5 137.26 -2.5 120.95 7.5 110.9L173.9 -56.46C183.9 -66.52 200.11 -66.52 210.1 -56.46L504.5 239.63C514.5 249.69 514.5 265.99 504.5 276.05zM166.57 165.29C173.41 158.2700000000001 184.75 158.2700000000001 191.78 165.11L403.85 375.38C410.87 382.2200000000001 410.87 393.56 404.0300000000001 400.59L362.08 442.71C355.24 449.73 343.9 449.73 336.87 442.89L179.71 286.81L111.48 355.58C104.64 362.6 93.3 362.6 86.28 355.76L44.15 313.99C37.13 307.15 37.13 295.81 43.97 288.79L166.57 165.29z" />
-    <glyph glyph-name="check-square"
-      unicode="&#xF14A;"
-      horiz-adv-x="448" d=" M400 -32H48C21.49 -32 0 -10.51 0 16V368C0 394.51 21.49 416 48 416H400C426.51 416 448 394.51 448 368V16C448 -10.51 426.51 -32 400 -32zM195.314 66.059L379.314 250.059C385.562 256.307 385.562 266.438 379.314 272.686L356.687 295.313C350.439 301.561 340.308 301.562 334.059 295.313L184 145.255L113.941 215.314C107.693 221.562 97.562 221.562 91.313 215.314L68.686 192.687C62.438 186.439 62.438 176.308 68.686 170.06L172.686 66.06C178.935 59.81 189.065 59.81 195.314 66.059z" />
-    <glyph glyph-name="check"
-      unicode="&#xF00C;"
-      horiz-adv-x="512" d=" M173.898 8.596L7.498 174.996C-2.499 184.993 -2.499 201.202 7.498 211.2L43.701 247.404C53.698 257.402 69.908 257.402 79.905 247.404L192 135.31L432.0950000000001 375.404C442.0920000000001 385.401 458.302 385.401 468.299 375.404L504.5020000000001 339.2C514.499 329.203 514.499 312.9940000000001 504.5020000000001 302.996L210.1020000000001 8.595C200.1040000000001 -1.402 183.8950000000001 -1.402 173.8980000000001 8.5959999999999z" />
-    <glyph glyph-name="chess-bishop"
-      unicode="&#xF43A;"
-      horiz-adv-x="320" d=" M123.158 370.1190000000001C107.369 375.4700000000001 96 390.403 96 408C96 430.091 113.909 448 136 448H183.796C205.887 448 223.796 430.091 223.796 408C223.796 390.459 212.501 375.5660000000001 196.791 370.171C220.784 353.514 245.368 323.332 265.4940000000001 288.121L144.929 167.557A6 6 0 0 1 144.929 159.072L159.071 144.93A6 6 0 0 1 167.556 144.93L280.9 258.274C298.658 219.977 310.271 178.831 310.271 144.001C310.271 90.215 287.374 68.213 251.825 57.968V0H68.174V57.97C32.631 68.216 9.739 90.219 9.739 144C9.739 222.029 68.02 331.766 123.158 370.1190000000001zM320 -52V-28C320 -21.373 314.627 -16 308 -16H12C5.373 -16 0 -21.373 0 -28V-52C0 -58.627 5.373 -64 12 -64H308C314.627 -64 320 -58.627 320 -52z" />
-    <glyph glyph-name="chess-board"
-      unicode="&#xF43C;"
-      horiz-adv-x="512" d=" M256 192V128H192V192H256zM256 448H192V384H256V448zM256 192H320V256H256V192zM384 448H320V384H384V448zM384 -64H448V0H384V-64zM512 0V64H448V0H512zM128 -64H192V0H128V-64zM128 448H64V384H128V448zM512 256V320H448V256H512zM512 128V192H448V128H512zM0 -64H64V0H0V-64zM0 384V320H64V384H0zM0 256V192H64V256H0zM0 128V64H64V128H0zM256 -64H320V0H256V-64zM192 64V0H256V64H192zM256 256V320H192V256H256zM64 64V0H128V64H64zM128 192H64V128H128V192zM384 64H448V128H384V64zM512 448H448V384H512V448zM384 192H448V256H384V192zM384 384V320H448V384H384zM320 64V0H384V64H320zM128 128V64H192V128H128zM256 128V64H320V128H256zM192 256H128V192H192V256zM128 320H64V256H128V320zM320 128H384V192H320V128zM192 320V384H128V320H192zM320 320V384H256V320H320zM320 256H384V320H320V256z" />
-    <glyph glyph-name="chess-king"
-      unicode="&#xF43F;"
-      horiz-adv-x="448" d=" M416 -28V-52C416 -58.627 410.627 -64 404 -64H44C37.373 -64 32 -58.627 32 -52V-28C32 -21.373 37.373 -16 44 -16H404C410.627 -16 416 -21.373 416 -28zM407.967 296H248V344H298A6 6 0 0 1 304 350V386A6 6 0 0 1 298 392H248V442A6 6 0 0 1 242 448H206A6 6 0 0 1 200 442V392H150A6 6 0 0 1 144 386V350A6 6 0 0 1 150 344H200V296H40.033C12.459 296 -6.846 268.756 2.295 242.741L87.582 0H360.418L445.7050000000001 242.741C454.846 268.756 435.541 296 407.967 296z" />
-    <glyph glyph-name="chess-knight"
-      unicode="&#xF441;"
-      horiz-adv-x="384" d=" M352 224V0H32V46.557C32 76.859 49.12 104.56 76.223 118.111L133.466 146.733A48 48 0 0 1 160 189.666V240L137.873 228.937A23.996 23.996 0 0 1 125.323 213.292L113.488 165.954A12 12 0 0 0 106.303 157.723L76.702 145.8830000000001A11.998 11.998 0 0 0 67.372 146.059L7.126 172.833A12 12 0 0 0 0 183.799V342.059C0 348.424 2.529 354.529 7.03 359.03L16 368L1.789 396.4220000000001A16.937 16.937 0 0 0 0 404C0 410.627 5.373 416 12 416H160C266.039 416 352 330.039 352 224zM372 -16H12C5.373 -16 0 -21.373 0 -28V-52C0 -58.627 5.373 -64 12 -64H372C378.627 -64 384 -58.627 384 -52V-28C384 -21.373 378.627 -16 372 -16zM52 320C40.954 320 32 311.046 32 300S40.954 280 52 280S72 288.954 72 300S63.046 320 52 320z" />
-    <glyph glyph-name="chess-pawn"
-      unicode="&#xF443;"
-      horiz-adv-x="320" d=" M264 0H56S116 42.743 116 176H84C77.373 176 72 181.373 72 188V212C72 218.627 77.373 224 84 224H124.209C95.721 237.44 76 266.4120000000001 76 300C76 346.392 113.608 384 160 384S244 346.392 244 300C244 266.4120000000001 224.279 237.44 195.791 224H236C242.627 224 248 218.627 248 212V188C248 181.373 242.627 176 236 176H204C204 42.743 264 0 264 0zM292 -16H28C21.373 -16 16 -21.373 16 -28V-52C16 -58.627 21.373 -64 28 -64H292C298.627 -64 304 -58.627 304 -52V-28C304 -21.373 298.627 -16 292 -16z" />
-    <glyph glyph-name="chess-queen"
-      unicode="&#xF445;"
-      horiz-adv-x="512" d=" M436 -64H76C69.373 -64 64 -58.627 64 -52V-28C64 -21.373 69.373 -16 76 -16H436C442.627 -16 448 -21.373 448 -28V-52C448 -58.627 442.627 -64 436 -64zM255.579 448C224.651 448 199.579 422.928 199.579 392S224.651 336 255.579 336S311.579 361.072 311.579 392S286.507 448 255.579 448zM460.147 293.366C454.3790000000001 296.411 447.2310000000001 294.298 444.0650000000001 288.596C435.4490000000001 273.0800000000001 421.3180000000001 250.795 400.0000000000001 250.795C371.2860000000001 250.795 369.3750000000001 270.5990000000001 368.3140000000001 308.337C368.1310000000001 314.829 362.8130000000001 320.0010000000001 356.3190000000001 320.0010000000001H315.3130000000001C310.1380000000001 320.0010000000001 305.5590000000001 316.673 303.9250000000002 311.7630000000001C295.0350000000002 285.0540000000001 277.8520000000002 270.7710000000001 256.0000000000001 270.7710000000001S216.9660000000001 285.0540000000001 208.0750000000001 311.7630000000001C206.4410000000001 316.673 201.8620000000001 320.0010000000001 196.6870000000001 320.0010000000001H155.6820000000001C149.1870000000001 320.0010000000001 143.8690000000001 314.827 143.6870000000001 308.3340000000001C142.6350000000001 270.692 140.7530000000001 250.795 111.9990000000001 250.795C91.3080000000001 250.795 78.1820000000001 271.019 67.5740000000001 288.8200000000001C64.3080000000001 294.3 57.3160000000001 296.2510000000001 51.6750000000001 293.273L12.4960000000001 272.5940000000001A12 12 0 0 1 6.9860000000001 257.449L112 0H400L505.014 257.448A12 12 0 0 1 499.504 272.593L460.147 293.366z" />
-    <glyph glyph-name="chess-rook"
-      unicode="&#xF447;"
-      horiz-adv-x="384" d=" M81.241 232.973C80.957 189.08 77.411 99.924 48 0H335.9820000000001C306.5820000000001 99.604 303.0460000000001 188.912 302.761 232.975L348.1790000000001 275.287A11.998 11.998 0 0 1 351.999 284.067V404C351.999 410.627 346.6260000000001 416 339.999 416H299.999C293.372 416 287.999 410.627 287.999 404V360H239.999V404C239.999 410.627 234.6260000000001 416 227.999 416H155.999C149.372 416 143.999 410.627 143.999 404V360H96V404C96 410.627 90.627 416 84 416H44C37.373 416 32 410.627 32 404V284.068C32 280.738 33.384 277.558 35.82 275.288L81.241 232.973zM160 192C160 209.673 174.327 224 192 224C209.673 224 224 209.673 224 192V127.996H160V192zM384 -28V-52C384 -58.627 378.627 -64 372 -64H12C5.373 -64 0 -58.627 0 -52V-28C0 -21.373 5.373 -16 12 -16H372C378.627 -16 384 -21.373 384 -28z" />
-    <glyph glyph-name="chess"
-      unicode="&#xF439;"
-      horiz-adv-x="512" d=" M199.821 230.367A6 6 0 0 0 205.821 224.367L205.82 203.601A6 6 0 0 0 199.82 197.601H174.015C174.015 165.886 171.862 101.4 191.413 44.372H64.597C84.54 102.548 82.02 168.755 82.02 197.601H56.183A6 6 0 0 0 50.183 203.601L50.185 224.367A6 6 0 0 0 56.185 230.367H199.821zM41.554 332.9120000000001L76.134 237.841H179.868L214.44 332.913C217.286 340.7390000000001 211.49 349.014 203.162 349.014H152V379.2340000000001H173.57A6 6 0 0 1 179.57 385.2340000000001V407.617A6 6 0 0 1 173.57 413.617H145.203V442A6 6 0 0 1 139.203 448H116.82A6 6 0 0 1 110.82 442V413.617H82.421A6 6 0 0 1 76.421 407.617V385.2340000000001A6 6 0 0 1 82.421 379.2340000000001H104V349.015H52.831C44.503 349.014 38.707 340.7390000000001 41.554 332.9120000000001zM222.678 2.83V30.897A6 6 0 0 1 216.678 36.897H39.322A6 6 0 0 1 33.322 30.897V2.83L11.174 -11.334A6 6 0 0 1 8.407 -16.389V-58A6 6 0 0 1 14.407 -64H241.594A6 6 0 0 1 247.594 -58V-16.388A6 6 0 0 1 244.8270000000001 -11.333L222.678 2.83zM313.256 147.055L338.136 130.0919999999999C338.226 111.9679999999999 337.969 66.1879999999999 326.231 15.5699999999999H473.757C462.044 66.045 461.788 111.894 461.875 130.107L486.734 147.056A3.856 3.856 0 0 1 488.418 150.243V220.144A3.8569999999999998 3.8569999999999998 0 0 1 484.561 224.001H456.9059999999999A3.8569999999999998 3.8569999999999998 0 0 1 453.0489999999999 220.144V188.63H430.3119999999999V220.144A3.8569999999999998 3.8569999999999998 0 0 1 426.4539999999999 224.001H373.5359999999999A3.8569999999999998 3.8569999999999998 0 0 1 369.6789999999999 220.144V188.63H346.9419999999999V220.144A3.8569999999999998 3.8569999999999998 0 0 1 343.0849999999998 224.001H315.43A3.8569999999999998 3.8569999999999998 0 0 1 311.573 220.144V150.243A3.8549999999999995 3.8549999999999995 0 0 1 313.256 147.055zM384.841 95.149C384.841 103.521 391.628 110.307 400 110.307S415.158 103.52 415.158 95.149V64.831H384.841V95.149zM504.62 -22.059L490.956 -11.42V4.132A3.8569999999999998 3.8569999999999998 0 0 1 487.099 7.989H312.915A3.8569999999999998 3.8569999999999998 0 0 1 309.058 4.132V-11.42L295.381 -22.059A3.8569999999999998 3.8569999999999998 0 0 1 293.893 -25.103V-60.142A3.8569999999999998 3.8569999999999998 0 0 1 297.75 -63.999H502.25A3.8569999999999998 3.8569999999999998 0 0 1 506.107 -60.142V-25.102A3.859 3.859 0 0 1 504.62 -22.059z" />
-    <glyph glyph-name="chevron-circle-down"
-      unicode="&#xF13A;"
-      horiz-adv-x="512" d=" M504 192C504 55 393 -56 256 -56S8 55 8 192S119 440 256 440S504 329 504 192zM273 78.1L408.5 213.6C417.9 223 417.9 238.2 408.5 247.5000000000001L391.5 264.5C382.1 273.9000000000001 366.9 273.9000000000001 357.6 264.5L256 162.9L154.4 264.5C145 273.9 129.8 273.9 120.5 264.5L103.5 247.5C94.1 238.1 94.1 222.9 103.5 213.6L239 78.1C248.4 68.7000000000001 263.6 68.7000000000001 273 78.1z" />
-    <glyph glyph-name="chevron-circle-left"
-      unicode="&#xF137;"
-      horiz-adv-x="512" d=" M256 -56C119 -56 8 55 8 192S119 440 256 440S504 329 504 192S393 -56 256 -56zM142.1 175L277.6 39.5C287 30.1 302.2000000000001 30.1 311.5 39.5L328.5 56.5C337.9 65.9 337.9 81.1 328.5 90.4L226.9 192L328.5 293.6C337.9 303 337.9 318.2 328.5 327.5L311.5 344.5C302.1 353.9 286.9 353.9 277.6 344.5L142.1 209C132.7 199.6 132.7 184.4 142.1 175z" />
-    <glyph glyph-name="chevron-circle-right"
-      unicode="&#xF138;"
-      horiz-adv-x="512" d=" M256 440C393 440 504 329 504 192S393 -56 256 -56S8 55 8 192S119 440 256 440zM369.9 209L234.4 344.5C225 353.9 209.8 353.9 200.5 344.5L183.5 327.5C174.1 318.1 174.1 302.9 183.5 293.6L285.1 192L183.5 90.4C174.1 81 174.1 65.8 183.5 56.5L200.5 39.5C209.9 30.1 225.1 30.1 234.4 39.5L369.9 175C379.3 184.4 379.3 199.6 369.9 209z" />
-    <glyph glyph-name="chevron-circle-up"
-      unicode="&#xF139;"
-      horiz-adv-x="512" d=" M8 192C8 329 119 440 256 440S504 329 504 192S393 -56 256 -56S8 55 8 192zM239 305.9L103.5 170.4C94.1 161 94.1 145.8 103.5 136.5L120.5 119.5C129.9 110.1 145.1 110.1 154.4 119.5L256 221.1L357.6 119.5C367 110.1 382.2000000000001 110.1 391.5 119.5L408.5 136.5C417.9 145.9 417.9 161.1 408.5 170.4L273 305.9C263.6 315.3 248.4 315.3 239 305.9z" />
-    <glyph glyph-name="chevron-down"
-      unicode="&#xF078;"
-      horiz-adv-x="448" d=" M207.029 66.524L12.686 260.868C3.313 270.241 3.313 285.437 12.686 294.809L35.353 317.476C44.71 326.833 59.875 326.851 69.254 317.516L224 163.495L378.745 317.516C388.124 326.851 403.289 326.833 412.646 317.476L435.313 294.809C444.686 285.4360000000001 444.686 270.24 435.313 260.868L240.971 66.524C231.598 57.152 216.402 57.152 207.029 66.524z" />
-    <glyph glyph-name="chevron-left"
-      unicode="&#xF053;"
-      horiz-adv-x="320" d=" M34.52 208.97L228.87 403.31C238.24 412.68 253.44 412.68 262.81 403.31L285.48 380.64C294.8400000000001 371.28 294.85 356.12 285.5200000000001 346.74L131.49 192L285.51 37.25C294.85 27.87 294.83 12.71 285.47 3.35L262.8 -19.32C253.43 -28.69 238.23 -28.69 228.86 -19.32L34.52 175.03C25.15 184.4 25.15 199.6 34.52 208.97z" />
-    <glyph glyph-name="chevron-right"
-      unicode="&#xF054;"
-      horiz-adv-x="320" d=" M285.476 175.029L91.132 -19.314C81.759 -28.687 66.563 -28.687 57.191 -19.314L34.524 3.353C25.167 12.7099999999999 25.149 27.8749999999999 34.484 37.254L188.505 192L34.484 346.745C25.149 356.124 25.167 371.289 34.524 380.646L57.191 403.313C66.564 412.6860000000001 81.76 412.6860000000001 91.132 403.313L285.475 208.97C294.848 199.598 294.848 184.402 285.476 175.029z" />
-    <glyph glyph-name="chevron-up"
-      unicode="&#xF077;"
-      horiz-adv-x="448" d=" M240.971 317.476L435.314 123.1330000000001C444.687 113.7600000000001 444.687 98.564 435.314 89.192L412.647 66.525C403.29 57.168 388.125 57.15 378.7459999999999 66.485L224 220.505L69.255 66.484C59.876 57.149 44.711 57.167 35.354 66.524L12.687 89.191C3.314 98.564 3.314 113.7600000000001 12.687 123.1320000000001L207.03 317.475C216.402 326.848 231.598 326.848 240.971 317.476z" />
-    <glyph glyph-name="child"
-      unicode="&#xF1AE;"
-      horiz-adv-x="384" d=" M120 376C120 415.765 152.235 448 192 448S264 415.765 264 376C264 336.236 231.765 304 192 304S120 336.236 120 376zM374.627 374.627C362.1310000000001 387.124 341.8690000000001 387.124 329.373 374.627L242.745 288H141.254L54.627 374.627C42.131 387.124 21.869 387.124 9.373 374.627C-3.124 362.13 -3.124 341.8690000000001 9.373 329.372L104 234.746V-32C104 -49.673 118.327 -64 136 -64H152C169.673 -64 184 -49.673 184 -32V80H200V-32C200 -49.673 214.327 -64 232 -64H248C265.673 -64 280 -49.673 280 -32V234.746L374.627 329.373C387.124 341.87 387.124 362.13 374.627 374.627z" />
-    <glyph glyph-name="church"
-      unicode="&#xF51D;"
-      horiz-adv-x="640" d=" M464.46 201.32L352 268.8V320H400C408.84 320 416 327.16 416 336V368C416 376.8400000000001 408.84 384 400 384H352V432C352 440.84 344.84 448 336 448H304C295.1600000000001 448 288 440.84 288 432V384H240C231.16 384 224 376.8400000000001 224 368V336C224 327.16 231.16 320 240 320H288V268.8L175.54 201.32A31.997 31.997 0 0 1 160 173.88V-64H256V32C256 67.35 284.65 96 320 96S384 67.35 384 32V-64H480V173.88C480 185.12 474.1 195.54 464.46 201.32zM0 52.04V-48C0 -56.84 7.16 -64 16 -64H128V128L19.39 81.46A32.024 32.024 0 0 1 0 52.04zM620.61 81.46L512 128V-64H624C632.84 -64 640 -56.84 640 -48V52.04C640 64.84 632.37 76.41 620.61 81.46z" />
-    <glyph glyph-name="circle-notch"
-      unicode="&#xF1CE;"
-      horiz-adv-x="512" d=" M288 408.944V392.2850000000001C288 381.481 295.281 372.126 305.686 369.219C383.204 347.5660000000001 440 276.482 440 192C440 90.311 357.705 8 256 8C154.311 8 72 90.295 72 192C72 276.4700000000001 128.786 347.564 206.312 369.219C216.719 372.126 224 381.483 224 392.288V408.936C224 424.645 209.166 436.089 193.954 432.17C86.603 404.5180000000001 7.394 306.794 8.003 190.668C8.723 53.616 119.48 -56.288 256.534 -55.999C393.255 -55.711 504 55.212 504 192C504 307.633 424.86 404.779 317.789 432.236C302.678 436.111 288 424.544 288 408.944z" />
-    <glyph glyph-name="circle"
-      unicode="&#xF111;"
-      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440z" />
-    <glyph glyph-name="clipboard-check"
-      unicode="&#xF46C;"
-      horiz-adv-x="384" d=" M336 384H256C256 419.3 227.3 448 192 448S128 419.3 128 384H48C21.5 384 0 362.5 0 336V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V336C384 362.5 362.5 384 336 384zM192 408C205.3 408 216 397.3 216 384S205.3 360 192 360S168 370.7 168 384S178.7 408 192 408zM313.2 176.2L170.2 34.4C165.5 29.7 157.9 29.8 153.2 34.5L70.6 117.8C65.9 122.5 66 130.1 70.7 134.8L99.1 163C103.8 167.7 111.4 167.6 116.1 162.9L162.1 116.5L268.1 221.7C272.8 226.4 280.4000000000001 226.3 285.1 221.6L313.3 193.2C318 188.4 317.9000000000001 180.9 313.2 176.2z" />
-    <glyph glyph-name="clipboard-list"
-      unicode="&#xF46D;"
-      horiz-adv-x="384" d=" M336 384H256C256 419.3 227.3 448 192 448S128 419.3 128 384H48C21.5 384 0 362.5 0 336V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V336C384 362.5 362.5 384 336 384zM96 24C82.7 24 72 34.7 72 48S82.7 72 96 72S120 61.3 120 48S109.3 24 96 24zM96 120C82.7 120 72 130.7 72 144S82.7 168 96 168S120 157.3 120 144S109.3 120 96 120zM96 216C82.7 216 72 226.7 72 240S82.7 264 96 264S120 253.3 120 240S109.3 216 96 216zM192 408C205.3 408 216 397.3 216 384S205.3 360 192 360S168 370.7 168 384S178.7 408 192 408zM320 40C320 35.6 316.4 32 312 32H168C163.6 32 160 35.6 160 40V56C160 60.4 163.6 64 168 64H312C316.4 64 320 60.4 320 56V40zM320 136C320 131.6 316.4 128 312 128H168C163.6 128 160 131.6 160 136V152C160 156.4 163.6 160 168 160H312C316.4 160 320 156.4 320 152V136zM320 232C320 227.6 316.4 224 312 224H168C163.6 224 160 227.6 160 232V248C160 252.4 163.6 256 168 256H312C316.4 256 320 252.4 320 248V232z" />
-    <glyph glyph-name="clipboard"
-      unicode="&#xF328;"
-      horiz-adv-x="384" d=" M384 336V-16C384 -42.51 362.51 -64 336 -64H48C21.49 -64 0 -42.51 0 -16V336C0 362.51 21.49 384 48 384H128C128 419.29 156.71 448 192 448S256 419.29 256 384H336C362.51 384 384 362.51 384 336zM192 408C178.745 408 168 397.255 168 384S178.745 360 192 360S216 370.745 216 384S205.255 408 192 408M288 294V314A6 6 0 0 1 282 320H102A6 6 0 0 1 96 314V294A6 6 0 0 1 102 288H282A6 6 0 0 1 288 294z" />
-    <glyph glyph-name="clock"
-      unicode="&#xF017;"
-      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM313.1 89.9L224.9 154C221.8 156.3 220 159.9 220 163.7V332C220 338.6 225.4 344 232 344H280C286.6 344 292 338.6 292 332V194.3L355.5 148.1C360.9 144.2000000000001 362 136.7000000000001 358.1 131.3L329.9000000000001 92.5C326.0000000000001 87.2 318.5000000000001 86 313.1 89.9z" />
-    <glyph glyph-name="clone"
-      unicode="&#xF24D;"
-      horiz-adv-x="512" d=" M464 448C490.51 448 512 426.51 512 400V112C512 85.49 490.51 64 464 64H176C149.49 64 128 85.49 128 112V400C128 426.51 149.49 448 176 448H464M176 32C131.888 32 96 67.888 96 112V320H48C21.49 320 0 298.51 0 272V-16C0 -42.51 21.49 -64 48 -64H336C362.51 -64 384 -42.51 384 -16V32H176z" />
-    <glyph glyph-name="closed-captioning"
-      unicode="&#xF20A;"
-      horiz-adv-x="512" d=" M464 384H48C21.5 384 0 362.5 0 336V48C0 21.5 21.5 0 48 0H464C490.5 0 512 21.5 512 48V336C512 362.5 490.5 384 464 384zM218.1 160.3C220.9 162.8 225.2 162.4 227.3 159.4L246.8 131.7000000000001C248.5 129.3000000000001 248.3 126.1 246.3 124.0000000000001C192.7 67.2000000000001 73.5 91.9 73.5 191.9000000000001C73.5 289.2000000000001 195.2 311.4000000000001 246 262.0000000000001C248.1 260.0000000000001 248.5 258.8000000000001 247 256.3000000000001L229.5 225.8000000000001C227.6 222.7000000000001 223.3 221.8000000000001 220.4 224.1000000000001C179.6 256.1000000000002 125.8 239.0000000000001 125.8 192.9000000000001C125.9 144.9000000000001 176.9 122.4000000000001 218.1 160.3000000000001zM408.5 160.3C411.3 162.8 415.6 162.4 417.7 159.4L437.2 131.7000000000001C438.9 129.3000000000001 438.7 126.1 436.7 124.0000000000001C383.2 67.1000000000001 264 91.9 264 191.9000000000001C264 289.2000000000001 385.7 311.4000000000001 436.5 262.0000000000001C438.6 260.0000000000001 439 258.8000000000001 437.5 256.3000000000001L420 225.8C418.1 222.7 413.8 221.8 410.9 224.1C370.1 256.1 316.3 239.0000000000001 316.3 192.9C316.3 144.9 367.3 122.4 408.5 160.3z" />
-    <glyph glyph-name="cloud-download-alt"
-      unicode="&#xF381;"
-      horiz-adv-x="640" d=" M537.6 221.4C541.7 232.1 544 243.8 544 256C544 309 501 352 448 352C428.3 352 409.9 346 394.7 335.8C367 383.8 315.3 416 256 416C167.6 416 96 344.4 96 256C96 253.3 96.1 250.6 96.2 247.9C40.2 228.2 0 174.8 0 112C0 32.5 64.5 -32 144 -32H512C582.7 -32 640 25.3 640 96C640 157.9 596 209.6 537.6 221.4zM404.7000000000001 132.7L299.3 27.3C293.1 21.1 282.9000000000001 21.1 276.7 27.3L171.3 132.7C161.2 142.8 168.4 160 182.6 160H248V272C248 280.8 255.2 288 264 288H312C320.8 288 328 280.8 328 272V160H393.4C407.6 160 414.8 142.8 404.7 132.7z" />
-    <glyph glyph-name="cloud-upload-alt"
-      unicode="&#xF382;"
-      horiz-adv-x="640" d=" M537.6 221.4C541.7 232.1 544 243.8 544 256C544 309 501 352 448 352C428.3 352 409.9 346 394.7 335.8C367 383.8 315.3 416 256 416C167.6 416 96 344.4 96 256C96 253.3 96.1 250.6 96.2 247.9C40.2 228.2 0 174.8 0 112C0 32.5 64.5 -32 144 -32H512C582.7 -32 640 25.3 640 96C640 157.9 596 209.6 537.6 221.4zM393.4 160H328V48C328 39.2 320.8 32 312 32H264C255.2 32 248 39.2 248 48V160H182.6C168.3 160 161.2 177.2 171.3 187.3L276.7 292.7000000000001C282.9 298.9 293.1 298.9 299.3 292.7000000000001L404.7000000000001 187.3C414.8000000000001 177.2 407.6 160 393.4000000000001 160z" />
-    <glyph glyph-name="cloud"
-      unicode="&#xF0C2;"
-      horiz-adv-x="640" d=" M537.6 221.4C541.7 232.1 544 243.8 544 256C544 309 501 352 448 352C428.3 352 409.9 346 394.7 335.8C367 383.8 315.3 416 256 416C167.6 416 96 344.4 96 256C96 253.3 96.1 250.6 96.2 247.9C40.2 228.2 0 174.8 0 112C0 32.5 64.5 -32 144 -32H512C582.7 -32 640 25.3 640 96C640 157.9 596 209.6 537.6 221.4z" />
-    <glyph glyph-name="cocktail"
-      unicode="&#xF561;"
-      horiz-adv-x="576" d=" M296 -16H240V109.22L408.74 277.9500000000001C424.26 293.4700000000001 413.27 320 391.32 320H24.68C2.73 320 -8.26 293.4700000000001 7.26 277.9500000000001L176 109.22V-16H120C97.91 -16 80 -33.91 80 -56C80 -60.42 83.58 -64 88 -64H328C332.42 -64 336 -60.42 336 -56C336 -33.91 318.09 -16 296 -16zM432 448C369.39 448 316.65 407.8 296.82 352H349.36C366.01 380.55 396.63 400 432 400C484.93 400 528 356.94 528 304S484.93 208 432 208C417.96 208 404.71 211.2 392.68 216.64L357.42 181.38C379.23 168.08 404.59 160 432 160C511.53 160 576 224.47 576 304S511.53 448 432 448z" />
-    <glyph glyph-name="code-branch"
-      unicode="&#xF126;"
-      horiz-adv-x="384" d=" M384 304C384 348.2 348.2 384 304 384S224 348.2 224 304C224 267.6 248.3 236.9 281.5 227.2C280.9 211.1 277.3 198.7 270.5 190.3C255.1 171.1 221.2 167.9 185.3 164.6C157.1 162 127.9 159.2000000000001 104 147.7000000000001V291.7000000000001C136.5 301.9000000000001 160 332.2000000000001 160 368.0000000000001C160 412.2000000000001 124.2 448.0000000000001 80 448.0000000000001S0 412.2 0 368C0 332.2 23.5 301.9 56 291.7V92.4C23.5 82.1 0 51.8 0 16C0 -28.2 35.8 -64 80 -64S160 -28.2 160 16C160 50 138.8 79.1 108.8 90.6C111.9 95.8 116.6 100.4 123.7 104C139.9 112.2 164.1 114.4 189.8 116.8C232 120.7 279.8 125.2 308 160.2C322 177.6 329.1 200 329.6 228.1C361.2000000000001 238.9 384 268.8 384 304zM80 384C88.8 384 96 376.8 96 368S88.8 352 80 352S64 359.2 64 368S71.2 384 80 384zM80 0C71.2 0 64 7.2 64 16S71.2 32 80 32S96 24.8 96 16S88.8 0 80 0zM304 320C312.8 320 320 312.8 320 304S312.8 288 304 288S288 295.2 288 304S295.2 320 304 320z" />
-    <glyph glyph-name="code"
-      unicode="&#xF121;"
-      horiz-adv-x="640" d=" M278.9 -63.5L217.9 -45.8C211.5 -44 207.9 -37.3 209.7 -30.9L346.2 439.3C348 445.7 354.7 449.3 361.1 447.5L422.1 429.8C428.5 428 432.1 421.3 430.3 414.9L293.8 -55.3C291.9000000000001 -61.7 285.3 -65.4 278.9000000000001 -63.5zM164.9 48.7L208.4 95.1C213 99.9999999999999 212.7 107.8 207.6 112.3L117 192L207.6 271.7C212.7 276.2 213.1 284 208.4 288.9L164.9 335.3C160.4 340.1 152.8 340.4 147.9 335.8L3.8 200.8C-1.3 196.1 -1.3 188 3.8 183.3L147.9 48.2C152.8 43.6 160.4 43.8000000000001 164.9 48.7zM492.1 48.1L636.1999999999999 183.1999999999999C641.3 187.8999999999999 641.3 196 636.1999999999999 200.6999999999999L492.1 335.9C487.3 340.4 479.7 340.2 475.1 335.4L431.6 289C427 284.1 427.3 276.3 432.4000000000001 271.8L523 192L432.4 112.3C427.3 107.8 426.9 100 431.6 95.1L475.1 48.7C479.6 43.8000000000001 487.2 43.6 492.1 48.1z" />
-    <glyph glyph-name="coffee"
-      unicode="&#xF0F4;"
-      horiz-adv-x="640" d=" M192 64H384C437 64 480 107 480 160H512C582.6 160 640 217.4 640 288S582.6 416 512 416H120C106.7 416 96 405.3 96 392V160C96 107 139 64 192 64zM512 352C547.3 352 576 323.3 576 288S547.3 224 512 224H480V352H512zM559.7 -32H48.3C0.7 -32 -12.7 32 12.3 32H595.5999999999999C620.5999999999999 32 607.3999999999999 -32 559.6999999999999 -32z" />
-    <glyph glyph-name="cog"
-      unicode="&#xF013;"
-      horiz-adv-x="512" d=" M444.788 156.9L487.404 132.301C492.271 129.492 494.53 123.683 492.863 118.316C481.793 82.674 462.893 50.474 438.174 23.73A12.015999999999998 12.015999999999998 0 0 0 423.342 21.4759999999999L380.758 46.0709999999999A191.577 191.577 0 0 0 319.999 10.9409999999999V-38.2410000000001A12.01 12.01 0 0 0 310.622 -49.9590000000001C275.666 -57.8090000000001 238.123 -58.2150000000001 201.403 -49.9660000000001C195.913 -48.7330000000001 192 -43.8700000000001 192 -38.2430000000001V10.9409999999999A191.555 191.555 0 0 0 131.241 46.0709999999999L88.657 21.4759999999999A12.015999999999998 12.015999999999998 0 0 0 73.825 23.7299999999999C49.107 50.4739999999999 30.206 82.6739999999999 19.136 118.3159999999999C17.469 123.6819999999999 19.728 129.4909999999999 24.595 132.3009999999999L67.212 156.9A193.48000000000002 193.48000000000002 0 0 0 67.212 227.099L24.596 251.698C19.729 254.507 17.47 260.316 19.137 265.683C30.207 301.325 49.107 333.525 73.826 360.269A12.015999999999998 12.015999999999998 0 0 0 88.658 362.523L131.242 337.928A191.577 191.577 0 0 0 192.001 373.058V422.241A12.01 12.01 0 0 0 201.3780000000001 433.959C236.3340000000001 441.8090000000001 273.8770000000001 442.215 310.5970000000001 433.966C316.0870000000001 432.733 320.0000000000001 427.87 320.0000000000001 422.243V373.059A191.555 191.555 0 0 0 380.7590000000001 337.929L423.3430000000001 362.524A12.015999999999998 12.015999999999998 0 0 0 438.1750000000001 360.27C462.8930000000001 333.526 481.7940000000001 301.326 492.8640000000001 265.684C494.5310000000001 260.318 492.2720000000001 254.509 487.4050000000001 251.699L444.788 227.1A193.485 193.485 0 0 0 444.788 156.9zM336 192C336 236.112 300.112 272 256 272S176 236.112 176 192S211.888 112 256 112S336 147.888 336 192z" />
-    <glyph glyph-name="cogs"
-      unicode="&#xF085;"
-      horiz-adv-x="640" d=" M512.1 257L503.9 242.7C500.9 237.4 494.5000000000001 235.2 488.8 237.3C477 241.7 466.2 248 456.7 255.9C452.1 259.7 450.9 266.4 453.9 271.6L462.1 285.9C455.2 293.9 449.8 303.2 446.2 313.3H429.7C423.7 313.3 418.5 317.6 417.5 323.6C415.5 335.6 415.4 348.2 417.5 360.7C418.5 366.7 423.7 371.1 429.7 371.1H446.2C449.8 381.2 455.2 390.5 462.1 398.5L453.9 412.8C450.9 418 452 424.7 456.7 428.5C466.2 436.4 477.1 442.7 488.8 447.1C494.5 449.2 500.9 447 503.9 441.7L512.1 427.4C522.6 429.3 533.3000000000001 429.3 543.8000000000001 427.4L552 441.7C555 447 561.4 449.2 567.1 447.1C578.9 442.7 589.7 436.4 599.2 428.5C603.8000000000001 424.7 605 418 602 412.8L593.8 398.5C600.6999999999999 390.5 606.0999999999999 381.2 609.6999999999999 371.1H626.1999999999999C632.1999999999999 371.1 637.4 366.8 638.4 360.8C640.4 348.8 640.5 336.2 638.4 323.7C637.4 317.7 632.1999999999999 313.3 626.1999999999999 313.3H609.6999999999999C606.0999999999999 303.2 600.6999999999999 293.9 593.8 285.9L602 271.6C605 266.4 603.9 259.7 599.2 255.9C589.7 248 578.8000000000001 241.7 567.1 237.3C561.4 235.2 555 237.4 552 242.7L543.8 257C533.4 255.1 522.5999999999999 255.1 512.0999999999999 257zM501.6 315.8C540.1 286.2000000000001 584 330.1 554.4 368.6C515.9 398.3 472 354.3 501.6 315.8zM386.3 161.9L420 145.1C430.1 139.3 434.5 127 430.5 116C421.6 91.8 404.1 69.6 387.9 50.1999999999999C380.5 41.3 367.7 39.0999999999999 357.6 44.8999999999999L328.5 61.6999999999999C312.5 47.9999999999999 293.8999999999999 37.0999999999999 273.6 29.9999999999999V-3.6000000000001C273.6 -15.2000000000001 265.3 -25.2000000000001 253.9 -27.2000000000001C229.3 -31.4000000000001 203.5 -31.6000000000001 178 -27.2000000000001C166.5 -25.2000000000001 158 -15.3000000000001 158 -3.6000000000001V30C137.7 37.2 119.1 48 103.1 61.7L74 45C64 39.2 51.1 41.4 43.7 50.3C27.5 69.7 10.4 91.9 1.5 116C-2.5 126.9 1.9 139.2 12 145.1L45.3 161.9C41.4 182.8 41.4 204.3000000000001 45.3 225.3000000000001L12 242.2C1.9 248 -2.6 260.3 1.5 271.2C10.4 295.4 27.5 317.6 43.7 337C51.1 345.9 63.9 348.1 74 342.3L103.1 325.5C119.1 339.2 137.7 350.1 158 357.2V390.9C158 402.4 166.2 412.4 177.6 414.4C202.2 418.6 228.1 418.8 253.6 414.5C265.1 412.5 273.6 402.6 273.6 390.9V357.3C293.9000000000001 350.1 312.5 339.3 328.5 325.6L357.6 342.4C367.6 348.2 380.5 346 387.9000000000001 337.1C404.1 317.7 421.1 295.5 430.0000000000001 271.3C434.0000000000001 260.4 430.1000000000001 248.1 420.0000000000001 242.2L386.3000000000001 225.4C390.2000000000001 204.4 390.2000000000001 182.9 386.3000000000001 161.9zM268.7000000000001 140.8C327.9000000000001 217.8 240.0000000000001 305.7 163.0000000000001 246.5C103.8000000000001 169.5 191.7000000000001 81.5999999999999 268.7000000000001 140.8zM512.1 -41.9L503.9 -56.2C500.9 -61.5000000000001 494.5000000000001 -63.7 488.8 -61.6C477 -57.2 466.2 -50.9 456.7 -43C452.1 -39.2 450.9 -32.5 453.9 -27.3L462.1 -13C455.2 -5 449.8 4.3 446.2 14.4H429.7C423.7 14.4 418.5 18.7 417.5 24.7C415.5 36.7 415.4 49.3 417.5 61.8C418.5 67.8 423.7 72.2 429.7 72.2H446.2C449.8 82.3 455.2 91.6 462.1 99.6L453.9 113.9C450.9 119.1 452 125.8 456.7 129.6C466.2 137.5 477.1 143.8 488.8 148.2C494.5 150.3 500.9 148.1 503.9 142.8L512.1 128.5C522.6 130.4 533.3000000000001 130.4 543.8000000000001 128.5L552.0000000000001 142.8C555.0000000000001 148.1 561.4000000000001 150.3 567.1000000000001 148.2C578.9000000000001 143.8 589.7000000000002 137.5 599.2000000000002 129.6C603.8000000000002 125.8 605.0000000000001 119.1 602.0000000000001 113.9L593.8000000000001 99.6C600.7 91.6 606.1 82.3 609.7 72.2H626.2C632.2 72.2 637.4000000000001 67.9 638.4000000000001 61.9C640.4000000000001 49.9 640.5000000000001 37.3 638.4000000000001 24.8C637.4000000000001 18.8 632.2 14.4 626.2 14.4H609.7C606.1 4.3 600.7 -5 593.8000000000001 -13L602.0000000000001 -27.3C605.0000000000001 -32.5 603.9000000000001 -39.2 599.2000000000002 -43C589.7000000000002 -50.9 578.8000000000002 -57.2 567.1000000000001 -61.6C561.4000000000001 -63.7 555.0000000000001 -61.5 552.0000000000001 -56.2L543.8000000000001 -41.9C533.4000000000001 -43.8 522.6 -43.8 512.1 -41.9zM501.6 17C540.1 -12.6 584 31.3 554.4 69.8C515.9 99.4 472 55.5 501.6 17z" />
-    <glyph glyph-name="coins"
-      unicode="&#xF51E;"
-      horiz-adv-x="512" d=" M0 42.7V0C0 -35.3 86 -64 192 -64S384 -35.3 384 0V42.7C342.7 13.6 267.2 0 192 0S41.3 13.6 0 42.7zM320 320C426 320 512 348.7 512 384S426 448 320 448S128 419.3 128 384S214 320 320 320zM0 147.6V96C0 60.7 86 32 192 32S384 60.7 384 96V147.6C342.7 113.6 267.1 96 192 96S41.3 113.6 0 147.6zM416 136.6C473.3 147.7000000000001 512 168.3 512 192V234.7000000000001C488.8 218.3000000000001 454.7 207.1000000000001 416 200.2000000000001V136.6zM192 288C86 288 0 252.2 0 208S86 128 192 128S384 163.8 384 208S298 288 192 288zM411.3 231.7C471.3 242.5 512 263.7 512 288V330.7C476.5 305.6 415.5 292.1 351.3 288.9C380.8 274.6 402.5 255.4 411.3 231.7z" />
-    <glyph glyph-name="columns"
-      unicode="&#xF0DB;"
-      horiz-adv-x="512" d=" M464 416H48C21.49 416 0 394.51 0 368V16C0 -10.51 21.49 -32 48 -32H464C490.51 -32 512 -10.51 512 16V368C512 394.51 490.51 416 464 416zM224 32H64V288H224V32zM448 32H288V288H448V32z" />
-    <glyph glyph-name="comment-alt"
-      unicode="&#xF27A;"
-      horiz-adv-x="512" d=" M448 448H64C28.7 448 0 419.3 0 384V96C0 60.7 28.7 32 64 32H160V-52C160 -61.8 171.2 -67.5 179.1 -61.7L304 32H448C483.3 32 512 60.7 512 96V384C512 419.3 483.3 448 448 448z" />
-    <glyph glyph-name="comment-dots"
-      unicode="&#xF4AD;"
-      horiz-adv-x="512" d=" M256 416C114.6 416 0 322.9 0 208C0 158.4 21.4 113 57 77.3C44.5 26.9 2.7 -18 2.2 -18.5C0 -20.8 -0.6 -24.2 0.7 -27.2S4.8 -32 8 -32C74.3 -32 124 -0.2 148.6 19.4C181.3 7.1 217.6 0 256 0C397.4 0 512 93.1 512 208S397.4 416 256 416zM128 176C110.3 176 96 190.3 96 208S110.3 240 128 240S160 225.7 160 208S145.7 176 128 176zM256 176C238.3 176 224 190.3 224 208S238.3 240 256 240S288 225.7 288 208S273.7 176 256 176zM384 176C366.3 176 352 190.3 352 208S366.3 240 384 240S416 225.7 416 208S401.7 176 384 176z" />
-    <glyph glyph-name="comment-slash"
-      unicode="&#xF4B3;"
-      horiz-adv-x="640" d=" M64 208C64 158.4 85.4 113 121 77.3C108.4 27 66.7 -17.9 66.2 -18.5C64 -20.8 63.4 -24.2 64.7 -27.2C66 -30.1 68.8 -32 72 -32C138.3 -32 188 -0.2 212.6 19.4C245.3 7.1 281.6 0 320 0C347.4 0 373.7 3.6 398.4 10L72.9 261.6C67.3 244.5 64 226.6 64 208zM633.8 -10.1L519.4 78.3C554.6 113.9 576 158.8 576 208C576 322.9 461.4 416 320 416C254.9 416 195.8 395.9 150.6 363.3L45.5 444.6C38.5 450 28.5 448.8 23 441.8L3.4 416.6C-2 409.6 -0.8 399.6 6.2 394.2L594.6 -60.5C601.6 -65.9 611.6 -64.7 617.1 -57.7L636.7 -32.4C642.1 -25.6 640.8000000000001 -15.5 633.8000000000001 -10.1z" />
-    <glyph glyph-name="comment"
-      unicode="&#xF075;"
-      horiz-adv-x="512" d=" M256 416C114.6 416 0 322.9 0 208C0 158.4 21.4 113 57 77.3C44.5 26.9 2.7 -18 2.2 -18.5C0 -20.8 -0.6 -24.2 0.7 -27.2S4.8 -32 8 -32C74.3 -32 124 -0.2 148.6 19.4C181.3 7.1 217.6 0 256 0C397.4 0 512 93.1 512 208S397.4 416 256 416z" />
-    <glyph glyph-name="comments"
-      unicode="&#xF086;"
-      horiz-adv-x="576" d=" M416 256C416 344.4 322.9 416 208 416S0 344.4 0 256C0 221.7 14.1 190.1 38 164C24.6 133.8 2.5 109.8 2.2 109.5C0 107.2 -0.6 103.8 0.7 100.8S4.8 96 8 96C44.6 96 74.9 108.3 96.7 121C128.9 105.3 167 96 208 96C322.9 96 416 167.6 416 256zM538 36C561.9 62 576 93.7 576 128C576 194.9 522.5 252.2 446.7 276.1C447.6 269.5 448 262.8 448 256C448 150.1 340.3 64 208 64C197.2 64 186.7 64.8 176.3 65.9C207.8 8.4 281.8 -32 368 -32C409 -32 447.1 -22.8 479.3 -7C501.1 -19.7 531.4 -32 568 -32C571.2 -32 574.1 -30.1 575.3 -27.2C576.5999999999999 -24.3 576 -20.9 573.8 -18.5C573.5 -18.2 551.4 5.7 538 36z" />
-    <glyph glyph-name="compact-disc"
-      unicode="&#xF51F;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM88 192H56C56 297.9 142.1 384 248 384V352C159.8 352 88 280.2 88 192zM248 96C195 96 152 139 152 192S195 288 248 288S344 245 344 192S301 96 248 96zM248 224C230.3 224 216 209.7 216 192S230.3 160 248 160S280 174.3 280 192S265.7 224 248 224z" />
-    <glyph glyph-name="compass"
-      unicode="&#xF14E;"
-      horiz-adv-x="512" d=" M504 192C504 55.033 392.967 -56 256 -56S8 55.033 8 192S119.033 440 256 440S504 328.967 504 192zM307.4460000000001 327.156L204.804 229.377A23.997 23.997 0 0 1 198.0320000000001 217.648L164.673 79.869C158.993 56.41 187.4500000000001 40.551 204.553 56.845L307.1930000000001 154.624A23.99 23.99 0 0 1 313.9650000000001 166.353L347.324 304.132C352.942 327.3300000000001 324.733 343.625 307.4460000000001 327.156zM256 224C238.327 224 224 209.673 224 192S238.327 160 256 160S288 174.327 288 192S273.673 224 256 224z" />
-    <glyph glyph-name="compress"
-      unicode="&#xF066;"
-      horiz-adv-x="448" d=" M436 256H312C298.7 256 288 266.7 288 280V404C288 410.6 293.4 416 300 416H340C346.6 416 352 410.6 352 404V320H436C442.6 320 448 314.6 448 308V268C448 261.4 442.6 256 436 256zM160 280V404C160 410.6 154.6 416 148 416H108C101.4 416 96 410.6 96 404V320H12C5.4 320 0 314.6 0 308V268C0 261.4 5.4 256 12 256H136C149.3 256 160 266.7 160 280zM160 -20V104C160 117.3 149.3 128 136 128H12C5.4 128 0 122.6 0 116V76C0 69.4 5.4 64 12 64H96V-20C96 -26.6 101.4 -32 108 -32H148C154.6 -32 160 -26.6 160 -20zM352 -20V64H436C442.6 64 448 69.4 448 76V116C448 122.6 442.6 128 436 128H312C298.7 128 288 117.3 288 104V-20C288 -26.6 293.4 -32 300 -32H340C346.6 -32 352 -26.6 352 -20z" />
-    <glyph glyph-name="concierge-bell"
-      unicode="&#xF562;"
-      horiz-adv-x="512" d=" M288 317.4600000000001V336H304C312.84 336 320 343.16 320 352V368C320 376.8400000000001 312.84 384 304 384H208C199.16 384 192 376.8400000000001 192 368V352C192 343.16 199.16 336 208 336H224V317.4600000000001C115.49 301.89 32 208.82 32 96H480C480 208.82 396.51 301.89 288 317.4600000000001zM496 64H16C7.16 64 0 56.84 0 48V16C0 7.16 7.16 0 16 0H496C504.84 0 512 7.16 512 16V48C512 56.84 504.84 64 496 64z" />
-    <glyph glyph-name="cookie-bite"
-      unicode="&#xF564;"
-      horiz-adv-x="512" d=" M510.52 192.18C440.55 193.03 384.05 249.87 384.05 320.04C313.88 320.04 257.05 376.53 256.19 446.49C228.93 450.63 201.06 446.19 176.47 433.67L107.34 398.45A132.221 132.221 0 0 1 49.55 340.64L14.4499999999999 271.76A132.645 132.645 0 0 1 1.6299999999999 190.81L13.7099999999999 114.54A132.521 132.521 0 0 1 50.8699999999999 41.58L105.6399999999999 -13.1799999999999A132.036 132.036 0 0 1 178.3499999999999 -50.2399999999999L255.06 -62.3899999999999C282.57 -66.7499999999999 310.76 -62.2799999999999 335.5899999999999 -49.6299999999999L404.7199999999999 -14.42A132.273 132.273 0 0 1 462.5099999999999 43.39L497.61 112.27C510.17 136.91 514.62 164.85 510.52 192.18zM176 80C158.33 80 144 94.33 144 112S158.33 144 176 144S208 129.67 208 112S193.67 80 176 80zM208 240C190.33 240 176 254.33 176 272S190.33 304 208 304S240 289.67 240 272S225.67 240 208 240zM368 112C350.33 112 336 126.33 336 144S350.33 176 368 176S400 161.67 400 144S385.67 112 368 112z" />
-    <glyph glyph-name="cookie"
-      unicode="&#xF563;"
-      horiz-adv-x="512" d=" M510.37 193.21L498.29 269.4700000000001A132.493 132.493 0 0 1 461.13 342.42L406.37 397.17C386.64 416.8900000000001 361.19 429.87 333.6600000000001 434.2200000000001L256.9600000000001 446.37C229.4500000000001 450.73 201.2700000000001 446.2600000000001 176.4400000000001 433.61L107.32 398.4A132.25 132.25 0 0 1 49.53 340.6L14.43 271.7200000000001A132.602 132.602 0 0 1 1.61 190.78L13.69 114.51A132.493 132.493 0 0 1 50.85 41.56L105.61 -13.19A132.087 132.087 0 0 1 178.32 -50.24L255.02 -62.38C282.53 -66.74 310.71 -62.27 335.54 -49.63L404.66 -14.42A132.302 132.302 0 0 1 462.45 43.38L497.55 112.25C510.26 137.21 514.75 165.55 510.37 193.21zM176 80C158.33 80 144 94.33 144 112S158.33 144 176 144S208 129.67 208 112S193.67 80 176 80zM208 240C190.33 240 176 254.33 176 272S190.33 304 208 304S240 289.67 240 272S225.67 240 208 240zM368 112C350.33 112 336 126.33 336 144S350.33 176 368 176S400 161.67 400 144S385.67 112 368 112z" />
-    <glyph glyph-name="copy"
-      unicode="&#xF0C5;"
-      horiz-adv-x="448" d=" M320 0V-40C320 -53.255 309.255 -64 296 -64H24C10.745 -64 0 -53.255 0 -40V328C0 341.255 10.745 352 24 352H96V56C96 25.121 121.121 0 152 0H320zM320 344V448H152C138.745 448 128 437.255 128 424V56C128 42.745 138.745 32 152 32H424C437.255 32 448 42.745 448 56V320H344C330.8 320 320 330.8 320 344zM440.971 375.029L375.029 440.971A24 24 0 0 1 358.0590000000001 448H352V352H448V358.059A24 24 0 0 1 440.971 375.029z" />
-    <glyph glyph-name="copyright"
-      unicode="&#xF1F9;"
-      horiz-adv-x="512" d=" M256 440C119.033 440 8 328.967 8 192S119.033 -56 256 -56S504 55.033 504 192S392.967 440 256 440zM373.134 93.247C371.5420000000001 91.38 333.358 47.516 263.283 47.516C178.591 47.516 118.799 110.776 118.799 193.083C118.799 274.386 180.803 336.4840000000001 262.5610000000001 336.4840000000001C329.5180000000001 336.4840000000001 364.5260000000001 299.1690000000001 365.9830000000001 297.5800000000001A12 12 0 0 0 367.2210000000001 282.9570000000001L344.8410000000001 248.3020000000001C340.7920000000001 242.0350000000001 332.0670000000001 240.9510000000001 326.6070000000001 246.0070000000001C326.3740000000001 246.2210000000001 300.0780000000001 269.8870000000001 264.7270000000001 269.8870000000001C218.6110000000001 269.8870000000001 190.8110000000001 236.3120000000001 190.8110000000001 193.8050000000001C190.8110000000001 154.2030000000001 216.3250000000001 114.1130000000001 265.0880000000001 114.1130000000001C303.7850000000001 114.1130000000001 330.3680000000001 142.4510000000001 330.6320000000001 142.7380000000001C335.7640000000001 148.3030000000001 344.6910000000001 147.7710000000001 349.1400000000001 141.6850000000001L373.6870000000001 108.1130000000001A12.001000000000001 12.001000000000001 0 0 0 373.1340000000001 93.2470000000001z" />
-    <glyph glyph-name="couch"
-      unicode="&#xF4B8;"
-      horiz-adv-x="640" d=" M160 224V160H480V224C480 259.3 508.7 288 544 288H576C576 341 533 384 480 384H160C107 384 64 341 64 288H96C131.3 288 160 259.3 160 224zM576 256H544C526.3 256 512 241.7 512 224V128H128V224C128 241.7 113.7 256 96 256H64C28.7 256 0 227.3 0 192C0 168.4 13 148 32 136.9V16C32 7.2 39.2 0 48 0H112C120.8 0 128 7.2 128 16V32H512V16C512 7.2 519.2 0 528 0H592C600.8 0 608 7.2 608 16V136.9C627 148 640 168.4 640 192C640 227.3 611.3 256 576 256z" />
-    <glyph glyph-name="credit-card"
-      unicode="&#xF09D;"
-      horiz-adv-x="576" d=" M0 16C0 -10.5 21.5 -32 48 -32H528C554.5 -32 576 -10.5 576 16V192H0V16zM192 84C192 90.6 197.4 96 204 96H340C346.6 96 352 90.6 352 84V44C352 37.4 346.6 32 340 32H204C197.4 32 192 37.4 192 44V84zM64 84C64 90.6 69.4 96 76 96H148C154.6 96 160 90.6 160 84V44C160 37.4 154.6 32 148 32H76C69.4 32 64 37.4 64 44V84zM576 368V320H0V368C0 394.5 21.5 416 48 416H528C554.5 416 576 394.5 576 368z" />
-    <glyph glyph-name="crop-alt"
-      unicode="&#xF565;"
-      horiz-adv-x="512" d=" M488 96H448V352C448 369.67 433.67 384 416 384H192V288H352V-40C352 -53.25 362.75 -64 376 -64H424C437.25 -64 448 -53.25 448 -40V0H488C501.25 0 512 10.75 512 24V72C512 85.26 501.25 96 488 96zM160 424C160 437.26 149.25 448 136 448H88C74.75 448 64 437.26 64 424V384H24C10.75 384 0 373.26 0 360V312C0 298.75 10.75 288 24 288H64V32C64 14.33 78.33 0 96 0H320V96H160V424z" />
-    <glyph glyph-name="crop"
-      unicode="&#xF125;"
-      horiz-adv-x="512" d=" M488 96H448V338.75L507.31 398.06C513.56 404.31 513.56 414.44 507.31 420.69L484.69 443.31C478.44 449.56 468.31 449.56 462.06 443.31L402.75 384H192V288H306.75L160 141.25V424C160 437.26 149.25 448 136 448H88C74.75 448 64 437.26 64 424V384H24C10.75 384 0 373.26 0 360V312C0 298.75 10.75 288 24 288H64V24C64 10.75 74.75 0 88 0H320V96H205.25L352 242.75V-40C352 -53.25 362.75 -64 376 -64H424C437.25 -64 448 -53.25 448 -40V0H488C501.25 0 512 10.75 512 24V72C512 85.26 501.25 96 488 96z" />
-    <glyph glyph-name="crosshairs"
-      unicode="&#xF05B;"
-      horiz-adv-x="512" d=" M500 224H469.636C455.724 317.675 381.675 391.724 288 405.636V436C288 442.627 282.627 448 276 448H236C229.373 448 224 442.627 224 436V405.636C130.325 391.724 56.276 317.675 42.364 224H12C5.373 224 0 218.627 0 212V172C0 165.373 5.373 160 12 160H42.364C56.276 66.325 130.325 -7.724 224 -21.636V-52C224 -58.627 229.373 -64 236 -64H276C282.627 -64 288 -58.627 288 -52V-21.636C381.675 -7.724 455.724 66.325 469.636 160H500C506.627 160 512 165.373 512 172V212C512 218.627 506.627 224 500 224zM288 43.366V84C288 90.627 282.627 96 276 96H236C229.373 96 224 90.627 224 84V43.366C165.826 55.768 119.783 101.757 107.366 160H148C154.627 160 160 165.373 160 172V212C160 218.627 154.627 224 148 224H107.366C119.768 282.174 165.757 328.217 224 340.634V300C224 293.373 229.373 288 236 288H276C282.627 288 288 293.373 288 300V340.634C346.174 328.232 392.217 282.243 404.634 224H364C357.373 224 352 218.627 352 212V172C352 165.373 357.373 160 364 160H404.634C392.2320000000001 101.826 346.243 55.783 288 43.366zM288 192C288 174.327 273.673 160 256 160S224 174.327 224 192C224 209.673 238.327 224 256 224S288 209.673 288 192z" />
-    <glyph glyph-name="crow"
-      unicode="&#xF520;"
-      horiz-adv-x="640" d=" M544 416H527.64C513.04 435.32 490.09 448 464 448C419.82 448 384 412.18 384 368V347.02L12.09 54.43A30.216 30.216 0 0 1 0 30.26C0 7.8 23.64 -6.81 43.73 3.23L165.27 64H261.76L306.17 -56.1C308.44 -62.33 315.32 -65.5400000000001 321.55 -63.27L344.1 -55.0600000000001C350.33 -52.7900000000001 353.54 -45.9100000000001 351.27 -39.6800000000001L312.94 64H352C353.9100000000001 64 355.76 64.23 357.6600000000001 64.29L402.17 -56.09C404.44 -62.32 411.32 -65.53 417.55 -63.26L440.1 -55.05C446.3300000000001 -52.78 449.54 -45.9 447.2700000000001 -39.67L406.0300000000001 71.86C485.74 95.2 544 168.74 544 256V336L640 352C640 387.35 597.02 416 544 416zM464 344C450.75 344 440 354.75 440 368C440 381.26 450.75 392 464 392S488 381.26 488 368C488 354.75 477.25 344 464 344z" />
-    <glyph glyph-name="crown"
-      unicode="&#xF521;"
-      horiz-adv-x="640" d=" M528 0H112C103.2 0 96 -7.2 96 -16V-48C96 -56.8 103.2 -64 112 -64H528C536.8 -64 544 -56.8 544 -48V-16C544 -7.2 536.8 0 528 0zM592 320C565.5 320 544 298.5 544 272C544 264.9 545.6 258.3 548.4 252.2L476 208.8C460.6 199.6 440.7 204.8 431.8 220.4L350.3 363C361 371.8 368 385 368 400C368 426.5 346.5 448 320 448S272 426.5 272 400C272 385 279 371.8 289.7 363L208.2 220.4C199.3 204.8 179.3 199.6 164 208.8L91.7 252.2C94.4 258.2000000000001 96.1 264.9 96.1 272C96.1 298.5 74.6 320 48.1 320S0 298.5 0 272S21.5 224 48 224C50.6 224 53.2 224.4 55.7 224.8L128 32H512L584.3 224.8C586.8 224.4 589.4 224 592 224C618.5 224 640 245.5 640 272S618.5 320 592 320z" />
-    <glyph glyph-name="cube"
-      unicode="&#xF1B2;"
-      horiz-adv-x="512" d=" M239.1 441.7L31.1 363.7C12.4 356.7 0 338.7 0 318.7V93.6C0 75.4 10.3 58.8 26.5 50.7L234.5 -53.3C248 -60.1 263.9 -60.1 277.4 -53.3L485.4 50.7C501.7 58.8000000000001 511.9 75.5000000000001 511.9 93.6V318.7C511.9 338.7 499.5 356.6 480.8 363.6L272.8 441.6C262 445.8 250 445.8 239.1 441.7zM256 379.6L448 307.6V306.5L256 228.5L64 306.5V307.6L256 379.6zM288 23.6V172.5L448 237.5V103.6L288 23.6z" />
-    <glyph glyph-name="cubes"
-      unicode="&#xF1B3;"
-      horiz-adv-x="512" d=" M488.6 197.8L392 234V342.5C392 357.5 382.7 370.9 368.6 376.2L268.6 413.7C260.5 416.8 251.5000000000001 416.8 243.3 413.7L143.3 376.2C129.2 370.9 119.9 357.5 119.9 342.5V234L23.3 197.8C9.3 192.5 0 179.1 0 164.1V54C0 40.4 7.7 27.9 19.9 21.8L119.9 -28.2C130 -33.3 142 -33.3 152.1 -28.2L256 23.8L359.9 -28.2C370 -33.3 382 -33.3 392.1 -28.2L492.1 21.8C504.3 27.9 511.9999999999999 40.4 511.9999999999999 54V164.1C511.9999999999999 179.1 502.6999999999999 192.5 488.6 197.8zM358 233.2L273 201.3V269.5L358 306.5V233.2zM154 343.9L256 382.1L358 343.9V343.3L256 301.9L154 343.3V343.9zM238 52.8L153 10.3V89.4L238 128.2V52.8zM238 164.8L136 123.4L34 164.8V165.4L136 203.6L238 165.4V164.8zM478 52.8L393 10.3V89.4L478 128.2V52.8zM478 164.8L376 123.4L274 164.8V165.4L376 203.6L478 165.4V164.8z" />
-    <glyph glyph-name="cut"
-      unicode="&#xF0C4;"
-      horiz-adv-x="448" d=" M278.06 192L444.48 358.43C449.17 363.12 449.17 370.7200000000001 444.48 375.4C411.68 408.2 358.49 408.2 325.69 375.4L210.18 259.88L185.32 284.74C189.63 295.66 192 307.55 192 320C192 373.02 149.02 416 96 416S0 373.02 0 320S42.98 224 96 224C100.54 224 104.99 224.32 109.36 224.93L142.29 192L109.36 159.07C104.99 159.68 100.53 160 96 160C42.98 160 0 117.02 0 64S42.98 -32 96 -32S192 10.98 192 64C192 76.45 189.63 88.34 185.32 99.26L210.18 124.12L325.69 8.6C358.49 -24.2 411.68 -24.2 444.48 8.6C449.17 13.28 449.17 20.88 444.48 25.5700000000001L278.06 192zM96 288C78.36 288 64 302.36 64 320S78.36 352 96 352S128 337.64 128 320S113.64 288 96 288zM96 32C78.36 32 64 46.36 64 64S78.36 96 96 96S128 81.64 128 64S113.64 32 96 32z" />
-    <glyph glyph-name="database"
-      unicode="&#xF1C0;"
-      horiz-adv-x="448" d=" M448 374.857V329.1430000000001C448 288.857 347.667 256 224 256S0 288.857 0 329.1430000000001V374.857C0 415.1430000000001 100.333 448 224 448S448 415.1430000000001 448 374.857zM448 272V169.143C448 128.857 347.667 96 224 96S0 128.857 0 169.143V272C48.125 238.857 136.208 223.428 224 223.428S399.874 238.857 448 272zM448 112V9.143C448 -31.143 347.667 -64 224 -64S0 -31.143 0 9.143V112C48.125 78.857 136.208 63.428 224 63.428S399.874 78.857 448 112z" />
-    <glyph glyph-name="deaf"
-      unicode="&#xF2A4;"
-      horiz-adv-x="512" d=" M216 188C216 172.536 203.464 160 188 160S160 172.536 160 188C160 232.112 195.888 268 240 268S320 232.112 320 188C320 172.536 307.464 160 292 160S264 172.536 264 188C264 201.234 253.233 212 240 212S216 201.234 216 188zM240 364C142.953 364 64 285.0470000000001 64 188C64 172.536 76.536 160 92 160S120 172.536 120 188C120 254.168 173.832 308 240 308S360 254.168 360 188C360 112.836 288.991 117.689 288.003 44.378L288 44C288 15.327 264.673 -8 236 -8C220.536 -8 208 -20.536 208 -36S220.536 -64 236 -64C295.475 -64 343.876 -15.672 344 43.774C344.5950000000001 78.202 416 92.014 416 188C416 285.0470000000001 337.0470000000001 364 240 364zM508.485 416.201L480.2 444.485C475.513 449.171 467.916 449.171 463.229 444.485L376.2 357.456C371.514 352.77 371.514 345.1720000000001 376.2 340.485L404.485 312.2C409.171 307.514 416.769 307.514 421.4550000000001 312.2L508.485 399.229C513.172 403.917 513.172 411.515 508.485 416.201zM168.97 133.255C164.284 137.941 156.686 137.941 152 133.255L3.515 -15.23C-1.171 -19.916 -1.171 -27.514 3.515 -32.201L31.8 -60.485C36.487 -65.171 44.084 -65.171 48.771 -60.485L197.256 88C201.942 92.686 201.942 100.284 197.256 104.971L168.97 133.255z" />
-    <glyph glyph-name="desktop"
-      unicode="&#xF108;"
-      horiz-adv-x="576" d=" M528 448H48C21.5 448 0 426.5 0 400V80C0 53.5 21.5 32 48 32H240L224 -16H152C138.7 -16 128 -26.7 128 -40S138.7 -64 152 -64H424C437.3 -64 448 -53.3 448 -40S437.3 -16 424 -16H352L336 32H528C554.5 32 576 53.5 576 80V400C576 426.5 554.5 448 528 448zM512 96H64V384H512V96z" />
-    <glyph glyph-name="diagnoses"
-      unicode="&#xF470;"
-      horiz-adv-x="640" d=" M496 192C504.8 192 512 199.2 512 208S504.8 224 496 224S480 216.8 480 208S487.2 192 496 192zM320 272C368.5 272 408 311.5 408 360S368.5 448 320 448S232 408.5 232 360S271.5 272 320 272zM59.8 84C70 68.7 89.1 66.2 102.7 74.2C118.9 83.8 158.9 105.9 208 122.8V32H432V122.7C481.1 105.9 521.1 83.7 537.3 74.1C550.9 66.1 570 68.8 580.1999999999999 83.9L597.9999999999999 110.6C606.7999999999998 123.8 605.5999999999999 145.2 587.9999999999999 155.7C576.0999999999999 162.8 558.2999999999998 172.7 536.8999999999999 183.1C508.7999999999998 137 437.4999999999999 165.3 449.1999999999999 218.2C409.3 230.8 365.1 240 320 240C263 240 207.1 225.5 160 207.8C159.8 167.6 112.4 144.5 80.8 171.8C69.6 165.8 59.5 160.2 52.1 155.8C34.5 145.3 33.3 124 42.1 110.7L59.8 84zM368 104C381.3 104 392 93.3 392 80S381.3 56 368 56S344 66.7 344 80S354.7 104 368 104zM272 200C285.3 200 296 189.3 296 176S285.3 152 272 152S248 162.7 248 176S258.7 200 272 200zM112 192C120.8 192 128 199.2 128 208S120.8 224 112 224S96 216.8 96 208S103.2 192 112 192zM624 0H16C7.2 0 0 -7.2 0 -16V-48C0 -56.8 7.2 -64 16 -64H624C632.8 -64 640 -56.8 640 -48V-16C640 -7.2 632.8 0 624 0z" />
-    <glyph glyph-name="dice-five"
-      unicode="&#xF523;"
-      horiz-adv-x="448" d=" M384 416H64C28.65 416 0 387.35 0 352V32C0 -3.35 28.65 -32 64 -32H384C419.35 -32 448 -3.35 448 32V352C448 387.35 419.35 416 384 416zM128 64C110.33 64 96 78.33 96 96S110.33 128 128 128S160 113.67 160 96S145.67 64 128 64zM128 256C110.33 256 96 270.3300000000001 96 288S110.33 320 128 320S160 305.67 160 288S145.67 256 128 256zM224 160C206.33 160 192 174.33 192 192S206.33 224 224 224S256 209.67 256 192S241.67 160 224 160zM320 64C302.33 64 288 78.33 288 96S302.33 128 320 128S352 113.67 352 96S337.67 64 320 64zM320 256C302.33 256 288 270.3300000000001 288 288S302.33 320 320 320S352 305.67 352 288S337.67 256 320 256z" />
-    <glyph glyph-name="dice-four"
-      unicode="&#xF524;"
-      horiz-adv-x="448" d=" M384 416H64C28.65 416 0 387.35 0 352V32C0 -3.35 28.65 -32 64 -32H384C419.35 -32 448 -3.35 448 32V352C448 387.35 419.35 416 384 416zM128 64C110.33 64 96 78.33 96 96S110.33 128 128 128S160 113.67 160 96S145.67 64 128 64zM128 256C110.33 256 96 270.3300000000001 96 288S110.33 320 128 320S160 305.67 160 288S145.67 256 128 256zM320 64C302.33 64 288 78.33 288 96S302.33 128 320 128S352 113.67 352 96S337.67 64 320 64zM320 256C302.33 256 288 270.3300000000001 288 288S302.33 320 320 320S352 305.67 352 288S337.67 256 320 256z" />
-    <glyph glyph-name="dice-one"
-      unicode="&#xF525;"
-      horiz-adv-x="448" d=" M384 416H64C28.65 416 0 387.35 0 352V32C0 -3.35 28.65 -32 64 -32H384C419.35 -32 448 -3.35 448 32V352C448 387.35 419.35 416 384 416zM224 160C206.33 160 192 174.33 192 192S206.33 224 224 224S256 209.67 256 192S241.67 160 224 160z" />
-    <glyph glyph-name="dice-six"
-      unicode="&#xF526;"
-      horiz-adv-x="448" d=" M384 416H64C28.65 416 0 387.35 0 352V32C0 -3.35 28.65 -32 64 -32H384C419.35 -32 448 -3.35 448 32V352C448 387.35 419.35 416 384 416zM128 64C110.33 64 96 78.33 96 96S110.33 128 128 128S160 113.67 160 96S145.67 64 128 64zM128 160C110.33 160 96 174.33 96 192S110.33 224 128 224S160 209.67 160 192S145.67 160 128 160zM128 256C110.33 256 96 270.3300000000001 96 288S110.33 320 128 320S160 305.67 160 288S145.67 256 128 256zM320 64C302.33 64 288 78.33 288 96S302.33 128 320 128S352 113.67 352 96S337.67 64 320 64zM320 160C302.33 160 288 174.33 288 192S302.33 224 320 224S352 209.67 352 192S337.67 160 320 160zM320 256C302.33 256 288 270.3300000000001 288 288S302.33 320 320 320S352 305.67 352 288S337.67 256 320 256z" />
-    <glyph glyph-name="dice-three"
-      unicode="&#xF527;"
-      horiz-adv-x="448" d=" M384 416H64C28.65 416 0 387.35 0 352V32C0 -3.35 28.65 -32 64 -32H384C419.35 -32 448 -3.35 448 32V352C448 387.35 419.35 416 384 416zM128 256C110.33 256 96 270.3300000000001 96 288S110.33 320 128 320S160 305.67 160 288S145.67 256 128 256zM224 160C206.33 160 192 174.33 192 192S206.33 224 224 224S256 209.67 256 192S241.67 160 224 160zM320 64C302.33 64 288 78.33 288 96S302.33 128 320 128S352 113.67 352 96S337.67 64 320 64z" />
-    <glyph glyph-name="dice-two"
-      unicode="&#xF528;"
-      horiz-adv-x="448" d=" M384 416H64C28.65 416 0 387.35 0 352V32C0 -3.35 28.65 -32 64 -32H384C419.35 -32 448 -3.35 448 32V352C448 387.35 419.35 416 384 416zM128 256C110.33 256 96 270.3300000000001 96 288S110.33 320 128 320S160 305.67 160 288S145.67 256 128 256zM320 64C302.33 64 288 78.33 288 96S302.33 128 320 128S352 113.67 352 96S337.67 64 320 64z" />
-    <glyph glyph-name="dice"
-      unicode="&#xF522;"
-      horiz-adv-x="640" d=" M592 256H473.26C485.95 226.41 480.38 190.8 456.26 166.68L320 30.42V-16C320 -42.51 341.49 -64 368 -64H592C618.51 -64 640 -42.51 640 -16V208C640 234.51 618.51 256 592 256zM480 72C466.75 72 456 82.75 456 96C456 109.26 466.75 120 480 120S504 109.26 504 96C504 82.75 493.25 72 480 72zM433.63 258.7L258.7 433.63C239.54 452.79 208.47 452.79 189.31 433.63L14.37 258.7C-4.79 239.54 -4.79 208.47 14.37 189.31L189.3 14.37C208.46 -4.79 239.53 -4.79 258.69 14.37L433.63 189.3C452.79 208.47 452.79 239.54 433.63 258.7000000000001zM96 200C82.75 200 72 210.75 72 224C72 237.26 82.75 248 96 248S120 237.26 120 224C120 210.75 109.25 200 96 200zM224 72C210.75 72 200 82.75 200 96C200 109.26 210.75 120 224 120S248 109.26 248 96C248 82.75 237.25 72 224 72zM224 200C210.75 200 200 210.75 200 224C200 237.26 210.75 248 224 248S248 237.26 248 224C248 210.75 237.25 200 224 200zM224 328C210.75 328 200 338.75 200 352C200 365.26 210.75 376 224 376S248 365.26 248 352C248 338.75 237.25 328 224 328zM352 200C338.75 200 328 210.75 328 224C328 237.26 338.75 248 352 248S376 237.26 376 224C376 210.75 365.25 200 352 200z" />
-    <glyph glyph-name="digital-tachograph"
-      unicode="&#xF566;"
-      horiz-adv-x="640" d=" M608 352H32C14.33 352 0 337.67 0 320V64C0 46.33 14.33 32 32 32H608C625.67 32 640 46.33 640 64V320C640 337.67 625.67 352 608 352zM304 96C304 91.58 300.42 88 296 88H72C67.58 88 64 91.58 64 96V104C64 108.42 67.58 112 72 112H296C300.42 112 304 108.42 304 104V96zM72 160V176C72 180.42 75.58 184 80 184H96C100.42 184 104 180.42 104 176V160C104 155.58 100.42 152 96 152H80C75.58 152 72 155.58 72 160zM136 160V176C136 180.42 139.58 184 144 184H160C164.42 184 168 180.42 168 176V160C168 155.58 164.42 152 160 152H144C139.58 152 136 155.58 136 160zM200 160V176C200 180.42 203.58 184 208 184H224C228.42 184 232 180.42 232 176V160C232 155.58 228.42 152 224 152H208C203.58 152 200 155.58 200 160zM264 160V176C264 180.42 267.58 184 272 184H288C292.42 184 296 180.42 296 176V160C296 155.58 292.42 152 288 152H272C267.58 152 264 155.58 264 160zM304 224C304 215.16 296.84 208 288 208H80C71.16 208 64 215.16 64 224V272C64 280.8400000000001 71.16 288 80 288H288C296.84 288 304 280.8400000000001 304 272V224zM576 96C576 91.58 572.42 88 568 88H344C339.58 88 336 91.58 336 96V104C336 108.42 339.58 112 344 112H568C572.42 112 576 108.42 576 104V96z" />
-    <glyph glyph-name="divide"
-      unicode="&#xF529;"
-      horiz-adv-x="448" d=" M224 96C188.65 96 160 67.35 160 32S188.65 -32 224 -32S288 -3.35 288 32S259.35 96 224 96zM224 288C259.35 288 288 316.65 288 352S259.35 416 224 416S160 387.35 160 352S188.65 288 224 288zM416 240H32C14.33 240 0 225.67 0 208V176C0 158.33 14.33 144 32 144H416C433.67 144 448 158.33 448 176V208C448 225.67 433.67 240 416 240z" />
-    <glyph glyph-name="dizzy"
-      unicode="&#xF567;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM152 233.4L123.3 204.7C108.5 189.9 85.5 212.2 100.7 227.3L129.4 256L100.7 284.7C85.7 299.7 108.4 322.3 123.3 307.3L152 278.6L180.7 307.3C195.7 322.3 218.3 299.6 203.3 284.7L174.6 256L203.3 227.3C218.5 212.1 195.4 189.9 180.7 204.7L152 233.4zM248 32C212.7 32 184 60.7 184 96S212.7 160 248 160S312 131.3 312 96S283.3 32 248 32zM395.3 227.3C410.5 212.1 387.4000000000001 189.9 372.7 204.7L344 233.4L315.3 204.7C300.5 189.9 277.5 212.2 292.7 227.3L321.4 256L292.7 284.7C277.7 299.7 300.4 322.3 315.3 307.3L344 278.6L372.7 307.3C387.7 322.3 410.3 299.6 395.3 284.7L366.6 256L395.3 227.3z" />
-    <glyph glyph-name="dna"
-      unicode="&#xF471;"
-      horiz-adv-x="448" d=" M0.1 -46.1C-1 -55.6 6.4 -63.9 16 -63.9L48.3 -64C56.4 -64 63.2 -58.1 64.3 -50.1C65 -45.2 66.1 -39 67.7 -32H380C381.6 -38.9 382.9 -45.2 383.5 -50.1C384.6 -58.1 391.4 -64.1 399.5 -64L431.8 -63.9C441.4000000000001 -63.9 448.9000000000001 -55.6 447.7 -46.1C443.1 -8.2 422.1 82.9 328.8 161.6C311.2 149.2000000000001 291.7 137.4 270.3 126.2000000000001C276.5 121.6 281.7 116.8000000000001 287.3 112.0000000000001H159.7C181 130.1000000000001 206.7 147.6000000000001 238.4 163.4C410.5 248.9 442.1 382.2 447.9 430.1C449 439.6 441.6 447.9 432 447.9L399.6 448C391.5 448 384.7000000000001 442.1 383.6 434.1C382.9000000000001 429.2 381.8 423 380.2000000000001 416H67.8C66.2 423 65.1 429.1 64.4 434.1C63.3 442.1 56.5 448.1 48.4 448L16.1 447.9C6.5 447.9 -1 439.6 0.1 430.1C5.3 387.2 31.4 276.2 160 192C31.5 107.8 5.3 -3.2 0.1 -46.1zM224 228.4C198.9 242.1 177.6 256.8 159.7 272H288.2C270.4 256.8 249.1 242 224 228.4zM355.1 352C349.3 341.6 342.3 330.9 334.1 320H114C105.7 330.9 98.7 341.6 93 352H355.1zM92.9 32C98.7 42.4 105.7 53.1 113.9 64H333.3C341.6 53.1 348.7 42.4 354.5 32H92.9z" />
-    <glyph glyph-name="dollar-sign"
-      unicode="&#xF155;"
-      horiz-adv-x="288" d=" M209.2 214.6L101.2 246.2C88.7 249.8 80 261.5 80 274.5C80 290.8 93.2 304 109.5 304H175.8C188 304 200 300.3 210 293.5C216.1 289.4 224.3 290.4 229.5 295.5L264.3 329.5C271.4000000000001 336.4 270.4000000000001 347.9 262.5 354C238 373.2 207.4 383.9 176 384V432C176 440.8 168.8 448 160 448H128C119.2 448 112 440.8 112 432V384H109.5C45.8 384 -5.4 329.3 0.5 264.4C4.7 218.3 39.9 180.8 84.3 167.8L186.8 137.8C199.3 134.1 208 122.5 208 109.5C208 93.2 194.8 80 178.5 80H112.2C100 80 88 83.7 78 90.5C71.9 94.6 63.7 93.6 58.5 88.5L23.7 54.5C16.6 47.6 17.6 36.1 25.5 30C50 10.8 80.6 0.1 112 0V-48C112 -56.8 119.2 -64 128 -64H160C168.8 -64 176 -56.8 176 -48V0.2C222.6 1.1 266.3 28.8 281.7 72.9C303.2 134.5 267.1 197.7 209.2 214.6z" />
-    <glyph glyph-name="dolly-flatbed"
-      unicode="&#xF474;"
-      horiz-adv-x="640" d=" M208 128H592C600.8 128 608 135.2 608 144V400C608 408.8 600.8 416 592 416H448V288L400 320L352 288V416H208C199.2 416 192 408.8 192 400V144C192 135.2 199.2 128 208 128zM624 64H128V432C128 440.8 120.8 448 112 448H16C7.2 448 0 440.8 0 432V400C0 391.2 7.2 384 16 384H64V16C64 7.2 71.2 0 80 0H162.9C161.1 -5 160 -10.4 160 -16C160 -42.5 181.5 -64 208 -64S256 -42.5 256 -16C256 -10.4 254.8 -5 253.1 0H451C449.2 -5 448.1 -10.4 448.1 -16C448.1 -42.5 469.6 -64 496.1 -64S544.1 -42.5 544.1 -16C544.1 -10.4 542.9 -5 541.2 0H624C632.8 0 640 7.2 640 16V48C640 56.8 632.8 64 624 64z" />
-    <glyph glyph-name="dolly"
-      unicode="&#xF472;"
-      horiz-adv-x="576" d=" M294.2 170.3C312.2 165.3 328.9 156.9 343.7 145.6L505.2 199.4C513.6 202.2000000000001 518.1 211.3000000000001 515.3 219.6L454.9 400.8C452.1 409.2 443 413.7 434.7 410.9L373.6 390.5L406.7 291.1L346 271L312.9 370.4L251.3 349.9C242.9 347.1 238.4 338 241.2 329.7L294.2 170.3zM575.2 121.6L565 152C562.2 160.4 553.1 164.9 544.8 162.1L331.3 90.9C314.1 112.9 287.7 127.3 257.8 127.9L158.4 426.1C154 439.2 141.8 448 128 448H16C7.2 448 0 440.8 0 432V400C0 391.2 7.2 384 16 384H104.9L197.1 107.3C171 86.9 155.4 53.7 161.1 16.8C167.2 -22.6 199 -55.5 238.4000000000001 -62.4C298.6 -73.1 350.7000000000001 -27.6 351.8000000000001 30.2L565.1000000000001 101.4C573.4000000000001 104.2000000000001 578.0000000000001 113.2000000000001 575.2000000000002 121.6zM256 -16C229.5 -16 208 5.5 208 32S229.5 80 256 80S304 58.5 304 32S282.5 -16 256 -16z" />
-    <glyph glyph-name="donate"
-      unicode="&#xF4B9;"
-      horiz-adv-x="512" d=" M256 32C370.9 32 464 125.1 464 240S370.9 448 256 448S48 354.9 48 240S141.1 32 256 32zM233.8 350.6V367.4C233.8 376.6 241.2 384 250.4 384H261.5C270.7 384 278.1 376.6 278.1 367.4V350.4C293.6 349.6 308.6 344.3 321.1 335C326.7000000000001 330.9 327.3 322.7 322.3 317.9L306 302.4C302.2 298.7000000000001 296.5 298.6 292 301.4C286.6 304.8 280.6 306.5 274.2 306.5H235.3C226.3 306.5 219 298.3 219 288.2C219 280 224 272.7 231.1 270.6L293.4 251.9C319.1 244.2 337.1 219.5 337.1 191.8C337.1 157.8 310.7 130.3 278 129.4V112.6C278 103.4 270.6 96 261.3999999999999 96H250.3C241.1 96 233.7 103.4 233.7 112.6V129.6C218.1999999999999 130.4 203.1999999999999 135.7000000000001 190.6999999999999 145C185.0999999999999 149.1 184.5 157.3 189.5 162.1L205.8 177.6C209.6 181.3 215.3 181.4 219.8 178.6C225.2 175.2000000000001 231.2 173.5 237.6 173.5H276.5C285.5 173.5 292.8 181.7 292.8 191.8C292.8 200 287.8 207.3 280.7 209.4L218.3999999999999 228.1C192.6999999999999 235.8 174.6999999999999 260.5 174.6999999999999 288.2C174.7999999999999 322.2 201.0999999999999 349.7 233.8 350.6zM480 96H447.5C427.9 70 402.9 48.3 374.5 32H438.3C443.6 32 447.9000000000001 28.4 447.9000000000001 24V8C447.9000000000001 3.6 443.6 0 438.3 0H73.6C68.3 0 64 3.6 64 8V24C64 28.4 68.3 32 73.6 32H137.4C109 48.3 84.1 70 64.4 96H32C14.3 96 0 81.7 0 64V-32C0 -49.7 14.3 -64 32 -64H480C497.7 -64 512 -49.7 512 -32V64C512 81.7 497.7 96 480 96z" />
-    <glyph glyph-name="door-closed"
-      unicode="&#xF52A;"
-      horiz-adv-x="640" d=" M624 0H512V397.2C512 425.2200000000001 490.47 448 464 448H175.99C149.52 448 127.99 425.2200000000001 127.99 397.2V0H16C7.16 0 0 -7.16 0 -16V-48C0 -56.84 7.16 -64 16 -64H624C632.84 -64 640 -56.84 640 -48V-16C640 -7.16 632.84 0 624 0zM415.99 160C398.32 160 383.99 174.33 383.99 192S398.32 224 415.99 224S447.99 209.67 447.99 192C448 174.33 433.67 160 415.99 160z" />
-    <glyph glyph-name="door-open"
-      unicode="&#xF52B;"
-      horiz-adv-x="640" d=" M624 0H544V334.55C544 361.81 522.47 384 496 384H384V320H480V-64H624C632.84 -64 640 -56.84 640 -48V-16C640 -7.16 632.84 0 624 0zM312.24 446.99L120.24 397.25C105.99 393.56 96 380.3 96 365.08V0H16C7.16 0 0 -7.16 0 -16V-48C0 -56.84 7.16 -64 16 -64H352V414.82C352 436.4 332.44 452.23 312.24 446.99zM264 160C250.75 160 240 174.33 240 192S250.75 224 264 224S288 209.67 288 192S277.25 160 264 160z" />
-    <glyph glyph-name="dot-circle"
-      unicode="&#xF192;"
-      horiz-adv-x="512" d=" M256 440C119.033 440 8 328.967 8 192S119.033 -56 256 -56S504 55.033 504 192S392.967 440 256 440zM336 192C336 147.888 300.112 112 256 112S176 147.888 176 192S211.888 272 256 272S336 236.112 336 192z" />
-    <glyph glyph-name="dove"
-      unicode="&#xF4BA;"
-      horiz-adv-x="512" d=" M288 280.8V308.9C259.8 345.2 240.9 388.2 233.9 434.1C231.8 447.6 214.9 452.9 206.1 442.4000000000001C185 417.5 168.4 388.3 157.2 355.9C191.4 317.6 237.2 291.3 288 280.8zM400 384C355.8 384 320 348.1 320 303.9V244.5C215.6 250.7 127 315 87 406.2C81.5 418.7 63.8 419.4 58 407.1C41.4 372 32 332.8 32 291.4C32 220.6 66.1 154.5 117.1 105.5C130.3 92.8 143.2 82.3 156 72.7L12.1 36.7C1.4 34 -3.4 21.6 2.6 12.3C20 -14.6 63 -60.2 155.8 -64C163.8 -64.2999999999999 171.8 -61.4 177.9 -56.1L243.1 0H320C408.4 0 480 71.5 480 159.9V320L512 384H400zM400 287.9C391.2 287.9 384 295.1 384 303.9S391.2 319.9 400 319.9S416 312.7000000000001 416 303.9S408.8 287.9 400 287.9z" />
-    <glyph glyph-name="download"
-      unicode="&#xF019;"
-      horiz-adv-x="512" d=" M216 448H296C309.3 448 320 437.3 320 424V256H407.7C425.5 256 434.4 234.5 421.8 221.9L269.7 69.7C262.2 62.2 249.9 62.2 242.4 69.7L90.1 221.9C77.5 234.5 86.4 256 104.2 256H192V424C192 437.3 202.7 448 216 448zM512 72V-40C512 -53.3 501.3 -64 488 -64H24C10.7 -64 0 -53.3 0 -40V72C0 85.3 10.7 96 24 96H170.7L219.7 47C239.8 26.9 272.2 26.9 292.3 47L341.3 96H488C501.3 96 512 85.3 512 72zM388 -16C388 -5 379 4 368 4S348 -5 348 -16S357 -36 368 -36S388 -27 388 -16zM452 -16C452 -5 443 4 432 4S412 -5 412 -16S421 -36 432 -36S452 -27 452 -16z" />
-    <glyph glyph-name="drafting-compass"
-      unicode="&#xF568;"
-      horiz-adv-x="512" d=" M457.01 103.58C431.96 83.25 404.38 66.4 374.47 54.53L428.85 -39.66L482.8 -62.7C492.61 -66.8900000000001 503.6899999999999 -60.4900000000001 504.97 -49.9L511.99 8.35L457.0099999999999 103.58zM499.5 198.14C504.36 205.81 501.39 216.13 493.45 220.53L465.38 236.1C457.9 240.25 448.77 237.56 444.12 230.38C403.01 166.85 332.25 128 256 128C232.07 128 208.77 132.25 186.59 139.53L253.95 256.21C254.65 256.19 255.29 256 255.99 256S257.34 256.19 258.03 256.21L309.12 167.71C340.35 176.67 368.68 193.46 391.73 216.63L339.94 306.34C347.39 319.9700000000001 352 335.37 352 352C352 405.02 309.02 448 256 448S160 405.02 160 352C160 335.37 164.61 319.9700000000001 172.05 306.3400000000001L103.75 188.03C91.2 199.64 79.79 212.62 70.07 227.03C65.28 234.13 56.1 236.65 48.69 232.36L20.94 216.29C13.09 211.75 10.31 201.39 15.3 193.82C30.87 170.18 49.99 149.61 71.28 131.8L0 8.34L7.02 -49.91C8.3 -60.5 19.38 -66.9 29.19 -62.71L83.14 -39.67L153.94 82.96C186.13 70.72 220.62 64 256 64C355.05 64 446.88 115.01 499.5 198.14zM256 384C273.67 384 288 369.67 288 352S273.67 320 256 320S224 334.33 224 352S238.33 384 256 384z" />
-    <glyph glyph-name="drum-steelpan"
-      unicode="&#xF56A;"
-      horiz-adv-x="576" d=" M288 416C128.94 416 0 358.69 0 288V96C0 25.31 128.94 -32 288 -32S576 25.31 576 96V288C576 358.69 447.06 416 288 416zM205.01 257.64C200.56 241.03 190.47 227.07 176.7 217.16C100.23 230.54 48 257.2200000000001 48 288C48 318.16 98.11 344.39 172.04 358.03L197.64 313.69C207.5 296.6 210.12 276.7 205.01 257.64zM288 208C266.92 208 246.59 209 227.11 210.7C235.17 236.83 259.26 256 288 256S340.83 236.83 348.89 210.7C329.4100000000001 209 309.08 208 288 208zM352 352C352 316.7100000000001 323.29 288 288 288S224 316.7100000000001 224 352V365.04C244.4 366.92 265.8 368 288 368S331.6 366.92 352 365.04V352zM398.93 217.1C385.12 227.01 374.99 241 370.5300000000001 257.64C365.42 276.7 368.04 296.6 377.9100000000001 313.68L403.56 358.1C477.72 344.5 528 318.2100000000001 528 288C528 257.17 475.6 230.46 398.93 217.1z" />
-    <glyph glyph-name="drum"
-      unicode="&#xF569;"
-      horiz-adv-x="576" d=" M458.08 327.12L560.47 388.55C575.63 397.64 580.53 417.3 571.44 432.46C562.34 447.61 542.7 452.53 527.53 443.43L366.84 347.02A629.3200000000002 629.3200000000002 0 0 1 288 352C128.94 352 0 294.69 0 224V63.17C0 32.71 24.03 4.77 64 -17.2V79.17C64 96.77 78.4 111.17 96 111.17S128 96.77 128 79.17V-43.24C165.4 -54.37 209 -61.68 256 -63.99V47.16C256 64.7600000000001 270.4 79.16 288 79.16S320 64.7600000000001 320 47.16V-64C367 -61.69 410.6 -54.38 448 -43.25V79.16C448 96.7600000000001 462.4 111.16 480 111.16S512 96.7600000000001 512 79.16V-17.21C551.97 4.76 576 32.7 576 63.16V223.99C575.99 266.37 529.46 303.8300000000001 458.08 327.12zM288 144C155.45 144 48 179.82 48 224S155.45 304 288 304C290.34 304 292.62 303.9 294.94 303.88L207.53 251.44C192.37 242.35 187.47 222.69 196.56 207.53C206.12 191.6 226.07 187.92 240.47 196.56L403.18 294.18C477.55 280.5900000000001 528 254.26 528 223.99C528 179.81 420.54 144 288 144z" />
-    <glyph glyph-name="dumbbell"
-      unicode="&#xF44B;"
-      horiz-adv-x="640" d=" M104 352H56C42.7 352 32 341.3 32 328V224H8C3.6 224 0 220.4 0 216V168C0 163.6 3.6 160 8 160H32V56C32 42.7 42.7 32 56 32H104C117.3 32 128 42.7 128 56V328C128 341.3 117.3 352 104 352zM632 224H608V328C608 341.3 597.3 352 584 352H536C522.7 352 512 341.3 512 328V56C512 42.7 522.7 32 536 32H584C597.3 32 608 42.7 608 56V160H632C636.4 160 640 163.6 640 168V216C640 220.4 636.4 224 632 224zM456 416H408C394.7 416 384 405.3 384 392V224H256V392C256 405.3 245.3 416 232 416H184C170.7 416 160 405.3 160 392V-8C160 -21.3 170.7 -32 184 -32H232C245.3 -32 256 -21.3 256 -8V160H384V-8C384 -21.3 394.7 -32 408 -32H456C469.3 -32 480 -21.3 480 -8V392C480 405.3 469.3 416 456 416z" />
-    <glyph glyph-name="edit"
-      unicode="&#xF044;"
-      horiz-adv-x="576" d=" M402.6 364.8L492.8 274.6C496.6 270.8 496.6 264.6 492.8 260.8L274.4 42.4L181.6 32.1C169.2 30.7 158.7 41.2 160.1 53.6L170.4 146.4L388.8 364.8C392.6 368.6 398.8 368.6 402.6 364.8zM564.6 387.7L515.8000000000001 436.5C500.6000000000001 451.7 475.9000000000001 451.7 460.6000000000001 436.5L425.2000000000001 401.1C421.4000000000001 397.3 421.4000000000001 391.1 425.2000000000001 387.3L515.4000000000001 297.1C519.2 293.3 525.4000000000001 293.3 529.2 297.1L564.6 332.5C579.8000000000001 347.8 579.8000000000001 372.5 564.6 387.7zM384 101.8V0H64V320H293.8C297 320 300 321.3 302.3 323.5L342.3 363.5C349.9000000000001 371.1 344.5 384 333.8 384H48C21.5 384 0 362.5 0 336V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V141.8C448 152.5 435.1 157.8 427.5 150.3L387.5 110.3C385.3 108 384 105 384 101.8z" />
-    <glyph glyph-name="eject"
-      unicode="&#xF052;"
-      horiz-adv-x="448" d=" M448 64V0C448 -17.673 433.673 -32 416 -32H32C14.327 -32 0 -17.673 0 0V64C0 81.673 14.327 96 32 96H416C433.673 96 448 81.673 448 64zM48.053 128H399.939C441.5900000000001 128 463.52 177.674 435.322 208.435L259.383 400.442C240.369 421.185 207.632 421.186 188.616 400.442L12.67 208.435C-15.475 177.732 6.324 128 48.053 128z" />
-    <glyph glyph-name="ellipsis-h"
-      unicode="&#xF141;"
-      horiz-adv-x="512" d=" M328 192C328 152.2 295.8 120 256 120S184 152.2 184 192S216.2 264 256 264S328 231.8 328 192zM432 264C392.2 264 360 231.8 360 192S392.2 120 432 120S504 152.2 504 192S471.8 264 432 264zM80 264C40.2 264 8 231.8 8 192S40.2 120 80 120S152 152.2 152 192S119.8 264 80 264z" />
-    <glyph glyph-name="ellipsis-v"
-      unicode="&#xF142;"
-      horiz-adv-x="192" d=" M96 264C135.8 264 168 231.8 168 192S135.8 120 96 120S24 152.2 24 192S56.2 264 96 264zM24 368C24 328.2 56.2 296 96 296S168 328.2 168 368S135.8 440 96 440S24 407.8 24 368zM24 16C24 -23.8 56.2 -56 96 -56S168 -23.8 168 16S135.8 88 96 88S24 55.8 24 16z" />
-    <glyph glyph-name="envelope-open"
-      unicode="&#xF2B6;"
-      horiz-adv-x="512" d=" M512 -16C512 -42.51 490.51 -64 464 -64H48C21.49 -64 0 -42.51 0 -16V247.276A48 48 0 0 0 18.387 285.052C43.3 304.581 63.888 320.4170000000001 182.587 406.563C199.412 418.83 232.797 448.347 256 447.997C279.198 448.351 312.596 418.825 329.413 406.564C448.1 320.427 468.716 304.569 493.613 285.052A48 48 0 0 0 512 247.276V-16zM446.334 180.605C443.771 184.333 438.634 185.2000000000001 434.995 182.512C412.15 165.639 379.533 141.807 329.413 105.433C312.588 93.167 279.2030000000001 63.652 256 64.003C232.789 63.659 199.441 93.146 182.587 105.433C132.473 141.803 99.853 165.637 77.005 182.512C73.366 185.2 68.229 184.333 65.666 180.605L56.594 167.409A7.997999999999999 7.997999999999999 0 0 1 58.433 156.442C81.32 139.543 113.887 115.752 163.736 79.574C184.01 64.793 220.26 31.761 256 32.001C291.724 31.759 327.961 64.7720000000001 348.2630000000001 79.574C398.1130000000001 115.7530000000001 430.6810000000001 139.544 453.566 156.442A7.997999999999999 7.997999999999999 0 0 1 455.405 167.409L446.334 180.605z" />
-    <glyph glyph-name="envelope-square"
-      unicode="&#xF199;"
-      horiz-adv-x="448" d=" M400 416H48C21.49 416 0 394.51 0 368V16C0 -10.51 21.49 -32 48 -32H400C426.51 -32 448 -10.51 448 16V368C448 394.51 426.51 416 400 416zM178.117 185.896C87.429 251.713 88.353 251.879 64 270.833V296C64 309.255 74.745 320 88 320H360C373.255 320 384 309.255 384 296V270.833C359.629 251.864 360.566 251.709 269.883 185.895C259.383 178.24 238.491 159.775 224 160.001C209.497 159.783 188.633 178.228 178.117 185.896zM384 230.225V88C384 74.745 373.255 64 360 64H88C74.745 64 64 74.745 64 88V230.225C77.958 219.431 97.329 204.989 159.303 160.011C173.465 149.67 197.278 127.866 223.997 128.001C250.884 127.867 275.034 150.042 288.717 160.026C350.675 204.991 370.042 219.432 384 230.225z" />
-    <glyph glyph-name="envelope"
-      unicode="&#xF0E0;"
-      horiz-adv-x="512" d=" M502.3 257.2C506.2 260.3 512 257.4 512 252.5V48C512 21.5 490.5 0 464 0H48C21.5 0 0 21.5 0 48V252.4C0 257.4 5.7 260.2000000000001 9.7 257.1C32.1 239.7 61.8 217.6 163.8 143.5C184.9 128.1 220.5 95.7 256 95.9C291.7 95.6 328 128.7 348.3 143.5C450.3 217.6 479.9 239.8 502.3 257.2zM256 128C279.2 127.6 312.6 157.2 329.4 169.4C462.1 265.7 472.2 274.1 502.8 298.1C508.6 302.6 511.9999999999999 309.6 511.9999999999999 317V336C511.9999999999999 362.5 490.4999999999999 384 463.9999999999999 384H48C21.5 384 0 362.5 0 336V317C0 309.6 3.4 302.7 9.2 298.1C39.8 274.2 49.9 265.7 182.6 169.4C199.4 157.2 232.8 127.6 256 128z" />
-    <glyph glyph-name="equals"
-      unicode="&#xF52C;"
-      horiz-adv-x="448" d=" M416 144H32C14.33 144 0 129.67 0 112V80C0 62.33 14.33 48 32 48H416C433.67 48 448 62.33 448 80V112C448 129.67 433.67 144 416 144zM416 336H32C14.33 336 0 321.67 0 304V272C0 254.33 14.33 240 32 240H416C433.67 240 448 254.33 448 272V304C448 321.67 433.67 336 416 336z" />
-    <glyph glyph-name="eraser"
-      unicode="&#xF12D;"
-      horiz-adv-x="512" d=" M497.941 174.059C516.6859999999999 192.804 516.6859999999999 223.196 497.941 241.9410000000001L337.941 401.9410000000001C319.196 420.6860000000001 288.805 420.687 270.058 401.9410000000001L14.058 145.941C-4.687 127.196 -4.687 96.804 14.058 78.059L110.058 -17.941A48.004000000000005 48.004000000000005 0 0 1 144 -32H500C506.627 -32 512 -26.627 512 -20V20C512 26.627 506.627 32 500 32H355.883L497.941 174.059zM195.314 236.6860000000001L332.687 99.3130000000001L265.373 32H150.628L70.628 112L195.314 236.686z" />
-    <glyph glyph-name="euro-sign"
-      unicode="&#xF153;"
-      horiz-adv-x="320" d=" M310.706 34.235C309.392 40.865 302.8710000000001 45.107 296.2820000000001 43.604C285.5900000000001 41.165 268.86 38.191 250.8560000000001 38.191C194.0930000000001 38.191 148.9270000000001 72.9810000000001 129.3950000000001 123.6400000000001H243.0840000000001A12 12 0 0 1 254.7920000000001 133.009L261.165 161.369C262.851 168.8710000000001 257.146 176 249.457 176H115.22C114.01 190.328 113.806 204.287 115.357 218.245H261.95A12 12 0 0 1 273.673 227.679L280.185 257.434C281.823 264.918 276.124 272 268.462 272H130.184C150.817 316.991 192.874 347.03 247.803 347.03C262.289 347.03 276.367 344.78 285.654 342.885C291.87 341.617 298.001 345.3830000000001 299.656 351.5080000000001L311.647 395.8760000000001C313.469 402.617 309.182 409.492 302.321 410.793C290.217 413.088 270.71 416 249.635 416C152.451 416 74.03 355.748 45.075 272H12C5.373 272 0 266.627 0 260V230.245C0 223.618 5.373 218.245 12 218.245H33.569C32.56 204.638 32.388 188.958 33.388 176H12C5.373 176 0 170.627 0 164V135.64C0 129.013 5.373 123.64 12 123.64H42.114C67.139 33.308 145.264 -32 249.635 -32C275.936 -32 298.197 -27.456 310.736 -24.212C316.903 -22.617 320.763 -16.504 319.524 -10.255L310.706 34.235z" />
-    <glyph glyph-name="exchange-alt"
-      unicode="&#xF362;"
-      horiz-adv-x="512" d=" M0 280V296C0 309.255 10.745 320 24 320H384V368C384 389.367 409.899 400.0420000000001 424.971 384.971L504.971 304.971C514.343 295.598 514.343 280.4020000000001 504.971 271.03L424.971 191.03C409.956 176.018 384 186.544 384 208V256H24C10.745 256 0 266.745 0 280zM488 128H128V176C128 197.314 102.138 208.08 87.029 192.971L7.029 112.971C-2.343 103.598 -2.343 88.402 7.029 79.03L87.029 -0.97C102.057 -15.997 128 -5.437 128 16V64H488C501.255 64 512 74.745 512 88V104C512 117.255 501.255 128 488 128z" />
-    <glyph glyph-name="exclamation-circle"
-      unicode="&#xF06A;"
-      horiz-adv-x="512" d=" M504 192C504 55.003 392.957 -56 256 -56S8 55.003 8 192C8 328.9170000000001 119.043 440 256 440S504 328.9170000000001 504 192zM256 142C230.595 142 210 121.405 210 96S230.595 50 256 50S302 70.595 302 96S281.405 142 256 142zM212.327 307.346L219.745 171.346C220.092 164.982 225.354 160 231.727 160H280.273C286.646 160 291.908 164.982 292.255 171.346L299.673 307.346C300.048 314.2200000000001 294.575 320 287.6910000000001 320H224.308C217.424 320 211.952 314.2200000000001 212.327 307.346z" />
-    <glyph glyph-name="exclamation-triangle"
-      unicode="&#xF071;"
-      horiz-adv-x="576" d=" M569.517 7.987C587.975 -24.007 564.806 -64 527.94 -64H48.054C11.117 -64 -11.945 -23.945 6.477 7.987L246.423 424.015C264.89 456.024 311.1430000000001 455.966 329.577 424.015L569.517 7.987zM288 94C262.5950000000001 94 242 73.405 242 48S262.5950000000001 2 288 2S334 22.595 334 48S313.405 94 288 94zM244.327 259.346L251.745 123.346C252.092 116.982 257.354 112 263.727 112H312.273C318.646 112 323.908 116.982 324.255 123.346L331.673 259.346C332.048 266.2200000000001 326.575 272 319.6910000000001 272H256.3080000000001C249.4240000000001 272 243.9520000000001 266.2200000000001 244.3270000000001 259.346z" />
-    <glyph glyph-name="exclamation"
-      unicode="&#xF12A;"
-      horiz-adv-x="192" d=" M176 16C176 -28.112 140.112 -64 96 -64S16 -28.112 16 16S51.888 96 96 96S176 60.112 176 16zM25.26 422.801L38.86 150.801C39.499 138.028 50.041 128 62.83 128H129.17C141.959 128 152.501 138.028 153.14 150.801L166.74 422.801C167.425 436.51 156.496 448 142.77 448H49.23C35.504 448 24.575 436.51 25.26 422.801z" />
-    <glyph glyph-name="expand-arrows-alt"
-      unicode="&#xF31E;"
-      horiz-adv-x="448.1" d=" M448.1 104V-8C448.1 -21.3 437.4000000000001 -32 424.1 -32H312.1C290.7000000000001 -32 280 -6.1 295.1 9L331.3 45.2L224 152.4L116.8 45.1L153 9C168.1 -6.1 157.4 -32 136 -32H24C10.7 -32 0 -21.3 0 -8V104C0 125.4 25.9 136.1 41 121L77.2 84.8L184.5 192L77.2 299.3L41 263C25.9 247.9 0 258.6 0 280V392C0 405.3 10.7 416 24 416H136C157.4 416 168.1 390.1 153 375L116.8 338.8L224 231.6L331.3 338.9L295.1 375C280 390.1 290.7000000000001 416 312.1 416H424.1C437.4000000000001 416 448.1 405.3 448.1 392V280C448.1 258.6 422.2000000000001 247.9 407.1 263L370.9000000000001 299.2L263.6 192L370.9000000000001 84.7L407.1 120.9C422.2000000000001 136.1 448.1 125.4 448.1 104z" />
-    <glyph glyph-name="expand"
-      unicode="&#xF065;"
-      horiz-adv-x="448" d=" M0 268V392C0 405.3 10.7 416 24 416H148C154.6 416 160 410.6 160 404V364C160 357.4 154.6 352 148 352H64V268C64 261.4 58.6 256 52 256H12C5.4 256 0 261.4 0 268zM288 404V364C288 357.4 293.4 352 300 352H384V268C384 261.4 389.4 256 396 256H436C442.6 256 448 261.4 448 268V392C448 405.3 437.3 416 424 416H300C293.4 416 288 410.6 288 404zM436 128H396C389.4 128 384 122.6 384 116V32H300C293.4 32 288 26.6 288 20V-20C288 -26.6 293.4 -32 300 -32H424C437.3 -32 448 -21.3 448 -8V116C448 122.6 442.6 128 436 128zM160 -20V20C160 26.6 154.6 32 148 32H64V116C64 122.6 58.6 128 52 128H12C5.4 128 0 122.6 0 116V-8C0 -21.3 10.7 -32 24 -32H148C154.6 -32 160 -26.6 160 -20z" />
-    <glyph glyph-name="external-link-alt"
-      unicode="&#xF35D;"
-      horiz-adv-x="576" d=" M576 424V296.016C576 274.555 550.04 264.0360000000001 535.029 279.045L499.322 314.754L255.799 71.231C246.426 61.858 231.231 61.858 221.858 71.231L199.231 93.858C189.858 103.231 189.858 118.427 199.231 127.799L442.756 371.324L407.053 407.029C391.9820000000001 422.1 402.656 448 424.024 448H552C565.255 448 576 437.255 576 424zM407.029 177.206L391.029 161.206A23.999000000000002 23.999000000000002 0 0 1 384 144.235V0H64V320H328A24.003 24.003 0 0 1 344.9700000000001 327.029L360.9700000000001 343.029C376.089 358.149 365.381 384 344 384H48C21.49 384 0 362.51 0 336V-16C0 -42.51 21.49 -64 48 -64H400C426.51 -64 448 -42.51 448 -16V160.236C448 181.618 422.148 192.326 407.029 177.206z" />
-    <glyph glyph-name="external-link-square-alt"
-      unicode="&#xF360;"
-      horiz-adv-x="448" d=" M448 368V16C448 -10.51 426.51 -32 400 -32H48C21.49 -32 0 -10.51 0 16V368C0 394.51 21.49 416 48 416H400C426.51 416 448 394.51 448 368zM360 352H248.029C226.716 352 215.949 326.139 231.058 311.029L263.042 279.0420000000001L67.515 83.515C62.829 78.829 62.829 71.231 67.515 66.544L98.544 35.515C103.231 30.829 110.829 30.829 115.515 35.515L311.041 231.041L343.029 199.05C358.058 184.023 384 194.575 384 216.021V328C384 341.255 373.255 352 360 352z" />
-    <glyph glyph-name="eye-dropper"
-      unicode="&#xF1FB;"
-      horiz-adv-x="512" d=" M50.75 114.75C38.75 102.75 32 86.47 32 69.49V24L0 -32L32 -64L88 -32H133.49C150.46 -32 166.74 -25.26 178.74 -13.26L305.38 113.36L177.38 241.36L50.75 114.75zM483.88 419.88C446.41 457.38 385.6 457.38 348.13 419.88L271.04 342.79L257.94 355.89C248.5 365.33 233.29 365.2 224 355.89L183.03 314.92C173.66 305.55 173.66 290.35 183.03 280.98L344.9699999999999 119.04C354.4099999999999 109.6 369.6199999999999 109.73 378.9099999999999 119.04L419.88 160C429.25 169.37 429.25 184.57 419.88 193.94L406.78 207.04L483.87 284.13C521.38 321.61 521.38 382.39 483.88 419.88z" />
-    <glyph glyph-name="eye-slash"
-      unicode="&#xF070;"
-      horiz-adv-x="576" d=" M286.693 56.016L319.272 9.474A333.958 333.958 0 0 0 288 8C168.19 8 63.031 71.949 6.646 167.631A47.999 47.999 0 0 0 6.646 216.37C30.669 257.136 63.559 292.145 102.67 318.907L159.747 237.368C154.736 223.18 152 207.913 152 192C152 117.264 212.135 56.718 286.693 56.016zM569.354 167.631C537.687 113.894 490.607 70.1710000000001 434.1790000000001 42.1560000000001L434.1900000000001 42.1410000000001L475.6600000000001 -17.0589999999999C483.2600000000001 -27.9189999999999 480.6200000000001 -42.8789999999999 469.7600000000001 -50.4789999999999L456.6500000000001 -59.6589999999999C445.7900000000001 -67.2589999999999 430.8300000000001 -64.6189999999999 423.2300000000001 -53.759L100.34 401.06C92.74 411.92 95.38 426.88 106.24 434.48L119.35 443.6600000000001C130.21 451.26 145.17 448.62 152.77 437.76L203.808 365.1430000000001C230.68 372.224 258.905 376 288 376C407.81 376 512.969 312.051 569.354 216.369A48.00200000000001 48.00200000000001 0 0 0 569.354 167.631zM424 192C424 267.174 363.162 328 288 328C270.061 328 252.944 324.527 237.271 318.228L256.57 291.17C282.439 299.341 311.614 297.3330000000001 336.9700000000001 283.76H336.9400000000001C313.2900000000001 283.76 294.1200000000001 264.5900000000001 294.1200000000001 240.9400000000001C294.1200000000001 217.314 313.2670000000001 198.12 336.9400000000001 198.12C360.5900000000001 198.12 379.7600000000001 217.29 379.7600000000001 240.9400000000001V240.9700000000001C398.2220000000001 206.48 396.0720000000001 163.0560000000001 371.5100000000001 130.0200000000001V130.0100000000001L390.8240000000001 102.9490000000001C411.496 126.8 424 157.926 424 192zM262.014 91.273L184.484 202.03C179.47 149.643 213.798 103.6760000000001 262.014 91.273z" />
-    <glyph glyph-name="eye"
-      unicode="&#xF06E;"
-      horiz-adv-x="576" d=" M569.354 216.369C512.969 312.051 407.81 376 288 376C168.14 376 63.004 312.006 6.646 216.369A47.999 47.999 0 0 1 6.646 167.63C63.031 71.949 168.19 8 288 8C407.86 8 512.996 71.994 569.354 167.631A47.997 47.997 0 0 1 569.354 216.369zM288 56C212.838 56 152 116.827 152 192C152 267.1620000000001 212.826 328 288 328C363.1620000000001 328 424 267.174 424 192C424 116.838 363.174 56 288 56zM392 192C392 134.562 345.438 88 288 88S184 134.562 184 192C184 209.708 188.431 226.379 196.236 240.973L196.235 240.941C196.235 217.29 215.408 198.118 239.059 198.118S281.883 217.291 281.883 240.941C281.883 264.592 262.71 283.765 239.059 283.765L239.027 283.764C253.621 291.569 270.292 296 288 296C345.438 296 392 249.438 392 192z" />
-    <glyph glyph-name="fast-backward"
-      unicode="&#xF049;"
-      horiz-adv-x="512" d=" M0 12V372C0 378.6 5.4 384 12 384H52C58.6 384 64 378.6 64 372V220.1L235.5 376.6C256.1 393.7 288 379.4 288 352V220.1L459.5 376.6C480.1 393.7 512 379.4 512 352V32C512 4.6 480.1 -9.7 459.5 7.4L288 162.7V32C288 4.6 256.1 -9.7 235.5 7.4L64 162.7V12C64 5.4 58.6 0 52 0H12C5.4 0 0 5.4 0 12z" />
-    <glyph glyph-name="fast-forward"
-      unicode="&#xF050;"
-      horiz-adv-x="512" d=" M512 372V12C512 5.4 506.6 0 500 0H460C453.4 0 448 5.4 448 12V163.9L276.5 7.4C255.9 -9.8 224 4.6 224 32V163.9L52.5 7.4C31.9 -9.8 0 4.6 0 32V352C0 379.4 31.9 393.7 52.5 376.6L224 221.2V352C224 379.4 255.9 393.7 276.5 376.6L448 221.2V372C448 378.6 453.4 384 460 384H500C506.6 384 512 378.6 512 372z" />
-    <glyph glyph-name="fax"
-      unicode="&#xF1AC;"
-      horiz-adv-x="512" d=" M128 304V-16C128 -42.51 106.51 -64 80 -64H48C21.49 -64 0 -42.51 0 -16V304C0 330.51 21.49 352 48 352H80C106.51 352 128 330.51 128 304zM512 240V-16C512 -42.51 490.51 -64 464 -64H192C165.49 -64 144 -42.51 144 -16V408C144 430.091 161.909 448 184 448H391.432A39.996 39.996 0 0 0 419.716 436.284L468.285 387.715A39.999 39.999 0 0 0 480 359.432V285.258C498.641 278.667 512 260.898 512 240zM192 256H432V352H408C394.7970000000001 352 384 362.7970000000001 384 376V400H192V256zM288 52C288 58.627 282.627 64 276 64H236C229.373 64 224 58.627 224 52V12C224 5.373 229.373 0 236 0H276C282.627 0 288 5.373 288 12V52zM288 180C288 186.627 282.627 192 276 192H236C229.373 192 224 186.627 224 180V140C224 133.373 229.373 128 236 128H276C282.627 128 288 133.373 288 140V180zM416 52C416 58.627 410.627 64 404 64H364C357.373 64 352 58.627 352 52V12C352 5.373 357.373 0 364 0H404C410.627 0 416 5.373 416 12V52zM416 180C416 186.627 410.627 192 404 192H364C357.373 192 352 186.627 352 180V140C352 133.373 357.373 128 364 128H404C410.627 128 416 133.373 416 140V180z" />
-    <glyph glyph-name="feather-alt"
-      unicode="&#xF56B;"
-      horiz-adv-x="512" d=" M512 448C460.22 444.44 96.44 409.8 71.01 160.39C67.92 133.73 66.17 106.95 65.02 80.15L243.89 258.84C250.14 265.09 260.29 265.09 266.54 258.84S272.79 242.46 266.54 236.21L7.04 -23.03C-2.34 -32.4 -2.34 -47.6 7.04 -56.97C16.42 -66.3399999999999 31.63 -66.3399999999999 41.02 -56.97L98.15 0.1C140.24 0.24 182.3 2.63 224.11 7.46C277.5900000000001 12.9 321.13 33.9300000000001 356.6900000000001 64.0000000000001H255.74L402.53 112.8800000000001C413.78 127.7700000000001 423.9 143.59 432.98 160.0000000000001H351.84L458.38 213.2100000000001C500.29 315.14 510.19 421.74 512 448z" />
-    <glyph glyph-name="feather"
-      unicode="&#xF52D;"
-      horiz-adv-x="512" d=" M467.14 403.16C404.59 465.64 305.4700000000001 467.94 214.86 377.43C136.25 298.91 153.88 316.51 129.11 291.77C68.65 231.38 58.72 140.94 65.47 80.6L243.91 258.85C250.17 265.1 260.31 265.1 266.56 258.85S272.81 242.4700000000001 266.56 236.2200000000001L7.04 -23.03C-2.34 -32.4 -2.34 -47.6 7.04 -56.97C16.42 -66.3399999999999 31.64 -66.3399999999999 41.02 -56.97L107.12 9.0600000000001C159.42 -6.65 279 -9.11 353.95 64H255.76L403.33 113.14C453.32 163.07 439.71 149.32 449.64 160H351.86L483.4 203.8C528.8399999999999 278.26 517.71 352.64 467.14 403.1600000000001z" />
-    <glyph glyph-name="female"
-      unicode="&#xF182;"
-      horiz-adv-x="256" d=" M128 448C163.346 448 192 419.346 192 384S163.346 320 128 320C92.654 320 64 348.654 64 384S92.654 448 128 448M247.283 93.821L199.283 285.8210000000001A24 24 0 0 1 176 304H164.64C141.929 293.557 115.05 293.106 91.36 304H80A24 24 0 0 1 56.717 285.8210000000001L8.717 93.821C4.935 78.695 16.383 64 32 64H88V-40C88 -53.255 98.745 -64 112 -64H144C157.255 -64 168 -53.255 168 -40V64H224C239.591 64 251.071 78.671 247.283 93.821z" />
-    <glyph glyph-name="fighter-jet"
-      unicode="&#xF0FB;"
-      horiz-adv-x="640" d=" M544 224L416 240L368 256H344L227.158 404H266.667C278.3330000000001 404 288 406.625 288 410S278.3330000000001 416 266.6670000000001 416H152V404H168V240H120L53.333 320H18.667L8 309.333V240H16V224H64V221.334L0 213.334V170.667L64 162.667V160H16V144H8V74.667L18.667 64H53.334L120 144H168V-20H152V-32H266.6670000000001C278.334 -32 288 -29.375 288 -26S278.3330000000001 -20 266.6670000000001 -20H227.158L344 128H368L416 144L544 160C640 181.333 640 186.583 640 192C640 197.417 640 202.667 544 224z" />
-    <glyph glyph-name="file-alt"
-      unicode="&#xF15C;"
-      horiz-adv-x="384" d=" M224 312V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V288H248C234.8 288 224 298.8 224 312zM288 76C288 69.4 282.6 64 276 64H108C101.4 64 96 69.4 96 76V84C96 90.6 101.4 96 108 96H276C282.6 96 288 90.6 288 84V76zM288 140C288 133.4 282.6 128 276 128H108C101.4 128 96 133.4 96 140V148C96 154.6 101.4 160 108 160H276C282.6 160 288 154.6 288 148V140zM288 212V204C288 197.4 282.6 192 276 192H108C101.4 192 96 197.4 96 204V212C96 218.6 101.4 224 108 224H276C282.6 224 288 218.6 288 212zM384 326.1V320H256V448H262.1C268.5 448 274.6 445.5 279.1 441L377 343C381.5 338.5 384 332.4 384 326.1z" />
-    <glyph glyph-name="file-archive"
-      unicode="&#xF1C6;"
-      horiz-adv-x="384" d=" M224 312V448H160.4V416H128.4V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V288H248C234.8 288 224 298.8 224 312zM95.9 416H127.9V384H95.9V416zM128.2 32C95 32 70.2 62.4 76.8 94.9L96.4 192V224H128.4V256H96.4V288H128.4V320H96.4V352H128.4V384H160.4V352H128.4V320H160.4V288H128.4V256H160.4V224H128.4V192H150.5C156.2 192 161.2 187.9 162.3 182.3L179.6 94.6C186 62.2000000000001 161.2 32 128.2 32zM160.9 85C160.9 70.1 146.4 58 128.5 58S96 70 96 85C96 99.9 110.5 112 128.4 112S160.9 99.9 160.9 85zM384 326.1V320H256V448H262.1C268.5 448 274.6 445.5 279.1 441L377 343C381.5 338.5 384 332.4 384 326.1z" />
-    <glyph glyph-name="file-audio"
-      unicode="&#xF1C7;"
-      horiz-adv-x="384" d=" M224 312V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V288H248C234.8 288 224 298.8 224 312zM160 44C160 33.3 147.1 28 139.5 35.5L104 72H76C69.4 72 64 77.4 64 84V140C64 146.6 69.4 152 76 152H104L139.5 188.5C147.1 196.1 160 190.7 160 180V44zM193.2 91.6C202.3 100.9 202.3 115.7000000000001 193.2 125C171.1 147.8 205.4 181.2 227.6 158.5C254.8 130.6 254.8 86.1 227.6 58.1C205.8 35.8 170.7 68.5 193.2 91.6zM279.2 208.7C333.6 152.8 333.6 63.9 279.2 7.9C257.4 -14.5 222.2 18.2 244.8 41.4C281 78.6 281.1 137.9 244.8 175.2C222.7 198 257.1 231.5 279.2 208.7zM384 326.1V320H256V448H262.1C268.5 448 274.6 445.5 279.1 441L377 343C381.5 338.5 384 332.4 384 326.1z" />
-    <glyph glyph-name="file-code"
-      unicode="&#xF1C9;"
-      horiz-adv-x="384" d=" M384 326.059V320H256V448H262.0590000000001C268.4240000000001 448 274.5290000000001 445.471 279.0300000000001 440.971L376.971 343.03A24.005 24.005 0 0 0 384 326.059zM248 288C234.8 288 224 298.8 224 312V448H24C10.745 448 0 437.255 0 424V-40C0 -53.255 10.745 -64 24 -64H360C373.255 -64 384 -53.255 384 -40V288H248zM123.206 47.495A5.4 5.4 0 0 0 115.573 47.249L50.707 108.061A5.4 5.4 0 0 0 50.707 115.9400000000001L115.573 176.7520000000001A5.4 5.4 0 0 0 123.206 176.5060000000001L142.785 155.6210000000001A5.4 5.4 0 0 0 142.413 147.8740000000001L101.65 112L142.413 76.126A5.4 5.4 0 0 0 142.785 68.379L123.206 47.495zM174.501 -2.984L147.048 4.986A5.401999999999999 5.401999999999999 0 0 0 143.367 11.6780000000001L204.807 223.3040000000001A5.401999999999999 5.401999999999999 0 0 0 211.499 226.9850000000001L238.951 219.0150000000001A5.4 5.4 0 0 0 242.631 212.3230000000001L181.191 0.6970000000001A5.396999999999999 5.396999999999999 0 0 0 174.501 -2.9839999999999zM335.293 108.061L270.427 47.249A5.4 5.4 0 0 0 262.7940000000001 47.495L243.2140000000001 68.38A5.4 5.4 0 0 0 243.5860000000001 76.127L284.35 112L243.587 147.874A5.4 5.4 0 0 0 243.215 155.6210000000001L262.795 176.506A5.4 5.4 0 0 0 270.428 176.752L335.294 115.94A5.4 5.4 0 0 0 335.293 108.061z" />
-    <glyph glyph-name="file-contract"
-      unicode="&#xF56C;"
-      horiz-adv-x="384" d=" M224 312V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V288H248C234.8 288 224 298.8 224 312zM64 376C64 380.42 67.58 384 72 384H152C156.42 384 160 380.42 160 376V360C160 355.58 156.42 352 152 352H72C67.58 352 64 355.58 64 360V376zM64 312C64 316.42 67.58 320 72 320H152C156.42 320 160 316.42 160 312V296C160 291.5800000000001 156.42 288 152 288H72C67.58 288 64 291.5800000000001 64 296V312zM256.81 64H304C312.84 64 320 56.84 320 48S312.84 32 304 32H256.81C240.36 32 225.54 41.14 218.17 55.86C215.22 61.78 210.08 62.38 208 62.38S200.78 61.79 197.98 56.19L190.31 40.85A15.986 15.986 0 0 0 176 32.0100000000001C175.62 32.0100000000001 175.25 32.03 174.8600000000001 32.0600000000001C168.4100000000001 32.5100000000001 162.8600000000001 36.8100000000001 160.8300000000001 42.95L144 93.41L133.39 61.53C127.5 43.87 111.01 32 92.39 32H80C71.16 32 64 39.16 64 48S71.16 64 80 64H92.39C97.22 64 101.5 67.08 103.03 71.66L121.22 126.3C124.52 136.11 133.66 142.71 144 142.71S163.48 136.1200000000001 166.77 126.3L180.65 84.66C200.42 100.85 234.7 94.36 246.65 70.5C248.67 66.44 252.61 64 256.81 64zM377 343L279.1 441C274.6 445.5 268.5 448 262.1 448H256V320H384V326.1C384 332.4 381.5 338.5 377 343z" />
-    <glyph glyph-name="file-download"
-      unicode="&#xF56D;"
-      horiz-adv-x="384" d=" M224 312V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V288H248C234.8 288 224 298.8 224 312zM300.45 100.64L204.03 4.94C197.38 -1.67 186.64 -1.67 179.99 4.94L83.57 100.64C73.42 110.71 80.54 128 94.82 128H160V208C160 216.84 167.16 224 176 224H208C216.84 224 224 216.84 224 208V128H289.18C303.46 128 310.58 110.71 300.45 100.64zM377 343L279.1 441C274.6 445.5 268.5 448 262.1 448H256V320H384V326.1C384 332.4 381.5 338.5 377 343z" />
-    <glyph glyph-name="file-excel"
-      unicode="&#xF1C3;"
-      horiz-adv-x="384" d=" M224 312V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V288H248C234.8 288 224 298.8 224 312zM284.1 205.5L224 112L284.1 18.5C289.2000000000001 10.5 283.5 0 274 0H239.1C234.7 0 230.6 2.4 228.5 6.3C208.9 42.5 192 75 192 75C185.6 60.2 182 55 155.4 6.2C153.3 2.3 149.3 -0.1 144.9 -0.1H110C100.5 -0.1 94.8 10.4 99.9 18.4L160.2 111.9L99.9 205.4C94.7 213.4 100.5 223.9 110 223.9H144.8C149.2 223.9 153.3 221.5 155.4 217.6C181.5 168.8 175.4 184 192 149.1C192 149.1 198.1 160.8 228.6 217.6C230.7 221.5 234.8 223.9 239.2 223.9H274C283.5 224 289.2 213.5 284.1 205.5zM384 326.1V320H256V448H262.1C268.5 448 274.6 445.5 279.1 441L377 343C381.5 338.5 384 332.4 384 326.1z" />
-    <glyph glyph-name="file-export"
-      unicode="&#xF56E;"
-      horiz-adv-x="576" d=" M384 326.1C384 332.4 381.5 338.5 377 343L279.1 441C274.6 445.5 268.5 448 262.1 448H256V320H384V326.1zM192 112V144C192 152.84 199.16 160 208 160H384V288H248C234.8 288 224 298.8 224 312V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V96H208C199.16 96 192 103.16 192 112zM571.05 140.02L475.35 236.45C465.29 246.59 447.99 239.46 447.99 225.18V160H384V96H447.99V30.82C447.99 16.54 465.28 9.41 475.35 19.55L571.0500000000001 115.97C577.6500000000001 122.6300000000001 577.6500000000001 133.37 571.0500000000001 140.0200000000001z" />
-    <glyph glyph-name="file-image"
-      unicode="&#xF1C5;"
-      horiz-adv-x="384" d=" M384 326.059V320H256V448H262.0590000000001A24 24 0 0 0 279.029 440.971L376.9700000000001 343.03A24.002000000000002 24.002000000000002 0 0 0 384 326.059zM248 288C234.8 288 224 298.8 224 312V448H24C10.745 448 0 437.255 0 424V-40C0 -53.255 10.745 -64 24 -64H360C373.255 -64 384 -53.255 384 -40V288H248zM112.545 272C139.055 272 160.545 250.51 160.545 224S139.055 176 112.545 176S64.545 197.49 64.545 224S86.036 272 112.545 272zM320.545 32H64.545L65.03 80.485L104.545 120C109.231 124.686 116.344 124.201 121.03 119.515L160.545 80L264.06 183.515C268.746 188.201 276.344 188.201 281.031 183.515L320.545 144V32z" />
-    <glyph glyph-name="file-import"
-      unicode="&#xF56F;"
-      horiz-adv-x="512" d=" M16 160C7.16 160 0 152.84 0 144V112C0 103.16 7.16 96 16 96H128V160H16zM352 312V448H152C138.7 448 128 437.3 128 424V160H255.99V225.18C255.99 239.46 273.2800000000001 246.59 283.35 236.45L379.05 140.02C385.6500000000001 133.37 385.6500000000001 122.63 379.05 115.98L283.35 19.5599999999999C273.29 9.42 255.99 16.55 255.99 30.8299999999999V96H128V-40C128 -53.3 138.7 -64 152 -64H488C501.3 -64 512 -53.3 512 -40V288H376C362.8 288 352 298.8 352 312zM505 343L407.1 441C402.6 445.5 396.5 448 390.1 448H384V320H512V326.1C512 332.4 509.5 338.5 505 343z" />
-    <glyph glyph-name="file-invoice-dollar"
-      unicode="&#xF571;"
-      horiz-adv-x="384" d=" M377 343L279.1 441C274.6 445.5 268.5 448 262.1 448H256V320H384V326.1C384 332.4 381.5 338.5 377 343zM224 312V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V288H248C234.8 288 224 298.8 224 312zM64 376C64 380.42 67.58 384 72 384H152C156.42 384 160 380.42 160 376V360C160 355.58 156.42 352 152 352H72C67.58 352 64 355.58 64 360V376zM64 296V312C64 316.42 67.58 320 72 320H152C156.42 320 160 316.42 160 312V296C160 291.5800000000001 156.42 288 152 288H72C67.58 288 64 291.5800000000001 64 296zM208 32.12V8C208 3.58 204.42 0 200 0H184C179.58 0 176 3.58 176 8V32.29C164.71 32.87 153.73 36.81 144.63 43.64C140.73 46.5700000000001 140.53 52.41 144.06 55.78L155.81 66.99C158.58 69.63 162.7 69.75 165.94 67.72C169.81 65.3 174.2 64 178.76 64H206.87C213.37 64 218.67 69.92 218.67 77.19C218.67 83.14 215.06 88.38 209.9 89.92L164.9 103.42C146.31 109 133.32 126.84 133.32 146.81C133.32 171.33 152.37 191.25 175.99 191.88V216C175.99 220.42 179.57 224 183.99 224H199.99C204.41 224 207.99 220.42 207.99 216V191.71C219.28 191.13 230.26 187.2 239.36 180.36C243.26 177.43 243.46 171.59 239.93 168.22L228.18 157.01C225.41 154.37 221.29 154.25 218.05 156.28C214.18 158.71 209.79 160 205.23 160H177.12C170.62 160 165.32 154.08 165.32 146.81C165.32 140.86 168.93 135.62 174.09 134.08L219.09 120.58C237.68 115 250.67 97.16 250.67 77.19C250.67 52.66 231.62 32.75 208 32.12z" />
-    <glyph glyph-name="file-invoice"
-      unicode="&#xF570;"
-      horiz-adv-x="384" d=" M288 192H96V128H288V192zM377 343L279.1 441C274.6 445.5 268.5 448 262.1 448H256V320H384V326.1C384 332.4 381.5 338.5 377 343zM224 312V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V288H248C234.8 288 224 298.8 224 312zM64 376C64 380.42 67.58 384 72 384H152C156.42 384 160 380.42 160 376V360C160 355.58 156.42 352 152 352H72C67.58 352 64 355.58 64 360V376zM64 312C64 316.42 67.58 320 72 320H152C156.42 320 160 316.42 160 312V296C160 291.5800000000001 156.42 288 152 288H72C67.58 288 64 291.5800000000001 64 296V312zM320 8C320 3.58 316.42 0 312 0H232C227.58 0 224 3.58 224 8V24C224 28.42 227.58 32 232 32H312C316.42 32 320 28.42 320 24V8zM320 208V112C320 103.16 312.84 96 304 96H80C71.16 96 64 103.16 64 112V208C64 216.84 71.16 224 80 224H304C312.84 224 320 216.84 320 208z" />
-    <glyph glyph-name="file-medical-alt"
-      unicode="&#xF478;"
-      horiz-adv-x="448" d=" M288 312V448H88C74.7 448 64 437.3 64 424V192H8C3.6 192 0 188.4 0 184V168C0 163.6 3.6 160 8 160H148.9C151.9 160 154.7 158.3 156.1 155.6L176 115.8L232.8 229.5C235.7 235.4 244.2 235.4 247.1 229.5L281.8 160H352C360.8 160 368 152.8 368 144S360.8 128 352 128H262.1L240 172.2L183.2 58.5C180.3 52.6 171.8 52.6 168.9 58.5L134.1 128H64V-40C64 -53.3 74.7 -64 88 -64H424C437.3 -64 448 -53.3 448 -40V288H312C298.8 288 288 298.8 288 312zM441 343L343.1 441C338.6 445.5 332.5 448 326.1 448H320V320H448V326.1C448 332.4 445.5 338.5 441 343z" />
-    <glyph glyph-name="file-medical"
-      unicode="&#xF477;"
-      horiz-adv-x="384" d=" M377 343L279.1 441C274.6 445.5 268.5 448 262.1 448H256V320H384V326.1C384 332.4 381.5 338.5 377 343zM224 312V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V288H248C234.8 288 224 298.8 224 312zM288 152V104C288 99.6 284.4 96 280 96H224V40C224 35.6 220.4 32 216 32H168C163.6 32 160 35.6 160 40V96H104C99.6 96 96 99.6 96 104V152C96 156.4 99.6 160 104 160H160V216C160 220.4 163.6 224 168 224H216C220.4 224 224 220.4 224 216V160H280C284.4 160 288 156.4 288 152z" />
-    <glyph glyph-name="file-pdf"
-      unicode="&#xF1C1;"
-      horiz-adv-x="384" d=" M181.9 191.9C176.9 207.9 177 238.8 179.9 238.8C188.3 238.8 187.5 201.9 181.9 191.9zM180.2 144.7C172.5 124.5 162.9 101.4 151.8 82C170.1 89 190.8 99.2 214.7 103.9C202 113.5 189.8 127.3 180.2 144.7zM86.1 19.9C86.1 19.1 99.3 25.3 121 60.1C114.3 53.8 91.9 35.6 86.1 19.9zM248 288H384V-40C384 -53.3 373.3 -64 360 -64H24C10.7 -64 0 -53.3 0 -40V424C0 437.3 10.7 448 24 448H224V312C224 298.8 234.8 288 248 288zM240 116.2C220 128.4 206.7 145.2 197.3 170C201.8 188.5 208.9 216.6 203.5 234.2C198.8 263.6 161.1 260.7 155.7 241C150.7 222.7 155.3 196.9 163.8 164C152.2 136.4 135.1 99.4 123 78.2C122.9 78.2 122.9 78.1 122.8 78.1C95.7 64.2 49.2 33.6 68.3 10.1C73.9 3.2 84.3 0.1 89.8 0.1C107.7 0.1 125.5 18.1 150.9 61.9C176.7 70.4 205 81 229.9 85.1C251.6 73.3 277 65.6 293.9 65.6C323.1 65.6 325.1 97.6 313.6 108.9999999999999C299.7 122.6 259.3 118.6999999999999 240 116.1999999999999zM377 343L279 441C274.5 445.5 268.4 448 262 448H256V320H384V326.1C384 332.4 381.5 338.5 377 343zM302.9 87.7C307 90.4 300.4 99.6 260.1 96.7C297.2 80.9 302.9 87.7 302.9 87.7z" />
-    <glyph glyph-name="file-powerpoint"
-      unicode="&#xF1C4;"
-      horiz-adv-x="384" d=" M193.7 176.8C202.5 176.8 209.2 174.1 214 168.7C223.6 157.8 223.8 136 213.8 124.6C208.9 119 201.9 116.1 192.7 116.1H165.8V176.8H193.7zM377 343L279 441C274.5 445.5 268.4 448 262 448H256V320H384V326.1C384 332.4 381.5 338.5 377 343zM224 312V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V288H248C234.8 288 224 298.8 224 312zM277 146.8C277 56.5 188.2 69.2000000000001 165.9 69.2000000000001V12C165.9 5.4 160.5 0 153.9 0H123.1C116.5 0 111.1 5.4 111.1 12V211.8C111.1 218.4 116.5 223.8 123.1 223.8H204.1C248.6 223.8 277 191 277 146.8z" />
-    <glyph glyph-name="file-prescription"
-      unicode="&#xF572;"
-      horiz-adv-x="384" d=" M224 312V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V288H248C234.8 288 224 298.8 224 312zM292.53 132.52L303.84 121.21C310.09 114.96 310.09 104.83 303.84 98.58L273.94 68.68L304 38.62C310.25 32.37 310.25 22.24 304 15.99L292.69 4.68C286.44 -1.57 276.31 -1.57 270.06 4.68L240 34.75L209.94 4.69C203.69 -1.56 193.56 -1.56 187.31 4.69L176 16C169.75 22.25 169.75 32.38 176 38.63L206.06 68.69L146.74 128H128V80C128 71.16 120.84 64 112 64H96C87.16 64 80 71.16 80 80V240C80 248.84 87.16 256 96 256H176C211.35 256 240 227.35 240 192C240 167.78 226.38 146.95 206.54 136.08L240 102.62L269.9 132.52C276.15 138.77 286.28 138.77 292.53 132.52zM176 176H128V208H176C184.82 208 192 200.82 192 192S184.82 176 176 176zM384 326.1V320H256V448H262.1C268.5 448 274.6 445.5 279.1 441L377 343C381.5 338.5 384 332.4 384 326.1z" />
-    <glyph glyph-name="file-signature"
-      unicode="&#xF573;"
-      horiz-adv-x="576" d=" M218.17 23.86C215.22 29.78 210.08 30.38 208 30.38S200.78 29.79 197.98 24.19L190.31 8.85C183.94 -3.9299999999999 165.28 -2.52 160.83 10.94L144 61.41L133.39 29.53C127.5 11.87 111.01 0 92.39 0H80C71.16 0 64 7.16 64 16S71.16 32 80 32H92.39C97.22 32 101.5 35.08 103.03 39.66L121.22 94.3C124.52 104.11 133.66 110.71 144 110.71S163.48 104.1200000000001 166.77 94.3L180.65 52.66C200.4 68.85 234.71 62.36 246.65 38.5C248.54 34.72 252.14 32.55 256.01 32.24V114.36L384.01 241.45V288H248C234.8 288 224 298.8 224 312V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V0L256 0.11C239.88 0.42 225.42 9.39 218.17 23.86zM384 326.1C384 332.4 381.5 338.5 377 343L279.1 441C274.6 445.5 268.5 448 262.1 448H256V320H384V326.1zM288 101.04V32H356.99L518.6700000000001 194.78L450.7900000000001 262.66L288 101.04zM568.54 280.67L536.67 312.54C526.7299999999999 322.48 510.6 322.48 500.66 312.54L473.41 285.29L541.29 217.41L568.54 244.66C578.49 254.6 578.49 270.73 568.54 280.67z" />
-    <glyph glyph-name="file-upload"
-      unicode="&#xF574;"
-      horiz-adv-x="384" d=" M224 312V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V288H248C234.8 288 224 298.8 224 312zM289.18 95.99H224V15.99C224 7.15 216.84 -0.01 208 -0.01H176C167.16 -0.01 160 7.15 160 15.99V95.99H94.82C80.54 95.99 73.41 113.28 83.55 123.35L179.97 219.05C186.62 225.6600000000001 197.36 225.6600000000001 204.01 219.05L300.43 123.35C310.58 113.28 303.46 95.99 289.18 95.99zM377 343L279.1 441C274.6 445.5 268.5 448 262.1 448H256V320H384V326.1C384 332.4 381.5 338.5 377 343z" />
-    <glyph glyph-name="file-video"
-      unicode="&#xF1C8;"
-      horiz-adv-x="384" d=" M384 326.059V320H256V448H262.0590000000001C268.4240000000001 448 274.5290000000001 445.471 279.0300000000001 440.971L376.971 343.03A24.005 24.005 0 0 0 384 326.059zM224 312V448H24C10.745 448 0 437.255 0 424V-40C0 -53.255 10.745 -64 24 -64H360C373.255 -64 384 -53.255 384 -40V288H248C234.8 288 224 298.8 224 312zM320 167.984V56.0210000000001C320 34.5760000000001 294.057 24.0230000000001 279.029 39.0500000000001L224 94.059V56C224 42.745 213.255 32 200 32H88C74.745 32 64 42.745 64 56V168C64 181.255 74.745 192 88 192H200C213.255 192 224 181.255 224 168V129.941L279.029 184.954C294.04 199.964 320 189.445 320 167.984z" />
-    <glyph glyph-name="file-word"
-      unicode="&#xF1C2;"
-      horiz-adv-x="384" d=" M224 312V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V288H248C234.8 288 224 298.8 224 312zM281.1 192H305C312.7 192 318.4 184.9 316.7 177.3L278.7 9.3C277.5 3.8 272.6 0 267 0H229C223.5 0 218.7 3.8 217.4 9.1C191.6 112.6 196.6 90.3 191.8 119.6H191.3C190.2 105.3 188.9 102.2000000000001 165.7 9.1C164.4 3.8 159.6 0 154.1 0H117C111.4 0 106.5 3.9 105.3 9.4L67.5 177.4C65.8 184.9 71.5 192 79.2 192H103.7C109.4 192 114.4 188 115.5 182.3C131.1 104.3 135.6 72.8 136.5 60.1C138.1 70.3 143.8 92.8 165.9 182.8C167.2 188.2 172 191.9 177.6 191.9H206.7C212.3 191.9 217.1 188.1 218.4 182.7000000000001C242.4 82.3000000000001 247.2 58.7000000000001 248 53.3000000000001C247.8 64.5000000000001 245.4 71.1000000000001 269.6 182.5000000000001C270.6 188.1000000000001 275.5 192.0000000000001 281.1 192.0000000000001zM384 326.1V320H256V448H262.1C268.5 448 274.6 445.5 279.1 441L377 343C381.5 338.5 384 332.4 384 326.1z" />
-    <glyph glyph-name="file"
-      unicode="&#xF15B;"
-      horiz-adv-x="384" d=" M224 312V448H24C10.7 448 0 437.3 0 424V-40C0 -53.3 10.7 -64 24 -64H360C373.3 -64 384 -53.3 384 -40V288H248C234.8 288 224 298.8 224 312zM384 326.1V320H256V448H262.1C268.5 448 274.6 445.5 279.1 441L377 343C381.5 338.5 384 332.4 384 326.1z" />
-    <glyph glyph-name="fill-drip"
-      unicode="&#xF576;"
-      horiz-adv-x="576" d=" M512 128S448 35.35 448 0C448 -35.35 476.66 -64 512 -64S576 -35.35 576 0S512 128 512 128zM502.63 230.94L294.94 438.63C288.69 444.88 280.5 448 272.31 448S255.93 444.88 249.69 438.63L168.11 357.05L81.93 443.24C75.68 449.49 65.55 449.49 59.31 443.24L36.69 420.62C30.45 414.37 30.45 404.24 36.69 398L122.88 311.82L28.12 217.06C-9.37 179.58 -9.37 118.8 28.12 81.31L145.31 -35.88C164.05 -54.62 188.62 -64 213.18 -64C237.75 -64 262.31 -54.63 281.05 -35.88L502.62 185.69C515.12 198.19 515.12 218.44 502.63 230.94zM386.41 159.97H65.93C67.29 163.81 69.5 167.9500000000001 73.36 171.8L86.51 184.95L168.12 266.56L226.72 207.96C239.21 195.47 259.4700000000001 195.47 271.96 207.96S284.45 240.71 271.96 253.2L213.36 311.8L272.31 370.75L434.75 208.31L386.41 159.97z" />
-    <glyph glyph-name="fill"
-      unicode="&#xF575;"
-      horiz-adv-x="512" d=" M502.63 230.94L294.94 438.63C288.69 444.88 280.5 448 272.31 448S255.93 444.88 249.69 438.63L168.11 357.05L81.93 443.23C75.69 449.48 65.55 449.48 59.31 443.23L36.69 420.62C30.45 414.37 30.45 404.24 36.69 397.99L122.88 311.81L28.12 217.05C-9.37 179.56 -9.37 118.79 28.12 81.3L145.31 -35.89C164.06 -54.63 188.62 -64.01 213.18 -64.01C237.75 -64.01 262.31 -54.64 281.06 -35.89L502.63 185.68C515.12 198.18 515.12 218.44 502.63 230.94zM386.41 159.97H65.93C67.29 163.81 69.5 167.9500000000001 73.36 171.8L86.51 184.95L168.12 266.56L226.73 207.96C239.2200000000001 195.47 259.48 195.47 271.9700000000001 207.96C284.4600000000001 220.45 284.4600000000001 240.71 271.9700000000001 253.2L213.36 311.8L272.31 370.75L434.76 208.31L386.41 159.97z" />
-    <glyph glyph-name="film"
-      unicode="&#xF008;"
-      horiz-adv-x="512" d=" M488 384H480V364C480 357.4 474.6 352 468 352H428C421.4 352 416 357.4 416 364V384H96V364C96 357.4 90.6 352 84 352H44C37.4 352 32 357.4 32 364V384H24C10.7 384 0 373.3 0 360V24C0 10.7 10.7 0 24 0H32V20C32 26.6 37.4 32 44 32H84C90.6 32 96 26.6 96 20V0H416V20C416 26.6 421.4 32 428 32H468C474.6 32 480 26.6 480 20V0H488C501.3 0 512 10.7 512 24V360C512 373.3 501.3 384 488 384zM96 76C96 69.4 90.6 64 84 64H44C37.4 64 32 69.4 32 76V116C32 122.6 37.4 128 44 128H84C90.6 128 96 122.6 96 116V76zM96 172C96 165.4 90.6 160 84 160H44C37.4 160 32 165.4 32 172V212C32 218.6 37.4 224 44 224H84C90.6 224 96 218.6 96 212V172zM96 268C96 261.4 90.6 256 84 256H44C37.4 256 32 261.4 32 268V308C32 314.6 37.4 320 44 320H84C90.6 320 96 314.6 96 308V268zM368 60C368 53.4 362.6 48 356 48H156C149.4 48 144 53.4 144 60V156C144 162.6 149.4 168 156 168H356C362.6 168 368 162.6 368 156V60zM368 228C368 221.4 362.6 216 356 216H156C149.4 216 144 221.4 144 228V324C144 330.6 149.4 336 156 336H356C362.6 336 368 330.6 368 324V228zM480 76C480 69.4 474.6 64 468 64H428C421.4 64 416 69.4 416 76V116C416 122.6 421.4 128 428 128H468C474.6 128 480 122.6 480 116V76zM480 172C480 165.4 474.6 160 468 160H428C421.4 160 416 165.4 416 172V212C416 218.6 421.4 224 428 224H468C474.6 224 480 218.6 480 212V172zM480 268C480 261.4 474.6 256 468 256H428C421.4 256 416 261.4 416 268V308C416 314.6 421.4 320 428 320H468C474.6 320 480 314.6 480 308V268z" />
-    <glyph glyph-name="filter"
-      unicode="&#xF0B0;"
-      horiz-adv-x="512" d=" M487.976 448H24.028C2.71 448 -8.047 422.134 7.058 407.029L192 222.059V16C192 8.169 195.821 0.83 202.237 -3.662L282.237 -59.642C298.02 -70.69 320 -59.493 320 -39.98V222.059L504.947 407.029C520.021 422.104 509.338 448 487.976 448z" />
-    <glyph glyph-name="fingerprint"
-      unicode="&#xF577;"
-      horiz-adv-x="512" d=" M256.12 202.04C242.87 202.04 232.12 191.3 232.12 178.04C233.26 105.79 223.98 36.14 204.42 -33.51C201.69 -43.2300000000001 206.57 -64 227.54 -64C238.02 -64 247.6500000000001 -57.08 250.63 -46.48C264.1600000000001 1.43 281.67 78.93 280.11 178.04C280.12 191.29 269.38 202.04 256.12 202.04zM255.26 283.77C194 283.8400000000001 151.25 236.7 152.1 182.68C152.85 134.74 148.35 86.77 138.73 40.13C136.04 27.15 144.4 14.44 157.37 11.77C170.42 9.1 183.04 17.43 185.73 30.41C196.07 80.5 200.9 131.99 200.1 183.43C199.69 209.38 220.0200000000001 235.92 254.55 235.77C285.86 235.3 311.7 210.43 312.17 180.3C312.94 132.25 309.36 83.97 301.56 36.7499999999999C299.39 23.6899999999999 308.25 11.3299999999999 321.32 9.17C341.29 5.84 348.13 24.27 348.9 28.9399999999999C357.18 78.9699999999999 360.96 130.1499999999999 360.17 181.05C359.29 236.85 312.23 282.93 255.26 283.77zM144.57 303.55C134.27 311.89 119.2 310.35 110.81 300.07C85.19 268.57 71.42 228.79 72.06 188.07C72.65 150.49 69.59 112.8 62.95 76.02C60.61 62.97 69.26 50.49 82.31 48.13C102.42 44.63 109.38 62.94 110.2 67.49C117.39 107.33 120.7 148.15 120.06 188.82C119.59 218.7 129.26 246.7 148.06 269.79C156.41 280.07 154.85 295.18 144.57 303.55zM254.04 365.88C238.63 366.29 223.17 364.44 208.26 360.91C195.37 357.85 187.39 344.93 190.43 332.02C193.49 319.13 206.43 311.19 219.32 314.19C230.37 316.8 241.79 317.9600000000001 253.32 317.88C328.75 316.75 391.05 256.38 392.2 183.3C392.79 145.42 390.92 107.1899999999999 386.62 69.67C385.12 56.4999999999999 394.57 44.59 407.73 43.09C424.4500000000001 41.14 433.24 54.97 434.31 64.2A929.06 929.06 0 0 1 440.2 184.05C438.64 282.8 355.13 364.38 254.04 365.88zM506.11 244.43C503.25 257.35 490.6 265.63 477.5 262.7C464.56 259.84 456.38 247.04 459.24 234.09C463.95 212.68 464.15 196.68 463.94 172.49C463.83 159.22 474.49 148.4 487.74 148.29H487.94C501.11 148.29 511.83 158.9 511.94 172.09C512.12 194.27 512.34 216.2 506.11 244.43zM465.99 335.15C417.29 404.54 337.6 446.71 252.81 447.98C183.02 448.82 118.47 423.09 70.46 375.06C24.09 328.63 -0.9 266.9600000000001 0.14 201.35L0.02 179.88C-0.37 166.63 10.05 155.57 23.3 155.19C23.53 155.17 23.78 155.17 24.02 155.17C36.94 155.17 47.61 165.47 47.99 178.47L48.15 202.11C47.32 254.61 67.31 303.9700000000001 104.43 341.11C143.19 379.9100000000001 195.77 400.7800000000001 252.11 399.9700000000001C321.56 398.94 386.8400000000001 364.4100000000001 426.73 307.5800000000001C434.3400000000001 296.7200000000001 449.29 294.13 460.15 301.7200000000001C470.99 309.3400000000001 473.61 324.31 465.99 335.15z" />
-    <glyph glyph-name="fire-extinguisher"
-      unicode="&#xF134;"
-      horiz-adv-x="448" d=" M434.027 421.671L266.027 393.671C254.693 391.782 256 380.2 256 376H197.668C208.353 411.892 181.446 448 144 448C104.565 448 77.632 408.324 91.772 371.7970000000001C39.733 358.746 16.391 317.584 1.723 280.913C-3.2 268.606 2.786 254.639 15.093 249.716C27.41 244.79 41.372 250.791 46.289 263.086C75.058 335.01 106.964 328 168 328V300.924C126.457 290.062 96 251.689 96 206.795V-40C96 -53.255 106.745 -64 120 -64H264C277.255 -64 288 -53.255 288 -40V208C288 252.731 257.404 290.312 216 300.9700000000001V328H256C256 325.026 254.297 312.284 266.027 310.329L434.027 282.329C441.342 281.11 448 286.75 448 294.166V409.834C448 417.25 441.342 422.89 434.027 421.671zM144 376C135.178 376 128 383.178 128 392S135.178 408 144 408S160 400.822 160 392S152.822 376 144 376z" />
-    <glyph glyph-name="fire"
-      unicode="&#xF06D;"
-      horiz-adv-x="384" d=" M216 424.142C216 447.944 185.347 456.907 171.851 437.18C48 256.149 224 248 224 160C224 124.371 194.886 95.542 159.15 96.006C123.98 96.462 96 125.78 96 160.954V246.464C96 268.1670000000001 69.529 278.689 54.568 262.968C27.801 234.842 0 186.668 0 128C0 22.131 86.131 -64 192 -64S384 22.131 384 128C384 298.29 216 321.003 216 424.142z" />
-    <glyph glyph-name="first-aid"
-      unicode="&#xF479;"
-      horiz-adv-x="576" d=" M0 368V16C0 -10.5 21.5 -32 48 -32H96V416H48C21.5 416 0 394.5 0 368zM128 -32H448V416H128V-32zM192 216C192 220.4 195.6 224 200 224H256V280C256 284.4 259.6 288 264 288H312C316.4 288 320 284.4 320 280V224H376C380.4 224 384 220.4 384 216V168C384 163.6 380.4 160 376 160H320V104C320 99.6 316.4 96 312 96H264C259.6 96 256 99.6 256 104V160H200C195.6 160 192 163.6 192 168V216zM528 416H480V-32H528C554.5 -32 576 -10.5 576 16V368C576 394.5 554.5 416 528 416z" />
-    <glyph glyph-name="fish"
-      unicode="&#xF578;"
-      horiz-adv-x="576" d=" M327.1 352C237.13 352 158.56 297.23 114.83 250.37L27.5 316.42C15.37 325.6 -2.74 315.82 0.36 301.76L24.54 192L0.35 82.23C-2.75 68.17 15.36 58.4 27.49 67.57L114.82 133.62C158.55 86.77 237.13 32 327.1 32C464.56 32 576 160 576 192S464.56 352 327.1 352zM414.5300000000001 168C401.2800000000001 168 390.5300000000001 178.75 390.5300000000001 192C390.5300000000001 205.26 401.2800000000001 216 414.5300000000001 216C427.79 216 438.5300000000001 205.26 438.5300000000001 192C438.5300000000001 178.75 427.7800000000001 168 414.5300000000001 168z" />
-    <glyph glyph-name="flag-checkered"
-      unicode="&#xF11E;"
-      horiz-adv-x="512" d=" M466.515 381.072C487.731 390.926 512 375.449 512 352.056V108.956C512 98.43 506.839 88.549 498.157 82.598C462.32 58.034 423.822 41.74 375.652 41.74C308.279 41.74 264.022 76.523 210.435 76.523C159.582 76.523 124.311 66.465 96 54.401V-40C96 -53.255 85.255 -64 72 -64H56C42.745 -64 32 -53.255 32 -40V346.055C17.497 356.175 8 372.974 8 392C8 423.704 34.345 449.254 66.338 447.952C94.806 446.794 118.117 423.984 119.889 395.548C120.409 387.206 119.079 379.238 116.303 371.986C137.039 379.616 159.393 384 184.348 384C251.721 384 295.978 349.217 349.5650000000001 349.217C390.0610000000001 349.217 432.177 365.123 466.515 381.072zM96 313.37V242.88C125 253.55 147.18 260.71 169.6 263.79V335.36C146.1 333.19 129.16 325.57 96 313.37zM316.8 304.18C290.3830000000001 308.852 266.914 318.159 243.2 325.52V258.1C267.375 251.3940000000001 290.766 241.6560000000001 316.8 235.79V304.18zM169.6 263.79V193.75C202.396 196.728 223.51 194.385 243.2 189.95V258.1C217.953 265.135 196.619 267.523 169.6 263.79zM243.2 121.5600000000001C269.538 116.9080000000001 292.932 107.633 316.8 100.2200000000001V167.6300000000001C292.523 174.3760000000001 269.26 184.0800000000001 243.2 189.9500000000001V121.5600000000001zM96 105.9C119.62 114.29 143.79 119.74 169.6 122.46V193.75C143.49 191.4 122.24 185.71 96 176.39V105.9zM464 327.5C442.7 318.65 417.41 309.86 390.4 305.03V233.12C417.71 237.48 440.43 247.22 464 257.01V327.5zM464 117.54V188.03C441.81 173.83 415.2200000000001 165.42 390.4 162.01V90.43C415.47 92.81 438.89 101.47 464 117.54zM316.8 235.79V167.63C342.464 160.496 363.416 158.288 390.4 162.01V233.12C364.401 228.933 340.457 230.444 316.8 235.79z" />
-    <glyph glyph-name="flag"
-      unicode="&#xF024;"
-      horiz-adv-x="512" d=" M349.565 349.217C295.978 349.217 251.721 384 184.348 384C159.393 384 137.039 379.616 116.303 371.987A55.947 55.947 0 0 1 119.889 395.549C118.117 423.985 94.806 446.794 66.338 447.952C34.345 449.254 8 423.704 8 392C8 372.974 17.497 356.175 32 346.055V-40C32 -53.255 42.745 -64 56 -64H72C85.255 -64 96 -53.255 96 -40V54.4C124.311 66.464 159.582 76.522 210.435 76.522C264.023 76.522 308.279 41.739 375.6520000000001 41.739C423.8210000000001 41.739 462.3190000000001 58.033 498.157 82.597C506.84 88.548 512 98.429 512 108.955V352.055C512 375.448 487.731 390.925 466.515 381.071C432.177 365.123 390.061 349.217 349.565 349.217z" />
-    <glyph glyph-name="flask"
-      unicode="&#xF0C3;"
-      horiz-adv-x="448" d=" M437.2 44.5L320 233V384H328C341.3 384 352 394.7 352 408V424C352 437.3 341.3 448 328 448H120C106.7 448 96 437.3 96 424V408C96 394.7 106.7 384 120 384H128V233L10.8 44.5C-18.5 -2.6 15.3 -64 70.9 -64H377.1C432.8 -64 466.5 -2.5 437.2000000000001 44.5zM137.9 128L186.1 205.6C189.8 210.8 191.9 217.2 191.9 224V384H255.9000000000001V224C255.9000000000001 217.1 258.1 210.8 261.7000000000001 205.6L309.9000000000001 128H137.9z" />
-    <glyph glyph-name="flushed"
-      unicode="&#xF579;"
-      horiz-adv-x="496" d=" M344 248C330.7 248 320 237.3 320 224S330.7 200 344 200S368 210.7 368 224S357.3 248 344 248zM152 248C138.7 248 128 237.3 128 224S138.7 200 152 200S176 210.7 176 224S165.3 248 152 248zM248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM80 224C80 263.8 112.2 296 152 296S224 263.8 224 224S191.8 152 152 152S80 184.2 80 224zM312 48H184C162.8 48 162.8 80 184 80H312C333.2 80 333.2 48 312 48zM344 152C304.2 152 272 184.2 272 224S304.2 296 344 296S416 263.8 416 224S383.8 152 344 152z" />
-    <glyph glyph-name="folder-open"
-      unicode="&#xF07C;"
-      horiz-adv-x="576" d=" M572.694 155.907L500.27 31.752A63.99699999999999 63.99699999999999 0 0 0 444.989 0H45.025C26.502 0 14.961 20.093 24.294 36.093L96.718 160.2480000000001A64 64 0 0 0 152 192H551.9639999999999C570.487 192 582.0279999999999 171.907 572.694 155.907zM152 224H480V272C480 298.51 458.51 320 432 320H272L208 384H48C21.49 384 0 362.51 0 336V57.954L69.077 176.372C86.214 205.75 117.989 224 152 224z" />
-    <glyph glyph-name="folder"
-      unicode="&#xF07B;"
-      horiz-adv-x="512" d=" M464 320H272L208 384H48C21.49 384 0 362.51 0 336V48C0 21.49 21.49 0 48 0H464C490.51 0 512 21.49 512 48V272C512 298.51 490.51 320 464 320z" />
-    <glyph glyph-name="font"
-      unicode="&#xF031;"
-      horiz-adv-x="448" d=" M152 32H127.987L154.573 112.782H292.8L319.386 32H296C287.163 32 280 24.837 280 16V-16C280 -24.837 287.163 -32 296 -32H432C440.837 -32 448 -24.837 448 -16V16C448 24.837 440.837 32 432 32H405.261L275.495 405.254A16 16 0 0 1 260.382 416H187.616A16 16 0 0 1 172.503 405.254L42.739 32H16C7.163 32 0 24.837 0 16V-16C0 -24.837 7.163 -32 16 -32H152C160.837 -32 168 -24.837 168 -16V16C168 24.837 160.837 32 152 32zM216.353 303.778C220.701 318.9940000000001 222.963 331.9340000000001 223.939 338.4220000000001C224.778 331.901 226.878 318.9460000000001 231.6660000000001 303.716L273.0010000000001 179.71H174.382L216.353 303.778z" />
-    <glyph glyph-name="football-ball"
-      unicode="&#xF44E;"
-      horiz-adv-x="496" d=" M481.5 387.7C476.7 405.9 462.4 420.2 444.2 425.1C420.3 431.5 383 439.1 339.4 440L496 283.2C495.2 326.7 487.8 363.8 481.5 387.7zM14.5 -3.7C19.3 -21.9 33.6 -36.2 51.8 -41.1C75.7 -47.4999999999999 113 -55.1 156.6 -55.9999999999999L0 100.8C0.8 57.3 8.2 20.2 14.5 -3.7zM4.2 164.6L220.4 -52C352.9 -32.6 469.2 66.7 491.9 219.4L275.6 436C143.1 416.6 26.8 317.3 4.2 164.6zM321.5 288.2000000000001C324.6 291.3 329.7 291.3 332.8 288.2000000000001L344.1 276.9C347.2000000000001 273.8 347.2000000000001 268.7000000000001 344.1 265.6L315.8 237.3L344.1 209C347.2000000000001 205.9 347.2000000000001 200.8 344.1 197.7L332.8 186.4C329.7 183.3 324.6 183.3 321.5 186.4L293.2 214.7L270.6 192L298.9 163.7C302 160.6 302 155.5 298.9 152.4L287.6 141.1C284.5 138 279.4 138 276.3 141.1L248 169.4L225.4 146.8L253.7 118.5C256.8 115.3999999999999 256.8 110.3 253.7 107.1999999999999L242.4 95.8999999999999C239.3 92.7999999999999 234.2 92.7999999999999 231.1 95.8999999999999L202.8 124.1999999999999L174.5 95.8999999999999C171.4 92.7999999999999 166.3 92.7999999999999 163.2 95.8999999999999L151.9 107.1999999999999C148.8 110.3 148.8 115.3999999999999 151.9 118.5L180.2 146.8L151.9 175C148.8 178.1 148.8 183.1999999999999 151.9 186.3L163.2 197.6C166.3 200.7 171.4 200.7 174.5 197.6L202.8 169.3L225.4 191.9L197.1 220.2C194 223.3 194 228.4 197.1 231.5L208.4 242.8C211.5 245.9 216.6 245.9 219.7 242.8L248 214.5L270.6 237.1L242.3 265.4C239.2 268.5 239.2 273.6 242.3 276.7000000000001L253.6 288C256.7000000000001 291.1 261.8 291.1 264.9000000000001 288L293.2000000000001 259.7000000000001L321.5000000000001 288.2000000000001z" />
-    <glyph glyph-name="forward"
-      unicode="&#xF04E;"
-      horiz-adv-x="512" d=" M500.5 216.6L308.5 376.6C287.9 393.7 256 379.4 256 352V32C256 4.6 287.9 -9.8 308.5 7.4L500.5 167.4C515.8 180.2 515.8 203.8 500.5 216.6zM244.5 216.6L52.5 376.6C31.9 393.7 0 379.4 0 352V32C0 4.6 31.9 -9.8 52.5 7.4L244.5 167.4C259.8 180.2 259.8 203.8 244.5 216.6z" />
-    <glyph glyph-name="frog"
-      unicode="&#xF52E;"
-      horiz-adv-x="576" d=" M446.53 350.57C439.67 387.77 407.19 416 368 416C328.77 416 296.28 387.71 289.46 350.46C126.75 335.04 -0.5 197.88 0 31.02C0.11 -3.9 29.08 -32 64 -32H368C376.84 -32 384 -24.84 384 -16C384 1.67 369.67 16 352 16H272.51L308.31 64.33C332.45 100.56 318.6600000000001 152.61 274.6 170.93C250.7100000000001 180.86 223.05 175.5799999999999 202.36 160.05L169.6 135.46C162.54 130.15 152.51 131.55 147.19 138.65C141.89 145.73 143.31 155.76 150.38 161.06L185.16 187.15C222 214.81 273.4400000000001 214.77 310.29 187.15C321.1600000000001 179 356.1600000000001 148.09 351.0900000000001 93.94L469.62 -32H560C568.84 -32 576 -24.84 576 -16C576 1.67 561.67 16 544 16H490.37L391.85 120.68L546.29 207.33A58.15999999999999 58.15999999999999 0 0 1 576 258.06C576 279.4600000000001 564.28 299.01 545.52 309.29C504.96 331.51 446.53 350.57 446.53 350.57zM368 312C354.74 312 344 322.75 344 336C344 349.26 354.74 360 368 360C381.25 360 392 349.26 392 336C392 322.75 381.25 312 368 312z" />
-    <glyph glyph-name="frown-open"
-      unicode="&#xF57A;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM136 240C136 257.7 150.3 272 168 272S200 257.7 200 240S185.7 208 168 208S136 222.3 136 240zM323.3 56.7C292.1 66.3 263.9000000000001 72 248 72S203.9 66.3 172.7 56.7C161.2 53.2 150.2 63 152.2 74.8C159.2 114.8 212.3 136 248 136S336.8 114.7 343.8 74.8C345.8 62.9 334.7 53.2 323.3 56.7zM328 208C310.3 208 296 222.3 296 240S310.3 272 328 272S360 257.7 360 240S345.7 208 328 208z" />
-    <glyph glyph-name="frown"
-      unicode="&#xF119;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM328 272C345.7 272 360 257.7 360 240S345.7 208 328 208S296 222.3 296 240S310.3 272 328 272zM168 272C185.7 272 200 257.7 200 240S185.7 208 168 208S136 222.3 136 240S150.3 272 168 272zM338.2 53.8C315.8 80.6 282.9 96 248 96S180.2 80.6 157.8 53.8C144.3 37.5 119.7 58 133.2 74.3C161.7 108.4 203.6 128 248 128S334.3 108.4 362.7 74.2C376.3 58 351.7 37.5 338.2 53.8z" />
-    <glyph glyph-name="futbol"
-      unicode="&#xF1E3;"
-      horiz-adv-x="512" d=" M504 192C504 55.033 392.967 -56 256 -56S8 55.033 8 192S119.033 440 256 440S504 328.967 504 192zM456 192L455.997 192.282L429.933 169.541L367.254 228.041L383.7080000000001 312.396L418.011 309.324C393.122 343.54 358.007 369.413 317.302 382.4650000000001L330.9530000000001 350.526L256 309L181.047 350.525L194.698 382.464C154.067 369.436 118.918 343.594 93.989 309.323L128.554 312.396L144.746 228.041L82.068 169.541L56.004 192.282L56.001 192C56.001 148.985 69.498 108.048 94.473 74.009L102.177 107.906L187.315 97.459L223.616 19.633L193.714 1.847C233.916 -11.275 278.004 -11.301 318.286 1.847L288.384 19.633L324.685 97.4590000000001L409.823 107.9060000000001L417.527 74.0090000000001C442.503 108.048 456 148.985 456 192zM207.898 122.429L178.004 213.741L256 270.2680000000001L333.996 213.741L304.374 122.429H207.898z" />
-    <glyph glyph-name="gamepad"
-      unicode="&#xF11B;"
-      horiz-adv-x="640" d=" M480 352H160C71.6 352 0 280.4 0 192S71.6 32 160 32C204.8 32 245.2 50.4 274.2 80H365.7C394.7 50.4 435.2 32 479.9 32C568.3 32 639.9 103.6 639.9 192S568.4 352 480 352zM256 172C256 165.4 250.6 160 244 160H192V108C192 101.4 186.6 96 180 96H140C133.4 96 128 101.4 128 108V160H76C69.4 160 64 165.4 64 172V212C64 218.6 69.4 224 76 224H128V276C128 282.6 133.4 288 140 288H180C186.6 288 192 282.6 192 276V224H244C250.6 224 256 218.6 256 212V172zM440 104C413.5 104 392 125.5 392 152S413.5 200 440 200S488 178.5 488 152S466.5 104 440 104zM520 184C493.5 184 472 205.5 472 232S493.5 280 520 280S568 258.5 568 232S546.5 184 520 184z" />
-    <glyph glyph-name="gas-pump"
-      unicode="&#xF52F;"
-      horiz-adv-x="512" d=" M336 0H16C7.2 0 0 -7.2 0 -16V-48C0 -56.8 7.2 -64 16 -64H336C344.8 -64 352 -56.8 352 -48V-16C352 -7.2 344.8 0 336 0zM493.2 340.7L412.2 421.7C406 427.9 395.8 427.9 389.6 421.7L378.3 410.4C372.1 404.2 372.1 394 378.3 387.8L416 350.1V288C416 259.9 436.9 236.7 464 232.8V72C464 58.8 453.2 48 440 48S416 58.8 416 72V104C416 152.6 376.6 192 328 192H320V384C320 419.3 291.3 448 256 448H96C60.7 448 32 419.3 32 384V32H320V144H328C350.1 144 368 126.1 368 104V76.2C368 38.5 395 4.2 432.5 0.3C475.5 -4.0000000000001 512 29.8 512 71.9999999999999V295.4C512 312.4 505.2 328.7 493.2 340.7zM256 256H96V384H256V256z" />
-    <glyph glyph-name="gavel"
-      unicode="&#xF0E3;"
-      horiz-adv-x="512" d=" M504.971 248.638L482.344 271.265C472.971 280.6380000000001 457.775 280.6380000000001 448.403 271.265L442.7460000000001 265.608L329.608 378.745L335.265 384.402C344.638 393.775 344.638 408.971 335.265 418.343L312.638 440.971C303.265 450.344 288.069 450.344 278.697 440.971L154.246 316.52C144.873 307.1470000000001 144.873 291.951 154.246 282.579L176.873 259.952C186.246 250.579 201.442 250.579 210.814 259.952L216.471 265.6090000000001L256.069 226.011L175.029 144.971L169.372 150.628C156.875 163.125 136.614 163.125 124.117 150.628L9.373 35.882C-3.124 23.385 -3.124 3.124 9.373 -9.373L54.628 -54.628C67.125 -67.125 87.386 -67.125 99.883 -54.628L214.628 60.117C227.125 72.614 227.125 92.875 214.628 105.372L208.971 111.029L290.011 192.069L329.6090000000001 152.471L323.9520000000001 146.814C314.5790000000001 137.441 314.5790000000001 122.245 323.9520000000001 112.8730000000001L346.5790000000001 90.246C355.9520000000001 80.8730000000001 371.1480000000001 80.8730000000001 380.5200000000001 90.246L504.9710000000001 214.697C514.3430000000001 224.069 514.3430000000001 239.2650000000001 504.9710000000001 248.6380000000001z" />
-    <glyph glyph-name="gem"
-      unicode="&#xF3A5;"
-      horiz-adv-x="576" d=" M485.5 448L576 288H474.9L405.7 448H485.5zM357.5 448L426.7 288H149.3L218.5 448H357.5zM90.5 448H170.3L101.1 288H0L90.5 448zM0 256H100.7L223.7 4.3C225.2 1.2 221 -1.6 218.7 1L0 256zM148.2 256H427.8L290.8 -62.2C289.8 -64.6 286.3 -64.6 285.3 -62.2L148.2 256zM352.3 4.3L475.3 256H576L357.3 1.1C355 -1.6 350.8 1.2 352.3 4.3z" />
-    <glyph glyph-name="genderless"
-      unicode="&#xF22D;"
-      horiz-adv-x="288" d=" M144 272C188.1 272 224 236.1 224 192S188.1 112 144 112S64 147.9 64 192S99.9 272 144 272M144 336C64.5 336 0 271.5 0 192S64.5 48 144 48S288 112.5 288 192S223.5 336 144 336z" />
-    <glyph glyph-name="gift"
-      unicode="&#xF06B;"
-      horiz-adv-x="512" d=" M32 0C32 -17.7 46.3 -32 64 -32H224V128H32V0zM480 288H437.9C444.1 300.1 448 313.5 448 328C448 376.5 408.5 416 360 416C318.4 416 291.5 394.7 257 347.7C222.5 394.7 195.6 416 154 416C105.5 416 66 376.5 66 328C66 313.5 69.8 300.1 76.1 288H32C14.3 288 0 273.7 0 256V176C0 167.2 7.2 160 16 160H496C504.8 160 512 167.2 512 176V256C512 273.7 497.7 288 480 288zM153.9 288C131.8 288 113.9 305.9 113.9 328S131.8 368 153.9 368C173.8 368 188.5 364.7 240 288H153.9zM360 288H273.9C325.3 364.5 339.6 368 360 368C382.1 368 400 350.1 400 328S382.1 288 360 288zM288 -32H448C465.7 -32 480 -17.7 480 0V128H288V-32z" />
-    <glyph glyph-name="glass-martini-alt"
-      unicode="&#xF57B;"
-      horiz-adv-x="512" d=" M502.05 390.4C523.3 411.66 508.25 448 478.2 448H33.8C3.75 448 -11.3 411.66 9.95 390.4L224 176.36V-16H168C145.91 -16 128 -33.91 128 -56C128 -60.42 131.58 -64 136 -64H376C380.42 -64 384 -60.42 384 -56C384 -33.91 366.09 -16 344 -16H288V176.36L502.05 390.4zM443.77 400L395.77 352H116.24L68.24 400H443.77z" />
-    <glyph glyph-name="glass-martini"
-      unicode="&#xF000;"
-      horiz-adv-x="512" d=" M502.05 390.4C523.3 411.66 508.25 448 478.2 448H33.8C3.75 448 -11.3 411.66 9.95 390.4L224 176.36V-16H168C145.91 -16 128 -33.91 128 -56C128 -60.42 131.58 -64 136 -64H376C380.42 -64 384 -60.42 384 -56C384 -33.91 366.09 -16 344 -16H288V176.36L502.05 390.4z" />
-    <glyph glyph-name="glasses"
-      unicode="&#xF530;"
-      horiz-adv-x="576" d=" M574.1 167.63L528.75 349.3400000000001C522.84 373.04 507.16 393.39 485.75 405.15C464.31 416.88 438.78 419.26 415.56 411.48L400.31 406.4C391.92 403.61 387.39 394.54 390.19 386.1600000000001L395.25 370.98C398.04 362.6 407.1 358.0700000000001 415.48 360.86L428.6600000000001 365.25C439.5300000000001 368.87 451.66 368.82 461.8200000000001 363.52C472.1100000000001 358.15 479.39 348.9600000000001 482.1900000000001 337.7000000000001L520.6500000000001 183.88C498.4600000000001 190.69 470.8600000000001 196.34 439.4500000000001 196.34C404.6800000000001 196.34 365.4700000000001 189.32 324.6000000000002 169.6H251.4200000000002C210.5500000000001 189.34 171.3400000000002 196.35 136.5600000000001 196.35C105.1400000000001 196.35 77.5400000000001 190.7000000000001 55.3500000000001 183.8900000000001L93.8100000000001 337.7200000000001C96.6000000000001 348.9700000000001 103.9000000000001 358.1700000000001 114.1900000000001 363.5300000000001C124.3500000000001 368.8300000000001 136.4700000000001 368.8800000000001 147.3400000000001 365.2600000000001L160.5100000000001 360.8700000000001C168.8900000000001 358.0800000000001 177.9500000000001 362.6100000000001 180.7400000000001 370.9900000000001L185.8000000000001 386.1700000000001C188.6000000000001 394.5500000000001 184.0700000000001 403.6200000000001 175.6800000000001 406.4100000000001L160.4300000000001 411.4900000000001C137.2100000000001 419.2700000000001 111.6800000000001 416.9000000000001 90.2400000000001 405.1600000000001C68.8300000000001 393.3900000000001 53.1500000000001 373.0500000000001 47.2400000000001 349.3600000000001L1.9 167.63A64.218 64.218 0 0 1 0 152.14V81.89C0 18.99 51.58 -32 115.2 -32H152.32C212.6 -32 262.69 13.94 267.2 73.37L270.13 112H305.88L308.81 73.37C313.31 13.94 363.4 -32 423.68 -32H460.8C524.42 -32 576 18.99 576 81.88V152.13C576 157.36 575.36 162.56 574.1 167.63zM203.38 78.21C201.41 52.3 178.98 32 152.32 32H115.2C86.97 32 64 54.38 64 81.89V119.43C82.12 125.92 107.42 132.35 136.58 132.35C160.44 132.35 183.84 128.0200000000001 206.51 119.43L203.38 78.21zM512 81.88C512 54.37 489.03 32 460.8 32H423.68C397.01 32 374.58 52.3 372.62 78.21L369.49 119.43C392.1600000000001 128.0199999999999 415.57 132.35 439.44 132.35C468.56 132.35 493.87 125.91 511.99 119.42V81.8799999999999z" />
-    <glyph glyph-name="globe-africa"
-      unicode="&#xF57C;"
-      horiz-adv-x="496" d=" M248 440C111.03 440 0 328.9700000000001 0 192S111.03 -56 248 -56S496 55.03 496 192S384.9700000000001 440 248 440zM408 224.5V217.57C408 211.7 404.68 206.33 399.43 203.71L384.04 196.01A15.485 15.485 0 0 0 368.5100000000001 196.98L350.3000000000001 209.12A15.519999999999998 15.519999999999998 0 0 1 336.8000000000001 210.93L334.1500000000001 210.05C324.4500000000001 206.82 320.4900000000001 195.26 326.1600000000001 186.75L339.4000000000001 166.89C342.2700000000001 162.58 347.1100000000001 159.99 352.2900000000001 159.99H360.5000000000001C369.0600000000001 159.99 376.0000000000001 153.05 376.0000000000001 144.49V133.15C376.0000000000001 129.8 374.9100000000001 126.53 372.9000000000001 123.85L354.1600000000001 98.87C352.74 96.97 351.7700000000001 94.77 351.3300000000001 92.44L347.0300000000001 69.61C346.4100000000001 66.32 344.74 63.32 342.2700000000001 61.05A159.60800000000003 159.60800000000003 0 0 1 317.2700000000001 31.89L304.2400000000001 12.34A27.756 27.756 0 0 0 281.1500000000001 -0.02C270.6400000000001 -0.02 261.0300000000001 5.92 256.3300000000001 15.3199999999999A78.902 78.902 0 0 0 248.0000000000001 50.61V80.5C248.0000000000001 89.06 241.0600000000001 96 232.5000000000001 96H206.6200000000001C192.1300000000001 96 178.2400000000001 101.76 167.9900000000001 112A54.65899999999999 54.65899999999999 0 0 0 151.9900000000001 150.63V164.69C151.9900000000001 181.88 160.0900000000001 198.07 173.8400000000001 208.39L201.4200000000001 229.08A54.663 54.663 0 0 0 234.2000000000001 240.01H235.0900000000001C243.5700000000001 240.01 251.9400000000001 238.04 259.5200000000001 234.24L274.2400000000001 226.88C277.9200000000001 225.04 282.1700000000001 224.74 286.0700000000001 226.04L333.3800000000001 241.81C339.7100000000001 243.92 343.9800000000001 249.84 343.9800000000001 256.51C343.9800000000001 265.07 337.0400000000001 272.01 328.4800000000001 272.01H318.3900000000001C314.2800000000001 272.01 310.3400000000001 273.64 307.4300000000001 276.55L300.5100000000001 283.4699999999999A15.493 15.493 0 0 1 289.5500000000002 288.01H199.5C190.94 288.01 184 294.95 184 303.51V307.91C184 315.02 188.84 321.2199999999999 195.74 322.95L210.19 326.56C213.93 327.5 217.19 329.79 219.33 333L227.41 345.1099999999999C230.28 349.42 235.12 352.01 240.3 352.01H264.51C273.07 352.01 280.01 358.95 280.01 367.51V389.2099999999999C359.23 376.37 422.86 316.98 441.93 240H423.5C414.94 240 408 233.06 408 224.5z" />
-    <glyph glyph-name="globe-americas"
-      unicode="&#xF57D;"
-      horiz-adv-x="496" d=" M248 440C111.03 440 0 328.9700000000001 0 192S111.03 -56 248 -56S496 55.03 496 192S384.9700000000001 440 248 440zM330.29 82.4C326.3900000000001 78.52 322.3 74.45 318.98 71.12C315.99 68.12 313.88 64.42 312.81 60.41C311.3 54.75 310.08 49.03 308.04 43.54L290.6500000000001 -3.31C276.8900000000001 -6.31 262.6500000000001 -8 248.0000000000001 -8V19.38C249.6900000000001 32 240.3600000000001 55.64 225.3700000000001 70.63C219.37 76.63 216 84.77 216 93.26V125.27C216 136.91 209.73 147.61 199.54 153.24C185.17 161.19 164.73 172.3 150.73 179.35C139.25 185.13 128.63 192.49 119.08 201.1L118.28 201.82A114.792 114.792 0 0 0 100.22 222.56C90.84 236.3300000000001 75.56 258.98 65.63 273.7000000000001C86.1 319.2000000000001 122.99 355.7400000000001 168.83 375.5900000000001L192.84 363.5800000000001C203.48 358.26 216 365.99 216 377.89V389.19C223.99 390.48 232.12 391.3 240.39 391.61L268.69 363.31C274.94 357.06 274.94 346.93 268.69 340.68L264 336L253.66 325.66C250.54 322.54 250.54 317.4700000000001 253.66 314.35L258.35 309.66C261.4700000000001 306.54 261.4700000000001 301.4700000000001 258.35 298.35L250.35 290.35A8.008 8.008 0 0 0 244.6900000000001 288.01H235.7C233.62 288.01 231.62 287.2 230.12 285.74L220.2 276.09A8.008 8.008 0 0 1 218.62 266.78L234.21 235.59C236.87 230.27 233 224.01 227.06 224.01H221.42C219.49 224.01 217.63 224.71 216.18 225.97L206.9 234.03A16.017 16.017 0 0 1 191.35 237.13L160.18 226.74A11.95 11.95 0 0 1 152.01 215.4C152.01 210.87 154.57 206.74 158.62 204.71L169.7000000000001 199.17C179.1100000000001 194.46 189.4900000000001 192.01 200.0100000000001 192.01S222.6000000000001 164.72 232.0100000000001 160.01H298.7600000000001C307.2500000000001 160.01 315.3800000000001 156.64 321.3900000000001 150.64L335.0800000000001 136.95A30.503000000000004 30.503000000000004 0 0 0 344.0100000000001 115.38A46.536 46.536 0 0 0 330.29 82.4zM417 173.75C411.21 175.2 406.1600000000001 178.75 402.85 183.72L384.87 210.69A23.97 23.97 0 0 0 384.87 237.3100000000001L404.46 266.6900000000001C406.78 270.1600000000001 409.96 272.98 413.7 274.8400000000001L426.68 281.3300000000001C440.2 254.41 448 224.13 448 192C448 183.33 447.26 174.84 446.18 166.46L417 173.75z" />
-    <glyph glyph-name="globe-asia"
-      unicode="&#xF57E;"
-      horiz-adv-x="496" d=" M248 440C111.03 440 0 328.9700000000001 0 192S111.03 -56 248 -56S496 55.03 496 192S384.9700000000001 440 248 440zM236.66 199.77C233.77 194.95 228.56 192 222.94 192H222.63C218.39 192 214.32 190.31 211.32 187.31L205.66 181.65C202.54 178.53 202.54 173.46 205.66 170.34L211.32 164.68C214.32 161.68 216.01 157.61 216.01 153.37V144C216.01 135.16 208.85 128 200.01 128H193.9C187.84 128 182.3 131.42 179.59 136.85L156.97 182.0800000000001C154.53 186.96 148.02 188.0200000000001 144.16 184.16L124.69 164.7000000000001C121.69 161.7000000000001 117.62 160.0100000000001 113.38 160.0100000000001H50.81C49.12 170.45 48 181.08 48 192C48 302.28 137.72 392 248 392C269.51 392 290.2 388.49 309.63 382.18L259.4700000000001 343.65C254.36 340.24 254.8400000000001 332.5900000000001 260.3300000000001 329.8400000000001L271.1600000000001 324.43C276.5800000000001 321.7200000000001 280 316.18 280 310.12V232C280 227.58 276.42 224 272 224H268.94C265.9100000000001 224 263.14 225.71 261.79 228.42C260.23 231.54 255.83 231.71 254.0300000000001 228.72L236.6600000000001 199.77zM408 89.57C408 85.33 406.31 81.26 403.31 78.26L393.74 68.69C390.74 65.69 386.67 64 382.43 64H367.27C363.03 64 358.96 65.69 355.96 68.69L342.95 81.7A26.767 26.767 0 0 1 317.53 88.74L296.26 83.42C294.99 83.1 293.69 82.94 292.38 82.94H282.04C277.8 82.94 273.73 84.63 270.73 87.63L258.82 99.54A8.008 8.008 0 0 0 256.48 105.2000000000001V115.4C256.48 118.67 258.4700000000001 121.61 261.51 122.8300000000001L300.85 138.5700000000001C302.8300000000001 139.3600000000001 304.7100000000001 140.3900000000001 306.44 141.6200000000001L330.15 158.5100000000001A7.978 7.978 0 0 0 334.79 159.9900000000001H346.88C350.11 159.9900000000001 353.0299999999999 158.0500000000001 354.2699999999999 155.0600000000001L359.62 142.21A4 4 0 0 1 363.31 139.7500000000001H367.11C368.89 139.7500000000001 370.46 140.9300000000001 370.95 142.6300000000001L375.1499999999999 157.1000000000001C375.6499999999999 158.8100000000001 377.2099999999999 159.9800000000001 378.9899999999999 159.9800000000001H385.0499999999999C387.2599999999999 159.9800000000001 389.0499999999999 158.1900000000001 389.0499999999999 155.9800000000001V143.0500000000001C389.0499999999999 140.9300000000001 389.8899999999999 138.8900000000001 391.3899999999999 137.3900000000001L403.2999999999999 125.48C406.2999999999999 122.48 407.9899999999999 118.41 407.9899999999999 114.17V89.57z" />
-    <glyph glyph-name="globe"
-      unicode="&#xF0AC;"
-      horiz-adv-x="496" d=" M336.5 288C322 377.3 287.8 440 248 440S174 377.3 159.5 288H336.5zM152 192C152 169.8 153.2 148.5 155.3 128H340.6C342.7000000000001 148.5 343.9000000000001 169.8 343.9000000000001 192S342.7000000000001 235.5 340.6 256H155.3C153.2 235.5 152 214.2 152 192zM476.7 288C448.1 355.9 390.2 408.4 318.7 429.6C343.1 395.8 359.9 344.9 368.7 288H476.7zM177.2 429.6C105.8 408.4 47.8 355.9 19.3 288H127.3C136 344.9 152.8 395.8 177.2 429.6zM487.4 256H372.7C374.8 235 376 213.5 376 192S374.8 149 372.7 128H487.3C492.8 148.5 495.9 169.8 495.9 192S492.8 235.5 487.4 256zM120 192C120 213.5 121.2 235 123.3 256H8.6C3.2 235.5 0 214.2 0 192S3.2 148.5 8.6 128H123.2C121.2 149 120 170.5 120 192zM159.5 96C174 6.7 208.2 -56 248 -56S322 6.7 336.5 96H159.5zM318.8 -45.6C390.2000000000001 -24.4 448.2000000000001 28.1 476.8 96H368.8C360 39.1 343.2 -11.8 318.8 -45.6zM19.3 96C47.9 28.1 105.8 -24.4 177.3 -45.6C152.9 -11.8 136.1 39.1 127.3 96H19.3z" />
-    <glyph glyph-name="golf-ball"
-      unicode="&#xF450;"
-      horiz-adv-x="416" d=" M96 32H320C320 14.3 305.7 0 288 0H272C254.3 0 240 -14.3 240 -32V-52C240 -58.6 234.6 -64 228 -64H188C181.4 -64 176 -58.6 176 -52V-32C176 -14.3 161.7 0 144 0H128C110.3 0 96 14.3 96 32zM416 240C416 165.8 377 100.8 318.5 64H97.5C39 100.8 0 165.8 0 240C0 354.9 93.1 448 208 448S416 354.9 416 240zM235.9 196.1C254.2 196.1 269 210.9 269 229.2C269 243.6 259.7 255.5 246.9 260.1C256.5 233.3 231.3 208.8 205 218.2C209.6 205.4 221.5 196.1 235.9 196.1zM285 149.2C285 163.6 275.7 175.5 262.9 180.1C272.5 153.3 247.3 128.8 221 138.2C225.6 125.4 237.5 116.1 251.9 116.1C270.2 116.1 285 131 285 149.2zM349 213.2C349 227.6 339.7 239.5 326.9 244.1C336.5 217.3 311.3 192.8 285 202.2C289.6 189.4 301.5 180.1 315.9 180.1C334.2 180.1 349 195 349 213.2z" />
-    <glyph glyph-name="graduation-cap"
-      unicode="&#xF19D;"
-      horiz-adv-x="640" d=" M622.884 248.995L347.067 163.895A96 96 0 0 0 292.933 163.895L92.398 225.768C83.834 214.33 81.38 202.718 80.48 187.433C89.778 181.835 96 171.645 96 160C96 148.048 89.443 137.634 79.735 132.139L95.932 9.043C96.562 4.257 92.832 0 88 0H40C35.172 0 31.438 4.253 32.068 9.044L48.265 132.14C38.557 137.634 32 148.048 32 160C32 172.034 38.646 182.511 48.465 187.976C49.412 205.927 52.439 221.207 60.617 235.573L17.115 248.995C-5.761 255.796 -5.651 288.236 17.115 295.005L292.932 380.105A96 96 0 0 0 347.0660000000001 380.105L622.883 295.005C645.76 288.204 645.6500000000001 255.764 622.884 248.995zM356.503 133.318L356.296 133.254L356.089 133.193A127.99799999999999 127.99799999999999 0 0 0 283.912 133.193L283.705 133.254L283.498 133.318L132.584 179.888L120 96C120 60.654 209.543 32 320 32S520 60.654 520 96L507.417 179.888L356.503 133.3180000000001z" />
-    <glyph glyph-name="greater-than-equal"
-      unicode="&#xF532;"
-      horiz-adv-x="448" d=" M55.22 340.31L230.78 272.2200000000001L55.34 204.17C36.95 198.14 27.46 179.78 34.14 163.17L46.23 133.09C52.91 116.48 73.22 107.9 91.61 113.9400000000001L393.02 233.8C406.79 238.32 416 250.4100000000001 416 263.9700000000001V279.9300000000001C416 293.49 406.79 305.5800000000001 393.02 310.1L91.3 430.08C73.01 436.08 52.79 427.55 46.15 411.02L34.12 381.1C27.48 364.57 36.93 346.31 55.22 340.31zM424 48H24C10.75 48 0 37.26 0 24V-24C0 -37.25 10.75 -48 24 -48H424C437.25 -48 448 -37.25 448 -24V24C448 37.26 437.25 48 424 48z" />
-    <glyph glyph-name="greater-than"
-      unicode="&#xF531;"
-      horiz-adv-x="384" d=" M365.52 238.15L59.22 380.99C43.16 388.48 24.07 381.53 16.58 365.4700000000001L3.01 336.39C-4.48 320.33 2.47 301.24 18.53 293.75L236.96 191.9L18.49 90.01C2.47 82.54 -4.46 63.5 3.01 47.48L16.53 18.48C24 2.46 43.04 -4.47 59.06 3L365.5300000000001 145.91A32.003 32.003 0 0 1 384.0100000000001 174.91V209.14C384.0000000000001 221.59 376.8000000000001 232.9 365.5200000000001 238.15z" />
-    <glyph glyph-name="grimace"
-      unicode="&#xF57F;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM144 48H136C118.3 48 104 62.3 104 80V88H144V48zM144 104H104V112C104 129.7 118.3 144 136 144H144V104zM136 240C136 257.7 150.3 272 168 272S200 257.7 200 240S185.7 208 168 208S136 222.3 136 240zM208 48H160V88H208V48zM208 104H160V144H208V104zM272 48H224V88H272V48zM272 104H224V144H272V104zM336 48H288V88H336V48zM336 104H288V144H336V104zM328 208C310.3 208 296 222.3 296 240S310.3 272 328 272S360 257.7 360 240S345.7 208 328 208zM392 80C392 62.3 377.7 48 360 48H352V88H392V80zM392 104H352V144H360C377.7 144 392 129.7 392 112V104z" />
-    <glyph glyph-name="grin-alt"
-      unicode="&#xF581;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM311.7 311.3C319.3 322.7000000000001 336.4 323 344.4 311.3C356.8 292.9 359.5 274.4 360.1 256C359.6 237.6 356.8 219.1 344.4 200.7C336.8 189.3 319.7 189 311.7 200.7C299.3 219.1 296.6 237.6 296 256C296.5 274.4 299.3 292.9 311.7 311.3zM151.7 311.3C159.3 322.7000000000001 176.4 323 184.4 311.3C196.8 292.9 199.5 274.4 200.1 256C199.6 237.6 196.8 219.1 184.4 200.7C176.8 189.3 159.7 189 151.7 200.7C139.3 219.1 136.6 237.6 136 256C136.5 274.4 139.3 292.9 151.7 311.3zM248 16C187.4 16 113.5 54.3 104.2 109.3C102.2 121.1 113.5 130.9 124.9 127.2C155.1 117.5 200 112 248 112S340.9 117.5 371.1 127.2C382.5 130.9 393.7000000000001 121.1 391.8 109.3C382.5 54.3 308.6 16 248 16z" />
-    <glyph glyph-name="grin-beam-sweat"
-      unicode="&#xF583;"
-      horiz-adv-x="504" d=" M456 320C482.5 320 504 341 504 367C504 387 475.5 427.4 462.4 444.8C459.2 449.1 452.8 449.1 449.6 444.8C436.5 427.4 408 387 408 367C408 341 429.5 320 456 320zM456 288C411.9 288 376 323.4 376 367C376 371.4 376.3 381.2 384.1 399.2C345 424.9 298.3 440 248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192C496 227.1 488.6 260.4 475.5 290.6C469.2 289.1 462.8 288 456 288zM328 296C351.8 296 380.7 266.7 384 224.6C384.7 216 373.2 212.6 369.1 220.1L359.6 237.1C351.9000000000001 250.8 340.4000000000001 258.7 328.1 258.7S304.3 250.8 296.6 237.1L287.1 220.1C283 212.7 271.5 216.1 272.2000000000001 224.6C275.3000000000001 266.7 304.2000000000001 296 328.0000000000001 296zM168 296C191.8 296 220.7 266.7 224 224.6C224.7 216 213.2 212.6 209.1 220.1L199.6 237.1C191.9 250.8 180.4 258.7 168.1 258.7S144.3 250.8 136.6 237.1L127.1 220.1C122.9 212.7 111.5 216.1 112.2 224.6C115.3 266.7 144.2 296 168 296zM248 16C187.4 16 113.5 54.3 104.2 109.3C102.2 121.1 113.5 130.9 124.9 127.2C155.1 117.5 200 112 248 112S340.9 117.5 371.1 127.2C382.6 130.9 393.7000000000001 121 391.8 109.3C382.5 54.3 308.6 16 248 16z" />
-    <glyph glyph-name="grin-beam"
-      unicode="&#xF582;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM328 296C351.8 296 380.7 266.7 384 224.6C384.7 216 373.2 212.7 369.1 220.1L359.6 237.1C351.9000000000001 250.8 340.4000000000001 258.7 328.1 258.7S304.3 250.8 296.6 237.1L287.1 220.1C283 212.8 271.5 216.1 272.2000000000001 224.6C275.3000000000001 266.7 304.2000000000001 296 328.0000000000001 296zM168 296C191.8 296 220.7 266.7 224 224.6C224.7 216 213.2 212.7 209.1 220.1L199.6 237.1C191.9 250.8 180.4 258.7 168.1 258.7S144.3 250.8 136.6 237.1L127.1 220.1C122.9 212.7 111.5 216.1 112.2 224.6C115.3 266.7 144.2 296 168 296zM248 16C187.4 16 113.5 54.3 104.2 109.3C102.2 121.2 113.6 130.9 124.9 127.2C155.1 117.5 200 112 248 112S340.9 117.5 371.1 127.2C382.5 130.9 393.7000000000001 121.1 391.8 109.3C382.5 54.3 308.6 16 248 16z" />
-    <glyph glyph-name="grin-hearts"
-      unicode="&#xF584;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM90.4 264.4C97.1 282 117.1 291.1 135.3 286.3L142.4 284.4L144.4 291.5C149.4 309.6 167.2 322.4 185.9 319.4C207.3 316 220.3 295.2000000000001 214.7 274.9L195.3 205C194.1 200.5 189.4 197.8 184.8 199L114.6 217.2C94.2 222.6 82.7 244.2 90.4 264.4zM248 16C187.4 16 113.5 54.3 104.2 109.3C102.2 121.1 113.4 130.8 124.9 127.2C155.1 117.5 200 112 248 112S340.9 117.5 371.1 127.2C382.5 130.8 393.7000000000001 121.1 391.8 109.3C382.5 54.3 308.6 16 248 16zM381.4 217.3L311.2 199.1C306.7 197.9 302 200.6 300.7 205.1L281.3 275C275.7 295.3 288.7 316.1 310.1 319.5C328.7000000000001 322.5 346.5 309.7 351.6 291.6L353.6 284.5L360.7000000000001 286.4C378.9000000000001 291.1 398.9000000000001 282.1 405.6 264.5C413.3 244.2 401.8 222.6 381.4000000000001 217.3z" />
-    <glyph glyph-name="grin-squint-tears"
-      unicode="&#xF586;"
-      horiz-adv-x="512" d=" M409.6 336.1C432.2000000000001 339.3 483.1 348.1 497.9 362.9C517.1 382.1 516.8000000000001 413.5 497.2 433.1S446 453 426.9 433.8C412.1 419 403.4 368.1 400.1 345.5C399.3 340 404 335.3 409.6 336.1zM102.4 47.9C79.8 44.7 28.9 35.9 14.1 21.1C-5 1.9999999999999 -4.7 -29.5000000000001 14.9 -49.1S65.9 -69 85.1 -49.8C99.9 -35 108.6 15.9 111.9 38.5C112.7 44 108 48.7 102.4 47.9zM414.1 304.4C381.1 300.5 365.5 329.5 368.4000000000001 350.1C371.8 374.1 375.8 392.2 379.9000000000001 406.6C285.1 461.4 161.8 448.5 80.6 367.4C-0.5 286.3 -13.4 163 41.4 68.1C55.8 72.2000000000001 73.8 76.1 97.9 79.6C131.1 83.5 146.5 54.4 143.6 33.9C140.2 9.9 136.2 -8.2 132.1 -22.6C226.9000000000001 -77.4 350.2000000000001 -64.5 431.4000000000001 16.6S525.4000000000001 221 470.6 315.9000000000001C456.2 311.8000000000001 438.1 307.9000000000001 414.1 304.4000000000001zM255.7 342C259 355.2 278.1 353.5 279.3 340.2L284.1 287.9L336.4000000000001 283.1C349.8 281.9 351.3 262.8 338.2000000000001 259.5L247.7000000000001 236.9C238.8000000000001 234.7 231.0000000000001 242.8 233.2000000000001 251.4L255.7000000000001 342zM164.8 111.7L160 164L107.7 168.8C94.3 170 92.8 189.1 105.9 192.4L196.4 215C205.2 217.2 213.1 209.2 210.9 200.5L188.3 110C185.2 96.8 166.1 98.3 164.8 111.7zM380.5 67.5C351.2 38.2 304.8 17.1 263.8 17.1C244.9 17.1 227.2 21.6 212.8 31.8C203 38.7 204.1 53.6 214.8 59C243.1 73.6 278.7 101.4 312.6 135.3S374.3 204.9 388.9000000000001 233.1C394.3 243.6 409.1 245.0000000000001 416.2000000000001 235.1C448.5000000000001 189.8 423.3000000000001 110.4 380.5000000000001 67.5z" />
-    <glyph glyph-name="grin-squint"
-      unicode="&#xF585;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM281.8 250.3L361.8 298.3C373.4000000000001 305.2000000000001 385.8 290.6 377.2 280.3L343.6 240L377.2000000000001 199.7C385.9000000000001 189.3 373.3000000000001 174.9 361.8000000000001 181.7L281.8000000000001 229.7C274.1000000000001 234.4 274.1000000000001 245.6 281.8000000000001 250.3zM118.8 280.3C110.2 290.6 122.6 305.2000000000001 134.2 298.3L214.2 250.3C222 245.6 222 234.4 214.2 229.7L134.2 181.7000000000001C122.7 174.9 110.2 189.3000000000001 118.8 199.7000000000001L152.4 240.0000000000001L118.8 280.3000000000001zM248 16C187.4 16 113.5 54.3 104.2 109.3C102.2 121.2 113.6 130.9 124.9 127.2C155.1 117.5 200 112 248 112S340.9 117.5 371.1 127.2C382.6 130.9 393.7000000000001 121 391.8 109.3C382.5 54.3 308.6 16 248 16z" />
-    <glyph glyph-name="grin-stars"
-      unicode="&#xF587;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM94.6 279.1L129.5 284.1L145 315.7C147.9 321.5 156 321.5 158.9 315.7L174.4 284.1L209.3 279.1C215.5 278.1 218.2 270.5 213.6 265.9L188.2 241.3L194.2 206.4C195.2 200.2 188.9 195.4 183.2 198.5L152 214.7L120.7 198.4C115 195.3 108.7 200.1 109.7 206.3L115.7 241.2L90.3 265.8C85.7 270.5 88.4 278.1 94.6 279.1zM248 16C187.4 16 113.5 54.3 104.2 109.3C102.2 121.1 113.5 130.8 124.9 127.2C155.1 117.5 200 112 248 112S340.9 117.5 371.1 127.2C382.6 130.9 393.7000000000001 121.1 391.8 109.3C382.5 54.3 308.6 16 248 16zM405.7 265.9L380.3 241.3L386.3 206.4C387.3 200.2 381 195.4 375.3 198.5L344 214.7L312.7 198.4C307 195.3 300.7 200.1 301.7 206.3L307.7 241.2L282.3 265.8C277.8 270.4 280.4000000000001 278 286.6 279L321.5 284L337 315.6C339.9 321.4 348 321.4 350.9 315.6L366.4 284L401.3 279C407.6 278.1 410.3 270.5 405.7 265.9z" />
-    <glyph glyph-name="grin-tears"
-      unicode="&#xF588;"
-      horiz-adv-x="640" d=" M102.4 191.9C79.8 188.7 28.9 179.9 14.1 165.1C-5 146 -4.7 114.5 14.9 94.9S65.9 75 85.1 94.2C99.9 109 108.6 159.9 111.9 182.5C112.7 188 108 192.7 102.4 191.9zM625.8 165.1C611 179.9 560.0999999999999 188.6 537.5 191.9C532 192.7 527.2 188 528 182.4C531.2 159.8 540 108.9 554.8 94.1C574 74.9 605.4 75.2 625 94.8S645 146 625.8 165.1zM496.4 177.9C492.6 204.5 515.5 227.4 542.1 223.6C551 222.3 558.9 220.9 566.4 219.5C552.7 343.5 447.7 440 320 440S87.3 343.5 73.6 219.5C81.1 220.9 89 222.3 97.9 223.6C131.1 227.5 146.5 198.3 143.6 177.9C131.8 95.6 113.7 77.5 107.8 71.5C106.9 70.6 105.8 69.9 104.8 69C147.5 -5.6 227.8 -56 320 -56S492.5 -5.6 535.2 69.1C534.2 70 533.1 70.6 532.2 71.6C526.3000000000001 77.5 508.2 95.6 496.4 177.9zM400 296C423.8 296 452.7 266.7 456 224.6C456.7 216 445.2 212.6 441.1 220.1L431.6 237.1C423.9000000000001 250.8 412.4000000000001 258.7 400.1 258.7S376.3 250.8 368.6 237.1L359.1 220.1C354.9000000000001 212.7 343.5 216.1 344.2000000000001 224.6C347.3000000000001 266.7 376.2000000000001 296 400.0000000000001 296zM240 296C263.8 296 292.7 266.7 296 224.6C296.7 216 285.2 212.6 281.1 220.1L271.6 237.1C263.9000000000001 250.8 252.4000000000001 258.7 240.1 258.7S216.3 250.8 208.6 237.1L199.1 220.1C194.9 212.7 183.5 216.1 184.2 224.6C187.3 266.7 216.2 296 240 296zM320 16C259.4 16 185.5 54.3 176.2 109.3C174.2 121 185.4 130.9 196.9 127.2C227.1 117.5 272 112 320 112S412.9 117.5 443.1 127.2C454.5 130.9 465.7 121.1 463.8 109.3C454.5 54.3 380.6 16 320 16z" />
-    <glyph glyph-name="grin-tongue-squint"
-      unicode="&#xF58A;"
-      horiz-adv-x="496" d=" M293.1 73.4C278.7000000000001 79.9 262 71.2 258.5 55.8L256.7 47.9999999999999C254.6 38.8 241.5 38.8 239.4 47.9999999999999L237.6 55.8C234.1 71.1999999999999 217.4 79.9 203 73.4C202.1 73 203.3 73.6 184.1 64V1C184.1 -34.2 212.1 -63.5 247.2 -63.9C282.9 -64.4 312.1 -35.5 312.1 0.1V64.1C292.6 73.7000000000001 293.9 73 293.1 73.4zM248 440C111 440 0 329 0 192C0 85.7 67 -4.7 161 -40C155.4 -27.8 152 -14.3 152 0V45.5C127.3 61.7 108.5 83.6 104.2 109.3C102.2 121.1 113.4 130.8 124.9 127.2C155.1 117.5 200 112 248 112S340.9 117.5 371.1 127.2C382.5 130.9 393.7000000000001 121.1 391.8 109.3C387.5 83.6 368.7 61.7 344 45.5V0C344 -14.3 340.6 -27.8 335 -40C429 -4.7 496 85.7 496 192C496 329 385 440 248 440zM214.2 229.7L134.2 181.7C122.7 174.9 110.2 189.3 118.8 199.7L152.4 240L118.8 280.3C110.2 290.6 122.6 305.2000000000001 134.2 298.3L214.2 250.3C221.9 245.6 221.9 234.4 214.2 229.7zM377.2 199.7C385.9 189.3 373.3 174.9 361.8 181.7L281.8 229.7C274 234.4 274 245.6 281.8 250.3L361.8 298.3C373.5 305.2 385.7 290.6 377.2 280.3L343.6 240L377.2000000000001 199.7z" />
-    <glyph glyph-name="grin-tongue-wink"
-      unicode="&#xF58B;"
-      horiz-adv-x="496" d=" M344 264C330.7 264 320 253.3 320 240S330.7 216 344 216S368 226.7 368 240S357.3 264 344 264zM248 440C111 440 0 329 0 192C0 85.7 67 -4.7 161 -40C155.4 -27.8 152 -14.3 152 0V45.5C127.3 61.7 108.5 83.6 104.2 109.3C102.2 121.1 113.5 130.8 124.9 127.2C155.1 117.5 200 112 248 112S340.9 117.5 371.1 127.2C382.6 130.9 393.7000000000001 121.1 391.8 109.3C387.5 83.6 368.7 61.7 344 45.5V0C344 -14.3 340.6 -27.8 335 -40C429 -4.7 496 85.7 496 192C496 329 385 440 248 440zM192 215L182.5 223.5C167.7 236.7 136.3 236.7 121.5 223.5L112 215C103.5 207.6 90.4 214.7 92.2 225.8C96.2 251 126.4 267.9 152.1 267.9S208 251 212 225.8C213.6 214.7 200.4 207.6 192 215zM344 176C308.7 176 280 204.7 280 240S308.7 304 344 304S408 275.3 408 240S379.3 176 344 176zM293.1 73.4C278.7000000000001 79.9 262 71.2 258.5 55.8L256.7 47.9999999999999C254.6 38.8 241.5 38.8 239.4 47.9999999999999L237.6 55.8C234.1 71.1999999999999 217.4 79.9 203 73.4C202.1 73 203.3 73.6 184.1 64V1C184.1 -34.2 212.1 -63.5 247.2 -63.9C282.9 -64.4 312.1 -35.5 312.1 0.1V64.1C292.6 73.7000000000001 293.9 73 293.1 73.4z" />
-    <glyph glyph-name="grin-tongue"
-      unicode="&#xF589;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192C0 85.7 67 -4.7 161 -40C155.4 -27.8 152 -14.3 152 0V45.5C127.3 61.7 108.5 83.6 104.2 109.3C102.2 121.1 113.5 130.8 124.9 127.2C155.1 117.5 200 112 248 112S340.9 117.5 371.1 127.2C382.5 130.8 393.7000000000001 121.1 391.8 109.3C387.5 83.6 368.7 61.7 344 45.5V0C344 -14.3 340.6 -27.8 335 -40C429 -4.7 496 85.7 496 192C496 329 385 440 248 440zM168 208C150.3 208 136 222.3 136 240S150.3 272 168 272S200 257.7 200 240S185.7 208 168 208zM328 208C310.3 208 296 222.3 296 240S310.3 272 328 272S360 257.7 360 240S345.7 208 328 208zM293.1 73.4C278.7000000000001 79.9 262 71.2 258.5 55.8L256.7 47.9999999999999C254.6 38.8 241.5 38.8 239.4 47.9999999999999L237.6 55.8C234.1 71.1999999999999 217.4 79.9 203 73.4C202.1 73 203.3 73.6 184.1 64V1C184.1 -34.2 212.1 -63.5 247.2 -63.9C282.9 -64.4 312.1 -35.5 312.1 0.1V64.1C292.6 73.7000000000001 293.9 73 293.1 73.4z" />
-    <glyph glyph-name="grin-wink"
-      unicode="&#xF58C;"
-      horiz-adv-x="496" d=" M0 192C0 55 111 -56 248 -56S496 55 496 192S385 440 248 440S0 329 0 192zM200 240C200 222.3 185.7 208 168 208S136 222.3 136 240S150.3 272 168 272S200 257.7 200 240zM368 215L358.5 223.5C343.7 236.7 312.3 236.7 297.5 223.5L288 215C279.7 207.6 266.4 214.6 268.2 225.8C272.2 251 302.4 267.9 328.1 267.9S384 251 388 225.8C389.6 214.8 376.5 207.6 368 215zM124.9 127.2C155.1 117.5 200 112 248 112S340.9 117.5 371.1 127.2C382.4000000000001 130.9 393.7000000000001 121.2 391.8 109.3C382.6 54.3 308.6 16 248 16S113.5 54.3 104.2 109.3C102.2 121.2 113.5 130.9 124.9 127.2z" />
-    <glyph glyph-name="grin"
-      unicode="&#xF580;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM328 272C345.7 272 360 257.7 360 240S345.7 208 328 208S296 222.3 296 240S310.3 272 328 272zM168 272C185.7 272 200 257.7 200 240S185.7 208 168 208S136 222.3 136 240S150.3 272 168 272zM248 16C187.4 16 113.5 54.3 104.2 109.3C102.2 121.1 113.5 130.9 124.9 127.2C155.1 117.5 200 112 248 112S340.9 117.5 371.1 127.2C382.4000000000001 130.9 393.7000000000001 121.1 391.8 109.3C382.5 54.3 308.6 16 248 16z" />
-    <glyph glyph-name="grip-horizontal"
-      unicode="&#xF58D;"
-      horiz-adv-x="448" d=" M96 160H32C14.33 160 0 145.67 0 128V64C0 46.33 14.33 32 32 32H96C113.67 32 128 46.33 128 64V128C128 145.67 113.67 160 96 160zM256 160H192C174.33 160 160 145.67 160 128V64C160 46.33 174.33 32 192 32H256C273.67 32 288 46.33 288 64V128C288 145.67 273.67 160 256 160zM416 160H352C334.33 160 320 145.67 320 128V64C320 46.33 334.33 32 352 32H416C433.67 32 448 46.33 448 64V128C448 145.67 433.67 160 416 160zM96 352H32C14.33 352 0 337.67 0 320V256C0 238.33 14.33 224 32 224H96C113.67 224 128 238.33 128 256V320C128 337.67 113.67 352 96 352zM256 352H192C174.33 352 160 337.67 160 320V256C160 238.33 174.33 224 192 224H256C273.67 224 288 238.33 288 256V320C288 337.67 273.67 352 256 352zM416 352H352C334.33 352 320 337.67 320 320V256C320 238.33 334.33 224 352 224H416C433.67 224 448 238.33 448 256V320C448 337.67 433.67 352 416 352z" />
-    <glyph glyph-name="grip-vertical"
-      unicode="&#xF58E;"
-      horiz-adv-x="320" d=" M96 416H32C14.33 416 0 401.67 0 384V320C0 302.33 14.33 288 32 288H96C113.67 288 128 302.3300000000001 128 320V384C128 401.67 113.67 416 96 416zM96 256H32C14.33 256 0 241.67 0 224V160C0 142.33 14.33 128 32 128H96C113.67 128 128 142.33 128 160V224C128 241.67 113.67 256 96 256zM96 96H32C14.33 96 0 81.67 0 64V0C0 -17.67 14.33 -32 32 -32H96C113.67 -32 128 -17.67 128 0V64C128 81.67 113.67 96 96 96zM288 416H224C206.33 416 192 401.67 192 384V320C192 302.33 206.33 288 224 288H288C305.67 288 320 302.3300000000001 320 320V384C320 401.67 305.67 416 288 416zM288 256H224C206.33 256 192 241.67 192 224V160C192 142.33 206.33 128 224 128H288C305.67 128 320 142.33 320 160V224C320 241.67 305.67 256 288 256zM288 96H224C206.33 96 192 81.67 192 64V0C192 -17.67 206.33 -32 224 -32H288C305.67 -32 320 -17.67 320 0V64C320 81.67 305.67 96 288 96z" />
-    <glyph glyph-name="h-square"
-      unicode="&#xF0FD;"
-      horiz-adv-x="448" d=" M448 368V16C448 -10.51 426.51 -32 400 -32H48C21.49 -32 0 -10.51 0 16V368C0 394.51 21.49 416 48 416H400C426.51 416 448 394.51 448 368zM336 320H304C295.163 320 288 312.837 288 304V224H160V304C160 312.837 152.837 320 144 320H112C103.163 320 96 312.837 96 304V80C96 71.163 103.163 64 112 64H144C152.837 64 160 71.163 160 80V160H288V80C288 71.163 295.163 64 304 64H336C344.837 64 352 71.163 352 80V304C352 312.837 344.837 320 336 320z" />
-    <glyph glyph-name="hand-holding-heart"
-      unicode="&#xF4BE;"
-      horiz-adv-x="576" d=" M275.3 197.5C282.3 190.1 293.7 190.1 300.8 197.5L409.7000000000001 311.7C441.3000000000001 344.9 439.5000000000001 399.9 404.1 430.5C373.3 457.2 327.4000000000001 452.4 299.2000000000001 422.8L288 411.1L276.9 422.7C248.7 452.4 202.8 457.2 172 430.5C136.7 399.9 134.8 344.9 166.4 311.7L275.3 197.5zM565.3 119.9C553.5 130.6 535.0999999999999 129.9 522.6999999999999 119.9L430.3 46C419 36.9 404.9000000000001 32 390.3 32H272C263.2 32 256 39.2 256 48S263.2 64 272 64H350.3C366.2 64 381 74.9 383.6 90.6C386.9000000000001 110.6 371.5 128 352 128H192C165 128 138.9 118.7 117.9 101.7L71.4 64H16C7.2 64 0 56.8 0 48V-48C0 -56.8 7.2 -64 16 -64H372.8C387.3 -64 401.4000000000001 -59.1 412.8 -50L564 71C579.2 83.1 580.4 106.3 565.3 119.9z" />
-    <glyph glyph-name="hand-holding-usd"
-      unicode="&#xF4C0;"
-      horiz-adv-x="544" d=" M257.6 303.7L307.6 289.4C311.2000000000001 288.4 313.7000000000001 285 313.7000000000001 281.3C313.7000000000001 276.7 309.9000000000001 272.9 305.3000000000001 272.9H272.5000000000001C268.9000000000001 272.9 265.4000000000001 273.7 262.2000000000001 275.1C257.4000000000001 277.3 251.8000000000001 276.8 248.1000000000001 273.1L230.6000000000001 255.6C225.3000000000001 250.3 225.9000000000001 241.3 232.1000000000001 237.2C241.6000000000001 230.9 252.4000000000001 227.1 263.9000000000001 225.7V208C263.9000000000001 199.2 271.1 192 279.9000000000001 192H295.9000000000001C304.7000000000001 192 311.9000000000001 199.2 311.9000000000001 208V225.6C342.2000000000001 229.2 365.2000000000001 256.6 361.2000000000001 288.6C358.3000000000001 311.6 340.5000000000001 329.9 318.3000000000001 336.3L268.3000000000001 350.6C264.7000000000001 351.6 262.2000000000001 355 262.2000000000001 358.7C262.2000000000001 363.3 266.0000000000001 367.1 270.6 367.1H303.4000000000001C307.0000000000001 367.1 310.5000000000001 366.3 313.7000000000001 364.9C318.5000000000001 362.7 324.1 363.2 327.8000000000001 366.9L345.3000000000001 384.4C350.6000000000001 389.7 350.0000000000001 398.7 343.8000000000001 402.8C334.3000000000001 409.1 323.5000000000001 412.9 312.0000000000001 414.3V432C312.0000000000001 440.8 304.8000000000001 448 296.0000000000001 448H280.0000000000001C271.2000000000001 448 264.0000000000001 440.8 264.0000000000001 432V414.4C233.7000000000001 410.8 210.7000000000001 383.4 214.7000000000001 351.4C217.6000000000001 328.4 235.4000000000001 310.1 257.6 303.7zM533.9000000000001 119.9C522.7 130.6 505.4000000000001 129.9 493.6000000000001 119.9L406.4 46C395.7 36.9 382.4 32 368.6 32H256.9C248.6 32 241.8 39.2 241.8 48S248.6 64 256.9 64H330.8C345.9 64 359.8 74.9 362.2 90.6C365.3 110.6 350.7 128 332.3999999999999 128H181.3C155.8 128 131.1 118.7 111.4 101.7L67.5 64H15.1C6.8 64 0 56.8 0 48V-48C0 -56.8 6.8 -64 15.1 -64H352C365.7 -64 379 -59.1 389.8 -50L532.6 71C547 83.1 548.1 106.3 533.9 119.9z" />
-    <glyph glyph-name="hand-holding"
-      unicode="&#xF4BD;"
-      horiz-adv-x="576" d=" M565.3 119.9C553.5 130.6 535.0999999999999 129.9 522.6999999999999 119.9L430.3 46C419 36.9 404.9000000000001 32 390.3 32H272C263.2 32 256 39.2 256 48S263.2 64 272 64H350.3C366.2 64 381 74.9 383.6 90.6C386.9000000000001 110.6 371.5 128 352 128H192C165 128 138.9 118.7 117.9 101.7L71.4 64H16C7.2 64 0 56.8 0 48V-48C0 -56.8 7.2 -64 16 -64H372.8C387.3 -64 401.4000000000001 -59.1 412.8 -50L564 71C579.2 83.1 580.4 106.3 565.3 119.9z" />
-    <glyph glyph-name="hand-lizard"
-      unicode="&#xF258;"
-      horiz-adv-x="576" d=" M384 -32H576V84.222A95.998 95.998 0 0 1 561.167 135.485L398.127 393.632A48 48 0 0 1 357.544 416H24C10.745 416 0 405.255 0 392V376C0 345.072 25.072 320 56 320H285.981C298.825 320 307.537 306.933 302.596 295.077L281.186 243.692A32 32 0 0 0 251.648 224H128C92.654 224 64 195.346 64 160V152C64 138.745 74.745 128 88 128H235.406A47.995 47.995 0 0 0 261.098 120.545L372.846 49.734A24.001000000000005 24.001000000000005 0 0 0 384 29.461V-32z" />
-    <glyph glyph-name="hand-paper"
-      unicode="&#xF256;"
-      horiz-adv-x="448" d=" M408.781 319.993C386.356 320.4220000000001 368 301.64 368 279.2100000000001V192H360V368.21C360 390.64 341.644 409.4220000000001 319.219 408.993C297.488 408.577 280 390.831 280 369V192H272V407.21C272 429.64 253.644 448.4220000000001 231.219 447.993C209.488 447.577 192 429.831 192 408V192H184V367.21C184 389.64 165.644 408.4220000000001 143.219 407.993C121.488 407.577 104 389.831 104 368V132.0080000000001L72.352 175.5270000000001C59.359 193.393 34.343 197.3440000000001 16.475 184.35C-1.39 171.356 -5.34 146.34 7.653 128.473L133.254 -44.232A48 48 0 0 1 172.073 -64H369.663C391.937 -64 411.2850000000001 -48.676 416.387 -26.994L442.895 85.6659999999999A192.011 192.011 0 0 1 447.999 129.641V280C448 301.831 430.512 319.577 408.781 319.993z" />
-    <glyph glyph-name="hand-peace"
-      unicode="&#xF25B;"
-      horiz-adv-x="448" d=" M408 232C385.908 232 368 214.091 368 192H360V224C360 246.091 342.092 264 320 264S280 246.091 280 224V192H272V400C272 426.51 250.51 448 224 448S176 426.51 176 400V192H162.428L92.688 369.551C82.994 394.226 55.134 406.37 30.461 396.676C5.787 386.983 -6.356 359.123 3.337 334.449L78.102 144.107L47.012 119.235C31.631 106.929 27.497 85.257 37.271 68.1539999999999L101.271 -43.8460000000001A39.998 39.998 0 0 1 136 -64H376C394.562 -64 410.686 -51.23 414.937 -33.162L446.937 102.838A39.97 39.97 0 0 1 448 112V192C448 214.091 430.092 232 408 232z" />
-    <glyph glyph-name="hand-point-down"
-      unicode="&#xF0A7;"
-      horiz-adv-x="384" d=" M91.826 -19.2V130.034C83.578 124.193 75.268 119.464 66.908 115.881C35.098 102.248 -0.014 125.778 0 160C0.008 178.616 10.897 192.203 29.092 200C57.378 212.122 93.421 278.648 106.415 307.534C114.371 325.391 131.894 335.987 150.26 335.998L150.261 336H321.7870000000001C333.5990000000001 336 343.6840000000001 327.404 345.49 315.731C352.74 268.894 383.973 253.971 383.805 192C383.798 189.276 384 178.746 384 176C384 125.346 361.878 94.426 312.737 103.4C303.44 84.803 273.251 72.662 250.422 86.95C229.245 62.305 196.526 64.311 179.478 80.651V-19.2C179.478 -43.35 159.277 -64 135.652 -64C112.369 -64 91.826 -42.65 91.826 -19.2zM112 376V424C112 437.255 122.745 448 136 448H328C341.255 448 352 437.255 352 424V376C352 362.745 341.255 352 328 352H136C122.745 352 112 362.745 112 376zM324 400C324 411.046 315.046 420 304 420S284 411.046 284 400S292.954 380 304 380S324 388.954 324 400z" />
-    <glyph glyph-name="hand-point-left"
-      unicode="&#xF0A5;"
-      horiz-adv-x="512" d=" M44.8 292.174H194.034C188.193 300.4220000000001 183.464 308.732 179.881 317.092C166.248 348.902 189.778 384.014 224 384C242.616 383.992 256.203 373.103 264 354.908C276.122 326.622 342.648 290.579 371.534 277.5850000000001C389.391 269.629 399.987 252.106 399.998 233.74L400 233.739V62.213C400 50.401 391.404 40.316 379.731 38.51C332.894 31.26 317.971 0.027 256 0.195C253.276 0.202 242.746 0 240 0C189.346 0 158.426 22.122 167.4 71.263C148.803 80.5600000000001 136.662 110.749 150.95 133.578C126.305 154.7550000000001 128.311 187.4740000000001 144.651 204.5220000000001H44.8C20.65 204.5220000000001 0 224.7230000000001 0 248.3480000000001C0 271.6310000000001 21.35 292.1740000000001 44.8 292.1740000000001zM440 272H488C501.255 272 512 261.255 512 248V56C512 42.745 501.255 32 488 32H440C426.745 32 416 42.745 416 56V248C416 261.255 426.745 272 440 272zM464 60C475.046 60 484 68.954 484 80S475.046 100 464 100S444 91.046 444 80S452.954 60 464 60z" />
-    <glyph glyph-name="hand-point-right"
-      unicode="&#xF0A4;"
-      horiz-adv-x="512" d=" M512 248.348C512 224.723 491.35 204.522 467.2 204.522H367.349C383.689 187.4740000000001 385.695 154.756 361.05 133.578C375.338 110.749 363.197 80.561 344.6 71.263C353.574 22.122 322.654 0 272 0C269.254 0 258.724 0.203 256 0.195C194.029 0.027 179.106 31.26 132.269 38.51C120.596 40.317 112 50.401 112 62.214V233.739L112.002 233.74C112.013 252.106 122.609 269.629 140.466 277.5850000000001C169.352 290.579 235.879 326.623 248 354.908C255.797 373.102 269.384 383.992 288 384C322.222 384.014 345.752 348.902 332.1190000000001 317.092C328.536 308.733 323.807 300.422 317.966 292.174H467.2C490.65 292.174 512 271.631 512 248.348zM96 248V56C96 42.745 85.255 32 72 32H24C10.745 32 0 42.745 0 56V248C0 261.255 10.745 272 24 272H72C85.255 272 96 261.255 96 248zM68 80C68 91.046 59.046 100 48 100S28 91.046 28 80S36.954 60 48 60S68 68.954 68 80z" />
-    <glyph glyph-name="hand-point-up"
-      unicode="&#xF0A6;"
-      horiz-adv-x="384" d=" M135.652 448C159.277 448 179.478 427.35 179.478 403.2V303.349C196.526 319.689 229.244 321.695 250.422 297.05C273.251 311.338 303.439 299.197 312.737 280.6C361.878 289.574 384 258.654 384 208C384 205.254 383.7970000000001 194.724 383.805 192C383.973 130.029 352.74 115.106 345.49 68.269C343.683 56.596 333.599 48 321.786 48H150.261L150.26 48.002C131.894 48.013 114.371 58.609 106.415 76.466C93.421 105.352 57.377 171.878 29.092 184C10.897 191.797 0.008 205.384 0 224C-0.014 258.222 35.098 281.752 66.908 268.1190000000001C75.267 264.536 83.578 259.807 91.826 253.966V403.2C91.826 426.65 112.369 448 135.652 448zM136 32H328C341.255 32 352 21.255 352 8V-40C352 -53.255 341.255 -64 328 -64H136C122.745 -64 112 -53.255 112 -40V8C112 21.255 122.745 32 136 32zM304 4C292.954 4 284 -4.954 284 -16S292.954 -36 304 -36S324 -27.046 324 -16S315.046 4 304 4z" />
-    <glyph glyph-name="hand-pointer"
-      unicode="&#xF25A;"
-      horiz-adv-x="448" d=" M448 208V112C448 108.916 447.644 105.841 446.937 102.838L414.937 -33.162C410.686 -51.23 394.562 -64 376 -64H168A40.004 40.004 0 0 0 135.65 -47.527L7.653 128.473C-5.34 146.339 -1.39 171.356 16.475 184.349C34.342 197.343 59.359 193.392 72.352 175.526L104 132.008V408C104 430.091 121.908 448 144 448S184 430.091 184 408V208H192V248C192 270.091 209.908 288 232 288S272 270.091 272 248V208H280V232C280 254.091 297.908 272 320 272S360 254.091 360 232V208H368C368 230.091 385.908 248 408 248S448 230.091 448 208zM192 128H184V32H192V128zM280 128H272V32H280V128zM368 128H360V32H368V128z" />
-    <glyph glyph-name="hand-rock"
-      unicode="&#xF255;"
-      horiz-adv-x="512" d=" M512 319.2100000000001C512 345.5320000000001 491.139 367.554 464.82 367.993C437.935 368.442 416 346.783 416 320H408V351.21C408 377.532 387.139 399.554 360.82 399.993C333.935 400.442 312 378.783 312 352V320H304V367.21C304 393.532 283.139 415.554 256.82 415.993C229.935 416.442 208 394.783 208 368V320H200V351.21C200 377.532 179.139 399.554 152.82 399.993C125.935 400.442 104 378.783 104 352V216L96 223.111V271.2100000000001C96 297.5320000000001 75.139 319.554 48.82 319.993C21.935 320.442 0 298.783 0 272V205.555A95.998 95.998 0 0 1 32.221 133.804L143.889 34.543A47.999 47.999 0 0 0 160 -1.333V-8C160 -21.255 170.745 -32 184 -32H424C437.255 -32 448 -21.255 448 -8V-5.079A96.01 96.01 0 0 0 455.523 32.175L504.477 148.44A96.002 96.002 0 0 1 512 185.694V319.2100000000001z" />
-    <glyph glyph-name="hand-scissors"
-      unicode="&#xF257;"
-      horiz-adv-x="512" d=" M216 8C216 30.092 233.909 48 256 48V56H224C201.909 56 184 73.908 184 96S201.909 136 224 136H256V144H48C21.49 144 0 165.49 0 192S21.49 240 48 240H256V253.572L78.449 323.312C53.775 333.006 41.631 360.867 51.324 385.54C61.017 410.214 88.878 422.357 113.552 412.664L303.894 337.899L328.766 368.9890000000001C341.072 384.37 362.7440000000001 388.504 379.8470000000001 378.73L491.847 314.73A40.002 40.002 0 0 0 512 280V40C512 21.438 499.23 5.314 481.162 1.063L345.162 -30.937A39.982 39.982 0 0 0 336 -32H256C233.909 -32 216 -14.092 216 8z" />
-    <glyph glyph-name="hand-spock"
-      unicode="&#xF259;"
-      horiz-adv-x="512" d=" M10.872 131.415C26.011 147.501 51.326 148.269 67.415 133.1280000000001L128 76.107V155.5120000000001L88.995 327.135C84.099 348.677 97.593 370.1090000000001 119.135 375.005C140.684 379.899 162.11 366.406 167.005 344.8640000000001L201.747 192H211.58L164.016 399.034C159.07 420.565 172.514 442.028 194.044 446.974C215.576 451.924 237.038 438.476 241.984 416.9460000000001L293.664 192H308.769L357.194 385.702C362.5510000000001 407.134 384.269 420.164 405.701 414.806C427.1330000000001 409.448 440.1640000000001 387.731 434.805 366.299L391.231 192H402.311L433.079 321.265C438.196 342.756 459.764 356.033 481.256 350.912C502.747 345.795 516.021 324.226 510.903 302.735L474.611 150.268A96.02400000000002 96.02400000000002 0 0 1 472 128.033V85.931A96.002 96.002 0 0 0 468.04 58.6440000000001L441.8660000000001 -29.6429999999999C435.825 -50.022 417.101 -64 395.846 -64H179.172A48.00200000000001 48.00200000000001 0 0 0 146.274 -50.954L12.585 74.872C-3.502 90.013 -4.268 115.328 10.872 131.415z" />
-    <glyph glyph-name="hands-helping"
-      unicode="&#xF4C4;"
-      horiz-adv-x="640" d=" M488 256H336V200C336 160.3 303.7 128 264 128S192 160.3 192 200V321.6L127.1 282.6C107.8 271.1 96 250.2 96 227.8V180.5L16 134.3C0.7 125.5 -4.6 105.9 4.3 90.6L84.3 -48C93.1 -63.3 112.7 -68.5 128 -59.7L231.4 0H368C403.3 0 432 28.7 432 64H448C465.7 64 480 78.3 480 96V160H488C501.3 160 512 170.7 512 184V232C512 245.3 501.3 256 488 256zM635.7 293.4L555.7 432C546.9 447.3 527.3 452.5 512 443.7L408.6 384H306.4C294.4 384 282.7 380.6 272.5 374.3L239 353.4C229.6 347.6 224 337.3 224 326.3V200C224 177.9 241.9 160 264 160S304 177.9 304 200V288H488C518.9 288 544 262.9 544 232V203.5L624 249.7C639.3 258.6 644.5 278.1 635.7 293.4z" />
-    <glyph glyph-name="hands"
-      unicode="&#xF4C2;"
-      horiz-adv-x="640" d=" M204.8 217.6C194.2 231.7 174.1 234.6 160 224C145.9 213.4 143 193.3 153.6 179.2L191.7 128.4C196.5 122 195.8 113.1 190.2 107.5L177.4 94.7C170.7 88 159.8 88.5 153.8 95.8L64 203.6V352C64 369.7 49.7 384 32 384S0 369.7 0 352V133.6C0 122.7000000000001 3.7 112.1 10.5 103.6L114.6 -30.7C119.6 -37.2 123 -44.6 125 -52.4C126.8 -59.2999999999999 133.1 -64 140.3 -64H272C280.8 -64 288 -56.8 288 -48V64C288 91.7 279 118.6 262.4 140.8L204.8 217.6zM608 384C590.3 384 576 369.7 576 352V203.6L486.2 95.8C480.2 88.6 469.2 88.1 462.6 94.7L449.8 107.5C444.2 113.1 443.5 122 448.3 128.4L486.4 179.2C497 193.3 494.1 213.4 480 224C465.9 234.6 445.8 231.7 435.2 217.6L377.6 140.8C361 118.6 352 91.7 352 64V-48C352 -56.8 359.2 -64 368 -64H499.7C506.8 -64 513.2 -59.3 515 -52.4C517 -44.6 520.4 -37.2 525.4 -30.7L629.5 103.6C636.3 112.1 640 122.7000000000001 640 133.6V352C640 369.7 625.7 384 608 384z" />
-    <glyph glyph-name="handshake"
-      unicode="&#xF2B5;"
-      horiz-adv-x="640" d=" M434.7 384H348.8C340.8 384 333.1 381 327.2 375.6L228.8999999999999 285.6C228.8 285.5 228.7 285.3 228.5999999999999 285.2C211.9999999999999 269.6 212.2999999999999 244.7 226.4999999999999 229.2C239.1999999999999 215.3 265.8999999999999 211.6 282.5999999999999 226.5C282.7 226.6 282.8999999999999 226.6 282.9999999999999 226.7L362.8999999999999 299.9C369.3999999999999 305.8 379.5999999999999 305.4 385.4999999999999 298.9C391.4999999999999 292.4 390.9999999999999 282.3 384.4999999999999 276.3L358.3999999999999 252.4L504 134.2C506.9 131.8 509.5 129.2 511.9 126.5V320L457.3 374.6C451.4 380.6 443.2 384 434.7 384zM544 319.8V95.9C544 78.2 558.3 63.9 576 63.9H640V319.8H544zM592 95.9C583.2 95.9 576 103.1 576 111.9S583.2 127.9 592 127.9S608 120.7 608 111.9S600.8 95.9 592 95.9zM0 64H64C81.7 64 96 78.3 96 96V319.8H0V64zM48 127.9C56.8 127.9 64 120.7 64 111.9S56.8 95.9 48 95.9S32 103.1 32 111.9C32 120.8 39.2 127.9 48 127.9zM483.9 109.3L334.6 230.5L304.6 203C274.9000000000001 175.9 229.4000000000001 178.5 202.9 207.4C176 236.8 178.1 282.3 207.3000000000001 309.1L289.1 384H205.3C196.8 384 188.7 380.6 182.7 374.6L128 320V96.1H146.3L236.8 14.2C264.2 -8.1 304.5 -3.9 326.8 23.5000000000001L327 23.7L344.9 8.2C360.8 -4.8 384.3 -2.3 397.2 13.6L428.6 52.2L434 47.8000000000001C447.7 36.7 467.8999999999999 38.7 478.9999999999999 52.5000000000001L488.4999999999999 64.2000000000001C499.6999999999999 78.0000000000001 497.6 98.1 483.8999999999999 109.3000000000001z" />
-    <glyph glyph-name="hashtag"
-      unicode="&#xF292;"
-      horiz-adv-x="448" d=" M440.667 265.891L447.81 305.891C449.123 313.246 443.468 320 435.997 320H361.187L375.81 401.891C377.123 409.246 371.468 416 363.997 416H323.365A12 12 0 0 1 311.552 406.109L296.175 320H197.54L212.163 401.891C213.477 409.246 207.822 416 200.35 416H159.718A12 12 0 0 1 147.905 406.109L132.528 320H53.432A12 12 0 0 1 41.619 310.1090000000001L34.476 270.1090000000001C33.163 262.754 38.818 256 46.289 256H121.099L98.242 128H19.146A12 12 0 0 1 7.333 118.109L0.19 78.109C-1.123 70.754 4.532 64 12.003 64H86.813L72.19 -17.891C70.877 -25.246 76.532 -32 84.003 -32H124.635A12 12 0 0 1 136.448 -22.109L151.826 64H250.46L235.837 -17.891C234.523 -25.246 240.178 -32 247.65 -32H288.282A12 12 0 0 1 300.095 -22.109L315.472 64H394.568A12 12 0 0 1 406.381 73.891L413.524 113.891C414.837 121.2460000000001 409.182 128 401.711 128H326.901L349.7579999999999 256H428.854A12 12 0 0 1 440.6669999999999 265.891zM261.889 128H163.255L186.112 256H284.746L261.889 128z" />
-    <glyph glyph-name="hdd"
-      unicode="&#xF0A0;"
-      horiz-adv-x="576" d=" M576 144V48C576 21.49 554.51 0 528 0H48C21.49 0 0 21.49 0 48V144C0 170.51 21.49 192 48 192H528C554.51 192 576 170.51 576 144zM528 224A79.557 79.557 0 0 0 558.777 217.835L462.25 362.626A48.003 48.003 0 0 1 422.311 384H153.689A48 48 0 0 1 113.751 362.626L17.223 217.835A79.557 79.557 0 0 0 48 224H528zM480 128C462.327 128 448 113.673 448 96S462.327 64 480 64S512 78.327 512 96S497.673 128 480 128zM384 128C366.327 128 352 113.673 352 96S366.327 64 384 64S416 78.327 416 96S401.673 128 384 128z" />
-    <glyph glyph-name="heading"
-      unicode="&#xF1DC;"
-      horiz-adv-x="512" d=" M496 368V400C496 408.837 488.837 416 480 416H320C311.163 416 304 408.837 304 400V368C304 359.163 311.163 352 320 352H357.621V224H154.379V352H192C200.837 352 208 359.163 208 368V400C208 408.837 200.837 416 192 416H32C23.163 416 16 408.837 16 400V368C16 359.163 23.163 352 32 352H69.275V32H32C23.163 32 16 24.837 16 16V-16C16 -24.837 23.163 -32 32 -32H192C200.837 -32 208 -24.837 208 -16V16C208 24.837 200.837 32 192 32H154.379V160H357.62V32H320C311.163 32 304 24.837 304 16V-16C304 -24.837 311.163 -32 320 -32H480C488.837 -32 496 -24.837 496 -16V16C496 24.837 488.837 32 480 32H442.725V352H480C488.837 352 496 359.163 496 368z" />
-    <glyph glyph-name="headphones-alt"
-      unicode="&#xF58F;"
-      horiz-adv-x="512" d=" M160 160H144C108.65 160 80 131.3 80 95.88V32.12C80 -3.29 108.65 -32 144 -32H160C177.67 -32 192 -17.64 192 0.06V127.94C192 145.65 177.67 160 160 160zM368 160H352C334.33 160 320 145.65 320 127.94V0.06C320 -17.64 334.33 -32 352 -32H368C403.35 -32 432 -3.29 432 32.12V95.88C432 131.29 403.35 160 368 160zM256 416C112.91 416 4.57 296.87 0 160V48C0 39.16 7.16 32 16 32H32C40.84 32 48 39.16 48 48V160C48 274.67 141.33 367.8 256 367.82C370.67 367.8 464 274.67 464 160V48C464 39.16 471.16 32 480 32H496C504.84 32 512 39.16 512 48V160C507.43 296.87 399.09 416 256 416z" />
-    <glyph glyph-name="headphones"
-      unicode="&#xF025;"
-      horiz-adv-x="512" d=" M256 416C114.52 416 0 301.504 0 160V112A32 32 0 0 1 17.689 83.378L32.072 76.187C34.083 16.097 83.421 -32 144 -32H168C181.255 -32 192 -21.255 192 -8V168C192 181.255 181.255 192 168 192H144C112.658 192 84.329 179.121 64 158.373V160C64 265.8690000000001 150.131 352 256 352S448 265.8690000000001 448 160V158.373C427.671 179.121 399.342 192 368 192H344C330.745 192 320 181.255 320 168V-8C320 -21.255 330.745 -32 344 -32H368C428.579 -32 477.917 16.098 479.928 76.187L494.31 83.378A32 32 0 0 1 512 112V160C512 301.4790000000001 397.504 416 256 416z" />
-    <glyph glyph-name="headset"
-      unicode="&#xF590;"
-      horiz-adv-x="512" d=" M192 240C192 257.67 177.67 272 160 272H144C108.65 272 80 243.35 80 208V160C80 124.65 108.65 96 144 96H160C177.67 96 192 110.33 192 128V240zM368 96C403.35 96 432 124.65 432 160V208C432 243.35 403.35 272 368 272H352C334.33 272 320 257.67 320 240V128C320 110.33 334.33 96 352 96H368zM256 448C113.18 448 4.58 329.17 0 192V176C0 167.16 7.16 160 16 160H32C40.84 160 48 167.16 48 176V192C48 306.69 141.31 400 256 400S464 306.69 464 192H463.88C463.96 189.57 464 26.28 464 26.28C464 2.93 445.07 -16 421.7200000000001 -16H320C320 10.51 298.51 32 272 32H240C213.49 32 192 10.51 192 -16S213.49 -64 240 -64H421.7200000000001C471.58 -64 512 -23.58 512 26.28V192C507.42 329.17 398.82 448 256 448z" />
-    <glyph glyph-name="heart"
-      unicode="&#xF004;"
-      horiz-adv-x="512" d=" M462.3 385.4C407.5 432.1 326 423.7 275.7 371.8L256 351.5L236.3 371.8C186.1 423.7 104.5 432.1 49.7 385.4C-13.1 331.8 -16.4 235.6 39.8 177.5L233.3 -22.3C245.8 -35.2 266.1 -35.2 278.6 -22.3L472.1 177.5C528.4 235.6 525.1 331.8 462.3 385.4z" />
-    <glyph glyph-name="heartbeat"
-      unicode="&#xF21E;"
-      horiz-adv-x="512" d=" M320.2 204.2L270.5 104.8C264.5 92.6999999999999 247.1 93.1 241.6 105.4L184.7 231.7L154.7 160H60.6L243.1 -26.5C250.2 -33.8 261.7 -33.8 268.8 -26.5L451.4 160H342.3L320.2 204.2zM473.7 374.1L471.3 376.6C419.8 429.2 335.5 429.2 283.9 376.6L256 348L228.1 376.5C176.6 429.2 92.2 429.2 40.7 376.5L38.3 374.1C-10.4 324.3 -12.5 245 31 192H133.4L169.3 278.2C174.7 291.1 192.9 291.4 198.7 278.6L256.9000000000001 149.3L305.9000000000001 247.2C311.8 259 328.6 259 334.5000000000001 247.2L362.1000000000001 192H481C524.5 245 522.4 324.3 473.7 374.0999999999999z" />
-    <glyph glyph-name="helicopter"
-      unicode="&#xF533;"
-      horiz-adv-x="640" d=" M304 64H576C593.67 64 608 78.33 608 96C608 219.71 507.71 320 384 320V384H560C568.84 384 576 391.16 576 400V432C576 440.84 568.84 448 560 448H144C135.16 448 128 440.84 128 432V400C128 391.16 135.16 384 144 384H320V320H112L68.8 377.6C65.78 381.63 61.03 384 56 384H16.01C5.6 384 -2.04 374.2200000000001 0.49 364.12L32 256L192 192L278.4 76.8A31.991999999999997 31.991999999999997 0 0 1 304 64zM416 252.49C478.55 239.7 528.03 190.56 540.79 128H416V252.49zM635.37 -10.81L613.22 11.39C606.97 17.65 596.98 17.49 590.58 11.38C583.49 4.61 576.74 0.13 565.94 0.13H240C231.16 0.13 224 -7.05 224 -15.9V-47.96C224 -56.81 231.16 -63.99 240 -63.99H565.94C580.82 -63.99 601.24 -63.52 634.3900000000001 -34.47C641.4100000000001 -28.33 641.9600000000002 -17.42 635.3700000000001 -10.81z" />
-    <glyph glyph-name="highlighter"
-      unicode="&#xF591;"
-      horiz-adv-x="544" d=" M0 -31.98L99.92 -64L135.37 -28.55L68.33 38.49L0 -31.98zM124.61 208.03A36.592 36.592 0 0 1 113.82 169.93L126.87 127.1L75.94 76.16L172.17 -20.07L223.03 30.79L265.7700000000001 17.71C279.5000000000001 13.51 294.42 17.72 303.92 28.49L339.4700000000001 70.1299999999999L166.13 243.47L124.61 208.03zM527.92 368.73L464.72 431.93C444.23 452.42 411.34 453.45 389.6 434.28L190.55 264.32L360.3200000000001 94.54L530.27 293.6C549.4499999999999 315.3400000000001 548.42 348.23 527.92 368.73z" />
-    <glyph glyph-name="history"
-      unicode="&#xF1DA;"
-      horiz-adv-x="512" d=" M504 192.469C504.253 55.829 392.82 -55.903 256.18 -55.999C197.165 -56.041 142.957 -35.469 100.358 -1.088C89.281 7.852 88.453 24.453 98.519 34.519L109.786 45.786C118.395 54.395 132.139 55.337 141.677 47.77C173.062 22.865 212.781 8 256 8C357.705 8 440 90.311 440 192C440 293.705 357.689 376 256 376C207.186 376 162.851 357.031 129.932 326.068L180.686 275.314C190.766 265.234 183.627 248 169.373 248H24C15.163 248 8 255.163 8 264V409.373C8 423.627 25.234 430.766 35.314 420.687L84.686 371.315C129.209 413.864 189.552 440 256 440C392.81 440 503.747 329.2200000000001 504 192.469zM323.088 113.685L332.911 126.315C341.0489999999999 136.778 339.164 151.857 328.701 159.994L288 191.651V296C288 309.255 277.255 320 264 320H248C234.745 320 224 309.255 224 296V160.349L289.409 109.475C299.872 101.338 314.95 103.222 323.088 113.685z" />
-    <glyph glyph-name="hockey-puck"
-      unicode="&#xF453;"
-      horiz-adv-x="512" d=" M0 288C0 341 114.6 384 256 384S512 341 512 288S397.4 192 256 192S0 235 0 288zM0 205.8V96C0 43 114.6 0 256 0S512 43 512 96V205.8C398.6 123.5 113.5 123.4 0 205.8z" />
-    <glyph glyph-name="home"
-      unicode="&#xF015;"
-      horiz-adv-x="576" d=" M488 135.3V-8C488 -21.3 477.3 -32 464 -32H348C341.4 -32 336 -26.6 336 -20V92C336 98.6 330.6 104 324 104H252C245.4 104 240 98.6 240 92V-20C240 -26.6 234.6 -32 228 -32H112C98.7 -32 88 -21.3 88 -8V135.3C88 138.9 89.6 142.3 92.4 144.6L280.4 299.4000000000001C284.8 303 291.2 303 295.7 299.4000000000001L483.7 144.6C486.4 142.3 488 138.9 488 135.3zM571.6 196.2L488 265.1V403.6C488 410.2 482.6 415.6 476 415.6H420C413.4 415.6 408 410.2 408 403.6V331L318.5 404.7C300.8 419.3 275.2 419.3 257.5 404.7L4.4 196.2C-0.7 192 -1.4 184.4 2.8 179.3L28.3 148.3C32.5 143.2 40.1 142.5 45.2 146.7L280.4 340.4C284.8 344 291.2 344 295.7 340.4L530.9 146.7C536 142.5 543.6 143.2 547.8 148.3L573.3 179.3C577.5 184.5 576.6999999999999 192 571.5999999999999 196.2z" />
-    <glyph glyph-name="hospital-alt"
-      unicode="&#xF47D;"
-      horiz-adv-x="576" d=" M544 352H416V416C416 433.7 401.7 448 384 448H192C174.3 448 160 433.7 160 416V352H32C14.3 352 0 337.7 0 320V-48C0 -56.8 7.2 -64 16 -64H560C568.8 -64 576 -56.8 576 -48V320C576 337.7 561.7 352 544 352zM160 12C160 5.4 154.6 0 148 0H108C101.4 0 96 5.4 96 12V52C96 58.6 101.4 64 108 64H148C154.6 64 160 58.6 160 52V12zM160 140C160 133.4 154.6 128 148 128H108C101.4 128 96 133.4 96 140V180C96 186.6 101.4 192 108 192H148C154.6 192 160 186.6 160 180V140zM320 12C320 5.4 314.6 0 308 0H268C261.4 0 256 5.4 256 12V52C256 58.6 261.4 64 268 64H308C314.6 64 320 58.6 320 52V12zM320 140C320 133.4 314.6 128 308 128H268C261.4 128 256 133.4 256 140V180C256 186.6 261.4 192 268 192H308C314.6 192 320 186.6 320 180V140zM336 310C336 306.7 333.3 304 330 304H304V278C304 274.7 301.3 272 298 272H278C274.7 272 272 274.7 272 278V304H246C242.7 304 240 306.7 240 310V330C240 333.3 242.7 336 246 336H272V362C272 365.3 274.7 368 278 368H298C301.3 368 304 365.3 304 362V336H330C333.3 336 336 333.3 336 330V310zM480 12C480 5.4 474.6 0 468 0H428C421.4 0 416 5.4 416 12V52C416 58.6 421.4 64 428 64H468C474.6 64 480 58.6 480 52V12zM480 140C480 133.4 474.6 128 468 128H428C421.4 128 416 133.4 416 140V180C416 186.6 421.4 192 428 192H468C474.6 192 480 186.6 480 180V140z" />
-    <glyph glyph-name="hospital-symbol"
-      unicode="&#xF47E;"
-      horiz-adv-x="512" d=" M256 448C114.6 448 0 333.4 0 192S114.6 -64 256 -64S512 50.6 512 192S397.4 448 256 448zM368 72C368 67.6 364.4 64 360 64H312C307.6 64 304 67.6 304 72V160H208V72C208 67.6 204.4 64 200 64H152C147.6 64 144 67.6 144 72V312C144 316.4 147.6 320 152 320H200C204.4 320 208 316.4 208 312V224H304V312C304 316.4 307.6 320 312 320H360C364.4 320 368 316.4 368 312V72z" />
-    <glyph glyph-name="hospital"
-      unicode="&#xF0F8;"
-      horiz-adv-x="448" d=" M448 -44V-64H0V-44C0 -37.373 5.373 -32 12 -32H32V328C32 341.255 42.745 352 56 352H144V424C144 437.255 154.745 448 168 448H280C293.255 448 304 437.255 304 424V352H392C405.255 352 416 341.255 416 328V-32H436C442.627 -32 448 -37.373 448 -44zM308 256H268C261.373 256 256 250.627 256 244V204C256 197.373 261.373 192 268 192H308C314.627 192 320 197.373 320 204V244C320 250.627 314.627 256 308 256zM140 192H180C186.627 192 192 197.373 192 204V244C192 250.627 186.627 256 180 256H140C133.373 256 128 250.627 128 244V204C128 197.373 133.373 192 140 192zM244 64H204C197.373 64 192 58.627 192 52V-32H256V52C256 58.627 250.627 64 244 64zM308 160H268C261.373 160 256 154.627 256 148V108C256 101.373 261.373 96 268 96H308C314.627 96 320 101.373 320 108V148C320 154.627 314.627 160 308 160zM192 148C192 154.627 186.627 160 180 160H140C133.373 160 128 154.627 128 148V108C128 101.373 133.373 96 140 96H180C186.627 96 192 101.373 192 108V148zM182 352H208V326A6 6 0 0 1 214 320H234A6 6 0 0 1 240 326V352H266A6 6 0 0 1 272 358V378A6 6 0 0 1 266 384H240V410A6 6 0 0 1 234 416H214A6 6 0 0 1 208 410V384H182A6 6 0 0 1 176 378V358A6 6 0 0 1 182 352z" />
-    <glyph glyph-name="hot-tub"
-      unicode="&#xF593;"
-      horiz-adv-x="512" d=" M414.21 270.35C415.23 262.14 421.96 256 429.96 256H446.08C455.59 256 463.16 264.57 462.08 274.35C457.74 313.46 439.68 348.88 411.95 371.51C394.58 385.68 383.13 408.26 379.97 433.66C378.96 441.86 372.2200000000001 448 364.23 448H348.11C338.6 448 331.0200000000001 439.43 332.11 429.65C336.45 390.54 354.51 355.12 382.24 332.49C399.6 318.3200000000001 411.06 295.74 414.2100000000001 270.35zM306.21 270.35C307.23 262.14 313.96 256 321.96 256H338.08C347.59 256 355.16 264.57 354.08 274.35C349.74 313.46 331.68 348.88 303.95 371.51C286.58 385.68 275.13 408.26 271.97 433.66C270.96 441.86 264.2200000000001 448 256.23 448H240.11C230.6 448 223.02 439.43 224.11 429.65C228.45 390.54 246.51 355.12 274.24 332.49C291.6 318.3200000000001 303.06 295.74 306.2100000000001 270.35zM480 192H256L145.07 275.2A63.99 63.99 0 0 1 106.67 288H64C28.65 288 0 259.35 0 224V0C0 -35.35 28.65 -64 64 -64H448C483.35 -64 512 -35.35 512 0V160C512 177.67 497.67 192 480 192zM128 8C128 3.58 124.42 0 120 0H104C99.58 0 96 3.58 96 8V120C96 124.42 99.58 128 104 128H120C124.42 128 128 124.42 128 120V8zM224 8C224 3.58 220.42 0 216 0H200C195.58 0 192 3.58 192 8V120C192 124.42 195.58 128 200 128H216C220.42 128 224 124.42 224 120V8zM320 8C320 3.58 316.42 0 312 0H296C291.58 0 288 3.58 288 8V120C288 124.42 291.58 128 296 128H312C316.42 128 320 124.42 320 120V8zM416 8C416 3.58 412.42 0 408 0H392C387.58 0 384 3.58 384 8V120C384 124.42 387.58 128 392 128H408C412.42 128 416 124.42 416 120V8zM64 320C99.35 320 128 348.65 128 384S99.35 448 64 448S0 419.35 0 384S28.65 320 64 320z" />
-    <glyph glyph-name="hotel"
-      unicode="&#xF594;"
-      horiz-adv-x="576" d=" M560 384C568.84 384 576 391.16 576 400V432C576 440.84 568.84 448 560 448H16C7.16 448 0 440.84 0 432V400C0 391.16 7.16 384 16 384H31.98V0H16C7.16 0 0 -7.16 0 -16V-48C0 -56.84 7.16 -64 16 -64H256V16C256 24.8 263.2 32 272 32H304C312.8 32 320 24.8 320 16V-64H560C568.84 -64 576 -56.84 576 -48V-16C576 -7.16 568.84 0 560 0H544V384H560zM256 339.2C256 345.6 262.4 352 268.8 352H307.2C313.6 352 320 345.6 320 339.2V300.8C320 294.4 313.6 288 307.2 288H268.8C262.4000000000001 288 256 294.4 256 300.8V339.2000000000001zM256 243.2C256 249.6 262.4 256 268.8 256H307.2C313.6 256 320 249.6 320 243.2V204.8C320 198.4 313.6 192 307.2 192H268.8C262.4000000000001 192 256 198.4 256 204.8V243.2zM128 339.2C128 345.6 134.4 352 140.8 352H179.2C185.6 352 192 345.6 192 339.2V300.8C192 294.4 185.6 288 179.2 288H140.8C134.4 288 128 294.4 128 300.8V339.2zM179.2 192H140.8C134.4 192 128 198.4 128 204.8V243.2C128 249.6 134.4 256 140.8 256H179.2C185.6 256 192 249.6 192 243.2V204.8C192 198.4 185.6 192 179.2 192zM192 64C192 117.02 234.98 160 288 160S384 117.02 384 64H192zM448 204.8C448 198.4 441.6 192 435.2 192H396.8C390.4000000000001 192 384 198.4 384 204.8V243.2C384 249.6 390.4 256 396.8 256H435.2C441.6 256 448 249.6 448 243.2V204.8zM448 300.8C448 294.4 441.6 288 435.2 288H396.8C390.4000000000001 288 384 294.4 384 300.8V339.2000000000001C384 345.6 390.4 352 396.8 352H435.2C441.6 352 448 345.6 448 339.2000000000001V300.8z" />
-    <glyph glyph-name="hourglass-end"
-      unicode="&#xF253;"
-      horiz-adv-x="384" d=" M360 384C373.255 384 384 394.745 384 408V424C384 437.255 373.255 448 360 448H24C10.745 448 0 437.255 0 424V408C0 394.745 10.745 384 24 384C24 293.035 75.016 216.266 144.842 192C75.016 167.734 24 90.965 24 0C10.745 0 0 -10.745 0 -24V-40C0 -53.255 10.745 -64 24 -64H360C373.255 -64 384 -53.255 384 -40V-24C384 -10.745 373.255 0 360 0C360 90.965 308.984 167.734 239.158 192C308.984 216.266 360 293.035 360 384zM192 240C134.213 240 88 306.5180000000001 88 384H296C296 306.055 249.49 240 192 240z" />
-    <glyph glyph-name="hourglass-half"
-      unicode="&#xF252;"
-      horiz-adv-x="384" d=" M360 448H24C10.745 448 0 437.255 0 424V408C0 394.745 10.745 384 24 384C24 293.035 75.016 216.266 144.842 192C75.016 167.734 24 90.965 24 0C10.745 0 0 -10.745 0 -24V-40C0 -53.255 10.745 -64 24 -64H360C373.255 -64 384 -53.255 384 -40V-24C384 -10.745 373.255 0 360 0C360 90.965 308.984 167.734 239.158 192C308.984 216.266 360 293.035 360 384C373.255 384 384 394.745 384 408V424C384 437.255 373.255 448 360 448zM284.9220000000001 64H99.08C116.139 110.797 151.176 144 192 144C232.821 144 267.862 110.804 284.9220000000001 64zM284.9410000000001 320H99.078C91.988 339.452 88 361.252 88 384H296C296 361.195 292.013 339.413 284.941 320z" />
-    <glyph glyph-name="hourglass-start"
-      unicode="&#xF251;"
-      horiz-adv-x="384" d=" M360 448H24C10.745 448 0 437.255 0 424V408C0 394.745 10.745 384 24 384C24 293.035 75.016 216.266 144.842 192C75.016 167.734 24 90.965 24 0C10.745 0 0 -10.745 0 -24V-40C0 -53.255 10.745 -64 24 -64H360C373.255 -64 384 -53.255 384 -40V-24C384 -10.745 373.255 0 360 0C360 90.965 308.984 167.734 239.158 192C308.984 216.266 360 293.035 360 384C373.255 384 384 394.745 384 408V424C384 437.255 373.255 448 360 448zM296 0H88C88 77.458 134.204 144 192 144C249.786 144 296 77.483 296 0z" />
-    <glyph glyph-name="hourglass"
-      unicode="&#xF254;"
-      horiz-adv-x="384" d=" M360 384C373.255 384 384 394.745 384 408V424C384 437.255 373.255 448 360 448H24C10.745 448 0 437.255 0 424V408C0 394.745 10.745 384 24 384C24 293.035 75.016 216.266 144.842 192C75.016 167.734 24 90.965 24 0C10.745 0 0 -10.745 0 -24V-40C0 -53.255 10.745 -64 24 -64H360C373.255 -64 384 -53.255 384 -40V-24C384 -10.745 373.255 0 360 0C360 90.965 308.984 167.734 239.158 192C308.984 216.266 360 293.035 360 384z" />
-    <glyph glyph-name="i-cursor"
-      unicode="&#xF246;"
-      horiz-adv-x="256" d=" M256 395.952V435.935C256 442.504 250.726 447.852 244.158 447.9340000000001C211.621 448.344 166.469 447.989 128 410.041C90.266 447.264 46.979 448.114 11.913 447.886C5.318 447.843 0 442.481 0 435.886V396.241C0 389.554 5.458 384.163 12.145 384.243C38.111 384.553 96 380.757 96 335.818V224H60C53.373 224 48 218.627 48 212V172C48 165.373 53.373 160 60 160H96V48C96 3.068 39.925 -0.031 12.05 0.041C5.404 0.058 0 -5.306 0 -11.952V-51.935C0 -58.504 5.274 -63.852 11.842 -63.934C44.379 -64.3430000000001 89.531 -63.988 128 -26.04C165.734 -63.263 209.021 -64.1130000000001 244.087 -63.885C250.682 -63.842 256 -58.48 256 -51.885V-12.24C256 -5.553 250.542 -0.162 243.855 -0.242C217.889 -0.553 160 3.061 160 48V160H196C202.627 160 208 165.373 208 172V212C208 218.627 202.627 224 196 224H160V335.818C160 380.75 216.075 384.031 243.95 383.9600000000001C250.596 383.942 256 389.3060000000001 256 395.952z" />
-    <glyph glyph-name="id-badge"
-      unicode="&#xF2C1;"
-      horiz-adv-x="384" d=" M336 448H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V400C384 426.5 362.5 448 336 448zM144 416H240C248.8 416 256 408.8 256 400S248.8 384 240 384H144C135.2 384 128 391.2 128 400S135.2 416 144 416zM192 288C227.3 288 256 259.3 256 224S227.3 160 192 160S128 188.7 128 224S156.7 288 192 288zM304 51.2C304 40.6 294 32 281.6 32H102.4C90 32 80 40.6 80 51.2V70.4C80 102.2 110.1 128 147.2 128H152.2C164.5 122.9 177.9 120 192 120S219.6 122.9 231.8 128H236.8C273.9000000000001 128 304 102.2 304 70.4V51.2z" />
-    <glyph glyph-name="id-card-alt"
-      unicode="&#xF47F;"
-      horiz-adv-x="576" d=" M528 384H384V288H192V384H48C21.5 384 0 362.5 0 336V-16C0 -42.5 21.5 -64 48 -64H528C554.5 -64 576 -42.5 576 -16V336C576 362.5 554.5 384 528 384zM288 224C323.3 224 352 195.3 352 160S323.3 96 288 96S224 124.7 224 160S252.7 224 288 224zM381.3 0H194.7C184.3 0 175.9 10 179.1 19.8C187.4 45.4 211.5 64 240 64H248.2C260.5 58.9 273.9 56 288 56S315.6 58.9 327.8 64H336C364.4 64 388.5 45.5 396.9 19.8C400.1 10 391.7 0 381.3 0zM352 416C352 433.7 337.7 448 320 448H256C238.3 448 224 433.7 224 416V320H352V416z" />
-    <glyph glyph-name="id-card"
-      unicode="&#xF2C2;"
-      horiz-adv-x="576" d=" M528 416H48C21.5 416 0 394.5 0 368V352H576V368C576 394.5 554.5 416 528 416zM0 16C0 -10.5 21.5 -32 48 -32H528C554.5 -32 576 -10.5 576 16V320H0V16zM352 248C352 252.4 355.6 256 360 256H504C508.4 256 512 252.4 512 248V232C512 227.6 508.4 224 504 224H360C355.6 224 352 227.6 352 232V248zM352 184C352 188.4 355.6 192 360 192H504C508.4 192 512 188.4 512 184V168C512 163.6 508.4 160 504 160H360C355.6 160 352 163.6 352 168V184zM352 120C352 124.4 355.6 128 360 128H504C508.4 128 512 124.4 512 120V104C512 99.6 508.4 96 504 96H360C355.6 96 352 99.6 352 104V120zM176 256C211.3 256 240 227.3 240 192S211.3 128 176 128S112 156.7 112 192S140.7 256 176 256zM67.1 51.8C75.5 77.5 99.6 96 128 96H136.2C148.5 90.9 161.9 88 176 88S203.6 90.9 215.8 96H224C252.4 96 276.5 77.5 284.9 51.8C288.1 41.9 279.7 32 269.3 32H82.7C72.3 32 63.9 42 67.1 51.8z" />
-    <glyph glyph-name="image"
-      unicode="&#xF03E;"
-      horiz-adv-x="512" d=" M464 0H48C21.49 0 0 21.49 0 48V336C0 362.51 21.49 384 48 384H464C490.51 384 512 362.51 512 336V48C512 21.49 490.51 0 464 0zM112 328C81.072 328 56 302.928 56 272S81.072 216 112 216S168 241.072 168 272S142.928 328 112 328zM64 64H448V176L360.485 263.515C355.7990000000001 268.201 348.201 268.201 343.514 263.515L208 128L152.485 183.515C147.799 188.201 140.201 188.201 135.514 183.515L64 112V64z" />
-    <glyph glyph-name="images"
-      unicode="&#xF302;"
-      horiz-adv-x="576" d=" M480 32V16C480 -10.51 458.51 -32 432 -32H48C21.49 -32 0 -10.51 0 16V272C0 298.51 21.49 320 48 320H64V112C64 67.888 99.888 32 144 32H480zM576 112V368C576 394.51 554.51 416 528 416H144C117.49 416 96 394.51 96 368V112C96 85.49 117.49 64 144 64H528C554.51 64 576 85.49 576 112zM256 320C256 293.49 234.51 272 208 272S160 293.49 160 320S181.49 368 208 368S256 346.51 256 320zM160 176L215.515 231.515C220.201 236.201 227.799 236.201 232.486 231.515L272 192L407.515 327.515C412.201 332.201 419.799 332.201 424.486 327.515L512 240V128H160V176z" />
-    <glyph glyph-name="inbox"
-      unicode="&#xF01C;"
-      horiz-adv-x="576" d=" M567.938 204.092L462.25 362.626A48.003 48.003 0 0 1 422.311 384H153.689A48 48 0 0 1 113.751 362.626L8.062 204.092A47.994 47.994 0 0 1 0 177.467V48C0 21.49 21.49 0 48 0H528C554.51 0 576 21.49 576 48V177.467A47.994 47.994 0 0 1 567.938 204.092zM162.252 320H413.749L499.082 192H376L344 128H232L200 192H76.918L162.252 320z" />
-    <glyph glyph-name="indent"
-      unicode="&#xF03C;"
-      horiz-adv-x="448" d=" M0 364V404C0 412.837 7.163 420 16 420H432C440.837 420 448 412.837 448 404V364C448 355.163 440.837 348 432 348H16C7.163 348 0 355.163 0 364zM176 220H432C440.837 220 448 227.163 448 236V276C448 284.837 440.837 292 432 292H176C167.163 292 160 284.837 160 276V236C160 227.163 167.163 220 176 220zM16 -36H432C440.837 -36 448 -28.837 448 -20V20C448 28.837 440.837 36 432 36H16C7.163 36 0 28.837 0 20V-20C0 -28.837 7.163 -36 16 -36zM176 92H432C440.837 92 448 99.163 448 108V148C448 156.837 440.837 164 432 164H176C167.163 164 160 156.837 160 148V108C160 99.163 167.163 92 176 92zM123.313 203.313L27.313 299.297C17.266 309.348 0 302.224 0 287.9840000000001V96.009C0 81.68 17.325 74.705 27.313 84.696L123.313 180.6880000000001C129.562 186.9350000000001 129.562 197.0650000000001 123.313 203.3130000000001z" />
-    <glyph glyph-name="industry"
-      unicode="&#xF275;"
-      horiz-adv-x="512" d=" M475.115 284.219L336 195.691V263.971C336 282.887 315.069 294.37 299.115 284.219L160 195.691V392C160 405.255 149.255 416 136 416H24C10.745 416 0 405.255 0 392V-8C0 -21.255 10.745 -32 24 -32H488C501.255 -32 512 -21.255 512 -8V263.971C512 282.8880000000001 491.069 294.37 475.115 284.219z" />
-    <glyph glyph-name="infinity"
-      unicode="&#xF534;"
-      horiz-adv-x="640" d=" M471.1 352C405 352 353.3 310.7 320 273.4C286.7 310.7 235 352 168.9 352C75.8 352 0 280.2 0 192S75.8 32 168.9 32C235 32 286.7 73.3 320 110.6C353.3 73.3 405 32 471.1 32C564.2 32 640 103.8 640 192S564.2 352 471.1 352zM168.9 128C128.7 128 96 156.7 96 192S128.7 256 168.9 256C207.1 256 242.3 219.9 262.9 192C242.5 164.4 207 128 168.9 128zM471.1 128C432.9000000000001 128 397.7000000000001 164.1 377.1 192C397.5 219.6 433 256 471.1 256C511.3 256 544 227.3 544 192S511.3 128 471.1 128z" />
-    <glyph glyph-name="info-circle"
-      unicode="&#xF05A;"
-      horiz-adv-x="512" d=" M256 440C119.043 440 8 328.9170000000001 8 192C8 55.003 119.043 -56 256 -56S504 55.003 504 192C504 328.9170000000001 392.957 440 256 440zM256 330C279.1960000000001 330 298 311.1960000000001 298 288S279.1960000000001 246 256 246S214 264.804 214 288S232.804 330 256 330zM312 76C312 69.373 306.627 64 300 64H212C205.373 64 200 69.373 200 76V100C200 106.627 205.373 112 212 112H224V176H212C205.373 176 200 181.373 200 188V212C200 218.627 205.373 224 212 224H276C282.627 224 288 218.627 288 212V112H300C306.627 112 312 106.627 312 100V76z" />
-    <glyph glyph-name="info"
-      unicode="&#xF129;"
-      horiz-adv-x="192" d=" M20 23.771H40V168.229H20C8.954 168.229 0 177.183 0 188.229V236C0 247.046 8.954 256 20 256H132C143.046 256 152 247.046 152 236V23.771H172C183.046 23.771 192 14.817 192 3.771V-44C192 -55.046 183.046 -64 172 -64H20C8.954 -64 0 -55.046 0 -44V3.771C0 14.817 8.954 23.771 20 23.771zM96 448C56.235 448 24 415.765 24 376S56.235 304 96 304S168 336.235 168 376S135.764 448 96 448z" />
-    <glyph glyph-name="italic"
-      unicode="&#xF033;"
-      horiz-adv-x="320" d=" M204.758 32H170.909L233.0010000000001 352H273.7260000000001A16 16 0 0 1 289.4300000000001 364.937L295.6720000000001 396.937C297.599 406.8160000000001 290.034 416 279.968 416H120.235A16 16 0 0 1 104.531 403.063L98.289 371.063C96.362 361.184 103.927 352 113.993 352H147.839L85.749 32H46.278A16 16 0 0 1 30.574 19.065L24.329 -12.935C22.402 -22.815 29.967 -32 40.034 -32H198.513A16 16 0 0 1 214.217 -19.065L220.462 12.935C222.389 22.815 214.824 32 204.758 32z" />
-    <glyph glyph-name="joint"
-      unicode="&#xF595;"
-      horiz-adv-x="640" d=" M444.34 266.9C466.72 251.22 480 225.74 480 198.31V168C480 163.58 483.58 160 488 160H536C540.42 160 544 163.58 544 168V198.31C544 241.55 522.99 281.7200000000001 487.66 306.37C463.85 322.98 448 348.66 448 377.69V440C448 444.42 444.42 448 440 448H392C387.58 448 384 444.42 384 440V373.6C384 329.91 408.56 291.9700000000001 444.3400000000001 266.9zM194.97 89.02C126.03 77.93 59.69 53.31 0 16C83.65 -36.28 180.3 -64 278.94 -64H367.51L254.79 67.51C240.05 84.71 217.34 92.62 194.97 89.02zM553.28 360.91C547.61 364.71 544 370.87 544 377.69V440C544 444.42 540.42 448 536 448H488C483.58 448 480 444.42 480 440V377.69C480 355.67 490.17 334.28 508.64 322.3C550.79 294.9600000000001 576 248.46 576 198.31V168C576 163.58 579.58 160 584 160H632C636.42 160 640 163.58 640 168V198.31C640 263.75 607.59 324.5 553.28 360.91zM360.89 95.95C326.49 95.89 274.08 95.8 272.68 95.78L390.48 -41.65A63.98700000000001 63.98700000000001 0 0 1 439.07 -64H527.52L409.57 73.6A63.95499999999999 63.95499999999999 0 0 1 360.89 95.9500000000001zM616 96H432L549.99 -41.65A63.98700000000001 63.98700000000001 0 0 1 598.58 -64H616C629.25 -64 640 -53.25 640 -40V72C640 85.26 629.25 96 616 96z" />
-    <glyph glyph-name="key"
-      unicode="&#xF084;"
-      horiz-adv-x="512" d=" M512 271.999C512 174.797 433.202 96 336 96C324.78 96 313.81 97.062 303.173 99.069L279.161 72.055A23.999000000000002 23.999000000000002 0 0 0 261.223 64H224V24C224 10.745 213.255 0 200 0H160V-40C160 -53.255 149.255 -64 136 -64H24C10.745 -64 0 -53.255 0 -40V38.059C0 44.424 2.529 50.529 7.029 55.03L168.831 216.832C163.108 234.186 160 252.729 160 272C160 369.202 238.797 447.999 335.999 448C433.488 448.001 512 369.4890000000001 512 271.999zM336 320C336 293.49 357.49 272 384 272S432 293.49 432 320S410.51 368 384 368S336 346.51 336 320z" />
-    <glyph glyph-name="keyboard"
-      unicode="&#xF11C;"
-      horiz-adv-x="576" d=" M528 0H48C21.49 0 0 21.49 0 48V336C0 362.51 21.49 384 48 384H528C554.51 384 576 362.51 576 336V48C576 21.49 554.51 0 528 0zM128 268V308C128 314.627 122.627 320 116 320H76C69.373 320 64 314.627 64 308V268C64 261.373 69.373 256 76 256H116C122.627 256 128 261.373 128 268zM224 268V308C224 314.627 218.627 320 212 320H172C165.373 320 160 314.627 160 308V268C160 261.373 165.373 256 172 256H212C218.627 256 224 261.373 224 268zM320 268V308C320 314.627 314.627 320 308 320H268C261.373 320 256 314.627 256 308V268C256 261.373 261.373 256 268 256H308C314.627 256 320 261.373 320 268zM416 268V308C416 314.627 410.627 320 404 320H364C357.373 320 352 314.627 352 308V268C352 261.373 357.373 256 364 256H404C410.627 256 416 261.373 416 268zM512 268V308C512 314.627 506.627 320 500 320H460C453.373 320 448 314.627 448 308V268C448 261.373 453.373 256 460 256H500C506.627 256 512 261.373 512 268zM176 172V212C176 218.627 170.627 224 164 224H124C117.373 224 112 218.627 112 212V172C112 165.373 117.373 160 124 160H164C170.627 160 176 165.373 176 172zM272 172V212C272 218.627 266.627 224 260 224H220C213.373 224 208 218.627 208 212V172C208 165.373 213.373 160 220 160H260C266.627 160 272 165.373 272 172zM368 172V212C368 218.627 362.627 224 356 224H316C309.373 224 304 218.627 304 212V172C304 165.373 309.373 160 316 160H356C362.627 160 368 165.373 368 172zM464 172V212C464 218.627 458.627 224 452 224H412C405.373 224 400 218.627 400 212V172C400 165.373 405.373 160 412 160H452C458.627 160 464 165.373 464 172zM128 76V116C128 122.627 122.627 128 116 128H76C69.373 128 64 122.627 64 116V76C64 69.373 69.373 64 76 64H116C122.627 64 128 69.373 128 76zM416 76V116C416 122.627 410.627 128 404 128H172C165.373 128 160 122.627 160 116V76C160 69.373 165.373 64 172 64H404C410.627 64 416 69.373 416 76zM512 76V116C512 122.627 506.627 128 500 128H460C453.373 128 448 122.627 448 116V76C448 69.373 453.373 64 460 64H500C506.627 64 512 69.373 512 76z" />
-    <glyph glyph-name="kiss-beam"
-      unicode="&#xF597;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM209 220.1L199.5 237.1C191.8 250.8 180.3 258.7 168 258.7S144.2 250.8 136.5 237.1L127 220.1C122.8 212.7 111.4 216.1 112.1 224.6C115.4 266.7 144.3 296 168.1 296S220.8 266.7 224.1 224.6C224.6 216.1 213.2 212.6 209 220.1zM304 52C304 32.8 275.3 10.5 232.5 8C224 7.2 220.4 19.8 228.9 23.4L245.9 30.6C258.9 36.1 266.7 44.1 266.7 52.1S258.9 68.1 245.9 73.6L228.9 80.8C222.9 83.3 222.8 92.9999999999999 228.9 95.6L245.9 102.8C258.9 108.3 266.7 116.3 266.7 124.3S258.9 140.3 245.9 145.8L228.9 153C220.3 156.6 224.1 169.5 232.5 168.3999999999999C275.3 165.8999999999999 304 143.5999999999999 304 124.3999999999999C304 111.3999999999999 290.6 97.0999999999999 268.8 88.3999999999999C290.6 79.3 304 65 304 52zM369 220.1L359.5 237.1C351.8 250.8 340.3 258.7 328 258.7S304.2 250.8 296.5 237.1L287 220.1C282.9 212.8 271.4 216.1 272.1 224.6C275.4000000000001 266.7 304.3 296 328.1 296S380.8 266.7 384.1 224.6C384.6 216.1 373.2000000000001 212.6 369 220.1z" />
-    <glyph glyph-name="kiss-wink-heart"
-      unicode="&#xF598;"
-      horiz-adv-x="504" d=" M501.1 45.5C493.1 66.3 469.6 77 448 71.4L439.6 69.2L437.3 77.6C431.4000000000001 98.9999999999999 410.3 114.1 388.3 110.6C363.1 106.6 347.7 81.9999999999999 354.3 57.9999999999999L377.2 -24.6C378.7 -29.9 384.2 -33.1 389.6 -31.7L472.6 -10.2C496.7 -3.9 510.3 21.6 501.1 45.4999999999999zM323.5 49.5C317.9 69.8 321.2 91.5 332.5 109.2C362.2 155.5 431.2 154.7 460.3 104.9C466.7 104.8 472.9 103.5 478.9 102C489.8 129.9 496.0000000000001 160.2 496.0000000000001 192C496 329 385 440 248 440S0 329 0 192S111 -56 248 -56C283.4 -56 316.9 -48.5 347.4 -35.1C347.1 -34.4 323.5 49.5 323.5 49.5zM168 208C150.3 208 136 222.3 136 240S150.3 272 168 272S200 257.7 200 240S185.7 208 168 208zM288 52C288 32.8 259.3 10.5 216.5 8C208 7.2 204.4 19.8 212.9 23.4L229.9 30.6C242.9 36.1 250.7 44.1 250.7 52.1S242.9 68.1 229.9 73.6L212.9 80.8C206.9 83.3 207.2 93.1 212.9 95.6L229.9 102.8C242.9 108.3 250.7 116.3 250.7 124.3S242.9 140.3 229.9 145.8L212.9 153C204.1 156.6999999999999 208.3 169.6 216.5 168.3999999999999C259.3 165.8999999999999 288 143.5999999999999 288 124.3999999999999C288 111.3999999999999 274.6 97.0999999999999 252.8 88.3999999999999C274.6 79.3 288 65 288 52zM304 231C295.7 223.6 282.4 230.6 284.2 241.8C288.2 267 318.4 283.9 344.1 283.9S400 267 404 241.8C405.7 230.7 392.7 223.5 384.2 231L374.7 239.5C359.9 252.7 328.5 252.7 313.7 239.5L304 231z" />
-    <glyph glyph-name="kiss"
-      unicode="&#xF596;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM168 208C150.3 208 136 222.3 136 240S150.3 272 168 272S200 257.7 200 240S185.7 208 168 208zM304 52C304 32.8 275.3 10.5 232.5 8C224 7.2 220.4 19.8 228.9 23.4L245.9 30.6C258.9 36.1 266.7 44.1 266.7 52.1S258.9 68.1 245.9 73.6L228.9 80.8C222.9 83.3 222.8 92.9999999999999 228.9 95.6L245.9 102.8C258.9 108.3 266.7 116.3 266.7 124.3S258.9 140.3 245.9 145.8L228.9 153C220.3 156.6 224.1 169.5 232.5 168.3999999999999C275.3 165.8999999999999 304 143.5999999999999 304 124.3999999999999C304 111.3999999999999 290.6 97.0999999999999 268.8 88.3999999999999C290.6 79.3 304 65 304 52zM328 208C310.3 208 296 222.3 296 240S310.3 272 328 272S360 257.7 360 240S345.7 208 328 208z" />
-    <glyph glyph-name="kiwi-bird"
-      unicode="&#xF535;"
-      horiz-adv-x="576" d=" M575.81 230.02C572.64 290.5900000000001 518.28 336 457.63 336H448.26C395.44 336 344.01 352.25 300.52 382.24C258.53 411.2 204.48 423.86 147.31 410.94C129.3 406.88 -0.08 369.76 0 224C0.04 153.05 38.68 91.2 95.99 57.99V-16C95.99 -24.84 103.15 -32 111.99 -32H127.99C136.83 -32 143.99 -24.84 143.99 -16V38.26C159.35 34.3 175.39 32 191.99 32C197.43 32 202.67 32.73 207.99 33.18V-16C207.99 -24.84 215.15 -32 223.99 -32H239.99C248.83 -32 255.99 -24.84 255.99 -16V43.43C270.23 48.49 283.87 54.82 296.3300000000001 62.94C342.07 92.75 393.86 112 448.46 112C473.94 112 464.47 112.31 471.51 112.78L545.92 -23.66C548.78 -28.89 554.2199999999999 -32 559.9699999999999 -32C561.2799999999999 -32 562.6099999999999 -31.84 563.92 -31.5C571.01 -29.7 575.9699999999999 -23.31 575.9699999999999 -16C575.9699999999999 -16 576.1099999999999 224.24 575.81 230.02zM463.97 200C450.72 200 439.9700000000001 210.75 439.9700000000001 224C439.9700000000001 237.26 450.72 248 463.97 248S487.97 237.26 487.97 224C487.97 210.75 477.22 200 463.97 200zM543.97 46.75L504.11 119.83C519.23 125.66 532.84 134.43 543.97 145.81V46.75z" />
-    <glyph glyph-name="language"
-      unicode="&#xF1AB;"
-      horiz-adv-x="640" d=" M304 32H24C10.745 32 0 42.745 0 56V328C0 341.255 10.745 352 24 352H304V32zM183.324 104.622A12 12 0 0 1 194.839 96H217.702C225.922 96 231.709 104.078 229.064 111.861L171.61 280.915A12 12 0 0 1 160.248 289.054H127.759A12.001000000000001 12.001000000000001 0 0 1 116.397 280.915L58.942 111.861C56.297 104.078 62.084 96 70.304 96H93.109A12 12 0 0 1 104.644 104.693L113.762 136.5H173.973L183.324 104.622zM144.273 245.042S148.593 223.981 152.103 211.832L162.9030000000001 174.301H124.8330000000001L135.9030000000001 211.832C139.4130000000001 223.982 143.7330000000001 245.042 143.7330000000001 245.042H144.2730000000001zM616 32H336V352H616C629.255 352 640 341.255 640 328V56C640 42.745 629.255 32 616 32zM580 260H516V276C516 282.627 510.627 288 504 288H488C481.373 288 476 282.627 476 276V260H412C405.373 260 400 254.627 400 248V232C400 225.373 405.373 220 412 220H526.106C519.843 205.701 509.588 191.028 496.083 176.794C489.523 183.692 483.686 190.704 478.718 197.727C475.079 202.871 468.133 204.402 462.723 201.173L455.443 196.827L448.945 192.948C442.989 189.392 441.252 181.527 445.21 175.831C451.275 167.102 458.308 158.495 466.194 150.105C458.0719999999999 143.879 449.353 137.861 440.091 132.141C434.57 128.731 432.7099999999999 121.585 435.929 115.951L443.87 102.055C447.232 96.172 454.8049999999999 94.2289999999999 460.576 97.7789999999999C473.308 105.61 485.147 113.954 496.0189999999999 122.67C506.9359999999999 113.9089999999999 518.785 105.568 531.415 97.789C537.189 94.233 544.7679999999999 96.171 548.132 102.059L556.0759999999999 115.962C559.2889999999999 121.585 557.4459999999999 128.722 551.9409999999999 132.133A312.737 312.737 0 0 0 525.881 150.152C546.905 172.577 561.649 196.441 568.5939999999999 220.002H580C586.627 220.002 592 225.375 592 232.002V248.002C592 254.627 586.627 260 580 260z" />
-    <glyph glyph-name="laptop"
-      unicode="&#xF109;"
-      horiz-adv-x="640" d=" M512 384V128H128V384H512M528 448H112C85.5 448 64 426.5 64 400V112C64 85.5 85.5 64 112 64H528C554.5 64 576 85.5 576 112V400C576 426.5 554.5 448 528 448zM628 32H389.5C386.5 32 384 29.9 383.6 26.9C381.2 11.7 368 0 352 0H288C272 0 258.8 11.7 256.4 26.9C255.9 29.8 253.4 32 250.5 32H12C5.4 32 0 26.6 0 20V-16C0 -42.5 21.5 -64 48 -64H592C618.5 -64 640 -42.5 640 -16V20C640 26.6 634.6 32 628 32z" />
-    <glyph glyph-name="laugh-beam"
-      unicode="&#xF59A;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM272 240.6C275.3 282.7 304.2 312 328 312S380.7 282.7 384 240.6C384.7 232 373.2 228.7 369.1 236.1L359.6 253.1C351.9000000000001 266.8 340.4000000000001 274.7 328.1 274.7S304.3 266.8 296.6 253.1L287.1 236.1C282.9000000000001 228.7 271.3 232 272 240.6zM112 240.6C115.3 282.7 144.2 312 168 312S220.7 282.7 224 240.6C224.7 232 213.2 228.7 209.1 236.1L199.6 253.1C191.9 266.8 180.4 274.7 168.1 274.7S144.3 266.8 136.6 253.1L127.1 236.1C122.8 228.7 111.3 232.1 112 240.6zM398.9 142C390 71 329.4 16 256 16H240C166.6 16 106 71 97.1 142C95.9 151.5 103.4 160 113 160H383C392.6 160 400.1 151.6 398.9 142z" />
-    <glyph glyph-name="laugh-squint"
-      unicode="&#xF59B;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM281.8 278.3L361.8 326.3C373.4000000000001 333.2000000000001 385.8 318.6 377.2 308.3L343.6 268L377.2000000000001 227.7C385.9000000000001 217.3 373.3000000000001 202.9 361.8000000000001 209.7L281.8000000000001 257.7C274.1000000000001 262.4 274.1000000000001 273.6 281.8000000000001 278.3zM118.8 308.3C110.2 318.6 122.6 333.2000000000001 134.2 326.3L214.2 278.3C222 273.6 222 262.4 214.2 257.7000000000001L134.2 209.7C122.7 202.9 110.2 217.3 118.8 227.7L152.4 268L118.8 308.3zM398.9 142C390 71 329.4 16 256 16H240C166.6 16 106 71 97.1 142C95.9 151.5 103.4 160 113 160H383C392.6 160 400.1 151.6 398.9 142z" />
-    <glyph glyph-name="laugh-wink"
-      unicode="&#xF59C;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM268.1 241.9C272.1 267.1 302.3 284 328 284S383.9 267.1 387.9 241.9C389.6 230.8 376.5 223.6 368.1 231.1L358.6 239.6C343.8 252.8 312.4 252.8 297.6 239.6L288 231C279.6 223.6 266.4 230.7 268.1 241.9zM168 288C185.7 288 200 273.7 200 256S185.7 224 168 224S136 238.3 136 256S150.3 288 168 288zM398.9 142C390 71 329.4 16 256 16H240C166.6 16 106 71 97.1 142C95.9 151.5 103.4 160 113 160H383C392.6 160 400.1 151.6 398.9 142z" />
-    <glyph glyph-name="laugh"
-      unicode="&#xF599;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM328 288C345.7 288 360 273.7 360 256S345.7 224 328 224S296 238.3 296 256S310.3 288 328 288zM168 288C185.7 288 200 273.7 200 256S185.7 224 168 224S136 238.3 136 256S150.3 288 168 288zM256 16H240C166.6 16 106 71 97.1 142C95.9 151.5 103.4 160 113 160H383C392.6 160 400.1 151.6 398.9 142C390 71 329.4 16 256 16z" />
-    <glyph glyph-name="leaf"
-      unicode="&#xF06C;"
-      horiz-adv-x="576" d=" M546.2 438.3C540.6 450.8 524.6 451.3 517.9000000000001 439.5C486.9 385.6 431.4 352 368 352H288C182 352 96 266 96 160C96 153 96.8 146.3 97.5 139.5C161.3 185.2 253.4 224 384 224C392.8 224 400 216.8 400 208S392.8 192 384 192C132.6 192 26 37.9 2.4 -20C-4.2 -36.3 3.6 -54.9 19.9 -61.6C36.3 -68.4 54.9 -60.5 61.7 -44.3C63.2 -40.7 82.6 3.6 133.6 46.3C166 2.4 227.6 -39.5000000000001 308.5 -30.9C465.5 -19.5 576 121.3 576 293.7C576 343.9 565.2 395.9 546.2 438.3z" />
-    <glyph glyph-name="lemon"
-      unicode="&#xF094;"
-      horiz-adv-x="512" d=" M489.038 425.037C465.944 448.13 434.648 453.93 413.947 441.871C355.041 407.5590000000001 232.697 494.948 92.874 355.125S40.441 92.959 6.129 34.055C-5.93 13.353 -0.131 -17.944 22.962 -41.038C46.057 -64.133 77.354 -69.929 98.057 -57.87C156.958 -23.56 279.303 -110.9489999999999 419.125 28.873S471.56 291.04 505.871 349.944C517.93 370.646 512.132 401.943 489.038 425.0370000000001zM243.881 352.478C185.692 337.931 110.073 262.323 95.523 204.12C93.706 196.85 87.181 191.996 80.012 191.996C78.728 191.996 77.422 192.152 76.119 192.477C67.547 194.621 62.335 203.307 64.477 211.88C81.901 281.573 166.316 366.07 236.119 383.522C244.694 385.665 253.38 380.453 255.522 371.88S252.453 354.621 243.881 352.478z" />
-    <glyph glyph-name="less-than-equal"
-      unicode="&#xF537;"
-      horiz-adv-x="448" d=" M54.98 233.8L356.3900000000001 113.93C374.7800000000001 107.9 395.1 116.47 401.7700000000001 133.08L413.86 163.16C420.54 179.77 411.04 198.13 392.6500000000001 204.16L217.21 272.21L392.7700000000001 340.3C411.0600000000001 346.3 420.5100000000001 364.57 413.8700000000001 381.09L401.8400000000001 411.01C395.2000000000001 427.54 374.9800000000001 436.07 356.6900000000001 430.07L54.98 310.11C41.21 305.5900000000001 32 293.5 32 279.93V263.9700000000001C32 250.41 41.21 238.32 54.98 233.8zM424 48H24C10.75 48 0 37.26 0 24V-24C0 -37.25 10.75 -48 24 -48H424C437.25 -48 448 -37.25 448 -24V24C448 37.26 437.25 48 424 48z" />
-    <glyph glyph-name="less-than"
-      unicode="&#xF536;"
-      horiz-adv-x="384" d=" M365.46 90.26L147.04 192.11L365.51 293.99C381.53 301.4600000000001 388.46 320.5 380.99 336.52L367.4700000000001 365.52C360 381.54 340.96 388.4700000000001 324.94 381L18.48 238.09A32.014 32.014 0 0 1 0 209.09V174.85C0 162.41 7.21 151.1 18.48 145.85L324.79 3.02C340.85 -4.47 359.94 2.48 367.43 18.54L380.99 47.62C388.48 63.68 381.5300000000001 82.7699999999999 365.4600000000001 90.2599999999999z" />
-    <glyph glyph-name="level-down-alt"
-      unicode="&#xF3BE;"
-      horiz-adv-x="320" d=" M313.553 55.669L209.587 -56.334C200.102 -66.548 183.911 -66.563 174.413 -56.334L70.438 55.669C56.232 70.969 67.062 96 88.025 96H152V368H68.024A11.996 11.996 0 0 0 59.539 371.515L3.539 427.515C-4.021 435.074 1.333 448 12.024 448H208C221.255 448 232 437.255 232 424V96H295.966C316.844 96 327.817 71.031 313.553 55.669z" />
-    <glyph glyph-name="level-up-alt"
-      unicode="&#xF3BF;"
-      horiz-adv-x="320" d=" M313.553 328.331L209.587 440.334C200.102 450.548 183.911 450.563 174.413 440.334L70.438 328.331C56.232 313.031 67.062 288 88.025 288H152V16H68.024A11.996 11.996 0 0 1 59.539 12.485L3.539 -43.515C-4.021 -51.074 1.333 -64 12.024 -64H208C221.255 -64 232 -53.255 232 -40V288H295.966C316.844 288 327.817 312.969 313.553 328.331z" />
-    <glyph glyph-name="life-ring"
-      unicode="&#xF1CD;"
-      horiz-adv-x="512" d=" M256 440C119.033 440 8 328.967 8 192S119.033 -56 256 -56S504 55.033 504 192S392.967 440 256 440zM429.6960000000001 320.4410000000001L366.2970000000001 257.0420000000001C355.31 275.601 339.627 291.294 321.0420000000001 302.2970000000001L384.4410000000001 365.6960000000001A218.396 218.396 0 0 0 429.6960000000001 320.4410000000001zM256 96C202.981 96 160 138.981 160 192S202.981 288 256 288S352 245.019 352 192S309.019 96 256 96zM127.559 365.6960000000001L190.958 302.2970000000001C172.399 291.31 156.706 275.627 145.703 257.0420000000001L82.304 320.4410000000001A218.372 218.372 0 0 0 127.559 365.6960000000001zM82.304 63.559L145.703 126.958C156.69 108.399 172.373 92.706 190.958 81.703L127.559 18.304A218.396 218.396 0 0 0 82.304 63.559zM384.4410000000001 18.304L321.0420000000001 81.703C339.6010000000001 92.6900000000001 355.2940000000001 108.3730000000001 366.2970000000001 126.958L429.6960000000001 63.559A218.40299999999996 218.40299999999996 0 0 0 384.4410000000001 18.304z" />
-    <glyph glyph-name="lightbulb"
-      unicode="&#xF0EB;"
-      horiz-adv-x="384" d=" M272 20V-8C272 -18.449 265.32 -27.334 256 -30.629V-40C256 -53.255 245.255 -64 232 -64H152C138.745 -64 128 -53.255 128 -40V-30.629C118.68 -27.334 112 -18.449 112 -8V20C112 26.627 117.373 32 124 32H260C266.627 32 272 26.627 272 20zM128.893 64C118.986 64 110.067 70.078 106.517 79.327C67.697 180.459 16 170.269 16 272C16 369.197 94.805 448 192 448S368 369.197 368 272C368 170.269 316.303 180.459 277.484 79.327C273.934 70.078 265.014 64 255.108 64H128.893zM112 272C112 316.112 147.888 352 192 352C200.837 352 208 359.164 208 368S200.837 384 192 384C130.243 384 80 333.757 80 272C80 263.164 87.164 256 96 256S112 263.164 112 272z" />
-    <glyph glyph-name="link"
-      unicode="&#xF0C1;"
-      horiz-adv-x="512" d=" M326.612 262.6090000000001C386.3590000000001 202.8 385.5390000000001 106.911 326.9720000000001 48.019C326.862 47.899 326.7320000000001 47.769 326.612 47.649L259.4120000000001 -19.551C200.142 -78.821 103.713 -78.813 44.452 -19.551C-14.818 39.709 -14.818 136.149 44.452 195.409L81.558 232.515C91.398 242.355 108.344 235.8150000000001 108.852 221.909C109.5 204.187 112.678 186.382 118.542 169.1880000000001C120.528 163.3660000000001 119.109 156.9260000000001 114.759 152.576L101.672 139.489C73.646 111.463 72.767 65.8290000000001 100.517 37.5290000000001C128.541 8.95 174.603 8.78 202.842 37.0190000000001L270.0420000000001 104.2090000000001C298.233 132.4 298.115 177.9660000000001 270.0420000000001 206.0390000000001C266.341 209.733 262.6130000000001 212.603 259.701 214.608A16.037 16.037 0 0 0 252.754 227.2140000000001C252.3580000000001 237.7810000000001 256.1020000000001 248.67 264.452 257.0200000000001L285.506 278.0750000000001C291.027 283.596 299.688 284.2740000000001 306.09 279.8060000000001A152.482 152.482 0 0 0 326.612 262.6090000000001zM467.547 403.551C408.286 462.813 311.8570000000001 462.821 252.587 403.551L185.387 336.351C185.267 336.231 185.137 336.101 185.027 335.981C126.461 277.089 125.64 181.2 185.387 121.391A152.454 152.454 0 0 1 205.908 104.1949999999999C212.31 99.7269999999999 220.972 100.406 226.492 105.9259999999999L247.546 126.981C255.896 135.331 259.6400000000001 146.2199999999999 259.2440000000001 156.7869999999999A16.037 16.037 0 0 1 252.2970000000001 169.3929999999999C249.385 171.3979999999999 245.6570000000001 174.2679999999999 241.956 177.9619999999999C213.883 206.035 213.765 251.601 241.956 279.7919999999999L309.156 346.9819999999999C337.395 375.2209999999999 383.456 375.051 411.481 346.4719999999999C439.231 318.1719999999999 438.353 272.5379999999999 410.326 244.5119999999999L397.2390000000001 231.425C392.889 227.075 391.4700000000001 220.6349999999999 393.456 214.8129999999999C399.32 197.619 402.498 179.8139999999999 403.146 162.0919999999999C403.6550000000001 148.1859999999999 420.6 141.6459999999999 430.44 151.4859999999999L467.546 188.5919999999999C526.817 247.851 526.817 344.291 467.547 403.551z" />
-    <glyph glyph-name="lira-sign"
-      unicode="&#xF195;"
-      horiz-adv-x="384" d=" M371.9940000000001 192H323.975C317.64 192 312 187.088 312 180.754C312 80 230.179 32 144 32V191.219L278.603 221.131A12 12 0 0 1 288 232.845V273.8210000000001C288 281.498 280.891 287.201 273.397 285.535L144 256.781V287.2200000000001L278.603 317.132A12 12 0 0 1 288 328.846V369.8210000000001C288 377.498 280.891 383.201 273.397 381.535L144 352.781V404C144 410.627 138.627 416 132 416H76C69.373 416 64 410.627 64 404V335.003L9.397 322.8690000000001A12 12 0 0 1 0 311.155V270.179C0 262.502 7.109 256.799 14.603 258.4650000000001L64 269.442V239.003L9.397 226.869A12 12 0 0 1 0 215.155V174.179C0 166.502 7.109 160.799 14.603 162.465L64 173.442V-20C64 -26.627 69.373 -32 76 -32H155.583C289.674 -32 378.838 45.834 383.991 179.592C384.252 186.374 378.78 192 371.994 192z" />
-    <glyph glyph-name="list-alt"
-      unicode="&#xF022;"
-      horiz-adv-x="512" d=" M464 -32H48C21.49 -32 0 -10.51 0 16V368C0 394.51 21.49 416 48 416H464C490.51 416 512 394.51 512 368V16C512 -10.51 490.51 -32 464 -32zM128 328C105.909 328 88 310.091 88 288S105.909 248 128 248S168 265.909 168 288S150.091 328 128 328zM128 232C105.909 232 88 214.091 88 192S105.909 152 128 152S168 169.909 168 192S150.091 232 128 232zM128 136C105.909 136 88 118.091 88 96S105.909 56 128 56S168 73.909 168 96S150.091 136 128 136zM416 272V304C416 310.627 410.627 316 404 316H204C197.373 316 192 310.627 192 304V272C192 265.373 197.373 260 204 260H404C410.627 260 416 265.373 416 272zM416 176V208C416 214.627 410.627 220 404 220H204C197.373 220 192 214.627 192 208V176C192 169.373 197.373 164 204 164H404C410.627 164 416 169.373 416 176zM416 80V112C416 118.627 410.627 124 404 124H204C197.373 124 192 118.627 192 112V80C192 73.373 197.373 68 204 68H404C410.627 68 416 73.373 416 80z" />
-    <glyph glyph-name="list-ol"
-      unicode="&#xF0CB;"
-      horiz-adv-x="512" d=" M3.263 308.473C3.263 315.9500000000001 7.18 320.045 14.836 320.045H29.967V359.9220000000001C29.967 365.085 30.501 370.425 30.501 370.425H30.145S28.366 367.755 27.297 366.687C22.846 362.414 16.793 362.236 11.631 367.755L6.113 373.986C0.771 379.327 1.129 385.202 6.647 390.365L28.367 410.303C32.815 414.398 36.732 416 42.785 416H54.89C62.546 416 66.639 412.084 66.639 404.428V320.044H82.127C89.782 320.044 93.699 315.95 93.699 308.472V299.5710000000001C93.699 292.094 89.782 287.999 82.127 287.999H14.836C7.18 287.999 3.263 292.094 3.263 299.5710000000001V308.473zM2.211 143.409C2.211 190.687 53.166 199.792 53.166 212.574C53.166 219.754 47.212 221.329 43.886 221.329C40.733 221.329 37.407 220.278 34.431 217.477C29.352 212.574 23.924 210.473 18.32 215.026L9.741 221.855C3.962 226.408 2.561 231.6600000000001 6.938 237.264C13.592 246.019 26.025 256 47.387 256C66.824 256 91.863 245.494 91.863 216.427C91.863 178.08 45.11 170.025 43.184 159.518H82.233C89.762 159.518 93.79 155.491 93.79 148.136V139.381C93.79 132.027 89.762 127.999 82.233 127.999H14.293C7.288 127.999 2.21 132.027 2.21 139.381V143.409zM5.654 -6.61L11.257 2.67C15.11 9.324 20.362 9.674 26.841 5.8219999999999C31.744 3.7209999999999 36.471 2.67 41.2 2.67C51.355 2.67 55.558 6.172 55.558 10.9C55.558 17.554 49.954 20.006 39.624 20.006H34.896C28.942 20.006 25.616 22.107 22.638 27.886L21.588 29.812C19.137 34.54 20.362 39.6179999999999 24.389 44.696L29.993 51.7C36.822 60.105 42.25 65.183 42.25 65.183V65.533S38.047 64.482 29.642 64.482H16.685C9.155 64.482 5.302 68.5100000000001 5.302 75.864V84.619C5.302 92.149 9.155 96.001 16.685 96.001H75.169C82.698 96.001 86.551 91.9740000000001 86.551 84.619V81.292C86.551 75.514 85.15 71.4860000000001 81.472 67.109L63.963 46.972C83.574 41.8940000000001 92.679 26.485 92.679 12.1270000000001C92.679 -9.2359999999999 78.321 -31.9989999999999 44.176 -31.9989999999999C27.54 -31.9989999999999 15.984 -27.2709999999999 8.28 -22.5439999999999C2.501 -18.3419999999999 1.976 -12.7389999999999 5.654 -6.6099999999999zM144 316H496C504.837 316 512 323.163 512 332V372C512 380.837 504.837 388 496 388H144C135.163 388 128 380.837 128 372V332C128 323.163 135.163 316 144 316zM144 156H496C504.837 156 512 163.163 512 172V212C512 220.837 504.837 228 496 228H144C135.163 228 128 220.837 128 212V172C128 163.163 135.163 156 144 156zM144 -4H496C504.837 -4 512 3.163 512 12V52C512 60.837 504.837 68 496 68H144C135.163 68 128 60.837 128 52V12C128 3.163 135.163 -4 144 -4z" />
-    <glyph glyph-name="list-ul"
-      unicode="&#xF0CA;"
-      horiz-adv-x="512" d=" M96 352C96 325.49 74.51 304 48 304S0 325.49 0 352S21.49 400 48 400S96 378.51 96 352zM48 240C21.49 240 0 218.51 0 192S21.49 144 48 144S96 165.49 96 192S74.51 240 48 240zM48 80C21.49 80 0 58.51 0 32S21.49 -16 48 -16S96 5.49 96 32S74.51 80 48 80zM144 316H496C504.837 316 512 323.163 512 332V372C512 380.837 504.837 388 496 388H144C135.163 388 128 380.837 128 372V332C128 323.163 135.163 316 144 316zM144 156H496C504.837 156 512 163.163 512 172V212C512 220.837 504.837 228 496 228H144C135.163 228 128 220.837 128 212V172C128 163.163 135.163 156 144 156zM144 -4H496C504.837 -4 512 3.163 512 12V52C512 60.837 504.837 68 496 68H144C135.163 68 128 60.837 128 52V12C128 3.163 135.163 -4 144 -4z" />
-    <glyph glyph-name="list"
-      unicode="&#xF03A;"
-      horiz-adv-x="512" d=" M128 332V372C128 380.837 135.163 388 144 388H496C504.837 388 512 380.837 512 372V332C512 323.163 504.837 316 496 316H144C135.163 316 128 323.163 128 332zM144 156H496C504.837 156 512 163.163 512 172V212C512 220.837 504.837 228 496 228H144C135.163 228 128 220.837 128 212V172C128 163.163 135.163 156 144 156zM144 -4H496C504.837 -4 512 3.163 512 12V52C512 60.837 504.837 68 496 68H144C135.163 68 128 60.837 128 52V12C128 3.163 135.163 -4 144 -4zM16 304H80C88.837 304 96 311.163 96 320V384C96 392.837 88.837 400 80 400H16C7.163 400 0 392.837 0 384V320C0 311.163 7.163 304 16 304zM16 144H80C88.837 144 96 151.163 96 160V224C96 232.837 88.837 240 80 240H16C7.163 240 0 232.837 0 224V160C0 151.163 7.163 144 16 144zM16 -16H80C88.837 -16 96 -8.837 96 0V64C96 72.837 88.837 80 80 80H16C7.163 80 0 72.837 0 64V0C0 -8.837 7.163 -16 16 -16z" />
-    <glyph glyph-name="location-arrow"
-      unicode="&#xF124;"
-      horiz-adv-x="512" d=" M443.683 443.471L27.818 251.582C-18.702 230.111 -3.39 160 47.933 160H224V-15.993C224 -67.72 294.161 -82.519 315.582 -36.108L507.38 379.775C526.285 420.736 483.628 461.908 443.683 443.471z" />
-    <glyph glyph-name="lock-open"
-      unicode="&#xF3C1;"
-      horiz-adv-x="576" d=" M423.5 448C339.5 447.7 272 378.5 272 294.5V224H48C21.5 224 0 202.5 0 176V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V176C448 202.5 426.5 224 400 224H352V295.1C352 334.7 383.7 367.6 423.3 368C463.3 368.4 496 335.9 496 296V216C496 202.7 506.7 192 520 192H552C565.3 192 576 202.7 576 216V296C576 380 507.5 448.3 423.5 448z" />
-    <glyph glyph-name="lock"
-      unicode="&#xF023;"
-      horiz-adv-x="448" d=" M400 224H376V296C376 379.8 307.8 448 224 448S72 379.8 72 296V224H48C21.5 224 0 202.5 0 176V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V176C448 202.5 426.5 224 400 224zM296 224H152V296C152 335.7 184.3 368 224 368S296 335.7 296 296V224z" />
-    <glyph glyph-name="long-arrow-alt-down"
-      unicode="&#xF309;"
-      horiz-adv-x="256" d=" M168 102.059V404C168 410.627 162.627 416 156 416H100C93.373 416 88 410.627 88 404V102.059H41.941C20.559 102.059 9.851 76.208 24.97 61.088L111.029 -24.971C120.402 -34.344 135.598 -34.344 144.97 -24.971L231.029 61.088C246.148 76.207 235.44 102.059 214.058 102.059H168z" />
-    <glyph glyph-name="long-arrow-alt-left"
-      unicode="&#xF30A;"
-      horiz-adv-x="448" d=" M134.059 152H436C442.627 152 448 157.373 448 164V220C448 226.627 442.627 232 436 232H134.059V278.059C134.059 299.4410000000001 108.208 310.149 93.088 295.03L7.029 208.971C-2.344 199.598 -2.344 184.402 7.029 175.03L93.088 88.971C108.207 73.852 134.059 84.56 134.059 105.942V152z" />
-    <glyph glyph-name="long-arrow-alt-right"
-      unicode="&#xF30B;"
-      horiz-adv-x="448" d=" M313.941 232H12C5.373 232 0 226.627 0 220V164C0 157.373 5.373 152 12 152H313.941V105.941C313.941 84.559 339.792 73.851 354.912 88.97L440.971 175.029C450.344 184.402 450.344 199.598 440.971 208.97L354.9120000000001 295.029C339.793 310.148 313.9410000000001 299.44 313.9410000000001 278.058V232z" />
-    <glyph glyph-name="long-arrow-alt-up"
-      unicode="&#xF30C;"
-      horiz-adv-x="256" d=" M88 281.9410000000001V-20C88 -26.627 93.373 -32 100 -32H156C162.627 -32 168 -26.627 168 -20V281.9410000000001H214.059C235.441 281.9410000000001 246.149 307.7920000000001 231.03 322.9120000000001L144.971 408.971C135.598 418.344 120.402 418.344 111.03 408.971L24.971 322.9120000000001C9.852 307.793 20.56 281.9410000000001 41.942 281.9410000000001H88z" />
-    <glyph glyph-name="low-vision"
-      unicode="&#xF2A8;"
-      horiz-adv-x="576" d=" M569.344 216.369C512.96 312.051 407.81 376 288 376C259.532 376 231.898 372.381 205.549 365.591L152.778 437.76C145.177 448.618 130.214 451.26 119.355 443.6600000000001L106.241 434.482C95.381 426.881 92.739 411.916 100.341 401.056L143.472 342.661C89.449 316.27 40.228 273.317 6.682 216.419C6.672 216.402 6.659 216.386 6.648 216.369C-2.117 201.494 -2.316 182.841 6.648 167.63C45.148 102.298 106.39 51.768 179.507 26.281L55.316 203.698A272.194 272.194 0 0 0 83.61 239.61L203.01 69.03H203.02L243.65 10.99A330.055 330.055 0 0 1 322.59 9.8199999999999L132.61 281.2199999999999A277.628 277.628 0 0 0 171.387 302.7829999999999L423.223 -53.7610000000001C430.824 -64.619 445.7870000000001 -67.2600000000001 456.646 -59.6610000000001L469.76 -50.4830000000001C480.62 -42.8820000000001 483.262 -27.9160000000001 475.66 -17.0570000000001L432.54 41.3199999999999L432.533 41.329C489.694 69.307 537.3679999999999 113.369 569.343 167.63A47.937999999999995 47.937999999999995 0 0 1 569.3439999999999 216.369zM390.026 102.06L370.9600000000001 129.29C395.6420000000001 161.857 398.6710000000001 205.643 379.7600000000001 240.9700000000001V240.9400000000001C379.7600000000001 217.29 360.5900000000001 198.12 336.9400000000001 198.12C313.1120000000001 198.12 294.1200000000001 217.469 294.1200000000001 240.9400000000001C294.1200000000001 264.5900000000001 313.2900000000001 283.76 336.9400000000001 283.76H336.9700000000001C312.2200000000001 297.009 283.4480000000001 299.403 257.4600000000001 291.4400000000001L238.392 318.677C253.758 324.694 270.488 328 288 328C363.1620000000001 328 424 267.174 424 192C424 157.496 411.167 126.025 390.026 102.06z" />
-    <glyph glyph-name="luggage-cart"
-      unicode="&#xF59D;"
-      horiz-adv-x="640" d=" M224 128H256V352H224C206.33 352 192 337.67 192 320V160C192 142.33 206.33 128 224 128zM576 160V320C576 337.67 561.67 352 544 352H512V128H544C561.67 128 576 142.33 576 160zM624 64H128V432C128 440.84 120.84 448 112 448H16C7.16 448 0 440.84 0 432V400C0 391.16 7.16 384 16 384H64V16C64 7.16 71.16 0 80 0H162.94C161.15 -5.03 160 -10.36 160 -16C160 -42.51 181.49 -64 208 -64S256 -42.51 256 -16C256 -10.36 254.85 -5.03 253.06 0H450.94C449.15 -5.03 448 -10.36 448 -16C448 -42.51 469.49 -64 496 -64S544 -42.51 544 -16C544 -10.36 542.85 -5.03 541.06 0H624C632.84 0 640 7.16 640 16V48C640 56.84 632.84 64 624 64zM480 352V400C480 426.51 458.51 448 432 448H336C309.49 448 288 426.51 288 400V128H480V352zM432 352H336V400H432V352z" />
-    <glyph glyph-name="magic"
-      unicode="&#xF0D0;"
-      horiz-adv-x="512" d=" M224 352L240 384L272 400L240 416L224 448L208 416L176 400L208 384L224 352zM80 288L106.66 341.33L160 368L106.66 394.67L80 448L53.34 394.67L0 368L53.34 341.33L80 288zM432 160L405.34 106.67L352 80L405.3400000000001 53.33L432 0L458.66 53.33L512 80L458.66 106.67L432 160zM502.62 353.77L417.77 438.62C411.53 444.88 403.34 448 395.15 448C386.96 448 378.77 444.88 372.52 438.62L9.38 75.48C-3.12 62.98 -3.12 42.72 9.38 30.23L94.23 -54.62C100.48 -60.87 108.67 -63.99 116.85 -63.99C125.04 -63.99 133.23 -60.87 139.48 -54.62L502.62 308.53C515.12 321.01 515.12 341.28 502.62 353.77zM359.45 244.54L308.54 295.45L395.14 382.05L446.05 331.14L359.45 244.54z" />
-    <glyph glyph-name="magnet"
-      unicode="&#xF076;"
-      horiz-adv-x="512.1" d=" M164.1 288H12C5.4 288 0 293.4 0 300V380C0 399.9 16.1 416 36 416H140C159.9 416 176 399.9 176 380V300C176.1 293.4 170.7 288 164.1 288zM512.1 300V380.1C512.1 400 496 416.1 476.1 416.1H372.1C352.2000000000001 416.1 336.1 400 336.1 380.1V300.1C336.1 293.5 341.5 288.1 348.1 288.1H500.1C506.7 288 512.1 293.4 512.1 300zM348.1 256C341.5 256 336.1 250.6 336.1 244V192C336.1 63.9 176.1 64.1 176.1 192V244C176.1 250.6 170.7 256 164.1 256H12.1C5.4 256 0.1 250.6 0.1 243.9C0.2 222.5 0.7 203.6 0.1 190.6C0.1 40 136.3 -56 256.9 -56C377.5 -56 512 40 512 190.7C511.4 203.5 511.8 223.7 512 243.9C512 250.6 506.7 256 500 256H348.1z" />
-    <glyph glyph-name="male"
-      unicode="&#xF183;"
-      horiz-adv-x="192" d=" M96 448C131.346 448 160 419.346 160 384S131.346 320 96 320S32 348.654 32 384S60.654 448 96 448M144 304H132.64C109.929 293.557 83.05 293.106 59.36 304H48C21.49 304 0 282.51 0 256V120C0 106.745 10.745 96 24 96H40V-40C40 -53.255 50.745 -64 64 -64H128C141.255 -64 152 -53.255 152 -40V96H168C181.255 96 192 106.745 192 120V256C192 282.51 170.51 304 144 304z" />
-    <glyph glyph-name="map-marked-alt"
-      unicode="&#xF5A0;"
-      horiz-adv-x="576" d=" M288 448C218.41 448 162 391.5900000000001 162 322C162 265.74 244.35 163.2 275.9 125.98C282.29 118.44 293.72 118.44 300.1 125.98C331.65 163.2 414 265.74 414 322C414 391.5900000000001 357.59 448 288 448zM288 280C264.8 280 246 298.8 246 322S264.8 364 288 364S330 345.2 330 322S311.2 280 288 280zM20.12 232.05A32.006 32.006 0 0 1 0 202.34V-47.98C0 -59.3 11.43 -67.04 21.94 -62.84L160 0V233.08C151.16 249.06 143.93 264.62 138.75 279.5L20.12 232.05zM288 88.33C273.93 88.33 260.62 94.51 251.49 105.29C231.83 128.49 210.92 154.91 192 182.01V0.01L384 -63.99V182C365.08 154.91 344.18 128.48 324.51 105.28C315.38 94.51 302.07 88.33 288 88.33zM554.06 286.84L416 224V-64L555.88 -8.05A31.996 31.996 0 0 1 576 21.66V271.98C576 283.3 564.57 291.04 554.06 286.84z" />
-    <glyph glyph-name="map-marked"
-      unicode="&#xF59F;"
-      horiz-adv-x="576" d=" M288 448C218.41 448 162 391.5900000000001 162 322C162 265.74 244.35 163.2 275.9 125.98C282.29 118.44 293.72 118.44 300.1 125.98C331.65 163.2 414 265.74 414 322C414 391.5900000000001 357.59 448 288 448zM20.12 232.05A32.006 32.006 0 0 1 0 202.34V-47.98C0 -59.3 11.43 -67.04 21.94 -62.84L160 0V233.08C151.16 249.06 143.93 264.62 138.75 279.5L20.12 232.05zM288 88.33C273.93 88.33 260.62 94.51 251.49 105.29C231.83 128.49 210.92 154.91 192 182.01V0.01L384 -63.99V182C365.08 154.91 344.18 128.48 324.51 105.28C315.38 94.51 302.07 88.33 288 88.33zM554.06 286.84L416 224V-64L555.88 -8.05A31.996 31.996 0 0 1 576 21.66V271.98C576 283.3 564.57 291.04 554.06 286.84z" />
-    <glyph glyph-name="map-marker-alt"
-      unicode="&#xF3C5;"
-      horiz-adv-x="384" d=" M172.268 -53.67C26.97 156.969 0 178.587 0 256C0 362.039 85.961 448 192 448S384 362.039 384 256C384 178.587 357.03 156.969 211.732 -53.67C202.197 -67.444 181.802 -67.443 172.268 -53.67zM192 176C236.183 176 272 211.817 272 256S236.183 336 192 336S112 300.183 112 256S147.817 176 192 176z" />
-    <glyph glyph-name="map-marker"
-      unicode="&#xF041;"
-      horiz-adv-x="384" d=" M172.268 -53.67C26.97 156.969 0 178.587 0 256C0 362.039 85.961 448 192 448S384 362.039 384 256C384 178.587 357.03 156.969 211.732 -53.67C202.197 -67.444 181.802 -67.443 172.268 -53.67z" />
-    <glyph glyph-name="map-pin"
-      unicode="&#xF276;"
-      horiz-adv-x="320" d=" M192 147.187V-25.633L169.985 -58.656C165.235 -65.7809999999999 154.766 -65.7809999999999 150.016 -58.656L128 -25.633V147.187A162.221 162.221 0 0 1 192 147.187zM160 448C239.529 448 304 383.529 304 304S239.529 160 160 160S16 224.471 16 304S80.471 448 160 448M80 312C80 351.701 112.299 384 152 384A8 8 0 0 1 152 400C103.477 400 64 360.523 64 312A8 8 0 0 1 80 312z" />
-    <glyph glyph-name="map-signs"
-      unicode="&#xF277;"
-      horiz-adv-x="512" d=" M487.515 343.515L439.03 295.03A23.998000000000005 23.998000000000005 0 0 0 422.06 288.001H56C42.745 288.001 32 298.746 32 312.001V392C32 405.255 42.745 416 56 416H216V424C216 437.255 226.745 448 240 448H272C285.255 448 296 437.255 296 424V416H422.059A24 24 0 0 0 439.029 408.971L487.514 360.486C492.201 355.799 492.201 348.201 487.515 343.515zM216 80V-40C216 -53.255 226.745 -64 240 -64H272C285.255 -64 296 -53.255 296 -40V80H216zM456 224H296V272H216V224H89.941A24 24 0 0 1 72.971 216.971L24.486 168.486C19.8 163.8 19.8 156.202 24.486 151.515L72.971 103.03A23.998000000000005 23.998000000000005 0 0 1 89.941 96.001H456C469.255 96.001 480 106.746 480 120.001V200.001C480 213.255 469.255 224 456 224z" />
-    <glyph glyph-name="map"
-      unicode="&#xF279;"
-      horiz-adv-x="576" d=" M0 330.3400000000001V-15.98C0 -27.3 11.43 -35.04 21.94 -30.84L160 32V416L20.12 360.05A32.006 32.006 0 0 1 0 330.3400000000001zM192 32L384 -32V352L192 416V32zM554.06 414.8400000000001L416 352V-32L555.88 23.95A31.996 31.996 0 0 1 576 53.66V399.98C576 411.3 564.57 419.04 554.06 414.84z" />
-    <glyph glyph-name="marker"
-      unicode="&#xF5A1;"
-      horiz-adv-x="512" d=" M93.95 157.97A327.038 327.038 0 0 1 0.17 -37.11L0.14 -37.34C-1.56 -52.62 11.35 -65.5400000000001 26.63 -63.85A327.02000000000004 327.02000000000004 0 0 1 221.97 29.95L297.37 105.35L169.35 233.3700000000001L93.95 157.97zM485.49 421.49C450.14 456.84 392.82 456.84 357.4700000000001 421.49L335.7100000000001 399.73L299.1500000000001 436.28C283.5300000000001 451.9 258.2000000000001 451.9 242.5900000000001 436.28L138.47 332.16C132.22 325.91 132.22 315.78 138.47 309.53L161.09 286.91C167.34 280.66 177.47 280.66 183.72 286.91L270.87 374.06L290.46 354.4700000000001L191.98 256L320 127.98L485.49 293.4700000000001C520.84 328.8200000000001 520.84 386.13 485.49 421.49z" />
-    <glyph glyph-name="mars-double"
-      unicode="&#xF227;"
-      horiz-adv-x="512" d=" M340 448H261C250.3 448 245 435.1 252.5 427.5L269.4 410.6L220.7 361.9C198.5 375.9 172.2 384 144 384C64.5 384 0 319.5 0 240S64.5 96 144 96S288 160.5 288 240C288 268.2 279.9 294.5 265.9 316.7L314.6 365.4L331.5 348.5C333.8999999999999 346.1 337 345 339.8999999999999 345C346.0999999999999 345 352 349.8 352 357V436C352 442.6 346.6 448 340 448zM144 160C99.9 160 64 195.9 64 240S99.9 320 144 320S224 284.1 224 240S188.1 160 144 160zM500 288.1H421C410.3 288.1 405 275.2 412.5 267.6L429.4 250.7L380.7 202C362.5 213.4 341.7 220.9 319.2 223.3C317.1 201.5 311 180 300.8 160C301.9000000000001 160 303 160.1 304 160.1C348.1 160.1 384 124.2000000000001 384 80.1S348.1 0.1 304 0.1S224 36 224 80.1C224 81.2000000000001 224 82.3 224.1 83.3C204.1 73.1 182.6 66.9 160.8 64.9C168.4 -7.6 229.6 -64 304 -64C383.5 -64 448 0.5 448 80C448 108.2 439.9 134.5 425.9 156.7L474.6 205.4L491.4999999999999 188.5C493.8999999999999 186.1 496.8999999999999 185 499.8999999999999 185C506.0999999999999 185 511.9999999999999 189.8 511.9999999999999 197V276C511.9999999999999 282.7 506.6 288.1 499.9999999999999 288.1z" />
-    <glyph glyph-name="mars-stroke-h"
-      unicode="&#xF22B;"
-      horiz-adv-x="480" d=" M476.2 200.5L420.3 256.4C412.7 264 399.8 258.6 399.8 247.9V224H376V244C376 250.6 370.6 256 364 256H324C317.4 256 312 250.6 312 244V224H284.4C278.6 249.6 265.7 273.9 245.8 293.8C189.6 350 98.4 350 42.2 293.8C-14 237.6 -14 146.4 42.2 90.2000000000001C98.4 34.0000000000001 189.6 34.0000000000001 245.8 90.2000000000001C265.7 110.1 278.6 134.4 284.4000000000001 160.0000000000001H312V140.0000000000001C312 133.4 317.4 128.0000000000001 324 128.0000000000001H364C370.6 128.0000000000001 376 133.4 376 140.0000000000001V160.0000000000001H399.9V136.1000000000001C399.9 125.4000000000001 412.8 120.1000000000001 420.4 127.6000000000001L476.3 183.5000000000001C480.9 188.2000000000001 480.9 195.8000000000001 476.1999999999999 200.5000000000001zM200.6 135.4C169.4 104.2 118.7 104.2 87.5 135.4C56.3 166.6 56.3 217.3 87.5 248.5C118.7 279.7 169.4 279.7 200.6 248.5C231.8 217.4 231.8 166.6 200.6 135.4z" />
-    <glyph glyph-name="mars-stroke-v"
-      unicode="&#xF22A;"
-      horiz-adv-x="288" d=" M245.8 213.8C225.9 233.7 201.6 246.6 176 252.4V277.8H196C202.6 277.8 208 283.2000000000001 208 289.8V329.8C208 336.4 202.6 341.8 196 341.8H176V366.6H199.9C210.6 366.6 215.9 379.5 208.4 387.1L152.5 442.9C147.8 447.6 140.2 447.6 135.5 442.9L79.6 387C72 379.4 77.4 366.5 88.1 366.5H112V341.8H92C85.4 341.8 80 336.4 80 329.8V289.8C80 283.2000000000001 85.4 277.8 92 277.8H112V252.4C86.4 246.6 62.1 233.7 42.2 213.8C-14 157.6 -14 66.4 42.2 10.2C98.4 -45.9999999999999 189.6 -45.9999999999999 245.8 10.2C302.1 66.4 302.1 157.6 245.8 213.8000000000001zM200.6 55.4C169.4 24.2 118.7 24.2 87.5 55.4C56.3 86.6 56.3 137.3 87.5 168.5C118.7 199.7 169.4 199.7 200.6 168.5C231.8 137.4 231.8 86.6 200.6 55.4z" />
-    <glyph glyph-name="mars-stroke"
-      unicode="&#xF229;"
-      horiz-adv-x="384" d=" M372 384H293C282.3 384 277 371.1 284.5 363.5L301.4 346.6L283.9 329.1L269.8 343.2C265.1 347.9 257.5 347.9 252.8 343.2L224.5 315C219.8 310.3 219.8 302.7 224.5 298L238.6 283.9L220.6 265.9C198.4 279.9 172.1 288 143.9 288C64.5 288 0 223.5 0 144S64.5 0 144 0S288 64.5 288 144C288 172.2 279.9 198.5 265.9 220.7L283.9 238.7L298 224.6C302.7 219.9 310.3 219.9 315 224.6L343.3 252.9C348 257.6 348 265.2000000000001 343.3 269.9L329.2 284L346.7 301.5L363.6 284.6C371.2 277 384.1 282.4 384.1 293.1V372C384 378.6 378.6 384 372 384zM144 64C99.9 64 64 99.9 64 144S99.9 224 144 224S224 188.1 224 144S188.1 64 144 64z" />
-    <glyph glyph-name="mars"
-      unicode="&#xF222;"
-      horiz-adv-x="384" d=" M372 384H293C282.3 384 277 371.1 284.5 363.5L301.4 346.6L220.7 265.9C198.5 279.9 172.2 288 144 288C64.5 288 0 223.5 0 144S64.5 0 144 0S288 64.5 288 144C288 172.2 279.9 198.5 265.9 220.7L346.6 301.4L363.5 284.5C371.1 276.9 384 282.3 384 293V372C384 378.6 378.6 384 372 384zM144 64C99.9 64 64 99.9 64 144S99.9 224 144 224S224 188.1 224 144S188.1 64 144 64z" />
-    <glyph glyph-name="medal"
-      unicode="&#xF5A2;"
-      horiz-adv-x="512" d=" M223.75 317.25L154.62 432.46A31.997 31.997 0 0 1 127.18 448H16.03C3.08 448 -4.5 433.43 2.92 422.82L114.19 263.86C143.91 291.63 181.71 310.69 223.75 317.25zM495.97 448H384.82C373.58 448 363.16 442.1 357.38 432.46L288.25 317.25C330.29 310.69 368.0900000000001 291.63 397.81 263.87L509.08 422.82C516.5 433.43 508.92 448 495.97 448zM256 288C158.8 288 80 209.2 80 112S158.8 -64 256 -64S432 14.8 432 112S353.2 288 256 288zM348.52 130.74L310.59 93.78L319.56 41.5600000000001C321.1600000000001 32.2 311.3 25.0500000000001 302.9100000000001 29.4700000000001L256 54.12L209.1 29.47C200.7 25.02 190.85 32.21 192.45 41.56L201.42 93.78L163.49 130.74C156.67 137.38 160.44 148.97 169.84 150.3299999999999L222.27 157.9699999999999L245.7 205.4899999999999C247.81 209.7699999999999 251.89 211.8799999999999 255.98 211.8799999999999C260.09 211.8799999999999 264.2 209.7399999999999 266.31 205.4899999999999L289.74 157.9699999999999L342.17 150.3299999999999C351.57 148.9699999999999 355.3400000000001 137.38 348.5200000000001 130.74z" />
-    <glyph glyph-name="medkit"
-      unicode="&#xF0FA;"
-      horiz-adv-x="512" d=" M96 -32H416V320H384V368C384 394.51 362.51 416 336 416H176C149.49 416 128 394.51 128 368V320H96V-32zM192 352H320V320H192V352zM512 272V16C512 -10.51 490.51 -32 464 -32H448V320H464C490.51 320 512 298.51 512 272zM64 -32H48C21.49 -32 0 -10.51 0 16V272C0 298.51 21.49 320 48 320H64V-32zM352 176V144C352 135.163 344.837 128 336 128H288V80C288 71.163 280.837 64 272 64H240C231.163 64 224 71.163 224 80V128H176C167.163 128 160 135.163 160 144V176C160 184.837 167.163 192 176 192H224V240C224 248.837 231.163 256 240 256H272C280.837 256 288 248.837 288 240V192H336C344.837 192 352 184.837 352 176z" />
-    <glyph glyph-name="meh-blank"
-      unicode="&#xF5A4;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM168 208C150.3 208 136 222.3 136 240S150.3 272 168 272S200 257.7 200 240S185.7 208 168 208zM328 208C310.3 208 296 222.3 296 240S310.3 272 328 272S360 257.7 360 240S345.7 208 328 208z" />
-    <glyph glyph-name="meh-rolling-eyes"
-      unicode="&#xF5A5;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM88 224C88 248.3 101.7 269.2 121.6 280C120.9 277.4 120 274.8 120 272C120 254.3 134.3 240 152 240S184 254.3 184 272C184 274.8 183.1 277.4 182.4 280C202.3 269.2 216 248.3 216 224C216 188.7 187.3 160 152 160S88 188.7 88 224zM312 48H184C162.8 48 162.8 80 184 80H312C333.2 80 333.2 48 312 48zM344 160C308.7 160 280 188.7 280 224C280 248.3 293.7 269.2 313.6 280C312.9000000000001 277.4 312 274.8 312 272C312 254.3 326.3 240 344 240S376 254.3 376 272C376 274.8 375.1 277.4 374.4 280C394.3 269.2 408 248.3 408 224C408 188.7 379.3 160 344 160z" />
-    <glyph glyph-name="meh"
-      unicode="&#xF11A;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM168 272C185.7 272 200 257.7 200 240S185.7 208 168 208S136 222.3 136 240S150.3 272 168 272zM344 80H152C130.8 80 130.8 112 152 112H344C365.2 112 365.2 80 344 80zM328 208C310.3 208 296 222.3 296 240S310.3 272 328 272S360 257.7 360 240S345.7 208 328 208z" />
-    <glyph glyph-name="memory"
-      unicode="&#xF538;"
-      horiz-adv-x="640" d=" M640 317.06V352C640 369.67 625.67 384 608 384H32C14.33 384 0 369.67 0 352V317.06C18.6 310.45 32 292.87 32 272S18.6 233.55 0 226.94V128H640V226.94C621.4 233.55 608 251.13 608 272S621.4 310.45 640 317.06zM224 192H160V320H224V192zM352 192H288V320H352V192zM480 192H416V320H480V192zM0 0H64V26.67C64 35.51 71.16 42.67 80 42.67S96 35.51 96 26.67V0H224V26.67C224 35.51 231.16 42.67 240 42.67S256 35.51 256 26.67V0H384V26.67C384 35.51 391.1600000000001 42.67 400 42.67S416 35.51 416 26.67V0H544V26.67C544 35.51 551.16 42.67 560 42.67S576 35.51 576 26.67V0H640V96H0V0z" />
-    <glyph glyph-name="mercury"
-      unicode="&#xF223;"
-      horiz-adv-x="288" d=" M288 240C288 284.2 268.1 323.7 236.8 350.1C239.3 351.9 241.7 353.9 244 355.9C268.7 377.1 283.8 404.7 287.2 434.7C288.1 441.8 282.5 448 275.3 448H234.8C229 448 224.1 443.9 223 438.2C220.6 425.7 213.4 413.9 202.3 404.4C187 391.2 166.3 384 144 384S101 391.2 85.6 404.4C74.5 413.9 67.4 425.7 64.9 438.2C63.8 443.9 58.9 448 53.2 448H12.7C5.5 448 -0.1 441.8 0.8 434.7C4.2 404.6 19.2 377 44 355.8C46.3 353.8 48.7 351.9 51.2 350C19.9 323.7 0 284.2 0 240C0 171.5 47.9 114.1 112 99.6V48H76C69.4 48 64 42.6 64 36V-4C64 -10.6 69.4 -16 76 -16H112V-52C112 -58.6 117.4 -64 124 -64H164C170.6 -64 176 -58.6 176 -52V-16H212C218.6 -16 224 -10.6 224 -4V36C224 42.6 218.6 48 212 48H176V99.6C240.1 114.1 288 171.5 288 240.0000000000001zM64 240C64 284.1 99.9 320 144 320S224 284.1 224 240S188.1 160 144 160S64 195.9 64 240z" />
-    <glyph glyph-name="microchip"
-      unicode="&#xF2DB;"
-      horiz-adv-x="512" d=" M416 400V-16C416 -42.51 394.51 -64 368 -64H144C117.49 -64 96 -42.51 96 -16V400C96 426.51 117.49 448 144 448H368C394.51 448 416 426.51 416 400zM512 342V330A6 6 0 0 0 506 324H488V318A6 6 0 0 0 482 312H440V360H482A6 6 0 0 0 488 354V348H506A6 6 0 0 0 512 342zM512 246V234A6 6 0 0 0 506 228H488V222A6 6 0 0 0 482 216H440V264H482A6 6 0 0 0 488 258V252H506A6 6 0 0 0 512 246zM512 150V138A6 6 0 0 0 506 132H488V126A6 6 0 0 0 482 120H440V168H482A6 6 0 0 0 488 162V156H506A6 6 0 0 0 512 150zM512 54V42A6 6 0 0 0 506 36H488V30A6 6 0 0 0 482 24H440V72H482A6 6 0 0 0 488 66V60H506A6 6 0 0 0 512 54zM30 72H72V24H30A6 6 0 0 0 24 30V36H6A6 6 0 0 0 0 42V54A6 6 0 0 0 6 60H24V66A6 6 0 0 0 30 72zM30 168H72V120H30A6 6 0 0 0 24 126V132H6A6 6 0 0 0 0 138V150A6 6 0 0 0 6 156H24V162A6 6 0 0 0 30 168zM30 264H72V216H30A6 6 0 0 0 24 222V228H6A6 6 0 0 0 0 234V246A6 6 0 0 0 6 252H24V258A6 6 0 0 0 30 264zM30 360H72V312H30A6 6 0 0 0 24 318V324H6A6 6 0 0 0 0 330V342A6 6 0 0 0 6 348H24V354A6 6 0 0 0 30 360z" />
-    <glyph glyph-name="microphone-alt-slash"
-      unicode="&#xF539;"
-      horiz-adv-x="640" d=" M633.82 -10.1L476.26 111.67C488.74 135.79 496 163.02 496 192V240C496 248.84 488.84 256 480 256H464C455.16 256 448 248.84 448 240V192C448 174.08 444.04 157.2 437.28 141.8L410.73 162.32C413.83 171.72 416.01 181.54 416.01 191.99H372.3399999999999L330.94 223.99H416V255.99H330.67C324.7800000000001 255.99 320 259.5700000000001 320 263.99V279.99C320 284.41 324.78 287.99 330.67 287.99H416V319.99H330.67C324.7800000000001 319.99 320 323.57 320 327.99V343.99C320 348.4100000000001 324.78 351.99 330.67 351.99H416C416 405.01 373.02 447.99 320 447.99S224 405.01 224 351.99V306.63L45.47 444.63C38.49 450.05 28.43 448.8 23.01 441.82L3.37 416.55C-2.05 409.58 -0.8 399.53 6.18 394.1L594.54 -60.63C601.52 -66.0599999999999 611.5699999999999 -64.7999999999999 617 -57.82L636.64 -32.55C642.05 -25.58 640.8 -15.53 633.8199999999999 -10.1zM400 -16H344V17.78C355.71 19.4 367.1 22.0599999999999 377.96 25.86L327.56 64.8199999999999C320.85 64.42 314.15 63.9499999999999 307.21 64.62C251.36 70.0699999999999 208.47 113.25 196.03 166.4699999999999L144 206.69V199.84C144 110.2 207.97 30.29 296 18.15V-16H240C231.16 -16 224 -23.16 224 -32V-48C224 -56.84 231.16 -64 240 -64H400C408.84 -64 416 -56.84 416 -48V-32C416 -23.16 408.84 -16 400 -16z" />
-    <glyph glyph-name="microphone-alt"
-      unicode="&#xF3C9;"
-      horiz-adv-x="352" d=" M336 256H320C311.1600000000001 256 304 248.84 304 240V192C304 117.2 239.51 57.18 163.21 64.62C96.71 71.11 48 130.89 48 197.7V240C48 248.84 40.84 256 32 256H16C7.16 256 0 248.84 0 240V199.84C0 110.2 63.97 30.29 152 18.15V-16H96C87.16 -16 80 -23.16 80 -32V-48C80 -56.84 87.16 -64 96 -64H256C264.84 -64 272 -56.84 272 -48V-32C272 -23.16 264.84 -16 256 -16H200V17.77C285.71 29.53 352 103.1 352 192V240C352 248.84 344.84 256 336 256zM176 96C229.02 96 272 138.98 272 192H186.67C180.78 192 176 195.58 176 200V216C176 220.42 180.78 224 186.67 224H272V256H186.67C180.78 256 176 259.5800000000001 176 264V280C176 284.42 180.78 288 186.67 288H272V320H186.67C180.78 320 176 323.58 176 328V344C176 348.42 180.78 352 186.67 352H272C272 405.02 229.02 448 176 448S80 405.02 80 352V192C80 138.98 122.98 96 176 96z" />
-    <glyph glyph-name="microphone-slash"
-      unicode="&#xF131;"
-      horiz-adv-x="640" d=" M633.82 -10.1L476.02 111.86C488.61 135.87 496 162.99 496 192V240C496 248.84 488.84 256 480 256H464C455.16 256 448 248.84 448 240V192C448 174.08 444.04 157.2 437.28 141.8L410.73 162.32C413.83 171.72 416.01 181.54 416.01 191.99V352C416.01 405.02 373.0299999999999 448 320.01 448S224.0099999999999 405.02 224.0099999999999 352V306.64L45.47 444.63C38.49 450.05 28.43 448.8 23.01 441.82L3.37 416.55C-2.05 409.58 -0.8 399.53 6.18 394.1L594.54 -60.63C601.52 -66.0599999999999 611.5699999999999 -64.7999999999999 617 -57.82L636.64 -32.55C642.05 -25.58 640.8 -15.53 633.8199999999999 -10.1zM400 -16H344V17.77C355.6600000000001 19.37 366.85 22.31 377.67 26.08L327.56 64.81C320.85 64.41 314.15 63.94 307.21 64.61C251.36 70.06 208.47 113.24 196.03 166.46L144 206.69V199.84C144 110.2 207.97 30.29 296 18.15V-16H240C231.16 -16 224 -23.16 224 -32V-48C224 -56.84 231.16 -64 240 -64H400C408.84 -64 416 -56.84 416 -48V-32C416 -23.16 408.84 -16 400 -16z" />
-    <glyph glyph-name="microphone"
-      unicode="&#xF130;"
-      horiz-adv-x="352" d=" M176 96C229.02 96 272 138.98 272 192V352C272 405.02 229.02 448 176 448S80 405.02 80 352V192C80 138.98 122.98 96 176 96zM336 256H320C311.1600000000001 256 304 248.84 304 240V192C304 117.2 239.51 57.18 163.21 64.62C96.71 71.11 48 130.89 48 197.7V240C48 248.84 40.84 256 32 256H16C7.16 256 0 248.84 0 240V199.84C0 110.2 63.97 30.29 152 18.15V-16H96C87.16 -16 80 -23.16 80 -32V-48C80 -56.84 87.16 -64 96 -64H256C264.84 -64 272 -56.84 272 -48V-32C272 -23.16 264.84 -16 256 -16H200V17.77C285.71 29.53 352 103.1 352 192V240C352 248.84 344.84 256 336 256z" />
-    <glyph glyph-name="minus-circle"
-      unicode="&#xF056;"
-      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM124 152C117.4 152 112 157.4 112 164V220C112 226.6 117.4 232 124 232H388C394.6 232 400 226.6 400 220V164C400 157.4 394.6 152 388 152H124z" />
-    <glyph glyph-name="minus-square"
-      unicode="&#xF146;"
-      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM92 152C85.4 152 80 157.4 80 164V220C80 226.6 85.4 232 92 232H356C362.6 232 368 226.6 368 220V164C368 157.4 362.6 152 356 152H92z" />
-    <glyph glyph-name="minus"
-      unicode="&#xF068;"
-      horiz-adv-x="448" d=" M416 240H32C14.33 240 0 225.67 0 208V176C0 158.33 14.33 144 32 144H416C433.67 144 448 158.33 448 176V208C448 225.67 433.67 240 416 240z" />
-    <glyph glyph-name="mobile-alt"
-      unicode="&#xF3CD;"
-      horiz-adv-x="320" d=" M272 448H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H272C298.5 -64 320 -42.5 320 -16V400C320 426.5 298.5 448 272 448zM160 -32C142.3 -32 128 -17.7 128 0S142.3 32 160 32S192 17.7 192 0S177.7 -32 160 -32zM272 76C272 69.4 266.6 64 260 64H60C53.4 64 48 69.4 48 76V388C48 394.6 53.4 400 60 400H260C266.6 400 272 394.6 272 388V76z" />
-    <glyph glyph-name="mobile"
-      unicode="&#xF10B;"
-      horiz-adv-x="320" d=" M272 448H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H272C298.5 -64 320 -42.5 320 -16V400C320 426.5 298.5 448 272 448zM160 -32C142.3 -32 128 -17.7 128 0S142.3 32 160 32S192 17.7 192 0S177.7 -32 160 -32z" />
-    <glyph glyph-name="money-bill-alt"
-      unicode="&#xF3D1;"
-      horiz-adv-x="640" d=" M352 160H336V248C336 252.42 332.42 256 328 256H314.42C309.68 256 305.05 254.6 301.11 251.97L285.7800000000001 241.75A7.993999999999999 7.993999999999999 0 0 1 283.56 230.66L292.44 217.35A7.993999999999999 7.993999999999999 0 0 1 303.53 215.13L304 215.44V160H288C283.58 160 280 156.42 280 152V136C280 131.58 283.58 128 288 128H352C356.42 128 360 131.58 360 136V152C360 156.42 356.42 160 352 160zM608 384H32C14.33 384 0 369.67 0 352V32C0 14.33 14.33 0 32 0H608C625.67 0 640 14.33 640 32V352C640 369.67 625.67 384 608 384zM48 48V112C83.35 112 112 83.35 112 48H48zM48 272V336H112C112 300.65 83.35 272 48 272zM320 80C266.98 80 224 130.15 224 192C224 253.86 266.98 304 320 304S416 253.86 416 192C416 130.13 373 80 320 80zM592 48H528C528 83.35 556.65 112 592 112V48zM592 272C556.65 272 528 300.65 528 336H592V272z" />
-    <glyph glyph-name="money-bill-wave-alt"
-      unicode="&#xF53B;"
-      horiz-adv-x="640" d=" M621.16 393.54C582.37 409.81 543.55 416 504.75 416C381.58 416.01 258.42 353.66 135.25 353.66C104.36 353.66 73.49 357.58 42.6 367.38C39.13 368.48 35.65 369 32.25 369C15.04 369 0 355.68 0 337.19V19.93C0 7.3 7.23 -4.67 18.84 -9.53C57.63 -25.81 96.45 -32 135.25 -32C258.42 -32 381.5900000000001 30.35 504.76 30.35C535.65 30.35 566.52 26.43 597.41 16.63C600.88 15.53 604.36 15.01 607.76 15.01C624.97 15.01 640.01 28.33 640.01 46.82V364.07C640 376.71 632.77 388.67 621.16 393.54zM320 96C275.81 96 240 138.99 240 192C240 245.02 275.82 288 320 288S400 245.02 400 192C400 138.97 364.17 96 320 96z" />
-    <glyph glyph-name="money-bill-wave"
-      unicode="&#xF53A;"
-      horiz-adv-x="640" d=" M621.16 393.54C582.37 409.81 543.55 416 504.75 416C381.58 416.01 258.42 353.66 135.25 353.66C104.36 353.66 73.49 357.58 42.6 367.38C39.13 368.48 35.65 369 32.25 369C15.04 369 0 355.68 0 337.19V19.93C0 7.3 7.23 -4.67 18.84 -9.53C57.63 -25.81 96.45 -32 135.25 -32C258.42 -32 381.5900000000001 30.35 504.76 30.35C535.65 30.35 566.52 26.43 597.41 16.63C600.88 15.53 604.36 15.01 607.76 15.01C624.97 15.01 640.01 28.33 640.01 46.82V364.07C640 376.71 632.77 388.67 621.16 393.54zM48 315.78C68.12 310.74 89.12 308.2100000000001 110.72 306.85C104.84 277.4600000000001 79 255.31 48 255.31V315.78zM48 30.78V78.56C82.37 78.56 110.18 51.29 111.71 17.16C89.18 18.97 68.12 23.47 48 30.78zM320 96C275.81 96 240 138.99 240 192C240 245.02 275.82 288 320 288S400 245.02 400 192C400 138.97 364.17 96 320 96zM592 68.22C574.48 72.61 556.29 75.0700000000001 537.68 76.66C543.55 102.74 565.18 122.54 592 125.9400000000001V68.22zM592 304.3300000000001C561.11 308.24 537.14 334.0300000000001 536.19 365.8800000000001C555.73 363.7100000000001 574.2800000000001 359.6500000000001 592 353.2200000000001V304.3300000000001z" />
-    <glyph glyph-name="money-bill"
-      unicode="&#xF0D6;"
-      horiz-adv-x="640" d=" M608 384H32C14.33 384 0 369.67 0 352V32C0 14.33 14.33 0 32 0H608C625.67 0 640 14.33 640 32V352C640 369.67 625.67 384 608 384zM48 48V112C83.35 112 112 83.35 112 48H48zM48 272V336H112C112 300.65 83.35 272 48 272zM320 96C275.81 96 240 138.99 240 192C240 245.02 275.82 288 320 288S400 245.02 400 192C400 138.97 364.17 96 320 96zM592 48H528C528 83.35 556.65 112 592 112V48zM592 272C556.65 272 528 300.65 528 336H592V272z" />
-    <glyph glyph-name="money-check-alt"
-      unicode="&#xF53D;"
-      horiz-adv-x="640" d=" M608 416H32C14.33 416 0 401.67 0 384V0C0 -17.67 14.33 -32 32 -32H608C625.67 -32 640 -17.67 640 0V384C640 401.67 625.67 416 608 416zM176 120.12V104C176 99.58 172.42 96 168 96H152C147.58 96 144 99.58 144 104V120.29C132.71 120.87 121.73 124.81 112.63 131.6400000000001C108.73 134.5700000000001 108.53 140.41 112.06 143.78L123.81 154.99C126.58 157.63 130.7 157.75 133.94 155.72C137.81 153.3 142.2 152 146.76 152H174.87C181.37 152 186.67 157.92 186.67 165.19C186.67 171.14 183.06 176.38 177.9 177.92L132.9 191.42C114.31 197 101.32 214.84 101.32 234.81C101.32 259.3300000000001 120.37 279.25 143.99 279.88V296C143.99 300.42 147.57 304 151.99 304H167.99C172.41 304 175.99 300.42 175.99 296V279.7100000000001C187.28 279.13 198.26 275.2000000000001 207.36 268.36C211.26 265.43 211.46 259.5900000000001 207.93 256.2200000000001L196.18 245.01C193.41 242.3700000000001 189.29 242.2500000000001 186.05 244.2800000000001C182.18 246.7100000000001 177.79 248.0000000000001 173.23 248.0000000000001H145.12C138.62 248.0000000000001 133.32 242.0800000000001 133.32 234.8100000000001C133.32 228.8600000000001 136.93 223.62 142.09 222.0800000000001L187.09 208.5800000000001C205.68 203 218.67 185.16 218.67 165.1900000000001C218.67 140.6600000000001 199.62 120.7500000000001 176 120.1200000000001zM416 136C416 131.58 412.42 128 408 128H296C291.58 128 288 131.58 288 136V152C288 156.42 291.58 160 296 160H408C412.42 160 416 156.42 416 152V136zM576 136C576 131.58 572.42 128 568 128H488C483.58 128 480 131.58 480 136V152C480 156.42 483.58 160 488 160H568C572.42 160 576 156.42 576 152V136zM576 232C576 227.58 572.42 224 568 224H296C291.58 224 288 227.58 288 232V248C288 252.42 291.58 256 296 256H568C572.42 256 576 252.42 576 248V232z" />
-    <glyph glyph-name="money-check"
-      unicode="&#xF53C;"
-      horiz-adv-x="640" d=" M0 0C0 -17.67 14.33 -32 32 -32H608C625.67 -32 640 -17.67 640 0V320H0V0zM448 208C448 216.84 455.16 224 464 224H560C568.84 224 576 216.84 576 208V176C576 167.16 568.84 160 560 160H464C455.16 160 448 167.16 448 176V208zM448 88C448 92.42 451.58 96 456 96H568C572.42 96 576 92.42 576 88V72C576 67.58 572.42 64 568 64H456C451.58 64 448 67.58 448 72V88zM64 184C64 188.42 67.58 192 72 192H376C380.42 192 384 188.42 384 184V168C384 163.58 380.42 160 376 160H72C67.58 160 64 163.58 64 168V184zM64 88C64 92.42 67.58 96 72 96H248C252.42 96 256 92.42 256 88V72C256 67.58 252.42 64 248 64H72C67.58 64 64 67.58 64 72V88zM624 416H16C7.16 416 0 408.8400000000001 0 400V352H640V400C640 408.8400000000001 632.84 416 624 416z" />
-    <glyph glyph-name="monument"
-      unicode="&#xF5A6;"
-      horiz-adv-x="384" d=" M368 0H16C7.16 0 0 -7.16 0 -16V-48C0 -56.84 7.16 -64 16 -64H368C376.84 -64 384 -56.84 384 -48V-16C384 -7.16 376.84 0 368 0zM289.14 347.26A31.97 31.97 0 0 1 279.93 366.7L203.31 443.31C197.06 449.56 186.93 449.56 180.68 443.31L104.08 366.7A31.97 31.97 0 0 1 94.87 347.26L64 32H320L289.14 347.26zM240 140.8C240 134.4 233.6 128 227.2 128H156.8C150.4 128 144 134.4 144 140.8V179.2C144 185.6 150.4 192 156.8 192H227.2C233.6 192 240 185.6 240 179.2V140.8z" />
-    <glyph glyph-name="moon"
-      unicode="&#xF186;"
-      horiz-adv-x="512" d=" M283.211 -64C362.173 -64 434.29 -28.075 482.068 30.792C489.136 39.5000000000001 481.429 52.222 470.506 50.1420000000001C346.303 26.4880000000001 232.244 121.7180000000001 232.244 247.0960000000001C232.244 319.3180000000001 270.906 385.7310000000001 333.742 421.4900000000001C343.428 427.0020000000001 340.992 441.6870000000001 329.986 443.7200000000001A258.156 258.156 0 0 1 283.211 448C141.902 448 27.211 333.4890000000001 27.211 192C27.211 50.691 141.722 -64 283.211 -64z" />
-    <glyph glyph-name="mortar-pestle"
-      unicode="&#xF5A7;"
-      horiz-adv-x="512" d=" M501.54 387.0900000000001C518.76 404.31 514.0500000000001 433.3400000000001 492.27 444.23A35.696 35.696 0 0 1 454.9 440.86L251.09 288H402.4600000000001L501.54 387.0900000000001zM496 256H16C7.16 256 0 248.84 0 240V208C0 199.16 7.16 192 16 192H32C32 111.02 82.2 41.89 153.13 13.68C140.37 -3.19 131.41 -23.12 128.18 -45.01C126.72 -54.93 134.22 -63.99 144.25 -63.99H367.75C377.78 -63.99 385.28 -54.93 383.82 -45.01C380.6 -23.12 371.64 -3.19 358.87 13.68C429.8 41.89 480 111.02 480 192H496C504.84 192 512 199.16 512 208V240C512 248.84 504.84 256 496 256z" />
-    <glyph glyph-name="motorcycle"
-      unicode="&#xF21C;"
-      horiz-adv-x="640" d=" M512.949 255.997C498.0869999999999 256.105 483.809 253.675 470.515 249.123L437.589 304H520C533.255 304 544 314.745 544 328V360C544 373.255 533.255 384 520 384H474.689A24 24 0 0 1 456.85 376.055L419.3540000000001 334.392L396.5800000000001 372.348A24 24 0 0 1 376 384H296C287.163 384 280 376.837 280 368V352C280 343.163 287.163 336 296 336H362.411L381.611 304H227.904C210.177 327.073 182.98 344 128 344H72.54C59.085 344 47.749 332.9890000000001 48.004 319.536C48.252 306.495 58.9 296 72 296H128C152.504 296 166.686 285.081 175.787 271.231L164.496 250.702C151.49 254.567 137.625 256.438 123.245 255.912C55.857 253.451 1.565 198.395 0.034 130.979C-1.603 58.924 56.317 0 128 0C187.642 0 237.744 40.794 251.953 96H336.189C349.862 96 360.778 107.421 360.165 121.077C358.0470000000001 168.197 377.687 214.742 416.35 246.103L428.8350000000001 225.295C401.189 201.641 383.7380000000001 166.415 384.004 127.116C384.4740000000001 57.56 441.207 0.664 510.762 0.006C582.391 -0.672 640.601 57.493 639.996 129.105C639.408 198.696 582.5409999999999 255.491 512.949 255.997zM128 48C83.888 48 48 83.888 48 128S83.888 208 128 208C132.242 208 136.405 207.659 140.469 207.018L98.97 131.566C90.187 115.593 101.762 96 120 96H201.297C188.927 67.775 160.737 48 128 48zM516.351 48.116C470.272 45.663 432 82.446 432 128C432 149.363 440.4340000000001 168.781 454.125 183.144L503.537 100.792C508.083 93.215 517.912 90.758 525.489 95.304L539.2090000000001 103.5360000000001C546.7860000000001 108.0820000000001 549.243 117.9110000000001 544.6970000000001 125.4880000000001L496.1410000000001 206.4150000000001A80.005 80.005 0 0 0 512 208C557.554 208 594.338 169.727 591.884 123.648C589.724 83.09 556.91 50.276 516.351 48.116z" />
-    <glyph glyph-name="mouse-pointer"
-      unicode="&#xF245;"
-      horiz-adv-x="320" d=" M302.189 118.874H196.105L251.936 -17.119C255.825 -26.547 251.381 -37.118 242.492 -41.118L193.327 -62.545C184.162 -66.5450000000001 173.884 -61.974 169.995 -52.831L116.942 76.305L30.278 -12.8330000000001C18.729 -24.71 0 -15.554 0 0.023V429.701C0 446.101 19.921 454.096 30.277 442.557L314.689 150.0150000000001C326.161 138.8360000000001 317.696 118.874 302.189 118.874z" />
-    <glyph glyph-name="music"
-      unicode="&#xF001;"
-      horiz-adv-x="512" d=" M470.4 446.5L166.4 350.5C153.1 346.3 144 334 144 320V55.4C129.9 60.8 113.5 64 96 64C43 64 0 35.3 0 0S43 -64 96 -64S192 -35.3 192 0V227.5L464 313.4V119.4C449.9 124.8 433.5 128 416 128C363 128 320 99.3 320 64S363 0 416 0S512 28.7 512 64V416C512 437.7 490.9 453 470.4 446.5z" />
-    <glyph glyph-name="neuter"
-      unicode="&#xF22C;"
-      horiz-adv-x="288" d=" M288 272C288 351.5 223.5 416 144 416S0 351.5 0 272C0 203.5 47.9 146.1 112 131.6V-20C112 -26.6 117.4 -32 124 -32H164C170.6 -32 176 -26.6 176 -20V131.6C240.1 146.1 288 203.5 288 272zM144 192C99.9 192 64 227.9 64 272S99.9 352 144 352S224 316.1 224 272S188.1 192 144 192z" />
-    <glyph glyph-name="newspaper"
-      unicode="&#xF1EA;"
-      horiz-adv-x="576" d=" M552 384H88C74.745 384 64 373.255 64 360V352H24C10.745 352 0 341.255 0 328V56C0 25.072 25.072 0 56 0H528C554.51 0 576 21.49 576 48V360C576 373.255 565.255 384 552 384zM56 48A8 8 0 0 0 48 56V304H64V56A8 8 0 0 0 56 48zM292 64H140C133.373 64 128 69.373 128 76V84C128 90.627 133.373 96 140 96H292C298.627 96 304 90.627 304 84V76C304 69.373 298.627 64 292 64zM500 64H348C341.373 64 336 69.373 336 76V84C336 90.627 341.373 96 348 96H500C506.627 96 512 90.627 512 84V76C512 69.373 506.627 64 500 64zM292 160H140C133.373 160 128 165.373 128 172V180C128 186.627 133.373 192 140 192H292C298.627 192 304 186.627 304 180V172C304 165.373 298.627 160 292 160zM500 160H348C341.373 160 336 165.373 336 172V180C336 186.627 341.373 192 348 192H500C506.627 192 512 186.627 512 180V172C512 165.373 506.627 160 500 160zM500 256H140C133.373 256 128 261.373 128 268V308C128 314.627 133.373 320 140 320H500C506.627 320 512 314.627 512 308V268C512 261.373 506.627 256 500 256z" />
-    <glyph glyph-name="not-equal"
-      unicode="&#xF53E;"
-      horiz-adv-x="448" d=" M416 240C433.67 240 448 254.33 448 272V304C448 321.67 433.67 336 416 336H392.12L443.99 402.81C449.36 409.83 448.0300000000001 419.87 441.02 425.24L415.61 444.7C408.5900000000001 450.08 398.55 448.74 393.17 441.73L311.09 336H32C14.33 336 0 321.67 0 304V272C0 254.33 14.33 240 32 240H236.56L162.03 144H32C14.33 144 0 129.67 0 112V80C0 62.33 14.33 48 32 48H87.49L35.62 -18.81C30.25 -25.82 31.58 -35.86 38.59 -41.24L64 -60.7C71.02 -66.08 81.06 -64.74 86.43 -57.73L168.52 48H416C433.67 48 448 62.33 448 80V112C448 129.67 433.67 144 416 144H243.05L317.5800000000001 240H416z" />
-    <glyph glyph-name="notes-medical"
-      unicode="&#xF481;"
-      horiz-adv-x="384" d=" M336 384H256C256 419.3 227.3 448 192 448S128 419.3 128 384H48C21.5 384 0 362.5 0 336V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V336C384 362.5 362.5 384 336 384zM192 408C205.3 408 216 397.3 216 384S205.3 360 192 360S168 370.7 168 384S178.7 408 192 408zM288 104C288 99.6 284.4 96 280 96H224V40C224 35.6 220.4 32 216 32H168C163.6 32 160 35.6 160 40V96H104C99.6 96 96 99.6 96 104V152C96 156.4 99.6 160 104 160H160V216C160 220.4 163.6 224 168 224H216C220.4 224 224 220.4 224 216V160H280C284.4 160 288 156.4 288 152V104zM288 296C288 291.6 284.4 288 280 288H104C99.6 288 96 291.6 96 296V312C96 316.4 99.6 320 104 320H280C284.4 320 288 316.4 288 312V296z" />
-    <glyph glyph-name="object-group"
-      unicode="&#xF247;"
-      horiz-adv-x="512" d=" M480 320V352H500C506.627 352 512 357.373 512 364V404C512 410.627 506.627 416 500 416H460C453.373 416 448 410.627 448 404V384H64V404C64 410.627 58.627 416 52 416H12C5.373 416 0 410.627 0 404V364C0 357.373 5.373 352 12 352H32V32H12C5.373 32 0 26.627 0 20V-20C0 -26.627 5.373 -32 12 -32H52C58.627 -32 64 -26.627 64 -20V0H448V-20C448 -26.627 453.373 -32 460 -32H500C506.627 -32 512 -26.627 512 -20V20C512 26.627 506.627 32 500 32H480V320zM96 172V308C96 314.627 101.373 320 108 320H276C282.627 320 288 314.627 288 308V172C288 165.373 282.627 160 276 160H108C101.373 160 96 165.373 96 172zM416 76C416 69.373 410.627 64 404 64H236C229.373 64 224 69.373 224 76V128H296C309.255 128 320 138.745 320 152V224H404C410.627 224 416 218.627 416 212V76z" />
-    <glyph glyph-name="object-ungroup"
-      unicode="&#xF248;"
-      horiz-adv-x="576" d=" M64 128V102A6 6 0 0 0 58 96H6A6 6 0 0 0 0 102V154A6 6 0 0 0 6 160H32V352H6A6 6 0 0 0 0 358V410A6 6 0 0 0 6 416H58A6 6 0 0 0 64 410V384H352V410A6 6 0 0 0 358 416H410A6 6 0 0 0 416 410V358A6 6 0 0 0 410 352H384V160H410A6 6 0 0 0 416 154V102A6 6 0 0 0 410 96H358A6 6 0 0 0 352 102V128H64zM544 192V224H570A6 6 0 0 1 576 230V282A6 6 0 0 1 570 288H518A6 6 0 0 1 512 282V256H408V184H416C429.255 184 440 173.255 440 160V96C440 82.745 429.255 72 416 72H352C338.745 72 328 82.745 328 96V104H192V32H166A6 6 0 0 1 160 26V-26A6 6 0 0 1 166 -32H218A6 6 0 0 1 224 -26V0H512V-26A6 6 0 0 1 518 -32H570A6 6 0 0 1 576 -26V26A6 6 0 0 1 570 32H544V192z" />
-    <glyph glyph-name="outdent"
-      unicode="&#xF03B;"
-      horiz-adv-x="448" d=" M0 364V404C0 412.837 7.163 420 16 420H432C440.837 420 448 412.837 448 404V364C448 355.163 440.837 348 432 348H16C7.163 348 0 355.163 0 364zM208 220H432C440.837 220 448 227.163 448 236V276C448 284.837 440.837 292 432 292H208C199.163 292 192 284.837 192 276V236C192 227.163 199.163 220 208 220zM16 -36H432C440.837 -36 448 -28.837 448 -20V20C448 28.837 440.837 36 432 36H16C7.163 36 0 28.837 0 20V-20C0 -28.837 7.163 -36 16 -36zM208 92H432C440.837 92 448 99.163 448 108V148C448 156.837 440.837 164 432 164H208C199.163 164 192 156.837 192 148V108C192 99.163 199.163 92 208 92zM4.687 180.687L100.687 84.703C110.734 74.652 128 81.776 128 96.016V287.992C128 302.3210000000001 110.675 309.296 100.687 299.305L4.687 203.313C-1.562 197.065 -1.562 186.935 4.687 180.687z" />
-    <glyph glyph-name="paint-brush"
-      unicode="&#xF1FC;"
-      horiz-adv-x="512" d=" M167.02 138.66C126.9 136.0800000000001 90.49 120.8 69.83 66.36C67.48 60.15 61.83 56.38 55.24 56.38C44.13 56.38 9.78 84.05 -0.01 90.73C0 8.38 37.93 -64 128 -64C203.86 -64 256 -20.23 256 56.19C256 59.3 255.35 62.27 255.03 65.32L167.02 138.66zM457.89 448C442.73 448 428.52 441.29 417.68 431.55C213.27 248.95 192 244.66 192 190.91C192 177.21 195.25 164.15 200.73 152.21L264.55 99.03C271.76 97.23 279.19 96.0000000000001 286.94 96.0000000000001C349.05 96.0000000000001 385.05 141.47 498.1 352.4600000000001C505.48 366.8100000000001 512 382.3100000000001 512 398.4500000000001C512 427.36 486 448 457.89 448z" />
-    <glyph glyph-name="paint-roller"
-      unicode="&#xF5AA;"
-      horiz-adv-x="512" d=" M416 320V416C416 433.67 401.67 448 384 448H32C14.33 448 0 433.67 0 416V320C0 302.33 14.33 288 32 288H384C401.67 288 416 302.3300000000001 416 320zM448 384V256C448 238.33 433.67 224 416 224H256C220.65 224 192 195.35 192 160V128C174.33 128 160 113.67 160 96V-32C160 -49.67 174.33 -64 192 -64H256C273.67 -64 288 -49.67 288 -32V96C288 113.67 273.67 128 256 128V160H416C469.02 160 512 202.98 512 256V320C512 355.35 483.35 384 448 384z" />
-    <glyph glyph-name="palette"
-      unicode="&#xF53F;"
-      horiz-adv-x="512" d=" M204.3 443C104.9 423.6 24.8 343.7 5.2 244.6C-31.8 57.6 136.9 -81.7999999999999 264 -62.1C305.2 -55.7 325.4 -7.5 306.5 29.6C283.4 74.9999999999999 316.4 128 367.4 128H447.1C482.9 128 511.9 157.6 512 193.3C511.5 350.9 368.1 474.9 204.3 443zM96 128C78.3 128 64 142.3 64 160S78.3 192 96 192S128 177.7 128 160S113.7 128 96 128zM128 256C110.3 256 96 270.3 96 288S110.3 320 128 320S160 305.7 160 288S145.7 256 128 256zM256 320C238.3 320 224 334.3 224 352S238.3 384 256 384S288 369.7 288 352S273.7 320 256 320zM384 256C366.3 256 352 270.3 352 288S366.3 320 384 320S416 305.7 416 288S401.7 256 384 256z" />
-    <glyph glyph-name="pallet"
-      unicode="&#xF482;"
-      horiz-adv-x="640" d=" M144 192H496C504.8 192 512 199.2 512 208V432C512 440.8 504.8 448 496 448H384V320L320 352L256 320V448H144C135.2 448 128 440.8 128 432V208C128 199.2 135.2 192 144 192zM624 64C632.8 64 640 71.2 640 80V112C640 120.8 632.8 128 624 128H16C7.2 128 0 120.8 0 112V80C0 71.2 7.2 64 16 64H64V0H16C7.2 0 0 -7.2 0 -16V-48C0 -56.8 7.2 -64 16 -64H624C632.8 -64 640 -56.8 640 -48V-16C640 -7.2 632.8 0 624 0H576V64H624zM288 0H128V64H288V0zM512 0H352V64H512V0z" />
-    <glyph glyph-name="paper-plane"
-      unicode="&#xF1D8;"
-      horiz-adv-x="512" d=" M476 444.8L12.5 177.4C-5.6 167 -3.3 141.8 14.7 134.2L121 89.6L408.3 342.8C413.8 347.7000000000001 421.6 340.2000000000001 416.9000000000001 334.5L176 41V-39.5C176 -63.1 204.5 -72.4 218.5 -55.3L282 22L406.6 -30.2C420.8 -36.2 437 -27.3 439.6 -12L511.6 420C515 440.2 493.3 454.8 476 444.8z" />
-    <glyph glyph-name="paperclip"
-      unicode="&#xF0C6;"
-      horiz-adv-x="448" d=" M43.246 -18.142C-15.184 42.147 -14.095 139.369 44.632 199.439L254.392 414C298.708 459.332 370.743 459.336 415.063 414C458.953 369.106 459.006 296.671 415.063 251.724L232.214 64.872C202.359 34.335 153.581 34.761 124.232 65.87C95.957 95.84 96.864 143.343 125.684 172.823L269.427 319.658C275.6090000000001 325.972 285.7390000000001 326.08 292.053 319.899L314.914 297.52C321.229 291.338 321.336 281.208 315.155 274.894L171.427 128.073C166.495 123.028 166.191 114.645 170.779 109.781C175.151 105.1469999999999 182.024 105.0699999999999 186.467 109.6159999999999L369.316 296.467C388.929 316.529 388.929 349.1919999999999 369.305 369.265C350.116 388.892 319.348 388.902 300.151 369.265L90.39 154.705C55.627 119.145 55.091 61.585 89.199 26.392C123.209 -8.701 178.184 -8.745 212.257 26.106L384.317 202.105C390.4940000000001 208.424 400.624 208.538 406.943 202.361L429.82 179.997C436.139 173.82 436.254 163.69 430.076 157.3710000000001L258.016 -18.627C198.44 -79.5649999999999 102.073 -78.843 43.246 -18.1419999999999z" />
-    <glyph glyph-name="parachute-box"
-      unicode="&#xF4CD;"
-      horiz-adv-x="512" d=" M511.9 273C502.8 348.6 433.5 405.4 353.6 431.7C390 392.3 416 331.1 416 256H444.1L327.5 126.5C325 127.1 322.7 128 320 128H272V256H384C384 371.2 315.1 448 256 448S128 371.2 128 256H240V128H192C189.3 128 187 127.1 184.5 126.5L67.9 256H96C96 331.1 122 392.3 158.4 431.7C78.5 405.3 9.2 348.5 0.1 273C-1 263.9 6.9 256 16.1 256H24.8L161.5 104.1C160.8 101.5 159.9 98.9 159.9 96V-32C159.9 -49.7 174.2 -64 191.9 -64H319.9C337.6 -64 351.9 -49.7 351.9 -32V96C351.9 98.9 351 101.4 350.3 104.1L487.1 256H495.8C505.1 256 513 263.8 511.9 273z" />
-    <glyph glyph-name="paragraph"
-      unicode="&#xF1DD;"
-      horiz-adv-x="448" d=" M408 416H177.531C88.948 416 16.045 344.665 16 256.082C15.956 167.679 87.607 96 176 96V-8C176 -21.255 186.745 -32 200 -32H232C245.255 -32 256 -21.255 256 -8V336H288V-8C288 -21.255 298.745 -32 312 -32H344C357.255 -32 368 -21.255 368 -8V336H408C421.255 336 432 346.745 432 360V392C432 405.255 421.255 416 408 416z" />
-    <glyph glyph-name="parking"
-      unicode="&#xF540;"
-      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM240 128H192V80C192 71.2 184.8 64 176 64H144C135.2 64 128 71.2 128 80V304C128 312.8 135.2 320 144 320H240C292.9 320 336 276.9 336 224S292.9 128 240 128zM240 256H192V192H240C257.6 192 272 206.4 272 224S257.6 256 240 256z" />
-    <glyph glyph-name="passport"
-      unicode="&#xF5AB;"
-      horiz-adv-x="448" d=" M129.62 272H168.71C170.2 299.03 175.25 323.35 182.92 342.41C155.21 329.17 134.9 303.2200000000001 129.62 272zM129.62 240C134.91 208.78 155.21 182.83 182.92 169.59C175.24 188.65 170.2 212.97 168.71 240.0000000000001H129.62zM224 161.31C231.69 168.76 244.77 195.73 247.43 240H200.56C203.23 195.74 216.31 168.76 224 161.31zM200.57 272H247.44C244.78 316.26 231.7 343.24 224.01 350.69C216.31 343.24 203.23 316.26 200.57 272zM265.08 169.59C292.79 182.8300000000001 313.1 208.78 318.38 240.0000000000001H279.29C277.8 212.97 272.76 188.65 265.08 169.59zM416 448H64C28.65 448 0 419.35 0 384V0C0 -35.35 28.65 -64 64 -64H416C433.67 -64 448 -49.67 448 -32V416C448 433.67 433.67 448 416 448zM336 32H112C103.2 32 96 39.2 96 48S103.2 64 112 64H336C344.8 64 352 56.8 352 48S344.8 32 336 32zM224 128C153.31 128 96 185.31 96 256S153.31 384 224 384S352 326.69 352 256S294.69 128 224 128zM265.08 342.41C272.76 323.35 277.8 299.03 279.29 272H318.38C313.1 303.2200000000001 292.79 329.17 265.08 342.41z" />
-    <glyph glyph-name="paste"
-      unicode="&#xF0EA;"
-      horiz-adv-x="448" d=" M128 264C128 294.879 153.122 320 184 320H320V392C320 405.255 309.255 416 296 416H215.39C204.306 435.11 183.637 448 160 448S115.694 435.11 104.61 416H24C10.745 416 0 405.255 0 392V56C0 42.745 10.745 32 24 32H128V264zM160 408C173.255 408 184 397.255 184 384S173.255 360 160 360S136 370.745 136 384S146.745 408 160 408zM344 160H448V-40C448 -53.255 437.255 -64 424 -64H184C170.745 -64 160 -53.255 160 -40V264C160 277.255 170.745 288 184 288H320V184C320 170.8 330.8 160 344 160zM448 198.059V192H352V288H358.0590000000001A24 24 0 0 0 375.029 280.971L440.9700000000001 215.03A24.002000000000002 24.002000000000002 0 0 0 448 198.059z" />
-    <glyph glyph-name="pause-circle"
-      unicode="&#xF28B;"
-      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM240 112C240 103.2 232.8 96 224 96H176C167.2 96 160 103.2 160 112V272C160 280.8 167.2 288 176 288H224C232.8 288 240 280.8 240 272V112zM352 112C352 103.2 344.8 96 336 96H288C279.2 96 272 103.2 272 112V272C272 280.8 279.2 288 288 288H336C344.8 288 352 280.8 352 272V112z" />
-    <glyph glyph-name="pause"
-      unicode="&#xF04C;"
-      horiz-adv-x="448" d=" M144 -31H48C21.5 -31 0 -9.5 0 17V369C0 395.5 21.5 417 48 417H144C170.5 417 192 395.5 192 369V17C192 -9.5 170.5 -31 144 -31zM448 17V369C448 395.5 426.5 417 400 417H304C277.5 417 256 395.5 256 369V17C256 -9.5 277.5 -31 304 -31H400C426.5 -31 448 -9.5 448 17z" />
-    <glyph glyph-name="paw"
-      unicode="&#xF1B0;"
-      horiz-adv-x="512" d=" M85.231 117.042C36 117.042 0 174.208 0 216.5C0 244.792 16 274.5420000000001 49.538 274.5420000000001C98.769 274.5420000000001 134.769 217.084 134.769 174.792C134.769 146.5 119.077 117.042 85.231 117.042zM433.231 10.875C433.231 -26.167 401.231 -32 369.846 -32C328.615 -32 295.384 -5.75 256 -5.75C214.769 -5.75 179.692 -31.708 135.077 -31.708C105.23 -31.708 78.769 -22.083 78.769 10.875C78.769 80 180.616 182.667 256 182.667S433.231 79.708 433.231 10.875zM182.462 244.208C132.615 244.208 102.462 303.708 102.462 344.541C102.462 377.208 120.308 416 160 416C210.154 416 240 356.5 240 315.6670000000001C240 283 222.154 244.208 182.462 244.208zM272 315.6670000000001C272 356.5 301.846 416 352 416C391.692 416 409.539 377.208 409.539 344.5420000000001C409.539 303.709 379.385 244.209 329.538 244.209C289.846 244.208 272 283 272 315.6670000000001zM512 216.5C512 174.208 476 117.042 426.769 117.042C392.9220000000001 117.042 377.231 146.5 377.231 174.792C377.231 217.083 413.23 274.5420000000001 462.462 274.5420000000001C496 274.5420000000001 512 244.792 512 216.5z" />
-    <glyph glyph-name="pen-alt"
-      unicode="&#xF305;"
-      horiz-adv-x="512" d=" M497.94 373.83L437.83 433.94C419.08 452.69 388.67 452.69 369.92 433.94L313.37 377.39L441.39 249.37L497.94 305.92C516.69 324.67 516.69 355.0700000000001 497.94 373.8300000000001zM251.14 394.36C235.52 409.98 210.2 409.98 194.58 394.36L75.8 275.57C69.55 269.32 69.55 259.19 75.8 252.95L98.43 230.32C104.68 224.07 114.81 224.07 121.06 230.32L222.88 332.14L245.51 309.52L93.95 157.97A327.038 327.038 0 0 1 0.17 -37.11L0.14 -37.34C-1.56 -52.62 11.35 -65.5400000000001 26.63 -63.85A327.02000000000004 327.02000000000004 0 0 1 221.97 29.95L418.76 226.74L335.99 309.51L251.14 394.36z" />
-    <glyph glyph-name="pen-fancy"
-      unicode="&#xF5AC;"
-      horiz-adv-x="512" d=" M79.18 165.06A32.005 32.005 0 0 1 58.94 144.82L0 -32L4.69 -36.69L97.58 56.2C96.92 58.76 96.01 61.23 96.01 64C96.01 81.67 110.34 96 128.01 96S160.01 81.67 160.01 64S145.68 32 128.01 32C125.24 32 122.77 32.91 120.21 33.57L27.32 -59.32L32 -64L208.82 -5.06A31.982999999999997 31.982999999999997 0 0 1 229.06 15.18L262.13 99.25L163.25 198.13L79.18 165.06zM369.25 419.68L186.14 220.19L283.99 122.34L483.48 305.4500000000001C568.4 380.52 443.73 503.94 369.25 419.68z" />
-    <glyph glyph-name="pen-nib"
-      unicode="&#xF5AD;"
-      horiz-adv-x="512" d=" M136.6 309.2100000000001A64.003 64.003 0 0 1 93.29 267.86L0 -12L14.69 -26.69L164.8 123.42C161.81 129.68 160 136.6 160 144C160 170.51 181.49 192 208 192S256 170.51 256 144S234.51 96 208 96C200.6 96 193.68 97.81 187.42 100.8L37.31 -49.31L52 -64L331.86 29.29A64.003 64.003 0 0 1 373.2100000000001 72.6L416 224L288 352L136.6 309.2100000000001zM497.9399999999999 373.8300000000001L437.83 433.94C419.08 452.69 388.67 452.69 369.92 433.94L313.37 377.39L441.39 249.37L497.94 305.92C516.69 324.67 516.69 355.0700000000001 497.94 373.8300000000001z" />
-    <glyph glyph-name="pen-square"
-      unicode="&#xF14B;"
-      horiz-adv-x="448" d=" M400 -32H48C21.5 -32 0 -10.5 0 16V368C0 394.5 21.5 416 48 416H400C426.5 416 448 394.5 448 368V16C448 -10.5 426.5 -32 400 -32zM238.1 270.1L102.4 134.4L96.1 77.3C95.3 69.6999999999999 101.7 63.1999999999999 109.4 63.9999999999999L166.5 70.3L302.2 206C304.5 208.3 304.5 212.1 302.2 214.5L246.7 270C244.2 272.4 240.4 272.4 238.1 270.1zM345 282.9L314.9 313C305.5 322.4 290.3 322.4 281 313L257.9 289.9C255.6 287.6 255.6 283.8 257.9 281.4L313.4 225.9C315.7 223.6 319.5 223.6 321.9 225.9L345 249C354.3 258.3 354.3 273.5 345 282.9z" />
-    <glyph glyph-name="pen"
-      unicode="&#xF304;"
-      horiz-adv-x="512" d=" M290.74 354.76L418.76 226.74L140.77 -51.25L26.63 -63.85C11.35 -65.54 -1.56 -52.62 0.14 -37.34L12.84 76.88L290.74 354.76zM497.94 373.82L437.83 433.93C419.08 452.68 388.67 452.68 369.92 433.93L313.37 377.38L441.39 249.36L497.94 305.9100000000001C516.69 324.67 516.69 355.0700000000001 497.94 373.8200000000001z" />
-    <glyph glyph-name="pencil-alt"
-      unicode="&#xF303;"
-      horiz-adv-x="512" d=" M497.9 305.9L451.8 259.8C447.1 255.1 439.5 255.1 434.8 259.8L323.8 370.8C319.1 375.5 319.1 383.1 323.8 387.8L369.9 433.9000000000001C388.6 452.6 419 452.6 437.8 433.9000000000001L497.9 373.8C516.6999999999999 355.1 516.6999999999999 324.7000000000001 497.9 305.9zM284.2 348.2L21.6 85.6L0.4 -35.9C-2.5 -52.3 11.8 -66.5 28.2 -63.7L149.7 -42.4L412.3 220.2000000000001C417 224.9 417 232.5000000000001 412.3 237.2000000000001L301.3 348.2000000000001C296.5 352.9000000000001 288.9000000000001 352.9000000000001 284.2 348.2000000000001zM124.1 108.1C118.6 113.6 118.6 122.4 124.1 127.9L278.1 281.9000000000001C283.6 287.4000000000001 292.4000000000001 287.4000000000001 297.9000000000001 281.9000000000001S303.4000000000001 267.6 297.9000000000001 262.1L143.9 108.1C138.4 102.6 129.6 102.6 124.1 108.1zM88 24H136V-12.3L71.5 -23.6L40.4 7.5L51.7 72H88V24z" />
-    <glyph glyph-name="pencil-ruler"
-      unicode="&#xF5AE;"
-      horiz-adv-x="512" d=" M109.46 203.96L244.04 338.52L199.92 382.64L138.24 320.9600000000001A7.919 7.919 0 0 0 127.03 320.9600000000001L115.82 332.17C112.72 335.27 112.72 340.29 115.82 343.38L177.5 405.06L143.86 438.7100000000001C131.47 451.1 111.39 451.1 99 438.71L9.29 349C-3.09 336.61 -3.1 316.53 9.29 304.14L109.46 203.96zM497.93 320.76C516.69 339.52 516.6800000000001 369.93 497.93 388.69L452.68 433.94C433.92 452.7 403.5 452.7 384.73 433.94L338.7100000000001 387.93L451.91 274.73L497.93 320.76zM316.08 365.29L19.08 68.33L0.32 -39.11C-2.21 -53.6 10.41 -66.22 24.91 -63.67L132.36 -44.83L429.28 252.1L316.08 365.29zM502.71 79.86L469.07 113.5L407.39 51.82C404.29 48.72 399.27 48.72 396.18 51.82L384.9700000000001 63.03C381.8800000000001 66.13 381.8800000000001 71.15 384.9700000000001 74.24L446.6500000000001 135.92L402.5100000000001 180.06L267.93 45.5L368.14 -54.7C380.53 -67.09 400.61 -67.09 413 -54.7L502.71 35C515.1 47.39 515.1 67.47 502.71 79.86z" />
-    <glyph glyph-name="people-carry"
-      unicode="&#xF4CE;"
-      horiz-adv-x="640" d=" M128 352C154.5 352 176 373.5 176 400S154.5 448 128 448S80 426.5 80 400S101.5 352 128 352zM512 352C538.5 352 560 373.5 560 400S538.5 448 512 448S464 426.5 464 400S485.5 352 512 352zM637.7 -20.1L593.7 89.9L552.6 43.5L550.6 25.3L578.3000000000001 -43.9C583.3000000000001 -56.4 595.3000000000001 -64 608.0000000000001 -64C612.0000000000001 -64 616.0000000000001 -63.3 619.9000000000001 -61.7C636.3000000000001 -55.1 644.3000000000001 -36.5 637.7 -20.1zM603.5 189.7L585 269.9C580.4 289.9 566.4 306.7 547.5 314.8C529 322.8 508.5 321.5 491.4 311.5C468.7 298.1 451.7 277 443.3 252.1L432 218.2L416 208V304C416 312.8 408.8 320 400 320H240C231.2 320 224 312.8 224 304V208L207.9 218.2L196.6 252.1C188.3 277.1 171.2 298.1 148.5 311.5C131.3 321.5 110.9 322.8 92.4 314.8C73.5 306.7000000000001 59.5 289.9 54.9 269.9L36.5 189.7C31.9 169.7 37.2 148.5 50.9 133L118.1 57.1L128.2 -35.5C130 -51.8 143.8 -64 160 -64C161.2 -64 162.3 -63.9 163.5 -63.8C181.1 -61.9 193.7 -46.1 191.8 -28.5L181.7 64.3C180.2 77.3 174.8 89.4 166.1 99.3L122.8 148.3L140.4 218.6L147.2000000000001 198.2C151.3000000000001 185.7000000000001 159.1000000000001 174.8 171.7000000000001 165.6L222.8000000000001 133.1C227.4000000000001 130.2000000000001 234.9000000000001 128.5 240.0000000000001 128.1H400C405.1 128.5 412.6 130.2000000000001 417.2 133.1L468.3 165.6C480.9 174.8 488.7 185.6 492.8 198.2L499.6 218.6L517.2 148.3L473.9 99.3C465.2 89.4 459.8 77.3 458.3 64.3L448.2 -28.5C446.3 -46.1 459 -61.9 476.5 -63.8C477.7 -63.9 478.8 -64 480 -64C496.1 -64 510 -51.9 511.8 -35.5L521.9 57.1L589.1 133C602.7 148.5 608.1 169.7 603.5 189.7zM46.3 89.9L2.3 -20.1C-4.3 -36.5 3.7 -55.1 20.1 -61.7C36.9 -68.3000000000001 55.2 -60.0000000000001 61.7 -43.9L89.4 25.3L87.4 43.4999999999999L46.3 89.8999999999999z" />
-    <glyph glyph-name="percent"
-      unicode="&#xF295;"
-      horiz-adv-x="448" d=" M112 224C173.9 224 224 274.1 224 336S173.9 448 112 448S0 397.9 0 336S50.1 224 112 224zM112 384C138.5 384 160 362.5 160 336S138.5 288 112 288S64 309.5 64 336S85.5 384 112 384zM336 160C274.1 160 224 109.9 224 48S274.1 -64 336 -64S448 -13.9 448 48S397.9 160 336 160zM336 0C309.5 0 288 21.5 288 48S309.5 96 336 96S384 74.5 384 48S362.5 0 336 0zM392.3 447.8L423.9000000000001 447.9C443.3 448 454.8 426.1 443.6 410.1L77.4 -53.6A23.95 23.95 0 0 0 57.8 -63.8L24.4 -63.9C4.9 -63.9 -6.5 -42.0000000000001 4.7 -26.1L372.7 437.6C377.2 444 384.5 447.8 392.3 447.8z" />
-    <glyph glyph-name="percentage"
-      unicode="&#xF541;"
-      horiz-adv-x="384" d=" M109.25 274.75C134.24 299.74 134.24 340.27 109.25 365.26C84.26 390.25 43.73 390.25 18.74 365.26C-6.25 340.27 -6.25 299.74 18.74 274.75C43.74 249.75 84.26 249.75 109.25 274.75zM365.25 109.26C340.26 134.25 299.73 134.25 274.74 109.26C249.75 84.27 249.75 43.74 274.74 18.75C299.73 -6.24 340.26 -6.24 365.25 18.75C390.25 43.74 390.25 84.26 365.25 109.26zM363.31 340.69L340.69 363.31C328.19 375.81 307.93 375.81 295.44 363.31L20.69 88.56C8.19 76.06 8.19 55.8 20.69 43.31L43.31 20.69C55.81 8.19 76.07 8.19 88.56 20.69L363.31 295.44C375.81 307.93 375.81 328.19 363.31 340.69z" />
-    <glyph glyph-name="phone-slash"
-      unicode="&#xF3DD;"
-      horiz-adv-x="640" d=" M268.2 66.6L218.6 127.2000000000001C211.8 135.5000000000001 200.4 138.3000000000001 190.6 134.1L78.6 86.1C67.9 81.5 62.1 70 64.7 58.6L88.7 -45.4C91.2 -56.2 100.8 -64 112.1 -64C212.8 -64 305.8 -31.6 381.8 22.9L301.8 84.7C290.9 78.2 279.7 72 268.2 66.6zM633.8 -10.1L475.1 112.5C537.9 191.6 576 291.1 576 400C576 411.2 568.3 420.9 557.4 423.4L453.4 447.4C442.1 450 430.5 444.1 425.9 433.5L377.9 321.5C373.7 311.7 376.5 300.2 384.8 293.5L445.4 243.9C433.2 217.8 417.5 193.6 399.4 171.1L45.5 444.6C38.5 450 28.5 448.8 23 441.8L3.4 416.6C-2 409.6 -0.8 399.6 6.2 394.2L594.6 -60.5C601.6 -65.9 611.6 -64.7 617.1 -57.7L636.7 -32.4C642.1 -25.6 640.8000000000001 -15.5 633.8000000000001 -10.1z" />
-    <glyph glyph-name="phone-square"
-      unicode="&#xF098;"
-      horiz-adv-x="448" d=" M400 416H48C21.49 416 0 394.51 0 368V16C0 -10.51 21.49 -32 48 -32H400C426.51 -32 448 -10.51 448 16V368C448 394.51 426.51 416 400 416zM94 32C86.967 32 80.943 36.873 79.384 43.627L64.386 108.627A15 15 0 0 0 73.093 125.787L143.091 155.7860000000001A15 15 0 0 0 160.609 151.4970000000001L191.606 113.6120000000001C240.55 136.5750000000001 279.903 176.4700000000001 302.387 224.3920000000001L264.501 255.3890000000001A15.000999999999998 15.000999999999998 0 0 0 260.212 272.9070000000001L290.212 342.9050000000001A15 15 0 0 0 307.372 351.6120000000001L372.372 336.6140000000001A14.997000000000002 14.997000000000002 0 0 0 384 322C384 161.708 254.055 32 94 32z" />
-    <glyph glyph-name="phone-volume"
-      unicode="&#xF2A0;"
-      horiz-adv-x="384" d=" M97.333 -58.966C-32.541 70.908 -32.348 281.286 97.333 410.967C103.031 416.665 111.86 417.599 118.596 413.389L183.413 372.876A17.187 17.187 0 0 0 190.262 351.918L157.854 270.897A17.188 17.188 0 0 0 140.185 260.178L84.375 265.7580000000001C63.324 207.497 63.763 143.287 84.375 86.2430000000001L140.186 91.8240000000001A17.188 17.188 0 0 0 157.855 81.1050000000001L190.263 0.0830000000001A17.188 17.188 0 0 0 183.414 -20.8749999999999L118.597 -61.3879999999999A17.19 17.19 0 0 0 97.333 -58.9659999999998zM247.126 352.527C258.9580000000001 332.48 258.9580000000001 307.519 247.126 287.472C243.176 280.779 234.018 279.513 228.408 284.891L222.433 290.617C218.522 294.365 217.64 300.239 220.172 305.027A32.063 32.063 0 0 1 220.172 334.972C217.6390000000001 339.76 218.522 345.634 222.433 349.382L228.408 355.108C234.0180000000001 360.486 243.176 359.22 247.126 352.527zM338.913 443.714C399.053 372.11 399.005 267.832 338.913 196.286C334.439 190.959 326.3830000000001 190.54 321.361 195.353L315.563 200.91C311.003 205.281 310.586 212.439 314.633 217.289C364.32 276.827 364.279 363.222 314.633 422.711C310.586 427.561 311.002 434.719 315.563 439.09L321.361 444.647C326.383 449.46 334.439 449.041 338.913 443.714zM292.9410000000001 398.773C328.9910000000001 352.451 329.0490000000001 287.624 292.9410000000001 241.227C288.5510000000001 235.586 280.2440000000001 234.976 275.0850000000001 239.923L269.2670000000001 245.502C264.8670000000001 249.721 264.2690000000001 256.597 267.9820000000001 261.433C294.5180000000001 295.997 294.516 344.005 267.9820000000001 378.567C264.269 383.403 264.867 390.278 269.2670000000001 394.4980000000001L275.0850000000001 400.077C280.2440000000001 405.024 288.5510000000001 404.414 292.9410000000001 398.773z" />
-    <glyph glyph-name="phone"
-      unicode="&#xF095;"
-      horiz-adv-x="512" d=" M493.4 423.4L389.4 447.4C378.1 450 366.5 444.1 361.9 433.5L313.9 321.5C309.7 311.7 312.5 300.2 320.8 293.5L381.4 243.9C345.4 167.2 282.5 103.4 204.2 66.7000000000001L154.6 127.3000000000001C147.8 135.6000000000001 136.4 138.4000000000001 126.6 134.2000000000001L14.6 86.2000000000001C3.9 81.5 -2 69.9 0.6 58.6L24.6 -45.4C27.1 -56.2 36.7 -64 48 -64C304.1 -64 512 143.5 512 400C512 411.2 504.3 420.9 493.4 423.4z" />
-    <glyph glyph-name="piggy-bank"
-      unicode="&#xF4D3;"
-      horiz-adv-x="576" d=" M560 224H530.5C521.7 244 508.9 261.7 493.1 276.5L512 352H480C450.6 352 424.6 338.5 407 317.7C399.4 318.8 391.9 320 384 320H256C178.6 320 114.1 265 99.2 192H56C41.2 192 29.5 205.5 32.5 220.8C34.7 232.2 45.4 240 57 240H58C61.3 240 64 242.7 64 246V266C64 269.3 61.3 272 58 272C29.5 272 4.1 251.6 0.5 223.4C-3.9 189.2 22.7 160 56 160H96C96 107.8 121.4 61.9 160 32.7V-48C160 -56.8 167.2 -64 176 -64H240C248.8 -64 256 -56.8 256 -48V0H384V-48C384 -56.8 391.2 -64 400 -64H464C472.8 -64 480 -56.8 480 -48V32.7C491.8 41.6 502.3 52.1 511.3 64H560C568.8 64 576 71.2 576 80V208C576 216.8 568.8 224 560 224zM432 160C423.2 160 416 167.2 416 176S423.2 192 432 192S448 184.8 448 176S440.8 160 432 160zM256 352H384C389.4 352 394.7 351.6 399.9 351.2C399.9 351.5 400 351.7 400 352C400 405 357 448 304 448S208 405 208 352C208 349.9 208.5 347.9 208.6 345.8C223.8 349.7 239.6 352 256 352z" />
-    <glyph glyph-name="pills"
-      unicode="&#xF484;"
-      horiz-adv-x="576" d=" M112 416C50.1 416 0 365.9 0 304V80C0 18.1 50.1 -32 112 -32S224 18.1 224 80V304C224 365.9 173.9 416 112 416zM160 192H64V304C64 330.5 85.5 352 112 352S160 330.5 160 304V192zM299.7 221.7C296.2 225.2 290.3 224.8 287.4 220.9C242.1 158.4 247 70.8 303.3 14.5C359.6 -41.8 447.2 -46.7 509.6999999999999 -1.4C513.6999999999999 1.5 513.9999999999999 7.4 510.4999999999999 10.9L299.7 221.7zM529.5 240.7C473.2 297 385.6 301.9 323.1 256.6C319.1 253.7 318.8 247.8 322.3 244.3L533.1 33.5C536.6 30 542.5 30.4 545.4 34.3C590.6999999999999 96.9 585.9 184.4 529.5 240.7z" />
-    <glyph glyph-name="plane-arrival"
-      unicode="&#xF5AF;"
-      horiz-adv-x="640" d=" M624 0H16C7.16 0 0 -7.16 0 -16V-48C0 -56.84 7.16 -64 16 -64H624C632.84 -64 640 -56.84 640 -48V-16C640 -7.16 632.84 0 624 0zM44.81 242.34L133.55 162.34A62.60699999999999 62.60699999999999 0 0 1 159.02 148.41L446.62 70.0600000000001C473.1 62.8500000000001 501.18 61.34 527.62 68.7000000000001C557.29 76.97 571.06 89.91 574.87 104.41C578.7 118.91 573.14 137.12 551.5 159.37C532.22 179.19 507.15 192.16 480.67 199.37L383.1600000000001 225.93L282.8 417.78C281.29 423.59 276.85 428.13 271.14 429.69L206.05 447.42C195.49 450.3 185.15 442.1 185.34 430.98L233.26 266.77L131.06 294.61L103.47 362.49C101.54 367.38 97.46 371.06 92.45 372.42L52.72 383.25C42.38 386.07 32.19 378.25 32 367.37L32.23 265.5900000000001C32.42 256.68 38.26 248.25 44.81 242.34z" />
-    <glyph glyph-name="plane-departure"
-      unicode="&#xF5B0;"
-      horiz-adv-x="640" d=" M624 0H16C7.16 0 0 -7.16 0 -16V-48C0 -56.84 7.16 -64 16 -64H624C632.84 -64 640 -56.84 640 -48V-16C640 -7.16 632.84 0 624 0zM80.55 106.73C86.83 99.89 95.65 96.01 104.88 96.02L235.42 96.2000000000001A65.62 65.62 0 0 1 265.06 103.3200000000001L556.02 250.9700000000001C582.76 264.5400000000001 606.73 283.9100000000001 623.04 309.2800000000001C641.3499999999999 337.7600000000001 643.3399999999999 358.3700000000001 636.11 372.9300000000001C628.9 387.5000000000001 611.37 398.2000000000001 577.86 400.3800000000001C548.01 402.3200000000001 518.32 394.4600000000001 491.58 380.9000000000001L393.0700000000001 330.9100000000001L174.3700000000001 412.9700000000001A17.799 17.799 0 0 1 156.3700000000001 414.0800000000001L90.62 380.71C79.95 375.3 77.37 361.06 85.45 352.18L241.67 254.08L138.46 201.7L66.11 238.17A17.804 17.804 0 0 1 50.04 238.15L9.91 217.78C-0.53 212.48 -3.28 198.66 4.34 189.7L80.55 106.73z" />
-    <glyph glyph-name="plane"
-      unicode="&#xF072;"
-      horiz-adv-x="576" d=" M480 256H365.71L260.61 439.94A16.014 16.014 0 0 1 246.71 448H181.21C170.58 448 162.91 437.83 165.83 427.61L214.86 256H112L68.8 313.6C65.78 317.63 61.03 320 56 320H16.01C5.6 320 -2.04 310.2200000000001 0.49 300.12L32 192L0.49 83.88C-2.04 73.78 5.6 64 16.01 64H56C61.04 64 65.78 66.37 68.8 70.4L112 128H214.86L165.83 -43.6C162.91 -53.82 170.58 -64 181.21 -64H246.71C252.45 -64 257.75 -60.92 260.6 -55.94L365.71 128H480C515.35 128 576 156.65 576 192S515.35 256 480 256z" />
-    <glyph glyph-name="play-circle"
-      unicode="&#xF144;"
-      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM371.7 168L195.7 67C179.9 58.2 160 69.5 160 88V296C160 314.4 179.8 325.8 195.7 317L371.7 210C388.1 200.8 388.1 177.1 371.7 168z" />
-    <glyph glyph-name="play"
-      unicode="&#xF04B;"
-      horiz-adv-x="448" d=" M424.4 233.3L72.4 441.4C43.8 458.3 0 441.9 0 400.1V-16C0 -53.5 40.7 -76.1 72.4 -57.3L424.4 150.7C455.8 169.2 455.9 214.8 424.4 233.3z" />
-    <glyph glyph-name="plug"
-      unicode="&#xF1E6;"
-      horiz-adv-x="384" d=" M256 304V416C256 433.673 270.327 448 288 448S320 433.673 320 416V304H256zM368 288H16C7.163 288 0 280.837 0 272V240C0 231.163 7.163 224 16 224H32V192C32 114.594 86.969 50.029 160 35.204V-64H224V35.204C297.031 50.029 352 114.594 352 192V224H368C376.837 224 384 231.163 384 240V272C384 280.837 376.837 288 368 288zM128 304V416C128 433.673 113.673 448 96 448S64 433.673 64 416V304H128z" />
-    <glyph glyph-name="plus-circle"
-      unicode="&#xF055;"
-      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM400 164C400 157.4 394.6 152 388 152H296V60C296 53.4 290.6 48 284 48H228C221.4 48 216 53.4 216 60V152H124C117.4 152 112 157.4 112 164V220C112 226.6 117.4 232 124 232H216V324C216 330.6 221.4 336 228 336H284C290.6 336 296 330.6 296 324V232H388C394.6 232 400 226.6 400 220V164z" />
-    <glyph glyph-name="plus-square"
-      unicode="&#xF0FE;"
-      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416zM368 164C368 157.4 362.6 152 356 152H264V60C264 53.4 258.6 48 252 48H196C189.4 48 184 53.4 184 60V152H92C85.4 152 80 157.4 80 164V220C80 226.6 85.4 232 92 232H184V324C184 330.6 189.4 336 196 336H252C258.6 336 264 330.6 264 324V232H356C362.6 232 368 226.6 368 220V164z" />
-    <glyph glyph-name="plus"
-      unicode="&#xF067;"
-      horiz-adv-x="448" d=" M416 240H272V384C272 401.67 257.67 416 240 416H208C190.33 416 176 401.67 176 384V240H32C14.33 240 0 225.67 0 208V176C0 158.33 14.33 144 32 144H176V0C176 -17.67 190.33 -32 208 -32H240C257.67 -32 272 -17.67 272 0V144H416C433.67 144 448 158.33 448 176V208C448 225.67 433.67 240 416 240z" />
-    <glyph glyph-name="podcast"
-      unicode="&#xF2CE;"
-      horiz-adv-x="448" d=" M267.429 -40.563C262.286 -59.573 242.858 -64 224 -64C205.143 -64 185.714 -59.573 180.572 -40.563C172.927 -12.134 160 59.102 160 92.25C160 127.406 191.142 136 224 136S288 127.406 288 92.25C288 59.301 275.129 -11.929 267.429 -40.563zM156.867 159.446C138.174 177.754 126.909 203.619 128.083 232.045C130.137 281.769 170.478 322.0010000000001 220.207 323.9260000000001C274.862 326.0420000000001 320 282.193 320 228C320 201.173 308.936 176.884 291.134 159.448C288.459 156.828 288.733 152.462 291.762 150.261C301.074 143.496 308.222 134.918 312.996 124.898C314.737 121.244 319.493 120.238 322.445 123.007C351.271 150.05 368.998 188.79 367.956 231.572C366.101 307.778 304.361 369.78 228.163 371.9409999999999C146.869 374.247 80 308.785 80 228C80 186.639 97.532 149.3 125.55 123.011C128.503 120.24 133.261 121.241 135.003 124.898C139.777 134.919 146.926 143.496 156.238 150.261C159.267 152.461 159.542 156.827 156.867 159.446zM224 448C100.204 448 0 347.815 0 224C0 134.008 52.602 58.353 125.739 22.592C130.072 20.474 135.006 24.136 134.274 28.902C131.892 44.414 129.932 59.848 128.868 73.241C128.722 75.077 127.719 76.727 126.19 77.753C78.79 109.559 47.626 163.769 48.003 225.1C48.595 321.337 127.293 399.748 223.532 399.999C320.793 400.253 400 321.203 400 224C400 162.068 367.842 107.51 319.35 76.133C318.351 62.0960000000001 316.281 45.545 313.726 28.903C312.994 24.136 317.929 20.474 322.261 22.593C395.227 58.273 448 133.813 448 224C448 347.795 347.815 448 224 448zM224 288C188.654 288 160 259.346 160 224S188.654 160 224 160S288 188.654 288 224S259.346 288 224 288z" />
-    <glyph glyph-name="poo"
-      unicode="&#xF2FE;"
-      horiz-adv-x="512" d=" M451.4 78.9C468.7 92 480 112.6 480 136C480 175.8 447.8 208 408 208H393.9C407.3 219.7 416 236.8 416 256C416 291.3 387.3 320 352 320H346.1C349.7000000000001 330.1 352 340.7 352 352C352 405 309 448 256 448C250.8 448 245.8 447.3 240.9 446.5C250.3 433.4 256 417.4 256 400C256 355.8 220.2 320 176 320H160C124.7 320 96 291.3 96 256C96 236.8 104.7 219.7 118.1 208H104C64.2 208 32 175.8 32 136C32 112.6 43.3 92 60.6 78.9C26.3 73.4 0 43.9 0 8C0 -31.8 32.2 -64 72 -64H440C479.8 -64 512 -31.8 512 8C512 43.9 485.7 73.4 451.4 78.9zM192 192C209.7 192 224 177.7 224 160S209.7 128 192 128S160 142.3 160 160S174.3 192 192 192zM351.5 53C341 25.1 293 0 256 0S171 25.1 160.5 53C158.5 58.3 162.5 64 168.3 64H343.7000000000001C349.5000000000001 64 353.5000000000001 58.3 351.5000000000001 53zM320 128C302.3 128 288 142.3 288 160S302.3 192 320 192S352 177.7 352 160S337.7 128 320 128z" />
-    <glyph glyph-name="portrait"
-      unicode="&#xF3E0;"
-      horiz-adv-x="384" d=" M336 448H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H336C362.5 -64 384 -42.5 384 -16V400C384 426.5 362.5 448 336 448zM192 320C227.3 320 256 291.3 256 256S227.3 192 192 192S128 220.7 128 256S156.7 320 192 320zM304 83.2C304 72.6 294 64 281.6 64H102.4C90 64 80 72.6 80 83.2V102.4C80 134.2 110.1 160 147.2 160H152.2C164.5 154.9 177.9 152 192 152S219.6 154.9 231.8 160H236.8C273.9000000000001 160 304 134.2 304 102.4V83.2z" />
-    <glyph glyph-name="pound-sign"
-      unicode="&#xF154;"
-      horiz-adv-x="320" d=" M308 96H262.505C255.878 96 250.505 90.627 250.505 84V33.152H128V160H212C218.627 160 224 165.373 224 172V212C224 218.627 218.627 224 212 224H128V287.556C128 319.822 152.562 344.642 189.792 344.642C213.45 344.642 235.67 333.137 247.444 325.793C252.5950000000001 322.58 259.332 323.742 263.132 328.478L291.625 363.991C295.858 369.267 294.904 376.996 289.506 381.072C273.124 393.44 236.576 416 187.931 416C106.026 416 48 363.258 48 290.039V224H20C13.373 224 8 218.627 8 212V172C8 165.373 13.373 160 20 160H48V32H12C5.373 32 0 26.627 0 20V-20C0 -26.627 5.373 -32 12 -32H308C314.627 -32 320 -26.627 320 -20V84C320 90.627 314.627 96 308 96z" />
-    <glyph glyph-name="power-off"
-      unicode="&#xF011;"
-      horiz-adv-x="512" d=" M400 393.9C463 348.9 504 275.3 504 192C504 55.2 393.2 -55.7 256.5 -56C120 -56.3 8.2 55 8 191.6C7.9 274.9 48.9 348.7 111.8 393.8C123.5 402.1 139.8 398.6 146.8 386.1L162.6 358C168.5 347.5 165.7 334.2 156 327C114.5 296.2 88 247.4 88 192.1C87.9 99.8 162.5 24 256 24C347.6 24 424.6 98.2 424 193.1C423.7 244.9 399.3 294.9 355.9 327.1C346.2 334.3 343.5 347.6 349.4 358L365.2 386.1C372.2 398.5 388.4 402.2 400 393.9zM296 184V424C296 437.3 285.3 448 272 448H240C226.7 448 216 437.3 216 424V184C216 170.7 226.7 160 240 160H272C285.3 160 296 170.7 296 184z" />
-    <glyph glyph-name="prescription-bottle-alt"
-      unicode="&#xF486;"
-      horiz-adv-x="384" d=" M360 448H24C10.8 448 0 437.2 0 424V376C0 362.8 10.8 352 24 352H360C373.2 352 384 362.8 384 376V424C384 437.2 373.2 448 360 448zM32 -32C32 -49.6 46.4 -64 64 -64H320C337.6 -64 352 -49.6 352 -32V320H32V-32zM96 152C96 156.4 99.6 160 104 160H160V216C160 220.4 163.6 224 168 224H216C220.4 224 224 220.4 224 216V160H280C284.4 160 288 156.4 288 152V104C288 99.6 284.4 96 280 96H224V40C224 35.6 220.4 32 216 32H168C163.6 32 160 35.6 160 40V96H104C99.6 96 96 99.6 96 104V152z" />
-    <glyph glyph-name="prescription-bottle"
-      unicode="&#xF485;"
-      horiz-adv-x="384" d=" M32 256H152C156.4 256 160 252.4 160 248V232C160 227.6 156.4 224 152 224H32V160H152C156.4 160 160 156.4 160 152V136C160 131.6 156.4 128 152 128H32V64H152C156.4 64 160 60.4 160 56V40C160 35.6 156.4 32 152 32H32V-32C32 -49.6 46.4 -64 64 -64H320C337.6 -64 352 -49.6 352 -32V320H32V256zM360 448H24C10.8 448 0 437.2 0 424V376C0 362.8 10.8 352 24 352H360C373.2 352 384 362.8 384 376V424C384 437.2 373.2 448 360 448z" />
-    <glyph glyph-name="prescription"
-      unicode="&#xF5B1;"
-      horiz-adv-x="384" d=" M301.26 96L379.32 174.06C385.57 180.31 385.57 190.44 379.32 196.69L356.69 219.32C350.44 225.57 340.31 225.57 334.06 219.32L256 141.26L172.04 225.22C219.31 231.2 256 271.11 256 320C256 373.02 213.02 416 160 416H16C7.16 416 0 408.8400000000001 0 400V144C0 135.16 7.16 128 16 128H48C56.84 128 64 135.16 64 144V224H82.75L210.75 96L132.69 17.94C126.44 11.69 126.44 1.56 132.69 -4.69L155.32 -27.32C161.57 -33.57 171.7 -33.57 177.95 -27.32L256 50.75L334.06 -27.31C340.31 -33.56 350.44 -33.56 356.69 -27.31L379.32 -4.68C385.57 1.57 385.57 11.7 379.32 17.95L301.26 96zM64 352H160C177.64 352 192 337.64 192 320S177.64 288 160 288H64V352z" />
-    <glyph glyph-name="print"
-      unicode="&#xF02F;"
-      horiz-adv-x="512" d=" M464 256H448V366.059A24 24 0 0 1 440.971 383.029L383.029 440.971A24 24 0 0 1 366.0590000000001 448H88C74.745 448 64 437.255 64 424V256H48C21.49 256 0 234.51 0 208V76C0 69.373 5.373 64 12 64H64V-40C64 -53.255 74.745 -64 88 -64H424C437.255 -64 448 -53.255 448 -40V64H500C506.627 64 512 69.373 512 76V208C512 234.51 490.51 256 464 256zM384 0H128V96H384V0zM128 224V384H320V344C320 330.8 330.8 320 344 320H384V224H128zM432 152C418.746 152 408 162.746 408 176S418.746 200 432 200S456 189.254 456 176S445.254 152 432 152z" />
-    <glyph glyph-name="procedures"
-      unicode="&#xF487;"
-      horiz-adv-x="640" d=" M528 224H272C263.2 224 256 216.8 256 208V64H64V304C64 312.8 56.8 320 48 320H16C7.2 320 0 312.8 0 304V-48C0 -56.8 7.2 -64 16 -64H48C56.8 -64 64 -56.8 64 -48V0H576V-48C576 -56.8 583.2 -64 592 -64H624C632.8 -64 640 -56.8 640 -48V112C640 173.9 589.9 224 528 224zM136 352H262.1L289.7000000000001 296.8C295.6 285 312.4000000000001 285 318.3000000000001 296.8L368 396.2L390.1 352H512C520.8 352 528 359.2 528 368S520.8 384 512 384H409.9L382.3 439.2C376.4 451 359.6 451 353.7 439.2L304 339.8L284.1 379.6C282.7000000000001 382.3 280 384 276.9000000000001 384H136C131.6 384 128 380.4 128 376V360C128 355.6 131.6 352 136 352zM160 96C195.3 96 224 124.7 224 160S195.3 224 160 224S96 195.3 96 160S124.7 96 160 96z" />
-    <glyph glyph-name="project-diagram"
-      unicode="&#xF542;"
-      horiz-adv-x="640" d=" M384 128H256C238.33 128 224 113.67 224 96V-32C224 -49.67 238.33 -64 256 -64H384C401.67 -64 416 -49.67 416 -32V96C416 113.67 401.67 128 384 128zM192 416C192 433.67 177.67 448 160 448H32C14.33 448 0 433.67 0 416V288C0 270.33 14.33 256 32 256H127.72L200.88 127.96C211.98 147.02 232.4 160 256 160H256.28L192 272.49V320H416V384H192V416zM608 448H480C462.33 448 448 433.67 448 416V288C448 270.33 462.33 256 480 256H608C625.67 256 640 270.3300000000001 640 288V416C640 433.67 625.67 448 608 448z" />
-    <glyph glyph-name="puzzle-piece"
-      unicode="&#xF12E;"
-      horiz-adv-x="576" d=" M519.442 159.349C477.923 159.349 459.942 127.756 437.384 127.756C377.409 127.756 432 304 432 304S235.712 224 235.712 307.2970000000001C235.712 343.124 272 353.5470000000001 272 393.282C272 428.784 243.885 448 210.539 448C175.885 448 144.173 429.109 144.173 391.654C144.173 350.29 175.884 332.377 175.884 309.904C175.885 240.281 0 281.242 0 281.242V-51.995S178.635 -93.042 178.635 -23.333C178.635 -0.86 138.635 16.774 138.635 58.138C138.635 95.594 167.885 114.484 202.212 114.484C235.885 114.484 264 95.268 264 59.767C264 20.032 227.712 9.609 227.712 -26.218C227.712 -87.021 357.387 -51.948 408.942 -51.948C408.942 -51.948 374.217 68.153 434.769 68.153C470.731 68.153 481.192 32.001 521.077 32.001C556.712 32 576 60.01 576 93.557C576 127.756 557.038 159.3490000000001 519.442 159.3490000000001z" />
-    <glyph glyph-name="qrcode"
-      unicode="&#xF029;"
-      horiz-adv-x="448" d=" M0 224H192V416H0V224zM64 352H128V288H64V352zM256 416V224H448V416H256zM384 288H320V352H384V288zM0 -32H192V160H0V-32zM64 96H128V32H64V96zM416 160H448V32H352V64H320V-32H256V160H352V128H416V160zM416 0H448V-32H416V0zM352 0H384V-32H352V0z" />
-    <glyph glyph-name="question-circle"
-      unicode="&#xF059;"
-      horiz-adv-x="512" d=" M504 192C504 55.003 392.957 -56 256 -56S8 55.003 8 192C8 328.9170000000001 119.043 440 256 440S504 328.9170000000001 504 192zM262.655 358C208.158 358 173.4 335.043 146.106 294.242C142.57 288.956 143.753 281.827 148.821 277.984L183.52 251.674C188.725 247.727 196.141 248.666 200.185 253.796C218.049 276.454 230.298 289.593 257.488 289.593C277.9169999999999 289.593 303.1859999999999 276.445 303.1859999999999 256.635C303.1859999999999 241.659 290.8229999999999 233.968 270.652 222.659C247.128 209.472 216 193.059 216 152V148C216 141.373 221.373 136 228 136H284C290.627 136 296 141.373 296 148V149.333C296 177.795 379.1860000000001 178.98 379.1860000000001 256C379.1860000000001 314.0020000000001 319.021 358 262.6550000000001 358zM256 110C230.635 110 210 89.365 210 64C210 38.636 230.635 18 256 18S302 38.636 302 64C302 89.365 281.365 110 256 110z" />
-    <glyph glyph-name="question"
-      unicode="&#xF128;"
-      horiz-adv-x="384" d=" M202.021 448C122.202 448 70.503 415.2970000000001 29.914 356.974C22.551 346.394 24.821 331.8880000000001 35.092 324.1L78.23 291.391C88.603 283.526 103.362 285.365 111.483 295.539C136.532 326.92 155.113 344.988 194.24 344.988C225.004 344.988 263.0560000000001 325.189 263.0560000000001 295.357C263.0560000000001 272.805 244.4390000000001 261.223 214.0630000000001 244.193C178.6400000000001 224.333 131.7640000000001 199.617 131.7640000000001 137.788V128C131.7640000000001 114.745 142.5090000000001 104 155.7640000000001 104H228.2350000000001C241.4900000000001 104 252.2350000000001 114.745 252.2350000000001 128V133.773C252.2350000000001 176.6330000000001 377.5030000000001 178.418 377.5030000000001 294.4000000000001C377.504 381.7440000000001 286.902 448 202.021 448zM192 74.541C153.804 74.541 122.729 43.466 122.729 5.27C122.729 -32.925 153.804 -64 192 -64S261.271 -32.925 261.271 5.271S230.1960000000001 74.541 192 74.541z" />
-    <glyph glyph-name="quidditch"
-      unicode="&#xF458;"
-      horiz-adv-x="640" d=" M256.5 231.2L343.2 122S326.6 19.6 266.6 -28.1C206.7 -75.7999999999999 0 -62.2 0 -62.2S3.8 -39.1 11 -6.8L105.6 105.4C109.6 110.1 104.7 117 99 114.9L38.6 92.8C53 134.5 71.3 172.8 93.2 190.3C153.1 238.1 256.5 231.2 256.5 231.2zM494.5 96.2C450.5 96.2 414.7 60.4 414.7 16.3C414.7 -27.8000000000001 450.4 -63.6 494.5 -63.6C538.6 -63.6 574.3 -27.8 574.3 16.3C574.3 60.4999999999999 538.5 96.1999999999999 494.4999999999999 96.1999999999999zM636.5 417L616.7 442C611.2 448.9 601.2 450 594.3000000000001 444.6L361.8 266.7L327.7 309.7C322.6 316.1 312.6 314.9 309.1 307.5L283.8 252.9L370.5 143.7L429.3 156.1C437.3 157.8 440.7 167.3 435.6 173.7L401.5 216.6L634 394.5C640.9 400 642 410.1 636.5 417z" />
-    <glyph glyph-name="quote-left"
-      unicode="&#xF10D;"
-      horiz-adv-x="512" d=" M464 192H384V256C384 291.3 412.7 320 448 320H456C469.3 320 480 330.7 480 344V392C480 405.3 469.3 416 456 416H448C359.6 416 288 344.4 288 256V16C288 -10.5 309.5 -32 336 -32H464C490.5 -32 512 -10.5 512 16V144C512 170.5 490.5 192 464 192zM176 192H96V256C96 291.3 124.7 320 160 320H168C181.3 320 192 330.7 192 344V392C192 405.3 181.3 416 168 416H160C71.6 416 0 344.4 0 256V16C0 -10.5 21.5 -32 48 -32H176C202.5 -32 224 -10.5 224 16V144C224 170.5 202.5 192 176 192z" />
-    <glyph glyph-name="quote-right"
-      unicode="&#xF10E;"
-      horiz-adv-x="512" d=" M464 416H336C309.5 416 288 394.5 288 368V240C288 213.5 309.5 192 336 192H416V128C416 92.7 387.3 64 352 64H344C330.7 64 320 53.3 320 40V-8C320 -21.3 330.7 -32 344 -32H352C440.4 -32 512 39.6 512 128V368C512 394.5 490.5 416 464 416zM176 416H48C21.5 416 0 394.5 0 368V240C0 213.5 21.5 192 48 192H128V128C128 92.7 99.3 64 64 64H56C42.7 64 32 53.3 32 40V-8C32 -21.3 42.7 -32 56 -32H64C152.4 -32 224 39.6 224 128V368C224 394.5 202.5 416 176 416z" />
-    <glyph glyph-name="random"
-      unicode="&#xF074;"
-      horiz-adv-x="512" d=" M504.971 88.971C514.344 79.598 514.344 64.402 504.971 55.03L424.971 -24.954C409.961 -39.964 384 -29.444 384 -7.983V32H325.2150000000001A12.004 12.004 0 0 0 316.442 35.812L245.886 111.408L299.2190000000001 168.5510000000001L352 112H384V151.981C384 173.419 409.943 183.979 424.971 168.952L504.971 88.971zM12 272H96L148.781 215.449L202.114 272.592L131.558 348.188A11.999000000000002 11.999000000000002 0 0 1 122.785 352H12C5.373 352 0 346.627 0 340V284C0 277.373 5.373 272 12 272zM384 272V232.016C384 210.556 409.961 200.036 424.971 215.045L504.971 295.029C514.344 304.402 514.344 319.598 504.971 328.9700000000001L424.971 408.951C409.943 423.979 384 413.418 384 391.981V352H325.2150000000001A12.004 12.004 0 0 1 316.442 348.188L96 112H12C5.373 112 0 106.627 0 100V44C0 37.373 5.373 32 12 32H122.785C126.111 32 129.288 33.381 131.558 35.812L352 272H384z" />
-    <glyph glyph-name="receipt"
-      unicode="&#xF543;"
-      horiz-adv-x="384" d=" M358.4 444.8L320 400L265.6 444.8A15.9 15.9 0 0 1 246.4000000000001 444.8L192 400L137.6 444.8A15.9 15.9 0 0 1 118.4 444.8L64 400L25.6 444.8C15 452.7 0 445.2 0 432V-48C0 -61.2 15 -68.7 25.6 -60.8L64 -16L118.4 -60.8A15.9 15.9 0 0 1 137.6 -60.8L192 -16L246.4 -60.8A15.9 15.9 0 0 1 265.6 -60.8L320 -16L358.4 -60.8C368.9 -68.7 384 -61.2 384 -48V432C384 445.2 369 452.7 358.4 444.8zM320 88C320 83.6 316.4 80 312 80H72C67.6 80 64 83.6 64 88V104C64 108.4 67.6 112 72 112H312C316.4 112 320 108.4 320 104V88zM320 184C320 179.6 316.4 176 312 176H72C67.6 176 64 179.6 64 184V200C64 204.4 67.6 208 72 208H312C316.4 208 320 204.4 320 200V184zM320 280C320 275.6 316.4 272 312 272H72C67.6 272 64 275.6 64 280V296C64 300.4 67.6 304 72 304H312C316.4 304 320 300.4 320 296V280z" />
-    <glyph glyph-name="recycle"
-      unicode="&#xF1B8;"
-      horiz-adv-x="512" d=" M184.561 186.097C187.793 172.1 172.438 161.462 160.493 168.929L119.757 194.384L68.89 112.982C55.606 91.727 70.96 64 96.012 64H148C154.627 64 160 58.627 160 52V12C160 5.373 154.627 0 148 0H96.115C20.781 0 -25.187 83.048 14.707 146.88L65.529 228.268L24.804 253.716C12.723 261.2630000000001 15.838 279.677 29.683 282.874L139.92 308.324C148.531 310.312 157.121 304.943 159.109 296.334L184.561 186.097zM283.122 369.012L324.411 302.936L283.671 277.479C271.62 269.951 274.671 251.526 288.55 248.321L398.7870000000001 222.871C407.4590000000001 220.872 416.002 226.309 417.9760000000001 234.861L443.4260000000001 345.098C446.6230000000001 358.942 431.4360000000001 369.817 419.3580000000001 362.266L378.6710000000001 336.842L337.4080000000001 402.924C299.8870000000001 462.957 212.1990000000001 463.095 174.5920000000001 402.924L156.6290000000001 374.158C153.1190000000001 368.538 154.8290000000001 361.137 160.4490000000001 357.625L194.3680000000001 336.43C199.9880000000001 332.918 207.3920000000001 334.627 210.9040000000001 340.247L228.8650000000001 368.99C241.5770000000001 389.331 270.8380000000001 388.666 283.1220000000001 369.012zM497.288 146.88L469.773 190.945C466.262 196.568 458.857 198.279 453.235 194.766L419.374 173.607C413.754 170.095 412.0440000000001 162.692 415.5560000000001 157.071L443.1200000000001 112.959C456.3770000000001 91.7479999999999 441.0630000000001 63.999 415.9840000000001 63.999H320V111.98C320 126.1930000000001 302.758 133.363 292.687 123.293L212.687 43.312C206.438 37.064 206.438 26.933 212.687 20.685L292.687 -59.304C302.689 -69.308 320 -62.3 320 -47.989V0H415.88C491.154 0 537.215 82.997 497.288 146.88z" />
-    <glyph glyph-name="redo-alt"
-      unicode="&#xF2F9;"
-      horiz-adv-x="512" d=" M256.455 440C322.724 439.881 382.892 413.767 427.314 371.315L463.029 407.03C478.149 422.149 504 411.4410000000001 504 390.059V256C504 242.745 493.255 232 480 232H345.941C324.559 232 313.851 257.851 328.97 272.971L370.72 314.721C339.856 343.62 299.919 359.628 257.49 359.9940000000001C165.092 360.7920000000001 87.207 286.017 88.0059999999999 190.552C88.764 99.991 162.184 24 256 24C297.127 24 335.997 38.678 366.629 65.556C371.372 69.717 378.5350000000001 69.464 382.997 65.003L422.659 25.341C427.531 20.469 427.29 12.526 422.177 7.908C378.202 -31.813 319.926 -56 256 -56C119.034 -56 8.001 55.033 8 191.998C7.999 328.807 119.646 440.245 256.455 440z" />
-    <glyph glyph-name="redo"
-      unicode="&#xF01E;"
-      horiz-adv-x="512.333" d=" M500.333 448H452.922C446.069 448 440.608 442.271 440.9360000000001 435.426L444.9020000000001 352.6670000000001C399.416 406.101 331.6720000000001 440 256.001 440C119.34 440 7.899 328.474 8 191.813C8.101 54.932 119.096 -56 256 -56C319.926 -56 378.202 -31.813 422.178 7.908C427.291 12.526 427.532 20.469 422.6600000000001 25.341L388.689 59.312C384.223 63.778 377.0490000000001 64.029 372.3090000000001 59.855C341.308 32.552 300.606 16 256 16C158.733 16 80 94.716 80 192C80 289.267 158.716 368 256 368C316.892 368 370.506 337.142 402.099 290.2L300.574 295.065C293.729 295.3930000000001 288 289.932 288 283.079V235.668C288 229.041 293.373 223.668 300 223.668H500.333C506.96 223.668 512.333 229.041 512.333 235.668V436C512.333 442.627 506.96 448 500.333 448z" />
-    <glyph glyph-name="registered"
-      unicode="&#xF25D;"
-      horiz-adv-x="512" d=" M285.363 240.525C285.363 221.925 275.532 212.094 256.932 212.094H227.056V268.234H250.4340000000001C279.1020000000001 268.234 285.3630000000001 259.461 285.3630000000001 240.525zM504 192C504 55.033 392.967 -56 256 -56S8 55.033 8 192S119.033 440 256 440S504 328.967 504 192zM363.411 87.586C316.682 172.411 320.112 166.222 318.709 168.566C342.141 183.7380000000001 356.654 211.545 356.654 243.052C356.654 297.2960000000001 325.154 332.3040000000001 251.156 332.3040000000001H180.489C167.234 332.3040000000001 156.489 321.5590000000001 156.489 308.3040000000001V76C156.489 62.745 167.234 52 180.489 52H203.056C216.311 52 227.056 62.745 227.056 76V147.663H252.612L296.7410000000001 64.726A24.001000000000005 24.001000000000005 0 0 1 317.9290000000001 51.999H342.3930000000001C360.6540000000001 52 372.2220000000001 71.59 363.4110000000001 87.586z" />
-    <glyph glyph-name="reply-all"
-      unicode="&#xF122;"
-      horiz-adv-x="576" d=" M136.309 258.164L312.313 410.149C327.7200000000001 423.454 352 412.652 352 391.985V309.222C481.182 298.991 576 257.01 576 125.674C576 64.233 536.418 3.365 492.667 -28.458C479.014 -38.389 459.556 -25.925 464.59 -9.827C503.102 113.335 460.668 159.655 352 172.188V88.013C352 67.312 327.7 56.56 312.313 69.849L136.309 221.836C125.238 231.397 125.223 248.589 136.309 258.164zM8.309 221.836L184.313 69.85C199.7 56.561 224 67.313 224 88.014V103.832L115.394 197.617A55.96 55.96 0 0 0 96 240.002A55.95300000000001 55.95300000000001 0 0 0 115.393 282.382L224 376.168V391.985C224 412.652 199.72 423.454 184.313 410.149L8.309 258.164C-2.777 248.589 -2.762 231.397 8.309 221.836z" />
-    <glyph glyph-name="reply"
-      unicode="&#xF3E5;"
-      horiz-adv-x="512" d=" M8.309 258.164L184.313 410.149C199.719 423.454 224 412.653 224 391.985V311.932C384.629 310.093 512 277.9000000000001 512 125.674C512 64.233 472.419 3.365 428.6670000000001 -28.458C415.014 -38.389 395.5560000000001 -25.925 400.5900000000001 -9.827C445.9340000000001 135.185 379.0830000000001 173.683 224 175.915V88C224 67.3 199.7 56.547 184.3130000000001 69.836L8.3090000000001 221.836C-2.7619999999999 231.398 -2.7769999999999 248.589 8.3090000000001 258.164z" />
-    <glyph glyph-name="retweet"
-      unicode="&#xF079;"
-      horiz-adv-x="640" d=" M629.657 104.402L528.971 3.716C519.598 -5.656 504.403 -5.656 495.03 3.716L394.343 104.402C384.9700000000001 113.775 384.9700000000001 128.971 394.343 138.343L405.166 149.166C414.728 158.728 430.299 158.5059999999999 439.585 148.6739999999999L480 105.882V288H292.451A24.005 24.005 0 0 0 275.48 295.029L259.48 311.029C244.361 326.149 255.069 352 276.451 352H520C533.255 352 544 341.255 544 328V105.882L584.4159999999999 148.674C593.7009999999999 158.505 609.2719999999999 158.728 618.8349999999999 149.166L629.6579999999999 138.343C639.0299999999999 128.971 639.0299999999999 113.774 629.6569999999999 104.402zM364.5190000000001 88.971A23.999000000000002 23.999000000000002 0 0 1 347.548 96H160V278.1190000000001L200.416 235.327C209.702 225.496 225.272 225.273 234.835 234.836L245.657 245.658C255.03 255.031 255.03 270.227 245.657 279.599L144.971 380.284C135.598 389.657 120.402 389.657 111.03 380.284L10.343 279.598C0.97 270.225 0.97 255.029 10.343 245.657L21.165 234.835C30.727 225.273 46.298 225.495 55.584 235.326L96 278.1190000000001V56C96 42.745 106.745 32 120 32H363.549C384.931 32 395.639 57.851 380.52 72.971L364.519 88.971z" />
-    <glyph glyph-name="ribbon"
-      unicode="&#xF4D6;"
-      horiz-adv-x="448" d=" M6.1 3.7C-3.5 -7.1 -1.4 -23.9 10.6 -32L79.4 -59.9C89.3 -66.6 102.7 -64.9 110.7 -56.1L202.5 45.8000000000001L123.3 133.7000000000001L6.1 3.7zM441.9000000000001 3.7S149.9 328.3 146.5000000000001 333.8C161.9000000000001 342.2000000000001 186.7000000000001 351.7000000000001 224.0000000000001 351.7000000000001S286.1000000000001 342.2000000000001 301.5000000000001 333.8C298.2000000000001 328.2000000000001 245.5000000000001 269.2000000000001 245.5000000000001 269.2000000000001L324.6 181.5L358.8 219.5C387.5 251.4 392.1 298.1 370.2 335L326.5 408.5C322.2 415.7 316.6 421.8 309.7 426.5C269 454.1 182.3 456.2 138.3 426.5C131.4 421.8 125.8 415.7 121.5 408.5L77.9 335.3C76.4 332.8 40.8 273.1 89.4 219.3L337.5 -56C345.5 -64.9 358.9 -66.5 368.8 -59.8L437.6 -31.9C449.5 -23.9 451.6 -7.1 441.9000000000001 3.7z" />
-    <glyph glyph-name="road"
-      unicode="&#xF018;"
-      horiz-adv-x="576" d=" M567.3 64.4L429.9 369.8C426 378.5 417.4 384 408 384H311.9L313.8 365.2C314.5 358.1 309 352 301.9 352H274C266.9 352 261.3 358.2 262.1 365.2L264 384H168C158.6 384 150 378.5 146.1 369.8L8.7 64.4C3.2 52.2 0 38.4 0 24C0 10.7 10.7 0 24 0H237.6C230.5 0 224.9 6.2 225.7 13.2L236.5 117.2C237.1 123.3 242.3 128 248.4 128H327.6C333.7000000000001 128 338.9000000000001 123.4 339.5 117.2L350.3 13.2C351 6.1 345.5 0 338.4000000000001 0H552C565.2 0 576 10.7 576 24C576 37.9 573 51.7 567.3 64.4zM254.7 293.2L258 325.2C258.6 331.3 263.8 336 269.9 336H306.1C312.2 336 317.4 331.4 318 325.2L321.3 293.2C322 286.1 316.5 280 309.4 280H266.6C259.5 280 253.9 286.2 254.7 293.2zM321.8 160H254.2C247.1 160 241.5000000000001 166.2 242.3 173.2L249.7 245.2C250.3 251.3 255.5000000000001 256 261.6 256H314.3C320.4000000000001 256 325.6 251.4 326.2 245.2L333.6 173.2C334.5 166.2 328.9 160 321.8 160z" />
-    <glyph glyph-name="robot"
-      unicode="&#xF544;"
-      horiz-adv-x="640" d=" M0 192V64C0 46.3 14.3 32 32 32H64V224H32C14.3 224 0 209.7 0 192zM464 352H352V416C352 433.7 337.7 448 320 448S288 433.7 288 416V352H176C131.8 352 96 316.2 96 272V0C96 -35.3 124.7 -64 160 -64H480C515.3 -64 544 -35.3 544 0V272C544 316.2 508.2 352 464 352zM256 32H192V64H256V32zM224 152C201.9 152 184 169.9 184 192S201.9 232 224 232S264 214.1 264 192S246.1 152 224 152zM352 32H288V64H352V32zM448 32H384V64H448V32zM416 152C393.9 152 376 169.9 376 192S393.9 232 416 232S456 214.1 456 192S438.1 152 416 152zM608 224H576V32H608C625.7 32 640 46.3 640 64V192C640 209.7 625.7 224 608 224z" />
-    <glyph glyph-name="rocket"
-      unicode="&#xF135;"
-      horiz-adv-x="512" d=" M505.1 428.9C503.8 435 499 439.8 492.9 441.1C460.7 448 435.5 448 410.4 448C307.2 448 245.3 392.8 199.1 320H94.9C76.7 320 60.1 309.7 52 293.5L2.6 194.7C-5.4 178.7 6.2 160 24.1 160H119.2C113.3 147.2 107.3 134.5 101.2 122.3C98.1 116.1 99.3 108.7 104.2 103.8L167.8 40.2C172.7 35.3 180.1 34.1 186.3 37.2C198.5 43.3 211.2 49.2 224 55.1V-40C224 -57.8 242.8 -69.4 258.7 -61.5L357.4 -12.1C373.7 -4 383.9 12.7 383.9 30.8V135.2C456.5 181.5 511.9 243.6 511.9 346.3C512 371.5 512 396.7 505.1 428.9zM400 288C373.5 288 352 309.5 352 336S373.5 384 400 384S448 362.5 448 336S426.5 288 400 288z" />
-    <glyph glyph-name="rss-square"
-      unicode="&#xF143;"
-      horiz-adv-x="448" d=" M400 416H48C21.49 416 0 394.51 0 368V16C0 -10.51 21.49 -32 48 -32H400C426.51 -32 448 -10.51 448 16V368C448 394.51 426.51 416 400 416zM112 32C85.49 32 64 53.49 64 80S85.49 128 112 128S160 106.51 160 80S138.51 32 112 32zM269.533 32H235.198C229.187 32 224.147 36.636 223.756 42.634C218.542 122.684 154.513 186.554 74.633 191.757C68.636 192.147 64 197.188 64 203.198V237.533C64 244.068 69.468 249.31 75.994 248.9580000000001C186.54 242.9840000000001 274.9910000000001 154.422 280.9580000000001 43.994C281.31 37.468 276.0680000000001 32 269.533 32zM372.56 32H338.226C332.065 32 327.051 36.882 326.799 43.038C321.201 179.573 211.595 289.199 75.039 294.798C68.882 295.051 64 300.065 64 306.226V340.56C64 347.014 69.338 352.224 75.787 351.992C243.617 345.967 377.997 210.801 383.992 43.787C384.224 37.338 379.014 32.0000000000001 372.56 32.0000000000001z" />
-    <glyph glyph-name="rss"
-      unicode="&#xF09E;"
-      horiz-adv-x="448" d=" M128.081 32.041C128.081 -3.328 99.409 -32 64.04 -32S0 -3.328 0 32.041S28.672 96.082 64.041 96.082S128.081 67.409 128.081 32.041zM303.741 -15.209C295.387 139.391 171.556 263.378 16.791 271.741C7.656 272.235 0 264.895 0 255.747V207.678C0 199.263 6.49 192.206 14.887 191.66C126.719 184.376 216.36 94.958 223.659 -17.112C224.206 -25.509 231.263 -31.999 239.677 -31.999H287.746C296.895 -32 304.235 -24.344 303.741 -15.209zM447.99 -15.497C439.596 218.323 251.465 407.555 16.503 415.99C7.473 416.314 0 409.019 0 399.984V351.916C0 343.291 6.835 336.271 15.453 335.9170000000001C206.632 328.078 360.08 174.601 367.918 -16.548C368.271 -25.166 375.291 -32.001 383.917 -32.001H431.985C441.019 -32 448.314 -24.527 447.99 -15.497z" />
-    <glyph glyph-name="ruble-sign"
-      unicode="&#xF158;"
-      horiz-adv-x="384" d=" M239.36 128C324.48 128 384 187.458 384 272.929S324.48 416 239.36 416H76C69.373 416 64 410.627 64 404V197.368H12C5.373 197.368 0 191.995 0 185.368V140C0 133.373 5.373 128 12 128H64V96H12C5.373 96 0 90.627 0 84V44C0 37.373 5.373 32 12 32H64V-20C64 -26.627 69.373 -32 76 -32H134.56C141.187 -32 146.56 -26.627 146.56 -20V32H308C314.627 32 320 37.373 320 44V84C320 90.627 314.627 96 308 96H146.56V128H239.36zM146.56 347.252H225.28C272 347.252 300.16 318.142 300.16 272.9290000000001C300.16 227.0970000000001 272 197.368 224 197.368H146.56V347.252z" />
-    <glyph glyph-name="ruler-combined"
-      unicode="&#xF546;"
-      horiz-adv-x="512" d=" M160 160H104C99.58 160 96 163.58 96 168V184C96 188.42 99.58 192 104 192H160V256H104C99.58 256 96 259.5800000000001 96 264V280C96 284.42 99.58 288 104 288H160V352H104C99.58 352 96 355.58 96 360V376C96 380.42 99.58 384 104 384H160V416C160 433.67 145.67 448 128 448H32C14.33 448 0 433.67 0 416V-32C0 -34.77 0.91 -37.24 1.57 -39.8L160 118.62V160zM480 96H448V40C448 35.58 444.42 32 440 32H424C419.58 32 416 35.58 416 40V96H352V40C352 35.58 348.42 32 344 32H328C323.58 32 320 35.58 320 40V96H256V40C256 35.58 252.42 32 248 32H232C227.58 32 224 35.58 224 40V96H182.63L24.2 -62.43C26.76 -63.09 29.24 -64 32 -64H480C497.67 -64 512 -49.67 512 -32V64C512 81.67 497.67 96 480 96z" />
-    <glyph glyph-name="ruler-horizontal"
-      unicode="&#xF547;"
-      horiz-adv-x="576" d=" M544 320H496V232C496 227.58 492.42 224 488 224H472C467.58 224 464 227.58 464 232V320H400V232C400 227.58 396.42 224 392 224H376C371.58 224 368 227.58 368 232V320H304V232C304 227.58 300.42 224 296 224H280C275.58 224 272 227.58 272 232V320H208V232C208 227.58 204.42 224 200 224H184C179.58 224 176 227.58 176 232V320H112V232C112 227.58 108.42 224 104 224H88C83.58 224 80 227.58 80 232V320H32C14.33 320 0 305.67 0 288V96C0 78.33 14.33 64 32 64H544C561.67 64 576 78.33 576 96V288C576 305.67 561.67 320 544 320z" />
-    <glyph glyph-name="ruler-vertical"
-      unicode="&#xF548;"
-      horiz-adv-x="256" d=" M168 32C163.58 32 160 35.58 160 40V56C160 60.42 163.58 64 168 64H256V128H168C163.58 128 160 131.58 160 136V152C160 156.42 163.58 160 168 160H256V224H168C163.58 224 160 227.58 160 232V248C160 252.42 163.58 256 168 256H256V320H168C163.58 320 160 323.58 160 328V344C160 348.42 163.58 352 168 352H256V416C256 433.67 241.67 448 224 448H32C14.33 448 0 433.67 0 416V-32C0 -49.67 14.33 -64 32 -64H224C241.67 -64 256 -49.67 256 -32V32H168z" />
-    <glyph glyph-name="ruler"
-      unicode="&#xF545;"
-      horiz-adv-x="640" d=" M635.7 280.8L556.1 416.3C547.3000000000001 431.3 527.8000000000001 436.4 512.6 427.8L443.6 388.7L503.3 287C505.5 283.2 504.2 278.5 500.4 276.3L486.6 268.5C482.8 266.3 477.9 267.6 475.7 271.4L416 373L360.8 341.7L388.7 294.3C390.9 290.5 389.6 285.8 385.8 283.6L372 275.8C368.2 273.6 363.3 274.9 361.1 278.7000000000001L333.2 326L278 294.7L337.8 193C340 189.3 338.7 184.5 334.9000000000001 182.3L321.1 174.5C317.3 172.3 312.4000000000001 173.6 310.2000000000001 177.4L250.5000000000001 279.1L195.3000000000001 247.8L223.2000000000001 200.4C225.4000000000001 196.5999999999999 224.1000000000001 191.9 220.3000000000001 189.6999999999999L206.5000000000001 181.8999999999999C202.7000000000001 179.6999999999999 197.8000000000001 181 195.6000000000001 184.7999999999999L167.7000000000001 232.2999999999999L112.5 200.9999999999999L172.2000000000001 99.2999999999999C174.4 95.5999999999999 173.1000000000001 90.7999999999999 169.3000000000001 88.5999999999999L155.5 80.7999999999999C151.7 78.5999999999999 146.8000000000001 79.8999999999999 144.6 83.6999999999999L84.9 185.1L15.9 146C0.7 137.3 -4.6 118.2 4.2 103.2L83.8 -32.4C92.6 -47.4 112.1 -52.5 127.3 -43.9L624.1 238C639.3000000000001 246.6 644.5 265.8 635.7 280.8z" />
-    <glyph glyph-name="rupee-sign"
-      unicode="&#xF156;"
-      horiz-adv-x="320" d=" M308 352C314.627 352 320 357.373 320 364V404C320 410.627 314.627 416 308 416H12C5.373 416 0 410.627 0 404V359.252C0 352.625 5.373 347.252 12 347.252H97.28C124.588 347.252 145.541 337.294 158.25 320H12C5.373 320 0 314.627 0 308V268C0 261.373 5.373 256 12 256H170.757C164.54 219.914 137.796 197.368 96 197.368H12C5.373 197.368 0 191.995 0 185.368V132.356C0 129.007 1.4 125.81 3.861 123.538L168.913 -28.818A12.001000000000001 12.001000000000001 0 0 1 177.052 -32H259.614C270.538 -32 275.78 -18.592 267.753 -11.182L116.871 128.094C193.37 130.434 248.015 181.489 255.189 256H308C314.627 256 320 261.373 320 268V308C320 314.627 314.627 320 308 320H249.31C245.824 331.541 241.03 342.246 235.058 352H308z" />
-    <glyph glyph-name="sad-cry"
-      unicode="&#xF5B3;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192C0 101.9 48.2 23.3 120 -20.1V160C120 168.8 127.2 176 136 176S152 168.8 152 160V-36.7C181.5 -49.1 214 -56 248 -56S314.5 -49.1 344 -36.7V160C344 168.8 351.2 176 360 176S376 168.8 376 160V-20.1C447.8 23.3 496 102 496 192C496 329 385 440 248 440zM182.5 223.5C167.7 236.7 136.3 236.7 121.5 223.5L112 215C108.2 211.7 102.7 211 98.3 213.4C93.9 215.8 91.4 220.8 92.2 225.8C96.2 251 126.4 267.9 152.1 267.9S208 251 212 225.8C212.8 220.8 210.3 215.8 205.9 213.4C200.1 210.3 194.7 212.7 192.2 215L182.5 223.5zM248 32C221.5 32 200 60.7 200 96S221.5 160 248 160S296 131.3 296 96S274.5 32 248 32zM397.8 213.5C392 210.4 386.6 212.8 384.1 215.1L374.6 223.6C359.8 236.8 328.4000000000001 236.8 313.6 223.6L304 215C300.2 211.7 294.7 211 290.3 213.4C285.9000000000001 215.8 283.4000000000001 220.8 284.2 225.8C288.2 251 318.4 267.9 344.1 267.9S400 251 404 225.8C404.6 220.9 402.2 215.9 397.8 213.5z" />
-    <glyph glyph-name="sad-tear"
-      unicode="&#xF5B4;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM328 272C345.7 272 360 257.7 360 240S345.7 208 328 208S296 222.3 296 240S310.3 272 328 272zM152 32C125.5 32 104 53 104 79C104 99 132.5 139.4 145.6 156.8C148.8 161.1 155.2 161.1 158.4 156.8C171.5 139.4 200 99 200 79C200 53 178.5 32 152 32zM168 208C150.3 208 136 222.3 136 240S150.3 272 168 272S200 257.7 200 240S185.7 208 168 208zM338.2 53.8C315.8 80.6 282.9 96 248 96C226.8 96 226.8 128 248 128C292.4 128 334.3 108.4 362.7 74.2C376.5 57.8 351.5 37.7 338.2 53.8z" />
-    <glyph glyph-name="save"
-      unicode="&#xF0C7;"
-      horiz-adv-x="448" d=" M433.941 318.059L350.059 401.9410000000001A48 48 0 0 1 316.118 416H48C21.49 416 0 394.51 0 368V16C0 -10.51 21.49 -32 48 -32H400C426.51 -32 448 -10.51 448 16V284.118A48 48 0 0 1 433.941 318.059zM224 32C188.654 32 160 60.654 160 96C160 131.346 188.654 160 224 160S288 131.346 288 96C288 60.654 259.346 32 224 32zM320 336.52V236C320 229.373 314.627 224 308 224H76C69.373 224 64 229.373 64 236V340C64 346.627 69.373 352 76 352H304.52C307.703 352 310.755 350.736 313.005 348.485L316.485 345.005A11.996 11.996 0 0 0 320 336.52z" />
-    <glyph glyph-name="school"
-      unicode="&#xF549;"
-      horiz-adv-x="640" d=" M0 224V-48C0 -56.84 7.16 -64 16 -64H96V256H32C14.33 256 0 241.67 0 224zM360 272H336V312C336 316.42 332.42 320 328 320H312C307.58 320 304 316.42 304 312V248C304 243.58 307.58 240 312 240H360C364.42 240 368 243.58 368 248V264C368 268.42 364.42 272 360 272zM497.75 335.9600000000001L337.75 442.63A32.02 32.02 0 0 1 302.25 442.63L142.25 335.9600000000001A32.002 32.002 0 0 1 128 309.3400000000001V-64H256V80C256 88.84 263.1600000000001 96 272 96H368C376.84 96 384 88.84 384 80V-64H512V309.3300000000001C512 320.0300000000001 506.65 330.0300000000001 497.75 335.9600000000001zM320 192C275.82 192 240 227.82 240 272S275.82 352 320 352S400 316.18 400 272S364.18 192 320 192zM608 256H544V-64H624C632.84 -64 640 -56.84 640 -48V224C640 241.67 625.67 256 608 256z" />
-    <glyph glyph-name="screwdriver"
-      unicode="&#xF54A;"
-      horiz-adv-x="512" d=" M448 448L320 352V289.94L236.97 206.91C243.76 202.66 250.24 197.85 256.04 192.04C261.8400000000001 186.24 266.6600000000001 179.76 270.9100000000001 172.97L353.94 256H416L512 384L448 448zM128 169.41L10.92 52.33C-3.63 37.78 -3.63 14.18 10.92 -0.38L63.62 -53.08C78.18 -67.64 101.77 -67.64 116.33 -53.08L233.41 64C262.52 93.11 262.52 140.3 233.41 169.41S157.11 198.52 128 169.41z" />
-    <glyph glyph-name="search-minus"
-      unicode="&#xF010;"
-      horiz-adv-x="512" d=" M304 256V224C304 217.4 298.6 212 292 212H124C117.4 212 112 217.4 112 224V256C112 262.6 117.4 268 124 268H292C298.6 268 304 262.6 304 256zM505 -28.7L476.7 -57C467.3 -66.4 452.1 -66.4 442.8 -57L343 42.7C338.5 47.2 336 53.3 336 59.7V76C300.7 48.4 256.3 32 208 32C93.1 32 0 125.1 0 240S93.1 448 208 448S416 354.9 416 240C416 191.7 399.6 147.3 372 112H388.3C394.7 112 400.8 109.5 405.3 105L505 5.3C514.3 -4.1 514.3 -19.3 505 -28.7zM344 240C344 315.2 283.2 376 208 376S72 315.2 72 240S132.8 104 208 104S344 164.8 344 240z" />
-    <glyph glyph-name="search-plus"
-      unicode="&#xF00E;"
-      horiz-adv-x="512" d=" M304 256V224C304 217.4 298.6 212 292 212H236V156C236 149.4 230.6 144 224 144H192C185.4 144 180 149.4 180 156V212H124C117.4 212 112 217.4 112 224V256C112 262.6 117.4 268 124 268H180V324C180 330.6 185.4 336 192 336H224C230.6 336 236 330.6 236 324V268H292C298.6 268 304 262.6 304 256zM505 -28.7L476.7 -57C467.3 -66.4 452.1 -66.4 442.8 -57L343 42.7C338.5 47.2 336 53.3 336 59.7V76C300.7 48.4 256.3 32 208 32C93.1 32 0 125.1 0 240S93.1 448 208 448S416 354.9 416 240C416 191.7 399.6 147.3 372 112H388.3C394.7 112 400.8 109.5 405.3 105L505 5.3C514.3 -4.1 514.3 -19.3 505 -28.7zM344 240C344 315.2 283.2 376 208 376S72 315.2 72 240S132.8 104 208 104S344 164.8 344 240z" />
-    <glyph glyph-name="search"
-      unicode="&#xF002;"
-      horiz-adv-x="512" d=" M505 5.3L405.3 105C400.8 109.5 394.7 112 388.3 112H372C399.6 147.3 416 191.7 416 240C416 354.9 322.9 448 208 448S0 354.9 0 240S93.1 32 208 32C256.3 32 300.7 48.4 336 76V59.7C336 53.3 338.5 47.2 343 42.7L442.7 -57C452.1 -66.4 467.3 -66.4 476.6 -57L504.9 -28.7C514.3 -19.3 514.3 -4.1 505 5.3zM208 112C137.3 112 80 169.2 80 240C80 310.7 137.2 368 208 368C278.7 368 336 310.8 336 240C336 169.3 278.8 112 208 112z" />
-    <glyph glyph-name="seedling"
-      unicode="&#xF4D8;"
-      horiz-adv-x="512" d=" M64 352H0C0 228.3 100.3 128 224 128V-16C224 -24.8 231.2 -32 240 -32H272C280.8 -32 288 -24.8 288 -16V128C288 251.7 187.7 352 64 352zM448 416C363.8 416 290.6 369.5 252.3 300.8C280 270.6 300.5 233.9 311.3 193.2C424 204.9 512 300.1 512 416H448z" />
-    <glyph glyph-name="server"
-      unicode="&#xF233;"
-      horiz-adv-x="512" d=" M480 288H32C14.327 288 0 302.327 0 320V384C0 401.673 14.327 416 32 416H480C497.673 416 512 401.673 512 384V320C512 302.327 497.673 288 480 288zM432 376C418.745 376 408 365.255 408 352S418.745 328 432 328S456 338.745 456 352S445.255 376 432 376zM368 376C354.745 376 344 365.255 344 352S354.745 328 368 328S392 338.745 392 352S381.255 376 368 376zM480 128H32C14.327 128 0 142.327 0 160V224C0 241.673 14.327 256 32 256H480C497.673 256 512 241.673 512 224V160C512 142.327 497.673 128 480 128zM432 216C418.745 216 408 205.255 408 192S418.745 168 432 168S456 178.745 456 192S445.255 216 432 216zM368 216C354.745 216 344 205.255 344 192S354.745 168 368 168S392 178.745 392 192S381.255 216 368 216zM480 -32H32C14.327 -32 0 -17.673 0 0V64C0 81.673 14.327 96 32 96H480C497.673 96 512 81.673 512 64V0C512 -17.673 497.673 -32 480 -32zM432 56C418.745 56 408 45.255 408 32S418.745 8 432 8S456 18.745 456 32S445.255 56 432 56zM368 56C354.745 56 344 45.255 344 32S354.745 8 368 8S392 18.745 392 32S381.255 56 368 56z" />
-    <glyph glyph-name="share-alt-square"
-      unicode="&#xF1E1;"
-      horiz-adv-x="448" d=" M448 368V16C448 -10.51 426.51 -32 400 -32H48C21.49 -32 0 -10.51 0 16V368C0 394.51 21.49 416 48 416H400C426.51 416 448 394.51 448 368zM304 152C289.438 152 276.177 146.439 266.217 137.329L198.259 178.104A56.33899999999999 56.33899999999999 0 0 1 198.259 205.897L266.217 246.672C276.177 237.561 289.438 232 304 232C334.928 232 360 257.072 360 288S334.928 344 304 344S248 318.928 248 288C248 283.203 248.605 278.5470000000001 249.74 274.103L181.782 233.328C171.823 242.439 158.562 248 144 248C113.072 248 88 222.928 88 192S113.072 136 144 136C158.562 136 171.823 141.561 181.783 150.671L249.741 109.896A56.08800000000001 56.08800000000001 0 0 1 248.001 95.999C248.001 65.071 273.073 39.999 304.001 39.999S360.001 65.071 360.001 95.999C360 126.928 334.928 152 304 152z" />
-    <glyph glyph-name="share-alt"
-      unicode="&#xF1E0;"
-      horiz-adv-x="448" d=" M352 128C329.392 128 308.613 120.181 292.21 107.105L189.724 171.159A96.551 96.551 0 0 1 189.724 212.842L292.21 276.896C308.613 263.819 329.392 256 352 256C405.019 256 448 298.981 448 352S405.019 448 352 448S256 405.019 256 352C256 344.842 256.79 337.87 258.276 331.159L155.79 267.105C139.387 280.1810000000001 118.608 288 96 288C42.981 288 0 245.019 0 192S42.981 96 96 96C118.608 96 139.387 103.819 155.79 116.895L258.276 52.841A96.301 96.301 0 0 1 256 32C256 -21.019 298.981 -64 352 -64S448 -21.019 448 32S405.019 128 352 128z" />
-    <glyph glyph-name="share-square"
-      unicode="&#xF14D;"
-      horiz-adv-x="576" d=" M568.482 270.552L424.479 134.567C409.3 120.232 384 130.86 384 152.015V223.978C239.425 223.008 178.434 188.865 219.225 52.625C223.708 37.652 206.379 26.058 194.219 35.295C155.252 64.895 120 121.512 120 178.661C120 322.598 237.599 351.161 384 351.973V423.988C384 445.162 409.317 455.756 424.479 441.436L568.482 305.448C578.502 295.985 578.51 280.023 568.482 270.552zM384 68.872V0H64V320H114.916A11.989999999999998 11.989999999999998 0 0 1 123.564 323.693C138.517 339.261 155.801 351.583 174.578 361.3690000000001C185.708 367.17 181.584 384 169.033 384H48C21.49 384 0 362.51 0 336V-16C0 -42.51 21.49 -64 48 -64H400C426.51 -64 448 -42.51 448 -16V72.806C448 81.094 439.803 86.872 431.989 84.108A71.83 71.83 0 0 0 397.8 80.731C390.53 81.777 384 76.217 384 68.872z" />
-    <glyph glyph-name="share"
-      unicode="&#xF064;"
-      horiz-adv-x="512" d=" M503.691 258.164L327.687 410.149C312.281 423.454 288 412.653 288 391.985V311.932C127.371 310.093 0 277.9 0 125.674C0 64.233 39.581 3.365 83.333 -28.458C96.986 -38.389 116.444 -25.925 111.41 -9.827C66.066 135.186 132.917 173.684 288 175.915V88C288 67.3 312.3 56.547 327.687 69.836L503.691 221.836C514.7620000000001 231.398 514.777 248.589 503.691 258.164z" />
-    <glyph glyph-name="shekel-sign"
-      unicode="&#xF20B;"
-      horiz-adv-x="448" d=" M248 280V112C248 103.16 255.16 96 264 96H312C320.84 96 328 103.16 328 112V280C328 355.11 267.11 416 192 416H24C10.75 416 0 405.26 0 392V-16C0 -24.84 7.16 -32 16 -32H64C72.84 -32 80 -24.84 80 -16V336H192C222.93 336 248 310.93 248 280zM432 416H384C375.1600000000001 416 368 408.8400000000001 368 400V104C368 73.07 342.93 48 312 48H200V272C200 280.8400000000001 192.84 288 184 288H136C127.16 288 120 280.8400000000001 120 272V-8C120 -21.25 130.75 -32 144 -32H312C387.11 -32 448 28.89 448 104V400C448 408.8400000000001 440.84 416 432 416z" />
-    <glyph glyph-name="shield-alt"
-      unicode="&#xF3ED;"
-      horiz-adv-x="512" d=" M496 320C496 98.718 360.0660000000001 -24.645 274.461 -60.308A48 48 0 0 0 237.538 -60.308C130.495 -15.713 16 121.513 16 320A48 48 0 0 0 45.539 364.308L237.539 444.308A48 48 0 0 0 274.462 444.308L466.462 364.308A48 48 0 0 0 496 320zM256 1.687L256.066 1.653C349.801 48.342 428.563 157.961 431.883 309.382L256 382.6670000000001V1.687z" />
-    <glyph glyph-name="ship"
-      unicode="&#xF21A;"
-      horiz-adv-x="640" d=" M496.616 75.361L566.6279999999999 145.373C583.5269999999999 162.273 576.5699999999999 191.144 553.7919999999999 198.465L512 211.898V352C512 369.673 497.673 384 480 384H416V424C416 437.255 405.255 448 392 448H248C234.745 448 224 437.255 224 424V384H160C142.327 384 128 369.673 128 352V211.898L86.208 198.465C63.455 191.152 56.454 162.292 73.372 145.373L143.384 75.361C125.828 31.713 85.587 0 24 0C10.745 0 0 -10.745 0 -24V-40C0 -53.255 10.745 -64 24 -64C85.023 -64 131.499 -43.39 167.258 -4.604C181.677 -39.432 216.021 -64 256 -64H384C423.979 -64 458.323 -39.432 472.742 -4.604C508.495 -43.384 554.968 -64 616 -64C629.255 -64 640 -53.255 640 -40V-24C640 -10.745 629.255 0 616 0C555.183 0 514.458 31.001 496.616 75.361zM192 320H448V232.469L329.7920000000001 270.464A31.995 31.995 0 0 1 310.2080000000001 270.464L192 232.469V320z" />
-    <glyph glyph-name="shipping-fast"
-      unicode="&#xF48B;"
-      horiz-adv-x="640" d=" M624 96H608V204.1C608 216.8 602.9 229 593.9 238L494 337.9C485 346.9 472.8 352 460.1 352H416V400C416 426.5 394.5 448 368 448H112C85.5 448 64 426.5 64 400V352H8C3.6 352 0 348.4 0 344V328C0 323.6 3.6 320 8 320H280C284.4 320 288 316.4 288 312V296C288 291.6 284.4 288 280 288H40C35.6 288 32 284.4 32 280V264C32 259.6 35.6 256 40 256H248C252.4 256 256 252.4 256 248V232C256 227.6 252.4 224 248 224H8C3.6 224 0 220.4 0 216V200C0 195.6 3.6 192 8 192H216C220.4 192 224 188.4 224 184V168C224 163.6 220.4 160 216 160H64V32C64 -21 107 -64 160 -64S256 -21 256 32H384C384 -21 427 -64 480 -64S576 -21 576 32H624C632.8 32 640 39.2 640 48V80C640 88.8 632.8 96 624 96zM160 -16C133.5 -16 112 5.5 112 32S133.5 80 160 80S208 58.5 208 32S186.5 -16 160 -16zM480 -16C453.5 -16 432 5.5 432 32S453.5 80 480 80S528 58.5 528 32S506.5 -16 480 -16zM560 192H416V304H460.1L560 204.1V192z" />
-    <glyph glyph-name="shoe-prints"
-      unicode="&#xF54B;"
-      horiz-adv-x="640" d=" M192 288H224V416H192C156.65 416 128 387.35 128 352S156.65 288 192 288zM0 32C0 -3.35 28.65 -32 64 -32H96V96H64C28.65 96 0 67.35 0 32zM337.46 160C302.55 160 261.3 146.88 232.73 128C207.94 111.62 188.21 96 128 96V-32L185.53 -47.97C211.74 -55.25 238.54 -61.09 265.84 -63.02C298.53 -65.33 331.44 -63.69 363.42 -56.82C472.9 -33.3 512 18.78 512 64C512 128 427.82 160 337.4600000000001 160zM491.42 440.81C459.44 447.68 426.53 449.33 393.84 447.01C366.54 445.08 339.74 439.24 313.53 431.9700000000001L256 416V288C316.2 288 335.94 272.38 360.73 256C389.3 237.12 430.55 224 465.46 224C555.82 224 640 256 640 320C640 365.2200000000001 600.9 417.3 491.42 440.81z" />
-    <glyph glyph-name="shopping-bag"
-      unicode="&#xF290;"
-      horiz-adv-x="448" d=" M352 288V320C352 390.58 294.579 448 224 448C153.42 448 96 390.58 96 320V288H0V16C0 -28.183 35.817 -64 80 -64H368C412.183 -64 448 -28.183 448 16V288H352zM160 320C160 355.29 188.71 384 224 384S288 355.29 288 320V288H160V320zM320 200C306.745 200 296 210.745 296 224S306.745 248 320 248S344 237.255 344 224S333.255 200 320 200zM128 200C114.745 200 104 210.745 104 224S114.745 248 128 248S152 237.255 152 224S141.255 200 128 200z" />
-    <glyph glyph-name="shopping-basket"
-      unicode="&#xF291;"
-      horiz-adv-x="576" d=" M576 232V216C576 202.745 565.255 192 552 192H544L517.887 9.212C514.509 -14.435 494.257 -32 470.37 -32H105.63C81.743 -32 61.491 -14.435 58.112 9.212L32 192H24C10.745 192 0 202.745 0 216V232C0 245.255 10.745 256 24 256H91.341L198.121 402.8210000000001C208.516 417.113 228.528 420.274 242.822 409.879C257.115 399.484 260.275 379.471 249.88 365.178L170.477 256H405.523L326.12 365.179C315.725 379.471 318.886 399.485 333.1790000000001 409.88C347.4700000000001 420.275 367.485 417.115 377.8800000000001 402.822L484.659 256H552C565.255 256 576 245.255 576 232zM312 56V168C312 181.255 301.255 192 288 192S264 181.255 264 168V56C264 42.745 274.745 32 288 32S312 42.745 312 56zM424 56V168C424 181.255 413.255 192 400 192S376 181.255 376 168V56C376 42.745 386.745 32 400 32S424 42.745 424 56zM200 56V168C200 181.255 189.255 192 176 192S152 181.255 152 168V56C152 42.745 162.745 32 176 32S200 42.745 200 56z" />
-    <glyph glyph-name="shopping-cart"
-      unicode="&#xF07A;"
-      horiz-adv-x="576" d=" M528.12 146.681L575.393 354.681C578.806 369.699 567.391 384 551.99 384H159.208L150.042 428.81C147.758 439.979 137.93 448 126.529 448H24C10.745 448 0 437.255 0 424V408C0 394.745 10.745 384 24 384H93.883L164.131 40.565C147.325 30.9 136 12.778 136 -8C136 -38.928 161.072 -64 192 -64S248 -38.928 248 -8C248 7.674 241.553 21.835 231.176 32H440.823C430.447 21.835 424 7.674 424 -8C424 -38.928 449.072 -64 480 -64S536 -38.928 536 -8C536 14.172 523.112 33.332 504.421 42.405L509.938 66.681C513.351 81.699 501.936 96 486.535 96H218.117L211.572 128H504.717C515.923 128 525.637 135.754 528.12 146.681z" />
-    <glyph glyph-name="shower"
-      unicode="&#xF2CC;"
-      horiz-adv-x="512" d=" M389.6600000000001 312.4L231.6 154.34C222.23 144.97 207.03 144.97 197.66 154.34L186.34 165.66C176.97 175.03 176.97 190.23 186.34 199.6L186.45 199.71C152.42 239.92 151.29 298.65 183.06 340.09C171.09 347.64 156.92 352 141.7600000000001 352C98.88 352 64 317.12 64 274.24V-32H0V274.24C0 352.41 63.59 416 141.76 416C178.69 416 212.37 401.8 237.62 378.58C273.52 390.09 314.12 383.08 344.29 357.55L344.4000000000001 357.66C353.7700000000001 367.03 368.9700000000001 367.03 378.3400000000001 357.66L389.6600000000001 346.3400000000001C399.0300000000001 336.9700000000001 399.0300000000001 321.77 389.6600000000001 312.4zM384 240C384 231.163 376.837 224 368 224S352 231.163 352 240S359.163 256 368 256S384 248.837 384 240zM416 240C416 248.837 423.163 256 432 256S448 248.837 448 240S440.837 224 432 224S416 231.163 416 240zM512 240C512 231.163 504.837 224 496 224S480 231.163 480 240S487.163 256 496 256S512 248.837 512 240zM352 208C352 199.163 344.837 192 336 192S320 199.163 320 208S327.163 224 336 224S352 216.837 352 208zM400 224C408.837 224 416 216.837 416 208S408.837 192 400 192S384 199.163 384 208S391.163 224 400 224zM480 208C480 199.163 472.837 192 464 192S448 199.163 448 208S455.163 224 464 224S480 216.837 480 208zM320 176C320 167.163 312.837 160 304 160S288 167.163 288 176S295.163 192 304 192S320 184.837 320 176zM352 176C352 184.837 359.163 192 368 192S384 184.837 384 176S376.837 160 368 160S352 167.163 352 176zM448 176C448 167.163 440.837 160 432 160S416 167.163 416 176S423.163 192 432 192S448 184.837 448 176zM320 144C320 152.837 327.163 160 336 160S352 152.837 352 144S344.837 128 336 128S320 135.163 320 144zM416 144C416 135.163 408.837 128 400 128S384 135.163 384 144S391.163 160 400 160S416 152.837 416 144zM320 112C320 103.163 312.837 96 304 96S288 103.163 288 112S295.163 128 304 128S320 120.837 320 112zM384 112C384 103.163 376.837 96 368 96S352 103.163 352 112S359.163 128 368 128S384 120.837 384 112zM352 80C352 71.163 344.837 64 336 64S320 71.163 320 80S327.163 96 336 96S352 88.837 352 80zM320 48C320 39.163 312.837 32 304 32S288 39.163 288 48S295.163 64 304 64S320 56.837 320 48z" />
-    <glyph glyph-name="shuttle-van"
-      unicode="&#xF5B6;"
-      horiz-adv-x="640" d=" M628.88 237.35L494.39 398.73A48.01 48.01 0 0 1 457.52 416H32C14.33 416 0 401.67 0 384V96C0 78.33 14.33 64 32 64H64C64 10.98 106.98 -32 160 -32S256 10.98 256 64H384C384 10.98 426.98 -32 480 -32S576 10.98 576 64H608C625.67 64 640 78.33 640 96V206.62C640 217.85 636.06 228.72 628.88 237.35zM64 256V352H160V256H64zM160 16C133.49 16 112 37.49 112 64S133.49 112 160 112S208 90.51 208 64S186.51 16 160 16zM320 256H224V352H320V256zM480 16C453.49 16 432 37.49 432 64S453.49 112 480 112S528 90.51 528 64S506.51 16 480 16zM384 256V352H450.02L530.02 256H384z" />
-    <glyph glyph-name="sign-in-alt"
-      unicode="&#xF2F6;"
-      horiz-adv-x="512" d=" M416 0H332C325.4 0 320 5.4 320 12V52C320 58.6 325.4 64 332 64H416C433.7 64 448 78.3 448 96V288C448 305.7 433.7 320 416 320H332C325.4 320 320 325.4 320 332V372C320 378.6 325.4 384 332 384H416C469 384 512 341 512 288V96C512 43 469 0 416 0zM369 201L201 369C186 384 160 373.5 160 352V256H24C10.7 256 0 245.3 0 232V136C0 122.7 10.7 112 24 112H160V16C160 -5.5 186 -16 201 -1L369 167C378.3 176.4 378.3 191.6 369 201z" />
-    <glyph glyph-name="sign-language"
-      unicode="&#xF2A7;"
-      horiz-adv-x="448" d=" M91.434 -35.987C91.127 -19.969 104.543 -6.858 120.564 -6.858H182.857V-1.144H56.993C40.972 -1.144 27.556 11.967 27.863 27.985C28.16 43.509 40.835 56 56.428 56H182.857V61.714H29.136C13.115 61.714 -0.301 74.825 0.006 90.843C0.303 106.365 12.979 118.856 28.572 118.856H182.858V124.57H57.707C41.686 124.57 28.27 137.681 28.577 153.699C28.874 169.221 41.55 181.712 57.143 181.712H225.709L194.624 204.318C181.862 213.599 179.041 231.467 188.322 244.23C197.603 256.991 215.472 259.812 228.234 250.532L351.5950000000001 160.817A34.287 34.287 0 0 0 365.7150000000001 133.089V-8.047C365.7150000000001 -23.957 354.769 -37.777 339.2820000000001 -41.421L258.8110000000001 -60.3550000000001A137.16 137.16 0 0 0 227.4000000000001 -64.0010000000001H120C104.407 -64.0000000000001 91.731 -51.5090000000001 91.434 -35.9870000000001zM164.683 189.714H201.106L189.919 197.8499999999999C171.34 211.3609999999999 169.606 238.737 186.749 254.386L173.745 271.0859999999999C163.902 283.7269999999999 145.315 286.257 132.865 276.1739999999999C120.8 266.4029999999999 118.732 248.7269999999999 128.312 236.4239999999999L164.683 189.714zM447.981 191.817L442.978 344.269C442.4600000000001 360.04 429.2560000000001 372.405 413.485 371.8879999999999C397.712 371.37 385.348 358.166 385.866 342.395L387.128 303.98L283.565 436.981C273.985 449.284 256.342 451.611 243.912 442.3090000000001C231.085 432.71 228.983 414.069 238.826 401.428L315.715 302.683L311.206 299.1720000000001L216.416 420.906C206.8359999999999 433.209 189.1929999999999 435.536 176.763 426.234C163.936 416.635 161.834 397.994 171.6769999999999 385.353L266.12 264.065L261.611 260.554L183.9359999999999 360.308C174.3559999999999 372.611 156.7129999999999 374.938 144.2829999999999 365.636C131.4559999999999 356.0370000000001 129.3539999999999 337.396 139.1969999999999 324.755L191.2499999999999 257.906C203.7469999999999 266.163 220.3049999999999 266.1910000000001 232.9399999999999 257.002L356.2999999999999 167.288C367.2039999999999 159.358 373.7149999999999 146.573 373.7149999999999 133.09V116.091L434.779 163.64A34.285 34.285 0 0 1 447.981 191.817z" />
-    <glyph glyph-name="sign-out-alt"
-      unicode="&#xF2F5;"
-      horiz-adv-x="512" d=" M497 175L329 7C314 -8 288 2.5 288 24V120H152C138.7 120 128 130.7 128 144V240C128 253.3 138.7 264 152 264H288V360C288 381.4 313.9 392 329 377L497 209C506.3 199.6 506.3 184.4 497 175zM192 12V52C192 58.6 186.6 64 180 64H96C78.3 64 64 78.3 64 96V288C64 305.7 78.3 320 96 320H180C186.6 320 192 325.4 192 332V372C192 378.6 186.6 384 180 384H96C43 384 0 341 0 288V96C0 43 43 0 96 0H180C186.6 0 192 5.4 192 12z" />
-    <glyph glyph-name="sign"
-      unicode="&#xF4D9;"
-      horiz-adv-x="512" d=" M496 384H128V432C128 440.8 120.8 448 112 448H80C71.2 448 64 440.8 64 432V384H16C7.2 384 0 376.8 0 368V336C0 327.2 7.2 320 16 320H64V-48C64 -56.8 71.2 -64 80 -64H112C120.8 -64 128 -56.8 128 -48V320H496C504.8 320 512 327.2 512 336V368C512 376.8 504.8 384 496 384zM160 64H480V288H160V64z" />
-    <glyph glyph-name="signal"
-      unicode="&#xF012;"
-      horiz-adv-x="640" d=" M36 64H92C98.6 64 104 58.6 104 52V-52C104 -58.6 98.6 -64 92 -64H36C29.4 -64 24 -58.6 24 -52V52C24 58.6 29.4 64 36 64zM152 100V-52C152 -58.6 157.4 -64 164 -64H220C226.6 -64 232 -58.6 232 -52V100C232 106.6 226.6 112 220 112H164C157.4 112 152 106.6 152 100zM280 180V-52C280 -58.6 285.4 -64 292 -64H348C354.6 -64 360 -58.6 360 -52V180C360 186.6 354.6 192 348 192H292C285.4 192 280 186.6 280 180zM408 292V-52C408 -58.6 413.4 -64 420 -64H476C482.6 -64 488 -58.6 488 -52V292C488 298.6 482.6 304 476 304H420C413.4 304 408 298.6 408 292zM536 436V-52C536 -58.6 541.4 -64 548 -64H604C610.6 -64 616 -58.6 616 -52V436C616 442.6 610.6 448 604 448H548C541.4 448 536 442.6 536 436z" />
-    <glyph glyph-name="signature"
-      unicode="&#xF5B7;"
-      horiz-adv-x="512" d=" M496 128H404.14C394.87 128 384.42 139.31 378.36 156.52C363.13 199.88 330.25 226.82 292.56 226.82C261.7200000000001 226.82 234.09 208.77 216.45 177.59L194.8 341.5C188.84 366.92 169.34 384 146.28 384C123.23 384 103.73 366.92 97.78 341.5L56.16 163.8C50.7 140.55 37.75 128 28.33 128H16C7.16 128 0 120.84 0 112V80C0 71.16 7.16 64 16 64H28.33C70.3 64 106.52 98.23 118.47 149.2L142.31 250.98L171.56 28.87C173.54 13.82 185.38 1.42 200.5 0.12C201.49 0.03 202.46 -0.01 203.43 -0.01C217.51 -0.01 230.07 9.26 234.12 22.94L267.15 135.28C273.03 152 282.99 162.8 292.56 162.8C302.14 162.8 312.11 152 318.3400000000001 134.28C333.5700000000001 90.92 366.4500000000001 63.98 404.1400000000001 63.98H496C504.84 63.98 512 71.14 512 79.98V111.98C512 120.84 504.84 128 496 128z" />
-    <glyph glyph-name="sitemap"
-      unicode="&#xF0E8;"
-      horiz-adv-x="640" d=" M128 96H32C14.33 96 0 81.67 0 64V-32C0 -49.67 14.33 -64 32 -64H128C145.67 -64 160 -49.67 160 -32V64C160 81.67 145.67 96 128 96zM104 176H296V128H344V176H536V128H584V185.59C584 206.7600000000001 566.77 224 545.59 224H344V288H384C401.67 288 416 302.3300000000001 416 320V416C416 433.67 401.67 448 384 448H256C238.33 448 224 433.67 224 416V320C224 302.33 238.33 288 256 288H296V224H94.41C73.23 224 56 206.77 56 185.59V128H104V176zM368 96H272C254.33 96 240 81.67 240 64V-32C240 -49.67 254.33 -64 272 -64H368C385.67 -64 400 -49.67 400 -32V64C400 81.67 385.67 96 368 96zM608 96H512C494.33 96 480 81.67 480 64V-32C480 -49.67 494.33 -64 512 -64H608C625.67 -64 640 -49.67 640 -32V64C640 81.67 625.67 96 608 96z" />
-    <glyph glyph-name="skull"
-      unicode="&#xF54C;"
-      horiz-adv-x="512" d=" M256 448C114.6 448 0 347.7 0 224C0 153.9 36.9 91.4 94.5 50.3C104.1 43.4 109.7 32.2 108 20.4L98.6 -45.8C97.2 -55.4 104.6 -63.9999999999999 114.3 -63.9999999999999H192V-7.9999999999999C192 -3.6 195.6 1e-13 200 1e-13H216C220.4 1e-13 224 -3.6 224 -7.9999999999999V-63.9999999999999H288V-7.9999999999999C288 -3.6 291.6 1e-13 296 1e-13H312C316.4 1e-13 320 -3.6 320 -7.9999999999999V-63.9999999999999H397.7C407.4 -63.9999999999999 414.8 -55.3999999999999 413.4 -45.8L404 20.4C402.3 32.1 407.8 43.4 417.5 50.3C475.1 91.4 512 153.9 512 224C512 347.7 397.4 448 256 448zM160 128C124.7 128 96 156.7 96 192S124.7 256 160 256S224 227.3 224 192S195.3 128 160 128zM352 128C316.7 128 288 156.7 288 192S316.7 256 352 256S416 227.3 416 192S387.3 128 352 128z" />
-    <glyph glyph-name="sliders-h"
-      unicode="&#xF1DE;"
-      horiz-adv-x="512" d=" M496 64H160V80C160 88.8 152.8 96 144 96H112C103.2 96 96 88.8 96 80V64H16C7.2 64 0 56.8 0 48V16C0 7.2 7.2 0 16 0H96V-16C96 -24.8 103.2 -32 112 -32H144C152.8 -32 160 -24.8 160 -16V0H496C504.8 0 512 7.2 512 16V48C512 56.8 504.8 64 496 64zM496 224H416V240C416 248.8 408.8 256 400 256H368C359.2 256 352 248.8 352 240V224H16C7.2 224 0 216.8 0 208V176C0 167.2 7.2 160 16 160H352V144C352 135.2 359.2 128 368 128H400C408.8 128 416 135.2 416 144V160H496C504.8 160 512 167.2 512 176V208C512 216.8 504.8 224 496 224zM496 384H288V400C288 408.8 280.8 416 272 416H240C231.2 416 224 408.8 224 400V384H16C7.2 384 0 376.8 0 368V336C0 327.2 7.2 320 16 320H224V304C224 295.2 231.2 288 240 288H272C280.8 288 288 295.2 288 304V320H496C504.8 320 512 327.2 512 336V368C512 376.8 504.8 384 496 384z" />
-    <glyph glyph-name="smile-beam"
-      unicode="&#xF5B8;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM112 224.6C115.3 266.7 144.2 296 168 296S220.7 266.7 224 224.6C224.7 216 213.2 212.7 209.1 220.1L199.6 237.1C191.9 250.8 180.4 258.7 168.1 258.7S144.3 250.8 136.6 237.1L127.1 220.1C122.8 212.7 111.3 216.1 112 224.6zM362.8 101.8C334.3 67.6 292.5 48 248 48S161.7 67.6 133.2 101.8C119.7 118.1 144.2 138.5 157.8 122.3C180.2 95.4 213 80.1 248 80.1S315.8 95.5 338.2 122.3C351.8 138.5 376.3 118 362.8 101.8zM369 220.1L359.5 237.1C351.8 250.8 340.3 258.7000000000001 328 258.7000000000001S304.2 250.8 296.5 237.1L287 220.1C282.9 212.8 271.4 216.1 272.1 224.6C275.4000000000001 266.7000000000001 304.3 296 328.1 296S380.8 266.7000000000001 384.1 224.6C384.7000000000001 216 373.1 212.7 369 220.1z" />
-    <glyph glyph-name="smile-wink"
-      unicode="&#xF4DA;"
-      horiz-adv-x="496" d=" M0 192C0 55 111 -56 248 -56S496 55 496 192S385 440 248 440S0 329 0 192zM200 240C200 222.3 185.7 208 168 208S136 222.3 136 240S150.3 272 168 272S200 257.7 200 240zM358.5 223.5C343.7 236.7 312.3 236.7 297.5 223.5L288 215C279.7 207.6 266.4 214.6 268.2 225.8C272.2 251 302.4 267.9 328.1 267.9S384 251 388 225.8C389.7 214.7 376.6 207.5 368.2 215L358.5 223.5zM157.8 122.2C180.2 95.3 213 80 248 80S315.8 95.4 338.2 122.2C351.8 138.4 376.3 118 362.8 101.7C334.3 67.6 292.5 48 248 48S161.7 67.6 133.2 101.8C119.7 118.1 144.4 138.5 157.8 122.2z" />
-    <glyph glyph-name="smile"
-      unicode="&#xF118;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM328 272C345.7 272 360 257.7 360 240S345.7 208 328 208S296 222.3 296 240S310.3 272 328 272zM168 272C185.7 272 200 257.7 200 240S185.7 208 168 208S136 222.3 136 240S150.3 272 168 272zM362.8 101.8C334.3 67.6 292.5 48 248 48S161.7 67.6 133.2 101.8C119.6 118.1 144.2 138.5 157.8 122.3C180.2 95.4 213 80.1 248 80.1S315.8 95.5 338.2 122.3C351.6 138.5 376.3 118.1 362.8 101.8z" />
-    <glyph glyph-name="smoking-ban"
-      unicode="&#xF54D;"
-      horiz-adv-x="512" d=" M96 144C96 135.2 103.2 128 112 128H229.5L133.5 224H112C103.2 224 96 216.8 96 208V144zM256 448C114.6 448 0 333.4 0 192S114.6 -64 256 -64S512 50.6 512 192S397.4 448 256 448zM256 0C150.1 0 64 86.1 64 192C64 233.4 77.3 271.7 99.7 303.1L367.1 35.7C335.7 13.3 297.4 0 256 0zM301.2 192H384V160H333.2L301.2 192zM412.3 80.9L365.2 128H400C408.8 128 416 135.2 416 144V208C416 216.8 408.8 224 400 224H269.2L144.9 348.3C176.3 370.7 214.6 384 256 384C361.9 384 448 297.9 448 192C448 150.6 434.7 112.3 412.3 80.9zM320.6 320C305 320 292 331.2 289.2000000000001 345.9C288.5000000000001 349.5 285.2000000000001 352 281.5000000000001 352H265.3000000000001C260.3000000000001 352 256.6000000000001 347.5 257.3000000000001 342.6C261.9000000000001 311.7 288.5000000000001 288 320.6000000000001 288C336.2000000000001 288 349.2000000000001 276.8 352.0000000000001 262.1C352.7000000000001 258.5 356.0000000000001 256 359.7000000000001 256H375.9000000000001C380.9000000000001 256 384.6 260.5 383.9000000000001 265.4C379.3 296.3 352.7000000000001 320 320.6 320z" />
-    <glyph glyph-name="smoking"
-      unicode="&#xF48D;"
-      horiz-adv-x="640" d=" M632 96H584C579.6 96 576 92.4 576 88V-56C576 -60.4 579.6 -64 584 -64H632C636.4 -64 640 -60.4 640 -56V88C640 92.4 636.4 96 632 96zM553.3 360.9C547.5999999999999 364.7 544 370.9 544 377.7V440C544 444.4 540.4 448 536 448H488C483.6 448 480 444.4 480 440V377.7C480 355.7 490.2 334.3 508.6 322.3C550.8000000000001 295 576 248.5 576 198.3V168C576 163.6 579.6 160 584 160H632C636.4 160 640 163.6 640 168V198.3C640 263.8 607.6 324.5 553.3 360.9zM432 96H48C21.5 96 0 74.5 0 48V-16C0 -42.5 21.5 -64 48 -64H432C440.8 -64 448 -56.8 448 -48V80C448 88.8 440.8 96 432 96zM400 -16H224V48H400V-16zM487.7 306.4C463.8 323 448 348.7 448 377.7V440C448 444.4 444.4 448 440 448H392C387.6 448 384 444.4 384 440V373.6C384 329.9 408.6 292 444.3 266.9C466.7 251.2 480 225.7 480 198.3V168C480 163.6 483.6 160 488 160H536C540.4 160 544 163.6 544 168V198.3C544 241.6 523 281.7000000000001 487.7 306.4zM536 96H488C483.6 96 480 92.4 480 88V-56C480 -60.4 483.6 -64 488 -64H536C540.4 -64 544 -60.4 544 -56V88C544 92.4 540.4 96 536 96z" />
-    <glyph glyph-name="snowflake"
-      unicode="&#xF2DC;"
-      horiz-adv-x="448" d=" M444.816 146.361A24.12 24.12 0 0 1 447.477 163.339C444.752 176.305 432.138 184.584 419.303 181.831L331.896 156.785L264 192L331.896 227.215L419.303 202.169C432.138 199.416 444.752 207.695 447.477 220.661C450.202 233.627 442.006 246.369 429.172 249.122L381.695 256.259L434.772 287.2150000000001C446.135 293.842 450.029 308.521 443.468 320C436.9070000000001 331.479 422.377 335.4120000000001 411.014 328.785L357.937 297.829L375.558 342.933C379.615 355.539 372.79 369.079 360.311 373.178C347.833 377.2770000000001 334.428 370.3810000000001 330.371 357.776L308.139 268.786L247.759 233.571V304L312.9340000000001 367.945C321.7120000000001 377.7970000000001 320.9210000000001 392.972 311.168 401.839C301.415 410.706 286.3930000000001 409.907 277.616 400.055L247.759 362.088V424C247.759 437.255 237.122 448 224.001 448S200.243 437.255 200.243 424V362.088L170.386 400.055C161.607 409.907 146.587 410.707 136.834 401.839C127.081 392.972 126.291 377.7970000000001 135.068 367.945L200.242 304V233.569L139.862 268.784L117.63 357.774C113.573 370.379 100.168 377.2750000000001 87.69 373.1760000000001C75.212 369.077 68.386 355.536 72.443 342.9310000000001L90.063 297.827L36.986 328.783C25.623 335.41 11.093 331.477 4.532 319.998S1.865 293.841 13.228 287.213L66.305 256.257L18.828 249.12C5.993 246.366 -2.203 233.625 0.523 220.659C3.248 207.694 15.862 199.414 28.697 202.167L116.104 227.213L184 192L116.104 156.785L28.698 181.83C15.863 184.583 3.249 176.304 0.524 163.338C-2.201 150.371 5.994 137.63 18.829 134.877L66.306 127.74L13.229 96.7839999999999C1.866 90.157 -2.027 75.479 4.533 64S25.624 48.588 36.987 55.215L90.064 86.171L72.444 41.067A24.157 24.157 0 0 1 74.466 21.639C77.297 16.686 81.882 12.73 87.69 10.823C100.168 6.724 113.573 13.6200000000001 117.63 26.225L139.862 115.215L200.242 150.4300000000001V80L135.067 16.055C126.289 6.203 127.08 -8.972 136.833 -17.839C146.587 -26.707 161.607 -25.907 170.385 -16.055L200.242 21.912V-40C200.242 -53.255 210.879 -64 224 -64S247.758 -53.255 247.758 -40V21.912L277.615 -16.055A23.59 23.59 0 0 1 295.282 -24A23.534 23.534 0 0 1 311.167 -17.839C320.92 -8.972 321.711 6.203 312.933 16.055L247.758 80V150.431L308.1380000000001 115.216L330.37 26.226C334.427 13.621 347.832 6.725 360.31 10.824C372.789 14.923 379.614 28.464 375.557 41.069L357.9360000000001 86.173L411.0130000000001 55.217C422.3760000000001 48.59 436.9060000000001 52.523 443.4670000000001 64.002S446.134 90.159 434.771 96.787L381.694 127.7430000000001L429.171 134.8800000000001C436.031 136.3490000000001 441.565 140.6730000000001 444.816 146.3610000000001z" />
-    <glyph glyph-name="solar-panel"
-      unicode="&#xF5BA;"
-      horiz-adv-x="640" d=" M431.98 -0.01L384.01 -0.06V32H256.01V-0.21L208.03 -0.26C199.21 -0.27 192.06 -7.42 192.05 -16.25L192 -47.98C191.99 -56.83 199.17 -64.01 208.02 -64L431.98 -63.74C440.8 -63.73 447.9500000000001 -56.58 447.9600000000001 -47.76L448.0000000000001 -16.03C448.0100000000001 -7.1799999999999 440.8300000000001 0 431.9800000000001 -0.01zM585.2 421.26C582.58 436.69 568.99 448 553.06 448H86.93C71 448 57.41 436.69 54.79 421.26C-3.32 78.84 0.04 99.92 0.03 96C0 78.68 14.32 64 32.63 64H607.37C625.6 64 639.88 78.56 639.96 95.79C639.98 99.87 643.3100000000001 78.84 585.2 421.2600000000001zM259.83 384H380.16L389.93 288H250.06L259.83 384zM184.66 128H71.09L90.1 240H196.07L184.66 128zM200.95 288H98.24L114.53 384H210.72L200.95 288zM233.77 128L245.17 240H394.82L406.2199999999999 128H233.77zM429.27 384H525.46L541.75 288H439.04L429.2700000000001 384zM455.33 128L443.93 240H549.9L568.91 128H455.33z" />
-    <glyph glyph-name="sort-alpha-down"
-      unicode="&#xF15D;"
-      horiz-adv-x="448" d=" M187.298 52.686L107.314 -27.316C101.066 -33.563 90.931 -33.561 84.687 -27.316L4.705 52.686C-5.365 62.756 1.807 80 16.019 80H64V400C64 408.837 71.163 416 80 416H112C120.837 416 128 408.837 128 400V80H175.984C190.225 80 197.347 62.736 187.298 52.686zM306.373 232.693A12 12 0 0 0 294.838 224H259.1210000000001C250.9010000000001 224 245.1140000000001 232.078 247.7590000000001 239.861L304.855 407.861A12 12 0 0 0 316.217 416H355.783C360.9220000000001 416 365.4910000000001 412.727 367.1450000000001 407.861L424.2410000000001 239.861C426.886 232.078 421.1 224 412.879 224H377.144A12 12 0 0 0 365.629 232.622L357.3280000000001 260.9210000000001H314.4650000000001L306.3730000000001 232.693zM329.23 311.39H342.5970000000001L335.997 334.327L329.23 311.39zM341.805 24.067L409.256 119.765A12 12 0 0 1 411.448 126.678V148C411.448 154.627 406.075 160 399.448 160H274.522C267.895 160 262.522 154.627 262.522 148V119.07C262.522 112.443 267.895 107.07 274.522 107.07H330.991C330.252 106.079 329.494 105.034 328.721 103.937L261.5180000000001 8.732A12.001000000000001 12.001000000000001 0 0 1 259.322 1.812V-20C259.322 -26.627 264.695 -32 271.322 -32H400.677C407.3040000000001 -32 412.677 -26.627 412.677 -20V8.93C412.677 15.557 407.3040000000001 20.93 400.677 20.93H339.531C340.271 21.923 341.031 22.969 341.805 24.067z" />
-    <glyph glyph-name="sort-alpha-up"
-      unicode="&#xF15E;"
-      horiz-adv-x="448" d=" M4.702 331.314L84.686 411.316C90.934 417.563 101.069 417.561 107.313 411.316L187.294 331.314C197.364 321.2440000000001 190.193 304 175.98 304H128V-16C128 -24.837 120.837 -32 112 -32H80C71.163 -32 64 -24.837 64 -16V304H16.016C1.775 304 -5.347 321.264 4.702 331.314zM306.373 232.693A12 12 0 0 0 294.838 224H259.1210000000001C250.9010000000001 224 245.1140000000001 232.078 247.7590000000001 239.861L304.855 407.861A12 12 0 0 0 316.217 416H355.783C360.9220000000001 416 365.4910000000001 412.727 367.1450000000001 407.861L424.2410000000001 239.861C426.886 232.078 421.1 224 412.879 224H377.144A12 12 0 0 0 365.629 232.622L357.3280000000001 260.9210000000001H314.4650000000001L306.3730000000001 232.693zM329.23 311.39H342.5970000000001L335.997 334.327L329.23 311.39zM341.805 24.067L409.256 119.765A12 12 0 0 1 411.448 126.678V148C411.448 154.627 406.075 160 399.448 160H274.522C267.895 160 262.522 154.627 262.522 148V119.07C262.522 112.443 267.895 107.07 274.522 107.07H330.991C330.252 106.079 329.494 105.034 328.721 103.937L261.5180000000001 8.732A12.001000000000001 12.001000000000001 0 0 1 259.322 1.812V-20C259.322 -26.627 264.695 -32 271.322 -32H400.677C407.3040000000001 -32 412.677 -26.627 412.677 -20V8.93C412.677 15.557 407.3040000000001 20.93 400.677 20.93H339.531C340.271 21.923 341.031 22.969 341.805 24.067z" />
-    <glyph glyph-name="sort-amount-down"
-      unicode="&#xF160;"
-      horiz-adv-x="512" d=" M187.298 52.686L107.314 -27.316C101.066 -33.563 90.931 -33.561 84.687 -27.316L4.705 52.686C-5.365 62.756 1.807 80 16.019 80H64V400C64 408.837 71.163 416 80 416H112C120.837 416 128 408.837 128 400V80H175.984C190.225 80 197.347 62.736 187.298 52.686zM240 352H496C504.837 352 512 359.163 512 368V400C512 408.837 504.837 416 496 416H240C231.163 416 224 408.837 224 400V368C224 359.163 231.163 352 240 352zM224 240V272C224 280.837 231.163 288 240 288H432C440.837 288 448 280.837 448 272V240C448 231.163 440.837 224 432 224H240C231.163 224 224 231.163 224 240zM224 -16V16C224 24.837 231.163 32 240 32H304C312.837 32 320 24.837 320 16V-16C320 -24.837 312.837 -32 304 -32H240C231.163 -32 224 -24.837 224 -16zM224 112V144C224 152.837 231.163 160 240 160H368C376.837 160 384 152.837 384 144V112C384 103.163 376.837 96 368 96H240C231.163 96 224 103.163 224 112z" />
-    <glyph glyph-name="sort-amount-up"
-      unicode="&#xF161;"
-      horiz-adv-x="512" d=" M4.702 331.314L84.686 411.316C90.934 417.563 101.069 417.561 107.313 411.316L187.294 331.314C197.364 321.2440000000001 190.193 304 175.98 304H128V-16C128 -24.837 120.837 -32 112 -32H80C71.163 -32 64 -24.837 64 -16V304H16.016C1.775 304 -5.347 321.264 4.702 331.314zM240 352H496C504.837 352 512 359.163 512 368V400C512 408.837 504.837 416 496 416H240C231.163 416 224 408.837 224 400V368C224 359.163 231.163 352 240 352zM224 240V272C224 280.837 231.163 288 240 288H432C440.837 288 448 280.837 448 272V240C448 231.163 440.837 224 432 224H240C231.163 224 224 231.163 224 240zM224 -16V16C224 24.837 231.163 32 240 32H304C312.837 32 320 24.837 320 16V-16C320 -24.837 312.837 -32 304 -32H240C231.163 -32 224 -24.837 224 -16zM224 112V144C224 152.837 231.163 160 240 160H368C376.837 160 384 152.837 384 144V112C384 103.163 376.837 96 368 96H240C231.163 96 224 103.163 224 112z" />
-    <glyph glyph-name="sort-down"
-      unicode="&#xF0DD;"
-      horiz-adv-x="320" d=" M41 160H279C300.4 160 311.1 134.1 296 119L177 0C167.6 -9.4 152.4 -9.4 143.1 0L24 119C8.9 134.1 19.6 160 41 160z" />
-    <glyph glyph-name="sort-numeric-down"
-      unicode="&#xF162;"
-      horiz-adv-x="448" d=" M308.811 334.213L289.363 355.008C284.841 359.844 285.089 367.429 289.919 371.958L333.362 412.699A11.999000000000002 11.999000000000002 0 0 0 341.571 415.9460000000001H373.162C379.789 415.9460000000001 385.162 410.573 385.162 403.9460000000001V276.876H410.822C417.449 276.876 422.822 271.5030000000001 422.822 264.876V235.946C422.822 229.319 417.449 223.946 410.822 223.946H301.649C295.022 223.946 289.649 229.319 289.649 235.946V264.876C289.649 271.5030000000001 295.022 276.876 301.649 276.876H327.063V334.814C319.809 328.2340000000001 312.852 329.8930000000001 308.811 334.213zM278.241 95.644C278.241 128.297 302.106 163 346.335 163C384.588 163 425.759 134.139 425.759 70.772C425.759 19.496 393.522 -35 333.776 -35C315.94 -35 303.23 -31.443 295.228 -28.219C289.438 -25.886 286.439 -19.473 288.306 -13.516L297.543 15.964C299.5780000000001 22.46 306.592 25.947 313.01 23.68C326.039 19.078 340.888 18.405 351.113 27.818C312.371 22.746 278.241 53.178 278.241 95.644zM370.514 76.306C370.514 98.591 355.212 112.811 344.6790000000001 112.811C336.0370000000001 112.811 331.5150000000001 104.846 331.5150000000001 96.979C331.5150000000001 91.31 333.3300000000001 72.811 356.6830000000001 72.811C366.6560000000001 72.811 370.0600000000001 74.965 370.427 75.542C370.4480000000001 75.588 370.514 75.833 370.514 76.306zM175.984 80H128V400C128 408.837 120.837 416 112 416H80C71.163 416 64 408.837 64 400V80H16.019C1.807 80 -5.365 62.756 4.705 52.686L84.686 -27.316C90.931 -33.561 101.066 -33.563 107.313 -27.316L187.297 52.686C197.347 62.736 190.225 80 175.984 80z" />
-    <glyph glyph-name="sort-numeric-up"
-      unicode="&#xF163;"
-      horiz-adv-x="448" d=" M308.811 334.213L289.363 355.008C284.841 359.844 285.089 367.429 289.919 371.958L333.362 412.699A11.999000000000002 11.999000000000002 0 0 0 341.571 415.9460000000001H373.162C379.789 415.9460000000001 385.162 410.573 385.162 403.9460000000001V276.876H410.822C417.449 276.876 422.822 271.5030000000001 422.822 264.876V235.946C422.822 229.319 417.449 223.946 410.822 223.946H301.649C295.022 223.946 289.649 229.319 289.649 235.946V264.876C289.649 271.5030000000001 295.022 276.876 301.649 276.876H327.063V334.814C319.809 328.2340000000001 312.852 329.8930000000001 308.811 334.213zM278.241 95.644C278.241 128.297 302.106 163 346.335 163C384.588 163 425.759 134.139 425.759 70.772C425.759 19.496 393.522 -35 333.776 -35C315.94 -35 303.23 -31.443 295.228 -28.219C289.438 -25.886 286.439 -19.473 288.306 -13.516L297.543 15.964C299.5780000000001 22.46 306.592 25.947 313.01 23.68C326.039 19.078 340.888 18.405 351.113 27.818C312.371 22.746 278.241 53.178 278.241 95.644zM370.514 76.306C370.514 98.591 355.212 112.811 344.6790000000001 112.811C336.0370000000001 112.811 331.5150000000001 104.846 331.5150000000001 96.979C331.5150000000001 91.31 333.3300000000001 72.811 356.6830000000001 72.811C366.6560000000001 72.811 370.0600000000001 74.965 370.427 75.542C370.4480000000001 75.588 370.514 75.833 370.514 76.306zM16.016 304H64V-16C64 -24.837 71.163 -32 80 -32H112C120.837 -32 128 -24.837 128 -16V304H175.981C190.193 304 197.365 321.2440000000001 187.295 331.314L107.314 411.316C101.069 417.561 90.934 417.563 84.687 411.316L4.702 331.314C-5.347 321.264 1.775 304 16.016 304z" />
-    <glyph glyph-name="sort-up"
-      unicode="&#xF0DE;"
-      horiz-adv-x="320" d=" M279 224H41C19.6 224 8.9 249.9 24 265L143 384C152.4 393.4 167.6 393.4 176.9 384L295.9 265C311.1 249.9 300.4 224 279 224z" />
-    <glyph glyph-name="sort"
-      unicode="&#xF0DC;"
-      horiz-adv-x="320" d=" M41 160H279C300.4 160 311.1 134.1 296 119L177 0C167.6 -9.4 152.4 -9.4 143.1 0L24 119C8.9 134.1 19.6 160 41 160zM296 265L177 384C167.6 393.4 152.4 393.4 143.1 384L24 265C8.9 249.9 19.6 224 41 224H279C300.4 224 311.1 249.9 296 265z" />
-    <glyph glyph-name="spa"
-      unicode="&#xF5BB;"
-      horiz-adv-x="576" d=" M568.25 256C539.21 255.87 433.24 249.84 354.41 173C321.29 143.37 301.05 109.7 288 78.14C274.95 109.7 254.71 143.37 221.59 173C142.76 249.84 36.79 255.87 7.75 256C3.34 256.02 -0.04 252.6 0 248.18C0.23 220.26 7.14 122.04 88.77 48.88C172.79 -32.94 256 -32 288 -32S403.19 -32.95 487.23 48.88C568.87 122.05 575.77 220.26 576 248.18C576.04 252.6 572.66 256.02 568.25 256zM287.98 145.4C300.8 164.25 315.5800000000001 181.18 332.0700000000001 195.92C351.1600000000001 214.53 371.6500000000001 229.22 392.3300000000001 241.1C375.8900000000001 311.6 340.61 374.15 295.6 413.32C291.49 416.9 284.5800000000001 416.9 280.4600000000001 413.32C235.4700000000001 374.18 200.1900000000001 311.69 183.72 241.25C204.09 229.55 224.22 215.11 242.9400000000001 196.86A282.768 282.768 0 0 0 287.98 145.4z" />
-    <glyph glyph-name="space-shuttle"
-      unicode="&#xF197;"
-      horiz-adv-x="640" d=" M592.604 239.756C559.735 255.164 515.777 264 472 264H186.327C181.375 270.555 175.742 275.978 169.607 280H376C229.157 310.253 219.403 416 96.003 416H96V288H80V416C53.49 416 32 387.346 32 352V288C8.803 288 0 277.968 0 264V224C0 210.017 8.819 200 32 200V184C8.803 184 0 173.968 0 160V120C0 106.017 8.819 96 32 96V32C32 -3.346 53.49 -32 80 -32V96H96V-32H96.003C219.403 -32 229.157 73.747 376 104H169.606C175.741 108.022 181.374 113.445 186.326 120H472C515.777 120 559.735 128.836 592.604 144.244C622.282 158.155 640 176.008 640 192S622.282 225.845 592.604 239.756zM488 152A8 8 0 0 0 480 160V224A8 8 0 0 0 488 232C519.909 232 519.942 152 488 152z" />
-    <glyph glyph-name="spinner"
-      unicode="&#xF110;"
-      horiz-adv-x="512" d=" M304 400C304 373.49 282.51 352 256 352S208 373.49 208 400S229.49 448 256 448S304 426.51 304 400zM256 32C229.49 32 208 10.51 208 -16S229.49 -64 256 -64S304 -42.51 304 -16S282.51 32 256 32zM464 240C437.49 240 416 218.51 416 192S437.49 144 464 144S512 165.49 512 192S490.51 240 464 240zM96 192C96 218.51 74.51 240 48 240S0 218.51 0 192S21.49 144 48 144S96 165.49 96 192zM108.922 92.922C82.412 92.922 60.922 71.432 60.922 44.922S82.412 -3.078 108.922 -3.078S156.922 18.412 156.922 44.922C156.922 71.431 135.431 92.922 108.922 92.922zM403.078 92.922C376.568 92.922 355.078 71.432 355.078 44.922S376.568 -3.078 403.078 -3.078S451.078 18.412 451.078 44.922C451.078 71.431 429.588 92.922 403.078 92.922zM108.922 387.078C82.412 387.078 60.922 365.588 60.922 339.078S82.412 291.078 108.922 291.078S156.922 312.568 156.922 339.078S135.431 387.078 108.922 387.078z" />
-    <glyph glyph-name="splotch"
-      unicode="&#xF5BC;"
-      horiz-adv-x="512" d=" M472.29 252.11L405.23 275.06C385.9500000000001 281.66 371.69 295.98 367.0900000000001 313.36L351.1 373.81C339.5200000000001 417.58 274.5300000000001 430.94 241.12 396.43L194.98 348.76C181.72 335.05 161.44 327.8300000000001 140.78 329.45L68.9 335.07C16.85 339.14 -18.03 290.19 9.87 252.24L48.41 199.82C59.49 184.75 61.23 165.96 53.05 149.58L24.62 92.6C4.03 51.35 47.46 7.73 98.11 18.79L168.07 34.07C188.18 38.46 209.52 34.07 225.14 22.34L279.46 -18.49C318.78 -48.05 380.5 -26.06 383.91 18.73L388.61 80.59C389.96 98.3800000000001 401.41 114.4500000000001 419.24 123.5800000000001L481.24 155.3200000000001C526.12 178.28 520.8299999999999 235.4900000000001 472.29 252.1100000000001z" />
-    <glyph glyph-name="spray-can"
-      unicode="&#xF5BD;"
-      horiz-adv-x="512" d=" M224 416C224 433.67 209.67 448 192 448H128C110.33 448 96 433.67 96 416V320H224V416zM480 320C462.33 320 448 305.67 448 288S462.33 256 480 256S512 270.3300000000001 512 288S497.67 320 480 320zM224 288H96C42.98 288 0 245.02 0 192V-32C0 -49.67 14.33 -64 32 -64H288C305.67 -64 320 -49.67 320 -32V192C320 245.02 277.02 288 224 288zM160 32C115.82 32 80 67.82 80 112S115.82 192 160 192S240 156.18 240 112S204.18 32 160 32zM480 352C497.67 352 512 366.33 512 384S497.67 416 480 416S448 401.67 448 384S462.33 352 480 352zM384 320C366.33 320 352 305.67 352 288S366.33 256 384 256S416 270.3300000000001 416 288S401.67 320 384 320zM288 416C270.33 416 256 401.67 256 384S270.33 352 288 352S320 366.33 320 384S305.67 416 288 416zM384 416C366.33 416 352 401.67 352 384S366.33 352 384 352S416 366.33 416 384S401.67 416 384 416zM480 224C462.33 224 448 209.67 448 192S462.33 160 480 160S512 174.33 512 192S497.67 224 480 224z" />
-    <glyph glyph-name="square-full"
-      unicode="&#xF45C;"
-      horiz-adv-x="512" d=" M512 -64H0V448H512V-64z" />
-    <glyph glyph-name="square"
-      unicode="&#xF0C8;"
-      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416z" />
-    <glyph glyph-name="stamp"
-      unicode="&#xF5BF;"
-      horiz-adv-x="512" d=" M32 -64H480V0H32V-64zM416 192H349.44C333.18 192 320 205.18 320 221.44V230.9C320 258.27 328.88 284.31 341.46 308.62C350.57 326.23 354.36 347.01 350.51 369.04C343.74 407.82 312.04 439.74 273.25 446.49C212.62 457.04 160 410.67 160 352C160 337.8400000000001 163.12 324.4600000000001 168.69 312.42C182.02 283.57 192 253.3 192 221.51V221.44C192 205.18 178.82 192 162.56 192H96C42.98 192 0 149.02 0 96V64C0 46.33 14.33 32 32 32H480C497.67 32 512 46.33 512 64V96C512 149.02 469.02 192 416 192z" />
-    <glyph glyph-name="star-half-alt"
-      unicode="&#xF5C0;"
-      horiz-adv-x="536" d=" M508.55 276.49L362.18 297.8L296.77 430.19C290.89 442.02 279.42 448 267.95 448C256.55 448 245.16 442.1 239.26 430.19L173.83 297.81L27.45 276.52C1.2 272.7200000000001 -9.32 240.43 9.71 221.93L115.6 118.93L90.54 -26.55C86.98 -47.33 103.57 -64 122.15 -64C127.08 -64 132.15 -62.83 137.02 -60.25L267.9700000000001 8.43L398.9100000000001 -60.27C403.7700000000001 -62.82 408.8300000000001 -63.98 413.74 -63.98C432.3400000000001 -63.98 448.9600000000001 -47.3699999999999 445.4000000000001 -26.58L420.37 118.91L526.28 221.8900000000001C545.3199999999999 240.3900000000001 534.8 272.6900000000001 508.55 276.49zM386.81 153.29L368.69 135.67L372.97 110.79L392.49 -2.66L290.36 50.9300000000001L267.98 62.6700000000001L268.01 379.8600000000001L319.04 276.5700000000001L330.22 253.9400000000001L355.23 250.3000000000001L469.46 233.6700000000001L386.81 153.2900000000001z" />
-    <glyph glyph-name="star-half"
-      unicode="&#xF089;"
-      horiz-adv-x="576" d=" M288 448C276.6 448 265.2 442.1 259.3 430.2L194 297.8L47.9 276.6C21.7 272.8 11.2 240.5 30.2 222L135.9 119L110.9 -26.5C106.4 -52.6 133.9 -72.5 157.3 -60.2L288 8.4V448z" />
-    <glyph glyph-name="star"
-      unicode="&#xF005;"
-      horiz-adv-x="576" d=" M259.3 430.2L194 297.8L47.9 276.5C21.7 272.7 11.2 240.4 30.2 221.9L135.9 118.9L110.9 -26.6C106.4 -52.9 134.1 -72.6 157.3 -60.3L288 8.4L418.7 -60.3C441.9 -72.5 469.6 -52.9 465.1 -26.6L440.1 118.9L545.8 221.9C564.8 240.4 554.3 272.7 528.0999999999999 276.5L382 297.8L316.7 430.2C305 453.8 271.1 454.1 259.3 430.2z" />
-    <glyph glyph-name="step-backward"
-      unicode="&#xF048;"
-      horiz-adv-x="448" d=" M64 -20V404C64 410.6 69.4 416 76 416H124C130.6 416 136 410.6 136 404V227.6L331.5 408.6C352.1 425.7 384 411.4 384 384V0C384 -27.4 352.1 -41.7 331.5 -24.6L136 155.3V-20C136 -26.6 130.6 -32 124 -32H76C69.4 -32 64 -26.6 64 -20z" />
-    <glyph glyph-name="step-forward"
-      unicode="&#xF051;"
-      horiz-adv-x="448" d=" M384 404V-20C384 -26.6 378.6 -32 372 -32H324C317.4 -32 312 -26.6 312 -20V156.4L116.5 -24.6C95.9 -41.7 64 -27.4 64 0V384C64 411.4 95.9 425.7 116.5 408.6L312 228.7V404C312 410.6 317.4 416 324 416H372C378.6 416 384 410.6 384 404z" />
-    <glyph glyph-name="stethoscope"
-      unicode="&#xF0F1;"
-      horiz-adv-x="512" d=" M447.1 336C412.9000000000001 335.5 384.8 307.6 384.1 273.4C383.6 249.1 396.6 227.8 416.1 216.6V104C416.1 46.7 365.9000000000001 0 304.1 0C244.1 0 194.9 44.1 192.2 99.2C265 114.2 320 178.8 320 256V411.4C320 422.8 311.9 432.7 300.7 434.9L237.8 447.5C224.8 450.1 212.2 441.7 209.6 428.7L206.4 413C203.8 400 212.2 387.4 225.2 384.8L255.9 378.7V257.3C255.9 204.4 213.7 160.6 160.8 160.1C107.4 159.6 63.9 202.8 63.9 256.1V378.6L94.6 384.7C107.6 387.3 116 399.9 113.4 412.9L110.3 428.6C107.7 441.6 95.1 450 82.1 447.4L19.3 435C8.1 432.7 0 422.9 0 411.4V256C0 178.7 55.1 114 128.1 99.2C130.7 8.8 208.6 -64 304 -64C401 -64 480 11.4 480 104V216.6C499.1 227.7 512 248.3 512 272C512 307.7 482.8 336.5 447.1 336zM448 256C439.2 256 432 263.2 432 272S439.2 288 448 288S464 280.8 464 272S456.8 256 448 256z" />
-    <glyph glyph-name="sticky-note"
-      unicode="&#xF249;"
-      horiz-adv-x="448" d=" M312 128H448V392C448 405.3 437.3 416 424 416H24C10.7 416 0 405.3 0 392V-8C0 -21.3 10.7 -32 24 -32H288V104C288 117.2 298.8 128 312 128zM441 73L343 -25C338.5 -29.5 332.4 -32 326 -32H320V96H448V89.9C448 83.6 445.5 77.5 441 73z" />
-    <glyph glyph-name="stop-circle"
-      unicode="&#xF28D;"
-      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM352 112C352 103.2 344.8 96 336 96H176C167.2 96 160 103.2 160 112V272C160 280.8 167.2 288 176 288H336C344.8 288 352 280.8 352 272V112z" />
-    <glyph glyph-name="stop"
-      unicode="&#xF04D;"
-      horiz-adv-x="448" d=" M400 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H400C426.5 -32 448 -10.5 448 16V368C448 394.5 426.5 416 400 416z" />
-    <glyph glyph-name="stopwatch"
-      unicode="&#xF2F2;"
-      horiz-adv-x="448" d=" M432 144C432 29.1 338.9 -64 224 -64S16 29.1 16 144C16 248 92.3 334.2 192 349.5V384H164C157.4 384 152 389.4 152 396V436C152 442.6 157.4 448 164 448H284C290.6 448 296 442.6 296 436V396C296 389.4 290.6 384 284 384H256V349.5C293.5 343.7 327.7 327.9 355.7 304.9L383.2 332.4C387.9 337.1 395.5 337.1 400.2 332.4L428.5 304.1C433.2 299.4 433.2 291.8 428.5 287.1L399.1 257.7L398.5 257.1C419.7 224.7 432 185.8 432 144zM256 108V259.5C256 266.1 250.6 271.5 244 271.5H204C197.4 271.5 192 266.1 192 259.5V108C192 101.4 197.4 96 204 96H244C250.6 96 256 101.4 256 108z" />
-    <glyph glyph-name="store-alt"
-      unicode="&#xF54F;"
-      horiz-adv-x="640" d=" M320 64H128V224H64V-32C64 -49.7 78.3 -64 96 -64H352C369.7 -64 384 -49.7 384 -32V224H320V64zM634.6 305.8L549.3000000000001 433.8C543.3000000000001 442.7 533.3000000000001 448 522.6 448H117.4C106.7 448 96.7 442.7 90.8 433.8L5.5 305.8C-8.7 284.5 6.5 256 32.1 256H608C633.5 256 648.7 284.5 634.6 305.8zM512 -48C512 -56.8 519.2 -64 528 -64H560C568.8 -64 576 -56.8 576 -48V224H512V-48z" />
-    <glyph glyph-name="store"
-      unicode="&#xF54E;"
-      horiz-adv-x="616" d=" M602 329.4L537.1 433C531.3 442.3 521 448 510 448H106C95 448 84.7 442.3 78.9 433L14 329.4C-19.5 275.9 10.2 201.5 72.8 193C77.3 192.4 81.9 192.1 86.5 192.1C116.1 192.1 142.3 205.1 160.3 225.2C178.3 205.1 204.6 192.1 234.1 192.1C263.7000000000001 192.1 289.9000000000001 205.1 307.9000000000001 225.2C325.9000000000001 205.1 352.2000000000001 192.1 381.7000000000001 192.1C411.3000000000001 192.1 437.5000000000001 205.1 455.5000000000001 225.2C473.6000000000001 205.1 499.8000000000001 192.1 529.3000000000001 192.1C534.0000000000001 192.1 538.5000000000001 192.4 543.0000000000001 193C605.8000000000001 201.4 635.6000000000001 275.8 602.0000000000001 329.4zM529.5 160C519.5 160 509.6 161.5 500 163.8V64H116V163.8C106.4 161.6 96.5 160 86.5 160C80.5 160 74.4 160.4 68.5 161.2C62.9 162 57.4 163.3 52.1 164.8V-32C52.1 -49.7 66.4 -64 84.1 -64H532.1C549.8000000000001 -64 564.1 -49.7 564.1 -32V164.8C558.7 163.2 553.3000000000001 161.9 547.7 161.2C541.6 160.4 535.6 160 529.5 160z" />
-    <glyph glyph-name="stream"
-      unicode="&#xF550;"
-      horiz-adv-x="512" d=" M16 320H432C440.84 320 448 327.16 448 336V400C448 408.8400000000001 440.84 416 432 416H16C7.16 416 0 408.8400000000001 0 400V336C0 327.16 7.16 320 16 320zM496 240H80C71.16 240 64 232.84 64 224V160C64 151.16 71.16 144 80 144H496C504.84 144 512 151.16 512 160V224C512 232.84 504.84 240 496 240zM432 64H16C7.16 64 0 56.84 0 48V-16C0 -24.84 7.16 -32 16 -32H432C440.84 -32 448 -24.84 448 -16V48C448 56.84 440.84 64 432 64z" />
-    <glyph glyph-name="street-view"
-      unicode="&#xF21D;"
-      horiz-adv-x="512" d=" M192 384C192 419.346 220.654 448 256 448S320 419.346 320 384C320 348.654 291.346 320 256 320S192 348.654 192 384zM304 304H292.64C269.929 293.557 243.05 293.106 219.36 304H208C181.49 304 160 282.51 160 256V152C160 138.745 170.745 128 184 128H200V24C200 10.745 210.745 0 224 0H288C301.255 0 312 10.745 312 24V128H328C341.255 128 352 138.745 352 152V256C352 282.51 330.51 304 304 304zM389.642 114.848A72.50299999999999 72.50299999999999 0 0 0 360.632 87.839C391.133 82.749 480 62.146 480 32C480 -14.304 312.344 -32 256 -32C185.697 -32 32 -11.141 32 32C32 62.123 120.361 82.665 151.367 87.839A72.516 72.516 0 0 0 122.357 114.848C74.959 104.605 0 80.401 0 32C0 -45.111 178.658 -64 256 -64C333.249 -64 512 -45.135 512 32C512 80.403 437.033 104.606 389.642 114.848z" />
-    <glyph glyph-name="strikethrough"
-      unicode="&#xF0CC;"
-      horiz-adv-x="512" d=" M496 160H16C7.163 160 0 167.163 0 176V208C0 216.837 7.163 224 16 224H496C504.837 224 512 216.837 512 208V176C512 167.163 504.837 160 496 160zM281.334 144C308.592 131.063 327.858 115.317 327.858 87.757C327.858 54.649 298.8810000000001 34.081 252.237 34.081C219.912 34.081 175.363 46.161 175.363 78.352V80C175.363 88.837 168.1990000000001 96 159.363 96H113.75C104.914 96 97.75 88.837 97.75 80V60.796C97.75 -6.049 175.467 -41.024 252.237 -41.024C340.815 -41.024 414.25 4.414 414.25 93.4C414.25 113.215 410.632 129.817 404.107 144H281.334zM250.382 240C217.96 253.505 193.546 268.9460000000001 193.546 299.683C193.546 333.603 224.447 347.089 258.508 347.089C301.155 347.089 323.47 330.496 323.47 314.104V312C323.47 303.163 330.634 296 339.47 296H385.083C393.919 296 401.083 303.163 401.083 312V342.318C401.083 394.756 329.358 422.193 258.508 422.193C173.305 422.193 107.782 381.221 107.782 296.5470000000001C107.782 273.837 112.447 255.371 120.559 240H250.382z" />
-    <glyph glyph-name="stroopwafel"
-      unicode="&#xF551;"
-      horiz-adv-x="512" d=" M188.12 237.26L142.86 192L188.11 146.75L233.37 192L188.12 237.26zM301.25 259.88L256 305.14L210.75 259.89L256 214.63L301.25 259.88zM210.75 124.12L256 78.86L301.26 124.12L256 169.37L210.75 124.12zM256 448C114.62 448 0 333.38 0 192S114.62 -64 256 -64S512 50.62 512 192S397.38 448 256 448zM442.68 152.4L431.37 141.09C428.25 137.97 423.18 137.97 420.06 141.09L391.77 169.38L346.52 124.13L380.46 90.19L397.43 107.16C400.55 110.28 405.62 110.28 408.74 107.16L420.05 95.85C423.17 92.73 423.17 87.66 420.05 84.54L403.08 67.5699999999999L420.05 50.5999999999999C423.17 47.4799999999999 423.17 42.4099999999999 420.05 39.2899999999999L408.74 27.9799999999999C405.62 24.8599999999999 400.55 24.8599999999999 397.43 27.9799999999999L380.4599999999999 44.9499999999999L363.4899999999999 27.9799999999999C360.3699999999999 24.8599999999999 355.2999999999999 24.8599999999999 352.1799999999999 27.9799999999999L340.8699999999999 39.2899999999999C337.7499999999999 42.4099999999999 337.7499999999999 47.4799999999999 340.8699999999999 50.5999999999999L357.8399999999999 67.5699999999999L323.8999999999999 101.5099999999999L278.64 56.2499999999999L306.93 27.9599999999999C310.05 24.8399999999999 310.05 19.7699999999999 306.93 16.6499999999999L295.62 5.3399999999999C292.5 2.2199999999999 287.43 2.2199999999999 284.31 5.3399999999999L256 33.61L227.71 5.32C224.59 2.2 219.52 2.2 216.4 5.32L205.09 16.63C201.97 19.75 201.97 24.82 205.09 27.94L233.38 56.23L188.13 101.49L154.19 67.55L171.16 50.58C174.28 47.46 174.28 42.39 171.16 39.27L159.85 27.96C156.73 24.84 151.66 24.84 148.54 27.96L131.57 44.9300000000001L114.6 27.96C111.48 24.84 106.41 24.84 103.29 27.96L91.98 39.27C88.86 42.39 88.86 47.46 91.98 50.58L108.95 67.5500000000001L91.98 84.5200000000001C88.86 87.6400000000001 88.86 92.7100000000001 91.98 95.8300000000001L103.29 107.1400000000001C106.41 110.2600000000001 111.48 110.2600000000001 114.6 107.1400000000001L131.57 90.1700000000001L165.51 124.1100000000001L120.26 169.3600000000001L91.97 141.0700000000001C88.85 137.9500000000001 83.78 137.9500000000001 80.66 141.0700000000001L69.32 152.4C66.2 155.52 66.2 160.59 69.32 163.71L97.61 192L69.32 220.29C66.2 223.41 66.2 228.48 69.32 231.6L80.63 242.91C83.75 246.03 88.82 246.03 91.94 242.91L120.23 214.62L165.48 259.88L131.54 293.82L114.57 276.85C111.45 273.73 106.38 273.73 103.26 276.85L91.95 288.16C88.83 291.28 88.83 296.35 91.95 299.4700000000001L108.92 316.44L91.95 333.41C88.83 336.53 88.83 341.6 91.95 344.7200000000001L103.26 356.03C106.38 359.15 111.45 359.15 114.57 356.03L131.54 339.06L148.51 356.03C151.63 359.15 156.7 359.15 159.82 356.03L171.13 344.7200000000001C174.25 341.6 174.25 336.53 171.13 333.41L154.16 316.44L188.1 282.5L233.36 327.75L205.07 356.04C201.95 359.16 201.95 364.23 205.07 367.35L216.38 378.66C219.5 381.78 224.57 381.78 227.69 378.66L256 350.39L284.29 378.68C287.4100000000001 381.8 292.48 381.8 295.6 378.68L306.9100000000001 367.37C310.0300000000001 364.25 310.0300000000001 359.18 306.9100000000001 356.06L278.62 327.77L323.88 282.52L357.82 316.4600000000001L340.85 333.43C337.73 336.55 337.73 341.62 340.85 344.74L352.1600000000001 356.05C355.2800000000001 359.17 360.35 359.17 363.4700000000001 356.05L380.4400000000001 339.0800000000001L397.4100000000001 356.05C400.5300000000001 359.17 405.6000000000001 359.17 408.7200000000001 356.05L420.0300000000001 344.74C423.1500000000001 341.62 423.1500000000001 336.55 420.0300000000001 333.43L403.0600000000001 316.4600000000001L420.0300000000001 299.49C423.1500000000001 296.37 423.1500000000001 291.3 420.0300000000001 288.18L408.7200000000001 276.87C405.6000000000001 273.75 400.5300000000001 273.75 397.4100000000001 276.87L380.4400000000001 293.8400000000001L346.5000000000001 259.9L391.7500000000001 214.64L420.0400000000001 242.93C423.1600000000001 246.05 428.2300000000001 246.05 431.3500000000001 242.93L442.6600000000001 231.62C445.7800000000001 228.5 445.7800000000001 223.43 442.6600000000001 220.31L414.39 192L442.68 163.72A8.015 8.015 0 0 0 442.68 152.4zM278.63 192L323.89 146.75L369.14 192L323.89 237.26L278.63 192z" />
-    <glyph glyph-name="subscript"
-      unicode="&#xF12C;"
-      horiz-adv-x="512" d=" M395.198 32C398.659 42.526 413.994 53.28 431.463 64.425C448.088 75.03 466.9299999999999 87.051 481.804 103.287C499.2619999999999 122.341 507.748 143.4620000000001 507.748 167.8540000000001C507.748 228.4160000000001 457.046 256.0000000000001 409.938 256.0000000000001C367.447 256.0000000000001 333.56 233.9840000000001 315.506 205.5530000000001C310.852 198.2240000000001 312.914 188.5170000000001 320.129 183.6880000000001L350.457 163.3920000000001C357.4889999999999 158.686 366.9169999999999 160.3080000000001 372.087 167.006C380.1089999999999 177.4 390.9049999999999 185.2310000000001 403.7539999999999 185.2310000000001C423.1409999999999 185.2310000000001 430.0199999999999 172.3300000000001 430.0199999999999 161.2830000000001C430.0199999999999 125.1240000000001 310.5829999999999 104.2600000000001 310.5829999999999 1.2590000000001C310.5829999999999 -5.3949999999999 311.1439999999999 -11.7549999999999 311.998 -18.0719999999999C313.074 -26.0359999999999 319.832 -31.9999999999999 327.868 -31.9999999999999H496C504.837 -31.9999999999999 512 -24.8369999999999 512 -15.9999999999999V16.0000000000001C512 24.837 504.837 32.0000000000001 496 32.0000000000001H395.198zM272 192C280.837 192 288 184.837 288 176V144C288 135.163 280.837 128 272 128H209.601A16 16 0 0 0 196.06 135.478L150.359 208.093C148.062 211.445 145.937 215.062 144.164 218.302C142.514 215.058 140.517 211.365 138.29 207.72L93.578 135.573A15.999 15.999 0 0 0 79.978 128.001H16C7.163 128.001 0 135.1640000000001 0 144.001V176.001C0 184.838 7.163 192.001 16 192.001H42.325L98.877 274.7100000000001L46.111 352H16C7.163 352 0 359.163 0 368V400C0 408.837 7.163 416 16 416H84.806A16 16 0 0 0 98.451 408.356L138.333 343.23C140.405 339.707 142.386 336.059 144.06 332.86C145.837 336.104 147.98 339.814 150.297 343.397L190.629 408.432A15.999 15.999 0 0 0 204.226 416H272C280.837 416 288 408.837 288 400V368C288 359.163 280.837 352 272 352H244.021L191.331 276.329L249.974 192H272z" />
-    <glyph glyph-name="subway"
-      unicode="&#xF239;"
-      horiz-adv-x="448" d=" M448 352V96C448 44.185 386.376 0 317.978 0L380.9580000000001 -49.721C386.905 -54.417 383.562 -64 376 -64H72C64.422 -64 61.108 -54.406 67.043 -49.721L130.022 0C61.82 0 0 44.046 0 96V352C0 405.019 64 448 128 448H320C385 448 448 405.019 448 352zM200 216V328C200 341.255 189.255 352 176 352H72C58.745 352 48 341.255 48 328V216C48 202.745 58.745 192 72 192H176C189.255 192 200 202.745 200 216zM400 216V328C400 341.255 389.255 352 376 352H272C258.745 352 248 341.255 248 328V216C248 202.745 258.745 192 272 192H376C389.255 192 400 202.745 400 216zM352 160C325.49 160 304 138.51 304 112S325.49 64 352 64S400 85.49 400 112S378.51 160 352 160zM96 160C69.49 160 48 138.51 48 112S69.49 64 96 64S144 85.49 144 112S122.51 160 96 160z" />
-    <glyph glyph-name="suitcase-rolling"
-      unicode="&#xF5C1;"
-      horiz-adv-x="384" d=" M336 288H48C21.49 288 0 266.51 0 240V16C0 -10.51 21.49 -32 48 -32H64V-48C64 -56.84 71.16 -64 80 -64H112C120.84 -64 128 -56.84 128 -48V-32H256V-48C256 -56.84 263.1600000000001 -64 272 -64H304C312.84 -64 320 -56.84 320 -48V-32H336C362.51 -32 384 -10.51 384 16V240C384 266.51 362.51 288 336 288zM320 72C320 67.58 316.42 64 312 64H72C67.58 64 64 67.58 64 72V88C64 92.42 67.58 96 72 96H312C316.42 96 320 92.42 320 88V72zM320 168C320 163.58 316.42 160 312 160H72C67.58 160 64 163.58 64 168V184C64 188.42 67.58 192 72 192H312C316.42 192 320 188.42 320 184V168zM144 400H240V320H288V400C288 426.51 266.51 448 240 448H144C117.49 448 96 426.51 96 400V320H144V400z" />
-    <glyph glyph-name="suitcase"
-      unicode="&#xF0F2;"
-      horiz-adv-x="512" d=" M128 -32H384V368C384 394.5 362.5 416 336 416H176C149.5 416 128 394.5 128 368V-32zM192 352H320V320H192V352zM512 272V16C512 -10.5 490.5 -32 464 -32H416V320H464C490.5 320 512 298.5 512 272zM96 -32H48C21.5 -32 0 -10.5 0 16V272C0 298.5 21.5 320 48 320H96V-32z" />
-    <glyph glyph-name="sun"
-      unicode="&#xF185;"
-      horiz-adv-x="512" d=" M274.835 435.354L300.351 372.961C304.564 362.66 317.022 358.612 326.485 364.469L383.8010000000001 399.948C399.2910000000001 409.536 418.6090000000001 395.501 414.2760000000001 377.806L398.2460000000001 312.331C395.5990000000001 301.521 403.2990000000001 290.923 414.3980000000001 290.1L481.6220000000001 285.1130000000001C499.7890000000001 283.765 507.1680000000001 261.0560000000001 493.2630000000001 249.2870000000001L441.81 205.74C433.315 198.55 433.315 185.451 441.81 178.261L493.264 134.713C507.17 122.944 499.791 100.235 481.623 98.887L414.399 93.9C403.3 93.077 395.6 82.479 398.247 71.669L414.2770000000001 6.194C418.6090000000001 -11.501 399.2910000000001 -25.5360000000001 383.802 -15.948L326.486 19.531C317.023 25.389 304.564 21.341 300.352 11.0389999999999L274.836 -51.354C267.94 -68.216 244.062 -68.216 237.166 -51.354L211.65 11.039C207.437 21.34 194.979 25.388 185.516 19.531L128.199 -15.948C112.709 -25.536 93.391 -11.501 97.724 6.194L113.754 71.669C116.401 82.479 108.701 93.077 97.602 93.9L30.378 98.887C12.211 100.235 4.832 122.944 18.737 134.713L70.19 178.26C78.685 185.45 78.685 198.549 70.19 205.739L18.736 249.287C4.83 261.056 12.209 283.765 30.377 285.113L97.601 290.1C108.7 290.923 116.4 301.521 113.753 312.331L97.723 377.806C93.391 395.501 112.709 409.536 128.198 399.948L185.515 364.469C194.978 358.611 207.436 362.659 211.649 372.961L237.165 435.354C244.061 452.215 267.939 452.215 274.835 435.354zM392 192C392 266.991 330.99 328 256 328C181.009 328 120 266.991 120 192S181.009 56 256 56C330.99 56 392 117.009 392 192zM360 192C360 134.654 313.346 88 256 88S152 134.654 152 192S198.654 296 256 296S360 249.346 360 192z" />
-    <glyph glyph-name="superscript"
-      unicode="&#xF12B;"
-      horiz-adv-x="512" d=" M395.198 192C398.659 202.526 413.994 213.28 431.463 224.425C448.088 235.03 466.9299999999999 247.051 481.804 263.2870000000001C499.2619999999999 282.341 507.748 303.462 507.748 327.854C507.748 388.416 457.046 416 409.938 416C367.447 416 333.56 393.984 315.506 365.553C310.852 358.224 312.914 348.517 320.129 343.688L350.457 323.392C357.4889999999999 318.6860000000001 366.9169999999999 320.308 372.087 327.006C380.1089999999999 337.4 390.9049999999999 345.231 403.7539999999999 345.231C423.1409999999999 345.231 430.0199999999999 332.33 430.0199999999999 321.283C430.0199999999999 285.124 310.5829999999999 264.26 310.5829999999999 161.259C310.5829999999999 154.605 311.1439999999999 148.245 311.998 141.928C313.074 133.964 319.832 128 327.868 128H496C504.837 128 512 135.163 512 144V176C512 184.837 504.837 192 496 192H395.198zM272 32C280.837 32 288 24.837 288 16V-16C288 -24.837 280.837 -32 272 -32H209.601A16 16 0 0 0 196.06 -24.522L150.359 48.093C148.062 51.445 145.937 55.062 144.164 58.302C142.514 55.058 140.517 51.365 138.29 47.72L93.578 -24.427A15.999 15.999 0 0 0 79.978 -31.999H16C7.163 -31.999 0 -24.836 0 -15.999V16.001C0 24.838 7.163 32.001 16 32.001H42.325L98.877 114.71L46.111 192H16C7.163 192 0 199.163 0 208V240C0 248.837 7.163 256 16 256H84.806A16 16 0 0 0 98.451 248.356L138.333 183.23C140.405 179.707 142.386 176.059 144.06 172.86C145.837 176.1040000000001 147.98 179.814 150.297 183.397L190.629 248.432A16 16 0 0 0 204.227 255.999H272C280.837 255.999 288 248.836 288 239.999V207.999C288 199.162 280.837 191.999 272 191.999H244.021L191.331 116.328L249.974 32H272z" />
-    <glyph glyph-name="surprise"
-      unicode="&#xF5C2;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM136 240C136 257.7 150.3 272 168 272S200 257.7 200 240S185.7 208 168 208S136 222.3 136 240zM248 32C212.7 32 184 60.7 184 96S212.7 160 248 160S312 131.3 312 96S283.3 32 248 32zM328 208C310.3 208 296 222.3 296 240S310.3 272 328 272S360 257.7 360 240S345.7 208 328 208z" />
-    <glyph glyph-name="swatchbook"
-      unicode="&#xF5C3;"
-      horiz-adv-x="511" d=" M479.06 128H372.29L186.15 -58.51C184.09 -60.58 181.66 -62.09 179.48 -64H479.06C496.7 -64 511 -49.67 511 -32V96C511 113.67 496.7 128 479.06 128zM434.56 280.9L344.23 371.4100000000001C331.76 383.9100000000001 311.54 383.9100000000001 299.06 371.4100000000001L223.56 295.76V32C223.56 29.04 222.89 26.27 222.69 23.36L434.56 235.64C447.0300000000001 248.14 447.0300000000001 268.4100000000001 434.56 280.9zM191.62 416C191.62 433.67 177.32 448 159.68 448H31.94C14.3 448 0 433.67 0 416V32C0 -21.02 42.9 -64 95.81 -64S191.62 -21.02 191.62 32V416zM95.81 8C82.58 8 71.86 18.75 71.86 32C71.86 45.26 82.59 56 95.81 56S119.76 45.26 119.76 32C119.77 18.75 109.04 8 95.81 8zM127.75 192H63.88V256H127.76V192zM127.75 320H63.88V384H127.76V320z" />
-    <glyph glyph-name="swimmer"
-      unicode="&#xF5C4;"
-      horiz-adv-x="640" d=" M189.61 137.42C193.15 134.16 204.88 128 224 128S254.86 134.16 258.39 137.42C274.41 152.19 292.89 160 311.85 160H328.15C347.11 160 365.6 152.19 381.61 137.42C385.15 134.16 396.88 128 416 128S446.86 134.16 450.3899999999999 137.42C465.2499999999999 151.13 482.2699999999999 158.54 499.7799999999999 159.5800000000001L386.94 240.1800000000001L404.94 253.04C408.58 255.6200000000001 413.2199999999999 256.5600000000001 417.56 255.6500000000001L517.91 234.1200000000001C543.8199999999999 228.5900000000001 569.3499999999999 245.0900000000001 574.91 271C580.4599999999999 296.92 563.9599999999999 322.4400000000001 538.03 328L437.68 349.53C406.95 356.11 374.6600000000001 349.41 349.12 331.15L269.1 273.98C258.7200000000001 266.5900000000001 249.74 257.54 242.38 247.04L173.75 149C179.22 145.77 184.57 142.07 189.61 137.42zM624 96H608C581.96 96 562.2 104.42 551.91 113.9C543.01 122.11 532.25 128 520.14 128H503.84C491.73 128 480.97 122.11 472.07 113.9C461.8 104.42 442.04 96 416 96S370.2 104.42 359.91 113.9C351.01 122.11 340.25 128 328.14 128H311.84C299.73 128 288.97 122.11 280.07 113.9C269.8 104.42 250.04 96 224 96S178.2 104.42 167.91 113.9C159.01 122.11 148.25 128 136.14 128H119.84C107.73 128 96.97 122.11 88.07 113.9C77.8 104.42 58.04 96 32 96H16C7.16 96 0 88.84 0 80V48C0 39.16 7.16 32 16 32H32C70.62 32 104.72 44.19 128 63.84C151.28 44.18 185.38 32 224 32S296.7200000000001 44.19 320 63.84C343.28 44.18 377.38 32 416 32S488.72 44.19 512 63.84C535.28 44.18 569.38 32 608 32H624C632.84 32 640 39.16 640 48V80C640 88.84 632.84 96 624 96zM112 192C156.18 192 192 227.82 192 272S156.18 352 112 352S32 316.18 32 272S67.82 192 112 192z" />
-    <glyph glyph-name="swimming-pool"
-      unicode="&#xF5C5;"
-      horiz-adv-x="640" d=" M624 32H608C581.96 32 562.2 40.42 551.91 49.9C543.01 58.11 532.25 64 520.14 64H503.84C491.73 64 480.97 58.11 472.07 49.9C461.8 40.42 442.04 32 416 32S370.2 40.42 359.91 49.9C351.01 58.11 340.25 64 328.14 64H311.84C299.73 64 288.97 58.11 280.07 49.9C269.8 40.42 250.04 32 224 32S178.2 40.42 167.91 49.9C159.01 58.11 148.25 64 136.14 64H119.84C107.73 64 96.97 58.11 88.07 49.9C77.8 40.42 58.04 32 32 32H16C7.16 32 0 24.84 0 16V-16C0 -24.84 7.16 -32 16 -32H32C70.62 -32 104.72 -19.81 128 -0.16C151.28 -19.82 185.38 -32 224 -32S296.7200000000001 -19.81 320 -0.16C343.28 -19.82 377.38 -32 416 -32S488.72 -19.81 512 -0.16C535.28 -19.82 569.38 -32 608 -32H624C632.84 -32 640 -24.84 640 -16V16C640 24.84 632.84 32 624 32zM224 64V160H416V64C435.12 64 446.86 70.16 450.39 73.42C459.56 81.88 469.59 87.76 480 91.49V320C480 337.64 494.36 352 512 352S544 337.64 544 320V304C544 295.16 551.16 288 560 288H592C600.84 288 608 295.16 608 304V320C608 372.94 564.94 416 512 416S416 372.94 416 320V224H224V320C224 337.64 238.36 352 256 352S288 337.64 288 320V304C288 295.16 295.1600000000001 288 304 288H336C344.84 288 352 295.16 352 304V320C352 372.94 308.94 416 256 416S160 372.94 160 320V91.5C170.41 87.77 180.44 81.88 189.61 73.43C193.14 70.16 204.88 64 224 64z" />
-    <glyph glyph-name="sync-alt"
-      unicode="&#xF2F1;"
-      horiz-adv-x="512" d=" M370.7200000000001 314.7200000000001C339.4580000000001 343.992 298.888 360.038 255.848 360C178.39 359.932 111.52 306.822 93.057 233.15C91.713 227.787 86.935 224 81.406 224H24.103C16.605 224 10.909 230.807 12.296 238.176C33.933 353.076 134.813 440 256 440C322.448 440 382.791 413.8640000000001 427.315 371.315L463.03 407.03C478.149 422.149 504 411.4410000000001 504 390.059V256C504 242.745 493.255 232 480 232H345.941C324.559 232 313.851 257.851 328.97 272.971L370.72 314.7200000000001zM32 152H166.059C187.441 152 198.149 126.149 183.03 111.029L141.28 69.279C172.542 40.006 213.115 23.96 256.156 23.999C333.574 24.069 400.471 77.143 418.943 150.848C420.287 156.211 425.065 159.998 430.594 159.998H487.898C495.396 159.998 501.092 153.191 499.705 145.822C478.067 30.924 377.187 -56 256 -56C189.552 -56 129.209 -29.864 84.685 12.685L48.97 -23.03C33.851 -38.149 8 -27.441 8 -6.059V128C8 141.255 18.745 152 32 152z" />
-    <glyph glyph-name="sync"
-      unicode="&#xF021;"
-      horiz-adv-x="512.333" d=" M440.935 435.426L444.901 352.66C399.416 406.096 331.674 440 256 440C134.813 440 33.933 353.076 12.296 238.176C10.908 230.807 16.604 224 24.103 224H73.187C78.757 224 83.564 227.842 84.863 233.259C103.407 310.592 172.931 368 256 368C316.8930000000001 368 370.512 337.144 402.1040000000001 290.199L300.5740000000001 295.064C293.7290000000001 295.3920000000001 288.0000000000001 289.9310000000001 288.0000000000001 283.0780000000001V235.6670000000001C288.0000000000001 229.04 293.3730000000001 223.667 300.0000000000001 223.667H500.3330000000001C506.9600000000001 223.667 512.3330000000001 229.04 512.3330000000001 235.6670000000001V436C512.3330000000001 442.627 506.9600000000001 448 500.3330000000001 448H452.9220000000001C446.0690000000001 448 440.6070000000001 442.271 440.9350000000001 435.426zM256 16C195.105 16 141.483 46.858 109.891 93.805L211.759 88.934C218.604 88.607 224.332 94.068 224.332 100.92V148.332C224.332 154.959 218.959 160.332 212.332 160.332H12C5.373 160.332 0 154.959 0 148.332V-52C0 -58.627 5.373 -64 12 -64H59.385C66.248 -64 71.713 -58.255 71.37 -51.401L67.241 31.174C112.725 -22.166 180.405 -56 256 -56C377.187 -56 478.067 30.924 499.704 145.824C501.092 153.193 495.396 160 487.897 160H438.813C433.243 160 428.436 156.158 427.137 150.741C408.593 73.408 339.069 16 256 16z" />
-    <glyph glyph-name="syringe"
-      unicode="&#xF48E;"
-      horiz-adv-x="512" d=" M201.5 273.2L257.2 217.4C260.3 214.3 260.3 209.2 257.2 206.1L245.9 194.8C242.8 191.6999999999999 237.7 191.6999999999999 234.6 194.8L178.9 250.6L133.6 205.3L189.4 149.5C192.5 146.3999999999999 192.5 141.3 189.4 138.1999999999999L178.1 126.8999999999999C175 123.7999999999999 169.9 123.7999999999999 166.8 126.8999999999999L111 182.8L84.6 156.4C67.3 139.1 59 115.3 61.6 91L68.7 27.4L2.3 -39C-0.8 -42.1 -0.8 -47.2 2.3 -50.3L13.6 -61.6C16.7 -64.7 21.8 -64.7 24.9 -61.6L91.2 4.7L154.8 -2.4C178.7 -5.0000000000001 202.7 2.9999999999999 220.2 20.6L402.1 202.5L266.4000000000001 338.2L201.5 273.2zM509.7 366.5L430.5 445.7C427.4 448.8 422.3 448.8 419.2 445.7L407.9 434.4C404.8 431.3 404.8 426.2 407.9 423.1L436.2 394.8L390.9 349.5L334.3 406.1L317.3 423.1C314.2 426.2 309.1 426.2 306 423.1L272.1 389.2C269 386.1 269 381 272.1 377.9L289.1 360.9L424.8 225L441.8 208C444.9000000000001 204.9 450 204.9 453.1 208L487 242C490.1 245.1 490.1 250.2 487 253.3L413.5 326.8L458.8 372.1L487.1 343.8C490.2 340.7000000000001 495.3 340.7000000000001 498.4 343.8L509.7 355.1C512.8000000000001 358.3 512.8000000000001 363.3 509.7 366.5z" />
-    <glyph glyph-name="table-tennis"
-      unicode="&#xF45D;"
-      horiz-adv-x="512" d=" M496.2 151.5C527.7 229.3 512 321.8 449 384.9C365.1 469 229 469 145.1 384.9L89.1 328.8L300.6 117.3C346.7000000000001 179.4 432.1 194.7 496.2 151.5zM278.3 71.8L57.9 292.1C30.6 246.8 36.2 187.1 75.2 148L109.7 113.4L6.7 24C-1.9 16.5 -2.4 3.3 5.7 -4.8L59.1 -58.3C67.1 -66.4 80.3 -65.9 87.8 -57.3L177.1 46L212.8 10.3C232.5 -9.4 257.4000000000001 -20.2 283.1 -23C276 -6 272.1 12.6 272.1 32.1C272 45.9 274.6 59.1 278.3 71.8zM416 128C363 128 320 85 320 32S363 -64 416 -64S512 -21 512 32S469 128 416 128z" />
-    <glyph glyph-name="table"
-      unicode="&#xF0CE;"
-      horiz-adv-x="512" d=" M464 416H48C21.49 416 0 394.51 0 368V16C0 -10.51 21.49 -32 48 -32H464C490.51 -32 512 -10.51 512 16V368C512 394.51 490.51 416 464 416zM224 32H64V128H224V32zM224 192H64V288H224V192zM448 32H288V128H448V32zM448 192H288V288H448V192z" />
-    <glyph glyph-name="tablet-alt"
-      unicode="&#xF3FA;"
-      horiz-adv-x="448" d=" M400 448H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V400C448 426.5 426.5 448 400 448zM224 -32C206.3 -32 192 -17.7 192 0S206.3 32 224 32S256 17.7 256 0S241.7 -32 224 -32zM400 76C400 69.4 394.6 64 388 64H60C53.4 64 48 69.4 48 76V388C48 394.6 53.4 400 60 400H388C394.6 400 400 394.6 400 388V76z" />
-    <glyph glyph-name="tablet"
-      unicode="&#xF10A;"
-      horiz-adv-x="448" d=" M400 448H48C21.5 448 0 426.5 0 400V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V400C448 426.5 426.5 448 400 448zM224 -32C206.3 -32 192 -17.7 192 0S206.3 32 224 32S256 17.7 256 0S241.7 -32 224 -32z" />
-    <glyph glyph-name="tablets"
-      unicode="&#xF490;"
-      horiz-adv-x="640" d=" M160 256C78.9 256 12.5 197.5 0.1 121.3C-0.7 116.5 3.4 112 8.4 112H311.7C316.7 112 320.8 116.5 320 121.3C307.5 197.5 241.1 256 160 256zM311.6 80H8.4C3.4 80 -0.7 75.5 0.1 70.7C12.5 -5.5 78.9 -64 160 -64S307.5 -5.5 319.9 70.7C320.7 75.5 316.6 80 311.6 80zM593.4 401.4C536.9 457.9 449.2 462.8 386.5 417.4C382.5 414.5 382.2 408.5 385.7 405.1L597 193.7C600.5 190.2 606.5 190.5 609.3 194.5C654.8 257.2 649.9 344.9 593.4 401.4zM363 382.3C359.5 385.8 353.5 385.5 350.7 381.5C305.3 318.8 310.2 231.1 366.6 174.6C423.1 118.1 510.8 113.2000000000001 573.5 158.7000000000001C577.5 161.6 577.8 167.6 574.3 171.0000000000001L363 382.3z" />
-    <glyph glyph-name="tachometer-alt"
-      unicode="&#xF3FD;"
-      horiz-adv-x="576" d=" M75.694 -32A48.02 48.02 0 0 0 33.246 -6.429C12.023 33.7 0 79.444 0 128C0 287.058 128.942 416 288 416S576 287.058 576 128C576 79.444 563.977 33.7 542.754 -6.429A48.01800000000001 48.01800000000001 0 0 0 500.306 -32H75.694zM512 160C494.327 160 480 145.673 480 128C480 110.327 494.327 96 512 96S544 110.327 544 128C544 145.673 529.673 160 512 160zM288 320C305.673 320 320 334.327 320 352C320 369.673 305.673 384 288 384S256 369.673 256 352C256 334.327 270.327 320 288 320zM64 160C46.327 160 32 145.673 32 128C32 110.327 46.327 96 64 96S96 110.327 96 128C96 145.673 81.673 160 64 160zM129.608 318.392C111.935 318.392 97.608 304.065 97.608 286.392C97.608 268.719 111.935 254.392 129.608 254.392S161.608 268.719 161.608 286.392C161.608 304.065 147.281 318.392 129.608 318.392zM446.392 318.392C428.719 318.392 414.392 304.065 414.392 286.392C414.392 268.719 428.719 254.392 446.392 254.392S478.392 268.719 478.392 286.392C478.392 304.065 464.065 318.392 446.392 318.392zM359.314 286.858C346.687 290.898 333.181 283.938 329.141 271.314L283.218 127.803C250.108 125.355 224 97.736 224 64C224 28.654 252.654 0 288 0C323.346 0 352 28.654 352 64C352 83.773 343.029 101.447 328.939 113.187L374.858 256.685C378.897 269.31 371.938 282.818 359.314 286.858z" />
-    <glyph glyph-name="tag"
-      unicode="&#xF02B;"
-      horiz-adv-x="512" d=" M0 195.882V400C0 426.51 21.49 448 48 448H252.118A48 48 0 0 0 286.059 433.941L497.941 222.059C516.6859999999999 203.314 516.6859999999999 172.922 497.941 154.177L293.823 -49.941C275.078 -68.6859999999999 244.686 -68.6859999999999 225.941 -49.941L14.059 161.941A48 48 0 0 0 0 195.882zM112 384C85.49 384 64 362.51 64 336S85.49 288 112 288S160 309.49 160 336S138.51 384 112 384z" />
-    <glyph glyph-name="tags"
-      unicode="&#xF02C;"
-      horiz-adv-x="640" d=" M497.941 222.059L286.0590000000001 433.941A48 48 0 0 1 252.118 448H48C21.49 448 0 426.51 0 400V195.882A48 48 0 0 1 14.059 161.941L225.941 -49.941C244.685 -68.6859999999999 275.077 -68.687 293.823 -49.941L497.941 154.177C516.6859999999999 172.922 516.6859999999999 203.314 497.941 222.059zM112 288C85.49 288 64 309.49 64 336S85.49 384 112 384S160 362.51 160 336S138.51 288 112 288zM625.941 154.177L421.823 -49.941C403.078 -68.6859999999999 372.686 -68.6859999999999 353.941 -49.941L353.581 -49.581L527.64 124.478C544.639 141.477 554 164.078 554 188.118S544.638 234.759 527.64 251.758L331.397 448H380.118A48 48 0 0 0 414.059 433.941L625.941 222.059C644.686 203.314 644.686 172.922 625.941 154.177z" />
-    <glyph glyph-name="tape"
-      unicode="&#xF4DB;"
-      horiz-adv-x="640" d=" M224 256C188.7 256 160 227.3 160 192S188.7 128 224 128S288 156.7 288 192S259.3 256 224 256zM624 32H380.6C422.1 72.7 448 129.3 448 192C448 315.7 347.7 416 224 416S0 315.7 0 192S100.3 -32 224 -32H624C632.8 -32 640 -24.8 640 -16V16C640 24.8 632.8 32 624 32zM224 96C171 96 128 139 128 192S171 288 224 288S320 245 320 192S277 96 224 96z" />
-    <glyph glyph-name="tasks"
-      unicode="&#xF0AE;"
-      horiz-adv-x="512" d=" M208 316H496C504.8 316 512 323.2 512 332V372C512 380.8 504.8 388 496 388H208C199.2 388 192 380.8 192 372V332C192 323.2 199.2 316 208 316zM208 156H496C504.8 156 512 163.2 512 172V212C512 220.8 504.8 228 496 228H208C199.2 228 192 220.8 192 212V172C192 163.2 199.2 156 208 156zM208 -4H496C504.8 -4 512 3.2 512 12V52C512 60.8 504.8 68 496 68H208C199.2 68 192 60.8 192 52V12C192 3.2 199.2 -4 208 -4zM64 80C37.5 80 15.4 58.5 15.4 32S37.5 -16 64 -16S112 5.5 112 32S90.5 80 64 80zM156.5 379L84.3 306.8L68.7 291.2000000000001C64 286.5 55.8 286.5 51.1 291.2000000000001L3.5 338.6C-1.2 343.3 -1.2 350.9 3.5 355.6L19.2 371.3C23.9 376 31.5 376 36.2 371.3L58.9 349.2L122.6 412.5C127.3 417.2 134.9 417.2 139.6 412.5L156.6 396C161.2 391.3 161.2 383.7 156.5 379zM156.5 219.4L84.3 147.2L68.6 131.5C63.9 126.8 55.7 126.8 51 131.5L3.5 179C-1.2 183.7 -1.2 191.3 3.5 196L19.2 211.7C23.9 216.4 31.5 216.4 36.2 211.7L58.9 189.6L122.6 253.3C127.3 258 134.9 258 139.6 253.3L156.6 236.3C161.2 231.7 161.2 224.1 156.5 219.4z" />
-    <glyph glyph-name="taxi"
-      unicode="&#xF1BA;"
-      horiz-adv-x="512" d=" M462 206.36L440 291.2000000000001C430.4 326.4000000000001 398.4 352 363.2 352H352V384C352 401.67 337.67 416 320 416H192C174.33 416 160 401.67 160 384V352H148.8C113.6 352 81.6 326.4 72 291.2L50 206.36C21.41 199.96 0 174.53 0 144V96C0 72.37 12.95 51.96 32 40.88V0C32 -17.67 46.33 -32 64 -32H96C113.67 -32 128 -17.67 128 0V32H384V0C384 -17.67 398.33 -32 416 -32H448C465.67 -32 480 -17.67 480 0V40.88C499.05 51.97 512 72.38 512 96V144C512 174.53 490.59 199.96 462 206.36zM96 96C78.33 96 64 110.33 64 128S78.33 160 96 160S128 145.67 128 128S113.67 96 96 96zM116.55 208L133.75 274.36C135.98 282.52 143.34 288 148.81 288H363.2100000000001C368.6800000000001 288 376.04 282.52 378.0600000000001 275.14L395.45 208H116.55zM416 96C398.33 96 384 110.33 384 128S398.33 160 416 160S448 145.67 448 128S433.67 96 416 96z" />
-    <glyph glyph-name="terminal"
-      unicode="&#xF120;"
-      horiz-adv-x="640" d=" M257.981 175.029L63.638 -19.314C54.265 -28.687 39.069 -28.687 29.697 -19.314L7.029 3.353C-2.328 12.71 -2.346 27.875 6.989 37.254L161.011 192L6.99 346.745C-2.345 356.124 -2.327 371.289 7.03 380.646L29.697 403.313C39.07 412.6860000000001 54.266 412.6860000000001 63.638 403.313L257.981 208.97C267.354 199.598 267.354 184.402 257.981 175.029zM640 -8V24C640 37.255 629.255 48 616 48H312C298.745 48 288 37.255 288 24V-8C288 -21.255 298.745 -32 312 -32H616C629.255 -32 640 -21.255 640 -8z" />
-    <glyph glyph-name="text-height"
-      unicode="&#xF034;"
-      horiz-adv-x="576" d=" M16 416H304C312.837 416 320 408.837 320 400V304C320 295.163 312.837 288 304 288H268.504C259.6670000000001 288 252.504 295.163 252.504 304V352H197.743V32H232C240.837 32 248 24.837 248 16V-16C248 -24.837 240.837 -32 232 -32H88C79.163 -32 72 -24.837 72 -16V16C72 24.837 79.163 32 88 32H122.257V352H67.496V304C67.496 295.163 60.333 288 51.496 288H16C7.163 288 0 295.163 0 304V400C0 408.837 7.163 416 16 416zM491.308 411.315L571.303 331.314C581.309 321.307 574.297 304 559.99 304H512V80H560C575.639 80 580.635 62.009 571.313 52.686L491.318 -27.3150000000001C485.071 -33.5620000000001 474.937 -33.5600000000001 468.692 -27.3150000000001L388.697 52.6859999999999C378.691 62.693 385.703 80 400.01 80H448V304H400C384.361 304 379.365 321.991 388.687 331.314L468.682 411.315C474.929 417.563 485.063 417.56 491.308 411.315z" />
-    <glyph glyph-name="text-width"
-      unicode="&#xF035;"
-      horiz-adv-x="448" d=" M16 416H432C440.837 416 448 408.837 448 400V304C448 295.163 440.837 288 432 288H396.504C387.6670000000001 288 380.504 295.163 380.504 304V352H261.743V224H296C304.837 224 312 216.837 312 208V176C312 167.163 304.837 160 296 160H152C143.163 160 136 167.163 136 176V208C136 216.837 143.163 224 152 224H186.257V352H67.496V304C67.496 295.163 60.333 288 51.496 288H16C7.163 288 0 295.163 0 304V400C0 408.837 7.163 416 16 416zM443.315 75.318L363.314 155.313C353.991 164.635 336 159.638 336 144V96H112V143.99C112 158.297 94.693 165.309 84.686 155.303L4.685 75.308C-1.56 69.063 -1.562 58.929 4.685 52.682L84.686 -27.313C94.009 -36.635 112 -31.638 112 -16V32H336V-15.99C336 -30.297 353.307 -37.309 363.314 -27.303L443.3150000000001 52.692C449.5600000000001 58.937 449.5630000000001 69.071 443.3150000000001 75.318z" />
-    <glyph glyph-name="th-large"
-      unicode="&#xF009;"
-      horiz-adv-x="512" d=" M296 416H488C501.255 416 512 405.255 512 392V232C512 218.745 501.255 208 488 208H296C282.745 208 272 218.745 272 232V392C272 405.255 282.745 416 296 416zM216 416H24C10.745 416 0 405.255 0 392V232C0 218.745 10.745 208 24 208H216C229.255 208 240 218.745 240 232V392C240 405.255 229.255 416 216 416zM0 152V-8C0 -21.255 10.745 -32 24 -32H216C229.255 -32 240 -21.255 240 -8V152C240 165.255 229.255 176 216 176H24C10.745 176 0 165.255 0 152zM296 -32H488C501.255 -32 512 -21.255 512 -8V152C512 165.255 501.255 176 488 176H296C282.745 176 272 165.255 272 152V-8C272 -21.255 282.745 -32 296 -32z" />
-    <glyph glyph-name="th-list"
-      unicode="&#xF00B;"
-      horiz-adv-x="512" d=" M149.333 232V152C149.333 138.745 138.588 128 125.333 128H24C10.745 128 0 138.745 0 152V232C0 245.255 10.745 256 24 256H125.333C138.588 256 149.333 245.255 149.333 232zM0 72V-8C0 -21.255 10.745 -32 24 -32H125.333C138.588 -32 149.333 -21.255 149.333 -8V72C149.333 85.255 138.588 96 125.333 96H24C10.745 96 0 85.255 0 72zM125.333 416H24C10.745 416 0 405.255 0 392V312C0 298.745 10.745 288 24 288H125.333C138.588 288 149.333 298.745 149.333 312V392C149.333 405.255 138.588 416 125.333 416zM205.333 -32H488C501.255 -32 512 -21.255 512 -8V72C512 85.255 501.255 96 488 96H205.333C192.078 96 181.333 85.255 181.333 72V-8C181.333 -21.255 192.078 -32 205.333 -32zM181.333 392V312C181.333 298.745 192.078 288 205.333 288H488C501.255 288 512 298.745 512 312V392C512 405.255 501.255 416 488 416H205.333C192.078 416 181.333 405.255 181.333 392zM205.333 128H488C501.255 128 512 138.745 512 152V232C512 245.255 501.255 256 488 256H205.333C192.078 256 181.333 245.255 181.333 232V152C181.333 138.745 192.078 128 205.333 128z" />
-    <glyph glyph-name="th"
-      unicode="&#xF00A;"
-      horiz-adv-x="512" d=" M149.333 392V312C149.333 298.745 138.588 288 125.333 288H24C10.745 288 0 298.745 0 312V392C0 405.255 10.745 416 24 416H125.333C138.588 416 149.333 405.255 149.333 392zM330.6670000000001 152V232C330.6670000000001 245.255 319.9220000000001 256 306.6670000000001 256H205.333C192.078 256 181.333 245.255 181.333 232V152C181.333 138.745 192.078 128 205.333 128H306.666C319.9220000000001 128 330.667 138.745 330.667 152zM362.6670000000001 392V312C362.6670000000001 298.745 373.4120000000001 288 386.6670000000001 288H488C501.255 288 512 298.745 512 312V392C512 405.255 501.255 416 488 416H386.667C373.412 416 362.667 405.255 362.667 392zM330.6670000000001 312V392C330.6670000000001 405.255 319.9220000000001 416 306.6670000000001 416H205.333C192.078 416 181.333 405.255 181.333 392V312C181.333 298.745 192.078 288 205.333 288H306.666C319.9220000000001 288 330.667 298.745 330.667 312zM125.333 256H24C10.745 256 0 245.255 0 232V152C0 138.745 10.745 128 24 128H125.333C138.588 128 149.333 138.745 149.333 152V232C149.333 245.255 138.588 256 125.333 256zM0 72V-8C0 -21.255 10.745 -32 24 -32H125.333C138.588 -32 149.333 -21.255 149.333 -8V72C149.333 85.255 138.588 96 125.333 96H24C10.745 96 0 85.255 0 72zM386.667 128H488C501.255 128 512 138.745 512 152V232C512 245.255 501.255 256 488 256H386.667C373.412 256 362.667 245.255 362.667 232V152C362.667 138.745 373.412 128 386.667 128zM386.667 -32H488C501.255 -32 512 -21.255 512 -8V72C512 85.255 501.255 96 488 96H386.667C373.412 96 362.667 85.255 362.667 72V-8C362.667 -21.255 373.412 -32 386.667 -32zM181.333 72V-8C181.333 -21.255 192.078 -32 205.333 -32H306.666C319.921 -32 330.666 -21.255 330.666 -8V72C330.666 85.255 319.921 96 306.666 96H205.333C192.078 96 181.333 85.255 181.333 72z" />
-    <glyph glyph-name="thermometer-empty"
-      unicode="&#xF2CB;"
-      horiz-adv-x="256" d=" M192 64C192 28.654 163.346 0 128 0S64 28.654 64 64C64 99.346 92.654 128 128 128S192 99.346 192 64zM224 148.653C243.912 126.09 256 96.459 256 64C256 -6.696 198.697 -64 128 -64C127.701 -64 127.391 -63.999 127.091 -63.997C56.789 -63.509 -0.357 -5.636 0.002 64.667C0.166 96.865 12.225 126.245 32 148.653V352C32 405.019 74.981 448 128 448S224 405.019 224 352V148.653zM208 64C208 98.339 188.63 116.19 176 130.502V352C176 378.467 154.467 400 128 400S80 378.467 80 352V130.502C67.268 116.074 48.175 98.402 48.001 64.422C47.777 20.5460000000001 83.564 -15.694 127.424 -15.998L128 -16C172.112 -16 208 19.888 208 64z" />
-    <glyph glyph-name="thermometer-full"
-      unicode="&#xF2C7;"
-      horiz-adv-x="256" d=" M224 352C224 405.019 181.019 448 128 448S32 405.019 32 352V148.653C12.225 126.244 0.166 96.864 0.002 64.667C-0.357 -5.636 56.789 -63.509 127.091 -63.997C127.39 -63.999 127.701 -64 128 -64C198.698 -64 256 -6.696 256 64C256 96.459 243.912 126.09 224 148.653V352zM128 -16L127.424 -15.998C83.564 -15.694 47.777 20.546 48.001 64.422C48.174 98.402 67.267 116.074 80 130.502V352C80 378.467 101.533 400 128 400S176 378.467 176 352V130.502C188.63 116.19 208 98.338 208 64C208 19.888 172.112 -16 128 -16zM192 64C192 28.654 163.346 0 128 0S64 28.654 64 64C64 87.685 76.876 108.349 96 119.417V352C96 369.673 110.327 384 128 384S160 369.673 160 352V119.417C179.124 108.3490000000001 192 87.6850000000001 192 64z" />
-    <glyph glyph-name="thermometer-half"
-      unicode="&#xF2C9;"
-      horiz-adv-x="256" d=" M192 64C192 28.654 163.346 0 128 0S64 28.654 64 64C64 87.685 76.876 108.349 96 119.417V224C96 241.673 110.327 256 128 256S160 241.673 160 224V119.417C179.124 108.3490000000001 192 87.6850000000001 192 64zM224 148.653C243.912 126.09 256 96.459 256 64C256 -6.696 198.697 -64 128 -64C127.701 -64 127.391 -63.999 127.091 -63.997C56.789 -63.509 -0.357 -5.636 0.002 64.667C0.166 96.865 12.225 126.245 32 148.653V352C32 405.019 74.981 448 128 448S224 405.019 224 352V148.653zM208 64C208 98.339 188.63 116.19 176 130.502V352C176 378.467 154.467 400 128 400S80 378.467 80 352V130.502C67.268 116.074 48.175 98.402 48.001 64.422C47.777 20.5460000000001 83.564 -15.694 127.424 -15.998L128 -16C172.112 -16 208 19.888 208 64z" />
-    <glyph glyph-name="thermometer-quarter"
-      unicode="&#xF2CA;"
-      horiz-adv-x="256" d=" M192 64C192 28.654 163.346 0 128 0S64 28.654 64 64C64 87.685 76.876 108.349 96 119.417V160C96 177.673 110.327 192 128 192S160 177.673 160 160V119.417C179.124 108.3490000000001 192 87.6850000000001 192 64zM224 148.653C243.912 126.09 256 96.459 256 64C256 -6.696 198.697 -64 128 -64C127.701 -64 127.391 -63.999 127.091 -63.997C56.789 -63.509 -0.357 -5.636 0.002 64.667C0.166 96.865 12.225 126.245 32 148.653V352C32 405.019 74.981 448 128 448S224 405.019 224 352V148.653zM208 64C208 98.339 188.63 116.19 176 130.502V352C176 378.467 154.467 400 128 400S80 378.467 80 352V130.502C67.268 116.074 48.175 98.402 48.001 64.422C47.777 20.5460000000001 83.564 -15.694 127.424 -15.998L128 -16C172.112 -16 208 19.888 208 64z" />
-    <glyph glyph-name="thermometer-three-quarters"
-      unicode="&#xF2C8;"
-      horiz-adv-x="256" d=" M192 64C192 28.654 163.346 0 128 0C92.654 0 64 28.654 64 64C64 87.685 76.876 108.349 96 119.417V288C96 305.673 110.327 320 128 320S160 305.673 160 288V119.417C179.124 108.3490000000001 192 87.6850000000001 192 64zM224 148.653C243.912 126.09 256 96.459 256 64C256 -6.696 198.697 -64 128 -64C127.701 -64 127.391 -63.999 127.091 -63.997C56.789 -63.509 -0.357 -5.636 0.002 64.667C0.166 96.865 12.225 126.245 32 148.653V352C32 405.019 74.981 448 128 448S224 405.019 224 352V148.653zM208 64C208 98.339 188.63 116.19 176 130.502V352C176 378.467 154.467 400 128 400S80 378.467 80 352V130.502C67.268 116.074 48.175 98.402 48.001 64.422C47.777 20.5460000000001 83.564 -15.694 127.424 -15.998L128 -16C172.112 -16 208 19.888 208 64z" />
-    <glyph glyph-name="thermometer"
-      unicode="&#xF491;"
-      horiz-adv-x="512" d=" M476.8 427.6C439.3 458.3 381.3 453.9 344.9 417.4L299.2 371.4L349.7 320.9C352.8 317.8 352.8 312.7000000000001 349.7 309.6L338.4 298.3C335.3 295.2 330.2 295.2 327.1 298.3L276.7 348.8L231.6 303.4L281.9 253C285 249.9 285 244.8 281.9 241.7L270.6 230.4C267.5 227.3 262.4 227.3 259.3 230.4L209 280.6L163.9 235.2L214 185C217.1 181.9 217.1 176.8 214 173.7L202.7 162.4C199.6 159.3 194.5 159.3 191.4 162.4L141.3 212.6L96 166.9V66L7 -23C-2.4 -32.4 -2.4 -47.6 7 -56.9C16.4 -66.2999999999999 31.6 -66.2999999999999 40.9 -56.9L129.9 32.1H229.8L484 285.4C518.9 320.3 526.2 386.9 476.8 427.6z" />
-    <glyph glyph-name="thumbs-down"
-      unicode="&#xF165;"
-      horiz-adv-x="512" d=" M0 392V152C0 138.745 10.745 128 24 128H104C117.255 128 128 138.745 128 152V392C128 405.255 117.255 416 104 416H24C10.745 416 0 405.255 0 392zM40 192C40 205.255 50.745 216 64 216S88 205.255 88 192S77.255 168 64 168S40 178.745 40 192zM312 -64C291.817 -64 282.515 -24.707 278.069 -6.205C272.863 15.461 267.48 37.865 252.676 52.697C220.207 85.221 203.173 126.664 163.559 165.808A11.98 11.98 0 0 0 160.001 174.329V388.099C160.001 394.64 165.244 399.977 171.784 400.097C187.615 400.387 208.478 409.176 224.435 416.275C256.189 430.402 295.709 447.983 343.995 448H346.839C389.616 448 440.202 447.587 460.613 418.263C469.005 406.206 471.059 391.229 466.761 373.631C483.073 356.578 491.824 324.7680000000001 483.143 298.874C500.687 275.442 502.2860000000001 242.742 492.451 219.405L492.561 219.295C504.4540000000001 207.346 512.0840000000001 188.036 512 170.098C511.844 139.746 485.843 111.9999999999999 452.447 111.9999999999999H350.723C358.03 83.66 384 59.868 384 17.452C384 -56 336 -64 312 -64z" />
-    <glyph glyph-name="thumbs-up"
-      unicode="&#xF164;"
-      horiz-adv-x="512" d=" M104 224H24C10.745 224 0 213.255 0 200V-40C0 -53.255 10.745 -64 24 -64H104C117.255 -64 128 -53.255 128 -40V200C128 213.255 117.255 224 104 224zM64 -24C50.745 -24 40 -13.255 40 0S50.745 24 64 24S88 13.255 88 0S77.255 -24 64 -24zM384 366.548C384 324.132 358.03 300.3400000000001 350.723 272H452.446C485.843 272 511.843 244.254 511.999 213.902C512.083 195.964 504.453 176.653 492.56 164.705L492.45 164.595C502.286 141.258 500.687 108.558 483.142 85.126C491.823 59.231 483.073 27.422 466.76 10.369C471.058 -7.229 469.004 -22.206 460.612 -34.263C440.202 -63.587 389.616 -64 346.839 -64L343.994 -63.999C295.707 -63.982 256.188 -46.401 224.434 -32.274C208.477 -25.175 187.613 -16.387 171.783 -16.096C165.243 -15.976 160 -10.639 160 -4.098V209.672C160 212.872 161.282 215.943 163.558 218.193C203.172 257.337 220.206 298.78 252.675 331.304C267.479 346.136 272.863 368.54 278.068 390.206C282.515 408.707 291.817 448 312 448C336 448 384 440 384 366.548z" />
-    <glyph glyph-name="thumbtack"
-      unicode="&#xF08D;"
-      horiz-adv-x="384" d=" M298.028 233.733L285.793 352H328C341.255 352 352 362.745 352 376V424C352 437.255 341.255 448 328 448H56C42.745 448 32 437.255 32 424V376C32 362.745 42.745 352 56 352H98.207L85.972 233.733C37.465 211.18 0 170.739 0 120C0 106.745 10.745 96 24 96H160V-8.007C160 -9.249 160.289 -10.474 160.845 -11.585L184.845 -59.585C187.786 -65.467 196.209 -65.4779999999999 199.156 -59.585L223.156 -11.585A8.008 8.008 0 0 1 224.001 -8.007V96H360.001C373.256 96 384.001 106.745 384.001 120C384 171.183 346.018 211.42 298.028 233.733z" />
-    <glyph glyph-name="ticket-alt"
-      unicode="&#xF3FF;"
-      horiz-adv-x="576" d=" M128 288H448V96H128V288zM528 192C528 165.49 549.49 144 576 144V48C576 21.49 554.51 0 528 0H48C21.49 0 0 21.49 0 48V144C26.51 144 48 165.49 48 192S26.51 240 0 240V336C0 362.51 21.49 384 48 384H528C554.51 384 576 362.51 576 336V240C549.49 240 528 218.51 528 192zM480 296C480 309.255 469.255 320 456 320H120C106.745 320 96 309.255 96 296V88C96 74.745 106.745 64 120 64H456C469.255 64 480 74.745 480 88V296z" />
-    <glyph glyph-name="times-circle"
-      unicode="&#xF057;"
-      horiz-adv-x="512" d=" M256 440C119 440 8 329 8 192S119 -56 256 -56S504 55 504 192S393 440 256 440zM377.6 126.9C382.3 122.2 382.3 114.6 377.6 109.9L338 70.4C333.3 65.7 325.7 65.7 321 70.4L256 136L190.9 70.4C186.2 65.7 178.6 65.7 173.9 70.4L134.4 110C129.7 114.7 129.7 122.3 134.4 127L200 192L134.4 257.1C129.7 261.8 129.7 269.4 134.4 274.1L174 313.7C178.7 318.4 186.3 318.4 191 313.7L256 248L321.1 313.6C325.8 318.3 333.4000000000001 318.3 338.1 313.6L377.7000000000001 274C382.4000000000001 269.3 382.4000000000001 261.7 377.7000000000001 257L312 192L377.6 126.9z" />
-    <glyph glyph-name="times"
-      unicode="&#xF00D;"
-      horiz-adv-x="352" d=" M242.72 192L342.79 292.07C355.07 304.35 355.07 324.26 342.79 336.55L320.55 358.79C308.27 371.07 288.36 371.07 276.07 358.79L176 258.7200000000001L75.93 358.79C63.65 371.07 43.74 371.07 31.45 358.79L9.21 336.55C-3.07 324.27 -3.07 304.36 9.21 292.07L109.28 192L9.21 91.93C-3.07 79.65 -3.07 59.74 9.21 47.45L31.45 25.21C43.73 12.93 63.65 12.93 75.93 25.21L176 125.28L276.07 25.21C288.35 12.93 308.27 12.93 320.55 25.21L342.79 47.45C355.07 59.73 355.07 79.64 342.79 91.93L242.72 192z" />
-    <glyph glyph-name="tint-slash"
-      unicode="&#xF5C7;"
-      horiz-adv-x="640" d=" M633.82 -10.1L494.97 97.22C495.49 102.79 496 108.3800000000001 496 114.09C496 225.85 396.21 267.4300000000001 349.2200000000001 425.9100000000001C341.2800000000001 454.6900000000001 299.7800000000001 456.03 290.7800000000001 425.9100000000001C275.2600000000001 373.5700000000001 253.9100000000001 333.9500000000001 232.29 300.23L45.47 444.63C38.49 450.05 28.43 448.8 23.01 441.82L3.37 416.55C-2.05 409.58 -0.8 399.53 6.18 394.1L594.54 -60.63C601.52 -66.0599999999999 611.5699999999999 -64.7999999999999 617 -57.82L636.64 -32.55C642.05 -25.58 640.8 -15.53 633.8199999999999 -10.1zM144 114.09C144 15.65 222.72 -64 320 -64C364.71 -64 405.37 -47.04 436.4 -19.3L162.72 192.22C151.31 168.72 144 143.87 144 114.09z" />
-    <glyph glyph-name="tint"
-      unicode="&#xF043;"
-      horiz-adv-x="352" d=" M205.22 425.9100000000001C197.28 454.69 155.78 456.03 146.78 425.9100000000001C100.01 268.15 0 225.28 0 114.09C0 15.65 78.72 -64 176 -64S352 15.65 352 114.09C352 225.8400000000001 252.21 267.4300000000001 205.22 425.9100000000001zM176 0C114.25 0 64 50.25 64 112C64 120.84 71.16 128 80 128S96 120.84 96 112C96 67.89 131.89 32 176 32C184.84 32 192 24.84 192 16S184.84 0 176 0z" />
-    <glyph glyph-name="tired"
-      unicode="&#xF5C8;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM281.8 250.3L361.8 298.3C373.4000000000001 305.2000000000001 385.8 290.6 377.2 280.3L343.6 240L377.2000000000001 199.7C385.9000000000001 189.3 373.3000000000001 174.9 361.8000000000001 181.7L281.8000000000001 229.7C274.1000000000001 234.4 274.1000000000001 245.6 281.8000000000001 250.3zM118.8 280.3C110.2 290.6 122.6 305.2000000000001 134.2 298.3L214.2 250.3C222 245.6 222 234.4 214.2 229.7L134.2 181.7000000000001C122.7 174.9 110.2 189.3000000000001 118.8 199.7000000000001L152.4 240.0000000000001L118.8 280.3000000000001zM248 160C299.9 160 363.3 116.2 371.2 53.3C372.9 39.7 363.2 28.7 353.5 32.9C327.6 44.0000000000001 289.1 50.3 248 50.3S168.4 44 142.5 32.9C132.7 28.7 123.1 39.9 124.8 53.3C132.7 116.2 196.1 160 248 160z" />
-    <glyph glyph-name="toggle-off"
-      unicode="&#xF204;"
-      horiz-adv-x="576" d=" M384 384H192C85.961 384 0 298.039 0 192S85.961 0 192 0H384C490.039 0 576 85.961 576 192S490.039 384 384 384zM64 192C64 262.741 121.249 320 192 320C262.741 320 320 262.751 320 192C320 121.259 262.751 64 192 64C121.259 64 64 121.249 64 192zM384 64H335.0950000000001C400.312 136.858 400.331 247.12 335.0950000000001 320H384C454.741 320 512 262.751 512 192C512 121.26 454.751 64 384 64z" />
-    <glyph glyph-name="toggle-on"
-      unicode="&#xF205;"
-      horiz-adv-x="576" d=" M576 192C576 85.961 490.039 0 384 0H192C85.961 0 0 85.961 0 192S85.961 384 192 384H384C490.039 384 576 298.039 576 192zM384 320C313.259 320 256 262.751 256 192C256 121.259 313.249 64 384 64C454.741 64 512 121.249 512 192C512 262.741 454.751 320 384 320" />
-    <glyph glyph-name="toolbox"
-      unicode="&#xF552;"
-      horiz-adv-x="512" d=" M502.63 233.37L457.38 278.62C451.38 284.62 443.24 287.99 434.75 287.99H384V368C384 394.51 362.51 416 336 416H176C149.49 416 128 394.51 128 368V288H77.25C68.76 288 60.63 284.63 54.62 278.63L9.37 233.37C3.37 227.37 0 219.23 0 210.74V128H128V144C128 152.84 135.16 160 144 160H176C184.84 160 192 152.84 192 144V128H320V144C320 152.84 327.1600000000001 160 336 160H368C376.84 160 384 152.84 384 144V128H512V210.75C512 219.23 508.63 227.37 502.63 233.37zM320 288H192V352H320V288zM384 80C384 71.16 376.84 64 368 64H336C327.1600000000001 64 320 71.16 320 80V96H192V80C192 71.16 184.84 64 176 64H144C135.16 64 128 71.16 128 80V96H0V0C0 -17.67 14.33 -32 32 -32H480C497.67 -32 512 -17.67 512 0V96H384V80z" />
-    <glyph glyph-name="tooth"
-      unicode="&#xF5C9;"
-      horiz-adv-x="448" d=" M443.98 351.75C432.9700000000001 396.9700000000001 396.87 433.81 351.9700000000001 445.4700000000001C319.7800000000001 453.83 288.9700000000001 440.37 262.8300000000001 421.14C259.5800000000001 418.75 255.8700000000001 417.4100000000001 252.3300000000001 415.66L280.6500000000001 397.45C288.0700000000001 392.68 290.23 382.78 285.4500000000001 375.3400000000001C280.9900000000001 368.39 271.1800000000001 365.48 263.3400000000001 370.54L162.83 435.1600000000001C142.13 446.01 119.45 451.56 96.02 445.4700000000001C51.12 433.8 15.02 396.9700000000001 4.01 351.75C-6.12 310.13 3.59 270.94 25.51 241.32C48.87 209.75 58.19 172.66 61.8 133.97C66.2 86.8100000000001 72.13 39.8100000000001 82.74 -6.35L90.54 -40.3C93.73 -54.17 106.03 -63.9999999999999 120.21 -63.9999999999999C134.18 -63.9999999999999 146.36 -54.4499999999999 149.75 -40.8399999999999L184.22 97.58C188.78 115.9 205.18 128.7400000000001 223.98 128.7400000000001S259.18 115.8900000000001 263.74 97.58L298.2100000000001 -40.8399999999999C301.6 -54.4499999999999 313.7800000000001 -63.9999999999999 327.7500000000001 -63.9999999999999C341.9300000000001 -63.9999999999999 354.2300000000001 -54.17 357.4200000000001 -40.3L365.2200000000001 -6.35C375.8300000000001 39.8 381.7500000000001 86.8100000000001 386.1600000000001 133.97C389.7700000000001 172.67 399.0900000000001 209.75 422.4500000000001 241.32C444.4000000000001 270.93 454.1100000000001 310.12 443.9800000000002 351.75z" />
-    <glyph glyph-name="trademark"
-      unicode="&#xF25C;"
-      horiz-adv-x="640" d=" M97.119 284.867H12C5.373 284.867 0 290.24 0 296.867V340C0 346.627 5.373 352 12 352H260.559C267.186 352 272.559 346.627 272.559 340V296.867C272.559 290.24 267.186 284.867 260.559 284.867H175.44V44C175.44 37.373 170.067 32 163.44 32H109.118C102.491 32 97.118 37.373 97.118 44V284.867zM329.825 352H395.25A12 12 0 0 0 406.596 343.907L450.355 216.839C457.516 196.251 466.466 164.027 466.466 164.027H467.362S476.312 196.251 483.473 216.839L527.231 343.907A12 12 0 0 0 538.577 352H603.987A12 12 0 0 0 615.948 340.9700000000001L639.96 44.97C640.527 37.983 635.009 32 627.999 32H573.898A12 12 0 0 0 561.926 43.182L552.844 176.112C551.0540000000001 200.28 552.844 229.8180000000001 552.844 229.8180000000001H551.9480000000001S541.2070000000001 196.2520000000001 534.046 176.112L503.3460000000001 91.381A12 12 0 0 0 492.0640000000001 83.4690000000001H441.7620000000001A12 12 0 0 0 430.4800000000001 91.381L399.7800000000001 176.112C392.6190000000001 196.252 381.8770000000001 229.8180000000001 381.8770000000001 229.8180000000001H380.9820000000001S382.7720000000001 200.28 380.9820000000001 176.112L371.9000000000001 43.182C371.4720000000001 36.887 366.2400000000001 32 359.9300000000001 32H305.4C298.383 32 292.864 37.994 293.441 44.987L317.866 340.987A11.999000000000002 11.999000000000002 0 0 0 329.825 352z" />
-    <glyph glyph-name="train"
-      unicode="&#xF238;"
-      horiz-adv-x="448" d=" M448 352V96C448 44.185 386.376 0 317.978 0L380.9580000000001 -49.721C386.905 -54.417 383.562 -64 376 -64H72C64.422 -64 61.108 -54.406 67.043 -49.721L130.022 0C61.82 0 0 44.046 0 96V352C0 405.019 64 448 128 448H320C385 448 448 405.019 448 352zM400 216V328C400 341.255 389.255 352 376 352H72C58.745 352 48 341.255 48 328V216C48 202.745 58.745 192 72 192H376C389.255 192 400 202.745 400 216zM224 152C193.072 152 168 126.928 168 96S193.072 40 224 40S280 65.072 280 96S254.928 152 224 152z" />
-    <glyph glyph-name="transgender-alt"
-      unicode="&#xF225;"
-      horiz-adv-x="480" d=" M468 448H389C378.3 448 373 435.1 380.5 427.5L397.4 410.6L316.7 329.9C294.5 343.9 268.2 352 240 352C211.8 352 185.5 343.9 163.3 329.9L146.8 346.4L166.6 366.2C171.3 370.9 171.3 378.5 166.6 383.2L138.3 411.5C133.6 416.2 126 416.2 121.3 411.5L101.5 391.7L82.5 410.7L99.4 427.6C107.1 435.1 101.7 448 91 448H12C5.4 448 0 442.6 0 436V357C0 346.3 12.9 341 20.5 348.5L37.4 365.4L56.4 346.4L36.6 326.6C31.9 321.9 31.9 314.3 36.6 309.6L64.9 281.3C69.6 276.6 77.2 276.6 81.9 281.3L101.7 301.1L118.2 284.6C104.1 262.5 96 236.2 96 208C96 139.5 143.9 82.1 208 67.6V40H172C165.4 40 160 34.6 160 28V-12C160 -18.6 165.4 -24 172 -24H208V-52C208 -58.6 213.4 -64 220 -64H260C266.6 -64 272 -58.6 272 -52V-24H308C314.6 -24 320 -18.6 320 -12V28C320 34.6 314.6 40 308 40H272V67.6C336.1 82.2000000000001 384 139.5 384 208C384 236.2 375.9 262.5 361.9 284.7000000000001L442.6 365.4000000000001L459.4999999999999 348.5000000000001C467.1 340.9000000000001 479.9999999999999 346.3000000000001 479.9999999999999 357.0000000000001V436C479.9999999999999 442.6 474.6 448 467.9999999999999 448zM240 128C195.9 128 160 163.9 160 208S195.9 288 240 288S320 252.1 320 208S284.1 128 240 128z" />
-    <glyph glyph-name="transgender"
-      unicode="&#xF224;"
-      horiz-adv-x="384" d=" M372 448H293C282.3 448 277 435.1 284.5 427.5L301.4 410.6L220.7 329.9C198.5 343.9 172.2 352 144 352C64.5 352 0 287.5 0 208C0 139.5 47.9 82.1 112 67.6V40H76C69.4 40 64 34.6 64 28V-12C64 -18.6 69.4 -24 76 -24H112V-52C112 -58.6 117.4 -64 124 -64H164C170.6 -64 176 -58.6 176 -52V-24H212C218.6 -24 224 -18.6 224 -12V28C224 34.6 218.6 40 212 40H176V67.6C240.1 82.2000000000001 288 139.5 288 208C288 236.2 279.9 262.5 265.9 284.7000000000001L346.6 365.4000000000001L363.5 348.5000000000001C371.1 340.9000000000001 384 346.3000000000001 384 357.0000000000001V436C384 442.6 378.6 448 372 448zM144 128C99.9 128 64 163.9 64 208S99.9 288 144 288S224 252.1 224 208S188.1 128 144 128z" />
-    <glyph glyph-name="trash-alt"
-      unicode="&#xF2ED;"
-      horiz-adv-x="448" d=" M0 364V392C0 405.3 10.7 416 24 416H136L145.4 434.7C149.4 442.9 157.7 448 166.8 448H281.1C290.2000000000001 448 298.5 442.9 302.6 434.7L312 416H424C437.3 416 448 405.3 448 392V364C448 357.4 442.6 352 436 352H12C5.4 352 0 357.4 0 364zM416 308V-16C416 -42.5 394.5 -64 368 -64H80C53.5 -64 32 -42.5 32 -16V308C32 314.6 37.4 320 44 320H404C410.6 320 416 314.6 416 308zM144 240C144 248.8 136.8 256 128 256S112 248.8 112 240V16C112 7.2 119.2 0 128 0S144 7.2 144 16V240zM240 240C240 248.8 232.8 256 224 256S208 248.8 208 240V16C208 7.2 215.2 0 224 0S240 7.2 240 16V240zM336 240C336 248.8 328.8 256 320 256S304 248.8 304 240V16C304 7.2 311.2 0 320 0S336 7.2 336 16V240z" />
-    <glyph glyph-name="trash"
-      unicode="&#xF1F8;"
-      horiz-adv-x="448" d=" M0 364V392C0 405.3 10.7 416 24 416H136L145.4 434.7C149.4 442.9 157.7 448 166.8 448H281.1C290.2000000000001 448 298.5 442.9 302.6 434.7L312 416H424C437.3 416 448 405.3 448 392V364C448 357.4 442.6 352 436 352H12C5.4 352 0 357.4 0 364zM415.2 307.3L394.8 -19C393.2 -44.3 372.2 -64 346.9000000000001 -64H101.1C75.8 -64 54.8 -44.3 53.2 -19L32.8 307.3C32.4 314.2000000000001 37.9 320 44.8 320H403.3C410.1 320 415.6 314.2000000000001 415.2 307.3z" />
-    <glyph glyph-name="tree"
-      unicode="&#xF1BB;"
-      horiz-adv-x="384" d=" M377.33 72.571L293.906 160H328C349.017 160 359.872 185.207 345.448 200.479L262.79 288H296C316.878 288 327.851 312.969 313.587 328.331L209.587 440.334C200.102 450.548 183.911 450.563 174.413 440.334L70.413 328.331C56.206 313.031 67.037 288 88 288H121.21L38.551 200.479C24.121 185.199 34.993 160 56 160H90.094L6.665 72.571C-7.869 57.345 2.925 32 24.025 32H144C144 -0.781 132.812 -17.26 110.005 -35.506C98.225 -44.93 104.914 -64 120 -64H264C279.086 -64 285.776 -44.931 273.995 -35.506C254.227 -19.6919999999999 240.003 -3.841 240 31.99V32H359.9700000000001C381.0200000000001 32 391.899 57.309 377.3300000000001 72.571z" />
-    <glyph glyph-name="trophy"
-      unicode="&#xF091;"
-      horiz-adv-x="576" d=" M552 384H448V424C448 437.3 437.3 448 424 448H152C138.7 448 128 437.3 128 424V384H24C10.7 384 0 373.3 0 360V304C0 268.3 22.5 231.6 61.9 203.3C93.4 180.6 131.7 166.2 171.9 161.6C203.3 109.5 240 88 240 88V16H192C156.7 16 128 -4.7 128 -40V-52C128 -58.6 133.4 -64 140 -64H436C442.6 -64 448 -58.6 448 -52V-40C448 -4.7 419.3 16 384 16H336V88S372.7 109.5 404.1 161.6C444.4000000000001 166.2000000000001 482.7 180.6 514.1 203.3C553.4 231.6 576 268.3 576 304V360C576 373.3 565.3 384 552 384zM99.3 255.2C74.9 272.8 64 292.4 64 304V320H128.2C129.2 287.4 134 258.8 141 233.8C125.9 239 111.8 246.2 99.3 255.2zM512 304C512 287.9 494.3 267.9 476.7 255.2C464.2 246.2 450 239 434.9 233.8C441.9 258.8 446.7 287.4 447.7 320H512V304z" />
-    <glyph glyph-name="truck-loading"
-      unicode="&#xF4DE;"
-      horiz-adv-x="640" d=" M50.2 72.4C52.5 63.9 61.3 58.8 69.8 61.1L286.2000000000001 119.1C294.7000000000001 121.4 299.8000000000001 130.2 297.5000000000001 138.7L247.8000000000001 324.2C245.5000000000001 332.7 236.7000000000001 337.8 228.2000000000001 335.5L151 314.7L175.8 222L114 205.5L89.2 298.2L11.9 277.5C3.4 275.2 -1.7 266.4 0.6 257.9L50.2 72.4zM384 448C366.3 448 352 433.7 352 416V92.4L5.9 -2C1.6 -3.2 -0.9 -7.6 0.3 -11.8L12.9 -58.1C14.1 -62.4 18.5 -64.9 22.7 -63.7L416.4 43.6999999999999C418.8 -16.1 467.6 -64 528 -64C589.9 -64 640 -13.9 640 48V448H384zM528 0C501.5 0 480 21.5 480 48S501.5 96 528 96S576 74.5 576 48S554.5 0 528 0z" />
-    <glyph glyph-name="truck-moving"
-      unicode="&#xF4DF;"
-      horiz-adv-x="640" d=" M621.3 210.7L562.8 269.2C550.8 281.2 534.5 287.9 517.5 287.9H480V384C480 401.7 465.7 416 448 416H32C14.3 416 0 401.7 0 384V48C0 3.8 35.8 -32 80 -32C106.3 -32 129.4 -19.1 144 0.4C158.6 -19.2 181.7 -32 208 -32C252.2 -32 288 3.8 288 48C288 53.5 287.4 58.8 286.4 64H449.6C448.5 58.8 448 53.5 448 48C448 3.8 483.8 -32 528 -32S608 3.8 608 48C608 53.5 607.4 58.8 606.4 64H624C632.8 64 640 71.2 640 80V165.5C640 182.5 633.3 198.7 621.3 210.7zM80 16C62.4 16 48 30.4 48 48S62.4 80 80 80S112 65.6 112 48S97.6 16 80 16zM208 16C190.4 16 176 30.4 176 48S190.4 80 208 80S240 65.6 240 48S225.6 16 208 16zM480 240H517.5C521.8 240 525.8 238.3 528.8 235.3L572.0999999999999 192H480V240zM528 16C510.4 16 496 30.4 496 48S510.4 80 528 80S560 65.6 560 48S545.6 16 528 16z" />
-    <glyph glyph-name="truck"
-      unicode="&#xF0D1;"
-      horiz-adv-x="640" d=" M624 96H608V204.1C608 216.8 602.9 229 593.9 238L494 337.9C485 346.9 472.8 352 460.1 352H416V400C416 426.5 394.5 448 368 448H48C21.5 448 0 426.5 0 400V80C0 53.5 21.5 32 48 32H64C64 -21 107 -64 160 -64S256 -21 256 32H384C384 -21 427 -64 480 -64S576 -21 576 32H624C632.8 32 640 39.2 640 48V80C640 88.8 632.8 96 624 96zM160 -16C133.5 -16 112 5.5 112 32S133.5 80 160 80S208 58.5 208 32S186.5 -16 160 -16zM480 -16C453.5 -16 432 5.5 432 32S453.5 80 480 80S528 58.5 528 32S506.5 -16 480 -16zM560 192H416V304H460.1L560 204.1V192z" />
-    <glyph glyph-name="tshirt"
-      unicode="&#xF553;"
-      horiz-adv-x="640" d=" M631.2 351.5L436.5 448C416.4 420.2 371.9 400.8 320 400.8S223.6 420.2 203.5 448L8.8 351.5C0.9 347.5 -2.3 337.9 1.6 330L58.8 215.5C62.8 207.6 72.4 204.4 80.3 208.3L136.9 236C147.5 241.2 159.9 233.5 159.9 221.6V-32C159.9 -49.7 174.2 -64 191.9 -64H447.9C465.6 -64 479.9 -49.7 479.9 -32V221.7C479.9 233.5 492.3 241.3 502.9 236.1L559.5 208.4C567.4 204.4 577 207.6 581 215.6L638.3 330C642.3 337.9 639.0999999999999 347.6 631.1999999999999 351.5z" />
-    <glyph glyph-name="tty"
-      unicode="&#xF1E4;"
-      horiz-adv-x="512" d=" M5.37 344.178C143.902 482.71 368.306 482.504 506.632 344.178C512.71 338.1 513.706 328.682 509.215 321.497L466.001 252.359A18.332 18.332 0 0 0 443.6450000000001 245.054L357.2230000000001 279.623A18.335 18.335 0 0 0 345.7890000000001 298.469L351.741 358C289.596 380.454 221.105 379.986 160.258 358L166.211 298.468A18.331 18.331 0 0 0 154.777 279.622L68.354 245.0540000000001A18.334 18.334 0 0 0 45.998 252.3590000000001L2.787 321.498A18.333 18.333 0 0 0 5.37 344.178zM96 140V180C96 186.627 90.627 192 84 192H44C37.373 192 32 186.627 32 180V140C32 133.373 37.373 128 44 128H84C90.627 128 96 133.373 96 140zM192 140V180C192 186.627 186.627 192 180 192H140C133.373 192 128 186.627 128 180V140C128 133.373 133.373 128 140 128H180C186.627 128 192 133.373 192 140zM288 140V180C288 186.627 282.627 192 276 192H236C229.373 192 224 186.627 224 180V140C224 133.373 229.373 128 236 128H276C282.627 128 288 133.373 288 140zM384 140V180C384 186.627 378.627 192 372 192H332C325.373 192 320 186.627 320 180V140C320 133.373 325.373 128 332 128H372C378.627 128 384 133.373 384 140zM480 140V180C480 186.627 474.627 192 468 192H428C421.373 192 416 186.627 416 180V140C416 133.373 421.373 128 428 128H468C474.627 128 480 133.373 480 140zM144 44V84C144 90.627 138.627 96 132 96H92C85.373 96 80 90.627 80 84V44C80 37.373 85.373 32 92 32H132C138.627 32 144 37.373 144 44zM240 44V84C240 90.627 234.627 96 228 96H188C181.373 96 176 90.627 176 84V44C176 37.373 181.373 32 188 32H228C234.627 32 240 37.373 240 44zM336 44V84C336 90.627 330.627 96 324 96H284C277.373 96 272 90.627 272 84V44C272 37.373 277.373 32 284 32H324C330.627 32 336 37.373 336 44zM432 44V84C432 90.627 426.627 96 420 96H380C373.373 96 368 90.627 368 84V44C368 37.373 373.373 32 380 32H420C426.627 32 432 37.373 432 44zM96 -52V-12C96 -5.373 90.627 0 84 0H44C37.373 0 32 -5.373 32 -12V-52C32 -58.627 37.373 -64 44 -64H84C90.627 -64 96 -58.627 96 -52zM384 -52V-12C384 -5.373 378.627 0 372 0H140C133.373 0 128 -5.373 128 -12V-52C128 -58.627 133.373 -64 140 -64H372C378.627 -64 384 -58.627 384 -52zM480 -52V-12C480 -5.373 474.627 0 468 0H428C421.373 0 416 -5.373 416 -12V-52C416 -58.627 421.373 -64 428 -64H468C474.627 -64 480 -58.627 480 -52z" />
-    <glyph glyph-name="tv"
-      unicode="&#xF26C;"
-      horiz-adv-x="640" d=" M592 448H48C21.5 448 0 426.5 0 400V80C0 53.5 21.5 32 48 32H293.1V0H133.1C115.4 0 101.1 -14.3 101.1 -32S115.4 -64 133.1 -64H517.1C534.8000000000001 -64 549.1 -49.7 549.1 -32S534.8000000000001 0 517.1 0H357.1V32H592C618.5 32 640 53.5 640 80V400C640 426.5 618.5 448 592 448zM576 96H64V384H576V96z" />
-    <glyph glyph-name="umbrella-beach"
-      unicode="&#xF5CA;"
-      horiz-adv-x="640" d=" M115.38 311.1L217.49 273.92C252.68 355.46 303.7 418.21 356.49 447.62C260.61 452.51 167.71 410.66 107.96 335.82C101.27 327.42 105.3 314.77 115.38 311.1zM247.63 262.94L486.11 176.11C521.87 297.49 504.81 407.77 443.48 430.0900000000001C436.0800000000001 432.79 428.35 434.0900000000001 420.3900000000001 434.0900000000001C362.3700000000001 434.08 292.12 364.92 247.6300000000001 262.94zM521.48 387.5C527.7 371.2 532.3100000000001 352.9 534.6800000000001 332.31C540.4200000000001 282.42 533.2600000000001 224.08 515.73 165.3300000000001L618.35 127.97C628.44 124.3 639.66 131.4 639.9200000000001 142.1400000000001C642.2400000000001 237.8300000000001 598.0100000000001 329.5800000000001 521.48 387.5000000000001zM560 0.02H321.06L386 178.5L325.86 200.4L252.96 0.03H16C7.16 0.03 0 -7.1300000000001 0 -15.98V-47.99C0 -56.83 7.16 -64 16 -64H560C568.84 -64 576 -56.83 576 -47.99V-15.98C576 -7.14 568.84 0.02 560 0.02z" />
-    <glyph glyph-name="umbrella"
-      unicode="&#xF0E9;"
-      horiz-adv-x="576" d=" M557.011 180.369C505.579 225.586 449.439 224.067 398.444 149.638C393.146 141.7770000000001 383.538 142.473 378.708 149.638C376.225 153.2620000000001 346.49 210.446 288 210.446C242.234 210.446 217.458 179.0680000000001 197.291 149.638C192.462 142.473 182.855 141.7770000000001 177.557 149.638C126.653 223.923 70.944 226.0440000000001 18.99 180.369C8.78 172.105 -1.922 181.478 0.294 189.85C32.146 313.427 158.516 383.3880000000001 288.001 383.3880000000001C416.794 383.3880000000001 544.547 313.427 575.707 189.85C577.913 181.528 567.281 172.057 557.011 180.369zM256 186.999V32C256 14.355 241.645 0 224 0S192 14.355 192 32C192 49.673 177.673 64 160 64S128 49.673 128 32C128 -20.935 171.065 -64 224 -64S320 -20.935 320 32V186.712C298.164 197.518 274.575 196.449 256 186.999zM320 398.0060000000001V416C320 433.673 305.673 448 288 448S256 433.673 256 416V398.0130000000001A372.105 372.105 0 0 0 320 398.0060000000001z" />
-    <glyph glyph-name="underline"
-      unicode="&#xF0CD;"
-      horiz-adv-x="448" d=" M224.264 59.76C132.595 59.76 67.661 110.925 67.661 211.152V384H39.37C30.533 384 23.37 391.163 23.37 400V432C23.37 440.837 30.533 448 39.37 448H176.76C185.597 448 192.76 440.837 192.76 432V400C192.76 391.163 185.597 384 176.76 384H147.947V211.152C147.947 157.453 176.261 131.708 224.264 131.708C271.23 131.708 300.06 157.142 300.06 211.673V384H271.769C262.932 384 255.769 391.163 255.769 400V432C255.769 440.837 262.932 448 271.769 448H408.637C417.474 448 424.637 440.837 424.637 432V400C424.637 391.163 417.474 384 408.637 384H380.346V211.152C380.346 111.747 315.4650000000001 59.76 224.264 59.76zM16 0H432C440.837 0 448 -7.163 448 -16V-48C448 -56.837 440.837 -64 432 -64H16C7.163 -64 0 -56.837 0 -48V-16C0 -7.163 7.163 0 16 0z" />
-    <glyph glyph-name="undo-alt"
-      unicode="&#xF2EA;"
-      horiz-adv-x="512" d=" M255.545 440C189.276 439.881 129.107 413.767 84.685 371.315L48.971 407.029C33.851 422.149 8 411.4410000000001 8 390.059V256C8 242.745 18.745 232 32 232H166.059C187.441 232 198.149 257.851 183.03 272.971L141.28 314.721C172.144 343.62 212.081 359.628 254.51 359.9940000000001C346.908 360.7920000000001 424.793 286.017 423.9940000000001 190.552C423.236 99.991 349.816 24 256 24C214.873 24 176.003 38.678 145.37 65.556C140.627 69.717 133.464 69.464 129.002 65.003L89.34 25.341C84.468 20.469 84.709 12.526 89.822 7.908C133.798 -31.813 192.074 -56 256 -56C392.966 -56 503.999 55.033 504 191.998C504.001 328.807 392.354 440.245 255.545 440z" />
-    <glyph glyph-name="undo"
-      unicode="&#xF0E2;"
-      horiz-adv-x="512" d=" M212.333 223.667H12C5.373 223.667 0 229.04 0 235.667V436C0 442.627 5.373 448 12 448H60C66.627 448 72 442.627 72 436V357.8880000000001C117.773 408.721 184.26 440.53 258.175 439.993C395.081 438.999 504.623 328.37 504.332 191.461C504.041 54.742 393.12 -56 256.3330000000001 -56C192.244 -56 133.8370000000001 -31.687 89.823 8.215C84.724 12.837 84.489 20.769 89.356 25.635L123.323 59.602C127.7970000000001 64.076 134.9850000000001 64.319 139.7240000000001 60.127C170.76 32.664 211.58 16 256.3330000000001 16C353.601 16 432.3330000000001 94.716 432.3330000000001 192C432.3330000000001 289.267 353.617 368 256.3330000000001 368C197.837 368 146.053 339.524 114.059 295.6670000000001H212.333C218.96 295.6670000000001 224.333 290.294 224.333 283.6670000000001V235.667C224.333 229.04 218.96 223.667 212.333 223.667z" />
-    <glyph glyph-name="universal-access"
-      unicode="&#xF29A;"
-      horiz-adv-x="512" d=" M256 400C370.953 400 464 306.971 464 192C464 77.047 370.971 -16 256 -16C141.047 -16 48 77.029 48 192C48 306.953 141.029 400 256 400M256 440C119.033 440 8 328.967 8 192S119.033 -56 256 -56S504 55.033 504 192S392.967 440 256 440zM256 384C149.961 384 64 298.039 64 192S149.961 0 256 0S448 85.961 448 192S362.039 384 256 384zM256 340C275.882 340 292 323.882 292 304S275.882 268 256 268S220 284.118 220 304S236.118 340 256 340zM373.741 241.977C345.029 235.198 318.23 229.229 291.601 226.17C292.452 125.1470000000001 303.907 103.118 316.638 70.549C320.255 61.289 315.681 50.851 306.421 47.234C297.16 43.617 286.722 48.191 283.105 57.451C274.4000000000001 79.759 266.019 98.087 260.844 136H251.158C245.991 98.149 237.624 79.792 228.896 57.451C225.281 48.196 214.846 43.615 205.581 47.234C196.321 50.8510000000001 191.747 61.29 195.364 70.549C208.077 103.09 219.549 125.09 220.401 226.1700000000001C193.772 229.2280000000001 166.973 235.1970000000001 138.26 241.9770000000001C129.66 244.0080000000001 124.334 252.6250000000001 126.365 261.226S137.012 275.1520000000001 145.614 273.1210000000001C242.3 250.2920000000001 269.897 250.338 366.389 273.1210000000001C374.988 275.1510000000001 383.6070000000001 269.827 385.6380000000001 261.226C387.6670000000001 252.6250000000001 382.341 244.0070000000001 373.7410000000001 241.9770000000001z" />
-    <glyph glyph-name="university"
-      unicode="&#xF19C;"
-      horiz-adv-x="512" d=" M496 320V304A8 8 0 0 0 488 296H464V284C464 277.373 458.627 272 452 272H60C53.373 272 48 277.373 48 284V296H24A8 8 0 0 0 16 304V320A8 8 0 0 0 20.941 327.392L252.941 415.392A7.996000000000001 7.996000000000001 0 0 0 259.0590000000001 415.392L491.059 327.392A8 8 0 0 0 496 320zM472 16H40C26.745 16 16 5.255 16 -8V-24A8 8 0 0 1 24 -32H488A8 8 0 0 1 496 -24V-8C496 5.255 485.255 16 472 16zM96 256V64H60C53.373 64 48 58.627 48 52V32H464V52C464 58.627 458.627 64 452 64H416V256H352V64H288V256H224V64H160V256H96z" />
-    <glyph glyph-name="unlink"
-      unicode="&#xF127;"
-      horiz-adv-x="512" d=" M304.0830000000001 42.093C308.769 37.407 308.769 29.809 304.0830000000001 25.122L259.4090000000001 -19.552C200.1460000000001 -78.814 103.716 -78.818 44.448 -19.552C-14.816 39.713 -14.816 136.144 44.448 195.4080000000001L89.123 240.0830000000001C93.809 244.7690000000001 101.407 244.7690000000001 106.094 240.0830000000001L145.692 200.485C150.3780000000001 195.799 150.3780000000001 188.201 145.692 183.514L101.017 138.84C72.945 110.7670000000001 72.945 65.09 101.017 37.0170000000001C129.089 8.9450000000001 174.7670000000001 8.9440000000001 202.841 37.0170000000001L247.5150000000001 81.691C252.2010000000001 86.377 259.7990000000001 86.377 264.4860000000001 81.691L304.0830000000001 42.093zM247.5150000000001 302.3090000000001C252.2010000000001 297.6230000000001 259.7990000000001 297.6230000000001 264.4860000000001 302.3090000000001L309.1600000000001 346.9830000000001C337.2320000000001 375.0580000000001 382.9100000000001 375.0560000000001 410.9840000000001 346.9830000000001C439.0560000000001 318.9100000000001 439.0560000000001 273.2330000000001 410.9840000000001 245.1600000000001L366.3090000000001 200.486C361.6230000000001 195.8 361.6230000000001 188.202 366.3090000000001 183.5150000000001L405.9070000000001 143.917C410.593 139.2310000000001 418.1910000000001 139.2310000000001 422.8780000000001 143.917L467.5530000000001 188.5920000000001C526.8180000000001 247.8570000000001 526.8180000000001 344.2870000000001 467.5530000000001 403.552C408.2870000000001 462.816 311.8580000000001 462.816 252.5920000000001 403.552L207.918 358.8780000000001C203.232 354.192 203.232 346.5940000000001 207.918 341.9070000000001L247.5150000000001 302.3090000000001zM482.3430000000001 -56.9709999999999L504.9700000000001 -34.3439999999999C514.3430000000001 -24.9709999999999 514.3430000000001 -9.7749999999999 504.9700000000001 -0.4029999999999L63.598 440.971C54.225 450.344 39.029 450.344 29.657 440.971L7.029 418.343C-2.344 408.9700000000001 -2.344 393.774 7.029 384.402L448.402 -56.971C457.775 -66.343 472.971 -66.343 482.343 -56.971z" />
-    <glyph glyph-name="unlock-alt"
-      unicode="&#xF13E;"
-      horiz-adv-x="448" d=" M400 192H152V295.1C152 334.7 183.7 367.6 223.3 368C263.3 368.4 296 335.9 296 296V280C296 266.7 306.7 256 320 256H352C365.3 256 376 266.7 376 280V296C376 380 307.5 448.3 223.5 448C139.5 447.7 72 378.5 72 294.5V192H48C21.5 192 0 170.5 0 144V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V144C448 170.5 426.5 192 400 192zM264 40C264 17.9 246.1 0 224 0S184 17.9 184 40V88C184 110.1 201.9 128 224 128S264 110.1 264 88V40z" />
-    <glyph glyph-name="unlock"
-      unicode="&#xF09C;"
-      horiz-adv-x="448" d=" M400 192H152V295.1C152 334.7 183.7 367.6 223.3 368C263.3 368.4 296 335.9 296 296V280C296 266.7 306.7 256 320 256H352C365.3 256 376 266.7 376 280V296C376 380 307.5 448.3 223.5 448C139.5 447.7 72 378.5 72 294.5V192H48C21.5 192 0 170.5 0 144V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V144C448 170.5 426.5 192 400 192z" />
-    <glyph glyph-name="upload"
-      unicode="&#xF093;"
-      horiz-adv-x="512" d=" M296 64H216C202.7 64 192 74.7 192 88V256H104.3C86.5 256 77.6 277.5 90.2 290.1L242.3 442.3C249.8 449.8 262.1 449.8 269.6 442.3L421.8 290.1C434.4000000000001 277.5 425.5 256 407.7 256H320V88C320 74.7 309.3 64 296 64zM512 72V-40C512 -53.3 501.3 -64 488 -64H24C10.7 -64 0 -53.3 0 -40V72C0 85.3 10.7 96 24 96H160V88C160 57.1 185.1 32 216 32H296C326.9 32 352 57.1 352 88V96H488C501.3 96 512 85.3 512 72zM388 -16C388 -5 379 4 368 4S348 -5 348 -16S357 -36 368 -36S388 -27 388 -16zM452 -16C452 -5 443 4 432 4S412 -5 412 -16S421 -36 432 -36S452 -27 452 -16z" />
-    <glyph glyph-name="user-alt-slash"
-      unicode="&#xF4FA;"
-      horiz-adv-x="640" d=" M633.8 -10.1L389.6 178.7C433.8 203.3 464 249.9 464 304C464 383.5 399.5 448 320 448C252.9 448 197 401.9 181 339.8L45.5 444.6C38.5 450 28.5 448.8 23 441.8L3.4 416.6C-2 409.6 -0.8 399.6 6.2 394.2L594.6 -60.5C601.6 -65.9 611.6 -64.7 617.1 -57.7L636.7 -32.4C642.1 -25.6 640.8000000000001 -15.5 633.8000000000001 -10.1zM198.4 128C124.2 128 64 67.8 64 -6.4V-16C64 -42.5 85.5 -64 112 -64H494.2L245.8 128H198.4z" />
-    <glyph glyph-name="user-alt"
-      unicode="&#xF406;"
-      horiz-adv-x="512" d=" M256 160C335.5 160 400 224.5 400 304S335.5 448 256 448S112 383.5 112 304S176.5 160 256 160zM384 128H328.9C306.7 117.8 282 112 256 112S205.4 117.8 183.1 128H128C57.3 128 0 70.7 0 0V-16C0 -42.5 21.5 -64 48 -64H464C490.5 -64 512 -42.5 512 -16V0C512 70.7 454.7 128 384 128z" />
-    <glyph glyph-name="user-astronaut"
-      unicode="&#xF4FB;"
-      horiz-adv-x="448" d=" M64 224H77.5C102.2 167.5 158.4 128 224 128S345.8 167.5 370.5 224H384C392.8 224 400 231.2 400 240V336C400 344.8 392.8 352 384 352H370.5C345.8 408.5 289.6 448 224 448S102.2 408.5 77.5 352H64C55.2 352 48 344.8 48 336V240C48 231.2 55.2 224 64 224zM104 312C104 334.1 125.5 352 152 352H296C322.5 352 344 334.1 344 312V288C344 235 301 192 248 192H200C147 192 104 235 104 288V312zM176 240L188 276L224 288L188 300L176 336L164 300L128 288L164 276L176 240zM327.6 126.6C297.7 107.3 262.2 96 224 96S150.3 107.3 120.4 126.6C52.9 119.5 0 63 0 -6.4V-16C0 -42.5 21.5 -64 48 -64H128V0C128 17.7 142.3 32 160 32H288C305.7 32 320 17.7 320 0V-64H400C426.5 -64 448 -42.5 448 -16V-6.4C448 63 395.1 119.5 327.6 126.6zM272 0C263.2 0 256 -7.2 256 -16S263.2 -32 272 -32S288 -24.8 288 -16S280.8 0 272 0zM176 0C167.2 0 160 -7.2 160 -16V-64H192V-16C192 -7.2 184.8 0 176 0z" />
-    <glyph glyph-name="user-check"
-      unicode="&#xF4FC;"
-      horiz-adv-x="640" d=" M224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192zM313.6 160H296.9000000000001C274.7000000000001 149.8 250.0000000000001 144 224 144S173.4 149.8 151.1 160H134.4C60.2 160 0 99.8 0 25.6V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V25.6C448 99.8 387.8 160 313.6 160zM636.6 288.4L608.8000000000001 316.5C604.2 321.2 596.7 321.2 592.0000000000001 316.6L487.2000000000001 212.6L441.7000000000001 258.4C437.1000000000001 263.1 429.6000000000001 263.1 424.9000000000001 258.5L396.8000000000001 230.6C392.1000000000001 226 392.1000000000001 218.5 396.7000000000001 213.8L478.4 131.5C483.0000000000001 126.8 490.5000000000001 126.8 495.2 131.3999999999999L636.5 271.5999999999999C641.1 276.2999999999999 641.2 283.7999999999999 636.6 288.3999999999999z" />
-    <glyph glyph-name="user-circle"
-      unicode="&#xF2BD;"
-      horiz-adv-x="496" d=" M248 440C111 440 0 329 0 192S111 -56 248 -56S496 55 496 192S385 440 248 440zM248 344C296.6 344 336 304.6 336 256S296.6 168 248 168S160 207.4 160 256S199.4 344 248 344zM248 0C189.3 0 136.7 26.6 101.5 68.2C120.3 103.6 157.1 128 200 128C202.4 128 204.8 127.6 207.1 126.9C220.1 122.7 233.7 120 248 120C262.3 120 276 122.7 288.9 126.9C291.2 127.6 293.6 128 296 128C338.9 128 375.7 103.6 394.5 68.2C359.3 26.6 306.7 0 248 0z" />
-    <glyph glyph-name="user-clock"
-      unicode="&#xF4FD;"
-      horiz-adv-x="640" d=" M496 224C416.4 224 352 159.6 352 80S416.4 -64 496 -64S640 0.4 640 80S575.6 224 496 224zM560 73.7C560 68.4 555.6 64 550.3 64H489.6999999999999C484.3999999999999 64 479.9999999999999 68.4 479.9999999999999 73.7V150.3C479.9999999999999 155.6 484.3999999999999 160 489.6999999999999 160H502.3C507.6 160 511.9999999999999 155.6 511.9999999999999 150.3V96H550.3C555.5999999999999 96 560 91.6 560 86.3V73.7zM320 80C320 107.8 326.7 134.1 338.2 157.5C330.2 159 322 160 313.6 160H296.9C274.7 149.8 250 144 224 144S173.4 149.8 151.1 160H134.4C60.2 160 0 99.8 0 25.6V-16C0 -42.5 21.5 -64 48 -64H395.1C349.8 -32.1 320 20.5 320 80zM224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192z" />
-    <glyph glyph-name="user-cog"
-      unicode="&#xF4FE;"
-      horiz-adv-x="640" d=" M610.5 74.7C613.1 88.8 613.1 103.2 610.5 117.3L636.3 132.2C639.3 133.9 640.5999999999999 137.4 639.5999999999999 140.7C632.8999999999999 162.3 621.3999999999999 181.9 606.3999999999999 198.1C604.0999999999999 200.6 600.3999999999999 201.2 597.3999999999999 199.5L571.5999999999999 184.6C560.6999999999999 193.9 548.1999999999999 201.1 534.6999999999999 205.9V235.7000000000001C534.6999999999999 239.1000000000001 532.3 242.1000000000001 528.9999999999999 242.8000000000001C506.6999999999999 247.8000000000001 483.9999999999999 247.6000000000001 462.7999999999999 242.8000000000001C459.4999999999999 242.1000000000001 457.0999999999999 239.1000000000001 457.0999999999999 235.7000000000001V205.9C443.5999999999999 201.1 431.0999999999999 193.9 420.2 184.6L394.3999999999999 199.5C391.5 201.2 387.7 200.6 385.3999999999999 198.1C370.3999999999999 181.9 358.8999999999999 162.3 352.2 140.7000000000001C351.2 137.4 352.5999999999999 133.9 355.5 132.2000000000001L381.3 117.3000000000001C378.7 103.2000000000001 378.7 88.8000000000001 381.3 74.7000000000001L355.5 59.8000000000001C352.5 58.1000000000001 351.2 54.6000000000001 352.2 51.3000000000001C358.8999999999999 29.7 370.3999999999999 10.2 385.3999999999999 -6.0999999999999C387.7 -8.5999999999999 391.3999999999999 -9.1999999999999 394.3999999999999 -7.4999999999999L420.2 7.4000000000001C431.0999999999999 -1.8999999999999 443.5999999999999 -9.0999999999999 457.0999999999999 -13.8999999999999V-43.6999999999999C457.0999999999999 -47.0999999999999 459.4999999999999 -50.0999999999999 462.7999999999999 -50.8C485.0999999999999 -55.8 507.7999999999999 -55.6 528.9999999999999 -50.8C532.2999999999998 -50.1 534.6999999999999 -47.1 534.6999999999999 -43.6999999999999V-13.8999999999999C548.1999999999999 -9.0999999999999 560.6999999999999 -1.8999999999999 571.5999999999999 7.4000000000001L597.3999999999999 -7.4999999999999C600.2999999999998 -9.1999999999999 604.0999999999999 -8.5999999999999 606.3999999999999 -6.0999999999999C621.3999999999999 10.1000000000001 632.8999999999999 29.7000000000001 639.5999999999999 51.3000000000001C640.5999999999999 54.6000000000001 639.1999999999999 58.1000000000001 636.3 59.8000000000001L610.5 74.7000000000001zM496 47.5C469.2 47.5 447.5 69.3 447.5 96S469.3 144.5 496 144.5S544.5 122.7 544.5 96S522.8 47.5 496 47.5zM224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192zM425.2 -34.5C422.9 -33.3 420.6 -31.9 418.4 -30.6L410.5 -35.2C404.5 -38.6 397.7 -40.5000000000001 390.9 -40.5000000000001C380 -40.5000000000001 369.5 -35.9 362 -27.9C343.7 -8.1 329.7 15.9999999999999 321.8 41.6999999999999C316.3 59.3999999999999 323.7 78.0999999999999 339.7 87.3999999999999L347.6 91.9999999999999C347.5 94.6 347.5 97.1999999999999 347.6 99.8L339.7 104.4C323.7 113.6 316.3 132.4 321.8 150.1C322.7 153 324 155.9 325 158.8C321.2 159.1 317.5 160 313.6 160H296.9000000000001C274.7000000000001 149.8 250.0000000000001 144 224 144S173.4 149.8 151.1 160H134.4C60.2 160 0 99.8 0 25.6V-16C0 -42.5 21.5 -64 48 -64H400C410.1 -64 419.5 -60.8 427.2 -55.5C426 -51.7 425.2 -47.8 425.2 -43.7V-34.5z" />
-    <glyph glyph-name="user-edit"
-      unicode="&#xF4FF;"
-      horiz-adv-x="640" d=" M224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192zM313.6 160H296.9000000000001C274.7000000000001 149.8 250.0000000000001 144 224 144S173.4 149.8 151.1 160H134.4C60.2 160 0 99.8 0 25.6V-16C0 -42.5 21.5 -64 48 -64H322.9C320.5 -57.2 319.5 -50 320.3 -42.7L327.1 18.2L328.3 29.3L336.2 37.2L413.5 114.5C389 142.2 353.5 160 313.5999999999999 160zM358.9000000000001 14.7L352.1 -46.3C351 -56.5 359.6 -65.1 369.7000000000001 -63.9L430.6 -57.1L568.5 80.8L496.8 152.5L358.9 14.6999999999999zM633 179.1L595.1 217C585.8000000000001 226.3 570.6 226.3 561.3000000000001 217L523.5000000000001 179.2L519.4000000000001 175.1L591.2 103.4L633 145.2C642.3 154.6 642.3 169.7 633 179.1z" />
-    <glyph glyph-name="user-friends"
-      unicode="&#xF500;"
-      horiz-adv-x="640" d=" M192 192C253.9 192 304 242.1 304 304S253.9 416 192 416S80 365.9 80 304S130.1 192 192 192zM268.8 160H260.5C239.7 150 216.6 144 192 144S144.4 150 123.5 160H115.2C51.6 160 0 108.4 0 44.8V16C0 -10.5 21.5 -32 48 -32H336C362.5 -32 384 -10.5 384 16V44.8C384 108.4 332.4 160 268.8 160zM480 192C533 192 576 235 576 288S533 384 480 384S384 341 384 288S427 192 480 192zM528 160H524.2C510.3000000000001 155.2 495.6 152 480.0000000000001 152S449.7000000000001 155.2 435.8000000000001 160H432C411.6 160 392.8 154.1 376.3 144.6C400.7 118.3 416 83.4 416 44.8V6.4C416 4.2 415.5 2.1 415.4 1e-13H592C618.5 1e-13 640 21.5000000000001 640 48.0000000000001C640 109.9 589.9 160.0000000000001 528 160.0000000000001z" />
-    <glyph glyph-name="user-graduate"
-      unicode="&#xF501;"
-      horiz-adv-x="448" d=" M319.4 127.4L224 32L128.6 127.4C57.1 124.3 0 65.8 0 -6.4V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V-6.4C448 65.8 390.9 124.3 319.4 127.4zM13.6 368.2L20 366.7V308.3C13 304.1 8 296.8 8 288C8 279.6 12.6 272.6 19.1 268.3L3.5 206C1.8 199.1 5.6 192 11.1 192H52.9C58.4 192 62.2 199.1 60.5 206L44.9 268.3C51.4 272.6 56 279.6 56 288C56 296.8 51 304.1 44 308.3V360.9L110 345C101.4 327.8 96 308.6 96 288C96 217.3 153.3 160 224 160S352 217.3 352 288C352 308.6 346.7 327.8 338 345L434.3 368.2C452.5 372.6 452.5 395.3 434.3 399.7L243.9 445.7C230.9 448.8 217.2 448.8 204.2 445.7L13.6 399.8C-4.5 395.4 -4.5 372.6 13.6 368.2z" />
-    <glyph glyph-name="user-lock"
-      unicode="&#xF502;"
-      horiz-adv-x="640" d=" M320 128C320 139.1 323.1 149.4 328.1 158.5C323.3 159 318.6 160 313.6 160H296.9000000000001C274.7000000000001 149.8 250.0000000000001 144 224 144S173.4 149.8 151.1 160H134.4C60.2 160 0 99.8 0 25.6V-16C0 -42.5 21.5 -64 48 -64H328.9C323.4 -54.5 320 -43.7 320 -32V128zM224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192zM608 160H576V208C576 252.2 540.2 288 496 288S416 252.2 416 208V160H384C366.3 160 352 145.7 352 128V-32C352 -49.7 366.3 -64 384 -64H608C625.7 -64 640 -49.7 640 -32V128C640 145.7 625.7 160 608 160zM528 160H464V208C464 225.6 478.4 240 496 240S528 225.6 528 208V160z" />
-    <glyph glyph-name="user-md"
-      unicode="&#xF0F0;"
-      horiz-adv-x="448" d=" M224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192zM104 24C104 10.7 114.7 0 128 0S152 10.7 152 24S141.3 48 128 48S104 37.3 104 24zM320 159.4V110.4C356.5 103 384 70.6 384 32V-9.7C384 -17.3 378.6 -23.9 371.1 -25.4L338.9000000000001 -31.8C334.6 -32.6999999999999 330.4000000000001 -29.9 329.5000000000001 -25.4999999999999L326.4000000000001 -9.8C325.5000000000001 -5.4999999999999 328.3 -1.1999999999999 332.7000000000001 -0.4L352.0000000000001 3.5V32C352.0000000000001 94.8 256.0000000000001 97.1 256.0000000000001 30.1V3.4L275.3000000000001 -0.4999999999999C279.6000000000001 -1.3999999999999 282.4000000000001 -5.6 281.6000000000001 -9.8999999999999L278.5000000000001 -25.5999999999999C277.6000000000001 -29.8999999999999 273.4000000000001 -32.6999999999999 269.1000000000001 -31.8999999999999L237.9000000000001 -27.6999999999999C230.0000000000001 -26.5999999999999 224.1000000000001 -19.8999999999999 224.1000000000001 -11.8V32C224.1000000000001 70.6 251.6000000000001 102.9 288.1000000000001 110.4V155.6C285.9000000000001 154.9 283.7000000000001 154.5 281.5000000000001 153.7C263.5000000000001 147.4 244.2000000000001 143.9 224.1000000000001 143.9S184.7000000000001 147.4 166.7000000000001 153.7C159.3000000000001 156.3 151.8000000000001 157.9 144.1000000000001 158.9V77.3C167.2000000000001 70.4 184.1000000000001 49.1999999999999 184.1000000000001 23.9C184.1000000000001 -7 159.0000000000001 -32.1 128.1000000000001 -32.1S72.1000000000001 -7 72.1000000000001 23.9C72.1000000000001 49.2 89.0000000000001 70.4 112.1000000000001 77.3V157.6999999999999C48.5 147 0 92.2 0 25.6V-19.2C0 -43.9 20.1 -64 44.8 -64H403.2C427.9 -64 448 -43.9 448 -19.2V25.6C448 97.6 391.2 155.9 320 159.4z" />
-    <glyph glyph-name="user-minus"
-      unicode="&#xF503;"
-      horiz-adv-x="640" d=" M624 240H432C423.2 240 416 232.8 416 224V192C416 183.2 423.2 176 432 176H624C632.8 176 640 183.2 640 192V224C640 232.8 632.8 240 624 240zM224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192zM313.6 160H296.9000000000001C274.7000000000001 149.8 250.0000000000001 144 224 144S173.4 149.8 151.1 160H134.4C60.2 160 0 99.8 0 25.6V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V25.6C448 99.8 387.8 160 313.6 160z" />
-    <glyph glyph-name="user-ninja"
-      unicode="&#xF504;"
-      horiz-adv-x="448" d=" M325.4 158.8L224 57.4L122.6 158.8C54 152.7 0 95.8 0 25.6V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V25.6C448 95.8 394 152.7000000000001 325.4 158.8zM32 256C59.3 256 83.8 267.5 101.2 285.7C116.3 231.8 165.2 192 224 192C294.7 192 352 249.3 352 320S294.7 448 224 448C173.6 448 130.4 418.6 109.5 376.2C92.1 400.2 64 416 32 416C32 382.6 49.1 353.2 75.1 336C49.1 318.8 32 289.4 32 256zM176 352H272C289.7 352 304 337.7 304 320H144C144 337.7 158.3 352 176 352z" />
-    <glyph glyph-name="user-plus"
-      unicode="&#xF234;"
-      horiz-adv-x="640" d=" M624 240H560V304C560 312.8 552.8 320 544 320H512C503.2 320 496 312.8 496 304V240H432C423.2 240 416 232.8 416 224V192C416 183.2 423.2 176 432 176H496V112C496 103.2 503.2 96 512 96H544C552.8 96 560 103.2 560 112V176H624C632.8 176 640 183.2 640 192V224C640 232.8 632.8 240 624 240zM224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192zM313.6 160H296.9000000000001C274.7000000000001 149.8 250.0000000000001 144 224 144S173.4 149.8 151.1 160H134.4C60.2 160 0 99.8 0 25.6V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V25.6C448 99.8 387.8 160 313.6 160z" />
-    <glyph glyph-name="user-secret"
-      unicode="&#xF21B;"
-      horiz-adv-x="448" d=" M383.9 139.7L407.8 202.3C411.8 212.8 404.1 224 392.8 224H334.3C345.3 242.9 352.1 264.6 352.1 288V288.3C391.3 296.1 416.1 307.4 416.1 320C416.1 333.3 388.8 345.1 346 353C336.8 385.8 319 418.8 305.4 435.8C295.9 447.7 279.5 451.4 265.9 444.6L238.3 430.8C229.3 426.3 218.7 426.3 209.7 430.8L182.1 444.6C168.5 451.4 152.1 447.7 142.6 435.8C129.1 418.8 111.2 385.8 102 353C59.3 345.1 32 333.3 32 320C32 307.4 56.8 296.1 96 288.3V288C96 264.6 102.8 242.9 113.8 224H56.3C44.8 224 37.1 212.3 41.6 201.7L67.4 141.5C27.3 118.2 0 75.3 0 25.6V-19.2C0 -43.9 20.1 -64 44.8 -64H403.2C427.9 -64 448 -43.9 448 -19.2V25.6C448 74 422.2 116 383.9 139.7000000000001zM176 -32L134.4 160L184 128L208 88L176 -32zM272 -32L240 88L264 128L313.6 160L272 -32zM313.7 266.5C309.8 254.6 306.7 241.9 297.2 233.1C287.1 223.8 249.2 210.7 233.2 258.1C230.4 266.5 217.8 266.5 214.9 258.1C197.9 207.9 158.9 225.7 150.9 233.1C141.4 241.9 138.2 254.6 134.4 266.5C133.6 269 128.1 272.2 128.1 272.3V283.1C156.4 279.5 189.1 277.3 224.1 277.3S291.8 279.4 320.1 283.1V272.3C320 272.2000000000001 314.5 269.1 313.7 266.5z" />
-    <glyph glyph-name="user-shield"
-      unicode="&#xF505;"
-      horiz-adv-x="640" d=" M622.3 176.9L507.1 221.9C502.9999999999999 223.5 494.4999999999999 225.6 484.9 221.9L369.7 176.9C359 172.7 352 162.9 352 152C352 40.4 420.7 -36.8 484.9 -61.9C494.5 -65.6 502.9 -63.5 507.1 -61.9C558.4 -41.9 640 27.5 640 152C640 162.9 633 172.7 622.3 176.9zM496 -14.4V174.7L591.5 137.4C585.9 50.3 530.6 2 496 -14.4zM224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192zM320 152C320 154.5 320.8 156.8 321.1 159.2C318.6 159.3 316.2000000000001 160 313.6 160H296.9000000000001C274.7000000000001 149.8 250.0000000000001 144 224 144S173.4 149.8 151.1 160H134.4C60.2 160 0 99.8 0 25.6V-16C0 -42.5 21.5 -64 48 -64H400C406.8 -64 413.3 -62.5 419.2 -60C365.2 -17.1 320 56.7 320 152z" />
-    <glyph glyph-name="user-slash"
-      unicode="&#xF506;"
-      horiz-adv-x="640" d=" M633.8 -10.1L362.3 199.7C412.1 217.3 448 264.2 448 320C448 390.7 390.7 448 320 448C252.9 448 198.5 396.2 193.1 330.6L45.5 444.6C38.5 450 28.5 448.8 23 441.8L3.4 416.6C-2 409.6 -0.8 399.6 6.2 394.2L594.6 -60.5C601.6 -65.9 611.6 -64.7 617.1 -57.7L636.7 -32.4C642.1 -25.6 640.8000000000001 -15.5 633.8000000000001 -10.1zM96 25.6V-16C96 -42.5 117.5 -64 144 -64H494.2L207.4 157.7C144.2 146.7 96 92 96 25.6z" />
-    <glyph glyph-name="user-tag"
-      unicode="&#xF507;"
-      horiz-adv-x="640" d=" M630.6 83.1L540.3000000000001 173.3C528.3000000000001 185.3 512.0000000000001 192 495.0000000000001 192H415.7000000000001C398.0000000000001 192 383.7000000000001 177.7 383.7000000000001 160V80.8C383.7000000000001 63.8 390.4000000000001 47.6 402.4000000000001 35.6L492.7 -54.6C505.2 -67.0999999999999 525.5 -67.0999999999999 538 -54.6L630.5 37.9C643.1 50.4 643.1 70.6 630.6 83.1zM447.8 104.1C434.5 104.1 423.8 114.8 423.8 128.1S434.5 152.1 447.8 152.1S471.8 141.4 471.8 128.1C471.8 114.9 461.1 104.1 447.8 104.1zM224 192.1C294.7 192.1 352 249.4000000000001 352 320.1C352 390.7 294.7 448 224 448S96 390.7 96 320C96 249.4 153.3 192.1 224 192.1zM351.8 80.9V154C339.6 157.6 326.9000000000001 160.2 313.6 160.2H296.9000000000001C274.7000000000001 150 250.0000000000001 144.2 224 144.2S173.4 150 151.1 160.2H134.4C60.2 160.1 0 99.9 0 25.7V-15.9C0 -42.4 21.5 -63.9 48 -63.9H400C415.5 -63.9 429.1 -56.4 437.9 -45.0000000000001L379.9 12.9999999999999C361.8 31.1 351.8 55.1999999999999 351.8 80.9z" />
-    <glyph glyph-name="user-tie"
-      unicode="&#xF508;"
-      horiz-adv-x="448" d=" M224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192zM319.8 159.4L272 -32L240 104L272 160H176L208 104L176 -32L128.2 159.4C56.9 156 0 97.7 0 25.6V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V25.6C448 97.7000000000001 391.1 156 319.8 159.4z" />
-    <glyph glyph-name="user-times"
-      unicode="&#xF235;"
-      horiz-adv-x="640" d=" M589.6 208L635.2 253.6C641.5 259.9 641.5 270.1 635.2 276.4L612.4000000000001 299.2000000000001C606.1000000000001 305.5 595.9000000000001 305.5 589.6000000000001 299.2000000000001L544 253.6L498.4 299.2C492.1 305.5 481.9 305.5 475.6 299.2L452.8 276.4C446.5 270.1 446.5 259.9 452.8 253.6L498.4 208L452.8 162.4C446.5 156.1 446.5 145.9 452.8 139.6L475.6 116.8C481.9 110.4999999999999 492.1 110.4999999999999 498.4 116.8L544 162.4L589.6 116.8C595.9 110.4999999999999 606.1 110.4999999999999 612.4 116.8L635.1999999999999 139.6C641.4999999999999 145.9 641.4999999999999 156.1 635.1999999999999 162.4L589.6 208zM224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192zM313.6 160H296.9000000000001C274.7000000000001 149.8 250.0000000000001 144 224 144S173.4 149.8 151.1 160H134.4C60.2 160 0 99.8 0 25.6V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V25.6C448 99.8 387.8 160 313.6 160z" />
-    <glyph glyph-name="user"
-      unicode="&#xF007;"
-      horiz-adv-x="448" d=" M224 192C294.7 192 352 249.3 352 320S294.7 448 224 448S96 390.7 96 320S153.3 192 224 192zM313.6 160H296.9000000000001C274.7000000000001 149.8 250.0000000000001 144 224 144S173.4 149.8 151.1 160H134.4C60.2 160 0 99.8 0 25.6V-16C0 -42.5 21.5 -64 48 -64H400C426.5 -64 448 -42.5 448 -16V25.6C448 99.8 387.8 160 313.6 160z" />
-    <glyph glyph-name="users-cog"
-      unicode="&#xF509;"
-      horiz-adv-x="640" d=" M610.5 106.7C613.1 120.8 613.1 135.2 610.5 149.3L636.3 164.2C639.3 165.9 640.5999999999999 169.4 639.5999999999999 172.7C632.8999999999999 194.3 621.3999999999999 213.9 606.3999999999999 230.1C604.0999999999999 232.6 600.3999999999999 233.2 597.3999999999999 231.5L571.5999999999999 216.6C560.6999999999999 225.9 548.1999999999999 233.1 534.6999999999999 237.9V267.7000000000001C534.6999999999999 271.1 532.3 274.1 528.9999999999999 274.8C506.6999999999999 279.8 483.9999999999999 279.6 462.7999999999999 274.8C459.4999999999999 274.1 457.0999999999999 271.1 457.0999999999999 267.7000000000001V237.9C443.5999999999999 233.1 431.0999999999999 225.9 420.2 216.6L394.3999999999999 231.5C391.5 233.2 387.7 232.6 385.3999999999999 230.1C370.3999999999999 213.9 358.8999999999999 194.3 352.2 172.7C351.2 169.4 352.5999999999999 165.9 355.5 164.2L381.3 149.3C378.7 135.2 378.7 120.8 381.3 106.7L355.5 91.8C352.5 90.1 351.2 86.6 352.2 83.3C358.8999999999999 61.7 370.3999999999999 42.2 385.3999999999999 25.9C387.7 23.4 391.3999999999999 22.8 394.3999999999999 24.5000000000001L420.2 39.4C431.0999999999999 30.1 443.5999999999999 22.9 457.0999999999999 18.1V-11.7C457.0999999999999 -15.1 459.4999999999999 -18.1 462.7999999999999 -18.8C485.0999999999999 -23.8 507.7999999999999 -23.6 528.9999999999999 -18.8C532.2999999999998 -18.1 534.6999999999999 -15.1 534.6999999999999 -11.7V18.1C548.1999999999999 22.9 560.6999999999999 30.1 571.5999999999999 39.4L597.3999999999999 24.5000000000001C600.2999999999998 22.8000000000001 604.0999999999999 23.4 606.3999999999999 25.9C621.3999999999999 42.1 632.8999999999999 61.7000000000001 639.5999999999999 83.3C640.5999999999999 86.6 639.1999999999999 90.1 636.3 91.8L610.5 106.7zM496 79.5C469.2 79.5 447.5 101.3 447.5 128S469.3 176.5 496 176.5S544.5 154.7 544.5 128S522.8 79.5 496 79.5zM96 224C131.3 224 160 252.7 160 288S131.3 352 96 352S32 323.3 32 288S60.7 224 96 224zM320 192C321.9 192 323.7 192.5 325.6 192.6C333.9000000000001 214.3 346.1 234.7 361.9000000000001 251.8C369.3 259.8 379.8 264.4 390.8 264.4C397.7 264.4 404.5 262.6 410.4000000000001 259.1L418.3 254.5C419.1 255 419.9000000000001 255.4 420.7 255.9C427.7 270.5 431.9 286.7000000000001 431.9 303.9C431.9 365.8 381.8 415.9 319.9 415.9S208 365.9 208 304C208 242.1 258.1 192 320 192zM425.2 -2.5C422.9 -1.3 420.6 0.1 418.4 1.4C410.2 -3.4 403.1 -8.4 390.9 -8.4C380 -8.4 369.5 -3.8 362 4.2C343.7 24 329.7 48.1 321.8 73.8C311.1 108.3 346.7 123.5 347.6 124.1C347.5 126.7 347.5 129.3 347.6 131.9L339.7000000000001 136.5C335.9000000000001 138.7 332.7000000000001 141.5 329.9000000000001 144.6C326.6 144.4 323.4000000000001 144 320.1 144C295.5 144 272.5 150 251.6 160H243.3C179.6 160 128 108.4 128 44.8V16C128 -10.5 149.5 -32 176 -32H431.4C427.7 -26 425.2 -19.2 425.2 -11.7V-2.5zM173.1 173.4C161.5 184.9 145.6 192 128 192H64C28.7 192 0 163.3 0 128V96C0 78.3 14.3 64 32 64H97.9C104.2 111.4 132.8 151.3 173.1 173.4z" />
-    <glyph glyph-name="users"
-      unicode="&#xF0C0;"
-      horiz-adv-x="640" d=" M96 224C131.3 224 160 252.7 160 288S131.3 352 96 352S32 323.3 32 288S60.7 224 96 224zM544 224C579.3 224 608 252.7 608 288S579.3 352 544 352S480 323.3 480 288S508.7 224 544 224zM576 192H512C494.4 192 478.5 184.9 466.9 173.4C507.2 151.3 535.8 111.4 542 64H608C625.7 64 640 78.3 640 96V128C640 163.3 611.3 192 576 192zM320 192C381.9 192 432 242.1 432 304S381.9 416 320 416S208 365.9 208 304S258.1 192 320 192zM396.8 160H388.5C367.7 150 344.6 144 320 144S272.4 150 251.5 160H243.2C179.6 160 128 108.4 128 44.8V16C128 -10.5 149.5 -32 176 -32H464C490.5 -32 512 -10.5 512 16V44.8C512 108.4 460.4 160 396.8 160zM173.1 173.4C161.5 184.9 145.6 192 128 192H64C28.7 192 0 163.3 0 128V96C0 78.3 14.3 64 32 64H97.9C104.2 111.4 132.8 151.3 173.1 173.4z" />
-    <glyph glyph-name="utensil-spoon"
-      unicode="&#xF2E5;"
-      horiz-adv-x="512" d=" M480.1 416.1C425.1 471.2 315.2000000000001 450.6 252.3 387.6C203 338.3 197.2 277.6 223.5 227.2L9 34.8C-2.6 24.3 -3.1 6.3 8 -4.7L59.3 -56C70.3 -67 88.4 -66.5 98.8 -54.9L291.2 159.5C341.6 133.2 402.3 139 451.6 188.3C514.6 251.2 535.2 361.1 480.1 416.1z" />
-    <glyph glyph-name="utensils"
-      unicode="&#xF2E7;"
-      horiz-adv-x="416" d=" M207.9 432.8C208.7 428.1 224 338.3 224 304C224 251.7 196.2 214.4 155.1 199.4L168 -38.7C168.7 -52.4 157.8 -64 144 -64H80C66.3 -64 55.3 -52.5 56 -38.7L68.9 199.4C27.7 214.4 0 251.8 0 304C0 338.4 15.3 428.1 16.1 432.8C19.3 453.1 61.4 453.4 64 431.7V290.5C65.3 287.1 79.1 287.3 80 290.5C81.4 315.8 87.9 429.7 88 432.3C91.3 453.1 132.7 453.1 135.9 432.3C136.1 429.6 142.5 315.8 143.9 290.5C144.8 287.3 158.7 287.1 159.9 290.5V431.7C162.5 453.3 204.7 453.1 207.9 432.8zM327.1 147.1L312.1 -38C310.9000000000001 -52 322 -64 336 -64H392C405.3 -64 416 -53.3 416 -40V424C416 437.2 405.3 448 392 448C309.5 448 170.6 269.5 327.1 147.1z" />
-    <glyph glyph-name="vector-square"
-      unicode="&#xF5CB;"
-      horiz-adv-x="512" d=" M512 320V416C512 433.67 497.67 448 480 448H384C366.33 448 352 433.67 352 416H160C160 433.67 145.67 448 128 448H32C14.33 448 0 433.67 0 416V320C0 302.33 14.33 288 32 288V96C14.33 96 0 81.67 0 64V-32C0 -49.67 14.33 -64 32 -64H128C145.67 -64 160 -49.67 160 -32H352C352 -49.67 366.33 -64 384 -64H480C497.67 -64 512 -49.67 512 -32V64C512 81.67 497.67 96 480 96V288C497.67 288 512 302.3300000000001 512 320zM416 384H448V352H416V384zM64 384H96V352H64V384zM96 0H64V32H96V0zM448 0H416V32H448V0zM416 96H384C366.33 96 352 81.67 352 64V32H160V64C160 81.67 145.67 96 128 96H96V288H128C145.67 288 160 302.3300000000001 160 320V352H352V320C352 302.33 366.33 288 384 288H416V96z" />
-    <glyph glyph-name="venus-double"
-      unicode="&#xF226;"
-      horiz-adv-x="512" d=" M288 272C288 351.5 223.5 416 144 416S0 351.5 0 272C0 203.5 47.9 146.1 112 131.6V80H76C69.4 80 64 74.6 64 68V28C64 21.4 69.4 16 76 16H112V-20C112 -26.6 117.4 -32 124 -32H164C170.6 -32 176 -26.6 176 -20V16H212C218.6 16 224 21.4 224 28V68C224 74.6 218.6 80 212 80H176V131.6C240.1 146.1 288 203.5 288 272zM64 272C64 316.1 99.9 352 144 352S224 316.1 224 272S188.1 192 144 192S64 227.9 64 272zM400 131.6V80H436C442.6 80 448 74.6 448 68V28C448 21.4 442.6 16 436 16H400V-20C400 -26.6 394.6 -32 388 -32H348C341.4 -32 336 -26.6 336 -20V16H300C293.4 16 288 21.4 288 28V68C288 74.6 293.4 80 300 80H336V131.6C314.8 136.4 295.4 145.9 278.8 158.9C292.8 175.6 303.8 194.9 310.9000000000001 216C325.4000000000001 201.2 345.6 192 368.0000000000001 192C412.1000000000001 192 448.0000000000001 227.9000000000001 448.0000000000001 272S412.1000000000001 352 368.0000000000001 352C345.7000000000001 352 325.4000000000001 342.8 310.9000000000001 328C303.8 349.1 292.9000000000001 368.4000000000001 278.8 385.1C303.4 404.4 334.3 416 368 416C447.5 416 512 351.5 512 272C512 203.5 464.1 146.1 400 131.6z" />
-    <glyph glyph-name="venus-mars"
-      unicode="&#xF228;"
-      horiz-adv-x="576" d=" M564 448H485C474.3 448 469 435.1 476.5 427.5L493.4 410.6L444.7 361.9C422.5 375.9 396.2 384 368 384C334.3 384 303.4 372.4 278.8 353.1C292.8 336.4 303.8 317.1 310.9000000000001 296C325.4000000000001 310.8 345.6 320 368.0000000000001 320C412.1000000000001 320 448.0000000000001 284.1 448.0000000000001 240S412.1000000000001 160 368.0000000000001 160C345.7000000000001 160 325.4000000000001 169.2 310.9000000000001 184C303.8 162.9 292.9000000000001 143.6 278.8 126.9C303.3 107.5 334.3 96 368 96C447.5 96 512 160.5 512 240C512 268.2 503.9 294.5 489.9 316.7L538.6 365.4L555.5 348.5C557.9 346.1 560.9 345 563.9 345C570.1 345 576 349.8 576 357V436C576 442.6 570.6 448 564 448zM144 384C64.5 384 0 319.5 0 240C0 171.5 47.9 114.1 112 99.6V48H76C69.4 48 64 42.6 64 36V-4C64 -10.6 69.4 -16 76 -16H112V-52C112 -58.6 117.4 -64 124 -64H164C170.6 -64 176 -58.6 176 -52V-16H212C218.6 -16 224 -10.6 224 -4V36C224 42.6 218.6 48 212 48H176V99.6C240.1 114.2000000000001 288 171.5 288 240.0000000000001C288 319.5 223.5 384 144 384zM144 160C99.9 160 64 195.9 64 240S99.9 320 144 320S224 284.1 224 240S188.1 160 144 160z" />
-    <glyph glyph-name="venus"
-      unicode="&#xF221;"
-      horiz-adv-x="288" d=" M288 272C288 351.5 223.5 416 144 416S0 351.5 0 272C0 203.5 47.9 146.1 112 131.6V80H76C69.4 80 64 74.6 64 68V28C64 21.4 69.4 16 76 16H112V-20C112 -26.6 117.4 -32 124 -32H164C170.6 -32 176 -26.6 176 -20V16H212C218.6 16 224 21.4 224 28V68C224 74.6 218.6 80 212 80H176V131.6C240.1 146.1 288 203.5 288 272zM64 272C64 316.1 99.9 352 144 352S224 316.1 224 272S188.1 192 144 192S64 227.9 64 272z" />
-    <glyph glyph-name="vial"
-      unicode="&#xF492;"
-      horiz-adv-x="480" d=" M477.7 261.9L309.5 429.7C306.4 432.8 301.3 432.8 298.2 429.7L264.2 395.8C261.1 392.7 261.1 387.6 264.2 384.5L275.4 373.4L33 131.5C-5.8 92.8 -12.1 29.5 23.6 -12C44.2 -36 73.1 -48 102 -47.9C128.4 -47.9 154.8 -37.9 174.9 -17.8L421.2000000000001 227.9000000000001L432.4000000000001 216.8000000000001C435.5000000000001 213.7000000000001 440.6 213.7000000000001 443.7000000000001 216.8000000000001L477.7 250.7000000000001C480.8000000000001 253.7000000000001 480.8000000000001 258.8000000000001 477.7 261.9000000000001zM318 192H161L309 339.7L387.5 261.4L318 192z" />
-    <glyph glyph-name="vials"
-      unicode="&#xF493;"
-      horiz-adv-x="640" d=" M72 384H96V144C96 99.9 131.9 64 176 64S256 99.9 256 144V384H280C284.4 384 288 387.6 288 392V440C288 444.4 284.4 448 280 448H72C67.6 448 64 444.4 64 440V392C64 387.6 67.6 384 72 384zM144 384H208V288H144V384zM624 0H16C7.2 0 0 -7.2 0 -16V-48C0 -56.8 7.2 -64 16 -64H624C632.8 -64 640 -56.8 640 -48V-16C640 -7.2 632.8 0 624 0zM360 384H384V144C384 99.9 419.9 64 464 64S544 99.9 544 144V384H568C572.4 384 576 387.6 576 392V440C576 444.4 572.4 448 568 448H360C355.6 448 352 444.4 352 440V392C352 387.6 355.6 384 360 384zM432 384H496V288H432V384z" />
-    <glyph glyph-name="video-slash"
-      unicode="&#xF4E2;"
-      horiz-adv-x="640" d=" M633.8 -10.1L578.8 32.4C594.1999999999999 33.8 608 46.1 608 63.5V320.5C608 346 578.9 360.9 557.6 346.3L448 270.7V133.5L416 158.2V336.2C416 362.6 394.6 384 368.2 384H123.9L45.5 444.6C38.5 450 28.5 448.8 23 441.8L3.4 416.6C-2 409.6 -0.8 399.6 6.2 394.2L42.7 366L416 77.4L594.5 -60.6C601.5 -66 611.5 -64.8000000000001 617 -57.8L636.6 -32.5C642.1 -25.6 640.8000000000001 -15.5 633.8000000000001 -10.1zM32 47.8C32 21.4 53.4 0 79.8 0H368.2C379.4 0 389.6 4 397.8 10.5L32 293.3V47.8z" />
-    <glyph glyph-name="video"
-      unicode="&#xF03D;"
-      horiz-adv-x="576" d=" M336.2 384H47.8C21.4 384 0 362.6 0 336.2V47.8C0 21.4 21.4 0 47.8 0H336.2C362.6 0 384 21.4 384 47.8V336.2C384 362.6 362.6 384 336.2 384zM525.6 346.3L416 270.7V113.3L525.6 37.8C546.8000000000001 23.1999999999999 576 38.1 576 63.6V320.5C576 345.9 546.9 360.9 525.6 346.3z" />
-    <glyph glyph-name="volleyball-ball"
-      unicode="&#xF45F;"
-      horiz-adv-x="495.9" d=" M223.3 204.6C222.4 241.6 214.7 277.4 200.6 310.3C109.8 267.9 43.1 187.9 20.3 93.5C33.7 62.7 53.2 35.2 77.2 12.4C99.9 91.6 151.4 160.2 223.3 204.6zM186.4 339C171.4 365.4 151.9 389.1 129 409.7C38 359.9 -15.8 256.8 4 147.5C37.4 230.6 102.4 299.5 186.4 339zM374 173.9C382.6 273.7 346.7 371.4 276.5 438.3C261.8 440 224.9 443.8 177.6 429.8C234.9 370.5 268.6 291.6 271.1 207.1C303.6 189.4 338.4000000000001 178.1 374 173.9zM249.3 164.4C217.7 145.1 190.6 120.5 169.1 91.8C251.1 34.4999999999999 353.6 16.6999999999999 446.6 43.9999999999999C466.3 70.3999999999999 480.8 100.8 488.8 133.9C462.2 127.3 435.1 123.5 407.9 123.5C353.3 123.6 299 137.6 249.3 164.4zM151 64.7C135.8 38.7 125.3 10.3 118.9 -19.5C156.5 -42.5 200.6 -56 248 -56C309 -56 364.7 -33.9 407.9 2.6C295 -13.5 204.6 27.4 151 64.7zM331.3 425.3C386.6 354.9 413.8 264.1 405.9 171.7C436.2 171.5 466.4 176.5 495.6 185.9C495.6 187.9 495.9 189.9 495.9 191.9C495.9 299.7 427.2 391 331.3 425.3z" />
-    <glyph glyph-name="volume-down"
-      unicode="&#xF027;"
-      horiz-adv-x="384" d=" M256 359.983V24.019C256 2.581 230.057 -7.979 215.029 7.048L126.059 96H24C10.745 96 0 106.745 0 120V264C0 277.255 10.745 288 24 288H126.059L215.03 376.954C230.04 391.964 256 381.444 256 359.983zM384 192C384 225.717 366.814 256.35 338.028 273.944C322.949 283.158 303.2530000000001 278.4070000000001 294.036 263.3280000000001S289.572 228.5530000000001 304.651 219.3360000000001C314.263 213.462 320 203.243 320 192A32.056 32.056 0 0 0 306.198 165.668C291.674 155.599 288.062 135.662 298.131 121.138C308.201 106.6130000000001 328.139 103.002 342.661 113.071C368.546 131.017 384 160.522 384 192z" />
-    <glyph glyph-name="volume-off"
-      unicode="&#xF026;"
-      horiz-adv-x="256" d=" M256 359.983V24.019C256 2.581 230.057 -7.979 215.029 7.048L126.059 96H24C10.745 96 0 106.745 0 120V264C0 277.255 10.745 288 24 288H126.059L215.03 376.954C230.04 391.964 256 381.444 256 359.983z" />
-    <glyph glyph-name="volume-up"
-      unicode="&#xF028;"
-      horiz-adv-x="576" d=" M256 359.983V24.019C256 2.581 230.057 -7.979 215.029 7.048L126.059 96H24C10.745 96 0 106.745 0 120V264C0 277.255 10.745 288 24 288H126.059L215.03 376.954C230.04 391.964 256 381.444 256 359.983zM438.0560000000001 437.8590000000001C422.9820000000001 447.08 403.283 442.332 394.061 427.255C384.84 412.178 389.588 392.481 404.665 383.26C468.967 343.937 512 273.017 512 192C512 118.569 475.923 49.708 415.493 7.794C400.971 -2.278 397.364 -22.216 407.436 -36.738C417.512 -51.266 437.452 -54.864 451.967 -44.795C529.633 9.073 576 97.594 576 192C576 295.2440000000001 521.421 386.877 438.0560000000001 437.8590000000001zM480 192C480 260.5470000000001 443.85 321.777 388.043 355.901C372.967 365.121 353.269 360.372 344.049 345.294C334.829 330.216 339.578 310.52 354.656 301.3C393.067 277.812 416 236.952 416 192C416 150.036 395.38 110.681 360.842 86.724C346.321 76.651 342.714 56.714 352.786 42.192C359.002 33.232 368.971 28.427 379.108 28.427A31.861999999999995 31.861999999999995 0 0 1 397.318 34.136C449.091 70.047 480 129.062 480 192zM384 192C384 225.717 366.814 256.35 338.028 273.944C322.949 283.158 303.2530000000001 278.4070000000001 294.036 263.3280000000001S289.572 228.5530000000001 304.651 219.3360000000001C314.263 213.462 320 203.243 320 192A32.056 32.056 0 0 0 306.198 165.668C291.674 155.599 288.062 135.662 298.131 121.138C308.201 106.6130000000001 328.139 103.002 342.661 113.071C368.546 131.017 384 160.522 384 192z" />
-    <glyph glyph-name="walking"
-      unicode="&#xF554;"
-      horiz-adv-x="320" d=" M208 352C234.5 352 256 373.5 256 400S234.5 448 208 448S160 426.5 160 400S181.5 352 208 352zM302.5 202.9L279.2 214.7L269.5 244.1C254.8 288.7000000000001 213.8 319.9000000000001 167.3 320C131.3 320.1 111.4 309.9000000000001 74 294.8000000000001C52.4 286.1 34.7 269.6 24.3 248.6L17.6 235C9.8 219.2 16.1 200 31.8 192.1C47.4 184.2 66.4 190.6 74.3 206.4L81 220C84.5 227 90.3 232.5 97.5 235.4L124.3 246.2L109.1 185.5C103.9 164.7 109.5 142.6 124 126.7L183.9 61.3C191.1 53.4 196.2 43.9 198.8 33.6L217.1 -39.7C221.4 -56.8000000000001 238.8 -67.3000000000001 255.9000000000001 -63.0000000000001C273.0000000000001 -58.7 283.5000000000001 -41.3000000000001 279.2000000000001 -24.2L257.0000000000001 64.8C254.4000000000001 75.1 249.3000000000001 84.6999999999999 242.1000000000001 92.4999999999999L196.6000000000001 142.1999999999999L213.8000000000001 210.8999999999999L219.3000000000001 194.3999999999999C224.6000000000001 178.2999999999999 236.0000000000001 165 251.0000000000001 157.3999999999999L274.3 145.5999999999999C289.9000000000001 137.6999999999999 308.9000000000001 144.0999999999999 316.8 159.8999999999999C324.5 175.5999999999999 318.2 194.9999999999999 302.5 202.8999999999999zM73.6 62.2C70.4 54.1 65.6 46.8 59.4 40.7L9.4 -9.4C-3.1 -21.9 -3.1 -42.2 9.4 -54.7S42.1 -67.2 54.6 -54.7L114 4.6999999999999C120.1 10.8 124.9 18.0999999999999 128.2 26.1999999999999L141.7 59.9999999999999C86.4 120.3 103 101.8 94.3 113.6999999999999L73.6 62.1999999999999z" />
-    <glyph glyph-name="wallet"
-      unicode="&#xF555;"
-      horiz-adv-x="512" d=" M461.2 320H80C71.16 320 64 327.16 64 336S71.16 352 80 352H464C472.84 352 480 359.16 480 368C480 394.51 458.51 416 432 416H64C28.65 416 0 387.35 0 352V32C0 -3.35 28.65 -32 64 -32H461.2C489.22 -32 512 -10.47 512 16V272C512 298.4700000000001 489.22 320 461.2 320zM416 112C398.33 112 384 126.33 384 144S398.33 176 416 176S448 161.67 448 144S433.67 112 416 112z" />
-    <glyph glyph-name="warehouse"
-      unicode="&#xF494;"
-      horiz-adv-x="640" d=" M504 96H136.4C132 96 128.4 92.4 128.4 88L128.3 40C128.3 35.6 131.9 32 136.3 32H504C508.4 32 512 35.6 512 40V88C512 92.4 508.4 96 504 96zM504 0H136.1C131.7 0 128.1 -3.6 128.1 -8L128 -56C128 -60.4 131.6 -64 136 -64H504C508.4 -64 512 -60.4 512 -56V-8C512 -3.6 508.4 0 504 0zM504 192H136.6C132.2 192 128.6 188.4 128.6 184L128.5 136C128.5 131.6 132.1 128 136.5 128H504C508.4 128 512 131.6 512 136V184C512 188.4 508.4 192 504 192zM610.5 331L338.4 444.3A48.15 48.15 0 0 1 301.5 444.3L29.5 331C11.7 323.5 0 306.1 0 286.7V-56C0 -60.4 3.6 -64 8 -64H88C92.4 -64 96 -60.4 96 -56V192C96 209.6 110.6 224 128.6 224H511.4C529.4 224 544 209.6 544 192V-56C544 -60.4 547.6 -64 552 -64H632C636.4 -64 640 -60.4 640 -56V286.7C640 306.1 628.3 323.5 610.5 331z" />
-    <glyph glyph-name="weight-hanging"
-      unicode="&#xF5CD;"
-      horiz-adv-x="512" d=" M510.28 2.14L437.25 294.27C433.45 309.46 420.81 319.99 406.38 319.99H346.13C349.7 330.04 352.01 340.71 352.01 351.99C352.01 405.01 309.03 447.99 256.01 447.99S160.01 405.01 160.01 351.99C160.01 340.71 162.31 330.04 165.89 319.99H105.64C91.21 319.99 78.56 309.45 74.77 294.27L1.72 2.14C-6.61 -31.17 16.38 -64 48.03 -64H463.98C495.62 -64 518.61 -31.17 510.28 2.14zM256 320C238.36 320 224 334.36 224 352S238.36 384 256 384S288 369.64 288 352S273.64 320 256 320z" />
-    <glyph glyph-name="weight"
-      unicode="&#xF496;"
-      horiz-adv-x="512" d=" M448 384H422.02C438.44 355.7200000000001 448 322.99 448 288C448 182.13 361.87 96 256 96S64 182.13 64 288C64 322.99 73.56 355.7200000000001 89.98 384H64C28.71 384 0 355.29 0 320V0C0 -35.29 28.71 -64 64 -64H448C483.29 -64 512 -35.29 512 0V320C512 355.29 483.29 384 448 384zM256 128C344.37 128 416 199.63 416 288S344.37 448 256 448S96 376.37 96 288S167.63 128 256 128zM255.7 279.94L289.28 358.3C292.78 366.4700000000001 302.22 370.2200000000001 310.31 366.71C318.43 363.23 322.19 353.82 318.72 345.71L285.05 267.16C291.73 260 296 250.55 296 240C296 217.91 278.09 200 256 200S216 217.91 216 240C216 261.98 233.76 279.77 255.7 279.94z" />
-    <glyph glyph-name="wheelchair"
-      unicode="&#xF193;"
-      horiz-adv-x="512" d=" M496.101 62.331L510.328 33.668C514.257 25.753 511.025 16.152 503.11 12.223L437.645 -20.663C421.596 -28.63 402.089 -21.857 394.456 -5.608L331.679 128H192C176.075 128 162.574 139.71 160.321 155.475C126.433 392.692 128.38 377.956 128 384C128 420.358 158.318 449.635 195.052 447.929C228.3230000000001 446.384 255.1 419.024 255.9770000000001 385.728C256.8450000000001 352.795 232.8250000000001 325.305 201.369 320.689L206.039 287.999H336C344.837 287.999 352 280.836 352 271.999V239.999C352 231.162 344.837 223.999 336 223.999H215.182L219.754 191.999H352A32 32 0 0 0 380.962 173.607L438.477 51.2L474.655 69.549C482.57 73.478 492.172 70.246 496.101 62.331zM311.358 96H286.852C279.064 41.796 232.324 0 176 0C114.243 0 64 50.243 64 112C64 153.505 86.694 189.809 120.324 209.156C116.612 235.121 113.48 257.016 110.836 275.4890000000001C45.956 249.536 0 186.037 0 112C0 14.953 78.953 -64 176 -64C247.87 -64 309.8060000000001 -20.692 337.11 41.192L311.358 96z" />
-    <glyph glyph-name="wifi"
-      unicode="&#xF1EB;"
-      horiz-adv-x="640" d=" M384 32C384 -3.346 355.346 -32 320 -32S256 -3.346 256 32C256 67.346 284.654 96 320 96S384 67.346 384 32zM520.659 156.443C527.124 162.908 526.904 173.508 520.095 179.61C406.302 281.5950000000001 233.569 281.4790000000001 119.905 179.61C113.096 173.5080000000001 112.876 162.908 119.341 156.443L153.347 122.437C159.274 116.51 168.811 116.117 175.1160000000001 121.641C257.9960000000001 194.25 382.1900000000001 194.088 464.884 121.641C471.189 116.117 480.726 116.509 486.653 122.437L520.659 156.443zM632.769 270.161C639.154 276.546 639.023 286.977 632.419 293.134C456.651 456.994 183.285 456.934 7.582 293.134C0.978 286.977 0.847 276.545 7.232 270.161L41.198 236.195C47.293 230.1 57.089 229.964 63.422 235.812C208.185 369.48 431.778 369.514 576.578 235.812C582.911 229.964 592.707 230.1 598.802 236.195L632.769 270.161z" />
-    <glyph glyph-name="window-close"
-      unicode="&#xF410;"
-      horiz-adv-x="512" d=" M464 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H464C490.5 -32 512 -10.5 512 16V368C512 394.5 490.5 416 464 416zM380.4 125.5C385.2 120.7 385.2 112.9 380.4 108.1L339.9 67.6C335.1 62.8 327.3 62.8 322.5 67.6L256 134.7L189.5 67.6C184.7 62.8 176.9 62.8 172.1 67.6L131.6 108.1C126.8 112.9 126.8 120.7000000000001 131.6 125.5L198.7 192L131.6 258.5C126.8 263.3 126.8 271.1 131.6 275.9L172.1 316.4C176.9 321.2 184.7 321.2 189.5 316.4L256 249.3L322.5 316.4C327.3 321.2 335.1 321.2 339.9 316.4L380.4 275.9C385.2 271.1 385.2 263.3 380.4 258.5L313.3 192L380.4 125.5z" />
-    <glyph glyph-name="window-maximize"
-      unicode="&#xF2D0;"
-      horiz-adv-x="512" d=" M464 416H48C21.5 416 0 394.5 0 368V16C0 -10.5 21.5 -32 48 -32H464C490.5 -32 512 -10.5 512 16V368C512 394.5 490.5 416 464 416zM448 256H64V340C64 346.6 69.4 352 76 352H436C442.6 352 448 346.6 448 340V256z" />
-    <glyph glyph-name="window-minimize"
-      unicode="&#xF2D1;"
-      horiz-adv-x="512" d=" M464 96H48C21.5 96 0 74.5 0 48V16C0 -10.5 21.5 -32 48 -32H464C490.5 -32 512 -10.5 512 16V48C512 74.5 490.5 96 464 96z" />
-    <glyph glyph-name="window-restore"
-      unicode="&#xF2D2;"
-      horiz-adv-x="512" d=" M512 400V112C512 85.5 490.5 64 464 64H416V272C416 316.1 380.1 352 336 352H128V400C128 426.5 149.5 448 176 448H464C490.5 448 512 426.5 512 400zM384 272V-16C384 -42.5 362.5 -64 336 -64H48C21.5 -64 0 -42.5 0 -16V272C0 298.5 21.5 320 48 320H336C362.5 320 384 298.5 384 272zM316 244C316 250.6 310.6 256 304 256H76C69.4 256 64 250.6 64 244V192H316V244z" />
-    <glyph glyph-name="wine-glass-alt"
-      unicode="&#xF5CE;"
-      horiz-adv-x="288" d=" M216 -16H176V101.19C244.47 117.08 294.05 181.1 287.4 255.35L271.45 433.45C270.71 441.69 263.9 448 255.74 448H32.26C24.11 448 17.29 441.69 16.56 433.45L0.6 255.34C-6.05 181.09 43.53 117.07 112 101.18V-16H72C49.91 -16 32 -33.91 32 -56C32 -60.42 35.58 -64 40 -64H248C252.42 -64 256 -60.42 256 -56C256 -33.91 238.09 -16 216 -16zM61.75 400H226.25L233.42 320H54.58L61.75 400z" />
-    <glyph glyph-name="wine-glass"
-      unicode="&#xF4E3;"
-      horiz-adv-x="288" d=" M216 -16H176V101.19C244.47 117.08 294.05 181.1 287.4 255.35L271.45 433.45C270.71 441.69 263.9 448 255.74 448H32.26C24.11 448 17.29 441.69 16.56 433.45L0.6 255.34C-6.05 181.09 43.53 117.07 112 101.18V-16H72C49.91 -16 32 -33.91 32 -56C32 -60.42 35.58 -64 40 -64H248C252.42 -64 256 -60.42 256 -56C256 -33.91 238.09 -16 216 -16z" />
-    <glyph glyph-name="won-sign"
-      unicode="&#xF159;"
-      horiz-adv-x="576" d=" M564 256C570.627 256 576 261.373 576 268V308C576 314.627 570.627 320 564 320H515.972L534.544 400.61C536.276 408.128 530.566 415.304 522.851 415.304H476.744A11.998 11.998 0 0 1 465.008 405.804L450.73 320H340.839L321.114 405.987A12 12 0 0 1 309.418 415.304H265.43A12 12 0 0 1 253.743 406.027L233.696 320H124.975L107.5 405.701A12 12 0 0 1 95.742 415.303H53.628C45.942 415.303 40.238 408.179 41.919 400.679L60 320H12C5.373 320 0 314.627 0 308V268C0 261.373 5.373 256 12 256H74.342L81.513 224H12C5.373 224 0 218.627 0 212V172C0 165.373 5.373 160 12 160H95.856L136.783 -22.624A12 12 0 0 1 148.492 -32H205.259C210.842 -32 215.687 -28.15 216.948 -22.712L259.335 160H314.421L356.807 -22.712A12 12 0 0 1 368.496 -32H425.322A12 12 0 0 1 437.016 -22.694L479.108 160H564C570.627 160 576 165.373 576 172V212C576 218.627 570.627 224 564 224H493.854L501.227 256H564zM138.024 256H218.781L211.324 224H144.548L138.024 256zM183.82 105.971C177.626 80.14 177.062 58.721 176.499 58.721H175.373S173.684 80.771 168.615 105.971L157.599 160H196.411L183.82 105.971zM274.182 224L276.178 232.602C278.034 240.564 279.635 248.57 280.981 256H292.775C294.122 248.57 295.722 240.564 297.578 232.602L299.574 224H274.182zM405.141 105.971C400.0730000000001 80.771 398.3830000000001 58.721 398.3830000000001 58.721H397.2570000000001C396.6940000000001 58.721 396.1310000000001 80.141 389.9360000000001 105.971L377.542 160H416.649L405.141 105.971zM430.281 224H362.861L355.521 256H437.098L430.281 224z" />
-    <glyph glyph-name="wrench"
-      unicode="&#xF0AD;"
-      horiz-adv-x="512" d=" M507.73 338.9C505.49 347.93 494.19 350.99 487.61 344.4100000000001L413.25 270.05L345.37 281.36L334.06 349.24L408.42 423.6C415.04 430.2200000000001 411.85 441.5 402.76 443.76C355.38 455.5 303.21 442.85 266.18 405.8300000000001C226.54 366.19 215.63 308.73 232.13 258.63L18.74 45.24C-6.25 20.25 -6.25 -20.27 18.74 -45.26C43.73 -70.25 84.25 -70.25 109.24 -45.26L322.45 167.9500000000001C372.57 151.2400000000001 429.92 162.2700000000001 469.82 202.1700000000001C506.89 239.2400000000001 519.52 291.49 507.73 338.9000000000001zM64 -24C50.75 -24 40 -13.25 40 0C40 13.26 50.75 24 64 24S88 13.26 88 0C88 -13.25 77.25 -24 64 -24z" />
-    <glyph glyph-name="x-ray"
-      unicode="&#xF497;"
-      horiz-adv-x="640" d=" M240 64C231.2 64 224 56.8 224 48S231.2 32 240 32S256 39.2 256 48S248.8 64 240 64zM400 32C408.8 32 416 39.2 416 48S408.8 64 400 64S384 56.8 384 48S391.2 32 400 32zM624 448H16C7.2 448 0 440.8 0 432V400C0 391.2 7.2 384 16 384H624C632.8 384 640 391.2 640 400V432C640 440.8 632.8 448 624 448zM624 0H576V352H64V0H16C7.2 0 0 -7.2 0 -16V-48C0 -56.8 7.2 -64 16 -64H624C632.8 -64 640 -56.8 640 -48V-16C640 -7.2 632.8 0 624 0zM480 200C480 195.6 476.4 192 472 192H336V160H440C444.4 160 448 156.4 448 152V136C448 131.6 444.4 128 440 128H336V96H400C426.5 96 448 74.5 448 48S426.5 0 400 0S352 21.5 352 48V64H288V48C288 21.5 266.5 0 240 0S192 21.5 192 48S213.5 96 240 96H304V128H200C195.6 128 192 131.6 192 136V152C192 156.4 195.6 160 200 160H304V192H168C163.6 192 160 195.6 160 200V216C160 220.4 163.6 224 168 224H304V256H200C195.6 256 192 259.6 192 264V280C192 284.4 195.6 288 200 288H304V312C304 316.4 307.6 320 312 320H328C332.4 320 336 316.4 336 312V288H440C444.4 288 448 284.4 448 280V264C448 259.6 444.4 256 440 256H336V224H472C476.4 224 480 220.4 480 216V200z" />
-    <glyph glyph-name="yen-sign"
-      unicode="&#xF157;"
-      horiz-adv-x="384" d=" M351.2080000000001 416H285.9310000000001A12 12 0 0 1 275.153 409.276L219.763 296.113C205.25 261.409 192.63 224.181 192.63 224.181H191.368S178.748 261.409 164.235 296.113L108.845 409.276A11.997 11.997 0 0 1 98.068 416H32.792C23.735 416 17.942 406.35 22.202 398.357L102.322 248H44C37.373 248 32 242.627 32 236V204C32 197.373 37.373 192 44 192H132.162L152 154.772V128H44C37.373 128 32 122.627 32 116V84C32 77.373 37.373 72 44 72H152V-20C152 -26.627 157.373 -32 164 -32H220C226.627 -32 232 -26.627 232 -20V72H340C346.627 72 352 77.373 352 84V116C352 122.627 346.627 128 340 128H232V154.772L251.838 192H340C346.627 192 352 197.373 352 204V236C352 242.627 346.627 248 340 248H281.678L361.798 398.357C366.058 406.35 360.266 416 351.2080000000001 416z" />
-  </font>
-</defs>
-</svg>
diff --git a/data/interfaces/default/fonts/font-awesome/fa-solid-900.ttf b/data/interfaces/default/fonts/font-awesome/fa-solid-900.ttf
deleted file mode 100644
index 618136ab..00000000
Binary files a/data/interfaces/default/fonts/font-awesome/fa-solid-900.ttf and /dev/null differ
diff --git a/data/interfaces/default/fonts/font-awesome/fa-solid-900.woff b/data/interfaces/default/fonts/font-awesome/fa-solid-900.woff
deleted file mode 100644
index af476578..00000000
Binary files a/data/interfaces/default/fonts/font-awesome/fa-solid-900.woff and /dev/null differ
diff --git a/data/interfaces/default/fonts/font-awesome/fa-solid-900.woff2 b/data/interfaces/default/fonts/font-awesome/fa-solid-900.woff2
deleted file mode 100644
index 9ef566a9..00000000
Binary files a/data/interfaces/default/fonts/font-awesome/fa-solid-900.woff2 and /dev/null differ
diff --git a/data/interfaces/default/fonts/fontawesome-webfont.eot b/data/interfaces/default/fonts/fontawesome-webfont.eot
new file mode 100644
index 00000000..a30335d7
Binary files /dev/null and b/data/interfaces/default/fonts/fontawesome-webfont.eot differ
diff --git a/data/interfaces/default/fonts/fontawesome-webfont.svg b/data/interfaces/default/fonts/fontawesome-webfont.svg
new file mode 100644
index 00000000..6fd19abc
--- /dev/null
+++ b/data/interfaces/default/fonts/fontawesome-webfont.svg
@@ -0,0 +1,640 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
+<metadata></metadata>
+<defs>
+<font id="fontawesomeregular" horiz-adv-x="1536" >
+<font-face units-per-em="1792" ascent="1536" descent="-256" />
+<missing-glyph horiz-adv-x="448" />
+<glyph unicode=" "  horiz-adv-x="448" />
+<glyph unicode="&#x09;" horiz-adv-x="448" />
+<glyph unicode="&#xa0;" horiz-adv-x="448" />
+<glyph unicode="&#xa8;" horiz-adv-x="1792" />
+<glyph unicode="&#xa9;" horiz-adv-x="1792" />
+<glyph unicode="&#xae;" horiz-adv-x="1792" />
+<glyph unicode="&#xb4;" horiz-adv-x="1792" />
+<glyph unicode="&#xc6;" horiz-adv-x="1792" />
+<glyph unicode="&#xd8;" horiz-adv-x="1792" />
+<glyph unicode="&#x2000;" horiz-adv-x="768" />
+<glyph unicode="&#x2001;" horiz-adv-x="1537" />
+<glyph unicode="&#x2002;" horiz-adv-x="768" />
+<glyph unicode="&#x2003;" horiz-adv-x="1537" />
+<glyph unicode="&#x2004;" horiz-adv-x="512" />
+<glyph unicode="&#x2005;" horiz-adv-x="384" />
+<glyph unicode="&#x2006;" horiz-adv-x="256" />
+<glyph unicode="&#x2007;" horiz-adv-x="256" />
+<glyph unicode="&#x2008;" horiz-adv-x="192" />
+<glyph unicode="&#x2009;" horiz-adv-x="307" />
+<glyph unicode="&#x200a;" horiz-adv-x="85" />
+<glyph unicode="&#x202f;" horiz-adv-x="307" />
+<glyph unicode="&#x205f;" horiz-adv-x="384" />
+<glyph unicode="&#x2122;" horiz-adv-x="1792" />
+<glyph unicode="&#x221e;" horiz-adv-x="1792" />
+<glyph unicode="&#x2260;" horiz-adv-x="1792" />
+<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
+<glyph unicode="&#xf000;" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
+<glyph unicode="&#xf001;" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
+<glyph unicode="&#xf002;" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
+<glyph unicode="&#xf003;" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+<glyph unicode="&#xf004;" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" />
+<glyph unicode="&#xf005;" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" />
+<glyph unicode="&#xf006;" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
+<glyph unicode="&#xf007;" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
+<glyph unicode="&#xf008;" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45 t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128 q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19 t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+<glyph unicode="&#xf009;" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
+<glyph unicode="&#xf00a;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
+<glyph unicode="&#xf00b;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
+<glyph unicode="&#xf00c;" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
+<glyph unicode="&#xf00d;" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
+<glyph unicode="&#xf00e;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5 t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
+<glyph unicode="&#xf010;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z " />
+<glyph unicode="&#xf011;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
+<glyph unicode="&#xf012;" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf013;" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
+<glyph unicode="&#xf014;" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf015;" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
+<glyph unicode="&#xf016;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z " />
+<glyph unicode="&#xf017;" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf018;" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
+<glyph unicode="&#xf019;" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
+<glyph unicode="&#xf01a;" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf01b;" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf01c;" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" />
+<glyph unicode="&#xf01d;" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf01e;" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
+<glyph unicode="&#xf021;" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5 q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
+<glyph unicode="&#xf022;" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47 t47 -113z" />
+<glyph unicode="&#xf023;" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
+<glyph unicode="&#xf024;" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf025;" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5 t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
+<glyph unicode="&#xf026;" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
+<glyph unicode="&#xf027;" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
+<glyph unicode="&#xf028;" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5 t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289 t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
+<glyph unicode="&#xf029;" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
+<glyph unicode="&#xf02a;" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
+<glyph unicode="&#xf02b;" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" />
+<glyph unicode="&#xf02c;" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
+<glyph unicode="&#xf02d;" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906 q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5 t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
+<glyph unicode="&#xf02e;" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
+<glyph unicode="&#xf02f;" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
+<glyph unicode="&#xf030;" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+<glyph unicode="&#xf031;" horiz-adv-x="1664" d="M725 977l-170 -450q33 0 136.5 -2t160.5 -2q19 0 57 2q-87 253 -184 452zM0 -128l2 79q23 7 56 12.5t57 10.5t49.5 14.5t44.5 29t31 50.5l237 616l280 724h75h53q8 -14 11 -21l205 -480q33 -78 106 -257.5t114 -274.5q15 -34 58 -144.5t72 -168.5q20 -45 35 -57 q19 -15 88 -29.5t84 -20.5q6 -38 6 -57q0 -4 -0.5 -13t-0.5 -13q-63 0 -190 8t-191 8q-76 0 -215 -7t-178 -8q0 43 4 78l131 28q1 0 12.5 2.5t15.5 3.5t14.5 4.5t15 6.5t11 8t9 11t2.5 14q0 16 -31 96.5t-72 177.5t-42 100l-450 2q-26 -58 -76.5 -195.5t-50.5 -162.5 q0 -22 14 -37.5t43.5 -24.5t48.5 -13.5t57 -8.5t41 -4q1 -19 1 -58q0 -9 -2 -27q-58 0 -174.5 10t-174.5 10q-8 0 -26.5 -4t-21.5 -4q-80 -14 -188 -14z" />
+<glyph unicode="&#xf032;" horiz-adv-x="1408" d="M555 15q74 -32 140 -32q376 0 376 335q0 114 -41 180q-27 44 -61.5 74t-67.5 46.5t-80.5 25t-84 10.5t-94.5 2q-73 0 -101 -10q0 -53 -0.5 -159t-0.5 -158q0 -8 -1 -67.5t-0.5 -96.5t4.5 -83.5t12 -66.5zM541 761q42 -7 109 -7q82 0 143 13t110 44.5t74.5 89.5t25.5 142 q0 70 -29 122.5t-79 82t-108 43.5t-124 14q-50 0 -130 -13q0 -50 4 -151t4 -152q0 -27 -0.5 -80t-0.5 -79q0 -46 1 -69zM0 -128l2 94q15 4 85 16t106 27q7 12 12.5 27t8.5 33.5t5.5 32.5t3 37.5t0.5 34v35.5v30q0 982 -22 1025q-4 8 -22 14.5t-44.5 11t-49.5 7t-48.5 4.5 t-30.5 3l-4 83q98 2 340 11.5t373 9.5q23 0 68.5 -0.5t67.5 -0.5q70 0 136.5 -13t128.5 -42t108 -71t74 -104.5t28 -137.5q0 -52 -16.5 -95.5t-39 -72t-64.5 -57.5t-73 -45t-84 -40q154 -35 256.5 -134t102.5 -248q0 -100 -35 -179.5t-93.5 -130.5t-138 -85.5t-163.5 -48.5 t-176 -14q-44 0 -132 3t-132 3q-106 0 -307 -11t-231 -12z" />
+<glyph unicode="&#xf033;" horiz-adv-x="1024" d="M0 -126l17 85q6 2 81.5 21.5t111.5 37.5q28 35 41 101q1 7 62 289t114 543.5t52 296.5v25q-24 13 -54.5 18.5t-69.5 8t-58 5.5l19 103q33 -2 120 -6.5t149.5 -7t120.5 -2.5q48 0 98.5 2.5t121 7t98.5 6.5q-5 -39 -19 -89q-30 -10 -101.5 -28.5t-108.5 -33.5 q-8 -19 -14 -42.5t-9 -40t-7.5 -45.5t-6.5 -42q-27 -148 -87.5 -419.5t-77.5 -355.5q-2 -9 -13 -58t-20 -90t-16 -83.5t-6 -57.5l1 -18q17 -4 185 -31q-3 -44 -16 -99q-11 0 -32.5 -1.5t-32.5 -1.5q-29 0 -87 10t-86 10q-138 2 -206 2q-51 0 -143 -9t-121 -11z" />
+<glyph unicode="&#xf034;" horiz-adv-x="1792" d="M1744 128q33 0 42 -18.5t-11 -44.5l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80zM81 1407l54 -27q12 -5 211 -5q44 0 132 2 t132 2q36 0 107.5 -0.5t107.5 -0.5h293q6 0 21 -0.5t20.5 0t16 3t17.5 9t15 17.5l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 48t-14.5 73.5t-7.5 35.5q-6 8 -12 12.5t-15.5 6t-13 2.5t-18 0.5t-16.5 -0.5 q-17 0 -66.5 0.5t-74.5 0.5t-64 -2t-71 -6q-9 -81 -8 -136q0 -94 2 -388t2 -455q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27 q19 42 19 383q0 101 -3 303t-3 303v117q0 2 0.5 15.5t0.5 25t-1 25.5t-3 24t-5 14q-11 12 -162 12q-33 0 -93 -12t-80 -26q-19 -13 -34 -72.5t-31.5 -111t-42.5 -53.5q-42 26 -56 44v383z" />
+<glyph unicode="&#xf035;" d="M81 1407l54 -27q12 -5 211 -5q44 0 132 2t132 2q70 0 246.5 1t304.5 0.5t247 -4.5q33 -1 56 31l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 47.5t-15 73.5t-7 36q-10 13 -27 19q-5 2 -66 2q-30 0 -93 1t-103 1 t-94 -2t-96 -7q-9 -81 -8 -136l1 -152v52q0 -55 1 -154t1.5 -180t0.5 -153q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27 q7 16 11.5 74t6 145.5t1.5 155t-0.5 153.5t-0.5 89q0 7 -2.5 21.5t-2.5 22.5q0 7 0.5 44t1 73t0 76.5t-3 67.5t-6.5 32q-11 12 -162 12q-41 0 -163 -13.5t-138 -24.5q-19 -12 -34 -71.5t-31.5 -111.5t-42.5 -54q-42 26 -56 44v383zM1310 125q12 0 42 -19.5t57.5 -41.5 t59.5 -49t36 -30q26 -21 26 -49t-26 -49q-4 -3 -36 -30t-59.5 -49t-57.5 -41.5t-42 -19.5q-13 0 -20.5 10.5t-10 28.5t-2.5 33.5t1.5 33t1.5 19.5h-1024q0 -2 1.5 -19.5t1.5 -33t-2.5 -33.5t-10 -28.5t-20.5 -10.5q-12 0 -42 19.5t-57.5 41.5t-59.5 49t-36 30q-26 21 -26 49 t26 49q4 3 36 30t59.5 49t57.5 41.5t42 19.5q13 0 20.5 -10.5t10 -28.5t2.5 -33.5t-1.5 -33t-1.5 -19.5h1024q0 2 -1.5 19.5t-1.5 33t2.5 33.5t10 28.5t20.5 10.5z" />
+<glyph unicode="&#xf036;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf037;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf038;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf039;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf03a;" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192 q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
+<glyph unicode="&#xf03b;" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
+<glyph unicode="&#xf03c;" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
+<glyph unicode="&#xf03d;" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" />
+<glyph unicode="&#xf03e;" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+<glyph unicode="&#xf040;" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" />
+<glyph unicode="&#xf041;" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
+<glyph unicode="&#xf042;" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf043;" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
+<glyph unicode="&#xf044;" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92 l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
+<glyph unicode="&#xf045;" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5 t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
+<glyph unicode="&#xf046;" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110 q24 -24 24 -57t-24 -57z" />
+<glyph unicode="&#xf047;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
+<glyph unicode="&#xf048;" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" />
+<glyph unicode="&#xf049;" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" />
+<glyph unicode="&#xf04a;" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" />
+<glyph unicode="&#xf04b;" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
+<glyph unicode="&#xf04c;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf04d;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf04e;" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
+<glyph unicode="&#xf050;" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
+<glyph unicode="&#xf051;" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" />
+<glyph unicode="&#xf052;" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
+<glyph unicode="&#xf053;" horiz-adv-x="1280" d="M1171 1235l-531 -531l531 -531q19 -19 19 -45t-19 -45l-166 -166q-19 -19 -45 -19t-45 19l-742 742q-19 19 -19 45t19 45l742 742q19 19 45 19t45 -19l166 -166q19 -19 19 -45t-19 -45z" />
+<glyph unicode="&#xf054;" horiz-adv-x="1280" d="M1107 659l-742 -742q-19 -19 -45 -19t-45 19l-166 166q-19 19 -19 45t19 45l531 531l-531 531q-19 19 -19 45t19 45l166 166q19 19 45 19t45 -19l742 -742q19 -19 19 -45t-19 -45z" />
+<glyph unicode="&#xf055;" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf056;" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
+<glyph unicode="&#xf057;" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf058;" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf059;" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf05a;" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf05b;" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143 q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf05c;" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5 t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf05d;" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf05e;" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
+<glyph unicode="&#xf060;" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" />
+<glyph unicode="&#xf061;" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
+<glyph unicode="&#xf062;" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" />
+<glyph unicode="&#xf063;" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
+<glyph unicode="&#xf064;" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
+<glyph unicode="&#xf065;" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf066;" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
+<glyph unicode="&#xf067;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
+<glyph unicode="&#xf068;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
+<glyph unicode="&#xf069;" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
+<glyph unicode="&#xf06a;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
+<glyph unicode="&#xf06b;" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5 t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf06c;" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5 t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
+<glyph unicode="&#xf06d;" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
+<glyph unicode="&#xf06e;" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
+<glyph unicode="&#xf070;" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z " />
+<glyph unicode="&#xf071;" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
+<glyph unicode="&#xf072;" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
+<glyph unicode="&#xf073;" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47 h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+<glyph unicode="&#xf074;" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
+<glyph unicode="&#xf075;" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
+<glyph unicode="&#xf076;" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf077;" horiz-adv-x="1792" d="M1683 205l-166 -165q-19 -19 -45 -19t-45 19l-531 531l-531 -531q-19 -19 -45 -19t-45 19l-166 165q-19 19 -19 45.5t19 45.5l742 741q19 19 45 19t45 -19l742 -741q19 -19 19 -45.5t-19 -45.5z" />
+<glyph unicode="&#xf078;" horiz-adv-x="1792" d="M1683 728l-742 -741q-19 -19 -45 -19t-45 19l-742 741q-19 19 -19 45.5t19 45.5l166 165q19 19 45 19t45 -19l531 -531l531 531q19 19 45 19t45 -19l166 -165q19 -19 19 -45.5t-19 -45.5z" />
+<glyph unicode="&#xf079;" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z " />
+<glyph unicode="&#xf07a;" horiz-adv-x="1664" d="M640 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1536 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1664 1088v-512q0 -24 -16.5 -42.5t-40.5 -21.5l-1044 -122q13 -60 13 -70q0 -16 -24 -64h920q26 0 45 -19t19 -45 t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 11 8 31.5t16 36t21.5 40t15.5 29.5l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t19.5 -15.5t13 -24.5t8 -26t5.5 -29.5t4.5 -26h1201q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf07b;" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
+<glyph unicode="&#xf07c;" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
+<glyph unicode="&#xf07d;" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
+<glyph unicode="&#xf07e;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
+<glyph unicode="&#xf080;" horiz-adv-x="2048" d="M640 640v-512h-256v512h256zM1024 1152v-1024h-256v1024h256zM2048 0v-128h-2048v1536h128v-1408h1920zM1408 896v-768h-256v768h256zM1792 1280v-1152h-256v1152h256z" />
+<glyph unicode="&#xf081;" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5 t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf082;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-188v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-532q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960z" />
+<glyph unicode="&#xf083;" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280 q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
+<glyph unicode="&#xf084;" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5 t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
+<glyph unicode="&#xf085;" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -9 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70 q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
+<glyph unicode="&#xf086;" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7 q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
+<glyph unicode="&#xf087;" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769 q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128 q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
+<glyph unicode="&#xf088;" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5 h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -74 49 -163z" />
+<glyph unicode="&#xf089;" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
+<glyph unicode="&#xf08a;" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5 q224 0 351 -124t127 -344z" />
+<glyph unicode="&#xf08b;" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
+<glyph unicode="&#xf08c;" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf08d;" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
+<glyph unicode="&#xf08e;" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf090;" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf091;" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
+<glyph unicode="&#xf092;" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -103t0.5 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf093;" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
+<glyph unicode="&#xf094;" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" />
+<glyph unicode="&#xf095;" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
+<glyph unicode="&#xf096;" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf097;" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
+<glyph unicode="&#xf098;" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf099;" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
+<glyph unicode="&#xf09a;" horiz-adv-x="1024" d="M959 1524v-264h-157q-86 0 -116 -36t-30 -108v-189h293l-39 -296h-254v-759h-306v759h-255v296h255v218q0 186 104 288.5t277 102.5q147 0 228 -12z" />
+<glyph unicode="&#xf09b;" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf09c;" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
+<glyph unicode="&#xf09d;" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
+<glyph unicode="&#xf09e;" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" />
+<glyph unicode="&#xf0a0;" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
+<glyph unicode="&#xf0a1;" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
+<glyph unicode="&#xf0a2;" horiz-adv-x="1792" d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM246 128h1300q-266 300 -266 832q0 51 -24 105t-69 103t-121.5 80.5t-169.5 31.5t-169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -532 -266 -832z M1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5 t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
+<glyph unicode="&#xf0a3;" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70 l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
+<glyph unicode="&#xf0a4;" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5 t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
+<glyph unicode="&#xf0a5;" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45 t45 -19t45 19t19 45zM1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128 q0 122 81.5 189t206.5 67q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
+<glyph unicode="&#xf0a6;" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5 t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76 q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
+<glyph unicode="&#xf0a7;" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580 q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100 q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
+<glyph unicode="&#xf0a8;" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf0a9;" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf0aa;" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf0ab;" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf0ac;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5 q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5 q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5 t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-5 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3 q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25 q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5 t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5 t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10t17 -20q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21 q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5 q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3 q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5 t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q7 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5 q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7 q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
+<glyph unicode="&#xf0ad;" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
+<glyph unicode="&#xf0ae;" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf0b0;" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
+<glyph unicode="&#xf0b1;" horiz-adv-x="1792" d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68 t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
+<glyph unicode="&#xf0b2;" d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z " />
+<glyph unicode="&#xf0c0;" horiz-adv-x="1920" d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75 t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5 t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
+<glyph unicode="&#xf0c1;" horiz-adv-x="1664" d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15 t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207 q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
+<glyph unicode="&#xf0c2;" horiz-adv-x="1920" d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z " />
+<glyph unicode="&#xf0c3;" horiz-adv-x="1664" d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
+<glyph unicode="&#xf0c4;" horiz-adv-x="1792" d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148 q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108 q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6 q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
+<glyph unicode="&#xf0c5;" horiz-adv-x="1792" d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299 h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
+<glyph unicode="&#xf0c6;" horiz-adv-x="1408" d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235 z" />
+<glyph unicode="&#xf0c7;" d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5 h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
+<glyph unicode="&#xf0c8;" d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf0c9;" d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45 t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf0ca;" horiz-adv-x="1792" d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
+<glyph unicode="&#xf0cb;" horiz-adv-x="1792" d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5 t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 122t0.5 121v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5 t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
+<glyph unicode="&#xf0cc;" horiz-adv-x="1792" d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 97 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -55 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23 l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
+<glyph unicode="&#xf0cd;" d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41 q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472 q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
+<glyph unicode="&#xf0ce;" horiz-adv-x="1664" d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192 q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192 q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113 z" />
+<glyph unicode="&#xf0d0;" horiz-adv-x="1664" d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276 l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
+<glyph unicode="&#xf0d1;" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38 t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf0d2;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33 q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf0d3;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5 t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
+<glyph unicode="&#xf0d4;" d="M829 318q0 -76 -58.5 -112.5t-139.5 -36.5q-41 0 -80.5 9.5t-75.5 28.5t-58 53t-22 78q0 46 25 80t65.5 51.5t82 25t84.5 7.5q20 0 31 -2q2 -1 23 -16.5t26 -19t23 -18t24.5 -22t19 -22.5t17 -26t9 -26.5t4.5 -31.5zM755 863q0 -60 -33 -99.5t-92 -39.5q-53 0 -93 42.5 t-57.5 96.5t-17.5 106q0 61 32 104t92 43q53 0 93.5 -45t58 -101t17.5 -107zM861 1120l88 64h-265q-85 0 -161 -32t-127.5 -98t-51.5 -153q0 -93 64.5 -154.5t158.5 -61.5q22 0 43 3q-13 -29 -13 -54q0 -44 40 -94q-175 -12 -257 -63q-47 -29 -75.5 -73t-28.5 -95 q0 -43 18.5 -77.5t48.5 -56.5t69 -37t77.5 -21t76.5 -6q60 0 120.5 15.5t113.5 46t86 82.5t33 117q0 49 -20 89.5t-49 66.5t-58 47.5t-49 44t-20 44.5t15.5 42.5t37.5 39.5t44 42t37.5 59.5t15.5 82.5q0 60 -22.5 99.5t-72.5 90.5h83zM1152 672h128v64h-128v128h-64v-128 h-128v-64h128v-160h64v160zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf0d5;" horiz-adv-x="1664" d="M735 740q0 -36 32 -70.5t77.5 -68t90.5 -73.5t77 -104t32 -142q0 -90 -48 -173q-72 -122 -211 -179.5t-298 -57.5q-132 0 -246.5 41.5t-171.5 137.5q-37 60 -37 131q0 81 44.5 150t118.5 115q131 82 404 100q-32 42 -47.5 74t-15.5 73q0 36 21 85q-46 -4 -68 -4 q-148 0 -249.5 96.5t-101.5 244.5q0 82 36 159t99 131q77 66 182.5 98t217.5 32h418l-138 -88h-131q74 -63 112 -133t38 -160q0 -72 -24.5 -129.5t-59 -93t-69.5 -65t-59.5 -61.5t-24.5 -66zM589 836q38 0 78 16.5t66 43.5q53 57 53 159q0 58 -17 125t-48.5 129.5 t-84.5 103.5t-117 41q-42 0 -82.5 -19.5t-65.5 -52.5q-47 -59 -47 -160q0 -46 10 -97.5t31.5 -103t52 -92.5t75 -67t96.5 -26zM591 -37q58 0 111.5 13t99 39t73 73t27.5 109q0 25 -7 49t-14.5 42t-27 41.5t-29.5 35t-38.5 34.5t-36.5 29t-41.5 30t-36.5 26q-16 2 -48 2 q-53 0 -105 -7t-107.5 -25t-97 -46t-68.5 -74.5t-27 -105.5q0 -70 35 -123.5t91.5 -83t119 -44t127.5 -14.5zM1401 839h213v-108h-213v-219h-105v219h-212v108h212v217h105v-217z" />
+<glyph unicode="&#xf0d6;" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf0d7;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf0d8;" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+<glyph unicode="&#xf0d9;" horiz-adv-x="640" d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
+<glyph unicode="&#xf0da;" horiz-adv-x="640" d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
+<glyph unicode="&#xf0db;" horiz-adv-x="1664" d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
+<glyph unicode="&#xf0dc;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+<glyph unicode="&#xf0dd;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf0de;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+<glyph unicode="&#xf0e0;" horiz-adv-x="1792" d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123 q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
+<glyph unicode="&#xf0e1;" d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329 q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
+<glyph unicode="&#xf0e2;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
+<glyph unicode="&#xf0e3;" horiz-adv-x="1792" d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14 q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28 q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
+<glyph unicode="&#xf0e4;" horiz-adv-x="1792" d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5 t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29 q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+<glyph unicode="&#xf0e5;" horiz-adv-x="1792" d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5 t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
+<glyph unicode="&#xf0e6;" horiz-adv-x="1792" d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5 t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129 q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
+<glyph unicode="&#xf0e7;" horiz-adv-x="896" d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
+<glyph unicode="&#xf0e8;" horiz-adv-x="1792" d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68 z" />
+<glyph unicode="&#xf0e9;" horiz-adv-x="1664" d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69 q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
+<glyph unicode="&#xf0ea;" horiz-adv-x="1792" d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28 h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
+<glyph unicode="&#xf0eb;" horiz-adv-x="1024" d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47 q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5 t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
+<glyph unicode="&#xf0ec;" horiz-adv-x="1792" d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9 q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
+<glyph unicode="&#xf0ed;" horiz-adv-x="1920" d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
+<glyph unicode="&#xf0ee;" horiz-adv-x="1920" d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
+<glyph unicode="&#xf0f0;" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68 t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" />
+<glyph unicode="&#xf0f1;" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252 t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
+<glyph unicode="&#xf0f2;" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" />
+<glyph unicode="&#xf0f3;" horiz-adv-x="1792" d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5 t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
+<glyph unicode="&#xf0f4;" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
+<glyph unicode="&#xf0f5;" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf0f6;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M384 736q0 14 9 23t23 9h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64zM1120 512q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704zM1120 256q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704 q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704z" />
+<glyph unicode="&#xf0f7;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf0f8;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320 v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf0f9;" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152 q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf0fa;" horiz-adv-x="1792" d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32 q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
+<glyph unicode="&#xf0fb;" horiz-adv-x="1920" d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96 q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q261 -58 287 -93z" />
+<glyph unicode="&#xf0fc;" horiz-adv-x="1664" d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
+<glyph unicode="&#xf0fd;" d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf0fe;" d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf100;" horiz-adv-x="1024" d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
+<glyph unicode="&#xf101;" horiz-adv-x="1024" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23 l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+<glyph unicode="&#xf102;" horiz-adv-x="1152" d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393 q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+<glyph unicode="&#xf103;" horiz-adv-x="1152" d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+<glyph unicode="&#xf104;" horiz-adv-x="640" d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+<glyph unicode="&#xf105;" horiz-adv-x="640" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+<glyph unicode="&#xf106;" horiz-adv-x="1152" d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+<glyph unicode="&#xf107;" horiz-adv-x="1152" d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+<glyph unicode="&#xf108;" horiz-adv-x="1920" d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19 t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+<glyph unicode="&#xf109;" horiz-adv-x="1920" d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
+<glyph unicode="&#xf10a;" horiz-adv-x="1152" d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832 q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
+<glyph unicode="&#xf10b;" horiz-adv-x="768" d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136 q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
+<glyph unicode="&#xf10c;" d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103 t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf10d;" horiz-adv-x="1664" d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
+<glyph unicode="&#xf10e;" horiz-adv-x="1664" d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216 v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
+<glyph unicode="&#xf110;" horiz-adv-x="1792" d="M526 142q0 -53 -37.5 -90.5t-90.5 -37.5q-52 0 -90 38t-38 90q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 -64q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -53 -37.5 -90.5t-90.5 -37.5 t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1522 142q0 -52 -38 -90t-90 -38q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM558 1138q0 -66 -47 -113t-113 -47t-113 47t-47 113t47 113t113 47t113 -47t47 -113z M1728 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1088 1344q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1618 1138q0 -93 -66 -158.5t-158 -65.5q-93 0 -158.5 65.5t-65.5 158.5 q0 92 65.5 158t158.5 66q92 0 158 -66t66 -158z" />
+<glyph unicode="&#xf111;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf112;" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
+<glyph unicode="&#xf113;" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />
+<glyph unicode="&#xf114;" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
+<glyph unicode="&#xf115;" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />
+<glyph unicode="&#xf116;" horiz-adv-x="1792" />
+<glyph unicode="&#xf117;" horiz-adv-x="1792" />
+<glyph unicode="&#xf118;" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf119;" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf11a;" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf11b;" horiz-adv-x="1920" d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150 t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
+<glyph unicode="&#xf11c;" horiz-adv-x="1920" d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16 h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96 q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896 h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
+<glyph unicode="&#xf11d;" horiz-adv-x="1792" d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102 q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
+<glyph unicode="&#xf11e;" horiz-adv-x="1792" d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266 q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8 q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
+<glyph unicode="&#xf120;" horiz-adv-x="1664" d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9 t9 -23z" />
+<glyph unicode="&#xf121;" horiz-adv-x="1920" d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5 l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
+<glyph unicode="&#xf122;" horiz-adv-x="1792" d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1 q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
+<glyph unicode="&#xf123;" horiz-adv-x="1664" d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5 l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
+<glyph unicode="&#xf124;" horiz-adv-x="1408" d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
+<glyph unicode="&#xf125;" horiz-adv-x="1664" d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23 v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf126;" horiz-adv-x="1024" d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5 q-2 -287 -226 -414q-68 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497 q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
+<glyph unicode="&#xf127;" horiz-adv-x="1664" d="M439 265l-256 -256q-10 -9 -23 -9q-12 0 -23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18 l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9 t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
+<glyph unicode="&#xf128;" horiz-adv-x="1024" d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5 t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
+<glyph unicode="&#xf129;" horiz-adv-x="640" d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192 q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf12a;" horiz-adv-x="640" d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
+<glyph unicode="&#xf12b;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1534 846v-206h-514l-3 27 q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5t-65.5 -51.5t-30.5 -63h232v80 h126z" />
+<glyph unicode="&#xf12c;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1536 -50v-206h-514l-4 27 q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73h232v80h126z" />
+<glyph unicode="&#xf12d;" horiz-adv-x="1920" d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
+<glyph unicode="&#xf12e;" horiz-adv-x="1664" d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89 q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117 q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
+<glyph unicode="&#xf130;" horiz-adv-x="1152" d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5 t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
+<glyph unicode="&#xf131;" horiz-adv-x="1408" d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23 t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
+<glyph unicode="&#xf132;" horiz-adv-x="1280" d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150 t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf133;" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+<glyph unicode="&#xf134;" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113 q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
+<glyph unicode="&#xf135;" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
+<glyph unicode="&#xf136;" horiz-adv-x="1792" d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
+<glyph unicode="&#xf137;" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf138;" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf139;" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf13a;" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf13b;" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
+<glyph unicode="&#xf13c;" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
+<glyph unicode="&#xf13d;" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-13 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19 t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf13e;" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736z" />
+<glyph unicode="&#xf140;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf141;" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
+<glyph unicode="&#xf142;" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
+<glyph unicode="&#xf143;" d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 232 -177 396t-396 177q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128q13 0 23 10 t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf144;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56 q16 -8 32 -8q17 0 32 9z" />
+<glyph unicode="&#xf145;" horiz-adv-x="1792" d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136 t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
+<glyph unicode="&#xf146;" d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
+<glyph unicode="&#xf147;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5 t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf148;" horiz-adv-x="1024" d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
+<glyph unicode="&#xf149;" horiz-adv-x="1024" d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
+<glyph unicode="&#xf14a;" d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5 t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf14b;" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf14c;" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf14d;" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf14e;" d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf150;" d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf151;" d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf152;" d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf153;" horiz-adv-x="1024" d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26 l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
+<glyph unicode="&#xf154;" horiz-adv-x="1024" d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7 q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
+<glyph unicode="&#xf155;" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50 t53 -63.5t31.5 -76.5t13 -94z" />
+<glyph unicode="&#xf156;" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf157;" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
+<glyph unicode="&#xf158;" horiz-adv-x="1280" d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128 q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
+<glyph unicode="&#xf159;" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf15a;" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
+<glyph unicode="&#xf15b;" d="M1024 1024v472q22 -14 36 -28l408 -408q14 -14 28 -36h-472zM896 992q0 -40 28 -68t68 -28h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544z" />
+<glyph unicode="&#xf15c;" d="M1468 1060q14 -14 28 -36h-472v472q22 -14 36 -28zM992 896h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544q0 -40 28 -68t68 -28zM1152 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704 q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23z" />
+<glyph unicode="&#xf15d;" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162 l230 -662h70z" />
+<glyph unicode="&#xf15e;" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248 v119h121z" />
+<glyph unicode="&#xf160;" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf161;" horiz-adv-x="1792" d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf162;" d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5 t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
+<glyph unicode="&#xf163;" d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13 q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
+<glyph unicode="&#xf164;" horiz-adv-x="1664" d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5 t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
+<glyph unicode="&#xf165;" horiz-adv-x="1664" d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121 t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
+<glyph unicode="&#xf166;" d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 16 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38 q21 -28 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5 q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78l24 -69t23 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38q-51 0 -78 -38 q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf167;" d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51 q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99 q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-37 -51 -106 -51q-67 0 -105 51 q-28 38 -28 118v175q0 80 28 117q38 51 105 51q69 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
+<glyph unicode="&#xf168;" horiz-adv-x="1408" d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942 q25 45 64 45h241q22 0 31 -15z" />
+<glyph unicode="&#xf169;" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf16a;" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" />
+<glyph unicode="&#xf16b;" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
+<glyph unicode="&#xf16c;" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" />
+<glyph unicode="&#xf16d;" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-1142q-81 0 -139 58t-58 139v1142q0 81 58 139 t139 58h1142q81 0 139 -58t58 -139z" />
+<glyph unicode="&#xf16e;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
+<glyph unicode="&#xf170;" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf171;" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18 t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5 t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
+<glyph unicode="&#xf172;" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf173;" horiz-adv-x="1024" d="M944 207l80 -237q-23 -35 -111 -66t-177 -32q-104 -2 -190.5 26t-142.5 74t-95 106t-55.5 120t-16.5 118v544h-168v215q72 26 129 69.5t91 90t58 102t34 99t15 88.5q1 5 4.5 8.5t7.5 3.5h244v-424h333v-252h-334v-518q0 -30 6.5 -56t22.5 -52.5t49.5 -41.5t81.5 -14 q78 2 134 29z" />
+<glyph unicode="&#xf174;" d="M1136 75l-62 183q-44 -22 -103 -22q-36 -1 -62 10.5t-38.5 31.5t-17.5 40.5t-5 43.5v398h257v194h-256v326h-188q-8 0 -9 -10q-5 -44 -17.5 -87t-39 -95t-77 -95t-118.5 -68v-165h130v-418q0 -57 21.5 -115t65 -111t121 -85.5t176.5 -30.5q69 1 136.5 25t85.5 50z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf175;" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
+<glyph unicode="&#xf176;" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
+<glyph unicode="&#xf177;" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf178;" horiz-adv-x="1792" d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
+<glyph unicode="&#xf179;" horiz-adv-x="1408" d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q112 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65 q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
+<glyph unicode="&#xf17a;" horiz-adv-x="1664" d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
+<glyph unicode="&#xf17b;" horiz-adv-x="1408" d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5 h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
+<glyph unicode="&#xf17c;" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7 q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15 q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5 t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19 q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63 q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18l-4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92 q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152 q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-14 -1 -7 -7l4 -2 q14 -4 18 -31q0 -3 8 2zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5t-30 -18.5 t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43q-19 4 -51 9.5 t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49t-14 -48 q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54q110 143 124 195 q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5t-40.5 -33.5t-61 -14 q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5t15.5 47.5q1 -31 8 -56.5 t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
+<glyph unicode="&#xf17d;" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19 q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -6 6.5 -17.5t7.5 -16.5q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6 t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf17e;" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5 q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80 q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
+<glyph unicode="&#xf180;" horiz-adv-x="1280" d="M1000 1102l37 194q5 23 -9 40t-35 17h-712q-23 0 -38.5 -17t-15.5 -37v-1101q0 -7 6 -1l291 352q23 26 38 33.5t48 7.5h239q22 0 37 14.5t18 29.5q24 130 37 191q4 21 -11.5 40t-36.5 19h-294q-29 0 -48 19t-19 48v42q0 29 19 47.5t48 18.5h346q18 0 35 13.5t20 29.5z M1227 1324q-15 -73 -53.5 -266.5t-69.5 -350t-35 -173.5q-6 -22 -9 -32.5t-14 -32.5t-24.5 -33t-38.5 -21t-58 -10h-271q-13 0 -22 -10q-8 -9 -426 -494q-22 -25 -58.5 -28.5t-48.5 5.5q-55 22 -55 98v1410q0 55 38 102.5t120 47.5h888q95 0 127 -53t10 -159zM1227 1324 l-158 -790q4 17 35 173.5t69.5 350t53.5 266.5z" />
+<glyph unicode="&#xf181;" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf182;" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+<glyph unicode="&#xf183;" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+<glyph unicode="&#xf184;" d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf185;" horiz-adv-x="1792" d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94 q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
+<glyph unicode="&#xf186;" d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61 t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
+<glyph unicode="&#xf187;" horiz-adv-x="1792" d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536 q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf188;" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19 t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
+<glyph unicode="&#xf189;" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q17 19 38 30q53 26 239 24 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2 q39 5 64 -2.5t31 -16.5z" />
+<glyph unicode="&#xf18a;" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
+<glyph unicode="&#xf18b;" d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495 q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
+<glyph unicode="&#xf18c;" horiz-adv-x="1408" d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5 t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56 t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -5 1 -50.5t-1 -71.5q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5 t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />
+<glyph unicode="&#xf18d;" horiz-adv-x="1280" d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z " />
+<glyph unicode="&#xf18e;" d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf190;" d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf191;" d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf192;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5 t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf193;" horiz-adv-x="1664" d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128 q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 16 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
+<glyph unicode="&#xf194;" d="M1292 898q10 216 -161 222q-231 8 -312 -261q44 19 82 19q85 0 74 -96q-4 -57 -74 -167t-105 -110q-43 0 -82 169q-13 54 -45 255q-30 189 -160 177q-59 -7 -164 -100l-81 -72l-81 -72l52 -67q76 52 87 52q57 0 107 -179q15 -55 45 -164.5t45 -164.5q68 -179 164 -179 q157 0 383 294q220 283 226 444zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf195;" horiz-adv-x="1152" d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160 q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf196;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832 q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf197;" horiz-adv-x="2176" d="M620 416q-110 -64 -268 -64h-128v64h-64q-13 0 -22.5 23.5t-9.5 56.5q0 24 7 49q-58 2 -96.5 10.5t-38.5 20.5t38.5 20.5t96.5 10.5q-7 25 -7 49q0 33 9.5 56.5t22.5 23.5h64v64h128q158 0 268 -64h1113q42 -7 106.5 -18t80.5 -14q89 -15 150 -40.5t83.5 -47.5t22.5 -40 t-22.5 -40t-83.5 -47.5t-150 -40.5q-16 -3 -80.5 -14t-106.5 -18h-1113zM1739 668q53 -36 53 -92t-53 -92l81 -30q68 48 68 122t-68 122zM625 400h1015q-217 -38 -456 -80q-57 0 -113 -24t-83 -48l-28 -24l-288 -288q-26 -26 -70.5 -45t-89.5 -19h-96l-93 464h29 q157 0 273 64zM352 816h-29l93 464h96q46 0 90 -19t70 -45l288 -288q4 -4 11 -10.5t30.5 -23t48.5 -29t61.5 -23t72.5 -10.5l456 -80h-1015q-116 64 -273 64z" />
+<glyph unicode="&#xf198;" horiz-adv-x="1664" d="M1519 760q62 0 103.5 -40.5t41.5 -101.5q0 -97 -93 -130l-172 -59l56 -167q7 -21 7 -47q0 -59 -42 -102t-101 -43q-47 0 -85.5 27t-53.5 72l-55 165l-310 -106l55 -164q8 -24 8 -47q0 -59 -42 -102t-102 -43q-47 0 -85 27t-53 72l-55 163l-153 -53q-29 -9 -50 -9 q-61 0 -101.5 40t-40.5 101q0 47 27.5 85t71.5 53l156 53l-105 313l-156 -54q-26 -8 -48 -8q-60 0 -101 40.5t-41 100.5q0 47 27.5 85t71.5 53l157 53l-53 159q-8 24 -8 47q0 60 42 102.5t102 42.5q47 0 85 -27t53 -72l54 -160l310 105l-54 160q-8 24 -8 47q0 59 42.5 102 t101.5 43q47 0 85.5 -27.5t53.5 -71.5l53 -161l162 55q21 6 43 6q60 0 102.5 -39.5t42.5 -98.5q0 -45 -30 -81.5t-74 -51.5l-157 -54l105 -316l164 56q24 8 46 8zM725 498l310 105l-105 315l-310 -107z" />
+<glyph unicode="&#xf199;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM1280 352v436q-31 -35 -64 -55q-34 -22 -132.5 -85t-151.5 -99q-98 -69 -164 -69v0v0q-66 0 -164 69 q-46 32 -141.5 92.5t-142.5 92.5q-12 8 -33 27t-31 27v-436q0 -40 28 -68t68 -28h832q40 0 68 28t28 68zM1280 925q0 41 -27.5 70t-68.5 29h-832q-40 0 -68 -28t-28 -68q0 -37 30.5 -76.5t67.5 -64.5q47 -32 137.5 -89t129.5 -83q3 -2 17 -11.5t21 -14t21 -13t23.5 -13 t21.5 -9.5t22.5 -7.5t20.5 -2.5t20.5 2.5t22.5 7.5t21.5 9.5t23.5 13t21 13t21 14t17 11.5l267 174q35 23 66.5 62.5t31.5 73.5z" />
+<glyph unicode="&#xf19a;" horiz-adv-x="1792" d="M127 640q0 163 67 313l367 -1005q-196 95 -315 281t-119 411zM1415 679q0 -19 -2.5 -38.5t-10 -49.5t-11.5 -44t-17.5 -59t-17.5 -58l-76 -256l-278 826q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-75 1 -202 10q-12 1 -20.5 -5t-11.5 -15t-1.5 -18.5t9 -16.5 t19.5 -8l80 -8l120 -328l-168 -504l-280 832q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-7 0 -23 0.5t-26 0.5q105 160 274.5 253.5t367.5 93.5q147 0 280.5 -53t238.5 -149h-10q-55 0 -92 -40.5t-37 -95.5q0 -12 2 -24t4 -21.5t8 -23t9 -21t12 -22.5t12.5 -21 t14.5 -24t14 -23q63 -107 63 -212zM909 573l237 -647q1 -6 5 -11q-126 -44 -255 -44q-112 0 -217 32zM1570 1009q95 -174 95 -369q0 -209 -104 -385.5t-279 -278.5l235 678q59 169 59 276q0 42 -6 79zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286 t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 -215q173 0 331.5 68t273 182.5t182.5 273t68 331.5t-68 331.5t-182.5 273t-273 182.5t-331.5 68t-331.5 -68t-273 -182.5t-182.5 -273t-68 -331.5t68 -331.5t182.5 -273 t273 -182.5t331.5 -68z" />
+<glyph unicode="&#xf19b;" horiz-adv-x="1792" d="M1086 1536v-1536l-272 -128q-228 20 -414 102t-293 208.5t-107 272.5q0 140 100.5 263.5t275 205.5t391.5 108v-172q-217 -38 -356.5 -150t-139.5 -255q0 -152 154.5 -267t388.5 -145v1360zM1755 954l37 -390l-525 114l147 83q-119 70 -280 99v172q277 -33 481 -157z" />
+<glyph unicode="&#xf19c;" horiz-adv-x="2048" d="M960 1536l960 -384v-128h-128q0 -26 -20.5 -45t-48.5 -19h-1526q-28 0 -48.5 19t-20.5 45h-128v128zM256 896h256v-768h128v768h256v-768h128v768h256v-768h128v768h256v-768h59q28 0 48.5 -19t20.5 -45v-64h-1664v64q0 26 20.5 45t48.5 19h59v768zM1851 -64 q28 0 48.5 -19t20.5 -45v-128h-1920v128q0 26 20.5 45t48.5 19h1782z" />
+<glyph unicode="&#xf19d;" horiz-adv-x="2304" d="M1774 700l18 -316q4 -69 -82 -128t-235 -93.5t-323 -34.5t-323 34.5t-235 93.5t-82 128l18 316l574 -181q22 -7 48 -7t48 7zM2304 1024q0 -23 -22 -31l-1120 -352q-4 -1 -10 -1t-10 1l-652 206q-43 -34 -71 -111.5t-34 -178.5q63 -36 63 -109q0 -69 -58 -107l58 -433 q2 -14 -8 -25q-9 -11 -24 -11h-192q-15 0 -24 11q-10 11 -8 25l58 433q-58 38 -58 107q0 73 65 111q11 207 98 330l-333 104q-22 8 -22 31t22 31l1120 352q4 1 10 1t10 -1l1120 -352q22 -8 22 -31z" />
+<glyph unicode="&#xf19e;" d="M859 579l13 -707q-62 11 -105 11q-41 0 -105 -11l13 707q-40 69 -168.5 295.5t-216.5 374.5t-181 287q58 -15 108 -15q43 0 111 15q63 -111 133.5 -229.5t167 -276.5t138.5 -227q37 61 109.5 177.5t117.5 190t105 176t107 189.5q54 -14 107 -14q56 0 114 14v0 q-28 -39 -60 -88.5t-49.5 -78.5t-56.5 -96t-49 -84q-146 -248 -353 -610z" />
+<glyph unicode="&#xf1a0;" horiz-adv-x="1280" d="M981 197q0 25 -7 49t-14.5 42t-27 41.5t-29.5 35t-38.5 34.5t-36.5 29t-41.5 30t-36.5 26q-16 2 -49 2q-53 0 -104.5 -7t-107 -25t-97 -46t-68.5 -74.5t-27 -105.5q0 -56 23.5 -102t61 -75.5t87 -50t100 -29t101.5 -8.5q58 0 111.5 13t99 39t73 73t27.5 109zM864 1055 q0 59 -17 125.5t-48 129t-84 103.5t-117 41q-42 0 -82.5 -19.5t-66.5 -52.5q-46 -59 -46 -160q0 -46 10 -97.5t31.5 -103t52 -92.5t75 -67t96.5 -26q37 0 77.5 16.5t65.5 43.5q53 56 53 159zM752 1536h417l-137 -88h-132q75 -63 113 -133t38 -160q0 -72 -24.5 -129.5 t-59.5 -93t-69.5 -65t-59 -61.5t-24.5 -66q0 -36 32 -70.5t77 -68t90.5 -73.5t77.5 -104t32 -142q0 -91 -49 -173q-71 -122 -209.5 -179.5t-298.5 -57.5q-132 0 -246.5 41.5t-172.5 137.5q-36 59 -36 131q0 81 44.5 150t118.5 115q131 82 404 100q-32 41 -47.5 73.5 t-15.5 73.5q0 40 21 85q-46 -4 -68 -4q-148 0 -249.5 96.5t-101.5 244.5q0 82 36 159t99 131q76 66 182 98t218 32z" />
+<glyph unicode="&#xf1a1;" horiz-adv-x="1792" d="M1095 369q16 -16 0 -31q-62 -62 -199 -62t-199 62q-16 15 0 31q6 6 15 6t15 -6q48 -49 169 -49q120 0 169 49q6 6 15 6t15 -6zM788 550q0 -37 -26 -63t-63 -26t-63.5 26t-26.5 63q0 38 26.5 64t63.5 26t63 -26.5t26 -63.5zM1183 550q0 -37 -26.5 -63t-63.5 -26t-63 26 t-26 63t26 63.5t63 26.5t63.5 -26t26.5 -64zM1434 670q0 49 -35 84t-85 35t-86 -36q-130 90 -311 96l63 283l200 -45q0 -37 26 -63t63 -26t63.5 26.5t26.5 63.5t-26.5 63.5t-63.5 26.5q-54 0 -80 -50l-221 49q-19 5 -25 -16l-69 -312q-180 -7 -309 -97q-35 37 -87 37 q-50 0 -85 -35t-35 -84q0 -35 18.5 -64t49.5 -44q-6 -27 -6 -56q0 -142 140 -243t337 -101q198 0 338 101t140 243q0 32 -7 57q30 15 48 43.5t18 63.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191 t348 71t348 -71t286 -191t191 -286t71 -348z" />
+<glyph unicode="&#xf1a2;" d="M939 407q13 -13 0 -26q-53 -53 -171 -53t-171 53q-13 13 0 26q5 6 13 6t13 -6q42 -42 145 -42t145 42q5 6 13 6t13 -6zM676 563q0 -31 -23 -54t-54 -23t-54 23t-23 54q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1014 563q0 -31 -23 -54t-54 -23t-54 23t-23 54 q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1229 666q0 42 -30 72t-73 30q-42 0 -73 -31q-113 78 -267 82l54 243l171 -39q1 -32 23.5 -54t53.5 -22q32 0 54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5q-48 0 -69 -43l-189 42q-17 5 -21 -13l-60 -268q-154 -6 -265 -83 q-30 32 -74 32q-43 0 -73 -30t-30 -72q0 -30 16 -55t42 -38q-5 -25 -5 -48q0 -122 120 -208.5t289 -86.5q170 0 290 86.5t120 208.5q0 25 -6 49q25 13 40.5 37.5t15.5 54.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf1a3;" d="M866 697l90 27v62q0 79 -58 135t-138 56t-138 -55.5t-58 -134.5v-283q0 -20 -14 -33.5t-33 -13.5t-32.5 13.5t-13.5 33.5v120h-151v-122q0 -82 57.5 -139t139.5 -57q81 0 138.5 56.5t57.5 136.5v280q0 19 13.5 33t33.5 14q19 0 32.5 -14t13.5 -33v-54zM1199 502v122h-150 v-126q0 -20 -13.5 -33.5t-33.5 -13.5q-19 0 -32.5 14t-13.5 33v123l-90 -26l-60 28v-123q0 -80 58 -137t139 -57t138.5 57t57.5 139zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103 t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf1a4;" horiz-adv-x="1920" d="M1062 824v118q0 42 -30 72t-72 30t-72 -30t-30 -72v-612q0 -175 -126 -299t-303 -124q-178 0 -303.5 125.5t-125.5 303.5v266h328v-262q0 -43 30 -72.5t72 -29.5t72 29.5t30 72.5v620q0 171 126.5 292t301.5 121q176 0 302 -122t126 -294v-136l-195 -58zM1592 602h328 v-266q0 -178 -125.5 -303.5t-303.5 -125.5q-177 0 -303 124.5t-126 300.5v268l131 -61l195 58v-270q0 -42 30 -71.5t72 -29.5t72 29.5t30 71.5v275z" />
+<glyph unicode="&#xf1a5;" d="M1472 160v480h-704v704h-480q-93 0 -158.5 -65.5t-65.5 -158.5v-480h704v-704h480q93 0 158.5 65.5t65.5 158.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
+<glyph unicode="&#xf1a6;" horiz-adv-x="2048" d="M328 1254h204v-983h-532v697h328v286zM328 435v369h-123v-369h123zM614 968v-697h205v697h-205zM614 1254v-204h205v204h-205zM901 968h533v-942h-533v163h328v82h-328v697zM1229 435v369h-123v-369h123zM1516 968h532v-942h-532v163h327v82h-327v697zM1843 435v369h-123 v-369h123z" />
+<glyph unicode="&#xf1a7;" d="M1046 516q0 -64 -38 -109t-91 -45q-43 0 -70 15v277q28 17 70 17q53 0 91 -45.5t38 -109.5zM703 944q0 -64 -38 -109.5t-91 -45.5q-43 0 -70 15v277q28 17 70 17q53 0 91 -45t38 -109zM1265 513q0 134 -88 229t-213 95q-20 0 -39 -3q-23 -78 -78 -136q-87 -95 -211 -101 v-636l211 41v206q51 -19 117 -19q125 0 213 95t88 229zM922 940q0 134 -88.5 229t-213.5 95q-74 0 -141 -36h-186v-840l211 41v206q55 -19 116 -19q125 0 213.5 95t88.5 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf1a8;" horiz-adv-x="2038" d="M1222 607q75 3 143.5 -20.5t118 -58.5t101 -94.5t84 -108t75.5 -120.5q33 -56 78.5 -109t75.5 -80.5t99 -88.5q-48 -30 -108.5 -57.5t-138.5 -59t-114 -47.5q-44 37 -74 115t-43.5 164.5t-33 180.5t-42.5 168.5t-72.5 123t-122.5 48.5l-10 -2l-6 -4q4 -5 13 -14 q6 -5 28 -23.5t25.5 -22t19 -18t18 -20.5t11.5 -21t10.5 -27.5t4.5 -31t4 -40.5l1 -33q1 -26 -2.5 -57.5t-7.5 -52t-12.5 -58.5t-11.5 -53q-35 1 -101 -9.5t-98 -10.5q-39 0 -72 10q-2 16 -2 47q0 74 3 96q2 13 31.5 41.5t57 59t26.5 51.5q-24 2 -43 -24 q-36 -53 -111.5 -99.5t-136.5 -46.5q-25 0 -75.5 63t-106.5 139.5t-84 96.5q-6 4 -27 30q-482 -112 -513 -112q-16 0 -28 11t-12 27q0 15 8.5 26.5t22.5 14.5l486 106q-8 14 -8 25t5.5 17.5t16 11.5t20 7t23 4.5t18.5 4.5q4 1 15.5 7.5t17.5 6.5q15 0 28 -16t20 -33 q163 37 172 37q17 0 29.5 -11t12.5 -28q0 -15 -8.5 -26t-23.5 -14l-182 -40l-1 -16q-1 -26 81.5 -117.5t104.5 -91.5q47 0 119 80t72 129q0 36 -23.5 53t-51 18.5t-51 11.5t-23.5 34q0 16 10 34l-68 19q43 44 43 117q0 26 -5 58q82 16 144 16q44 0 71.5 -1.5t48.5 -8.5 t31 -13.5t20.5 -24.5t15.5 -33.5t17 -47.5t24 -60l50 25q-3 -40 -23 -60t-42.5 -21t-40 -6.5t-16.5 -20.5zM1282 842q-5 5 -13.5 15.5t-12 14.5t-10.5 11.5t-10 10.5l-8 8t-8.5 7.5t-8 5t-8.5 4.5q-7 3 -14.5 5t-20.5 2.5t-22 0.5h-32.5h-37.5q-126 0 -217 -43 q16 30 36 46.5t54 29.5t65.5 36t46 36.5t50 55t43.5 50.5q12 -9 28 -31.5t32 -36.5t38 -13l12 1v-76l22 -1q247 95 371 190q28 21 50 39t42.5 37.5t33 31t29.5 34t24 31t24.5 37t23 38t27 47.5t29.5 53l7 9q-2 -53 -43 -139q-79 -165 -205 -264t-306 -142q-14 -3 -42 -7.5 t-50 -9.5t-39 -14q3 -19 24.5 -46t21.5 -34q0 -11 -26 -30zM1061 -79q39 26 131.5 47.5t146.5 21.5q9 0 22.5 -15.5t28 -42.5t26 -50t24 -51t14.5 -33q-121 -45 -244 -45q-61 0 -125 11zM822 568l48 12l109 -177l-73 -48zM1323 51q3 -15 3 -16q0 -7 -17.5 -14.5t-46 -13 t-54 -9.5t-53.5 -7.5t-32 -4.5l-7 43q21 2 60.5 8.5t72 10t60.5 3.5h14zM866 679l-96 -20l-6 17q10 1 32.5 7t34.5 6q19 0 35 -10zM1061 45h31l10 -83l-41 -12v95zM1950 1535v1v-1zM1950 1535l-1 -5l-2 -2l1 3zM1950 1535l1 1z" />
+<glyph unicode="&#xf1a9;" d="M1167 -50q-5 19 -24 5q-30 -22 -87 -39t-131 -17q-129 0 -193 49q-5 4 -13 4q-11 0 -26 -12q-7 -6 -7.5 -16t7.5 -20q34 -32 87.5 -46t102.5 -12.5t99 4.5q41 4 84.5 20.5t65 30t28.5 20.5q12 12 7 29zM1128 65q-19 47 -39 61q-23 15 -76 15q-47 0 -71 -10 q-29 -12 -78 -56q-26 -24 -12 -44q9 -8 17.5 -4.5t31.5 23.5q3 2 10.5 8.5t10.5 8.5t10 7t11.5 7t12.5 5t15 4.5t16.5 2.5t20.5 1q27 0 44.5 -7.5t23 -14.5t13.5 -22q10 -17 12.5 -20t12.5 1q23 12 14 34zM1483 346q0 22 -5 44.5t-16.5 45t-34 36.5t-52.5 14 q-33 0 -97 -41.5t-129 -83.5t-101 -42q-27 -1 -63.5 19t-76 49t-83.5 58t-100 49t-111 19q-115 -1 -197 -78.5t-84 -178.5q-2 -112 74 -164q29 -20 62.5 -28.5t103.5 -8.5q57 0 132 32.5t134 71t120 70.5t93 31q26 -1 65 -31.5t71.5 -67t68 -67.5t55.5 -32q35 -3 58.5 14 t55.5 63q28 41 42.5 101t14.5 106zM1536 506q0 -164 -62 -304.5t-166 -236t-242.5 -149.5t-290.5 -54t-293 57.5t-247.5 157t-170.5 241.5t-64 302q0 89 19.5 172.5t49 145.5t70.5 118.5t78.5 94t78.5 69.5t64.5 46.5t42.5 24.5q14 8 51 26.5t54.5 28.5t48 30t60.5 44 q36 28 58 72.5t30 125.5q129 -155 186 -193q44 -29 130 -68t129 -66q21 -13 39 -25t60.5 -46.5t76 -70.5t75 -95t69 -122t47 -148.5t19.5 -177.5z" />
+<glyph unicode="&#xf1aa;" d="M1070 463l-160 -160l-151 -152l-30 -30q-65 -64 -151.5 -87t-171.5 -2q-16 -70 -72 -115t-129 -45q-85 0 -145 60.5t-60 145.5q0 72 44.5 128t113.5 72q-22 86 1 173t88 152l12 12l151 -152l-11 -11q-37 -37 -37 -89t37 -90q37 -37 89 -37t89 37l30 30l151 152l161 160z M729 1145l12 -12l-152 -152l-12 12q-37 37 -89 37t-89 -37t-37 -89.5t37 -89.5l29 -29l152 -152l160 -160l-151 -152l-161 160l-151 152l-30 30q-68 67 -90 159.5t5 179.5q-70 15 -115 71t-45 129q0 85 60 145.5t145 60.5q76 0 133.5 -49t69.5 -123q84 20 169.5 -3.5 t149.5 -87.5zM1536 78q0 -85 -60 -145.5t-145 -60.5q-74 0 -131 47t-71 118q-86 -28 -179.5 -6t-161.5 90l-11 12l151 152l12 -12q37 -37 89 -37t89 37t37 89t-37 89l-30 30l-152 152l-160 160l152 152l160 -160l152 -152l29 -30q64 -64 87.5 -150.5t2.5 -171.5 q76 -11 126.5 -68.5t50.5 -134.5zM1534 1202q0 -77 -51 -135t-127 -69q26 -85 3 -176.5t-90 -158.5l-12 -12l-151 152l12 12q37 37 37 89t-37 89t-89 37t-89 -37l-30 -30l-152 -152l-160 -160l-152 152l161 160l152 152l29 30q67 67 159 89.5t178 -3.5q11 75 68.5 126 t135.5 51q85 0 145 -60.5t60 -145.5z" />
+<glyph unicode="&#xf1ab;" d="M654 458q-1 -3 -12.5 0.5t-31.5 11.5l-20 9q-44 20 -87 49q-7 5 -41 31.5t-38 28.5q-67 -103 -134 -181q-81 -95 -105 -110q-4 -2 -19.5 -4t-18.5 0q6 4 82 92q21 24 85.5 115t78.5 118q17 30 51 98.5t36 77.5q-8 1 -110 -33q-8 -2 -27.5 -7.5t-34.5 -9.5t-17 -5 q-2 -2 -2 -10.5t-1 -9.5q-5 -10 -31 -15q-23 -7 -47 0q-18 4 -28 21q-4 6 -5 23q6 2 24.5 5t29.5 6q58 16 105 32q100 35 102 35q10 2 43 19.5t44 21.5q9 3 21.5 8t14.5 5.5t6 -0.5q2 -12 -1 -33q0 -2 -12.5 -27t-26.5 -53.5t-17 -33.5q-25 -50 -77 -131l64 -28 q12 -6 74.5 -32t67.5 -28q4 -1 10.5 -25.5t4.5 -30.5zM449 944q3 -15 -4 -28q-12 -23 -50 -38q-30 -12 -60 -12q-26 3 -49 26q-14 15 -18 41l1 3q3 -3 19.5 -5t26.5 0t58 16q36 12 55 14q17 0 21 -17zM1147 815l63 -227l-139 42zM39 15l694 232v1032l-694 -233v-1031z M1280 332l102 -31l-181 657l-100 31l-216 -536l102 -31l45 110l211 -65zM777 1294l573 -184v380zM1088 -29l158 -13l-54 -160l-40 66q-130 -83 -276 -108q-58 -12 -91 -12h-84q-79 0 -199.5 39t-183.5 85q-8 7 -8 16q0 8 5 13.5t13 5.5q4 0 18 -7.5t30.5 -16.5t20.5 -11 q73 -37 159.5 -61.5t157.5 -24.5q95 0 167 14.5t157 50.5q15 7 30.5 15.5t34 19t28.5 16.5zM1536 1050v-1079l-774 246q-14 -6 -375 -127.5t-368 -121.5q-13 0 -18 13q0 1 -1 3v1078q3 9 4 10q5 6 20 11q106 35 149 50v384l558 -198q2 0 160.5 55t316 108.5t161.5 53.5 q20 0 20 -21v-418z" />
+<glyph unicode="&#xf1ac;" horiz-adv-x="1792" d="M288 1152q66 0 113 -47t47 -113v-1088q0 -66 -47 -113t-113 -47h-128q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h128zM1664 989q58 -34 93 -93t35 -128v-768q0 -106 -75 -181t-181 -75h-864q-66 0 -113 47t-47 113v1536q0 40 28 68t68 28h672q40 0 88 -20t76 -48 l152 -152q28 -28 48 -76t20 -88v-163zM928 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 512v128q0 14 -9 23 t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128 q14 0 23 9t9 23zM1184 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 256v128q0 14 -9 23t-23 9h-128 q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1536 896v256h-160q-40 0 -68 28t-28 68v160h-640v-512h896z" />
+<glyph unicode="&#xf1ad;" d="M1344 1536q26 0 45 -19t19 -45v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280zM512 1248v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 992v-64q0 -14 9 -23t23 -9h64q14 0 23 9 t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 736v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 480v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 160v64 q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64 q14 0 23 9t9 23zM384 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 -96v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9 t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM896 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 928v64 q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 160v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64 q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9 t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23z" />
+<glyph unicode="&#xf1ae;" horiz-adv-x="1280" d="M1188 988l-292 -292v-824q0 -46 -33 -79t-79 -33t-79 33t-33 79v384h-64v-384q0 -46 -33 -79t-79 -33t-79 33t-33 79v824l-292 292q-28 28 -28 68t28 68t68 28t68 -28l228 -228h368l228 228q28 28 68 28t68 -28t28 -68t-28 -68zM864 1152q0 -93 -65.5 -158.5 t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+<glyph unicode="&#xf1b0;" horiz-adv-x="1664" d="M780 1064q0 -60 -19 -113.5t-63 -92.5t-105 -39q-76 0 -138 57.5t-92 135.5t-30 151q0 60 19 113.5t63 92.5t105 39q77 0 138.5 -57.5t91.5 -135t30 -151.5zM438 581q0 -80 -42 -139t-119 -59q-76 0 -141.5 55.5t-100.5 133.5t-35 152q0 80 42 139.5t119 59.5 q76 0 141.5 -55.5t100.5 -134t35 -152.5zM832 608q118 0 255 -97.5t229 -237t92 -254.5q0 -46 -17 -76.5t-48.5 -45t-64.5 -20t-76 -5.5q-68 0 -187.5 45t-182.5 45q-66 0 -192.5 -44.5t-200.5 -44.5q-183 0 -183 146q0 86 56 191.5t139.5 192.5t187.5 146t193 59zM1071 819 q-61 0 -105 39t-63 92.5t-19 113.5q0 74 30 151.5t91.5 135t138.5 57.5q61 0 105 -39t63 -92.5t19 -113.5q0 -73 -30 -151t-92 -135.5t-138 -57.5zM1503 923q77 0 119 -59.5t42 -139.5q0 -74 -35 -152t-100.5 -133.5t-141.5 -55.5q-77 0 -119 59t-42 139q0 74 35 152.5 t100.5 134t141.5 55.5z" />
+<glyph unicode="&#xf1b1;" horiz-adv-x="768" d="M704 1008q0 -145 -57 -243.5t-152 -135.5l45 -821q2 -26 -16 -45t-44 -19h-192q-26 0 -44 19t-16 45l45 821q-95 37 -152 135.5t-57 243.5q0 128 42.5 249.5t117.5 200t160 78.5t160 -78.5t117.5 -200t42.5 -249.5z" />
+<glyph unicode="&#xf1b2;" horiz-adv-x="1792" d="M896 -93l640 349v636l-640 -233v-752zM832 772l698 254l-698 254l-698 -254zM1664 1024v-768q0 -35 -18 -65t-49 -47l-704 -384q-28 -16 -61 -16t-61 16l-704 384q-31 17 -49 47t-18 65v768q0 40 23 73t61 47l704 256q22 8 44 8t44 -8l704 -256q38 -14 61 -47t23 -73z " />
+<glyph unicode="&#xf1b3;" horiz-adv-x="2304" d="M640 -96l384 192v314l-384 -164v-342zM576 358l404 173l-404 173l-404 -173zM1664 -96l384 192v314l-384 -164v-342zM1600 358l404 173l-404 173l-404 -173zM1152 651l384 165v266l-384 -164v-267zM1088 1030l441 189l-441 189l-441 -189zM2176 512v-416q0 -36 -19 -67 t-52 -47l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-5 2 -7 4q-2 -2 -7 -4l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-33 16 -52 47t-19 67v416q0 38 21.5 70t56.5 48l434 186v400q0 38 21.5 70t56.5 48l448 192q23 10 50 10t50 -10l448 -192q35 -16 56.5 -48t21.5 -70 v-400l434 -186q36 -16 57 -48t21 -70z" />
+<glyph unicode="&#xf1b4;" horiz-adv-x="2048" d="M1848 1197h-511v-124h511v124zM1596 771q-90 0 -146 -52.5t-62 -142.5h408q-18 195 -200 195zM1612 186q63 0 122 32t76 87h221q-100 -307 -427 -307q-214 0 -340.5 132t-126.5 347q0 208 130.5 345.5t336.5 137.5q138 0 240.5 -68t153 -179t50.5 -248q0 -17 -2 -47h-658 q0 -111 57.5 -171.5t166.5 -60.5zM277 236h296q205 0 205 167q0 180 -199 180h-302v-347zM277 773h281q78 0 123.5 36.5t45.5 113.5q0 144 -190 144h-260v-294zM0 1282h594q87 0 155 -14t126.5 -47.5t90 -96.5t31.5 -154q0 -181 -172 -263q114 -32 172 -115t58 -204 q0 -75 -24.5 -136.5t-66 -103.5t-98.5 -71t-121 -42t-134 -13h-611v1260z" />
+<glyph unicode="&#xf1b5;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM499 1041h-371v-787h382q117 0 197 57.5t80 170.5q0 158 -143 200q107 52 107 164q0 57 -19.5 96.5 t-56.5 60.5t-79 29.5t-97 8.5zM477 723h-176v184h163q119 0 119 -90q0 -94 -106 -94zM486 388h-185v217h189q124 0 124 -113q0 -104 -128 -104zM1136 356q-68 0 -104 38t-36 107h411q1 10 1 30q0 132 -74.5 220.5t-203.5 88.5q-128 0 -210 -86t-82 -216q0 -135 79 -217 t213 -82q205 0 267 191h-138q-11 -34 -47.5 -54t-75.5 -20zM1126 722q113 0 124 -122h-254q4 56 39 89t91 33zM964 988h319v-77h-319v77z" />
+<glyph unicode="&#xf1b6;" horiz-adv-x="1792" d="M1582 954q0 -101 -71.5 -172.5t-172.5 -71.5t-172.5 71.5t-71.5 172.5t71.5 172.5t172.5 71.5t172.5 -71.5t71.5 -172.5zM812 212q0 104 -73 177t-177 73q-27 0 -54 -6l104 -42q77 -31 109.5 -106.5t1.5 -151.5q-31 -77 -107 -109t-152 -1q-21 8 -62 24.5t-61 24.5 q32 -60 91 -96.5t130 -36.5q104 0 177 73t73 177zM1642 953q0 126 -89.5 215.5t-215.5 89.5q-127 0 -216.5 -89.5t-89.5 -215.5q0 -127 89.5 -216t216.5 -89q126 0 215.5 89t89.5 216zM1792 953q0 -189 -133.5 -322t-321.5 -133l-437 -319q-12 -129 -109 -218t-229 -89 q-121 0 -214 76t-118 192l-230 92v429l389 -157q79 48 173 48q13 0 35 -2l284 407q2 187 135.5 319t320.5 132q188 0 321.5 -133.5t133.5 -321.5z" />
+<glyph unicode="&#xf1b7;" d="M1242 889q0 80 -57 136.5t-137 56.5t-136.5 -57t-56.5 -136q0 -80 56.5 -136.5t136.5 -56.5t137 56.5t57 136.5zM632 301q0 -83 -58 -140.5t-140 -57.5q-56 0 -103 29t-72 77q52 -20 98 -40q60 -24 120 1.5t85 86.5q24 60 -1.5 120t-86.5 84l-82 33q22 5 42 5 q82 0 140 -57.5t58 -140.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v153l172 -69q20 -92 93.5 -152t168.5 -60q104 0 181 70t87 173l345 252q150 0 255.5 105.5t105.5 254.5q0 150 -105.5 255.5t-255.5 105.5 q-148 0 -253 -104.5t-107 -252.5l-225 -322q-9 1 -28 1q-75 0 -137 -37l-297 119v468q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5zM1289 887q0 -100 -71 -170.5t-171 -70.5t-170.5 70.5t-70.5 170.5t70.5 171t170.5 71q101 0 171.5 -70.5t70.5 -171.5z " />
+<glyph unicode="&#xf1b8;" horiz-adv-x="1792" d="M836 367l-15 -368l-2 -22l-420 29q-36 3 -67 31.5t-47 65.5q-11 27 -14.5 55t4 65t12 55t21.5 64t19 53q78 -12 509 -28zM449 953l180 -379l-147 92q-63 -72 -111.5 -144.5t-72.5 -125t-39.5 -94.5t-18.5 -63l-4 -21l-190 357q-17 26 -18 56t6 47l8 18q35 63 114 188 l-140 86zM1680 436l-188 -359q-12 -29 -36.5 -46.5t-43.5 -20.5l-18 -4q-71 -7 -219 -12l8 -164l-230 367l211 362l7 -173q170 -16 283 -5t170 33zM895 1360q-47 -63 -265 -435l-317 187l-19 12l225 356q20 31 60 45t80 10q24 -2 48.5 -12t42 -21t41.5 -33t36 -34.5 t36 -39.5t32 -35zM1550 1053l212 -363q18 -37 12.5 -76t-27.5 -74q-13 -20 -33 -37t-38 -28t-48.5 -22t-47 -16t-51.5 -14t-46 -12q-34 72 -265 436l313 195zM1407 1279l142 83l-220 -373l-419 20l151 86q-34 89 -75 166t-75.5 123.5t-64.5 80t-47 46.5l-17 13l405 -1 q31 3 58 -10.5t39 -28.5l11 -15q39 -61 112 -190z" />
+<glyph unicode="&#xf1b9;" horiz-adv-x="2048" d="M480 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM516 768h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5zM1888 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM2048 544v-384 q0 -14 -9 -23t-23 -9h-96v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-1024v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5t179 63.5h768q98 0 179 -63.5t104 -157.5 l105 -419h28q93 0 158.5 -65.5t65.5 -158.5z" />
+<glyph unicode="&#xf1ba;" horiz-adv-x="2048" d="M1824 640q93 0 158.5 -65.5t65.5 -158.5v-384q0 -14 -9 -23t-23 -9h-96v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-1024v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5 t179 63.5h128v224q0 14 9 23t23 9h448q14 0 23 -9t9 -23v-224h128q98 0 179 -63.5t104 -157.5l105 -419h28zM320 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM516 640h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5z M1728 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47z" />
+<glyph unicode="&#xf1bb;" d="M1504 64q0 -26 -19 -45t-45 -19h-462q1 -17 6 -87.5t5 -108.5q0 -25 -18 -42.5t-43 -17.5h-320q-25 0 -43 17.5t-18 42.5q0 38 5 108.5t6 87.5h-462q-26 0 -45 19t-19 45t19 45l402 403h-229q-26 0 -45 19t-19 45t19 45l402 403h-197q-26 0 -45 19t-19 45t19 45l384 384 q19 19 45 19t45 -19l384 -384q19 -19 19 -45t-19 -45t-45 -19h-197l402 -403q19 -19 19 -45t-19 -45t-45 -19h-229l402 -403q19 -19 19 -45z" />
+<glyph unicode="&#xf1bc;" d="M1127 326q0 32 -30 51q-193 115 -447 115q-133 0 -287 -34q-42 -9 -42 -52q0 -20 13.5 -34.5t35.5 -14.5q5 0 37 8q132 27 243 27q226 0 397 -103q19 -11 33 -11q19 0 33 13.5t14 34.5zM1223 541q0 40 -35 61q-237 141 -548 141q-153 0 -303 -42q-48 -13 -48 -64 q0 -25 17.5 -42.5t42.5 -17.5q7 0 37 8q122 33 251 33q279 0 488 -124q24 -13 38 -13q25 0 42.5 17.5t17.5 42.5zM1331 789q0 47 -40 70q-126 73 -293 110.5t-343 37.5q-204 0 -364 -47q-23 -7 -38.5 -25.5t-15.5 -48.5q0 -31 20.5 -52t51.5 -21q11 0 40 8q133 37 307 37 q159 0 309.5 -34t253.5 -95q21 -12 40 -12q29 0 50.5 20.5t21.5 51.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf1bd;" horiz-adv-x="1024" d="M1024 1233l-303 -582l24 -31h279v-415h-507l-44 -30l-142 -273l-30 -30h-301v303l303 583l-24 30h-279v415h507l44 30l142 273l30 30h301v-303z" />
+<glyph unicode="&#xf1be;" horiz-adv-x="2304" d="M784 164l16 241l-16 523q-1 10 -7.5 17t-16.5 7q-9 0 -16 -7t-7 -17l-14 -523l14 -241q1 -10 7.5 -16.5t15.5 -6.5q22 0 24 23zM1080 193l11 211l-12 586q0 16 -13 24q-8 5 -16 5t-16 -5q-13 -8 -13 -24l-1 -6l-10 -579q0 -1 11 -236v-1q0 -10 6 -17q9 -11 23 -11 q11 0 20 9q9 7 9 20zM35 533l20 -128l-20 -126q-2 -9 -9 -9t-9 9l-17 126l17 128q2 9 9 9t9 -9zM121 612l26 -207l-26 -203q-2 -9 -10 -9q-9 0 -9 10l-23 202l23 207q0 9 9 9q8 0 10 -9zM401 159zM213 650l25 -245l-25 -237q0 -11 -11 -11q-10 0 -12 11l-21 237l21 245 q2 12 12 12q11 0 11 -12zM307 657l23 -252l-23 -244q-2 -13 -14 -13q-13 0 -13 13l-21 244l21 252q0 13 13 13q12 0 14 -13zM401 639l21 -234l-21 -246q-2 -16 -16 -16q-6 0 -10.5 4.5t-4.5 11.5l-20 246l20 234q0 6 4.5 10.5t10.5 4.5q14 0 16 -15zM784 164zM495 785 l21 -380l-21 -246q0 -7 -5 -12.5t-12 -5.5q-16 0 -18 18l-18 246l18 380q2 18 18 18q7 0 12 -5.5t5 -12.5zM589 871l19 -468l-19 -244q0 -8 -5.5 -13.5t-13.5 -5.5q-18 0 -20 19l-16 244l16 468q2 19 20 19q8 0 13.5 -5.5t5.5 -13.5zM687 911l18 -506l-18 -242 q-2 -21 -22 -21q-19 0 -21 21l-16 242l16 506q0 9 6.5 15.5t14.5 6.5q9 0 15 -6.5t7 -15.5zM1079 169v0v0zM881 915l15 -510l-15 -239q0 -10 -7.5 -17.5t-17.5 -7.5t-17 7t-8 18l-14 239l14 510q0 11 7.5 18t17.5 7t17.5 -7t7.5 -18zM980 896l14 -492l-14 -236q0 -11 -8 -19 t-19 -8t-19 8t-9 19l-12 236l12 492q1 12 9 20t19 8t18.5 -8t8.5 -20zM1192 404l-14 -231v0q0 -13 -9 -22t-22 -9t-22 9t-10 22l-6 114l-6 117l12 636v3q2 15 12 24q9 7 20 7q8 0 15 -5q14 -8 16 -26zM2304 423q0 -117 -83 -199.5t-200 -82.5h-786q-13 2 -22 11t-9 22v899 q0 23 28 33q85 34 181 34q195 0 338 -131.5t160 -323.5q53 22 110 22q117 0 200 -83t83 -201z" />
+<glyph unicode="&#xf1c0;" d="M768 768q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 0q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127 t443 -43zM768 384q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 1536q208 0 385 -34.5t280 -93.5t103 -128v-128q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5 t-103 128v128q0 69 103 128t280 93.5t385 34.5z" />
+<glyph unicode="&#xf1c1;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M894 465q33 -26 84 -56q59 7 117 7q147 0 177 -49q16 -22 2 -52q0 -1 -1 -2l-2 -2v-1q-6 -38 -71 -38q-48 0 -115 20t-130 53q-221 -24 -392 -83q-153 -262 -242 -262q-15 0 -28 7l-24 12q-1 1 -6 5q-10 10 -6 36q9 40 56 91.5t132 96.5q14 9 23 -6q2 -2 2 -4q52 85 107 197 q68 136 104 262q-24 82 -30.5 159.5t6.5 127.5q11 40 42 40h21h1q23 0 35 -15q18 -21 9 -68q-2 -6 -4 -8q1 -3 1 -8v-30q-2 -123 -14 -192q55 -164 146 -238zM318 54q52 24 137 158q-51 -40 -87.5 -84t-49.5 -74zM716 974q-15 -42 -2 -132q1 7 7 44q0 3 7 43q1 4 4 8 q-1 1 -1 2t-0.5 1.5t-0.5 1.5q-1 22 -13 36q0 -1 -1 -2v-2zM592 313q135 54 284 81q-2 1 -13 9.5t-16 13.5q-76 67 -127 176q-27 -86 -83 -197q-30 -56 -45 -83zM1238 329q-24 24 -140 24q76 -28 124 -28q14 0 18 1q0 1 -2 3z" />
+<glyph unicode="&#xf1c2;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M233 768v-107h70l164 -661h159l128 485q7 20 10 46q2 16 2 24h4l3 -24q1 -3 3.5 -20t5.5 -26l128 -485h159l164 661h70v107h-300v-107h90l-99 -438q-5 -20 -7 -46l-2 -21h-4l-3 21q-1 5 -4 21t-5 25l-144 545h-114l-144 -545q-2 -9 -4.5 -24.5t-3.5 -21.5l-4 -21h-4l-2 21 q-2 26 -7 46l-99 438h90v107h-300z" />
+<glyph unicode="&#xf1c3;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M429 106v-106h281v106h-75l103 161q5 7 10 16.5t7.5 13.5t3.5 4h2q1 -4 5 -10q2 -4 4.5 -7.5t6 -8t6.5 -8.5l107 -161h-76v-106h291v106h-68l-192 273l195 282h67v107h-279v-107h74l-103 -159q-4 -7 -10 -16.5t-9 -13.5l-2 -3h-2q-1 4 -5 10q-6 11 -17 23l-106 159h76v107 h-290v-107h68l189 -272l-194 -283h-68z" />
+<glyph unicode="&#xf1c4;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M416 106v-106h327v106h-93v167h137q76 0 118 15q67 23 106.5 87t39.5 146q0 81 -37 141t-100 87q-48 19 -130 19h-368v-107h92v-555h-92zM769 386h-119v268h120q52 0 83 -18q56 -33 56 -115q0 -89 -62 -120q-31 -15 -78 -15z" />
+<glyph unicode="&#xf1c5;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M1280 320v-320h-1024v192l192 192l128 -128l384 384zM448 512q-80 0 -136 56t-56 136t56 136t136 56t136 -56t56 -136t-56 -136t-136 -56z" />
+<glyph unicode="&#xf1c6;" d="M640 1152v128h-128v-128h128zM768 1024v128h-128v-128h128zM640 896v128h-128v-128h128zM768 768v128h-128v-128h128zM1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400 v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-128v-128h-128v128h-512v-1536h1280zM781 593l107 -349q8 -27 8 -52q0 -83 -72.5 -137.5t-183.5 -54.5t-183.5 54.5t-72.5 137.5q0 25 8 52q21 63 120 396v128h128v-128h79 q22 0 39 -13t23 -34zM640 128q53 0 90.5 19t37.5 45t-37.5 45t-90.5 19t-90.5 -19t-37.5 -45t37.5 -45t90.5 -19z" />
+<glyph unicode="&#xf1c7;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M620 686q20 -8 20 -30v-544q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-166 167h-131q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h131l166 167q16 15 35 7zM1037 -3q31 0 50 24q129 159 129 363t-129 363q-16 21 -43 24t-47 -14q-21 -17 -23.5 -43.5t14.5 -47.5 q100 -123 100 -282t-100 -282q-17 -21 -14.5 -47.5t23.5 -42.5q18 -15 40 -15zM826 145q27 0 47 20q87 93 87 219t-87 219q-18 19 -45 20t-46 -17t-20 -44.5t18 -46.5q52 -57 52 -131t-52 -131q-19 -20 -18 -46.5t20 -44.5q20 -17 44 -17z" />
+<glyph unicode="&#xf1c8;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M768 768q52 0 90 -38t38 -90v-384q0 -52 -38 -90t-90 -38h-384q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h384zM1260 766q20 -8 20 -30v-576q0 -22 -20 -30q-8 -2 -12 -2q-14 0 -23 9l-265 266v90l265 266q9 9 23 9q4 0 12 -2z" />
+<glyph unicode="&#xf1c9;" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M480 768q8 11 21 12.5t24 -6.5l51 -38q11 -8 12.5 -21t-6.5 -24l-182 -243l182 -243q8 -11 6.5 -24t-12.5 -21l-51 -38q-11 -8 -24 -6.5t-21 12.5l-226 301q-14 19 0 38zM1282 467q14 -19 0 -38l-226 -301q-8 -11 -21 -12.5t-24 6.5l-51 38q-11 8 -12.5 21t6.5 24l182 243 l-182 243q-8 11 -6.5 24t12.5 21l51 38q11 8 24 6.5t21 -12.5zM662 6q-13 2 -20.5 13t-5.5 24l138 831q2 13 13 20.5t24 5.5l63 -10q13 -2 20.5 -13t5.5 -24l-138 -831q-2 -13 -13 -20.5t-24 -5.5z" />
+<glyph unicode="&#xf1ca;" d="M1497 709v-198q-101 -23 -198 -23q-65 -136 -165.5 -271t-181.5 -215.5t-128 -106.5q-80 -45 -162 3q-28 17 -60.5 43.5t-85 83.5t-102.5 128.5t-107.5 184t-105.5 244t-91.5 314.5t-70.5 390h283q26 -218 70 -398.5t104.5 -317t121.5 -235.5t140 -195q169 169 287 406 q-142 72 -223 220t-81 333q0 192 104 314.5t284 122.5q178 0 273 -105.5t95 -297.5q0 -159 -58 -286q-7 -1 -19.5 -3t-46 -2t-63 6t-62 25.5t-50.5 51.5q31 103 31 184q0 87 -29 132t-79 45q-53 0 -85 -49.5t-32 -140.5q0 -186 105 -293.5t267 -107.5q62 0 121 14z" />
+<glyph unicode="&#xf1cb;" horiz-adv-x="1792" d="M216 367l603 -402v359l-334 223zM154 511l193 129l-193 129v-258zM973 -35l603 402l-269 180l-334 -223v-359zM896 458l272 182l-272 182l-272 -182zM485 733l334 223v359l-603 -402zM1445 640l193 -129v258zM1307 733l269 180l-603 402v-359zM1792 913v-546 q0 -41 -34 -64l-819 -546q-21 -13 -43 -13t-43 13l-819 546q-34 23 -34 64v546q0 41 34 64l819 546q21 13 43 13t43 -13l819 -546q34 -23 34 -64z" />
+<glyph unicode="&#xf1cc;" horiz-adv-x="2048" d="M1800 764q111 -46 179.5 -145.5t68.5 -221.5q0 -164 -118 -280.5t-285 -116.5q-4 0 -11.5 0.5t-10.5 0.5h-1209h-1h-2h-5q-170 10 -288 125.5t-118 280.5q0 110 55 203t147 147q-12 39 -12 82q0 115 82 196t199 81q95 0 172 -58q75 154 222.5 248t326.5 94 q166 0 306 -80.5t221.5 -218.5t81.5 -301q0 -6 -0.5 -18t-0.5 -18zM468 498q0 -122 84 -193t208 -71q137 0 240 99q-16 20 -47.5 56.5t-43.5 50.5q-67 -65 -144 -65q-55 0 -93.5 33.5t-38.5 87.5q0 53 38.5 87t91.5 34q44 0 84.5 -21t73 -55t65 -75t69 -82t77 -75t97 -55 t121.5 -21q121 0 204.5 71.5t83.5 190.5q0 121 -84 192t-207 71q-143 0 -241 -97q14 -16 29.5 -34t34.5 -40t29 -34q66 64 142 64q52 0 92 -33t40 -84q0 -57 -37 -91.5t-94 -34.5q-43 0 -82.5 21t-72 55t-65.5 75t-69.5 82t-77.5 75t-96.5 55t-118.5 21q-122 0 -207 -70.5 t-85 -189.5z" />
+<glyph unicode="&#xf1cd;" horiz-adv-x="1792" d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 1408q-190 0 -361 -90l194 -194q82 28 167 28t167 -28l194 194q-171 90 -361 90zM218 279l194 194 q-28 82 -28 167t28 167l-194 194q-90 -171 -90 -361t90 -361zM896 -128q190 0 361 90l-194 194q-82 -28 -167 -28t-167 28l-194 -194q171 -90 361 -90zM896 256q159 0 271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5 t271.5 -112.5zM1380 473l194 -194q90 171 90 361t-90 361l-194 -194q28 -82 28 -167t-28 -167z" />
+<glyph unicode="&#xf1ce;" horiz-adv-x="1792" d="M1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348q0 222 101 414.5t276.5 317t390.5 155.5v-260q-221 -45 -366.5 -221t-145.5 -406q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5 q0 230 -145.5 406t-366.5 221v260q215 -31 390.5 -155.5t276.5 -317t101 -414.5z" />
+<glyph unicode="&#xf1d0;" horiz-adv-x="1792" d="M19 662q8 217 116 406t305 318h5q0 -1 -1 -3q-8 -8 -28 -33.5t-52 -76.5t-60 -110.5t-44.5 -135.5t-14 -150.5t39 -157.5t108.5 -154q50 -50 102 -69.5t90.5 -11.5t69.5 23.5t47 32.5l16 16q39 51 53 116.5t6.5 122.5t-21 107t-26.5 80l-14 29q-10 25 -30.5 49.5t-43 41 t-43.5 29.5t-35 19l-13 6l104 115q39 -17 78 -52t59 -61l19 -27q1 48 -18.5 103.5t-40.5 87.5l-20 31l161 183l160 -181q-33 -46 -52.5 -102.5t-22.5 -90.5l-4 -33q22 37 61.5 72.5t67.5 52.5l28 17l103 -115q-44 -14 -85 -50t-60 -65l-19 -29q-31 -56 -48 -133.5t-7 -170 t57 -156.5q33 -45 77.5 -60.5t85 -5.5t76 26.5t57.5 33.5l21 16q60 53 96.5 115t48.5 121.5t10 121.5t-18 118t-37 107.5t-45.5 93t-45 72t-34.5 47.5l-13 17q-14 13 -7 13l10 -3q40 -29 62.5 -46t62 -50t64 -58t58.5 -65t55.5 -77t45.5 -88t38 -103t23.5 -117t10.5 -136 q3 -259 -108 -465t-312 -321t-456 -115q-185 0 -351 74t-283.5 198t-184 293t-60.5 353z" />
+<glyph unicode="&#xf1d1;" horiz-adv-x="1792" d="M874 -102v-66q-208 6 -385 109.5t-283 275.5l58 34q29 -49 73 -99l65 57q148 -168 368 -212l-17 -86q65 -12 121 -13zM276 428l-83 -28q22 -60 49 -112l-57 -33q-98 180 -98 385t98 385l57 -33q-30 -56 -49 -112l82 -28q-35 -100 -35 -212q0 -109 36 -212zM1528 251 l58 -34q-106 -172 -283 -275.5t-385 -109.5v66q56 1 121 13l-17 86q220 44 368 212l65 -57q44 50 73 99zM1377 805l-233 -80q14 -42 14 -85t-14 -85l232 -80q-31 -92 -98 -169l-185 162q-57 -67 -147 -85l48 -241q-52 -10 -98 -10t-98 10l48 241q-90 18 -147 85l-185 -162 q-67 77 -98 169l232 80q-14 42 -14 85t14 85l-233 80q33 93 99 169l185 -162q59 68 147 86l-48 240q44 10 98 10t98 -10l-48 -240q88 -18 147 -86l185 162q66 -76 99 -169zM874 1448v-66q-65 -2 -121 -13l17 -86q-220 -42 -368 -211l-65 56q-38 -42 -73 -98l-57 33 q106 172 282 275.5t385 109.5zM1705 640q0 -205 -98 -385l-57 33q27 52 49 112l-83 28q36 103 36 212q0 112 -35 212l82 28q-19 56 -49 112l57 33q98 -180 98 -385zM1585 1063l-57 -33q-35 56 -73 98l-65 -56q-148 169 -368 211l17 86q-56 11 -121 13v66q209 -6 385 -109.5 t282 -275.5zM1748 640q0 173 -67.5 331t-181.5 272t-272 181.5t-331 67.5t-331 -67.5t-272 -181.5t-181.5 -272t-67.5 -331t67.5 -331t181.5 -272t272 -181.5t331 -67.5t331 67.5t272 181.5t181.5 272t67.5 331zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71 t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+<glyph unicode="&#xf1d2;" d="M582 228q0 -66 -93 -66q-107 0 -107 63q0 64 98 64q102 0 102 -61zM546 694q0 -85 -74 -85q-77 0 -77 84q0 90 77 90q36 0 55 -25.5t19 -63.5zM712 769v125q-78 -29 -135 -29q-50 29 -110 29q-86 0 -145 -57t-59 -143q0 -50 29.5 -102t73.5 -67v-3q-38 -17 -38 -85 q0 -53 41 -77v-3q-113 -37 -113 -139q0 -45 20 -78.5t54 -51t72 -25.5t81 -8q224 0 224 188q0 67 -48 99t-126 46q-27 5 -51.5 20.5t-24.5 39.5q0 44 49 52q77 15 122 70t45 134q0 24 -10 52q37 9 49 13zM771 350h137q-2 27 -2 82v387q0 46 2 69h-137q3 -23 3 -71v-392 q0 -50 -3 -75zM1280 366v121q-30 -21 -68 -21q-53 0 -53 82v225h52q9 0 26.5 -1t26.5 -1v117h-105q0 82 3 102h-140q4 -24 4 -55v-47h-60v-117q36 3 37 3q3 0 11 -0.5t12 -0.5v-2h-2v-217q0 -37 2.5 -64t11.5 -56.5t24.5 -48.5t43.5 -31t66 -12q64 0 108 24zM924 1072 q0 36 -24 63.5t-60 27.5t-60.5 -27t-24.5 -64q0 -36 25 -62.5t60 -26.5t59.5 27t24.5 62zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf1d3;" horiz-adv-x="1792" d="M595 22q0 100 -165 100q-158 0 -158 -104q0 -101 172 -101q151 0 151 105zM536 777q0 61 -30 102t-89 41q-124 0 -124 -145q0 -135 124 -135q119 0 119 137zM805 1101v-202q-36 -12 -79 -22q16 -43 16 -84q0 -127 -73 -216.5t-197 -112.5q-40 -8 -59.5 -27t-19.5 -58 q0 -31 22.5 -51.5t58 -32t78.5 -22t86 -25.5t78.5 -37.5t58 -64t22.5 -98.5q0 -304 -363 -304q-69 0 -130 12.5t-116 41t-87.5 82t-32.5 127.5q0 165 182 225v4q-67 41 -67 126q0 109 63 137v4q-72 24 -119.5 108.5t-47.5 165.5q0 139 95 231.5t235 92.5q96 0 178 -47 q98 0 218 47zM1123 220h-222q4 45 4 134v609q0 94 -4 128h222q-4 -33 -4 -124v-613q0 -89 4 -134zM1724 442v-196q-71 -39 -174 -39q-62 0 -107 20t-70 50t-39.5 78t-18.5 92t-4 103v351h2v4q-7 0 -19 1t-18 1q-21 0 -59 -6v190h96v76q0 54 -6 89h227q-6 -41 -6 -165h171 v-190q-15 0 -43.5 2t-42.5 2h-85v-365q0 -131 87 -131q61 0 109 33zM1148 1389q0 -58 -39 -101.5t-96 -43.5q-58 0 -98 43.5t-40 101.5q0 59 39.5 103t98.5 44q58 0 96.5 -44.5t38.5 -102.5z" />
+<glyph unicode="&#xf1d4;" d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf1d5;" horiz-adv-x="1280" d="M842 964q0 -80 -57 -136.5t-136 -56.5q-60 0 -111 35q-62 -67 -115 -146q-247 -371 -202 -859q1 -22 -12.5 -38.5t-34.5 -18.5h-5q-20 0 -35 13.5t-17 33.5q-14 126 -3.5 247.5t29.5 217t54 186t69 155.5t74 125q61 90 132 165q-16 35 -16 77q0 80 56.5 136.5t136.5 56.5 t136.5 -56.5t56.5 -136.5zM1223 953q0 -158 -78 -292t-212.5 -212t-292.5 -78q-64 0 -131 14q-21 5 -32.5 23.5t-6.5 39.5q5 20 23 31.5t39 7.5q51 -13 108 -13q97 0 186 38t153 102t102 153t38 186t-38 186t-102 153t-153 102t-186 38t-186 -38t-153 -102t-102 -153 t-38 -186q0 -114 52 -218q10 -20 3.5 -40t-25.5 -30t-39.5 -3t-30.5 26q-64 123 -64 265q0 119 46.5 227t124.5 186t186 124t226 46q158 0 292.5 -78t212.5 -212.5t78 -292.5z" />
+<glyph unicode="&#xf1d6;" horiz-adv-x="1792" d="M270 730q-8 19 -8 52q0 20 11 49t24 45q-1 22 7.5 53t22.5 43q0 139 92.5 288.5t217.5 209.5q139 66 324 66q133 0 266 -55q49 -21 90 -48t71 -56t55 -68t42 -74t32.5 -84.5t25.5 -89.5t22 -98l1 -5q55 -83 55 -150q0 -14 -9 -40t-9 -38q0 -1 1.5 -3.5t3.5 -5t2 -3.5 q77 -114 120.5 -214.5t43.5 -208.5q0 -43 -19.5 -100t-55.5 -57q-9 0 -19.5 7.5t-19 17.5t-19 26t-16 26.5t-13.5 26t-9 17.5q-1 1 -3 1l-5 -4q-59 -154 -132 -223q20 -20 61.5 -38.5t69 -41.5t35.5 -65q-2 -4 -4 -16t-7 -18q-64 -97 -302 -97q-53 0 -110.5 9t-98 20 t-104.5 30q-15 5 -23 7q-14 4 -46 4.5t-40 1.5q-41 -45 -127.5 -65t-168.5 -20q-35 0 -69 1.5t-93 9t-101 20.5t-74.5 40t-32.5 64q0 40 10 59.5t41 48.5q11 2 40.5 13t49.5 12q4 0 14 2q2 2 2 4l-2 3q-48 11 -108 105.5t-73 156.5l-5 3q-4 0 -12 -20q-18 -41 -54.5 -74.5 t-77.5 -37.5h-1q-4 0 -6 4.5t-5 5.5q-23 54 -23 100q0 275 252 466z" />
+<glyph unicode="&#xf1d7;" horiz-adv-x="2048" d="M580 1075q0 41 -25 66t-66 25q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 66 24.5t25 65.5zM1323 568q0 28 -25.5 50t-65.5 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q40 0 65.5 22t25.5 51zM1087 1075q0 41 -24.5 66t-65.5 25 q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 65.5 24.5t24.5 65.5zM1722 568q0 28 -26 50t-65 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q39 0 65 22t26 51zM1456 965q-31 4 -70 4q-169 0 -311 -77t-223.5 -208.5t-81.5 -287.5 q0 -78 23 -152q-35 -3 -68 -3q-26 0 -50 1.5t-55 6.5t-44.5 7t-54.5 10.5t-50 10.5l-253 -127l72 218q-290 203 -290 490q0 169 97.5 311t264 223.5t363.5 81.5q176 0 332.5 -66t262 -182.5t136.5 -260.5zM2048 404q0 -117 -68.5 -223.5t-185.5 -193.5l55 -181l-199 109 q-150 -37 -218 -37q-169 0 -311 70.5t-223.5 191.5t-81.5 264t81.5 264t223.5 191.5t311 70.5q161 0 303 -70.5t227.5 -192t85.5 -263.5z" />
+<glyph unicode="&#xf1d8;" horiz-adv-x="1792" d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-453 185l-242 -295q-18 -23 -49 -23q-13 0 -22 4q-19 7 -30.5 23.5t-11.5 36.5v349l864 1059l-1069 -925l-395 162q-37 14 -40 55q-2 40 32 59l1664 960q15 9 32 9q20 0 36 -11z" />
+<glyph unicode="&#xf1d9;" horiz-adv-x="1792" d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-527 215l-298 -327q-18 -21 -47 -21q-14 0 -23 4q-19 7 -30 23.5t-11 36.5v452l-472 193q-37 14 -40 55q-3 39 32 59l1664 960q35 21 68 -2zM1422 26l221 1323l-1434 -827l336 -137 l863 639l-478 -797z" />
+<glyph unicode="&#xf1da;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298zM896 928v-448q0 -14 -9 -23 t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf1db;" d="M768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf1dc;" horiz-adv-x="1792" d="M1682 -128q-44 0 -132.5 3.5t-133.5 3.5q-44 0 -132 -3.5t-132 -3.5q-24 0 -37 20.5t-13 45.5q0 31 17 46t39 17t51 7t45 15q33 21 33 140l-1 391q0 21 -1 31q-13 4 -50 4h-675q-38 0 -51 -4q-1 -10 -1 -31l-1 -371q0 -142 37 -164q16 -10 48 -13t57 -3.5t45 -15 t20 -45.5q0 -26 -12.5 -48t-36.5 -22q-47 0 -139.5 3.5t-138.5 3.5q-43 0 -128 -3.5t-127 -3.5q-23 0 -35.5 21t-12.5 45q0 30 15.5 45t36 17.5t47.5 7.5t42 15q33 23 33 143l-1 57v813q0 3 0.5 26t0 36.5t-1.5 38.5t-3.5 42t-6.5 36.5t-11 31.5t-16 18q-15 10 -45 12t-53 2 t-41 14t-18 45q0 26 12 48t36 22q46 0 138.5 -3.5t138.5 -3.5q42 0 126.5 3.5t126.5 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17 -43.5t-38.5 -14.5t-49.5 -4t-43 -13q-35 -21 -35 -160l1 -320q0 -21 1 -32q13 -3 39 -3h699q25 0 38 3q1 11 1 32l1 320q0 139 -35 160 q-18 11 -58.5 12.5t-66 13t-25.5 49.5q0 26 12.5 48t37.5 22q44 0 132 -3.5t132 -3.5q43 0 129 3.5t129 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17.5 -44t-40 -14.5t-51.5 -3t-44 -12.5q-35 -23 -35 -161l1 -943q0 -119 34 -140q16 -10 46 -13.5t53.5 -4.5t41.5 -15.5t18 -44.5 q0 -26 -12 -48t-36 -22z" />
+<glyph unicode="&#xf1dd;" horiz-adv-x="1280" d="M1278 1347v-73q0 -29 -18.5 -61t-42.5 -32q-50 0 -54 -1q-26 -6 -32 -31q-3 -11 -3 -64v-1152q0 -25 -18 -43t-43 -18h-108q-25 0 -43 18t-18 43v1218h-143v-1218q0 -25 -17.5 -43t-43.5 -18h-108q-26 0 -43.5 18t-17.5 43v496q-147 12 -245 59q-126 58 -192 179 q-64 117 -64 259q0 166 88 286q88 118 209 159q111 37 417 37h479q25 0 43 -18t18 -43z" />
+<glyph unicode="&#xf1de;" d="M352 128v-128h-352v128h352zM704 256q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM864 640v-128h-864v128h864zM224 1152v-128h-224v128h224zM1536 128v-128h-736v128h736zM576 1280q26 0 45 -19t19 -45v-256 q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1216 768q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1536 640v-128h-224v128h224zM1536 1152v-128h-864v128h864z" />
+<glyph unicode="&#xf1e0;" d="M1216 512q133 0 226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5t-226.5 93.5t-93.5 226.5q0 12 2 34l-360 180q-92 -86 -218 -86q-133 0 -226.5 93.5t-93.5 226.5t93.5 226.5t226.5 93.5q126 0 218 -86l360 180q-2 22 -2 34q0 133 93.5 226.5t226.5 93.5 t226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5q-126 0 -218 86l-360 -180q2 -22 2 -34t-2 -34l360 -180q92 86 218 86z" />
+<glyph unicode="&#xf1e1;" d="M1280 341q0 88 -62.5 151t-150.5 63q-84 0 -145 -58l-241 120q2 16 2 23t-2 23l241 120q61 -58 145 -58q88 0 150.5 63t62.5 151t-62.5 150.5t-150.5 62.5t-151 -62.5t-63 -150.5q0 -7 2 -23l-241 -120q-62 57 -145 57q-88 0 -150.5 -62.5t-62.5 -150.5t62.5 -150.5 t150.5 -62.5q83 0 145 57l241 -120q-2 -16 -2 -23q0 -88 63 -150.5t151 -62.5t150.5 62.5t62.5 150.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf1e2;" horiz-adv-x="1792" d="M571 947q-10 25 -34 35t-49 0q-108 -44 -191 -127t-127 -191q-10 -25 0 -49t35 -34q13 -5 24 -5q42 0 60 40q34 84 98.5 148.5t148.5 98.5q25 11 35 35t0 49zM1513 1303l46 -46l-244 -243l68 -68q19 -19 19 -45.5t-19 -45.5l-64 -64q89 -161 89 -343q0 -143 -55.5 -273.5 t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5q182 0 343 -89l64 64q19 19 45.5 19t45.5 -19l68 -68zM1521 1359q-10 -10 -22 -10q-13 0 -23 10l-91 90q-9 10 -9 23t9 23q10 9 23 9t23 -9l90 -91 q10 -9 10 -22.5t-10 -22.5zM1751 1129q-11 -9 -23 -9t-23 9l-90 91q-10 9 -10 22.5t10 22.5q9 10 22.5 10t22.5 -10l91 -90q9 -10 9 -23t-9 -23zM1792 1312q0 -14 -9 -23t-23 -9h-96q-14 0 -23 9t-9 23t9 23t23 9h96q14 0 23 -9t9 -23zM1600 1504v-96q0 -14 -9 -23t-23 -9 t-23 9t-9 23v96q0 14 9 23t23 9t23 -9t9 -23zM1751 1449l-91 -90q-10 -10 -22 -10q-13 0 -23 10q-10 9 -10 22.5t10 22.5l90 91q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
+<glyph unicode="&#xf1e3;" horiz-adv-x="1792" d="M609 720l287 208l287 -208l-109 -336h-355zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM1515 186q149 203 149 454v3l-102 -89l-240 224l63 323 l134 -12q-150 206 -389 282l53 -124l-287 -159l-287 159l53 124q-239 -76 -389 -282l135 12l62 -323l-240 -224l-102 89v-3q0 -251 149 -454l30 132l326 -40l139 -298l-116 -69q117 -39 240 -39t240 39l-116 69l139 298l326 40z" />
+<glyph unicode="&#xf1e4;" horiz-adv-x="1792" d="M448 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM256 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM832 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM66 768q-28 0 -47 19t-19 46v129h514v-129q0 -27 -19 -46t-46 -19h-383zM1216 224v-192q0 -14 -9 -23t-23 -9h-192 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1600 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23 zM1408 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1016v-13h-514v10q0 104 -382 102q-382 -1 -382 -102v-10h-514v13q0 17 8.5 43t34 64t65.5 75.5t110.5 76t160 67.5t224 47.5t293.5 18.5t293 -18.5t224 -47.5 t160.5 -67.5t110.5 -76t65.5 -75.5t34 -64t8.5 -43zM1792 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 962v-129q0 -27 -19 -46t-46 -19h-384q-27 0 -46 19t-19 46v129h514z" />
+<glyph unicode="&#xf1e5;" horiz-adv-x="1792" d="M704 1216v-768q0 -26 -19 -45t-45 -19v-576q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v512l249 873q7 23 31 23h424zM1024 1216v-704h-256v704h256zM1792 320v-512q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v576q-26 0 -45 19t-19 45v768h424q24 0 31 -23z M736 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23zM1408 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf1e6;" horiz-adv-x="1792" d="M1755 1083q37 -37 37 -90t-37 -91l-401 -400l150 -150l-160 -160q-163 -163 -389.5 -186.5t-411.5 100.5l-362 -362h-181v181l362 362q-124 185 -100.5 411.5t186.5 389.5l160 160l150 -150l400 401q38 37 91 37t90 -37t37 -90.5t-37 -90.5l-400 -401l234 -234l401 400 q38 37 91 37t90 -37z" />
+<glyph unicode="&#xf1e7;" horiz-adv-x="1792" d="M873 796q0 -83 -63.5 -142.5t-152.5 -59.5t-152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59t152.5 -59t63.5 -143zM1375 796q0 -83 -63 -142.5t-153 -59.5q-89 0 -152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59q90 0 153 -59t63 -143zM1600 616v667q0 87 -32 123.5 t-111 36.5h-1112q-83 0 -112.5 -34t-29.5 -126v-673q43 -23 88.5 -40t81 -28t81 -18.5t71 -11t70 -4t58.5 -0.5t56.5 2t44.5 2q68 1 95 -27q6 -6 10 -9q26 -25 61 -51q7 91 118 87q5 0 36.5 -1.5t43 -2t45.5 -1t53 1t54.5 4.5t61 8.5t62 13.5t67 19.5t67.5 27t72 34.5z M1763 621q-121 -149 -372 -252q84 -285 -23 -465q-66 -113 -183 -148q-104 -32 -182 15q-86 51 -82 164l-1 326v1q-8 2 -24.5 6t-23.5 5l-1 -338q4 -114 -83 -164q-79 -47 -183 -15q-117 36 -182 150q-105 180 -22 463q-251 103 -372 252q-25 37 -4 63t60 -1q3 -2 11 -7 t11 -8v694q0 72 47 123t114 51h1257q67 0 114 -51t47 -123v-694l21 15q39 27 60 1t-4 -63z" />
+<glyph unicode="&#xf1e8;" horiz-adv-x="1792" d="M896 1102v-434h-145v434h145zM1294 1102v-434h-145v434h145zM1294 342l253 254v795h-1194v-1049h326v-217l217 217h398zM1692 1536v-1013l-434 -434h-326l-217 -217h-217v217h-398v1158l109 289h1483z" />
+<glyph unicode="&#xf1e9;" d="M773 217v-127q-1 -292 -6 -305q-12 -32 -51 -40q-54 -9 -181.5 38t-162.5 89q-13 15 -17 36q-1 12 4 26q4 10 34 47t181 216q1 0 60 70q15 19 39.5 24.5t49.5 -3.5q24 -10 37.5 -29t12.5 -42zM624 468q-3 -55 -52 -70l-120 -39q-275 -88 -292 -88q-35 2 -54 36 q-12 25 -17 75q-8 76 1 166.5t30 124.5t56 32q13 0 202 -77q70 -29 115 -47l84 -34q23 -9 35.5 -30.5t11.5 -48.5zM1450 171q-7 -54 -91.5 -161t-135.5 -127q-37 -14 -63 7q-14 10 -184 287l-47 77q-14 21 -11.5 46t19.5 46q35 43 83 26q1 -1 119 -40q203 -66 242 -79.5 t47 -20.5q28 -22 22 -61zM778 803q5 -102 -54 -122q-58 -17 -114 71l-378 598q-8 35 19 62q41 43 207.5 89.5t224.5 31.5q40 -10 49 -45q3 -18 22 -305.5t24 -379.5zM1440 695q3 -39 -26 -59q-15 -10 -329 -86q-67 -15 -91 -23l1 2q-23 -6 -46 4t-37 32q-30 47 0 87 q1 1 75 102q125 171 150 204t34 39q28 19 65 2q48 -23 123 -133.5t81 -167.5v-3z" />
+<glyph unicode="&#xf1ea;" horiz-adv-x="2048" d="M1024 1024h-384v-384h384v384zM1152 384v-128h-640v128h640zM1152 1152v-640h-640v640h640zM1792 384v-128h-512v128h512zM1792 640v-128h-512v128h512zM1792 896v-128h-512v128h512zM1792 1152v-128h-512v128h512zM256 192v960h-128v-960q0 -26 19 -45t45 -19t45 19 t19 45zM1920 192v1088h-1536v-1088q0 -33 -11 -64h1483q26 0 45 19t19 45zM2048 1408v-1216q0 -80 -56 -136t-136 -56h-1664q-80 0 -136 56t-56 136v1088h256v128h1792z" />
+<glyph unicode="&#xf1eb;" horiz-adv-x="2048" d="M1024 13q-20 0 -93 73.5t-73 93.5q0 32 62.5 54t103.5 22t103.5 -22t62.5 -54q0 -20 -73 -93.5t-93 -73.5zM1294 284q-2 0 -40 25t-101.5 50t-128.5 25t-128.5 -25t-101 -50t-40.5 -25q-18 0 -93.5 75t-75.5 93q0 13 10 23q78 77 196 121t233 44t233 -44t196 -121 q10 -10 10 -23q0 -18 -75.5 -93t-93.5 -75zM1567 556q-11 0 -23 8q-136 105 -252 154.5t-268 49.5q-85 0 -170.5 -22t-149 -53t-113.5 -62t-79 -53t-31 -22q-17 0 -92 75t-75 93q0 12 10 22q132 132 320 205t380 73t380 -73t320 -205q10 -10 10 -22q0 -18 -75 -93t-92 -75z M1838 827q-11 0 -22 9q-179 157 -371.5 236.5t-420.5 79.5t-420.5 -79.5t-371.5 -236.5q-11 -9 -22 -9q-17 0 -92.5 75t-75.5 93q0 13 10 23q187 186 445 288t527 102t527 -102t445 -288q10 -10 10 -23q0 -18 -75.5 -93t-92.5 -75z" />
+<glyph unicode="&#xf1ec;" horiz-adv-x="1792" d="M384 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5 t37.5 90.5zM384 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 768q0 53 -37.5 90.5t-90.5 37.5 t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1536 0v384q0 52 -38 90t-90 38t-90 -38t-38 -90v-384q0 -52 38 -90t90 -38t90 38t38 90zM1152 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z M1536 1088v256q0 26 -19 45t-45 19h-1280q-26 0 -45 -19t-19 -45v-256q0 -26 19 -45t45 -19h1280q26 0 45 19t19 45zM1536 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1408v-1536q0 -52 -38 -90t-90 -38 h-1408q-52 0 -90 38t-38 90v1536q0 52 38 90t90 38h1408q52 0 90 -38t38 -90z" />
+<glyph unicode="&#xf1ed;" d="M1519 890q18 -84 -4 -204q-87 -444 -565 -444h-44q-25 0 -44 -16.5t-24 -42.5l-4 -19l-55 -346l-2 -15q-5 -26 -24.5 -42.5t-44.5 -16.5h-251q-21 0 -33 15t-9 36q9 56 26.5 168t26.5 168t27 167.5t27 167.5q5 37 43 37h131q133 -2 236 21q175 39 287 144q102 95 155 246 q24 70 35 133q1 6 2.5 7.5t3.5 1t6 -3.5q79 -59 98 -162zM1347 1172q0 -107 -46 -236q-80 -233 -302 -315q-113 -40 -252 -42q0 -1 -90 -1l-90 1q-100 0 -118 -96q-2 -8 -85 -530q-1 -10 -12 -10h-295q-22 0 -36.5 16.5t-11.5 38.5l232 1471q5 29 27.5 48t51.5 19h598 q34 0 97.5 -13t111.5 -32q107 -41 163.5 -123t56.5 -196z" />
+<glyph unicode="&#xf1ee;" horiz-adv-x="1792" d="M602 949q19 -61 31 -123.5t17 -141.5t-14 -159t-62 -145q-21 81 -67 157t-95.5 127t-99 90.5t-78.5 57.5t-33 19q-62 34 -81.5 100t14.5 128t101 81.5t129 -14.5q138 -83 238 -177zM927 1236q11 -25 20.5 -46t36.5 -100.5t42.5 -150.5t25.5 -179.5t0 -205.5t-47.5 -209.5 t-105.5 -208.5q-51 -72 -138 -72q-54 0 -98 31q-57 40 -69 109t28 127q60 85 81 195t13 199.5t-32 180.5t-39 128t-22 52q-31 63 -8.5 129.5t85.5 97.5q34 17 75 17q47 0 88.5 -25t63.5 -69zM1248 567q-17 -160 -72 -311q-17 131 -63 246q25 174 -5 361q-27 178 -94 342 q114 -90 212 -211q9 -37 15 -80q26 -179 7 -347zM1520 1440q9 -17 23.5 -49.5t43.5 -117.5t50.5 -178t34 -227.5t5 -269t-47 -300t-112.5 -323.5q-22 -48 -66 -75.5t-95 -27.5q-39 0 -74 16q-67 31 -92.5 100t4.5 136q58 126 90 257.5t37.5 239.5t-3.5 213.5t-26.5 180.5 t-38.5 138.5t-32.5 90t-15.5 32.5q-34 65 -11.5 135.5t87.5 104.5q37 20 81 20q49 0 91.5 -25.5t66.5 -70.5z" />
+<glyph unicode="&#xf1f0;" horiz-adv-x="2304" d="M1975 546h-138q14 37 66 179l3 9q4 10 10 26t9 26l12 -55zM531 611l-58 295q-11 54 -75 54h-268l-2 -13q311 -79 403 -336zM710 960l-162 -438l-17 89q-26 70 -85 129.5t-131 88.5l135 -510h175l261 641h-176zM849 318h166l104 642h-166zM1617 944q-69 27 -149 27 q-123 0 -201 -59t-79 -153q-1 -102 145 -174q48 -23 67 -41t19 -39q0 -30 -30 -46t-69 -16q-86 0 -156 33l-22 11l-23 -144q74 -34 185 -34q130 -1 208.5 59t80.5 160q0 106 -140 174q-49 25 -71 42t-22 38q0 22 24.5 38.5t70.5 16.5q70 1 124 -24l15 -8zM2042 960h-128 q-65 0 -87 -54l-246 -588h174l35 96h212q5 -22 20 -96h154zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+<glyph unicode="&#xf1f1;" horiz-adv-x="2304" d="M671 603h-13q-47 0 -47 -32q0 -22 20 -22q17 0 28 15t12 39zM1066 639h62v3q1 4 0.5 6.5t-1 7t-2 8t-4.5 6.5t-7.5 5t-11.5 2q-28 0 -36 -38zM1606 603h-12q-48 0 -48 -32q0 -22 20 -22q17 0 28 15t12 39zM1925 629q0 41 -30 41q-19 0 -31 -20t-12 -51q0 -42 28 -42 q20 0 32.5 20t12.5 52zM480 770h87l-44 -262h-56l32 201l-71 -201h-39l-4 200l-34 -200h-53l44 262h81l2 -163zM733 663q0 -6 -4 -42q-16 -101 -17 -113h-47l1 22q-20 -26 -58 -26q-23 0 -37.5 16t-14.5 42q0 39 26 60.5t73 21.5q14 0 23 -1q0 3 0.5 5.5t1 4.5t0.5 3 q0 20 -36 20q-29 0 -59 -10q0 4 7 48q38 11 67 11q74 0 74 -62zM889 721l-8 -49q-22 3 -41 3q-27 0 -27 -17q0 -8 4.5 -12t21.5 -11q40 -19 40 -60q0 -72 -87 -71q-34 0 -58 6q0 2 7 49q29 -8 51 -8q32 0 32 19q0 7 -4.5 11.5t-21.5 12.5q-43 20 -43 59q0 72 84 72 q30 0 50 -4zM977 721h28l-7 -52h-29q-2 -17 -6.5 -40.5t-7 -38.5t-2.5 -18q0 -16 19 -16q8 0 16 2l-8 -47q-21 -7 -40 -7q-43 0 -45 47q0 12 8 56q3 20 25 146h55zM1180 648q0 -23 -7 -52h-111q-3 -22 10 -33t38 -11q30 0 58 14l-9 -54q-30 -8 -57 -8q-95 0 -95 95 q0 55 27.5 90.5t69.5 35.5q35 0 55.5 -21t20.5 -56zM1319 722q-13 -23 -22 -62q-22 2 -31 -24t-25 -128h-56l3 14q22 130 29 199h51l-3 -33q14 21 25.5 29.5t28.5 4.5zM1506 763l-9 -57q-28 14 -50 14q-31 0 -51 -27.5t-20 -70.5q0 -30 13.5 -47t38.5 -17q21 0 48 13 l-10 -59q-28 -8 -50 -8q-45 0 -71.5 30.5t-26.5 82.5q0 70 35.5 114.5t91.5 44.5q26 0 61 -13zM1668 663q0 -18 -4 -42q-13 -79 -17 -113h-46l1 22q-20 -26 -59 -26q-23 0 -37 16t-14 42q0 39 25.5 60.5t72.5 21.5q15 0 23 -1q2 7 2 13q0 20 -36 20q-29 0 -59 -10q0 4 8 48 q38 11 67 11q73 0 73 -62zM1809 722q-14 -24 -21 -62q-23 2 -31.5 -23t-25.5 -129h-56l3 14q19 104 29 199h52q0 -11 -4 -33q15 21 26.5 29.5t27.5 4.5zM1950 770h56l-43 -262h-53l3 19q-23 -23 -52 -23q-31 0 -49.5 24t-18.5 64q0 53 27.5 92t64.5 39q31 0 53 -29z M2061 640q0 148 -72.5 273t-198 198t-273.5 73q-181 0 -328 -110q127 -116 171 -284h-50q-44 150 -158 253q-114 -103 -158 -253h-50q44 168 171 284q-147 110 -328 110q-148 0 -273.5 -73t-198 -198t-72.5 -273t72.5 -273t198 -198t273.5 -73q181 0 328 110 q-120 111 -165 264h50q46 -138 152 -233q106 95 152 233h50q-45 -153 -165 -264q147 -110 328 -110q148 0 273.5 73t198 198t72.5 273zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+<glyph unicode="&#xf1f2;" horiz-adv-x="2304" d="M313 759q0 -51 -36 -84q-29 -26 -89 -26h-17v220h17q61 0 89 -27q36 -31 36 -83zM2089 824q0 -52 -64 -52h-19v101h20q63 0 63 -49zM380 759q0 74 -50 120.5t-129 46.5h-95v-333h95q74 0 119 38q60 51 60 128zM410 593h65v333h-65v-333zM730 694q0 40 -20.5 62t-75.5 42 q-29 10 -39.5 19t-10.5 23q0 16 13.5 26.5t34.5 10.5q29 0 53 -27l34 44q-41 37 -98 37q-44 0 -74 -27.5t-30 -67.5q0 -35 18 -55.5t64 -36.5q37 -13 45 -19q19 -12 19 -34q0 -20 -14 -33.5t-36 -13.5q-48 0 -71 44l-42 -40q44 -64 115 -64q51 0 83 30.5t32 79.5zM1008 604 v77q-37 -37 -78 -37q-49 0 -80.5 32.5t-31.5 82.5q0 48 31.5 81.5t77.5 33.5q43 0 81 -38v77q-40 20 -80 20q-74 0 -125.5 -50.5t-51.5 -123.5t51 -123.5t125 -50.5q42 0 81 19zM2240 0v527q-65 -40 -144.5 -84t-237.5 -117t-329.5 -137.5t-417.5 -134.5t-504 -118h1569 q26 0 45 19t19 45zM1389 757q0 75 -53 128t-128 53t-128 -53t-53 -128t53 -128t128 -53t128 53t53 128zM1541 584l144 342h-71l-90 -224l-89 224h-71l142 -342h35zM1714 593h184v56h-119v90h115v56h-115v74h119v57h-184v-333zM2105 593h80l-105 140q76 16 76 94q0 47 -31 73 t-87 26h-97v-333h65v133h9zM2304 1274v-1268q0 -56 -38.5 -95t-93.5 -39h-2040q-55 0 -93.5 39t-38.5 95v1268q0 56 38.5 95t93.5 39h2040q55 0 93.5 -39t38.5 -95z" />
+<glyph unicode="&#xf1f3;" horiz-adv-x="2304" d="M119 854h89l-45 108zM740 328l74 79l-70 79h-163v-49h142v-55h-142v-54h159zM898 406l99 -110v217zM1186 453q0 33 -40 33h-84v-69h83q41 0 41 36zM1475 457q0 29 -42 29h-82v-61h81q43 0 43 32zM1197 923q0 29 -42 29h-82v-60h81q43 0 43 31zM1656 854h89l-44 108z M699 1009v-271h-66v212l-94 -212h-57l-94 212v-212h-132l-25 60h-135l-25 -60h-70l116 271h96l110 -257v257h106l85 -184l77 184h108zM1255 453q0 -20 -5.5 -35t-14 -25t-22.5 -16.5t-26 -10t-31.5 -4.5t-31.5 -1t-32.5 0.5t-29.5 0.5v-91h-126l-80 90l-83 -90h-256v271h260 l80 -89l82 89h207q109 0 109 -89zM964 794v-56h-217v271h217v-57h-152v-49h148v-55h-148v-54h152zM2304 235v-229q0 -55 -38.5 -94.5t-93.5 -39.5h-2040q-55 0 -93.5 39.5t-38.5 94.5v678h111l25 61h55l25 -61h218v46l19 -46h113l20 47v-47h541v99l10 1q10 0 10 -14v-86h279 v23q23 -12 55 -18t52.5 -6.5t63 0.5t51.5 1l25 61h56l25 -61h227v58l34 -58h182v378h-180v-44l-25 44h-185v-44l-23 44h-249q-69 0 -109 -22v22h-172v-22q-24 22 -73 22h-628l-43 -97l-43 97h-198v-44l-22 44h-169l-78 -179v391q0 55 38.5 94.5t93.5 39.5h2040 q55 0 93.5 -39.5t38.5 -94.5v-678h-120q-51 0 -81 -22v22h-177q-55 0 -78 -22v22h-316v-22q-31 22 -87 22h-209v-22q-23 22 -91 22h-234l-54 -58l-50 58h-349v-378h343l55 59l52 -59h211v89h21q59 0 90 13v-102h174v99h8q8 0 10 -2t2 -10v-87h529q57 0 88 24v-24h168 q60 0 95 17zM1546 469q0 -23 -12 -43t-34 -29q25 -9 34 -26t9 -46v-54h-65v45q0 33 -12 43.5t-46 10.5h-69v-99h-65v271h154q48 0 77 -15t29 -58zM1269 936q0 -24 -12.5 -44t-33.5 -29q26 -9 34.5 -25.5t8.5 -46.5v-53h-65q0 9 0.5 26.5t0 25t-3 18.5t-8.5 16t-17.5 8.5 t-29.5 3.5h-70v-98h-64v271l153 -1q49 0 78 -14.5t29 -57.5zM1798 327v-56h-216v271h216v-56h-151v-49h148v-55h-148v-54zM1372 1009v-271h-66v271h66zM2065 357q0 -86 -102 -86h-126v58h126q34 0 34 25q0 16 -17 21t-41.5 5t-49.5 3.5t-42 22.5t-17 55q0 39 26 60t66 21 h130v-57h-119q-36 0 -36 -25q0 -16 17.5 -20.5t42 -4t49 -2.5t42 -21.5t17.5 -54.5zM2304 407v-101q-24 -35 -88 -35h-125v58h125q33 0 33 25q0 13 -12.5 19t-31 5.5t-40 2t-40 8t-31 24t-12.5 48.5q0 39 26.5 60t66.5 21h129v-57h-118q-36 0 -36 -25q0 -20 29 -22t68.5 -5 t56.5 -26zM2139 1008v-270h-92l-122 203v-203h-132l-26 60h-134l-25 -60h-75q-129 0 -129 133q0 138 133 138h63v-59q-7 0 -28 1t-28.5 0.5t-23 -2t-21.5 -6.5t-14.5 -13.5t-11.5 -23t-3 -33.5q0 -38 13.5 -58t49.5 -20h29l92 213h97l109 -256v256h99l114 -188v188h66z" />
+<glyph unicode="&#xf1f4;" horiz-adv-x="2304" d="M745 630q0 -37 -25.5 -61.5t-62.5 -24.5q-29 0 -46.5 16t-17.5 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM1530 779q0 -42 -22 -57t-66 -15l-32 -1l17 107q2 11 13 11h18q22 0 35 -2t25 -12.5t12 -30.5zM1881 630q0 -36 -25.5 -61t-61.5 -25q-29 0 -47 16 t-18 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM513 801q0 59 -38.5 85.5t-100.5 26.5h-160q-19 0 -21 -19l-65 -408q-1 -6 3 -11t10 -5h76q20 0 22 19l18 110q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM822 489l41 261q1 6 -3 11t-10 5h-76 q-14 0 -17 -33q-27 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q28 0 58 12t48 32q-4 -12 -4 -21q0 -16 13 -16h69q19 0 22 19zM1269 752q0 5 -4 9.5t-9 4.5h-77q-11 0 -18 -10l-106 -156l-44 150q-5 16 -22 16h-75q-5 0 -9 -4.5t-4 -9.5q0 -2 19.5 -59 t42 -123t23.5 -70q-82 -112 -82 -120q0 -13 13 -13h77q11 0 18 10l255 368q2 2 2 7zM1649 801q0 59 -38.5 85.5t-100.5 26.5h-159q-20 0 -22 -19l-65 -408q-1 -6 3 -11t10 -5h82q12 0 16 13l18 116q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM1958 489 l41 261q1 6 -3 11t-10 5h-76q-14 0 -17 -33q-26 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q29 0 59 12t47 32q0 -1 -2 -9t-2 -12q0 -16 13 -16h69q19 0 22 19zM2176 898v1q0 14 -13 14h-74q-11 0 -13 -11l-65 -416l-1 -2q0 -5 4 -9.5t10 -4.5h66 q19 0 21 19zM392 764q-5 -35 -26 -46t-60 -11l-33 -1l17 107q2 11 13 11h19q40 0 58 -11.5t12 -48.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+<glyph unicode="&#xf1f5;" horiz-adv-x="2304" d="M1597 633q0 -69 -21 -106q-19 -35 -52 -35q-23 0 -41 9v224q29 30 57 30q57 0 57 -122zM2035 669h-110q6 98 56 98q51 0 54 -98zM476 534q0 59 -33 91.5t-101 57.5q-36 13 -52 24t-16 25q0 26 38 26q58 0 124 -33l18 112q-67 32 -149 32q-77 0 -123 -38q-48 -39 -48 -109 q0 -58 32.5 -90.5t99.5 -56.5q39 -14 54.5 -25.5t15.5 -27.5q0 -31 -48 -31q-29 0 -70 12.5t-72 30.5l-18 -113q72 -41 168 -41q81 0 129 37q51 41 51 117zM771 749l19 111h-96v135l-129 -21l-18 -114l-46 -8l-17 -103h62v-219q0 -84 44 -120q38 -30 111 -30q32 0 79 11v118 q-32 -7 -44 -7q-42 0 -42 50v197h77zM1087 724v139q-15 3 -28 3q-32 0 -55.5 -16t-33.5 -46l-10 56h-131v-471h150v306q26 31 82 31q16 0 26 -2zM1124 389h150v471h-150v-471zM1746 638q0 122 -45 179q-40 52 -111 52q-64 0 -117 -56l-8 47h-132v-645l150 25v151 q36 -11 68 -11q83 0 134 56q61 65 61 202zM1278 986q0 33 -23 56t-56 23t-56 -23t-23 -56t23 -56.5t56 -23.5t56 23.5t23 56.5zM2176 629q0 113 -48 176q-50 64 -144 64q-96 0 -151.5 -66t-55.5 -180q0 -128 63 -188q55 -55 161 -55q101 0 160 40l-16 103q-57 -31 -128 -31 q-43 0 -63 19q-23 19 -28 66h248q2 14 2 52zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+<glyph unicode="&#xf1f6;" horiz-adv-x="2048" d="M1558 684q61 -356 298 -556q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5zM1024 -176q16 0 16 16t-16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5zM2026 1424q8 -10 7.5 -23.5t-10.5 -22.5 l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5 l418 363q10 8 23.5 7t21.5 -11z" />
+<glyph unicode="&#xf1f7;" horiz-adv-x="2048" d="M1040 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM503 315l877 760q-42 88 -132.5 146.5t-223.5 58.5q-93 0 -169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -384 -137 -645zM1856 128 q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5l149 129h757q-166 187 -227 459l111 97q61 -356 298 -556zM1942 1520l84 -96q8 -10 7.5 -23.5t-10.5 -22.5l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161 q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5l418 363q10 8 23.5 7t21.5 -11z" />
+<glyph unicode="&#xf1f8;" horiz-adv-x="1408" d="M512 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM768 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1024 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704 q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167 q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf1f9;" d="M1150 462v-109q0 -50 -36.5 -89t-94 -60.5t-118 -32.5t-117.5 -11q-205 0 -342.5 139t-137.5 346q0 203 136 339t339 136q34 0 75.5 -4.5t93 -18t92.5 -34t69 -56.5t28 -81v-109q0 -16 -16 -16h-118q-16 0 -16 16v70q0 43 -65.5 67.5t-137.5 24.5q-140 0 -228.5 -91.5 t-88.5 -237.5q0 -151 91.5 -249.5t233.5 -98.5q68 0 138 24t70 66v70q0 7 4.5 11.5t10.5 4.5h119q6 0 11 -4.5t5 -11.5zM768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5 t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf1fa;" d="M972 761q0 108 -53.5 169t-147.5 61q-63 0 -124 -30.5t-110 -84.5t-79.5 -137t-30.5 -180q0 -112 53.5 -173t150.5 -61q96 0 176 66.5t122.5 166t42.5 203.5zM1536 640q0 -111 -37 -197t-98.5 -135t-131.5 -74.5t-145 -27.5q-6 0 -15.5 -0.5t-16.5 -0.5q-95 0 -142 53 q-28 33 -33 83q-52 -66 -131.5 -110t-173.5 -44q-161 0 -249.5 95.5t-88.5 269.5q0 157 66 290t179 210.5t246 77.5q87 0 155 -35.5t106 -99.5l2 19l11 56q1 6 5.5 12t9.5 6h118q5 0 13 -11q5 -5 3 -16l-120 -614q-5 -24 -5 -48q0 -39 12.5 -52t44.5 -13q28 1 57 5.5t73 24 t77 50t57 89.5t24 137q0 292 -174 466t-466 174q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51q228 0 405 144q11 9 24 8t21 -12l41 -49q8 -12 7 -24q-2 -13 -12 -22q-102 -83 -227.5 -128t-258.5 -45q-156 0 -298 61 t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q344 0 556 -212t212 -556z" />
+<glyph unicode="&#xf1fb;" horiz-adv-x="1792" d="M1698 1442q94 -94 94 -226.5t-94 -225.5l-225 -223l104 -104q10 -10 10 -23t-10 -23l-210 -210q-10 -10 -23 -10t-23 10l-105 105l-603 -603q-37 -37 -90 -37h-203l-256 -128l-64 64l128 256v203q0 53 37 90l603 603l-105 105q-10 10 -10 23t10 23l210 210q10 10 23 10 t23 -10l104 -104l223 225q93 94 225.5 94t226.5 -94zM512 64l576 576l-192 192l-576 -576v-192h192z" />
+<glyph unicode="&#xf1fc;" horiz-adv-x="1792" d="M1615 1536q70 0 122.5 -46.5t52.5 -116.5q0 -63 -45 -151q-332 -629 -465 -752q-97 -91 -218 -91q-126 0 -216.5 92.5t-90.5 219.5q0 128 92 212l638 579q59 54 130 54zM706 502q39 -76 106.5 -130t150.5 -76l1 -71q4 -213 -129.5 -347t-348.5 -134q-123 0 -218 46.5 t-152.5 127.5t-86.5 183t-29 220q7 -5 41 -30t62 -44.5t59 -36.5t46 -17q41 0 55 37q25 66 57.5 112.5t69.5 76t88 47.5t103 25.5t125 10.5z" />
+<glyph unicode="&#xf1fd;" horiz-adv-x="1792" d="M1792 128v-384h-1792v384q45 0 85 14t59 27.5t47 37.5q30 27 51.5 38t56.5 11t55.5 -11t52.5 -38q29 -25 47 -38t58 -27t86 -14q45 0 85 14.5t58 27t48 37.5q21 19 32.5 27t31 15t43.5 7q35 0 56.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14t85 14t59 27.5t47 37.5 q30 27 51.5 38t56.5 11q34 0 55.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14zM1792 448v-192q-35 0 -55.5 11t-52.5 38q-29 25 -47 38t-58 27t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-22 -19 -33 -27t-31 -15t-44 -7q-35 0 -56.5 11t-51.5 38q-29 25 -47 38t-58 27 t-86 14q-45 0 -85 -14.5t-58 -27t-48 -37.5q-21 -19 -32.5 -27t-31 -15t-43.5 -7q-35 0 -56.5 11t-51.5 38q-28 24 -47 37.5t-59 27.5t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-30 -27 -51.5 -38t-56.5 -11v192q0 80 56 136t136 56h64v448h256v-448h256v448h256v-448h256v448 h256v-448h64q80 0 136 -56t56 -136zM512 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1024 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51 t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1536 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150z" />
+<glyph unicode="&#xf1fe;" horiz-adv-x="2048" d="M2048 0v-128h-2048v1536h128v-1408h1920zM1664 1024l256 -896h-1664v576l448 576l576 -576z" />
+<glyph unicode="&#xf200;" horiz-adv-x="1792" d="M768 646l546 -546q-106 -108 -247.5 -168t-298.5 -60q-209 0 -385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103v-762zM955 640h773q0 -157 -60 -298.5t-168 -247.5zM1664 768h-768v768q209 0 385.5 -103t279.5 -279.5t103 -385.5z" />
+<glyph unicode="&#xf201;" horiz-adv-x="2048" d="M2048 0v-128h-2048v1536h128v-1408h1920zM1920 1248v-435q0 -21 -19.5 -29.5t-35.5 7.5l-121 121l-633 -633q-10 -10 -23 -10t-23 10l-233 233l-416 -416l-192 192l585 585q10 10 23 10t23 -10l233 -233l464 464l-121 121q-16 16 -7.5 35.5t29.5 19.5h435q14 0 23 -9 t9 -23z" />
+<glyph unicode="&#xf202;" horiz-adv-x="1792" d="M1292 832q0 -6 10 -41q10 -29 25 -49.5t41 -34t44 -20t55 -16.5q325 -91 325 -332q0 -146 -105.5 -242.5t-254.5 -96.5q-59 0 -111.5 18.5t-91.5 45.5t-77 74.5t-63 87.5t-53.5 103.5t-43.5 103t-39.5 106.5t-35.5 95q-32 81 -61.5 133.5t-73.5 96.5t-104 64t-142 20 q-96 0 -183 -55.5t-138 -144.5t-51 -185q0 -160 106.5 -279.5t263.5 -119.5q177 0 258 95q56 63 83 116l84 -152q-15 -34 -44 -70l1 -1q-131 -152 -388 -152q-147 0 -269.5 79t-190.5 207.5t-68 274.5q0 105 43.5 206t116 176.5t172 121.5t204.5 46q87 0 159 -19t123.5 -50 t95 -80t72.5 -99t58.5 -117t50.5 -124.5t50 -130.5t55 -127q96 -200 233 -200q81 0 138.5 48.5t57.5 128.5q0 42 -19 72t-50.5 46t-72.5 31.5t-84.5 27t-87.5 34t-81 52t-65 82t-39 122.5q-3 16 -3 33q0 110 87.5 192t198.5 78q78 -3 120.5 -14.5t90.5 -53.5h-1 q12 -11 23 -24.5t26 -36t19 -27.5l-129 -99q-26 49 -54 70v1q-23 21 -97 21q-49 0 -84 -33t-35 -83z" />
+<glyph unicode="&#xf203;" d="M1432 484q0 173 -234 239q-35 10 -53 16.5t-38 25t-29 46.5q0 2 -2 8.5t-3 12t-1 7.5q0 36 24.5 59.5t60.5 23.5q54 0 71 -15h-1q20 -15 39 -51l93 71q-39 54 -49 64q-33 29 -67.5 39t-85.5 10q-80 0 -142 -57.5t-62 -137.5q0 -7 2 -23q16 -96 64.5 -140t148.5 -73 q29 -8 49 -15.5t45 -21.5t38.5 -34.5t13.5 -46.5v-5q1 -58 -40.5 -93t-100.5 -35q-97 0 -167 144q-23 47 -51.5 121.5t-48 125.5t-54 110.5t-74 95.5t-103.5 60.5t-147 24.5q-101 0 -192 -56t-144 -148t-50 -192v-1q4 -108 50.5 -199t133.5 -147.5t196 -56.5q186 0 279 110 q20 27 31 51l-60 109q-42 -80 -99 -116t-146 -36q-115 0 -191 87t-76 204q0 105 82 189t186 84q112 0 170 -53.5t104 -172.5q8 -21 25.5 -68.5t28.5 -76.5t31.5 -74.5t38.5 -74t45.5 -62.5t55.5 -53.5t66 -33t80 -13.5q107 0 183 69.5t76 174.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf204;" horiz-adv-x="2048" d="M1152 640q0 104 -40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM1920 640q0 104 -40.5 198.5 t-109.5 163.5t-163.5 109.5t-198.5 40.5h-386q119 -90 188.5 -224t69.5 -288t-69.5 -288t-188.5 -224h386q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM2048 640q0 -130 -51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5 t-136.5 204t-51 248.5t51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5z" />
+<glyph unicode="&#xf205;" horiz-adv-x="2048" d="M0 640q0 130 51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5t-51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5t-136.5 204t-51 248.5zM1408 128q104 0 198.5 40.5t163.5 109.5 t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5z" />
+<glyph unicode="&#xf206;" horiz-adv-x="2304" d="M762 384h-314q-40 0 -57.5 35t6.5 67l188 251q-65 31 -137 31q-132 0 -226 -94t-94 -226t94 -226t226 -94q115 0 203 72.5t111 183.5zM576 512h186q-18 85 -75 148zM1056 512l288 384h-480l-99 -132q105 -103 126 -252h165zM2176 448q0 132 -94 226t-226 94 q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94t226 94t94 226zM2304 448q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 97 39.5 183.5t109.5 149.5l-65 98l-353 -469 q-18 -26 -51 -26h-197q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q114 0 215 -55l137 183h-224q-26 0 -45 19t-19 45t19 45t45 19h384v-128h435l-85 128h-222q-26 0 -45 19t-19 45t19 45t45 19h256q33 0 53 -28l267 -400 q91 44 192 44q185 0 316.5 -131.5t131.5 -316.5z" />
+<glyph unicode="&#xf207;" d="M384 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1362 716l-72 384q-5 23 -22.5 37.5t-40.5 14.5 h-918q-23 0 -40.5 -14.5t-22.5 -37.5l-72 -384q-5 -30 14 -53t49 -23h1062q30 0 49 23t14 53zM1136 1328q0 20 -14 34t-34 14h-640q-20 0 -34 -14t-14 -34t14 -34t34 -14h640q20 0 34 14t14 34zM1536 603v-603h-128v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5v128h-768v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5v128h-128v603q0 112 25 223l103 454q9 78 97.5 137t230 89t312.5 30t312.5 -30t230 -89t97.5 -137l105 -454q23 -102 23 -223z" />
+<glyph unicode="&#xf208;" horiz-adv-x="2048" d="M1463 704q0 -35 -25 -60.5t-61 -25.5h-702q-36 0 -61 25.5t-25 60.5t25 60.5t61 25.5h702q36 0 61 -25.5t25 -60.5zM1677 704q0 86 -23 170h-982q-36 0 -61 25t-25 60q0 36 25 61t61 25h908q-88 143 -235 227t-320 84q-177 0 -327.5 -87.5t-238 -237.5t-87.5 -327 q0 -86 23 -170h982q36 0 61 -25t25 -60q0 -36 -25 -61t-61 -25h-908q88 -143 235.5 -227t320.5 -84q132 0 253 51.5t208 139t139 208t52 253.5zM2048 959q0 -35 -25 -60t-61 -25h-131q17 -85 17 -170q0 -167 -65.5 -319.5t-175.5 -263t-262.5 -176t-319.5 -65.5 q-246 0 -448.5 133t-301.5 350h-189q-36 0 -61 25t-25 61q0 35 25 60t61 25h132q-17 85 -17 170q0 167 65.5 319.5t175.5 263t262.5 176t320.5 65.5q245 0 447.5 -133t301.5 -350h188q36 0 61 -25t25 -61z" />
+<glyph unicode="&#xf209;" horiz-adv-x="1280" d="M953 1158l-114 -328l117 -21q165 451 165 518q0 56 -38 56q-57 0 -130 -225zM654 471l33 -88q37 42 71 67l-33 5.5t-38.5 7t-32.5 8.5zM362 1367q0 -98 159 -521q18 10 49 10q15 0 75 -5l-121 351q-75 220 -123 220q-19 0 -29 -17.5t-10 -37.5zM283 608q0 -36 51.5 -119 t117.5 -153t100 -70q14 0 25.5 13t11.5 27q0 24 -32 102q-13 32 -32 72t-47.5 89t-61.5 81t-62 32q-20 0 -45.5 -27t-25.5 -47zM125 273q0 -41 25 -104q59 -145 183.5 -227t281.5 -82q227 0 382 170q152 169 152 427q0 43 -1 67t-11.5 62t-30.5 56q-56 49 -211.5 75.5 t-270.5 26.5q-37 0 -49 -11q-12 -5 -12 -35q0 -34 21.5 -60t55.5 -40t77.5 -23.5t87.5 -11.5t85 -4t70 0h23q24 0 40 -19q15 -19 19 -55q-28 -28 -96 -54q-61 -22 -93 -46q-64 -46 -108.5 -114t-44.5 -137q0 -31 18.5 -88.5t18.5 -87.5l-3 -12q-4 -12 -4 -14 q-137 10 -146 216q-8 -2 -41 -2q2 -7 2 -21q0 -53 -40.5 -89.5t-94.5 -36.5q-82 0 -166.5 78t-84.5 159q0 34 33 67q52 -64 60 -76q77 -104 133 -104q12 0 26.5 8.5t14.5 20.5q0 34 -87.5 145t-116.5 111q-43 0 -70 -44.5t-27 -90.5zM11 264q0 101 42.5 163t136.5 88 q-28 74 -28 104q0 62 61 123t122 61q29 0 70 -15q-163 462 -163 567q0 80 41 130.5t119 50.5q131 0 325 -581q6 -17 8 -23q6 16 29 79.5t43.5 118.5t54 127.5t64.5 123t70.5 86.5t76.5 36q71 0 112 -49t41 -122q0 -108 -159 -550q61 -15 100.5 -46t58.5 -78t26 -93.5 t7 -110.5q0 -150 -47 -280t-132 -225t-211 -150t-278 -55q-111 0 -223 42q-149 57 -258 191.5t-109 286.5z" />
+<glyph unicode="&#xf20a;" horiz-adv-x="2048" d="M785 528h207q-14 -158 -98.5 -248.5t-214.5 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-203q-5 64 -35.5 99t-81.5 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t40 -51.5t66 -18q95 0 109 139zM1497 528h206 q-14 -158 -98 -248.5t-214 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-204q-4 64 -35 99t-81 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t39.5 -51.5t65.5 -18q49 0 76.5 38t33.5 101zM1856 647q0 207 -15.5 307 t-60.5 161q-6 8 -13.5 14t-21.5 15t-16 11q-86 63 -697 63q-625 0 -710 -63q-5 -4 -17.5 -11.5t-21 -14t-14.5 -14.5q-45 -60 -60 -159.5t-15 -308.5q0 -208 15 -307.5t60 -160.5q6 -8 15 -15t20.5 -14t17.5 -12q44 -33 239.5 -49t470.5 -16q610 0 697 65q5 4 17 11t20.5 14 t13.5 16q46 60 61 159t15 309zM2048 1408v-1536h-2048v1536h2048z" />
+<glyph unicode="&#xf20b;" d="M992 912v-496q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v496q0 112 -80 192t-192 80h-272v-1152q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v1344q0 14 9 23t23 9h464q135 0 249 -66.5t180.5 -180.5t66.5 -249zM1376 1376v-880q0 -135 -66.5 -249t-180.5 -180.5 t-249 -66.5h-464q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h160q14 0 23 -9t9 -23v-768h272q112 0 192 80t80 192v880q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
+<glyph unicode="&#xf20c;" d="M1311 694v-114q0 -24 -13.5 -38t-37.5 -14h-202q-24 0 -38 14t-14 38v114q0 24 14 38t38 14h202q24 0 37.5 -14t13.5 -38zM821 464v250q0 53 -32.5 85.5t-85.5 32.5h-133q-68 0 -96 -52q-28 52 -96 52h-130q-53 0 -85.5 -32.5t-32.5 -85.5v-250q0 -22 21 -22h55 q22 0 22 22v230q0 24 13.5 38t38.5 14h94q24 0 38 -14t14 -38v-230q0 -22 21 -22h54q22 0 22 22v230q0 24 14 38t38 14h97q24 0 37.5 -14t13.5 -38v-230q0 -22 22 -22h55q21 0 21 22zM1410 560v154q0 53 -33 85.5t-86 32.5h-264q-53 0 -86 -32.5t-33 -85.5v-410 q0 -21 22 -21h55q21 0 21 21v180q31 -42 94 -42h191q53 0 86 32.5t33 85.5zM1536 1176v-1072q0 -96 -68 -164t-164 -68h-1072q-96 0 -164 68t-68 164v1072q0 96 68 164t164 68h1072q96 0 164 -68t68 -164z" />
+<glyph unicode="&#xf20d;" d="M915 450h-294l147 551zM1001 128h311l-324 1024h-440l-324 -1024h311l383 314zM1536 1120v-960q0 -118 -85 -203t-203 -85h-960q-118 0 -203 85t-85 203v960q0 118 85 203t203 85h960q118 0 203 -85t85 -203z" />
+<glyph unicode="&#xf20e;" horiz-adv-x="2048" d="M2048 641q0 -21 -13 -36.5t-33 -19.5l-205 -356q3 -9 3 -18q0 -20 -12.5 -35.5t-32.5 -19.5l-193 -337q3 -8 3 -16q0 -23 -16.5 -40t-40.5 -17q-25 0 -41 18h-400q-17 -20 -43 -20t-43 20h-399q-17 -20 -43 -20q-23 0 -40 16.5t-17 40.5q0 8 4 20l-193 335 q-20 4 -32.5 19.5t-12.5 35.5q0 9 3 18l-206 356q-20 5 -32.5 20.5t-12.5 35.5q0 21 13.5 36.5t33.5 19.5l199 344q0 1 -0.5 3t-0.5 3q0 36 34 51l209 363q-4 10 -4 18q0 24 17 40.5t40 16.5q26 0 44 -21h396q16 21 43 21t43 -21h398q18 21 44 21q23 0 40 -16.5t17 -40.5 q0 -6 -4 -18l207 -358q23 -1 39 -17.5t16 -38.5q0 -13 -7 -27l187 -324q19 -4 31.5 -19.5t12.5 -35.5zM1063 -158h389l-342 354h-143l-342 -354h360q18 16 39 16t39 -16zM112 654q1 -4 1 -13q0 -10 -2 -15l208 -360q2 0 4.5 -1t5.5 -2.5l5 -2.5l188 199v347l-187 194 q-13 -8 -29 -10zM986 1438h-388l190 -200l554 200h-280q-16 -16 -38 -16t-38 16zM1689 226q1 6 5 11l-64 68l-17 -79h76zM1583 226l22 105l-252 266l-296 -307l63 -64h463zM1495 -142l16 28l65 310h-427l333 -343q8 4 13 5zM578 -158h5l342 354h-373v-335l4 -6q14 -5 22 -13 zM552 226h402l64 66l-309 321l-157 -166v-221zM359 226h163v189l-168 -177q4 -8 5 -12zM358 1051q0 -1 0.5 -2t0.5 -2q0 -16 -8 -29l171 -177v269zM552 1121v-311l153 -157l297 314l-223 236zM556 1425l-4 -8v-264l205 74l-191 201q-6 -2 -10 -3zM1447 1438h-16l-621 -224 l213 -225zM1023 946l-297 -315l311 -319l296 307zM688 634l-136 141v-284zM1038 270l-42 -44h85zM1374 618l238 -251l132 624l-3 5l-1 1zM1718 1018q-8 13 -8 29v2l-216 376q-5 1 -13 5l-437 -463l310 -327zM522 1142v223l-163 -282zM522 196h-163l163 -283v283zM1607 196 l-48 -227l130 227h-82zM1729 266l207 361q-2 10 -2 14q0 1 3 16l-171 296l-129 -612l77 -82q5 3 15 7z" />
+<glyph unicode="&#xf210;" d="M0 856q0 131 91.5 226.5t222.5 95.5h742l352 358v-1470q0 -132 -91.5 -227t-222.5 -95h-780q-131 0 -222.5 95t-91.5 227v790zM1232 102l-176 180v425q0 46 -32 79t-78 33h-484q-46 0 -78 -33t-32 -79v-492q0 -46 32.5 -79.5t77.5 -33.5h770z" />
+<glyph unicode="&#xf211;" d="M934 1386q-317 -121 -556 -362.5t-358 -560.5q-20 89 -20 176q0 208 102.5 384.5t278.5 279t384 102.5q82 0 169 -19zM1203 1267q93 -65 164 -155q-389 -113 -674.5 -400.5t-396.5 -676.5q-93 72 -155 162q112 386 395 671t667 399zM470 -67q115 356 379.5 622t619.5 384 q40 -92 54 -195q-292 -120 -516 -345t-343 -518q-103 14 -194 52zM1536 -125q-193 50 -367 115q-135 -84 -290 -107q109 205 274 370.5t369 275.5q-21 -152 -101 -284q65 -175 115 -370z" />
+<glyph unicode="&#xf212;" horiz-adv-x="2048" d="M1893 1144l155 -1272q-131 0 -257 57q-200 91 -393 91q-226 0 -374 -148q-148 148 -374 148q-193 0 -393 -91q-128 -57 -252 -57h-5l155 1272q224 127 482 127q233 0 387 -106q154 106 387 106q258 0 482 -127zM1398 157q129 0 232 -28.5t260 -93.5l-124 1021 q-171 78 -368 78q-224 0 -374 -141q-150 141 -374 141q-197 0 -368 -78l-124 -1021q105 43 165.5 65t148.5 39.5t178 17.5q202 0 374 -108q172 108 374 108zM1438 191l-55 907q-211 -4 -359 -155q-152 155 -374 155q-176 0 -336 -66l-114 -941q124 51 228.5 76t221.5 25 q209 0 374 -102q172 107 374 102z" />
+<glyph unicode="&#xf213;" horiz-adv-x="2048" d="M1500 165v733q0 21 -15 36t-35 15h-93q-20 0 -35 -15t-15 -36v-733q0 -20 15 -35t35 -15h93q20 0 35 15t15 35zM1216 165v531q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-531q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM924 165v429q0 20 -15 35t-35 15h-101 q-20 0 -35 -15t-15 -35v-429q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM632 165v362q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-362q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM2048 311q0 -166 -118 -284t-284 -118h-1244q-166 0 -284 118t-118 284 q0 116 63 214.5t168 148.5q-10 34 -10 73q0 113 80.5 193.5t193.5 80.5q102 0 180 -67q45 183 194 300t338 117q149 0 275 -73.5t199.5 -199.5t73.5 -275q0 -66 -14 -122q135 -33 221 -142.5t86 -247.5z" />
+<glyph unicode="&#xf214;" d="M0 1536h1536v-1392l-776 -338l-760 338v1392zM1436 209v926h-1336v-926l661 -294zM1436 1235v201h-1336v-201h1336zM181 937v-115h-37v115h37zM181 789v-115h-37v115h37zM181 641v-115h-37v115h37zM181 493v-115h-37v115h37zM181 345v-115h-37v115h37zM207 202l15 34 l105 -47l-15 -33zM343 142l15 34l105 -46l-15 -34zM478 82l15 34l105 -46l-15 -34zM614 23l15 33l104 -46l-15 -34zM797 10l105 46l15 -33l-105 -47zM932 70l105 46l15 -34l-105 -46zM1068 130l105 46l15 -34l-105 -46zM1203 189l105 47l15 -34l-105 -46zM259 1389v-36h-114 v36h114zM421 1389v-36h-115v36h115zM583 1389v-36h-115v36h115zM744 1389v-36h-114v36h114zM906 1389v-36h-114v36h114zM1068 1389v-36h-115v36h115zM1230 1389v-36h-115v36h115zM1391 1389v-36h-114v36h114zM181 1049v-79h-37v115h115v-36h-78zM421 1085v-36h-115v36h115z M583 1085v-36h-115v36h115zM744 1085v-36h-114v36h114zM906 1085v-36h-114v36h114zM1068 1085v-36h-115v36h115zM1230 1085v-36h-115v36h115zM1355 970v79h-78v36h115v-115h-37zM1355 822v115h37v-115h-37zM1355 674v115h37v-115h-37zM1355 526v115h37v-115h-37zM1355 378 v115h37v-115h-37zM1355 230v115h37v-115h-37zM760 265q-129 0 -221 91.5t-92 221.5q0 129 92 221t221 92q130 0 221.5 -92t91.5 -221q0 -130 -91.5 -221.5t-221.5 -91.5zM595 646q0 -36 19.5 -56.5t49.5 -25t64 -7t64 -2t49.5 -9t19.5 -30.5q0 -49 -112 -49q-97 0 -123 51 h-3l-31 -63q67 -42 162 -42q29 0 56.5 5t55.5 16t45.5 33t17.5 53q0 46 -27.5 69.5t-67.5 27t-79.5 3t-67 5t-27.5 25.5q0 21 20.5 33t40.5 15t41 3q34 0 70.5 -11t51.5 -34h3l30 58q-3 1 -21 8.5t-22.5 9t-19.5 7t-22 7t-20 4.5t-24 4t-23 1q-29 0 -56.5 -5t-54 -16.5 t-43 -34t-16.5 -53.5z" />
+<glyph unicode="&#xf215;" horiz-adv-x="2048" d="M863 504q0 112 -79.5 191.5t-191.5 79.5t-191 -79.5t-79 -191.5t79 -191t191 -79t191.5 79t79.5 191zM1726 505q0 112 -79 191t-191 79t-191.5 -79t-79.5 -191q0 -113 79.5 -192t191.5 -79t191 79.5t79 191.5zM2048 1314v-1348q0 -44 -31.5 -75.5t-76.5 -31.5h-1832 q-45 0 -76.5 31.5t-31.5 75.5v1348q0 44 31.5 75.5t76.5 31.5h431q44 0 76 -31.5t32 -75.5v-161h754v161q0 44 32 75.5t76 31.5h431q45 0 76.5 -31.5t31.5 -75.5z" />
+<glyph unicode="&#xf216;" horiz-adv-x="2048" d="M1430 953zM1690 749q148 0 253 -98.5t105 -244.5q0 -157 -109 -261.5t-267 -104.5q-85 0 -162 27.5t-138 73.5t-118 106t-109 126.5t-103.5 132.5t-108.5 126t-117 106t-136 73.5t-159 27.5q-154 0 -251.5 -91.5t-97.5 -244.5q0 -157 104 -250t263 -93q100 0 208 37.5 t193 98.5q5 4 21 18.5t30 24t22 9.5q14 0 24.5 -10.5t10.5 -24.5q0 -24 -60 -77q-101 -88 -234.5 -142t-260.5 -54q-133 0 -245.5 58t-180 165t-67.5 241q0 205 141.5 341t347.5 136q120 0 226.5 -43.5t185.5 -113t151.5 -153t139 -167.5t133.5 -153.5t149.5 -113 t172.5 -43.5q102 0 168.5 61.5t66.5 162.5q0 95 -64.5 159t-159.5 64q-30 0 -81.5 -18.5t-68.5 -18.5q-20 0 -35.5 15t-15.5 35q0 18 8.5 57t8.5 59q0 159 -107.5 263t-266.5 104q-58 0 -111.5 -18.5t-84 -40.5t-55.5 -40.5t-33 -18.5q-15 0 -25.5 10.5t-10.5 25.5 q0 19 25 46q59 67 147 103.5t182 36.5q191 0 318 -125.5t127 -315.5q0 -37 -4 -66q57 15 115 15z" />
+<glyph unicode="&#xf217;" horiz-adv-x="1664" d="M1216 832q0 26 -19 45t-45 19h-128v128q0 26 -19 45t-45 19t-45 -19t-19 -45v-128h-128q-26 0 -45 -19t-19 -45t19 -45t45 -19h128v-128q0 -26 19 -45t45 -19t45 19t19 45v128h128q26 0 45 19t19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920 q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf218;" horiz-adv-x="1664" d="M1280 832q0 26 -19 45t-45 19t-45 -19l-147 -146v293q0 26 -19 45t-45 19t-45 -19t-19 -45v-293l-147 146q-19 19 -45 19t-45 -19t-19 -45t19 -45l256 -256q19 -19 45 -19t45 19l256 256q19 19 19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920 q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
+<glyph unicode="&#xf219;" horiz-adv-x="2048" d="M212 768l623 -665l-300 665h-323zM1024 -4l349 772h-698zM538 896l204 384h-262l-288 -384h346zM1213 103l623 665h-323zM683 896h682l-204 384h-274zM1510 896h346l-288 384h-262zM1651 1382l384 -512q14 -18 13 -41.5t-17 -40.5l-960 -1024q-18 -20 -47 -20t-47 20 l-960 1024q-16 17 -17 40.5t13 41.5l384 512q18 26 51 26h1152q33 0 51 -26z" />
+<glyph unicode="&#xf21a;" horiz-adv-x="2048" d="M1811 -19q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83 q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83 q19 19 45 19t45 -19l83 -83zM237 19q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -82l83 82q19 19 45 19t45 -19l83 -82l64 64v293l-210 314q-17 26 -7 56.5t40 40.5l177 58v299h128v128h256v128h256v-128h256v-128h128v-299l177 -58q30 -10 40 -40.5t-7 -56.5l-210 -314 v-293l19 18q19 19 45 19t45 -19l83 -82l83 82q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83 q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83zM640 1152v-128l384 128l384 -128v128h-128v128h-512v-128h-128z" />
+<glyph unicode="&#xf21b;" d="M576 0l96 448l-96 128l-128 64zM832 0l128 640l-128 -64l-96 -128zM992 1010q-2 4 -4 6q-10 8 -96 8q-70 0 -167 -19q-7 -2 -21 -2t-21 2q-97 19 -167 19q-86 0 -96 -8q-2 -2 -4 -6q2 -18 4 -27q2 -3 7.5 -6.5t7.5 -10.5q2 -4 7.5 -20.5t7 -20.5t7.5 -17t8.5 -17t9 -14 t12 -13.5t14 -9.5t17.5 -8t20.5 -4t24.5 -2q36 0 59 12.5t32.5 30t14.5 34.5t11.5 29.5t17.5 12.5h12q11 0 17.5 -12.5t11.5 -29.5t14.5 -34.5t32.5 -30t59 -12.5q13 0 24.5 2t20.5 4t17.5 8t14 9.5t12 13.5t9 14t8.5 17t7.5 17t7 20.5t7.5 20.5q2 7 7.5 10.5t7.5 6.5 q2 9 4 27zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 61 4.5 118t19 125.5t37.5 123.5t63.5 103.5t93.5 74.5l-90 220h214q-22 64 -22 128q0 12 2 32q-194 40 -194 96q0 57 210 99q17 62 51.5 134t70.5 114q32 37 76 37q30 0 84 -31t84 -31t84 31 t84 31q44 0 76 -37q36 -42 70.5 -114t51.5 -134q210 -42 210 -99q0 -56 -194 -96q7 -81 -20 -160h214l-82 -225q63 -33 107.5 -96.5t65.5 -143.5t29 -151.5t8 -148.5z" />
+<glyph unicode="&#xf21c;" horiz-adv-x="2304" d="M2301 500q12 -103 -22 -198.5t-99 -163.5t-158.5 -106t-196.5 -31q-161 11 -279.5 125t-134.5 274q-12 111 27.5 210.5t118.5 170.5l-71 107q-96 -80 -151 -194t-55 -244q0 -27 -18.5 -46.5t-45.5 -19.5h-256h-69q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5 t-131.5 316.5t131.5 316.5t316.5 131.5q76 0 152 -27l24 45q-123 110 -304 110h-64q-26 0 -45 19t-19 45t19 45t45 19h128q78 0 145 -13.5t116.5 -38.5t71.5 -39.5t51 -36.5h512h115l-85 128h-222q-30 0 -49 22.5t-14 52.5q4 23 23 38t43 15h253q33 0 53 -28l70 -105 l114 114q19 19 46 19h101q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-179l115 -172q131 63 275 36q143 -26 244 -134.5t118 -253.5zM448 128q115 0 203 72.5t111 183.5h-314q-35 0 -55 31q-18 32 -1 63l147 277q-47 13 -91 13q-132 0 -226 -94t-94 -226t94 -226 t226 -94zM1856 128q132 0 226 94t94 226t-94 226t-226 94q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94z" />
+<glyph unicode="&#xf21d;" d="M1408 0q0 -63 -61.5 -113.5t-164 -81t-225 -46t-253.5 -15.5t-253.5 15.5t-225 46t-164 81t-61.5 113.5q0 49 33 88.5t91 66.5t118 44.5t131 29.5q26 5 48 -10.5t26 -41.5q5 -26 -10.5 -48t-41.5 -26q-58 -10 -106 -23.5t-76.5 -25.5t-48.5 -23.5t-27.5 -19.5t-8.5 -12 q3 -11 27 -26.5t73 -33t114 -32.5t160.5 -25t201.5 -10t201.5 10t160.5 25t114 33t73 33.5t27 27.5q-1 4 -8.5 11t-27.5 19t-48.5 23.5t-76.5 25t-106 23.5q-26 4 -41.5 26t-10.5 48q4 26 26 41.5t48 10.5q71 -12 131 -29.5t118 -44.5t91 -66.5t33 -88.5zM1024 896v-384 q0 -26 -19 -45t-45 -19h-64v-384q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v384h-64q-26 0 -45 19t-19 45v384q0 53 37.5 90.5t90.5 37.5h384q53 0 90.5 -37.5t37.5 -90.5zM928 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5 t158.5 -65.5t65.5 -158.5z" />
+<glyph unicode="&#xf21e;" horiz-adv-x="1792" d="M1280 512h305q-5 -6 -10 -10.5t-9 -7.5l-3 -4l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-5 2 -21 20h369q22 0 39.5 13.5t22.5 34.5l70 281l190 -667q6 -20 23 -33t39 -13q21 0 38 13t23 33l146 485l56 -112q18 -35 57 -35zM1792 940q0 -145 -103 -300h-369l-111 221 q-8 17 -25.5 27t-36.5 8q-45 -5 -56 -46l-129 -430l-196 686q-6 20 -23.5 33t-39.5 13t-39 -13.5t-22 -34.5l-116 -464h-423q-103 155 -103 300q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124 t127 -344z" />
+<glyph unicode="&#xf221;" horiz-adv-x="1280" d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292 q11 134 80.5 249t182 188t245.5 88q170 19 319 -54t236 -212t87 -306zM128 960q0 -185 131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5z" />
+<glyph unicode="&#xf222;" d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-382 -383q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5 q203 0 359 -126l382 382h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+<glyph unicode="&#xf223;" horiz-adv-x="1280" d="M830 1220q145 -72 233.5 -210.5t88.5 -305.5q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5 t-147.5 384.5q0 167 88.5 305.5t233.5 210.5q-165 96 -228 273q-6 16 3.5 29.5t26.5 13.5h69q21 0 29 -20q44 -106 140 -171t214 -65t214 65t140 171q8 20 37 20h61q17 0 26.5 -13.5t3.5 -29.5q-63 -177 -228 -273zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5 t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+<glyph unicode="&#xf224;" d="M1024 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64 q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-149 16 -270.5 103t-186.5 223.5t-53 291.5q16 204 160 353.5t347 172.5q118 14 228 -19t198 -103l255 254h-134q-14 0 -23 9t-9 23v64zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5 t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+<glyph unicode="&#xf225;" horiz-adv-x="1792" d="M1280 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64 q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5t-147.5 384.5q0 201 126 359l-52 53l-101 -111q-9 -10 -22 -10.5t-23 7.5l-48 44q-10 8 -10.5 21.5t8.5 23.5l105 115l-111 112v-134q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9 t-9 23v288q0 26 19 45t45 19h288q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-133l106 -107l86 94q9 10 22 10.5t23 -7.5l48 -44q10 -8 10.5 -21.5t-8.5 -23.5l-90 -99l57 -56q158 126 359 126t359 -126l255 254h-134q-14 0 -23 9t-9 23v64zM832 256q185 0 316.5 131.5 t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+<glyph unicode="&#xf226;" horiz-adv-x="1792" d="M1790 1007q12 -155 -52.5 -292t-186 -224t-271.5 -103v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-512v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23 t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292q17 206 164.5 356.5t352.5 169.5q206 21 377 -94q171 115 377 94q205 -19 352.5 -169.5t164.5 -356.5zM896 647q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM576 512q115 0 218 57q-154 165 -154 391 q0 224 154 391q-103 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5zM1152 128v260q-137 15 -256 94q-119 -79 -256 -94v-260h512zM1216 512q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5q-115 0 -218 -57q154 -167 154 -391 q0 -226 -154 -391q103 -57 218 -57z" />
+<glyph unicode="&#xf227;" horiz-adv-x="1920" d="M1536 1120q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-31 -182 -166 -312t-318 -156q-210 -29 -384.5 80t-241.5 300q-117 6 -221 57.5t-177.5 133t-113.5 192.5t-32 230 q9 135 78 252t182 191.5t248 89.5q118 14 227.5 -19t198.5 -103l255 254h-134q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q59 -74 93 -169q182 -9 328 -124l255 254h-134q-14 0 -23 9 t-9 23v64zM1024 704q0 20 -4 58q-162 -25 -271 -150t-109 -292q0 -20 4 -58q162 25 271 150t109 292zM128 704q0 -168 111 -294t276 -149q-3 29 -3 59q0 210 135 369.5t338 196.5q-53 120 -163.5 193t-245.5 73q-185 0 -316.5 -131.5t-131.5 -316.5zM1088 -128 q185 0 316.5 131.5t131.5 316.5q0 168 -111 294t-276 149q3 -29 3 -59q0 -210 -135 -369.5t-338 -196.5q53 -120 163.5 -193t245.5 -73z" />
+<glyph unicode="&#xf228;" horiz-adv-x="2048" d="M1664 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-32 -180 -164.5 -310t-313.5 -157q-223 -34 -409 90q-117 -78 -256 -93v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23 t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-155 17 -279.5 109.5t-187 237.5t-39.5 307q25 187 159.5 322.5t320.5 164.5q224 34 410 -90q146 97 320 97q201 0 359 -126l255 254h-134q-14 0 -23 9 t-9 23v64zM896 391q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM128 704q0 -185 131.5 -316.5t316.5 -131.5q117 0 218 57q-154 167 -154 391t154 391q-101 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5zM1216 256q185 0 316.5 131.5t131.5 316.5 t-131.5 316.5t-316.5 131.5q-117 0 -218 -57q154 -167 154 -391t-154 -391q101 -57 218 -57z" />
+<glyph unicode="&#xf229;" d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-213 -214l140 -140q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-140 141l-78 -79q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5 t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5q203 0 359 -126l78 78l-172 172q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l172 -172l213 213h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5 t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+<glyph unicode="&#xf22a;" horiz-adv-x="1280" d="M640 892q217 -24 364.5 -187.5t147.5 -384.5q0 -167 -87 -306t-236 -212t-319 -54q-133 15 -245.5 88t-182 188t-80.5 249q-12 155 52.5 292t186 224t271.5 103v132h-160q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h160v165l-92 -92q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22 t9 23l202 201q19 19 45 19t45 -19l202 -201q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-92 92v-165h160q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-160v-132zM576 -128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5 t131.5 -316.5t316.5 -131.5z" />
+<glyph unicode="&#xf22b;" horiz-adv-x="2048" d="M1901 621q19 -19 19 -45t-19 -45l-294 -294q-9 -10 -22.5 -10t-22.5 10l-45 45q-10 9 -10 22.5t10 22.5l185 185h-294v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-132q-24 -217 -187.5 -364.5t-384.5 -147.5q-167 0 -306 87t-212 236t-54 319q15 133 88 245.5 t188 182t249 80.5q155 12 292 -52.5t224 -186t103 -271.5h132v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h294l-185 185q-10 9 -10 22.5t10 22.5l45 45q9 10 22.5 10t22.5 -10zM576 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5 t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+<glyph unicode="&#xf22c;" horiz-adv-x="1280" d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-612q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v612q-217 24 -364.5 187.5t-147.5 384.5q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM576 512q185 0 316.5 131.5 t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+<glyph unicode="&#xf22d;" horiz-adv-x="1280" d="M1024 576q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1152 576q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123 t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5z" />
+<glyph unicode="&#xf22e;" horiz-adv-x="1792" />
+<glyph unicode="&#xf22f;" horiz-adv-x="1792" />
+<glyph unicode="&#xf230;" d="M1451 1408q35 0 60 -25t25 -60v-1366q0 -35 -25 -60t-60 -25h-391v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-735q-35 0 -60 25t-25 60v1366q0 35 25 60t60 25h1366z" />
+<glyph unicode="&#xf231;" horiz-adv-x="1280" d="M0 939q0 108 37.5 203.5t103.5 166.5t152 123t185 78t202 26q158 0 294 -66.5t221 -193.5t85 -287q0 -96 -19 -188t-60 -177t-100 -149.5t-145 -103t-189 -38.5q-68 0 -135 32t-96 88q-10 -39 -28 -112.5t-23.5 -95t-20.5 -71t-26 -71t-32 -62.5t-46 -77.5t-62 -86.5 l-14 -5l-9 10q-15 157 -15 188q0 92 21.5 206.5t66.5 287.5t52 203q-32 65 -32 169q0 83 52 156t132 73q61 0 95 -40.5t34 -102.5q0 -66 -44 -191t-44 -187q0 -63 45 -104.5t109 -41.5q55 0 102 25t78.5 68t56 95t38 110.5t20 111t6.5 99.5q0 173 -109.5 269.5t-285.5 96.5 q-200 0 -334 -129.5t-134 -328.5q0 -44 12.5 -85t27 -65t27 -45.5t12.5 -30.5q0 -28 -15 -73t-37 -45q-2 0 -17 3q-51 15 -90.5 56t-61 94.5t-32.5 108t-11 106.5z" />
+<glyph unicode="&#xf232;" d="M985 562q13 0 97.5 -44t89.5 -53q2 -5 2 -15q0 -33 -17 -76q-16 -39 -71 -65.5t-102 -26.5q-57 0 -190 62q-98 45 -170 118t-148 185q-72 107 -71 194v8q3 91 74 158q24 22 52 22q6 0 18 -1.5t19 -1.5q19 0 26.5 -6.5t15.5 -27.5q8 -20 33 -88t25 -75q0 -21 -34.5 -57.5 t-34.5 -46.5q0 -7 5 -15q34 -73 102 -137q56 -53 151 -101q12 -7 22 -7q15 0 54 48.5t52 48.5zM782 32q127 0 243.5 50t200.5 134t134 200.5t50 243.5t-50 243.5t-134 200.5t-200.5 134t-243.5 50t-243.5 -50t-200.5 -134t-134 -200.5t-50 -243.5q0 -203 120 -368l-79 -233 l242 77q158 -104 345 -104zM782 1414q153 0 292.5 -60t240.5 -161t161 -240.5t60 -292.5t-60 -292.5t-161 -240.5t-240.5 -161t-292.5 -60q-195 0 -365 94l-417 -134l136 405q-108 178 -108 389q0 153 60 292.5t161 240.5t240.5 161t292.5 60z" />
+<glyph unicode="&#xf233;" horiz-adv-x="1792" d="M128 128h1024v128h-1024v-128zM128 640h1024v128h-1024v-128zM1696 192q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM128 1152h1024v128h-1024v-128zM1696 704q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1696 1216 q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1792 384v-384h-1792v384h1792zM1792 896v-384h-1792v384h1792zM1792 1408v-384h-1792v384h1792z" />
+<glyph unicode="&#xf234;" horiz-adv-x="2048" d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1664 512h352q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-352q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5 t-9.5 22.5v352h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v352q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5v-352zM928 288q0 -52 38 -90t90 -38h256v-238q-68 -50 -171 -50h-874q-121 0 -194 69t-73 190q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q79 -61 154.5 -91.5t164.5 -30.5t164.5 30.5t154.5 91.5q20 17 39 17q132 0 217 -96h-223q-52 0 -90 -38t-38 -90v-192z" />
+<glyph unicode="&#xf235;" horiz-adv-x="2048" d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1781 320l249 -249q9 -9 9 -23q0 -13 -9 -22l-136 -136q-9 -9 -22 -9q-14 0 -23 9l-249 249l-249 -249q-9 -9 -23 -9q-13 0 -22 9l-136 136 q-9 9 -9 22q0 14 9 23l249 249l-249 249q-9 9 -9 23q0 13 9 22l136 136q9 9 22 9q14 0 23 -9l249 -249l249 249q9 9 23 9q13 0 22 -9l136 -136q9 -9 9 -22q0 -14 -9 -23zM1283 320l-181 -181q-37 -37 -37 -91q0 -53 37 -90l83 -83q-21 -3 -44 -3h-874q-121 0 -194 69 t-73 190q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q154 -122 319 -122t319 122q20 17 39 17q28 0 57 -6q-28 -27 -41 -50t-13 -56q0 -54 37 -91z" />
+<glyph unicode="&#xf236;" horiz-adv-x="2048" d="M256 512h1728q26 0 45 -19t19 -45v-448h-256v256h-1536v-256h-256v1216q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-704zM832 832q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM2048 576v64q0 159 -112.5 271.5t-271.5 112.5h-704 q-26 0 -45 -19t-19 -45v-384h1152z" />
+<glyph unicode="&#xf237;" d="M1536 1536l-192 -448h192v-192h-274l-55 -128h329v-192h-411l-357 -832l-357 832h-411v192h329l-55 128h-274v192h192l-192 448h256l323 -768h378l323 768h256zM768 320l108 256h-216z" />
+<glyph unicode="&#xf238;" d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM768 192q80 0 136 56t56 136t-56 136t-136 56 t-136 -56t-56 -136t56 -136t136 -56zM1344 768v512h-1152v-512h1152z" />
+<glyph unicode="&#xf239;" d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM288 224q66 0 113 47t47 113t-47 113t-113 47 t-113 -47t-47 -113t47 -113t113 -47zM704 768v512h-544v-512h544zM1248 224q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM1408 768v512h-576v-512h576z" />
+<glyph unicode="&#xf23a;" horiz-adv-x="1792" d="M1792 204v-209h-642v209h134v926h-6l-314 -1135h-243l-310 1135h-8v-926h135v-209h-538v209h69q21 0 43 19.5t22 37.5v881q0 18 -22 40t-43 22h-69v209h672l221 -821h6l223 821h670v-209h-71q-19 0 -41 -22t-22 -40v-881q0 -18 21.5 -37.5t41.5 -19.5h71z" />
+<glyph unicode="&#xf23b;" d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1408v-1536h-1536v1536h1536z" />
+<glyph unicode="&#xf23c;" horiz-adv-x="2296" d="M478 -139q-8 -16 -27 -34.5t-37 -25.5q-25 -9 -51.5 3.5t-28.5 31.5q-1 22 40 55t68 38q23 4 34 -21.5t2 -46.5zM1819 -139q7 -16 26 -34.5t38 -25.5q25 -9 51.5 3.5t27.5 31.5q2 22 -39.5 55t-68.5 38q-22 4 -33 -21.5t-2 -46.5zM1867 -30q13 -27 56.5 -59.5t77.5 -41.5 q45 -13 82 4.5t37 50.5q0 46 -67.5 100.5t-115.5 59.5q-40 5 -63.5 -37.5t-6.5 -76.5zM428 -30q-13 -27 -56 -59.5t-77 -41.5q-45 -13 -82 4.5t-37 50.5q0 46 67.5 100.5t115.5 59.5q40 5 63 -37.5t6 -76.5zM1158 1094h1q-41 0 -76 -15q27 -8 44 -30.5t17 -49.5 q0 -35 -27 -60t-65 -25q-52 0 -80 43q-5 -23 -5 -42q0 -74 56 -126.5t135 -52.5q80 0 136 52.5t56 126.5t-56 126.5t-136 52.5zM1462 1312q-99 109 -220.5 131.5t-245.5 -44.5q27 60 82.5 96.5t118 39.5t121.5 -17t99.5 -74.5t44.5 -131.5zM2212 73q8 -11 -11 -42 q7 -23 7 -40q1 -56 -44.5 -112.5t-109.5 -91.5t-118 -37q-48 -2 -92 21.5t-66 65.5q-687 -25 -1259 0q-23 -41 -66.5 -65t-92.5 -22q-86 3 -179.5 80.5t-92.5 160.5q2 22 7 40q-19 31 -11 42q6 10 31 1q14 22 41 51q-7 29 2 38q11 10 39 -4q29 20 59 34q0 29 13 37 q23 12 51 -16q35 5 61 -2q18 -4 38 -19v73q-11 0 -18 2q-53 10 -97 44.5t-55 87.5q-9 38 0 81q15 62 93 95q2 17 19 35.5t36 23.5t33 -7.5t19 -30.5h13q46 -5 60 -23q3 -3 5 -7q10 1 30.5 3.5t30.5 3.5q-15 11 -30 17q-23 40 -91 43q0 6 1 10q-62 2 -118.5 18.5t-84.5 47.5 q-32 36 -42.5 92t-2.5 112q16 126 90 179q23 16 52 4.5t32 -40.5q0 -1 1.5 -14t2.5 -21t3 -20t5.5 -19t8.5 -10q27 -14 76 -12q48 46 98 74q-40 4 -162 -14l47 46q61 58 163 111q145 73 282 86q-20 8 -41 15.5t-47 14t-42.5 10.5t-47.5 11t-43 10q595 126 904 -139 q98 -84 158 -222q85 -10 121 9h1q5 3 8.5 10t5.5 19t3 19.5t3 21.5l1 14q3 28 32 40t52 -5q73 -52 91 -178q7 -57 -3.5 -113t-42.5 -91q-28 -32 -83.5 -48.5t-115.5 -18.5v-10q-71 -2 -95 -43q-14 -5 -31 -17q11 -1 32 -3.5t30 -3.5q1 4 5 8q16 18 60 23h13q5 18 19 30t33 8 t36 -23t19 -36q79 -32 93 -95q9 -40 1 -81q-12 -53 -56 -88t-97 -44q-10 -2 -17 -2q0 -49 -1 -73q20 15 38 19q26 7 61 2q28 28 51 16q14 -9 14 -37q33 -16 59 -34q27 13 38 4q10 -10 2 -38q28 -30 41 -51q23 8 31 -1zM1937 1025q0 -29 -9 -54q82 -32 112 -132 q4 37 -9.5 98.5t-41.5 90.5q-20 19 -36 17t-16 -20zM1859 925q35 -42 47.5 -108.5t-0.5 -124.5q67 13 97 45q13 14 18 28q-3 64 -31 114.5t-79 66.5q-15 -15 -52 -21zM1822 921q-30 0 -44 1q42 -115 53 -239q21 0 43 3q16 68 1 135t-53 100zM258 839q30 100 112 132 q-9 25 -9 54q0 18 -16.5 20t-35.5 -17q-28 -29 -41.5 -90.5t-9.5 -98.5zM294 737q29 -31 97 -45q-13 58 -0.5 124.5t47.5 108.5v0q-37 6 -52 21q-51 -16 -78.5 -66t-31.5 -115q9 -17 18 -28zM471 683q14 124 73 235q-19 -4 -55 -18l-45 -19v1q-46 -89 -20 -196q25 -3 47 -3z M1434 644q8 -38 16.5 -108.5t11.5 -89.5q3 -18 9.5 -21.5t23.5 4.5q40 20 62 85.5t23 125.5q-24 2 -146 4zM1152 1285q-116 0 -199 -82.5t-83 -198.5q0 -117 83 -199.5t199 -82.5t199 82.5t83 199.5q0 116 -83 198.5t-199 82.5zM1380 646q-106 2 -211 0v1q-1 -27 2.5 -86 t13.5 -66q29 -14 93.5 -14.5t95.5 10.5q9 3 11 39t-0.5 69.5t-4.5 46.5zM1112 447q8 4 9.5 48t-0.5 88t-4 63v1q-212 -3 -214 -3q-4 -20 -7 -62t0 -83t14 -46q34 -15 101 -16t101 10zM718 636q-16 -59 4.5 -118.5t77.5 -84.5q15 -8 24 -5t12 21q3 16 8 90t10 103 q-69 -2 -136 -6zM591 510q3 -23 -34 -36q132 -141 271.5 -240t305.5 -154q172 49 310.5 146t293.5 250q-33 13 -30 34l3 9v1v-1q-17 2 -50 5.5t-48 4.5q-26 -90 -82 -132q-51 -38 -82 1q-5 6 -9 14q-7 13 -17 62q-2 -5 -5 -9t-7.5 -7t-8 -5.5t-9.5 -4l-10 -2.5t-12 -2 l-12 -1.5t-13.5 -1t-13.5 -0.5q-106 -9 -163 11q-4 -17 -10 -26.5t-21 -15t-23 -7t-36 -3.5q-2 0 -3 -0.5t-3 -0.5h-3q-179 -17 -203 40q-2 -63 -56 -54q-47 8 -91 54q-12 13 -20 26q-17 29 -26 65q-58 -6 -87 -10q1 -2 4 -10zM507 -118q3 14 3 30q-17 71 -51 130t-73 70 q-41 12 -101.5 -14.5t-104.5 -80t-39 -107.5q35 -53 100 -93t119 -42q51 -2 94 28t53 79zM510 53q23 -63 27 -119q195 113 392 174q-98 52 -180.5 120t-179.5 165q-6 -4 -29 -13q0 -2 -1 -5t-1 -4q31 -18 22 -37q-12 -23 -56 -34q-10 -13 -29 -24h-1q-2 -83 1 -150 q19 -34 35 -73zM579 -113q532 -21 1145 0q-254 147 -428 196q-76 -35 -156 -57q-8 -3 -16 0q-65 21 -129 49q-208 -60 -416 -188h-1v-1q1 0 1 1zM1763 -67q4 54 28 120q14 38 33 71l-1 -1q3 77 3 153q-15 8 -30 25q-42 9 -56 33q-9 20 22 38q-2 4 -2 9q-16 4 -28 12 q-204 -190 -383 -284q198 -59 414 -176zM2155 -90q5 54 -39 107.5t-104 80t-102 14.5q-38 -11 -72.5 -70.5t-51.5 -129.5q0 -16 3 -30q10 -49 53 -79t94 -28q54 2 119 42t100 93z" />
+<glyph unicode="&#xf23d;" horiz-adv-x="2304" d="M1524 -25q0 -68 -48 -116t-116 -48t-116.5 48t-48.5 116t48.5 116.5t116.5 48.5t116 -48.5t48 -116.5zM775 -25q0 -68 -48.5 -116t-116.5 -48t-116 48t-48 116t48 116.5t116 48.5t116.5 -48.5t48.5 -116.5zM0 1469q57 -60 110.5 -104.5t121 -82t136 -63t166 -45.5 t200 -31.5t250 -18.5t304 -9.5t372.5 -2.5q139 0 244.5 -5t181 -16.5t124 -27.5t71 -39.5t24 -51.5t-19.5 -64t-56.5 -76.5t-89.5 -91t-116 -104.5t-139 -119q-185 -157 -286 -247q29 51 76.5 109t94 105.5t94.5 98.5t83 91.5t54 80.5t13 70t-45.5 55.5t-116.5 41t-204 23.5 t-304 5q-168 -2 -314 6t-256 23t-204.5 41t-159.5 51.5t-122.5 62.5t-91.5 66.5t-68 71.5t-50.5 69.5t-40 68t-36.5 59.5z" />
+<glyph unicode="&#xf23e;" horiz-adv-x="1792" d="M896 1472q-169 0 -323 -66t-265.5 -177.5t-177.5 -265.5t-66 -323t66 -323t177.5 -265.5t265.5 -177.5t323 -66t323 66t265.5 177.5t177.5 265.5t66 323t-66 323t-177.5 265.5t-265.5 177.5t-323 66zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348 t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM496 704q16 0 16 -16v-480q0 -16 -16 -16h-32q-16 0 -16 16v480q0 16 16 16h32zM896 640q53 0 90.5 -37.5t37.5 -90.5q0 -35 -17.5 -64t-46.5 -46v-114q0 -14 -9 -23 t-23 -9h-64q-14 0 -23 9t-9 23v114q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5zM896 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM544 928v-96 q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 93 65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5v-96q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 146 -103 249t-249 103t-249 -103t-103 -249zM1408 192v512q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-512 q0 -26 19 -45t45 -19h896q26 0 45 19t19 45z" />
+<glyph unicode="&#xf240;" horiz-adv-x="2304" d="M1920 1024v-768h-1664v768h1664zM2048 448h128v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288zM2304 832v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113 v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160q53 0 90.5 -37.5t37.5 -90.5z" />
+<glyph unicode="&#xf241;" horiz-adv-x="2304" d="M256 256v768h1280v-768h-1280zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9 h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+<glyph unicode="&#xf242;" horiz-adv-x="2304" d="M256 256v768h896v-768h-896zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9 h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+<glyph unicode="&#xf243;" horiz-adv-x="2304" d="M256 256v768h512v-768h-512zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9 h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+<glyph unicode="&#xf244;" horiz-adv-x="2304" d="M2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23 v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+<glyph unicode="&#xf245;" horiz-adv-x="1280" d="M1133 493q31 -30 14 -69q-17 -40 -59 -40h-382l201 -476q10 -25 0 -49t-34 -35l-177 -75q-25 -10 -49 0t-35 34l-191 452l-312 -312q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v1504q0 42 40 59q12 5 24 5q27 0 45 -19z" />
+<glyph unicode="&#xf246;" horiz-adv-x="1024" d="M832 1408q-320 0 -320 -224v-416h128v-128h-128v-544q0 -224 320 -224h64v-128h-64q-272 0 -384 146q-112 -146 -384 -146h-64v128h64q320 0 320 224v544h-128v128h128v416q0 224 -320 224h-64v128h64q272 0 384 -146q112 146 384 146h64v-128h-64z" />
+<glyph unicode="&#xf247;" horiz-adv-x="2048" d="M2048 1152h-128v-1024h128v-384h-384v128h-1280v-128h-384v384h128v1024h-128v384h384v-128h1280v128h384v-384zM1792 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 -128v128h-128v-128h128zM1664 0v128h128v1024h-128v128h-1280v-128h-128v-1024h128v-128 h1280zM1920 -128v128h-128v-128h128zM1280 896h384v-768h-896v256h-384v768h896v-256zM512 512h640v512h-640v-512zM1536 256v512h-256v-384h-384v-128h640z" />
+<glyph unicode="&#xf248;" horiz-adv-x="2304" d="M2304 768h-128v-640h128v-384h-384v128h-896v-128h-384v384h128v128h-384v-128h-384v384h128v640h-128v384h384v-128h896v128h384v-384h-128v-128h384v128h384v-384zM2048 1024v-128h128v128h-128zM1408 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 256 v128h-128v-128h128zM1536 384h-128v-128h128v128zM384 384h896v128h128v640h-128v128h-896v-128h-128v-640h128v-128zM896 -128v128h-128v-128h128zM2176 -128v128h-128v-128h128zM2048 128v640h-128v128h-384v-384h128v-384h-384v128h-384v-128h128v-128h896v128h128z" />
+<glyph unicode="&#xf249;" d="M1024 288v-416h-928q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68v-928h-416q-40 0 -68 -28t-28 -68zM1152 256h381q-15 -82 -65 -132l-184 -184q-50 -50 -132 -65v381z" />
+<glyph unicode="&#xf24a;" d="M1400 256h-248v-248q29 10 41 22l185 185q12 12 22 41zM1120 384h288v896h-1280v-1280h896v288q0 40 28 68t68 28zM1536 1312v-1024q0 -40 -20 -88t-48 -76l-184 -184q-28 -28 -76 -48t-88 -20h-1024q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68 z" />
+<glyph unicode="&#xf24b;" horiz-adv-x="2304" d="M1951 538q0 -26 -15.5 -44.5t-38.5 -23.5q-8 -2 -18 -2h-153v140h153q10 0 18 -2q23 -5 38.5 -23.5t15.5 -44.5zM1933 751q0 -25 -15 -42t-38 -21q-3 -1 -15 -1h-139v129h139q3 0 8.5 -0.5t6.5 -0.5q23 -4 38 -21.5t15 -42.5zM728 587v308h-228v-308q0 -58 -38 -94.5 t-105 -36.5q-108 0 -229 59v-112q53 -15 121 -23t109 -9l42 -1q328 0 328 217zM1442 403v113q-99 -52 -200 -59q-108 -8 -169 41t-61 142t61 142t169 41q101 -7 200 -58v112q-48 12 -100 19.5t-80 9.5l-28 2q-127 6 -218.5 -14t-140.5 -60t-71 -88t-22 -106t22 -106t71 -88 t140.5 -60t218.5 -14q101 4 208 31zM2176 518q0 54 -43 88.5t-109 39.5v3q57 8 89 41.5t32 79.5q0 55 -41 88t-107 36q-3 0 -12 0.5t-14 0.5h-455v-510h491q74 0 121.5 36.5t47.5 96.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90 t90 38h2048q52 0 90 -38t38 -90z" />
+<glyph unicode="&#xf24c;" horiz-adv-x="2304" d="M858 295v693q-106 -41 -172 -135.5t-66 -211.5t66 -211.5t172 -134.5zM1362 641q0 117 -66 211.5t-172 135.5v-694q106 41 172 135.5t66 211.5zM1577 641q0 -159 -78.5 -294t-213.5 -213.5t-294 -78.5q-119 0 -227.5 46.5t-187 125t-125 187t-46.5 227.5q0 159 78.5 294 t213.5 213.5t294 78.5t294 -78.5t213.5 -213.5t78.5 -294zM1960 634q0 139 -55.5 261.5t-147.5 205.5t-213.5 131t-252.5 48h-301q-176 0 -323.5 -81t-235 -230t-87.5 -335q0 -171 87 -317.5t236 -231.5t323 -85h301q129 0 251.5 50.5t214.5 135t147.5 202.5t55.5 246z M2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+<glyph unicode="&#xf24d;" horiz-adv-x="1792" d="M1664 -96v1088q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5zM1792 992v-1088q0 -66 -47 -113t-113 -47h-1088q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113 zM1408 1376v-160h-128v160q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h160v-128h-160q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113z" />
+<glyph unicode="&#xf24e;" horiz-adv-x="2304" d="M1728 1088l-384 -704h768zM448 1088l-384 -704h768zM1269 1280q-14 -40 -45.5 -71.5t-71.5 -45.5v-1291h608q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1344q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h608v1291q-40 14 -71.5 45.5t-45.5 71.5h-491q-14 0 -23 9t-9 23v64 q0 14 9 23t23 9h491q21 57 70 92.5t111 35.5t111 -35.5t70 -92.5h491q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-491zM1088 1264q33 0 56.5 23.5t23.5 56.5t-23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5zM2176 384q0 -73 -46.5 -131t-117.5 -91 t-144.5 -49.5t-139.5 -16.5t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81zM896 384q0 -73 -46.5 -131t-117.5 -91t-144.5 -49.5t-139.5 -16.5 t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81z" />
+<glyph unicode="&#xf250;" d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9 t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-77 -29 -149 -92.5 t-129.5 -152.5t-92.5 -210t-35 -253h1024q0 132 -35 253t-92.5 210t-129.5 152.5t-149 92.5q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
+<glyph unicode="&#xf251;" d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9 t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -66 9 -128h1006q9 61 9 128zM1280 -128q0 130 -34 249.5t-90.5 208t-126.5 152t-146 94.5h-230q-76 -31 -146 -94.5t-126.5 -152t-90.5 -208t-34 -249.5h1024z" />
+<glyph unicode="&#xf252;" d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9 t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -206 85 -384h854q85 178 85 384zM1223 192q-54 141 -145.5 241.5t-194.5 142.5h-230q-103 -42 -194.5 -142.5t-145.5 -241.5h910z" />
+<glyph unicode="&#xf253;" d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9 t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-137 -51 -244 -196 h700q-107 145 -244 196q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
+<glyph unicode="&#xf254;" d="M1504 -64q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472zM130 0q3 55 16 107t30 95t46 87t53.5 76t64.5 69.5t66 60t70.5 55t66.5 47.5t65 43q-43 28 -65 43t-66.5 47.5t-70.5 55t-66 60t-64.5 69.5t-53.5 76t-46 87 t-30 95t-16 107h1276q-3 -55 -16 -107t-30 -95t-46 -87t-53.5 -76t-64.5 -69.5t-66 -60t-70.5 -55t-66.5 -47.5t-65 -43q43 -28 65 -43t66.5 -47.5t70.5 -55t66 -60t64.5 -69.5t53.5 -76t46 -87t30 -95t16 -107h-1276zM1504 1536q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9 h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472z" />
+<glyph unicode="&#xf255;" d="M768 1152q-53 0 -90.5 -37.5t-37.5 -90.5v-128h-32v93q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-429l-32 30v172q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-224q0 -47 35 -82l310 -296q39 -39 39 -102q0 -26 19 -45t45 -19h640q26 0 45 19t19 45v25 q0 41 10 77l108 436q10 36 10 77v246q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-32h-32v125q0 40 -25 72.5t-64 40.5q-14 2 -23 2q-46 0 -79 -33t-33 -79v-128h-32v122q0 51 -32.5 89.5t-82.5 43.5q-5 1 -13 1zM768 1280q84 0 149 -50q57 34 123 34q59 0 111 -27 t86 -76q27 7 59 7q100 0 170 -71.5t70 -171.5v-246q0 -51 -13 -108l-109 -436q-6 -24 -6 -71q0 -80 -56 -136t-136 -56h-640q-84 0 -138 58.5t-54 142.5l-308 296q-76 73 -76 175v224q0 99 70.5 169.5t169.5 70.5q11 0 16 -1q6 95 75.5 160t164.5 65q52 0 98 -21 q72 69 174 69z" />
+<glyph unicode="&#xf256;" horiz-adv-x="1792" d="M880 1408q-46 0 -79 -33t-33 -79v-656h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528v-256l-154 205q-38 51 -102 51q-53 0 -90.5 -37.5t-37.5 -90.5q0 -43 26 -77l384 -512q38 -51 102 -51h688q34 0 61 22t34 56l76 405q5 32 5 59v498q0 46 -33 79t-79 33t-79 -33 t-33 -79v-272h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528h-32v656q0 46 -33 79t-79 33zM880 1536q68 0 125.5 -35.5t88.5 -96.5q19 4 42 4q99 0 169.5 -70.5t70.5 -169.5v-17q105 6 180.5 -64t75.5 -175v-498q0 -40 -8 -83l-76 -404q-14 -79 -76.5 -131t-143.5 -52 h-688q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 106 75 181t181 75q78 0 128 -34v434q0 99 70.5 169.5t169.5 70.5q23 0 42 -4q31 61 88.5 96.5t125.5 35.5z" />
+<glyph unicode="&#xf257;" horiz-adv-x="1792" d="M1073 -128h-177q-163 0 -226 141q-23 49 -23 102v5q-62 30 -98.5 88.5t-36.5 127.5q0 38 5 48h-261q-106 0 -181 75t-75 181t75 181t181 75h113l-44 17q-74 28 -119.5 93.5t-45.5 145.5q0 106 75 181t181 75q46 0 91 -17l628 -239h401q106 0 181 -75t75 -181v-668 q0 -88 -54 -157.5t-140 -90.5l-339 -85q-92 -23 -186 -23zM1024 583l-155 -71l-163 -74q-30 -14 -48 -41.5t-18 -60.5q0 -46 33 -79t79 -33q26 0 46 10l338 154q-49 10 -80.5 50t-31.5 90v55zM1344 272q0 46 -33 79t-79 33q-26 0 -46 -10l-290 -132q-28 -13 -37 -17 t-30.5 -17t-29.5 -23.5t-16 -29t-8 -40.5q0 -50 31.5 -82t81.5 -32q20 0 38 9l352 160q30 14 48 41.5t18 60.5zM1112 1024l-650 248q-24 8 -46 8q-53 0 -90.5 -37.5t-37.5 -90.5q0 -40 22.5 -73t59.5 -47l526 -200v-64h-640q-53 0 -90.5 -37.5t-37.5 -90.5t37.5 -90.5 t90.5 -37.5h535l233 106v198q0 63 46 106l111 102h-69zM1073 0q82 0 155 19l339 85q43 11 70 45.5t27 78.5v668q0 53 -37.5 90.5t-90.5 37.5h-308l-136 -126q-36 -33 -36 -82v-296q0 -46 33 -77t79 -31t79 35t33 81v208h32v-208q0 -70 -57 -114q52 -8 86.5 -48.5t34.5 -93.5 q0 -42 -23 -78t-61 -53l-310 -141h91z" />
+<glyph unicode="&#xf258;" horiz-adv-x="2048" d="M1151 1536q61 0 116 -28t91 -77l572 -781q118 -159 118 -359v-355q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v177l-286 143h-546q-80 0 -136 56t-56 136v32q0 119 84.5 203.5t203.5 84.5h420l42 128h-686q-100 0 -173.5 67.5t-81.5 166.5q-65 79 -65 182v32 q0 80 56 136t136 56h959zM1920 -64v355q0 157 -93 284l-573 781q-39 52 -103 52h-959q-26 0 -45 -19t-19 -45q0 -32 1.5 -49.5t9.5 -40.5t25 -43q10 31 35.5 50t56.5 19h832v-32h-832q-26 0 -45 -19t-19 -45q0 -44 3 -58q8 -44 44 -73t81 -29h640h91q40 0 68 -28t28 -68 q0 -15 -5 -30l-64 -192q-10 -29 -35 -47.5t-56 -18.5h-443q-66 0 -113 -47t-47 -113v-32q0 -26 19 -45t45 -19h561q16 0 29 -7l317 -158q24 -13 38.5 -36t14.5 -50v-197q0 -26 19 -45t45 -19h384q26 0 45 19t19 45z" />
+<glyph unicode="&#xf259;" horiz-adv-x="2048" d="M816 1408q-48 0 -79.5 -34t-31.5 -82q0 -14 3 -28l150 -624h-26l-116 482q-9 38 -39.5 62t-69.5 24q-47 0 -79 -34t-32 -81q0 -11 4 -29q3 -13 39 -161t68 -282t32 -138v-227l-307 230q-34 26 -77 26q-52 0 -89.5 -36.5t-37.5 -88.5q0 -67 56 -110l507 -379 q34 -26 76 -26h694q33 0 59 20.5t34 52.5l100 401q8 30 10 88t9 86l116 478q3 12 3 26q0 46 -33 79t-80 33q-38 0 -69 -25.5t-40 -62.5l-99 -408h-26l132 547q3 14 3 28q0 47 -32 80t-80 33q-38 0 -68.5 -24t-39.5 -62l-145 -602h-127l-164 682q-9 38 -39.5 62t-68.5 24z M1461 -256h-694q-85 0 -153 51l-507 380q-50 38 -78.5 94t-28.5 118q0 105 75 179t180 74q25 0 49.5 -5.5t41.5 -11t41 -20.5t35 -23t38.5 -29.5t37.5 -28.5l-123 512q-7 35 -7 59q0 93 60 162t152 79q14 87 80.5 144.5t155.5 57.5q83 0 148 -51.5t85 -132.5l103 -428 l83 348q20 81 85 132.5t148 51.5q87 0 152.5 -54t82.5 -139q93 -10 155 -78t62 -161q0 -30 -7 -57l-116 -477q-5 -22 -5 -67q0 -51 -13 -108l-101 -401q-19 -75 -79.5 -122.5t-137.5 -47.5z" />
+<glyph unicode="&#xf25a;" horiz-adv-x="1792" d="M640 1408q-53 0 -90.5 -37.5t-37.5 -90.5v-512v-384l-151 202q-41 54 -107 54q-52 0 -89 -38t-37 -90q0 -43 26 -77l384 -512q38 -51 102 -51h718q22 0 39.5 13.5t22.5 34.5l92 368q24 96 24 194v217q0 41 -28 71t-68 30t-68 -28t-28 -68h-32v61q0 48 -32 81.5t-80 33.5 q-46 0 -79 -33t-33 -79v-64h-32v90q0 55 -37 94.5t-91 39.5q-53 0 -90.5 -37.5t-37.5 -90.5v-96h-32v570q0 55 -37 94.5t-91 39.5zM640 1536q107 0 181.5 -77.5t74.5 -184.5v-220q22 2 32 2q99 0 173 -69q47 21 99 21q113 0 184 -87q27 7 56 7q94 0 159 -67.5t65 -161.5 v-217q0 -116 -28 -225l-92 -368q-16 -64 -68 -104.5t-118 -40.5h-718q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 105 74.5 180.5t179.5 75.5q71 0 130 -35v547q0 106 75 181t181 75zM768 128v384h-32v-384h32zM1024 128v384h-32v-384h32zM1280 128v384h-32 v-384h32z" />
+<glyph unicode="&#xf25b;" d="M1288 889q60 0 107 -23q141 -63 141 -226v-177q0 -94 -23 -186l-85 -339q-21 -86 -90.5 -140t-157.5 -54h-668q-106 0 -181 75t-75 181v401l-239 628q-17 45 -17 91q0 106 75 181t181 75q80 0 145.5 -45.5t93.5 -119.5l17 -44v113q0 106 75 181t181 75t181 -75t75 -181 v-261q27 5 48 5q69 0 127.5 -36.5t88.5 -98.5zM1072 896q-33 0 -60.5 -18t-41.5 -48l-74 -163l-71 -155h55q50 0 90 -31.5t50 -80.5l154 338q10 20 10 46q0 46 -33 79t-79 33zM1293 761q-22 0 -40.5 -8t-29 -16t-23.5 -29.5t-17 -30.5t-17 -37l-132 -290q-10 -20 -10 -46 q0 -46 33 -79t79 -33q33 0 60.5 18t41.5 48l160 352q9 18 9 38q0 50 -32 81.5t-82 31.5zM128 1120q0 -22 8 -46l248 -650v-69l102 111q43 46 106 46h198l106 233v535q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5v-640h-64l-200 526q-14 37 -47 59.5t-73 22.5 q-53 0 -90.5 -37.5t-37.5 -90.5zM1180 -128q44 0 78.5 27t45.5 70l85 339q19 73 19 155v91l-141 -310q-17 -38 -53 -61t-78 -23q-53 0 -93.5 34.5t-48.5 86.5q-44 -57 -114 -57h-208v32h208q46 0 81 33t35 79t-31 79t-77 33h-296q-49 0 -82 -36l-126 -136v-308 q0 -53 37.5 -90.5t90.5 -37.5h668z" />
+<glyph unicode="&#xf25c;" horiz-adv-x="1973" d="M857 992v-117q0 -13 -9.5 -22t-22.5 -9h-298v-812q0 -13 -9 -22.5t-22 -9.5h-135q-13 0 -22.5 9t-9.5 23v812h-297q-13 0 -22.5 9t-9.5 22v117q0 14 9 23t23 9h793q13 0 22.5 -9.5t9.5 -22.5zM1895 995l77 -961q1 -13 -8 -24q-10 -10 -23 -10h-134q-12 0 -21 8.5 t-10 20.5l-46 588l-189 -425q-8 -19 -29 -19h-120q-20 0 -29 19l-188 427l-45 -590q-1 -12 -10 -20.5t-21 -8.5h-135q-13 0 -23 10q-9 10 -9 24l78 961q1 12 10 20.5t21 8.5h142q20 0 29 -19l220 -520q10 -24 20 -51q3 7 9.5 24.5t10.5 26.5l221 520q9 19 29 19h141 q13 0 22 -8.5t10 -20.5z" />
+<glyph unicode="&#xf25d;" horiz-adv-x="1792" d="M1042 833q0 88 -60 121q-33 18 -117 18h-123v-281h162q66 0 102 37t36 105zM1094 548l205 -373q8 -17 -1 -31q-8 -16 -27 -16h-152q-20 0 -28 17l-194 365h-155v-350q0 -14 -9 -23t-23 -9h-134q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h294q128 0 190 -24q85 -31 134 -109 t49 -180q0 -92 -42.5 -165.5t-115.5 -109.5q6 -10 9 -16zM896 1376q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM1792 640 q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+<glyph unicode="&#xf25e;" horiz-adv-x="1792" d="M605 303q153 0 257 104q14 18 3 36l-45 82q-6 13 -24 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13t-23.5 -14.5t-28.5 -13.5t-33.5 -9.5t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78 q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-148 0 -246 -96.5t-98 -240.5q0 -146 97 -241.5t247 -95.5zM1235 303q153 0 257 104q14 18 4 36l-45 82q-8 14 -25 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13t-23.5 -14.5t-28.5 -13.5t-33.5 -9.5 t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-147 0 -245.5 -96.5t-98.5 -240.5q0 -146 97 -241.5t247 -95.5zM896 1376 q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191 t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71z" />
+<glyph unicode="&#xf260;" horiz-adv-x="2048" d="M736 736l384 -384l-384 -384l-672 672l672 672l168 -168l-96 -96l-72 72l-480 -480l480 -480l193 193l-289 287zM1312 1312l672 -672l-672 -672l-168 168l96 96l72 -72l480 480l-480 480l-193 -193l289 -287l-96 -96l-384 384z" />
+<glyph unicode="&#xf261;" horiz-adv-x="1792" d="M717 182l271 271l-279 279l-88 -88l192 -191l-96 -96l-279 279l279 279l40 -40l87 87l-127 128l-454 -454zM1075 190l454 454l-454 454l-271 -271l279 -279l88 88l-192 191l96 96l279 -279l-279 -279l-40 40l-87 -88zM1792 640q0 -182 -71 -348t-191 -286t-286 -191 t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+<glyph unicode="&#xf262;" horiz-adv-x="2304" d="M651 539q0 -39 -27.5 -66.5t-65.5 -27.5q-39 0 -66.5 27.5t-27.5 66.5q0 38 27.5 65.5t66.5 27.5q38 0 65.5 -27.5t27.5 -65.5zM1805 540q0 -39 -27.5 -66.5t-66.5 -27.5t-66.5 27.5t-27.5 66.5t27.5 66t66.5 27t66.5 -27t27.5 -66zM765 539q0 79 -56.5 136t-136.5 57 t-136.5 -56.5t-56.5 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM1918 540q0 80 -56.5 136.5t-136.5 56.5q-79 0 -136 -56.5t-57 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM850 539q0 -116 -81.5 -197.5t-196.5 -81.5q-116 0 -197.5 82t-81.5 197 t82 196.5t197 81.5t196.5 -81.5t81.5 -196.5zM2004 540q0 -115 -81.5 -196.5t-197.5 -81.5q-115 0 -196.5 81.5t-81.5 196.5t81.5 196.5t196.5 81.5q116 0 197.5 -81.5t81.5 -196.5zM1040 537q0 191 -135.5 326.5t-326.5 135.5q-125 0 -231 -62t-168 -168.5t-62 -231.5 t62 -231.5t168 -168.5t231 -62q191 0 326.5 135.5t135.5 326.5zM1708 1110q-254 111 -556 111q-319 0 -573 -110q117 0 223 -45.5t182.5 -122.5t122 -183t45.5 -223q0 115 43.5 219.5t118 180.5t177.5 123t217 50zM2187 537q0 191 -135 326.5t-326 135.5t-326.5 -135.5 t-135.5 -326.5t135.5 -326.5t326.5 -135.5t326 135.5t135 326.5zM1921 1103h383q-44 -51 -75 -114.5t-40 -114.5q110 -151 110 -337q0 -156 -77 -288t-209 -208.5t-287 -76.5q-133 0 -249 56t-196 155q-47 -56 -129 -179q-11 22 -53.5 82.5t-74.5 97.5 q-80 -99 -196.5 -155.5t-249.5 -56.5q-155 0 -287 76.5t-209 208.5t-77 288q0 186 110 337q-9 51 -40 114.5t-75 114.5h365q149 100 355 156.5t432 56.5q224 0 421 -56t348 -157z" />
+<glyph unicode="&#xf263;" horiz-adv-x="1280" d="M640 629q-188 0 -321 133t-133 320q0 188 133 321t321 133t321 -133t133 -321q0 -187 -133 -320t-321 -133zM640 1306q-92 0 -157.5 -65.5t-65.5 -158.5q0 -92 65.5 -157.5t157.5 -65.5t157.5 65.5t65.5 157.5q0 93 -65.5 158.5t-157.5 65.5zM1163 574q13 -27 15 -49.5 t-4.5 -40.5t-26.5 -38.5t-42.5 -37t-61.5 -41.5q-115 -73 -315 -94l73 -72l267 -267q30 -31 30 -74t-30 -73l-12 -13q-31 -30 -74 -30t-74 30q-67 68 -267 268l-267 -268q-31 -30 -74 -30t-73 30l-12 13q-31 30 -31 73t31 74l267 267l72 72q-203 21 -317 94 q-39 25 -61.5 41.5t-42.5 37t-26.5 38.5t-4.5 40.5t15 49.5q10 20 28 35t42 22t56 -2t65 -35q5 -4 15 -11t43 -24.5t69 -30.5t92 -24t113 -11q91 0 174 25.5t120 50.5l38 25q33 26 65 35t56 2t42 -22t28 -35z" />
+<glyph unicode="&#xf264;" d="M927 956q0 -66 -46.5 -112.5t-112.5 -46.5t-112.5 46.5t-46.5 112.5t46.5 112.5t112.5 46.5t112.5 -46.5t46.5 -112.5zM1141 593q-10 20 -28 32t-47.5 9.5t-60.5 -27.5q-10 -8 -29 -20t-81 -32t-127 -20t-124 18t-86 36l-27 18q-31 25 -60.5 27.5t-47.5 -9.5t-28 -32 q-22 -45 -2 -74.5t87 -73.5q83 -53 226 -67l-51 -52q-142 -142 -191 -190q-22 -22 -22 -52.5t22 -52.5l9 -9q22 -22 52.5 -22t52.5 22l191 191q114 -115 191 -191q22 -22 52.5 -22t52.5 22l9 9q22 22 22 52.5t-22 52.5l-191 190l-52 52q141 14 225 67q67 44 87 73.5t-2 74.5 zM1092 956q0 134 -95 229t-229 95t-229 -95t-95 -229t95 -229t229 -95t229 95t95 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+<glyph unicode="&#xf265;" horiz-adv-x="1720" d="M1565 1408q65 0 110 -45.5t45 -110.5v-519q0 -176 -68 -336t-182.5 -275t-274 -182.5t-334.5 -67.5q-176 0 -335.5 67.5t-274.5 182.5t-183 275t-68 336v519q0 64 46 110t110 46h1409zM861 344q47 0 82 33l404 388q37 35 37 85q0 49 -34.5 83.5t-83.5 34.5q-47 0 -82 -33 l-323 -310l-323 310q-35 33 -81 33q-49 0 -83.5 -34.5t-34.5 -83.5q0 -51 36 -85l405 -388q33 -33 81 -33z" />
+<glyph unicode="&#xf266;" horiz-adv-x="2304" d="M1494 -103l-295 695q-25 -49 -158.5 -305.5t-198.5 -389.5q-1 -1 -27.5 -0.5t-26.5 1.5q-82 193 -255.5 587t-259.5 596q-21 50 -66.5 107.5t-103.5 100.5t-102 43q0 5 -0.5 24t-0.5 27h583v-50q-39 -2 -79.5 -16t-66.5 -43t-10 -64q26 -59 216.5 -499t235.5 -540 q31 61 140 266.5t131 247.5q-19 39 -126 281t-136 295q-38 69 -201 71v50l513 -1v-47q-60 -2 -93.5 -25t-12.5 -69q33 -70 87 -189.5t86 -187.5q110 214 173 363q24 55 -10 79.5t-129 26.5q1 7 1 25v24q64 0 170.5 0.5t180 1t92.5 0.5v-49q-62 -2 -119 -33t-90 -81 l-213 -442q13 -33 127.5 -290t121.5 -274l441 1017q-14 38 -49.5 62.5t-65 31.5t-55.5 8v50l460 -4l1 -2l-1 -44q-139 -4 -201 -145q-526 -1216 -559 -1291h-49z" />
+<glyph unicode="&#xf267;" horiz-adv-x="1792" d="M949 643q0 -26 -16.5 -45t-41.5 -19q-26 0 -45 16.5t-19 41.5q0 26 17 45t42 19t44 -16.5t19 -41.5zM964 585l350 581q-9 -8 -67.5 -62.5t-125.5 -116.5t-136.5 -127t-117 -110.5t-50.5 -51.5l-349 -580q7 7 67 62t126 116.5t136 127t117 111t50 50.5zM1611 640 q0 -201 -104 -371q-3 2 -17 11t-26.5 16.5t-16.5 7.5q-13 0 -13 -13q0 -10 59 -44q-74 -112 -184.5 -190.5t-241.5 -110.5l-16 67q-1 10 -15 10q-5 0 -8 -5.5t-2 -9.5l16 -68q-72 -15 -146 -15q-199 0 -372 105q1 2 13 20.5t21.5 33.5t9.5 19q0 13 -13 13q-6 0 -17 -14.5 t-22.5 -34.5t-13.5 -23q-113 75 -192 187.5t-110 244.5l69 15q10 3 10 15q0 5 -5.5 8t-10.5 2l-68 -15q-14 72 -14 139q0 206 109 379q2 -1 18.5 -12t30 -19t17.5 -8q13 0 13 12q0 6 -12.5 15.5t-32.5 21.5l-20 12q77 112 189 189t244 107l15 -67q2 -10 15 -10q5 0 8 5.5 t2 10.5l-15 66q71 13 134 13q204 0 379 -109q-39 -56 -39 -65q0 -13 12 -13q11 0 48 64q111 -75 187.5 -186t107.5 -241l-56 -12q-10 -2 -10 -16q0 -5 5.5 -8t9.5 -2l57 13q14 -72 14 -140zM1696 640q0 163 -63.5 311t-170.5 255t-255 170.5t-311 63.5t-311 -63.5 t-255 -170.5t-170.5 -255t-63.5 -311t63.5 -311t170.5 -255t255 -170.5t311 -63.5t311 63.5t255 170.5t170.5 255t63.5 311zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191 t191 -286t71 -348z" />
+<glyph unicode="&#xf268;" horiz-adv-x="1792" d="M893 1536q240 2 451 -120q232 -134 352 -372l-742 39q-160 9 -294 -74.5t-185 -229.5l-276 424q128 159 311 245.5t383 87.5zM146 1131l337 -663q72 -143 211 -217t293 -45l-230 -451q-212 33 -385 157.5t-272.5 316t-99.5 411.5q0 267 146 491zM1732 962 q58 -150 59.5 -310.5t-48.5 -306t-153 -272t-246 -209.5q-230 -133 -498 -119l405 623q88 131 82.5 290.5t-106.5 277.5zM896 942q125 0 213.5 -88.5t88.5 -213.5t-88.5 -213.5t-213.5 -88.5t-213.5 88.5t-88.5 213.5t88.5 213.5t213.5 88.5z" />
+<glyph unicode="&#xf269;" horiz-adv-x="1792" d="M903 -256q-283 0 -504.5 150.5t-329.5 398.5q-58 131 -67 301t26 332.5t111 312t179 242.5l-11 -281q11 14 68 15.5t70 -15.5q42 81 160.5 138t234.5 59q-54 -45 -119.5 -148.5t-58.5 -163.5q25 -8 62.5 -13.5t63 -7.5t68 -4t50.5 -3q15 -5 9.5 -45.5t-30.5 -75.5 q-5 -7 -16.5 -18.5t-56.5 -35.5t-101 -34l15 -189l-139 67q-18 -43 -7.5 -81.5t36 -66.5t65.5 -41.5t81 -6.5q51 9 98 34.5t83.5 45t73.5 17.5q61 -4 89.5 -33t19.5 -65q-1 -2 -2.5 -5.5t-8.5 -12.5t-18 -15.5t-31.5 -10.5t-46.5 -1q-60 -95 -144.5 -135.5t-209.5 -29.5 q74 -61 162.5 -82.5t168.5 -6t154.5 52t128 87.5t80.5 104q43 91 39 192.5t-37.5 188.5t-78.5 125q87 -38 137 -79.5t77 -112.5q15 170 -57.5 343t-209.5 284q265 -77 412 -279.5t151 -517.5q2 -127 -40.5 -255t-123.5 -238t-189 -196t-247.5 -135.5t-288.5 -49.5z" />
+<glyph unicode="&#xf26a;" d="M768 -92q77 0 139.5 63t100.5 166t59 234.5t21 268.5t-21 268.5t-59 234.5t-100.5 166t-139.5 63t-139.5 -63t-100.5 -166t-59 -234.5t-21 -268.5t21 -268.5t59 -234.5t100.5 -166t139.5 -63zM768 -256q-184 0 -333 77t-240 203t-141 287t-50 329t50 329t141 287t240 203 t333 77q148 0 274 -50t214.5 -136t151.5 -201t92.5 -244t29.5 -265t-29.5 -265t-92.5 -244t-151.5 -201t-214.5 -136t-274 -50z" />
+<glyph unicode="&#xf26b;" horiz-adv-x="1792" d="M716 -69q-143 35 -261.5 114t-197.5 191q-139 -300 -17 -398q26 -21 85 -24.5t127.5 9.5t141 41.5t122.5 66.5zM693 762h452q0 108 -61.5 169t-168.5 61q-103 0 -162.5 -62.5t-59.5 -167.5zM1724 1137h-34q26 102 22.5 170t-25 110t-63.5 57t-93.5 11t-115 -26.5 t-128.5 -56.5t-134 -79q129 -37 238.5 -113.5t185 -179t110 -231.5t15.5 -262h-1005q0 -60 10 -106t34 -85t69.5 -60t112.5 -21q87 0 142.5 44t72.5 122h540q-71 -230 -281.5 -377t-477.5 -147q-83 0 -159 15q-35 -40 -151 -94t-248 -78t-219 35q-78 60 -100 159t7 214 t88 242t143.5 248t173.5 226.5t177.5 183.5t156.5 112v24q-120 -37 -258.5 -137.5t-240.5 -207t-159 -195.5q4 106 34 201t80 169t118 135.5t147.5 100.5t168 65.5t180.5 29.5t185 -8q310 186 503 189h7q57 0 103 -18q80 -30 98 -132.5t-30 -248.5z" />
+<glyph unicode="&#xf26c;" horiz-adv-x="2048" d="M1792 288v960q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1248v-960q0 -66 -47 -113t-113 -47h-736v-128h352q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23 v64q0 14 9 23t23 9h352v128h-736q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+<glyph unicode="&#xf26d;" horiz-adv-x="1792" d="M138 1408h197q-70 -64 -126 -149q-36 -56 -59 -115t-30 -125.5t-8.5 -120t10.5 -132t21 -126t28 -136.5q4 -19 6 -28q51 -238 81 -329q57 -171 152 -275h-272q-48 0 -82 34t-34 82v1304q0 48 34 82t82 34zM1346 1408h308q48 0 82 -34t34 -82v-1304q0 -48 -34 -82t-82 -34 h-178q212 210 196 565l-469 -101q-2 -45 -12 -82t-31 -72t-59.5 -59.5t-93.5 -36.5q-123 -26 -199 40q-32 27 -53 61t-51.5 129t-64.5 258q-35 163 -45.5 263t-5.5 139t23 77q20 41 62.5 73t102.5 45q45 12 83.5 6.5t67 -17t54 -35t43 -48t34.5 -56.5l468 100 q-68 175 -180 287z" />
+<glyph unicode="&#xf26e;" horiz-adv-x="2304" d="M1391 390v0l-1 1q-15 18 -34.5 37.5t-62.5 57.5t-93.5 62t-95.5 24q-48 0 -83 -21.5t-51 -54t-23 -59t-7 -47.5v0v0q0 -21 7 -48t23 -59t51 -53.5t83 -21.5q45 0 95.5 24t94 62.5t62 57t34.5 37.5zM2103 390q0 21 -7 47.5t-23 59t-51 54t-83 21.5q-45 0 -95.5 -24 t-94 -62.5t-62 -57t-34.5 -37.5l-1 -1v0v0l1 -1q15 -18 34.5 -37.5t62.5 -57.5t93.5 -62t95.5 -24q48 0 83 21.5t51 53.5t23 59t7 48zM2304 393q0 -69 -24 -137.5t-68 -126t-116 -93.5t-159 -36q-68 0 -134 24t-113.5 58.5t-84.5 69.5t-59.5 59t-25.5 24t-22.5 -24 t-54.5 -58.5t-81.5 -69.5t-115 -59t-143.5 -24q-65 0 -123.5 22.5t-96.5 54t-66.5 66.5t-41 59.5t-12.5 32.5q0 -8 -8.5 -26.5t-25 -45.5t-47 -55t-69 -52.5t-96.5 -40t-125 -15.5q-71 0 -130 15.5t-98.5 39.5t-70.5 56.5t-48 63.5t-27.5 63.5t-14 54t-3.5 36.5h217 q0 -55 49 -107.5t126 -52.5q79 0 134.5 67t55.5 148q0 80 -52 136.5t-138 56.5q-5 0 -13 -0.5t-31 -5t-43 -12t-42 -24.5t-34 -40h-195l102 583h602v-174h-445q-27 -159 -41 -248q4 0 16.5 13t31.5 28.5t65 28.5t108 13t114 -20.5t82.5 -49.5t51.5 -58.5t31 -50t11 -20.5 t13 25t36.5 60.5t60.5 71.5t97 61t133 25t140.5 -25t115.5 -60.5t83.5 -71.5t56.5 -61t21 -25q2 0 22 25t56 60.5t83.5 71.5t115.5 61t140 25q92 0 164.5 -35t115.5 -93t65 -125t22 -137z" />
+<glyph unicode="&#xf270;" horiz-adv-x="1792" d="M1551 60q15 6 26 3t11 -17.5t-15 -33.5q-13 -16 -44 -43.5t-95.5 -68t-141 -74t-188 -58t-229.5 -24.5q-119 0 -238 31t-209 76.5t-172.5 104t-132.5 105t-84 87.5q-8 9 -10 16.5t1 12t8 7t11.5 2t11.5 -4.5q192 -117 300 -166q389 -176 799 -90q190 40 391 135z M1758 175q11 -16 2.5 -69.5t-28.5 -102.5q-34 -83 -85 -124q-17 -14 -26 -9t0 24q21 45 44.5 121.5t6.5 98.5q-5 7 -15.5 11.5t-27 6t-29.5 2.5t-35 0t-31.5 -2t-31 -3t-22.5 -2q-6 -1 -13 -1.5t-11 -1t-8.5 -1t-7 -0.5h-5.5h-4.5t-3 0.5t-2 1.5l-1.5 3q-6 16 47 40t103 30 q46 7 108 1t76 -24zM1364 618q0 -31 13.5 -64t32 -58t37.5 -46t33 -32l13 -11l-227 -224q-40 37 -79 75.5t-58 58.5l-19 20q-11 11 -25 33q-38 -59 -97.5 -102.5t-127.5 -63.5t-140 -23t-137.5 21t-117.5 65.5t-83 113t-31 162.5q0 84 28 154t72 116.5t106.5 83t122.5 57 t130 34.5t119.5 18.5t99.5 6.5v127q0 65 -21 97q-34 53 -121 53q-6 0 -16.5 -1t-40.5 -12t-56 -29.5t-56 -59.5t-48 -96l-294 27q0 60 22 119t67 113t108 95t151.5 65.5t190.5 24.5q100 0 181 -25t129.5 -61.5t81 -83t45 -86t12.5 -73.5v-589zM692 597q0 -86 70 -133 q66 -44 139 -22q84 25 114 123q14 45 14 101v162q-59 -2 -111 -12t-106.5 -33.5t-87 -71t-32.5 -114.5z" />
+<glyph unicode="&#xf271;" horiz-adv-x="1792" d="M1536 1280q52 0 90 -38t38 -90v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128zM1152 1376v-288q0 -14 9 -23t23 -9 h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 1376v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM1536 -128v1024h-1408v-1024h1408zM896 448h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224 v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224z" />
+<glyph unicode="&#xf272;" horiz-adv-x="1792" d="M1152 416v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23 t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47 t47 -113v-96h128q52 0 90 -38t38 -90z" />
+<glyph unicode="&#xf273;" horiz-adv-x="1792" d="M1111 151l-46 -46q-9 -9 -22 -9t-23 9l-188 189l-188 -189q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22t9 23l189 188l-189 188q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l188 -188l188 188q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23l-188 -188l188 -188q9 -10 9 -23t-9 -22z M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+<glyph unicode="&#xf274;" horiz-adv-x="1792" d="M1303 572l-512 -512q-10 -9 -23 -9t-23 9l-288 288q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l220 -220l444 444q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23 t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47 t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+<glyph unicode="&#xf275;" horiz-adv-x="1792" d="M448 1536q26 0 45 -19t19 -45v-891l536 429q17 14 40 14q26 0 45 -19t19 -45v-379l536 429q17 14 40 14q26 0 45 -19t19 -45v-1152q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h384z" />
+<glyph unicode="&#xf276;" horiz-adv-x="1024" d="M512 448q66 0 128 15v-655q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v655q61 -15 128 -15zM512 1536q212 0 362 -150t150 -362t-150 -362t-362 -150t-362 150t-150 362t150 362t362 150zM512 1312q14 0 23 9t9 23t-9 23t-23 9q-146 0 -249 -103t-103 -249 q0 -14 9 -23t23 -9t23 9t9 23q0 119 84.5 203.5t203.5 84.5z" />
+<glyph unicode="&#xf277;" horiz-adv-x="1792" d="M1745 1239q10 -10 10 -23t-10 -23l-141 -141q-28 -28 -68 -28h-1344q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h576v64q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-64h512q40 0 68 -28zM768 320h256v-512q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v512zM1600 768 q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-1344q-40 0 -68 28l-141 141q-10 10 -10 23t10 23l141 141q28 28 68 28h512v192h256v-192h576z" />
+<glyph unicode="&#xf278;" horiz-adv-x="2048" d="M2020 1525q28 -20 28 -53v-1408q0 -20 -11 -36t-29 -23l-640 -256q-24 -11 -48 0l-616 246l-616 -246q-10 -5 -24 -5q-19 0 -36 11q-28 20 -28 53v1408q0 20 11 36t29 23l640 256q24 11 48 0l616 -246l616 246q32 13 60 -6zM736 1390v-1270l576 -230v1270zM128 1173 v-1270l544 217v1270zM1920 107v1270l-544 -217v-1270z" />
+<glyph unicode="&#xf279;" horiz-adv-x="1792" d="M512 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472q0 20 17 28l480 256q7 4 15 4zM1760 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472 q0 20 17 28l480 256q7 4 15 4zM640 1536q8 0 14 -3l512 -256q18 -10 18 -29v-1472q0 -13 -9.5 -22.5t-22.5 -9.5q-8 0 -14 3l-512 256q-18 10 -18 29v1472q0 13 9.5 22.5t22.5 9.5z" />
+<glyph unicode="&#xf27a;" horiz-adv-x="1792" d="M640 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 640q0 53 -37.5 90.5t-90.5 37.5 t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-110 0 -211 18q-173 -173 -435 -229q-52 -10 -86 -13q-12 -1 -22 6t-13 18q-4 15 20 37q5 5 23.5 21.5t25.5 23.5t23.5 25.5t24 31.5t20.5 37 t20 48t14.5 57.5t12.5 72.5q-146 90 -229.5 216.5t-83.5 269.5q0 174 120 321.5t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
+<glyph unicode="&#xf27b;" horiz-adv-x="1792" d="M640 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 -53 -37.5 -90.5t-90.5 -37.5 t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5 t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51 t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 130 71 248.5t191 204.5t286 136.5t348 50.5t348 -50.5t286 -136.5t191 -204.5t71 -248.5z" />
+<glyph unicode="&#xf27c;" horiz-adv-x="1024" d="M512 345l512 295v-591l-512 -296v592zM0 640v-591l512 296zM512 1527v-591l-512 -296v591zM512 936l512 295v-591z" />
+<glyph unicode="&#xf27d;" horiz-adv-x="1792" d="M1709 1018q-10 -236 -332 -651q-333 -431 -562 -431q-142 0 -240 263q-44 160 -132 482q-72 262 -157 262q-18 0 -127 -76l-77 98q24 21 108 96.5t130 115.5q156 138 241 146q95 9 153 -55.5t81 -203.5q44 -287 66 -373q55 -249 120 -249q51 0 154 161q101 161 109 246 q13 139 -109 139q-57 0 -121 -26q120 393 459 382q251 -8 236 -326z" />
+<glyph unicode="&#xf27e;" d="M0 1408h1536v-1536h-1536v1536zM1085 293l-221 631l221 297h-634l221 -297l-221 -631l317 -304z" />
+<glyph unicode="&#xf280;" d="M0 1408h1536v-1536h-1536v1536zM908 1088l-12 -33l75 -83l-31 -114l25 -25l107 57l107 -57l25 25l-31 114l75 83l-12 33h-95l-53 96h-32l-53 -96h-95zM641 925q32 0 44.5 -16t11.5 -63l174 21q0 55 -17.5 92.5t-50.5 56t-69 25.5t-85 7q-133 0 -199 -57.5t-66 -182.5v-72 h-96v-128h76q20 0 20 -8v-382q0 -14 -5 -20t-18 -7l-73 -7v-88h448v86l-149 14q-6 1 -8.5 1.5t-3.5 2.5t-0.5 4t1 7t0.5 10v387h191l38 128h-231q-6 0 -2 6t4 9v80q0 27 1.5 40.5t7.5 28t19.5 20t36.5 5.5zM1248 96v86l-54 9q-7 1 -9.5 2.5t-2.5 3t1 7.5t1 12v520h-275 l-23 -101l83 -22q23 -7 23 -27v-370q0 -14 -6 -18.5t-20 -6.5l-70 -9v-86h352z" />
+<glyph unicode="&#xf281;" horiz-adv-x="1792" />
+<glyph unicode="&#xf282;" horiz-adv-x="1792" />
+<glyph unicode="&#xf283;" horiz-adv-x="1792" />
+<glyph unicode="&#xf284;" horiz-adv-x="1792" />
+<glyph unicode="&#xf285;" horiz-adv-x="1792" />
+<glyph unicode="&#xf286;" horiz-adv-x="1792" />
+<glyph unicode="&#xf287;" horiz-adv-x="1792" />
+<glyph unicode="&#xf288;" horiz-adv-x="1792" />
+<glyph unicode="&#xf289;" horiz-adv-x="1792" />
+<glyph unicode="&#xf28a;" horiz-adv-x="1792" />
+<glyph unicode="&#xf28b;" horiz-adv-x="1792" />
+<glyph unicode="&#xf28c;" horiz-adv-x="1792" />
+<glyph unicode="&#xf28d;" horiz-adv-x="1792" />
+<glyph unicode="&#xf28e;" horiz-adv-x="1792" />
+<glyph unicode="&#xf500;" horiz-adv-x="1792" />
+</font>
+</defs></svg> 
\ No newline at end of file
diff --git a/data/interfaces/default/fonts/fontawesome-webfont.ttf b/data/interfaces/default/fonts/fontawesome-webfont.ttf
new file mode 100644
index 00000000..d7994e13
Binary files /dev/null and b/data/interfaces/default/fonts/fontawesome-webfont.ttf differ
diff --git a/data/interfaces/default/fonts/fontawesome-webfont.woff b/data/interfaces/default/fonts/fontawesome-webfont.woff
new file mode 100644
index 00000000..6fd4ede0
Binary files /dev/null and b/data/interfaces/default/fonts/fontawesome-webfont.woff differ
diff --git a/data/interfaces/default/fonts/fontawesome-webfont.woff2 b/data/interfaces/default/fonts/fontawesome-webfont.woff2
new file mode 100644
index 00000000..5560193c
Binary files /dev/null and b/data/interfaces/default/fonts/fontawesome-webfont.woff2 differ
diff --git a/data/interfaces/default/graphs.html b/data/interfaces/default/graphs.html
index 7201c35f..8f114b67 100644
--- a/data/interfaces/default/graphs.html
+++ b/data/interfaces/default/graphs.html
@@ -1,9 +1,8 @@
 <%inherit file="base.html"/>
 
 <%def name="headIncludes()">
-<link rel="stylesheet" href="${http_root}css/bootstrap-select.min.css">
-<link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.min.css">
-<link rel="stylesheet" href="${http_root}css/tautulli-dataTables.css">
+<link rel="stylesheet" href="interfaces/default/css/dataTables.bootstrap.css">
+<link rel="stylesheet" href="interfaces/default/css/plexpy-dataTables.css">
 </%def>
 
 <%def name="body()">
@@ -12,49 +11,47 @@
         <div class="header-bar">
             <span><i class="fa fa-bar-chart"></i> Graphs</span>
         </div>
-        <div class="button-bar">
-            <div class="btn-group" id="user-selection">
-                <label>
-                    <select name="graph-user" id="graph-user" multiple>
-                    </select>
+        <div class="button-bar hidden-xs">
+            <div class="btn-group" data-toggle="buttons" id="yaxis-selection">
+                <label class="btn btn-dark active">
+                    <input type="radio" name="yaxis-options" id="yaxis-count" value="plays" autocomplete="off" checked> Play Count
                 </label>
-            </div>
-            <div class="btn-group" style="margin-right: 2px;" data-toggle="buttons" id="yaxis-selection">
-                <label class="btn btn-dark btn-filter">
-                    <input type="radio" name="yaxis-options" id="yaxis-plays" value="plays" autocomplete="off"> Play Count
-                </label>
-                <label class="btn btn-dark btn-filter">
+                <label class="btn btn-dark">
                     <input type="radio" name="yaxis-options" id="yaxis-duration" value="duration" autocomplete="off"> Play Duration
                 </label>
             </div>
-            <div class="input-group pull-right" style="width: 1px;" id="days-selection">
-                <span class="input-group-addon btn-dark inactive">Last</span>
-                <input type="number" class="form-control number-input" name="graph-days" id="graph-days" value="30" min="1" data-default="7" data-toggle="tooltip" title="Min: 1 day" />
-                <span class="input-group-addon btn-dark inactive">days</span>
+            <div class="btn-group" data-toggle="buttons" id="days-selection">
+                <label class="btn btn-dark">
+                    <input type="radio" name="date-options" id="graph-7" value="7" autocomplete="off"> 7 days
+                </label>
+                <label class="btn btn-dark active">
+                    <input type="radio" name="date-options" id="graph-30" value="30" autocomplete="off" checked> 30 days
+                </label>
+                <label class="btn btn-dark">
+                    <input type="radio" name="date-options" id="graph-90" value="90" autocomplete="off"> 90 days
+                </label>
+                <label class="btn btn-dark">
+                    <input type="radio" name="date-options" id="graph-365" value="365" autocomplete="off"> 1 year
+                </label>
             </div>
-            <div class="input-group pull-right" style="width: 1px;" id="months-selection">
-                <span class="input-group-addon btn-dark inactive">Last</span>
-                <input type="number" class="form-control number-input" name="graph-months" id="graph-months" value="12" min="1" data-default="12" data-toggle="tooltip" title="Min: 1 month" />
-                <span class="input-group-addon btn-dark inactive">months</span>
-			</div>
         </div>
     </div>
-    <div class="table-card-back">
-        <ul class="nav nav-list nav-pills" role="tablist" id="graph-tabs">
-            <li role="presentation"><a id="nav-tabs-plays" href="#tabs-plays" aria-controls="tabs-plays" data-toggle="tab" role="tab">Media Type</a></li>
-            <li role="presentation"><a id="nav-tabs-stream" href="#tabs-stream" aria-controls="tabs-stream" data-toggle="tab" role="tab">Stream Type</a></li>
-            <li role="presentation"><a id="nav-tabs-total" href="#tabs-total" aria-controls="tabs-total" data-toggle="tab" role="tab">Play Totals</a></li>
+    <div class='table-card-back'>
+        <ul class="nav nav-pills" role="tablist" id="graph-tabs">
+            <li role="presentation" class="active"><a href="#tabs-1" aria-controls="tabs-1" data-toggle="tab" role="tab">Plays by period</a></li>
+            <li role="presentation"><a href="#tabs-2" aria-controls="tabs-2" data-toggle="tab" role="tab">Stream Info</a></li>
+            <li role="presentation"><a href="#tabs-3" aria-controls="tabs-3" data-toggle="tab" role="tab">Play Totals</a></li>
         </ul>
         <div class="tab-content">
-            <div role="tabpanel" class="tab-pane" id="tabs-plays">
+            <div role="tabpanel" class="tab-pane active" id="tabs-1">
                 <div class="row">
                     <div class="col-md-12">
-                        <h4><i class="fa fa-history"></i> Daily <span class="yaxis-text" style="text-transform: lowercase;">play count</span> by media type <small>Last <span class="days">30</span> days</small></h4>
+                        <h4><i class="fa fa-history"></i> Daily <span class="yaxis-text">Play count</span> <small>Last <span class="days">30</span> days</small></h4>
                         <p class="help-block">
                             The total play count or duration of tv, movies, and music played per day. Click a graph point to open up a list of items played for that specific date.
                         </p>
                         <div class="graphs-instance">
-                            <div class="watch-chart" id="graph_plays_by_day">
+                            <div class="watch-chart" id="chart_div_plays_by_day">
                                 <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...</div>
                                 <br>
                             </div>
@@ -68,9 +65,8 @@
                             The combined total of tv, movies, and music played per day of the week.
                         </p>
                         <div class="graphs-instance">
-                            <div class="watch-chart" id="graph_plays_by_dayofweek" style="float: left;">
-                                <div class="graphs-load">
-                                    <i class="fa fa-refresh fa-spin"></i> Loading chart...
+                            <div class="watch-chart" id="chart_div_plays_by_dayofweek" style="float: left;">
+                                <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...
                                 </div>
                                 <br>
                             </div>
@@ -82,9 +78,8 @@
                             The combined total of tv, movies, and music played per hour of the day.
                         </p>
                         <div class="graphs-instance">
-                            <div class="watch-chart" id="graph_plays_by_hourofday">
-                                <div class="graphs-load">
-                                    <i class="fa fa-refresh fa-spin"></i> Loading chart...
+                            <div class="watch-chart" id="chart_div_plays_by_hourofday">
+                                <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...
                                 </div>
                                 <br>
                             </div>
@@ -98,9 +93,8 @@
                             The combined total of tv, movies, and music played by top 10 most active platforms.
                         </p>
                         <div class="graphs-instance">
-                            <div class="watch-chart" id="graph_plays_by_platform" style="float: left;">
-                                <div class="graphs-load">
-                                    <i class="fa fa-refresh fa-spin"></i> Loading chart...
+                            <div class="watch-chart" id="chart_div_plays_by_platform" style="float: left;">
+                                <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...
                                 </div>
                                 <br>
                             </div>
@@ -112,9 +106,8 @@
                             The combined total of tv, movies, and music played by top 10 most active users.
                         </p>
                         <div class="graphs-instance">
-                            <div class="watch-chart" id="graph_plays_by_user">
-                                <div class="graphs-load">
-                                    <i class="fa fa-refresh fa-spin"></i> Loading chart...
+                            <div class="watch-chart" id="chart_div_plays_by_user">
+                                <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...
                                 </div>
                                 <br>
                             </div>
@@ -122,29 +115,16 @@
                     </div>
                 </div>
             </div>
-            <div role="tabpanel" class="tab-pane" id="tabs-stream">
+
+            <div role="tabpanel" class="tab-pane" id="tabs-2">
                 <div class="row">
                     <div class="col-md-12">
-                        <h4><i class="fa fa-video-camera"></i> Daily <span class="yaxis-text" style="text-transform: lowercase;">play count</span> by stream type <small>Last <span class="days">30</span> days</small></h4>
+                        <h4><i class="fa fa-video-camera"></i> Daily Stream type breakdown <small>Last <span class="days">30</span> days</small></h4>
                         <p class="help-block">
                             The total play count or duration of tv, movies, and music by the transcode decision. Click a graph point to open up a list of items played for that specific date.
                         </p>
                         <div class="graphs-instance">
-                            <div class="watch-chart" id="graph_plays_by_stream_type">
-                                <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...</div>
-                                <br>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="row" id="concurrent-graph">
-                    <div class="col-md-12">
-                        <h4><i class="fa fa-video-camera"></i> Daily concurrent stream count</span> by stream type <small>Last <span class="days">30</span> days</small></h4>
-                        <p class="help-block">
-                            The total count of concurrent streams of tv, movies, and music by the transcode decision.
-                        </p>
-                        <div class="graphs-instance">
-                            <div class="watch-chart" id="graph_concurrent_streams_by_stream_type">
+                            <div class="watch-chart" id="chart_div_plays_by_stream_type">
                                 <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...</div>
                                 <br>
                             </div>
@@ -153,12 +133,12 @@
                 </div>
                 <div class="row">
                     <div class="col-md-6">
-                        <h4><i class="fa fa-expand-arrows-alt"></i> <span class="yaxis-text">Play count</span> by source resolution <small>Last <span class="days">30</span> days</small></h4>
+                        <h4><i class="fa fa-expand"></i> <span class="yaxis-text">Play count</span> by source resolution <small>Last <span class="days">30</span> days</small></h4>
                         <p class="help-block">
                             The combined total of tv and movies by their original resolution (pre-transcoding).
                         </p>
                         <div class="graphs-instance">
-                            <div class="watch-chart" id="graph_plays_by_source_resolution" style="float: left;">
+                            <div class="watch-chart" id="chart_div_plays_by_source_resolution" style="float: left;">
                                 <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...
                                 </div>
                                 <br>
@@ -166,12 +146,12 @@
                         </div>
                     </div>
                     <div class="col-md-6">
-                        <h4><i class="fa fa-expand-arrows-alt"></i> <span class="yaxis-text">Play count</span> by stream resolution <small>Last <span class="days">30</span> days</small></h4>
+                        <h4><i class="fa fa-expand"></i> <span class="yaxis-text">Play count</span> by stream resolution <small>Last <span class="days">30</span> days</small></h4>
                         <p class="help-block">
                             The combined total of tv and movies by their streamed resolution (post-transcoding).
                         </p>
                         <div class="graphs-instance">
-                            <div class="watch-chart" id="graph_plays_by_stream_resolution">
+                            <div class="watch-chart" id="chart_div_plays_by_stream_resolution">
                                 <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...
                                 </div>
                                 <br>
@@ -186,7 +166,7 @@
                             The combined total of tv, movies, and music by platform and stream type.
                         </p>
                         <div class="graphs-instance">
-                            <div class="watch-chart" id="graph_plays_by_platform_by_stream_type" style="float: left;">
+                            <div class="watch-chart" id="chart_div_plays_by_platform_by_stream_type" style="float: left;">
                                 <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...
                                 </div>
                                 <br>
@@ -199,7 +179,7 @@
                             The combined total of tv, movies, and music by user and stream type.
                         </p>
                         <div class="graphs-instance">
-                            <div class="watch-chart" id="graph_plays_by_user_by_stream_type" style="float: left;">
+                            <div class="watch-chart" id="chart_div_plays_by_user_by_stream_type" style="float: left;">
                                 <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...
                                 </div>
                                 <br>
@@ -208,15 +188,16 @@
                     </div>
                 </div>
             </div>
-            <div role="tabpanel" class="tab-pane" id="tabs-total">
+
+            <div role="tabpanel" class="tab-pane" id="tabs-3">
                 <div class="row">
                     <div class="col-md-12">
-                        <h4><i class="fa fa-calendar"></i> Total <span class="yaxis-text" style="text-transform: lowercase;">play count</span> by month <small>Last <span class="months">12</span> months</small></h4>
+                        <h4><i class="fa fa-calendar"></i> Plays by Month <small>Last 12 months</small></h4>
                         <p class="help-block">
                             The combined total of tv, movies, and music by month.
                         </p>
                         <div class="graphs-instance">
-                            <div class="watch-chart" id="graph_plays_by_month">
+                            <div class="watch-chart" id="chart_div_plays_by_month">
                                 <div class="graphs-load"><i class="fa fa-refresh fa-spin"></i> Loading chart...
                                 </div>
                                 <br>
@@ -225,30 +206,24 @@
                     </div>
                 </div>
             </div>
+            <div class="modal fade" id="history-modal" tabindex="-1" role="dialog" aria-labelledby="history-modal">
+            </div>
         </div>
     </div>
 </div>
 </%def>
 
-<%def name="modalIncludes()">
-<div class="modal fade" id="history-modal" tabindex="-1" role="dialog" aria-labelledby="history-modal">
-</div>
-<div class="modal fade" id="info-modal" tabindex="-1" role="dialog" aria-labelledby="info-modal">
-</div>
-</%def>
-
 <%def name="javascriptIncludes()">
-<script src="${http_root}js/bootstrap-select.min.js"></script>
-<script src="${http_root}js/highcharts.min.js"></script>
-<script src="${http_root}js/jquery.dataTables.min.js"></script>
-<script src="${http_root}js/dataTables.bootstrap.min.js"></script>
-<script src="${http_root}js/dataTables.bootstrap.pagination.js"></script>
+<script src="interfaces/default/js/moment-with-locale.js"></script>
+<script src="interfaces/default/js/moment-duration-format.js"></script>
+<script src="interfaces/default/js/highcharts/js/highcharts.js"></script>
+<script src="interfaces/default/js/jquery.dataTables.min.js"></script>
+<script src="interfaces/default/js/dataTables.bootstrap.min.js"></script>
+<script src="interfaces/default/js/dataTables.bootstrap.pagination.js"></script>
 
 <script>
-    var selected_user_id = null;
-
     // Modal popup dialog
-    function selectHandler(selectedDate, selectedSeries) {
+    function selectHandler(selectedDate) {
 
         try
         {
@@ -258,216 +233,95 @@
             var y = dateValue.getFullYear();
             var dateString = '' + y + '-' + (m<=9 ? '0' + m : m) + '-' + (d <= 9 ? '0' + d : d);
 
-            var media_type = null;
-            var transcode_decision = null;
-            switch(selectedSeries) {
-                case "TV": media_type = 'episode'; break;
-                case "Movies": media_type = 'movie'; break;
-                case "Music": media_type = 'track'; break;
-                case "Live TV": media_type = 'live'; break;
-                case "Direct Play": transcode_decision = 'direct play'; break;
-                case "Direct Stream": transcode_decision = 'copy'; break;
-                case "Transcode": transcode_decision = 'transcode'; break;
-            }
-            
             $.ajax({
-                url: "history_table_modal",
-                cache: false,
-                async: true,
-                data: {
-                    user_id: selected_user_id,
-                    start_date: dateString,
-                    media_type: media_type,
-                    transcode_decision: transcode_decision
-                },
+                "url": "history_table_modal",
+                type: 'post',
+                data:  { 'start_date': dateString },
                 complete: function(xhr, status) {
+                    $('#history-modal').modal('show');
                     $("#history-modal").html(xhr.responseText);
-                    $('#history-modal').modal();
                 }
             });
         }
         catch(err)
         {
-          console.log("Failed to retrieve history modal data.");
+          console.log("Failed to retrieve data");
         }
     }
-
-    function getGraphVisibility(chart_name, data_series) {
-        var chart_key = 'HighCharts_' + chart_name;
-        var chart_visibility = JSON.parse(getLocalStorage(chart_key, null)) || [];
-
-        chart_visibility = chart_visibility.reduce(function(obj, s) {
-            obj[s.name] = s.visible;
-            return obj;
-        }, {});
-
-        if (!("Total" in chart_visibility)) {
-            chart_visibility["Total"] = false;
-        }
-
-        return data_series.map(function(s) {
-            var obj = Object.assign({}, s);
-            obj.visible = (chart_visibility[s.name] !== false);
-            return obj
-        });
-    }
-
-    function setGraphVisibility(chart_name, data_series, series_name) {
-        var chart_key = 'HighCharts_' + chart_name;
-
-        var chart_visibility = data_series.map(function(s) {
-            return {name: s.name, visible: (s.name === series_name) ? !s.visible : s.visible}
-        });
-
-        setLocalStorage(chart_key, JSON.stringify(chart_visibility));
-    }
-
-    function getGraphColors(data_series) {
-        var colors = {
-            'TV': '#E5A00D',
-            'Movies': '#FFFFFF',
-            'Music': '#F06464',
-            'Live TV': '#19A0D7',
-            'Direct Play': '#E5A00D',
-            'Direct Stream': '#FFFFFF',
-            'Transcode': '#F06464',
-            'Max. Concurrent Streams': '#96C83C',
-            'Total': '#96C83C'
-        };
-        var series_colors = [];
-        $.each(data_series, function(index, series) {
-            series_colors.push(colors[series.name]);
-        });
-        return series_colors;
-    }
 </script>
-<script src="${http_root}js/graphs/plays_by_day.js${cache_param}"></script>
-<script src="${http_root}js/graphs/plays_by_dayofweek.js${cache_param}"></script>
-<script src="${http_root}js/graphs/plays_by_hourofday.js${cache_param}"></script>
-<script src="${http_root}js/graphs/plays_by_platform.js${cache_param}"></script>
-<script src="${http_root}js/graphs/plays_by_user.js${cache_param}"></script>
-<script src="${http_root}js/graphs/plays_by_stream_type.js${cache_param}"></script>
-<script src="${http_root}js/graphs/concurrent_streams_by_stream_type.js${cache_param}"></script>
-<script src="${http_root}js/graphs/plays_by_source_resolution.js${cache_param}"></script>
-<script src="${http_root}js/graphs/plays_by_stream_resolution.js${cache_param}"></script>
-<script src="${http_root}js/graphs/plays_by_platform_by_stream_type.js${cache_param}"></script>
-<script src="${http_root}js/graphs/plays_by_user_by_stream_type.js${cache_param}"></script>
-<script src="${http_root}js/graphs/plays_by_month.js${cache_param}"></script>
+<script src="interfaces/default/js/graphs/plays_by_day.js"></script>
+<script src="interfaces/default/js/graphs/plays_by_dayofweek.js"></script>
+<script src="interfaces/default/js/graphs/plays_by_hourofday.js"></script>
+<script src="interfaces/default/js/graphs/plays_by_platform.js"></script>
+<script src="interfaces/default/js/graphs/plays_by_user.js"></script>
+<script src="interfaces/default/js/graphs/plays_by_stream_type.js"></script>
+<script src="interfaces/default/js/graphs/plays_by_source_resolution.js"></script>
+<script src="interfaces/default/js/graphs/plays_by_stream_resolution.js"></script>
+<script src="interfaces/default/js/graphs/plays_by_platform_by_stream_type.js"></script>
+<script src="interfaces/default/js/graphs/plays_by_user_by_stream_type.js"></script>
+<script src="interfaces/default/js/graphs/plays_by_month.js"></script>
 <script>
     $(document).ready(function () {
 
-        // Initial values for graph from local storage
-        var yaxis = getLocalStorage('graph_type', 'plays');
-        var current_day_range = getLocalStorage('graph_days', 30);
-        var current_month_range = getLocalStorage('graph_months', 12);
-        var current_tab = '#' + getLocalStorage('graph_tab', 'tabs-plays');
-
-        // Update tab values from upgrading
-        switch (current_tab) {
-            case '#tabs-1':
-                current_tab = '#tabs-plays'
-                break
-            case '#tabs-2':
-                current_tab = '#tabs-stream'
-                break
-            case '#tabs-3':
-                current_tab = '#tabs-total'
-                break
-            default:
-                break
-        }
-
-        if (window.location.hash === '#concurrent-graph') {
-            current_tab = '#tabs-stream';
-        }
-
-        $('#yaxis-' + yaxis).prop('checked', true);
-        $('#yaxis-' + yaxis).closest('label').addClass('active');
-        $('#graph-days').val(current_day_range);
-        $('#graph-months').val(current_month_range);
-        $('#nav-' + current_tab.replace('#', '')).tab('show').trigger('show.bs.tab');
-        //$(current_tab).addClass('active');
-
-
-        $('.days').text(current_day_range);
-        $('.months').text(current_month_range);
-        
-        // Load user ids and names (for the selector)
-        $.ajax({
-            url: 'get_user_names',
-            type: 'get',
-            dataType: "json",
-            success: function (data) {
-                let select = $('#graph-user');
-                let by_id = {};
-                data.sort(function(a, b) {
-                    return a.friendly_name.localeCompare(b.friendly_name);
-                });
-                data.forEach(function(item) {
-                    select.append('<option value="' + item.user_id + '">' +
-                        item.friendly_name + '</option>');
-                    by_id[item.user_id] = item.friendly_name;
-                });
-                select.selectpicker({
-                    countSelectedText: function(sel, total) {
-                        if (sel === 0 || sel === total) {
-                            return 'All users';
-                        } else if (sel > 1) {
-                            return sel + ' users';
-                        } else {
-                            return select.val().map(function(id) {
-                                return by_id[id];
-                            }).join(', ');
-                        }
-                    },
-                    style: 'btn-dark',
-                    actionsBox: true,
-                    selectedTextFormat: 'count',
-                    noneSelectedText: 'All users'
-                });
-                select.selectpicker('render');
-                select.selectpicker('selectAll');
-            }
+        // Save graph state to cookies
+        $('input[name=yaxis-options]').change(function() {
+            setCookie('graphType', $(this).val(), 365, '/');
         });
-
-        function dataSecondsToHours(data) {
-            $.each(data.series, function (i, series) {
-                series.data = $.map(series.data, function (value) {
-                    return value / 60 / 60;
-                });
-            });
+        $('input[name=date-options]').change(function() {
+            setCookie('graphDate', $(this).val(), 365, '/');
+        });
+        $('a[data-toggle=tab]').click(function() {
+            setCookie('graphTab', $(this).attr('href'), 365, '/');
+        });
+        
+        // Initial values for graph if no saved state
+        var yaxis = 'plays';
+        var current_range = 30;
+        var current_tab = '#tabs-1';
+            
+        // Read saved graph state from cookies and set initial values
+        if(getCookie('graphType')) {
+            var yaxis = getCookie('graphType');
+            $('input[name=yaxis-options][value=' + yaxis + ']').prop('checked', true).trigger('click');
         }
+        if(getCookie('graphDate')) {
+            var current_range = getCookie('graphDate');
+            $('input[name=date-options][value=' + current_range + ']').prop('checked', true).trigger('click');
+            $('.days').html(current_range);
+        }
+        if(getCookie('graphTab')) {
+            var current_tab = getCookie('graphTab');
+            $('a[data-toggle=tab][href=' + current_tab + ']').trigger('click');
+        }
+
+        var music_visible = (${config['music_logging_enable']} == 1 ? true : false);
 
         function loadGraphsTab1(time_range, yaxis) {
-            $('#days-selection').show();
-            $('#months-selection').hide();
-
             setGraphFormat(yaxis);
 
             $.ajax({
                 url: "get_plays_by_date",
                 type: 'get',
-                data: { time_range: time_range, y_axis: yaxis, user_id: selected_user_id },
+                data: { time_range: time_range, y_axis: yaxis },
                 dataType: "json",
                 success: function(data) {
                     var dateArray = [];
-                    $.each(data.categories, function (i, day) {
-                        dateArray.push(moment(day, 'YYYY-MM-DD').valueOf());
+                    for (var i = 0; i < data.categories.length; i++) {
+                        dateArray.push(moment(data.categories[i], 'YYYY-MM-DD').valueOf());
                         // Highlight the weekend
-                        if ((moment(day, 'YYYY-MM-DD').format('ddd') === 'Sat') ||
-                            (moment(day, 'YYYY-MM-DD').format('ddd') === 'Sun')) {
+                        if ((moment(data.categories[i], 'YYYY-MM-DD').format('ddd') == 'Sat') ||
+                            (moment(data.categories[i], 'YYYY-MM-DD').format('ddd') == 'Sun')) {
                             hc_plays_by_day_options.xAxis.plotBands.push({
                                 from: i-0.5,
                                 to: i+0.5,
                                 color: 'rgba(80,80,80,0.3)'
                             });
                         }
-                    });
-                    if (yaxis === 'duration') { dataSecondsToHours(data); }
+                    }
                     hc_plays_by_day_options.yAxis.min = 0;
                     hc_plays_by_day_options.xAxis.categories = dateArray;
-                    hc_plays_by_day_options.series = getGraphVisibility(hc_plays_by_day_options.chart.renderTo, data.series);
-                    hc_plays_by_day_options.colors = getGraphColors(data.series);
+                    hc_plays_by_day_options.series = data.series;
+                    hc_plays_by_day_options.series[2].visible = music_visible;
                     var hc_plays_by_day = new Highcharts.Chart(hc_plays_by_day_options);
                 }
             });
@@ -475,13 +329,12 @@
             $.ajax({
                 url: "get_plays_by_dayofweek",
                 type: 'get',
-                data: { time_range: time_range, y_axis: yaxis, user_id: selected_user_id },
+                data: { time_range: time_range, y_axis: yaxis },
                 dataType: "json",
                 success: function(data) {
-                    if (yaxis === 'duration') { dataSecondsToHours(data); }
                     hc_plays_by_dayofweek_options.xAxis.categories = data.categories;
-                    hc_plays_by_dayofweek_options.series = getGraphVisibility(hc_plays_by_dayofweek_options.chart.renderTo, data.series);
-                    hc_plays_by_dayofweek_options.colors = getGraphColors(data.series);
+                    hc_plays_by_dayofweek_options.series = data.series;
+                    hc_plays_by_dayofweek_options.series[2].visible = music_visible;
                     var hc_plays_by_dayofweek = new Highcharts.Chart(hc_plays_by_dayofweek_options);
                 }
             });
@@ -489,13 +342,12 @@
             $.ajax({
                 url: "get_plays_by_hourofday",
                 type: 'get',
-                data: { time_range: time_range, y_axis: yaxis, user_id: selected_user_id },
+                data: { time_range: time_range, y_axis: yaxis },
                 dataType: "json",
                 success: function(data) {
-                    if (yaxis === 'duration') { dataSecondsToHours(data); }
                     hc_plays_by_hourofday_options.xAxis.categories = data.categories;
-                    hc_plays_by_hourofday_options.series = getGraphVisibility(hc_plays_by_hourofday_options.chart.renderTo, data.series);
-                    hc_plays_by_hourofday_options.colors = getGraphColors(data.series);
+                    hc_plays_by_hourofday_options.series = data.series;
+                    hc_plays_by_hourofday_options.series[2].visible = music_visible;
                     var hc_plays_by_hourofday = new Highcharts.Chart(hc_plays_by_hourofday_options);
                 }
             });
@@ -503,13 +355,12 @@
             $.ajax({
                 url: "get_plays_by_top_10_platforms",
                 type: 'get',
-                data: { time_range: time_range, y_axis: yaxis, user_id: selected_user_id },
+                data: { time_range: time_range, y_axis: yaxis },
                 dataType: "json",
                 success: function(data) {
-                    if (yaxis === 'duration') { dataSecondsToHours(data); }
                     hc_plays_by_platform_options.xAxis.categories = data.categories;
-                    hc_plays_by_platform_options.series = getGraphVisibility(hc_plays_by_platform_options.chart.renderTo, data.series);
-                    hc_plays_by_platform_options.colors = getGraphColors(data.series);
+                    hc_plays_by_platform_options.series = data.series;
+                    hc_plays_by_platform_options.series[2].visible = music_visible;
                     var hc_plays_by_platform = new Highcharts.Chart(hc_plays_by_platform_options);
                 }
             });
@@ -517,91 +368,54 @@
             $.ajax({
                 url: "get_plays_by_top_10_users",
                 type: 'get',
-                data: { time_range: time_range, y_axis: yaxis, user_id: selected_user_id  },
+                data: { time_range: time_range, y_axis: yaxis },
                 dataType: "json",
                 success: function(data) {
-                    if (yaxis === 'duration') { dataSecondsToHours(data); }
                     hc_plays_by_user_options.xAxis.categories = data.categories;
-                    hc_plays_by_user_options.series = getGraphVisibility(hc_plays_by_user_options.chart.renderTo, data.series);
-                    hc_plays_by_user_options.colors = getGraphColors(data.series);
+                    hc_plays_by_user_options.series = data.series;
+                    hc_plays_by_user_options.series[2].visible = music_visible;
                     var hc_plays_by_user = new Highcharts.Chart(hc_plays_by_user_options);
                 }
             });
-
-            $('#nav-tabs-plays').tab('show');
         }
 
         function loadGraphsTab2(time_range, yaxis) {
-            $('#days-selection').show();
-            $('#months-selection').hide();
-
             setGraphFormat(yaxis);
 
             $.ajax({
                 url: "get_plays_by_stream_type",
                 type: 'get',
-                data: { time_range: time_range, y_axis: yaxis, user_id: selected_user_id },
+                data: { time_range: time_range, y_axis: yaxis },
                 dataType: "json",
                 success: function(data) {
                     var dateArray = [];
-                    $.each(data.categories, function (i, day) {
-                        dateArray.push(moment(day, 'YYYY-MM-DD').valueOf());
+                    for (var i = 0; i < data.categories.length; i++) {
+                        dateArray.push(moment(data.categories[i], 'YYYY-MM-DD').valueOf());
                         // Highlight the weekend
-                        if ((moment(day, 'YYYY-MM-DD').format('ddd') == 'Sat') ||
-                            (moment(day, 'YYYY-MM-DD').format('ddd') == 'Sun')) {
-                            hc_plays_by_day_options.xAxis.plotBands.push({
+                        if ((moment(data.categories[i], 'YYYY-MM-DD').format('ddd') == 'Sat') ||
+                            (moment(data.categories[i], 'YYYY-MM-DD').format('ddd') == 'Sun')) {
+                            hc_plays_by_stream_type_options.xAxis.plotBands.push({
                                 from: i-0.5,
                                 to: i+0.5,
                                 color: 'rgba(80,80,80,0.3)'
                             });
                         }
-                    });
-                    if (yaxis === 'duration') { dataSecondsToHours(data); }
+                    }
                     hc_plays_by_stream_type_options.yAxis.min = 0;
                     hc_plays_by_stream_type_options.xAxis.categories = dateArray;
-                    hc_plays_by_stream_type_options.series = getGraphVisibility(hc_plays_by_stream_type_options.chart.renderTo, data.series);
-                    hc_plays_by_stream_type_options.colors = getGraphColors(data.series);
+                    hc_plays_by_stream_type_options.series = data.series;
                     var hc_plays_by_stream_type = new Highcharts.Chart(hc_plays_by_stream_type_options);
                 }
             });
 
-            $.ajax({
-                url: "get_concurrent_streams_by_stream_type",
-                type: 'get',
-                data: { time_range: time_range, user_id: selected_user_id },
-                dataType: "json",
-                success: function(data) {
-                    var dateArray = [];
-                    $.each(data.categories, function (i, day) {
-                        dateArray.push(moment(day, 'YYYY-MM-DD').valueOf());
-                        // Highlight the weekend
-                        if ((moment(day, 'YYYY-MM-DD').format('ddd') == 'Sat') ||
-                            (moment(day, 'YYYY-MM-DD').format('ddd') == 'Sun')) {
-                            hc_plays_by_day_options.xAxis.plotBands.push({
-                                from: i-0.5,
-                                to: i+0.5,
-                                color: 'rgba(80,80,80,0.3)'
-                            });
-                        }
-                    });
-                    hc_concurrent_streams_by_stream_type_options.yAxis.min = 0;
-                    hc_concurrent_streams_by_stream_type_options.xAxis.categories = dateArray;
-                    hc_concurrent_streams_by_stream_type_options.series = getGraphVisibility(hc_concurrent_streams_by_stream_type_options.chart.renderTo, data.series);
-                    hc_concurrent_streams_by_stream_type_options.colors = getGraphColors(data.series);
-                    var hc_plays_by_stream_type = new Highcharts.Chart(hc_concurrent_streams_by_stream_type_options);
-                }
-            });
-
             $.ajax({
                 url: "get_plays_by_source_resolution",
                 type: 'get',
-                data: { time_range: time_range, y_axis: yaxis, user_id: selected_user_id },
+                data: { time_range: time_range, y_axis: yaxis },
                 dataType: "json",
                 success: function(data) {
-                    if (yaxis === 'duration') { dataSecondsToHours(data); }
                     hc_plays_by_source_resolution_options.xAxis.categories = data.categories;
-                    hc_plays_by_source_resolution_options.series = getGraphVisibility(hc_plays_by_source_resolution_options.chart.renderTo, data.series);
-                    hc_plays_by_source_resolution_options.colors = getGraphColors(data.series);
+                    hc_plays_by_source_resolution_options.series = data.series;
                     var hc_plays_by_source_resolution = new Highcharts.Chart(hc_plays_by_source_resolution_options);
                 }
             });
@@ -609,13 +423,11 @@
             $.ajax({
                 url: "get_plays_by_stream_resolution",
                 type: 'get',
-                data: { time_range: time_range, y_axis: yaxis, user_id: selected_user_id },
+                data: { time_range: time_range, y_axis: yaxis },
                 dataType: "json",
                 success: function(data) {
-                    if (yaxis === 'duration') { dataSecondsToHours(data); }
                     hc_plays_by_stream_resolution_options.xAxis.categories = data.categories;
-                    hc_plays_by_stream_resolution_options.series = getGraphVisibility(hc_plays_by_stream_resolution_options.chart.renderTo, data.series);
-                    hc_plays_by_stream_resolution_options.colors = getGraphColors(data.series);
+                    hc_plays_by_stream_resolution_options.series = data.series;
                     var hc_plays_by_stream_resolution = new Highcharts.Chart(hc_plays_by_stream_resolution_options);
                 }
             });
@@ -623,13 +435,11 @@
             $.ajax({
                 url: "get_stream_type_by_top_10_platforms",
                 type: 'get',
-                data: { time_range: time_range, y_axis: yaxis, user_id: selected_user_id },
+                data: { time_range: time_range, y_axis: yaxis },
                 dataType: "json",
                 success: function(data) {
-                    if (yaxis === 'duration') { dataSecondsToHours(data); }
                     hc_plays_by_platform_by_stream_type_options.xAxis.categories = data.categories;
-                    hc_plays_by_platform_by_stream_type_options.series = getGraphVisibility(hc_plays_by_platform_by_stream_type_options.chart.renderTo, data.series);
-                    hc_plays_by_platform_by_stream_type_options.colors = getGraphColors(data.series);
+                    hc_plays_by_platform_by_stream_type_options.series = data.series;
                     var hc_plays_by_platform_by_stream_type = new Highcharts.Chart(hc_plays_by_platform_by_stream_type_options);
                 }
             });
@@ -637,178 +447,138 @@
             $.ajax({
                 url: "get_stream_type_by_top_10_users",
                 type: 'get',
-                data: { time_range: time_range, y_axis: yaxis, user_id: selected_user_id },
+                data: { time_range: time_range, y_axis: yaxis },
                 dataType: "json",
                 success: function(data) {
-                    if (yaxis === 'duration') { dataSecondsToHours(data); }
                     hc_plays_by_user_by_stream_type_options.xAxis.categories = data.categories;
-                    hc_plays_by_user_by_stream_type_options.series = getGraphVisibility(hc_plays_by_user_by_stream_type_options.chart.renderTo, data.series);
-                    hc_plays_by_user_by_stream_type_options.colors = getGraphColors(data.series);
+                    hc_plays_by_user_by_stream_type_options.series = data.series;
                     var hc_plays_by_user_by_stream_type = new Highcharts.Chart(hc_plays_by_user_by_stream_type_options);
                 }
             });
-
-            $('#nav-tabs-stream').tab('show');
         }
 
-        function loadGraphsTab3(time_range, yaxis) {
-            $('#days-selection').hide();
-            $('#months-selection').show();
-
+        function loadGraphsTab3(yaxis) {
             setGraphFormat(yaxis);
 
             $.ajax({
                 url: "get_plays_per_month",
                 type: 'get',
-                data: { time_range: time_range, y_axis: yaxis, user_id: selected_user_id },
+                data: { y_axis: yaxis },
                 dataType: "json",
                 success: function(data) {
-                    if (yaxis === 'duration') { dataSecondsToHours(data); }
                     hc_plays_by_month_options.yAxis.min = 0;
                     hc_plays_by_month_options.xAxis.categories = data.categories;
-                    hc_plays_by_month_options.series = getGraphVisibility(hc_plays_by_month_options.chart.renderTo, data.series);
-                    hc_plays_by_month_options.colors = getGraphColors(data.series);
+                    hc_plays_by_month_options.series = data.series;
+                    hc_plays_by_month_options.series[2].visible = music_visible;
                     var hc_plays_by_month = new Highcharts.Chart(hc_plays_by_month_options);
                 }
             });
-
-            $('#nav-tabs-total').tab('show');
         }
 
+        // Set initial state
+        loadGraphsTab1(current_range, yaxis);
+
         // Tab1 opened
-        $('#nav-tabs-plays').on('shown.bs.tab', function (e) {
+        $('#graph-tabs a[href="#tabs-1"]').on('shown.bs.tab', function (e) {
             e.preventDefault();
             current_tab = $(this).attr('href');
-            setLocalStorage('graph_tab', current_tab.replace('#',''));
-            loadGraphsTab1(current_day_range, yaxis);
-        });
+            $('#days-selection').show();
+            loadGraphsTab1(current_range, yaxis);
+        })
 
         // Tab2 opened
-        $('#nav-tabs-stream').on('shown.bs.tab', function (e) {
+        $('#graph-tabs a[href="#tabs-2"]').on('shown.bs.tab', function (e) {
             e.preventDefault();
             current_tab = $(this).attr('href');
-            setLocalStorage('graph_tab', current_tab.replace('#',''));
-            loadGraphsTab2(current_day_range, yaxis);
-        });
+            $('#days-selection').show();
+            loadGraphsTab2(current_range, yaxis);
+        })
 
         // Tab3 opened
-        $('#nav-tabs-total').on('shown.bs.tab', function (e) {
+        $('#graph-tabs a[href="#tabs-3"]').on('shown.bs.tab', function (e) {
             e.preventDefault();
             current_tab = $(this).attr('href');
-            setLocalStorage('graph_tab', current_tab.replace('#',''));
-            loadGraphsTab3(current_month_range, yaxis);
-        });
+            $('#days-selection').hide();
+            console.log('loading....');
+            loadGraphsTab3(yaxis);
+        })
+
 
         // Date range changed
-        $('#graph-days').tooltip({ container: 'body', placement: 'top', html: true });
-        $('#graph-days').on('change', function() {
-            forceMinMax($(this));
-            current_day_range = $(this).val();
-            setLocalStorage('graph_days', current_day_range);
-            if (current_tab === '#tabs-plays') { loadGraphsTab1(current_day_range, yaxis); }
-            if (current_tab === '#tabs-stream') { loadGraphsTab2(current_day_range, yaxis); }
-            $('.days').text(current_day_range);
-        });
-        
-        // Month range changed
-        $('#graph-months').tooltip({ container: 'body', placement: 'top', html: true });
-        $('#graph-months').on('change', function() {
-            forceMinMax($(this));
-            current_month_range = $(this).val();
-            setLocalStorage('graph_months', current_month_range);
-            if (current_tab === '#tabs-total') { loadGraphsTab3(current_month_range, yaxis); }
-            $('.months').text(current_month_range);
+        $('#days-selection').on('change', function() {
+            current_range = $('input[name=date-options]:checked', '#days-selection').val();
+            if (current_tab == '#tabs-1') { loadGraphsTab1(current_range, yaxis); }
+            if (current_tab == '#tabs-2') { loadGraphsTab2(current_range, yaxis); }
+            $('.days').html(current_range);
         });
 
-        let graph_user_last_id = undefined;
-
-        // User changed
-        $('#graph-user').on('change', function() {
-            let val = $(this).val();
-            if (val.length === 0 || val.length === $(this).children().length) {
-                selected_user_id = null; // if all users are selected, just send an empty list
-            } else {
-                selected_user_id = val.join(",");
-            }
-            if (selected_user_id === graph_user_last_id) {
-                return;
-            }
-            graph_user_last_id = selected_user_id;
-            if (current_tab === '#tabs-plays') { loadGraphsTab1(current_day_range, yaxis); }
-            if (current_tab === '#tabs-stream') { loadGraphsTab2(current_day_range, yaxis); }
-            if (current_tab === '#tabs-total') { loadGraphsTab3(current_month_range, yaxis); }
-        });
-        
         // Y-axis changed
         $('#yaxis-selection').on('change', function() {
             yaxis = $('input[name=yaxis-options]:checked', '#yaxis-selection').val();
-            setLocalStorage('graph_type', yaxis);
-            if (current_tab === '#tabs-plays') { loadGraphsTab1(current_day_range, yaxis); }
-            if (current_tab === '#tabs-stream') { loadGraphsTab2(current_day_range, yaxis); }
-            if (current_tab === '#tabs-total') { loadGraphsTab3(current_month_range, yaxis); }
+            if (current_tab == '#tabs-1') { loadGraphsTab1(current_range, yaxis); }
+            if (current_tab == '#tabs-2') { loadGraphsTab2(current_range, yaxis); }
+            if (current_tab == '#tabs-3') { loadGraphsTab3(yaxis); }
         });
 
         function setGraphFormat(type) {
             if (type === 'plays') {
                 yaxis_format = function() { return this.value; };
                 tooltip_format = function() {
-                    if (moment(this.x, 'X').isValid() && (this.x > 946684800)) {
-                        var s = '<b>'+ moment(this.x).format('ddd MMM D') +'</b>';
-                    } else {
-                        var s = '<b>'+ this.x +'</b>';
-                    }
-                    if (this.points.length > 1) {
-                        var total = 0;
-                        $.each(this.points, function(i, point) {
-                            if (point.series.name === 'Total') return;
-                            s += '<br/>'+point.series.name+': '+point.y;
-                            total += point.y;
-                        });
-                        s += '<br><b>Total: '+total+'</b>';
-                    } else {
-                        $.each(this.points, function(i, point) {
-                            s += '<br/>'+point.series.name+': '+point.y;
-                        });
-                    }
-                    return s;
-                }
+                                    if (moment(this.x, 'X').isValid() && (this.x > 946684800)) {
+                                        var s = '<b>'+ moment(this.x).format("ddd MMM D") +'</b>';
+                                    } else {
+                                        var s = '<b>'+ this.x +'</b>';
+                                    }
+                                    if (this.points.length > 1) {
+                                        var total = 0;
+                                        $.each(this.points, function(i, point) {
+                                            s += '<br/>'+point.series.name+': '+point.y;
+                                            total += point.y;
+                                        });
+                                        s += '<br><b>Total: '+total+'</b>';
+                                    } else {
+                                        $.each(this.points, function(i, point) {
+                                            s += '<br/>'+point.series.name+': '+point.y;
+                                        });
+                                    }
+                                    return s;
+                                 }
                 stack_labels_format = function() {
-                    return this.total;
-                }
+                                          return this.total;
+                                      }
+
                 $('.yaxis-text').html('Play count');
             } else {
-                yaxis_format = function() { return moment.duration(this.value, 'hours').format('H [h] m [m]'); };
+                yaxis_format = function() { return moment.duration(this.value, 'seconds').format("m [mins]"); };
                 tooltip_format = function() {
-                    if (moment(this.x, 'X').isValid() && (this.x > 946684800)) {
-                        var s = '<b>'+ moment(this.x).format('ddd MMM D') +'</b>';
-                    } else {
-                        var s = '<b>'+ this.x +'</b>';
-                    }
-                    if (this.points.length > 1) {
-                        var total = 0;
-                        $.each(this.points, function(i, point) {
-                            if (point.series.name === 'Total') return;
-                            s += '<br/>'+point.series.name+': '+moment.duration(point.y, 'hours').format('D [days] H [hrs] m [mins]');
-                            total += point.y;
-                        });
-                        s += '<br/><b>Total: '+moment.duration(total, 'hours').format('D [days] H [hrs] m [mins]')+'</b>';
-                    } else {
-                        $.each(this.points, function(i, point) {
-                            s += '<br/>'+point.series.name+': '+moment.duration(point.y, 'hours').format('D [days] H [hrs] m [mins]');
-                        });
-                    }
-                    return s;
-                }
+                                    if (moment(this.x, 'X').isValid() && (this.x > 946684800)) {
+                                        var s = '<b>'+ moment(this.x).format("ddd MMM D") +'</b>';
+                                    } else {
+                                        var s = '<b>'+ this.x +'</b>';
+                                    }
+                                    if (this.points.length > 1) {
+                                        var total = 0;
+                                        $.each(this.points, function(i, point) {
+                                            s += '<br/>'+point.series.name+': '+moment.duration(point.y, 'seconds').format('D [days] H [hrs] m [mins]');
+                                            total += point.y;
+                                        });
+                                        s += '<br/><b>Total: '+moment.duration(total, 'seconds').format('D [days] H [hrs] m [mins]')+'</b>';
+                                    } else {
+                                        $.each(this.points, function(i, point) {
+                                            s += '<br/>'+point.series.name+': '+moment.duration(point.y, 'seconds').format('D [days] H [hrs] m [mins]');
+                                        });
+                                    }
+                                    return s;
+                                 }
                 stack_labels_format = function() {
-                    var s = moment.duration(this.total, 'hours').format('H [h] m [m]');
-                    return s;
-                }
+                                          var s = moment.duration(this.total, 'seconds').format("H [hrs] m [mins]");
+                                          return s;
+                                      }
                 $('.yaxis-text').html('Play duration');
             }
 
             hc_plays_by_day_options.xAxis.plotBands = [];
             hc_plays_by_stream_type_options.xAxis.plotBands = [];
-            hc_concurrent_streams_by_stream_type_options.xAxis.plotBands = [];
 
             hc_plays_by_day_options.yAxis.labels.formatter = yaxis_format;
             hc_plays_by_dayofweek_options.yAxis.labels.formatter = yaxis_format;
diff --git a/data/interfaces/default/history.html b/data/interfaces/default/history.html
index 8ab8b19e..3f589390 100644
--- a/data/interfaces/default/history.html
+++ b/data/interfaces/default/history.html
@@ -1,118 +1,67 @@
 <%inherit file="base.html"/>
 
 <%def name="headIncludes()">
-<link rel="stylesheet" href="${http_root}css/bootstrap-select.min.css">
-<link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.min.css">
-<link rel="stylesheet" href="${http_root}css/dataTables.colVis.css">
-<link rel="stylesheet" href="${http_root}css/tautulli-dataTables.css">
+<link rel="stylesheet" href="interfaces/default/css/dataTables.bootstrap.css">
+<link rel="stylesheet" href="interfaces/default/css/dataTables.colVis.css">
+<link rel="stylesheet" href="interfaces/default/css/plexpy-dataTables.css">
 </%def>
 
 <%def name="body()">
+
 <div class='container-fluid'>
-    % if config['database_is_importing']:
-    <div style="text-align: center; margin-top: 20px;">
-        <i class="fa fa-refresh fa-spin"></i>&nbsp; Tautulli is importing history from another database. This could take a few minutes depending on the size of your database.
-        <br />
-        You may leave this page and check back later.
-    </div>
-    % endif
     <div class='table-card-header'>
         <div class="header-bar">
             <span><i class="fa fa-history"></i> History</span>
         </div>
         <div class="button-bar">
-            % if _session['user_group'] == 'admin':
-            <div class="alert alert-danger alert-edit" role="alert" id="row-edit-mode-alert"><i class="fa fa-exclamation-triangle"></i>&nbsp</div>
-            <div class="btn-group">
-                <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
-                    <i class="fa fa-trash-o"></i> Delete mode
-                </button>
-            </div>
-            % endif
-            % if _session['user_group'] == 'admin':
-            <div class="btn-group" id="user-selection">
-                <label>
-                    <select name="history-user" id="history-user" multiple>
-                    </select>
-                </label>
-            </div>
-            % endif
-            <div class="btn-group" data-toggle="buttons" id="media_type-selection">
-                <label class="btn btn-dark btn-filter">
-                    <input type="checkbox" name="media_type-filter" id="history-media_type-movie" value="movie" autocomplete="off"><i class="fa fa-film"></i> Movies
-                </label>
-                <label class="btn btn-dark btn-filter">
-                    <input type="checkbox" name="media_type-filter" id="history-media_type-episode" value="episode" autocomplete="off"><i class="fa fa-television"></i> TV Shows
-                </label>
-                <label class="btn btn-dark btn-filter">
-                    <input type="checkbox" name="media_type-filter" id="history-media_type-track" value="track" autocomplete="off"><i class="fa fa-music"></i> Music
-                </label>
-                <label class="btn btn-dark btn-filter">
-                    <input type="checkbox" name="media_type-filter" id="history-media_type-live" value="live" autocomplete="off"><i class="fa fa-broadcast-tower"></i> Live TV
-                </label>
-            </div>
-            <div class="btn-group" data-toggle="buttons" id="transcode_decision-selection">
-                <label class="btn btn-dark btn-filter">
-                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-direct_play" value="direct play" autocomplete="off"><i class="fa fa-play-circle"></i> Direct Play
-                </label>
-                <label class="btn btn-dark btn-filter">
-                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-copy" value="copy" autocomplete="off"><i class="fa fa-stream"></i> Direct Stream
-                </label>
-                <label class="btn btn-dark btn-filter">
-                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-transcode" value="transcode" autocomplete="off"><i class="fa fa-server"></i> Transcode
-                </label>
-            </div>
-            <div class="btn-group">
-                <button class="btn btn-dark refresh-history-button" id="refresh-history-list"><i class="fa fa-refresh"></i> Refresh history</button>
-            </div>
-            <div class="btn-group colvis-button-bar"></div>
+            <div class="colvis-button-bar hidden-xs"></div>
+            <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
+                <i class="fa fa-trash-o"></i> Delete mode
+            </button>
+            <div class="alert alert-danger alert-edit" role="alert" id="row-edit-mode-alert"><i class="fa fa-exclamation-triangle"></i>&nbspSelect rows to delete. Data is deleted upon exiting delete mode.</div>
         </div>
     </div>
-    <div class="table-card-back">
-        <table class="display history_table" id="history_table" width="100%">
+    <div class='table-card-back'>
+        <table class="display" id="history_table" width="100%">
             <thead>
             <tr>
-                <th align="left" id="delete_row">Delete</th>
-                <th align="left" id="date">Date</th>
-                <th align="left" id="friendly_name">User</th>
-                <th align="left" id="ip_address">IP Address</th>
-                <th align="left" id="platform">Platform</th>
-                <th align="left" id="product">Product</th>
-                <th align="left" id="player">Player</th>
-                <th align="left" id="title">Title</th>
-                <th align="left" id="started">Started</th>
-                <th align="left" id="paused_counter">Paused</th>
-                <th align="left" id="stopped">Stopped</th>
-                <th align="left" id="play_duration">Duration</th>
-                <th align="left" id="percent_complete"></th>
+                <th align='left' id="delete_row">Delete</th>
+                <th align='left' id="time">Time</th>
+                <th align='left' id="friendly_name">User</th>
+                <th align='left' id="ip_address">IP Address</th>
+                <th align='left' id="platform">Platform</th>
+                <th align='left' id="device">Player</th>
+                <th align='left' id="title">Title</th>
+                <th align='left' id="started">Started</th>
+                <th align='left' id="paused_counter">Paused</th>
+                <th align='left' id="stopped">Stopped</th>
+                <th align='left' id="duration">Duration</th>
+                <th align='left' id="percent_complete"></th>
             </tr>
             </thead>
             <tbody>
             </tbody>
         </table>
-    </div>
-</div>
-</%def>
-
-<%def name="modalIncludes()">
-<div class="modal fade" id="info-modal" tabindex="-1" role="dialog" aria-labelledby="info-modal">
-</div>
-<div class="modal fade" id="ip-info-modal" tabindex="-1" role="dialog" aria-labelledby="ip-info-modal">
-</div>
-<div class="modal fade" id="confirm-modal-delete" tabindex="-1" role="dialog" aria-labelledby="confirm-modal-delete">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title" id="myModalLabel">Confirm Delete</h4>
-            </div>
-            <div class="modal-body" style="text-align: center;">
-                <p>Are you REALLY sure you want to delete <strong><span id="deleteCount"></span></strong> history item(s)?</p>
-                <p>This is permanent and cannot be undone!</p>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-dark" data-dismiss="modal">Cancel</button>
-                <button type="button" class="btn btn-danger btn-ok" data-dismiss="modal" id="confirm-delete">Delete</button>
+        <div class="modal fade" id="info-modal" tabindex="-1" role="dialog" aria-labelledby="info-modal">
+        </div>
+        <div class="modal fade" id="ip-info-modal" tabindex="-1" role="dialog" aria-labelledby="ip-info-modal">
+        </div>
+        <div class="modal fade" id="confirm-modal" tabindex="-1" role="dialog" aria-labelledby="confirm-modal">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
+                        <h4 class="modal-title" id="myModalLabel">Confirm Delete</h4>
+                    </div>
+                    <div class="modal-body" style="text-align: center;">
+                        <p>Are you REALLY sure you want to delete <strong><span id="deleteCount"></span></strong> history item(s)?</p>
+                        <p>This is permanent and cannot be undone!</p>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-dark" data-dismiss="modal">Cancel</button>
+                        <button type="button" class="btn btn-danger btn-ok" data-dismiss="modal" id="confirm-delete">Delete</button>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
@@ -120,148 +69,47 @@
 </%def>
 
 <%def name="javascriptIncludes()">
-<script src="${http_root}js/bootstrap-select.min.js"></script>
-<script src="${http_root}js/jquery.dataTables.min.js"></script>
-<script src="${http_root}js/dataTables.colVis.js"></script>
-<script src="${http_root}js/dataTables.bootstrap.min.js"></script>
-<script src="${http_root}js/dataTables.bootstrap.pagination.js"></script>
-<script src="${http_root}js/tables/history_table.js${cache_param}"></script>
+<script src="interfaces/default/js/jquery.dataTables.min.js"></script>
+<script src="interfaces/default/js/dataTables.colVis.js"></script>
+<script src="interfaces/default/js/dataTables.bootstrap.min.js"></script>
+<script src="interfaces/default/js/dataTables.bootstrap.pagination.js"></script>
+<script src="interfaces/default/js/moment-with-locale.js"></script>
+<script src="interfaces/default/js/tables/history_table.js"></script>
 <script>
-    $(document).ready(function () {
-        // Load user ids and names (for the selector)
-        $.ajax({
-            url: 'get_user_names',
-            type: 'GET',
-            dataType: 'json',
-            success: function (data) {
-                let select = $('#history-user');
-                let by_id = {};
-                data.sort(function (a, b) {
-                    return a.friendly_name.localeCompare(b.friendly_name);
-                });
-                data.forEach(function (item) {
-                    select.append('<option value="' + item.user_id + '">' +
-                        item.friendly_name + '</option>');
-                    by_id[item.user_id] = item.friendly_name;
-                });
-                select.selectpicker({
-                    countSelectedText: function(sel, total) {
-                        if (sel === 0 || sel === total) {
-                            return 'All users';
-                        } else if (sel > 1) {
-                            return sel + ' users';
-                        } else {
-                            return select.val().map(function(id) {
-                                return by_id[id];
-                            }).join(', ');
-                        }
-                    },
-                    style: 'btn-dark',
-                    actionsBox: true,
-                    selectedTextFormat: 'count',
-                    noneSelectedText: 'All users'
-                });
-                select.selectpicker('render');
-                select.selectpicker('selectAll');
+    $(document).ready(function() {
+        history_table_options.ajax = {
+            "url": "get_history",
+            type: "post",
+            data: function ( d ) {
+                return { 'json_data': JSON.stringify( d ) };
             }
-        });
-
-        let history_user_last_id = undefined;
-
-        function loadHistoryTable(media_type, transcode_decision, selected_user_id) {
-            history_table_options.ajax = {
-                url: 'get_history',
-                type: 'POST',
-                data: function (d) {
-                    return {
-                        json_data: JSON.stringify(d),
-                        media_type: media_type,
-                        transcode_decision: transcode_decision,
-                        user_id: selected_user_id
-                    };
-                }
-            };
-            history_table = $('#history_table').DataTable(history_table_options);
-            var colvis = new $.fn.dataTable.ColVis(history_table, {
-                buttonText: '<i class="fa fa-columns"></i> Select columns',
-                buttonClass: 'btn btn-dark',
-                exclude: [0, 12]
-            });
-            $(colvis.button()).appendTo('div.colvis-button-bar');
-
-            clearSearchButton('history_table', history_table);
-
-            $('#media_type-selection').on('change', function () {
-                $('#media_type-selection > label').removeClass('active');
-                var selected_filter = $('input[name=media_type-filter]:checked', '#media_type-selection');
-                $(selected_filter).closest('label').addClass('active');
-                media_type = $(selected_filter).map(function () { return $(this).val(); }).get().join(',');
-                setLocalStorage('history_media_type', media_type);
-                history_table.draw();
-            });
-
-            $('#transcode_decision-selection').on('change', function () {
-                $('#transcode_decision-selection > label').removeClass('active');
-                var selected_filter = $('input[name=transcode_decision-filter]:checked', '#transcode_decision-selection');
-                $(selected_filter).closest('label').addClass('active');
-                transcode_decision = $(selected_filter).map(function () { return $(this).val(); }).get().join(',');
-                setLocalStorage('history_transcode_decision', transcode_decision);
-                history_table.draw();
-            });
-
-            $('#history-user').on('change', function () {
-                let val = $(this).val();
-                if (val.length === 0 || val.length === $(this).children().length) {
-                    selected_user_id = null; // if all users are selected, just send an empty list
-                } else {
-                    selected_user_id = val.join(",");
-                }
-                if (selected_user_id === history_user_last_id) {
-                    return;
-                }
-                history_user_last_id = selected_user_id;
-                history_table.draw();
-            });
         }
+        history_table = $('#history_table').DataTable(history_table_options);
+        var colvis = new $.fn.dataTable.ColVis(history_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark', exclude: [0, 11] });
+        $(colvis.button()).appendTo('div.colvis-button-bar');
 
-        var selected_user_id = "${_session['user_group']}" == "admin" ? null : "${_session['user_id']}";
+        clearSearchButton('history_table', history_table);
 
-        var media_type = getLocalStorage('history_media_type', 'all');
-        $.each(media_type.split(','), function (i, item) {
-            var history_media_type = $('#history-media_type-' + item);
-            history_media_type.prop('checked', true);
-            history_media_type.closest('label').addClass('active');
-        });
-
-        var transcode_decision = getLocalStorage('history_transcode_decision', 'all');
-        $.each(transcode_decision.split(','), function (i, item) {
-            var history_transcode_decision = $('#history-transcode_decision-' + item.replace(' ', '_'));
-            history_transcode_decision.prop('checked', true);
-            history_transcode_decision.closest('label').addClass('active');
-        });
-
-        loadHistoryTable(media_type, transcode_decision, selected_user_id);
-
-        % if _session['user_group'] == 'admin':
         $('#row-edit-mode').on('click', function() {
-            if ($(this).hasClass('active')) {
-                $(this).tooltip('destroy');
+            $('#row-edit-mode-alert').fadeIn(200);
 
+            if ($(this).hasClass('active')) {
                 if (history_to_delete.length > 0) {
                     $('#deleteCount').text(history_to_delete.length);
-                    $('#confirm-modal-delete').modal();
-                    $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
-                        $.ajax({
-                            url: 'delete_history_rows',
-                            type: 'POST',
-                            data: { row_ids: history_to_delete.join(',') },
-                            async: true,
-                            success: function (data) {
-                                var msg = "History deleted";
-                                showMsg(msg, false, true, 2000);
-                                history_table.draw();
-                            }
-                        });
+                    $('#confirm-modal').modal();
+                    $('#confirm-modal').one('click', '#confirm-delete', function () {
+                        for (var i = 0; i < history_to_delete.length; i++) {
+                            $.ajax({
+                                url: 'delete_history_rows',
+                                data: { row_id: history_to_delete[i] },
+                                async: true,
+                                success: function (data) {
+                                    var msg = "History deleted";
+                                    showMsg(msg, false, true, 2000);
+                                }
+                            });
+                        }
+                        history_table.draw();
                     });
                 }
 
@@ -271,13 +119,6 @@
                 });
 
             } else {
-                $(this).tooltip({
-                    container: '.body-container',
-                    placement: 'bottom',
-                    title: 'Select rows to delete. Data is deleted upon exiting delete mode.',
-                    trigger: 'manual'
-                }).tooltip('show');
-
                 history_to_delete = [];
                 $('.delete-control').each(function() {
                     $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
@@ -285,11 +126,6 @@
                 });
             }
         });
-        % endif
-    });
-
-    $("#refresh-history-list").click(function() {
-        history_table.draw();
     });
 </script>
 </%def>
diff --git a/data/interfaces/default/history_table_modal.html b/data/interfaces/default/history_table_modal.html
index b4066627..19de1faf 100644
--- a/data/interfaces/default/history_table_modal.html
+++ b/data/interfaces/default/history_table_modal.html
@@ -5,35 +5,19 @@
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
             <h4 class="modal-title" id="myModalLabel">
                 <strong><span id="modal_header_ip_address">
-                    % if data.get('media_type'):
-                    <% h = {'episode': 'TV Show', 'track': 'Music', 'live': 'Live TV'} %>
-                    <i class="fa fa-history"></i> ${h.get(data['media_type'], data['media_type'].title())} History for <span id="date-header">${data['start_date']}</span>
-                    % elif data.get('transcode_decision'):
-                    <% h = {'copy': 'Direct Stream'} %>
-                    <i class="fa fa-history"></i> ${h.get(data['transcode_decision'], data['transcode_decision'].title())} History for <span id="date-header">${data['start_date']}</span>
-                    % else:
-                    <i class="fa fa-history"></i> History for <span id="date-header">${data['start_date']}</span>
-                    % endif
+                    <i class="fa fa-history"></i> History for <span id="date-header">${data}</span>
                 </span></strong>
             </h4>
         </div>
         <div class="modal-body" id="modal-text">
-            <table class="display history_table" id="history_table_modal" width="100%">
+            <table class="display" id="history_table" width="100%">
                 <thead>
                 <tr>
-                    <th align="left" id="delete_row">Delete</th>
-                    <th align="left" id="date">Date</th>
-                    <th align="left" id="friendly_name">User</th>
-                    <th align="left" id="ip_address">IP Address</th>
-                    <th align="left" id="platform">Platform</th>
-                    <th align="left" id="product">Product</th>
-                    <th align="left" id="device">Player</th>
-                    <th align="left" id="title">Title</th>
-                    <th align="left" id="started">Started</th>
-                    <th align="left" id="paused_counter">Paused</th>
-                    <th align="left" id="stopped">Stopped</th>
-                    <th align="left" id="play_duration">Duration</th>
-                    <th align="left" id="percent_complete"></th>
+                    <th align='left' id="started">Started</th>
+                    <th align='left' id="stopped">Stopped</th>
+                    <th align='left' id="friendly_name">User</th>
+                    <th align='left' id="player">Player</th>
+                    <th align='left' id="title">Title</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -43,30 +27,52 @@
         <div class="modal-footer"></div>
     </div>
 </div>
-
-<script src="${http_root}js/tables/history_table.js${cache_param}"></script>
+<div class="modal fade" id="info-modal" tabindex="-1" role="dialog" aria-labelledby="info-modal">
+</div>
+<script src="interfaces/default/js/tables/history_table_modal.js"></script>
 <script>
-    $('#date-header').html(moment('${data["start_date"]}','YYYY-MM-DD').format('ddd MMM Do YYYY'));
-
-    $('#history-modal').off('shown.bs.modal').on('shown.bs.modal', function() {
-        history_table_options.ajax = {
-            url: 'get_history',
+    $(document).ready(function() {
+        $('#date-header').html(moment('${data}','YYYY-MM-DD').format('ddd MMM Do YYYY'));
+        history_table_modal_options.ajax = {
+            "url": "get_history",
+            type: "post",
             data: function ( d ) {
-                return {
-                    json_data: JSON.stringify(d),
-                    user_id: "${data['user_id']}",
-                    start_date: "${data['start_date']}",
-                    media_type: "${data.get('media_type') or 'all'}",
-                    transcode_decision: "${data.get('transcode_decision')}",
-                    include_activity: false
-                };
+                return { 'json_data': JSON.stringify( d ),
+                         'grouping': false,
+                         'start_date': '${data}'
+                       };
             }
-        };
+        }
 
-        history_table = $('#history_table_modal').DataTable(history_table_options);
-        history_table.columns([0, 3, 4, 5, 9, 11, 12]).visible(false);
+        history_table = $('#history_table').DataTable(history_table_modal_options);
+        
+        clearSearchButton('history_table', history_table);
 
-        clearSearchButton('history_table_modal', history_table);
+        // Move #info-modal to parent container
+        if (!($('#history-modal').next().is('#info-modal'))) {
+            $('#info-modal').appendTo($('#history-modal').parent());
+        }
+        $('#history-modal > #info-modal').remove();
+
+        $('#history-modal').css('z-index', '1050');
+        $('.modal-backdrop').not('.modal-backdrop-stack').css('z-index', '1049');
+        $('.modal-backdrop').not('.modal-backdrop-stack').addClass('modal-backdrop-stack');
+
+        $('#info-modal').on('show.bs.modal', function () {
+            // Fix position to match parent modal
+            var currentPadding = parseInt($('body').css('padding-right'));
+            $(this).children('.modal-dialog').css('left', -currentPadding / 2);
+            $('#history-modal').css('overflow-y', 'hidden');
+            setTimeout(function () {
+                $('#info-modal').css('z-index', '1060');
+                $('.modal-backdrop').not('.modal-backdrop-stack').css('z-index', '1059');
+                $('.modal-backdrop').not('.modal-backdrop-stack').addClass('modal-backdrop-stack');
+            }, 0);
+        });
+        $('#info-modal').on('hidden.bs.modal', function () {
+            $('body').addClass('modal-open');
+            $('#history-modal').css('overflow-y', 'auto');
+        });
     });
 </script>
 % else:
diff --git a/data/interfaces/default/home_stats.html b/data/interfaces/default/home_stats.html
index 3e1e118c..f65871f2 100644
--- a/data/interfaces/default/home_stats.html
+++ b/data/interfaces/default/home_stats.html
@@ -25,7 +25,7 @@ grandparent_thumb       Returns location of the item's thumbnail. Use with pms_i
 rating_key              Returns the unique identifier for the media item.
 title                   Returns the title for the associated stat.
 
-== Only if 'stat_id' is 'top_tv' or 'top_movies' or 'top_music' or 'top_user' or 'top_platform' or 'top_libraries' ==
+== Only if 'stat_id' is 'top_tv' or 'top_movies' or 'top_music' or 'top_user' or 'top_platform' ==
 total_plays             Returns the count for the associated stat.
 total_duration          Returns the total duration for the associated stat.
 
@@ -39,171 +39,769 @@ user_id                 Returns the user id for the associated stat.
 friendly_name           Returns the friendly name of the user for the associated stat.
 
 == Only if 'stat_id' is 'top_platform' or 'last_watched' ==
-player                  Returns the player name for the associated stat.
+platform_type           Returns the platform name for the associated stat.
 
 == Only if 'stat_id' is 'last_watched' ==
 last_watch              Returns the time the media item was last watched.
 
-== Only if 'stat_id' is 'most_concurrent' ==
-count                   Returns the count of the most concurrent streams.
-started                 Returns the start time of the most concurrent streams.
-stopped                 Returns the stop time of the most concurrent streams.
-
 DOCUMENTATION :: END
 </%doc>
 
 <%!
-    from plexpy.helpers import cast_to_int, page
+    from plexpy import helpers
 
     # Human readable duration
     def hd(seconds):
-        m, s = divmod(cast_to_int(seconds), 60)
-        if s > 30:
-            m += 1
-        h, m = divmod(m, 60)
-        return str(h).zfill(1) + ':' + str(m).zfill(2)
+        minutes = helpers.cast_to_float(seconds) / 60
+        if minutes > 60:
+            hours = int(minutes / 60)
+            minutes = int(minutes % 60)
+            if minutes > 0:
+                return "<h3>" + str(hours) + "</h3><p>hrs</p><h3>" + str(minutes) + "</h3><p>mins</p>"
+            else:
+                return "<h3>" + str(hours) + "</h3><p>hrs</p>"
+        else:
+            return "<h3>" + str(int(minutes)) + "</h3><p>mins</p>"
 %>
 
-% if data and any(top_stat['rows'] for top_stat in data):
-% for top_stat in data:
-% if top_stat['rows']:
-<%
-    stat_id = top_stat['stat_id']
-    row0 = top_stat['rows'][0]
-%>
-<div class="dashboard-stats-instance" id="stats-instance-${stat_id}" data-stat_id="${stat_id}">
-    <div class="dashboard-stats-container">
-        % if stat_id in ('top_movies', 'popular_movies', 'top_tv', 'popular_tv', 'top_music', 'popular_music', 'last_watched'):
-        <% fallback = 'art-live' if row0['live'] else 'art' %>
-        <div id="stats-background-${stat_id}" class="dashboard-stats-background" style="background-image: url(${page('pms_image_proxy', row0['art'], row0['rating_key'], 500, 280, 40, '282828', 3, fallback=fallback)});">
-        % elif stat_id == 'top_libraries':
-        <% fallback = 'art-live' if row0['live'] else row0['library_art'] %>
-        <div id="stats-background-${stat_id}" class="dashboard-stats-background" style="background-image: url(${page('pms_image_proxy', row0['art'] or row0['library_art'], None, 500, 280, 40, '282828', 3, fallback=fallback)});" data-library_art="${row0['library_art']}">
-        % elif stat_id == 'top_users':
-        <div id="stats-background-${stat_id}" class="dashboard-stats-background" data-blurhash="${page('pms_image_proxy', row0['user_thumb'] or 'interfaces/default/images/gravatar-default.png', None, 100, 100, 40, '282828', 0, fallback='user')}">
-        % elif stat_id == 'top_platforms':
-        <div id="stats-background-${stat_id}" class="dashboard-stats-background platform-${row0['platform_name']}-rgba no-image">
-        % else:
-        <div id="stats-background-${stat_id}" class="dashboard-stats-background flat">
-        % endif
-            % if stat_id in ('top_movies', 'popular_movies', 'top_tv', 'popular_tv', 'top_music', 'popular_music', 'last_watched'):
-            <div class="dashboard-stats-poster-container hidden-xs">
-                % if stat_id in ('top_music', 'popular_music'):
-                <div id="stats-thumb-${stat_id}-bg" class="dashboard-stats-poster" style="background-image: url(${page('pms_image_proxy', row0['thumb'], row0['rating_key'], 300, 300, 60, '282828', 3, fallback='cover')});"></div>
-                % endif
-                <%
-                    height, fallback = ('450', 'poster')
-                    if stat_id in ('top_music', 'popular_music'):
-                        height, fallback = ('300', 'cover')
-                    elif row0['live']:
-                        height, fallback = ('450', 'poster-live')
-
-                    href = '#'
-                    if row0['rating_key']:
-                        if row0['live']:
-                            href = page('info', row0['rating_key'], row0['guid'], history=True, live=row0['live'])
-                        else:
-                            href = page('info', row0['rating_key'], history=True)
-                %>
-                <a id="stats-thumb-url-${stat_id}" href="${href}" title="${row0['title']}">
-                    <div id="stats-thumb-${stat_id}" class="dashboard-stats-${fallback.split('-')[0]}" style="background-image: url(${page('pms_image_proxy', row0['thumb'], row0['grandparent_rating_key'] or row0['rating_key'], 300, height, fallback=fallback)});"></div>
-                </a>
-            </div>
-            % elif stat_id == 'top_libraries':
-                % if row0['library_thumb'].startswith('http'):
-                <div id="stats-thumb-${stat_id}" class="dashboard-stats-flat hidden-xs" style="background-image: url(${page('pms_image_proxy', row0['library_thumb'], None, 100, 100, fallback='cover')});"></div>
-                % else:
-                <div id="stats-thumb-${stat_id}" class="dashboard-stats-flat svg-icon library-${row0['section_type']} hidden-xs"></div>
-                % endif
-            % elif stat_id == 'top_users':
-            <% user_href = page('user', row0['user_id']) if row0['user_id'] else '#' %>
-            <a id="stats-thumb-url-${stat_id}" href="${user_href}" title="${row0['user']}" class="hidden-xs">
-                <div id="stats-thumb-${stat_id}" class="dashboard-stats-circle" style="background-image: url(${page('pms_image_proxy', row0['user_thumb'] or 'interfaces/default/images/gravatar-default.png', None, 100, 100, fallback='user')})"></div>
-            </a>
-            % elif stat_id == 'top_platforms':
-            <div id="stats-thumb-${stat_id}" class="dashboard-stats-flat svg-icon platform-${row0['platform_name']} transparent hidden-xs"></div>
-            % elif stat_id == 'most_concurrent':
-            <div id="stats-thumb-${stat_id}" class="dashboard-stats-flat svg-icon stats-${stat_id} transparent hidden-xs"></div>
-            % endif
-            <div class="dashboard-stats-info-container">
-                <div id="stats-title-${stat_id}" class="dashboard-stats-info-title">
-                    <h4>${top_stat['stat_title']}</h4>
-                    % if stat_id.startswith('top') and top_stat.get('stat_type') == 'total_plays':
-                    <span class="dashboard-stats-stats-units">plays</span>
-                    % elif stat_id.startswith('top') and top_stat.get('stat_type') == 'total_duration':
-                    <span class="dashboard-stats-stats-units">hh:mm</span>
-                    % elif stat_id.startswith('popular'):
-                    <span class="dashboard-stats-stats-units">users</span>
-                    % elif stat_id == 'last_watched':
-                    <span class="dashboard-stats-stats-units" id="last-watched-header-info" title="${row0['user']}">${row0['friendly_name']}</span>
-                    % elif stat_id == 'most_concurrent':
-                    <span class="dashboard-stats-stats-units" id="most-concurrent-header-info">streams</span>
+% if data:
+% if data[0]['rows']:
+<ul class="list-unstyled">
+    % for top_stat in data:
+    % if top_stat['stat_id'] == 'top_tv' and top_stat['rows']:
+    <div class="home-platforms-instance">
+        <li>
+            <div class="home-platforms-instance-info">
+                <div class="home-platforms-instance-name">
+                    <h4>Most Watched TV</h4>
+                </div>
+                <div class="home-platforms-instance-playcount">
+                    <h4>
+                        <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                            ${top_stat['rows'][0]['title']}
+                        </a>
+                    </h4>
+                    % if top_stat['stat_type'] == 'total_plays':
+                    <h3>${top_stat['rows'][0]['total_plays']}</h3>
+                    <p> plays</p>
+                    % else:
+                    ${top_stat['rows'][0]['total_duration'] | hd}
                     % endif
                 </div>
-                <div class="dashboard-stats-info-scroller scrollbar-macosx">
-                    <div class="dashboard-stats-info scoller-content">
-                        <ul class="list-unstyled dashboard-stats-info-list">
-                            % for row in top_stat['rows']:
-                            <li class="dashboard-stats-info-item ${'expanded' if loop.index == 0 else ''}" data-stat_id="${stat_id}"
-                                data-rating_key="${row.get('rating_key')}" data-grandparent_rating_key="${row.get('grandparent_rating_key')}" data-guid="${row.get('guid')}" data-title="${row.get('title')}"
-                                data-art="${row.get('art')}" data-thumb="${row.get('thumb')}" data-platform="${row.get('platform_name')}" data-library-type="${row.get('section_type')}"
-                                data-user_id="${row.get('user_id')}" data-user="${row.get('user')}" data-friendly_name="${row.get('friendly_name')}" data-user_thumb="${row.get('user_thumb')}"
-                                data-last_watch="${row.get('last_watch')}" data-started="${row.get('started')}" data-live="${row.get('live')}"
-                                data-library_art="${row.get('library_art', '')}" data-library_thumb="${row.get('library_thumb', '')}">
-                                <div class="sub-list">${loop.index + 1}</div>
-                                <div class="sub-value">
-                                    % if stat_id in ('top_movies', 'popular_movies', 'top_tv', 'popular_tv', 'top_music', 'popular_music', 'last_watched'):
-                                    <%
-                                        href = '#'
-                                        if row['rating_key']:
-                                            if row['live']:
-                                                href = page('info', row['rating_key'], row['guid'], history=True, live=row['live'])
-                                            else:
-                                                href = page('info', row['rating_key'], history=True)
-                                    %>
-                                    <a href="${href}" title="${row['title']}">
-                                        ${row['title']}
-                                    </a>
-                                    % elif stat_id == 'top_libraries':
-                                    <% library_href = page('library', row['section_id']) %>
-                                    <a href="${library_href}" title="${row['section_name']}">
-                                        ${row['section_name']}
-                                    </a>
-                                    % elif stat_id == 'top_users':
-                                    <% user_href = page('user', row['user_id']) if row['user_id'] else '#' %>
-                                    <a href="${user_href}" title="${row['user']}">
-                                        ${row['friendly_name']}
-                                    </a>
-                                    % elif stat_id == 'top_platforms':
-                                    ${row['platform']}
-                                    % elif stat_id == 'most_concurrent':
-                                    <a href="graphs#concurrent-graph" title="${row['title']}">
-                                        ${row['title']}
-                                    </a>
+            </div>
+            <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                % if top_stat['rows'][0]['grandparent_thumb']:
+                <div class="home-platforms-instance-poster">
+                    <div class="home-platforms-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][0]['grandparent_thumb']}&width=300&height=450&fallback=poster);"></div>
+                </div>
+                % else:
+                <div class="home-platforms-instance-poster">
+                    <div class="home-platforms-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                </div>
+                % endif
+            </a>
+            %if len(top_stat['rows']) > 1:
+            <div class="home-platforms-instance-list-chevron"><i class="fa fa-chevron-down"></i></div>
+            <ul class="list-unstyled">
+                <div class="slider">
+                    <div class="home-platforms-instance-list">
+                        % for row in top_stat['rows']:
+                        %if loop.index > 0:
+                        <li>
+                            <div class="home-platforms-instance-list-info">
+                                <div class="home-platforms-instance-list-name">
+                                    <h5>
+                                        <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                            ${top_stat['rows'][loop.index]['title']}
+                                        </a>
+                                    </h5>
+                                </div>
+                                <div class="home-platforms-instance-list-playcount">
+                                    % if top_stat['stat_type'] == 'total_plays':
+                                    <h3>${top_stat['rows'][loop.index]['total_plays']}</h3>
+                                    <p> plays</p>
+                                    % else:
+                                    ${top_stat['rows'][loop.index]['total_duration'] | hd}
                                     % endif
                                 </div>
-                                <div class="sub-count">
-                                    % if stat_id.startswith('top') and top_stat.get('stat_type') == 'total_plays':
-                                    ${row['total_plays']}
-                                    % elif stat_id.startswith('top') and top_stat.get('stat_type') == 'total_duration':
-                                    ${row['total_duration'] | hd}
-                                    % elif stat_id.startswith('popular'):
-                                    ${row['users_watched']}
-                                    % elif stat_id == 'most_concurrent':
-                                    ${row['count']}
-                                    % endif
-                                </div>
-                            </li>
-                            % endfor
-                        </ul>
+                            </div>
+                            <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                            % if top_stat['rows'][loop.index]['grandparent_thumb']:
+                            <div class="home-platforms-instance-list-poster">
+                                <div class="home-platforms-list-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][loop.index]['grandparent_thumb']}&width=300&height=450&fallback=poster);"></div>
+                            </div>
+                            % else:
+                            <div class="home-platforms-instance-poster2">
+                                <div class="home-platforms-list-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                            </div>
+                            % endif
+                            </a>
+                            <div class="home-platforms-instance-list-number">
+                                <h4>${loop.index + 1}</h4>
+                            </div>
+                        </li>
+                        % endif
+                        % endfor
                     </div>
                 </div>
-            </div>
-        </div>
+            </ul>
+            % endif
+        </li>
     </div>
-</div>
-% endif
-% endfor
+    % elif top_stat['stat_id'] == 'popular_tv' and top_stat['rows']:
+    <div class="home-platforms-instance">
+        <li>
+            <div class="home-platforms-instance-info">
+                <div class="home-platforms-instance-name">
+                    <h4>Most Popular TV</h4>
+                </div>
+                <div class="home-platforms-instance-playcount">
+                    <h4>
+                        <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                            ${top_stat['rows'][0]['title']}
+                        </a>
+                    </h4>
+                    <h3>${top_stat['rows'][0]['users_watched']}</h3>
+                    <p> users</p>
+                </div>
+            </div>
+            <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                % if top_stat['rows'][0]['grandparent_thumb'] != '':
+                <div class="home-platforms-instance-poster">
+                    <div class="home-platforms-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][0]['grandparent_thumb']}&width=300&height=450&fallback=poster);"></div>
+                </div>
+                % else:
+                <div class="home-platforms-instance-poster">
+                    <div class="home-platforms-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                </div>
+                % endif
+            </a>
+            %if len(top_stat['rows']) > 1:
+            <div class="home-platforms-instance-list-chevron"><i class="fa fa-chevron-down"></i></div>
+            <ul class="list-unstyled">
+                <div class="slider">
+                    <div class="home-platforms-instance-list">
+                        % for row in top_stat['rows']:
+                        %if loop.index > 0:
+                        <li>
+                            <div class="home-platforms-instance-list-info">
+                                <div class="home-platforms-instance-list-name">
+                                    <h5>
+                                        <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                            ${top_stat['rows'][loop.index]['title']}
+                                        </a>
+                                    </h5>
+                                </div>
+                                <div class="home-platforms-instance-list-playcount">
+                                    <h3>${top_stat['rows'][loop.index]['users_watched']}</h3>
+                                    <p> users</p>
+                                </div>
+                            </div>
+                            <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                % if top_stat['rows'][loop.index]['grandparent_thumb']:
+                                <div class="home-platforms-instance-list-poster">
+                                    <div class="home-platforms-list-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][loop.index]['grandparent_thumb']}&width=300&height=450&fallback=poster);"></div>
+                                </div>
+                                % else:
+                                <div class="home-platforms-instance-poster2">
+                                    <div class="home-platforms-list-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                                </div>
+                                % endif
+                            </a>
+                            <div class="home-platforms-instance-list-number">
+                                <h4>${loop.index + 1}</h4>
+                            </div>
+                        </li>
+                        % endif
+                        % endfor
+                    </div>
+                </div>
+            </ul>
+            % endif
+        </li>
+    </div>
+    % elif top_stat['stat_id'] == 'top_movies' and top_stat['rows']:
+    <div class="home-platforms-instance">
+        <li>
+            <div class="home-platforms-instance-info">
+                <div class="home-platforms-instance-name">
+                    <h4>Most Watched Movie</h4>
+                </div>
+                <div class="home-platforms-instance-playcount">
+                    <h4>
+                        <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                            ${top_stat['rows'][0]['title']}
+                        </a>
+                    </h4>
+                    % if top_stat['stat_type'] == 'total_plays':
+                    <h3>${top_stat['rows'][0]['total_plays']}</h3>
+                    <p> plays</p>
+                    % else:
+                    ${top_stat['rows'][0]['total_duration'] | hd}
+                    % endif
+                </div>
+            </div>
+            <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                % if top_stat['rows'][0]['thumb']:
+                <div class="home-platforms-instance-poster">
+                    <div class="home-platforms-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][0]['thumb']}&width=300&height=450&fallback=poster);"></div>
+                </div>
+                % else:
+                <div class="home-platforms-instance-poster">
+                    <div class="home-platforms-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                </div>
+                % endif
+            </a>
+            %if len(top_stat['rows']) > 1:
+            <div class="home-platforms-instance-list-chevron"><i class="fa fa-chevron-down"></i></div>
+            <ul class="list-unstyled">
+                <div class="slider">
+                    <div class="home-platforms-instance-list">
+                        % for row in top_stat['rows']:
+                        %if loop.index > 0:
+                        <li>
+                            <div class="home-platforms-instance-list-info">
+                                <div class="home-platforms-instance-list-name">
+                                    <h5>
+                                        <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                            ${top_stat['rows'][loop.index]['title']}
+                                        </a>
+                                    </h5>
+                                </div>
+                                <div class="home-platforms-instance-list-playcount">
+                                    % if top_stat['stat_type'] == 'total_plays':
+                                    <h3>${top_stat['rows'][loop.index]['total_plays']}</h3>
+                                    <p> plays</p>
+                                    % else:
+                                    ${top_stat['rows'][loop.index]['total_duration'] | hd}
+                                    % endif
+                                </div>
+                            </div>
+                            <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                % if top_stat['rows'][loop.index]['thumb']:
+                                <div class="home-platforms-instance-list-poster">
+                                    <div class="home-platforms-list-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][loop.index]['thumb']}&width=300&height=450&fallback=poster);"></div>
+                                </div>
+                                % else:
+                                <div class="home-platforms-instance-poster2">
+                                    <div class="home-platforms-list-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                                </div>
+                                % endif
+                            </a>
+                            <div class="home-platforms-instance-list-number">
+                                <h4>${loop.index + 1}</h4>
+                            </div>
+                        </li>
+                        % endif
+                        % endfor
+                    </div>
+                </div>
+            </ul>
+            % endif
+        </li>
+    </div>
+    % elif top_stat['stat_id'] == 'popular_movies' and top_stat['rows']:
+    <div class="home-platforms-instance">
+        <li>
+            <div class="home-platforms-instance-info">
+                <div class="home-platforms-instance-name">
+                    <h4>Most Popular Movie</h4>
+                </div>
+                <div class="home-platforms-instance-playcount">
+                    <h4>
+                        <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                            ${top_stat['rows'][0]['title']}
+                        </a>
+                    </h4>
+                    <h3>${top_stat['rows'][0]['users_watched']}</h3>
+                    <p> users</p>
+                </div>
+            </div>
+            <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                % if top_stat['rows'][0]['thumb']:
+                <div class="home-platforms-instance-poster">
+                    <div class="home-platforms-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][0]['thumb']}&width=300&height=450&fallback=poster);"></div>
+                </div>
+                % else:
+                <div class="home-platforms-instance-poster">
+                    <div class="home-platforms-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                </div>
+                % endif
+            </a>
+            %if len(top_stat['rows']) > 1:
+            <div class="home-platforms-instance-list-chevron"><i class="fa fa-chevron-down"></i></div>
+            <ul class="list-unstyled">
+                <div class="slider">
+                    <div class="home-platforms-instance-list">
+                        % for row in top_stat['rows']:
+                        %if loop.index > 0:
+                        <li>
+                            <div class="home-platforms-instance-list-info">
+                                <div class="home-platforms-instance-list-name">
+                                    <h5>
+                                        <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                            ${top_stat['rows'][loop.index]['title']}
+                                        </a>
+                                    </h5>
+                                </div>
+                                <div class="home-platforms-instance-list-playcount">
+                                    <h3>${top_stat['rows'][loop.index]['users_watched']}</h3>
+                                    <p> users</p>
+                                </div>
+                            </div>
+                            <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                % if top_stat['rows'][loop.index]['thumb']:
+                                <div class="home-platforms-instance-list-poster">
+                                    <div class="home-platforms-list-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][loop.index]['thumb']}&width=300&height=450&fallback=poster);"></div>
+                                </div>
+                                % else:
+                                <div class="home-platforms-instance-poster2">
+                                    <div class="home-platforms-list-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                                </div>
+                                % endif
+                            </a>
+                            <div class="home-platforms-instance-list-number">
+                                <h4>${loop.index + 1}</h4>
+                            </div>
+                        </li>
+                        % endif
+                        % endfor
+                    </div>
+                </div>
+            </ul>
+            % endif
+        </li>
+    </div>
+    % elif top_stat['stat_id'] == 'top_music' and top_stat['rows']:
+    <div class="home-platforms-instance">
+        <li>
+            <div class="home-platforms-instance-info">
+                <div class="home-platforms-instance-name">
+                    <h4>Most Listened to Artist</h4>
+                </div>
+                <div class="home-platforms-instance-playcount">
+                    <h4>
+                        <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                            ${top_stat['rows'][0]['title']}
+                        </a>
+                    </h4>
+                    % if top_stat['stat_type'] == 'total_plays':
+                    <h3>${top_stat['rows'][0]['total_plays']}</h3>
+                    <p> plays</p>
+                    % else:
+                    ${top_stat['rows'][0]['total_duration'] | hd}
+                    % endif
+                </div>
+            </div>
+            <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                % if top_stat['rows'][0]['grandparent_thumb']:
+                <div class="home-platforms-instance-poster">
+                    <div class="home-platforms-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][0]['grandparent_thumb']}&width=300&height=300&fallback=poster);"></div>
+                </div>
+                % else:
+                <div class="home-platforms-instance-poster">
+                    <div class="home-platforms-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                </div>
+                % endif
+            </a>
+            %if len(top_stat['rows']) > 1:
+            <div class="home-platforms-instance-list-chevron"><i class="fa fa-chevron-down"></i></div>
+            <ul class="list-unstyled">
+                <div class="slider">
+                    <div class="home-platforms-instance-list">
+                        % for row in top_stat['rows']:
+                        %if loop.index > 0:
+                        <li>
+                            <div class="home-platforms-instance-list-info">
+                                <div class="home-platforms-instance-list-name">
+                                    <h5>
+                                        <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                            ${top_stat['rows'][loop.index]['title']}
+                                        </a>
+                                    </h5>
+                                </div>
+                                <div class="home-platforms-instance-list-playcount">
+                                    % if top_stat['stat_type'] == 'total_plays':
+                                    <h3>${top_stat['rows'][loop.index]['total_plays']}</h3>
+                                    <p> plays</p>
+                                    % else:
+                                    ${top_stat['rows'][loop.index]['total_duration'] | hd}
+                                    % endif
+                                </div>
+                            </div>
+                            <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                % if top_stat['rows'][loop.index]['grandparent_thumb']:
+                                <div class="home-platforms-instance-list-poster">
+                                    <div class="home-platforms-list-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][loop.index]['grandparent_thumb']}&width=300&height=300&fallback=poster);"></div>
+                                </div>
+                                % else:
+                                <div class="home-platforms-instance-poster2">
+                                    <div class="home-platforms-list-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                                </div>
+                                % endif
+                            </a>
+                            <div class="home-platforms-instance-list-number">
+                                <h4>${loop.index + 1}</h4>
+                            </div>
+                        </li>
+                        % endif
+                        % endfor
+                    </div>
+                </div>
+            </ul>
+            % endif
+        </li>
+    </div>
+    % elif top_stat['stat_id'] == 'popular_music' and top_stat['rows']:
+    <div class="home-platforms-instance">
+        <li>
+            <div class="home-platforms-instance-info">
+                <div class="home-platforms-instance-name">
+                    <h4>Most Popular Artist</h4>
+                </div>
+                <div class="home-platforms-instance-playcount">
+                    <h4>
+                        <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                            ${top_stat['rows'][0]['title']}
+                        </a>
+                    </h4>
+                    <h3>${top_stat['rows'][0]['users_watched']}</h3>
+                    <p> users</p>
+                </div>
+            </div>
+            <a href="info?item_id=${top_stat['rows'][0]['rating_key']}" title="${top_stat['rows'][0]['title']}">
+                % if top_stat['rows'][0]['grandparent_thumb'] != '':
+                <div class="home-platforms-instance-poster">
+                    <div class="home-platforms-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][0]['grandparent_thumb']}&width=300&height=300&fallback=poster);"></div>
+                </div>
+                % else:
+                <div class="home-platforms-instance-poster">
+                    <div class="home-platforms-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                </div>
+                % endif
+            </a>
+            %if len(top_stat['rows']) > 1:
+            <div class="home-platforms-instance-list-chevron"><i class="fa fa-chevron-down"></i></div>
+            <ul class="list-unstyled">
+                <div class="slider">
+                    <div class="home-platforms-instance-list">
+                        % for row in top_stat['rows']:
+                        %if loop.index > 0:
+                        <li>
+                            <div class="home-platforms-instance-list-info">
+                                <div class="home-platforms-instance-list-name">
+                                    <h5>
+                                        <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                            ${top_stat['rows'][loop.index]['title']}
+                                        </a>
+                                    </h5>
+                                </div>
+                                <div class="home-platforms-instance-list-playcount">
+                                    <h3>${top_stat['rows'][loop.index]['users_watched']}</h3>
+                                    <p> users</p>
+                                </div>
+                            </div>
+                            <a href="info?item_id=${top_stat['rows'][loop.index]['rating_key']}" title="${top_stat['rows'][loop.index]['title']}">
+                                % if top_stat['rows'][loop.index]['grandparent_thumb']:
+                                <div class="home-platforms-instance-list-poster">
+                                    <div class="home-platforms-list-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][loop.index]['grandparent_thumb']}&width=300&height=300&fallback=poster);"></div>
+                                </div>
+                                % else:
+                                <div class="home-platforms-instance-poster2">
+                                    <div class="home-platforms-list-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                                </div>
+                                % endif
+                            </a>
+                            <div class="home-platforms-instance-list-number">
+                                <h4>${loop.index + 1}</h4>
+                            </div>
+                        </li>
+                        % endif
+                        % endfor
+                    </div>
+                </div>
+            </ul>
+            % endif
+        </li>
+    </div>
+    % elif top_stat['stat_id'] == 'top_users' and top_stat['rows']:
+    <div class="home-platforms-instance">
+        <li>
+            <div class="home-platforms-instance-info">
+                <div class="home-platforms-instance-name">
+                    <h4>Most Active User</h4>
+                </div>
+                <div class="home-platforms-instance-playcount">
+                    <h4>
+                        % if top_stat['rows'][0]['user_id']:
+                        <a href="user?user_id=${top_stat['rows'][0]['user_id']}" title="${top_stat['rows'][0]['friendly_name']}">
+                        % else:
+                        <a href="user?user=${top_stat['rows'][0]['user']}" title="${top_stat['rows'][0]['friendly_name']}">
+                        % endif
+                            ${top_stat['rows'][0]['friendly_name']}
+                        </a>
+                    </h4>
+                    % if top_stat['stat_type'] == 'total_plays':
+                    <h3>${top_stat['rows'][0]['total_plays']}</h3>
+                    <p> plays</p>
+                    % else:
+                    ${top_stat['rows'][0]['total_duration'] | hd}
+                    % endif
+                </div>
+            </div>
+            % if top_stat['rows'][0]['user_id']:
+            <a href="user?user_id=${top_stat['rows'][0]['user_id']}" title="${top_stat['rows'][0]['friendly_name']}">
+            % else:
+            <a href="user?user=${top_stat['rows'][0]['user']}" title="${top_stat['rows'][0]['friendly_name']}">
+            % endif
+                % if top_stat['rows'][0]['user_thumb'] != '':
+                <div class="home-platforms-instance-poster">
+                    <div class="home-platforms-instance-oval" style="background-image: url(${top_stat['rows'][0]['user_thumb']});"></div>
+                </div>
+                % else:
+                <div class="home-platforms-instance-poster">
+                    <div class="home-platforms-instance-oval" style="background-image: url(interfaces/default/images/gravatar-default.png);"></div>
+                </div>
+                % endif
+            </a>
+            %if len(top_stat['rows']) > 1:
+            <div class="home-platforms-instance-list-chevron"><i class="fa fa-chevron-down"></i></div>
+            <ul class="list-unstyled">
+                <div class="slider">
+                    <div class="home-platforms-instance-list">
+                        % for row in top_stat['rows']:
+                        %if loop.index > 0:
+                        <li>
+                            <div class="home-platforms-instance-list-info">
+                                <div class="home-platforms-instance-list-name">
+                                    <h5>
+                                        % if top_stat['rows'][loop.index]['user_id']:
+                                        <a href="user?user_id=${top_stat['rows'][loop.index]['user_id']}" title="${top_stat['rows'][loop.index]['friendly_name']}">
+                                        % else:
+                                        <a href="user?user=${top_stat['rows'][loop.index]['user']}" title="${top_stat['rows'][loop.index]['friendly_name']}">
+                                        % endif
+                                            ${top_stat['rows'][loop.index]['friendly_name']}
+                                        </a>
+                                    </h5>
+                                </div>
+                                <div class="home-platforms-instance-list-playcount">
+                                    % if top_stat['stat_type'] == 'total_plays':
+                                    <h3>${top_stat['rows'][loop.index]['total_plays']}</h3>
+                                    <p> plays</p>
+                                    % else:
+                                    ${top_stat['rows'][loop.index]['total_duration'] | hd}
+                                    % endif
+                                </div>
+                            </div>
+                            % if top_stat['rows'][loop.index]['user_id']:
+                            <a href="user?user_id=${top_stat['rows'][loop.index]['user_id']}" title="${top_stat['rows'][loop.index]['friendly_name']}">
+                            % else:
+                            <a href="user?user=${top_stat['rows'][loop.index]['user']}" title="${top_stat['rows'][loop.index]['friendly_name']}">
+                            % endif
+                                % if top_stat['rows'][loop.index]['user_thumb'] != '':
+                                <div class="home-platforms-instance-poster">
+                                    <div class="home-platforms-instance-list-oval" style="background-image: url(${top_stat['rows'][loop.index]['user_thumb']});"></div>
+                                </div>
+                                % else:
+                                <div class="home-platforms-instance-poster">
+                                    <div class="home-platforms-instance-list-oval" style="background-image: url(interfaces/default/images/gravatar-default.png);"></div>
+                                </div>
+                                % endif
+                                </a>
+                            <div class="home-platforms-instance-list-number">
+                                <h4>${loop.index + 1}</h4>
+                            </div>
+                        </li>
+                        % endif
+                        % endfor
+                    </div>
+                </div>
+            </ul>
+            % endif
+        </li>
+    </div>
+    % elif top_stat['stat_id'] == 'top_platforms' and top_stat['rows']:
+    <div class="home-platforms-instance">
+        <li>
+            <div class="home-platforms-instance-info">
+                <div class="home-platforms-instance-name">
+                    <h4>Most Active Platform</h4>
+                </div>
+                <div class="home-platforms-instance-playcount">
+                    <h4 title="${top_stat['rows'][0]['platform_type']}">${top_stat['rows'][0]['platform_type']}</h4>
+                    % if top_stat['stat_type'] == 'total_plays':
+                    <h3>${top_stat['rows'][0]['total_plays']}</h3>
+                    <p> plays</p>
+                    % else:
+                    ${top_stat['rows'][0]['total_duration'] | hd}
+                    % endif
+                </div>
+            </div>
+            <div id="platform-stat" class="home-platforms-instance-poster" title="${top_stat['rows'][0]['platform_type']}">
+                <script>
+                    $("#platform-stat").html("<div class='home-platforms-instance-box' style='background-image: url(" + getPlatformImagePath('${top_stat['rows'][0]['platform_type']}') + ");'>");
+                </script>
+            </div>
+            %if len(top_stat['rows']) > 1:
+            <div class="home-platforms-instance-list-chevron"><i class="fa fa-chevron-down"></i></div>
+            <ul class="list-unstyled">
+                <div class="slider">
+                    <div class="home-platforms-instance-list">
+                        % for row in top_stat['rows']:
+                        %if loop.index > 0:
+                        <li>
+                            <div class="home-platforms-instance-list-info">
+                                <div class="home-platforms-instance-list-name">
+                                    <h5 title="${top_stat['rows'][loop.index]['platform_type']}">
+                                        ${top_stat['rows'][loop.index]['platform_type']}
+                                    </h5>
+                                </div>
+                                <div class="home-platforms-instance-list-playcount">
+                                    % if top_stat['stat_type'] == 'total_plays':
+                                    <h3>${top_stat['rows'][loop.index]['total_plays']}</h3>
+                                    <p> plays</p>
+                                    % else:
+                                    ${top_stat['rows'][loop.index]['total_duration'] | hd}
+                                    % endif
+                                </div>
+                            </div>
+                            <div class="home-platforms-instance-poster" id="home-platforms-instance-poster-${loop.index + 1}" title="${top_stat['rows'][loop.index]['platform_type']}">
+                                <script>
+                                    $("#home-platforms-instance-poster-${loop.index + 1}").html("<div class='home-platforms-instance-list-box' style='background-image: url(" + getPlatformImagePath('${top_stat['rows'][loop.index]['platform_type']}') + ");'>");
+                                </script>
+                            </div>
+                            <div class="home-platforms-instance-list-number">
+                                <h4>${loop.index + 1}</h4>
+                            </div>
+                        </li>
+                        % endif
+                        % endfor
+                    </div>
+                </div>
+            </ul>
+            % endif
+        </li>
+    </div>
+    % elif top_stat['stat_id'] == 'last_watched' and top_stat['rows']:
+    <div class="home-platforms-instance">
+        <li>
+            <div class="home-platforms-instance-info">
+                <div class="home-platforms-instance-name">
+                    <h4>Last Watched</h4>
+                </div>
+                <div class="home-platforms-instance-last-user">
+                    <h4>
+                        <a href="info?source=history&item_id=${top_stat['rows'][0]['row_id']}" title="${top_stat['rows'][0]['title']}">
+                            ${top_stat['rows'][0]['title']}
+                        </a>
+                    </h4>
+                    <h5>
+                        % if top_stat['rows'][0]['user_id']:
+                        <a href="user?user_id=${top_stat['rows'][0]['user_id']}" title="${top_stat['rows'][0]['friendly_name']}">
+                        % else:
+                        <a href="user?user=${top_stat['rows'][0]['user']}" title="${top_stat['rows'][0]['friendly_name']}">
+                        % endif
+                            ${top_stat['rows'][0]['friendly_name']}
+                        </a>
+                    </h5>
+                    <p>
+                        <span id="last-watch-stat">
+                            <script>
+                                $('#last-watch-stat').text(moment(${top_stat['rows'][0]['last_watch']},"X").format(date_format));
+                            </script>
+                        </span> - ${top_stat['rows'][0]['platform_type']}
+                    </p>
+                </div>
+            </div>
+            <a href="info?source=history&item_id=${top_stat['rows'][0]['row_id']}" title="${top_stat['rows'][0]['title']}">
+                % if top_stat['rows'][0]['thumb']:
+                <div class="home-platforms-instance-poster">
+                    <div class="home-platforms-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][0]['thumb']}&width=300&height=450&fallback=poster);"></div>
+                </div>
+                % else:
+                <div class="home-platforms-instance-poster">
+                    <div class="home-platforms-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                </div>
+                % endif
+            </a>
+            %if len(top_stat['rows']) > 1:
+            <div class="home-platforms-instance-list-chevron"><i class="fa fa-chevron-down"></i></div>
+            <ul class="list-unstyled">
+                <div class="slider">
+                    <div class="home-platforms-instance-list">
+                        % for row in top_stat['rows']:
+                        %if loop.index > 0:
+                        <li>
+                            <div class="home-platforms-instance-list-info">
+                                <div class="home-platforms-instance-list-name">
+                                    <h5>
+                                        <a href="info?source=history&item_id=${top_stat['rows'][loop.index]['row_id']}" title="${top_stat['rows'][loop.index]['title']}">
+                                            ${top_stat['rows'][loop.index]['title']}
+                                        </a>
+                                    </h5>
+                                </div>
+                                <div class="home-platforms-instance-list-last-user">
+                                    <h5>
+                                        % if top_stat['rows'][loop.index]['user_id']:
+                                        <a href="user?user_id=${top_stat['rows'][loop.index]['user_id']}" title="${top_stat['rows'][loop.index]['friendly_name']}">
+                                        % else:
+                                        <a href="user?user=${top_stat['rows'][loop.index]['user']}" title="${top_stat['rows'][loop.index]['friendly_name']}">
+                                        % endif
+                                            ${top_stat['rows'][loop.index]['friendly_name']}
+                                        </a>
+                                    </h5>
+                                    <p>
+                                        <span id="home-platforms-instance-list-last-watch-${loop.index + 1}">
+                                            <script>
+                                                $('#home-platforms-instance-list-last-watch-${loop.index + 1}').text(moment(${top_stat['rows'][loop.index]['last_watch']},"X").format(date_format));
+                                            </script>
+                                        </span> - ${top_stat['rows'][loop.index]['platform_type']}
+                                    </p>
+                                </div>
+                            </div>
+                            <a href="info?source=history&item_id=${top_stat['rows'][loop.index]['row_id']}" title="${top_stat['rows'][loop.index]['title']}">
+                                % if top_stat['rows'][loop.index]['thumb']:
+                                <div class="home-platforms-instance-list-poster">
+                                    <div class="home-platforms-list-poster-face" style="background-image: url(pms_image_proxy?img=${top_stat['rows'][loop.index]['thumb']}&width=300&height=450&fallback=poster);"></div>
+                                </div>
+                                % else:
+                                <div class="home-platforms-instance-poster2">
+                                    <div class="home-platforms-list-poster-face" style="background-image: url(interfaces/default/images/poster.png);"></div>
+                                </div>
+                                % endif
+                            </a>
+                            <div class="home-platforms-instance-list-number">
+                                <h4>${loop.index + 1}</h4>
+                            </div>
+                        </li>
+                        % endif
+                        % endfor
+                    </div>
+                </div>
+            </ul>
+            % endif
+        </li>
+    </div>
+    % endif
+    % endfor
+</ul>
+<script>
+    var topZIndex = 2;
+    $('.home-platforms-instance-list-chevron').on('click', function() {
+        var instanceBoxChevron = $(this);
+        var instanceBox = $(this).parents('.home-platforms-instance');
+        var instanceBoxSlider = instanceBox.find('.slider');
+        
+        topZIndex++;
+        instanceBoxChevron.toggleClass('active');
+        instanceBoxSlider.css('z-index', topZIndex);
+        instanceBoxSlider.stop().slideToggle(500);
+    });
+</script>
 % else:
-<div class="text-muted">No stats to show for the selected period.</div><br>
+<div class="text-muted">No stats for selected period.</div><br>
+% endif
+% else:
+<div class="text-muted">Unable to retrieve data from database. Please check your <a href="settings">settings</a>.
+</div><br>
 % endif
\ No newline at end of file
diff --git a/data/interfaces/default/images/13AD46AC.png b/data/interfaces/default/images/13AD46AC.png
deleted file mode 100644
index 7ab91c05..00000000
Binary files a/data/interfaces/default/images/13AD46AC.png and /dev/null differ
diff --git a/data/interfaces/default/images/13AD46AD.png b/data/interfaces/default/images/13AD46AD.png
deleted file mode 100644
index 9d6cfd90..00000000
Binary files a/data/interfaces/default/images/13AD46AD.png and /dev/null differ
diff --git a/data/interfaces/default/images/93124B54.png b/data/interfaces/default/images/93124B54.png
deleted file mode 100644
index c4abfd72..00000000
Binary files a/data/interfaces/default/images/93124B54.png and /dev/null differ
diff --git a/data/interfaces/default/images/93124B55.png b/data/interfaces/default/images/93124B55.png
deleted file mode 100644
index 5437946b..00000000
Binary files a/data/interfaces/default/images/93124B55.png and /dev/null differ
diff --git a/data/interfaces/default/images/Stripe_wordmark_-_white_small_28px.png b/data/interfaces/default/images/Stripe_wordmark_-_white_small_28px.png
deleted file mode 100644
index 960f32ee..00000000
Binary files a/data/interfaces/default/images/Stripe_wordmark_-_white_small_28px.png and /dev/null differ
diff --git a/data/interfaces/default/images/app-store-badge.svg b/data/interfaces/default/images/app-store-badge.svg
deleted file mode 100644
index 072b425a..00000000
--- a/data/interfaces/default/images/app-store-badge.svg
+++ /dev/null
@@ -1,46 +0,0 @@
-<svg id="livetype" xmlns="http://www.w3.org/2000/svg" width="119.66407" height="40" viewBox="0 0 119.66407 40">
-  <title>Download_on_the_App_Store_Badge_US-UK_RGB_blk_4SVG_092917</title>
-  <g>
-    <g>
-      <g>
-        <path d="M110.13477,0H9.53468c-.3667,0-.729,0-1.09473.002-.30615.002-.60986.00781-.91895.0127A13.21476,13.21476,0,0,0,5.5171.19141a6.66509,6.66509,0,0,0-1.90088.627A6.43779,6.43779,0,0,0,1.99757,1.99707,6.25844,6.25844,0,0,0,.81935,3.61816a6.60119,6.60119,0,0,0-.625,1.90332,12.993,12.993,0,0,0-.1792,2.002C.00587,7.83008.00489,8.1377,0,8.44434V31.5586c.00489.3105.00587.6113.01515.9219a12.99232,12.99232,0,0,0,.1792,2.0019,6.58756,6.58756,0,0,0,.625,1.9043A6.20778,6.20778,0,0,0,1.99757,38.001a6.27445,6.27445,0,0,0,1.61865,1.1787,6.70082,6.70082,0,0,0,1.90088.6308,13.45514,13.45514,0,0,0,2.0039.1768c.30909.0068.6128.0107.91895.0107C8.80567,40,9.168,40,9.53468,40H110.13477c.3594,0,.7246,0,1.084-.002.3047,0,.6172-.0039.9219-.0107a13.279,13.279,0,0,0,2-.1768,6.80432,6.80432,0,0,0,1.9082-.6308,6.27742,6.27742,0,0,0,1.6172-1.1787,6.39482,6.39482,0,0,0,1.1816-1.6143,6.60413,6.60413,0,0,0,.6191-1.9043,13.50643,13.50643,0,0,0,.1856-2.0019c.0039-.3106.0039-.6114.0039-.9219.0078-.3633.0078-.7246.0078-1.0938V9.53613c0-.36621,0-.72949-.0078-1.09179,0-.30664,0-.61426-.0039-.9209a13.5071,13.5071,0,0,0-.1856-2.002,6.6177,6.6177,0,0,0-.6191-1.90332,6.46619,6.46619,0,0,0-2.7988-2.7998,6.76754,6.76754,0,0,0-1.9082-.627,13.04394,13.04394,0,0,0-2-.17676c-.3047-.00488-.6172-.01074-.9219-.01269-.3594-.002-.7246-.002-1.084-.002Z" style="fill: #a6a6a6"/>
-        <path d="M8.44483,39.125c-.30468,0-.602-.0039-.90429-.0107a12.68714,12.68714,0,0,1-1.86914-.1631,5.88381,5.88381,0,0,1-1.65674-.5479,5.40573,5.40573,0,0,1-1.397-1.0166,5.32082,5.32082,0,0,1-1.02051-1.3965,5.72186,5.72186,0,0,1-.543-1.6572,12.41351,12.41351,0,0,1-.1665-1.875c-.00634-.2109-.01464-.9131-.01464-.9131V8.44434S.88185,7.75293.8877,7.5498a12.37039,12.37039,0,0,1,.16553-1.87207,5.7555,5.7555,0,0,1,.54346-1.6621A5.37349,5.37349,0,0,1,2.61183,2.61768,5.56543,5.56543,0,0,1,4.01417,1.59521a5.82309,5.82309,0,0,1,1.65332-.54394A12.58589,12.58589,0,0,1,7.543.88721L8.44532.875H111.21387l.9131.0127a12.38493,12.38493,0,0,1,1.8584.16259,5.93833,5.93833,0,0,1,1.6709.54785,5.59374,5.59374,0,0,1,2.415,2.41993,5.76267,5.76267,0,0,1,.5352,1.64892,12.995,12.995,0,0,1,.1738,1.88721c.0029.2832.0029.5874.0029.89014.0079.375.0079.73193.0079,1.09179V30.4648c0,.3633,0,.7178-.0079,1.0752,0,.3252,0,.6231-.0039.9297a12.73126,12.73126,0,0,1-.1709,1.8535,5.739,5.739,0,0,1-.54,1.67,5.48029,5.48029,0,0,1-1.0156,1.3857,5.4129,5.4129,0,0,1-1.3994,1.0225,5.86168,5.86168,0,0,1-1.668.5498,12.54218,12.54218,0,0,1-1.8692.1631c-.2929.0068-.5996.0107-.8974.0107l-1.084.002Z"/>
-      </g>
-      <g id="_Group_" data-name="&lt;Group&gt;">
-        <g id="_Group_2" data-name="&lt;Group&gt;">
-          <g id="_Group_3" data-name="&lt;Group&gt;">
-            <path id="_Path_" data-name="&lt;Path&gt;" d="M24.76888,20.30068a4.94881,4.94881,0,0,1,2.35656-4.15206,5.06566,5.06566,0,0,0-3.99116-2.15768c-1.67924-.17626-3.30719,1.00483-4.1629,1.00483-.87227,0-2.18977-.98733-3.6085-.95814a5.31529,5.31529,0,0,0-4.47292,2.72787c-1.934,3.34842-.49141,8.26947,1.3612,10.97608.9269,1.32535,2.01018,2.8058,3.42763,2.7533,1.38706-.05753,1.9051-.88448,3.5794-.88448,1.65876,0,2.14479.88448,3.591.8511,1.48838-.02416,2.42613-1.33124,3.32051-2.66914a10.962,10.962,0,0,0,1.51842-3.09251A4.78205,4.78205,0,0,1,24.76888,20.30068Z" style="fill: #fff"/>
-            <path id="_Path_2" data-name="&lt;Path&gt;" d="M22.03725,12.21089a4.87248,4.87248,0,0,0,1.11452-3.49062,4.95746,4.95746,0,0,0-3.20758,1.65961,4.63634,4.63634,0,0,0-1.14371,3.36139A4.09905,4.09905,0,0,0,22.03725,12.21089Z" style="fill: #fff"/>
-          </g>
-        </g>
-        <g>
-          <path d="M42.30227,27.13965h-4.7334l-1.13672,3.35645H34.42727l4.4834-12.418h2.083l4.4834,12.418H43.438ZM38.0591,25.59082h3.752l-1.84961-5.44727h-.05176Z" style="fill: #fff"/>
-          <path d="M55.15969,25.96973c0,2.81348-1.50586,4.62109-3.77832,4.62109a3.0693,3.0693,0,0,1-2.84863-1.584h-.043v4.48438h-1.8584V21.44238H48.4302v1.50586h.03418a3.21162,3.21162,0,0,1,2.88281-1.60059C53.645,21.34766,55.15969,23.16406,55.15969,25.96973Zm-1.91016,0c0-1.833-.94727-3.03809-2.39258-3.03809-1.41992,0-2.375,1.23047-2.375,3.03809,0,1.82422.95508,3.0459,2.375,3.0459C52.30227,29.01563,53.24953,27.81934,53.24953,25.96973Z" style="fill: #fff"/>
-          <path d="M65.12453,25.96973c0,2.81348-1.50586,4.62109-3.77832,4.62109a3.0693,3.0693,0,0,1-2.84863-1.584h-.043v4.48438h-1.8584V21.44238H58.395v1.50586h.03418A3.21162,3.21162,0,0,1,61.312,21.34766C63.60988,21.34766,65.12453,23.16406,65.12453,25.96973Zm-1.91016,0c0-1.833-.94727-3.03809-2.39258-3.03809-1.41992,0-2.375,1.23047-2.375,3.03809,0,1.82422.95508,3.0459,2.375,3.0459C62.26711,29.01563,63.21438,27.81934,63.21438,25.96973Z" style="fill: #fff"/>
-          <path d="M71.71047,27.03613c.1377,1.23145,1.334,2.04,2.96875,2.04,1.56641,0,2.69336-.80859,2.69336-1.91895,0-.96387-.67969-1.541-2.28906-1.93652l-1.60937-.3877c-2.28027-.55078-3.33887-1.61719-3.33887-3.34766,0-2.14258,1.86719-3.61426,4.51855-3.61426,2.624,0,4.42285,1.47168,4.4834,3.61426h-1.876c-.1123-1.23926-1.13672-1.9873-2.63379-1.9873s-2.52148.75684-2.52148,1.8584c0,.87793.6543,1.39453,2.25488,1.79l1.36816.33594c2.54785.60254,3.60645,1.626,3.60645,3.44238,0,2.32324-1.85059,3.77832-4.79395,3.77832-2.75391,0-4.61328-1.4209-4.7334-3.667Z" style="fill: #fff"/>
-          <path d="M83.34621,19.2998v2.14258h1.72168v1.47168H83.34621v4.99121c0,.77539.34473,1.13672,1.10156,1.13672a5.80752,5.80752,0,0,0,.61133-.043v1.46289a5.10351,5.10351,0,0,1-1.03223.08594c-1.833,0-2.54785-.68848-2.54785-2.44434V22.91406H80.16262V21.44238H81.479V19.2998Z" style="fill: #fff"/>
-          <path d="M86.065,25.96973c0-2.84863,1.67773-4.63867,4.29395-4.63867,2.625,0,4.29492,1.79,4.29492,4.63867,0,2.85645-1.66113,4.63867-4.29492,4.63867C87.72609,30.6084,86.065,28.82617,86.065,25.96973Zm6.69531,0c0-1.9541-.89551-3.10742-2.40137-3.10742s-2.40039,1.16211-2.40039,3.10742c0,1.96191.89453,3.10645,2.40039,3.10645S92.76027,27.93164,92.76027,25.96973Z" style="fill: #fff"/>
-          <path d="M96.18606,21.44238h1.77246v1.541h.043a2.1594,2.1594,0,0,1,2.17773-1.63574,2.86616,2.86616,0,0,1,.63672.06934v1.73828a2.59794,2.59794,0,0,0-.835-.1123,1.87264,1.87264,0,0,0-1.93652,2.083v5.37012h-1.8584Z" style="fill: #fff"/>
-          <path d="M109.3843,27.83691c-.25,1.64355-1.85059,2.77148-3.89844,2.77148-2.63379,0-4.26855-1.76465-4.26855-4.5957,0-2.83984,1.64355-4.68164,4.19043-4.68164,2.50488,0,4.08008,1.7207,4.08008,4.46582v.63672h-6.39453v.1123a2.358,2.358,0,0,0,2.43555,2.56445,2.04834,2.04834,0,0,0,2.09082-1.27344Zm-6.28223-2.70215h4.52637a2.1773,2.1773,0,0,0-2.2207-2.29785A2.292,2.292,0,0,0,103.10207,25.13477Z" style="fill: #fff"/>
-        </g>
-      </g>
-    </g>
-    <g id="_Group_4" data-name="&lt;Group&gt;">
-      <g>
-        <path d="M37.82619,8.731a2.63964,2.63964,0,0,1,2.80762,2.96484c0,1.90625-1.03027,3.002-2.80762,3.002H35.67092V8.731Zm-1.22852,5.123h1.125a1.87588,1.87588,0,0,0,1.96777-2.146,1.881,1.881,0,0,0-1.96777-2.13379h-1.125Z" style="fill: #fff"/>
-        <path d="M41.68068,12.44434a2.13323,2.13323,0,1,1,4.24707,0,2.13358,2.13358,0,1,1-4.24707,0Zm3.333,0c0-.97607-.43848-1.54687-1.208-1.54687-.77246,0-1.207.5708-1.207,1.54688,0,.98389.43457,1.55029,1.207,1.55029C44.57522,13.99463,45.01369,13.42432,45.01369,12.44434Z" style="fill: #fff"/>
-        <path d="M51.57326,14.69775h-.92187l-.93066-3.31641h-.07031l-.92676,3.31641h-.91309l-1.24121-4.50293h.90137l.80664,3.436h.06641l.92578-3.436h.85254l.92578,3.436h.07031l.80273-3.436h.88867Z" style="fill: #fff"/>
-        <path d="M53.85354,10.19482H54.709v.71533h.06641a1.348,1.348,0,0,1,1.34375-.80225,1.46456,1.46456,0,0,1,1.55859,1.6748v2.915h-.88867V12.00586c0-.72363-.31445-1.0835-.97168-1.0835a1.03294,1.03294,0,0,0-1.0752,1.14111v2.63428h-.88867Z" style="fill: #fff"/>
-        <path d="M59.09377,8.437h.88867v6.26074h-.88867Z" style="fill: #fff"/>
-        <path d="M61.21779,12.44434a2.13346,2.13346,0,1,1,4.24756,0,2.1338,2.1338,0,1,1-4.24756,0Zm3.333,0c0-.97607-.43848-1.54687-1.208-1.54687-.77246,0-1.207.5708-1.207,1.54688,0,.98389.43457,1.55029,1.207,1.55029C64.11232,13.99463,64.5508,13.42432,64.5508,12.44434Z" style="fill: #fff"/>
-        <path d="M66.4009,13.42432c0-.81055.60352-1.27783,1.6748-1.34424l1.21973-.07031v-.38867c0-.47559-.31445-.74414-.92187-.74414-.49609,0-.83984.18213-.93848.50049h-.86035c.09082-.77344.81836-1.26953,1.83984-1.26953,1.12891,0,1.76563.562,1.76563,1.51318v3.07666h-.85547v-.63281h-.07031a1.515,1.515,0,0,1-1.35254.707A1.36026,1.36026,0,0,1,66.4009,13.42432Zm2.89453-.38477v-.37646l-1.09961.07031c-.62012.0415-.90137.25244-.90137.64941,0,.40527.35156.64111.835.64111A1.0615,1.0615,0,0,0,69.29543,13.03955Z" style="fill: #fff"/>
-        <path d="M71.34816,12.44434c0-1.42285.73145-2.32422,1.86914-2.32422a1.484,1.484,0,0,1,1.38086.79h.06641V8.437h.88867v6.26074h-.85156v-.71143h-.07031a1.56284,1.56284,0,0,1-1.41406.78564C72.0718,14.772,71.34816,13.87061,71.34816,12.44434Zm.918,0c0,.95508.4502,1.52979,1.20313,1.52979.749,0,1.21191-.583,1.21191-1.52588,0-.93848-.46777-1.52979-1.21191-1.52979C72.72121,10.91846,72.26613,11.49707,72.26613,12.44434Z" style="fill: #fff"/>
-        <path d="M79.23,12.44434a2.13323,2.13323,0,1,1,4.24707,0,2.13358,2.13358,0,1,1-4.24707,0Zm3.333,0c0-.97607-.43848-1.54687-1.208-1.54687-.77246,0-1.207.5708-1.207,1.54688,0,.98389.43457,1.55029,1.207,1.55029C82.12453,13.99463,82.563,13.42432,82.563,12.44434Z" style="fill: #fff"/>
-        <path d="M84.66945,10.19482h.85547v.71533h.06641a1.348,1.348,0,0,1,1.34375-.80225,1.46456,1.46456,0,0,1,1.55859,1.6748v2.915H87.605V12.00586c0-.72363-.31445-1.0835-.97168-1.0835a1.03294,1.03294,0,0,0-1.0752,1.14111v2.63428h-.88867Z" style="fill: #fff"/>
-        <path d="M93.51516,9.07373v1.1416h.97559v.74854h-.97559V13.2793c0,.47168.19434.67822.63672.67822a2.96657,2.96657,0,0,0,.33887-.02051v.74023a2.9155,2.9155,0,0,1-.4834.04541c-.98828,0-1.38184-.34766-1.38184-1.21582v-2.543h-.71484v-.74854h.71484V9.07373Z" style="fill: #fff"/>
-        <path d="M95.70461,8.437h.88086v2.48145h.07031a1.3856,1.3856,0,0,1,1.373-.80664,1.48339,1.48339,0,0,1,1.55078,1.67871v2.90723H98.69v-2.688c0-.71924-.335-1.0835-.96289-1.0835a1.05194,1.05194,0,0,0-1.13379,1.1416v2.62988h-.88867Z" style="fill: #fff"/>
-        <path d="M104.76125,13.48193a1.828,1.828,0,0,1-1.95117,1.30273A2.04531,2.04531,0,0,1,100.73,12.46045a2.07685,2.07685,0,0,1,2.07617-2.35254c1.25293,0,2.00879.856,2.00879,2.27V12.688h-3.17969v.0498a1.1902,1.1902,0,0,0,1.19922,1.29,1.07934,1.07934,0,0,0,1.07129-.5459Zm-3.126-1.45117h2.27441a1.08647,1.08647,0,0,0-1.1084-1.1665A1.15162,1.15162,0,0,0,101.63527,12.03076Z" style="fill: #fff"/>
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/data/interfaces/default/images/art-live-full.png b/data/interfaces/default/images/art-live-full.png
deleted file mode 100644
index bdb20927..00000000
Binary files a/data/interfaces/default/images/art-live-full.png and /dev/null differ
diff --git a/data/interfaces/default/images/art-live.png b/data/interfaces/default/images/art-live.png
deleted file mode 100644
index 25db2664..00000000
Binary files a/data/interfaces/default/images/art-live.png and /dev/null differ
diff --git a/data/interfaces/default/images/art.png b/data/interfaces/default/images/art.png
deleted file mode 100644
index 997b001f..00000000
Binary files a/data/interfaces/default/images/art.png and /dev/null differ
diff --git a/data/interfaces/default/images/become_a_patron_button.png b/data/interfaces/default/images/become_a_patron_button.png
deleted file mode 100644
index 291b7bcf..00000000
Binary files a/data/interfaces/default/images/become_a_patron_button.png and /dev/null differ
diff --git a/data/interfaces/default/images/check-solid.ico b/data/interfaces/default/images/check-solid.ico
deleted file mode 100644
index 5351e91e..00000000
Binary files a/data/interfaces/default/images/check-solid.ico and /dev/null differ
diff --git a/data/interfaces/default/images/default_profile.svg b/data/interfaces/default/images/default_profile.svg
deleted file mode 100644
index a2cd8f0e..00000000
--- a/data/interfaces/default/images/default_profile.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="120px" height="120px" viewBox="0 0 120 120" enable-background="new 0 0 120 120" xml:space="preserve">
-<g>
-	<path fill="#BEBEBE" d="M31.161,105.119c4.747-3.413,10.392-5.561,16.939-6.444c2.645,1.983,6.611,2.976,11.9,2.976
-		c5.288,0,9.255-0.992,11.9-2.976c6.546,0.884,12.192,3.031,16.938,6.444c-8.325,5.336-18.223,8.431-28.838,8.431
-		C49.385,113.55,39.487,110.455,31.161,105.119z"/>
-	<path fill="#D6D6D6" d="M48.1,98.675l2.737-8.553C42.241,84.96,36.2,72.758,36.2,58.526c0-7.478,1.669-14.397,4.498-20.029
-		c3.436,1.059,7.504,1.669,11.864,1.669c10.86,0,19.907-3.795,21.903-8.822c5.676,6.256,9.334,16.104,9.334,27.182
-		c0,14.232-6.041,26.434-14.637,31.596l2.737,8.553c-2.646,1.983-6.612,2.976-11.9,2.976c-5.248,0-9.194-0.977-11.838-2.929
-		L48.1,98.675z"/>
-	<path fill="#A6A6A6" d="M38.763,73.994C33.496,68.09,30.25,60,30.25,51.075C30.25,33.002,43.57,18.35,60,18.35
-		c16.431,0,29.75,14.65,29.75,32.724c0,8.925-3.247,17.016-8.514,22.92c1.64-4.647,2.563-9.901,2.563-15.468
-		c0-11.078-3.658-20.925-9.334-27.182c-1.996,5.027-11.043,8.822-21.903,8.822c-4.36,0-8.428-0.611-11.864-1.669
-		C37.868,44.128,36.2,51.048,36.2,58.526C36.2,64.093,37.124,69.348,38.763,73.994z"/>
-	<path fill="#D6D6D6" d="M60,113.55c29.575,0,53.55-23.974,53.55-53.55c0-29.575-23.975-53.55-53.55-53.55
-		C30.425,6.45,6.45,30.425,6.45,60C6.45,89.576,30.425,113.55,60,113.55z M60,119.5C27.138,119.5,0.5,92.86,0.5,60
-		S27.138,0.5,60,0.5c32.86,0,59.5,26.64,59.5,59.499C119.5,92.86,92.86,119.5,60,119.5z"/>
-</g>
-</svg>
diff --git a/data/interfaces/default/images/discord-overlay.png b/data/interfaces/default/images/discord-overlay.png
deleted file mode 100644
index 0ee330a0..00000000
Binary files a/data/interfaces/default/images/discord-overlay.png and /dev/null differ
diff --git a/data/interfaces/default/images/favicon.ico b/data/interfaces/default/images/favicon.ico
new file mode 100644
index 00000000..588e8b03
Binary files /dev/null and b/data/interfaces/default/images/favicon.ico differ
diff --git a/data/interfaces/default/images/favicon.png b/data/interfaces/default/images/favicon.png
new file mode 100644
index 00000000..61031461
Binary files /dev/null and b/data/interfaces/default/images/favicon.png differ
diff --git a/data/interfaces/default/images/favicon/android-chrome-192x192.png b/data/interfaces/default/images/favicon/android-chrome-192x192.png
deleted file mode 100644
index 67a57cff..00000000
Binary files a/data/interfaces/default/images/favicon/android-chrome-192x192.png and /dev/null differ
diff --git a/data/interfaces/default/images/favicon/android-chrome-256x256.png b/data/interfaces/default/images/favicon/android-chrome-256x256.png
deleted file mode 100644
index 4518b78a..00000000
Binary files a/data/interfaces/default/images/favicon/android-chrome-256x256.png and /dev/null differ
diff --git a/data/interfaces/default/images/favicon/apple-touch-icon.png b/data/interfaces/default/images/favicon/apple-touch-icon.png
deleted file mode 100644
index 16f05843..00000000
Binary files a/data/interfaces/default/images/favicon/apple-touch-icon.png and /dev/null differ
diff --git a/data/interfaces/default/images/favicon/browserconfig.xml b/data/interfaces/default/images/favicon/browserconfig.xml
deleted file mode 100644
index 8762506d..00000000
--- a/data/interfaces/default/images/favicon/browserconfig.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig>
-    <msapplication>
-        <tile>
-            <square150x150logo src="mstile-150x150.png?v=2.6.0"/>
-            <TileColor>#282a2d</TileColor>
-        </tile>
-    </msapplication>
-</browserconfig>
diff --git a/data/interfaces/default/images/favicon/favicon-16x16.png b/data/interfaces/default/images/favicon/favicon-16x16.png
deleted file mode 100644
index b2b8a3c2..00000000
Binary files a/data/interfaces/default/images/favicon/favicon-16x16.png and /dev/null differ
diff --git a/data/interfaces/default/images/favicon/favicon-32x32.png b/data/interfaces/default/images/favicon/favicon-32x32.png
deleted file mode 100644
index 34897ce1..00000000
Binary files a/data/interfaces/default/images/favicon/favicon-32x32.png and /dev/null differ
diff --git a/data/interfaces/default/images/favicon/favicon.ico b/data/interfaces/default/images/favicon/favicon.ico
deleted file mode 100644
index 5d1cc62e..00000000
Binary files a/data/interfaces/default/images/favicon/favicon.ico and /dev/null differ
diff --git a/data/interfaces/default/images/favicon/manifest.json b/data/interfaces/default/images/favicon/manifest.json
deleted file mode 100644
index 7ed483cc..00000000
--- a/data/interfaces/default/images/favicon/manifest.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "name": "Tautulli: Monitor your Plex Media Server",
-    "short_name": "Tautulli",
-    "Description": "A Python based monitoring and tracking tool for Plex Media Server.",
-    "start_url": "../../",
-    "scope": "../../",
-    "icons": [
-        {
-            "src": "android-chrome-192x192.png?v=2.6.0",
-            "sizes": "192x192",
-            "type": "image/png"
-        },
-        {
-            "src": "android-chrome-256x256.png?v=2.6.0",
-            "sizes": "256x256",
-            "type": "image/png"
-        }
-    ],
-    "theme_color": "#282a2d",
-    "background_color": "#282a2d",
-    "display": "standalone"
-}
\ No newline at end of file
diff --git a/data/interfaces/default/images/favicon/mstile-150x150.png b/data/interfaces/default/images/favicon/mstile-150x150.png
deleted file mode 100644
index 072be207..00000000
Binary files a/data/interfaces/default/images/favicon/mstile-150x150.png and /dev/null differ
diff --git a/data/interfaces/default/images/favicon/safari-pinned-tab.svg b/data/interfaces/default/images/favicon/safari-pinned-tab.svg
deleted file mode 100644
index 4a9d0a69..00000000
--- a/data/interfaces/default/images/favicon/safari-pinned-tab.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- width="350.000000pt" height="350.000000pt" viewBox="0 0 350.000000 350.000000"
- preserveAspectRatio="xMidYMid meet">
-<metadata>
-Created by potrace 1.11, written by Peter Selinger 2001-2013
-</metadata>
-<g transform="translate(0.000000,350.000000) scale(0.100000,-0.100000)"
-fill="#000000" stroke="none">
-<path d="M1566 3489 c-433 -46 -867 -274 -1141 -601 -404 -481 -526 -1100
--334 -1688 91 -278 283 -569 498 -756 676 -589 1646 -589 2322 0 215 187 407
-478 498 756 142 436 113 895 -84 1305 -320 666 -1027 1061 -1759 984z m1147
--604 c87 -36 146 -118 154 -214 10 -111 -39 -203 -137 -254 -49 -26 -63 -28
--131 -25 l-76 3 -109 -154 c-60 -85 -190 -269 -290 -409 l-181 -255 26 -46
-c22 -38 26 -59 26 -121 0 -63 -5 -84 -29 -132 -27 -54 -28 -59 -13 -76 22 -24
-47 -86 47 -117 0 -14 6 -28 13 -30 6 -3 91 -16 187 -30 157 -23 175 -24 183
--10 38 68 115 118 199 130 103 15 220 -51 268 -151 26 -52 29 -154 6 -207 -19
--48 -82 -114 -129 -138 -151 -77 -346 22 -373 189 -7 46 15 39 -222 74 -142
-20 -155 21 -163 6 -65 -116 -225 -163 -347 -102 -116 58 -167 187 -126 323 8
-29 13 55 11 57 -3 3 -65 -33 -138 -79 -74 -46 -162 -100 -196 -120 l-62 -38 6
--47 c11 -100 -46 -207 -136 -254 -43 -23 -66 -28 -121 -28 -77 0 -124 16 -175
-62 -48 41 -76 99 -82 167 -7 72 9 129 50 183 85 112 256 132 372 44 l31 -24
-174 109 c96 60 180 111 185 113 6 2 -2 16 -16 32 -35 39 -412 468 -414 471 0
-1 -21 -5 -45 -13 -57 -20 -142 -14 -196 14 -162 84 -197 288 -71 419 102 108
-291 101 386 -14 62 -75 78 -185 40 -273 l-21 -49 23 -28 c13 -16 102 -118 198
--227 l175 -198 20 61 c26 78 64 125 124 155 63 31 117 39 177 26 49 -11 51
--11 72 17 21 26 533 749 548 773 4 6 -4 28 -17 48 -88 133 -44 307 94 376 61
-31 163 36 221 11z"/>
-</g>
-</svg>
diff --git a/data/interfaces/default/images/glyphicons-halflings-white.png b/data/interfaces/default/images/glyphicons-halflings-white.png
new file mode 100644
index 00000000..3bf6484a
Binary files /dev/null and b/data/interfaces/default/images/glyphicons-halflings-white.png differ
diff --git a/data/interfaces/default/images/glyphicons-halflings.png b/data/interfaces/default/images/glyphicons-halflings.png
new file mode 100644
index 00000000..a9969993
Binary files /dev/null and b/data/interfaces/default/images/glyphicons-halflings.png differ
diff --git a/data/interfaces/default/images/glyphicons.png b/data/interfaces/default/images/glyphicons.png
new file mode 100644
index 00000000..167d0831
Binary files /dev/null and b/data/interfaces/default/images/glyphicons.png differ
diff --git a/data/interfaces/default/images/gold-rect-paypal-34px.png b/data/interfaces/default/images/gold-rect-paypal-34px.png
deleted file mode 100644
index a6ab3cce..00000000
Binary files a/data/interfaces/default/images/gold-rect-paypal-34px.png and /dev/null differ
diff --git a/data/interfaces/default/images/google-play-badge.svg b/data/interfaces/default/images/google-play-badge.svg
deleted file mode 100644
index a01a8d87..00000000
--- a/data/interfaces/default/images/google-play-badge.svg
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
-	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
-	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
-	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
-	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
-	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
-	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
-	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
-]>
-<svg version="1.1" id="Livello_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 5435.8 1604"
-	 style="enable-background:new 0 0 5435.8 1604;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill-rule:evenodd;clip-rule:evenodd;}
-	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#A6A6A6;}
-	.st2{fill:#FFFFFF;}
-	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
-	.st4{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_1_);}
-	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_2_);}
-	.st6{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_3_);}
-	.st7{fill-rule:evenodd;clip-rule:evenodd;fill:url(#SVGID_4_);}
-	.st8{opacity:0.2;fill-rule:evenodd;clip-rule:evenodd;enable-background:new    ;}
-	.st9{opacity:0.12;fill-rule:evenodd;clip-rule:evenodd;enable-background:new    ;}
-	.st10{opacity:0.25;fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;enable-background:new    ;}
-</style>
-<metadata>
-	<sfw  xmlns="&ns_sfw;">
-		<slices></slices>
-		<sliceSourceBounds  bottomLeftOrigin="true" height="1604" width="5435.8" x="-2656.9" y="-784"></sliceSourceBounds>
-	</sfw>
-</metadata>
-<path class="st0" d="M5234.4,1604h-5033C90.4,1604,0,1513.6,0,1403.5v-1203C0,90,90.4,0,201.4,0h5033c110.9,0,201.4,90,201.4,200.5
-	v1203C5435.8,1513.6,5345.3,1604,5234.4,1604z"/>
-<path class="st1" d="M5234.4,32.1c93.1,0,169.3,75.7,169.3,168.4v1203c0,92.7-75.7,168.4-169.3,168.4h-5033
-	c-93.1,0-169.3-75.7-169.3-168.4v-1203c0-92.7,75.7-168.4,169.3-168.4C201.4,32.1,5234.4,32.1,5234.4,32.1z M5234.4,0h-5033
-	C90.4,0,0,90.4,0,200.5v1203C0,1514,90.4,1604,201.4,1604h5033c110.9,0,201.4-90,201.4-200.5v-1203C5435.8,90.4,5345.3,0,5234.4,0z"
-	/>
-<path class="st2" d="M2863.6,530.6c-36.3,0-66.9-12.7-91.1-37.7c-24-24.3-37.4-57.8-36.8-92c0-36.5,12.4-67.4,36.8-91.9
-	c24.1-25,54.7-37.7,91-37.7c35.9,0,66.5,12.7,91.1,37.7c24.4,25.3,36.8,56.2,36.8,91.9c-0.4,36.6-12.8,67.5-36.8,91.9
-	C2930.5,518,2899.9,530.6,2863.6,530.6z M1783.5,530.6c-35.5,0-66.3-12.5-91.5-37.2c-25-24.6-37.7-55.7-37.7-92.4
-	s12.7-67.8,37.7-92.4c24.7-24.7,55.5-37.2,91.5-37.2c17.6,0,34.7,3.5,51.1,10.6c16.1,6.9,29.2,16.3,38.9,27.8l2.4,2.9l-27.1,26.6
-	l-2.8-3.3c-15.3-18.2-35.8-27.1-62.9-27.1c-24.2,0-45.3,8.6-62.7,25.6c-17.5,17.1-26.4,39.5-26.4,66.6s8.9,49.5,26.4,66.6
-	c17.4,17,38.5,25.6,62.7,25.6c25.8,0,47.5-8.6,64.4-25.6c10-10,16.2-24,18.4-41.7h-86.9v-37.4h124.2l0.5,3.4
-	c0.9,6.3,1.8,12.8,1.8,18.8c0,34.5-10.4,62.4-31,83C1851.1,518.2,1820.5,530.6,1783.5,530.6z M3219.6,525.3h-38.3L3064,337.6l1,33.8
-	v153.8h-38.3V276.7h43.7l1.2,1.9l110.3,176.8l-1-33.7V276.7h38.7V525.3z M2575.8,525.3H2537V314.1h-67.3v-37.4H2643v37.4h-67.3
-	V525.3z M2438.1,525.3h-38.7V276.7h38.7V525.3z M2220.6,525.3h-38.7V314.1h-67.3v-37.4h173.3v37.4h-67.3V525.3z M2090.1,524.9
-	h-148.4V276.7h148.4v37.4h-109.6v68.2h98.9v37h-98.9v68.2h109.6V524.9z M2800.9,467.2c17.3,17.3,38.3,26,62.7,26
-	c25.1,0,45.6-8.5,62.7-26c17-17,25.6-39.3,25.6-66.2s-8.6-49.3-25.5-66.2c-17.3-17.3-38.4-26-62.7-26c-25.1,0-45.6,8.5-62.6,26
-	c-17,17-25.6,39.3-25.6,66.2S2784,450.3,2800.9,467.2L2800.9,467.2z"/>
-<path class="st3" d="M2732.1,872.4c-94.5,0-171.1,71.7-171.1,170.6c0,98,77.1,170.6,171.1,170.6c94.5,0,171.1-72.2,171.1-170.6
-	C2903.2,944.1,2826.6,872.4,2732.1,872.4z M2732.1,1146c-51.7,0-96.2-42.8-96.2-103.4c0-61.5,44.6-103.4,96.2-103.4
-	c51.7,0,96.2,41.9,96.2,103.4C2828.4,1103.6,2783.8,1146,2732.1,1146z M2358.8,872.4c-94.5,0-171.1,71.7-171.1,170.6
-	c0,98,77.1,170.6,171.1,170.6c94.5,0,171.1-72.2,171.1-170.6C2529.9,944.1,2453.2,872.4,2358.8,872.4z M2358.8,1146
-	c-51.7,0-96.2-42.8-96.2-103.4c0-61.5,44.6-103.4,96.2-103.4c51.7,0,96.2,41.9,96.2,103.4C2455,1103.6,2410.5,1146,2358.8,1146z
-	 M1914.6,924.5v72.2h173.3c-5.3,40.5-18.7,70.4-39.2,90.9c-25.4,25.4-64.6,53-133.7,53c-106.5,0-189.8-86-189.8-192.5
-	s83.3-192.5,189.8-192.5c57.5,0,99.4,22.7,130.5,51.7l51.2-51.2c-43.2-41.4-100.7-73.1-181.3-73.1c-146.1,0-268.7,119-268.7,264.7
-	c0,146.1,122.5,264.7,268.7,264.7c78.9,0,138.1-25.8,184.9-74.4c47.7-47.7,62.8-115,62.8-169.3c0-16.9-1.3-32.1-4-45h-244.6
-	C1914.6,923.6,1914.6,924.5,1914.6,924.5z M3731.5,980.7c-14.3-38.3-57.5-108.7-146.1-108.7c-87.8,0-160.8,69.1-160.8,170.6
-	c0,95.8,72.2,170.6,169.3,170.6c78,0,123.4-47.7,142.1-75.7l-57.9-38.8c-19.2,28.5-45.9,47.2-83.8,47.2c-38.3,0-65.1-17.4-82.9-51.7
-	l228.1-94.5C3739.5,999.8,3731.5,980.7,3731.5,980.7z M3498.9,1037.7c-1.8-65.9,51.2-99.4,89.1-99.4c29.9,0,54.8,14.7,63.3,36.1
-	L3498.9,1037.7z M3313.6,1203h74.9V701.8h-74.9V1203z M3190.6,910.3h-2.7c-16.9-20.1-49-38.3-90-38.3
-	c-85.1,0-163.5,74.9-163.5,171.1c0,95.8,78,169.8,163.5,169.8c40.5,0,73.1-18.3,90-38.8h2.7v24.5c0,65.1-34.8,100.2-90.9,100.2
-	c-45.9,0-74.4-33-86-60.6l-65.1,27.2c18.7,45,68.6,100.7,151,100.7c87.8,0,162.2-51.7,162.2-177.8V882.2h-70.8v28.1
-	C3191.1,910.3,3190.6,910.3,3190.6,910.3z M3104.6,1146c-51.7,0-94.9-43.2-94.9-102.9c0-60.2,43.2-103.8,94.9-103.8
-	c51.2,0,90.9,44.1,90.9,103.8C3196,1102.8,3155.9,1146,3104.6,1146z M4082.2,701.8h-179.1V1203h74.9v-189.8h104.3
-	c82.9,0,164.4-60.1,164.4-155.5S4165.5,701.8,4082.2,701.8z M4084.4,943.2h-106.5v-172h106.5c56.1,0,87.8,46.3,87.8,86
-	C4172.2,896.5,4140.1,943.2,4084.4,943.2z M4546.9,871.5c-54.4,0-110.5,24.1-133.7,76.6l66.4,27.6c14.3-27.6,40.5-37,68.2-37
-	c38.8,0,78,23.2,78.9,64.6v5.3c-13.4-7.6-42.8-19.2-78-19.2c-71.7,0-144.4,39.2-144.4,112.7c0,67.3,58.8,110.5,124.3,110.5
-	c50.3,0,78-22.7,95.3-49h2.7v38.8h72.2v-192C4698.8,921,4632.4,871.5,4546.9,871.5z M4537.5,1146c-24.5,0-58.8-12-58.8-42.8
-	c0-38.8,42.8-53.5,79.3-53.5c33,0,48.6,7.1,68.2,16.9C4620.8,1111.6,4582.8,1145.6,4537.5,1146z M4962.2,882.2l-86,217.4h-2.7
-	l-89.1-217.4h-80.6l133.7,303.9l-76.2,168.9h78L5045,882.2C5045,882.2,4962.2,882.2,4962.2,882.2z M4288,1203h74.9V701.8H4288V1203z
-	"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="1682.1077" y1="1339.4783" x2="1624.2924" y2="1309.6345" gradientTransform="matrix(11.64 0 0 -22.55 -18705.5957 30554.3691)">
-	<stop  offset="0" style="stop-color:#00A0FF"/>
-	<stop  offset="6.569999e-03" style="stop-color:#00A1FF"/>
-	<stop  offset="0.2601" style="stop-color:#00BEFF"/>
-	<stop  offset="0.5122" style="stop-color:#00D2FF"/>
-	<stop  offset="0.7604" style="stop-color:#00DFFF"/>
-	<stop  offset="1" style="stop-color:#00E3FF"/>
-</linearGradient>
-<path class="st4" d="M418.4,302.1c-11.6,12.5-18.3,31.6-18.3,56.6v886.7c0,25,6.7,44.1,18.7,56.1l3.1,2.7l496.8-496.8v-11.1
-	L421.5,299.4C421.5,299.4,418.4,302.1,418.4,302.1z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="1712.6624" y1="1274.8376" x2="1606.5613" y2="1274.8376" gradientTransform="matrix(9.145 0 0 -7.7 -14305.5381 10618.251)">
-	<stop  offset="0" style="stop-color:#FFE000"/>
-	<stop  offset="0.4087" style="stop-color:#FFBD00"/>
-	<stop  offset="0.7754" style="stop-color:#FFA500"/>
-	<stop  offset="1" style="stop-color:#FF9C00"/>
-</linearGradient>
-<path class="st5" d="M1084,973.5L918.3,807.8v-11.6L1084,630.5l3.6,2.2l196,111.4c56.1,31.6,56.1,83.8,0,115.8l-196,111.4
-	C1087.6,971.3,1084,973.5,1084,973.5z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="1707.4414" y1="1290.0475" x2="1646.682" y2="1211.2225" gradientTransform="matrix(15.02 0 0 -11.5775 -24650.2285 15829.6484)">
-	<stop  offset="0" style="stop-color:#FF3A44"/>
-	<stop  offset="1" style="stop-color:#C31162"/>
-</linearGradient>
-<path class="st6" d="M1087.6,971.3L918.3,802l-499.9,499.9c18.3,19.6,49,21.8,83.3,2.7L1087.6,971.3"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="1660.6357" y1="1365.6676" x2="1687.767" y2="1330.4501" gradientTransform="matrix(15.02 0 0 -11.5715 -24650.2285 15809.9922)">
-	<stop  offset="0" style="stop-color:#32A071"/>
-	<stop  offset="6.850000e-02" style="stop-color:#2DA771"/>
-	<stop  offset="0.4762" style="stop-color:#15CF74"/>
-	<stop  offset="0.8009" style="stop-color:#06E775"/>
-	<stop  offset="1" style="stop-color:#00F076"/>
-</linearGradient>
-<path class="st7" d="M1087.6,632.7L501.7,299.9c-34.3-19.6-65.1-16.9-83.3,2.7L918.3,802L1087.6,632.7z"/>
-<path class="st8" d="M1084,967.7l-581.9,330.6c-32.5,18.7-61.5,17.4-80.2,0.4l-3.1,3.1l3.1,2.7c18.7,16.9,47.7,18.3,80.2-0.4
-	L1088,971.3C1088,971.3,1084,967.7,1084,967.7z"/>
-<path class="st9" d="M1283.6,854.1l-200.1,113.6l3.6,3.6l196-111.4c28.1-16,41.9-37,41.9-57.9C1323.3,821.2,1309,839.4,1283.6,854.1
-	z"/>
-<path class="st10" d="M501.7,305.7l781.9,444.2c25.4,14.3,39.7,33,41.9,52.1c0-20.9-13.8-41.9-41.9-57.9L501.7,299.9
-	c-56.1-32.1-101.6-5.3-101.6,58.8v5.8C400.1,300.3,445.6,274,501.7,305.7z"/>
-</svg>
diff --git a/data/interfaces/default/images/gravatar-default-80x80.png b/data/interfaces/default/images/gravatar-default-80x80.png
index 16862794..9440f72b 100644
Binary files a/data/interfaces/default/images/gravatar-default-80x80.png and b/data/interfaces/default/images/gravatar-default-80x80.png differ
diff --git a/data/interfaces/default/images/gravatar-default.png b/data/interfaces/default/images/gravatar-default.png
index 6ee806dd..d72cb55c 100644
Binary files a/data/interfaces/default/images/gravatar-default.png and b/data/interfaces/default/images/gravatar-default.png differ
diff --git a/data/interfaces/default/images/icon_ipad.png b/data/interfaces/default/images/icon_ipad.png
new file mode 100644
index 00000000..f36c4294
Binary files /dev/null and b/data/interfaces/default/images/icon_ipad.png differ
diff --git a/data/interfaces/default/images/icon_ipad@2x.png b/data/interfaces/default/images/icon_ipad@2x.png
new file mode 100644
index 00000000..eb62a0a8
Binary files /dev/null and b/data/interfaces/default/images/icon_ipad@2x.png differ
diff --git a/data/interfaces/default/images/icon_iphone.png b/data/interfaces/default/images/icon_iphone.png
new file mode 100644
index 00000000..daafebfc
Binary files /dev/null and b/data/interfaces/default/images/icon_iphone.png differ
diff --git a/data/interfaces/default/images/icon_iphone@2x.png b/data/interfaces/default/images/icon_iphone@2x.png
new file mode 100644
index 00000000..bed1c53e
Binary files /dev/null and b/data/interfaces/default/images/icon_iphone@2x.png differ
diff --git a/data/interfaces/default/images/icons/most-concurrent-streams.svg b/data/interfaces/default/images/icons/most-concurrent-streams.svg
deleted file mode 100644
index 64236b50..00000000
--- a/data/interfaces/default/images/icons/most-concurrent-streams.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="483.904px" height="409.539px" viewBox="66.712 194.513 483.904 409.539"
-	 enable-background="new 66.712 194.513 483.904 409.539" xml:space="preserve">
-<g>
-	<g>
-		<path fill="none" d="M41.209,627.586c0-151.979,0-303.963,0-456.118c177.822,0,355.688,0,533.881,0c0,151.922,0,304.021,0,456.118
-			C397.214,627.586,219.233,627.586,41.209,627.586z M461.314,421.571c-110.652,0-220.389,0-329.873,0c0,18.87,0,36.226,0,54.729
-			c110.29,0,219.734,0,329.824,0c0,6.858-0.271,12.563,0.058,18.231c0.659,11.344,8.853,15.958,18.112,9.46
-			c22.087-15.499,43.824-31.503,65.474-47.611c7.678-5.715,7.621-10.63-0.234-16.467c-21.352-15.862-42.87-31.508-64.563-46.902
-			c-9.542-6.773-17.488-2.864-18.691,8.976C460.813,407.959,461.314,414.046,461.314,421.571z M130.996,574.741
-			c74.536,0,148.057,0,222.423,0c0,6.464-0.617,11.836,0.192,16.98c0.662,4.21,2.17,10.746,4.826,11.622
-			c4.329,1.427,10.994,0.66,14.77-1.943c21.297-14.688,42.098-30.1,62.911-45.474c8.887-6.564,8.992-11.503,0.233-18.001
-			c-20.777-15.419-41.647-30.727-62.83-45.579c-3.569-2.503-10.381-4.832-13.03-3.118c-3.676,2.376-5.784,8.447-6.81,13.308
-			c-1.126,5.336-0.257,11.091-0.257,17.757c-75.009,0-148.525,0-222.43,0C130.996,538.558,130.996,555.663,130.996,574.741z
-			 M130.83,281.392c49.453,0,97.705,0,146.88,0c0,6.838-0.232,12.506,0.049,18.148c0.585,11.758,9.078,16.246,18.887,9.342
-			c21.767-15.316,43.232-31.064,64.624-46.902c8.01-5.932,7.995-11.301-0.134-17.342c-21.053-15.65-42.257-31.103-63.625-46.318
-			c-10.735-7.647-18.836-3.478-19.734,9.846c-0.378,5.611-0.063,11.27-0.063,18.431c-49.546,0-98.1,0-146.885,0
-			C130.83,245.229,130.83,262.325,130.83,281.392z M188.205,379.701c0,6.939-0.606,12.297,0.19,17.438
-			c0.649,4.198,2.088,10.688,4.753,11.61c4.316,1.496,11.054,0.904,14.8-1.673c21.612-14.857,42.736-30.435,63.834-46.026
-			c8.481-6.265,8.471-11.812-0.159-18.227c-21.054-15.647-42.241-31.123-63.625-46.315c-10.656-7.571-18.899-3.211-19.724,10.07
-			c-0.365,5.875-0.062,11.793-0.062,18.885c-20.45,0-38.938,0-57.202,0c0,18.619,0,35.973,0,54.238
-			C149.953,379.701,168.131,379.701,188.205,379.701z M66.712,280.18c17.568,0,33.699,0,49.59,0c0-18.261,0-35.579,0-53.046
-			c-16.925,0-33.07,0-49.59,0C66.712,245.159,66.712,262.481,66.712,280.18z M66.869,325.488c0,18.556,0,35.876,0,53.543
-			c16.862,0,33,0,49.278,0c0-18.274,0-35.852,0-53.543C99.359,325.488,83.5,325.488,66.869,325.488z M116.673,422.747
-			c-17.484,0-33.644,0-49.668,0c0,17.835,0,34.781,0,51.779c17.017,0,33.178,0,49.668,0
-			C116.673,456.924,116.673,440.208,116.673,422.747z M116.497,520.842c-17.01,0-33.43,0-49.552,0c0,18.244,0,35.566,0,53.021
-			c16.944,0,33.084,0,49.552,0C116.497,555.793,116.497,538.471,116.497,520.842z"/>
-		<path fill="#FFFFFF" d="M461.314,421.571c0-7.525-0.503-13.612,0.105-19.586c1.203-11.839,9.149-15.749,18.691-8.976
-			c21.691,15.396,43.211,31.04,64.563,46.902c7.855,5.837,7.912,10.752,0.234,16.467c-21.648,16.108-43.387,32.112-65.474,47.611
-			c-9.261,6.498-17.453,1.884-18.112-9.46c-0.329-5.67-0.058-11.373-0.058-18.231c-110.09,0-219.534,0-329.824,0
-			c0-18.503,0-35.857,0-54.729C240.927,421.571,350.662,421.571,461.314,421.571z"/>
-		<path fill="#FFFFFF" d="M130.996,574.741c0-19.078,0-36.185,0-54.448c73.904,0,147.42,0,222.43,0
-			c0-6.666-0.869-12.421,0.257-17.757c1.024-4.859,3.134-10.932,6.81-13.308c2.649-1.714,9.461,0.615,13.029,3.118
-			c21.184,14.854,42.054,30.16,62.831,45.579c8.759,6.498,8.652,11.437-0.233,18.001c-20.813,15.374-41.614,30.786-62.911,45.474
-			c-3.774,2.604-10.439,3.369-14.77,1.943c-2.656-0.876-4.165-7.412-4.826-11.622c-0.811-5.146-0.192-10.518-0.192-16.98
-			C279.053,574.741,205.532,574.741,130.996,574.741z"/>
-		<path fill="#FFFFFF" d="M130.83,281.392c0-19.067,0-36.163,0-54.795c48.785,0,97.339,0,146.885,0
-			c0-7.161-0.315-12.82,0.063-18.431c0.898-13.323,8.999-17.493,19.734-9.846c21.368,15.215,42.572,30.668,63.625,46.318
-			c8.129,6.041,8.144,11.411,0.133,17.342c-21.391,15.838-42.855,31.586-64.623,46.902c-9.81,6.904-18.302,2.417-18.887-9.342
-			c-0.281-5.643-0.049-11.31-0.049-18.148C228.535,281.392,180.283,281.392,130.83,281.392z"/>
-		<path fill="#FFFFFF" d="M188.205,379.701c-20.074,0-38.252,0-57.192,0c0-18.265,0-35.619,0-54.238c18.264,0,36.752,0,57.202,0
-			c0-7.092-0.303-13.01,0.062-18.885c0.825-13.281,9.067-17.641,19.724-10.07c21.383,15.193,42.57,30.668,63.625,46.315
-			c8.63,6.416,8.64,11.962,0.159,18.227c-21.099,15.591-42.222,31.169-63.834,46.026c-3.746,2.577-10.484,3.169-14.8,1.673
-			c-2.666-0.923-4.104-7.412-4.753-11.61C187.599,391.999,188.205,386.64,188.205,379.701z"/>
-		<path fill="#FFFFFF" d="M66.712,280.18c0-17.699,0-35.021,0-53.046c16.52,0,32.665,0,49.59,0c0,17.468,0,34.786,0,53.046
-			C100.411,280.18,84.281,280.18,66.712,280.18z"/>
-		<path fill="#FFFFFF" d="M66.869,325.488c16.63,0,32.49,0,49.278,0c0,17.692,0,35.27,0,53.543c-16.278,0-32.416,0-49.278,0
-			C66.869,361.364,66.869,344.044,66.869,325.488z"/>
-		<path fill="#E5A00D" d="M116.673,422.747c0,17.461,0,34.177,0,51.779c-16.49,0-32.652,0-49.668,0c0-16.998,0-33.944,0-51.779
-			C83.029,422.747,99.188,422.747,116.673,422.747z"/>
-		<path fill="#FFFFFF" d="M116.497,520.842c0,17.629,0,34.951,0,53.021c-16.468,0-32.608,0-49.552,0c0-17.455,0-34.777,0-53.021
-			C83.067,520.842,99.487,520.842,116.497,520.842z"/>
-	</g>
-</g>
-</svg>
diff --git a/data/interfaces/default/images/libraries/artist.png b/data/interfaces/default/images/libraries/artist.png
deleted file mode 100644
index 7c9c6c03..00000000
Binary files a/data/interfaces/default/images/libraries/artist.png and /dev/null differ
diff --git a/data/interfaces/default/images/libraries/artist.svg b/data/interfaces/default/images/libraries/artist.svg
deleted file mode 100644
index 37920c10..00000000
--- a/data/interfaces/default/images/libraries/artist.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<title>artist</title>
-<path fill="#FFFFFF" d="M29.369,0.72H10.271C8.864,0.722,7.726,1.861,7.724,3.267v18.534c-0.771-0.459-1.649-0.703-2.546-0.709
-	c-2.813,0-5.094,2.281-5.094,5.094s2.281,5.094,5.094,5.094s5.093-2.281,5.093-5.094V10.907h19.099v10.894
-	c-0.771-0.459-1.649-0.703-2.546-0.709c-2.813,0-5.094,2.281-5.094,5.094s2.281,5.094,5.094,5.094s5.093-2.281,5.093-5.094V3.267
-	C31.914,1.861,30.775,0.722,29.369,0.72z M10.271,3.267h19.099V8.36H10.271V3.267z"/>
-</svg>
diff --git a/data/interfaces/default/images/libraries/live.png b/data/interfaces/default/images/libraries/live.png
deleted file mode 100644
index 4b642df4..00000000
Binary files a/data/interfaces/default/images/libraries/live.png and /dev/null differ
diff --git a/data/interfaces/default/images/libraries/live.svg b/data/interfaces/default/images/libraries/live.svg
deleted file mode 100644
index 42a4f874..00000000
--- a/data/interfaces/default/images/libraries/live.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<g>
-	<polygon fill="none" points="12.252,15.364 9.287,23.717 20.6,23.709 	"/>
-	<path fill="none" d="M13.122,12.92l8.846,8.846l-4.158-11.71c-0.558,0.271-1.175,0.437-1.839,0.437
-		c-0.66,0-1.276-0.164-1.833-0.434L13.122,12.92z"/>
-	<path fill="#FFFFFF" d="M19.663,8.28c0.33-0.601,0.529-1.277,0.529-2.008c0-2.333-1.892-4.223-4.222-4.223s-4.222,1.89-4.222,4.223
-		c0,0.733,0.203,1.412,0.532,2.013l-7.56,21.292c-0.248,0.697,0.047,1.434,0.656,1.654c0.608,0.215,1.305-0.177,1.549-0.865
-		l1.53-4.309l15.034-0.007l1.532,4.315c0.247,0.688,0.941,1.08,1.549,0.865c0.61-0.221,0.904-0.957,0.658-1.654L19.663,8.28z
-		 M17.81,10.057l4.158,11.71l-8.846-8.846l1.016-2.861c0.557,0.27,1.173,0.434,1.833,0.434
-		C16.635,10.493,17.252,10.328,17.81,10.057z M12.252,15.364l8.347,8.345L9.287,23.717L12.252,15.364z"/>
-	<g>
-		<path fill="#FFFFFF" d="M3.638,1.458C3.189,0.996,2.563,0.875,2.279,1.211c-3.043,3.578-3.045,8.859-0.002,12.44
-			c0.284,0.335,0.913,0.214,1.362-0.25c0.452-0.462,0.628-1.022,0.424-1.264C1.76,9.428,1.762,5.433,4.064,2.726
-			C4.267,2.484,4.089,1.924,3.638,1.458z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M28.303,1.46c-0.45,0.464-0.626,1.021-0.421,1.261c2.303,2.71,2.3,6.707-0.003,9.412
-			c-0.205,0.24-0.025,0.802,0.424,1.266c0.448,0.466,1.075,0.586,1.361,0.25c3.044-3.578,3.046-8.86,0.003-12.441
-			C29.38,0.873,28.753,0.996,28.303,1.46z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M8.847,11.926c0.453-0.465,0.687-0.966,0.546-1.132C7.78,8.897,7.781,6.1,9.392,4.205
-			c0.141-0.167-0.094-0.672-0.545-1.138c-0.448-0.463-1.019-0.639-1.24-0.376c-2.351,2.766-2.353,6.848,0,9.616
-			C7.826,12.569,8.398,12.39,8.847,11.926z"/>
-	</g>
-	<g>
-		<path fill="#FFFFFF" d="M23.182,11.858c0.45,0.466,1.017,0.642,1.24,0.379c2.353-2.766,2.354-6.849,0.001-9.617
-			C24.199,2.362,23.63,2.54,23.18,3.004c-0.449,0.464-0.685,0.967-0.542,1.132c1.611,1.896,1.61,4.692-0.001,6.587
-			C22.495,10.888,22.73,11.393,23.182,11.858z"/>
-	</g>
-</g>
-</svg>
diff --git a/data/interfaces/default/images/libraries/movie.png b/data/interfaces/default/images/libraries/movie.png
deleted file mode 100644
index 454fc66b..00000000
Binary files a/data/interfaces/default/images/libraries/movie.png and /dev/null differ
diff --git a/data/interfaces/default/images/libraries/movie.svg b/data/interfaces/default/images/libraries/movie.svg
deleted file mode 100644
index a1c47720..00000000
--- a/data/interfaces/default/images/libraries/movie.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px"
-	 height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<g id="Layer_1">
-	<title>artist</title>
-</g>
-<g id="Layer_2">
-	<path fill="#FFFFFF" d="M29.508,0.241H2.492c-1.242,0-2.251,1.008-2.251,2.251v27.015c0,1.242,1.009,2.252,2.251,2.252h27.016
-		c1.242,0,2.251-1.01,2.251-2.252V2.493C31.759,1.25,30.75,0.241,29.508,0.241z M4.744,29.508H2.492v-3.002h2.252V29.508z
-		 M4.744,24.255H2.492v-3.753h2.252V24.255z M4.744,18.252H2.492V14.5h2.252V18.252z M4.744,12.248H2.492V8.496h2.252V12.248z
-		 M4.744,6.245H2.492V2.493h2.252V6.245z M25.005,29.508H6.995V16.75h18.01V29.508z M25.005,14.5H6.995V2.493h18.01V14.5z
-		 M29.508,29.508h-2.252v-3.002h2.252V29.508z M29.508,24.255h-2.252v-3.753h2.252V24.255z M29.508,18.252h-2.252V14.5h2.252V18.252
-		z M29.508,12.248h-2.252V8.496h2.252V12.248z M29.508,6.245h-2.252V2.493h2.252V6.245z"/>
-</g>
-</svg>
diff --git a/data/interfaces/default/images/libraries/photo.png b/data/interfaces/default/images/libraries/photo.png
deleted file mode 100644
index 31170f1e..00000000
Binary files a/data/interfaces/default/images/libraries/photo.png and /dev/null differ
diff --git a/data/interfaces/default/images/libraries/photo.svg b/data/interfaces/default/images/libraries/photo.svg
deleted file mode 100644
index 6fdc16b9..00000000
--- a/data/interfaces/default/images/libraries/photo.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px"
-	 height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<g id="Layer_2">
-</g>
-<g id="Layer_3">
-	<g>
-		<path fill="#FFFFFF" d="M30.807,8.975c-0.587-0.596-1.388-0.933-2.224-0.934h-5.158l-0.855-2.599
-			c-0.207-0.633-0.607-1.184-1.145-1.577c-0.536-0.389-1.18-0.6-1.84-0.6h-7.171c-0.661,0-1.306,0.211-1.84,0.602
-			C10.037,4.259,9.637,4.811,9.43,5.442L8.573,8.041H3.416C2.579,8.042,1.779,8.379,1.192,8.975c-0.591,0.6-0.923,1.408-0.923,2.25
-			V25.55c0,0.843,0.332,1.65,0.923,2.25c0.587,0.596,1.387,0.932,2.224,0.934h25.167c0.836-0.002,1.637-0.338,2.224-0.934
-			c0.591-0.6,0.923-1.407,0.923-2.25V11.225C31.729,10.383,31.397,9.574,30.807,8.975z M29.482,25.55
-			c0,0.258-0.103,0.497-0.273,0.672c-0.165,0.168-0.391,0.265-0.627,0.266H3.418c-0.237-0.001-0.462-0.098-0.628-0.266
-			c-0.176-0.181-0.274-0.422-0.273-0.674v-14.32c0-0.258,0.103-0.499,0.273-0.673c0.172-0.173,0.396-0.266,0.627-0.267h6.782
-			l1.365-4.144c0.063-0.189,0.181-0.351,0.334-0.463c0.152-0.11,0.332-0.169,0.514-0.169h7.175c0.182,0,0.361,0.059,0.514,0.169
-			c0.153,0.112,0.271,0.273,0.335,0.463l1.363,4.144h6.783c0.23,0,0.456,0.094,0.627,0.267c0.171,0.174,0.272,0.413,0.273,0.671
-			V25.55z"/>
-		<path fill="#FFFFFF" d="M16,10.7c-3.764,0-6.813,3.049-6.813,6.812c0,3.765,3.05,6.815,6.813,6.815
-			c3.763,0,6.813-3.051,6.813-6.815C22.813,13.749,19.763,10.7,16,10.7z M15.999,22.082c-2.523,0-4.568-2.045-4.568-4.568
-			s2.045-4.569,4.568-4.569c2.524,0,4.569,2.046,4.569,4.569S18.523,22.082,15.999,22.082z"/>
-	</g>
-</g>
-</svg>
diff --git a/data/interfaces/default/images/libraries/playlist.png b/data/interfaces/default/images/libraries/playlist.png
deleted file mode 100644
index 6b8a5dad..00000000
Binary files a/data/interfaces/default/images/libraries/playlist.png and /dev/null differ
diff --git a/data/interfaces/default/images/libraries/playlist.svg b/data/interfaces/default/images/libraries/playlist.svg
deleted file mode 100644
index 7fc2d88f..00000000
--- a/data/interfaces/default/images/libraries/playlist.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_4" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<path fill="#FFFFFF" d="M0.27,2.892h2.621v2.622H0.27V2.892z M31.729,2.892H8.135v2.622h23.595V2.892z M31.729,10.757H8.135v2.622
-	h23.595V10.757z M8.135,18.622h23.595v2.621H8.135V18.622z M31.729,26.487H8.135v2.621h23.595V26.487z M2.891,10.757H0.27v2.622
-	h2.621V10.757z M0.27,18.622h2.621v2.621H0.27V18.622z M2.891,26.487H0.27v2.621h2.621V26.487z"/>
-</svg>
diff --git a/data/interfaces/default/images/libraries/show.png b/data/interfaces/default/images/libraries/show.png
deleted file mode 100644
index 5ba8a9ce..00000000
Binary files a/data/interfaces/default/images/libraries/show.png and /dev/null differ
diff --git a/data/interfaces/default/images/libraries/show.svg b/data/interfaces/default/images/libraries/show.svg
deleted file mode 100644
index 6e11dc77..00000000
--- a/data/interfaces/default/images/libraries/show.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<title>artist</title>
-<g>
-	<path fill="#FFFFFF" d="M2.359,1.602h27.281c1.255,0,2.273,1.018,2.273,2.273v19.703c0,1.256-1.019,2.273-2.273,2.273H2.359
-		c-1.255,0-2.273-1.018-2.273-2.273V3.875C0.086,2.62,1.104,1.602,2.359,1.602z M2.359,23.578h27.281V3.875H2.359V23.578z"/>
-	<path fill="#FFFFFF" d="M25.094,30.398v-2.273H6.906v2.273H25.094z"/>
-</g>
-</svg>
diff --git a/data/interfaces/default/images/libraries/video.png b/data/interfaces/default/images/libraries/video.png
deleted file mode 100644
index 647310c3..00000000
Binary files a/data/interfaces/default/images/libraries/video.png and /dev/null differ
diff --git a/data/interfaces/default/images/libraries/video.svg b/data/interfaces/default/images/libraries/video.svg
deleted file mode 100644
index 46f78428..00000000
--- a/data/interfaces/default/images/libraries/video.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="32px" height="32px" viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
-<title>artist</title>
-<path fill="#FFFFFF" d="M21.619,27.237H2.515c-1.241,0-2.247-1.006-2.247-2.247V7.011c0-1.242,1.006-2.248,2.247-2.248h19.104
-	c1.24,0,2.247,1.006,2.247,2.248v4.562l6.091-4.349c0.506-0.36,1.207-0.242,1.568,0.263c0.134,0.19,0.206,0.415,0.207,0.647v15.732
-	c-0.002,0.621-0.509,1.123-1.128,1.119c-0.232-0.001-0.458-0.075-0.647-0.209l-6.091-4.349v4.563
-	C23.866,26.231,22.859,27.237,21.619,27.237z M2.515,7.011V24.99h19.104v-6.742c0.003-0.621,0.509-1.122,1.129-1.118
-	c0.231,0,0.457,0.074,0.646,0.208l6.091,4.349V10.314l-6.091,4.349c-0.506,0.36-1.207,0.242-1.568-0.263
-	c-0.133-0.189-0.206-0.415-0.207-0.647V7.011H2.515z"/>
-</svg>
diff --git a/data/interfaces/default/images/logo-circle.icns b/data/interfaces/default/images/logo-circle.icns
deleted file mode 100644
index 3ced71f4..00000000
Binary files a/data/interfaces/default/images/logo-circle.icns and /dev/null differ
diff --git a/data/interfaces/default/images/logo-circle.ico b/data/interfaces/default/images/logo-circle.ico
deleted file mode 100644
index 45c5d3ff..00000000
Binary files a/data/interfaces/default/images/logo-circle.ico and /dev/null differ
diff --git a/data/interfaces/default/images/logo-circle.png b/data/interfaces/default/images/logo-circle.png
deleted file mode 100644
index 3cf72642..00000000
Binary files a/data/interfaces/default/images/logo-circle.png and /dev/null differ
diff --git a/data/interfaces/default/images/logo-flat-white.ico b/data/interfaces/default/images/logo-flat-white.ico
deleted file mode 100644
index f11c1fc8..00000000
Binary files a/data/interfaces/default/images/logo-flat-white.ico and /dev/null differ
diff --git a/data/interfaces/default/images/logo-flat-white.png b/data/interfaces/default/images/logo-flat-white.png
deleted file mode 100644
index c9aaac79..00000000
Binary files a/data/interfaces/default/images/logo-flat-white.png and /dev/null differ
diff --git a/data/interfaces/default/images/logo-plexpy.png b/data/interfaces/default/images/logo-plexpy.png
new file mode 100644
index 00000000..1a40b62b
Binary files /dev/null and b/data/interfaces/default/images/logo-plexpy.png differ
diff --git a/data/interfaces/default/images/logo-plexpy@2x.png b/data/interfaces/default/images/logo-plexpy@2x.png
new file mode 100644
index 00000000..e77316ca
Binary files /dev/null and b/data/interfaces/default/images/logo-plexpy@2x.png differ
diff --git a/data/interfaces/default/images/logo-tautulli-100.png b/data/interfaces/default/images/logo-tautulli-100.png
deleted file mode 100644
index 52bef662..00000000
Binary files a/data/interfaces/default/images/logo-tautulli-100.png and /dev/null differ
diff --git a/data/interfaces/default/images/logo-tautulli-45.png b/data/interfaces/default/images/logo-tautulli-45.png
deleted file mode 100644
index 89330311..00000000
Binary files a/data/interfaces/default/images/logo-tautulli-45.png and /dev/null differ
diff --git a/data/interfaces/default/images/logo-tautulli-newsletter.png b/data/interfaces/default/images/logo-tautulli-newsletter.png
deleted file mode 100644
index e1ec4923..00000000
Binary files a/data/interfaces/default/images/logo-tautulli-newsletter.png and /dev/null differ
diff --git a/data/interfaces/default/images/logo-tautulli.png b/data/interfaces/default/images/logo-tautulli.png
deleted file mode 100644
index 2c02ff68..00000000
Binary files a/data/interfaces/default/images/logo-tautulli.png and /dev/null differ
diff --git a/data/interfaces/default/images/logo-tautulli.svg b/data/interfaces/default/images/logo-tautulli.svg
deleted file mode 100644
index 3b66cd69..00000000
--- a/data/interfaces/default/images/logo-tautulli.svg
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="900px"
-	 height="300px" viewBox="0 0 900 300" enable-background="new 0 0 900 300" xml:space="preserve">
-<g id="Layer_1">
-	<g>
-		<path fill="none" d="M401.343,203.396c7.493,0,14.836,0,22.407,0c-3.766-12.354-7.495-24.586-11.333-37.176
-			C408.665,178.818,405.017,191.064,401.343,203.396z"/>
-		<path fill="#FFFFFF" d="M436.772,189.627c-4.399-12.521-8.814-25.034-13.224-37.553c-7.552,0-15.105,0-22.657,0.002
-			c-0.14,0.611-0.221,1.246-0.428,1.836c-8.502,24.335-17.017,48.666-25.526,72.996c-1.45,4.146-2.887,8.298-4.362,12.535
-			c6.686,0,13.198,0,19.792,0c2.095-6.873,4.172-13.693,6.248-20.514c10.593,0,21.056,0,31.594,0
-			c2.102,6.894,4.177,13.707,6.245,20.489c6.66,0,13.146,0,19.772,0c-0.229-0.676-0.408-1.213-0.597-1.747
-			C448.014,221.656,442.4,205.639,436.772,189.627z M401.343,203.396c3.674-12.332,7.322-24.578,11.074-37.176
-			c3.837,12.59,7.567,24.82,11.333,37.176C416.179,203.396,408.836,203.396,401.343,203.396z"/>
-		<path fill="#FFFFFF" d="M371.072,152.459c-21.916,0-43.668,0-65.421,0c0,5.111,0,10.227,0,15.341c7.836,0,15.672,0,23.691,0
-			c0,24.046,0,47.786,0,71.621c6.164,0,12.144,0,18.361,0c0-23.901,0-47.698,0-71.682c7.948,0,15.66,0,23.369,0
-			C371.072,162.549,371.072,157.549,371.072,152.459z"/>
-		<path fill="#FFFFFF" d="M532.615,152.555c-6.176,0-12.154,0-18.349,0c0,0.842,0,1.592,0,2.34c0,16.42,0.021,32.838-0.021,49.258
-			c-0.006,2.675-0.119,5.373-0.494,8.018c-0.997,7.07-4.634,11.153-11.06,12.587c-3.731,0.83-7.491,0.754-11.238,0
-			c-5.745-1.157-9.344-4.668-10.58-10.297c-0.678-3.088-0.958-6.317-0.976-9.487c-0.094-16.738-0.045-33.478-0.045-50.217
-			c0-0.732,0-1.467,0-2.148c-6.296,0-12.275,0-18.329,0c0,0.591,0,1.035,0,1.48c0,18.209-0.013,36.416,0.018,54.625
-			c0.003,1.908,0.127,3.835,0.396,5.727c1.632,11.408,7.683,19.563,18.562,23.516c11.146,4.052,22.489,3.83,33.593-0.393
-			c7.937-3.017,13.483-8.627,16.483-16.617c1.474-3.93,2.044-8.024,2.042-12.211c-0.006-18.146-0.002-36.289-0.002-54.436
-			C532.615,153.744,532.615,153.188,532.615,152.555z"/>
-		<path fill="#FFFFFF" d="M688.532,152.555c-6.16,0-12.14,0-18.349,0c0,0.924,0,1.62,0,2.318c0,16.482,0.021,32.967-0.021,49.449
-			c-0.006,2.609-0.125,5.244-0.49,7.824c-1.003,7.127-4.74,11.291-11.226,12.654c-3.674,0.771-7.373,0.702-11.056-0.037
-			c-5.74-1.156-9.354-4.652-10.596-10.281c-0.682-3.086-0.964-6.317-0.979-9.487c-0.094-16.738-0.044-33.478-0.044-50.216
-			c0-0.739,0-1.478,0-2.18c-6.278,0-12.26,0-18.332,0c0,0.582,0,1.024,0,1.467c0.003,18.271-0.011,36.543,0.021,54.815
-			c0.002,1.847,0.132,3.707,0.391,5.533c1.626,11.411,7.669,19.567,18.546,23.533c11.213,4.09,22.621,3.836,33.771-0.445
-			c7.851-3.019,13.345-8.612,16.315-16.541c1.521-4.052,2.06-8.274,2.056-12.592c-0.018-17.953-0.008-35.905-0.008-53.858
-			C688.532,153.893,688.532,153.27,688.532,152.555z"/>
-		<path fill="#FFFFFF" d="M542.405,167.793c7.813,0,15.522,0,23.479,0c0,23.979,0,47.771,0,71.648c6.172,0,12.102,0,18.425,0
-			c0-23.948,0-47.738,0-71.729c7.947,0,15.655,0,23.378,0c0-5.158,0-10.115,0-15.115c-21.819,0-43.53,0-65.281,0
-			C542.405,157.691,542.405,162.648,542.405,167.793z"/>
-		<path fill="#FFFFFF" d="M725.407,152.58c-6.199,0-12.177,0-18.193,0c0,29.021,0,57.92,0,86.857c17.832,0,35.528,0,53.335,0
-			c0-5.191,0-10.146,0-15.307c-11.72,0-23.322,0-35.142,0C725.407,200.143,725.407,176.361,725.407,152.58z"/>
-		<path fill="#FFFFFF" d="M790.668,152.593c-6.197,0-12.172,0-18.216,0c0,28.985,0,57.833,0,86.831c17.905,0,35.6,0,53.371,0
-			c0-5.105,0-10.107,0-15.316c-11.729,0-23.335,0-35.155,0C790.668,200.119,790.668,176.339,790.668,152.593z"/>
-		<path fill="#FFFFFF" d="M838.183,239.464c6.083,0,12.021,0,18.096,0c0-29.09,0-57.987,0-86.879c-6.12,0-12.098,0-18.096,0
-			C838.183,181.611,838.183,210.514,838.183,239.464z"/>
-		<ellipse fill="#E5A00D" cx="847.229" cy="129.416" rx="12.459" ry="12.44"/>
-	</g>
-</g>
-<g id="Layer_2_1_">
-	<g>
-		
-			<image overflow="visible" opacity="0.2" width="279" height="216" xlink:href="13AD46AC.png"  transform="matrix(1 0 0 1 15.5 73.5)">
-		</image>
-		<g>
-			<path fill="#FFFFFF" d="M243.77,212.601c-10.482,0-19.533,6.118-23.783,14.977l-37.755-5.478
-				c-0.133-14.445-11.881-26.114-26.356-26.114c-5.163,0-9.975,1.489-14.041,4.051l-53.649-60.787
-				c3.091-4.319,4.914-9.605,4.914-15.319c0-14.56-11.802-26.362-26.363-26.362c-14.56,0-26.363,11.803-26.363,26.362
-				c0,14.559,11.803,26.361,26.363,26.361c4.484,0,8.704-1.122,12.399-3.096l54.223,61.438c-2.439,3.994-3.846,8.688-3.846,13.712
-				c0,14.56,11.803,26.363,26.364,26.363c10.422,0,19.43-6.05,23.708-14.828l37.832,5.491c0.22,14.369,11.929,25.953,26.354,25.953
-				c14.56,0,26.363-11.804,26.363-26.362S258.33,212.601,243.77,212.601z"/>
-		</g>
-	</g>
-	<g>
-		
-			<image overflow="visible" opacity="0.2" width="279" height="279" xlink:href="13AD46AD.png"  transform="matrix(1 0 0 1 15.5 10.5)">
-		</image>
-		<g>
-			<path fill="#E5A00D" d="M243.77,34.779c-14.56,0-26.363,11.802-26.363,26.362c0,7.17,2.867,13.667,7.512,18.42l-58.424,82.548
-				c-3.25-1.431-6.84-2.23-10.619-2.23c-14.56,0-26.363,11.8-26.363,26.36c0,2.592,0.38,5.094,1.078,7.46L86.2,221.181
-				c-4.82-5.271-11.754-8.58-19.461-8.58c-14.56,0-26.363,11.803-26.363,26.361s11.803,26.362,26.363,26.362
-				c14.561,0,26.363-11.804,26.363-26.362c0-2.518-0.36-4.951-1.019-7.256l44.477-27.534c4.815,5.183,11.686,8.429,19.318,8.429
-				c14.561,0,26.364-11.803,26.364-26.361c0-6.424-2.301-12.31-6.119-16.883l58.973-83.322c2.72,0.948,5.637,1.468,8.677,1.468
-				c14.561,0,26.363-11.802,26.363-26.361C270.135,46.582,258.33,34.779,243.77,34.779z"/>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/data/interfaces/default/images/logo.png b/data/interfaces/default/images/logo.png
deleted file mode 100644
index 1737c3d3..00000000
Binary files a/data/interfaces/default/images/logo.png and /dev/null differ
diff --git a/data/interfaces/default/images/logo.svg b/data/interfaces/default/images/logo.svg
deleted file mode 100644
index 686a614e..00000000
--- a/data/interfaces/default/images/logo.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="298.961px" height="300px" viewBox="0 0 298.961 300" enable-background="new 0 0 298.961 300" xml:space="preserve">
-<g>
-	
-		<image overflow="visible" opacity="0.2" width="289" height="224" xlink:href="93124B54.png"  transform="matrix(1 0 0 1 4.9805 70.5)">
-	</image>
-	<g>
-		<path fill="#FFFFFF" d="M241.811,215.25c-10.935,0-20.375,6.382-24.809,15.623l-39.383-5.715
-			c-0.139-15.068-12.393-27.242-27.493-27.242c-5.385,0-10.405,1.554-14.646,4.229l-55.963-63.414
-			c3.224-4.505,5.127-10.02,5.127-15.981c0-15.188-12.312-27.5-27.5-27.5s-27.5,12.312-27.5,27.5s12.312,27.5,27.5,27.5
-			c4.677,0,9.079-1.171,12.934-3.23l56.56,64.089c-2.544,4.168-4.012,9.064-4.012,14.307c0,15.188,12.312,27.5,27.5,27.5
-			c10.872,0,20.269-6.311,24.731-15.467l39.463,5.727c0.229,14.99,12.443,27.074,27.49,27.074c15.188,0,27.5-12.313,27.5-27.5
-			S256.998,215.25,241.811,215.25z"/>
-	</g>
-</g>
-<g>
-	
-		<image overflow="visible" opacity="0.2" width="289" height="289" xlink:href="93124B55.png"  transform="matrix(1 0 0 1 4.9805 5.5)">
-	</image>
-	<g>
-		<path fill="#E5A00D" d="M241.811,29.75c-15.188,0-27.5,12.312-27.5,27.5c0,7.48,2.99,14.258,7.836,19.216l-60.943,86.113
-			c-3.389-1.493-7.135-2.329-11.076-2.329c-15.188,0-27.5,12.313-27.5,27.5c0,2.704,0.397,5.314,1.125,7.783l-46.306,28.668
-			c-5.028-5.5-12.261-8.951-20.3-8.951c-15.188,0-27.5,12.313-27.5,27.5s12.312,27.5,27.5,27.5s27.5-12.313,27.5-27.5
-			c0-2.627-0.376-5.165-1.064-7.57l46.396-28.724c5.022,5.407,12.189,8.794,20.15,8.794c15.188,0,27.5-12.313,27.5-27.5
-			c0-6.701-2.399-12.84-6.382-17.611l61.515-86.92c2.837,0.988,5.88,1.532,9.052,1.532c15.188,0,27.5-12.312,27.5-27.5
-			S256.998,29.75,241.811,29.75z"/>
-	</g>
-</g>
-</svg>
diff --git a/data/interfaces/default/images/media_flags/aspect_ratio/1.33.png b/data/interfaces/default/images/media_flags/aspect_ratio/1.33.png
deleted file mode 100644
index 3c58c524..00000000
Binary files a/data/interfaces/default/images/media_flags/aspect_ratio/1.33.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/aspect_ratio/1.66.png b/data/interfaces/default/images/media_flags/aspect_ratio/1.66.png
deleted file mode 100644
index dd6bae2e..00000000
Binary files a/data/interfaces/default/images/media_flags/aspect_ratio/1.66.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/aspect_ratio/1.78.png b/data/interfaces/default/images/media_flags/aspect_ratio/1.78.png
deleted file mode 100644
index 34d3184e..00000000
Binary files a/data/interfaces/default/images/media_flags/aspect_ratio/1.78.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/aspect_ratio/1.85.png b/data/interfaces/default/images/media_flags/aspect_ratio/1.85.png
deleted file mode 100644
index 3da66e01..00000000
Binary files a/data/interfaces/default/images/media_flags/aspect_ratio/1.85.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/aspect_ratio/2.20.png b/data/interfaces/default/images/media_flags/aspect_ratio/2.20.png
deleted file mode 100644
index 46b5c59a..00000000
Binary files a/data/interfaces/default/images/media_flags/aspect_ratio/2.20.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/aspect_ratio/2.25.png b/data/interfaces/default/images/media_flags/aspect_ratio/2.25.png
deleted file mode 100644
index 7570fbae..00000000
Binary files a/data/interfaces/default/images/media_flags/aspect_ratio/2.25.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/aspect_ratio/2.35.png b/data/interfaces/default/images/media_flags/aspect_ratio/2.35.png
deleted file mode 100644
index 46b6d308..00000000
Binary files a/data/interfaces/default/images/media_flags/aspect_ratio/2.35.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_channels/1.png b/data/interfaces/default/images/media_flags/audio_channels/1.png
deleted file mode 100644
index 6a3c2b61..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_channels/1.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_channels/2.png b/data/interfaces/default/images/media_flags/audio_channels/2.png
deleted file mode 100644
index 85847256..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_channels/2.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_channels/5.png b/data/interfaces/default/images/media_flags/audio_channels/5.png
deleted file mode 100644
index c5bcdf32..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_channels/5.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_channels/6.png b/data/interfaces/default/images/media_flags/audio_channels/6.png
deleted file mode 100644
index c5bcdf32..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_channels/6.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_channels/7.png b/data/interfaces/default/images/media_flags/audio_channels/7.png
deleted file mode 100644
index a4979ed1..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_channels/7.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_channels/8.png b/data/interfaces/default/images/media_flags/audio_channels/8.png
deleted file mode 100644
index 3e197738..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_channels/8.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/aac.png b/data/interfaces/default/images/media_flags/audio_codec/aac.png
deleted file mode 100644
index b89e8d51..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/aac.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/aif.png b/data/interfaces/default/images/media_flags/audio_codec/aif.png
deleted file mode 100644
index c645e88a..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/aif.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/aifc.png b/data/interfaces/default/images/media_flags/audio_codec/aifc.png
deleted file mode 100644
index 5bcf43f3..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/aifc.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/aiff.png b/data/interfaces/default/images/media_flags/audio_codec/aiff.png
deleted file mode 100644
index a22e5d03..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/aiff.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/alac.png b/data/interfaces/default/images/media_flags/audio_codec/alac.png
deleted file mode 100644
index a3bffb3b..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/alac.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/ape.png b/data/interfaces/default/images/media_flags/audio_codec/ape.png
deleted file mode 100644
index ab71bae7..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/ape.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/cdda.png b/data/interfaces/default/images/media_flags/audio_codec/cdda.png
deleted file mode 100644
index 0cf9861b..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/cdda.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/dca-ma.png b/data/interfaces/default/images/media_flags/audio_codec/dca-ma.png
deleted file mode 100644
index 7c12ccc7..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/dca-ma.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/dolby_digital.png b/data/interfaces/default/images/media_flags/audio_codec/dolby_digital.png
deleted file mode 100644
index d487d320..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/dolby_digital.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/dolby_truehd.png b/data/interfaces/default/images/media_flags/audio_codec/dolby_truehd.png
deleted file mode 100644
index 0940c536..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/dolby_truehd.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/dts.png b/data/interfaces/default/images/media_flags/audio_codec/dts.png
deleted file mode 100644
index 7c12ccc7..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/dts.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/eac3.png b/data/interfaces/default/images/media_flags/audio_codec/eac3.png
deleted file mode 100644
index bf8d76e2..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/eac3.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/flac.png b/data/interfaces/default/images/media_flags/audio_codec/flac.png
deleted file mode 100644
index ade59622..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/flac.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/m4a.png b/data/interfaces/default/images/media_flags/audio_codec/m4a.png
deleted file mode 100644
index dddb71d2..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/m4a.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/mlp.png b/data/interfaces/default/images/media_flags/audio_codec/mlp.png
deleted file mode 100644
index bb2e3b0f..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/mlp.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/mp2.png b/data/interfaces/default/images/media_flags/audio_codec/mp2.png
deleted file mode 100644
index 39e325f4..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/mp2.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/mp3.png b/data/interfaces/default/images/media_flags/audio_codec/mp3.png
deleted file mode 100644
index 46b6e46b..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/mp3.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/mpc.png b/data/interfaces/default/images/media_flags/audio_codec/mpc.png
deleted file mode 100644
index a4211fd6..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/mpc.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/ogg.png b/data/interfaces/default/images/media_flags/audio_codec/ogg.png
deleted file mode 100644
index 8475ccb6..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/ogg.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/pcm.png b/data/interfaces/default/images/media_flags/audio_codec/pcm.png
deleted file mode 100644
index 14585ae3..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/pcm.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/ra.png b/data/interfaces/default/images/media_flags/audio_codec/ra.png
deleted file mode 100644
index 726f6671..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/ra.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/shn.png b/data/interfaces/default/images/media_flags/audio_codec/shn.png
deleted file mode 100644
index 18da111f..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/shn.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/wav.png b/data/interfaces/default/images/media_flags/audio_codec/wav.png
deleted file mode 100644
index c886078b..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/wav.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/wave.png b/data/interfaces/default/images/media_flags/audio_codec/wave.png
deleted file mode 100644
index c886078b..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/wave.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/wma.png b/data/interfaces/default/images/media_flags/audio_codec/wma.png
deleted file mode 100644
index c765c4e6..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/wma.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/wmahd.png b/data/interfaces/default/images/media_flags/audio_codec/wmahd.png
deleted file mode 100644
index 02202cec..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/wmahd.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/wmapro.png b/data/interfaces/default/images/media_flags/audio_codec/wmapro.png
deleted file mode 100644
index bd388596..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/wmapro.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/wmav2.png b/data/interfaces/default/images/media_flags/audio_codec/wmav2.png
deleted file mode 100644
index d2e58d04..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/wmav2.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/audio_codec/wv.png b/data/interfaces/default/images/media_flags/audio_codec/wv.png
deleted file mode 100644
index 5012b151..00000000
Binary files a/data/interfaces/default/images/media_flags/audio_codec/wv.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/G.png b/data/interfaces/default/images/media_flags/content_rating/G.png
deleted file mode 100644
index c9c72fc1..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/G.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/NC-17.png b/data/interfaces/default/images/media_flags/content_rating/NC-17.png
deleted file mode 100644
index 257f2cb0..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/NC-17.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/NR.png b/data/interfaces/default/images/media_flags/content_rating/NR.png
deleted file mode 100644
index aca772c4..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/NR.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/Not Rated.png b/data/interfaces/default/images/media_flags/content_rating/Not Rated.png
deleted file mode 100644
index 7c30b17d..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/Not Rated.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/PG-13.png b/data/interfaces/default/images/media_flags/content_rating/PG-13.png
deleted file mode 100644
index 68628b20..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/PG-13.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/PG.png b/data/interfaces/default/images/media_flags/content_rating/PG.png
deleted file mode 100644
index 4bff6fff..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/PG.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/R.png b/data/interfaces/default/images/media_flags/content_rating/R.png
deleted file mode 100644
index 34967386..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/R.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/TV-14.png b/data/interfaces/default/images/media_flags/content_rating/TV-14.png
deleted file mode 100644
index 88df274d..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/TV-14.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/TV-G.png b/data/interfaces/default/images/media_flags/content_rating/TV-G.png
deleted file mode 100644
index f2f60a13..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/TV-G.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/TV-MA.png b/data/interfaces/default/images/media_flags/content_rating/TV-MA.png
deleted file mode 100644
index 09ca4703..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/TV-MA.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/TV-PG.png b/data/interfaces/default/images/media_flags/content_rating/TV-PG.png
deleted file mode 100644
index 80526601..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/TV-PG.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/TV-Y.png b/data/interfaces/default/images/media_flags/content_rating/TV-Y.png
deleted file mode 100644
index a7a30735..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/TV-Y.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/TV-Y7-FV.png b/data/interfaces/default/images/media_flags/content_rating/TV-Y7-FV.png
deleted file mode 100644
index c0004926..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/TV-Y7-FV.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/TV-Y7.png b/data/interfaces/default/images/media_flags/content_rating/TV-Y7.png
deleted file mode 100644
index ec938312..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/TV-Y7.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/Unrated.png b/data/interfaces/default/images/media_flags/content_rating/Unrated.png
deleted file mode 100644
index cb955c8d..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/Unrated.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/X.png b/data/interfaces/default/images/media_flags/content_rating/X.png
deleted file mode 100644
index 74498d53..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/X.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/au/E.png b/data/interfaces/default/images/media_flags/content_rating/au/E.png
deleted file mode 100644
index b647585a..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/au/E.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/au/G.png b/data/interfaces/default/images/media_flags/content_rating/au/G.png
deleted file mode 100644
index a76762e4..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/au/G.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/au/M.png b/data/interfaces/default/images/media_flags/content_rating/au/M.png
deleted file mode 100644
index 8b57b970..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/au/M.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/au/MA15+.png b/data/interfaces/default/images/media_flags/content_rating/au/MA15+.png
deleted file mode 100644
index 1fa71d0a..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/au/MA15+.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/au/MA15.png b/data/interfaces/default/images/media_flags/content_rating/au/MA15.png
deleted file mode 100644
index 1fa71d0a..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/au/MA15.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/au/PG.png b/data/interfaces/default/images/media_flags/content_rating/au/PG.png
deleted file mode 100644
index 995575d1..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/au/PG.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/au/R18+.png b/data/interfaces/default/images/media_flags/content_rating/au/R18+.png
deleted file mode 100644
index 377f96c0..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/au/R18+.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/au/R18.png b/data/interfaces/default/images/media_flags/content_rating/au/R18.png
deleted file mode 100644
index 377f96c0..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/au/R18.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/au/X18+.png b/data/interfaces/default/images/media_flags/content_rating/au/X18+.png
deleted file mode 100644
index 7129847d..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/au/X18+.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/au/X18.png b/data/interfaces/default/images/media_flags/content_rating/au/X18.png
deleted file mode 100644
index 7129847d..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/au/X18.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/ca/14A.png b/data/interfaces/default/images/media_flags/content_rating/ca/14A.png
deleted file mode 100644
index 443d9380..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/ca/14A.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/ca/18A.png b/data/interfaces/default/images/media_flags/content_rating/ca/18A.png
deleted file mode 100644
index 9cf9d7d1..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/ca/18A.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/ca/E.png b/data/interfaces/default/images/media_flags/content_rating/ca/E.png
deleted file mode 100644
index 99bb8a64..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/ca/E.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/ca/G.png b/data/interfaces/default/images/media_flags/content_rating/ca/G.png
deleted file mode 100644
index c399d267..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/ca/G.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/ca/PG.png b/data/interfaces/default/images/media_flags/content_rating/ca/PG.png
deleted file mode 100644
index 248e0fc6..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/ca/PG.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/ca/R.png b/data/interfaces/default/images/media_flags/content_rating/ca/R.png
deleted file mode 100644
index e8aa9e72..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/ca/R.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/de/0.png b/data/interfaces/default/images/media_flags/content_rating/de/0.png
deleted file mode 100644
index 9021a82c..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/de/0.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/de/12.png b/data/interfaces/default/images/media_flags/content_rating/de/12.png
deleted file mode 100644
index edfc6a06..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/de/12.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/de/16.png b/data/interfaces/default/images/media_flags/content_rating/de/16.png
deleted file mode 100644
index f087a18b..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/de/16.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/de/18.png b/data/interfaces/default/images/media_flags/content_rating/de/18.png
deleted file mode 100644
index 5f70d505..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/de/18.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/de/6.png b/data/interfaces/default/images/media_flags/content_rating/de/6.png
deleted file mode 100644
index dc25d063..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/de/6.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/fr/-10.png b/data/interfaces/default/images/media_flags/content_rating/fr/-10.png
deleted file mode 100644
index 287dc0db..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/fr/-10.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/fr/-12.png b/data/interfaces/default/images/media_flags/content_rating/fr/-12.png
deleted file mode 100644
index 522a8e46..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/fr/-12.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/fr/-16.png b/data/interfaces/default/images/media_flags/content_rating/fr/-16.png
deleted file mode 100644
index 53a26ce9..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/fr/-16.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/fr/-18.png b/data/interfaces/default/images/media_flags/content_rating/fr/-18.png
deleted file mode 100644
index 45699b77..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/fr/-18.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/fr/Tout Public.png b/data/interfaces/default/images/media_flags/content_rating/fr/Tout Public.png
deleted file mode 100644
index 2ed85e78..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/fr/Tout Public.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/fr/U.png b/data/interfaces/default/images/media_flags/content_rating/fr/U.png
deleted file mode 100644
index 2ed85e78..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/fr/U.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/gb/12.png b/data/interfaces/default/images/media_flags/content_rating/gb/12.png
deleted file mode 100644
index 3d66906e..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/gb/12.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/gb/12A.png b/data/interfaces/default/images/media_flags/content_rating/gb/12A.png
deleted file mode 100644
index 1cad76f6..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/gb/12A.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/gb/15.png b/data/interfaces/default/images/media_flags/content_rating/gb/15.png
deleted file mode 100644
index 82d62416..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/gb/15.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/gb/18.png b/data/interfaces/default/images/media_flags/content_rating/gb/18.png
deleted file mode 100644
index 1e695f0f..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/gb/18.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/gb/PG.png b/data/interfaces/default/images/media_flags/content_rating/gb/PG.png
deleted file mode 100644
index d1ab5104..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/gb/PG.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/gb/R18.png b/data/interfaces/default/images/media_flags/content_rating/gb/R18.png
deleted file mode 100644
index 32104192..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/gb/R18.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/gb/U.png b/data/interfaces/default/images/media_flags/content_rating/gb/U.png
deleted file mode 100644
index 57304b2f..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/gb/U.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/nl/12.png b/data/interfaces/default/images/media_flags/content_rating/nl/12.png
deleted file mode 100644
index f2471569..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/nl/12.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/nl/16.png b/data/interfaces/default/images/media_flags/content_rating/nl/16.png
deleted file mode 100644
index 78d6e76c..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/nl/16.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/nl/6.png b/data/interfaces/default/images/media_flags/content_rating/nl/6.png
deleted file mode 100644
index 0ad9ff12..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/nl/6.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/nl/9.png b/data/interfaces/default/images/media_flags/content_rating/nl/9.png
deleted file mode 100644
index 9b2e0b56..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/nl/9.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/nl/AL.png b/data/interfaces/default/images/media_flags/content_rating/nl/AL.png
deleted file mode 100644
index d6febf07..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/nl/AL.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/content_rating/nl/Alle Leeftijden.png b/data/interfaces/default/images/media_flags/content_rating/nl/Alle Leeftijden.png
deleted file mode 100644
index d6febf07..00000000
Binary files a/data/interfaces/default/images/media_flags/content_rating/nl/Alle Leeftijden.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/1492_pictures.png b/data/interfaces/default/images/media_flags/studio/1492_pictures.png
deleted file mode 100644
index 258c7fdc..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/1492_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/20th_century_fox.png b/data/interfaces/default/images/media_flags/studio/20th_century_fox.png
deleted file mode 100644
index 78ca60c5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/20th_century_fox.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/20th_century_fox_animation.png b/data/interfaces/default/images/media_flags/studio/20th_century_fox_animation.png
deleted file mode 100644
index 28ee0aee..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/20th_century_fox_animation.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/2929.png b/data/interfaces/default/images/media_flags/studio/2929.png
deleted file mode 100644
index 9e360891..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/2929.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/360_pictures.png b/data/interfaces/default/images/media_flags/studio/360_pictures.png
deleted file mode 100644
index 7e8fb519..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/360_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/40_acres.png b/data/interfaces/default/images/media_flags/studio/40_acres.png
deleted file mode 100644
index 48f0a389..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/40_acres.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/57_irving.png b/data/interfaces/default/images/media_flags/studio/57_irving.png
deleted file mode 100644
index 5253520e..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/57_irving.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/777_film_corp.png b/data/interfaces/default/images/media_flags/studio/777_film_corp.png
deleted file mode 100644
index 986e93e2..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/777_film_corp.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/a24.png b/data/interfaces/default/images/media_flags/studio/a24.png
deleted file mode 100644
index 18fd529e..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/a24.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/a_1_pictures.png b/data/interfaces/default/images/media_flags/studio/a_1_pictures.png
deleted file mode 100644
index 0fe5ea76..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/a_1_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/a_and_e.png b/data/interfaces/default/images/media_flags/studio/a_and_e.png
deleted file mode 100644
index 9ee1038a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/a_and_e.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/aardman.png b/data/interfaces/default/images/media_flags/studio/aardman.png
deleted file mode 100644
index 7bbbb40b..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/aardman.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/abandon.png b/data/interfaces/default/images/media_flags/studio/abandon.png
deleted file mode 100644
index 86f7f477..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/abandon.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/abc.png b/data/interfaces/default/images/media_flags/studio/abc.png
deleted file mode 100644
index 0b3f3539..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/abc.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/abc_australia.png b/data/interfaces/default/images/media_flags/studio/abc_australia.png
deleted file mode 100644
index a546a4d5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/abc_australia.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/abc_family.png b/data/interfaces/default/images/media_flags/studio/abc_family.png
deleted file mode 100644
index f81f52bf..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/abc_family.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/actf.png b/data/interfaces/default/images/media_flags/studio/actf.png
deleted file mode 100644
index 7b16fdae..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/actf.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/adult_swim.png b/data/interfaces/default/images/media_flags/studio/adult_swim.png
deleted file mode 100644
index f743916a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/adult_swim.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/afi.png b/data/interfaces/default/images/media_flags/studio/afi.png
deleted file mode 100644
index 43f6eac3..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/afi.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/after_dark.png b/data/interfaces/default/images/media_flags/studio/after_dark.png
deleted file mode 100644
index e92ea940..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/after_dark.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/aic.png b/data/interfaces/default/images/media_flags/studio/aic.png
deleted file mode 100644
index bef38d93..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/aic.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/alcon_entertainment.png b/data/interfaces/default/images/media_flags/studio/alcon_entertainment.png
deleted file mode 100644
index 30eda4c5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/alcon_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/alfred_hitchcock_productions.png b/data/interfaces/default/images/media_flags/studio/alfred_hitchcock_productions.png
deleted file mode 100644
index f7da8d9d..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/alfred_hitchcock_productions.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/alliance.png b/data/interfaces/default/images/media_flags/studio/alliance.png
deleted file mode 100644
index 553fdaa7..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/alliance.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/alloy.png b/data/interfaces/default/images/media_flags/studio/alloy.png
deleted file mode 100644
index 75f5c431..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/alloy.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/alphaville.png b/data/interfaces/default/images/media_flags/studio/alphaville.png
deleted file mode 100644
index 2dcaafa3..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/alphaville.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/amazon_studios.png b/data/interfaces/default/images/media_flags/studio/amazon_studios.png
deleted file mode 100644
index 3ac9732c..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/amazon_studios.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/ambience.png b/data/interfaces/default/images/media_flags/studio/ambience.png
deleted file mode 100644
index 660081b5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/ambience.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/amblin_entertainment.png b/data/interfaces/default/images/media_flags/studio/amblin_entertainment.png
deleted file mode 100644
index f402fa8b..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/amblin_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/amc.png b/data/interfaces/default/images/media_flags/studio/amc.png
deleted file mode 100644
index e72be7e3..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/amc.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/american_masters.png b/data/interfaces/default/images/media_flags/studio/american_masters.png
deleted file mode 100644
index 41164567..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/american_masters.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/american_zoetrope.png b/data/interfaces/default/images/media_flags/studio/american_zoetrope.png
deleted file mode 100644
index f35ea05b..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/american_zoetrope.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/anchor_bay_entertainment.png b/data/interfaces/default/images/media_flags/studio/anchor_bay_entertainment.png
deleted file mode 100644
index d8760a6e..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/anchor_bay_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/animal_planet.png b/data/interfaces/default/images/media_flags/studio/animal_planet.png
deleted file mode 100644
index 7fa36598..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/animal_planet.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/animax.png b/data/interfaces/default/images/media_flags/studio/animax.png
deleted file mode 100644
index 84d20cb0..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/animax.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/anonymous_content.png b/data/interfaces/default/images/media_flags/studio/anonymous_content.png
deleted file mode 100644
index 91df7339..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/anonymous_content.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/antena_3.png b/data/interfaces/default/images/media_flags/studio/antena_3.png
deleted file mode 100644
index 1bb711f3..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/antena_3.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/apatow_productions.png b/data/interfaces/default/images/media_flags/studio/apatow_productions.png
deleted file mode 100644
index 477f9df3..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/apatow_productions.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/apple.png b/data/interfaces/default/images/media_flags/studio/apple.png
deleted file mode 100644
index b6d3615b..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/apple.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/ard.png b/data/interfaces/default/images/media_flags/studio/ard.png
deleted file mode 100644
index 6ed48bf2..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/ard.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/ark.png b/data/interfaces/default/images/media_flags/studio/ark.png
deleted file mode 100644
index e555f619..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/ark.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/arte.png b/data/interfaces/default/images/media_flags/studio/arte.png
deleted file mode 100644
index 6b231f43..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/arte.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/artisan_entertainment.png b/data/interfaces/default/images/media_flags/studio/artisan_entertainment.png
deleted file mode 100644
index 6a958d27..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/artisan_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/aspen_film_society.png b/data/interfaces/default/images/media_flags/studio/aspen_film_society.png
deleted file mode 100644
index 59fa60d2..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/aspen_film_society.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/atom_films.png b/data/interfaces/default/images/media_flags/studio/atom_films.png
deleted file mode 100644
index 51d066d3..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/atom_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/audience_network.png b/data/interfaces/default/images/media_flags/studio/audience_network.png
deleted file mode 100644
index e9e9358d..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/audience_network.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/australian_film_commission.png b/data/interfaces/default/images/media_flags/studio/australian_film_commission.png
deleted file mode 100644
index 729e8739..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/australian_film_commission.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/avalanche_studios.png b/data/interfaces/default/images/media_flags/studio/avalanche_studios.png
deleted file mode 100644
index 9e821f14..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/avalanche_studios.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/avnet_kerner.png b/data/interfaces/default/images/media_flags/studio/avnet_kerner.png
deleted file mode 100644
index e8a61b41..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/avnet_kerner.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/babylonian.png b/data/interfaces/default/images/media_flags/studio/babylonian.png
deleted file mode 100644
index 0e5239ee..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/babylonian.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/bad_boy_entertainment.png b/data/interfaces/default/images/media_flags/studio/bad_boy_entertainment.png
deleted file mode 100644
index 26943da4..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/bad_boy_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/bad_robot.png b/data/interfaces/default/images/media_flags/studio/bad_robot.png
deleted file mode 100644
index 9359b493..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/bad_robot.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/baltimore_pictures.png b/data/interfaces/default/images/media_flags/studio/baltimore_pictures.png
deleted file mode 100644
index 868de6f8..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/baltimore_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/bandai.png b/data/interfaces/default/images/media_flags/studio/bandai.png
deleted file mode 100644
index 32801a36..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/bandai.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/bandai_visual.png b/data/interfaces/default/images/media_flags/studio/bandai_visual.png
deleted file mode 100644
index 4b468901..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/bandai_visual.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/bandapart.png b/data/interfaces/default/images/media_flags/studio/bandapart.png
deleted file mode 100644
index b43f806d..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/bandapart.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/batjac.png b/data/interfaces/default/images/media_flags/studio/batjac.png
deleted file mode 100644
index 9a2dab41..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/batjac.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/bazmark.png b/data/interfaces/default/images/media_flags/studio/bazmark.png
deleted file mode 100644
index 630fd647..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/bazmark.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/bbc.png b/data/interfaces/default/images/media_flags/studio/bbc.png
deleted file mode 100644
index bf5748fa..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/bbc.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/bbc_america.png b/data/interfaces/default/images/media_flags/studio/bbc_america.png
deleted file mode 100644
index 117dd04e..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/bbc_america.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/bbc_films.png b/data/interfaces/default/images/media_flags/studio/bbc_films.png
deleted file mode 100644
index 756ae822..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/bbc_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/bbc_four.png b/data/interfaces/default/images/media_flags/studio/bbc_four.png
deleted file mode 100644
index ff7ef72c..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/bbc_four.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/bbc_one.png b/data/interfaces/default/images/media_flags/studio/bbc_one.png
deleted file mode 100644
index 7aaa597e..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/bbc_one.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/bbc_prime.png b/data/interfaces/default/images/media_flags/studio/bbc_prime.png
deleted file mode 100644
index 502ee002..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/bbc_prime.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/bbc_three.png b/data/interfaces/default/images/media_flags/studio/bbc_three.png
deleted file mode 100644
index 21b6d29e..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/bbc_three.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/bbc_two.png b/data/interfaces/default/images/media_flags/studio/bbc_two.png
deleted file mode 100644
index ab80fa85..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/bbc_two.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/beacon.png b/data/interfaces/default/images/media_flags/studio/beacon.png
deleted file mode 100644
index e72f48e7..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/beacon.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/becker_entertainment.png b/data/interfaces/default/images/media_flags/studio/becker_entertainment.png
deleted file mode 100644
index e4b14bd2..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/becker_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/belair_entertainment.png b/data/interfaces/default/images/media_flags/studio/belair_entertainment.png
deleted file mode 100644
index 6ea18567..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/belair_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/bet.png b/data/interfaces/default/images/media_flags/studio/bet.png
deleted file mode 100644
index ee67019c..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/bet.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/bigtalk.png b/data/interfaces/default/images/media_flags/studio/bigtalk.png
deleted file mode 100644
index ee1d8040..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/bigtalk.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/biography_channel.png b/data/interfaces/default/images/media_flags/studio/biography_channel.png
deleted file mode 100644
index fd6b21a4..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/biography_channel.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/black_bear_pictures.png b/data/interfaces/default/images/media_flags/studio/black_bear_pictures.png
deleted file mode 100644
index f6fc7131..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/black_bear_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/blackdog.png b/data/interfaces/default/images/media_flags/studio/blackdog.png
deleted file mode 100644
index 02b7b06c..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/blackdog.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/bleecker_street.png b/data/interfaces/default/images/media_flags/studio/bleecker_street.png
deleted file mode 100644
index 29d1f6b1..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/bleecker_street.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/blind_ambition_entertainment.png b/data/interfaces/default/images/media_flags/studio/blind_ambition_entertainment.png
deleted file mode 100644
index 1e3de5e9..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/blind_ambition_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/blizzard_entertainment.png b/data/interfaces/default/images/media_flags/studio/blizzard_entertainment.png
deleted file mode 100644
index 0fd98942..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/blizzard_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/blue_sky.png b/data/interfaces/default/images/media_flags/studio/blue_sky.png
deleted file mode 100644
index c02489f6..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/blue_sky.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/blue_sky_studios.png b/data/interfaces/default/images/media_flags/studio/blue_sky_studios.png
deleted file mode 100644
index abc0d85b..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/blue_sky_studios.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/blue_underground.png b/data/interfaces/default/images/media_flags/studio/blue_underground.png
deleted file mode 100644
index b0a7f17b..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/blue_underground.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/blumhouse_productions.png b/data/interfaces/default/images/media_flags/studio/blumhouse_productions.png
deleted file mode 100644
index b4409df3..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/blumhouse_productions.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/bnn.png b/data/interfaces/default/images/media_flags/studio/bnn.png
deleted file mode 100644
index 5dad0a17..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/bnn.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/bold_films.png b/data/interfaces/default/images/media_flags/studio/bold_films.png
deleted file mode 100644
index 8c310530..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/bold_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/boomerang.png b/data/interfaces/default/images/media_flags/studio/boomerang.png
deleted file mode 100644
index bfd7f438..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/boomerang.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/bravo.png b/data/interfaces/default/images/media_flags/studio/bravo.png
deleted file mode 100644
index a4287fc4..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/bravo.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/brightlight.png b/data/interfaces/default/images/media_flags/studio/brightlight.png
deleted file mode 100644
index 58a29d9d..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/brightlight.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/bristol_bay.png b/data/interfaces/default/images/media_flags/studio/bristol_bay.png
deleted file mode 100644
index 953760bd..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/bristol_bay.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/broken_lizard.png b/data/interfaces/default/images/media_flags/studio/broken_lizard.png
deleted file mode 100644
index 2600fb72..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/broken_lizard.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/brooklyn_films.png b/data/interfaces/default/images/media_flags/studio/brooklyn_films.png
deleted file mode 100644
index 24d17c9d..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/brooklyn_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/buena_vista.png b/data/interfaces/default/images/media_flags/studio/buena_vista.png
deleted file mode 100644
index 3f9711e3..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/buena_vista.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/bulletproof.png b/data/interfaces/default/images/media_flags/studio/bulletproof.png
deleted file mode 100644
index e0ea5828..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/bulletproof.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/c2_pictures.png b/data/interfaces/default/images/media_flags/studio/c2_pictures.png
deleted file mode 100644
index eab35918..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/c2_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/canalplus.png b/data/interfaces/default/images/media_flags/studio/canalplus.png
deleted file mode 100644
index f6117178..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/canalplus.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/cannon_pictures.png b/data/interfaces/default/images/media_flags/studio/cannon_pictures.png
deleted file mode 100644
index 7a8309b5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/cannon_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/capcom.png b/data/interfaces/default/images/media_flags/studio/capcom.png
deleted file mode 100644
index 8bab3440..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/capcom.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/capitol_films.png b/data/interfaces/default/images/media_flags/studio/capitol_films.png
deleted file mode 100644
index af4b2c64..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/capitol_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/caravan_pictures.png b/data/interfaces/default/images/media_flags/studio/caravan_pictures.png
deleted file mode 100644
index 47f9e350..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/caravan_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/carnaby.png b/data/interfaces/default/images/media_flags/studio/carnaby.png
deleted file mode 100644
index 35915915..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/carnaby.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/carolco.png b/data/interfaces/default/images/media_flags/studio/carolco.png
deleted file mode 100644
index 873ef2ac..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/carolco.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/cartoonnetwork.png b/data/interfaces/default/images/media_flags/studio/cartoonnetwork.png
deleted file mode 100644
index badf075a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/cartoonnetwork.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/casablanca_filmes.png b/data/interfaces/default/images/media_flags/studio/casablanca_filmes.png
deleted file mode 100644
index 48671a7f..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/casablanca_filmes.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/cascade_film.png b/data/interfaces/default/images/media_flags/studio/cascade_film.png
deleted file mode 100644
index 840ec07f..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/cascade_film.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/casey_silver_productions.png b/data/interfaces/default/images/media_flags/studio/casey_silver_productions.png
deleted file mode 100644
index 44ce05f1..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/casey_silver_productions.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/castle_rock_entertainment.png b/data/interfaces/default/images/media_flags/studio/castle_rock_entertainment.png
deleted file mode 100644
index 485d5964..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/castle_rock_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/cat_in_the_hat.png b/data/interfaces/default/images/media_flags/studio/cat_in_the_hat.png
deleted file mode 100644
index 560d2eda..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/cat_in_the_hat.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/cbbc.png b/data/interfaces/default/images/media_flags/studio/cbbc.png
deleted file mode 100644
index 7527bef7..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/cbbc.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/cbc.png b/data/interfaces/default/images/media_flags/studio/cbc.png
deleted file mode 100644
index 3f26e7f8..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/cbc.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/cbs.png b/data/interfaces/default/images/media_flags/studio/cbs.png
deleted file mode 100644
index b75a7d41..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/cbs.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/celador.png b/data/interfaces/default/images/media_flags/studio/celador.png
deleted file mode 100644
index f9b619ee..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/celador.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/centropolis_entertainment.png b/data/interfaces/default/images/media_flags/studio/centropolis_entertainment.png
deleted file mode 100644
index c65c6289..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/centropolis_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/ceska_televize.png b/data/interfaces/default/images/media_flags/studio/ceska_televize.png
deleted file mode 100644
index 4d3c97a8..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/ceska_televize.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/channel4.png b/data/interfaces/default/images/media_flags/studio/channel4.png
deleted file mode 100644
index fb5aa602..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/channel4.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/channel5.png b/data/interfaces/default/images/media_flags/studio/channel5.png
deleted file mode 100644
index 98118b9a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/channel5.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/channel_nine.png b/data/interfaces/default/images/media_flags/studio/channel_nine.png
deleted file mode 100644
index 4a581fd3..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/channel_nine.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/channel_seven.png b/data/interfaces/default/images/media_flags/studio/channel_seven.png
deleted file mode 100644
index c9c620d3..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/channel_seven.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/channel_ten.png b/data/interfaces/default/images/media_flags/studio/channel_ten.png
deleted file mode 100644
index f00cd1b7..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/channel_ten.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/cheyenne.png b/data/interfaces/default/images/media_flags/studio/cheyenne.png
deleted file mode 100644
index 94bf7a5b..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/cheyenne.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/chiller.png b/data/interfaces/default/images/media_flags/studio/chiller.png
deleted file mode 100644
index 0cff8a88..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/chiller.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/cinemax.png b/data/interfaces/default/images/media_flags/studio/cinemax.png
deleted file mode 100644
index 80dccddc..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/cinemax.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/city.png b/data/interfaces/default/images/media_flags/studio/city.png
deleted file mode 100644
index 441dae9f..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/city.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/cmt.png b/data/interfaces/default/images/media_flags/studio/cmt.png
deleted file mode 100644
index e46507f1..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/cmt.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/cnc.png b/data/interfaces/default/images/media_flags/studio/cnc.png
deleted file mode 100644
index e337f56c..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/cnc.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/columbia_pictures.png b/data/interfaces/default/images/media_flags/studio/columbia_pictures.png
deleted file mode 100644
index b957faeb..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/columbia_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/comedy_central.png b/data/interfaces/default/images/media_flags/studio/comedy_central.png
deleted file mode 100644
index 879d39a0..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/comedy_central.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/concorde.png b/data/interfaces/default/images/media_flags/studio/concorde.png
deleted file mode 100644
index de8730cd..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/concorde.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/condemned.png b/data/interfaces/default/images/media_flags/studio/condemned.png
deleted file mode 100644
index 1abea67c..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/condemned.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/constantin_film.png b/data/interfaces/default/images/media_flags/studio/constantin_film.png
deleted file mode 100644
index f31c87a5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/constantin_film.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/constellation.png b/data/interfaces/default/images/media_flags/studio/constellation.png
deleted file mode 100644
index cd682d2f..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/constellation.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/cookie_jar.png b/data/interfaces/default/images/media_flags/studio/cookie_jar.png
deleted file mode 100644
index cee89714..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/cookie_jar.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/cpfilms.png b/data/interfaces/default/images/media_flags/studio/cpfilms.png
deleted file mode 100644
index 22b36342..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/cpfilms.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/crackle.png b/data/interfaces/default/images/media_flags/studio/crackle.png
deleted file mode 100644
index 5c9e8e3f..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/crackle.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/criterion.png b/data/interfaces/default/images/media_flags/studio/criterion.png
deleted file mode 100644
index de7ad4cd..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/criterion.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/ctv.png b/data/interfaces/default/images/media_flags/studio/ctv.png
deleted file mode 100644
index 671525c5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/ctv.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/cw.png b/data/interfaces/default/images/media_flags/studio/cw.png
deleted file mode 100644
index ae5a8ed4..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/cw.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/cw_seed.png b/data/interfaces/default/images/media_flags/studio/cw_seed.png
deleted file mode 100644
index 8b8f6503..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/cw_seed.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/czolowka.png b/data/interfaces/default/images/media_flags/studio/czolowka.png
deleted file mode 100644
index 30a8e4c4..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/czolowka.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/damselfly.png b/data/interfaces/default/images/media_flags/studio/damselfly.png
deleted file mode 100644
index 0719d2cd..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/damselfly.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/danjaq.png b/data/interfaces/default/images/media_flags/studio/danjaq.png
deleted file mode 100644
index 702bd849..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/danjaq.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/dark_castle_entertainment.png b/data/interfaces/default/images/media_flags/studio/dark_castle_entertainment.png
deleted file mode 100644
index b433fd4a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/dark_castle_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/dark_horse.png b/data/interfaces/default/images/media_flags/studio/dark_horse.png
deleted file mode 100644
index 69472a60..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/dark_horse.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/dave.png b/data/interfaces/default/images/media_flags/studio/dave.png
deleted file mode 100644
index 52c7775c..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/dave.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/davis_entertainment.png b/data/interfaces/default/images/media_flags/studio/davis_entertainment.png
deleted file mode 100644
index 2e3e81d5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/davis_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/dc.png b/data/interfaces/default/images/media_flags/studio/dc.png
deleted file mode 100644
index 5a5871a8..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/dc.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/de_laurentiis.png b/data/interfaces/default/images/media_flags/studio/de_laurentiis.png
deleted file mode 100644
index ac45f1b0..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/de_laurentiis.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/defa.png b/data/interfaces/default/images/media_flags/studio/defa.png
deleted file mode 100644
index 9709cc1d..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/defa.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/destination_films.png b/data/interfaces/default/images/media_flags/studio/destination_films.png
deleted file mode 100644
index 60be7cf7..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/destination_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/dfi.png b/data/interfaces/default/images/media_flags/studio/dfi.png
deleted file mode 100644
index 64180155..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/dfi.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/dickhouse_productions.png b/data/interfaces/default/images/media_flags/studio/dickhouse_productions.png
deleted file mode 100644
index aab3b566..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/dickhouse_productions.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/digital_factory.png b/data/interfaces/default/images/media_flags/studio/digital_factory.png
deleted file mode 100644
index b57fa3de..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/digital_factory.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/digital_playground.png b/data/interfaces/default/images/media_flags/studio/digital_playground.png
deleted file mode 100644
index 70ca7185..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/digital_playground.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/dimension_films.png b/data/interfaces/default/images/media_flags/studio/dimension_films.png
deleted file mode 100644
index 963a8319..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/dimension_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/discovery_channel.png b/data/interfaces/default/images/media_flags/studio/discovery_channel.png
deleted file mode 100644
index d156aa33..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/discovery_channel.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/disney_channel.png b/data/interfaces/default/images/media_flags/studio/disney_channel.png
deleted file mode 100644
index 906200ab..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/disney_channel.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/disney_xd.png b/data/interfaces/default/images/media_flags/studio/disney_xd.png
deleted file mode 100644
index aa118b6e..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/disney_xd.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/distant_horizon.png b/data/interfaces/default/images/media_flags/studio/distant_horizon.png
deleted file mode 100644
index 1ed0ed9f..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/distant_horizon.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/dmax.png b/data/interfaces/default/images/media_flags/studio/dmax.png
deleted file mode 100644
index 9f1017e3..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/dmax.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/dna.png b/data/interfaces/default/images/media_flags/studio/dna.png
deleted file mode 100644
index 807d6377..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/dna.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/dolores_pictures.png b/data/interfaces/default/images/media_flags/studio/dolores_pictures.png
deleted file mode 100644
index 6c0c84d3..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/dolores_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/don_simpson_jerry_bruckheimer_films.png b/data/interfaces/default/images/media_flags/studio/don_simpson_jerry_bruckheimer_films.png
deleted file mode 100644
index 625975c3..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/don_simpson_jerry_bruckheimer_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/donners.png b/data/interfaces/default/images/media_flags/studio/donners.png
deleted file mode 100644
index 9bafec9c..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/donners.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/dreamworks.png b/data/interfaces/default/images/media_flags/studio/dreamworks.png
deleted file mode 100644
index 808ffbd0..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/dreamworks.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/dreamworks_animation.png b/data/interfaces/default/images/media_flags/studio/dreamworks_animation.png
deleted file mode 100644
index 2f4c764d..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/dreamworks_animation.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/e4.png b/data/interfaces/default/images/media_flags/studio/e4.png
deleted file mode 100644
index e39ff30f..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/e4.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/ealing.png b/data/interfaces/default/images/media_flags/studio/ealing.png
deleted file mode 100644
index 8b8544b0..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/ealing.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/eclectic.png b/data/interfaces/default/images/media_flags/studio/eclectic.png
deleted file mode 100644
index a2ded0b8..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/eclectic.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/edmonds_entertainment.png b/data/interfaces/default/images/media_flags/studio/edmonds_entertainment.png
deleted file mode 100644
index fe1dc89f..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/edmonds_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/el_rey_network.png b/data/interfaces/default/images/media_flags/studio/el_rey_network.png
deleted file mode 100644
index 18fedcde..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/el_rey_network.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/electric_enterteinment.png b/data/interfaces/default/images/media_flags/studio/electric_enterteinment.png
deleted file mode 100644
index 957791a4..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/electric_enterteinment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/electric_pictures.png b/data/interfaces/default/images/media_flags/studio/electric_pictures.png
deleted file mode 100644
index 0c214351..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/electric_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/eleven_eleven.png b/data/interfaces/default/images/media_flags/studio/eleven_eleven.png
deleted file mode 100644
index 9580a0cc..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/eleven_eleven.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/emi.png b/data/interfaces/default/images/media_flags/studio/emi.png
deleted file mode 100644
index 339283ff..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/emi.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/emmedia.png b/data/interfaces/default/images/media_flags/studio/emmedia.png
deleted file mode 100644
index e6c21588..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/emmedia.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/encore.png b/data/interfaces/default/images/media_flags/studio/encore.png
deleted file mode 100644
index e1a96e3f..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/encore.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/endgame_entertainment.png b/data/interfaces/default/images/media_flags/studio/endgame_entertainment.png
deleted file mode 100644
index 00dea657..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/endgame_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/entara.png b/data/interfaces/default/images/media_flags/studio/entara.png
deleted file mode 100644
index 5a3d8518..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/entara.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/entertainment_one.png b/data/interfaces/default/images/media_flags/studio/entertainment_one.png
deleted file mode 100644
index f4361522..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/entertainment_one.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/entertainment_television.png b/data/interfaces/default/images/media_flags/studio/entertainment_television.png
deleted file mode 100644
index 916eaf37..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/entertainment_television.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/eon_productions.png b/data/interfaces/default/images/media_flags/studio/eon_productions.png
deleted file mode 100644
index 4615a583..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/eon_productions.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/epix.png b/data/interfaces/default/images/media_flags/studio/epix.png
deleted file mode 100644
index b92eca69..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/epix.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/escape_artists.png b/data/interfaces/default/images/media_flags/studio/escape_artists.png
deleted file mode 100644
index 97d7177a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/escape_artists.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/espn.png b/data/interfaces/default/images/media_flags/studio/espn.png
deleted file mode 100644
index 59e9b333..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/espn.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/eurimages.png b/data/interfaces/default/images/media_flags/studio/eurimages.png
deleted file mode 100644
index b0d73852..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/eurimages.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/europa_corp.png b/data/interfaces/default/images/media_flags/studio/europa_corp.png
deleted file mode 100644
index 8aa019e5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/europa_corp.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/eurosport.png b/data/interfaces/default/images/media_flags/studio/eurosport.png
deleted file mode 100644
index a9f1679a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/eurosport.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/excel.png b/data/interfaces/default/images/media_flags/studio/excel.png
deleted file mode 100644
index e7d6d9fd..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/excel.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/eyekiss_films.png b/data/interfaces/default/images/media_flags/studio/eyekiss_films.png
deleted file mode 100644
index 0e0a0626..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/eyekiss_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/fact.png b/data/interfaces/default/images/media_flags/studio/fact.png
deleted file mode 100644
index 03118350..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/fact.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/figaro.png b/data/interfaces/default/images/media_flags/studio/figaro.png
deleted file mode 100644
index e936da40..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/figaro.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/film_colony.png b/data/interfaces/default/images/media_flags/studio/film_colony.png
deleted file mode 100644
index 14013554..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/film_colony.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/film_four.png b/data/interfaces/default/images/media_flags/studio/film_four.png
deleted file mode 100644
index 3763127d..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/film_four.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/film_institut.png b/data/interfaces/default/images/media_flags/studio/film_institut.png
deleted file mode 100644
index 8db5c27b..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/film_institut.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/film_media.png b/data/interfaces/default/images/media_flags/studio/film_media.png
deleted file mode 100644
index 9e6cf8f1..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/film_media.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/film_polski.png b/data/interfaces/default/images/media_flags/studio/film_polski.png
deleted file mode 100644
index 7f66e7eb..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/film_polski.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/film_tv.png b/data/interfaces/default/images/media_flags/studio/film_tv.png
deleted file mode 100644
index e0384217..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/film_tv.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/filmauro.png b/data/interfaces/default/images/media_flags/studio/filmauro.png
deleted file mode 100644
index 1eb239b6..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/filmauro.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/filmax_animation.png b/data/interfaces/default/images/media_flags/studio/filmax_animation.png
deleted file mode 100644
index 9c86e21c..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/filmax_animation.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/filmforderung_hamburg.png b/data/interfaces/default/images/media_flags/studio/filmforderung_hamburg.png
deleted file mode 100644
index d94e5a35..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/filmforderung_hamburg.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/filmoteka narodowa.png b/data/interfaces/default/images/media_flags/studio/filmoteka narodowa.png
deleted file mode 100644
index c6eb5cb5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/filmoteka narodowa.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/filmstiftung_nordrhein-westfalen.png b/data/interfaces/default/images/media_flags/studio/filmstiftung_nordrhein-westfalen.png
deleted file mode 100644
index 69e7d7ce..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/filmstiftung_nordrhein-westfalen.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/finos_film.png b/data/interfaces/default/images/media_flags/studio/finos_film.png
deleted file mode 100644
index cef2c605..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/finos_film.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/fireworks_entertainment.png b/data/interfaces/default/images/media_flags/studio/fireworks_entertainment.png
deleted file mode 100644
index 84c608f8..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/fireworks_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/first_look_pictures.png b/data/interfaces/default/images/media_flags/studio/first_look_pictures.png
deleted file mode 100644
index afc54858..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/first_look_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/five.png b/data/interfaces/default/images/media_flags/studio/five.png
deleted file mode 100644
index e8f342f7..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/five.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/flower_films.png b/data/interfaces/default/images/media_flags/studio/flower_films.png
deleted file mode 100644
index 7af4a257..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/flower_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/focus_features.png b/data/interfaces/default/images/media_flags/studio/focus_features.png
deleted file mode 100644
index 207f0e56..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/focus_features.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/food_network.png b/data/interfaces/default/images/media_flags/studio/food_network.png
deleted file mode 100644
index a8bcb1e1..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/food_network.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/forte_cinema.png b/data/interfaces/default/images/media_flags/studio/forte_cinema.png
deleted file mode 100644
index c5fecec0..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/forte_cinema.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/fourhands_film.png b/data/interfaces/default/images/media_flags/studio/fourhands_film.png
deleted file mode 100644
index 74ddad62..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/fourhands_film.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/fox.png b/data/interfaces/default/images/media_flags/studio/fox.png
deleted file mode 100644
index 2d2b09d3..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/fox.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/fox_atomic.png b/data/interfaces/default/images/media_flags/studio/fox_atomic.png
deleted file mode 100644
index dd8baa2a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/fox_atomic.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/fox_kids.png b/data/interfaces/default/images/media_flags/studio/fox_kids.png
deleted file mode 100644
index 96100a45..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/fox_kids.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/fox_searchlight_pictures.png b/data/interfaces/default/images/media_flags/studio/fox_searchlight_pictures.png
deleted file mode 100644
index ca67770c..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/fox_searchlight_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/france_2.png b/data/interfaces/default/images/media_flags/studio/france_2.png
deleted file mode 100644
index ca357753..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/france_2.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/france_3.png b/data/interfaces/default/images/media_flags/studio/france_3.png
deleted file mode 100644
index 41358df0..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/france_3.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/france_4.png b/data/interfaces/default/images/media_flags/studio/france_4.png
deleted file mode 100644
index bd058950..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/france_4.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/franchise_pictures.png b/data/interfaces/default/images/media_flags/studio/franchise_pictures.png
deleted file mode 100644
index 30a92437..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/franchise_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/freeform.png b/data/interfaces/default/images/media_flags/studio/freeform.png
deleted file mode 100644
index 1fbd6f91..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/freeform.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/fuji_tv.png b/data/interfaces/default/images/media_flags/studio/fuji_tv.png
deleted file mode 100644
index 10d72a65..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/fuji_tv.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/future_flix.png b/data/interfaces/default/images/media_flags/studio/future_flix.png
deleted file mode 100644
index d7e0f5d4..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/future_flix.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/fx.png b/data/interfaces/default/images/media_flags/studio/fx.png
deleted file mode 100644
index e94598dc..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/fx.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/fxx.png b/data/interfaces/default/images/media_flags/studio/fxx.png
deleted file mode 100644
index 18acf89a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/fxx.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/g4.png b/data/interfaces/default/images/media_flags/studio/g4.png
deleted file mode 100644
index 27adf098..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/g4.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/gaumont.png b/data/interfaces/default/images/media_flags/studio/gaumont.png
deleted file mode 100644
index 9ea43461..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/gaumont.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/geffen.png b/data/interfaces/default/images/media_flags/studio/geffen.png
deleted file mode 100644
index a8e2f75b..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/geffen.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/ghost_house.png b/data/interfaces/default/images/media_flags/studio/ghost_house.png
deleted file mode 100644
index 840e86e7..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/ghost_house.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/gk_films.png b/data/interfaces/default/images/media_flags/studio/gk_films.png
deleted file mode 100644
index 45c2343b..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/gk_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/glass_eye_pix.png b/data/interfaces/default/images/media_flags/studio/glass_eye_pix.png
deleted file mode 100644
index 7bf1f8b1..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/glass_eye_pix.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/global_tv.png b/data/interfaces/default/images/media_flags/studio/global_tv.png
deleted file mode 100644
index dda68913..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/global_tv.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/glue_works_entertainment.png b/data/interfaces/default/images/media_flags/studio/glue_works_entertainment.png
deleted file mode 100644
index d9441eba..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/glue_works_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/gofilms.png b/data/interfaces/default/images/media_flags/studio/gofilms.png
deleted file mode 100644
index ab3bca07..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/gofilms.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/gold_circle_films.png b/data/interfaces/default/images/media_flags/studio/gold_circle_films.png
deleted file mode 100644
index ecd1ea03..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/gold_circle_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/goldwyn.png b/data/interfaces/default/images/media_flags/studio/goldwyn.png
deleted file mode 100644
index fc5d8f80..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/goldwyn.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/gracie_films.png b/data/interfaces/default/images/media_flags/studio/gracie_films.png
deleted file mode 100644
index 73394e70..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/gracie_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/gramercy_pictures.png b/data/interfaces/default/images/media_flags/studio/gramercy_pictures.png
deleted file mode 100644
index 613116b9..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/gramercy_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/grandhustle.png b/data/interfaces/default/images/media_flags/studio/grandhustle.png
deleted file mode 100644
index 28111775..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/grandhustle.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/green_street.png b/data/interfaces/default/images/media_flags/studio/green_street.png
deleted file mode 100644
index 3771e347..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/green_street.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/greentree_pictures.png b/data/interfaces/default/images/media_flags/studio/greentree_pictures.png
deleted file mode 100644
index 03855147..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/greentree_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/grub_street_productions.png b/data/interfaces/default/images/media_flags/studio/grub_street_productions.png
deleted file mode 100644
index a5a464f7..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/grub_street_productions.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/guinea_pig_films.png b/data/interfaces/default/images/media_flags/studio/guinea_pig_films.png
deleted file mode 100644
index 932fb8c7..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/guinea_pig_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/gutek.png b/data/interfaces/default/images/media_flags/studio/gutek.png
deleted file mode 100644
index 6b258ff9..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/gutek.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/halestorm.png b/data/interfaces/default/images/media_flags/studio/halestorm.png
deleted file mode 100644
index fb751935..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/halestorm.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/hallmark_channel.png b/data/interfaces/default/images/media_flags/studio/hallmark_channel.png
deleted file mode 100644
index b197b2d9..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/hallmark_channel.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/hallucination_on_film.png b/data/interfaces/default/images/media_flags/studio/hallucination_on_film.png
deleted file mode 100644
index 6e360efa..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/hallucination_on_film.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/hand_made_films.png b/data/interfaces/default/images/media_flags/studio/hand_made_films.png
deleted file mode 100644
index c896682b..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/hand_made_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/happy_madison.png b/data/interfaces/default/images/media_flags/studio/happy_madison.png
deleted file mode 100644
index 3ee4f0e1..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/happy_madison.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/hasbro.png b/data/interfaces/default/images/media_flags/studio/hasbro.png
deleted file mode 100644
index 29fab8f2..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/hasbro.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/hbo.png b/data/interfaces/default/images/media_flags/studio/hbo.png
deleted file mode 100644
index cfa5d9ad..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/hbo.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/hbo_films.png b/data/interfaces/default/images/media_flags/studio/hbo_films.png
deleted file mode 100644
index 2999fcdb..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/hbo_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/head_gear_films.png b/data/interfaces/default/images/media_flags/studio/head_gear_films.png
deleted file mode 100644
index 67fde5fb..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/head_gear_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/hemus_film.png b/data/interfaces/default/images/media_flags/studio/hemus_film.png
deleted file mode 100644
index f9d1700e..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/hemus_film.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/heyday_films.png b/data/interfaces/default/images/media_flags/studio/heyday_films.png
deleted file mode 100644
index 2dbff495..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/heyday_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/hgtv.png b/data/interfaces/default/images/media_flags/studio/hgtv.png
deleted file mode 100644
index c3efbb86..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/hgtv.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/history_channel.png b/data/interfaces/default/images/media_flags/studio/history_channel.png
deleted file mode 100644
index 55dda333..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/history_channel.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/hollywood_pictures.png b/data/interfaces/default/images/media_flags/studio/hollywood_pictures.png
deleted file mode 100644
index 3db665e0..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/hollywood_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/hopscotch_films.png b/data/interfaces/default/images/media_flags/studio/hopscotch_films.png
deleted file mode 100644
index aa4ea64e..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/hopscotch_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/hulu.png b/data/interfaces/default/images/media_flags/studio/hulu.png
deleted file mode 100644
index ca9c5ecc..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/hulu.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/hustler_video.png b/data/interfaces/default/images/media_flags/studio/hustler_video.png
deleted file mode 100644
index d6babc0f..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/hustler_video.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/hyde_park_entertainment.png b/data/interfaces/default/images/media_flags/studio/hyde_park_entertainment.png
deleted file mode 100644
index f6b0d188..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/hyde_park_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/icon_entertainment.png b/data/interfaces/default/images/media_flags/studio/icon_entertainment.png
deleted file mode 100644
index db4a9ed0..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/icon_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/ifc.png b/data/interfaces/default/images/media_flags/studio/ifc.png
deleted file mode 100644
index 9d02da39..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/ifc.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/illumination_entertainment.png b/data/interfaces/default/images/media_flags/studio/illumination_entertainment.png
deleted file mode 100644
index b217aa58..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/illumination_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/image.png b/data/interfaces/default/images/media_flags/studio/image.png
deleted file mode 100644
index 9106d0f9..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/image.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/image_movers.png b/data/interfaces/default/images/media_flags/studio/image_movers.png
deleted file mode 100644
index 4a3d39d6..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/image_movers.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/imagi_studios.png b/data/interfaces/default/images/media_flags/studio/imagi_studios.png
deleted file mode 100644
index 2445ccb0..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/imagi_studios.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/imaginary_forces.png b/data/interfaces/default/images/media_flags/studio/imaginary_forces.png
deleted file mode 100644
index aade8008..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/imaginary_forces.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/imagine.png b/data/interfaces/default/images/media_flags/studio/imagine.png
deleted file mode 100644
index 51b0d4de..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/imagine.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/imax.png b/data/interfaces/default/images/media_flags/studio/imax.png
deleted file mode 100644
index 820e80df..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/imax.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/imperial_entertainment.png b/data/interfaces/default/images/media_flags/studio/imperial_entertainment.png
deleted file mode 100644
index 4e645b84..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/imperial_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/independent_pictures.png b/data/interfaces/default/images/media_flags/studio/independent_pictures.png
deleted file mode 100644
index 91dc1f1b..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/independent_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/industrial_light_and_magic.png b/data/interfaces/default/images/media_flags/studio/industrial_light_and_magic.png
deleted file mode 100644
index 928dfa9f..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/industrial_light_and_magic.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/infilm.png b/data/interfaces/default/images/media_flags/studio/infilm.png
deleted file mode 100644
index b7e1baf1..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/infilm.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/ingenious_film_partners.png b/data/interfaces/default/images/media_flags/studio/ingenious_film_partners.png
deleted file mode 100644
index 60327393..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/ingenious_film_partners.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/ingenius_entertainment.png b/data/interfaces/default/images/media_flags/studio/ingenius_entertainment.png
deleted file mode 100644
index 8dd64180..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/ingenius_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/inside_track.png b/data/interfaces/default/images/media_flags/studio/inside_track.png
deleted file mode 100644
index 60f10532..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/inside_track.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/insurge_pictures.png b/data/interfaces/default/images/media_flags/studio/insurge_pictures.png
deleted file mode 100644
index 1ad2c598..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/insurge_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/interactual.png b/data/interfaces/default/images/media_flags/studio/interactual.png
deleted file mode 100644
index dda62e66..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/interactual.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/intermedia.png b/data/interfaces/default/images/media_flags/studio/intermedia.png
deleted file mode 100644
index 40778fc7..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/intermedia.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/interscope_shady_aftermath.png b/data/interfaces/default/images/media_flags/studio/interscope_shady_aftermath.png
deleted file mode 100644
index 1dbb2b12..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/interscope_shady_aftermath.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/intrepid_pictures.png b/data/interfaces/default/images/media_flags/studio/intrepid_pictures.png
deleted file mode 100644
index d6ab9154..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/intrepid_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/island_world.png b/data/interfaces/default/images/media_flags/studio/island_world.png
deleted file mode 100644
index 69730e9c..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/island_world.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/itv.png b/data/interfaces/default/images/media_flags/studio/itv.png
deleted file mode 100644
index e00948f5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/itv.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/janus.png b/data/interfaces/default/images/media_flags/studio/janus.png
deleted file mode 100644
index a4a96fc4..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/janus.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/jarowskij.png b/data/interfaces/default/images/media_flags/studio/jarowskij.png
deleted file mode 100644
index d487ed78..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/jarowskij.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/jawa.png b/data/interfaces/default/images/media_flags/studio/jawa.png
deleted file mode 100644
index 2267f4b8..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/jawa.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/jerry_bruckheimer_films.png b/data/interfaces/default/images/media_flags/studio/jerry_bruckheimer_films.png
deleted file mode 100644
index d1387877..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/jerry_bruckheimer_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/jersey_films.png b/data/interfaces/default/images/media_flags/studio/jersey_films.png
deleted file mode 100644
index 91766b48..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/jersey_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/jim_henson.png b/data/interfaces/default/images/media_flags/studio/jim_henson.png
deleted file mode 100644
index ca940fc5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/jim_henson.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/jj_splice.png b/data/interfaces/default/images/media_flags/studio/jj_splice.png
deleted file mode 100644
index 09bc120a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/jj_splice.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/kaboom_entertainment.png b/data/interfaces/default/images/media_flags/studio/kaboom_entertainment.png
deleted file mode 100644
index c2bc81ba..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/kaboom_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/kadokawa_pictures.png b/data/interfaces/default/images/media_flags/studio/kadokawa_pictures.png
deleted file mode 100644
index a239905b..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/kadokawa_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/kadr.png b/data/interfaces/default/images/media_flags/studio/kadr.png
deleted file mode 100644
index 16d76be4..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/kadr.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/kamera.png b/data/interfaces/default/images/media_flags/studio/kamera.png
deleted file mode 100644
index 52bb0a32..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/kamera.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/kanal_5.png b/data/interfaces/default/images/media_flags/studio/kanal_5.png
deleted file mode 100644
index b9bba37e..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/kanal_5.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/kennedymarshall.png b/data/interfaces/default/images/media_flags/studio/kennedymarshall.png
deleted file mode 100644
index 6195caff..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/kennedymarshall.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/kid_rhino.png b/data/interfaces/default/images/media_flags/studio/kid_rhino.png
deleted file mode 100644
index 69914dca..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/kid_rhino.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/killer_films.png b/data/interfaces/default/images/media_flags/studio/killer_films.png
deleted file mode 100644
index 921dd182..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/killer_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/kinepolis.png b/data/interfaces/default/images/media_flags/studio/kinepolis.png
deleted file mode 100644
index 062274e6..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/kinepolis.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/king_world.png b/data/interfaces/default/images/media_flags/studio/king_world.png
deleted file mode 100644
index cbad9498..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/king_world.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/kinowelt.png b/data/interfaces/default/images/media_flags/studio/kinowelt.png
deleted file mode 100644
index e25f2c83..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/kinowelt.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/konami.png b/data/interfaces/default/images/media_flags/studio/konami.png
deleted file mode 100644
index 054d320e..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/konami.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/kopelson.png b/data/interfaces/default/images/media_flags/studio/kopelson.png
deleted file mode 100644
index 0cebf892..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/kopelson.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/kyoto_animation.png b/data/interfaces/default/images/media_flags/studio/kyoto_animation.png
deleted file mode 100644
index 637621b4..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/kyoto_animation.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/ladd.png b/data/interfaces/default/images/media_flags/studio/ladd.png
deleted file mode 100644
index 9e1ed603..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/ladd.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/lakeshore_entertainment.png b/data/interfaces/default/images/media_flags/studio/lakeshore_entertainment.png
deleted file mode 100644
index 166b0bfc..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/lakeshore_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/latham.png b/data/interfaces/default/images/media_flags/studio/latham.png
deleted file mode 100644
index 87792ced..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/latham.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/lawrence_bender_productions.png b/data/interfaces/default/images/media_flags/studio/lawrence_bender_productions.png
deleted file mode 100644
index 0588aab0..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/lawrence_bender_productions.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/league of noble peers.png b/data/interfaces/default/images/media_flags/studio/league of noble peers.png
deleted file mode 100644
index f7f99cd4..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/league of noble peers.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/legendary_pictures.png b/data/interfaces/default/images/media_flags/studio/legendary_pictures.png
deleted file mode 100644
index 14d906cf..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/legendary_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/lego.png b/data/interfaces/default/images/media_flags/studio/lego.png
deleted file mode 100644
index 0f695471..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/lego.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/liberty_films.png b/data/interfaces/default/images/media_flags/studio/liberty_films.png
deleted file mode 100644
index a23d0d76..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/liberty_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/lifetime.png b/data/interfaces/default/images/media_flags/studio/lifetime.png
deleted file mode 100644
index f6abd7bb..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/lifetime.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/lift.png b/data/interfaces/default/images/media_flags/studio/lift.png
deleted file mode 100644
index 7fe0318a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/lift.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/lightstorm_entertainment.png b/data/interfaces/default/images/media_flags/studio/lightstorm_entertainment.png
deleted file mode 100644
index 4a7ade60..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/lightstorm_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/lionsgate.png b/data/interfaces/default/images/media_flags/studio/lionsgate.png
deleted file mode 100644
index 91e7c806..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/lionsgate.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/little_chicken.png b/data/interfaces/default/images/media_flags/studio/little_chicken.png
deleted file mode 100644
index 8a3c7cac..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/little_chicken.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/london_films.png b/data/interfaces/default/images/media_flags/studio/london_films.png
deleted file mode 100644
index 6d3f1af3..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/london_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/lookout.png b/data/interfaces/default/images/media_flags/studio/lookout.png
deleted file mode 100644
index 68dc9b66..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/lookout.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/lucasfilm.png b/data/interfaces/default/images/media_flags/studio/lucasfilm.png
deleted file mode 100644
index 5e1c677d..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/lucasfilm.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/lucky_7.png b/data/interfaces/default/images/media_flags/studio/lucky_7.png
deleted file mode 100644
index 4eae3157..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/lucky_7.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/m6.png b/data/interfaces/default/images/media_flags/studio/m6.png
deleted file mode 100644
index dc125bcf..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/m6.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/madhouse.png b/data/interfaces/default/images/media_flags/studio/madhouse.png
deleted file mode 100644
index 262032e4..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/madhouse.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/madman.png b/data/interfaces/default/images/media_flags/studio/madman.png
deleted file mode 100644
index 0d0259c0..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/madman.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/magnolia_pictures.png b/data/interfaces/default/images/media_flags/studio/magnolia_pictures.png
deleted file mode 100644
index f9ed0deb..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/magnolia_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/mandalay_pictures.png b/data/interfaces/default/images/media_flags/studio/mandalay_pictures.png
deleted file mode 100644
index e0f8ca33..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/mandalay_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/mandate_pictures.png b/data/interfaces/default/images/media_flags/studio/mandate_pictures.png
deleted file mode 100644
index 18e8b7c7..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/mandate_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/manga.png b/data/interfaces/default/images/media_flags/studio/manga.png
deleted file mode 100644
index 7111dfe1..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/manga.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/marc_dorcel.png b/data/interfaces/default/images/media_flags/studio/marc_dorcel.png
deleted file mode 100644
index a87cc990..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/marc_dorcel.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/marvel.png b/data/interfaces/default/images/media_flags/studio/marvel.png
deleted file mode 100644
index 50aaf30a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/marvel.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/maverick.png b/data/interfaces/default/images/media_flags/studio/maverick.png
deleted file mode 100644
index 9b5eb9db..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/maverick.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/maya_entertainment.png b/data/interfaces/default/images/media_flags/studio/maya_entertainment.png
deleted file mode 100644
index 0d2abcb6..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/maya_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/mbs.png b/data/interfaces/default/images/media_flags/studio/mbs.png
deleted file mode 100644
index 14253292..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/mbs.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/media8.png b/data/interfaces/default/images/media_flags/studio/media8.png
deleted file mode 100644
index bcf90b0e..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/media8.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/mediapro.png b/data/interfaces/default/images/media_flags/studio/mediapro.png
deleted file mode 100644
index 6731475b..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/mediapro.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/meridian_films.png b/data/interfaces/default/images/media_flags/studio/meridian_films.png
deleted file mode 100644
index f8b5e18a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/meridian_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/mgm.png b/data/interfaces/default/images/media_flags/studio/mgm.png
deleted file mode 100644
index 017c1a02..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/mgm.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/mibac.png b/data/interfaces/default/images/media_flags/studio/mibac.png
deleted file mode 100644
index 568eab4d..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/mibac.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/midway_pictures.png b/data/interfaces/default/images/media_flags/studio/midway_pictures.png
deleted file mode 100644
index fee131e1..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/midway_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/mike_zoss_productions.png b/data/interfaces/default/images/media_flags/studio/mike_zoss_productions.png
deleted file mode 100644
index 7c25922f..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/mike_zoss_productions.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/milkshake.png b/data/interfaces/default/images/media_flags/studio/milkshake.png
deleted file mode 100644
index c35b9747..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/milkshake.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/millennium_films.png b/data/interfaces/default/images/media_flags/studio/millennium_films.png
deleted file mode 100644
index 2bbac300..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/millennium_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/minds_eye_entertainment.png b/data/interfaces/default/images/media_flags/studio/minds_eye_entertainment.png
deleted file mode 100644
index 2ab1832a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/minds_eye_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/mirage.png b/data/interfaces/default/images/media_flags/studio/mirage.png
deleted file mode 100644
index 804a2194..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/mirage.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/miramax.png b/data/interfaces/default/images/media_flags/studio/miramax.png
deleted file mode 100644
index 6f24ac8f..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/miramax.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/momentum_pictures.png b/data/interfaces/default/images/media_flags/studio/momentum_pictures.png
deleted file mode 100644
index f14d1230..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/momentum_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/monarch_pictures.png b/data/interfaces/default/images/media_flags/studio/monarch_pictures.png
deleted file mode 100644
index e3ec96aa..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/monarch_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/monolith.png b/data/interfaces/default/images/media_flags/studio/monolith.png
deleted file mode 100644
index fb2b673d..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/monolith.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/montecito_picture_company.png b/data/interfaces/default/images/media_flags/studio/montecito_picture_company.png
deleted file mode 100644
index 34c8893b..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/montecito_picture_company.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/morgan_creek.png b/data/interfaces/default/images/media_flags/studio/morgan_creek.png
deleted file mode 100644
index 7acc99f1..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/morgan_creek.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/mosaic_media.png b/data/interfaces/default/images/media_flags/studio/mosaic_media.png
deleted file mode 100644
index c86719be..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/mosaic_media.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/mosfilm.png b/data/interfaces/default/images/media_flags/studio/mosfilm.png
deleted file mode 100644
index 5b903269..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/mosfilm.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/mpca.png b/data/interfaces/default/images/media_flags/studio/mpca.png
deleted file mode 100644
index 625b02c1..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/mpca.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/msnbc.png b/data/interfaces/default/images/media_flags/studio/msnbc.png
deleted file mode 100644
index 6ab945f3..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/msnbc.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/mtv.png b/data/interfaces/default/images/media_flags/studio/mtv.png
deleted file mode 100644
index c3e284a2..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/mtv.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/mtv3.png b/data/interfaces/default/images/media_flags/studio/mtv3.png
deleted file mode 100644
index 3932c9c5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/mtv3.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/musashi_films.png b/data/interfaces/default/images/media_flags/studio/musashi_films.png
deleted file mode 100644
index 62ae33bf..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/musashi_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/mutual_film_company.png b/data/interfaces/default/images/media_flags/studio/mutual_film_company.png
deleted file mode 100644
index 92a2dcd3..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/mutual_film_company.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/myriad.png b/data/interfaces/default/images/media_flags/studio/myriad.png
deleted file mode 100644
index 1377f441..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/myriad.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/mytv.png b/data/interfaces/default/images/media_flags/studio/mytv.png
deleted file mode 100644
index d06cbeef..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/mytv.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/nala.png b/data/interfaces/default/images/media_flags/studio/nala.png
deleted file mode 100644
index d5fd973d..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/nala.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/nat_geo_wild.png b/data/interfaces/default/images/media_flags/studio/nat_geo_wild.png
deleted file mode 100644
index 15ecfa80..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/nat_geo_wild.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/national_general_pictures.png b/data/interfaces/default/images/media_flags/studio/national_general_pictures.png
deleted file mode 100644
index 4285a2f8..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/national_general_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/nbc.png b/data/interfaces/default/images/media_flags/studio/nbc.png
deleted file mode 100644
index b4653dea..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/nbc.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/nbc_universal.png b/data/interfaces/default/images/media_flags/studio/nbc_universal.png
deleted file mode 100644
index 55e0fd68..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/nbc_universal.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/nelvana.png b/data/interfaces/default/images/media_flags/studio/nelvana.png
deleted file mode 100644
index 8a945529..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/nelvana.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/netflix.png b/data/interfaces/default/images/media_flags/studio/netflix.png
deleted file mode 100644
index 869b833a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/netflix.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/new_deal_entertainment.png b/data/interfaces/default/images/media_flags/studio/new_deal_entertainment.png
deleted file mode 100644
index c19d584f..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/new_deal_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/new_line_cinema.png b/data/interfaces/default/images/media_flags/studio/new_line_cinema.png
deleted file mode 100644
index ddf7a9c2..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/new_line_cinema.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/new_zealand_film_commission.png b/data/interfaces/default/images/media_flags/studio/new_zealand_film_commission.png
deleted file mode 100644
index 9cfac285..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/new_zealand_film_commission.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/newmarket.png b/data/interfaces/default/images/media_flags/studio/newmarket.png
deleted file mode 100644
index f76ade93..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/newmarket.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/ngc.png b/data/interfaces/default/images/media_flags/studio/ngc.png
deleted file mode 100644
index 833e2877..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/ngc.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/nick_at_nite.png b/data/interfaces/default/images/media_flags/studio/nick_at_nite.png
deleted file mode 100644
index 8878ac0b..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/nick_at_nite.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/nick_jr.png b/data/interfaces/default/images/media_flags/studio/nick_jr.png
deleted file mode 100644
index 451ef185..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/nick_jr.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/nickelodeon.png b/data/interfaces/default/images/media_flags/studio/nickelodeon.png
deleted file mode 100644
index 02b94739..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/nickelodeon.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/nicktoons.png b/data/interfaces/default/images/media_flags/studio/nicktoons.png
deleted file mode 100644
index 1153e7d0..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/nicktoons.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/nine network.png b/data/interfaces/default/images/media_flags/studio/nine network.png
deleted file mode 100644
index 4a581fd3..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/nine network.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/nord_ouest.png b/data/interfaces/default/images/media_flags/studio/nord_ouest.png
deleted file mode 100644
index cd7e45c4..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/nord_ouest.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/nordisk film.png b/data/interfaces/default/images/media_flags/studio/nordisk film.png
deleted file mode 100644
index 3b3dd6ea..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/nordisk film.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/northern_lights_entertainment.png b/data/interfaces/default/images/media_flags/studio/northern_lights_entertainment.png
deleted file mode 100644
index 7309fa53..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/northern_lights_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/nothing.png b/data/interfaces/default/images/media_flags/studio/nothing.png
deleted file mode 100644
index d1bb705f..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/nothing.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/nrk1.png b/data/interfaces/default/images/media_flags/studio/nrk1.png
deleted file mode 100644
index d34d1d0c..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/nrk1.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/nuimage.png b/data/interfaces/default/images/media_flags/studio/nuimage.png
deleted file mode 100644
index 43a2596b..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/nuimage.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/o2_filmes.png b/data/interfaces/default/images/media_flags/studio/o2_filmes.png
deleted file mode 100644
index 5c49f3be..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/o2_filmes.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/oddlot.png b/data/interfaces/default/images/media_flags/studio/oddlot.png
deleted file mode 100644
index b06be305..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/oddlot.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/oko.png b/data/interfaces/default/images/media_flags/studio/oko.png
deleted file mode 100644
index 1be7e351..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/oko.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/only_vegas.png b/data/interfaces/default/images/media_flags/studio/only_vegas.png
deleted file mode 100644
index 0a50dd44..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/only_vegas.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/oprah_winfrey_network.png b/data/interfaces/default/images/media_flags/studio/oprah_winfrey_network.png
deleted file mode 100644
index fdac122d..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/oprah_winfrey_network.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/orf.png b/data/interfaces/default/images/media_flags/studio/orf.png
deleted file mode 100644
index d10c4c9a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/orf.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/orion.png b/data/interfaces/default/images/media_flags/studio/orion.png
deleted file mode 100644
index 53bb6842..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/orion.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/overturefilms.png b/data/interfaces/default/images/media_flags/studio/overturefilms.png
deleted file mode 100644
index 699accc0..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/overturefilms.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/pa_works.png b/data/interfaces/default/images/media_flags/studio/pa_works.png
deleted file mode 100644
index 866e807d..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/pa_works.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/pan_vision.png b/data/interfaces/default/images/media_flags/studio/pan_vision.png
deleted file mode 100644
index af729ee8..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/pan_vision.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/pandora_film.png b/data/interfaces/default/images/media_flags/studio/pandora_film.png
deleted file mode 100644
index 5f1a6664..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/pandora_film.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/paramount_classics.png b/data/interfaces/default/images/media_flags/studio/paramount_classics.png
deleted file mode 100644
index 5934be36..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/paramount_classics.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/paramount_pictures.png b/data/interfaces/default/images/media_flags/studio/paramount_pictures.png
deleted file mode 100644
index e40f5dda..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/paramount_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/paramount_vantage.png b/data/interfaces/default/images/media_flags/studio/paramount_vantage.png
deleted file mode 100644
index f4ab942f..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/paramount_vantage.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/participant.png b/data/interfaces/default/images/media_flags/studio/participant.png
deleted file mode 100644
index 280b3cde..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/participant.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/pathe.png b/data/interfaces/default/images/media_flags/studio/pathe.png
deleted file mode 100644
index 6cb91a08..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/pathe.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/pbs.png b/data/interfaces/default/images/media_flags/studio/pbs.png
deleted file mode 100644
index d9e4abd3..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/pbs.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/peacearch.png b/data/interfaces/default/images/media_flags/studio/peacearch.png
deleted file mode 100644
index 23b29f3d..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/peacearch.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/pecf.png b/data/interfaces/default/images/media_flags/studio/pecf.png
deleted file mode 100644
index 309c3d02..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/pecf.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/peters_entertainment2.png b/data/interfaces/default/images/media_flags/studio/peters_entertainment2.png
deleted file mode 100644
index 989347b5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/peters_entertainment2.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/phase_4_films.png b/data/interfaces/default/images/media_flags/studio/phase_4_films.png
deleted file mode 100644
index d9a75137..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/phase_4_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/pheonix.png b/data/interfaces/default/images/media_flags/studio/pheonix.png
deleted file mode 100644
index cbf0c03b..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/pheonix.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/picturehouse.png b/data/interfaces/default/images/media_flags/studio/picturehouse.png
deleted file mode 100644
index 7e007eb5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/picturehouse.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/pisf.png b/data/interfaces/default/images/media_flags/studio/pisf.png
deleted file mode 100644
index 1e40b8fd..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/pisf.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/pixar.png b/data/interfaces/default/images/media_flags/studio/pixar.png
deleted file mode 100644
index f7c1e7fc..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/pixar.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/plan_b.png b/data/interfaces/default/images/media_flags/studio/plan_b.png
deleted file mode 100644
index 3726cc5b..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/plan_b.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/platige.png b/data/interfaces/default/images/media_flags/studio/platige.png
deleted file mode 100644
index 9f612e7a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/platige.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/platinum_dunes.png b/data/interfaces/default/images/media_flags/studio/platinum_dunes.png
deleted file mode 100644
index c15ef757..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/platinum_dunes.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/play_uk.png b/data/interfaces/default/images/media_flags/studio/play_uk.png
deleted file mode 100644
index ecdc6040..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/play_uk.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/playstation_network.png b/data/interfaces/default/images/media_flags/studio/playstation_network.png
deleted file mode 100644
index 72c05764..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/playstation_network.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/playtone.png b/data/interfaces/default/images/media_flags/studio/playtone.png
deleted file mode 100644
index b3b2e57c..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/playtone.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/polsat.png b/data/interfaces/default/images/media_flags/studio/polsat.png
deleted file mode 100644
index 9e6fad94..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/polsat.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/polygram.png b/data/interfaces/default/images/media_flags/studio/polygram.png
deleted file mode 100644
index d8cc9764..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/polygram.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/pop.png b/data/interfaces/default/images/media_flags/studio/pop.png
deleted file mode 100644
index 24b4802a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/pop.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/porchlight.png b/data/interfaces/default/images/media_flags/studio/porchlight.png
deleted file mode 100644
index 30340134..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/porchlight.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/portman_film.png b/data/interfaces/default/images/media_flags/studio/portman_film.png
deleted file mode 100644
index e9006673..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/portman_film.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/premiere direkt.png b/data/interfaces/default/images/media_flags/studio/premiere direkt.png
deleted file mode 100644
index 70e1c874..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/premiere direkt.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/premiere.png b/data/interfaces/default/images/media_flags/studio/premiere.png
deleted file mode 100644
index 1b12d671..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/premiere.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/private_pictures.png b/data/interfaces/default/images/media_flags/studio/private_pictures.png
deleted file mode 100644
index 5b15f7cc..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/private_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/pro7.png b/data/interfaces/default/images/media_flags/studio/pro7.png
deleted file mode 100644
index 5904c4f9..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/pro7.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/production_i_g.png b/data/interfaces/default/images/media_flags/studio/production_i_g.png
deleted file mode 100644
index e3622cb1..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/production_i_g.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/profilm_productions.png b/data/interfaces/default/images/media_flags/studio/profilm_productions.png
deleted file mode 100644
index c817e7f1..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/profilm_productions.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/promotion_pictures.png b/data/interfaces/default/images/media_flags/studio/promotion_pictures.png
deleted file mode 100644
index e82ad26a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/promotion_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/prosieben.png b/data/interfaces/default/images/media_flags/studio/prosieben.png
deleted file mode 100644
index 5904c4f9..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/prosieben.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/radical_media.png b/data/interfaces/default/images/media_flags/studio/radical_media.png
deleted file mode 100644
index 860f9945..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/radical_media.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/rai_cinema.png b/data/interfaces/default/images/media_flags/studio/rai_cinema.png
deleted file mode 100644
index 0b7c07f4..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/rai_cinema.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/rankin.png b/data/interfaces/default/images/media_flags/studio/rankin.png
deleted file mode 100644
index 5d4ea3db..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/rankin.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/ratpac_dune_entertainment.png b/data/interfaces/default/images/media_flags/studio/ratpac_dune_entertainment.png
deleted file mode 100644
index 41dcb7b5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/ratpac_dune_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/ratpac_entertainment.png b/data/interfaces/default/images/media_flags/studio/ratpac_entertainment.png
deleted file mode 100644
index a3728248..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/ratpac_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/red_hour.png b/data/interfaces/default/images/media_flags/studio/red_hour.png
deleted file mode 100644
index 10795b35..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/red_hour.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/red_wagon_entertainment.png b/data/interfaces/default/images/media_flags/studio/red_wagon_entertainment.png
deleted file mode 100644
index ea1f0626..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/red_wagon_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/redrum.png b/data/interfaces/default/images/media_flags/studio/redrum.png
deleted file mode 100644
index 6ec2b1fb..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/redrum.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/reel_dog_productions.png b/data/interfaces/default/images/media_flags/studio/reel_dog_productions.png
deleted file mode 100644
index fde7afcc..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/reel_dog_productions.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/regency.png b/data/interfaces/default/images/media_flags/studio/regency.png
deleted file mode 100644
index 436273f2..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/regency.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/relativity_media.png b/data/interfaces/default/images/media_flags/studio/relativity_media.png
deleted file mode 100644
index ddf671e5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/relativity_media.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/renaissance_films.png b/data/interfaces/default/images/media_flags/studio/renaissance_films.png
deleted file mode 100644
index 16ee415a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/renaissance_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/republic_pictures.png b/data/interfaces/default/images/media_flags/studio/republic_pictures.png
deleted file mode 100644
index f48a57fa..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/republic_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/resident_evil.png b/data/interfaces/default/images/media_flags/studio/resident_evil.png
deleted file mode 100644
index 5124a8f1..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/resident_evil.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/revere_pictures.png b/data/interfaces/default/images/media_flags/studio/revere_pictures.png
deleted file mode 100644
index bf2620da..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/revere_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/revision3.png b/data/interfaces/default/images/media_flags/studio/revision3.png
deleted file mode 100644
index 54e1fc38..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/revision3.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/revolution_studios.png b/data/interfaces/default/images/media_flags/studio/revolution_studios.png
deleted file mode 100644
index f0511a11..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/revolution_studios.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/rhombus.png b/data/interfaces/default/images/media_flags/studio/rhombus.png
deleted file mode 100644
index 51d60d4a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/rhombus.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/rick_mill.png b/data/interfaces/default/images/media_flags/studio/rick_mill.png
deleted file mode 100644
index 900b85cd..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/rick_mill.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/rickety_shack_films.png b/data/interfaces/default/images/media_flags/studio/rickety_shack_films.png
deleted file mode 100644
index 3bebcbd1..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/rickety_shack_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/river_road_entertainment.png b/data/interfaces/default/images/media_flags/studio/river_road_entertainment.png
deleted file mode 100644
index b6b5d854..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/river_road_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/rko_radio_pictures.png b/data/interfaces/default/images/media_flags/studio/rko_radio_pictures.png
deleted file mode 100644
index bf1382e7..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/rko_radio_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/roadside_attractions.png b/data/interfaces/default/images/media_flags/studio/roadside_attractions.png
deleted file mode 100644
index 758cc039..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/roadside_attractions.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/rogue_pictures.png b/data/interfaces/default/images/media_flags/studio/rogue_pictures.png
deleted file mode 100644
index 4c7e536f..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/rogue_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/romar.png b/data/interfaces/default/images/media_flags/studio/romar.png
deleted file mode 100644
index 7281db42..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/romar.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/rte_one.png b/data/interfaces/default/images/media_flags/studio/rte_one.png
deleted file mode 100644
index d1e6403f..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/rte_one.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/rtl.png b/data/interfaces/default/images/media_flags/studio/rtl.png
deleted file mode 100644
index eaa07c48..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/rtl.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/rtl4.png b/data/interfaces/default/images/media_flags/studio/rtl4.png
deleted file mode 100644
index b861a93c..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/rtl4.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/rtl5.png b/data/interfaces/default/images/media_flags/studio/rtl5.png
deleted file mode 100644
index f9b208be..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/rtl5.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/rtl7.png b/data/interfaces/default/images/media_flags/studio/rtl7.png
deleted file mode 100644
index 2f622b02..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/rtl7.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/rtl8.png b/data/interfaces/default/images/media_flags/studio/rtl8.png
deleted file mode 100644
index 99bf9b29..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/rtl8.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/rtl_ii.png b/data/interfaces/default/images/media_flags/studio/rtl_ii.png
deleted file mode 100644
index 9d0d7e29..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/rtl_ii.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/rysher_entertainment.png b/data/interfaces/default/images/media_flags/studio/rysher_entertainment.png
deleted file mode 100644
index f9c07b82..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/rysher_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/saban.png b/data/interfaces/default/images/media_flags/studio/saban.png
deleted file mode 100644
index aae809c5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/saban.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/salter_street_films.png b/data/interfaces/default/images/media_flags/studio/salter_street_films.png
deleted file mode 100644
index e2d766e5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/salter_street_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/sandrew.png b/data/interfaces/default/images/media_flags/studio/sandrew.png
deleted file mode 100644
index b35017d5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/sandrew.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/sat1.png b/data/interfaces/default/images/media_flags/studio/sat1.png
deleted file mode 100644
index c4a21a56..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/sat1.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/saturn_films.png b/data/interfaces/default/images/media_flags/studio/saturn_films.png
deleted file mode 100644
index 18c28e51..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/saturn_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/saul_zaentz.png b/data/interfaces/default/images/media_flags/studio/saul_zaentz.png
deleted file mode 100644
index 3a6b4090..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/saul_zaentz.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/sbs.png b/data/interfaces/default/images/media_flags/studio/sbs.png
deleted file mode 100644
index ea63f1c2..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/sbs.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/scholastic.png b/data/interfaces/default/images/media_flags/studio/scholastic.png
deleted file mode 100644
index a4b050ef..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/scholastic.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/scifi.png b/data/interfaces/default/images/media_flags/studio/scifi.png
deleted file mode 100644
index ef5d9a1d..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/scifi.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/scott_free.png b/data/interfaces/default/images/media_flags/studio/scott_free.png
deleted file mode 100644
index 736e0615..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/scott_free.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/screen_australia.png b/data/interfaces/default/images/media_flags/studio/screen_australia.png
deleted file mode 100644
index a170c6f4..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/screen_australia.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/screen_gems.png b/data/interfaces/default/images/media_flags/studio/screen_gems.png
deleted file mode 100644
index a4f3bbe6..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/screen_gems.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/seeso.png b/data/interfaces/default/images/media_flags/studio/seeso.png
deleted file mode 100644
index e4ca56d5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/seeso.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/selznick_pictures.png b/data/interfaces/default/images/media_flags/studio/selznick_pictures.png
deleted file mode 100644
index dda675e4..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/selznick_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/semafor.png b/data/interfaces/default/images/media_flags/studio/semafor.png
deleted file mode 100644
index 692355dc..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/semafor.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/seven network.png b/data/interfaces/default/images/media_flags/studio/seven network.png
deleted file mode 100644
index c9c620d3..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/seven network.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/sfi.png b/data/interfaces/default/images/media_flags/studio/sfi.png
deleted file mode 100644
index 32f7042c..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/sfi.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/shady_acres_entertainment.png b/data/interfaces/default/images/media_flags/studio/shady_acres_entertainment.png
deleted file mode 100644
index d30752be..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/shady_acres_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/shaft.png b/data/interfaces/default/images/media_flags/studio/shaft.png
deleted file mode 100644
index fa782c62..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/shaft.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/shangri-la_entertainment.png b/data/interfaces/default/images/media_flags/studio/shangri-la_entertainment.png
deleted file mode 100644
index 45e224ae..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/shangri-la_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/shout_factory.png b/data/interfaces/default/images/media_flags/studio/shout_factory.png
deleted file mode 100644
index 5ded67bb..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/shout_factory.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/showcase.png b/data/interfaces/default/images/media_flags/studio/showcase.png
deleted file mode 100644
index e4546100..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/showcase.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/showcase_au.png b/data/interfaces/default/images/media_flags/studio/showcase_au.png
deleted file mode 100644
index 8ada90e8..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/showcase_au.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/showtime.png b/data/interfaces/default/images/media_flags/studio/showtime.png
deleted file mode 100644
index c92b0a4e..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/showtime.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/sidney_kimmel.png b/data/interfaces/default/images/media_flags/studio/sidney_kimmel.png
deleted file mode 100644
index 835e3626..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/sidney_kimmel.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/silver_pictures.png b/data/interfaces/default/images/media_flags/studio/silver_pictures.png
deleted file mode 100644
index e35e5d57..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/silver_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/sky.png b/data/interfaces/default/images/media_flags/studio/sky.png
deleted file mode 100644
index 3f582621..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/sky.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/sky_1.png b/data/interfaces/default/images/media_flags/studio/sky_1.png
deleted file mode 100644
index 0aedb3e8..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/sky_1.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/skydance_productions.png b/data/interfaces/default/images/media_flags/studio/skydance_productions.png
deleted file mode 100644
index 31ac3f18..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/skydance_productions.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/slim_films.png b/data/interfaces/default/images/media_flags/studio/slim_films.png
deleted file mode 100644
index 1a146a02..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/slim_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/smc.png b/data/interfaces/default/images/media_flags/studio/smc.png
deleted file mode 100644
index 94600e72..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/smc.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/snl_studios.png b/data/interfaces/default/images/media_flags/studio/snl_studios.png
deleted file mode 100644
index 00bb39f8..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/snl_studios.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/sobini_films.png b/data/interfaces/default/images/media_flags/studio/sobini_films.png
deleted file mode 100644
index b6d3436a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/sobini_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/sony.png b/data/interfaces/default/images/media_flags/studio/sony.png
deleted file mode 100644
index b58aabae..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/sony.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/sony_pictures.png b/data/interfaces/default/images/media_flags/studio/sony_pictures.png
deleted file mode 100644
index b58aabae..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/sony_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/sony_pictures_animation.png b/data/interfaces/default/images/media_flags/studio/sony_pictures_animation.png
deleted file mode 100644
index a8c732cc..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/sony_pictures_animation.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/space.png b/data/interfaces/default/images/media_flags/studio/space.png
deleted file mode 100644
index 4a0e24ab..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/space.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/spelling_films.png b/data/interfaces/default/images/media_flags/studio/spelling_films.png
deleted file mode 100644
index 0560ed85..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/spelling_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/spike.png b/data/interfaces/default/images/media_flags/studio/spike.png
deleted file mode 100644
index 3fb70868..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/spike.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/spitfire_pictures.png b/data/interfaces/default/images/media_flags/studio/spitfire_pictures.png
deleted file mode 100644
index 086a7f4b..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/spitfire_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/splendid.png b/data/interfaces/default/images/media_flags/studio/splendid.png
deleted file mode 100644
index 9c449a3e..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/splendid.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/spyglass_entertainment.png b/data/interfaces/default/images/media_flags/studio/spyglass_entertainment.png
deleted file mode 100644
index a7d7026d..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/spyglass_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/squareenix.png b/data/interfaces/default/images/media_flags/studio/squareenix.png
deleted file mode 100644
index 60fee92d..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/squareenix.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/stage6.png b/data/interfaces/default/images/media_flags/studio/stage6.png
deleted file mode 100644
index c5fa11b2..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/stage6.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/stan.png b/data/interfaces/default/images/media_flags/studio/stan.png
deleted file mode 100644
index 6e229e52..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/stan.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/starbucks_entertainment.png b/data/interfaces/default/images/media_flags/studio/starbucks_entertainment.png
deleted file mode 100644
index aaf3c8e0..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/starbucks_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/starz.png b/data/interfaces/default/images/media_flags/studio/starz.png
deleted file mode 100644
index 1737ceac..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/starz.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/steele.png b/data/interfaces/default/images/media_flags/studio/steele.png
deleted file mode 100644
index d2aadcbf..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/steele.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/storyline.png b/data/interfaces/default/images/media_flags/studio/storyline.png
deleted file mode 100644
index 0ee21d89..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/storyline.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/studio_canal.png b/data/interfaces/default/images/media_flags/studio/studio_canal.png
deleted file mode 100644
index b0533443..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/studio_canal.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/studio_ghibli.png b/data/interfaces/default/images/media_flags/studio/studio_ghibli.png
deleted file mode 100644
index ab13b5a5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/studio_ghibli.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/summit.png b/data/interfaces/default/images/media_flags/studio/summit.png
deleted file mode 100644
index d4099701..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/summit.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/sundancetv.png b/data/interfaces/default/images/media_flags/studio/sundancetv.png
deleted file mode 100644
index 3b4a6fb9..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/sundancetv.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/sunrise.png b/data/interfaces/default/images/media_flags/studio/sunrise.png
deleted file mode 100644
index ebbd9cc7..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/sunrise.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/super_channel.png b/data/interfaces/default/images/media_flags/studio/super_channel.png
deleted file mode 100644
index 1c840cbf..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/super_channel.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/svensk_filmindustri.png b/data/interfaces/default/images/media_flags/studio/svensk_filmindustri.png
deleted file mode 100644
index 3f1bebc0..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/svensk_filmindustri.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/svt.png b/data/interfaces/default/images/media_flags/studio/svt.png
deleted file mode 100644
index fa10d579..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/svt.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/svt1.png b/data/interfaces/default/images/media_flags/studio/svt1.png
deleted file mode 100644
index f536aa45..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/svt1.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/svt2.png b/data/interfaces/default/images/media_flags/studio/svt2.png
deleted file mode 100644
index 1e2901af..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/svt2.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/syfy.png b/data/interfaces/default/images/media_flags/studio/syfy.png
deleted file mode 100644
index bb8da0d9..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/syfy.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/syncopy.png b/data/interfaces/default/images/media_flags/studio/syncopy.png
deleted file mode 100644
index a26b8944..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/syncopy.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/syrena.png b/data/interfaces/default/images/media_flags/studio/syrena.png
deleted file mode 100644
index 09272817..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/syrena.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/tandem.png b/data/interfaces/default/images/media_flags/studio/tandem.png
deleted file mode 100644
index fb498793..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/tandem.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/taurus_film.png b/data/interfaces/default/images/media_flags/studio/taurus_film.png
deleted file mode 100644
index c6546a84..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/taurus_film.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/tbs.png b/data/interfaces/default/images/media_flags/studio/tbs.png
deleted file mode 100644
index 74209c52..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/tbs.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/telecinco.png b/data/interfaces/default/images/media_flags/studio/telecinco.png
deleted file mode 100644
index 217d5d18..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/telecinco.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/telemundo.png b/data/interfaces/default/images/media_flags/studio/telemundo.png
deleted file mode 100644
index 05e58ab1..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/telemundo.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/teletoon.png b/data/interfaces/default/images/media_flags/studio/teletoon.png
deleted file mode 100644
index c137e63e..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/teletoon.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/telos.png b/data/interfaces/default/images/media_flags/studio/telos.png
deleted file mode 100644
index 2e8f432f..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/telos.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/tf1.png b/data/interfaces/default/images/media_flags/studio/tf1.png
deleted file mode 100644
index 897411c9..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/tf1.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/the_cw.png b/data/interfaces/default/images/media_flags/studio/the_cw.png
deleted file mode 100644
index ae5a8ed4..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/the_cw.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/the_entertainment_group.png b/data/interfaces/default/images/media_flags/studio/the_entertainment_group.png
deleted file mode 100644
index 9f7647ca..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/the_entertainment_group.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/the_film_foundry.png b/data/interfaces/default/images/media_flags/studio/the_film_foundry.png
deleted file mode 100644
index 90133d89..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/the_film_foundry.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/the_hub.png b/data/interfaces/default/images/media_flags/studio/the_hub.png
deleted file mode 100644
index 8b10991f..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/the_hub.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/the_independent_film_channel.png b/data/interfaces/default/images/media_flags/studio/the_independent_film_channel.png
deleted file mode 100644
index b55bf7dd..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/the_independent_film_channel.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/the_wb.png b/data/interfaces/default/images/media_flags/studio/the_wb.png
deleted file mode 100644
index d2ae817b..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/the_wb.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/the_wb_television_network.png b/data/interfaces/default/images/media_flags/studio/the_wb_television_network.png
deleted file mode 100644
index 9ec513c3..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/the_wb_television_network.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/thierry_mugler.png b/data/interfaces/default/images/media_flags/studio/thierry_mugler.png
deleted file mode 100644
index bd07db8c..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/thierry_mugler.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/think_film.png b/data/interfaces/default/images/media_flags/studio/think_film.png
deleted file mode 100644
index c8f00035..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/think_film.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/this_is_that.png b/data/interfaces/default/images/media_flags/studio/this_is_that.png
deleted file mode 100644
index c46c5763..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/this_is_that.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/tlc.png b/data/interfaces/default/images/media_flags/studio/tlc.png
deleted file mode 100644
index 5686d640..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/tlc.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/tnt.png b/data/interfaces/default/images/media_flags/studio/tnt.png
deleted file mode 100644
index 26292675..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/tnt.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/toho.png b/data/interfaces/default/images/media_flags/studio/toho.png
deleted file mode 100644
index f1cf458f..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/toho.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/tor.png b/data/interfaces/default/images/media_flags/studio/tor.png
deleted file mode 100644
index 3cdc1135..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/tor.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/touchstone.png b/data/interfaces/default/images/media_flags/studio/touchstone.png
deleted file mode 100644
index 3791d5f0..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/touchstone.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/tristar_pictures.png b/data/interfaces/default/images/media_flags/studio/tristar_pictures.png
deleted file mode 100644
index 98a7861c..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/tristar_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/trutv.png b/data/interfaces/default/images/media_flags/studio/trutv.png
deleted file mode 100644
index 73a393b2..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/trutv.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/turner.png b/data/interfaces/default/images/media_flags/studio/turner.png
deleted file mode 100644
index e050b6d1..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/turner.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/tv2.png b/data/interfaces/default/images/media_flags/studio/tv2.png
deleted file mode 100644
index 909debdf..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/tv2.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/tv3.png b/data/interfaces/default/images/media_flags/studio/tv3.png
deleted file mode 100644
index bf8721d2..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/tv3.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/tv4.png b/data/interfaces/default/images/media_flags/studio/tv4.png
deleted file mode 100644
index 8106d805..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/tv4.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/tv_2.png b/data/interfaces/default/images/media_flags/studio/tv_2.png
deleted file mode 100644
index af04d285..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/tv_2.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/tv_land.png b/data/interfaces/default/images/media_flags/studio/tv_land.png
deleted file mode 100644
index 7be8fe84..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/tv_land.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/tv_tokyo.png b/data/interfaces/default/images/media_flags/studio/tv_tokyo.png
deleted file mode 100644
index 415b1e08..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/tv_tokyo.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/tvn.png b/data/interfaces/default/images/media_flags/studio/tvn.png
deleted file mode 100644
index 4ed8fbb1..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/tvn.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/tvnz.png b/data/interfaces/default/images/media_flags/studio/tvnz.png
deleted file mode 100644
index e6aacd4a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/tvnz.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/tvp.png b/data/interfaces/default/images/media_flags/studio/tvp.png
deleted file mode 100644
index 60e1378b..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/tvp.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/twisted_pictures.png b/data/interfaces/default/images/media_flags/studio/twisted_pictures.png
deleted file mode 100644
index 867964b5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/twisted_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/twit.png b/data/interfaces/default/images/media_flags/studio/twit.png
deleted file mode 100644
index 41297a91..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/twit.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/ugc.png b/data/interfaces/default/images/media_flags/studio/ugc.png
deleted file mode 100644
index 33016e14..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/ugc.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/uk_film_council.png b/data/interfaces/default/images/media_flags/studio/uk_film_council.png
deleted file mode 100644
index 882f8ede..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/uk_film_council.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/united_artists.png b/data/interfaces/default/images/media_flags/studio/united_artists.png
deleted file mode 100644
index 3751f0c4..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/united_artists.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/universal.png b/data/interfaces/default/images/media_flags/studio/universal.png
deleted file mode 100644
index f2b8b2a3..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/universal.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/univision.png b/data/interfaces/default/images/media_flags/studio/univision.png
deleted file mode 100644
index 8d89c452..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/univision.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/up_tv.png b/data/interfaces/default/images/media_flags/studio/up_tv.png
deleted file mode 100644
index 9ad6c0b1..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/up_tv.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/upn.png b/data/interfaces/default/images/media_flags/studio/upn.png
deleted file mode 100644
index 0ae86fa8..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/upn.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/usa_network.png b/data/interfaces/default/images/media_flags/studio/usa_network.png
deleted file mode 100644
index 3e5de545..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/usa_network.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/vara.png b/data/interfaces/default/images/media_flags/studio/vara.png
deleted file mode 100644
index 12d0487e..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/vara.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/versus.png b/data/interfaces/default/images/media_flags/studio/versus.png
deleted file mode 100644
index ab09d74e..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/versus.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/vertigo.png b/data/interfaces/default/images/media_flags/studio/vertigo.png
deleted file mode 100644
index bd266466..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/vertigo.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/vh1.png b/data/interfaces/default/images/media_flags/studio/vh1.png
deleted file mode 100644
index 1865f8b7..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/vh1.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/viacom.png b/data/interfaces/default/images/media_flags/studio/viacom.png
deleted file mode 100644
index bfb21006..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/viacom.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/view_askew.png b/data/interfaces/default/images/media_flags/studio/view_askew.png
deleted file mode 100644
index e0e88fb9..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/view_askew.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/village_roadshow_pictures.png b/data/interfaces/default/images/media_flags/studio/village_roadshow_pictures.png
deleted file mode 100644
index 3aa42087..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/village_roadshow_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/vimeo.png b/data/interfaces/default/images/media_flags/studio/vimeo.png
deleted file mode 100644
index 77a586f9..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/vimeo.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/virtual_studios.png b/data/interfaces/default/images/media_flags/studio/virtual_studios.png
deleted file mode 100644
index 02c80063..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/virtual_studios.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/vital_film_works.png b/data/interfaces/default/images/media_flags/studio/vital_film_works.png
deleted file mode 100644
index d89d8348..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/vital_film_works.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/viz.png b/data/interfaces/default/images/media_flags/studio/viz.png
deleted file mode 100644
index 8a6c3f7c..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/viz.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/vortex_entertainment.png b/data/interfaces/default/images/media_flags/studio/vortex_entertainment.png
deleted file mode 100644
index ddb0301a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/vortex_entertainment.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/vox.png b/data/interfaces/default/images/media_flags/studio/vox.png
deleted file mode 100644
index 646b3ace..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/vox.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/vpro.png b/data/interfaces/default/images/media_flags/studio/vpro.png
deleted file mode 100644
index 990c9590..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/vpro.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/vtm.png b/data/interfaces/default/images/media_flags/studio/vtm.png
deleted file mode 100644
index 1e5a7cdc..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/vtm.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/walden_media.png b/data/interfaces/default/images/media_flags/studio/walden_media.png
deleted file mode 100644
index 2abe70ba..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/walden_media.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/walt_disney_pictures.png b/data/interfaces/default/images/media_flags/studio/walt_disney_pictures.png
deleted file mode 100644
index e3dcefcc..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/walt_disney_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/warner_bros.png b/data/interfaces/default/images/media_flags/studio/warner_bros.png
deleted file mode 100644
index abf82869..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/warner_bros.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/warner_bros_animation.png b/data/interfaces/default/images/media_flags/studio/warner_bros_animation.png
deleted file mode 100644
index 70d8574e..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/warner_bros_animation.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/warner_independent_pictures.png b/data/interfaces/default/images/media_flags/studio/warner_independent_pictures.png
deleted file mode 100644
index 5850e069..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/warner_independent_pictures.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/water_walk_productions.png b/data/interfaces/default/images/media_flags/studio/water_walk_productions.png
deleted file mode 100644
index 4f00f68b..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/water_walk_productions.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/wdr.png b/data/interfaces/default/images/media_flags/studio/wdr.png
deleted file mode 100644
index 062ed3e8..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/wdr.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/we_tv.png b/data/interfaces/default/images/media_flags/studio/we_tv.png
deleted file mode 100644
index 45b7c646..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/we_tv.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/weinstein_company.png b/data/interfaces/default/images/media_flags/studio/weinstein_company.png
deleted file mode 100644
index 351d252e..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/weinstein_company.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/wfdif.png b/data/interfaces/default/images/media_flags/studio/wfdif.png
deleted file mode 100644
index 57038113..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/wfdif.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/wgn.png b/data/interfaces/default/images/media_flags/studio/wgn.png
deleted file mode 100644
index 25495e14..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/wgn.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/wild_bunch.png b/data/interfaces/default/images/media_flags/studio/wild_bunch.png
deleted file mode 100644
index d2eed5e1..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/wild_bunch.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/wild_side.png b/data/interfaces/default/images/media_flags/studio/wild_side.png
deleted file mode 100644
index 3ea5b075..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/wild_side.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/working_title_films.png b/data/interfaces/default/images/media_flags/studio/working_title_films.png
deleted file mode 100644
index f5bd31e4..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/working_title_films.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/xfilme.png b/data/interfaces/default/images/media_flags/studio/xfilme.png
deleted file mode 100644
index 9461452d..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/xfilme.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/xxx_productions.png b/data/interfaces/default/images/media_flags/studio/xxx_productions.png
deleted file mode 100644
index 7e99ff0a..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/xxx_productions.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/yahoo_screen.png b/data/interfaces/default/images/media_flags/studio/yahoo_screen.png
deleted file mode 100644
index 2b2a65c6..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/yahoo_screen.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/yari_film_group.png b/data/interfaces/default/images/media_flags/studio/yari_film_group.png
deleted file mode 100644
index f9ab4f87..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/yari_film_group.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/youtube.png b/data/interfaces/default/images/media_flags/studio/youtube.png
deleted file mode 100644
index cb424f28..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/youtube.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/ytv.png b/data/interfaces/default/images/media_flags/studio/ytv.png
deleted file mode 100644
index 42720790..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/ytv.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/zaloom_mayfield.png b/data/interfaces/default/images/media_flags/studio/zaloom_mayfield.png
deleted file mode 100644
index b51b0251..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/zaloom_mayfield.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/zdf.png b/data/interfaces/default/images/media_flags/studio/zdf.png
deleted file mode 100644
index 76b2ecd5..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/zdf.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/zebra.png b/data/interfaces/default/images/media_flags/studio/zebra.png
deleted file mode 100644
index faa68153..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/zebra.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/zentropa.png b/data/interfaces/default/images/media_flags/studio/zentropa.png
deleted file mode 100644
index 09d88e96..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/zentropa.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/studio/zomba.png b/data/interfaces/default/images/media_flags/studio/zomba.png
deleted file mode 100644
index 6948ed09..00000000
Binary files a/data/interfaces/default/images/media_flags/studio/zomba.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_codec/h264.png b/data/interfaces/default/images/media_flags/video_codec/h264.png
deleted file mode 100644
index a08acf71..00000000
Binary files a/data/interfaces/default/images/media_flags/video_codec/h264.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_codec/hevc.png b/data/interfaces/default/images/media_flags/video_codec/hevc.png
deleted file mode 100644
index 50b904c3..00000000
Binary files a/data/interfaces/default/images/media_flags/video_codec/hevc.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_codec/mpeg1video.png b/data/interfaces/default/images/media_flags/video_codec/mpeg1video.png
deleted file mode 100644
index 14b212a2..00000000
Binary files a/data/interfaces/default/images/media_flags/video_codec/mpeg1video.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_codec/mpeg2video.png b/data/interfaces/default/images/media_flags/video_codec/mpeg2video.png
deleted file mode 100644
index 500da2bc..00000000
Binary files a/data/interfaces/default/images/media_flags/video_codec/mpeg2video.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_codec/mpeg4.png b/data/interfaces/default/images/media_flags/video_codec/mpeg4.png
deleted file mode 100644
index 25a47100..00000000
Binary files a/data/interfaces/default/images/media_flags/video_codec/mpeg4.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_codec/vc1.png b/data/interfaces/default/images/media_flags/video_codec/vc1.png
deleted file mode 100644
index 090bd055..00000000
Binary files a/data/interfaces/default/images/media_flags/video_codec/vc1.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_codec/wmv.png b/data/interfaces/default/images/media_flags/video_codec/wmv.png
deleted file mode 100644
index a35d358d..00000000
Binary files a/data/interfaces/default/images/media_flags/video_codec/wmv.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_codec/wmvhd.png b/data/interfaces/default/images/media_flags/video_codec/wmvhd.png
deleted file mode 100644
index 3b55c2f7..00000000
Binary files a/data/interfaces/default/images/media_flags/video_codec/wmvhd.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_framerate/24p.png b/data/interfaces/default/images/media_flags/video_framerate/24p.png
deleted file mode 100644
index ceadf12f..00000000
Binary files a/data/interfaces/default/images/media_flags/video_framerate/24p.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_framerate/25p.png b/data/interfaces/default/images/media_flags/video_framerate/25p.png
deleted file mode 100644
index abbdfd99..00000000
Binary files a/data/interfaces/default/images/media_flags/video_framerate/25p.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_framerate/50p.png b/data/interfaces/default/images/media_flags/video_framerate/50p.png
deleted file mode 100644
index d448cde7..00000000
Binary files a/data/interfaces/default/images/media_flags/video_framerate/50p.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_framerate/60p.png b/data/interfaces/default/images/media_flags/video_framerate/60p.png
deleted file mode 100644
index b47edc0a..00000000
Binary files a/data/interfaces/default/images/media_flags/video_framerate/60p.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_framerate/NTSC.png b/data/interfaces/default/images/media_flags/video_framerate/NTSC.png
deleted file mode 100644
index 831538cc..00000000
Binary files a/data/interfaces/default/images/media_flags/video_framerate/NTSC.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_framerate/PAL.png b/data/interfaces/default/images/media_flags/video_framerate/PAL.png
deleted file mode 100644
index a9231045..00000000
Binary files a/data/interfaces/default/images/media_flags/video_framerate/PAL.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_resolution/1080.png b/data/interfaces/default/images/media_flags/video_resolution/1080.png
deleted file mode 100644
index bf2fce9a..00000000
Binary files a/data/interfaces/default/images/media_flags/video_resolution/1080.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_resolution/1080i.png b/data/interfaces/default/images/media_flags/video_resolution/1080i.png
deleted file mode 100644
index 0ab2e040..00000000
Binary files a/data/interfaces/default/images/media_flags/video_resolution/1080i.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_resolution/270.png b/data/interfaces/default/images/media_flags/video_resolution/270.png
deleted file mode 100644
index 929e1c3a..00000000
Binary files a/data/interfaces/default/images/media_flags/video_resolution/270.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_resolution/360.png b/data/interfaces/default/images/media_flags/video_resolution/360.png
deleted file mode 100644
index 4bb768ad..00000000
Binary files a/data/interfaces/default/images/media_flags/video_resolution/360.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_resolution/432.png b/data/interfaces/default/images/media_flags/video_resolution/432.png
deleted file mode 100644
index 4b42cbc9..00000000
Binary files a/data/interfaces/default/images/media_flags/video_resolution/432.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_resolution/468.png b/data/interfaces/default/images/media_flags/video_resolution/468.png
deleted file mode 100644
index c388e214..00000000
Binary files a/data/interfaces/default/images/media_flags/video_resolution/468.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_resolution/480.png b/data/interfaces/default/images/media_flags/video_resolution/480.png
deleted file mode 100644
index bf289855..00000000
Binary files a/data/interfaces/default/images/media_flags/video_resolution/480.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_resolution/480i.png b/data/interfaces/default/images/media_flags/video_resolution/480i.png
deleted file mode 100644
index 0dcf20ab..00000000
Binary files a/data/interfaces/default/images/media_flags/video_resolution/480i.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_resolution/4k.png b/data/interfaces/default/images/media_flags/video_resolution/4k.png
deleted file mode 100644
index dc1630c0..00000000
Binary files a/data/interfaces/default/images/media_flags/video_resolution/4k.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_resolution/540.png b/data/interfaces/default/images/media_flags/video_resolution/540.png
deleted file mode 100644
index 4ff646c5..00000000
Binary files a/data/interfaces/default/images/media_flags/video_resolution/540.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_resolution/544.png b/data/interfaces/default/images/media_flags/video_resolution/544.png
deleted file mode 100644
index 1de821c0..00000000
Binary files a/data/interfaces/default/images/media_flags/video_resolution/544.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_resolution/576.png b/data/interfaces/default/images/media_flags/video_resolution/576.png
deleted file mode 100644
index 503620f8..00000000
Binary files a/data/interfaces/default/images/media_flags/video_resolution/576.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_resolution/576i.png b/data/interfaces/default/images/media_flags/video_resolution/576i.png
deleted file mode 100644
index 36941520..00000000
Binary files a/data/interfaces/default/images/media_flags/video_resolution/576i.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_resolution/720.png b/data/interfaces/default/images/media_flags/video_resolution/720.png
deleted file mode 100644
index 8a472271..00000000
Binary files a/data/interfaces/default/images/media_flags/video_resolution/720.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_resolution/8k.png b/data/interfaces/default/images/media_flags/video_resolution/8k.png
deleted file mode 100644
index 7fdd10ea..00000000
Binary files a/data/interfaces/default/images/media_flags/video_resolution/8k.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_resolution/hdtv.png b/data/interfaces/default/images/media_flags/video_resolution/hdtv.png
deleted file mode 100644
index d4569c21..00000000
Binary files a/data/interfaces/default/images/media_flags/video_resolution/hdtv.png and /dev/null differ
diff --git a/data/interfaces/default/images/media_flags/video_resolution/sd.png b/data/interfaces/default/images/media_flags/video_resolution/sd.png
deleted file mode 100644
index b68702f4..00000000
Binary files a/data/interfaces/default/images/media_flags/video_resolution/sd.png and /dev/null differ
diff --git a/data/interfaces/default/images/newsletter/newsletter-header.png b/data/interfaces/default/images/newsletter/newsletter-header.png
deleted file mode 100644
index 0b97a437..00000000
Binary files a/data/interfaces/default/images/newsletter/newsletter-header.png and /dev/null differ
diff --git a/data/interfaces/default/images/newsletter/view-on-plex-cover.png b/data/interfaces/default/images/newsletter/view-on-plex-cover.png
deleted file mode 100644
index 506848b7..00000000
Binary files a/data/interfaces/default/images/newsletter/view-on-plex-cover.png and /dev/null differ
diff --git a/data/interfaces/default/images/newsletter/view-on-plex-flat.png b/data/interfaces/default/images/newsletter/view-on-plex-flat.png
deleted file mode 100644
index 6875a4e8..00000000
Binary files a/data/interfaces/default/images/newsletter/view-on-plex-flat.png and /dev/null differ
diff --git a/data/interfaces/default/images/newsletter/view-on-plex-poster.png b/data/interfaces/default/images/newsletter/view-on-plex-poster.png
deleted file mode 100644
index 40a3e2d1..00000000
Binary files a/data/interfaces/default/images/newsletter/view-on-plex-poster.png and /dev/null differ
diff --git a/data/interfaces/default/images/platforms/alexa.svg b/data/interfaces/default/images/platforms/alexa.svg
deleted file mode 100644
index 96034020..00000000
--- a/data/interfaces/default/images/platforms/alexa.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 63 64">
-<title>alexa</title>
-<path fill="#fff" d="M31.554 1.104c-17.063 0-30.896 13.832-30.896 30.896s13.832 30.896 30.896 30.896 30.896-13.833 30.896-30.896c0-17.063-13.833-30.896-30.896-30.896zM27.506 62.329c0-0.037 0-0.072 0-0.107 0-1.945 0.006-3.89-0.002-5.835-0.006-1.199-0.443-2.224-1.318-3.051-0.459-0.435-1.009-0.711-1.604-0.917-2.669-0.926-5.071-2.316-7.189-4.188-3.006-2.658-5.122-5.897-6.335-9.723-0.313-0.989-0.542-1.997-0.711-3.022-0.185-1.121-0.27-2.25-0.271-3.384-0.001-0.766 0.037-1.532 0.115-2.297 0.283-2.765 1.070-5.374 2.361-7.833 0.836-1.592 1.861-3.053 3.069-4.386 1.705-1.883 3.682-3.414 5.929-4.597 1.777-0.935 3.651-1.605 5.617-2.009 0.649-0.133 1.305-0.237 1.962-0.317 0.94-0.114 1.886-0.13 2.834-0.124 0.691 0.004 1.381 0.042 2.066 0.123 3.624 0.428 6.949 1.663 9.929 3.778 3.997 2.836 6.73 6.604 8.208 11.276 0.313 0.988 0.539 1.999 0.691 3.026 0.092 0.623 0.184 1.247 0.2 1.877 0.021 0.801 0.060 1.603 0.035 2.403-0.021 0.671-0.111 1.34-0.191 2.007-0.148 1.243-0.435 2.456-0.804 3.652-0.745 2.415-1.861 4.653-3.247 6.76-0.863 1.312-1.823 2.551-2.855 3.735-1.409 1.618-2.945 3.108-4.572 4.503-2.165 1.857-4.47 3.523-6.883 5.042-2.011 1.266-4.080 2.43-6.226 3.452-0.143 0.068-0.288 0.135-0.441 0.206-0.123-0.015-0.246-0.031-0.369-0.048z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/android.png b/data/interfaces/default/images/platforms/android.png
new file mode 100644
index 00000000..b7101285
Binary files /dev/null and b/data/interfaces/default/images/platforms/android.png differ
diff --git a/data/interfaces/default/images/platforms/android.svg b/data/interfaces/default/images/platforms/android.svg
deleted file mode 100644
index c9f6cad4..00000000
--- a/data/interfaces/default/images/platforms/android.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>android</title>
-<path fill="#fff" d="M46.73 40.88c-0.003 0-0.007 0-0.010 0-1.475 0-2.67-1.195-2.67-2.67s1.195-2.67 2.67-2.67c1.475 0 2.67 1.195 2.67 2.67v0c0 0 0 0 0 0 0 1.471-1.19 2.664-2.659 2.67h-0.001zM17.27 40.88c-1.475 0-2.67-1.195-2.67-2.67s1.195-2.67 2.67-2.67c1.475 0 2.67 1.195 2.67 2.67v0c0 0.003 0 0.007 0 0.010 0 1.469-1.191 2.66-2.66 2.66-0.003 0-0.007 0-0.011 0h0.001zM47.68 24.83l5.32-9.23c0.095-0.159 0.151-0.351 0.151-0.557 0-0.405-0.219-0.76-0.546-0.951l-0.005-0.003c-0.16-0.095-0.354-0.152-0.56-0.152-0.407 0-0.764 0.22-0.957 0.547l-0.003 0.005-5.38 9.34c-4.027-1.851-8.738-2.93-13.7-2.93s-9.673 1.079-13.909 3.016l0.209-0.086-5.39-9.34c-0.204-0.28-0.531-0.46-0.9-0.46-0.613 0-1.11 0.497-1.11 1.11 0 0.167 0.037 0.325 0.103 0.467l-0.003-0.007 5.33 9.23c-9.153 5.047-15.453 14.286-16.323 25.059l-0.007 0.111h64c-0.875-10.883-7.171-20.121-16.158-25.088l-0.162-0.082z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/atv.png b/data/interfaces/default/images/platforms/atv.png
new file mode 100644
index 00000000..fe9eab46
Binary files /dev/null and b/data/interfaces/default/images/platforms/atv.png differ
diff --git a/data/interfaces/default/images/platforms/atv.svg b/data/interfaces/default/images/platforms/atv.svg
deleted file mode 100644
index 72b334df..00000000
--- a/data/interfaces/default/images/platforms/atv.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>atv</title>
-<path fill="#fff" d="M24.635 26.894c-2.223 1.558-3.539 3.574-3.348 6.363 0.19 2.766 1.715 4.61 4.125 5.832-0.041 0.157-0.066 0.295-0.112 0.425-0.588 1.663-1.401 3.207-2.447 4.63-0.5 0.681-0.984 1.372-1.606 1.952-0.653 0.608-1.37 1.097-2.279 1.221-0.753 0.103-1.492 0.022-2.203-0.245-0.506-0.19-0.991-0.448-1.508-0.594-0.599-0.17-1.222-0.331-1.838-0.349-0.842-0.024-1.669 0.171-2.462 0.493-0.62 0.252-1.249 0.491-1.891 0.675-0.971 0.278-1.881 0.092-2.718-0.479-0.522-0.356-0.989-0.768-1.4-1.249-1.779-2.080-3.15-4.391-3.963-7.013-0.612-1.975-0.987-3.99-0.886-6.071 0.115-2.359 0.758-4.53 2.43-6.274 1.274-1.328 2.823-2.143 4.695-2.321 1.022-0.097 1.979 0.078 2.925 0.416 0.723 0.259 1.441 0.53 2.162 0.794 0.433 0.159 0.865 0.161 1.3-0.001 0.801-0.297 1.604-0.587 2.408-0.877 2.033-0.733 4.027-0.59 5.95 0.352 1.070 0.524 1.99 1.259 2.664 2.318z"></path>
-<path fill="#fff" d="M52.394 43.811c2.187-7.175 4.799-14.116 7.181-21.133 1.481 0 2.918 0 4.425 0-3.053 8.193-6.097 16.36-9.145 24.539-1.627 0-3.246 0-4.888 0-2.963-8.173-5.925-16.342-8.896-24.538 1.499 0 2.947 0 4.422 0 0.194 0.558 0.394 1.116 0.582 1.678 1.547 4.613 3.108 9.222 4.631 13.842 0.565 1.714 1.041 3.457 1.558 5.187 0.036 0.119 0.074 0.237 0.132 0.425z"></path>
-<path fill="#fff" d="M31.678 18.828c1.36-0.555 2.678-1.093 4.045-1.651 0 1.857 0 3.668 0 5.515 1.514 0 2.99 0 4.493 0 0 1.014 0 1.991 0 3.006-1.474 0-2.951 0-4.459 0-0.008 0.16-0.019 0.286-0.019 0.412-0.001 4.546-0.001 9.093-0 13.639 0 0.628-0.027 1.258 0.020 1.883 0.036 0.48 0.137 0.961 0.269 1.425 0.17 0.601 0.613 0.945 1.209 1.11 0.675 0.187 1.349 0.142 2.028 0.032 0.447-0.072 0.895-0.131 1.37-0.199 0 1.019 0 2.009 0 3.034-0.107 0.037-0.224 0.088-0.346 0.117-1.577 0.385-3.177 0.576-4.794 0.387-1.318-0.154-2.435-0.72-3.123-1.907-0.494-0.854-0.757-1.797-0.761-2.789-0.024-5.552-0.038-11.105-0.055-16.658-0-0.14 0-0.281 0-0.468-0.935 0-1.858 0-2.796 0 0-1.037 0-2.027 0-3.047 0.972 0 1.93 0 2.921 0-0-1.29-0-2.55-0-3.843z"></path>
-<path fill="#fff" d="M12.713 23.491c-0.159-0.672-0.073-1.311 0.091-1.923 0.716-2.664 2.429-4.367 5.071-5.139 0.247-0.072 0.507-0.105 0.763-0.143 0.093-0.014 0.191 0.009 0.337 0.019 0.013 0.256 0.053 0.502 0.034 0.743-0.208 2.587-1.379 4.582-3.674 5.853-0.798 0.442-1.674 0.622-2.621 0.589z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/chrome.png b/data/interfaces/default/images/platforms/chrome.png
new file mode 100644
index 00000000..1fad4145
Binary files /dev/null and b/data/interfaces/default/images/platforms/chrome.png differ
diff --git a/data/interfaces/default/images/platforms/chrome.svg b/data/interfaces/default/images/platforms/chrome.svg
deleted file mode 100644
index 75178524..00000000
--- a/data/interfaces/default/images/platforms/chrome.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>chrome</title>
-<path fill="#fff" d="M36.915 47.676c-0.537 0.909-1.014 1.71-1.485 2.515-2.474 4.235-4.95 8.469-7.414 12.709-0.237 0.407-0.481 0.665-1.007 0.57-5.054-0.909-9.721-2.729-13.811-5.885-6.239-4.815-10.285-11.035-11.829-18.794-1.319-6.628-0.564-13.027 2.373-19.14 0.386-0.803 0.805-1.589 1.253-2.472 0.403 0.677 0.754 1.259 1.097 1.846 4.232 7.234 8.392 14.511 12.716 21.688 3.332 5.53 8.361 8.019 14.812 7.544 0.867-0.064 1.72-0.298 2.58-0.454 0.199-0.036 0.399-0.071 0.714-0.127z"></path>
-<path fill="#fff" d="M32.125 63.797c0.095-0.181 0.184-0.367 0.287-0.544 4.095-7.016 8.191-14.032 12.289-21.047 1.11-1.901 2.18-3.834 2.73-5.974 1.371-5.335 0.128-10.033-3.619-14.068-0.318-0.343-0.657-0.667-0.984-1.001-0.012-0.012-0.008-0.039-0.021-0.115 0.184-0.013 0.364-0.038 0.544-0.038 5.74-0.002 11.479 0.005 17.219-0.013 0.484-0.002 0.705 0.156 0.884 0.599 1.897 4.695 2.496 9.557 1.821 14.56-1.083 8.030-4.746 14.687-10.825 20.025-4.352 3.822-9.377 6.262-15.089 7.226-1.709 0.289-3.448 0.401-5.174 0.594-0.021-0.068-0.042-0.135-0.062-0.203z"></path>
-<path fill="#fff" d="M16.683 29.45c-0.658-1.12-1.239-2.11-1.819-3.1-2.393-4.085-4.781-8.173-7.188-12.249-0.217-0.368-0.223-0.595 0.062-0.937 5.199-6.226 11.706-10.195 19.792-11.338 12.918-1.826 24.674 4.296 30.968 14.71 0.095 0.157 0.167 0.328 0.296 0.583-0.315 0-0.54-0-0.765 0-8.771 0.005-17.541 0.011-26.312 0.013-6.922 0.002-13.185 4.898-14.846 11.609-0.046 0.184-0.097 0.368-0.188 0.71z"></path>
-<path fill="#fff" d="M31.98 21.084c6.62 0 11.591 5.010 11.649 11.618 0.060 6.833-5.527 11.861-11.985 11.705-5.304-0.128-11.356-4.097-11.387-11.819-0.026-6.511 5.123-11.504 11.723-11.504z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/chromecast.png b/data/interfaces/default/images/platforms/chromecast.png
new file mode 100644
index 00000000..5c41d3bc
Binary files /dev/null and b/data/interfaces/default/images/platforms/chromecast.png differ
diff --git a/data/interfaces/default/images/platforms/chromecast.svg b/data/interfaces/default/images/platforms/chromecast.svg
deleted file mode 100644
index 384d14d3..00000000
--- a/data/interfaces/default/images/platforms/chromecast.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>chromecast</title>
-<path fill="#fff" d="M37.855 58.198c0-1.95 0-3.841 0-5.807 6.758 0 13.504 0 20.283 0 0-13.609 0-27.142 0-40.719-17.417 0-34.831 0-52.303 0 0 2.88 0 5.745 0 8.644-1.962 0-3.867 0-5.806 0-0.009-0.197-0.024-0.373-0.024-0.549-0.001-2.658-0.004-5.316 0-7.973 0.006-3.458 2.536-5.991 5.995-5.991 17.339-0.002 34.678-0.002 52.017 0 3.452 0 5.98 2.539 5.981 6.005 0.003 13.47 0.003 26.939-0 40.409-0.001 3.431-2.536 5.978-5.951 5.981-6.545 0.005-13.090 0.002-19.635 0.002-0.176 0-0.352 0-0.556 0z"></path>
-<path fill="#fff" d="M0.018 31.982c0-1.953 0-3.831 0-5.809 7.428 0.072 14.093 2.304 19.858 6.954 7.939 6.403 11.872 14.809 12.165 25.025-1.967 0-3.872 0-5.839 0-0.124-7.142-2.607-13.361-7.678-18.446-5.076-5.090-11.288-7.596-18.505-7.723z"></path>
-<path fill="#fff" d="M0.032 43.628c0-1.932 0-3.824 0-5.808 4.732 0.047 8.962 1.496 12.662 4.441 5.523 4.395 7.709 10.679 7.651 15.89-1.904 0-3.808 0-5.777 0-0.091-3.951-1.465-7.415-4.291-10.24-2.814-2.813-6.257-4.193-10.245-4.283z"></path>
-<path fill="#fff" d="M0.048 49.537c4.157-0.28 8.758 3.539 8.643 8.624-2.865 0-5.732 0-8.643 0 0-2.867 0-5.746 0-8.624z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/cloudsync.svg b/data/interfaces/default/images/platforms/cloudsync.svg
deleted file mode 100644
index 77e3f796..00000000
--- a/data/interfaces/default/images/platforms/cloudsync.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>cloudsync</title>
-<path fill="#fff" d="M29.725 11.603c2-4.421 5.2-6.886 10.15-6.57 3.57 0.228 7.396 1.805 9.26 7.961 0.441-0.078 0.887-0.169 1.338-0.232 2.972-0.417 5.33 0.656 7.129 3.004 1.755 2.291 2.080 4.797 1.011 7.477-0.398 0.997-0.435 1.031 0.456 1.686 2.408 1.771 3.811 4.105 4.219 7.076 0.714 5.199-3.32 10.421-8.531 10.979-0.587 0.063-1.18 0.097-1.77 0.099-4.716 0.008-9.433-0.001-14.149 0.018-0.352 0.002-0.486-0.164-0.64-0.404-1.906-2.972-3.816-5.942-5.725-8.912-0.148-0.231-0.298-0.461-0.491-0.759-0.318 0.487-0.598 0.911-0.874 1.339-1.783 2.766-3.571 5.528-5.338 8.304-0.208 0.326-0.431 0.427-0.802 0.426-4.809-0.011-9.618-0.007-14.426-0.007-4.883-0-9.114-3.656-9.821-8.486-0.718-4.903 1.795-9.26 6.415-11.049 0.613-0.237 0.635-0.601 0.55-1.119-0.7-4.263 0.512-7.944 3.471-11.042 4.571-4.785 12.259-4.874 16.659-1.312 0.616 0.498 1.237 0.988 1.912 1.526z"></path>
-<path fill="#fff" d="M36.561 52.21c0 2.174 0 4.244-0 6.314-0 0.74-0.001 0.742-0.738 0.742-2.534 0.001-5.067-0.014-7.601 0.012-0.539 0.005-0.738-0.105-0.724-0.696 0.042-1.886 0.015-3.773 0.015-5.659 0-0.201 0-0.402 0-0.691-2.259 0-4.477 0-6.817 0 3.777-5.9 7.478-11.681 11.284-17.626 3.83 5.888 7.523 11.679 11.235 17.604-2.273-0-4.424-0-6.653-0z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/default.png b/data/interfaces/default/images/platforms/default.png
new file mode 100644
index 00000000..2adb6dd2
Binary files /dev/null and b/data/interfaces/default/images/platforms/default.png differ
diff --git a/data/interfaces/default/images/platforms/default.svg b/data/interfaces/default/images/platforms/default.svg
deleted file mode 100644
index 16ab26ac..00000000
--- a/data/interfaces/default/images/platforms/default.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>plex</title>
-<path fill="#fff" d="M9.528 63.949c8.213-10.706 16.347-21.309 24.511-31.952-8.148-10.627-16.281-21.235-24.502-31.957 0.352 0 0.585 0 0.818 0 3.256 0 6.512 0.004 9.769-0.001 2.944-0.004 5.887-0.010 8.831-0.035 0.493-0.004 0.828 0.158 1.132 0.551 8.077 10.413 16.164 20.818 24.249 31.225 0.040 0.052 0.068 0.114 0.137 0.233-0.124 0.173-0.256 0.371-0.401 0.559-7.992 10.281-15.987 20.56-23.973 30.847-0.298 0.383-0.606 0.582-1.113 0.58-6.267-0.015-12.534-0.009-18.802-0.011-0.169 0-0.338-0.019-0.656-0.038z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/dlna.svg b/data/interfaces/default/images/platforms/dlna.svg
deleted file mode 100644
index 04cc4707..00000000
--- a/data/interfaces/default/images/platforms/dlna.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>dlna</title>
-<path fill="#fff" d="M48.116 30.41c-3.431 0-6.862 0.002-10.293-0.001-1.199-0.001-2.403 0.050-3.597-0.030-2.812-0.189-5.041-1.506-6.822-3.656-1.746-2.108-4.007-3.188-6.743-3.17-4.461 0.029-8.152 3.653-8.406 8.199-0.243 4.348 3.055 8.345 7.39 8.861 3.086 0.367 5.737-0.575 7.729-3.014 2.086-2.555 4.731-3.743 8.021-3.729 8.472 0.038 16.945 0.013 25.418 0.013 0.193 0 0.386-0.005 0.579 0.002 1.742 0.058 2.609 1.163 2.245 2.877-1.64 7.71-5.906 13.573-12.52 17.781-6.351 4.040-13.29 5.85-20.798 5.374-7.691-0.487-14.603-2.991-20.453-8.13-0.627-0.551-1.244-1.121-1.809-1.735-0.83-0.902-0.552-1.684 0.653-1.909 0.334-0.063 0.683-0.057 1.026-0.057 5.362-0.003 10.725 0.008 16.087-0.006 3.234-0.008 5.854 1.23 7.895 3.739 2.837 3.487 7.859 4.176 11.509 1.598 3.059-2.161 4.399-6.182 3.229-9.69-1.206-3.617-4.666-6.066-8.454-5.906-2.473 0.104-4.566 1.085-6.16 3.015-1.476 1.786-3.249 3.107-5.553 3.596-0.583 0.124-1.187 0.21-1.782 0.211-6.392 0.015-12.784 0.017-19.176 0.006-2.616-0.004-4.11-1.047-5.048-3.474-0.301-0.778-0.638-1.549-0.85-2.352-1.432-5.43-1.174-10.783 0.894-16.014 0.87-2.2 2.619-3.235 4.934-3.245 6.434-0.027 12.869-0.043 19.303 0.006 2.9 0.022 5.225 1.337 7.044 3.569 1.553 1.905 3.534 3.043 5.995 3.225 4.403 0.327 8.218-2.506 9.086-6.856 0.697-3.495-0.451-6.456-3.306-8.547-2.862-2.095-6.042-2.366-9.192-0.63-1.020 0.562-1.876 1.484-2.684 2.355-1.582 1.706-3.417 2.913-5.737 3.298-0.505 0.084-1.022 0.126-1.534 0.132-1.566 0.017-3.132 0.002-4.697 0.007-4.010 0.012-8.021 0.034-12.031 0.031-0.393-0-0.805-0.104-1.175-0.245-0.697-0.266-0.842-0.629-0.511-1.31 0.164-0.337 0.421-0.647 0.692-0.912 4.675-4.576 10.228-7.526 16.642-8.767 6.795-1.315 13.499-0.922 19.971 1.634 6.588 2.602 11.939 6.764 15.553 12.959 1.435 2.459 2.425 5.098 2.967 7.9 0.352 1.815-0.446 2.929-2.276 2.982-2.4 0.070-4.803 0.046-7.205 0.053-2.016 0.007-4.032 0.001-6.049 0.001-0.001-0.014-0.001-0.027-0.001-0.042z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/firefox.png b/data/interfaces/default/images/platforms/firefox.png
new file mode 100644
index 00000000..b9428b36
Binary files /dev/null and b/data/interfaces/default/images/platforms/firefox.png differ
diff --git a/data/interfaces/default/images/platforms/firefox.svg b/data/interfaces/default/images/platforms/firefox.svg
deleted file mode 100644
index 45e8f7cf..00000000
--- a/data/interfaces/default/images/platforms/firefox.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>firefox</title>
-<path fill="#fff" d="M0.706 32.886c-0.1 0.599-0.201 1.199-0.301 1.798-0.224-3.461-0.143-6.897 0.775-10.275-0.050-0.012-0.1-0.025-0.15-0.037-0.344 0.755-0.687 1.51-1.031 2.264 0.434-2.65 1.043-5.25 2.156-7.698 0.494-1.087 1.134-2.106 1.66-3.179 0.138-0.281 0.15-0.65 0.134-0.975-0.135-2.716 0.145-5.364 1.371-7.831 0.37-0.745 0.895-1.414 1.365-2.107 0.116-0.171 0.297-0.298 0.524-0.519 0.18 2.197 1.261 3.809 2.638 5.286 0.586 0.629 1.303 0.717 2.027 0.58 1.98-0.374 3.937-0.333 5.9 0.085 0.197 0.042 0.51 0.014 0.626-0.113 1.731-1.896 3.971-2.775 6.415-3.241 0.59-0.112 1.197-0.136 1.796-0.2 0.012 0.054 0.023 0.108 0.035 0.162-0.174 0.118-0.346 0.239-0.522 0.353-1.965 1.271-3.176 3.063-3.674 5.34-0.044 0.2-0.049 0.458 0.040 0.63 0.825 1.593 1.968 2.685 3.936 2.618 1.277-0.044 2.561 0.024 3.838 0.092 0.668 0.036 0.776 0.21 0.753 0.886-0.036 1.071-0.46 1.9-1.4 2.495-1.453 0.919-2.865 1.901-4.296 2.855-0.54 0.36-0.74 0.777-0.528 1.468 0.364 1.185 0.476 2.419 0.329 3.667-0.707-0.248-1.391-0.521-2.096-0.727-0.907-0.264-2.172 0.295-2.6 1.133s-0.533 1.712-0.145 2.601c0.104 0.237 0.225 0.471 0.367 0.686 1.895 2.877 5.744 4.104 8.954 2.888 1.136-0.43 2.272-0.932 3.454-1.152 1.921-0.358 3.635 0.257 5.071 1.595 0.16 0.149 0.307 0.32 0.421 0.506 0.246 0.4 0.312 0.831 0.048 1.247-0.264 0.415-0.682 0.578-1.145 0.481-0.655-0.137-1.243 0.018-1.782 0.344-0.838 0.506-1.683 1.013-2.462 1.602-1.706 1.291-3.665 1.867-5.742 2.051-1.207 0.107-2.432 0.020-3.653 0.020 0 0.051-0.014 0.104 0.002 0.115 2.294 1.621 4.675 3.082 7.365 3.966 5.588 1.835 10.231 0.271 14.066-4.001 0.945-1.052 1.727-2.251 2.583-3.383 0.103-0.136 0.202-0.276 0.365-0.389-0.040 1.665-0.66 3.212-0.923 4.824 0.040 0.030 0.080 0.060 0.12 0.089 0.387-0.414 0.824-0.793 1.153-1.249 1.070-1.479 1.521-3.205 1.823-4.967 0.421-2.46 0.494-4.934 0.171-7.415-0.007-0.057 0.012-0.117 0.023-0.219 1.149 0.469 1.687 1.431 2.128 2.489 0.49-0.764 0.898-3.296 0.975-6.149 0.056-2.081-0.048-4.15-0.63-6.233 0.72 0.188 1.167 0.641 1.569 1.127 0.404 0.488 0.756 1.018 1.174 1.485-1.829-7.324-6.85-11.234-14.034-12.963 2.107-0.584 4.155-0.835 6.231-0.912 0.016-0.042 0.033-0.083 0.049-0.125-0.279-0.206-0.531-0.481-0.842-0.606-1.332-0.534-2.662-1.084-4.030-1.511-1.236-0.386-2.519-0.619-3.795-0.994 0.325-0.035 0.65-0.088 0.976-0.101 3.101-0.128 6.073 0.547 9.031 1.386 4.281 1.213 7.129 4.033 9.092 7.893 0.098 0.192 0.193 0.386 0.29 0.579 0.059-0.011 0.118-0.022 0.178-0.033-0.126-0.803-0.211-1.614-0.388-2.405s-0.447-1.562-0.581-2.417c0.243 0.291 0.528 0.558 0.724 0.878 1.284 2.096 2.261 4.334 2.732 6.747 0.552 2.824 0.986 5.672 1.472 8.509 0.026 0.148 0.064 0.294 0.19 0.437 0.192-1.209 0.383-2.419 0.575-3.628 0.026-0.005 0.052-0.009 0.078-0.013 0.026 0.077 0.074 0.153 0.076 0.23 0.198 8.041-0.999 15.806-4.781 23.006-4.207 8.008-10.85 12.868-19.647 14.788-5.411 1.181-10.839 1.284-16.23-0.162-6.983-1.873-12.432-5.923-16.515-11.837-2.568-3.719-4.496-7.739-5.42-12.196-0.158-0.761-0.263-1.533-0.393-2.3-0.037-0.007-0.074-0.013-0.11-0.020z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/gtv.png b/data/interfaces/default/images/platforms/gtv.png
new file mode 100644
index 00000000..f001ff81
Binary files /dev/null and b/data/interfaces/default/images/platforms/gtv.png differ
diff --git a/data/interfaces/default/images/platforms/gtv.svg b/data/interfaces/default/images/platforms/gtv.svg
deleted file mode 100644
index 83675a13..00000000
--- a/data/interfaces/default/images/platforms/gtv.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>gtv</title>
-<path fill="#fff" d="M24.931 15.701c-0.244-0.337-0.388-0.548-0.544-0.751-3.097-4.013-6.201-8.021-9.291-12.039-0.705-0.916-0.574-1.667 0.334-2.234 0.571-0.356 1.315-0.232 1.978 0.412 1.171 1.136 2.325 2.289 3.46 3.46 3.435 3.546 6.857 7.105 10.286 10.657 0.656 0.679 0.677 0.676 1.337-0.003 4.455-4.583 8.909-9.168 13.37-13.746 0.306-0.314 0.644-0.606 1-0.861 0.831-0.597 1.188-0.564 1.911 0.117 0.56 0.526 0.635 1.085 0.152 1.841-0.462 0.723-0.969 1.42-1.495 2.097-2.676 3.447-5.365 6.884-8.049 10.325-0.16 0.205-0.313 0.416-0.566 0.755 0.595 0.033 1.063 0.057 1.53 0.085 4.464 0.267 8.938 0.428 13.387 0.85 2.062 0.195 4.094 0.834 6.105 1.394 1.599 0.445 2.155 1.332 2.155 2.98 0.001 12.036 0.002 24.073-0.004 36.109-0.001 0.77-0.045 1.542-0.1 2.311-0.095 1.347-0.675 2.137-2.006 2.45-1.885 0.443-3.787 0.831-5.699 1.138-5.174 0.833-10.403 0.95-15.624 0.946-7.249-0.006-14.499-0.143-21.747-0.274-4.316-0.078-8.555-0.728-12.702-1.95-1.495-0.441-2.074-1.173-2.075-2.715-0.011-12.631-0.021-25.262-0.030-37.893-0-0.33 0.012-0.661 0.029-0.991 0.059-1.152 0.65-1.944 1.753-2.208 1.882-0.451 3.781-0.841 5.685-1.194 4.31-0.798 8.685-0.758 13.042-0.943 0.747-0.032 1.494-0.078 2.416-0.126zM31.843 20.822c-8.488 0-16.975-0-25.463 0.001-0.331 0-0.661 0.015-0.992 0.016-0.471 0.001-0.678 0.249-0.676 0.703 0.001 0.198-0.006 0.397-0.006 0.595-0 11.861-0 23.721-0 35.582 0 0.154 0.004 0.309 0 0.463-0.011 0.469 0.246 0.683 0.685 0.713 0.22 0.015 0.441 0.011 0.661 0.011 17.086 0.001 34.171 0.001 51.257 0 0.198 0 0.397 0.004 0.595-0.004 1.026-0.042 1.073-0.091 1.073-1.118 0-11.949 0-23.898 0-35.847 0-0.132-0.006-0.265 0-0.397 0.022-0.477-0.24-0.682-0.68-0.707-0.242-0.014-0.485-0.012-0.727-0.012-8.576-0.001-17.152-0-25.728-0z"></path>
-<path fill="#fff" d="M17.475 36.303c1.541 0 3.083-0.004 4.624 0.002 0.822 0.003 1.009 0.189 1.012 1.016 0.007 1.629 0.008 3.259-0 4.888-0.004 0.776-0.208 0.997-0.976 1-3.127 0.010-6.254 0.009-9.38 0.001-0.733-0.002-0.963-0.219-0.97-0.944-0.017-1.695-0.002-3.391-0.008-5.086-0.002-0.644 0.325-0.909 0.944-0.906 1.585 0.007 3.17 0.002 4.755 0.002-0 0.010-0 0.019-0 0.029z"></path>
-<path fill="#fff" d="M17.492 26.798c1.544-0 3.087-0.006 4.63 0.002 0.782 0.004 0.983 0.2 0.988 0.978 0.010 1.654 0.010 3.307-0 4.961-0.005 0.733-0.225 0.961-0.947 0.963-3.153 0.008-6.306-0.005-9.459 0.011-0.589 0.003-0.886-0.267-0.893-0.813-0.023-1.807-0.028-3.614-0.011-5.422 0.005-0.528 0.377-0.686 0.863-0.684 1.61 0.009 3.219 0.004 4.829 0.003z"></path>
-<path fill="#fff" d="M32.044 43.213c-1.541 0-3.081 0.004-4.622-0.002-0.796-0.003-0.987-0.159-1-0.961-0.027-1.716-0.009-3.433-0.020-5.15-0.004-0.708 0.454-0.828 1.011-0.826 1.584 0.004 3.169 0.016 4.753 0.021 1.519 0.005 3.037 0.001 4.556 0.008 0.814 0.004 0.978 0.159 0.982 0.965 0.009 1.673-0.012 3.346 0.010 5.018 0.008 0.658-0.293 0.913-0.916 0.91-1.585-0.008-3.169-0.003-4.754-0.003 0 0.007 0 0.013 0 0.018z"></path>
-<path fill="#fff" d="M46.297 43.213c-1.542 0-3.084 0.006-4.626-0.002-0.807-0.004-0.973-0.172-0.975-0.969-0.005-1.696 0.015-3.392-0.010-5.088-0.009-0.635 0.278-0.882 0.869-0.88 3.216 0.011 6.432 0.022 9.647 0.029 0.527 0.001 0.761 0.273 0.761 0.78 0.001 1.784 0 3.568 0.001 5.353 0.001 0.616-0.375 0.78-0.91 0.778-1.586-0.005-3.172-0.002-4.758-0.001z"></path>
-<path fill="#fff" d="M17.41 53.033c-1.541 0-3.082 0.007-4.623-0.002-0.844-0.005-0.938-0.104-0.951-0.962-0.025-1.628-0.048-3.257-0.055-4.885-0.004-0.87 0.182-1.055 1.041-1.056 3.082-0.005 6.164-0.006 9.246 0.001 0.84 0.002 1.041 0.214 1.044 1.066 0.006 1.607 0.006 3.214-0 4.821-0.003 0.825-0.181 1.009-1.013 1.014-1.563 0.010-3.126 0.003-4.689 0.003z"></path>
-<path fill="#fff" d="M32.049 26.798c1.565 0 3.131-0.005 4.696 0.002 0.779 0.004 0.952 0.163 0.958 0.924 0.012 1.675 0.012 3.351-0.001 5.027-0.006 0.749-0.208 0.951-0.948 0.952-3.153 0.008-6.306-0.003-9.459 0.009-0.589 0.002-0.85-0.255-0.853-0.829-0.009-1.763-0.023-3.526-0.039-5.29-0.006-0.606 0.327-0.802 0.883-0.798 1.587 0.010 3.175 0.004 4.762 0.003z"></path>
-<path fill="#fff" d="M32.034 53.033c-1.563 0-3.126-0.015-4.689 0.008-0.644 0.010-0.913-0.234-0.908-0.891 0.011-1.695-0.026-3.389-0.031-5.084-0.002-0.742 0.192-0.935 0.946-0.936 3.126-0.007 6.252-0.007 9.378 0 0.784 0.002 0.97 0.194 0.974 0.987 0.009 1.651 0.009 3.302 0 4.953-0.004 0.809-0.152 0.955-0.981 0.961-1.563 0.011-3.126 0.003-4.689 0.003z"></path>
-<path fill="#fff" d="M46.301 53.033c-1.541 0-3.081 0.008-4.622-0.003-0.836-0.005-0.974-0.134-0.983-0.953-0.018-1.672-0.023-3.345-0.014-5.017 0.004-0.741 0.204-0.93 0.956-0.931 3.125-0.006 6.25-0.006 9.376 0 0.759 0.002 0.946 0.186 0.95 0.929 0.008 1.695 0.009 3.389 0 5.084-0.004 0.728-0.159 0.882-0.909 0.888-1.584 0.012-3.169 0.004-4.754 0.004z"></path>
-<path fill="#fff" d="M46.35 26.798c1.541-0 3.082-0.003 4.623 0.001 0.828 0.002 0.988 0.148 0.992 0.942 0.008 1.673 0.008 3.346-0 5.020-0.004 0.764-0.178 0.942-0.934 0.943-3.126 0.006-6.252 0.006-9.378 0-0.752-0.001-0.95-0.195-0.954-0.93-0.009-1.717 0.007-3.434-0.008-5.151-0.005-0.596 0.264-0.832 0.84-0.828 1.606 0.011 3.213 0.004 4.82 0.003z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/ie.png b/data/interfaces/default/images/platforms/ie.png
new file mode 100644
index 00000000..506a18b6
Binary files /dev/null and b/data/interfaces/default/images/platforms/ie.png differ
diff --git a/data/interfaces/default/images/platforms/ie.svg b/data/interfaces/default/images/platforms/ie.svg
deleted file mode 100644
index 0423a884..00000000
--- a/data/interfaces/default/images/platforms/ie.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>ie</title>
-<path fill="#fff" d="M22.139 14.902c-5.793 2.901-10.218 7.408-14.648 11.997 0.074-0.309 0.13-0.624 0.223-0.927 3.407-11.028 10.715-17.929 21.97-20.489 2.203-0.501 4.542-0.394 6.817-0.589 0.386-0.033 0.788-0.12 1.141-0.276 3.648-1.617 7.405-2.914 11.342-3.573 3.075-0.514 6.161-0.49 9.122 0.694 3.075 1.229 4.676 3.544 4.902 6.83 0.159 2.318-0.242 4.563-0.965 6.751-0.432 1.305-0.962 2.578-1.409 3.879-0.088 0.256-0.089 0.624 0.032 0.855 2.089 3.983 3.219 8.217 3.306 12.712 0.028 1.457-0.084 2.917-0.135 4.435-13.703 0-27.292 0-41.020 0 0.080 0.766 0.096 1.468 0.232 2.147 1.049 5.203 5.624 9.304 10.914 9.888 4.525 0.5 8.439-0.718 11.646-3.996 0.524-0.536 0.927-1.188 1.415-1.762 0.153-0.18 0.401-0.395 0.607-0.396 4.844-0.019 9.688-0.010 14.532-0.005 0.039 0 0.078 0.032 0.228 0.099-0.538 1.186-1.004 2.41-1.624 3.551-4.335 7.982-10.911 13.036-19.834 14.867-6.056 1.242-11.935 0.511-17.563-2.070-0.498-0.229-0.882-0.217-1.364 0.023-3.436 1.709-7.006 3.036-10.823 3.599-1.791 0.264-3.582 0.322-5.357-0.15-3.042-0.809-4.895-3.079-5.37-6.495-0.455-3.274 0.096-6.454 0.727-9.647 0.657-3.324 2.19-6.283 3.743-9.221 4.455-8.43 10.003-16.049 17.036-22.537 0.065-0.059 0.119-0.13 0.178-0.196zM48.558 29.316c-0.396-6.993-6.557-12.209-13.839-11.666-7.66 0.571-11.906 6.7-11.888 11.666 8.563 0 17.125 0 25.727 0zM20.695 58.147c-5.879-3.615-9.97-8.607-12.373-15.090-1.284 2.542-2.283 5.017-2.861 7.622-0.343 1.546-0.576 3.162-0.537 4.739 0.077 3.127 2.051 5.155 5.161 5.52 0.851 0.1 1.733 0.096 2.586 0.004 2.843-0.307 5.425-1.391 8.026-2.795zM45.778 6.815c5.917 2.413 10.466 6.216 13.894 11.525 0.856-2.378 1.575-4.618 1.77-7.011 0.355-4.358-2.945-7.089-6.808-6.979-3.076 0.088-5.892 1.161-8.856 2.465z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/ios.png b/data/interfaces/default/images/platforms/ios.png
new file mode 100644
index 00000000..819d2f50
Binary files /dev/null and b/data/interfaces/default/images/platforms/ios.png differ
diff --git a/data/interfaces/default/images/platforms/ios.svg b/data/interfaces/default/images/platforms/ios.svg
deleted file mode 100644
index 6892d3db..00000000
--- a/data/interfaces/default/images/platforms/ios.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>ios</title>
-<path fill="#fff" d="M23.38 27.263c-0.233 0.174-0.451 0.339-0.672 0.502-0.264 0.194-0.49 0.429-0.718 0.662-0.35 0.358-0.652 0.755-0.909 1.183-0.268 0.447-0.488 0.919-0.635 1.42-0.097 0.33-0.171 0.666-0.212 1.011-0.040 0.334-0.068 0.668-0.051 1.002 0.015 0.289 0.053 0.578 0.083 0.866 0.043 0.411 0.152 0.806 0.286 1.195 0.157 0.454 0.371 0.878 0.626 1.283 0.307 0.488 0.683 0.92 1.108 1.306 0.358 0.325 0.744 0.617 1.169 0.853 0.223 0.124 0.45 0.239 0.692 0.366-0.003 0.018-0.007 0.054-0.018 0.089-0.181 0.577-0.391 1.142-0.652 1.688-0.168 0.35-0.334 0.702-0.516 1.045-0.308 0.581-0.655 1.138-1.038 1.673-0.267 0.373-0.528 0.751-0.803 1.117-0.157 0.209-0.335 0.403-0.509 0.599-0.15 0.168-0.3 0.338-0.464 0.492-0.383 0.357-0.797 0.673-1.282 0.883-0.309 0.134-0.626 0.241-0.966 0.257-0.263 0.013-0.529 0.045-0.79 0.023-0.414-0.035-0.818-0.133-1.21-0.281-0.578-0.217-1.127-0.507-1.725-0.676-0.283-0.080-0.567-0.151-0.861-0.165-0.379-0.018-0.759-0.035-1.138-0.026-0.226 0.005-0.451 0.052-0.675 0.095-0.606 0.116-1.169 0.362-1.733 0.601-0.365 0.155-0.735 0.295-1.12 0.39-0.418 0.103-0.845 0.126-1.268 0.089-0.467-0.040-0.893-0.226-1.296-0.465-0.542-0.321-0.988-0.755-1.405-1.214-0.343-0.379-0.668-0.777-0.955-1.203-0.304-0.451-0.626-0.889-0.928-1.341-0.165-0.247-0.308-0.509-0.455-0.767-0.138-0.243-0.279-0.485-0.398-0.737-0.262-0.554-0.53-1.107-0.731-1.689-0.157-0.454-0.336-0.901-0.474-1.361-0.149-0.501-0.271-1.010-0.387-1.52-0.075-0.327-0.122-0.66-0.176-0.99-0.043-0.257-0.084-0.514-0.114-0.773-0.021-0.18-0.027-0.363-0.031-0.544-0.012-0.563-0.025-1.125-0.027-1.688-0.001-0.175 0.034-0.35 0.053-0.524 0.010-0.099 0.017-0.199 0.032-0.298 0.046-0.309 0.086-0.619 0.147-0.925 0.077-0.388 0.181-0.77 0.312-1.145 0.226-0.644 0.509-1.26 0.883-1.834 0.221-0.339 0.453-0.667 0.732-0.96 0.149-0.157 0.285-0.326 0.445-0.47 0.364-0.326 0.734-0.646 1.163-0.887 0.243-0.136 0.482-0.283 0.732-0.405 0.382-0.186 0.777-0.342 1.194-0.435 0.248-0.056 0.494-0.13 0.745-0.167 0.268-0.039 0.542-0.047 0.813-0.062 0.14-0.008 0.28-0.003 0.42-0.001 0.358 0.004 0.705 0.078 1.051 0.162 0.653 0.158 1.273 0.412 1.895 0.659 0.403 0.16 0.809 0.314 1.232 0.412 0.262 0.060 0.529 0.063 0.795 0.003 0.439-0.098 0.852-0.271 1.271-0.429 0.533-0.202 1.066-0.406 1.607-0.585 0.321-0.107 0.655-0.178 0.988-0.244 0.209-0.042 0.426-0.044 0.639-0.064 0.095-0.009 0.19-0.031 0.284-0.026 0.247 0.012 0.495 0.032 0.741 0.056 0.255 0.025 0.512 0.043 0.763 0.091 0.291 0.055 0.578 0.134 0.865 0.212 0.477 0.13 0.921 0.343 1.354 0.576 0.325 0.175 0.636 0.376 0.915 0.62 0.22 0.192 0.445 0.381 0.645 0.592 0.202 0.213 0.378 0.452 0.564 0.681 0.041 0.051 0.075 0.108 0.103 0.15z"></path>
-<path fill="#fff" d="M35.942 35.377c0.005-1.373 0.18-2.648 0.633-3.875 0.475-1.288 1.184-2.423 2.218-3.339 1.045-0.925 2.258-1.497 3.638-1.713 1.183-0.185 2.358-0.15 3.514 0.171 1.927 0.535 3.353 1.71 4.322 3.448 0.522 0.936 0.845 1.941 1.017 2.996 0.196 1.2 0.2 2.402 0.050 3.606-0.151 1.211-0.488 2.368-1.077 3.442-0.875 1.597-2.146 2.747-3.861 3.386-0.724 0.27-1.477 0.402-2.246 0.45-0.643 0.040-1.283 0.012-1.919-0.090-1.251-0.201-2.372-0.695-3.351-1.5-1.26-1.036-2.047-2.378-2.511-3.924-0.306-1.020-0.421-2.067-0.427-3.057zM38.822 35.21c0.011 0.241 0.019 0.482 0.033 0.723 0.046 0.813 0.197 1.607 0.47 2.375 0.318 0.894 0.782 1.698 1.492 2.342 1.026 0.931 2.234 1.26 3.59 1.055 0.956-0.145 1.745-0.615 2.403-1.315 0.655-0.697 1.069-1.527 1.347-2.432 0.252-0.817 0.364-1.656 0.39-2.508 0.032-1.033-0.068-2.052-0.368-3.045-0.281-0.93-0.706-1.783-1.378-2.497-0.996-1.057-2.224-1.491-3.661-1.33-0.961 0.108-1.773 0.531-2.453 1.214-0.621 0.624-1.040 1.372-1.336 2.193-0.375 1.042-0.516 2.123-0.529 3.225z"></path>
-<path fill="#fff" d="M53.361 42.907c0.213-0.767 0.421-1.513 0.633-2.277 0.105 0.058 0.196 0.109 0.286 0.159 0.858 0.477 1.775 0.766 2.751 0.873 0.617 0.068 1.232 0.080 1.845-0.032 0.554-0.102 1.065-0.304 1.5-0.671 0.647-0.545 0.89-1.251 0.822-2.077-0.068-0.828-0.513-1.425-1.176-1.883-0.566-0.392-1.187-0.679-1.826-0.927-0.747-0.29-1.476-0.617-2.153-1.050-0.568-0.364-1.087-0.784-1.509-1.316-0.598-0.753-0.893-1.612-0.893-2.572-0.001-1.248 0.428-2.32 1.326-3.194 0.548-0.534 1.201-0.9 1.915-1.161 0.681-0.249 1.388-0.371 2.109-0.401 0.953-0.039 1.9 0.026 2.83 0.252 0.423 0.103 0.831 0.245 1.223 0.436 0.069 0.034 0.136 0.071 0.217 0.113-0.227 0.731-0.451 1.456-0.68 2.194-0.047-0.020-0.085-0.035-0.121-0.053-0.785-0.41-1.622-0.63-2.503-0.697-0.517-0.039-1.032-0.040-1.542 0.063-0.47 0.096-0.901 0.278-1.278 0.58-0.605 0.483-0.822 1.119-0.748 1.872 0.067 0.684 0.431 1.182 0.975 1.568 0.562 0.399 1.183 0.687 1.812 0.957 0.726 0.312 1.46 0.606 2.138 1.020 0.618 0.377 1.186 0.811 1.647 1.376 0.545 0.668 0.86 1.433 0.95 2.29 0.089 0.854 0.005 1.687-0.333 2.482-0.399 0.938-1.056 1.65-1.927 2.169-0.747 0.446-1.56 0.702-2.417 0.833-0.781 0.119-1.566 0.136-2.353 0.081-1.051-0.075-2.072-0.278-3.028-0.744-0.164-0.080-0.322-0.171-0.492-0.262z"></path>
-<path fill="#fff" d="M30.64 31.384c0.899 0 1.786 0 2.683 0 0 4.098 0 8.191 0 12.293-0.892 0-1.782 0-2.683 0 0-4.094 0-8.188 0-12.293z"></path>
-<path fill="#fff" d="M12.027 24.009c-0.043-0.345-0.053-0.676-0.018-1.012 0.030-0.298 0.079-0.591 0.152-0.88 0.088-0.348 0.21-0.684 0.357-1.012 0.182-0.407 0.4-0.793 0.655-1.158 0.178-0.253 0.358-0.505 0.583-0.719 0.25-0.237 0.494-0.484 0.763-0.698 0.239-0.191 0.502-0.353 0.766-0.51 0.231-0.138 0.473-0.262 0.718-0.373 0.395-0.18 0.803-0.329 1.234-0.399 0.215-0.035 0.432-0.060 0.648-0.086 0.032-0.004 0.065 0.006 0.109 0.011 0.006 0.040 0.015 0.077 0.015 0.113 0.001 0.299 0.018 0.6-0.005 0.897-0.021 0.272-0.085 0.541-0.13 0.811-0.076 0.46-0.248 0.891-0.43 1.314-0.166 0.387-0.383 0.749-0.623 1.097-0.208 0.302-0.436 0.587-0.691 0.85-0.357 0.369-0.757 0.687-1.193 0.959-0.562 0.351-1.162 0.605-1.817 0.727-0.335 0.062-0.671 0.093-1.010 0.083-0.023-0.001-0.046-0.007-0.084-0.013z"></path>
-<path fill="#fff" d="M31.99 29.482c-0.796 0.017-1.438-0.468-1.6-1.23-0.139-0.654 0.045-1.321 0.625-1.73 0.188-0.133 0.397-0.221 0.625-0.251 0.682-0.092 1.281 0.053 1.698 0.648 0.256 0.365 0.317 0.779 0.255 1.215-0.083 0.577-0.395 0.982-0.925 1.219-0.214 0.096-0.444 0.126-0.677 0.13z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/kodi.png b/data/interfaces/default/images/platforms/kodi.png
new file mode 100644
index 00000000..282e09b9
Binary files /dev/null and b/data/interfaces/default/images/platforms/kodi.png differ
diff --git a/data/interfaces/default/images/platforms/kodi.svg b/data/interfaces/default/images/platforms/kodi.svg
deleted file mode 100644
index ba3e180c..00000000
--- a/data/interfaces/default/images/platforms/kodi.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>kodi</title>
-<path fill="#fff" d="M19.969 24.241c0-3.683-0-7.366 0-11.048 0-1.253 0.424-2.321 1.326-3.216 2.733-2.712 5.447-5.442 8.172-8.161 0.321-0.321 0.689-0.596 0.996-0.928 0.505-0.548 1.102-0.831 1.839-0.673 0.371 0.079 0.809 0.167 1.065 0.411 2.076 1.979 4.123 3.989 6.166 6.002 1.465 1.443 2.914 2.903 4.364 4.362 1.211 1.218 1.215 2.47-0.008 3.693-7.307 7.304-14.619 14.602-21.929 21.903-0.017 0.017-0.031 0.041-0.052 0.049-0.418 0.173-0.973 0.591-1.224 0.455-0.352-0.191-0.609-0.779-0.671-1.23-0.106-0.775-0.030-1.575-0.030-2.364-0-3.085-0-6.17-0-9.255-0.005 0-0.010 0-0.014 0z"></path>
-<path fill="#fff" d="M63.877 31.945c0.094 0.744-0.254 1.311-0.738 1.796-3.392 3.404-6.78 6.811-10.197 10.19-1.081 1.070-2.349 1.034-3.429-0.036-3.36-3.333-6.714-6.672-10.056-10.023-1.187-1.19-1.167-2.597 0.024-3.791 3.275-3.284 6.554-6.564 9.838-9.838 1.327-1.323 2.52-1.31 3.846 0.015 3.314 3.312 6.625 6.627 9.941 9.938 0.49 0.489 0.893 1.006 0.77 1.75z"></path>
-<path fill="#fff" d="M32.206 38.365c0.694-0.093 1.256 0.184 1.735 0.664 3.426 3.434 6.859 6.862 10.27 10.311 1.007 1.018 1.016 2.298 0.004 3.319-3.413 3.448-6.845 6.877-10.29 10.293-1 0.992-2.235 0.984-3.34 0.008-0.769-0.679-1.487-1.417-2.213-2.143-2.584-2.587-5.165-5.177-7.738-7.774-0.785-0.792-1.434-1.671-0.902-2.86 0.199-0.446 0.523-0.862 0.87-1.212 3.249-3.274 6.515-6.53 9.777-9.791 0.502-0.502 1.044-0.923 1.826-0.815z"></path>
-<path fill="#fff" d="M12.22 31.895c0 3.419 0.007 6.838-0.010 10.257-0.002 0.395-0.081 0.812-0.227 1.178-0.219 0.547-0.608 0.612-1.085 0.252-0.114-0.086-0.21-0.195-0.312-0.296-3.128-3.127-6.261-6.248-9.376-9.387-0.54-0.544-1.21-1.067-1.037-1.989 0.054-0.286 0.128-0.622 0.314-0.821 1.73-1.849 3.476-3.684 5.24-5.501 1.516-1.56 3.063-3.090 4.596-4.633 0.084-0.085 0.155-0.206 0.257-0.246 0.376-0.149 0.852-0.468 1.12-0.347 0.276 0.125 0.493 0.688 0.497 1.061 0.036 3.49 0.021 6.981 0.022 10.472z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/lg.svg b/data/interfaces/default/images/platforms/lg.svg
deleted file mode 100644
index ba6d28d7..00000000
--- a/data/interfaces/default/images/platforms/lg.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>lg</title>
-<path fill="#fff" d="M30.203 31.797c0 8.176-6.654 14.832-14.835 14.82-7.927-0.011-14.818-6.28-14.812-14.838 0.005-8.282 6.541-14.82 14.841-14.803 8.618 0.017 14.807 6.969 14.806 14.822zM26.577 32.388c-0.087 4.433-3.485 9.518-9.37 10.487-6.122 1.008-11.584-2.989-12.814-8.656-0.632-2.912-0.221-5.696 1.362-8.228 2.347-3.754 5.815-5.502 10.222-5.453 0-0.387 0-0.761 0-1.134-4.114-0.281-9.226 1.824-11.763 6.923-2.454 4.932-1.296 10.953 2.811 14.672 4.153 3.762 10.224 4.309 14.953 1.326 2.328-1.468 3.999-3.496 4.997-6.067 0.628-1.617 0.882-3.296 0.813-5.032-2.967 0-5.909 0-8.864 0 0 0.39 0 0.768 0 1.162 2.558-0 5.097-0 7.652-0zM15.991 37.112c0-0.129 0-0.221 0-0.313 0-3.731 0-7.463 0-11.194 0-0.060-0.004-0.119 0-0.179 0.009-0.118-0.038-0.166-0.16-0.163-0.278 0.006-0.556 0.012-0.833-0.002-0.178-0.008-0.237 0.042-0.237 0.23 0.005 4.194 0.005 8.389-0 12.583-0 0.198 0.065 0.239 0.249 0.237 1.224-0.007 2.448-0.004 3.672-0.004 0.072 0 0.143 0 0.244 0 0-0.343-0.008-0.665 0.003-0.987 0.006-0.166-0.050-0.214-0.214-0.212-0.82 0.007-1.641 0.003-2.461 0.003-0.078 0-0.155 0-0.263 0zM12.434 27.068c0.003-0.987-0.799-1.798-1.785-1.805s-1.799 0.796-1.805 1.782c-0.006 0.985 0.799 1.8 1.783 1.805 0.985 0.004 1.804-0.803 1.807-1.783z"></path>
-<path fill="#fff" d="M63.467 30.606c0 2.864 0 5.707 0 8.571-1.242 0-2.479 0-3.742 0 0-0.468 0-0.933 0-1.433-0.203 0.226-0.366 0.432-0.553 0.612-0.683 0.656-1.518 1-2.441 1.136-1.187 0.174-2.348 0.075-3.462-0.4-1.234-0.526-2.145-1.407-2.8-2.565-0.599-1.058-0.906-2.207-1.035-3.409-0.148-1.367-0.103-2.723 0.28-4.051 0.797-2.764 2.635-4.391 5.453-4.899 1.534-0.277 3.058-0.208 4.54 0.311 1.243 0.436 2.298 1.139 3.011 2.276 0.431 0.688 0.584 1.467 0.687 2.258 0.013 0.097 0.028 0.195 0.046 0.318-0.064 0.003-0.126 0.010-0.188 0.010-1.389 0.001-2.779-0.002-4.169 0.003-0.151 0.001-0.215-0.034-0.245-0.197-0.229-1.234-1.281-1.773-2.308-1.679-1.182 0.108-1.823 0.859-2.22 1.888-0.211 0.547-0.315 1.12-0.352 1.703-0.066 1.061-0.039 2.117 0.31 3.138 0.211 0.618 0.523 1.173 1.050 1.579 1.371 1.055 3.326 0.436 3.877-1.228 0.090-0.274 0.157-0.557 0.246-0.875-0.112 0-0.182 0-0.251 0-0.794 0-1.588-0.005-2.382 0.004-0.168 0.002-0.213-0.053-0.212-0.214 0.006-0.887 0.005-1.774 0.001-2.66-0.001-0.139 0.019-0.215 0.192-0.215 2.17 0.006 4.341 0.004 6.511 0.004 0.045 0 0.090 0.008 0.157 0.013z"></path>
-<path fill="#fff" d="M48.501 35.522c0 1.233 0 2.44 0 3.661-3.613 0-7.216 0-10.834 0 0-4.923 0-9.841 0-14.77 1.44 0 2.872 0 4.331 0 0 0.092 0 0.175 0 0.259 0 3.526 0 7.053 0 10.579 0 0.271 0 0.271 0.267 0.271 1.985 0 3.97 0 5.954 0 0.086 0 0.171 0 0.281 0z"></path>
-</svg>
\ No newline at end of file
diff --git a/data/interfaces/default/images/platforms/linux.svg b/data/interfaces/default/images/platforms/linux.svg
deleted file mode 100644
index d084d9fd..00000000
--- a/data/interfaces/default/images/platforms/linux.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>linux</title>
-<path fill="#fff" d="M53.080 44.39c1.297 0.519 1.843 1.562 2.151 2.781 0.107 0.425 0.202 0.852 0.298 1.28 0.185 0.826 0.529 1.553 1.097 2.208 0.483 0.557 0.912 1.189 1.236 1.851 0.61 1.249 0.377 2.332-0.746 3.144-0.863 0.624-1.826 1.129-2.791 1.59-1.804 0.862-3.404 1.945-4.733 3.474-1.278 1.471-2.901 2.465-4.86 2.821-2.532 0.46-4.745-0.742-5.767-3.105-0.085-0.197-0.305-0.451-0.487-0.472-1.435-0.168-2.884-0.229-4.313-0.433-1.862-0.264-3.671 0.014-5.488 0.331-0.755 0.132-1.517 0.22-2.27 0.36-0.185 0.034-0.421 0.149-0.509 0.3-1.115 1.91-2.913 2.439-4.942 2.396-1.596-0.033-3.137-0.444-4.541-1.201-1.825-0.983-3.802-1.277-5.811-1.522-0.996-0.122-2.007-0.261-2.963-0.551-1.469-0.445-2.111-1.593-1.886-3.117 0.057-0.389 0.087-0.802 0.242-1.154 0.544-1.236 0.364-2.48 0.172-3.747-0.095-0.623-0.137-1.28-0.050-1.901 0.169-1.21 0.912-2.108 2.048-2.442 1.809-0.531 3.105-1.588 4.129-3.139 0.336-0.509 0.527-0.921 0.476-1.526-0.184-2.187 0.299-4.278 1.051-6.311 1.495-4.044 3.876-7.56 6.564-10.887 2.323-2.876 3.356-6.167 3.176-9.848-0.119-2.432-0.366-4.863-0.044-7.296 0.285-2.154 0.927-4.156 2.531-5.727 1.339-1.311 2.995-1.935 4.813-2.227 2-0.322 3.984-0.322 5.914 0.341 2.542 0.873 4.049 2.757 4.91 5.223 0.822 2.353 0.992 4.802 1.027 7.268 0.021 1.47-0.052 2.946 0.052 4.41 0.134 1.887 0.944 3.555 2.033 5.071 0.895 1.247 1.855 2.449 2.812 3.65 2.172 2.726 4.078 5.606 5.209 8.936 0.99 2.915 1.236 5.862 0.333 8.851-0.025 0.081-0.035 0.166-0.068 0.319zM23.717 52.92c0.211 0.279 0.446 0.537 0.622 0.832 0.72 1.208 1.685 2.114 3.038 2.57 0.291 0.098 0.572 0.226 0.865 0.313 4.063 1.203 7.701 0.146 11.104-2.112 0.133-0.089 0.264-0.257 0.297-0.409 0.285-1.349 0.588-2.695 0.804-4.055 0.23-1.449 0.295-2.927 0.573-4.364 0.268-1.384 0.985-2.525 2.336-3.166 0.153-0.073 0.264-0.324 0.312-0.513 0.352-1.401 1.167-1.961 2.615-1.749 1.397 0.205 2.639 0.802 3.805 1.567 0.794 0.521 1.359 1.183 1.233 2.3 0.205-0.088 0.401-0.206 0.437-0.361 0.157-0.695-0.052-1.338-0.549-1.809-0.536-0.508-1.148-0.945-1.765-1.356-0.484-0.322-1.026-0.558-1.548-0.835 0.498-2.254 0.127-4.365-0.736-6.412-0.968-2.295-2.969-4.985-3.945-5.162 0.301 0.342 0.524 0.599 0.752 0.852 1.913 2.126 3.075 4.583 3.212 7.464 0.047 0.979-0.077 1.957-0.521 2.861-0.478-0.067-0.904-0.127-1.343-0.189-0.486-2.601-1.368-5.029-2.583-7.33-1.655-3.133-2.995-6.395-4.112-9.753-0.286-0.861-0.541-1.732-0.792-2.539-0.671 0.455-1.294 0.935-1.97 1.322-0.91 0.521-1.843 1.009-2.8 1.437-0.692 0.31-1.422 0.598-2.164 0.723-1.316 0.222-2.445-0.263-3.433-1.151-0.585-0.525-1.237-0.974-1.953-1.531-0.182 2.112-0.617 3.975-1.336 5.748-1.021 2.52-2.114 5.011-3.221 7.495-0.863 1.937-1.52 3.927-1.826 6.027-0.105 0.717-0.177 1.438-0.263 2.158-0.077 0.016-0.153 0.033-0.23 0.049-0.318-0.873-0.735-1.725-0.935-2.624-0.434-1.955-0.023-3.852 0.724-5.662 0.509-1.234 1.152-2.413 1.729-3.62 0.091-0.192 0.148-0.4 0.221-0.6-1.5 2.206-2.783 4.497-3.407 7.091-0.878 3.653 0.168 6.476 3.379 8.392 1.048 0.626 2.004 1.423 2.94 2.214 0.925 0.782 1.716 1.701 2.203 2.838 0.673 1.571 0.152 2.823-1.624 2.958-0.035 0.003-0.068 0.041-0.146 0.091zM21.211 62.145c0.682-0.143 1.389-0.215 2.041-0.443 1.86-0.652 2.861-2.645 2.114-4.467-0.466-1.138-1.144-2.232-1.917-3.194-1.573-1.96-3.005-3.996-4.125-6.249-0.322-0.648-0.642-1.307-1.052-1.898-0.42-0.606-0.882-1.216-1.444-1.683-1.349-1.122-2.731-0.939-3.851 0.412-0.126 0.152-0.261 0.3-0.362 0.469-0.865 1.442-2.094 2.337-3.727 2.819-1.63 0.48-2.169 1.497-1.912 3.183 0.241 1.588 0.513 3.169-0.207 4.713-0.072 0.155-0.083 0.34-0.114 0.512-0.274 1.516 0.22 2.306 1.711 2.665 0.574 0.138 1.163 0.233 1.751 0.286 2.416 0.219 4.768 0.618 6.953 1.791 1.262 0.677 2.672 0.976 4.142 1.086zM43.475 43.443c-0.62 0.345-1.092 0.844-1.301 1.507-0.27 0.852-0.574 1.728-0.629 2.608-0.181 2.905-0.622 5.747-1.541 8.519-0.259 0.781-0.378 1.632-0.415 2.458-0.115 2.571 1.937 4.465 4.499 4.215 1.961-0.191 3.58-1.128 4.819-2.576 1.56-1.823 3.493-3.034 5.63-4.008 0.636-0.29 1.261-0.624 1.843-1.011 0.989-0.658 1.167-1.376 0.616-2.426-0.263-0.501-0.565-1.006-0.95-1.413-0.821-0.866-1.222-1.898-1.455-3.037-0.122-0.598-0.283-1.199-0.517-1.761-0.661-1.59-2.618-1.998-3.977-0.971-0.773 0.584-1.668 1.070-2.582 1.389-1.43 0.5-2.621-0.039-3.302-1.393-0.319-0.633-0.48-1.346-0.737-2.099zM30.398 22.602c0.957 0.022 1.793-0.337 2.611-0.792 0.821-0.456 1.661-0.879 2.506-1.291 0.802-0.391 1.536-0.858 2.008-1.642 0.533-0.888 0.351-1.701-0.501-2.28-0.145-0.098-0.298-0.188-0.457-0.259-1.396-0.629-2.789-1.261-4.191-1.875-1.594-0.698-3.117-0.613-4.518 0.484-0.898 0.703-1.785 1.419-2.668 2.139-0.641 0.523-0.799 1.104-0.36 1.796 0.309 0.486 0.754 0.903 1.195 1.284 0.612 0.529 1.297 0.972 1.915 1.493 0.719 0.605 1.514 0.958 2.461 0.943zM36.804 15.898c1.332-1.645 1.302-4.347-0.029-5.893-1.299-1.509-3.269-1.431-4.428 0.191-0.736 1.031-0.941 2.191-0.77 3.449 0.502 0.162 0.993 0.32 1.413 0.455 0.142-0.637 0.221-1.247 0.422-1.813 0.191-0.538 0.601-0.96 1.227-0.926 0.59 0.032 0.918 0.469 1.117 0.987 0.403 1.051 0.328 2.048-0.418 2.967 0.504 0.2 0.968 0.385 1.466 0.583zM28.084 14.13c0.249-0.104 0.55-0.187 0.8-0.348 0.153-0.099 0.322-0.316 0.325-0.483 0.018-1.004-0.179-1.966-0.78-2.798-0.984-1.362-2.5-1.265-3.244 0.243-0.798 1.617-0.656 3.227 0.247 4.774 0.095 0.162 0.244 0.292 0.395 0.467 0.274-0.209 0.507-0.388 0.748-0.572-0.669-0.848-0.859-1.732-0.59-2.707 0.115-0.418 0.295-0.823 0.779-0.87 0.524-0.050 0.797 0.35 0.944 0.77 0.17 0.484 0.251 0.999 0.376 1.523z"></path>
-<path fill="#fff" d="M25.504 17.748c0.166 0.21 0.315 0.438 0.502 0.626 2.229 2.245 4.038 2.516 6.387 1.462 1.286-0.577 2.487-1.284 3.474-2.315 0.097-0.102 0.265-0.136 0.4-0.202 0.037 0.047 0.075 0.093 0.112 0.14-0.135 0.18-0.245 0.388-0.409 0.538-1.386 1.262-3.005 2.118-4.798 2.625-1.216 0.344-2.416 0.163-3.483-0.494-0.739-0.456-1.403-1.040-2.068-1.605-0.172-0.146-0.221-0.436-0.326-0.66 0.069-0.038 0.138-0.077 0.208-0.115z"></path>
-<path fill="#fff" d="M29.612 15.203c-0.358 0.113-0.623 0.63-1.159 0.276 0.352-0.434 0.709-0.555 1.159-0.276z"></path>
-<path fill="#fff" d="M31.169 15.216c0.462-0.311 0.806-0.139 1.14 0.241-0.512 0.425-0.773-0.169-1.14-0.241z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/macos.svg b/data/interfaces/default/images/platforms/macos.svg
deleted file mode 100644
index 5579fcb5..00000000
--- a/data/interfaces/default/images/platforms/macos.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>macOS</title>
-<path fill="#fff" d="M56.427 21.621c-4.621 3.193-7.264 7.356-6.859 13.082 0.401 5.687 3.507 9.477 8.49 11.933-0.859 2.561-1.826 5.027-3.285 7.239-1.417 2.149-2.977 4.206-4.529 6.261-0.458 0.606-1.069 1.114-1.669 1.593-2.419 1.931-5.125 2.192-7.984 1.226-1.188-0.401-2.312-0.993-3.504-1.375-2.568-0.823-5.146-0.882-7.706 0.106-1.356 0.524-2.714 1.048-4.095 1.497-2.516 0.818-4.843 0.428-6.873-1.309-0.834-0.714-1.655-1.464-2.372-2.292-4.982-5.755-8.102-12.407-9.339-19.91-0.759-4.604-0.721-9.198 1.008-13.619 2.029-5.189 5.633-8.737 11.118-10.132 2.477-0.63 4.971-0.634 7.41 0.322 1.456 0.57 2.94 1.067 4.403 1.619 1.255 0.474 2.488 0.462 3.742-0.013 1.586-0.602 3.161-1.245 4.782-1.735 5.946-1.799 11.228-0.63 15.737 3.705 0.548 0.527 0.991 1.165 1.526 1.803z"></path>
-<path fill="#fff" d="M44.761 0.019c0.964 5.989-4.334 14.858-12.66 14.692-0.324-1.196-0.139-2.393 0.11-3.57 1.229-5.811 6.154-10.347 12.039-11.119 0.168-0.022 0.343-0.003 0.51-0.003z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/msedge.svg b/data/interfaces/default/images/platforms/msedge.svg
deleted file mode 100644
index 79f6d9f4..00000000
--- a/data/interfaces/default/images/platforms/msedge.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>msedge</title>
-<path fill="#fff" d="M27.374 24.467c0.31-0.182 0.635-0.345 0.965-0.487l0.037-0.015c0.001-0 0.002-0.001 0.003-0.001 0.592-0.25 1.213-0.433 1.844-0.543 0.494-0.086 0.996-0.129 1.495-0.129 1.855 0 3.592 0.591 5.017 1.609-0.35-0.579-0.742-1.141-1.175-1.683-1.129-1.413-2.516-2.664-4.12-3.719-1.083-0.712-2.262-1.331-3.504-1.839-2.715-1.114-5.743-1.703-8.759-1.703-3.885 0-7.654 1.106-10.901 3.198-3.086 1.989-5.566 4.773-7.177 8.055-0.245 1.575-0.369 3.188-0.369 4.798 0 8.102 3.099 15.769 8.727 21.59 5.666 5.863 13.196 9.2 21.301 9.464-0.709-0.233-1.407-0.505-2.093-0.816-2.617-1.183-4.931-2.862-6.878-4.99-0.053-0.056-0.109-0.12-0.166-0.183-3.452-3.863-5.354-8.848-5.354-14.035 0-6.244 2.746-12.13 7.533-16.148 1.109-0.929 2.311-1.744 3.576-2.423z"></path>
-<path fill="#fff" d="M62.724 28.806c0.085-0.731 0.129-1.499 0.129-2.285 0-0.728-0.048-1.455-0.142-2.162-0.194-1.445-0.74-3.421-1.391-5.034-1.995-4.943-5.351-9.205-9.707-12.326-5.929-4.249-11.855-6.062-19.813-6.062-13.874 0-25.737 8.96-29.688 21.849 1.488-1.908 3.295-3.562 5.352-4.888 3.489-2.248 7.538-3.437 11.711-3.437 3.209 0 6.434 0.628 9.327 1.815 1.33 0.545 2.595 1.209 3.759 1.973 1.736 1.141 3.24 2.499 4.468 4.035 1.923 2.408 3.107 5.161 3.52 8.182 0.091 0.507 0.137 1.025 0.139 1.539v0.028c0 1.95-0.623 3.794-1.801 5.334-0.247 0.323-0.521 0.634-0.814 0.922-0.014 0.051-0.032 0.165-0.032 0.424 0 0.411 0.18 0.794 0.497 1.058 0.131 0.077 0.265 0.151 0.399 0.221l0.024 0.013c0.017 0.010 0.033 0.019 0.050 0.027l0.035 0.017c2.312 1.216 4.927 1.833 7.773 1.833 4.039 0 7.64-1.020 10.414-2.948 3.289-2.287 5.293-5.789 5.793-10.128z"></path>
-<path fill="#fff" d="M57.865 48.926l0.112-0.174c0.023-0.036 0.046-0.071 0.069-0.107 0.011-0.033 0.017-0.068 0.017-0.102 0-0.112-0.058-0.213-0.156-0.271-0.065-0.039-0.14-0.052-0.211-0.040-0.066 0.037-0.133 0.074-0.199 0.109l-0.024 0.013c-0.017 0.010-0.034 0.019-0.051 0.028-3.483 1.886-7.44 2.883-11.446 2.883-4.047 0-8.008-0.864-11.454-2.499-3.369-1.598-6.205-3.906-8.2-6.675-2.063-2.862-3.19-6.176-3.261-9.585-0.009-0.153-0.013-0.309-0.013-0.475 0-0.243 0.010-0.482 0.029-0.712l0.002-0.024c0.061-0.736 0.214-1.452 0.449-2.134-3.683 3.663-5.767 8.634-5.767 13.876 0 4.818 1.767 9.449 4.974 13.039 0.050 0.056 0.098 0.11 0.148 0.164 3.675 4.016 8.888 6.334 14.317 6.371 6.007-1.052 11.532-3.838 15.98-8.059 1.778-1.686 3.353-3.579 4.685-5.627z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/opera.png b/data/interfaces/default/images/platforms/opera.png
new file mode 100644
index 00000000..a7990fe8
Binary files /dev/null and b/data/interfaces/default/images/platforms/opera.png differ
diff --git a/data/interfaces/default/images/platforms/opera.svg b/data/interfaces/default/images/platforms/opera.svg
deleted file mode 100644
index 8cb68341..00000000
--- a/data/interfaces/default/images/platforms/opera.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>opera</title>
-<path fill="#fff" d="M51.873 9.622c-0.491-0.255-0.977-0.521-1.473-0.765-6.237-3.061-12.636-3.543-18.966-0.564-7.818 3.681-12.694 9.876-14.465 18.384-1.355 6.514-0.821 12.906 2.195 18.856 3.566 7.035 9.123 11.838 17.005 13.501 5.47 1.154 10.613 0.062 15.417-2.737 0.194-0.113 0.388-0.224 0.655-0.379-1.67 2.352-8.728 5.938-13.678 6.986-5.171 1.095-10.299 0.852-15.348-0.661-10.409-3.119-20.778-12.617-21.69-27.54-0.836-13.666 7.46-25.983 20.084-30.564 11.411-4.141 23.228-0.959 30.264 5.481z"></path>
-<path fill="#fff" d="M23.473 15.562c1.020-1.256 2.137-2.394 3.39-3.392 2.879-2.294 6.024-4.147 9.691-4.733 6.245-0.998 12.131-0.176 17.114 4.14 2.68 2.321 4.586 5.237 6.138 8.387 1.601 3.249 2.644 6.682 2.89 10.302 0.615 9.036-2.155 16.904-8.336 23.544-1.74 1.87-3.979 2.995-6.332 3.802-6.824 2.34-13.274 1.472-19.292-2.525-1.903-1.264-3.632-2.72-5.012-4.563 0.567 0.505 1.112 1.039 1.706 1.511 5.102 4.060 11.475 3.778 16.305-0.672 3.329-3.067 5.269-6.896 6.29-11.242 0.784-3.334 1.11-6.711 0.757-10.128-0.489-4.737-1.96-9.13-4.794-12.996-1.722-2.35-3.868-4.253-6.657-5.222-4.687-1.628-8.867-0.608-12.539 2.664-0.42 0.374-0.812 0.778-1.219 1.166-0.005 0.005-0.031-0.013-0.1-0.043z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/pht.png b/data/interfaces/default/images/platforms/pht.png
new file mode 100644
index 00000000..33e0d3a2
Binary files /dev/null and b/data/interfaces/default/images/platforms/pht.png differ
diff --git a/data/interfaces/default/images/platforms/playstation.png b/data/interfaces/default/images/platforms/playstation.png
new file mode 100644
index 00000000..c6a7fb0b
Binary files /dev/null and b/data/interfaces/default/images/platforms/playstation.png differ
diff --git a/data/interfaces/default/images/platforms/playstation.svg b/data/interfaces/default/images/platforms/playstation.svg
deleted file mode 100644
index 0a948c1b..00000000
--- a/data/interfaces/default/images/platforms/playstation.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>playstation</title>
-<path fill="#fff" d="M34.399 56.809c-3.399-1.165-6.699-2.296-10.050-3.444 0-15.391 0-30.761 0-46.173 0.562 0.154 1.134 0.308 1.704 0.469 4.119 1.159 8.246 2.29 12.353 3.49 2.137 0.624 4.145 1.568 5.986 2.839 3.781 2.611 5.726 6.217 5.83 10.808 0.053 2.333-0.125 4.642-0.944 6.853-0.224 0.603-0.507 1.198-0.849 1.742-1.153 1.834-2.831 2.756-5.006 2.744-1.69-0.009-3.249-0.53-4.806-1.242 0-0.205 0-0.406 0-0.607-0-5.427 0.001-10.855-0.001-16.282-0.001-1.212-0.711-2.262-1.825-2.719-1.122-0.46-2.021 0.005-2.265 1.198-0.071 0.347-0.090 0.711-0.091 1.067-0.016 12.851-0.026 25.703-0.037 38.554 0 0.203 0 0.404 0 0.705z"></path>
-<path fill="#fff" d="M36.417 56.074c0-2.008 0-3.983 0-5.989 0.179-0.072 0.348-0.146 0.521-0.21 4.676-1.709 9.353-3.416 14.030-5.125 0.736-0.269 1.478-0.525 2.197-0.834 0.354-0.152 0.694-0.376 0.985-0.631 0.532-0.465 0.465-0.962-0.202-1.214-0.533-0.202-1.116-0.336-1.685-0.371-1.472-0.091-2.931 0.018-4.343 0.506-3.657 1.266-7.315 2.526-10.973 3.787-0.156 0.054-0.313 0.102-0.509 0.166 0-2.089 0-4.129 0-6.24 0.638-0.23 1.282-0.501 1.948-0.695 3.878-1.129 7.825-1.765 11.874-1.432 3.1 0.254 6.167 0.725 9.104 1.816 1.012 0.376 1.975 0.848 2.831 1.516 0.656 0.512 1.177 1.128 1.517 1.899 0.288 0.655 0.254 1.297-0.171 1.838-0.426 0.543-0.916 1.061-1.461 1.482-1.089 0.839-2.346 1.389-3.634 1.852-7.203 2.593-14.41 5.177-21.615 7.762-0.126 0.045-0.257 0.073-0.414 0.117z"></path>
-<path fill="#fff" d="M22.222 35.254c0 2.044 0 4.020 0 6.048-0.848 0.323-1.704 0.65-2.56 0.974-2.806 1.060-5.613 2.118-8.419 3.18-0.222 0.084-0.444 0.178-0.65 0.295-0.286 0.164-0.559 0.368-0.534 0.747 0.025 0.369 0.297 0.581 0.605 0.695 0.363 0.135 0.748 0.269 1.13 0.292 1.985 0.121 3.942 0.068 5.825-0.734 1.268-0.54 2.589-0.958 3.886-1.431 0.158-0.057 0.317-0.114 0.52-0.187 0 1.821 0 3.6 0 5.466-0.948 0.16-1.916 0.327-2.884 0.488-3.535 0.586-7.010 0.134-10.449-0.675-1.622-0.382-3.231-0.845-4.807-1.385-0.775-0.265-1.523-0.709-2.175-1.211-1.708-1.316-1.692-3.257 0.017-4.57 0.59-0.453 1.262-0.809 1.925-1.154 2.262-1.176 4.694-1.93 7.084-2.786 3.594-1.288 7.194-2.56 10.792-3.836 0.207-0.073 0.42-0.13 0.697-0.214z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/plex.svg b/data/interfaces/default/images/platforms/plex.svg
deleted file mode 100644
index 16ab26ac..00000000
--- a/data/interfaces/default/images/platforms/plex.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>plex</title>
-<path fill="#fff" d="M9.528 63.949c8.213-10.706 16.347-21.309 24.511-31.952-8.148-10.627-16.281-21.235-24.502-31.957 0.352 0 0.585 0 0.818 0 3.256 0 6.512 0.004 9.769-0.001 2.944-0.004 5.887-0.010 8.831-0.035 0.493-0.004 0.828 0.158 1.132 0.551 8.077 10.413 16.164 20.818 24.249 31.225 0.040 0.052 0.068 0.114 0.137 0.233-0.124 0.173-0.256 0.371-0.401 0.559-7.992 10.281-15.987 20.56-23.973 30.847-0.298 0.383-0.606 0.582-1.113 0.58-6.267-0.015-12.534-0.009-18.802-0.011-0.169 0-0.338-0.019-0.656-0.038z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/plexamp.svg b/data/interfaces/default/images/platforms/plexamp.svg
deleted file mode 100644
index 2ff2ee5e..00000000
--- a/data/interfaces/default/images/platforms/plexamp.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>plexamp</title>
-<path fill="#fff" d="M36.553 54.883c1.174 0 2.191 0 3.242 0 5.304-7.575 10.611-15.157 15.923-22.743 2.767 0 5.518 0 8.282 0 0 0.817 0 1.589 0 2.409-2.503 0-4.977 0-7.481 0-5.394 7.693-10.775 15.369-16.156 23.045-2.692 0-5.368 0-8.164 0 5.977-8.567 11.906-17.067 17.873-25.62-5.357-7.668-10.712-15.332-16.044-22.963-1.088 0-2.12 0-3.256 0 5.372 7.696 10.698 15.327 16.043 22.985-5.995 8.55-11.973 17.078-17.956 25.613-2.671 0-5.325 0-8.108 0 5.975-8.58 11.899-17.085 17.852-25.633-5.34-7.654-10.679-15.308-16.034-22.983-1.068 0-2.144 0-3.342 0 5.266 7.527 10.492 14.996 15.765 22.532-11.713 0-23.328 0-34.99 0 0-0.683 0-1.37 0-2.114 10.297 0 20.592 0 31.080 0-5.388-7.731-10.687-15.335-16.037-23.013 2.738 0 5.369 0 8.090 0 5.939 8.469 11.918 16.994 17.931 25.567-5.313 7.599-10.621 15.192-15.982 22.862 1.146 0 2.192 0 3.303 0 5.295-7.577 10.619-15.195 15.96-22.837-5.94-8.518-11.868-17.020-17.849-25.598 2.772 0 5.425 0 8.13 0 5.962 8.492 11.946 17.015 17.954 25.572-5.322 7.611-10.632 15.206-16.025 22.919z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/pmh.png b/data/interfaces/default/images/platforms/pmh.png
new file mode 100644
index 00000000..5ad5148e
Binary files /dev/null and b/data/interfaces/default/images/platforms/pmh.png differ
diff --git a/data/interfaces/default/images/platforms/pms.png b/data/interfaces/default/images/platforms/pms.png
new file mode 100644
index 00000000..5ad5148e
Binary files /dev/null and b/data/interfaces/default/images/platforms/pms.png differ
diff --git a/data/interfaces/default/images/platforms/roku.png b/data/interfaces/default/images/platforms/roku.png
new file mode 100644
index 00000000..61eeaaf1
Binary files /dev/null and b/data/interfaces/default/images/platforms/roku.png differ
diff --git a/data/interfaces/default/images/platforms/roku.svg b/data/interfaces/default/images/platforms/roku.svg
deleted file mode 100644
index 1bbe8c17..00000000
--- a/data/interfaces/default/images/platforms/roku.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>roku</title>
-<path fill="#fff" d="M32.375 26.152c1.731 0 3.449 0 5.215 0 0 1.959 0 3.917 0 5.874 0.025 0.010 0.049 0.020 0.074 0.029 0.069-0.067 0.138-0.133 0.206-0.2 1.813-1.815 3.628-3.628 5.436-5.448 0.186-0.187 0.373-0.274 0.641-0.273 3.345 0.011 6.691 0.011 10.036 0.014 0.083 0 0.167 0 0.291 0 0 0.125 0 0.233 0 0.342 0 2.406-0.003 4.811 0.002 7.217 0.002 0.648 0.008 1.297 0.057 1.943 0.026 0.351 0.115 0.706 0.23 1.041 0.224 0.652 0.693 0.994 1.395 1.033 1.254 0.068 2.142-0.501 2.763-1.547 0.057-0.097 0.071-0.231 0.072-0.348 0.003-3.148 0.002-6.296 0.002-9.444 0-0.064 0-0.128 0-0.214 1.745 0 3.467 0 5.206 0 0 5.095 0 10.184 0 15.309-0.342 0-0.686 0.013-1.028-0.008-0.097-0.006-0.198-0.099-0.282-0.17-0.635-0.544-1.266-1.093-1.899-1.639-0.070-0.060-0.143-0.117-0.223-0.182-0.46 0.484-0.958 0.895-1.514 1.235-2.156 1.319-4.425 1.421-6.733 0.523-1.821-0.709-2.835-2.131-3.176-4.036-0.074-0.414-0.1-0.841-0.102-1.262-0.012-2.904-0.012-5.807-0.017-8.711-0-0.074 0-0.149-0.048-0.257-2.171 2.162-4.343 4.323-6.535 6.505 2.656 2.659 5.296 5.301 7.973 7.982-0.124 0.012-0.193 0.025-0.262 0.025-2.011 0.001-4.022-0.002-6.033 0.005-0.221 0.001-0.366-0.090-0.513-0.236-1.913-1.901-3.83-3.798-5.746-5.695-0.072-0.071-0.146-0.139-0.266-0.252 0 2.083 0 4.105 0 6.149-1.753 0-3.476 0-5.222 0-0-5.089-0-10.177-0-15.301z"></path>
-<path fill="#fff" d="M5.254 34.965c0 2.176 0 4.323 0 6.494-1.765 0-3.498 0-5.254 0 0-6.501 0-13.014 0-19.563 0.103 0 0.204 0 0.305 0 2.471 0 4.943-0.032 7.413 0.009 2.354 0.040 4.413 0.852 6.031 2.609 1.105 1.2 1.654 2.629 1.556 4.274-0.087 1.474-0.719 2.713-1.746 3.744-0.414 0.416-0.91 0.751-1.371 1.12-0.071 0.057-0.151 0.103-0.25 0.17 1.83 2.546 3.647 5.075 5.491 7.641-1.997 0-3.95 0-5.94 0-0.050-0.063-0.123-0.147-0.187-0.236-1.438-1.997-2.877-3.993-4.308-5.995-0.14-0.196-0.283-0.289-0.533-0.273-0.391 0.024-0.785 0.006-1.209 0.006zM5.27 25.152c0 2.206 0 4.359 0 6.509 0.668 0 1.314 0.004 1.959-0.003 0.129-0.002 0.26-0.038 0.387-0.070 1.341-0.331 2.383-1.558 2.457-2.892 0.085-1.529-0.736-2.802-2.139-3.33-0.865-0.326-1.759-0.169-2.664-0.215z"></path>
-<path fill="#fff" d="M31.358 33.801c0.011 4.148-3.253 7.916-7.941 8.003-4.209 0.078-7.868-3.158-8.105-7.559-0.24-4.45 3.133-8.17 7.548-8.416 4.528-0.252 8.465 3.251 8.498 7.971zM25.877 33.755c0.007-0.559-0.076-1.17-0.257-1.767-0.213-0.701-0.534-1.343-1.085-1.845-0.768-0.699-1.74-0.689-2.465 0.050-0.259 0.264-0.504 0.569-0.663 0.9-0.843 1.75-0.854 3.526-0.075 5.303 0.178 0.407 0.431 0.769 0.762 1.071 0.769 0.703 1.677 0.705 2.451 0.007 0.347-0.313 0.6-0.694 0.797-1.114 0.378-0.804 0.535-1.655 0.535-2.605z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/safari.png b/data/interfaces/default/images/platforms/safari.png
new file mode 100644
index 00000000..be13b149
Binary files /dev/null and b/data/interfaces/default/images/platforms/safari.png differ
diff --git a/data/interfaces/default/images/platforms/safari.svg b/data/interfaces/default/images/platforms/safari.svg
deleted file mode 100644
index 93722050..00000000
--- a/data/interfaces/default/images/platforms/safari.svg
+++ /dev/null
@@ -1,66 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>safari</title>
-<path fill="#fff" d="M34.444 1.31c0.521 0.073 1.041 0.154 1.563 0.218 11.7 1.421 21.89 9.882 25.441 21.121 0.843 2.667 1.343 5.393 1.393 8.192 0.159 8.797-2.772 16.406-8.924 22.7-4.337 4.437-9.624 7.197-15.712 8.403-2.906 0.576-5.842 0.746-8.791 0.469-7-0.658-13.103-3.366-18.228-8.18-4.862-4.568-7.934-10.163-9.1-16.731-3.086-17.368 8.123-31.661 22.762-35.287 1.629-0.404 3.282-0.68 4.958-0.802 0.157-0.011 0.31-0.067 0.465-0.102 1.391-0 2.782-0 4.173-0zM60.324 31.948c-0.002-15.541-12.55-28.080-28.114-28.094-15.55-0.013-28.121 12.503-28.116 27.995 0.005 15.671 12.523 28.198 28.144 28.162 15.529-0.036 28.088-12.584 28.086-28.062z"></path>
-<path fill="#fff" d="M12.553 50.057c0.2-0.297 0.384-0.606 0.603-0.888 3.135-4.037 6.278-8.068 9.412-12.107 1.993-2.568 3.977-5.143 5.957-7.722 0.378-0.493 0.81-0.909 1.329-1.254 7.082-4.707 14.16-9.422 21.239-14.134 0.152-0.101 0.309-0.195 0.507-0.32 0.042 0.298-0.16 0.437-0.28 0.597-2.658 3.552-5.321 7.1-7.984 10.649-2.344 3.123-4.692 6.244-7.030 9.371-0.619 0.828-1.347 1.538-2.211 2.101-6.869 4.473-13.739 8.944-20.611 13.412-0.25 0.162-0.52 0.293-0.782 0.438-0.050-0.048-0.099-0.095-0.149-0.143z"></path>
-<path fill="#fff" d="M32.607 8.003c-0 0.715 0.006 1.431-0.002 2.146-0.005 0.44-0.145 0.671-0.377 0.672-0.254 0.001-0.442-0.267-0.445-0.699-0.008-1.43-0.005-2.861-0-4.291 0-0.12 0.006-0.263 0.070-0.352 0.074-0.103 0.222-0.226 0.325-0.215 0.136 0.013 0.3 0.122 0.377 0.238 0.069 0.104 0.049 0.275 0.050 0.417 0.004 0.695 0.002 1.39 0.002 2.085z"></path>
-<path fill="#fff" d="M32.607 55.822c-0 0.632 0 1.264-0 1.896 0 0.102 0.004 0.204-0.001 0.306-0.016 0.335-0.199 0.591-0.412 0.583-0.209-0.008-0.408-0.267-0.41-0.599-0.009-1.448-0.008-2.895-0.004-4.343 0-0.119 0.006-0.27 0.076-0.348 0.095-0.107 0.259-0.225 0.381-0.214s0.271 0.156 0.337 0.28c0.060 0.114 0.032 0.279 0.032 0.421 0.003 0.673 0.001 1.346 0.001 2.018z"></path>
-<path fill="#fff" d="M48.084 53.181c-0.007 0.291-0.331 0.497-0.54 0.368-0.167-0.104-0.313-0.261-0.432-0.422-0.788-1.068-1.568-2.143-2.348-3.217-0.084-0.115-0.171-0.233-0.228-0.362-0.089-0.202-0.091-0.397 0.125-0.538 0.195-0.127 0.351-0.049 0.491 0.090 0.086 0.086 0.163 0.183 0.235 0.282 0.816 1.124 1.632 2.248 2.444 3.375 0.105 0.147 0.186 0.311 0.253 0.425z"></path>
-<path fill="#fff" d="M9.372 45.522c-0.095-0.074-0.24-0.129-0.267-0.219-0.041-0.14-0.044-0.324 0.017-0.452 0.053-0.113 0.209-0.186 0.33-0.257 1.2-0.699 2.402-1.396 3.606-2.090 0.123-0.071 0.254-0.136 0.389-0.177 0.205-0.063 0.393 0.021 0.445 0.215 0.035 0.13-0.024 0.309-0.095 0.435-0.054 0.095-0.189 0.149-0.295 0.21-1.203 0.694-2.408 1.387-3.613 2.077-0.158 0.091-0.327 0.164-0.518 0.258z"></path>
-<path fill="#fff" d="M28.078 53.293c-0.118 0.553-0.251 1.17-0.383 1.788-0.17 0.798-0.338 1.596-0.51 2.393-0.026 0.119-0.055 0.24-0.101 0.352-0.083 0.206-0.269 0.279-0.449 0.199-0.123-0.055-0.236-0.209-0.278-0.343-0.039-0.123 0.011-0.281 0.040-0.419 0.275-1.317 0.554-2.634 0.833-3.951 0.025-0.12 0.058-0.238 0.091-0.356 0.064-0.23 0.228-0.343 0.456-0.319 0.224 0.024 0.277 0.212 0.3 0.403 0.007 0.060 0.001 0.122 0.001 0.252z"></path>
-<path fill="#fff" d="M16.594 17.465c0.016 0.302-0.287 0.53-0.509 0.427-0.163-0.075-0.308-0.199-0.443-0.321-0.992-0.885-1.98-1.775-2.967-2.665-0.121-0.109-0.267-0.214-0.333-0.354-0.058-0.124-0.071-0.317-0.014-0.436 0.089-0.185 0.289-0.216 0.479-0.124 0.090 0.044 0.17 0.113 0.245 0.181 1.095 0.985 2.189 1.97 3.279 2.96 0.116 0.106 0.199 0.249 0.263 0.332z"></path>
-<path fill="#fff" d="M16.832 53.578c-0.39 0.027-0.586-0.249-0.46-0.517 0.051-0.109 0.123-0.211 0.195-0.309 0.825-1.139 1.651-2.276 2.479-3.413 0.072-0.098 0.145-0.199 0.233-0.281 0.154-0.143 0.327-0.154 0.498-0.023 0.167 0.128 0.225 0.286 0.116 0.48-0.050 0.089-0.105 0.175-0.164 0.257-0.826 1.138-1.648 2.278-2.483 3.41-0.127 0.171-0.31 0.3-0.413 0.398z"></path>
-<path fill="#fff" d="M52.191 49.469c0.015 0.277-0.306 0.495-0.538 0.41-0.13-0.047-0.252-0.134-0.357-0.228-1.062-0.951-2.12-1.906-3.179-2.861-0.045-0.041-0.087-0.086-0.129-0.13-0.149-0.156-0.295-0.362-0.098-0.523 0.126-0.103 0.377-0.099 0.561-0.072 0.122 0.018 0.231 0.156 0.337 0.251 1 0.898 2 1.797 2.994 2.702 0.162 0.148 0.296 0.325 0.409 0.451z"></path>
-<path fill="#fff" d="M7.238 40.458c-0.272 0.016-0.384-0.151-0.45-0.353-0.060-0.184 0.030-0.316 0.199-0.391 0.111-0.049 0.228-0.086 0.344-0.124 1.316-0.429 2.632-0.859 3.948-1.286 0.135-0.044 0.274-0.094 0.413-0.105 0.208-0.016 0.38 0.094 0.389 0.3 0.006 0.135-0.081 0.298-0.174 0.407-0.070 0.082-0.215 0.105-0.331 0.142-1.355 0.442-2.71 0.882-4.065 1.322-0.096 0.032-0.193 0.062-0.274 0.087z"></path>
-<path fill="#fff" d="M26.327 6.192c0.075-0.087 0.162-0.261 0.301-0.329 0.195-0.096 0.349 0.055 0.443 0.225 0.059 0.105 0.095 0.226 0.121 0.345 0.301 1.417 0.597 2.836 0.899 4.254 0.035 0.165 0.070 0.306-0.093 0.437-0.291 0.233-0.548 0.183-0.658-0.171-0.085-0.272-0.132-0.556-0.192-0.835-0.252-1.178-0.503-2.356-0.753-3.534-0.021-0.1-0.035-0.201-0.068-0.391z"></path>
-<path fill="#fff" d="M44.974 14.91c-0.342 0.028-0.55-0.224-0.474-0.485 0.039-0.132 0.123-0.256 0.205-0.369 0.812-1.121 1.626-2.24 2.443-3.357 0.084-0.114 0.167-0.244 0.282-0.316 0.105-0.066 0.299-0.129 0.371-0.077 0.11 0.079 0.205 0.257 0.204 0.393-0.001 0.146-0.099 0.307-0.191 0.435-0.832 1.157-1.669 2.309-2.513 3.458-0.102 0.14-0.251 0.246-0.327 0.319z"></path>
-<path fill="#fff" d="M52.674 38.185c0.202 0.053 0.322 0.078 0.438 0.115 1.301 0.421 2.602 0.842 3.901 1.268 0.153 0.050 0.303 0.121 0.441 0.205 0.153 0.094 0.247 0.255 0.136 0.414-0.083 0.117-0.234 0.223-0.372 0.253-0.125 0.027-0.276-0.049-0.411-0.093-1.302-0.418-2.603-0.837-3.904-1.259-0.135-0.044-0.271-0.097-0.392-0.169-0.168-0.099-0.312-0.252-0.187-0.448 0.085-0.133 0.254-0.212 0.35-0.286z"></path>
-<path fill="#fff" d="M36.267 52.948c0.078-0.084 0.169-0.254 0.307-0.315 0.213-0.093 0.411 0.006 0.473 0.244 0.102 0.393 0.184 0.791 0.269 1.188 0.243 1.133 0.473 2.269 0.731 3.399 0.055 0.242-0 0.396-0.189 0.517-0.218 0.14-0.448 0.067-0.548-0.175-0.045-0.111-0.059-0.236-0.085-0.355-0.297-1.371-0.593-2.743-0.889-4.114-0.021-0.099-0.035-0.2-0.070-0.39z"></path>
-<path fill="#fff" d="M10.439 33.822c0.153 0 0.275-0.006 0.397 0.001 0.194 0.011 0.292 0.127 0.311 0.313 0.020 0.204-0.048 0.372-0.261 0.422-0.197 0.046-0.401 0.066-0.604 0.088-1.295 0.138-2.59 0.273-3.886 0.408-0.101 0.010-0.203 0.019-0.305 0.016-0.316-0.008-0.462-0.115-0.471-0.354-0.011-0.286 0.169-0.39 0.418-0.423 0.060-0.008 0.12-0.025 0.181-0.031 1.417-0.148 2.834-0.295 4.22-0.439z"></path>
-<path fill="#fff" d="M55.367 45.138c0.011 0.192-0.235 0.403-0.446 0.334-0.134-0.044-0.259-0.121-0.382-0.192-1.203-0.692-2.406-1.386-3.608-2.080-0.106-0.061-0.217-0.118-0.311-0.194-0.156-0.127-0.231-0.281-0.111-0.481 0.108-0.181 0.261-0.264 0.462-0.197 0.134 0.044 0.259 0.118 0.383 0.189 1.167 0.674 2.333 1.349 3.497 2.027 0.229 0.133 0.473 0.258 0.517 0.593z"></path>
-<path fill="#fff" d="M16.849 10.272c0.084 0.087 0.236 0.216 0.351 0.372 0.763 1.038 1.518 2.081 2.276 3.123 0.12 0.165 0.24 0.331 0.358 0.498 0.135 0.192 0.15 0.377-0.043 0.543-0.19 0.163-0.368 0.138-0.585-0.086-0.070-0.073-0.129-0.159-0.189-0.241-0.819-1.123-1.639-2.246-2.456-3.371-0.072-0.099-0.147-0.2-0.194-0.311-0.112-0.265 0.099-0.553 0.483-0.528z"></path>
-<path fill="#fff" d="M38.034 6.468c-0.114 0.528-0.25 1.144-0.381 1.761-0.169 0.796-0.336 1.593-0.503 2.389-0.017 0.080-0.024 0.162-0.048 0.239-0.101 0.329-0.266 0.461-0.508 0.414-0.239-0.046-0.346-0.243-0.286-0.578 0.061-0.34 0.145-0.676 0.218-1.014 0.243-1.134 0.48-2.269 0.737-3.4 0.036-0.158 0.141-0.359 0.272-0.426 0.299-0.151 0.528 0.103 0.498 0.614z"></path>
-<path fill="#fff" d="M53.972 30.047c-0.536 0.037-0.721-0.056-0.736-0.351-0.013-0.259 0.13-0.376 0.613-0.43 1.417-0.158 2.836-0.303 4.254-0.452 0.081-0.009 0.163-0.005 0.244-0.006 0.24-0.003 0.391 0.106 0.41 0.353 0.018 0.226-0.132 0.347-0.322 0.379-0.482 0.081-0.967 0.147-1.453 0.199-1.012 0.11-2.026 0.208-3.011 0.308z"></path>
-<path fill="#fff" d="M21.419 56.335c-0.223-0.023-0.335-0.157-0.312-0.369 0.015-0.138 0.079-0.274 0.136-0.405 0.567-1.291 1.136-2.58 1.706-3.869 0.041-0.093 0.081-0.189 0.135-0.275 0.103-0.165 0.228-0.294 0.451-0.194 0.237 0.106 0.341 0.296 0.259 0.527-0.075 0.211-0.172 0.415-0.263 0.62-0.515 1.157-1.032 2.313-1.547 3.47-0.112 0.252-0.247 0.474-0.563 0.494z"></path>
-<path fill="#fff" d="M55.407 18.8c-0.037 0.062-0.080 0.182-0.162 0.259-0.118 0.109-0.261 0.193-0.402 0.274-1.163 0.673-2.328 1.342-3.492 2.012-0.071 0.041-0.138 0.087-0.211 0.123-0.314 0.153-0.488 0.12-0.626-0.117-0.156-0.265-0.006-0.422 0.205-0.545 1.339-0.775 2.676-1.553 4.022-2.316 0.311-0.177 0.634-0.031 0.666 0.31z"></path>
-<path fill="#fff" d="M57.63 23.848c-0.032 0.057-0.073 0.174-0.151 0.254-0.066 0.069-0.172 0.11-0.267 0.14-1.432 0.462-2.867 0.917-4.298 1.384-0.222 0.072-0.391 0.060-0.531-0.141-0.15-0.214-0.132-0.375 0.086-0.514 0.084-0.054 0.184-0.084 0.28-0.116 1.393-0.453 2.786-0.904 4.18-1.355 0.096-0.031 0.195-0.068 0.294-0.074 0.23-0.014 0.391 0.138 0.406 0.421z"></path>
-<path fill="#fff" d="M9.378 18.359c0.142 0.063 0.258 0.102 0.362 0.161 1.29 0.743 2.578 1.488 3.865 2.235 0.087 0.050 0.197 0.107 0.233 0.189 0.052 0.117 0.106 0.299 0.051 0.382-0.075 0.113-0.25 0.218-0.384 0.22-0.147 0.002-0.303-0.104-0.442-0.184-1.166-0.672-2.329-1.348-3.491-2.027-0.157-0.092-0.327-0.186-0.438-0.322-0.072-0.088-0.098-0.273-0.056-0.381 0.043-0.111 0.193-0.181 0.3-0.272z"></path>
-<path fill="#fff" d="M10.446 30.045c-1.407-0.141-2.788-0.278-4.169-0.42-0.141-0.015-0.307-0.020-0.412-0.097-0.112-0.083-0.235-0.253-0.223-0.373 0.012-0.123 0.159-0.273 0.285-0.334 0.114-0.056 0.28-0.019 0.421-0.004 1.38 0.145 2.761 0.289 4.14 0.444 0.542 0.061 0.68 0.17 0.659 0.451-0.021 0.287-0.187 0.362-0.701 0.333z"></path>
-<path fill="#fff" d="M23.848 12.267c-0.019 0.268-0.339 0.451-0.56 0.309-0.142-0.091-0.259-0.256-0.331-0.414-0.585-1.281-1.157-2.568-1.733-3.853-0.034-0.075-0.103-0.159-0.088-0.224 0.038-0.168 0.069-0.388 0.186-0.474 0.18-0.133 0.394-0.038 0.53 0.146 0.060 0.080 0.096 0.179 0.138 0.272 0.564 1.268 1.129 2.536 1.691 3.804 0.066 0.149 0.117 0.304 0.167 0.434z"></path>
-<path fill="#fff" d="M40.774 51.253c0.406 0.008 0.565 0.182 0.683 0.453 0.463 1.065 0.942 2.123 1.415 3.184 0.116 0.261 0.237 0.519 0.343 0.784 0.132 0.332 0.081 0.535-0.14 0.623-0.215 0.085-0.44-0.022-0.589-0.302-0.096-0.179-0.167-0.371-0.25-0.557-0.499-1.116-1.001-2.23-1.496-3.348-0.073-0.165-0.154-0.347-0.151-0.52 0.002-0.122 0.139-0.241 0.187-0.317z"></path>
-<path fill="#fff" d="M43.326 7.871c-0.065 0.173-0.108 0.308-0.165 0.438-0.577 1.303-1.154 2.606-1.737 3.906-0.192 0.428-0.358 0.532-0.616 0.422-0.257-0.109-0.3-0.31-0.115-0.733 0.555-1.268 1.118-2.532 1.685-3.795 0.074-0.164 0.165-0.337 0.296-0.452 0.088-0.078 0.276-0.11 0.389-0.072 0.109 0.037 0.18 0.189 0.264 0.286z"></path>
-<path fill="#fff" d="M54.028 33.827c1.358 0.142 2.717 0.278 4.075 0.43 0.55 0.061 0.672 0.164 0.658 0.457-0.014 0.3-0.168 0.388-0.713 0.333-1.399-0.142-2.797-0.294-4.194-0.453-0.431-0.049-0.641-0.227-0.599-0.455 0.038-0.212 0.273-0.326 0.652-0.317 0.041 0.001 0.081 0.006 0.122 0.009-0-0.002 0-0.003 0-0.004z"></path>
-<path fill="#fff" d="M11.582 25.649c-0.084-0.023-0.204-0.050-0.32-0.088-1.297-0.421-2.594-0.843-3.89-1.267-0.135-0.044-0.273-0.087-0.397-0.154-0.195-0.106-0.225-0.286-0.139-0.473 0.080-0.175 0.208-0.307 0.433-0.237 0.156 0.048 0.311 0.097 0.466 0.147 1.24 0.4 2.48 0.801 3.719 1.203 0.135 0.044 0.272 0.089 0.399 0.154 0.174 0.089 0.303 0.222 0.241 0.439-0.067 0.237-0.248 0.304-0.511 0.276z"></path>
-<path fill="#fff" d="M57.492 31.525c0.324 0 0.65-0.019 0.972 0.005 0.295 0.022 0.428 0.178 0.418 0.418-0.010 0.25-0.172 0.382-0.389 0.387-0.668 0.016-1.337 0.014-2.005-0.002-0.221-0.006-0.377-0.148-0.395-0.387-0.017-0.223 0.144-0.397 0.426-0.416 0.323-0.023 0.648-0.005 0.972-0.005 0 0.001 0 0.001 0 0.002z"></path>
-<path fill="#fff" d="M6.897 32.348c-0.305 0-0.61 0.015-0.913-0.004-0.319-0.020-0.509-0.197-0.482-0.43 0.031-0.265 0.209-0.388 0.462-0.391 0.629-0.006 1.258-0.007 1.888 0.002 0.249 0.003 0.441 0.114 0.446 0.394 0.005 0.276-0.178 0.406-0.426 0.42-0.324 0.019-0.649 0.005-0.974 0.005 0 0.002 0 0.003 0 0.005z"></path>
-<path fill="#fff" d="M30.036 7.532c0 0.131 0.036 0.253-0.008 0.328-0.074 0.124-0.181 0.269-0.307 0.313-0.186 0.065-0.368-0.025-0.423-0.238-0.050-0.196-0.076-0.398-0.101-0.599-0.047-0.382-0.091-0.765-0.125-1.148-0.014-0.16-0.046-0.342 0.012-0.479 0.054-0.127 0.21-0.275 0.335-0.288 0.119-0.013 0.273 0.119 0.378 0.221 0.062 0.061 0.075 0.186 0.085 0.285 0.057 0.544 0.106 1.090 0.155 1.605z"></path>
-<path fill="#fff" d="M44.436 52.549c0.066 0.056 0.202 0.125 0.268 0.235 0.333 0.556 0.652 1.121 0.967 1.687 0.111 0.2 0.093 0.395-0.116 0.53-0.213 0.138-0.413 0.066-0.528-0.121-0.358-0.587-0.71-1.18-1.026-1.791-0.135-0.262 0.097-0.556 0.435-0.541z"></path>
-<path fill="#fff" d="M14.623 51.857c-0.338-0.019-0.542-0.358-0.358-0.58 0.457-0.549 0.944-1.075 1.44-1.59 0.158-0.164 0.366-0.145 0.545 0.032 0.168 0.167 0.139 0.331 0.002 0.484-0.448 0.505-0.899 1.007-1.359 1.501-0.077 0.083-0.206 0.117-0.27 0.152z"></path>
-<path fill="#fff" d="M35.312 6.139c-0.049 0.495-0.091 1.024-0.16 1.55-0.020 0.151-0.085 0.33-0.192 0.424-0.082 0.073-0.303 0.092-0.39 0.031-0.112-0.078-0.217-0.262-0.212-0.396 0.017-0.468 0.080-0.935 0.129-1.402 0.019-0.183 0.039-0.366 0.074-0.546 0.058-0.298 0.211-0.429 0.447-0.384 0.241 0.046 0.337 0.206 0.322 0.444-0.005 0.082-0.010 0.163-0.017 0.278z"></path>
-<path fill="#fff" d="M20.448 10.918c-0.017 0.323-0.346 0.496-0.584 0.338-0.081-0.054-0.152-0.138-0.201-0.222-0.309-0.526-0.622-1.050-0.906-1.589-0.065-0.124-0.081-0.328-0.024-0.452 0.128-0.28 0.486-0.267 0.681 0.043 0.345 0.55 0.656 1.123 0.977 1.689 0.038 0.068 0.046 0.153 0.058 0.193z"></path>
-<path fill="#fff" d="M35.321 57.782c0 0.165 0.011 0.268-0.002 0.368-0.029 0.218-0.19 0.342-0.381 0.312-0.13-0.021-0.328-0.162-0.344-0.272-0.102-0.686-0.17-1.377-0.232-2.068-0.020-0.221 0.070-0.404 0.328-0.437 0.241-0.031 0.405 0.087 0.447 0.392 0.080 0.587 0.129 1.177 0.185 1.705z"></path>
-<path fill="#fff" d="M30.022 56.461c-0.042 0.442-0.079 0.928-0.137 1.411-0.051 0.425-0.224 0.618-0.483 0.579-0.249-0.038-0.368-0.273-0.325-0.687 0.056-0.544 0.115-1.089 0.191-1.631 0.050-0.358 0.188-0.486 0.438-0.448 0.285 0.042 0.345 0.243 0.331 0.491-0.005 0.081-0.009 0.162-0.016 0.286z"></path>
-<path fill="#fff" d="M19.146 55.062c-0.356 0.022-0.575-0.256-0.436-0.521 0.322-0.612 0.672-1.21 1.024-1.805 0.121-0.205 0.313-0.251 0.524-0.115 0.204 0.131 0.262 0.315 0.143 0.525-0.321 0.567-0.646 1.132-0.985 1.688-0.067 0.11-0.206 0.176-0.271 0.229z"></path>
-<path fill="#fff" d="M39.35 8.648c0.178-0.537 0.389-1.195 0.616-1.849 0.069-0.197 0.236-0.288 0.441-0.213 0.208 0.075 0.366 0.227 0.294 0.465-0.202 0.661-0.416 1.319-0.647 1.971-0.064 0.18-0.222 0.296-0.441 0.225-0.229-0.074-0.317-0.238-0.264-0.599z"></path>
-<path fill="#fff" d="M6.539 26.072c0.675 0.148 1.352 0.287 2.023 0.45 0.239 0.058 0.295 0.264 0.24 0.487-0.052 0.211-0.21 0.309-0.413 0.268-0.658-0.131-1.313-0.277-1.968-0.421-0.229-0.050-0.366-0.189-0.324-0.435 0.040-0.236 0.196-0.346 0.442-0.349z"></path>
-<path fill="#fff" d="M10.883 16.040c0.14 0.073 0.236 0.11 0.317 0.169 0.497 0.355 0.991 0.715 1.485 1.074 0.049 0.036 0.096 0.076 0.137 0.121 0.14 0.154 0.172 0.319 0.041 0.496s-0.322 0.214-0.485 0.101c-0.585-0.405-1.162-0.824-1.725-1.261-0.081-0.062-0.121-0.27-0.081-0.371 0.053-0.131 0.204-0.223 0.311-0.329z"></path>
-<path fill="#fff" d="M57.852 37.804c-0.675-0.151-1.351-0.294-2.022-0.46-0.188-0.046-0.336-0.193-0.249-0.414 0.074-0.189 0.193-0.393 0.439-0.343 0.678 0.136 1.352 0.292 2.026 0.45 0.215 0.050 0.283 0.212 0.25 0.422-0.040 0.251-0.202 0.335-0.443 0.346z"></path>
-<path fill="#fff" d="M44.421 11.304c-0.334 0.016-0.559-0.242-0.434-0.482 0.33-0.632 0.691-1.248 1.067-1.854 0.121-0.194 0.355-0.195 0.549-0.070 0.195 0.126 0.173 0.314 0.075 0.486-0.323 0.568-0.648 1.134-0.988 1.691-0.067 0.11-0.206 0.176-0.269 0.228z"></path>
-<path fill="#fff" d="M12.552 45.797c0.24-0.005 0.446 0.295 0.342 0.524-0.048 0.105-0.136 0.204-0.23 0.274-0.489 0.364-0.985 0.721-1.482 1.075-0.155 0.11-0.333 0.205-0.488 0.018-0.141-0.17-0.192-0.424-0.024-0.558 0.571-0.455 1.174-0.87 1.766-1.298 0.031-0.022 0.077-0.024 0.116-0.035z"></path>
-<path fill="#fff" d="M16.354 13.894c0.001 0.244-0.307 0.446-0.532 0.347-0.089-0.039-0.172-0.108-0.239-0.181-0.384-0.419-0.761-0.845-1.145-1.264-0.149-0.163-0.222-0.335-0.135-0.553 0.092-0.232 0.313-0.339 0.475-0.172 0.522 0.538 1.014 1.105 1.514 1.664 0.038 0.042 0.045 0.111 0.063 0.159z"></path>
-<path fill="#fff" d="M23.677 56.906c0.013-0.045 0.028-0.104 0.047-0.162 0.195-0.6 0.38-1.204 0.59-1.799 0.115-0.326 0.257-0.396 0.488-0.303 0.246 0.099 0.342 0.264 0.251 0.532-0.195 0.579-0.371 1.164-0.571 1.741-0.044 0.127-0.134 0.263-0.242 0.336-0.235 0.158-0.566-0.048-0.564-0.346z"></path>
-<path fill="#fff" d="M40.71 56.766c0.017 0.347-0.137 0.472-0.345 0.529-0.214 0.058-0.347-0.061-0.412-0.261-0.2-0.618-0.41-1.233-0.587-1.858-0.037-0.132 0.004-0.333 0.088-0.442 0.156-0.204 0.459-0.177 0.551 0.059 0.266 0.679 0.493 1.373 0.705 1.973z"></path>
-<path fill="#fff" d="M8.467 36.583c0.093 0.081 0.263 0.166 0.326 0.301 0.090 0.192-0.029 0.386-0.223 0.434-0.691 0.169-1.388 0.317-2.087 0.453-0.208 0.040-0.347-0.093-0.386-0.304s0.044-0.378 0.251-0.426c0.675-0.156 1.354-0.294 2.119-0.458z"></path>
-<path fill="#fff" d="M48.515 14.3c-0.307 0.028-0.583-0.327-0.416-0.53 0.474-0.578 0.989-1.124 1.509-1.661 0.145-0.15 0.338-0.078 0.485 0.072 0.141 0.143 0.139 0.3 0.021 0.435-0.469 0.533-0.946 1.058-1.426 1.581-0.051 0.056-0.136 0.082-0.174 0.103z"></path>
-<path fill="#fff" d="M56.603 42.57c-0.022 0.315-0.242 0.509-0.468 0.417-0.657-0.265-1.304-0.557-1.946-0.855-0.179-0.084-0.261-0.26-0.177-0.462 0.094-0.226 0.282-0.3 0.498-0.208 0.633 0.269 1.264 0.548 1.885 0.843 0.106 0.050 0.162 0.204 0.208 0.265z"></path>
-<path fill="#fff" d="M25.124 8.86c-0.093 0.105-0.174 0.278-0.295 0.313-0.124 0.037-0.292-0.052-0.432-0.106-0.042-0.016-0.064-0.101-0.084-0.158-0.208-0.595-0.411-1.193-0.621-1.787-0.088-0.248 0.040-0.399 0.232-0.494 0.188-0.093 0.394-0.035 0.467 0.157 0.253 0.665 0.476 1.341 0.733 2.075z"></path>
-<path fill="#fff" d="M50.182 51.439c-0.025 0.323-0.363 0.473-0.613 0.303-0.132-0.090-0.239-0.222-0.348-0.342-0.357-0.392-0.714-0.784-1.062-1.185-0.159-0.182-0.145-0.371 0.039-0.539 0.188-0.172 0.367-0.151 0.532 0.030 0.439 0.483 0.879 0.965 1.31 1.456 0.075 0.086 0.109 0.21 0.142 0.277z"></path>
-<path fill="#fff" d="M10.382 21.95c0.016 0.316-0.156 0.503-0.373 0.485-0.118-0.009-0.236-0.057-0.347-0.106-0.541-0.237-1.080-0.478-1.617-0.723-0.215-0.098-0.31-0.262-0.218-0.496 0.090-0.229 0.277-0.309 0.547-0.196 0.563 0.237 1.122 0.485 1.672 0.75 0.149 0.072 0.261 0.22 0.336 0.285z"></path>
-<path fill="#fff" d="M54.273 22.451c-0.066-0.074-0.211-0.173-0.249-0.303-0.030-0.102 0.037-0.294 0.124-0.357 0.194-0.14 0.426-0.232 0.648-0.332 0.426-0.192 0.855-0.376 1.282-0.565 0.237-0.105 0.388-0.013 0.491 0.203 0.095 0.2 0.047 0.377-0.143 0.466-0.644 0.299-1.296 0.58-1.947 0.866-0.035 0.016-0.080 0.010-0.207 0.023z"></path>
-<path fill="#fff" d="M8.112 43.031c-0.077-0.070-0.22-0.145-0.262-0.257-0.042-0.111 0.009-0.263 0.041-0.391 0.012-0.047 0.084-0.089 0.137-0.113 0.61-0.275 1.218-0.554 1.836-0.808 0.11-0.045 0.292-0.019 0.394 0.047 0.216 0.139 0.199 0.485-0.043 0.604-0.636 0.313-1.288 0.594-1.935 0.885-0.036 0.016-0.078 0.016-0.169 0.033z"></path>
-<path fill="#fff" d="M57.827 26.072c0.24 0.004 0.406 0.086 0.451 0.335 0.040 0.222-0.078 0.367-0.272 0.415-0.674 0.165-1.351 0.319-2.030 0.46-0.214 0.044-0.346-0.101-0.402-0.296-0.059-0.208 0.014-0.375 0.229-0.429 0.672-0.169 1.348-0.324 2.023-0.484z"></path>
-<path fill="#fff" d="M51.795 45.795c0.157 0.066 0.26 0.089 0.34 0.146 0.498 0.353 0.999 0.703 1.48 1.080 0.109 0.086 0.191 0.269 0.197 0.411 0.010 0.287-0.264 0.452-0.5 0.292-0.59-0.399-1.164-0.822-1.727-1.257-0.083-0.064-0.133-0.267-0.094-0.366 0.049-0.126 0.204-0.21 0.305-0.306z"></path>
-<path fill="#fff" d="M51.826 18.081c-0.090-0.061-0.245-0.11-0.27-0.195-0.040-0.139-0.041-0.327 0.025-0.45 0.071-0.132 0.233-0.218 0.363-0.314 0.425-0.312 0.852-0.62 1.281-0.927 0.158-0.113 0.322-0.185 0.485-0.005 0.16 0.177 0.171 0.432-0.028 0.59-0.524 0.414-1.068 0.805-1.607 1.2-0.063 0.046-0.148 0.060-0.25 0.1z"></path>
-<path fill="#fff" d="M50.375 15.944c0.491-0.677 0.973-1.361 1.508-2.044 0.302 0.458 0.314 0.525 0.037 0.795-0.467 0.456-0.952 0.893-1.429 1.339-0.038-0.030-0.077-0.060-0.115-0.089z"></path>
-<path fill="#fff" d="M13.208 48.68c-0.26 0.364-0.521 0.728-0.791 1.106-0.258-0.422-0.133-0.607 0.791-1.106z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/samsung.png b/data/interfaces/default/images/platforms/samsung.png
new file mode 100644
index 00000000..f5c68f1d
Binary files /dev/null and b/data/interfaces/default/images/platforms/samsung.png differ
diff --git a/data/interfaces/default/images/platforms/samsung.svg b/data/interfaces/default/images/platforms/samsung.svg
deleted file mode 100644
index bbd4d25e..00000000
--- a/data/interfaces/default/images/platforms/samsung.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>samsung</title>
-<path fill="#fff" d="M9.807 29.032c-0.374 0.409-0.517 0.845-0.531 1.332-0.018 0.627 0.219 1.128 0.735 1.478 0.374 0.253 0.773 0.469 1.154 0.713 0.306 0.195 0.606 0.4 0.9 0.614 0.209 0.152 0.294 0.369 0.265 0.63-0.044 0.392-0.288 0.613-0.674 0.601-0.421-0.013-0.644-0.224-0.661-0.638-0.008-0.184-0.001-0.37-0.001-0.573-0.576 0-1.129 0-1.683 0-0.296 0.706 0.088 1.721 0.809 2.060 0.989 0.465 1.992 0.452 2.986 0.008 0.412-0.184 0.671-0.515 0.788-0.951 0.036-0.136 0.055-0.278 0.073-0.419 0.122-0.949-0.205-1.659-1.082-2.105-0.458-0.233-0.892-0.512-1.332-0.777-0.144-0.087-0.286-0.183-0.408-0.296-0.252-0.235-0.257-0.652-0.026-0.889 0.201-0.206 0.669-0.229 0.88-0.023 0.082 0.081 0.137 0.206 0.165 0.32 0.039 0.161 0.041 0.331 0.060 0.513 0.517 0 1.028 0 1.539 0 0.231-0.677-0.080-1.483-0.707-1.795-0.636-0.317-1.316-0.328-2.003-0.254-0.061 0.007-0.122 0.017-0.184 0.024-0.008 0.001-0.016-0.007-0.063-0.028 0.108-0.048 0.19-0.088 0.274-0.123 3.441-1.416 6.981-2.532 10.58-3.462 3.263-0.843 6.555-1.548 9.882-2.091 2.469-0.403 4.948-0.729 7.436-0.976 2.207-0.22 4.421-0.346 6.639-0.369 1.313-0.014 2.626-0.034 3.939-0.016 1.678 0.023 3.345 0.199 5.010 0.395 1.759 0.207 3.475 0.6 5.159 1.139 1.039 0.332 2.011 0.799 2.864 1.486 0.577 0.464 1.044 1.017 1.215 1.762 0.196 0.855 0.028 1.655-0.404 2.406-0.428 0.746-0.983 1.387-1.629 1.952-1.594 1.394-3.389 2.478-5.272 3.427-0.6 0.302-1.204 0.595-1.806 0.892-0.011-0.015-0.023-0.030-0.035-0.045 0.027-0.034 0.049-0.075 0.082-0.102 0.266-0.22 0.452-0.507 0.464-0.84 0.029-0.777 0.009-1.557 0.009-2.355-0.733 0-1.482 0-2.252 0 0 0.291 0 0.587 0 0.916 0.194 0 0.394 0 0.617 0 0 0.445 0.002 0.858-0.002 1.271-0.001 0.049-0.030 0.102-0.057 0.146-0.139 0.22-0.504 0.331-0.816 0.253-0.295-0.075-0.465-0.263-0.469-0.566-0.011-0.789-0.009-1.579-0.011-2.368-0-0.293-0.002-0.586 0.010-0.878 0.021-0.532 0.401-0.8 0.909-0.655 0.26 0.074 0.406 0.242 0.431 0.511 0.016 0.166 0.026 0.334 0.040 0.52 0.541 0 1.066 0 1.589 0 0.199-1.010-0.269-1.812-1.234-2.082-0.75-0.21-1.507-0.235-2.249 0.047-0.691 0.262-1.090 0.756-1.1 1.506-0.016 1.171-0.022 2.342-0.005 3.512 0.010 0.708 0.457 1.24 1.177 1.477 0.55 0.182 1.114 0.201 1.683 0.13 0.053-0.007 0.105-0.016 0.158-0.021 0.012-0.001 0.026 0.013 0.066 0.036-0.168 0.075-0.317 0.148-0.47 0.21-3.751 1.523-7.594 2.764-11.524 3.736-2.901 0.718-5.824 1.325-8.771 1.824-2.423 0.41-4.857 0.732-7.3 0.987-1.765 0.184-3.534 0.298-5.311 0.286-2.777-0.019-5.554 0.020-8.33-0.024-0.988-0.016-1.977-0.182-2.96-0.314-1.895-0.254-3.747-0.686-5.523-1.415-0.862-0.354-1.656-0.81-2.32-1.473-0.958-0.957-1.19-2.124-0.661-3.37 0.364-0.857 0.952-1.556 1.622-2.185 1.335-1.253 2.847-2.259 4.468-3.098 1.007-0.521 2.033-1.008 3.051-1.509 0.021-0.011 0.047-0.013 0.137-0.037zM26.219 28.769c-0.271 1.666-0.536 3.297-0.802 4.928-0.022-0.001-0.043-0.002-0.065-0.003-0.267-1.639-0.534-3.279-0.8-4.912-0.909 0-1.784 0-2.679 0-0.047 2.174-0.094 4.331-0.141 6.492 0.575 0 1.11 0 1.671 0 0-1.947 0-3.872 0-5.797 0.020-0.002 0.040-0.004 0.059-0.006 0.364 1.943 0.727 3.886 1.089 5.82 0.576 0 1.114 0 1.663 0 0.375-1.94 0.714-3.873 1.092-5.798 0.027 0.004 0.054 0.008 0.081 0.011 0 1.921 0 3.842 0 5.771 0.56 0 1.096 0 1.649 0-0.049-2.18-0.097-4.338-0.145-6.506-0.907-0-1.772-0-2.673-0zM48.834 28.788c-0.536 0-1.053 0-1.59 0 0.030 1.694 0.059 3.371 0.089 5.049-0.020 0.002-0.041 0.004-0.061 0.006-0.495-1.687-0.989-3.374-1.485-5.064-0.829 0-1.62 0-2.416 0 0 2.155 0 4.288 0 6.429 0.531 0 1.047 0 1.58 0-0.027-1.746-0.054-3.471-0.080-5.197 0.020-0.003 0.040-0.005 0.060-0.008 0.532 1.74 1.064 3.48 1.596 5.221 0.787 0 1.542 0 2.308 0-0-2.154-0-4.28-0-6.436zM36.913 28.774c-0.009 0.076-0.021 0.127-0.021 0.178 0.007 1.659 0.005 3.318 0.027 4.976 0.009 0.637 0.341 1.089 0.935 1.329 0.794 0.32 1.603 0.353 2.422 0.095 0.789-0.248 1.148-0.701 1.212-1.525 0.008-0.106 0.011-0.213 0.011-0.319 0.003-1.34 0.005-2.679 0.007-4.019 0.001-0.236 0-0.473 0-0.709-0.576 0-1.11 0-1.659 0 0 0.12 0 0.217 0 0.313 0 1.411 0 2.821-0 4.232-0 0.151 0.003 0.302-0.011 0.452-0.033 0.332-0.246 0.53-0.575 0.55-0.454 0.028-0.702-0.199-0.703-0.659-0.006-1.526-0.008-3.052-0.011-4.578-0-0.103-0-0.205-0-0.317-0.562-0-1.083-0-1.632-0zM16.276 28.77c-0.404 2.177-0.805 4.334-1.208 6.508 0.61 0 1.182 0 1.763 0 0.297-1.958 0.593-3.901 0.888-5.844 0.021 0.001 0.043 0.002 0.064 0.003 0.288 1.949 0.576 3.899 0.864 5.849 0.595 0 1.165 0 1.754 0-0.404-2.186-0.805-4.349-1.205-6.516-0.993 0-1.94 0-2.92 0zM35.188 30.657c0-0.198 0.008-0.366-0.002-0.532-0.043-0.742-0.364-1.155-1.072-1.382-0.779-0.249-1.556-0.222-2.327 0.035-0.383 0.128-0.69 0.358-0.885 0.722-0.423 0.787-0.233 1.745 0.465 2.3 0.18 0.143 0.372 0.273 0.568 0.393 0.371 0.226 0.757 0.428 1.12 0.665 0.197 0.129 0.381 0.292 0.536 0.47 0.186 0.213 0.177 0.568 0.020 0.797-0.151 0.219-0.485 0.309-0.795 0.213-0.295-0.091-0.417-0.259-0.425-0.596-0.004-0.183-0.001-0.367-0.001-0.552-0.596 0-1.158 0-1.731 0-0.034 0.392-0.022 0.762 0.092 1.121 0.139 0.437 0.417 0.771 0.84 0.945 0.945 0.389 1.902 0.397 2.846-0.004 0.472-0.2 0.769-0.571 0.841-1.085 0.042-0.297 0.048-0.6 0.055-0.901 0.008-0.353-0.111-0.676-0.366-0.913-0.27-0.252-0.566-0.482-0.877-0.683-0.417-0.269-0.859-0.497-1.288-0.747-0.091-0.053-0.183-0.112-0.258-0.185-0.216-0.211-0.258-0.536-0.111-0.782 0.134-0.225 0.405-0.326 0.699-0.261 0.284 0.063 0.422 0.246 0.435 0.584 0.005 0.121 0.001 0.243 0.001 0.379 0.545-0 1.065-0 1.619-0z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/synclounge.svg b/data/interfaces/default/images/platforms/synclounge.svg
deleted file mode 100644
index 8c45d8a2..00000000
--- a/data/interfaces/default/images/platforms/synclounge.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>synclounge</title>
-<path fill="#fff" d="M43.773 51.538c0.303-0.025 0.586-0.070 0.869-0.068 2.333 0.019 4.373-0.802 6.191-2.204 0.667-0.514 1.284-0.63 2.076-0.274 1.415 0.636 1.419 0.593 2.235-0.747 7.904-12.978 2.453-29.829-10.544-36.265-13.899-6.882-28.716-0.339-34.47 10.849-4.506 8.763-4.214 17.477 0.948 25.95 0.080 0.131 0.162 0.263 0.228 0.401 0.168 0.348 0.427 0.401 0.767 0.271 0.539-0.206 1.083-0.4 1.624-0.599 0.447-0.164 0.873-0.136 1.255 0.165 2.070 1.628 4.402 2.497 7.053 2.46 0.128-0.002 0.256 0.031 0.418 0.154-0.225 0.121-0.447 0.247-0.675 0.361-2.367 1.188-4.278 2.864-5.563 5.204-0.242 0.441-0.58 0.623-1.080 0.606-0.712-0.024-1.427-0.039-2.137 0.005-0.639 0.039-1.102-0.218-1.531-0.651-2.881-2.905-5.148-6.221-6.71-10.007-4.728-11.459-2.427-24.362 6.021-33.37 4.83-5.151 10.78-8.288 17.78-9.257 10.004-1.386 18.671 1.541 25.881 8.562 4.981 4.85 7.803 10.854 8.76 17.737 0.831 5.981 0.137 11.745-2.436 17.244-1.54 3.292-3.619 6.216-6.102 8.855-1.54 1.637-4.074 1.363-5.199-0.566-1.207-2.070-3.067-3.358-5.125-4.429-0.153-0.080-0.307-0.159-0.457-0.245-0.026-0.015-0.035-0.062-0.076-0.14z"></path>
-<path fill="#fff" d="M24.271 43.639c0.043-1.893 0.693-3.889 1.915-5.715 2.471-3.693 8.759-5.239 12.733-0.852 3.699 4.084 3.449 10.491-0.508 14.227-3.416 3.227-8.808 2.377-11.337-0.338-1.66-1.783-2.829-4.61-2.802-7.324z"></path>
-<path fill="#fff" d="M16.362 60.863c0.642-2.391 1.804-4.423 3.686-6.021 1.52-1.29 3.265-2.157 5.132-2.812 0.619-0.217 1.122-0.023 1.611 0.343 1.179 0.882 2.435 1.623 3.878 1.988 2.856 0.722 5.504 0.337 7.832-1.561 1.004-0.818 2.018-0.959 3.206-0.394 2.121 1.007 4.132 2.15 5.688 3.958 0.853 0.992 1.48 2.109 1.805 3.381 0.089 0.349 0.12 0.712 0.186 1.118-11.033-0-21.997-0-33.024-0z"></path>
-<path fill="#fff" d="M27.948 34.335c-4.976 3.137-6.412 9.585-3.269 15.358-2.579 0.818-5.086 0.798-7.477-0.544-2.576-1.445-3.974-3.734-4.491-6.59-0.711-3.924 0.319-7.306 3.344-9.953 3.399-2.975 9.108-2.236 11.725 1.447 0.054 0.076 0.098 0.161 0.169 0.281z"></path>
-<path fill="#fff" d="M37.984 34.36c1.186-1.825 2.809-2.919 4.816-3.348 3.571-0.763 6.519 0.389 8.705 3.273 3.036 4.006 2.556 10.001-0.995 13.555-2.157 2.16-4.756 2.777-7.694 2.171-0.485-0.1-0.964-0.228-1.517-0.36 1.464-2.662 2.060-5.433 1.478-8.382-0.584-2.965-2.204-5.244-4.793-6.909z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/tivo.svg b/data/interfaces/default/images/platforms/tivo.svg
deleted file mode 100644
index 841d50d3..00000000
--- a/data/interfaces/default/images/platforms/tivo.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>tivo</title>
-<path fill="#fff" d="M26.006 20.123c-1.305-3.746-3.438-6.811-6.666-9.079-0.813-0.572-1.708-0.668-2.657-0.589-0.793 0.066-1.586 0.124-2.381 0.164-1.396 0.069-2.082-0.604-2.124-2.004-0.098-3.251 1.115-5.824 3.931-7.532 0.861-0.522 1.776-0.994 2.84-0.991 1.493 0.004 2.902 1.296 2.885 2.793-0.008 0.731-0.189 1.498-0.463 2.18-0.5 1.247-0.31 2.287 0.644 3.204 0.988 0.949 2.018 1.857 2.969 2.842 2.324 2.406 4.047 5.189 5.045 8.394 0.153 0.49 0.392 0.65 0.893 0.631 0.992-0.037 1.988-0.011 3.005-0.011 0.079-0.18 0.164-0.332 0.216-0.494 1.383-4.322 3.961-7.816 7.415-10.701 0.636-0.531 1.218-1.101 1.465-1.923 0.199-0.666 0.075-1.314-0.152-1.949-0.119-0.333-0.27-0.656-0.365-0.996-0.578-2.063 0.462-3.199 2.054-3.891 0.39-0.17 0.937-0.138 1.369-0.030 3.944 0.983 6.536 4.723 6.124 8.779-0.104 1.021-0.68 1.624-1.708 1.677-0.658 0.034-1.334 0.026-1.981-0.085-1.711-0.292-3.199 0.125-4.495 1.258-2.023 1.768-3.68 3.815-4.773 6.291-0.294 0.665-0.612 1.32-0.957 2.061 1.032 0.185 2.001 0.363 2.971 0.533 2.852 0.5 5.709 0.977 8.556 1.501 2.819 0.52 4.559 2.36 4.849 5.12 0.059 0.562 0.015 1.156-0.099 1.711-1.134 5.498-2.269 10.996-3.451 16.483-0.849 3.939-3.968 6.374-8.201 6.47-1.592 0.036-3.185 0.024-4.777 0.039-0.694 0.006-0.761 0.066-0.784 0.753-0.025 0.729-0.043 1.46-0.041 2.189 0.006 1.711 0.922 2.908 2.571 3.329 1.456 0.372 2.922 0.704 4.379 1.067 0.363 0.090 0.722 0.212 1.067 0.356 1.814 0.756 2.65 2.302 2.317 4.326-10.222 0-20.453 0-30.692 0-0.488-1.305 0.163-3.16 1.512-3.922 0.719-0.406 1.538-0.664 2.339-0.889 1.254-0.352 2.536-0.606 3.799-0.927 1.679-0.427 2.654-1.686 2.661-3.426 0.003-0.707-0.044-1.414-0.052-2.122-0.006-0.521-0.228-0.751-0.771-0.744-1.526 0.021-3.053 0.032-4.579 0.002-3.226-0.065-5.883-1.245-7.503-4.154-0.528-0.948-0.879-2.033-1.114-3.099-1.109-5.029-2.167-10.068-3.206-15.112-0.464-2.252-0.086-4.321 1.637-5.989 0.991-0.959 2.227-1.392 3.566-1.612 3.512-0.577 7.020-1.173 10.53-1.764 0.105-0.018 0.207-0.063 0.384-0.119zM30.666 52.055c-0.061 2.989 0.282 5.83 1.462 8.546 1.134-2.731 1.535-5.573 1.428-8.546-0.981 0-1.897 0-2.89 0z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/wiiu.png b/data/interfaces/default/images/platforms/wiiu.png
new file mode 100644
index 00000000..20ca3d6a
Binary files /dev/null and b/data/interfaces/default/images/platforms/wiiu.png differ
diff --git a/data/interfaces/default/images/platforms/wiiu.svg b/data/interfaces/default/images/platforms/wiiu.svg
deleted file mode 100644
index 20dafbca..00000000
--- a/data/interfaces/default/images/platforms/wiiu.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>wiiu</title>
-<path fill="#fff" d="M47.215 9.165c0.294 0 0.501 0 0.708 0 2.82 0 5.64 0.031 8.459-0.008 3.851-0.053 7.043 2.819 7.567 6.501 0.044 0.308 0.046 0.625 0.046 0.937 0.002 10.199 0.005 20.399 0 30.598-0.002 3.844-2.603 6.964-6.343 7.608-0.408 0.070-0.831 0.074-1.248 0.074-15.769 0.004-31.538 0.005-47.307-0.001-0.936-0-1.885 0.021-2.806-0.115-3.541-0.52-6.286-3.74-6.287-7.312-0.003-10.217-0.005-20.434 0.001-30.651 0.002-3.745 2.58-6.836 6.262-7.521 0.408-0.076 0.83-0.106 1.245-0.107 2.924-0.009 5.848-0.005 8.772-0.004 0.153 0 0.306 0.018 0.501 0.029 0 0.24 0 0.447 0 0.653 0 6.684-0.045 13.367 0.016 20.051 0.040 4.373 1.598 8.181 4.689 11.316 3.325 3.371 7.427 4.707 12.062 4.321 6.809-0.567 12.481-6.023 13.465-12.822 0.134-0.925 0.152-1.873 0.155-2.81 0.024-6.683 0.029-13.366 0.041-20.049 0-0.205 0-0.411 0-0.69z"></path>
-<path fill="#fff" d="M24.396 9.223c5.088 0 10.13 0 15.247 0 0 0.205 0 0.406 0 0.607 0 6.891-0.047 13.782 0.020 20.672 0.033 3.447-2.646 7.159-6.77 7.599-2.973 0.317-6.139-1.099-7.639-3.917-0.556-1.044-0.874-2.161-0.875-3.348-0.006-7.082-0.003-14.165-0.002-21.247 0-0.103 0.011-0.206 0.019-0.367z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/win8.png b/data/interfaces/default/images/platforms/win8.png
new file mode 100644
index 00000000..9f872936
Binary files /dev/null and b/data/interfaces/default/images/platforms/win8.png differ
diff --git a/data/interfaces/default/images/platforms/windows.svg b/data/interfaces/default/images/platforms/windows.svg
deleted file mode 100644
index 333f2557..00000000
--- a/data/interfaces/default/images/platforms/windows.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>windows</title>
-<path fill="#fff" d="M63.703 30.357c-11.439 0.087-22.894 0.174-34.389 0.261 0-8.559 0-17.035 0-25.591 11.453-1.676 22.908-3.352 34.358-5.027 0.158 0.481 0.193 29.607 0.031 30.357z"></path>
-<path fill="#fff" d="M29.248 59.124c0-8.503 0-16.919 0-25.357 11.486 0 22.959 0 34.477 0 0 10.095 0 20.12 0 30.232-11.49-1.625-22.948-3.245-34.477-4.876z"></path>
-<path fill="#fff" d="M26.112 33.577c0 8.384 0 16.726 0 25.157-8.667-1.193-17.289-2.381-25.956-3.574 0-7.233 0-14.451 0-21.672 0.536-0.17 24.219-0.098 25.956 0.089z"></path>
-<path fill="#fff" d="M0.136 30.825c0-7.31 0-14.517 0-21.78 8.652-1.181 17.284-2.359 25.973-3.545 0 8.397 0 16.742 0 25.166-8.636 0.053-17.279 0.106-25.973 0.159z"></path>
-</svg>
diff --git a/data/interfaces/default/images/platforms/wp.png b/data/interfaces/default/images/platforms/wp.png
new file mode 100644
index 00000000..78a78cb6
Binary files /dev/null and b/data/interfaces/default/images/platforms/wp.png differ
diff --git a/data/interfaces/default/images/platforms/xbmc.png b/data/interfaces/default/images/platforms/xbmc.png
new file mode 100644
index 00000000..d9b639b7
Binary files /dev/null and b/data/interfaces/default/images/platforms/xbmc.png differ
diff --git a/data/interfaces/default/images/platforms/xbox.png b/data/interfaces/default/images/platforms/xbox.png
new file mode 100644
index 00000000..45ba5107
Binary files /dev/null and b/data/interfaces/default/images/platforms/xbox.png differ
diff --git a/data/interfaces/default/images/platforms/xbox.svg b/data/interfaces/default/images/platforms/xbox.svg
deleted file mode 100644
index 86179a61..00000000
--- a/data/interfaces/default/images/platforms/xbox.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- Generated by IcoMoon.io -->
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
-<title>xbox</title>
-<path fill="#fff" d="M32.489 63.892c-5.577 0.108-10.759-1.227-15.596-3.901-1.21-0.669-2.354-1.457-3.511-2.217-0.462-0.303-0.877-0.677-1.315-1.016-1.361-1.053-1.752-2.459-1.481-4.098 0.249-1.51 0.831-2.904 1.526-4.253 1.562-3.029 3.569-5.76 5.745-8.363 3.561-4.26 7.429-8.226 11.652-11.836 0.695-0.595 1.437-1.137 2.173-1.683 0.449-0.334 0.579-0.328 1.023 0.012 0.609 0.466 1.228 0.925 1.796 1.438 3.99 3.603 7.831 7.359 11.346 11.431 2.345 2.716 4.438 5.618 6.139 8.789 0.821 1.529 1.489 3.11 1.741 4.845 0.195 1.343-0.119 2.508-1.188 3.389-0.788 0.65-1.583 1.301-2.431 1.867-2.258 1.506-4.655 2.765-7.192 3.727-2.321 0.88-4.738 1.393-7.209 1.629-1.082 0.103-2.167 0.163-3.217 0.241z"></path>
-<path fill="#fff" d="M57.215 51.378c0.070-0.55 0.12-0.991 0.184-1.43 0.125-0.856 0.021-1.701-0.111-2.545-0.412-2.635-1.312-5.111-2.453-7.507-2.526-5.307-5.562-10.317-8.952-15.11-1.501-2.122-3.121-4.16-4.688-6.236-0.126-0.167-0.252-0.334-0.381-0.505 0.078-0.093 0.124-0.167 0.187-0.222 1.81-1.589 3.606-3.196 5.441-4.755 0.68-0.578 1.443-1.059 2.186-1.558 1.34-0.899 2.806-1.513 4.369-1.918 0.516-0.133 0.931-0.042 1.287 0.319 0.732 0.743 1.502 1.457 2.166 2.259 3.024 3.654 5.070 7.807 6.266 12.393 0.46 1.764 0.716 3.551 0.771 5.366 0.043 1.426 0.049 2.853 0.046 4.28-0.005 2.407-0.492 4.729-1.161 7.038-0.991 3.418-2.592 6.524-4.55 9.467-0.106 0.159-0.231 0.306-0.353 0.454-0.038 0.047-0.095 0.079-0.257 0.209z"></path>
-<path fill="#fff" d="M6.977 51.417c-0.071-0.074-0.151-0.141-0.21-0.223-2.975-4.109-4.905-8.65-5.72-13.668-0.267-1.643-0.523-3.288-0.562-4.949-0.024-1.017 0.087-2.044 0.21-3.057 0.294-2.435 0.694-4.85 1.5-7.18 1.575-4.552 3.856-8.669 7.328-12.075 0.661-0.648 1.339-0.805 2.204-0.555 1.808 0.522 3.421 1.414 4.927 2.516 1.913 1.399 3.687 2.966 5.434 4.564 0.454 0.415 0.911 0.828 1.403 1.274-0.475 0.584-0.936 1.14-1.384 1.706-5.043 6.373-9.453 13.145-12.894 20.524-0.993 2.13-1.789 4.333-2.188 6.659-0.133 0.775-0.237 1.563-0.258 2.347-0.015 0.544 0.13 1.093 0.211 1.638 0.021 0.141 0.069 0.277 0.105 0.416-0.035 0.021-0.070 0.042-0.106 0.064z"></path>
-<path fill="#fff" d="M16.171 5.161c1.236-1.407 8.53-3.893 11.726-4.215 9.396-0.946 15.835 1.408 20.389 4.251-0.277 0-0.464 0.012-0.648-0.002-2.509-0.188-4.914 0.317-7.289 1.061-1.814 0.568-3.549 1.327-5.27 2.124-0.85 0.394-1.718 0.752-2.559 1.164-0.389 0.191-0.711 0.163-1.082-0.030-1.891-0.982-3.817-1.898-5.825-2.614-1.522-0.543-3.070-1.023-4.629-1.447-1.24-0.337-2.533-0.301-3.813-0.294-0.291 0.002-0.583 0-1.001 0z"></path>
-</svg>
diff --git a/data/interfaces/default/images/poster-live.png b/data/interfaces/default/images/poster-live.png
deleted file mode 100644
index c27cda2c..00000000
Binary files a/data/interfaces/default/images/poster-live.png and /dev/null differ
diff --git a/data/interfaces/default/images/rating/imdb.svg b/data/interfaces/default/images/rating/imdb.svg
deleted file mode 100644
index f1dd35ee..00000000
--- a/data/interfaces/default/images/rating/imdb.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 1000 560" xmlns="http://www.w3.org/2000/svg" stroke-miterlimit="1.414" clip-rule="evenodd" fill-rule="evenodd" stroke-linejoin="round"><path d="M0 89.996C0 62.384 22.378 40 49.997 40h900.006C977.616 40 1000 62.388 1000 89.996v380.008c0 27.612-22.378 49.996-49.997 49.996H49.997C22.384 520 0 497.612 0 470.004V89.996z" fill="#e1be00"/><path d="M769.68 134.76v94.64c6.03-6.976 12.753-12.181 20.17-15.61 7.419-3.428 18.552-5.157 27.24-5.157 10.01 0 18.685 1.552 26.04 4.667 7.362 3.109 12.967 7.471 16.829 13.08 3.857 5.614 6.172 11.11 6.962 16.485.781 5.377 1.176 16.843 1.176 34.41v81.63c0 17.448-1.176 30.434-3.528 38.981-2.357 8.543-7.881 15.958-16.567 22.23-8.691 6.267-19 9.405-30.952 9.405-8.567 0-19.648-1.857-27.07-5.581-7.424-3.724-14.21-9.314-20.362-16.767l-4.709 18.538h-68.04v-290.95h72.809m-631.58 290.95h75.58v-290.95h-75.58v290.95m199.38-290.95c2.881 17.615 5.9 38.29 9.06 62.01l10.829 73.915 17.505-135.92h98.73v290.95h-65.99l-.239-196.38-26.433 196.38h-47.15l-27.862-192.11-.238 192.11h-66.2v-290.95h97.99m218.36 0c36.581 0 57.629 1.681 70.52 5.03 12.895 3.347 22.705 8.847 29.419 16.504 6.719 7.657 10.915 16.181 12.595 25.567 1.677 9.39 2.752 27.843 2.752 55.36v102.18c0 26.08-1.461 43.519-3.918 52.31-2.462 8.8-6.748 15.676-12.862 20.638-6.124 4.962-13.676 8.433-22.672 10.404-9 1.977-22.551 2.962-40.657 2.962h-91.57v-290.95h56.39m239.33 220.35c0 14.08-.7 22.977-2.096 26.677-1.4 3.704-7.485 5.566-12.1 5.566-4.5 0-7.5-1.786-9.02-5.371-1.519-3.581-2.272-11.757-2.272-24.538v-76.891c0-13.257.667-21.519 2-24.809 1.333-3.277 4.248-4.924 8.743-4.924 4.609 0 10.796 1.871 12.376 5.633 1.576 3.762 2.367 11.795 2.367 24.09v74.57m-203.37-167.99c2.986 1.728 4.901 4.457 5.734 8.157.833 3.709 1.257 12.138 1.257 25.29v112.8c0 19.371-1.257 31.23-3.767 35.595-2.509 4.371-9.2 6.548-20.06 6.548v-190.99c8.234 0 13.852.866 16.838 2.6"/></svg>
\ No newline at end of file
diff --git a/data/interfaces/default/images/rating/popcorn-spilled.svg b/data/interfaces/default/images/rating/popcorn-spilled.svg
deleted file mode 100644
index 73a06ab2..00000000
--- a/data/interfaces/default/images/rating/popcorn-spilled.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="560" height="560" viewBox="0 0 560 560">
-  <g fill="none" transform="translate(33 140)">
-    <path fill="#FFF" d="M43.8020066,267.3152 L281.745403,290.797105 C286.539148,305.7344 292.894623,320.31421 302.004138,331.0528 L71.7380852,300.927619 C61.4905377,294.175695 50.8770689,281.050362 43.8020066,267.3152 Z M266.684852,192.017143 C267.285384,212.923048 270.116459,239.981562 275.03101,263.034133 L33.8766098,243.950705 C26.3585902,221.21181 24.03,207.991848 22.1723803,189.066133 L266.684852,192.017143 Z M275.03101,89.3083429 C270.116459,112.360914 267.285384,139.419429 266.684852,160.325333 L22.1723803,163.276343 C24.03,144.350629 26.3585902,131.130667 33.8766098,108.391771 L275.03101,89.3083429 Z M302.004138,21.2896762 C292.894623,32.030019 286.539148,46.6080762 281.745403,61.5471238 L43.8020066,85.0272762 C50.8770689,71.2921143 61.4905377,58.1685333 71.7380852,51.4148571 L302.004138,21.2896762 Z"/>
-    <path fill="#00641E" d="M303.565869,264.667352 C306.720846,256.846476 317.903331,252.081752 325.93259,252.63901 C334.515108,253.234819 343.631626,262.264838 345.224872,271.145905 C345.520761,270.823467 345.830656,270.518552 346.145803,270.218895 C348.901593,267.583314 352.35421,265.834438 356.132479,265.352533 C355.554708,262.790552 355.416393,260.048076 355.812079,257.233752 C357.207482,247.3328 365.145698,239.907962 374.234203,239.981562 C380.099449,240.028876 385.245108,243.032457 388.597928,247.646476 C388.897318,247.271467 389.228223,246.928 389.550374,246.577524 C393.384669,226.586362 395.814807,203.999924 396.368066,180.030857 C398.267705,97.6111238 377.375174,30.2776381 349.70522,29.6397714 C322.033515,29.0001524 298.061292,95.2962286 296.161652,177.715962 C296.161652,177.715962 294.696216,207.778057 303.565869,264.667352"/>
-    <path fill="#FFD700" d="M490.910577,354.797562 C492.545843,352.0656 493.45977,348.7904 493.396741,345.310171 C493.927239,334.065143 486.214879,323.871543 475.484105,325.000076 C475.794,323.713829 475.997095,322.376762 476.075882,320.997638 C476.718433,309.733333 468.957049,300.025143 458.739266,299.315429 C458.515161,299.30141 458.294557,299.2944 458.072203,299.28739 C459.134951,296.492343 459.661948,293.371352 459.47461,290.06461 C458.945862,280.692876 452.488839,272.796648 444.088407,271.242286 C441.054236,270.681524 438.111108,270.960152 435.416597,271.894171 C432.870905,265.617143 427.525652,260.961067 421.023108,259.977981 C420.508367,249.786133 413.153174,241.397486 403.68299,240.740343 C397.728452,240.326781 392.257141,243.064 388.597928,247.646476 C385.245108,243.032457 380.099449,240.030629 374.234203,239.983314 C365.145698,239.907962 357.207482,247.3328 355.812079,257.235505 C355.416393,260.048076 355.554708,262.790552 356.132479,265.354286 C352.35421,265.834438 348.901593,267.585067 346.145803,270.218895 C345.830656,270.518552 345.520761,270.823467 345.224872,271.145905 C343.631626,262.264838 334.515108,253.236571 325.93259,252.63901 C317.903331,252.081752 306.575528,256.963886 303.565869,264.667352 C304.885987,278.101105 313.275915,314.72061 343.621121,347.570743 L343.890748,347.590019 C346.816367,350.239619 350.636656,351.699352 354.709062,351.33661 C357.233744,351.110552 359.558833,350.206324 361.56177,348.811429 L362.050249,348.844724 C364.720249,350.700495 367.929502,351.671314 371.320839,351.369905 C372.616446,351.254248 373.852525,350.942324 375.027325,350.497219 C377.933685,356.51139 384.41522,360.398171 391.649607,359.760305 C397.25223,359.266133 402.014459,356.164419 404.81402,351.799238 L405.720944,351.862324 C408.517003,354.636343 412.233993,356.252038 416.24337,356.131124 C419.557672,361.149943 425.645272,364.237638 432.363167,363.647086 C434.893102,363.424533 437.254957,362.692038 439.361193,361.582781 C442.875089,365.90941 448.642289,368.481905 454.969751,367.924648 C461.22543,367.376152 466.509403,363.904686 469.384249,359.104914 C472.208321,361.374248 475.746728,362.592152 479.503987,362.257448 C483.149193,361.931505 486.38821,360.208914 488.821849,357.603124 L489.228039,357.631162 C489.781298,356.828571 490.25402,356.006705 490.693475,355.177829 C490.70398,355.162057 490.712734,355.144533 490.721489,355.128762 C490.781016,355.018362 490.854551,354.909714 490.910577,354.797562"/>
-    <path fill="#04A53C" d="M281.745403,61.5471238 L43.8020066,85.0272762 C50.8770689,71.2921143 61.4905377,58.1685333 71.7380852,51.4148571 L302.004138,21.2896762 C292.894623,32.030019 286.539148,46.6080762 281.745403,61.5471238 Z M302.004138,331.0528 L71.7380852,300.927619 C61.4905377,294.175695 50.8770689,281.050362 43.8020066,267.316952 L281.745403,290.797105 C286.539148,305.7344 292.894623,320.31421 302.004138,331.0528 Z M33.8766098,243.950705 C26.3585902,221.21181 24.03,207.9936 22.1723803,189.066133 L266.684852,192.017143 C267.285384,212.923048 270.116459,239.981562 275.03101,263.034133 L33.8766098,243.950705 Z M33.8766098,108.391771 L275.03101,89.3083429 C270.116459,112.360914 267.285384,139.419429 266.684852,160.327086 L22.1723803,163.276343 C24.03,144.350629 26.3585902,131.130667 33.8766098,108.391771 Z M378.597246,25.7126857 C363.342354,7.93478095 352.390977,-0.411809524 343.010085,0.672914286 C341.261016,0.895466667 76.1168852,37.8952381 76.1168852,37.8952381 C34.0429377,42.1780571 0.416695082,103.32739 0,176.172114 C0.416695082,249.015086 34.0429377,310.164419 76.1168852,314.44899 C76.1168852,314.44899 341.758249,351.583695 343.010085,351.669562 C345.228374,351.655543 347.418649,351.357638 349.57741,350.803886 C347.476426,350.178286 345.538269,349.083048 343.890748,347.590019 L343.621121,347.570743 C313.275915,314.722362 304.885987,278.101105 303.565869,264.667352 C303.56937,264.656838 303.576374,264.648076 303.579875,264.637562 C303.576374,264.648076 303.56937,264.656838 303.565869,264.667352 C294.696216,207.778057 296.161652,177.715962 296.161652,177.715962 C298.061292,95.2962286 322.033515,29.0001524 349.70522,29.638019 C377.375174,30.2776381 398.267705,97.6111238 396.368066,180.030857 C395.814807,203.999924 393.384669,226.586362 389.550374,246.577524 C393.489718,242.226362 398.773692,240.393371 403.68299,240.740343 C404.586413,240.805181 405.465325,240.957638 406.326728,241.155657 C423.131095,149.125867 405.514348,59.262019 378.597246,25.7126857 Z"/>
-  </g>
-</svg>
diff --git a/data/interfaces/default/images/rating/popcorn-upright.svg b/data/interfaces/default/images/rating/popcorn-upright.svg
deleted file mode 100644
index 603490a9..00000000
--- a/data/interfaces/default/images/rating/popcorn-upright.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="560" height="560"><g fill="none"><path fill="#FFF" d="M370.57 474.214l23.466-237.956c14.93-4.796 29.498-11.15 40.23-20.262L404.16 446.278c-6.748 10.248-19.863 20.86-33.59 27.936zm-78.197 21.631l2.947-244.528c20.894-.599 47.933-3.43 70.97-8.346l-19.07 241.17c-22.724 7.518-35.934 9.848-54.847 11.704zm-99.694-252.874c23.038 4.916 50.077 7.747 70.971 8.346l2.948 244.528c-18.914-1.856-32.123-4.186-54.847-11.705l-19.072-241.17zm-67.974-26.975c10.732 9.112 25.3 15.466 40.23 20.262l23.464 237.956c-13.726-7.075-26.84-17.688-33.59-27.936l-30.104-230.282z"/><path fill="gold" d="M118.905 157.445c1.357 28.827 72.771 51.677 160.578 51.176 76.687-.438 140.659-18.546 156.329-42.336a22.976 22.976 0 00-14.058-7.426c.06-.7.098-1.406.095-2.122-.065-11.4-8.429-20.788-19.327-22.54.287-1.474.438-2.999.43-4.559-.072-12.696-10.426-22.928-23.124-22.856-.287.001-.568.036-.853.049a22.911 22.911 0 001.254-7.56c-.074-12.697-10.425-22.93-23.123-22.858a22.914 22.914 0 00-8.247 1.6c-3.632-6.835-10.606-11.6-18.737-12.149-1.416-11.4-11.157-20.195-22.93-20.129-7.41.042-13.963 3.6-18.136 9.065-4.233-4.605-10.3-7.494-17.047-7.456-12.698.072-22.932 10.424-22.86 23.118a22.983 22.983 0 001.115 6.946 22.918 22.918 0 00-13.07 7.459c-2.644-9.847-11.637-17.084-22.314-17.024-9.975.057-18.406 6.47-21.537 15.366-8.474 3.426-14.439 11.738-14.383 21.433.012 2.154.342 4.227.907 6.202a22.876 22.876 0 00-9.328-1.932c-10.012.058-18.47 6.516-21.574 15.465a22.83 22.83 0 00-9.788-2.149c-12.698.072-22.934 10.422-22.86 23.118a22.833 22.833 0 003.159 11.463c-.202.203-.379.426-.571.636"/><path fill="#FA320A" d="M404.161 446.278c-6.749 10.248-19.864 20.86-33.59 27.936l23.465-237.956c14.93-4.796 29.498-11.15 40.23-20.262L404.16 446.278zM347.22 484.14c-22.723 7.519-35.934 9.85-54.847 11.705l2.947-244.528c20.894-.599 47.933-3.43 70.973-8.346L347.22 484.14zm-135.47 0l-19.07-241.17c23.037 4.917 50.076 7.748 70.97 8.347l2.948 244.528c-18.914-1.856-32.123-4.186-54.847-11.705zm-56.94-37.862l-30.105-230.282c10.732 9.112 25.3 15.466 40.23 20.262l23.464 237.956c-13.726-7.075-26.84-17.688-33.588-27.936zm247.668-321.143c.298 1.453.465 2.955.473 4.498a23.018 23.018 0 01-.43 4.56c10.9 1.749 19.263 11.137 19.328 22.54a23.59 23.59 0 01-.095 2.12 22.976 22.976 0 0114.058 7.425c-15.669 23.792-79.642 41.9-156.327 42.34-87.807.502-159.221-22.346-160.58-51.175.192-.208.37-.433.57-.634-1.355-2.311-2.29-4.887-2.773-7.62-8.408 7.979-13.495 14.412-12.6 23.78.085 1.251 37.196 266.911 37.196 266.911 4.282 42.075 65.391 75.703 138.187 76.12 72.796-.417 133.907-34.045 138.187-76.12 0 0 37.11-265.66 37.197-266.912 1.777-18.736-20.15-35.745-52.39-47.833z"/></g></svg>
\ No newline at end of file
diff --git a/data/interfaces/default/images/rating/themoviedb.svg b/data/interfaces/default/images/rating/themoviedb.svg
deleted file mode 100644
index e98e4ab2..00000000
--- a/data/interfaces/default/images/rating/themoviedb.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 190.24 81.52"><defs><linearGradient id="a" y1="40.76" x2="190.24" y2="40.76" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#90cea1"/><stop offset=".56" stop-color="#3cbec9"/><stop offset="1" stop-color="#00b3e5"/></linearGradient></defs><g data-name="Layer 2"><path d="M105.67 36.06h66.9a17.67 17.67 0 0017.67-17.66A17.67 17.67 0 00172.57.73h-66.9A17.67 17.67 0 0088 18.4a17.67 17.67 0 0017.67 17.66zm-88 45h76.9a17.67 17.67 0 0017.67-17.66 17.67 17.67 0 00-17.67-17.67h-76.9A17.67 17.67 0 000 63.4a17.67 17.67 0 0017.67 17.66zm-7.26-45.64h7.8V6.92h10.1V0h-28v6.9h10.1zm28.1 0h7.8V8.25h.1l9 27.15h6l9.3-27.15h.1V35.4h7.8V0H66.76l-8.2 23.1h-.1L50.31 0h-11.8zm113.92 20.25a15.07 15.07 0 00-4.52-5.52 18.57 18.57 0 00-6.68-3.08 33.54 33.54 0 00-8.07-1h-11.7v35.4h12.75a24.58 24.58 0 007.55-1.15 19.34 19.34 0 006.35-3.32 16.27 16.27 0 004.37-5.5 16.91 16.91 0 001.63-7.58 18.5 18.5 0 00-1.68-8.25zM145 68.6a8.8 8.8 0 01-2.64 3.4 10.7 10.7 0 01-4 1.82 21.57 21.57 0 01-5 .55h-4.05v-21h4.6a17 17 0 014.67.63 11.66 11.66 0 013.88 1.87A9.14 9.14 0 01145 59a9.87 9.87 0 011 4.52 11.89 11.89 0 01-1 5.08zm44.63-.13a8 8 0 00-1.58-2.62 8.38 8.38 0 00-2.42-1.85 10.31 10.31 0 00-3.17-1v-.1a9.22 9.22 0 004.42-2.82 7.43 7.43 0 001.68-5 8.42 8.42 0 00-1.15-4.65 8.09 8.09 0 00-3-2.72 12.56 12.56 0 00-4.18-1.3 32.84 32.84 0 00-4.62-.33h-13.2v35.4h14.5a22.41 22.41 0 004.72-.5 13.53 13.53 0 004.28-1.65 9.42 9.42 0 003.1-3 8.52 8.52 0 001.2-4.68 9.39 9.39 0 00-.55-3.18zm-19.42-15.75h5.3a10 10 0 011.85.18 6.18 6.18 0 011.7.57 3.39 3.39 0 011.22 1.13 3.22 3.22 0 01.48 1.82 3.63 3.63 0 01-.43 1.8 3.4 3.4 0 01-1.12 1.2 4.92 4.92 0 01-1.58.65 7.51 7.51 0 01-1.77.2h-5.65zm11.72 20a3.9 3.9 0 01-1.22 1.3 4.64 4.64 0 01-1.68.7 8.18 8.18 0 01-1.82.2h-7v-8h5.9a15.35 15.35 0 012 .15 8.47 8.47 0 012.05.55 4 4 0 011.57 1.18 3.11 3.11 0 01.63 2 3.71 3.71 0 01-.43 1.92z" fill="url(#a)" data-name="Layer 1"/></g></svg>
\ No newline at end of file
diff --git a/data/interfaces/default/images/rating/thetvdb.svg b/data/interfaces/default/images/rating/thetvdb.svg
deleted file mode 100644
index 1d593be6..00000000
--- a/data/interfaces/default/images/rating/thetvdb.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="48" height="48" fill="none" xmlns="http://www.w3.org/2000/svg"><rect y="8" width="48" height="32" rx="2" fill="#333"/><path d="M5.708 12.19c-.375-.065-.75-.128-1.125-.19h-.509s-.269.139-.373.178c-1.334.496-1.835 1.26-1.671 2.693.724 6.411 1.453 12.822 2.201 19.238.214 1.845 1.126 2.564 2.98 2.36a92.817 92.817 0 003.233-.427c.427-.062.853-.123 1.28-.182 2.169-.3 4.337-.603 6.505-.905 2.168-.303 4.336-.605 6.505-.905.917-.13 1.552-.64 1.75-1.503.022-.093.047-.19.072-.287.172-.667.365-1.418-.275-1.919-3.327-2.588-3.332-7.64-.024-10.234.168-.129.347-.382.351-.58.03-.918.04-1.84-.02-2.757-.074-1.12-.743-1.81-1.874-1.964-2.444-.33-4.887-.657-7.331-.983-3.055-.409-6.11-.817-9.165-1.233-.842-.116-1.676-.259-2.51-.4zm17.102 5.026c.73 0 1.334.585 1.344 1.31.01.708-.59 1.333-1.309 1.363a1.341 1.341 0 01-1.363-1.29 1.306 1.306 0 011.328-1.383zM7.628 24.148H6.309v-.997h.258v.705h.268v-.62h.257v.62h.278v-.714h.258v1.006zm-.53.61h.53v-.288H6.309v.288h.52v.535h-.52v.288h1.319v-.288h-.53v-.535zm.53 1.448H6.577v-.402h-.268v1.091h.268v-.402h1.05v-.287z" fill="#227D3A"/><path d="M32.023 20.36v-3.545h2.613v13.298c-.64-.024-1.281-.04-1.92-.055-1.499-.037-2.992-.074-4.476-.213-1.26-.119-2.127-1.016-2.717-2.122-1.156-2.177-.704-5.047 1.175-6.476.664-.5 1.611-.718 2.469-.852.62-.1 1.258-.078 1.931-.056.3.01.608.02.925.02zm-.045 2.087c-.24 0-.473-.003-.7-.006a21.007 21.007 0 00-1.377.011c-1.324.075-2.142.962-2.261 2.395-.13 1.517.58 2.752 1.84 2.985.558.103 1.136.116 1.718.129.26.005.52.011.78.025v-5.539zm13.879 4.012c-.56 2.062-1.87 3.351-4.026 3.495-1.295.086-2.6.065-3.917.044a104.6 104.6 0 00-1.776-.019v-13.14h2.633v3.516l.858-.001a193.42 193.42 0 011.582 0c2.727.026 4.086 1.126 4.705 3.789l.002.005c.016.08.21 1.017-.061 2.31zm-7.026 1.507c.343-.025.693-.016 1.04-.008 1.166.03 2.293.058 2.981-1.207.6-1.1.65-2.355-.084-3.401-.717-1.016-1.725-.969-2.746-.92-.399.018-.8.037-1.186-.008-.005 1.885-.005 3.665-.005 5.544zM12.04 20.522c-.436-.002-.88-.004-1.333-.004 0-1.06-.015-2.94-.015-2.94v-.595s-1.87-.03-2.712-.03v3.417l-1.626.015s-.065 1.551-.065 2.236h1.726v2.25c-.003.894-.005 1.788.015 2.683.024 1.166.738 2.286 1.71 2.455.752.13 1.518.165 2.291.201.344.016.69.032 1.036.057V28.11c-.137 0-.27.001-.398.003-.29.003-.56.005-.831-.008-.556-.025-1.042-.303-1.066-.853a71.029 71.029 0 01-.027-3.284c.003-.45.007-.904.007-1.362.269 0 .53.002.787.004.6.005 1.174.01 1.746-.014.481-.02.704.174.873.61.64 1.666 1.304 3.327 1.983 4.978.072.174.135.363.2.554.187.556.38 1.126.767 1.37.436.272 1.11.192 1.745.117.152-.018.303-.035.447-.048.273-.024.654-.262.758-.5a625.204 625.204 0 003.207-7.381l.468-1.088a2.38 2.38 0 00.128-.43c.019-.08.04-.168.065-.264-.244 0-.478.002-.704.005-.502.006-.965.012-1.423-.015-.476-.025-.719.148-.888.59a178.161 178.161 0 01-1.542 3.872c-.172.43-.358.853-.559 1.312-.105.24-.214.49-.328.756l-.135-.308a9.371 9.371 0 01-.163-.381c-.18-.486-.364-.972-.546-1.458a215.63 215.63 0 01-1.368-3.704c-.178-.5-.426-.694-.971-.68-1.072.029-2.144.024-3.258.02z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/data/interfaces/default/images/rating/tomato-ripe.svg b/data/interfaces/default/images/rating/tomato-ripe.svg
deleted file mode 100644
index c8da285e..00000000
--- a/data/interfaces/default/images/rating/tomato-ripe.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="560" height="560"><g fill="none"><path fill="#FA320A" d="M478.29 296.976c-3.99-63.966-36.52-111.823-85.468-138.579.278 1.56-1.109 3.508-2.688 2.818-32.016-14.006-86.328 31.32-124.282 7.584.285 8.519-1.378 50.072-59.914 52.483-1.382.056-2.142-1.355-1.268-2.354 7.828-8.929 15.732-31.535 4.367-43.586-24.338 21.81-38.472 30.017-85.138 19.186-29.878 31.241-46.809 74-43.485 127.265 6.78 108.735 108.63 170.89 211.193 164.49 102.556-6.395 193.466-80.572 186.683-189.307"/><path fill="#00912D" d="M291.375 132.293c21.075-5.023 81.693-.49 101.114 25.274 1.166 1.545-.475 4.468-2.355 3.648-32.016-14.006-86.328 31.32-124.282 7.584.285 8.519-1.378 50.072-59.914 52.483-1.382.056-2.142-1.355-1.268-2.354 7.828-8.929 15.73-31.535 4.367-43.586-26.512 23.758-40.884 31.392-98.426 15.838-1.883-.508-1.241-3.535.762-4.298 10.876-4.157 35.515-22.361 58.824-30.385 4.438-1.526 8.862-2.71 13.18-3.4-25.665-2.293-37.235-5.862-53.559-3.4-1.789.27-3.004-1.813-1.895-3.241 21.995-28.332 62.513-36.888 87.512-21.837-15.41-19.094-27.48-34.321-27.48-34.321l28.601-16.246s11.817 26.4 20.414 45.614c21.275-31.435 60.86-34.336 77.585-12.033.992 1.326-.045 3.21-1.702 3.171-13.612-.331-21.107 12.05-21.675 21.466l.197.023"/></g></svg>
\ No newline at end of file
diff --git a/data/interfaces/default/images/rating/tomato-rotten.svg b/data/interfaces/default/images/rating/tomato-rotten.svg
deleted file mode 100644
index 7401427c..00000000
--- a/data/interfaces/default/images/rating/tomato-rotten.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="560" height="560"><path fill="#0AC855" d="M445.185 444.684c-79.369 4.167-95.587-86.652-126.726-86.006-13.268.279-23.726 14.151-19.133 30.32 2.525 8.888 9.53 21.923 13.944 30.011 15.57 28.544-7.447 60.845-34.383 63.577-44.76 4.54-63.433-21.426-62.278-48.007 1.3-29.84 26.6-60.331.65-73.305-27.194-13.597-49.301 39.572-75.325 51.439-23.553 10.741-56.248 2.413-67.872-23.741-8.164-18.379-6.68-53.768 29.67-67.27 22.706-8.433 73.305 11.029 75.9-13.623 2.992-28.416-53.155-30.812-70.06-37.626-29.912-12.055-47.567-37.85-33.734-65.522 10.378-20.757 40.915-29.203 64.223-20.11 27.922 10.892 32.404 39.853 46.71 51.897 12.324 10.38 29.19 11.68 40.22 4.543 8.135-5.265 10.843-16.828 7.774-27.39-4.07-14.023-14.875-22.773-25.415-31.346-18.758-15.249-45.24-28.36-29.222-69.983 13.13-34.11 51.642-35.34 51.642-35.34 15.3-1.72 29.002 2.9 40.167 12.875 14.927 13.335 17.834 31.16 15.336 50.176-2.283 17.358-8.426 32.56-11.63 49.759-3.717 19.966 6.954 40.086 27.249 40.869 26.694 1.031 34.698-19.486 37.964-32.492 4.782-19.028 11.058-36.694 28.718-47.82 25.346-15.97 60.552-12.47 76.886 18.222 12.92 24.284 8.772 57.715-11.047 75.97-8.892 8.188-19.584 11.075-31.148 11.156-16.585.117-33.162-.29-48.556 7.471-10.48 5.281-15.047 13.888-15.045 25.423 0 11.242 5.853 18.585 15.336 23.363 17.86 9.003 37.577 10.843 56.871 14.222 27.98 4.9 52.581 14.755 68.375 40.72.142.228.28.458.415.69 18.139 30.741-.831 75.005-36.476 76.878"/></svg>
\ No newline at end of file
diff --git a/data/interfaces/default/images/star-16.png b/data/interfaces/default/images/star-16.png
new file mode 100644
index 00000000..890bff87
Binary files /dev/null and b/data/interfaces/default/images/star-16.png differ
diff --git a/data/interfaces/default/images/star-32.png b/data/interfaces/default/images/star-32.png
new file mode 100644
index 00000000..9d15bb50
Binary files /dev/null and b/data/interfaces/default/images/star-32.png differ
diff --git a/data/interfaces/default/images/star-gray-16.png b/data/interfaces/default/images/star-gray-16.png
new file mode 100644
index 00000000..917d268a
Binary files /dev/null and b/data/interfaces/default/images/star-gray-16.png differ
diff --git a/data/interfaces/default/images/star-gray-32.png b/data/interfaces/default/images/star-gray-32.png
new file mode 100644
index 00000000..23100684
Binary files /dev/null and b/data/interfaces/default/images/star-gray-32.png differ
diff --git a/data/interfaces/default/images/tautulli.png b/data/interfaces/default/images/tautulli.png
deleted file mode 100644
index 7d653d5b..00000000
Binary files a/data/interfaces/default/images/tautulli.png and /dev/null differ
diff --git a/data/interfaces/default/images/tautulli.svg b/data/interfaces/default/images/tautulli.svg
deleted file mode 100644
index 7e70db00..00000000
--- a/data/interfaces/default/images/tautulli.svg
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="956.251px" height="214.137px" viewBox="0 -12.083 956.251 214.137" enable-background="new 0 -12.083 956.251 214.137"
-	 xml:space="preserve">
-<g>
-	<path fill="none" d="M165.163,137.282c12.933,0,25.607,0,38.673,0c-6.5-21.354-12.936-42.492-19.56-64.253
-		C177.798,94.804,171.503,115.967,165.163,137.282z"/>
-	<path fill="#FFFFFF" d="M226.314,113.482c-7.594-21.64-15.215-43.269-22.824-64.903c-13.035,0-26.072,0-39.106,0.002
-		c-0.241,1.061-0.381,2.153-0.737,3.174c-14.675,42.061-29.37,84.111-44.058,126.164c-2.503,7.166-4.984,14.34-7.53,21.666
-		c11.54,0,22.78,0,34.162,0c3.614-11.881,7.2-23.67,10.784-35.455c18.283,0,36.34,0,54.529,0
-		c3.627,11.914,7.212,23.691,10.781,35.412c11.493,0,22.693,0,34.128,0c-0.397-1.166-0.705-2.094-1.029-3.02
-		C245.716,168.84,236.026,141.157,226.314,113.482z M165.163,137.282c6.34-21.314,12.635-42.478,19.113-64.253
-		c6.624,21.761,13.06,42.899,19.56,64.253C190.77,137.282,178.096,137.282,165.163,137.282z"/>
-	<path fill="#FFFFFF" d="M112.916,49.243c-37.826,0-75.371,0-112.916,0c0,8.836,0,17.674,0.001,26.514c13.525,0,27.05,0,40.889,0
-		c0,41.563,0,82.594,0,123.787c10.64,0,20.961,0,31.692,0c0-41.311,0-82.438,0-123.892c13.718,0,27.028,0,40.334,0
-		C112.916,66.68,112.916,58.04,112.916,49.243z"/>
-	<path fill="#FFFFFF" d="M391.734,49.409c-10.657,0-20.976,0-31.667,0c0,1.457,0,2.752,0,4.045c0,28.379,0.037,56.758-0.037,85.135
-		c-0.012,4.623-0.206,9.287-0.851,13.857c-1.723,12.219-7.998,19.277-19.089,21.752c-6.441,1.436-12.932,1.305-19.396,0.002
-		c-9.917-2-16.129-8.066-18.262-17.797c-1.171-5.336-1.655-10.92-1.685-16.398c-0.158-28.928-0.074-57.859-0.074-86.791
-		c0-1.268,0-2.534,0-3.717c-10.869,0-21.188,0-31.639,0c0,1.023,0,1.793,0,2.563c0,31.471-0.018,62.939,0.032,94.41
-		c0.005,3.301,0.217,6.629,0.683,9.896c2.816,19.719,13.26,33.813,32.036,40.645c19.239,7.002,38.813,6.619,57.978-0.678
-		c13.699-5.215,23.273-14.91,28.45-28.723c2.545-6.791,3.528-13.869,3.526-21.104c-0.011-31.363-0.005-62.723-0.005-94.082
-		C391.734,51.463,391.734,50.502,391.734,49.409z"/>
-	<path fill="#FFFFFF" d="M660.845,52.793c0-1.073,0-2.149,0-3.385c-10.631,0-20.953,0-31.668,0c0,1.598,0,2.803,0,4.008
-		c0,28.487,0.035,56.979-0.037,85.467c-0.012,4.51-0.215,9.064-0.844,13.525c-1.734,12.313-8.184,19.514-19.379,21.869
-		c-6.34,1.332-12.723,1.215-19.076-0.064c-9.912-1.996-16.146-8.039-18.291-17.77c-1.174-5.334-1.662-10.92-1.689-16.398
-		c-0.16-28.928-0.076-57.86-0.076-86.791c0-1.277,0-2.553,0-3.77c-10.834,0-21.158,0-31.641,0c0,1.01,0,1.771,0,2.537
-		c0.004,31.581-0.016,63.16,0.033,94.742c0.006,3.189,0.23,6.406,0.678,9.564c2.805,19.723,13.236,33.82,32.006,40.674
-		c19.354,7.068,39.047,6.631,58.289-0.77c13.549-5.217,23.031-14.889,28.16-28.59c2.623-7.006,3.557-14.305,3.551-21.764
-		C660.828,114.852,660.845,83.823,660.845,52.793z"/>
-	<path fill="#FFFFFF" d="M408.633,75.745c13.484,0,26.794,0,40.523,0c0,41.445,0,82.566,0,123.836c10.655,0,20.887,0,31.802,0
-		c0-41.391,0-82.51,0-123.974c13.717,0,27.02,0,40.35,0c0-8.916,0-17.481,0-26.125c-37.66,0-75.133,0-112.675,0
-		C408.633,58.288,408.633,66.853,408.633,75.745z"/>
-	<path fill="#FFFFFF" d="M724.49,49.454c-10.699,0-21.014,0-31.4,0c0,50.158,0,100.104,0,150.119c30.779,0,61.322,0,92.055,0
-		c0-8.973,0-17.535,0-26.453c-20.227,0-40.254,0-60.652,0C724.49,131.659,724.49,90.556,724.49,49.454z"/>
-	<path fill="#FFFFFF" d="M837.128,49.476c-10.697,0-21.01,0-31.441,0c0,50.094,0,99.954,0,150.073c30.904,0,61.445,0,92.119,0
-		c0-8.826,0-17.469,0-26.473c-20.246,0-40.273,0-60.678,0C837.128,131.618,837.128,90.515,837.128,49.476z"/>
-	<path fill="#FFFFFF" d="M919.136,199.62c10.502,0,20.748,0,31.232,0c0-50.277,0-100.226,0-150.158c-10.564,0-20.879,0-31.232,0
-		C919.136,99.631,919.136,149.583,919.136,199.62z"/>
-	<circle fill="#E5A00D" cx="934.751" cy="9.417" r="21.5"/>
-</g>
-</svg>
diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html
index ca95be42..5f8caeba 100644
--- a/data/interfaces/default/index.html
+++ b/data/interfaces/default/index.html
@@ -1,1011 +1,179 @@
 <%inherit file="base.html"/>
 
 <%def name="headIncludes()">
-<link href="${http_root}css/jquery.scrollbar.css" rel="stylesheet">
 </%def>
 
 <%def name="body()">
-<% from plexpy import PLEX_SERVER_UP %>
 <div class="container-fluid">
-    % for section in config['home_sections']:
-    % if section == 'current_activity':
     <div class="row">
         <div class="col-md-12">
             <div class="padded-header" id="current-activity-header">
-                <h3><span id="sessions-xml">Activity</span> &nbsp;&nbsp;
-                    <small>
-                        <span id="currentActivityHeader" style="display: none;">
-                            Sessions: <span id="currentActivityHeader-streams"></span> |
-                            Bandwidth: <span id="currentActivityHeader-bandwidth"></span>
-                            <span id="currentActivityHeader-bandwidth-tooltip" data-toggle="tooltip" title="Streaming Brain Estimate (Reserved Bandwidth)"><i class="fa fa-info-circle"></i></span>
-                        </span>
-                    </small>
-                </h3>
+                <h3>Activity</h3>
             </div>
             <div id="currentActivity">
-                % if PLEX_SERVER_UP:
-                <div class="text-muted" id="dashboard-checking-activity"><i class="fa fa-refresh fa-spin"></i>&nbsp; Checking for activity...</div>
-                % elif config['pms_is_cloud']:
-                <div id="dashboard-no-activity" class="text-muted">Plex Cloud server is sleeping.</div>
-                % elif not config['first_run_complete']:
-                <div id="dashboard-no-activity" class="text-muted">The Tautulli setup wizard has not been completed. Please click <a href="welcome">here</a> to go to the setup wizard.</div>
-                % else:
-                <div class="text-muted" id="dashboard-checking-activity"><i class="fa fa-refresh fa-spin"></i>&nbsp; Tautulli is connecting to the Plex server...</div>
-                % endif
+                <div class="text-muted"><i class="fa fa-refresh fa-spin"></i> Checking for activity...</div>
+                <br>
             </div>
         </div>
     </div>
-    % elif section == 'watch_stats':
+    % if config['home_stats_cards'] > 'watch_statistics':
     <div class="row">
         <div class="col-md-12">
-            <div class="home-padded-header padded-header">
-                <h3 class="pull-left">Watch Statistics</h3>
-                <div class="button-bar">
-                    <div class="btn-group pull-left" data-toggle="buttons" id="watch-stats-toggles" style="margin-right: 3px">
-                        <label class="btn btn-dark btn-filter">
-                            <input type="radio" class="watched-stats-toggle" name="watched-stats-type" id="watched-stats-plays" value="plays" autocomplete="off"> Play Count
-                        </label>
-                        <label class="btn btn-dark btn-filter">
-                            <input type="radio" class="watched-stats-toggle" name="watched-stats-type" id="watched-stats-duration" value="duration" autocomplete="off"> Play Duration
-                        </label>
-                    </div>
-                    <div class="input-group pull-left" style="width: 1px; margin-right: 3px" id="watched-stats-days-selection">
-                        <span class="input-group-addon btn-dark inactive">Last</span>
-                        <input type="number" class="form-control number-input" name="watched-stats-days" id="watched-stats-days" value="30" min="1" data-default="30" data-toggle="tooltip" title="Min: 1 day" />
-                        <span class="input-group-addon btn-dark inactive">days</span>
-                    </div>
-                </div>
+            <div class="padded-header">
+                <h3>Watch Statistics <small>Last ${config['home_stats_length']} days</small></h3>
             </div>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-12">
             <div id="home-stats" class="home-platforms">
-                <div class="text-muted"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading stats...</div>
+                <div class='text-muted'><i class="fa fa-refresh fa-spin"></i> Loading stats...</div>
                 <br>
             </div>
         </div>
     </div>
-    % elif section == 'library_stats':
-    <div class="row">
-        <div class="col-md-12">
-            <div class="home-padded-header padded-header" id="library-statistics-header">
-                <h3 class="pull-left">Library Statistics</h3>
-                <div class="button-bar">
-                    <span class="btn btn-dark active" style="cursor: default">${config['pms_name']}</span>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-12">
-            <div id="library-stats" class="library-platforms">
-                <div class="text-muted"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading stats...</div>
-                <br>
-            </div>
-        </div>
-    </div>
-    % elif section == 'recently_added':
-    <div class="row">
-        <div class="col-md-12">
-            <div class="home-padded-header padded-header">
-                <h3 class="pull-left"><span id="recently-added-xml">Recently Added</span></h3>
-                <ul class="nav nav-header nav-dashboard pull-right" style="margin-top: -3px;">
-                    <li>
-                        <a href="#" id="recently-added-page-left" class="paginate-added btn-gray disabled" data-id="-1"><i class="fa fa-lg fa-chevron-left"></i></a>
-                    </li>
-                    <li>
-                        <a href="#" id="recently-added-page-right" class="paginate-added btn-gray disabled" data-id="+1"><i class="fa fa-lg fa-chevron-right"></i></a>
-                    </li>
-                </ul>
-                <div class="button-bar">
-                    <div class="btn-group pull-left" data-toggle="buttons" id="recently-added-toggles" style="margin-right: 3px">
-                        <label class="btn btn-dark btn-filter" id="recently-added-label-all">
-                            <input type="radio" name="recently-added-toggle" id="recently-added-toggle-all" value="all" autocomplete="off"> All
-                        </label>
-                        <label class="btn btn-dark btn-filter" id="recently-added-label-movies">
-                            <input type="radio" name="recently-added-toggle" id="recently-added-toggle-movie" value="movie" autocomplete="off"> Movies
-                        </label>
-                        <label class="btn btn-dark btn-filter" id="recently-added-label-tv">
-                            <input type="radio" name="recently-added-toggle" id="recently-added-toggle-show" value="show" autocomplete="off"> TV Shows
-                        </label>
-                        <label class="btn btn-dark btn-filter" id="recently-added-label-music">
-                            <input type="radio" name="recently-added-toggle" id="recently-added-toggle-artist" value="artist" autocomplete="off"> Music
-                        </label>
-                        <label class="btn btn-dark btn-filter" id="recently-added-label-other_video">
-                            <input type="radio" name="recently-added-toggle" id="recently-added-toggle-other_video" value="other_video" autocomplete="off"> Videos
-                        </label>
-                    </div>
-                    <div class="input-group pull-left" style="width: 1px;" id="recently-added-count-selection">
-                        <input type="number" class="form-control number-input" name="recently-added-count" id="recently-added-count" value="50" min="1" max="50" data-default="50" data-toggle="tooltip" title="Min: 1 item<br>Max: 50 items" />
-                        <span class="input-group-addon btn-dark inactive">items</span>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-12">
-            <div id="recentlyAdded" style="margin-right: -15px;">
-                % if PLEX_SERVER_UP:
-                <div id="dashboard-checking-recently-added" class="text-muted"><i class="fa fa-refresh fa-spin"></i>&nbsp; Looking for new items...</div>
-                % elif config['pms_is_cloud']:
-                <div class="text-muted">Plex Cloud server is sleeping.</div>
-                % else:
-                <div id="dashboard-no-recently-added" class="text-muted"><i class="fa fa-refresh fa-spin"></i>&nbsp; Tautulli is connecting to your Plex server...</div>
-                % endif
-            </div>
-        </div>
-    </div>
     % endif
-    % endfor
-</div>
-</%def>
-
-<%def name="modalIncludes()">
-
-% if _session['user_group'] == 'admin' and config['update_show_changelog']:
-<% from plexpy.common import RELEASE %>
-<div id="changelog-modal" class="modal fade wide" tabindex="-1" role="dialog" aria-labelledby="changelog-modal">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title">Tautulli Updated to <strong>${RELEASE}</strong></h4>
+    % if config['home_library_cards'] > 'library_statistics':
+    <div class="row">
+        <div class="col-md-12">
+            <div class="padded-header" id="library-statistics-header">
+                <h3>Library Statistics</h3>
             </div>
-            <div class="modal-body">
+            <div id="library-stats" class="library-platforms">
+                <div class='text-muted'><i class="fa fa-refresh fa-spin"></i> Loading stats...</div>
+                <br>
             </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-danger" data-target="#donate-modal" data-toggle="modal" style="float: left;"><i class="fa fa-fw fa-heart"></i> Donate</button>
-                <input type="button" class="btn btn-bright" data-dismiss="modal" value="Close">
+        </div>
+    </div>
+    % endif
+    <div class='row'>
+        <div class="col-md-12">
+            <div class="padded-header">
+                <h3>Recently Added</h3>
+            </div>
+            <div id='recentlyAdded'>
+                <div class='text-muted'><i class="fa fa-refresh fa-spin"></i> Looking for new items...</div>
+                <br>
             </div>
         </div>
     </div>
 </div>
-% endif
-
-% if _session['user_group'] == 'admin':
-<div id="terminate-session-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="terminate-session-modal">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title">Terminate Stream</h4>
-            </div>
-            <div class="modal-body" style="text-align: center;">
-                <p>Are you sure you want to terminate this stream?</p>
-                <p>
-                    <strong>
-                        <span id="terminate-user"></span><br />
-                        <span id="terminate-title"></span><br />
-                        <span id="terminate-subtitle"></span>
-                    </strong>
-                </p>
-                <br />
-                <label for="terminate-message">Terminate Message</label>
-                <div class="row">
-                    <div class="col-md-8" style="float: none; margin: 0 auto;">
-                        <input type="text" class="form-control" id="terminate-message" name="terminate-message" value="" placeholder="The server owner has ended the stream." style="text-align: center;">
-                    </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-dark" data-dismiss="modal">Cancel</button>
-                <button type="button" class="btn btn-danger btn-ok" data-dismiss="modal" id="confirm-terminate-session">Terminate</button>
-            </div>
-        </div>
-    </div>
-</div>
-<div class="modal fade wide" id="raw-stream-info-modal" tabindex="-1" role="dialog" aria-labelledby="raw-stream-info-modal">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title">Raw Stream Info: <strong><span id="raw-stream-info-title"></span> (<span id="raw-stream-info-user"></span>)</strong></h4>
-            </div>
-            <div class="modal-body">
-                <pre id="raw-stream-info"></pre>
-            </div>
-            <div class="modal-footer">
-                <input type="button" class="btn btn-bright" data-dismiss="modal" value="Close">
-            </div>
-        </div>
-    </div>
-</div>
-% endif
-
-<div class="modal fade" id="ip-info-modal" tabindex="-1" role="dialog" aria-labelledby="ip-info-modal">
-</div>
-
 </%def>
 
 <%def name="javascriptIncludes()">
-<script src="${http_root}js/jquery.scrollbar.min.js"></script>
-<script src="${http_root}js/jquery.mousewheel.min.js"></script>
+<script src="interfaces/default/js/moment-with-locale.js"></script>
 <script>
+
+    function currentActivityHeader() {
+        $.ajax({
+            url: 'get_current_activity_header',
+            cache: false,
+            async: true,
+            complete: function(xhr, status) {
+                $("#current-activity-header").html(xhr.responseText);
+            }
+        });
+    }
+    currentActivityHeader();
+    setInterval(currentActivityHeader, 15000);
+
+    function currentActivity() {
+        $.ajax({
+            url: 'get_current_activity',
+            cache: false,
+            async: true,
+            complete: function(xhr, status) {
+                $("#currentActivity").html(xhr.responseText);
+            }
+        });
+    }
+    currentActivity();
+    setInterval(currentActivity, 15000);
+
+    function getHomeStats(days) {
+        $.ajax({
+            url: 'home_stats',
+            cache: false,
+            async: true,
+            data: { },
+            complete: function(xhr, status) {
+                $("#home-stats").html(xhr.responseText);
+            }
+        });
+    }
+
+    function getLibraryStatsHeader() { 
+        $.ajax({
+            "url": "get_servers_info",
+            type: "post",
+            cache: false,
+            async: true,
+            data: { },
+            complete: function (xhr, status) {
+                server_info = $.parseJSON(xhr.responseText);
+                var server_name = 'Server name not found';
+                for (var i in server_info) {
+                    if (server_info[i].machine_identifier == '${config['pms_identifier']}') { 
+                        server_name = server_info[i].name
+                        break;
+                    }
+                }
+                $('#library-statistics-header h3').append(' <small>' + server_name + '</small>')
+            }
+        });
+    }
+
+    function getLibraryStats() {
+        $.ajax({
+            url: 'library_stats',
+            cache: false,
+            async: true,
+            data: { },
+            complete: function(xhr, status) {
+                $("#library-stats").html(xhr.responseText);
+            }
+        });
+    }
+
+    function recentlyAdded() {
+        var widthVal = $('body').find(".container-fluid").width();
+        var tmp = (widthVal-20) / 182;
+
+        if (tmp > 0) {
+            containerSize = parseInt(tmp);
+        } else {
+            containerSize = 1;
+        }
+
+        $.ajax({
+            url: 'get_recently_added',
+            type: "GET",
+            async: true,
+            data: { count : containerSize },
+            complete: function(xhr, status) {
+                $("#recentlyAdded").html(xhr.responseText);
+            }
+        });
+    }
+    $(document).ready(function () {
+        recentlyAdded();
+        $(window).resize(function() {
+            recentlyAdded();
+        });
+    });
+
     var date_format = 'YYYY-MM-DD';
     var time_format = 'hh:mm a';
     $.ajax({
         url: 'get_date_formats',
         type: 'GET',
-        success: function (data) {
+        success: function(data) {
             date_format = data.date_format;
             time_format = data.time_format;
         }
     });
 
-    function lockScroll(elem) {
-        $(elem).each(function (i, instance)  {
-            var childHeight = $(instance).children('.scoller-content').height();
-            var height = $(instance).height();
-            var scrollHeight = $(instance).get(0).scrollHeight;
-
-            if (childHeight > height) {
-                $(instance).on('mousewheel', function(e, d) {
-                    if(($(instance).scrollTop() >= (scrollHeight - height)) && d < 0 || ($(instance).scrollTop() <= 0) && d > 0) {
-                        e.preventDefault();
-                    }
-                });
-            }
-        });
-    }
-
-    % if _session['user_group'] == 'admin':
-    var msg_settings = ' Check the <a href="logs">logs</a> and verify your server connection in the <a href="settings#tab_tabs-plex_media_server">settings</a>.';
-    % else:
-    var msg_settings = '';
-    % endif
-
-    var error_msg = 'There was an error communicating with your Plex Server.' + msg_settings;
-
-    % if 'current_activity' in config['home_sections'] or 'recently_added' in config['home_sections']:
-    var server_status;
-    server_status = setInterval(function() {
-        $.getJSON('server_status', function (data) {
-            if (data.connected === true) {
-                clearInterval(server_status);
-                % if 'current_activity' in config['home_sections']:
-                $('#currentActivity').html('<div id="dashboard-checking-activity" class="text-muted"><i class="fa fa-refresh fa-spin"></i>&nbsp; Checking for activity...</div>');
-                activityConnected();
-                % endif
-                % if 'recently_added' in config['home_sections']:
-                $('#recentlyAdded').html('<div id="dashboard-checking-recently-added" class="text-muted"><i class="fa fa-refresh fa-spin"></i>&nbsp; Looking for new items...</div>');
-                recentlyAddedConnected();
-                % endif
-            } else if (data.connected === false) {
-                clearInterval(server_status);
-                % if 'current_activity' in config['home_sections']:
-                $('#currentActivity').html('<div id="dashboard-no-activity" class="text-muted">' + error_msg + '</div>');
-                % endif
-                % if 'recently_added' in config['home_sections']:
-                $('#recentlyAdded').html('<div id="dashboard-no-recently-added" class="text-muted">' + error_msg + '</div>');
-                % endif
-            }
-        });
-    }, 1000);
-    % endif
-</script>
-% if 'current_activity' in config['home_sections']:
-<script>
-    var defaultHandler = {
-        get: function(target, name) {
-            return target.hasOwnProperty(name) ? target[name] : 'Unknown';
-        }
-    };
-
-    var create_instances = [];
-    var activity_ready = true;
-
-    $('#currentActivityHeader-bandwidth-tooltip').tooltip({ container: 'body', placement: 'right', delay: 50 });
-
-    var title = document.title;
-
-    function getCurrentActivity() {
-        activity_ready = false;
-
-        $.ajax({
-            url: 'get_activity',
-            type: 'GET',
-            cache: false,
-            async: true,
-            error: function (xhr, status, error) {
-                console.log(status + ': ' + error);
-                activity_ready = true;
-            },
-            complete: function (xhr, status) {
-                $('#dashboard-checking-activity').remove();
-
-                var current_activity;
-                try {
-                    current_activity = $.parseJSON(xhr.responseText);
-                } catch (e) {
-                    console.log(status + ': ' + e);
-                    current_activity = null;
-                }
-
-                if (!(current_activity)) {
-                    $('#currentActivityHeader').hide();
-                    $('#currentActivity').html('<div id="dashboard-no-activity" class="text-muted">' + error_msg + '</div>');
-                    return
-                }
-
-                var stream_count = parseInt(current_activity.stream_count);
-                var sessions = current_activity.sessions;
-
-                if (stream_count) {
-                    $('#dashboard-no-activity').remove();
-
-                    // Update the header stream counts
-                    var sc_dp = current_activity.stream_count_direct_play,
-                        sc_ds = current_activity.stream_count_direct_stream,
-                        sc_tc = current_activity.stream_count_transcode,
-                        total_bw = current_activity.total_bandwidth,
-                        lan_bw = current_activity.lan_bandwidth,
-                        wan_bw = current_activity.wan_bandwidth;
-                    var streams_header = stream_count + ' stream' + (stream_count > 1 ? 's' : '') + ' (';
-                    if (sc_dp) {
-                        streams_header += sc_dp + ' direct play' + (sc_dp > 1 ? 's' : '') + ', ';
-                    }
-                    if (sc_ds) {
-                        streams_header += sc_ds + ' direct stream' + (sc_ds > 1 ? 's' : '') + ', ';
-                    }
-                    if (sc_tc) {
-                        streams_header += sc_tc + ' transcode' + (sc_tc > 1 ? 's' : '') + ', ';
-                    }
-                    streams_header = streams_header.replace(/, $/, '') + ')';
-                    $('#currentActivityHeader-streams').text(streams_header);
-
-                    var bandwidth_header = ((total_bw > 1000000) ? ((total_bw / 1000000).toFixed(1) + ' Gbps') : ((total_bw > 1000) ? ((total_bw / 1000).toFixed(1) + ' Mbps') : (total_bw + ' kbps')));
-                    var lan_wan_bandwidth_header = '';
-                    if (lan_bw) {
-                        lan_wan_bandwidth_header += 'LAN: ' + ((lan_bw > 1000000) ? ((lan_bw / 1000000).toFixed(1) + ' Gbps') : ((lan_bw > 1000) ? ((lan_bw / 1000).toFixed(1) + ' Mbps') : (lan_bw + ' kbps'))) + ', ';
-                    }
-                    if (wan_bw) {
-                        lan_wan_bandwidth_header += 'WAN: ' + ((wan_bw > 1000000) ? ((wan_bw / 1000000).toFixed(1) + ' Gbps') : ((wan_bw > 1000) ? ((wan_bw / 1000).toFixed(1) + ' Mbps') : (wan_bw + ' kbps'))) + ', ';
-                    }
-                    if (lan_wan_bandwidth_header) {
-                        bandwidth_header += ' (' + lan_wan_bandwidth_header.replace(/, $/, '') + ')';
-                    }
-                    $('#currentActivityHeader-bandwidth').text(bandwidth_header);
-
-                    $('#currentActivityHeader').show();
-
-                    document.title = stream_count + ' stream' + (stream_count > 1 ? 's' : '') + ' | ' + title;
-
-                    sessions.forEach(function (session) {
-                        var s = (typeof Proxy === "function") ? new Proxy(session, defaultHandler) : session;
-                        var key = s.session_key;
-                        var session_id = s.session_id;
-                        var instance = $('#activity-instance-' + key);
-
-                        // Create a new instance if it doesn't exist or recreate the entire instance
-                        // if the rating key changed (for movies or episodes) of guid changed (for live tv) with the same session key
-                        if (!(instance.length) ||
-                                (s.media_type !== 'track' && s.rating_key !== instance.data('rating_key').toString()) ||
-                                (s.live === 1 && s.guid !== instance.data('guid'))) {
-                            create_instances.push(key);
-                            getActivityInstance(key);
-                            return;
-                        }
-
-                        // Update play state icon
-                        var state_icon = '';
-                        switch (s.state) {
-                            case 'playing':
-                                state_icon = '<i class="fa fa-fw fa-play"></i>&nbsp;';
-                                break;
-                            case 'paused':
-                                state_icon = '<i class="fa fa-fw fa-pause"></i>&nbsp;';
-                                break;
-                            case 'buffering':
-                                state_icon = '<i class="fa fa-fw fa-spinner"></i>&nbsp;';
-                                break;
-                            case 'error':
-                                state_icon = '<i class="fa fa-fw fa-exclamation-triangle"></i>&nbsp;';
-                                break;
-                            default:
-                                state_icon = '<i class="fa fa-fw fa-question-circle"></i>&nbsp;';
-                        }
-                        $('#play-state-' + key).html(state_icon).attr('title', capitalizeFirstLetter(s.state));
-
-                        // Switching tracks can be under the same session key, so need to update the info.
-                        if (s.media_type === 'track') {
-                            // Update if artist changed
-                            if (s.grandparent_rating_key !== instance.data('grandparent_rating_key').toString()) {
-                                $('#background-' + key).css('background-image', 'url(' + page('pms_image_proxy', s.art, s.rating_key, 500, 280, 40, '282828', 3, 'art', true) + ')');
-                                $('#metadata-grandparent_title-' + key)
-                                    .attr('href', page('info', s.grandparent_rating_key))
-                                    .attr('title', s.original_title || s.grandparent_title)
-                                    .text(s.original_title || s.grandparent_title);
-                            }
-                            // Update cover if album changed
-                            if (s.parent_rating_key !== instance.data('parent_rating_key').toString()) {
-                                $('#poster-' + key).css('background-image', 'url(' + page('pms_image_proxy', s.parent_thumb, s.parent_rating_key, 300, 300, null, null, null, 'poster', true) + ')');
-                                $('#poster-' + key + '-bg').css('background-image', 'url(' + page('pms_image_proxy', s.parent_thumb, s.parent_rating_key, 300, 300, 60, '282828', 3, 'poster', true) + ')');
-                                $('#poster-url-' + key)
-                                    .attr('href', page('info', s.parent_rating_key))
-                                    .attr('title', s.parent_title);
-                                $('#metadata-parent_title-' + key)
-                                    .attr('href', page('info', s.parent_rating_key))
-                                    .attr('title', s.parent_title)
-                                    .text(s.parent_title);
-                            }
-                            // Update cover if track changed
-                            if (s.rating_key !== instance.data('rating_key').toString()) {
-                                $('#metadata-grandparent_title-' + key)
-                                    .attr('href', page('info', s.grandparent_rating_key))
-                                    .attr('title', s.original_title || s.grandparent_title)
-                                    .text(s.original_title || s.grandparent_title);
-                                $('#metadata-title-' + key)
-                                    .attr('href', page('info', s.rating_key))
-                                    .attr('title', s.title)
-                                    .text(s.title);
-                            }
-                        }
-
-                        // Update the transcode state
-                        var transcode_decision = '';
-                        if (s.transcode_decision === 'transcode') {
-                            var throttled = (s.transcode_throttled === 1) ? ' (Throttled)' : ' (Speed: ' + s.transcode_speed + ')';
-                            transcode_decision = 'Transcode' + throttled;
-                        } else if (s.transcode_decision === 'copy') {
-                            transcode_decision = 'Direct Stream';
-                        } else {
-                            transcode_decision = 'Direct Play';
-                        }
-                        $('#transcode_decision-' + key).html(transcode_decision);
-
-                        var transcode_container = '';
-                        if (s.stream_container_decision === 'transcode') {
-                            transcode_container = 'Converting (' + s.container.toUpperCase() + ' <i class="fa fa-long-arrow-right"></i> ' + s.stream_container.toUpperCase() + ')';
-                        } else {
-                            transcode_container = 'Direct Play (' + s.stream_container.toUpperCase() + ')';
-                        }
-                        $('#transcode_container-' + key).html(transcode_container);
-
-                        var video_decision = '';
-                        if (['movie', 'episode', 'clip'].indexOf(s.media_type) > -1 && s.stream_video_decision) {
-                            var v_bd =  (s.video_dynamic_range !== 'SDR') ? ' ' + s.video_dynamic_range : '';
-                            var sv_bd =  (s.stream_video_dynamic_range !== 'SDR' || v_bd) ? ' ' + s.stream_video_dynamic_range : '';
-                            var v_res= '';
-                            switch (s.video_resolution.toLowerCase()) {
-                                case 'sd':
-                                    v_res = 'SD';
-                                    break;
-                                case '4k':
-                                    v_res = '4k';
-                                    break;
-                                default:
-                                    v_res = s.video_full_resolution;
-                            }
-                            var sv_res = '';
-                            switch (s.stream_video_resolution.toLowerCase()) {
-                                case 'sd':
-                                    sv_res = 'SD';
-                                    break;
-                                case '4k':
-                                    sv_res = '4k';
-                                    break;
-                                default:
-                                    sv_res = s.stream_video_full_resolution;
-                            }
-                            if (s.stream_video_decision === 'transcode') {
-                                var hw_d = (s.transcode_hw_decoding === 1) ? ' (HW)' : '';
-                                var hw_e = (s.transcode_hw_encoding === 1) ? ' (HW)' : '';
-                                video_decision = 'Transcode (' + s.video_codec.toUpperCase() + hw_d + ' ' + v_res + v_bd + ' <i class="fa fa-long-arrow-right"></i> ' + s.stream_video_codec.toUpperCase() + hw_e + ' ' + sv_res + sv_bd + ')';
-                            } else if (s.stream_video_decision === 'copy') {
-                                video_decision = 'Direct Stream (' + s.stream_video_codec.toUpperCase() + ' ' + sv_res + sv_bd + ')';
-                            } else {
-                                video_decision = 'Direct Play (' + s.stream_video_codec.toUpperCase() + ' ' + sv_res + sv_bd + ')';
-                            }
-                        } else if (s.media_type === 'photo') {
-                            video_decision = 'Direct Play (' + s.width + 'x' + s.height + ')';
-                        }
-                        $('#video_decision-' + key).html(video_decision);
-
-                        var audio_decision = '';
-                        if (['movie', 'episode', 'clip', 'track'].indexOf(s.media_type) > -1 && s.stream_audio_decision) {
-                            var audio_language = (s.media_type !== 'track') ? (s.audio_language || 'Unknown') + ' - ' : '';
-                            var a_codec = (s.audio_codec === 'truehd') ? 'TrueHD' : s.audio_codec.toUpperCase();
-                            var sa_codec = (s.stream_audio_codec === 'truehd') ? 'TrueHD' : s.stream_audio_codec.toUpperCase();
-                            if (s.stream_audio_decision === 'transcode') {
-                                audio_decision = 'Transcode (' + audio_language + a_codec + ' ' + capitalizeFirstLetter(s.audio_channel_layout.split('(')[0]) + ' <i class="fa fa-long-arrow-right"></i> ' + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')';
-                            } else if (s.stream_audio_decision === 'copy') {
-                                audio_decision = 'Direct Stream (' + audio_language + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')';
-                            } else {
-                                audio_decision = 'Direct Play (' + audio_language + sa_codec + ' ' + capitalizeFirstLetter(s.stream_audio_channel_layout.split('(')[0]) + ')';
-                            }
-                        }
-                        $('#audio_decision-' + key).html(audio_decision);
-
-                        var subtitle_decision = 'None';
-                        if (['movie', 'episode', 'clip'].indexOf(s.media_type) > -1 && s.subtitles === 1) {
-                            var subtitle_codec = (s.stream_subtitle_codec && s.stream_subtitle_transient) ? 'None' : s.subtitle_codec.toUpperCase();
-                            if (s.stream_subtitle_decision === 'transcode') {
-                                subtitle_decision = 'Transcode ('+ (s.subtitle_language || 'Unknown')+ ' - ' + subtitle_codec + ' <i class="fa fa-long-arrow-right"></i> ' + s.stream_subtitle_codec.toUpperCase() + ')';
-                            } else if (s.stream_subtitle_decision === 'copy') {
-                                subtitle_decision = 'Direct Stream ('+ (s.subtitle_language || 'Unknown')+ ' - ' + subtitle_codec + ')';
-                            } else if (s.stream_subtitle_decision === 'burn') {
-                                subtitle_decision = 'Burn ('+ (s.subtitle_language || 'Unknown')+ ' - ' + subtitle_codec + ')';
-                            } else {
-                                subtitle_decision = 'Direct Play ('+ (s.subtitle_language || 'Unknown')+ ' - ' + ((s.synced_version === '1') ? subtitle_codec : s.stream_subtitle_codec.toUpperCase()) + ')';
-                            }
-                        }
-                        $('#subtitle_decision-' + key).html(subtitle_decision);
-
-                        // Update the stream quality profile and bandwidth
-                        if (s.media_type !== 'photo' && s.quality_profile !== 'Unknown') {
-                            var br = parseInt(s.stream_bitrate) || '';
-                            if (br) {
-                                if (br > 1000) {
-                                    br = ' (' + (br / 1000).toFixed(1) + ' Mbps)';
-                                } else {
-                                    br = ' (' + br + ' kbps)';
-                                }
-                            }
-                            $('#stream_quality-' + key).html(s.quality_profile + br);
-                        } else {
-                            $('#stream_quality-' + key).html(s.quality_profile);
-                        }
-                        $('#optimized_version-' + key).html(s.optimized_version_profile + ' (' + s.optimized_version_title + ')');
-                        $('#synced_quality_profile-' + key).html(s.synced_quality_profile);
-
-                        $('#location-' + key).html(s.location.toUpperCase());
-
-                        if (s.media_type !== 'photo' && s.bandwidth !== 'Unknown') {
-                            var bw = parseInt(s.bandwidth) || 0;
-                            if (bw > 1000000) {
-                                bw = (bw / 1000000).toFixed(1) + ' Gbps';
-                            } else if (bw > 1000) {
-                                bw = (bw / 1000).toFixed(1) + ' Mbps';
-                            } else {
-                                bw = bw + ' kbps'
-                            }
-                            $('#stream-bandwidth-' + key).html(bw);
-                        }
-
-                        // Update the stream progress times
-                        $('#stream-eta-' + key).html(moment().add(parseInt(s.duration) - parseInt(s.view_offset), 'milliseconds').format(time_format));
-                        $('#stream-duration-' + key).html(millisecondsToMinutes(parseInt(s.stream_duration), false));
-                        var stream_view_offset = $('#stream-view-offset-' + key);
-                        stream_view_offset.data('state', s.state);
-                        if (stream_view_offset.data('last_view_offset') !== s.view_offset) {
-                            stream_view_offset.data('last_view_offset', s.view_offset).data('view_offset', s.view_offset);
-                        }
-
-                        // Update the progress bars
-                        var duration = parseInt(s.duration);
-                        var transcode_progress = duration ? Math.round(s.transcode_max_offset_available * 1000 / duration * 100) : s.transcode_progress;
-                        $('#buffer-bar-' + key).css({width: parseInt(transcode_progress) + '%'}).html(transcode_progress + '%')
-                            .attr('data-original-title', 'Transcoder Progress ' + transcode_progress + '%');
-                        if (s.live !== 1) {
-                            var progress_bar = $('#progress-bar-' + key);
-                            progress_bar.data('state', s.state);
-                            if (progress_bar.data('last_view_offset') !== s.view_offset) {
-                                progress_bar.data('last_view_offset', s.view_offset).data('view_offset', s.view_offset);
-                            }
-                        }
-
-                        // Add temporary class so we know which instances are still active
-                        instance.addClass('updated-temp');
-                    });
-
-                    // Remove finished instances
-                    $('div[id^=activity-instance-]').each(function (i, instance) {
-                        if ($(instance).hasClass('updated-temp')) {
-                            $(instance).removeClass('updated-temp');
-                        } else {
-                            $(instance).find('[data-toggle=tooltip]').tooltip('destroy');
-                            $(instance).find('[data-toggle=popover]').popover('destroy');
-                            $(instance).remove();
-                        }
-                    });
-
-                } else {
-                    $('#currentActivityHeader').hide();
-                    $('#currentActivity').html('<div id="dashboard-no-activity" class="text-muted">Nothing is currently being played.</div>');
-
-                    document.title = title;
-                }
-
-                activity_ready = true;
-            }
-        });
-    }
-
-    function getActivityInstance(session_key) {
-        $.ajax({
-            url: 'get_current_activity_instance',
-            type: 'GET',
-            cache: false,
-            async: true,
-            data: {
-                session_key: session_key
-            },
-            complete: function(xhr, status) {
-                var instance = $('#activity-instance-' + session_key);
-
-                if (instance.length) {
-                    instance.replaceWith(xhr.responseText);
-                } else {
-                    $('#currentActivity').append(xhr.responseText);
-                }
-
-                $('#activity-instance-' + session_key + ' .dashboard-activity-info-scroller').scrollbar();
-                $('#activity-instance-' + session_key + ' [data-toggle=tooltip]').tooltip({ container: 'body', placement: 'right', delay: 50 });
-                $('#activity-instance-' + session_key + ' [data-toggle=popover]').popover({
-                    html: true,
-                    sanitize: false,
-                    container: 'body',
-                    trigger: 'hover',
-                    placement: 'right',
-                    delay: 50,
-                    template: '<div class="popover channel-thumbnail-popover" role="tooltip"><div class="arrow" style="top: 50%;"></div><div class="popover-content"></div></div>',
-                    content: function () {
-                        return '<div class="channel-thumbnail" style="background-image: url(' + $(this).data('img') + ');" />';
-                    }
-                });
-                $('#terminate-button-' + session_key).tooltip('destroy').tooltip({ container: 'body', placement: 'left', delay: 50 });
-                lockScroll('#activity-instance-' + session_key + ' .dashboard-activity-info-scroller');
-
-                var index = create_instances.indexOf(session_key);
-                if (index > -1) {
-                    create_instances.splice(index, 1);
-                }
-            }
-        });
-    }
-
-    function activityConnected() {
-        getCurrentActivity();
-        setInterval(function () {
-            if (!(create_instances.length) && activity_ready) {
-                getCurrentActivity();
-            }
-        }, ${config['home_refresh_interval'] * 1000});
-
-        setInterval(function(){
-            $('.progress_time_offset').each(function () {
-                if ($(this).data('state') === 'playing' && $(this).data('view_offset') >= 0) {
-                    var view_offset = parseInt($(this).data('view_offset'));
-                    var stream_duration = parseInt($(this).data('stream_duration'));
-                    var timestamp = millisecondsToMinutes(Math.min(view_offset, stream_duration), false);
-                    $(this).html(timestamp).data('view_offset', Math.min(view_offset + 1000, stream_duration))
-                }
-            });
-            $('.progress-bar').each(function () {
-                if ($(this).data('state') === 'playing' && $(this).data('view_offset') >= 0) {
-                    var view_offset = parseInt($(this).data('view_offset'));
-                    var stream_duration = parseInt($(this).data('stream_duration'));
-                    var progress_percent = Math.floor(view_offset / stream_duration * 100);
-                    progress_percent = (progress_percent >= 0) ? Math.min(progress_percent, 100) : 100;
-                    $(this).css({width: progress_percent + '%'}).html(progress_percent + '%')
-                        .attr('data-original-title', 'Stream Progress ' + progress_percent + '%')
-                        .data('view_offset', Math.min(view_offset + 1000, stream_duration));
-                }
-            });
-        }, 1000);
-    }
-
-    $('#currentActivity').on('click', '.external_ip-modal', function () {
-        $.get('get_ip_address_details', {
-            ip_address: $(this).data('ip'),
-            location: $(this).data('location'),
-            secure: $(this).data('secure'),
-            relayed: $(this).data('relayed')
-        }).then(function (jqXHR) {
-            $("#ip-info-modal").html(jqXHR);
-        });
-    });
-
-    $('#currentActivity').on('click', '.raw-stream-info-modal', function () {
-        $.ajax({
-            url: 'get_activity',
-            type: 'GET',
-            cache: false,
-            async: true,
-            data: {
-                session_key: $(this).data('key')
-            },
-            error: function (xhr, status, error) {
-                console.log(status + ': ' + error);
-            },
-            complete: function (xhr, status) {
-                var session = $.parseJSON(xhr.responseText);
-                $('#raw-stream-info-title').text(session.full_title);
-                $('#raw-stream-info-user').text(session.friendly_name);
-                $('#raw-stream-info').text(JSON.stringify(session, Object.keys(session).sort(), 4));
-            }
-        });
-    });
-
-    % if _session['user_group'] == 'admin':
-    // Terminate session
-    $('#currentActivity').on('click', '.dashboard-activity-terminate-session', function (e) {
-        e.preventDefault();
-        var session_id = $(this).data('id');
-        var key = $(this).data('key');
-        var instance = $('#activity-instance-' + key);
-
-        $('#terminate-user').text(instance.find('.dashboard-activity-metadata-user').text());
-        $('#terminate-title').text(instance.find('.dashboard-activity-metadata-title').text());
-        $('#terminate-subtitle').text(instance.find('.dashboard-activity-metadata-subtitle').text());
-
-        $('#terminate-session-modal').modal();
-        $('#terminate-session-modal').one('click', '#confirm-terminate-session', function () {
-            var message = $('#terminate-message').val();
-
-            showMsg('Terminating session', true);
-
-            $.ajax({
-                url: 'terminate_session',
-                data: {
-                    session_key: key,
-                    session_id: session_id,
-                    message: message
-                },
-                async: true,
-                success: function (data) {
-                    if (data.result === 'success') {
-                        setTimeout(function() {
-                            getCurrentActivity();
-                            showMsg('<i class="fa fa-check"></i> ' + data.message, false, true, 5000);
-                        }, 2500);
-                    } else {
-                        showMsg('<i class="fa fa-exclamation-circle"></i> ' + data.message, false, true, 5000, true);
-                    }
-                }
-            });
-        });
-    });
-
-    $('#sessions-xml').on('tripleclick', function () {
-        openPlexXML('/status/sessions');
-    });
-    % endif
-</script>
-% endif
-% if 'watch_stats' in config['home_sections'] or 'library_stats' in config['home_sections']:
-<script>
-    function statsCardCallback() {
-        $('.dashboard-stats-instance .dashboard-stats-info-scroller').scrollbar();
-        loadAllBlurHash();
-
-        function changeImages(elem) {
-            var stat_id = $(elem).data('stat_id');
-            var art = $(elem).data('art');
-            var thumb = $(elem).data('thumb');
-            var user_id = $(elem).data('user_id');
-            var library_type = $(elem).data('library-type');
-            var user_thumb = $(elem).data('user_thumb');
-            var rating_key = $(elem).data('rating_key');
-            var grandparent_rating_key = $(elem).data('grandparent_rating_key');
-            var guid = $(elem).data('guid');
-            var live = $(elem).data('live');
-            var library_art = $(elem).data('library_art');
-            var library_thumb = $(elem).data('library_thumb');
-            var [height, fallback_poster, fallback_art] = [450, 'poster', 'art'];
-            if ($.inArray(stat_id, ['top_music', 'popular_music']) > -1) {
-                [height, fallback_poster, fallback_art] = [300, 'cover', 'art'];
-            } else if (live) {
-                [height, fallback_poster, fallback_art] = [450, 'poster-live', 'art-live'];
-            }
-            var href = '#';
-
-            if (stat_id === 'most_concurrent') {
-                return
-            } else if (stat_id === 'top_libraries') {
-                $('#stats-background-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', art || library_art, null, 500, 280, 40, '282828', 3, fallback_art) + ')');
-                $('#stats-thumb-' + stat_id).removeClass(function (index, className) {
-                    return (className.match (/(^|\s)svg-icon library-\S+/g) || []).join(' ')});
-                if (library_thumb.startsWith('http')) {
-                    $('#stats-thumb-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', library_thumb, null, 100, 100, null, null, null, 'cover') + ')');
-                } else {
-                    $('#stats-thumb-' + stat_id).css('background-image', '')
-                        .addClass('svg-icon library-' + library_type);
-                }
-            } else if (stat_id === 'top_users') {
-                loadBlurHash($('#stats-background-' + stat_id), page('pms_image_proxy', user_thumb || 'interfaces/default/images/gravatar-default.png', null, 100, 100, 40, '282828', 0, 'user'));
-                $('#stats-thumb-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', user_thumb || 'interfaces/default/images/gravatar-default.png', null, 100, 100, null, null, null, 'user') + ')');
-                if (user_id) {
-                    href = page('user', user_id);
-                }
-                $('#stats-thumb-url-' + stat_id).attr('href', href).prop('title', $(elem).data('user'));
-            } else if (stat_id === 'top_platforms') {
-                $('#stats-thumb-' + stat_id).removeClass(function (index, className) {
-                    return (className.match (/(^|\s)platform-\S+/g) || []).join(' ');
-                }).addClass('platform-' + $(elem).data('platform'));
-                $('#stats-background-' + stat_id).removeClass(function (index, className) {
-                    return (className.match (/(^|\s)platform-\S+/g) || []).join(' ');
-                }).addClass('platform-' + $(elem).data('platform') + '-rgba');
-            } else {
-                if (rating_key) {
-                    if (live) {
-                        href = page('info', rating_key, guid, true, live);
-                    } else {
-                        href = page('info', rating_key);
-                    }
-                }
-                var img_rating_key = grandparent_rating_key || rating_key;
-                $('#stats-thumb-url-' + stat_id).attr('href', href).prop('title', $(elem).data('title'));
-                $('#stats-background-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', art, img_rating_key, 500, 280, 40, '282828', 3, fallback_art) + ')');
-                $('#stats-thumb-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', thumb, img_rating_key, 300, height, null, null, null, fallback_poster) + ')');
-                $('#stats-thumb-' + stat_id + '-bg').css('background-image', 'url(' + page('pms_image_proxy', thumb, img_rating_key, 300, height, 60, '282828', 3, fallback_poster) + ')');
-                $('#library-stats-background-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', art || library_art, img_rating_key, 500, 280, 40, '282828', 3, library_art || fallback_art) + ')');
-                if (thumb.startsWith('http')) {
-                    $('#library-stats-thumb-' + stat_id).css('background-image', 'url(' + page('pms_image_proxy', thumb, img_rating_key, 300, 300, null, null, null, 'cover') + ')')
-                        .removeClass('svg-icon library-' + stat_id);
-                } else {
-                    $('#library-stats-thumb-' + stat_id).css('background-image', '')
-                        .addClass('svg-icon library-' + stat_id);
-                }
-            }
-        }
-
-        $('.dashboard-stats-info-item').mouseenter(function () {
-            changeImages(this);
-            if ($(this).data('stat_id') === 'last_watched') {
-                var friendly_name = $(this).data('friendly_name');
-                var last_watch = moment($(this).data('last_watch'), 'X').format(date_format);
-                $('#last-watched-header-info').html(friendly_name);
-            } else if ($(this).data('stat_id') === 'most_concurrent') {
-                var started = moment($(this).data('started'), 'X').format(date_format + ' ' + time_format);
-                $('#most-concurrent-header-info').html(started);
-            }
-        });
-        $('.dashboard-stats-instance').mouseleave(function () {
-            changeImages($(this).find('.dashboard-stats-info-item').first());
-            if ($(this).data('stat_id') === 'last_watched') {
-                $('#last-watched-header-info').text($(this).find('.dashboard-stats-info-item').first().data('friendly_name'));
-            } else if ($(this).data('stat_id') === 'most_concurrent') {
-                $('#most-concurrent-header-info').text('streams');
-            }
-        });
-    }
-</script>
-% endif
-% if 'watch_stats' in config['home_sections']:
-<script>
-    function getHomeStats(time_range, stats_type) {
-        showMsg("Loading watch statistics...", true, false, 0);
-
-        $.ajax({
-            url: 'home_stats',
-            type: 'GET',
-            cache: false,
-            async: true,
-            data: {
-                time_range: time_range,
-                stats_type: stats_type
-            },
-            complete: function (xhr, status) {
-                $("#home-stats").html(xhr.responseText);
-                $('#ajaxMsg').fadeOut();
-                lockScroll('#home-stats .dashboard-stats-info-scroller');
-                statsCardCallback();
-            }
-        });
-    }
-
-    var stats_type = getLocalStorage('home_stats_type', 'plays');
-    var time_range = getLocalStorage('home_stats_days', 30);
-
-    $('#watched-stats-' + stats_type).prop('checked', true);
-    $('#watched-stats-' + stats_type).closest('label').addClass('active');
-    $('#watched-stats-days').val(time_range);
-
-    getHomeStats(time_range, stats_type);
-
-    $('input[name=watched-stats-type]').change(function () {
-        stats_type = $(this).filter(':checked').val();
-        setLocalStorage('home_stats_type', stats_type);
-        getHomeStats(time_range, stats_type);
-    });
-    $('#watched-stats-days').change(function () {
-        forceMinMax($(this));
-        time_range = $(this).val();
-        setLocalStorage('home_stats_days', time_range);
-        getHomeStats(time_range, stats_type);
-    });
-
-    $('#watched-stats-days').tooltip({ container: 'body', placement: 'top', html: true });
-</script>
-% endif
-% if 'library_stats' in config['home_sections']:
-<script>
-    function getLibraryStats() {
-        $.ajax({
-            url: 'library_stats',
-            type: 'GET',
-            cache: false,
-            async: true,
-            data: { },
-            complete: function (xhr, status) {
-                $("#library-stats").html(xhr.responseText);
-                statsCardCallback();
-            }
-        });
-    }
+    getHomeStats();
+    getLibraryStatsHeader();
     getLibraryStats();
+
+
 </script>
-% endif
-% if 'recently_added' in config['home_sections']:
-<script>
-    function recentlyAdded(recently_added_count, recently_added_type) {
-        showMsg("Loading recently added items...", true, false, 0);
 
-        $.ajax({
-            url: 'get_recently_added',
-            type: 'GET',
-            async: true,
-            data: {
-                count: recently_added_count,
-                media_type: recently_added_type
-            },
-            beforeSend: function () {
-                $(".dashboard-recent-media-row").animate({ scrollLeft: 0 }, 1000);
-            },
-            complete: function (xhr, status) {
-                $("#recentlyAdded").html(xhr.responseText);
-                $('#ajaxMsg').fadeOut();
-                highlightScrollerButton("#recently-added");
-                paginateScroller("#recently-added", ".paginate-added");
-            }
-        });
-    }
-
-    var recently_added_count = getLocalStorage('home_stats_recently_added_count', 50);
-    var recently_added_type = getLocalStorage('home_stats_recently_added_type', 'all');;
-
-    $('#recently-added-toggle-' + recently_added_type).prop('checked', true);
-    $('#recently-added-toggle-' + recently_added_type).closest('label').addClass('active');
-    $('#recently-added-count').val(recently_added_count);
-
-    function recentlyAddedConnected() {
-        recentlyAdded(recently_added_count, recently_added_type);
-    }
-
-    $('#recently-added-toggles').on('change', function () {
-        $('#recently-added-toggles > label').removeClass('active');
-        selected_filter = $('input[name=recently-added-toggle]:checked', '#recently-added-toggles');
-        $(selected_filter).closest('label').addClass('active');
-        recently_added_type = $(selected_filter).val();
-        setLocalStorage('home_stats_recently_added_type', recently_added_type);
-        recentlyAdded(recently_added_count, recently_added_type);
-    });
-
-    $('#recently-added-count').change(function () {
-        forceMinMax($(this));
-        recently_added_count = $(this).val();
-        setLocalStorage('home_stats_recently_added_count', recently_added_count);
-        recentlyAdded(recently_added_count, recently_added_type);
-    });
-
-    $('#recently-added-count').tooltip({ container: 'body', placement: 'top', html: true });
-
-    $('#recently-added-xml').on('tripleclick', function () {
-        openPlexXML('/library/recentlyAdded', false, {'X-Plex-Container-Start': 0, 'X-Plex-Container-Size': recently_added_count});
-    });
-</script>
-% endif
-% if _session['user_group'] == 'admin' and config['update_show_changelog']:
-<script>
-    $.ajax({
-        url: 'get_changelog',
-        data: {
-            since_prev_release: true,
-            update_shown: true
-        },
-        cache: false,
-        async: true,
-        complete: function (xhr, status) {
-            $("#changelog-modal .modal-body").html(xhr.responseText);
-            $('#changelog-modal').modal({
-                backdrop: 'static',
-                keyboard: false
-            });
-        }
-    });
-</script>
-% endif
 </%def>
diff --git a/data/interfaces/default/info.html b/data/interfaces/default/info.html
index ead534a1..c7f15dd3 100644
--- a/data/interfaces/default/info.html
+++ b/data/interfaces/default/info.html
@@ -11,17 +11,15 @@ data :: Usable parameters (if not applicable for media type, blank value will be
 
 == Global keys ==
 rating_key              Returns the unique identifier for the media item.
-media_type              Returns the type of media. Either 'movie', 'show', 'season', 'episode', 'artist', 'album', or 'track'.
-sub_media_type          Returns the subtype of media. Either 'movie', 'show', 'season', 'episode', 'artist', 'album', or 'track'.
+type                    Returns the type of media. Either 'movie', 'show', 'season', 'episode', 'artist', 'album', or 'track'.
 art                     Returns the location of the item's artwork
 title                   Returns the name of the movie, show, episode, artist, album, or track.
-edition_title            Returns the edition title of a movie.
 duration                Returns the standard runtime of the media.
 content_rating          Returns the age rating for the media.
 summary                 Returns a brief description of the media plot.
 grandparent_title       Returns the name of the show, or artist.
-parent_media_index      Returns the index number of the season.
-media_index             Returns the index number of the episode, or track.
+parent_index            Returns the index number of the season.
+index                   Returns the index number of the episode, or track.
 parent_thumb            Returns the location of the item's thumbnail. Use with pms_image_proxy.
 writers                 Returns an array of writers.
 thumb                   Returns the location of the item's thumbnail. Use with pms_image_proxy.
@@ -34,332 +32,152 @@ directors               Returns an array of directors.
 studio                  Returns the name of the studio.
 originally_available_at Returns the air date of the item.
 
+query :: Usable parameters
+
+== Global keys ==
+query_string            Returns the string used for the search query.
+title                   Returns the name of the movie, episode, or track.
+parent_title            Returns the name of the album.
+grandparent_title       Returns the name of the show, or artist.
+media_index             Returns the index number of the episode, or track.
+parent_media_index      Returns the index number of the season.
+year                    Returns the release year of the movie, or show.
+media_type              Returns the type of media. Either 'movie', 'show', 'season', 'episode', 'artist', 'album', or 'track'.
+rating_key              Returns the unique identifier for the media item.
+
 DOCUMENTATION :: END
 </%doc>
 
-<%!
-    from collections import defaultdict
-    import re
-
-    from plexpy import notifiers
-    from plexpy.common import MEDIA_TYPE_HEADERS, MEDIA_FLAGS_AUDIO, MEDIA_FLAGS_VIDEO
-    from plexpy.helpers import page, get_percent, cast_to_int, short_season
-
-    # Get audio codec file
-    def af(codec):
-        for pattern, file_type in MEDIA_FLAGS_AUDIO.items():
-            if re.match(pattern, codec):
-                return file_type
-        return codec
-
-    # Get video codec file
-    def vf(codec):
-        for pattern, file_type in MEDIA_FLAGS_VIDEO.items():
-            if re.match(pattern, codec):
-                return file_type
-        return codec
-
-    # Get video resolution file
-    def vr(resolution):
-        if resolution in ('1080i', '576i', '480i'):
-            return resolution
-        else:
-            return resolution.lower().rstrip('ip')
-
-    def br(text):
-        return text.replace('\n', '<br /><br />')
-%>
-
 <%inherit file="base.html"/>
 
 <%def name="headIncludes()">
-<link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.min.css">
-<link rel="stylesheet" href="${http_root}css/dataTables.colVis.css">
-<link rel="stylesheet" href="${http_root}css/tautulli-dataTables.css">
+<link rel="stylesheet" href="interfaces/default/css/dataTables.bootstrap.css">
+<link rel="stylesheet" href="interfaces/default/css/dataTables.colVis.css">
+<link rel="stylesheet" href="interfaces/default/css/plexpy-dataTables.css">
 </%def>
 
 <%def name="body()">
-% if metadata:
-<%
-    data = defaultdict(lambda: None, **metadata)
-    media_info = defaultdict(lambda: None, **(data['media_info'][0] if data['media_info'] else {}))
-    season = ''
-    if data['media_type'] == 'episode':
-        season = short_season(data['parent_title'])
-    elif data['media_type'] == 'season':
-        season = short_season(data['title'])
-%>
+% if data:
 <div class="container-fluid">
     <div class="row">
-        % if data['media_type'] not in ('photo_album', 'photo', 'playlist'):
-        <% fallback = 'art-live-full' if data['live'] else None %>
-        <div class="art-face" style="background-image:url(${page('pms_image_proxy', data['art'], data['rating_key'], 1920, 1080, fallback=fallback)})"></div>
-        % endif
-        % if _session['user_group'] == 'admin':
-        <span class="overlay-refresh-image info-art" title="Refresh background image"><i class="fa fa-refresh refresh_pms_image"></i></span>
+        % if data['type'] != 'library':
+        <div class="art-face" style="background-image:url(pms_image_proxy?img=${data['art']}&width=1920&height=1080)"></div>
         % endif
         <div class="summary-container">
             <div class="summary-navbar">
                 <div class="col-md-12">
                     <div class="summary-navbar-list">
                         <ul class="list-unstyled breadcrumb">
-                        % if data['live']:
-                        <li><a href="${page('library', data['section_id'])}">${data['library_name']}</a></li>
-                        <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                            % if data['media_type'] == 'movie':
-                            <li class="active metadata-xml">${data['title']}</li>
-                            % elif data['media_type'] == 'episode':
-                            <li class="hidden-xs hidden-sm">${data['grandparent_title']}</li>
-                            <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                            % if data['media_index']:
-                            <li> ${data['parent_title']}</li>
-                            <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                            <li class="active metadata-xml">Episode ${data['media_index']} - ${data['title']}</li>
-                            % else:
-                            <li class="active metadata-xml">${data['title']}</li>
-                            % endif
-                            % endif
-                        % elif data['media_type'] in ('movie', 'collection'):
-                        <li><a href="${page('library', data['section_id'])}">${data['library_name']}</a></li>
-                        <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                        <li class="active metadata-xml">${data['title']}</li>
-                        % elif data['media_type'] == 'show':
-                        <li><a href="${page('library', data['section_id'])}">${data['library_name']}</a></li>
-                        <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                        <li class="active metadata-xml">${data['title']}</li>
-                        % elif data['media_type'] == 'season':
-                        <li class="hidden-xs hidden-sm"><a href="${page('library', data['section_id'])}">${data['library_name']}</a></li>
-                        <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                        <li><a href="${page('info', data['parent_rating_key'])}">${data['parent_title']}</a></li>
-                        <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                        <li class="active metadata-xml">${data['title']}</li>
-                        % elif data['media_type'] == 'episode':
-                        <li class="hidden-xs hidden-sm"><a href="${page('library', data['section_id'])}">${data['library_name']}</a></li>
-                        <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                        <li class="hidden-xs hidden-sm"><a href="${page('info', data['grandparent_rating_key'])}">${data['grandparent_title']}</a></li>
-                        <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                        <li><a href="${page('info', data['parent_rating_key'])}">${data['parent_title']}</a></li>
-                        <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                        <li class="active metadata-xml">Episode ${data['media_index']} - ${data['title']}</li>
-                        % elif data['media_type'] == 'artist':
-                        <li><a href="${page('library', data['section_id'])}">${data['library_name']}</a></li>
-                        <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                        <li class="active metadata-xml">${data['title']}</li>
-                        % elif data['media_type'] == 'album':
-                        <li class="hidden-xs hidden-sm"><a href="${page('library', data['section_id'])}">${data['library_name']}</a></li>
-                        <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                        <li><a href="${page('info', data['parent_rating_key'])}">${data['parent_title']}</a></li>
-                        <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                        <li class="active metadata-xml">${data['title']}</li>
-                        % elif data['media_type'] == 'track':
-                        <li class="hidden-xs hidden-sm"><a href="${page('library', data['section_id'])}">${data['library_name']}</a></li>
-                        <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                        <li class="hidden-xs hidden-sm"><a href="${page('info', data['grandparent_rating_key'])}">${data['grandparent_title']}</a></li>
-                        <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                        <li><a href="${page('info', data['parent_rating_key'])}">${data['parent_title']}</a></li>
-                        <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                        <li class="active metadata-xml">Track ${data['media_index']} - ${data['title']}</li>
-                        % elif data['media_type'] == 'photo_album':
-                        <li><a href="${page('library', data['section_id'])}">${data['library_name']}</a></li>
-                        <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                            % if data['parent_title']:
-                            <li><a href="${page('info', data['parent_rating_key'])}">${data['parent_title']}</a></li>
-                            <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                            % endif
-                        <li class="active metadata-xml">${data['title']}</li>
-                        % elif data['media_type'] in ('photo', 'clip'):
-                        <li class="hidden-xs hidden-sm"><a href="${page('library', data['section_id'])}">${data['library_name']}</a></li>
-                        <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                        <li><a href="${page('info', data['parent_rating_key'])}">${data['parent_title']}</a></li>
-                        <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                        <li class="active metadata-xml">${data['title']}</li>
-                        % elif data['media_type'] == 'playlist':
-                            % if user_info.get('user_id'):
-                            <li><a href="${page('user', user_info.get('user_id'))}">${user_info.get('friendly_name')}</a></li>
-                            <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                            % elif data['section_id']:
-                            <li><a href="${page('library', data['section_id'])}">${data['library_name']}</a></li>
-                            <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                            % endif
-                        <li class="active metadata-xml">${data['title']}</li>
+                        % if data['type'] == 'library':
+                        % if data['library'] == 'movie':
+                        <li class="active">Movies</li>
+                        % elif data['library'] == 'show':
+                        <li class="active">TV Shows</li>
+                        % elif data['library'] == 'artist':
+                        <li class="active">Music</li>
+                        % endif
+                        % elif data['type'] == 'movie':
+                        <li><a href="info?item_id=movie">Movies</a></li>
+                        <li class="active">${data['title']}</li>
+                        % elif data['type'] == 'show':
+                        <li><a href="info?item_id=show">TV Shows</a></li>
+                        <li class="active">${data['title']}</li>
+                        % elif data['type'] == 'season':
+                        <li class="hidden-xs hidden-sm"><a href="info?item_id=show">TV Shows</a></li>
+                        <li><a href="info?item_id=${data['parent_rating_key']}">${data['parent_title']}</a></li>
+                        <li class="active">Season ${data['index']}</li>
+                        % elif data['type'] == 'episode':
+                        <li class="hidden-xs hidden-sm"><a href="info?item_id=show">TV Shows</a></li>
+                        <li class="hidden-xs hidden-sm"><a href="info?item_id=${data['grandparent_rating_key']}">${data['grandparent_title']}</a></li>
+                        <li><a href="info?item_id=${data['parent_rating_key']}">Season ${data['parent_index']}</a></li>
+                        <li class="active">Episode ${data['index']} - ${data['title']}</li>
+                        % elif data['type'] == 'artist':
+                        <li><a href="info?item_id=artist">Music</a></li>
+                        <li class="active">${data['title']}</li>
+                        % elif data['type'] == 'album':
+                        <li class="hidden-xs hidden-sm"><a href="info?item_id=artist">Music</a></li>
+                        <li><a href="info?item_id=${data['parent_rating_key']}">${data['parent_title']}</a></li>
+                        <li class="active">${data['title']}</li>
+                        % elif data['type'] == 'track':
+                        <li class="hidden-xs hidden-sm"><a href="info?item_id=artist">Music</a></li>
+                        <li class="hidden-xs hidden-sm"><a href="info?item_id=${data['grandparent_rating_key']}">${data['grandparent_title']}</a></li>
+                        <li><a href="info?item_id=${data['parent_rating_key']}">${data['parent_title']}</a></li>
+                        <li class="active">Track ${data['index']} - ${data['title']}</li>
                         % endif
                         </ul>
                     </div>
                 </div>
             </div>
+            % if data['type'] != 'library':
             <div class="summary-content-title-wrapper">
                 <div class="col-md-9">
                     <div class="summary-content-poster hidden-xs hidden-sm">
-                        <% legacy = '&legacy=1' if data['media_type'] in ('photo_album', 'photo', 'clip') else '' %>
-                        % if data['media_type'] in ('track', 'photo'):
-                        <a href="${config['pms_web_url']}#!/server/${config['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${data['parent_rating_key']}${legacy}" target="_blank" rel="noreferrer" title="View on Plex Web">
-                        % elif data['media_type'] == 'playlist':
-                        <a href="${config['pms_web_url']}#!/server/${config['pms_identifier']}/playlist?key=%2Fplaylists%2F${data['rating_key']}" target="_blank" rel="noreferrer" title="View on Plex Web">
-                        % elif not data['live']:
-                        <a href="${config['pms_web_url']}#!/server/${config['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${data['rating_key']}${legacy}" target="_blank" rel="noreferrer" title="View on Plex Web">
+                        % if data['type'] == 'track':
+                        <a href="http://app.plex.tv/web/app#!/server/${config['pms_identifier']}/details/%2Flibrary%2Fmetadata%2F${data['parent_rating_key']}" target="Plex/Web" title="View in Plex/Web">
+                        % elif data['type'] != 'library':
+                        <a href="http://app.plex.tv/web/app#!/server/${config['pms_identifier']}/details/%2Flibrary%2Fmetadata%2F${data['rating_key']}" target="Plex/Web" title="View in Plex/Web">
                         % endif
-                        % if data['live']:
-                            <div class="summary-poster-face" style="background-image: url(${page('pms_image_proxy', data['grandparent_thumb'] or data['thumb'], data['rating_key'], 300, 450, fallback='poster-live')});">
+                            % if data['type'] == 'episode':
+                            <div class="summary-poster-face-episode" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=500&height=280&fallback=poster);">
                                 <div class="summary-poster-face-overlay">
                                     <span></span>
                                 </div>
                             </div>
-                        % else:
-                            % if data['media_type'] == 'episode':
-                            <div class="summary-poster-face-episode" style="background-image: url(${page('pms_image_proxy', data['thumb'], data['rating_key'], 500, 280, fallback='art')});">
+                            % elif data['type'] == 'artist' or data['type'] == 'album' or data['type'] == 'track':
+                            <div class="summary-poster-face-track" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=500&height=500&fallback=poster);">
                                 <div class="summary-poster-face-overlay">
                                     <span></span>
                                 </div>
                             </div>
-                            % if _session['user_group'] == 'admin':
-                            <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                            % endif
-                            % elif data['media_type'] in ('artist', 'album', 'track', 'playlist', 'photo_album', 'photo', 'clip') or data['sub_media_type'] in ('artist', 'album', 'track'):
-                            <div class="summary-poster-face-track" style="background-image: url(${page('pms_image_proxy', data['thumb'], data['rating_key'], 300, 300, fallback='cover')});">
+                            % elif data['type'] != 'library':
+                            <div class="summary-poster-face" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=300&height=450&fallback=poster);">
                                 <div class="summary-poster-face-overlay">
                                     <span></span>
                                 </div>
-                                    % if data['media_type'] == 'playlist' and data['smart']:
-                                    <span class="smart-playlist-image" title="Smart Playlist"><i class="fa fa-cog"></i></span>
-                                    % endif
                             </div>
-                            % if _session['user_group'] == 'admin':
-                            <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
                             % endif
-                            % else:
-                            <div class="summary-poster-face" style="background-image: url(${page('pms_image_proxy', data['thumb'], data['rating_key'], 300, 450, fallback='poster')});">
-                                <div class="summary-poster-face-overlay">
-                                    <span></span>
-                                </div>
-                                    % if data['media_type'] == 'collection' and data['smart']:
-                                    <span class="smart-collection-image" title="Smart Collection"><i class="fa fa-cog"></i></span>
-                                    % endif
-                            </div>
-                            % if _session['user_group'] == 'admin':
-                            <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                            % endif
-                            % endif
-                        % endif
-                        % if not data['live']:
                         </a>
-                        % endif
                     </div>
                     <div class="summary-content-title">
-                        % if data['live']:
-                            % if data['media_type'] == 'movie':
-                            <h1>&nbsp;</h1><h1>${data['title']}</h1>
-                            % elif data['media_type'] == 'episode':
-                            <h1>${data['grandparent_title']}</h1>
-                            <h2>${data['title']}</h2>
-                            % if data['media_index']:
-                            <h3 class="hidden-xs">${season} &middot; E${data['media_index']}</h3>
-                            % endif
-                            % endif
-                        % elif data['media_type'] in ('movie', 'show', 'artist', 'collection', 'playlist', 'photo_album'):
+                        % if data['type'] == 'movie' or data['type'] == 'show' or data['type'] == 'artist':
                         <h1>&nbsp;</h1><h1>${data['title']}</h1>
-                        % elif data['media_type'] == 'season':
-                        <h1>&nbsp;</h1><h1><a href="${page('info', data['parent_rating_key'])}">${data['parent_title']}</a></h1>
-                        <h3 class="hidden-xs">${season}</h3>
-                        % elif data['media_type'] == 'episode':
-                        <h1><a href="${page('info', data['grandparent_rating_key'])}">${data['grandparent_title']}</a></h1>
+                        % elif data['type'] == 'season':
+                        <h1>&nbsp;</h1><h1><a href="info?item_id=${data['parent_rating_key']}">${data['parent_title']}</a></h1>
+                        <h3 class="hidden-xs">S${data['index']}</h3>
+                        % elif data['type'] == 'episode':
+                        <h1><a href="info?item_id=${data['grandparent_rating_key']}">${data['grandparent_title']}</a></h1>
                         <h2>${data['title']}</h2>
-                        <h3 class="hidden-xs">${season} &middot; E${data['media_index']}</h3>
-                        % elif data['media_type'] == 'album':
-                        <h1><a href="${page('info', data['parent_rating_key'])}">${data['parent_title']}</a></h1>
-                        <h2>${data['title']}</h2>
-                        % elif data['media_type'] == 'track':
-                        <h1><a href="${page('info', data['grandparent_rating_key'])}">${data['grandparent_title']}</a></h1>
-                        <h2><a href="${page('info', data['parent_rating_key'])}">${data['parent_title']}</a> - ${data['title']}</h2>
-                        <h3 class="hidden-xs">T${data['media_index']}</h3>
-                        % elif data['media_type'] in ('photo', 'clip'):
-                        <h1><a href="${page('info', data['parent_rating_key'])}">${data['parent_title']}</a></h1>
+                        <h3 class="hidden-xs">S${data['parent_index']} &middot; E${data['index']}</h3>
+                        % elif data['type'] == 'album':
+                        <h1><a href="info?item_id=${data['parent_rating_key']}">${data['parent_title']}</a></h1>
                         <h2>${data['title']}</h2>
+                        % elif data['type'] == 'track':
+                        <h1><a href="info?item_id=${data['grandparent_rating_key']}">${data['grandparent_title']}</a></h1>
+                        <h2><a href="info?item_id=${data['parent_rating_key']}">${data['parent_title']}</a> - ${data['title']}</h2>
+                        <h3 class="hidden-xs">T${data['index']}</h3>
                         % endif
                     </div>
                 </div>
             </div>
+            % endif
             <div class="summary-content-wrapper">
+                % if data['type'] != 'library':
                 <div class="col-md-9">
-                    <%
-                        padding_height = ''
-                        if data['media_type'] == 'movie' or data['live']:
-                            padding_height = 'height: 305px;'
-                        elif data['media_type'] in ('artist', 'album', 'playlist', 'photo_album', 'photo') or data['sub_media_type'] in ('artist', 'album', 'track'):
-                            padding_height = 'height: 150px;'
-                        elif data['media_type'] in ('track', 'clip'):
-                            padding_height = 'height: 180px;'
-                        elif data['media_type'] == 'episode':
-                            padding_height = 'height: 70px;'
-                        elif data['media_type'] in ('show', 'season', 'collection'):
-                            padding_height = 'height: 270px;'
-                    %>
-                    <div class="summary-content-padding hidden-xs hidden-sm" style="${padding_height}">
-                        % if data['media_type'] in ('movie', 'episode', 'track', 'clip'):
-                        <div class="summary-content-media-info-wrapper">
-                            % if data['media_type'] != 'track' and media_info['video_codec']:
-                            <img class="summary-content-media-flag" title="${media_info['video_codec']}" src="${http_root}images/media_flags/video_codec/${media_info['video_codec'] | vf}.png" />
-                            % endif
-                            % if data['media_type'] != 'track' and media_info['video_resolution']:
-                            <img class="summary-content-media-flag" title="${media_info['video_resolution']}" src="${http_root}images/media_flags/video_resolution/${media_info['video_full_resolution'] | vr}.png" />
-                            % endif
-                            % if media_info['audio_codec']:
-                            <img class="summary-content-media-flag" title="${media_info['audio_codec']}" src="${http_root}images/media_flags/audio_codec/${media_info['audio_codec'] | af}.png" />
-                            % endif
-                            % if media_info['audio_channels']:
-                            <img class="summary-content-media-flag" title="${media_info['audio_channels']}" src="${http_root}images/media_flags/audio_channels/${media_info['audio_channels']}.png" />
-                            % endif
-                        </div>
-                        % endif
-                    </div>
+                    % if data['type'] == 'movie' or data['type'] == 'show' or data['type'] == 'season':
+                    <div class="summary-content-padding hidden-xs hidden-sm" style="height: 275px;"></div>
+                    % elif data['type'] == 'episode':
+                    <div class="summary-content-padding hidden-xs hidden-sm" style="height: 40px;"></div>
+                    % elif data['type'] == 'artist' or data['type'] == 'album' or data['type'] == 'track':
+                    <div class="summary-content-padding hidden-xs hidden-sm" style="height: 150px;"></div>
+                    % else:
+                    <div class="summary-content-padding hidden-xs hidden-sm"></div>
+                    % endif
                     <div class="summary-content">
                         <div class="summary-content-details-wrapper">
-                            <% rating = data['rating'] or data['audience_rating'] %>
-                            % if rating:
-                            % if data['audience_rating_image']:
-                            % if data['audience_rating_image'].startswith('imdb://'):
-                            <div class="critic-rating hidden-xs hidden-sm" title="${rating}">
-                                <span class="rating-image rating-imdb"></span><strong>${rating}</strong>
-                            </div>
+                            % if data['rating']:
+                            <div id="stars" class="rateit hidden-xs hidden-sm" data-rateit-value=""
+                                 data-rateit-ispreset="true" data-rateit-readonly="true"></div>
                             % endif
-                            % if data['audience_rating_image'].startswith('themoviedb://'):
-                            <div class="critic-rating hidden-xs hidden-sm" title="${rating}">
-                                <span class="rating-image rating-themoviedb"></span><strong>${get_percent(rating, 10)}%</strong>
-                            </div>
-                            % endif
-                            % if data['audience_rating_image'].startswith('thetvdb://'):
-                            <div class="critic-rating hidden-xs hidden-sm" title="${rating}">
-                                <span class="rating-image rating-thetvdb"></span><strong>${get_percent(rating, 10)}%</strong>
-                            </div>
-                            % endif
-                            % if data['audience_rating_image'].startswith('rottentomatoes://'):
-                            <div class="critic-rating hidden-xs hidden-sm" title="${data['audience_rating']}">
-                                <span class="rating-image rating-rottentomatos-${data['audience_rating_image'].rsplit('.')[-1]}"></span><strong>${get_percent(data['audience_rating'], 10)}%</strong>
-                            </div>
-                            % endif
-                            % if data['rating_image'].startswith('rottentomatoes://'):
-                            <div class="critic-rating hidden-xs hidden-sm" title="${data['rating']}">
-                                <span class="rating-image rating-rottentomatos-${data['rating_image'].rsplit('.')[-1]}"></span><strong>${get_percent(data['rating'], 10)}%</strong>
-                            </div>
-                            % endif
-                            % else:
-                            <div class="critic-rating hidden-xs hidden-sm" title="${rating}">
-                                <i class="star-icon fa fa-star"></i> <strong>${get_percent(rating, 10)}%</strong>
-                            </div>
-                            % endif
-                            % endif
-                            <div class="summary-content-details-tag">
-                                % if data['media_type'] in ('collection', 'playlist') and data['children_count']:
-                                <%
-                                    if data['media_type'] == 'collection':
-                                        suffix = MEDIA_TYPE_HEADERS[data['sub_media_type']]
-                                    elif data['media_type'] == 'playlist':
-                                        suffix = MEDIA_TYPE_HEADERS[data['playlist_type']]
-                                    if data['children_count'] == 1:
-                                        suffix = suffix[:-1]
-                                %>
-                                Items <strong> ${data['children_count']} ${suffix} </strong>
-                                % endif
-                            </div>
                             <div class="summary-content-details-tag">
                                 % if data['directors']:
                                 Directed by <strong> ${data['directors'][0]}</strong>
@@ -371,58 +189,34 @@ DOCUMENTATION :: END
                                 % endif
                             </div>
                             <div class="summary-content-details-tag">
-                                % if data['media_type'] == 'track' and data['original_title']:
-                                Track Artists <strong> ${data['original_title']}</strong>
-                                % endif
-                            </div>
-                            <div class="summary-content-details-tag">
-                                % if data['media_type'] == 'movie':
+                                % if data['type'] == 'movie':
                                 Year <strong> ${data['year']}</strong>
-                                % elif data['media_type'] == 'show':
+                                % elif data['type'] == 'show':
                                 Aired <strong> ${data['year']}</strong>
-                                % elif data['media_type'] == 'episode':
+                                % elif data['type'] == 'episode':
                                 Aired <strong> <span id="airdate">${data['originally_available_at']}</span></strong>
-                                % elif data['media_type'] == 'album' or data['media_type'] == 'track':
+                                % elif data['type'] == 'album' or data['type'] == 'track':
                                 Released <strong> ${data['year']}</strong>
-                                % elif data['media_type'] in ('photo', 'clip'):
-                                Taken <strong> <span id="airdate">${data['originally_available_at']}</span></strong>
-                                % elif data['media_type'] == 'collection' and data['min_year'] and data['max_year']:
-                                Year <strong> ${data['min_year']} - ${data['max_year']}</strong>
-                                % elif data['year']:
-                                Year <strong> ${data['year']}</strong>
                                 % endif
                             </div>
                             <div class="summary-content-details-tag">
                                 % if data['duration']:
-                                Runtime <strong> <span id="runtime">${data['duration']}</span></strong>
+                                Runtime <strong> <span id="runtime">${data['duration']}</span> mins</strong>
                                 % endif
                             </div>
-                            % if data['edition_title']:
-                            <div class="summary-content-details-tag">
-                                Edition <strong> ${data['edition_title']} </strong>
-                            </div>
-                            % endif
                             <div class="summary-content-details-tag">
                                 % if data['content_rating']:
                                 Rated <strong> ${data['content_rating']} </strong>
                                 % endif
                             </div>
-                            <div class="summary-content-details-tag" id="channel-icon">
-                                % if media_info['channel_vcn']:
-                                Channel <strong> <span class="thumb-tooltip" data-toggle="popover" data-img="${media_info['channel_thumb']}" data-height="40" data-width="40">${media_info['channel_title'] or (media_info['channel_vcn'] + ' ' + media_info['channel_call_sign'])}</span> </strong>
-                                % endif
-                            </div>
                         </div>
                         % if data['tagline']:
-                        <div class="summary-content-text summary-content-tagline">
-                            <p>${data['tagline']}</p>
+                        <div class="summary-content-summary">
+                            <p><strong> ${data['tagline']} </strong></p>
                         </div>
                         % endif
-                        <div class="summary-content-text summary-content-summary">
-                            <p>${data['summary'] | br, n}</p>
-                        </div>
-                        <div class="summary-content-text summary-toggle">
-                            <a href="#" class="show-more">Read more &nbsp;<i class="fa fa-chevron-down"></i></a>
+                        <div class="summary-content-summary">
+                            <p> ${data['summary']} </p>
                         </div>
                     </div>
                 </div>
@@ -474,746 +268,411 @@ DOCUMENTATION :: END
                         % endif
                     </div>
                 </div>
-                % if data['media_type'] == 'show':
-                <div class="col-md-12">
-                    <div class="table-card-header">
+                % if data['type'] == 'show':
+                <div class='col-md-12'>
+                    <div class='table-card-header'>
                         <div class="header-bar">
                             <span>Season List for <strong>${data['title']}</strong></span>
                         </div>
                     </div>
-                    <div class="table-card-back">
-                        <div id="children-list" class="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading season list...</div>
+                    <div class='table-card-back'>
+                        <div id="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading season list...</div>
                     </div>
                 </div>
-                % elif data['media_type'] == 'season':
-                <div class="col-md-12">
-                    <div class="table-card-header">
+                % elif data['type'] == 'season':
+                <div class='col-md-12'>
+                    <div class='table-card-header'>
                         <div class="header-bar">
                             <span>Episode List for <strong>${data['title']}</strong></span>
                         </div>
                     </div>
-                    <div class="table-card-back">
-                        <div id="children-list" class="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading episode list...</div>
+                    <div class='table-card-back'>
+                        <div id="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading episode list...</div>
                     </div>
                 </div>
-                % elif data['media_type'] == 'artist':
-                <div class="col-md-12">
-                    <div class="table-card-header">
+                % elif data['type'] == 'artist':
+                <div class='col-md-12'>
+                    <div class='table-card-header'>
                         <div class="header-bar">
                             <span>Album List for <strong>${data['title']}</strong></span>
                         </div>
                     </div>
-                    <div class="table-card-back">
-                        <div id="children-list" class="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading album list...</div>
+                    <div class='table-card-back'>
+                        <div id="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading album list...</div>
                     </div>
                 </div>
-                % elif data['media_type'] == 'album':
-                <div class="col-md-12">
-                    <div class="table-card-header">
+                % elif data['type'] == 'album':
+                <div class='col-md-12'>
+                    <div class='table-card-header'>
                         <div class="header-bar">
                             <span>Track List for <strong>${data['title']}</strong></span>
                         </div>
                     </div>
-                    <div class="table-card-back">
-                        <div id="children-list" class="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading track list...</div>
-                    </div>
-                </div>
-                % elif data['media_type'] == 'photo_album':
-                <div class="col-md-12">
-                    <div class="table-card-header">
-                        <div class="header-bar">
-                            <span>Photo List for <strong>${data['title']}</strong></span>
-                        </div>
-                    </div>
-                    <div class="table-card-back">
-                        <div id="children-list" class="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading photo list...</div>
-                    </div>
-                </div>
-                % elif data['media_type'] == 'collection':
-                <div class="col-md-12">
-                    <div class="table-card-header">
-                        <div class="header-bar">
-                            <span>${MEDIA_TYPE_HEADERS[data['sub_media_type']]} in <strong>${data['title']}</strong> collection</span>
-                        </div>
-                    </div>
-                    <div class="table-card-back">
-                        <div id="children-list" class="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading collection items...</div>
-                    </div>
-                </div>
-                <div id="collection-related-list-container" style="display: none;">
-                </div>
-                % elif data['media_type'] == 'playlist':
-                <div class="col-md-12">
-                    <div class="table-card-header">
-                        <div class="header-bar">
-                            <span>${MEDIA_TYPE_HEADERS[data['playlist_type']]} List for <strong>${data['title']}</strong></span>
-                        </div>
-                    </div>
-                    <div class="table-card-back">
-                        <div id="children-list" class="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading playlist items...</div>
+                    <div class='table-card-back'>
+                        <div id="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading track list...</div>
                     </div>
                 </div>
                 % endif
-                % if data['media_type'] in ('movie', 'show', 'season', 'episode', 'artist', 'album', 'track', 'collection', 'playlist'):
-                <div class="col-md-12">
-                    <div class="table-card-header">
-                        <div class="header-bar">
-                            <span><i class="fa fa-line-chart"></i> Global Stats</span>
-                        </div>
-                    </div>
-                    <div class="table-card-back">
-                        <div id="watch-time-stats" class="user-overview-stats-wrapper">
-                            <div class='muted'><i class="fa fa-refresh fa-spin"></i> Loading data...</div>
-                            <br>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-md-12">
-                    <div class="table-card-header">
-                        <div class="header-bar">
-                            <span><i class="fa fa-group"></i> User Stats</span>
-                        </div>
-                    </div>
-                    <div class="table-card-back">
-                        <div id="user-stats" class="user-player">
-                            <div class='muted'><i class="fa fa-refresh fa-spin"></i> Loading data...</div>
-                            <br>
-                        </div>
-                    </div>
-                </div>
                 % endif
-                <%
-                    history_type = data['media_type'] in ('movie', 'show', 'season', 'episode', 'artist', 'album', 'track', 'collection', 'playlist')
-                    history_active = 'active' if history_type else ''
-                    export_active = 'active' if not history_type else ''
-                %>
-                % if history_type and _session['user_group'] == 'admin':
-                <div class="col-md-12">
-                    <div class="table-card-header">
-                        <ul class="nav nav-list nav-pills" role="tablist">
-                            <li class="${history_active}"><a id="nav-tabs-history" href="#tabs-history" role="tab" data-toggle="tab">History</a></li>
-                            <li class="${export_active}"><a id="nav-tabs-export" href="#tabs-export" role="tab" data-toggle="tab">Export</a></li>
-                        </ul>
+                <div class='col-md-12'>
+                    <div class='table-card-header'>
+                        <div class="header-bar">
+                            <span>Watch History for <strong>${data['title']}</strong></span>
+                        </div>
                         <div class="button-bar">
-                            % if source == 'history':
-                            <div class="btn-group">
-                                <a href="update_metadata?rating_key=${data['rating_key']}&update=True" class="btn btn-danger btn-edit" id="fix-metadata">
-                                    <i class="fa fa-wrench"></i> Fix Match
-                                </a>
-                            </div>
-                            % endif
-                            % if data.get('tvmaze_id') or data.get('themoviedb_id') or data.get('musicbrainz_id'):
-                            <div class="btn-group">
-                                <button class="btn btn-danger btn-edit" data-toggle="modal" aria-pressed="false" autocomplete="off" id="delete-lookup-info"
-                                        data-id="${data['grandparent_rating_key'] if data['media_type'] == 'episode' else data['parent_rating_key'] if data['media_type'] == 'season' else data['rating_key']}"
-                                        data-title="${data['grandparent_title'] if data['media_type'] == 'episode' else data['parent_title'] if data['media_type'] == 'season' else data['title']}">
-                                    <i class="fa fa-search"></i> Delete Lookup Info
-                                </button>
-                            </div>
-                            % endif
-                            % if data.get('poster_url'):
-                            <div class="btn-group" id="hosted-poster">
-                                % if data['media_type'] == 'artist' or data['media_type'] == 'album' or data['media_type'] == 'track':
-                                <span class="hosted-poster-tooltip" data-toggle="popover" data-img="${data['poster_url']}" data-height="80" data-width="80" style="display: inline-flex;">
-                                % else:
-                                <span class="hosted-poster-tooltip" data-toggle="popover" data-img="${data['poster_url']}" data-height="120" data-width="80" style="display: inline-flex;">
-                                % endif
-                                    <button class="btn btn-danger btn-edit" data-toggle="modal" aria-pressed="false" autocomplete="off" id="delete-hosted-poster"
-                                            data-id="${data['parent_rating_key'] if data['media_type'] in ('episode', 'track') else data['rating_key']}"
-                                            data-title="${data["poster_title"]}">
-                                        <i class="fa fa-picture-o"></i> Delete ${data['img_service']} Poster
-                                    </button>
-                                </span>
-                            </div>
-                            % endif
-                            % if not data['live']:
-                            <div class="btn-group">
-                                <button class="btn btn-dark" data-toggle="modal" aria-pressed="false" autocomplete="off" id="send-recently-added-notification"
-                                        data-id="${data['rating_key']}">
-                                    <i class="fa fa-bell"></i> Recently Added Notification
-                                </button>
-                            </div>
-                            % endif
+                            <div class="colvis-button-bar hidden-xs"></div>
+                            <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
+                                <i class="fa fa-trash-o"></i> Delete mode
+                            </button>
+                            <div class="alert alert-danger alert-edit" role="alert" id="row-edit-mode-alert"><i class="fa fa-exclamation-triangle"></i>&nbspSelect rows to delete. Data is deleted upon exiting delete mode.</div>
                         </div>
                     </div>
-                </div>
-                % endif
-                <div class="tab-content">
-                    % if history_type:
-                    <div role="tabpanel" class="tab-pane ${history_active}" id="tabs-history">
-                        <div class="container-fluid">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <div class="table-card-header">
-                                        <div class="header-bar">
-                                            % if data['media_type'] in ('artist', 'album', 'track', 'playlist'):
-                                            <span>Play History for <strong>${data['title']}</strong></span>
-                                            % else:
-                                            <span>Watch History for <strong>${data['title']}</strong></span>
-                                            % endif
-                                        </div>
-                                        <div class="button-bar">
-                                            % if _session['user_group'] == 'admin':
-                                            <div class="btn-group">
-                                                <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
-                                                    <i class="fa fa-trash-o"></i> Delete mode
-                                                </button>
-                                            </div>
-                                            % endif
-                                            <div class="btn-group" data-toggle="buttons" id="transcode_decision-selection">
-                                                <label class="btn btn-dark btn-filter">
-                                                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-direct_play" value="direct play" autocomplete="off"><i class="fa fa-play-circle"></i> Direct Play
-                                                </label>
-                                                <label class="btn btn-dark btn-filter">
-                                                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-direct_stream" value="copy" autocomplete="off"><i class="fa fa-stream"></i> Direct Stream
-                                                </label>
-                                                <label class="btn btn-dark btn-filter">
-                                                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-transcode" value="transcode" autocomplete="off"><i class="fa fa-server"></i> Transcode
-                                                </label>
-                                            </div>
-                                            <div class="btn-group">
-                                                <button class="btn btn-dark refresh-history-button" id="refresh-history-list"><i class="fa fa-refresh"></i> Refresh history</button>
-                                            </div>
-                                            <div class="btn-group colvis-button-bar" id="button-bar-history"></div>
-                                        </div>
-                                    </div>
-                                    <div class="table-card-back">
-                                        <table class="display history_table" id="history_table-RK-${data['rating_key']}" width="100%">
-                                            <thead>
-                                                <tr>
-                                                    <th align="left" id="delete">Delete</th>
-                                                    <th align="left" id="date">Date</th>
-                                                    <th align="left" id="friendly_name">User</th>
-                                                    <th align="left" id="ip_address">IP Address</th>
-                                                    <th align="left" id="platform">Platform</th>
-                                                    <th align="left" id="product">Product</th>
-                                                    <th align="left" id="player">Player</th>
-                                                    <th align="left" id="title">Title</th>
-                                                    <th align="left" id="started">Started</th>
-                                                    <th align="left" id="paused_counter">Paused</th>
-                                                    <th align="left" id="stopped">Stopped</th>
-                                                    <th align="left" id="play_duration">Duration</th>
-                                                    <th align="left" id="percent_complete"></th>
-                                                </tr>
-                                            </thead>
-                                            <tbody></tbody>
-                                        </table>
-                                    </div>
+                    <div class="table-card-back">
+                        <table class="display" id="history_table" width="100%">
+                            <thead>
+                                <tr>
+                                    <th align='left' id="delete">Delete</th>
+                                    <th align='left' id="time">Time</th>
+                                    <th align='left' id="friendly_name">User</th>
+                                    <th align='left' id="ip_address">IP Address</th>
+                                    <th align='left' id="platform">Platform</th>
+                                    <th align='left' id="player">Player</th>
+                                    <th align='left' id="title">Title</th>
+                                    <th align='left' id="started">Started</th>
+                                    <th align='left' id="paused_counter">Paused</th>
+                                    <th align='left' id="stopped">Stopped</th>
+                                    <th align='left' id="duration">Duration</th>
+                                    <th align='left' id="percent_complete"></th>
+                                </tr>
+                            </thead>
+                            <tbody></tbody>
+                        </table>
+                    </div>
+                    <div id="info-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="info-modal">
+                    </div>
+                    <div class="modal fade" id="ip-info-modal" tabindex="-1" role="dialog" aria-labelledby="ip-info-modal">
+                    </div>
+                    <div class="modal fade" id="confirm-modal" tabindex="-1" role="dialog" aria-labelledby="confirm-modal">
+                        <div class="modal-dialog">
+                            <div class="modal-content">
+                                <div class="modal-header">
+                                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
+                                    <h4 class="modal-title" id="myModalLabel">Confirm Delete</h4>
+                                </div>
+                                <div class="modal-body" style="text-align: center;">
+                                    <p>Are you REALLY sure you want to delete <strong><span id="deleteCount"></span></strong> history item(s)?</p>
+                                    <p>This is permanent and cannot be undone!</p>
+                                </div>
+                                <div class="modal-footer">
+                                    <button type="button" class="btn btn-dark" data-dismiss="modal">Cancel</button>
+                                    <button type="button" class="btn btn-danger btn-ok" data-dismiss="modal" id="confirm-delete">Delete</button>
                                 </div>
                             </div>
                         </div>
                     </div>
-                    % endif
-                    % if not data['live'] and _session['user_group'] == 'admin':
-                    <div role="tabpanel" class="tab-pane ${export_active}" id="tabs-export">
-                        <div class="container-fluid">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <div class="table-card-header">
-                                        <div class="header-bar">
-                                            <span>Metadata Exports for <strong>${data['title']}</strong></span>
-                                        </div>
-                                        <div class="button-bar">
-                                            <div class="btn-group">
-                                                <button class="btn btn-dark export-button" id="toggle-export-modal" data-toggle="modal" data-target="#export-modal"
-                                                        data-section_id="${data['section_id']}" data-rating_key="${data['rating_key']}"
-                                                        data-media_type="${data['media_type']}" data-sub_media_type="${data['sub_media_type'] or data['playlist_type'] or ''}">
-                                                    <i class="fa fa-file-export"></i> Export metadata
-                                                </button>
-                                            </div>
-                                            <div class="btn-group">
-                                                <button class="btn btn-dark refresh-export-table-button" id="refresh-export-table">
-                                                    <i class="fa fa-refresh"></i> Refresh exports
-                                                </button>
-                                            </div>
-                                            <div class="btn-group colvis-button-bar" id="button-bar-export"></div>
-                                        </div>
-                                    </div>
-                                    <div class="table-card-back">
-                                        <table class="display export_table" id="export_table-RK-${data['rating_key']}" width="100%">
-                                            <thead>
-                                                <tr>
-                                                    <th align="left" id="timestamp">Exported At</th>
-                                                    <th align="left" id="media_type_title">Media Type</th>
-                                                    <th align="left" id="rating_key">Rating Key</th>
-                                                    <th align="left" id="filename">Filename</th>
-                                                    <th align="left" id="file_format">File Format</th>
-                                                    <th align="left" id="metadata_level">Metadata Level</th>
-                                                    <th align="left" id="media_info_level">Media Info Level</th>
-                                                    <th align="left" id="media_info_level">Custom Fields</th>
-                                                    <th align="left" id="file_size">File Size</th>
-                                                    <th align="left" id="complete">Download</th>
-                                                    <th align="left" id="delete">Delete</th>
-                                                </tr>
-                                            </thead>
-                                            <tbody></tbody>
-                                        </table>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    % endif
                 </div>
             </div>
         </div>
     </div>
 </div>
-% endif
-</%def>
-
-<%def name="modalIncludes()">
-% if metadata:
-<%
-    data = defaultdict(None, **metadata)
-    season = ''
-    if data['media_type'] == 'episode':
-        season = short_season(data['parent_title'])
-    elif data['media_type'] == 'season':
-        season = short_season(data['title'])
-%>
-<div class="modal fade" id="info-modal" tabindex="-1" role="dialog" aria-labelledby="info-modal">
-</div>
-<div class="modal fade" id="ip-info-modal" tabindex="-1" role="dialog" aria-labelledby="ip-info-modal">
-</div>
-<div class="modal fade" id="confirm-modal-delete" tabindex="-1" role="dialog" aria-labelledby="confirm-modal-delete">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title" id="myModalLabel">Confirm Delete</h4>
-            </div>
-            <div class="modal-body" style="text-align: center;">
-                <p>Are you REALLY sure you want to delete <strong><span id="deleteCount"></span></strong> history item(s)?</p>
-                <p>This is permanent and cannot be undone!</p>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-dark" data-dismiss="modal">Cancel</button>
-                <button type="button" class="btn btn-danger btn-ok" data-dismiss="modal" id="confirm-delete">Delete</button>
-            </div>
-        </div>
-    </div>
-</div>
-<div id="send-recently-added-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="send-recently-added-modal">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title">Recently Added Notification</h4>
-            </div>
-            <div class="modal-body" style="text-align: center;">
-                <p>Send a recently added notification for the following:</p>
-                <p>
-                    <strong>
-                        % if data['media_type'] == 'movie':
-                        ${data['title']}<br />${data['year']}
-                        % elif data['media_type'] == 'show':
-                        ${data['title']}
-                        % elif data['media_type'] == 'season':
-                        ${data['parent_title']}<br />${data['title']}
-                        % elif data['media_type'] == 'episode':
-                        ${data['grandparent_title']}<br />${data['title']}<br />${season} &middot; E${data['media_index']}
-                        % elif data['media_type'] == 'artist':
-                        ${data['title']}
-                        % elif data['media_type'] == 'album':
-                        ${data['parent_title']}<br />${data['title']}
-                        % elif data['media_type'] == 'track':
-                        ${data['grandparent_title']}<br />${data['title']}<br />${data['parent_title']}
+% else:
+<div class="container-fluid">
+    <div class="row">
+        <div class="summary-container">
+            <div class="summary-navbar">
+                <div class="col-md-12">
+                    <div class="summary-navbar-list">
+                        % if query:
+                        % if query['media_type'] == 'movie':
+                        <span>Movies</span>
+                        <span class="hidden-xs hidden-sm"><i class="fa fa-chevron-right"></i></span>
+                        <span>${query['title']}</span>
+                        % elif query['media_type'] == 'show':
+                        <span>TV Shows</span>
+                        <span class="hidden-xs hidden-sm"><i class="fa fa-chevron-right"></i></span>
+                        <span>${query['grandparent_title']}</span>
+                        % elif query['media_type'] == 'season':
+                        <span class="hidden-xs hidden-sm">TV Shows</span>
+                        <span class="hidden-xs hidden-sm"><i class="fa fa-chevron-right"></i></span>
+                        <span class="hidden-xs hidden-sm">${query['grandparent_title']}</span>
+                        <span class="hidden-xs hidden-sm"><i class="fa fa-chevron-right"></i></span>
+                        <span>Season ${query['parent_media_index']}</span>
+                        % elif query['media_type'] == 'episode':
+                        <span class="hidden-xs hidden-sm">TV Shows</span>
+                        <span class="hidden-xs hidden-sm"><i class="fa fa-chevron-right"></i></span>
+                        <span class="hidden-xs hidden-sm">${query['grandparent_title']}</span>
+                        <span class="hidden-xs hidden-sm"><i class="fa fa-chevron-right"></i></span>
+                        <span>Season ${query['parent_media_index']}</span>
+                        <span><i class="fa fa-chevron-right"></i></span>
+                        <span>Episode ${query['media_index']} - ${query['title']}</span>
+                        % elif query['media_type'] == 'artist':
+                        <span>Music</span>
+                        <span><i class="fa fa-chevron-right"></i></span>
+                        <span>${query['grandparent_title']}</span>
+                        % elif query['media_type'] == 'album':
+                        <span class="hidden-xs hidden-sm">Music</span>
+                        <span class="hidden-xs hidden-sm"><i class="fa fa-chevron-right"></i></span>
+                        <span>${query['grandparent_title']}</span>
+                        <span><i class="fa fa-chevron-right"></i></span>
+                        <span>${query['parent_title']}</span>
+                        % elif query['media_type'] == 'track':
+                        <span class="hidden-xs hidden-sm">Music</span>
+                        <span class="hidden-xs hidden-sm"><i class="fa fa-chevron-right"></i></span>
+                        <span class="hidden-xs hidden-sm">${query['grandparent_title']}</span>
+                        <span class="hidden-xs hidden-sm"><i class="fa fa-chevron-right"></i></span>
+                        <span>${query['parent_title']}</span>
+                        <span><i class="fa fa-chevron-right"></i></span>
+                        <span>Track ${query['media_index']} - ${query['title']}</span>
+                        % endif
                         % endif
-                    </strong>
-                </p>
-                <br />
-                <label for="send-notification-notifier">Select the Notification Agent</label>
-                <div class="row">
-                    <div class="col-md-8" style="float: none; margin: 0 auto;">
-                        <select class="form-control" id="send-notification-notifier" name="send-notification-notifier" value="" placeholder="The server owner has ended the stream.">
-                            <option value="">All Enabled Recently Added Notification Agents</option>
-                            % for notifier in sorted(notifiers.get_notifiers(), key=lambda k: (k['agent_label'], k['friendly_name'], k['id'])):
-                            % if notifier['friendly_name']:
-                            <option value="${notifier['id']}"> ${notifier['agent_label']} (${notifier['id']} - ${notifier['friendly_name']})</option>
-                            % else:
-                            <option value="${notifier['id']}"> ${notifier['agent_label']} (${notifier['id']})</option>
-                            % endif
-                            % endfor
-                        </select>
                     </div>
-                    <p class="help-block">Note: All custom notification conditions will be bypassed.</p>
                 </div>
             </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-dark" data-dismiss="modal">Cancel</button>
-                <button type="button" class="btn btn-bright btn-ok" data-dismiss="modal" id="confirm-send-notification">Send</button>
+            <div class="summary-content-title-wrapper">
+                <div class="col-md-12">
+                    <h4 style="text-align: center; margin-bottom: 20px;">
+                        Error retrieving item metadata. This media item is not available in the Plex Media Server library.
+                    </h4>
+                    % if query:
+                    <h4 style="text-align: center; margin-bottom: 20px;">
+                        If the item has been moved, please select the correct match below to update the PlexPy database.
+                    </h4>
+                    % endif
+                </div>
+            </div>
+            <div class="summary-content-wrapper">
+                <div class='col-md-12'>
+                    % if query:
+                    <div class='table-card-header'>
+                        <div class="header-bar">
+                            <span>Search Results for <strong>${query['query_string']}</strong></span>
+                        </div>
+                    </div>
+                    <div class='table-card-back'>
+                        <div id="search-results-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading search results...</div>
+                    </div>
+                    <div class="modal fade" id="confirm-modal" tabindex="-1" role="dialog" aria-labelledby="confirm-modal">
+                        <div class="modal-dialog">
+                            <div class="modal-content">
+                                <div class="modal-header">
+                                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
+                                    <h4 class="modal-title" id="myModalLabel">Confirm Update</h4>
+                                </div>
+                                <div class="modal-body" style="text-align: center;">
+                                    <p>Are you REALLY sure you want to replace
+                                    <p><strong>
+                                        % if query['media_type'] == 'movie':
+                                        ${query['title']}<br />${query['year']}
+                                        % elif query['media_type'] == 'show':
+                                        ${query['grandparent_title']}
+                                        % elif query['media_type'] == 'season':
+                                        ${query['grandparent_title']}<br />S${query['parent_media_index']}
+                                        % elif query['media_type'] == 'episode':
+                                        ${query['grandparent_title']}<br />${query['title']}<br />S${query['parent_media_index']} &middot; E${query['media_index']}
+                                        % elif query['media_type'] == 'artist':
+                                        ${query['grandparent_title']}
+                                        % elif query['media_type'] == 'album':
+                                        ${query['grandparent_title']}<br />${query['parent_title']}
+                                        % elif query['media_type'] == 'track':
+                                        ${query['grandparent_title']}<br />${query['title']}<br />${query['parent_title']}
+                                        % endif
+                                        </strong></p>
+                                    <p> with </p>
+                                    <p><span id="new_title"></span></p>
+                                    % if query['media_type'] != 'movie':
+                                    <p>All items for <strong>${query['grandparent_title']}</strong> will also be updated.</p>
+                                    % endif
+                                    <p>This is permanent and cannot be undone!</p>
+                                </div>
+                                <div class="modal-footer">
+                                    <button type="button" class="btn btn-dark" data-dismiss="modal">Cancel</button>
+                                    <button type="button" class="btn btn-danger btn-ok" data-dismiss="modal" id="confirm-update">Update</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    % endif
+                </div>
             </div>
         </div>
     </div>
 </div>
 % endif
-<div id="export-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="export-modal">
-</div>
 </%def>
 
 <%def name="javascriptIncludes()">
-<script src="${http_root}js/jquery.dataTables.min.js"></script>
-<script src="${http_root}js/dataTables.colVis.js"></script>
-<script src="${http_root}js/dataTables.bootstrap.min.js"></script>
-<script src="${http_root}js/dataTables.bootstrap.pagination.js"></script>
+<script src="interfaces/default/js/jquery.rateit.min.js"></script>
+<script src="interfaces/default/js/jquery.dataTables.min.js"></script>
+<script src="interfaces/default/js/dataTables.colVis.js"></script>
+<script src="interfaces/default/js/dataTables.bootstrap.min.js"></script>
+<script src="interfaces/default/js/dataTables.bootstrap.pagination.js"></script>
+<script src="interfaces/default/js/moment-with-locale.js"></script>
 
-% if metadata:
-<%
-    data = defaultdict(None, **metadata)
-    history_user_id = '' if _session['user_group'] == 'admin' else _session['user_id']
-%>
-<script src="${http_root}js/tables/history_table.js${cache_param}"></script>
-<script src="${http_root}js/tables/export_table.js${cache_param}"></script>
-% if data['media_type'] in ('movie', 'show', 'season', 'episode', 'artist', 'album', 'track', 'collection', 'playlist'):
+% if data:
+<script src="interfaces/default/js/tables/history_table.js"></script>
+% if data['type'] == 'library':
 <script>
-    function loadHistoryTable(transcode_decision) {
-        // Build watch history table
+    function get_history() {
         history_table_options.ajax = {
-            url: 'get_history',
-            type: 'POST',
-            data: function (d) {
-                return {
-                    json_data: JSON.stringify(d),
-                    transcode_decision: transcode_decision,
-                    user_id: "${history_user_id}",
-                    % if data['live']:
-                    guid: "${data['guid']}"
-                    % elif data['media_type'] in ('show', 'artist'):
-                    grandparent_rating_key: "${data['rating_key']}"
-                    % elif data['media_type'] in ('season', 'album'):
-                    parent_rating_key: "${data['rating_key']}"
-                    % elif data['media_type'] in ('movie', 'episode', 'track'):
-                    rating_key: "${data['rating_key']}"
-                    % elif data['media_type'] in ('collection', 'playlist'):
-                    media_type: "${data['media_type']}",
-                    rating_key: "${data['rating_key']}"
-                    % endif
-                };
+            "url": "get_history",
+            type: 'post',
+            data: function ( d ) {
+                return { 'json_data': JSON.stringify( d ),
+                    'media_type': '${data['media_type']}' };
+            }
+        }
+    }
+</script>
+% elif data['type'] == 'show' or data['type'] == 'artist':
+<script>
+    function get_history() {
+        history_table_options.ajax = {
+            "url": "get_history",
+            type: 'post',
+            data: function ( d ) {
+                return { 'json_data': JSON.stringify( d ),
+                    'grandparent_rating_key': ${data['rating_key']} };
+            }
+        }
+    }
+</script>
+% elif data['type'] == 'season' or data['type'] == 'album':
+<script>
+    function get_history() {
+        history_table_options.ajax = {
+            "url": "get_history",
+            type: 'post',
+            data: function ( d ) {
+                return { 'json_data': JSON.stringify( d ),
+                    'parent_rating_key': ${data['rating_key']} };
+            }
+        }
+    }
+</script>
+% elif data['type'] == 'episode' or data['type'] == 'track' or data['type'] == 'movie':
+<script>
+    function get_history() {
+        history_table_options.ajax = {
+            "url": "get_history",
+            type: 'post',
+            data: function ( d ) {
+                return { 'json_data': JSON.stringify( d ),
+                    'rating_key': ${data['rating_key']} };
             }
         }
-        history_table = $('#history_table-RK-${data["rating_key"]}').DataTable(history_table_options);
-        var colvis = new $.fn.dataTable.ColVis(history_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark', exclude: [0, 12] });
-        $(colvis.button()).appendTo('#button-bar-history');
-
-        clearSearchButton('history_table-RK-${data["rating_key"]}', history_table);
-
-        $('#transcode_decision-selection').on('change', function () {
-            $('#transcode_decision-selection > label').removeClass('active');
-            var selected_filter = $('input[name=transcode_decision-filter]:checked', '#transcode_decision-selection');
-            $(selected_filter).closest('label').addClass('active');
-            transcode_decision = $(selected_filter).map(function () { return $(this).val(); }).get().join(',');
-            setLocalStorage('info_${data["rating_key"]}_history_transcode_decision', transcode_decision);
-            history_table.draw();
-        });
     }
-
-    var transcode_decision = getLocalStorage('info_${data["rating_key"]}_history_transcode_decision', 'all');
-    $.each(transcode_decision.split(','), function (i, item) {
-        var history_transcode_decision = $('#history-transcode_decision-' + item.replace(' ', '_'));
-        history_transcode_decision.prop('checked', true);
-        history_transcode_decision.closest('label').addClass('active');
-    });
-
-    $(document).ready(function () {
-        loadHistoryTable(transcode_decision);
-    });
-
-    $("#refresh-history-list").click(function () {
-        history_table.draw();
-    });
 </script>
 % endif
-% if data['media_type'] in ('show', 'season', 'artist', 'album', 'photo_album', 'collection', 'playlist'):
+<script>
+    $(document).ready(function () {
+        get_history();
+        history_table = $('#history_table').DataTable(history_table_options);
+        var colvis = new $.fn.dataTable.ColVis(history_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark', exclude: [0, 11] });
+        $(colvis.button()).appendTo('div.colvis-button-bar');
+
+        clearSearchButton('history_table', history_table);
+
+        $('#row-edit-mode').on('click', function() {
+            $('#row-edit-mode-alert').fadeIn(200);
+
+            if ($(this).hasClass('active')) {
+                if (history_to_delete.length > 0) {
+                    $('#deleteCount').text(history_to_delete.length);
+                    $('#confirm-modal').modal();
+                    $('#confirm-modal').one('click', '#confirm-delete', function () {
+                        for (var i = 0; i < history_to_delete.length; i++) {
+                            $.ajax({
+                                url: 'delete_history_rows',
+                                data: { row_id: history_to_delete[i] },
+                                async: true,
+                                success: function (data) {
+                                    var msg = "History deleted";
+                                    showMsg(msg, false, true, 2000);
+                                }
+                            });
+                        }
+                        history_table.draw();
+                    });
+                }
+
+                $('.delete-control').each(function () {
+                    $(this).addClass('hidden');
+                    $('#row-edit-mode-alert').fadeOut(200);
+                });
+
+            } else {
+                history_to_delete = [];
+                $('.delete-control').each(function() {
+                    $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
+                    $(this).removeClass('hidden');
+                });
+            }
+        });
+    });
+</script>
+% if data['type'] == 'show' or data['type'] == 'season' or data['type'] == 'artist' or data['type'] == 'album':
 <script>
     $.ajax({
         url: 'get_item_children',
-        type: 'GET',
+        type: "GET",
         async: true,
-        data: {
-            rating_key: "${data['rating_key']}",
-            media_type: "${data['media_type']}"
-        },
+        data: { rating_key : ${data['rating_key']} },
         complete: function(xhr, status) {
-            $("#children-list").html(xhr.responseText);
-        }
+        $("#children-list").html(xhr.responseText); }
     });
 </script>
 % endif
-% if data['media_type'] in ('movie', 'show', 'season', 'episode', 'artist', 'album', 'track', 'collection', 'playlist'):
+% if data['type'] != 'library' and data['rating']:
 <script>
-    // Populate watch time stats
-    $.ajax({
-        url: 'item_watch_time_stats',
-        async: true,
-        data: { 
-            % if data['live']:
-            guid: "${data['guid']}"
-            % else:
-            rating_key: "${data['rating_key']}",
-            media_type: "${data['media_type']}"
-            % endif
-        },
-        complete: function(xhr, status) {
-            $("#watch-time-stats").html(xhr.responseText);
-        }
-    });
-    // Populate user stats
-    $.ajax({
-        url: 'item_user_stats',
-        async: true,
-        data: { 
-            % if data['live']:
-            guid: "${data['guid']}"
-            % else:
-            rating_key: "${data['rating_key']}",
-            media_type: "${data['media_type']}"
-            % endif
-        },
-        complete: function(xhr, status) {
-            $("#user-stats").html(xhr.responseText);
-        }
-    });
-</script>
-% endif
-% if data['media_type'] == 'collection':
-<script>
-    $.ajax({
-        url: 'get_item_children_related',
-        type: 'GET',
-        async: true,
-        data: {
-            rating_key: "${data['rating_key']}",
-            title: "${data['title']}"
-        },
-        complete: function(xhr, status) {
-            $("#collection-related-list-container").html(xhr.responseText).show();
-        }
-    });
+    // Convert rating to 5 star rating type
+    var starRating = Math.round(${data['rating']} / 2);
+    $('#stars').attr('data-rateit-value', starRating);
 </script>
 % endif
 <script>
-    $(document).ready(function () {
-        // Javascript to enable link to tab
-        var hash = document.location.hash;
-        var prefix = "tab_";
-        if (hash) {
-            $('.nav-list #nav-' + hash.replace('#' + prefix, "")).tab('show').trigger('show.bs.tab');
-        }
-
-        // Change hash for page-reload
-        $('.nav-list a').on('shown.bs.tab', function (e) {
-            window.location.hash = e.target.hash.replace("#", "#" + prefix);
-        });
-    });
-
-    $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
-        $.fn.dataTable.tables({ visible: true, api: true }).columns.adjust();
-    });
-
-    var airdate = $("#airdate")
-    var runtime = $("#runtime")
-    airdate.html(moment(airdate.text()).format('MMM DD, YYYY'));
-    runtime.html(humanDuration(runtime.text()));
-
+    $("#airdate").html(moment($("#airdate").text()).format('MMM DD, YYYY'));
+    $("#runtime").html(millisecondsToMinutes($("#runtime").text(), true));
     $('div.art-face').animate({ opacity: 0.2 }, { duration: 1000 });
-    $('#channel-icon').popover({
-        selector: '[data-toggle=popover]',
-        html: true,
-        sanitize: false,
-        container: 'body',
-        trigger: 'hover',
-        placement: 'right',
-        template: '<div class="popover channel-thumbnail-popover" role="tooltip"><div class="arrow" style="top: 50%;"></div><div class="popover-content"></div></div>',
-        content: function () {
-            return '<div class="channel-thumbnail" style="background-image: url(' + $(this).data('img') + ');" />';
-        }
-    });
-
-    $('.summary-content-summary').hasScrollBar() ? $('.summary-toggle').show() : $('.summary-toggle').hide();
-
-    $('.summary-toggle a').on('click', function() {
-        var $this = $(this);
-        var $content = $this.parent().prev('div.summary-content-summary');
-
-        if ($this.hasClass('show-more')) {
-            $this.html('Read less &nbsp;<i class="fa fa-chevron-up"></i>').toggleClass('show-more').toggleClass('show-less');
-            $content.animate({'height': $content[0].scrollHeight});
-        } else {
-            $this.html('Read more &nbsp;<i class="fa fa-chevron-down"></i>').toggleClass('show-more').toggleClass('show-less');
-            $content.animate({'height': '60px'});
-        }
-    });
 </script>
-% if _session['user_group'] == 'admin':
+% elif query:
 <script>
-    $("#toggle-export-modal").click(function() {
-        $.ajax({
-            url: 'export_metadata_modal',
-            data: {
-                section_id: $(this).data('section_id'),
-                rating_key: $(this).data('rating_key'),
-                media_type: $(this).data('media_type'),
-                sub_media_type: $(this).data('sub_media_type')
-            },
-            cache: false,
-            async: true,
-            complete: function(xhr, status) {
-                $("#export-modal").html(xhr.responseText);
-            }
-        });
+    $.ajax({
+        url: 'get_search_results_children',
+        type: "GET",
+        async: true,
+        data: {'query': "${query['query_string']}",
+               'media_type': "${query['media_type']}",
+               'season_index': "${query['parent_media_index']}"
+        },
+        complete: function(xhr, status) {
+        $("#search-results-list").html(xhr.responseText); }
     });
+    $(document).on('click', '#search-results-list a', function (e) {
+        e.preventDefault();
+        var new_rating_key = $(this).attr("id");
+        var new_href = $(this).attr("href");
 
-    function loadExportTable() {
-        // Build export table
-        export_table_options.ajax = {
-            url: 'get_export_list',
-            type: 'POST',
-            data: function ( d ) {
-                return {
-                    json_data: JSON.stringify( d ),
-                    rating_key: "${data['rating_key']}"
-                };
-            }
-        };
-        export_table = $('#export_table-RK-${data["rating_key"]}').DataTable(export_table_options);
-        export_table.columns([2, 7]).visible(false);
+        $('#new_title').html($(this).find('.item-children-instance-text-wrapper').html());
 
-        var colvis = new $.fn.dataTable.ColVis(export_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' });
-        $(colvis.button()).appendTo('#button-bar-export');
+        $('#confirm-modal').modal();
+        $('#confirm-modal').one('click', '#confirm-update', function () {
+            $(this).prop('disabled', true);
+            var msg = "<i class='fa fa-refresh fa-spin'></i>&nbspUpdating database..."
+            showMsg(msg, false, false, 0)
 
-        clearSearchButton('export_table-RK-${data["rating_key"]}', export_table);
-    }
-
-    $('#nav-tabs-export').on('shown.bs.tab', function() {
-        if (typeof(export_table) === 'undefined') {
-            loadExportTable();
-        }
-    });
-
-    $(document).ready(function () {
-        if (!($('#tabs-history').length)) {
-            loadExportTable();
-        }
-    });
-
-    $("#refresh-export-table").click(function () {
-        export_table.draw();
-    });
-
-    $('#row-edit-mode').on('click', function() {
-        if ($(this).hasClass('active')) {
-            $(this).tooltip('destroy');
-
-            if (history_to_delete.length > 0) {
-                $('#deleteCount').text(history_to_delete.length);
-                $('#confirm-modal-delete').modal();
-                $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
-                    $.ajax({
-                        url: 'delete_history_rows',
-                        type: 'POST',
-                        data: { row_ids: history_to_delete.join(',') },
-                        async: true,
-                        success: function (data) {
-                            var msg = "History deleted";
-                            showMsg(msg, false, true, 2000);
-                            history_table.draw();
-                        }
-                    });
-                });
-            }
-
-            $('.delete-control').each(function () {
-                $(this).addClass('hidden');
-                $('#row-edit-mode-alert').fadeOut(200);
-            });
-
-        } else {
-            $(this).tooltip({
-                container: '.body-container',
-                placement: 'bottom',
-                title: 'Select rows to delete. Data is deleted upon exiting delete mode.',
-                trigger: 'manual'
-            }).tooltip('show');
-
-            history_to_delete = [];
-            $('.delete-control').each(function() {
-                $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
-                $(this).removeClass('hidden');
-            });
-        }
-    });
-
-    // Send recently added notification
-    $('#send-recently-added-notification').on('click', function () {
-        var rating_key = $(this).data('id');
-
-        $('#send-recently-added-modal').modal();
-        $('#send-recently-added-modal').one('click', '#confirm-send-notification', function () {
             $.ajax({
-                url: 'send_manual_on_created',
-                data: {
-                    rating_key: rating_key,
-                    notifier_id: $('#send-notification-notifier option:selected').val()
-                },
+                url: 'update_history_rating_key',
+                data: { old_rating_key: "${query['rating_key']}",
+                    new_rating_key: new_rating_key,
+                    media_type: "${query['media_type']}"
+                    },
                 async: true,
                 success: function (data) {
-                    if (data.result === 'success') {
-                        showMsg('<i class="fa fa-check"></i> ' + data.message, false, true, 5000);
-                    } else {
-                        showMsg('<i class="fa fa-exclamation-circle"></i> ' + data.message, false, true, 5000, true);
-                    }
+                    window.location.href = new_href;
                 }
             });
         });
     });
-
-    $('.metadata-xml').on('tripleclick', function () {
-        openPlexXML("/library/metadata/${data['rating_key']}");
-    });
 </script>
 % endif
-% if data.get('poster_url'):
-<script>
-    $('#hosted-poster').popover({
-        selector: '[data-toggle=popover]',
-        html: true,
-        sanitize: false,
-        container: 'body',
-        trigger: 'hover',
-        placement: 'top',
-        template: '<div class="popover history-thumbnail-popover" role="tooltip"><div class="arrow" style="top: 50%;"></div><div class="popover-content"></div></div>',
-        content: function () {
-            return '<div class="history-thumbnail" style="background-image: url(' + $(this).data('img') + '); height: ' + $(this).data('height') + 'px; width: ' + $(this).data('width') + 'px;" />';
-        }
-    });
-
-    $('#delete-hosted-poster').on('click', function () {
-        var msg = 'Are you sure you want to delete the ${data['img_service']} poster for <strong>' + $(this).data('title') + '</strong>?<br><br>' +
-                  'All previous links to this image will no longer work.';
-        var url = 'delete_hosted_images';
-        var data = { rating_key: $(this).data('id') };
-        var callback = function () {
-            $('.hosted-poster-tooltip').popover('destroy');
-            $('#delete-hosted-poster').closest('.btn-group').remove();
-        };
-        confirmAjaxCall(url, msg, data, false, callback);
-    });
-</script>
-% endif
-% if data.get('tvmaze_id') or data.get('themoviedb_id') or data.get('musicbrainz_id'):
-<script>
-    $('#delete-lookup-info').on('click', function () {
-        var msg = 'Are you sure you want to delete all the metadata lookup info for <strong>' + $(this).data('title') + '</strong>?' +
-                  '<br /><br />Tautulli will lookup the metadata info again the next time a notification is sent.';
-        var url = 'delete_lookup_info';
-        var data = { rating_key: $(this).data('id') };
-        var callback = function () {
-            $('#delete-lookup-info').closest('.btn-group').remove();
-        };
-        confirmAjaxCall(url, msg, data, false, callback);
-    });
-</script>
-% endif
-% endif
 </%def>
diff --git a/data/interfaces/default/info_children_list.html b/data/interfaces/default/info_children_list.html
index d7998071..e2994206 100644
--- a/data/interfaces/default/info_children_list.html
+++ b/data/interfaces/default/info_children_list.html
@@ -18,7 +18,7 @@ data['children_list'] :: Usable paramaters
 
 == Global keys ==
 rating_key              Returns the unique identifier for the media item.
-media_index             Returns the episode number.
+index                   Returns the episode number.
 title                   Returns the name of the episode.
 thumb                   Returns the location of the item's thumbnail. Use with pms_image_proxy.
 parent_thumb            Returns the location of the item's parent thumbnail. Use with pms_image_proxy.
@@ -27,288 +27,76 @@ DOCUMENTATION :: END
 </%doc>
 
 % if data != None:
-<%
-    from plexpy.helpers import cast_to_int, page, short_season
-%>
 % if data['children_count'] > 0:
 <div class="item-children-wrapper">
-    <% max_height ='max-height' if data['children_type'] in ('track', 'photo') or media_type == 'playlist' else '' %>
-    <ul class="item-children-instance ${max_height} list-unstyled">
+    <ul class="item-children-instance list-unstyled">
         % for child in data['children_list']:
         % if child['rating_key']:
-        % if data['children_type'] in ('track', 'photo') or media_type == 'playlist':
+        % if data['children_type'] == 'track':
         <li class="item-children-list-item">
         % else:
         <li>
         % endif
-            % if media_type == 'playlist':
-                <% e = 'even' if loop.index % 2 == 0 else 'odd' %>
-                <div class="item-children-list-item-${e}">
-                    <span class="item-children-list-item-index">${loop.index + 1}</span>
-                    <span class="item-children-list-item-title">
-                        % if child['media_type'] == 'movie':
-                        <span class="media-type-tooltip" data-toggle="tooltip" title="Movie"><i class="fa fa-film fa-fw"></i></span>
-                        <a href="${page('info', child['rating_key'])}" title="${child['title']}">
-                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')}" data-height="120" data-width="80">
-                                ${child['title']}
-                            </span>
-                        </a>
-                        <span class="text-muted"> (${child['year']})</span>
-                        % elif child['media_type'] == 'episode':
-                        <span class="media-type-tooltip" data-toggle="tooltip" title="Episode"><i class="fa fa-television fa-fw"></i></span>
-                        <a href="${page('info', child['grandparent_rating_key'])}" title="${child['grandparent_title']}">
-                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['grandparent_thumb'], child['grandparent_rating_key'], 300, 450, fallback='poster')}" data-height="120" data-width="80">
-                                ${child['grandparent_title']}
-                            </span>
-                        </a> -
-                        <a href="${page('info', child['rating_key'])}" title="${child['title']}">
-                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['parent_thumb'], child['parent_rating_key'], 300, 450, fallback='poster')}" data-height="120" data-width="80">
-                                ${child['title']}
-                            </span>
-                        </a>
-                        <span class="text-muted"> (<a class="no-highlight" href="${page('info', child['parent_rating_key'])}" title="${child['parent_title']}">${short_season(child['parent_title'])}</a> &middot; <a class="no-highlight" href="${page('info', child['rating_key'])}" title="${child['title']}">E${child['media_index']}</a>)</span>
-                        % elif child['media_type'] == 'track':
-                        <span class="media-type-tooltip" data-toggle="tooltip" title="Track"><i class="fa fa-music fa-fw"></i></span>
-                        <a href="${page('info', child['rating_key'])}" title="${child['title']}">
-                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['parent_thumb'], child['parent_rating_key'], 300, 300, fallback='cover')}" data-height="80" data-width="80">
-                                ${child['title']}
-                            </span>
-                        </a> -
-                        <a href="${page('info', child['grandparent_rating_key'])}" title="${child['grandparent_title']}">
-                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['grandparent_thumb'], child['grandparent_rating_key'], 300, 300, fallback='cover')}" data-height="80" data-width="80">
-                                ${child['grandparent_title']}
-                            </span>
-                        </a>
-                        <span class="text-muted"> (<a class="no-highlight" href="${page('info', child['parent_rating_key'])}" title="${child['parent_title']}">${child['parent_title']}</a>)</span>
-                        % elif child['media_type'] == 'photo':
-                        <span class="media-type-tooltip" data-toggle="tooltip" title="Photo"><i class="fa fa-picture-o fa-fw"></i></span>
-                        <a href="${page('info', child['rating_key'])}" title="${child['title']}">
-                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover')}" data-height="80" data-width="80">
-                                ${child['title']}
-                            </span>
-                        </a>
-                            % if child['grandparent_title']:
-                            - <a href="${page('info', child['grandparent_rating_key'])}" title="${child['grandparent_title']}">
-                                <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['grandparent_thumb'], child['grandparent_rating_key'], 300, 300, fallback='cover')}" data-height="80" data-width="80">
-                                    ${child['grandparent_title']}
-                                </span>
-                            </a>
-                            % endif
-                        <span class="text-muted"> (<a class="no-highlight" href="${page('info', child['parent_rating_key'])}" title="${child['parent_title']}">${child['parent_title']}</a>)</span>
-                        % elif child['media_type'] == 'clip':
-                        <span class="media-type-tooltip" data-toggle="tooltip" title="Video"><i class="fa fa-video-camera fa-fw"></i></span>
-                        <a href="${page('info', child['rating_key'])}" title="${child['title']}">
-                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover')}" data-height="80" data-width="80">
-                                ${child['title']}
-                            </span>
-                        </a>
-                        <span class="text-muted"> (<a class="no-highlight" href="${page('info', child['parent_rating_key'])}" title="${child['parent_title']}">${child['parent_title']}</a>)</span>
-                        % endif
-                    </span>
-                    % if child['duration']:
-                    <span class="item-children-list-item-duration" id="item-children-list-item-duration-${loop.index + 1}">
-                        <% f = 'h:mm:ss' if cast_to_int(child['duration']) >= 3600000 else 'm:ss' %>
-                        <script>$('#item-children-list-item-duration-${loop.index + 1}').text(moment.utc(${child['duration']}).format("${f}"));</script>
-                    </span>
-                    % endif
-                </div>
-            % elif child['media_type'] == 'movie':
-            <a href="${page('info', child['rating_key'])}" title="${child['title']}">
-                <div class="item-children-poster">
-                    <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')});"></div>
-                    % if _session['user_group'] == 'admin':
-                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                    % endif
-                </div>
-            </a>
-            <div class="item-children-instance-text-wrapper poster-item">
-                <h3>
-                     <a href="${page('info', child['rating_key'])}" title="${child['title']}">${child['title']}</a>
-                </h3>
-                <h3 class="text-muted">${child['year']}</h3>
-            </div>
-            % elif child['media_type'] == 'show':
-            <a href="${page('info', child['rating_key'])}" title="${child['title']}">
-                <div class="item-children-poster">
-                    <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')});"></div>
-                    % if _session['user_group'] == 'admin':
-                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                    % endif
-                </div>
-            </a>
-            <div class="item-children-instance-text-wrapper poster-item">
-                <h3>
-                     <a href="${page('info', child['rating_key'])}" title="${child['title']}">${child['title']}</a>
-                </h3>
-            </div>
-            % elif child['media_type'] == 'season':
-            <a href="${page('info', child['rating_key'])}" title="${child['title']}">
+            <a href="info?item_id=${child['rating_key']}">
+                %if data['children_type'] == 'season':
                 <div class="item-children-poster">
                     % if child['thumb']:
-                    <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')});">
+                    <div class="item-children-poster-face season-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=450);">
                     % else:
-                    <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['parent_thumb'], child['parent_rating_key'], 300, 450, fallback='poster')});">
+                    <div class="item-children-poster-face season-poster" style="background-image: url(pms_image_proxy?img=${child['parent_thumb']}&width=300&height=450);">
                     % endif
                         <div class="item-children-card-overlay">
                             <div class="item-children-overlay-text">
-                                ${child['title']}
+                                Season ${child['index']}
                             </div>
                         </div>
                     </div>
-                    % if _session['user_group'] == 'admin':
-                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                    % endif
                 </div>
-            </a>
-            <div class="item-children-instance-text-wrapper poster-item">
-                <h3>
-                     <a href="${page('info', child['rating_key'])}" title="${child['title']}">${child['title']}</a>
-                </h3>
-                % if media_type == 'collection':
-                <h3 class="text-muted">
-                    <a class="text-muted" href="${page('info', child['parent_rating_key'])}" title="${child['parent_title']}">${child['parent_title']}</a>
-                </h3>
-                % endif
-            </div>
-            % elif child['media_type'] == 'episode':
-            <a href="${page('info', child['rating_key'])}" title="Episode ${child['media_index']}">
+                % elif data['children_type'] == 'episode':
                 <div class="item-children-poster">
-                    <div class="item-children-poster-face episode-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 500, 280, fallback='art')});">
+                    <div class="item-children-poster-face episode-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=450);">
                         <div class="item-children-card-overlay">
                             <div class="item-children-overlay-text">
-                                Episode ${child['media_index'] or child['originally_available_at']}
+                                Episode ${child['index']}
                             </div>
                         </div>
                     </div>
-                    % if _session['user_group'] == 'admin':
-                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                    % endif
                 </div>
-            </a>
-            <div class="item-children-instance-text-wrapper episode-item">
-                <h3>
-                     <a href="${page('info', child['rating_key'])}" title="${child['title']}">${child['title']}</a>
-                </h3>
-                % if media_type == 'collection':
-                <h3 class="text-muted">
-                    <a href="${page('info', child['grandparent_rating_key'])}" title="${child['grandparent_title']}">${child['grandparent_title']}</a>
-                </h3>
-                <h3 class="text-muted">
-                    <a href="${page('info', child['parent_rating_key'])}" title="${child['parent_title']}">${short_season(child['parent_title'])}</a>
-                        &middot; <a href="${page('info', child['rating_key'])}" title="Episode ${child['media_index']}">E${child['media_index']}</a>
-                </h3>
-                % endif
-            </div>
-            % elif child['media_type'] == 'artist':
-            <a href="${page('info', child['rating_key'])}" title="${child['title']}">
+                <div class="item-children-instance-text-wrapper episode-item">
+                    <h3 title="${child['title']}">${child['title']}</h3>
+                </div>
+                % elif data['children_type'] == 'album':
                 <div class="item-children-poster">
-                    <div class="item-children-poster-face cover-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover')});"></div>
-                    % if _session['user_group'] == 'admin':
-                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                    % endif
+                    <div class="item-children-poster-face album-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=300);"></div>
                 </div>
-            </a>
-            <div class="item-children-instance-text-wrapper cover-item">
-                <h3>
-                    <a href="${page('info', child['rating_key'])}" title="${child['title']}">${child['title']}</a>
-                </h3>
-            </div>
-            % elif child['media_type'] == 'album':
-            <a href="${page('info', child['rating_key'])}" title="${child['title']}">
-                <div class="item-children-poster">
-                    <div class="item-children-poster-face cover-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover')});"></div>
-                    % if _session['user_group'] == 'admin':
-                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                    % endif
+                <div class="item-children-instance-text-wrapper album-item">
+                    <h3 title="${child['title']}">${child['title']}</h3>
                 </div>
-            </a>
-            <div class="item-children-instance-text-wrapper cover-item">
-                <h3>
-                    <a href="${page('info', child['rating_key'])}" title="${child['title']}">${child['title']}</a>
-                </h3>
-                % if media_type == 'collection':
-                <h3 class="text-muted">
-                    <a class="text-muted" href="${page('info', child['parent_rating_key'])}" title="${child['parent_title']}">${child['parent_title']}</a>
-                </h3>
+                % elif data['children_type'] == 'track':
+                    % if loop.index % 2 == 0:
+                    <div class="item-children-list-item-even">
+                        <span class="item-children-list-item-index">${child['index']}</span>
+                        <span class="item-children-list-item-title">${child['title']}</span>
+                        <span class="item-children-list-item-duration" id="item-children-list-item-duration-${loop.index + 1}">
+                            <script>$('#item-children-list-item-duration-${loop.index + 1}').text(moment.utc(${child['duration']}).format("m:ss"));</script>
+                        </span>
+                    </div>
+                    % else:
+                    <div class="item-children-list-item-odd">
+                        <span class="item-children-list-item-index">${child['index']}</span>
+                        <span class="item-children-list-item-title">${child['title']}</span>
+                        <span class="item-children-list-item-duration" id="item-children-list-item-duration-${loop.index + 1}">
+                            <script>$('#item-children-list-item-duration-${loop.index + 1}').text(moment.utc(${child['duration']}).format("m:ss"));</script>
+                        </span>
+                    </div>
+                    % endif
                 % endif
-            </div>
-            % elif child['media_type'] == 'track':
-                <% e = 'even' if loop.index % 2 == 0 else 'odd' %>
-                <div class="item-children-list-item-${e}">
-                    <span class="item-children-list-item-index">${child['media_index']}</span>
-                    <span class="item-children-list-item-title">
-                        <span class="media-type-tooltip" data-toggle="tooltip" title="Track"><i class="fa fa-music fa-fw"></i></span>
-                        <a href="${page('info', child['rating_key'])}" title="${child['title']}">
-                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['parent_thumb'], child['parent_rating_key'], 300, 300, fallback='cover')}" data-height="80" data-width="80">
-                                ${child['title']}
-                            </span>
-                        </a>
-                        % if media_type == 'collection':
-                        -
-                        <a href="${page('info', child['grandparent_rating_key'])}" title="${child['grandparent_title']}">
-                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['grandparent_thumb'], child['grandparent_rating_key'], 300, 300, fallback='cover')}" data-height="80" data-width="80">
-                                ${child['grandparent_title']}
-                            </span>
-                        </a>
-                        <span class="text-muted"> (<a class="no-highlight" href="${page('info', child['parent_rating_key'])}" title="${child['parent_title']}">${child['parent_title']}</a>)</span>
-                        % elif child['original_title']:
-                        <span class="text-muted"> - ${child['original_title']}</span>
-                        % endif
-                    </span>
-                    <span class="item-children-list-item-duration" id="item-children-list-item-duration-${loop.index + 1}">
-                        <% f = 'h:mm:ss' if cast_to_int(child['duration']) >= 3600000 else 'm:ss' %>
-                        <script>$('#item-children-list-item-duration-${loop.index + 1}').text(moment.utc(${child['duration']}).format("${f}"));</script>
-                    </span>
-                </div>
-            % elif child['media_type'] == 'photo':
-                <% e = 'even' if loop.index % 2 == 0 else 'odd' %>
-                <div class="item-children-list-item-${e}">
-                    <span class="item-children-list-item-index">${loop.index + 1}</span>
-                    <span class="item-children-list-item-title">
-                        % if child['media_type'] == 'photo_album':
-                        <span class="media-type-tooltip" data-toggle="tooltip" title="Photo"><i class="fa fa-camera fa-fw"></i></span>
-                        % elif child['media_type'] == 'clip':
-                        <span class="media-type-tooltip" data-toggle="tooltip" title="Photo"><i class="fa fa-video-camera fa-fw"></i></span>
-                        % else:
-                        <span class="media-type-tooltip" data-toggle="tooltip" title="Photo"><i class="fa fa-picture-o fa-fw"></i></span>
-                        % endif
-                        <a href="${page('info', child['rating_key'])}" title="${child['title']}">
-                            <span class="thumb-tooltip" data-toggle="popover" data-img="${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover')}" data-height="80" data-width="80">
-                                ${child['title']}
-                            </span>
-                        </a>
-                    </span>
-                    % if child['duration']:
-                    <span class="item-children-list-item-duration" id="item-children-list-item-duration-${loop.index + 1}">
-                        <% f = 'h:mm:ss' if cast_to_int(child['duration']) >= 3600000 else 'm:ss' %>
-                        <script>$('#item-children-list-item-duration-${loop.index + 1}').text(moment.utc(${child['duration']}).format("${f}"));</script>
-                    </span>
-                    % endif
-                </div>
-            % endif
+            </a>
         </li>
         % endif
         % endfor
     </ul>
 </div>
-<script>
-    $('body').tooltip({
-        selector: '[data-toggle="tooltip"]',
-        container: 'body'
-    });
-    $('body').popover({
-        selector: '[data-toggle="popover"]',
-        html: true,
-        sanitize: false,
-        container: 'body',
-        trigger: 'hover',
-        placement: 'right',
-        template: '<div class="popover history-thumbnail-popover" role="tooltip"><div class="arrow" style="top: 50%;"></div><div class="popover-content"></div></div>',
-        content: function () {
-            return '<div class="history-thumbnail" style="background-image: url(' + $(this).data('img') + '); height: ' + $(this).data('height') + 'px; width: ' + $(this).data('width') + 'px;" />';
-        }
-    });
-</script>
 % endif
 % endif
 
diff --git a/data/interfaces/default/info_collection_list.html b/data/interfaces/default/info_collection_list.html
deleted file mode 100644
index e4b675b5..00000000
--- a/data/interfaces/default/info_collection_list.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<%doc>
-USAGE DOCUMENTATION :: PLEASE LEAVE THIS AT THE TOP OF THIS FILE
-
-For Mako templating syntax documentation please visit: http://docs.makotemplates.org/en/latest/
-
-Filename:           info_collection_list.html
-Version:            0.1
-Variable names:     data [list]
-
-data :: Usable parameters
-
-== Global keys ==
-children_type           Returns the type of children in the array.
-children_count          Returns the number of episodes in the array.
-children_list           Returns an array of episodes.
-
-data['children_list'] :: Usable paramaters
-
-== Global keys ==
-rating_key              Returns the unique identifier for the media item.
-media_index             Returns the episode number.
-title                   Returns the name of the episode.
-thumb                   Returns the location of the item's thumbnail. Use with pms_image_proxy.
-parent_thumb            Returns the location of the item's parent thumbnail. Use with pms_image_proxy.
-
-DOCUMENTATION :: END
-</%doc>
-
-% if data != None:
-<%
-    from plexpy.common import MEDIA_TYPE_HEADERS
-    from plexpy.helpers import page
-    types = ('movie', 'show', 'artist', 'album')
-%>
-% for media_type in types:
-% if data['results_list'][media_type]:
-<div class="col-md-12">
-    <div class="table-card-header">
-        <div class="header-bar">
-            <span>${MEDIA_TYPE_HEADERS[media_type]} in <strong>${title}</strong> collection</span>
-        </div>
-    </div>
-    <div class="table-card-back">
-        <div id="children-list" class="children-list">
-            <div class="item-children-wrapper">
-                <ul class="item-children-instance list-unstyled">
-                    % for child in data['results_list'][media_type]:
-                    <li>
-                        <a href="${page('info', child['rating_key'])}" title="${child['title']}">
-                            <div class="item-children-poster">
-                                % if media_type in ('artist', 'album'):
-                                <div class="item-children-poster-face cover-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover')});"></div>
-                                % else:
-                                <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')});"></div>
-                                % endif
-                                % if _session['user_group'] == 'admin':
-                                <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                                % endif
-                            </div>
-                        </a>
-                        % if media_type == 'artist':
-                        <div class="item-children-instance-text-wrapper cover-item">
-                            <h3>
-                                 <a href="${page('info', child['rating_key'])}" title="${child['title']}">${child['title']}</a>
-                            </h3>
-                        </div>
-                        % elif media_type == 'album':
-                        <div class="item-children-instance-text-wrapper cover-item">
-                            <h3>
-                                 <a href="${page('info', child['parent_rating_key'])}" title="${child['parent_title']}">${child['parent_title']}</a>
-                            </h3>
-                            <h3>
-                                 <a href="${page('info', child['rating_key'])}" title="${child['title']}">${child['title']}</a>
-                            </h3>
-                        </div>
-                        % else:
-                        <div class="item-children-instance-text-wrapper poster-item">
-                            <h3>
-                                 <a href="${page('info', child['rating_key'])}" title="${child['title']}">${child['title']}</a>
-                            </h3>
-                            <h3 class="text-muted">${child['year']}</h3>
-                        </div>
-                        % endif
-                    </li>
-                    % endfor
-                </ul>
-            </div>
-        </div>
-    </div>
-</div>
-% endif
-% endfor
-% endif
diff --git a/data/interfaces/default/info_search_results_list.html b/data/interfaces/default/info_search_results_list.html
index e368efde..bd09e068 100644
--- a/data/interfaces/default/info_search_results_list.html
+++ b/data/interfaces/default/info_search_results_list.html
@@ -35,8 +35,8 @@ duration                Returns the standard runtime of the media.
 content_rating          Returns the age rating for the media.
 summary                 Returns a brief description of the media plot.
 grandparent_title       Returns the name of the show, or artist.
-parent_media_index      Returns the index number of the season.
-media_index             Returns the index number of the episode, or track.
+parent_index            Returns the index number of the season.
+index                   Returns the index number of the episode, or track.
 parent_thumb            Returns the location of the item's thumbnail. Use with pms_image_proxy.
 writers                 Returns an array of writers.
 thumb                   Returns the location of the item's thumbnail. Use with pms_image_proxy.
@@ -53,35 +53,7 @@ DOCUMENTATION :: END
 </%doc>
 
 % if data != None:
-<%
-    from plexpy.helpers import page, short_season
-%>
 % if data['results_count'] > 0:
-% if 'collection' in data['results_list'] and data['results_list']['collection']:
-<div class="item-children-wrapper">
-    <div class="item-children-section-title">
-        <h4>Collections</h4>
-    </div>
-    <ul class="item-children-instance list-unstyled">
-        % for child in data['results_list']['collection']:
-        <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
-                <div class="item-children-poster">
-                    <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')});"></div>
-                    % if _session['user_group'] == 'admin':
-                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                    % endif
-                </div>
-                <div class="item-children-instance-text-wrapper poster-item">
-                    <h3 title="${child['title']}">${child['title']}</h3>
-                    <h3 class="text-muted">${child['min_year']} - ${child['max_year']}</h3>
-                </div>
-            </a>
-        </li>
-        % endfor
-    </ul>
-</div>
-% endif
 % if 'movie' in data['results_list'] and data['results_list']['movie']:
 <div class="item-children-wrapper">
     <div class="item-children-section-title">
@@ -90,14 +62,11 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['movie']:
         <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
+            <a href="info?item_id=${child['rating_key']}" id="${child['rating_key']}">
                 <div class="item-children-poster">
-                    <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')});"></div>
-                    % if _session['user_group'] == 'admin':
-                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                    % endif
+                    <div class="item-children-poster-face season-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=450);"></div>
                 </div>
-                <div class="item-children-instance-text-wrapper poster-item">
+                <div class="item-children-instance-text-wrapper season-item">
                     <h3 title="${child['title']}">${child['title']}</h3>
                     <h3 class="text-muted">${child['year']}</h3>
                 </div>
@@ -115,14 +84,11 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['show']:
         <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
+            <a href="info?item_id=${child['rating_key']}" id="${child['rating_key']}">
                 <div class="item-children-poster">
-                    <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')});"></div>
-                    % if _session['user_group'] == 'admin':
-                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                    % endif
+                    <div class="item-children-poster-face season-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=450);"></div>
                 </div>
-                <div class="item-children-instance-text-wrapper poster-item">
+                <div class="item-children-instance-text-wrapper season-item">
                     <h3 title="${child['title']}">${child['title']}</h3>
                     <h3 class="text-muted">${child['year']}</h3>
                 </div>
@@ -140,16 +106,13 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['season']:
         <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
+            <a href="info?item_id=${child['rating_key']}" id="${child['rating_key']}">
                 <div class="item-children-poster">
-                    <div class="item-children-poster-face poster-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 450, fallback='poster')});"></div>
-                    % if _session['user_group'] == 'admin':
-                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                    % endif
+                    <div class="item-children-poster-face season-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=450);"></div>
                 </div>
-                <div class="item-children-instance-text-wrapper poster-item">
+                <div class="item-children-instance-text-wrapper season-item">
                     <h3 title="${child['parent_title']}">${child['parent_title']}</h3>
-                    <h3 class="text-muted">${short_season(child['title'])}</h3>
+                    <h3 class="text-muted">S${child['index']}</h3>
                 </div>
             </a>
         </li>
@@ -165,17 +128,14 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['episode']:
         <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
+            <a href="info?item_id=${child['rating_key']}" id="${child['rating_key']}">
                 <div class="item-children-poster">
-                    <div class="item-children-poster-face episode-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 500, 280, fallback='art')});"></div>
-                    % if _session['user_group'] == 'admin':
-                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                    % endif
+                    <div class="item-children-poster-face episode-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=450);"></div>
                 </div>
                 <div class="item-children-instance-text-wrapper episode-item">
                     <h3 title="${child['grandparent_title']}">${child['grandparent_title']}</h3>
                     <h3 title="${child['title']}">${child['title']}</h3>
-                    <h3 class="text-muted">${short_season(child['parent_title'])} &middot; E${child['media_index']}</h3>
+                    <h3 class="text-muted">S${child['parent_index']} &middot; E${child['index']}</h3>
                 </div>
             </a>
         </li>
@@ -191,14 +151,11 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['artist']:
         <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
+            <a href="info?item_id=${child['rating_key']}" id="${child['rating_key']}">
                 <div class="item-children-poster">
-                    <div class="item-children-poster-face cover-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover')});"></div>
-                    % if _session['user_group'] == 'admin':
-                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                    % endif
+                    <div class="item-children-poster-face album-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=300);"></div>
                 </div>
-                <div class="item-children-instance-text-wrapper cover-item">
+                <div class="item-children-instance-text-wrapper album-item">
                     <h3 title="${child['title']}">${child['title']}</h3>
                 </div>
             </a>
@@ -215,14 +172,11 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['album']:
         <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
+            <a href="info?item_id=${child['rating_key']}" id="${child['rating_key']}">
                 <div class="item-children-poster">
-                    <div class="item-children-poster-face cover-item" style="background-image: url(${page('pms_image_proxy', child['thumb'], child['rating_key'], 300, 300, fallback='cover')});"></div>
-                    % if _session['user_group'] == 'admin':
-                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                    % endif
+                    <div class="item-children-poster-face album-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=300);"></div>
                 </div>
-                <div class="item-children-instance-text-wrapper cover-item">
+                <div class="item-children-instance-text-wrapper album-item">
                     <h3 title="${child['parent_title']}">${child['parent_title']}</h3>
                     <h3 title="${child['title']}">${child['title']}</h3>
                 </div>
@@ -240,21 +194,18 @@ DOCUMENTATION :: END
     <ul class="item-children-instance list-unstyled">
         % for child in data['results_list']['track']:
         <li>
-            <a href="${page('info', child['rating_key'])}" data-rating_key="${child['rating_key']}" data-library_name="${child['library_name']}">
+            <a href="info?item_id=${child['rating_key']}" id="${child['rating_key']}">
                 <div class="item-children-poster">
-                    <div class="item-children-poster-face cover-item" style="background-image: url(${page('pms_image_proxy', child['parent_thumb'], child['parent_rating_key'], 300, 300, fallback='cover')});">
+                    <div class="item-children-poster-face album-poster" style="background-image: url(pms_image_proxy?img=${child['parent_thumb']}&width=300&height=300);">
                         <div class="item-children-card-overlay">
                             <div class="item-children-overlay-text">
-                                Track ${child['media_index']}
+                                Track ${child['index']}
                             </div>
                         </div>
                     </div>
-                    % if _session['user_group'] == 'admin':
-                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                    % endif
                 </div>
-                <div class="item-children-instance-text-wrapper cover-item">
-                    <h3 title="${child['original_title'] or child['grandparent_title']}">${child['original_title'] or child['grandparent_title']}</h3>
+                <div class="item-children-instance-text-wrapper album-item">
+                    <h3 title="${child['grandparent_title']}">${child['grandparent_title']}</h3>
                     <h3 title="${child['title']}">${child['title']}</h3>
                     <h3 title="${child['parent_title']}" class="text-muted">${child['parent_title']}</h3>
                 </div>
diff --git a/data/interfaces/default/ip_address_modal.html b/data/interfaces/default/ip_address_modal.html
index 239b95e2..d05eec64 100644
--- a/data/interfaces/default/ip_address_modal.html
+++ b/data/interfaces/default/ip_address_modal.html
@@ -3,164 +3,69 @@
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
             <h4 class="modal-title" id="myModalLabel">
+                % if data:
                 <strong><span id="modal_header_ip_address">
-                    % if data:
-                    <i class="fa fa-map-marker"></i> IP Address: ${data}
-                    % else:
-                    <i class="fa fa-exclamation-circle"></i> Invalid IP Address
-                    % endif
+                    <i class="fa fa-spin fa-refresh"></i>&nbspLoading Details...
                 </span></strong>
+                % else:
+                <i class="fa fa-exclamation-circle"></i>&nbspInvalid IP Address</span></strong>
+                % endif
             </h4>
         </div>
         <div class="modal-body" id="modal-text">
-            % if kwargs:
-            <div class="col-sm-12">
-                <h4>
-                    <strong>Connection Details</strong>
-                </h4>
-            </div>
-            <div class="col-sm-12">
+            <div class="col-md-6">
+                <h4><strong>Location Details</strong></h4>
                 <ul class="list-unstyled">
-                    <% icon = {'0': 'times', '1': 'check'} %>
-                    <li>Location: <strong>${(kwargs['location'] or 'unknown').upper()}</strong></li>
-                    <li>Secure Connection: <i class="fa fa-${icon.get(kwargs['secure'], 'question')}"></i></li>
-                    <li>Plex Relay: <i class="fa fa-${icon.get(kwargs['relayed'], 'question')}"></i></li>
-                </ul>
-            </div>
-            % endif
-            % if public:
-            <div class="col-sm-12">
-                <h4>
-                    <strong>Geolocation Lookup</strong>
-                    % if data:
-                    <span id="ip_loading" style="padding-left: 5px;"><i class="fa fa-refresh fa-spin"></i></span>
-                    % endif
-                </h4>
-            </div>
-            <div id="ip_error" class="col-sm-12 text-muted"></div>
-            <div class="col-sm-6">
-                <ul class="list-unstyled">
-                    <li>Continent: <strong><span id="continent"></span></strong></li>
                     <li>Country: <strong><span id="country"></span></strong></li>
-                    <li>Region: <strong><span id="region"></span></strong></li>
                     <li>City: <strong><span id="city"></span></strong></li>
-                    <li>Postal Code: <strong><span id="postal_code"></span></strong></li>
-                </ul>
-            </div>
-            <div class="col-sm-6">
-                <ul class="list-unstyled">
+                    <li>Region: <strong><span id="region"></span></strong></li>
                     <li>Timezone: <strong><span id="timezone"></span></strong></li>
-                    <li>Latitude: <strong><span id="latitude"></span></strong></li>
-                    <li>Longitude: <strong><span id="longitude"></span></strong></li>
+                    <li>Latitude: <strong><span id="lat"></span></strong></li>
+                    <li>Longitude: <strong><span id="lon"></span></strong></li>
                 </ul>
             </div>
-            <div class="col-sm-12">
-                <h4>
-                    <strong>Whois Lookup</strong>
-                    % if data:
-                    <span id="isp_loading" style="padding-left: 5px;"><i class="fa fa-refresh fa-spin"></i></span>
-                    % endif
-                </h4>
-            </div>
-            <div id="isp_error" class="col-sm-12 text-muted"></div>
-            <div class="col-sm-12">
+            <div class="col-md-6">
+                <h4><strong>Connection Details</strong></h4>
                 <ul class="list-unstyled">
-                    <li>Host: <strong><span id="isp_host"></span></strong></li>
+                    <li>ISP: <strong><span id="isp"></span></strong></li>
+                    <li>Organization: <strong><span id="org"></span></strong></li>
+                    <li>AS: <strong><span id="as"></span></strong></li>
                 </ul>
             </div>
-            <div class="col-sm-6" id="isp_instance">
-                <ul class="list-unstyled">
-                    <li>ISP: <strong><span id="isp_name"></span></strong></li>
-                    <li>Address: <strong><span id="isp_address"></span></strong></li>
-                </ul>
-            </div>
-            % endif
         </div>
         <div class="modal-footer">
-            % if data == '127.0.0.1' and kwargs.get('location') == 'wan':
-            <div style="float: right;"><span class="text-muted" id="rquote">We've traced the call. It's coming from inside the house!</span></div>
-            % endif
+            <span class="text-muted">Service provided by ip-api.com.</span>
         </div>
     </div>
 </div>
 
-% if data and public:
+% if data:
 <script>
     function getUserLocation(ip_address) {
         $.ajax({
-            url: 'get_geoip_lookup',
-            type: 'GET',
-            data: { ip_address: ip_address },
+            url: 'http://ip-api.com/json/' + ip_address,
             cache: true,
             async: true,
-            complete: function () {
-                $('#ip_loading').remove();
-            },
-            error: function () {
-                $('#ip_error').html('<i class="fa fa-exclamation-circle"></i> Internal request failed.').show();
-            },
-            success: function (result) {
-                if (result.result === 'error') {
-                    $('#ip_error').html('<i class="fa fa-exclamation-circle"></i> ' + result.message).show();
-                } else {
-                    var data = result.data;
-                    $('#continent').html(data.continent);
-                    $('#country').html(data.country);
-                    $('#region').html(data.region);
-                    $('#city').html(data.city);
-                    $('#postal_code').html(data.postal_code);
-                    $('#timezone').html(data.timezone);
-                    $('#latitude').html(data.latitude);
-                    $('#longitude').html(data.longitude);
-                }
-            }
-        });
-    }
-
-    function getUserConnection(ip_address) {
-        $.ajax({
-            url: 'get_whois_lookup',
             type: 'GET',
-            data: { ip_address: ip_address },
-            cache: true,
-            async: true,
-            complete: function () {
-                $('#isp_loading').remove();
+            dataType: 'json',
+            error: function(){
+                $('#modal_header_ip_address').html("Request failed. Server may be too busy.");
             },
-            error: function () {
-                $('#isp_error').html('<i class="fa fa-exclamation-circle"></i> Internal request failed.').show();
+            success: function(data) {
+                $('#modal_header_ip_address').html('<i class="fa fa-map-marker"></i> IP Address: ' + ip_address);
+                $('#country').html(data.country);
+                $('#city').html(data.city);
+                $('#region').html(data.regionName);
+                $('#timezone').html(data.timezone);
+                $('#lat').html(data.lat);
+                $('#lon').html(data.lon);
+                $('#isp').html(data.isp);
+                $('#org').html(data.org);
+                $('#as').html(data.as);
             },
-            success: function (data) {
-                $('#isp_host').html(data.host);
-                if ('error' in data) {
-                    $('#isp_error').html('<i class="fa fa-exclamation-circle"></i> ' + data.error).show();
-                } else if (data.nets.length) {
-                    $('#isp_instance').remove();
-                    $.each(data.nets, function (index, net) {
-                        var s = '';
-                        if (net.city || net.state || net.postal_code) {
-                            s = (net.city && net.state) ? net.city + ', ' + net.state : net.city || net.state || '';
-                            s = (s && net.postal_code) ? s + '&nbsp;&nbsp;' + net.postal_code : s || net.postal_code || '';
-                        }
-                        s = (s) ? '<strong>' + s + '</strong><br />' : s;
-                        $('#modal-text').append('<div class="col-sm-6"> \
-                            <ul class="list-unstyled"> \
-                                <li>ISP: <strong>' + net.description + '</strong></li> \
-                                <li><span style="float: left;">Address:&nbsp;</span> \
-                                    <span style="float: left;"><strong>' + net.address + '</strong><br />' + s +
-                                        '<strong>' + net.country + '</strong></span> \
-                                </li> \
-                            </ul> \
-                        </div>')
-                    });
-                } else {
-                    $('#isp_name, #isp_address').html("Not available");
-                }
-            }
+            timeout: 5000
         });
     }
-
     getUserLocation('${data}');
-    getUserConnection('${data}');
 </script>
 % endif
\ No newline at end of file
diff --git a/data/interfaces/default/js/Sortable.min.js b/data/interfaces/default/js/Sortable.min.js
deleted file mode 100644
index e95d2a30..00000000
--- a/data/interfaces/default/js/Sortable.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! Sortable 1.4.2 - MIT | git://github.com/rubaxa/Sortable.git */
-!function(a){"use strict";"function"==typeof define&&define.amd?define(a):"undefined"!=typeof module&&"undefined"!=typeof module.exports?module.exports=a():"undefined"!=typeof Package?Sortable=a():window.Sortable=a()}(function(){"use strict";function a(a,b){if(!a||!a.nodeType||1!==a.nodeType)throw"Sortable: `el` must be HTMLElement, and not "+{}.toString.call(a);this.el=a,this.options=b=r({},b),a[L]=this;var c={group:Math.random(),sort:!0,disabled:!1,store:null,handle:null,scroll:!0,scrollSensitivity:30,scrollSpeed:10,draggable:/[uo]l/i.test(a.nodeName)?"li":">*",ghostClass:"sortable-ghost",chosenClass:"sortable-chosen",ignore:"a, img",filter:null,animation:0,setData:function(a,b){a.setData("Text",b.textContent)},dropBubble:!1,dragoverBubble:!1,dataIdAttr:"data-id",delay:0,forceFallback:!1,fallbackClass:"sortable-fallback",fallbackOnBody:!1};for(var d in c)!(d in b)&&(b[d]=c[d]);V(b);for(var f in this)"_"===f.charAt(0)&&(this[f]=this[f].bind(this));this.nativeDraggable=b.forceFallback?!1:P,e(a,"mousedown",this._onTapStart),e(a,"touchstart",this._onTapStart),this.nativeDraggable&&(e(a,"dragover",this),e(a,"dragenter",this)),T.push(this._onDragOver),b.store&&this.sort(b.store.get(this))}function b(a){v&&v.state!==a&&(h(v,"display",a?"none":""),!a&&v.state&&w.insertBefore(v,s),v.state=a)}function c(a,b,c){if(a){c=c||N,b=b.split(".");var d=b.shift().toUpperCase(),e=new RegExp("\\s("+b.join("|")+")(?=\\s)","g");do if(">*"===d&&a.parentNode===c||(""===d||a.nodeName.toUpperCase()==d)&&(!b.length||((" "+a.className+" ").match(e)||[]).length==b.length))return a;while(a!==c&&(a=a.parentNode))}return null}function d(a){a.dataTransfer&&(a.dataTransfer.dropEffect="move"),a.preventDefault()}function e(a,b,c){a.addEventListener(b,c,!1)}function f(a,b,c){a.removeEventListener(b,c,!1)}function g(a,b,c){if(a)if(a.classList)a.classList[c?"add":"remove"](b);else{var d=(" "+a.className+" ").replace(K," ").replace(" "+b+" "," ");a.className=(d+(c?" "+b:"")).replace(K," ")}}function h(a,b,c){var d=a&&a.style;if(d){if(void 0===c)return N.defaultView&&N.defaultView.getComputedStyle?c=N.defaultView.getComputedStyle(a,""):a.currentStyle&&(c=a.currentStyle),void 0===b?c:c[b];b in d||(b="-webkit-"+b),d[b]=c+("string"==typeof c?"":"px")}}function i(a,b,c){if(a){var d=a.getElementsByTagName(b),e=0,f=d.length;if(c)for(;f>e;e++)c(d[e],e);return d}return[]}function j(a,b,c,d,e,f,g){var h=N.createEvent("Event"),i=(a||b[L]).options,j="on"+c.charAt(0).toUpperCase()+c.substr(1);h.initEvent(c,!0,!0),h.to=b,h.from=e||b,h.item=d||b,h.clone=v,h.oldIndex=f,h.newIndex=g,b.dispatchEvent(h),i[j]&&i[j].call(a,h)}function k(a,b,c,d,e,f){var g,h,i=a[L],j=i.options.onMove;return g=N.createEvent("Event"),g.initEvent("move",!0,!0),g.to=b,g.from=a,g.dragged=c,g.draggedRect=d,g.related=e||b,g.relatedRect=f||b.getBoundingClientRect(),a.dispatchEvent(g),j&&(h=j.call(i,g)),h}function l(a){a.draggable=!1}function m(){R=!1}function n(a,b){var c=a.lastElementChild,d=c.getBoundingClientRect();return(b.clientY-(d.top+d.height)>5||b.clientX-(d.right+d.width)>5)&&c}function o(a){for(var b=a.tagName+a.className+a.src+a.href+a.textContent,c=b.length,d=0;c--;)d+=b.charCodeAt(c);return d.toString(36)}function p(a){var b=0;if(!a||!a.parentNode)return-1;for(;a&&(a=a.previousElementSibling);)"TEMPLATE"!==a.nodeName.toUpperCase()&&b++;return b}function q(a,b){var c,d;return function(){void 0===c&&(c=arguments,d=this,setTimeout(function(){1===c.length?a.call(d,c[0]):a.apply(d,c),c=void 0},b))}}function r(a,b){if(a&&b)for(var c in b)b.hasOwnProperty(c)&&(a[c]=b[c]);return a}var s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J={},K=/\s+/g,L="Sortable"+(new Date).getTime(),M=window,N=M.document,O=M.parseInt,P=!!("draggable"in N.createElement("div")),Q=function(a){return a=N.createElement("x"),a.style.cssText="pointer-events:auto","auto"===a.style.pointerEvents}(),R=!1,S=Math.abs,T=([].slice,[]),U=q(function(a,b,c){if(c&&b.scroll){var d,e,f,g,h=b.scrollSensitivity,i=b.scrollSpeed,j=a.clientX,k=a.clientY,l=window.innerWidth,m=window.innerHeight;if(z!==c&&(y=b.scroll,z=c,y===!0)){y=c;do if(y.offsetWidth<y.scrollWidth||y.offsetHeight<y.scrollHeight)break;while(y=y.parentNode)}y&&(d=y,e=y.getBoundingClientRect(),f=(S(e.right-j)<=h)-(S(e.left-j)<=h),g=(S(e.bottom-k)<=h)-(S(e.top-k)<=h)),f||g||(f=(h>=l-j)-(h>=j),g=(h>=m-k)-(h>=k),(f||g)&&(d=M)),(J.vx!==f||J.vy!==g||J.el!==d)&&(J.el=d,J.vx=f,J.vy=g,clearInterval(J.pid),d&&(J.pid=setInterval(function(){d===M?M.scrollTo(M.pageXOffset+f*i,M.pageYOffset+g*i):(g&&(d.scrollTop+=g*i),f&&(d.scrollLeft+=f*i))},24)))}},30),V=function(a){var b=a.group;b&&"object"==typeof b||(b=a.group={name:b}),["pull","put"].forEach(function(a){a in b||(b[a]=!0)}),a.groups=" "+b.name+(b.put.join?" "+b.put.join(" "):"")+" "};return a.prototype={constructor:a,_onTapStart:function(a){var b=this,d=this.el,e=this.options,f=a.type,g=a.touches&&a.touches[0],h=(g||a).target,i=h,k=e.filter;if(!("mousedown"===f&&0!==a.button||e.disabled)&&(h=c(h,e.draggable,d))){if(D=p(h),"function"==typeof k){if(k.call(this,a,h,this))return j(b,i,"filter",h,d,D),void a.preventDefault()}else if(k&&(k=k.split(",").some(function(a){return a=c(i,a.trim(),d),a?(j(b,a,"filter",h,d,D),!0):void 0})))return void a.preventDefault();(!e.handle||c(i,e.handle,d))&&this._prepareDragStart(a,g,h)}},_prepareDragStart:function(a,b,c){var d,f=this,h=f.el,j=f.options,k=h.ownerDocument;c&&!s&&c.parentNode===h&&(G=a,w=h,s=c,t=s.parentNode,x=s.nextSibling,F=j.group,d=function(){f._disableDelayedDrag(),s.draggable=!0,g(s,f.options.chosenClass,!0),f._triggerDragStart(b)},j.ignore.split(",").forEach(function(a){i(s,a.trim(),l)}),e(k,"mouseup",f._onDrop),e(k,"touchend",f._onDrop),e(k,"touchcancel",f._onDrop),j.delay?(e(k,"mouseup",f._disableDelayedDrag),e(k,"touchend",f._disableDelayedDrag),e(k,"touchcancel",f._disableDelayedDrag),e(k,"mousemove",f._disableDelayedDrag),e(k,"touchmove",f._disableDelayedDrag),f._dragStartTimer=setTimeout(d,j.delay)):d())},_disableDelayedDrag:function(){var a=this.el.ownerDocument;clearTimeout(this._dragStartTimer),f(a,"mouseup",this._disableDelayedDrag),f(a,"touchend",this._disableDelayedDrag),f(a,"touchcancel",this._disableDelayedDrag),f(a,"mousemove",this._disableDelayedDrag),f(a,"touchmove",this._disableDelayedDrag)},_triggerDragStart:function(a){a?(G={target:s,clientX:a.clientX,clientY:a.clientY},this._onDragStart(G,"touch")):this.nativeDraggable?(e(s,"dragend",this),e(w,"dragstart",this._onDragStart)):this._onDragStart(G,!0);try{N.selection?N.selection.empty():window.getSelection().removeAllRanges()}catch(b){}},_dragStarted:function(){w&&s&&(g(s,this.options.ghostClass,!0),a.active=this,j(this,w,"start",s,w,D))},_emulateDragOver:function(){if(H){if(this._lastX===H.clientX&&this._lastY===H.clientY)return;this._lastX=H.clientX,this._lastY=H.clientY,Q||h(u,"display","none");var a=N.elementFromPoint(H.clientX,H.clientY),b=a,c=" "+this.options.group.name,d=T.length;if(b)do{if(b[L]&&b[L].options.groups.indexOf(c)>-1){for(;d--;)T[d]({clientX:H.clientX,clientY:H.clientY,target:a,rootEl:b});break}a=b}while(b=b.parentNode);Q||h(u,"display","")}},_onTouchMove:function(b){if(G){a.active||this._dragStarted(),this._appendGhost();var c=b.touches?b.touches[0]:b,d=c.clientX-G.clientX,e=c.clientY-G.clientY,f=b.touches?"translate3d("+d+"px,"+e+"px,0)":"translate("+d+"px,"+e+"px)";I=!0,H=c,h(u,"webkitTransform",f),h(u,"mozTransform",f),h(u,"msTransform",f),h(u,"transform",f),b.preventDefault()}},_appendGhost:function(){if(!u){var a,b=s.getBoundingClientRect(),c=h(s),d=this.options;u=s.cloneNode(!0),g(u,d.ghostClass,!1),g(u,d.fallbackClass,!0),h(u,"top",b.top-O(c.marginTop,10)),h(u,"left",b.left-O(c.marginLeft,10)),h(u,"width",b.width),h(u,"height",b.height),h(u,"opacity","0.8"),h(u,"position","fixed"),h(u,"zIndex","100000"),h(u,"pointerEvents","none"),d.fallbackOnBody&&N.body.appendChild(u)||w.appendChild(u),a=u.getBoundingClientRect(),h(u,"width",2*b.width-a.width),h(u,"height",2*b.height-a.height)}},_onDragStart:function(a,b){var c=a.dataTransfer,d=this.options;this._offUpEvents(),"clone"==F.pull&&(v=s.cloneNode(!0),h(v,"display","none"),w.insertBefore(v,s)),b?("touch"===b?(e(N,"touchmove",this._onTouchMove),e(N,"touchend",this._onDrop),e(N,"touchcancel",this._onDrop)):(e(N,"mousemove",this._onTouchMove),e(N,"mouseup",this._onDrop)),this._loopId=setInterval(this._emulateDragOver,50)):(c&&(c.effectAllowed="move",d.setData&&d.setData.call(this,c,s)),e(N,"drop",this),setTimeout(this._dragStarted,0))},_onDragOver:function(a){var d,e,f,g=this.el,i=this.options,j=i.group,l=j.put,o=F===j,p=i.sort;if(void 0!==a.preventDefault&&(a.preventDefault(),!i.dragoverBubble&&a.stopPropagation()),I=!0,F&&!i.disabled&&(o?p||(f=!w.contains(s)):F.pull&&l&&(F.name===j.name||l.indexOf&&~l.indexOf(F.name)))&&(void 0===a.rootEl||a.rootEl===this.el)){if(U(a,i,this.el),R)return;if(d=c(a.target,i.draggable,g),e=s.getBoundingClientRect(),f)return b(!0),void(v||x?w.insertBefore(s,v||x):p||w.appendChild(s));if(0===g.children.length||g.children[0]===u||g===a.target&&(d=n(g,a))){if(d){if(d.animated)return;r=d.getBoundingClientRect()}b(o),k(w,g,s,e,d,r)!==!1&&(s.contains(g)||(g.appendChild(s),t=g),this._animate(e,s),d&&this._animate(r,d))}else if(d&&!d.animated&&d!==s&&void 0!==d.parentNode[L]){A!==d&&(A=d,B=h(d),C=h(d.parentNode));var q,r=d.getBoundingClientRect(),y=r.right-r.left,z=r.bottom-r.top,D=/left|right|inline/.test(B.cssFloat+B.display)||"flex"==C.display&&0===C["flex-direction"].indexOf("row"),E=d.offsetWidth>s.offsetWidth,G=d.offsetHeight>s.offsetHeight,H=(D?(a.clientX-r.left)/y:(a.clientY-r.top)/z)>.5,J=d.nextElementSibling,K=k(w,g,s,e,d,r);if(K!==!1){if(R=!0,setTimeout(m,30),b(o),1===K||-1===K)q=1===K;else if(D){var M=s.offsetTop,N=d.offsetTop;q=M===N?d.previousElementSibling===s&&!E||H&&E:N>M}else q=J!==s&&!G||H&&G;s.contains(g)||(q&&!J?g.appendChild(s):d.parentNode.insertBefore(s,q?J:d)),t=s.parentNode,this._animate(e,s),this._animate(r,d)}}}},_animate:function(a,b){var c=this.options.animation;if(c){var d=b.getBoundingClientRect();h(b,"transition","none"),h(b,"transform","translate3d("+(a.left-d.left)+"px,"+(a.top-d.top)+"px,0)"),b.offsetWidth,h(b,"transition","all "+c+"ms"),h(b,"transform","translate3d(0,0,0)"),clearTimeout(b.animated),b.animated=setTimeout(function(){h(b,"transition",""),h(b,"transform",""),b.animated=!1},c)}},_offUpEvents:function(){var a=this.el.ownerDocument;f(N,"touchmove",this._onTouchMove),f(a,"mouseup",this._onDrop),f(a,"touchend",this._onDrop),f(a,"touchcancel",this._onDrop)},_onDrop:function(b){var c=this.el,d=this.options;clearInterval(this._loopId),clearInterval(J.pid),clearTimeout(this._dragStartTimer),f(N,"mousemove",this._onTouchMove),this.nativeDraggable&&(f(N,"drop",this),f(c,"dragstart",this._onDragStart)),this._offUpEvents(),b&&(I&&(b.preventDefault(),!d.dropBubble&&b.stopPropagation()),u&&u.parentNode.removeChild(u),s&&(this.nativeDraggable&&f(s,"dragend",this),l(s),g(s,this.options.ghostClass,!1),g(s,this.options.chosenClass,!1),w!==t?(E=p(s),E>=0&&(j(null,t,"sort",s,w,D,E),j(this,w,"sort",s,w,D,E),j(null,t,"add",s,w,D,E),j(this,w,"remove",s,w,D,E))):(v&&v.parentNode.removeChild(v),s.nextSibling!==x&&(E=p(s),E>=0&&(j(this,w,"update",s,w,D,E),j(this,w,"sort",s,w,D,E)))),a.active&&((null===E||-1===E)&&(E=D),j(this,w,"end",s,w,D,E),this.save())),w=s=t=u=x=v=y=z=G=H=I=E=A=B=F=a.active=null)},handleEvent:function(a){var b=a.type;"dragover"===b||"dragenter"===b?s&&(this._onDragOver(a),d(a)):("drop"===b||"dragend"===b)&&this._onDrop(a)},toArray:function(){for(var a,b=[],d=this.el.children,e=0,f=d.length,g=this.options;f>e;e++)a=d[e],c(a,g.draggable,this.el)&&b.push(a.getAttribute(g.dataIdAttr)||o(a));return b},sort:function(a){var b={},d=this.el;this.toArray().forEach(function(a,e){var f=d.children[e];c(f,this.options.draggable,d)&&(b[a]=f)},this),a.forEach(function(a){b[a]&&(d.removeChild(b[a]),d.appendChild(b[a]))})},save:function(){var a=this.options.store;a&&a.set(this)},closest:function(a,b){return c(a,b||this.options.draggable,this.el)},option:function(a,b){var c=this.options;return void 0===b?c[a]:(c[a]=b,void("group"===a&&V(c)))},destroy:function(){var a=this.el;a[L]=null,f(a,"mousedown",this._onTapStart),f(a,"touchstart",this._onTapStart),this.nativeDraggable&&(f(a,"dragover",this),f(a,"dragenter",this)),Array.prototype.forEach.call(a.querySelectorAll("[draggable]"),function(a){a.removeAttribute("draggable")}),T.splice(T.indexOf(this._onDragOver),1),this._onDrop(),this.el=a=null}},a.utils={on:e,off:f,css:h,find:i,is:function(a,b){return!!c(a,b,a)},extend:r,throttle:q,closest:c,toggleClass:g,index:p},a.create=function(b,c){return new a(b,c)},a.version="1.4.2",a});
\ No newline at end of file
diff --git a/data/interfaces/default/js/ajaxNotifications.js b/data/interfaces/default/js/ajaxNotifications.js
deleted file mode 100644
index 1dfa62e3..00000000
--- a/data/interfaces/default/js/ajaxNotifications.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Taken from https://github.com/SickRage/SickRage
-
-PNotify.prototype.options.addclass = "stack-bottomright";
-PNotify.prototype.options.buttons.closer_hover = false;
-PNotify.prototype.options.desktop = { desktop: true, icon: 'images/logo-circle.png' };
-PNotify.prototype.options.history = false;
-PNotify.prototype.options.shadow = false;
-PNotify.prototype.options.stack = { dir1: 'up', dir2: 'left', firstpos1: 25, firstpos2: 25 };
-PNotify.prototype.options.styling = 'fontawesome';
-PNotify.prototype.options.type = 'notice';
-PNotify.prototype.options.width = '340px';
-
-function displayPNotify(title, message) {
-    var notification = new PNotify({
-        title: title,
-        text: message
-    });
-}
-
-function check_notifications() {
-    $.getJSON('get_browser_notifications', function (data) {
-        if (data) {
-            $.each(data, function (i, notification) {
-                if (notification.delay === 0) {
-                    PNotify.prototype.options.hide = false;
-                } else {
-                    PNotify.prototype.options.hide = true;
-                    PNotify.prototype.options.delay = notification.delay * 1000;
-                }
-                displayPNotify(notification.subject_text, notification.body_text);
-            });
-        }
-    });
-    setTimeout(function () {
-        "use strict";
-        check_notifications();
-    }, 5000);
-}
diff --git a/data/interfaces/default/js/blurhash_pure_js_port.min.js b/data/interfaces/default/js/blurhash_pure_js_port.min.js
deleted file mode 100644
index f48514f4..00000000
--- a/data/interfaces/default/js/blurhash_pure_js_port.min.js
+++ /dev/null
@@ -1 +0,0 @@
-const blurhash=function(t){const e=["0","1","2","3","4","5","6","7","8","9","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","#","$","%","*","+",",","-",".",":",";","=","?","@","[","]","^","_","{","|","}","~"],a=t=>{let a=0;for(let r=0;r<t.length;r++){const o=t[r];a=83*a+e.indexOf(o)}return a},r=(t,a)=>{var r="";for(let o=1;o<=a;o++){let h=Math.floor(t)/Math.pow(83,a-o)%83;r+=e[Math.floor(h)]}return r},o=t=>{let e=t/255;return e<=.04045?e/12.92:Math.pow((e+.055)/1.055,2.4)},h=t=>{let e=Math.max(0,Math.min(1,t));return e<=.0031308?Math.round(12.92*e*255+.5):Math.round(255*(1.055*Math.pow(e,1/2.4)-.055)+.5)},n=(t,e)=>(t=>t<0?-1:1)(t)*Math.pow(Math.abs(t),e),l=t=>{if(!t||t.length<6)throw new Error("The blurhash string must be at least 6 characters");const e=a(t[0]),r=Math.floor(e/9)+1,o=e%9+1;if(t.length!==4+2*o*r)throw new Error(`blurhash length mismatch: length is ${t.length} but it should be ${4+2*o*r}`)},s=t=>{const e=t>>8&255,a=255&t;return[o(t>>16),o(e),o(a)]},m=(t,e)=>{const a=Math.floor(t/361),r=Math.floor(t/19)%19,o=t%19;return[n((a-9)/9,2)*e,n((r-9)/9,2)*e,n((o-9)/9,2)*e]},c=(t,e,a,r)=>{let h=0,n=0,l=0;const s=4*e;for(let m=0;m<e;m++)for(let e=0;e<a;e++){const a=r(m,e);h+=a*o(t[4*m+0+e*s]),n+=a*o(t[4*m+1+e*s]),l+=a*o(t[4*m+2+e*s])}let m=1/(e*a);return[h*m,n*m,l*m]};return t.decodePromise=((e,a,r,o=1)=>new Promise((h,n)=>{h(t.decode(e,a,r,o))})),t.decode=((t,e,r,o=1)=>{l(t),o|=1;const n=a(t[0]),c=Math.floor(n/9)+1,i=n%9+1,M=(a(t[1])+1)/166,g=new Array(i*c);for(let e=0;e<g.length;e++)if(0===e){const r=a(t.substring(2,6));g[e]=s(r)}else{const r=a(t.substring(4+2*e,6+2*e));g[e]=m(r,M*o)}const f=4*e,d=new Uint8ClampedArray(f*r);for(let t=0;t<r;t++)for(let a=0;a<e;a++){let o=0,n=0,l=0;for(let h=0;h<c;h++)for(let s=0;s<i;s++){const m=Math.cos(Math.PI*a*s/e)*Math.cos(Math.PI*t*h/r);let c=g[s+h*i];o+=c[0]*m,n+=c[1]*m,l+=c[2]*m}let s=h(o),m=h(n),M=h(l);d[4*a+0+t*f]=s,d[4*a+1+t*f]=m,d[4*a+2+t*f]=M,d[4*a+3+t*f]=255}return d}),t.encodePromise=((e,a,r,o,h)=>new Promise((n,l)=>{n(t.encode(e,a,r,o,h))})),t.encode=((t,e,a,o,l)=>{if(o<1||o>9||l<1||l>9)throw new Error("BlurHash must have between 1 and 9 components");if(e*a*4!==t.length)throw new Error("Width and height must match the pixels array");let s=[];for(let r=0;r<l;r++)for(let h=0;h<o;h++){const o=0==h&&0==r?1:2,n=c(t,e,a,(t,n)=>o*Math.cos(Math.PI*h*t/e)*Math.cos(Math.PI*r*n/a));s.push(n)}const m=s[0],i=s.slice(1);let M,g="";if(g+=r(o-1+9*(l-1),1),i.length>0){let t=Math.max(...i.map(t=>Math.max(...t))),e=Math.floor(Math.max(0,Math.min(82,Math.floor(166*t-.5))));M=(e+1)/166,g+=r(e,1)}else M=1,g+=r(0,1);return g+=r((t=>{return(h(t[0])<<16)+(h(t[1])<<8)+h(t[2])})(m),4),i.forEach(t=>{g+=r(((t,e)=>{return 19*Math.floor(Math.max(0,Math.min(18,Math.floor(9*n(t[0]/e,.5)+9.5))))*19+19*Math.floor(Math.max(0,Math.min(18,Math.floor(9*n(t[1]/e,.5)+9.5))))+Math.floor(Math.max(0,Math.min(18,Math.floor(9*n(t[2]/e,.5)+9.5))))})(t,M),2)}),g}),t.getImageData=(t=>{const e=t.width,a=t.height,r=document.createElement("canvas"),o=r.getContext("2d");return r.width=e,r.height=a,o.width=e,o.height=a,o.drawImage(t,0,0),o.getImageData(0,0,e,a).data}),t.drawImageDataOnNewCanvas=((t,e,a)=>{const r=document.createElement("canvas"),o=r.getContext("2d");return r.width=e,r.height=a,o.width=e,o.height=a,o.putImageData(new ImageData(t,e,a),0,0),r}),t.getImageDataAsImageWithOnloadPromise=((e,a,r)=>new Promise((o,h)=>{t.getImageDataAsImage(e,a,r,(t,e)=>{o(e)})})),t.getImageDataAsImage=((e,a,r,o)=>{const h=t.drawImageDataOnNewCanvas(e,a,r).toDataURL(),n=new Image(a,r);return n.onload=(t=>o(t,n)),n.width=a,n.height=r,n.src=h,n}),t}({});
\ No newline at end of file
diff --git a/data/interfaces/default/js/bootstrap-hover-dropdown.min.js b/data/interfaces/default/js/bootstrap-hover-dropdown.min.js
deleted file mode 100644
index 89d5c6d5..00000000
--- a/data/interfaces/default/js/bootstrap-hover-dropdown.min.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * @preserve
- * Project: Bootstrap Hover Dropdown
- * Author: Cameron Spear
- * Version: v2.2.1
- * Contributors: Mattia Larentis
- * Dependencies: Bootstrap's Dropdown plugin, jQuery
- * Description: A simple plugin to enable Bootstrap dropdowns to active on hover and provide a nice user experience.
- * License: MIT
- * Homepage: http://cameronspear.com/blog/bootstrap-dropdown-on-hover-plugin/
- */
-!function(e,n,o){var t=e();e.fn.dropdownHover=function(o){return"ontouchstart"in document?this:(t=t.add(this.parent()),this.each(function(){function r(e){d.parents(".navbar").find(".navbar-toggle").is(":visible")||(n.clearTimeout(a),n.clearTimeout(i),i=n.setTimeout(function(){t.find(":focus").blur(),f.instantlyCloseOthers===!0&&t.removeClass("open"),n.clearTimeout(i),d.attr("aria-expanded","true"),s.addClass("open"),d.trigger(l)},f.hoverDelay))}var a,i,d=e(this),s=d.parent(),u={delay:500,hoverDelay:0,instantlyCloseOthers:!0},h={delay:e(this).data("delay"),hoverDelay:e(this).data("hover-delay"),instantlyCloseOthers:e(this).data("close-others")},l="show.bs.dropdown",c="hide.bs.dropdown",f=e.extend(!0,{},u,o,h);s.hover(function(e){return s.hasClass("open")||d.is(e.target)?void r(e):!0},function(){n.clearTimeout(i),a=n.setTimeout(function(){d.attr("aria-expanded","false"),s.removeClass("open"),d.trigger(c)},f.delay)}),d.hover(function(e){return s.hasClass("open")||s.is(e.target)?void r(e):!0}),s.find(".dropdown-submenu").each(function(){var o,t=e(this);t.hover(function(){n.clearTimeout(o),t.children(".dropdown-menu").show(),t.siblings().children(".dropdown-menu").hide()},function(){var e=t.children(".dropdown-menu");o=n.setTimeout(function(){e.hide()},f.delay)})})}))},e(document).ready(function(){e(n).width()>769&&e(".navbar .dropdown > a").click(function(){location.href=this.href})}),e(document).ready(function(){e('[data-hover="dropdown"]').dropdownHover()})}(jQuery,window);
\ No newline at end of file
diff --git a/data/interfaces/default/js/bootstrap-select.min.js b/data/interfaces/default/js/bootstrap-select.min.js
deleted file mode 100644
index 92e3a32e..00000000
--- a/data/interfaces/default/js/bootstrap-select.min.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Bootstrap-select v1.13.14 (https://developer.snapappointments.com/bootstrap-select)
- *
- * Copyright 2012-2020 SnapAppointments, LLC
- * Licensed under MIT (https://github.com/snapappointments/bootstrap-select/blob/master/LICENSE)
- */
-
-!function(e,t){void 0===e&&void 0!==window&&(e=window),"function"==typeof define&&define.amd?define(["jquery"],function(e){return t(e)}):"object"==typeof module&&module.exports?module.exports=t(require("jquery")):t(e.jQuery)}(this,function(e){!function(z){"use strict";var d=["sanitize","whiteList","sanitizeFn"],r=["background","cite","href","itemtype","longdesc","poster","src","xlink:href"],e={"*":["class","dir","id","lang","role","tabindex","style",/^aria-[\w-]*$/i],a:["target","href","title","rel"],area:[],b:[],br:[],col:[],code:[],div:[],em:[],hr:[],h1:[],h2:[],h3:[],h4:[],h5:[],h6:[],i:[],img:["src","alt","title","width","height"],li:[],ol:[],p:[],pre:[],s:[],small:[],span:[],sub:[],sup:[],strong:[],u:[],ul:[]},l=/^(?:(?:https?|mailto|ftp|tel|file):|[^&:/?#]*(?:[/?#]|$))/gi,a=/^data:(?:image\/(?:bmp|gif|jpeg|jpg|png|tiff|webp)|video\/(?:mpeg|mp4|ogg|webm)|audio\/(?:mp3|oga|ogg|opus));base64,[a-z0-9+/]+=*$/i;function v(e,t){var i=e.nodeName.toLowerCase();if(-1!==z.inArray(i,t))return-1===z.inArray(i,r)||Boolean(e.nodeValue.match(l)||e.nodeValue.match(a));for(var s=z(t).filter(function(e,t){return t instanceof RegExp}),n=0,o=s.length;n<o;n++)if(i.match(s[n]))return!0;return!1}function P(e,t,i){if(i&&"function"==typeof i)return i(e);for(var s=Object.keys(t),n=0,o=e.length;n<o;n++)for(var r=e[n].querySelectorAll("*"),l=0,a=r.length;l<a;l++){var c=r[l],d=c.nodeName.toLowerCase();if(-1!==s.indexOf(d))for(var h=[].slice.call(c.attributes),p=[].concat(t["*"]||[],t[d]||[]),u=0,f=h.length;u<f;u++){var m=h[u];v(m,p)||c.removeAttribute(m.nodeName)}else c.parentNode.removeChild(c)}}"classList"in document.createElement("_")||function(e){if("Element"in e){var t="classList",i="prototype",s=e.Element[i],n=Object,o=function(){var i=z(this);return{add:function(e){return e=Array.prototype.slice.call(arguments).join(" "),i.addClass(e)},remove:function(e){return e=Array.prototype.slice.call(arguments).join(" "),i.removeClass(e)},toggle:function(e,t){return i.toggleClass(e,t)},contains:function(e){return i.hasClass(e)}}};if(n.defineProperty){var r={get:o,enumerable:!0,configurable:!0};try{n.defineProperty(s,t,r)}catch(e){void 0!==e.number&&-2146823252!==e.number||(r.enumerable=!1,n.defineProperty(s,t,r))}}else n[i].__defineGetter__&&s.__defineGetter__(t,o)}}(window);var t,c,i=document.createElement("_");if(i.classList.add("c1","c2"),!i.classList.contains("c2")){var s=DOMTokenList.prototype.add,n=DOMTokenList.prototype.remove;DOMTokenList.prototype.add=function(){Array.prototype.forEach.call(arguments,s.bind(this))},DOMTokenList.prototype.remove=function(){Array.prototype.forEach.call(arguments,n.bind(this))}}if(i.classList.toggle("c3",!1),i.classList.contains("c3")){var o=DOMTokenList.prototype.toggle;DOMTokenList.prototype.toggle=function(e,t){return 1 in arguments&&!this.contains(e)==!t?t:o.call(this,e)}}function h(e){if(null==this)throw new TypeError;var t=String(this);if(e&&"[object RegExp]"==c.call(e))throw new TypeError;var i=t.length,s=String(e),n=s.length,o=1<arguments.length?arguments[1]:void 0,r=o?Number(o):0;r!=r&&(r=0);var l=Math.min(Math.max(r,0),i);if(i<n+l)return!1;for(var a=-1;++a<n;)if(t.charCodeAt(l+a)!=s.charCodeAt(a))return!1;return!0}function O(e,t){var i,s=e.selectedOptions,n=[];if(t){for(var o=0,r=s.length;o<r;o++)(i=s[o]).disabled||"OPTGROUP"===i.parentNode.tagName&&i.parentNode.disabled||n.push(i);return n}return s}function T(e,t){for(var i,s=[],n=t||e.selectedOptions,o=0,r=n.length;o<r;o++)(i=n[o]).disabled||"OPTGROUP"===i.parentNode.tagName&&i.parentNode.disabled||s.push(i.value);return e.multiple?s:s.length?s[0]:null}i=null,String.prototype.startsWith||(t=function(){try{var e={},t=Object.defineProperty,i=t(e,e,e)&&t}catch(e){}return i}(),c={}.toString,t?t(String.prototype,"startsWith",{value:h,configurable:!0,writable:!0}):String.prototype.startsWith=h),Object.keys||(Object.keys=function(e,t,i){for(t in i=[],e)i.hasOwnProperty.call(e,t)&&i.push(t);return i}),HTMLSelectElement&&!HTMLSelectElement.prototype.hasOwnProperty("selectedOptions")&&Object.defineProperty(HTMLSelectElement.prototype,"selectedOptions",{get:function(){return this.querySelectorAll(":checked")}});var p={useDefault:!1,_set:z.valHooks.select.set};z.valHooks.select.set=function(e,t){return t&&!p.useDefault&&z(e).data("selected",!0),p._set.apply(this,arguments)};var A=null,u=function(){try{return new Event("change"),!0}catch(e){return!1}}();function k(e,t,i,s){for(var n=["display","subtext","tokens"],o=!1,r=0;r<n.length;r++){var l=n[r],a=e[l];if(a&&(a=a.toString(),"display"===l&&(a=a.replace(/<[^>]+>/g,"")),s&&(a=w(a)),a=a.toUpperCase(),o="contains"===i?0<=a.indexOf(t):a.startsWith(t)))break}return o}function L(e){return parseInt(e,10)||0}z.fn.triggerNative=function(e){var t,i=this[0];i.dispatchEvent?(u?t=new Event(e,{bubbles:!0}):(t=document.createEvent("Event")).initEvent(e,!0,!1),i.dispatchEvent(t)):i.fireEvent?((t=document.createEventObject()).eventType=e,i.fireEvent("on"+e,t)):this.trigger(e)};var f={"\xc0":"A","\xc1":"A","\xc2":"A","\xc3":"A","\xc4":"A","\xc5":"A","\xe0":"a","\xe1":"a","\xe2":"a","\xe3":"a","\xe4":"a","\xe5":"a","\xc7":"C","\xe7":"c","\xd0":"D","\xf0":"d","\xc8":"E","\xc9":"E","\xca":"E","\xcb":"E","\xe8":"e","\xe9":"e","\xea":"e","\xeb":"e","\xcc":"I","\xcd":"I","\xce":"I","\xcf":"I","\xec":"i","\xed":"i","\xee":"i","\xef":"i","\xd1":"N","\xf1":"n","\xd2":"O","\xd3":"O","\xd4":"O","\xd5":"O","\xd6":"O","\xd8":"O","\xf2":"o","\xf3":"o","\xf4":"o","\xf5":"o","\xf6":"o","\xf8":"o","\xd9":"U","\xda":"U","\xdb":"U","\xdc":"U","\xf9":"u","\xfa":"u","\xfb":"u","\xfc":"u","\xdd":"Y","\xfd":"y","\xff":"y","\xc6":"Ae","\xe6":"ae","\xde":"Th","\xfe":"th","\xdf":"ss","\u0100":"A","\u0102":"A","\u0104":"A","\u0101":"a","\u0103":"a","\u0105":"a","\u0106":"C","\u0108":"C","\u010a":"C","\u010c":"C","\u0107":"c","\u0109":"c","\u010b":"c","\u010d":"c","\u010e":"D","\u0110":"D","\u010f":"d","\u0111":"d","\u0112":"E","\u0114":"E","\u0116":"E","\u0118":"E","\u011a":"E","\u0113":"e","\u0115":"e","\u0117":"e","\u0119":"e","\u011b":"e","\u011c":"G","\u011e":"G","\u0120":"G","\u0122":"G","\u011d":"g","\u011f":"g","\u0121":"g","\u0123":"g","\u0124":"H","\u0126":"H","\u0125":"h","\u0127":"h","\u0128":"I","\u012a":"I","\u012c":"I","\u012e":"I","\u0130":"I","\u0129":"i","\u012b":"i","\u012d":"i","\u012f":"i","\u0131":"i","\u0134":"J","\u0135":"j","\u0136":"K","\u0137":"k","\u0138":"k","\u0139":"L","\u013b":"L","\u013d":"L","\u013f":"L","\u0141":"L","\u013a":"l","\u013c":"l","\u013e":"l","\u0140":"l","\u0142":"l","\u0143":"N","\u0145":"N","\u0147":"N","\u014a":"N","\u0144":"n","\u0146":"n","\u0148":"n","\u014b":"n","\u014c":"O","\u014e":"O","\u0150":"O","\u014d":"o","\u014f":"o","\u0151":"o","\u0154":"R","\u0156":"R","\u0158":"R","\u0155":"r","\u0157":"r","\u0159":"r","\u015a":"S","\u015c":"S","\u015e":"S","\u0160":"S","\u015b":"s","\u015d":"s","\u015f":"s","\u0161":"s","\u0162":"T","\u0164":"T","\u0166":"T","\u0163":"t","\u0165":"t","\u0167":"t","\u0168":"U","\u016a":"U","\u016c":"U","\u016e":"U","\u0170":"U","\u0172":"U","\u0169":"u","\u016b":"u","\u016d":"u","\u016f":"u","\u0171":"u","\u0173":"u","\u0174":"W","\u0175":"w","\u0176":"Y","\u0177":"y","\u0178":"Y","\u0179":"Z","\u017b":"Z","\u017d":"Z","\u017a":"z","\u017c":"z","\u017e":"z","\u0132":"IJ","\u0133":"ij","\u0152":"Oe","\u0153":"oe","\u0149":"'n","\u017f":"s"},m=/[\xc0-\xd6\xd8-\xf6\xf8-\xff\u0100-\u017f]/g,g=RegExp("[\\u0300-\\u036f\\ufe20-\\ufe2f\\u20d0-\\u20ff\\u1ab0-\\u1aff\\u1dc0-\\u1dff]","g");function b(e){return f[e]}function w(e){return(e=e.toString())&&e.replace(m,b).replace(g,"")}var I,x,y,$,S=(I={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"},x="(?:"+Object.keys(I).join("|")+")",y=RegExp(x),$=RegExp(x,"g"),function(e){return e=null==e?"":""+e,y.test(e)?e.replace($,E):e});function E(e){return I[e]}var C={32:" ",48:"0",49:"1",50:"2",51:"3",52:"4",53:"5",54:"6",55:"7",56:"8",57:"9",59:";",65:"A",66:"B",67:"C",68:"D",69:"E",70:"F",71:"G",72:"H",73:"I",74:"J",75:"K",76:"L",77:"M",78:"N",79:"O",80:"P",81:"Q",82:"R",83:"S",84:"T",85:"U",86:"V",87:"W",88:"X",89:"Y",90:"Z",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9"},N=27,D=13,H=32,W=9,B=38,M=40,R={success:!1,major:"3"};try{R.full=(z.fn.dropdown.Constructor.VERSION||"").split(" ")[0].split("."),R.major=R.full[0],R.success=!0}catch(e){}var U=0,j=".bs.select",V={DISABLED:"disabled",DIVIDER:"divider",SHOW:"open",DROPUP:"dropup",MENU:"dropdown-menu",MENURIGHT:"dropdown-menu-right",MENULEFT:"dropdown-menu-left",BUTTONCLASS:"btn-default",POPOVERHEADER:"popover-title",ICONBASE:"glyphicon",TICKICON:"glyphicon-ok"},F={MENU:"."+V.MENU},_={span:document.createElement("span"),i:document.createElement("i"),subtext:document.createElement("small"),a:document.createElement("a"),li:document.createElement("li"),whitespace:document.createTextNode("\xa0"),fragment:document.createDocumentFragment()};_.a.setAttribute("role","option"),"4"===R.major&&(_.a.className="dropdown-item"),_.subtext.className="text-muted",_.text=_.span.cloneNode(!1),_.text.className="text",_.checkMark=_.span.cloneNode(!1);var G=new RegExp(B+"|"+M),q=new RegExp("^"+W+"$|"+N),K={li:function(e,t,i){var s=_.li.cloneNode(!1);return e&&(1===e.nodeType||11===e.nodeType?s.appendChild(e):s.innerHTML=e),void 0!==t&&""!==t&&(s.className=t),null!=i&&s.classList.add("optgroup-"+i),s},a:function(e,t,i){var s=_.a.cloneNode(!0);return e&&(11===e.nodeType?s.appendChild(e):s.insertAdjacentHTML("beforeend",e)),void 0!==t&&""!==t&&s.classList.add.apply(s.classList,t.split(" ")),i&&s.setAttribute("style",i),s},text:function(e,t){var i,s,n=_.text.cloneNode(!1);if(e.content)n.innerHTML=e.content;else{if(n.textContent=e.text,e.icon){var o=_.whitespace.cloneNode(!1);(s=(!0===t?_.i:_.span).cloneNode(!1)).className=this.options.iconBase+" "+e.icon,_.fragment.appendChild(s),_.fragment.appendChild(o)}e.subtext&&((i=_.subtext.cloneNode(!1)).textContent=e.subtext,n.appendChild(i))}if(!0===t)for(;0<n.childNodes.length;)_.fragment.appendChild(n.childNodes[0]);else _.fragment.appendChild(n);return _.fragment},label:function(e){var t,i,s=_.text.cloneNode(!1);if(s.innerHTML=e.display,e.icon){var n=_.whitespace.cloneNode(!1);(i=_.span.cloneNode(!1)).className=this.options.iconBase+" "+e.icon,_.fragment.appendChild(i),_.fragment.appendChild(n)}return e.subtext&&((t=_.subtext.cloneNode(!1)).textContent=e.subtext,s.appendChild(t)),_.fragment.appendChild(s),_.fragment}},Y=function(e,t){var i=this;p.useDefault||(z.valHooks.select.set=p._set,p.useDefault=!0),this.$element=z(e),this.$newElement=null,this.$button=null,this.$menu=null,this.options=t,this.selectpicker={main:{},search:{},current:{},view:{},isSearching:!1,keydown:{keyHistory:"",resetKeyHistory:{start:function(){return setTimeout(function(){i.selectpicker.keydown.keyHistory=""},800)}}}},this.sizeInfo={},null===this.options.title&&(this.options.title=this.$element.attr("title"));var s=this.options.windowPadding;"number"==typeof s&&(this.options.windowPadding=[s,s,s,s]),this.val=Y.prototype.val,this.render=Y.prototype.render,this.refresh=Y.prototype.refresh,this.setStyle=Y.prototype.setStyle,this.selectAll=Y.prototype.selectAll,this.deselectAll=Y.prototype.deselectAll,this.destroy=Y.prototype.destroy,this.remove=Y.prototype.remove,this.show=Y.prototype.show,this.hide=Y.prototype.hide,this.init()};function Z(e){var l,a=arguments,c=e;if([].shift.apply(a),!R.success){try{R.full=(z.fn.dropdown.Constructor.VERSION||"").split(" ")[0].split(".")}catch(e){Y.BootstrapVersion?R.full=Y.BootstrapVersion.split(" ")[0].split("."):(R.full=[R.major,"0","0"],console.warn("There was an issue retrieving Bootstrap's version. Ensure Bootstrap is being loaded before bootstrap-select and there is no namespace collision. If loading Bootstrap asynchronously, the version may need to be manually specified via $.fn.selectpicker.Constructor.BootstrapVersion.",e))}R.major=R.full[0],R.success=!0}if("4"===R.major){var t=[];Y.DEFAULTS.style===V.BUTTONCLASS&&t.push({name:"style",className:"BUTTONCLASS"}),Y.DEFAULTS.iconBase===V.ICONBASE&&t.push({name:"iconBase",className:"ICONBASE"}),Y.DEFAULTS.tickIcon===V.TICKICON&&t.push({name:"tickIcon",className:"TICKICON"}),V.DIVIDER="dropdown-divider",V.SHOW="show",V.BUTTONCLASS="btn-light",V.POPOVERHEADER="popover-header",V.ICONBASE="",V.TICKICON="bs-ok-default";for(var i=0;i<t.length;i++){e=t[i];Y.DEFAULTS[e.name]=V[e.className]}}var s=this.each(function(){var e=z(this);if(e.is("select")){var t=e.data("selectpicker"),i="object"==typeof c&&c;if(t){if(i)for(var s in i)i.hasOwnProperty(s)&&(t.options[s]=i[s])}else{var n=e.data();for(var o in n)n.hasOwnProperty(o)&&-1!==z.inArray(o,d)&&delete n[o];var r=z.extend({},Y.DEFAULTS,z.fn.selectpicker.defaults||{},n,i);r.template=z.extend({},Y.DEFAULTS.template,z.fn.selectpicker.defaults?z.fn.selectpicker.defaults.template:{},n.template,i.template),e.data("selectpicker",t=new Y(this,r))}"string"==typeof c&&(l=t[c]instanceof Function?t[c].apply(t,a):t.options[c])}});return void 0!==l?l:s}Y.VERSION="1.13.14",Y.DEFAULTS={noneSelectedText:"Nothing selected",noneResultsText:"No results matched {0}",countSelectedText:function(e,t){return 1==e?"{0} item selected":"{0} items selected"},maxOptionsText:function(e,t){return[1==e?"Limit reached ({n} item max)":"Limit reached ({n} items max)",1==t?"Group limit reached ({n} item max)":"Group limit reached ({n} items max)"]},selectAllText:"Select All",deselectAllText:"Deselect All",doneButton:!1,doneButtonText:"Close",multipleSeparator:", ",styleBase:"btn",style:V.BUTTONCLASS,size:"auto",title:null,selectedTextFormat:"values",width:!1,container:!1,hideDisabled:!1,showSubtext:!1,showIcon:!0,showContent:!0,dropupAuto:!0,header:!1,liveSearch:!1,liveSearchPlaceholder:null,liveSearchNormalize:!1,liveSearchStyle:"contains",actionsBox:!1,iconBase:V.ICONBASE,tickIcon:V.TICKICON,showTick:!1,template:{caret:'<span class="caret"></span>'},maxOptions:!1,mobile:!1,selectOnTab:!1,dropdownAlignRight:!1,windowPadding:0,virtualScroll:600,display:!1,sanitize:!0,sanitizeFn:null,whiteList:e},Y.prototype={constructor:Y,init:function(){var i=this,e=this.$element.attr("id");U++,this.selectId="bs-select-"+U,this.$element[0].classList.add("bs-select-hidden"),this.multiple=this.$element.prop("multiple"),this.autofocus=this.$element.prop("autofocus"),this.$element[0].classList.contains("show-tick")&&(this.options.showTick=!0),this.$newElement=this.createDropdown(),this.buildData(),this.$element.after(this.$newElement).prependTo(this.$newElement),this.$button=this.$newElement.children("button"),this.$menu=this.$newElement.children(F.MENU),this.$menuInner=this.$menu.children(".inner"),this.$searchbox=this.$menu.find("input"),this.$element[0].classList.remove("bs-select-hidden"),!0===this.options.dropdownAlignRight&&this.$menu[0].classList.add(V.MENURIGHT),void 0!==e&&this.$button.attr("data-id",e),this.checkDisabled(),this.clickListener(),this.options.liveSearch?(this.liveSearchListener(),this.focusedParent=this.$searchbox[0]):this.focusedParent=this.$menuInner[0],this.setStyle(),this.render(),this.setWidth(),this.options.container?this.selectPosition():this.$element.on("hide"+j,function(){if(i.isVirtual()){var e=i.$menuInner[0],t=e.firstChild.cloneNode(!1);e.replaceChild(t,e.firstChild),e.scrollTop=0}}),this.$menu.data("this",this),this.$newElement.data("this",this),this.options.mobile&&this.mobile(),this.$newElement.on({"hide.bs.dropdown":function(e){i.$element.trigger("hide"+j,e)},"hidden.bs.dropdown":function(e){i.$element.trigger("hidden"+j,e)},"show.bs.dropdown":function(e){i.$element.trigger("show"+j,e)},"shown.bs.dropdown":function(e){i.$element.trigger("shown"+j,e)}}),i.$element[0].hasAttribute("required")&&this.$element.on("invalid"+j,function(){i.$button[0].classList.add("bs-invalid"),i.$element.on("shown"+j+".invalid",function(){i.$element.val(i.$element.val()).off("shown"+j+".invalid")}).on("rendered"+j,function(){this.validity.valid&&i.$button[0].classList.remove("bs-invalid"),i.$element.off("rendered"+j)}),i.$button.on("blur"+j,function(){i.$element.trigger("focus").trigger("blur"),i.$button.off("blur"+j)})}),setTimeout(function(){i.buildList(),i.$element.trigger("loaded"+j)})},createDropdown:function(){var e=this.multiple||this.options.showTick?" show-tick":"",t=this.multiple?' aria-multiselectable="true"':"",i="",s=this.autofocus?" autofocus":"";R.major<4&&this.$element.parent().hasClass("input-group")&&(i=" input-group-btn");var n,o="",r="",l="",a="";return this.options.header&&(o='<div class="'+V.POPOVERHEADER+'"><button type="button" class="close" aria-hidden="true">&times;</button>'+this.options.header+"</div>"),this.options.liveSearch&&(r='<div class="bs-searchbox"><input type="search" class="form-control" autocomplete="off"'+(null===this.options.liveSearchPlaceholder?"":' placeholder="'+S(this.options.liveSearchPlaceholder)+'"')+' role="combobox" aria-label="Search" aria-controls="'+this.selectId+'" aria-autocomplete="list"></div>'),this.multiple&&this.options.actionsBox&&(l='<div class="bs-actionsbox"><div class="btn-group btn-group-sm btn-block"><button type="button" class="actions-btn bs-select-all btn '+V.BUTTONCLASS+'">'+this.options.selectAllText+'</button><button type="button" class="actions-btn bs-deselect-all btn '+V.BUTTONCLASS+'">'+this.options.deselectAllText+"</button></div></div>"),this.multiple&&this.options.doneButton&&(a='<div class="bs-donebutton"><div class="btn-group btn-block"><button type="button" class="btn btn-sm '+V.BUTTONCLASS+'">'+this.options.doneButtonText+"</button></div></div>"),n='<div class="dropdown bootstrap-select'+e+i+'"><button type="button" class="'+this.options.styleBase+' dropdown-toggle" '+("static"===this.options.display?'data-display="static"':"")+'data-toggle="dropdown"'+s+' role="combobox" aria-owns="'+this.selectId+'" aria-haspopup="listbox" aria-expanded="false"><div class="filter-option"><div class="filter-option-inner"><div class="filter-option-inner-inner"></div></div> </div>'+("4"===R.major?"":'<span class="bs-caret">'+this.options.template.caret+"</span>")+'</button><div class="'+V.MENU+" "+("4"===R.major?"":V.SHOW)+'">'+o+r+l+'<div class="inner '+V.SHOW+'" role="listbox" id="'+this.selectId+'" tabindex="-1" '+t+'><ul class="'+V.MENU+" inner "+("4"===R.major?V.SHOW:"")+'" role="presentation"></ul></div>'+a+"</div></div>",z(n)},setPositionData:function(){this.selectpicker.view.canHighlight=[];for(var e=this.selectpicker.view.size=0;e<this.selectpicker.current.data.length;e++){var t=this.selectpicker.current.data[e],i=!0;"divider"===t.type?(i=!1,t.height=this.sizeInfo.dividerHeight):"optgroup-label"===t.type?(i=!1,t.height=this.sizeInfo.dropdownHeaderHeight):t.height=this.sizeInfo.liHeight,t.disabled&&(i=!1),this.selectpicker.view.canHighlight.push(i),i&&(this.selectpicker.view.size++,t.posinset=this.selectpicker.view.size),t.position=(0===e?0:this.selectpicker.current.data[e-1].position)+t.height}},isVirtual:function(){return!1!==this.options.virtualScroll&&this.selectpicker.main.elements.length>=this.options.virtualScroll||!0===this.options.virtualScroll},createView:function(A,e,t){var L,N,D=this,i=0,H=[];if(this.selectpicker.isSearching=A,this.selectpicker.current=A?this.selectpicker.search:this.selectpicker.main,this.setPositionData(),e)if(t)i=this.$menuInner[0].scrollTop;else if(!D.multiple){var s=D.$element[0],n=(s.options[s.selectedIndex]||{}).liIndex;if("number"==typeof n&&!1!==D.options.size){var o=D.selectpicker.main.data[n],r=o&&o.position;r&&(i=r-(D.sizeInfo.menuInnerHeight+D.sizeInfo.liHeight)/2)}}function l(e,t){var i,s,n,o,r,l,a,c,d=D.selectpicker.current.elements.length,h=[],p=!0,u=D.isVirtual();D.selectpicker.view.scrollTop=e,i=Math.ceil(D.sizeInfo.menuInnerHeight/D.sizeInfo.liHeight*1.5),s=Math.round(d/i)||1;for(var f=0;f<s;f++){var m=(f+1)*i;if(f===s-1&&(m=d),h[f]=[f*i+(f?1:0),m],!d)break;void 0===r&&e-1<=D.selectpicker.current.data[m-1].position-D.sizeInfo.menuInnerHeight&&(r=f)}if(void 0===r&&(r=0),l=[D.selectpicker.view.position0,D.selectpicker.view.position1],n=Math.max(0,r-1),o=Math.min(s-1,r+1),D.selectpicker.view.position0=!1===u?0:Math.max(0,h[n][0])||0,D.selectpicker.view.position1=!1===u?d:Math.min(d,h[o][1])||0,a=l[0]!==D.selectpicker.view.position0||l[1]!==D.selectpicker.view.position1,void 0!==D.activeIndex&&(N=D.selectpicker.main.elements[D.prevActiveIndex],H=D.selectpicker.main.elements[D.activeIndex],L=D.selectpicker.main.elements[D.selectedIndex],t&&(D.activeIndex!==D.selectedIndex&&D.defocusItem(H),D.activeIndex=void 0),D.activeIndex&&D.activeIndex!==D.selectedIndex&&D.defocusItem(L)),void 0!==D.prevActiveIndex&&D.prevActiveIndex!==D.activeIndex&&D.prevActiveIndex!==D.selectedIndex&&D.defocusItem(N),(t||a)&&(c=D.selectpicker.view.visibleElements?D.selectpicker.view.visibleElements.slice():[],D.selectpicker.view.visibleElements=!1===u?D.selectpicker.current.elements:D.selectpicker.current.elements.slice(D.selectpicker.view.position0,D.selectpicker.view.position1),D.setOptionStatus(),(A||!1===u&&t)&&(p=!function(e,i){return e.length===i.length&&e.every(function(e,t){return e===i[t]})}(c,D.selectpicker.view.visibleElements)),(t||!0===u)&&p)){var v,g,b=D.$menuInner[0],w=document.createDocumentFragment(),I=b.firstChild.cloneNode(!1),x=D.selectpicker.view.visibleElements,k=[];b.replaceChild(I,b.firstChild);f=0;for(var y=x.length;f<y;f++){var $,S,E=x[f];D.options.sanitize&&($=E.lastChild)&&(S=D.selectpicker.current.data[f+D.selectpicker.view.position0])&&S.content&&!S.sanitized&&(k.push($),S.sanitized=!0),w.appendChild(E)}if(D.options.sanitize&&k.length&&P(k,D.options.whiteList,D.options.sanitizeFn),!0===u?(v=0===D.selectpicker.view.position0?0:D.selectpicker.current.data[D.selectpicker.view.position0-1].position,g=D.selectpicker.view.position1>d-1?0:D.selectpicker.current.data[d-1].position-D.selectpicker.current.data[D.selectpicker.view.position1-1].position,b.firstChild.style.marginTop=v+"px",b.firstChild.style.marginBottom=g+"px"):(b.firstChild.style.marginTop=0,b.firstChild.style.marginBottom=0),b.firstChild.appendChild(w),!0===u&&D.sizeInfo.hasScrollBar){var C=b.firstChild.offsetWidth;if(t&&C<D.sizeInfo.menuInnerInnerWidth&&D.sizeInfo.totalMenuWidth>D.sizeInfo.selectWidth)b.firstChild.style.minWidth=D.sizeInfo.menuInnerInnerWidth+"px";else if(C>D.sizeInfo.menuInnerInnerWidth){D.$menu[0].style.minWidth=0;var O=b.firstChild.offsetWidth;O>D.sizeInfo.menuInnerInnerWidth&&(D.sizeInfo.menuInnerInnerWidth=O,b.firstChild.style.minWidth=D.sizeInfo.menuInnerInnerWidth+"px"),D.$menu[0].style.minWidth=""}}}if(D.prevActiveIndex=D.activeIndex,D.options.liveSearch){if(A&&t){var z,T=0;D.selectpicker.view.canHighlight[T]||(T=1+D.selectpicker.view.canHighlight.slice(1).indexOf(!0)),z=D.selectpicker.view.visibleElements[T],D.defocusItem(D.selectpicker.view.currentActive),D.activeIndex=(D.selectpicker.current.data[T]||{}).index,D.focusItem(z)}}else D.$menuInner.trigger("focus")}l(i,!0),this.$menuInner.off("scroll.createView").on("scroll.createView",function(e,t){D.noScroll||l(this.scrollTop,t),D.noScroll=!1}),z(window).off("resize"+j+"."+this.selectId+".createView").on("resize"+j+"."+this.selectId+".createView",function(){D.$newElement.hasClass(V.SHOW)&&l(D.$menuInner[0].scrollTop)})},focusItem:function(e,t,i){if(e){t=t||this.selectpicker.main.data[this.activeIndex];var s=e.firstChild;s&&(s.setAttribute("aria-setsize",this.selectpicker.view.size),s.setAttribute("aria-posinset",t.posinset),!0!==i&&(this.focusedParent.setAttribute("aria-activedescendant",s.id),e.classList.add("active"),s.classList.add("active")))}},defocusItem:function(e){e&&(e.classList.remove("active"),e.firstChild&&e.firstChild.classList.remove("active"))},setPlaceholder:function(){var e=!1;if(this.options.title&&!this.multiple){this.selectpicker.view.titleOption||(this.selectpicker.view.titleOption=document.createElement("option")),e=!0;var t=this.$element[0],i=!1,s=!this.selectpicker.view.titleOption.parentNode;if(s)this.selectpicker.view.titleOption.className="bs-title-option",this.selectpicker.view.titleOption.value="",i=void 0===z(t.options[t.selectedIndex]).attr("selected")&&void 0===this.$element.data("selected");!s&&0===this.selectpicker.view.titleOption.index||t.insertBefore(this.selectpicker.view.titleOption,t.firstChild),i&&(t.selectedIndex=0)}return e},buildData:function(){var p=':not([hidden]):not([data-hidden="true"])',u=[],f=0,e=this.setPlaceholder()?1:0;this.options.hideDisabled&&(p+=":not(:disabled)");var t=this.$element[0].querySelectorAll("select > *"+p);function m(e){var t=u[u.length-1];t&&"divider"===t.type&&(t.optID||e.optID)||((e=e||{}).type="divider",u.push(e))}function v(e,t){if((t=t||{}).divider="true"===e.getAttribute("data-divider"),t.divider)m({optID:t.optID});else{var i=u.length,s=e.style.cssText,n=s?S(s):"",o=(e.className||"")+(t.optgroupClass||"");t.optID&&(o="opt "+o),t.optionClass=o.trim(),t.inlineStyle=n,t.text=e.textContent,t.content=e.getAttribute("data-content"),t.tokens=e.getAttribute("data-tokens"),t.subtext=e.getAttribute("data-subtext"),t.icon=e.getAttribute("data-icon"),e.liIndex=i,t.display=t.content||t.text,t.type="option",t.index=i,t.option=e,t.selected=!!e.selected,t.disabled=t.disabled||!!e.disabled,u.push(t)}}function i(e,t){var i=t[e],s=t[e-1],n=t[e+1],o=i.querySelectorAll("option"+p);if(o.length){var r,l,a={display:S(i.label),subtext:i.getAttribute("data-subtext"),icon:i.getAttribute("data-icon"),type:"optgroup-label",optgroupClass:" "+(i.className||"")};f++,s&&m({optID:f}),a.optID=f,u.push(a);for(var c=0,d=o.length;c<d;c++){var h=o[c];0===c&&(l=(r=u.length-1)+d),v(h,{headerIndex:r,lastIndex:l,optID:a.optID,optgroupClass:a.optgroupClass,disabled:i.disabled})}n&&m({optID:f})}}for(var s=t.length;e<s;e++){var n=t[e];"OPTGROUP"!==n.tagName?v(n,{}):i(e,t)}this.selectpicker.main.data=this.selectpicker.current.data=u},buildList:function(){var s=this,e=this.selectpicker.main.data,n=[],o=0;function t(e){var t,i=0;switch(e.type){case"divider":t=K.li(!1,V.DIVIDER,e.optID?e.optID+"div":void 0);break;case"option":(t=K.li(K.a(K.text.call(s,e),e.optionClass,e.inlineStyle),"",e.optID)).firstChild&&(t.firstChild.id=s.selectId+"-"+e.index);break;case"optgroup-label":t=K.li(K.label.call(s,e),"dropdown-header"+e.optgroupClass,e.optID)}n.push(t),e.display&&(i+=e.display.length),e.subtext&&(i+=e.subtext.length),e.icon&&(i+=1),o<i&&(o=i,s.selectpicker.view.widestOption=n[n.length-1])}!s.options.showTick&&!s.multiple||_.checkMark.parentNode||(_.checkMark.className=this.options.iconBase+" "+s.options.tickIcon+" check-mark",_.a.appendChild(_.checkMark));for(var i=e.length,r=0;r<i;r++){t(e[r])}this.selectpicker.main.elements=this.selectpicker.current.elements=n},findLis:function(){return this.$menuInner.find(".inner > li")},render:function(){var e,t=this,i=this.$element[0],s=this.setPlaceholder()&&0===i.selectedIndex,n=O(i,this.options.hideDisabled),o=n.length,r=this.$button[0],l=r.querySelector(".filter-option-inner-inner"),a=document.createTextNode(this.options.multipleSeparator),c=_.fragment.cloneNode(!1),d=!1;if(r.classList.toggle("bs-placeholder",t.multiple?!o:!T(i,n)),this.tabIndex(),"static"===this.options.selectedTextFormat)c=K.text.call(this,{text:this.options.title},!0);else if(!1===(this.multiple&&-1!==this.options.selectedTextFormat.indexOf("count")&&1<o&&(1<(e=this.options.selectedTextFormat.split(">")).length&&o>e[1]||1===e.length&&2<=o))){if(!s){for(var h=0;h<o&&h<50;h++){var p=n[h],u=this.selectpicker.main.data[p.liIndex],f={};this.multiple&&0<h&&c.appendChild(a.cloneNode(!1)),p.title?f.text=p.title:u&&(u.content&&t.options.showContent?(f.content=u.content.toString(),d=!0):(t.options.showIcon&&(f.icon=u.icon),t.options.showSubtext&&!t.multiple&&u.subtext&&(f.subtext=" "+u.subtext),f.text=p.textContent.trim())),c.appendChild(K.text.call(this,f,!0))}49<o&&c.appendChild(document.createTextNode("..."))}}else{var m=':not([hidden]):not([data-hidden="true"]):not([data-divider="true"])';this.options.hideDisabled&&(m+=":not(:disabled)");var v=this.$element[0].querySelectorAll("select > option"+m+", optgroup"+m+" option"+m).length,g="function"==typeof this.options.countSelectedText?this.options.countSelectedText(o,v):this.options.countSelectedText;c=K.text.call(this,{text:g.replace("{0}",o.toString()).replace("{1}",v.toString())},!0)}if(null==this.options.title&&(this.options.title=this.$element.attr("title")),c.childNodes.length||(c=K.text.call(this,{text:void 0!==this.options.title?this.options.title:this.options.noneSelectedText},!0)),r.title=c.textContent.replace(/<[^>]*>?/g,"").trim(),this.options.sanitize&&d&&P([c],t.options.whiteList,t.options.sanitizeFn),l.innerHTML="",l.appendChild(c),R.major<4&&this.$newElement[0].classList.contains("bs3-has-addon")){var b=r.querySelector(".filter-expand"),w=l.cloneNode(!0);w.className="filter-expand",b?r.replaceChild(w,b):r.appendChild(w)}this.$element.trigger("rendered"+j)},setStyle:function(e,t){var i,s=this.$button[0],n=this.$newElement[0],o=this.options.style.trim();this.$element.attr("class")&&this.$newElement.addClass(this.$element.attr("class").replace(/selectpicker|mobile-device|bs-select-hidden|validate\[.*\]/gi,"")),R.major<4&&(n.classList.add("bs3"),n.parentNode.classList.contains("input-group")&&(n.previousElementSibling||n.nextElementSibling)&&(n.previousElementSibling||n.nextElementSibling).classList.contains("input-group-addon")&&n.classList.add("bs3-has-addon")),i=e?e.trim():o,"add"==t?i&&s.classList.add.apply(s.classList,i.split(" ")):"remove"==t?i&&s.classList.remove.apply(s.classList,i.split(" ")):(o&&s.classList.remove.apply(s.classList,o.split(" ")),i&&s.classList.add.apply(s.classList,i.split(" ")))},liHeight:function(e){if(e||!1!==this.options.size&&!Object.keys(this.sizeInfo).length){var t=document.createElement("div"),i=document.createElement("div"),s=document.createElement("div"),n=document.createElement("ul"),o=document.createElement("li"),r=document.createElement("li"),l=document.createElement("li"),a=document.createElement("a"),c=document.createElement("span"),d=this.options.header&&0<this.$menu.find("."+V.POPOVERHEADER).length?this.$menu.find("."+V.POPOVERHEADER)[0].cloneNode(!0):null,h=this.options.liveSearch?document.createElement("div"):null,p=this.options.actionsBox&&this.multiple&&0<this.$menu.find(".bs-actionsbox").length?this.$menu.find(".bs-actionsbox")[0].cloneNode(!0):null,u=this.options.doneButton&&this.multiple&&0<this.$menu.find(".bs-donebutton").length?this.$menu.find(".bs-donebutton")[0].cloneNode(!0):null,f=this.$element.find("option")[0];if(this.sizeInfo.selectWidth=this.$newElement[0].offsetWidth,c.className="text",a.className="dropdown-item "+(f?f.className:""),t.className=this.$menu[0].parentNode.className+" "+V.SHOW,t.style.width=0,"auto"===this.options.width&&(i.style.minWidth=0),i.className=V.MENU+" "+V.SHOW,s.className="inner "+V.SHOW,n.className=V.MENU+" inner "+("4"===R.major?V.SHOW:""),o.className=V.DIVIDER,r.className="dropdown-header",c.appendChild(document.createTextNode("\u200b")),a.appendChild(c),l.appendChild(a),r.appendChild(c.cloneNode(!0)),this.selectpicker.view.widestOption&&n.appendChild(this.selectpicker.view.widestOption.cloneNode(!0)),n.appendChild(l),n.appendChild(o),n.appendChild(r),d&&i.appendChild(d),h){var m=document.createElement("input");h.className="bs-searchbox",m.className="form-control",h.appendChild(m),i.appendChild(h)}p&&i.appendChild(p),s.appendChild(n),i.appendChild(s),u&&i.appendChild(u),t.appendChild(i),document.body.appendChild(t);var v,g=l.offsetHeight,b=r?r.offsetHeight:0,w=d?d.offsetHeight:0,I=h?h.offsetHeight:0,x=p?p.offsetHeight:0,k=u?u.offsetHeight:0,y=z(o).outerHeight(!0),$=!!window.getComputedStyle&&window.getComputedStyle(i),S=i.offsetWidth,E=$?null:z(i),C={vert:L($?$.paddingTop:E.css("paddingTop"))+L($?$.paddingBottom:E.css("paddingBottom"))+L($?$.borderTopWidth:E.css("borderTopWidth"))+L($?$.borderBottomWidth:E.css("borderBottomWidth")),horiz:L($?$.paddingLeft:E.css("paddingLeft"))+L($?$.paddingRight:E.css("paddingRight"))+L($?$.borderLeftWidth:E.css("borderLeftWidth"))+L($?$.borderRightWidth:E.css("borderRightWidth"))},O={vert:C.vert+L($?$.marginTop:E.css("marginTop"))+L($?$.marginBottom:E.css("marginBottom"))+2,horiz:C.horiz+L($?$.marginLeft:E.css("marginLeft"))+L($?$.marginRight:E.css("marginRight"))+2};s.style.overflowY="scroll",v=i.offsetWidth-S,document.body.removeChild(t),this.sizeInfo.liHeight=g,this.sizeInfo.dropdownHeaderHeight=b,this.sizeInfo.headerHeight=w,this.sizeInfo.searchHeight=I,this.sizeInfo.actionsHeight=x,this.sizeInfo.doneButtonHeight=k,this.sizeInfo.dividerHeight=y,this.sizeInfo.menuPadding=C,this.sizeInfo.menuExtras=O,this.sizeInfo.menuWidth=S,this.sizeInfo.menuInnerInnerWidth=S-C.horiz,this.sizeInfo.totalMenuWidth=this.sizeInfo.menuWidth,this.sizeInfo.scrollBarWidth=v,this.sizeInfo.selectHeight=this.$newElement[0].offsetHeight,this.setPositionData()}},getSelectPosition:function(){var e,t=z(window),i=this.$newElement.offset(),s=z(this.options.container);this.options.container&&s.length&&!s.is("body")?((e=s.offset()).top+=parseInt(s.css("borderTopWidth")),e.left+=parseInt(s.css("borderLeftWidth"))):e={top:0,left:0};var n=this.options.windowPadding;this.sizeInfo.selectOffsetTop=i.top-e.top-t.scrollTop(),this.sizeInfo.selectOffsetBot=t.height()-this.sizeInfo.selectOffsetTop-this.sizeInfo.selectHeight-e.top-n[2],this.sizeInfo.selectOffsetLeft=i.left-e.left-t.scrollLeft(),this.sizeInfo.selectOffsetRight=t.width()-this.sizeInfo.selectOffsetLeft-this.sizeInfo.selectWidth-e.left-n[1],this.sizeInfo.selectOffsetTop-=n[0],this.sizeInfo.selectOffsetLeft-=n[3]},setMenuSize:function(e){this.getSelectPosition();var t,i,s,n,o,r,l,a,c=this.sizeInfo.selectWidth,d=this.sizeInfo.liHeight,h=this.sizeInfo.headerHeight,p=this.sizeInfo.searchHeight,u=this.sizeInfo.actionsHeight,f=this.sizeInfo.doneButtonHeight,m=this.sizeInfo.dividerHeight,v=this.sizeInfo.menuPadding,g=0;if(this.options.dropupAuto&&(l=d*this.selectpicker.current.elements.length+v.vert,a=this.sizeInfo.selectOffsetTop-this.sizeInfo.selectOffsetBot>this.sizeInfo.menuExtras.vert&&l+this.sizeInfo.menuExtras.vert+50>this.sizeInfo.selectOffsetBot,!0===this.selectpicker.isSearching&&(a=this.selectpicker.dropup),this.$newElement.toggleClass(V.DROPUP,a),this.selectpicker.dropup=a),"auto"===this.options.size)n=3<this.selectpicker.current.elements.length?3*this.sizeInfo.liHeight+this.sizeInfo.menuExtras.vert-2:0,i=this.sizeInfo.selectOffsetBot-this.sizeInfo.menuExtras.vert,s=n+h+p+u+f,r=Math.max(n-v.vert,0),this.$newElement.hasClass(V.DROPUP)&&(i=this.sizeInfo.selectOffsetTop-this.sizeInfo.menuExtras.vert),t=(o=i)-h-p-u-f-v.vert;else if(this.options.size&&"auto"!=this.options.size&&this.selectpicker.current.elements.length>this.options.size){for(var b=0;b<this.options.size;b++)"divider"===this.selectpicker.current.data[b].type&&g++;t=(i=d*this.options.size+g*m+v.vert)-v.vert,o=i+h+p+u+f,s=r=""}this.$menu.css({"max-height":o+"px",overflow:"hidden","min-height":s+"px"}),this.$menuInner.css({"max-height":t+"px","overflow-y":"auto","min-height":r+"px"}),this.sizeInfo.menuInnerHeight=Math.max(t,1),this.selectpicker.current.data.length&&this.selectpicker.current.data[this.selectpicker.current.data.length-1].position>this.sizeInfo.menuInnerHeight&&(this.sizeInfo.hasScrollBar=!0,this.sizeInfo.totalMenuWidth=this.sizeInfo.menuWidth+this.sizeInfo.scrollBarWidth),"auto"===this.options.dropdownAlignRight&&this.$menu.toggleClass(V.MENURIGHT,this.sizeInfo.selectOffsetLeft>this.sizeInfo.selectOffsetRight&&this.sizeInfo.selectOffsetRight<this.sizeInfo.totalMenuWidth-c),this.dropdown&&this.dropdown._popper&&this.dropdown._popper.update()},setSize:function(e){if(this.liHeight(e),this.options.header&&this.$menu.css("padding-top",0),!1!==this.options.size){var t=this,i=z(window);this.setMenuSize(),this.options.liveSearch&&this.$searchbox.off("input.setMenuSize propertychange.setMenuSize").on("input.setMenuSize propertychange.setMenuSize",function(){return t.setMenuSize()}),"auto"===this.options.size?i.off("resize"+j+"."+this.selectId+".setMenuSize scroll"+j+"."+this.selectId+".setMenuSize").on("resize"+j+"."+this.selectId+".setMenuSize scroll"+j+"."+this.selectId+".setMenuSize",function(){return t.setMenuSize()}):this.options.size&&"auto"!=this.options.size&&this.selectpicker.current.elements.length>this.options.size&&i.off("resize"+j+"."+this.selectId+".setMenuSize scroll"+j+"."+this.selectId+".setMenuSize")}this.createView(!1,!0,e)},setWidth:function(){var i=this;"auto"===this.options.width?requestAnimationFrame(function(){i.$menu.css("min-width","0"),i.$element.on("loaded"+j,function(){i.liHeight(),i.setMenuSize();var e=i.$newElement.clone().appendTo("body"),t=e.css("width","auto").children("button").outerWidth();e.remove(),i.sizeInfo.selectWidth=Math.max(i.sizeInfo.totalMenuWidth,t),i.$newElement.css("width",i.sizeInfo.selectWidth+"px")})}):"fit"===this.options.width?(this.$menu.css("min-width",""),this.$newElement.css("width","").addClass("fit-width")):this.options.width?(this.$menu.css("min-width",""),this.$newElement.css("width",this.options.width)):(this.$menu.css("min-width",""),this.$newElement.css("width","")),this.$newElement.hasClass("fit-width")&&"fit"!==this.options.width&&this.$newElement[0].classList.remove("fit-width")},selectPosition:function(){this.$bsContainer=z('<div class="bs-container" />');function e(e){var t={},i=r.options.display||!!z.fn.dropdown.Constructor.Default&&z.fn.dropdown.Constructor.Default.display;r.$bsContainer.addClass(e.attr("class").replace(/form-control|fit-width/gi,"")).toggleClass(V.DROPUP,e.hasClass(V.DROPUP)),s=e.offset(),l.is("body")?n={top:0,left:0}:((n=l.offset()).top+=parseInt(l.css("borderTopWidth"))-l.scrollTop(),n.left+=parseInt(l.css("borderLeftWidth"))-l.scrollLeft()),o=e.hasClass(V.DROPUP)?0:e[0].offsetHeight,(R.major<4||"static"===i)&&(t.top=s.top-n.top+o,t.left=s.left-n.left),t.width=e[0].offsetWidth,r.$bsContainer.css(t)}var s,n,o,r=this,l=z(this.options.container);this.$button.on("click.bs.dropdown.data-api",function(){r.isDisabled()||(e(r.$newElement),r.$bsContainer.appendTo(r.options.container).toggleClass(V.SHOW,!r.$button.hasClass(V.SHOW)).append(r.$menu))}),z(window).off("resize"+j+"."+this.selectId+" scroll"+j+"."+this.selectId).on("resize"+j+"."+this.selectId+" scroll"+j+"."+this.selectId,function(){r.$newElement.hasClass(V.SHOW)&&e(r.$newElement)}),this.$element.on("hide"+j,function(){r.$menu.data("height",r.$menu.height()),r.$bsContainer.detach()})},setOptionStatus:function(e){var t=this;if(t.noScroll=!1,t.selectpicker.view.visibleElements&&t.selectpicker.view.visibleElements.length)for(var i=0;i<t.selectpicker.view.visibleElements.length;i++){var s=t.selectpicker.current.data[i+t.selectpicker.view.position0],n=s.option;n&&(!0!==e&&t.setDisabled(s.index,s.disabled),t.setSelected(s.index,n.selected))}},setSelected:function(e,t){var i,s,n=this.selectpicker.main.elements[e],o=this.selectpicker.main.data[e],r=void 0!==this.activeIndex,l=this.activeIndex===e||t&&!this.multiple&&!r;o.selected=t,s=n.firstChild,t&&(this.selectedIndex=e),n.classList.toggle("selected",t),l?(this.focusItem(n,o),this.selectpicker.view.currentActive=n,this.activeIndex=e):this.defocusItem(n),s&&(s.classList.toggle("selected",t),t?s.setAttribute("aria-selected",!0):this.multiple?s.setAttribute("aria-selected",!1):s.removeAttribute("aria-selected")),l||r||!t||void 0===this.prevActiveIndex||(i=this.selectpicker.main.elements[this.prevActiveIndex],this.defocusItem(i))},setDisabled:function(e,t){var i,s=this.selectpicker.main.elements[e];this.selectpicker.main.data[e].disabled=t,i=s.firstChild,s.classList.toggle(V.DISABLED,t),i&&("4"===R.major&&i.classList.toggle(V.DISABLED,t),t?(i.setAttribute("aria-disabled",t),i.setAttribute("tabindex",-1)):(i.removeAttribute("aria-disabled"),i.setAttribute("tabindex",0)))},isDisabled:function(){return this.$element[0].disabled},checkDisabled:function(){this.isDisabled()?(this.$newElement[0].classList.add(V.DISABLED),this.$button.addClass(V.DISABLED).attr("tabindex",-1).attr("aria-disabled",!0)):(this.$button[0].classList.contains(V.DISABLED)&&(this.$newElement[0].classList.remove(V.DISABLED),this.$button.removeClass(V.DISABLED).attr("aria-disabled",!1)),-1!=this.$button.attr("tabindex")||this.$element.data("tabindex")||this.$button.removeAttr("tabindex"))},tabIndex:function(){this.$element.data("tabindex")!==this.$element.attr("tabindex")&&-98!==this.$element.attr("tabindex")&&"-98"!==this.$element.attr("tabindex")&&(this.$element.data("tabindex",this.$element.attr("tabindex")),this.$button.attr("tabindex",this.$element.data("tabindex"))),this.$element.attr("tabindex",-98)},clickListener:function(){var C=this,t=z(document);function e(){C.options.liveSearch?C.$searchbox.trigger("focus"):C.$menuInner.trigger("focus")}function i(){C.dropdown&&C.dropdown._popper&&C.dropdown._popper.state.isCreated?e():requestAnimationFrame(i)}t.data("spaceSelect",!1),this.$button.on("keyup",function(e){/(32)/.test(e.keyCode.toString(10))&&t.data("spaceSelect")&&(e.preventDefault(),t.data("spaceSelect",!1))}),this.$newElement.on("show.bs.dropdown",function(){3<R.major&&!C.dropdown&&(C.dropdown=C.$button.data("bs.dropdown"),C.dropdown._menu=C.$menu[0])}),this.$button.on("click.bs.dropdown.data-api",function(){C.$newElement.hasClass(V.SHOW)||C.setSize()}),this.$element.on("shown"+j,function(){C.$menuInner[0].scrollTop!==C.selectpicker.view.scrollTop&&(C.$menuInner[0].scrollTop=C.selectpicker.view.scrollTop),3<R.major?requestAnimationFrame(i):e()}),this.$menuInner.on("mouseenter","li a",function(e){var t=this.parentElement,i=C.isVirtual()?C.selectpicker.view.position0:0,s=Array.prototype.indexOf.call(t.parentElement.children,t),n=C.selectpicker.current.data[s+i];C.focusItem(t,n,!0)}),this.$menuInner.on("click","li a",function(e,t){var i=z(this),s=C.$element[0],n=C.isVirtual()?C.selectpicker.view.position0:0,o=C.selectpicker.current.data[i.parent().index()+n],r=o.index,l=T(s),a=s.selectedIndex,c=s.options[a],d=!0;if(C.multiple&&1!==C.options.maxOptions&&e.stopPropagation(),e.preventDefault(),!C.isDisabled()&&!i.parent().hasClass(V.DISABLED)){var h=o.option,p=z(h),u=h.selected,f=p.parent("optgroup"),m=f.find("option"),v=C.options.maxOptions,g=f.data("maxOptions")||!1;if(r===C.activeIndex&&(t=!0),t||(C.prevActiveIndex=C.activeIndex,C.activeIndex=void 0),C.multiple){if(h.selected=!u,C.setSelected(r,!u),i.trigger("blur"),!1!==v||!1!==g){var b=v<O(s).length,w=g<f.find("option:selected").length;if(v&&b||g&&w)if(v&&1==v)s.selectedIndex=-1,h.selected=!0,C.setOptionStatus(!0);else if(g&&1==g){for(var I=0;I<m.length;I++){var x=m[I];x.selected=!1,C.setSelected(x.liIndex,!1)}h.selected=!0,C.setSelected(r,!0)}else{var k="string"==typeof C.options.maxOptionsText?[C.options.maxOptionsText,C.options.maxOptionsText]:C.options.maxOptionsText,y="function"==typeof k?k(v,g):k,$=y[0].replace("{n}",v),S=y[1].replace("{n}",g),E=z('<div class="notify"></div>');y[2]&&($=$.replace("{var}",y[2][1<v?0:1]),S=S.replace("{var}",y[2][1<g?0:1])),h.selected=!1,C.$menu.append(E),v&&b&&(E.append(z("<div>"+$+"</div>")),d=!1,C.$element.trigger("maxReached"+j)),g&&w&&(E.append(z("<div>"+S+"</div>")),d=!1,C.$element.trigger("maxReachedGrp"+j)),setTimeout(function(){C.setSelected(r,!1)},10),E[0].classList.add("fadeOut"),setTimeout(function(){E.remove()},1050)}}}else c&&(c.selected=!1),h.selected=!0,C.setSelected(r,!0);!C.multiple||C.multiple&&1===C.options.maxOptions?C.$button.trigger("focus"):C.options.liveSearch&&C.$searchbox.trigger("focus"),d&&(!C.multiple&&a===s.selectedIndex||(A=[h.index,p.prop("selected"),l],C.$element.triggerNative("change")))}}),this.$menu.on("click","li."+V.DISABLED+" a, ."+V.POPOVERHEADER+", ."+V.POPOVERHEADER+" :not(.close)",function(e){e.currentTarget==this&&(e.preventDefault(),e.stopPropagation(),C.options.liveSearch&&!z(e.target).hasClass("close")?C.$searchbox.trigger("focus"):C.$button.trigger("focus"))}),this.$menuInner.on("click",".divider, .dropdown-header",function(e){e.preventDefault(),e.stopPropagation(),C.options.liveSearch?C.$searchbox.trigger("focus"):C.$button.trigger("focus")}),this.$menu.on("click","."+V.POPOVERHEADER+" .close",function(){C.$button.trigger("click")}),this.$searchbox.on("click",function(e){e.stopPropagation()}),this.$menu.on("click",".actions-btn",function(e){C.options.liveSearch?C.$searchbox.trigger("focus"):C.$button.trigger("focus"),e.preventDefault(),e.stopPropagation(),z(this).hasClass("bs-select-all")?C.selectAll():C.deselectAll()}),this.$element.on("change"+j,function(){C.render(),C.$element.trigger("changed"+j,A),A=null}).on("focus"+j,function(){C.options.mobile||C.$button.trigger("focus")})},liveSearchListener:function(){var u=this,f=document.createElement("li");this.$button.on("click.bs.dropdown.data-api",function(){u.$searchbox.val()&&u.$searchbox.val("")}),this.$searchbox.on("click.bs.dropdown.data-api focus.bs.dropdown.data-api touchend.bs.dropdown.data-api",function(e){e.stopPropagation()}),this.$searchbox.on("input propertychange",function(){var e=u.$searchbox.val();if(u.selectpicker.search.elements=[],u.selectpicker.search.data=[],e){var t=[],i=e.toUpperCase(),s={},n=[],o=u._searchStyle(),r=u.options.liveSearchNormalize;r&&(i=w(i));for(var l=0;l<u.selectpicker.main.data.length;l++){var a=u.selectpicker.main.data[l];s[l]||(s[l]=k(a,i,o,r)),s[l]&&void 0!==a.headerIndex&&-1===n.indexOf(a.headerIndex)&&(0<a.headerIndex&&(s[a.headerIndex-1]=!0,n.push(a.headerIndex-1)),s[a.headerIndex]=!0,n.push(a.headerIndex),s[a.lastIndex+1]=!0),s[l]&&"optgroup-label"!==a.type&&n.push(l)}l=0;for(var c=n.length;l<c;l++){var d=n[l],h=n[l-1],p=(a=u.selectpicker.main.data[d],u.selectpicker.main.data[h]);("divider"!==a.type||"divider"===a.type&&p&&"divider"!==p.type&&c-1!==l)&&(u.selectpicker.search.data.push(a),t.push(u.selectpicker.main.elements[d]))}u.activeIndex=void 0,u.noScroll=!0,u.$menuInner.scrollTop(0),u.selectpicker.search.elements=t,u.createView(!0),t.length||(f.className="no-results",f.innerHTML=u.options.noneResultsText.replace("{0}",'"'+S(e)+'"'),u.$menuInner[0].firstChild.appendChild(f))}else u.$menuInner.scrollTop(0),u.createView(!1)})},_searchStyle:function(){return this.options.liveSearchStyle||"contains"},val:function(e){var t=this.$element[0];if(void 0===e)return this.$element.val();var i=T(t);if(A=[null,null,i],this.$element.val(e).trigger("changed"+j,A),this.$newElement.hasClass(V.SHOW))if(this.multiple)this.setOptionStatus(!0);else{var s=(t.options[t.selectedIndex]||{}).liIndex;"number"==typeof s&&(this.setSelected(this.selectedIndex,!1),this.setSelected(s,!0))}return this.render(),A=null,this.$element},changeAll:function(e){if(this.multiple){void 0===e&&(e=!0);var t=this.$element[0],i=0,s=0,n=T(t);t.classList.add("bs-select-hidden");for(var o=0,r=this.selectpicker.current.data,l=r.length;o<l;o++){var a=r[o],c=a.option;c&&!a.disabled&&"divider"!==a.type&&(a.selected&&i++,!0===(c.selected=e)&&s++)}t.classList.remove("bs-select-hidden"),i!==s&&(this.setOptionStatus(),A=[null,null,n],this.$element.triggerNative("change"))}},selectAll:function(){return this.changeAll(!0)},deselectAll:function(){return this.changeAll(!1)},toggle:function(e){(e=e||window.event)&&e.stopPropagation(),this.$button.trigger("click.bs.dropdown.data-api")},keydown:function(e){var t,i,s,n,o,r=z(this),l=r.hasClass("dropdown-toggle"),a=(l?r.closest(".dropdown"):r.closest(F.MENU)).data("this"),c=a.findLis(),d=!1,h=e.which===W&&!l&&!a.options.selectOnTab,p=G.test(e.which)||h,u=a.$menuInner[0].scrollTop,f=!0===a.isVirtual()?a.selectpicker.view.position0:0;if(!(112<=e.which&&e.which<=123))if(!(i=a.$newElement.hasClass(V.SHOW))&&(p||48<=e.which&&e.which<=57||96<=e.which&&e.which<=105||65<=e.which&&e.which<=90)&&(a.$button.trigger("click.bs.dropdown.data-api"),a.options.liveSearch))a.$searchbox.trigger("focus");else{if(e.which===N&&i&&(e.preventDefault(),a.$button.trigger("click.bs.dropdown.data-api").trigger("focus")),p){if(!c.length)return;-1!==(t=(s=a.selectpicker.main.elements[a.activeIndex])?Array.prototype.indexOf.call(s.parentElement.children,s):-1)&&a.defocusItem(s),e.which===B?(-1!==t&&t--,t+f<0&&(t+=c.length),a.selectpicker.view.canHighlight[t+f]||-1===(t=a.selectpicker.view.canHighlight.slice(0,t+f).lastIndexOf(!0)-f)&&(t=c.length-1)):e.which!==M&&!h||(++t+f>=a.selectpicker.view.canHighlight.length&&(t=0),a.selectpicker.view.canHighlight[t+f]||(t=t+1+a.selectpicker.view.canHighlight.slice(t+f+1).indexOf(!0))),e.preventDefault();var m=f+t;e.which===B?0===f&&t===c.length-1?(a.$menuInner[0].scrollTop=a.$menuInner[0].scrollHeight,m=a.selectpicker.current.elements.length-1):d=(o=(n=a.selectpicker.current.data[m]).position-n.height)<u:e.which!==M&&!h||(0===t?m=a.$menuInner[0].scrollTop=0:d=u<(o=(n=a.selectpicker.current.data[m]).position-a.sizeInfo.menuInnerHeight)),s=a.selectpicker.current.elements[m],a.activeIndex=a.selectpicker.current.data[m].index,a.focusItem(s),a.selectpicker.view.currentActive=s,d&&(a.$menuInner[0].scrollTop=o),a.options.liveSearch?a.$searchbox.trigger("focus"):r.trigger("focus")}else if(!r.is("input")&&!q.test(e.which)||e.which===H&&a.selectpicker.keydown.keyHistory){var v,g,b=[];e.preventDefault(),a.selectpicker.keydown.keyHistory+=C[e.which],a.selectpicker.keydown.resetKeyHistory.cancel&&clearTimeout(a.selectpicker.keydown.resetKeyHistory.cancel),a.selectpicker.keydown.resetKeyHistory.cancel=a.selectpicker.keydown.resetKeyHistory.start(),g=a.selectpicker.keydown.keyHistory,/^(.)\1+$/.test(g)&&(g=g.charAt(0));for(var w=0;w<a.selectpicker.current.data.length;w++){var I=a.selectpicker.current.data[w];k(I,g,"startsWith",!0)&&a.selectpicker.view.canHighlight[w]&&b.push(I.index)}if(b.length){var x=0;c.removeClass("active").find("a").removeClass("active"),1===g.length&&(-1===(x=b.indexOf(a.activeIndex))||x===b.length-1?x=0:x++),v=b[x],d=0<u-(n=a.selectpicker.main.data[v]).position?(o=n.position-n.height,!0):(o=n.position-a.sizeInfo.menuInnerHeight,n.position>u+a.sizeInfo.menuInnerHeight),s=a.selectpicker.main.elements[v],a.activeIndex=b[x],a.focusItem(s),s&&s.firstChild.focus(),d&&(a.$menuInner[0].scrollTop=o),r.trigger("focus")}}i&&(e.which===H&&!a.selectpicker.keydown.keyHistory||e.which===D||e.which===W&&a.options.selectOnTab)&&(e.which!==H&&e.preventDefault(),a.options.liveSearch&&e.which===H||(a.$menuInner.find(".active a").trigger("click",!0),r.trigger("focus"),a.options.liveSearch||(e.preventDefault(),z(document).data("spaceSelect",!0))))}},mobile:function(){this.$element[0].classList.add("mobile-device")},refresh:function(){var e=z.extend({},this.options,this.$element.data());this.options=e,this.checkDisabled(),this.setStyle(),this.render(),this.buildData(),this.buildList(),this.setWidth(),this.setSize(!0),this.$element.trigger("refreshed"+j)},hide:function(){this.$newElement.hide()},show:function(){this.$newElement.show()},remove:function(){this.$newElement.remove(),this.$element.remove()},destroy:function(){this.$newElement.before(this.$element).remove(),this.$bsContainer?this.$bsContainer.remove():this.$menu.remove(),this.$element.off(j).removeData("selectpicker").removeClass("bs-select-hidden selectpicker"),z(window).off(j+"."+this.selectId)}};var J=z.fn.selectpicker;z.fn.selectpicker=Z,z.fn.selectpicker.Constructor=Y,z.fn.selectpicker.noConflict=function(){return z.fn.selectpicker=J,this};var Q=z.fn.dropdown.Constructor._dataApiKeydownHandler||z.fn.dropdown.Constructor.prototype.keydown;z(document).off("keydown.bs.dropdown.data-api").on("keydown.bs.dropdown.data-api",':not(.bootstrap-select) > [data-toggle="dropdown"]',Q).on("keydown.bs.dropdown.data-api",":not(.bootstrap-select) > .dropdown-menu",Q).on("keydown"+j,'.bootstrap-select [data-toggle="dropdown"], .bootstrap-select [role="listbox"], .bootstrap-select .bs-searchbox input',Y.prototype.keydown).on("focusin.modal",'.bootstrap-select [data-toggle="dropdown"], .bootstrap-select [role="listbox"], .bootstrap-select .bs-searchbox input',function(e){e.stopPropagation()}),z(window).on("load"+j+".data-api",function(){z(".selectpicker").each(function(){var e=z(this);Z.call(e,e.data())})})}(e)});
-//# sourceMappingURL=bootstrap-select.min.js.map
\ No newline at end of file
diff --git a/data/interfaces/default/js/bootstrap.min.js b/data/interfaces/default/js/bootstrap.min.js
deleted file mode 100644
index f9d2f1bf..00000000
--- a/data/interfaces/default/js/bootstrap.min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*!
- * Bootstrap v3.4.1 (https://getbootstrap.com/)
- * Copyright 2011-2019 Twitter, Inc.
- * Licensed under the MIT license
- */
-if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");!function(t){"use strict";var e=jQuery.fn.jquery.split(" ")[0].split(".");if(e[0]<2&&e[1]<9||1==e[0]&&9==e[1]&&e[2]<1||e[0]>3)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4")}(),function(t){"use strict";t.fn.emulateTransitionEnd=function(e){var i=!1,o=this;t(this).one("bsTransitionEnd",function(){i=!0});return setTimeout(function(){i||t(o).trigger(t.support.transition.end)},e),this},t(function(){t.support.transition=function(){var t=document.createElement("bootstrap"),e={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var i in e)if(void 0!==t.style[i])return{end:e[i]};return!1}(),t.support.transition&&(t.event.special.bsTransitionEnd={bindType:t.support.transition.end,delegateType:t.support.transition.end,handle:function(e){if(t(e.target).is(this))return e.handleObj.handler.apply(this,arguments)}})})}(jQuery),function(t){"use strict";var e='[data-dismiss="alert"]',i=function(i){t(i).on("click",e,this.close)};i.VERSION="3.4.1",i.TRANSITION_DURATION=150,i.prototype.close=function(e){var o=t(this),n=o.attr("data-target");n||(n=(n=o.attr("href"))&&n.replace(/.*(?=#[^\s]*$)/,"")),n="#"===n?[]:n;var s=t(document).find(n);function a(){s.detach().trigger("closed.bs.alert").remove()}e&&e.preventDefault(),s.length||(s=o.closest(".alert")),s.trigger(e=t.Event("close.bs.alert")),e.isDefaultPrevented()||(s.removeClass("in"),t.support.transition&&s.hasClass("fade")?s.one("bsTransitionEnd",a).emulateTransitionEnd(i.TRANSITION_DURATION):a())};var o=t.fn.alert;t.fn.alert=function(e){return this.each(function(){var o=t(this),n=o.data("bs.alert");n||o.data("bs.alert",n=new i(this)),"string"==typeof e&&n[e].call(o)})},t.fn.alert.Constructor=i,t.fn.alert.noConflict=function(){return t.fn.alert=o,this},t(document).on("click.bs.alert.data-api",e,i.prototype.close)}(jQuery),function(t){"use strict";var e=function(i,o){this.$element=t(i),this.options=t.extend({},e.DEFAULTS,o),this.isLoading=!1};function i(i){return this.each(function(){var o=t(this),n=o.data("bs.button"),s="object"==typeof i&&i;n||o.data("bs.button",n=new e(this,s)),"toggle"==i?n.toggle():i&&n.setState(i)})}e.VERSION="3.4.1",e.DEFAULTS={loadingText:"loading..."},e.prototype.setState=function(e){var i="disabled",o=this.$element,n=o.is("input")?"val":"html",s=o.data();e+="Text",null==s.resetText&&o.data("resetText",o[n]()),setTimeout(t.proxy(function(){o[n](null==s[e]?this.options[e]:s[e]),"loadingText"==e?(this.isLoading=!0,o.addClass(i).attr(i,i).prop(i,!0)):this.isLoading&&(this.isLoading=!1,o.removeClass(i).removeAttr(i).prop(i,!1))},this),0)},e.prototype.toggle=function(){var t=!0,e=this.$element.closest('[data-toggle="buttons"]');if(e.length){var i=this.$element.find("input");"radio"==i.prop("type")?(i.prop("checked")&&(t=!1),e.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==i.prop("type")&&(i.prop("checked")!==this.$element.hasClass("active")&&(t=!1),this.$element.toggleClass("active")),i.prop("checked",this.$element.hasClass("active")),t&&i.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")};var o=t.fn.button;t.fn.button=i,t.fn.button.Constructor=e,t.fn.button.noConflict=function(){return t.fn.button=o,this},t(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(e){var o=t(e.target).closest(".btn");i.call(o,"toggle"),t(e.target).is('input[type="radio"], input[type="checkbox"]')||(e.preventDefault(),o.is("input,button")?o.trigger("focus"):o.find("input:visible,button:visible").first().trigger("focus"))}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(e){t(e.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(e.type))})}(jQuery),function(t){"use strict";var e=function(e,i){this.$element=t(e),this.$indicators=this.$element.find(".carousel-indicators"),this.options=i,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",t.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",t.proxy(this.pause,this)).on("mouseleave.bs.carousel",t.proxy(this.cycle,this))};function i(i){return this.each(function(){var o=t(this),n=o.data("bs.carousel"),s=t.extend({},e.DEFAULTS,o.data(),"object"==typeof i&&i),a="string"==typeof i?i:s.slide;n||o.data("bs.carousel",n=new e(this,s)),"number"==typeof i?n.to(i):a?n[a]():s.interval&&n.pause().cycle()})}e.VERSION="3.4.1",e.TRANSITION_DURATION=600,e.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},e.prototype.keydown=function(t){if(!/input|textarea/i.test(t.target.tagName)){switch(t.which){case 37:this.prev();break;case 39:this.next();break;default:return}t.preventDefault()}},e.prototype.cycle=function(e){return e||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(t.proxy(this.next,this),this.options.interval)),this},e.prototype.getItemIndex=function(t){return this.$items=t.parent().children(".item"),this.$items.index(t||this.$active)},e.prototype.getItemForDirection=function(t,e){var i=this.getItemIndex(e);if(("prev"==t&&0===i||"next"==t&&i==this.$items.length-1)&&!this.options.wrap)return e;var o=(i+("prev"==t?-1:1))%this.$items.length;return this.$items.eq(o)},e.prototype.to=function(t){var e=this,i=this.getItemIndex(this.$active=this.$element.find(".item.active"));if(!(t>this.$items.length-1||t<0))return this.sliding?this.$element.one("slid.bs.carousel",function(){e.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",this.$items.eq(t))},e.prototype.pause=function(e){return e||(this.paused=!0),this.$element.find(".next, .prev").length&&t.support.transition&&(this.$element.trigger(t.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},e.prototype.next=function(){if(!this.sliding)return this.slide("next")},e.prototype.prev=function(){if(!this.sliding)return this.slide("prev")},e.prototype.slide=function(i,o){var n=this.$element.find(".item.active"),s=o||this.getItemForDirection(i,n),a=this.interval,r="next"==i?"left":"right",l=this;if(s.hasClass("active"))return this.sliding=!1;var h=s[0],d=t.Event("slide.bs.carousel",{relatedTarget:h,direction:r});if(this.$element.trigger(d),!d.isDefaultPrevented()){if(this.sliding=!0,a&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var p=t(this.$indicators.children()[this.getItemIndex(s)]);p&&p.addClass("active")}var c=t.Event("slid.bs.carousel",{relatedTarget:h,direction:r});return t.support.transition&&this.$element.hasClass("slide")?(s.addClass(i),"object"==typeof s&&s.length&&s[0].offsetWidth,n.addClass(r),s.addClass(r),n.one("bsTransitionEnd",function(){s.removeClass([i,r].join(" ")).addClass("active"),n.removeClass(["active",r].join(" ")),l.sliding=!1,setTimeout(function(){l.$element.trigger(c)},0)}).emulateTransitionEnd(e.TRANSITION_DURATION)):(n.removeClass("active"),s.addClass("active"),this.sliding=!1,this.$element.trigger(c)),a&&this.cycle(),this}};var o=t.fn.carousel;t.fn.carousel=i,t.fn.carousel.Constructor=e,t.fn.carousel.noConflict=function(){return t.fn.carousel=o,this};var n=function(e){var o=t(this),n=o.attr("href");n&&(n=n.replace(/.*(?=#[^\s]+$)/,""));var s=o.attr("data-target")||n,a=t(document).find(s);if(a.hasClass("carousel")){var r=t.extend({},a.data(),o.data()),l=o.attr("data-slide-to");l&&(r.interval=!1),i.call(a,r),l&&a.data("bs.carousel").to(l),e.preventDefault()}};t(document).on("click.bs.carousel.data-api","[data-slide]",n).on("click.bs.carousel.data-api","[data-slide-to]",n),t(window).on("load",function(){t('[data-ride="carousel"]').each(function(){var e=t(this);i.call(e,e.data())})})}(jQuery),function(t){"use strict";var e=function(i,o){this.$element=t(i),this.options=t.extend({},e.DEFAULTS,o),this.$trigger=t('[data-toggle="collapse"][href="#'+i.id+'"],[data-toggle="collapse"][data-target="#'+i.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};function i(e){var i,o=e.attr("data-target")||(i=e.attr("href"))&&i.replace(/.*(?=#[^\s]+$)/,"");return t(document).find(o)}function o(i){return this.each(function(){var o=t(this),n=o.data("bs.collapse"),s=t.extend({},e.DEFAULTS,o.data(),"object"==typeof i&&i);!n&&s.toggle&&/show|hide/.test(i)&&(s.toggle=!1),n||o.data("bs.collapse",n=new e(this,s)),"string"==typeof i&&n[i]()})}e.VERSION="3.4.1",e.TRANSITION_DURATION=350,e.DEFAULTS={toggle:!0},e.prototype.dimension=function(){return this.$element.hasClass("width")?"width":"height"},e.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var i,n=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(n&&n.length&&(i=n.data("bs.collapse"))&&i.transitioning)){var s=t.Event("show.bs.collapse");if(this.$element.trigger(s),!s.isDefaultPrevented()){n&&n.length&&(o.call(n,"hide"),i||n.data("bs.collapse",null));var a=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[a](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var r=function(){this.$element.removeClass("collapsing").addClass("collapse in")[a](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!t.support.transition)return r.call(this);var l=t.camelCase(["scroll",a].join("-"));this.$element.one("bsTransitionEnd",t.proxy(r,this)).emulateTransitionEnd(e.TRANSITION_DURATION)[a](this.$element[0][l])}}}},e.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var i=t.Event("hide.bs.collapse");if(this.$element.trigger(i),!i.isDefaultPrevented()){var o=this.dimension();this.$element[o](this.$element[o]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var n=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};if(!t.support.transition)return n.call(this);this.$element[o](0).one("bsTransitionEnd",t.proxy(n,this)).emulateTransitionEnd(e.TRANSITION_DURATION)}}},e.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},e.prototype.getParent=function(){return t(document).find(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(t.proxy(function(e,o){var n=t(o);this.addAriaAndCollapsedClass(i(n),n)},this)).end()},e.prototype.addAriaAndCollapsedClass=function(t,e){var i=t.hasClass("in");t.attr("aria-expanded",i),e.toggleClass("collapsed",!i).attr("aria-expanded",i)};var n=t.fn.collapse;t.fn.collapse=o,t.fn.collapse.Constructor=e,t.fn.collapse.noConflict=function(){return t.fn.collapse=n,this},t(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(e){var n=t(this);n.attr("data-target")||e.preventDefault();var s=i(n),a=s.data("bs.collapse")?"toggle":n.data();o.call(s,a)})}(jQuery),function(t){"use strict";var e=".dropdown-backdrop",i='[data-toggle="dropdown"]',o=function(e){t(e).on("click.bs.dropdown",this.toggle)};function n(e){var i=e.attr("data-target");i||(i=(i=e.attr("href"))&&/#[A-Za-z]/.test(i)&&i.replace(/.*(?=#[^\s]*$)/,""));var o="#"!==i?t(document).find(i):null;return o&&o.length?o:e.parent()}function s(o){o&&3===o.which||(t(e).remove(),t(i).each(function(){var e=t(this),i=n(e),s={relatedTarget:this};i.hasClass("open")&&(o&&"click"==o.type&&/input|textarea/i.test(o.target.tagName)&&t.contains(i[0],o.target)||(i.trigger(o=t.Event("hide.bs.dropdown",s)),o.isDefaultPrevented()||(e.attr("aria-expanded","false"),i.removeClass("open").trigger(t.Event("hidden.bs.dropdown",s)))))}))}o.VERSION="3.4.1",o.prototype.toggle=function(e){var i=t(this);if(!i.is(".disabled, :disabled")){var o=n(i),a=o.hasClass("open");if(s(),!a){"ontouchstart"in document.documentElement&&!o.closest(".navbar-nav").length&&t(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(t(this)).on("click",s);var r={relatedTarget:this};if(o.trigger(e=t.Event("show.bs.dropdown",r)),e.isDefaultPrevented())return;i.trigger("focus").attr("aria-expanded","true"),o.toggleClass("open").trigger(t.Event("shown.bs.dropdown",r))}return!1}},o.prototype.keydown=function(e){if(/(38|40|27|32)/.test(e.which)&&!/input|textarea/i.test(e.target.tagName)){var o=t(this);if(e.preventDefault(),e.stopPropagation(),!o.is(".disabled, :disabled")){var s=n(o),a=s.hasClass("open");if(!a&&27!=e.which||a&&27==e.which)return 27==e.which&&s.find(i).trigger("focus"),o.trigger("click");var r=s.find(".dropdown-menu li:not(.disabled):visible a");if(r.length){var l=r.index(e.target);38==e.which&&l>0&&l--,40==e.which&&l<r.length-1&&l++,~l||(l=0),r.eq(l).trigger("focus")}}}};var a=t.fn.dropdown;t.fn.dropdown=function(e){return this.each(function(){var i=t(this),n=i.data("bs.dropdown");n||i.data("bs.dropdown",n=new o(this)),"string"==typeof e&&n[e].call(i)})},t.fn.dropdown.Constructor=o,t.fn.dropdown.noConflict=function(){return t.fn.dropdown=a,this},t(document).on("click.bs.dropdown.data-api",s).on("click.bs.dropdown.data-api",".dropdown form",function(t){t.stopPropagation()}).on("click.bs.dropdown.data-api",i,o.prototype.toggle).on("keydown.bs.dropdown.data-api",i,o.prototype.keydown).on("keydown.bs.dropdown.data-api",".dropdown-menu",o.prototype.keydown)}(jQuery),function(t){"use strict";var e=function(e,i){this.options=i,this.$body=t(document.body),this.$element=t(e),this.$dialog=this.$element.find(".modal-dialog"),this.$backdrop=null,this.isShown=null,this.originalBodyPad=null,this.scrollbarWidth=0,this.ignoreBackdropClick=!1,this.fixedContent=".navbar-fixed-top, .navbar-fixed-bottom",this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,t.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))};function i(i,o){return this.each(function(){var n=t(this),s=n.data("bs.modal"),a=t.extend({},e.DEFAULTS,n.data(),"object"==typeof i&&i);s||n.data("bs.modal",s=new e(this,a)),"string"==typeof i?s[i](o):a.show&&s.show(o)})}e.VERSION="3.4.1",e.TRANSITION_DURATION=300,e.BACKDROP_TRANSITION_DURATION=150,e.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},e.prototype.toggle=function(t){return this.isShown?this.hide():this.show(t)},e.prototype.show=function(i){var o=this,n=t.Event("show.bs.modal",{relatedTarget:i});this.$element.trigger(n),this.isShown||n.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.setScrollbar(),this.$body.addClass("modal-open"),this.escape(),this.resize(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',t.proxy(this.hide,this)),this.$dialog.on("mousedown.dismiss.bs.modal",function(){o.$element.one("mouseup.dismiss.bs.modal",function(e){t(e.target).is(o.$element)&&(o.ignoreBackdropClick=!0)})}),this.backdrop(function(){var n=t.support.transition&&o.$element.hasClass("fade");o.$element.parent().length||o.$element.appendTo(o.$body),o.$element.show().scrollTop(0),o.adjustDialog(),n&&o.$element[0].offsetWidth,o.$element.addClass("in"),o.enforceFocus();var s=t.Event("shown.bs.modal",{relatedTarget:i});n?o.$dialog.one("bsTransitionEnd",function(){o.$element.trigger("focus").trigger(s)}).emulateTransitionEnd(e.TRANSITION_DURATION):o.$element.trigger("focus").trigger(s)}))},e.prototype.hide=function(i){i&&i.preventDefault(),i=t.Event("hide.bs.modal"),this.$element.trigger(i),this.isShown&&!i.isDefaultPrevented()&&(this.isShown=!1,this.escape(),this.resize(),t(document).off("focusin.bs.modal"),this.$element.removeClass("in").off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"),this.$dialog.off("mousedown.dismiss.bs.modal"),t.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTransitionEnd",t.proxy(this.hideModal,this)).emulateTransitionEnd(e.TRANSITION_DURATION):this.hideModal())},e.prototype.enforceFocus=function(){t(document).off("focusin.bs.modal").on("focusin.bs.modal",t.proxy(function(t){document===t.target||this.$element[0]===t.target||this.$element.has(t.target).length||this.$element.trigger("focus")},this))},e.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keydown.dismiss.bs.modal",t.proxy(function(t){27==t.which&&this.hide()},this)):this.isShown||this.$element.off("keydown.dismiss.bs.modal")},e.prototype.resize=function(){this.isShown?t(window).on("resize.bs.modal",t.proxy(this.handleUpdate,this)):t(window).off("resize.bs.modal")},e.prototype.hideModal=function(){var t=this;this.$element.hide(),this.backdrop(function(){t.$body.removeClass("modal-open"),t.resetAdjustments(),t.resetScrollbar(),t.$element.trigger("hidden.bs.modal")})},e.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},e.prototype.backdrop=function(i){var o=this,n=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var s=t.support.transition&&n;if(this.$backdrop=t(document.createElement("div")).addClass("modal-backdrop "+n).appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",t.proxy(function(t){this.ignoreBackdropClick?this.ignoreBackdropClick=!1:t.target===t.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus():this.hide())},this)),s&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!i)return;s?this.$backdrop.one("bsTransitionEnd",i).emulateTransitionEnd(e.BACKDROP_TRANSITION_DURATION):i()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var a=function(){o.removeBackdrop(),i&&i()};t.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",a).emulateTransitionEnd(e.BACKDROP_TRANSITION_DURATION):a()}else i&&i()},e.prototype.handleUpdate=function(){this.adjustDialog()},e.prototype.adjustDialog=function(){var t=this.$element[0].scrollHeight>document.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&t?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!t?this.scrollbarWidth:""})},e.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},e.prototype.checkScrollbar=function(){var t=window.innerWidth;if(!t){var e=document.documentElement.getBoundingClientRect();t=e.right-Math.abs(e.left)}this.bodyIsOverflowing=document.body.clientWidth<t,this.scrollbarWidth=this.measureScrollbar()},e.prototype.setScrollbar=function(){var e=parseInt(this.$body.css("padding-right")||0,10);this.originalBodyPad=document.body.style.paddingRight||"";var i=this.scrollbarWidth;this.bodyIsOverflowing&&(this.$body.css("padding-right",e+i),t(this.fixedContent).each(function(e,o){var n=o.style.paddingRight,s=t(o).css("padding-right");t(o).data("padding-right",n).css("padding-right",parseFloat(s)+i+"px")}))},e.prototype.resetScrollbar=function(){this.$body.css("padding-right",this.originalBodyPad),t(this.fixedContent).each(function(e,i){var o=t(i).data("padding-right");t(i).removeData("padding-right"),i.style.paddingRight=o||""})},e.prototype.measureScrollbar=function(){var t=document.createElement("div");t.className="modal-scrollbar-measure",this.$body.append(t);var e=t.offsetWidth-t.clientWidth;return this.$body[0].removeChild(t),e};var o=t.fn.modal;t.fn.modal=i,t.fn.modal.Constructor=e,t.fn.modal.noConflict=function(){return t.fn.modal=o,this},t(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(e){var o=t(this),n=o.attr("href"),s=o.attr("data-target")||n&&n.replace(/.*(?=#[^\s]+$)/,""),a=t(document).find(s),r=a.data("bs.modal")?"toggle":t.extend({remote:!/#/.test(n)&&n},a.data(),o.data());o.is("a")&&e.preventDefault(),a.one("show.bs.modal",function(t){t.isDefaultPrevented()||a.one("hidden.bs.modal",function(){o.is(":visible")&&o.trigger("focus")})}),i.call(a,r,this)})}(jQuery),function(t){"use strict";var e=["sanitize","whiteList","sanitizeFn"],i=["background","cite","href","itemtype","longdesc","poster","src","xlink:href"],o={"*":["class","dir","id","lang","role",/^aria-[\w-]*$/i],a:["target","href","title","rel"],area:[],b:[],br:[],col:[],code:[],div:[],em:[],hr:[],h1:[],h2:[],h3:[],h4:[],h5:[],h6:[],i:[],img:["src","alt","title","width","height"],li:[],ol:[],p:[],pre:[],s:[],small:[],span:[],sub:[],sup:[],strong:[],u:[],ul:[]},n=/^(?:(?:https?|mailto|ftp|tel|file):|[^&:\/?#]*(?:[\/?#]|$))/gi,s=/^data:(?:image\/(?:bmp|gif|jpeg|jpg|png|tiff|webp)|video\/(?:mpeg|mp4|ogg|webm)|audio\/(?:mp3|oga|ogg|opus));base64,[a-z0-9+\/]+=*$/i;function a(e,o){var a=e.nodeName.toLowerCase();if(-1!==t.inArray(a,o))return-1===t.inArray(a,i)||Boolean(e.nodeValue.match(n)||e.nodeValue.match(s));for(var r=t(o).filter(function(t,e){return e instanceof RegExp}),l=0,h=r.length;l<h;l++)if(a.match(r[l]))return!0;return!1}function r(e,i,o){if(0===e.length)return e;if(o&&"function"==typeof o)return o(e);if(!document.implementation||!document.implementation.createHTMLDocument)return e;var n=document.implementation.createHTMLDocument("sanitization");n.body.innerHTML=e;for(var s=t.map(i,function(t,e){return e}),r=t(n.body).find("*"),l=0,h=r.length;l<h;l++){var d=r[l],p=d.nodeName.toLowerCase();if(-1!==t.inArray(p,s))for(var c=t.map(d.attributes,function(t){return t}),f=[].concat(i["*"]||[],i[p]||[]),u=0,g=c.length;u<g;u++)a(c[u],f)||d.removeAttribute(c[u].nodeName);else d.parentNode.removeChild(d)}return n.body.innerHTML}var l=function(t,e){this.type=null,this.options=null,this.enabled=null,this.timeout=null,this.hoverState=null,this.$element=null,this.inState=null,this.init("tooltip",t,e)};l.VERSION="3.4.1",l.TRANSITION_DURATION=150,l.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0},sanitize:!0,sanitizeFn:null,whiteList:o},l.prototype.init=function(e,i,o){if(this.enabled=!0,this.type=e,this.$element=t(i),this.options=this.getOptions(o),this.$viewport=this.options.viewport&&t(document).find(t.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var n=this.options.trigger.split(" "),s=n.length;s--;){var a=n[s];if("click"==a)this.$element.on("click."+this.type,this.options.selector,t.proxy(this.toggle,this));else if("manual"!=a){var r="hover"==a?"mouseenter":"focusin",l="hover"==a?"mouseleave":"focusout";this.$element.on(r+"."+this.type,this.options.selector,t.proxy(this.enter,this)),this.$element.on(l+"."+this.type,this.options.selector,t.proxy(this.leave,this))}}this.options.selector?this._options=t.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},l.prototype.getDefaults=function(){return l.DEFAULTS},l.prototype.getOptions=function(i){var o=this.$element.data();for(var n in o)o.hasOwnProperty(n)&&-1!==t.inArray(n,e)&&delete o[n];return(i=t.extend({},this.getDefaults(),o,i)).delay&&"number"==typeof i.delay&&(i.delay={show:i.delay,hide:i.delay}),i.sanitize&&(i.template=r(i.template,i.whiteList,i.sanitizeFn)),i},l.prototype.getDelegateOptions=function(){var e={},i=this.getDefaults();return this._options&&t.each(this._options,function(t,o){i[t]!=o&&(e[t]=o)}),e},l.prototype.enter=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget).data("bs."+this.type);if(i||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i)),e instanceof t.Event&&(i.inState["focusin"==e.type?"focus":"hover"]=!0),i.tip().hasClass("in")||"in"==i.hoverState)i.hoverState="in";else{if(clearTimeout(i.timeout),i.hoverState="in",!i.options.delay||!i.options.delay.show)return i.show();i.timeout=setTimeout(function(){"in"==i.hoverState&&i.show()},i.options.delay.show)}},l.prototype.isInStateTrue=function(){for(var t in this.inState)if(this.inState[t])return!0;return!1},l.prototype.leave=function(e){var i=e instanceof this.constructor?e:t(e.currentTarget).data("bs."+this.type);if(i||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i)),e instanceof t.Event&&(i.inState["focusout"==e.type?"focus":"hover"]=!1),!i.isInStateTrue()){if(clearTimeout(i.timeout),i.hoverState="out",!i.options.delay||!i.options.delay.hide)return i.hide();i.timeout=setTimeout(function(){"out"==i.hoverState&&i.hide()},i.options.delay.hide)}},l.prototype.show=function(){var e=t.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(e);var i=t.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(e.isDefaultPrevented()||!i)return;var o=this,n=this.tip(),s=this.getUID(this.type);this.setContent(),n.attr("id",s),this.$element.attr("aria-describedby",s),this.options.animation&&n.addClass("fade");var a="function"==typeof this.options.placement?this.options.placement.call(this,n[0],this.$element[0]):this.options.placement,r=/\s?auto?\s?/i,h=r.test(a);h&&(a=a.replace(r,"")||"top"),n.detach().css({top:0,left:0,display:"block"}).addClass(a).data("bs."+this.type,this),this.options.container?n.appendTo(t(document).find(this.options.container)):n.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type);var d=this.getPosition(),p=n[0].offsetWidth,c=n[0].offsetHeight;if(h){var f=a,u=this.getPosition(this.$viewport);a="bottom"==a&&d.bottom+c>u.bottom?"top":"top"==a&&d.top-c<u.top?"bottom":"right"==a&&d.right+p>u.width?"left":"left"==a&&d.left-p<u.left?"right":a,n.removeClass(f).addClass(a)}var g=this.getCalculatedOffset(a,d,p,c);this.applyPlacement(g,a);var m=function(){var t=o.hoverState;null!=o.$element&&o.$element.trigger("shown.bs."+o.type),o.hoverState=null,"out"==t&&o.leave(o)};t.support.transition&&this.$tip.hasClass("fade")?n.one("bsTransitionEnd",m).emulateTransitionEnd(l.TRANSITION_DURATION):m()}},l.prototype.applyPlacement=function(e,i){var o=this.tip(),n=o[0].offsetWidth,s=o[0].offsetHeight,a=parseInt(o.css("margin-top"),10),r=parseInt(o.css("margin-left"),10);isNaN(a)&&(a=0),isNaN(r)&&(r=0),e.top+=a,e.left+=r,t.offset.setOffset(o[0],t.extend({using:function(t){o.css({top:Math.round(t.top),left:Math.round(t.left)})}},e),0),o.addClass("in");var l=o[0].offsetWidth,h=o[0].offsetHeight;"top"==i&&h!=s&&(e.top=e.top+s-h);var d=this.getViewportAdjustedDelta(i,e,l,h);d.left?e.left+=d.left:e.top+=d.top;var p=/top|bottom/.test(i),c=p?2*d.left-n+l:2*d.top-s+h,f=p?"offsetWidth":"offsetHeight";o.offset(e),this.replaceArrow(c,o[0][f],p)},l.prototype.replaceArrow=function(t,e,i){this.arrow().css(i?"left":"top",50*(1-t/e)+"%").css(i?"top":"left","")},l.prototype.setContent=function(){var t=this.tip(),e=this.getTitle();this.options.html?(this.options.sanitize&&(e=r(e,this.options.whiteList,this.options.sanitizeFn)),t.find(".tooltip-inner").html(e)):t.find(".tooltip-inner").text(e),t.removeClass("fade in top bottom left right")},l.prototype.hide=function(e){var i=this,o=t(this.$tip),n=t.Event("hide.bs."+this.type);function s(){"in"!=i.hoverState&&o.detach(),i.$element&&i.$element.removeAttr("aria-describedby").trigger("hidden.bs."+i.type),e&&e()}if(this.$element.trigger(n),!n.isDefaultPrevented())return o.removeClass("in"),t.support.transition&&o.hasClass("fade")?o.one("bsTransitionEnd",s).emulateTransitionEnd(l.TRANSITION_DURATION):s(),this.hoverState=null,this},l.prototype.fixTitle=function(){var t=this.$element;(t.attr("title")||"string"!=typeof t.attr("data-original-title"))&&t.attr("data-original-title",t.attr("title")||"").attr("title","")},l.prototype.hasContent=function(){return this.getTitle()},l.prototype.getPosition=function(e){var i=(e=e||this.$element)[0],o="BODY"==i.tagName,n=i.getBoundingClientRect();null==n.width&&(n=t.extend({},n,{width:n.right-n.left,height:n.bottom-n.top}));var s=window.SVGElement&&i instanceof window.SVGElement,a=o?{top:0,left:0}:s?null:e.offset(),r={scroll:o?document.documentElement.scrollTop||document.body.scrollTop:e.scrollTop()},l=o?{width:t(window).width(),height:t(window).height()}:null;return t.extend({},n,r,l,a)},l.prototype.getCalculatedOffset=function(t,e,i,o){return"bottom"==t?{top:e.top+e.height,left:e.left+e.width/2-i/2}:"top"==t?{top:e.top-o,left:e.left+e.width/2-i/2}:"left"==t?{top:e.top+e.height/2-o/2,left:e.left-i}:{top:e.top+e.height/2-o/2,left:e.left+e.width}},l.prototype.getViewportAdjustedDelta=function(t,e,i,o){var n={top:0,left:0};if(!this.$viewport)return n;var s=this.options.viewport&&this.options.viewport.padding||0,a=this.getPosition(this.$viewport);if(/right|left/.test(t)){var r=e.top-s-a.scroll,l=e.top+s-a.scroll+o;r<a.top?n.top=a.top-r:l>a.top+a.height&&(n.top=a.top+a.height-l)}else{var h=e.left-s,d=e.left+s+i;h<a.left?n.left=a.left-h:d>a.right&&(n.left=a.left+a.width-d)}return n},l.prototype.getTitle=function(){var t=this.$element,e=this.options;return t.attr("data-original-title")||("function"==typeof e.title?e.title.call(t[0]):e.title)},l.prototype.getUID=function(t){do{t+=~~(1e6*Math.random())}while(document.getElementById(t));return t},l.prototype.tip=function(){if(!this.$tip&&(this.$tip=t(this.options.template),1!=this.$tip.length))throw new Error(this.type+" `template` option must consist of exactly 1 top-level element!");return this.$tip},l.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},l.prototype.enable=function(){this.enabled=!0},l.prototype.disable=function(){this.enabled=!1},l.prototype.toggleEnabled=function(){this.enabled=!this.enabled},l.prototype.toggle=function(e){var i=this;e&&((i=t(e.currentTarget).data("bs."+this.type))||(i=new this.constructor(e.currentTarget,this.getDelegateOptions()),t(e.currentTarget).data("bs."+this.type,i))),e?(i.inState.click=!i.inState.click,i.isInStateTrue()?i.enter(i):i.leave(i)):i.tip().hasClass("in")?i.leave(i):i.enter(i)},l.prototype.destroy=function(){var t=this;clearTimeout(this.timeout),this.hide(function(){null!=t.$element&&t.$element.off("."+t.type).removeData("bs."+t.type),t.$tip&&t.$tip.detach(),t.$tip=null,t.$arrow=null,t.$viewport=null,t.$element=null})},l.prototype.sanitizeHtml=function(t){return r(t,this.options.whiteList,this.options.sanitizeFn)};var h=t.fn.tooltip;t.fn.tooltip=function(e){return this.each(function(){var i=t(this),o=i.data("bs.tooltip"),n="object"==typeof e&&e;!o&&/destroy|hide/.test(e)||(o||i.data("bs.tooltip",o=new l(this,n)),"string"==typeof e&&o[e]())})},t.fn.tooltip.Constructor=l,t.fn.tooltip.noConflict=function(){return t.fn.tooltip=h,this}}(jQuery),function(t){"use strict";var e=function(t,e){this.init("popover",t,e)};if(!t.fn.tooltip)throw new Error("Popover requires tooltip.js");e.VERSION="3.4.1",e.DEFAULTS=t.extend({},t.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),e.prototype=t.extend({},t.fn.tooltip.Constructor.prototype),e.prototype.constructor=e,e.prototype.getDefaults=function(){return e.DEFAULTS},e.prototype.setContent=function(){var t=this.tip(),e=this.getTitle(),i=this.getContent();if(this.options.html){var o=typeof i;this.options.sanitize&&(e=this.sanitizeHtml(e),"string"===o&&(i=this.sanitizeHtml(i))),t.find(".popover-title").html(e),t.find(".popover-content").children().detach().end()["string"===o?"html":"append"](i)}else t.find(".popover-title").text(e),t.find(".popover-content").children().detach().end().text(i);t.removeClass("fade top bottom left right in"),t.find(".popover-title").html()||t.find(".popover-title").hide()},e.prototype.hasContent=function(){return this.getTitle()||this.getContent()},e.prototype.getContent=function(){var t=this.$element,e=this.options;return t.attr("data-content")||("function"==typeof e.content?e.content.call(t[0]):e.content)},e.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var i=t.fn.popover;t.fn.popover=function(i){return this.each(function(){var o=t(this),n=o.data("bs.popover"),s="object"==typeof i&&i;!n&&/destroy|hide/.test(i)||(n||o.data("bs.popover",n=new e(this,s)),"string"==typeof i&&n[i]())})},t.fn.popover.Constructor=e,t.fn.popover.noConflict=function(){return t.fn.popover=i,this}}(jQuery),function(t){"use strict";function e(i,o){this.$body=t(document.body),this.$scrollElement=t(i).is(document.body)?t(window):t(i),this.options=t.extend({},e.DEFAULTS,o),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",t.proxy(this.process,this)),this.refresh(),this.process()}function i(i){return this.each(function(){var o=t(this),n=o.data("bs.scrollspy"),s="object"==typeof i&&i;n||o.data("bs.scrollspy",n=new e(this,s)),"string"==typeof i&&n[i]()})}e.VERSION="3.4.1",e.DEFAULTS={offset:10},e.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},e.prototype.refresh=function(){var e=this,i="offset",o=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),t.isWindow(this.$scrollElement[0])||(i="position",o=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var e=t(this),n=e.data("target")||e.attr("href"),s=/^#./.test(n)&&t(n);return s&&s.length&&s.is(":visible")&&[[s[i]().top+o,n]]||null}).sort(function(t,e){return t[0]-e[0]}).each(function(){e.offsets.push(this[0]),e.targets.push(this[1])})},e.prototype.process=function(){var t,e=this.$scrollElement.scrollTop()+this.options.offset,i=this.getScrollHeight(),o=this.options.offset+i-this.$scrollElement.height(),n=this.offsets,s=this.targets,a=this.activeTarget;if(this.scrollHeight!=i&&this.refresh(),e>=o)return a!=(t=s[s.length-1])&&this.activate(t);if(a&&e<n[0])return this.activeTarget=null,this.clear();for(t=n.length;t--;)a!=s[t]&&e>=n[t]&&(void 0===n[t+1]||e<n[t+1])&&this.activate(s[t])},e.prototype.activate=function(e){this.activeTarget=e,this.clear();var i=this.selector+'[data-target="'+e+'"],'+this.selector+'[href="'+e+'"]',o=t(i).parents("li").addClass("active");o.parent(".dropdown-menu").length&&(o=o.closest("li.dropdown").addClass("active")),o.trigger("activate.bs.scrollspy")},e.prototype.clear=function(){t(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var o=t.fn.scrollspy;t.fn.scrollspy=i,t.fn.scrollspy.Constructor=e,t.fn.scrollspy.noConflict=function(){return t.fn.scrollspy=o,this},t(window).on("load.bs.scrollspy.data-api",function(){t('[data-spy="scroll"]').each(function(){var e=t(this);i.call(e,e.data())})})}(jQuery),function(t){"use strict";var e=function(e){this.element=t(e)};function i(i){return this.each(function(){var o=t(this),n=o.data("bs.tab");n||o.data("bs.tab",n=new e(this)),"string"==typeof i&&n[i]()})}e.VERSION="3.4.1",e.TRANSITION_DURATION=150,e.prototype.show=function(){var e=this.element,i=e.closest("ul:not(.dropdown-menu)"),o=e.data("target");if(o||(o=(o=e.attr("href"))&&o.replace(/.*(?=#[^\s]*$)/,"")),!e.parent("li").hasClass("active")){var n=i.find(".active:last a"),s=t.Event("hide.bs.tab",{relatedTarget:e[0]}),a=t.Event("show.bs.tab",{relatedTarget:n[0]});if(n.trigger(s),e.trigger(a),!a.isDefaultPrevented()&&!s.isDefaultPrevented()){var r=t(document).find(o);this.activate(e.closest("li"),i),this.activate(r,r.parent(),function(){n.trigger({type:"hidden.bs.tab",relatedTarget:e[0]}),e.trigger({type:"shown.bs.tab",relatedTarget:n[0]})})}}},e.prototype.activate=function(i,o,n){var s=o.find("> .active"),a=n&&t.support.transition&&(s.length&&s.hasClass("fade")||!!o.find("> .fade").length);function r(){s.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),i.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),a?(i[0].offsetWidth,i.addClass("in")):i.removeClass("fade"),i.parent(".dropdown-menu").length&&i.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),n&&n()}s.length&&a?s.one("bsTransitionEnd",r).emulateTransitionEnd(e.TRANSITION_DURATION):r(),s.removeClass("in")};var o=t.fn.tab;t.fn.tab=i,t.fn.tab.Constructor=e,t.fn.tab.noConflict=function(){return t.fn.tab=o,this};var n=function(e){e.preventDefault(),i.call(t(this),"show")};t(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',n).on("click.bs.tab.data-api",'[data-toggle="pill"]',n)}(jQuery),function(t){"use strict";var e=function(i,o){this.options=t.extend({},e.DEFAULTS,o);var n=this.options.target===e.DEFAULTS.target?t(this.options.target):t(document).find(this.options.target);this.$target=n.on("scroll.bs.affix.data-api",t.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",t.proxy(this.checkPositionWithEventLoop,this)),this.$element=t(i),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};function i(i){return this.each(function(){var o=t(this),n=o.data("bs.affix"),s="object"==typeof i&&i;n||o.data("bs.affix",n=new e(this,s)),"string"==typeof i&&n[i]()})}e.VERSION="3.4.1",e.RESET="affix affix-top affix-bottom",e.DEFAULTS={offset:0,target:window},e.prototype.getState=function(t,e,i,o){var n=this.$target.scrollTop(),s=this.$element.offset(),a=this.$target.height();if(null!=i&&"top"==this.affixed)return n<i&&"top";if("bottom"==this.affixed)return null!=i?!(n+this.unpin<=s.top)&&"bottom":!(n+a<=t-o)&&"bottom";var r=null==this.affixed,l=r?n:s.top;return null!=i&&n<=i?"top":null!=o&&l+(r?a:e)>=t-o&&"bottom"},e.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(e.RESET).addClass("affix");var t=this.$target.scrollTop(),i=this.$element.offset();return this.pinnedOffset=i.top-t},e.prototype.checkPositionWithEventLoop=function(){setTimeout(t.proxy(this.checkPosition,this),1)},e.prototype.checkPosition=function(){if(this.$element.is(":visible")){var i=this.$element.height(),o=this.options.offset,n=o.top,s=o.bottom,a=Math.max(t(document).height(),t(document.body).height());"object"!=typeof o&&(s=n=o),"function"==typeof n&&(n=o.top(this.$element)),"function"==typeof s&&(s=o.bottom(this.$element));var r=this.getState(a,i,n,s);if(this.affixed!=r){null!=this.unpin&&this.$element.css("top","");var l="affix"+(r?"-"+r:""),h=t.Event(l+".bs.affix");if(this.$element.trigger(h),h.isDefaultPrevented())return;this.affixed=r,this.unpin="bottom"==r?this.getPinnedOffset():null,this.$element.removeClass(e.RESET).addClass(l).trigger(l.replace("affix","affixed")+".bs.affix")}"bottom"==r&&this.$element.offset({top:a-i-s})}};var o=t.fn.affix;t.fn.affix=i,t.fn.affix.Constructor=e,t.fn.affix.noConflict=function(){return t.fn.affix=o,this},t(window).on("load",function(){t('[data-spy="affix"]').each(function(){var e=t(this),o=e.data();o.offset=o.offset||{},null!=o.offsetBottom&&(o.offset.bottom=o.offsetBottom),null!=o.offsetTop&&(o.offset.top=o.offsetTop),i.call(e,o)})})}(jQuery);
\ No newline at end of file
diff --git a/data/interfaces/default/js/bootstrap3/bootstrap.min.js b/data/interfaces/default/js/bootstrap3/bootstrap.min.js
new file mode 100644
index 00000000..133aeecb
--- /dev/null
+++ b/data/interfaces/default/js/bootstrap3/bootstrap.min.js
@@ -0,0 +1,7 @@
+/*!
+ * Bootstrap v3.3.5 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under the MIT license
+ */
+if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){return a(b.target).is(this)?b.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.5",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a(f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.5",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")?(c.prop("checked")&&(a=!1),b.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==c.prop("type")&&(c.prop("checked")!==this.$element.hasClass("active")&&(a=!1),this.$element.toggleClass("active")),c.prop("checked",this.$element.hasClass("active")),a&&c.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target);d.hasClass("btn")||(d=d.closest(".btn")),b.call(d,"toggle"),a(c.target).is('input[type="radio"]')||a(c.target).is('input[type="checkbox"]')||c.preventDefault()}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.5",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));return a>this.$items.length-1||0>a?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){return this.sliding?void 0:this.slide("next")},c.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a('[data-toggle="collapse"][href="#'+b.id+'"],[data-toggle="collapse"][data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.5",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":e.data();c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function c(c){c&&3===c.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=b(d),f={relatedTarget:this};e.hasClass("open")&&(c&&"click"==c.type&&/input|textarea/i.test(c.target.tagName)&&a.contains(e[0],c.target)||(e.trigger(c=a.Event("hide.bs.dropdown",f)),c.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger("hidden.bs.dropdown",f))))}))}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.5",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=b(e),g=f.hasClass("open");if(c(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click",c);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger("shown.bs.dropdown",h)}return!1}},g.prototype.keydown=function(c){if(/(38|40|27|32)/.test(c.which)&&!/input|textarea/i.test(c.target.tagName)){var d=a(this);if(c.preventDefault(),c.stopPropagation(),!d.is(".disabled, :disabled")){var e=b(d),g=e.hasClass("open");if(!g&&27!=c.which||g&&27==c.which)return 27==c.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.disabled):visible a",i=e.find(".dropdown-menu"+h);if(i.length){var j=i.index(c.target);38==c.which&&j>0&&j--,40==c.which&&j<i.length-1&&j++,~j||(j=0),i.eq(j).trigger("focus")}}}};var h=a.fn.dropdown;a.fn.dropdown=d,a.fn.dropdown.Constructor=g,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=h,this},a(document).on("click.bs.dropdown.data-api",c).on("click.bs.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.bs.dropdown.data-api",f,g.prototype.toggle).on("keydown.bs.dropdown.data-api",f,g.prototype.keydown).on("keydown.bs.dropdown.data-api",".dropdown-menu",g.prototype.keydown)}(jQuery),+function(a){"use strict";function b(b,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},c.DEFAULTS,e.data(),"object"==typeof b&&b);f||e.data("bs.modal",f=new c(this,g)),"string"==typeof b?f[b](d):g.show&&f.show(d)})}var c=function(b,c){this.options=c,this.$body=a(document.body),this.$element=a(b),this.$dialog=this.$element.find(".modal-dialog"),this.$backdrop=null,this.isShown=null,this.originalBodyPad=null,this.scrollbarWidth=0,this.ignoreBackdropClick=!1,this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,a.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))};c.VERSION="3.3.5",c.TRANSITION_DURATION=300,c.BACKDROP_TRANSITION_DURATION=150,c.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},c.prototype.toggle=function(a){return this.isShown?this.hide():this.show(a)},c.prototype.show=function(b){var d=this,e=a.Event("show.bs.modal",{relatedTarget:b});this.$element.trigger(e),this.isShown||e.isDefaultPrevented()||(this.isShown=!0,this.checkScrollbar(),this.setScrollbar(),this.$body.addClass("modal-open"),this.escape(),this.resize(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.$dialog.on("mousedown.dismiss.bs.modal",function(){d.$element.one("mouseup.dismiss.bs.modal",function(b){a(b.target).is(d.$element)&&(d.ignoreBackdropClick=!0)})}),this.backdrop(function(){var e=a.support.transition&&d.$element.hasClass("fade");d.$element.parent().length||d.$element.appendTo(d.$body),d.$element.show().scrollTop(0),d.adjustDialog(),e&&d.$element[0].offsetWidth,d.$element.addClass("in"),d.enforceFocus();var f=a.Event("shown.bs.modal",{relatedTarget:b});e?d.$dialog.one("bsTransitionEnd",function(){d.$element.trigger("focus").trigger(f)}).emulateTransitionEnd(c.TRANSITION_DURATION):d.$element.trigger("focus").trigger(f)}))},c.prototype.hide=function(b){b&&b.preventDefault(),b=a.Event("hide.bs.modal"),this.$element.trigger(b),this.isShown&&!b.isDefaultPrevented()&&(this.isShown=!1,this.escape(),this.resize(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").off("click.dismiss.bs.modal").off("mouseup.dismiss.bs.modal"),this.$dialog.off("mousedown.dismiss.bs.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one("bsTransitionEnd",a.proxy(this.hideModal,this)).emulateTransitionEnd(c.TRANSITION_DURATION):this.hideModal())},c.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(a){this.$element[0]===a.target||this.$element.has(a.target).length||this.$element.trigger("focus")},this))},c.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keydown.dismiss.bs.modal",a.proxy(function(a){27==a.which&&this.hide()},this)):this.isShown||this.$element.off("keydown.dismiss.bs.modal")},c.prototype.resize=function(){this.isShown?a(window).on("resize.bs.modal",a.proxy(this.handleUpdate,this)):a(window).off("resize.bs.modal")},c.prototype.hideModal=function(){var a=this;this.$element.hide(),this.backdrop(function(){a.$body.removeClass("modal-open"),a.resetAdjustments(),a.resetScrollbar(),a.$element.trigger("hidden.bs.modal")})},c.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},c.prototype.backdrop=function(b){var d=this,e=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var f=a.support.transition&&e;if(this.$backdrop=a(document.createElement("div")).addClass("modal-backdrop "+e).appendTo(this.$body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(a){return this.ignoreBackdropClick?void(this.ignoreBackdropClick=!1):void(a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus():this.hide()))},this)),f&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;f?this.$backdrop.one("bsTransitionEnd",b).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):b()}else if(!this.isShown&&this.$backdrop){this.$backdrop.removeClass("in");var g=function(){d.removeBackdrop(),b&&b()};a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one("bsTransitionEnd",g).emulateTransitionEnd(c.BACKDROP_TRANSITION_DURATION):g()}else b&&b()},c.prototype.handleUpdate=function(){this.adjustDialog()},c.prototype.adjustDialog=function(){var a=this.$element[0].scrollHeight>document.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this.bodyIsOverflowing=document.body.clientWidth<a,this.scrollbarWidth=this.measureScrollbar()},c.prototype.setScrollbar=function(){var a=parseInt(this.$body.css("padding-right")||0,10);this.originalBodyPad=document.body.style.paddingRight||"",this.bodyIsOverflowing&&this.$body.css("padding-right",a+this.scrollbarWidth)},c.prototype.resetScrollbar=function(){this.$body.css("padding-right",this.originalBodyPad)},c.prototype.measureScrollbar=function(){var a=document.createElement("div");a.className="modal-scrollbar-measure",this.$body.append(a);var b=a.offsetWidth-a.clientWidth;return this.$body[0].removeChild(a),b};var d=a.fn.modal;a.fn.modal=b,a.fn.modal.Constructor=c,a.fn.modal.noConflict=function(){return a.fn.modal=d,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(c){var d=a(this),e=d.attr("href"),f=a(d.attr("data-target")||e&&e.replace(/.*(?=#[^\s]+$)/,"")),g=f.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(e)&&e},f.data(),d.data());d.is("a")&&c.preventDefault(),f.one("show.bs.modal",function(a){a.isDefaultPrevented()||f.one("hidden.bs.modal",function(){d.is(":visible")&&d.trigger("focus")})}),b.call(f,g,this)})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data("bs.tooltip",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.type=null,this.options=null,this.enabled=null,this.timeout=null,this.hoverState=null,this.$element=null,this.inState=null,this.init("tooltip",a,b)};c.VERSION="3.3.5",c.TRANSITION_DURATION=150,c.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){if(this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(a.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusin"==b.type?"focus":"hover"]=!0),c.tip().hasClass("in")||"in"==c.hoverState?void(c.hoverState="in"):(clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.isInStateTrue=function(){for(var a in this.inState)if(this.inState[a])return!0;return!1},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusout"==b.type?"focus":"hover"]=!1),c.isInStateTrue()?void 0:(clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide())},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.getPosition(this.$viewport);h="bottom"==h&&k.bottom+m>o.bottom?"top":"top"==h&&k.top-m<o.top?"bottom":"right"==h&&k.right+l>o.width?"left":"left"==h&&k.left-l<o.left?"right":h,f.removeClass(n).addClass(h)}var p=this.getCalculatedOffset(h,k,l,m);this.applyPlacement(p,h);var q=function(){var a=e.hoverState;e.$element.trigger("shown.bs."+e.type),e.hoverState=null,"out"==a&&e.leave(e)};a.support.transition&&this.$tip.hasClass("fade")?f.one("bsTransitionEnd",q).emulateTransitionEnd(c.TRANSITION_DURATION):q()}},c.prototype.applyPlacement=function(b,c){var d=this.tip(),e=d[0].offsetWidth,f=d[0].offsetHeight,g=parseInt(d.css("margin-top"),10),h=parseInt(d.css("margin-left"),10);isNaN(g)&&(g=0),isNaN(h)&&(h=0),b.top+=g,b.left+=h,a.offset.setOffset(d[0],a.extend({using:function(a){d.css({top:Math.round(a.top),left:Math.round(a.left)})}},b),0),d.addClass("in");var i=d[0].offsetWidth,j=d[0].offsetHeight;"top"==c&&j!=f&&(b.top=b.top+f-j);var k=this.getViewportAdjustedDelta(c,b,i,j);k.left?b.left+=k.left:b.top+=k.top;var l=/top|bottom/.test(c),m=l?2*k.left-e+i:2*k.top-f+j,n=l?"offsetWidth":"offsetHeight";d.offset(b),this.replaceArrow(m,d[0][n],l)},c.prototype.replaceArrow=function(a,b,c){this.arrow().css(c?"left":"top",50*(1-a/b)+"%").css(c?"top":"left","")},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},c.prototype.hide=function(b){function d(){"in"!=e.hoverState&&f.detach(),e.$element.removeAttr("aria-describedby").trigger("hidden.bs."+e.type),b&&b()}var e=this,f=a(this.$tip),g=a.Event("hide.bs."+this.type);return this.$element.trigger(g),g.isDefaultPrevented()?void 0:(f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one("bsTransitionEnd",d).emulateTransitionEnd(c.TRANSITION_DURATION):d(),this.hoverState=null,this)},c.prototype.fixTitle=function(){var a=this.$element;(a.attr("title")||"string"!=typeof a.attr("data-original-title"))&&a.attr("data-original-title",a.attr("title")||"").attr("title","")},c.prototype.hasContent=function(){return this.getTitle()},c.prototype.getPosition=function(b){b=b||this.$element;var c=b[0],d="BODY"==c.tagName,e=c.getBoundingClientRect();null==e.width&&(e=a.extend({},e,{width:e.right-e.left,height:e.bottom-e.top}));var f=d?{top:0,left:0}:b.offset(),g={scroll:d?document.documentElement.scrollTop||document.body.scrollTop:b.scrollTop()},h=d?{width:a(window).width(),height:a(window).height()}:null;return a.extend({},e,g,h,f)},c.prototype.getCalculatedOffset=function(a,b,c,d){return"bottom"==a?{top:b.top+b.height,left:b.left+b.width/2-c/2}:"top"==a?{top:b.top-d,left:b.left+b.width/2-c/2}:"left"==a?{top:b.top+b.height/2-d/2,left:b.left-c}:{top:b.top+b.height/2-d/2,left:b.left+b.width}},c.prototype.getViewportAdjustedDelta=function(a,b,c,d){var e={top:0,left:0};if(!this.$viewport)return e;var f=this.options.viewport&&this.options.viewport.padding||0,g=this.getPosition(this.$viewport);if(/right|left/.test(a)){var h=b.top-f-g.scroll,i=b.top+f-g.scroll+d;h<g.top?e.top=g.top-h:i>g.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;j<g.left?e.left=g.left-j:k>g.right&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){if(!this.$tip&&(this.$tip=a(this.options.template),1!=this.$tip.length))throw new Error(this.type+" `template` option must consist of exactly 1 top-level element!");return this.$tip},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),b?(c.inState.click=!c.inState.click,c.isInStateTrue()?c.enter(c):c.leave(c)):c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type),a.$tip&&a.$tip.detach(),a.$tip=null,a.$arrow=null,a.$viewport=null})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.5",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){this.$body=a(document.body),this.$scrollElement=a(a(c).is(document.body)?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",a.proxy(this.process,this)),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.5",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b=this,c="offset",d=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),a.isWindow(this.$scrollElement[0])||(c="position",d=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var b=a(this),e=b.data("target")||b.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[c]().top+d,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b<e[0])return this.activeTarget=null,this.clear();for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(void 0===e[a+1]||b<e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,this.clear();var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),
+d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=d,this},a(window).on("load.bs.scrollspy.data-api",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);c.call(b,b.data())})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new c(this)),"string"==typeof b&&e[b]()})}var c=function(b){this.element=a(b)};c.VERSION="3.3.5",c.TRANSITION_DURATION=150,c.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a"),f=a.Event("hide.bs.tab",{relatedTarget:b[0]}),g=a.Event("show.bs.tab",{relatedTarget:e[0]});if(e.trigger(f),b.trigger(g),!g.isDefaultPrevented()&&!f.isDefaultPrevented()){var h=a(d);this.activate(b.closest("li"),c),this.activate(h,h.parent(),function(){e.trigger({type:"hidden.bs.tab",relatedTarget:b[0]}),b.trigger({type:"shown.bs.tab",relatedTarget:e[0]})})}}},c.prototype.activate=function(b,d,e){function f(){g.removeClass("active").find("> .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.5",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return c>e?"top":!1;if("bottom"==this.affixed)return null!=c?e+this.unpin<=f.top?!1:"bottom":a-d>=e+g?!1:"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&c>=e?"top":null!=d&&i+j>=a-d?"bottom":!1},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=Math.max(a(document).height(),a(document.body).height());"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery);
\ No newline at end of file
diff --git a/data/interfaces/default/js/dataTables.bootstrap.min.js b/data/interfaces/default/js/dataTables.bootstrap.min.js
index 781eb7be..29ad2fe3 100644
--- a/data/interfaces/default/js/dataTables.bootstrap.min.js
+++ b/data/interfaces/default/js/dataTables.bootstrap.min.js
@@ -1,14 +1,8 @@
 /*!
  DataTables Bootstrap 3 integration
- ©2011-2015 SpryMedia Ltd - datatables.net/license
+ ©2011-2014 SpryMedia Ltd - datatables.net/license
 */
-var $jscomp=$jscomp||{};$jscomp.scope={};$jscomp.findInternal=function(a,b,c){a instanceof String&&(a=String(a));for(var e=a.length,d=0;d<e;d++){var f=a[d];if(b.call(c,f,d,a))return{i:d,v:f}}return{i:-1,v:void 0}};$jscomp.ASSUME_ES5=!1;$jscomp.ASSUME_NO_NATIVE_MAP=!1;$jscomp.ASSUME_NO_NATIVE_SET=!1;$jscomp.SIMPLE_FROUND_POLYFILL=!1;$jscomp.ISOLATE_POLYFILLS=!1;
-$jscomp.defineProperty=$jscomp.ASSUME_ES5||"function"==typeof Object.defineProperties?Object.defineProperty:function(a,b,c){if(a==Array.prototype||a==Object.prototype)return a;a[b]=c.value;return a};$jscomp.getGlobal=function(a){a=["object"==typeof globalThis&&globalThis,a,"object"==typeof window&&window,"object"==typeof self&&self,"object"==typeof global&&global];for(var b=0;b<a.length;++b){var c=a[b];if(c&&c.Math==Math)return c}throw Error("Cannot find global object");};$jscomp.global=$jscomp.getGlobal(this);
-$jscomp.IS_SYMBOL_NATIVE="function"===typeof Symbol&&"symbol"===typeof Symbol("x");$jscomp.TRUST_ES6_POLYFILLS=!$jscomp.ISOLATE_POLYFILLS||$jscomp.IS_SYMBOL_NATIVE;$jscomp.polyfills={};$jscomp.propertyToPolyfillSymbol={};$jscomp.POLYFILL_PREFIX="$jscp$";var $jscomp$lookupPolyfilledValue=function(a,b){var c=$jscomp.propertyToPolyfillSymbol[b];if(null==c)return a[b];c=a[c];return void 0!==c?c:a[b]};
-$jscomp.polyfill=function(a,b,c,e){b&&($jscomp.ISOLATE_POLYFILLS?$jscomp.polyfillIsolated(a,b,c,e):$jscomp.polyfillUnisolated(a,b,c,e))};$jscomp.polyfillUnisolated=function(a,b,c,e){c=$jscomp.global;a=a.split(".");for(e=0;e<a.length-1;e++){var d=a[e];if(!(d in c))return;c=c[d]}a=a[a.length-1];e=c[a];b=b(e);b!=e&&null!=b&&$jscomp.defineProperty(c,a,{configurable:!0,writable:!0,value:b})};
-$jscomp.polyfillIsolated=function(a,b,c,e){var d=a.split(".");a=1===d.length;e=d[0];e=!a&&e in $jscomp.polyfills?$jscomp.polyfills:$jscomp.global;for(var f=0;f<d.length-1;f++){var l=d[f];if(!(l in e))return;e=e[l]}d=d[d.length-1];c=$jscomp.IS_SYMBOL_NATIVE&&"es6"===c?e[d]:null;b=b(c);null!=b&&(a?$jscomp.defineProperty($jscomp.polyfills,d,{configurable:!0,writable:!0,value:b}):b!==c&&($jscomp.propertyToPolyfillSymbol[d]=$jscomp.IS_SYMBOL_NATIVE?$jscomp.global.Symbol(d):$jscomp.POLYFILL_PREFIX+d,d=
-$jscomp.propertyToPolyfillSymbol[d],$jscomp.defineProperty(e,d,{configurable:!0,writable:!0,value:b})))};$jscomp.polyfill("Array.prototype.find",function(a){return a?a:function(b,c){return $jscomp.findInternal(this,b,c).v}},"es6","es3");
-(function(a){"function"===typeof define&&define.amd?define(["jquery","datatables.net"],function(b){return a(b,window,document)}):"object"===typeof exports?module.exports=function(b,c){b||(b=window);c&&c.fn.dataTable||(c=require("datatables.net")(b,c).$);return a(c,b,b.document)}:a(jQuery,window,document)})(function(a,b,c,e){var d=a.fn.dataTable;a.extend(!0,d.defaults,{dom:"<'row'<'col-sm-6'l><'col-sm-6'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-5'i><'col-sm-7'p>>",renderer:"bootstrap"});a.extend(d.ext.classes,
-{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm",sLengthSelect:"form-control input-sm",sProcessing:"dataTables_processing panel panel-default"});d.ext.renderer.pageButton.bootstrap=function(f,l,A,B,m,t){var u=new d.Api(f),C=f.oClasses,n=f.oLanguage.oPaginate,D=f.oLanguage.oAria.paginate||{},h,k,v=0,y=function(q,w){var x,E=function(p){p.preventDefault();a(p.currentTarget).hasClass("disabled")||u.page()==p.data.action||u.page(p.data.action).draw("page")};
-var r=0;for(x=w.length;r<x;r++){var g=w[r];if(Array.isArray(g))y(q,g);else{k=h="";switch(g){case "ellipsis":h="&#x2026;";k="disabled";break;case "first":h=n.sFirst;k=g+(0<m?"":" disabled");break;case "previous":h=n.sPrevious;k=g+(0<m?"":" disabled");break;case "next":h=n.sNext;k=g+(m<t-1?"":" disabled");break;case "last":h=n.sLast;k=g+(m<t-1?"":" disabled");break;default:h=g+1,k=m===g?"active":""}if(h){var F=a("<li>",{"class":C.sPageButton+" "+k,id:0===A&&"string"===typeof g?f.sTableId+"_"+g:null}).append(a("<a>",
-{href:"#","aria-controls":f.sTableId,"aria-label":D[g],"data-dt-idx":v,tabindex:f.iTabIndex}).html(h)).appendTo(q);f.oApi._fnBindAction(F,{action:g},E);v++}}}};try{var z=a(l).find(c.activeElement).data("dt-idx")}catch(q){}y(a(l).empty().html('<ul class="pagination"/>').children("ul"),B);z!==e&&a(l).find("[data-dt-idx="+z+"]").trigger("focus")};return d});
+(function(l,q){var e=function(b,c){b.extend(!0,c.defaults,{dom:"<'row'<'col-sm-6'l><'col-sm-6'f>><'row'<'col-sm-12'tr>><'row'<'col-sm-5'i><'col-sm-7'p>>",renderer:"bootstrap"});b.extend(c.ext.classes,{sWrapper:"dataTables_wrapper form-inline dt-bootstrap",sFilterInput:"form-control input-sm",sLengthSelect:"form-control input-sm"});c.ext.renderer.pageButton.bootstrap=function(g,e,r,s,i,m){var t=new c.Api(g),u=g.oClasses,j=g.oLanguage.oPaginate,d,f,n=0,p=function(c,e){var k,h,o,a,l=function(a){a.preventDefault();
+b(a.currentTarget).hasClass("disabled")||t.page(a.data.action).draw(!1)};k=0;for(h=e.length;k<h;k++)if(a=e[k],b.isArray(a))p(c,a);else{f=d="";switch(a){case "ellipsis":d="&hellip;";f="disabled";break;case "first":d=j.sFirst;f=a+(0<i?"":" disabled");break;case "previous":d=j.sPrevious;f=a+(0<i?"":" disabled");break;case "next":d=j.sNext;f=a+(i<m-1?"":" disabled");break;case "last":d=j.sLast;f=a+(i<m-1?"":" disabled");break;default:d=a+1,f=i===a?"active":""}d&&(o=b("<li>",{"class":u.sPageButton+" "+
+f,id:0===r&&"string"===typeof a?g.sTableId+"_"+a:null}).append(b("<a>",{href:"#","aria-controls":g.sTableId,"data-dt-idx":n,tabindex:g.iTabIndex}).html(d)).appendTo(c),g.oApi._fnBindAction(o,{action:a},l),n++)}},h;try{h=b(q.activeElement).data("dt-idx")}catch(l){}p(b(e).empty().html('<ul class="pagination"/>').children("ul"),s);h&&b(e).find("[data-dt-idx="+h+"]").focus()};c.TableTools&&(b.extend(!0,c.TableTools.classes,{container:"DTTT btn-group",buttons:{normal:"btn btn-default",disabled:"disabled"},
+collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:"disabled"}},print:{info:"DTTT_print_info"},select:{row:"active"}}),b.extend(!0,c.TableTools.DEFAULTS.oTags,{collection:{container:"ul",button:"li",liner:"a"}}))};"function"===typeof define&&define.amd?define(["jquery","datatables"],e):"object"===typeof exports?e(require("jquery"),require("datatables")):jQuery&&e(jQuery,jQuery.fn.dataTable)})(window,document);
\ No newline at end of file
diff --git a/data/interfaces/default/js/dataTables.colVis.js b/data/interfaces/default/js/dataTables.colVis.js
index 1a2df816..cc13cd8c 100644
--- a/data/interfaces/default/js/dataTables.colVis.js
+++ b/data/interfaces/default/js/dataTables.colVis.js
@@ -790,9 +790,6 @@ ColVis.prototype = {
 		oStyle.top = oPos.top+"px";
 		oStyle.left = iDivX+"px";
 
-		var iDocWidth = $(document).width();
-		var iDocHeight = $(document).height();
-
 		document.body.appendChild( nBackground );
 		document.body.appendChild( nHidden );
 		document.body.appendChild( this.dom.catcher );
@@ -822,17 +819,12 @@ ColVis.prototype = {
 
 			var iDivWidth = $(nHidden).outerWidth();
 			var iDivHeight = $(nHidden).outerHeight();
-			var iDivMarginTop = parseInt($(nHidden).css("marginTop"), 10);
-			var iDivMarginBottom = parseInt($(nHidden).css("marginBottom"), 10);
+			var iDocWidth = $(document).width();
 
 			if ( iLeft + iDivWidth > iDocWidth )
 			{
 				nHidden.style.left = (iDocWidth-iDivWidth)+"px";
 			}
-			if ( iDivY + iDivHeight > iDocHeight )
-			{
-				nHidden.style.top = (oPos.top - iDivHeight - iDivMarginTop - iDivMarginBottom)+"px";
-			}
 		}
 
 		this.s.hidden = false;
@@ -854,8 +846,7 @@ ColVis.prototype = {
 			this.s.hidden = true;
 
 			$(this.dom.collection).animate({"opacity": 0}, that.s.iOverlayFade, function (e) {
-				// this.style.display = "none";
-				document.body.removeChild( this );
+				this.style.display = "none";
 			} );
 
 			$(this.dom.background).animate({"opacity": 0}, that.s.iOverlayFade, function (e) {
diff --git a/data/interfaces/default/js/filterer.jquery.js b/data/interfaces/default/js/filterer.jquery.js
deleted file mode 100644
index db84ab9d..00000000
--- a/data/interfaces/default/js/filterer.jquery.js
+++ /dev/null
@@ -1,10 +0,0 @@
-!function(e){function t(r){if(n[r])return n[r].exports;var o=n[r]={exports:{},id:r,loaded:!1};return e[r].call(o.exports,o,o.exports,t),o.loaded=!0,o.exports}var n={};return t.m=e,t.c=n,t.p="/filterer/",t(0)}(function(e){for(var t in e)if(Object.prototype.hasOwnProperty.call(e,t))switch(typeof e[t]){case"function":break;case"object":e[t]=function(t){var n=t.slice(1),r=e[t[0]];return function(e,t,o){r.apply(this,[e,t,o].concat(n))}}(e[t]);break;default:e[t]=e[e[t]]}return e}([function(e,t,n){n(188),e.exports=n(94)},function(e,t,n){"use strict";function r(e,t,n,r,i,a,s,u){if(o(t),!e){var l;if(void 0===t)l=new Error("Minified exception occurred; use the non-minified dev environment for the full error message and additional helpful warnings.");else{var c=[n,r,i,a,s,u],p=0;l=new Error(t.replace(/%s/g,function(){return c[p++]})),l.name="Invariant Violation"}throw l.framesToPop=1,l}}var o=function(e){};e.exports=r},function(e,t,n){"use strict";var r=n(8),o=r;e.exports=o},function(e,t){"use strict";function n(e){for(var t=arguments.length-1,n="Minified React error #"+e+"; visit http://facebook.github.io/react/docs/error-decoder.html?invariant="+e,r=0;r<t;r++)n+="&args[]="+encodeURIComponent(arguments[r+1]);n+=" for the full message or use the non-minified dev environment for full errors and additional helpful warnings.";var o=new Error(n);throw o.name="Invariant Violation",o.framesToPop=1,o}e.exports=n},function(e,t){"use strict";function n(e){if(null===e||void 0===e)throw new TypeError("Object.assign cannot be called with null or undefined");return Object(e)}function r(){try{if(!Object.assign)return!1;var e=new String("abc");if(e[5]="de","5"===Object.getOwnPropertyNames(e)[0])return!1;for(var t={},n=0;n<10;n++)t["_"+String.fromCharCode(n)]=n;var r=Object.getOwnPropertyNames(t).map(function(e){return t[e]});if("0123456789"!==r.join(""))return!1;var o={};return"abcdefghijklmnopqrst".split("").forEach(function(e){o[e]=e}),"abcdefghijklmnopqrst"===Object.keys(Object.assign({},o)).join("")}catch(e){return!1}}var o=Object.getOwnPropertySymbols,i=Object.prototype.hasOwnProperty,a=Object.prototype.propertyIsEnumerable;e.exports=r()?Object.assign:function(e,t){for(var r,s,u=n(e),l=1;l<arguments.length;l++){r=Object(arguments[l]);for(var c in r)i.call(r,c)&&(u[c]=r[c]);if(o){s=o(r);for(var p=0;p<s.length;p++)a.call(r,s[p])&&(u[s[p]]=r[s[p]])}}return u}},function(e,t,n){"use strict";e.exports=n(20)},function(e,t,n){"use strict";function r(e,t){return 1===e.nodeType&&e.getAttribute(h)===String(t)||8===e.nodeType&&e.nodeValue===" react-text: "+t+" "||8===e.nodeType&&e.nodeValue===" react-empty: "+t+" "}function o(e){for(var t;t=e._renderedComponent;)e=t;return e}function i(e,t){var n=o(e);n._hostNode=t,t[v]=n}function a(e){var t=e._hostNode;t&&(delete t[v],e._hostNode=null)}function s(e,t){if(!(e._flags&m.hasCachedChildNodes)){var n=e._renderedChildren,a=t.firstChild;e:for(var s in n)if(n.hasOwnProperty(s)){var u=n[s],l=o(u)._domID;if(0!==l){for(;null!==a;a=a.nextSibling)if(r(a,l)){i(u,a);continue e}p("32",l)}}e._flags|=m.hasCachedChildNodes}}function u(e){if(e[v])return e[v];for(var t=[];!e[v];){if(t.push(e),!e.parentNode)return null;e=e.parentNode}for(var n,r;e&&(r=e[v]);e=t.pop())n=r,t.length&&s(r,e);return n}function l(e){var t=u(e);return null!=t&&t._hostNode===e?t:null}function c(e){if(void 0===e._hostNode?p("33"):void 0,e._hostNode)return e._hostNode;for(var t=[];!e._hostNode;)t.push(e),e._hostParent?void 0:p("34"),e=e._hostParent;for(;t.length;e=t.pop())s(e,e._hostNode);return e._hostNode}var p=n(3),f=n(18),d=n(67),h=(n(1),f.ID_ATTRIBUTE_NAME),m=d,v="__reactInternalInstance$"+Math.random().toString(36).slice(2),g={getClosestInstanceFromNode:u,getInstanceFromNode:l,getNodeFromInstance:c,precacheChildNodes:s,precacheNode:i,uncacheNode:a};e.exports=g},function(e,t){"use strict";var n=!("undefined"==typeof window||!window.document||!window.document.createElement),r={canUseDOM:n,canUseWorkers:"undefined"!=typeof Worker,canUseEventListeners:n&&!(!window.addEventListener&&!window.attachEvent),canUseViewport:n&&!!window.screen,isInWorker:!n};e.exports=r},function(e,t){"use strict";function n(e){return function(){return e}}var r=function(){};r.thatReturns=n,r.thatReturnsFalse=n(!1),r.thatReturnsTrue=n(!0),r.thatReturnsNull=n(null),r.thatReturnsThis=function(){return this},r.thatReturnsArgument=function(e){return e},e.exports=r},function(e,t,n){"use strict";var r=null;e.exports={debugTool:r}},function(e,t,n){"use strict";function r(){P.ReactReconcileTransaction&&_?void 0:c("123")}function o(){this.reinitializeTransaction(),this.dirtyComponentsLength=null,this.callbackQueue=f.getPooled(),this.reconcileTransaction=P.ReactReconcileTransaction.getPooled(!0)}function i(e,t,n,o,i,a){return r(),_.batchedUpdates(e,t,n,o,i,a)}function a(e,t){return e._mountOrder-t._mountOrder}function s(e){var t=e.dirtyComponentsLength;t!==g.length?c("124",t,g.length):void 0,g.sort(a),y++;for(var n=0;n<t;n++){var r=g[n],o=r._pendingCallbacks;r._pendingCallbacks=null;var i;if(h.logTopLevelRenders){var s=r;r._currentElement.type.isReactTopLevelWrapper&&(s=r._renderedComponent),i="React update: "+s.getName(),console.time(i)}if(m.performUpdateIfNecessary(r,e.reconcileTransaction,y),i&&console.timeEnd(i),o)for(var u=0;u<o.length;u++)e.callbackQueue.enqueue(o[u],r.getPublicInstance())}}function u(e){return r(),_.isBatchingUpdates?(g.push(e),void(null==e._updateBatchNumber&&(e._updateBatchNumber=y+1))):void _.batchedUpdates(u,e)}function l(e,t){_.isBatchingUpdates?void 0:c("125"),b.enqueue(e,t),C=!0}var c=n(3),p=n(4),f=n(65),d=n(14),h=n(70),m=n(19),v=n(31),g=(n(1),[]),y=0,b=f.getPooled(),C=!1,_=null,w={initialize:function(){this.dirtyComponentsLength=g.length},close:function(){this.dirtyComponentsLength!==g.length?(g.splice(0,this.dirtyComponentsLength),x()):g.length=0}},E={initialize:function(){this.callbackQueue.reset()},close:function(){this.callbackQueue.notifyAll()}},T=[w,E];p(o.prototype,v,{getTransactionWrappers:function(){return T},destructor:function(){this.dirtyComponentsLength=null,f.release(this.callbackQueue),this.callbackQueue=null,P.ReactReconcileTransaction.release(this.reconcileTransaction),this.reconcileTransaction=null},perform:function(e,t,n){return v.perform.call(this,this.reconcileTransaction.perform,this.reconcileTransaction,e,t,n)}}),d.addPoolingTo(o);var x=function(){for(;g.length||C;){if(g.length){var e=o.getPooled();e.perform(s,null,e),o.release(e)}if(C){C=!1;var t=b;b=f.getPooled(),t.notifyAll(),f.release(t)}}},O={injectReconcileTransaction:function(e){e?void 0:c("126"),P.ReactReconcileTransaction=e},injectBatchingStrategy:function(e){e?void 0:c("127"),"function"!=typeof e.batchedUpdates?c("128"):void 0,"boolean"!=typeof e.isBatchingUpdates?c("129"):void 0,_=e}},P={ReactReconcileTransaction:null,batchedUpdates:i,enqueueUpdate:u,flushBatchedUpdates:x,injection:O,asap:l};e.exports=P},function(e,t,n){"use strict";function r(e,t,n,r){this.dispatchConfig=e,this._targetInst=t,this.nativeEvent=n;var o=this.constructor.Interface;for(var i in o)if(o.hasOwnProperty(i)){var s=o[i];s?this[i]=s(n):"target"===i?this.target=r:this[i]=n[i]}var u=null!=n.defaultPrevented?n.defaultPrevented:n.returnValue===!1;return u?this.isDefaultPrevented=a.thatReturnsTrue:this.isDefaultPrevented=a.thatReturnsFalse,this.isPropagationStopped=a.thatReturnsFalse,this}var o=n(4),i=n(14),a=n(8),s=(n(2),"function"==typeof Proxy,["dispatchConfig","_targetInst","nativeEvent","isDefaultPrevented","isPropagationStopped","_dispatchListeners","_dispatchInstances"]),u={type:null,target:null,currentTarget:a.thatReturnsNull,eventPhase:null,bubbles:null,cancelable:null,timeStamp:function(e){return e.timeStamp||Date.now()},defaultPrevented:null,isTrusted:null};o(r.prototype,{preventDefault:function(){this.defaultPrevented=!0;var e=this.nativeEvent;e&&(e.preventDefault?e.preventDefault():"unknown"!=typeof e.returnValue&&(e.returnValue=!1),this.isDefaultPrevented=a.thatReturnsTrue)},stopPropagation:function(){var e=this.nativeEvent;e&&(e.stopPropagation?e.stopPropagation():"unknown"!=typeof e.cancelBubble&&(e.cancelBubble=!0),this.isPropagationStopped=a.thatReturnsTrue)},persist:function(){this.isPersistent=a.thatReturnsTrue},isPersistent:a.thatReturnsFalse,destructor:function(){var e=this.constructor.Interface;for(var t in e)this[t]=null;for(var n=0;n<s.length;n++)this[s[n]]=null}}),r.Interface=u,r.augmentClass=function(e,t){var n=this,r=function(){};r.prototype=n.prototype;var a=new r;o(a,e.prototype),e.prototype=a,e.prototype.constructor=e,e.Interface=o({},n.Interface,t),e.augmentClass=n.augmentClass,i.addPoolingTo(e,i.fourArgumentPooler)},i.addPoolingTo(r,i.fourArgumentPooler),e.exports=r},function(e,t){"use strict";var n={current:null};e.exports=n},function(e,t,n){"use strict";e.exports=n(138)},[228,3],[227,189,190,192,193,191],function(e,t,n){(function(){function t(e,t){var n,r=function(o){return e.length>1?function(){var i=o?o.concat():[];return n=t?n||this:this,i.push.apply(i,arguments)<e.length&&arguments.length?r.call(n,i):e.apply(n,i)}:e};return r()}function r(e,t){var n={}.hasOwnProperty;for(var r in t)n.call(t,r)&&(e[r]=t[r]);return e}var o,i,a,s,u,l,c,p,f,d,h,m,v,g,y,b,C,_,w,E,T,x,O,P,k,S,N=[].slice,M={}.toString;o=n(118),i=o.all,a=o.any,s=o.concatMap,u=o.each,l=o.filter,c=o.find,p=o.isType,f=o.keys,d=o.map,h=o.Obj,m=o.objToPairs,v=o.partition,g=o.reverse,y=o.sortBy,b=t(function(e,t,n){return Math.max(t,Math.min(n,e))}),C=t(function(e,t,n){var r;return r=e.substr(n).indexOf(t),r===-1?[]:[n+r].concat(C(e,t,n+r+t.length))}),_=t(function(e,t){var n,r,o;return n=t[0],r=N.call(t,1),0===r.length?null!=(o=e[n])?o:null:"undefined"==typeof e[n]?null:_(e[n],r)}),w=function(e){var t;return t=function(e){return e.length}(f(h.filter(function(e){return!!e})(e))),0===t},E=t(function(e,t){return M.call(e).slice(8,-1)===M.call(t).slice(8,-1)&&(a(function(t){return p(t,e)})(["Boolean","Number","String","undefined"])?e===t:"Array"===M.call(e).slice(8,-1)?e.length===t.length&&i(function(n){return E(e[n],t[n])})(function(){var t,n,r=[];for(t=0,n=e.length;t<n;++t)r.push(t);return r}()):f(e).length===f(t).length&&i(function(n){return E(e[n],t[n])})(f(e)))}),T=t(function(e,t){var n,r,o,i,a,s;return 0===t.length?[[0,e.length]]:(n=C(e,t,0),r=n[0],o=n[n.length-1],0===n.length?[]:(i=o+t.length,a=d(function(e){return[e,e+t.length,!0]})(n),s=d(function(e){return[a[e][1],a[e+1][0],!1]})(function(){var e,t,n=[];for(e=0,t=a.length-1;e<t;++e)n.push(e);return n}()),(0===r?[]:[[0,r,!1]]).concat(y(function(e){return e[0]})(a.concat(s)),i===e.length?[]:[[i,e.length,!1]])))}),x=t(function(e,t,n,r){var o;return o=_(e,t),P(e,t,o?r(o,n):n)}),O=t(function(e,t){var n,o;return n=M.call(t).slice(8,-1),a(function(e){return e===n},["Boolean","Number","String","Function"])?t:null===e||"Undefined"===M.call(e).slice(8,-1)?t:(o=h.keys(t),0===o.length?e:(u(function(n){return e[n]=O(h.keys(e[n]).length>0?r({},e[n]):e[n],t[n])})(o),e))}),P=t(function(e,t,n){var r,o,i;return r=t[0],o=N.call(t,1),o.length>0?(e[r]=null!=(i=e[r])?i:{},P(e[r],o,n)):(e[r]=n,e)}),k=function(e){return d(function(t){return d(function(e){return e[t]})(e)})(f(e[0]))},S=t(function(e,n,r){var o;return(o=t(function(e,t,n,r,i){return s(function(i){var a,s;return a=i[0],s=i[1],n<r?o(e,t.concat(a),n+1,r,s):e(t.concat(a),s)})(m(i))}))(e,[],0,n,r)}),e.exports={clamp:b,findAll:C,get:_,isEmptyObject:w,isEqualToObject:E,mappend:x,partitionString:T,rextend:O,set:P,transpose:k,unwrap:S}}).call(this)},function(e,t,n){"use strict";function r(e){if(v){var t=e.node,n=e.children;if(n.length)for(var r=0;r<n.length;r++)g(t,n[r],null);else null!=e.html?p(t,e.html):null!=e.text&&d(t,e.text)}}function o(e,t){e.parentNode.replaceChild(t.node,e),r(t)}function i(e,t){v?e.children.push(t):e.node.appendChild(t.node)}function a(e,t){v?e.html=t:p(e.node,t)}function s(e,t){v?e.text=t:d(e.node,t)}function u(){return this.node.nodeName}function l(e){return{node:e,children:[],html:null,text:null,toString:u}}var c=n(38),p=n(33),f=n(46),d=n(82),h=1,m=11,v="undefined"!=typeof document&&"number"==typeof document.documentMode||"undefined"!=typeof navigator&&"string"==typeof navigator.userAgent&&/\bEdge\/\d/.test(navigator.userAgent),g=f(function(e,t,n){t.node.nodeType===m||t.node.nodeType===h&&"object"===t.node.nodeName.toLowerCase()&&(null==t.node.namespaceURI||t.node.namespaceURI===c.html)?(r(t),e.insertBefore(t.node,n)):(e.insertBefore(t.node,n),r(t))});l.insertTreeBefore=g,l.replaceChildWithTree=o,l.queueChild=i,l.queueHTML=a,l.queueText=s,e.exports=l},function(e,t,n){"use strict";function r(e,t){return(e&t)===t}var o=n(3),i=(n(1),{MUST_USE_PROPERTY:1,HAS_BOOLEAN_VALUE:4,HAS_NUMERIC_VALUE:8,HAS_POSITIVE_NUMERIC_VALUE:24,HAS_OVERLOADED_BOOLEAN_VALUE:32,injectDOMPropertyConfig:function(e){var t=i,n=e.Properties||{},a=e.DOMAttributeNamespaces||{},u=e.DOMAttributeNames||{},l=e.DOMPropertyNames||{},c=e.DOMMutationMethods||{};e.isCustomAttribute&&s._isCustomAttributeFunctions.push(e.isCustomAttribute);for(var p in n){s.properties.hasOwnProperty(p)?o("48",p):void 0;var f=p.toLowerCase(),d=n[p],h={attributeName:f,attributeNamespace:null,propertyName:p,mutationMethod:null,mustUseProperty:r(d,t.MUST_USE_PROPERTY),hasBooleanValue:r(d,t.HAS_BOOLEAN_VALUE),hasNumericValue:r(d,t.HAS_NUMERIC_VALUE),hasPositiveNumericValue:r(d,t.HAS_POSITIVE_NUMERIC_VALUE),hasOverloadedBooleanValue:r(d,t.HAS_OVERLOADED_BOOLEAN_VALUE)};if(h.hasBooleanValue+h.hasNumericValue+h.hasOverloadedBooleanValue<=1?void 0:o("50",p),u.hasOwnProperty(p)){var m=u[p];h.attributeName=m}a.hasOwnProperty(p)&&(h.attributeNamespace=a[p]),l.hasOwnProperty(p)&&(h.propertyName=l[p]),c.hasOwnProperty(p)&&(h.mutationMethod=c[p]),s.properties[p]=h}}}),a=":A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD",s={ID_ATTRIBUTE_NAME:"data-reactid",ROOT_ATTRIBUTE_NAME:"data-reactroot",ATTRIBUTE_NAME_START_CHAR:a,ATTRIBUTE_NAME_CHAR:a+"\\-.0-9\\u00B7\\u0300-\\u036F\\u203F-\\u2040",properties:{},getPossibleStandardName:null,_isCustomAttributeFunctions:[],isCustomAttribute:function(e){for(var t=0;t<s._isCustomAttributeFunctions.length;t++){var n=s._isCustomAttributeFunctions[t];if(n(e))return!0}return!1},injection:i};e.exports=s},function(e,t,n){"use strict";function r(){o.attachRefs(this,this._currentElement)}var o=n(161),i=(n(9),n(2),{mountComponent:function(e,t,n,o,i,a){var s=e.mountComponent(t,n,o,i,a);return e._currentElement&&null!=e._currentElement.ref&&t.getReactMountReady().enqueue(r,e),s},getHostNode:function(e){return e.getHostNode()},unmountComponent:function(e,t){o.detachRefs(e,e._currentElement),e.unmountComponent(t)},receiveComponent:function(e,t,n,i){var a=e._currentElement;if(t!==a||i!==e._context){var s=o.shouldUpdateRefs(a,t);s&&o.detachRefs(e,a),e.receiveComponent(t,n,i),s&&e._currentElement&&null!=e._currentElement.ref&&n.getReactMountReady().enqueue(r,e)}},performUpdateIfNecessary:function(e,t,n){e._updateBatchNumber===n&&e.performUpdateIfNecessary(t)}});e.exports=i},function(e,t,n){"use strict";var r=n(4),o=n(213),i=n(54),a=n(218),s=n(214),u=n(215),l=n(21),c=n(217),p=n(219),f=n(222),d=(n(2),l.createElement),h=l.createFactory,m=l.cloneElement,v=r,g={Children:{map:o.map,forEach:o.forEach,count:o.count,toArray:o.toArray,only:f},Component:i,PureComponent:a,createElement:d,cloneElement:m,isValidElement:l.isValidElement,PropTypes:c,createClass:s.createClass,createFactory:h,createMixin:function(e){return e},DOM:u,version:p,__spread:v};e.exports=g},function(e,t,n){"use strict";function r(e){return void 0!==e.ref}function o(e){return void 0!==e.key}var i=n(4),a=n(12),s=(n(2),n(89),Object.prototype.hasOwnProperty),u=n(88),l={key:!0,ref:!0,__self:!0,__source:!0},c=function(e,t,n,r,o,i,a){var s={$$typeof:u,type:e,key:t,ref:n,props:a,_owner:i};return s};c.createElement=function(e,t,n){var i,u={},p=null,f=null,d=null,h=null;if(null!=t){r(t)&&(f=t.ref),o(t)&&(p=""+t.key),d=void 0===t.__self?null:t.__self,h=void 0===t.__source?null:t.__source;for(i in t)s.call(t,i)&&!l.hasOwnProperty(i)&&(u[i]=t[i])}var m=arguments.length-2;if(1===m)u.children=n;else if(m>1){for(var v=Array(m),g=0;g<m;g++)v[g]=arguments[g+2];u.children=v}if(e&&e.defaultProps){var y=e.defaultProps;for(i in y)void 0===u[i]&&(u[i]=y[i])}return c(e,p,f,d,h,a.current,u)},c.createFactory=function(e){var t=c.createElement.bind(null,e);return t.type=e,t},c.cloneAndReplaceKey=function(e,t){var n=c(e.type,t,e.ref,e._self,e._source,e._owner,e.props);return n},c.cloneElement=function(e,t,n){var u,p=i({},e.props),f=e.key,d=e.ref,h=e._self,m=e._source,v=e._owner;if(null!=t){r(t)&&(d=t.ref,v=a.current),o(t)&&(f=""+t.key);var g;e.type&&e.type.defaultProps&&(g=e.type.defaultProps);for(u in t)s.call(t,u)&&!l.hasOwnProperty(u)&&(void 0===t[u]&&void 0!==g?p[u]=g[u]:p[u]=t[u])}var y=arguments.length-2;if(1===y)p.children=n;else if(y>1){for(var b=Array(y),C=0;C<y;C++)b[C]=arguments[C+2];p.children=b}return c(e.type,f,d,h,m,v,p)},c.isValidElement=function(e){return"object"==typeof e&&null!==e&&e.$$typeof===u},e.exports=c},3,function(e,t,n){"use strict";var r={};e.exports=r},function(e,t,n){"use strict";function r(e){return"button"===e||"input"===e||"select"===e||"textarea"===e}function o(e,t,n){switch(e){case"onClick":case"onClickCapture":case"onDoubleClick":case"onDoubleClickCapture":case"onMouseDown":case"onMouseDownCapture":case"onMouseMove":case"onMouseMoveCapture":case"onMouseUp":case"onMouseUpCapture":return!(!n.disabled||!r(t));default:return!1}}var i=n(3),a=n(39),s=n(40),u=n(44),l=n(76),c=n(77),p=(n(1),{}),f=null,d=function(e,t){e&&(s.executeDispatchesInOrder(e,t),e.isPersistent()||e.constructor.release(e))},h=function(e){return d(e,!0)},m=function(e){return d(e,!1)},v=function(e){return"."+e._rootNodeID},g={injection:{injectEventPluginOrder:a.injectEventPluginOrder,injectEventPluginsByName:a.injectEventPluginsByName},putListener:function(e,t,n){"function"!=typeof n?i("94",t,typeof n):void 0;var r=v(e),o=p[t]||(p[t]={});o[r]=n;var s=a.registrationNameModules[t];s&&s.didPutListener&&s.didPutListener(e,t,n)},getListener:function(e,t){var n=p[t];if(o(t,e._currentElement.type,e._currentElement.props))return null;var r=v(e);return n&&n[r]},deleteListener:function(e,t){var n=a.registrationNameModules[t];n&&n.willDeleteListener&&n.willDeleteListener(e,t);var r=p[t];if(r){var o=v(e);delete r[o]}},deleteAllListeners:function(e){var t=v(e);for(var n in p)if(p.hasOwnProperty(n)&&p[n][t]){var r=a.registrationNameModules[n];r&&r.willDeleteListener&&r.willDeleteListener(e,n),delete p[n][t]}},extractEvents:function(e,t,n,r){for(var o,i=a.plugins,s=0;s<i.length;s++){var u=i[s];if(u){var c=u.extractEvents(e,t,n,r);c&&(o=l(o,c))}}return o},enqueueEvents:function(e){e&&(f=l(f,e))},processEventQueue:function(e){var t=f;f=null,e?c(t,h):c(t,m),f?i("95"):void 0,u.rethrowCaughtError()},__purge:function(){p={}},__getListenerBank:function(){return p}};e.exports=g},function(e,t,n){"use strict";function r(e,t,n){var r=t.dispatchConfig.phasedRegistrationNames[n];return g(e,r)}function o(e,t,n){var o=r(e,n,t);o&&(n._dispatchListeners=m(n._dispatchListeners,o),n._dispatchInstances=m(n._dispatchInstances,e))}function i(e){e&&e.dispatchConfig.phasedRegistrationNames&&h.traverseTwoPhase(e._targetInst,o,e)}function a(e){if(e&&e.dispatchConfig.phasedRegistrationNames){var t=e._targetInst,n=t?h.getParentInstance(t):null;h.traverseTwoPhase(n,o,e)}}function s(e,t,n){if(n&&n.dispatchConfig.registrationName){var r=n.dispatchConfig.registrationName,o=g(e,r);o&&(n._dispatchListeners=m(n._dispatchListeners,o),n._dispatchInstances=m(n._dispatchInstances,e))}}function u(e){e&&e.dispatchConfig.registrationName&&s(e._targetInst,null,e)}function l(e){v(e,i)}function c(e){v(e,a)}function p(e,t,n,r){h.traverseEnterLeave(n,r,s,e,t)}function f(e){v(e,u)}var d=n(24),h=n(40),m=n(76),v=n(77),g=(n(2),d.getListener),y={accumulateTwoPhaseDispatches:l,accumulateTwoPhaseDispatchesSkipTarget:c,accumulateDirectDispatches:f,accumulateEnterLeaveDispatches:p};e.exports=y},function(e,t){"use strict";var n={remove:function(e){e._reactInternalInstance=void 0},get:function(e){return e._reactInternalInstance},has:function(e){return void 0!==e._reactInternalInstance},set:function(e,t){e._reactInternalInstance=t}};e.exports=n},function(e,t,n){"use strict";function r(e,t,n,r){return o.call(this,e,t,n,r)}var o=n(11),i=n(49),a={view:function(e){if(e.view)return e.view;var t=i(e);if(t.window===t)return t;var n=t.ownerDocument;return n?n.defaultView||n.parentWindow:window},detail:function(e){return e.detail||0}};o.augmentClass(r,a),e.exports=r},function(e,t,n){(function(){var e,r,o,i,a,s,u,l="undefined"!=typeof t&&t||this;e=n(15),r=e.filter,o=e.map,i=e.objToPairs,a=e.Str,l.cancelEvent=s=function(e){e.preventDefault(),e.stopPropagation()},l.classNameFromObject=u=function(e){return a.join(" ")(o(function(e){return e[0]})(r(function(e){return!!e[1]})(i(e))))}}).call(this)},function(e,t,n){"use strict";function r(e){return Object.prototype.hasOwnProperty.call(e,m)||(e[m]=d++,p[e[m]]={}),p[e[m]]}var o,i=n(4),a=n(39),s=n(153),u=n(75),l=n(185),c=n(50),p={},f=!1,d=0,h={topAbort:"abort",topAnimationEnd:l("animationend")||"animationend",topAnimationIteration:l("animationiteration")||"animationiteration",topAnimationStart:l("animationstart")||"animationstart",topBlur:"blur",topCanPlay:"canplay",topCanPlayThrough:"canplaythrough",topChange:"change",topClick:"click",topCompositionEnd:"compositionend",topCompositionStart:"compositionstart",topCompositionUpdate:"compositionupdate",topContextMenu:"contextmenu",topCopy:"copy",topCut:"cut",topDoubleClick:"dblclick",topDrag:"drag",topDragEnd:"dragend",topDragEnter:"dragenter",topDragExit:"dragexit",topDragLeave:"dragleave",topDragOver:"dragover",topDragStart:"dragstart",topDrop:"drop",topDurationChange:"durationchange",topEmptied:"emptied",topEncrypted:"encrypted",topEnded:"ended",topError:"error",topFocus:"focus",topInput:"input",topKeyDown:"keydown",topKeyPress:"keypress",topKeyUp:"keyup",topLoadedData:"loadeddata",topLoadedMetadata:"loadedmetadata",topLoadStart:"loadstart",topMouseDown:"mousedown",topMouseMove:"mousemove",topMouseOut:"mouseout",topMouseOver:"mouseover",topMouseUp:"mouseup",topPaste:"paste",topPause:"pause",topPlay:"play",topPlaying:"playing",topProgress:"progress",topRateChange:"ratechange",topScroll:"scroll",topSeeked:"seeked",topSeeking:"seeking",topSelectionChange:"selectionchange",topStalled:"stalled",topSuspend:"suspend",topTextInput:"textInput",topTimeUpdate:"timeupdate",topTouchCancel:"touchcancel",topTouchEnd:"touchend",topTouchMove:"touchmove",topTouchStart:"touchstart",topTransitionEnd:l("transitionend")||"transitionend",topVolumeChange:"volumechange",topWaiting:"waiting",topWheel:"wheel"},m="_reactListenersID"+String(Math.random()).slice(2),v=i({},s,{ReactEventListener:null,injection:{injectReactEventListener:function(e){e.setHandleTopLevel(v.handleTopLevel),v.ReactEventListener=e}},setEnabled:function(e){v.ReactEventListener&&v.ReactEventListener.setEnabled(e)},isEnabled:function(){return!(!v.ReactEventListener||!v.ReactEventListener.isEnabled())},listenTo:function(e,t){for(var n=t,o=r(n),i=a.registrationNameDependencies[e],s=0;s<i.length;s++){var u=i[s];o.hasOwnProperty(u)&&o[u]||("topWheel"===u?c("wheel")?v.ReactEventListener.trapBubbledEvent("topWheel","wheel",n):c("mousewheel")?v.ReactEventListener.trapBubbledEvent("topWheel","mousewheel",n):v.ReactEventListener.trapBubbledEvent("topWheel","DOMMouseScroll",n):"topScroll"===u?c("scroll",!0)?v.ReactEventListener.trapCapturedEvent("topScroll","scroll",n):v.ReactEventListener.trapBubbledEvent("topScroll","scroll",v.ReactEventListener.WINDOW_HANDLE):"topFocus"===u||"topBlur"===u?(c("focus",!0)?(v.ReactEventListener.trapCapturedEvent("topFocus","focus",n),v.ReactEventListener.trapCapturedEvent("topBlur","blur",n)):c("focusin")&&(v.ReactEventListener.trapBubbledEvent("topFocus","focusin",n),v.ReactEventListener.trapBubbledEvent("topBlur","focusout",n)),o.topBlur=!0,o.topFocus=!0):h.hasOwnProperty(u)&&v.ReactEventListener.trapBubbledEvent(u,h[u],n),o[u]=!0)}},trapBubbledEvent:function(e,t,n){return v.ReactEventListener.trapBubbledEvent(e,t,n)},trapCapturedEvent:function(e,t,n){return v.ReactEventListener.trapCapturedEvent(e,t,n)},supportsEventPageXY:function(){if(!document.createEvent)return!1;var e=document.createEvent("MouseEvent");return null!=e&&"pageX"in e},ensureScrollValueMonitoring:function(){if(void 0===o&&(o=v.supportsEventPageXY()),!o&&!f){var e=u.refreshScrollValues;v.ReactEventListener.monitorScrollValue(e),f=!0}}});e.exports=v},function(e,t,n){"use strict";function r(e,t,n,r){return o.call(this,e,t,n,r)}var o=n(27),i=n(75),a=n(48),s={screenX:null,screenY:null,clientX:null,clientY:null,ctrlKey:null,shiftKey:null,altKey:null,metaKey:null,getModifierState:a,button:function(e){var t=e.button;return"which"in e?t:2===t?2:4===t?1:0},buttons:null,relatedTarget:function(e){return e.relatedTarget||(e.fromElement===e.srcElement?e.toElement:e.fromElement)},pageX:function(e){return"pageX"in e?e.pageX:e.clientX+i.currentScrollLeft},pageY:function(e){return"pageY"in e?e.pageY:e.clientY+i.currentScrollTop}};o.augmentClass(r,s),e.exports=r},function(e,t,n){"use strict";var r=n(3),o=(n(1),{}),i={reinitializeTransaction:function(){this.transactionWrappers=this.getTransactionWrappers(),this.wrapperInitData?this.wrapperInitData.length=0:this.wrapperInitData=[],this._isInTransaction=!1},_isInTransaction:!1,getTransactionWrappers:null,isInTransaction:function(){return!!this._isInTransaction},perform:function(e,t,n,o,i,a,s,u){this.isInTransaction()?r("27"):void 0;var l,c;try{this._isInTransaction=!0,l=!0,this.initializeAll(0),c=e.call(t,n,o,i,a,s,u),l=!1}finally{try{if(l)try{this.closeAll(0)}catch(e){}else this.closeAll(0)}finally{this._isInTransaction=!1}}return c},initializeAll:function(e){for(var t=this.transactionWrappers,n=e;n<t.length;n++){var r=t[n];try{this.wrapperInitData[n]=o,this.wrapperInitData[n]=r.initialize?r.initialize.call(this):null}finally{if(this.wrapperInitData[n]===o)try{this.initializeAll(n+1)}catch(e){}}}},closeAll:function(e){this.isInTransaction()?void 0:r("28");for(var t=this.transactionWrappers,n=e;n<t.length;n++){var i,a=t[n],s=this.wrapperInitData[n];try{i=!0,s!==o&&a.close&&a.close.call(this,s),i=!1}finally{if(i)try{this.closeAll(n+1)}catch(e){}}}this.wrapperInitData.length=0}};e.exports=i},function(e,t){"use strict";function n(e){var t=""+e,n=o.exec(t);if(!n)return t;var r,i="",a=0,s=0;for(a=n.index;a<t.length;a++){switch(t.charCodeAt(a)){case 34:r="&quot;";break;case 38:r="&amp;";break;case 39:r="&#x27;";break;case 60:r="&lt;";break;case 62:r="&gt;";break;default:continue}s!==a&&(i+=t.substring(s,a)),s=a+1,i+=r}return s!==a?i+t.substring(s,a):i}function r(e){return"boolean"==typeof e||"number"==typeof e?""+e:n(e)}var o=/["'&<>]/;e.exports=r},function(e,t,n){"use strict";var r,o=n(7),i=n(38),a=/^[ \r\n\t\f]/,s=/<(!--|link|noscript|meta|script|style)[ \r\n\t\f\/>]/,u=n(46),l=u(function(e,t){if(e.namespaceURI!==i.svg||"innerHTML"in e)e.innerHTML=t;else{r=r||document.createElement("div"),r.innerHTML="<svg>"+t+"</svg>";for(var n=r.firstChild;n.firstChild;)e.appendChild(n.firstChild)}});if(o.canUseDOM){var c=document.createElement("div");c.innerHTML=" ",""===c.innerHTML&&(l=function(e,t){if(e.parentNode&&e.parentNode.replaceChild(e,e),a.test(t)||"<"===t[0]&&s.test(t)){e.innerHTML=String.fromCharCode(65279)+t;var n=e.firstChild;1===n.data.length?e.removeChild(n):n.deleteData(0,1)}else e.innerHTML=t}),c=null}e.exports=l},function(e,t,n){e.exports=n(208)()},function(e,t){function n(e){return e&&e.__esModule?e:{default:e}}e.exports=n,e.exports.__esModule=!0,e.exports.default=e.exports},function(e,t){"use strict";function n(e,t){return e===t?0!==e||0!==t||1/e===1/t:e!==e&&t!==t}function r(e,t){if(n(e,t))return!0;if("object"!=typeof e||null===e||"object"!=typeof t||null===t)return!1;var r=Object.keys(e),i=Object.keys(t);if(r.length!==i.length)return!1;for(var a=0;a<r.length;a++)if(!o.call(t,r[a])||!n(e[r[a]],t[r[a]]))return!1;return!0}var o=Object.prototype.hasOwnProperty;e.exports=r},function(e,t,n){"use strict";function r(e,t){return Array.isArray(t)&&(t=t[1]),t?t.nextSibling:e.firstChild}function o(e,t,n){c.insertTreeBefore(e,t,n)}function i(e,t,n){Array.isArray(t)?s(e,t[0],t[1],n):m(e,t,n)}function a(e,t){if(Array.isArray(t)){var n=t[1];t=t[0],u(e,t,n),e.removeChild(n)}e.removeChild(t)}function s(e,t,n,r){for(var o=t;;){var i=o.nextSibling;if(m(e,o,r),o===n)break;o=i}}function u(e,t,n){for(;;){var r=t.nextSibling;if(r===n)break;e.removeChild(r)}}function l(e,t,n){var r=e.parentNode,o=e.nextSibling;o===t?n&&m(r,document.createTextNode(n),o):n?(h(o,n),u(r,o,t)):u(r,e,t)}var c=n(17),p=n(130),f=(n(6),n(9),n(46)),d=n(33),h=n(82),m=f(function(e,t,n){e.insertBefore(t,n)}),v=p.dangerouslyReplaceNodeWithMarkup,g={dangerouslyReplaceNodeWithMarkup:v,replaceDelimitedText:l,processUpdates:function(e,t){for(var n=0;n<t.length;n++){var s=t[n];switch(s.type){case"INSERT_MARKUP":o(e,s.content,r(e,s.afterNode));break;case"MOVE_EXISTING":i(e,s.fromNode,r(e,s.afterNode));break;case"SET_MARKUP":d(e,s.content);break;case"TEXT_CONTENT":h(e,s.content);break;case"REMOVE_NODE":a(e,s.fromNode)}}}};e.exports=g},function(e,t){"use strict";var n={html:"http://www.w3.org/1999/xhtml",mathml:"http://www.w3.org/1998/Math/MathML",svg:"http://www.w3.org/2000/svg"};e.exports=n},function(e,t,n){"use strict";function r(){if(s)for(var e in u){var t=u[e],n=s.indexOf(e);if(n>-1?void 0:a("96",e),!l.plugins[n]){t.extractEvents?void 0:a("97",e),l.plugins[n]=t;var r=t.eventTypes;for(var i in r)o(r[i],t,i)?void 0:a("98",i,e)}}}function o(e,t,n){l.eventNameDispatchConfigs.hasOwnProperty(n)?a("99",n):void 0,l.eventNameDispatchConfigs[n]=e;var r=e.phasedRegistrationNames;if(r){for(var o in r)if(r.hasOwnProperty(o)){var s=r[o];i(s,t,n)}return!0}return!!e.registrationName&&(i(e.registrationName,t,n),!0)}function i(e,t,n){l.registrationNameModules[e]?a("100",e):void 0,l.registrationNameModules[e]=t,l.registrationNameDependencies[e]=t.eventTypes[n].dependencies}var a=n(3),s=(n(1),null),u={},l={plugins:[],eventNameDispatchConfigs:{},registrationNameModules:{},registrationNameDependencies:{},possibleRegistrationNames:null,injectEventPluginOrder:function(e){s?a("101"):void 0,s=Array.prototype.slice.call(e),r()},injectEventPluginsByName:function(e){var t=!1;for(var n in e)if(e.hasOwnProperty(n)){var o=e[n];u.hasOwnProperty(n)&&u[n]===o||(u[n]?a("102",n):void 0,u[n]=o,t=!0)}t&&r()},getPluginModuleForEvent:function(e){var t=e.dispatchConfig;if(t.registrationName)return l.registrationNameModules[t.registrationName]||null;if(void 0!==t.phasedRegistrationNames){var n=t.phasedRegistrationNames;for(var r in n)if(n.hasOwnProperty(r)){var o=l.registrationNameModules[n[r]];if(o)return o}}return null},_resetEventPlugins:function(){s=null;for(var e in u)u.hasOwnProperty(e)&&delete u[e];l.plugins.length=0;var t=l.eventNameDispatchConfigs;for(var n in t)t.hasOwnProperty(n)&&delete t[n];var r=l.registrationNameModules;for(var o in r)r.hasOwnProperty(o)&&delete r[o]}};e.exports=l},function(e,t,n){"use strict";function r(e){return"topMouseUp"===e||"topTouchEnd"===e||"topTouchCancel"===e}function o(e){return"topMouseMove"===e||"topTouchMove"===e}function i(e){return"topMouseDown"===e||"topTouchStart"===e}function a(e,t,n,r){var o=e.type||"unknown-event";e.currentTarget=g.getNodeFromInstance(r),t?m.invokeGuardedCallbackWithCatch(o,n,e):m.invokeGuardedCallback(o,n,e),e.currentTarget=null}function s(e,t){var n=e._dispatchListeners,r=e._dispatchInstances;if(Array.isArray(n))for(var o=0;o<n.length&&!e.isPropagationStopped();o++)a(e,t,n[o],r[o]);else n&&a(e,t,n,r);e._dispatchListeners=null,e._dispatchInstances=null}function u(e){var t=e._dispatchListeners,n=e._dispatchInstances;if(Array.isArray(t)){for(var r=0;r<t.length&&!e.isPropagationStopped();r++)if(t[r](e,n[r]))return n[r]}else if(t&&t(e,n))return n;return null}function l(e){var t=u(e);return e._dispatchInstances=null,e._dispatchListeners=null,
-t}function c(e){var t=e._dispatchListeners,n=e._dispatchInstances;Array.isArray(t)?h("103"):void 0,e.currentTarget=t?g.getNodeFromInstance(n):null;var r=t?t(e):null;return e.currentTarget=null,e._dispatchListeners=null,e._dispatchInstances=null,r}function p(e){return!!e._dispatchListeners}var f,d,h=n(3),m=n(44),v=(n(1),n(2),{injectComponentTree:function(e){f=e},injectTreeTraversal:function(e){d=e}}),g={isEndish:r,isMoveish:o,isStartish:i,executeDirectDispatch:c,executeDispatchesInOrder:s,executeDispatchesInOrderStopAtTrue:l,hasDispatches:p,getInstanceFromNode:function(e){return f.getInstanceFromNode(e)},getNodeFromInstance:function(e){return f.getNodeFromInstance(e)},isAncestor:function(e,t){return d.isAncestor(e,t)},getLowestCommonAncestor:function(e,t){return d.getLowestCommonAncestor(e,t)},getParentInstance:function(e){return d.getParentInstance(e)},traverseTwoPhase:function(e,t,n){return d.traverseTwoPhase(e,t,n)},traverseEnterLeave:function(e,t,n,r,o){return d.traverseEnterLeave(e,t,n,r,o)},injection:v};e.exports=g},function(e,t){"use strict";function n(e){var t=/[=:]/g,n={"=":"=0",":":"=2"},r=(""+e).replace(t,function(e){return n[e]});return"$"+r}function r(e){var t=/(=0|=2)/g,n={"=0":"=","=2":":"},r="."===e[0]&&"$"===e[1]?e.substring(2):e.substring(1);return(""+r).replace(t,function(e){return n[e]})}var o={escape:n,unescape:r};e.exports=o},function(e,t,n){"use strict";function r(e){null!=e.checkedLink&&null!=e.valueLink?s("87"):void 0}function o(e){r(e),null!=e.value||null!=e.onChange?s("88"):void 0}function i(e){r(e),null!=e.checked||null!=e.onChange?s("89"):void 0}function a(e){if(e){var t=e.getName();if(t)return" Check the render method of `"+t+"`."}return""}var s=n(3),u=n(159),l=n(62),c=n(20),p=l(c.isValidElement),f=(n(1),n(2),{button:!0,checkbox:!0,image:!0,hidden:!0,radio:!0,reset:!0,submit:!0}),d={value:function(e,t,n){return!e[t]||f[e.type]||e.onChange||e.readOnly||e.disabled?null:new Error("You provided a `value` prop to a form field without an `onChange` handler. This will render a read-only field. If the field should be mutable use `defaultValue`. Otherwise, set either `onChange` or `readOnly`.")},checked:function(e,t,n){return!e[t]||e.onChange||e.readOnly||e.disabled?null:new Error("You provided a `checked` prop to a form field without an `onChange` handler. This will render a read-only field. If the field should be mutable use `defaultChecked`. Otherwise, set either `onChange` or `readOnly`.")},onChange:p.func},h={},m={checkPropTypes:function(e,t,n){for(var r in d){if(d.hasOwnProperty(r))var o=d[r](t,r,e,"prop",null,u);if(o instanceof Error&&!(o.message in h)){h[o.message]=!0;a(n)}}},getValue:function(e){return e.valueLink?(o(e),e.valueLink.value):e.value},getChecked:function(e){return e.checkedLink?(i(e),e.checkedLink.value):e.checked},executeOnChange:function(e,t){return e.valueLink?(o(e),e.valueLink.requestChange(t.target.value)):e.checkedLink?(i(e),e.checkedLink.requestChange(t.target.checked)):e.onChange?e.onChange.call(void 0,t):void 0}};e.exports=m},function(e,t,n){"use strict";var r=n(3),o=(n(1),!1),i={replaceNodeWithMarkup:null,processChildrenUpdates:null,injection:{injectEnvironment:function(e){o?r("104"):void 0,i.replaceNodeWithMarkup=e.replaceNodeWithMarkup,i.processChildrenUpdates=e.processChildrenUpdates,o=!0}}};e.exports=i},function(e,t,n){"use strict";function r(e,t,n){try{t(n)}catch(e){null===o&&(o=e)}}var o=null,i={invokeGuardedCallback:r,invokeGuardedCallbackWithCatch:r,rethrowCaughtError:function(){if(o){var e=o;throw o=null,e}}};e.exports=i},function(e,t,n){"use strict";function r(e){u.enqueueUpdate(e)}function o(e){var t=typeof e;if("object"!==t)return t;var n=e.constructor&&e.constructor.name||t,r=Object.keys(e);return r.length>0&&r.length<20?n+" (keys: "+r.join(", ")+")":n}function i(e,t){var n=s.get(e);if(!n){return null}return n}var a=n(3),s=(n(12),n(26)),u=(n(9),n(10)),l=(n(1),n(2),{isMounted:function(e){var t=s.get(e);return!!t&&!!t._renderedComponent},enqueueCallback:function(e,t,n){l.validateCallback(t,n);var o=i(e);return o?(o._pendingCallbacks?o._pendingCallbacks.push(t):o._pendingCallbacks=[t],void r(o)):null},enqueueCallbackInternal:function(e,t){e._pendingCallbacks?e._pendingCallbacks.push(t):e._pendingCallbacks=[t],r(e)},enqueueForceUpdate:function(e){var t=i(e,"forceUpdate");t&&(t._pendingForceUpdate=!0,r(t))},enqueueReplaceState:function(e,t,n){var o=i(e,"replaceState");o&&(o._pendingStateQueue=[t],o._pendingReplaceState=!0,void 0!==n&&null!==n&&(l.validateCallback(n,"replaceState"),o._pendingCallbacks?o._pendingCallbacks.push(n):o._pendingCallbacks=[n]),r(o))},enqueueSetState:function(e,t){var n=i(e,"setState");if(n){var o=n._pendingStateQueue||(n._pendingStateQueue=[]);o.push(t),r(n)}},enqueueElementInternal:function(e,t,n){e._pendingElement=t,e._context=n,r(e)},validateCallback:function(e,t){e&&"function"!=typeof e?a("122",t,o(e)):void 0}});e.exports=l},function(e,t){"use strict";var n=function(e){return"undefined"!=typeof MSApp&&MSApp.execUnsafeLocalFunction?function(t,n,r,o){MSApp.execUnsafeLocalFunction(function(){return e(t,n,r,o)})}:e};e.exports=n},function(e,t){"use strict";function n(e){var t,n=e.keyCode;return"charCode"in e?(t=e.charCode,0===t&&13===n&&(t=13)):t=n,t>=32||13===t?t:0}e.exports=n},function(e,t){"use strict";function n(e){var t=this,n=t.nativeEvent;if(n.getModifierState)return n.getModifierState(e);var r=o[e];return!!r&&!!n[r]}function r(e){return n}var o={Alt:"altKey",Control:"ctrlKey",Meta:"metaKey",Shift:"shiftKey"};e.exports=r},function(e,t){"use strict";function n(e){var t=e.target||e.srcElement||window;return t.correspondingUseElement&&(t=t.correspondingUseElement),3===t.nodeType?t.parentNode:t}e.exports=n},function(e,t,n){"use strict";function r(e,t){if(!i.canUseDOM||t&&!("addEventListener"in document))return!1;var n="on"+e,r=n in document;if(!r){var a=document.createElement("div");a.setAttribute(n,"return;"),r="function"==typeof a[n]}return!r&&o&&"wheel"===e&&(r=document.implementation.hasFeature("Events.wheel","3.0")),r}var o,i=n(7);i.canUseDOM&&(o=document.implementation&&document.implementation.hasFeature&&document.implementation.hasFeature("","")!==!0),e.exports=r},function(e,t){"use strict";function n(e,t){var n=null===e||e===!1,r=null===t||t===!1;if(n||r)return n===r;var o=typeof e,i=typeof t;return"string"===o||"number"===o?"string"===i||"number"===i:"object"===i&&e.type===t.type&&e.key===t.key}e.exports=n},function(e,t,n){"use strict";var r=(n(4),n(8)),o=(n(2),r);e.exports=o},function(e,t,n){(function(){function t(e,t){var n={}.hasOwnProperty;for(var r in t)n.call(t,r)&&(e[r]=t[r]);return e}function r(e,t){for(var n=-1,r=t.length>>>0;++n<r;)if(e===t[n])return!0;return!1}var o,i,a,s,u,l,c,p,f,d,h,m,v,g,y,b,C,_,w,E,T,x,O,P,k,S,N,M,A,I,D,R,L,U,F,j,B;o=n(15),i=o.each,a=o.filter,s=o.find,u=o.findIndex,l=o.id,c=o.initial,p=o.last,f=o.map,d=o.objToPairs,h=o.partition,m=o.reject,v=o.reverse,g=o.Str,y=o.sortBy,b=o.sum,C=o.values,o=n(16),_=o.clamp,w=o.isEqualToObject,E=n(5),o=E.DOM,T=o.div,x=o.input,O=o.path,P=o.span,k=o.svg,S=E.createClass,N=E.createFactory,M=n(13).findDOMNode,A=N(n(63)),I=N(n(202)),D=N(n(195)),R=N(n(84)),L=N(n(203)),U=N(n(199)),F=N(n(200)),o=n(28),j=o.cancelEvent,B=o.classNameFromObject,e.exports=S({displayName:"ReactSelectize",focusLock:!1,getDefaultProps:function(){return{anchor:null,autofocus:!1,cancelKeyboardEventOnSelection:!0,delimiters:[],disabled:!1,dropdownDirection:1,firstOptionIndexToHighlight:function(e){return 0},groupId:function(e){return e.groupId},groupsAsColumns:!1,highlightedUid:void 0,inputProps:{},onAnchorChange:function(e){},onBlur:function(e){},onEnter:function(e){},onFocus:function(e){},onHighlightedUidChange:function(e,t){},onKeyboardSelectionFailed:function(e){},onOpenChange:function(e,t){},onPaste:function(e){},onScrollLockChange:function(e){},onSearchChange:function(e,t){},onValuesChange:function(e,t){},open:!1,hideResetButton:!1,renderValue:function(e){var t;return t=e.label,T({className:"simple-value"},P(null,t))},renderToggleButton:I,renderResetButton:U,scrollLock:!1,search:"",style:{},theme:"default",uid:l,values:[]}},render:function(){var e,n,r,o,i,a=this;return e=function(){var e;switch(!1){case!("undefined"==typeof this.props.anchor||null===this.props.anchor):return-1;default:return null!=(e=u(function(e){return a.isEqualToObject(e,a.props.anchor)},this.props.values))?e:this.props.values.length-1}}.call(this),n=function(e){return f(function(e){var t,n;return t=a.props.values[e],n=a.props.uid(t),L({key:a.uidToString(n),uid:n,item:t,renderItem:a.props.renderValue})})(e)},r=this.props.dropdownDirection===-1,T({className:B((o={"react-selectize":1},o[this.props.theme+""]=1,o["root-node"]=1,o[this.props.className+""]=1,o.disabled=this.props.disabled,o.open=this.props.open,o.flipped=r,o.tethered=this.props.tether,o)),style:this.props.style},this.props.name?x({type:"hidden",name:this.props.name,value:this.props.serialize(this.props.values)}):void 0,T({className:"react-selectize-control",ref:"control",onMouseDown:function(e){if(function(){return a.props.onAnchorChange(p(a.props.values),function(){return a.onOpenChange(!0,function(){return a.highlightAndFocus()})})}(),!a.props.open)return j(e)}},0===this.props.search.length&&0===this.props.values.length?T({className:"react-selectize-placeholder"},this.props.placeholder):void 0,T({className:"react-selectize-search-field-and-selected-values"},n(function(){var t,n,r=[];for(t=0,n=e;t<=n;++t)r.push(t);return r}()),F((o=t({disabled:this.props.disabled},this.props.inputProps),o.ref="search",o.type="text",o.value=this.props.search,o.onChange=function(e){var t;return t=e.currentTarget.value,a.props.onSearchChange(t,function(){return a.highlightAndScrollToSelectableOption(a.props.firstOptionIndexToHighlight(a.props.options),1)})},o.onFocus=function(e){!function(){return function(e){return a.focusLock?e(a.focusLock=!1):a.onOpenChange(!0,function(){return e(!0)})}}()(function(){return a.props.onFocus(e)})},o.onBlur=function(e){if(!a.refs.dropdownMenu||document.activeElement!==M(a.refs.dropdownMenu))return a.closeDropdown(function(){return a.props.onBlur(e)})},o.onPaste=this.props.onPaste,o.onKeyDown=function(t){return a.handleKeydown({anchorIndex:e},t)},o)),n(function(){var t,n,r=[];for(t=e+1,n=this.props.values.length;t<n;++t)r.push(t);return r}.call(this))),this.props.values.length>0&&!this.props.hideResetButton?T({className:"react-selectize-reset-button-container",onClick:function(e){return function(){return a.props.onValuesChange([],function(){return a.props.onSearchChange("",function(){return a.highlightAndFocus()})})}(),j(e)}},this.props.renderResetButton()):void 0,T({className:"react-selectize-toggle-button-container",onMouseDown:function(e){return a.props.open?a.onOpenChange(!1,function(){}):a.props.onAnchorChange(p(a.props.values),function(){return a.onOpenChange(!0,function(){})}),j(e)}},this.props.renderToggleButton({open:this.props.open,flipped:r}))),D((o=t({},this.props),o.ref="dropdownMenu",o.className=B((i={"react-selectize":1},i[this.props.className+""]=1,i)),o.theme=this.props.theme,o.scrollLock=this.props.scrollLock,o.onScrollChange=this.props.onScrollChange,o.bottomAnchor=function(){return M(a.refs.control)},o.tetherProps=(i=t({},this.props.tetherProps),i.target=function(){return M(a.refs.control)},i),o.highlightedUid=this.props.highlightedUid,o.onHighlightedUidChange=this.props.onHighlightedUidChange,o.onOptionClick=function(t){a.selectHighlightedUid(e,function(){})},o)))},handleKeydown:function(e,t){var n,o,i,a=this;switch(n=e.anchorIndex,t.persist(),t.which){case 8:if(this.props.search.length>0||n===-1)return;!function(){var e,t,r,o;return e=n,t=n-1<0?void 0:a.props.values[n-1],r=a.props.values[n],a.props.onValuesChange(null!=(o=m(function(e){return a.isEqualToObject(e,r)})(a.props.values))?o:[],function(){return function(){return function(e){return"undefined"==typeof s(function(e){return a.isEqualToObject(e,r)},a.props.values)?a.props.restoreOnBackspace?a.props.onSearchChange(a.props.restoreOnBackspace(r),function(){return e(!0)}):e(!0):e(!1)}}()(function(r){if(r&&(a.highlightAndScrollToSelectableOption(a.props.firstOptionIndexToHighlight(a.props.options),1),n===e&&("undefined"==typeof t||s(function(e){return a.isEqualToObject(e,t)})(a.props.values))))return a.props.onAnchorChange(t,function(){})})})}(),j(t);break;case 27:!function(){return a.props.open?function(e){return a.onOpenChange(!1,e)}:function(e){return a.props.onValuesChange([],e)}}()(function(){return a.props.onSearchChange("",function(){return a.focusOnInput()})})}if(this.props.open&&r(t.which,[13].concat(this.props.delimiters))&&!(null!=t&&t.metaKey||null!=t&&t.ctrlKey||null!=t&&t.shiftKey)&&(o=this.selectHighlightedUid(n,function(e){if("undefined"==typeof e)return a.props.onKeyboardSelectionFailed(t.which)}),o&&this.props.cancelKeyboardEventOnSelection))return j(t);if(0===this.props.search.length)switch(t.which){case 37:this.props.onAnchorChange(n-1<0||t.metaKey?void 0:this.props.values[_(n-1,0,this.props.values.length-1)],function(){});break;case 39:this.props.onAnchorChange(t.metaKey?p(this.props.values):this.props.values[_(n+1,0,this.props.values.length-1)],function(){})}switch(t.which){case 38:return this.props.onScrollLockChange(!0),i=function(){switch(!1){case"undefined"!=typeof this.props.highlightedUid:return 0;default:return-1+this.optionIndexFromUid(this.props.highlightedUid)}}.call(this),this.highlightAndScrollToSelectableOption(i,-1,function(e){if(!e)return a.highlightAndScrollToSelectableOption(a.props.options.length-1,-1)});case 40:return this.props.onScrollLockChange(!0),i=function(){switch(!1){case"undefined"!=typeof this.props.highlightedUid:return 0;default:return 1+this.optionIndexFromUid(this.props.highlightedUid)}}.call(this),this.highlightAndScrollToSelectableOption(i,1,function(e){if(!e)return a.highlightAndScrollToSelectableOption(0,1)})}},componentDidMount:function(){this.props.autofocus&&this.focus(),this.props.open&&this.highlightAndFocus()},componentDidUpdate:function(e){this.props.open&&!e.open&&void 0===this.props.highlightedUid&&this.highlightAndFocus(),!this.props.open&&e.open&&this.props.onHighlightedUidChange(void 0,function(){})},componentWillReceiveProps:function(e){"undefined"!=typeof this.props.disabled&&this.props.disabled!==!1||"undefined"==typeof e.disabled||e.disabled!==!0||this.onOpenChange(!1,function(){})},optionIndexFromUid:function(e){var t=this;return u(function(n){return w(e,t.props.uid(n))})(this.props.options)},closeDropdown:function(e){var t=this;this.onOpenChange(!1,function(){return t.props.onAnchorChange(p(t.props.values),e)})},blur:function(){this.refs.search.blur()},focus:function(){this.refs.search.focus()},focusOnInput:function(){var e;e=M(this.refs.search),e!==document.activeElement&&(this.focusLock=!0,e.focus(),e.value=e.value)},highlightAndFocus:function(){this.highlightAndScrollToSelectableOption(this.props.firstOptionIndexToHighlight(this.props.options),1),this.focusOnInput()},highlightAndScrollToOption:function(e,t){null==t&&(t=function(){}),this.refs.dropdownMenu.highlightAndScrollToOption(e,t)},highlightAndScrollToSelectableOption:function(e,t,n){var r=this;null==n&&(n=function(){}),function(){return r.props.open?function(e){return e()}:function(e){return r.onOpenChange(!0,e)}}()(function(){return r.refs.dropdownMenu.highlightAndScrollToSelectableOption(e,t,n)})},isEqualToObject:function(){return w(this.props.uid(arguments[0]),this.props.uid(arguments[1]))},onOpenChange:function(e,t){return this.props.onOpenChange(!this.props.disabled&&e,t)},selectHighlightedUid:function(e,t){var n,r,o=this;return void 0===this.props.highlightedUid?(t(),!1):(n=this.optionIndexFromUid(this.props.highlightedUid),"number"!=typeof n?(t(),!1):(r=this.props.options[n],function(){return o.props.onValuesChange(f(function(e){return o.props.values[e]},function(){var t,n,r=[];for(t=0,n=e;t<=n;++t)r.push(t);return r}()).concat([r],f(function(e){return o.props.values[e]},function(){var t,n,r=[];for(t=e+1,n=this.props.values.length;t<n;++t)r.push(t);return r}.call(o))),function(){var e;return e=s(function(e){return o.isEqualToObject(e,r)},o.props.values),e?o.props.onSearchChange("",function(){return o.props.onAnchorChange(e,function(){return o.props.open?o.highlightAndScrollToSelectableOption(n,1,function(n){return n?void t(e):o.highlightAndScrollToSelectableOption(o.props.firstOptionIndexToHighlight(o.props.options),1,function(n){return n?t(e):o.onOpenChange(!1,function(){return t(e)})})}):void t(e)})}):void t()})}(),!0))},uidToString:function(e){return("object"==typeof e?JSON.stringify:l)(e)}})}).call(this)},function(e,t,n){"use strict";function r(e,t,n){this.props=e,this.context=t,this.refs=a,this.updater=n||i}var o=n(22),i=n(55),a=(n(89),n(23));n(1),n(2);r.prototype.isReactComponent={},r.prototype.setState=function(e,t){"object"!=typeof e&&"function"!=typeof e&&null!=e?o("85"):void 0,this.updater.enqueueSetState(this,e),t&&this.updater.enqueueCallback(this,t,"setState")},r.prototype.forceUpdate=function(e){this.updater.enqueueForceUpdate(this),e&&this.updater.enqueueCallback(this,e,"forceUpdate")};e.exports=r},function(e,t,n){"use strict";function r(e,t){}var o=(n(2),{isMounted:function(e){return!1},enqueueCallback:function(e,t){},enqueueForceUpdate:function(e){r(e,"forceUpdate")},enqueueReplaceState:function(e,t){r(e,"replaceState")},enqueueSetState:function(e,t){r(e,"setState")}});e.exports=o},function(e,t){"use strict";t.__esModule=!0,t.default=void 0;var n=!("undefined"==typeof window||!window.document||!window.document.createElement);t.default=n,e.exports=t.default},function(e,t,n){"use strict";var r=n(8),o={listen:function(e,t,n){return e.addEventListener?(e.addEventListener(t,n,!1),{remove:function(){e.removeEventListener(t,n,!1)}}):e.attachEvent?(e.attachEvent("on"+t,n),{remove:function(){e.detachEvent("on"+t,n)}}):void 0},capture:function(e,t,n){return e.addEventListener?(e.addEventListener(t,n,!0),{remove:function(){e.removeEventListener(t,n,!0)}}):{remove:r}},registerDefault:function(){}};e.exports=o},function(e,t){"use strict";function n(e){try{e.focus()}catch(e){}}e.exports=n},function(e,t){"use strict";function n(e){if(e=e||("undefined"!=typeof document?document:void 0),"undefined"==typeof e)return null;try{return e.activeElement||e.body}catch(t){return e.body}}e.exports=n},function(e,t){function n(){throw new Error("setTimeout has not been defined")}function r(){throw new Error("clearTimeout has not been defined")}function o(e){if(c===setTimeout)return setTimeout(e,0);if((c===n||!c)&&setTimeout)return c=setTimeout,setTimeout(e,0);try{return c(e,0)}catch(t){try{return c.call(null,e,0)}catch(t){return c.call(this,e,0)}}}function i(e){if(p===clearTimeout)return clearTimeout(e);if((p===r||!p)&&clearTimeout)return p=clearTimeout,clearTimeout(e);try{return p(e)}catch(t){try{return p.call(null,e)}catch(t){return p.call(this,e)}}}function a(){m&&d&&(m=!1,d.length?h=d.concat(h):v=-1,h.length&&s())}function s(){if(!m){var e=o(a);m=!0;for(var t=h.length;t;){for(d=h,h=[];++v<t;)d&&d[v].run();v=-1,t=h.length}d=null,m=!1,i(e)}}function u(e,t){this.fun=e,this.array=t}function l(){}var c,p,f=e.exports={};!function(){try{c="function"==typeof setTimeout?setTimeout:n}catch(e){c=n}try{p="function"==typeof clearTimeout?clearTimeout:r}catch(e){p=r}}();var d,h=[],m=!1,v=-1;f.nextTick=function(e){var t=new Array(arguments.length-1);if(arguments.length>1)for(var n=1;n<arguments.length;n++)t[n-1]=arguments[n];h.push(new u(e,t)),1!==h.length||m||o(s)},u.prototype.run=function(){this.fun.apply(null,this.array)},f.title="browser",f.browser=!0,f.env={},f.argv=[],f.version="",f.versions={},f.on=l,f.addListener=l,f.once=l,f.off=l,f.removeListener=l,f.removeAllListeners=l,f.emit=l,f.prependListener=l,f.prependOnceListener=l,f.listeners=function(e){return[]},f.binding=function(e){throw new Error("process.binding is not supported")},f.cwd=function(){return"/"},f.chdir=function(e){throw new Error("process.chdir is not supported")},f.umask=function(){return 0}},function(e,t,n){"use strict";function r(){}function o(e){try{return e.then}catch(e){return g=e,y}}function i(e,t){try{return e(t)}catch(e){return g=e,y}}function a(e,t,n){try{e(t,n)}catch(e){return g=e,y}}function s(e){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof e)throw new TypeError("not a function");this._45=0,this._81=0,this._65=null,this._54=null,e!==r&&m(e,this)}function u(e,t,n){return new e.constructor(function(o,i){var a=new s(r);a.then(o,i),l(e,new h(t,n,a))})}function l(e,t){for(;3===e._81;)e=e._65;return s._10&&s._10(e),0===e._81?0===e._45?(e._45=1,void(e._54=t)):1===e._45?(e._45=2,void(e._54=[e._54,t])):void e._54.push(t):void c(e,t)}function c(e,t){v(function(){var n=1===e._81?t.onFulfilled:t.onRejected;if(null===n)return void(1===e._81?p(t.promise,e._65):f(t.promise,e._65));var r=i(n,e._65);r===y?f(t.promise,g):p(t.promise,r)})}function p(e,t){if(t===e)return f(e,new TypeError("A promise cannot be resolved with itself."));if(t&&("object"==typeof t||"function"==typeof t)){var n=o(t);if(n===y)return f(e,g);if(n===e.then&&t instanceof s)return e._81=3,e._65=t,void d(e);if("function"==typeof n)return void m(n.bind(t),e)}e._81=1,e._65=t,d(e)}function f(e,t){e._81=2,e._65=t,s._97&&s._97(e,t),d(e)}function d(e){if(1===e._45&&(l(e,e._54),e._54=null),2===e._45){for(var t=0;t<e._54.length;t++)l(e,e._54[t]);e._54=null}}function h(e,t,n){this.onFulfilled="function"==typeof e?e:null,this.onRejected="function"==typeof t?t:null,this.promise=n}function m(e,t){var n=!1,r=a(e,function(e){n||(n=!0,p(t,e))},function(e){n||(n=!0,f(t,e))});n||r!==y||(n=!0,f(t,g))}var v=n(90),g=null,y={};e.exports=s,s._10=null,s._97=null,s._61=r,s.prototype.then=function(e,t){if(this.constructor!==s)return u(this,e,t);var n=new s(r);return l(this,new h(e,t,n)),n}},function(e,t,n){"use strict";var r=n(122);e.exports=function(e){var t=!1;return r(e,t)}},function(e,t,n){"use strict";e.exports=n(205)},function(e,t){"use strict";function n(e,t){return e+t.charAt(0).toUpperCase()+t.substring(1)}var r={animationIterationCount:!0,borderImageOutset:!0,borderImageSlice:!0,borderImageWidth:!0,boxFlex:!0,boxFlexGroup:!0,boxOrdinalGroup:!0,columnCount:!0,flex:!0,flexGrow:!0,flexPositive:!0,flexShrink:!0,flexNegative:!0,flexOrder:!0,gridRow:!0,gridColumn:!0,fontWeight:!0,lineClamp:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,tabSize:!0,widows:!0,zIndex:!0,zoom:!0,fillOpacity:!0,floodOpacity:!0,stopOpacity:!0,strokeDasharray:!0,strokeDashoffset:!0,strokeMiterlimit:!0,strokeOpacity:!0,strokeWidth:!0},o=["Webkit","ms","Moz","O"];Object.keys(r).forEach(function(e){o.forEach(function(t){r[n(t,e)]=r[e]})});var i={background:{backgroundAttachment:!0,backgroundColor:!0,backgroundImage:!0,backgroundPositionX:!0,backgroundPositionY:!0,backgroundRepeat:!0},backgroundPosition:{backgroundPositionX:!0,backgroundPositionY:!0},border:{borderWidth:!0,borderStyle:!0,borderColor:!0},borderBottom:{borderBottomWidth:!0,borderBottomStyle:!0,borderBottomColor:!0},borderLeft:{borderLeftWidth:!0,borderLeftStyle:!0,borderLeftColor:!0},borderRight:{borderRightWidth:!0,borderRightStyle:!0,borderRightColor:!0},borderTop:{borderTopWidth:!0,borderTopStyle:!0,borderTopColor:!0},font:{fontStyle:!0,fontVariant:!0,fontWeight:!0,fontSize:!0,lineHeight:!0,fontFamily:!0},outline:{outlineWidth:!0,outlineStyle:!0,outlineColor:!0}},a={isUnitlessNumber:r,shorthandPropertyExpansions:i};e.exports=a},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var o=n(3),i=n(14),a=(n(1),function(){function e(t){r(this,e),this._callbacks=null,this._contexts=null,this._arg=t}return e.prototype.enqueue=function(e,t){this._callbacks=this._callbacks||[],this._callbacks.push(e),this._contexts=this._contexts||[],this._contexts.push(t)},e.prototype.notifyAll=function(){var e=this._callbacks,t=this._contexts,n=this._arg;if(e&&t){e.length!==t.length?o("24"):void 0,this._callbacks=null,this._contexts=null;for(var r=0;r<e.length;r++)e[r].call(t[r],n);e.length=0,t.length=0}},e.prototype.checkpoint=function(){return this._callbacks?this._callbacks.length:0},e.prototype.rollback=function(e){this._callbacks&&this._contexts&&(this._callbacks.length=e,this._contexts.length=e)},e.prototype.reset=function(){this._callbacks=null,this._contexts=null},e.prototype.destructor=function(){this.reset()},e}());e.exports=i.addPoolingTo(a)},function(e,t,n){"use strict";function r(e){return!!l.hasOwnProperty(e)||!u.hasOwnProperty(e)&&(s.test(e)?(l[e]=!0,!0):(u[e]=!0,!1))}function o(e,t){return null==t||e.hasBooleanValue&&!t||e.hasNumericValue&&isNaN(t)||e.hasPositiveNumericValue&&t<1||e.hasOverloadedBooleanValue&&t===!1}var i=n(18),a=(n(6),n(9),n(186)),s=(n(2),new RegExp("^["+i.ATTRIBUTE_NAME_START_CHAR+"]["+i.ATTRIBUTE_NAME_CHAR+"]*$")),u={},l={},c={createMarkupForID:function(e){return i.ID_ATTRIBUTE_NAME+"="+a(e)},setAttributeForID:function(e,t){e.setAttribute(i.ID_ATTRIBUTE_NAME,t)},createMarkupForRoot:function(){return i.ROOT_ATTRIBUTE_NAME+'=""'},setAttributeForRoot:function(e){e.setAttribute(i.ROOT_ATTRIBUTE_NAME,"")},createMarkupForProperty:function(e,t){var n=i.properties.hasOwnProperty(e)?i.properties[e]:null;if(n){if(o(n,t))return"";var r=n.attributeName;return n.hasBooleanValue||n.hasOverloadedBooleanValue&&t===!0?r+'=""':r+"="+a(t)}return i.isCustomAttribute(e)?null==t?"":e+"="+a(t):null},createMarkupForCustomAttribute:function(e,t){return r(e)&&null!=t?e+"="+a(t):""},setValueForProperty:function(e,t,n){var r=i.properties.hasOwnProperty(t)?i.properties[t]:null;if(r){var a=r.mutationMethod;if(a)a(e,n);else{if(o(r,n))return void this.deleteValueForProperty(e,t);if(r.mustUseProperty)e[r.propertyName]=n;else{var s=r.attributeName,u=r.attributeNamespace;u?e.setAttributeNS(u,s,""+n):r.hasBooleanValue||r.hasOverloadedBooleanValue&&n===!0?e.setAttribute(s,""):e.setAttribute(s,""+n)}}}else if(i.isCustomAttribute(t))return void c.setValueForAttribute(e,t,n)},setValueForAttribute:function(e,t,n){if(r(t)){null==n?e.removeAttribute(t):e.setAttribute(t,""+n)}},deleteValueForAttribute:function(e,t){e.removeAttribute(t)},deleteValueForProperty:function(e,t){var n=i.properties.hasOwnProperty(t)?i.properties[t]:null;if(n){var r=n.mutationMethod;if(r)r(e,void 0);else if(n.mustUseProperty){var o=n.propertyName;n.hasBooleanValue?e[o]=!1:e[o]=""}else e.removeAttribute(n.attributeName)}else i.isCustomAttribute(t)&&e.removeAttribute(t)}};e.exports=c},function(e,t){"use strict";var n={hasCachedChildNodes:1};e.exports=n},function(e,t,n){"use strict";function r(){if(this._rootNodeID&&this._wrapperState.pendingUpdate){this._wrapperState.pendingUpdate=!1;var e=this._currentElement.props,t=s.getValue(e);null!=t&&o(this,Boolean(e.multiple),t)}}function o(e,t,n){var r,o,i=u.getNodeFromInstance(e).options;if(t){for(r={},o=0;o<n.length;o++)r[""+n[o]]=!0;for(o=0;o<i.length;o++){var a=r.hasOwnProperty(i[o].value);i[o].selected!==a&&(i[o].selected=a)}}else{for(r=""+n,o=0;o<i.length;o++)if(i[o].value===r)return void(i[o].selected=!0);i.length&&(i[0].selected=!0)}}function i(e){var t=this._currentElement.props,n=s.executeOnChange(t,e);return this._rootNodeID&&(this._wrapperState.pendingUpdate=!0),l.asap(r,this),n}var a=n(4),s=n(42),u=n(6),l=n(10),c=(n(2),!1),p={getHostProps:function(e,t){return a({},t,{onChange:e._wrapperState.onChange,value:void 0})},mountWrapper:function(e,t){var n=s.getValue(t);e._wrapperState={pendingUpdate:!1,initialValue:null!=n?n:t.defaultValue,listeners:null,onChange:i.bind(e),wasMultiple:Boolean(t.multiple)},void 0===t.value||void 0===t.defaultValue||c||(c=!0)},getSelectValueContext:function(e){return e._wrapperState.initialValue},postUpdateWrapper:function(e){var t=e._currentElement.props;e._wrapperState.initialValue=void 0;var n=e._wrapperState.wasMultiple;e._wrapperState.wasMultiple=Boolean(t.multiple);var r=s.getValue(t);null!=r?(e._wrapperState.pendingUpdate=!1,o(e,Boolean(t.multiple),r)):n!==Boolean(t.multiple)&&(null!=t.defaultValue?o(e,Boolean(t.multiple),t.defaultValue):o(e,Boolean(t.multiple),t.multiple?[]:""))}};e.exports=p},function(e,t){"use strict";var n,r={injectEmptyComponentFactory:function(e){n=e}},o={create:function(e){return n(e)}};o.injection=r,e.exports=o},function(e,t){"use strict";var n={logTopLevelRenders:!1};e.exports=n},function(e,t,n){"use strict";function r(e){return s?void 0:a("111",e.type),new s(e)}function o(e){return new u(e)}function i(e){return e instanceof u}var a=n(3),s=(n(1),null),u=null,l={injectGenericComponentClass:function(e){s=e},injectTextComponentClass:function(e){u=e}},c={createInternalComponent:r,createInstanceForText:o,isTextComponent:i,injection:l};e.exports=c},function(e,t,n){"use strict";function r(e){return i(document.documentElement,e)}var o=n(146),i=n(103),a=n(58),s=n(59),u={hasSelectionCapabilities:function(e){var t=e&&e.nodeName&&e.nodeName.toLowerCase();return t&&("input"===t&&"text"===e.type||"textarea"===t||"true"===e.contentEditable)},getSelectionInformation:function(){var e=s();return{focusedElem:e,selectionRange:u.hasSelectionCapabilities(e)?u.getSelection(e):null}},restoreSelection:function(e){var t=s(),n=e.focusedElem,o=e.selectionRange;t!==n&&r(n)&&(u.hasSelectionCapabilities(n)&&u.setSelection(n,o),a(n))},getSelection:function(e){var t;if("selectionStart"in e)t={start:e.selectionStart,end:e.selectionEnd};else if(document.selection&&e.nodeName&&"input"===e.nodeName.toLowerCase()){var n=document.selection.createRange();n.parentElement()===e&&(t={start:-n.moveStart("character",-e.value.length),end:-n.moveEnd("character",-e.value.length)})}else t=o.getOffsets(e);return t||{start:0,end:0}},setSelection:function(e,t){var n=t.start,r=t.end;if(void 0===r&&(r=n),"selectionStart"in e)e.selectionStart=n,e.selectionEnd=Math.min(r,e.value.length);else if(document.selection&&e.nodeName&&"input"===e.nodeName.toLowerCase()){var i=e.createTextRange();i.collapse(!0),i.moveStart("character",n),i.moveEnd("character",r-n),i.select()}else o.setOffsets(e,t)}};e.exports=u},function(e,t,n){"use strict";function r(e,t){for(var n=Math.min(e.length,t.length),r=0;r<n;r++)if(e.charAt(r)!==t.charAt(r))return r;return e.length===t.length?-1:n}function o(e){return e?e.nodeType===D?e.documentElement:e.firstChild:null}function i(e){return e.getAttribute&&e.getAttribute(M)||""}function a(e,t,n,r,o){var i;if(_.logTopLevelRenders){var a=e._currentElement.props.child,s=a.type;i="React mount: "+("string"==typeof s?s:s.displayName||s.name),console.time(i)}var u=T.mountComponent(e,n,null,b(e,t),o,0);i&&console.timeEnd(i),e._renderedComponent._topLevelWrapper=e,j._mountImageIntoNode(u,t,e,r,n)}function s(e,t,n,r){var o=O.ReactReconcileTransaction.getPooled(!n&&C.useCreateElement);o.perform(a,null,e,t,o,n,r),O.ReactReconcileTransaction.release(o)}function u(e,t,n){for(T.unmountComponent(e,n),t.nodeType===D&&(t=t.documentElement);t.lastChild;)t.removeChild(t.lastChild)}function l(e){var t=o(e);if(t){var n=y.getInstanceFromNode(t);return!(!n||!n._hostParent)}}function c(e){return!(!e||e.nodeType!==I&&e.nodeType!==D&&e.nodeType!==R)}function p(e){var t=o(e),n=t&&y.getInstanceFromNode(t);return n&&!n._hostParent?n:null}function f(e){var t=p(e);return t?t._hostContainerInfo._topLevelWrapper:null}var d=n(3),h=n(17),m=n(18),v=n(20),g=n(29),y=(n(12),n(6)),b=n(140),C=n(142),_=n(70),w=n(26),E=(n(9),n(156)),T=n(19),x=n(45),O=n(10),P=n(23),k=n(80),S=(n(1),n(33)),N=n(51),M=(n(2),m.ID_ATTRIBUTE_NAME),A=m.ROOT_ATTRIBUTE_NAME,I=1,D=9,R=11,L={},U=1,F=function(){this.rootID=U++};F.prototype.isReactComponent={},F.prototype.render=function(){return this.props.child},F.isReactTopLevelWrapper=!0;var j={TopLevelWrapper:F,_instancesByReactRootID:L,scrollMonitor:function(e,t){t()},_updateRootComponent:function(e,t,n,r,o){return j.scrollMonitor(r,function(){x.enqueueElementInternal(e,t,n),o&&x.enqueueCallbackInternal(e,o)}),e},_renderNewRootComponent:function(e,t,n,r){c(t)?void 0:d("37"),g.ensureScrollValueMonitoring();var o=k(e,!1);O.batchedUpdates(s,o,t,n,r);
-var i=o._instance.rootID;return L[i]=o,o},renderSubtreeIntoContainer:function(e,t,n,r){return null!=e&&w.has(e)?void 0:d("38"),j._renderSubtreeIntoContainer(e,t,n,r)},_renderSubtreeIntoContainer:function(e,t,n,r){x.validateCallback(r,"ReactDOM.render"),v.isValidElement(t)?void 0:d("39","string"==typeof t?" Instead of passing a string like 'div', pass React.createElement('div') or <div />.":"function"==typeof t?" Instead of passing a class like Foo, pass React.createElement(Foo) or <Foo />.":null!=t&&void 0!==t.props?" This may be caused by unintentionally loading two independent copies of React.":"");var a,s=v.createElement(F,{child:t});if(e){var u=w.get(e);a=u._processChildContext(u._context)}else a=P;var c=f(n);if(c){var p=c._currentElement,h=p.props.child;if(N(h,t)){var m=c._renderedComponent.getPublicInstance(),g=r&&function(){r.call(m)};return j._updateRootComponent(c,s,a,n,g),m}j.unmountComponentAtNode(n)}var y=o(n),b=y&&!!i(y),C=l(n),_=b&&!c&&!C,E=j._renderNewRootComponent(s,n,_,a)._renderedComponent.getPublicInstance();return r&&r.call(E),E},render:function(e,t,n){return j._renderSubtreeIntoContainer(null,e,t,n)},unmountComponentAtNode:function(e){c(e)?void 0:d("40");var t=f(e);if(!t){l(e),1===e.nodeType&&e.hasAttribute(A);return!1}return delete L[t._instance.rootID],O.batchedUpdates(u,t,e,!1),!0},_mountImageIntoNode:function(e,t,n,i,a){if(c(t)?void 0:d("41"),i){var s=o(t);if(E.canReuseMarkup(e,s))return void y.precacheNode(n,s);var u=s.getAttribute(E.CHECKSUM_ATTR_NAME);s.removeAttribute(E.CHECKSUM_ATTR_NAME);var l=s.outerHTML;s.setAttribute(E.CHECKSUM_ATTR_NAME,u);var p=e,f=r(p,l),m=" (client) "+p.substring(f-20,f+20)+"\n (server) "+l.substring(f-20,f+20);t.nodeType===D?d("42",m):void 0}if(t.nodeType===D?d("43"):void 0,a.useCreateElement){for(;t.lastChild;)t.removeChild(t.lastChild);h.insertTreeBefore(t,e,null)}else S(t,e),y.precacheNode(n,t.firstChild)}};e.exports=j},function(e,t,n){"use strict";var r=n(3),o=n(20),i=(n(1),{HOST:0,COMPOSITE:1,EMPTY:2,getType:function(e){return null===e||e===!1?i.EMPTY:o.isValidElement(e)?"function"==typeof e.type?i.COMPOSITE:i.HOST:void r("26",e)}});e.exports=i},function(e,t){"use strict";var n={currentScrollLeft:0,currentScrollTop:0,refreshScrollValues:function(e){n.currentScrollLeft=e.x,n.currentScrollTop=e.y}};e.exports=n},function(e,t,n){"use strict";function r(e,t){return null==t?o("30"):void 0,null==e?t:Array.isArray(e)?Array.isArray(t)?(e.push.apply(e,t),e):(e.push(t),e):Array.isArray(t)?[e].concat(t):[e,t]}var o=n(3);n(1);e.exports=r},function(e,t){"use strict";function n(e,t,n){Array.isArray(e)?e.forEach(t,n):e&&t.call(n,e)}e.exports=n},function(e,t,n){"use strict";function r(e){for(var t;(t=e._renderedNodeType)===o.COMPOSITE;)e=e._renderedComponent;return t===o.HOST?e._renderedComponent:t===o.EMPTY?null:void 0}var o=n(74);e.exports=r},function(e,t,n){"use strict";function r(){return!i&&o.canUseDOM&&(i="textContent"in document.documentElement?"textContent":"innerText"),i}var o=n(7),i=null;e.exports=r},function(e,t,n){"use strict";function r(e){if(e){var t=e.getName();if(t)return" Check the render method of `"+t+"`."}return""}function o(e){return"function"==typeof e&&"undefined"!=typeof e.prototype&&"function"==typeof e.prototype.mountComponent&&"function"==typeof e.prototype.receiveComponent}function i(e,t){var n;if(null===e||e===!1)n=l.create(i);else if("object"==typeof e){var s=e,u=s.type;if("function"!=typeof u&&"string"!=typeof u){var f="";f+=r(s._owner),a("130",null==u?u:typeof u,f)}"string"==typeof s.type?n=c.createInternalComponent(s):o(s.type)?(n=new s.type(s),n.getHostNode||(n.getHostNode=n.getNativeNode)):n=new p(s)}else"string"==typeof e||"number"==typeof e?n=c.createInstanceForText(e):a("131",typeof e);return n._mountIndex=0,n._mountImage=null,n}var a=n(3),s=n(4),u=n(137),l=n(69),c=n(71),p=(n(221),n(1),n(2),function(e){this.construct(e)});s(p.prototype,u,{_instantiateReactComponent:i}),e.exports=i},function(e,t){"use strict";function n(e){var t=e&&e.nodeName&&e.nodeName.toLowerCase();return"input"===t?!!r[e.type]:"textarea"===t}var r={color:!0,date:!0,datetime:!0,"datetime-local":!0,email:!0,month:!0,number:!0,password:!0,range:!0,search:!0,tel:!0,text:!0,time:!0,url:!0,week:!0};e.exports=n},function(e,t,n){"use strict";var r=n(7),o=n(32),i=n(33),a=function(e,t){if(t){var n=e.firstChild;if(n&&n===e.lastChild&&3===n.nodeType)return void(n.nodeValue=t)}e.textContent=t};r.canUseDOM&&("textContent"in document.documentElement||(a=function(e,t){return 3===e.nodeType?void(e.nodeValue=t):void i(e,o(t))})),e.exports=a},function(e,t,n){"use strict";function r(e,t){return e&&"object"==typeof e&&null!=e.key?l.escape(e.key):t.toString(36)}function o(e,t,n,i){var f=typeof e;if("undefined"!==f&&"boolean"!==f||(e=null),null===e||"string"===f||"number"===f||"object"===f&&e.$$typeof===s)return n(i,e,""===t?c+r(e,0):t),1;var d,h,m=0,v=""===t?c:t+p;if(Array.isArray(e))for(var g=0;g<e.length;g++)d=e[g],h=v+r(d,g),m+=o(d,h,n,i);else{var y=u(e);if(y){var b,C=y.call(e);if(y!==e.entries)for(var _=0;!(b=C.next()).done;)d=b.value,h=v+r(d,_++),m+=o(d,h,n,i);else for(;!(b=C.next()).done;){var w=b.value;w&&(d=w[1],h=v+l.escape(w[0])+p+r(d,0),m+=o(d,h,n,i))}}else if("object"===f){var E="",T=String(e);a("31","[object Object]"===T?"object with keys {"+Object.keys(e).join(", ")+"}":T,E)}}return m}function i(e,t,n){return null==e?0:o(e,"",t,n)}var a=n(3),s=(n(12),n(152)),u=n(183),l=(n(1),n(41)),c=(n(2),"."),p=":";e.exports=i},function(e,t,n){(function(){var t,r,o,i,a;t=n(5),r=t.createClass,o=t.DOM.div,i=n(16).isEqualToObject,a=n(28).cancelEvent,e.exports=r({getDefaultProps:function(){return{}},render:function(){var e=this;return o({className:"option-wrapper "+(this.props.highlight?"highlight":""),onMouseDown:function(t){var n;return n=function(t){return e.props.onClick(t),window.removeEventListener("mouseup",n)},window.addEventListener("mouseup",n),a(t)},onMouseMove:this.props.onMouseMove,onMouseOut:this.props.onMouseOut,onMouseOver:this.props.onMouseOver},this.props.renderItem(this.props.item))},shouldComponentUpdate:function(e){var t,n,r;return!i(null!=e?e.uid:void 0,null!=(t=this.props)?t.uid:void 0)||(null!=e?e.highlight:void 0)!==(null!=(n=this.props)?n.highlight:void 0)||(null!=e?e.selectable:void 0)!==(null!=(r=this.props)?r.selectable:void 0)}})}).call(this)},function(e,t,n){(function(){var t,r,o,i;t=n(5),r=t.createClass,o=t.DOM.svg,i=n(13).findDOMNode,e.exports=r({render:function(){return o(this.props)},componentDidMount:function(){i(this).setAttribute("focusable",!1)}})}).call(this)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function o(e){var t="transition"+e+"Timeout",n="transition"+e;return function(e){if(e[n]){if(null==e[t])return new Error(t+" wasn't supplied to CSSTransitionGroup: this can cause unreliable animations and won't be supported in a future version of React. See https://fb.me/react-animation-transition-group-timeout for more information.");if("number"!=typeof e[t])return new Error(t+" must be a number (in milliseconds)")}return null}}t.__esModule=!0,t.nameShape=void 0,t.transitionTimeout=o;var i=n(5),a=(r(i),n(34)),s=r(a);t.nameShape=s.default.oneOfType([s.default.string,s.default.shape({enter:s.default.string,leave:s.default.string,active:s.default.string}),s.default.shape({enter:s.default.string,enterActive:s.default.string,leave:s.default.string,leaveActive:s.default.string,appear:s.default.string,appearActive:s.default.string})])},function(e,t,n){"use strict";function r(e){var t=Function.prototype.toString,n=Object.prototype.hasOwnProperty,r=RegExp("^"+t.call(n).replace(/[\\^$.*+?()[\]{}|]/g,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$");try{var o=t.call(e);return r.test(o)}catch(e){return!1}}function o(e){var t=l(e);if(t){var n=t.childIDs;c(e),n.forEach(o)}}function i(e,t,n){return"\n    in "+(e||"Unknown")+(t?" (at "+t.fileName.replace(/^.*[\\\/]/,"")+":"+t.lineNumber+")":n?" (created by "+n+")":"")}function a(e){return null==e?"#empty":"string"==typeof e||"number"==typeof e?"#text":"string"==typeof e.type?e.type:e.type.displayName||e.type.name||"Unknown"}function s(e){var t,n=x.getDisplayName(e),r=x.getElement(e),o=x.getOwnerID(e);return o&&(t=x.getDisplayName(o)),i(n,r&&r._source,t)}var u,l,c,p,f,d,h,m=n(22),v=n(12),g=(n(1),n(2),"function"==typeof Array.from&&"function"==typeof Map&&r(Map)&&null!=Map.prototype&&"function"==typeof Map.prototype.keys&&r(Map.prototype.keys)&&"function"==typeof Set&&r(Set)&&null!=Set.prototype&&"function"==typeof Set.prototype.keys&&r(Set.prototype.keys));if(g){var y=new Map,b=new Set;u=function(e,t){y.set(e,t)},l=function(e){return y.get(e)},c=function(e){y.delete(e)},p=function(){return Array.from(y.keys())},f=function(e){b.add(e)},d=function(e){b.delete(e)},h=function(){return Array.from(b.keys())}}else{var C={},_={},w=function(e){return"."+e},E=function(e){return parseInt(e.substr(1),10)};u=function(e,t){var n=w(e);C[n]=t},l=function(e){var t=w(e);return C[t]},c=function(e){var t=w(e);delete C[t]},p=function(){return Object.keys(C).map(E)},f=function(e){var t=w(e);_[t]=!0},d=function(e){var t=w(e);delete _[t]},h=function(){return Object.keys(_).map(E)}}var T=[],x={onSetChildren:function(e,t){var n=l(e);n?void 0:m("144"),n.childIDs=t;for(var r=0;r<t.length;r++){var o=t[r],i=l(o);i?void 0:m("140"),null==i.childIDs&&"object"==typeof i.element&&null!=i.element?m("141"):void 0,i.isMounted?void 0:m("71"),null==i.parentID&&(i.parentID=e),i.parentID!==e?m("142",o,i.parentID,e):void 0}},onBeforeMountComponent:function(e,t,n){var r={element:t,parentID:n,text:null,childIDs:[],isMounted:!1,updateCount:0};u(e,r)},onBeforeUpdateComponent:function(e,t){var n=l(e);n&&n.isMounted&&(n.element=t)},onMountComponent:function(e){var t=l(e);t?void 0:m("144"),t.isMounted=!0;var n=0===t.parentID;n&&f(e)},onUpdateComponent:function(e){var t=l(e);t&&t.isMounted&&t.updateCount++},onUnmountComponent:function(e){var t=l(e);if(t){t.isMounted=!1;var n=0===t.parentID;n&&d(e)}T.push(e)},purgeUnmountedComponents:function(){if(!x._preventPurging){for(var e=0;e<T.length;e++){var t=T[e];o(t)}T.length=0}},isMounted:function(e){var t=l(e);return!!t&&t.isMounted},getCurrentStackAddendum:function(e){var t="";if(e){var n=a(e),r=e._owner;t+=i(n,e._source,r&&r.getName())}var o=v.current,s=o&&o._debugID;return t+=x.getStackAddendumByID(s)},getStackAddendumByID:function(e){for(var t="";e;)t+=s(e),e=x.getParentID(e);return t},getChildIDs:function(e){var t=l(e);return t?t.childIDs:[]},getDisplayName:function(e){var t=x.getElement(e);return t?a(t):null},getElement:function(e){var t=l(e);return t?t.element:null},getOwnerID:function(e){var t=x.getElement(e);return t&&t._owner?t._owner._debugID:null},getParentID:function(e){var t=l(e);return t?t.parentID:null},getSource:function(e){var t=l(e),n=t?t.element:null,r=null!=n?n._source:null;return r},getText:function(e){var t=x.getElement(e);return"string"==typeof t?t:"number"==typeof t?""+t:null},getUpdateCount:function(e){var t=l(e);return t?t.updateCount:0},getRootIDs:h,getRegisteredIDs:p};e.exports=x},function(e,t){"use strict";var n="function"==typeof Symbol&&Symbol.for&&Symbol.for("react.element")||60103;e.exports=n},function(e,t,n){"use strict";var r=!1;e.exports=r},function(e,t){(function(t){"use strict";function n(e){s.length||(a(),u=!0),s[s.length]=e}function r(){for(;l<s.length;){var e=l;if(l+=1,s[e].call(),l>c){for(var t=0,n=s.length-l;t<n;t++)s[t]=s[t+l];s.length-=l,l=0}}s.length=0,l=0,u=!1}function o(e){var t=1,n=new f(e),r=document.createTextNode("");return n.observe(r,{characterData:!0}),function(){t=-t,r.data=t}}function i(e){return function(){function t(){clearTimeout(n),clearInterval(r),e()}var n=setTimeout(t,0),r=setInterval(t,50)}}e.exports=n;var a,s=[],u=!1,l=0,c=1024,p="undefined"!=typeof t?t:self,f=p.MutationObserver||p.WebKitMutationObserver;a="function"==typeof f?o(r):i(r),n.requestFlush=a,n.makeRequestCallFromTimer=i}).call(t,function(){return this}())},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0});var s=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),u=n(5),l=r(u),c=n(204),p=function(e){function t(e){o(this,t);var n=i(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e));return n.getCoefficients=function(e){if(e)return e.map(function(e,t){return l.default.createElement("option",{key:t,value:e.value},e.name)})},n.labels=[],n.handleInputChange=n.handleInputChange.bind(n),n.handleValueChange=n.handleValueChange.bind(n),n}return a(t,e),s(t,[{key:"handleInputChange",value:function(e){var t=this.props.condition;t[e.target.name]=e.target.value;var n=this.props.parameters.find(function(t){return t.value===e.target.value});n&&(n.type!==t.type&&(t.operator=""),t.type=n.type),this.props.onChange({index:this.props.index,value:t})}},{key:"handleValueChange",value:function(e){var t=this.props.condition;t.value=e.map(function(e){return e.value}),this.props.onChange({index:this.props.index,value:t})}},{key:"getOperators",value:function(e,t){if(e&&t)return e.filter(function(e){return e.types.indexOf(t.type)>-1}).map(function(e,t){return l.default.createElement("option",{key:t,value:e.name},e.name)})}},{key:"getValues",value:function(e){return e?e.map(function(e){return{label:e,value:e}}):[]}},{key:"render",value:function(){var e=this,t=this.props.parameters.find(function(t){return t.value===e.props.condition.parameter});return this.props.condition.type=t?t.type:null,l.default.createElement("div",{className:this.props.classes.filterLineRow},l.default.createElement("div",{className:this.props.classes.filterLineParameter},l.default.createElement("select",{className:this.props.classes.filterLineInput,name:"parameter",value:this.props.condition.parameter,onChange:this.handleInputChange},l.default.createElement("option",{value:""},"-- Parameter --"),this.getCoefficients(this.props.parameters))),l.default.createElement("div",{className:this.props.classes.filterLineOperator},l.default.createElement("select",{className:this.props.classes.filterLineInput,name:"operator",value:this.props.condition.operator,onChange:this.handleInputChange},l.default.createElement("option",{disabled:!0,value:""},"-- Operator --"),this.getOperators(this.props.operators,this.props.parameters.find(function(t){return t.value===e.props.condition.parameter})))),l.default.createElement("div",{className:this.props.classes.filterLineValue},l.default.createElement(c.MultiSelect,{style:{width:"100%"},placeholder:"-- Value --",theme:"bootstrap3",values:this.getValues(this.props.condition.value),onValuesChange:this.handleValueChange,uid:function(e){return e.value},restoreOnBackspace:function(e){return e.label.toString()},createFromSearch:function(t,n,r){return e.labels=n.map(function(e){return e.label}),0===r.trim().length||e.labels.indexOf(r.trim())!==-1?null:{label:r.trim(),value:r.trim()}},renderNoResultsFound:function(e,t){return l.default.createElement("div",{className:"no-results-found"},function(){return 0===t.trim().length?"Enter a new value":e.map(function(e){return e.label}).indexOf(t.trim())!==-1?"Value already exists":void 0}())}})))}}]),t}(u.Component);t.default=p},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0});var s=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),u=n(5),l=r(u),c={paddingTop:10,paddingBottom:10,paddingRight:3,paddingLeft:3},p=function(e){function t(e){o(this,t);var n=i(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e));return n.removeCondition=n.removeCondition.bind(n),n.addCondition=n.addCondition.bind(n),n}return a(t,e),s(t,[{key:"removeCondition",value:function(){this.props.removeCondition(this.props.index)}},{key:"addCondition",value:function(){this.props.addCondition(this.props.index)}},{key:"render",value:function(){return l.default.createElement("div",{className:this.props.classes.filterLineLabelRow},l.default.createElement("div",{className:this.props.classes.filterLineLabelCondition},l.default.createElement("label",{style:{marginTop:0}},"Condition {",this.props.index+1,"}")),l.default.createElement("div",{className:this.props.classes.filterLineLabelControls},l.default.createElement("a",{style:c,onClick:this.addCondition},l.default.createElement("span",{className:this.props.classes.plusIcon})),l.default.createElement("a",{style:c,onClick:this.removeCondition},l.default.createElement("span",{className:this.props.classes.minusIcon}))))}}]),t}(u.Component);t.default=p},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0});var s=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),u=n(5),l=r(u),c=n(91),p=r(c),f=n(92),d=r(f),h=function(e){function t(e){o(this,t);var n=i(this,(t.__proto__||Object.getPrototypeOf(t)).call(this,e));return n.state={conditions:e.config.conditions},n.updateCondition=n.updateCondition.bind(n),n.addCondition=n.addCondition.bind(n),n.removeCondition=n.removeCondition.bind(n),n.componentDidUpdate=n.componentDidUpdate.bind(n),n}return a(t,e),s(t,[{key:"updateCondition",value:function(e){var t=this.state.conditions;t[e.index]=e.value,this.setState({conditions:t})}},{key:"addCondition",value:function(e){var t=this.state.conditions;t.splice(e+1,0,{parameter:"",operator:"",value:""}),this.setState({conditions:t})}},{key:"removeCondition",value:function(e){if(this.state.conditions.length>1){var t=this.state.conditions;t.splice(e,1),this.setState({conditions:t})}}},{key:"componentDidUpdate",value:function(e,t){t!==this.state&&this.props.config.updateConditions(this.state.conditions)}},{key:"render",value:function(){var e=this,t=this.state.conditions.map(function(t,n){return l.default.createElement("div",{key:n},l.default.createElement(d.default,{index:n,classes:e.props.config.classes,addCondition:e.addCondition,removeCondition:e.removeCondition}),l.default.createElement(p.default,{parameters:e.props.config.parameters,operators:e.props.config.operators,condition:t,index:n,classes:e.props.config.classes,onChange:e.updateCondition}))});return l.default.createElement("div",{className:"form-horizontal"},t)}}]),t}(u.Component);t.default=h},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}var o=n(5),i=r(o),a=n(13),s=r(a),u=n(93),l=r(u),c=window.$;if(c.fn.filterer=function(e){e.operators=[{name:"contains",types:["string","str"]},{name:"does not contain",types:["string","str"]},{name:"is",types:["string","str","number","int","float"]},{name:"is not",types:["string","str","number","int","float"]},{name:"begins with",types:["string","str"]},{name:"does not begin with",types:["string","str"]},{name:"ends with",types:["string","str"]},{name:"does not end with",types:["string","str"]},{name:"is greater than",types:["number","int","float"]},{name:"is less than",types:["number","int","float"]}],e.classes=Object.assign({plusIcon:"fa fa-fw fa-plus",minusIcon:"fa fa-fw fa-minus",filterLineRow:"form-group",filterLineParameter:"col-sm-4",filterLineOperator:"col-sm-3 condition-operator-col",filterLineValue:"col-sm-5",filterLineInput:"form-control",filterLineLabelRow:"row",filterLineLabelCondition:"col-sm-10",filterLineLabelControls:"col-sm-2 text-right"},e.classes),this.each(function(){s.default.render(i.default.createElement(l.default,{id:"filterer",config:e}),this)})},window.wcomartin_filterer_demo){var p={parameters:[{name:"Title",type:"string",value:"title"},{name:"Year",type:"number",value:"year"}],conditions:[{parameter:"year",operator:"is",value:[2017]}]};p.updateConditions=function(e){console.log(JSON.stringify(e))},c("#root").filterer(p)}},function(e,t){e.exports=function(){for(var e=arguments.length,t=[],n=0;n<e;n++)t[n]=arguments[n];if(t=t.filter(function(e){return null!=e}),0!==t.length)return 1===t.length?t[0]:t.reduce(function(e,t){return function(){e.apply(this,arguments),t.apply(this,arguments)}})}},function(e,t,n){"use strict";function r(e,t){e.classList?e.classList.add(t):(0,i.default)(e,t)||("string"==typeof e.className?e.className=e.className+" "+t:e.setAttribute("class",(e.className&&e.className.baseVal||"")+" "+t))}var o=n(35);t.__esModule=!0,t.default=r;var i=o(n(97));e.exports=t.default},function(e,t){"use strict";function n(e,t){return e.classList?!!t&&e.classList.contains(t):(" "+(e.className.baseVal||e.className)+" ").indexOf(" "+t+" ")!==-1}t.__esModule=!0,t.default=n,e.exports=t.default},function(e,t){"use strict";function n(e,t){return e.replace(new RegExp("(^|\\s)"+t+"(?:\\s|$)","g"),"$1").replace(/\s+/g," ").replace(/^\s*|\s*$/g,"")}e.exports=function(e,t){e.classList?e.classList.remove(t):"string"==typeof e.className?e.className=n(e.className,t):e.setAttribute("class",n(e.className&&e.className.baseVal||"",t))}},function(e,t,n){"use strict";function r(){for(var e,t,n=document.createElement("div").style,r={O:function(e){return"o"+e.toLowerCase()},Moz:function(e){return e.toLowerCase()},Webkit:function(e){return"webkit"+e},ms:function(e){return"MS"+e}},o=Object.keys(r),i="",a=0;a<o.length;a++){var s=o[a];if(s+"TransitionProperty"in n){i="-"+s.toLowerCase(),e=r[s]("TransitionEnd"),t=r[s]("AnimationEnd");break}}return!e&&"transitionProperty"in n&&(e="transitionend"),!t&&"animationName"in n&&(t="animationend"),n=null,{animationEnd:t,transitionEnd:e,prefix:i}}var o=n(35);t.__esModule=!0,t.default=t.animationEnd=t.animationDelay=t.animationTiming=t.animationDuration=t.animationName=t.transitionEnd=t.transitionDuration=t.transitionDelay=t.transitionTiming=t.transitionProperty=t.transform=void 0;var i=o(n(56)),a="transform";t.transform=a;var s,u,l;t.animationEnd=l,t.transitionEnd=u;var c,p,f,d;t.transitionDelay=d,t.transitionTiming=f,t.transitionDuration=p,t.transitionProperty=c;var h,m,v,g;if(t.animationDelay=g,t.animationTiming=v,t.animationDuration=m,t.animationName=h,i.default){var y=r();s=y.prefix,t.transitionEnd=u=y.transitionEnd,t.animationEnd=l=y.animationEnd,t.transform=a=s+"-"+a,t.transitionProperty=c=s+"-transition-property",t.transitionDuration=p=s+"-transition-duration",t.transitionDelay=d=s+"-transition-delay",t.transitionTiming=f=s+"-transition-timing-function",t.animationName=h=s+"-animation-name",t.animationDuration=m=s+"-animation-duration",t.animationTiming=v=s+"-animation-delay",t.animationDelay=g=s+"-animation-timing-function"}var b={transform:a,end:u,property:c,timing:f,delay:d,duration:p};t.default=b},function(e,t,n){"use strict";function r(e){var t=(new Date).getTime(),n=Math.max(0,16-(t-p)),r=setTimeout(e,n);return p=t,r}var o=n(35);t.__esModule=!0,t.default=void 0;var i,a=o(n(56)),s=["","webkit","moz","o","ms"],u="clearTimeout",l=r,c=function(e,t){return e+(e?t[0].toUpperCase()+t.substr(1):t)+"AnimationFrame"};a.default&&s.some(function(e){var t=c(e,"request");if(t in window)return u=c(e,"cancel"),l=function(e){return window[t](e)}});var p=(new Date).getTime();i=function(e){return l(e)},i.cancel=function(e){window[u]&&"function"==typeof window[u]&&window[u](e)};var f=i;t.default=f,e.exports=t.default},function(e,t){"use strict";function n(e){return e.replace(r,function(e,t){return t.toUpperCase()})}var r=/-(.)/g;e.exports=n},function(e,t,n){"use strict";function r(e){return o(e.replace(i,"ms-"))}var o=n(101),i=/^-ms-/;e.exports=r},function(e,t,n){"use strict";function r(e,t){return!(!e||!t)&&(e===t||!o(e)&&(o(t)?r(e,t.parentNode):"contains"in e?e.contains(t):!!e.compareDocumentPosition&&!!(16&e.compareDocumentPosition(t))))}var o=n(111);e.exports=r},function(e,t,n){"use strict";function r(e){var t=e.length;if(Array.isArray(e)||"object"!=typeof e&&"function"!=typeof e?a(!1):void 0,"number"!=typeof t?a(!1):void 0,0===t||t-1 in e?void 0:a(!1),"function"==typeof e.callee?a(!1):void 0,e.hasOwnProperty)try{return Array.prototype.slice.call(e)}catch(e){}for(var n=Array(t),r=0;r<t;r++)n[r]=e[r];return n}function o(e){return!!e&&("object"==typeof e||"function"==typeof e)&&"length"in e&&!("setInterval"in e)&&"number"!=typeof e.nodeType&&(Array.isArray(e)||"callee"in e||"item"in e)}function i(e){return o(e)?Array.isArray(e)?e.slice():r(e):[e]}var a=n(1);e.exports=i},function(e,t,n){"use strict";function r(e){var t=e.match(c);return t&&t[1].toLowerCase()}function o(e,t){var n=l;l?void 0:u(!1);var o=r(e),i=o&&s(o);if(i){n.innerHTML=i[1]+e+i[2];for(var c=i[0];c--;)n=n.lastChild}else n.innerHTML=e;var p=n.getElementsByTagName("script");p.length&&(t?void 0:u(!1),a(p).forEach(t));for(var f=Array.from(n.childNodes);n.lastChild;)n.removeChild(n.lastChild);return f}var i=n(7),a=n(104),s=n(106),u=n(1),l=i.canUseDOM?document.createElement("div"):null,c=/^\s*<(\w+)/;e.exports=o},function(e,t,n){"use strict";function r(e){return a?void 0:i(!1),f.hasOwnProperty(e)||(e="*"),s.hasOwnProperty(e)||("*"===e?a.innerHTML="<link />":a.innerHTML="<"+e+"></"+e+">",s[e]=!a.firstChild),s[e]?f[e]:null}var o=n(7),i=n(1),a=o.canUseDOM?document.createElement("div"):null,s={},u=[1,'<select multiple="true">',"</select>"],l=[1,"<table>","</table>"],c=[3,"<table><tbody><tr>","</tr></tbody></table>"],p=[1,'<svg xmlns="http://www.w3.org/2000/svg">',"</svg>"],f={"*":[1,"?<div>","</div>"],area:[1,"<map>","</map>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],legend:[1,"<fieldset>","</fieldset>"],param:[1,"<object>","</object>"],tr:[2,"<table><tbody>","</tbody></table>"],optgroup:u,option:u,caption:l,colgroup:l,tbody:l,tfoot:l,thead:l,td:c,th:c},d=["circle","clipPath","defs","ellipse","g","image","line","linearGradient","mask","path","pattern","polygon","polyline","radialGradient","rect","stop","text","tspan"];d.forEach(function(e){f[e]=p,s[e]=!0}),e.exports=r},function(e,t){"use strict";function n(e){return e.Window&&e instanceof e.Window?{x:e.pageXOffset||e.document.documentElement.scrollLeft,y:e.pageYOffset||e.document.documentElement.scrollTop}:{x:e.scrollLeft,y:e.scrollTop}}e.exports=n},function(e,t){"use strict";function n(e){return e.replace(r,"-$1").toLowerCase()}var r=/([A-Z])/g;e.exports=n},function(e,t,n){"use strict";function r(e){return o(e).replace(i,"-ms-")}var o=n(108),i=/^ms-/;e.exports=r},function(e,t){"use strict";function n(e){var t=e?e.ownerDocument||e:document,n=t.defaultView||window;return!(!e||!("function"==typeof n.Node?e instanceof n.Node:"object"==typeof e&&"number"==typeof e.nodeType&&"string"==typeof e.nodeName))}e.exports=n},function(e,t,n){"use strict";function r(e){return o(e)&&3==e.nodeType}var o=n(110);e.exports=r},function(e,t){"use strict";function n(e){var t={};return function(n){return t.hasOwnProperty(n)||(t[n]=e.call(this,n)),t[n]}}e.exports=n},function(e,t){function n(e,t){var n,r=function(o){return e.length>1?function(){var i=o?o.concat():[];return n=t?n||this:this,i.push.apply(i,arguments)<e.length&&arguments.length?r.call(n,i):e.apply(n,i)}:e};return r()}var r,o,i,a,s,u,l={}.toString;r=n(function(e,t){return e.apply(null,t)}),o=function(e){return n(e)},i=n(function(e,t,n){return e(n,t)}),a=function(e){return function(t){return function(){return e(t(t)).apply(null,arguments)}}(function(t){return function(){return e(t(t)).apply(null,arguments)}})},s=n(function(e,t,n,r){return e(t(n),t(r))}),u=function(e){var t;return t={},function(){var n,r,o,i,a,s;for(r=[],o=0,i=arguments.length;o<i;++o)r.push(arguments[o]);return n=r,a=function(){var e,t,r,o=[];for(e=0,r=(t=n).length;e<r;++e)s=t[e],o.push(s+l.call(s).slice(8,-1));return o}().join(""),t[a]=a in t?t[a]:e.apply(null,n)}},e.exports={curry:o,flip:i,fix:a,apply:r,over:s,memoize:u}},function(e,t){function n(e,t){var n,r=function(o){return e.length>1?function(){var i=o?o.concat():[];return n=t?n||this:this,i.push.apply(i,arguments)<e.length&&arguments.length?r.call(n,i):e.apply(n,i)}:e};return r()}function r(e,t){for(var n=-1,r=t.length>>>0;++n<r;)if(e===t[n])return!0;return!1}function o(){var e=arguments;return function(){var t,n;for(n=e[0].apply(this,arguments),t=1;t<e.length;++t)n=e[t](n);return n}}function i(e){return!e}var a,s,u,l,c,p,f,d,h,m,v,g,y,b,C,_,w,E,T,x,O,P,k,S,N,M,A,I,D,R,L,U,F,j,B,V,W,H,q,z,K,Y,X,G,Q,$,Z,J,ee,te,ne,re,oe,ie,ae,se,ue,le,ce,pe,fe,de,he,me,ve,ge,ye,be,Ce,_e,we={}.toString;a=n(function(e,t){var n,r,o;for(n=0,r=t.length;n<r;++n)o=t[n],e(o);return t}),s=n(function(e,t){var n,r,o,i=[];for(n=0,r=t.length;n<r;++n)o=t[n],i.push(e(o));return i}),u=function(e){var t,n,r,o=[];for(t=0,n=e.length;t<n;++t)r=e[t],r&&o.push(r);return o},l=n(function(e,t){var n,r,o,i=[];for(n=0,r=t.length;n<r;++n)o=t[n],e(o)&&i.push(o);return i}),c=n(function(e,t){var n,r,o,i=[];for(n=0,r=t.length;n<r;++n)o=t[n],e(o)||i.push(o);return i}),p=n(function(e,t){var n,r;return n=ye(e,t),r=t.slice(),null!=n&&r.splice(n,1),r}),f=n(function(e,t){var n,r,o,i,a;for(n=[],r=[],o=0,i=t.length;o<i;++o)a=t[o],(e(a)?n:r).push(a);return[n,r]}),d=n(function(e,t){var n,r,o;for(n=0,r=t.length;n<r;++n)if(o=t[n],e(o))return o}),h=m=function(e){return e[0]},v=function(e){if(e.length)return e.slice(1)},g=function(e){return e[e.length-1]},y=function(e){if(e.length)return e.slice(0,-1)},b=function(e){return!e.length},C=function(e){return e.concat().reverse()},_=function(e){var t,n,o,i;for(t=[],n=0,o=e.length;n<o;++n)i=e[n],r(i,t)||t.push(i);return t},w=n(function(e,t){var n,o,i,a,s,u=[];for(n=[],o=0,i=t.length;o<i;++o)a=t[o],s=e(a),r(s,n)||(n.push(s),u.push(a));return u}),E=T=n(function(e,t,n){var r,o,i;for(r=0,o=n.length;r<o;++r)i=n[r],t=e(t,i);return t}),x=O=n(function(e,t){return E(e,t[0],t.slice(1))}),P=n(function(e,t,n){var r,o;for(r=n.length-1;r>=0;--r)o=n[r],t=e(o,t);return t}),k=n(function(e,t){return P(e,t[t.length-1],t.slice(0,-1))}),S=n(function(e,t){var n,r,o;for(n=[],r=t;null!=(o=e(r));)n.push(o[0]),r=o[1];return n}),N=function(e){return[].concat.apply([],e)},M=n(function(e,t){var n;return[].concat.apply([],function(){
-var r,o,i,a=[];for(r=0,i=(o=t).length;r<i;++r)n=o[r],a.push(e(n));return a}())}),A=function(e){var t;return[].concat.apply([],function(){var n,r,o,i=[];for(n=0,o=(r=e).length;n<o;++n)t=r[n],"Array"===we.call(t).slice(8,-1)?i.push(A(t)):i.push(t);return i}())},I=function(e){var t,n,o,i,a,s,u,l,c,p;for(n=[],o=1,i=arguments.length;o<i;++o)n.push(arguments[o]);t=n,a=[];e:for(o=0,s=e.length;o<s;++o){for(u=e[o],l=0,c=t.length;l<c;++l)if(p=t[l],r(u,p))continue e;a.push(u)}return a},D=function(e){var t,n,o,i,a,s,u,l,c,p;for(n=[],o=1,i=arguments.length;o<i;++o)n.push(arguments[o]);t=n,a=[];e:for(o=0,s=e.length;o<s;++o){for(u=e[o],l=0,c=t.length;l<c;++l)if(p=t[l],!r(u,p))continue e;a.push(u)}return a},R=function(){var e,t,n,o,i,a,s,u,l,c;for(t=[],n=0,o=arguments.length;n<o;++n)t.push(arguments[n]);for(e=t,i=[],n=0,a=e.length;n<a;++n)for(s=e[n],u=0,l=s.length;u<l;++u)c=s[u],r(c,i)||i.push(c);return i},L=n(function(e,t){var n,r,o,i,a;for(n={},r=0,o=t.length;r<o;++r)i=t[r],a=e(i),a in n?n[a]+=1:n[a]=1;return n}),U=n(function(e,t){var n,r,o,i,a;for(n={},r=0,o=t.length;r<o;++r)i=t[r],a=e(i),a in n?n[a].push(i):n[a]=[i];return n}),F=function(e){var t,n,r;for(t=0,n=e.length;t<n;++t)if(r=e[t],!r)return!1;return!0},j=function(e){var t,n,r;for(t=0,n=e.length;t<n;++t)if(r=e[t])return!0;return!1},B=n(function(e,t){var n,r,o;for(n=0,r=t.length;n<r;++n)if(o=t[n],e(o))return!0;return!1}),V=n(function(e,t){var n,r,o;for(n=0,r=t.length;n<r;++n)if(o=t[n],!e(o))return!1;return!0}),W=function(e){return e.concat().sort(function(e,t){return e>t?1:e<t?-1:0})},H=n(function(e,t){return t.concat().sort(e)}),q=n(function(e,t){return t.concat().sort(function(t,n){return e(t)>e(n)?1:e(t)<e(n)?-1:0})}),z=function(e){var t,n,r,o;for(t=0,n=0,r=e.length;n<r;++n)o=e[n],t+=o;return t},K=function(e){var t,n,r,o;for(t=1,n=0,r=e.length;n<r;++n)o=e[n],t*=o;return t},Y=X=function(e){var t,n,r,o;for(t=0,n=0,r=e.length;n<r;++n)o=e[n],t+=o;return t/e.length},G=function(e){var t,n,r,o,i;for(t=e[0],n=0,o=(r=e.slice(1)).length;n<o;++n)i=r[n],i>t&&(t=i);return t},Q=function(e){var t,n,r,o,i;for(t=e[0],n=0,o=(r=e.slice(1)).length;n<o;++n)i=r[n],i<t&&(t=i);return t},$=n(function(e,t){var n,r,o,i,a;for(n=t[0],r=0,i=(o=t.slice(1)).length;r<i;++r)a=o[r],e(a)>e(n)&&(n=a);return n}),Z=n(function(e,t){var n,r,o,i,a;for(n=t[0],r=0,i=(o=t.slice(1)).length;r<i;++r)a=o[r],e(a)<e(n)&&(n=a);return n}),J=ee=n(function(e,t,n){var r,o;return r=t,[t].concat(function(){var t,i,a,s=[];for(t=0,a=(i=n).length;t<a;++t)o=i[t],s.push(r=e(r,o));return s}())}),te=ne=n(function(e,t){if(t.length)return J(e,t[0],t.slice(1))}),re=n(function(e,t,n){return n=n.concat().reverse(),J(e,t,n).reverse()}),oe=n(function(e,t){if(t.length)return t=t.concat().reverse(),J(e,t[0],t.slice(1)).reverse()}),ie=n(function(e,t,n){return n.slice(e,t)}),ae=n(function(e,t){return e<=0?t.slice(0,0):t.slice(0,e)}),se=n(function(e,t){return e<=0?t:t.slice(e)}),ue=n(function(e,t){return[ae(e,t),se(e,t)]}),le=n(function(e,t){var n,r;if(n=t.length,!n)return t;for(r=0;r<n&&e(t[r]);)r+=1;return t.slice(0,r)}),ce=n(function(e,t){var n,r;if(n=t.length,!n)return t;for(r=0;r<n&&e(t[r]);)r+=1;return t.slice(r)}),pe=n(function(e,t){return[le(e,t),ce(e,t)]}),fe=n(function(e,t){return pe(o(e,i),t)}),de=n(function(e,t){var n,r,o,i,a,s;for(n=[],r=t.length,o=0,i=e.length;o<i&&(a=o,s=e[o],a!==r);++o)n.push([s,t[a]]);return n}),he=n(function(e,t,n){var r,o,i,a,s,u;for(r=[],o=n.length,i=0,a=t.length;i<a&&(s=i,u=t[i],s!==o);++i)r.push(e(u,n[s]));return r}),me=function(){var e,t,n,r,o,i,a,s,u,l,c,p=[];for(t=[],n=0,r=arguments.length;n<r;++n)t.push(arguments[n]);for(e=t,o=void 0,n=0,i=e.length;n<i;++n)a=e[n],o<=(s=a.length)||(o=s);for(n=0;n<o;++n){for(u=n,l=[],c=0,i=e.length;c<i;++c)a=e[c],l.push(a[u]);p.push(l)}return p},ve=function(e){function t(){var e,t,r,o=[];for(e=0,r=(t=n).length;e<r;++e)u=t[e],o.push(u[c]);return o}var n,r,o,i,a,s,u,l,c,p=[];for(r=[],o=1,i=arguments.length;o<i;++o)r.push(arguments[o]);for(n=r,a=void 0,o=0,s=n.length;o<s;++o)u=n[o],a<=(l=u.length)||(a=l);for(o=0;o<a;++o)c=o,p.push(e.apply(null,t()));return p},ge=n(function(e,t){return e<0?t[t.length+e]:t[e]}),ye=n(function(e,t){var n,r,o,i;for(n=0,r=t.length;n<r;++n)if(o=n,i=t[n],i===e)return o}),be=n(function(e,t){var n,r,o,i,a=[];for(n=0,r=t.length;n<r;++n)o=n,i=t[n],i===e&&a.push(o);return a}),Ce=n(function(e,t){var n,r,o,i;for(n=0,r=t.length;n<r;++n)if(o=n,i=t[n],e(i))return o}),_e=n(function(e,t){var n,r,o,i,a=[];for(n=0,r=t.length;n<r;++n)o=n,i=t[n],e(i)&&a.push(o);return a}),e.exports={each:a,map:s,filter:l,compact:u,reject:c,remove:p,partition:f,find:d,head:h,first:m,tail:v,last:g,initial:y,empty:b,reverse:C,difference:I,intersection:D,union:R,countBy:L,groupBy:U,fold:E,fold1:x,foldl:T,foldl1:O,foldr:P,foldr1:k,unfoldr:S,andList:F,orList:j,any:B,all:V,unique:_,uniqueBy:w,sort:W,sortWith:H,sortBy:q,sum:z,product:K,mean:Y,average:X,concat:N,concatMap:M,flatten:A,maximum:G,minimum:Q,maximumBy:$,minimumBy:Z,scan:J,scan1:te,scanl:ee,scanl1:ne,scanr:re,scanr1:oe,slice:ie,take:ae,drop:se,splitAt:ue,takeWhile:le,dropWhile:ce,span:pe,breakList:fe,zip:de,zipWith:he,zipAll:me,zipAllWith:ve,at:ge,elemIndex:ye,elemIndices:be,findIndex:Ce,findIndices:_e}},function(e,t){function n(e,t){var n,r=function(o){return e.length>1?function(){var i=o?o.concat():[];return n=t?n||this:this,i.push.apply(i,arguments)<e.length&&arguments.length?r.call(n,i):e.apply(n,i)}:e};return r()}var r,o,i,a,s,u,l,c,p,f,d,h,m,v,g,y,b,C,_,w,E,T,x,O,P,k,S,N,M,A,I,D;r=n(function(e,t){return e>t?e:t}),o=n(function(e,t){return e<t?e:t}),i=function(e){return-e},a=Math.abs,s=function(e){return e<0?-1:e>0?1:0},u=n(function(e,t){return~~(e/t)}),l=n(function(e,t){return e%t}),c=n(function(e,t){return Math.floor(e/t)}),p=n(function(e,t){var n;return(e%(n=t)+n)%n}),f=function(e){return 1/e},d=Math.PI,h=2*d,m=Math.exp,v=Math.sqrt,g=Math.log,y=n(function(e,t){return Math.pow(e,t)}),b=Math.sin,C=Math.tan,_=Math.cos,w=Math.asin,E=Math.acos,T=Math.atan,x=n(function(e,t){return Math.atan2(e,t)}),O=function(e){return~~e},P=Math.round,k=Math.ceil,S=Math.floor,N=function(e){return e!==e},M=function(e){return e%2===0},A=function(e){return e%2!==0},I=n(function(e,t){var n;for(e=Math.abs(e),t=Math.abs(t);0!==t;)n=e%t,e=t,t=n;return e}),D=n(function(e,t){return Math.abs(Math.floor(e/I(e,t)*t))}),e.exports={max:r,min:o,negate:i,abs:a,signum:s,quot:u,rem:l,div:c,mod:p,recip:f,pi:d,tau:h,exp:m,sqrt:v,ln:g,pow:y,sin:b,tan:C,cos:_,acos:E,asin:w,atan:T,atan2:x,truncate:O,round:P,ceiling:k,floor:S,isItNaN:N,even:M,odd:A,gcd:I,lcm:D}},function(e,t){function n(e,t){var n,r=function(o){return e.length>1?function(){var i=o?o.concat():[];return n=t?n||this:this,i.push.apply(i,arguments)<e.length&&arguments.length?r.call(n,i):e.apply(n,i)}:e};return r()}var r,o,i,a,s,u,l,c,p,f,d,h,m,v;r=function(e){var t,n,r=[];for(t in e)n=e[t],r.push(n);return r},o=function(e){var t,n=[];for(t in e)n.push(t);return n},i=function(e){var t,n,r,o={};for(t=0,n=e.length;t<n;++t)r=e[t],o[r[0]]=r[1];return o},a=function(e){var t,n,r=[];for(t in e)n=e[t],r.push([t,n]);return r},s=n(function(e,t){var n,r,o,i,a={};for(n=0,r=e.length;n<r;++n)o=n,i=e[n],a[i]=t[o];return a}),u=function(e){var t,n,r,o;t=[],n=[];for(r in e)o=e[r],t.push(r),n.push(o);return[t,n]},l=function(e){var t;for(t in e)return!1;return!0},c=n(function(e,t){var n,r;for(n in t)r=t[n],e(r);return t}),p=n(function(e,t){var n,r,o={};for(n in t)r=t[n],o[n]=e(r);return o}),f=function(e){var t,n,r={};for(t in e)n=e[t],n&&(r[t]=n);return r},d=n(function(e,t){var n,r,o={};for(n in t)r=t[n],e(r)&&(o[n]=r);return o}),h=n(function(e,t){var n,r,o={};for(n in t)r=t[n],e(r)||(o[n]=r);return o}),m=n(function(e,t){var n,r,o,i;n={},r={};for(o in t)i=t[o],(e(i)?n:r)[o]=i;return[n,r]}),v=n(function(e,t){var n,r;for(n in t)if(r=t[n],e(r))return r}),e.exports={values:r,keys:o,pairsToObj:i,objToPairs:a,listsToObj:s,objToLists:u,empty:l,each:c,map:p,filter:d,compact:f,reject:h,partition:m,find:v}},function(e,t){function n(e,t){var n,r=function(o){return e.length>1?function(){var i=o?o.concat():[];return n=t?n||this:this,i.push.apply(i,arguments)<e.length&&arguments.length?r.call(n,i):e.apply(n,i)}:e};return r()}var r,o,i,a,s,u,l,c,p,f,d,h,m;r=n(function(e,t){return t.split(e)}),o=n(function(e,t){return t.join(e)}),i=function(e){return e.length?e.split("\n"):[]},a=function(e){return e.join("\n")},s=function(e){return e.length?e.split(/[ ]+/):[]},u=function(e){return e.join(" ")},l=function(e){return e.split("")},c=function(e){return e.join("")},p=function(e){return e.split("").reverse().join("")},f=n(function(e,t){var n,r;for(n="",r=0;r<e;++r)n+=t;return n}),d=function(e){return e.charAt(0).toUpperCase()+e.slice(1)},h=function(e){return e.replace(/[-_]+(.)?/g,function(e,t){return(null!=t?t:"").toUpperCase()})},m=function(e){return e.replace(/([^-A-Z])([A-Z]+)/g,function(e,t,n){return t+"-"+(n.length>1?n:n.toLowerCase())}).replace(/^([A-Z]+)/,function(e,t){return t.length>1?t+"-":t.toLowerCase()})},e.exports={split:r,join:o,lines:i,unlines:a,words:s,unwords:u,chars:l,unchars:c,reverse:p,repeat:f,capitalize:d,camelize:h,dasherize:m}},[227,113,114,116,117,115],function(e,t,n){"use strict";function r(e){var t=new o(o._61);return t._81=1,t._65=e,t}var o=n(61);e.exports=o;var i=r(!0),a=r(!1),s=r(null),u=r(void 0),l=r(0),c=r("");o.resolve=function(e){if(e instanceof o)return e;if(null===e)return s;if(void 0===e)return u;if(e===!0)return i;if(e===!1)return a;if(0===e)return l;if(""===e)return c;if("object"==typeof e||"function"==typeof e)try{var t=e.then;if("function"==typeof t)return new o(t.bind(e))}catch(e){return new o(function(t,n){n(e)})}return r(e)},o.all=function(e){var t=Array.prototype.slice.call(e);return new o(function(e,n){function r(a,s){if(s&&("object"==typeof s||"function"==typeof s)){if(s instanceof o&&s.then===o.prototype.then){for(;3===s._81;)s=s._65;return 1===s._81?r(a,s._65):(2===s._81&&n(s._65),void s.then(function(e){r(a,e)},n))}var u=s.then;if("function"==typeof u){var l=new o(u.bind(s));return void l.then(function(e){r(a,e)},n)}}t[a]=s,0===--i&&e(t)}if(0===t.length)return e([]);for(var i=t.length,a=0;a<t.length;a++)r(a,t[a])})},o.reject=function(e){return new o(function(t,n){n(e)})},o.race=function(e){return new o(function(t,n){e.forEach(function(e){o.resolve(e).then(t,n)})})},o.prototype.catch=function(e){return this.then(null,e)}},function(e,t,n){"use strict";function r(){l=!1,s._10=null,s._97=null}function o(e){function t(t){(e.allRejections||a(p[t].error,e.whitelist||u))&&(p[t].displayId=c++,e.onUnhandled?(p[t].logged=!0,e.onUnhandled(p[t].displayId,p[t].error)):(p[t].logged=!0,i(p[t].displayId,p[t].error)))}function n(t){p[t].logged&&(e.onHandled?e.onHandled(p[t].displayId,p[t].error):p[t].onUnhandled||(console.warn("Promise Rejection Handled (id: "+p[t].displayId+"):"),console.warn('  This means you can ignore any previous messages of the form "Possible Unhandled Promise Rejection" with id '+p[t].displayId+".")))}e=e||{},l&&r(),l=!0;var o=0,c=0,p={};s._10=function(e){2===e._81&&p[e._72]&&(p[e._72].logged?n(e._72):clearTimeout(p[e._72].timeout),delete p[e._72])},s._97=function(e,n){0===e._45&&(e._72=o++,p[e._72]={displayId:null,error:n,timeout:setTimeout(t.bind(null,e._72),a(n,u)?100:2e3),logged:!1})}}function i(e,t){console.warn("Possible Unhandled Promise Rejection (id: "+e+"):");var n=(t&&(t.stack||t))+"";n.split("\n").forEach(function(e){console.warn("  "+e)})}function a(e,t){return t.some(function(t){return e instanceof t})}var s=n(61),u=[ReferenceError,TypeError,RangeError],l=!1;t.disable=r,t.enable=o},function(e,t,n){"use strict";function r(e,t,n,r,o){}e.exports=r},function(e,t,n){"use strict";var r=n(8),o=n(1),i=(n(2),n(123)),a=n(121);e.exports=function(e,t){function n(e){var t=e&&(x&&e[x]||e[O]);if("function"==typeof t)return t}function s(e,t){return e===t?0!==e||1/e===1/t:e!==e&&t!==t}function u(e){this.message=e,this.stack=""}function l(e){function n(n,r,a,s,l,c,p){if(s=s||P,c=c||a,p!==i)if(t)o(!1,"Calling PropTypes validators directly is not supported by the `prop-types` package. Use `PropTypes.checkPropTypes()` to call them. Read more at http://fb.me/use-check-prop-types");else;return null==r[a]?n?new u(null===r[a]?"The "+l+" `"+c+"` is marked as required "+("in `"+s+"`, but its value is `null`."):"The "+l+" `"+c+"` is marked as required in "+("`"+s+"`, but its value is `undefined`.")):null:e(r,a,s,l,c)}var r=n.bind(null,!1);return r.isRequired=n.bind(null,!0),r}function c(e){function t(t,n,r,o,i,a){var s=t[n],l=w(s);if(l!==e){var c=E(s);return new u("Invalid "+o+" `"+i+"` of type "+("`"+c+"` supplied to `"+r+"`, expected ")+("`"+e+"`."))}return null}return l(t)}function p(){return l(r.thatReturnsNull)}function f(e){function t(t,n,r,o,a){if("function"!=typeof e)return new u("Property `"+a+"` of component `"+r+"` has invalid PropType notation inside arrayOf.");var s=t[n];if(!Array.isArray(s)){var l=w(s);return new u("Invalid "+o+" `"+a+"` of type "+("`"+l+"` supplied to `"+r+"`, expected an array."))}for(var c=0;c<s.length;c++){var p=e(s,c,r,o,a+"["+c+"]",i);if(p instanceof Error)return p}return null}return l(t)}function d(){function t(t,n,r,o,i){var a=t[n];if(!e(a)){var s=w(a);return new u("Invalid "+o+" `"+i+"` of type "+("`"+s+"` supplied to `"+r+"`, expected a single ReactElement."))}return null}return l(t)}function h(e){function t(t,n,r,o,i){if(!(t[n]instanceof e)){var a=e.name||P,s=T(t[n]);return new u("Invalid "+o+" `"+i+"` of type "+("`"+s+"` supplied to `"+r+"`, expected ")+("instance of `"+a+"`."))}return null}return l(t)}function m(e){function t(t,n,r,o,i){for(var a=t[n],l=0;l<e.length;l++)if(s(a,e[l]))return null;var c=JSON.stringify(e);return new u("Invalid "+o+" `"+i+"` of value `"+a+"` "+("supplied to `"+r+"`, expected one of "+c+"."))}return Array.isArray(e)?l(t):r.thatReturnsNull}function v(e){function t(t,n,r,o,a){if("function"!=typeof e)return new u("Property `"+a+"` of component `"+r+"` has invalid PropType notation inside objectOf.");var s=t[n],l=w(s);if("object"!==l)return new u("Invalid "+o+" `"+a+"` of type "+("`"+l+"` supplied to `"+r+"`, expected an object."));for(var c in s)if(s.hasOwnProperty(c)){var p=e(s,c,r,o,a+"."+c,i);if(p instanceof Error)return p}return null}return l(t)}function g(e){function t(t,n,r,o,a){for(var s=0;s<e.length;s++){var l=e[s];if(null==l(t,n,r,o,a,i))return null}return new u("Invalid "+o+" `"+a+"` supplied to "+("`"+r+"`."))}return Array.isArray(e)?l(t):r.thatReturnsNull}function y(){function e(e,t,n,r,o){return C(e[t])?null:new u("Invalid "+r+" `"+o+"` supplied to "+("`"+n+"`, expected a ReactNode."))}return l(e)}function b(e){function t(t,n,r,o,a){var s=t[n],l=w(s);if("object"!==l)return new u("Invalid "+o+" `"+a+"` of type `"+l+"` "+("supplied to `"+r+"`, expected `object`."));for(var c in e){var p=e[c];if(p){var f=p(s,c,r,o,a+"."+c,i);if(f)return f}}return null}return l(t)}function C(t){switch(typeof t){case"number":case"string":case"undefined":return!0;case"boolean":return!t;case"object":if(Array.isArray(t))return t.every(C);if(null===t||e(t))return!0;var r=n(t);if(!r)return!1;var o,i=r.call(t);if(r!==t.entries){for(;!(o=i.next()).done;)if(!C(o.value))return!1}else for(;!(o=i.next()).done;){var a=o.value;if(a&&!C(a[1]))return!1}return!0;default:return!1}}function _(e,t){return"symbol"===e||("Symbol"===t["@@toStringTag"]||"function"==typeof Symbol&&t instanceof Symbol)}function w(e){var t=typeof e;return Array.isArray(e)?"array":e instanceof RegExp?"object":_(t,e)?"symbol":t}function E(e){var t=w(e);if("object"===t){if(e instanceof Date)return"date";if(e instanceof RegExp)return"regexp"}return t}function T(e){return e.constructor&&e.constructor.name?e.constructor.name:P}var x="function"==typeof Symbol&&Symbol.iterator,O="@@iterator",P="<<anonymous>>",k={array:c("array"),bool:c("boolean"),func:c("function"),number:c("number"),object:c("object"),string:c("string"),symbol:c("symbol"),any:p(),arrayOf:f,element:d(),instanceOf:h,node:y(),objectOf:v,oneOf:m,oneOfType:g,shape:b};return u.prototype=Error.prototype,k.checkPropTypes=a,k.PropTypes=k,k}},function(e,t){"use strict";var n="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED";e.exports=n},function(e,t){"use strict";function n(e,t){return e===t?0!==e||0!==t||1/e===1/t:e!==e&&t!==t}function r(e,t){if(n(e,t))return!0;if("object"!=typeof e||null===e||"object"!=typeof t||null===t)return!1;var r=Object.keys(e),o=Object.keys(t);if(r.length!==o.length)return!1;for(var a=0;a<r.length;a++)if(!i.call(t,r[a])||!n(e[r[a]],t[r[a]]))return!1;return!0}function o(e,t,n){return!r(e.props,t)||!r(e.state,n)}var i=Object.prototype.hasOwnProperty;e.exports=o},function(e,t){"use strict";var n={Properties:{"aria-current":0,"aria-details":0,"aria-disabled":0,"aria-hidden":0,"aria-invalid":0,"aria-keyshortcuts":0,"aria-label":0,"aria-roledescription":0,"aria-autocomplete":0,"aria-checked":0,"aria-expanded":0,"aria-haspopup":0,"aria-level":0,"aria-modal":0,"aria-multiline":0,"aria-multiselectable":0,"aria-orientation":0,"aria-placeholder":0,"aria-pressed":0,"aria-readonly":0,"aria-required":0,"aria-selected":0,"aria-sort":0,"aria-valuemax":0,"aria-valuemin":0,"aria-valuenow":0,"aria-valuetext":0,"aria-atomic":0,"aria-busy":0,"aria-live":0,"aria-relevant":0,"aria-dropeffect":0,"aria-grabbed":0,"aria-activedescendant":0,"aria-colcount":0,"aria-colindex":0,"aria-colspan":0,"aria-controls":0,"aria-describedby":0,"aria-errormessage":0,"aria-flowto":0,"aria-labelledby":0,"aria-owns":0,"aria-posinset":0,"aria-rowcount":0,"aria-rowindex":0,"aria-rowspan":0,"aria-setsize":0},DOMAttributeNames:{},DOMPropertyNames:{}};e.exports=n},function(e,t,n){"use strict";var r=n(6),o=n(58),i={focusDOMComponent:function(){o(r.getNodeFromInstance(this))}};e.exports=i},function(e,t,n){"use strict";function r(){var e=window.opera;return"object"==typeof e&&"function"==typeof e.version&&parseInt(e.version(),10)<=12}function o(e){return(e.ctrlKey||e.altKey||e.metaKey)&&!(e.ctrlKey&&e.altKey)}function i(e){switch(e){case"topCompositionStart":return O.compositionStart;case"topCompositionEnd":return O.compositionEnd;case"topCompositionUpdate":return O.compositionUpdate}}function a(e,t){return"topKeyDown"===e&&t.keyCode===b}function s(e,t){switch(e){case"topKeyUp":return y.indexOf(t.keyCode)!==-1;case"topKeyDown":return t.keyCode!==b;case"topKeyPress":case"topMouseDown":case"topBlur":return!0;default:return!1}}function u(e){var t=e.detail;return"object"==typeof t&&"data"in t?t.data:null}function l(e,t,n,r){var o,l;if(C?o=i(e):k?s(e,n)&&(o=O.compositionEnd):a(e,n)&&(o=O.compositionStart),!o)return null;E&&(k||o!==O.compositionStart?o===O.compositionEnd&&k&&(l=k.getData()):k=m.getPooled(r));var c=v.getPooled(o,t,n,r);if(l)c.data=l;else{var p=u(n);null!==p&&(c.data=p)}return d.accumulateTwoPhaseDispatches(c),c}function c(e,t){switch(e){case"topCompositionEnd":return u(t);case"topKeyPress":var n=t.which;return n!==T?null:(P=!0,x);case"topTextInput":var r=t.data;return r===x&&P?null:r;default:return null}}function p(e,t){if(k){if("topCompositionEnd"===e||!C&&s(e,t)){var n=k.getData();return m.release(k),k=null,n}return null}switch(e){case"topPaste":return null;case"topKeyPress":return t.which&&!o(t)?String.fromCharCode(t.which):null;case"topCompositionEnd":return E?null:t.data;default:return null}}function f(e,t,n,r){var o;if(o=w?c(e,n):p(e,n),!o)return null;var i=g.getPooled(O.beforeInput,t,n,r);return i.data=o,d.accumulateTwoPhaseDispatches(i),i}var d=n(25),h=n(7),m=n(133),v=n(170),g=n(173),y=[9,13,27,32],b=229,C=h.canUseDOM&&"CompositionEvent"in window,_=null;h.canUseDOM&&"documentMode"in document&&(_=document.documentMode);var w=h.canUseDOM&&"TextEvent"in window&&!_&&!r(),E=h.canUseDOM&&(!C||_&&_>8&&_<=11),T=32,x=String.fromCharCode(T),O={beforeInput:{phasedRegistrationNames:{bubbled:"onBeforeInput",captured:"onBeforeInputCapture"},dependencies:["topCompositionEnd","topKeyPress","topTextInput","topPaste"]},compositionEnd:{phasedRegistrationNames:{bubbled:"onCompositionEnd",captured:"onCompositionEndCapture"},dependencies:["topBlur","topCompositionEnd","topKeyDown","topKeyPress","topKeyUp","topMouseDown"]},compositionStart:{phasedRegistrationNames:{bubbled:"onCompositionStart",captured:"onCompositionStartCapture"},dependencies:["topBlur","topCompositionStart","topKeyDown","topKeyPress","topKeyUp","topMouseDown"]},compositionUpdate:{phasedRegistrationNames:{bubbled:"onCompositionUpdate",captured:"onCompositionUpdateCapture"},dependencies:["topBlur","topCompositionUpdate","topKeyDown","topKeyPress","topKeyUp","topMouseDown"]}},P=!1,k=null,S={eventTypes:O,extractEvents:function(e,t,n,r){return[l(e,t,n,r),f(e,t,n,r)]}};e.exports=S},function(e,t,n){"use strict";var r=n(64),o=n(7),i=(n(9),n(102),n(179)),a=n(109),s=n(112),u=(n(2),s(function(e){return a(e)})),l=!1,c="cssFloat";if(o.canUseDOM){var p=document.createElement("div").style;try{p.font=""}catch(e){l=!0}void 0===document.documentElement.style.cssFloat&&(c="styleFloat")}var f={createMarkupForStyles:function(e,t){var n="";for(var r in e)if(e.hasOwnProperty(r)){var o=e[r];null!=o&&(n+=u(r)+":",n+=i(r,o,t)+";")}return n||null},setValueForStyles:function(e,t,n){var o=e.style;for(var a in t)if(t.hasOwnProperty(a)){var s=i(a,t[a],n);if("float"!==a&&"cssFloat"!==a||(a=c),s)o[a]=s;else{var u=l&&r.shorthandPropertyExpansions[a];if(u)for(var p in u)o[p]="";else o[a]=""}}}};e.exports=f},function(e,t,n){"use strict";function r(e){var t=e.nodeName&&e.nodeName.toLowerCase();return"select"===t||"input"===t&&"file"===e.type}function o(e){var t=T.getPooled(k.change,N,e,x(e));C.accumulateTwoPhaseDispatches(t),E.batchedUpdates(i,t)}function i(e){b.enqueueEvents(e),b.processEventQueue(!1)}function a(e,t){S=e,N=t,S.attachEvent("onchange",o)}function s(){S&&(S.detachEvent("onchange",o),S=null,N=null)}function u(e,t){if("topChange"===e)return t}function l(e,t,n){"topFocus"===e?(s(),a(t,n)):"topBlur"===e&&s()}function c(e,t){S=e,N=t,M=e.value,A=Object.getOwnPropertyDescriptor(e.constructor.prototype,"value"),Object.defineProperty(S,"value",R),S.attachEvent?S.attachEvent("onpropertychange",f):S.addEventListener("propertychange",f,!1)}function p(){S&&(delete S.value,S.detachEvent?S.detachEvent("onpropertychange",f):S.removeEventListener("propertychange",f,!1),S=null,N=null,M=null,A=null)}function f(e){if("value"===e.propertyName){var t=e.srcElement.value;t!==M&&(M=t,o(e))}}function d(e,t){if("topInput"===e)return t}function h(e,t,n){"topFocus"===e?(p(),c(t,n)):"topBlur"===e&&p()}function m(e,t){if(("topSelectionChange"===e||"topKeyUp"===e||"topKeyDown"===e)&&S&&S.value!==M)return M=S.value,N}function v(e){return e.nodeName&&"input"===e.nodeName.toLowerCase()&&("checkbox"===e.type||"radio"===e.type)}function g(e,t){if("topClick"===e)return t}function y(e,t){if(null!=e){var n=e._wrapperState||t._wrapperState;if(n&&n.controlled&&"number"===t.type){var r=""+t.value;t.getAttribute("value")!==r&&t.setAttribute("value",r)}}}var b=n(24),C=n(25),_=n(7),w=n(6),E=n(10),T=n(11),x=n(49),O=n(50),P=n(81),k={change:{phasedRegistrationNames:{bubbled:"onChange",captured:"onChangeCapture"},dependencies:["topBlur","topChange","topClick","topFocus","topInput","topKeyDown","topKeyUp","topSelectionChange"]}},S=null,N=null,M=null,A=null,I=!1;_.canUseDOM&&(I=O("change")&&(!document.documentMode||document.documentMode>8));var D=!1;_.canUseDOM&&(D=O("input")&&(!document.documentMode||document.documentMode>11));var R={get:function(){return A.get.call(this)},set:function(e){M=""+e,A.set.call(this,e)}},L={eventTypes:k,extractEvents:function(e,t,n,o){var i,a,s=t?w.getNodeFromInstance(t):window;if(r(s)?I?i=u:a=l:P(s)?D?i=d:(i=m,a=h):v(s)&&(i=g),i){var c=i(e,t);if(c){var p=T.getPooled(k.change,c,n,o);return p.type="change",C.accumulateTwoPhaseDispatches(p),p}}a&&a(e,s,t),"topBlur"===e&&y(t,s)}};e.exports=L},function(e,t,n){"use strict";var r=n(3),o=n(17),i=n(7),a=n(105),s=n(8),u=(n(1),{dangerouslyReplaceNodeWithMarkup:function(e,t){if(i.canUseDOM?void 0:r("56"),t?void 0:r("57"),"HTML"===e.nodeName?r("58"):void 0,"string"==typeof t){var n=a(t,s)[0];e.parentNode.replaceChild(n,e)}else o.replaceChildWithTree(e,t)}});e.exports=u},function(e,t){"use strict";var n=["ResponderEventPlugin","SimpleEventPlugin","TapEventPlugin","EnterLeaveEventPlugin","ChangeEventPlugin","SelectEventPlugin","BeforeInputEventPlugin"];e.exports=n},function(e,t,n){"use strict";var r=n(25),o=n(6),i=n(30),a={mouseEnter:{registrationName:"onMouseEnter",dependencies:["topMouseOut","topMouseOver"]},mouseLeave:{registrationName:"onMouseLeave",dependencies:["topMouseOut","topMouseOver"]}},s={eventTypes:a,extractEvents:function(e,t,n,s){if("topMouseOver"===e&&(n.relatedTarget||n.fromElement))return null;if("topMouseOut"!==e&&"topMouseOver"!==e)return null;var u;if(s.window===s)u=s;else{var l=s.ownerDocument;u=l?l.defaultView||l.parentWindow:window}var c,p;if("topMouseOut"===e){c=t;var f=n.relatedTarget||n.toElement;p=f?o.getClosestInstanceFromNode(f):null}else c=null,p=t;if(c===p)return null;var d=null==c?u:o.getNodeFromInstance(c),h=null==p?u:o.getNodeFromInstance(p),m=i.getPooled(a.mouseLeave,c,n,s);m.type="mouseleave",m.target=d,m.relatedTarget=h;var v=i.getPooled(a.mouseEnter,p,n,s);return v.type="mouseenter",v.target=h,v.relatedTarget=d,r.accumulateEnterLeaveDispatches(m,v,c,p),[m,v]}};e.exports=s},function(e,t,n){"use strict";function r(e){this._root=e,this._startText=this.getText(),this._fallbackText=null}var o=n(4),i=n(14),a=n(79);o(r.prototype,{destructor:function(){this._root=null,this._startText=null,this._fallbackText=null},getText:function(){return"value"in this._root?this._root.value:this._root[a()]},getData:function(){if(this._fallbackText)return this._fallbackText;var e,t,n=this._startText,r=n.length,o=this.getText(),i=o.length;for(e=0;e<r&&n[e]===o[e];e++);var a=r-e;for(t=1;t<=a&&n[r-t]===o[i-t];t++);var s=t>1?1-t:void 0;return this._fallbackText=o.slice(e,s),this._fallbackText}}),i.addPoolingTo(r),e.exports=r},function(e,t,n){"use strict";var r=n(18),o=r.injection.MUST_USE_PROPERTY,i=r.injection.HAS_BOOLEAN_VALUE,a=r.injection.HAS_NUMERIC_VALUE,s=r.injection.HAS_POSITIVE_NUMERIC_VALUE,u=r.injection.HAS_OVERLOADED_BOOLEAN_VALUE,l={isCustomAttribute:RegExp.prototype.test.bind(new RegExp("^(data|aria)-["+r.ATTRIBUTE_NAME_CHAR+"]*$")),Properties:{accept:0,acceptCharset:0,accessKey:0,action:0,allowFullScreen:i,allowTransparency:0,alt:0,as:0,async:i,autoComplete:0,autoPlay:i,capture:i,cellPadding:0,cellSpacing:0,charSet:0,challenge:0,checked:o|i,cite:0,classID:0,className:0,cols:s,colSpan:0,content:0,contentEditable:0,contextMenu:0,controls:i,coords:0,crossOrigin:0,data:0,dateTime:0,default:i,defer:i,dir:0,disabled:i,download:u,draggable:0,encType:0,form:0,formAction:0,formEncType:0,formMethod:0,formNoValidate:i,formTarget:0,frameBorder:0,headers:0,height:0,hidden:i,high:0,href:0,hrefLang:0,htmlFor:0,httpEquiv:0,icon:0,id:0,inputMode:0,integrity:0,is:0,keyParams:0,keyType:0,kind:0,label:0,lang:0,list:0,loop:i,low:0,manifest:0,marginHeight:0,marginWidth:0,max:0,maxLength:0,media:0,mediaGroup:0,method:0,min:0,minLength:0,multiple:o|i,muted:o|i,name:0,nonce:0,noValidate:i,open:i,optimum:0,pattern:0,placeholder:0,playsInline:i,poster:0,preload:0,profile:0,radioGroup:0,readOnly:i,referrerPolicy:0,rel:0,required:i,reversed:i,role:0,rows:s,rowSpan:a,sandbox:0,scope:0,scoped:i,scrolling:0,seamless:i,selected:o|i,shape:0,size:s,sizes:0,span:s,spellCheck:0,src:0,srcDoc:0,srcLang:0,srcSet:0,start:a,step:0,style:0,summary:0,tabIndex:0,target:0,title:0,type:0,useMap:0,value:0,width:0,wmode:0,wrap:0,about:0,datatype:0,inlist:0,prefix:0,property:0,resource:0,typeof:0,vocab:0,autoCapitalize:0,autoCorrect:0,autoSave:0,color:0,itemProp:0,itemScope:i,itemType:0,itemID:0,itemRef:0,results:0,security:0,unselectable:0},DOMAttributeNames:{acceptCharset:"accept-charset",className:"class",htmlFor:"for",httpEquiv:"http-equiv"},DOMPropertyNames:{},DOMMutationMethods:{value:function(e,t){return null==t?e.removeAttribute("value"):void("number"!==e.type||e.hasAttribute("value")===!1?e.setAttribute("value",""+t):e.validity&&!e.validity.badInput&&e.ownerDocument.activeElement!==e&&e.setAttribute("value",""+t))}}};e.exports=l},function(e,t,n){(function(t){"use strict";function r(e,t,n,r){var o=void 0===e[n];null!=t&&o&&(e[n]=i(t,!0))}var o=n(19),i=n(80),a=(n(41),n(51)),s=n(83),u=(n(2),{instantiateChildren:function(e,t,n,o){if(null==e)return null;var i={};return s(e,r,i),i},updateChildren:function(e,t,n,r,s,u,l,c,p){if(t||e){var f,d;for(f in t)if(t.hasOwnProperty(f)){d=e&&e[f];var h=d&&d._currentElement,m=t[f];if(null!=d&&a(h,m))o.receiveComponent(d,m,s,c),t[f]=d;else{d&&(r[f]=o.getHostNode(d),o.unmountComponent(d,!1));var v=i(m,!0);t[f]=v;var g=o.mountComponent(v,s,u,l,c,p);n.push(g)}}for(f in e)!e.hasOwnProperty(f)||t&&t.hasOwnProperty(f)||(d=e[f],r[f]=o.getHostNode(d),o.unmountComponent(d,!1))}},unmountChildren:function(e,t){for(var n in e)if(e.hasOwnProperty(n)){var r=e[n];o.unmountComponent(r,t)}}});e.exports=u}).call(t,n(60))},function(e,t,n){"use strict";var r=n(37),o=n(143),i={processChildrenUpdates:o.dangerouslyProcessChildrenUpdates,replaceNodeWithMarkup:r.dangerouslyReplaceNodeWithMarkup};e.exports=i},function(e,t,n){"use strict";function r(e){}function o(e,t){}function i(e){return!(!e.prototype||!e.prototype.isReactComponent)}function a(e){return!(!e.prototype||!e.prototype.isPureReactComponent)}var s=n(3),u=n(4),l=n(20),c=n(43),p=n(12),f=n(44),d=n(26),h=(n(9),n(74)),m=n(19),v=n(23),g=(n(1),n(36)),y=n(51),b=(n(2),{ImpureClass:0,PureClass:1,StatelessFunctional:2});r.prototype.render=function(){var e=d.get(this)._currentElement.type,t=e(this.props,this.context,this.updater);return o(e,t),t};var C=1,_={construct:function(e){this._currentElement=e,this._rootNodeID=0,this._compositeType=null,this._instance=null,this._hostParent=null,this._hostContainerInfo=null,this._updateBatchNumber=null,this._pendingElement=null,this._pendingStateQueue=null,this._pendingReplaceState=!1,this._pendingForceUpdate=!1,this._renderedNodeType=null,this._renderedComponent=null,this._context=null,this._mountOrder=0,this._topLevelWrapper=null,this._pendingCallbacks=null,this._calledComponentWillUnmount=!1},mountComponent:function(e,t,n,u){this._context=u,this._mountOrder=C++,this._hostParent=t,this._hostContainerInfo=n;var c,p=this._currentElement.props,f=this._processContext(u),h=this._currentElement.type,m=e.getUpdateQueue(),g=i(h),y=this._constructComponent(g,p,f,m);g||null!=y&&null!=y.render?a(h)?this._compositeType=b.PureClass:this._compositeType=b.ImpureClass:(c=y,o(h,c),null===y||y===!1||l.isValidElement(y)?void 0:s("105",h.displayName||h.name||"Component"),y=new r(h),this._compositeType=b.StatelessFunctional);y.props=p,y.context=f,y.refs=v,y.updater=m,this._instance=y,d.set(y,this);var _=y.state;void 0===_&&(y.state=_=null),"object"!=typeof _||Array.isArray(_)?s("106",this.getName()||"ReactCompositeComponent"):void 0,this._pendingStateQueue=null,this._pendingReplaceState=!1,this._pendingForceUpdate=!1;var w;return w=y.unstable_handleError?this.performInitialMountWithErrorHandling(c,t,n,e,u):this.performInitialMount(c,t,n,e,u),y.componentDidMount&&e.getReactMountReady().enqueue(y.componentDidMount,y),w},_constructComponent:function(e,t,n,r){return this._constructComponentWithoutOwner(e,t,n,r)},_constructComponentWithoutOwner:function(e,t,n,r){var o=this._currentElement.type;return e?new o(t,n,r):o(t,n,r)},performInitialMountWithErrorHandling:function(e,t,n,r,o){var i,a=r.checkpoint();try{i=this.performInitialMount(e,t,n,r,o)}catch(s){r.rollback(a),this._instance.unstable_handleError(s),this._pendingStateQueue&&(this._instance.state=this._processPendingState(this._instance.props,this._instance.context)),a=r.checkpoint(),this._renderedComponent.unmountComponent(!0),r.rollback(a),i=this.performInitialMount(e,t,n,r,o)}return i},performInitialMount:function(e,t,n,r,o){var i=this._instance,a=0;i.componentWillMount&&(i.componentWillMount(),this._pendingStateQueue&&(i.state=this._processPendingState(i.props,i.context))),void 0===e&&(e=this._renderValidatedComponent());var s=h.getType(e);this._renderedNodeType=s;
-var u=this._instantiateReactComponent(e,s!==h.EMPTY);this._renderedComponent=u;var l=m.mountComponent(u,r,t,n,this._processChildContext(o),a);return l},getHostNode:function(){return m.getHostNode(this._renderedComponent)},unmountComponent:function(e){if(this._renderedComponent){var t=this._instance;if(t.componentWillUnmount&&!t._calledComponentWillUnmount)if(t._calledComponentWillUnmount=!0,e){var n=this.getName()+".componentWillUnmount()";f.invokeGuardedCallback(n,t.componentWillUnmount.bind(t))}else t.componentWillUnmount();this._renderedComponent&&(m.unmountComponent(this._renderedComponent,e),this._renderedNodeType=null,this._renderedComponent=null,this._instance=null),this._pendingStateQueue=null,this._pendingReplaceState=!1,this._pendingForceUpdate=!1,this._pendingCallbacks=null,this._pendingElement=null,this._context=null,this._rootNodeID=0,this._topLevelWrapper=null,d.remove(t)}},_maskContext:function(e){var t=this._currentElement.type,n=t.contextTypes;if(!n)return v;var r={};for(var o in n)r[o]=e[o];return r},_processContext:function(e){var t=this._maskContext(e);return t},_processChildContext:function(e){var t,n=this._currentElement.type,r=this._instance;if(r.getChildContext&&(t=r.getChildContext()),t){"object"!=typeof n.childContextTypes?s("107",this.getName()||"ReactCompositeComponent"):void 0;for(var o in t)o in n.childContextTypes?void 0:s("108",this.getName()||"ReactCompositeComponent",o);return u({},e,t)}return e},_checkContextTypes:function(e,t,n){},receiveComponent:function(e,t,n){var r=this._currentElement,o=this._context;this._pendingElement=null,this.updateComponent(t,r,e,o,n)},performUpdateIfNecessary:function(e){null!=this._pendingElement?m.receiveComponent(this,this._pendingElement,e,this._context):null!==this._pendingStateQueue||this._pendingForceUpdate?this.updateComponent(e,this._currentElement,this._currentElement,this._context,this._context):this._updateBatchNumber=null},updateComponent:function(e,t,n,r,o){var i=this._instance;null==i?s("136",this.getName()||"ReactCompositeComponent"):void 0;var a,u=!1;this._context===o?a=i.context:(a=this._processContext(o),u=!0);var l=t.props,c=n.props;t!==n&&(u=!0),u&&i.componentWillReceiveProps&&i.componentWillReceiveProps(c,a);var p=this._processPendingState(c,a),f=!0;this._pendingForceUpdate||(i.shouldComponentUpdate?f=i.shouldComponentUpdate(c,p,a):this._compositeType===b.PureClass&&(f=!g(l,c)||!g(i.state,p))),this._updateBatchNumber=null,f?(this._pendingForceUpdate=!1,this._performComponentUpdate(n,c,p,a,e,o)):(this._currentElement=n,this._context=o,i.props=c,i.state=p,i.context=a)},_processPendingState:function(e,t){var n=this._instance,r=this._pendingStateQueue,o=this._pendingReplaceState;if(this._pendingReplaceState=!1,this._pendingStateQueue=null,!r)return n.state;if(o&&1===r.length)return r[0];for(var i=u({},o?r[0]:n.state),a=o?1:0;a<r.length;a++){var s=r[a];u(i,"function"==typeof s?s.call(n,i,e,t):s)}return i},_performComponentUpdate:function(e,t,n,r,o,i){var a,s,u,l=this._instance,c=Boolean(l.componentDidUpdate);c&&(a=l.props,s=l.state,u=l.context),l.componentWillUpdate&&l.componentWillUpdate(t,n,r),this._currentElement=e,this._context=i,l.props=t,l.state=n,l.context=r,this._updateRenderedComponent(o,i),c&&o.getReactMountReady().enqueue(l.componentDidUpdate.bind(l,a,s,u),l)},_updateRenderedComponent:function(e,t){var n=this._renderedComponent,r=n._currentElement,o=this._renderValidatedComponent(),i=0;if(y(r,o))m.receiveComponent(n,o,e,this._processChildContext(t));else{var a=m.getHostNode(n);m.unmountComponent(n,!1);var s=h.getType(o);this._renderedNodeType=s;var u=this._instantiateReactComponent(o,s!==h.EMPTY);this._renderedComponent=u;var l=m.mountComponent(u,e,this._hostParent,this._hostContainerInfo,this._processChildContext(t),i);this._replaceNodeWithMarkup(a,l,n)}},_replaceNodeWithMarkup:function(e,t,n){c.replaceNodeWithMarkup(e,t,n)},_renderValidatedComponentWithoutOwnerOrContext:function(){var e,t=this._instance;return e=t.render()},_renderValidatedComponent:function(){var e;if(this._compositeType!==b.StatelessFunctional){p.current=this;try{e=this._renderValidatedComponentWithoutOwnerOrContext()}finally{p.current=null}}else e=this._renderValidatedComponentWithoutOwnerOrContext();return null===e||e===!1||l.isValidElement(e)?void 0:s("109",this.getName()||"ReactCompositeComponent"),e},attachRef:function(e,t){var n=this.getPublicInstance();null==n?s("110"):void 0;var r=t.getPublicInstance(),o=n.refs===v?n.refs={}:n.refs;o[e]=r},detachRef:function(e){var t=this.getPublicInstance().refs;delete t[e]},getName:function(){var e=this._currentElement.type,t=this._instance&&this._instance.constructor;return e.displayName||t&&t.displayName||e.name||t&&t.name||null},getPublicInstance:function(){var e=this._instance;return this._compositeType===b.StatelessFunctional?null:e},_instantiateReactComponent:null};e.exports=_},function(e,t,n){"use strict";var r=n(6),o=n(151),i=n(73),a=n(19),s=n(10),u=n(164),l=n(180),c=n(78),p=n(187);n(2);o.inject();var f={findDOMNode:l,render:i.render,unmountComponentAtNode:i.unmountComponentAtNode,version:u,unstable_batchedUpdates:s.batchedUpdates,unstable_renderSubtreeIntoContainer:p};"undefined"!=typeof __REACT_DEVTOOLS_GLOBAL_HOOK__&&"function"==typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.inject&&__REACT_DEVTOOLS_GLOBAL_HOOK__.inject({ComponentTree:{getClosestInstanceFromNode:r.getClosestInstanceFromNode,getNodeFromInstance:function(e){return e._renderedComponent&&(e=c(e)),e?r.getNodeFromInstance(e):null}},Mount:i,Reconciler:a});e.exports=f},function(e,t,n){"use strict";function r(e){if(e){var t=e._currentElement._owner||null;if(t){var n=t.getName();if(n)return" This DOM node was rendered by `"+n+"`."}}return""}function o(e,t){t&&(X[e._tag]&&(null!=t.children||null!=t.dangerouslySetInnerHTML?m("137",e._tag,e._currentElement._owner?" Check the render method of "+e._currentElement._owner.getName()+".":""):void 0),null!=t.dangerouslySetInnerHTML&&(null!=t.children?m("60"):void 0,"object"==typeof t.dangerouslySetInnerHTML&&W in t.dangerouslySetInnerHTML?void 0:m("61")),null!=t.style&&"object"!=typeof t.style?m("62",r(e)):void 0)}function i(e,t,n,r){if(!(r instanceof I)){var o=e._hostContainerInfo,i=o._node&&o._node.nodeType===q,s=i?o._node:o._ownerDocument;F(t,s),r.getReactMountReady().enqueue(a,{inst:e,registrationName:t,listener:n})}}function a(){var e=this;E.putListener(e.inst,e.registrationName,e.listener)}function s(){var e=this;k.postMountWrapper(e)}function u(){var e=this;M.postMountWrapper(e)}function l(){var e=this;S.postMountWrapper(e)}function c(){var e=this;e._rootNodeID?void 0:m("63");var t=U(e);switch(t?void 0:m("64"),e._tag){case"iframe":case"object":e._wrapperState.listeners=[x.trapBubbledEvent("topLoad","load",t)];break;case"video":case"audio":e._wrapperState.listeners=[];for(var n in z)z.hasOwnProperty(n)&&e._wrapperState.listeners.push(x.trapBubbledEvent(n,z[n],t));break;case"source":e._wrapperState.listeners=[x.trapBubbledEvent("topError","error",t)];break;case"img":e._wrapperState.listeners=[x.trapBubbledEvent("topError","error",t),x.trapBubbledEvent("topLoad","load",t)];break;case"form":e._wrapperState.listeners=[x.trapBubbledEvent("topReset","reset",t),x.trapBubbledEvent("topSubmit","submit",t)];break;case"input":case"select":case"textarea":e._wrapperState.listeners=[x.trapBubbledEvent("topInvalid","invalid",t)]}}function p(){N.postUpdateWrapper(this)}function f(e){$.call(Q,e)||(G.test(e)?void 0:m("65",e),Q[e]=!0)}function d(e,t){return e.indexOf("-")>=0||null!=t.is}function h(e){var t=e.type;f(t),this._currentElement=e,this._tag=t.toLowerCase(),this._namespaceURI=null,this._renderedChildren=null,this._previousStyle=null,this._previousStyleCopy=null,this._hostNode=null,this._hostParent=null,this._rootNodeID=0,this._domID=0,this._hostContainerInfo=null,this._wrapperState=null,this._topLevelWrapper=null,this._flags=0}var m=n(3),v=n(4),g=n(126),y=n(128),b=n(17),C=n(38),_=n(18),w=n(66),E=n(24),T=n(39),x=n(29),O=n(67),P=n(6),k=n(144),S=n(145),N=n(68),M=n(148),A=(n(9),n(157)),I=n(162),D=(n(8),n(32)),R=(n(1),n(50),n(36),n(52),n(2),O),L=E.deleteListener,U=P.getNodeFromInstance,F=x.listenTo,j=T.registrationNameModules,B={string:!0,number:!0},V="style",W="__html",H={children:null,dangerouslySetInnerHTML:null,suppressContentEditableWarning:null},q=11,z={topAbort:"abort",topCanPlay:"canplay",topCanPlayThrough:"canplaythrough",topDurationChange:"durationchange",topEmptied:"emptied",topEncrypted:"encrypted",topEnded:"ended",topError:"error",topLoadedData:"loadeddata",topLoadedMetadata:"loadedmetadata",topLoadStart:"loadstart",topPause:"pause",topPlay:"play",topPlaying:"playing",topProgress:"progress",topRateChange:"ratechange",topSeeked:"seeked",topSeeking:"seeking",topStalled:"stalled",topSuspend:"suspend",topTimeUpdate:"timeupdate",topVolumeChange:"volumechange",topWaiting:"waiting"},K={area:!0,base:!0,br:!0,col:!0,embed:!0,hr:!0,img:!0,input:!0,keygen:!0,link:!0,meta:!0,param:!0,source:!0,track:!0,wbr:!0},Y={listing:!0,pre:!0,textarea:!0},X=v({menuitem:!0},K),G=/^[a-zA-Z][a-zA-Z:_\.\-\d]*$/,Q={},$={}.hasOwnProperty,Z=1;h.displayName="ReactDOMComponent",h.Mixin={mountComponent:function(e,t,n,r){this._rootNodeID=Z++,this._domID=n._idCounter++,this._hostParent=t,this._hostContainerInfo=n;var i=this._currentElement.props;switch(this._tag){case"audio":case"form":case"iframe":case"img":case"link":case"object":case"source":case"video":this._wrapperState={listeners:null},e.getReactMountReady().enqueue(c,this);break;case"input":k.mountWrapper(this,i,t),i=k.getHostProps(this,i),e.getReactMountReady().enqueue(c,this);break;case"option":S.mountWrapper(this,i,t),i=S.getHostProps(this,i);break;case"select":N.mountWrapper(this,i,t),i=N.getHostProps(this,i),e.getReactMountReady().enqueue(c,this);break;case"textarea":M.mountWrapper(this,i,t),i=M.getHostProps(this,i),e.getReactMountReady().enqueue(c,this)}o(this,i);var a,p;null!=t?(a=t._namespaceURI,p=t._tag):n._tag&&(a=n._namespaceURI,p=n._tag),(null==a||a===C.svg&&"foreignobject"===p)&&(a=C.html),a===C.html&&("svg"===this._tag?a=C.svg:"math"===this._tag&&(a=C.mathml)),this._namespaceURI=a;var f;if(e.useCreateElement){var d,h=n._ownerDocument;if(a===C.html)if("script"===this._tag){var m=h.createElement("div"),v=this._currentElement.type;m.innerHTML="<"+v+"></"+v+">",d=m.removeChild(m.firstChild)}else d=i.is?h.createElement(this._currentElement.type,i.is):h.createElement(this._currentElement.type);else d=h.createElementNS(a,this._currentElement.type);P.precacheNode(this,d),this._flags|=R.hasCachedChildNodes,this._hostParent||w.setAttributeForRoot(d),this._updateDOMProperties(null,i,e);var y=b(d);this._createInitialChildren(e,i,r,y),f=y}else{var _=this._createOpenTagMarkupAndPutListeners(e,i),E=this._createContentMarkup(e,i,r);f=!E&&K[this._tag]?_+"/>":_+">"+E+"</"+this._currentElement.type+">"}switch(this._tag){case"input":e.getReactMountReady().enqueue(s,this),i.autoFocus&&e.getReactMountReady().enqueue(g.focusDOMComponent,this);break;case"textarea":e.getReactMountReady().enqueue(u,this),i.autoFocus&&e.getReactMountReady().enqueue(g.focusDOMComponent,this);break;case"select":i.autoFocus&&e.getReactMountReady().enqueue(g.focusDOMComponent,this);break;case"button":i.autoFocus&&e.getReactMountReady().enqueue(g.focusDOMComponent,this);break;case"option":e.getReactMountReady().enqueue(l,this)}return f},_createOpenTagMarkupAndPutListeners:function(e,t){var n="<"+this._currentElement.type;for(var r in t)if(t.hasOwnProperty(r)){var o=t[r];if(null!=o)if(j.hasOwnProperty(r))o&&i(this,r,o,e);else{r===V&&(o&&(o=this._previousStyleCopy=v({},t.style)),o=y.createMarkupForStyles(o,this));var a=null;null!=this._tag&&d(this._tag,t)?H.hasOwnProperty(r)||(a=w.createMarkupForCustomAttribute(r,o)):a=w.createMarkupForProperty(r,o),a&&(n+=" "+a)}}return e.renderToStaticMarkup?n:(this._hostParent||(n+=" "+w.createMarkupForRoot()),n+=" "+w.createMarkupForID(this._domID))},_createContentMarkup:function(e,t,n){var r="",o=t.dangerouslySetInnerHTML;if(null!=o)null!=o.__html&&(r=o.__html);else{var i=B[typeof t.children]?t.children:null,a=null!=i?null:t.children;if(null!=i)r=D(i);else if(null!=a){var s=this.mountChildren(a,e,n);r=s.join("")}}return Y[this._tag]&&"\n"===r.charAt(0)?"\n"+r:r},_createInitialChildren:function(e,t,n,r){var o=t.dangerouslySetInnerHTML;if(null!=o)null!=o.__html&&b.queueHTML(r,o.__html);else{var i=B[typeof t.children]?t.children:null,a=null!=i?null:t.children;if(null!=i)""!==i&&b.queueText(r,i);else if(null!=a)for(var s=this.mountChildren(a,e,n),u=0;u<s.length;u++)b.queueChild(r,s[u])}},receiveComponent:function(e,t,n){var r=this._currentElement;this._currentElement=e,this.updateComponent(t,r,e,n)},updateComponent:function(e,t,n,r){var i=t.props,a=this._currentElement.props;switch(this._tag){case"input":i=k.getHostProps(this,i),a=k.getHostProps(this,a);break;case"option":i=S.getHostProps(this,i),a=S.getHostProps(this,a);break;case"select":i=N.getHostProps(this,i),a=N.getHostProps(this,a);break;case"textarea":i=M.getHostProps(this,i),a=M.getHostProps(this,a)}switch(o(this,a),this._updateDOMProperties(i,a,e),this._updateDOMChildren(i,a,e,r),this._tag){case"input":k.updateWrapper(this);break;case"textarea":M.updateWrapper(this);break;case"select":e.getReactMountReady().enqueue(p,this)}},_updateDOMProperties:function(e,t,n){var r,o,a;for(r in e)if(!t.hasOwnProperty(r)&&e.hasOwnProperty(r)&&null!=e[r])if(r===V){var s=this._previousStyleCopy;for(o in s)s.hasOwnProperty(o)&&(a=a||{},a[o]="");this._previousStyleCopy=null}else j.hasOwnProperty(r)?e[r]&&L(this,r):d(this._tag,e)?H.hasOwnProperty(r)||w.deleteValueForAttribute(U(this),r):(_.properties[r]||_.isCustomAttribute(r))&&w.deleteValueForProperty(U(this),r);for(r in t){var u=t[r],l=r===V?this._previousStyleCopy:null!=e?e[r]:void 0;if(t.hasOwnProperty(r)&&u!==l&&(null!=u||null!=l))if(r===V)if(u?u=this._previousStyleCopy=v({},u):this._previousStyleCopy=null,l){for(o in l)!l.hasOwnProperty(o)||u&&u.hasOwnProperty(o)||(a=a||{},a[o]="");for(o in u)u.hasOwnProperty(o)&&l[o]!==u[o]&&(a=a||{},a[o]=u[o])}else a=u;else if(j.hasOwnProperty(r))u?i(this,r,u,n):l&&L(this,r);else if(d(this._tag,t))H.hasOwnProperty(r)||w.setValueForAttribute(U(this),r,u);else if(_.properties[r]||_.isCustomAttribute(r)){var c=U(this);null!=u?w.setValueForProperty(c,r,u):w.deleteValueForProperty(c,r)}}a&&y.setValueForStyles(U(this),a,this)},_updateDOMChildren:function(e,t,n,r){var o=B[typeof e.children]?e.children:null,i=B[typeof t.children]?t.children:null,a=e.dangerouslySetInnerHTML&&e.dangerouslySetInnerHTML.__html,s=t.dangerouslySetInnerHTML&&t.dangerouslySetInnerHTML.__html,u=null!=o?null:e.children,l=null!=i?null:t.children,c=null!=o||null!=a,p=null!=i||null!=s;null!=u&&null==l?this.updateChildren(null,n,r):c&&!p&&this.updateTextContent(""),null!=i?o!==i&&this.updateTextContent(""+i):null!=s?a!==s&&this.updateMarkup(""+s):null!=l&&this.updateChildren(l,n,r)},getHostNode:function(){return U(this)},unmountComponent:function(e){switch(this._tag){case"audio":case"form":case"iframe":case"img":case"link":case"object":case"source":case"video":var t=this._wrapperState.listeners;if(t)for(var n=0;n<t.length;n++)t[n].remove();break;case"html":case"head":case"body":m("66",this._tag)}this.unmountChildren(e),P.uncacheNode(this),E.deleteAllListeners(this),this._rootNodeID=0,this._domID=0,this._wrapperState=null},getPublicInstance:function(){return U(this)}},v(h.prototype,h.Mixin,A.Mixin),e.exports=h},function(e,t,n){"use strict";function r(e,t){var n={_topLevelWrapper:e,_idCounter:1,_ownerDocument:t?t.nodeType===o?t:t.ownerDocument:null,_node:t,_tag:t?t.nodeName.toLowerCase():null,_namespaceURI:t?t.namespaceURI:null};return n}var o=(n(52),9);e.exports=r},function(e,t,n){"use strict";var r=n(4),o=n(17),i=n(6),a=function(e){this._currentElement=null,this._hostNode=null,this._hostParent=null,this._hostContainerInfo=null,this._domID=0};r(a.prototype,{mountComponent:function(e,t,n,r){var a=n._idCounter++;this._domID=a,this._hostParent=t,this._hostContainerInfo=n;var s=" react-empty: "+this._domID+" ";if(e.useCreateElement){var u=n._ownerDocument,l=u.createComment(s);return i.precacheNode(this,l),o(l)}return e.renderToStaticMarkup?"":"<!--"+s+"-->"},receiveComponent:function(){},getHostNode:function(){return i.getNodeFromInstance(this)},unmountComponent:function(){i.uncacheNode(this)}}),e.exports=a},function(e,t){"use strict";var n={useCreateElement:!0,useFiber:!1};e.exports=n},function(e,t,n){"use strict";var r=n(37),o=n(6),i={dangerouslyProcessChildrenUpdates:function(e,t){var n=o.getNodeFromInstance(e);r.processUpdates(n,t)}};e.exports=i},function(e,t,n){"use strict";function r(){this._rootNodeID&&f.updateWrapper(this)}function o(e){var t="checkbox"===e.type||"radio"===e.type;return t?null!=e.checked:null!=e.value}function i(e){var t=this._currentElement.props,n=l.executeOnChange(t,e);p.asap(r,this);var o=t.name;if("radio"===t.type&&null!=o){for(var i=c.getNodeFromInstance(this),s=i;s.parentNode;)s=s.parentNode;for(var u=s.querySelectorAll("input[name="+JSON.stringify(""+o)+'][type="radio"]'),f=0;f<u.length;f++){var d=u[f];if(d!==i&&d.form===i.form){var h=c.getInstanceFromNode(d);h?void 0:a("90"),p.asap(r,h)}}}return n}var a=n(3),s=n(4),u=n(66),l=n(42),c=n(6),p=n(10),f=(n(1),n(2),{getHostProps:function(e,t){var n=l.getValue(t),r=l.getChecked(t),o=s({type:void 0,step:void 0,min:void 0,max:void 0},t,{defaultChecked:void 0,defaultValue:void 0,value:null!=n?n:e._wrapperState.initialValue,checked:null!=r?r:e._wrapperState.initialChecked,onChange:e._wrapperState.onChange});return o},mountWrapper:function(e,t){var n=t.defaultValue;e._wrapperState={initialChecked:null!=t.checked?t.checked:t.defaultChecked,initialValue:null!=t.value?t.value:n,listeners:null,onChange:i.bind(e),controlled:o(t)}},updateWrapper:function(e){var t=e._currentElement.props,n=t.checked;null!=n&&u.setValueForProperty(c.getNodeFromInstance(e),"checked",n||!1);var r=c.getNodeFromInstance(e),o=l.getValue(t);if(null!=o)if(0===o&&""===r.value)r.value="0";else if("number"===t.type){var i=parseFloat(r.value,10)||0;o!=i&&(r.value=""+o)}else o!=r.value&&(r.value=""+o);else null==t.value&&null!=t.defaultValue&&r.defaultValue!==""+t.defaultValue&&(r.defaultValue=""+t.defaultValue),null==t.checked&&null!=t.defaultChecked&&(r.defaultChecked=!!t.defaultChecked)},postMountWrapper:function(e){var t=e._currentElement.props,n=c.getNodeFromInstance(e);switch(t.type){case"submit":case"reset":break;case"color":case"date":case"datetime":case"datetime-local":case"month":case"time":case"week":n.value="",n.value=n.defaultValue;break;default:n.value=n.value}var r=n.name;""!==r&&(n.name=""),n.defaultChecked=!n.defaultChecked,n.defaultChecked=!n.defaultChecked,""!==r&&(n.name=r)}});e.exports=f},function(e,t,n){"use strict";function r(e){var t="";return i.Children.forEach(e,function(e){null!=e&&("string"==typeof e||"number"==typeof e?t+=e:u||(u=!0))}),t}var o=n(4),i=n(20),a=n(6),s=n(68),u=(n(2),!1),l={mountWrapper:function(e,t,n){var o=null;if(null!=n){var i=n;"optgroup"===i._tag&&(i=i._hostParent),null!=i&&"select"===i._tag&&(o=s.getSelectValueContext(i))}var a=null;if(null!=o){var u;if(u=null!=t.value?t.value+"":r(t.children),a=!1,Array.isArray(o)){for(var l=0;l<o.length;l++)if(""+o[l]===u){a=!0;break}}else a=""+o===u}e._wrapperState={selected:a}},postMountWrapper:function(e){var t=e._currentElement.props;if(null!=t.value){var n=a.getNodeFromInstance(e);n.setAttribute("value",t.value)}},getHostProps:function(e,t){var n=o({selected:void 0,children:void 0},t);null!=e._wrapperState.selected&&(n.selected=e._wrapperState.selected);var i=r(t.children);return i&&(n.children=i),n}};e.exports=l},function(e,t,n){"use strict";function r(e,t,n,r){return e===n&&t===r}function o(e){var t=document.selection,n=t.createRange(),r=n.text.length,o=n.duplicate();o.moveToElementText(e),o.setEndPoint("EndToStart",n);var i=o.text.length,a=i+r;return{start:i,end:a}}function i(e){var t=window.getSelection&&window.getSelection();if(!t||0===t.rangeCount)return null;var n=t.anchorNode,o=t.anchorOffset,i=t.focusNode,a=t.focusOffset,s=t.getRangeAt(0);try{s.startContainer.nodeType,s.endContainer.nodeType}catch(e){return null}var u=r(t.anchorNode,t.anchorOffset,t.focusNode,t.focusOffset),l=u?0:s.toString().length,c=s.cloneRange();c.selectNodeContents(e),c.setEnd(s.startContainer,s.startOffset);var p=r(c.startContainer,c.startOffset,c.endContainer,c.endOffset),f=p?0:c.toString().length,d=f+l,h=document.createRange();h.setStart(n,o),h.setEnd(i,a);var m=h.collapsed;return{start:m?d:f,end:m?f:d}}function a(e,t){var n,r,o=document.selection.createRange().duplicate();void 0===t.end?(n=t.start,r=n):t.start>t.end?(n=t.end,r=t.start):(n=t.start,r=t.end),o.moveToElementText(e),o.moveStart("character",n),o.setEndPoint("EndToStart",o),o.moveEnd("character",r-n),o.select()}function s(e,t){if(window.getSelection){var n=window.getSelection(),r=e[c()].length,o=Math.min(t.start,r),i=void 0===t.end?o:Math.min(t.end,r);if(!n.extend&&o>i){var a=i;i=o,o=a}var s=l(e,o),u=l(e,i);if(s&&u){var p=document.createRange();p.setStart(s.node,s.offset),n.removeAllRanges(),o>i?(n.addRange(p),n.extend(u.node,u.offset)):(p.setEnd(u.node,u.offset),n.addRange(p))}}}var u=n(7),l=n(184),c=n(79),p=u.canUseDOM&&"selection"in document&&!("getSelection"in window),f={getOffsets:p?o:i,setOffsets:p?a:s};e.exports=f},function(e,t,n){"use strict";var r=n(3),o=n(4),i=n(37),a=n(17),s=n(6),u=n(32),l=(n(1),n(52),function(e){this._currentElement=e,this._stringText=""+e,this._hostNode=null,this._hostParent=null,this._domID=0,this._mountIndex=0,this._closingComment=null,this._commentNodes=null});o(l.prototype,{mountComponent:function(e,t,n,r){var o=n._idCounter++,i=" react-text: "+o+" ",l=" /react-text ";if(this._domID=o,this._hostParent=t,e.useCreateElement){var c=n._ownerDocument,p=c.createComment(i),f=c.createComment(l),d=a(c.createDocumentFragment());return a.queueChild(d,a(p)),this._stringText&&a.queueChild(d,a(c.createTextNode(this._stringText))),a.queueChild(d,a(f)),s.precacheNode(this,p),this._closingComment=f,d}var h=u(this._stringText);return e.renderToStaticMarkup?h:"<!--"+i+"-->"+h+"<!--"+l+"-->"},receiveComponent:function(e,t){if(e!==this._currentElement){this._currentElement=e;var n=""+e;if(n!==this._stringText){this._stringText=n;var r=this.getHostNode();i.replaceDelimitedText(r[0],r[1],n)}}},getHostNode:function(){var e=this._commentNodes;if(e)return e;if(!this._closingComment)for(var t=s.getNodeFromInstance(this),n=t.nextSibling;;){if(null==n?r("67",this._domID):void 0,8===n.nodeType&&" /react-text "===n.nodeValue){this._closingComment=n;break}n=n.nextSibling}return e=[this._hostNode,this._closingComment],this._commentNodes=e,e},unmountComponent:function(){this._closingComment=null,this._commentNodes=null,s.uncacheNode(this)}}),e.exports=l},function(e,t,n){"use strict";function r(){this._rootNodeID&&c.updateWrapper(this)}function o(e){var t=this._currentElement.props,n=s.executeOnChange(t,e);return l.asap(r,this),n}var i=n(3),a=n(4),s=n(42),u=n(6),l=n(10),c=(n(1),n(2),{getHostProps:function(e,t){null!=t.dangerouslySetInnerHTML?i("91"):void 0;var n=a({},t,{value:void 0,defaultValue:void 0,children:""+e._wrapperState.initialValue,onChange:e._wrapperState.onChange});return n},mountWrapper:function(e,t){var n=s.getValue(t),r=n;if(null==n){var a=t.defaultValue,u=t.children;null!=u&&(null!=a?i("92"):void 0,Array.isArray(u)&&(u.length<=1?void 0:i("93"),u=u[0]),a=""+u),null==a&&(a=""),r=a}e._wrapperState={initialValue:""+r,listeners:null,onChange:o.bind(e)}},updateWrapper:function(e){var t=e._currentElement.props,n=u.getNodeFromInstance(e),r=s.getValue(t);if(null!=r){var o=""+r;o!==n.value&&(n.value=o),null==t.defaultValue&&(n.defaultValue=o)}null!=t.defaultValue&&(n.defaultValue=t.defaultValue)},postMountWrapper:function(e){var t=u.getNodeFromInstance(e),n=t.textContent;n===e._wrapperState.initialValue&&(t.value=n)}});e.exports=c},function(e,t,n){"use strict";function r(e,t){"_hostNode"in e?void 0:u("33"),"_hostNode"in t?void 0:u("33");for(var n=0,r=e;r;r=r._hostParent)n++;for(var o=0,i=t;i;i=i._hostParent)o++;for(;n-o>0;)e=e._hostParent,n--;for(;o-n>0;)t=t._hostParent,o--;for(var a=n;a--;){if(e===t)return e;e=e._hostParent,t=t._hostParent}return null}function o(e,t){"_hostNode"in e?void 0:u("35"),"_hostNode"in t?void 0:u("35");for(;t;){if(t===e)return!0;t=t._hostParent}return!1}function i(e){return"_hostNode"in e?void 0:u("36"),e._hostParent}function a(e,t,n){for(var r=[];e;)r.push(e),e=e._hostParent;var o;for(o=r.length;o-- >0;)t(r[o],"captured",n);for(o=0;o<r.length;o++)t(r[o],"bubbled",n)}function s(e,t,n,o,i){for(var a=e&&t?r(e,t):null,s=[];e&&e!==a;)s.push(e),e=e._hostParent;for(var u=[];t&&t!==a;)u.push(t),t=t._hostParent;var l;for(l=0;l<s.length;l++)n(s[l],"bubbled",o);for(l=u.length;l-- >0;)n(u[l],"captured",i)}var u=n(3);n(1);e.exports={isAncestor:o,getLowestCommonAncestor:r,getParentInstance:i,traverseTwoPhase:a,traverseEnterLeave:s}},function(e,t,n){"use strict";function r(){this.reinitializeTransaction()}var o=n(4),i=n(10),a=n(31),s=n(8),u={initialize:s,close:function(){f.isBatchingUpdates=!1}},l={initialize:s,close:i.flushBatchedUpdates.bind(i)},c=[l,u];o(r.prototype,a,{getTransactionWrappers:function(){return c}});var p=new r,f={isBatchingUpdates:!1,batchedUpdates:function(e,t,n,r,o,i){var a=f.isBatchingUpdates;return f.isBatchingUpdates=!0,a?e(t,n,r,o,i):p.perform(e,null,t,n,r,o,i)}};e.exports=f},function(e,t,n){"use strict";function r(){E||(E=!0,y.EventEmitter.injectReactEventListener(g),y.EventPluginHub.injectEventPluginOrder(s),y.EventPluginUtils.injectComponentTree(f),y.EventPluginUtils.injectTreeTraversal(h),y.EventPluginHub.injectEventPluginsByName({SimpleEventPlugin:w,EnterLeaveEventPlugin:u,ChangeEventPlugin:a,SelectEventPlugin:_,BeforeInputEventPlugin:i}),y.HostComponent.injectGenericComponentClass(p),y.HostComponent.injectTextComponentClass(m),y.DOMProperty.injectDOMPropertyConfig(o),y.DOMProperty.injectDOMPropertyConfig(l),y.DOMProperty.injectDOMPropertyConfig(C),y.EmptyComponent.injectEmptyComponentFactory(function(e){return new d(e)}),y.Updates.injectReconcileTransaction(b),y.Updates.injectBatchingStrategy(v),y.Component.injectEnvironment(c))}var o=n(125),i=n(127),a=n(129),s=n(131),u=n(132),l=n(134),c=n(136),p=n(139),f=n(6),d=n(141),h=n(149),m=n(147),v=n(150),g=n(154),y=n(155),b=n(160),C=n(165),_=n(166),w=n(167),E=!1;e.exports={inject:r}},88,function(e,t,n){"use strict";function r(e){o.enqueueEvents(e),o.processEventQueue(!1)}var o=n(24),i={handleTopLevel:function(e,t,n,i){var a=o.extractEvents(e,t,n,i);r(a)}};e.exports=i},function(e,t,n){"use strict";function r(e){for(;e._hostParent;)e=e._hostParent;var t=p.getNodeFromInstance(e),n=t.parentNode;return p.getClosestInstanceFromNode(n)}function o(e,t){this.topLevelType=e,this.nativeEvent=t,this.ancestors=[]}function i(e){var t=d(e.nativeEvent),n=p.getClosestInstanceFromNode(t),o=n;do e.ancestors.push(o),o=o&&r(o);while(o);for(var i=0;i<e.ancestors.length;i++)n=e.ancestors[i],m._handleTopLevel(e.topLevelType,n,e.nativeEvent,d(e.nativeEvent))}function a(e){var t=h(window);e(t)}var s=n(4),u=n(57),l=n(7),c=n(14),p=n(6),f=n(10),d=n(49),h=n(107);s(o.prototype,{destructor:function(){this.topLevelType=null,this.nativeEvent=null,this.ancestors.length=0}}),c.addPoolingTo(o,c.twoArgumentPooler);var m={_enabled:!0,_handleTopLevel:null,WINDOW_HANDLE:l.canUseDOM?window:null,setHandleTopLevel:function(e){m._handleTopLevel=e},setEnabled:function(e){m._enabled=!!e},isEnabled:function(){return m._enabled},trapBubbledEvent:function(e,t,n){return n?u.listen(n,t,m.dispatchEvent.bind(null,e)):null},trapCapturedEvent:function(e,t,n){return n?u.capture(n,t,m.dispatchEvent.bind(null,e)):null},monitorScrollValue:function(e){var t=a.bind(null,e);u.listen(window,"scroll",t)},dispatchEvent:function(e,t){if(m._enabled){var n=o.getPooled(e,t);try{f.batchedUpdates(i,n)}finally{o.release(n)}}}};e.exports=m},function(e,t,n){"use strict";var r=n(18),o=n(24),i=n(40),a=n(43),s=n(69),u=n(29),l=n(71),c=n(10),p={Component:a.injection,DOMProperty:r.injection,EmptyComponent:s.injection,EventPluginHub:o.injection,EventPluginUtils:i.injection,EventEmitter:u.injection,HostComponent:l.injection,Updates:c.injection};e.exports=p},function(e,t,n){"use strict";var r=n(178),o=/\/?>/,i=/^<\!\-\-/,a={CHECKSUM_ATTR_NAME:"data-react-checksum",addChecksumToMarkup:function(e){var t=r(e);return i.test(e)?e:e.replace(o," "+a.CHECKSUM_ATTR_NAME+'="'+t+'"$&')},canReuseMarkup:function(e,t){var n=t.getAttribute(a.CHECKSUM_ATTR_NAME);n=n&&parseInt(n,10);var o=r(e);return o===n}};e.exports=a},function(e,t,n){"use strict";function r(e,t,n){return{type:"INSERT_MARKUP",content:e,fromIndex:null,fromNode:null,toIndex:n,afterNode:t}}function o(e,t,n){return{type:"MOVE_EXISTING",content:null,fromIndex:e._mountIndex,fromNode:f.getHostNode(e),toIndex:n,afterNode:t}}function i(e,t){return{type:"REMOVE_NODE",content:null,fromIndex:e._mountIndex,fromNode:t,toIndex:null,afterNode:null}}function a(e){return{type:"SET_MARKUP",content:e,fromIndex:null,fromNode:null,toIndex:null,afterNode:null}}function s(e){return{type:"TEXT_CONTENT",content:e,fromIndex:null,fromNode:null,toIndex:null,afterNode:null}}function u(e,t){return t&&(e=e||[],e.push(t)),e}function l(e,t){p.processChildrenUpdates(e,t)}var c=n(3),p=n(43),f=(n(26),n(9),n(12),n(19)),d=n(135),h=(n(8),n(181)),m=(n(1),{Mixin:{_reconcilerInstantiateChildren:function(e,t,n){return d.instantiateChildren(e,t,n)},_reconcilerUpdateChildren:function(e,t,n,r,o,i){var a,s=0;return a=h(t,s),d.updateChildren(e,a,n,r,o,this,this._hostContainerInfo,i,s),a},mountChildren:function(e,t,n){var r=this._reconcilerInstantiateChildren(e,t,n);this._renderedChildren=r;var o=[],i=0;for(var a in r)if(r.hasOwnProperty(a)){var s=r[a],u=0,l=f.mountComponent(s,t,this,this._hostContainerInfo,n,u);s._mountIndex=i++,o.push(l)}return o},updateTextContent:function(e){var t=this._renderedChildren;d.unmountChildren(t,!1);for(var n in t)t.hasOwnProperty(n)&&c("118");var r=[s(e)];l(this,r)},updateMarkup:function(e){var t=this._renderedChildren;d.unmountChildren(t,!1);for(var n in t)t.hasOwnProperty(n)&&c("118");var r=[a(e)];l(this,r)},updateChildren:function(e,t,n){this._updateChildren(e,t,n)},_updateChildren:function(e,t,n){var r=this._renderedChildren,o={},i=[],a=this._reconcilerUpdateChildren(r,e,i,o,t,n);if(a||r){var s,c=null,p=0,d=0,h=0,m=null;for(s in a)if(a.hasOwnProperty(s)){var v=r&&r[s],g=a[s];v===g?(c=u(c,this.moveChild(v,m,p,d)),d=Math.max(v._mountIndex,d),v._mountIndex=p):(v&&(d=Math.max(v._mountIndex,d)),c=u(c,this._mountChildAtIndex(g,i[h],m,p,t,n)),h++),p++,m=f.getHostNode(g)}for(s in o)o.hasOwnProperty(s)&&(c=u(c,this._unmountChild(r[s],o[s])));c&&l(this,c),this._renderedChildren=a}},unmountChildren:function(e){var t=this._renderedChildren;d.unmountChildren(t,e),this._renderedChildren=null},moveChild:function(e,t,n,r){if(e._mountIndex<r)return o(e,t,n)},createChild:function(e,t,n){return r(n,t,e._mountIndex)},removeChild:function(e,t){return i(e,t)},_mountChildAtIndex:function(e,t,n,r,o,i){return e._mountIndex=r,this.createChild(e,n,t)},_unmountChild:function(e,t){var n=this.removeChild(e,t);return e._mountIndex=null,n}}});e.exports=m},function(e,t,n){"use strict";function r(e){return!(!e||"function"!=typeof e.attachRef||"function"!=typeof e.detachRef)}var o=n(3),i=(n(1),{addComponentAsRefTo:function(e,t,n){r(n)?void 0:o("119"),n.attachRef(t,e)},removeComponentAsRefFrom:function(e,t,n){r(n)?void 0:o("120");var i=n.getPublicInstance();i&&i.refs[t]===e.getPublicInstance()&&n.detachRef(t)}});e.exports=i},function(e,t){"use strict";var n="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED";e.exports=n},function(e,t,n){"use strict";function r(e){this.reinitializeTransaction(),this.renderToStaticMarkup=!1,this.reactMountReady=i.getPooled(null),this.useCreateElement=e}var o=n(4),i=n(65),a=n(14),s=n(29),u=n(72),l=(n(9),n(31)),c=n(45),p={initialize:u.getSelectionInformation,close:u.restoreSelection},f={initialize:function(){var e=s.isEnabled();return s.setEnabled(!1),e},close:function(e){
-s.setEnabled(e)}},d={initialize:function(){this.reactMountReady.reset()},close:function(){this.reactMountReady.notifyAll()}},h=[p,f,d],m={getTransactionWrappers:function(){return h},getReactMountReady:function(){return this.reactMountReady},getUpdateQueue:function(){return c},checkpoint:function(){return this.reactMountReady.checkpoint()},rollback:function(e){this.reactMountReady.rollback(e)},destructor:function(){i.release(this.reactMountReady),this.reactMountReady=null}};o(r.prototype,l,m),a.addPoolingTo(r),e.exports=r},function(e,t,n){"use strict";function r(e,t,n){"function"==typeof e?e(t.getPublicInstance()):i.addComponentAsRefTo(t,e,n)}function o(e,t,n){"function"==typeof e?e(null):i.removeComponentAsRefFrom(t,e,n)}var i=n(158),a={};a.attachRefs=function(e,t){if(null!==t&&"object"==typeof t){var n=t.ref;null!=n&&r(n,e,t._owner)}},a.shouldUpdateRefs=function(e,t){var n=null,r=null;null!==e&&"object"==typeof e&&(n=e.ref,r=e._owner);var o=null,i=null;return null!==t&&"object"==typeof t&&(o=t.ref,i=t._owner),n!==o||"string"==typeof o&&i!==r},a.detachRefs=function(e,t){if(null!==t&&"object"==typeof t){var n=t.ref;null!=n&&o(n,e,t._owner)}},e.exports=a},function(e,t,n){"use strict";function r(e){this.reinitializeTransaction(),this.renderToStaticMarkup=e,this.useCreateElement=!1,this.updateQueue=new s(this)}var o=n(4),i=n(14),a=n(31),s=(n(9),n(163)),u=[],l={enqueue:function(){}},c={getTransactionWrappers:function(){return u},getReactMountReady:function(){return l},getUpdateQueue:function(){return this.updateQueue},destructor:function(){},checkpoint:function(){},rollback:function(){}};o(r.prototype,a,c),i.addPoolingTo(r),e.exports=r},function(e,t,n){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function o(e,t){}var i=n(45),a=(n(2),function(){function e(t){r(this,e),this.transaction=t}return e.prototype.isMounted=function(e){return!1},e.prototype.enqueueCallback=function(e,t,n){this.transaction.isInTransaction()&&i.enqueueCallback(e,t,n)},e.prototype.enqueueForceUpdate=function(e){this.transaction.isInTransaction()?i.enqueueForceUpdate(e):o(e,"forceUpdate")},e.prototype.enqueueReplaceState=function(e,t){this.transaction.isInTransaction()?i.enqueueReplaceState(e,t):o(e,"replaceState")},e.prototype.enqueueSetState=function(e,t){this.transaction.isInTransaction()?i.enqueueSetState(e,t):o(e,"setState")},e}());e.exports=a},function(e,t){"use strict";e.exports="15.5.4"},function(e,t){"use strict";var n={xlink:"http://www.w3.org/1999/xlink",xml:"http://www.w3.org/XML/1998/namespace"},r={accentHeight:"accent-height",accumulate:0,additive:0,alignmentBaseline:"alignment-baseline",allowReorder:"allowReorder",alphabetic:0,amplitude:0,arabicForm:"arabic-form",ascent:0,attributeName:"attributeName",attributeType:"attributeType",autoReverse:"autoReverse",azimuth:0,baseFrequency:"baseFrequency",baseProfile:"baseProfile",baselineShift:"baseline-shift",bbox:0,begin:0,bias:0,by:0,calcMode:"calcMode",capHeight:"cap-height",clip:0,clipPath:"clip-path",clipRule:"clip-rule",clipPathUnits:"clipPathUnits",colorInterpolation:"color-interpolation",colorInterpolationFilters:"color-interpolation-filters",colorProfile:"color-profile",colorRendering:"color-rendering",contentScriptType:"contentScriptType",contentStyleType:"contentStyleType",cursor:0,cx:0,cy:0,d:0,decelerate:0,descent:0,diffuseConstant:"diffuseConstant",direction:0,display:0,divisor:0,dominantBaseline:"dominant-baseline",dur:0,dx:0,dy:0,edgeMode:"edgeMode",elevation:0,enableBackground:"enable-background",end:0,exponent:0,externalResourcesRequired:"externalResourcesRequired",fill:0,fillOpacity:"fill-opacity",fillRule:"fill-rule",filter:0,filterRes:"filterRes",filterUnits:"filterUnits",floodColor:"flood-color",floodOpacity:"flood-opacity",focusable:0,fontFamily:"font-family",fontSize:"font-size",fontSizeAdjust:"font-size-adjust",fontStretch:"font-stretch",fontStyle:"font-style",fontVariant:"font-variant",fontWeight:"font-weight",format:0,from:0,fx:0,fy:0,g1:0,g2:0,glyphName:"glyph-name",glyphOrientationHorizontal:"glyph-orientation-horizontal",glyphOrientationVertical:"glyph-orientation-vertical",glyphRef:"glyphRef",gradientTransform:"gradientTransform",gradientUnits:"gradientUnits",hanging:0,horizAdvX:"horiz-adv-x",horizOriginX:"horiz-origin-x",ideographic:0,imageRendering:"image-rendering",in:0,in2:0,intercept:0,k:0,k1:0,k2:0,k3:0,k4:0,kernelMatrix:"kernelMatrix",kernelUnitLength:"kernelUnitLength",kerning:0,keyPoints:"keyPoints",keySplines:"keySplines",keyTimes:"keyTimes",lengthAdjust:"lengthAdjust",letterSpacing:"letter-spacing",lightingColor:"lighting-color",limitingConeAngle:"limitingConeAngle",local:0,markerEnd:"marker-end",markerMid:"marker-mid",markerStart:"marker-start",markerHeight:"markerHeight",markerUnits:"markerUnits",markerWidth:"markerWidth",mask:0,maskContentUnits:"maskContentUnits",maskUnits:"maskUnits",mathematical:0,mode:0,numOctaves:"numOctaves",offset:0,opacity:0,operator:0,order:0,orient:0,orientation:0,origin:0,overflow:0,overlinePosition:"overline-position",overlineThickness:"overline-thickness",paintOrder:"paint-order",panose1:"panose-1",pathLength:"pathLength",patternContentUnits:"patternContentUnits",patternTransform:"patternTransform",patternUnits:"patternUnits",pointerEvents:"pointer-events",points:0,pointsAtX:"pointsAtX",pointsAtY:"pointsAtY",pointsAtZ:"pointsAtZ",preserveAlpha:"preserveAlpha",preserveAspectRatio:"preserveAspectRatio",primitiveUnits:"primitiveUnits",r:0,radius:0,refX:"refX",refY:"refY",renderingIntent:"rendering-intent",repeatCount:"repeatCount",repeatDur:"repeatDur",requiredExtensions:"requiredExtensions",requiredFeatures:"requiredFeatures",restart:0,result:0,rotate:0,rx:0,ry:0,scale:0,seed:0,shapeRendering:"shape-rendering",slope:0,spacing:0,specularConstant:"specularConstant",specularExponent:"specularExponent",speed:0,spreadMethod:"spreadMethod",startOffset:"startOffset",stdDeviation:"stdDeviation",stemh:0,stemv:0,stitchTiles:"stitchTiles",stopColor:"stop-color",stopOpacity:"stop-opacity",strikethroughPosition:"strikethrough-position",strikethroughThickness:"strikethrough-thickness",string:0,stroke:0,strokeDasharray:"stroke-dasharray",strokeDashoffset:"stroke-dashoffset",strokeLinecap:"stroke-linecap",strokeLinejoin:"stroke-linejoin",strokeMiterlimit:"stroke-miterlimit",strokeOpacity:"stroke-opacity",strokeWidth:"stroke-width",surfaceScale:"surfaceScale",systemLanguage:"systemLanguage",tableValues:"tableValues",targetX:"targetX",targetY:"targetY",textAnchor:"text-anchor",textDecoration:"text-decoration",textRendering:"text-rendering",textLength:"textLength",to:0,transform:0,u1:0,u2:0,underlinePosition:"underline-position",underlineThickness:"underline-thickness",unicode:0,unicodeBidi:"unicode-bidi",unicodeRange:"unicode-range",unitsPerEm:"units-per-em",vAlphabetic:"v-alphabetic",vHanging:"v-hanging",vIdeographic:"v-ideographic",vMathematical:"v-mathematical",values:0,vectorEffect:"vector-effect",version:0,vertAdvY:"vert-adv-y",vertOriginX:"vert-origin-x",vertOriginY:"vert-origin-y",viewBox:"viewBox",viewTarget:"viewTarget",visibility:0,widths:0,wordSpacing:"word-spacing",writingMode:"writing-mode",x:0,xHeight:"x-height",x1:0,x2:0,xChannelSelector:"xChannelSelector",xlinkActuate:"xlink:actuate",xlinkArcrole:"xlink:arcrole",xlinkHref:"xlink:href",xlinkRole:"xlink:role",xlinkShow:"xlink:show",xlinkTitle:"xlink:title",xlinkType:"xlink:type",xmlBase:"xml:base",xmlns:0,xmlnsXlink:"xmlns:xlink",xmlLang:"xml:lang",xmlSpace:"xml:space",y:0,y1:0,y2:0,yChannelSelector:"yChannelSelector",z:0,zoomAndPan:"zoomAndPan"},o={Properties:{},DOMAttributeNamespaces:{xlinkActuate:n.xlink,xlinkArcrole:n.xlink,xlinkHref:n.xlink,xlinkRole:n.xlink,xlinkShow:n.xlink,xlinkTitle:n.xlink,xlinkType:n.xlink,xmlBase:n.xml,xmlLang:n.xml,xmlSpace:n.xml},DOMAttributeNames:{}};Object.keys(r).forEach(function(e){o.Properties[e]=0,r[e]&&(o.DOMAttributeNames[e]=r[e])}),e.exports=o},function(e,t,n){"use strict";function r(e){if("selectionStart"in e&&u.hasSelectionCapabilities(e))return{start:e.selectionStart,end:e.selectionEnd};if(window.getSelection){var t=window.getSelection();return{anchorNode:t.anchorNode,anchorOffset:t.anchorOffset,focusNode:t.focusNode,focusOffset:t.focusOffset}}if(document.selection){var n=document.selection.createRange();return{parentElement:n.parentElement(),text:n.text,top:n.boundingTop,left:n.boundingLeft}}}function o(e,t){if(y||null==m||m!==c())return null;var n=r(m);if(!g||!f(g,n)){g=n;var o=l.getPooled(h.select,v,e,t);return o.type="select",o.target=m,i.accumulateTwoPhaseDispatches(o),o}return null}var i=n(25),a=n(7),s=n(6),u=n(72),l=n(11),c=n(59),p=n(81),f=n(36),d=a.canUseDOM&&"documentMode"in document&&document.documentMode<=11,h={select:{phasedRegistrationNames:{bubbled:"onSelect",captured:"onSelectCapture"},dependencies:["topBlur","topContextMenu","topFocus","topKeyDown","topKeyUp","topMouseDown","topMouseUp","topSelectionChange"]}},m=null,v=null,g=null,y=!1,b=!1,C={eventTypes:h,extractEvents:function(e,t,n,r){if(!b)return null;var i=t?s.getNodeFromInstance(t):window;switch(e){case"topFocus":(p(i)||"true"===i.contentEditable)&&(m=i,v=t,g=null);break;case"topBlur":m=null,v=null,g=null;break;case"topMouseDown":y=!0;break;case"topContextMenu":case"topMouseUp":return y=!1,o(n,r);case"topSelectionChange":if(d)break;case"topKeyDown":case"topKeyUp":return o(n,r)}return null},didPutListener:function(e,t,n){"onSelect"===t&&(b=!0)}};e.exports=C},function(e,t,n){"use strict";function r(e){return"."+e._rootNodeID}function o(e){return"button"===e||"input"===e||"select"===e||"textarea"===e}var i=n(3),a=n(57),s=n(25),u=n(6),l=n(168),c=n(169),p=n(11),f=n(172),d=n(174),h=n(30),m=n(171),v=n(175),g=n(176),y=n(27),b=n(177),C=n(8),_=n(47),w=(n(1),{}),E={};["abort","animationEnd","animationIteration","animationStart","blur","canPlay","canPlayThrough","click","contextMenu","copy","cut","doubleClick","drag","dragEnd","dragEnter","dragExit","dragLeave","dragOver","dragStart","drop","durationChange","emptied","encrypted","ended","error","focus","input","invalid","keyDown","keyPress","keyUp","load","loadedData","loadedMetadata","loadStart","mouseDown","mouseMove","mouseOut","mouseOver","mouseUp","paste","pause","play","playing","progress","rateChange","reset","scroll","seeked","seeking","stalled","submit","suspend","timeUpdate","touchCancel","touchEnd","touchMove","touchStart","transitionEnd","volumeChange","waiting","wheel"].forEach(function(e){var t=e[0].toUpperCase()+e.slice(1),n="on"+t,r="top"+t,o={phasedRegistrationNames:{bubbled:n,captured:n+"Capture"},dependencies:[r]};w[e]=o,E[r]=o});var T={},x={eventTypes:w,extractEvents:function(e,t,n,r){var o=E[e];if(!o)return null;var a;switch(e){case"topAbort":case"topCanPlay":case"topCanPlayThrough":case"topDurationChange":case"topEmptied":case"topEncrypted":case"topEnded":case"topError":case"topInput":case"topInvalid":case"topLoad":case"topLoadedData":case"topLoadedMetadata":case"topLoadStart":case"topPause":case"topPlay":case"topPlaying":case"topProgress":case"topRateChange":case"topReset":case"topSeeked":case"topSeeking":case"topStalled":case"topSubmit":case"topSuspend":case"topTimeUpdate":case"topVolumeChange":case"topWaiting":a=p;break;case"topKeyPress":if(0===_(n))return null;case"topKeyDown":case"topKeyUp":a=d;break;case"topBlur":case"topFocus":a=f;break;case"topClick":if(2===n.button)return null;case"topDoubleClick":case"topMouseDown":case"topMouseMove":case"topMouseUp":case"topMouseOut":case"topMouseOver":case"topContextMenu":a=h;break;case"topDrag":case"topDragEnd":case"topDragEnter":case"topDragExit":case"topDragLeave":case"topDragOver":case"topDragStart":case"topDrop":a=m;break;case"topTouchCancel":case"topTouchEnd":case"topTouchMove":case"topTouchStart":a=v;break;case"topAnimationEnd":case"topAnimationIteration":case"topAnimationStart":a=l;break;case"topTransitionEnd":a=g;break;case"topScroll":a=y;break;case"topWheel":a=b;break;case"topCopy":case"topCut":case"topPaste":a=c}a?void 0:i("86",e);var u=a.getPooled(o,t,n,r);return s.accumulateTwoPhaseDispatches(u),u},didPutListener:function(e,t,n){if("onClick"===t&&!o(e._tag)){var i=r(e),s=u.getNodeFromInstance(e);T[i]||(T[i]=a.listen(s,"click",C))}},willDeleteListener:function(e,t){if("onClick"===t&&!o(e._tag)){var n=r(e);T[n].remove(),delete T[n]}}};e.exports=x},function(e,t,n){"use strict";function r(e,t,n,r){return o.call(this,e,t,n,r)}var o=n(11),i={animationName:null,elapsedTime:null,pseudoElement:null};o.augmentClass(r,i),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return o.call(this,e,t,n,r)}var o=n(11),i={clipboardData:function(e){return"clipboardData"in e?e.clipboardData:window.clipboardData}};o.augmentClass(r,i),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return o.call(this,e,t,n,r)}var o=n(11),i={data:null};o.augmentClass(r,i),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return o.call(this,e,t,n,r)}var o=n(30),i={dataTransfer:null};o.augmentClass(r,i),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return o.call(this,e,t,n,r)}var o=n(27),i={relatedTarget:null};o.augmentClass(r,i),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return o.call(this,e,t,n,r)}var o=n(11),i={data:null};o.augmentClass(r,i),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return o.call(this,e,t,n,r)}var o=n(27),i=n(47),a=n(182),s=n(48),u={key:a,location:null,ctrlKey:null,shiftKey:null,altKey:null,metaKey:null,repeat:null,locale:null,getModifierState:s,charCode:function(e){return"keypress"===e.type?i(e):0},keyCode:function(e){return"keydown"===e.type||"keyup"===e.type?e.keyCode:0},which:function(e){return"keypress"===e.type?i(e):"keydown"===e.type||"keyup"===e.type?e.keyCode:0}};o.augmentClass(r,u),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return o.call(this,e,t,n,r)}var o=n(27),i=n(48),a={touches:null,targetTouches:null,changedTouches:null,altKey:null,metaKey:null,ctrlKey:null,shiftKey:null,getModifierState:i};o.augmentClass(r,a),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return o.call(this,e,t,n,r)}var o=n(11),i={propertyName:null,elapsedTime:null,pseudoElement:null};o.augmentClass(r,i),e.exports=r},function(e,t,n){"use strict";function r(e,t,n,r){return o.call(this,e,t,n,r)}var o=n(30),i={deltaX:function(e){return"deltaX"in e?e.deltaX:"wheelDeltaX"in e?-e.wheelDeltaX:0},deltaY:function(e){return"deltaY"in e?e.deltaY:"wheelDeltaY"in e?-e.wheelDeltaY:"wheelDelta"in e?-e.wheelDelta:0},deltaZ:null,deltaMode:null};o.augmentClass(r,i),e.exports=r},function(e,t){"use strict";function n(e){for(var t=1,n=0,o=0,i=e.length,a=i&-4;o<a;){for(var s=Math.min(o+4096,a);o<s;o+=4)n+=(t+=e.charCodeAt(o))+(t+=e.charCodeAt(o+1))+(t+=e.charCodeAt(o+2))+(t+=e.charCodeAt(o+3));t%=r,n%=r}for(;o<i;o++)n+=t+=e.charCodeAt(o);return t%=r,n%=r,t|n<<16}var r=65521;e.exports=n},function(e,t,n){"use strict";function r(e,t,n){var r=null==t||"boolean"==typeof t||""===t;if(r)return"";var o=isNaN(t);if(o||0===t||i.hasOwnProperty(e)&&i[e])return""+t;if("string"==typeof t){t=t.trim()}return t+"px"}var o=n(64),i=(n(2),o.isUnitlessNumber);e.exports=r},function(e,t,n){"use strict";function r(e){if(null==e)return null;if(1===e.nodeType)return e;var t=a.get(e);return t?(t=s(t),t?i.getNodeFromInstance(t):null):void("function"==typeof e.render?o("44"):o("45",Object.keys(e)))}var o=n(3),i=(n(12),n(6)),a=n(26),s=n(78);n(1),n(2);e.exports=r},function(e,t,n){(function(t){"use strict";function r(e,t,n,r){if(e&&"object"==typeof e){var o=e,i=void 0===o[n];i&&null!=t&&(o[n]=t)}}function o(e,t){if(null==e)return e;var n={};return i(e,r,n),n}var i=(n(41),n(83));n(2);e.exports=o}).call(t,n(60))},function(e,t,n){"use strict";function r(e){if(e.key){var t=i[e.key]||e.key;if("Unidentified"!==t)return t}if("keypress"===e.type){var n=o(e);return 13===n?"Enter":String.fromCharCode(n)}return"keydown"===e.type||"keyup"===e.type?a[e.keyCode]||"Unidentified":""}var o=n(47),i={Esc:"Escape",Spacebar:" ",Left:"ArrowLeft",Up:"ArrowUp",Right:"ArrowRight",Down:"ArrowDown",Del:"Delete",Win:"OS",Menu:"ContextMenu",Apps:"ContextMenu",Scroll:"ScrollLock",MozPrintableKey:"Unidentified"},a={8:"Backspace",9:"Tab",12:"Clear",13:"Enter",16:"Shift",17:"Control",18:"Alt",19:"Pause",20:"CapsLock",27:"Escape",32:" ",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"ArrowLeft",38:"ArrowUp",39:"ArrowRight",40:"ArrowDown",45:"Insert",46:"Delete",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"NumLock",145:"ScrollLock",224:"Meta"};e.exports=r},function(e,t){"use strict";function n(e){var t=e&&(r&&e[r]||e[o]);if("function"==typeof t)return t}var r="function"==typeof Symbol&&Symbol.iterator,o="@@iterator";e.exports=n},function(e,t){"use strict";function n(e){for(;e&&e.firstChild;)e=e.firstChild;return e}function r(e){for(;e;){if(e.nextSibling)return e.nextSibling;e=e.parentNode}}function o(e,t){for(var o=n(e),i=0,a=0;o;){if(3===o.nodeType){if(a=i+o.textContent.length,i<=t&&a>=t)return{node:o,offset:t-i};i=a}o=n(r(o))}}e.exports=o},function(e,t,n){"use strict";function r(e,t){var n={};return n[e.toLowerCase()]=t.toLowerCase(),n["Webkit"+e]="webkit"+t,n["Moz"+e]="moz"+t,n["ms"+e]="MS"+t,n["O"+e]="o"+t.toLowerCase(),n}function o(e){if(s[e])return s[e];if(!a[e])return e;var t=a[e];for(var n in t)if(t.hasOwnProperty(n)&&n in u)return s[e]=t[n];return""}var i=n(7),a={animationend:r("Animation","AnimationEnd"),animationiteration:r("Animation","AnimationIteration"),animationstart:r("Animation","AnimationStart"),transitionend:r("Transition","TransitionEnd")},s={},u={};i.canUseDOM&&(u=document.createElement("div").style,"AnimationEvent"in window||(delete a.animationend.animation,delete a.animationiteration.animation,delete a.animationstart.animation),"TransitionEvent"in window||delete a.transitionend.transition),e.exports=o},function(e,t,n){"use strict";function r(e){return'"'+o(e)+'"'}var o=n(32);e.exports=r},function(e,t,n){"use strict";var r=n(73);e.exports=r.renderSubtreeIntoContainer},function(e,t,n){"use strict";"undefined"==typeof Promise&&(n(120).enable(),window.Promise=n(119)),n(226),Object.assign=n(4)},113,114,115,116,117,function(e,t,n){(function(){var t,r,o;t=n(5),r=t.createClass,o=t.DOM.div,e.exports=r({getDefaultProps:function(){return{className:"",onHeightChange:function(){}}},render:function(){return o({className:this.props.className,ref:"dropdown"},this.props.children)},componentDidMount:function(){this.props.onHeightChange(this.refs.dropdown.offsetHeight)},componentDidUpdate:function(){this.props.onHeightChange(this.refs.dropdown.offsetHeight)},componentWillUnmount:function(){this.props.onHeightChange(0)}})}).call(this)},function(e,t,n){(function(){function t(e,t){var n={}.hasOwnProperty;for(var r in t)n.call(t,r)&&(e[r]=t[r]);return e}var r,o,i,a,s,u,l,c,p,f,d,h,m,v,g,y,b,C;r=n(15),o=r.filter,i=r.id,a=r.map,s=n(16).isEqualToObject,u=n(5),r=u.DOM,l=r.div,c=r.input,p=r.span,f=u.createClass,d=u.createFactory,h=n(13).findDOMNode,m=d(n(63)),v=d(n(198)),g=d(n(194)),y=d(n(84)),r=n(28),b=r.cancelEvent,C=r.classNameFromObject,e.exports=f({displayName:"DropdownMenu",getDefaultProps:function(){return{className:"",dropdownDirection:1,groupId:function(e){return e.groupId},groupsAsColumns:!1,highlightedUid:void 0,onHighlightedUidChange:function(e,t){},onOptionClick:function(e){},onScrollLockChange:function(e){},options:[],renderNoResultsFound:function(){return l({className:"no-results-found"},"No results found")},renderGroupTitle:function(e,t){var n,r;return null!=t&&(n=t.groupId,r=t.title),l({className:"simple-group-title",key:n},r)},renderOption:function(e){var t,n,r,o;return null!=e&&(t=e.label,n=e.newOption,r=e.selectable),o="undefined"==typeof r||r,l({className:"simple-option "+(o?"":"not-selectable")},p(null,n?"Add "+t+" ...":t))},scrollLock:!1,style:{},tether:!1,tetherProps:{},theme:"default",transitionEnter:!1,transitionLeave:!1,transitionEnterTimeout:200,transitionLeaveTimeout:200,uid:i}},render:function(){var e,n;return e=C((n={},n[this.props.theme+""]=1,n[this.props.className+""]=1,n.flipped=this.props.dropdownDirection===-1,n.tethered=this.props.tether,n)),this.props.tether?v((n=t({},this.props.tetherProps),n.options={attachment:"top left",targetAttachment:"bottom left",constraints:[{to:"scrollParent"}]},n),this.renderAnimatedDropdown({dynamicClassName:e})):this.renderAnimatedDropdown({dynamicClassName:e})},renderAnimatedDropdown:function(e){var t;return t=e.dynamicClassName,this.props.transitionEnter||this.props.transitionLeave?m({component:"div",transitionName:"custom",transitionEnter:this.props.transitionEnter,transitionLeave:this.props.transitionLeave,transitionEnterTimeout:this.props.transitionEnterTimeout,transitionLeaveTimeout:this.props.transitionLeaveTimeout,className:"dropdown-menu-wrapper "+t,ref:"dropdownMenuWrapper"},this.renderDropdown(e)):this.renderDropdown(e)},renderOptions:function(e){var n=this;return a(function(r){var o,i;return o=e[r],i=n.props.uid(o),y(t({uid:i,ref:"option-"+n.uidToString(i),key:n.uidToString(i),item:o,highlight:s(n.props.highlightedUid,i),selectable:null!=o?o.selectable:void 0,onMouseMove:function(e){var t;t=e.currentTarget,n.props.scrollLock&&n.props.onScrollLockChange(!1)},onMouseOut:function(){n.props.scrollLock||n.props.onHighlightedUidChange(void 0,function(){})},renderItem:n.props.renderOption},function(){switch(!1){case!("boolean"==typeof(null!=o?o.selectable:void 0)&&!o.selectable):return{onClick:b};default:return{onClick:function(){n.props.onOptionClick(n.props.highlightedUid)},onMouseOver:function(e){var t;t=e.currentTarget,n.props.scrollLock||n.props.onHighlightedUidChange(i,function(){})}}}}()))})(function(){var t,n,r=[];for(t=0,n=e.length;t<n;++t)r.push(t);return r}())},renderDropdown:function(e){var t,n,r,i,s=this;return t=e.dynamicClassName,this.props.open?g({className:"dropdown-menu "+t,ref:"dropdownMenu",onHeightChange:function(e){s.refs.dropdownMenuWrapper&&(h(s.refs.dropdownMenuWrapper).style.height=e+"px")}},0===this.props.options.length?this.props.renderNoResultsFound():(null!=(n=this.props)&&null!=(r=n.groups)?r.length:void 0)>0?(i=a(function(e){var t,n,r;return t=s.props.groups[e],n=t.groupId,r=o(function(e){return s.props.groupId(e)===n})(s.props.options),{index:e,group:t,options:r}})(function(){var e,t,n=[];for(e=0,t=this.props.groups.length;e<t;++e)n.push(e);return n}.call(this)),l({className:"groups "+(this.props.groupsAsColumns?"as-columns":"")},a(function(e){var t,n,r,o;return t=e.index,n=e.group,r=n.groupId,o=e.options,l({key:r},s.props.renderGroupTitle(t,n,o),l({className:"options"},s.renderOptions(o)))})(o(function(e){return e.options.length>0})(i)))):this.renderOptions(this.props.options)):null},componentDidUpdate:function(){var e,t,n;e=t=h(null!=(n=this.refs.dropdownMenuWrapper)?n:this.refs.dropdownMenu),null!=e&&(e.style.bottom=function(){switch(!1){case this.props.dropdownDirection!==-1:return this.props.bottomAnchor().offsetHeight+t.style.marginBottom+"px";default:return""}}.call(this))},highlightAndScrollToOption:function(e,t){var n,r=this;null==t&&(t=function(){}),n=this.props.uid(this.props.options[e]),this.props.onHighlightedUidChange(n,function(){var e,o,i,a,s;return null!=(e=h(null!=(o=r.refs)?o["option-"+r.uidToString(n)]:void 0))&&(i=e),i&&(a=h(r.refs.dropdownMenu),s=i.offsetHeight-1,i.offsetTop-a.scrollTop>=a.offsetHeight?a.scrollTop=i.offsetTop-a.offsetHeight+s:i.offsetTop-a.scrollTop+s<=0&&(a.scrollTop=i.offsetTop)),t()})},highlightAndScrollToSelectableOption:function(e,t,n){var r,o,i;null==n&&(n=function(){}),e<0||e>=this.props.options.length?this.props.onHighlightedUidChange(void 0,function(){return n(!1)}):(r=null!=(o=this.props)&&null!=(i=o.options)?i[e]:void 0,"boolean"!=typeof(null!=r?r.selectable:void 0)||r.selectable?this.highlightAndScrollToOption(e,function(){return n(!0)}):this.highlightAndScrollToSelectableOption(e+t,t,n))},uidToString:function(e){return("object"==typeof e?JSON.stringify:i)(e)}})}).call(this)},function(e,t,n){(function(){var t,r,o,i,a,s;t=n(5),r=t.createClass,o=t.DOM,i=o.div,a=o.span,s=n(15).map,e.exports=r({getDefaultProps:function(){return{partitions:[],text:"",style:{},highlightStyle:{}}},render:function(){var e=this;return i({className:"highlighted-text",style:this.props.style},s(function(t){var n,r,o;return n=t[0],r=t[1],o=t[2],a({key:e.props.text+""+n+r+o,className:o?"highlight":"",style:o?e.props.highlightStyle:{}},e.props.text.substring(n,r))})(this.props.partitions))}})}).call(this)},function(e,t,n){(function(){function t(e,t){for(var n=-1,r=t.length>>>0;++n<r;)if(e===t[n])return!0;return!1}function r(e,t){var n,r=function(o){return e.length>1?function(){var i=o?o.concat():[];return n=t?n||this:this,i.push.apply(i,arguments)<e.length&&arguments.length?r.call(n,i):e.apply(n,i)}:e};return r()}function o(e,t){var n={}.hasOwnProperty;for(var r in t)n.call(t,r)&&(e[r]=t[r]);return e}var i,a,s,u,l,c,p,f,d,h,m,v,g,y,b,C,_,w,E,T,x,O={}.toString;i=n(15),a=i.all,s=i.any,u=i.camelize,l=i.difference,c=i.drop,p=i.filter,f=i.find,d=i.findIndex,h=i.id,m=i.last,v=i.map,g=i.reject,y=n(16).isEqualToObject,b=n(5),C=b.createFactory,i=b.DOM,_=i.div,w=i.img,E=i.span,T=C(n(53)),x=n(28).cancelEvent,e.exports=b.createClass({displayName:"MultiSelect",getDefaultProps:function(){return{className:"",closeOnSelect:!1,defaultValues:[],delimiters:[],filterOptions:r(function(e,n,r){return p(function(e){return e.label.toLowerCase().trim().indexOf(r.toLowerCase().trim())>-1})(g(function(e){return t(e.label.trim(),v(function(e){return e.label.trim()},null!=n?n:[]))})(e))}),firstOptionIndexToHighlight:h,onBlur:function(e){},onFocus:function(e){},onPaste:function(e){},serialize:v(function(e){return null!=e?e.value:void 0}),tether:!1}},render:function(){var e,t,n,r,i,a,s,u,l,c,p,f,d,h,v,g,y,b,C,_,w,E,O,P,k,S,N,M,A,I,D,R,L,U,F,j,B,V,W=this;return e=this.getComputedState(),t=e.anchor,n=e.filteredOptions,r=e.highlightedUid,i=e.onAnchorChange,a=e.onOpenChange,s=e.onHighlightedUidChange,u=e.onSearchChange,l=e.onValuesChange,c=e.search,p=e.open,f=e.options,d=e.values,null!=(e=this.props)&&(h=e.autofocus,v=e.autosize,g=e.cancelKeyboardEventOnSelection,y=e.delimiters,b=e.disabled,C=e.dropdownDirection,_=e.groupId,w=e.groups,E=e.groupsAsColumns,O=e.hideResetButton,P=e.inputProps,k=e.name,S=e.onKeyboardSelectionFailed,N=e.renderToggleButton,M=e.renderGroupTitle,A=e.renderResetButton,I=e.serialize,D=e.tether,R=e.tetherProps,L=e.theme,U=e.transitionEnter,F=e.transitionLeave,j=e.transitionEnterTimeout,B=e.transitionLeaveTimeout,V=e.uid),T(o(o({autofocus:h,autosize:v,cancelKeyboardEventOnSelection:g,className:"multi-select "+this.props.className,delimiters:y,disabled:b,dropdownDirection:C,groupId:_,groups:w,groupsAsColumns:E,hideResetButton:O,highlightedUid:r,onHighlightedUidChange:s,inputProps:P,name:k,onKeyboardSelectionFailed:S,renderGroupTitle:M,renderResetButton:A,renderToggleButton:N,scrollLock:this.state.scrollLock,onScrollLockChange:function(e){return W.setState({scrollLock:e})},tether:D,tetherProps:R,theme:L,transitionEnter:U,transitionEnterTimeout:j,transitionLeave:F,transitionLeaveTimeout:B,uid:V,ref:"select",anchor:t,onAnchorChange:i,open:p,onOpenChange:a,options:f,renderOption:this.props.renderOption,firstOptionIndexToHighlight:function(){return W.firstOptionIndexToHighlight(f)},search:c,onSearchChange:function(e,t){return u(W.props.maxValues&&d.length>=W.props.maxValues?"":e,t)},values:d,onValuesChange:function(e,t){return l(e,function(){if(t(),W.props.closeOnSelect||W.props.maxValues&&W.values().length>=W.props.maxValues)return a(!1,function(){})})},renderValue:this.props.renderValue,serialize:I,onBlur:function(e){u("",function(){return W.props.onBlur({open:p,values:d,originalEvent:e})})},onFocus:function(e){W.props.onFocus({open:p,values:d,originalEvent:e})},onPaste:function(){var e;switch(!1){case"undefined"!=typeof(null!=(e=this.props)?e.valuesFromPaste:void 0):return this.props.onPaste;default:return function(e){var t;return t=e.clipboardData,function(){var e;return e=d.concat(W.props.valuesFromPaste(f,d,t.getData("text"))),l(e,function(){return i(m(e))})}(),x(e)}}}.call(this),placeholder:this.props.placeholder,style:this.props.style},function(){switch(!1){case"function"!=typeof this.props.restoreOnBackspace:return{restoreOnBackspace:this.props.restoreOnBackspace};default:return{}}}.call(this)),function(){switch(!1){case"function"!=typeof this.props.renderNoResultsFound:return{renderNoResultsFound:function(){return W.props.renderNoResultsFound(d,c)}};default:return{}}}.call(this)))},getComputedState:function(){var e,t,n,r,i,a,s,l,c,p,f,d,h,m,g,y,b=this;return e=this.props.hasOwnProperty("anchor")?this.props.anchor:this.state.anchor,t=this.props.hasOwnProperty("highlightedUid")?this.props.highlightedUid:this.state.highlightedUid,n=this.isOpen(),r=this.props.hasOwnProperty("search")?this.props.search:this.state.search,i=this.values(),a=v(function(e){switch(!1){case!(b.props.hasOwnProperty(e)&&b.props.hasOwnProperty(u("on-"+e+"-change"))):return function(t,n){return b.props[u("on-"+e+"-change")](t,function(){}),b.setState({},n)};case!(b.props.hasOwnProperty(e)&&!b.props.hasOwnProperty(u("on-"+e+"-change"))):return function(e,t){return t()};case!(!b.props.hasOwnProperty(e)&&b.props.hasOwnProperty(u("on-"+e+"-change"))):return function(t,n){var r;return b.setState((r={},r[e+""]=t,r),function(){return n(),b.props[u("on-"+e+"-change")](t,function(){})})};case!(!b.props.hasOwnProperty(e)&&!b.props.hasOwnProperty(u("on-"+e+"-change"))):return function(t,n){var r;return b.setState((r={},r[e+""]=t,r),n)}}})(["anchor","highlightedUid","open","search","values"]),s=a[0],l=a[1],c=a[2],p=a[3],f=a[4],d=function(){var e;switch(!1){case!(null!=(e=this.props)&&e.children):return v(function(e){var t,n,r;return null!=e&&(t=e.props),null!=t&&(n=t.value,r=t.children),{label:r,value:n}})("Array"===O.call(this.props.children).slice(8,-1)?this.props.children:[this.props.children]);default:return[]}}.call(this),h=this.props.hasOwnProperty("options")?null!=(a=this.props.options)?a:[]:d,m=this.props.filterOptions(h,i,r),g=function(){switch(!1){case"function"!=typeof this.props.createFromSearch:return this.props.createFromSearch(m,i,r);default:return null}}.call(this),y=(g?[(a=o({},g),a.newOption=!0,a)]:[]).concat(m),{anchor:e,highlightedUid:t,search:r,values:i,onAnchorChange:s,onHighlightedUidChange:l,open:n,onOpenChange:function(e,t){c(function(){switch(!1){case!("undefined"!=typeof this.props.maxValues&&this.values().length>=this.props.maxValues):return!1;default:return e}}.call(b),t)},onSearchChange:p,onValuesChange:f,filteredOptions:m,options:y}},getInitialState:function(){return{anchor:this.props.values?m(this.props.values):void 0,highlightedUid:void 0,open:!1,scrollLock:!1,search:"",values:this.props.defaultValues}},firstOptionIndexToHighlight:function(e){var t,n;return t=function(){var t;switch(!1){case 1!==e.length:return 0;case"undefined"!=typeof(null!=(t=e[0])?t.newOption:void 0):return 0;default:return a(function(e){return"boolean"==typeof e.selectable&&!e.selectable})(c(1)(e))?0:1}}(),n=this.props.hasOwnProperty("search")?this.props.search:this.state.search,this.props.firstOptionIndexToHighlight(t,e,this.values(),n)},focus:function(){this.refs.select.focus()},blur:function(){this.refs.select.blur()},highlightFirstSelectableOption:function(){this.state.open&&this.refs.select.highlightAndScrollToSelectableOption(this.firstOptionIndexToHighlight(this.getComputedState().options),1)},values:function(){return this.props.hasOwnProperty("values")?this.props.values:this.state.values},isOpen:function(){return this.props.hasOwnProperty("open")?this.props.open:this.state.open}})}).call(this)},function(e,t,n){(function(){function t(e,t){var n={}.hasOwnProperty;for(var r in t)n.call(t,r)&&(e[r]=t[r]);return e}var r,o,i,a,s,u;r=n(5).createClass,o=n(13),i=o.render,a=o.unmountComponentAtNode,s=n(124),u=n(224),e.exports=r({getDefaultProps:function(){return{parentElement:function(){return document.body}}},render:function(){
-return null},initTether:function(e){var n=this;this.node=document.createElement("div"),this.props.parentElement().appendChild(this.node),this.tether=new u(t({element:this.node,target:e.target()},e.options)),i(e.children,this.node,function(){return n.tether.position()})},destroyTether:function(){this.tether&&this.tether.destroy(),this.node&&(a(this.node),this.node.parentElement.removeChild(this.node)),this.node=this.tether=void 0},componentDidMount:function(){this.props.children&&this.initTether(this.props)},componentWillReceiveProps:function(e){var n=this;this.props.children&&!e.children?this.destroyTether():e.children&&!this.props.children?this.initTether(e):e.children&&(this.tether.setOptions(t({element:this.node,target:e.target()},e.options)),i(e.children,this.node,function(){return n.tether.position()}))},shouldComponentUpdate:function(e,t){return s(this,e,t)},componentWillUnmount:function(){this.destroyTether()}})}).call(this)},function(e,t,n){(function(){var t,r,o,i,a;t=n(5),r=t.createClass,o=t.createFactory,i=t.DOM.path,a=o(n(85)),e.exports=r({render:function(){return a({className:"react-selectize-reset-button",style:{width:8,height:8}},i({d:"M0 0 L8 8 M8 0 L 0 8"}))}})}).call(this)},function(e,t,n){(function(){function t(e,t){var n={}.hasOwnProperty;for(var r in t)n.call(t,r)&&(e[r]=t[r]);return e}var r,o,i,a,s,u,l,c;r=n(15),o=r.each,i=r.objToPairs,a=n(5),s=a.DOM.input,u=a.createClass,l=a.createFactory,c=n(13).findDOMNode,e.exports=u({displayName:"ResizableInput",render:function(){var e;return s((e=t({},this.props),e.type="input",e.className="resizable-input",e))},autosize:function(){var e,t,n,r,a;return e=t=c(this),e.style.width="0px",0===t.value.length?t.style.width=null!=t&&t.currentStyle?"4px":"2px":t.scrollWidth>0?t.style.width=2+t.scrollWidth+"px":(n=r=document.createElement("div"),n.innerHTML=t.value,function(){var e;return e=r.style,e.display="inline-block",e.width="",e}(o(function(e){var t,n;return t=e[0],n=e[1],r.style[t]=n})(i(t.currentStyle?t.currentStyle:null!=(a=document.defaultView)?a:window.getComputedStyle(t)))),document.body.appendChild(r),t.style.width=4+r.clientWidth+"px",document.body.removeChild(r))},componentDidMount:function(){this.autosize()},componentDidUpdate:function(){this.autosize()},blur:function(){return c(this).blur()},focus:function(){return c(this).focus()}})}).call(this)},function(e,t,n){(function(){function t(e,t){var n,r=function(o){return e.length>1?function(){var i=o?o.concat():[];return n=t?n||this:this,i.push.apply(i,arguments)<e.length&&arguments.length?r.call(n,i):e.apply(n,i)}:e};return r()}function r(e,t){var n={}.hasOwnProperty;for(var r in t)n.call(t,r)&&(e[r]=t[r]);return e}var o,i,a,s,u,l,c,p,f,d,h,m,v,g,y,b,C,_,w,E,T,x={}.toString;o=n(15),i=o.all,a=o.any,s=o.drop,u=o.camelize,l=o.difference,c=o.filter,p=o.find,f=o.findIndex,d=o.id,h=o.last,m=o.map,v=o.reject,g=n(16).isEqualToObject,y=n(5),b=y.createFactory,o=y.DOM,C=o.div,_=o.img,w=o.span,E=b(n(53)),T=n(28).cancelEvent,e.exports=y.createClass({displayName:"SimpleSelect",getDefaultProps:function(){return{delimiters:[],filterOptions:t(function(e,t){return c(function(e){return e.label.toLowerCase().trim().indexOf(t.toLowerCase().trim())>-1})(e)}),firstOptionIndexToHighlight:d,onBlur:function(e){},onBlurResetsInput:!0,onFocus:function(e){},onKeyboardSelectionFailed:function(e){},onPaste:function(e){},placeholder:"",renderValue:function(e){var t;return t=e.label,C({className:"simple-value"},w(null,t))},serialize:function(e){return null!=e?e.value:void 0},style:{},tether:!1,uid:d}},render:function(){var e,t,n,o,i,a,s,u,l,c,p,f,d,m,v,y,b,C,_,w,x,O,P,k,S,N,M,A,I,D,R,L,U,F,j,B,V,W=this;return e=this.getComputedState(),t=e.filteredOptions,n=e.highlightedUid,o=e.onHighlightedUidChange,i=e.onOpenChange,a=e.onSearchChange,s=e.onValueChange,u=e.open,l=e.options,c=e.search,p=e.value,f=e.values,null!=(e=this.props)&&(d=e.autofocus,m=e.autosize,v=e.cancelKeyboardEventOnSelection,y=e.delimiters,b=e.disabled,C=e.dropdownDirection,_=e.groupId,w=e.groups,x=e.groupsAsColumns,O=e.hideResetButton,P=e.name,k=e.inputProps,S=e.onBlurResetsInput,N=e.renderToggleButton,M=e.renderGroupTitle,A=e.renderResetButton,I=e.serialize,D=e.tether,R=e.tetherProps,L=e.theme,U=e.transitionEnter,F=e.transitionLeave,j=e.transitionEnterTimeout,B=e.transitionLeaveTimeout,V=e.uid),E(r(r({autofocus:d,autosize:m,cancelKeyboardEventOnSelection:v,className:"simple-select"+(this.props.className?" "+this.props.className:""),delimiters:y,disabled:b,dropdownDirection:C,groupId:_,groups:w,groupsAsColumns:x,hideResetButton:O,highlightedUid:n,onHighlightedUidChange:o,inputProps:k,name:P,onBlurResetsInput:S,renderGroupTitle:M,renderResetButton:A,renderToggleButton:N,scrollLock:this.state.scrollLock,onScrollLockChange:function(e){return W.setState({scrollLock:e})},tether:D,tetherProps:R,theme:L,transitionEnter:U,transitionEnterTimeout:j,transitionLeave:F,transitionLeaveTimeout:B,ref:"select",anchor:h(f),onAnchorChange:function(e,t){return t()},open:u,onOpenChange:i,firstOptionIndexToHighlight:function(){return W.firstOptionIndexToHighlight(l,p)},options:l,renderOption:this.props.renderOption,renderNoResultsFound:this.props.renderNoResultsFound,search:c,onSearchChange:function(e,t){return a(e,t)},values:f,onValuesChange:function(e,t){var n,r;return 0===e.length?s(void 0,function(){return t()}):(n=h(e),r=!g(n,p),function(){return function(e){return r?s(n,e):e()}}()(function(){return t(),i(!1,function(){})}))},renderValue:function(e){return u&&(W.props.editable||c.length>0)?null:W.props.renderValue(e)},onKeyboardSelectionFailed:function(e){return a("",function(){return i(!1,function(){return W.props.onKeyboardSelectionFailed(e)})})},uid:function(e){return{uid:W.props.uid(e),open:u,search:c}},serialize:function(e){return I(e[0])},onBlur:function(e){var t;t=W.props.onBlurResetsInput,function(){return function(e){return c.length>0&&t?a("",e):e()}}()(function(){return W.props.onBlur({value:p,open:u,originalEvent:e})})},onFocus:function(e){W.props.onFocus({value:p,open:u,originalEvent:e})},onPaste:function(){var e;switch(!1){case"undefined"!=typeof(null!=(e=this.props)?e.valueFromPaste:void 0):return this.props.onPaste;default:return function(e){var t,n;if(t=e.clipboardData,n=W.props.valueFromPaste(l,p,t.getData("text")))return function(){return s(n,function(){return a("",function(){return i(!1)})})}(),T(e)}}}.call(this),placeholder:this.props.placeholder,style:this.props.style},function(){switch(!1){case"function"!=typeof this.props.restoreOnBackspace:return{restoreOnBackspace:this.props.restoreOnBackspace};default:return{}}}.call(this)),function(){switch(!1){case"function"!=typeof this.props.renderNoResultsFound:return{renderNoResultsFound:function(){return W.props.renderNoResultsFound(p,c)}};default:return{}}}.call(this)))},getComputedState:function(){var e,t,n,o,i,a,s,l,c,p,f,d,h,v,g,y=this;return e=this.props.hasOwnProperty("highlightedUid")?this.props.highlightedUid:this.state.highlightedUid,t=this.isOpen(),n=this.props.hasOwnProperty("search")?this.props.search:this.state.search,o=this.value(),i=o||0===o?[o]:[],a=m(function(e){var t;return t=function(){switch(!1){case!(this.props.hasOwnProperty(e)&&this.props.hasOwnProperty(u("on-"+e+"-change"))):return function(t,n){return y.props[u("on-"+e+"-change")](t,function(){}),y.setState({},n)};case!(this.props.hasOwnProperty(e)&&!this.props.hasOwnProperty(u("on-"+e+"-change"))):return function(e,t){return t()};case!(!this.props.hasOwnProperty(e)&&this.props.hasOwnProperty(u("on-"+e+"-change"))):return function(t,n){var r;return y.setState((r={},r[e+""]=t,r),function(){return n(),y.props[u("on-"+e+"-change")](t,function(){})})};case!(!this.props.hasOwnProperty(e)&&!this.props.hasOwnProperty(u("on-"+e+"-change"))):return function(t,n){var r;return y.setState((r={},r[e+""]=t,r),n)}}}.call(y)})(["highlightedUid","open","search","value"]),s=a[0],l=a[1],c=a[2],p=a[3],f=function(){var e;switch(!1){case!(null!=(e=this.props)&&e.children):return m(function(e){var t,n,r;return null!=(t=null!=e?e.props:void 0)&&(n=t.value,r=t.children),{label:r,value:n}})("Array"===x.call(this.props.children).slice(8,-1)?this.props.children:[this.props.children]);default:return[]}}.call(this),d=this.props.hasOwnProperty("options")?null!=(a=this.props.options)?a:[]:f,h=this.props.filterOptions(d,n),v=function(){switch(!1){case"function"!=typeof this.props.createFromSearch:return this.props.createFromSearch(h,n);default:return null}}.call(this),g=(v?[(a=r({},v),a.newOption=!0,a)]:[]).concat(h),{highlightedUid:e,open:t,search:n,value:o,values:i,onHighlightedUidChange:s,onOpenChange:function(e,t){l(e,function(){if(t(),y.props.editable&&y.isOpen()&&o)return c(y.props.editable(o)+""+(1===n.length?n:""),function(){return y.highlightFirstSelectableOption(function(){})})})},onSearchChange:c,onValueChange:p,filteredOptions:h,options:g}},getInitialState:function(){var e;return{highlightedUid:void 0,open:!1,scrollLock:!1,search:"",value:null!=(e=this.props)?e.defaultValue:void 0}},firstOptionIndexToHighlight:function(e,t){var n,r,o;return n=t?f(function(e){return g(e,t)},e):void 0,r=function(){var t;switch(!1){case"undefined"==typeof n:return n;case 1!==e.length:return 0;case"undefined"!=typeof(null!=(t=e[0])?t.newOption:void 0):return 0;default:return i(function(e){return"boolean"==typeof e.selectable&&!e.selectable})(s(1)(e))?0:1}}(),o=this.props.hasOwnProperty("search")?this.props.search:this.state.search,this.props.firstOptionIndexToHighlight(r,e,t,o)},focus:function(){this.refs.select.focus()},blur:function(){this.refs.select.blur()},highlightFirstSelectableOption:function(e){var t,n,r;null==e&&(e=function(){}),this.state.open?(t=this.getComputedState(),n=t.options,r=t.value,this.refs.select.highlightAndScrollToSelectableOption(this.firstOptionIndexToHighlight(n,r),1,e)):e()},value:function(){return this.props.hasOwnProperty("value")?this.props.value:this.state.value},isOpen:function(){return this.props.hasOwnProperty("open")?this.props.open:this.state.open}})}).call(this)},function(e,t,n){(function(){var t,r,o,i,a;t=n(5),r=t.createClass,o=t.createFactory,i=t.DOM.path,a=o(n(85)),e.exports=r({getDefaultProps:function(){return{open:!1,flipped:!1}},render:function(){return a({className:"react-selectize-toggle-button",style:{width:10,height:8}},i({d:function(){switch(!1){case!(this.props.open&&!this.props.flipped||!this.props.open&&this.props.flipped):return"M0 6 L5 1 L10 6 Z";default:return"M0 1 L5 6 L10 1 Z"}}.call(this)}))}})}).call(this)},function(e,t,n){(function(){var t,r,o,i;t=n(5),r=t.createClass,o=t.DOM.div,i=n(16).isEqualToObject,e.exports=r({getDefaultProps:function(){return{}},render:function(){return o({className:"value-wrapper"},this.props.renderItem(this.props.item))},shouldComponentUpdate:function(e){var t;return!i(null!=e?e.uid:void 0,null!=(t=this.props)?t.uid:void 0)}})}).call(this)},function(e,t,n){(function(){var t,r,o,i;t=n(196),r=n(201),o=n(197),i=n(53),e.exports={HighlightedText:t,SimpleSelect:r,MultiSelect:o,ReactSelectize:i}}).call(this)},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t.__esModule=!0;var s=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},u=n(5),l=r(u),c=n(34),p=r(c),f=n(207),d=r(f),h=n(206),m=r(h),v=n(86),g=({transitionName:v.nameShape.isRequired,transitionAppear:p.default.bool,transitionEnter:p.default.bool,transitionLeave:p.default.bool,transitionAppearTimeout:(0,v.transitionTimeout)("Appear"),transitionEnterTimeout:(0,v.transitionTimeout)("Enter"),transitionLeaveTimeout:(0,v.transitionTimeout)("Leave")},{transitionAppear:!1,transitionEnter:!0,transitionLeave:!0}),y=function(e){function t(){var n,r,a;o(this,t);for(var s=arguments.length,u=Array(s),c=0;c<s;c++)u[c]=arguments[c];return n=r=i(this,e.call.apply(e,[this].concat(u))),r._wrapChild=function(e){return l.default.createElement(m.default,{name:r.props.transitionName,appear:r.props.transitionAppear,enter:r.props.transitionEnter,leave:r.props.transitionLeave,appearTimeout:r.props.transitionAppearTimeout,enterTimeout:r.props.transitionEnterTimeout,leaveTimeout:r.props.transitionLeaveTimeout},e)},a=n,i(r,a)}return a(t,e),t.prototype.render=function(){return l.default.createElement(d.default,s({},this.props,{childFactory:this._wrapChild}))},t}(l.default.Component);y.displayName="CSSTransitionGroup",y.propTypes={},y.defaultProps=g,t.default=y,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function s(e,t){return w.length?w.forEach(function(n){return e.addEventListener(n,t,!1)}):setTimeout(t,0),function(){w.length&&w.forEach(function(n){return e.removeEventListener(n,t,!1)})}}t.__esModule=!0;var u=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},l=n(96),c=r(l),p=n(98),f=r(p),d=n(100),h=r(d),m=n(99),v=n(5),g=r(v),y=n(34),b=r(y),C=n(13),_=n(86),w=[];m.transitionEnd&&w.push(m.transitionEnd),m.animationEnd&&w.push(m.animationEnd);var E=({children:b.default.node,name:_.nameShape.isRequired,appear:b.default.bool,enter:b.default.bool,leave:b.default.bool,appearTimeout:b.default.number,enterTimeout:b.default.number,leaveTimeout:b.default.number},function(e){function t(){var n,r,a;o(this,t);for(var s=arguments.length,u=Array(s),l=0;l<s;l++)u[l]=arguments[l];return n=r=i(this,e.call.apply(e,[this].concat(u))),r.componentWillAppear=function(e){r.props.appear?r.transition("appear",e,r.props.appearTimeout):e()},r.componentWillEnter=function(e){r.props.enter?r.transition("enter",e,r.props.enterTimeout):e()},r.componentWillLeave=function(e){r.props.leave?r.transition("leave",e,r.props.leaveTimeout):e()},a=n,i(r,a)}return a(t,e),t.prototype.componentWillMount=function(){this.classNameAndNodeQueue=[],this.transitionTimeouts=[]},t.prototype.componentWillUnmount=function(){this.unmounted=!0,this.timeout&&clearTimeout(this.timeout),this.transitionTimeouts.forEach(function(e){clearTimeout(e)}),this.classNameAndNodeQueue.length=0},t.prototype.transition=function(e,t,n){var r=(0,C.findDOMNode)(this);if(!r)return void(t&&t());var o=this.props.name[e]||this.props.name+"-"+e,i=this.props.name[e+"Active"]||o+"-active",a=null,u=void 0;(0,c.default)(r,o),this.queueClassAndNode(i,r);var l=function(e){e&&e.target!==r||(clearTimeout(a),u&&u(),(0,f.default)(r,o),(0,f.default)(r,i),u&&u(),t&&t())};n?(a=setTimeout(l,n),this.transitionTimeouts.push(a)):m.transitionEnd&&(u=s(r,l))},t.prototype.queueClassAndNode=function(e,t){var n=this;this.classNameAndNodeQueue.push({className:e,node:t}),this.rafHandle||(this.rafHandle=(0,h.default)(function(){return n.flushClassNameAndNodeQueue()}))},t.prototype.flushClassNameAndNodeQueue=function(){this.unmounted||this.classNameAndNodeQueue.forEach(function(e){e.node.scrollTop,(0,c.default)(e.node,e.className)}),this.classNameAndNodeQueue.length=0,this.rafHandle=null},t.prototype.render=function(){var e=u({},this.props);return delete e.name,delete e.appear,delete e.enter,delete e.leave,delete e.appearTimeout,delete e.enterTimeout,delete e.leaveTimeout,delete e.children,g.default.cloneElement(g.default.Children.only(this.props.children),e)},t}(g.default.Component));E.displayName="CSSTransitionGroupChild",E.propTypes={},t.default=E,e.exports=t.default},function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function o(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function a(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}t.__esModule=!0;var s=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},u=n(95),l=r(u),c=n(5),p=r(c),f=n(34),d=r(f),h=n(225),m=(r(h),n(210)),v=({component:d.default.any,childFactory:d.default.func,children:d.default.node},{component:"span",childFactory:function(e){return e}}),g=function(e){function t(n,r){o(this,t);var a=i(this,e.call(this,n,r));return a.performAppear=function(e,t){a.currentlyTransitioningKeys[e]=!0,t.componentWillAppear?t.componentWillAppear(a._handleDoneAppearing.bind(a,e,t)):a._handleDoneAppearing(e,t)},a._handleDoneAppearing=function(e,t){t.componentDidAppear&&t.componentDidAppear(),delete a.currentlyTransitioningKeys[e];var n=(0,m.getChildMapping)(a.props.children);n&&n.hasOwnProperty(e)||a.performLeave(e,t)},a.performEnter=function(e,t){a.currentlyTransitioningKeys[e]=!0,t.componentWillEnter?t.componentWillEnter(a._handleDoneEntering.bind(a,e,t)):a._handleDoneEntering(e,t)},a._handleDoneEntering=function(e,t){t.componentDidEnter&&t.componentDidEnter(),delete a.currentlyTransitioningKeys[e];var n=(0,m.getChildMapping)(a.props.children);n&&n.hasOwnProperty(e)||a.performLeave(e,t)},a.performLeave=function(e,t){a.currentlyTransitioningKeys[e]=!0,t.componentWillLeave?t.componentWillLeave(a._handleDoneLeaving.bind(a,e,t)):a._handleDoneLeaving(e,t)},a._handleDoneLeaving=function(e,t){t.componentDidLeave&&t.componentDidLeave(),delete a.currentlyTransitioningKeys[e];var n=(0,m.getChildMapping)(a.props.children);n&&n.hasOwnProperty(e)?a.keysToEnter.push(e):a.setState(function(t){var n=s({},t.children);return delete n[e],{children:n}})},a.childRefs=Object.create(null),a.state={children:(0,m.getChildMapping)(n.children)},a}return a(t,e),t.prototype.componentWillMount=function(){this.currentlyTransitioningKeys={},this.keysToEnter=[],this.keysToLeave=[]},t.prototype.componentDidMount=function(){var e=this.state.children;for(var t in e)e[t]&&this.performAppear(t,this.childRefs[t])},t.prototype.componentWillReceiveProps=function(e){var t=(0,m.getChildMapping)(e.children),n=this.state.children;this.setState({children:(0,m.mergeChildMappings)(n,t)});for(var r in t){var o=n&&n.hasOwnProperty(r);!t[r]||o||this.currentlyTransitioningKeys[r]||this.keysToEnter.push(r)}for(var i in n){var a=t&&t.hasOwnProperty(i);!n[i]||a||this.currentlyTransitioningKeys[i]||this.keysToLeave.push(i)}},t.prototype.componentDidUpdate=function(){var e=this,t=this.keysToEnter;this.keysToEnter=[],t.forEach(function(t){return e.performEnter(t,e.childRefs[t])});var n=this.keysToLeave;this.keysToLeave=[],n.forEach(function(t){return e.performLeave(t,e.childRefs[t])})},t.prototype.render=function(){var e=this,t=[],n=function(n){var r=e.state.children[n];if(r){var o="string"!=typeof r.ref,i=e.props.childFactory(r),a=function(t){e.childRefs[n]=t};i===r&&o&&(a=(0,l.default)(r.ref,a)),t.push(p.default.cloneElement(i,{key:n,ref:a}))}};for(var r in this.state.children)n(r);var o=s({},this.props);return delete o.transitionLeave,delete o.transitionName,delete o.transitionAppear,delete o.transitionEnter,delete o.childFactory,delete o.transitionLeaveTimeout,delete o.transitionEnterTimeout,delete o.transitionAppearTimeout,delete o.component,p.default.createElement(this.props.component,o,t)},t}(p.default.Component);g.displayName="TransitionGroup",g.propTypes={},g.defaultProps=v,t.default=g,e.exports=t.default},function(e,t,n){"use strict";function r(){}function o(){}var i=n(209);o.resetWarningCache=r,e.exports=function(){function e(e,t,n,r,o,a){if(a!==i){var s=new Error("Calling PropTypes validators directly is not supported by the `prop-types` package. Use PropTypes.checkPropTypes() to call them. Read more at http://fb.me/use-check-prop-types");throw s.name="Invariant Violation",s}}function t(){return e}e.isRequired=e;var n={array:e,bigint:e,bool:e,func:e,number:e,object:e,string:e,symbol:e,any:e,arrayOf:t,element:e,elementType:e,instanceOf:t,node:e,objectOf:t,oneOf:t,oneOfType:t,shape:t,exact:t,checkPropTypes:o,resetWarningCache:r};return n.PropTypes=n,n}},function(e,t){"use strict";var n="SECRET_DO_NOT_PASS_THIS_OR_YOU_WILL_BE_FIRED";e.exports=n},function(e,t,n){"use strict";function r(e){if(!e)return e;var t={};return i.Children.map(e,function(e){return e}).forEach(function(e){t[e.key]=e}),t}function o(e,t){function n(n){return t.hasOwnProperty(n)?t[n]:e[n]}e=e||{},t=t||{};var r={},o=[];for(var i in e)t.hasOwnProperty(i)?o.length&&(r[i]=o,o=[]):o.push(i);var a=void 0,s={};for(var u in t){if(r.hasOwnProperty(u))for(a=0;a<r[u].length;a++){var l=r[u][a];s[r[u][a]]=n(l)}s[u]=n(u)}for(a=0;a<o.length;a++)s[o[a]]=n(o[a]);return s}t.__esModule=!0,t.getChildMapping=r,t.mergeChildMappings=o;var i=n(5)},41,[228,22],function(e,t,n){"use strict";function r(e){return(""+e).replace(C,"$&/")}function o(e,t){this.func=e,this.context=t,this.count=0}function i(e,t,n){var r=e.func,o=e.context;r.call(o,t,e.count++)}function a(e,t,n){if(null==e)return e;var r=o.getPooled(t,n);g(e,i,r),o.release(r)}function s(e,t,n,r){this.result=e,this.keyPrefix=t,this.func=n,this.context=r,this.count=0}function u(e,t,n){var o=e.result,i=e.keyPrefix,a=e.func,s=e.context,u=a.call(s,t,e.count++);Array.isArray(u)?l(u,o,n,v.thatReturnsArgument):null!=u&&(m.isValidElement(u)&&(u=m.cloneAndReplaceKey(u,i+(!u.key||t&&t.key===u.key?"":r(u.key)+"/")+n)),o.push(u))}function l(e,t,n,o,i){var a="";null!=n&&(a=r(n)+"/");var l=s.getPooled(t,a,o,i);g(e,u,l),s.release(l)}function c(e,t,n){if(null==e)return e;var r=[];return l(e,r,null,t,n),r}function p(e,t,n){return null}function f(e,t){return g(e,p,null)}function d(e){var t=[];return l(e,t,null,v.thatReturnsArgument),t}var h=n(212),m=n(21),v=n(8),g=n(223),y=h.twoArgumentPooler,b=h.fourArgumentPooler,C=/\/+/g;o.prototype.destructor=function(){this.func=null,this.context=null,this.count=0},h.addPoolingTo(o,y),s.prototype.destructor=function(){this.result=null,this.keyPrefix=null,this.func=null,this.context=null,this.count=0},h.addPoolingTo(s,b);var _={forEach:a,map:c,mapIntoWithKeyPrefixInternal:l,count:f,toArray:d};e.exports=_},function(e,t,n){"use strict";function r(e){return e}function o(e,t){var n=C.hasOwnProperty(t)?C[t]:null;w.hasOwnProperty(t)&&("OVERRIDE_BASE"!==n?f("73",t):void 0),e&&("DEFINE_MANY"!==n&&"DEFINE_MANY_MERGED"!==n?f("74",t):void 0)}function i(e,t){if(t){"function"==typeof t?f("75"):void 0,m.isValidElement(t)?f("76"):void 0;var n=e.prototype,r=n.__reactAutoBindPairs;t.hasOwnProperty(y)&&_.mixins(e,t.mixins);for(var i in t)if(t.hasOwnProperty(i)&&i!==y){var a=t[i],s=n.hasOwnProperty(i);if(o(s,i),_.hasOwnProperty(i))_[i](e,a);else{var c=C.hasOwnProperty(i),p="function"==typeof a,d=p&&!c&&!s&&t.autobind!==!1;if(d)r.push(i,a),n[i]=a;else if(s){var h=C[i];!c||"DEFINE_MANY_MERGED"!==h&&"DEFINE_MANY"!==h?f("77",h,i):void 0,"DEFINE_MANY_MERGED"===h?n[i]=u(n[i],a):"DEFINE_MANY"===h&&(n[i]=l(n[i],a))}else n[i]=a}}}else;}function a(e,t){if(t)for(var n in t){var r=t[n];if(t.hasOwnProperty(n)){var o=n in _;o?f("78",n):void 0;var i=n in e;i?f("79",n):void 0,e[n]=r}}}function s(e,t){e&&t&&"object"==typeof e&&"object"==typeof t?void 0:f("80");for(var n in t)t.hasOwnProperty(n)&&(void 0!==e[n]?f("81",n):void 0,e[n]=t[n]);return e}function u(e,t){return function(){var n=e.apply(this,arguments),r=t.apply(this,arguments);if(null==n)return r;if(null==r)return n;var o={};return s(o,n),s(o,r),o}}function l(e,t){return function(){e.apply(this,arguments),t.apply(this,arguments)}}function c(e,t){var n=t.bind(e);return n}function p(e){for(var t=e.__reactAutoBindPairs,n=0;n<t.length;n+=2){var r=t[n],o=t[n+1];e[r]=c(e,o)}}var f=n(22),d=n(4),h=n(54),m=n(21),v=(n(216),n(55)),g=n(23),y=(n(1),n(2),"mixins"),b=[],C={mixins:"DEFINE_MANY",statics:"DEFINE_MANY",propTypes:"DEFINE_MANY",contextTypes:"DEFINE_MANY",childContextTypes:"DEFINE_MANY",getDefaultProps:"DEFINE_MANY_MERGED",getInitialState:"DEFINE_MANY_MERGED",getChildContext:"DEFINE_MANY_MERGED",render:"DEFINE_ONCE",componentWillMount:"DEFINE_MANY",componentDidMount:"DEFINE_MANY",componentWillReceiveProps:"DEFINE_MANY",shouldComponentUpdate:"DEFINE_ONCE",componentWillUpdate:"DEFINE_MANY",componentDidUpdate:"DEFINE_MANY",componentWillUnmount:"DEFINE_MANY",updateComponent:"OVERRIDE_BASE"},_={displayName:function(e,t){e.displayName=t},mixins:function(e,t){if(t)for(var n=0;n<t.length;n++)i(e,t[n])},childContextTypes:function(e,t){e.childContextTypes=d({},e.childContextTypes,t)},contextTypes:function(e,t){e.contextTypes=d({},e.contextTypes,t)},getDefaultProps:function(e,t){e.getDefaultProps?e.getDefaultProps=u(e.getDefaultProps,t):e.getDefaultProps=t},propTypes:function(e,t){e.propTypes=d({},e.propTypes,t)},statics:function(e,t){a(e,t)},autobind:function(){}},w={replaceState:function(e,t){this.updater.enqueueReplaceState(this,e),t&&this.updater.enqueueCallback(this,t,"replaceState")},isMounted:function(){return this.updater.isMounted(this)}},E=function(){};d(E.prototype,h.prototype,w);var T={createClass:function(e){var t=r(function(e,n,r){this.__reactAutoBindPairs.length&&p(this),this.props=e,this.context=n,this.refs=g,this.updater=r||v,this.state=null;var o=this.getInitialState?this.getInitialState():null;"object"!=typeof o||Array.isArray(o)?f("82",t.displayName||"ReactCompositeComponent"):void 0,this.state=o});t.prototype=new E,t.prototype.constructor=t,t.prototype.__reactAutoBindPairs=[],b.forEach(i.bind(null,t)),i(t,e),t.getDefaultProps&&(t.defaultProps=t.getDefaultProps()),t.prototype.render?void 0:f("83");for(var n in C)t.prototype[n]||(t.prototype[n]=null);return t},injection:{injectMixin:function(e){b.push(e)}}};e.exports=T},function(e,t,n){"use strict";var r=n(21),o=r.createFactory,i={a:o("a"),abbr:o("abbr"),address:o("address"),area:o("area"),article:o("article"),aside:o("aside"),audio:o("audio"),b:o("b"),base:o("base"),bdi:o("bdi"),bdo:o("bdo"),big:o("big"),blockquote:o("blockquote"),body:o("body"),br:o("br"),button:o("button"),canvas:o("canvas"),caption:o("caption"),cite:o("cite"),code:o("code"),col:o("col"),colgroup:o("colgroup"),data:o("data"),datalist:o("datalist"),dd:o("dd"),del:o("del"),details:o("details"),dfn:o("dfn"),dialog:o("dialog"),div:o("div"),dl:o("dl"),dt:o("dt"),em:o("em"),embed:o("embed"),fieldset:o("fieldset"),figcaption:o("figcaption"),figure:o("figure"),footer:o("footer"),form:o("form"),h1:o("h1"),h2:o("h2"),h3:o("h3"),h4:o("h4"),h5:o("h5"),h6:o("h6"),head:o("head"),header:o("header"),hgroup:o("hgroup"),hr:o("hr"),html:o("html"),i:o("i"),iframe:o("iframe"),img:o("img"),input:o("input"),ins:o("ins"),kbd:o("kbd"),keygen:o("keygen"),label:o("label"),legend:o("legend"),li:o("li"),link:o("link"),main:o("main"),map:o("map"),mark:o("mark"),menu:o("menu"),menuitem:o("menuitem"),meta:o("meta"),meter:o("meter"),nav:o("nav"),noscript:o("noscript"),object:o("object"),ol:o("ol"),optgroup:o("optgroup"),option:o("option"),output:o("output"),p:o("p"),param:o("param"),picture:o("picture"),pre:o("pre"),progress:o("progress"),q:o("q"),rp:o("rp"),rt:o("rt"),ruby:o("ruby"),s:o("s"),samp:o("samp"),script:o("script"),section:o("section"),select:o("select"),small:o("small"),source:o("source"),span:o("span"),strong:o("strong"),style:o("style"),sub:o("sub"),summary:o("summary"),sup:o("sup"),table:o("table"),tbody:o("tbody"),td:o("td"),textarea:o("textarea"),tfoot:o("tfoot"),th:o("th"),thead:o("thead"),time:o("time"),title:o("title"),tr:o("tr"),track:o("track"),u:o("u"),ul:o("ul"),var:o("var"),video:o("video"),wbr:o("wbr"),circle:o("circle"),clipPath:o("clipPath"),defs:o("defs"),ellipse:o("ellipse"),g:o("g"),image:o("image"),line:o("line"),linearGradient:o("linearGradient"),mask:o("mask"),path:o("path"),pattern:o("pattern"),polygon:o("polygon"),polyline:o("polyline"),radialGradient:o("radialGradient"),rect:o("rect"),stop:o("stop"),svg:o("svg"),text:o("text"),tspan:o("tspan")};e.exports=i},function(e,t,n){"use strict";var r={};e.exports=r},function(e,t,n){"use strict";var r=n(21),o=r.isValidElement,i=n(62);e.exports=i(o)},function(e,t,n){"use strict";function r(e,t,n){this.props=e,this.context=t,this.refs=u,this.updater=n||s}function o(){}var i=n(4),a=n(54),s=n(55),u=n(23);o.prototype=a.prototype,r.prototype=new o,r.prototype.constructor=r,i(r.prototype,a.prototype),r.prototype.isPureReactComponent=!0,e.exports=r},164,183,function(e,t){"use strict";function n(){return r++}var r=1;e.exports=n},function(e,t,n){"use strict";function r(e){return i.isValidElement(e)?void 0:o("143"),e}var o=n(22),i=n(21);n(1);e.exports=r},function(e,t,n){"use strict";function r(e,t){return e&&"object"==typeof e&&null!=e.key?l.escape(e.key):t.toString(36)}function o(e,t,n,i){var f=typeof e;if("undefined"!==f&&"boolean"!==f||(e=null),null===e||"string"===f||"number"===f||"object"===f&&e.$$typeof===s)return n(i,e,""===t?c+r(e,0):t),1;var d,h,m=0,v=""===t?c:t+p;if(Array.isArray(e))for(var g=0;g<e.length;g++)d=e[g],h=v+r(d,g),m+=o(d,h,n,i);else{var y=u(e);if(y){var b,C=y.call(e);if(y!==e.entries)for(var _=0;!(b=C.next()).done;)d=b.value,h=v+r(d,_++),m+=o(d,h,n,i);else for(;!(b=C.next()).done;){var w=b.value;w&&(d=w[1],h=v+l.escape(w[0])+p+r(d,0),m+=o(d,h,n,i))}}else if("object"===f){var E="",T=String(e);a("31","[object Object]"===T?"object with keys {"+Object.keys(e).join(", ")+"}":T,E)}}return m}function i(e,t,n){return null==e?0:o(e,"",t,n)}var a=n(22),s=(n(12),n(88)),u=n(220),l=(n(1),n(211)),c=(n(2),"."),p=":";e.exports=i},function(e,t,n){var r,o,i;!function(n,a){o=[],r=a,i="function"==typeof r?r.apply(t,o):r,!(void 0!==i&&(e.exports=i))}(this,function(){"use strict";function e(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function t(e){var n=e.getBoundingClientRect(),r={};for(var o in n)r[o]=n[o];try{if(e.ownerDocument!==document){var i=e.ownerDocument.defaultView.frameElement;if(i){var a=t(i);r.top+=a.top,r.bottom+=a.top,r.left+=a.left,r.right+=a.left}}}catch(e){}return r}function n(e){var t=getComputedStyle(e)||{},n=t.position,r=[];if("fixed"===n)return[e];for(var o=e;(o=o.parentNode)&&o&&1===o.nodeType;){var i=void 0;try{i=getComputedStyle(o)}catch(e){}if("undefined"==typeof i||null===i)return r.push(o),r;var a=i,s=a.overflow,u=a.overflowX,l=a.overflowY;/(auto|scroll|overlay)/.test(s+l+u)&&("absolute"!==n||["relative","absolute","fixed"].indexOf(i.position)>=0)&&r.push(o)}return r.push(e.ownerDocument.body),e.ownerDocument!==document&&r.push(e.ownerDocument.defaultView),r}function r(){w&&document.body.removeChild(w),w=null}function o(e){var n=void 0;e===document?(n=document,e=document.documentElement):n=e.ownerDocument;var r=n.documentElement,o=t(e),i=x();return o.top-=i.top,o.left-=i.left,"undefined"==typeof o.width&&(o.width=document.body.scrollWidth-o.left-o.right),"undefined"==typeof o.height&&(o.height=document.body.scrollHeight-o.top-o.bottom),o.top=o.top-r.clientTop,o.left=o.left-r.clientLeft,
-o.right=n.body.clientWidth-o.width-o.left,o.bottom=n.body.clientHeight-o.height-o.top,o}function i(e){return e.offsetParent||document.documentElement}function a(){if(O)return O;var e=document.createElement("div");e.style.width="100%",e.style.height="200px";var t=document.createElement("div");s(t.style,{position:"absolute",top:0,left:0,pointerEvents:"none",visibility:"hidden",width:"200px",height:"150px",overflow:"hidden"}),t.appendChild(e),document.body.appendChild(t);var n=e.offsetWidth;t.style.overflow="scroll";var r=e.offsetWidth;n===r&&(r=t.clientWidth),document.body.removeChild(t);var o=n-r;return O={width:o,height:o}}function s(){var e=arguments.length<=0||void 0===arguments[0]?{}:arguments[0],t=[];return Array.prototype.push.apply(t,arguments),t.slice(1).forEach(function(t){if(t)for(var n in t)({}).hasOwnProperty.call(t,n)&&(e[n]=t[n])}),e}function u(e,t){if("undefined"!=typeof e.classList)t.split(" ").forEach(function(t){t.trim()&&e.classList.remove(t)});else{var n=new RegExp("(^| )"+t.split(" ").join("|")+"( |$)","gi"),r=p(e).replace(n," ");f(e,r)}}function l(e,t){if("undefined"!=typeof e.classList)t.split(" ").forEach(function(t){t.trim()&&e.classList.add(t)});else{u(e,t);var n=p(e)+(" "+t);f(e,n)}}function c(e,t){if("undefined"!=typeof e.classList)return e.classList.contains(t);var n=p(e);return new RegExp("(^| )"+t+"( |$)","gi").test(n)}function p(e){return e.className instanceof e.ownerDocument.defaultView.SVGAnimatedString?e.className.baseVal:e.className}function f(e,t){e.setAttribute("class",t)}function d(e,t,n){n.forEach(function(n){t.indexOf(n)===-1&&c(e,n)&&u(e,n)}),t.forEach(function(t){c(e,t)||l(e,t)})}function e(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function h(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function m(e,t){var n=arguments.length<=2||void 0===arguments[2]?1:arguments[2];return e+n>=t&&t>=e-n}function v(){return"object"==typeof performance&&"function"==typeof performance.now?performance.now():+new Date}function g(){for(var e={top:0,left:0},t=arguments.length,n=Array(t),r=0;r<t;r++)n[r]=arguments[r];return n.forEach(function(t){var n=t.top,r=t.left;"string"==typeof n&&(n=parseFloat(n,10)),"string"==typeof r&&(r=parseFloat(r,10)),e.top+=n,e.left+=r}),e}function y(e,t){return"string"==typeof e.left&&e.left.indexOf("%")!==-1&&(e.left=parseFloat(e.left,10)/100*t.width),"string"==typeof e.top&&e.top.indexOf("%")!==-1&&(e.top=parseFloat(e.top,10)/100*t.height),e}function b(e,t){return"scrollParent"===t?t=e.scrollParents[0]:"window"===t&&(t=[pageXOffset,pageYOffset,innerWidth+pageXOffset,innerHeight+pageYOffset]),t===document&&(t=t.documentElement),"undefined"!=typeof t.nodeType&&!function(){var e=t,n=o(t),r=n,i=getComputedStyle(t);if(t=[r.left,r.top,n.width+r.left,n.height+r.top],e.ownerDocument!==document){var a=e.ownerDocument.defaultView;t[0]+=a.pageXOffset,t[1]+=a.pageYOffset,t[2]+=a.pageXOffset,t[3]+=a.pageYOffset}K.forEach(function(e,n){e=e[0].toUpperCase()+e.substr(1),"Top"===e||"Left"===e?t[n]+=parseFloat(i["border"+e+"Width"]):t[n]-=parseFloat(i["border"+e+"Width"])})}(),t}var C=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),_=void 0;"undefined"==typeof _&&(_={modules:[]});var w=null,E=function(){var e=0;return function(){return++e}}(),T={},x=function(){var e=w;e&&document.body.contains(e)||(e=document.createElement("div"),e.setAttribute("data-tether-id",E()),s(e.style,{top:0,left:0,position:"absolute"}),document.body.appendChild(e),w=e);var n=e.getAttribute("data-tether-id");return"undefined"==typeof T[n]&&(T[n]=t(e),k(function(){delete T[n]})),T[n]},O=null,P=[],k=function(e){P.push(e)},S=function(){for(var e=void 0;e=P.pop();)e()},N=function(){function t(){e(this,t)}return C(t,[{key:"on",value:function(e,t,n){var r=!(arguments.length<=3||void 0===arguments[3])&&arguments[3];"undefined"==typeof this.bindings&&(this.bindings={}),"undefined"==typeof this.bindings[e]&&(this.bindings[e]=[]),this.bindings[e].push({handler:t,ctx:n,once:r})}},{key:"once",value:function(e,t,n){this.on(e,t,n,!0)}},{key:"off",value:function(e,t){if("undefined"!=typeof this.bindings&&"undefined"!=typeof this.bindings[e])if("undefined"==typeof t)delete this.bindings[e];else for(var n=0;n<this.bindings[e].length;)this.bindings[e][n].handler===t?this.bindings[e].splice(n,1):++n}},{key:"trigger",value:function(e){if("undefined"!=typeof this.bindings&&this.bindings[e]){for(var t=0,n=arguments.length,r=Array(n>1?n-1:0),o=1;o<n;o++)r[o-1]=arguments[o];for(;t<this.bindings[e].length;){var i=this.bindings[e][t],a=i.handler,s=i.ctx,u=i.once,l=s;"undefined"==typeof l&&(l=this),a.apply(l,r),u?this.bindings[e].splice(t,1):++t}}}}]),t}();_.Utils={getActualBoundingClientRect:t,getScrollParents:n,getBounds:o,getOffsetParent:i,extend:s,addClass:l,removeClass:u,hasClass:c,updateClasses:d,defer:k,flush:S,uniqueId:E,Evented:N,getScrollBarSize:a,removeUtilElements:r};var M=function(){function e(e,t){var n=[],r=!0,o=!1,i=void 0;try{for(var a,s=e[Symbol.iterator]();!(r=(a=s.next()).done)&&(n.push(a.value),!t||n.length!==t);r=!0);}catch(e){o=!0,i=e}finally{try{!r&&s.return&&s.return()}finally{if(o)throw i}}return n}return function(t,n){if(Array.isArray(t))return t;if(Symbol.iterator in Object(t))return e(t,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),C=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),A=function(e,t,n){for(var r=!0;r;){var o=e,i=t,a=n;r=!1,null===o&&(o=Function.prototype);var s=Object.getOwnPropertyDescriptor(o,i);if(void 0!==s){if("value"in s)return s.value;var u=s.get;if(void 0===u)return;return u.call(a)}var l=Object.getPrototypeOf(o);if(null===l)return;e=l,t=i,n=a,r=!0,s=l=void 0}};if("undefined"==typeof _)throw new Error("You must include the utils.js file before tether.js");var I=_.Utils,n=I.getScrollParents,o=I.getBounds,i=I.getOffsetParent,s=I.extend,l=I.addClass,u=I.removeClass,d=I.updateClasses,k=I.defer,S=I.flush,a=I.getScrollBarSize,r=I.removeUtilElements,D=function(){if("undefined"==typeof document)return"";for(var e=document.createElement("div"),t=["transform","WebkitTransform","OTransform","MozTransform","msTransform"],n=0;n<t.length;++n){var r=t[n];if(void 0!==e.style[r])return r}}(),R=[],L=function(){R.forEach(function(e){e.position(!1)}),S()};!function(){var e=null,t=null,n=null,r=function r(){return"undefined"!=typeof t&&t>16?(t=Math.min(t-16,250),void(n=setTimeout(r,250))):void("undefined"!=typeof e&&v()-e<10||(null!=n&&(clearTimeout(n),n=null),e=v(),L(),t=v()-e))};"undefined"!=typeof window&&"undefined"!=typeof window.addEventListener&&["resize","scroll","touchmove"].forEach(function(e){window.addEventListener(e,r)})}();var U={center:"center",left:"right",right:"left"},F={middle:"middle",top:"bottom",bottom:"top"},j={top:0,left:0,middle:"50%",center:"50%",bottom:"100%",right:"100%"},B=function(e,t){var n=e.left,r=e.top;return"auto"===n&&(n=U[t.left]),"auto"===r&&(r=F[t.top]),{left:n,top:r}},V=function(e){var t=e.left,n=e.top;return"undefined"!=typeof j[e.left]&&(t=j[e.left]),"undefined"!=typeof j[e.top]&&(n=j[e.top]),{left:t,top:n}},W=function(e){var t=e.split(" "),n=M(t,2),r=n[0],o=n[1];return{top:r,left:o}},H=W,q=function(t){function c(t){var n=this;e(this,c),A(Object.getPrototypeOf(c.prototype),"constructor",this).call(this),this.position=this.position.bind(this),R.push(this),this.history=[],this.setOptions(t,!1),_.modules.forEach(function(e){"undefined"!=typeof e.initialize&&e.initialize.call(n)}),this.position()}return h(c,t),C(c,[{key:"getClass",value:function(){var e=arguments.length<=0||void 0===arguments[0]?"":arguments[0],t=this.options.classes;return"undefined"!=typeof t&&t[e]?this.options.classes[e]:this.options.classPrefix?this.options.classPrefix+"-"+e:e}},{key:"setOptions",value:function(e){var t=this,r=arguments.length<=1||void 0===arguments[1]||arguments[1],o={offset:"0 0",targetOffset:"0 0",targetAttachment:"auto auto",classPrefix:"tether"};this.options=s(o,e);var i=this.options,a=i.element,u=i.target,c=i.targetModifier;if(this.element=a,this.target=u,this.targetModifier=c,"viewport"===this.target?(this.target=document.body,this.targetModifier="visible"):"scroll-handle"===this.target&&(this.target=document.body,this.targetModifier="scroll-handle"),["element","target"].forEach(function(e){if("undefined"==typeof t[e])throw new Error("Tether Error: Both element and target must be defined");"undefined"!=typeof t[e].jquery?t[e]=t[e][0]:"string"==typeof t[e]&&(t[e]=document.querySelector(t[e]))}),l(this.element,this.getClass("element")),this.options.addTargetClasses!==!1&&l(this.target,this.getClass("target")),!this.options.attachment)throw new Error("Tether Error: You must provide an attachment");this.targetAttachment=H(this.options.targetAttachment),this.attachment=H(this.options.attachment),this.offset=W(this.options.offset),this.targetOffset=W(this.options.targetOffset),"undefined"!=typeof this.scrollParents&&this.disable(),"scroll-handle"===this.targetModifier?this.scrollParents=[this.target]:this.scrollParents=n(this.target),this.options.enabled!==!1&&this.enable(r)}},{key:"getTargetBounds",value:function(){if("undefined"==typeof this.targetModifier)return o(this.target);if("visible"===this.targetModifier){if(this.target===document.body)return{top:pageYOffset,left:pageXOffset,height:innerHeight,width:innerWidth};var e=o(this.target),t={height:e.height,width:e.width,top:e.top,left:e.left};return t.height=Math.min(t.height,e.height-(pageYOffset-e.top)),t.height=Math.min(t.height,e.height-(e.top+e.height-(pageYOffset+innerHeight))),t.height=Math.min(innerHeight,t.height),t.height-=2,t.width=Math.min(t.width,e.width-(pageXOffset-e.left)),t.width=Math.min(t.width,e.width-(e.left+e.width-(pageXOffset+innerWidth))),t.width=Math.min(innerWidth,t.width),t.width-=2,t.top<pageYOffset&&(t.top=pageYOffset),t.left<pageXOffset&&(t.left=pageXOffset),t}if("scroll-handle"===this.targetModifier){var e=void 0,n=this.target;n===document.body?(n=document.documentElement,e={left:pageXOffset,top:pageYOffset,height:innerHeight,width:innerWidth}):e=o(n);var r=getComputedStyle(n),i=n.scrollWidth>n.clientWidth||[r.overflow,r.overflowX].indexOf("scroll")>=0||this.target!==document.body,a=0;i&&(a=15);var s=e.height-parseFloat(r.borderTopWidth)-parseFloat(r.borderBottomWidth)-a,t={width:15,height:.975*s*(s/n.scrollHeight),left:e.left+e.width-parseFloat(r.borderLeftWidth)-15},u=0;s<408&&this.target===document.body&&(u=-11e-5*Math.pow(s,2)-.00727*s+22.58),this.target!==document.body&&(t.height=Math.max(t.height,24));var l=this.target.scrollTop/(n.scrollHeight-s);return t.top=l*(s-t.height-u)+e.top+parseFloat(r.borderTopWidth),this.target===document.body&&(t.height=Math.max(t.height,24)),t}}},{key:"clearCache",value:function(){this._cache={}}},{key:"cache",value:function(e,t){return"undefined"==typeof this._cache&&(this._cache={}),"undefined"==typeof this._cache[e]&&(this._cache[e]=t.call(this)),this._cache[e]}},{key:"enable",value:function(){var e=this,t=arguments.length<=0||void 0===arguments[0]||arguments[0];this.options.addTargetClasses!==!1&&l(this.target,this.getClass("enabled")),l(this.element,this.getClass("enabled")),this.enabled=!0,this.scrollParents.forEach(function(t){t!==e.target.ownerDocument&&t.addEventListener("scroll",e.position)}),t&&this.position()}},{key:"disable",value:function(){var e=this;u(this.target,this.getClass("enabled")),u(this.element,this.getClass("enabled")),this.enabled=!1,"undefined"!=typeof this.scrollParents&&this.scrollParents.forEach(function(t){t.removeEventListener("scroll",e.position)})}},{key:"destroy",value:function(){var e=this;this.disable(),R.forEach(function(t,n){t===e&&R.splice(n,1)}),0===R.length&&r()}},{key:"updateAttachClasses",value:function(e,t){var n=this;e=e||this.attachment,t=t||this.targetAttachment;var r=["left","top","bottom","right","middle","center"];"undefined"!=typeof this._addAttachClasses&&this._addAttachClasses.length&&this._addAttachClasses.splice(0,this._addAttachClasses.length),"undefined"==typeof this._addAttachClasses&&(this._addAttachClasses=[]);var o=this._addAttachClasses;e.top&&o.push(this.getClass("element-attached")+"-"+e.top),e.left&&o.push(this.getClass("element-attached")+"-"+e.left),t.top&&o.push(this.getClass("target-attached")+"-"+t.top),t.left&&o.push(this.getClass("target-attached")+"-"+t.left);var i=[];r.forEach(function(e){i.push(n.getClass("element-attached")+"-"+e),i.push(n.getClass("target-attached")+"-"+e)}),k(function(){"undefined"!=typeof n._addAttachClasses&&(d(n.element,n._addAttachClasses,i),n.options.addTargetClasses!==!1&&d(n.target,n._addAttachClasses,i),delete n._addAttachClasses)})}},{key:"position",value:function(){var e=this,t=arguments.length<=0||void 0===arguments[0]||arguments[0];if(this.enabled){this.clearCache();var n=B(this.targetAttachment,this.attachment);this.updateAttachClasses(this.attachment,n);var r=this.cache("element-bounds",function(){return o(e.element)}),s=r.width,u=r.height;if(0===s&&0===u&&"undefined"!=typeof this.lastSize){var l=this.lastSize;s=l.width,u=l.height}else this.lastSize={width:s,height:u};var c=this.cache("target-bounds",function(){return e.getTargetBounds()}),p=c,f=y(V(this.attachment),{width:s,height:u}),d=y(V(n),p),h=y(this.offset,{width:s,height:u}),m=y(this.targetOffset,p);f=g(f,h),d=g(d,m);for(var v=c.left+d.left-f.left,b=c.top+d.top-f.top,C=0;C<_.modules.length;++C){var w=_.modules[C],E=w.position.call(this,{left:v,top:b,targetAttachment:n,targetPos:c,elementPos:r,offset:f,targetOffset:d,manualOffset:h,manualTargetOffset:m,scrollbarSize:P,attachment:this.attachment});if(E===!1)return!1;"undefined"!=typeof E&&"object"==typeof E&&(b=E.top,v=E.left)}var T={page:{top:b,left:v},viewport:{top:b-pageYOffset,bottom:pageYOffset-b-u+innerHeight,left:v-pageXOffset,right:pageXOffset-v-s+innerWidth}},x=this.target.ownerDocument,O=x.defaultView,P=void 0;return O.innerHeight>x.documentElement.clientHeight&&(P=this.cache("scrollbar-size",a),T.viewport.bottom-=P.height),O.innerWidth>x.documentElement.clientWidth&&(P=this.cache("scrollbar-size",a),T.viewport.right-=P.width),["","static"].indexOf(x.body.style.position)!==-1&&["","static"].indexOf(x.body.parentElement.style.position)!==-1||(T.page.bottom=x.body.scrollHeight-b-u,T.page.right=x.body.scrollWidth-v-s),"undefined"!=typeof this.options.optimizations&&this.options.optimizations.moveElement!==!1&&"undefined"==typeof this.targetModifier&&!function(){var t=e.cache("target-offsetparent",function(){return i(e.target)}),n=e.cache("target-offsetparent-bounds",function(){return o(t)}),r=getComputedStyle(t),a=n,s={};if(["Top","Left","Bottom","Right"].forEach(function(e){s[e.toLowerCase()]=parseFloat(r["border"+e+"Width"])}),n.right=x.body.scrollWidth-n.left-a.width+s.right,n.bottom=x.body.scrollHeight-n.top-a.height+s.bottom,T.page.top>=n.top+s.top&&T.page.bottom>=n.bottom&&T.page.left>=n.left+s.left&&T.page.right>=n.right){var u=t.scrollTop,l=t.scrollLeft;T.offset={top:T.page.top-n.top+u-s.top,left:T.page.left-n.left+l-s.left}}}(),this.move(T),this.history.unshift(T),this.history.length>3&&this.history.pop(),t&&S(),!0}}},{key:"move",value:function(e){var t=this;if("undefined"!=typeof this.element.parentNode){var n={};for(var r in e){n[r]={};for(var o in e[r]){for(var a=!1,u=0;u<this.history.length;++u){var l=this.history[u];if("undefined"!=typeof l[r]&&!m(l[r][o],e[r][o])){a=!0;break}}a||(n[r][o]=!0)}}var c={top:"",left:"",right:"",bottom:""},p=function(e,n){var r="undefined"!=typeof t.options.optimizations,o=r?t.options.optimizations.gpu:null;if(o!==!1){var i=void 0,a=void 0;e.top?(c.top=0,i=n.top):(c.bottom=0,i=-n.bottom),e.left?(c.left=0,a=n.left):(c.right=0,a=-n.right),"number"==typeof window.devicePixelRatio&&devicePixelRatio%1===0&&(a=Math.round(a*devicePixelRatio)/devicePixelRatio,i=Math.round(i*devicePixelRatio)/devicePixelRatio),c[D]="translateX("+a+"px) translateY("+i+"px)","msTransform"!==D&&(c[D]+=" translateZ(0)")}else e.top?c.top=n.top+"px":c.bottom=n.bottom+"px",e.left?c.left=n.left+"px":c.right=n.right+"px"},f=!1;if((n.page.top||n.page.bottom)&&(n.page.left||n.page.right)?(c.position="absolute",p(n.page,e.page)):(n.viewport.top||n.viewport.bottom)&&(n.viewport.left||n.viewport.right)?(c.position="fixed",p(n.viewport,e.viewport)):"undefined"!=typeof n.offset&&n.offset.top&&n.offset.left?!function(){c.position="absolute";var r=t.cache("target-offsetparent",function(){return i(t.target)});i(t.element)!==r&&k(function(){t.element.parentNode.removeChild(t.element),r.appendChild(t.element)}),p(n.offset,e.offset),f=!0}():(c.position="absolute",p({top:!0,left:!0},e.page)),!f)if(this.options.bodyElement)this.element.parentNode!==this.options.bodyElement&&this.options.bodyElement.appendChild(this.element);else{for(var d=function(e){var t=e.ownerDocument,n=t.fullscreenElement||t.webkitFullscreenElement||t.mozFullScreenElement||t.msFullscreenElement;return n===e},h=!0,v=this.element.parentNode;v&&1===v.nodeType&&"BODY"!==v.tagName&&!d(v);){if("static"!==getComputedStyle(v).position){h=!1;break}v=v.parentNode}h||(this.element.parentNode.removeChild(this.element),this.element.ownerDocument.body.appendChild(this.element))}var g={},y=!1;for(var o in c){var b=c[o],C=this.element.style[o];C!==b&&(y=!0,g[o]=b)}y&&k(function(){s(t.element.style,g),t.trigger("repositioned")})}}}]),c}(N);q.modules=[],_.position=L;var z=s(q,_),M=function(){function e(e,t){var n=[],r=!0,o=!1,i=void 0;try{for(var a,s=e[Symbol.iterator]();!(r=(a=s.next()).done)&&(n.push(a.value),!t||n.length!==t);r=!0);}catch(e){o=!0,i=e}finally{try{!r&&s.return&&s.return()}finally{if(o)throw i}}return n}return function(t,n){if(Array.isArray(t))return t;if(Symbol.iterator in Object(t))return e(t,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}(),I=_.Utils,o=I.getBounds,s=I.extend,d=I.updateClasses,k=I.defer,K=["left","top","right","bottom"];_.modules.push({position:function(e){var t=this,n=e.top,r=e.left,i=e.targetAttachment;if(!this.options.constraints)return!0;var a=this.cache("element-bounds",function(){return o(t.element)}),u=a.height,l=a.width;if(0===l&&0===u&&"undefined"!=typeof this.lastSize){var c=this.lastSize;l=c.width,u=c.height}var p=this.cache("target-bounds",function(){return t.getTargetBounds()}),f=p.height,h=p.width,m=[this.getClass("pinned"),this.getClass("out-of-bounds")];this.options.constraints.forEach(function(e){var t=e.outOfBoundsClass,n=e.pinnedClass;t&&m.push(t),n&&m.push(n)}),m.forEach(function(e){["left","top","right","bottom"].forEach(function(t){m.push(e+"-"+t)})});var v=[],g=s({},i),y=s({},this.attachment);return this.options.constraints.forEach(function(e){var o=e.to,a=e.attachment,s=e.pin;"undefined"==typeof a&&(a="");var c=void 0,p=void 0;if(a.indexOf(" ")>=0){var d=a.split(" "),m=M(d,2);p=m[0],c=m[1]}else c=p=a;var C=b(t,o);"target"!==p&&"both"!==p||(n<C[1]&&"top"===g.top&&(n+=f,g.top="bottom"),n+u>C[3]&&"bottom"===g.top&&(n-=f,g.top="top")),"together"===p&&("top"===g.top&&("bottom"===y.top&&n<C[1]?(n+=f,g.top="bottom",n+=u,y.top="top"):"top"===y.top&&n+u>C[3]&&n-(u-f)>=C[1]&&(n-=u-f,g.top="bottom",y.top="bottom")),"bottom"===g.top&&("top"===y.top&&n+u>C[3]?(n-=f,g.top="top",n-=u,y.top="bottom"):"bottom"===y.top&&n<C[1]&&n+(2*u-f)<=C[3]&&(n+=u-f,g.top="top",y.top="top")),"middle"===g.top&&(n+u>C[3]&&"top"===y.top?(n-=u,y.top="bottom"):n<C[1]&&"bottom"===y.top&&(n+=u,y.top="top"))),"target"!==c&&"both"!==c||(r<C[0]&&"left"===g.left&&(r+=h,g.left="right"),r+l>C[2]&&"right"===g.left&&(r-=h,g.left="left")),"together"===c&&(r<C[0]&&"left"===g.left?"right"===y.left?(r+=h,g.left="right",r+=l,y.left="left"):"left"===y.left&&(r+=h,g.left="right",r-=l,y.left="right"):r+l>C[2]&&"right"===g.left?"left"===y.left?(r-=h,g.left="left",r-=l,y.left="right"):"right"===y.left&&(r-=h,g.left="left",r+=l,y.left="left"):"center"===g.left&&(r+l>C[2]&&"left"===y.left?(r-=l,y.left="right"):r<C[0]&&"right"===y.left&&(r+=l,y.left="left"))),"element"!==p&&"both"!==p||(n<C[1]&&"bottom"===y.top&&(n+=u,y.top="top"),n+u>C[3]&&"top"===y.top&&(n-=u,y.top="bottom")),"element"!==c&&"both"!==c||(r<C[0]&&("right"===y.left?(r+=l,y.left="left"):"center"===y.left&&(r+=l/2,y.left="left")),r+l>C[2]&&("left"===y.left?(r-=l,y.left="right"):"center"===y.left&&(r-=l/2,y.left="right"))),"string"==typeof s?s=s.split(",").map(function(e){return e.trim()}):s===!0&&(s=["top","left","right","bottom"]),s=s||[];var _=[],w=[];n<C[1]&&(s.indexOf("top")>=0?(n=C[1],_.push("top")):w.push("top")),n+u>C[3]&&(s.indexOf("bottom")>=0?(n=C[3]-u,_.push("bottom")):w.push("bottom")),r<C[0]&&(s.indexOf("left")>=0?(r=C[0],_.push("left")):w.push("left")),r+l>C[2]&&(s.indexOf("right")>=0?(r=C[2]-l,_.push("right")):w.push("right")),_.length&&!function(){var e=void 0;e="undefined"!=typeof t.options.pinnedClass?t.options.pinnedClass:t.getClass("pinned"),v.push(e),_.forEach(function(t){v.push(e+"-"+t)})}(),w.length&&!function(){var e=void 0;e="undefined"!=typeof t.options.outOfBoundsClass?t.options.outOfBoundsClass:t.getClass("out-of-bounds"),v.push(e),w.forEach(function(t){v.push(e+"-"+t)})}(),(_.indexOf("left")>=0||_.indexOf("right")>=0)&&(y.left=g.left=!1),(_.indexOf("top")>=0||_.indexOf("bottom")>=0)&&(y.top=g.top=!1),g.top===i.top&&g.left===i.left&&y.top===t.attachment.top&&y.left===t.attachment.left||(t.updateAttachClasses(y,g),t.trigger("update",{attachment:y,targetAttachment:g}))}),k(function(){t.options.addTargetClasses!==!1&&d(t.target,v,m),d(t.element,v,m)}),{top:n,left:r}}});var I=_.Utils,o=I.getBounds,d=I.updateClasses,k=I.defer;_.modules.push({position:function(e){var t=this,n=e.top,r=e.left,i=this.cache("element-bounds",function(){return o(t.element)}),a=i.height,s=i.width,u=this.getTargetBounds(),l=n+a,c=r+s,p=[];n<=u.bottom&&l>=u.top&&["left","right"].forEach(function(e){var t=u[e];t!==r&&t!==c||p.push(e)}),r<=u.right&&c>=u.left&&["top","bottom"].forEach(function(e){var t=u[e];t!==n&&t!==l||p.push(e)});var f=[],h=[],m=["left","top","right","bottom"];return f.push(this.getClass("abutted")),m.forEach(function(e){f.push(t.getClass("abutted")+"-"+e)}),p.length&&h.push(this.getClass("abutted")),p.forEach(function(e){h.push(t.getClass("abutted")+"-"+e)}),k(function(){t.options.addTargetClasses!==!1&&d(t.target,h,f),d(t.element,h,f)}),!0}});var M=function(){function e(e,t){var n=[],r=!0,o=!1,i=void 0;try{for(var a,s=e[Symbol.iterator]();!(r=(a=s.next()).done)&&(n.push(a.value),!t||n.length!==t);r=!0);}catch(e){o=!0,i=e}finally{try{!r&&s.return&&s.return()}finally{if(o)throw i}}return n}return function(t,n){if(Array.isArray(t))return t;if(Symbol.iterator in Object(t))return e(t,n);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}();return _.modules.push({position:function(e){var t=e.top,n=e.left;if(this.options.shift){var r=this.options.shift;"function"==typeof this.options.shift&&(r=this.options.shift.call(this,{top:t,left:n}));var o=void 0,i=void 0;if("string"==typeof r){r=r.split(" "),r[1]=r[1]||r[0];var a=r,s=M(a,2);o=s[0],i=s[1],o=parseFloat(o,10),i=parseFloat(i,10)}else o=r.top,i=r.left;return t+=o,n+=i,{top:t,left:n}}}}),z})},function(e,t,n){"use strict";var r=function(){};e.exports=r},function(e,t){!function(e){"use strict";function t(e){if("string"!=typeof e&&(e=String(e)),/[^a-z0-9\-#$%&'*+.\^_`|~]/i.test(e))throw new TypeError("Invalid character in header field name");return e.toLowerCase()}function n(e){return"string"!=typeof e&&(e=String(e)),e}function r(e){var t={next:function(){var t=e.shift();return{done:void 0===t,value:t}}};return g.iterable&&(t[Symbol.iterator]=function(){return t}),t}function o(e){this.map={},e instanceof o?e.forEach(function(e,t){this.append(t,e)},this):e&&Object.getOwnPropertyNames(e).forEach(function(t){this.append(t,e[t])},this)}function i(e){return e.bodyUsed?Promise.reject(new TypeError("Already read")):void(e.bodyUsed=!0)}function a(e){return new Promise(function(t,n){e.onload=function(){t(e.result)},e.onerror=function(){n(e.error)}})}function s(e){var t=new FileReader,n=a(t);return t.readAsArrayBuffer(e),n}function u(e){var t=new FileReader,n=a(t);return t.readAsText(e),n}function l(e){for(var t=new Uint8Array(e),n=new Array(t.length),r=0;r<t.length;r++)n[r]=String.fromCharCode(t[r]);return n.join("")}function c(e){if(e.slice)return e.slice(0);var t=new Uint8Array(e.byteLength);return t.set(new Uint8Array(e)),t.buffer}function p(){return this.bodyUsed=!1,this._initBody=function(e){if(this._bodyInit=e,e)if("string"==typeof e)this._bodyText=e;else if(g.blob&&Blob.prototype.isPrototypeOf(e))this._bodyBlob=e;else if(g.formData&&FormData.prototype.isPrototypeOf(e))this._bodyFormData=e;else if(g.searchParams&&URLSearchParams.prototype.isPrototypeOf(e))this._bodyText=e.toString();else if(g.arrayBuffer&&g.blob&&b(e))this._bodyArrayBuffer=c(e.buffer),this._bodyInit=new Blob([this._bodyArrayBuffer]);else{if(!g.arrayBuffer||!ArrayBuffer.prototype.isPrototypeOf(e)&&!C(e))throw new Error("unsupported BodyInit type");this._bodyArrayBuffer=c(e)}else this._bodyText="";this.headers.get("content-type")||("string"==typeof e?this.headers.set("content-type","text/plain;charset=UTF-8"):this._bodyBlob&&this._bodyBlob.type?this.headers.set("content-type",this._bodyBlob.type):g.searchParams&&URLSearchParams.prototype.isPrototypeOf(e)&&this.headers.set("content-type","application/x-www-form-urlencoded;charset=UTF-8"))},g.blob&&(this.blob=function(){var e=i(this);if(e)return e;if(this._bodyBlob)return Promise.resolve(this._bodyBlob);if(this._bodyArrayBuffer)return Promise.resolve(new Blob([this._bodyArrayBuffer]));if(this._bodyFormData)throw new Error("could not read FormData body as blob");return Promise.resolve(new Blob([this._bodyText]))},this.arrayBuffer=function(){return this._bodyArrayBuffer?i(this)||Promise.resolve(this._bodyArrayBuffer):this.blob().then(s)}),this.text=function(){var e=i(this);if(e)return e;if(this._bodyBlob)return u(this._bodyBlob);if(this._bodyArrayBuffer)return Promise.resolve(l(this._bodyArrayBuffer));if(this._bodyFormData)throw new Error("could not read FormData body as text");return Promise.resolve(this._bodyText)},g.formData&&(this.formData=function(){return this.text().then(h)}),this.json=function(){return this.text().then(JSON.parse)},this}function f(e){var t=e.toUpperCase();return _.indexOf(t)>-1?t:e}function d(e,t){t=t||{};var n=t.body;if(e instanceof d){if(e.bodyUsed)throw new TypeError("Already read");this.url=e.url,this.credentials=e.credentials,t.headers||(this.headers=new o(e.headers)),this.method=e.method,this.mode=e.mode,n||null==e._bodyInit||(n=e._bodyInit,e.bodyUsed=!0)}else this.url=String(e);if(this.credentials=t.credentials||this.credentials||"omit",!t.headers&&this.headers||(this.headers=new o(t.headers)),this.method=f(t.method||this.method||"GET"),this.mode=t.mode||this.mode||null,this.referrer=null,("GET"===this.method||"HEAD"===this.method)&&n)throw new TypeError("Body not allowed for GET or HEAD requests");this._initBody(n)}function h(e){var t=new FormData;return e.trim().split("&").forEach(function(e){if(e){var n=e.split("="),r=n.shift().replace(/\+/g," "),o=n.join("=").replace(/\+/g," ");t.append(decodeURIComponent(r),decodeURIComponent(o))}}),t}function m(e){var t=new o;return e.split(/\r?\n/).forEach(function(e){var n=e.split(":"),r=n.shift().trim();if(r){var o=n.join(":").trim();t.append(r,o)}}),t}function v(e,t){t||(t={}),this.type="default",this.status="status"in t?t.status:200,this.ok=this.status>=200&&this.status<300,this.statusText="statusText"in t?t.statusText:"OK",this.headers=new o(t.headers),this.url=t.url||"",this._initBody(e)}if(!e.fetch){var g={searchParams:"URLSearchParams"in e,iterable:"Symbol"in e&&"iterator"in Symbol,blob:"FileReader"in e&&"Blob"in e&&function(){try{return new Blob,!0}catch(e){return!1}}(),formData:"FormData"in e,arrayBuffer:"ArrayBuffer"in e};if(g.arrayBuffer)var y=["[object Int8Array]","[object Uint8Array]","[object Uint8ClampedArray]","[object Int16Array]","[object Uint16Array]","[object Int32Array]","[object Uint32Array]","[object Float32Array]","[object Float64Array]"],b=function(e){return e&&DataView.prototype.isPrototypeOf(e)},C=ArrayBuffer.isView||function(e){return e&&y.indexOf(Object.prototype.toString.call(e))>-1};o.prototype.append=function(e,r){e=t(e),r=n(r);var o=this.map[e];this.map[e]=o?o+","+r:r},o.prototype.delete=function(e){delete this.map[t(e)]},o.prototype.get=function(e){return e=t(e),this.has(e)?this.map[e]:null},o.prototype.has=function(e){return this.map.hasOwnProperty(t(e))},o.prototype.set=function(e,r){this.map[t(e)]=n(r)},o.prototype.forEach=function(e,t){for(var n in this.map)this.map.hasOwnProperty(n)&&e.call(t,this.map[n],n,this)},o.prototype.keys=function(){var e=[];return this.forEach(function(t,n){e.push(n)}),r(e)},o.prototype.values=function(){var e=[];return this.forEach(function(t){e.push(t)}),r(e)},o.prototype.entries=function(){var e=[];return this.forEach(function(t,n){e.push([n,t])}),r(e)},g.iterable&&(o.prototype[Symbol.iterator]=o.prototype.entries);var _=["DELETE","GET","HEAD","OPTIONS","POST","PUT"];d.prototype.clone=function(){return new d(this,{body:this._bodyInit})},p.call(d.prototype),p.call(v.prototype),v.prototype.clone=function(){return new v(this._bodyInit,{status:this.status,statusText:this.statusText,headers:new o(this.headers),url:this.url})},v.error=function(){var e=new v(null,{status:0,statusText:""});return e.type="error",e};var w=[301,302,303,307,308];v.redirect=function(e,t){if(w.indexOf(t)===-1)throw new RangeError("Invalid status code");return new v(null,{status:t,headers:{location:e}})},e.Headers=o,e.Request=d,e.Response=v,e.fetch=function(e,t){return new Promise(function(n,r){var o=new d(e,t),i=new XMLHttpRequest;i.onload=function(){var e={status:i.status,statusText:i.statusText,headers:m(i.getAllResponseHeaders()||"")};e.url="responseURL"in i?i.responseURL:e.headers.get("X-Request-URL");var t="response"in i?i.response:i.responseText;n(new v(t,e))},i.onerror=function(){r(new TypeError("Network request failed"))},i.ontimeout=function(){r(new TypeError("Network request failed"))},i.open(o.method,o.url,!0),"include"===o.credentials&&(i.withCredentials=!0),"responseType"in i&&g.blob&&(i.responseType="blob"),o.headers.forEach(function(e,t){i.setRequestHeader(t,e)}),i.send("undefined"==typeof o._bodyInit?null:o._bodyInit)})},e.fetch.polyfill=!0}}("undefined"!=typeof self?self:this)},function(e,t,n,r,o,i,a,s){function u(e,t){var n,r=function(o){return e.length>1?function(){var i=o?o.concat():[];return n=t?n||this:this,i.push.apply(i,arguments)<e.length&&arguments.length?r.call(n,i):e.apply(n,i)}:e};return r()}var l,c,p,f,d,h,m,v,g,y={}.toString;l=n(r),c=n(o),p=n(i),f=n(a),d=n(s),h=function(e){return e},m=u(function(e,t){return y.call(t).slice(8,-1)===e}),v=u(function(e,t){var n,r=[];for(n=0;n<e;++n)r.push(t);return r}),f.empty=c.empty,f.slice=c.slice,f.take=c.take,f.drop=c.drop,f.splitAt=c.splitAt,f.takeWhile=c.takeWhile,f.dropWhile=c.dropWhile,f.span=c.span,f.breakStr=c.breakList,g={Func:l,List:c,Obj:p,Str:f,Num:d,id:h,isType:m,replicate:v},g.each=c.each,g.map=c.map,g.filter=c.filter,g.compact=c.compact,g.reject=c.reject,g.partition=c.partition,g.find=c.find,g.head=c.head,g.first=c.first,g.tail=c.tail,g.last=c.last,g.initial=c.initial,g.empty=c.empty,g.reverse=c.reverse,g.difference=c.difference,g.intersection=c.intersection,g.union=c.union,g.countBy=c.countBy,g.groupBy=c.groupBy,g.fold=c.fold,g.foldl=c.foldl,g.fold1=c.fold1,g.foldl1=c.foldl1,
-g.foldr=c.foldr,g.foldr1=c.foldr1,g.unfoldr=c.unfoldr,g.andList=c.andList,g.orList=c.orList,g.any=c.any,g.all=c.all,g.unique=c.unique,g.uniqueBy=c.uniqueBy,g.sort=c.sort,g.sortWith=c.sortWith,g.sortBy=c.sortBy,g.sum=c.sum,g.product=c.product,g.mean=c.mean,g.average=c.average,g.concat=c.concat,g.concatMap=c.concatMap,g.flatten=c.flatten,g.maximum=c.maximum,g.minimum=c.minimum,g.maximumBy=c.maximumBy,g.minimumBy=c.minimumBy,g.scan=c.scan,g.scanl=c.scanl,g.scan1=c.scan1,g.scanl1=c.scanl1,g.scanr=c.scanr,g.scanr1=c.scanr1,g.slice=c.slice,g.take=c.take,g.drop=c.drop,g.splitAt=c.splitAt,g.takeWhile=c.takeWhile,g.dropWhile=c.dropWhile,g.span=c.span,g.breakList=c.breakList,g.zip=c.zip,g.zipWith=c.zipWith,g.zipAll=c.zipAll,g.zipAllWith=c.zipAllWith,g.at=c.at,g.elemIndex=c.elemIndex,g.elemIndices=c.elemIndices,g.findIndex=c.findIndex,g.findIndices=c.findIndices,g.apply=l.apply,g.curry=l.curry,g.flip=l.flip,g.fix=l.fix,g.over=l.over,g.split=f.split,g.join=f.join,g.lines=f.lines,g.unlines=f.unlines,g.words=f.words,g.unwords=f.unwords,g.chars=f.chars,g.unchars=f.unchars,g.repeat=f.repeat,g.capitalize=f.capitalize,g.camelize=f.camelize,g.dasherize=f.dasherize,g.values=p.values,g.keys=p.keys,g.pairsToObj=p.pairsToObj,g.objToPairs=p.objToPairs,g.listsToObj=p.listsToObj,g.objToLists=p.objToLists,g.max=d.max,g.min=d.min,g.negate=d.negate,g.abs=d.abs,g.signum=d.signum,g.quot=d.quot,g.rem=d.rem,g.div=d.div,g.mod=d.mod,g.recip=d.recip,g.pi=d.pi,g.tau=d.tau,g.exp=d.exp,g.sqrt=d.sqrt,g.ln=d.ln,g.pow=d.pow,g.sin=d.sin,g.tan=d.tan,g.cos=d.cos,g.acos=d.acos,g.asin=d.asin,g.atan=d.atan,g.atan2=d.atan2,g.truncate=d.truncate,g.round=d.round,g.ceiling=d.ceiling,g.floor=d.floor,g.isItNaN=d.isItNaN,g.even=d.even,g.odd=d.odd,g.gcd=d.gcd,g.lcm=d.lcm,g.VERSION="1.2.1",e.exports=g},function(e,t,n,r){"use strict";var o=n(r),i=(n(1),function(e){var t=this;if(t.instancePool.length){var n=t.instancePool.pop();return t.call(n,e),n}return new t(e)}),a=function(e,t){var n=this;if(n.instancePool.length){var r=n.instancePool.pop();return n.call(r,e,t),r}return new n(e,t)},s=function(e,t,n){var r=this;if(r.instancePool.length){var o=r.instancePool.pop();return r.call(o,e,t,n),o}return new r(e,t,n)},u=function(e,t,n,r){var o=this;if(o.instancePool.length){var i=o.instancePool.pop();return o.call(i,e,t,n,r),i}return new o(e,t,n,r)},l=function(e){var t=this;e instanceof t?void 0:o("25"),e.destructor(),t.instancePool.length<t.poolSize&&t.instancePool.push(e)},c=10,p=i,f=function(e,t){var n=e;return n.instancePool=[],n.getPooled=t||p,n.poolSize||(n.poolSize=c),n.release=l,n},d={addPoolingTo:f,oneArgumentPooler:i,twoArgumentPooler:a,threeArgumentPooler:s,fourArgumentPooler:u};e.exports=d}]));
-//# sourceMappingURL=main.bd8d4a90.js.map
\ No newline at end of file
diff --git a/data/interfaces/default/js/graphs/concurrent_streams_by_stream_type.js b/data/interfaces/default/js/graphs/concurrent_streams_by_stream_type.js
deleted file mode 100644
index 623e4735..00000000
--- a/data/interfaces/default/js/graphs/concurrent_streams_by_stream_type.js
+++ /dev/null
@@ -1,76 +0,0 @@
-var formatter_function = function() {
-    if (moment(this.x, 'X').isValid() && (this.x > 946684800)) {
-        var s = '<b>'+ moment(this.x).format('ddd MMM D') +'</b>';
-    } else {
-        var s = '<b>'+ this.x +'</b>';
-    }
-    $.each(this.points, function(i, point) {
-        s += '<br/>'+point.series.name+': '+point.y;
-    });
-    return s;
-};
-
-var hc_concurrent_streams_by_stream_type_options = {
-    chart: {
-        type: 'line',
-        backgroundColor: 'rgba(0,0,0,0)',
-        renderTo: 'graph_concurrent_streams_by_stream_type'
-    },
-    title: {
-        text: ''
-    },
-    legend: {
-        enabled: true,
-        itemStyle: {
-            font: '9pt "Open Sans", sans-serif',
-            color: '#A0A0A0'
-        },
-        itemHoverStyle: {
-            color: '#FFF'
-        },
-        itemHiddenStyle: {
-            color: '#444'
-        }
-    },
-    credits: {
-        enabled: false
-    },
-    plotOptions: {
-        series: {
-            events: {
-                legendItemClick: function() {
-                    setGraphVisibility(this.chart.renderTo.id, this.chart.series, this.name);
-                }
-            }
-        }
-    },
-    xAxis: {
-            type: 'datetime',
-            labels: {
-                formatter: function() {
-                    return moment(this.value).format("MMM D");
-                },
-                style: {
-                    color: '#aaa'
-                }
-            },
-            categories: [{}],
-            plotBands: []
-    },
-    yAxis: {
-            title: {
-                text: null
-            },
-            labels: {
-                style: {
-                    color: '#aaa'
-                }
-            }
-    },
-    tooltip: {
-        shared: true,
-        crosshairs: true,
-        formatter: formatter_function
-    },
-    series: [{}]
-};
\ No newline at end of file
diff --git a/data/interfaces/default/js/graphs/plays_by_day.js b/data/interfaces/default/js/graphs/plays_by_day.js
index 3252403e..6eabea39 100644
--- a/data/interfaces/default/js/graphs/plays_by_day.js
+++ b/data/interfaces/default/js/graphs/plays_by_day.js
@@ -2,7 +2,7 @@ var hc_plays_by_day_options = {
     chart: {
         type: 'line',
         backgroundColor: 'rgba(0,0,0,0)',
-        renderTo: 'graph_plays_by_day'
+        renderTo: 'chart_div_plays_by_day'
     },
     title: {
         text: ''
@@ -28,18 +28,14 @@ var hc_plays_by_day_options = {
             cursor: 'pointer',
             point: {
                 events: {
-                    click: function () {
-                        selectHandler(this.category, this.series.name);
+                    click: function() {
+                        selectHandler(this.category);
                     }
                 }
-            },
-            events: {
-                legendItemClick: function() {
-                    setGraphVisibility(this.chart.renderTo.id, this.chart.series, this.name);
-                }
             }
         }
     },
+    colors: ['#F9AA03', '#FFFFFF', '#FF4747'],
     xAxis: {
             type: 'datetime',
             labels: {
@@ -64,8 +60,7 @@ var hc_plays_by_day_options = {
             }
     },
     tooltip: {
-        shared: true,
-        crosshairs: true
+        shared: true
     },
     series: [{}]
 };
\ No newline at end of file
diff --git a/data/interfaces/default/js/graphs/plays_by_dayofweek.js b/data/interfaces/default/js/graphs/plays_by_dayofweek.js
index 84337f8d..a0d66bbe 100644
--- a/data/interfaces/default/js/graphs/plays_by_dayofweek.js
+++ b/data/interfaces/default/js/graphs/plays_by_dayofweek.js
@@ -2,11 +2,17 @@ var hc_plays_by_dayofweek_options = {
     chart: {
         type: 'column',
         backgroundColor: 'rgba(0,0,0,0)',
-        renderTo: 'graph_plays_by_dayofweek'
+        renderTo: 'chart_div_plays_by_dayofweek'
     },
     title: {
         text: ''
     },
+    plotOptions: {
+            column: {
+                pointPadding: 0.2,
+                borderWidth: 0
+            }
+        },
     legend: {
         enabled: true,
         itemStyle: {
@@ -23,6 +29,7 @@ var hc_plays_by_dayofweek_options = {
     credits: {
         enabled: false
     },
+    colors: ['#F9AA03', '#FFFFFF', '#FF4747'],
     xAxis: {
             categories: [{}],
             labels: {
@@ -49,21 +56,14 @@ var hc_plays_by_dayofweek_options = {
     },
     plotOptions: {
         column: {
-            borderWidth: 0,
             stacking: 'normal',
+            borderWidth: '0',
             dataLabels: {
                 enabled: false,
                 style: {
                     color: '#000'
                 }
             }
-        },
-        series: {
-            events: {
-                legendItemClick: function () {
-                    setGraphVisibility(this.chart.renderTo.id, this.chart.series, this.name);
-                }
-            }
         }
     },
     tooltip: {
diff --git a/data/interfaces/default/js/graphs/plays_by_hourofday.js b/data/interfaces/default/js/graphs/plays_by_hourofday.js
index e9d0ca4c..e2e036e3 100644
--- a/data/interfaces/default/js/graphs/plays_by_hourofday.js
+++ b/data/interfaces/default/js/graphs/plays_by_hourofday.js
@@ -2,11 +2,17 @@ var hc_plays_by_hourofday_options = {
     chart: {
         type: 'column',
         backgroundColor: 'rgba(0,0,0,0)',
-        renderTo: 'graph_plays_by_hourofday'
+        renderTo: 'chart_div_plays_by_hourofday'
     },
     title: {
         text: ''
     },
+    plotOptions: {
+            column: {
+                pointPadding: 0.2,
+                borderWidth: 0
+            }
+        },
     legend: {
         enabled: true,
         itemStyle: {
@@ -23,6 +29,7 @@ var hc_plays_by_hourofday_options = {
     credits: {
         enabled: false
     },
+    colors: ['#F9AA03', '#FFFFFF', '#FF4747'],
     xAxis: {
             categories: [{}],
             labels: {
@@ -49,21 +56,14 @@ var hc_plays_by_hourofday_options = {
     },
     plotOptions: {
         column: {
-            borderWidth: 0,
             stacking: 'normal',
+            borderWidth: '0',
             dataLabels: {
                 enabled: false,
                 style: {
                     color: '#000'
                 }
             }
-        },
-        series: {
-            events: {
-                legendItemClick: function () {
-                    setGraphVisibility(this.chart.renderTo.id, this.chart.series, this.name);
-                }
-            }
         }
     },
     tooltip: {
diff --git a/data/interfaces/default/js/graphs/plays_by_month.js b/data/interfaces/default/js/graphs/plays_by_month.js
index 084c636c..c43cf041 100644
--- a/data/interfaces/default/js/graphs/plays_by_month.js
+++ b/data/interfaces/default/js/graphs/plays_by_month.js
@@ -2,7 +2,7 @@ var hc_plays_by_month_options = {
     chart: {
         type: 'column',
         backgroundColor: 'rgba(0,0,0,0)',
-        renderTo: 'graph_plays_by_month'
+        renderTo: 'chart_div_plays_by_month'
     },
     title: {
         text: ''
@@ -23,6 +23,7 @@ var hc_plays_by_month_options = {
     credits: {
         enabled: false
     },
+    colors: ['#F9AA03', '#FFFFFF', '#FF4747'],
     xAxis: {
             labels: {
                 style: {
@@ -49,21 +50,14 @@ var hc_plays_by_month_options = {
     },
     plotOptions: {
         column: {
-            borderWidth: 0,
             stacking: 'normal',
+            borderWidth: '0',
             dataLabels: {
                 enabled: false,
                 style: {
                     color: '#000'
                 }
             }
-        },
-        series: {
-            events: {
-                legendItemClick: function () {
-                    setGraphVisibility(this.chart.renderTo.id, this.chart.series, this.name);
-                }
-            }
         }
     },
     tooltip: {
diff --git a/data/interfaces/default/js/graphs/plays_by_platform.js b/data/interfaces/default/js/graphs/plays_by_platform.js
index 70e0c193..c84d785e 100644
--- a/data/interfaces/default/js/graphs/plays_by_platform.js
+++ b/data/interfaces/default/js/graphs/plays_by_platform.js
@@ -2,11 +2,17 @@ var hc_plays_by_platform_options = {
     chart: {
         type: 'column',
         backgroundColor: 'rgba(0,0,0,0)',
-        renderTo: 'graph_plays_by_platform'
+        renderTo: 'chart_div_plays_by_platform'
     },
     title: {
         text: ''
     },
+    plotOptions: {
+            column: {
+                pointPadding: 0.2,
+                borderWidth: 0
+            }
+        },
     legend: {
         enabled: true,
         itemStyle: {
@@ -23,6 +29,7 @@ var hc_plays_by_platform_options = {
     credits: {
         enabled: false
     },
+    colors: ['#F9AA03', '#FFFFFF', '#FF4747'],
     xAxis: {
             categories: [{}],
             labels: {
@@ -49,21 +56,14 @@ var hc_plays_by_platform_options = {
     },
     plotOptions: {
         column: {
-            borderWidth: 0,
             stacking: 'normal',
+            borderWidth: '0',
             dataLabels: {
                 enabled: false,
                 style: {
                     color: '#000'
                 }
             }
-        },
-        series: {
-            events: {
-                legendItemClick: function () {
-                    setGraphVisibility(this.chart.renderTo.id, this.chart.series, this.name);
-                }
-            }
         }
     },
     tooltip: {
diff --git a/data/interfaces/default/js/graphs/plays_by_platform_by_stream_type.js b/data/interfaces/default/js/graphs/plays_by_platform_by_stream_type.js
index 95727a50..c1b60aeb 100644
--- a/data/interfaces/default/js/graphs/plays_by_platform_by_stream_type.js
+++ b/data/interfaces/default/js/graphs/plays_by_platform_by_stream_type.js
@@ -2,11 +2,17 @@ var hc_plays_by_platform_by_stream_type_options = {
     chart: {
         type: 'column',
         backgroundColor: 'rgba(0,0,0,0)',
-        renderTo: 'graph_plays_by_platform_by_stream_type'
+        renderTo: 'chart_div_plays_by_platform_by_stream_type'
     },
     title: {
         text: ''
     },
+    plotOptions: {
+            column: {
+                pointPadding: 0.2,
+                borderWidth: 0
+            }
+        },
     legend: {
         enabled: true,
         itemStyle: {
@@ -23,6 +29,7 @@ var hc_plays_by_platform_by_stream_type_options = {
     credits: {
         enabled: false
     },
+    colors: ['#F9AA03', '#FFFFFF', '#FF4747'],
     xAxis: {
             categories: [{}],
             labels: {
@@ -49,21 +56,14 @@ var hc_plays_by_platform_by_stream_type_options = {
     },
     plotOptions: {
         column: {
-            borderWidth: 0,
             stacking: 'normal',
+            borderWidth: '0',
             dataLabels: {
                 enabled: false,
                 style: {
                     color: '#000'
                 }
             }
-        },
-        series: {
-            events: {
-                legendItemClick: function () {
-                    setGraphVisibility(this.chart.renderTo.id, this.chart.series, this.name);
-                }
-            }
         }
     },
     tooltip: {
diff --git a/data/interfaces/default/js/graphs/plays_by_source_resolution.js b/data/interfaces/default/js/graphs/plays_by_source_resolution.js
index b8273780..c82f16bc 100644
--- a/data/interfaces/default/js/graphs/plays_by_source_resolution.js
+++ b/data/interfaces/default/js/graphs/plays_by_source_resolution.js
@@ -2,11 +2,17 @@ var hc_plays_by_source_resolution_options = {
     chart: {
         type: 'column',
         backgroundColor: 'rgba(0,0,0,0)',
-        renderTo: 'graph_plays_by_source_resolution'
+        renderTo: 'chart_div_plays_by_source_resolution'
     },
     title: {
         text: ''
     },
+    plotOptions: {
+            column: {
+                pointPadding: 0.2,
+                borderWidth: 0
+            }
+        },
     legend: {
         enabled: true,
         itemStyle: {
@@ -23,6 +29,7 @@ var hc_plays_by_source_resolution_options = {
     credits: {
         enabled: false
     },
+    colors: ['#F9AA03', '#FFFFFF', '#FF4747'],
     xAxis: {
             categories: [{}],
             labels: {
@@ -49,21 +56,14 @@ var hc_plays_by_source_resolution_options = {
     },
     plotOptions: {
         column: {
-            borderWidth: 0,
             stacking: 'normal',
+            borderWidth: '0',
             dataLabels: {
                 enabled: false,
                 style: {
                     color: '#000'
                 }
             }
-        },
-        series: {
-            events: {
-                legendItemClick: function () {
-                    setGraphVisibility(this.chart.renderTo.id, this.chart.series, this.name);
-                }
-            }
         }
     },
     tooltip: {
diff --git a/data/interfaces/default/js/graphs/plays_by_stream_resolution.js b/data/interfaces/default/js/graphs/plays_by_stream_resolution.js
index 103d9443..7ae7f84d 100644
--- a/data/interfaces/default/js/graphs/plays_by_stream_resolution.js
+++ b/data/interfaces/default/js/graphs/plays_by_stream_resolution.js
@@ -2,11 +2,17 @@ var hc_plays_by_stream_resolution_options = {
     chart: {
         type: 'column',
         backgroundColor: 'rgba(0,0,0,0)',
-        renderTo: 'graph_plays_by_stream_resolution'
+        renderTo: 'chart_div_plays_by_stream_resolution'
     },
     title: {
         text: ''
     },
+    plotOptions: {
+            column: {
+                pointPadding: 0.2,
+                borderWidth: 0
+            }
+        },
     legend: {
         enabled: true,
         itemStyle: {
@@ -23,6 +29,7 @@ var hc_plays_by_stream_resolution_options = {
     credits: {
         enabled: false
     },
+    colors: ['#F9AA03', '#FFFFFF', '#FF4747'],
     xAxis: {
             categories: [{}],
             labels: {
@@ -49,21 +56,14 @@ var hc_plays_by_stream_resolution_options = {
     },
     plotOptions: {
         column: {
-            borderWidth: 0,
             stacking: 'normal',
+            borderWidth: '0',
             dataLabels: {
                 enabled: false,
                 style: {
                     color: '#000'
                 }
             }
-        },
-        series: {
-            events: {
-                legendItemClick: function () {
-                    setGraphVisibility(this.chart.renderTo.id, this.chart.series, this.name);
-                }
-            }
         }
     },
     tooltip: {
diff --git a/data/interfaces/default/js/graphs/plays_by_stream_type.js b/data/interfaces/default/js/graphs/plays_by_stream_type.js
index 1be862f4..1fb46bb3 100644
--- a/data/interfaces/default/js/graphs/plays_by_stream_type.js
+++ b/data/interfaces/default/js/graphs/plays_by_stream_type.js
@@ -2,7 +2,7 @@ var hc_plays_by_stream_type_options = {
     chart: {
         type: 'line',
         backgroundColor: 'rgba(0,0,0,0)',
-        renderTo: 'graph_plays_by_stream_type'
+        renderTo: 'chart_div_plays_by_stream_type'
     },
     title: {
         text: ''
@@ -29,17 +29,13 @@ var hc_plays_by_stream_type_options = {
             point: {
                 events: {
                     click: function() {
-                        selectHandler(this.category, this.series.name);
+                        selectHandler(this.category);
                     }
                 }
-            },
-            events: {
-                legendItemClick: function() {
-                    setGraphVisibility(this.chart.renderTo.id, this.chart.series, this.name);
-                }
             }
         }
     },
+    colors: ['#F9AA03', '#FFFFFF', '#FF4747'],
     xAxis: {
             type: 'datetime',
             labels: {
@@ -64,8 +60,7 @@ var hc_plays_by_stream_type_options = {
             }
     },
     tooltip: {
-        shared: true,
-        crosshairs: true
+        shared: true
     },
     series: [{}]
 };
\ No newline at end of file
diff --git a/data/interfaces/default/js/graphs/plays_by_user.js b/data/interfaces/default/js/graphs/plays_by_user.js
index eb3a528a..8700b445 100644
--- a/data/interfaces/default/js/graphs/plays_by_user.js
+++ b/data/interfaces/default/js/graphs/plays_by_user.js
@@ -2,11 +2,17 @@ var hc_plays_by_user_options = {
     chart: {
         type: 'column',
         backgroundColor: 'rgba(0,0,0,0)',
-        renderTo: 'graph_plays_by_user'
+        renderTo: 'chart_div_plays_by_user'
     },
     title: {
         text: ''
     },
+    plotOptions: {
+            column: {
+                pointPadding: 0.2,
+                borderWidth: 0
+            }
+        },
     legend: {
         enabled: true,
         itemStyle: {
@@ -23,6 +29,7 @@ var hc_plays_by_user_options = {
     credits: {
         enabled: false
     },
+    colors: ['#F9AA03', '#FFFFFF', '#FF4747'],
     xAxis: {
             categories: [{}],
             labels: {
@@ -49,21 +56,14 @@ var hc_plays_by_user_options = {
     },
     plotOptions: {
         column: {
-            borderWidth: 0,
             stacking: 'normal',
+            borderWidth: '0',
             dataLabels: {
                 enabled: false,
                 style: {
                     color: '#000'
                 }
             }
-        },
-        series: {
-            events: {
-                legendItemClick: function () {
-                    setGraphVisibility(this.chart.renderTo.id, this.chart.series, this.name);
-                }
-            }
         }
     },
     tooltip: {
diff --git a/data/interfaces/default/js/graphs/plays_by_user_by_stream_type.js b/data/interfaces/default/js/graphs/plays_by_user_by_stream_type.js
index 55ca25ca..00007afa 100644
--- a/data/interfaces/default/js/graphs/plays_by_user_by_stream_type.js
+++ b/data/interfaces/default/js/graphs/plays_by_user_by_stream_type.js
@@ -2,11 +2,17 @@ var hc_plays_by_user_by_stream_type_options = {
     chart: {
         type: 'column',
         backgroundColor: 'rgba(0,0,0,0)',
-        renderTo: 'graph_plays_by_user_by_stream_type'
+        renderTo: 'chart_div_plays_by_user_by_stream_type'
     },
     title: {
         text: ''
     },
+    plotOptions: {
+            column: {
+                pointPadding: 0.2,
+                borderWidth: 0
+            }
+        },
     legend: {
         enabled: true,
         itemStyle: {
@@ -23,6 +29,7 @@ var hc_plays_by_user_by_stream_type_options = {
     credits: {
         enabled: false
     },
+    colors: ['#F9AA03', '#FFFFFF', '#FF4747'],
     xAxis: {
             categories: [{}],
             labels: {
@@ -49,21 +56,14 @@ var hc_plays_by_user_by_stream_type_options = {
     },
     plotOptions: {
         column: {
-            borderWidth: 0,
             stacking: 'normal',
+            borderWidth: '0',
             dataLabels: {
                 enabled: false,
                 style: {
                     color: '#000'
                 }
             }
-        },
-        series: {
-            events: {
-                legendItemClick: function () {
-                    setGraphVisibility(this.chart.renderTo.id, this.chart.series, this.name);
-                }
-            }
         }
     },
     tooltip: {
diff --git a/data/interfaces/default/js/highcharts.min.js b/data/interfaces/default/js/highcharts.min.js
deleted file mode 100644
index 96460b4f..00000000
--- a/data/interfaces/default/js/highcharts.min.js
+++ /dev/null
@@ -1,596 +0,0 @@
-/*
- Highcharts JS v9.2.2 (2021-08-24)
-
- (c) 2009-2021 Torstein Honsi
-
- License: www.highcharts.com/license
-*/
-'use strict';(function(aa,M){"object"===typeof module&&module.exports?(M["default"]=M,module.exports=aa.document?M(aa):M):"function"===typeof define&&define.amd?define("highcharts/highcharts",function(){return M(aa)}):(aa.Highcharts&&aa.Highcharts.error(16,!0),aa.Highcharts=M(aa))})("undefined"!==typeof window?window:this,function(aa){function M(r,a,C,E){r.hasOwnProperty(a)||(r[a]=E.apply(null,C))}var a={};M(a,"Core/Globals.js",[],function(){var r="undefined"!==typeof aa?aa:"undefined"!==typeof window?
-window:{},a;(function(a){a.SVG_NS="http://www.w3.org/2000/svg";a.product="Highcharts";a.version="9.2.2";a.win=r;a.doc=a.win.document;a.svg=a.doc&&a.doc.createElementNS&&!!a.doc.createElementNS(a.SVG_NS,"svg").createSVGRect;a.userAgent=a.win.navigator&&a.win.navigator.userAgent||"";a.isChrome=-1!==a.userAgent.indexOf("Chrome");a.isFirefox=-1!==a.userAgent.indexOf("Firefox");a.isMS=/(edge|msie|trident)/i.test(a.userAgent)&&!a.win.opera;a.isSafari=!a.isChrome&&-1!==a.userAgent.indexOf("Safari");a.isTouchDevice=
-/(Mobile|Android|Windows Phone)/.test(a.userAgent);a.isWebKit=-1!==a.userAgent.indexOf("AppleWebKit");a.deg2rad=2*Math.PI/360;a.hasBidiBug=a.isFirefox&&4>parseInt(a.userAgent.split("Firefox/")[1],10);a.hasTouch=!!a.win.TouchEvent;a.marginNames=["plotTop","marginRight","marginBottom","plotLeft"];a.noop=function(){};a.supportsPassiveEvents=function(){var r=!1;if(!a.isMS){var w=Object.defineProperty({},"passive",{get:function(){r=!0}});a.win.addEventListener&&a.win.removeEventListener&&(a.win.addEventListener("testPassive",
-a.noop,w),a.win.removeEventListener("testPassive",a.noop,w))}return r}();a.charts=[];a.dateFormats={};a.seriesTypes={};a.symbolSizes={};a.chartCount=0})(a||(a={}));"";return a});M(a,"Core/Utilities.js",[a["Core/Globals.js"]],function(a){function r(b,d,e,p){var y=d?"Highcharts error":"Highcharts warning";32===b&&(b=y+": Deprecated member");var F=m(b),c=F?y+" #"+b+": www.highcharts.com/errors/"+b+"/":b.toString();if("undefined"!==typeof p){var k="";F&&(c+="?");I(p,function(b,K){k+="\n - "+K+": "+b;
-F&&(c+=encodeURI(K)+"="+encodeURI(b))});c+=k}B(a,"displayError",{chart:e,code:b,message:c,params:p},function(){if(d)throw Error(c);h.console&&-1===r.messages.indexOf(c)&&console.warn(c)});r.messages.push(c)}function C(b,d){var y={};I(b,function(h,c){if(J(b[c],!0)&&!b.nodeType&&d[c])h=C(b[c],d[c]),Object.keys(h).length&&(y[c]=h);else if(J(b[c])||b[c]!==d[c])y[c]=b[c]});return y}function E(b,d){return parseInt(b,d||10)}function z(b){return"string"===typeof b}function x(b){b=Object.prototype.toString.call(b);
-return"[object Array]"===b||"[object Array Iterator]"===b}function J(b,d){return!!b&&"object"===typeof b&&(!d||!x(b))}function u(b){return J(b)&&"number"===typeof b.nodeType}function n(b){var d=b&&b.constructor;return!(!J(b,!0)||u(b)||!d||!d.name||"Object"===d.name)}function m(b){return"number"===typeof b&&!isNaN(b)&&Infinity>b&&-Infinity<b}function g(b){return"undefined"!==typeof b&&null!==b}function c(b,d,h){var y;z(d)?g(h)?b.setAttribute(d,h):b&&b.getAttribute&&((y=b.getAttribute(d))||"class"!==
-d||(y=b.getAttribute(d+"Name"))):I(d,function(d,y){b.setAttribute(y,d)});return y}function e(b,d){var y;b||(b={});for(y in d)b[y]=d[y];return b}function l(){for(var b=arguments,d=b.length,h=0;h<d;h++){var c=b[h];if("undefined"!==typeof c&&null!==c)return c}}function f(b,d){a.isMS&&!a.svg&&d&&"undefined"!==typeof d.opacity&&(d.filter="alpha(opacity="+100*d.opacity+")");e(b.style,d)}function v(b,d,h,c,p){b=t.createElement(b);d&&e(b,d);p&&f(b,{padding:"0",border:"none",margin:"0"});h&&f(b,h);c&&c.appendChild(b);
-return b}function q(b,d){return parseFloat(b.toPrecision(d||14))}function k(b,d,c){var y=a.getStyle||k;if("width"===d)return d=Math.min(b.offsetWidth,b.scrollWidth),c=b.getBoundingClientRect&&b.getBoundingClientRect().width,c<d&&c>=d-1&&(d=Math.floor(c)),Math.max(0,d-(y(b,"padding-left",!0)||0)-(y(b,"padding-right",!0)||0));if("height"===d)return Math.max(0,Math.min(b.offsetHeight,b.scrollHeight)-(y(b,"padding-top",!0)||0)-(y(b,"padding-bottom",!0)||0));h.getComputedStyle||r(27,!0);if(b=h.getComputedStyle(b,
-void 0)){var e=b.getPropertyValue(d);l(c,"opacity"!==d)&&(e=E(e))}return e}function I(b,d,h){for(var y in b)Object.hasOwnProperty.call(b,y)&&d.call(h||b[y],b[y],y,b)}function D(b,d,h){function y(d,H){var K=b.removeEventListener||a.removeEventListenerPolyfill;K&&K.call(b,d,H,!1)}function c(h){var H;if(b.nodeName){if(d){var K={};K[d]=!0}else K=h;I(K,function(b,d){if(h[d])for(H=h[d].length;H--;)y(d,h[d][H].fn)})}}var e="function"===typeof b&&b.prototype||b;if(Object.hasOwnProperty.call(e,"hcEvents")){var p=
-e.hcEvents;d?(e=p[d]||[],h?(p[d]=e.filter(function(b){return h!==b.fn}),y(d,h)):(c(p),p[d]=[])):(c(p),delete e.hcEvents)}}function B(b,d,h,c){h=h||{};if(t.createEvent&&(b.dispatchEvent||b.fireEvent&&b!==a)){var y=t.createEvent("Events");y.initEvent(d,!0,!0);h=e(y,h);b.dispatchEvent?b.dispatchEvent(h):b.fireEvent(d,h)}else if(b.hcEvents){h.target||e(h,{preventDefault:function(){h.defaultPrevented=!0},target:b,type:d});y=[];for(var p=b,k=!1;p.hcEvents;)Object.hasOwnProperty.call(p,"hcEvents")&&p.hcEvents[d]&&
-(y.length&&(k=!0),y.unshift.apply(y,p.hcEvents[d])),p=Object.getPrototypeOf(p);k&&y.sort(function(b,d){return b.order-d.order});y.forEach(function(d){!1===d.fn.call(b,h)&&h.preventDefault()})}c&&!h.defaultPrevented&&c.call(b,h)}var O=a.charts,t=a.doc,h=a.win;(r||(r={})).messages=[];var d;Math.easeInOutSine=function(b){return-.5*(Math.cos(Math.PI*b)-1)};var b=Array.prototype.find?function(b,d){return b.find(d)}:function(b,d){var h,y=b.length;for(h=0;h<y;h++)if(d(b[h],h))return b[h]};I({map:"map",each:"forEach",
-grep:"filter",reduce:"reduce",some:"some"},function(b,d){a[d]=function(h){var y;r(32,!1,void 0,(y={},y["Highcharts."+d]="use Array."+b,y));return Array.prototype[b].apply(h,[].slice.call(arguments,1))}});var p,G=function(){var b=Math.random().toString(36).substring(2,9)+"-",d=0;return function(){return"highcharts-"+(p?"":b)+d++}}();h.jQuery&&(h.jQuery.fn.highcharts=function(){var b=[].slice.call(arguments);if(this[0])return b[0]?(new (a[z(b[0])?b.shift():"Chart"])(this[0],b[0],b[1]),this):O[c(this[0],
-"data-highcharts-chart")]});b={addEvent:function(b,d,h,c){void 0===c&&(c={});var y="function"===typeof b&&b.prototype||b;Object.hasOwnProperty.call(y,"hcEvents")||(y.hcEvents={});y=y.hcEvents;a.Point&&b instanceof a.Point&&b.series&&b.series.chart&&(b.series.chart.runTrackerClick=!0);var p=b.addEventListener||a.addEventListenerPolyfill;p&&p.call(b,d,h,a.supportsPassiveEvents?{passive:void 0===c.passive?-1!==d.indexOf("touch"):c.passive,capture:!1}:!1);y[d]||(y[d]=[]);y[d].push({fn:h,order:"number"===
-typeof c.order?c.order:Infinity});y[d].sort(function(b,d){return b.order-d.order});return function(){D(b,d,h)}},arrayMax:function(b){for(var d=b.length,h=b[0];d--;)b[d]>h&&(h=b[d]);return h},arrayMin:function(b){for(var d=b.length,h=b[0];d--;)b[d]<h&&(h=b[d]);return h},attr:c,clamp:function(b,d,h){return b>d?b<h?b:h:d},cleanRecursively:C,clearTimeout:function(b){g(b)&&clearTimeout(b)},correctFloat:q,createElement:v,css:f,defined:g,destroyObjectProperties:function(b,d){I(b,function(h,c){h&&h!==d&&
-h.destroy&&h.destroy();delete b[c]})},discardElement:function(b){d||(d=v("div"));b&&d.appendChild(b);d.innerHTML=""},erase:function(b,d){for(var h=b.length;h--;)if(b[h]===d){b.splice(h,1);break}},error:r,extend:e,extendClass:function(b,d){var h=function(){};h.prototype=new b;e(h.prototype,d);return h},find:b,fireEvent:B,getMagnitude:function(b){return Math.pow(10,Math.floor(Math.log(b)/Math.LN10))},getNestedProperty:function(b,d){for(b=b.split(".");b.length&&g(d);){var c=b.shift();if("undefined"===
-typeof c||"__proto__"===c)return;d=d[c];if(!g(d)||"function"===typeof d||"number"===typeof d.nodeType||d===h)return}return d},getStyle:k,inArray:function(b,d,h){r(32,!1,void 0,{"Highcharts.inArray":"use Array.indexOf"});return d.indexOf(b,h)},isArray:x,isClass:n,isDOMElement:u,isFunction:function(b){return"function"===typeof b},isNumber:m,isObject:J,isString:z,keys:function(b){r(32,!1,void 0,{"Highcharts.keys":"use Object.keys"});return Object.keys(b)},merge:function(){var b,d=arguments,h={},c=function(b,
-d){"object"!==typeof b&&(b={});I(d,function(h,H){"__proto__"!==H&&"constructor"!==H&&(!J(h,!0)||n(h)||u(h)?b[H]=d[H]:b[H]=c(b[H]||{},h))});return b};!0===d[0]&&(h=d[1],d=Array.prototype.slice.call(d,2));var p=d.length;for(b=0;b<p;b++)h=c(h,d[b]);return h},normalizeTickInterval:function(b,d,h,c,p){var e=b;h=l(h,1);var k=b/h;d||(d=p?[1,1.2,1.5,2,2.5,3,4,5,6,8,10]:[1,2,2.5,5,10],!1===c&&(1===h?d=d.filter(function(b){return 0===b%1}):.1>=h&&(d=[1/h])));for(c=0;c<d.length&&!(e=d[c],p&&e*h>=b||!p&&k<=(d[c]+
-(d[c+1]||d[c]))/2);c++);return e=q(e*h,-Math.round(Math.log(.001)/Math.LN10))},objectEach:I,offset:function(b){var d=t.documentElement;b=b.parentElement||b.parentNode?b.getBoundingClientRect():{top:0,left:0,width:0,height:0};return{top:b.top+(h.pageYOffset||d.scrollTop)-(d.clientTop||0),left:b.left+(h.pageXOffset||d.scrollLeft)-(d.clientLeft||0),width:b.width,height:b.height}},pad:function(b,d,h){return Array((d||2)+1-String(b).replace("-","").length).join(h||"0")+b},pick:l,pInt:E,relativeLength:function(b,
-d,h){return/%$/.test(b)?d*parseFloat(b)/100+(h||0):parseFloat(b)},removeEvent:D,splat:function(b){return x(b)?b:[b]},stableSort:function(b,d){var h=b.length,c,p;for(p=0;p<h;p++)b[p].safeI=p;b.sort(function(b,h){c=d(b,h);return 0===c?b.safeI-h.safeI:c});for(p=0;p<h;p++)delete b[p].safeI},syncTimeout:function(b,d,h){if(0<d)return setTimeout(b,d,h);b.call(0,h);return-1},timeUnits:{millisecond:1,second:1E3,minute:6E4,hour:36E5,day:864E5,week:6048E5,month:24192E5,year:314496E5},uniqueKey:G,useSerialIds:function(b){return p=
-l(b,p)},wrap:function(b,d,h){var c=b[d];b[d]=function(){var b=Array.prototype.slice.call(arguments),d=arguments,p=this;p.proceed=function(){c.apply(p,arguments.length?arguments:d)};b.unshift(c);b=h.apply(this,b);p.proceed=null;return b}}};"";return b});M(a,"Core/Color/Palette.js",[],function(){return{colors:"#7cb5ec #434348 #90ed7d #f7a35c #8085e9 #f15c80 #e4d354 #2b908f #f45b5b #91e8e1".split(" "),backgroundColor:"#ffffff",neutralColor100:"#000000",neutralColor80:"#333333",neutralColor60:"#666666",
-neutralColor40:"#999999",neutralColor20:"#cccccc",neutralColor10:"#e6e6e6",neutralColor5:"#f2f2f2",neutralColor3:"#f7f7f7",highlightColor100:"#003399",highlightColor80:"#335cad",highlightColor60:"#6685c2",highlightColor20:"#ccd6eb",highlightColor10:"#e6ebf5",positiveColor:"#06b535",negativeColor:"#f21313"}});M(a,"Core/Chart/ChartDefaults.js",[a["Core/Color/Palette.js"]],function(a){return{panning:{enabled:!1,type:"x"},styledMode:!1,borderRadius:0,colorCount:10,defaultSeriesType:"line",ignoreHiddenSeries:!0,
-spacing:[10,10,15,10],resetZoomButton:{theme:{zIndex:6},position:{align:"right",x:-10,y:10}},zoomBySingleTouch:!1,width:null,height:null,borderColor:a.highlightColor80,backgroundColor:a.backgroundColor,plotBorderColor:a.neutralColor20}});M(a,"Core/Color/Color.js",[a["Core/Globals.js"],a["Core/Utilities.js"]],function(a,w){var r=w.isNumber,E=w.merge,z=w.pInt;w=function(){function x(r){this.rgba=[NaN,NaN,NaN,NaN];this.input=r;var u=a.Color;if(u&&u!==x)return new u(r);if(!(this instanceof x))return new x(r);
-this.init(r)}x.parse=function(a){return a?new x(a):x.None};x.prototype.init=function(a){var u;if("object"===typeof a&&"undefined"!==typeof a.stops)this.stops=a.stops.map(function(c){return new x(c[1])});else if("string"===typeof a){this.input=a=x.names[a.toLowerCase()]||a;if("#"===a.charAt(0)){var n=a.length;var m=parseInt(a.substr(1),16);7===n?u=[(m&16711680)>>16,(m&65280)>>8,m&255,1]:4===n&&(u=[(m&3840)>>4|(m&3840)>>8,(m&240)>>4|m&240,(m&15)<<4|m&15,1])}if(!u)for(m=x.parsers.length;m--&&!u;){var g=
-x.parsers[m];(n=g.regex.exec(a))&&(u=g.parse(n))}}u&&(this.rgba=u)};x.prototype.get=function(a){var u=this.input,n=this.rgba;if("object"===typeof u&&"undefined"!==typeof this.stops){var m=E(u);m.stops=[].slice.call(m.stops);this.stops.forEach(function(g,c){m.stops[c]=[m.stops[c][0],g.get(a)]});return m}return n&&r(n[0])?"rgb"===a||!a&&1===n[3]?"rgb("+n[0]+","+n[1]+","+n[2]+")":"a"===a?""+n[3]:"rgba("+n.join(",")+")":u};x.prototype.brighten=function(a){var u=this.rgba;if(this.stops)this.stops.forEach(function(m){m.brighten(a)});
-else if(r(a)&&0!==a)for(var n=0;3>n;n++)u[n]+=z(255*a),0>u[n]&&(u[n]=0),255<u[n]&&(u[n]=255);return this};x.prototype.setOpacity=function(a){this.rgba[3]=a;return this};x.prototype.tweenTo=function(a,u){var n=this.rgba,m=a.rgba;if(!r(n[0])||!r(m[0]))return a.input||"none";a=1!==m[3]||1!==n[3];return(a?"rgba(":"rgb(")+Math.round(m[0]+(n[0]-m[0])*(1-u))+","+Math.round(m[1]+(n[1]-m[1])*(1-u))+","+Math.round(m[2]+(n[2]-m[2])*(1-u))+(a?","+(m[3]+(n[3]-m[3])*(1-u)):"")+")"};x.names={white:"#ffffff",black:"#000000"};
-x.parsers=[{regex:/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]?(?:\.[0-9]+)?)\s*\)/,parse:function(a){return[z(a[1]),z(a[2]),z(a[3]),parseFloat(a[4],10)]}},{regex:/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/,parse:function(a){return[z(a[1]),z(a[2]),z(a[3]),1]}}];x.None=new x("");return x}();"";return w});M(a,"Core/Time.js",[a["Core/Globals.js"],a["Core/Utilities.js"]],function(a,w){var r=a.win,E=w.defined,z=w.error,x=w.extend,J=w.isObject,u=w.merge,
-n=w.objectEach,m=w.pad,g=w.pick,c=w.splat,e=w.timeUnits,l=a.isSafari&&r.Intl&&r.Intl.DateTimeFormat.prototype.formatRange,f=a.isSafari&&r.Intl&&!r.Intl.DateTimeFormat.prototype.formatRange;w=function(){function v(c){this.options={};this.variableTimezone=this.useUTC=!1;this.Date=r.Date;this.getTimezoneOffset=this.timezoneOffsetFunction();this.update(c)}v.prototype.get=function(c,e){if(this.variableTimezone||this.timezoneOffset){var k=e.getTime(),f=k-this.getTimezoneOffset(e);e.setTime(f);c=e["getUTC"+
-c]();e.setTime(k);return c}return this.useUTC?e["getUTC"+c]():e["get"+c]()};v.prototype.set=function(c,e,f){if(this.variableTimezone||this.timezoneOffset){if("Milliseconds"===c||"Seconds"===c||"Minutes"===c&&0===this.getTimezoneOffset(e)%36E5)return e["setUTC"+c](f);var k=this.getTimezoneOffset(e);k=e.getTime()-k;e.setTime(k);e["setUTC"+c](f);c=this.getTimezoneOffset(e);k=e.getTime()+c;return e.setTime(k)}return this.useUTC||l&&"FullYear"===c?e["setUTC"+c](f):e["set"+c](f)};v.prototype.update=function(c){var e=
-g(c&&c.useUTC,!0);this.options=c=u(!0,this.options||{},c);this.Date=c.Date||r.Date||Date;this.timezoneOffset=(this.useUTC=e)&&c.timezoneOffset;this.getTimezoneOffset=this.timezoneOffsetFunction();this.variableTimezone=e&&!(!c.getTimezoneOffset&&!c.timezone)};v.prototype.makeTime=function(c,e,l,v,B,a){if(this.useUTC){var k=this.Date.UTC.apply(0,arguments);var h=this.getTimezoneOffset(k);k+=h;var d=this.getTimezoneOffset(k);h!==d?k+=d-h:h-36E5!==this.getTimezoneOffset(k-36E5)||f||(k-=36E5)}else k=(new this.Date(c,
-e,g(l,1),g(v,0),g(B,0),g(a,0))).getTime();return k};v.prototype.timezoneOffsetFunction=function(){var c=this,e=this.options,f=e.moment||r.moment;if(!this.useUTC)return function(c){return 6E4*(new Date(c.toString())).getTimezoneOffset()};if(e.timezone){if(f)return function(c){return 6E4*-f.tz(c,e.timezone).utcOffset()};z(25)}return this.useUTC&&e.getTimezoneOffset?function(c){return 6E4*e.getTimezoneOffset(c.valueOf())}:function(){return 6E4*(c.timezoneOffset||0)}};v.prototype.dateFormat=function(c,
-e,f){if(!E(e)||isNaN(e))return a.defaultOptions.lang&&a.defaultOptions.lang.invalidDate||"";c=g(c,"%Y-%m-%d %H:%M:%S");var k=this,l=new this.Date(e),q=this.get("Hours",l),t=this.get("Day",l),h=this.get("Date",l),d=this.get("Month",l),b=this.get("FullYear",l),p=a.defaultOptions.lang,G=p&&p.weekdays,y=p&&p.shortWeekdays;l=x({a:y?y[t]:G[t].substr(0,3),A:G[t],d:m(h),e:m(h,2," "),w:t,b:p.shortMonths[d],B:p.months[d],m:m(d+1),o:d+1,y:b.toString().substr(2,2),Y:b,H:m(q),k:q,I:m(q%12||12),l:q%12||12,M:m(this.get("Minutes",
-l)),p:12>q?"AM":"PM",P:12>q?"am":"pm",S:m(l.getSeconds()),L:m(Math.floor(e%1E3),3)},a.dateFormats);n(l,function(b,d){for(;-1!==c.indexOf("%"+d);)c=c.replace("%"+d,"function"===typeof b?b.call(k,e):b)});return f?c.substr(0,1).toUpperCase()+c.substr(1):c};v.prototype.resolveDTLFormat=function(e){return J(e,!0)?e:(e=c(e),{main:e[0],from:e[1],to:e[2]})};v.prototype.getTimeTicks=function(c,k,f,l){var q=this,v=[],t={},h=new q.Date(k),d=c.unitRange,b=c.count||1,p;l=g(l,1);if(E(k)){q.set("Milliseconds",h,
-d>=e.second?0:b*Math.floor(q.get("Milliseconds",h)/b));d>=e.second&&q.set("Seconds",h,d>=e.minute?0:b*Math.floor(q.get("Seconds",h)/b));d>=e.minute&&q.set("Minutes",h,d>=e.hour?0:b*Math.floor(q.get("Minutes",h)/b));d>=e.hour&&q.set("Hours",h,d>=e.day?0:b*Math.floor(q.get("Hours",h)/b));d>=e.day&&q.set("Date",h,d>=e.month?1:Math.max(1,b*Math.floor(q.get("Date",h)/b)));if(d>=e.month){q.set("Month",h,d>=e.year?0:b*Math.floor(q.get("Month",h)/b));var G=q.get("FullYear",h)}d>=e.year&&q.set("FullYear",
-h,G-G%b);d===e.week&&(G=q.get("Day",h),q.set("Date",h,q.get("Date",h)-G+l+(G<l?-7:0)));G=q.get("FullYear",h);l=q.get("Month",h);var y=q.get("Date",h),a=q.get("Hours",h);k=h.getTime();!q.variableTimezone&&q.useUTC||!E(f)||(p=f-k>4*e.month||q.getTimezoneOffset(k)!==q.getTimezoneOffset(f));k=h.getTime();for(h=1;k<f;)v.push(k),k=d===e.year?q.makeTime(G+h*b,0):d===e.month?q.makeTime(G,l+h*b):!p||d!==e.day&&d!==e.week?p&&d===e.hour&&1<b?q.makeTime(G,l,y,a+h*b):k+d*b:q.makeTime(G,l,y+h*b*(d===e.day?1:7)),
-h++;v.push(k);d<=e.hour&&1E4>v.length&&v.forEach(function(b){0===b%18E5&&"000000000"===q.dateFormat("%H%M%S%L",b)&&(t[b]="day")})}v.info=x(c,{higherRanks:t,totalRange:d*b});return v};v.prototype.getDateFormat=function(c,k,f,g){var l=this.dateFormat("%m-%d %H:%M:%S.%L",k),q={millisecond:15,second:12,minute:9,hour:6,day:3},t="millisecond";for(h in e){if(c===e.week&&+this.dateFormat("%w",k)===f&&"00:00:00.000"===l.substr(6)){var h="week";break}if(e[h]>c){h=t;break}if(q[h]&&l.substr(q[h])!=="01-01 00:00:00.000".substr(q[h]))break;
-"week"!==h&&(t=h)}if(h)var d=this.resolveDTLFormat(g[h]).main;return d};return v}();"";return w});M(a,"Core/DefaultOptions.js",[a["Core/Chart/ChartDefaults.js"],a["Core/Color/Color.js"],a["Core/Globals.js"],a["Core/Color/Palette.js"],a["Core/Time.js"],a["Core/Utilities.js"]],function(a,w,C,E,z,x){w=w.parse;var r=x.merge,u={colors:E.colors,symbols:["circle","diamond","square","triangle","triangle-down"],lang:{loading:"Loading...",months:"January February March April May June July August September October November December".split(" "),
-shortMonths:"Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),weekdays:"Sunday Monday Tuesday Wednesday Thursday Friday Saturday".split(" "),decimalPoint:".",numericSymbols:"kMGTPE".split(""),resetZoom:"Reset zoom",resetZoomTitle:"Reset zoom level 1:1",thousandsSep:" "},global:{},time:{Date:void 0,getTimezoneOffset:void 0,timezone:void 0,timezoneOffset:0,useUTC:!0},chart:a,title:{text:"Chart title",align:"center",margin:15,widthAdjust:-44},subtitle:{text:"",align:"center",widthAdjust:-44},
-caption:{margin:15,text:"",align:"left",verticalAlign:"bottom"},plotOptions:{},labels:{style:{position:"absolute",color:E.neutralColor80}},legend:{enabled:!0,align:"center",alignColumns:!0,className:"highcharts-no-tooltip",layout:"horizontal",labelFormatter:function(){return this.name},borderColor:E.neutralColor40,borderRadius:0,navigation:{activeColor:E.highlightColor100,inactiveColor:E.neutralColor20},itemStyle:{color:E.neutralColor80,cursor:"pointer",fontSize:"12px",fontWeight:"bold",textOverflow:"ellipsis"},
-itemHoverStyle:{color:E.neutralColor100},itemHiddenStyle:{color:E.neutralColor20},shadow:!1,itemCheckboxStyle:{position:"absolute",width:"13px",height:"13px"},squareSymbol:!0,symbolPadding:5,verticalAlign:"bottom",x:0,y:0,title:{style:{fontWeight:"bold"}}},loading:{labelStyle:{fontWeight:"bold",position:"relative",top:"45%"},style:{position:"absolute",backgroundColor:E.backgroundColor,opacity:.5,textAlign:"center"}},tooltip:{enabled:!0,animation:C.svg,borderRadius:3,dateTimeLabelFormats:{millisecond:"%A, %b %e, %H:%M:%S.%L",
-second:"%A, %b %e, %H:%M:%S",minute:"%A, %b %e, %H:%M",hour:"%A, %b %e, %H:%M",day:"%A, %b %e, %Y",week:"Week from %A, %b %e, %Y",month:"%B %Y",year:"%Y"},footerFormat:"",headerShape:"callout",hideDelay:500,padding:8,shape:"callout",shared:!1,snap:C.isTouchDevice?25:10,headerFormat:'<span style="font-size: 10px">{point.key}</span><br/>',pointFormat:'<span style="color:{point.color}">\u25cf</span> {series.name}: <b>{point.y}</b><br/>',backgroundColor:w(E.neutralColor3).setOpacity(.85).get(),borderWidth:1,
-shadow:!0,stickOnContact:!1,style:{color:E.neutralColor80,cursor:"default",fontSize:"12px",whiteSpace:"nowrap"},useHTML:!1},credits:{enabled:!0,href:"https://www.highcharts.com?credits",position:{align:"right",x:-10,verticalAlign:"bottom",y:-5},style:{cursor:"pointer",color:E.neutralColor40,fontSize:"9px"},text:"Highcharts.com"}};u.chart.styledMode=!1;"";var n=new z(r(u.global,u.time));a={defaultOptions:u,defaultTime:n,getOptions:function(){return u},setOptions:function(a){r(!0,u,a);if(a.time||a.global)C.time?
-C.time.update(r(u.global,u.time,a.global,a.time)):C.time=n;return u}};"";return a});M(a,"Core/Animation/Fx.js",[a["Core/Color/Color.js"],a["Core/Globals.js"],a["Core/Utilities.js"]],function(a,w,C){var r=a.parse,z=w.win,x=C.isNumber,J=C.objectEach;return function(){function a(a,m,g){this.pos=NaN;this.options=m;this.elem=a;this.prop=g}a.prototype.dSetter=function(){var a=this.paths,m=a&&a[0];a=a&&a[1];var g=this.now||0,c=[];if(1!==g&&m&&a)if(m.length===a.length&&1>g)for(var e=0;e<a.length;e++){for(var l=
-m[e],f=a[e],v=[],q=0;q<f.length;q++){var k=l[q],I=f[q];x(k)&&x(I)&&("A"!==f[0]||4!==q&&5!==q)?v[q]=k+g*(I-k):v[q]=I}c.push(v)}else c=a;else c=this.toD||[];this.elem.attr("d",c,void 0,!0)};a.prototype.update=function(){var a=this.elem,m=this.prop,g=this.now,c=this.options.step;if(this[m+"Setter"])this[m+"Setter"]();else a.attr?a.element&&a.attr(m,g,null,!0):a.style[m]=g+this.unit;c&&c.call(a,g,this)};a.prototype.run=function(n,m,g){var c=this,e=c.options,l=function(e){return l.stopped?!1:c.step(e)},
-f=z.requestAnimationFrame||function(c){setTimeout(c,13)},v=function(){for(var c=0;c<a.timers.length;c++)a.timers[c]()||a.timers.splice(c--,1);a.timers.length&&f(v)};n!==m||this.elem["forceAnimate:"+this.prop]?(this.startTime=+new Date,this.start=n,this.end=m,this.unit=g,this.now=this.start,this.pos=0,l.elem=this.elem,l.prop=this.prop,l()&&1===a.timers.push(l)&&f(v)):(delete e.curAnim[this.prop],e.complete&&0===Object.keys(e.curAnim).length&&e.complete.call(this.elem))};a.prototype.step=function(a){var m=
-+new Date,g=this.options,c=this.elem,e=g.complete,l=g.duration,f=g.curAnim;if(c.attr&&!c.element)a=!1;else if(a||m>=l+this.startTime){this.now=this.end;this.pos=1;this.update();var v=f[this.prop]=!0;J(f,function(c){!0!==c&&(v=!1)});v&&e&&e.call(c);a=!1}else this.pos=g.easing((m-this.startTime)/l),this.now=this.start+(this.end-this.start)*this.pos,this.update(),a=!0;return a};a.prototype.initPath=function(a,m,g){function c(c,e){for(;c.length<D;){var f=c[0],h=e[D-c.length];h&&"M"===f[0]&&(c[0]="C"===
-h[0]?["C",f[1],f[2],f[1],f[2],f[1],f[2]]:["L",f[1],f[2]]);c.unshift(f);v&&(f=c.pop(),c.push(c[c.length-1],f))}}function e(c,e){for(;c.length<D;)if(e=c[Math.floor(c.length/q)-1].slice(),"C"===e[0]&&(e[1]=e[5],e[2]=e[6]),v){var f=c[Math.floor(c.length/q)].slice();c.splice(c.length/2,0,e,f)}else c.push(e)}var l=a.startX,f=a.endX;g=g.slice();var v=a.isArea,q=v?2:1;m=m&&m.slice();if(!m)return[g,g];if(l&&f&&f.length){for(a=0;a<l.length;a++)if(l[a]===f[0]){var k=a;break}else if(l[0]===f[f.length-l.length+
-a]){k=a;var I=!0;break}else if(l[l.length-1]===f[f.length-l.length+a]){k=l.length-a;break}"undefined"===typeof k&&(m=[])}if(m.length&&x(k)){var D=g.length+k*q;I?(c(m,g),e(g,m)):(c(g,m),e(m,g))}return[m,g]};a.prototype.fillSetter=function(){a.prototype.strokeSetter.apply(this,arguments)};a.prototype.strokeSetter=function(){this.elem.attr(this.prop,r(this.start).tweenTo(r(this.end),this.pos),null,!0)};a.timers=[];return a}()});M(a,"Core/Animation/AnimationUtilities.js",[a["Core/Animation/Fx.js"],a["Core/Utilities.js"]],
-function(a,w){function r(c){return n(c)?m({duration:500,defer:0},c):{duration:c?500:0,defer:0}}function E(c,g){for(var e=a.timers.length;e--;)a.timers[e].elem!==c||g&&g!==a.timers[e].prop||(a.timers[e].stopped=!0)}var z=w.defined,x=w.getStyle,J=w.isArray,u=w.isNumber,n=w.isObject,m=w.merge,g=w.objectEach,c=w.pick;return{animate:function(c,l,f){var e,q="",k,I;if(!n(f)){var D=arguments;f={duration:D[2],easing:D[3],complete:D[4]}}u(f.duration)||(f.duration=400);f.easing="function"===typeof f.easing?
-f.easing:Math[f.easing]||Math.easeInOutSine;f.curAnim=m(l);g(l,function(g,v){E(c,v);I=new a(c,f,v);k=void 0;"d"===v&&J(l.d)?(I.paths=I.initPath(c,c.pathArray,l.d),I.toD=l.d,e=0,k=1):c.attr?e=c.attr(v):(e=parseFloat(x(c,v))||0,"opacity"!==v&&(q="px"));k||(k=g);"string"===typeof k&&k.match("px")&&(k=k.replace(/px/g,""));I.run(e,k,q)})},animObject:r,getDeferredAnimation:function(c,g,f){var e=r(g),a=0,k=0;(f?[f]:c.series).forEach(function(c){c=r(c.options.animation);a=g&&z(g.defer)?e.defer:Math.max(a,
-c.duration+c.defer);k=Math.min(e.duration,c.duration)});c.renderer.forExport&&(a=0);return{defer:Math.max(0,a-k),duration:Math.min(a,k)}},setAnimation:function(e,g){g.renderer.globalAnimation=c(e,g.options.chart.animation,!0)},stop:E}});M(a,"Core/Renderer/HTML/AST.js",[a["Core/Globals.js"],a["Core/Utilities.js"]],function(a,w){var r=a.SVG_NS,E=w.attr,z=w.createElement,x=w.discardElement,J=w.error,u=w.isString,n=w.objectEach,m=w.splat;try{var g=!!(new DOMParser).parseFromString("","text/html")}catch(c){g=
-!1}w=function(){function c(c){this.nodes="string"===typeof c?this.parseMarkup(c):c}c.filterUserAttributes=function(e){n(e,function(g,f){var a=!0;-1===c.allowedAttributes.indexOf(f)&&(a=!1);-1!==["background","dynsrc","href","lowsrc","src"].indexOf(f)&&(a=u(g)&&c.allowedReferences.some(function(c){return 0===g.indexOf(c)}));a||(J("Highcharts warning: Invalid attribute '"+f+"' in config"),delete e[f])});return e};c.setElementHTML=function(e,g){e.innerHTML="";g&&(new c(g)).addToDOM(e)};c.prototype.addToDOM=
-function(e){function g(e,l){var f;m(e).forEach(function(e){var k=e.tagName,q=e.textContent?a.doc.createTextNode(e.textContent):void 0;if(k)if("#text"===k)var v=q;else if(-1!==c.allowedTags.indexOf(k)){k=a.doc.createElementNS("svg"===k?r:l.namespaceURI||r,k);var m=e.attributes||{};n(e,function(c,h){"tagName"!==h&&"attributes"!==h&&"children"!==h&&"textContent"!==h&&(m[h]=c)});E(k,c.filterUserAttributes(m));q&&k.appendChild(q);g(e.children||[],k);v=k}else J("Highcharts warning: Invalid tagName '"+k+
-"' in config");v&&l.appendChild(v);f=v});return f}return g(this.nodes,e)};c.prototype.parseMarkup=function(c){var e=[];c=c.trim();if(g)c=(new DOMParser).parseFromString(c,"text/html");else{var f=z("div");f.innerHTML=c;c={body:f}}var a=function(c,e){var f=c.nodeName.toLowerCase(),k={tagName:f};"#text"===f&&(k.textContent=c.textContent||"");if(f=c.attributes){var g={};[].forEach.call(f,function(c){g[c.name]=c.value});k.attributes=g}if(c.childNodes.length){var l=[];[].forEach.call(c.childNodes,function(c){a(c,
-l)});l.length&&(k.children=l)}e.push(k)};[].forEach.call(c.body.childNodes,function(c){return a(c,e)});f&&x(f);return e};c.allowedAttributes="aria-controls aria-describedby aria-expanded aria-haspopup aria-hidden aria-label aria-labelledby aria-live aria-pressed aria-readonly aria-roledescription aria-selected class clip-path color colspan cx cy d dx dy disabled fill height href id in markerHeight markerWidth offset opacity orient padding paddingLeft paddingRight patternUnits r refX refY role scope slope src startOffset stdDeviation stroke stroke-linecap stroke-width style tableValues result rowspan summary target tabindex text-align textAnchor textLength type valign width x x1 x2 y y1 y2 zIndex".split(" ");
-c.allowedReferences="https:// http:// mailto: / ../ ./ #".split(" ");c.allowedTags="a b br button caption circle clipPath code dd defs div dl dt em feComponentTransfer feFuncA feFuncB feFuncG feFuncR feGaussianBlur feOffset feMerge feMergeNode filter h1 h2 h3 h4 h5 h6 hr i img li linearGradient marker ol p path pattern pre rect small span stop strong style sub sup svg table text thead tbody tspan td th tr u ul #text".split(" ");return c}();"";return w});M(a,"Core/FormatUtilities.js",[a["Core/DefaultOptions.js"],
-a["Core/Utilities.js"]],function(a,w){function r(a,g,c,e){a=+a||0;g=+g;var l=E.lang,f=(a.toString().split(".")[1]||"").split("e")[0].length,v=a.toString().split("e"),q=g;if(-1===g)g=Math.min(f,20);else if(!J(g))g=2;else if(g&&v[1]&&0>v[1]){var k=g+ +v[1];0<=k?(v[0]=(+v[0]).toExponential(k).split("e")[0],g=k):(v[0]=v[0].split(".")[0]||0,a=20>g?(v[0]*Math.pow(10,v[1])).toFixed(g):0,v[1]=0)}k=(Math.abs(v[1]?v[0]:a)+Math.pow(10,-Math.max(g,f)-1)).toFixed(g);f=String(n(k));var m=3<f.length?f.length%3:
-0;c=u(c,l.decimalPoint);e=u(e,l.thousandsSep);a=(0>a?"-":"")+(m?f.substr(0,m)+e:"");a=0>+v[1]&&!q?"0":a+f.substr(m).replace(/(\d{3})(?=\d)/g,"$1"+e);g&&(a+=c+k.slice(-g));v[1]&&0!==+a&&(a+="e"+v[1]);return a}var E=a.defaultOptions,z=a.defaultTime,x=w.getNestedProperty,J=w.isNumber,u=w.pick,n=w.pInt;return{dateFormat:function(a,g,c){return z.dateFormat(a,g,c)},format:function(a,g,c){var e="{",l=!1,f=/f$/,v=/\.([0-9])/,q=E.lang,k=c&&c.time||z;c=c&&c.numberFormatter||r;for(var m=[];a;){var D=a.indexOf(e);
-if(-1===D)break;var B=a.slice(0,D);if(l){B=B.split(":");e=x(B.shift()||"",g);if(B.length&&"number"===typeof e)if(B=B.join(":"),f.test(B)){var u=parseInt((B.match(v)||["","-1"])[1],10);null!==e&&(e=c(e,u,q.decimalPoint,-1<B.indexOf(",")?q.thousandsSep:""))}else e=k.dateFormat(B,e);m.push(e)}else m.push(B);a=a.slice(D+1);e=(l=!l)?"}":"{"}m.push(a);return m.join("")},numberFormat:r}});M(a,"Core/Renderer/RendererUtilities.js",[a["Core/Utilities.js"]],function(a){var r=a.clamp,C=a.pick,E=a.stableSort,
-z;(function(a){function x(a,n,m){var g=a,c=g.reducedLen||n,e=function(c,e){return(e.rank||0)-(c.rank||0)},l=function(c,e){return c.target-e.target},f,v=!0,q=[],k=0;for(f=a.length;f--;)k+=a[f].size;if(k>c){E(a,e);for(k=f=0;k<=c;)k+=a[f].size,f++;q=a.splice(f-1,a.length)}E(a,l);for(a=a.map(function(c){return{size:c.size,targets:[c.target],align:C(c.align,.5)}});v;){for(f=a.length;f--;)c=a[f],e=(Math.min.apply(0,c.targets)+Math.max.apply(0,c.targets))/2,c.pos=r(e-c.size*c.align,0,n-c.size);f=a.length;
-for(v=!1;f--;)0<f&&a[f-1].pos+a[f-1].size>a[f].pos&&(a[f-1].size+=a[f].size,a[f-1].targets=a[f-1].targets.concat(a[f].targets),a[f-1].align=.5,a[f-1].pos+a[f-1].size>n&&(a[f-1].pos=n-a[f-1].size),a.splice(f,1),v=!0)}g.push.apply(g,q);f=0;a.some(function(c){var e=0;return(c.targets||[]).some(function(){g[f].pos=c.pos+e;if("undefined"!==typeof m&&Math.abs(g[f].pos-g[f].target)>m)return g.slice(0,f+1).forEach(function(c){return delete c.pos}),g.reducedLen=(g.reducedLen||n)-.1*n,g.reducedLen>.1*n&&x(g,
-n,m),!0;e+=g[f].size;f++;return!1})});E(g,l);return g}a.distribute=x})(z||(z={}));return z});M(a,"Core/Renderer/SVG/SVGElement.js",[a["Core/Animation/AnimationUtilities.js"],a["Core/Renderer/HTML/AST.js"],a["Core/Color/Color.js"],a["Core/Globals.js"],a["Core/Color/Palette.js"],a["Core/Utilities.js"]],function(a,w,C,E,z,x){var r=a.animate,u=a.animObject,n=a.stop,m=E.deg2rad,g=E.doc,c=E.noop,e=E.svg,l=E.SVG_NS,f=E.win,v=x.addEvent,q=x.attr,k=x.createElement,I=x.css,D=x.defined,B=x.erase,O=x.extend,
-t=x.fireEvent,h=x.isArray,d=x.isFunction,b=x.isNumber,p=x.isString,G=x.merge,y=x.objectEach,L=x.pick,F=x.pInt,P=x.syncTimeout,S=x.uniqueKey;a=function(){function a(){this.element=void 0;this.onEvents={};this.opacity=1;this.renderer=void 0;this.SVG_NS=l;this.symbolCustomAttribs="x y width height r start end innerR anchorX anchorY rounded".split(" ")}a.prototype._defaultGetter=function(b){b=L(this[b+"Value"],this[b],this.element?this.element.getAttribute(b):null,0);/^[\-0-9\.]+$/.test(b)&&(b=parseFloat(b));
-return b};a.prototype._defaultSetter=function(b,d,c){c.setAttribute(d,b)};a.prototype.add=function(b){var d=this.renderer,c=this.element;b&&(this.parentGroup=b);this.parentInverted=b&&b.inverted;"undefined"!==typeof this.textStr&&"text"===this.element.nodeName&&d.buildText(this);this.added=!0;if(!b||b.handleZ||this.zIndex)var K=this.zIndexSetter();K||(b?b.element:d.box).appendChild(c);if(this.onAdd)this.onAdd();return this};a.prototype.addClass=function(b,d){var c=d?"":this.attr("class")||"";b=(b||
-"").split(/ /g).reduce(function(b,d){-1===c.indexOf(d)&&b.push(d);return b},c?[c]:[]).join(" ");b!==c&&this.attr("class",b);return this};a.prototype.afterSetters=function(){this.doTransform&&(this.updateTransform(),this.doTransform=!1)};a.prototype.align=function(b,d,c){var K={},h=this.renderer,H=h.alignedObjects,a,e,A;if(b){if(this.alignOptions=b,this.alignByTranslate=d,!c||p(c))this.alignTo=a=c||"renderer",B(H,this),H.push(this),c=void 0}else b=this.alignOptions,d=this.alignByTranslate,a=this.alignTo;
-c=L(c,h[a],"scrollablePlotBox"===a?h.plotBox:void 0,h);a=b.align;var f=b.verticalAlign;h=(c.x||0)+(b.x||0);H=(c.y||0)+(b.y||0);"right"===a?e=1:"center"===a&&(e=2);e&&(h+=(c.width-(b.width||0))/e);K[d?"translateX":"x"]=Math.round(h);"bottom"===f?A=1:"middle"===f&&(A=2);A&&(H+=(c.height-(b.height||0))/A);K[d?"translateY":"y"]=Math.round(H);this[this.placed?"animate":"attr"](K);this.placed=!0;this.alignAttr=K;return this};a.prototype.alignSetter=function(b){var d={left:"start",center:"middle",right:"end"};
-d[b]&&(this.alignValue=b,this.element.setAttribute("text-anchor",d[b]))};a.prototype.animate=function(b,d,c){var h=this,H=u(L(d,this.renderer.globalAnimation,!0));d=H.defer;L(g.hidden,g.msHidden,g.webkitHidden,!1)&&(H.duration=0);0!==H.duration?(c&&(H.complete=c),P(function(){h.element&&r(h,b,H)},d)):(this.attr(b,void 0,c),y(b,function(b,d){H.step&&H.step.call(this,b,{prop:d,pos:1,elem:this})},this));return this};a.prototype.applyTextOutline=function(b){var d=this.element;-1!==b.indexOf("contrast")&&
-(b=b.replace(/contrast/g,this.renderer.getContrast(d.style.fill)));var c=b.split(" ");b=c[c.length-1];if((c=c[0])&&"none"!==c&&E.svg){this.fakeTS=!0;this.ySetter=this.xSetter;c=c.replace(/(^[\d\.]+)(.*?)$/g,function(b,d,c){return 2*Number(d)+c});this.removeTextOutline();var h=g.createElementNS(l,"tspan");q(h,{"class":"highcharts-text-outline",fill:b,stroke:b,"stroke-width":c,"stroke-linejoin":"round"});[].forEach.call(d.childNodes,function(b){var d=b.cloneNode(!0);d.removeAttribute&&["fill","stroke",
-"stroke-width","stroke"].forEach(function(b){return d.removeAttribute(b)});h.appendChild(d)});var a=g.createElementNS(l,"tspan");a.textContent="\u200b";["x","y"].forEach(function(b){var c=d.getAttribute(b);c&&a.setAttribute(b,c)});h.appendChild(a);d.insertBefore(h,d.firstChild)}};a.prototype.attr=function(b,d,c,h){var K=this.element,H=this.symbolCustomAttribs,a,e=this,A,p;if("string"===typeof b&&"undefined"!==typeof d){var f=b;b={};b[f]=d}"string"===typeof b?e=(this[b+"Getter"]||this._defaultGetter).call(this,
-b,K):(y(b,function(d,c){A=!1;h||n(this,c);this.symbolName&&-1!==H.indexOf(c)&&(a||(this.symbolAttr(b),a=!0),A=!0);!this.rotation||"x"!==c&&"y"!==c||(this.doTransform=!0);A||(p=this[c+"Setter"]||this._defaultSetter,p.call(this,d,c,K),!this.styledMode&&this.shadows&&/^(width|height|visibility|x|y|d|transform|cx|cy|r)$/.test(c)&&this.updateShadows(c,d,p))},this),this.afterSetters());c&&c.call(this);return e};a.prototype.clip=function(b){return this.attr("clip-path",b?"url("+this.renderer.url+"#"+b.id+
-")":"none")};a.prototype.crisp=function(b,d){d=d||b.strokeWidth||0;var c=Math.round(d)%2/2;b.x=Math.floor(b.x||this.x||0)+c;b.y=Math.floor(b.y||this.y||0)+c;b.width=Math.floor((b.width||this.width||0)-2*c);b.height=Math.floor((b.height||this.height||0)-2*c);D(b.strokeWidth)&&(b.strokeWidth=d);return b};a.prototype.complexColor=function(b,d,c){var K=this.renderer,a,H,e,p,A,f,k,g,l,q,v=[],F;t(this.renderer,"complexColor",{args:arguments},function(){b.radialGradient?H="radialGradient":b.linearGradient&&
-(H="linearGradient");if(H){e=b[H];A=K.gradients;f=b.stops;l=c.radialReference;h(e)&&(b[H]=e={x1:e[0],y1:e[1],x2:e[2],y2:e[3],gradientUnits:"userSpaceOnUse"});"radialGradient"===H&&l&&!D(e.gradientUnits)&&(p=e,e=G(e,K.getRadialAttr(l,p),{gradientUnits:"userSpaceOnUse"}));y(e,function(b,d){"id"!==d&&v.push(d,b)});y(f,function(b){v.push(b)});v=v.join(",");if(A[v])q=A[v].attr("id");else{e.id=q=S();var N=A[v]=K.createElement(H).attr(e).add(K.defs);N.radAttr=p;N.stops=[];f.forEach(function(b){0===b[1].indexOf("rgba")?
-(a=C.parse(b[1]),k=a.get("rgb"),g=a.get("a")):(k=b[1],g=1);b=K.createElement("stop").attr({offset:b[0],"stop-color":k,"stop-opacity":g}).add(N);N.stops.push(b)})}F="url("+K.url+"#"+q+")";c.setAttribute(d,F);c.gradient=v;b.toString=function(){return F}}})};a.prototype.css=function(b){var d=this.styles,c={},h=this.element,a=["textOutline","textOverflow","width"],p="",f=!d;b&&b.color&&(b.fill=b.color);d&&y(b,function(b,h){d&&d[h]!==b&&(c[h]=b,f=!0)});if(f){d&&(b=O(d,c));if(b)if(null===b.width||"auto"===
-b.width)delete this.textWidth;else if("text"===h.nodeName.toLowerCase()&&b.width)var k=this.textWidth=F(b.width);this.styles=b;k&&!e&&this.renderer.forExport&&delete b.width;if(h.namespaceURI===this.SVG_NS){var A=function(b,d){return"-"+d.toLowerCase()};y(b,function(b,d){-1===a.indexOf(d)&&(p+=d.replace(/([A-Z])/g,A)+":"+b+";")});p&&q(h,"style",p)}else I(h,b);this.added&&("text"===this.element.nodeName&&this.renderer.buildText(this),b&&b.textOutline&&this.applyTextOutline(b.textOutline))}return this};
-a.prototype.dashstyleSetter=function(b){var d=this["stroke-width"];"inherit"===d&&(d=1);if(b=b&&b.toLowerCase()){var c=b.replace("shortdashdotdot","3,1,1,1,1,1,").replace("shortdashdot","3,1,1,1").replace("shortdot","1,1,").replace("shortdash","3,1,").replace("longdash","8,3,").replace(/dot/g,"1,3,").replace("dash","4,3,").replace(/,$/,"").split(",");for(b=c.length;b--;)c[b]=""+F(c[b])*L(d,NaN);b=c.join(",").replace(/NaN/g,"none");this.element.setAttribute("stroke-dasharray",b)}};a.prototype.destroy=
-function(){var b=this,d=b.element||{},c=b.renderer,h=d.ownerSVGElement,a=c.isSVG&&"SPAN"===d.nodeName&&b.parentGroup||void 0;d.onclick=d.onmouseout=d.onmouseover=d.onmousemove=d.point=null;n(b);if(b.clipPath&&h){var e=b.clipPath;[].forEach.call(h.querySelectorAll("[clip-path],[CLIP-PATH]"),function(b){-1<b.getAttribute("clip-path").indexOf(e.element.id)&&b.removeAttribute("clip-path")});b.clipPath=e.destroy()}if(b.stops){for(h=0;h<b.stops.length;h++)b.stops[h].destroy();b.stops.length=0;b.stops=void 0}b.safeRemoveChild(d);
-for(c.styledMode||b.destroyShadows();a&&a.div&&0===a.div.childNodes.length;)d=a.parentGroup,b.safeRemoveChild(a.div),delete a.div,a=d;b.alignTo&&B(c.alignedObjects,b);y(b,function(d,c){b[c]&&b[c].parentGroup===b&&b[c].destroy&&b[c].destroy();delete b[c]})};a.prototype.destroyShadows=function(){(this.shadows||[]).forEach(function(b){this.safeRemoveChild(b)},this);this.shadows=void 0};a.prototype.destroyTextPath=function(b,d){var c=b.getElementsByTagName("text")[0];if(c){if(c.removeAttribute("dx"),
-c.removeAttribute("dy"),d.element.setAttribute("id",""),this.textPathWrapper&&c.getElementsByTagName("textPath").length){for(b=this.textPathWrapper.element.childNodes;b.length;)c.appendChild(b[0]);c.removeChild(this.textPathWrapper.element)}}else if(b.getAttribute("dx")||b.getAttribute("dy"))b.removeAttribute("dx"),b.removeAttribute("dy");this.textPathWrapper&&(this.textPathWrapper=this.textPathWrapper.destroy())};a.prototype.dSetter=function(b,d,c){h(b)&&("string"===typeof b[0]&&(b=this.renderer.pathToSegments(b)),
-this.pathArray=b,b=b.reduce(function(b,d,c){return d&&d.join?(c?b+" ":"")+d.join(" "):(d||"").toString()},""));/(NaN| {2}|^$)/.test(b)&&(b="M 0 0");this[d]!==b&&(c.setAttribute(d,b),this[d]=b)};a.prototype.fadeOut=function(b){var d=this;d.animate({opacity:0},{duration:L(b,150),complete:function(){d.attr({y:-9999}).hide()}})};a.prototype.fillSetter=function(b,d,c){"string"===typeof b?c.setAttribute(d,b):b&&this.complexColor(b,d,c)};a.prototype.getBBox=function(b,c){var h=this.renderer,K=this.element,
-e=this.styles,p=this.textStr,f=h.cache,k=h.cacheKeys,A=K.namespaceURI===this.SVG_NS;c=L(c,this.rotation,0);var g=h.styledMode?K&&a.prototype.getStyle.call(K,"font-size"):e&&e.fontSize,y;if(D(p)){var G=p.toString();-1===G.indexOf("<")&&(G=G.replace(/[0-9]/g,"0"));G+=["",c,g,this.textWidth,e&&e.textOverflow,e&&e.fontWeight].join()}G&&!b&&(y=f[G]);if(!y){if(A||h.forExport){try{var l=this.fakeTS&&function(b){var d=K.querySelector(".highcharts-text-outline");d&&I(d,{display:b})};d(l)&&l("none");y=K.getBBox?
-O({},K.getBBox()):{width:K.offsetWidth,height:K.offsetHeight};d(l)&&l("")}catch(Y){""}if(!y||0>y.width)y={width:0,height:0}}else y=this.htmlGetBBox();h.isSVG&&(b=y.width,h=y.height,A&&(y.height=h={"11px,17":14,"13px,20":16}[e&&e.fontSize+","+Math.round(h)]||h),c&&(e=c*m,y.width=Math.abs(h*Math.sin(e))+Math.abs(b*Math.cos(e)),y.height=Math.abs(h*Math.cos(e))+Math.abs(b*Math.sin(e))));if(G&&(""===p||0<y.height)){for(;250<k.length;)delete f[k.shift()];f[G]||k.push(G);f[G]=y}}return y};a.prototype.getStyle=
-function(b){return f.getComputedStyle(this.element||this,"").getPropertyValue(b)};a.prototype.hasClass=function(b){return-1!==(""+this.attr("class")).split(" ").indexOf(b)};a.prototype.hide=function(b){b?this.attr({y:-9999}):this.attr({visibility:"hidden"});return this};a.prototype.htmlGetBBox=function(){return{height:0,width:0,x:0,y:0}};a.prototype.init=function(b,d){this.element="span"===d?k(d):g.createElementNS(this.SVG_NS,d);this.renderer=b;t(this,"afterInit")};a.prototype.invert=function(b){this.inverted=
-b;this.updateTransform();return this};a.prototype.on=function(b,d){var c=this.onEvents;if(c[b])c[b]();c[b]=v(this.element,b,d);return this};a.prototype.opacitySetter=function(b,d,c){this.opacity=b=Number(Number(b).toFixed(3));c.setAttribute(d,b)};a.prototype.removeClass=function(b){return this.attr("class",(""+this.attr("class")).replace(p(b)?new RegExp("(^| )"+b+"( |$)"):b," ").replace(/ +/g," ").trim())};a.prototype.removeTextOutline=function(){var b=this.element.querySelector("tspan.highcharts-text-outline");
-b&&this.safeRemoveChild(b)};a.prototype.safeRemoveChild=function(b){var d=b.parentNode;d&&d.removeChild(b)};a.prototype.setRadialReference=function(b){var d=this.element.gradient&&this.renderer.gradients[this.element.gradient];this.element.radialReference=b;d&&d.radAttr&&d.animate(this.renderer.getRadialAttr(b,d.radAttr));return this};a.prototype.setTextPath=function(d,h){var a=this.element,K=this.text?this.text.element:a,e={textAnchor:"text-anchor"},p=!1,f=this.textPathWrapper,k=!f;h=G(!0,{enabled:!0,
-attributes:{dy:-5,startOffset:"50%",textAnchor:"middle"}},h);var A=w.filterUserAttributes(h.attributes);if(d&&h&&h.enabled){f&&null===f.element.parentNode?(k=!0,f=f.destroy()):f&&this.removeTextOutline.call(f.parentGroup);this.options&&this.options.padding&&(A.dx=-this.options.padding);f||(this.textPathWrapper=f=this.renderer.createElement("textPath"),p=!0);var g=f.element;(h=d.element.getAttribute("id"))||d.element.setAttribute("id",h=S());if(k)for(K.setAttribute("y",0),b(A.dx)&&K.setAttribute("x",
--A.dx),d=[].slice.call(K.childNodes),k=0;k<d.length;k++){var l=d[k];l.nodeType!==Node.TEXT_NODE&&"tspan"!==l.nodeName||g.appendChild(l)}p&&f&&f.add({element:K});g.setAttributeNS("http://www.w3.org/1999/xlink","href",this.renderer.url+"#"+h);D(A.dy)&&(g.parentNode.setAttribute("dy",A.dy),delete A.dy);D(A.dx)&&(g.parentNode.setAttribute("dx",A.dx),delete A.dx);y(A,function(b,d){g.setAttribute(e[d]||d,b)});a.removeAttribute("transform");this.removeTextOutline.call(f);this.text&&!this.renderer.styledMode&&
-this.attr({fill:"none","stroke-width":0});this.applyTextOutline=this.updateTransform=c}else f&&(delete this.updateTransform,delete this.applyTextOutline,this.destroyTextPath(a,d),this.updateTransform(),this.options&&this.options.rotation&&this.applyTextOutline(this.options.style.textOutline));return this};a.prototype.shadow=function(b,d,c){var h=[],a=this.element,e=this.oldShadowOptions,H={color:z.neutralColor100,offsetX:this.parentInverted?-1:1,offsetY:this.parentInverted?-1:1,opacity:.15,width:3},
-p=!1,A;!0===b?A=H:"object"===typeof b&&(A=O(H,b));A&&(A&&e&&y(A,function(b,d){b!==e[d]&&(p=!0)}),p&&this.destroyShadows(),this.oldShadowOptions=A);if(!A)this.destroyShadows();else if(!this.shadows){var f=A.opacity/A.width;var k=this.parentInverted?"translate("+A.offsetY+", "+A.offsetX+")":"translate("+A.offsetX+", "+A.offsetY+")";for(H=1;H<=A.width;H++){var g=a.cloneNode(!1);var G=2*A.width+1-2*H;q(g,{stroke:b.color||z.neutralColor100,"stroke-opacity":f*H,"stroke-width":G,transform:k,fill:"none"});
-g.setAttribute("class",(g.getAttribute("class")||"")+" highcharts-shadow");c&&(q(g,"height",Math.max(q(g,"height")-G,0)),g.cutHeight=G);d?d.element.appendChild(g):a.parentNode&&a.parentNode.insertBefore(g,a);h.push(g)}this.shadows=h}return this};a.prototype.show=function(b){return this.attr({visibility:b?"inherit":"visible"})};a.prototype.strokeSetter=function(b,d,c){this[d]=b;this.stroke&&this["stroke-width"]?(a.prototype.fillSetter.call(this,this.stroke,"stroke",c),c.setAttribute("stroke-width",
-this["stroke-width"]),this.hasStroke=!0):"stroke-width"===d&&0===b&&this.hasStroke?(c.removeAttribute("stroke"),this.hasStroke=!1):this.renderer.styledMode&&this["stroke-width"]&&(c.setAttribute("stroke-width",this["stroke-width"]),this.hasStroke=!0)};a.prototype.strokeWidth=function(){if(!this.renderer.styledMode)return this["stroke-width"]||0;var b=this.getStyle("stroke-width"),d=0;if(b.indexOf("px")===b.length-2)d=F(b);else if(""!==b){var c=g.createElementNS(l,"rect");q(c,{width:b,"stroke-width":0});
-this.element.parentNode.appendChild(c);d=c.getBBox().width;c.parentNode.removeChild(c)}return d};a.prototype.symbolAttr=function(b){var d=this;"x y r start end width height innerR anchorX anchorY clockwise".split(" ").forEach(function(c){d[c]=L(b[c],d[c])});d.attr({d:d.renderer.symbols[d.symbolName](d.x,d.y,d.width,d.height,d)})};a.prototype.textSetter=function(b){b!==this.textStr&&(delete this.textPxLength,this.textStr=b,this.added&&this.renderer.buildText(this))};a.prototype.titleSetter=function(b){var d=
-this.element,c=d.getElementsByTagName("title")[0]||g.createElementNS(this.SVG_NS,"title");d.insertBefore?d.insertBefore(c,d.firstChild):d.appendChild(c);c.textContent=String(L(b,"")).replace(/<[^>]*>/g,"").replace(/&lt;/g,"<").replace(/&gt;/g,">")};a.prototype.toFront=function(){var b=this.element;b.parentNode.appendChild(b);return this};a.prototype.translate=function(b,d){return this.attr({translateX:b,translateY:d})};a.prototype.updateShadows=function(b,d,c){var h=this.shadows;if(h)for(var a=h.length;a--;)c.call(h[a],
-"height"===b?Math.max(d-(h[a].cutHeight||0),0):"d"===b?this.d:d,b,h[a])};a.prototype.updateTransform=function(){var b=this.scaleX,d=this.scaleY,c=this.inverted,h=this.rotation,a=this.matrix,e=this.element,p=this.translateX||0,f=this.translateY||0;c&&(p+=this.width,f+=this.height);p=["translate("+p+","+f+")"];D(a)&&p.push("matrix("+a.join(",")+")");c?p.push("rotate(90) scale(-1,1)"):h&&p.push("rotate("+h+" "+L(this.rotationOriginX,e.getAttribute("x"),0)+" "+L(this.rotationOriginY,e.getAttribute("y")||
-0)+")");(D(b)||D(d))&&p.push("scale("+L(b,1)+" "+L(d,1)+")");p.length&&e.setAttribute("transform",p.join(" "))};a.prototype.visibilitySetter=function(b,d,c){"inherit"===b?c.removeAttribute(d):this[d]!==b&&c.setAttribute(d,b);this[d]=b};a.prototype.xGetter=function(b){"circle"===this.element.nodeName&&("x"===b?b="cx":"y"===b&&(b="cy"));return this._defaultGetter(b)};a.prototype.zIndexSetter=function(b,d){var c=this.renderer,h=this.parentGroup,a=(h||c).element||c.box,e=this.element;c=a===c.box;var p=
-!1;var f=this.added;var A;D(b)?(e.setAttribute("data-z-index",b),b=+b,this[d]===b&&(f=!1)):D(this[d])&&e.removeAttribute("data-z-index");this[d]=b;if(f){(b=this.zIndex)&&h&&(h.handleZ=!0);d=a.childNodes;for(A=d.length-1;0<=A&&!p;A--){h=d[A];f=h.getAttribute("data-z-index");var k=!D(f);if(h!==e)if(0>b&&k&&!c&&!A)a.insertBefore(e,d[A]),p=!0;else if(F(f)<=b||k&&(!D(b)||0<=b))a.insertBefore(e,d[A+1]||null),p=!0}p||(a.insertBefore(e,d[c?3:0]||null),p=!0)}return p};return a}();a.prototype["stroke-widthSetter"]=
-a.prototype.strokeSetter;a.prototype.yGetter=a.prototype.xGetter;a.prototype.matrixSetter=a.prototype.rotationOriginXSetter=a.prototype.rotationOriginYSetter=a.prototype.rotationSetter=a.prototype.scaleXSetter=a.prototype.scaleYSetter=a.prototype.translateXSetter=a.prototype.translateYSetter=a.prototype.verticalAlignSetter=function(b,d){this[d]=b;this.doTransform=!0};"";return a});M(a,"Core/Renderer/RendererRegistry.js",[a["Core/Globals.js"]],function(a){var r;(function(r){r.rendererTypes={};var w;
-r.getRendererType=function(a){void 0===a&&(a=w);return r.rendererTypes[a]||r.rendererTypes[w]};r.registerRendererType=function(C,x,E){r.rendererTypes[C]=x;if(!w||E)w=C,a.Renderer=x}})(r||(r={}));return r});M(a,"Core/Renderer/SVG/SVGLabel.js",[a["Core/Renderer/SVG/SVGElement.js"],a["Core/Utilities.js"]],function(a,w){var r=this&&this.__extends||function(){var a=function(g,c){a=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(c,a){c.__proto__=a}||function(c,a){for(var e in a)a.hasOwnProperty(e)&&
-(c[e]=a[e])};return a(g,c)};return function(g,c){function e(){this.constructor=g}a(g,c);g.prototype=null===c?Object.create(c):(e.prototype=c.prototype,new e)}}(),E=w.defined,z=w.extend,x=w.isNumber,J=w.merge,u=w.pick,n=w.removeEvent;return function(m){function g(c,a,l,f,v,q,k,I,D,B){var e=m.call(this)||this;e.paddingLeftSetter=e.paddingSetter;e.paddingRightSetter=e.paddingSetter;e.init(c,"g");e.textStr=a;e.x=l;e.y=f;e.anchorX=q;e.anchorY=k;e.baseline=D;e.className=B;e.addClass("button"===B?"highcharts-no-tooltip":
-"highcharts-label");B&&e.addClass("highcharts-"+B);e.text=c.text(void 0,0,0,I).attr({zIndex:1});var t;"string"===typeof v&&((t=/^url\((.*?)\)$/.test(v))||e.renderer.symbols[v])&&(e.symbolKey=v);e.bBox=g.emptyBBox;e.padding=3;e.baselineOffset=0;e.needsBox=c.styledMode||t;e.deferredAttr={};e.alignFactor=0;return e}r(g,m);g.prototype.alignSetter=function(c){c={left:0,center:.5,right:1}[c];c!==this.alignFactor&&(this.alignFactor=c,this.bBox&&x(this.xSetting)&&this.attr({x:this.xSetting}))};g.prototype.anchorXSetter=
-function(c,a){this.anchorX=c;this.boxAttr(a,Math.round(c)-this.getCrispAdjust()-this.xSetting)};g.prototype.anchorYSetter=function(c,a){this.anchorY=c;this.boxAttr(a,c-this.ySetting)};g.prototype.boxAttr=function(c,a){this.box?this.box.attr(c,a):this.deferredAttr[c]=a};g.prototype.css=function(c){if(c){var e={};c=J(c);g.textProps.forEach(function(a){"undefined"!==typeof c[a]&&(e[a]=c[a],delete c[a])});this.text.css(e);var l="width"in e;"fontSize"in e||"fontWeight"in e?this.updateTextPadding():l&&
-this.updateBoxSize()}return a.prototype.css.call(this,c)};g.prototype.destroy=function(){n(this.element,"mouseenter");n(this.element,"mouseleave");this.text&&this.text.destroy();this.box&&(this.box=this.box.destroy());a.prototype.destroy.call(this)};g.prototype.fillSetter=function(c,a){c&&(this.needsBox=!0);this.fill=c;this.boxAttr(a,c)};g.prototype.getBBox=function(){this.textStr&&0===this.bBox.width&&0===this.bBox.height&&this.updateBoxSize();var c=this.padding,a=u(this.paddingLeft,c);return{width:this.width,
-height:this.height,x:this.bBox.x-a,y:this.bBox.y-c}};g.prototype.getCrispAdjust=function(){return this.renderer.styledMode&&this.box?this.box.strokeWidth()%2/2:(this["stroke-width"]?parseInt(this["stroke-width"],10):0)%2/2};g.prototype.heightSetter=function(c){this.heightSetting=c};g.prototype.onAdd=function(){var c=this.textStr;this.text.add(this);this.attr({text:E(c)?c:"",x:this.x,y:this.y});this.box&&E(this.anchorX)&&this.attr({anchorX:this.anchorX,anchorY:this.anchorY})};g.prototype.paddingSetter=
-function(c,a){x(c)?c!==this[a]&&(this[a]=c,this.updateTextPadding()):this[a]=void 0};g.prototype.rSetter=function(c,a){this.boxAttr(a,c)};g.prototype.shadow=function(c){c&&!this.renderer.styledMode&&(this.updateBoxSize(),this.box&&this.box.shadow(c));return this};g.prototype.strokeSetter=function(c,a){this.stroke=c;this.boxAttr(a,c)};g.prototype["stroke-widthSetter"]=function(c,a){c&&(this.needsBox=!0);this["stroke-width"]=c;this.boxAttr(a,c)};g.prototype["text-alignSetter"]=function(c){this.textAlign=
-c};g.prototype.textSetter=function(c){"undefined"!==typeof c&&this.text.attr({text:c});this.updateTextPadding()};g.prototype.updateBoxSize=function(){var c=this.text.element.style,a={},l=this.padding,f=this.bBox=x(this.widthSetting)&&x(this.heightSetting)&&!this.textAlign||!E(this.text.textStr)?g.emptyBBox:this.text.getBBox();this.width=this.getPaddedWidth();this.height=(this.heightSetting||f.height||0)+2*l;c=this.renderer.fontMetrics(c&&c.fontSize,this.text);this.baselineOffset=l+Math.min((this.text.firstLineMetrics||
-c).b,f.height||Infinity);this.heightSetting&&(this.baselineOffset+=(this.heightSetting-c.h)/2);this.needsBox&&(this.box||(l=this.box=this.symbolKey?this.renderer.symbol(this.symbolKey):this.renderer.rect(),l.addClass(("button"===this.className?"":"highcharts-label-box")+(this.className?" highcharts-"+this.className+"-box":"")),l.add(this)),l=this.getCrispAdjust(),a.x=l,a.y=(this.baseline?-this.baselineOffset:0)+l,a.width=Math.round(this.width),a.height=Math.round(this.height),this.box.attr(z(a,this.deferredAttr)),
-this.deferredAttr={})};g.prototype.updateTextPadding=function(){var c=this.text;this.updateBoxSize();var a=this.baseline?0:this.baselineOffset,g=u(this.paddingLeft,this.padding);E(this.widthSetting)&&this.bBox&&("center"===this.textAlign||"right"===this.textAlign)&&(g+={center:.5,right:1}[this.textAlign]*(this.widthSetting-this.bBox.width));if(g!==c.x||a!==c.y)c.attr("x",g),c.hasBoxWidthChanged&&(this.bBox=c.getBBox(!0)),"undefined"!==typeof a&&c.attr("y",a);c.x=g;c.y=a};g.prototype.widthSetter=function(c){this.widthSetting=
-x(c)?c:void 0};g.prototype.getPaddedWidth=function(){var c=this.padding,a=u(this.paddingLeft,c);c=u(this.paddingRight,c);return(this.widthSetting||this.bBox.width||0)+a+c};g.prototype.xSetter=function(c){this.x=c;this.alignFactor&&(c-=this.alignFactor*this.getPaddedWidth(),this["forceAnimate:x"]=!0);this.xSetting=Math.round(c);this.attr("translateX",this.xSetting)};g.prototype.ySetter=function(c){this.ySetting=this.y=Math.round(c);this.attr("translateY",this.ySetting)};g.emptyBBox={width:0,height:0,
-x:0,y:0};g.textProps="color direction fontFamily fontSize fontStyle fontWeight lineHeight textAlign textDecoration textOutline textOverflow width".split(" ");return g}(a)});M(a,"Core/Renderer/SVG/Symbols.js",[a["Core/Utilities.js"]],function(a){function r(a,n,m,g,c){var e=[];if(c){var l=c.start||0,f=J(c.r,m);m=J(c.r,g||m);var v=(c.end||0)-.001;g=c.innerR;var q=J(c.open,.001>Math.abs((c.end||0)-l-2*Math.PI)),k=Math.cos(l),I=Math.sin(l),D=Math.cos(v),B=Math.sin(v);l=J(c.longArc,.001>v-l-Math.PI?0:1);
-e.push(["M",a+f*k,n+m*I],["A",f,m,0,l,J(c.clockwise,1),a+f*D,n+m*B]);z(g)&&e.push(q?["M",a+g*D,n+g*B]:["L",a+g*D,n+g*B],["A",g,g,0,l,z(c.clockwise)?1-c.clockwise:0,a+g*k,n+g*I]);q||e.push(["Z"])}return e}function C(a,n,m,g,c){return c&&c.r?E(a,n,m,g,c):[["M",a,n],["L",a+m,n],["L",a+m,n+g],["L",a,n+g],["Z"]]}function E(a,n,m,g,c){c=c&&c.r||0;return[["M",a+c,n],["L",a+m-c,n],["C",a+m,n,a+m,n,a+m,n+c],["L",a+m,n+g-c],["C",a+m,n+g,a+m,n+g,a+m-c,n+g],["L",a+c,n+g],["C",a,n+g,a,n+g,a,n+g-c],["L",a,n+c],
-["C",a,n,a,n,a+c,n]]}var z=a.defined,x=a.isNumber,J=a.pick;return{arc:r,callout:function(a,n,m,g,c){var e=Math.min(c&&c.r||0,m,g),l=e+6,f=c&&c.anchorX;c=c&&c.anchorY||0;var v=E(a,n,m,g,{r:e});if(!x(f))return v;a+f>=m?c>n+l&&c<n+g-l?v.splice(3,1,["L",a+m,c-6],["L",a+m+6,c],["L",a+m,c+6],["L",a+m,n+g-e]):v.splice(3,1,["L",a+m,g/2],["L",f,c],["L",a+m,g/2],["L",a+m,n+g-e]):0>=a+f?c>n+l&&c<n+g-l?v.splice(7,1,["L",a,c+6],["L",a-6,c],["L",a,c-6],["L",a,n+e]):v.splice(7,1,["L",a,g/2],["L",f,c],["L",a,g/2],
-["L",a,n+e]):c&&c>g&&f>a+l&&f<a+m-l?v.splice(5,1,["L",f+6,n+g],["L",f,n+g+6],["L",f-6,n+g],["L",a+e,n+g]):c&&0>c&&f>a+l&&f<a+m-l&&v.splice(1,1,["L",f-6,n],["L",f,n-6],["L",f+6,n],["L",m-e,n]);return v},circle:function(a,n,m,g){return r(a+m/2,n+g/2,m/2,g/2,{start:.5*Math.PI,end:2.5*Math.PI,open:!1})},diamond:function(a,n,m,g){return[["M",a+m/2,n],["L",a+m,n+g/2],["L",a+m/2,n+g],["L",a,n+g/2],["Z"]]},rect:C,roundedRect:E,square:C,triangle:function(a,n,m,g){return[["M",a+m/2,n],["L",a+m,n+g],["L",a,
-n+g],["Z"]]},"triangle-down":function(a,n,m,g){return[["M",a,n],["L",a+m,n],["L",a+m/2,n+g],["Z"]]}}});M(a,"Core/Renderer/SVG/TextBuilder.js",[a["Core/Renderer/HTML/AST.js"],a["Core/Globals.js"],a["Core/Utilities.js"]],function(a,w,C){var r=w.doc,z=w.SVG_NS,x=C.attr,J=C.isString,u=C.objectEach,n=C.pick;return function(){function m(a){var c=a.styles;this.renderer=a.renderer;this.svgElement=a;this.width=a.textWidth;this.textLineHeight=c&&c.lineHeight;this.textOutline=c&&c.textOutline;this.ellipsis=
-!(!c||"ellipsis"!==c.textOverflow);this.noWrap=!(!c||"nowrap"!==c.whiteSpace);this.fontSize=c&&c.fontSize}m.prototype.buildSVG=function(){var g=this.svgElement,c=g.element,e=g.renderer,l=n(g.textStr,"").toString(),f=-1!==l.indexOf("<"),v=c.childNodes;e=this.width&&!g.added&&e.box;var q=/<br.*?>/g,k=[l,this.ellipsis,this.noWrap,this.textLineHeight,this.textOutline,this.fontSize,this.width].join();if(k!==g.textCache){g.textCache=k;delete g.actualWidth;for(k=v.length;k--;)c.removeChild(v[k]);f||this.ellipsis||
-this.width||-1!==l.indexOf(" ")&&(!this.noWrap||q.test(l))?""!==l&&(e&&e.appendChild(c),l=new a(l),this.modifyTree(l.nodes),l.addToDOM(g.element),this.modifyDOM(),this.ellipsis&&-1!==(c.textContent||"").indexOf("\u2026")&&g.attr("title",this.unescapeEntities(g.textStr||"",["&lt;","&gt;"])),e&&e.removeChild(c)):c.appendChild(r.createTextNode(this.unescapeEntities(l)));J(this.textOutline)&&g.applyTextOutline&&g.applyTextOutline(this.textOutline)}};m.prototype.modifyDOM=function(){var a=this,c=this.svgElement,
-e=x(c.element,"x");c.firstLineMetrics=void 0;for(var l;l=c.element.firstChild;)if(/^[\s\u200B]*$/.test(l.textContent||" "))c.element.removeChild(l);else break;[].forEach.call(c.element.querySelectorAll("tspan.highcharts-br"),function(f,g){f.nextSibling&&f.previousSibling&&(0===g&&1===f.previousSibling.nodeType&&(c.firstLineMetrics=c.renderer.fontMetrics(void 0,f.previousSibling)),x(f,{dy:a.getLineHeight(f.nextSibling),x:e}))});var f=this.width||0;if(f){var v=function(k,g){var l=k.textContent||"",
-q=l.replace(/([^\^])-/g,"$1- ").split(" "),v=!a.noWrap&&(1<q.length||1<c.element.childNodes.length),t=a.getLineHeight(g),h=0,d=c.actualWidth;if(a.ellipsis)l&&a.truncate(k,l,void 0,0,Math.max(0,f-parseInt(a.fontSize||12,10)),function(b,d){return b.substring(0,d)+"\u2026"});else if(v){l=[];for(v=[];g.firstChild&&g.firstChild!==k;)v.push(g.firstChild),g.removeChild(g.firstChild);for(;q.length;)q.length&&!a.noWrap&&0<h&&(l.push(k.textContent||""),k.textContent=q.join(" ").replace(/- /g,"-")),a.truncate(k,
-void 0,q,0===h?d||0:0,f,function(b,d){return q.slice(0,d).join(" ").replace(/- /g,"-")}),d=c.actualWidth,h++;v.forEach(function(b){g.insertBefore(b,k)});l.forEach(function(b){g.insertBefore(r.createTextNode(b),k);b=r.createElementNS(z,"tspan");b.textContent="\u200b";x(b,{dy:t,x:e});g.insertBefore(b,k)})}},q=function(a){[].slice.call(a.childNodes).forEach(function(e){e.nodeType===Node.TEXT_NODE?v(e,a):(-1!==e.className.baseVal.indexOf("highcharts-br")&&(c.actualWidth=0),q(e))})};q(c.element)}};m.prototype.getLineHeight=
-function(a){var c;a=a.nodeType===Node.TEXT_NODE?a.parentElement:a;this.renderer.styledMode||(c=a&&/(px|em)$/.test(a.style.fontSize)?a.style.fontSize:this.fontSize||this.renderer.style.fontSize||12);return this.textLineHeight?parseInt(this.textLineHeight.toString(),10):this.renderer.fontMetrics(c,a||this.svgElement.element).h};m.prototype.modifyTree=function(a){var c=this,e=function(g,f){var l=g.tagName,q=c.renderer.styledMode,k=g.attributes||{};if("b"===l||"strong"===l)q?k["class"]="highcharts-strong":
-k.style="font-weight:bold;"+(k.style||"");else if("i"===l||"em"===l)q?k["class"]="highcharts-emphasized":k.style="font-style:italic;"+(k.style||"");J(k.style)&&(k.style=k.style.replace(/(;| |^)color([ :])/,"$1fill$2"));"br"===l&&(k["class"]="highcharts-br",g.textContent="\u200b",(f=a[f+1])&&f.textContent&&(f.textContent=f.textContent.replace(/^ +/gm,"")));"#text"!==l&&"a"!==l&&(g.tagName="tspan");g.attributes=k;g.children&&g.children.filter(function(c){return"#text"!==c.tagName}).forEach(e)};a.forEach(e)};
-m.prototype.truncate=function(a,c,e,l,f,v){var g=this.svgElement,k=g.renderer,m=g.rotation,D=[],B=e?1:0,n=(c||e||"").length,t=n,h,d=function(b,d){d=d||b;var h=a.parentNode;if(h&&"undefined"===typeof D[d])if(h.getSubStringLength)try{D[d]=l+h.getSubStringLength(0,e?d+1:d)}catch(L){""}else k.getSpanWidth&&(a.textContent=v(c||e,b),D[d]=l+k.getSpanWidth(g,a));return D[d]};g.rotation=0;var b=d(a.textContent.length);if(l+b>f){for(;B<=n;)t=Math.ceil((B+n)/2),e&&(h=v(e,t)),b=d(t,h&&h.length-1),B===n?B=n+1:
-b>f?n=t-1:B=t;0===n?a.textContent="":c&&n===c.length-1||(a.textContent=h||v(c||e,t))}e&&e.splice(0,t);g.actualWidth=b;g.rotation=m};m.prototype.unescapeEntities=function(a,c){u(this.renderer.escapes,function(e,g){c&&-1!==c.indexOf(e)||(a=a.toString().replace(new RegExp(e,"g"),g))});return a};return m}()});M(a,"Core/Renderer/SVG/SVGRenderer.js",[a["Core/Renderer/HTML/AST.js"],a["Core/Color/Color.js"],a["Core/Globals.js"],a["Core/Color/Palette.js"],a["Core/Renderer/RendererRegistry.js"],a["Core/Renderer/SVG/SVGElement.js"],
-a["Core/Renderer/SVG/SVGLabel.js"],a["Core/Renderer/SVG/Symbols.js"],a["Core/Renderer/SVG/TextBuilder.js"],a["Core/Utilities.js"]],function(a,w,C,E,z,x,J,u,n,m){var g=C.charts,c=C.deg2rad,e=C.doc,l=C.isFirefox,f=C.isMS,v=C.isWebKit,q=C.noop,k=C.SVG_NS,I=C.symbolSizes,D=C.win,B=m.addEvent,r=m.attr,t=m.createElement,h=m.css,d=m.defined,b=m.destroyObjectProperties,p=m.extend,G=m.isArray,y=m.isNumber,L=m.isObject,F=m.isString,P=m.merge,S=m.pick,Q=m.pInt,V=m.uniqueKey,fa;C=function(){function H(b,d,c,
-a,h,e,p){this.width=this.url=this.style=this.isSVG=this.imgCount=this.height=this.gradients=this.globalAnimation=this.defs=this.chartIndex=this.cacheKeys=this.cache=this.boxWrapper=this.box=this.alignedObjects=void 0;this.init(b,d,c,a,h,e,p)}H.prototype.init=function(b,d,c,a,p,A,H){var K=this.createElement("svg").attr({version:"1.1","class":"highcharts-root"}),f=K.element;H||K.css(this.getStyle(a));b.appendChild(f);r(b,"dir","ltr");-1===b.innerHTML.indexOf("xmlns")&&r(f,"xmlns",this.SVG_NS);this.isSVG=
-!0;this.box=f;this.boxWrapper=K;this.alignedObjects=[];this.url=this.getReferenceURL();this.createElement("desc").add().element.appendChild(e.createTextNode("Created with Highcharts 9.2.2"));this.defs=this.createElement("defs").add();this.allowHTML=A;this.forExport=p;this.styledMode=H;this.gradients={};this.cache={};this.cacheKeys=[];this.imgCount=0;this.setSize(d,c,!1);var k;l&&b.getBoundingClientRect&&(d=function(){h(b,{left:0,top:0});k=b.getBoundingClientRect();h(b,{left:Math.ceil(k.left)-k.left+
-"px",top:Math.ceil(k.top)-k.top+"px"})},d(),this.unSubPixelFix=B(D,"resize",d))};H.prototype.definition=function(b){return(new a([b])).addToDOM(this.defs.element)};H.prototype.getReferenceURL=function(){if((l||v)&&e.getElementsByTagName("base").length){if(!d(fa)){var b=V();b=(new a([{tagName:"svg",attributes:{width:8,height:8},children:[{tagName:"defs",children:[{tagName:"clipPath",attributes:{id:b},children:[{tagName:"rect",attributes:{width:4,height:4}}]}]},{tagName:"rect",attributes:{id:"hitme",
-width:8,height:8,"clip-path":"url(#"+b+")",fill:"rgba(0,0,0,0.001)"}}]}])).addToDOM(e.body);h(b,{position:"fixed",top:0,left:0,zIndex:9E5});var c=e.elementFromPoint(6,6);fa="hitme"===(c&&c.id);e.body.removeChild(b)}if(fa)return D.location.href.split("#")[0].replace(/<[^>]*>/g,"").replace(/([\('\)])/g,"\\$1").replace(/ /g,"%20")}return""};H.prototype.getStyle=function(b){return this.style=p({fontFamily:'"Lucida Grande", "Lucida Sans Unicode", Arial, Helvetica, sans-serif',fontSize:"12px"},b)};H.prototype.setStyle=
-function(b){this.boxWrapper.css(this.getStyle(b))};H.prototype.isHidden=function(){return!this.boxWrapper.getBBox().width};H.prototype.destroy=function(){var d=this.defs;this.box=null;this.boxWrapper=this.boxWrapper.destroy();b(this.gradients||{});this.gradients=null;d&&(this.defs=d.destroy());this.unSubPixelFix&&this.unSubPixelFix();return this.alignedObjects=null};H.prototype.createElement=function(b){var d=new this.Element;d.init(this,b);return d};H.prototype.getRadialAttr=function(b,d){return{cx:b[0]-
-b[2]/2+(d.cx||0)*b[2],cy:b[1]-b[2]/2+(d.cy||0)*b[2],r:(d.r||0)*b[2]}};H.prototype.buildText=function(b){(new n(b)).buildSVG()};H.prototype.getContrast=function(b){b=w.parse(b).rgba;b[0]*=1;b[1]*=1.2;b[2]*=.5;return 459<b[0]+b[1]+b[2]?"#000000":"#FFFFFF"};H.prototype.button=function(b,d,c,h,e,A,H,k,g,y){var K=this.label(b,d,c,g,void 0,void 0,y,void 0,"button"),G=this.styledMode,l=0,t=e?P(e):{};b=t&&t.style||{};t=a.filterUserAttributes(t);K.attr(P({padding:8,r:2},t));if(!G){t=P({fill:E.neutralColor3,
-stroke:E.neutralColor20,"stroke-width":1,style:{color:E.neutralColor80,cursor:"pointer",fontWeight:"normal"}},{style:b},t);var N=t.style;delete t.style;A=P(t,{fill:E.neutralColor10},a.filterUserAttributes(A||{}));var q=A.style;delete A.style;H=P(t,{fill:E.highlightColor10,style:{color:E.neutralColor100,fontWeight:"bold"}},a.filterUserAttributes(H||{}));var v=H.style;delete H.style;k=P(t,{style:{color:E.neutralColor20}},a.filterUserAttributes(k||{}));var F=k.style;delete k.style}B(K.element,f?"mouseover":
-"mouseenter",function(){3!==l&&K.setState(1)});B(K.element,f?"mouseout":"mouseleave",function(){3!==l&&K.setState(l)});K.setState=function(b){1!==b&&(K.state=l=b);K.removeClass(/highcharts-button-(normal|hover|pressed|disabled)/).addClass("highcharts-button-"+["normal","hover","pressed","disabled"][b||0]);G||K.attr([t,A,H,k][b||0]).css([N,q,v,F][b||0])};G||K.attr(t).css(p({cursor:"default"},N));return K.on("touchstart",function(b){return b.stopPropagation()}).on("click",function(b){3!==l&&h.call(K,
-b)})};H.prototype.crispLine=function(b,c,a){void 0===a&&(a="round");var h=b[0],e=b[1];d(h[1])&&h[1]===e[1]&&(h[1]=e[1]=Math[a](h[1])-c%2/2);d(h[2])&&h[2]===e[2]&&(h[2]=e[2]=Math[a](h[2])+c%2/2);return b};H.prototype.path=function(b){var d=this.styledMode?{}:{fill:"none"};G(b)?d.d=b:L(b)&&p(d,b);return this.createElement("path").attr(d)};H.prototype.circle=function(b,d,c){b=L(b)?b:"undefined"===typeof b?{}:{x:b,y:d,r:c};d=this.createElement("circle");d.xSetter=d.ySetter=function(b,d,c){c.setAttribute("c"+
-d,b)};return d.attr(b)};H.prototype.arc=function(b,d,c,a,h,e){L(b)?(a=b,d=a.y,c=a.r,b=a.x):a={innerR:a,start:h,end:e};b=this.symbol("arc",b,d,c,c,a);b.r=c;return b};H.prototype.rect=function(b,d,c,a,h,e){h=L(b)?b.r:h;var p=this.createElement("rect");b=L(b)?b:"undefined"===typeof b?{}:{x:b,y:d,width:Math.max(c,0),height:Math.max(a,0)};this.styledMode||("undefined"!==typeof e&&(b["stroke-width"]=e,b=p.crisp(b)),b.fill="none");h&&(b.r=h);p.rSetter=function(b,d,c){p.r=b;r(c,{rx:b,ry:b})};p.rGetter=function(){return p.r||
-0};return p.attr(b)};H.prototype.setSize=function(b,d,c){this.width=b;this.height=d;this.boxWrapper.animate({width:b,height:d},{step:function(){this.attr({viewBox:"0 0 "+this.attr("width")+" "+this.attr("height")})},duration:S(c,!0)?void 0:0});this.alignElements()};H.prototype.g=function(b){var d=this.createElement("g");return b?d.attr({"class":"highcharts-"+b}):d};H.prototype.image=function(b,d,c,a,h,e){var A={preserveAspectRatio:"none"},H=function(b,d){b.setAttributeNS?b.setAttributeNS("http://www.w3.org/1999/xlink",
-"href",d):b.setAttribute("hc-svg-href",d)};1<arguments.length&&p(A,{x:d,y:c,width:a,height:h});var f=this.createElement("image").attr(A);A=function(d){H(f.element,b);e.call(f,d)};if(e){H(f.element,"data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==");var K=new D.Image;B(K,"load",A);K.src=b;K.complete&&A({})}else H(f.element,b);return f};H.prototype.symbol=function(b,c,a,H,f,A){var K=this,k=/^url\((.*?)\)$/,y=k.test(b),G=!y&&(this.symbols[b]?b:"circle"),l=G&&this.symbols[G],
-q;if(l){"number"===typeof c&&(q=l.call(this.symbols,Math.round(c||0),Math.round(a||0),H||0,f||0,A));var v=this.path(q);K.styledMode||v.attr("fill","none");p(v,{symbolName:G||void 0,x:c,y:a,width:H,height:f});A&&p(v,A)}else if(y){var F=b.match(k)[1];var m=v=this.image(F);m.imgwidth=S(I[F]&&I[F].width,A&&A.width);m.imgheight=S(I[F]&&I[F].height,A&&A.height);var L=function(b){return b.attr({width:b.width,height:b.height})};["width","height"].forEach(function(b){m[b+"Setter"]=function(b,c){var a=this["img"+
-c];this[c]=b;d(a)&&(A&&"within"===A.backgroundSize&&this.width&&this.height&&(a=Math.round(a*Math.min(this.width/this.imgwidth,this.height/this.imgheight))),this.element&&this.element.setAttribute(c,a),this.alignByTranslate||(b=((this[c]||0)-a)/2,this.attr("width"===c?{translateX:b}:{translateY:b})))}});d(c)&&m.attr({x:c,y:a});m.isImg=!0;d(m.imgwidth)&&d(m.imgheight)?L(m):(m.attr({width:0,height:0}),t("img",{onload:function(){var b=g[K.chartIndex];0===this.width&&(h(this,{position:"absolute",top:"-999em"}),
-e.body.appendChild(this));I[F]={width:this.width,height:this.height};m.imgwidth=this.width;m.imgheight=this.height;m.element&&L(m);this.parentNode&&this.parentNode.removeChild(this);K.imgCount--;if(!K.imgCount&&b&&!b.hasLoaded)b.onload()},src:F}),this.imgCount++)}return v};H.prototype.clipRect=function(b,d,c,a){var h=V()+"-",e=this.createElement("clipPath").attr({id:h}).add(this.defs);b=this.rect(b,d,c,a,0).add(e);b.id=h;b.clipPath=e;b.count=0;return b};H.prototype.text=function(b,c,a,h){var e={};
-if(h&&(this.allowHTML||!this.forExport))return this.html(b,c,a);e.x=Math.round(c||0);a&&(e.y=Math.round(a));d(b)&&(e.text=b);b=this.createElement("text").attr(e);if(!h||this.forExport&&!this.allowHTML)b.xSetter=function(b,d,c){for(var a=c.getElementsByTagName("tspan"),h=c.getAttribute(d),e=0,p;e<a.length;e++)p=a[e],p.getAttribute(d)===h&&p.setAttribute(d,b);c.setAttribute(d,b)};return b};H.prototype.fontMetrics=function(b,d){b=!this.styledMode&&/px/.test(b)||!D.getComputedStyle?b||d&&d.style&&d.style.fontSize||
-this.style&&this.style.fontSize:d&&x.prototype.getStyle.call(d,"font-size");b=/px/.test(b)?Q(b):12;d=24>b?b+3:Math.round(1.2*b);return{h:d,b:Math.round(.8*d),f:b}};H.prototype.rotCorr=function(b,d,a){var h=b;d&&a&&(h=Math.max(h*Math.cos(d*c),4));return{x:-b/3*Math.sin(d*c),y:h}};H.prototype.pathToSegments=function(b){for(var d=[],c=[],a={A:8,C:7,H:2,L:3,M:3,Q:5,S:5,T:3,V:2},h=0;h<b.length;h++)F(c[0])&&y(b[h])&&c.length===a[c[0].toUpperCase()]&&b.splice(h,0,c[0].replace("M","L").replace("m","l")),
-"string"===typeof b[h]&&(c.length&&d.push(c.slice(0)),c.length=0),c.push(b[h]);d.push(c.slice(0));return d};H.prototype.label=function(b,d,c,a,h,e,p,H,f){return new J(this,b,d,c,a,h,e,p,H,f)};H.prototype.alignElements=function(){this.alignedObjects.forEach(function(b){return b.align()})};return H}();p(C.prototype,{Element:x,SVG_NS:k,escapes:{"&":"&amp;","<":"&lt;",">":"&gt;","'":"&#39;",'"':"&quot;"},symbols:u,draw:q});z.registerRendererType("svg",C,!0);"";return C});M(a,"Core/Renderer/HTML/HTMLElement.js",
-[a["Core/Globals.js"],a["Core/Renderer/SVG/SVGElement.js"],a["Core/Utilities.js"]],function(a,w,C){var r=this&&this.__extends||function(){var c=function(a,e){c=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(c,a){c.__proto__=a}||function(c,a){for(var e in a)a.hasOwnProperty(e)&&(c[e]=a[e])};return c(a,e)};return function(a,e){function f(){this.constructor=a}c(a,e);a.prototype=null===e?Object.create(e):(f.prototype=e.prototype,new f)}}(),z=a.isFirefox,x=a.isMS,J=a.isWebKit,u=a.win,
-n=C.css,m=C.defined,g=C.extend,c=C.pick,e=C.pInt;return function(a){function f(){return null!==a&&a.apply(this,arguments)||this}r(f,a);f.compose=function(c){if(-1===f.composedClasses.indexOf(c)){f.composedClasses.push(c);var a=f.prototype,e=c.prototype;e.getSpanCorrection=a.getSpanCorrection;e.htmlCss=a.htmlCss;e.htmlGetBBox=a.htmlGetBBox;e.htmlUpdateTransform=a.htmlUpdateTransform;e.setSpanRotation=a.setSpanRotation}return c};f.prototype.getSpanCorrection=function(c,a,e){this.xCorr=-c*e;this.yCorr=
--a};f.prototype.htmlCss=function(a){var e="SPAN"===this.element.tagName&&a&&"width"in a,f=c(e&&a.width,void 0);if(e){delete a.width;this.textWidth=f;var l=!0}a&&"ellipsis"===a.textOverflow&&(a.whiteSpace="nowrap",a.overflow="hidden");this.styles=g(this.styles,a);n(this.element,a);l&&this.htmlUpdateTransform();return this};f.prototype.htmlGetBBox=function(){var c=this.element;return{x:c.offsetLeft,y:c.offsetTop,width:c.offsetWidth,height:c.offsetHeight}};f.prototype.htmlUpdateTransform=function(){if(this.added){var c=
-this.renderer,a=this.element,f=this.translateX||0,g=this.translateY||0,l=this.x||0,B=this.y||0,r=this.textAlign||"left",t={left:0,center:.5,right:1}[r],h=this.styles;h=h&&h.whiteSpace;n(a,{marginLeft:f,marginTop:g});!c.styledMode&&this.shadows&&this.shadows.forEach(function(b){n(b,{marginLeft:f+1,marginTop:g+1})});this.inverted&&[].forEach.call(a.childNodes,function(b){c.invertChild(b,a)});if("SPAN"===a.tagName){var d=this.rotation,b=this.textWidth&&e(this.textWidth),p=[d,r,a.innerHTML,this.textWidth,
-this.textAlign].join(),G=void 0;(G=b!==this.oldTextWidth)&&!(G=b>this.oldTextWidth)&&((G=this.textPxLength)||(n(a,{width:"",whiteSpace:h||"nowrap"}),G=a.offsetWidth),G=G>b);G&&(/[ \-]/.test(a.textContent||a.innerText)||"ellipsis"===a.style.textOverflow)?(n(a,{width:b+"px",display:"block",whiteSpace:h||"normal"}),this.oldTextWidth=b,this.hasBoxWidthChanged=!0):this.hasBoxWidthChanged=!1;p!==this.cTT&&(G=c.fontMetrics(a.style.fontSize,a).b,!m(d)||d===(this.oldRotation||0)&&r===this.oldAlign||this.setSpanRotation(d,
-t,G),this.getSpanCorrection(!m(d)&&this.textPxLength||a.offsetWidth,G,t,d,r));n(a,{left:l+(this.xCorr||0)+"px",top:B+(this.yCorr||0)+"px"});this.cTT=p;this.oldRotation=d;this.oldAlign=r}}else this.alignOnAdd=!0};f.prototype.setSpanRotation=function(c,a,e){var f={},g=x&&!/Edge/.test(u.navigator.userAgent)?"-ms-transform":J?"-webkit-transform":z?"MozTransform":u.opera?"-o-transform":void 0;g&&(f[g]=f.transform="rotate("+c+"deg)",f[g+(z?"Origin":"-origin")]=f.transformOrigin=100*a+"% "+e+"px",n(this.element,
-f))};f.composedClasses=[];return f}(w)});M(a,"Core/Renderer/HTML/HTMLRenderer.js",[a["Core/Renderer/HTML/AST.js"],a["Core/Renderer/SVG/SVGElement.js"],a["Core/Renderer/SVG/SVGRenderer.js"],a["Core/Utilities.js"]],function(a,w,C,E){var r=this&&this.__extends||function(){var a=function(g,c){a=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(a,c){a.__proto__=c}||function(a,c){for(var e in c)c.hasOwnProperty(e)&&(a[e]=c[e])};return a(g,c)};return function(g,c){function e(){this.constructor=
-g}a(g,c);g.prototype=null===c?Object.create(c):(e.prototype=c.prototype,new e)}}(),x=E.attr,J=E.createElement,u=E.extend,n=E.pick;return function(m){function g(){return null!==m&&m.apply(this,arguments)||this}r(g,m);g.compose=function(c){-1===g.composedClasses.indexOf(c)&&(g.composedClasses.push(c),c.prototype.html=g.prototype.html);return c};g.prototype.html=function(c,e,g){var f=this.createElement("span"),l=f.element,q=f.renderer,k=q.isSVG,m=function(c,a){["opacity","visibility"].forEach(function(e){c[e+
-"Setter"]=function(f,h,d){var b=c.div?c.div.style:a;w.prototype[e+"Setter"].call(this,f,h,d);b&&(b[h]=f)}});c.addedSetters=!0};f.textSetter=function(c){c!==this.textStr&&(delete this.bBox,delete this.oldTextWidth,a.setElementHTML(this.element,n(c,"")),this.textStr=c,f.doTransform=!0)};k&&m(f,f.element.style);f.xSetter=f.ySetter=f.alignSetter=f.rotationSetter=function(c,a){"align"===a?f.alignValue=f.textAlign=c:f[a]=c;f.doTransform=!0};f.afterSetters=function(){this.doTransform&&(this.htmlUpdateTransform(),
-this.doTransform=!1)};f.attr({text:c,x:Math.round(e),y:Math.round(g)}).css({position:"absolute"});q.styledMode||f.css({fontFamily:this.style.fontFamily,fontSize:this.style.fontSize});l.style.whiteSpace="nowrap";f.css=f.htmlCss;k&&(f.add=function(c){var a=q.box.parentNode,e=[];if(this.parentGroup=c){var g=c.div;if(!g){for(;c;)e.push(c),c=c.parentGroup;e.reverse().forEach(function(c){function d(b,d){c[d]=b;"translateX"===d?k.left=b+"px":k.top=b+"px";c.doTransform=!0}var b=x(c.element,"class"),h=c.styles||
-{};g=c.div=c.div||J("div",b?{className:b}:void 0,{position:"absolute",left:(c.translateX||0)+"px",top:(c.translateY||0)+"px",display:c.display,opacity:c.opacity,cursor:h.cursor,pointerEvents:h.pointerEvents,visibility:c.visibility},g||a);var k=g.style;u(c,{classSetter:function(b){return function(d){this.element.setAttribute("class",d);b.className=d}}(g),on:function(){e[0].div&&f.on.apply({element:e[0].div,onEvents:c.onEvents},arguments);return c},translateXSetter:d,translateYSetter:d});c.addedSetters||
-m(c)})}}else g=a;g.appendChild(l);f.added=!0;f.alignOnAdd&&f.htmlUpdateTransform();return f});return f};g.composedClasses=[];return g}(C)});M(a,"Core/Axis/AxisDefaults.js",[a["Core/Color/Palette.js"]],function(a){var r;(function(r){r.defaultXAxisOptions={alignTicks:!0,allowDecimals:void 0,panningEnabled:!0,zIndex:2,zoomEnabled:!0,dateTimeLabelFormats:{millisecond:{main:"%H:%M:%S.%L",range:!1},second:{main:"%H:%M:%S",range:!1},minute:{main:"%H:%M",range:!1},hour:{main:"%H:%M",range:!1},day:{main:"%e. %b"},
-week:{main:"%e. %b"},month:{main:"%b '%y"},year:{main:"%Y"}},endOnTick:!1,gridLineDashStyle:"Solid",gridZIndex:1,labels:{autoRotation:void 0,autoRotationLimit:80,distance:void 0,enabled:!0,indentation:10,overflow:"justify",padding:5,reserveSpace:void 0,rotation:void 0,staggerLines:0,step:0,useHTML:!1,x:0,zIndex:7,style:{color:a.neutralColor60,cursor:"default",fontSize:"11px"}},maxPadding:.01,minorGridLineDashStyle:"Solid",minorTickLength:2,minorTickPosition:"outside",minPadding:.01,offset:void 0,
-opposite:!1,reversed:void 0,reversedStacks:!1,showEmpty:!0,showFirstLabel:!0,showLastLabel:!0,startOfWeek:1,startOnTick:!1,tickLength:10,tickPixelInterval:100,tickmarkPlacement:"between",tickPosition:"outside",title:{align:"middle",rotation:0,useHTML:!1,x:0,y:0,style:{color:a.neutralColor60}},type:"linear",uniqueNames:!0,visible:!0,minorGridLineColor:a.neutralColor5,minorGridLineWidth:1,minorTickColor:a.neutralColor40,lineColor:a.highlightColor20,lineWidth:1,gridLineColor:a.neutralColor10,gridLineWidth:void 0,
-tickColor:a.highlightColor20};r.defaultYAxisOptions={reversedStacks:!0,endOnTick:!0,maxPadding:.05,minPadding:.05,tickPixelInterval:72,showLastLabel:!0,labels:{x:-8},startOnTick:!0,title:{rotation:270,text:"Values"},stackLabels:{animation:{},allowOverlap:!1,enabled:!1,crop:!0,overflow:"justify",formatter:function(){var a=this.axis.chart.numberFormatter;return a(this.total,-1)},style:{color:a.neutralColor100,fontSize:"11px",fontWeight:"bold",textOutline:"1px contrast"}},gridLineWidth:1,lineWidth:0};
-r.defaultLeftAxisOptions={labels:{x:-15},title:{rotation:270}};r.defaultRightAxisOptions={labels:{x:15},title:{rotation:90}};r.defaultBottomAxisOptions={labels:{autoRotation:[-45],x:0},margin:15,title:{rotation:0}};r.defaultTopAxisOptions={labels:{autoRotation:[-45],x:0},margin:15,title:{rotation:0}}})(r||(r={}));return r});M(a,"Core/Foundation.js",[a["Core/Utilities.js"]],function(a){var r=a.addEvent,C=a.isFunction,E=a.objectEach,z=a.removeEvent;return{registerEventOptions:function(a,w){a.eventOptions=
-a.eventOptions||{};E(w.events,function(u,n){a.eventOptions[n]!==u&&(a.eventOptions[n]&&(z(a,n,a.eventOptions[n]),delete a.eventOptions[n]),C(u)&&(a.eventOptions[n]=u,r(a,n,u)))})}}});M(a,"Core/Axis/Tick.js",[a["Core/FormatUtilities.js"],a["Core/Globals.js"],a["Core/Utilities.js"]],function(a,w,C){var r=w.deg2rad,z=C.clamp,x=C.correctFloat,J=C.defined,u=C.destroyObjectProperties,n=C.extend,m=C.fireEvent,g=C.isNumber,c=C.merge,e=C.objectEach,l=C.pick;w=function(){function f(c,a,e,f,g){this.isNewLabel=
-this.isNew=!0;this.axis=c;this.pos=a;this.type=e||"";this.parameters=g||{};this.tickmarkOffset=this.parameters.tickmarkOffset;this.options=this.parameters.options;m(this,"init");e||f||this.addLabel()}f.prototype.addLabel=function(){var c=this,e=c.axis,f=e.options,I=e.chart,D=e.categories,B=e.logarithmic,r=e.names,t=c.pos,h=l(c.options&&c.options.labels,f.labels),d=e.tickPositions,b=t===d[0],p=t===d[d.length-1],G=(!h.step||1===h.step)&&1===e.tickInterval;d=d.info;var y=c.label,L;D=this.parameters.category||
-(D?l(D[t],r[t],t):t);B&&g(D)&&(D=x(B.lin2log(D)));if(e.dateTime)if(d){var F=I.time.resolveDTLFormat(f.dateTimeLabelFormats[!f.grid&&d.higherRanks[t]||d.unitName]);var P=F.main}else g(D)&&(P=e.dateTime.getXDateFormat(D,f.dateTimeLabelFormats||{}));c.isFirst=b;c.isLast=p;var S={axis:e,chart:I,dateTimeLabelFormat:P,isFirst:b,isLast:p,pos:t,tick:c,tickPositionInfo:d,value:D};m(this,"labelFormat",S);var Q=function(b){return h.formatter?h.formatter.call(b,b):h.format?(b.text=e.defaultLabelFormatter.call(b),
-a.format(h.format,b,I)):e.defaultLabelFormatter.call(b,b)};f=Q.call(S,S);var u=F&&F.list;c.shortenLabel=u?function(){for(L=0;L<u.length;L++)if(n(S,{dateTimeLabelFormat:u[L]}),y.attr({text:Q.call(S,S)}),y.getBBox().width<e.getSlotWidth(c)-2*h.padding)return;y.attr({text:""})}:void 0;G&&e._addedPlotLB&&c.moveLabel(f,h);J(y)||c.movedLabel?y&&y.textStr!==f&&!G&&(!y.textWidth||h.style.width||y.styles.width||y.css({width:null}),y.attr({text:f}),y.textPxLength=y.getBBox().width):(c.label=y=c.createLabel({x:0,
-y:0},f,h),c.rotation=0)};f.prototype.createLabel=function(a,e,f){var g=this.axis,k=g.chart;if(a=J(e)&&f.enabled?k.renderer.text(e,a.x,a.y,f.useHTML).add(g.labelGroup):null)k.styledMode||a.css(c(f.style)),a.textPxLength=a.getBBox().width;return a};f.prototype.destroy=function(){u(this,this.axis)};f.prototype.getPosition=function(c,a,e,f){var g=this.axis,k=g.chart,l=f&&k.oldChartHeight||k.chartHeight;c={x:c?x(g.translate(a+e,null,null,f)+g.transB):g.left+g.offset+(g.opposite?(f&&k.oldChartWidth||k.chartWidth)-
-g.right-g.left:0),y:c?l-g.bottom+g.offset-(g.opposite?g.height:0):x(l-g.translate(a+e,null,null,f)-g.transB)};c.y=z(c.y,-1E5,1E5);m(this,"afterGetPosition",{pos:c});return c};f.prototype.getLabelPosition=function(c,a,e,f,g,l,n,t){var h=this.axis,d=h.transA,b=h.isLinked&&h.linkedParent?h.linkedParent.reversed:h.reversed,p=h.staggerLines,k=h.tickRotCorr||{x:0,y:0},y=f||h.reserveSpaceDefault?0:-h.labelOffset*("center"===h.labelAlign?.5:1),q={},F=g.y;J(F)||(F=0===h.side?e.rotation?-8:-e.getBBox().height:
-2===h.side?k.y+8:Math.cos(e.rotation*r)*(k.y-e.getBBox(!1,0).height/2));c=c+g.x+y+k.x-(l&&f?l*d*(b?-1:1):0);a=a+F-(l&&!f?l*d*(b?1:-1):0);p&&(e=n/(t||1)%p,h.opposite&&(e=p-e-1),a+=h.labelOffset/p*e);q.x=c;q.y=Math.round(a);m(this,"afterGetLabelPosition",{pos:q,tickmarkOffset:l,index:n});return q};f.prototype.getLabelSize=function(){return this.label?this.label.getBBox()[this.axis.horiz?"height":"width"]:0};f.prototype.getMarkPath=function(c,a,e,f,g,l){return l.crispLine([["M",c,a],["L",c+(g?0:-e),
-a+(g?e:0)]],f)};f.prototype.handleOverflow=function(c){var a=this.axis,e=a.options.labels,f=c.x,g=a.chart.chartWidth,m=a.chart.spacing,v=l(a.labelLeft,Math.min(a.pos,m[3]));m=l(a.labelRight,Math.max(a.isRadial?0:a.pos+a.len,g-m[1]));var t=this.label,h=this.rotation,d={left:0,center:.5,right:1}[a.labelAlign||t.attr("align")],b=t.getBBox().width,p=a.getSlotWidth(this),G={},y=p,L=1,F;if(h||"justify"!==e.overflow)0>h&&f-d*b<v?F=Math.round(f/Math.cos(h*r)-v):0<h&&f+d*b>m&&(F=Math.round((g-f)/Math.cos(h*
-r)));else if(g=f+(1-d)*b,f-d*b<v?y=c.x+y*(1-d)-v:g>m&&(y=m-c.x+y*d,L=-1),y=Math.min(p,y),y<p&&"center"===a.labelAlign&&(c.x+=L*(p-y-d*(p-Math.min(b,y)))),b>y||a.autoRotation&&(t.styles||{}).width)F=y;F&&(this.shortenLabel?this.shortenLabel():(G.width=Math.floor(F)+"px",(e.style||{}).textOverflow||(G.textOverflow="ellipsis"),t.css(G)))};f.prototype.moveLabel=function(c,a){var f=this,g=f.label,l=f.axis,m=l.reversed,q=!1;g&&g.textStr===c?(f.movedLabel=g,q=!0,delete f.label):e(l.ticks,function(a){q||
-a.isNew||a===f||!a.label||a.label.textStr!==c||(f.movedLabel=a.label,q=!0,a.labelPos=f.movedLabel.xy,delete a.label)});if(!q&&(f.labelPos||g)){var t=f.labelPos||g.xy;g=l.horiz?m?0:l.width+l.left:t.x;l=l.horiz?t.y:m?l.width+l.left:0;f.movedLabel=f.createLabel({x:g,y:l},c,a);f.movedLabel&&f.movedLabel.attr({opacity:0})}};f.prototype.render=function(a,c,e){var f=this.axis,g=f.horiz,k=this.pos,q=l(this.tickmarkOffset,f.tickmarkOffset);k=this.getPosition(g,k,q,c);q=k.x;var t=k.y;f=g&&q===f.pos+f.len||
-!g&&t===f.pos?-1:1;g=l(e,this.label&&this.label.newOpacity,1);e=l(e,1);this.isActive=!0;this.renderGridLine(c,e,f);this.renderMark(k,e,f);this.renderLabel(k,c,g,a);this.isNew=!1;m(this,"afterRender")};f.prototype.renderGridLine=function(c,a,e){var f=this.axis,g=f.options,k={},m=this.pos,t=this.type,h=l(this.tickmarkOffset,f.tickmarkOffset),d=f.chart.renderer,b=this.gridLine,p=g.gridLineWidth,G=g.gridLineColor,y=g.gridLineDashStyle;"minor"===this.type&&(p=g.minorGridLineWidth,G=g.minorGridLineColor,
-y=g.minorGridLineDashStyle);b||(f.chart.styledMode||(k.stroke=G,k["stroke-width"]=p||0,k.dashstyle=y),t||(k.zIndex=1),c&&(a=0),this.gridLine=b=d.path().attr(k).addClass("highcharts-"+(t?t+"-":"")+"grid-line").add(f.gridGroup));if(b&&(e=f.getPlotLinePath({value:m+h,lineWidth:b.strokeWidth()*e,force:"pass",old:c})))b[c||this.isNew?"attr":"animate"]({d:e,opacity:a})};f.prototype.renderMark=function(c,a,e){var f=this.axis,g=f.options,k=f.chart.renderer,m=this.type,t=f.tickSize(m?m+"Tick":"tick"),h=c.x;
-c=c.y;var d=l(g["minor"!==m?"tickWidth":"minorTickWidth"],!m&&f.isXAxis?1:0);g=g["minor"!==m?"tickColor":"minorTickColor"];var b=this.mark,p=!b;t&&(f.opposite&&(t[0]=-t[0]),b||(this.mark=b=k.path().addClass("highcharts-"+(m?m+"-":"")+"tick").add(f.axisGroup),f.chart.styledMode||b.attr({stroke:g,"stroke-width":d})),b[p?"attr":"animate"]({d:this.getMarkPath(h,c,t[0],b.strokeWidth()*e,f.horiz,k),opacity:a}))};f.prototype.renderLabel=function(c,a,e,f){var k=this.axis,m=k.horiz,q=k.options,t=this.label,
-h=q.labels,d=h.step;k=l(this.tickmarkOffset,k.tickmarkOffset);var b=c.x;c=c.y;var p=!0;t&&g(b)&&(t.xy=c=this.getLabelPosition(b,c,t,m,h,k,f,d),this.isFirst&&!this.isLast&&!q.showFirstLabel||this.isLast&&!this.isFirst&&!q.showLastLabel?p=!1:!m||h.step||h.rotation||a||0===e||this.handleOverflow(c),d&&f%d&&(p=!1),p&&g(c.y)?(c.opacity=e,t[this.isNewLabel?"attr":"animate"](c),this.isNewLabel=!1):(t.attr("y",-9999),this.isNewLabel=!0))};f.prototype.replaceMovedLabel=function(){var c=this.label,a=this.axis,
-e=a.reversed;if(c&&!this.isNew){var f=a.horiz?e?a.left:a.width+a.left:c.xy.x;e=a.horiz?c.xy.y:e?a.width+a.top:a.top;c.animate({x:f,y:e,opacity:0},void 0,c.destroy);delete this.label}a.isDirty=!0;this.label=this.movedLabel;delete this.movedLabel};return f}();"";return w});M(a,"Core/Axis/Axis.js",[a["Core/Animation/AnimationUtilities.js"],a["Core/Axis/AxisDefaults.js"],a["Core/Color/Color.js"],a["Core/Color/Palette.js"],a["Core/DefaultOptions.js"],a["Core/Foundation.js"],a["Core/Globals.js"],a["Core/Axis/Tick.js"],
-a["Core/Utilities.js"]],function(a,w,C,E,z,x,J,u,n){var m=a.animObject,g=z.defaultOptions,c=x.registerEventOptions,e=J.deg2rad,l=n.arrayMax,f=n.arrayMin,v=n.clamp,q=n.correctFloat,k=n.defined,r=n.destroyObjectProperties,D=n.erase,B=n.error,O=n.extend,t=n.fireEvent,h=n.getMagnitude,d=n.isArray,b=n.isNumber,p=n.isString,G=n.merge,y=n.normalizeTickInterval,L=n.objectEach,F=n.pick,P=n.relativeLength,S=n.removeEvent,Q=n.splat,V=n.syncTimeout;a=function(){function a(b,a){this.zoomEnabled=this.width=this.visible=
-this.userOptions=this.translationSlope=this.transB=this.transA=this.top=this.ticks=this.tickRotCorr=this.tickPositions=this.tickmarkOffset=this.tickInterval=this.tickAmount=this.side=this.series=this.right=this.positiveValuesOnly=this.pos=this.pointRangePadding=this.pointRange=this.plotLinesAndBandsGroups=this.plotLinesAndBands=this.paddedTicks=this.overlap=this.options=this.offset=this.names=this.minPixelPadding=this.minorTicks=this.minorTickInterval=this.min=this.maxLabelLength=this.max=this.len=
-this.left=this.labelFormatter=this.labelEdge=this.isLinked=this.height=this.hasVisibleSeries=this.hasNames=this.eventOptions=this.coll=this.closestPointRange=this.chart=this.categories=this.bottom=this.alternateBands=void 0;this.init(b,a)}a.prototype.init=function(a,d){var h=d.isX;this.chart=a;this.horiz=a.inverted&&!this.isZAxis?!h:h;this.isXAxis=h;this.coll=this.coll||(h?"xAxis":"yAxis");t(this,"init",{userOptions:d});this.opposite=F(d.opposite,this.opposite);this.side=F(d.side,this.side,this.horiz?
-this.opposite?0:2:this.opposite?1:3);this.setOptions(d);var e=this.options,f=e.labels,p=e.type;this.userOptions=d;this.minPixelPadding=0;this.reversed=F(e.reversed,this.reversed);this.visible=e.visible;this.zoomEnabled=e.zoomEnabled;this.hasNames="category"===p||!0===e.categories;this.categories=e.categories||this.hasNames;this.names||(this.names=[],this.names.keys={});this.plotLinesAndBandsGroups={};this.positiveValuesOnly=!!this.logarithmic;this.isLinked=k(e.linkedTo);this.ticks={};this.labelEdge=
-[];this.minorTicks={};this.plotLinesAndBands=[];this.alternateBands={};this.len=0;this.minRange=this.userMinRange=e.minRange||e.maxZoom;this.range=e.range;this.offset=e.offset||0;this.min=this.max=null;d=F(e.crosshair,Q(a.options.tooltip.crosshairs)[h?0:1]);this.crosshair=!0===d?{}:d;-1===a.axes.indexOf(this)&&(h?a.axes.splice(a.xAxis.length,0,this):a.axes.push(this),a[this.coll].push(this));this.series=this.series||[];a.inverted&&!this.isZAxis&&h&&"undefined"===typeof this.reversed&&(this.reversed=
-!0);this.labelRotation=b(f.rotation)?f.rotation:void 0;c(this,e);t(this,"afterInit")};a.prototype.setOptions=function(b){this.options=G(w.defaultXAxisOptions,"yAxis"===this.coll&&w.defaultYAxisOptions,[w.defaultTopAxisOptions,w.defaultRightAxisOptions,w.defaultBottomAxisOptions,w.defaultLeftAxisOptions][this.side],G(g[this.coll],b));t(this,"afterSetOptions",{userOptions:b})};a.prototype.defaultLabelFormatter=function(a){var d=this.axis;a=this.chart.numberFormatter;var c=b(this.value)?this.value:NaN,
-e=d.chart.time,h=this.dateTimeLabelFormat,f=g.lang,p=f.numericSymbols;f=f.numericSymbolMagnitude||1E3;var H=d.logarithmic?Math.abs(c):d.tickInterval,y=p&&p.length;if(d.categories)var k=""+this.value;else if(h)k=e.dateFormat(h,c);else if(y&&1E3<=H)for(;y--&&"undefined"===typeof k;)d=Math.pow(f,y+1),H>=d&&0===10*c%d&&null!==p[y]&&0!==c&&(k=a(c/d,-1)+p[y]);"undefined"===typeof k&&(k=1E4<=Math.abs(c)?a(c,-1):a(c,-1,void 0,""));return k};a.prototype.getSeriesExtremes=function(){var a=this,d=a.chart,c;
-t(this,"getSeriesExtremes",null,function(){a.hasVisibleSeries=!1;a.dataMin=a.dataMax=a.threshold=null;a.softThreshold=!a.isXAxis;a.stacking&&a.stacking.buildStacks();a.series.forEach(function(e){if(e.visible||!d.options.chart.ignoreHiddenSeries){var h=e.options,f=h.threshold;a.hasVisibleSeries=!0;a.positiveValuesOnly&&0>=f&&(f=null);if(a.isXAxis){if(h=e.xData,h.length){h=a.logarithmic?h.filter(a.validatePositiveValue):h;c=e.getXExtremes(h);var p=c.min;var g=c.max;b(p)||p instanceof Date||(h=h.filter(b),
-c=e.getXExtremes(h),p=c.min,g=c.max);h.length&&(a.dataMin=Math.min(F(a.dataMin,p),p),a.dataMax=Math.max(F(a.dataMax,g),g))}}else if(e=e.applyExtremes(),b(e.dataMin)&&(p=e.dataMin,a.dataMin=Math.min(F(a.dataMin,p),p)),b(e.dataMax)&&(g=e.dataMax,a.dataMax=Math.max(F(a.dataMax,g),g)),k(f)&&(a.threshold=f),!h.softThreshold||a.positiveValuesOnly)a.softThreshold=!1}})});t(this,"afterGetSeriesExtremes")};a.prototype.translate=function(a,d,c,e,h,f){var p=this.linkedParent||this,g=e&&p.old?p.old.min:p.min,
-H=p.minPixelPadding;h=(p.isOrdinal||p.brokenAxis&&p.brokenAxis.hasBreaks||p.logarithmic&&h)&&p.lin2val;var K=1,y=0;e=e&&p.old?p.old.transA:p.transA;e||(e=p.transA);c&&(K*=-1,y=p.len);p.reversed&&(K*=-1,y-=K*(p.sector||p.len));d?(a=(a*K+y-H)/e+g,h&&(a=p.lin2val(a))):(h&&(a=p.val2lin(a)),a=b(g)?K*(a-g)*e+y+K*H+(b(f)?e*f:0):void 0);return a};a.prototype.toPixels=function(b,a){return this.translate(b,!1,!this.horiz,null,!0)+(a?0:this.pos)};a.prototype.toValue=function(b,a){return this.translate(b-(a?
-0:this.pos),!0,!this.horiz,null,!0)};a.prototype.getPlotLinePath=function(a){function d(b,a,d){if("pass"!==m&&b<a||b>d)m?b=v(b,a,d):r=!0;return b}var c=this,e=c.chart,h=c.left,f=c.top,p=a.old,g=a.value,H=a.lineWidth,y=p&&e.oldChartHeight||e.chartHeight,k=p&&e.oldChartWidth||e.chartWidth,G=c.transB,l=a.translatedValue,m=a.force,L,q,n,B,r;a={value:g,lineWidth:H,old:p,force:m,acrossPanes:a.acrossPanes,translatedValue:l};t(this,"getPlotLinePath",a,function(a){l=F(l,c.translate(g,null,null,p));l=v(l,-1E5,
-1E5);L=n=Math.round(l+G);q=B=Math.round(y-l-G);b(l)?c.horiz?(q=f,B=y-c.bottom,L=n=d(L,h,h+c.width)):(L=h,n=k-c.right,q=B=d(q,f,f+c.height)):(r=!0,m=!1);a.path=r&&!m?null:e.renderer.crispLine([["M",L,q],["L",n,B]],H||1)});return a.path};a.prototype.getLinearTickPositions=function(b,a,d){var c=q(Math.floor(a/b)*b);d=q(Math.ceil(d/b)*b);var e=[],h;q(c+b)===c&&(h=20);if(this.single)return[a];for(a=c;a<=d;){e.push(a);a=q(a+b,h);if(a===f)break;var f=a}return e};a.prototype.getMinorTickInterval=function(){var b=
-this.options;return!0===b.minorTicks?F(b.minorTickInterval,"auto"):!1===b.minorTicks?null:b.minorTickInterval};a.prototype.getMinorTickPositions=function(){var b=this.options,a=this.tickPositions,d=this.minorTickInterval,c=this.pointRangePadding||0,e=this.min-c;c=this.max+c;var h=c-e,f=[];if(h&&h/d<this.len/3){var p=this.logarithmic;if(p)this.paddedTicks.forEach(function(b,a,c){a&&f.push.apply(f,p.getLogTickPositions(d,c[a-1],c[a],!0))});else if(this.dateTime&&"auto"===this.getMinorTickInterval())f=
-f.concat(this.getTimeTicks(this.dateTime.normalizeTimeTickInterval(d),e,c,b.startOfWeek));else for(b=e+(a[0]-e)%d;b<=c&&b!==f[0];b+=d)f.push(b)}0!==f.length&&this.trimTicks(f);return f};a.prototype.adjustForMinRange=function(){var b=this.options,a=this.logarithmic,d=this.min,c=this.max,e=0,h,p,g,y;this.isXAxis&&"undefined"===typeof this.minRange&&!a&&(k(b.min)||k(b.max)?this.minRange=null:(this.series.forEach(function(b){g=b.xData;y=b.xIncrement?1:g.length-1;if(1<g.length)for(h=y;0<h;h--)if(p=g[h]-
-g[h-1],!e||p<e)e=p}),this.minRange=Math.min(5*e,this.dataMax-this.dataMin)));if(c-d<this.minRange){var G=this.dataMax-this.dataMin>=this.minRange;var t=this.minRange;var m=(t-c+d)/2;m=[d-m,F(b.min,d-m)];G&&(m[2]=this.logarithmic?this.logarithmic.log2lin(this.dataMin):this.dataMin);d=l(m);c=[d+t,F(b.max,d+t)];G&&(c[2]=a?a.log2lin(this.dataMax):this.dataMax);c=f(c);c-d<t&&(m[0]=c-t,m[1]=F(b.min,c-t),d=l(m))}this.min=d;this.max=c};a.prototype.getClosest=function(){var b;this.categories?b=1:this.series.forEach(function(a){var d=
-a.closestPointRange,c=a.visible||!a.chart.options.chart.ignoreHiddenSeries;!a.noSharedTooltip&&k(d)&&c&&(b=k(b)?Math.min(b,d):d)});return b};a.prototype.nameToX=function(b){var a=d(this.categories),c=a?this.categories:this.names,e=b.options.x;b.series.requireSorting=!1;k(e)||(e=this.options.uniqueNames?a?c.indexOf(b.name):F(c.keys[b.name],-1):b.series.autoIncrement());if(-1===e){if(!a)var h=c.length}else h=e;"undefined"!==typeof h&&(this.names[h]=b.name,this.names.keys[b.name]=h);return h};a.prototype.updateNames=
-function(){var b=this,a=this.names;0<a.length&&(Object.keys(a.keys).forEach(function(b){delete a.keys[b]}),a.length=0,this.minRange=this.userMinRange,(this.series||[]).forEach(function(a){a.xIncrement=null;if(!a.points||a.isDirtyData)b.max=Math.max(b.max,a.xData.length-1),a.processData(),a.generatePoints();a.data.forEach(function(d,c){if(d&&d.options&&"undefined"!==typeof d.name){var e=b.nameToX(d);"undefined"!==typeof e&&e!==d.x&&(d.x=e,a.xData[c]=e)}})}))};a.prototype.setAxisTranslation=function(){var b=
-this,a=b.max-b.min,d=b.linkedParent,c=!!b.categories,e=b.isXAxis,h=b.axisPointRange||0,f=0,g=0,y=b.transA;if(e||c||h){var k=b.getClosest();d?(f=d.minPointOffset,g=d.pointRangePadding):b.series.forEach(function(a){var d=c?1:e?F(a.options.pointRange,k,0):b.axisPointRange||0,A=a.options.pointPlacement;h=Math.max(h,d);if(!b.single||c)a=a.is("xrange")?!e:e,f=Math.max(f,a&&p(A)?0:d/2),g=Math.max(g,a&&"on"===A?0:d)});d=b.ordinal&&b.ordinal.slope&&k?b.ordinal.slope/k:1;b.minPointOffset=f*=d;b.pointRangePadding=
-g*=d;b.pointRange=Math.min(h,b.single&&c?1:a);e&&(b.closestPointRange=k)}b.translationSlope=b.transA=y=b.staticScale||b.len/(a+g||1);b.transB=b.horiz?b.left:b.bottom;b.minPixelPadding=y*f;t(this,"afterSetAxisTranslation")};a.prototype.minFromRange=function(){return this.max-this.range};a.prototype.setTickInterval=function(a){var d=this,c=d.chart,e=d.logarithmic,f=d.options,p=d.isXAxis,g=d.isLinked,l=f.tickPixelInterval,G=d.categories,H=d.softThreshold,m=f.maxPadding,L=f.minPadding,n=f.tickInterval,
-v=b(d.threshold)?d.threshold:null;d.dateTime||G||g||this.getTickAmount();var r=F(d.userMin,f.min);var P=F(d.userMax,f.max);if(g){d.linkedParent=c[d.coll][f.linkedTo];var D=d.linkedParent.getExtremes();d.min=F(D.min,D.dataMin);d.max=F(D.max,D.dataMax);f.type!==d.linkedParent.options.type&&B(11,1,c)}else{if(H&&k(v))if(d.dataMin>=v)D=v,L=0;else if(d.dataMax<=v){var I=v;m=0}d.min=F(r,D,d.dataMin);d.max=F(P,I,d.dataMax)}e&&(d.positiveValuesOnly&&!a&&0>=Math.min(d.min,F(d.dataMin,d.min))&&B(10,1,c),d.min=
-q(e.log2lin(d.min),16),d.max=q(e.log2lin(d.max),16));d.range&&k(d.max)&&(d.userMin=d.min=r=Math.max(d.dataMin,d.minFromRange()),d.userMax=P=d.max,d.range=null);t(d,"foundExtremes");d.beforePadding&&d.beforePadding();d.adjustForMinRange();!(G||d.axisPointRange||d.stacking&&d.stacking.usePercentage||g)&&k(d.min)&&k(d.max)&&(c=d.max-d.min)&&(!k(r)&&L&&(d.min-=c*L),!k(P)&&m&&(d.max+=c*m));b(d.userMin)||(b(f.softMin)&&f.softMin<d.min&&(d.min=r=f.softMin),b(f.floor)&&(d.min=Math.max(d.min,f.floor)));b(d.userMax)||
-(b(f.softMax)&&f.softMax>d.max&&(d.max=P=f.softMax),b(f.ceiling)&&(d.max=Math.min(d.max,f.ceiling)));H&&k(d.dataMin)&&(v=v||0,!k(r)&&d.min<v&&d.dataMin>=v?d.min=d.options.minRange?Math.min(v,d.max-d.minRange):v:!k(P)&&d.max>v&&d.dataMax<=v&&(d.max=d.options.minRange?Math.max(v,d.min+d.minRange):v));b(d.min)&&b(d.max)&&!this.chart.polar&&d.min>d.max&&(k(d.options.min)?d.max=d.min:k(d.options.max)&&(d.min=d.max));d.tickInterval=d.min===d.max||"undefined"===typeof d.min||"undefined"===typeof d.max?1:
-g&&d.linkedParent&&!n&&l===d.linkedParent.options.tickPixelInterval?n=d.linkedParent.tickInterval:F(n,this.tickAmount?(d.max-d.min)/Math.max(this.tickAmount-1,1):void 0,G?1:(d.max-d.min)*l/Math.max(d.len,l));p&&!a&&(d.series.forEach(function(b){b.forceCrop=b.forceCropping&&b.forceCropping();b.processData(d.min!==(d.old&&d.old.min)||d.max!==(d.old&&d.old.max))}),t(this,"postProcessData"));d.setAxisTranslation();t(this,"initialAxisTranslation");d.pointRange&&!n&&(d.tickInterval=Math.max(d.pointRange,
-d.tickInterval));a=F(f.minTickInterval,d.dateTime&&!d.series.some(function(b){return b.noSharedTooltip})?d.closestPointRange:0);!n&&d.tickInterval<a&&(d.tickInterval=a);d.dateTime||d.logarithmic||n||(d.tickInterval=y(d.tickInterval,void 0,h(d.tickInterval),F(f.allowDecimals,.5>d.tickInterval||void 0!==this.tickAmount),!!this.tickAmount));this.tickAmount||(d.tickInterval=d.unsquish());this.setTickPositions()};a.prototype.setTickPositions=function(){var b=this.options,d=b.tickPositions,a=this.getMinorTickInterval(),
-c=this.hasVerticalPanning(),e="colorAxis"===this.coll,h=(e||!c)&&b.startOnTick;c=(e||!c)&&b.endOnTick;e=b.tickPositioner;this.tickmarkOffset=this.categories&&"between"===b.tickmarkPlacement&&1===this.tickInterval?.5:0;this.minorTickInterval="auto"===a&&this.tickInterval?this.tickInterval/5:a;this.single=this.min===this.max&&k(this.min)&&!this.tickAmount&&(parseInt(this.min,10)===this.min||!1!==b.allowDecimals);this.tickPositions=a=d&&d.slice();!a&&(this.ordinal&&this.ordinal.positions||!((this.max-
-this.min)/this.tickInterval>Math.max(2*this.len,200))?a=this.dateTime?this.getTimeTicks(this.dateTime.normalizeTimeTickInterval(this.tickInterval,b.units),this.min,this.max,b.startOfWeek,this.ordinal&&this.ordinal.positions,this.closestPointRange,!0):this.logarithmic?this.logarithmic.getLogTickPositions(this.tickInterval,this.min,this.max):this.getLinearTickPositions(this.tickInterval,this.min,this.max):(a=[this.min,this.max],B(19,!1,this.chart)),a.length>this.len&&(a=[a[0],a.pop()],a[0]===a[1]&&
-(a.length=1)),this.tickPositions=a,e&&(e=e.apply(this,[this.min,this.max])))&&(this.tickPositions=a=e);this.paddedTicks=a.slice(0);this.trimTicks(a,h,c);this.isLinked||(this.single&&2>a.length&&!this.categories&&!this.series.some(function(b){return b.is("heatmap")&&"between"===b.options.pointPlacement})&&(this.min-=.5,this.max+=.5),d||e||this.adjustTickAmount());t(this,"afterSetTickPositions")};a.prototype.trimTicks=function(b,d,a){var c=b[0],e=b[b.length-1],h=!this.isOrdinal&&this.minPointOffset||
-0;t(this,"trimTicks");if(!this.isLinked){if(d&&-Infinity!==c)this.min=c;else for(;this.min-h>b[0];)b.shift();if(a)this.max=e;else for(;this.max+h<b[b.length-1];)b.pop();0===b.length&&k(c)&&!this.options.tickPositions&&b.push((e+c)/2)}};a.prototype.alignToOthers=function(){var b={},d=this.options,a;!1!==this.chart.options.chart.alignTicks&&d.alignTicks&&!1!==d.startOnTick&&!1!==d.endOnTick&&!this.logarithmic&&this.chart[this.coll].forEach(function(d){var c=d.options;c=[d.horiz?c.left:c.top,c.width,
-c.height,c.pane].join();d.series.length&&(b[c]?a=!0:b[c]=1)});return a};a.prototype.getTickAmount=function(){var b=this.options,d=b.tickPixelInterval,a=b.tickAmount;!k(b.tickInterval)&&!a&&this.len<d&&!this.isRadial&&!this.logarithmic&&b.startOnTick&&b.endOnTick&&(a=2);!a&&this.alignToOthers()&&(a=Math.ceil(this.len/d)+1);4>a&&(this.finalTickAmt=a,a=5);this.tickAmount=a};a.prototype.adjustTickAmount=function(){var d=this.options,a=this.tickInterval,c=this.tickPositions,e=this.tickAmount,h=this.finalTickAmt,
-f=c&&c.length,p=F(this.threshold,this.softThreshold?0:null);if(this.hasData()&&b(this.min)&&b(this.max)){if(f<e){for(;c.length<e;)c.length%2||this.min===p?c.push(q(c[c.length-1]+a)):c.unshift(q(c[0]-a));this.transA*=(f-1)/(e-1);this.min=d.startOnTick?c[0]:Math.min(this.min,c[0]);this.max=d.endOnTick?c[c.length-1]:Math.max(this.max,c[c.length-1])}else f>e&&(this.tickInterval*=2,this.setTickPositions());if(k(h)){for(a=d=c.length;a--;)(3===h&&1===a%2||2>=h&&0<a&&a<d-1)&&c.splice(a,1);this.finalTickAmt=
-void 0}}};a.prototype.setScale=function(){var b=!1,d=!1;this.series.forEach(function(a){b=b||a.isDirtyData||a.isDirty;d=d||a.xAxis&&a.xAxis.isDirty||!1});this.setAxisSize();var a=this.len!==(this.old&&this.old.len);a||b||d||this.isLinked||this.forceRedraw||this.userMin!==(this.old&&this.old.userMin)||this.userMax!==(this.old&&this.old.userMax)||this.alignToOthers()?(this.stacking&&this.stacking.resetStacks(),this.forceRedraw=!1,this.getSeriesExtremes(),this.setTickInterval(),this.isDirty||(this.isDirty=
-a||this.min!==(this.old&&this.old.min)||this.max!==(this.old&&this.old.max))):this.stacking&&this.stacking.cleanStacks();b&&this.panningState&&(this.panningState.isDirty=!0);t(this,"afterSetScale")};a.prototype.setExtremes=function(b,d,a,c,e){var h=this,f=h.chart;a=F(a,!0);h.series.forEach(function(b){delete b.kdTree});e=O(e,{min:b,max:d});t(h,"setExtremes",e,function(){h.userMin=b;h.userMax=d;h.eventArgs=e;a&&f.redraw(c)})};a.prototype.zoom=function(b,d){var a=this,c=this.dataMin,e=this.dataMax,
-h=this.options,f=Math.min(c,F(h.min,c)),p=Math.max(e,F(h.max,e));b={newMin:b,newMax:d};t(this,"zoom",b,function(b){var d=b.newMin,h=b.newMax;if(d!==a.min||h!==a.max)a.allowZoomOutside||(k(c)&&(d<f&&(d=f),d>p&&(d=p)),k(e)&&(h<f&&(h=f),h>p&&(h=p))),a.displayBtn="undefined"!==typeof d||"undefined"!==typeof h,a.setExtremes(d,h,!1,void 0,{trigger:"zoom"});b.zoomed=!0});return b.zoomed};a.prototype.setAxisSize=function(){var b=this.chart,d=this.options,a=d.offsets||[0,0,0,0],c=this.horiz,e=this.width=Math.round(P(F(d.width,
-b.plotWidth-a[3]+a[1]),b.plotWidth)),h=this.height=Math.round(P(F(d.height,b.plotHeight-a[0]+a[2]),b.plotHeight)),f=this.top=Math.round(P(F(d.top,b.plotTop+a[0]),b.plotHeight,b.plotTop));d=this.left=Math.round(P(F(d.left,b.plotLeft+a[3]),b.plotWidth,b.plotLeft));this.bottom=b.chartHeight-h-f;this.right=b.chartWidth-e-d;this.len=Math.max(c?e:h,0);this.pos=c?d:f};a.prototype.getExtremes=function(){var b=this.logarithmic;return{min:b?q(b.lin2log(this.min)):this.min,max:b?q(b.lin2log(this.max)):this.max,
-dataMin:this.dataMin,dataMax:this.dataMax,userMin:this.userMin,userMax:this.userMax}};a.prototype.getThreshold=function(b){var d=this.logarithmic,a=d?d.lin2log(this.min):this.min;d=d?d.lin2log(this.max):this.max;null===b||-Infinity===b?b=a:Infinity===b?b=d:a>b?b=a:d<b&&(b=d);return this.translate(b,0,1,0,1)};a.prototype.autoLabelAlign=function(b){var d=(F(b,0)-90*this.side+720)%360;b={align:"center"};t(this,"autoLabelAlign",b,function(b){15<d&&165>d?b.align="right":195<d&&345>d&&(b.align="left")});
-return b.align};a.prototype.tickSize=function(b){var d=this.options,a=F(d["tick"===b?"tickWidth":"minorTickWidth"],"tick"===b&&this.isXAxis&&!this.categories?1:0),c=d["tick"===b?"tickLength":"minorTickLength"];if(a&&c){"inside"===d[b+"Position"]&&(c=-c);var e=[c,a]}b={tickSize:e};t(this,"afterTickSize",b);return b.tickSize};a.prototype.labelMetrics=function(){var b=this.tickPositions&&this.tickPositions[0]||0;return this.chart.renderer.fontMetrics(this.options.labels.style.fontSize,this.ticks[b]&&
-this.ticks[b].label)};a.prototype.unsquish=function(){var d=this.options.labels,a=this.horiz,c=this.tickInterval,h=this.len/(((this.categories?1:0)+this.max-this.min)/c),f=d.rotation,p=this.labelMetrics(),g=Math.max(this.max-this.min,0),y=function(b){var d=b/(h||1);d=1<d?Math.ceil(d):1;d*c>g&&Infinity!==b&&Infinity!==h&&g&&(d=Math.ceil(g/c));return q(d*c)},k=c,l,G,t=Number.MAX_VALUE;if(a){if(!d.staggerLines&&!d.step)if(b(f))var m=[f];else h<d.autoRotationLimit&&(m=d.autoRotation);m&&m.forEach(function(b){if(b===
-f||b&&-90<=b&&90>=b){G=y(Math.abs(p.h/Math.sin(e*b)));var d=G+Math.abs(b/360);d<t&&(t=d,l=b,k=G)}})}else d.step||(k=y(p.h));this.autoRotation=m;this.labelRotation=F(l,b(f)?f:0);return k};a.prototype.getSlotWidth=function(d){var a=this.chart,c=this.horiz,e=this.options.labels,h=Math.max(this.tickPositions.length-(this.categories?0:1),1),f=a.margin[3];if(d&&b(d.slotWidth))return d.slotWidth;if(c&&2>e.step)return e.rotation?0:(this.staggerLines||1)*this.len/h;if(!c){d=e.style.width;if(void 0!==d)return parseInt(String(d),
-10);if(f)return f-a.spacing[3]}return.33*a.chartWidth};a.prototype.renderUnsquish=function(){var b=this.chart,d=b.renderer,a=this.tickPositions,c=this.ticks,e=this.options.labels,h=e.style,f=this.horiz,g=this.getSlotWidth(),y=Math.max(1,Math.round(g-2*e.padding)),k={},G=this.labelMetrics(),l=h.textOverflow,t=0;p(e.rotation)||(k.rotation=e.rotation||0);a.forEach(function(b){b=c[b];b.movedLabel&&b.replaceMovedLabel();b&&b.label&&b.label.textPxLength>t&&(t=b.label.textPxLength)});this.maxLabelLength=
-t;if(this.autoRotation)t>y&&t>G.h?k.rotation=this.labelRotation:this.labelRotation=0;else if(g){var m=y;if(!l){var F="clip";for(y=a.length;!f&&y--;){var L=a[y];if(L=c[L].label)L.styles&&"ellipsis"===L.styles.textOverflow?L.css({textOverflow:"clip"}):L.textPxLength>g&&L.css({width:g+"px"}),L.getBBox().height>this.len/a.length-(G.h-G.f)&&(L.specificTextOverflow="ellipsis")}}}k.rotation&&(m=t>.5*b.chartHeight?.33*b.chartHeight:t,l||(F="ellipsis"));if(this.labelAlign=e.align||this.autoLabelAlign(this.labelRotation))k.align=
-this.labelAlign;a.forEach(function(b){var d=(b=c[b])&&b.label,a=h.width,e={};d&&(d.attr(k),b.shortenLabel?b.shortenLabel():m&&!a&&"nowrap"!==h.whiteSpace&&(m<d.textPxLength||"SPAN"===d.element.tagName)?(e.width=m+"px",l||(e.textOverflow=d.specificTextOverflow||F),d.css(e)):d.styles&&d.styles.width&&!e.width&&!a&&d.css({width:null}),delete d.specificTextOverflow,b.rotation=k.rotation)},this);this.tickRotCorr=d.rotCorr(G.b,this.labelRotation||0,0!==this.side)};a.prototype.hasData=function(){return this.series.some(function(b){return b.hasData()})||
-this.options.showEmpty&&k(this.min)&&k(this.max)};a.prototype.addTitle=function(b){var d=this.chart.renderer,a=this.horiz,c=this.opposite,e=this.options.title,h=this.chart.styledMode,f;this.axisTitle||((f=e.textAlign)||(f=(a?{low:"left",middle:"center",high:"right"}:{low:c?"right":"left",middle:"center",high:c?"left":"right"})[e.align]),this.axisTitle=d.text(e.text||"",0,0,e.useHTML).attr({zIndex:7,rotation:e.rotation,align:f}).addClass("highcharts-axis-title"),h||this.axisTitle.css(G(e.style)),this.axisTitle.add(this.axisGroup),
-this.axisTitle.isNew=!0);h||e.style.width||this.isRadial||this.axisTitle.css({width:this.len+"px"});this.axisTitle[b?"show":"hide"](b)};a.prototype.generateTick=function(b){var d=this.ticks;d[b]?d[b].addLabel():d[b]=new u(this,b)};a.prototype.getOffset=function(){var b=this,d=this,a=d.chart,c=a.renderer,e=d.options,h=d.tickPositions,f=d.ticks,p=d.horiz,g=d.side,y=a.inverted&&!d.isZAxis?[1,0,3,2][g]:g,G=d.hasData(),l=e.title,m=e.labels,q=a.axisOffset;a=a.clipOffset;var v=[-1,1,1,-1][g],n=e.className,
-B=d.axisParent,r,P=0,D=0,ca=0;d.showAxis=r=G||e.showEmpty;d.staggerLines=d.horiz&&m.staggerLines||void 0;if(!d.axisGroup){var ia=function(d,a,e){return c.g(d).attr({zIndex:e}).addClass("highcharts-"+b.coll.toLowerCase()+a+" "+(b.isRadial?"highcharts-radial-axis"+a+" ":"")+(n||"")).add(B)};d.gridGroup=ia("grid","-grid",e.gridZIndex);d.axisGroup=ia("axis","",e.zIndex);d.labelGroup=ia("axis-labels","-labels",m.zIndex)}G||d.isLinked?(h.forEach(function(b){d.generateTick(b)}),d.renderUnsquish(),d.reserveSpaceDefault=
-0===g||2===g||{1:"left",3:"right"}[g]===d.labelAlign,F(m.reserveSpace,"center"===d.labelAlign?!0:null,d.reserveSpaceDefault)&&h.forEach(function(b){ca=Math.max(f[b].getLabelSize(),ca)}),d.staggerLines&&(ca*=d.staggerLines),d.labelOffset=ca*(d.opposite?-1:1)):L(f,function(b,d){b.destroy();delete f[d]});if(l&&l.text&&!1!==l.enabled&&(d.addTitle(r),r&&!1!==l.reserveSpace)){d.titleOffset=P=d.axisTitle.getBBox()[p?"height":"width"];var I=l.offset;D=k(I)?0:F(l.margin,p?5:10)}d.renderLine();d.offset=v*F(e.offset,
-q[g]?q[g]+(e.margin||0):0);d.tickRotCorr=d.tickRotCorr||{x:0,y:0};l=0===g?-d.labelMetrics().h:2===g?d.tickRotCorr.y:0;G=Math.abs(ca)+D;ca&&(G=G-l+v*(p?F(m.y,d.tickRotCorr.y+8*v):m.x));d.axisTitleMargin=F(I,G);d.getMaxLabelDimensions&&(d.maxLabelDimensions=d.getMaxLabelDimensions(f,h));p=this.tickSize("tick");q[g]=Math.max(q[g],(d.axisTitleMargin||0)+P+v*d.offset,G,h&&h.length&&p?p[0]+v*d.offset:0);e=e.offset?0:2*Math.floor(d.axisLine.strokeWidth()/2);a[y]=Math.max(a[y],e);t(this,"afterGetOffset")};
-a.prototype.getLinePath=function(b){var d=this.chart,a=this.opposite,c=this.offset,e=this.horiz,h=this.left+(a?this.width:0)+c;c=d.chartHeight-this.bottom-(a?this.height:0)+c;a&&(b*=-1);return d.renderer.crispLine([["M",e?this.left:h,e?c:this.top],["L",e?d.chartWidth-this.right:h,e?c:d.chartHeight-this.bottom]],b)};a.prototype.renderLine=function(){this.axisLine||(this.axisLine=this.chart.renderer.path().addClass("highcharts-axis-line").add(this.axisGroup),this.chart.styledMode||this.axisLine.attr({stroke:this.options.lineColor,
-"stroke-width":this.options.lineWidth,zIndex:7}))};a.prototype.getTitlePosition=function(){var b=this.horiz,d=this.left,a=this.top,c=this.len,e=this.options.title,h=b?d:a,f=this.opposite,p=this.offset,g=e.x,y=e.y,k=this.axisTitle,G=this.chart.renderer.fontMetrics(e.style.fontSize,k);k=Math.max(k.getBBox(null,0).height-G.h-1,0);c={low:h+(b?0:c),middle:h+c/2,high:h+(b?c:0)}[e.align];d=(b?a+this.height:d)+(b?1:-1)*(f?-1:1)*this.axisTitleMargin+[-k,k,G.f,-k][this.side];b={x:b?c+g:d+(f?this.width:0)+p+
-g,y:b?d+y-(f?this.height:0)+p:c+y};t(this,"afterGetTitlePosition",{titlePosition:b});return b};a.prototype.renderMinorTick=function(b,d){var a=this.minorTicks;a[b]||(a[b]=new u(this,b,"minor"));d&&a[b].isNew&&a[b].render(null,!0);a[b].render(null,!1,1)};a.prototype.renderTick=function(b,d,a){var c=this.ticks;if(!this.isLinked||b>=this.min&&b<=this.max||this.grid&&this.grid.isColumn)c[b]||(c[b]=new u(this,b)),a&&c[b].isNew&&c[b].render(d,!0,-1),c[b].render(d)};a.prototype.render=function(){var d=this,
-a=d.chart,c=d.logarithmic,e=d.options,h=d.isLinked,f=d.tickPositions,p=d.axisTitle,g=d.ticks,y=d.minorTicks,k=d.alternateBands,G=e.stackLabels,l=e.alternateGridColor,F=d.tickmarkOffset,q=d.axisLine,v=d.showAxis,n=m(a.renderer.globalAnimation),B,r;d.labelEdge.length=0;d.overlap=!1;[g,y,k].forEach(function(b){L(b,function(b){b.isActive=!1})});if(d.hasData()||h){var P=d.chart.hasRendered&&d.old&&b(d.old.min);d.minorTickInterval&&!d.categories&&d.getMinorTickPositions().forEach(function(b){d.renderMinorTick(b,
-P)});f.length&&(f.forEach(function(b,a){d.renderTick(b,a,P)}),F&&(0===d.min||d.single)&&(g[-1]||(g[-1]=new u(d,-1,null,!0)),g[-1].render(-1)));l&&f.forEach(function(b,e){r="undefined"!==typeof f[e+1]?f[e+1]+F:d.max-F;0===e%2&&b<d.max&&r<=d.max+(a.polar?-F:F)&&(k[b]||(k[b]=new J.PlotLineOrBand(d)),B=b+F,k[b].options={from:c?c.lin2log(B):B,to:c?c.lin2log(r):r,color:l,className:"highcharts-alternate-grid"},k[b].render(),k[b].isActive=!0)});d._addedPlotLB||(d._addedPlotLB=!0,(e.plotLines||[]).concat(e.plotBands||
-[]).forEach(function(b){d.addPlotBandOrLine(b)}))}[g,y,k].forEach(function(b){var d=[],c=n.duration;L(b,function(b,a){b.isActive||(b.render(a,!1,0),b.isActive=!1,d.push(a))});V(function(){for(var a=d.length;a--;)b[d[a]]&&!b[d[a]].isActive&&(b[d[a]].destroy(),delete b[d[a]])},b!==k&&a.hasRendered&&c?c:0)});q&&(q[q.isPlaced?"animate":"attr"]({d:this.getLinePath(q.strokeWidth())}),q.isPlaced=!0,q[v?"show":"hide"](v));p&&v&&(e=d.getTitlePosition(),b(e.y)?(p[p.isNew?"attr":"animate"](e),p.isNew=!1):(p.attr("y",
--9999),p.isNew=!0));G&&G.enabled&&d.stacking&&d.stacking.renderStackTotals();d.old={len:d.len,max:d.max,min:d.min,transA:d.transA,userMax:d.userMax,userMin:d.userMin};d.isDirty=!1;t(this,"afterRender")};a.prototype.redraw=function(){this.visible&&(this.render(),this.plotLinesAndBands.forEach(function(b){b.render()}));this.series.forEach(function(b){b.isDirty=!0})};a.prototype.getKeepProps=function(){return this.keepProps||a.keepProps};a.prototype.destroy=function(b){var d=this,a=d.plotLinesAndBands,
-c=this.eventOptions;t(this,"destroy",{keepEvents:b});b||S(d);[d.ticks,d.minorTicks,d.alternateBands].forEach(function(b){r(b)});if(a)for(b=a.length;b--;)a[b].destroy();"axisLine axisTitle axisGroup gridGroup labelGroup cross scrollbar".split(" ").forEach(function(b){d[b]&&(d[b]=d[b].destroy())});for(var e in d.plotLinesAndBandsGroups)d.plotLinesAndBandsGroups[e]=d.plotLinesAndBandsGroups[e].destroy();L(d,function(b,a){-1===d.getKeepProps().indexOf(a)&&delete d[a]});this.eventOptions=c};a.prototype.drawCrosshair=
-function(b,d){var a=this.crosshair,c=F(a&&a.snap,!0),e=this.chart,h,f=this.cross;t(this,"drawCrosshair",{e:b,point:d});b||(b=this.cross&&this.cross.e);if(a&&!1!==(k(d)||!c)){c?k(d)&&(h=F("colorAxis"!==this.coll?d.crosshairPos:null,this.isXAxis?d.plotX:this.len-d.plotY)):h=b&&(this.horiz?b.chartX-this.pos:this.len-b.chartY+this.pos);if(k(h)){var p={value:d&&(this.isXAxis?d.x:F(d.stackY,d.y)),translatedValue:h};e.polar&&O(p,{isCrosshair:!0,chartX:b&&b.chartX,chartY:b&&b.chartY,point:d});p=this.getPlotLinePath(p)||
-null}if(!k(p)){this.hideCrosshair();return}c=this.categories&&!this.isRadial;f||(this.cross=f=e.renderer.path().addClass("highcharts-crosshair highcharts-crosshair-"+(c?"category ":"thin ")+(a.className||"")).attr({zIndex:F(a.zIndex,2)}).add(),e.styledMode||(f.attr({stroke:a.color||(c?C.parse(E.highlightColor20).setOpacity(.25).get():E.neutralColor20),"stroke-width":F(a.width,1)}).css({"pointer-events":"none"}),a.dashStyle&&f.attr({dashstyle:a.dashStyle})));f.show().attr({d:p});c&&!a.width&&f.attr({"stroke-width":this.transA});
-this.cross.e=b}else this.hideCrosshair();t(this,"afterDrawCrosshair",{e:b,point:d})};a.prototype.hideCrosshair=function(){this.cross&&this.cross.hide();t(this,"afterHideCrosshair")};a.prototype.hasVerticalPanning=function(){var b=this.chart.options.chart.panning;return!!(b&&b.enabled&&/y/.test(b.type))};a.prototype.validatePositiveValue=function(d){return b(d)&&0<d};a.prototype.update=function(b,d){var a=this.chart;b=G(this.userOptions,b);this.destroy(!0);this.init(a,b);a.isDirtyBox=!0;F(d,!0)&&a.redraw()};
-a.prototype.remove=function(b){for(var d=this.chart,a=this.coll,c=this.series,e=c.length;e--;)c[e]&&c[e].remove(!1);D(d.axes,this);D(d[a],this);d[a].forEach(function(b,d){b.options.index=b.userOptions.index=d});this.destroy();d.isDirtyBox=!0;F(b,!0)&&d.redraw()};a.prototype.setTitle=function(b,d){this.update({title:b},d)};a.prototype.setCategories=function(b,d){this.update({categories:b},d)};a.defaultOptions=w.defaultXAxisOptions;a.keepProps="extKey hcEvents names series userMax userMin".split(" ");
-return a}();"";return a});M(a,"Core/Axis/DateTimeAxis.js",[a["Core/Utilities.js"]],function(a){var r=a.addEvent,C=a.getMagnitude,E=a.normalizeTickInterval,z=a.timeUnits,x;(function(a){function u(){return this.chart.time.getTimeTicks.apply(this.chart.time,arguments)}function n(a){"datetime"!==a.userOptions.type?this.dateTime=void 0:this.dateTime||(this.dateTime=new g(this))}var m=[];a.compose=function(a){-1===m.indexOf(a)&&(m.push(a),a.keepProps.push("dateTime"),a.prototype.getTimeTicks=u,r(a,"init",
-n));return a};var g=function(){function a(a){this.axis=a}a.prototype.normalizeTimeTickInterval=function(a,c){var e=c||[["millisecond",[1,2,5,10,20,25,50,100,200,500]],["second",[1,2,5,10,15,30]],["minute",[1,2,5,10,15,30]],["hour",[1,2,3,4,6,8,12]],["day",[1,2]],["week",[1,2]],["month",[1,2,3,4,6]],["year",null]];c=e[e.length-1];var g=z[c[0]],l=c[1],k;for(k=0;k<e.length&&!(c=e[k],g=z[c[0]],l=c[1],e[k+1]&&a<=(g*l[l.length-1]+z[e[k+1][0]])/2);k++);g===z.year&&a<5*g&&(l=[1,2,5]);a=E(a/g,l,"year"===c[0]?
-Math.max(C(a/g),1):1);return{unitRange:g,count:a,unitName:c[0]}};a.prototype.getXDateFormat=function(a,c){var e=this.axis;return e.closestPointRange?e.chart.time.getDateFormat(e.closestPointRange,a,e.options.startOfWeek,c)||c.year:c.day};return a}();a.Additions=g})(x||(x={}));return x});M(a,"Core/Axis/LogarithmicAxis.js",[a["Core/Utilities.js"]],function(a){var r=a.addEvent,C=a.getMagnitude,E=a.normalizeTickInterval,z=a.pick,x;(function(a){function u(a){var c=this.logarithmic;"logarithmic"!==a.userOptions.type?
-this.logarithmic=void 0:c||(this.logarithmic=new g(this))}function n(){var a=this.logarithmic;a&&(this.lin2val=function(c){return a.lin2log(c)},this.val2lin=function(c){return a.log2lin(c)})}var m=[];a.compose=function(a){-1===m.indexOf(a)&&(m.push(a),a.keepProps.push("logarithmic"),r(a,"init",u),r(a,"afterInit",n));return a};var g=function(){function a(a){this.axis=a}a.prototype.getLogTickPositions=function(a,c,f,g){var e=this.axis,k=e.len,l=e.options,m=[];g||(this.minorAutoInterval=void 0);if(.5<=
-a)a=Math.round(a),m=e.getLinearTickPositions(a,c,f);else if(.08<=a){var n=Math.floor(c),v,t=l=void 0;for(k=.3<a?[1,2,4]:.15<a?[1,2,4,6,8]:[1,2,3,4,5,6,7,8,9];n<f+1&&!t;n++){var h=k.length;for(v=0;v<h&&!t;v++){var d=this.log2lin(this.lin2log(n)*k[v]);d>c&&(!g||l<=f)&&"undefined"!==typeof l&&m.push(l);l>f&&(t=!0);l=d}}}else c=this.lin2log(c),f=this.lin2log(f),a=g?e.getMinorTickInterval():l.tickInterval,a=z("auto"===a?null:a,this.minorAutoInterval,l.tickPixelInterval/(g?5:1)*(f-c)/((g?k/e.tickPositions.length:
-k)||1)),a=E(a,void 0,C(a)),m=e.getLinearTickPositions(a,c,f).map(this.log2lin),g||(this.minorAutoInterval=a/5);g||(e.tickInterval=a);return m};a.prototype.lin2log=function(a){return Math.pow(10,a)};a.prototype.log2lin=function(a){return Math.log(a)/Math.LN10};return a}();a.Additions=g})(x||(x={}));return x});M(a,"Core/Axis/PlotLineOrBand/PlotLineOrBandAxis.js",[a["Core/Utilities.js"]],function(a){var r=a.erase,C=a.extend,E=a.isNumber,z;(function(a){var x=[],u;a.compose=function(a,g){u||(u=a);-1===
-x.indexOf(g)&&(x.push(g),C(g.prototype,n.prototype));return g};var n=function(){function a(){}a.prototype.getPlotBandPath=function(a,c,e){void 0===e&&(e=this.options);var g=this.getPlotLinePath({value:c,force:!0,acrossPanes:e.acrossPanes}),f=[],m=this.horiz;c=!E(this.min)||!E(this.max)||a<this.min&&c<this.min||a>this.max&&c>this.max;a=this.getPlotLinePath({value:a,force:!0,acrossPanes:e.acrossPanes});e=1;if(a&&g){if(c){var q=a.toString()===g.toString();e=0}for(c=0;c<a.length;c+=2){var k=a[c],n=a[c+
-1],r=g[c],B=g[c+1];"M"!==k[0]&&"L"!==k[0]||"M"!==n[0]&&"L"!==n[0]||"M"!==r[0]&&"L"!==r[0]||"M"!==B[0]&&"L"!==B[0]||(m&&r[1]===k[1]?(r[1]+=e,B[1]+=e):m||r[2]!==k[2]||(r[2]+=e,B[2]+=e),f.push(["M",k[1],k[2]],["L",n[1],n[2]],["L",B[1],B[2]],["L",r[1],r[2]],["Z"]));f.isFlat=q}}return f};a.prototype.addPlotBand=function(a){return this.addPlotBandOrLine(a,"plotBands")};a.prototype.addPlotLine=function(a){return this.addPlotBandOrLine(a,"plotLines")};a.prototype.addPlotBandOrLine=function(a,c){var e=this,
-g=this.userOptions,f=new u(this,a);this.visible&&(f=f.render());if(f){this._addedPlotLB||(this._addedPlotLB=!0,(g.plotLines||[]).concat(g.plotBands||[]).forEach(function(a){e.addPlotBandOrLine(a)}));if(c){var m=g[c]||[];m.push(a);g[c]=m}this.plotLinesAndBands.push(f)}return f};a.prototype.removePlotBandOrLine=function(a){var c=this.plotLinesAndBands,e=this.options,g=this.userOptions;if(c){for(var f=c.length;f--;)c[f].id===a&&c[f].destroy();[e.plotLines||[],g.plotLines||[],e.plotBands||[],g.plotBands||
-[]].forEach(function(c){for(f=c.length;f--;)(c[f]||{}).id===a&&r(c,c[f])})}};a.prototype.removePlotBand=function(a){this.removePlotBandOrLine(a)};a.prototype.removePlotLine=function(a){this.removePlotBandOrLine(a)};return a}()})(z||(z={}));return z});M(a,"Core/Axis/PlotLineOrBand/PlotLineOrBand.js",[a["Core/Color/Palette.js"],a["Core/Axis/PlotLineOrBand/PlotLineOrBandAxis.js"],a["Core/Utilities.js"]],function(a,w,C){var r=C.arrayMax,z=C.arrayMin,x=C.defined,J=C.destroyObjectProperties,u=C.erase,n=
-C.fireEvent,m=C.merge,g=C.objectEach,c=C.pick;C=function(){function e(a,c){this.axis=a;c&&(this.options=c,this.id=c.id)}e.compose=function(a){return w.compose(e,a)};e.prototype.render=function(){n(this,"render");var e=this,f=e.axis,v=f.horiz,q=f.logarithmic,k=e.options,r=k.color,D=c(k.zIndex,0),B=k.events,u={},t=f.chart.renderer,h=k.label,d=e.label,b=k.to,p=k.from,G=k.value,y=e.svgElem,L=[],F=x(p)&&x(b);L=x(G);var P=!y,S={"class":"highcharts-plot-"+(F?"band ":"line ")+(k.className||"")},Q=F?"bands":
-"lines";q&&(p=q.log2lin(p),b=q.log2lin(b),G=q.log2lin(G));f.chart.styledMode||(L?(S.stroke=r||a.neutralColor40,S["stroke-width"]=c(k.width,1),k.dashStyle&&(S.dashstyle=k.dashStyle)):F&&(S.fill=r||a.highlightColor10,k.borderWidth&&(S.stroke=k.borderColor,S["stroke-width"]=k.borderWidth)));u.zIndex=D;Q+="-"+D;(q=f.plotLinesAndBandsGroups[Q])||(f.plotLinesAndBandsGroups[Q]=q=t.g("plot-"+Q).attr(u).add());P&&(e.svgElem=y=t.path().attr(S).add(q));if(L)L=f.getPlotLinePath({value:G,lineWidth:y.strokeWidth(),
-acrossPanes:k.acrossPanes});else if(F)L=f.getPlotBandPath(p,b,k);else return;!e.eventsAdded&&B&&(g(B,function(b,d){y.on(d,function(b){B[d].apply(e,[b])})}),e.eventsAdded=!0);(P||!y.d)&&L&&L.length?y.attr({d:L}):y&&(L?(y.show(!0),y.animate({d:L})):y.d&&(y.hide(),d&&(e.label=d=d.destroy())));h&&(x(h.text)||x(h.formatter))&&L&&L.length&&0<f.width&&0<f.height&&!L.isFlat?(h=m({align:v&&F&&"center",x:v?!F&&4:10,verticalAlign:!v&&F&&"middle",y:v?F?16:10:F?6:-4,rotation:v&&!F&&90},h),this.renderLabel(h,L,
-F,D)):d&&d.hide();return e};e.prototype.renderLabel=function(a,c,e,g){var f=this.axis,l=f.chart.renderer,q=this.label;q||(this.label=q=l.text(this.getLabelText(a),0,0,a.useHTML).attr({align:a.textAlign||a.align,rotation:a.rotation,"class":"highcharts-plot-"+(e?"band":"line")+"-label "+(a.className||""),zIndex:g}).add(),f.chart.styledMode||q.css(m({textOverflow:"ellipsis"},a.style)));g=c.xBounds||[c[0][1],c[1][1],e?c[2][1]:c[0][1]];c=c.yBounds||[c[0][2],c[1][2],e?c[2][2]:c[0][2]];e=z(g);l=z(c);q.align(a,
-!1,{x:e,y:l,width:r(g)-e,height:r(c)-l});q.alignValue&&"left"!==q.alignValue||q.css({width:(90===q.rotation?f.height-(q.alignAttr.y-f.top):f.width-(q.alignAttr.x-f.left))+"px"});q.show(!0)};e.prototype.getLabelText=function(a){return x(a.formatter)?a.formatter.call(this):a.text};e.prototype.destroy=function(){u(this.axis.plotLinesAndBands,this);delete this.axis;J(this)};return e}();"";"";return C});M(a,"Core/Tooltip.js",[a["Core/FormatUtilities.js"],a["Core/Globals.js"],a["Core/Color/Palette.js"],
-a["Core/Renderer/RendererUtilities.js"],a["Core/Renderer/RendererRegistry.js"],a["Core/Utilities.js"]],function(a,w,C,E,z,x){var r=a.format,u=w.doc,n=E.distribute,m=x.addEvent,g=x.clamp,c=x.css,e=x.defined,l=x.discardElement,f=x.extend,v=x.fireEvent,q=x.isArray,k=x.isNumber,I=x.isString,D=x.merge,B=x.pick,O=x.splat,t=x.syncTimeout;a=function(){function a(a,b){this.container=void 0;this.crosshairs=[];this.distance=0;this.isHidden=!0;this.isSticky=!1;this.now={};this.options={};this.outside=!1;this.chart=
-a;this.init(a,b)}a.prototype.applyFilter=function(){var a=this.chart;a.renderer.definition({tagName:"filter",attributes:{id:"drop-shadow-"+a.index,opacity:.5},children:[{tagName:"feGaussianBlur",attributes:{"in":"SourceAlpha",stdDeviation:1}},{tagName:"feOffset",attributes:{dx:1,dy:1}},{tagName:"feComponentTransfer",children:[{tagName:"feFuncA",attributes:{type:"linear",slope:.3}}]},{tagName:"feMerge",children:[{tagName:"feMergeNode"},{tagName:"feMergeNode",attributes:{"in":"SourceGraphic"}}]}]})};
-a.prototype.bodyFormatter=function(a){return a.map(function(b){var a=b.series.tooltipOptions;return(a[(b.point.formatPrefix||"point")+"Formatter"]||b.point.tooltipFormatter).call(b.point,a[(b.point.formatPrefix||"point")+"Format"]||"")})};a.prototype.cleanSplit=function(a){this.chart.series.forEach(function(b){var d=b&&b.tt;d&&(!d.isActive||a?b.tt=d.destroy():d.isActive=!1)})};a.prototype.defaultFormatter=function(a){var b=this.points||O(this);var d=[a.tooltipFooterHeaderFormatter(b[0])];d=d.concat(a.bodyFormatter(b));
-d.push(a.tooltipFooterHeaderFormatter(b[0],!0));return d};a.prototype.destroy=function(){this.label&&(this.label=this.label.destroy());this.split&&this.tt&&(this.cleanSplit(this.chart,!0),this.tt=this.tt.destroy());this.renderer&&(this.renderer=this.renderer.destroy(),l(this.container));x.clearTimeout(this.hideTimer);x.clearTimeout(this.tooltipTimeout)};a.prototype.getAnchor=function(a,b){var d=this.chart,c=d.pointer,e=d.inverted,h=d.plotTop,f=d.plotLeft,g,k,t=0,l=0;a=O(a);this.followPointer&&b?("undefined"===
-typeof b.chartX&&(b=c.normalize(b)),c=[b.chartX-f,b.chartY-h]):a[0].tooltipPos?c=a[0].tooltipPos:(a.forEach(function(b){g=b.series.yAxis;k=b.series.xAxis;t+=b.plotX||0;l+=b.plotLow?(b.plotLow+(b.plotHigh||0))/2:b.plotY||0;k&&g&&(e?(t+=h+d.plotHeight-k.len-k.pos,l+=f+d.plotWidth-g.len-g.pos):(t+=k.pos-f,l+=g.pos-h))}),t/=a.length,l/=a.length,c=[e?d.plotWidth-l:t,e?d.plotHeight-t:l],this.shared&&1<a.length&&b&&(e?c[0]=b.chartX-f:c[1]=b.chartY-h));return c.map(Math.round)};a.prototype.getLabel=function(){var a=
-this,b=this.chart.styledMode,h=this.options,f="tooltip"+(e(h.className)?" "+h.className:""),g=h.style.pointerEvents||(!this.followPointer&&h.stickOnContact?"auto":"none"),k=function(){a.inContact=!0},t=function(b){var d=a.chart.hoverSeries;a.inContact=a.shouldStickOnContact()&&a.chart.pointer.inClass(b.relatedTarget,"highcharts-tooltip");if(!a.inContact&&d&&d.onMouseOut)d.onMouseOut()},l,q=this.chart.renderer;if(!this.label){if(this.outside){var n=this.chart.options.chart.style,v=z.getRendererType();
-this.container=l=w.doc.createElement("div");l.className="highcharts-tooltip-container";c(l,{position:"absolute",top:"1px",pointerEvents:g,zIndex:Math.max(this.options.style.zIndex||0,(n&&n.zIndex||0)+3)});m(l,"mouseenter",k);m(l,"mouseleave",t);w.doc.body.appendChild(l);this.renderer=q=new v(l,0,0,n,void 0,void 0,q.styledMode)}this.split?this.label=q.g(f):(this.label=q.label("",0,0,h.shape,void 0,void 0,h.useHTML,void 0,f).attr({padding:h.padding,r:h.borderRadius}),b||this.label.attr({fill:h.backgroundColor,
-"stroke-width":h.borderWidth}).css(h.style).css({pointerEvents:g}).shadow(h.shadow));b&&h.shadow&&(this.applyFilter(),this.label.attr({filter:"url(#drop-shadow-"+this.chart.index+")"}));if(a.outside&&!a.split){var r=this.label,B=r.xSetter,D=r.ySetter;r.xSetter=function(b){B.call(r,a.distance);l.style.left=b+"px"};r.ySetter=function(b){D.call(r,a.distance);l.style.top=b+"px"}}this.label.on("mouseenter",k).on("mouseleave",t).attr({zIndex:8}).add()}return this.label};a.prototype.getPosition=function(a,
-b,c){var d=this.chart,e=this.distance,h={},f=d.inverted&&c.h||0,g=this.outside,p=g?u.documentElement.clientWidth-2*e:d.chartWidth,k=g?Math.max(u.body.scrollHeight,u.documentElement.scrollHeight,u.body.offsetHeight,u.documentElement.offsetHeight,u.documentElement.clientHeight):d.chartHeight,l=d.pointer.getChartPosition(),t=function(h){var f="x"===h;return[h,f?p:k,f?a:b].concat(g?[f?a*l.scaleX:b*l.scaleY,f?l.left-e+(c.plotX+d.plotLeft)*l.scaleX:l.top-e+(c.plotY+d.plotTop)*l.scaleY,0,f?p:k]:[f?a:b,f?
-c.plotX+d.plotLeft:c.plotY+d.plotTop,f?d.plotLeft:d.plotTop,f?d.plotLeft+d.plotWidth:d.plotTop+d.plotHeight])},m=t("y"),q=t("x"),n,v=!this.followPointer&&B(c.ttBelow,!d.inverted===!!c.negative),r=function(b,a,d,c,p,k,y){var t=g?"y"===b?e*l.scaleY:e*l.scaleX:e,G=(d-c)/2,A=c<p-e,m=p+e+c<a,F=p-t-d+G;p=p+t-G;if(v&&m)h[b]=p;else if(!v&&A)h[b]=F;else if(A)h[b]=Math.min(y-c,0>F-f?F:F-f);else if(m)h[b]=Math.max(k,p+f+d>a?p:p+f);else return!1},D=function(b,a,d,c,f){var g;f<e||f>a-e?g=!1:h[b]=f<d/2?1:f>a-c/
-2?a-c-2:f-d/2;return g},A=function(b){var a=m;m=q;q=a;n=b},U=function(){!1!==r.apply(0,m)?!1!==D.apply(0,q)||n||(A(!0),U()):n?h.x=h.y=0:(A(!0),U())};(d.inverted||1<this.len)&&A();U();return h};a.prototype.hide=function(a){var b=this;x.clearTimeout(this.hideTimer);a=B(a,this.options.hideDelay);this.isHidden||(this.hideTimer=t(function(){b.getLabel().fadeOut(a?void 0:a);b.isHidden=!0},a))};a.prototype.init=function(a,b){this.chart=a;this.options=b;this.crosshairs=[];this.now={x:0,y:0};this.isHidden=
-!0;this.split=b.split&&!a.inverted&&!a.polar;this.shared=b.shared||this.split;this.outside=B(b.outside,!(!a.scrollablePixelsX&&!a.scrollablePixelsY))};a.prototype.shouldStickOnContact=function(){return!(this.followPointer||!this.options.stickOnContact)};a.prototype.isStickyOnContact=function(){return!(!this.shouldStickOnContact()||!this.inContact)};a.prototype.move=function(a,b,c,e){var d=this,h=d.now,g=!1!==d.options.animation&&!d.isHidden&&(1<Math.abs(a-h.x)||1<Math.abs(b-h.y)),p=d.followPointer||
-1<d.len;f(h,{x:g?(2*h.x+a)/3:a,y:g?(h.y+b)/2:b,anchorX:p?void 0:g?(2*h.anchorX+c)/3:c,anchorY:p?void 0:g?(h.anchorY+e)/2:e});d.getLabel().attr(h);d.drawTracker();g&&(x.clearTimeout(this.tooltipTimeout),this.tooltipTimeout=setTimeout(function(){d&&d.move(a,b,c,e)},32))};a.prototype.refresh=function(a,b){var d=this.chart,c=this.options,e=O(a),h=e[0],f=[],g=c.formatter||this.defaultFormatter,k=this.shared,l=d.styledMode,t={};if(c.enabled){x.clearTimeout(this.hideTimer);this.followPointer=!this.split&&
-h.series.tooltipOptions.followPointer;var m=this.getAnchor(a,b),n=m[0],r=m[1];!k||!q(a)&&a.series&&a.series.noSharedTooltip?t=h.getLabelConfig():(d.pointer.applyInactiveState(e),e.forEach(function(b){b.setState("hover");f.push(b.getLabelConfig())}),t={x:h.category,y:h.y},t.points=f);this.len=f.length;a=g.call(t,this);g=h.series;this.distance=B(g.tooltipOptions.distance,16);if(!1===a)this.hide();else{if(this.split)this.renderSplit(a,e);else if(e=n,k=r,b&&d.pointer.isDirectTouch&&(e=b.chartX-d.plotLeft,
-k=b.chartY-d.plotTop),d.polar||!1===g.options.clip||g.shouldShowTooltip(e,k))b=this.getLabel(),c.style.width&&!l||b.css({width:this.chart.spacingBox.width+"px"}),b.attr({text:a&&a.join?a.join(""):a}),b.removeClass(/highcharts-color-[\d]+/g).addClass("highcharts-color-"+B(h.colorIndex,g.colorIndex)),l||b.attr({stroke:c.borderColor||h.color||g.color||C.neutralColor60}),this.updatePosition({plotX:n,plotY:r,negative:h.negative,ttBelow:h.ttBelow,h:m[2]||0});else{this.hide();return}this.isHidden&&this.label&&
-this.label.attr({opacity:1}).show();this.isHidden=!1}v(this,"refresh")}};a.prototype.renderSplit=function(a,b){function d(b,a,d,e,h){void 0===h&&(h=!0);d?(a=Y?0:J,b=g(b-e/2,N.left,N.right-e-(c.outside?T:0))):(a-=da,b=h?b-e-z:b+z,b=g(b,h?b:N.left,N.right));return{x:b,y:a}}var c=this,e=c.chart,h=c.chart,k=h.chartWidth,l=h.chartHeight,t=h.plotHeight,m=h.plotLeft,q=h.plotTop,r=h.pointer,v=h.scrollablePixelsY;v=void 0===v?0:v;var D=h.scrollablePixelsX,x=h.scrollingContainer;x=void 0===x?{scrollLeft:0,
-scrollTop:0}:x;var w=x.scrollLeft;x=x.scrollTop;var O=h.styledMode,z=c.distance,A=c.options,U=c.options.positioner,N=c.outside&&"number"!==typeof D?u.documentElement.getBoundingClientRect():{left:w,right:w+k,top:x,bottom:x+l},W=c.getLabel(),X=this.renderer||e.renderer,Y=!(!e.xAxis[0]||!e.xAxis[0].opposite);e=r.getChartPosition();var T=e.left;e=e.top;var da=q+x,E=0,J=t-v;I(a)&&(a=[!1,a]);a=a.slice(0,b.length+1).reduce(function(a,e,h){if(!1!==e&&""!==e){h=b[h-1]||{isHeader:!0,plotX:b[0].plotX,plotY:t,
-series:{}};var f=h.isHeader,p=f?c:h.series;e=e.toString();var k=p.tt,l=h.isHeader;var y=h.series;var G="highcharts-color-"+B(h.colorIndex,y.colorIndex,"none");k||(k={padding:A.padding,r:A.borderRadius},O||(k.fill=A.backgroundColor,k["stroke-width"]=A.borderWidth),k=X.label("",0,0,A[l?"headerShape":"shape"],void 0,void 0,A.useHTML).addClass((l?"highcharts-tooltip-header ":"")+"highcharts-tooltip-box "+G).attr(k).add(W));k.isActive=!0;k.attr({text:e});O||k.css(A.style).shadow(A.shadow).attr({stroke:A.borderColor||
-h.color||y.color||C.neutralColor80});p=p.tt=k;l=p.getBBox();e=l.width+p.strokeWidth();f&&(E=l.height,J+=E,Y&&(da-=E));y=h.plotX;y=void 0===y?0:y;G=h.plotY;G=void 0===G?0:G;k=h.series;if(h.isHeader){y=m+y;var F=q+t/2}else{var n=k.xAxis,ca=k.yAxis;y=n.pos+g(y,-z,n.len+z);k.shouldShowTooltip(0,ca.pos-q+G,{ignoreX:!0})&&(F=ca.pos+G)}y=g(y,N.left-z,N.right+z);"number"===typeof F?(l=l.height+1,G=U?U.call(c,e,l,h):d(y,F,f,e),a.push({align:U?0:void 0,anchorX:y,anchorY:F,boxWidth:e,point:h,rank:B(G.rank,f?
-1:0),size:l,target:G.y,tt:p,x:G.x})):p.isActive=!1}return a},[]);!U&&a.some(function(b){var a=(c.outside?T:0)+b.anchorX;return a<N.left&&a+b.boxWidth<N.right?!0:a<T-N.left+b.boxWidth&&N.right-a>a})&&(a=a.map(function(b){var a=d(b.anchorX,b.anchorY,b.point.isHeader,b.boxWidth,!1);return f(b,{target:a.y,x:a.x})}));c.cleanSplit();n(a,J);var ba=T,ea=T;a.forEach(function(b){var a=b.x,d=b.boxWidth;b=b.isHeader;b||(c.outside&&T+a<ba&&(ba=T+a),!b&&c.outside&&ba+d>ea&&(ea=T+a))});a.forEach(function(b){var a=
-b.x,d=b.anchorX,e=b.pos,h=b.point.isHeader;e={visibility:"undefined"===typeof e?"hidden":"inherit",x:a,y:e+da,anchorX:d,anchorY:b.anchorY};if(c.outside&&a<d){var f=T-ba;0<f&&(h||(e.x=a+f,e.anchorX=d+f),h&&(e.x=(ea-ba)/2,e.anchorX=d+f))}b.tt.attr(e)});a=c.container;v=c.renderer;c.outside&&a&&v&&(h=W.getBBox(),v.setSize(h.width+h.x,h.height+h.y,!1),a.style.left=ba+"px",a.style.top=e+"px")};a.prototype.drawTracker=function(){if(this.followPointer||!this.options.stickOnContact)this.tracker&&this.tracker.destroy();
-else{var a=this.chart,b=this.label,c=this.shared?a.hoverPoints:a.hoverPoint;if(b&&c){var e={x:0,y:0,width:0,height:0};c=this.getAnchor(c);var h=b.getBBox();c[0]+=a.plotLeft-b.translateX;c[1]+=a.plotTop-b.translateY;e.x=Math.min(0,c[0]);e.y=Math.min(0,c[1]);e.width=0>c[0]?Math.max(Math.abs(c[0]),h.width-c[0]):Math.max(Math.abs(c[0]),h.width);e.height=0>c[1]?Math.max(Math.abs(c[1]),h.height-Math.abs(c[1])):Math.max(Math.abs(c[1]),h.height);this.tracker?this.tracker.attr(e):(this.tracker=b.renderer.rect(e).addClass("highcharts-tracker").add(b),
-a.styledMode||this.tracker.attr({fill:"rgba(0,0,0,0)"}))}}};a.prototype.styledModeFormat=function(a){return a.replace('style="font-size: 10px"','class="highcharts-header"').replace(/style="color:{(point|series)\.color}"/g,'class="highcharts-color-{$1.colorIndex}"')};a.prototype.tooltipFooterHeaderFormatter=function(a,b){var d=a.series,c=d.tooltipOptions,e=d.xAxis,h=e&&e.dateTime;e={isFooter:b,labelConfig:a};var f=c.xDateFormat,g=c[b?"footerFormat":"headerFormat"];v(this,"headerFormatter",e,function(b){h&&
-!f&&k(a.key)&&(f=h.getXDateFormat(a.key,c.dateTimeLabelFormats));h&&f&&(a.point&&a.point.tooltipDateKeys||["key"]).forEach(function(b){g=g.replace("{point."+b+"}","{point."+b+":"+f+"}")});d.chart.styledMode&&(g=this.styledModeFormat(g));b.text=r(g,{point:a,series:d},this.chart)});return e.text};a.prototype.update=function(a){this.destroy();D(!0,this.chart.options.tooltip.userOptions,a);this.init(this.chart,D(!0,this.options,a))};a.prototype.updatePosition=function(a){var b=this.chart,d=this.options,
-e=b.pointer,h=this.getLabel();e=e.getChartPosition();var f=(d.positioner||this.getPosition).call(this,h.width,h.height,a),g=a.plotX+b.plotLeft;a=a.plotY+b.plotTop;if(this.outside){d=d.borderWidth+2*this.distance;this.renderer.setSize(h.width+d,h.height+d,!1);if(1!==e.scaleX||1!==e.scaleY)c(this.container,{transform:"scale("+e.scaleX+", "+e.scaleY+")"}),g*=e.scaleX,a*=e.scaleY;g+=e.left-f.x;a+=e.top-f.y}this.move(Math.round(f.x),Math.round(f.y||0),g,a)};return a}();"";return a});M(a,"Core/Series/Point.js",
-[a["Core/Renderer/HTML/AST.js"],a["Core/Animation/AnimationUtilities.js"],a["Core/DefaultOptions.js"],a["Core/FormatUtilities.js"],a["Core/Utilities.js"]],function(a,w,C,E,z){var r=w.animObject,J=C.defaultOptions,u=E.format,n=z.addEvent,m=z.defined,g=z.erase,c=z.extend,e=z.fireEvent,l=z.getNestedProperty,f=z.isArray,v=z.isFunction,q=z.isNumber,k=z.isObject,I=z.merge,D=z.objectEach,B=z.pick,O=z.syncTimeout,t=z.removeEvent,h=z.uniqueKey;w=function(){function d(){this.colorIndex=this.category=void 0;
-this.formatPrefix="point";this.id=void 0;this.isNull=!1;this.percentage=this.options=this.name=void 0;this.selected=!1;this.total=this.series=void 0;this.visible=!0;this.x=void 0}d.prototype.animateBeforeDestroy=function(){var b=this,a={x:b.startXPos,opacity:0},d=b.getGraphicalProps();d.singular.forEach(function(d){b[d]=b[d].animate("dataLabel"===d?{x:b[d].startXPos,y:b[d].startYPos,opacity:0}:a)});d.plural.forEach(function(a){b[a].forEach(function(a){a.element&&a.animate(c({x:b.startXPos},a.startYPos?
-{x:a.startXPos,y:a.startYPos}:{}))})})};d.prototype.applyOptions=function(b,a){var e=this.series,h=e.options.pointValKey||e.pointValKey;b=d.prototype.optionsToObject.call(this,b);c(this,b);this.options=this.options?c(this.options,b):b;b.group&&delete this.group;b.dataLabels&&delete this.dataLabels;h&&(this.y=d.prototype.getNestedProperty.call(this,h));this.formatPrefix=(this.isNull=B(this.isValid&&!this.isValid(),null===this.x||!q(this.y)))?"null":"point";this.selected&&(this.state="select");"name"in
-this&&"undefined"===typeof a&&e.xAxis&&e.xAxis.hasNames&&(this.x=e.xAxis.nameToX(this));"undefined"===typeof this.x&&e?this.x="undefined"===typeof a?e.autoIncrement():a:q(b.x)&&e.options.relativeXValue&&(this.x=e.autoIncrement(b.x));return this};d.prototype.destroy=function(){function b(){if(a.graphic||a.dataLabel||a.dataLabels)t(a),a.destroyElements();for(f in a)a[f]=null}var a=this,d=a.series,c=d.chart;d=d.options.dataSorting;var e=c.hoverPoints,h=r(a.series.chart.renderer.globalAnimation),f;a.legendItem&&
-c.legend.destroyItem(a);e&&(a.setState(),g(e,a),e.length||(c.hoverPoints=null));if(a===c.hoverPoint)a.onMouseOut();d&&d.enabled?(this.animateBeforeDestroy(),O(b,h.duration)):b();c.pointCount--};d.prototype.destroyElements=function(b){var a=this;b=a.getGraphicalProps(b);b.singular.forEach(function(b){a[b]=a[b].destroy()});b.plural.forEach(function(b){a[b].forEach(function(b){b.element&&b.destroy()});delete a[b]})};d.prototype.firePointEvent=function(b,a,d){var c=this,h=this.series.options;(h.point.events[b]||
-c.options&&c.options.events&&c.options.events[b])&&c.importEvents();"click"===b&&h.allowPointSelect&&(d=function(b){c.select&&c.select(null,b.ctrlKey||b.metaKey||b.shiftKey)});e(c,b,a,d)};d.prototype.getClassName=function(){return"highcharts-point"+(this.selected?" highcharts-point-select":"")+(this.negative?" highcharts-negative":"")+(this.isNull?" highcharts-null-point":"")+("undefined"!==typeof this.colorIndex?" highcharts-color-"+this.colorIndex:"")+(this.options.className?" "+this.options.className:
-"")+(this.zone&&this.zone.className?" "+this.zone.className.replace("highcharts-negative",""):"")};d.prototype.getGraphicalProps=function(b){var a=this,d=[],c={singular:[],plural:[]},e;b=b||{graphic:1,dataLabel:1};b.graphic&&d.push("graphic","upperGraphic","shadowGroup");b.dataLabel&&d.push("dataLabel","dataLabelUpper","connector");for(e=d.length;e--;){var h=d[e];a[h]&&c.singular.push(h)}["dataLabel","connector"].forEach(function(d){var e=d+"s";b[d]&&a[e]&&c.plural.push(e)});return c};d.prototype.getLabelConfig=
-function(){return{x:this.category,y:this.y,color:this.color,colorIndex:this.colorIndex,key:this.name||this.category,series:this.series,point:this,percentage:this.percentage,total:this.total||this.stackTotal}};d.prototype.getNestedProperty=function(b){if(b)return 0===b.indexOf("custom.")?l(b,this.options):this[b]};d.prototype.getZone=function(){var b=this.series,a=b.zones;b=b.zoneAxis||"y";var d,c=0;for(d=a[c];this[b]>=d.value;)d=a[++c];this.nonZonedColor||(this.nonZonedColor=this.color);this.color=
-d&&d.color&&!this.options.color?d.color:this.nonZonedColor;return d};d.prototype.hasNewShapeType=function(){return(this.graphic&&(this.graphic.symbolName||this.graphic.element.nodeName))!==this.shapeType};d.prototype.init=function(b,a,d){this.series=b;this.applyOptions(a,d);this.id=m(this.id)?this.id:h();this.resolveColor();b.chart.pointCount++;e(this,"afterInit");return this};d.prototype.optionsToObject=function(b){var a=this.series,c=a.options.keys,e=c||a.pointArrayMap||["y"],h=e.length,g={},k=
-0,l=0;if(q(b)||null===b)g[e[0]]=b;else if(f(b))for(!c&&b.length>h&&(a=typeof b[0],"string"===a?g.name=b[0]:"number"===a&&(g.x=b[0]),k++);l<h;)c&&"undefined"===typeof b[k]||(0<e[l].indexOf(".")?d.prototype.setNestedProperty(g,b[k],e[l]):g[e[l]]=b[k]),k++,l++;else"object"===typeof b&&(g=b,b.dataLabels&&(a._hasPointLabels=!0),b.marker&&(a._hasPointMarkers=!0));return g};d.prototype.resolveColor=function(){var b=this.series,a=b.chart.styledMode;var d=b.chart.options.chart.colorCount;delete this.nonZonedColor;
-if(b.options.colorByPoint){if(!a){d=b.options.colors||b.chart.options.colors;var c=d[b.colorCounter];d=d.length}a=b.colorCounter;b.colorCounter++;b.colorCounter===d&&(b.colorCounter=0)}else a||(c=b.color),a=b.colorIndex;this.colorIndex=B(this.options.colorIndex,a);this.color=B(this.options.color,c)};d.prototype.setNestedProperty=function(b,a,d){d.split(".").reduce(function(b,d,c,e){b[d]=e.length-1===c?a:k(b[d],!0)?b[d]:{};return b[d]},b);return b};d.prototype.tooltipFormatter=function(b){var a=this.series,
-d=a.tooltipOptions,c=B(d.valueDecimals,""),e=d.valuePrefix||"",h=d.valueSuffix||"";a.chart.styledMode&&(b=a.chart.tooltip.styledModeFormat(b));(a.pointArrayMap||["y"]).forEach(function(a){a="{point."+a;if(e||h)b=b.replace(RegExp(a+"}","g"),e+a+"}"+h);b=b.replace(RegExp(a+"}","g"),a+":,."+c+"f}")});return u(b,{point:this,series:this.series},a.chart)};d.prototype.update=function(b,a,d,c){function e(){h.applyOptions(b);var c=g&&h.hasDummyGraphic;c=null===h.y?!c:c;g&&c&&(h.graphic=g.destroy(),delete h.hasDummyGraphic);
-k(b,!0)&&(g&&g.element&&b&&b.marker&&"undefined"!==typeof b.marker.symbol&&(h.graphic=g.destroy()),b&&b.dataLabels&&h.dataLabel&&(h.dataLabel=h.dataLabel.destroy()),h.connector&&(h.connector=h.connector.destroy()));t=h.index;f.updateParallelArrays(h,t);l.data[t]=k(l.data[t],!0)||k(b,!0)?h.options:B(b,l.data[t]);f.isDirty=f.isDirtyData=!0;!f.fixedBox&&f.hasCartesianSeries&&(p.isDirtyBox=!0);"point"===l.legendType&&(p.isDirtyLegend=!0);a&&p.redraw(d)}var h=this,f=h.series,g=h.graphic,p=f.chart,l=f.options,
-t;a=B(a,!0);!1===c?e():h.firePointEvent("update",{options:b},e)};d.prototype.remove=function(b,a){this.series.removePoint(this.series.data.indexOf(this),b,a)};d.prototype.select=function(b,a){var d=this,c=d.series,e=c.chart;this.selectedStaging=b=B(b,!d.selected);d.firePointEvent(b?"select":"unselect",{accumulate:a},function(){d.selected=d.options.selected=b;c.options.data[c.data.indexOf(d)]=d.options;d.setState(b&&"select");a||e.getSelectedPoints().forEach(function(b){var a=b.series;b.selected&&
-b!==d&&(b.selected=b.options.selected=!1,a.options.data[a.data.indexOf(b)]=b.options,b.setState(e.hoverPoints&&a.options.inactiveOtherPoints?"inactive":""),b.firePointEvent("unselect"))})});delete this.selectedStaging};d.prototype.onMouseOver=function(b){var a=this.series.chart,d=a.pointer;b=b?d.normalize(b):d.getChartCoordinatesFromPoint(this,a.inverted);d.runPointActions(b,this)};d.prototype.onMouseOut=function(){var b=this.series.chart;this.firePointEvent("mouseOut");this.series.options.inactiveOtherPoints||
-(b.hoverPoints||[]).forEach(function(b){b.setState()});b.hoverPoints=b.hoverPoint=null};d.prototype.importEvents=function(){if(!this.hasImportedEvents){var b=this,a=I(b.series.options.point,b.options).events;b.events=a;D(a,function(a,d){v(a)&&n(b,d,a)});this.hasImportedEvents=!0}};d.prototype.setState=function(b,d){var h=this.series,f=this.state,g=h.options.states[b||"normal"]||{},k=J.plotOptions[h.type].marker&&h.options.marker,p=k&&!1===k.enabled,l=k&&k.states&&k.states[b||"normal"]||{},t=!1===
-l.enabled,m=this.marker||{},n=h.chart,v=k&&h.markerAttribs,r=h.halo,D,I=h.stateMarkerGraphic;b=b||"";if(!(b===this.state&&!d||this.selected&&"select"!==b||!1===g.enabled||b&&(t||p&&!1===l.enabled)||b&&m.states&&m.states[b]&&!1===m.states[b].enabled)){this.state=b;v&&(D=h.markerAttribs(this,b));if(this.graphic&&!this.hasDummyGraphic){f&&this.graphic.removeClass("highcharts-point-"+f);b&&this.graphic.addClass("highcharts-point-"+b);if(!n.styledMode){var u=h.pointAttribs(this,b);var x=B(n.options.chart.animation,
-g.animation);h.options.inactiveOtherPoints&&q(u.opacity)&&((this.dataLabels||[]).forEach(function(b){b&&b.animate({opacity:u.opacity},x)}),this.connector&&this.connector.animate({opacity:u.opacity},x));this.graphic.animate(u,x)}D&&this.graphic.animate(D,B(n.options.chart.animation,l.animation,k.animation));I&&I.hide()}else{if(b&&l){f=m.symbol||h.symbol;I&&I.currentSymbol!==f&&(I=I.destroy());if(D)if(I)I[d?"animate":"attr"]({x:D.x,y:D.y});else f&&(h.stateMarkerGraphic=I=n.renderer.symbol(f,D.x,D.y,
-D.width,D.height).add(h.markerGroup),I.currentSymbol=f);!n.styledMode&&I&&I.attr(h.pointAttribs(this,b))}I&&(I[b&&this.isInside?"show":"hide"](),I.element.point=this,I.addClass(this.getClassName(),!0))}g=g.halo;D=(I=this.graphic||I)&&I.visibility||"inherit";g&&g.size&&I&&"hidden"!==D&&!this.isCluster?(r||(h.halo=r=n.renderer.path().add(I.parentGroup)),r.show()[d?"animate":"attr"]({d:this.haloPath(g.size)}),r.attr({"class":"highcharts-halo highcharts-color-"+B(this.colorIndex,h.colorIndex)+(this.className?
-" "+this.className:""),visibility:D,zIndex:-1}),r.point=this,n.styledMode||r.attr(c({fill:this.color||h.color,"fill-opacity":g.opacity},a.filterUserAttributes(g.attributes||{})))):r&&r.point&&r.point.haloPath&&r.animate({d:r.point.haloPath(0)},null,r.hide);e(this,"afterSetState",{state:b})}};d.prototype.haloPath=function(b){return this.series.chart.renderer.symbols.circle(Math.floor(this.plotX)-b,this.plotY-b,2*b,2*b)};return d}();"";return w});M(a,"Core/Pointer.js",[a["Core/Color/Color.js"],a["Core/Globals.js"],
-a["Core/Color/Palette.js"],a["Core/Tooltip.js"],a["Core/Utilities.js"]],function(a,w,C,E,z){var r=a.parse,J=w.charts,u=w.noop,n=z.addEvent,m=z.attr,g=z.css,c=z.defined,e=z.extend,l=z.find,f=z.fireEvent,v=z.isNumber,q=z.isObject,k=z.objectEach,I=z.offset,D=z.pick,B=z.splat;a=function(){function a(a,c){this.lastValidTouch={};this.pinchDown=[];this.runChartClick=!1;this.eventsToUnbind=[];this.chart=a;this.hasDragged=!1;this.options=c;this.init(a,c)}a.prototype.applyInactiveState=function(a){var c=[],
-d;(a||[]).forEach(function(b){d=b.series;c.push(d);d.linkedParent&&c.push(d.linkedParent);d.linkedSeries&&(c=c.concat(d.linkedSeries));d.navigatorSeries&&c.push(d.navigatorSeries)});this.chart.series.forEach(function(b){-1===c.indexOf(b)?b.setState("inactive",!0):b.options.inactiveOtherPoints&&b.setAllPointsToState("inactive")})};a.prototype.destroy=function(){var c=this;this.eventsToUnbind.forEach(function(a){return a()});this.eventsToUnbind=[];w.chartCount||(a.unbindDocumentMouseUp&&(a.unbindDocumentMouseUp=
-a.unbindDocumentMouseUp()),a.unbindDocumentTouchEnd&&(a.unbindDocumentTouchEnd=a.unbindDocumentTouchEnd()));clearInterval(c.tooltipTimeout);k(c,function(a,d){c[d]=void 0})};a.prototype.drag=function(a){var c=this.chart,d=c.options.chart,b=this.zoomHor,e=this.zoomVert,f=c.plotLeft,g=c.plotTop,k=c.plotWidth,l=c.plotHeight,t=this.mouseDownX||0,m=this.mouseDownY||0,n=q(d.panning)?d.panning&&d.panning.enabled:d.panning,v=d.panKey&&a[d.panKey+"Key"],B=a.chartX,D=a.chartY,I=this.selectionMarker;if(!I||!I.touch)if(B<
-f?B=f:B>f+k&&(B=f+k),D<g?D=g:D>g+l&&(D=g+l),this.hasDragged=Math.sqrt(Math.pow(t-B,2)+Math.pow(m-D,2)),10<this.hasDragged){var u=c.isInsidePlot(t-f,m-g,{visiblePlotOnly:!0});c.hasCartesianSeries&&(this.zoomX||this.zoomY)&&u&&!v&&!I&&(this.selectionMarker=I=c.renderer.rect(f,g,b?1:k,e?1:l,0).attr({"class":"highcharts-selection-marker",zIndex:7}).add(),c.styledMode||I.attr({fill:d.selectionMarkerFill||r(C.highlightColor80).setOpacity(.25).get()}));I&&b&&(b=B-t,I.attr({width:Math.abs(b),x:(0<b?0:b)+
-t}));I&&e&&(b=D-m,I.attr({height:Math.abs(b),y:(0<b?0:b)+m}));u&&!I&&n&&c.pan(a,d.panning)}};a.prototype.dragStart=function(a){var c=this.chart;c.mouseIsDown=a.type;c.cancelClick=!1;c.mouseDownX=this.mouseDownX=a.chartX;c.mouseDownY=this.mouseDownY=a.chartY};a.prototype.drop=function(a){var h=this,d=this.chart,b=this.hasPinched;if(this.selectionMarker){var k={originalEvent:a,xAxis:[],yAxis:[]},l=this.selectionMarker,t=l.attr?l.attr("x"):l.x,m=l.attr?l.attr("y"):l.y,q=l.attr?l.attr("width"):l.width,
-n=l.attr?l.attr("height"):l.height,r;if(this.hasDragged||b)d.axes.forEach(function(d){if(d.zoomEnabled&&c(d.min)&&(b||h[{xAxis:"zoomX",yAxis:"zoomY"}[d.coll]])&&v(t)&&v(m)){var e=d.horiz,f="touchend"===a.type?d.minPixelPadding:0,g=d.toValue((e?t:m)+f);e=d.toValue((e?t+q:m+n)-f);k[d.coll].push({axis:d,min:Math.min(g,e),max:Math.max(g,e)});r=!0}}),r&&f(d,"selection",k,function(a){d.zoom(e(a,b?{animation:!1}:null))});v(d.index)&&(this.selectionMarker=this.selectionMarker.destroy());b&&this.scaleGroups()}d&&
-v(d.index)&&(g(d.container,{cursor:d._cursor}),d.cancelClick=10<this.hasDragged,d.mouseIsDown=this.hasDragged=this.hasPinched=!1,this.pinchDown=[])};a.prototype.findNearestKDPoint=function(a,c,d){var b=this.chart,e=b.hoverPoint;b=b.tooltip;if(e&&b&&b.isStickyOnContact())return e;var h;a.forEach(function(b){var a=!(b.noSharedTooltip&&c)&&0>b.options.findNearestPointBy.indexOf("y");b=b.searchPoint(d,a);if((a=q(b,!0)&&b.series)&&!(a=!q(h,!0))){a=h.distX-b.distX;var e=h.dist-b.dist,f=(b.series.group&&
-b.series.group.zIndex)-(h.series.group&&h.series.group.zIndex);a=0<(0!==a&&c?a:0!==e?e:0!==f?f:h.series.index>b.series.index?-1:1)}a&&(h=b)});return h};a.prototype.getChartCoordinatesFromPoint=function(a,c){var d=a.series,b=d.xAxis;d=d.yAxis;var e=a.shapeArgs;if(b&&d){var h=D(a.clientX,a.plotX),f=a.plotY||0;a.isNode&&e&&v(e.x)&&v(e.y)&&(h=e.x,f=e.y);return c?{chartX:d.len+d.pos-f,chartY:b.len+b.pos-h}:{chartX:h+b.pos,chartY:f+d.pos}}if(e&&e.x&&e.y)return{chartX:e.x,chartY:e.y}};a.prototype.getChartPosition=
-function(){if(this.chartPosition)return this.chartPosition;var a=this.chart.container,c=I(a);this.chartPosition={left:c.left,top:c.top,scaleX:1,scaleY:1};var d=a.offsetWidth;a=a.offsetHeight;2<d&&2<a&&(this.chartPosition.scaleX=c.width/d,this.chartPosition.scaleY=c.height/a);return this.chartPosition};a.prototype.getCoordinates=function(a){var c={xAxis:[],yAxis:[]};this.chart.axes.forEach(function(d){c[d.isXAxis?"xAxis":"yAxis"].push({axis:d,value:d.toValue(a[d.horiz?"chartX":"chartY"])})});return c};
-a.prototype.getHoverData=function(a,c,d,b,e,g){var h=[];b=!(!b||!a);var k={chartX:g?g.chartX:void 0,chartY:g?g.chartY:void 0,shared:e};f(this,"beforeGetHoverData",k);var p=c&&!c.stickyTracking?[c]:d.filter(function(b){return k.filter?k.filter(b):b.visible&&!(!e&&b.directTouch)&&D(b.options.enableMouseTracking,!0)&&b.stickyTracking});var t=b||!g?a:this.findNearestKDPoint(p,e,g);c=t&&t.series;t&&(e&&!c.noSharedTooltip?(p=d.filter(function(b){return k.filter?k.filter(b):b.visible&&!(!e&&b.directTouch)&&
-D(b.options.enableMouseTracking,!0)&&!b.noSharedTooltip}),p.forEach(function(b){var a=l(b.points,function(b){return b.x===t.x&&!b.isNull});q(a)&&(b.chart.isBoosting&&(a=b.getPoint(a)),h.push(a))})):h.push(t));k={hoverPoint:t};f(this,"afterGetHoverData",k);return{hoverPoint:k.hoverPoint,hoverSeries:c,hoverPoints:h}};a.prototype.getPointFromEvent=function(a){a=a.target;for(var c;a&&!c;)c=a.point,a=a.parentNode;return c};a.prototype.onTrackerMouseOut=function(a){a=a.relatedTarget||a.toElement;var c=
-this.chart.hoverSeries;this.isDirectTouch=!1;if(!(!c||!a||c.stickyTracking||this.inClass(a,"highcharts-tooltip")||this.inClass(a,"highcharts-series-"+c.index)&&this.inClass(a,"highcharts-tracker")))c.onMouseOut()};a.prototype.inClass=function(a,c){for(var d;a;){if(d=m(a,"class")){if(-1!==d.indexOf(c))return!0;if(-1!==d.indexOf("highcharts-container"))return!1}a=a.parentNode}};a.prototype.init=function(a,c){this.options=c;this.chart=a;this.runChartClick=!(!c.chart.events||!c.chart.events.click);this.pinchDown=
-[];this.lastValidTouch={};E&&(a.tooltip=new E(a,c.tooltip),this.followTouchMove=D(c.tooltip.followTouchMove,!0));this.setDOMEvents()};a.prototype.normalize=function(a,c){var d=a.touches,b=d?d.length?d.item(0):D(d.changedTouches,a.changedTouches)[0]:a;c||(c=this.getChartPosition());d=b.pageX-c.left;b=b.pageY-c.top;d/=c.scaleX;b/=c.scaleY;return e(a,{chartX:Math.round(d),chartY:Math.round(b)})};a.prototype.onContainerClick=function(a){var c=this.chart,d=c.hoverPoint;a=this.normalize(a);var b=c.plotLeft,
-g=c.plotTop;c.cancelClick||(d&&this.inClass(a.target,"highcharts-tracker")?(f(d.series,"click",e(a,{point:d})),c.hoverPoint&&d.firePointEvent("click",a)):(e(a,this.getCoordinates(a)),c.isInsidePlot(a.chartX-b,a.chartY-g,{visiblePlotOnly:!0})&&f(c,"click",a)))};a.prototype.onContainerMouseDown=function(a){var c=1===((a.buttons||a.button)&1);a=this.normalize(a);if(w.isFirefox&&0!==a.button)this.onContainerMouseMove(a);if("undefined"===typeof a.button||c)this.zoomOption(a),c&&a.preventDefault&&a.preventDefault(),
-this.dragStart(a)};a.prototype.onContainerMouseLeave=function(c){var e=J[D(a.hoverChartIndex,-1)],d=this.chart.tooltip;d&&d.shouldStickOnContact()&&this.inClass(c.relatedTarget,"highcharts-tooltip-container")||(c=this.normalize(c),e&&(c.relatedTarget||c.toElement)&&(e.pointer.reset(),e.pointer.chartPosition=void 0),d&&!d.isHidden&&this.reset())};a.prototype.onContainerMouseEnter=function(a){delete this.chartPosition};a.prototype.onContainerMouseMove=function(a){var c=this.chart;a=this.normalize(a);
-this.setHoverChartIndex();a.preventDefault||(a.returnValue=!1);("mousedown"===c.mouseIsDown||this.touchSelect(a))&&this.drag(a);c.openMenu||!this.inClass(a.target,"highcharts-tracker")&&!c.isInsidePlot(a.chartX-c.plotLeft,a.chartY-c.plotTop,{visiblePlotOnly:!0})||(this.inClass(a.target,"highcharts-no-tooltip")?this.reset(!1,0):this.runPointActions(a))};a.prototype.onDocumentTouchEnd=function(c){var e=J[D(a.hoverChartIndex,-1)];e&&e.pointer.drop(c)};a.prototype.onContainerTouchMove=function(a){if(this.touchSelect(a))this.onContainerMouseMove(a);
-else this.touch(a)};a.prototype.onContainerTouchStart=function(a){if(this.touchSelect(a))this.onContainerMouseDown(a);else this.zoomOption(a),this.touch(a,!0)};a.prototype.onDocumentMouseMove=function(a){var c=this.chart,d=this.chartPosition;a=this.normalize(a,d);var b=c.tooltip;!d||b&&b.isStickyOnContact()||c.isInsidePlot(a.chartX-c.plotLeft,a.chartY-c.plotTop,{visiblePlotOnly:!0})||this.inClass(a.target,"highcharts-tracker")||this.reset()};a.prototype.onDocumentMouseUp=function(c){var e=J[D(a.hoverChartIndex,
--1)];e&&e.pointer.drop(c)};a.prototype.pinch=function(a){var c=this,d=c.chart,b=c.pinchDown,f=a.touches||[],g=f.length,k=c.lastValidTouch,l=c.hasZoom,m={},t=1===g&&(c.inClass(a.target,"highcharts-tracker")&&d.runTrackerClick||c.runChartClick),q={},n=c.selectionMarker;1<g?c.initiated=!0:1===g&&this.followTouchMove&&(c.initiated=!1);l&&c.initiated&&!t&&!1!==a.cancelable&&a.preventDefault();[].map.call(f,function(b){return c.normalize(b)});"touchstart"===a.type?([].forEach.call(f,function(a,d){b[d]=
-{chartX:a.chartX,chartY:a.chartY}}),k.x=[b[0].chartX,b[1]&&b[1].chartX],k.y=[b[0].chartY,b[1]&&b[1].chartY],d.axes.forEach(function(b){if(b.zoomEnabled){var a=d.bounds[b.horiz?"h":"v"],c=b.minPixelPadding,e=b.toPixels(Math.min(D(b.options.min,b.dataMin),b.dataMin)),h=b.toPixels(Math.max(D(b.options.max,b.dataMax),b.dataMax)),f=Math.max(e,h);a.min=Math.min(b.pos,Math.min(e,h)-c);a.max=Math.max(b.pos+b.len,f+c)}}),c.res=!0):c.followTouchMove&&1===g?this.runPointActions(c.normalize(a)):b.length&&(n||
-(c.selectionMarker=n=e({destroy:u,touch:!0},d.plotBox)),c.pinchTranslate(b,f,m,n,q,k),c.hasPinched=l,c.scaleGroups(m,q),c.res&&(c.res=!1,this.reset(!1,0)))};a.prototype.pinchTranslate=function(a,c,d,b,e,f){this.zoomHor&&this.pinchTranslateDirection(!0,a,c,d,b,e,f);this.zoomVert&&this.pinchTranslateDirection(!1,a,c,d,b,e,f)};a.prototype.pinchTranslateDirection=function(a,c,d,b,e,f,g,k){var h=this.chart,l=a?"x":"y",p=a?"X":"Y",m="chart"+p,y=a?"width":"height",t=h["plot"+(a?"Left":"Top")],q=h.inverted,
-n=h.bounds[a?"h":"v"],r=1===c.length,v=c[0][m],B=!r&&c[1][m];c=function(){"number"===typeof I&&20<Math.abs(v-B)&&(D=k||Math.abs(N-I)/Math.abs(v-B));A=(t-N)/D+v;G=h["plot"+(a?"Width":"Height")]/D};var G,A,D=k||1,N=d[0][m],I=!r&&d[1][m];c();d=A;if(d<n.min){d=n.min;var L=!0}else d+G>n.max&&(d=n.max-G,L=!0);L?(N-=.8*(N-g[l][0]),"number"===typeof I&&(I-=.8*(I-g[l][1])),c()):g[l]=[N,I];q||(f[l]=A-t,f[y]=G);f=q?1/D:D;e[y]=G;e[l]=d;b[q?a?"scaleY":"scaleX":"scale"+p]=D;b["translate"+p]=f*t+(N-f*v)};a.prototype.reset=
-function(a,c){var d=this.chart,b=d.hoverSeries,e=d.hoverPoint,h=d.hoverPoints,f=d.tooltip,g=f&&f.shared?h:e;a&&g&&B(g).forEach(function(b){b.series.isCartesian&&"undefined"===typeof b.plotX&&(a=!1)});if(a)f&&g&&B(g).length&&(f.refresh(g),f.shared&&h?h.forEach(function(b){b.setState(b.state,!0);b.series.isCartesian&&(b.series.xAxis.crosshair&&b.series.xAxis.drawCrosshair(null,b),b.series.yAxis.crosshair&&b.series.yAxis.drawCrosshair(null,b))}):e&&(e.setState(e.state,!0),d.axes.forEach(function(b){b.crosshair&&
-e.series[b.coll]===b&&b.drawCrosshair(null,e)})));else{if(e)e.onMouseOut();h&&h.forEach(function(b){b.setState()});if(b)b.onMouseOut();f&&f.hide(c);this.unDocMouseMove&&(this.unDocMouseMove=this.unDocMouseMove());d.axes.forEach(function(b){b.hideCrosshair()});this.hoverX=d.hoverPoints=d.hoverPoint=null}};a.prototype.runPointActions=function(c,e){var d=this.chart,b=d.tooltip&&d.tooltip.options.enabled?d.tooltip:void 0,h=b?b.shared:!1,f=e||d.hoverPoint,g=f&&f.series||d.hoverSeries;e=this.getHoverData(f,
-g,d.series,(!c||"touchmove"!==c.type)&&(!!e||g&&g.directTouch&&this.isDirectTouch),h,c);f=e.hoverPoint;g=e.hoverSeries;var k=e.hoverPoints;e=g&&g.tooltipOptions.followPointer&&!g.tooltipOptions.split;h=h&&g&&!g.noSharedTooltip;if(f&&(f!==d.hoverPoint||b&&b.isHidden)){(d.hoverPoints||[]).forEach(function(b){-1===k.indexOf(b)&&b.setState()});if(d.hoverSeries!==g)g.onMouseOver();this.applyInactiveState(k);(k||[]).forEach(function(b){b.setState("hover")});d.hoverPoint&&d.hoverPoint.firePointEvent("mouseOut");
-if(!f.series)return;d.hoverPoints=k;d.hoverPoint=f;f.firePointEvent("mouseOver");b&&b.refresh(h?k:f,c)}else e&&b&&!b.isHidden&&(f=b.getAnchor([{}],c),d.isInsidePlot(f[0],f[1],{visiblePlotOnly:!0})&&b.updatePosition({plotX:f[0],plotY:f[1]}));this.unDocMouseMove||(this.unDocMouseMove=n(d.container.ownerDocument,"mousemove",function(b){var d=J[a.hoverChartIndex];if(d)d.pointer.onDocumentMouseMove(b)}),this.eventsToUnbind.push(this.unDocMouseMove));d.axes.forEach(function(b){var a=D((b.crosshair||{}).snap,
-!0),e;a&&((e=d.hoverPoint)&&e.series[b.coll]===b||(e=l(k,function(a){return a.series[b.coll]===b})));e||!a?b.drawCrosshair(c,e):b.hideCrosshair()})};a.prototype.scaleGroups=function(a,c){var d=this.chart;d.series.forEach(function(b){var e=a||b.getPlotBox();b.xAxis&&b.xAxis.zoomEnabled&&b.group&&(b.group.attr(e),b.markerGroup&&(b.markerGroup.attr(e),b.markerGroup.clip(c?d.clipRect:null)),b.dataLabelsGroup&&b.dataLabelsGroup.attr(e))});d.clipRect.attr(c||d.clipBox)};a.prototype.setDOMEvents=function(){var c=
-this,e=this.chart.container,d=e.ownerDocument;e.onmousedown=this.onContainerMouseDown.bind(this);e.onmousemove=this.onContainerMouseMove.bind(this);e.onclick=this.onContainerClick.bind(this);this.eventsToUnbind.push(n(e,"mouseenter",this.onContainerMouseEnter.bind(this)));this.eventsToUnbind.push(n(e,"mouseleave",this.onContainerMouseLeave.bind(this)));a.unbindDocumentMouseUp||(a.unbindDocumentMouseUp=n(d,"mouseup",this.onDocumentMouseUp.bind(this)));for(var b=this.chart.renderTo.parentElement;b&&
-"BODY"!==b.tagName;)this.eventsToUnbind.push(n(b,"scroll",function(){delete c.chartPosition})),b=b.parentElement;w.hasTouch&&(this.eventsToUnbind.push(n(e,"touchstart",this.onContainerTouchStart.bind(this),{passive:!1})),this.eventsToUnbind.push(n(e,"touchmove",this.onContainerTouchMove.bind(this),{passive:!1})),a.unbindDocumentTouchEnd||(a.unbindDocumentTouchEnd=n(d,"touchend",this.onDocumentTouchEnd.bind(this),{passive:!1})))};a.prototype.setHoverChartIndex=function(){var c=this.chart,e=w.charts[D(a.hoverChartIndex,
--1)];if(e&&e!==c)e.pointer.onContainerMouseLeave({relatedTarget:!0});e&&e.mouseIsDown||(a.hoverChartIndex=c.index)};a.prototype.touch=function(a,c){var d=this.chart,b;this.setHoverChartIndex();if(1===a.touches.length)if(a=this.normalize(a),(b=d.isInsidePlot(a.chartX-d.plotLeft,a.chartY-d.plotTop,{visiblePlotOnly:!0}))&&!d.openMenu){c&&this.runPointActions(a);if("touchmove"===a.type){c=this.pinchDown;var e=c[0]?4<=Math.sqrt(Math.pow(c[0].chartX-a.chartX,2)+Math.pow(c[0].chartY-a.chartY,2)):!1}D(e,
-!0)&&this.pinch(a)}else c&&this.reset();else 2===a.touches.length&&this.pinch(a)};a.prototype.touchSelect=function(a){return!(!this.chart.options.chart.zoomBySingleTouch||!a.touches||1!==a.touches.length)};a.prototype.zoomOption=function(a){var c=this.chart,d=c.options.chart;c=c.inverted;var b=d.zoomType||"";/touch/.test(a.type)&&(b=D(d.pinchType,b));this.zoomX=a=/x/.test(b);this.zoomY=d=/y/.test(b);this.zoomHor=a&&!c||d&&c;this.zoomVert=d&&!c||a&&c;this.hasZoom=a||d};return a}();"";return a});M(a,
-"Core/MSPointer.js",[a["Core/Globals.js"],a["Core/Pointer.js"],a["Core/Utilities.js"]],function(a,w,C){function r(){var a=[];a.item=function(a){return this[a]};e(f,function(c){a.push({pageX:c.pageX,pageY:c.pageY,target:c.target})});return a}function z(a,c,e,f){var g=J[w.hoverChartIndex||NaN];"touch"!==a.pointerType&&a.pointerType!==a.MSPOINTER_TYPE_TOUCH||!g||(g=g.pointer,f(a),g[c]({type:e,target:a.currentTarget,preventDefault:n,touches:r()}))}var x=this&&this.__extends||function(){var a=function(c,
-e){a=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(a,c){a.__proto__=c}||function(a,c){for(var e in c)c.hasOwnProperty(e)&&(a[e]=c[e])};return a(c,e)};return function(c,e){function f(){this.constructor=c}a(c,e);c.prototype=null===e?Object.create(e):(f.prototype=e.prototype,new f)}}(),J=a.charts,u=a.doc,n=a.noop,m=a.win,g=C.addEvent,c=C.css,e=C.objectEach,l=C.removeEvent,f={},v=!!m.PointerEvent;return function(e){function k(){return null!==e&&e.apply(this,arguments)||this}x(k,e);k.isRequired=
-function(){return!(a.hasTouch||!m.PointerEvent&&!m.MSPointerEvent)};k.prototype.batchMSEvents=function(a){a(this.chart.container,v?"pointerdown":"MSPointerDown",this.onContainerPointerDown);a(this.chart.container,v?"pointermove":"MSPointerMove",this.onContainerPointerMove);a(u,v?"pointerup":"MSPointerUp",this.onDocumentPointerUp)};k.prototype.destroy=function(){this.batchMSEvents(l);e.prototype.destroy.call(this)};k.prototype.init=function(a,f){e.prototype.init.call(this,a,f);this.hasZoom&&c(a.container,
-{"-ms-touch-action":"none","touch-action":"none"})};k.prototype.onContainerPointerDown=function(a){z(a,"onContainerTouchStart","touchstart",function(a){f[a.pointerId]={pageX:a.pageX,pageY:a.pageY,target:a.currentTarget}})};k.prototype.onContainerPointerMove=function(a){z(a,"onContainerTouchMove","touchmove",function(a){f[a.pointerId]={pageX:a.pageX,pageY:a.pageY};f[a.pointerId].target||(f[a.pointerId].target=a.currentTarget)})};k.prototype.onDocumentPointerUp=function(a){z(a,"onDocumentTouchEnd",
-"touchend",function(a){delete f[a.pointerId]})};k.prototype.setDOMEvents=function(){e.prototype.setDOMEvents.call(this);(this.hasZoom||this.followTouchMove)&&this.batchMSEvents(g)};return k}(w)});M(a,"Core/Legend/Legend.js",[a["Core/Animation/AnimationUtilities.js"],a["Core/FormatUtilities.js"],a["Core/Globals.js"],a["Core/Series/Point.js"],a["Core/Renderer/RendererUtilities.js"],a["Core/Utilities.js"]],function(a,w,C,E,z,x){var r=a.animObject,u=a.setAnimation,n=w.format;a=C.isFirefox;var m=C.marginNames;
-C=C.win;var g=z.distribute,c=x.addEvent,e=x.createElement,l=x.css,f=x.defined,v=x.discardElement,q=x.find,k=x.fireEvent,I=x.isNumber,D=x.merge,B=x.pick,O=x.relativeLength,t=x.stableSort,h=x.syncTimeout;z=x.wrap;x=function(){function a(a,d){this.allItems=[];this.contentGroup=this.box=void 0;this.display=!1;this.group=void 0;this.offsetWidth=this.maxLegendWidth=this.maxItemWidth=this.legendWidth=this.legendHeight=this.lastLineHeight=this.lastItemY=this.itemY=this.itemX=this.itemMarginTop=this.itemMarginBottom=
-this.itemHeight=this.initialItemY=0;this.options={};this.padding=0;this.pages=[];this.proximate=!1;this.scrollGroup=void 0;this.widthOption=this.totalItemWidth=this.titleHeight=this.symbolWidth=this.symbolHeight=0;this.chart=a;this.init(a,d)}a.prototype.init=function(a,d){this.chart=a;this.setOptions(d);d.enabled&&(this.render(),c(this.chart,"endResize",function(){this.legend.positionCheckboxes()}),this.proximate?this.unchartrender=c(this.chart,"render",function(){this.legend.proximatePositions();
-this.legend.positionItems()}):this.unchartrender&&this.unchartrender())};a.prototype.setOptions=function(a){var b=B(a.padding,8);this.options=a;this.chart.styledMode||(this.itemStyle=a.itemStyle,this.itemHiddenStyle=D(this.itemStyle,a.itemHiddenStyle));this.itemMarginTop=a.itemMarginTop||0;this.itemMarginBottom=a.itemMarginBottom||0;this.padding=b;this.initialItemY=b-5;this.symbolWidth=B(a.symbolWidth,16);this.pages=[];this.proximate="proximate"===a.layout&&!this.chart.inverted;this.baseline=void 0};
-a.prototype.update=function(a,d){var b=this.chart;this.setOptions(D(!0,this.options,a));this.destroy();b.isDirtyLegend=b.isDirtyBox=!0;B(d,!0)&&b.redraw();k(this,"afterUpdate")};a.prototype.colorizeItem=function(a,d){a.legendGroup[d?"removeClass":"addClass"]("highcharts-legend-item-hidden");if(!this.chart.styledMode){var b=this.options,c=a.legendItem,e=a.legendLine,h=a.legendSymbol,f=this.itemHiddenStyle.color;b=d?b.itemStyle.color:f;var g=d?a.color||f:f,l=a.options&&a.options.marker,p={fill:g};c&&
-c.css({fill:b,color:b});e&&e.attr({stroke:g});h&&(l&&h.isMarker&&(p=a.pointAttribs(),d||(p.stroke=p.fill=f)),h.attr(p))}k(this,"afterColorizeItem",{item:a,visible:d})};a.prototype.positionItems=function(){this.allItems.forEach(this.positionItem,this);this.chart.isResizing||this.positionCheckboxes()};a.prototype.positionItem=function(a){var b=this,d=this.options,c=d.symbolPadding,e=!d.rtl,h=a._legendItemPos;d=h[0];h=h[1];var g=a.checkbox,l=a.legendGroup;l&&l.element&&(c={translateX:e?d:this.legendWidth-
-d-2*c-4,translateY:h},e=function(){k(b,"afterPositionItem",{item:a})},f(l.translateY)?l.animate(c,void 0,e):(l.attr(c),e()));g&&(g.x=d,g.y=h)};a.prototype.destroyItem=function(a){var b=a.checkbox;["legendItem","legendLine","legendSymbol","legendGroup"].forEach(function(b){a[b]&&(a[b]=a[b].destroy())});b&&v(a.checkbox)};a.prototype.destroy=function(){function a(a){this[a]&&(this[a]=this[a].destroy())}this.getAllItems().forEach(function(b){["legendItem","legendGroup"].forEach(a,b)});"clipRect up down pager nav box title group".split(" ").forEach(a,
-this);this.display=null};a.prototype.positionCheckboxes=function(){var a=this.group&&this.group.alignAttr,d=this.clipHeight||this.legendHeight,c=this.titleHeight;if(a){var e=a.translateY;this.allItems.forEach(function(b){var h=b.checkbox;if(h){var f=e+c+h.y+(this.scrollOffset||0)+3;l(h,{left:a.translateX+b.checkboxOffset+h.x-20+"px",top:f+"px",display:this.proximate||f>e-6&&f<e+d-6?"":"none"})}},this)}};a.prototype.renderTitle=function(){var a=this.options,d=this.padding,c=a.title,e=0;c.text&&(this.title||
-(this.title=this.chart.renderer.label(c.text,d-3,d-4,null,null,null,a.useHTML,null,"legend-title").attr({zIndex:1}),this.chart.styledMode||this.title.css(c.style),this.title.add(this.group)),c.width||this.title.css({width:this.maxLegendWidth+"px"}),a=this.title.getBBox(),e=a.height,this.offsetWidth=a.width,this.contentGroup.attr({translateY:e}));this.titleHeight=e};a.prototype.setText=function(a){var b=this.options;a.legendItem.attr({text:b.labelFormat?n(b.labelFormat,a,this.chart):b.labelFormatter.call(a)})};
-a.prototype.renderItem=function(a){var b=this.chart,d=b.renderer,c=this.options,e=this.symbolWidth,h=c.symbolPadding||0,f=this.itemStyle,g=this.itemHiddenStyle,k="horizontal"===c.layout?B(c.itemDistance,20):0,l=!c.rtl,m=!a.series,n=!m&&a.series.drawLegendSymbol?a.series:a,q=n.options,t=this.createCheckboxForItem&&q&&q.showCheckbox,v=c.useHTML,r=a.options.className,I=a.legendItem;q=e+h+k+(t?20:0);I||(a.legendGroup=d.g("legend-item").addClass("highcharts-"+n.type+"-series highcharts-color-"+a.colorIndex+
-(r?" "+r:"")+(m?" highcharts-series-"+a.index:"")).attr({zIndex:1}).add(this.scrollGroup),a.legendItem=I=d.text("",l?e+h:-h,this.baseline||0,v),b.styledMode||I.css(D(a.visible?f:g)),I.attr({align:l?"left":"right",zIndex:2}).add(a.legendGroup),this.baseline||(this.fontMetrics=d.fontMetrics(b.styledMode?12:f.fontSize,I),this.baseline=this.fontMetrics.f+3+this.itemMarginTop,I.attr("y",this.baseline),this.symbolHeight=c.symbolHeight||this.fontMetrics.f,c.squareSymbol&&(this.symbolWidth=B(c.symbolWidth,
-Math.max(this.symbolHeight,16)),q=this.symbolWidth+h+k+(t?20:0),l&&I.attr("x",this.symbolWidth+h))),n.drawLegendSymbol(this,a),this.setItemEvents&&this.setItemEvents(a,I,v));t&&!a.checkbox&&this.createCheckboxForItem&&this.createCheckboxForItem(a);this.colorizeItem(a,a.visible);!b.styledMode&&f.width||I.css({width:(c.itemWidth||this.widthOption||b.spacingBox.width)-q+"px"});this.setText(a);b=I.getBBox();a.itemWidth=a.checkboxOffset=c.itemWidth||a.legendItemWidth||b.width+q;this.maxItemWidth=Math.max(this.maxItemWidth,
-a.itemWidth);this.totalItemWidth+=a.itemWidth;this.itemHeight=a.itemHeight=Math.round(a.legendItemHeight||b.height||this.symbolHeight)};a.prototype.layoutItem=function(a){var b=this.options,d=this.padding,c="horizontal"===b.layout,e=a.itemHeight,h=this.itemMarginBottom,f=this.itemMarginTop,g=c?B(b.itemDistance,20):0,k=this.maxLegendWidth;b=b.alignColumns&&this.totalItemWidth>k?this.maxItemWidth:a.itemWidth;c&&this.itemX-d+b>k&&(this.itemX=d,this.lastLineHeight&&(this.itemY+=f+this.lastLineHeight+
-h),this.lastLineHeight=0);this.lastItemY=f+this.itemY+h;this.lastLineHeight=Math.max(e,this.lastLineHeight);a._legendItemPos=[this.itemX,this.itemY];c?this.itemX+=b:(this.itemY+=f+e+h,this.lastLineHeight=e);this.offsetWidth=this.widthOption||Math.max((c?this.itemX-d-(a.checkbox?0:g):b)+d,this.offsetWidth)};a.prototype.getAllItems=function(){var a=[];this.chart.series.forEach(function(b){var d=b&&b.options;b&&B(d.showInLegend,f(d.linkedTo)?!1:void 0,!0)&&(a=a.concat(b.legendItems||("point"===d.legendType?
-b.data:b)))});k(this,"afterGetAllItems",{allItems:a});return a};a.prototype.getAlignment=function(){var a=this.options;return this.proximate?a.align.charAt(0)+"tv":a.floating?"":a.align.charAt(0)+a.verticalAlign.charAt(0)+a.layout.charAt(0)};a.prototype.adjustMargins=function(a,d){var b=this.chart,c=this.options,e=this.getAlignment();e&&[/(lth|ct|rth)/,/(rtv|rm|rbv)/,/(rbh|cb|lbh)/,/(lbv|lm|ltv)/].forEach(function(h,g){h.test(e)&&!f(a[g])&&(b[m[g]]=Math.max(b[m[g]],b.legend[(g+1)%2?"legendHeight":
-"legendWidth"]+[1,-1,-1,1][g]*c[g%2?"x":"y"]+B(c.margin,12)+d[g]+(b.titleOffset[g]||0)))})};a.prototype.proximatePositions=function(){var a=this.chart,d=[],c="left"===this.options.align;this.allItems.forEach(function(b){var e;var h=c;if(b.yAxis){b.xAxis.options.reversed&&(h=!h);b.points&&(e=q(h?b.points:b.points.slice(0).reverse(),function(a){return I(a.plotY)}));h=this.itemMarginTop+b.legendItem.getBBox().height+this.itemMarginBottom;var f=b.yAxis.top-a.plotTop;b.visible?(e=e?e.plotY:b.yAxis.height,
-e+=f-.3*h):e=f+b.yAxis.height;d.push({target:e,size:h,item:b})}},this);g(d,a.plotHeight).forEach(function(b){b.item._legendItemPos&&(b.item._legendItemPos[1]=a.plotTop-a.spacing[0]+b.pos)})};a.prototype.render=function(){var a=this.chart,d=a.renderer,c=this.options,e=this.padding,h=this.getAllItems(),f=this.group,g=this.box;this.itemX=e;this.itemY=this.initialItemY;this.lastItemY=this.offsetWidth=0;this.widthOption=O(c.width,a.spacingBox.width-e);var l=a.spacingBox.width-2*e-c.x;-1<["rm","lm"].indexOf(this.getAlignment().substring(0,
-2))&&(l/=2);this.maxLegendWidth=this.widthOption||l;f||(this.group=f=d.g("legend").addClass(c.className||"").attr({zIndex:7}).add(),this.contentGroup=d.g().attr({zIndex:1}).add(f),this.scrollGroup=d.g().add(this.contentGroup));this.renderTitle();t(h,function(a,b){return(a.options&&a.options.legendIndex||0)-(b.options&&b.options.legendIndex||0)});c.reversed&&h.reverse();this.allItems=h;this.display=l=!!h.length;this.itemHeight=this.totalItemWidth=this.maxItemWidth=this.lastLineHeight=0;h.forEach(this.renderItem,
-this);h.forEach(this.layoutItem,this);h=(this.widthOption||this.offsetWidth)+e;var m=this.lastItemY+this.lastLineHeight+this.titleHeight;m=this.handleOverflow(m);m+=e;g||(this.box=g=d.rect().addClass("highcharts-legend-box").attr({r:c.borderRadius}).add(f),g.isNew=!0);a.styledMode||g.attr({stroke:c.borderColor,"stroke-width":c.borderWidth||0,fill:c.backgroundColor||"none"}).shadow(c.shadow);0<h&&0<m&&(g[g.isNew?"attr":"animate"](g.crisp.call({},{x:0,y:0,width:h,height:m},g.strokeWidth())),g.isNew=
-!1);g[l?"show":"hide"]();a.styledMode&&"none"===f.getStyle("display")&&(h=m=0);this.legendWidth=h;this.legendHeight=m;l&&this.align();this.proximate||this.positionItems();k(this,"afterRender")};a.prototype.align=function(a){void 0===a&&(a=this.chart.spacingBox);var b=this.chart,d=this.options,c=a.y;/(lth|ct|rth)/.test(this.getAlignment())&&0<b.titleOffset[0]?c+=b.titleOffset[0]:/(lbh|cb|rbh)/.test(this.getAlignment())&&0<b.titleOffset[2]&&(c-=b.titleOffset[2]);c!==a.y&&(a=D(a,{y:c}));this.group.align(D(d,
-{width:this.legendWidth,height:this.legendHeight,verticalAlign:this.proximate?"top":d.verticalAlign}),!0,a)};a.prototype.handleOverflow=function(a){var b=this,d=this.chart,c=d.renderer,e=this.options,h=e.y,f="top"===e.verticalAlign,g=this.padding,k=e.maxHeight,l=e.navigation,m=B(l.animation,!0),n=l.arrowSize||12,q=this.pages,t=this.allItems,v=function(a){"number"===typeof a?N.attr({height:a}):N&&(b.clipRect=N.destroy(),b.contentGroup.clip());b.contentGroup.div&&(b.contentGroup.div.style.clip=a?"rect("+
-g+"px,9999px,"+(g+a)+"px,0)":"auto")},r=function(a){b[a]=c.circle(0,0,1.3*n).translate(n/2,n/2).add(U);d.styledMode||b[a].attr("fill","rgba(0,0,0,0.0001)");return b[a]},I,A;h=d.spacingBox.height+(f?-h:h)-g;var U=this.nav,N=this.clipRect;"horizontal"!==e.layout||"middle"===e.verticalAlign||e.floating||(h/=2);k&&(h=Math.min(h,k));q.length=0;a&&0<h&&a>h&&!1!==l.enabled?(this.clipHeight=I=Math.max(h-20-this.titleHeight-g,0),this.currentPage=B(this.currentPage,1),this.fullHeight=a,t.forEach(function(a,
-b){var d=a._legendItemPos[1],c=Math.round(a.legendItem.getBBox().height),e=q.length;if(!e||d-q[e-1]>I&&(A||d)!==q[e-1])q.push(A||d),e++;a.pageIx=e-1;A&&(t[b-1].pageIx=e-1);b===t.length-1&&d+c-q[e-1]>I&&d!==A&&(q.push(d),a.pageIx=e);d!==A&&(A=d)}),N||(N=b.clipRect=c.clipRect(0,g,9999,0),b.contentGroup.clip(N)),v(I),U||(this.nav=U=c.g().attr({zIndex:1}).add(this.group),this.up=c.symbol("triangle",0,0,n,n).add(U),r("upTracker").on("click",function(){b.scroll(-1,m)}),this.pager=c.text("",15,10).addClass("highcharts-legend-navigation"),
-d.styledMode||this.pager.css(l.style),this.pager.add(U),this.down=c.symbol("triangle-down",0,0,n,n).add(U),r("downTracker").on("click",function(){b.scroll(1,m)})),b.scroll(0),a=h):U&&(v(),this.nav=U.destroy(),this.scrollGroup.attr({translateY:1}),this.clipHeight=0);return a};a.prototype.scroll=function(a,d){var b=this,c=this.chart,e=this.pages,f=e.length,g=this.clipHeight,l=this.options.navigation,m=this.pager,p=this.padding,n=this.currentPage+a;n>f&&(n=f);0<n&&("undefined"!==typeof d&&u(d,c),this.nav.attr({translateX:p,
-translateY:g+this.padding+7+this.titleHeight,visibility:"visible"}),[this.up,this.upTracker].forEach(function(a){a.attr({"class":1===n?"highcharts-legend-nav-inactive":"highcharts-legend-nav-active"})}),m.attr({text:n+"/"+f}),[this.down,this.downTracker].forEach(function(a){a.attr({x:18+this.pager.getBBox().width,"class":n===f?"highcharts-legend-nav-inactive":"highcharts-legend-nav-active"})},this),c.styledMode||(this.up.attr({fill:1===n?l.inactiveColor:l.activeColor}),this.upTracker.css({cursor:1===
-n?"default":"pointer"}),this.down.attr({fill:n===f?l.inactiveColor:l.activeColor}),this.downTracker.css({cursor:n===f?"default":"pointer"})),this.scrollOffset=-e[n-1]+this.initialItemY,this.scrollGroup.animate({translateY:this.scrollOffset}),this.currentPage=n,this.positionCheckboxes(),a=r(B(d,c.renderer.globalAnimation,!0)),h(function(){k(b,"afterScroll",{currentPage:n})},a.duration))};a.prototype.setItemEvents=function(a,d,c){var b=this,e=b.chart.renderer.boxWrapper,h=a instanceof E,f="highcharts-legend-"+
-(h?"point":"series")+"-active",g=b.chart.styledMode,l=function(d){b.allItems.forEach(function(b){a!==b&&[b].concat(b.linkedSeries||[]).forEach(function(a){a.setState(d,!h)})})};(c?[d,a.legendSymbol]:[a.legendGroup]).forEach(function(c){if(c)c.on("mouseover",function(){a.visible&&l("inactive");a.setState("hover");a.visible&&e.addClass(f);g||d.css(b.options.itemHoverStyle)}).on("mouseout",function(){b.chart.styledMode||d.css(D(a.visible?b.itemStyle:b.itemHiddenStyle));l("");e.removeClass(f);a.setState()}).on("click",
-function(b){var d=function(){a.setVisible&&a.setVisible();l(a.visible?"inactive":"")};e.removeClass(f);b={browserEvent:b};a.firePointEvent?a.firePointEvent("legendItemClick",b,d):k(a,"legendItemClick",b,d)})})};a.prototype.createCheckboxForItem=function(a){a.checkbox=e("input",{type:"checkbox",className:"highcharts-legend-checkbox",checked:a.selected,defaultChecked:a.selected},this.options.itemCheckboxStyle,this.chart.container);c(a.checkbox,"click",function(b){k(a.series||a,"checkboxClick",{checked:b.target.checked,
-item:a},function(){a.select()})})};return a}();(/Trident\/7\.0/.test(C.navigator&&C.navigator.userAgent)||a)&&z(x.prototype,"positionItem",function(a,b){var d=this,c=function(){b._legendItemPos&&a.call(d,b)};c();d.bubbleLegend||setTimeout(c)});"";return x});M(a,"Core/Series/SeriesRegistry.js",[a["Core/Globals.js"],a["Core/DefaultOptions.js"],a["Core/Series/Point.js"],a["Core/Utilities.js"]],function(a,w,C,E){var r=w.defaultOptions,x=E.error,J=E.extendClass,u=E.merge,n;(function(m){function g(a,e){var c=
-r.plotOptions||{},f=e.defaultOptions;e.prototype.pointClass||(e.prototype.pointClass=C);e.prototype.type=a;f&&(c[a]=f);m.seriesTypes[a]=e}m.seriesTypes=a.seriesTypes;m.getSeries=function(a,e){void 0===e&&(e={});var c=a.options.chart;c=e.type||c.type||c.defaultSeriesType||"";var f=m.seriesTypes[c];m||x(17,!0,a,{missingModuleFor:c});c=new f;"function"===typeof c.init&&c.init(a,e);return c};m.registerSeriesType=g;m.seriesType=function(a,e,l,f,n){var c=r.plotOptions||{};e=e||"";c[a]=u(c[e],l);g(a,J(m.seriesTypes[e]||
-function(){},f));m.seriesTypes[a].prototype.type=a;n&&(m.seriesTypes[a].prototype.pointClass=J(C,n));return m.seriesTypes[a]}})(n||(n={}));return n});M(a,"Core/Chart/Chart.js",[a["Core/Animation/AnimationUtilities.js"],a["Core/Axis/Axis.js"],a["Core/FormatUtilities.js"],a["Core/Foundation.js"],a["Core/Globals.js"],a["Core/Legend/Legend.js"],a["Core/MSPointer.js"],a["Core/DefaultOptions.js"],a["Core/Color/Palette.js"],a["Core/Pointer.js"],a["Core/Renderer/RendererRegistry.js"],a["Core/Series/SeriesRegistry.js"],
-a["Core/Renderer/SVG/SVGRenderer.js"],a["Core/Time.js"],a["Core/Utilities.js"],a["Core/Renderer/HTML/AST.js"]],function(a,w,C,E,z,x,J,u,n,m,g,c,e,l,f,v){var q=a.animate,k=a.animObject,r=a.setAnimation,D=C.numberFormat,B=E.registerEventOptions,O=z.charts,t=z.doc,h=z.marginNames,d=z.svg,b=z.win,p=u.defaultOptions,G=u.defaultTime,y=c.seriesTypes,L=f.addEvent,F=f.attr,P=f.cleanRecursively,S=f.createElement,Q=f.css,V=f.defined,fa=f.discardElement,H=f.erase,K=f.error,M=f.extend,ha=f.find,R=f.fireEvent,
-Z=f.getStyle,A=f.isArray,U=f.isNumber,N=f.isObject,W=f.isString,X=f.merge,Y=f.objectEach,T=f.pick,da=f.pInt,ka=f.relativeLength,ja=f.removeEvent,ba=f.splat,ea=f.syncTimeout,ma=f.uniqueKey;a=function(){function a(a,b,d){this.series=this.renderTo=this.renderer=this.pointer=this.pointCount=this.plotWidth=this.plotTop=this.plotLeft=this.plotHeight=this.plotBox=this.options=this.numberFormatter=this.margin=this.legend=this.labelCollectors=this.isResizing=this.index=this.eventOptions=this.container=this.colorCounter=
-this.clipBox=this.chartWidth=this.chartHeight=this.bounds=this.axisOffset=this.axes=void 0;this.sharedClips={};this.yAxis=this.xAxis=this.userOptions=this.titleOffset=this.time=this.symbolCounter=this.spacingBox=this.spacing=void 0;this.getArgs(a,b,d)}a.chart=function(b,d,c){return new a(b,d,c)};a.prototype.getArgs=function(a,b,d){W(a)||a.nodeName?(this.renderTo=a,this.init(b,d)):this.init(a,b)};a.prototype.init=function(a,b){var d=a.plotOptions||{};R(this,"init",{args:arguments},function(){var c=
-X(p,a),e=c.chart;Y(c.plotOptions,function(a,b){N(a)&&(a.tooltip=d[b]&&X(d[b].tooltip)||void 0)});c.tooltip.userOptions=a.chart&&a.chart.forExport&&a.tooltip.userOptions||a.tooltip;this.userOptions=a;this.margin=[];this.spacing=[];this.bounds={h:{},v:{}};this.labelCollectors=[];this.callback=b;this.isResizing=0;this.options=c;this.axes=[];this.series=[];this.time=a.time&&Object.keys(a.time).length?new l(a.time):z.time;this.numberFormatter=e.numberFormatter||D;this.styledMode=e.styledMode;this.hasCartesianSeries=
-e.showAxes;this.index=O.length;O.push(this);z.chartCount++;B(this,e);this.xAxis=[];this.yAxis=[];this.pointCount=this.colorCounter=this.symbolCounter=0;R(this,"afterInit");this.firstRender()})};a.prototype.initSeries=function(a){var b=this.options.chart;b=a.type||b.type||b.defaultSeriesType;var d=y[b];d||K(17,!0,this,{missingModuleFor:b});b=new d;"function"===typeof b.init&&b.init(this,a);return b};a.prototype.setSeriesData=function(){this.getSeriesOrderByLinks().forEach(function(a){a.points||a.data||
-!a.enabledDataSorting||a.setData(a.options.data,!1)})};a.prototype.getSeriesOrderByLinks=function(){return this.series.concat().sort(function(a,b){return a.linkedSeries.length||b.linkedSeries.length?b.linkedSeries.length-a.linkedSeries.length:0})};a.prototype.orderSeries=function(a){var b=this.series;a=a||0;for(var d=b.length;a<d;++a)b[a]&&(b[a].index=a,b[a].name=b[a].getName())};a.prototype.isInsidePlot=function(a,b,d){void 0===d&&(d={});var c=this.inverted,e=this.plotBox,h=this.plotLeft,f=this.plotTop,
-g=this.scrollablePlotBox,k=0;var l=0;d.visiblePlotOnly&&this.scrollingContainer&&(l=this.scrollingContainer,k=l.scrollLeft,l=l.scrollTop);var m=d.series;e=d.visiblePlotOnly&&g||e;g=d.inverted?b:a;b=d.inverted?a:b;a={x:g,y:b,isInsidePlot:!0};if(!d.ignoreX){var A=m&&(c?m.yAxis:m.xAxis)||{pos:h,len:Infinity};g=d.paneCoordinates?A.pos+g:h+g;g>=Math.max(k+h,A.pos)&&g<=Math.min(k+h+e.width,A.pos+A.len)||(a.isInsidePlot=!1)}!d.ignoreY&&a.isInsidePlot&&(c=m&&(c?m.xAxis:m.yAxis)||{pos:f,len:Infinity},d=d.paneCoordinates?
-c.pos+b:f+b,d>=Math.max(l+f,c.pos)&&d<=Math.min(l+f+e.height,c.pos+c.len)||(a.isInsidePlot=!1));R(this,"afterIsInsidePlot",a);return a.isInsidePlot};a.prototype.redraw=function(a){R(this,"beforeRedraw");var b=this.hasCartesianSeries?this.axes:this.colorAxis||[],d=this.series,c=this.pointer,e=this.legend,h=this.userOptions.legend,f=this.renderer,g=f.isHidden(),k=[],l=this.isDirtyBox,m=this.isDirtyLegend;this.setResponsive&&this.setResponsive(!1);r(this.hasRendered?a:!1,this);g&&this.temporaryDisplay();
-this.layOutTitles();for(a=d.length;a--;){var A=d[a];if(A.options.stacking||A.options.centerInCategory){var p=!0;if(A.isDirty){var n=!0;break}}}if(n)for(a=d.length;a--;)A=d[a],A.options.stacking&&(A.isDirty=!0);d.forEach(function(a){a.isDirty&&("point"===a.options.legendType?("function"===typeof a.updateTotals&&a.updateTotals(),m=!0):h&&(h.labelFormatter||h.labelFormat)&&(m=!0));a.isDirtyData&&R(a,"updatedData")});m&&e&&e.options.enabled&&(e.render(),this.isDirtyLegend=!1);p&&this.getStacks();b.forEach(function(a){a.updateNames();
-a.setScale()});this.getMargins();b.forEach(function(a){a.isDirty&&(l=!0)});b.forEach(function(a){var b=a.min+","+a.max;a.extKey!==b&&(a.extKey=b,k.push(function(){R(a,"afterSetExtremes",M(a.eventArgs,a.getExtremes()));delete a.eventArgs}));(l||p)&&a.redraw()});l&&this.drawChartBox();R(this,"predraw");d.forEach(function(a){(l||a.isDirty)&&a.visible&&a.redraw();a.isDirtyData=!1});c&&c.reset(!0);f.draw();R(this,"redraw");R(this,"render");g&&this.temporaryDisplay(!0);k.forEach(function(a){a.call()})};
-a.prototype.get=function(a){function b(b){return b.id===a||b.options&&b.options.id===a}for(var d=this.series,c=ha(this.axes,b)||ha(this.series,b),e=0;!c&&e<d.length;e++)c=ha(d[e].points||[],b);return c};a.prototype.getAxes=function(){var a=this,b=this.options,d=b.xAxis=ba(b.xAxis||{});b=b.yAxis=ba(b.yAxis||{});R(this,"getAxes");d.forEach(function(a,b){a.index=b;a.isX=!0});b.forEach(function(a,b){a.index=b});d.concat(b).forEach(function(b){new w(a,b)});R(this,"afterGetAxes")};a.prototype.getSelectedPoints=
-function(){return this.series.reduce(function(a,b){b.getPointsCollection().forEach(function(b){T(b.selectedStaging,b.selected)&&a.push(b)});return a},[])};a.prototype.getSelectedSeries=function(){return this.series.filter(function(a){return a.selected})};a.prototype.setTitle=function(a,b,d){this.applyDescription("title",a);this.applyDescription("subtitle",b);this.applyDescription("caption",void 0);this.layOutTitles(d)};a.prototype.applyDescription=function(a,b){var d=this,c="title"===a?{color:n.neutralColor80,
-fontSize:this.options.isStock?"16px":"18px"}:{color:n.neutralColor60};c=this.options[a]=X(!this.styledMode&&{style:c},this.options[a],b);var e=this[a];e&&b&&(this[a]=e=e.destroy());c&&!e&&(e=this.renderer.text(c.text,0,0,c.useHTML).attr({align:c.align,"class":"highcharts-"+a,zIndex:c.zIndex||4}).add(),e.update=function(b){d[{title:"setTitle",subtitle:"setSubtitle",caption:"setCaption"}[a]](b)},this.styledMode||e.css(c.style),this[a]=e)};a.prototype.layOutTitles=function(a){var b=[0,0,0],d=this.renderer,
-c=this.spacingBox;["title","subtitle","caption"].forEach(function(a){var e=this[a],h=this.options[a],f=h.verticalAlign||"top";a="title"===a?"top"===f?-3:0:"top"===f?b[0]+2:0;var g;if(e){this.styledMode||(g=h.style&&h.style.fontSize);g=d.fontMetrics(g,e).b;e.css({width:(h.width||c.width+(h.widthAdjust||0))+"px"});var k=Math.round(e.getBBox(h.useHTML).height);e.align(M({y:"bottom"===f?g:a+g,height:k},h),!1,"spacingBox");h.floating||("top"===f?b[0]=Math.ceil(b[0]+k):"bottom"===f&&(b[2]=Math.ceil(b[2]+
-k)))}},this);b[0]&&"top"===(this.options.title.verticalAlign||"top")&&(b[0]+=this.options.title.margin);b[2]&&"bottom"===this.options.caption.verticalAlign&&(b[2]+=this.options.caption.margin);var e=!this.titleOffset||this.titleOffset.join(",")!==b.join(",");this.titleOffset=b;R(this,"afterLayOutTitles");!this.isDirtyBox&&e&&(this.isDirtyBox=this.isDirtyLegend=e,this.hasRendered&&T(a,!0)&&this.isDirtyBox&&this.redraw())};a.prototype.getChartSize=function(){var a=this.options.chart,b=a.width;a=a.height;
-var d=this.renderTo;V(b)||(this.containerWidth=Z(d,"width"));V(a)||(this.containerHeight=Z(d,"height"));this.chartWidth=Math.max(0,b||this.containerWidth||600);this.chartHeight=Math.max(0,ka(a,this.chartWidth)||(1<this.containerHeight?this.containerHeight:400))};a.prototype.temporaryDisplay=function(a){var b=this.renderTo;if(a)for(;b&&b.style;)b.hcOrigStyle&&(Q(b,b.hcOrigStyle),delete b.hcOrigStyle),b.hcOrigDetached&&(t.body.removeChild(b),b.hcOrigDetached=!1),b=b.parentNode;else for(;b&&b.style;){t.body.contains(b)||
-b.parentNode||(b.hcOrigDetached=!0,t.body.appendChild(b));if("none"===Z(b,"display",!1)||b.hcOricDetached)b.hcOrigStyle={display:b.style.display,height:b.style.height,overflow:b.style.overflow},a={display:"block",overflow:"hidden"},b!==this.renderTo&&(a.height=0),Q(b,a),b.offsetWidth||b.style.setProperty("display","block","important");b=b.parentNode;if(b===t.body)break}};a.prototype.setClassName=function(a){this.container.className="highcharts-container "+(a||"")};a.prototype.getContainer=function(){var a=
-this.options,b=a.chart,c=ma(),h,f=this.renderTo;f||(this.renderTo=f=b.renderTo);W(f)&&(this.renderTo=f=t.getElementById(f));f||K(13,!0,this);var k=da(F(f,"data-highcharts-chart"));U(k)&&O[k]&&O[k].hasRendered&&O[k].destroy();F(f,"data-highcharts-chart",this.index);f.innerHTML="";b.skipClone||f.offsetWidth||this.temporaryDisplay();this.getChartSize();k=this.chartWidth;var l=this.chartHeight;Q(f,{overflow:"hidden"});this.styledMode||(h=M({position:"relative",overflow:"hidden",width:k+"px",height:l+
-"px",textAlign:"left",lineHeight:"normal",zIndex:0,"-webkit-tap-highlight-color":"rgba(0,0,0,0)",userSelect:"none","touch-action":"manipulation",outline:"none"},b.style||{}));this.container=c=S("div",{id:c},h,f);this._cursor=c.style.cursor;this.renderer=new (b.renderer||!d?g.getRendererType(b.renderer):e)(c,k,l,void 0,b.forExport,a.exporting&&a.exporting.allowHTML,this.styledMode);r(void 0,this);this.setClassName(b.className);if(this.styledMode)for(var m in a.defs)this.renderer.definition(a.defs[m]);
-else this.renderer.setStyle(b.style);this.renderer.chartIndex=this.index;R(this,"afterGetContainer")};a.prototype.getMargins=function(a){var b=this.spacing,d=this.margin,c=this.titleOffset;this.resetMargins();c[0]&&!V(d[0])&&(this.plotTop=Math.max(this.plotTop,c[0]+b[0]));c[2]&&!V(d[2])&&(this.marginBottom=Math.max(this.marginBottom,c[2]+b[2]));this.legend&&this.legend.display&&this.legend.adjustMargins(d,b);R(this,"getMargins");a||this.getAxisMargins()};a.prototype.getAxisMargins=function(){var a=
-this,b=a.axisOffset=[0,0,0,0],d=a.colorAxis,c=a.margin,e=function(a){a.forEach(function(a){a.visible&&a.getOffset()})};a.hasCartesianSeries?e(a.axes):d&&d.length&&e(d);h.forEach(function(d,e){V(c[e])||(a[d]+=b[e])});a.setChartSize()};a.prototype.reflow=function(a){var d=this,c=d.options.chart,e=d.renderTo,h=V(c.width)&&V(c.height),g=c.width||Z(e,"width");c=c.height||Z(e,"height");e=a?a.target:b;delete d.pointer.chartPosition;if(!h&&!d.isPrinting&&g&&c&&(e===b||e===t)){if(g!==d.containerWidth||c!==
-d.containerHeight)f.clearTimeout(d.reflowTimeout),d.reflowTimeout=ea(function(){d.container&&d.setSize(void 0,void 0,!1)},a?100:0);d.containerWidth=g;d.containerHeight=c}};a.prototype.setReflow=function(a){var d=this;!1===a||this.unbindReflow?!1===a&&this.unbindReflow&&(this.unbindReflow=this.unbindReflow()):(this.unbindReflow=L(b,"resize",function(a){d.options&&d.reflow(a)}),L(this,"destroy",this.unbindReflow))};a.prototype.setSize=function(a,b,d){var c=this,e=c.renderer;c.isResizing+=1;r(d,c);d=
-e.globalAnimation;c.oldChartHeight=c.chartHeight;c.oldChartWidth=c.chartWidth;"undefined"!==typeof a&&(c.options.chart.width=a);"undefined"!==typeof b&&(c.options.chart.height=b);c.getChartSize();c.styledMode||(d?q:Q)(c.container,{width:c.chartWidth+"px",height:c.chartHeight+"px"},d);c.setChartSize(!0);e.setSize(c.chartWidth,c.chartHeight,d);c.axes.forEach(function(a){a.isDirty=!0;a.setScale()});c.isDirtyLegend=!0;c.isDirtyBox=!0;c.layOutTitles();c.getMargins();c.redraw(d);c.oldChartHeight=null;R(c,
-"resize");ea(function(){c&&R(c,"endResize",null,function(){--c.isResizing})},k(d).duration)};a.prototype.setChartSize=function(a){var b=this.inverted,d=this.renderer,c=this.chartWidth,e=this.chartHeight,h=this.options.chart,f=this.spacing,g=this.clipOffset,k,l,m,A;this.plotLeft=k=Math.round(this.plotLeft);this.plotTop=l=Math.round(this.plotTop);this.plotWidth=m=Math.max(0,Math.round(c-k-this.marginRight));this.plotHeight=A=Math.max(0,Math.round(e-l-this.marginBottom));this.plotSizeX=b?A:m;this.plotSizeY=
-b?m:A;this.plotBorderWidth=h.plotBorderWidth||0;this.spacingBox=d.spacingBox={x:f[3],y:f[0],width:c-f[3]-f[1],height:e-f[0]-f[2]};this.plotBox=d.plotBox={x:k,y:l,width:m,height:A};b=2*Math.floor(this.plotBorderWidth/2);c=Math.ceil(Math.max(b,g[3])/2);e=Math.ceil(Math.max(b,g[0])/2);this.clipBox={x:c,y:e,width:Math.floor(this.plotSizeX-Math.max(b,g[1])/2-c),height:Math.max(0,Math.floor(this.plotSizeY-Math.max(b,g[2])/2-e))};a||(this.axes.forEach(function(a){a.setAxisSize();a.setAxisTranslation()}),
-d.alignElements());R(this,"afterSetChartSize",{skipAxes:a})};a.prototype.resetMargins=function(){R(this,"resetMargins");var a=this,b=a.options.chart;["margin","spacing"].forEach(function(d){var c=b[d],e=N(c)?c:[c,c,c,c];["Top","Right","Bottom","Left"].forEach(function(c,h){a[d][h]=T(b[d+c],e[h])})});h.forEach(function(b,d){a[b]=T(a.margin[d],a.spacing[d])});a.axisOffset=[0,0,0,0];a.clipOffset=[0,0,0,0]};a.prototype.drawChartBox=function(){var a=this.options.chart,b=this.renderer,d=this.chartWidth,
-c=this.chartHeight,e=this.styledMode,h=this.plotBGImage,f=a.backgroundColor,g=a.plotBackgroundColor,k=a.plotBackgroundImage,l=this.plotLeft,m=this.plotTop,A=this.plotWidth,p=this.plotHeight,n=this.plotBox,q=this.clipRect,N=this.clipBox,t=this.chartBackground,v=this.plotBackground,r=this.plotBorder,B,y="animate";t||(this.chartBackground=t=b.rect().addClass("highcharts-background").add(),y="attr");if(e)var I=B=t.strokeWidth();else{I=a.borderWidth||0;B=I+(a.shadow?8:0);f={fill:f||"none"};if(I||t["stroke-width"])f.stroke=
-a.borderColor,f["stroke-width"]=I;t.attr(f).shadow(a.shadow)}t[y]({x:B/2,y:B/2,width:d-B-I%2,height:c-B-I%2,r:a.borderRadius});y="animate";v||(y="attr",this.plotBackground=v=b.rect().addClass("highcharts-plot-background").add());v[y](n);e||(v.attr({fill:g||"none"}).shadow(a.plotShadow),k&&(h?(k!==h.attr("href")&&h.attr("href",k),h.animate(n)):this.plotBGImage=b.image(k,l,m,A,p).add()));q?q.animate({width:N.width,height:N.height}):this.clipRect=b.clipRect(N);y="animate";r||(y="attr",this.plotBorder=
-r=b.rect().addClass("highcharts-plot-border").attr({zIndex:1}).add());e||r.attr({stroke:a.plotBorderColor,"stroke-width":a.plotBorderWidth||0,fill:"none"});r[y](r.crisp({x:l,y:m,width:A,height:p},-r.strokeWidth()));this.isDirtyBox=!1;R(this,"afterDrawChartBox")};a.prototype.propFromSeries=function(){var a=this,b=a.options.chart,d=a.options.series,c,e,h;["inverted","angular","polar"].forEach(function(f){e=y[b.type||b.defaultSeriesType];h=b[f]||e&&e.prototype[f];for(c=d&&d.length;!h&&c--;)(e=y[d[c].type])&&
-e.prototype[f]&&(h=!0);a[f]=h})};a.prototype.linkSeries=function(){var a=this,b=a.series;b.forEach(function(a){a.linkedSeries.length=0});b.forEach(function(b){var d=b.options.linkedTo;W(d)&&(d=":previous"===d?a.series[b.index-1]:a.get(d))&&d.linkedParent!==b&&(d.linkedSeries.push(b),b.linkedParent=d,d.enabledDataSorting&&b.setDataSortingOptions(),b.visible=T(b.options.visible,d.options.visible,b.visible))});R(this,"afterLinkSeries")};a.prototype.renderSeries=function(){this.series.forEach(function(a){a.translate();
-a.render()})};a.prototype.renderLabels=function(){var a=this,b=a.options.labels;b.items&&b.items.forEach(function(d){var c=M(b.style,d.style),e=da(c.left)+a.plotLeft,h=da(c.top)+a.plotTop+12;delete c.left;delete c.top;a.renderer.text(d.html,e,h).attr({zIndex:2}).css(c).add()})};a.prototype.render=function(){var a=this.axes,b=this.colorAxis,d=this.renderer,c=this.options,e=function(a){a.forEach(function(a){a.visible&&a.render()})},h=0;this.setTitle();this.legend=new x(this,c.legend);this.getStacks&&
-this.getStacks();this.getMargins(!0);this.setChartSize();c=this.plotWidth;a.some(function(a){if(a.horiz&&a.visible&&a.options.labels.enabled&&a.series.length)return h=21,!0});var f=this.plotHeight=Math.max(this.plotHeight-h,0);a.forEach(function(a){a.setScale()});this.getAxisMargins();var g=1.1<c/this.plotWidth,k=1.05<f/this.plotHeight;if(g||k)a.forEach(function(a){(a.horiz&&g||!a.horiz&&k)&&a.setTickInterval(!0)}),this.getMargins();this.drawChartBox();this.hasCartesianSeries?e(a):b&&b.length&&e(b);
-this.seriesGroup||(this.seriesGroup=d.g("series-group").attr({zIndex:3}).add());this.renderSeries();this.renderLabels();this.addCredits();this.setResponsive&&this.setResponsive();this.hasRendered=!0};a.prototype.addCredits=function(a){var d=this,c=X(!0,this.options.credits,a);c.enabled&&!this.credits&&(this.credits=this.renderer.text(c.text+(this.mapCredits||""),0,0).addClass("highcharts-credits").on("click",function(){c.href&&(b.location.href=c.href)}).attr({align:c.position.align,zIndex:8}),d.styledMode||
-this.credits.css(c.style),this.credits.add().align(c.position),this.credits.update=function(a){d.credits=d.credits.destroy();d.addCredits(a)})};a.prototype.destroy=function(){var a=this,b=a.axes,d=a.series,c=a.container,e=c&&c.parentNode,h;R(a,"destroy");a.renderer.forExport?H(O,a):O[a.index]=void 0;z.chartCount--;a.renderTo.removeAttribute("data-highcharts-chart");ja(a);for(h=b.length;h--;)b[h]=b[h].destroy();this.scroller&&this.scroller.destroy&&this.scroller.destroy();for(h=d.length;h--;)d[h]=
-d[h].destroy();"title subtitle chartBackground plotBackground plotBGImage plotBorder seriesGroup clipRect credits pointer rangeSelector legend resetZoomButton tooltip renderer".split(" ").forEach(function(b){var d=a[b];d&&d.destroy&&(a[b]=d.destroy())});c&&(c.innerHTML="",ja(c),e&&fa(c));Y(a,function(b,d){delete a[d]})};a.prototype.firstRender=function(){var a=this,b=a.options;if(!a.isReadyToRender||a.isReadyToRender()){a.getContainer();a.resetMargins();a.setChartSize();a.propFromSeries();a.getAxes();
-(A(b.series)?b.series:[]).forEach(function(b){a.initSeries(b)});a.linkSeries();a.setSeriesData();R(a,"beforeRender");m&&(J.isRequired()?a.pointer=new J(a,b):a.pointer=new m(a,b));a.render();a.pointer.getChartPosition();if(!a.renderer.imgCount&&!a.hasLoaded)a.onload();a.temporaryDisplay(!0)}};a.prototype.onload=function(){this.callbacks.concat([this.callback]).forEach(function(a){a&&"undefined"!==typeof this.index&&a.apply(this,[this])},this);R(this,"load");R(this,"render");V(this.index)&&this.setReflow(this.options.chart.reflow);
-this.hasLoaded=!0};a.prototype.addSeries=function(a,b,d){var c=this,e;a&&(b=T(b,!0),R(c,"addSeries",{options:a},function(){e=c.initSeries(a);c.isDirtyLegend=!0;c.linkSeries();e.enabledDataSorting&&e.setData(a.data,!1);R(c,"afterAddSeries",{series:e});b&&c.redraw(d)}));return e};a.prototype.addAxis=function(a,b,d,c){return this.createAxis(b?"xAxis":"yAxis",{axis:a,redraw:d,animation:c})};a.prototype.addColorAxis=function(a,b,d){return this.createAxis("colorAxis",{axis:a,redraw:b,animation:d})};a.prototype.createAxis=
-function(a,b){a=new w(this,X(b.axis,{index:this[a].length,isX:"xAxis"===a}));T(b.redraw,!0)&&this.redraw(b.animation);return a};a.prototype.showLoading=function(a){var b=this,d=b.options,c=d.loading,e=function(){h&&Q(h,{left:b.plotLeft+"px",top:b.plotTop+"px",width:b.plotWidth+"px",height:b.plotHeight+"px"})},h=b.loadingDiv,f=b.loadingSpan;h||(b.loadingDiv=h=S("div",{className:"highcharts-loading highcharts-loading-hidden"},null,b.container));f||(b.loadingSpan=f=S("span",{className:"highcharts-loading-inner"},
-null,h),L(b,"redraw",e));h.className="highcharts-loading";v.setElementHTML(f,T(a,d.lang.loading,""));b.styledMode||(Q(h,M(c.style,{zIndex:10})),Q(f,c.labelStyle),b.loadingShown||(Q(h,{opacity:0,display:""}),q(h,{opacity:c.style.opacity||.5},{duration:c.showDuration||0})));b.loadingShown=!0;e()};a.prototype.hideLoading=function(){var a=this.options,b=this.loadingDiv;b&&(b.className="highcharts-loading highcharts-loading-hidden",this.styledMode||q(b,{opacity:0},{duration:a.loading.hideDuration||100,
-complete:function(){Q(b,{display:"none"})}}));this.loadingShown=!1};a.prototype.update=function(a,b,d,c){var e=this,h={credits:"addCredits",title:"setTitle",subtitle:"setSubtitle",caption:"setCaption"},f=a.isResponsiveOptions,g=[],k,m;R(e,"update",{options:a});f||e.setResponsive(!1,!0);a=P(a,e.options);e.userOptions=X(e.userOptions,a);var A=a.chart;if(A){X(!0,e.options.chart,A);"className"in A&&e.setClassName(A.className);"reflow"in A&&e.setReflow(A.reflow);if("inverted"in A||"polar"in A||"type"in
-A){e.propFromSeries();var p=!0}"alignTicks"in A&&(p=!0);"events"in A&&B(this,A);Y(A,function(a,b){-1!==e.propsRequireUpdateSeries.indexOf("chart."+b)&&(k=!0);-1!==e.propsRequireDirtyBox.indexOf(b)&&(e.isDirtyBox=!0);-1!==e.propsRequireReflow.indexOf(b)&&(f?e.isDirtyBox=!0:m=!0)});!e.styledMode&&A.style&&e.renderer.setStyle(e.options.chart.style||{})}!e.styledMode&&a.colors&&(this.options.colors=a.colors);a.time&&(this.time===G&&(this.time=new l(a.time)),X(!0,e.options.time,a.time));Y(a,function(b,
-d){if(e[d]&&"function"===typeof e[d].update)e[d].update(b,!1);else if("function"===typeof e[h[d]])e[h[d]](b);else"colors"!==d&&-1===e.collectionsWithUpdate.indexOf(d)&&X(!0,e.options[d],a[d]);"chart"!==d&&-1!==e.propsRequireUpdateSeries.indexOf(d)&&(k=!0)});this.collectionsWithUpdate.forEach(function(b){if(a[b]){var c=[];e[b].forEach(function(a,b){a.options.isInternal||c.push(T(a.options.index,b))});ba(a[b]).forEach(function(a,h){var f=V(a.id),g;f&&(g=e.get(a.id));!g&&e[b]&&(g=e[b][c?c[h]:h])&&f&&
-V(g.options.id)&&(g=void 0);g&&g.coll===b&&(g.update(a,!1),d&&(g.touched=!0));!g&&d&&e.collectionsWithInit[b]&&(e.collectionsWithInit[b][0].apply(e,[a].concat(e.collectionsWithInit[b][1]||[]).concat([!1])).touched=!0)});d&&e[b].forEach(function(a){a.touched||a.options.isInternal?delete a.touched:g.push(a)})}});g.forEach(function(a){a.chart&&a.remove&&a.remove(!1)});p&&e.axes.forEach(function(a){a.update({},!1)});k&&e.getSeriesOrderByLinks().forEach(function(a){a.chart&&a.update({},!1)},this);p=A&&
-A.width;A=A&&(W(A.height)?ka(A.height,p||e.chartWidth):A.height);m||U(p)&&p!==e.chartWidth||U(A)&&A!==e.chartHeight?e.setSize(p,A,c):T(b,!0)&&e.redraw(c);R(e,"afterUpdate",{options:a,redraw:b,animation:c})};a.prototype.setSubtitle=function(a,b){this.applyDescription("subtitle",a);this.layOutTitles(b)};a.prototype.setCaption=function(a,b){this.applyDescription("caption",a);this.layOutTitles(b)};a.prototype.showResetZoom=function(){function a(){b.zoomOut()}var b=this,d=p.lang,c=b.options.chart.resetZoomButton,
-e=c.theme,h=e.states,f="chart"===c.relativeTo||"spacingBox"===c.relativeTo?null:"scrollablePlotBox";R(this,"beforeShowResetZoom",null,function(){b.resetZoomButton=b.renderer.button(d.resetZoom,null,null,a,e,h&&h.hover).attr({align:c.position.align,title:d.resetZoomTitle}).addClass("highcharts-reset-zoom").add().align(c.position,!1,f)});R(this,"afterShowResetZoom")};a.prototype.zoomOut=function(){R(this,"selection",{resetSelection:!0},this.zoom)};a.prototype.zoom=function(a){var b=this,d=b.pointer,
-c=b.inverted?d.mouseDownX:d.mouseDownY,e=!1,h;!a||a.resetSelection?(b.axes.forEach(function(a){h=a.zoom()}),d.initiated=!1):a.xAxis.concat(a.yAxis).forEach(function(a){var f=a.axis,g=b.inverted?f.left:f.top,k=b.inverted?g+f.width:g+f.height,l=f.isXAxis,A=!1;if(!l&&c>=g&&c<=k||l||!V(c))A=!0;d[l?"zoomX":"zoomY"]&&A&&(h=f.zoom(a.min,a.max),f.displayBtn&&(e=!0))});var f=b.resetZoomButton;e&&!f?b.showResetZoom():!e&&N(f)&&(b.resetZoomButton=f.destroy());h&&b.redraw(T(b.options.chart.animation,a&&a.animation,
-100>b.pointCount))};a.prototype.pan=function(a,b){var d=this,c=d.hoverPoints;b="object"===typeof b?b:{enabled:b,type:"x"};var e=d.options.chart,h=d.options.mapNavigation&&d.options.mapNavigation.enabled;e&&e.panning&&(e.panning=b);var f=b.type,g;R(this,"pan",{originalEvent:a},function(){c&&c.forEach(function(a){a.setState()});var b=d.xAxis;"xy"===f?b=b.concat(d.yAxis):"y"===f&&(b=d.yAxis);var e={};b.forEach(function(b){if(b.options.panningEnabled&&!b.options.isInternal){var c=b.horiz,k=a[c?"chartX":
-"chartY"];c=c?"mouseDownX":"mouseDownY";var l=d[c],A=b.minPointOffset||0,m=b.reversed&&!d.inverted||!b.reversed&&d.inverted?-1:1,p=b.getExtremes(),n=b.toValue(l-k,!0)+A*m,q=b.toValue(l+b.len-k,!0)-(A*m||b.isXAxis&&b.pointRangePadding||0),t=q<n;m=b.hasVerticalPanning();l=t?q:n;n=t?n:q;var N=b.panningState;!m||b.isXAxis||N&&!N.isDirty||b.series.forEach(function(a){var b=a.getProcessedData(!0);b=a.getExtremes(b.yData,!0);N||(N={startMin:Number.MAX_VALUE,startMax:-Number.MAX_VALUE});U(b.dataMin)&&U(b.dataMax)&&
-(N.startMin=Math.min(T(a.options.threshold,Infinity),b.dataMin,N.startMin),N.startMax=Math.max(T(a.options.threshold,-Infinity),b.dataMax,N.startMax))});m=Math.min(T(N&&N.startMin,p.dataMin),A?p.min:b.toValue(b.toPixels(p.min)-b.minPixelPadding));q=Math.max(T(N&&N.startMax,p.dataMax),A?p.max:b.toValue(b.toPixels(p.max)+b.minPixelPadding));b.panningState=N;b.isOrdinal||(A=m-l,0<A&&(n+=A,l=m),A=n-q,0<A&&(n=q,l-=A),b.series.length&&l!==p.min&&n!==p.max&&l>=m&&n<=q&&(b.setExtremes(l,n,!1,!1,{trigger:"pan"}),
-d.resetZoomButton||h||l===m||n===q||!f.match("y")||(d.showResetZoom(),b.displayBtn=!1),g=!0),e[c]=k)}});Y(e,function(a,b){d[b]=a});g&&d.redraw(!1);Q(d.container,{cursor:"move"})})};return a}();M(a.prototype,{callbacks:[],collectionsWithInit:{xAxis:[a.prototype.addAxis,[!0]],yAxis:[a.prototype.addAxis,[!1]],series:[a.prototype.addSeries]},collectionsWithUpdate:["xAxis","yAxis","series"],propsRequireDirtyBox:"backgroundColor borderColor borderWidth borderRadius plotBackgroundColor plotBackgroundImage plotBorderColor plotBorderWidth plotShadow shadow".split(" "),
-propsRequireReflow:"margin marginTop marginRight marginBottom marginLeft spacing spacingTop spacingRight spacingBottom spacingLeft".split(" "),propsRequireUpdateSeries:"chart.inverted chart.polar chart.ignoreHiddenSeries chart.type colors plotOptions time tooltip".split(" ")});"";return a});M(a,"Core/Legend/LegendSymbol.js",[a["Core/Utilities.js"]],function(a){var r=a.merge,C=a.pick,E;(function(a){a.drawLineMarker=function(a){var x=this.options,u=a.symbolWidth,n=a.symbolHeight,m=n/2,g=this.chart.renderer,
-c=this.legendGroup;a=a.baseline-Math.round(.3*a.fontMetrics.b);var e={},l=x.marker;this.chart.styledMode||(e={"stroke-width":x.lineWidth||0},x.dashStyle&&(e.dashstyle=x.dashStyle));this.legendLine=g.path([["M",0,a],["L",u,a]]).addClass("highcharts-graph").attr(e).add(c);l&&!1!==l.enabled&&u&&(x=Math.min(C(l.radius,m),m),0===this.symbol.indexOf("url")&&(l=r(l,{width:n,height:n}),x=0),this.legendSymbol=u=g.symbol(this.symbol,u/2-x,a-x,2*x,2*x,l).addClass("highcharts-point").add(c),u.isMarker=!0)};a.drawRectangle=
-function(a,r){var u=a.symbolHeight,n=a.options.squareSymbol;r.legendSymbol=this.chart.renderer.rect(n?(a.symbolWidth-u)/2:0,a.baseline-u+1,n?u:a.symbolWidth,u,C(a.options.symbolRadius,u/2)).addClass("highcharts-point").attr({zIndex:3}).add(r.legendGroup)}})(E||(E={}));return E});M(a,"Core/Series/SeriesDefaults.js",[a["Core/Color/Palette.js"]],function(a){return{lineWidth:2,allowPointSelect:!1,crisp:!0,showCheckbox:!1,animation:{duration:1E3},events:{},marker:{enabledThreshold:2,lineColor:a.backgroundColor,
-lineWidth:0,radius:4,states:{normal:{animation:!0},hover:{animation:{duration:50},enabled:!0,radiusPlus:2,lineWidthPlus:1},select:{fillColor:a.neutralColor20,lineColor:a.neutralColor100,lineWidth:2}}},point:{events:{}},dataLabels:{animation:{},align:"center",defer:!0,formatter:function(){var a=this.series.chart.numberFormatter;return"number"!==typeof this.y?"":a(this.y,-1)},padding:5,style:{fontSize:"11px",fontWeight:"bold",color:"contrast",textOutline:"1px contrast"},verticalAlign:"bottom",x:0,y:0},
-cropThreshold:300,opacity:1,pointRange:0,softThreshold:!0,states:{normal:{animation:!0},hover:{animation:{duration:50},lineWidthPlus:1,marker:{},halo:{size:10,opacity:.25}},select:{animation:{duration:0}},inactive:{animation:{duration:50},opacity:.2}},stickyTracking:!0,turboThreshold:1E3,findNearestPointBy:"x"}});M(a,"Core/Series/Series.js",[a["Core/Animation/AnimationUtilities.js"],a["Core/DefaultOptions.js"],a["Core/Foundation.js"],a["Core/Globals.js"],a["Core/Legend/LegendSymbol.js"],a["Core/Color/Palette.js"],
-a["Core/Series/Point.js"],a["Core/Series/SeriesDefaults.js"],a["Core/Series/SeriesRegistry.js"],a["Core/Renderer/SVG/SVGElement.js"],a["Core/Utilities.js"]],function(a,w,C,E,z,x,J,u,n,m,g){var c=a.animObject,e=a.setAnimation,l=w.defaultOptions,f=C.registerEventOptions,v=E.hasTouch,q=E.svg,k=E.win,r=n.seriesTypes,D=g.addEvent,B=g.arrayMax,O=g.arrayMin,t=g.clamp,h=g.cleanRecursively,d=g.correctFloat,b=g.defined,p=g.erase,G=g.error,y=g.extend,L=g.find,F=g.fireEvent,P=g.getNestedProperty,S=g.isArray,
-Q=g.isNumber,V=g.isString,M=g.merge,H=g.objectEach,K=g.pick,la=g.removeEvent,ha=g.splat,R=g.syncTimeout;a=function(){function a(){this.zones=this.yAxis=this.xAxis=this.userOptions=this.tooltipOptions=this.processedYData=this.processedXData=this.points=this.options=this.linkedSeries=this.index=this.eventsToUnbind=this.eventOptions=this.data=this.chart=this._i=void 0}a.prototype.init=function(a,b){F(this,"init",{options:b});var d=this,c=a.series;this.eventsToUnbind=[];d.chart=a;d.options=d.setOptions(b);
-b=d.options;d.linkedSeries=[];d.bindAxes();y(d,{name:b.name,state:"",visible:!1!==b.visible,selected:!0===b.selected});f(this,b);var e=b.events;if(e&&e.click||b.point&&b.point.events&&b.point.events.click||b.allowPointSelect)a.runTrackerClick=!0;d.getColor();d.getSymbol();d.parallelArrays.forEach(function(a){d[a+"Data"]||(d[a+"Data"]=[])});d.isCartesian&&(a.hasCartesianSeries=!0);var h;c.length&&(h=c[c.length-1]);d._i=K(h&&h._i,-1)+1;d.opacity=d.options.opacity;a.orderSeries(this.insert(c));b.dataSorting&&
-b.dataSorting.enabled?d.setDataSortingOptions():d.points||d.data||d.setData(b.data,!1);F(this,"afterInit")};a.prototype.is=function(a){return r[a]&&this instanceof r[a]};a.prototype.insert=function(a){var b=this.options.index,d;if(Q(b)){for(d=a.length;d--;)if(b>=K(a[d].options.index,a[d]._i)){a.splice(d+1,0,this);break}-1===d&&a.unshift(this);d+=1}else a.push(this);return K(d,a.length-1)};a.prototype.bindAxes=function(){var a=this,b=a.options,d=a.chart,c;F(this,"bindAxes",null,function(){(a.axisTypes||
-[]).forEach(function(e){var h=0;d[e].forEach(function(d){c=d.options;if(b[e]===h&&!c.isInternal||"undefined"!==typeof b[e]&&b[e]===c.id||"undefined"===typeof b[e]&&0===c.index)a.insert(d.series),a[e]=d,d.isDirty=!0;c.isInternal||h++});a[e]||a.optionalAxis===e||G(18,!0,d)})});F(this,"afterBindAxes")};a.prototype.updateParallelArrays=function(a,b){var d=a.series,c=arguments,e=Q(b)?function(c){var e="y"===c&&d.toYData?d.toYData(a):a[c];d[c+"Data"][b]=e}:function(a){Array.prototype[b].apply(d[a+"Data"],
-Array.prototype.slice.call(c,2))};d.parallelArrays.forEach(e)};a.prototype.hasData=function(){return this.visible&&"undefined"!==typeof this.dataMax&&"undefined"!==typeof this.dataMin||this.visible&&this.yData&&0<this.yData.length};a.prototype.autoIncrement=function(a){var b=this.options,d=b.pointIntervalUnit,c=b.relativeXValue,e=this.chart.time,h=this.xIncrement,f;h=K(h,b.pointStart,0);this.pointInterval=f=K(this.pointInterval,b.pointInterval,1);c&&Q(a)&&(f*=a);d&&(b=new e.Date(h),"day"===d?e.set("Date",
-b,e.get("Date",b)+f):"month"===d?e.set("Month",b,e.get("Month",b)+f):"year"===d&&e.set("FullYear",b,e.get("FullYear",b)+f),f=b.getTime()-h);if(c&&Q(a))return h+f;this.xIncrement=h+f;return h};a.prototype.setDataSortingOptions=function(){var a=this.options;y(this,{requireSorting:!1,sorted:!1,enabledDataSorting:!0,allowDG:!1});b(a.pointRange)||(a.pointRange=1)};a.prototype.setOptions=function(a){var d=this.chart,c=d.options,e=c.plotOptions,h=d.userOptions||{};a=M(a);d=d.styledMode;var f={plotOptions:e,
-userOptions:a};F(this,"setOptions",f);var g=f.plotOptions[this.type],k=h.plotOptions||{};this.userOptions=f.userOptions;h=M(g,e.series,h.plotOptions&&h.plotOptions[this.type],a);this.tooltipOptions=M(l.tooltip,l.plotOptions.series&&l.plotOptions.series.tooltip,l.plotOptions[this.type].tooltip,c.tooltip.userOptions,e.series&&e.series.tooltip,e[this.type].tooltip,a.tooltip);this.stickyTracking=K(a.stickyTracking,k[this.type]&&k[this.type].stickyTracking,k.series&&k.series.stickyTracking,this.tooltipOptions.shared&&
-!this.noSharedTooltip?!0:h.stickyTracking);null===g.marker&&delete h.marker;this.zoneAxis=h.zoneAxis;e=this.zones=(h.zones||[]).slice();!h.negativeColor&&!h.negativeFillColor||h.zones||(c={value:h[this.zoneAxis+"Threshold"]||h.threshold||0,className:"highcharts-negative"},d||(c.color=h.negativeColor,c.fillColor=h.negativeFillColor),e.push(c));e.length&&b(e[e.length-1].value)&&e.push(d?{}:{color:this.color,fillColor:this.fillColor});F(this,"afterSetOptions",{options:h});return h};a.prototype.getName=
-function(){return K(this.options.name,"Series "+(this.index+1))};a.prototype.getCyclic=function(a,d,c){var e=this.chart,h=this.userOptions,f=a+"Index",g=a+"Counter",k=c?c.length:K(e.options.chart[a+"Count"],e[a+"Count"]);if(!d){var l=K(h[f],h["_"+f]);b(l)||(e.series.length||(e[g]=0),h["_"+f]=l=e[g]%k,e[g]+=1);c&&(d=c[l])}"undefined"!==typeof l&&(this[f]=l);this[a]=d};a.prototype.getColor=function(){this.chart.styledMode?this.getCyclic("color"):this.options.colorByPoint?this.color=x.neutralColor20:
-this.getCyclic("color",this.options.color||l.plotOptions[this.type].color,this.chart.options.colors)};a.prototype.getPointsCollection=function(){return(this.hasGroupedData?this.points:this.data)||[]};a.prototype.getSymbol=function(){this.getCyclic("symbol",this.options.marker.symbol,this.chart.options.symbols)};a.prototype.findPointIndex=function(a,b){var d=a.id,c=a.x,e=this.points,h=this.options.dataSorting,f,g;if(d)h=this.chart.get(d),h instanceof J&&(f=h);else if(this.linkedParent||this.enabledDataSorting||
-this.options.relativeXValue)if(f=function(b){return!b.touched&&b.index===a.index},h&&h.matchByName?f=function(b){return!b.touched&&b.name===a.name}:this.options.relativeXValue&&(f=function(b){return!b.touched&&b.options.x===a.x}),f=L(e,f),!f)return;if(f){var k=f&&f.index;"undefined"!==typeof k&&(g=!0)}"undefined"===typeof k&&Q(c)&&(k=this.xData.indexOf(c,b));-1!==k&&"undefined"!==typeof k&&this.cropped&&(k=k>=this.cropStart?k-this.cropStart:k);!g&&Q(k)&&e[k]&&e[k].touched&&(k=void 0);return k};a.prototype.updateData=
-function(a,d){var c=this.options,e=c.dataSorting,h=this.points,f=[],g=this.requireSorting,k=a.length===h.length,l,m,A,p=!0;this.xIncrement=null;a.forEach(function(a,d){var m=b(a)&&this.pointClass.prototype.optionsToObject.call({series:this},a)||{},p=m.x;if(m.id||Q(p)){if(m=this.findPointIndex(m,A),-1===m||"undefined"===typeof m?f.push(a):h[m]&&a!==c.data[m]?(h[m].update(a,!1,null,!1),h[m].touched=!0,g&&(A=m+1)):h[m]&&(h[m].touched=!0),!k||d!==m||e&&e.enabled||this.hasDerivedData)l=!0}else f.push(a)},
-this);if(l)for(a=h.length;a--;)(m=h[a])&&!m.touched&&m.remove&&m.remove(!1,d);else!k||e&&e.enabled?p=!1:(a.forEach(function(a,b){a!==h[b].y&&h[b].update&&h[b].update(a,!1,null,!1)}),f.length=0);h.forEach(function(a){a&&(a.touched=!1)});if(!p)return!1;f.forEach(function(a){this.addPoint(a,!1,null,null,!1)},this);null===this.xIncrement&&this.xData&&this.xData.length&&(this.xIncrement=B(this.xData),this.autoIncrement());return!0};a.prototype.setData=function(a,b,d,c){var e=this,h=e.points,f=h&&h.length||
-0,g=e.options,k=e.chart,l=g.dataSorting,m=e.xAxis,A=g.turboThreshold,p=this.xData,n=this.yData,q=e.pointArrayMap;q=q&&q.length;var t=g.keys,v,r=0,B=1,y=null;a=a||[];var N=a.length;b=K(b,!0);l&&l.enabled&&(a=this.sortData(a));!1!==c&&N&&f&&!e.cropped&&!e.hasGroupedData&&e.visible&&!e.isSeriesBoosting&&(v=this.updateData(a,d));if(!v){e.xIncrement=null;e.colorCounter=0;this.parallelArrays.forEach(function(a){e[a+"Data"].length=0});if(A&&N>A)if(y=e.getFirstValidPoint(a),Q(y))for(d=0;d<N;d++)p[d]=this.autoIncrement(),
-n[d]=a[d];else if(S(y))if(q)for(d=0;d<N;d++)c=a[d],p[d]=c[0],n[d]=c.slice(1,q+1);else for(t&&(r=t.indexOf("x"),B=t.indexOf("y"),r=0<=r?r:0,B=0<=B?B:1),d=0;d<N;d++)c=a[d],p[d]=c[r],n[d]=c[B];else G(12,!1,k);else for(d=0;d<N;d++)"undefined"!==typeof a[d]&&(c={series:e},e.pointClass.prototype.applyOptions.apply(c,[a[d]]),e.updateParallelArrays(c,d));n&&V(n[0])&&G(14,!0,k);e.data=[];e.options.data=e.userOptions.data=a;for(d=f;d--;)h[d]&&h[d].destroy&&h[d].destroy();m&&(m.minRange=m.userMinRange);e.isDirty=
-k.isDirtyBox=!0;e.isDirtyData=!!h;d=!1}"point"===g.legendType&&(this.processData(),this.generatePoints());b&&k.redraw(d)};a.prototype.sortData=function(a){var d=this,c=d.options.dataSorting.sortKey||"y",e=function(a,d){return b(d)&&a.pointClass.prototype.optionsToObject.call({series:a},d)||{}};a.forEach(function(b,c){a[c]=e(d,b);a[c].index=c},this);a.concat().sort(function(a,b){a=P(c,a);b=P(c,b);return b<a?-1:b>a?1:0}).forEach(function(a,b){a.x=b},this);d.linkedSeries&&d.linkedSeries.forEach(function(b){var d=
-b.options,c=d.data;d.dataSorting&&d.dataSorting.enabled||!c||(c.forEach(function(d,h){c[h]=e(b,d);a[h]&&(c[h].x=a[h].x,c[h].index=h)}),b.setData(c,!1))});return a};a.prototype.getProcessedData=function(a){var b=this.xAxis,d=this.options,c=d.cropThreshold,e=a||this.getExtremesFromAll||d.getExtremesFromAll,h=this.isCartesian;a=b&&b.val2lin;d=!(!b||!b.logarithmic);var f=0,g=this.xData,k=this.yData,l=this.requireSorting;var m=!1;var A=g.length;if(b){m=b.getExtremes();var p=m.min;var n=m.max;m=b.categories&&
-!b.names.length}if(h&&this.sorted&&!e&&(!c||A>c||this.forceCrop))if(g[A-1]<p||g[0]>n)g=[],k=[];else if(this.yData&&(g[0]<p||g[A-1]>n)){var q=this.cropData(this.xData,this.yData,p,n);g=q.xData;k=q.yData;f=q.start;q=!0}for(c=g.length||1;--c;)if(b=d?a(g[c])-a(g[c-1]):g[c]-g[c-1],0<b&&("undefined"===typeof t||b<t))var t=b;else 0>b&&l&&!m&&(G(15,!1,this.chart),l=!1);return{xData:g,yData:k,cropped:q,cropStart:f,closestPointRange:t}};a.prototype.processData=function(a){var b=this.xAxis;if(this.isCartesian&&
-!this.isDirty&&!b.isDirty&&!this.yAxis.isDirty&&!a)return!1;a=this.getProcessedData();this.cropped=a.cropped;this.cropStart=a.cropStart;this.processedXData=a.xData;this.processedYData=a.yData;this.closestPointRange=this.basePointRange=a.closestPointRange};a.prototype.cropData=function(a,b,d,c,e){var h=a.length,f,g=0,k=h;e=K(e,this.cropShoulder);for(f=0;f<h;f++)if(a[f]>=d){g=Math.max(0,f-e);break}for(d=f;d<h;d++)if(a[d]>c){k=d+e;break}return{xData:a.slice(g,k),yData:b.slice(g,k),start:g,end:k}};a.prototype.generatePoints=
-function(){var a=this.options,b=a.data,d=this.processedXData,c=this.processedYData,e=this.pointClass,h=d.length,f=this.cropStart||0,g=this.hasGroupedData,k=a.keys,l=[];a=a.dataGrouping&&a.dataGrouping.groupAll?f:0;var m,p,n=this.data;if(!n&&!g){var q=[];q.length=b.length;n=this.data=q}k&&g&&(this.options.keys=!1);for(p=0;p<h;p++){q=f+p;if(g){var t=(new e).init(this,[d[p]].concat(ha(c[p])));t.dataGroup=this.groupMap[a+p];t.dataGroup.options&&(t.options=t.dataGroup.options,y(t,t.dataGroup.options),
-delete t.dataLabels)}else(t=n[q])||"undefined"===typeof b[q]||(n[q]=t=(new e).init(this,b[q],d[p]));t&&(t.index=g?a+p:q,l[p]=t)}this.options.keys=k;if(n&&(h!==(m=n.length)||g))for(p=0;p<m;p++)p!==f||g||(p+=h),n[p]&&(n[p].destroyElements(),n[p].plotX=void 0);this.data=n;this.points=l;F(this,"afterGeneratePoints")};a.prototype.getXExtremes=function(a){return{min:O(a),max:B(a)}};a.prototype.getExtremes=function(a,b){var d=this.xAxis,c=this.yAxis,e=this.processedXData||this.xData,h=[],f=this.requireSorting?
-this.cropShoulder:0;c=c?c.positiveValuesOnly:!1;var g,k=0,l=0,m=0;a=a||this.stackedYData||this.processedYData||[];var p=a.length;if(d){var n=d.getExtremes();k=n.min;l=n.max}for(g=0;g<p;g++){var A=e[g];n=a[g];var q=(Q(n)||S(n))&&(n.length||0<n||!c);A=b||this.getExtremesFromAll||this.options.getExtremesFromAll||this.cropped||!d||(e[g+f]||A)>=k&&(e[g-f]||A)<=l;if(q&&A)if(q=n.length)for(;q--;)Q(n[q])&&(h[m++]=n[q]);else h[m++]=n}a={dataMin:O(h),dataMax:B(h)};F(this,"afterGetExtremes",{dataExtremes:a});
-return a};a.prototype.applyExtremes=function(){var a=this.getExtremes();this.dataMin=a.dataMin;this.dataMax=a.dataMax;return a};a.prototype.getFirstValidPoint=function(a){for(var b=a.length,d=0,c=null;null===c&&d<b;)c=a[d],d++;return c};a.prototype.translate=function(){this.processedXData||this.processData();this.generatePoints();var a=this.options,c=a.stacking,e=this.xAxis,h=e.categories,f=this.enabledDataSorting,g=this.yAxis,k=this.points,l=k.length,m=!!this.modifyValue,p=this.pointPlacementToXValue(),
-n=!!p,q=a.threshold,v=a.startFromThreshold?q:0,r=this.zoneAxis||"y",B,y,I=Number.MAX_VALUE;for(B=0;B<l;B++){var D=k[B],u=D.x,G=void 0,x=void 0,w=D.y,L=D.low,z=c&&g.stacking&&g.stacking.stacks[(this.negStacks&&w<(v?0:q)?"-":"")+this.stackKey];if(g.positiveValuesOnly&&!g.validatePositiveValue(w)||e.positiveValuesOnly&&!e.validatePositiveValue(u))D.isNull=!0;D.plotX=y=d(t(e.translate(u,0,0,0,1,p,"flags"===this.type),-1E5,1E5));if(c&&this.visible&&z&&z[u]){var C=this.getStackIndicator(C,u,this.index);
-D.isNull||(G=z[u],x=G.points[C.key])}S(x)&&(L=x[0],w=x[1],L===v&&C.key===z[u].base&&(L=K(Q(q)&&q,g.min)),g.positiveValuesOnly&&0>=L&&(L=null),D.total=D.stackTotal=G.total,D.percentage=G.total&&D.y/G.total*100,D.stackY=w,this.irregularWidths||G.setOffset(this.pointXOffset||0,this.barW||0));D.yBottom=b(L)?t(g.translate(L,0,1,0,1),-1E5,1E5):null;m&&(w=this.modifyValue(w,D));D.plotY=void 0;Q(w)&&(G=g.translate(w,!1,!0,!1,!0),"undefined"!==typeof G&&(D.plotY=t(G,-1E5,1E5)));D.isInside=this.isPointInside(D);
-D.clientX=n?d(e.translate(u,0,0,0,1,p)):y;D.negative=D[r]<(a[r+"Threshold"]||q||0);D.category=h&&"undefined"!==typeof h[D.x]?h[D.x]:D.x;if(!D.isNull&&!1!==D.visible){"undefined"!==typeof H&&(I=Math.min(I,Math.abs(y-H)));var H=y}D.zone=this.zones.length&&D.getZone();!D.graphic&&this.group&&f&&(D.isNew=!0)}this.closestPointRangePx=I;F(this,"afterTranslate")};a.prototype.getValidPoints=function(a,b,d){var c=this.chart;return(a||this.points||[]).filter(function(a){return b&&!c.isInsidePlot(a.plotX,a.plotY,
-{inverted:c.inverted})?!1:!1!==a.visible&&(d||!a.isNull)})};a.prototype.getClipBox=function(a,b){var d=this.options,c=this.chart,e=c.inverted,h=this.xAxis,f=h&&this.yAxis,g=c.options.chart.scrollablePlotArea||{};a&&!1===d.clip&&f?a=e?{y:-c.chartWidth+f.len+f.pos,height:c.chartWidth,width:c.chartHeight,x:-c.chartHeight+h.len+h.pos}:{y:-f.pos,height:c.chartHeight,width:c.chartWidth,x:-h.pos}:(a=this.clipBox||c.clipBox,b&&(a.width=c.plotSizeX,a.x=(c.scrollablePixelsX||0)*(g.scrollPositionX||0)));return b?
-{width:a.width,x:a.x}:a};a.prototype.getSharedClipKey=function(a){if(this.sharedClipKey)return this.sharedClipKey;var b=[a&&a.duration,a&&a.easing,a&&a.defer,this.getClipBox(a).height,this.options.xAxis,this.options.yAxis].join();if(!1!==this.options.clip||a)this.sharedClipKey=b;return b};a.prototype.setClip=function(a){var b=this.chart,d=this.options,c=b.renderer,e=b.inverted,h=this.clipBox,f=this.getClipBox(a),g=this.getSharedClipKey(a),k=b.sharedClips[g],l=b.sharedClips[g+"m"];a&&(f.width=0,e&&
-(f.x=b.plotHeight+(!1!==d.clip?0:b.plotTop)));k?b.hasLoaded||k.attr(f):(a&&(b.sharedClips[g+"m"]=l=c.clipRect(e?(b.plotSizeX||0)+99:-99,e?-b.plotLeft:-b.plotTop,99,e?b.chartWidth:b.chartHeight)),b.sharedClips[g]=k=c.clipRect(f),k.count={length:0});a&&!k.count[this.index]&&(k.count[this.index]=!0,k.count.length+=1);if(!1!==d.clip||a)this.group.clip(a||h?k:b.clipRect),this.markerGroup.clip(l);a||(k.count[this.index]&&(delete k.count[this.index],--k.count.length),0===k.count.length&&(h||(b.sharedClips[g]=
-k.destroy()),l&&(b.sharedClips[g+"m"]=l.destroy())))};a.prototype.animate=function(a){var b=this.chart,d=c(this.options.animation),e=this.sharedClipKey;if(a)this.setClip(d);else if(e){a=b.sharedClips[e];e=b.sharedClips[e+"m"];var h=this.getClipBox(d,!0);a&&a.animate(h,d);e&&e.animate({width:h.width+99,x:h.x-(b.inverted?0:99)},d)}};a.prototype.afterAnimate=function(){this.setClip();F(this,"afterAnimate");this.finishedAnimating=!0};a.prototype.drawPoints=function(){var a=this.points,b=this.chart,d=
-this.options.marker,c=this[this.specialGroup]||this.markerGroup,e=this.xAxis,h=K(d.enabled,!e||e.isRadial?!0:null,this.closestPointRangePx>=d.enabledThreshold*d.radius),f,g;if(!1!==d.enabled||this._hasPointMarkers)for(f=0;f<a.length;f++){var k=a[f];var l=(g=k.graphic)?"animate":"attr";var m=k.marker||{};var p=!!k.marker;if((h&&"undefined"===typeof m.enabled||m.enabled)&&!k.isNull&&!1!==k.visible){var n=K(m.symbol,this.symbol,"rect");var q=this.markerAttribs(k,k.selected&&"select");this.enabledDataSorting&&
-(k.startXPos=e.reversed?-(q.width||0):e.width);var t=!1!==k.isInside;g?g[t?"show":"hide"](t).animate(q):t&&(0<(q.width||0)||k.hasImage)&&(k.graphic=g=b.renderer.symbol(n,q.x,q.y,q.width,q.height,p?m:d).add(c),this.enabledDataSorting&&b.hasRendered&&(g.attr({x:k.startXPos}),l="animate"));g&&"animate"===l&&g[t?"show":"hide"](t).animate(q);if(g&&!b.styledMode)g[l](this.pointAttribs(k,k.selected&&"select"));g&&g.addClass(k.getClassName(),!0)}else g&&(k.graphic=g.destroy())}};a.prototype.markerAttribs=
-function(a,b){var d=this.options,c=d.marker,e=a.marker||{},h=e.symbol||c.symbol,f=K(e.radius,c.radius);b&&(c=c.states[b],b=e.states&&e.states[b],f=K(b&&b.radius,c&&c.radius,f+(c&&c.radiusPlus||0)));a.hasImage=h&&0===h.indexOf("url");a.hasImage&&(f=0);a={x:d.crisp?Math.floor(a.plotX-f):a.plotX-f,y:a.plotY-f};f&&(a.width=a.height=2*f);return a};a.prototype.pointAttribs=function(a,b){var d=this.options.marker,c=a&&a.options,e=c&&c.marker||{},h=c&&c.color,f=a&&a.color,g=a&&a.zone&&a.zone.color,k=this.color;
-a=K(e.lineWidth,d.lineWidth);c=1;k=h||g||f||k;h=e.fillColor||d.fillColor||k;f=e.lineColor||d.lineColor||k;b=b||"normal";d=d.states[b];b=e.states&&e.states[b]||{};a=K(b.lineWidth,d.lineWidth,a+K(b.lineWidthPlus,d.lineWidthPlus,0));h=b.fillColor||d.fillColor||h;f=b.lineColor||d.lineColor||f;c=K(b.opacity,d.opacity,c);return{stroke:f,"stroke-width":a,fill:h,opacity:c}};a.prototype.destroy=function(a){var b=this,d=b.chart,c=/AppleWebKit\/533/.test(k.navigator.userAgent),e=b.data||[],h,f,l,n;F(b,"destroy");
-this.removeEvents(a);(b.axisTypes||[]).forEach(function(a){(n=b[a])&&n.series&&(p(n.series,b),n.isDirty=n.forceRedraw=!0)});b.legendItem&&b.chart.legend.destroyItem(b);for(f=e.length;f--;)(l=e[f])&&l.destroy&&l.destroy();b.clips&&b.clips.forEach(function(a){return a.destroy()});g.clearTimeout(b.animationTimeout);H(b,function(a,b){a instanceof m&&!a.survive&&(h=c&&"group"===b?"hide":"destroy",a[h]())});d.hoverSeries===b&&(d.hoverSeries=void 0);p(d.series,b);d.orderSeries();H(b,function(d,c){a&&"hcEvents"===
-c||delete b[c]})};a.prototype.applyZones=function(){var a=this,b=this.chart,d=b.renderer,c=this.zones,e=this.clips||[],h=this.graph,f=this.area,g=Math.max(b.chartWidth,b.chartHeight),k=this[(this.zoneAxis||"y")+"Axis"],l=b.inverted,m,p,n,q,v,r,B,y,D=!1;if(c.length&&(h||f)&&k&&"undefined"!==typeof k.min){var I=k.reversed;var F=k.horiz;h&&!this.showLine&&h.hide();f&&f.hide();var u=k.getExtremes();c.forEach(function(c,A){m=I?F?b.plotWidth:0:F?0:k.toPixels(u.min)||0;m=t(K(p,m),0,g);p=t(Math.round(k.toPixels(K(c.value,
-u.max),!0)||0),0,g);D&&(m=p=k.toPixels(u.max));q=Math.abs(m-p);v=Math.min(m,p);r=Math.max(m,p);k.isXAxis?(n={x:l?r:v,y:0,width:q,height:g},F||(n.x=b.plotHeight-n.x)):(n={x:0,y:l?r:v,width:g,height:q},F&&(n.y=b.plotWidth-n.y));l&&d.isVML&&(n=k.isXAxis?{x:0,y:I?v:r,height:n.width,width:b.chartWidth}:{x:n.y-b.plotLeft-b.spacingBox.x,y:0,width:n.height,height:b.chartHeight});e[A]?e[A].animate(n):e[A]=d.clipRect(n);B=a["zone-area-"+A];y=a["zone-graph-"+A];h&&y&&y.clip(e[A]);f&&B&&B.clip(e[A]);D=c.value>
-u.max;a.resetZones&&0===p&&(p=void 0)});this.clips=e}else a.visible&&(h&&h.show(!0),f&&f.show(!0))};a.prototype.invertGroups=function(a){function b(){["group","markerGroup"].forEach(function(b){d[b]&&(c.renderer.isVML&&d[b].attr({width:d.yAxis.len,height:d.xAxis.len}),d[b].width=d.yAxis.len,d[b].height=d.xAxis.len,d[b].invert(d.isRadialSeries?!1:a))})}var d=this,c=d.chart;d.xAxis&&(d.eventsToUnbind.push(D(c,"resize",b)),b(),d.invertGroups=b)};a.prototype.plotGroup=function(a,d,c,e,h){var f=this[a],
-g=!f;c={visibility:c,zIndex:e||.1};"undefined"===typeof this.opacity||this.chart.styledMode||"inactive"===this.state||(c.opacity=this.opacity);g&&(this[a]=f=this.chart.renderer.g().add(h));f.addClass("highcharts-"+d+" highcharts-series-"+this.index+" highcharts-"+this.type+"-series "+(b(this.colorIndex)?"highcharts-color-"+this.colorIndex+" ":"")+(this.options.className||"")+(f.hasClass("highcharts-tracker")?" highcharts-tracker":""),!0);f.attr(c)[g?"attr":"animate"](this.getPlotBox());return f};
-a.prototype.getPlotBox=function(){var a=this.chart,b=this.xAxis,d=this.yAxis;a.inverted&&(b=d,d=this.xAxis);return{translateX:b?b.left:a.plotLeft,translateY:d?d.top:a.plotTop,scaleX:1,scaleY:1}};a.prototype.removeEvents=function(a){a||la(this);this.eventsToUnbind.length&&(this.eventsToUnbind.forEach(function(a){a()}),this.eventsToUnbind.length=0)};a.prototype.render=function(){var a=this,b=a.chart,d=a.options,e=c(d.animation),h=a.visible?"inherit":"hidden",f=d.zIndex,g=a.hasRendered,k=b.seriesGroup,
-l=b.inverted,m=!a.finishedAnimating&&b.renderer.isSVG&&e.duration;F(this,"render");var p=a.plotGroup("group","series",h,f,k);a.markerGroup=a.plotGroup("markerGroup","markers",h,f,k);m&&a.animate&&a.animate(!0);p.inverted=K(a.invertible,a.isCartesian)?l:!1;a.drawGraph&&(a.drawGraph(),a.applyZones());a.visible&&a.drawPoints();a.drawDataLabels&&a.drawDataLabels();a.redrawPoints&&a.redrawPoints();a.drawTracker&&!1!==a.options.enableMouseTracking&&a.drawTracker();a.invertGroups(l);!1===d.clip||a.sharedClipKey||
-g||p.clip(b.clipRect);m&&a.animate&&a.animate();g||(m&&e.defer&&(m+=e.defer),a.animationTimeout=R(function(){a.afterAnimate()},m||0));a.isDirty=!1;a.hasRendered=!0;F(a,"afterRender")};a.prototype.redraw=function(){var a=this.chart,b=this.isDirty||this.isDirtyData,d=this.group,c=this.xAxis,e=this.yAxis;d&&(a.inverted&&d.attr({width:a.plotWidth,height:a.plotHeight}),d.animate({translateX:K(c&&c.left,a.plotLeft),translateY:K(e&&e.top,a.plotTop)}));this.translate();this.render();b&&delete this.kdTree};
-a.prototype.searchPoint=function(a,b){var d=this.xAxis,c=this.yAxis,e=this.chart.inverted;return this.searchKDTree({clientX:e?d.len-a.chartY+d.pos:a.chartX-d.pos,plotY:e?c.len-a.chartX+c.pos:a.chartY-c.pos},b,a)};a.prototype.buildKDTree=function(a){function b(a,c,e){var h=a&&a.length;if(h){var f=d.kdAxisArray[c%e];a.sort(function(a,b){return a[f]-b[f]});h=Math.floor(h/2);return{point:a[h],left:b(a.slice(0,h),c+1,e),right:b(a.slice(h+1),c+1,e)}}}this.buildingKdTree=!0;var d=this,c=-1<d.options.findNearestPointBy.indexOf("y")?
-2:1;delete d.kdTree;R(function(){d.kdTree=b(d.getValidPoints(null,!d.directTouch),c,c);d.buildingKdTree=!1},d.options.kdNow||a&&"touchstart"===a.type?0:1)};a.prototype.searchKDTree=function(a,d,c){function e(a,d,c,l){var m=d.point,p=h.kdAxisArray[c%l],n=m,q=b(a[f])&&b(m[f])?Math.pow(a[f]-m[f],2):null;var t=b(a[g])&&b(m[g])?Math.pow(a[g]-m[g],2):null;t=(q||0)+(t||0);m.dist=b(t)?Math.sqrt(t):Number.MAX_VALUE;m.distX=b(q)?Math.sqrt(q):Number.MAX_VALUE;p=a[p]-m[p];t=0>p?"left":"right";q=0>p?"right":"left";
-d[t]&&(t=e(a,d[t],c+1,l),n=t[k]<n[k]?t:m);d[q]&&Math.sqrt(p*p)<n[k]&&(a=e(a,d[q],c+1,l),n=a[k]<n[k]?a:n);return n}var h=this,f=this.kdAxisArray[0],g=this.kdAxisArray[1],k=d?"distX":"dist";d=-1<h.options.findNearestPointBy.indexOf("y")?2:1;this.kdTree||this.buildingKdTree||this.buildKDTree(c);if(this.kdTree)return e(a,this.kdTree,d,d)};a.prototype.pointPlacementToXValue=function(){var a=this.options,b=a.pointRange,d=this.xAxis;a=a.pointPlacement;"between"===a&&(a=d.reversed?-.5:.5);return Q(a)?a*(b||
-d.pointRange):0};a.prototype.isPointInside=function(a){return"undefined"!==typeof a.plotY&&"undefined"!==typeof a.plotX&&0<=a.plotY&&a.plotY<=this.yAxis.len&&0<=a.plotX&&a.plotX<=this.xAxis.len};a.prototype.drawTracker=function(){var a=this,b=a.options,d=b.trackByArea,c=[].concat(d?a.areaPath:a.graphPath),e=a.chart,h=e.pointer,f=e.renderer,g=e.options.tooltip.snap,k=a.tracker,l=function(b){if(e.hoverSeries!==a)a.onMouseOver()},m="rgba(192,192,192,"+(q?.0001:.002)+")";k?k.attr({d:c}):a.graph&&(a.tracker=
-f.path(c).attr({visibility:a.visible?"visible":"hidden",zIndex:2}).addClass(d?"highcharts-tracker-area":"highcharts-tracker-line").add(a.group),e.styledMode||a.tracker.attr({"stroke-linecap":"round","stroke-linejoin":"round",stroke:m,fill:d?m:"none","stroke-width":a.graph.strokeWidth()+(d?0:2*g)}),[a.tracker,a.markerGroup,a.dataLabelsGroup].forEach(function(a){if(a&&(a.addClass("highcharts-tracker").on("mouseover",l).on("mouseout",function(a){h.onTrackerMouseOut(a)}),b.cursor&&!e.styledMode&&a.css({cursor:b.cursor}),
-v))a.on("touchstart",l)}));F(this,"afterDrawTracker")};a.prototype.addPoint=function(a,b,d,c,e){var h=this.options,f=this.data,g=this.chart,k=this.xAxis;k=k&&k.hasNames&&k.names;var l=h.data,m=this.xData,p;b=K(b,!0);var n={series:this};this.pointClass.prototype.applyOptions.apply(n,[a]);var q=n.x;var t=m.length;if(this.requireSorting&&q<m[t-1])for(p=!0;t&&m[t-1]>q;)t--;this.updateParallelArrays(n,"splice",t,0,0);this.updateParallelArrays(n,t);k&&n.name&&(k[q]=n.name);l.splice(t,0,a);p&&(this.data.splice(t,
-0,null),this.processData());"point"===h.legendType&&this.generatePoints();d&&(f[0]&&f[0].remove?f[0].remove(!1):(f.shift(),this.updateParallelArrays(n,"shift"),l.shift()));!1!==e&&F(this,"addPoint",{point:n});this.isDirtyData=this.isDirty=!0;b&&g.redraw(c)};a.prototype.removePoint=function(a,b,d){var c=this,h=c.data,f=h[a],g=c.points,k=c.chart,l=function(){g&&g.length===h.length&&g.splice(a,1);h.splice(a,1);c.options.data.splice(a,1);c.updateParallelArrays(f||{series:c},"splice",a,1);f&&f.destroy();
-c.isDirty=!0;c.isDirtyData=!0;b&&k.redraw()};e(d,k);b=K(b,!0);f?f.firePointEvent("remove",null,l):l()};a.prototype.remove=function(a,b,d,c){function e(){h.destroy(c);f.isDirtyLegend=f.isDirtyBox=!0;f.linkSeries();K(a,!0)&&f.redraw(b)}var h=this,f=h.chart;!1!==d?F(h,"remove",null,e):e()};a.prototype.update=function(a,b){a=h(a,this.userOptions);F(this,"update",{options:a});var d=this,c=d.chart,e=d.userOptions,f=d.initialType||d.type,g=c.options.plotOptions,k=r[f].prototype,l=d.finishedAnimating&&{animation:!1},
-m={},p,n=["eventOptions","navigatorSeries","baseSeries"],q=a.type||e.type||c.options.chart.type,t=!(this.hasDerivedData||q&&q!==this.type||"undefined"!==typeof a.pointStart||"undefined"!==typeof a.pointInterval||"undefined"!==typeof a.relativeXValue||d.hasOptionChanged("dataGrouping")||d.hasOptionChanged("pointStart")||d.hasOptionChanged("pointInterval")||d.hasOptionChanged("pointIntervalUnit")||d.hasOptionChanged("keys"));q=q||f;t&&(n.push("data","isDirtyData","points","processedXData","processedYData",
-"xIncrement","cropped","_hasPointMarkers","_hasPointLabels","clips","nodes","layout","mapMap","mapData","minY","maxY","minX","maxX"),!1!==a.visible&&n.push("area","graph"),d.parallelArrays.forEach(function(a){n.push(a+"Data")}),a.data&&(a.dataSorting&&y(d.options.dataSorting,a.dataSorting),this.setData(a.data,!1)));a=M(e,l,{index:"undefined"===typeof e.index?d.index:e.index,pointStart:K(g&&g.series&&g.series.pointStart,e.pointStart,d.xData[0])},!t&&{data:d.options.data},a);t&&a.data&&(a.data=d.options.data);
-n=["group","markerGroup","dataLabelsGroup","transformGroup"].concat(n);n.forEach(function(a){n[a]=d[a];delete d[a]});g=!1;if(r[q]){if(g=q!==d.type,d.remove(!1,!1,!1,!0),g)if(Object.setPrototypeOf)Object.setPrototypeOf(d,r[q].prototype);else{l=Object.hasOwnProperty.call(d,"hcEvents")&&d.hcEvents;for(p in k)d[p]=void 0;y(d,r[q].prototype);l?d.hcEvents=l:delete d.hcEvents}}else G(17,!0,c,{missingModuleFor:q});n.forEach(function(a){d[a]=n[a]});d.init(c,a);if(t&&this.points){var v=d.options;!1===v.visible?
-(m.graphic=1,m.dataLabel=1):d._hasPointLabels||(a=v.marker,k=v.dataLabels,!a||!1!==a.enabled&&(e.marker&&e.marker.symbol)===a.symbol||(m.graphic=1),k&&!1===k.enabled&&(m.dataLabel=1));this.points.forEach(function(a){a&&a.series&&(a.resolveColor(),Object.keys(m).length&&a.destroyElements(m),!1===v.showInLegend&&a.legendItem&&c.legend.destroyItem(a))},this)}d.initialType=f;c.linkSeries();g&&d.linkedSeries.length&&(d.isDirtyData=!0);F(this,"afterUpdate");K(b,!0)&&c.redraw(t?void 0:!1)};a.prototype.setName=
-function(a){this.name=this.options.name=this.userOptions.name=a;this.chart.isDirtyLegend=!0};a.prototype.hasOptionChanged=function(a){var b=this.options[a],d=this.chart.options.plotOptions,c=this.userOptions[a];return c?b!==c:b!==K(d&&d[this.type]&&d[this.type][a],d&&d.series&&d.series[a],b)};a.prototype.onMouseOver=function(){var a=this.chart,b=a.hoverSeries;a.pointer.setHoverChartIndex();if(b&&b!==this)b.onMouseOut();this.options.events.mouseOver&&F(this,"mouseOver");this.setState("hover");a.hoverSeries=
-this};a.prototype.onMouseOut=function(){var a=this.options,b=this.chart,d=b.tooltip,c=b.hoverPoint;b.hoverSeries=null;if(c)c.onMouseOut();this&&a.events.mouseOut&&F(this,"mouseOut");!d||this.stickyTracking||d.shared&&!this.noSharedTooltip||d.hide();b.series.forEach(function(a){a.setState("",!0)})};a.prototype.setState=function(a,b){var d=this,c=d.options,e=d.graph,h=c.inactiveOtherPoints,f=c.states,g=K(f[a||"normal"]&&f[a||"normal"].animation,d.chart.options.chart.animation),k=c.lineWidth,l=0,m=c.opacity;
-a=a||"";if(d.state!==a&&([d.group,d.markerGroup,d.dataLabelsGroup].forEach(function(b){b&&(d.state&&b.removeClass("highcharts-series-"+d.state),a&&b.addClass("highcharts-series-"+a))}),d.state=a,!d.chart.styledMode)){if(f[a]&&!1===f[a].enabled)return;a&&(k=f[a].lineWidth||k+(f[a].lineWidthPlus||0),m=K(f[a].opacity,m));if(e&&!e.dashstyle)for(c={"stroke-width":k},e.animate(c,g);d["zone-graph-"+l];)d["zone-graph-"+l].animate(c,g),l+=1;h||[d.group,d.markerGroup,d.dataLabelsGroup,d.labelBySeries].forEach(function(a){a&&
-a.animate({opacity:m},g)})}b&&h&&d.points&&d.setAllPointsToState(a||void 0)};a.prototype.setAllPointsToState=function(a){this.points.forEach(function(b){b.setState&&b.setState(a)})};a.prototype.setVisible=function(a,b){var d=this,c=d.chart,e=d.legendItem,h=c.options.chart.ignoreHiddenSeries,f=d.visible,g=(d.visible=a=d.options.visible=d.userOptions.visible="undefined"===typeof a?!f:a)?"show":"hide";["group","dataLabelsGroup","markerGroup","tracker","tt"].forEach(function(a){if(d[a])d[a][g]()});if(c.hoverSeries===
-d||(c.hoverPoint&&c.hoverPoint.series)===d)d.onMouseOut();e&&c.legend.colorizeItem(d,a);d.isDirty=!0;d.options.stacking&&c.series.forEach(function(a){a.options.stacking&&a.visible&&(a.isDirty=!0)});d.linkedSeries.forEach(function(b){b.setVisible(a,!1)});h&&(c.isDirtyBox=!0);F(d,g);!1!==b&&c.redraw()};a.prototype.show=function(){this.setVisible(!0)};a.prototype.hide=function(){this.setVisible(!1)};a.prototype.select=function(a){this.selected=a=this.options.selected="undefined"===typeof a?!this.selected:
-a;this.checkbox&&(this.checkbox.checked=a);F(this,a?"select":"unselect")};a.prototype.shouldShowTooltip=function(a,b,d){void 0===d&&(d={});d.series=this;d.visiblePlotOnly=!0;return this.chart.isInsidePlot(a,b,d)};a.defaultOptions=u;return a}();y(a.prototype,{axisTypes:["xAxis","yAxis"],coll:"series",colorCounter:0,cropShoulder:1,directTouch:!1,drawLegendSymbol:z.drawLineMarker,isCartesian:!0,kdAxisArray:["clientX","plotY"],parallelArrays:["x","y"],pointClass:J,requireSorting:!0,sorted:!0});n.series=
-a;"";"";return a});M(a,"Extensions/ScrollablePlotArea.js",[a["Core/Animation/AnimationUtilities.js"],a["Core/Axis/Axis.js"],a["Core/Chart/Chart.js"],a["Core/Series/Series.js"],a["Core/Renderer/RendererRegistry.js"],a["Core/Utilities.js"]],function(a,w,C,E,z,x){var r=a.stop,u=x.addEvent,n=x.createElement,m=x.merge,g=x.pick;u(C,"afterSetChartSize",function(a){var c=this.options.chart.scrollablePlotArea,g=c&&c.minWidth;c=c&&c.minHeight;if(!this.renderer.forExport){if(g){if(this.scrollablePixelsX=g=Math.max(0,
-g-this.chartWidth)){this.scrollablePlotBox=this.renderer.scrollablePlotBox=m(this.plotBox);this.plotBox.width=this.plotWidth+=g;this.inverted?this.clipBox.height+=g:this.clipBox.width+=g;var f={1:{name:"right",value:g}}}}else c&&(this.scrollablePixelsY=g=Math.max(0,c-this.chartHeight))&&(this.scrollablePlotBox=this.renderer.scrollablePlotBox=m(this.plotBox),this.plotBox.height=this.plotHeight+=g,this.inverted?this.clipBox.width+=g:this.clipBox.height+=g,f={2:{name:"bottom",value:g}});f&&!a.skipAxes&&
-this.axes.forEach(function(a){f[a.side]?a.getPlotLinePath=function(){var c=f[a.side].name,e=this[c];this[c]=e-f[a.side].value;var g=w.prototype.getPlotLinePath.apply(this,arguments);this[c]=e;return g}:(a.setAxisSize(),a.setAxisTranslation())})}});u(C,"render",function(){this.scrollablePixelsX||this.scrollablePixelsY?(this.setUpScrolling&&this.setUpScrolling(),this.applyFixed()):this.fixedDiv&&this.applyFixed()});C.prototype.setUpScrolling=function(){var a=this,e={WebkitOverflowScrolling:"touch",
-overflowX:"hidden",overflowY:"hidden"};this.scrollablePixelsX&&(e.overflowX="auto");this.scrollablePixelsY&&(e.overflowY="auto");this.scrollingParent=n("div",{className:"highcharts-scrolling-parent"},{position:"relative"},this.renderTo);this.scrollingContainer=n("div",{className:"highcharts-scrolling"},e,this.scrollingParent);u(this.scrollingContainer,"scroll",function(){a.pointer&&delete a.pointer.chartPosition});this.innerContainer=n("div",{className:"highcharts-inner-container"},null,this.scrollingContainer);
-this.innerContainer.appendChild(this.container);this.setUpScrolling=null};C.prototype.moveFixedElements=function(){var a=this.container,e=this.fixedRenderer,g=".highcharts-contextbutton .highcharts-credits .highcharts-legend .highcharts-legend-checkbox .highcharts-navigator-series .highcharts-navigator-xaxis .highcharts-navigator-yaxis .highcharts-navigator .highcharts-reset-zoom .highcharts-drillup-button .highcharts-scrollbar .highcharts-subtitle .highcharts-title".split(" "),f;this.scrollablePixelsX&&
-!this.inverted?f=".highcharts-yaxis":this.scrollablePixelsX&&this.inverted?f=".highcharts-xaxis":this.scrollablePixelsY&&!this.inverted?f=".highcharts-xaxis":this.scrollablePixelsY&&this.inverted&&(f=".highcharts-yaxis");f&&g.push(f+":not(.highcharts-radial-axis)",f+"-labels:not(.highcharts-radial-axis-labels)");g.forEach(function(c){[].forEach.call(a.querySelectorAll(c),function(a){(a.namespaceURI===e.SVG_NS?e.box:e.box.parentNode).appendChild(a);a.style.pointerEvents="auto"})})};C.prototype.applyFixed=
-function(){var a=!this.fixedDiv,e=this.options.chart,l=e.scrollablePlotArea,f=z.getRendererType();a?(this.fixedDiv=n("div",{className:"highcharts-fixed"},{position:"absolute",overflow:"hidden",pointerEvents:"none",zIndex:(e.style&&e.style.zIndex||0)+2,top:0},null,!0),this.scrollingContainer&&this.scrollingContainer.parentNode.insertBefore(this.fixedDiv,this.scrollingContainer),this.renderTo.style.overflow="visible",this.fixedRenderer=e=new f(this.fixedDiv,this.chartWidth,this.chartHeight,this.options.chart.style),
-this.scrollableMask=e.path().attr({fill:this.options.chart.backgroundColor||"#fff","fill-opacity":g(l.opacity,.85),zIndex:-1}).addClass("highcharts-scrollable-mask").add(),u(this,"afterShowResetZoom",this.moveFixedElements),u(this,"afterDrilldown",this.moveFixedElements),u(this,"afterLayOutTitles",this.moveFixedElements)):this.fixedRenderer.setSize(this.chartWidth,this.chartHeight);if(this.scrollableDirty||a)this.scrollableDirty=!1,this.moveFixedElements();e=this.chartWidth+(this.scrollablePixelsX||
-0);f=this.chartHeight+(this.scrollablePixelsY||0);r(this.container);this.container.style.width=e+"px";this.container.style.height=f+"px";this.renderer.boxWrapper.attr({width:e,height:f,viewBox:[0,0,e,f].join(" ")});this.chartBackground.attr({width:e,height:f});this.scrollingContainer.style.height=this.chartHeight+"px";a&&(l.scrollPositionX&&(this.scrollingContainer.scrollLeft=this.scrollablePixelsX*l.scrollPositionX),l.scrollPositionY&&(this.scrollingContainer.scrollTop=this.scrollablePixelsY*l.scrollPositionY));
-f=this.axisOffset;a=this.plotTop-f[0]-1;l=this.plotLeft-f[3]-1;e=this.plotTop+this.plotHeight+f[2]+1;f=this.plotLeft+this.plotWidth+f[1]+1;var m=this.plotLeft+this.plotWidth-(this.scrollablePixelsX||0),q=this.plotTop+this.plotHeight-(this.scrollablePixelsY||0);a=this.scrollablePixelsX?[["M",0,a],["L",this.plotLeft-1,a],["L",this.plotLeft-1,e],["L",0,e],["Z"],["M",m,a],["L",this.chartWidth,a],["L",this.chartWidth,e],["L",m,e],["Z"]]:this.scrollablePixelsY?[["M",l,0],["L",l,this.plotTop-1],["L",f,this.plotTop-
-1],["L",f,0],["Z"],["M",l,q],["L",l,this.chartHeight],["L",f,this.chartHeight],["L",f,q],["Z"]]:[["M",0,0]];"adjustHeight"!==this.redrawTrigger&&this.scrollableMask.attr({d:a})};u(w,"afterInit",function(){this.chart.scrollableDirty=!0});u(E,"show",function(){this.chart.scrollableDirty=!0});""});M(a,"Core/Axis/StackingAxis.js",[a["Core/Animation/AnimationUtilities.js"],a["Core/Axis/Axis.js"],a["Core/Utilities.js"]],function(a,w,C){var r=a.getDeferredAnimation,z=C.addEvent,x=C.destroyObjectProperties,
-J=C.fireEvent,u=C.isNumber,n=C.objectEach,m;(function(a){function c(){var a=this.stacking;if(a){var c=a.stacks;n(c,function(a,e){x(a);c[e]=null});a&&a.stackTotalGroup&&a.stackTotalGroup.destroy()}}function e(){this.stacking||(this.stacking=new f(this))}var g=[];a.compose=function(a){-1===g.indexOf(a)&&(g.push(a),z(a,"init",e),z(a,"destroy",c));return a};var f=function(){function a(a){this.oldStacks={};this.stacks={};this.stacksTouched=0;this.axis=a}a.prototype.buildStacks=function(){var a=this.axis,
-c=a.series,e=a.options.reversedStacks,f=c.length,g;if(!a.isXAxis){this.usePercentage=!1;for(g=f;g--;){var l=c[e?g:f-g-1];l.setStackedPoints();l.setGroupedPoints()}for(g=0;g<f;g++)c[g].modifyStacks();J(a,"afterBuildStacks")}};a.prototype.cleanStacks=function(){if(!this.axis.isXAxis){if(this.oldStacks)var a=this.stacks=this.oldStacks;n(a,function(a){n(a,function(a){a.cumulative=a.total})})}};a.prototype.resetStacks=function(){var a=this,c=a.stacks;a.axis.isXAxis||n(c,function(c){n(c,function(e,f){u(e.touched)&&
-e.touched<a.stacksTouched?(e.destroy(),delete c[f]):(e.total=null,e.cumulative=null)})})};a.prototype.renderStackTotals=function(){var a=this.axis,c=a.chart,e=c.renderer,f=this.stacks;a=r(c,a.options.stackLabels&&a.options.stackLabels.animation||!1);var g=this.stackTotalGroup=this.stackTotalGroup||e.g("stack-labels").attr({visibility:"visible",zIndex:6,opacity:0}).add();g.translate(c.plotLeft,c.plotTop);n(f,function(a){n(a,function(a){a.render(g)})});g.animate({opacity:1},a)};return a}();a.Additions=
-f})(m||(m={}));return m});M(a,"Extensions/Stacking.js",[a["Core/Axis/Axis.js"],a["Core/Chart/Chart.js"],a["Core/FormatUtilities.js"],a["Core/Globals.js"],a["Core/Series/Series.js"],a["Core/Axis/StackingAxis.js"],a["Core/Utilities.js"]],function(a,w,C,E,z,x,J){var r=C.format,n=J.correctFloat,m=J.defined,g=J.destroyObjectProperties,c=J.isArray,e=J.isNumber,l=J.objectEach,f=J.pick,v=function(){function a(a,c,e,f,g){var k=a.chart.inverted;this.axis=a;this.isNegative=e;this.options=c=c||{};this.x=f;this.total=
-null;this.points={};this.hasValidPoints=!1;this.stack=g;this.rightCliff=this.leftCliff=0;this.alignOptions={align:c.align||(k?e?"left":"right":"center"),verticalAlign:c.verticalAlign||(k?"middle":e?"bottom":"top"),y:c.y,x:c.x};this.textAlign=c.textAlign||(k?e?"right":"left":"center")}a.prototype.destroy=function(){g(this,this.axis)};a.prototype.render=function(a){var c=this.axis.chart,e=this.options,g=e.format;g=g?r(g,this,c):e.formatter.call(this);this.label?this.label.attr({text:g,visibility:"hidden"}):
-(this.label=c.renderer.label(g,null,null,e.shape,null,null,e.useHTML,!1,"stack-labels"),g={r:e.borderRadius||0,text:g,rotation:e.rotation,padding:f(e.padding,5),visibility:"hidden"},c.styledMode||(g.fill=e.backgroundColor,g.stroke=e.borderColor,g["stroke-width"]=e.borderWidth,this.label.css(e.style)),this.label.attr(g),this.label.added||this.label.add(a));this.label.labelrank=c.plotSizeY};a.prototype.setOffset=function(a,c,g,l,n){var k=this.axis,h=k.chart;l=k.translate(k.stacking.usePercentage?100:
-l?l:this.total,0,0,0,1);g=k.translate(g?g:0);g=m(l)&&Math.abs(l-g);a=f(n,h.xAxis[0].translate(this.x))+a;k=m(l)&&this.getStackBox(h,this,a,l,c,g,k);c=this.label;g=this.isNegative;a="justify"===f(this.options.overflow,"justify");var d=this.textAlign;c&&k&&(n=c.getBBox(),l=c.padding,d="left"===d?h.inverted?-l:l:"right"===d?n.width:h.inverted&&"center"===d?n.width/2:h.inverted?g?n.width+l:-l:n.width/2,g=h.inverted?n.height/2:g?-l:n.height,this.alignOptions.x=f(this.options.x,0),this.alignOptions.y=f(this.options.y,
-0),k.x-=d,k.y-=g,c.align(this.alignOptions,null,k),h.isInsidePlot(c.alignAttr.x+d-this.alignOptions.x,c.alignAttr.y+g-this.alignOptions.y)?c.show():(c.alignAttr.y=-9999,a=!1),a&&z.prototype.justifyDataLabel.call(this.axis,c,this.alignOptions,c.alignAttr,n,k),c.attr({x:c.alignAttr.x,y:c.alignAttr.y}),f(!a&&this.options.crop,!0)&&((h=e(c.x)&&e(c.y)&&h.isInsidePlot(c.x-l+c.width,c.y)&&h.isInsidePlot(c.x+l,c.y))||c.hide()))};a.prototype.getStackBox=function(a,c,e,f,g,l,h){var d=c.axis.reversed,b=a.inverted,
-k=h.height+h.pos-(b?a.plotLeft:a.plotTop);c=c.isNegative&&!d||!c.isNegative&&d;return{x:b?c?f-h.right:f-l+h.pos-a.plotLeft:e+a.xAxis[0].transB-a.plotLeft,y:b?h.height-e-g:c?k-f-l:k-f,width:b?l:g,height:b?g:l}};return a}();w.prototype.getStacks=function(){var a=this,c=a.inverted;a.yAxis.forEach(function(a){a.stacking&&a.stacking.stacks&&a.hasVisibleSeries&&(a.stacking.oldStacks=a.stacking.stacks)});a.series.forEach(function(e){var g=e.xAxis&&e.xAxis.options||{};!e.options.stacking||!0!==e.visible&&
-!1!==a.options.chart.ignoreHiddenSeries||(e.stackKey=[e.type,f(e.options.stack,""),c?g.top:g.left,c?g.height:g.width].join())})};x.compose(a);z.prototype.setGroupedPoints=function(){var a=this.yAxis.stacking;this.options.centerInCategory&&(this.is("column")||this.is("columnrange"))&&!this.options.stacking&&1<this.chart.series.length?z.prototype.setStackedPoints.call(this,"group"):a&&l(a.stacks,function(c,e){"group"===e.slice(-5)&&(l(c,function(a){return a.destroy()}),delete a.stacks[e])})};z.prototype.setStackedPoints=
-function(a){var e=a||this.options.stacking;if(e&&(!0===this.visible||!1===this.chart.options.chart.ignoreHiddenSeries)){var g=this.processedXData,l=this.processedYData,q=[],r=l.length,t=this.options,h=t.threshold,d=f(t.startFromThreshold&&h,0);t=t.stack;a=a?this.type+","+e:this.stackKey;var b="-"+a,p=this.negStacks,u=this.yAxis,y=u.stacking.stacks,x=u.stacking.oldStacks,F,w;u.stacking.stacksTouched+=1;for(w=0;w<r;w++){var z=g[w];var C=l[w];var E=this.getStackIndicator(E,z,this.index);var J=E.key;
-var H=(F=p&&C<(d?0:h))?b:a;y[H]||(y[H]={});y[H][z]||(x[H]&&x[H][z]?(y[H][z]=x[H][z],y[H][z].total=null):y[H][z]=new v(u,u.options.stackLabels,F,z,t));H=y[H][z];null!==C?(H.points[J]=H.points[this.index]=[f(H.cumulative,d)],m(H.cumulative)||(H.base=J),H.touched=u.stacking.stacksTouched,0<E.index&&!1===this.singleStacks&&(H.points[J][0]=H.points[this.index+","+z+",0"][0])):H.points[J]=H.points[this.index]=null;"percent"===e?(F=F?a:b,p&&y[F]&&y[F][z]?(F=y[F][z],H.total=F.total=Math.max(F.total,H.total)+
-Math.abs(C)||0):H.total=n(H.total+(Math.abs(C)||0))):"group"===e?(c(C)&&(C=C[0]),null!==C&&(H.total=(H.total||0)+1)):H.total=n(H.total+(C||0));H.cumulative="group"===e?(H.total||1)-1:f(H.cumulative,d)+(C||0);null!==C&&(H.points[J].push(H.cumulative),q[w]=H.cumulative,H.hasValidPoints=!0)}"percent"===e&&(u.stacking.usePercentage=!0);"group"!==e&&(this.stackedYData=q);u.stacking.oldStacks={}}};z.prototype.modifyStacks=function(){var a=this,c=a.stackKey,e=a.yAxis.stacking.stacks,f=a.processedXData,g,
-l=a.options.stacking;a[l+"Stacker"]&&[c,"-"+c].forEach(function(c){for(var h=f.length,d,b;h--;)if(d=f[h],g=a.getStackIndicator(g,d,a.index,c),b=(d=e[c]&&e[c][d])&&d.points[g.key])a[l+"Stacker"](b,d,h)})};z.prototype.percentStacker=function(a,c,e){c=c.total?100/c.total:0;a[0]=n(a[0]*c);a[1]=n(a[1]*c);this.stackedYData[e]=a[1]};z.prototype.getStackIndicator=function(a,c,e,f){!m(a)||a.x!==c||f&&a.key!==f?a={x:c,index:0,key:f}:a.index++;a.key=[e,c,a.index].join();return a};E.StackItem=v;"";return E.StackItem});
-M(a,"Series/Line/LineSeries.js",[a["Core/Color/Palette.js"],a["Core/Series/Series.js"],a["Core/Series/SeriesRegistry.js"],a["Core/Utilities.js"]],function(a,w,C,E){var r=this&&this.__extends||function(){var a=function(n,m){a=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(a,c){a.__proto__=c}||function(a,c){for(var e in c)c.hasOwnProperty(e)&&(a[e]=c[e])};return a(n,m)};return function(n,m){function g(){this.constructor=n}a(n,m);n.prototype=null===m?Object.create(m):(g.prototype=m.prototype,
-new g)}}(),x=E.defined,J=E.merge;E=function(u){function n(){var a=null!==u&&u.apply(this,arguments)||this;a.data=void 0;a.options=void 0;a.points=void 0;return a}r(n,u);n.prototype.drawGraph=function(){var m=this,g=this.options,c=(this.gappedPath||this.getGraphPath).call(this),e=this.chart.styledMode,l=[["graph","highcharts-graph"]];e||l[0].push(g.lineColor||this.color||a.neutralColor20,g.dashStyle);l=m.getZonesGraphs(l);l.forEach(function(a,l){var f=a[0],k=m[f],n=k?"animate":"attr";k?(k.endX=m.preventGraphAnimation?
-null:c.xMap,k.animate({d:c})):c.length&&(m[f]=k=m.chart.renderer.path(c).addClass(a[1]).attr({zIndex:1}).add(m.group));k&&!e&&(f={stroke:a[2],"stroke-width":g.lineWidth,fill:m.fillGraph&&m.color||"none"},a[3]?f.dashstyle=a[3]:"square"!==g.linecap&&(f["stroke-linecap"]=f["stroke-linejoin"]="round"),k[n](f).shadow(2>l&&g.shadow));k&&(k.startX=c.xMap,k.isArea=c.isArea)})};n.prototype.getGraphPath=function(a,g,c){var e=this,l=e.options,f=[],m=[],n,k=l.step;a=a||e.points;var r=a.reversed;r&&a.reverse();
-(k={right:1,center:2}[k]||k&&3)&&r&&(k=4-k);a=this.getValidPoints(a,!1,!(l.connectNulls&&!g&&!c));a.forEach(function(q,r){var v=q.plotX,t=q.plotY,h=a[r-1];(q.leftCliff||h&&h.rightCliff)&&!c&&(n=!0);q.isNull&&!x(g)&&0<r?n=!l.connectNulls:q.isNull&&!g?n=!0:(0===r||n?r=[["M",q.plotX,q.plotY]]:e.getPointSpline?r=[e.getPointSpline(a,q,r)]:k?(r=1===k?[["L",h.plotX,t]]:2===k?[["L",(h.plotX+v)/2,h.plotY],["L",(h.plotX+v)/2,t]]:[["L",v,h.plotY]],r.push(["L",v,t])):r=[["L",v,t]],m.push(q.x),k&&(m.push(q.x),
-2===k&&m.push(q.x)),f.push.apply(f,r),n=!1)});f.xMap=m;return e.graphPath=f};n.prototype.getZonesGraphs=function(a){this.zones.forEach(function(g,c){c=["zone-graph-"+c,"highcharts-graph highcharts-zone-graph-"+c+" "+(g.className||"")];this.chart.styledMode||c.push(g.color||this.color,g.dashStyle||this.options.dashStyle);a.push(c)},this);return a};n.defaultOptions=J(w.defaultOptions,{});return n}(w);C.registerSeriesType("line",E);"";return E});M(a,"Series/Area/AreaSeries.js",[a["Core/Color/Color.js"],
-a["Core/Legend/LegendSymbol.js"],a["Core/Series/SeriesRegistry.js"],a["Core/Utilities.js"]],function(a,w,C,E){var r=this&&this.__extends||function(){var a=function(c,e){a=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(a,c){a.__proto__=c}||function(a,c){for(var e in c)c.hasOwnProperty(e)&&(a[e]=c[e])};return a(c,e)};return function(c,e){function g(){this.constructor=c}a(c,e);c.prototype=null===e?Object.create(e):(g.prototype=e.prototype,new g)}}(),x=a.parse,J=C.seriesTypes.line;a=
-E.extend;var u=E.merge,n=E.objectEach,m=E.pick;E=function(a){function c(){var c=null!==a&&a.apply(this,arguments)||this;c.data=void 0;c.options=void 0;c.points=void 0;return c}r(c,a);c.prototype.drawGraph=function(){this.areaPath=[];a.prototype.drawGraph.apply(this);var c=this,g=this.areaPath,f=this.options,n=[["area","highcharts-area",this.color,f.fillColor]];this.zones.forEach(function(a,e){n.push(["zone-area-"+e,"highcharts-area highcharts-zone-area-"+e+" "+a.className,a.color||c.color,a.fillColor||
-f.fillColor])});n.forEach(function(a){var e=a[0],l=c[e],n=l?"animate":"attr",q={};l?(l.endX=c.preventGraphAnimation?null:g.xMap,l.animate({d:g})):(q.zIndex=0,l=c[e]=c.chart.renderer.path(g).addClass(a[1]).add(c.group),l.isArea=!0);c.chart.styledMode||(q.fill=m(a[3],x(a[2]).setOpacity(m(f.fillOpacity,.75)).get()));l[n](q);l.startX=g.xMap;l.shiftUnit=f.step?2:1})};c.prototype.getGraphPath=function(a){var c=J.prototype.getGraphPath,e=this.options,g=e.stacking,n=this.yAxis,k,r=[],u=[],B=this.index,x=
-n.stacking.stacks[this.stackKey],t=e.threshold,h=Math.round(n.getThreshold(e.threshold));e=m(e.connectNulls,"percent"===g);var d=function(b,d,c){var e=a[b];b=g&&x[e.x].points[B];var f=e[c+"Null"]||0;c=e[c+"Cliff"]||0;e=!0;if(c||f){var k=(f?b[0]:b[1])+c;var l=b[0]+c;e=!!f}else!g&&a[d]&&a[d].isNull&&(k=l=t);"undefined"!==typeof k&&(u.push({plotX:p,plotY:null===k?h:n.getThreshold(k),isNull:e,isCliff:!0}),r.push({plotX:p,plotY:null===l?h:n.getThreshold(l),doCurve:!1}))};a=a||this.points;g&&(a=this.getStackPoints(a));
-for(k=0;k<a.length;k++){g||(a[k].leftCliff=a[k].rightCliff=a[k].leftNull=a[k].rightNull=void 0);var b=a[k].isNull;var p=m(a[k].rectPlotX,a[k].plotX);var G=g?m(a[k].yBottom,h):h;if(!b||e)e||d(k,k-1,"left"),b&&!g&&e||(u.push(a[k]),r.push({x:k,plotX:p,plotY:G})),e||d(k,k+1,"right")}k=c.call(this,u,!0,!0);r.reversed=!0;b=c.call(this,r,!0,!0);(G=b[0])&&"M"===G[0]&&(b[0]=["L",G[1],G[2]]);b=k.concat(b);b.length&&b.push(["Z"]);c=c.call(this,u,!1,e);b.xMap=k.xMap;this.areaPath=b;return c};c.prototype.getStackPoints=
-function(a){var c=this,e=[],g=[],r=this.xAxis,k=this.yAxis,u=k.stacking.stacks[this.stackKey],x={},B=k.series,w=B.length,t=k.options.reversedStacks?1:-1,h=B.indexOf(c);a=a||this.points;if(this.options.stacking){for(var d=0;d<a.length;d++)a[d].leftNull=a[d].rightNull=void 0,x[a[d].x]=a[d];n(u,function(a,b){null!==a.total&&g.push(b)});g.sort(function(a,b){return a-b});var b=B.map(function(a){return a.visible});g.forEach(function(a,d){var f=0,l,n;if(x[a]&&!x[a].isNull)e.push(x[a]),[-1,1].forEach(function(e){var f=
-1===e?"rightNull":"leftNull",k=0,m=u[g[d+e]];if(m)for(var p=h;0<=p&&p<w;){var r=B[p].index;l=m.points[r];l||(r===c.index?x[a][f]=!0:b[p]&&(n=u[a].points[r])&&(k-=n[1]-n[0]));p+=t}x[a][1===e?"rightCliff":"leftCliff"]=k});else{for(var p=h;0<=p&&p<w;){if(l=u[a].points[B[p].index]){f=l[1];break}p+=t}f=m(f,0);f=k.translate(f,0,1,0,1);e.push({isNull:!0,plotX:r.translate(a,0,0,0,1),x:a,plotY:f,yBottom:f})}})}return e};c.defaultOptions=u(J.defaultOptions,{threshold:0});return c}(J);a(E.prototype,{singleStacks:!1,
-drawLegendSymbol:w.drawRectangle});C.registerSeriesType("area",E);"";return E});M(a,"Series/Spline/SplineSeries.js",[a["Core/Series/SeriesRegistry.js"],a["Core/Utilities.js"]],function(a,w){var r=this&&this.__extends||function(){var a=function(r,n){a=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(a,g){a.__proto__=g}||function(a,g){for(var c in g)g.hasOwnProperty(c)&&(a[c]=g[c])};return a(r,n)};return function(r,n){function m(){this.constructor=r}a(r,n);r.prototype=null===n?Object.create(n):
-(m.prototype=n.prototype,new m)}}(),E=a.seriesTypes.line,z=w.merge,x=w.pick;w=function(a){function u(){var n=null!==a&&a.apply(this,arguments)||this;n.data=void 0;n.options=void 0;n.points=void 0;return n}r(u,a);u.prototype.getPointSpline=function(a,m,g){var c=m.plotX||0,e=m.plotY||0,l=a[g-1];g=a[g+1];if(l&&!l.isNull&&!1!==l.doCurve&&!m.isCliff&&g&&!g.isNull&&!1!==g.doCurve&&!m.isCliff){a=l.plotY||0;var f=g.plotX||0;g=g.plotY||0;var n=0;var r=(1.5*c+(l.plotX||0))/2.5;var k=(1.5*e+a)/2.5;f=(1.5*c+
-f)/2.5;var u=(1.5*e+g)/2.5;f!==r&&(n=(u-k)*(f-c)/(f-r)+e-u);k+=n;u+=n;k>a&&k>e?(k=Math.max(a,e),u=2*e-k):k<a&&k<e&&(k=Math.min(a,e),u=2*e-k);u>g&&u>e?(u=Math.max(g,e),k=2*e-u):u<g&&u<e&&(u=Math.min(g,e),k=2*e-u);m.rightContX=f;m.rightContY=u}m=["C",x(l.rightContX,l.plotX,0),x(l.rightContY,l.plotY,0),x(r,c,0),x(k,e,0),c,e];l.rightContX=l.rightContY=void 0;return m};u.defaultOptions=z(E.defaultOptions);return u}(E);a.registerSeriesType("spline",w);"";return w});M(a,"Series/AreaSpline/AreaSplineSeries.js",
-[a["Series/Area/AreaSeries.js"],a["Series/Spline/SplineSeries.js"],a["Core/Legend/LegendSymbol.js"],a["Core/Series/SeriesRegistry.js"],a["Core/Utilities.js"]],function(a,w,C,E,z){var r=this&&this.__extends||function(){var a=function(g,c){a=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(a,c){a.__proto__=c}||function(a,c){for(var e in c)c.hasOwnProperty(e)&&(a[e]=c[e])};return a(g,c)};return function(g,c){function e(){this.constructor=g}a(g,c);g.prototype=null===c?Object.create(c):
-(e.prototype=c.prototype,new e)}}(),J=a.prototype,u=z.extend,n=z.merge;z=function(m){function g(){var a=null!==m&&m.apply(this,arguments)||this;a.data=void 0;a.points=void 0;a.options=void 0;return a}r(g,m);g.defaultOptions=n(w.defaultOptions,a.defaultOptions);return g}(w);u(z.prototype,{getGraphPath:J.getGraphPath,getStackPoints:J.getStackPoints,drawGraph:J.drawGraph,drawLegendSymbol:C.drawRectangle});E.registerSeriesType("areaspline",z);"";return z});M(a,"Series/Column/ColumnSeries.js",[a["Core/Animation/AnimationUtilities.js"],
-a["Core/Color/Color.js"],a["Core/Globals.js"],a["Core/Legend/LegendSymbol.js"],a["Core/Color/Palette.js"],a["Core/Series/Series.js"],a["Core/Series/SeriesRegistry.js"],a["Core/Utilities.js"]],function(a,w,C,E,z,x,J,u){var n=this&&this.__extends||function(){var a=function(c,d){a=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(a,d){a.__proto__=d}||function(a,d){for(var b in d)d.hasOwnProperty(b)&&(a[b]=d[b])};return a(c,d)};return function(c,d){function b(){this.constructor=c}a(c,d);
-c.prototype=null===d?Object.create(d):(b.prototype=d.prototype,new b)}}(),m=a.animObject,g=w.parse,c=C.hasTouch;a=C.noop;var e=u.clamp,l=u.css,f=u.defined,r=u.extend,q=u.fireEvent,k=u.isArray,I=u.isNumber,D=u.merge,B=u.pick,O=u.objectEach;u=function(a){function h(){var d=null!==a&&a.apply(this,arguments)||this;d.borderWidth=void 0;d.data=void 0;d.group=void 0;d.options=void 0;d.points=void 0;return d}n(h,a);h.prototype.animate=function(a){var b=this,d=this.yAxis,c=b.options,h=this.chart.inverted,
-f={},g=h?"translateX":"translateY";if(a)f.scaleY=.001,a=e(d.toPixels(c.threshold),d.pos,d.pos+d.len),h?f.translateX=a-d.len:f.translateY=a,b.clipBox&&b.setClip(),b.group.attr(f);else{var k=Number(b.group.attr(g));b.group.animate({scaleY:1},r(m(b.options.animation),{step:function(a,c){b.group&&(f[g]=k+c.pos*(d.pos-k),b.group.attr(f))}}))}};h.prototype.init=function(d,b){a.prototype.init.apply(this,arguments);var c=this;d=c.chart;d.hasRendered&&d.series.forEach(function(a){a.type===c.type&&(a.isDirty=
-!0)})};h.prototype.getColumnMetrics=function(){var a=this,b=a.options,c=a.xAxis,e=a.yAxis,h=c.options.reversedStacks;h=c.reversed&&!h||!c.reversed&&h;var f={},g,k=0;!1===b.grouping?k=1:a.chart.series.forEach(function(b){var d=b.yAxis,c=b.options;if(b.type===a.type&&(b.visible||!a.chart.options.chart.ignoreHiddenSeries)&&e.len===d.len&&e.pos===d.pos){if(c.stacking&&"group"!==c.stacking){g=b.stackKey;"undefined"===typeof f[g]&&(f[g]=k++);var h=f[g]}else!1!==c.grouping&&(h=k++);b.columnIndex=h}});var l=
-Math.min(Math.abs(c.transA)*(c.ordinal&&c.ordinal.slope||b.pointRange||c.closestPointRange||c.tickInterval||1),c.len),m=l*b.groupPadding,n=(l-2*m)/(k||1);b=Math.min(b.maxPointWidth||c.len,B(b.pointWidth,n*(1-2*b.pointPadding)));a.columnMetrics={width:b,offset:(n-b)/2+(m+((a.columnIndex||0)+(h?1:0))*n-l/2)*(h?-1:1),paddedWidth:n,columnCount:k};return a.columnMetrics};h.prototype.crispCol=function(a,b,c,e){var d=this.chart,h=this.borderWidth,f=-(h%2?.5:0);h=h%2?.5:1;d.inverted&&d.renderer.isVML&&(h+=
-1);this.options.crisp&&(c=Math.round(a+c)+f,a=Math.round(a)+f,c-=a);e=Math.round(b+e)+h;f=.5>=Math.abs(b)&&.5<e;b=Math.round(b)+h;e-=b;f&&e&&(--b,e+=1);return{x:a,y:b,width:c,height:e}};h.prototype.adjustForMissingColumns=function(a,b,c,e){var d=this,h=this.options.stacking;if(!c.isNull&&1<e.columnCount){var f=0,g=0;O(this.yAxis.stacking&&this.yAxis.stacking.stacks,function(a){if("number"===typeof c.x&&(a=a[c.x.toString()])){var b=a.points[d.index],e=a.total;h?(b&&(f=g),a.hasValidPoints&&g++):k(b)&&
-(f=b[1],g=e||0)}});a=(c.plotX||0)+((g-1)*e.paddedWidth+b)/2-b-f*e.paddedWidth}return a};h.prototype.translate=function(){var a=this,b=a.chart,c=a.options,h=a.dense=2>a.closestPointRange*a.xAxis.transA;h=a.borderWidth=B(c.borderWidth,h?0:1);var g=a.xAxis,k=a.yAxis,l=c.threshold,m=a.translatedThreshold=k.getThreshold(l),n=B(c.minPointLength,5),r=a.getColumnMetrics(),t=r.width,q=a.pointXOffset=r.offset,v=a.dataMin,u=a.dataMax,w=a.barW=Math.max(t,1+2*h);b.inverted&&(m-=.5);c.pointPadding&&(w=Math.ceil(w));
-x.prototype.translate.apply(a);a.points.forEach(function(d){var h=B(d.yBottom,m),p=999+Math.abs(h),y=d.plotX||0;p=e(d.plotY,-p,k.len+p);var x=Math.min(p,h),F=Math.max(p,h)-x,D=t,G=y+q,z=w;n&&Math.abs(F)<n&&(F=n,y=!k.reversed&&!d.negative||k.reversed&&d.negative,I(l)&&I(u)&&d.y===l&&u<=l&&(k.min||0)<l&&(v!==u||(k.max||0)<=l)&&(y=!y),x=Math.abs(x-m)>n?h-n:m-(y?n:0));f(d.options.pointWidth)&&(D=z=Math.ceil(d.options.pointWidth),G-=Math.round((D-t)/2));c.centerInCategory&&(G=a.adjustForMissingColumns(G,
-D,d,r));d.barX=G;d.pointWidth=D;d.tooltipPos=b.inverted?[e(k.len+k.pos-b.plotLeft-p,k.pos-b.plotLeft,k.len+k.pos-b.plotLeft),g.len+g.pos-b.plotTop-G-z/2,F]:[g.left-b.plotLeft+G+z/2,e(p+k.pos-b.plotTop,k.pos-b.plotTop,k.len+k.pos-b.plotTop),F];d.shapeType=a.pointClass.prototype.shapeType||"rect";d.shapeArgs=a.crispCol.apply(a,d.isNull?[G,m,z,0]:[G,x,z,F])})};h.prototype.drawGraph=function(){this.group[this.dense?"addClass":"removeClass"]("highcharts-dense-data")};h.prototype.pointAttribs=function(a,
-b){var d=this.options,c=this.pointAttrToOptions||{},e=c.stroke||"borderColor",h=c["stroke-width"]||"borderWidth",f=a&&a.color||this.color,k=a&&a[e]||d[e]||f;c=a&&a.options.dashStyle||d.dashStyle;var l=a&&a[h]||d[h]||this[h]||0,m=B(a&&a.opacity,d.opacity,1);if(a&&this.zones.length){var n=a.getZone();f=a.options.color||n&&(n.color||a.nonZonedColor)||this.color;n&&(k=n.borderColor||k,c=n.dashStyle||c,l=n.borderWidth||l)}b&&a&&(a=D(d.states[b],a.options.states&&a.options.states[b]||{}),b=a.brightness,
-f=a.color||"undefined"!==typeof b&&g(f).brighten(a.brightness).get()||f,k=a[e]||k,l=a[h]||l,c=a.dashStyle||c,m=B(a.opacity,m));e={fill:f,stroke:k,"stroke-width":l,opacity:m};c&&(e.dashstyle=c);return e};h.prototype.drawPoints=function(){var a=this,b=this.chart,c=a.options,e=b.renderer,h=c.animationLimit||250,f;a.points.forEach(function(d){var g=d.graphic,k=!!g,l=g&&b.pointCount<h?"animate":"attr";if(I(d.plotY)&&null!==d.y){f=d.shapeArgs;g&&d.hasNewShapeType()&&(g=g.destroy());a.enabledDataSorting&&
-(d.startXPos=a.xAxis.reversed?-(f?f.width||0:0):a.xAxis.width);g||(d.graphic=g=e[d.shapeType](f).add(d.group||a.group))&&a.enabledDataSorting&&b.hasRendered&&b.pointCount<h&&(g.attr({x:d.startXPos}),k=!0,l="animate");if(g&&k)g[l](D(f));if(c.borderRadius)g[l]({r:c.borderRadius});b.styledMode||g[l](a.pointAttribs(d,d.selected&&"select")).shadow(!1!==d.allowShadow&&c.shadow,null,c.stacking&&!c.borderRadius);g&&(g.addClass(d.getClassName(),!0),g.attr({visibility:d.visible?"inherit":"hidden"}))}else g&&
-(d.graphic=g.destroy())})};h.prototype.drawTracker=function(){var a=this,b=a.chart,e=b.pointer,h=function(a){var b=e.getPointFromEvent(a);"undefined"!==typeof b&&(e.isDirectTouch=!0,b.onMouseOver(a))},f;a.points.forEach(function(a){f=k(a.dataLabels)?a.dataLabels:a.dataLabel?[a.dataLabel]:[];a.graphic&&(a.graphic.element.point=a);f.forEach(function(b){b.div?b.div.point=a:b.element.point=a})});a._hasTracking||(a.trackerGroups.forEach(function(d){if(a[d]){a[d].addClass("highcharts-tracker").on("mouseover",
-h).on("mouseout",function(a){e.onTrackerMouseOut(a)});if(c)a[d].on("touchstart",h);!b.styledMode&&a.options.cursor&&a[d].css(l).css({cursor:a.options.cursor})}}),a._hasTracking=!0);q(this,"afterDrawTracker")};h.prototype.remove=function(){var a=this,b=a.chart;b.hasRendered&&b.series.forEach(function(b){b.type===a.type&&(b.isDirty=!0)});x.prototype.remove.apply(a,arguments)};h.defaultOptions=D(x.defaultOptions,{borderRadius:0,centerInCategory:!1,groupPadding:.2,marker:null,pointPadding:.1,minPointLength:0,
-cropThreshold:50,pointRange:null,states:{hover:{halo:!1,brightness:.1},select:{color:z.neutralColor20,borderColor:z.neutralColor100}},dataLabels:{align:void 0,verticalAlign:void 0,y:void 0},startFromThreshold:!0,stickyTracking:!1,tooltip:{distance:6},threshold:0,borderColor:z.backgroundColor});return h}(x);r(u.prototype,{cropShoulder:0,directTouch:!0,drawLegendSymbol:E.drawRectangle,getSymbol:a,negStacks:!0,trackerGroups:["group","dataLabelsGroup"]});J.registerSeriesType("column",u);"";"";return u});
-M(a,"Core/Series/DataLabel.js",[a["Core/Animation/AnimationUtilities.js"],a["Core/FormatUtilities.js"],a["Core/Color/Palette.js"],a["Core/Utilities.js"]],function(a,w,C,E){var r=a.getDeferredAnimation,x=w.format,J=E.defined,u=E.extend,n=E.fireEvent,m=E.isArray,g=E.merge,c=E.objectEach,e=E.pick,l=E.splat,f;(function(a){function f(a,c,b,f,g){var d=this,h=this.chart,k=this.isCartesian&&h.inverted,l=this.enabledDataSorting,m=e(a.dlBox&&a.dlBox.centerX,a.plotX,-9999),n=e(a.plotY,-9999),p=c.getBBox(),r=
-b.rotation,t=b.align,q=h.isInsidePlot(m,Math.round(n),{inverted:k,paneCoordinates:!0,series:d}),v=function(b){l&&d.xAxis&&!B&&d.setDataLabelStartPos(a,c,g,q,b)},B="justify"===e(b.overflow,l?"none":"justify"),x=this.visible&&!1!==a.visible&&(a.series.forceDL||l&&!B||q||e(b.inside,!!this.options.stacking)&&f&&h.isInsidePlot(m,k?f.x+1:f.y+f.height-1,{inverted:k,paneCoordinates:!0,series:d}));if(x){var w=h.renderer.fontMetrics(h.styledMode?void 0:b.style.fontSize,c).b;f=u({x:k?this.yAxis.len-n:m,y:Math.round(k?
-this.xAxis.len-m:n),width:0,height:0},f);u(b,{width:p.width,height:p.height});r?(B=!1,m=h.renderer.rotCorr(w,r),m={x:f.x+(b.x||0)+f.width/2+m.x,y:f.y+(b.y||0)+{top:0,middle:.5,bottom:1}[b.verticalAlign]*f.height},v(m),c[g?"attr":"animate"](m).attr({align:t}),v=(r+720)%360,v=180<v&&360>v,"left"===t?m.y-=v?p.height:0:"center"===t?(m.x-=p.width/2,m.y-=p.height/2):"right"===t&&(m.x-=p.width,m.y-=v?0:p.height),c.placed=!0,c.alignAttr=m):(v(f),c.align(b,void 0,f),m=c.alignAttr);B&&0<=f.height?this.justifyDataLabel(c,
-b,m,p,f,g):e(b.crop,!0)&&(x=h.isInsidePlot(m.x,m.y,{paneCoordinates:!0,series:d})&&h.isInsidePlot(m.x+p.width,m.y+p.height,{paneCoordinates:!0,series:d}));if(b.shape&&!r)c[g?"attr":"animate"]({anchorX:k?h.plotWidth-a.plotY:a.plotX,anchorY:k?h.plotHeight-a.plotX:a.plotY})}g&&l&&(c.placed=!1);x||l&&!B||(c.hide(!0),c.placed=!1)}function k(a,c){var b=c.filter;return b?(c=b.operator,a=a[b.property],b=b.value,">"===c&&a>b||"<"===c&&a<b||">="===c&&a>=b||"<="===c&&a<=b||"=="===c&&a==b||"==="===c&&a===b?!0:
-!1):!0}function v(){var a=this,d=a.chart,b=a.options,f=a.points,g=a.hasRendered||0,t=d.renderer,q=b.dataLabels,v,u=q.animation;u=q.defer?r(d,u,a):{defer:0,duration:0};q=B(B(d.options.plotOptions&&d.options.plotOptions.series&&d.options.plotOptions.series.dataLabels,d.options.plotOptions&&d.options.plotOptions[a.type]&&d.options.plotOptions[a.type].dataLabels),q);n(this,"drawDataLabels");if(m(q)||q.enabled||a._hasPointLabels){var w=a.plotGroup("dataLabelsGroup","data-labels",g?"inherit":"hidden",q.zIndex||
-6);w.attr({opacity:+g});!g&&(g=a.dataLabelsGroup)&&(a.visible&&w.show(!0),g[b.animation?"animate":"attr"]({opacity:1},u));f.forEach(function(f){v=l(B(q,f.dlOptions||f.options&&f.options.dataLabels));v.forEach(function(h,g){var l=h.enabled&&(!f.isNull||f.dataLabelOnNull)&&k(f,h),m=f.connectors?f.connectors[g]:f.connector,n=f.dataLabels?f.dataLabels[g]:f.dataLabel,p=e(h.distance,f.labelDistance),r=!n;if(l){var q=f.getLabelConfig();var v=e(h[f.formatPrefix+"Format"],h.format);q=J(v)?x(v,q,d):(h[f.formatPrefix+
-"Formatter"]||h.formatter).call(q,h);v=h.style;var u=h.rotation;d.styledMode||(v.color=e(h.color,v.color,a.color,C.neutralColor100),"contrast"===v.color?(f.contrastColor=t.getContrast(f.color||a.color),v.color=!J(p)&&h.inside||0>p||b.stacking?f.contrastColor:C.neutralColor100):delete f.contrastColor,b.cursor&&(v.cursor=b.cursor));var B={r:h.borderRadius||0,rotation:u,padding:h.padding,zIndex:1};d.styledMode||(B.fill=h.backgroundColor,B.stroke=h.borderColor,B["stroke-width"]=h.borderWidth);c(B,function(a,
-b){"undefined"===typeof a&&delete B[b]})}!n||l&&J(q)?l&&J(q)&&(n?B.text=q:(f.dataLabels=f.dataLabels||[],n=f.dataLabels[g]=u?t.text(q,0,-9999,h.useHTML).addClass("highcharts-data-label"):t.label(q,0,-9999,h.shape,null,null,h.useHTML,null,"data-label"),g||(f.dataLabel=n),n.addClass(" highcharts-data-label-color-"+f.colorIndex+" "+(h.className||"")+(h.useHTML?" highcharts-tracker":""))),n.options=h,n.attr(B),d.styledMode||n.css(v).shadow(h.shadow),n.added||n.add(w),h.textPath&&!h.useHTML&&(n.setTextPath(f.getDataLabelPath&&
-f.getDataLabelPath(n)||f.graphic,h.textPath),f.dataLabelPath&&!h.textPath.enabled&&(f.dataLabelPath=f.dataLabelPath.destroy())),a.alignDataLabel(f,n,h,null,r)):(f.dataLabel=f.dataLabel&&f.dataLabel.destroy(),f.dataLabels&&(1===f.dataLabels.length?delete f.dataLabels:delete f.dataLabels[g]),g||delete f.dataLabel,m&&(f.connector=f.connector.destroy(),f.connectors&&(1===f.connectors.length?delete f.connectors:delete f.connectors[g])))})})}n(this,"afterDrawDataLabels")}function w(a,c,b,e,f,g){var d=this.chart,
-h=c.align,k=c.verticalAlign,l=a.box?0:a.padding||0,m=c.x;m=void 0===m?0:m;var n=c.y;n=void 0===n?0:n;var p=(b.x||0)+l;if(0>p){"right"===h&&0<=m?(c.align="left",c.inside=!0):m-=p;var r=!0}p=(b.x||0)+e.width-l;p>d.plotWidth&&("left"===h&&0>=m?(c.align="right",c.inside=!0):m+=d.plotWidth-p,r=!0);p=b.y+l;0>p&&("bottom"===k&&0<=n?(c.verticalAlign="top",c.inside=!0):n-=p,r=!0);p=(b.y||0)+e.height-l;p>d.plotHeight&&("top"===k&&0>=n?(c.verticalAlign="bottom",c.inside=!0):n+=d.plotHeight-p,r=!0);r&&(c.x=m,
-c.y=n,a.placed=!g,a.align(c,void 0,f));return r}function B(a,c){var b=[],d;if(m(a)&&!m(c))b=a.map(function(a){return g(a,c)});else if(m(c)&&!m(a))b=c.map(function(b){return g(a,b)});else if(m(a)||m(c))for(d=Math.max(a.length,c.length);d--;)b[d]=g(a[d],c[d]);else b=g(a,c);return b}function z(a,c,b,e,f){var d=this.chart,h=d.inverted,g=this.xAxis,k=g.reversed,l=h?c.height/2:c.width/2;a=(a=a.pointWidth)?a/2:0;c.startXPos=h?f.x:k?-l-a:g.width-l+a;c.startYPos=h?k?this.yAxis.height-l+a:-l-a:f.y;e?"hidden"===
-c.visibility&&(c.show(),c.attr({opacity:0}).animate({opacity:1})):c.attr({opacity:1}).animate({opacity:0},void 0,c.hide);d.hasRendered&&(b&&c.attr({x:c.startXPos,y:c.startYPos}),c.placed=!0)}var t=[];a.compose=function(a){if(-1===t.indexOf(a)){var c=a.prototype;t.push(a);c.alignDataLabel=f;c.drawDataLabels=v;c.justifyDataLabel=w;c.setDataLabelStartPos=z}}})(f||(f={}));"";return f});M(a,"Series/Column/ColumnDataLabel.js",[a["Core/Series/DataLabel.js"],a["Core/Series/SeriesRegistry.js"],a["Core/Utilities.js"]],
-function(a,w,C){var r=w.series,z=C.merge,x=C.pick,J;(function(u){function n(a,c,e,l,f){var g=this.chart.inverted,m=a.series,k=a.dlBox||a.shapeArgs,n=x(a.below,a.plotY>x(this.translatedThreshold,m.yAxis.len)),u=x(e.inside,!!this.options.stacking);k&&(l=z(k),0>l.y&&(l.height+=l.y,l.y=0),k=l.y+l.height-m.yAxis.len,0<k&&k<l.height&&(l.height-=k),g&&(l={x:m.yAxis.len-l.y-l.height,y:m.xAxis.len-l.x-l.width,width:l.height,height:l.width}),u||(g?(l.x+=n?0:l.width,l.width=0):(l.y+=n?l.height:0,l.height=0)));
-e.align=x(e.align,!g||u?"center":n?"right":"left");e.verticalAlign=x(e.verticalAlign,g||u?"middle":n?"top":"bottom");r.prototype.alignDataLabel.call(this,a,c,e,l,f);e.inside&&a.contrastColor&&c.css({color:a.contrastColor})}var m=[];u.compose=function(g){a.compose(r);-1===m.indexOf(g)&&(m.push(g),g.prototype.alignDataLabel=n)}})(J||(J={}));return J});M(a,"Series/Bar/BarSeries.js",[a["Series/Column/ColumnSeries.js"],a["Core/Series/SeriesRegistry.js"],a["Core/Utilities.js"]],function(a,w,C){var r=this&&
-this.__extends||function(){var a=function(r,n){a=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(a,g){a.__proto__=g}||function(a,g){for(var c in g)g.hasOwnProperty(c)&&(a[c]=g[c])};return a(r,n)};return function(r,n){function m(){this.constructor=r}a(r,n);r.prototype=null===n?Object.create(n):(m.prototype=n.prototype,new m)}}(),z=C.extend,x=C.merge;C=function(w){function u(){var a=null!==w&&w.apply(this,arguments)||this;a.data=void 0;a.options=void 0;a.points=void 0;return a}r(u,w);
-u.defaultOptions=x(a.defaultOptions,{});return u}(a);z(C.prototype,{inverted:!0});w.registerSeriesType("bar",C);"";return C});M(a,"Series/Scatter/ScatterSeries.js",[a["Series/Column/ColumnSeries.js"],a["Series/Line/LineSeries.js"],a["Core/Series/SeriesRegistry.js"],a["Core/Utilities.js"]],function(a,w,C,E){var r=this&&this.__extends||function(){var a=function(m,g){a=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(a,e){a.__proto__=e}||function(a,e){for(var c in e)e.hasOwnProperty(c)&&
-(a[c]=e[c])};return a(m,g)};return function(m,g){function c(){this.constructor=m}a(m,g);m.prototype=null===g?Object.create(g):(c.prototype=g.prototype,new c)}}(),x=E.addEvent,J=E.extend,u=E.merge;E=function(a){function m(){var g=null!==a&&a.apply(this,arguments)||this;g.data=void 0;g.options=void 0;g.points=void 0;return g}r(m,a);m.prototype.applyJitter=function(){var a=this,c=this.options.jitter,e=this.points.length;c&&this.points.forEach(function(g,f){["x","y"].forEach(function(l,m){var k="plot"+
-l.toUpperCase();if(c[l]&&!g.isNull){var n=a[l+"Axis"];var r=c[l]*n.transA;if(n&&!n.isLog){var q=Math.max(0,g[k]-r);n=Math.min(n.len,g[k]+r);m=1E4*Math.sin(f+m*e);g[k]=q+(n-q)*(m-Math.floor(m));"x"===l&&(g.clientX=g.plotX)}}})})};m.prototype.drawGraph=function(){this.options.lineWidth?a.prototype.drawGraph.call(this):this.graph&&(this.graph=this.graph.destroy())};m.defaultOptions=u(w.defaultOptions,{lineWidth:0,findNearestPointBy:"xy",jitter:{x:0,y:0},marker:{enabled:!0},tooltip:{headerFormat:'<span style="color:{point.color}">\u25cf</span> <span style="font-size: 10px"> {series.name}</span><br/>',
-pointFormat:"x: <b>{point.x}</b><br/>y: <b>{point.y}</b><br/>"}});return m}(w);J(E.prototype,{drawTracker:a.prototype.drawTracker,sorted:!1,requireSorting:!1,noSharedTooltip:!0,trackerGroups:["group","markerGroup","dataLabelsGroup"],takeOrdinalPosition:!1});x(E,"afterTranslate",function(){this.applyJitter()});C.registerSeriesType("scatter",E);"";return E});M(a,"Mixins/CenteredSeries.js",[a["Core/Globals.js"],a["Core/Series/Series.js"],a["Core/Utilities.js"]],function(a,w,C){var r=C.isNumber,z=C.pick,
-x=C.relativeLength,J=a.deg2rad;return a.CenteredSeriesMixin={getCenter:function(){var a=this.options,n=this.chart,m=2*(a.slicedOffset||0),g=n.plotWidth-2*m,c=n.plotHeight-2*m,e=a.center,l=Math.min(g,c),f=a.size,r=a.innerSize||0;"string"===typeof f&&(f=parseFloat(f));"string"===typeof r&&(r=parseFloat(r));a=[z(e[0],"50%"),z(e[1],"50%"),z(f&&0>f?void 0:a.size,"100%"),z(r&&0>r?void 0:a.innerSize||0,"0%")];!n.angular||this instanceof w||(a[3]=0);for(e=0;4>e;++e)f=a[e],n=2>e||2===e&&/%$/.test(f),a[e]=
-x(f,[g,c,l,a[2]][e])+(n?m:0);a[3]>a[2]&&(a[3]=a[2]);return a},getStartAndEndRadians:function(a,n){a=r(a)?a:0;n=r(n)&&n>a&&360>n-a?n:a+360;return{start:J*(a+-90),end:J*(n+-90)}}}});M(a,"Series/Pie/PiePoint.js",[a["Core/Animation/AnimationUtilities.js"],a["Core/Series/Point.js"],a["Core/Utilities.js"]],function(a,w,C){var r=this&&this.__extends||function(){var a=function(c,e){a=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(a,c){a.__proto__=c}||function(a,c){for(var e in c)c.hasOwnProperty(e)&&
-(a[e]=c[e])};return a(c,e)};return function(c,e){function g(){this.constructor=c}a(c,e);c.prototype=null===e?Object.create(e):(g.prototype=e.prototype,new g)}}(),z=a.setAnimation,x=C.addEvent,J=C.defined;a=C.extend;var u=C.isNumber,n=C.pick,m=C.relativeLength;w=function(a){function c(){var c=null!==a&&a.apply(this,arguments)||this;c.labelDistance=void 0;c.options=void 0;c.series=void 0;return c}r(c,a);c.prototype.getConnectorPath=function(){var a=this.labelPosition,c=this.series.options.dataLabels,
-f=this.connectorShapes,g=c.connectorShape;f[g]&&(g=f[g]);return g.call(this,{x:a.final.x,y:a.final.y,alignment:a.alignment},a.connectorPosition,c)};c.prototype.getTranslate=function(){return this.sliced?this.slicedTranslation:{translateX:0,translateY:0}};c.prototype.haloPath=function(a){var c=this.shapeArgs;return this.sliced||!this.visible?[]:this.series.chart.renderer.symbols.arc(c.x,c.y,c.r+a,c.r+a,{innerR:c.r-1,start:c.start,end:c.end})};c.prototype.init=function(){var c=this;a.prototype.init.apply(this,
-arguments);this.name=n(this.name,"Slice");var g=function(a){c.slice("select"===a.type)};x(this,"select",g);x(this,"unselect",g);return this};c.prototype.isValid=function(){return u(this.y)&&0<=this.y};c.prototype.setVisible=function(a,c){var e=this,g=this.series,l=g.chart,k=g.options.ignoreHiddenPoint;c=n(c,k);a!==this.visible&&(this.visible=this.options.visible=a="undefined"===typeof a?!this.visible:a,g.options.data[g.data.indexOf(this)]=this.options,["graphic","dataLabel","connector","shadowGroup"].forEach(function(c){if(e[c])e[c][a?
-"show":"hide"](a)}),this.legendItem&&l.legend.colorizeItem(this,a),a||"hover"!==this.state||this.setState(""),k&&(g.isDirty=!0),c&&l.redraw())};c.prototype.slice=function(a,c,f){var e=this.series;z(f,e.chart);n(c,!0);this.sliced=this.options.sliced=J(a)?a:!this.sliced;e.options.data[e.data.indexOf(this)]=this.options;this.graphic&&this.graphic.animate(this.getTranslate());this.shadowGroup&&this.shadowGroup.animate(this.getTranslate())};return c}(w);a(w.prototype,{connectorShapes:{fixedOffset:function(a,
-c,e){var g=c.breakAt;c=c.touchingSliceAt;return[["M",a.x,a.y],e.softConnector?["C",a.x+("left"===a.alignment?-5:5),a.y,2*g.x-c.x,2*g.y-c.y,g.x,g.y]:["L",g.x,g.y],["L",c.x,c.y]]},straight:function(a,c){c=c.touchingSliceAt;return[["M",a.x,a.y],["L",c.x,c.y]]},crookedLine:function(a,c,e){c=c.touchingSliceAt;var g=this.series,f=g.center[0],n=g.chart.plotWidth,r=g.chart.plotLeft;g=a.alignment;var k=this.shapeArgs.r;e=m(e.crookDistance,1);n="left"===g?f+k+(n+r-f-k)*(1-e):r+(f-k)*e;e=["L",n,a.y];f=!0;if("left"===
-g?n>a.x||n<c.x:n<a.x||n>c.x)f=!1;a=[["M",a.x,a.y]];f&&a.push(e);a.push(["L",c.x,c.y]);return a}}});return w});M(a,"Series/Pie/PieSeries.js",[a["Mixins/CenteredSeries.js"],a["Series/Column/ColumnSeries.js"],a["Core/Globals.js"],a["Core/Legend/LegendSymbol.js"],a["Core/Color/Palette.js"],a["Series/Pie/PiePoint.js"],a["Core/Series/Series.js"],a["Core/Series/SeriesRegistry.js"],a["Core/Renderer/SVG/Symbols.js"],a["Core/Utilities.js"]],function(a,w,C,E,z,x,J,u,n,m){var g=this&&this.__extends||function(){var a=
-function(c,e){a=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(a,c){a.__proto__=c}||function(a,c){for(var e in c)c.hasOwnProperty(e)&&(a[e]=c[e])};return a(c,e)};return function(c,e){function f(){this.constructor=c}a(c,e);c.prototype=null===e?Object.create(e):(f.prototype=e.prototype,new f)}}(),c=a.getStartAndEndRadians;C=C.noop;var e=m.clamp,l=m.extend,f=m.fireEvent,r=m.merge,q=m.pick,k=m.relativeLength;m=function(a){function l(){var c=null!==a&&a.apply(this,arguments)||this;c.center=
-void 0;c.data=void 0;c.maxLabelDistance=void 0;c.options=void 0;c.points=void 0;return c}g(l,a);l.prototype.animate=function(a){var c=this,e=c.points,f=c.startAngleRad;a||e.forEach(function(a){var b=a.graphic,d=a.shapeArgs;b&&d&&(b.attr({r:q(a.startR,c.center&&c.center[3]/2),start:f,end:f}),b.animate({r:d.r,start:d.start,end:d.end},c.options.animation))})};l.prototype.drawEmpty=function(){var a=this.startAngleRad,c=this.endAngleRad,e=this.options;if(0===this.total&&this.center){var f=this.center[0];
-var d=this.center[1];this.graph||(this.graph=this.chart.renderer.arc(f,d,this.center[1]/2,0,a,c).addClass("highcharts-empty-series").add(this.group));this.graph.attr({d:n.arc(f,d,this.center[2]/2,0,{start:a,end:c,innerR:this.center[3]/2})});this.chart.styledMode||this.graph.attr({"stroke-width":e.borderWidth,fill:e.fillColor||"none",stroke:e.color||z.neutralColor20})}else this.graph&&(this.graph=this.graph.destroy())};l.prototype.drawPoints=function(){var a=this.chart.renderer;this.points.forEach(function(c){c.graphic&&
-c.hasNewShapeType()&&(c.graphic=c.graphic.destroy());c.graphic||(c.graphic=a[c.shapeType](c.shapeArgs).add(c.series.group),c.delayedRendering=!0)})};l.prototype.generatePoints=function(){a.prototype.generatePoints.call(this);this.updateTotals()};l.prototype.getX=function(a,c,f){var h=this.center,d=this.radii?this.radii[f.index]||0:h[2]/2;a=Math.asin(e((a-h[1])/(d+f.labelDistance),-1,1));return h[0]+(c?-1:1)*Math.cos(a)*(d+f.labelDistance)+(0<f.labelDistance?(c?-1:1)*this.options.dataLabels.padding:
-0)};l.prototype.hasData=function(){return!!this.processedXData.length};l.prototype.redrawPoints=function(){var a=this,c=a.chart,e=c.renderer,f=a.options.shadow,d,b,g,k;this.drawEmpty();!f||a.shadowGroup||c.styledMode||(a.shadowGroup=e.g("shadow").attr({zIndex:-1}).add(a.group));a.points.forEach(function(h){var l={};b=h.graphic;if(!h.isNull&&b){var m=void 0;k=h.shapeArgs;d=h.getTranslate();c.styledMode||(m=h.shadowGroup,f&&!m&&(m=h.shadowGroup=e.g("shadow").add(a.shadowGroup)),m&&m.attr(d),g=a.pointAttribs(h,
-h.selected&&"select"));h.delayedRendering?(b.setRadialReference(a.center).attr(k).attr(d),c.styledMode||b.attr(g).attr({"stroke-linejoin":"round"}).shadow(f,m),h.delayedRendering=!1):(b.setRadialReference(a.center),c.styledMode||r(!0,l,g),r(!0,l,k,d),b.animate(l));b.attr({visibility:h.visible?"inherit":"hidden"});b.addClass(h.getClassName(),!0)}else b&&(h.graphic=b.destroy())})};l.prototype.sortByAngle=function(a,c){a.sort(function(a,e){return"undefined"!==typeof a.angle&&(e.angle-a.angle)*c})};l.prototype.translate=
-function(a){this.generatePoints();var e=this.options,g=e.slicedOffset,h=g+(e.borderWidth||0),d=c(e.startAngle,e.endAngle),b=this.startAngleRad=d.start;d=(this.endAngleRad=d.end)-b;var l=this.points,m=e.dataLabels.distance;e=e.ignoreHiddenPoint;var n=l.length,r,v=0;a||(this.center=a=this.getCenter());for(r=0;r<n;r++){var u=l[r];var x=b+v*d;!u.isValid()||e&&!u.visible||(v+=u.percentage/100);var w=b+v*d;var B={x:a[0],y:a[1],r:a[2]/2,innerR:a[3]/2,start:Math.round(1E3*x)/1E3,end:Math.round(1E3*w)/1E3};
-u.shapeType="arc";u.shapeArgs=B;u.labelDistance=q(u.options.dataLabels&&u.options.dataLabels.distance,m);u.labelDistance=k(u.labelDistance,B.r);this.maxLabelDistance=Math.max(this.maxLabelDistance||0,u.labelDistance);w=(w+x)/2;w>1.5*Math.PI?w-=2*Math.PI:w<-Math.PI/2&&(w+=2*Math.PI);u.slicedTranslation={translateX:Math.round(Math.cos(w)*g),translateY:Math.round(Math.sin(w)*g)};B=Math.cos(w)*a[2]/2;var z=Math.sin(w)*a[2]/2;u.tooltipPos=[a[0]+.7*B,a[1]+.7*z];u.half=w<-Math.PI/2||w>Math.PI/2?1:0;u.angle=
-w;x=Math.min(h,u.labelDistance/5);u.labelPosition={natural:{x:a[0]+B+Math.cos(w)*u.labelDistance,y:a[1]+z+Math.sin(w)*u.labelDistance},"final":{},alignment:0>u.labelDistance?"center":u.half?"right":"left",connectorPosition:{breakAt:{x:a[0]+B+Math.cos(w)*x,y:a[1]+z+Math.sin(w)*x},touchingSliceAt:{x:a[0]+B,y:a[1]+z}}}}f(this,"afterTranslate")};l.prototype.updateTotals=function(){var a=this.points,c=a.length,e=this.options.ignoreHiddenPoint,f,d=0;for(f=0;f<c;f++){var b=a[f];!b.isValid()||e&&!b.visible||
-(d+=b.y)}this.total=d;for(f=0;f<c;f++)b=a[f],b.percentage=0<d&&(b.visible||!e)?b.y/d*100:0,b.total=d};l.defaultOptions=r(J.defaultOptions,{center:[null,null],clip:!1,colorByPoint:!0,dataLabels:{allowOverlap:!0,connectorPadding:5,connectorShape:"fixedOffset",crookDistance:"70%",distance:30,enabled:!0,formatter:function(){return this.point.isNull?void 0:this.point.name},softConnector:!0,x:0},fillColor:void 0,ignoreHiddenPoint:!0,inactiveOtherPoints:!0,legendType:"point",marker:null,size:null,showInLegend:!1,
-slicedOffset:10,stickyTracking:!1,tooltip:{followPointer:!0},borderColor:z.backgroundColor,borderWidth:1,lineWidth:void 0,states:{hover:{brightness:.1}}});return l}(J);l(m.prototype,{axisTypes:[],directTouch:!0,drawGraph:void 0,drawLegendSymbol:E.drawRectangle,drawTracker:w.prototype.drawTracker,getCenter:a.getCenter,getSymbol:C,isCartesian:!1,noSharedTooltip:!0,pointAttribs:w.prototype.pointAttribs,pointClass:x,requireSorting:!1,searchPoint:C,trackerGroups:["group","dataLabelsGroup"]});u.registerSeriesType("pie",
-m);"";return m});M(a,"Series/Pie/PieDataLabel.js",[a["Core/Series/DataLabel.js"],a["Core/Globals.js"],a["Core/Color/Palette.js"],a["Core/Renderer/RendererUtilities.js"],a["Core/Series/SeriesRegistry.js"],a["Core/Utilities.js"]],function(a,w,C,E,z,x){var r=w.noop,u=E.distribute,n=z.series,m=x.arrayMax,g=x.clamp,c=x.defined,e=x.merge,l=x.pick,f=x.relativeLength,v;(function(q){function k(){var a=this,f=a.data,d=a.chart,b=a.options.dataLabels||{},g=b.connectorPadding,k=d.plotWidth,r=d.plotHeight,q=d.plotLeft,
-v=Math.round(d.chartWidth/3),w=a.center,x=w[2]/2,B=w[1],z=[[],[]],D=[0,0,0,0],E=a.dataLabelPositioners,I,J,M,O,Z,A,U,N,W,X,Y,T;a.visible&&(b.enabled||a._hasPointLabels)&&(f.forEach(function(a){a.dataLabel&&a.visible&&a.dataLabel.shortened&&(a.dataLabel.attr({width:"auto"}).css({width:"auto",textOverflow:"clip"}),a.dataLabel.shortened=!1)}),n.prototype.drawDataLabels.apply(a),f.forEach(function(a){a.dataLabel&&(a.visible?(z[a.half].push(a),a.dataLabel._pos=null,!c(b.style.width)&&!c(a.options.dataLabels&&
-a.options.dataLabels.style&&a.options.dataLabels.style.width)&&a.dataLabel.getBBox().width>v&&(a.dataLabel.css({width:Math.round(.7*v)+"px"}),a.dataLabel.shortened=!0)):(a.dataLabel=a.dataLabel.destroy(),a.dataLabels&&1===a.dataLabels.length&&delete a.dataLabels))}),z.forEach(function(e,f){var h=e.length,m=[],n;if(h){a.sortByAngle(e,f-.5);if(0<a.maxLabelDistance){var p=Math.max(0,B-x-a.maxLabelDistance);var t=Math.min(B+x+a.maxLabelDistance,d.plotHeight);e.forEach(function(a){0<a.labelDistance&&a.dataLabel&&
-(a.top=Math.max(0,B-x-a.labelDistance),a.bottom=Math.min(B+x+a.labelDistance,d.plotHeight),n=a.dataLabel.getBBox().height||21,a.distributeBox={target:a.labelPosition.natural.y-a.top+n/2,size:n,rank:a.y},m.push(a.distributeBox))});p=t+n-p;u(m,p,p/5)}for(Y=0;Y<h;Y++){I=e[Y];A=I.labelPosition;O=I.dataLabel;X=!1===I.visible?"hidden":"inherit";W=p=A.natural.y;m&&c(I.distributeBox)&&("undefined"===typeof I.distributeBox.pos?X="hidden":(U=I.distributeBox.size,W=E.radialDistributionY(I)));delete I.positionIndex;
-if(b.justify)N=E.justify(I,x,w);else switch(b.alignTo){case "connectors":N=E.alignToConnectors(e,f,k,q);break;case "plotEdges":N=E.alignToPlotEdges(O,f,k,q);break;default:N=E.radialDistributionX(a,I,W,p)}O._attr={visibility:X,align:A.alignment};T=I.options.dataLabels||{};O._pos={x:N+l(T.x,b.x)+({left:g,right:-g}[A.alignment]||0),y:W+l(T.y,b.y)-10};A.final.x=N;A.final.y=W;l(b.crop,!0)&&(Z=O.getBBox().width,p=null,N-Z<g&&1===f?(p=Math.round(Z-N+g),D[3]=Math.max(p,D[3])):N+Z>k-g&&0===f&&(p=Math.round(N+
-Z-k+g),D[1]=Math.max(p,D[1])),0>W-U/2?D[0]=Math.max(Math.round(-W+U/2),D[0]):W+U/2>r&&(D[2]=Math.max(Math.round(W+U/2-r),D[2])),O.sideOverflow=p)}}}),0===m(D)||this.verifyDataLabelOverflow(D))&&(this.placeDataLabels(),this.points.forEach(function(c){T=e(b,c.options.dataLabels);if(J=l(T.connectorWidth,1)){var f;M=c.connector;if((O=c.dataLabel)&&O._pos&&c.visible&&0<c.labelDistance){X=O._attr.visibility;if(f=!M)c.connector=M=d.renderer.path().addClass("highcharts-data-label-connector  highcharts-color-"+
-c.colorIndex+(c.className?" "+c.className:"")).add(a.dataLabelsGroup),d.styledMode||M.attr({"stroke-width":J,stroke:T.connectorColor||c.color||C.neutralColor60});M[f?"attr":"animate"]({d:c.getConnectorPath()});M.attr("visibility",X)}else M&&(c.connector=M.destroy())}}))}function v(){this.points.forEach(function(a){var c=a.dataLabel,d;c&&a.visible&&((d=c._pos)?(c.sideOverflow&&(c._attr.width=Math.max(c.getBBox().width-c.sideOverflow,0),c.css({width:c._attr.width+"px",textOverflow:(this.options.dataLabels.style||
-{}).textOverflow||"ellipsis"}),c.shortened=!0),c.attr(c._attr),c[c.moved?"animate":"attr"](d),c.moved=!0):c&&c.attr({y:-9999}));delete a.distributeBox},this)}function w(a){var c=this.center,d=this.options,b=d.center,e=d.minSize||80,k=null!==d.size;if(!k){if(null!==b[0])var l=Math.max(c[2]-Math.max(a[1],a[3]),e);else l=Math.max(c[2]-a[1]-a[3],e),c[0]+=(a[3]-a[1])/2;null!==b[1]?l=g(l,e,c[2]-Math.max(a[0],a[2])):(l=g(l,e,c[2]-a[0]-a[2]),c[1]+=(a[0]-a[2])/2);l<c[2]?(c[2]=l,c[3]=Math.min(f(d.innerSize||
-0,l),l),this.translate(c),this.drawDataLabels&&this.drawDataLabels()):k=!0}return k}var x=[],z={radialDistributionY:function(a){return a.top+a.distributeBox.pos},radialDistributionX:function(a,c,d,b){return a.getX(d<c.top+2||d>c.bottom-2?b:d,c.half,c)},justify:function(a,c,d){return d[0]+(a.half?-1:1)*(c+a.labelDistance)},alignToPlotEdges:function(a,c,d,b){a=a.getBBox().width;return c?a+b:d-a-b},alignToConnectors:function(a,c,d,b){var e=0,f;a.forEach(function(a){f=a.dataLabel.getBBox().width;f>e&&
-(e=f)});return c?e+b:d-e-b}};q.compose=function(c){a.compose(n);-1===x.indexOf(c)&&(x.push(c),c=c.prototype,c.dataLabelPositioners=z,c.alignDataLabel=r,c.drawDataLabels=k,c.placeDataLabels=v,c.verifyDataLabelOverflow=w)}})(v||(v={}));return v});M(a,"Extensions/OverlappingDataLabels.js",[a["Core/Chart/Chart.js"],a["Core/Utilities.js"]],function(a,w){function r(a,g){var c=!1;if(a){var e=a.newOpacity;a.oldOpacity!==e&&(a.alignAttr&&a.placed?(a[e?"removeClass":"addClass"]("highcharts-data-label-hidden"),
-c=!0,a.alignAttr.opacity=e,a[a.isOld?"animate":"attr"](a.alignAttr,null,function(){g.styledMode||a.css({pointerEvents:e?"auto":"none"})}),z(g,"afterHideOverlappingLabel")):a.attr({opacity:e}));a.isOld=!0}return c}var E=w.addEvent,z=w.fireEvent,x=w.isArray,J=w.isNumber,u=w.objectEach,n=w.pick;E(a,"render",function(){var a=this,g=[];(this.labelCollectors||[]).forEach(function(a){g=g.concat(a())});(this.yAxis||[]).forEach(function(a){a.stacking&&a.options.stackLabels&&!a.options.stackLabels.allowOverlap&&
-u(a.stacking.stacks,function(a){u(a,function(a){a.label&&"hidden"!==a.label.visibility&&g.push(a.label)})})});(this.series||[]).forEach(function(c){var e=c.options.dataLabels;c.visible&&(!1!==e.enabled||c._hasPointLabels)&&(e=function(c){return c.forEach(function(c){c.visible&&(x(c.dataLabels)?c.dataLabels:c.dataLabel?[c.dataLabel]:[]).forEach(function(e){var f=e.options;e.labelrank=n(f.labelrank,c.labelrank,c.shapeArgs&&c.shapeArgs.height);f.allowOverlap?(e.oldOpacity=e.opacity,e.newOpacity=1,r(e,
-a)):g.push(e)})})},e(c.nodes||[]),e(c.points))});this.hideOverlappingLabels(g)});a.prototype.hideOverlappingLabels=function(a){var g=this,c=a.length,e=g.renderer,l,f,m,n=!1;var k=function(a){var c,f=a.box?0:a.padding||0,g=c=0,d;if(a&&(!a.alignAttr||a.placed)){var b=a.alignAttr||{x:a.attr("x"),y:a.attr("y")};var k=a.parentGroup;a.width||(c=a.getBBox(),a.width=c.width,a.height=c.height,c=e.fontMetrics(null,a.element).h);var l=a.width-2*f;(d={left:"0",center:"0.5",right:"1"}[a.alignValue])?g=+d*l:J(a.x)&&
-Math.round(a.x)!==a.translateX&&(g=a.x-a.translateX);return{x:b.x+(k.translateX||0)+f-(g||0),y:b.y+(k.translateY||0)+f-c,width:a.width-2*f,height:a.height-2*f}}};for(f=0;f<c;f++)if(l=a[f])l.oldOpacity=l.opacity,l.newOpacity=1,l.absoluteBox=k(l);a.sort(function(a,c){return(c.labelrank||0)-(a.labelrank||0)});for(f=0;f<c;f++){var u=(k=a[f])&&k.absoluteBox;for(l=f+1;l<c;++l){var w=(m=a[l])&&m.absoluteBox;!u||!w||k===m||0===k.newOpacity||0===m.newOpacity||w.x>=u.x+u.width||w.x+w.width<=u.x||w.y>=u.y+u.height||
-w.y+w.height<=u.y||((k.labelrank<m.labelrank?k:m).newOpacity=0)}}a.forEach(function(a){r(a,g)&&(n=!0)});n&&z(g,"afterHideAllOverlappingLabels")}});M(a,"Core/Responsive.js",[a["Core/Utilities.js"]],function(a){var r=a.extend,C=a.find,E=a.isArray,z=a.isObject,x=a.merge,J=a.objectEach,u=a.pick,n=a.splat,m=a.uniqueKey,g;(function(a){var c=[];a.compose=function(a){-1===c.indexOf(a)&&(c.push(a),r(a.prototype,g.prototype));return a};var g=function(){function a(){}a.prototype.currentOptions=function(a){function c(a,
-f,g,k){var h;J(a,function(a,b){if(!k&&-1<e.collectionsWithUpdate.indexOf(b)&&f[b])for(a=n(a),g[b]=[],h=0;h<Math.max(a.length,f[b].length);h++)f[b][h]&&(void 0===a[h]?g[b][h]=f[b][h]:(g[b][h]={},c(a[h],f[b][h],g[b][h],k+1)));else z(a)?(g[b]=E(a)?[]:{},c(a,f[b]||{},g[b],k+1)):g[b]="undefined"===typeof f[b]?null:f[b]})}var e=this,f={};c(a,this.options,f,0);return f};a.prototype.matchResponsiveRule=function(a,c){var e=a.condition;(e.callback||function(){return this.chartWidth<=u(e.maxWidth,Number.MAX_VALUE)&&
-this.chartHeight<=u(e.maxHeight,Number.MAX_VALUE)&&this.chartWidth>=u(e.minWidth,0)&&this.chartHeight>=u(e.minHeight,0)}).call(this)&&c.push(a._id)};a.prototype.setResponsive=function(a,c){var e=this,f=this.options.responsive,g=this.currentResponsive,l=[];!c&&f&&f.rules&&f.rules.forEach(function(a){"undefined"===typeof a._id&&(a._id=m());e.matchResponsiveRule(a,l)},this);c=x.apply(void 0,l.map(function(a){return C((f||{}).rules||[],function(c){return c._id===a})}).map(function(a){return a&&a.chartOptions}));
-c.isResponsiveOptions=!0;l=l.toString()||void 0;l!==(g&&g.ruleIds)&&(g&&this.update(g.undoOptions,a,!0),l?(g=this.currentOptions(c),g.isResponsiveOptions=!0,this.currentResponsive={ruleIds:l,mergedOptions:c,undoOptions:g},this.update(c,a,!0)):this.currentResponsive=void 0)};return a}()})(g||(g={}));"";"";return g});M(a,"masters/highcharts.src.js",[a["Core/Globals.js"],a["Core/Utilities.js"],a["Core/DefaultOptions.js"],a["Core/Animation/Fx.js"],a["Core/Animation/AnimationUtilities.js"],a["Core/Renderer/HTML/AST.js"],
-a["Core/FormatUtilities.js"],a["Core/Renderer/RendererUtilities.js"],a["Core/Renderer/SVG/SVGElement.js"],a["Core/Renderer/SVG/SVGRenderer.js"],a["Core/Renderer/HTML/HTMLElement.js"],a["Core/Renderer/HTML/HTMLRenderer.js"],a["Core/Axis/Axis.js"],a["Core/Axis/DateTimeAxis.js"],a["Core/Axis/LogarithmicAxis.js"],a["Core/Axis/PlotLineOrBand/PlotLineOrBand.js"],a["Core/Axis/Tick.js"],a["Core/Tooltip.js"],a["Core/Series/Point.js"],a["Core/Pointer.js"],a["Core/MSPointer.js"],a["Core/Legend/Legend.js"],a["Core/Chart/Chart.js"],
-a["Core/Series/Series.js"],a["Core/Series/SeriesRegistry.js"],a["Series/Column/ColumnSeries.js"],a["Series/Column/ColumnDataLabel.js"],a["Series/Pie/PieSeries.js"],a["Series/Pie/PieDataLabel.js"],a["Core/Series/DataLabel.js"],a["Core/Responsive.js"],a["Core/Color/Color.js"],a["Core/Time.js"]],function(a,w,C,E,z,x,J,u,n,m,g,c,e,l,f,v,q,k,I,D,B,M,t,h,d,b,p,G,y,L,F,P,S){a.animate=z.animate;a.animObject=z.animObject;a.getDeferredAnimation=z.getDeferredAnimation;a.setAnimation=z.setAnimation;a.stop=z.stop;
-a.timers=E.timers;a.AST=x;a.Axis=e;a.Chart=t;a.chart=t.chart;a.Fx=E;a.Legend=M;a.PlotLineOrBand=v;a.Point=I;a.Pointer=B.isRequired()?B:D;a.Series=h;a.SVGElement=n;a.SVGRenderer=m;a.Tick=q;a.Time=S;a.Tooltip=k;a.Color=P;a.color=P.parse;c.compose(m);g.compose(n);a.defaultOptions=C.defaultOptions;a.getOptions=C.getOptions;a.time=C.defaultTime;a.setOptions=C.setOptions;a.dateFormat=J.dateFormat;a.format=J.format;a.numberFormat=J.numberFormat;a.addEvent=w.addEvent;a.arrayMax=w.arrayMax;a.arrayMin=w.arrayMin;
-a.attr=w.attr;a.clearTimeout=w.clearTimeout;a.correctFloat=w.correctFloat;a.createElement=w.createElement;a.css=w.css;a.defined=w.defined;a.destroyObjectProperties=w.destroyObjectProperties;a.discardElement=w.discardElement;a.distribute=u.distribute;a.erase=w.erase;a.error=w.error;a.extend=w.extend;a.extendClass=w.extendClass;a.find=w.find;a.fireEvent=w.fireEvent;a.getMagnitude=w.getMagnitude;a.getStyle=w.getStyle;a.inArray=w.inArray;a.isArray=w.isArray;a.isClass=w.isClass;a.isDOMElement=w.isDOMElement;
-a.isFunction=w.isFunction;a.isNumber=w.isNumber;a.isObject=w.isObject;a.isString=w.isString;a.keys=w.keys;a.merge=w.merge;a.normalizeTickInterval=w.normalizeTickInterval;a.objectEach=w.objectEach;a.offset=w.offset;a.pad=w.pad;a.pick=w.pick;a.pInt=w.pInt;a.relativeLength=w.relativeLength;a.removeEvent=w.removeEvent;a.seriesType=d.seriesType;a.splat=w.splat;a.stableSort=w.stableSort;a.syncTimeout=w.syncTimeout;a.timeUnits=w.timeUnits;a.uniqueKey=w.uniqueKey;a.useSerialIds=w.useSerialIds;a.wrap=w.wrap;
-p.compose(b);L.compose(h);l.compose(e);f.compose(e);y.compose(G);v.compose(e);F.compose(t);return a});a["masters/highcharts.src.js"]._modules=a;return a["masters/highcharts.src.js"]});
-//# sourceMappingURL=highcharts.js.map
\ No newline at end of file
diff --git a/data/interfaces/default/js/highcharts/api/css/font-awesome.css b/data/interfaces/default/js/highcharts/api/css/font-awesome.css
new file mode 100644
index 00000000..048cff97
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/api/css/font-awesome.css
@@ -0,0 +1,1338 @@
+/*!
+ *  Font Awesome 4.0.3 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */
+/* FONT PATH
+ * -------------------------- */
+@font-face {
+  font-family: 'FontAwesome';
+  src: url('../fonts/fontawesome-webfont.eot?v=4.0.3');
+  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.3') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.0.3') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.0.3') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.0.3#fontawesomeregular') format('svg');
+  font-weight: normal;
+  font-style: normal;
+}
+.fa {
+  display: inline-block;
+  font-family: FontAwesome;
+  font-style: normal;
+  font-weight: normal;
+  line-height: 1;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+/* makes the font 33% larger relative to the icon container */
+.fa-lg {
+  font-size: 1.3333333333333333em;
+  line-height: 0.75em;
+  vertical-align: -15%;
+}
+.fa-2x {
+  font-size: 2em;
+}
+.fa-3x {
+  font-size: 3em;
+}
+.fa-4x {
+  font-size: 4em;
+}
+.fa-5x {
+  font-size: 5em;
+}
+.fa-fw {
+  width: 1.2857142857142858em;
+  text-align: center;
+}
+.fa-ul {
+  padding-left: 0;
+  margin-left: 2.142857142857143em;
+  list-style-type: none;
+}
+.fa-ul > li {
+  position: relative;
+}
+.fa-li {
+  position: absolute;
+  left: -2.142857142857143em;
+  width: 2.142857142857143em;
+  top: 0.14285714285714285em;
+  text-align: center;
+}
+.fa-li.fa-lg {
+  left: -1.8571428571428572em;
+}
+.fa-border {
+  padding: .2em .25em .15em;
+  border: solid 0.08em #eeeeee;
+  border-radius: .1em;
+}
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
+.fa.pull-left {
+  margin-right: .3em;
+}
+.fa.pull-right {
+  margin-left: .3em;
+}
+.fa-spin {
+  -webkit-animation: spin 2s infinite linear;
+  -moz-animation: spin 2s infinite linear;
+  -o-animation: spin 2s infinite linear;
+  animation: spin 2s infinite linear;
+}
+@-moz-keyframes spin {
+  0% {
+    -moz-transform: rotate(0deg);
+  }
+  100% {
+    -moz-transform: rotate(359deg);
+  }
+}
+@-webkit-keyframes spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+  }
+}
+@-o-keyframes spin {
+  0% {
+    -o-transform: rotate(0deg);
+  }
+  100% {
+    -o-transform: rotate(359deg);
+  }
+}
+@-ms-keyframes spin {
+  0% {
+    -ms-transform: rotate(0deg);
+  }
+  100% {
+    -ms-transform: rotate(359deg);
+  }
+}
+@keyframes spin {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(359deg);
+  }
+}
+.fa-rotate-90 {
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
+  -webkit-transform: rotate(90deg);
+  -moz-transform: rotate(90deg);
+  -ms-transform: rotate(90deg);
+  -o-transform: rotate(90deg);
+  transform: rotate(90deg);
+}
+.fa-rotate-180 {
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
+  -webkit-transform: rotate(180deg);
+  -moz-transform: rotate(180deg);
+  -ms-transform: rotate(180deg);
+  -o-transform: rotate(180deg);
+  transform: rotate(180deg);
+}
+.fa-rotate-270 {
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
+  -webkit-transform: rotate(270deg);
+  -moz-transform: rotate(270deg);
+  -ms-transform: rotate(270deg);
+  -o-transform: rotate(270deg);
+  transform: rotate(270deg);
+}
+.fa-flip-horizontal {
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);
+  -webkit-transform: scale(-1, 1);
+  -moz-transform: scale(-1, 1);
+  -ms-transform: scale(-1, 1);
+  -o-transform: scale(-1, 1);
+  transform: scale(-1, 1);
+}
+.fa-flip-vertical {
+  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);
+  -webkit-transform: scale(1, -1);
+  -moz-transform: scale(1, -1);
+  -ms-transform: scale(1, -1);
+  -o-transform: scale(1, -1);
+  transform: scale(1, -1);
+}
+.fa-stack {
+  position: relative;
+  display: inline-block;
+  width: 2em;
+  height: 2em;
+  line-height: 2em;
+  vertical-align: middle;
+}
+.fa-stack-1x,
+.fa-stack-2x {
+  position: absolute;
+  left: 0;
+  width: 100%;
+  text-align: center;
+}
+.fa-stack-1x {
+  line-height: inherit;
+}
+.fa-stack-2x {
+  font-size: 2em;
+}
+.fa-inverse {
+  color: #ffffff;
+}
+/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
+   readers do not read off random characters that represent icons */
+.fa-glass:before {
+  content: "\f000";
+}
+.fa-music:before {
+  content: "\f001";
+}
+.fa-search:before {
+  content: "\f002";
+}
+.fa-envelope-o:before {
+  content: "\f003";
+}
+.fa-heart:before {
+  content: "\f004";
+}
+.fa-star:before {
+  content: "\f005";
+}
+.fa-star-o:before {
+  content: "\f006";
+}
+.fa-user:before {
+  content: "\f007";
+}
+.fa-film:before {
+  content: "\f008";
+}
+.fa-th-large:before {
+  content: "\f009";
+}
+.fa-th:before {
+  content: "\f00a";
+}
+.fa-th-list:before {
+  content: "\f00b";
+}
+.fa-check:before {
+  content: "\f00c";
+}
+.fa-times:before {
+  content: "\f00d";
+}
+.fa-search-plus:before {
+  content: "\f00e";
+}
+.fa-search-minus:before {
+  content: "\f010";
+}
+.fa-power-off:before {
+  content: "\f011";
+}
+.fa-signal:before {
+  content: "\f012";
+}
+.fa-gear:before,
+.fa-cog:before {
+  content: "\f013";
+}
+.fa-trash-o:before {
+  content: "\f014";
+}
+.fa-home:before {
+  content: "\f015";
+}
+.fa-file-o:before {
+  content: "\f016";
+}
+.fa-clock-o:before {
+  content: "\f017";
+}
+.fa-road:before {
+  content: "\f018";
+}
+.fa-download:before {
+  content: "\f019";
+}
+.fa-arrow-circle-o-down:before {
+  content: "\f01a";
+}
+.fa-arrow-circle-o-up:before {
+  content: "\f01b";
+}
+.fa-inbox:before {
+  content: "\f01c";
+}
+.fa-play-circle-o:before {
+  content: "\f01d";
+}
+.fa-rotate-right:before,
+.fa-repeat:before {
+  content: "\f01e";
+}
+.fa-refresh:before {
+  content: "\f021";
+}
+.fa-list-alt:before {
+  content: "\f022";
+}
+.fa-lock:before {
+  content: "\f023";
+}
+.fa-flag:before {
+  content: "\f024";
+}
+.fa-headphones:before {
+  content: "\f025";
+}
+.fa-volume-off:before {
+  content: "\f026";
+}
+.fa-volume-down:before {
+  content: "\f027";
+}
+.fa-volume-up:before {
+  content: "\f028";
+}
+.fa-qrcode:before {
+  content: "\f029";
+}
+.fa-barcode:before {
+  content: "\f02a";
+}
+.fa-tag:before {
+  content: "\f02b";
+}
+.fa-tags:before {
+  content: "\f02c";
+}
+.fa-book:before {
+  content: "\f02d";
+}
+.fa-bookmark:before {
+  content: "\f02e";
+}
+.fa-print:before {
+  content: "\f02f";
+}
+.fa-camera:before {
+  content: "\f030";
+}
+.fa-font:before {
+  content: "\f031";
+}
+.fa-bold:before {
+  content: "\f032";
+}
+.fa-italic:before {
+  content: "\f033";
+}
+.fa-text-height:before {
+  content: "\f034";
+}
+.fa-text-width:before {
+  content: "\f035";
+}
+.fa-align-left:before {
+  content: "\f036";
+}
+.fa-align-center:before {
+  content: "\f037";
+}
+.fa-align-right:before {
+  content: "\f038";
+}
+.fa-align-justify:before {
+  content: "\f039";
+}
+.fa-list:before {
+  content: "\f03a";
+}
+.fa-dedent:before,
+.fa-outdent:before {
+  content: "\f03b";
+}
+.fa-indent:before {
+  content: "\f03c";
+}
+.fa-video-camera:before {
+  content: "\f03d";
+}
+.fa-picture-o:before {
+  content: "\f03e";
+}
+.fa-pencil:before {
+  content: "\f040";
+}
+.fa-map-marker:before {
+  content: "\f041";
+}
+.fa-adjust:before {
+  content: "\f042";
+}
+.fa-tint:before {
+  content: "\f043";
+}
+.fa-edit:before,
+.fa-pencil-square-o:before {
+  content: "\f044";
+}
+.fa-share-square-o:before {
+  content: "\f045";
+}
+.fa-check-square-o:before {
+  content: "\f046";
+}
+.fa-arrows:before {
+  content: "\f047";
+}
+.fa-step-backward:before {
+  content: "\f048";
+}
+.fa-fast-backward:before {
+  content: "\f049";
+}
+.fa-backward:before {
+  content: "\f04a";
+}
+.fa-play:before {
+  content: "\f04b";
+}
+.fa-pause:before {
+  content: "\f04c";
+}
+.fa-stop:before {
+  content: "\f04d";
+}
+.fa-forward:before {
+  content: "\f04e";
+}
+.fa-fast-forward:before {
+  content: "\f050";
+}
+.fa-step-forward:before {
+  content: "\f051";
+}
+.fa-eject:before {
+  content: "\f052";
+}
+.fa-chevron-left:before {
+  content: "\f053";
+}
+.fa-chevron-right:before {
+  content: "\f054";
+}
+.fa-plus-circle:before {
+  content: "\f055";
+}
+.fa-minus-circle:before {
+  content: "\f056";
+}
+.fa-times-circle:before {
+  content: "\f057";
+}
+.fa-check-circle:before {
+  content: "\f058";
+}
+.fa-question-circle:before {
+  content: "\f059";
+}
+.fa-info-circle:before {
+  content: "\f05a";
+}
+.fa-crosshairs:before {
+  content: "\f05b";
+}
+.fa-times-circle-o:before {
+  content: "\f05c";
+}
+.fa-check-circle-o:before {
+  content: "\f05d";
+}
+.fa-ban:before {
+  content: "\f05e";
+}
+.fa-arrow-left:before {
+  content: "\f060";
+}
+.fa-arrow-right:before {
+  content: "\f061";
+}
+.fa-arrow-up:before {
+  content: "\f062";
+}
+.fa-arrow-down:before {
+  content: "\f063";
+}
+.fa-mail-forward:before,
+.fa-share:before {
+  content: "\f064";
+}
+.fa-expand:before {
+  content: "\f065";
+}
+.fa-compress:before {
+  content: "\f066";
+}
+.fa-plus:before {
+  content: "\f067";
+}
+.fa-minus:before {
+  content: "\f068";
+}
+.fa-asterisk:before {
+  content: "\f069";
+}
+.fa-exclamation-circle:before {
+  content: "\f06a";
+}
+.fa-gift:before {
+  content: "\f06b";
+}
+.fa-leaf:before {
+  content: "\f06c";
+}
+.fa-fire:before {
+  content: "\f06d";
+}
+.fa-eye:before {
+  content: "\f06e";
+}
+.fa-eye-slash:before {
+  content: "\f070";
+}
+.fa-warning:before,
+.fa-exclamation-triangle:before {
+  content: "\f071";
+}
+.fa-plane:before {
+  content: "\f072";
+}
+.fa-calendar:before {
+  content: "\f073";
+}
+.fa-random:before {
+  content: "\f074";
+}
+.fa-comment:before {
+  content: "\f075";
+}
+.fa-magnet:before {
+  content: "\f076";
+}
+.fa-chevron-up:before {
+  content: "\f077";
+}
+.fa-chevron-down:before {
+  content: "\f078";
+}
+.fa-retweet:before {
+  content: "\f079";
+}
+.fa-shopping-cart:before {
+  content: "\f07a";
+}
+.fa-folder:before {
+  content: "\f07b";
+}
+.fa-folder-open:before {
+  content: "\f07c";
+}
+.fa-arrows-v:before {
+  content: "\f07d";
+}
+.fa-arrows-h:before {
+  content: "\f07e";
+}
+.fa-bar-chart-o:before {
+  content: "\f080";
+}
+.fa-twitter-square:before {
+  content: "\f081";
+}
+.fa-facebook-square:before {
+  content: "\f082";
+}
+.fa-camera-retro:before {
+  content: "\f083";
+}
+.fa-key:before {
+  content: "\f084";
+}
+.fa-gears:before,
+.fa-cogs:before {
+  content: "\f085";
+}
+.fa-comments:before {
+  content: "\f086";
+}
+.fa-thumbs-o-up:before {
+  content: "\f087";
+}
+.fa-thumbs-o-down:before {
+  content: "\f088";
+}
+.fa-star-half:before {
+  content: "\f089";
+}
+.fa-heart-o:before {
+  content: "\f08a";
+}
+.fa-sign-out:before {
+  content: "\f08b";
+}
+.fa-linkedin-square:before {
+  content: "\f08c";
+}
+.fa-thumb-tack:before {
+  content: "\f08d";
+}
+.fa-external-link:before {
+  content: "\f08e";
+}
+.fa-sign-in:before {
+  content: "\f090";
+}
+.fa-trophy:before {
+  content: "\f091";
+}
+.fa-github-square:before {
+  content: "\f092";
+}
+.fa-upload:before {
+  content: "\f093";
+}
+.fa-lemon-o:before {
+  content: "\f094";
+}
+.fa-phone:before {
+  content: "\f095";
+}
+.fa-square-o:before {
+  content: "\f096";
+}
+.fa-bookmark-o:before {
+  content: "\f097";
+}
+.fa-phone-square:before {
+  content: "\f098";
+}
+.fa-twitter:before {
+  content: "\f099";
+}
+.fa-facebook:before {
+  content: "\f09a";
+}
+.fa-github:before {
+  content: "\f09b";
+}
+.fa-unlock:before {
+  content: "\f09c";
+}
+.fa-credit-card:before {
+  content: "\f09d";
+}
+.fa-rss:before {
+  content: "\f09e";
+}
+.fa-hdd-o:before {
+  content: "\f0a0";
+}
+.fa-bullhorn:before {
+  content: "\f0a1";
+}
+.fa-bell:before {
+  content: "\f0f3";
+}
+.fa-certificate:before {
+  content: "\f0a3";
+}
+.fa-hand-o-right:before {
+  content: "\f0a4";
+}
+.fa-hand-o-left:before {
+  content: "\f0a5";
+}
+.fa-hand-o-up:before {
+  content: "\f0a6";
+}
+.fa-hand-o-down:before {
+  content: "\f0a7";
+}
+.fa-arrow-circle-left:before {
+  content: "\f0a8";
+}
+.fa-arrow-circle-right:before {
+  content: "\f0a9";
+}
+.fa-arrow-circle-up:before {
+  content: "\f0aa";
+}
+.fa-arrow-circle-down:before {
+  content: "\f0ab";
+}
+.fa-globe:before {
+  content: "\f0ac";
+}
+.fa-wrench:before {
+  content: "\f0ad";
+}
+.fa-tasks:before {
+  content: "\f0ae";
+}
+.fa-filter:before {
+  content: "\f0b0";
+}
+.fa-briefcase:before {
+  content: "\f0b1";
+}
+.fa-arrows-alt:before {
+  content: "\f0b2";
+}
+.fa-group:before,
+.fa-users:before {
+  content: "\f0c0";
+}
+.fa-chain:before,
+.fa-link:before {
+  content: "\f0c1";
+}
+.fa-cloud:before {
+  content: "\f0c2";
+}
+.fa-flask:before {
+  content: "\f0c3";
+}
+.fa-cut:before,
+.fa-scissors:before {
+  content: "\f0c4";
+}
+.fa-copy:before,
+.fa-files-o:before {
+  content: "\f0c5";
+}
+.fa-paperclip:before {
+  content: "\f0c6";
+}
+.fa-save:before,
+.fa-floppy-o:before {
+  content: "\f0c7";
+}
+.fa-square:before {
+  content: "\f0c8";
+}
+.fa-bars:before {
+  content: "\f0c9";
+}
+.fa-list-ul:before {
+  content: "\f0ca";
+}
+.fa-list-ol:before {
+  content: "\f0cb";
+}
+.fa-strikethrough:before {
+  content: "\f0cc";
+}
+.fa-underline:before {
+  content: "\f0cd";
+}
+.fa-table:before {
+  content: "\f0ce";
+}
+.fa-magic:before {
+  content: "\f0d0";
+}
+.fa-truck:before {
+  content: "\f0d1";
+}
+.fa-pinterest:before {
+  content: "\f0d2";
+}
+.fa-pinterest-square:before {
+  content: "\f0d3";
+}
+.fa-google-plus-square:before {
+  content: "\f0d4";
+}
+.fa-google-plus:before {
+  content: "\f0d5";
+}
+.fa-money:before {
+  content: "\f0d6";
+}
+.fa-caret-down:before {
+  content: "\f0d7";
+}
+.fa-caret-up:before {
+  content: "\f0d8";
+}
+.fa-caret-left:before {
+  content: "\f0d9";
+}
+.fa-caret-right:before {
+  content: "\f0da";
+}
+.fa-columns:before {
+  content: "\f0db";
+}
+.fa-unsorted:before,
+.fa-sort:before {
+  content: "\f0dc";
+}
+.fa-sort-down:before,
+.fa-sort-asc:before {
+  content: "\f0dd";
+}
+.fa-sort-up:before,
+.fa-sort-desc:before {
+  content: "\f0de";
+}
+.fa-envelope:before {
+  content: "\f0e0";
+}
+.fa-linkedin:before {
+  content: "\f0e1";
+}
+.fa-rotate-left:before,
+.fa-undo:before {
+  content: "\f0e2";
+}
+.fa-legal:before,
+.fa-gavel:before {
+  content: "\f0e3";
+}
+.fa-dashboard:before,
+.fa-tachometer:before {
+  content: "\f0e4";
+}
+.fa-comment-o:before {
+  content: "\f0e5";
+}
+.fa-comments-o:before {
+  content: "\f0e6";
+}
+.fa-flash:before,
+.fa-bolt:before {
+  content: "\f0e7";
+}
+.fa-sitemap:before {
+  content: "\f0e8";
+}
+.fa-umbrella:before {
+  content: "\f0e9";
+}
+.fa-paste:before,
+.fa-clipboard:before {
+  content: "\f0ea";
+}
+.fa-lightbulb-o:before {
+  content: "\f0eb";
+}
+.fa-exchange:before {
+  content: "\f0ec";
+}
+.fa-cloud-download:before {
+  content: "\f0ed";
+}
+.fa-cloud-upload:before {
+  content: "\f0ee";
+}
+.fa-user-md:before {
+  content: "\f0f0";
+}
+.fa-stethoscope:before {
+  content: "\f0f1";
+}
+.fa-suitcase:before {
+  content: "\f0f2";
+}
+.fa-bell-o:before {
+  content: "\f0a2";
+}
+.fa-coffee:before {
+  content: "\f0f4";
+}
+.fa-cutlery:before {
+  content: "\f0f5";
+}
+.fa-file-text-o:before {
+  content: "\f0f6";
+}
+.fa-building-o:before {
+  content: "\f0f7";
+}
+.fa-hospital-o:before {
+  content: "\f0f8";
+}
+.fa-ambulance:before {
+  content: "\f0f9";
+}
+.fa-medkit:before {
+  content: "\f0fa";
+}
+.fa-fighter-jet:before {
+  content: "\f0fb";
+}
+.fa-beer:before {
+  content: "\f0fc";
+}
+.fa-h-square:before {
+  content: "\f0fd";
+}
+.fa-plus-square:before {
+  content: "\f0fe";
+}
+.fa-angle-double-left:before {
+  content: "\f100";
+}
+.fa-angle-double-right:before {
+  content: "\f101";
+}
+.fa-angle-double-up:before {
+  content: "\f102";
+}
+.fa-angle-double-down:before {
+  content: "\f103";
+}
+.fa-angle-left:before {
+  content: "\f104";
+}
+.fa-angle-right:before {
+  content: "\f105";
+}
+.fa-angle-up:before {
+  content: "\f106";
+}
+.fa-angle-down:before {
+  content: "\f107";
+}
+.fa-desktop:before {
+  content: "\f108";
+}
+.fa-laptop:before {
+  content: "\f109";
+}
+.fa-tablet:before {
+  content: "\f10a";
+}
+.fa-mobile-phone:before,
+.fa-mobile:before {
+  content: "\f10b";
+}
+.fa-circle-o:before {
+  content: "\f10c";
+}
+.fa-quote-left:before {
+  content: "\f10d";
+}
+.fa-quote-right:before {
+  content: "\f10e";
+}
+.fa-spinner:before {
+  content: "\f110";
+}
+.fa-circle:before {
+  content: "\f111";
+}
+.fa-mail-reply:before,
+.fa-reply:before {
+  content: "\f112";
+}
+.fa-github-alt:before {
+  content: "\f113";
+}
+.fa-folder-o:before {
+  content: "\f114";
+}
+.fa-folder-open-o:before {
+  content: "\f115";
+}
+.fa-smile-o:before {
+  content: "\f118";
+}
+.fa-frown-o:before {
+  content: "\f119";
+}
+.fa-meh-o:before {
+  content: "\f11a";
+}
+.fa-gamepad:before {
+  content: "\f11b";
+}
+.fa-keyboard-o:before {
+  content: "\f11c";
+}
+.fa-flag-o:before {
+  content: "\f11d";
+}
+.fa-flag-checkered:before {
+  content: "\f11e";
+}
+.fa-terminal:before {
+  content: "\f120";
+}
+.fa-code:before {
+  content: "\f121";
+}
+.fa-reply-all:before {
+  content: "\f122";
+}
+.fa-mail-reply-all:before {
+  content: "\f122";
+}
+.fa-star-half-empty:before,
+.fa-star-half-full:before,
+.fa-star-half-o:before {
+  content: "\f123";
+}
+.fa-location-arrow:before {
+  content: "\f124";
+}
+.fa-crop:before {
+  content: "\f125";
+}
+.fa-code-fork:before {
+  content: "\f126";
+}
+.fa-unlink:before,
+.fa-chain-broken:before {
+  content: "\f127";
+}
+.fa-question:before {
+  content: "\f128";
+}
+.fa-info:before {
+  content: "\f129";
+}
+.fa-exclamation:before {
+  content: "\f12a";
+}
+.fa-superscript:before {
+  content: "\f12b";
+}
+.fa-subscript:before {
+  content: "\f12c";
+}
+.fa-eraser:before {
+  content: "\f12d";
+}
+.fa-puzzle-piece:before {
+  content: "\f12e";
+}
+.fa-microphone:before {
+  content: "\f130";
+}
+.fa-microphone-slash:before {
+  content: "\f131";
+}
+.fa-shield:before {
+  content: "\f132";
+}
+.fa-calendar-o:before {
+  content: "\f133";
+}
+.fa-fire-extinguisher:before {
+  content: "\f134";
+}
+.fa-rocket:before {
+  content: "\f135";
+}
+.fa-maxcdn:before {
+  content: "\f136";
+}
+.fa-chevron-circle-left:before {
+  content: "\f137";
+}
+.fa-chevron-circle-right:before {
+  content: "\f138";
+}
+.fa-chevron-circle-up:before {
+  content: "\f139";
+}
+.fa-chevron-circle-down:before {
+  content: "\f13a";
+}
+.fa-html5:before {
+  content: "\f13b";
+}
+.fa-css3:before {
+  content: "\f13c";
+}
+.fa-anchor:before {
+  content: "\f13d";
+}
+.fa-unlock-alt:before {
+  content: "\f13e";
+}
+.fa-bullseye:before {
+  content: "\f140";
+}
+.fa-ellipsis-h:before {
+  content: "\f141";
+}
+.fa-ellipsis-v:before {
+  content: "\f142";
+}
+.fa-rss-square:before {
+  content: "\f143";
+}
+.fa-play-circle:before {
+  content: "\f144";
+}
+.fa-ticket:before {
+  content: "\f145";
+}
+.fa-minus-square:before {
+  content: "\f146";
+}
+.fa-minus-square-o:before {
+  content: "\f147";
+}
+.fa-level-up:before {
+  content: "\f148";
+}
+.fa-level-down:before {
+  content: "\f149";
+}
+.fa-check-square:before {
+  content: "\f14a";
+}
+.fa-pencil-square:before {
+  content: "\f14b";
+}
+.fa-external-link-square:before {
+  content: "\f14c";
+}
+.fa-share-square:before {
+  content: "\f14d";
+}
+.fa-compass:before {
+  content: "\f14e";
+}
+.fa-toggle-down:before,
+.fa-caret-square-o-down:before {
+  content: "\f150";
+}
+.fa-toggle-up:before,
+.fa-caret-square-o-up:before {
+  content: "\f151";
+}
+.fa-toggle-right:before,
+.fa-caret-square-o-right:before {
+  content: "\f152";
+}
+.fa-euro:before,
+.fa-eur:before {
+  content: "\f153";
+}
+.fa-gbp:before {
+  content: "\f154";
+}
+.fa-dollar:before,
+.fa-usd:before {
+  content: "\f155";
+}
+.fa-rupee:before,
+.fa-inr:before {
+  content: "\f156";
+}
+.fa-cny:before,
+.fa-rmb:before,
+.fa-yen:before,
+.fa-jpy:before {
+  content: "\f157";
+}
+.fa-ruble:before,
+.fa-rouble:before,
+.fa-rub:before {
+  content: "\f158";
+}
+.fa-won:before,
+.fa-krw:before {
+  content: "\f159";
+}
+.fa-bitcoin:before,
+.fa-btc:before {
+  content: "\f15a";
+}
+.fa-file:before {
+  content: "\f15b";
+}
+.fa-file-text:before {
+  content: "\f15c";
+}
+.fa-sort-alpha-asc:before {
+  content: "\f15d";
+}
+.fa-sort-alpha-desc:before {
+  content: "\f15e";
+}
+.fa-sort-amount-asc:before {
+  content: "\f160";
+}
+.fa-sort-amount-desc:before {
+  content: "\f161";
+}
+.fa-sort-numeric-asc:before {
+  content: "\f162";
+}
+.fa-sort-numeric-desc:before {
+  content: "\f163";
+}
+.fa-thumbs-up:before {
+  content: "\f164";
+}
+.fa-thumbs-down:before {
+  content: "\f165";
+}
+.fa-youtube-square:before {
+  content: "\f166";
+}
+.fa-youtube:before {
+  content: "\f167";
+}
+.fa-xing:before {
+  content: "\f168";
+}
+.fa-xing-square:before {
+  content: "\f169";
+}
+.fa-youtube-play:before {
+  content: "\f16a";
+}
+.fa-dropbox:before {
+  content: "\f16b";
+}
+.fa-stack-overflow:before {
+  content: "\f16c";
+}
+.fa-instagram:before {
+  content: "\f16d";
+}
+.fa-flickr:before {
+  content: "\f16e";
+}
+.fa-adn:before {
+  content: "\f170";
+}
+.fa-bitbucket:before {
+  content: "\f171";
+}
+.fa-bitbucket-square:before {
+  content: "\f172";
+}
+.fa-tumblr:before {
+  content: "\f173";
+}
+.fa-tumblr-square:before {
+  content: "\f174";
+}
+.fa-long-arrow-down:before {
+  content: "\f175";
+}
+.fa-long-arrow-up:before {
+  content: "\f176";
+}
+.fa-long-arrow-left:before {
+  content: "\f177";
+}
+.fa-long-arrow-right:before {
+  content: "\f178";
+}
+.fa-apple:before {
+  content: "\f179";
+}
+.fa-windows:before {
+  content: "\f17a";
+}
+.fa-android:before {
+  content: "\f17b";
+}
+.fa-linux:before {
+  content: "\f17c";
+}
+.fa-dribbble:before {
+  content: "\f17d";
+}
+.fa-skype:before {
+  content: "\f17e";
+}
+.fa-foursquare:before {
+  content: "\f180";
+}
+.fa-trello:before {
+  content: "\f181";
+}
+.fa-female:before {
+  content: "\f182";
+}
+.fa-male:before {
+  content: "\f183";
+}
+.fa-gittip:before {
+  content: "\f184";
+}
+.fa-sun-o:before {
+  content: "\f185";
+}
+.fa-moon-o:before {
+  content: "\f186";
+}
+.fa-archive:before {
+  content: "\f187";
+}
+.fa-bug:before {
+  content: "\f188";
+}
+.fa-vk:before {
+  content: "\f189";
+}
+.fa-weibo:before {
+  content: "\f18a";
+}
+.fa-renren:before {
+  content: "\f18b";
+}
+.fa-pagelines:before {
+  content: "\f18c";
+}
+.fa-stack-exchange:before {
+  content: "\f18d";
+}
+.fa-arrow-circle-o-right:before {
+  content: "\f18e";
+}
+.fa-arrow-circle-o-left:before {
+  content: "\f190";
+}
+.fa-toggle-left:before,
+.fa-caret-square-o-left:before {
+  content: "\f191";
+}
+.fa-dot-circle-o:before {
+  content: "\f192";
+}
+.fa-wheelchair:before {
+  content: "\f193";
+}
+.fa-vimeo-square:before {
+  content: "\f194";
+}
+.fa-turkish-lira:before,
+.fa-try:before {
+  content: "\f195";
+}
+.fa-plus-square-o:before {
+  content: "\f196";
+}
diff --git a/data/interfaces/default/js/highcharts/api/css/images/ui-bg_flat_75_ffffff_40x100.png b/data/interfaces/default/js/highcharts/api/css/images/ui-bg_flat_75_ffffff_40x100.png
new file mode 100644
index 00000000..ca779e35
Binary files /dev/null and b/data/interfaces/default/js/highcharts/api/css/images/ui-bg_flat_75_ffffff_40x100.png differ
diff --git a/data/interfaces/default/js/highcharts/api/css/images/ui-bg_glass_75_dadada_1x400.png b/data/interfaces/default/js/highcharts/api/css/images/ui-bg_glass_75_dadada_1x400.png
new file mode 100644
index 00000000..7eda20a5
Binary files /dev/null and b/data/interfaces/default/js/highcharts/api/css/images/ui-bg_glass_75_dadada_1x400.png differ
diff --git a/data/interfaces/default/js/highcharts/api/css/jquery-ui.css b/data/interfaces/default/js/highcharts/api/css/jquery-ui.css
new file mode 100644
index 00000000..572ed8a9
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/api/css/jquery-ui.css
@@ -0,0 +1,1177 @@
+/*! jQuery UI - v1.10.3 - 2013-05-03
+* http://jqueryui.com
+* Includes: jquery.ui.core.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana%2CArial%2Csans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=highlight_soft&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=flat&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=glass&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=glass&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=glass&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=glass&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=glass&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+* Copyright 2013 jQuery Foundation and other contributors Licensed MIT */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden {
+	display: none;
+}
+.ui-helper-hidden-accessible {
+	border: 0;
+	clip: rect(0 0 0 0);
+	height: 1px;
+	margin: -1px;
+	overflow: hidden;
+	padding: 0;
+	position: absolute;
+	width: 1px;
+}
+.ui-helper-reset {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	line-height: 1.3;
+	text-decoration: none;
+	font-size: 100%;
+	list-style: none;
+}
+.ui-helper-clearfix:before,
+.ui-helper-clearfix:after {
+	content: "";
+	display: table;
+	border-collapse: collapse;
+}
+.ui-helper-clearfix:after {
+	clear: both;
+}
+.ui-helper-clearfix {
+	min-height: 0; /* support: IE7 */
+}
+.ui-helper-zfix {
+	width: 100%;
+	height: 100%;
+	top: 0;
+	left: 0;
+	position: absolute;
+	opacity: 0;
+	filter:Alpha(Opacity=0);
+}
+
+.ui-front {
+	z-index: 100;
+}
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled {
+	cursor: default !important;
+}
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon {
+	display: block;
+	text-indent: -99999px;
+	overflow: hidden;
+	background-repeat: no-repeat;
+}
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+}
+.ui-accordion .ui-accordion-header {
+	display: block;
+	cursor: pointer;
+	position: relative;
+	margin-top: 2px;
+	padding: .5em .5em .5em .7em;
+	min-height: 0; /* support: IE7 */
+}
+.ui-accordion .ui-accordion-icons {
+	padding-left: 2.2em;
+}
+.ui-accordion .ui-accordion-noicons {
+	padding-left: .7em;
+}
+.ui-accordion .ui-accordion-icons .ui-accordion-icons {
+	padding-left: 2.2em;
+}
+.ui-accordion .ui-accordion-header .ui-accordion-header-icon {
+	position: absolute;
+	left: .5em;
+	top: 50%;
+	margin-top: -8px;
+}
+.ui-accordion .ui-accordion-content {
+	padding: 1em 2.2em;
+	border-top: 0;
+	overflow: auto;
+}
+.ui-autocomplete {
+	position: absolute;
+	top: 0;
+	left: 0;
+	cursor: default;
+}
+.ui-button {
+	display: inline-block;
+	position: relative;
+	padding: 0;
+	line-height: normal;
+	margin-right: .1em;
+	cursor: pointer;
+	vertical-align: middle;
+	text-align: center;
+	overflow: visible; /* removes extra width in IE */
+}
+.ui-button,
+.ui-button:link,
+.ui-button:visited,
+.ui-button:hover,
+.ui-button:active {
+	text-decoration: none;
+}
+/* to make room for the icon, a width needs to be set here */
+.ui-button-icon-only {
+	width: 2.2em;
+}
+/* button elements seem to need a little more width */
+button.ui-button-icon-only {
+	width: 2.4em;
+}
+.ui-button-icons-only {
+	width: 3.4em;
+}
+button.ui-button-icons-only {
+	width: 3.7em;
+}
+
+/* button text element */
+.ui-button .ui-button-text {
+	display: block;
+	line-height: normal;
+}
+.ui-button-text-only .ui-button-text {
+	padding: .4em 1em;
+}
+.ui-button-icon-only .ui-button-text,
+.ui-button-icons-only .ui-button-text {
+	padding: .4em;
+	text-indent: -9999999px;
+}
+.ui-button-text-icon-primary .ui-button-text,
+.ui-button-text-icons .ui-button-text {
+	padding: .4em 1em .4em 2.1em;
+}
+.ui-button-text-icon-secondary .ui-button-text,
+.ui-button-text-icons .ui-button-text {
+	padding: .4em 2.1em .4em 1em;
+}
+.ui-button-text-icons .ui-button-text {
+	padding-left: 2.1em;
+	padding-right: 2.1em;
+}
+/* no icon support for input elements, provide padding by default */
+input.ui-button {
+	padding: .4em 1em;
+}
+
+/* button icon element(s) */
+.ui-button-icon-only .ui-icon,
+.ui-button-text-icon-primary .ui-icon,
+.ui-button-text-icon-secondary .ui-icon,
+.ui-button-text-icons .ui-icon,
+.ui-button-icons-only .ui-icon {
+	position: absolute;
+	top: 50%;
+	margin-top: -8px;
+}
+.ui-button-icon-only .ui-icon {
+	left: 50%;
+	margin-left: -8px;
+}
+.ui-button-text-icon-primary .ui-button-icon-primary,
+.ui-button-text-icons .ui-button-icon-primary,
+.ui-button-icons-only .ui-button-icon-primary {
+	left: .5em;
+}
+.ui-button-text-icon-secondary .ui-button-icon-secondary,
+.ui-button-text-icons .ui-button-icon-secondary,
+.ui-button-icons-only .ui-button-icon-secondary {
+	right: .5em;
+}
+
+/* button sets */
+.ui-buttonset {
+	margin-right: 7px;
+}
+.ui-buttonset .ui-button {
+	margin-left: 0;
+	margin-right: -.3em;
+}
+
+/* workarounds */
+/* reset extra padding in Firefox, see h5bp.com/l */
+input.ui-button::-moz-focus-inner,
+button.ui-button::-moz-focus-inner {
+	border: 0;
+	padding: 0;
+}
+.ui-datepicker {
+	width: 17em;
+	padding: .2em .2em 0;
+	display: none;
+}
+.ui-datepicker .ui-datepicker-header {
+	position: relative;
+	padding: .2em 0;
+}
+.ui-datepicker .ui-datepicker-prev,
+.ui-datepicker .ui-datepicker-next {
+	position: absolute;
+	top: 2px;
+	width: 1.8em;
+	height: 1.8em;
+}
+.ui-datepicker .ui-datepicker-prev-hover,
+.ui-datepicker .ui-datepicker-next-hover {
+	top: 1px;
+}
+.ui-datepicker .ui-datepicker-prev {
+	left: 2px;
+}
+.ui-datepicker .ui-datepicker-next {
+	right: 2px;
+}
+.ui-datepicker .ui-datepicker-prev-hover {
+	left: 1px;
+}
+.ui-datepicker .ui-datepicker-next-hover {
+	right: 1px;
+}
+.ui-datepicker .ui-datepicker-prev span,
+.ui-datepicker .ui-datepicker-next span {
+	display: block;
+	position: absolute;
+	left: 50%;
+	margin-left: -8px;
+	top: 50%;
+	margin-top: -8px;
+}
+.ui-datepicker .ui-datepicker-title {
+	margin: 0 2.3em;
+	line-height: 1.8em;
+	text-align: center;
+}
+.ui-datepicker .ui-datepicker-title select {
+	font-size: 1em;
+	margin: 1px 0;
+}
+.ui-datepicker select.ui-datepicker-month-year {
+	width: 100%;
+}
+.ui-datepicker select.ui-datepicker-month,
+.ui-datepicker select.ui-datepicker-year {
+	width: 49%;
+}
+.ui-datepicker table {
+	width: 100%;
+	font-size: .9em;
+	border-collapse: collapse;
+	margin: 0 0 .4em;
+}
+.ui-datepicker th {
+	padding: .7em .3em;
+	text-align: center;
+	font-weight: bold;
+	border: 0;
+}
+.ui-datepicker td {
+	border: 0;
+	padding: 1px;
+}
+.ui-datepicker td span,
+.ui-datepicker td a {
+	display: block;
+	padding: .2em;
+	text-align: right;
+	text-decoration: none;
+}
+.ui-datepicker .ui-datepicker-buttonpane {
+	background-image: none;
+	margin: .7em 0 0 0;
+	padding: 0 .2em;
+	border-left: 0;
+	border-right: 0;
+	border-bottom: 0;
+}
+.ui-datepicker .ui-datepicker-buttonpane button {
+	float: right;
+	margin: .5em .2em .4em;
+	cursor: pointer;
+	padding: .2em .6em .3em .6em;
+	width: auto;
+	overflow: visible;
+}
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
+	float: left;
+}
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi {
+	width: auto;
+}
+.ui-datepicker-multi .ui-datepicker-group {
+	float: left;
+}
+.ui-datepicker-multi .ui-datepicker-group table {
+	width: 95%;
+	margin: 0 auto .4em;
+}
+.ui-datepicker-multi-2 .ui-datepicker-group {
+	width: 50%;
+}
+.ui-datepicker-multi-3 .ui-datepicker-group {
+	width: 33.3%;
+}
+.ui-datepicker-multi-4 .ui-datepicker-group {
+	width: 25%;
+}
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
+	border-left-width: 0;
+}
+.ui-datepicker-multi .ui-datepicker-buttonpane {
+	clear: left;
+}
+.ui-datepicker-row-break {
+	clear: both;
+	width: 100%;
+	font-size: 0;
+}
+
+/* RTL support */
+.ui-datepicker-rtl {
+	direction: rtl;
+}
+.ui-datepicker-rtl .ui-datepicker-prev {
+	right: 2px;
+	left: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-next {
+	left: 2px;
+	right: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-prev:hover {
+	right: 1px;
+	left: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-next:hover {
+	left: 1px;
+	right: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane {
+	clear: right;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane button {
+	float: left;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,
+.ui-datepicker-rtl .ui-datepicker-group {
+	float: right;
+}
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
+	border-right-width: 0;
+	border-left-width: 1px;
+}
+.ui-dialog {
+	position: absolute;
+	top: 0;
+	left: 0;
+	padding: .2em;
+	outline: 0;
+}
+.ui-dialog .ui-dialog-titlebar {
+	padding: .4em 1em;
+	position: relative;
+}
+.ui-dialog .ui-dialog-title {
+	float: left;
+	margin: .1em 0;
+	white-space: nowrap;
+	width: 90%;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+.ui-dialog .ui-dialog-titlebar-close {
+	position: absolute;
+	right: .3em;
+	top: 50%;
+	width: 21px;
+	margin: -10px 0 0 0;
+	padding: 1px;
+	height: 20px;
+}
+.ui-dialog .ui-dialog-content {
+	position: relative;
+	border: 0;
+	padding: .5em 1em;
+	background: none;
+	overflow: auto;
+}
+.ui-dialog .ui-dialog-buttonpane {
+	text-align: left;
+	border-width: 1px 0 0 0;
+	background-image: none;
+	margin-top: .5em;
+	padding: .3em 1em .5em .4em;
+}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
+	float: right;
+}
+.ui-dialog .ui-dialog-buttonpane button {
+	margin: .5em .4em .5em 0;
+	cursor: pointer;
+}
+.ui-dialog .ui-resizable-se {
+	width: 12px;
+	height: 12px;
+	right: -5px;
+	bottom: -5px;
+	background-position: 16px 16px;
+}
+.ui-draggable .ui-dialog-titlebar {
+	cursor: move;
+}
+.ui-menu {
+	list-style: none;
+	padding: 2px;
+	margin: 0;
+	display: block;
+	outline: none;
+}
+.ui-menu .ui-menu {
+	margin-top: -3px;
+	position: absolute;
+}
+.ui-menu .ui-menu-item {
+	margin: 0;
+	padding: 0;
+	width: 100%;
+	/* support: IE10, see #8844 */
+	list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
+}
+.ui-menu .ui-menu-divider {
+	margin: 5px -2px 5px -2px;
+	height: 0;
+	font-size: 0;
+	line-height: 0;
+	border-width: 1px 0 0 0;
+}
+.ui-menu .ui-menu-item a {
+	text-decoration: none;
+	display: block;
+	padding: 2px .4em;
+	line-height: 1.5;
+	min-height: 0; /* support: IE7 */
+	font-weight: normal;
+}
+.ui-menu .ui-menu-item a.ui-state-focus,
+.ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
+	margin: -1px;
+}
+
+.ui-menu .ui-state-disabled {
+	font-weight: normal;
+	margin: .4em 0 .2em;
+	line-height: 1.5;
+}
+.ui-menu .ui-state-disabled a {
+	cursor: default;
+}
+
+/* icon support */
+.ui-menu-icons {
+	position: relative;
+}
+.ui-menu-icons .ui-menu-item a {
+	position: relative;
+	padding-left: 2em;
+}
+
+/* left-aligned */
+.ui-menu .ui-icon {
+	position: absolute;
+	top: .2em;
+	left: .2em;
+}
+
+/* right-aligned */
+.ui-menu .ui-menu-icon {
+	position: static;
+	float: right;
+}
+.ui-progressbar {
+	height: 2em;
+	text-align: left;
+	overflow: hidden;
+}
+.ui-progressbar .ui-progressbar-value {
+	margin: -1px;
+	height: 100%;
+}
+.ui-progressbar .ui-progressbar-overlay {
+	background: url("images/animated-overlay.gif");
+	height: 100%;
+	filter: alpha(opacity=25);
+	opacity: 0.25;
+}
+.ui-progressbar-indeterminate .ui-progressbar-value {
+	background-image: none;
+}
+.ui-resizable {
+	position: relative;
+}
+.ui-resizable-handle {
+	position: absolute;
+	font-size: 0.1px;
+	display: block;
+}
+.ui-resizable-disabled .ui-resizable-handle,
+.ui-resizable-autohide .ui-resizable-handle {
+	display: none;
+}
+.ui-resizable-n {
+	cursor: n-resize;
+	height: 7px;
+	width: 100%;
+	top: -5px;
+	left: 0;
+}
+.ui-resizable-s {
+	cursor: s-resize;
+	height: 7px;
+	width: 100%;
+	bottom: -5px;
+	left: 0;
+}
+.ui-resizable-e {
+	cursor: e-resize;
+	width: 7px;
+	right: -5px;
+	top: 0;
+	height: 100%;
+}
+.ui-resizable-w {
+	cursor: w-resize;
+	width: 7px;
+	left: -5px;
+	top: 0;
+	height: 100%;
+}
+.ui-resizable-se {
+	cursor: se-resize;
+	width: 12px;
+	height: 12px;
+	right: 1px;
+	bottom: 1px;
+}
+.ui-resizable-sw {
+	cursor: sw-resize;
+	width: 9px;
+	height: 9px;
+	left: -5px;
+	bottom: -5px;
+}
+.ui-resizable-nw {
+	cursor: nw-resize;
+	width: 9px;
+	height: 9px;
+	left: -5px;
+	top: -5px;
+}
+.ui-resizable-ne {
+	cursor: ne-resize;
+	width: 9px;
+	height: 9px;
+	right: -5px;
+	top: -5px;
+}
+.ui-selectable-helper {
+	position: absolute;
+	z-index: 100;
+	border: 1px dotted black;
+}
+.ui-slider {
+	position: relative;
+	text-align: left;
+}
+.ui-slider .ui-slider-handle {
+	position: absolute;
+	z-index: 2;
+	width: 1.2em;
+	height: 1.2em;
+	cursor: default;
+}
+.ui-slider .ui-slider-range {
+	position: absolute;
+	z-index: 1;
+	font-size: .7em;
+	display: block;
+	border: 0;
+	background-position: 0 0;
+}
+
+/* For IE8 - See #6727 */
+.ui-slider.ui-state-disabled .ui-slider-handle,
+.ui-slider.ui-state-disabled .ui-slider-range {
+	filter: inherit;
+}
+
+.ui-slider-horizontal {
+	height: .8em;
+}
+.ui-slider-horizontal .ui-slider-handle {
+	top: -.3em;
+	margin-left: -.6em;
+}
+.ui-slider-horizontal .ui-slider-range {
+	top: 0;
+	height: 100%;
+}
+.ui-slider-horizontal .ui-slider-range-min {
+	left: 0;
+}
+.ui-slider-horizontal .ui-slider-range-max {
+	right: 0;
+}
+
+.ui-slider-vertical {
+	width: .8em;
+	height: 100px;
+}
+.ui-slider-vertical .ui-slider-handle {
+	left: -.3em;
+	margin-left: 0;
+	margin-bottom: -.6em;
+}
+.ui-slider-vertical .ui-slider-range {
+	left: 0;
+	width: 100%;
+}
+.ui-slider-vertical .ui-slider-range-min {
+	bottom: 0;
+}
+.ui-slider-vertical .ui-slider-range-max {
+	top: 0;
+}
+.ui-spinner {
+	position: relative;
+	display: inline-block;
+	overflow: hidden;
+	padding: 0;
+	vertical-align: middle;
+}
+.ui-spinner-input {
+	border: none;
+	background: none;
+	color: inherit;
+	padding: 0;
+	margin: .2em 0;
+	vertical-align: middle;
+	margin-left: .4em;
+	margin-right: 22px;
+}
+.ui-spinner-button {
+	width: 16px;
+	height: 50%;
+	font-size: .5em;
+	padding: 0;
+	margin: 0;
+	text-align: center;
+	position: absolute;
+	cursor: default;
+	display: block;
+	overflow: hidden;
+	right: 0;
+}
+/* more specificity required here to overide default borders */
+.ui-spinner a.ui-spinner-button {
+	border-top: none;
+	border-bottom: none;
+	border-right: none;
+}
+/* vertical centre icon */
+.ui-spinner .ui-icon {
+	position: absolute;
+	margin-top: -8px;
+	top: 50%;
+	left: 0;
+}
+.ui-spinner-up {
+	top: 0;
+}
+.ui-spinner-down {
+	bottom: 0;
+}
+
+/* TR overrides */
+.ui-spinner .ui-icon-triangle-1-s {
+	/* need to fix icons sprite */
+	background-position: -65px -16px;
+}
+.ui-tabs {
+	position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+	padding: .2em;
+}
+.ui-tabs .ui-tabs-nav {
+	margin: 0;
+	padding: .2em .2em 0;
+}
+.ui-tabs .ui-tabs-nav li {
+	list-style: none;
+	float: left;
+	position: relative;
+	top: 0;
+	margin: 1px .2em 0 0;
+	border-bottom-width: 0;
+	padding: 0;
+	white-space: nowrap;
+}
+.ui-tabs .ui-tabs-nav li a {
+	float: left;
+	padding: .5em 1em;
+	text-decoration: none;
+}
+.ui-tabs .ui-tabs-nav li.ui-tabs-active {
+	margin-bottom: -1px;
+	padding-bottom: 1px;
+}
+.ui-tabs .ui-tabs-nav li.ui-tabs-active a,
+.ui-tabs .ui-tabs-nav li.ui-state-disabled a,
+.ui-tabs .ui-tabs-nav li.ui-tabs-loading a {
+	cursor: text;
+}
+.ui-tabs .ui-tabs-nav li a, /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a {
+	cursor: pointer;
+}
+.ui-tabs .ui-tabs-panel {
+	display: block;
+	border-width: 0;
+	padding: 1em 1.4em;
+	background: none;
+}
+.ui-tooltip {
+	padding: 8px;
+	position: absolute;
+	z-index: 9999;
+	max-width: 300px;
+	-webkit-box-shadow: 0 0 5px #aaa;
+	box-shadow: 0 0 5px #aaa;
+}
+body .ui-tooltip {
+	border-width: 2px;
+}
+
+/* Component containers
+----------------------------------*/
+.ui-widget {
+	font-family: Verdana,Arial,sans-serif;
+	font-size: 1.1em;
+}
+.ui-widget .ui-widget {
+	font-size: 1em;
+}
+.ui-widget input,
+.ui-widget select,
+.ui-widget textarea,
+.ui-widget button {
+	font-family: Verdana,Arial,sans-serif;
+	font-size: 1em;
+}
+.ui-widget-content {
+	border: 1px solid #aaaaaa;
+	background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x;
+	color: #222222;
+}
+.ui-widget-content a {
+	color: #222222;
+}
+.ui-widget-header {
+	border: 1px solid #aaaaaa;
+	background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png) 50% 50% repeat-x;
+	color: #222222;
+	font-weight: bold;
+}
+.ui-widget-header a {
+	color: #222222;
+}
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default,
+.ui-widget-content .ui-state-default,
+.ui-widget-header .ui-state-default {
+	border: 1px solid #d3d3d3;
+	background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x;
+	font-weight: normal;
+	color: #555555;
+}
+.ui-state-default a,
+.ui-state-default a:link,
+.ui-state-default a:visited {
+	color: #555555;
+	text-decoration: none;
+}
+.ui-state-hover,
+.ui-widget-content .ui-state-hover,
+.ui-widget-header .ui-state-hover,
+.ui-state-focus,
+.ui-widget-content .ui-state-focus,
+.ui-widget-header .ui-state-focus {
+	border: 1px solid #999999;
+	background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x;
+	font-weight: normal;
+	color: #212121;
+}
+.ui-state-hover a,
+.ui-state-hover a:hover,
+.ui-state-hover a:link,
+.ui-state-hover a:visited {
+	color: #212121;
+	text-decoration: none;
+}
+.ui-state-active,
+.ui-widget-content .ui-state-active,
+.ui-widget-header .ui-state-active {
+	border: 1px solid #aaaaaa;
+	background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x;
+	font-weight: normal;
+	color: #212121;
+}
+.ui-state-active a,
+.ui-state-active a:link,
+.ui-state-active a:visited {
+	color: #212121;
+	text-decoration: none;
+}
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight,
+.ui-widget-content .ui-state-highlight,
+.ui-widget-header .ui-state-highlight {
+	border: 1px solid #fcefa1;
+	background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x;
+	color: #363636;
+}
+.ui-state-highlight a,
+.ui-widget-content .ui-state-highlight a,
+.ui-widget-header .ui-state-highlight a {
+	color: #363636;
+}
+.ui-state-error,
+.ui-widget-content .ui-state-error,
+.ui-widget-header .ui-state-error {
+	border: 1px solid #cd0a0a;
+	background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x;
+	color: #cd0a0a;
+}
+.ui-state-error a,
+.ui-widget-content .ui-state-error a,
+.ui-widget-header .ui-state-error a {
+	color: #cd0a0a;
+}
+.ui-state-error-text,
+.ui-widget-content .ui-state-error-text,
+.ui-widget-header .ui-state-error-text {
+	color: #cd0a0a;
+}
+.ui-priority-primary,
+.ui-widget-content .ui-priority-primary,
+.ui-widget-header .ui-priority-primary {
+	font-weight: bold;
+}
+.ui-priority-secondary,
+.ui-widget-content .ui-priority-secondary,
+.ui-widget-header .ui-priority-secondary {
+	opacity: .7;
+	filter:Alpha(Opacity=70);
+	font-weight: normal;
+}
+.ui-state-disabled,
+.ui-widget-content .ui-state-disabled,
+.ui-widget-header .ui-state-disabled {
+	opacity: .35;
+	filter:Alpha(Opacity=35);
+	background-image: none;
+}
+.ui-state-disabled .ui-icon {
+	filter:Alpha(Opacity=35); /* For IE8 - See #6059 */
+}
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon {
+	width: 16px;
+	height: 16px;
+}
+.ui-icon,
+.ui-widget-content .ui-icon {
+	background-image: url(images/ui-icons_222222_256x240.png);
+}
+.ui-widget-header .ui-icon {
+	background-image: url(images/ui-icons_222222_256x240.png);
+}
+.ui-state-default .ui-icon {
+	background-image: url(images/ui-icons_888888_256x240.png);
+}
+.ui-state-hover .ui-icon,
+.ui-state-focus .ui-icon {
+	background-image: url(images/ui-icons_454545_256x240.png);
+}
+.ui-state-active .ui-icon {
+	background-image: url(images/ui-icons_454545_256x240.png);
+}
+.ui-state-highlight .ui-icon {
+	background-image: url(images/ui-icons_2e83ff_256x240.png);
+}
+.ui-state-error .ui-icon,
+.ui-state-error-text .ui-icon {
+	background-image: url(images/ui-icons_cd0a0a_256x240.png);
+}
+
+/* positioning */
+.ui-icon-blank { background-position: 16px 16px; }
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-on { background-position: -96px -144px; }
+.ui-icon-radio-off { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-left,
+.ui-corner-tl {
+	border-top-left-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-right,
+.ui-corner-tr {
+	border-top-right-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-left,
+.ui-corner-bl {
+	border-bottom-left-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-right,
+.ui-corner-br {
+	border-bottom-right-radius: 4px;
+}
+
+/* Overlays */
+.ui-widget-overlay {
+	background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
+	opacity: .3;
+	filter: Alpha(Opacity=30);
+}
+.ui-widget-shadow {
+	margin: -8px 0 0 -8px;
+	padding: 8px;
+	background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x;
+	opacity: .3;
+	filter: Alpha(Opacity=30);
+	border-radius: 8px;
+}
diff --git a/data/interfaces/default/js/highcharts/api/css/ref.css b/data/interfaces/default/js/highcharts/api/css/ref.css
new file mode 100644
index 00000000..fe4d239f
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/api/css/ref.css
@@ -0,0 +1,594 @@
+.clearfix {
+	clear: both;
+}
+.hidden {
+	visibility: hidden;
+}
+.container {
+	width: auto;
+	padding: 30px;
+	margin: auto;
+}
+* {
+	font-family: 'Source Sans Pro', sans-serif;
+}
+
+body {
+	margin: 0;
+	background-color: #15151d;
+	font-size: 1em;
+	overflow-x: hidden;
+}
+h3 {
+	text-transform: uppercase;
+	margin-bottom: 3px;
+}
+
+p {
+	margin: 0 0 1em 0;
+}
+a {
+	color: #8085e8;
+	text-decoration: none;
+	font-weight: bold;
+}
+a:hover {
+	color: #90ee7e;
+}
+
+#nav a.dump {
+	padding: 0px;
+	margin: 0px;
+}
+
+/*
+==========
+=== Header
+==========
+*/
+#top {
+	background-color: #252530;
+}
+#top .container {
+	padding: 0;
+}
+#top h1 {
+	color: #eeeaea;
+	font-weight: 100;
+	margin: 0;
+	font-size: 1.5em;
+}
+.cell {
+	width: 33%;
+	display: inline-block;
+	vertical-align: middle;
+}
+
+.cell:nth-child(4) {
+	text-align: right;
+	color:#eeeaea;
+	font-size: 0.9em;
+}
+
+#logo {
+	display: block;
+
+}
+#logo img {
+	max-width: 200px;
+	width: 100%;
+	margin: 15px;
+	margin-left: 33px;
+	height: 32px;
+}
+
+/* Search bar */
+#search-div {
+	color: #252530;
+	display: block;
+	margin-bottom: 20px;
+	border: 1px solid #252530;
+}
+
+div#search-div i {
+	margin: 5px;
+	color: #252530;
+	font-size: 14px;
+}
+
+input#search {
+	height: 18px;
+	font-family: "Courier New", Courier, monospace;
+	font-size: 0.9em;
+	background-color: transparent;
+	border: none;	
+	outline: none;
+	color: #252530;
+	width:80%;
+}
+
+.ui-autocomplete {
+	max-height: 500px;
+	max-width: 400px;
+	overflow-y: auto;
+	overflow-x: auto;
+}
+
+.ui-menu .ui-menu-item a {
+	font-size:14px;
+	zoom:1;
+	font-family: "Courier New", Courier, monospace;
+}
+.ui-widget-content a {
+	color: #222222 /*{fcContent}*/;
+}
+
+/*
+==============
+=== END Header
+==============
+*/
+/*
+==========
+=== Footer
+==========
+*/
+#footer {
+	background-color: #15151d;
+	color: #eeeaea;
+}
+#footer-copy {
+	float: left;
+	font-size: 14px;
+	line-height: 18px;
+}
+#footer-social {
+	float: right;
+}
+#footer-social a {
+	color: #eeeaea;
+	font-size: 18px;
+	margin-left: 10px;
+}
+#footer-social a:hover {
+	color: #90ee7e;
+}
+#footer .container {
+	padding: 10px;
+}
+#scrollTop {
+	position: fixed;
+	bottom: 75px;
+	right: 50px;
+	background-color: #90ee7e;
+	padding: 10px;
+	border-radius: 2px;
+	color: white;
+	display: none;
+}
+#scrollTop:hover {
+	color: black;
+}
+/*
+==============
+=== END Footer
+==============
+*/
+
+#reference-loading {
+	margin-top: 300px;
+	text-align: center;
+}
+
+/*
+===========
+=== Wrapper
+===========
+*/
+#splashText {
+	display: none;
+}
+.nav-section h3 {
+	font-size: 24px;
+	margin-top: 0;
+}
+
+#wrapper{
+	background-color: #d6d1d1;
+}
+#wrapper .container {
+	padding: 0;
+}
+#wrapper-inner {
+	background-color: #ffffff;
+	/*border: 1px solid silver;*/
+}
+
+.tree a {
+	color: #252530;
+}
+
+#nav .tree, #nav .tree * {
+	font-family: "Courier New", Courier, monospace;
+}
+
+#nav .header p {
+	font-weight: normal;
+	color: #666;
+}
+
+#nav h1, 
+#details h1,
+#details h2 {
+	font-weight: 100;
+	margin-bottom: 1em;
+}
+
+#nav h1, 
+#details h2 {
+	text-transform: uppercase;
+}
+
+#nav {
+	min-height: 100%;
+	border-right: 1px solid silver;
+}
+
+#nav-wrap {
+	width: 30%;
+	float:left;
+	overflow: auto;
+}
+
+#nav a,#nav a:visited {
+	font-weight: bold;
+	padding: 0 2px;
+	margin: 1px;
+}
+
+.nav-section {
+	padding: 30px;
+	position: relative;
+}
+.nav-section:last-child {
+	border-bottom: none;
+}
+
+#nav .level {
+	margin-left: 13px;
+	display: none;
+}
+
+#nav .level-0 {
+	display: block;
+}
+
+#nav a.level-0 {
+	margin-left: 1em;
+}
+
+#nav .menuitem {
+	position: relative;
+}
+
+#nav .value {
+	width: 40%;
+	overflow: hidden;
+	color: silver;
+	position: absolute;
+	white-space: nowrap;
+}
+#nav .value-string, #nav .value-color {
+	color: #39A832;
+}
+#nav .value-number {
+	color: #297EA8;
+}
+
+a.hilighted {
+	background-color: #C5F7BE;
+}
+
+#nav .plus {
+	display: block;
+	position: absolute;
+	left: -12px;
+	top: 0;
+	width: 9px;
+	height: 9px;
+	font-family: FontAwesome;
+	color: gray;
+
+}
+#nav .plus:before {
+}
+
+#nav .collapsed>.plus:before {
+	content: "\f0da";
+}
+
+#nav .expanded>.plus:before {
+	content: "\f0d7";
+}
+
+#nav .dots {
+	padding: 0 4px;
+}
+#nav .expanded>.dots {
+	display: none;
+}
+
+#nav .dots.loading {
+	background: url(./../images/ajax-loader.gif) no-repeat center;
+}
+#nav .dots.error {
+	color: red;
+	font-weight: bold;
+}
+
+#nav .dots.loading span {
+	visibility: hidden;
+}
+
+#nav code {
+	color:#8085e8;
+	font-weight: bold;
+}
+
+#nav span.typed {
+	margin-left: 15px;
+}
+#nav .collapsed span.typed {
+	margin-left: 0;
+}
+#nav .collapsed br.typed {
+	display: none;
+}
+
+#methods-and-properties-toc ul {
+	margin-left: 0;
+	padding-left: 1em;
+}
+
+#options-tree,#global-options-tree,#objects-tree {
+	font-size: 0.9em;
+}
+
+pre,code {
+	font-family: "Courier New", Courier, monospace;
+}
+
+#overview {
+	margin-left: 420px;
+}
+
+#details-wrap {
+	float: right;
+	width: 70%;
+	overflow:auto;
+	margin:0px;
+	padding:0px;
+}
+
+/* Member styling */
+.member {
+	padding: 30px;
+	overflow-y: hidden;
+	position: relative;
+	border-top: 1px solid silver;
+}
+
+.member:first-child {
+	color:green;
+}
+
+.member.deprecated * {
+	color: silver !important;
+}
+
+.member.hilighted {
+	background-color: #eefdec;
+}
+
+.member .title, .member .title a, .member .returnType {
+	font-family: "Courier New", Courier, monospace;
+	font-size: 1.1em;
+	font-weight: bold;
+	margin-bottom: 5px;
+	display: inline-block;
+}
+
+.member .title a{
+	text-decoration: underline;
+}
+
+.member .default {
+	display: none;
+}
+
+.member .since {
+	float: right;
+	font-size: 0.8em;
+}
+
+.member .description {
+	color: #666;
+}
+.member .context {
+	padding: 1em 0;
+}
+
+.description code {
+	color: #666;
+	font-weight: normal;
+}
+
+.section {
+	padding-top: 25px;
+}
+
+.section .demo, .member .demo {
+	font-style: italic;
+	margin-top: 1.5em;
+	margin-bottom:0.5em;
+	margin-left: 1.5em;
+}
+
+.section .member .demo {
+	margin-left: 0em;
+}
+
+.section h1,
+.section h2,
+.section .section-description {
+	padding-left: 25px;
+}
+
+.section h1 {
+	margin: 0px;
+	font-family: "Courier New", Courier, monospace;
+}
+
+.section-description {
+	margin: 0 0 1em 0;
+}
+
+/*gert*/
+.menuitem div {
+	margin-left: 8px;
+}
+
+.tree {
+	padding-left: 24px;
+}
+
+div.edit {
+	float: right
+}
+
+/*edit form*/
+form#optionAttribute td.inp {
+	width: 450px;
+}
+
+form#optionAttribute td input {
+	width: 100%;
+}
+
+form#optionAttribute td textarea {
+	width: 100%;
+}
+
+form#optionAttribute td input[type="checkbox"] {
+	width: 20px;
+}
+
+.pencil {
+	background-image: url(./../images/edit.png);
+}
+
+.remove {
+	background-image: url(./../images/delete.gif);
+}
+
+.add {
+	background-image: url(./../images/add.png);
+}
+
+.copy {
+	background-image: url(./../images/copy.png);
+}
+
+.pencil, .add, .remove, .copy {
+	background-repeat: no-repeat;
+	background-position: center;
+	float: right;
+	position: relative;
+	width: 10px;
+	padding: 8px;
+}
+
+.pencil a,.add a,.remove a, .copy a {
+	text-decoration: none;
+	padding: 5px;
+}
+
+.deprecated, .error {
+	color: red;
+	font-weight: bold;
+}
+
+dl#inhMembers dd a,span.returnType {
+	margin-left: 3px;
+}
+
+/* fix for icons changing containers height, affects updateHeights, javascript function */
+#footer-social i:before {  
+  line-height: 1.5;
+}
+
+@media screen and (max-width: 767px) {
+	.nav-section-inner {
+		display: none;
+	}
+	#nav-wrap {
+		width: 100%;
+	}
+	#details-wrap {
+		width: 100%;
+	}
+	.nav-section {
+		padding: 0px;
+	}
+	#search-div{
+		margin:30px;
+	}
+	#wrapper,
+	#wrapper-inner,
+	#details-wrap {
+		height: auto !important;
+	}
+	.cell {
+		width: 48%;
+		text-align: center !important;
+	}
+	.cell:nth-child(1) {
+		width: 100%;
+	}
+	#splashText {
+		padding: 30px;
+		text-align: center;
+	}	
+	#splashText.section {
+		border: none;
+	}
+	#splashText img {
+		width: 100%;
+		max-width: 380px;
+	}
+	#scrollTop {
+		display: block;
+	}
+	.section {
+		padding-top: 0px;
+	}
+	#logo img {
+		margin-left:0px;
+		margin-right:0px;
+	}
+}
+@media screen and (max-width: 479px) {
+	#footer-copy,
+	#footer-social {
+		float: none;
+		text-align: center;
+		padding: 5px 0;
+	}
+	.cell {
+		width: 100%;
+	}
+	.ui-autocomplete {
+		max-height: 300px;
+		max-width: 275px;
+		overflow-x:auto;
+	}
diff --git a/data/interfaces/default/js/highcharts/api/fonts/fontawesome-webfont.woff b/data/interfaces/default/js/highcharts/api/fonts/fontawesome-webfont.woff
new file mode 100644
index 00000000..628b6a52
Binary files /dev/null and b/data/interfaces/default/js/highcharts/api/fonts/fontawesome-webfont.woff differ
diff --git a/data/interfaces/default/js/highcharts/api/highcharts.html b/data/interfaces/default/js/highcharts/api/highcharts.html
new file mode 100644
index 00000000..5799470b
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/api/highcharts.html
@@ -0,0 +1,122 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="viewport" content="width=device-width, minimum-scale=1, maximum-scale=1">
+<title>Highcharts API Reference</title>
+
+<link href="css/font-awesome.css" rel="stylesheet">
+<link rel="stylesheet" href="css/jquery-ui.css" />
+<link rel="apple-touch-icon" sizes="57x57" href="images/apple-touch-icon-57x57.png">
+<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png">
+<link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png">
+<link rel="apple-touch-icon" sizes="144x144" href="images/apple-touch-icon-144x144.png">
+<link rel="apple-touch-icon" sizes="60x60" href="images/apple-touch-icon-60x60.png">
+<link rel="apple-touch-icon" sizes="120x120" href="images/apple-touch-icon-120x120.png">
+<link rel="apple-touch-icon" sizes="76x76" href="images/apple-touch-icon-76x76.png">
+<link rel="apple-touch-icon" sizes="152x152" href="images/apple-touch-icon-152x152.png">
+<link rel="apple-touch-icon" sizes="180x180" href="images/apple-touch-icon-180x180.png">
+<link rel="icon" type="image/png" href="images/favicon-192x192.png" sizes="192x192">
+<link rel="icon" type="image/png" href="images/favicon-160x160.png" sizes="160x160">
+<link rel="icon" type="image/png" href="images/favicon-96x96.png" sizes="96x96">
+<link rel="icon" type="image/png" href="images/favicon-16x16.png" sizes="16x16">
+<link rel="icon" type="image/png" href="images/favicon-32x32.png" sizes="32x32">
+<meta name="msapplication-TileColor" content="#2b5797">
+<meta name="msapplication-TileImage" content="/mstile-144x144.png">
+<link href="css/ref.css" rel="stylesheet"
+	type="text/css" />
+<script src="js/jquery.min.js"></script>
+<script src="js/jquery-ui.min.js"></script>
+<script type="text/javascript">
+	var PRODUCTNAME = 'Highcharts'.toLowerCase(),
+		runDB = false;
+</script>
+<script src="js/ref.js"
+	type="text/javascript"></script>
+</head>
+<body>
+	<div id="top">
+		<div class="container">
+			<div class="cell">
+				<a href="http://www.highcharts.com/products/highcharts" title="Highcharts Home Page" id="logo"><img
+					alt="Highcharts Home Page"
+					src="images/Highcharts.svg"
+					border="0"></a>
+			</div>
+			<div class="cell" style="text-align: center;">
+				<h1>Options Reference v.4.1.6</h1>
+			</div>
+			<div class="cell hidden-offline">See also options for <a href="/highstock">Highstock</a>, <a href="/highmaps">Highmaps</a>
+			</div>
+			<div class="clearfix"></div>
+		</div>
+	</div>
+	<div id="wrapper">
+		<div class="container">
+			<div id="wrapper-inner">
+				<div id="nav-wrap">
+					<div id="nav">						
+						<div class="nav-section first">
+							<div class="ui-widget" id="search-div">
+								<div id="search-wrap">
+									<i class="fa fa-search"></i><input id="search"/>
+								</div>
+							</div>
+							<div class="nav-section-inner">
+								<h3 id="options-header">Configuration options</h3>
+								<p>For initial declarative chart setup. View as <a class="dump" href="highcharts/option/dump.json">JSON</a>.</p>
+								<div id="global-options-tree">
+									<code>Highcharts.setOptions({</code>
+									<div id="global-options" class="tree"></div>
+									<code>});</code>
+								</div>
+								<div id="options-tree">
+									<code>$("#container").highcharts({</code>
+									<div id="options" class="tree"></div>
+									<code>});</code>
+								</div>
+							</div>
+						</div>
+
+						<div class="nav-section">
+							<div class="nav-section-inner">
+								<h3>Methods and properties</h3>
+
+								<p>For dynamically modifying the chart. View as <a class="dump" href="highcharts/object/dump.json">JSON</a>. </p>
+								<div id="methods-and-properties-toc"></div>
+
+								<div id="objects-tree">
+									<div id="objects" class="tree"></div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div id="details-wrap">
+					<div id="details">
+					   <div id="splashText" class="section">
+						   <img src="images/splash.svg" />
+					   </div>
+				   </div>
+				</div>
+				<div class="clearfix"></div>
+			</div>
+		</div>
+	</div>
+	<div id="footer">
+		<div class="container">
+			<div id="footer-copy">
+				&copy;&nbsp;Highcharts 2013. All rights reserved.
+			</div>
+			<div id="footer-social">
+				<a href="https://www.facebook.com/Highcharts" title="Facebook" class="social-icon"><i class="fa fa-facebook"></i></a>
+				<a href="https://twitter.com/Highcharts" title="Twitter" class="social-icon"><i class="fa fa-twitter"></i></a>
+				<a href="http://www.linkedin.com/company/highsoft-solutions-as" title="LinkedIn" class="social-icon"><i class="fa fa-linkedin"></i></a>
+				<a href="https://github.com/highslide-software/highcharts.com" title="Github" class="social-icon"><i class="fa fa-github"></i></a>
+			</div>
+			<div class="clearfix"></div>
+		</div>
+	</div>
+	<a id="scrollTop" href="#top" style="display: none;"><i class="fa fa-arrow-up"></i></a>
+</body>
+</html>
diff --git a/data/interfaces/default/js/highcharts/api/images/Highcharts.svg b/data/interfaces/default/js/highcharts/api/images/Highcharts.svg
new file mode 100644
index 00000000..c07a9cc2
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/api/images/Highcharts.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Warstwa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="380" height="70"
+	 xml:space="preserve">
+
+<g transform="translate(-25,-30)">
+<g>
+	<path fill="#eeeaea" d="M138.475,69.712h-17.02v9.77c0,1.037-0.813,1.851-1.849,1.851c-1.037,0-1.85-0.813-1.85-1.851V57.725
+		c0-1.037,0.813-1.852,1.85-1.852c1.036,0,1.849,0.813,1.849,1.852v8.436h17.02v-8.436c0-1.037,0.814-1.852,1.85-1.852
+		c1.036,0,1.85,0.813,1.85,1.852v21.754c0,1.037-0.814,1.851-1.85,1.851c-1.036,0-1.85-0.813-1.85-1.851V69.712z"/>
+	<path fill="#eeeaea" d="M156.973,79.479c0,1.037-0.814,1.851-1.852,1.851s-1.852-0.813-1.852-1.851V57.725
+		c0-1.037,0.814-1.852,1.852-1.852s1.852,0.813,1.852,1.852V79.479z"/>
+	<path fill="#eeeaea" d="M184.125,70.378c0-1.036,0.814-1.774,1.852-1.774c1.034,0,1.852,0.813,1.852,1.849v5.847
+		c0,0.444-0.226,1.109-0.595,1.479c-2.367,2.369-5.549,3.773-9.176,3.773c-7.178,0-12.949-5.771-12.949-12.948
+		c0-7.181,5.771-12.949,12.949-12.949c3.627,0,6.809,1.405,9.176,3.771c0.738,0.74,0.738,1.852,0,2.592
+		c-0.741,0.738-1.922,0.813-2.663,0.072c-1.702-1.699-3.923-2.736-6.513-2.736c-5.104,0-9.249,4.144-9.249,9.25
+		c0,5.104,4.146,9.25,9.249,9.25c2.367,0,4.441-0.813,6.067-2.222V70.378z"/>
+	<path fill="#eeeaea" d="M218.162,69.712h-17.019v9.77c0,1.037-0.817,1.851-1.852,1.851c-1.037,0-1.849-0.813-1.849-1.851V57.725
+		c0-1.037,0.812-1.852,1.849-1.852c1.034,0,1.852,0.813,1.852,1.852v8.436h17.019v-8.436c0-1.037,0.813-1.852,1.849-1.852
+		c1.037,0,1.852,0.813,1.852,1.852v21.754c0,1.037-0.813,1.851-1.852,1.851c-1.033,0-1.849-0.813-1.849-1.851V69.712z"/>
+	<path fill="#eeeaea" d="M242.948,81.552c-7.182,0-12.949-5.771-12.949-12.948c0-7.181,5.77-12.949,12.949-12.949
+		c3.627,0,6.809,1.405,9.176,3.771c0.738,0.74,0.738,1.852,0,2.592c-0.741,0.738-1.925,0.813-2.666,0.072
+		c-1.699-1.699-3.92-2.736-6.51-2.736c-5.106,0-9.249,4.144-9.249,9.25c0,5.104,4.143,9.25,9.249,9.25
+		c2.59,0,4.884-0.962,6.586-2.664c0.74-0.741,1.849-0.741,2.59,0c0.738,0.738,0.738,1.85,0,2.589
+		C249.756,80.146,246.574,81.552,242.948,81.552z"/>
+	<path fill="#eeeaea" d="M281.569,69.712h-17.02v9.77c0,1.037-0.813,1.851-1.852,1.851c-1.034,0-1.85-0.813-1.85-1.851V57.725
+		c0-1.037,0.813-1.852,1.85-1.852c1.035,0,1.852,0.813,1.852,1.852v8.436h17.02v-8.436c0-1.037,0.813-1.852,1.853-1.852
+		c1.034,0,1.849,0.813,1.849,1.852v21.754c0,1.037-0.813,1.851-1.849,1.851c-1.037,0-1.853-0.813-1.853-1.851V69.712z"/>
+	<path fill="#eeeaea" d="M308.758,57.503l10.507,20.646c0.223,0.443,0.445,1.036,0.445,1.554c0,1.036-0.668,1.628-1.702,1.628
+		c-0.741,0-1.481-0.222-2.001-1.258l-3.253-6.438h-13.547l-3.183,6.438c-0.517,1.036-1.256,1.258-1.994,1.258
+		c-1.037,0-1.702-0.593-1.702-1.628c0-0.519,0.22-1.109,0.442-1.554l10.506-20.646c0.668-1.405,2.002-1.628,2.74-1.628
+		C306.76,55.875,308.09,56.096,308.758,57.503z M300.985,70.083h9.988l-4.957-9.99L300.985,70.083z"/>
+	<path fill="#eeeaea" d="M340.159,56.023c4.441,0,8.064,3.255,8.064,7.694c0,3.923-2.813,6.884-6.511,7.549l6.731,7.104
+		c0.664,0.666,0.889,1.85,0.146,2.516c-0.736,0.741-2.145,0.521-2.886-0.296l-8.729-9.176h-6.511v8.142
+		c0,1.034-0.815,1.774-1.854,1.774c-1.033,0-1.85-0.813-1.85-1.851V57.873c0-1.035,0.814-1.85,1.85-1.85H340.159z M330.468,59.575
+		v8.288h9.691c2.59,0,4.367-1.776,4.367-4.146c0-2.365-1.777-4.144-4.367-4.144L330.468,59.575L330.468,59.575z"/>
+	<path fill="#eeeaea" d="M365.047,59.575h-9.249c-1.033,0-1.849-0.74-1.849-1.776c0-1.034,0.813-1.773,1.849-1.773h22.201
+		c1.037,0,1.852,0.74,1.852,1.773c0,1.037-0.813,1.776-1.852,1.776h-9.249V79.48c0,1.037-0.813,1.851-1.849,1.851
+		c-1.037,0-1.854-0.813-1.854-1.851V59.575z"/>
+	<path fill="#eeeaea" d="M388.724,66.013c0-9.25,5.698-10.359,9.99-10.359c1.035,0,1.85,0.813,1.85,1.85
+		c0,1.036-0.813,1.851-1.85,1.851c-3.479,0-6.29,0.738-6.29,6.66v5.18c0,9.25-5.698,10.358-9.989,10.358
+		c-1.035,0-1.85-0.813-1.85-1.85s0.814-1.85,1.85-1.85c3.479,0,6.289-0.74,6.289-6.66V66.013z"/>
+</g>
+<polygon fill="#8087E8" points="67.981,30.52 56.757,56.73 42.009,91.171 76.301,76.685 94.465,69.013 "/>
+<polygon fill="#30426B" points="73.7,62.25 76.302,76.685 94.466,69.013 "/>
+<polygon fill="#6699A1" points="67.981,30.52 73.7,62.251 94.465,69.013 "/>
+<polygon fill="#78758C" points="73.7,62.25 94.466,69.013 56.758,56.729 42.009,91.171 76.302,76.685 "/>
+<polygon fill="#A3EDBA" points="42.009,91.171 56.757,56.73 26.442,46.855 "/>
+<polygon fill="#6699A1" points="76.302,76.685 79.628,95.13 94.466,69.013 "/>
+<polygon fill="#8087E8" points="67.981,30.52 56.757,56.73 73.7,62.251 "/>
+</g>
+</svg>
diff --git a/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-114x114.png b/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-114x114.png
new file mode 100644
index 00000000..d0745ff5
Binary files /dev/null and b/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-114x114.png differ
diff --git a/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-120x120.png b/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-120x120.png
new file mode 100644
index 00000000..cd4599f4
Binary files /dev/null and b/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-120x120.png differ
diff --git a/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-144x144.png b/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-144x144.png
new file mode 100644
index 00000000..49cd184f
Binary files /dev/null and b/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-144x144.png differ
diff --git a/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-152x152.png b/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-152x152.png
new file mode 100644
index 00000000..73865ce7
Binary files /dev/null and b/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-152x152.png differ
diff --git a/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-180x180.png b/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-180x180.png
new file mode 100644
index 00000000..79bee95c
Binary files /dev/null and b/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-180x180.png differ
diff --git a/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-57x57.png b/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-57x57.png
new file mode 100644
index 00000000..89953256
Binary files /dev/null and b/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-57x57.png differ
diff --git a/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-60x60.png b/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-60x60.png
new file mode 100644
index 00000000..7e1ba3a4
Binary files /dev/null and b/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-60x60.png differ
diff --git a/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-72x72.png b/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-72x72.png
new file mode 100644
index 00000000..55af2c22
Binary files /dev/null and b/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-72x72.png differ
diff --git a/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-76x76.png b/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-76x76.png
new file mode 100644
index 00000000..2bbc9c14
Binary files /dev/null and b/data/interfaces/default/js/highcharts/api/images/apple-touch-icon-76x76.png differ
diff --git a/data/interfaces/default/js/highcharts/api/images/favicon-160x160.png b/data/interfaces/default/js/highcharts/api/images/favicon-160x160.png
new file mode 100644
index 00000000..557da46e
Binary files /dev/null and b/data/interfaces/default/js/highcharts/api/images/favicon-160x160.png differ
diff --git a/data/interfaces/default/js/highcharts/api/images/favicon-16x16.png b/data/interfaces/default/js/highcharts/api/images/favicon-16x16.png
new file mode 100644
index 00000000..98e8169c
Binary files /dev/null and b/data/interfaces/default/js/highcharts/api/images/favicon-16x16.png differ
diff --git a/data/interfaces/default/js/highcharts/api/images/favicon-192x192.png b/data/interfaces/default/js/highcharts/api/images/favicon-192x192.png
new file mode 100644
index 00000000..df415c33
Binary files /dev/null and b/data/interfaces/default/js/highcharts/api/images/favicon-192x192.png differ
diff --git a/data/interfaces/default/js/highcharts/api/images/favicon-32x32.png b/data/interfaces/default/js/highcharts/api/images/favicon-32x32.png
new file mode 100644
index 00000000..625ac9bb
Binary files /dev/null and b/data/interfaces/default/js/highcharts/api/images/favicon-32x32.png differ
diff --git a/data/interfaces/default/js/highcharts/api/images/favicon-96x96.png b/data/interfaces/default/js/highcharts/api/images/favicon-96x96.png
new file mode 100644
index 00000000..e219a759
Binary files /dev/null and b/data/interfaces/default/js/highcharts/api/images/favicon-96x96.png differ
diff --git a/data/interfaces/default/js/highcharts/api/images/splash.svg b/data/interfaces/default/js/highcharts/api/images/splash.svg
new file mode 100644
index 00000000..cbdc6386
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/api/images/splash.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<!-- Created with Inkscape (http://www.inkscape.org/) -->

+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="256" width="1020" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">

+<metadata>

+<rdf:RDF>

+<cc:Work rdf:about="">

+<dc:format>image/svg+xml</dc:format>

+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>

+<dc:title/>

+</cc:Work>

+</rdf:RDF>

+</metadata>

+<g transform="translate(0,-796.36218)">

+<g transform="matrix(1.6460977,0,0,1.6460984,-8.1132563,652.37875)">

+<g style="letter-spacing:0px;word-spacing:0px;" font-weight="normal" font-size="68.34341431px" font-style="normal" font-stretch="normal" line-height="125%" font-variant="normal" font-family="Reenie Beanie" fill="#8085e8">

+<path d="m39.2,174c-0.00003,2.05-0.365,3.66-1.09,4.82-0.729,1.16-1.8,2.24-3.21,3.25-0.364,0.228-0.865,0.502-1.5,0.821-0.638,0.319-1.34,0.615-2.12,0.888-0.775,0.273-1.59,0.501-2.46,0.683-0.866,0.182-1.66,0.273-2.39,0.273-2.05,0-3.6-0.216-4.65-0.649-1.05-0.432-1.57-0.945-1.57-1.54-0.000011-0.638,0.182-1.16,0.546-1.57s0.683-0.638,0.957-0.684l0.753,0.546c0.227,0.228,0.545,0.468,0.955,0.719s1.07,0.376,1.98,0.376c0.865,0.00001,1.91-0.148,3.14-0.444s2.4-0.752,3.52-1.37c1.12-0.615,2.07-1.38,2.87-2.29,0.797-0.911,1.2-1.96,1.2-3.14-0.000027-1.05-0.786-2.01-2.36-2.9-1.57-0.888-4.04-1.49-7.42-1.81-1.73-0.136-3.44-0.352-5.13-0.649-1.69-0.296-3.2-0.706-4.54-1.23s-2.43-1.18-3.25-1.98c-0.82-0.797-1.23-1.79-1.23-2.97-0.000004-1.14,0.319-2.23,0.957-3.28s1.42-2.02,2.36-2.9c0.934-0.888,1.9-1.67,2.9-2.36,1-0.683,1.85-1.25,2.53-1.71,0.546-0.318,1.31-0.74,2.29-1.26,0.98-0.524,2.03-1.03,3.14-1.5,1.12-0.478,2.23-0.888,3.35-1.23,1.12-0.341,2.06-0.512,2.84-0.512,0.912,0.00004,1.53,0.251,1.85,0.752,0.318,0.501,0.478,1.21,0.478,2.12-0.000026,0.775-0.0911,1.59-0.273,2.46-0.182,0.866-0.387,1.71-0.615,2.53s-0.444,1.54-0.649,2.15c-0.204,0.615-0.353,1.01-0.444,1.2-0.182,0.41-0.387,0.683-0.615,0.82-0.228,0.136-0.387,0.204-0.478,0.204-0.182,0.00002-0.273-0.114-0.273-0.342-0.000022-0.136,0.034-0.398,0.102-0.785,0.0681-0.387,0.159-0.854,0.273-1.4,0.114-0.547,0.205-1.14,0.273-1.78,0.0681-0.637,0.102-1.28,0.102-1.91-0.000023-1-0.0456-1.73-0.137-2.19-0.0911-0.455-0.456-0.683-1.09-0.683-0.637,0.00004-1.5,0.171-2.6,0.512-1.09,0.341-2.21,0.763-3.35,1.26-1.23,0.546-2.42,1.25-3.59,2.12-1.16,0.866-2.2,1.75-3.11,2.67-0.911,0.911-1.65,1.79-2.22,2.63-0.569,0.843-0.854,1.51-0.854,2.02-0.000006,0.546,0.376,1.06,1.13,1.54,0.752,0.478,1.71,0.9,2.87,1.26,1.16,0.365,2.45,0.684,3.86,0.957s2.8,0.478,4.17,0.614c1.14,0.136,2.39,0.318,3.76,0.546s2.64,0.593,3.83,1.09c1.18,0.501,2.19,1.17,3.01,2.02,0.82,0.843,1.23,1.93,1.23,3.25z"/>

+<path d="m61.9,177c0.0459,0.0918,0.0688,0.229,0.0688,0.411-0.000022,0.274-0.205,0.684-0.615,1.23-0.136,0.182-0.432,0.478-0.888,0.888s-1.07,0.82-1.85,1.23c-0.774,0.41-1.72,0.774-2.84,1.09-1.12,0.318-2.43,0.478-3.93,0.478-1.05,0-2.07-0.239-3.07-0.717s-1.89-1.18-2.67-2.12c-0.774-0.934-1.41-2.1-1.91-3.49-0.501-1.39-0.752-3.02-0.752-4.89-0.000003-1.78,0.228-3.44,0.683-4.99s1.04-2.92,1.74-4.1c0.706-1.18,1.49-2.12,2.36-2.8,0.866-0.683,1.71-1.03,2.53-1.03,0.729,0.00003,1.47,0.148,2.22,0.444,0.752,0.296,1.44,0.672,2.05,1.13,0.615,0.456,1.1,0.969,1.47,1.54,0.365,0.569,0.547,1.15,0.547,1.74-0.000017,0.683-0.308,1.39-0.923,2.12-0.615,0.729-1.36,1.4-2.22,2.02-0.866,0.615-1.73,1.12-2.6,1.5-0.866,0.387-1.55,0.581-2.05,0.581-0.273,0.00001-0.511-0.125-0.716-0.376s-0.308-0.559-0.308-0.923c-0.000008-0.638,0.285-1.14,0.854-1.5,0.569-0.364,1.2-0.695,1.88-0.991,0.683-0.296,1.31-0.649,1.88-1.06,0.569-0.41,0.854-0.98,0.854-1.71-0.000013-0.0918-0.114-0.32-0.342-0.684s-0.843-0.546-1.85-0.546c-0.455,0.00002-0.978,0.262-1.57,0.786s-1.16,1.23-1.71,2.12c-0.547,0.889-1,1.94-1.37,3.14-0.364,1.21-0.546,2.52-0.546,3.93-0.000006,1.18,0.217,2.26,0.65,3.21,0.433,0.957,0.991,1.77,1.67,2.43,0.683,0.661,1.48,1.17,2.39,1.54,0.911,0.364,1.85,0.546,2.8,0.546,0.683,0,1.42-0.148,2.22-0.444,0.797-0.296,1.55-0.615,2.26-0.957,0.706-0.342,1.32-0.661,1.84-0.957,0.523-0.296,0.854-0.444,0.992-0.444,0.136,0.00001,0.284,0.0685,0.443,0.205,0.159,0.137,0.262,0.274,0.308,0.41z"/>

+<path d="m99.3,170c-0.000036,0.82-0.376,1.83-1.13,3.04-0.752,1.21-1.77,2.38-3.04,3.52-1.28,1.14-2.76,2.11-4.44,2.9-1.69,0.797-3.44,1.2-5.26,1.2-0.82,0.00001-1.69-0.137-2.6-0.41-0.911-0.273-1.8-0.672-2.67-1.2-0.866-0.524-1.64-1.16-2.32-1.91-0.683-0.752-1.19-1.61-1.5-2.56-0.273,0.273-0.602,0.728-0.99,1.37-0.387,0.638-0.809,1.29-1.26,1.95-0.456,0.66-0.957,1.23-1.5,1.71-0.546,0.478-1.12,0.717-1.71,0.717-0.592,0.00001-1.08-0.308-1.47-0.923-0.387-0.615-0.695-1.3-0.923-2.05-0.228-0.752-0.388-1.47-0.479-2.15-0.0911-0.683-0.137-1.07-0.137-1.16-0.000003-0.548,0.16-1.58,0.479-3.11s0.797-3.11,1.43-4.75c0.638-1.64,1.45-3.1,2.43-4.37,0.98-1.28,2.13-1.91,3.45-1.91,0.501,0.00003,0.831,0.216,0.991,0.649,0.16,0.432,0.24,0.854,0.24,1.26v2.05c0.227,0.182,0.465,0.308,0.716,0.376,0.251,0.0688,0.479,0.16,0.684,0.273s0.365,0.284,0.479,0.512,0.171,0.592,0.171,1.09c-0.000015,0.32-0.023,0.605-0.0688,0.855-0.0459,0.25-0.0688,0.489-0.0688,0.717-0.000015,1.18,0.0911,2.35,0.273,3.49s0.547,2.15,1.09,3.04c0.547,0.888,1.3,1.62,2.26,2.19,0.957,0.57,2.23,0.855,3.83,0.855,2.01,0.00001,3.7-0.422,5.09-1.26,1.39-0.843,2.55-1.78,3.49-2.8,0.934-1.02,1.67-1.96,2.22-2.8,0.546-0.843,1-1.26,1.37-1.26,0.592,0.00002,0.888,0.296,0.888,0.888zm-24-3.01c-0.000011-0.182-0.0456-0.353-0.137-0.512-0.0911-0.159-0.137-0.307-0.137-0.443-0.000011-0.182,0.0455-0.342,0.137-0.479,0.0911-0.137,0.137-0.319,0.137-0.547-0.000011-0.136-0.0456-0.238-0.137-0.307-0.0911-0.0681-0.137-0.148-0.137-0.24-0.41,0.0918-0.832,0.479-1.26,1.16-0.433,0.683-0.843,1.48-1.23,2.39-0.387,0.911-0.695,1.83-0.922,2.77-0.227,0.934-0.341,1.7-0.341,2.29-0.000008,0.318,0.0911,0.842,0.273,1.57,0.182,0.729,0.387,1.21,0.615,1.44,0.774-1.59,1.49-3.14,2.15-4.65,0.66-1.5,0.991-2.98,0.991-4.44z"/>

+<path d="m116,163c-0.00001,0.318-0.137,0.58-0.41,0.785s-0.592,0.376-0.957,0.513-0.73,0.24-1.09,0.308c-0.364,0.0682-0.66,0.102-0.888,0.102-0.683,0.00002-1.14-0.0455-1.37-0.137-0.228-0.091-0.41-0.137-0.546-0.137-1.14,0.00002-2.05,0.0911-2.73,0.273-0.683,0.182-1.22,0.478-1.61,0.888-0.387,0.41-0.638,0.923-0.752,1.54-0.114,0.615-0.171,1.36-0.171,2.22-0.00001,1.46,0.057,2.62,0.171,3.49,0.114,0.866,0.228,1.57,0.341,2.12,0.113,0.546,0.227,0.968,0.341,1.26,0.114,0.296,0.171,0.581,0.171,0.855-0.00001,0.364-0.194,0.752-0.581,1.16-0.387,0.41-0.74,0.615-1.06,0.615-0.546,0-1.04-0.49-1.47-1.47-0.433-0.98-0.798-2.14-1.09-3.49-0.296-1.34-0.535-2.68-0.717-4s-0.273-2.32-0.273-3.01c0-0.776,0.0681-1.52,0.204-2.22,0.136-0.706,0.318-1.32,0.546-1.84,0.228-0.524,0.479-0.946,0.752-1.26,0.273-0.319,0.547-0.479,0.821-0.479,0.228,0.00003,0.41,0.08,0.546,0.24s0.25,0.342,0.341,0.547c0.0911,0.205,0.194,0.387,0.308,0.546s0.262,0.239,0.444,0.239c0.41,0.00003,1.07-0.205,1.98-0.615,0.911-0.41,2.03-0.615,3.35-0.615,1.23,0.00002,2.15,0.0341,2.77,0.102,0.615,0.0682,1.22,0.216,1.81,0.444,0.136,0.0459,0.307,0.148,0.512,0.308,0.205,0.159,0.308,0.399,0.308,0.719z"/>

+<path d="m141,172c-0.00002,0.456-0.0685,0.923-0.205,1.4-0.137,0.478-0.274,0.877-0.41,1.2-0.0918,0.138-0.513,0.605-1.26,1.4-0.752,0.797-1.69,1.63-2.8,2.49-1.12,0.866-2.37,1.65-3.76,2.36-1.39,0.706-2.72,1.06-4,1.06-0.774,0-1.56-0.137-2.36-0.411-0.797-0.274-1.54-0.718-2.22-1.33-0.683-0.615-1.24-1.38-1.67-2.29-0.432-0.911-0.649-2.03-0.649-3.35,0-2.19,0.364-4.17,1.09-5.95,0.729-1.78,1.46-3.19,2.19-4.24,0.32-0.501,0.741-1.01,1.26-1.54,0.524-0.524,1.04-1,1.54-1.43,0.501-0.432,0.968-0.786,1.4-1.06,0.433-0.274,0.741-0.411,0.923-0.411,0.41,0.00002,0.786,0.114,1.13,0.342,0.341,0.228,0.512,0.456,0.512,0.684-0.00001,0.364-0.102,0.672-0.307,0.922-0.204,0.25-0.489,0.524-0.854,0.82s-0.798,0.684-1.3,1.16c-0.501,0.479-1.03,1.11-1.57,1.88-1.09,1.5-1.9,3.04-2.43,4.61-0.524,1.57-0.786,2.95-0.786,4.13s0.444,2.13,1.33,2.84c0.888,0.706,1.81,1.06,2.77,1.06,1.73,0,3.27-0.387,4.61-1.16,1.34-0.774,2.5-1.64,3.45-2.6,0.957-0.957,1.73-1.82,2.32-2.6,0.592-0.774,1.02-1.16,1.3-1.16,0.502,0.00001,0.753,0.387,0.753,1.16z"/>

+<path d="m169,171c0.228,0.228,0.342,0.365,0.342,0.411-0.00003,0.0904-0.125,0.363-0.375,0.819-0.25,0.455-0.581,0.934-0.991,1.43-0.41,0.501-0.854,0.946-1.33,1.33-0.478,0.387-0.946,0.581-1.4,0.581-0.957,0.00001-1.73-0.194-2.32-0.581-0.592-0.387-1.08-0.877-1.47-1.47-0.387-0.592-0.683-1.24-0.888-1.95-0.205-0.706-0.376-1.38-0.512-2.02-0.0918-0.32-0.183-0.48-0.273-0.48-0.138,0.00002-0.411,0.49-0.821,1.47s-0.853,2.05-1.33,3.21c-0.478,1.16-0.934,2.23-1.37,3.21-0.433,0.98-0.718,1.47-0.854,1.47-0.82,0.00001-1.52-0.353-2.08-1.06-0.569-0.706-1.03-1.53-1.37-2.46-0.342-0.934-0.604-1.89-0.786-2.87s-0.296-1.74-0.342-2.29c-0.136-1.23-0.432-3.28-0.887-6.15s-0.843-6.36-1.16-10.5c-0.0904-0.865-0.193-1.65-0.307-2.36-0.114-0.706-0.24-1.49-0.376-2.36-0.137-0.866-0.251-1.85-0.342-2.94-0.0911-1.09-0.137-2.44-0.137-4.03,0-0.0903,0.0229-0.386,0.0688-0.887s0.114-1.05,0.205-1.64c0.0911-0.592,0.239-1.12,0.444-1.57,0.205-0.456,0.444-0.684,0.716-0.684,0.32,0.00005,0.616,0.194,0.89,0.581,0.273,0.387,0.512,0.832,0.717,1.33,0.205,0.501,0.353,0.98,0.444,1.44,0.0911,0.456,0.137,0.775,0.137,0.957-0.00001,0.683-0.0455,1.32-0.137,1.91-0.0911,0.592-0.137,1.14-0.137,1.64,0,0.683,0.057,1.55,0.171,2.6s0.262,2.12,0.444,3.21,0.341,2.15,0.478,3.18c0.136,1.03,0.25,1.86,0.342,2.5-0.00001,0.0445,0.0455,0.363,0.137,0.955,0.0911,0.592,0.194,1.33,0.308,2.22,0.114,0.889,0.228,1.85,0.342,2.87,0.114,1.03,0.239,2.03,0.375,3.01s0.261,1.85,0.375,2.6c0.114,0.752,0.194,1.29,0.24,1.61-0.00001,0.136,0.0341,0.33,0.102,0.58,0.0681,0.25,0.136,0.535,0.204,0.854,0.0681,0.319,0.148,0.615,0.24,0.888,0.0918,0.273,0.206,0.479,0.342,0.616,0.273-0.546,0.625-1.39,1.06-2.53,0.433-1.14,0.889-2.3,1.37-3.49,0.478-1.18,0.934-2.22,1.37-3.11,0.433-0.888,0.809-1.33,1.13-1.33,0.364,0.00002,0.66,0.0685,0.888,0.205,0.228,0.137,0.524,0.251,0.888,0.341,0.456,0.182,0.684,0.421,0.684,0.717-0.00002,0.296,0.0452,0.649,0.136,1.06,0.0918,0.548,0.24,1.27,0.445,2.15,0.205,0.889,0.444,1.75,0.717,2.6,0.273,0.843,0.592,1.56,0.956,2.15,0.364,0.592,0.729,0.889,1.09,0.888,0.182,0.00001,0.433-0.239,0.752-0.717s0.752-0.74,1.3-0.786c0.0917,0.00001,0.252,0.057,0.48,0.171s0.455,0.262,0.682,0.444z"/>

+<path d="m224,135c0.0459,0.0918,0.0688,0.252,0.0688,0.48-0.00003,0.228-0.00003,0.478,0,0.751-0.00003,0.32-0.114,0.48-0.342,0.48-0.0918,0.00005-0.206-0.0229-0.342-0.0688-0.136-0.0458-0.25-0.0917-0.342-0.138-0.82-0.364-1.81-0.831-2.97-1.4s-2.47-0.854-3.93-0.854c-1.64,0.00005-2.96,0.615-3.96,1.84-1,1.23-1.77,2.65-2.29,4.27-0.524,1.62-0.866,3.2-1.03,4.75-0.159,1.55-0.239,2.67-0.239,3.35-0.00001,0.501,0.0796,1.29,0.239,2.36s0.376,2.18,0.65,3.32,0.593,2.18,0.957,3.11c0.364,0.934,0.729,1.51,1.09,1.74,0.274,0.00002,0.764-0.0229,1.47-0.0688s1.29-0.0688,1.74-0.0688c0.774,0.00003,1.5,0.0685,2.19,0.205,0.683,0.137,1.39,0.205,2.12,0.205,0.182,0.00003,0.455,0.00003,0.82,0,0.364,0.00003,0.74,0.023,1.13,0.0688,0.387,0.0459,0.717,0.126,0.991,0.239,0.273,0.113,0.41,0.261,0.41,0.443-0.00002,0.228-0.16,0.433-0.479,0.615s-0.683,0.33-1.09,0.444c-0.41,0.114-0.819,0.194-1.23,0.24-0.41,0.0459-0.729,0.0688-0.957,0.0688-0.228,0.00002-0.524-0.0114-0.888-0.0344-0.364-0.0229-0.763-0.0573-1.2-0.103-0.433-0.0459-0.843-0.0799-1.23-0.102-0.387-0.0222-0.717-0.0333-0.99-0.0334-0.73,0.00002-1.17,0.0796-1.33,0.239-0.159,0.159-0.239,0.467-0.239,0.923-0.00001,0.683,0.308,1.6,0.923,2.77,0.615,1.16,1.29,2.4,2.02,3.73,0.729,1.32,1.4,2.69,2.02,4.1,0.615,1.41,0.923,2.71,0.923,3.9-0.00002,0.227-0.057,0.648-0.171,1.26-0.114,0.615-0.274,1.24-0.479,1.88-0.205,0.638-0.49,1.21-0.854,1.71-0.364,0.501-0.774,0.752-1.23,0.752-0.364,0.00001-0.695-0.103-0.991-0.308s-0.444-0.559-0.444-1.06c-0.00001-0.729,0.194-1.41,0.581-2.05,0.387-0.638,0.581-1.32,0.581-2.05-0.00001-0.364-0.171-0.979-0.512-1.84-0.341-0.866-0.763-1.83-1.26-2.9-0.501-1.07-1.05-2.2-1.64-3.38-0.592-1.18-1.15-2.27-1.67-3.25-0.524-0.98-0.968-1.79-1.33-2.43-0.364-0.638-0.569-0.98-0.615-1.03-0.911,0.32-1.84,0.639-2.8,0.958-0.957,0.319-1.82,0.797-2.6,1.43-0.318,0.32-0.615,0.48-0.888,0.48-0.455,0.00002-0.876-0.182-1.26-0.547-0.387-0.365-0.581-0.775-0.581-1.23,0-0.502,0.148-0.901,0.444-1.2,0.296-0.296,0.581-0.512,0.853-0.649,0.41-0.228,1.05-0.479,1.91-0.752,0.866-0.273,1.73-0.501,2.6-0.683,0.318-0.0917,0.615-0.172,0.888-0.24,0.274-0.0681,0.411-0.216,0.411-0.444-0.138-0.455-0.332-1.06-0.582-1.81-0.25-0.752-0.501-1.65-0.752-2.7s-0.468-2.22-0.65-3.52-0.273-2.7-0.273-4.2c-0.00001-1.64,0.194-3.37,0.581-5.19s1-3.5,1.85-5.02c0.843-1.53,1.9-2.78,3.18-3.76s2.8-1.47,4.58-1.47c0.819,0.00005,1.73,0.08,2.73,0.24s1.93,0.388,2.77,0.684c0.843,0.296,1.55,0.661,2.12,1.09,0.569,0.432,0.854,0.922,0.854,1.47z"/>

+<path d="m240,169c-0.00002,1-0.137,1.96-0.41,2.87-0.273,0.911-0.638,1.71-1.09,2.39-0.455,0.683-0.991,1.22-1.61,1.61-0.615,0.387-1.29,0.581-2.02,0.581-1.28,0-2.28-0.365-3.01-1.09-0.729-0.729-1.29-1.57-1.67-2.53-0.388-0.957-0.639-1.92-0.752-2.9s-0.17-1.72-0.17-2.22c0-0.82,0.125-1.74,0.375-2.77s0.592-1.97,1.03-2.84c0.433-0.866,0.923-1.59,1.47-2.19,0.546-0.592,1.12-0.888,1.71-0.888,0.136,0.00003,0.352,0.0456,0.649,0.137,0.296,0.0911,0.604,0.228,0.923,0.41s0.604,0.41,0.855,0.683,0.422,0.593,0.512,0.958c0.502,0.0445,1,0.226,1.5,0.545,0.501,0.319,0.774,0.57,0.82,0.752,0.364,1.18,0.603,2.37,0.717,3.55s0.171,2.16,0.171,2.94zm-3.07-1.23c-0.00001-0.683-0.0685-1.4-0.205-2.15-0.137-0.752-0.411-1.52-0.821-2.29-0.0904,0.0459-0.204,0.0688-0.342,0.0688-0.182,0.00002-0.33-0.0226-0.444-0.0678s-0.216-0.0678-0.307-0.0678c-0.546,0.00002-0.979,0.148-1.3,0.444-0.319,0.296-0.559,0.683-0.719,1.16-0.16,0.478-0.262,0.991-0.308,1.54-0.0452,0.546-0.0678,1.07-0.0678,1.57,0,0.501,0.0226,1.06,0.0678,1.67,0.0452,0.615,0.148,1.2,0.308,1.74,0.16,0.546,0.376,1.01,0.65,1.4,0.273,0.387,0.638,0.581,1.09,0.581,0.455,0.00001,0.842-0.239,1.16-0.717,0.319-0.478,0.57-1.04,0.752-1.67,0.182-0.638,0.308-1.26,0.376-1.88,0.0688-0.615,0.103-1.06,0.103-1.33z"/>

+<path d="m263,163c-0.00002,0.318-0.137,0.58-0.41,0.785s-0.592,0.376-0.957,0.513-0.73,0.24-1.09,0.308c-0.364,0.0682-0.66,0.102-0.888,0.102-0.683,0.00002-1.14-0.0455-1.37-0.137-0.228-0.091-0.41-0.137-0.546-0.137-1.14,0.00002-2.05,0.0911-2.73,0.273-0.683,0.182-1.22,0.478-1.61,0.888-0.387,0.41-0.638,0.923-0.752,1.54-0.114,0.615-0.171,1.36-0.171,2.22,0,1.46,0.057,2.62,0.171,3.49,0.114,0.866,0.228,1.57,0.341,2.12,0.113,0.546,0.227,0.968,0.341,1.26,0.114,0.296,0.171,0.581,0.171,0.855-0.00001,0.364-0.194,0.752-0.581,1.16-0.387,0.41-0.74,0.615-1.06,0.615-0.546,0-1.04-0.49-1.47-1.47-0.433-0.98-0.798-2.14-1.09-3.49-0.296-1.34-0.535-2.68-0.717-4s-0.273-2.32-0.273-3.01c-0.00001-0.776,0.0681-1.52,0.204-2.22,0.136-0.706,0.318-1.32,0.546-1.84,0.228-0.524,0.479-0.946,0.752-1.26,0.273-0.319,0.547-0.479,0.821-0.479,0.228,0.00003,0.41,0.08,0.546,0.24s0.25,0.342,0.341,0.547c0.0911,0.205,0.194,0.387,0.308,0.546s0.262,0.239,0.444,0.239c0.41,0.00003,1.07-0.205,1.98-0.615,0.911-0.41,2.03-0.615,3.35-0.615,1.23,0.00002,2.15,0.0341,2.77,0.102,0.615,0.0682,1.22,0.216,1.81,0.444,0.136,0.0459,0.307,0.148,0.512,0.308,0.205,0.159,0.308,0.399,0.308,0.719z"/>

+<path d="m309,169c-0.00001,1-0.137,1.96-0.41,2.87-0.273,0.911-0.638,1.71-1.09,2.39-0.455,0.683-0.991,1.22-1.61,1.61-0.615,0.387-1.29,0.581-2.02,0.581-1.28,0-2.28-0.365-3.01-1.09-0.729-0.729-1.29-1.57-1.67-2.53-0.388-0.957-0.639-1.92-0.752-2.9s-0.17-1.72-0.17-2.22c-0.00001-0.82,0.125-1.74,0.375-2.77s0.592-1.97,1.03-2.84c0.433-0.866,0.923-1.59,1.47-2.19,0.546-0.592,1.12-0.888,1.71-0.888,0.136,0.00003,0.352,0.0456,0.649,0.137,0.296,0.0911,0.604,0.228,0.923,0.41s0.604,0.41,0.855,0.683,0.422,0.593,0.512,0.958c0.502,0.0445,1,0.226,1.5,0.545,0.501,0.319,0.774,0.57,0.82,0.752,0.364,1.18,0.603,2.37,0.717,3.55s0.171,2.16,0.171,2.94zm-3.07-1.23c-0.00001-0.683-0.0685-1.4-0.205-2.15-0.137-0.752-0.411-1.52-0.821-2.29-0.0904,0.0459-0.204,0.0688-0.342,0.0688-0.182,0.00002-0.33-0.0226-0.444-0.0678s-0.216-0.0678-0.307-0.0678c-0.546,0.00002-0.979,0.148-1.3,0.444-0.319,0.296-0.559,0.683-0.719,1.16-0.16,0.478-0.262,0.991-0.308,1.54-0.0452,0.546-0.0678,1.07-0.0678,1.57-0.00001,0.501,0.0226,1.06,0.0678,1.67,0.0452,0.615,0.148,1.2,0.308,1.74,0.16,0.546,0.376,1.01,0.65,1.4,0.273,0.387,0.638,0.581,1.09,0.581,0.455,0.00001,0.842-0.239,1.16-0.717,0.319-0.478,0.57-1.04,0.752-1.67,0.182-0.638,0.308-1.26,0.376-1.88,0.0688-0.615,0.103-1.06,0.103-1.33z"/>

+<path d="m338,164c-0.00002,1.18-0.33,2.32-0.991,3.42-0.66,1.09-1.47,2.11-2.43,3.04-0.957,0.934-2,1.8-3.14,2.6-1.14,0.797-2.19,1.49-3.14,2.08-0.911,0.638-1.66,1.16-2.25,1.57-0.592,0.41-0.889,0.729-0.888,0.957-0.00001,0.592,0.0681,1.42,0.204,2.49s0.307,2.23,0.512,3.49c0.205,1.25,0.41,2.54,0.615,3.86s0.354,2.53,0.445,3.62c-0.00002,0.0459,0.034,0.251,0.102,0.615,0.0681,0.364,0.159,0.774,0.273,1.23,0.114,0.455,0.205,0.877,0.273,1.26,0.0681,0.387,0.102,0.627,0.102,0.719-0.00001,0.318-0.0111,0.671-0.0334,1.06-0.0223,0.387-0.0904,0.752-0.204,1.09-0.114,0.342-0.285,0.627-0.513,0.855s-0.524,0.342-0.888,0.342c-0.502-0.00001-0.867-0.217-1.09-0.65-0.227-0.433-0.341-0.855-0.341-1.26-0.00001-0.0904,0.0111-0.181,0.0334-0.273,0.0222-0.0918,0.0333-0.206,0.0334-0.342-0.00002-0.501-0.182-1.84-0.546-4.03s-0.774-4.8-1.23-7.83c-0.455-3.03-0.865-6.29-1.23-9.77-0.364-3.49-0.546-6.78-0.546-9.88-0.00001-0.228,0.0226-0.49,0.0678-0.786s0.0678-0.558,0.0678-0.786c-0.456,0.0459-1.13,0.251-2.02,0.616-0.888,0.365-1.77,0.809-2.63,1.33-0.866,0.524-1.63,1.07-2.29,1.64-0.66,0.569-0.991,1.08-0.991,1.54h-0.478c-0.138,0.00002-0.309-0.0911-0.514-0.273s-0.387-0.387-0.546-0.615-0.307-0.456-0.444-0.683-0.205-0.387-0.205-0.479c0.00001-0.957,0.57-1.86,1.71-2.7,1.14-0.843,2.56-1.6,4.27-2.26s3.59-1.18,5.64-1.57c2.05-0.387,3.99-0.581,5.81-0.581,1.78,0.00003,3.27,0.205,4.48,0.615s2.18,0.9,2.9,1.47c0.729,0.569,1.25,1.15,1.57,1.74,0.319,0.592,0.479,1.09,0.479,1.5zm-3.35-0.204c-0.00002-0.456-0.57-0.923-1.71-1.4-1.14-0.478-2.48-0.717-4.03-0.717-1.37,0.00002-2.37,0.0456-3.01,0.137-0.638,0.0911-1.07,0.183-1.3,0.274-0.0918,0.729-0.16,1.59-0.205,2.6-0.0452,1-0.0678,2.03-0.0678,3.07-0.00001,1.09,0.0341,2.15,0.102,3.18,0.0681,1.02,0.147,1.88,0.238,2.56,0.638-0.41,1.52-0.968,2.63-1.67,1.12-0.706,2.22-1.5,3.32-2.39,1.09-0.888,2.04-1.82,2.84-2.8,0.797-0.98,1.2-1.92,1.2-2.84z"/>

+<path d="m360,153c-0.592,0.683-1.44,1.35-2.53,2.02-1.09,0.661-2.19,1.26-3.28,1.81-1.09,0.546-2.05,1.01-2.87,1.4-0.82,0.387-1.23,0.649-1.23,0.785-0.00001,0.138,0.0911,0.548,0.273,1.23,0.182,0.683,0.398,1.49,0.649,2.43,0.25,0.934,0.512,1.9,0.786,2.9s0.502,1.89,0.684,2.67c0.0904,0.456,0.204,1.05,0.341,1.78,0.137,0.729,0.262,1.46,0.376,2.19,0.114,0.729,0.217,1.38,0.308,1.95,0.0911,0.569,0.137,0.877,0.137,0.923-0.00001,0.683-0.114,1.39-0.342,2.12-0.228,0.729-0.592,1.09-1.09,1.09-0.274,0-0.525-0.114-0.753-0.342s-0.433-0.49-0.615-0.786-0.319-0.581-0.41-0.854c-0.0911-0.273-0.137-0.478-0.137-0.614-0.00001-0.0918,0.0115-0.229,0.0344-0.411s0.0344-0.387,0.0344-0.615c-0.00002-0.865-0.137-2.12-0.411-3.76-0.0904-0.501-0.272-1.28-0.545-2.32-0.273-1.05-0.547-2.12-0.821-3.21-0.318-1.28-0.683-2.67-1.09-4.17-0.182-0.638-0.296-0.957-0.342-0.957-0.32,0.00002-0.855,0.194-1.61,0.581-0.752,0.387-1.61,0.866-2.56,1.44-0.957,0.57-1.96,1.19-3.01,1.85s-2.03,1.28-2.94,1.84c-0.911,0.569-1.7,1.05-2.36,1.43-0.66,0.387-1.06,0.581-1.2,0.581-0.592,0.00002-1.07-0.205-1.43-0.615-0.364-0.41-0.546-0.866-0.546-1.37,0-0.274,0.376-0.673,1.13-1.2,0.752-0.523,1.69-1.1,2.8-1.74,1.12-0.638,2.32-1.3,3.62-1.98,1.3-0.683,2.51-1.3,3.62-1.84,1.12-0.546,2.05-1,2.8-1.37,0.752-0.365,1.13-0.547,1.13-0.547-0.41-2.1-0.752-3.96-1.03-5.6-0.228-1.41-0.445-2.71-0.65-3.9-0.205-1.18-0.308-1.82-0.308-1.91,0-0.592,0.125-1.04,0.376-1.33,0.251-0.296,0.536-0.444,0.854-0.444,0.502,0.00004,0.821,0.342,0.957,1.03,0.501,2.46,0.967,4.65,1.4,6.56s0.855,3.46,1.26,4.65c0.41-0.0904,1.12-0.352,2.12-0.785s2.05-0.9,3.14-1.4c1.09-0.501,2.08-0.945,2.97-1.33,0.888-0.387,1.4-0.581,1.54-0.581,0.273,0.00003,0.443,0.0914,0.512,0.274,0.0688,0.183,0.148,0.342,0.239,0.479z"/>

+<path d="m368,153c-0.00001,0.0904-0.16,0.272-0.479,0.545s-0.695,0.558-1.13,0.854c-0.432,0.296-0.877,0.558-1.33,0.786-0.456,0.228-0.82,0.342-1.09,0.342-0.182,0.00003-0.421-0.0114-0.717-0.0344-0.296-0.0229-0.592-0.103-0.888-0.239s-0.558-0.33-0.786-0.581-0.342-0.582-0.342-0.992c0-0.637,0.228-1.24,0.683-1.81s1.05-0.855,1.78-0.855c0.136,0.00004,0.444,0.057,0.922,0.171s0.968,0.262,1.47,0.444c0.501,0.182,0.946,0.387,1.33,0.615,0.387,0.228,0.581,0.479,0.581,0.753zm2.25,25.6c-0.00001,0.318-0.239,0.592-0.717,0.82s-0.832,0.342-1.06,0.342c-0.455,0.00001-0.865-0.296-1.23-0.888s-0.684-1.28-0.957-2.05c-0.273-0.774-0.501-1.51-0.683-2.22-0.182-0.706-0.318-1.2-0.409-1.47-0.138-0.456-0.32-1-0.547-1.64-0.227-0.638-0.444-1.25-0.649-1.85-0.205-0.592-0.376-1.12-0.513-1.57-0.137-0.455-0.205-0.706-0.205-0.752-0.00001-0.638,0.125-1.23,0.375-1.78,0.25-0.546,0.558-0.82,0.924-0.82,0.41,0.00002,0.843,0.319,1.3,0.957,0.455,0.638,0.899,1.45,1.33,2.43,0.432,0.98,0.831,2.05,1.2,3.21,0.365,1.16,0.684,2.25,0.957,3.28,0.273,1.02,0.489,1.91,0.649,2.67,0.159,0.752,0.239,1.2,0.239,1.33z"/>

+<path d="m386,169c-0.00001,1-0.137,1.96-0.41,2.87-0.273,0.911-0.638,1.71-1.09,2.39-0.455,0.683-0.991,1.22-1.61,1.61-0.615,0.387-1.29,0.581-2.02,0.581-1.28,0-2.28-0.365-3.01-1.09-0.729-0.729-1.29-1.57-1.67-2.53-0.388-0.957-0.639-1.92-0.752-2.9s-0.17-1.72-0.17-2.22c-0.00001-0.82,0.125-1.74,0.375-2.77s0.592-1.97,1.03-2.84c0.433-0.866,0.923-1.59,1.47-2.19,0.546-0.592,1.12-0.888,1.71-0.888,0.136,0.00003,0.352,0.0456,0.649,0.137,0.296,0.0911,0.604,0.228,0.923,0.41s0.604,0.41,0.855,0.683,0.422,0.593,0.512,0.958c0.502,0.0445,1,0.226,1.5,0.545,0.501,0.319,0.774,0.57,0.82,0.752,0.364,1.18,0.603,2.37,0.717,3.55s0.171,2.16,0.171,2.94zm-3.07-1.23c-0.00001-0.683-0.0685-1.4-0.205-2.15-0.137-0.752-0.411-1.52-0.821-2.29-0.0904,0.0459-0.204,0.0688-0.342,0.0688-0.182,0.00002-0.33-0.0226-0.444-0.0678s-0.216-0.0678-0.307-0.0678c-0.546,0.00002-0.979,0.148-1.3,0.444-0.319,0.296-0.559,0.683-0.719,1.16-0.16,0.478-0.262,0.991-0.308,1.54-0.0452,0.546-0.0678,1.07-0.0678,1.57-0.00001,0.501,0.0226,1.06,0.0678,1.67,0.0452,0.615,0.148,1.2,0.308,1.74,0.16,0.546,0.376,1.01,0.65,1.4,0.273,0.387,0.638,0.581,1.09,0.581,0.455,0.00001,0.842-0.239,1.16-0.717,0.319-0.478,0.57-1.04,0.752-1.67,0.182-0.638,0.308-1.26,0.376-1.88,0.0688-0.615,0.103-1.06,0.103-1.33z"/>

+<path d="m414,176c-0.00003,0.273-0.0911,0.545-0.273,0.819-0.182,0.273-0.398,0.524-0.649,0.752-0.25,0.228-0.524,0.422-0.82,0.581s-0.558,0.239-0.786,0.239c-0.774,0-1.77-0.171-2.97-0.512-1.21-0.341-2.18-0.876-2.9-1.6-0.774-0.774-1.46-1.7-2.05-2.77-0.592-1.07-1.25-2.65-1.98-4.75-0.501,2.01-1.08,3.99-1.74,5.95s-1.72,3.76-3.18,5.4c-0.0904,0.0904-0.227,0.136-0.411,0.136-0.318,0-0.66-0.16-1.02-0.479-0.364-0.319-0.546-0.638-0.546-0.956-0.00001-0.318-0.0344-1.06-0.103-2.22-0.0688-1.16-0.149-2.46-0.24-3.9-0.0911-1.43-0.171-2.89-0.239-4.37-0.0681-1.48-0.102-2.7-0.102-3.66-0.00001-0.456,0.0229-1.06,0.0688-1.81,0.0459-0.752,0.182-1.4,0.409-1.95,0.0459-0.0917,0.217-0.274,0.513-0.547s0.626-0.41,0.991-0.41c0.32,0.00002,0.502,0.205,0.547,0.615,0.0452,0.41,0.0678,0.866,0.0678,1.37v10.8c0,0.228,0.0344,0.547,0.103,0.956,0.0688,0.41,0.171,0.705,0.308,0.887,0.501-1.09,0.967-2.38,1.4-3.86s0.855-2.89,1.26-4.24c0.41-1.34,0.82-2.48,1.23-3.42,0.41-0.934,0.82-1.4,1.23-1.4,0.456,0.00003,0.821,0.0911,1.09,0.273,0.273,0.182,0.501,0.547,0.683,1.09,0.228,1.32,0.411,2.49,0.547,3.52,0.137,1.02,0.308,1.95,0.513,2.77s0.501,1.58,0.888,2.29c0.387,0.706,0.922,1.36,1.6,1.95,0.638,0.592,1.36,1.03,2.15,1.3,0.797,0.273,1.49,0.41,2.08,0.41,0.274,0.00001,0.57-0.057,0.888-0.171s0.546-0.171,0.684-0.171c0.182,0.00001,0.353,0.16,0.512,0.479s0.239,0.525,0.239,0.616z"/>

+<path d="m433,175c-0.00002,0.774-0.262,1.45-0.786,2.02-0.524,0.569-1.19,1.05-1.98,1.43-0.797,0.387-1.67,0.695-2.63,0.923-0.957,0.228-1.87,0.399-2.73,0.512-0.866,0.113-1.63,0.181-2.29,0.204-0.661,0.023-1.08,0.0344-1.26,0.0344-1,0.00001-1.78-0.16-2.32-0.479-0.546-0.319-0.82-0.888-0.82-1.71,0-0.274,0.0226-0.513,0.0678-0.719,0.0452-0.205,0.228-0.308,0.547-0.308,0.136,0.00001,0.364,0.0341,0.683,0.102,0.319,0.0681,0.57,0.102,0.752,0.102,0.182,0.00001,0.763-0.0341,1.74-0.102,0.98-0.0681,2.03-0.193,3.14-0.375,1.12-0.182,2.12-0.444,3.01-0.786,0.888-0.342,1.33-0.786,1.33-1.33-0.00001-0.0904-0.467-0.375-1.4-0.853-0.934-0.478-2.34-1.29-4.2-2.43-1.46-0.911-2.48-1.83-3.08-2.77-0.592-0.934-0.888-2.2-0.888-3.79,0-1,0.217-1.82,0.65-2.46,0.433-0.638,1.03-1.14,1.78-1.5,0.752-0.364,1.62-0.626,2.6-0.785s2.02-0.239,3.11-0.239c0.0918,0.00003,0.377,0.0456,0.855,0.137,0.478,0.0911,0.991,0.239,1.54,0.444,0.547,0.205,1.04,0.456,1.47,0.752,0.432,0.296,0.649,0.626,0.649,0.991-0.00002,0.0904-0.0796,0.227-0.239,0.409s-0.421,0.524-0.785,1.03c-0.138-0.0459-0.377-0.114-0.719-0.205-0.341-0.091-0.729-0.194-1.16-0.308-0.433-0.114-0.877-0.205-1.33-0.273-0.455-0.0681-0.82-0.102-1.09-0.102-1.18,0.00002-2.14,0.216-2.87,0.649-0.729,0.432-1.09,1.26-1.09,2.49-0.00001,0.592,0.239,1.14,0.717,1.64,0.478,0.501,1.08,0.968,1.81,1.4,0.729,0.433,1.51,0.866,2.36,1.3,0.843,0.432,1.63,0.899,2.36,1.4,0.729,0.501,1.33,1.04,1.81,1.61,0.479,0.569,0.718,1.22,0.719,1.95z"/>

+<path d="m489,171c0.228,0.228,0.342,0.365,0.342,0.411-0.00002,0.0904-0.125,0.363-0.375,0.819-0.25,0.455-0.581,0.934-0.991,1.43-0.41,0.501-0.854,0.946-1.33,1.33-0.478,0.387-0.946,0.581-1.4,0.581-0.957,0.00001-1.73-0.194-2.32-0.581-0.592-0.387-1.08-0.877-1.47-1.47-0.387-0.592-0.683-1.24-0.888-1.95-0.205-0.706-0.376-1.38-0.512-2.02-0.0918-0.32-0.183-0.48-0.273-0.48-0.138,0.00002-0.411,0.49-0.821,1.47s-0.853,2.05-1.33,3.21c-0.478,1.16-0.934,2.23-1.37,3.21-0.433,0.98-0.718,1.47-0.854,1.47-0.82,0.00001-1.52-0.353-2.08-1.06-0.569-0.706-1.03-1.53-1.37-2.46-0.342-0.934-0.604-1.89-0.786-2.87s-0.296-1.74-0.342-2.29c-0.136-1.23-0.432-3.28-0.887-6.15s-0.843-6.36-1.16-10.5c-0.0904-0.865-0.193-1.65-0.307-2.36-0.114-0.706-0.24-1.49-0.376-2.36-0.137-0.866-0.251-1.85-0.342-2.94-0.0911-1.09-0.137-2.44-0.137-4.03,0-0.0903,0.0229-0.386,0.0688-0.887s0.114-1.05,0.205-1.64c0.0911-0.592,0.239-1.12,0.444-1.57,0.205-0.456,0.444-0.684,0.716-0.684,0.32,0.00005,0.616,0.194,0.89,0.581,0.273,0.387,0.512,0.832,0.717,1.33,0.205,0.501,0.353,0.98,0.444,1.44,0.0911,0.456,0.137,0.775,0.137,0.957-0.00001,0.683-0.0455,1.32-0.137,1.91-0.0911,0.592-0.137,1.14-0.137,1.64-0.00001,0.683,0.057,1.55,0.171,2.6s0.262,2.12,0.444,3.21,0.341,2.15,0.478,3.18c0.136,1.03,0.25,1.86,0.342,2.5-0.00001,0.0445,0.0455,0.363,0.137,0.955,0.0911,0.592,0.194,1.33,0.308,2.22,0.114,0.889,0.228,1.85,0.342,2.87,0.114,1.03,0.239,2.03,0.375,3.01s0.261,1.85,0.375,2.6c0.114,0.752,0.194,1.29,0.24,1.61-0.00001,0.136,0.034,0.33,0.102,0.58,0.0681,0.25,0.136,0.535,0.204,0.854,0.0681,0.319,0.148,0.615,0.24,0.888,0.0917,0.273,0.206,0.479,0.342,0.616,0.273-0.546,0.625-1.39,1.06-2.53,0.433-1.14,0.889-2.3,1.37-3.49,0.478-1.18,0.934-2.22,1.37-3.11,0.433-0.888,0.809-1.33,1.13-1.33,0.364,0.00002,0.66,0.0685,0.888,0.205,0.228,0.137,0.524,0.251,0.888,0.341,0.456,0.182,0.684,0.421,0.684,0.717-0.00002,0.296,0.0452,0.649,0.136,1.06,0.0918,0.548,0.24,1.27,0.445,2.15,0.205,0.889,0.444,1.75,0.717,2.6,0.273,0.843,0.592,1.56,0.956,2.15,0.364,0.592,0.729,0.889,1.09,0.888,0.182,0.00001,0.433-0.239,0.752-0.717s0.752-0.74,1.3-0.786c0.0918,0.00001,0.252,0.057,0.48,0.171s0.455,0.262,0.682,0.444z"/>

+<path d="m512,177c0.0459,0.0918,0.0688,0.229,0.0688,0.411-0.00002,0.274-0.205,0.684-0.615,1.23-0.136,0.182-0.432,0.478-0.888,0.888s-1.07,0.82-1.85,1.23c-0.774,0.41-1.72,0.774-2.84,1.09-1.12,0.318-2.43,0.478-3.93,0.478-1.05,0-2.07-0.239-3.07-0.717s-1.89-1.18-2.67-2.12c-0.774-0.934-1.41-2.1-1.91-3.49-0.501-1.39-0.752-3.02-0.752-4.89,0-1.78,0.228-3.44,0.683-4.99s1.04-2.92,1.74-4.1c0.706-1.18,1.49-2.12,2.36-2.8,0.866-0.683,1.71-1.03,2.53-1.03,0.729,0.00003,1.47,0.148,2.22,0.444,0.752,0.296,1.44,0.672,2.05,1.13,0.615,0.456,1.1,0.969,1.47,1.54,0.365,0.569,0.547,1.15,0.547,1.74-0.00001,0.683-0.308,1.39-0.923,2.12-0.615,0.729-1.36,1.4-2.22,2.02-0.866,0.615-1.73,1.12-2.6,1.5-0.866,0.387-1.55,0.581-2.05,0.581-0.273,0.00001-0.511-0.125-0.716-0.376s-0.308-0.559-0.308-0.923c-0.00001-0.638,0.285-1.14,0.854-1.5,0.569-0.364,1.2-0.695,1.88-0.991,0.683-0.296,1.31-0.649,1.88-1.06,0.569-0.41,0.854-0.98,0.854-1.71-0.00002-0.0918-0.114-0.32-0.342-0.684s-0.843-0.546-1.85-0.546c-0.455,0.00002-0.978,0.262-1.57,0.786s-1.16,1.23-1.71,2.12c-0.547,0.889-1,1.94-1.37,3.14-0.364,1.21-0.546,2.52-0.546,3.93,0,1.18,0.217,2.26,0.65,3.21,0.433,0.957,0.991,1.77,1.67,2.43,0.683,0.661,1.48,1.17,2.39,1.54,0.911,0.364,1.85,0.546,2.8,0.546,0.683,0,1.42-0.148,2.22-0.444,0.797-0.296,1.55-0.615,2.26-0.957,0.706-0.342,1.32-0.661,1.84-0.957,0.523-0.296,0.854-0.444,0.992-0.444,0.136,0.00001,0.284,0.0685,0.443,0.205,0.159,0.137,0.262,0.274,0.308,0.41z"/>

+<path d="m533,163c-0.00002,0.318-0.137,0.58-0.41,0.785s-0.592,0.376-0.957,0.513-0.73,0.24-1.09,0.308c-0.364,0.0682-0.66,0.102-0.888,0.102-0.683,0.00002-1.14-0.0455-1.37-0.137-0.228-0.091-0.41-0.137-0.546-0.137-1.14,0.00002-2.05,0.0911-2.73,0.273-0.683,0.182-1.22,0.478-1.61,0.888-0.387,0.41-0.638,0.923-0.752,1.54-0.114,0.615-0.171,1.36-0.171,2.22-0.00001,1.46,0.057,2.62,0.171,3.49,0.114,0.866,0.228,1.57,0.341,2.12,0.113,0.546,0.227,0.968,0.341,1.26,0.114,0.296,0.171,0.581,0.171,0.855-0.00001,0.364-0.194,0.752-0.581,1.16-0.387,0.41-0.74,0.615-1.06,0.615-0.546,0-1.04-0.49-1.47-1.47-0.433-0.98-0.798-2.14-1.09-3.49-0.296-1.34-0.535-2.68-0.717-4s-0.273-2.32-0.273-3.01c0-0.776,0.0681-1.52,0.204-2.22,0.136-0.706,0.318-1.32,0.546-1.84,0.228-0.524,0.479-0.946,0.752-1.26,0.273-0.319,0.547-0.479,0.821-0.479,0.228,0.00003,0.41,0.08,0.546,0.24s0.25,0.342,0.341,0.547c0.0911,0.205,0.194,0.387,0.308,0.546s0.262,0.239,0.444,0.239c0.41,0.00003,1.07-0.205,1.98-0.615,0.911-0.41,2.03-0.615,3.35-0.615,1.23,0.00002,2.15,0.0341,2.77,0.102,0.615,0.0682,1.22,0.216,1.81,0.444,0.136,0.0459,0.307,0.148,0.512,0.308,0.205,0.159,0.308,0.399,0.308,0.719z"/>

+<path d="m558,177c0.0459,0.0918,0.0688,0.229,0.0688,0.411-0.00002,0.274-0.205,0.684-0.615,1.23-0.136,0.182-0.432,0.478-0.888,0.888s-1.07,0.82-1.85,1.23c-0.774,0.41-1.72,0.774-2.84,1.09-1.12,0.318-2.43,0.478-3.93,0.478-1.05,0-2.07-0.239-3.07-0.717s-1.89-1.18-2.67-2.12c-0.774-0.934-1.41-2.1-1.91-3.49-0.501-1.39-0.752-3.02-0.752-4.89,0-1.78,0.228-3.44,0.683-4.99s1.04-2.92,1.74-4.1c0.706-1.18,1.49-2.12,2.36-2.8,0.866-0.683,1.71-1.03,2.53-1.03,0.729,0.00003,1.47,0.148,2.22,0.444,0.752,0.296,1.44,0.672,2.05,1.13,0.615,0.456,1.1,0.969,1.47,1.54,0.365,0.569,0.547,1.15,0.547,1.74-0.00001,0.683-0.308,1.39-0.923,2.12-0.615,0.729-1.36,1.4-2.22,2.02-0.866,0.615-1.73,1.12-2.6,1.5-0.866,0.387-1.55,0.581-2.05,0.581-0.273,0.00001-0.511-0.125-0.716-0.376s-0.308-0.559-0.308-0.923c0-0.638,0.285-1.14,0.854-1.5,0.569-0.364,1.2-0.695,1.88-0.991,0.683-0.296,1.31-0.649,1.88-1.06,0.569-0.41,0.854-0.98,0.854-1.71-0.00001-0.0918-0.114-0.32-0.342-0.684s-0.843-0.546-1.85-0.546c-0.455,0.00002-0.978,0.262-1.57,0.786s-1.16,1.23-1.71,2.12c-0.547,0.889-1,1.94-1.37,3.14-0.364,1.21-0.546,2.52-0.546,3.93,0,1.18,0.217,2.26,0.65,3.21,0.433,0.957,0.991,1.77,1.67,2.43,0.683,0.661,1.48,1.17,2.39,1.54,0.911,0.364,1.85,0.546,2.8,0.546,0.683,0,1.42-0.148,2.22-0.444,0.797-0.296,1.55-0.615,2.26-0.957,0.706-0.342,1.32-0.661,1.84-0.957,0.523-0.296,0.854-0.444,0.992-0.444,0.136,0.00001,0.284,0.0685,0.443,0.205,0.159,0.137,0.262,0.274,0.308,0.41z"/>

+</g>

+<g stroke-linejoin="miter" transform="translate(77.31638,-1.3284405)" stroke="#8085e8" stroke-linecap="butt" stroke-dasharray="none" stroke-miterlimit="4" fill="none">

+<path d="m786,141c75.8,1.01,67.7-26.3,62.6-68.7-6-42.6-6-42.6-6-42.6" transform="matrix(0.60749736,0,0,0.6074971,4.9287817,87.469516)" stroke-width="4"/>

+<path d="m498,126c12.9-8.59,19.6-22.1,19.6-22.1s0.614,3.07,12.9,9.2c12.3,6.14,10.4,5.52,10.4,5.52" stroke-width="2.42998885999999990"/>

+</g>

+</g>

+</g>

+</svg>

diff --git a/data/interfaces/default/js/highcharts/api/images/sprite.png b/data/interfaces/default/js/highcharts/api/images/sprite.png
new file mode 100644
index 00000000..f36941a6
Binary files /dev/null and b/data/interfaces/default/js/highcharts/api/images/sprite.png differ
diff --git a/data/interfaces/default/js/highcharts/api/js/highcharts.json b/data/interfaces/default/js/highcharts/api/js/highcharts.json
new file mode 100644
index 00000000..6f7adc05
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/api/js/highcharts.json
@@ -0,0 +1,2 @@
+offline.highcharts.object = [{"name":"Axis","fullname":"Axis","returnType":"","description":"<p>A chart can have from 0 axes (pie chart) to multiples. In a normal, single series cartesian chart, there is one X axis and one Y axis.</p><p>The X axis or axes are referenced by <code>chart.xAxis</code>, which is an array of Axis objects. If there is only one axis, it can be referenced through <code>chart.xAxis[0]</code>, and multiple axes have increasing indices. The same pattern goes for Y axes.</p><p>If you need to get the axes from a series object, use the <code>series.xAxis</code> and<code>series.yAxis</code> properties. These are not arrays, as one series can only be associated to one X and one Y axis.</p><p>A third way to reference the axis programmatically is by id. Add an id in the axis configuration options, and get the axis by <code>chart.get(id)</code>.</p> <p>Configuration options for the axes are given in <a class=\"internal\" href=\"#xAxis\">options.xAxis</a> and <a class=\"internal\" href=\"#yAxis\">options.yAxis</a>.</p>","title":"Axis","isParent":true,"params":"","paramsDescription":"","demo":"","since":"","deprecated":false},{"name":"Axis--getExtremes","fullname":"Axis.getExtremes","type":"method","returnType":"Object","description":"Get the current extremes for the axis.","title":"getExtremes","isParent":false,"parent":"Axis","params":"()","paramsDescription":"dataMax: The maximum value of the axis' associated series.||dataMin: The minimum value of the axis' associated series.||max: The maximum axis value, either automatic or set manually. If the <code>max</code> option is not set and <code>maxPadding</code> is 0, this value will be the same as <code>dataMax</code>.||min: The minimum axis value, either automatic or set manually. If the <code>min</code> option is not set and <code>minPadding</code> is 0, this value will be the same as <code>dataMin</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/axis-getextremes/\" target=\"_blank\">Report extremes by click on a button</a>","since":"1.2.0","deprecated":false},{"name":"Axis--remove","fullname":"Axis.remove","type":"method","returnType":"","description":"Remove an axis from the chart.","title":"remove","isParent":false,"parent":"Axis","params":"(Boolean redraw)","paramsDescription":"redraw: Boolean<br>\r\nDefaults to <code>true</code>. Whether to redraw the chart following the remove. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/chart-addaxis/\" target=\"_blank\">Add and remove axes</a>","since":"3.0","deprecated":false},{"name":"Axis--removePlotBand","fullname":"Axis.removePlotBand","type":"method","returnType":"","description":"Remove a plot band by its <code>id</code>.","title":"removePlotBand","isParent":false,"parent":"Axis","params":"(String id)","paramsDescription":"id: String<br>The plot band's <code>id</code> as given in the original configuration object or in the addPlotBand method.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/axis-removeplotband/\" target=\"_blank\">Remove plot band by id</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/axis-addplotband/\" target=\"_blank\">Toggle the plot band from a button</a>","since":"1.2.0","deprecated":false},{"name":"Axis--removePlotLine","fullname":"Axis.removePlotLine","type":"method","returnType":"","description":"Remove a plot line by its <code>id</code>.","title":"removePlotLine","isParent":false,"parent":"Axis","params":"(String id)","paramsDescription":"id: String<br>The plot line's <code>id</code> as given in the original configuration object or in the addPlotLine method.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-id/\" target=\"_blank\">Remove plot line by id</a>,<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/axis-addplotline/\" target=\"_blank\">toggle the plot line from a button</a>","since":"1.2.0","deprecated":false},{"name":"Axis--setCategories","fullname":"Axis.setCategories","type":"method","description":"Set new categories for the axis.","title":"setCategories","isParent":false,"parent":"Axis","params":"(Array cateories, [Boolean redraw])","paramsDescription":"categories: Array<br>The new category names.||redraw: Boolean<br>Defaults to <code>true</code>. Whether to redraw the axis or wait for an explicit call to <code>chart.redraw()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/axis-setcategories/\" target=\"_blank\">Set categories by click on a button</a>","since":"1.2.0"},{"name":"Axis--setExtremes","fullname":"Axis.setExtremes","type":"method","returnType":"","description":"Set the minimum and maximum of the axes after render time. If the <code>startOnTick</code> and <code>endOnTick</code> options are true, the minimum and maximum values are rounded off to the nearest tick. To prevent this, these options can be set to false before calling setExtremes. Also, <code>setExtremes</code> will not allow a range lower than the <a href=\"#xAxis.minRange\">minRange</a> option, which by default is the range of five points.","title":"setExtremes","isParent":false,"parent":"Axis","params":"(Number min, Number max, [Boolean redraw], [Mixed animation])","paramsDescription":"min: Number<br>The new minimum value||max: Number<br>The new maximum value||redraw: Boolean<br>Defaults to <code>true</code>. Whether to redraw the chart or wait for an explicit call to <code>chart.redraw()</code>.||animation: Mixed<br>Defaults to true. When true, the resize will be animated with default animation options. The animation can also be a configuration object with properties <code>duration</code> and <code>easing</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/axis-setextremes/\" target=\"_blank\">Set extremes from button</a>,<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/axis-setextremes-datetime/\" target=\"_blank\">Set extremes on datetime axis</a>,<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/axis-setextremes-off-ticks/\" target=\"_blank\">setting extremes off ticks</a>","since":"1.2.0","deprecated":false},{"name":"Axis--toPixels","fullname":"Axis.toPixels","type":"method","returnType":"Number","description":"Translates a value in terms of axis units in to pixels within the chart.","title":"toPixels","isParent":false,"parent":"Axis","params":"(Number value, [Boolean paneCoordinates])","paramsDescription":"value: Number<br>\r\nA value in terms of axis units.||\r\n\r\npaneCoordinates: Boolean<br>\r\nWhether to return the pixel coordinate relative to the chart or just the axis/pane itself.","demo":"","since":"3.0","deprecated":false},{"name":"Axis--toValue","fullname":"Axis.toValue","type":"method","returnType":"Number","description":"Translate a pixel position along the axis to a value in terms of axis units.","title":"toValue","isParent":false,"parent":"Axis","params":"(Number pixel, [Boolean paneCoordinates])","paramsDescription":"pixel: Number<br>\r\nA pixel position along the axis.||\r\n\r\npaneCoordinates: Boolean<br>\r\nWhether the input pixel position is relative to the chart or just the axis/pane itself.","demo":"","since":"3.0","deprecated":false},{"name":"Axis--update","fullname":"Axis.update","type":"method","returnType":"","description":"Update an axis object with a new set of options. The options are merged with the existing options, so only new or altered options need to be specified.","title":"update","isParent":false,"parent":"Axis","params":"(Object options, [Boolean redraw])","paramsDescription":"options: Object<br>\r\nThe new options that will be merged in with existing options on the axis.||\r\n\r\nredraw: Boolean<br>\r\nDefaults to <code>true</code>. Whether to redraw the chart after the new options are set. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/axis-update/\" target=\"_blank\">Axis update demo</a>","since":"3.0","deprecated":false},{"name":"Chart","fullname":"Chart","returnType":"","description":"<p>The chart object is the JavaScript object representing a single chart in the web page.The pointer to your chart object is returned when a chart is created using the <code>Highcharts.Chart()</code> constructor:</p><pre>var chart1 = new Highcharts.Chart(options);</pre>","title":"Chart","isParent":true,"params":"","paramsDescription":"","demo":"","since":"","deprecated":false},{"name":"Chart--addAxis","fullname":"Chart.addAxis","type":"method","returnType":"","description":"Add an axis to the chart after render time. Note that this method should never be used when adding data synchronously at chart render time, as it adds expense to the calculations and rendering. When adding data at the same time as the chart is initiated, add the axis as a configuration option instead.","title":"addAxis","isParent":false,"parent":"Chart","params":"(Object options, [Boolean isX], [Boolean redraw], [Mixed animation])","paramsDescription":"options: Object<br>\r\nThe Axis options, as documented under <a href=\"#xAxis\">xAxis</a> and <a href=\"#yAxis\">yAxis</a>.||\r\n\r\nisX: Boolean<br>\r\nWhether it is an X axis or Y axis.||\r\n\r\nredraw: Boolean<br>\r\nDefaults to <code>true</code>. Whether to redraw the chart after the series is added. See the <code>redraw()</code> method below.||\r\n\r\nanimation: Mixed<br>\r\nDefaults to true. When true, the series' updating will be animated with default animation options. The animation can also be a configuration object with properties <code>duration</code> and <code>easing</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/chart-addaxis/\" target=\"_blank\">Add and remove axes</a>","since":"3.0","deprecated":false},{"name":"Chart--addSeries","fullname":"Chart.addSeries","type":"method","returnType":"Series","description":"Add a series to the chart after render time. Note that this method should never be used when adding data synchronously at chart render time, as it adds expense to the calculations and rendering. When adding data at the same time as the chart is initiated, add the series as a configuration option instead.","title":"addSeries","isParent":false,"parent":"Chart","params":"(Object options, [Boolean redraw], [Mixed animation])","paramsDescription":"options: Object<br>\r\nThe series options, as documented under <a href=\"#plotOptions.series\">plotOptions.series</a> and under the plotOptions for each series type.||\r\n\r\nredraw: Boolean<br>\r\nDefaults to <code>true</code>. Whether to redraw the chart after the series is added. See the <code>redraw()</code> method below.||\r\n\r\nanimation: Mixed<br>\r\nDefaults to true. When true, the series' updating will be animated with default animation options. The animation can also be a configuration object with properties <code>duration</code> and <code>easing</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/chart-addseries/\" target=\"_blank\">Add a series from a button</a>","since":"1.2.0","deprecated":false},{"name":"Chart--exportChart","fullname":"Chart.exportChart","type":"method","returnType":"","description":"Exporting module required. Submit an SVG version of the chart to a server along with some parameters for conversion.","title":"exportChart","isParent":false,"parent":"Chart","params":"(Object options, Object chartOptions)","paramsDescription":"options: Object<br>Exporting options. Out of the <a class=\"internal\" href=\"#exporting\">exporting</a> options, the following options can be given as parameters to the exportChart method. All options default to the values given in the exporting config options. \r\n<code>filename</code>: the filename for the export without extension, \r\n<code>url</code>: the URL for the server module to do the conversion, \r\n<code>width</code>: the width of the PNG or JPEG image generated on the server, \r\n<code>type</code>: the MIME type of the converted image, \r\n<code>sourceWidth</code>: the width of the source (in-page) chart, \r\n<code>sourceHeight</code>: the height of the source chart.||\r\n\r\nchartOptions: Object<br>Additional chart options for the exported chart. For example a different background color can be added here.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/chart-exportchart/\" target=\"_blank\">Export with no options</a>,<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/chart-exportchart-filename/\" target=\"_blank\">PDF type and custom filename</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/chart-exportchart-custom-background/\" target=\"_blank\">different chart background in export</a>","since":"2.0","deprecated":false},{"name":"Chart--get","fullname":"Chart.get","type":"method","returnType":"Axis|Series|Point","description":"Get an axis, series or point by its <code>id</code> as given in the configuration options.","title":"get","isParent":false,"parent":"Chart","params":"(String id)","paramsDescription":"id: String<br>The id of the axis, series or point to get.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","since":"1.2.0"},{"name":"Chart--getSVG","fullname":"Chart.getSVG","type":"method","returnType":"String","description":"Exporting module required. Get an SVG string representing the chart.","title":"getSVG","isParent":false,"parent":"Chart","params":"(Object additionalOptions)","paramsDescription":"additionalOptions: Object<br>Chart options to add to the exported chart in addition to the options given for the original chart. For example if series.lineWidth should be greater in the exported chart than in the original, or the chart should have a different background color, this is added here.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/chart-getsvg/\" target=\"_blank\">View the SVG from a button</a>","since":"2.0","deprecated":false},{"name":"Chart--getSelectedPoints","fullname":"Chart.getSelectedPoints","type":"method","returnType":"Array<Point>","description":"Returns an array of all currently selected points in the chart. Points can be selected either programmatically by the <code>point.select()</code> method or by clicking.","title":"getSelectedPoints","isParent":false,"parent":"Chart","params":"()","paramsDescription":"An array of the selected points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Get selected points</a>","since":"1.2.0","deprecated":false},{"name":"Chart--destroy","fullname":"Chart.destroy","type":"method","returnType":"","description":"Removes the chart and purges memory. This method should be called before writing a new chart into the same container. It is called internally on window unload to prevent leaks.","title":"destroy","isParent":false,"parent":"Chart","params":"()","paramsDescription":"","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/chart-destroy/\" target=\"_blank\">Destroy the chart from a button</a>","since":"1.2.2","deprecated":false},{"name":"Chart--options","fullname":"Chart.options","type":"property","returnType":"Object","description":"The options structure for the chart.","title":"options","isParent":false,"parent":"Chart","params":"","paramsDescription":"","demo":"","since":"1.2.0","deprecated":false},{"name":"Chart--xAxis","fullname":"Chart.xAxis","type":"property","returnType":"Array<Axis>","description":"An array of the chart's x axes. If only one x axis, it is referenced by <code>chart.xAxis[0]</code>.","title":"xAxis","isParent":false,"parent":"Chart","params":"","paramsDescription":"","demo":"","since":"1.2.0","deprecated":false},{"name":"Chart--yAxis","fullname":"Chart.yAxis","type":"property","returnType":"Array<Axis>","description":"An array of the chart's y axes. If only one y axis, it is referenced by <code>chart.yAxis[0]</code>.","title":"yAxis","isParent":false,"parent":"Chart","params":"","paramsDescription":"","demo":"","since":"1.2.0","deprecated":false},{"name":"Chart--container","fullname":"Chart.container","type":"property","returnType":"Object","description":"A reference to the containing HTML element, dynamically inserted into the element given in <code>chart.renderTo</code>.","title":"container","isParent":false,"parent":"Chart","params":"","paramsDescription":"","demo":"","since":"1.2.5","deprecated":false},{"name":"Point--series","fullname":"Point.series","type":"property","returnType":"Series","description":"The series object associated with the point.","title":"series","isParent":false,"parent":"Point","params":"","paramsDescription":"","demo":"","since":"1.2.0","deprecated":false},{"name":"Chart--print","fullname":"Chart.print","type":"method","returnType":"","description":"Exporting module required. Clears away other elements in the page and prints the chart as it is displayed. By default, when the exporting module is enabled, a button at the upper left calls this method.","title":"print","isParent":false,"parent":"Chart","params":"()","paramsDescription":"","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/chart-print/\" target=\"_blank\">Print from a HTML button</a>","since":"2.0","deprecated":false},{"name":"Chart--redraw","fullname":"Chart.redraw","type":"method","returnType":"","description":"Redraw the chart after changes have been done to the data or axis extremes. All methods for updating axes, series or points have a parameter for redrawing the chart. This is <code>true</code> by default. But in many cases you want to do more than one operation on the chart before redrawing, for example add a number of points. In those cases it is a waste of resources to redraw the chart for each new point added. So you add the points and call <code>chart.redraw()</code> after.","title":"redraw","isParent":false,"parent":"Chart","params":"()","paramsDescription":"","demo":"","since":"1.2.0","deprecated":false},{"name":"Chart--setSize","fullname":"Chart.setSize","type":"method","returnType":"","description":"Resize the chart to a given width and height.","title":"setSize","isParent":false,"parent":"Chart","params":"(Number width, Number height, [Mixed animation])","paramsDescription":"width: Number<br>The new pixel width of the chart.||height: Number<br>The new pixel height of the chart.||animation: Mixed<br>Defaults to true. When true, the resize will be animated with default animation options. The animation can also be a configuration object with properties <code>duration</code> and <code>easing</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.9.1/highslide-software/highcharts.com/tree/master/samples/highcharts/members/chart-setsize-button/\" target=\"_blank\">Test resizing from buttons</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.9.1/highslide-software/highcharts.com/tree/master/samples/highcharts/members/chart-setsize-jquery-resizable/\" target=\"_blank\">add a jQuery UI resizable</a>","since":"","deprecated":false},{"name":"Chart--showLoading","fullname":"Chart.showLoading","type":"method","returnType":"null","description":"Dim the chart's plot area and show a loading label text. Options for the loading screen are defined at <a class=\"internal\" href=\"#loading\">options.loading</a>. A custom text can be given as a parameter for loading.","title":"showLoading","isParent":false,"parent":"Chart","params":"(String str)","paramsDescription":"","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/chart-hideloading/\" target=\"_blank\">Show and hide loading from a button</a>,<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/chart-showloading/\" target=\"_blank\">apply different text labels.</a>","since":"2.0.5","deprecated":false},{"name":"Chart--updatePosition","fullname":"Chart.updatePosition","type":"method","returnType":"","description":"This method is deprecated as of 2.0.1. Updating the chart position after a move operation is no longer necessary.","title":"updatePosition","isParent":false,"parent":"Chart","params":"()","paramsDescription":"","demo":"","since":"1.2.5","deprecated":true},{"name":"Element","fullname":"Element","returnType":"","description":"<p>The Element class is a JavaScript wrapper for SVG elements used in the rendering layer of Highchart. Combined with the Renderer object, these elements allows freeform annotation in the charts or even in your HTML pages without creating a chart at all.</p>","title":"Element","isParent":true,"params":"","paramsDescription":"","demo":"","since":"","deprecated":false},{"name":"Element--add","fullname":"Element.add","type":"method","returnType":"Element","description":"Add the element to the renderer canvas.","title":"add","isParent":false,"parent":"Element","params":"[(Object parent)]","paramsDescription":"parent: Object<br>The element can be added to a <code>g</code> (group) element.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/renderer-g/\" target=\"_blank\">Elements added to a group</a>","since":"2.0"},{"name":"Element--animate","fullname":"Element.animate","type":"method","returnType":"Element","description":"Apply numeric attributes to the SVG/VML element by animation. See <a href=\"#Element.attr()\">Element.attr()</a> for more information on setting attributes.","title":"animate","isParent":false,"parent":"Element","params":"(Object attributes[, Object animation])","paramsDescription":"attributes: Object<br/>A set of attributes to apply.||animation: Object<br/>Optional animation parameters that are passed over to jQuery or other framework. Valid properties depend on the library, but options like <code>duration</code>, <code>easing</code> and <code>complete</code> are supported by jQuery.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/element-on/\" target=\"_blank\">Setting some attributes by animation</a>","since":"2.0","deprecated":false},{"name":"Element--css","fullname":"Element.css","type":"method","returnType":"Element","description":"Apply some CSS properties to the element","title":"css","isParent":false,"parent":"Element","params":"(Object hash)","paramsDescription":"hash: Object<br>The object literal of CSS properties to apply. Properties should be hyphenated, not camelCased.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/renderer-text-on-chart/\" target=\"_blank\">Styled text</a>","since":"2.0"},{"name":"Element--on","fullname":"Element.on","type":"method","returnType":"Element","description":"Apply an event handler to the element","title":"on","isParent":false,"parent":"Element","params":"(String eventType, Function handler)","paramsDescription":"eventType: String<br>The event type to attach, for example 'click', 'mouseover', 'touch'.||handler: Function<br>The event handler function.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/element-on/\" target=\"_blank\">A clickable rectangle</a>.","since":"2.0"},{"name":"Element--toFront","fullname":"Element.toFront","type":"method","returnType":"Element","description":"Bring the element to the front. Alternatively, a zIndex attribute can be given.","title":"toFront","isParent":false,"parent":"Element","paramsDescription":"The element object","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/element-tofront/\" target=\"_blank\">Click an element to bring it to front</a>.","since":"2.0"},{"name":"Highcharts","fullname":"Highcharts","returnType":"","description":"<p>The namespace under which all other Highcharts variables are assembled is called <code>Highcharts</code>. </p><pre>var chart1 = new Highcharts.Chart(options);</pre>","title":"Highcharts","isParent":true,"params":"","paramsDescription":"","demo":"","since":"","deprecated":false},{"name":"Highcharts--Chart","fullname":"Highcharts.Chart","type":"method","returnType":"Chart","description":"This is the constructor for creating a new chart object.","title":"Chart","isParent":false,"parent":"Highcharts","params":"(Object options, Function callback)","paramsDescription":"options: Object<br>The chart options, as documented under the heading \"The options object\"in the left menu.||callback: Function<br>A function to execute when the chart object is finished loading and rendering. In most cases the chart is built in one thread, but in Internet Explorer version 8 or less the chart is sometimes initiated before the document is ready, and in these cases the <code>chart</code> object will not be finished directly after calling<code>new Highcharts.Chart()</code>. As a consequence, code that relies on the newly built Chart object should always run in the callback. Defining a <code>chart.event.load</code> handler is equivalent.","demo":"","since":"","deprecated":false},{"name":"Highcharts--charts","fullname":"Highcharts.charts","type":"Array<Object>","returnType":"Array<Chart>","description":"An array containing the current chart objects in the page. A chart's position in the array is preserved throughout the page's lifetime. When a chart is destroyed, the array item becomes <code>undefined</code>.","title":"charts","isParent":false,"parent":"Highcharts","params":"","paramsDescription":"","demo":"","since":"2.3.4","deprecated":false},{"name":"Highcharts--dateFormat","fullname":"Highcharts.dateFormat","type":"method","returnType":"String","description":"Formats a JavaScript date timestamp (milliseconds since Jan 1st 1970) into a human readable date string. The format is a subset of the formats for <a href=\"http://php.net/manual/en/function.strftime.php\">PHP's strftime function</a>. Additional formats can be given  in the Highcharts.dateFormats hook, see below.","title":"dateFormat","isParent":false,"parent":"Highcharts","params":"(String format, [Number time], [Boolean capitalize])","paramsDescription":"format: String<br>A string containing some of the formats above.||time: Number<br>The JavaScript time to format.||capitalize: Boolean<br>Whether to capitalize words in the return string.","demo":"","since":"","deprecated":false},{"name":"Highcharts--dateFormats","fullname":"Highcharts.dateFormats","type":"Object","returnType":"","description":"A hook for defining additional date format specifiers. New specifiers are defined as key-value pairs by using the specifier as key, and a function which takes the timestamp as value. This function returns the formatted portion of the date.","title":"dateFormats","isParent":false,"parent":"Highcharts","params":"","paramsDescription":"","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/global/dateformats/\" target=\"_blank\">Adding support for week number</a>","since":"3.0","deprecated":false},{"name":"Highcharts--setOptions","fullname":"Highcharts.setOptions","type":"method","returnType":"Object","description":"Sets the options globally for all charts created after this has been called. Takes an options JavaScript object structure as the argument. These options are merged with the default options and the result is returned.","title":"setOptions","isParent":false,"parent":"Highcharts","params":"(Object options)","paramsDescription":"options: Object<br>The chart configuration object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/global/useutc-false/\" target=\"_blank\">Setting a global option</a>,<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/setoptions/\" target=\"_blank\">applying a general theme</a>"},{"name":"Point","fullname":"Point","returnType":"","description":"<p>The Point object is the JavaScript representation of each data point</p><p>The object can be accessed in a number of ways. In all point event handlers the point object is <code>this</code>. In the <code>series</code> object all the points are accessed by the <code>series.data</code> array.</p><p>Another way to reference the point programmatically is by id. Add an id in the point configuration options, and get the point object by <code>chart.get(id)</code>.</p>","title":"Point","isParent":true,"params":"","paramsDescription":"","demo":"","since":"","deprecated":false},{"name":"Point--percentage","fullname":"Point.percentage","type":"property","returnType":"Number","description":"The percentage for points in a stacked series or pies.","title":"percentage","isParent":false,"parent":"Point","since":"1.2.0"},{"name":"Point--remove","fullname":"Point.remove","type":"method","returnType":"","description":"Remove the point from the series.","title":"remove","isParent":false,"parent":"Point","params":"([Boolean redraw], [Mixed animation])","paramsDescription":"redraw: Boolean<br>Defaults to <code>true</code>. Whether to redraw the chart after the point is removed.If doing more operations on the chart, it is a good idea to set redraw to false and call <code>chart.redraw()</code> after.||animation: Mixed<br>Defaults to true. When true, the graph's updating will be animated with default animation options. The animation can also be a configuration object with properties <code>duration</code> and <code>easing</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>,<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/point-remove/\" target=\"_blank\">Remove pie slice</a>","since":"1.2.0","deprecated":false},{"name":"Point--selected","fullname":"Point.selected","type":"property","returnType":"Boolean","description":"Whether the point is selected or not.","title":"selected","isParent":false,"parent":"Point","since":"1.2.0"},{"name":"Point--slice","fullname":"Point.slice","type":"method","returnType":"","description":"Slice out or set back in a pie chart slice. This is the default way of Highcharts to visualize that a pie point is selected.","title":"slice","isParent":false,"parent":"Point","params":"([Boolean sliced], [Boolean redraw], [Mixed animation])","paramsDescription":"sliced: Boolean<br>When <code>true</code>, the point is sliced out. When <code>false</code>, the point is set in. When <code>null</code> or <code>undefined</code>, the sliced state is toggled.||redraw: Boolean<br>Defaults to <code>true</code>. Whether to redraw the chart after the point is altered.||animation: Mixed<br>Defaults to true. When true, the move will be animated with default animation options. The animation can also be a configuration object with properties <code>duration</code> and <code>easing</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/point-slice/\" target=\"_blank\">Slice and unslice a point from a button</a>","since":"1.2.0","deprecated":false},{"name":"Point--update","fullname":"Point.update","type":"method","returnType":"","description":"Update the point with new values.","title":"update","isParent":false,"parent":"Point","params":"([Mixed options], [Boolean redraw], [Mixed animation])","paramsDescription":"options: Number|Array|Object<br>The point options. If options is a single number, the point will be given that number as the y value.If it is an array, it will be interpreted as x and y values respectively. If it is an object, advanced options as outlined under <a class=\"internal\" href=\"#series.data\">series.data</a> are applied.||redraw: Boolean<br>Defaults to <code>true</code>. Whether to redraw the chart after the point is updated.If doing more operations on the chart, it is a good idea to set redraw to false and call <code>chart.redraw()</code> after.||animation: Mixed<br>Defaults to true. When true, the update will be animated with default animation options. The animation can also be a configuration object with properties <code>duration</code> and <code>easing</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/point-update-column/\" target=\"_blank\">Update column value</a>,<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/point-update-pie/\" target=\"_blank\">update pie slice</a>","since":"1.2.0","deprecated":false},{"name":"Point--x","fullname":"Point.x","type":"property","returnType":"Number","description":"The x value for the point.","title":"x","isParent":false,"parent":"Point","since":"1.2.0"},{"name":"Point--y","fullname":"Point.y","type":"property","returnType":"Number","description":"The y value for the point.","title":"y","isParent":false,"parent":"Point","since":"1.2.0"},{"name":"Renderer","fullname":"Renderer","returnType":"","description":"<p>Allows direct access to the Highcharts rendering layer in order to draw primitive shapes like circles, rectangles,paths or text directly on a chart, or independent from any chart. The Renderer represents a wrapper object for SVGin modern browsers and VML in IE &lt; 8.</p><p>An existing chart's renderer can be accessed through <code>chart.renderer</code>. To create a renderer independent from a chart, use <code>var renderer = new Highcharts.Renderer(parentNode, width, height);</code> where parentNode is the HTML element where you want to add it.</p><p>The Renderer's methods are chained wherever possible, so you can initiate an element then call for example <code>attr</code> and <code>css</code> and <code>add</code> on that element in one statement.</p><div class=\"demo\"><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/members/renderer-on-chart/\">Annotating a chart programmatically</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/members/renderer-basic/\">independent SVG/VML drawing</a></div>","title":"Renderer","isParent":true,"params":"","paramsDescription":"","demo":"","since":"","deprecated":false},{"name":"Renderer--arc","fullname":"Renderer.arc","type":"method","returnType":"Element","description":"Draw an arc on the renderer canvas.","title":"arc","isParent":false,"parent":"Renderer","params":"(Number centerX, Number centerY, Number outerRadius, Number innerRadius, Number start, Number end)","paramsDescription":"centerX: Number<br>The x position of the arc's center in the SVG element.||centerY: Number<br>The y position of the arc's center in the SVG element.||outerRadius: Number<br>The outer radius of the arc.||innerRadius: Number<br>The inner radius of the arc.||start: Number<br>The starting angle of the arc in radians, where 0 is to the right and -Math.PI/2 is up.||end: Number<br>The ending angle of the arc in radians, where 0 is to the right and -Math.PI/2 is up.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/renderer-arc/\" target=\"_blank\">Drawing an arc</a>","since":"2.0"},{"name":"Renderer--circle","fullname":"Renderer.circle","type":"method","returnType":"Element","description":"Draw circle on the renderer canvas.","title":"circle","isParent":false,"parent":"Renderer","params":"(Number centerX, Number centerY, Number radius)","paramsDescription":"centerX: Number<br>The x position of the circle's center in the SVG element.||centerY: Number<br>The y position of the circle's center in the SVG element.||radius: Number<br>The radius of the circle.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/renderer-circle/\" target=\"_blank\">Drawing a circle</a>","since":"2.0"},{"name":"Renderer--g","fullname":"Renderer.g","type":"method","returnType":"Element","description":"Add an SVG/VML group.","title":"g","isParent":false,"parent":"Renderer","params":"(String name)","paramsDescription":"name: String<br>The name of the group. This will be used in the class name, which will be <code>\"highcharts-\"+ name</code>. Other Element objects are added to the group by using the group as the first parameter in .add() for the wrappers.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/renderer-g/\" target=\"_blank\">Show and hide grouped objects</a>","since":"2.0","deprecated":false},{"name":"Renderer--image","fullname":"Renderer.image","type":"method","returnType":"Element","description":"Add an image from an external resource.","title":"image","isParent":false,"parent":"Renderer","params":"(String source, Number x, Number y, Number width, Number height)","paramsDescription":"source: String<br>The URL of the image.||x: String<br>The x position of the image's upper left corner.||y: String<br>The y position of the image's upper left corner.||width: String<br>The width of the image.||height: String<br>The height of the image.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/renderer-image-on-chart/\" target=\"_blank\">Add an image in a chart</a>,<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/renderer-image/\" target=\"_blank\">add an image independent from chart</a>","since":"2.0"},{"name":"Renderer--path","fullname":"Renderer.path","type":"method","returnType":"Element","description":"Add a path based on <a href=\"http://www.w3.org/TR/SVG/paths.html\">SVG's path commands</a>. In SVG capable browsers all path commands are supported, but in VML only a subset is supported: absolute moveTo (M), absolute lineTo (L), absolute curveTo (C) and close (Z).","title":"path","isParent":false,"parent":"Renderer","params":"(Array path)","paramsDescription":"path: Array<br>An SVG path split up in array form.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/renderer-path-on-chart/\" target=\"_blank\">Draw a path in a chart</a>,<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/renderer-path/\" target=\"_blank\">draw a path independent from a chart</a>","since":"2.0","deprecated":false},{"name":"Renderer--rect","fullname":"Renderer.rect","type":"method","returnType":"Element","description":"Add a rectangle.","title":"rect","isParent":false,"parent":"Renderer","params":"(Number x, Number y, Number width, Number height, Number cornerRadius)","paramsDescription":"x: Number<br>The x position of the rectangle's upper left corner.||y: Number<br>The y position of the rectangle's upper left corner.||width: Number<br>The width of the rectangle.||height: Number<br>The height of the rectangle.||cornerRadius: Number<br>The corner radius of all the rectangle's corners.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/renderer-rect-on-chart/\" target=\"_blank\">Draw a rectangle in a chart</a>,<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/renderer-rect/\" target=\"_blank\">draw a rectangle independent from a chart</a>","since":"2.0"},{"name":"Renderer--text","fullname":"Renderer.text","type":"method","returnType":"Element","description":"Draw text. The text can contain a subset of HTML, like spans and anchors and some basic text styling of these. For more advanced features like border and background, use <a href=\"#Renderer.label\">label</a> instead.","title":"text","isParent":false,"parent":"Renderer","params":"(String str, Number x, Number y)","paramsDescription":"str: String<br>The text or HTML to draw||x: Number<br>The x position of the text's lower left corner.||y: Number<br>The y position of the text's lower left corner.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/renderer-text-on-chart/\" target=\"_blank\">Annotate the chart freely</a>; <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/renderer-on-chart/\" target=\"_blank\">annotate with a border and in response to the data</a>; <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/renderer-text/\" target=\"_blank\">formatted text</a>.","since":"2.0","deprecated":false},{"name":"Series","fullname":"Series","returnType":"","description":"<p>The Series object is the JavaScript representation of each line, area series, pie etc.</p><p>The object can be accessed in a number of ways. All series and point event handlers give a reference to the series object. The <code>chart</code> object has a <code>series</code> property that is a collection of all the chart's series. The <code>point</code> objects also have the same reference.</p><p>Another way to reference the series programmatically is by id. Add an id in the series configuration options, and get the series object by <code>chart.get(id)</code>.</p><p>Configuration options for the series are given in three levels. Options for all series in a chart are given in the <a class=\"internal\" href=\"#plotOptions.series\">plotOptions.series</a> object. Then options for all series of a specific type are given in the plotOptions of that type, for example plotOptions.line. Next, options for one single series are given in <a class=\"internal\" href=\"#series\">the series array</a>.</p>","title":"Series","isParent":true,"params":"","paramsDescription":"","demo":"","since":"","deprecated":false},{"name":"Series--addPoint","fullname":"Series.addPoint","type":"method","returnType":"","description":"Add a point to the series after render time. The point can be added at the end, or by giving it an X value, to the start or in the middle of the series.","title":"addPoint","isParent":false,"parent":"Series","params":"(Object options, [Boolean redraw], [Boolean shift], [Mixed animation])","paramsDescription":"options: Number|Array|Object<br>The point options. If options is a single number, a point with that y value is appended to the series.If it is an array, it will be interpreted as x and y values respectively. If it is an object, advanced options as outlined under <a class=\"internal\" href=\"#series.data\">series.data</a> are applied.||\r\nredraw: Boolean<br>Defaults to <code>true</code>. Whether to redraw the chart after the point is added. When adding more than one point, it is highly recommended that the <code>redraw</code> option be set to false, and instead <code>chart.redraw()</code> is explicitly called after the adding of points is finished.||\r\nshift: Boolean<br>Defaults to <code>false</code>. When shift is true, one point is shifted off the start of the series as one is appended to the end. Use this option for live charts monitoring a value over time.||animation: Mixed<br>Defaults to true. When true, the graph will be animated with default animation options. The animation can also be a configuration object with properties <code>duration</code> and <code>easing</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/series-addpoint-append/\" target=\"_blank\">Append point</a>,<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/series-addpoint-append-and-shift/\" target=\"_blank\">append and shift</a>,<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/series-addpoint-x-and-y/\" target=\"_blank\">both x and y values given</a>,<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/series-addpoint-pie/\" target=\"_blank\">append pie slice</a>","since":"1.2.0","deprecated":false},{"name":"Series--hide","fullname":"Series.hide","type":"method","description":"Hides the series if visible. If the <code>chart.ignoreHiddenSeries</code> option is true,the chart is redrawn without this series.","title":"hide","isParent":false,"parent":"Series","params":"()","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/series-hide/\" target=\"_blank\">Toggle visibility from a button</a>","since":"1.2.0"},{"name":"Series--name","fullname":"Series.name","type":"property","returnType":"String","description":"The series' name as given in the options.","title":"name","isParent":false,"parent":"Series","since":"1.2.0"},{"name":"Series--options","fullname":"Series.options","type":"property","returnType":"Object","description":"Read only. The series' options.","title":"options","isParent":false,"parent":"Series","since":"1.2.0"},{"name":"Series--select","fullname":"Series.select","type":"method","returnType":"","description":"Select or unselect the series. This means its <code>selected</code> property is set,the checkbox in the legend is toggled and when selected, the series is returned in the <code>chart.getSelectedSeries()</code> method.","title":"select","isParent":false,"parent":"Series","params":"([Boolean selected|null])","paramsDescription":"selected: Boolean|null<br>When <code>true</code>, the series is selected. When <code>false</code> it is unselected. When <code>null</code> or <code>undefined</code>, the series' selection state is toggled.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/series-select/\" target=\"_blank\">Select a series from a button</a>","since":"1.2.0","deprecated":false},{"name":"Series--selected","fullname":"Series.selected","type":"property","returnType":"Boolean","description":"Read only. The series' selected state as set by <code>series.select()</code>.","title":"selected","isParent":false,"parent":"Series","since":"1.2.0"},{"name":"Series--setVisible","fullname":"Series.setVisible","type":"method","returnType":"","description":"A utility function to show or hide the series with an optional redraw.","title":"setVisible","isParent":false,"parent":"Series","params":"(Boolean visible, [Boolean redraw])","paramsDescription":"visible: Boolean<br>Whether to show or hide the series. If undefined, the visibility is toggled.||redraw: Boolean<br>Defaults to <code>true</code>. Whether to redraw the chart after the series is altered.If doing more operations on the chart, it is a good idea to set redraw to false and call <code>chart.redraw()</code> after.","demo":"","since":"","deprecated":false},{"name":"Series--show","fullname":"Series.show","type":"method","description":"Shows the series if hidden.","title":"show","isParent":false,"parent":"Series","params":"()","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/series-hide/\" target=\"_blank\">Toggle visibility from a button</a>","since":"1.2.0"},{"name":"Series--type","fullname":"Series.type","type":"property","returnType":"String","description":"Read only. The series' type, like \"line\", \"area\" etc.","title":"type","isParent":false,"parent":"Series","since":"1.2.0"},{"name":"Series--update","fullname":"Series.update","type":"method","returnType":"","description":"Update the series with a new set of options. For a clean and precise handling of new options, all methods and elements from the series is removed, and it is initiated from scratch. Therefore, this method is more performance expensive than some other utility methods like <code>setData</code> or <code>setVisible</code>.","title":"update","isParent":false,"parent":"Series","params":"(Object options, [Boolean redraw])","paramsDescription":"options: Boolean<br>\r\nNew options that will be merged into the series' existing options.\r\n\r\n||\r\n\r\nredraw: Boolean<br>\r\nDefaults to <code>true</code>. Whether to redraw the chart after the series is altered. If doing more operations on the chart, it is a good idea to set redraw to false and call <code>chart.redraw()</code> after.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/series-update/\" target=\"_blank\">Updating series options</a>","since":"3.0","deprecated":false},{"name":"Series--visible","fullname":"Series.visible","type":"property","returnType":"Boolean","description":"Read only. The series' visibility state as set by <code>series.show()</code>, <code>series.hide()</code>, or the initial configuration.","title":"visible","isParent":false,"parent":"Series","since":"1.2.0"},{"name":"Chart--addSeriesAsDrilldown","fullname":"Chart.addSeriesAsDrilldown","type":"method","returnType":"","description":"Add a series to the chart as drilldown from a specific point in the parent series. This method is used for async drilldown, when clicking a point in a series should result in loading and displaying a more high-resolution series. When <i>not</i> async, the setup is simpler using the <a href=\"#drilldown.series\">drilldown.series</a> options structure.","title":"addSeriesAsDrilldown","isParent":false,"parent":"Chart","params":"(Object point, Object seriesOptions)","paramsDescription":"point: Object<br>\r\nThe existing Point object from which the drilldown will start.||\r\n\r\nseriesOptions: Object<br>\r\nThe series options, as documented under <a href=\"#plotOptions.series\">plotOptions.series</a> and under the plotOptions for each series type.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/async/\" target=\"_blank\">Async drilldown</a>","since":"3.0.8","deprecated":false},{"name":"Chart--drillUp","fullname":"Chart.drillUp","type":"method","returnType":"","description":"When the chart is drilled down to a child series, calling <code>chart.drillUp()</code> will drill up to the parent series.","title":"drillUp","isParent":false,"parent":"Chart","params":"()","paramsDescription":"","demo":"","since":"3.0.8","deprecated":false},{"name":"Chart--setTitle","fullname":"Chart.setTitle","type":"method","returnType":"","description":"Set a new title or subtitle for the chart","title":"setTitle","isParent":false,"parent":"Chart","params":"(Object title, object subtitle, Boolean redraw)","paramsDescription":"title: Object<br>A configuration object for the new title as defined at <a class=\"internal\" href=\"#title\">#title</a>.||\r\nsubtitle: Object<br>A configuration object for the new subtitle as defined at <a class=\"internal\" href=\"#subtitle\">#subtitle</a>.||\r\nredraw: Boolean<br>Whether to redraw the chart. Defaults to true.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/chart-settitle/\" target=\"_blank\">Set title text and styles</a>","since":"2.1.0","deprecated":false},{"name":"Series--setData","fullname":"Series.setData","type":"method","returnType":"","description":"Apply a new set of data to the series and optionally redraw it. Note that this method throws away all points and creates new ones. For updating the values of existing points, use <a href=\"#Point.update()\">Point.update()</a> instead.","title":"setData","isParent":false,"parent":"Series","params":"(Array&lt;Mixed&gt; data, [Boolean redraw], [Mixed animation], [Boolean updatePoints])","paramsDescription":"data: Array&lt;Number&gt;|Array&lt;Array&gt;|Array&lt;Object&gt;<br>Takes an array of data in the same format as given at <a class=\"internal\" href=\"#series\">options.series</a> =&gt; data.||\r\nredraw: Boolean<br>Defaults to <code>true</code>. Whether to redraw the chart after the series is altered.If doing more operations on the chart, it is a good idea to set redraw to false and call <code>chart.redraw()</code> after.||\r\nanimation: Mixed<br>When the updated data is the same length as the existing data, points will be updated by default, and animation visualizes how the points are changed. Set false to disable animation, or a configuration object to set duration or easing.||\r\nupdatePoints: Boolean<br>When the updated data is the same length as the existing data, points will be updated instead of replace. This option prevents this, and makes setData behave like it did prior to Highcharts 3.0.10.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/series-setdata/\" target=\"_blank\">Set new data from a button</a>,<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/series-setdata-pie/\" target=\"_blank\">set data in a pie</a>","since":"1.2.0","deprecated":false},{"name":"Element--attr","fullname":"Element.attr","type":"method","returnType":"Element","description":"<p>Apply attributes to the SVG/VML elements. These attributes for the most parts correspond to SVG, but some are specific to Highcharts, like <code>zIndex</code> and <code>rotation</code>.</p>\r\n\r\n<p>In order to set the rotation center for <code>rotation</code>, set x and y to 0 and use <code>translateX</code> and <code>translateY</code> attributes to position the element instead.</p>\r\n\r\n<p>Attributes frequently used in Highcharts are <code>fill</code>, <code>stroke</code>, <code>stroke-width</code>.</p>","title":"attr","isParent":false,"parent":"Element","params":"Object hash","paramsDescription":"hash: Object<br>A set of attributes to apply.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/renderer-rect/\" target=\"_blank\">Setting some attributes</a>","since":"2.0","deprecated":false},{"name":"Axis--setTitle","fullname":"Axis.setTitle","type":"method","returnType":"","description":"Update the title of the axis after render time.","title":"setTitle","isParent":false,"parent":"Axis","params":"(Object title, [Boolean redraw])","paramsDescription":"title: Object<br>The new title options on the same format as given in <a class=\"internal\" href=\"#xAxis.title\">xAxis.title</a>.||redraw: Boolean<br>Whether to redraw the chart now or hold until the next chart.redraw()","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/axis-settitle/\" target=\"_blank\">Set a new Y axis title</a>","since":"2.2","deprecated":false},{"name":"Point--select","fullname":"Point.select","type":"method","returnType":"","description":"Select or unselect the point.","title":"select","isParent":false,"parent":"Point","params":"([Boolean select], [Boolean accumulate])","paramsDescription":"select: Boolean<br>When <code>true</code>, the point is selected. When <code>false</code>, the point is unselected. When <code>null</code> or <code>undefined</code>, the selection state is toggled.||accumulate: Boolean<br>When <code>true</code>, the selection is added to other selected points. When <code>false</code>, other selected points are deselected. Internally in Highcharts,selected points are accumulated on Control, Shift or Cmd clicking the point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/point-select/\" target=\"_blank\">Select a point from a button</a>","since":"1.2.0","deprecated":false},{"name":"Series--remove","fullname":"Series.remove","type":"method","returnType":"","description":"Remove the series from the chart.","title":"remove","isParent":false,"parent":"Series","params":"([Boolean redraw])","paramsDescription":"redraw: Boolean<br>Defaults to <code>true</code>. Whether to redraw the chart after the series is removed.If doing more operations on the chart, it is a good idea to set redraw to false and call <code>chart.redraw()</code> after.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/series-remove/\" target=\"_blank\">Remove first series from a button</a>","since":"1.2.0","deprecated":false},{"name":"Chart--getSelectedSeries","fullname":"Chart.getSelectedSeries","type":"method","returnType":"Array<Series>","description":"Returns an array of all currently selected series in the chart. Series can be selected either programmatically by the <code>series.select()</code> method or by checking the checkbox next to the legend item if <code>series.showCheckBox</code> is true.","title":"getSelectedSeries","isParent":false,"parent":"Chart","params":"()","paramsDescription":"An array of the selected Series items.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/chart-getselectedseries/\" target=\"_blank\">Get selected series</a>","since":"1.2.0","deprecated":false},{"name":"Point--category","fullname":"Point.category","type":"property","returnType":"String|Number","description":"For categorized axes this property holds the category name for the point. For other axis it holds the x value.","title":"category","isParent":false,"parent":"Point","params":"","paramsDescription":"","demo":"","since":"1.2.0","deprecated":false},{"name":"Chart--hideLoading","fullname":"Chart.hideLoading","type":"method","returnType":"","description":"Hide the loading screen. Options for the loading screen are defined at <a class=\"internal\" href=\"#loading\">options.loading</a>.","title":"hideLoading","isParent":false,"parent":"Chart","params":"()","paramsDescription":"","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/chart-hideloading/\" target=\"_blank\">Show and hide loading from a button</a>","since":"1.2.0","deprecated":false},{"name":"Axis--addPlotLine","fullname":"Axis.addPlotLine","type":"method","returnType":"","description":"Add a plot line after render time.","title":"addPlotLine","isParent":false,"parent":"Axis","params":"(Object options)","paramsDescription":"options: Object<br>A configuration object consisting of the same members as <a class=\"internal\" href=\"#xAxis.plotLines\">options.xAxis.plotLines</a>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/axis-addplotline/\" target=\"_blank\">Toggle the plot line from a button</a>","since":"1.2.0","deprecated":false},{"name":"Axis--addPlotBand","fullname":"Axis.addPlotBand","type":"method","returnType":"","description":"Add a plot band after render time.","title":"addPlotBand","isParent":false,"parent":"Axis","params":"(Object options)","paramsDescription":"options: Object<br>A configuration object consisting of the same members as <a class=\"internal\" href=\"#xAxis.plotBands\">options.xAxis.plotBands</a>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/axis-addplotband/\" target=\"_blank\">Toggle the plot band from a button</a>","since":"1.2.0","deprecated":false},{"name":"Chart--series","fullname":"Chart.series","type":"property","returnType":"Array<Series>","description":"An array of all the chart's series.","title":"series","isParent":false,"parent":"Chart","params":"","paramsDescription":"","demo":"","since":"1.2.0","deprecated":false},{"name":"Element--destroy","fullname":"Element.destroy","type":"method","returnType":"","description":"Destroy the element and free up memory","title":"destroy","isParent":false,"parent":"Element","params":"","paramsDescription":"","demo":"","since":"2.0","deprecated":false},{"name":"Point--total","fullname":"Point.total","type":"Number","returnType":"Number","description":"The total of a stack for stacked series, or pie in pie charts.","title":"total","isParent":false,"parent":"Point","params":"","paramsDescription":"","demo":"","since":"","deprecated":false},{"name":"Chart--reflow","fullname":"Chart.reflow","type":"method","returnType":"","description":"Reflows the chart to its container. By default, the chart reflows automatically to its container following a <code>window.resize</code> event, as per the <a href=\"#chart.reflow\">chart.reflow</a> option. However, there are no reliable events for div resize, so if the container is resized without a window resize event, this must be called explicitly. ","title":"reflow","isParent":false,"parent":"Chart","params":"()","paramsDescription":"","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/chart-reflow/\" target=\"_blank\">Resize div and reflow</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/events-container/\" target=\"_blank\">pop up and reflow</a>","since":"","deprecated":false},{"name":"Element--getBBox","fullname":"Element.getBBox","type":"method","returnType":"Object","description":"Get the bounding box of the element","title":"getBBox","isParent":false,"parent":"Element","params":"","paramsDescription":"A hash object containing x, y, width and height values for the element.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/renderer-on-chart/\" target=\"_blank\">Draw a rectangle based on a text's bounding box</a>.","since":"2.0","deprecated":false},{"name":"Series--chart","fullname":"Series.chart","type":"property","returnType":"Chart","description":"Read only. The chart that the series belongs to.","title":"chart","isParent":false,"parent":"Series","params":"","paramsDescription":"","demo":"","since":"1.2.0","deprecated":false},{"name":"Series--data","fullname":"Series.data","type":"property","returnType":"Array<Point>","description":"Read only. An array with the series' data point objects.","title":"data","isParent":false,"parent":"Series","params":"","paramsDescription":"","demo":"","since":"1.2.0","deprecated":false},{"name":"Series--xAxis","fullname":"Series.xAxis","type":"property","returnType":"Axis","description":"Read only. The unique xAxis object associated with the series.","title":"xAxis","isParent":false,"parent":"Series","params":"","paramsDescription":"","demo":"","since":"1.2.0","deprecated":false},{"name":"Series--yAxis","fullname":"Series.yAxis","type":"property","returnType":"Axis","description":"Read only. The unique yAxis object associated with the series.","title":"yAxis","isParent":false,"parent":"Series","params":"","paramsDescription":"","demo":"","since":"1.2.0","deprecated":false},{"name":"Series--removePoint","fullname":"Series.removePoint","type":"method","returnType":"","description":"Remove a point from the series. Unlike the <a href=\"#Point.remove\">Point.remove</a> method, this can also be done on a point that is not instanciated because it is outside the view or subject to data grouping.","title":"removePoint","isParent":false,"parent":"Series","params":"(Object index, [Boolean redraw], [Mixed animation])","paramsDescription":"index: Number<br>The index of the point in the data array.||\r\nredraw: Boolean<br>Defaults to <code>true</code>. Whether to redraw the chart after the point is added. When adding more than one point, it is highly recommended that the <code>redraw</code> option be set to false, and instead <code>chart.redraw()</code> is explicitly called after the adding of points is finished.||\r\nanimation: Mixed<br>Defaults to true. When true, the graph will be animated with default animation options. The animation can also be a configuration object with properties <code>duration</code> and <code>easing</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/series-removepoint/\" target=\"_blank\">Remove cropped point</a>","since":"4.1.0","deprecated":false},{"name":"Highcharts--numberFormat","fullname":"Highcharts.numberFormat","type":"method","returnType":"String","description":"Formats a JavaScript number with grouped thousands, a fixed amount of decimals and an optional decimal point. It is a port of PHP's function with the same name. See <a href=\"http://php.net/manual/en/function.number-format.php\">PHP number_format</a> for a full explanation of the parameters.","title":"numberFormat","isParent":false,"parent":"Highcharts","params":"(Number number, [Number decimals], [String decimalPoint], [String thousandsSep])","paramsDescription":"number: Number<br>The raw number to format.||decimals: Number<br>The desired number of decimals.||decimalPoint: String<br>The decimal point. Defaults to \".\" or to the string specified globally in options.lang.decimalPoint.||thousandsSep: String<br>The thousands separator. Defaults to \" \" or to the string specified globally in options.lang.thousandsSep.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/highcharts-numberformat/\" target=\"_blank\">Custom number format</a>","since":"","deprecated":false},{"name":"Renderer--label","fullname":"Renderer.label","type":"method","returnType":"Element","description":"Draw a label, which is an extended <code>text</code> element with support for border and background. Highcharts creates a <code>g</code> element with a <code>text</code> and a <code>path</code> or <code>rect</code> inside, to make it behave somewhat like a HTML <code>div</code>. Border and background are set through <code>stroke</code>, <code>stroke-width</code> and <code>fill</code> attributes using the <a href=\"#Element.attr\">attr</a> method. This must be done before calling <a href=\"#Element.add\">add</a>.","title":"label","isParent":false,"parent":"Renderer","params":"(String str, Number x, Number y, String shape, Number anchorX, Number anchorY, Boolean useHTML, Boolean baseline, String className)","paramsDescription":"str: String<br>\r\nThe text or HTML to draw||\r\n\r\nx: Number<br>\r\nThe x position of the label's left side.||\r\n\r\ny: Number<br>\r\nThe y position of the label's top side or baseline, depending on the <code>baseline</code> parameter.||\r\n\r\nshape: String<br>\r\nThe shape of the label's border/background, if any. Defaults to <code>rect</code>.||\r\n\r\nanchorX: Number<br>\r\nIf the shape has a pointer, like the chevron on a callout shape, anchorX is the x position to point to.||\r\n\r\nanchorY: Number<br>\r\nIf the shape has a pointer, like the chevron on a callout shape, anchorY is the y position to point to.||\r\n\r\nuseHTML: Boolean<br>\r\nUse HTML to render the text of the label.||\r\n\r\nbaseline: Boolean<br>\r\nWhether the label should be vertically aligned by the text baseline, which makes it behave like the <code>text</code> element, or by the top left side, which makes it behave like a HTML <code>div</code>.||\r\n\r\nclassName: String<br>\r\nA class name for the <code>g</code> element surrounding the label.\r\n\r\n","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/members/renderer-label-on-chart/\" target=\"_blank\">A label on the chart</a>","since":"","deprecated":false}];
+offline.highcharts.option = [{"name":"global--Date","fullname":"global.Date","title":"Date","parent":"global","isParent":false,"returnType":"Object","since":"4.0.4","description":"A custom <code>Date</code> class for advanced date handling. For example, <a href=\"https://github.com/tahajahangir/jdate\">JDate</a> can be hooked in to handle Jalali dates.","deprecated":false},{"name":"global--VMLRadialGradientURL","fullname":"global.VMLRadialGradientURL","title":"VMLRadialGradientURL","parent":"global","isParent":false,"returnType":"String","defaults":"http://code.highcharts.com/{version}/gfx/vml-radial-gradient.png","since":"2.3.0","description":"Path to the pattern image required by VML browsers in order to draw radial gradients.","demo":"","seeAlso":"","deprecated":false},{"name":"drilldown--activeAxisLabelStyle","fullname":"drilldown.activeAxisLabelStyle","title":"activeAxisLabelStyle","parent":"drilldown","isParent":false,"returnType":"CSSObject","since":"3.0.8","description":"Additional styles to apply to the X axis label for a point that has drilldown data. By default it is underlined and blue to invite to interaction. Defaults to:\r\n<pre>activeAxisLabelStyle: {\r\n\tcursor: 'pointer',\r\n\tcolor: '#0d233a',\r\n\tfontWeight: 'bold',\r\n\ttextDecoration: 'underline'\t\t\t\r\n}</pre>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/labels/\" target=\"_blank\">Label styles</a>","deprecated":false},{"name":"legend-navigation--activeColor","fullname":"legend.navigation.activeColor","title":"activeColor","parent":"legend-navigation","isParent":false,"returnType":"Color","defaults":"#3E576F","since":"2.2.4","description":"The color for the active up or down arrow in the legend page navigation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/navigation/\" target=\"_blank\">\n\t\t\t\tLegend page navigation demonstrated</a>"},{"name":"drilldown--activeDataLabelStyle","fullname":"drilldown.activeDataLabelStyle","title":"activeDataLabelStyle","parent":"drilldown","isParent":false,"returnType":"CSSObject","since":"3.0.8","description":"Additional styles to apply to the data label of a point that has drilldown data. By default it is underlined and blue to invite to interaction. Defaults to:\r\n<pre>activeAxisLabelStyle: {\r\n\tcursor: 'pointer',\r\n\tcolor: '#0d233a',\r\n\tfontWeight: 'bold',\r\n\ttextDecoration: 'underline'\t\t\t\r\n}</pre>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/labels/\" target=\"_blank\">Label styles</a>","deprecated":false},{"name":"chart-events--addSeries","fullname":"chart.events.addSeries","title":"addSeries","parent":"chart-events","isParent":false,"returnType":"Function","context":"Chart","since":"1.2.0","description":"Fires when a series is added to the chart after load time, using the <code>addSeries</code> method. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Through <code>event.options</code> you can access the series options that was passed to the <code>addSeries</code>  method. Returning false prevents the series from being added.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/events-addseries/\" target=\"_blank\">Alert on add series</a>","deprecated":false},{"name":"series<area>-events--afterAnimate","fullname":"series<area>.events.afterAnimate","title":"afterAnimate","parent":"series<area>-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"plotOptions-spline-events--afterAnimate","fullname":"plotOptions.spline.events.afterAnimate","title":"afterAnimate","parent":"plotOptions-spline-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"plotOptions-errorbar-events--afterAnimate","fullname":"plotOptions.errorbar.events.afterAnimate","title":"afterAnimate","parent":"plotOptions-errorbar-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"plotOptions-waterfall-events--afterAnimate","fullname":"plotOptions.waterfall.events.afterAnimate","title":"afterAnimate","parent":"plotOptions-waterfall-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"series<waterfall>-events--afterAnimate","fullname":"series<waterfall>.events.afterAnimate","title":"afterAnimate","parent":"series<waterfall>-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"plotOptions-areasplinerange-events--afterAnimate","fullname":"plotOptions.areasplinerange.events.afterAnimate","title":"afterAnimate","parent":"plotOptions-areasplinerange-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"series<bar>-events--afterAnimate","fullname":"series<bar>.events.afterAnimate","title":"afterAnimate","parent":"series<bar>-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"plotOptions-area-events--afterAnimate","fullname":"plotOptions.area.events.afterAnimate","title":"afterAnimate","parent":"plotOptions-area-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"plotOptions-series-events--afterAnimate","fullname":"plotOptions.series.events.afterAnimate","title":"afterAnimate","parent":"plotOptions-series-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"plotOptions-line-events--afterAnimate","fullname":"plotOptions.line.events.afterAnimate","title":"afterAnimate","parent":"plotOptions-line-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"series<funnel>-events--afterAnimate","fullname":"series<funnel>.events.afterAnimate","title":"afterAnimate","parent":"series<funnel>-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"series<areasplinerange>-events--afterAnimate","fullname":"series<areasplinerange>.events.afterAnimate","title":"afterAnimate","parent":"series<areasplinerange>-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"plotOptions-column-events--afterAnimate","fullname":"plotOptions.column.events.afterAnimate","title":"afterAnimate","parent":"plotOptions-column-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"series<column>-events--afterAnimate","fullname":"series<column>.events.afterAnimate","title":"afterAnimate","parent":"series<column>-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"plotOptions-gauge-events--afterAnimate","fullname":"plotOptions.gauge.events.afterAnimate","title":"afterAnimate","parent":"plotOptions-gauge-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"plotOptions-solidgauge-events--afterAnimate","fullname":"plotOptions.solidgauge.events.afterAnimate","title":"afterAnimate","parent":"plotOptions-solidgauge-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"plotOptions-treemap-events--afterAnimate","fullname":"plotOptions.treemap.events.afterAnimate","title":"afterAnimate","parent":"plotOptions-treemap-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"series<pie>-events--afterAnimate","fullname":"series<pie>.events.afterAnimate","title":"afterAnimate","parent":"series<pie>-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"series<arearange>-events--afterAnimate","fullname":"series<arearange>.events.afterAnimate","title":"afterAnimate","parent":"series<arearange>-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"plotOptions-bubble-events--afterAnimate","fullname":"plotOptions.bubble.events.afterAnimate","title":"afterAnimate","parent":"plotOptions-bubble-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"series<scatter>-events--afterAnimate","fullname":"series<scatter>.events.afterAnimate","title":"afterAnimate","parent":"series<scatter>-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"plotOptions-pyramid-events--afterAnimate","fullname":"plotOptions.pyramid.events.afterAnimate","title":"afterAnimate","parent":"plotOptions-pyramid-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"series<boxplot>-events--afterAnimate","fullname":"series<boxplot>.events.afterAnimate","title":"afterAnimate","parent":"series<boxplot>-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"series<heatmap>-events--afterAnimate","fullname":"series<heatmap>.events.afterAnimate","title":"afterAnimate","parent":"series<heatmap>-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"plotOptions-boxplot-events--afterAnimate","fullname":"plotOptions.boxplot.events.afterAnimate","title":"afterAnimate","parent":"plotOptions-boxplot-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"series<gauge>-events--afterAnimate","fullname":"series<gauge>.events.afterAnimate","title":"afterAnimate","parent":"series<gauge>-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"plotOptions-funnel-events--afterAnimate","fullname":"plotOptions.funnel.events.afterAnimate","title":"afterAnimate","parent":"plotOptions-funnel-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"plotOptions-pie-events--afterAnimate","fullname":"plotOptions.pie.events.afterAnimate","title":"afterAnimate","parent":"plotOptions-pie-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"series<pyramid>-events--afterAnimate","fullname":"series<pyramid>.events.afterAnimate","title":"afterAnimate","parent":"series<pyramid>-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"series<line>-events--afterAnimate","fullname":"series<line>.events.afterAnimate","title":"afterAnimate","parent":"series<line>-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"plotOptions-arearange-events--afterAnimate","fullname":"plotOptions.arearange.events.afterAnimate","title":"afterAnimate","parent":"plotOptions-arearange-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"series<errorbar>-events--afterAnimate","fullname":"series<errorbar>.events.afterAnimate","title":"afterAnimate","parent":"series<errorbar>-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"plotOptions-columnrange-events--afterAnimate","fullname":"plotOptions.columnrange.events.afterAnimate","title":"afterAnimate","parent":"plotOptions-columnrange-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"plotOptions-scatter-events--afterAnimate","fullname":"plotOptions.scatter.events.afterAnimate","title":"afterAnimate","parent":"plotOptions-scatter-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"plotOptions-polygon-events--afterAnimate","fullname":"plotOptions.polygon.events.afterAnimate","title":"afterAnimate","parent":"plotOptions-polygon-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"series<areaspline>-events--afterAnimate","fullname":"series<areaspline>.events.afterAnimate","title":"afterAnimate","parent":"series<areaspline>-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"plotOptions-areaspline-events--afterAnimate","fullname":"plotOptions.areaspline.events.afterAnimate","title":"afterAnimate","parent":"plotOptions-areaspline-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"plotOptions-bar-events--afterAnimate","fullname":"plotOptions.bar.events.afterAnimate","title":"afterAnimate","parent":"plotOptions-bar-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"series<bubble>-events--afterAnimate","fullname":"series<bubble>.events.afterAnimate","title":"afterAnimate","parent":"series<bubble>-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"series<columnrange>-events--afterAnimate","fullname":"series<columnrange>.events.afterAnimate","title":"afterAnimate","parent":"series<columnrange>-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"series<polygon>-events--afterAnimate","fullname":"series<polygon>.events.afterAnimate","title":"afterAnimate","parent":"series<polygon>-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"series<solidgauge>-events--afterAnimate","fullname":"series<solidgauge>.events.afterAnimate","title":"afterAnimate","parent":"series<solidgauge>-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"series<treemap>-events--afterAnimate","fullname":"series<treemap>.events.afterAnimate","title":"afterAnimate","parent":"series<treemap>-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"plotOptions-heatmap-events--afterAnimate","fullname":"plotOptions.heatmap.events.afterAnimate","title":"afterAnimate","parent":"plotOptions-heatmap-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"series<spline>-events--afterAnimate","fullname":"series<spline>.events.afterAnimate","title":"afterAnimate","parent":"series<spline>-events","isParent":false,"returnType":"Function","context":"Series","since":"4.0","description":"Fires after the series has finished its initial animation, or in case animation is disabled, immediately as the series is displayed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-afteranimate/\" target=\"_blank\">Show label after animate</a>","deprecated":false},{"name":"yAxis-events--afterBreaks","fullname":"yAxis.events.afterBreaks","title":"afterBreaks","parent":"yAxis-events","isParent":false,"returnType":"Function","since":"4.1.0","description":"An event fired after the breaks have rendered.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/axisbreak/break-event//\" target=\"_blank\">afterBreak Event</a>","seeAlso":"<a href=\"#xAxis.breaks\">breaks</a>","deprecated":false},{"name":"xAxis-events--afterBreaks","fullname":"xAxis.events.afterBreaks","title":"afterBreaks","parent":"xAxis-events","isParent":false,"returnType":"Function","since":"4.1.0","description":"An event fired after the breaks have rendered.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/axisbreak/break-event//\" target=\"_blank\">afterBreak Event</a>","seeAlso":"<a href=\"#xAxis.breaks\">breaks</a>","deprecated":false},{"name":"chart-events--afterPrint","fullname":"chart.events.afterPrint","title":"afterPrint","parent":"chart-events","isParent":false,"returnType":"Function","context":"Chart","defaults":"","values":"","since":"4.1.0","description":"Fires after a chart is printed through the context menu item or the <code>Chart.print</code> method. Requires the exporting module.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/events-beforeprint-afterprint/\" target=\"_blank\">Rescale the chart to print</a>","seeAlso":"","deprecated":false},{"name":"xAxis-events--afterSetExtremes","fullname":"xAxis.events.afterSetExtremes","title":"afterSetExtremes","parent":"xAxis-events","isParent":false,"returnType":"Function","context":"Axis","since":"2.3","description":"As opposed to the <code>setExtremes</code> event, this event fires after the final min and max values are computed and corrected for <code>minRange</code>.","deprecated":false},{"name":"yAxis-events--afterSetExtremes","fullname":"yAxis.events.afterSetExtremes","title":"afterSetExtremes","parent":"yAxis-events","isParent":false,"returnType":"Function","context":"Axis","since":"2.3","description":"As opposed to the <code>setExtremes</code> event, this event fires after the final min and max values are computed and corrected for <code>minRange</code>.","deprecated":false},{"name":"plotOptions-areaspline-dataLabels--align","fullname":"plotOptions.areaspline.dataLabels.align","title":"align","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"xAxis-plotLines-label--align","fullname":"xAxis.plotLines.label.align","title":"align","parent":"xAxis-plotLines-label","isParent":false,"returnType":"String","defaults":"left","since":"2.1","description":"Horizontal alignment of the label. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-label-align-right/\" target=\"_blank\">Aligned to the right</a>","deprecated":false},{"name":"plotOptions-treemap-dataLabels--align","fullname":"plotOptions.treemap.dataLabels.align","title":"align","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"xAxis-plotBands-label--align","fullname":"xAxis.plotBands.label.align","title":"align","parent":"xAxis-plotBands-label","isParent":false,"returnType":"String","defaults":"center","since":"2.1","description":"Horizontal alignment of the label. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-label-align/\" target=\"_blank\">Aligned to the right</a>"},{"name":"plotOptions-bar-dataLabels--align","fullname":"plotOptions.bar.dataLabels.align","title":"align","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"String","defaults":"left","description":"Alignment of the data label relative to the data point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/bar-datalabels-align-inside-bar/\" target=\"_blank\">Data labels inside the bar</a>"},{"name":"yAxis-plotLines-label--align","fullname":"yAxis.plotLines.label.align","title":"align","parent":"yAxis-plotLines-label","isParent":false,"returnType":"String","defaults":"left","since":"2.1","description":"Horizontal alignment of the label. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-label-align-right/\" target=\"_blank\">Aligned to the right</a>","deprecated":false},{"name":"series<scatter>-dataLabels--align","fullname":"series<scatter>.dataLabels.align","title":"align","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"yAxis-plotBands-label--align","fullname":"yAxis.plotBands.label.align","title":"align","parent":"yAxis-plotBands-label","isParent":false,"returnType":"String","defaults":"center","since":"2.1","description":"Horizontal alignment of the label. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-label-align/\" target=\"_blank\">Aligned to the right</a>"},{"name":"series<gauge>-dataLabels--align","fullname":"series<gauge>.dataLabels.align","title":"align","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"plotOptions-gauge-dataLabels--align","fullname":"plotOptions.gauge.dataLabels.align","title":"align","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"subtitle--align","fullname":"subtitle.align","title":"align","parent":"subtitle","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","since":"2.0","description":"The horizontal alignment of the subtitle. Can be one of \"left\", \"center\" and \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/subtitle/align/\" target=\"_blank\">Footnote at right of plot area</a>"},{"name":"series<solidgauge>-dataLabels--align","fullname":"series<solidgauge>.dataLabels.align","title":"align","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels--align","fullname":"plotOptions.areasplinerange.dataLabels.align","title":"align","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"xAxis-labels--align","fullname":"xAxis.labels.align","title":"align","parent":"xAxis-labels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"What part of the string the given position is anchored to. Can be one of <code>\"left\"</code>, <code>\"center\"</code> or <code>\"right\"</code>. Defaults to an intelligent guess based on which side of the chart the axis is on and the rotation of the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-align-left/\" target=\"_blank\">\"left\"</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-align-right/\" target=\"_blank\">\"right\"</a> on X axis","deprecated":false},{"name":"plotOptions-spline-dataLabels--align","fullname":"plotOptions.spline.dataLabels.align","title":"align","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"plotOptions-line-dataLabels--align","fullname":"plotOptions.line.dataLabels.align","title":"align","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"yAxis-labels--align","fullname":"yAxis.labels.align","title":"align","parent":"yAxis-labels","isParent":false,"returnType":"String","defaults":"right","description":"What part of the string the given position is anchored to. \n\t\tCan be one of <code>\"left\"</code>, <code>\"center\"</code> or <code>\"right\"</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/labels-align-left/\" target=\"_blank\">\"left\"</a> on Y axis"},{"name":"yAxis-stackLabels--align","fullname":"yAxis.stackLabels.align","title":"align","parent":"yAxis-stackLabels","isParent":false,"returnType":"String","values":"[\"left\", \"center\", \"right\"]","since":"2.1.5","description":"Defines the horizontal alignment of the stack total label.  Can be one of <code>\"left\"</code>, <code>\"center\"</code> or <code>\"right\"</code>. The default value is calculated at runtime and depends on orientation and whether  the stack is positive or negative.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/stacklabels-align-left/\" target=\"_blank\">aligned to the left</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/stacklabels-align-center/\" target=\"_blank\">aligned in center</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/stacklabels-align-right/\" target=\"_blank\">aligned to the right</a>"},{"name":"series<spline>-dataLabels--align","fullname":"series<spline>.dataLabels.align","title":"align","parent":"series<spline>-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"series<area>-dataLabels--align","fullname":"series<area>.dataLabels.align","title":"align","parent":"series<area>-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"plotOptions-waterfall-dataLabels--align","fullname":"plotOptions.waterfall.dataLabels.align","title":"align","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"series<bubble>-dataLabels--align","fullname":"series<bubble>.dataLabels.align","title":"align","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"series<treemap>-dataLabels--align","fullname":"series<treemap>.dataLabels.align","title":"align","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"plotOptions-column-dataLabels--align","fullname":"plotOptions.column.dataLabels.align","title":"align","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"plotOptions-columnrange-dataLabels--align","fullname":"plotOptions.columnrange.dataLabels.align","title":"align","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"plotOptions-heatmap-dataLabels--align","fullname":"plotOptions.heatmap.dataLabels.align","title":"align","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"plotOptions-bubble-dataLabels--align","fullname":"plotOptions.bubble.dataLabels.align","title":"align","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"series<line>-dataLabels--align","fullname":"series<line>.dataLabels.align","title":"align","parent":"series<line>-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"exporting-buttons-contextButton--align","fullname":"exporting.buttons.contextButton.align","title":"align","parent":"exporting-buttons-contextButton","isParent":false,"returnType":"String","defaults":"right","values":"[\"left\", \"center\", \"right\"]","since":"2.0","description":"Alignment for the buttons.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-align/\" target=\"_blank\">Center aligned</a>"},{"name":"series<waterfall>-dataLabels--align","fullname":"series<waterfall>.dataLabels.align","title":"align","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"series<polygon>-dataLabels--align","fullname":"series<polygon>.dataLabels.align","title":"align","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"navigation-buttonOptions--align","fullname":"navigation.buttonOptions.align","title":"align","parent":"navigation-buttonOptions","isParent":false,"returnType":"String","defaults":"right","values":"[\"left\", \"center\", \"right\"]","since":"2.0","description":"Alignment for the buttons.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-align/\" target=\"_blank\">Center aligned</a>"},{"name":"series<arearange>-dataLabels--align","fullname":"series<arearange>.dataLabels.align","title":"align","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"series<areasplinerange>-dataLabels--align","fullname":"series<areasplinerange>.dataLabels.align","title":"align","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"series<column>-dataLabels--align","fullname":"series<column>.dataLabels.align","title":"align","parent":"series<column>-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"plotOptions-series-dataLabels--align","fullname":"plotOptions.series.dataLabels.align","title":"align","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"plotOptions-solidgauge-dataLabels--align","fullname":"plotOptions.solidgauge.dataLabels.align","title":"align","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"legend--align","fullname":"legend.align","title":"align","parent":"legend","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","since":"2.0","description":"The horizontal alignment of the legend box within the chart area. Valid values are <code>\"left\"</code>, <code>\"center\"</code> and <code>\"right\"</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/align/\" target=\"_blank\">Legend at the right of the chart</a>","deprecated":false},{"name":"plotOptions-area-dataLabels--align","fullname":"plotOptions.area.dataLabels.align","title":"align","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"plotOptions-scatter-dataLabels--align","fullname":"plotOptions.scatter.dataLabels.align","title":"align","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"title--align","fullname":"title.align","title":"align","parent":"title","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","since":"2.0","description":"The horizontal alignment of the title. Can be one of \"left\", \"center\" and \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/title/align/\" target=\"_blank\">Aligned to the plot area (x = 70px \n\t\t\t= margin left - spacing left)</a>"},{"name":"plotOptions-polygon-dataLabels--align","fullname":"plotOptions.polygon.dataLabels.align","title":"align","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"xAxis-title--align","fullname":"xAxis.title.align","title":"align","parent":"xAxis-title","isParent":false,"returnType":"String","defaults":"middle","values":"[\"low\", \"middle\", \"high\"]","description":"Alignment of the title relative to the axis values. Possible values\r\n are \"low\", \"middle\" or \"high\".","demo":"X axis title aligned <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/title-align-low/\" target=\"_blank\">\"low\"</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/title-align-center/\" target=\"_blank\">\"middle\" by default</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/title-align-high/\" target=\"_blank\">\"high\"</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/title-offset/\" target=\"_blank\">place the Y axis title on top of the axis</a>","deprecated":false},{"name":"series<columnrange>-dataLabels--align","fullname":"series<columnrange>.dataLabels.align","title":"align","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"series<areaspline>-dataLabels--align","fullname":"series<areaspline>.dataLabels.align","title":"align","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"series<bar>-dataLabels--align","fullname":"series<bar>.dataLabels.align","title":"align","parent":"series<bar>-dataLabels","isParent":false,"returnType":"String","defaults":"left","description":"Alignment of the data label relative to the data point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/bar-datalabels-align-inside-bar/\" target=\"_blank\">Data labels inside the bar</a>"},{"name":"plotOptions-arearange-dataLabels--align","fullname":"plotOptions.arearange.dataLabels.align","title":"align","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"series<heatmap>-dataLabels--align","fullname":"series<heatmap>.dataLabels.align","title":"align","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"String","defaults":"center","values":"[\"left\", \"center\", \"right\"]","description":"The alignment of the data label compared to the point.  If <code>right</code>, the right side of the label should be touching the point. For points with an extent, like columns, the alignments also dictates how to align it inside the box, as given with the <a href=\"#plotOptions.column.dataLabels.inside\">inside</a> option. Can be one of \"left\", \"center\" or \"right\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-align-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"yAxis-title--align","fullname":"yAxis.title.align","title":"align","parent":"yAxis-title","isParent":false,"returnType":"String","defaults":"middle","values":"[\"low\", \"middle\", \"high\"]","description":"Alignment of the title relative to the axis values. Possible values\r\n are \"low\", \"middle\" or \"high\".","demo":"X axis title aligned <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/title-align-low/\" target=\"_blank\">\"low\"</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/title-align-center/\" target=\"_blank\">\"middle\" by default</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/title-align-high/\" target=\"_blank\">\"high\"</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/title-offset/\" target=\"_blank\">place the Y axis title on top of the axis</a>","deprecated":false},{"name":"chart--alignTicks","fullname":"chart.alignTicks","title":"alignTicks","parent":"chart","isParent":false,"returnType":"Boolean","defaults":"true","description":"When using multiple axis, the ticks of two or more opposite axes will  automatically be aligned by adding ticks to the axis or axes with the least ticks. This can be prevented by setting <code>alignTicks</code> to false. If the grid lines look messy, it's a good idea to hide them for the secondary axis by setting <code>gridLineWidth</code> to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/alignticks-true/\" target=\"_blank\">True by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/alignticks-false/\" target=\"_blank\">false</a>."},{"name":"xAxis--allowDecimals","fullname":"xAxis.allowDecimals","title":"allowDecimals","parent":"xAxis","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Whether to allow decimals in this axis' ticks. When counting integers, like\r persons or hits on a web page, decimals must be avoided in the axis tick\r labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/allowdecimals-true/\" target=\"_blank\">True by default</a> (unwanted for this\r\n\t\t\ttype of data), \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/allowdecimals-false/\" target=\"_blank\">false</a>","seeAlso":"<a href=\"#xAxis.minTickInterval\">minTickInterval</a>","deprecated":false},{"name":"yAxis--allowDecimals","fullname":"yAxis.allowDecimals","title":"allowDecimals","parent":"yAxis","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Whether to allow decimals in this axis' ticks. When counting integers, like\r persons or hits on a web page, decimals must be avoided in the axis tick\r labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/allowdecimals-true/\" target=\"_blank\">True by default</a> (unwanted for this\r\n\t\t\ttype of data), \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/allowdecimals-false/\" target=\"_blank\">false</a>","seeAlso":"<a href=\"#xAxis.minTickInterval\">minTickInterval</a>","deprecated":false},{"name":"series<treemap>--allowDrillToNode","fullname":"series<treemap>.allowDrillToNode","title":"allowDrillToNode","parent":"series<treemap>","isParent":false,"returnType":"Boolean","defaults":"false","values":"[\"false\", \"true\"]","since":"4.1.0","description":"When enabled the user can click on a point which is a parent and zoom in on its children.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/treemap-allowdrilltonode/\" target=\"_blank\">Enabled</a>","deprecated":false},{"name":"plotOptions-treemap--allowDrillToNode","fullname":"plotOptions.treemap.allowDrillToNode","title":"allowDrillToNode","parent":"plotOptions-treemap","isParent":false,"returnType":"Boolean","defaults":"false","values":"[\"false\", \"true\"]","since":"4.1.0","description":"When enabled the user can click on a point which is a parent and zoom in on its children.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/treemap-allowdrilltonode/\" target=\"_blank\">Enabled</a>","deprecated":false},{"name":"plotOptions-columnrange-dataLabels--allowOverlap","fullname":"plotOptions.columnrange.dataLabels.allowOverlap","title":"allowOverlap","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"series<polygon>-dataLabels--allowOverlap","fullname":"series<polygon>.dataLabels.allowOverlap","title":"allowOverlap","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"series<areasplinerange>-dataLabels--allowOverlap","fullname":"series<areasplinerange>.dataLabels.allowOverlap","title":"allowOverlap","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"series<heatmap>-dataLabels--allowOverlap","fullname":"series<heatmap>.dataLabels.allowOverlap","title":"allowOverlap","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"plotOptions-bar-dataLabels--allowOverlap","fullname":"plotOptions.bar.dataLabels.allowOverlap","title":"allowOverlap","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"series<columnrange>-dataLabels--allowOverlap","fullname":"series<columnrange>.dataLabels.allowOverlap","title":"allowOverlap","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"plotOptions-gauge-dataLabels--allowOverlap","fullname":"plotOptions.gauge.dataLabels.allowOverlap","title":"allowOverlap","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"plotOptions-line-dataLabels--allowOverlap","fullname":"plotOptions.line.dataLabels.allowOverlap","title":"allowOverlap","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"series<gauge>-dataLabels--allowOverlap","fullname":"series<gauge>.dataLabels.allowOverlap","title":"allowOverlap","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"plotOptions-waterfall-dataLabels--allowOverlap","fullname":"plotOptions.waterfall.dataLabels.allowOverlap","title":"allowOverlap","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"series<bar>-dataLabels--allowOverlap","fullname":"series<bar>.dataLabels.allowOverlap","title":"allowOverlap","parent":"series<bar>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"series<arearange>-dataLabels--allowOverlap","fullname":"series<arearange>.dataLabels.allowOverlap","title":"allowOverlap","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"plotOptions-treemap-dataLabels--allowOverlap","fullname":"plotOptions.treemap.dataLabels.allowOverlap","title":"allowOverlap","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"series<areaspline>-dataLabels--allowOverlap","fullname":"series<areaspline>.dataLabels.allowOverlap","title":"allowOverlap","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"series<waterfall>-dataLabels--allowOverlap","fullname":"series<waterfall>.dataLabels.allowOverlap","title":"allowOverlap","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"plotOptions-column-dataLabels--allowOverlap","fullname":"plotOptions.column.dataLabels.allowOverlap","title":"allowOverlap","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"series<spline>-dataLabels--allowOverlap","fullname":"series<spline>.dataLabels.allowOverlap","title":"allowOverlap","parent":"series<spline>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"series<area>-dataLabels--allowOverlap","fullname":"series<area>.dataLabels.allowOverlap","title":"allowOverlap","parent":"series<area>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"series<solidgauge>-dataLabels--allowOverlap","fullname":"series<solidgauge>.dataLabels.allowOverlap","title":"allowOverlap","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"plotOptions-area-dataLabels--allowOverlap","fullname":"plotOptions.area.dataLabels.allowOverlap","title":"allowOverlap","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"plotOptions-solidgauge-dataLabels--allowOverlap","fullname":"plotOptions.solidgauge.dataLabels.allowOverlap","title":"allowOverlap","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"plotOptions-arearange-dataLabels--allowOverlap","fullname":"plotOptions.arearange.dataLabels.allowOverlap","title":"allowOverlap","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"series<column>-dataLabels--allowOverlap","fullname":"series<column>.dataLabels.allowOverlap","title":"allowOverlap","parent":"series<column>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"plotOptions-bubble-dataLabels--allowOverlap","fullname":"plotOptions.bubble.dataLabels.allowOverlap","title":"allowOverlap","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"plotOptions-spline-dataLabels--allowOverlap","fullname":"plotOptions.spline.dataLabels.allowOverlap","title":"allowOverlap","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"series<bubble>-dataLabels--allowOverlap","fullname":"series<bubble>.dataLabels.allowOverlap","title":"allowOverlap","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"series<treemap>-dataLabels--allowOverlap","fullname":"series<treemap>.dataLabels.allowOverlap","title":"allowOverlap","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"plotOptions-polygon-dataLabels--allowOverlap","fullname":"plotOptions.polygon.dataLabels.allowOverlap","title":"allowOverlap","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"plotOptions-series-dataLabels--allowOverlap","fullname":"plotOptions.series.dataLabels.allowOverlap","title":"allowOverlap","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"plotOptions-heatmap-dataLabels--allowOverlap","fullname":"plotOptions.heatmap.dataLabels.allowOverlap","title":"allowOverlap","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"series<line>-dataLabels--allowOverlap","fullname":"series<line>.dataLabels.allowOverlap","title":"allowOverlap","parent":"series<line>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"series<scatter>-dataLabels--allowOverlap","fullname":"series<scatter>.dataLabels.allowOverlap","title":"allowOverlap","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"plotOptions-areaspline-dataLabels--allowOverlap","fullname":"plotOptions.areaspline.dataLabels.allowOverlap","title":"allowOverlap","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"plotOptions-scatter-dataLabels--allowOverlap","fullname":"plotOptions.scatter.dataLabels.allowOverlap","title":"allowOverlap","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels--allowOverlap","fullname":"plotOptions.areasplinerange.dataLabels.allowOverlap","title":"allowOverlap","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.1.0","description":"Whether to allow data labels to overlap. To make the labels less sensitive for overlapping, the <a href=\"#plotOptions.series.dataLabels.padding\">dataLabels.padding</a> can be set to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-allowoverlap-false/\" target=\"_blank\">Don't allow overlap</a>","deprecated":false},{"name":"plotOptions-arearange--allowPointSelect","fullname":"plotOptions.arearange.allowPointSelect","title":"allowPointSelect","parent":"plotOptions-arearange","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"series<area>--allowPointSelect","fullname":"series<area>.allowPointSelect","title":"allowPointSelect","parent":"series<area>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-boxplot--allowPointSelect","fullname":"plotOptions.boxplot.allowPointSelect","title":"allowPointSelect","parent":"plotOptions-boxplot","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-heatmap--allowPointSelect","fullname":"plotOptions.heatmap.allowPointSelect","title":"allowPointSelect","parent":"plotOptions-heatmap","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"series<column>--allowPointSelect","fullname":"series<column>.allowPointSelect","title":"allowPointSelect","parent":"series<column>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-treemap--allowPointSelect","fullname":"plotOptions.treemap.allowPointSelect","title":"allowPointSelect","parent":"plotOptions-treemap","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-polygon--allowPointSelect","fullname":"plotOptions.polygon.allowPointSelect","title":"allowPointSelect","parent":"plotOptions-polygon","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"series<areasplinerange>--allowPointSelect","fullname":"series<areasplinerange>.allowPointSelect","title":"allowPointSelect","parent":"series<areasplinerange>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"series<pyramid>--allowPointSelect","fullname":"series<pyramid>.allowPointSelect","title":"allowPointSelect","parent":"series<pyramid>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-line--allowPointSelect","fullname":"plotOptions.line.allowPointSelect","title":"allowPointSelect","parent":"plotOptions-line","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-bubble--allowPointSelect","fullname":"plotOptions.bubble.allowPointSelect","title":"allowPointSelect","parent":"plotOptions-bubble","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"series<bar>--allowPointSelect","fullname":"series<bar>.allowPointSelect","title":"allowPointSelect","parent":"series<bar>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-errorbar--allowPointSelect","fullname":"plotOptions.errorbar.allowPointSelect","title":"allowPointSelect","parent":"plotOptions-errorbar","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-waterfall--allowPointSelect","fullname":"plotOptions.waterfall.allowPointSelect","title":"allowPointSelect","parent":"plotOptions-waterfall","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-spline--allowPointSelect","fullname":"plotOptions.spline.allowPointSelect","title":"allowPointSelect","parent":"plotOptions-spline","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"series<line>--allowPointSelect","fullname":"series<line>.allowPointSelect","title":"allowPointSelect","parent":"series<line>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"series<arearange>--allowPointSelect","fullname":"series<arearange>.allowPointSelect","title":"allowPointSelect","parent":"series<arearange>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-series--allowPointSelect","fullname":"plotOptions.series.allowPointSelect","title":"allowPointSelect","parent":"plotOptions-series","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-bar--allowPointSelect","fullname":"plotOptions.bar.allowPointSelect","title":"allowPointSelect","parent":"plotOptions-bar","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"series<columnrange>--allowPointSelect","fullname":"series<columnrange>.allowPointSelect","title":"allowPointSelect","parent":"series<columnrange>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-column--allowPointSelect","fullname":"plotOptions.column.allowPointSelect","title":"allowPointSelect","parent":"plotOptions-column","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"series<boxplot>--allowPointSelect","fullname":"series<boxplot>.allowPointSelect","title":"allowPointSelect","parent":"series<boxplot>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-pie--allowPointSelect","fullname":"plotOptions.pie.allowPointSelect","title":"allowPointSelect","parent":"plotOptions-pie","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"series<scatter>--allowPointSelect","fullname":"series<scatter>.allowPointSelect","title":"allowPointSelect","parent":"series<scatter>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"series<errorbar>--allowPointSelect","fullname":"series<errorbar>.allowPointSelect","title":"allowPointSelect","parent":"series<errorbar>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-pyramid--allowPointSelect","fullname":"plotOptions.pyramid.allowPointSelect","title":"allowPointSelect","parent":"plotOptions-pyramid","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-columnrange--allowPointSelect","fullname":"plotOptions.columnrange.allowPointSelect","title":"allowPointSelect","parent":"plotOptions-columnrange","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-funnel--allowPointSelect","fullname":"plotOptions.funnel.allowPointSelect","title":"allowPointSelect","parent":"plotOptions-funnel","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"series<areaspline>--allowPointSelect","fullname":"series<areaspline>.allowPointSelect","title":"allowPointSelect","parent":"series<areaspline>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"series<bubble>--allowPointSelect","fullname":"series<bubble>.allowPointSelect","title":"allowPointSelect","parent":"series<bubble>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"series<polygon>--allowPointSelect","fullname":"series<polygon>.allowPointSelect","title":"allowPointSelect","parent":"series<polygon>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-area--allowPointSelect","fullname":"plotOptions.area.allowPointSelect","title":"allowPointSelect","parent":"plotOptions-area","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"series<heatmap>--allowPointSelect","fullname":"series<heatmap>.allowPointSelect","title":"allowPointSelect","parent":"series<heatmap>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-areaspline--allowPointSelect","fullname":"plotOptions.areaspline.allowPointSelect","title":"allowPointSelect","parent":"plotOptions-areaspline","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"series<spline>--allowPointSelect","fullname":"series<spline>.allowPointSelect","title":"allowPointSelect","parent":"series<spline>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-scatter--allowPointSelect","fullname":"plotOptions.scatter.allowPointSelect","title":"allowPointSelect","parent":"plotOptions-scatter","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"series<waterfall>--allowPointSelect","fullname":"series<waterfall>.allowPointSelect","title":"allowPointSelect","parent":"series<waterfall>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"series<treemap>--allowPointSelect","fullname":"series<treemap>.allowPointSelect","title":"allowPointSelect","parent":"series<treemap>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-areasplinerange--allowPointSelect","fullname":"plotOptions.areasplinerange.allowPointSelect","title":"allowPointSelect","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"series<funnel>--allowPointSelect","fullname":"series<funnel>.allowPointSelect","title":"allowPointSelect","parent":"series<funnel>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"series<pie>--allowPointSelect","fullname":"series<pie>.allowPointSelect","title":"allowPointSelect","parent":"series<pie>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Allow this series' points to be selected by clicking on the markers, bars or pie slices.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-line/\" target=\"_blank\">Line</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-column/\" target=\"_blank\">column</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-allowpointselect-pie/\" target=\"_blank\">pie</a>"},{"name":"chart-options3d--alpha","fullname":"chart.options3d.alpha","title":"alpha","parent":"chart-options3d","isParent":false,"returnType":"Number","defaults":"0","since":"4.0","description":"One of the two rotation angles for the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/3d-column-interactive/\">Dynamic Angles</a>","deprecated":false},{"name":"yAxis--alternateGridColor","fullname":"yAxis.alternateGridColor","title":"alternateGridColor","parent":"yAxis","isParent":false,"returnType":"Color","description":"When using an alternate grid color, a band is painted across the plot area between every other grid line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/alternategridcolor/\" target=\"_blank\">Alternate grid color on the Y axis</a>"},{"name":"xAxis--alternateGridColor","fullname":"xAxis.alternateGridColor","title":"alternateGridColor","parent":"xAxis","isParent":false,"returnType":"Color","description":"When using an alternate grid color, a band is painted across the plot area between every other grid line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/alternategridcolor/\" target=\"_blank\">Alternate grid color on the Y axis</a>"},{"name":"series<treemap>--alternateStartingDirection","fullname":"series<treemap>.alternateStartingDirection","title":"alternateStartingDirection","parent":"series<treemap>","isParent":false,"returnType":"Boolean","defaults":"false","values":"[\"false\", \"true\"]","since":"4.1.0","description":"Enabling this option will make the treemap alternate the drawing direction between vertical and horizontal.\r\nThe next levels starting direction will always be the opposite of the previous.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/treemap-alternateStartingDirection/\" target=\"_blank\">Enabled</a>\r\n","deprecated":false},{"name":"plotOptions-treemap--alternateStartingDirection","fullname":"plotOptions.treemap.alternateStartingDirection","title":"alternateStartingDirection","parent":"plotOptions-treemap","isParent":false,"returnType":"Boolean","defaults":"false","values":"[\"false\", \"true\"]","since":"4.1.0","description":"Enabling this option will make the treemap alternate the drawing direction between vertical and horizontal.\r\nThe next levels starting direction will always be the opposite of the previous.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/treemap-alternateStartingDirection/\" target=\"_blank\">Enabled</a>\r\n","deprecated":false},{"name":"series<column>--animation","fullname":"series<column>.animation","title":"animation","parent":"series<column>","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-area--animation","fullname":"plotOptions.area.animation","title":"animation","parent":"plotOptions-area","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"series<gauge>--animation","fullname":"series<gauge>.animation","title":"animation","parent":"series<gauge>","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"series<area>--animation","fullname":"series<area>.animation","title":"animation","parent":"series<area>","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-column--animation","fullname":"plotOptions.column.animation","title":"animation","parent":"plotOptions-column","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon--animation","fullname":"plotOptions.polygon.animation","title":"animation","parent":"plotOptions-polygon","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-solidgauge--animation","fullname":"plotOptions.solidgauge.animation","title":"animation","parent":"plotOptions-solidgauge","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"series<bar>--animation","fullname":"series<bar>.animation","title":"animation","parent":"series<bar>","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange--animation","fullname":"plotOptions.areasplinerange.animation","title":"animation","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange--animation","fullname":"plotOptions.columnrange.animation","title":"animation","parent":"plotOptions-columnrange","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-bar--animation","fullname":"plotOptions.bar.animation","title":"animation","parent":"plotOptions-bar","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"series<pie>--animation","fullname":"series<pie>.animation","title":"animation","parent":"series<pie>","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"tooltip--animation","fullname":"tooltip.animation","title":"animation","parent":"tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Enable or disable animation of the tooltip. In slow legacy IE browsers the animation is disabled by default.","demo":"","seeAlso":"","deprecated":false},{"name":"series<line>--animation","fullname":"series<line>.animation","title":"animation","parent":"series<line>","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"legend-navigation--animation","fullname":"legend.navigation.animation","title":"animation","parent":"legend-navigation","isParent":false,"returnType":"Boolean|Object","defaults":"true","since":"2.2.4","description":"How to animate the pages when navigating up or down. A value of <code>true</code> applies the default navigation given in  the chart.animation option. Additional options can be given as an object containing values for easing and duration.  .","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/navigation/\" target=\"_blank\">\n\t\t\t\tLegend page navigation demonstrated</a>"},{"name":"plotOptions-areaspline--animation","fullname":"plotOptions.areaspline.animation","title":"animation","parent":"plotOptions-areaspline","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall--animation","fullname":"plotOptions.waterfall.animation","title":"animation","parent":"plotOptions-waterfall","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-spline--animation","fullname":"plotOptions.spline.animation","title":"animation","parent":"plotOptions-spline","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap--animation","fullname":"plotOptions.heatmap.animation","title":"animation","parent":"plotOptions-heatmap","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>--animation","fullname":"series<areasplinerange>.animation","title":"animation","parent":"series<areasplinerange>","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"series<spline>--animation","fullname":"series<spline>.animation","title":"animation","parent":"series<spline>","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-series--animation","fullname":"plotOptions.series.animation","title":"animation","parent":"plotOptions-series","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"series<bubble>--animation","fullname":"series<bubble>.animation","title":"animation","parent":"series<bubble>","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-line--animation","fullname":"plotOptions.line.animation","title":"animation","parent":"plotOptions-line","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"series<areaspline>--animation","fullname":"series<areaspline>.animation","title":"animation","parent":"series<areaspline>","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter--animation","fullname":"plotOptions.scatter.animation","title":"animation","parent":"plotOptions-scatter","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"series<arearange>--animation","fullname":"series<arearange>.animation","title":"animation","parent":"series<arearange>","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"series<solidgauge>--animation","fullname":"series<solidgauge>.animation","title":"animation","parent":"series<solidgauge>","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"drilldown--animation","fullname":"drilldown.animation","title":"animation","parent":"drilldown","isParent":false,"returnType":"Boolean|Object","defaults":"","values":"","since":"3.0.8","description":"<p>Set the animation for all drilldown animations. Animation of a drilldown occurs when drilling between a column point and a column series, or a pie slice and a full pie series. Drilldown can still be used between series and points of different types, but animation will not occur.</p>\r\n \r\n <p>The animation can either be set as a boolean or a configuration object. If <code>true</code>,\r\n it will use the 'swing' jQuery easing and a duration of 500 ms. If used as a configuration object,\r\n the following properties are supported: \r\n </p><dl>\r\n \t<dt>duration</dt>\r\n \t<dd>The duration of the animation in milliseconds.</dd>\r\n \t\r\n \t<dt>easing</dt>\r\n \t<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\r\n \t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\r\n \tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using \r\n \tMooTools as the general framework, use the property name <code>transition</code> instead \r\n \tof <code>easing</code>.</dd>\r\n </dl>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pie--animation","fullname":"plotOptions.pie.animation","title":"animation","parent":"plotOptions-pie","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"series<heatmap>--animation","fullname":"series<heatmap>.animation","title":"animation","parent":"series<heatmap>","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"series<columnrange>--animation","fullname":"series<columnrange>.animation","title":"animation","parent":"series<columnrange>","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble--animation","fullname":"plotOptions.bubble.animation","title":"animation","parent":"plotOptions-bubble","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"series<waterfall>--animation","fullname":"series<waterfall>.animation","title":"animation","parent":"series<waterfall>","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange--animation","fullname":"plotOptions.arearange.animation","title":"animation","parent":"plotOptions-arearange","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap--animation","fullname":"plotOptions.treemap.animation","title":"animation","parent":"plotOptions-treemap","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"series<treemap>--animation","fullname":"series<treemap>.animation","title":"animation","parent":"series<treemap>","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"series<polygon>--animation","fullname":"series<polygon>.animation","title":"animation","parent":"series<polygon>","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"series<scatter>--animation","fullname":"series<scatter>.animation","title":"animation","parent":"series<scatter>","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"chart--animation","fullname":"chart.animation","title":"animation","parent":"chart","isParent":false,"returnType":"Boolean|Object","defaults":"true","description":"<p>Set the overall animation for all chart updating. Animation can be disabled throughout\r the chart by setting it to false here. It can be overridden for each individual\r API method as a function parameter. The only animation not affected by this option is the \r initial series animation, see <a class=\"internal\" href=\"#plotOptions.series.animation\">plotOptions.series.animation</a>.</p>\r \r <p>The animation can either be set as a boolean or a configuration object. If <code>true</code>,\r it will use the 'swing' jQuery easing and a duration of 500 ms. If used as a configuration object,\r the following properties are supported: \r </p><dl>\r \t<dt>duration</dt>\r \t<dd>The duration of the animation in milliseconds.</dd>\r \t\r \t<dt>easing</dt>\r \t<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\r \t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\r \tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using \r \tMooTools as the general framework, use the property name <code>transition</code> instead \r \tof <code>easing</code>.</dd>\r </dl>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/animation-none/\" target=\"_blank\">Updating with no animation</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/animation-duration/\" target=\"_blank\">with a longer duration</a>,  \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/animation-easing/\" target=\"_blank\">with a jQuery UI easing</a>.","deprecated":false},{"name":"plotOptions-gauge--animation","fullname":"plotOptions.gauge.animation","title":"animation","parent":"plotOptions-gauge","isParent":false,"returnType":"Boolean","defaults":"true","since":"","description":"<p>Enable or disable the initial animation when a series is displayed. The animation can also be set as a configuration object. Please note that this option only applies to the initial animation of the series itself. For other animations, see <a href=\"#chart.animation\">chart.animation</a> and the animation parameter under the API methods.\t\tThe following properties are supported:</p>\r\n<dl>\r\n  <dt>duration</dt>\r\n  <dd>The duration of the animation in milliseconds.</dd>\r\n<dt>easing</dt>\r\n<dd>When using jQuery as the general framework, the easing can be set to <code>linear</code> or\t<code>swing</code>. More easing functions are available with the use of jQuery plug-ins, most notably\t\t\t\tthe jQuery UI suite. See <a href=\"http://api.jquery.com/animate/\">the jQuery docs</a>. When using MooTools as the general framework, use the property name <code>transition</code> instead of <code>easing</code>.</dd>\r\n</dl>\r\n<p>\r\nDue to poor performance, animation is disabled in old IE browsers for column charts and polar charts.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-disabled/\" target=\"_blank\">Animation disabled</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-slower/\" target=\"_blank\">slower animation</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-animation-easing/\" target=\"_blank\">easing \"easeOutBounce\" through jQuery UI</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-area","fullname":"plotOptions.area","title":"area","parent":"plotOptions","isParent":true},{"name":"plotOptions-arearange","fullname":"plotOptions.arearange","title":"arearange","parent":"plotOptions","isParent":true,"since":"2.3.0","description":"The area range is a cartesian series type with higher and lower Y values along an X axis. Requires <code>highcharts-more.js</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange/\">Arearange example</a>","deprecated":false},{"name":"plotOptions-areaspline","fullname":"plotOptions.areaspline","title":"areaspline","parent":"plotOptions","isParent":true},{"name":"plotOptions-areasplinerange","fullname":"plotOptions.areasplinerange","title":"areasplinerange","parent":"plotOptions","isParent":true,"returnType":"","defaults":"","since":"2.3.0","description":"The area spline range is a cartesian series type with higher and lower Y values along an X axis. Requires <code>highcharts-more.js</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"legend-navigation--arrowSize","fullname":"legend.navigation.arrowSize","title":"arrowSize","parent":"legend-navigation","isParent":false,"returnType":"Number","defaults":"12","since":"2.2.4","description":"The pixel size of the up and down arrows in the legend paging navigation.  .","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/navigation/\" target=\"_blank\">\n\t\t\t\tLegend page navigation demonstrated</a>"},{"name":"noData--attr","fullname":"noData.attr","title":"attr","parent":"noData","isParent":false,"returnType":"Object","since":"3.0.8","description":"An object of additional SVG attributes for the no-data label.","deprecated":false},{"name":"plotOptions-arearange-states-hover-halo--attributes","fullname":"plotOptions.arearange.states.hover.halo.attributes","title":"attributes","parent":"plotOptions-arearange-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-area-states-hover-halo--attributes","fullname":"plotOptions.area.states.hover.halo.attributes","title":"attributes","parent":"plotOptions-area-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot-states-hover-halo--attributes","fullname":"plotOptions.boxplot.states.hover.halo.attributes","title":"attributes","parent":"plotOptions-boxplot-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<treemap>-states-hover-halo--attributes","fullname":"series<treemap>.states.hover.halo.attributes","title":"attributes","parent":"series<treemap>-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<errorbar>-states-hover-halo--attributes","fullname":"series<errorbar>.states.hover.halo.attributes","title":"attributes","parent":"series<errorbar>-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel-states-hover-halo--attributes","fullname":"plotOptions.funnel.states.hover.halo.attributes","title":"attributes","parent":"plotOptions-funnel-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-states-hover-halo--attributes","fullname":"plotOptions.spline.states.hover.halo.attributes","title":"attributes","parent":"plotOptions-spline-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap-states-hover-halo--attributes","fullname":"plotOptions.heatmap.states.hover.halo.attributes","title":"attributes","parent":"plotOptions-heatmap-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange-states-hover-halo--attributes","fullname":"plotOptions.areasplinerange.states.hover.halo.attributes","title":"attributes","parent":"plotOptions-areasplinerange-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>-states-hover-halo--attributes","fullname":"series<spline>.states.hover.halo.attributes","title":"attributes","parent":"series<spline>-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar-states-hover-halo--attributes","fullname":"plotOptions.errorbar.states.hover.halo.attributes","title":"attributes","parent":"plotOptions-errorbar-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-states-hover-halo--attributes","fullname":"plotOptions.polygon.states.hover.halo.attributes","title":"attributes","parent":"plotOptions-polygon-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-line-states-hover-halo--attributes","fullname":"plotOptions.line.states.hover.halo.attributes","title":"attributes","parent":"plotOptions-line-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-states-hover-halo--attributes","fullname":"series<areasplinerange>.states.hover.halo.attributes","title":"attributes","parent":"series<areasplinerange>-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter-states-hover-halo--attributes","fullname":"plotOptions.scatter.states.hover.halo.attributes","title":"attributes","parent":"plotOptions-scatter-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pie-states-hover-halo--attributes","fullname":"plotOptions.pie.states.hover.halo.attributes","title":"attributes","parent":"plotOptions-pie-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<boxplot>-states-hover-halo--attributes","fullname":"series<boxplot>.states.hover.halo.attributes","title":"attributes","parent":"series<boxplot>-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<polygon>-states-hover-halo--attributes","fullname":"series<polygon>.states.hover.halo.attributes","title":"attributes","parent":"series<polygon>-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<area>-states-hover-halo--attributes","fullname":"series<area>.states.hover.halo.attributes","title":"attributes","parent":"series<area>-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<solidgauge>-states-hover-halo--attributes","fullname":"series<solidgauge>.states.hover.halo.attributes","title":"attributes","parent":"series<solidgauge>-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bar-states-hover-halo--attributes","fullname":"plotOptions.bar.states.hover.halo.attributes","title":"attributes","parent":"plotOptions-bar-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge-states-hover-halo--attributes","fullname":"plotOptions.gauge.states.hover.halo.attributes","title":"attributes","parent":"plotOptions-gauge-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<gauge>-states-hover-halo--attributes","fullname":"series<gauge>.states.hover.halo.attributes","title":"attributes","parent":"series<gauge>-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange-states-hover-halo--attributes","fullname":"plotOptions.columnrange.states.hover.halo.attributes","title":"attributes","parent":"plotOptions-columnrange-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<line>-states-hover-halo--attributes","fullname":"series<line>.states.hover.halo.attributes","title":"attributes","parent":"series<line>-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column-states-hover-halo--attributes","fullname":"plotOptions.column.states.hover.halo.attributes","title":"attributes","parent":"plotOptions-column-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap-states-hover-halo--attributes","fullname":"plotOptions.treemap.states.hover.halo.attributes","title":"attributes","parent":"plotOptions-treemap-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<scatter>-states-hover-halo--attributes","fullname":"series<scatter>.states.hover.halo.attributes","title":"attributes","parent":"series<scatter>-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble-states-hover-halo--attributes","fullname":"plotOptions.bubble.states.hover.halo.attributes","title":"attributes","parent":"plotOptions-bubble-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bubble>-states-hover-halo--attributes","fullname":"series<bubble>.states.hover.halo.attributes","title":"attributes","parent":"series<bubble>-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-states-hover-halo--attributes","fullname":"plotOptions.areaspline.states.hover.halo.attributes","title":"attributes","parent":"plotOptions-areaspline-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<funnel>-states-hover-halo--attributes","fullname":"series<funnel>.states.hover.halo.attributes","title":"attributes","parent":"series<funnel>-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<column>-states-hover-halo--attributes","fullname":"series<column>.states.hover.halo.attributes","title":"attributes","parent":"series<column>-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<columnrange>-states-hover-halo--attributes","fullname":"series<columnrange>.states.hover.halo.attributes","title":"attributes","parent":"series<columnrange>-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bar>-states-hover-halo--attributes","fullname":"series<bar>.states.hover.halo.attributes","title":"attributes","parent":"series<bar>-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-solidgauge-states-hover-halo--attributes","fullname":"plotOptions.solidgauge.states.hover.halo.attributes","title":"attributes","parent":"plotOptions-solidgauge-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<arearange>-states-hover-halo--attributes","fullname":"series<arearange>.states.hover.halo.attributes","title":"attributes","parent":"series<arearange>-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-states-hover-halo--attributes","fullname":"plotOptions.pyramid.states.hover.halo.attributes","title":"attributes","parent":"plotOptions-pyramid-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall-states-hover-halo--attributes","fullname":"plotOptions.waterfall.states.hover.halo.attributes","title":"attributes","parent":"plotOptions-waterfall-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-series-states-hover-halo--attributes","fullname":"plotOptions.series.states.hover.halo.attributes","title":"attributes","parent":"plotOptions-series-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pyramid>-states-hover-halo--attributes","fullname":"series<pyramid>.states.hover.halo.attributes","title":"attributes","parent":"series<pyramid>-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areaspline>-states-hover-halo--attributes","fullname":"series<areaspline>.states.hover.halo.attributes","title":"attributes","parent":"series<areaspline>-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<heatmap>-states-hover-halo--attributes","fullname":"series<heatmap>.states.hover.halo.attributes","title":"attributes","parent":"series<heatmap>-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<waterfall>-states-hover-halo--attributes","fullname":"series<waterfall>.states.hover.halo.attributes","title":"attributes","parent":"series<waterfall>-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pie>-states-hover-halo--attributes","fullname":"series<pie>.states.hover.halo.attributes","title":"attributes","parent":"series<pie>-states-hover-halo","isParent":false,"returnType":"Object","defaults":"","values":"","since":"4.0","description":"A collection of SVG attributes to override the appearance of the halo, for example <code>fill</code>, <code>stroke</code> and <code>stroke-width</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"yAxis-labels--autoRotation","fullname":"yAxis.labels.autoRotation","title":"autoRotation","parent":"yAxis-labels","isParent":false,"returnType":"Array<Number>","defaults":"[-45]","since":"4.1.0","description":"For horizontal axes, the allowed degrees of label rotation to prevent overlapping labels. If there is enough space, labels are not rotated. As the chart gets narrower, it will start rotating the labels -45 degrees, then remove every second label and try again with rotations 0 and -45 etc. Set it to <code>false</code> to disable rotation, which will cause the labels to word-wrap if possible.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-autorotation-default/\" target=\"_blank\">Default auto rotation of 0 or -45</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-autorotation-0-90/\" target=\"_blank\">custom graded auto rotation</a>","deprecated":false},{"name":"xAxis-labels--autoRotation","fullname":"xAxis.labels.autoRotation","title":"autoRotation","parent":"xAxis-labels","isParent":false,"returnType":"Array<Number>","defaults":"[-45]","since":"4.1.0","description":"For horizontal axes, the allowed degrees of label rotation to prevent overlapping labels. If there is enough space, labels are not rotated. As the chart gets narrower, it will start rotating the labels -45 degrees, then remove every second label and try again with rotations 0 and -45 etc. Set it to <code>false</code> to disable rotation, which will cause the labels to word-wrap if possible.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-autorotation-default/\" target=\"_blank\">Default auto rotation of 0 or -45</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-autorotation-0-90/\" target=\"_blank\">custom graded auto rotation</a>","deprecated":false},{"name":"yAxis-labels--autoRotationLimit","fullname":"yAxis.labels.autoRotationLimit","title":"autoRotationLimit","parent":"yAxis-labels","isParent":false,"returnType":"Number","defaults":"80","since":"4.1.5","description":"When each category width is more than this many pixels, we don't apply auto rotation. Instead, we lay out the axis label with word wrap. A lower limit makes sense when the label contains multiple short words that don't extend the available horizontal space for each label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-autorotationlimit/\" target=\"_blank\">Lower limit</a>","deprecated":false},{"name":"xAxis-labels--autoRotationLimit","fullname":"xAxis.labels.autoRotationLimit","title":"autoRotationLimit","parent":"xAxis-labels","isParent":false,"returnType":"Number","defaults":"80","since":"4.1.5","description":"When each category width is more than this many pixels, we don't apply auto rotation. Instead, we lay out the axis label with word wrap. A lower limit makes sense when the label contains multiple short words that don't extend the available horizontal space for each label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-autorotationlimit/\" target=\"_blank\">Lower limit</a>","deprecated":false},{"name":"chart-options3d-frame-back","fullname":"chart.options3d.frame.back","title":"back","parent":"chart-options3d-frame","isParent":true,"returnType":"","defaults":"","values":"","since":"4.0","description":"Defines the back panel of the frame around 3D charts.","demo":"","seeAlso":"","deprecated":false},{"name":"pane--background","fullname":"pane.background","title":"background","parent":"pane","isParent":false,"returnType":"Array<Object>","since":"2.3.0","description":"An object, or array of objects, for backgrounds. Sub options include <code>backgroundColor</code> (can be solid or gradient), <code>shape</code> (\"solid\" or \"arc\"), <code>innerWidth</code>, <code>outerWidth</code>, <code>borderWidth</code>, <code>borderColor</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/gauge-speedometer/\" target=\"_blank\">Multiple backgrounds on a gauge</a>.","deprecated":false},{"name":"plotOptions-heatmap-dataLabels--backgroundColor","fullname":"plotOptions.heatmap.dataLabels.backgroundColor","title":"backgroundColor","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<funnel>-dataLabels--backgroundColor","fullname":"series<funnel>.dataLabels.backgroundColor","title":"backgroundColor","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-treemap-dataLabels--backgroundColor","fullname":"plotOptions.treemap.dataLabels.backgroundColor","title":"backgroundColor","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-columnrange-dataLabels--backgroundColor","fullname":"plotOptions.columnrange.dataLabels.backgroundColor","title":"backgroundColor","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<heatmap>-dataLabels--backgroundColor","fullname":"series<heatmap>.dataLabels.backgroundColor","title":"backgroundColor","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<pie>-dataLabels--backgroundColor","fullname":"series<pie>.dataLabels.backgroundColor","title":"backgroundColor","parent":"series<pie>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-line-dataLabels--backgroundColor","fullname":"plotOptions.line.dataLabels.backgroundColor","title":"backgroundColor","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-column-dataLabels--backgroundColor","fullname":"plotOptions.column.dataLabels.backgroundColor","title":"backgroundColor","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-bar-dataLabels--backgroundColor","fullname":"plotOptions.bar.dataLabels.backgroundColor","title":"backgroundColor","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<areaspline>-dataLabels--backgroundColor","fullname":"series<areaspline>.dataLabels.backgroundColor","title":"backgroundColor","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-area-dataLabels--backgroundColor","fullname":"plotOptions.area.dataLabels.backgroundColor","title":"backgroundColor","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<arearange>-dataLabels--backgroundColor","fullname":"series<arearange>.dataLabels.backgroundColor","title":"backgroundColor","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<gauge>-dataLabels--backgroundColor","fullname":"series<gauge>.dataLabels.backgroundColor","title":"backgroundColor","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-gauge-dial--backgroundColor","fullname":"plotOptions.gauge.dial.backgroundColor","title":"backgroundColor","parent":"plotOptions-gauge-dial","isParent":false,"returnType":"Color","defaults":"black","since":"2.3.0","description":"The background or fill color of the gauge's dial. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-dial/\" target=\"_blank\">Dial options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-pie-dataLabels--backgroundColor","fullname":"plotOptions.pie.dataLabels.backgroundColor","title":"backgroundColor","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-pyramid-dataLabels--backgroundColor","fullname":"plotOptions.pyramid.dataLabels.backgroundColor","title":"backgroundColor","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-series-dataLabels--backgroundColor","fullname":"plotOptions.series.dataLabels.backgroundColor","title":"backgroundColor","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"legend--backgroundColor","fullname":"legend.backgroundColor","title":"backgroundColor","parent":"legend","isParent":false,"returnType":"Color","description":"The background color of the legend.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/backgroundcolor/\" target=\"_blank\">Yellowish background</a>","deprecated":false},{"name":"plotOptions-spline-dataLabels--backgroundColor","fullname":"plotOptions.spline.dataLabels.backgroundColor","title":"backgroundColor","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<bubble>-dataLabels--backgroundColor","fullname":"series<bubble>.dataLabels.backgroundColor","title":"backgroundColor","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<areasplinerange>-dataLabels--backgroundColor","fullname":"series<areasplinerange>.dataLabels.backgroundColor","title":"backgroundColor","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-bubble-dataLabels--backgroundColor","fullname":"plotOptions.bubble.dataLabels.backgroundColor","title":"backgroundColor","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-waterfall-dataLabels--backgroundColor","fullname":"plotOptions.waterfall.dataLabels.backgroundColor","title":"backgroundColor","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-funnel-dataLabels--backgroundColor","fullname":"plotOptions.funnel.dataLabels.backgroundColor","title":"backgroundColor","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"chart--backgroundColor","fullname":"chart.backgroundColor","title":"backgroundColor","parent":"chart","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The background color or gradient for the outer chart area.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/backgroundcolor-color/\" target=\"_blank\">Color</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/backgroundcolor-gradient/\" target=\"_blank\">gradient</a>"},{"name":"series<column>-dataLabels--backgroundColor","fullname":"series<column>.dataLabels.backgroundColor","title":"backgroundColor","parent":"series<column>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-arearange-dataLabels--backgroundColor","fullname":"plotOptions.arearange.dataLabels.backgroundColor","title":"backgroundColor","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<solidgauge>-dataLabels--backgroundColor","fullname":"series<solidgauge>.dataLabels.backgroundColor","title":"backgroundColor","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-areasplinerange-dataLabels--backgroundColor","fullname":"plotOptions.areasplinerange.dataLabels.backgroundColor","title":"backgroundColor","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<waterfall>-dataLabels--backgroundColor","fullname":"series<waterfall>.dataLabels.backgroundColor","title":"backgroundColor","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"tooltip--backgroundColor","fullname":"tooltip.backgroundColor","title":"backgroundColor","parent":"tooltip","isParent":false,"returnType":"Color","defaults":"rgba(255, 255, 255, 0.85)","description":"The background color or gradient for the tooltip.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/backgroundcolor-solid/\" target=\"_blank\">Yellowish background</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/backgroundcolor-gradient/\" target=\"_blank\">gradient</a>","deprecated":false},{"name":"series<line>-dataLabels--backgroundColor","fullname":"series<line>.dataLabels.backgroundColor","title":"backgroundColor","parent":"series<line>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<scatter>-dataLabels--backgroundColor","fullname":"series<scatter>.dataLabels.backgroundColor","title":"backgroundColor","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<pyramid>-dataLabels--backgroundColor","fullname":"series<pyramid>.dataLabels.backgroundColor","title":"backgroundColor","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-areaspline-dataLabels--backgroundColor","fullname":"plotOptions.areaspline.dataLabels.backgroundColor","title":"backgroundColor","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-gauge-dataLabels--backgroundColor","fullname":"plotOptions.gauge.dataLabels.backgroundColor","title":"backgroundColor","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<polygon>-dataLabels--backgroundColor","fullname":"series<polygon>.dataLabels.backgroundColor","title":"backgroundColor","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<spline>-dataLabels--backgroundColor","fullname":"series<spline>.dataLabels.backgroundColor","title":"backgroundColor","parent":"series<spline>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<treemap>-dataLabels--backgroundColor","fullname":"series<treemap>.dataLabels.backgroundColor","title":"backgroundColor","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-gauge-pivot--backgroundColor","fullname":"plotOptions.gauge.pivot.backgroundColor","title":"backgroundColor","parent":"plotOptions-gauge-pivot","isParent":false,"returnType":"Color","defaults":"black","since":"2.3.0","description":"The background color or fill of the pivot.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-pivot/\" target=\"_blank\">Pivot options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"series<bar>-dataLabels--backgroundColor","fullname":"series<bar>.dataLabels.backgroundColor","title":"backgroundColor","parent":"series<bar>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-scatter-dataLabels--backgroundColor","fullname":"plotOptions.scatter.dataLabels.backgroundColor","title":"backgroundColor","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-polygon-dataLabels--backgroundColor","fullname":"plotOptions.polygon.dataLabels.backgroundColor","title":"backgroundColor","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<gauge>-pivot--backgroundColor","fullname":"series<gauge>.pivot.backgroundColor","title":"backgroundColor","parent":"series<gauge>-pivot","isParent":false,"returnType":"Color","defaults":"black","since":"2.3.0","description":"The background color or fill of the pivot.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-pivot/\" target=\"_blank\">Pivot options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-solidgauge-dataLabels--backgroundColor","fullname":"plotOptions.solidgauge.dataLabels.backgroundColor","title":"backgroundColor","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<area>-dataLabels--backgroundColor","fullname":"series<area>.dataLabels.backgroundColor","title":"backgroundColor","parent":"series<area>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<gauge>-dial--backgroundColor","fullname":"series<gauge>.dial.backgroundColor","title":"backgroundColor","parent":"series<gauge>-dial","isParent":false,"returnType":"Color","defaults":"black","since":"2.3.0","description":"The background or fill color of the gauge's dial. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-dial/\" target=\"_blank\">Dial options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"series<columnrange>-dataLabels--backgroundColor","fullname":"series<columnrange>.dataLabels.backgroundColor","title":"backgroundColor","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The background color or gradient for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-bar","fullname":"plotOptions.bar","title":"bar","parent":"plotOptions","isParent":true},{"name":"series<gauge>-dial--baseLength","fullname":"series<gauge>.dial.baseLength","title":"baseLength","parent":"series<gauge>-dial","isParent":false,"returnType":"String","defaults":"70%","since":"2.3.0","description":"The length of the dial's base part, relative to the total radius or length of the dial. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-dial/\" target=\"_blank\">Dial options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge-dial--baseLength","fullname":"plotOptions.gauge.dial.baseLength","title":"baseLength","parent":"plotOptions-gauge-dial","isParent":false,"returnType":"String","defaults":"70%","since":"2.3.0","description":"The length of the dial's base part, relative to the total radius or length of the dial. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-dial/\" target=\"_blank\">Dial options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"series<gauge>-dial--baseWidth","fullname":"series<gauge>.dial.baseWidth","title":"baseWidth","parent":"series<gauge>-dial","isParent":false,"returnType":"Number","defaults":"3","since":"2.3.0","description":"The pixel width of the base of the gauge dial. The base is the part closest to the pivot, defined by baseLength. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-dial/\" target=\"_blank\">Dial options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge-dial--baseWidth","fullname":"plotOptions.gauge.dial.baseWidth","title":"baseWidth","parent":"plotOptions-gauge-dial","isParent":false,"returnType":"Number","defaults":"3","since":"2.3.0","description":"The pixel width of the base of the gauge dial. The base is the part closest to the pivot, defined by baseLength. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-dial/\" target=\"_blank\">Dial options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"chart-events--beforePrint","fullname":"chart.events.beforePrint","title":"beforePrint","parent":"chart-events","isParent":false,"returnType":"Function","context":"Chart","since":"4.1.0","description":"Fires before a chart is printed through the context menu item or the <code>Chart.print</code> method. Requires the exporting module.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/events-beforeprint-afterprint/\" target=\"_blank\">Rescale the chart to print</a>","deprecated":false},{"name":"chart-options3d--beta","fullname":"chart.options3d.beta","title":"beta","parent":"chart-options3d","isParent":false,"returnType":"Number","defaults":"0","since":"4.0","description":"One of the two rotation angles for the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/3d-column-interactive/\">Dynamic Angles</a>","deprecated":false},{"name":"series<bar>-dataLabels--borderColor","fullname":"series<bar>.dataLabels.borderColor","title":"borderColor","parent":"series<bar>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-polygon-dataLabels--borderColor","fullname":"plotOptions.polygon.dataLabels.borderColor","title":"borderColor","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<bar>--borderColor","fullname":"series<bar>.borderColor","title":"borderColor","parent":"series<bar>","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-bordercolor/\" target=\"_blank\">Dark gray border</a>","deprecated":false},{"name":"plotOptions-funnel-dataLabels--borderColor","fullname":"plotOptions.funnel.dataLabels.borderColor","title":"borderColor","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"chart--borderColor","fullname":"chart.borderColor","title":"borderColor","parent":"chart","isParent":false,"returnType":"Color","defaults":"#4572A7","description":"The color of the outer chart border.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/bordercolor/\" target=\"_blank\">Brown border</a>","deprecated":false},{"name":"series<areasplinerange>-dataLabels--borderColor","fullname":"series<areasplinerange>.dataLabels.borderColor","title":"borderColor","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<arearange>-dataLabels--borderColor","fullname":"series<arearange>.dataLabels.borderColor","title":"borderColor","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<line>-dataLabels--borderColor","fullname":"series<line>.dataLabels.borderColor","title":"borderColor","parent":"series<line>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-arearange-dataLabels--borderColor","fullname":"plotOptions.arearange.dataLabels.borderColor","title":"borderColor","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<funnel>--borderColor","fullname":"series<funnel>.borderColor","title":"borderColor","parent":"series<funnel>","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the border surrounding each slice.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-bordercolor-black/\" target=\"_blank\">Black border</a>","deprecated":false},{"name":"series<columnrange>--borderColor","fullname":"series<columnrange>.borderColor","title":"borderColor","parent":"series<columnrange>","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-bordercolor/\" target=\"_blank\">Dark gray border</a>","deprecated":false},{"name":"series<bubble>-dataLabels--borderColor","fullname":"series<bubble>.dataLabels.borderColor","title":"borderColor","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<treemap>-dataLabels--borderColor","fullname":"series<treemap>.dataLabels.borderColor","title":"borderColor","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<treemap>--borderColor","fullname":"series<treemap>.borderColor","title":"borderColor","parent":"series<treemap>","isParent":false,"returnType":"Color","defaults":"#E0E0E0","description":"The color of the border surrounding each tree map item.","deprecated":false},{"name":"series<spline>-dataLabels--borderColor","fullname":"series<spline>.dataLabels.borderColor","title":"borderColor","parent":"series<spline>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-heatmap-dataLabels--borderColor","fullname":"plotOptions.heatmap.dataLabels.borderColor","title":"borderColor","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-gauge-pivot--borderColor","fullname":"plotOptions.gauge.pivot.borderColor","title":"borderColor","parent":"plotOptions-gauge-pivot","isParent":false,"returnType":"Color","defaults":"silver","since":"2.3.0","description":"The border or stroke color of the pivot. In able to change this, the borderWidth must also be set to something other than the default 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-pivot/\" target=\"_blank\">Pivot options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap-dataLabels--borderColor","fullname":"plotOptions.treemap.dataLabels.borderColor","title":"borderColor","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-scatter-dataLabels--borderColor","fullname":"plotOptions.scatter.dataLabels.borderColor","title":"borderColor","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<pie>--borderColor","fullname":"series<pie>.borderColor","title":"borderColor","parent":"series<pie>","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the border surrounding each slice.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-bordercolor-black/\" target=\"_blank\">Black border</a>","deprecated":false},{"name":"series<heatmap>--borderColor","fullname":"series<heatmap>.borderColor","title":"borderColor","parent":"series<heatmap>","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-bordercolor/\" target=\"_blank\">Dark gray border</a>","deprecated":false},{"name":"plotOptions-area-dataLabels--borderColor","fullname":"plotOptions.area.dataLabels.borderColor","title":"borderColor","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<pie>-dataLabels--borderColor","fullname":"series<pie>.dataLabels.borderColor","title":"borderColor","parent":"series<pie>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-line-dataLabels--borderColor","fullname":"plotOptions.line.dataLabels.borderColor","title":"borderColor","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-solidgauge-dataLabels--borderColor","fullname":"plotOptions.solidgauge.dataLabels.borderColor","title":"borderColor","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"Color","defaults":"silver","since":"2.3.0","description":"The border color for the data label.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall-dataLabels--borderColor","fullname":"plotOptions.waterfall.dataLabels.borderColor","title":"borderColor","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-waterfall--borderColor","fullname":"plotOptions.waterfall.borderColor","title":"borderColor","parent":"plotOptions-waterfall","isParent":false,"returnType":"Color","defaults":"#333333","since":"3.0","description":"The color of the border of each waterfall column.","deprecated":false},{"name":"plotOptions-series-dataLabels--borderColor","fullname":"plotOptions.series.dataLabels.borderColor","title":"borderColor","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-gauge-dial--borderColor","fullname":"plotOptions.gauge.dial.borderColor","title":"borderColor","parent":"plotOptions-gauge-dial","isParent":false,"returnType":"Color","defaults":"silver","since":"2.3.0","description":"The border color or stroke of the gauge's dial. By default, the borderWidth is 0, so this must be set in addition to a custom border color.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-dial/\" target=\"_blank\">Dial options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-dataLabels--borderColor","fullname":"plotOptions.pyramid.dataLabels.borderColor","title":"borderColor","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-areaspline-dataLabels--borderColor","fullname":"plotOptions.areaspline.dataLabels.borderColor","title":"borderColor","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<pyramid>--borderColor","fullname":"series<pyramid>.borderColor","title":"borderColor","parent":"series<pyramid>","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the border surrounding each slice.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-bordercolor-black/\" target=\"_blank\">Black border</a>","deprecated":false},{"name":"plotOptions-treemap--borderColor","fullname":"plotOptions.treemap.borderColor","title":"borderColor","parent":"plotOptions-treemap","isParent":false,"returnType":"Color","defaults":"#E0E0E0","description":"The color of the border surrounding each tree map item.","deprecated":false},{"name":"plotOptions-spline-dataLabels--borderColor","fullname":"plotOptions.spline.dataLabels.borderColor","title":"borderColor","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<scatter>-dataLabels--borderColor","fullname":"series<scatter>.dataLabels.borderColor","title":"borderColor","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"tooltip--borderColor","fullname":"tooltip.borderColor","title":"borderColor","parent":"tooltip","isParent":false,"returnType":"Color","defaults":"null","description":"The color of the tooltip border. When <code>null</code>, the border takes the color of the corresponding series or point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/bordercolor-default/\" target=\"_blank\">Follow series by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/bordercolor-black/\" target=\"_blank\">black border</a>","deprecated":false},{"name":"plotOptions-columnrange--borderColor","fullname":"plotOptions.columnrange.borderColor","title":"borderColor","parent":"plotOptions-columnrange","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-bordercolor/\" target=\"_blank\">Dark gray border</a>","deprecated":false},{"name":"plotOptions-treemap-levels--borderColor","fullname":"plotOptions.treemap.levels.borderColor","title":"borderColor","parent":"plotOptions-treemap-levels","isParent":false,"returnType":"Color","since":"4.1.0","description":"Can set borderColor on all points which lies on the same level.","deprecated":false},{"name":"plotOptions-column--borderColor","fullname":"plotOptions.column.borderColor","title":"borderColor","parent":"plotOptions-column","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-bordercolor/\" target=\"_blank\">Dark gray border</a>","deprecated":false},{"name":"series<heatmap>-dataLabels--borderColor","fullname":"series<heatmap>.dataLabels.borderColor","title":"borderColor","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-column-dataLabels--borderColor","fullname":"plotOptions.column.dataLabels.borderColor","title":"borderColor","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-funnel--borderColor","fullname":"plotOptions.funnel.borderColor","title":"borderColor","parent":"plotOptions-funnel","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the border surrounding each slice.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-bordercolor-black/\" target=\"_blank\">Black border</a>","deprecated":false},{"name":"series<column>-dataLabels--borderColor","fullname":"series<column>.dataLabels.borderColor","title":"borderColor","parent":"series<column>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<areaspline>-dataLabels--borderColor","fullname":"series<areaspline>.dataLabels.borderColor","title":"borderColor","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"yAxis-plotBands--borderColor","fullname":"yAxis.plotBands.borderColor","title":"borderColor","parent":"yAxis-plotBands","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"","description":"Border color for the plot band. Also requires <code>borderWidth</code> to be set.","demo":"","seeAlso":"","deprecated":false},{"name":"series<polygon>-dataLabels--borderColor","fullname":"series<polygon>.dataLabels.borderColor","title":"borderColor","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-bar-dataLabels--borderColor","fullname":"plotOptions.bar.dataLabels.borderColor","title":"borderColor","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<column>--borderColor","fullname":"series<column>.borderColor","title":"borderColor","parent":"series<column>","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-bordercolor/\" target=\"_blank\">Dark gray border</a>","deprecated":false},{"name":"series<funnel>-dataLabels--borderColor","fullname":"series<funnel>.dataLabels.borderColor","title":"borderColor","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-bubble-dataLabels--borderColor","fullname":"plotOptions.bubble.dataLabels.borderColor","title":"borderColor","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-pie-dataLabels--borderColor","fullname":"plotOptions.pie.dataLabels.borderColor","title":"borderColor","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-columnrange-dataLabels--borderColor","fullname":"plotOptions.columnrange.dataLabels.borderColor","title":"borderColor","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-areasplinerange-dataLabels--borderColor","fullname":"plotOptions.areasplinerange.dataLabels.borderColor","title":"borderColor","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"legend--borderColor","fullname":"legend.borderColor","title":"borderColor","parent":"legend","isParent":false,"returnType":"Color","defaults":"#909090","description":"The color of the drawn border around the legend.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/bordercolor/\" target=\"_blank\">Brown border</a>"},{"name":"series<area>-dataLabels--borderColor","fullname":"series<area>.dataLabels.borderColor","title":"borderColor","parent":"series<area>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-pyramid--borderColor","fullname":"plotOptions.pyramid.borderColor","title":"borderColor","parent":"plotOptions-pyramid","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the border surrounding each slice.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-bordercolor-black/\" target=\"_blank\">Black border</a>","deprecated":false},{"name":"series<gauge>-dataLabels--borderColor","fullname":"series<gauge>.dataLabels.borderColor","title":"borderColor","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"Color","defaults":"silver","since":"2.3.0","description":"The border color for the data label.","demo":"","seeAlso":"","deprecated":false},{"name":"series<treemap>-levels--borderColor","fullname":"series<treemap>.levels.borderColor","title":"borderColor","parent":"series<treemap>-levels","isParent":false,"returnType":"Color","since":"4.1.0","description":"Can set borderColor on all points which lies on the same level.","deprecated":false},{"name":"series<columnrange>-dataLabels--borderColor","fullname":"series<columnrange>.dataLabels.borderColor","title":"borderColor","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"plotOptions-bar--borderColor","fullname":"plotOptions.bar.borderColor","title":"borderColor","parent":"plotOptions-bar","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-bordercolor/\" target=\"_blank\">Dark gray border</a>","deprecated":false},{"name":"series<pyramid>-dataLabels--borderColor","fullname":"series<pyramid>.dataLabels.borderColor","title":"borderColor","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"series<gauge>-pivot--borderColor","fullname":"series<gauge>.pivot.borderColor","title":"borderColor","parent":"series<gauge>-pivot","isParent":false,"returnType":"Color","defaults":"silver","since":"2.3.0","description":"The border or stroke color of the pivot. In able to change this, the borderWidth must also be set to something other than the default 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-pivot/\" target=\"_blank\">Pivot options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge-dataLabels--borderColor","fullname":"plotOptions.gauge.dataLabels.borderColor","title":"borderColor","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"Color","defaults":"silver","since":"2.3.0","description":"The border color for the data label.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pie--borderColor","fullname":"plotOptions.pie.borderColor","title":"borderColor","parent":"plotOptions-pie","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the border surrounding each slice.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-bordercolor-black/\" target=\"_blank\">Black border</a>","deprecated":false},{"name":"series<waterfall>--borderColor","fullname":"series<waterfall>.borderColor","title":"borderColor","parent":"series<waterfall>","isParent":false,"returnType":"Color","defaults":"#333333","since":"3.0","description":"The color of the border of each waterfall column.","deprecated":false},{"name":"series<gauge>-dial--borderColor","fullname":"series<gauge>.dial.borderColor","title":"borderColor","parent":"series<gauge>-dial","isParent":false,"returnType":"Color","defaults":"silver","since":"2.3.0","description":"The border color or stroke of the gauge's dial. By default, the borderWidth is 0, so this must be set in addition to a custom border color.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-dial/\" target=\"_blank\">Dial options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap--borderColor","fullname":"plotOptions.heatmap.borderColor","title":"borderColor","parent":"plotOptions-heatmap","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-bordercolor/\" target=\"_blank\">Dark gray border</a>","deprecated":false},{"name":"series<waterfall>-dataLabels--borderColor","fullname":"series<waterfall>.dataLabels.borderColor","title":"borderColor","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"Color","since":"2.2.1","description":"The border color for the data label. Defaults to <code>undefined</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>"},{"name":"xAxis-plotBands--borderColor","fullname":"xAxis.plotBands.borderColor","title":"borderColor","parent":"xAxis-plotBands","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"","description":"Border color for the plot band. Also requires <code>borderWidth</code> to be set.","demo":"","seeAlso":"","deprecated":false},{"name":"series<solidgauge>-dataLabels--borderColor","fullname":"series<solidgauge>.dataLabels.borderColor","title":"borderColor","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"Color","defaults":"silver","since":"2.3.0","description":"The border color for the data label.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap-levels--borderDashStyle","fullname":"plotOptions.treemap.levels.borderDashStyle","title":"borderDashStyle","parent":"plotOptions-treemap-levels","isParent":false,"returnType":"String","since":"4.1.0","description":"Set the dash style of the border of all the point which lies on the level.\r\nSee <a href\"#plotOptions.scatter.dashStyle\">plotOptions.scatter.dashStyle</a> for possible options.","deprecated":false},{"name":"series<treemap>-levels--borderDashStyle","fullname":"series<treemap>.levels.borderDashStyle","title":"borderDashStyle","parent":"series<treemap>-levels","isParent":false,"returnType":"String","since":"4.1.0","description":"Set the dash style of the border of all the point which lies on the level.\r\nSee <a href\"#plotOptions.scatter.dashStyle\">plotOptions.scatter.dashStyle</a> for possible options.","deprecated":false},{"name":"plotOptions-pie-dataLabels--borderRadius","fullname":"plotOptions.pie.dataLabels.borderRadius","title":"borderRadius","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-polygon-dataLabels--borderRadius","fullname":"plotOptions.polygon.dataLabels.borderRadius","title":"borderRadius","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"chart--borderRadius","fullname":"chart.borderRadius","title":"borderRadius","parent":"chart","isParent":false,"returnType":"Number","defaults":"0","description":"The corner radius of the outer chart border.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/borderradius/\" target=\"_blank\">20px radius</a>","deprecated":false},{"name":"plotOptions-waterfall-dataLabels--borderRadius","fullname":"plotOptions.waterfall.dataLabels.borderRadius","title":"borderRadius","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<line>-dataLabels--borderRadius","fullname":"series<line>.dataLabels.borderRadius","title":"borderRadius","parent":"series<line>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-columnrange--borderRadius","fullname":"plotOptions.columnrange.borderRadius","title":"borderRadius","parent":"plotOptions-columnrange","isParent":false,"returnType":"Number","defaults":"0","description":"The corner radius of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-borderradius/\" target=\"_blank\">Rounded columns</a>","deprecated":false},{"name":"series<pyramid>-dataLabels--borderRadius","fullname":"series<pyramid>.dataLabels.borderRadius","title":"borderRadius","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<column>--borderRadius","fullname":"series<column>.borderRadius","title":"borderRadius","parent":"series<column>","isParent":false,"returnType":"Number","defaults":"0","description":"The corner radius of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-borderradius/\" target=\"_blank\">Rounded columns</a>","deprecated":false},{"name":"plotOptions-scatter-dataLabels--borderRadius","fullname":"plotOptions.scatter.dataLabels.borderRadius","title":"borderRadius","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<columnrange>--borderRadius","fullname":"series<columnrange>.borderRadius","title":"borderRadius","parent":"series<columnrange>","isParent":false,"returnType":"Number","defaults":"0","description":"The corner radius of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-borderradius/\" target=\"_blank\">Rounded columns</a>","deprecated":false},{"name":"series<arearange>-dataLabels--borderRadius","fullname":"series<arearange>.dataLabels.borderRadius","title":"borderRadius","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"tooltip--borderRadius","fullname":"tooltip.borderRadius","title":"borderRadius","parent":"tooltip","isParent":false,"returnType":"Number","defaults":"3","description":"The radius of the rounded border corners.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/bordercolor-default/\" target=\"_blank\">5px by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/borderradius-0/\" target=\"_blank\">square borders</a>","deprecated":false},{"name":"series<spline>-dataLabels--borderRadius","fullname":"series<spline>.dataLabels.borderRadius","title":"borderRadius","parent":"series<spline>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-spline-dataLabels--borderRadius","fullname":"plotOptions.spline.dataLabels.borderRadius","title":"borderRadius","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-bar--borderRadius","fullname":"plotOptions.bar.borderRadius","title":"borderRadius","parent":"plotOptions-bar","isParent":false,"returnType":"Number","defaults":"0","description":"The corner radius of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-borderradius/\" target=\"_blank\">Rounded columns</a>","deprecated":false},{"name":"plotOptions-funnel-dataLabels--borderRadius","fullname":"plotOptions.funnel.dataLabels.borderRadius","title":"borderRadius","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<bar>-dataLabels--borderRadius","fullname":"series<bar>.dataLabels.borderRadius","title":"borderRadius","parent":"series<bar>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<areasplinerange>-dataLabels--borderRadius","fullname":"series<areasplinerange>.dataLabels.borderRadius","title":"borderRadius","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<areaspline>-dataLabels--borderRadius","fullname":"series<areaspline>.dataLabels.borderRadius","title":"borderRadius","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<heatmap>-dataLabels--borderRadius","fullname":"series<heatmap>.dataLabels.borderRadius","title":"borderRadius","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<column>-dataLabels--borderRadius","fullname":"series<column>.dataLabels.borderRadius","title":"borderRadius","parent":"series<column>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-columnrange-dataLabels--borderRadius","fullname":"plotOptions.columnrange.dataLabels.borderRadius","title":"borderRadius","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<bar>--borderRadius","fullname":"series<bar>.borderRadius","title":"borderRadius","parent":"series<bar>","isParent":false,"returnType":"Number","defaults":"0","description":"The corner radius of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-borderradius/\" target=\"_blank\">Rounded columns</a>","deprecated":false},{"name":"series<waterfall>--borderRadius","fullname":"series<waterfall>.borderRadius","title":"borderRadius","parent":"series<waterfall>","isParent":false,"returnType":"Number","defaults":"0","description":"The corner radius of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-borderradius/\" target=\"_blank\">Rounded columns</a>","deprecated":false},{"name":"series<treemap>-dataLabels--borderRadius","fullname":"series<treemap>.dataLabels.borderRadius","title":"borderRadius","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-bubble-dataLabels--borderRadius","fullname":"plotOptions.bubble.dataLabels.borderRadius","title":"borderRadius","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-waterfall--borderRadius","fullname":"plotOptions.waterfall.borderRadius","title":"borderRadius","parent":"plotOptions-waterfall","isParent":false,"returnType":"Number","defaults":"0","description":"The corner radius of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-borderradius/\" target=\"_blank\">Rounded columns</a>","deprecated":false},{"name":"plotOptions-bar-dataLabels--borderRadius","fullname":"plotOptions.bar.dataLabels.borderRadius","title":"borderRadius","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<funnel>-dataLabels--borderRadius","fullname":"series<funnel>.dataLabels.borderRadius","title":"borderRadius","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-treemap-dataLabels--borderRadius","fullname":"plotOptions.treemap.dataLabels.borderRadius","title":"borderRadius","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-column-dataLabels--borderRadius","fullname":"plotOptions.column.dataLabels.borderRadius","title":"borderRadius","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<area>-dataLabels--borderRadius","fullname":"series<area>.dataLabels.borderRadius","title":"borderRadius","parent":"series<area>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-solidgauge-dataLabels--borderRadius","fullname":"plotOptions.solidgauge.dataLabels.borderRadius","title":"borderRadius","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"Number","defaults":"3","since":"2.3.0","description":"The border radius in pixels for the gauge's data label.","demo":"","seeAlso":"","deprecated":false},{"name":"series<heatmap>--borderRadius","fullname":"series<heatmap>.borderRadius","title":"borderRadius","parent":"series<heatmap>","isParent":false,"returnType":"Number","defaults":"0","description":"The corner radius of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-borderradius/\" target=\"_blank\">Rounded columns</a>","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels--borderRadius","fullname":"plotOptions.areasplinerange.dataLabels.borderRadius","title":"borderRadius","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<scatter>-dataLabels--borderRadius","fullname":"series<scatter>.dataLabels.borderRadius","title":"borderRadius","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<solidgauge>-dataLabels--borderRadius","fullname":"series<solidgauge>.dataLabels.borderRadius","title":"borderRadius","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"Number","defaults":"3","since":"2.3.0","description":"The border radius in pixels for the gauge's data label.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bubble>-dataLabels--borderRadius","fullname":"series<bubble>.dataLabels.borderRadius","title":"borderRadius","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-areaspline-dataLabels--borderRadius","fullname":"plotOptions.areaspline.dataLabels.borderRadius","title":"borderRadius","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-heatmap-dataLabels--borderRadius","fullname":"plotOptions.heatmap.dataLabels.borderRadius","title":"borderRadius","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-gauge-dataLabels--borderRadius","fullname":"plotOptions.gauge.dataLabels.borderRadius","title":"borderRadius","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"Number","defaults":"3","since":"2.3.0","description":"The border radius in pixels for the gauge's data label.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-dataLabels--borderRadius","fullname":"plotOptions.pyramid.dataLabels.borderRadius","title":"borderRadius","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<gauge>-dataLabels--borderRadius","fullname":"series<gauge>.dataLabels.borderRadius","title":"borderRadius","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"Number","defaults":"3","since":"2.3.0","description":"The border radius in pixels for the gauge's data label.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-line-dataLabels--borderRadius","fullname":"plotOptions.line.dataLabels.borderRadius","title":"borderRadius","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-series-dataLabels--borderRadius","fullname":"plotOptions.series.dataLabels.borderRadius","title":"borderRadius","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-column--borderRadius","fullname":"plotOptions.column.borderRadius","title":"borderRadius","parent":"plotOptions-column","isParent":false,"returnType":"Number","defaults":"0","description":"The corner radius of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-borderradius/\" target=\"_blank\">Rounded columns</a>","deprecated":false},{"name":"series<polygon>-dataLabels--borderRadius","fullname":"series<polygon>.dataLabels.borderRadius","title":"borderRadius","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-area-dataLabels--borderRadius","fullname":"plotOptions.area.dataLabels.borderRadius","title":"borderRadius","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<columnrange>-dataLabels--borderRadius","fullname":"series<columnrange>.dataLabels.borderRadius","title":"borderRadius","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"legend--borderRadius","fullname":"legend.borderRadius","title":"borderRadius","parent":"legend","isParent":false,"returnType":"Number","defaults":"0","description":"The border corner radius of the legend.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/borderradius-default/\" target=\"_blank\">Square by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/borderradius-round/\" target=\"_blank\">5px rounded</a>","deprecated":false},{"name":"plotOptions-heatmap--borderRadius","fullname":"plotOptions.heatmap.borderRadius","title":"borderRadius","parent":"plotOptions-heatmap","isParent":false,"returnType":"Number","defaults":"0","description":"The corner radius of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-borderradius/\" target=\"_blank\">Rounded columns</a>","deprecated":false},{"name":"plotOptions-arearange-dataLabels--borderRadius","fullname":"plotOptions.arearange.dataLabels.borderRadius","title":"borderRadius","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<waterfall>-dataLabels--borderRadius","fullname":"series<waterfall>.dataLabels.borderRadius","title":"borderRadius","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<pie>-dataLabels--borderRadius","fullname":"series<pie>.dataLabels.borderRadius","title":"borderRadius","parent":"series<pie>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border radius in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"legend--borderWidth","fullname":"legend.borderWidth","title":"borderWidth","parent":"legend","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the drawn border around the legend.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/borderwidth/\" target=\"_blank\">2px border width</a>","deprecated":false},{"name":"plotOptions-gauge-pivot--borderWidth","fullname":"plotOptions.gauge.pivot.borderWidth","title":"borderWidth","parent":"plotOptions-gauge-pivot","isParent":false,"returnType":"Number","defaults":"0","since":"2.3.0","description":"The border or stroke width of the pivot.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-pivot/\" target=\"_blank\">Pivot options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"series<heatmap>-dataLabels--borderWidth","fullname":"series<heatmap>.dataLabels.borderWidth","title":"borderWidth","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<funnel>--borderWidth","fullname":"series<funnel>.borderWidth","title":"borderWidth","parent":"series<funnel>","isParent":false,"returnType":"Number","defaults":"1","description":"The width of the border surrounding each slice.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-borderwidth/\" target=\"_blank\">3px border</a>","deprecated":false},{"name":"series<pyramid>--borderWidth","fullname":"series<pyramid>.borderWidth","title":"borderWidth","parent":"series<pyramid>","isParent":false,"returnType":"Number","defaults":"1","description":"The width of the border surrounding each slice.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-borderwidth/\" target=\"_blank\">3px border</a>","deprecated":false},{"name":"series<areasplinerange>-dataLabels--borderWidth","fullname":"series<areasplinerange>.dataLabels.borderWidth","title":"borderWidth","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-columnrange-dataLabels--borderWidth","fullname":"plotOptions.columnrange.dataLabels.borderWidth","title":"borderWidth","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-treemap-levels--borderWidth","fullname":"plotOptions.treemap.levels.borderWidth","title":"borderWidth","parent":"plotOptions-treemap-levels","isParent":false,"returnType":"Number","since":"4.1.0","description":"Can set the borderWidth on all points which lies on the same level.","deprecated":false},{"name":"series<bubble>-dataLabels--borderWidth","fullname":"series<bubble>.dataLabels.borderWidth","title":"borderWidth","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-bar--borderWidth","fullname":"plotOptions.bar.borderWidth","title":"borderWidth","parent":"plotOptions-bar","isParent":false,"returnType":"Number","defaults":"1","description":"The width of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-borderwidth/\" target=\"_blank\">2px black border</a>","deprecated":false},{"name":"plotOptions-bubble-dataLabels--borderWidth","fullname":"plotOptions.bubble.dataLabels.borderWidth","title":"borderWidth","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-polygon-dataLabels--borderWidth","fullname":"plotOptions.polygon.dataLabels.borderWidth","title":"borderWidth","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-pie-dataLabels--borderWidth","fullname":"plotOptions.pie.dataLabels.borderWidth","title":"borderWidth","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-heatmap--borderWidth","fullname":"plotOptions.heatmap.borderWidth","title":"borderWidth","parent":"plotOptions-heatmap","isParent":false,"returnType":"Number","defaults":"1","description":"The width of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-borderwidth/\" target=\"_blank\">2px black border</a>","deprecated":false},{"name":"series<waterfall>-dataLabels--borderWidth","fullname":"series<waterfall>.dataLabels.borderWidth","title":"borderWidth","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<column>--borderWidth","fullname":"series<column>.borderWidth","title":"borderWidth","parent":"series<column>","isParent":false,"returnType":"Number","defaults":"1","description":"The width of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-borderwidth/\" target=\"_blank\">2px black border</a>","deprecated":false},{"name":"series<pyramid>-dataLabels--borderWidth","fullname":"series<pyramid>.dataLabels.borderWidth","title":"borderWidth","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<area>-dataLabels--borderWidth","fullname":"series<area>.dataLabels.borderWidth","title":"borderWidth","parent":"series<area>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-solidgauge-dataLabels--borderWidth","fullname":"plotOptions.solidgauge.dataLabels.borderWidth","title":"borderWidth","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"Number","defaults":"1","since":"2.3.0","description":"The border width in pixels for the gauge data label.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap-dataLabels--borderWidth","fullname":"plotOptions.treemap.dataLabels.borderWidth","title":"borderWidth","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<funnel>-dataLabels--borderWidth","fullname":"series<funnel>.dataLabels.borderWidth","title":"borderWidth","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<spline>-dataLabels--borderWidth","fullname":"series<spline>.dataLabels.borderWidth","title":"borderWidth","parent":"series<spline>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"tooltip--borderWidth","fullname":"tooltip.borderWidth","title":"borderWidth","parent":"tooltip","isParent":false,"returnType":"Number","defaults":"1","description":"The pixel width of the tooltip border.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/bordercolor-default/\" target=\"_blank\">2px by default,</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/borderwidth/\" target=\"_blank\">no border (shadow only)</a>","deprecated":false},{"name":"plotOptions-arearange-dataLabels--borderWidth","fullname":"plotOptions.arearange.dataLabels.borderWidth","title":"borderWidth","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-pyramid-dataLabels--borderWidth","fullname":"plotOptions.pyramid.dataLabels.borderWidth","title":"borderWidth","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<treemap>-dataLabels--borderWidth","fullname":"series<treemap>.dataLabels.borderWidth","title":"borderWidth","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<polygon>-dataLabels--borderWidth","fullname":"series<polygon>.dataLabels.borderWidth","title":"borderWidth","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<bar>-dataLabels--borderWidth","fullname":"series<bar>.dataLabels.borderWidth","title":"borderWidth","parent":"series<bar>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<pie>--borderWidth","fullname":"series<pie>.borderWidth","title":"borderWidth","parent":"series<pie>","isParent":false,"returnType":"Number","defaults":"1","description":"The width of the border surrounding each slice.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-borderwidth/\" target=\"_blank\">3px border</a>","deprecated":false},{"name":"plotOptions-funnel--borderWidth","fullname":"plotOptions.funnel.borderWidth","title":"borderWidth","parent":"plotOptions-funnel","isParent":false,"returnType":"Number","defaults":"1","description":"The width of the border surrounding each slice.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-borderwidth/\" target=\"_blank\">3px border</a>","deprecated":false},{"name":"plotOptions-pie--borderWidth","fullname":"plotOptions.pie.borderWidth","title":"borderWidth","parent":"plotOptions-pie","isParent":false,"returnType":"Number","defaults":"1","description":"The width of the border surrounding each slice.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-borderwidth/\" target=\"_blank\">3px border</a>","deprecated":false},{"name":"plotOptions-area-dataLabels--borderWidth","fullname":"plotOptions.area.dataLabels.borderWidth","title":"borderWidth","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-areaspline-dataLabels--borderWidth","fullname":"plotOptions.areaspline.dataLabels.borderWidth","title":"borderWidth","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels--borderWidth","fullname":"plotOptions.areasplinerange.dataLabels.borderWidth","title":"borderWidth","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<solidgauge>-dataLabels--borderWidth","fullname":"series<solidgauge>.dataLabels.borderWidth","title":"borderWidth","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"Number","defaults":"1","since":"2.3.0","description":"The border width in pixels for the gauge data label.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pie>-dataLabels--borderWidth","fullname":"series<pie>.dataLabels.borderWidth","title":"borderWidth","parent":"series<pie>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<heatmap>--borderWidth","fullname":"series<heatmap>.borderWidth","title":"borderWidth","parent":"series<heatmap>","isParent":false,"returnType":"Number","defaults":"1","description":"The width of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-borderwidth/\" target=\"_blank\">2px black border</a>","deprecated":false},{"name":"series<columnrange>--borderWidth","fullname":"series<columnrange>.borderWidth","title":"borderWidth","parent":"series<columnrange>","isParent":false,"returnType":"Number","defaults":"1","description":"The width of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-borderwidth/\" target=\"_blank\">2px black border</a>","deprecated":false},{"name":"plotOptions-scatter-dataLabels--borderWidth","fullname":"plotOptions.scatter.dataLabels.borderWidth","title":"borderWidth","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-line-dataLabels--borderWidth","fullname":"plotOptions.line.dataLabels.borderWidth","title":"borderWidth","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-column-dataLabels--borderWidth","fullname":"plotOptions.column.dataLabels.borderWidth","title":"borderWidth","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<waterfall>--borderWidth","fullname":"series<waterfall>.borderWidth","title":"borderWidth","parent":"series<waterfall>","isParent":false,"returnType":"Number","defaults":"1","description":"The width of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-borderwidth/\" target=\"_blank\">2px black border</a>","deprecated":false},{"name":"plotOptions-funnel-dataLabels--borderWidth","fullname":"plotOptions.funnel.dataLabels.borderWidth","title":"borderWidth","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<arearange>-dataLabels--borderWidth","fullname":"series<arearange>.dataLabels.borderWidth","title":"borderWidth","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-columnrange--borderWidth","fullname":"plotOptions.columnrange.borderWidth","title":"borderWidth","parent":"plotOptions-columnrange","isParent":false,"returnType":"Number","defaults":"1","description":"The width of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-borderwidth/\" target=\"_blank\">2px black border</a>","deprecated":false},{"name":"series<treemap>--borderWidth","fullname":"series<treemap>.borderWidth","title":"borderWidth","parent":"series<treemap>","isParent":false,"returnType":"Number","defaults":"1","description":"The width of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-borderwidth/\" target=\"_blank\">2px black border</a>","deprecated":false},{"name":"plotOptions-column--borderWidth","fullname":"plotOptions.column.borderWidth","title":"borderWidth","parent":"plotOptions-column","isParent":false,"returnType":"Number","defaults":"1","description":"The width of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-borderwidth/\" target=\"_blank\">2px black border</a>","deprecated":false},{"name":"series<areaspline>-dataLabels--borderWidth","fullname":"series<areaspline>.dataLabels.borderWidth","title":"borderWidth","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-gauge-dial--borderWidth","fullname":"plotOptions.gauge.dial.borderWidth","title":"borderWidth","parent":"plotOptions-gauge-dial","isParent":false,"returnType":"Number","defaults":"0","since":"2.3.0","description":"The width of the gauge dial border in pixels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-dial/\" target=\"_blank\">Dial options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"series<gauge>-dataLabels--borderWidth","fullname":"series<gauge>.dataLabels.borderWidth","title":"borderWidth","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"Number","defaults":"1","since":"2.3.0","description":"The border width in pixels for the gauge data label.","demo":"","seeAlso":"","deprecated":false},{"name":"series<treemap>-levels--borderWidth","fullname":"series<treemap>.levels.borderWidth","title":"borderWidth","parent":"series<treemap>-levels","isParent":false,"returnType":"Number","since":"4.1.0","description":"Can set the borderWidth on all points which lies on the same level.","deprecated":false},{"name":"plotOptions-treemap--borderWidth","fullname":"plotOptions.treemap.borderWidth","title":"borderWidth","parent":"plotOptions-treemap","isParent":false,"returnType":"Number","defaults":"1","description":"The width of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-borderwidth/\" target=\"_blank\">2px black border</a>","deprecated":false},{"name":"plotOptions-bar-dataLabels--borderWidth","fullname":"plotOptions.bar.dataLabels.borderWidth","title":"borderWidth","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<bar>--borderWidth","fullname":"series<bar>.borderWidth","title":"borderWidth","parent":"series<bar>","isParent":false,"returnType":"Number","defaults":"1","description":"The width of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-borderwidth/\" target=\"_blank\">2px black border</a>","deprecated":false},{"name":"series<columnrange>-dataLabels--borderWidth","fullname":"series<columnrange>.dataLabels.borderWidth","title":"borderWidth","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"yAxis-plotBands--borderWidth","fullname":"yAxis.plotBands.borderWidth","title":"borderWidth","parent":"yAxis-plotBands","isParent":false,"returnType":"Number","defaults":"0","description":"Border width for the plot band.  Also requires <code>borderColor</code> to be set.","deprecated":false},{"name":"plotOptions-pyramid--borderWidth","fullname":"plotOptions.pyramid.borderWidth","title":"borderWidth","parent":"plotOptions-pyramid","isParent":false,"returnType":"Number","defaults":"1","description":"The width of the border surrounding each slice.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-borderwidth/\" target=\"_blank\">3px border</a>","deprecated":false},{"name":"series<column>-dataLabels--borderWidth","fullname":"series<column>.dataLabels.borderWidth","title":"borderWidth","parent":"series<column>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"chart--borderWidth","fullname":"chart.borderWidth","title":"borderWidth","parent":"chart","isParent":false,"returnType":"Number","defaults":"0","description":"The pixel width of the outer chart border.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/borderwidth/\" target=\"_blank\">5px border</a>","deprecated":false},{"name":"plotOptions-spline-dataLabels--borderWidth","fullname":"plotOptions.spline.dataLabels.borderWidth","title":"borderWidth","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-heatmap-dataLabels--borderWidth","fullname":"plotOptions.heatmap.dataLabels.borderWidth","title":"borderWidth","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<gauge>-dial--borderWidth","fullname":"series<gauge>.dial.borderWidth","title":"borderWidth","parent":"series<gauge>-dial","isParent":false,"returnType":"Number","defaults":"0","since":"2.3.0","description":"The width of the gauge dial border in pixels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-dial/\" target=\"_blank\">Dial options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall--borderWidth","fullname":"plotOptions.waterfall.borderWidth","title":"borderWidth","parent":"plotOptions-waterfall","isParent":false,"returnType":"Number","defaults":"1","description":"The width of the border surrounding each column or bar.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-borderwidth/\" target=\"_blank\">2px black border</a>","deprecated":false},{"name":"series<line>-dataLabels--borderWidth","fullname":"series<line>.dataLabels.borderWidth","title":"borderWidth","parent":"series<line>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"xAxis-plotBands--borderWidth","fullname":"xAxis.plotBands.borderWidth","title":"borderWidth","parent":"xAxis-plotBands","isParent":false,"returnType":"Number","defaults":"0","description":"Border width for the plot band.  Also requires <code>borderColor</code> to be set.","deprecated":false},{"name":"series<scatter>-dataLabels--borderWidth","fullname":"series<scatter>.dataLabels.borderWidth","title":"borderWidth","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-waterfall-dataLabels--borderWidth","fullname":"plotOptions.waterfall.dataLabels.borderWidth","title":"borderWidth","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-series-dataLabels--borderWidth","fullname":"plotOptions.series.dataLabels.borderWidth","title":"borderWidth","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.1","description":"The border width in pixels for the data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<gauge>-pivot--borderWidth","fullname":"series<gauge>.pivot.borderWidth","title":"borderWidth","parent":"series<gauge>-pivot","isParent":false,"returnType":"Number","defaults":"0","since":"2.3.0","description":"The border or stroke width of the pivot.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-pivot/\" target=\"_blank\">Pivot options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge-dataLabels--borderWidth","fullname":"plotOptions.gauge.dataLabels.borderWidth","title":"borderWidth","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"Number","defaults":"1","since":"2.3.0","description":"The border width in pixels for the gauge data label.","demo":"","seeAlso":"","deprecated":false},{"name":"chart-options3d-frame-bottom","fullname":"chart.options3d.frame.bottom","title":"bottom","parent":"chart-options3d-frame","isParent":true,"returnType":"","defaults":"","values":"","since":"4.0","description":"The bottom of the frame around a 3D chart.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot","fullname":"plotOptions.boxplot","title":"boxplot","parent":"plotOptions","isParent":true,"returnType":"Object","defaults":"","values":"","since":"3.0","description":"A box plot is a convenient way of depicting groups of data through their five-number summaries: the smallest observation (sample minimum), lower quartile (Q1), median (Q2), upper quartile (Q3), and largest observation (sample maximum). ","demo":"","seeAlso":"","deprecated":false},{"name":"xAxis-breaks--breakSize","fullname":"xAxis.breaks.breakSize","title":"breakSize","parent":"xAxis-breaks","isParent":false,"returnType":"Number","defaults":"0","since":"4.1.0","description":"A number indicating how much space should be left between the start and the end of the break. The break size is given in axis units, so for instance on a <code>datetime</code> axis, a break size of 3600000 would indicate the equivalent of an hour.","deprecated":false},{"name":"yAxis-breaks--breakSize","fullname":"yAxis.breaks.breakSize","title":"breakSize","parent":"yAxis-breaks","isParent":false,"returnType":"Number","defaults":"0","since":"4.1.0","description":"A number indicating how much space should be left between the start and the end of the break. The break size is given in axis units, so for instance on a <code>datetime</code> axis, a break size of 3600000 would indicate the equivalent of an hour.","deprecated":false},{"name":"yAxis-breaks","fullname":"yAxis.breaks","title":"breaks","parent":"yAxis","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining breaks in the axis, the sections defined will be left out and all the points shifted closer to each other. Requires that the broken-axis.js module is loaded.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/axisbreak/break-simple/\" target=\"_blank\">Simple break</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/axisbreak/break-visualized/\" target=\"_blank\">advanced with callback</a>","deprecated":false},{"name":"xAxis-breaks","fullname":"xAxis.breaks","title":"breaks","parent":"xAxis","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining breaks in the axis, the sections defined will be left out and all the points shifted closer to each other. Requires that the broken-axis.js module is loaded.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/axisbreak/break-simple/\" target=\"_blank\">Simple break</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/axisbreak/break-visualized/\" target=\"_blank\">advanced with callback</a>","deprecated":false},{"name":"plotOptions-bubble","fullname":"plotOptions.bubble","title":"bubble","parent":"plotOptions","isParent":true,"returnType":"Object","defaults":"","values":"","since":"3.0","description":"A bubble series is a three dimensional series type where each point renders an X, Y and Z value. Each points is drawn as a bubble where the position along the X and Y axes mark the X and Y values, and the size of the bubble relates to the Z value.","demo":"","seeAlso":"","deprecated":false},{"name":"navigation-buttonOptions","fullname":"navigation.buttonOptions","title":"buttonOptions","parent":"navigation","isParent":true,"description":"A collection of options for buttons appearing in the exporting module."},{"name":"exporting-buttons","fullname":"exporting.buttons","title":"buttons","parent":"exporting","isParent":true,"description":"Options for the export related buttons, print and export. In addition to the default buttons listed here, custom buttons can be added. See <a href=\"#navigation.buttonOptions\">navigation.buttonOptions</a> for general options.","deprecated":false},{"name":"global--canvasToolsURL","fullname":"global.canvasToolsURL","title":"canvasToolsURL","parent":"global","isParent":false,"returnType":"String","defaults":"http://code.highcharts.com/{version}/modules/canvas-tools.js","description":"The URL to the additional file to lazy load for Android 2.x devices. These devices don't \r\n support SVG, so we download a helper file that contains <a href=\"http://code.google.com/p/canvg/\">canvg</a>,\r\n its dependency rbcolor, and our own CanVG Renderer class. To avoid hotlinking to our site,\r\n you can install canvas-tools.js on your own server and change this option accordingly.","deprecated":false},{"name":"xAxis--categories","fullname":"xAxis.categories","title":"categories","parent":"xAxis","isParent":false,"returnType":"Array<String>","description":"<p>If categories are present for the xAxis, names are used instead of numbers for that axis. Since Highcharts 3.0, categories can also be extracted by giving each point a <a href=\"#series.data\">name</a> and setting axis <a href=\"#xAxis.type\">type</a> to <code>category</code>. However, if you have multiple series, best practice remains defining the <code>categories</code> array.</p>\r\n\r\n<p>Example:\r\n<pre>categories: ['Apples', 'Bananas', 'Oranges']</pre>\r\n\t\t Defaults to <code>null</code>\r\n</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">With</a> and\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/categories/\" target=\"_blank\">without</a> categories","deprecated":false},{"name":"yAxis--categories","fullname":"yAxis.categories","title":"categories","parent":"yAxis","isParent":false,"returnType":"Array<String>","description":"<p>If categories are present for the xAxis, names are used instead of numbers for that axis. Since Highcharts 3.0, categories can also be extracted by giving each point a <a href=\"#series.data\">name</a> and setting axis <a href=\"#xAxis.type\">type</a> to <code>category</code>. However, if you have multiple series, best practice remains defining the <code>categories</code> array.</p>\r\n\r\n<p>Example:\r\n<pre>categories: ['Apples', 'Bananas', 'Oranges']</pre>\r\n\t\t Defaults to <code>null</code>\r\n</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">With</a> and\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/categories/\" target=\"_blank\">without</a> categories","deprecated":false},{"name":"yAxis--ceiling","fullname":"yAxis.ceiling","title":"ceiling","parent":"yAxis","isParent":false,"returnType":"Number","defaults":"","values":"","since":"4.0","description":"The highest allowed value for automatically computed axis extremes.","demo":" <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/floor-ceiling/\" target=\"_blank\">Floor and ceiling</a>","seeAlso":"<a href=\"#xAxis.floor\">floor</a>","deprecated":false},{"name":"xAxis--ceiling","fullname":"xAxis.ceiling","title":"ceiling","parent":"xAxis","isParent":false,"returnType":"Number","defaults":"","values":"","since":"4.0","description":"The highest allowed value for automatically computed axis extremes.","demo":" <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/floor-ceiling/\" target=\"_blank\">Floor and ceiling</a>","seeAlso":"<a href=\"#xAxis.floor\">floor</a>","deprecated":false},{"name":"series<pie>--center","fullname":"series<pie>.center","title":"center","parent":"series<pie>","isParent":false,"returnType":"Array<String|Number>","defaults":"[null, null]","description":"The center of the pie chart relative to the plot area. Can be percentages or pixel values. The default behaviour (as of 3.0) is to center the pie so that all slices and data labels are within the plot area. As a consequence, the pie may actually jump around in a chart with dynamic values, as the data labels move. In that case, the center should be explicitly set, for example to <code>[\"50%\", \"50%\"]</code>.\r\n\t\t ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-center/\" target=\"_blank\">Centered at 100, 100</a>","deprecated":false},{"name":"series<funnel>--center","fullname":"series<funnel>.center","title":"center","parent":"series<funnel>","isParent":false,"returnType":"Array<String|Number>","defaults":"[\"50%\", \"50%\"]","since":"3.0","description":"The center of the series. By default, it is centered in the middle of the plot area, so it fills the plot area height.","deprecated":false},{"name":"pane--center","fullname":"pane.center","title":"center","parent":"pane","isParent":false,"returnType":"Array<String|Number>","defaults":"[\"50%\", \"50%\"]","since":"2.3.0","description":"The center of a polar chart or angular gauge, given as an array of [x, y] positions. Positions can be given as integers that transform to pixels, or as percentages of the plot area size.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/gauge-vu-meter/\" target=\"_blank\">Two gauges with different center</a>","deprecated":false},{"name":"plotOptions-pie--center","fullname":"plotOptions.pie.center","title":"center","parent":"plotOptions-pie","isParent":false,"returnType":"Array<String|Number>","defaults":"[null, null]","description":"The center of the pie chart relative to the plot area. Can be percentages or pixel values. The default behaviour (as of 3.0) is to center the pie so that all slices and data labels are within the plot area. As a consequence, the pie may actually jump around in a chart with dynamic values, as the data labels move. In that case, the center should be explicitly set, for example to <code>[\"50%\", \"50%\"]</code>.\r\n\t\t ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-center/\" target=\"_blank\">Centered at 100, 100</a>","deprecated":false},{"name":"plotOptions-pyramid--center","fullname":"plotOptions.pyramid.center","title":"center","parent":"plotOptions-pyramid","isParent":false,"returnType":"Array<String|Number>","defaults":"[\"50%\", \"50%\"]","since":"3.0","description":"The center of the series. By default, it is centered in the middle of the plot area, so it fills the plot area height.","deprecated":false},{"name":"series<pyramid>--center","fullname":"series<pyramid>.center","title":"center","parent":"series<pyramid>","isParent":false,"returnType":"Array<String|Number>","defaults":"[\"50%\", \"50%\"]","since":"3.0","description":"The center of the series. By default, it is centered in the middle of the plot area, so it fills the plot area height.","deprecated":false},{"name":"plotOptions-funnel--center","fullname":"plotOptions.funnel.center","title":"center","parent":"plotOptions-funnel","isParent":false,"returnType":"Array<String|Number>","defaults":"[\"50%\", \"50%\"]","since":"3.0","description":"The center of the series. By default, it is centered in the middle of the plot area, so it fills the plot area height.","deprecated":false},{"name":"chart","fullname":"chart","title":"chart","isParent":true,"description":"Options regarding the chart area and plot area as well as general chart options."},{"name":"exporting--chartOptions","fullname":"exporting.chartOptions","title":"chartOptions","parent":"exporting","isParent":false,"returnType":"Object","defaults":"null","values":"","since":"","description":"Additional chart options to be merged into an exported chart. For example, the exported chart can be given a specific width and height, or a printer-friendly color scheme.","demo":"","seeAlso":"","deprecated":false},{"name":"series<polygon>-events--checkboxClick","fullname":"series<polygon>.events.checkboxClick","title":"checkboxClick","parent":"series<polygon>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"plotOptions-area-events--checkboxClick","fullname":"plotOptions.area.events.checkboxClick","title":"checkboxClick","parent":"plotOptions-area-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"plotOptions-arearange-events--checkboxClick","fullname":"plotOptions.arearange.events.checkboxClick","title":"checkboxClick","parent":"plotOptions-arearange-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"plotOptions-spline-events--checkboxClick","fullname":"plotOptions.spline.events.checkboxClick","title":"checkboxClick","parent":"plotOptions-spline-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"plotOptions-pyramid-events--checkboxClick","fullname":"plotOptions.pyramid.events.checkboxClick","title":"checkboxClick","parent":"plotOptions-pyramid-events","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"1.2.0","description":"Fires when the checkbox next to the point name in the legend is clicked. One parameter, event, is passed to the function. The state of the checkbox is found by event.checked. The checked item is found by event.item. Return false to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","seeAlso":"","deprecated":false},{"name":"series<line>-events--checkboxClick","fullname":"series<line>.events.checkboxClick","title":"checkboxClick","parent":"series<line>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"plotOptions-column-events--checkboxClick","fullname":"plotOptions.column.events.checkboxClick","title":"checkboxClick","parent":"plotOptions-column-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"plotOptions-solidgauge-events--checkboxClick","fullname":"plotOptions.solidgauge.events.checkboxClick","title":"checkboxClick","parent":"plotOptions-solidgauge-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"series<heatmap>-events--checkboxClick","fullname":"series<heatmap>.events.checkboxClick","title":"checkboxClick","parent":"series<heatmap>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"series<arearange>-events--checkboxClick","fullname":"series<arearange>.events.checkboxClick","title":"checkboxClick","parent":"series<arearange>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"series<column>-events--checkboxClick","fullname":"series<column>.events.checkboxClick","title":"checkboxClick","parent":"series<column>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"series<areaspline>-events--checkboxClick","fullname":"series<areaspline>.events.checkboxClick","title":"checkboxClick","parent":"series<areaspline>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"series<area>-events--checkboxClick","fullname":"series<area>.events.checkboxClick","title":"checkboxClick","parent":"series<area>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"plotOptions-areaspline-events--checkboxClick","fullname":"plotOptions.areaspline.events.checkboxClick","title":"checkboxClick","parent":"plotOptions-areaspline-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"plotOptions-treemap-events--checkboxClick","fullname":"plotOptions.treemap.events.checkboxClick","title":"checkboxClick","parent":"plotOptions-treemap-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"plotOptions-columnrange-events--checkboxClick","fullname":"plotOptions.columnrange.events.checkboxClick","title":"checkboxClick","parent":"plotOptions-columnrange-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"plotOptions-funnel-events--checkboxClick","fullname":"plotOptions.funnel.events.checkboxClick","title":"checkboxClick","parent":"plotOptions-funnel-events","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"1.2.0","description":"Fires when the checkbox next to the point name in the legend is clicked. One parameter, event, is passed to the function. The state of the checkbox is found by event.checked. The checked item is found by event.item. Return false to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","seeAlso":"","deprecated":false},{"name":"series<boxplot>-events--checkboxClick","fullname":"series<boxplot>.events.checkboxClick","title":"checkboxClick","parent":"series<boxplot>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"series<solidgauge>-events--checkboxClick","fullname":"series<solidgauge>.events.checkboxClick","title":"checkboxClick","parent":"series<solidgauge>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"series<bubble>-events--checkboxClick","fullname":"series<bubble>.events.checkboxClick","title":"checkboxClick","parent":"series<bubble>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"plotOptions-heatmap-events--checkboxClick","fullname":"plotOptions.heatmap.events.checkboxClick","title":"checkboxClick","parent":"plotOptions-heatmap-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"series<treemap>-events--checkboxClick","fullname":"series<treemap>.events.checkboxClick","title":"checkboxClick","parent":"series<treemap>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"plotOptions-errorbar-events--checkboxClick","fullname":"plotOptions.errorbar.events.checkboxClick","title":"checkboxClick","parent":"plotOptions-errorbar-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"series<pyramid>-events--checkboxClick","fullname":"series<pyramid>.events.checkboxClick","title":"checkboxClick","parent":"series<pyramid>-events","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"1.2.0","description":"Fires when the checkbox next to the point name in the legend is clicked. One parameter, event, is passed to the function. The state of the checkbox is found by event.checked. The checked item is found by event.item. Return false to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange-events--checkboxClick","fullname":"plotOptions.areasplinerange.events.checkboxClick","title":"checkboxClick","parent":"plotOptions-areasplinerange-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"plotOptions-series-events--checkboxClick","fullname":"plotOptions.series.events.checkboxClick","title":"checkboxClick","parent":"plotOptions-series-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"plotOptions-polygon-events--checkboxClick","fullname":"plotOptions.polygon.events.checkboxClick","title":"checkboxClick","parent":"plotOptions-polygon-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"plotOptions-scatter-events--checkboxClick","fullname":"plotOptions.scatter.events.checkboxClick","title":"checkboxClick","parent":"plotOptions-scatter-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"plotOptions-gauge-events--checkboxClick","fullname":"plotOptions.gauge.events.checkboxClick","title":"checkboxClick","parent":"plotOptions-gauge-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"series<scatter>-events--checkboxClick","fullname":"series<scatter>.events.checkboxClick","title":"checkboxClick","parent":"series<scatter>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"series<gauge>-events--checkboxClick","fullname":"series<gauge>.events.checkboxClick","title":"checkboxClick","parent":"series<gauge>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"series<waterfall>-events--checkboxClick","fullname":"series<waterfall>.events.checkboxClick","title":"checkboxClick","parent":"series<waterfall>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"series<bar>-events--checkboxClick","fullname":"series<bar>.events.checkboxClick","title":"checkboxClick","parent":"series<bar>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"series<columnrange>-events--checkboxClick","fullname":"series<columnrange>.events.checkboxClick","title":"checkboxClick","parent":"series<columnrange>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"plotOptions-line-events--checkboxClick","fullname":"plotOptions.line.events.checkboxClick","title":"checkboxClick","parent":"plotOptions-line-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"series<pie>-events--checkboxClick","fullname":"series<pie>.events.checkboxClick","title":"checkboxClick","parent":"series<pie>-events","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"1.2.0","description":"Fires when the checkbox next to the point name in the legend is clicked. One parameter, event, is passed to the function. The state of the checkbox is found by event.checked. The checked item is found by event.item. Return false to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","seeAlso":"","deprecated":false},{"name":"series<errorbar>-events--checkboxClick","fullname":"series<errorbar>.events.checkboxClick","title":"checkboxClick","parent":"series<errorbar>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"plotOptions-pie-events--checkboxClick","fullname":"plotOptions.pie.events.checkboxClick","title":"checkboxClick","parent":"plotOptions-pie-events","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"1.2.0","description":"Fires when the checkbox next to the point name in the legend is clicked. One parameter, event, is passed to the function. The state of the checkbox is found by event.checked. The checked item is found by event.item. Return false to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall-events--checkboxClick","fullname":"plotOptions.waterfall.events.checkboxClick","title":"checkboxClick","parent":"plotOptions-waterfall-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"plotOptions-bar-events--checkboxClick","fullname":"plotOptions.bar.events.checkboxClick","title":"checkboxClick","parent":"plotOptions-bar-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"plotOptions-bubble-events--checkboxClick","fullname":"plotOptions.bubble.events.checkboxClick","title":"checkboxClick","parent":"plotOptions-bubble-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"plotOptions-boxplot-events--checkboxClick","fullname":"plotOptions.boxplot.events.checkboxClick","title":"checkboxClick","parent":"plotOptions-boxplot-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"series<areasplinerange>-events--checkboxClick","fullname":"series<areasplinerange>.events.checkboxClick","title":"checkboxClick","parent":"series<areasplinerange>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"series<spline>-events--checkboxClick","fullname":"series<spline>.events.checkboxClick","title":"checkboxClick","parent":"series<spline>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the checkbox next to the series' name in the legend is clicked. One parameter, <code>event</code>, is passed to the function. The state of the checkbox is found by <code>event.checked</code>. The checked item is found by <code>event.item</code>. Return <code>false</code> to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","deprecated":false},{"name":"series<funnel>-events--checkboxClick","fullname":"series<funnel>.events.checkboxClick","title":"checkboxClick","parent":"series<funnel>-events","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"1.2.0","description":"Fires when the checkbox next to the point name in the legend is clicked. One parameter, event, is passed to the function. The state of the checkbox is found by event.checked. The checked item is found by event.item. Return false to prevent the default action which is to toggle the select state of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-checkboxclick/\" target=\"_blank\">Alert checkbox status</a>","seeAlso":"","deprecated":false},{"name":"chart--className","fullname":"chart.className","title":"className","parent":"chart","isParent":false,"returnType":"String","description":"A CSS class name to apply to the charts container <code>div</code>, allowing unique CSS styling for each chart."},{"name":"plotOptions-series-point-events--click","fullname":"plotOptions.series.point.events.click","title":"click","parent":"plotOptions-series-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<spline>-data-events--click","fullname":"series<spline>.data.events.click","title":"click","parent":"series<spline>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<polygon>-data-events--click","fullname":"series<polygon>.data.events.click","title":"click","parent":"series<polygon>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<column>-point-events--click","fullname":"series<column>.point.events.click","title":"click","parent":"series<column>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<column>-data-events--click","fullname":"series<column>.data.events.click","title":"click","parent":"series<column>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<solidgauge>-point-events--click","fullname":"series<solidgauge>.point.events.click","title":"click","parent":"series<solidgauge>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-areasplinerange-events--click","fullname":"plotOptions.areasplinerange.events.click","title":"click","parent":"plotOptions-areasplinerange-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<treemap>-events--click","fullname":"series<treemap>.events.click","title":"click","parent":"series<treemap>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<pyramid>-point-events--click","fullname":"series<pyramid>.point.events.click","title":"click","parent":"series<pyramid>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<errorbar>-events--click","fullname":"series<errorbar>.events.click","title":"click","parent":"series<errorbar>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"plotOptions-polygon-point-events--click","fullname":"plotOptions.polygon.point.events.click","title":"click","parent":"plotOptions-polygon-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<gauge>-point-events--click","fullname":"series<gauge>.point.events.click","title":"click","parent":"series<gauge>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-bar-point-events--click","fullname":"plotOptions.bar.point.events.click","title":"click","parent":"plotOptions-bar-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-bubble-events--click","fullname":"plotOptions.bubble.events.click","title":"click","parent":"plotOptions-bubble-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<areaspline>-point-events--click","fullname":"series<areaspline>.point.events.click","title":"click","parent":"series<areaspline>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-gauge-point-events--click","fullname":"plotOptions.gauge.point.events.click","title":"click","parent":"plotOptions-gauge-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<scatter>-point-events--click","fullname":"series<scatter>.point.events.click","title":"click","parent":"series<scatter>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<areaspline>-events--click","fullname":"series<areaspline>.events.click","title":"click","parent":"series<areaspline>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<columnrange>-point-events--click","fullname":"series<columnrange>.point.events.click","title":"click","parent":"series<columnrange>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-boxplot-events--click","fullname":"plotOptions.boxplot.events.click","title":"click","parent":"plotOptions-boxplot-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"plotOptions-funnel-point-events--click","fullname":"plotOptions.funnel.point.events.click","title":"click","parent":"plotOptions-funnel-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<line>-data-events--click","fullname":"series<line>.data.events.click","title":"click","parent":"series<line>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-area-events--click","fullname":"plotOptions.area.events.click","title":"click","parent":"plotOptions-area-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<area>-data-events--click","fullname":"series<area>.data.events.click","title":"click","parent":"series<area>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-columnrange-point-events--click","fullname":"plotOptions.columnrange.point.events.click","title":"click","parent":"plotOptions-columnrange-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-errorbar-events--click","fullname":"plotOptions.errorbar.events.click","title":"click","parent":"plotOptions-errorbar-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<pie>-events--click","fullname":"series<pie>.events.click","title":"click","parent":"series<pie>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"plotOptions-bubble-point-events--click","fullname":"plotOptions.bubble.point.events.click","title":"click","parent":"plotOptions-bubble-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-treemap-point-events--click","fullname":"plotOptions.treemap.point.events.click","title":"click","parent":"plotOptions-treemap-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<waterfall>-point-events--click","fullname":"series<waterfall>.point.events.click","title":"click","parent":"series<waterfall>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-pie-point-events--click","fullname":"plotOptions.pie.point.events.click","title":"click","parent":"plotOptions-pie-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<areaspline>-data-events--click","fullname":"series<areaspline>.data.events.click","title":"click","parent":"series<areaspline>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<polygon>-point-events--click","fullname":"series<polygon>.point.events.click","title":"click","parent":"series<polygon>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<treemap>-point-events--click","fullname":"series<treemap>.point.events.click","title":"click","parent":"series<treemap>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<errorbar>-point-events--click","fullname":"series<errorbar>.point.events.click","title":"click","parent":"series<errorbar>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-treemap-events--click","fullname":"plotOptions.treemap.events.click","title":"click","parent":"plotOptions-treemap-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"plotOptions-spline-point-events--click","fullname":"plotOptions.spline.point.events.click","title":"click","parent":"plotOptions-spline-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<area>-events--click","fullname":"series<area>.events.click","title":"click","parent":"series<area>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<heatmap>-data-events--click","fullname":"series<heatmap>.data.events.click","title":"click","parent":"series<heatmap>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<boxplot>-events--click","fullname":"series<boxplot>.events.click","title":"click","parent":"series<boxplot>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<pyramid>-data-events--click","fullname":"series<pyramid>.data.events.click","title":"click","parent":"series<pyramid>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-heatmap-point-events--click","fullname":"plotOptions.heatmap.point.events.click","title":"click","parent":"plotOptions-heatmap-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<areasplinerange>-events--click","fullname":"series<areasplinerange>.events.click","title":"click","parent":"series<areasplinerange>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<pyramid>-events--click","fullname":"series<pyramid>.events.click","title":"click","parent":"series<pyramid>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<spline>-point-events--click","fullname":"series<spline>.point.events.click","title":"click","parent":"series<spline>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-funnel-events--click","fullname":"plotOptions.funnel.events.click","title":"click","parent":"plotOptions-funnel-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"plotOptions-areasplinerange-point-events--click","fullname":"plotOptions.areasplinerange.point.events.click","title":"click","parent":"plotOptions-areasplinerange-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<heatmap>-point-events--click","fullname":"series<heatmap>.point.events.click","title":"click","parent":"series<heatmap>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<arearange>-events--click","fullname":"series<arearange>.events.click","title":"click","parent":"series<arearange>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"plotOptions-spline-events--click","fullname":"plotOptions.spline.events.click","title":"click","parent":"plotOptions-spline-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"plotOptions-polygon-events--click","fullname":"plotOptions.polygon.events.click","title":"click","parent":"plotOptions-polygon-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"plotOptions-scatter-events--click","fullname":"plotOptions.scatter.events.click","title":"click","parent":"plotOptions-scatter-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"plotOptions-scatter-point-events--click","fullname":"plotOptions.scatter.point.events.click","title":"click","parent":"plotOptions-scatter-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-solidgauge-events--click","fullname":"plotOptions.solidgauge.events.click","title":"click","parent":"plotOptions-solidgauge-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<funnel>-point-events--click","fullname":"series<funnel>.point.events.click","title":"click","parent":"series<funnel>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-bar-events--click","fullname":"plotOptions.bar.events.click","title":"click","parent":"plotOptions-bar-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"plotOptions-area-point-events--click","fullname":"plotOptions.area.point.events.click","title":"click","parent":"plotOptions-area-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<bar>-point-events--click","fullname":"series<bar>.point.events.click","title":"click","parent":"series<bar>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<gauge>-data-events--click","fullname":"series<gauge>.data.events.click","title":"click","parent":"series<gauge>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-line-point-events--click","fullname":"plotOptions.line.point.events.click","title":"click","parent":"plotOptions-line-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<bar>-data-events--click","fullname":"series<bar>.data.events.click","title":"click","parent":"series<bar>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-series-events--click","fullname":"plotOptions.series.events.click","title":"click","parent":"plotOptions-series-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<area>-point-events--click","fullname":"series<area>.point.events.click","title":"click","parent":"series<area>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<line>-point-events--click","fullname":"series<line>.point.events.click","title":"click","parent":"series<line>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<heatmap>-events--click","fullname":"series<heatmap>.events.click","title":"click","parent":"series<heatmap>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"plotOptions-heatmap-events--click","fullname":"plotOptions.heatmap.events.click","title":"click","parent":"plotOptions-heatmap-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"plotOptions-waterfall-point-events--click","fullname":"plotOptions.waterfall.point.events.click","title":"click","parent":"plotOptions-waterfall-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<columnrange>-data-events--click","fullname":"series<columnrange>.data.events.click","title":"click","parent":"series<columnrange>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"chart-events--click","fullname":"chart.events.click","title":"click","parent":"chart-events","isParent":false,"returnType":"Function","context":"Chart","since":"1.2.0","description":"<p>Fires when clicking on the plot background. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.</p> <p>Information on the clicked spot can be found through <code>event.xAxis</code> and  <code>event.yAxis</code>, which are arrays containing the axes of each dimension and each axis' value at the clicked spot. The primary axes are <code>event.xAxis[0]</code> and <code>event.yAxis[0]</code>. Remember the unit of a datetime axis is milliseconds since 1970-01-01 00:00:00.</p>\r\n<pre>click: function(e) {\r\n\tconsole.log(\r\n\t\tHighcharts.dateFormat('%Y-%m-%d %H:%M:%S', e.xAxis[0].value), \r\n\t\te.yAxis[0].value\r\n\t)\r\n}</pre>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/events-click/\" target=\"_blank\">Alert coordinates on click</a>. <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/events-container/\" target=\"_blank\">Alternatively, attach event to container</a>","deprecated":false},{"name":"series<treemap>-data-events--click","fullname":"series<treemap>.data.events.click","title":"click","parent":"series<treemap>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<arearange>-point-events--click","fullname":"series<arearange>.point.events.click","title":"click","parent":"series<arearange>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-column-events--click","fullname":"plotOptions.column.events.click","title":"click","parent":"plotOptions-column-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"plotOptions-columnrange-events--click","fullname":"plotOptions.columnrange.events.click","title":"click","parent":"plotOptions-columnrange-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<polygon>-events--click","fullname":"series<polygon>.events.click","title":"click","parent":"series<polygon>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<spline>-events--click","fullname":"series<spline>.events.click","title":"click","parent":"series<spline>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"plotOptions-waterfall-events--click","fullname":"plotOptions.waterfall.events.click","title":"click","parent":"plotOptions-waterfall-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<bubble>-point-events--click","fullname":"series<bubble>.point.events.click","title":"click","parent":"series<bubble>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-areaspline-point-events--click","fullname":"plotOptions.areaspline.point.events.click","title":"click","parent":"plotOptions-areaspline-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<bubble>-data-events--click","fullname":"series<bubble>.data.events.click","title":"click","parent":"series<bubble>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<bar>-events--click","fullname":"series<bar>.events.click","title":"click","parent":"series<bar>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<waterfall>-events--click","fullname":"series<waterfall>.events.click","title":"click","parent":"series<waterfall>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<errorbar>-data-events--click","fullname":"series<errorbar>.data.events.click","title":"click","parent":"series<errorbar>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<column>-events--click","fullname":"series<column>.events.click","title":"click","parent":"series<column>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<gauge>-events--click","fullname":"series<gauge>.events.click","title":"click","parent":"series<gauge>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"plotOptions-gauge-events--click","fullname":"plotOptions.gauge.events.click","title":"click","parent":"plotOptions-gauge-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<areasplinerange>-data-events--click","fullname":"series<areasplinerange>.data.events.click","title":"click","parent":"series<areasplinerange>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-arearange-events--click","fullname":"plotOptions.arearange.events.click","title":"click","parent":"plotOptions-arearange-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"plotOptions-areaspline-events--click","fullname":"plotOptions.areaspline.events.click","title":"click","parent":"plotOptions-areaspline-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"plotOptions-boxplot-point-events--click","fullname":"plotOptions.boxplot.point.events.click","title":"click","parent":"plotOptions-boxplot-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-arearange-point-events--click","fullname":"plotOptions.arearange.point.events.click","title":"click","parent":"plotOptions-arearange-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<pie>-data-events--click","fullname":"series<pie>.data.events.click","title":"click","parent":"series<pie>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<columnrange>-events--click","fullname":"series<columnrange>.events.click","title":"click","parent":"series<columnrange>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"plotOptions-errorbar-point-events--click","fullname":"plotOptions.errorbar.point.events.click","title":"click","parent":"plotOptions-errorbar-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-solidgauge-point-events--click","fullname":"plotOptions.solidgauge.point.events.click","title":"click","parent":"plotOptions-solidgauge-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<solidgauge>-events--click","fullname":"series<solidgauge>.events.click","title":"click","parent":"series<solidgauge>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"plotOptions-pie-events--click","fullname":"plotOptions.pie.events.click","title":"click","parent":"plotOptions-pie-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<bubble>-events--click","fullname":"series<bubble>.events.click","title":"click","parent":"series<bubble>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<scatter>-data-events--click","fullname":"series<scatter>.data.events.click","title":"click","parent":"series<scatter>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<funnel>-data-events--click","fullname":"series<funnel>.data.events.click","title":"click","parent":"series<funnel>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<boxplot>-point-events--click","fullname":"series<boxplot>.point.events.click","title":"click","parent":"series<boxplot>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-line-events--click","fullname":"plotOptions.line.events.click","title":"click","parent":"plotOptions-line-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<areasplinerange>-point-events--click","fullname":"series<areasplinerange>.point.events.click","title":"click","parent":"series<areasplinerange>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-pyramid-events--click","fullname":"plotOptions.pyramid.events.click","title":"click","parent":"plotOptions-pyramid-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<pie>-point-events--click","fullname":"series<pie>.point.events.click","title":"click","parent":"series<pie>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-pyramid-point-events--click","fullname":"plotOptions.pyramid.point.events.click","title":"click","parent":"plotOptions-pyramid-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<arearange>-data-events--click","fullname":"series<arearange>.data.events.click","title":"click","parent":"series<arearange>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"plotOptions-column-point-events--click","fullname":"plotOptions.column.point.events.click","title":"click","parent":"plotOptions-column-point-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<line>-events--click","fullname":"series<line>.events.click","title":"click","parent":"series<line>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<scatter>-events--click","fullname":"series<scatter>.events.click","title":"click","parent":"series<scatter>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<waterfall>-data-events--click","fullname":"series<waterfall>.data.events.click","title":"click","parent":"series<waterfall>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<boxplot>-data-events--click","fullname":"series<boxplot>.data.events.click","title":"click","parent":"series<boxplot>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<solidgauge>-data-events--click","fullname":"series<solidgauge>.data.events.click","title":"click","parent":"series<solidgauge>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"<p></p>Fires when a point is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.<p></p> <p>If the <code>series.allowPointSelect</code> option is true, the default action for the point's click event is to toggle the point's select state. Returning <code>false</code> cancels this action.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click/\" target=\"_blank\">Click marker to alert values</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-column/\" target=\"_blank\">click column</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-click-url/\" target=\"_blank\">go to URL</a>","deprecated":false},{"name":"series<funnel>-events--click","fullname":"series<funnel>.events.click","title":"click","parent":"series<funnel>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. Additionally, <code>event.point</code> holds a pointer to the nearest point on the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-click/\" target=\"_blank\">Alert click info</a>","deprecated":false},{"name":"series<pie>-dataLabels--color","fullname":"series<pie>.dataLabels.color","title":"color","parent":"series<pie>-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<heatmap>--color","fullname":"series<heatmap>.color","title":"color","parent":"series<heatmap>","isParent":false,"returnType":"Color","defaults":"null","since":"4.0","description":"The main color of the series. In heat maps this color is rarely used, as we mostly use the color to denote the value of each point. Unless options are set in the <a href=\"#colorAxis\">colorAxis</a>, the default value is pulled from the <a href=\"#colors\">options.colors</a> array.","deprecated":false},{"name":"yAxis-plotBands--color","fullname":"yAxis.plotBands.color","title":"color","parent":"yAxis-plotBands","isParent":false,"returnType":"Color","description":"The color of the plot band.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-color/\" target=\"_blank\">Color band</a>"},{"name":"series<bar>-dataLabels--color","fullname":"series<bar>.dataLabels.color","title":"color","parent":"series<bar>-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<column>-zones--color","fullname":"series<column>.zones.color","title":"color","parent":"series<column>-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<boxplot>-zones--color","fullname":"series<boxplot>.zones.color","title":"color","parent":"series<boxplot>-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"plotOptions-area-dataLabels--color","fullname":"plotOptions.area.dataLabels.color","title":"color","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"xAxis-plotBands--color","fullname":"xAxis.plotBands.color","title":"color","parent":"xAxis-plotBands","isParent":false,"returnType":"Color","description":"The color of the plot band.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-color/\" target=\"_blank\">Color band</a>"},{"name":"series<polygon>-data--color","fullname":"series<polygon>.data.color","title":"color","parent":"series<polygon>-data","isParent":false,"returnType":"Color","defaults":"undefined","description":"Individual color for the point. By default the color is pulled from the global <code>colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/color/\" target=\"_blank\">Mark the highest point</a>","deprecated":false},{"name":"xAxis-plotLines--color","fullname":"xAxis.plotLines.color","title":"color","parent":"xAxis-plotLines","isParent":false,"returnType":"Color","description":"The color of the line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-color/\" target=\"_blank\">A red line from X axis</a>"},{"name":"series<bar>-data--color","fullname":"series<bar>.data.color","title":"color","parent":"series<bar>-data","isParent":false,"returnType":"Color","defaults":"undefined","description":"Individual color for the point. By default the color is pulled from the global <code>colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/color/\" target=\"_blank\">Mark the highest point</a>","deprecated":false},{"name":"series<areasplinerange>-zones--color","fullname":"series<areasplinerange>.zones.color","title":"color","parent":"series<areasplinerange>-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<waterfall>-data--color","fullname":"series<waterfall>.data.color","title":"color","parent":"series<waterfall>-data","isParent":false,"returnType":"Color","defaults":"undefined","description":"Individual color for the point. By default the color is pulled from the global <code>colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/color/\" target=\"_blank\">Mark the highest point</a>","deprecated":false},{"name":"plotOptions-scatter-dataLabels--color","fullname":"plotOptions.scatter.dataLabels.color","title":"color","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<pyramid>-zones--color","fullname":"series<pyramid>.zones.color","title":"color","parent":"series<pyramid>-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"plotOptions-waterfall-zones--color","fullname":"plotOptions.waterfall.zones.color","title":"color","parent":"plotOptions-waterfall-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<column>--color","fullname":"series<column>.color","title":"color","parent":"series<column>","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"yAxis-plotLines--color","fullname":"yAxis.plotLines.color","title":"color","parent":"yAxis-plotLines","isParent":false,"returnType":"Color","description":"The color of the line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-color/\" target=\"_blank\">A red line from X axis</a>"},{"name":"plotOptions-polygon-zones--color","fullname":"plotOptions.polygon.zones.color","title":"color","parent":"plotOptions-polygon-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"plotOptions-pie-zones--color","fullname":"plotOptions.pie.zones.color","title":"color","parent":"plotOptions-pie-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<line>-dataLabels--color","fullname":"series<line>.dataLabels.color","title":"color","parent":"series<line>-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<columnrange>-dataLabels--color","fullname":"series<columnrange>.dataLabels.color","title":"color","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"plotOptions-funnel-zones--color","fullname":"plotOptions.funnel.zones.color","title":"color","parent":"plotOptions-funnel-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"plotOptions-solidgauge-zones--color","fullname":"plotOptions.solidgauge.zones.color","title":"color","parent":"plotOptions-solidgauge-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<bubble>-data--color","fullname":"series<bubble>.data.color","title":"color","parent":"series<bubble>-data","isParent":false,"returnType":"Color","defaults":"undefined","description":"Individual color for the point. By default the color is pulled from the global <code>colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/color/\" target=\"_blank\">Mark the highest point</a>","deprecated":false},{"name":"series<scatter>-data--color","fullname":"series<scatter>.data.color","title":"color","parent":"series<scatter>-data","isParent":false,"returnType":"Color","defaults":"undefined","description":"Individual color for the point. By default the color is pulled from the global <code>colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/color/\" target=\"_blank\">Mark the highest point</a>","deprecated":false},{"name":"plotOptions-series-zones--color","fullname":"plotOptions.series.zones.color","title":"color","parent":"plotOptions-series-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"plotOptions-areaspline--color","fullname":"plotOptions.areaspline.color","title":"color","parent":"plotOptions-areaspline","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"plotOptions-columnrange-zones--color","fullname":"plotOptions.columnrange.zones.color","title":"color","parent":"plotOptions-columnrange-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"plotOptions-treemap-zones--color","fullname":"plotOptions.treemap.zones.color","title":"color","parent":"plotOptions-treemap-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<columnrange>-data--color","fullname":"series<columnrange>.data.color","title":"color","parent":"series<columnrange>-data","isParent":false,"returnType":"Color","defaults":"undefined","description":"Individual color for the point. By default the color is pulled from the global <code>colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/color/\" target=\"_blank\">Mark the highest point</a>","deprecated":false},{"name":"plotOptions-bar--color","fullname":"plotOptions.bar.color","title":"color","parent":"plotOptions-bar","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"plotOptions-gauge--color","fullname":"plotOptions.gauge.color","title":"color","parent":"plotOptions-gauge","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"chart-options3d-frame-back--color","fullname":"chart.options3d.frame.back.color","title":"color","parent":"chart-options3d-frame-back","isParent":false,"returnType":"Color","defaults":"transparent","values":"","since":"4.0","description":"The color of the panel.","demo":"","seeAlso":"","deprecated":false},{"name":"series<solidgauge>-data--color","fullname":"series<solidgauge>.data.color","title":"color","parent":"series<solidgauge>-data","isParent":false,"returnType":"Color","defaults":"undefined","description":"Individual color for the point. By default the color is pulled from the global <code>colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/color/\" target=\"_blank\">Mark the highest point</a>","deprecated":false},{"name":"series<pyramid>-dataLabels--color","fullname":"series<pyramid>.dataLabels.color","title":"color","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"plotOptions-spline-dataLabels--color","fullname":"plotOptions.spline.dataLabels.color","title":"color","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<line>-zones--color","fullname":"series<line>.zones.color","title":"color","parent":"series<line>-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"plotOptions-arearange--color","fullname":"plotOptions.arearange.color","title":"color","parent":"plotOptions-arearange","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"series<waterfall>-dataLabels--color","fullname":"series<waterfall>.dataLabels.color","title":"color","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"plotOptions-pyramid-dataLabels--color","fullname":"plotOptions.pyramid.dataLabels.color","title":"color","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<spline>--color","fullname":"series<spline>.color","title":"color","parent":"series<spline>","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"series<funnel>-dataLabels--color","fullname":"series<funnel>.dataLabels.color","title":"color","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<gauge>-dataLabels--color","fullname":"series<gauge>.dataLabels.color","title":"color","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"plotOptions-waterfall--color","fullname":"plotOptions.waterfall.color","title":"color","parent":"plotOptions-waterfall","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"plotOptions-bubble-zones--color","fullname":"plotOptions.bubble.zones.color","title":"color","parent":"plotOptions-bubble-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"plotOptions-line-dataLabels--color","fullname":"plotOptions.line.dataLabels.color","title":"color","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"plotOptions-gauge-dataLabels--color","fullname":"plotOptions.gauge.dataLabels.color","title":"color","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<polygon>-zones--color","fullname":"series<polygon>.zones.color","title":"color","parent":"series<polygon>-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<errorbar>-zones--color","fullname":"series<errorbar>.zones.color","title":"color","parent":"series<errorbar>-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<waterfall>--color","fullname":"series<waterfall>.color","title":"color","parent":"series<waterfall>","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"series<pie>-zones--color","fullname":"series<pie>.zones.color","title":"color","parent":"series<pie>-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"plotOptions-arearange-zones--color","fullname":"plotOptions.arearange.zones.color","title":"color","parent":"plotOptions-arearange-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<gauge>-data--color","fullname":"series<gauge>.data.color","title":"color","parent":"series<gauge>-data","isParent":false,"returnType":"Color","defaults":"undefined","description":"Individual color for the point. By default the color is pulled from the global <code>colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/color/\" target=\"_blank\">Mark the highest point</a>","deprecated":false},{"name":"series<funnel>-data--color","fullname":"series<funnel>.data.color","title":"color","parent":"series<funnel>-data","isParent":false,"returnType":"Color","defaults":"undefined","description":"Individual color for the point. By default the color is pulled from the global <code>colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/color/\" target=\"_blank\">Mark the highest point</a>","deprecated":false},{"name":"plotOptions-column--color","fullname":"plotOptions.column.color","title":"color","parent":"plotOptions-column","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"series<funnel>-zones--color","fullname":"series<funnel>.zones.color","title":"color","parent":"series<funnel>-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<areasplinerange>-dataLabels--color","fullname":"series<areasplinerange>.dataLabels.color","title":"color","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<areaspline>-dataLabels--color","fullname":"series<areaspline>.dataLabels.color","title":"color","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<scatter>-zones--color","fullname":"series<scatter>.zones.color","title":"color","parent":"series<scatter>-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<treemap>-zones--color","fullname":"series<treemap>.zones.color","title":"color","parent":"series<treemap>-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<bar>--color","fullname":"series<bar>.color","title":"color","parent":"series<bar>","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"series<columnrange>--color","fullname":"series<columnrange>.color","title":"color","parent":"series<columnrange>","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"plotOptions-bubble-dataLabels--color","fullname":"plotOptions.bubble.dataLabels.color","title":"color","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<arearange>-dataLabels--color","fullname":"series<arearange>.dataLabels.color","title":"color","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<columnrange>-zones--color","fullname":"series<columnrange>.zones.color","title":"color","parent":"series<columnrange>-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<areasplinerange>--color","fullname":"series<areasplinerange>.color","title":"color","parent":"series<areasplinerange>","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"plotOptions-treemap--color","fullname":"plotOptions.treemap.color","title":"color","parent":"plotOptions-treemap","isParent":false,"returnType":"Color","defaults":"null","since":"4.0","description":"The main color of the series. In heat maps this color is rarely used, as we mostly use the color to denote the value of each point. Unless options are set in the <a href=\"#colorAxis\">colorAxis</a>, the default value is pulled from the <a href=\"#colors\">options.colors</a> array.","deprecated":false},{"name":"plotOptions-heatmap--color","fullname":"plotOptions.heatmap.color","title":"color","parent":"plotOptions-heatmap","isParent":false,"returnType":"Color","defaults":"null","since":"4.0","description":"The main color of the series. In heat maps this color is rarely used, as we mostly use the color to denote the value of each point. Unless options are set in the <a href=\"#colorAxis\">colorAxis</a>, the default value is pulled from the <a href=\"#colors\">options.colors</a> array.","deprecated":false},{"name":"series<spline>-zones--color","fullname":"series<spline>.zones.color","title":"color","parent":"series<spline>-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"chart-options3d-frame-side--color","fullname":"chart.options3d.frame.side.color","title":"color","parent":"chart-options3d-frame-side","isParent":false,"returnType":"Color","defaults":"transparent","values":"","since":"4.0","description":"The color of the panel.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange-dataLabels--color","fullname":"plotOptions.columnrange.dataLabels.color","title":"color","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"plotOptions-series-dataLabels--color","fullname":"plotOptions.series.dataLabels.color","title":"color","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"plotOptions-heatmap-zones--color","fullname":"plotOptions.heatmap.zones.color","title":"color","parent":"plotOptions-heatmap-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"plotOptions-waterfall-dataLabels--color","fullname":"plotOptions.waterfall.dataLabels.color","title":"color","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<spline>-dataLabels--color","fullname":"series<spline>.dataLabels.color","title":"color","parent":"series<spline>-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"plotOptions-area--color","fullname":"plotOptions.area.color","title":"color","parent":"plotOptions-area","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"chart-options3d-frame-bottom--color","fullname":"chart.options3d.frame.bottom.color","title":"color","parent":"chart-options3d-frame-bottom","isParent":false,"returnType":"Color","defaults":"transparent","values":"","since":"4.0","description":"The color of the panel.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap-dataLabels--color","fullname":"plotOptions.heatmap.dataLabels.color","title":"color","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<gauge>-zones--color","fullname":"series<gauge>.zones.color","title":"color","parent":"series<gauge>-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<area>-zones--color","fullname":"series<area>.zones.color","title":"color","parent":"series<area>-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<areaspline>-zones--color","fullname":"series<areaspline>.zones.color","title":"color","parent":"series<areaspline>-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<treemap>-data--color","fullname":"series<treemap>.data.color","title":"color","parent":"series<treemap>-data","isParent":false,"returnType":"Color","description":"The color of the point. In heat maps the point color is rarely set explicitly, as we use the color to denote the <code>value</code>. Options for this are set in the <a href=\"#colorAxis\">colorAxis</a> configuration."},{"name":"plotOptions-pyramid-zones--color","fullname":"plotOptions.pyramid.zones.color","title":"color","parent":"plotOptions-pyramid-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"plotOptions-spline-zones--color","fullname":"plotOptions.spline.zones.color","title":"color","parent":"plotOptions-spline-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<boxplot>--color","fullname":"series<boxplot>.color","title":"color","parent":"series<boxplot>","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"series<line>--color","fullname":"series<line>.color","title":"color","parent":"series<line>","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"series<gauge>--color","fullname":"series<gauge>.color","title":"color","parent":"series<gauge>","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"plotOptions-boxplot-zones--color","fullname":"plotOptions.boxplot.zones.color","title":"color","parent":"plotOptions-boxplot-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<treemap>-levels--color","fullname":"series<treemap>.levels.color","title":"color","parent":"series<treemap>-levels","isParent":false,"returnType":"Color","since":"4.1.0","description":"Can set a color on all points which lies on the same level.","deprecated":false},{"name":"plotOptions-bar-zones--color","fullname":"plotOptions.bar.zones.color","title":"color","parent":"plotOptions-bar-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<area>--color","fullname":"series<area>.color","title":"color","parent":"series<area>","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"plotOptions-column-zones--color","fullname":"plotOptions.column.zones.color","title":"color","parent":"plotOptions-column-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"plotOptions-line--color","fullname":"plotOptions.line.color","title":"color","parent":"plotOptions-line","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"series<arearange>-data--color","fullname":"series<arearange>.data.color","title":"color","parent":"series<arearange>-data","isParent":false,"returnType":"Color","defaults":"undefined","description":"Individual color for the point. By default the color is pulled from the global <code>colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/color/\" target=\"_blank\">Mark the highest point</a>","deprecated":false},{"name":"series<line>-data--color","fullname":"series<line>.data.color","title":"color","parent":"series<line>-data","isParent":false,"returnType":"Color","defaults":"undefined","description":"Individual color for the point. By default the color is pulled from the global <code>colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/color/\" target=\"_blank\">Mark the highest point</a>","deprecated":false},{"name":"series<area>-data--color","fullname":"series<area>.data.color","title":"color","parent":"series<area>-data","isParent":false,"returnType":"Color","defaults":"undefined","description":"Individual color for the point. By default the color is pulled from the global <code>colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/color/\" target=\"_blank\">Mark the highest point</a>","deprecated":false},{"name":"series<treemap>-dataLabels--color","fullname":"series<treemap>.dataLabels.color","title":"color","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"plotOptions-areasplinerange--color","fullname":"plotOptions.areasplinerange.color","title":"color","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"plotOptions-spline--color","fullname":"plotOptions.spline.color","title":"color","parent":"plotOptions-spline","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"plotOptions-solidgauge-dataLabels--color","fullname":"plotOptions.solidgauge.dataLabels.color","title":"color","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<arearange>-zones--color","fullname":"series<arearange>.zones.color","title":"color","parent":"series<arearange>-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<bubble>-zones--color","fullname":"series<bubble>.zones.color","title":"color","parent":"series<bubble>-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"plotOptions-scatter--color","fullname":"plotOptions.scatter.color","title":"color","parent":"plotOptions-scatter","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"plotOptions-line-zones--color","fullname":"plotOptions.line.zones.color","title":"color","parent":"plotOptions-line-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"plotOptions-pie-dataLabels--color","fullname":"plotOptions.pie.dataLabels.color","title":"color","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<scatter>--color","fullname":"series<scatter>.color","title":"color","parent":"series<scatter>","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"plotOptions-boxplot--color","fullname":"plotOptions.boxplot.color","title":"color","parent":"plotOptions-boxplot","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"series<bubble>-dataLabels--color","fullname":"series<bubble>.dataLabels.color","title":"color","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<heatmap>-data--color","fullname":"series<heatmap>.data.color","title":"color","parent":"series<heatmap>-data","isParent":false,"returnType":"Color","description":"The color of the point. In heat maps the point color is rarely set explicitly, as we use the color to denote the <code>value</code>. Options for this are set in the <a href=\"#colorAxis\">colorAxis</a> configuration."},{"name":"plotOptions-scatter-zones--color","fullname":"plotOptions.scatter.zones.color","title":"color","parent":"plotOptions-scatter-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<pie>-data--color","fullname":"series<pie>.data.color","title":"color","parent":"series<pie>-data","isParent":false,"returnType":"Color","defaults":"undefined","description":"Individual color for the point. By default the color is pulled from the global <code>colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/color/\" target=\"_blank\">Mark the highest point</a>","deprecated":false},{"name":"plotOptions-bar-dataLabels--color","fullname":"plotOptions.bar.dataLabels.color","title":"color","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<polygon>-dataLabels--color","fullname":"series<polygon>.dataLabels.color","title":"color","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<column>-data--color","fullname":"series<column>.data.color","title":"color","parent":"series<column>-data","isParent":false,"returnType":"Color","defaults":"undefined","description":"Individual color for the point. By default the color is pulled from the global <code>colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/color/\" target=\"_blank\">Mark the highest point</a>","deprecated":false},{"name":"plotOptions-treemap-levels--color","fullname":"plotOptions.treemap.levels.color","title":"color","parent":"plotOptions-treemap-levels","isParent":false,"returnType":"Color","since":"4.1.0","description":"Can set a color on all points which lies on the same level.","deprecated":false},{"name":"plotOptions-column-dataLabels--color","fullname":"plotOptions.column.dataLabels.color","title":"color","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<solidgauge>-dataLabels--color","fullname":"series<solidgauge>.dataLabels.color","title":"color","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<spline>-data--color","fullname":"series<spline>.data.color","title":"color","parent":"series<spline>-data","isParent":false,"returnType":"Color","defaults":"undefined","description":"Individual color for the point. By default the color is pulled from the global <code>colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/color/\" target=\"_blank\">Mark the highest point</a>","deprecated":false},{"name":"series<waterfall>-zones--color","fullname":"series<waterfall>.zones.color","title":"color","parent":"series<waterfall>-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<treemap>--color","fullname":"series<treemap>.color","title":"color","parent":"series<treemap>","isParent":false,"returnType":"Color","defaults":"null","since":"4.0","description":"The main color of the series. In heat maps this color is rarely used, as we mostly use the color to denote the value of each point. Unless options are set in the <a href=\"#colorAxis\">colorAxis</a>, the default value is pulled from the <a href=\"#colors\">options.colors</a> array.","deprecated":false},{"name":"plotOptions-treemap-dataLabels--color","fullname":"plotOptions.treemap.dataLabels.color","title":"color","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<pyramid>-data--color","fullname":"series<pyramid>.data.color","title":"color","parent":"series<pyramid>-data","isParent":false,"returnType":"Color","defaults":"undefined","description":"Individual color for the point. By default the color is pulled from the global <code>colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/color/\" target=\"_blank\">Mark the highest point</a>","deprecated":false},{"name":"series<errorbar>--color","fullname":"series<errorbar>.color","title":"color","parent":"series<errorbar>","isParent":false,"returnType":"Color","defaults":"#000000","values":"","since":"3.0","description":"The main color of the bars. This can be overridden by <a href=\"#plotOptions.errorbar.stemColor\">stemColor</a> and <a href=\"#plotOptions.errorbar.whiskerColor\">whiskerColor</a> individually. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/error-bar-styling/\" target=\"_blank\">Error bar styling</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange-zones--color","fullname":"plotOptions.areasplinerange.zones.color","title":"color","parent":"plotOptions-areasplinerange-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<arearange>--color","fullname":"series<arearange>.color","title":"color","parent":"series<arearange>","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"series<solidgauge>-zones--color","fullname":"series<solidgauge>.zones.color","title":"color","parent":"series<solidgauge>-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<area>-dataLabels--color","fullname":"series<area>.dataLabels.color","title":"color","parent":"series<area>-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"plotOptions-errorbar--color","fullname":"plotOptions.errorbar.color","title":"color","parent":"plotOptions-errorbar","isParent":false,"returnType":"Color","defaults":"#000000","values":"","since":"3.0","description":"The main color of the bars. This can be overridden by <a href=\"#plotOptions.errorbar.stemColor\">stemColor</a> and <a href=\"#plotOptions.errorbar.whiskerColor\">whiskerColor</a> individually. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/error-bar-styling/\" target=\"_blank\">Error bar styling</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-dataLabels--color","fullname":"plotOptions.areaspline.dataLabels.color","title":"color","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<areaspline>-data--color","fullname":"series<areaspline>.data.color","title":"color","parent":"series<areaspline>-data","isParent":false,"returnType":"Color","defaults":"undefined","description":"Individual color for the point. By default the color is pulled from the global <code>colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/color/\" target=\"_blank\">Mark the highest point</a>","deprecated":false},{"name":"plotOptions-gauge-zones--color","fullname":"plotOptions.gauge.zones.color","title":"color","parent":"plotOptions-gauge-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"plotOptions-columnrange--color","fullname":"plotOptions.columnrange.color","title":"color","parent":"plotOptions-columnrange","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"series<bubble>--color","fullname":"series<bubble>.color","title":"color","parent":"series<bubble>","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"series<polygon>--color","fullname":"series<polygon>.color","title":"color","parent":"series<polygon>","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"plotOptions-errorbar-zones--color","fullname":"plotOptions.errorbar.zones.color","title":"color","parent":"plotOptions-errorbar-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"plotOptions-series--color","fullname":"plotOptions.series.color","title":"color","parent":"plotOptions-series","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"plotOptions-areaspline-zones--color","fullname":"plotOptions.areaspline.zones.color","title":"color","parent":"plotOptions-areaspline-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<column>-dataLabels--color","fullname":"series<column>.dataLabels.color","title":"color","parent":"series<column>-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"plotOptions-arearange-dataLabels--color","fullname":"plotOptions.arearange.dataLabels.color","title":"color","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"plotOptions-polygon-dataLabels--color","fullname":"plotOptions.polygon.dataLabels.color","title":"color","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"plotOptions-polygon--color","fullname":"plotOptions.polygon.color","title":"color","parent":"plotOptions-polygon","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"series<heatmap>-dataLabels--color","fullname":"series<heatmap>.dataLabels.color","title":"color","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<errorbar>-data--color","fullname":"series<errorbar>.data.color","title":"color","parent":"series<errorbar>-data","isParent":false,"returnType":"Color","defaults":"undefined","description":"Individual color for the point. By default the color is pulled from the global <code>colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/color/\" target=\"_blank\">Mark the highest point</a>","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels--color","fullname":"plotOptions.areasplinerange.dataLabels.color","title":"color","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"series<areasplinerange>-data--color","fullname":"series<areasplinerange>.data.color","title":"color","parent":"series<areasplinerange>-data","isParent":false,"returnType":"Color","defaults":"undefined","description":"Individual color for the point. By default the color is pulled from the global <code>colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/color/\" target=\"_blank\">Mark the highest point</a>","deprecated":false},{"name":"series<scatter>-dataLabels--color","fullname":"series<scatter>.dataLabels.color","title":"color","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"plotOptions-funnel-dataLabels--color","fullname":"plotOptions.funnel.dataLabels.color","title":"color","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"Color","description":"The text color for the data labels. Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-color/\" target=\"_blank\">Red data labels</a>"},{"name":"plotOptions-area-zones--color","fullname":"plotOptions.area.zones.color","title":"color","parent":"plotOptions-area-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"series<boxplot>-data--color","fullname":"series<boxplot>.data.color","title":"color","parent":"series<boxplot>-data","isParent":false,"returnType":"Color","defaults":"undefined","description":"Individual color for the point. By default the color is pulled from the global <code>colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/color/\" target=\"_blank\">Mark the highest point</a>","deprecated":false},{"name":"series<bar>-zones--color","fullname":"series<bar>.zones.color","title":"color","parent":"series<bar>-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"plotOptions-bubble--color","fullname":"plotOptions.bubble.color","title":"color","parent":"plotOptions-bubble","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"series<areaspline>--color","fullname":"series<areaspline>.color","title":"color","parent":"series<areaspline>","isParent":false,"returnType":"Color","description":"The main color or the series. In line type series it applies to the line and the point markers unless otherwise specified. In bar type series it applies to the bars unless a color is specified per point. The default value is pulled from the  <code>options.colors</code> array.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-general/\" target=\"_blank\">General plot option</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-specific/\" target=\"_blank\">one specific series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-color-area/\" target=\"_blank\">area color</a>"},{"name":"series<heatmap>-zones--color","fullname":"series<heatmap>.zones.color","title":"color","parent":"series<heatmap>-zones","isParent":false,"returnType":"Color","since":"4.1.0","description":"Defines the color of the series.","seeAlso":"<a href=\"#plotOption.series.color\">series color</a>","deprecated":false},{"name":"plotOptions-heatmap--colorByPoint","fullname":"plotOptions.heatmap.colorByPoint","title":"colorByPoint","parent":"plotOptions-heatmap","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.0","description":"When using automatic point colors pulled from the <code>options.colors</code>\r collection, this option determines whether the chart should receive \r one color per series or one color per point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-false/\" target=\"_blank\">False by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-true/\" target=\"_blank\">true</a>","seeAlso":"<a href=\"#plotOptions.column.colors\">series colors</a>","deprecated":false},{"name":"series<heatmap>--colorByPoint","fullname":"series<heatmap>.colorByPoint","title":"colorByPoint","parent":"series<heatmap>","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.0","description":"When using automatic point colors pulled from the <code>options.colors</code>\r collection, this option determines whether the chart should receive \r one color per series or one color per point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-false/\" target=\"_blank\">False by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-true/\" target=\"_blank\">true</a>","seeAlso":"<a href=\"#plotOptions.column.colors\">series colors</a>","deprecated":false},{"name":"series<columnrange>--colorByPoint","fullname":"series<columnrange>.colorByPoint","title":"colorByPoint","parent":"series<columnrange>","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.0","description":"When using automatic point colors pulled from the <code>options.colors</code>\r collection, this option determines whether the chart should receive \r one color per series or one color per point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-false/\" target=\"_blank\">False by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-true/\" target=\"_blank\">true</a>","seeAlso":"<a href=\"#plotOptions.column.colors\">series colors</a>","deprecated":false},{"name":"plotOptions-boxplot--colorByPoint","fullname":"plotOptions.boxplot.colorByPoint","title":"colorByPoint","parent":"plotOptions-boxplot","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.0","description":"When using automatic point colors pulled from the <code>options.colors</code>\r collection, this option determines whether the chart should receive \r one color per series or one color per point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-false/\" target=\"_blank\">False by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-true/\" target=\"_blank\">true</a>","seeAlso":"<a href=\"#plotOptions.column.colors\">series colors</a>","deprecated":false},{"name":"series<bar>--colorByPoint","fullname":"series<bar>.colorByPoint","title":"colorByPoint","parent":"series<bar>","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.0","description":"When using automatic point colors pulled from the <code>options.colors</code>\r collection, this option determines whether the chart should receive \r one color per series or one color per point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-false/\" target=\"_blank\">False by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-true/\" target=\"_blank\">true</a>","seeAlso":"<a href=\"#plotOptions.column.colors\">series colors</a>","deprecated":false},{"name":"plotOptions-bar--colorByPoint","fullname":"plotOptions.bar.colorByPoint","title":"colorByPoint","parent":"plotOptions-bar","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.0","description":"When using automatic point colors pulled from the <code>options.colors</code>\r collection, this option determines whether the chart should receive \r one color per series or one color per point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-false/\" target=\"_blank\">False by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-true/\" target=\"_blank\">true</a>","seeAlso":"<a href=\"#plotOptions.column.colors\">series colors</a>","deprecated":false},{"name":"plotOptions-columnrange--colorByPoint","fullname":"plotOptions.columnrange.colorByPoint","title":"colorByPoint","parent":"plotOptions-columnrange","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.0","description":"When using automatic point colors pulled from the <code>options.colors</code>\r collection, this option determines whether the chart should receive \r one color per series or one color per point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-false/\" target=\"_blank\">False by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-true/\" target=\"_blank\">true</a>","seeAlso":"<a href=\"#plotOptions.column.colors\">series colors</a>","deprecated":false},{"name":"plotOptions-errorbar--colorByPoint","fullname":"plotOptions.errorbar.colorByPoint","title":"colorByPoint","parent":"plotOptions-errorbar","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.0","description":"When using automatic point colors pulled from the <code>options.colors</code>\r collection, this option determines whether the chart should receive \r one color per series or one color per point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-false/\" target=\"_blank\">False by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-true/\" target=\"_blank\">true</a>","seeAlso":"<a href=\"#plotOptions.column.colors\">series colors</a>","deprecated":false},{"name":"plotOptions-treemap--colorByPoint","fullname":"plotOptions.treemap.colorByPoint","title":"colorByPoint","parent":"plotOptions-treemap","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.0","description":"When using automatic point colors pulled from the <code>options.colors</code>\r collection, this option determines whether the chart should receive \r one color per series or one color per point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-false/\" target=\"_blank\">False by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-true/\" target=\"_blank\">true</a>","seeAlso":"<a href=\"#plotOptions.column.colors\">series colors</a>","deprecated":false},{"name":"series<errorbar>--colorByPoint","fullname":"series<errorbar>.colorByPoint","title":"colorByPoint","parent":"series<errorbar>","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.0","description":"When using automatic point colors pulled from the <code>options.colors</code>\r collection, this option determines whether the chart should receive \r one color per series or one color per point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-false/\" target=\"_blank\">False by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-true/\" target=\"_blank\">true</a>","seeAlso":"<a href=\"#plotOptions.column.colors\">series colors</a>","deprecated":false},{"name":"series<treemap>--colorByPoint","fullname":"series<treemap>.colorByPoint","title":"colorByPoint","parent":"series<treemap>","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.0","description":"When using automatic point colors pulled from the <code>options.colors</code>\r collection, this option determines whether the chart should receive \r one color per series or one color per point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-false/\" target=\"_blank\">False by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-true/\" target=\"_blank\">true</a>","seeAlso":"<a href=\"#plotOptions.column.colors\">series colors</a>","deprecated":false},{"name":"series<column>--colorByPoint","fullname":"series<column>.colorByPoint","title":"colorByPoint","parent":"series<column>","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.0","description":"When using automatic point colors pulled from the <code>options.colors</code>\r collection, this option determines whether the chart should receive \r one color per series or one color per point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-false/\" target=\"_blank\">False by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-true/\" target=\"_blank\">true</a>","seeAlso":"<a href=\"#plotOptions.column.colors\">series colors</a>","deprecated":false},{"name":"series<boxplot>--colorByPoint","fullname":"series<boxplot>.colorByPoint","title":"colorByPoint","parent":"series<boxplot>","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.0","description":"When using automatic point colors pulled from the <code>options.colors</code>\r collection, this option determines whether the chart should receive \r one color per series or one color per point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-false/\" target=\"_blank\">False by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-true/\" target=\"_blank\">true</a>","seeAlso":"<a href=\"#plotOptions.column.colors\">series colors</a>","deprecated":false},{"name":"plotOptions-column--colorByPoint","fullname":"plotOptions.column.colorByPoint","title":"colorByPoint","parent":"plotOptions-column","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.0","description":"When using automatic point colors pulled from the <code>options.colors</code>\r collection, this option determines whether the chart should receive \r one color per series or one color per point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-false/\" target=\"_blank\">False by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-true/\" target=\"_blank\">true</a>","seeAlso":"<a href=\"#plotOptions.column.colors\">series colors</a>","deprecated":false},{"name":"series<waterfall>--colorByPoint","fullname":"series<waterfall>.colorByPoint","title":"colorByPoint","parent":"series<waterfall>","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.0","description":"When using automatic point colors pulled from the <code>options.colors</code>\r collection, this option determines whether the chart should receive \r one color per series or one color per point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-false/\" target=\"_blank\">False by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-true/\" target=\"_blank\">true</a>","seeAlso":"<a href=\"#plotOptions.column.colors\">series colors</a>","deprecated":false},{"name":"plotOptions-waterfall--colorByPoint","fullname":"plotOptions.waterfall.colorByPoint","title":"colorByPoint","parent":"plotOptions-waterfall","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.0","description":"When using automatic point colors pulled from the <code>options.colors</code>\r collection, this option determines whether the chart should receive \r one color per series or one color per point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-false/\" target=\"_blank\">False by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-colorbypoint-true/\" target=\"_blank\">true</a>","seeAlso":"<a href=\"#plotOptions.column.colors\">series colors</a>","deprecated":false},{"name":"series<treemap>-data--colorValue","fullname":"series<treemap>.data.colorValue","title":"colorValue","parent":"series<treemap>-data","isParent":false,"returnType":"Number","defaults":"undefined","since":"4.1.0","description":"Serves a purpose only if a colorAxis object is defined in the chart options. This value will decide which color the point gets from the scale of the colorAxis.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/treemap-coloraxis\">Treemap with a colorAxis</a>","deprecated":false},{"name":"colors","fullname":"colors","title":"colors","isParent":false,"returnType":"Array<Color>","defaults":"[ \"#7cb5ec\" , \"#434348\" , \"#90ed7d\" , \"#f7a35c\" , \"#8085e9\" , \"#f15c80\" , \"#e4d354\" , \"#2b908f\" , \"#f45b5b\" , \"#91e8e1\"]","description":"<p>An array containing the default colors for the chart's series. When all colors are used, new colors are pulled from the start again. Defaults to:\r\n<pre>colors: ['#7cb5ec', '#434348', '#90ed7d', '#f7a35c', '#8085e9', \r\n   '#f15c80', '#e4d354', '#2b908f', '#f45b5b', '#91e8e1']</pre>\r\n\r\nDefault colors can also be set on a series or series.type basis, see <a href=\"#plotOptions.column.colors\">column.colors</a>, <a href=\"#plotOptions.pie.colors\">pie.colors</a>.\r\n</p>\r\n\r\n<h3>Legacy</h3>\r\n<p>In Highcharts 3.x, the default colors were:\r\n<pre>colors: ['#2f7ed8', '#0d233a', '#8bbc21', '#910000', '#1aadce', \r\n   '#492970', '#f28f43', '#77a1e5', '#c42525', '#a6c96a']</pre>\r\n</p>\r\n\r\n<p>In Highcharts 2.x, the default colors were:\r\n<pre>colors: ['#4572A7', '#AA4643', '#89A54E', '#80699B', '#3D96AE', \r\n   '#DB843D', '#92A8CD', '#A47D7C', '#B5CA92']</pre></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/colors/\" target=\"_blank\">Assign a global color theme</a>","deprecated":false},{"name":"plotOptions-funnel--colors","fullname":"plotOptions.funnel.colors","title":"colors","parent":"plotOptions-funnel","isParent":false,"returnType":"Array<Color>","since":"3.0","description":"A series specific or series type specific color set to use instead of the global <a href=\"#colors\">colors</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/pie-monochrome/\" target=\"_blank\">Set default colors for all pies</a>","deprecated":false},{"name":"series<columnrange>--colors","fullname":"series<columnrange>.colors","title":"colors","parent":"series<columnrange>","isParent":false,"returnType":"Array<Color>","defaults":"","values":"","since":"3.0","description":"A series specific or series type specific color set to apply instead of the global <a href=\"#colors\">colors</a> when <a href=\"#plotOptions.column.colorByPoint\">colorByPoint</a> is true.","demo":"","seeAlso":"","deprecated":false},{"name":"series<funnel>--colors","fullname":"series<funnel>.colors","title":"colors","parent":"series<funnel>","isParent":false,"returnType":"Array<Color>","since":"3.0","description":"A series specific or series type specific color set to use instead of the global <a href=\"#colors\">colors</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/pie-monochrome/\" target=\"_blank\">Set default colors for all pies</a>","deprecated":false},{"name":"series<bar>--colors","fullname":"series<bar>.colors","title":"colors","parent":"series<bar>","isParent":false,"returnType":"Array<Color>","defaults":"","values":"","since":"3.0","description":"A series specific or series type specific color set to apply instead of the global <a href=\"#colors\">colors</a> when <a href=\"#plotOptions.column.colorByPoint\">colorByPoint</a> is true.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pie>--colors","fullname":"series<pie>.colors","title":"colors","parent":"series<pie>","isParent":false,"returnType":"Array<Color>","since":"3.0","description":"A series specific or series type specific color set to use instead of the global <a href=\"#colors\">colors</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/pie-monochrome/\" target=\"_blank\">Set default colors for all pies</a>","deprecated":false},{"name":"series<boxplot>--colors","fullname":"series<boxplot>.colors","title":"colors","parent":"series<boxplot>","isParent":false,"returnType":"Array<Color>","defaults":"","values":"","since":"3.0","description":"A series specific or series type specific color set to apply instead of the global <a href=\"#colors\">colors</a> when <a href=\"#plotOptions.column.colorByPoint\">colorByPoint</a> is true.","demo":"","seeAlso":"","deprecated":false},{"name":"series<heatmap>--colors","fullname":"series<heatmap>.colors","title":"colors","parent":"series<heatmap>","isParent":false,"returnType":"Array<Color>","defaults":"","values":"","since":"3.0","description":"A series specific or series type specific color set to apply instead of the global <a href=\"#colors\">colors</a> when <a href=\"#plotOptions.column.colorByPoint\">colorByPoint</a> is true.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange--colors","fullname":"plotOptions.columnrange.colors","title":"colors","parent":"plotOptions-columnrange","isParent":false,"returnType":"Array<Color>","defaults":"","values":"","since":"3.0","description":"A series specific or series type specific color set to apply instead of the global <a href=\"#colors\">colors</a> when <a href=\"#plotOptions.column.colorByPoint\">colorByPoint</a> is true.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column--colors","fullname":"plotOptions.column.colors","title":"colors","parent":"plotOptions-column","isParent":false,"returnType":"Array<Color>","defaults":"","values":"","since":"3.0","description":"A series specific or series type specific color set to apply instead of the global <a href=\"#colors\">colors</a> when <a href=\"#plotOptions.column.colorByPoint\">colorByPoint</a> is true.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid--colors","fullname":"plotOptions.pyramid.colors","title":"colors","parent":"plotOptions-pyramid","isParent":false,"returnType":"Array<Color>","since":"3.0","description":"A series specific or series type specific color set to use instead of the global <a href=\"#colors\">colors</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/pie-monochrome/\" target=\"_blank\">Set default colors for all pies</a>","deprecated":false},{"name":"plotOptions-waterfall--colors","fullname":"plotOptions.waterfall.colors","title":"colors","parent":"plotOptions-waterfall","isParent":false,"returnType":"Array<Color>","defaults":"","values":"","since":"3.0","description":"A series specific or series type specific color set to apply instead of the global <a href=\"#colors\">colors</a> when <a href=\"#plotOptions.column.colorByPoint\">colorByPoint</a> is true.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pie--colors","fullname":"plotOptions.pie.colors","title":"colors","parent":"plotOptions-pie","isParent":false,"returnType":"Array<Color>","since":"3.0","description":"A series specific or series type specific color set to use instead of the global <a href=\"#colors\">colors</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/pie-monochrome/\" target=\"_blank\">Set default colors for all pies</a>","deprecated":false},{"name":"plotOptions-bar--colors","fullname":"plotOptions.bar.colors","title":"colors","parent":"plotOptions-bar","isParent":false,"returnType":"Array<Color>","defaults":"","values":"","since":"3.0","description":"A series specific or series type specific color set to apply instead of the global <a href=\"#colors\">colors</a> when <a href=\"#plotOptions.column.colorByPoint\">colorByPoint</a> is true.","demo":"","seeAlso":"","deprecated":false},{"name":"series<column>--colors","fullname":"series<column>.colors","title":"colors","parent":"series<column>","isParent":false,"returnType":"Array<Color>","defaults":"","values":"","since":"3.0","description":"A series specific or series type specific color set to apply instead of the global <a href=\"#colors\">colors</a> when <a href=\"#plotOptions.column.colorByPoint\">colorByPoint</a> is true.","demo":"","seeAlso":"","deprecated":false},{"name":"series<treemap>--colors","fullname":"series<treemap>.colors","title":"colors","parent":"series<treemap>","isParent":false,"returnType":"Array<Color>","defaults":"","values":"","since":"3.0","description":"A series specific or series type specific color set to apply instead of the global <a href=\"#colors\">colors</a> when <a href=\"#plotOptions.column.colorByPoint\">colorByPoint</a> is true.","demo":"","seeAlso":"","deprecated":false},{"name":"series<waterfall>--colors","fullname":"series<waterfall>.colors","title":"colors","parent":"series<waterfall>","isParent":false,"returnType":"Array<Color>","defaults":"","values":"","since":"3.0","description":"A series specific or series type specific color set to apply instead of the global <a href=\"#colors\">colors</a> when <a href=\"#plotOptions.column.colorByPoint\">colorByPoint</a> is true.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap--colors","fullname":"plotOptions.treemap.colors","title":"colors","parent":"plotOptions-treemap","isParent":false,"returnType":"Array<Color>","defaults":"","values":"","since":"3.0","description":"A series specific or series type specific color set to apply instead of the global <a href=\"#colors\">colors</a> when <a href=\"#plotOptions.column.colorByPoint\">colorByPoint</a> is true.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot--colors","fullname":"plotOptions.boxplot.colors","title":"colors","parent":"plotOptions-boxplot","isParent":false,"returnType":"Array<Color>","defaults":"","values":"","since":"3.0","description":"A series specific or series type specific color set to apply instead of the global <a href=\"#colors\">colors</a> when <a href=\"#plotOptions.column.colorByPoint\">colorByPoint</a> is true.","demo":"","seeAlso":"","deprecated":false},{"name":"series<errorbar>--colors","fullname":"series<errorbar>.colors","title":"colors","parent":"series<errorbar>","isParent":false,"returnType":"Array<Color>","defaults":"","values":"","since":"3.0","description":"A series specific or series type specific color set to apply instead of the global <a href=\"#colors\">colors</a> when <a href=\"#plotOptions.column.colorByPoint\">colorByPoint</a> is true.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar--colors","fullname":"plotOptions.errorbar.colors","title":"colors","parent":"plotOptions-errorbar","isParent":false,"returnType":"Array<Color>","defaults":"","values":"","since":"3.0","description":"A series specific or series type specific color set to apply instead of the global <a href=\"#colors\">colors</a> when <a href=\"#plotOptions.column.colorByPoint\">colorByPoint</a> is true.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap--colors","fullname":"plotOptions.heatmap.colors","title":"colors","parent":"plotOptions-heatmap","isParent":false,"returnType":"Array<Color>","defaults":"","values":"","since":"3.0","description":"A series specific or series type specific color set to apply instead of the global <a href=\"#colors\">colors</a> when <a href=\"#plotOptions.column.colorByPoint\">colorByPoint</a> is true.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pyramid>--colors","fullname":"series<pyramid>.colors","title":"colors","parent":"series<pyramid>","isParent":false,"returnType":"Array<Color>","since":"3.0","description":"A series specific or series type specific color set to use instead of the global <a href=\"#colors\">colors</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/pie-monochrome/\" target=\"_blank\">Set default colors for all pies</a>","deprecated":false},{"name":"plotOptions-heatmap--colsize","fullname":"plotOptions.heatmap.colsize","title":"colsize","parent":"plotOptions-heatmap","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0","description":"The column size - how many X axis units each column in the heatmap should span.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/maps/demo/heatmap/\" target=\"_blank\">One day</a>","seeAlso":"","deprecated":false},{"name":"series<heatmap>--colsize","fullname":"series<heatmap>.colsize","title":"colsize","parent":"series<heatmap>","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0","description":"The column size - how many X axis units each column in the heatmap should span.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/maps/demo/heatmap/\" target=\"_blank\">One day</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-column","fullname":"plotOptions.column","title":"column","parent":"plotOptions","isParent":true,"returnType":"","defaults":"","since":"","description":"","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange","fullname":"plotOptions.columnrange","title":"columnrange","parent":"plotOptions","isParent":true,"returnType":"Object","since":"2.3.0","description":"The column range is a cartesian series type with higher and lower Y values along an X axis. Requires <code>highcharts-more.js</code>. To display horizontal bars, set <a href=\"#chart.inverted\">chart.inverted</a> to <code>true</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/columnrange/\" target=\"_blank\">Inverted column range</a>","deprecated":false},{"name":"data--columns","fullname":"data.columns","title":"columns","parent":"data","isParent":false,"returnType":"Array<Array<Mixed>>","defaults":"","values":"","since":"4.0","description":"A two-dimensional array representing the input data on tabular form. This input can be used when the data is already parsed, for example from a grid view component. Each cell can be a string or number. If not switchRowsAndColumns is set, the columns are interpreted as series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/data/columns/\" target=\"_blank\">Columns</a>","seeAlso":"<a href=\"#data.rows\">data.rows</a>","deprecated":false},{"name":"data--complete","fullname":"data.complete","title":"complete","parent":"data","isParent":false,"returnType":"Function","defaults":"","values":"","since":"4.0","description":"The callback that is evaluated when the data is finished loading, optionally from an external source, and parsed. The first argument passed is a finished chart options object, containing the series. These options can be extended with additional options and passed directly to the chart constructor.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/data/complete/\" target=\"_blank\">Modify data on complete</a>","seeAlso":"<a href=\"#data.parsed\">data.parsed</a>","deprecated":false},{"name":"series<line>--connectEnds","fullname":"series<line>.connectEnds","title":"connectEnds","parent":"series<line>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Polar charts only. Whether to connect the ends of a line series plot across the extremes.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/line-connectends-false/\" target=\"_blank\">Do not connect</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline--connectEnds","fullname":"plotOptions.areaspline.connectEnds","title":"connectEnds","parent":"plotOptions-areaspline","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Polar charts only. Whether to connect the ends of a line series plot across the extremes.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/line-connectends-false/\" target=\"_blank\">Do not connect</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-line--connectEnds","fullname":"plotOptions.line.connectEnds","title":"connectEnds","parent":"plotOptions-line","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Polar charts only. Whether to connect the ends of a line series plot across the extremes.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/line-connectends-false/\" target=\"_blank\">Do not connect</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-spline--connectEnds","fullname":"plotOptions.spline.connectEnds","title":"connectEnds","parent":"plotOptions-spline","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Polar charts only. Whether to connect the ends of a line series plot across the extremes.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/line-connectends-false/\" target=\"_blank\">Do not connect</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-series--connectEnds","fullname":"plotOptions.series.connectEnds","title":"connectEnds","parent":"plotOptions-series","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Polar charts only. Whether to connect the ends of a line series plot across the extremes.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/line-connectends-false/\" target=\"_blank\">Do not connect</a>","seeAlso":"","deprecated":false},{"name":"series<spline>--connectEnds","fullname":"series<spline>.connectEnds","title":"connectEnds","parent":"series<spline>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Polar charts only. Whether to connect the ends of a line series plot across the extremes.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/line-connectends-false/\" target=\"_blank\">Do not connect</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-area--connectEnds","fullname":"plotOptions.area.connectEnds","title":"connectEnds","parent":"plotOptions-area","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Polar charts only. Whether to connect the ends of a line series plot across the extremes.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/line-connectends-false/\" target=\"_blank\">Do not connect</a>","seeAlso":"","deprecated":false},{"name":"series<areaspline>--connectEnds","fullname":"series<areaspline>.connectEnds","title":"connectEnds","parent":"series<areaspline>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Polar charts only. Whether to connect the ends of a line series plot across the extremes.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/line-connectends-false/\" target=\"_blank\">Do not connect</a>","seeAlso":"","deprecated":false},{"name":"series<area>--connectEnds","fullname":"series<area>.connectEnds","title":"connectEnds","parent":"series<area>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Polar charts only. Whether to connect the ends of a line series plot across the extremes.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/line-connectends-false/\" target=\"_blank\">Do not connect</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline--connectNulls","fullname":"plotOptions.areaspline.connectNulls","title":"connectNulls","parent":"plotOptions-areaspline","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to connect a graph line across null points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-false/\" target=\"_blank\">False by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-true/\" target=\"_blank\">true</a>"},{"name":"plotOptions-areasplinerange--connectNulls","fullname":"plotOptions.areasplinerange.connectNulls","title":"connectNulls","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to connect a graph line across null points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-false/\" target=\"_blank\">False by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-true/\" target=\"_blank\">true</a>"},{"name":"plotOptions-line--connectNulls","fullname":"plotOptions.line.connectNulls","title":"connectNulls","parent":"plotOptions-line","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to connect a graph line across null points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-false/\" target=\"_blank\">False by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-true/\" target=\"_blank\">true</a>"},{"name":"series<areasplinerange>--connectNulls","fullname":"series<areasplinerange>.connectNulls","title":"connectNulls","parent":"series<areasplinerange>","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to connect a graph line across null points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-false/\" target=\"_blank\">False by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-true/\" target=\"_blank\">true</a>"},{"name":"series<arearange>--connectNulls","fullname":"series<arearange>.connectNulls","title":"connectNulls","parent":"series<arearange>","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to connect a graph line across null points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-false/\" target=\"_blank\">False by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-true/\" target=\"_blank\">true</a>"},{"name":"series<spline>--connectNulls","fullname":"series<spline>.connectNulls","title":"connectNulls","parent":"series<spline>","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to connect a graph line across null points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-false/\" target=\"_blank\">False by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-true/\" target=\"_blank\">true</a>"},{"name":"plotOptions-arearange--connectNulls","fullname":"plotOptions.arearange.connectNulls","title":"connectNulls","parent":"plotOptions-arearange","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to connect a graph line across null points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-false/\" target=\"_blank\">False by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-true/\" target=\"_blank\">true</a>"},{"name":"series<line>--connectNulls","fullname":"series<line>.connectNulls","title":"connectNulls","parent":"series<line>","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to connect a graph line across null points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-false/\" target=\"_blank\">False by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-true/\" target=\"_blank\">true</a>"},{"name":"plotOptions-series--connectNulls","fullname":"plotOptions.series.connectNulls","title":"connectNulls","parent":"plotOptions-series","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to connect a graph line across null points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-false/\" target=\"_blank\">False by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-true/\" target=\"_blank\">true</a>"},{"name":"series<area>--connectNulls","fullname":"series<area>.connectNulls","title":"connectNulls","parent":"series<area>","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to connect a graph line across null points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-false/\" target=\"_blank\">False by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-true/\" target=\"_blank\">true</a>"},{"name":"plotOptions-spline--connectNulls","fullname":"plotOptions.spline.connectNulls","title":"connectNulls","parent":"plotOptions-spline","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to connect a graph line across null points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-false/\" target=\"_blank\">False by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-true/\" target=\"_blank\">true</a>"},{"name":"series<areaspline>--connectNulls","fullname":"series<areaspline>.connectNulls","title":"connectNulls","parent":"series<areaspline>","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to connect a graph line across null points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-false/\" target=\"_blank\">False by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-true/\" target=\"_blank\">true</a>"},{"name":"plotOptions-area--connectNulls","fullname":"plotOptions.area.connectNulls","title":"connectNulls","parent":"plotOptions-area","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to connect a graph line across null points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-false/\" target=\"_blank\">False by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-connectnulls-true/\" target=\"_blank\">true</a>"},{"name":"plotOptions-funnel-dataLabels--connectorColor","fullname":"plotOptions.funnel.dataLabels.connectorColor","title":"connectorColor","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"String","defaults":"{point.color}","since":"2.1","description":"The color of the line connecting the data label to the pie slice. The default color is the same as the point's color.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-connectorcolor/\" target=\"_blank\">Blue connectors</a>"},{"name":"series<pie>-dataLabels--connectorColor","fullname":"series<pie>.dataLabels.connectorColor","title":"connectorColor","parent":"series<pie>-dataLabels","isParent":false,"returnType":"String","defaults":"{point.color}","since":"2.1","description":"The color of the line connecting the data label to the pie slice. The default color is the same as the point's color.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-connectorcolor/\" target=\"_blank\">Blue connectors</a>"},{"name":"plotOptions-pie-dataLabels--connectorColor","fullname":"plotOptions.pie.dataLabels.connectorColor","title":"connectorColor","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"String","defaults":"{point.color}","since":"2.1","description":"The color of the line connecting the data label to the pie slice. The default color is the same as the point's color.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-connectorcolor/\" target=\"_blank\">Blue connectors</a>"},{"name":"series<funnel>-dataLabels--connectorColor","fullname":"series<funnel>.dataLabels.connectorColor","title":"connectorColor","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"String","defaults":"{point.color}","since":"2.1","description":"The color of the line connecting the data label to the pie slice. The default color is the same as the point's color.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-connectorcolor/\" target=\"_blank\">Blue connectors</a>"},{"name":"plotOptions-pyramid-dataLabels--connectorColor","fullname":"plotOptions.pyramid.dataLabels.connectorColor","title":"connectorColor","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"String","defaults":"{point.color}","since":"2.1","description":"The color of the line connecting the data label to the pie slice. The default color is the same as the point's color.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-connectorcolor/\" target=\"_blank\">Blue connectors</a>"},{"name":"series<pyramid>-dataLabels--connectorColor","fullname":"series<pyramid>.dataLabels.connectorColor","title":"connectorColor","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"String","defaults":"{point.color}","since":"2.1","description":"The color of the line connecting the data label to the pie slice. The default color is the same as the point's color.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-connectorcolor/\" target=\"_blank\">Blue connectors</a>"},{"name":"series<funnel>-dataLabels--connectorPadding","fullname":"series<funnel>.dataLabels.connectorPadding","title":"connectorPadding","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.1","description":"The distance from the data label to the connector.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-connectorpadding/\" target=\"_blank\">No padding</a>"},{"name":"series<pie>-dataLabels--connectorPadding","fullname":"series<pie>.dataLabels.connectorPadding","title":"connectorPadding","parent":"series<pie>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.1","description":"The distance from the data label to the connector.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-connectorpadding/\" target=\"_blank\">No padding</a>"},{"name":"plotOptions-pie-dataLabels--connectorPadding","fullname":"plotOptions.pie.dataLabels.connectorPadding","title":"connectorPadding","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.1","description":"The distance from the data label to the connector.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-connectorpadding/\" target=\"_blank\">No padding</a>"},{"name":"plotOptions-funnel-dataLabels--connectorPadding","fullname":"plotOptions.funnel.dataLabels.connectorPadding","title":"connectorPadding","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.1","description":"The distance from the data label to the connector.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-connectorpadding/\" target=\"_blank\">No padding</a>"},{"name":"plotOptions-pyramid-dataLabels--connectorPadding","fullname":"plotOptions.pyramid.dataLabels.connectorPadding","title":"connectorPadding","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.1","description":"The distance from the data label to the connector.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-connectorpadding/\" target=\"_blank\">No padding</a>"},{"name":"series<pyramid>-dataLabels--connectorPadding","fullname":"series<pyramid>.dataLabels.connectorPadding","title":"connectorPadding","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.1","description":"The distance from the data label to the connector.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-connectorpadding/\" target=\"_blank\">No padding</a>"},{"name":"plotOptions-pie-dataLabels--connectorWidth","fullname":"plotOptions.pie.dataLabels.connectorWidth","title":"connectorWidth","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"Number","defaults":"1","since":"2.1","description":"The width of the line connecting the data label to the pie slice.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-connectorwidth-disabled/\" target=\"_blank\">Disable the connector</a>"},{"name":"series<pyramid>-dataLabels--connectorWidth","fullname":"series<pyramid>.dataLabels.connectorWidth","title":"connectorWidth","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"Number","defaults":"1","since":"2.1","description":"The width of the line connecting the data label to the pie slice.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-connectorwidth-disabled/\" target=\"_blank\">Disable the connector</a>"},{"name":"series<pie>-dataLabels--connectorWidth","fullname":"series<pie>.dataLabels.connectorWidth","title":"connectorWidth","parent":"series<pie>-dataLabels","isParent":false,"returnType":"Number","defaults":"1","since":"2.1","description":"The width of the line connecting the data label to the pie slice.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-connectorwidth-disabled/\" target=\"_blank\">Disable the connector</a>"},{"name":"plotOptions-funnel-dataLabels--connectorWidth","fullname":"plotOptions.funnel.dataLabels.connectorWidth","title":"connectorWidth","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"Number","defaults":"1","since":"2.1","description":"The width of the line connecting the data label to the pie slice.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-connectorwidth-disabled/\" target=\"_blank\">Disable the connector</a>"},{"name":"plotOptions-pyramid-dataLabels--connectorWidth","fullname":"plotOptions.pyramid.dataLabels.connectorWidth","title":"connectorWidth","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"Number","defaults":"1","since":"2.1","description":"The width of the line connecting the data label to the pie slice.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-connectorwidth-disabled/\" target=\"_blank\">Disable the connector</a>"},{"name":"series<funnel>-dataLabels--connectorWidth","fullname":"series<funnel>.dataLabels.connectorWidth","title":"connectorWidth","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"Number","defaults":"1","since":"2.1","description":"The width of the line connecting the data label to the pie slice.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-connectorwidth-disabled/\" target=\"_blank\">Disable the connector</a>"},{"name":"exporting-buttons-contextButton","fullname":"exporting.buttons.contextButton","title":"contextButton","parent":"exporting-buttons","isParent":true,"description":"Options for the export button."},{"name":"lang--contextButtonTitle","fullname":"lang.contextButtonTitle","title":"contextButtonTitle","parent":"lang","isParent":false,"returnType":"String","defaults":"Chart context menu","values":"","since":"3.0","description":"Exporting module menu. The tooltip title for the context menu holding print and export menu items.","demo":"","seeAlso":"","deprecated":false},{"name":"credits","fullname":"credits","title":"credits","isParent":true,"description":"Highchart by default puts a credits label in the lower right corner of the chart.\n\t\tThis can be changed using these options."},{"name":"plotOptions-columnrange-dataLabels--crop","fullname":"plotOptions.columnrange.dataLabels.crop","title":"crop","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange-dataLabels--crop","fullname":"plotOptions.arearange.dataLabels.crop","title":"crop","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels--crop","fullname":"plotOptions.areasplinerange.dataLabels.crop","title":"crop","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"series<treemap>-dataLabels--crop","fullname":"series<treemap>.dataLabels.crop","title":"crop","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"series<heatmap>-dataLabels--crop","fullname":"series<heatmap>.dataLabels.crop","title":"crop","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap-dataLabels--crop","fullname":"plotOptions.treemap.dataLabels.crop","title":"crop","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pie-dataLabels--crop","fullname":"plotOptions.pie.dataLabels.crop","title":"crop","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap-dataLabels--crop","fullname":"plotOptions.heatmap.dataLabels.crop","title":"crop","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bubble>-dataLabels--crop","fullname":"series<bubble>.dataLabels.crop","title":"crop","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-dataLabels--crop","fullname":"series<areasplinerange>.dataLabels.crop","title":"crop","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pie>-dataLabels--crop","fullname":"series<pie>.dataLabels.crop","title":"crop","parent":"series<pie>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"series<solidgauge>-dataLabels--crop","fullname":"series<solidgauge>.dataLabels.crop","title":"crop","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"series<scatter>-dataLabels--crop","fullname":"series<scatter>.dataLabels.crop","title":"crop","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"series<line>-dataLabels--crop","fullname":"series<line>.dataLabels.crop","title":"crop","parent":"series<line>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>-dataLabels--crop","fullname":"series<spline>.dataLabels.crop","title":"crop","parent":"series<spline>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bar>-dataLabels--crop","fullname":"series<bar>.dataLabels.crop","title":"crop","parent":"series<bar>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-dataLabels--crop","fullname":"plotOptions.areaspline.dataLabels.crop","title":"crop","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel-dataLabels--crop","fullname":"plotOptions.funnel.dataLabels.crop","title":"crop","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"series<area>-dataLabels--crop","fullname":"series<area>.dataLabels.crop","title":"crop","parent":"series<area>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"series<columnrange>-dataLabels--crop","fullname":"series<columnrange>.dataLabels.crop","title":"crop","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble-dataLabels--crop","fullname":"plotOptions.bubble.dataLabels.crop","title":"crop","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"series<waterfall>-dataLabels--crop","fullname":"series<waterfall>.dataLabels.crop","title":"crop","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-dataLabels--crop","fullname":"plotOptions.pyramid.dataLabels.crop","title":"crop","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-dataLabels--crop","fullname":"plotOptions.spline.dataLabels.crop","title":"crop","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-solidgauge-dataLabels--crop","fullname":"plotOptions.solidgauge.dataLabels.crop","title":"crop","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"series<column>-dataLabels--crop","fullname":"series<column>.dataLabels.crop","title":"crop","parent":"series<column>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"series<arearange>-dataLabels--crop","fullname":"series<arearange>.dataLabels.crop","title":"crop","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-area-dataLabels--crop","fullname":"plotOptions.area.dataLabels.crop","title":"crop","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-line-dataLabels--crop","fullname":"plotOptions.line.dataLabels.crop","title":"crop","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge-dataLabels--crop","fullname":"plotOptions.gauge.dataLabels.crop","title":"crop","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areaspline>-dataLabels--crop","fullname":"series<areaspline>.dataLabels.crop","title":"crop","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-series-dataLabels--crop","fullname":"plotOptions.series.dataLabels.crop","title":"crop","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"series<gauge>-dataLabels--crop","fullname":"series<gauge>.dataLabels.crop","title":"crop","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter-dataLabels--crop","fullname":"plotOptions.scatter.dataLabels.crop","title":"crop","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"series<polygon>-dataLabels--crop","fullname":"series<polygon>.dataLabels.crop","title":"crop","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column-dataLabels--crop","fullname":"plotOptions.column.dataLabels.crop","title":"crop","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall-dataLabels--crop","fullname":"plotOptions.waterfall.dataLabels.crop","title":"crop","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bar-dataLabels--crop","fullname":"plotOptions.bar.dataLabels.crop","title":"crop","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"series<funnel>-dataLabels--crop","fullname":"series<funnel>.dataLabels.crop","title":"crop","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pyramid>-dataLabels--crop","fullname":"series<pyramid>.dataLabels.crop","title":"crop","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-dataLabels--crop","fullname":"plotOptions.polygon.dataLabels.crop","title":"crop","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.3","description":"Whether to hide data labels that are outside the plot area. By default, the data label is moved inside the plot area according to the <a href=\"#plotOptions.series.dataLabels.overflow\">overflow</a> option.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column--cropThreshold","fullname":"plotOptions.column.cropThreshold","title":"cropThreshold","parent":"plotOptions-column","isParent":false,"returnType":"Number","defaults":"50","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"plotOptions-treemap--cropThreshold","fullname":"plotOptions.treemap.cropThreshold","title":"cropThreshold","parent":"plotOptions-treemap","isParent":false,"returnType":"Number","context":"","defaults":"300","values":"","since":"4.1.0","description":"When the series contains less points than the crop threshold, all points are drawn, event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bar--cropThreshold","fullname":"plotOptions.bar.cropThreshold","title":"cropThreshold","parent":"plotOptions-bar","isParent":false,"returnType":"Number","defaults":"50","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"series<heatmap>--cropThreshold","fullname":"series<heatmap>.cropThreshold","title":"cropThreshold","parent":"series<heatmap>","isParent":false,"returnType":"Number","defaults":"50","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"series<scatter>--cropThreshold","fullname":"series<scatter>.cropThreshold","title":"cropThreshold","parent":"series<scatter>","isParent":false,"returnType":"Number","defaults":"300","since":"2.2","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"plotOptions-spline--cropThreshold","fullname":"plotOptions.spline.cropThreshold","title":"cropThreshold","parent":"plotOptions-spline","isParent":false,"returnType":"Number","defaults":"300","since":"2.2","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"plotOptions-line--cropThreshold","fullname":"plotOptions.line.cropThreshold","title":"cropThreshold","parent":"plotOptions-line","isParent":false,"returnType":"Number","defaults":"300","since":"2.2","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"series<areasplinerange>--cropThreshold","fullname":"series<areasplinerange>.cropThreshold","title":"cropThreshold","parent":"series<areasplinerange>","isParent":false,"returnType":"Number","defaults":"300","since":"2.2","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"series<areaspline>--cropThreshold","fullname":"series<areaspline>.cropThreshold","title":"cropThreshold","parent":"series<areaspline>","isParent":false,"returnType":"Number","defaults":"300","since":"2.2","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"plotOptions-series--cropThreshold","fullname":"plotOptions.series.cropThreshold","title":"cropThreshold","parent":"plotOptions-series","isParent":false,"returnType":"Number","defaults":"300","since":"2.2","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"plotOptions-areasplinerange--cropThreshold","fullname":"plotOptions.areasplinerange.cropThreshold","title":"cropThreshold","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"Number","defaults":"300","since":"2.2","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"plotOptions-bubble--cropThreshold","fullname":"plotOptions.bubble.cropThreshold","title":"cropThreshold","parent":"plotOptions-bubble","isParent":false,"returnType":"Number","defaults":"300","since":"2.2","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"series<area>--cropThreshold","fullname":"series<area>.cropThreshold","title":"cropThreshold","parent":"series<area>","isParent":false,"returnType":"Number","defaults":"300","since":"2.2","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"plotOptions-polygon--cropThreshold","fullname":"plotOptions.polygon.cropThreshold","title":"cropThreshold","parent":"plotOptions-polygon","isParent":false,"returnType":"Number","defaults":"300","since":"2.2","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"series<line>--cropThreshold","fullname":"series<line>.cropThreshold","title":"cropThreshold","parent":"series<line>","isParent":false,"returnType":"Number","defaults":"300","since":"2.2","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"series<treemap>--cropThreshold","fullname":"series<treemap>.cropThreshold","title":"cropThreshold","parent":"series<treemap>","isParent":false,"returnType":"Number","context":"","defaults":"300","values":"","since":"4.1.0","description":"When the series contains less points than the crop threshold, all points are drawn, event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<column>--cropThreshold","fullname":"series<column>.cropThreshold","title":"cropThreshold","parent":"series<column>","isParent":false,"returnType":"Number","defaults":"50","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"series<bubble>--cropThreshold","fullname":"series<bubble>.cropThreshold","title":"cropThreshold","parent":"series<bubble>","isParent":false,"returnType":"Number","defaults":"300","since":"2.2","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"plotOptions-columnrange--cropThreshold","fullname":"plotOptions.columnrange.cropThreshold","title":"cropThreshold","parent":"plotOptions-columnrange","isParent":false,"returnType":"Number","defaults":"50","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"plotOptions-areaspline--cropThreshold","fullname":"plotOptions.areaspline.cropThreshold","title":"cropThreshold","parent":"plotOptions-areaspline","isParent":false,"returnType":"Number","defaults":"300","since":"2.2","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"plotOptions-heatmap--cropThreshold","fullname":"plotOptions.heatmap.cropThreshold","title":"cropThreshold","parent":"plotOptions-heatmap","isParent":false,"returnType":"Number","defaults":"50","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"series<spline>--cropThreshold","fullname":"series<spline>.cropThreshold","title":"cropThreshold","parent":"series<spline>","isParent":false,"returnType":"Number","defaults":"300","since":"2.2","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"plotOptions-scatter--cropThreshold","fullname":"plotOptions.scatter.cropThreshold","title":"cropThreshold","parent":"plotOptions-scatter","isParent":false,"returnType":"Number","defaults":"300","since":"2.2","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"series<arearange>--cropThreshold","fullname":"series<arearange>.cropThreshold","title":"cropThreshold","parent":"series<arearange>","isParent":false,"returnType":"Number","defaults":"300","since":"2.2","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"plotOptions-arearange--cropThreshold","fullname":"plotOptions.arearange.cropThreshold","title":"cropThreshold","parent":"plotOptions-arearange","isParent":false,"returnType":"Number","defaults":"300","since":"2.2","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"series<bar>--cropThreshold","fullname":"series<bar>.cropThreshold","title":"cropThreshold","parent":"series<bar>","isParent":false,"returnType":"Number","defaults":"50","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"series<polygon>--cropThreshold","fullname":"series<polygon>.cropThreshold","title":"cropThreshold","parent":"series<polygon>","isParent":false,"returnType":"Number","defaults":"300","since":"2.2","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"plotOptions-area--cropThreshold","fullname":"plotOptions.area.cropThreshold","title":"cropThreshold","parent":"plotOptions-area","isParent":false,"returnType":"Number","defaults":"300","since":"2.2","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"series<columnrange>--cropThreshold","fullname":"series<columnrange>.cropThreshold","title":"cropThreshold","parent":"series<columnrange>","isParent":false,"returnType":"Number","defaults":"50","description":"When the series contains less points than the crop threshold, all points are drawn,  event if the points fall outside the visible plot area at the current zoom. The advantage of drawing all points (including markers and columns), is that animation is performed on updates. On the other hand, when the series contains more points than the crop threshold, the series data is cropped to only contain points that fall within the plot area. The advantage of cropping away invisible points is to increase performance on large series.  ."},{"name":"tooltip--crosshairs","fullname":"tooltip.crosshairs","title":"crosshairs","parent":"tooltip","isParent":false,"returnType":"Mixed","description":"Display crosshairs to connect the points with their corresponding axis values. The crosshairs can be defined as a boolean, an array of booleans or an object. <dl> \t<dt>Boolean</dt> \t<dd>If the crosshairs option is true, a single crosshair relating to the \tx axis will be shown.</dd> \t \t<dt>Array of booleans</dt> \t<dd>In an array of booleans, the first value turns on the x axis crosshair and the second \tvalue to the y axis crosshair. Use <code>[true, true]</code> to show complete crosshairs.</dd> \t \t<dt>Array of objects</dt> \t<dd>In an array of objects, the first value applies to the x axis crosshair and the second \tvalue to the y axis crosshair. For each dimension, a <code>width</code>, <code>color</code>, \t<code><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\">dashStyle</a></code> and <code>zIndex</code> can be given.</dd>\n\t\t</dl> Defaults to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/crosshairs-x/\" target=\"_blank\">Enable a crosshair for the x value</a>;\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/crosshairs-both/\" target=\"_blank\">true two-dimensional crosshairs</a>;\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/crosshairs-customized/\" target=\"_blank\">customized crosshairs</a>;\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/crosshairs-dotted/\" target=\"_blank\">dotted crosshair for x axis</a>."},{"name":"data--csv","fullname":"data.csv","title":"csv","parent":"data","isParent":false,"returnType":"String","defaults":"","values":"","since":"4.0","description":"A comma delimited string to be parsed. Related options are <a href=\"#data.startRow\">startRow</a>, <a href=\"#data.endRow\">endRow</a>, <a href=\"#data.startColumn\">startColumn</a> and <a href=\"#data.endColumn\">endColumn</a> to delimit what part of the table is used. The <a href=\"#data.lineDelimiter\">lineDelimiter</a> and <a href=\"#data.itemDelimiter\">itemDelimiter</a> options define the CSV delimiter formats.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/data/csv/\" target=\"_blank\">Data from CSV</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-pie--cursor","fullname":"plotOptions.pie.cursor","title":"cursor","parent":"plotOptions-pie","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"series<area>--cursor","fullname":"series<area>.cursor","title":"cursor","parent":"series<area>","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"series<boxplot>--cursor","fullname":"series<boxplot>.cursor","title":"cursor","parent":"series<boxplot>","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"series<line>--cursor","fullname":"series<line>.cursor","title":"cursor","parent":"series<line>","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"series<gauge>--cursor","fullname":"series<gauge>.cursor","title":"cursor","parent":"series<gauge>","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"plotOptions-gauge--cursor","fullname":"plotOptions.gauge.cursor","title":"cursor","parent":"plotOptions-gauge","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"plotOptions-columnrange--cursor","fullname":"plotOptions.columnrange.cursor","title":"cursor","parent":"plotOptions-columnrange","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"plotOptions-column--cursor","fullname":"plotOptions.column.cursor","title":"cursor","parent":"plotOptions-column","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"plotOptions-heatmap--cursor","fullname":"plotOptions.heatmap.cursor","title":"cursor","parent":"plotOptions-heatmap","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"series<solidgauge>--cursor","fullname":"series<solidgauge>.cursor","title":"cursor","parent":"series<solidgauge>","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"series<pyramid>--cursor","fullname":"series<pyramid>.cursor","title":"cursor","parent":"series<pyramid>","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"series<areaspline>--cursor","fullname":"series<areaspline>.cursor","title":"cursor","parent":"series<areaspline>","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"plotOptions-polygon--cursor","fullname":"plotOptions.polygon.cursor","title":"cursor","parent":"plotOptions-polygon","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"plotOptions-line--cursor","fullname":"plotOptions.line.cursor","title":"cursor","parent":"plotOptions-line","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"plotOptions-boxplot--cursor","fullname":"plotOptions.boxplot.cursor","title":"cursor","parent":"plotOptions-boxplot","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"series<waterfall>--cursor","fullname":"series<waterfall>.cursor","title":"cursor","parent":"series<waterfall>","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"series<funnel>--cursor","fullname":"series<funnel>.cursor","title":"cursor","parent":"series<funnel>","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"series<arearange>--cursor","fullname":"series<arearange>.cursor","title":"cursor","parent":"series<arearange>","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"plotOptions-area--cursor","fullname":"plotOptions.area.cursor","title":"cursor","parent":"plotOptions-area","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"plotOptions-bubble--cursor","fullname":"plotOptions.bubble.cursor","title":"cursor","parent":"plotOptions-bubble","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"plotOptions-areaspline--cursor","fullname":"plotOptions.areaspline.cursor","title":"cursor","parent":"plotOptions-areaspline","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"plotOptions-areasplinerange--cursor","fullname":"plotOptions.areasplinerange.cursor","title":"cursor","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"series<bubble>--cursor","fullname":"series<bubble>.cursor","title":"cursor","parent":"series<bubble>","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"plotOptions-pyramid--cursor","fullname":"plotOptions.pyramid.cursor","title":"cursor","parent":"plotOptions-pyramid","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"plotOptions-spline--cursor","fullname":"plotOptions.spline.cursor","title":"cursor","parent":"plotOptions-spline","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"series<polygon>--cursor","fullname":"series<polygon>.cursor","title":"cursor","parent":"series<polygon>","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"series<columnrange>--cursor","fullname":"series<columnrange>.cursor","title":"cursor","parent":"series<columnrange>","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"series<treemap>--cursor","fullname":"series<treemap>.cursor","title":"cursor","parent":"series<treemap>","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"series<spline>--cursor","fullname":"series<spline>.cursor","title":"cursor","parent":"series<spline>","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"plotOptions-waterfall--cursor","fullname":"plotOptions.waterfall.cursor","title":"cursor","parent":"plotOptions-waterfall","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"series<heatmap>--cursor","fullname":"series<heatmap>.cursor","title":"cursor","parent":"series<heatmap>","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"series<scatter>--cursor","fullname":"series<scatter>.cursor","title":"cursor","parent":"series<scatter>","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"series<errorbar>--cursor","fullname":"series<errorbar>.cursor","title":"cursor","parent":"series<errorbar>","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"plotOptions-funnel--cursor","fullname":"plotOptions.funnel.cursor","title":"cursor","parent":"plotOptions-funnel","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"plotOptions-scatter--cursor","fullname":"plotOptions.scatter.cursor","title":"cursor","parent":"plotOptions-scatter","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"plotOptions-arearange--cursor","fullname":"plotOptions.arearange.cursor","title":"cursor","parent":"plotOptions-arearange","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"plotOptions-errorbar--cursor","fullname":"plotOptions.errorbar.cursor","title":"cursor","parent":"plotOptions-errorbar","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"series<column>--cursor","fullname":"series<column>.cursor","title":"cursor","parent":"series<column>","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"plotOptions-bar--cursor","fullname":"plotOptions.bar.cursor","title":"cursor","parent":"plotOptions-bar","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"series<pie>--cursor","fullname":"series<pie>.cursor","title":"cursor","parent":"series<pie>","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"plotOptions-solidgauge--cursor","fullname":"plotOptions.solidgauge.cursor","title":"cursor","parent":"plotOptions-solidgauge","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"series<areasplinerange>--cursor","fullname":"series<areasplinerange>.cursor","title":"cursor","parent":"series<areasplinerange>","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"series<bar>--cursor","fullname":"series<bar>.cursor","title":"cursor","parent":"series<bar>","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"plotOptions-treemap--cursor","fullname":"plotOptions.treemap.cursor","title":"cursor","parent":"plotOptions-treemap","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"plotOptions-series--cursor","fullname":"plotOptions.series.cursor","title":"cursor","parent":"plotOptions-series","isParent":false,"returnType":"String","values":"[null, \"default\", \"none\", \"help\", \"pointer\", \"crosshair\"]","description":"You can set the cursor to \"pointer\" if you have click events attached to  the series, to signal to the user that the points and lines can be clicked.","demo":"Pointer cursor <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-line/\" target=\"_blank\">on line graph</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-column/\" target=\"_blank\">on columns</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-cursor-scatter/\" target=\"_blank\">on scatter markers</a>"},{"name":"plotOptions-polygon--dashStyle","fullname":"plotOptions.polygon.dashStyle","title":"dashStyle","parent":"plotOptions-polygon","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"2.1","description":"A name for the dash style to use for the graph. Applies only to series type having a graph, like <code>line</code>, <code>spline</code>, <code>area</code> and <code>scatter</code> in  case it has a <code>lineWidth</code>. The value for the <code>dashStyle</code> include:\r\n\t\t    <ul>\r\n\t\t    \t<li>Solid</li>\r\n\t\t    \t<li>ShortDash</li>\r\n\t\t    \t<li>ShortDot</li>\r\n\t\t    \t<li>ShortDashDot</li>\r\n\t\t    \t<li>ShortDashDotDot</li>\r\n\t\t    \t<li>Dot</li>\r\n\t\t    \t<li>Dash</li>\r\n\t\t    \t<li>LongDash</li>\r\n\t\t    \t<li>DashDot</li>\r\n\t\t    \t<li>LongDashDot</li>\r\n\t\t    \t<li>LongDashDotDot</li>\r\n\t\t    </ul>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\" target=\"_blank\">Possible values demonstrated</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle/\" target=\"_blank\">chart suitable for printing in black and white</a>","deprecated":false},{"name":"plotOptions-bubble-zones--dashStyle","fullname":"plotOptions.bubble.zones.dashStyle","title":"dashStyle","parent":"plotOptions-bubble-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"plotOptions-funnel-zones--dashStyle","fullname":"plotOptions.funnel.zones.dashStyle","title":"dashStyle","parent":"plotOptions-funnel-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"plotOptions-heatmap-zones--dashStyle","fullname":"plotOptions.heatmap.zones.dashStyle","title":"dashStyle","parent":"plotOptions-heatmap-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"plotOptions-column-zones--dashStyle","fullname":"plotOptions.column.zones.dashStyle","title":"dashStyle","parent":"plotOptions-column-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"plotOptions-polygon-zones--dashStyle","fullname":"plotOptions.polygon.zones.dashStyle","title":"dashStyle","parent":"plotOptions-polygon-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"plotOptions-areaspline--dashStyle","fullname":"plotOptions.areaspline.dashStyle","title":"dashStyle","parent":"plotOptions-areaspline","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"2.1","description":"A name for the dash style to use for the graph. Applies only to series type having a graph, like <code>line</code>, <code>spline</code>, <code>area</code> and <code>scatter</code> in  case it has a <code>lineWidth</code>. The value for the <code>dashStyle</code> include:\r\n\t\t    <ul>\r\n\t\t    \t<li>Solid</li>\r\n\t\t    \t<li>ShortDash</li>\r\n\t\t    \t<li>ShortDot</li>\r\n\t\t    \t<li>ShortDashDot</li>\r\n\t\t    \t<li>ShortDashDotDot</li>\r\n\t\t    \t<li>Dot</li>\r\n\t\t    \t<li>Dash</li>\r\n\t\t    \t<li>LongDash</li>\r\n\t\t    \t<li>DashDot</li>\r\n\t\t    \t<li>LongDashDot</li>\r\n\t\t    \t<li>LongDashDotDot</li>\r\n\t\t    </ul>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\" target=\"_blank\">Possible values demonstrated</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle/\" target=\"_blank\">chart suitable for printing in black and white</a>","deprecated":false},{"name":"series<treemap>-zones--dashStyle","fullname":"series<treemap>.zones.dashStyle","title":"dashStyle","parent":"series<treemap>-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<solidgauge>-zones--dashStyle","fullname":"series<solidgauge>.zones.dashStyle","title":"dashStyle","parent":"series<solidgauge>-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"plotOptions-waterfall--dashStyle","fullname":"plotOptions.waterfall.dashStyle","title":"dashStyle","parent":"plotOptions-waterfall","isParent":false,"returnType":"String","defaults":"Dot","values":"","since":"3.0","description":"A name for the dash style to use for the line connecting the columns of the waterfall series. Possible values:\r\n\t\t    <ul>\r\n\t\t    \t<li>Solid</li>\r\n\t\t    \t<li>ShortDash</li>\r\n\t\t    \t<li>ShortDot</li>\r\n\t\t    \t<li>ShortDashDot</li>\r\n\t\t    \t<li>ShortDashDotDot</li>\r\n\t\t    \t<li>Dot</li>\r\n\t\t    \t<li>Dash</li>\r\n\t\t    \t<li>LongDash</li>\r\n\t\t    \t<li>DashDot</li>\r\n\t\t    \t<li>LongDashDot</li>\r\n\t\t    \t<li>LongDashDotDot</li>\r\n\t\t    </ul>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar-zones--dashStyle","fullname":"plotOptions.errorbar.zones.dashStyle","title":"dashStyle","parent":"plotOptions-errorbar-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"plotOptions-waterfall-zones--dashStyle","fullname":"plotOptions.waterfall.zones.dashStyle","title":"dashStyle","parent":"plotOptions-waterfall-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<boxplot>-zones--dashStyle","fullname":"series<boxplot>.zones.dashStyle","title":"dashStyle","parent":"series<boxplot>-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"plotOptions-line--dashStyle","fullname":"plotOptions.line.dashStyle","title":"dashStyle","parent":"plotOptions-line","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"2.1","description":"A name for the dash style to use for the graph. Applies only to series type having a graph, like <code>line</code>, <code>spline</code>, <code>area</code> and <code>scatter</code> in  case it has a <code>lineWidth</code>. The value for the <code>dashStyle</code> include:\r\n\t\t    <ul>\r\n\t\t    \t<li>Solid</li>\r\n\t\t    \t<li>ShortDash</li>\r\n\t\t    \t<li>ShortDot</li>\r\n\t\t    \t<li>ShortDashDot</li>\r\n\t\t    \t<li>ShortDashDotDot</li>\r\n\t\t    \t<li>Dot</li>\r\n\t\t    \t<li>Dash</li>\r\n\t\t    \t<li>LongDash</li>\r\n\t\t    \t<li>DashDot</li>\r\n\t\t    \t<li>LongDashDot</li>\r\n\t\t    \t<li>LongDashDotDot</li>\r\n\t\t    </ul>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\" target=\"_blank\">Possible values demonstrated</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle/\" target=\"_blank\">chart suitable for printing in black and white</a>","deprecated":false},{"name":"series<spline>--dashStyle","fullname":"series<spline>.dashStyle","title":"dashStyle","parent":"series<spline>","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"2.1","description":"A name for the dash style to use for the graph. Applies only to series type having a graph, like <code>line</code>, <code>spline</code>, <code>area</code> and <code>scatter</code> in  case it has a <code>lineWidth</code>. The value for the <code>dashStyle</code> include:\r\n\t\t    <ul>\r\n\t\t    \t<li>Solid</li>\r\n\t\t    \t<li>ShortDash</li>\r\n\t\t    \t<li>ShortDot</li>\r\n\t\t    \t<li>ShortDashDot</li>\r\n\t\t    \t<li>ShortDashDotDot</li>\r\n\t\t    \t<li>Dot</li>\r\n\t\t    \t<li>Dash</li>\r\n\t\t    \t<li>LongDash</li>\r\n\t\t    \t<li>DashDot</li>\r\n\t\t    \t<li>LongDashDot</li>\r\n\t\t    \t<li>LongDashDotDot</li>\r\n\t\t    </ul>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\" target=\"_blank\">Possible values demonstrated</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle/\" target=\"_blank\">chart suitable for printing in black and white</a>","deprecated":false},{"name":"series<arearange>--dashStyle","fullname":"series<arearange>.dashStyle","title":"dashStyle","parent":"series<arearange>","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"2.1","description":"A name for the dash style to use for the graph. Applies only to series type having a graph, like <code>line</code>, <code>spline</code>, <code>area</code> and <code>scatter</code> in  case it has a <code>lineWidth</code>. The value for the <code>dashStyle</code> include:\r\n\t\t    <ul>\r\n\t\t    \t<li>Solid</li>\r\n\t\t    \t<li>ShortDash</li>\r\n\t\t    \t<li>ShortDot</li>\r\n\t\t    \t<li>ShortDashDot</li>\r\n\t\t    \t<li>ShortDashDotDot</li>\r\n\t\t    \t<li>Dot</li>\r\n\t\t    \t<li>Dash</li>\r\n\t\t    \t<li>LongDash</li>\r\n\t\t    \t<li>DashDot</li>\r\n\t\t    \t<li>LongDashDot</li>\r\n\t\t    \t<li>LongDashDotDot</li>\r\n\t\t    </ul>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\" target=\"_blank\">Possible values demonstrated</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle/\" target=\"_blank\">chart suitable for printing in black and white</a>","deprecated":false},{"name":"plotOptions-pie-zones--dashStyle","fullname":"plotOptions.pie.zones.dashStyle","title":"dashStyle","parent":"plotOptions-pie-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<heatmap>-zones--dashStyle","fullname":"series<heatmap>.zones.dashStyle","title":"dashStyle","parent":"series<heatmap>-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<scatter>--dashStyle","fullname":"series<scatter>.dashStyle","title":"dashStyle","parent":"series<scatter>","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"2.1","description":"A name for the dash style to use for the graph. Applies only to series type having a graph, like <code>line</code>, <code>spline</code>, <code>area</code> and <code>scatter</code> in  case it has a <code>lineWidth</code>. The value for the <code>dashStyle</code> include:\r\n\t\t    <ul>\r\n\t\t    \t<li>Solid</li>\r\n\t\t    \t<li>ShortDash</li>\r\n\t\t    \t<li>ShortDot</li>\r\n\t\t    \t<li>ShortDashDot</li>\r\n\t\t    \t<li>ShortDashDotDot</li>\r\n\t\t    \t<li>Dot</li>\r\n\t\t    \t<li>Dash</li>\r\n\t\t    \t<li>LongDash</li>\r\n\t\t    \t<li>DashDot</li>\r\n\t\t    \t<li>LongDashDot</li>\r\n\t\t    \t<li>LongDashDotDot</li>\r\n\t\t    </ul>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\" target=\"_blank\">Possible values demonstrated</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle/\" target=\"_blank\">chart suitable for printing in black and white</a>","deprecated":false},{"name":"plotOptions-area-zones--dashStyle","fullname":"plotOptions.area.zones.dashStyle","title":"dashStyle","parent":"plotOptions-area-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<bar>-zones--dashStyle","fullname":"series<bar>.zones.dashStyle","title":"dashStyle","parent":"series<bar>-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"xAxis-plotLines--dashStyle","fullname":"xAxis.plotLines.dashStyle","title":"dashStyle","parent":"xAxis-plotLines","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"1.2","description":"The dashing or dot style for the plot line. For possible values see <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\">this overview</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-dashstyle/\" target=\"_blank\">Dash and dot pattern</a>","deprecated":false},{"name":"plotOptions-areaspline-zones--dashStyle","fullname":"plotOptions.areaspline.zones.dashStyle","title":"dashStyle","parent":"plotOptions-areaspline-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"plotOptions-scatter--dashStyle","fullname":"plotOptions.scatter.dashStyle","title":"dashStyle","parent":"plotOptions-scatter","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"2.1","description":"A name for the dash style to use for the graph. Applies only to series type having a graph, like <code>line</code>, <code>spline</code>, <code>area</code> and <code>scatter</code> in  case it has a <code>lineWidth</code>. The value for the <code>dashStyle</code> include:\r\n\t\t    <ul>\r\n\t\t    \t<li>Solid</li>\r\n\t\t    \t<li>ShortDash</li>\r\n\t\t    \t<li>ShortDot</li>\r\n\t\t    \t<li>ShortDashDot</li>\r\n\t\t    \t<li>ShortDashDotDot</li>\r\n\t\t    \t<li>Dot</li>\r\n\t\t    \t<li>Dash</li>\r\n\t\t    \t<li>LongDash</li>\r\n\t\t    \t<li>DashDot</li>\r\n\t\t    \t<li>LongDashDot</li>\r\n\t\t    \t<li>LongDashDotDot</li>\r\n\t\t    </ul>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\" target=\"_blank\">Possible values demonstrated</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle/\" target=\"_blank\">chart suitable for printing in black and white</a>","deprecated":false},{"name":"plotOptions-areasplinerange-zones--dashStyle","fullname":"plotOptions.areasplinerange.zones.dashStyle","title":"dashStyle","parent":"plotOptions-areasplinerange-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<areaspline>--dashStyle","fullname":"series<areaspline>.dashStyle","title":"dashStyle","parent":"series<areaspline>","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"2.1","description":"A name for the dash style to use for the graph. Applies only to series type having a graph, like <code>line</code>, <code>spline</code>, <code>area</code> and <code>scatter</code> in  case it has a <code>lineWidth</code>. The value for the <code>dashStyle</code> include:\r\n\t\t    <ul>\r\n\t\t    \t<li>Solid</li>\r\n\t\t    \t<li>ShortDash</li>\r\n\t\t    \t<li>ShortDot</li>\r\n\t\t    \t<li>ShortDashDot</li>\r\n\t\t    \t<li>ShortDashDotDot</li>\r\n\t\t    \t<li>Dot</li>\r\n\t\t    \t<li>Dash</li>\r\n\t\t    \t<li>LongDash</li>\r\n\t\t    \t<li>DashDot</li>\r\n\t\t    \t<li>LongDashDot</li>\r\n\t\t    \t<li>LongDashDotDot</li>\r\n\t\t    </ul>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\" target=\"_blank\">Possible values demonstrated</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle/\" target=\"_blank\">chart suitable for printing in black and white</a>","deprecated":false},{"name":"plotOptions-treemap-zones--dashStyle","fullname":"plotOptions.treemap.zones.dashStyle","title":"dashStyle","parent":"plotOptions-treemap-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"plotOptions-bar-zones--dashStyle","fullname":"plotOptions.bar.zones.dashStyle","title":"dashStyle","parent":"plotOptions-bar-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"plotOptions-series--dashStyle","fullname":"plotOptions.series.dashStyle","title":"dashStyle","parent":"plotOptions-series","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"2.1","description":"A name for the dash style to use for the graph. Applies only to series type having a graph, like <code>line</code>, <code>spline</code>, <code>area</code> and <code>scatter</code> in  case it has a <code>lineWidth</code>. The value for the <code>dashStyle</code> include:\r\n\t\t    <ul>\r\n\t\t    \t<li>Solid</li>\r\n\t\t    \t<li>ShortDash</li>\r\n\t\t    \t<li>ShortDot</li>\r\n\t\t    \t<li>ShortDashDot</li>\r\n\t\t    \t<li>ShortDashDotDot</li>\r\n\t\t    \t<li>Dot</li>\r\n\t\t    \t<li>Dash</li>\r\n\t\t    \t<li>LongDash</li>\r\n\t\t    \t<li>DashDot</li>\r\n\t\t    \t<li>LongDashDot</li>\r\n\t\t    \t<li>LongDashDotDot</li>\r\n\t\t    </ul>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\" target=\"_blank\">Possible values demonstrated</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle/\" target=\"_blank\">chart suitable for printing in black and white</a>","deprecated":false},{"name":"plotOptions-spline--dashStyle","fullname":"plotOptions.spline.dashStyle","title":"dashStyle","parent":"plotOptions-spline","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"2.1","description":"A name for the dash style to use for the graph. Applies only to series type having a graph, like <code>line</code>, <code>spline</code>, <code>area</code> and <code>scatter</code> in  case it has a <code>lineWidth</code>. The value for the <code>dashStyle</code> include:\r\n\t\t    <ul>\r\n\t\t    \t<li>Solid</li>\r\n\t\t    \t<li>ShortDash</li>\r\n\t\t    \t<li>ShortDot</li>\r\n\t\t    \t<li>ShortDashDot</li>\r\n\t\t    \t<li>ShortDashDotDot</li>\r\n\t\t    \t<li>Dot</li>\r\n\t\t    \t<li>Dash</li>\r\n\t\t    \t<li>LongDash</li>\r\n\t\t    \t<li>DashDot</li>\r\n\t\t    \t<li>LongDashDot</li>\r\n\t\t    \t<li>LongDashDotDot</li>\r\n\t\t    </ul>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\" target=\"_blank\">Possible values demonstrated</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle/\" target=\"_blank\">chart suitable for printing in black and white</a>","deprecated":false},{"name":"series<scatter>-zones--dashStyle","fullname":"series<scatter>.zones.dashStyle","title":"dashStyle","parent":"series<scatter>-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<areasplinerange>-zones--dashStyle","fullname":"series<areasplinerange>.zones.dashStyle","title":"dashStyle","parent":"series<areasplinerange>-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<bubble>-zones--dashStyle","fullname":"series<bubble>.zones.dashStyle","title":"dashStyle","parent":"series<bubble>-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"plotOptions-spline-zones--dashStyle","fullname":"plotOptions.spline.zones.dashStyle","title":"dashStyle","parent":"plotOptions-spline-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<line>-zones--dashStyle","fullname":"series<line>.zones.dashStyle","title":"dashStyle","parent":"series<line>-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<polygon>-zones--dashStyle","fullname":"series<polygon>.zones.dashStyle","title":"dashStyle","parent":"series<polygon>-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"plotOptions-area--dashStyle","fullname":"plotOptions.area.dashStyle","title":"dashStyle","parent":"plotOptions-area","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"2.1","description":"A name for the dash style to use for the graph. Applies only to series type having a graph, like <code>line</code>, <code>spline</code>, <code>area</code> and <code>scatter</code> in  case it has a <code>lineWidth</code>. The value for the <code>dashStyle</code> include:\r\n\t\t    <ul>\r\n\t\t    \t<li>Solid</li>\r\n\t\t    \t<li>ShortDash</li>\r\n\t\t    \t<li>ShortDot</li>\r\n\t\t    \t<li>ShortDashDot</li>\r\n\t\t    \t<li>ShortDashDotDot</li>\r\n\t\t    \t<li>Dot</li>\r\n\t\t    \t<li>Dash</li>\r\n\t\t    \t<li>LongDash</li>\r\n\t\t    \t<li>DashDot</li>\r\n\t\t    \t<li>LongDashDot</li>\r\n\t\t    \t<li>LongDashDotDot</li>\r\n\t\t    </ul>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\" target=\"_blank\">Possible values demonstrated</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle/\" target=\"_blank\">chart suitable for printing in black and white</a>","deprecated":false},{"name":"plotOptions-boxplot-zones--dashStyle","fullname":"plotOptions.boxplot.zones.dashStyle","title":"dashStyle","parent":"plotOptions-boxplot-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<column>-zones--dashStyle","fullname":"series<column>.zones.dashStyle","title":"dashStyle","parent":"series<column>-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<gauge>-zones--dashStyle","fullname":"series<gauge>.zones.dashStyle","title":"dashStyle","parent":"series<gauge>-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<pie>-zones--dashStyle","fullname":"series<pie>.zones.dashStyle","title":"dashStyle","parent":"series<pie>-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"plotOptions-series-zones--dashStyle","fullname":"plotOptions.series.zones.dashStyle","title":"dashStyle","parent":"plotOptions-series-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"plotOptions-areasplinerange--dashStyle","fullname":"plotOptions.areasplinerange.dashStyle","title":"dashStyle","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"2.1","description":"A name for the dash style to use for the graph. Applies only to series type having a graph, like <code>line</code>, <code>spline</code>, <code>area</code> and <code>scatter</code> in  case it has a <code>lineWidth</code>. The value for the <code>dashStyle</code> include:\r\n\t\t    <ul>\r\n\t\t    \t<li>Solid</li>\r\n\t\t    \t<li>ShortDash</li>\r\n\t\t    \t<li>ShortDot</li>\r\n\t\t    \t<li>ShortDashDot</li>\r\n\t\t    \t<li>ShortDashDotDot</li>\r\n\t\t    \t<li>Dot</li>\r\n\t\t    \t<li>Dash</li>\r\n\t\t    \t<li>LongDash</li>\r\n\t\t    \t<li>DashDot</li>\r\n\t\t    \t<li>LongDashDot</li>\r\n\t\t    \t<li>LongDashDotDot</li>\r\n\t\t    </ul>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\" target=\"_blank\">Possible values demonstrated</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle/\" target=\"_blank\">chart suitable for printing in black and white</a>","deprecated":false},{"name":"series<pyramid>-zones--dashStyle","fullname":"series<pyramid>.zones.dashStyle","title":"dashStyle","parent":"series<pyramid>-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"plotOptions-arearange--dashStyle","fullname":"plotOptions.arearange.dashStyle","title":"dashStyle","parent":"plotOptions-arearange","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"2.1","description":"A name for the dash style to use for the graph. Applies only to series type having a graph, like <code>line</code>, <code>spline</code>, <code>area</code> and <code>scatter</code> in  case it has a <code>lineWidth</code>. The value for the <code>dashStyle</code> include:\r\n\t\t    <ul>\r\n\t\t    \t<li>Solid</li>\r\n\t\t    \t<li>ShortDash</li>\r\n\t\t    \t<li>ShortDot</li>\r\n\t\t    \t<li>ShortDashDot</li>\r\n\t\t    \t<li>ShortDashDotDot</li>\r\n\t\t    \t<li>Dot</li>\r\n\t\t    \t<li>Dash</li>\r\n\t\t    \t<li>LongDash</li>\r\n\t\t    \t<li>DashDot</li>\r\n\t\t    \t<li>LongDashDot</li>\r\n\t\t    \t<li>LongDashDotDot</li>\r\n\t\t    </ul>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\" target=\"_blank\">Possible values demonstrated</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle/\" target=\"_blank\">chart suitable for printing in black and white</a>","deprecated":false},{"name":"plotOptions-solidgauge-zones--dashStyle","fullname":"plotOptions.solidgauge.zones.dashStyle","title":"dashStyle","parent":"plotOptions-solidgauge-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<waterfall>-zones--dashStyle","fullname":"series<waterfall>.zones.dashStyle","title":"dashStyle","parent":"series<waterfall>-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<spline>-zones--dashStyle","fullname":"series<spline>.zones.dashStyle","title":"dashStyle","parent":"series<spline>-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<arearange>-zones--dashStyle","fullname":"series<arearange>.zones.dashStyle","title":"dashStyle","parent":"series<arearange>-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<polygon>--dashStyle","fullname":"series<polygon>.dashStyle","title":"dashStyle","parent":"series<polygon>","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"2.1","description":"A name for the dash style to use for the graph. Applies only to series type having a graph, like <code>line</code>, <code>spline</code>, <code>area</code> and <code>scatter</code> in  case it has a <code>lineWidth</code>. The value for the <code>dashStyle</code> include:\r\n\t\t    <ul>\r\n\t\t    \t<li>Solid</li>\r\n\t\t    \t<li>ShortDash</li>\r\n\t\t    \t<li>ShortDot</li>\r\n\t\t    \t<li>ShortDashDot</li>\r\n\t\t    \t<li>ShortDashDotDot</li>\r\n\t\t    \t<li>Dot</li>\r\n\t\t    \t<li>Dash</li>\r\n\t\t    \t<li>LongDash</li>\r\n\t\t    \t<li>DashDot</li>\r\n\t\t    \t<li>LongDashDot</li>\r\n\t\t    \t<li>LongDashDotDot</li>\r\n\t\t    </ul>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\" target=\"_blank\">Possible values demonstrated</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle/\" target=\"_blank\">chart suitable for printing in black and white</a>","deprecated":false},{"name":"series<errorbar>-zones--dashStyle","fullname":"series<errorbar>.zones.dashStyle","title":"dashStyle","parent":"series<errorbar>-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"plotOptions-scatter-zones--dashStyle","fullname":"plotOptions.scatter.zones.dashStyle","title":"dashStyle","parent":"plotOptions-scatter-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"plotOptions-line-zones--dashStyle","fullname":"plotOptions.line.zones.dashStyle","title":"dashStyle","parent":"plotOptions-line-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"yAxis-plotLines--dashStyle","fullname":"yAxis.plotLines.dashStyle","title":"dashStyle","parent":"yAxis-plotLines","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"1.2","description":"The dashing or dot style for the plot line. For possible values see <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\">this overview</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-dashstyle/\" target=\"_blank\">Dash and dot pattern</a>","deprecated":false},{"name":"series<area>-zones--dashStyle","fullname":"series<area>.zones.dashStyle","title":"dashStyle","parent":"series<area>-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<funnel>-zones--dashStyle","fullname":"series<funnel>.zones.dashStyle","title":"dashStyle","parent":"series<funnel>-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"plotOptions-bubble--dashStyle","fullname":"plotOptions.bubble.dashStyle","title":"dashStyle","parent":"plotOptions-bubble","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"2.1","description":"A name for the dash style to use for the graph. Applies only to series type having a graph, like <code>line</code>, <code>spline</code>, <code>area</code> and <code>scatter</code> in  case it has a <code>lineWidth</code>. The value for the <code>dashStyle</code> include:\r\n\t\t    <ul>\r\n\t\t    \t<li>Solid</li>\r\n\t\t    \t<li>ShortDash</li>\r\n\t\t    \t<li>ShortDot</li>\r\n\t\t    \t<li>ShortDashDot</li>\r\n\t\t    \t<li>ShortDashDotDot</li>\r\n\t\t    \t<li>Dot</li>\r\n\t\t    \t<li>Dash</li>\r\n\t\t    \t<li>LongDash</li>\r\n\t\t    \t<li>DashDot</li>\r\n\t\t    \t<li>LongDashDot</li>\r\n\t\t    \t<li>LongDashDotDot</li>\r\n\t\t    </ul>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\" target=\"_blank\">Possible values demonstrated</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle/\" target=\"_blank\">chart suitable for printing in black and white</a>","deprecated":false},{"name":"plotOptions-arearange-zones--dashStyle","fullname":"plotOptions.arearange.zones.dashStyle","title":"dashStyle","parent":"plotOptions-arearange-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<areasplinerange>--dashStyle","fullname":"series<areasplinerange>.dashStyle","title":"dashStyle","parent":"series<areasplinerange>","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"2.1","description":"A name for the dash style to use for the graph. Applies only to series type having a graph, like <code>line</code>, <code>spline</code>, <code>area</code> and <code>scatter</code> in  case it has a <code>lineWidth</code>. The value for the <code>dashStyle</code> include:\r\n\t\t    <ul>\r\n\t\t    \t<li>Solid</li>\r\n\t\t    \t<li>ShortDash</li>\r\n\t\t    \t<li>ShortDot</li>\r\n\t\t    \t<li>ShortDashDot</li>\r\n\t\t    \t<li>ShortDashDotDot</li>\r\n\t\t    \t<li>Dot</li>\r\n\t\t    \t<li>Dash</li>\r\n\t\t    \t<li>LongDash</li>\r\n\t\t    \t<li>DashDot</li>\r\n\t\t    \t<li>LongDashDot</li>\r\n\t\t    \t<li>LongDashDotDot</li>\r\n\t\t    </ul>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\" target=\"_blank\">Possible values demonstrated</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle/\" target=\"_blank\">chart suitable for printing in black and white</a>","deprecated":false},{"name":"series<area>--dashStyle","fullname":"series<area>.dashStyle","title":"dashStyle","parent":"series<area>","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"2.1","description":"A name for the dash style to use for the graph. Applies only to series type having a graph, like <code>line</code>, <code>spline</code>, <code>area</code> and <code>scatter</code> in  case it has a <code>lineWidth</code>. The value for the <code>dashStyle</code> include:\r\n\t\t    <ul>\r\n\t\t    \t<li>Solid</li>\r\n\t\t    \t<li>ShortDash</li>\r\n\t\t    \t<li>ShortDot</li>\r\n\t\t    \t<li>ShortDashDot</li>\r\n\t\t    \t<li>ShortDashDotDot</li>\r\n\t\t    \t<li>Dot</li>\r\n\t\t    \t<li>Dash</li>\r\n\t\t    \t<li>LongDash</li>\r\n\t\t    \t<li>DashDot</li>\r\n\t\t    \t<li>LongDashDot</li>\r\n\t\t    \t<li>LongDashDotDot</li>\r\n\t\t    </ul>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\" target=\"_blank\">Possible values demonstrated</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle/\" target=\"_blank\">chart suitable for printing in black and white</a>","deprecated":false},{"name":"plotOptions-columnrange-zones--dashStyle","fullname":"plotOptions.columnrange.zones.dashStyle","title":"dashStyle","parent":"plotOptions-columnrange-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<bubble>--dashStyle","fullname":"series<bubble>.dashStyle","title":"dashStyle","parent":"series<bubble>","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"2.1","description":"A name for the dash style to use for the graph. Applies only to series type having a graph, like <code>line</code>, <code>spline</code>, <code>area</code> and <code>scatter</code> in  case it has a <code>lineWidth</code>. The value for the <code>dashStyle</code> include:\r\n\t\t    <ul>\r\n\t\t    \t<li>Solid</li>\r\n\t\t    \t<li>ShortDash</li>\r\n\t\t    \t<li>ShortDot</li>\r\n\t\t    \t<li>ShortDashDot</li>\r\n\t\t    \t<li>ShortDashDotDot</li>\r\n\t\t    \t<li>Dot</li>\r\n\t\t    \t<li>Dash</li>\r\n\t\t    \t<li>LongDash</li>\r\n\t\t    \t<li>DashDot</li>\r\n\t\t    \t<li>LongDashDot</li>\r\n\t\t    \t<li>LongDashDotDot</li>\r\n\t\t    </ul>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\" target=\"_blank\">Possible values demonstrated</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle/\" target=\"_blank\">chart suitable for printing in black and white</a>","deprecated":false},{"name":"series<waterfall>--dashStyle","fullname":"series<waterfall>.dashStyle","title":"dashStyle","parent":"series<waterfall>","isParent":false,"returnType":"String","defaults":"Dot","values":"","since":"3.0","description":"A name for the dash style to use for the line connecting the columns of the waterfall series. Possible values:\r\n\t\t    <ul>\r\n\t\t    \t<li>Solid</li>\r\n\t\t    \t<li>ShortDash</li>\r\n\t\t    \t<li>ShortDot</li>\r\n\t\t    \t<li>ShortDashDot</li>\r\n\t\t    \t<li>ShortDashDotDot</li>\r\n\t\t    \t<li>Dot</li>\r\n\t\t    \t<li>Dash</li>\r\n\t\t    \t<li>LongDash</li>\r\n\t\t    \t<li>DashDot</li>\r\n\t\t    \t<li>LongDashDot</li>\r\n\t\t    \t<li>LongDashDotDot</li>\r\n\t\t    </ul>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge-zones--dashStyle","fullname":"plotOptions.gauge.zones.dashStyle","title":"dashStyle","parent":"plotOptions-gauge-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<areaspline>-zones--dashStyle","fullname":"series<areaspline>.zones.dashStyle","title":"dashStyle","parent":"series<areaspline>-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<columnrange>-zones--dashStyle","fullname":"series<columnrange>.zones.dashStyle","title":"dashStyle","parent":"series<columnrange>-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<line>--dashStyle","fullname":"series<line>.dashStyle","title":"dashStyle","parent":"series<line>","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"2.1","description":"A name for the dash style to use for the graph. Applies only to series type having a graph, like <code>line</code>, <code>spline</code>, <code>area</code> and <code>scatter</code> in  case it has a <code>lineWidth</code>. The value for the <code>dashStyle</code> include:\r\n\t\t    <ul>\r\n\t\t    \t<li>Solid</li>\r\n\t\t    \t<li>ShortDash</li>\r\n\t\t    \t<li>ShortDot</li>\r\n\t\t    \t<li>ShortDashDot</li>\r\n\t\t    \t<li>ShortDashDotDot</li>\r\n\t\t    \t<li>Dot</li>\r\n\t\t    \t<li>Dash</li>\r\n\t\t    \t<li>LongDash</li>\r\n\t\t    \t<li>DashDot</li>\r\n\t\t    \t<li>LongDashDot</li>\r\n\t\t    \t<li>LongDashDotDot</li>\r\n\t\t    </ul>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\" target=\"_blank\">Possible values demonstrated</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle/\" target=\"_blank\">chart suitable for printing in black and white</a>","deprecated":false},{"name":"plotOptions-pyramid-zones--dashStyle","fullname":"plotOptions.pyramid.zones.dashStyle","title":"dashStyle","parent":"plotOptions-pyramid-zones","isParent":false,"returnType":"String","since":"4.1.0","description":"A name for the dash style to use for the graph.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-dashstyle-dot/\" target=\"_blank\">Dashed line indicates prognosis</a>","seeAlso":"<a href=\"#plotOption.series.dashStyle\">series.dashStyle</a>","deprecated":false},{"name":"series<column>-data","fullname":"series<column>.data","title":"data","parent":"series<column>","isParent":true,"returnType":"Array<Object|Array|Number>","description":"An array of data points for the series. For the <code>column</code> series type, points can be given in the following ways:\r\n <ol>\r\n \t<li>An array of numerical values. In this case, the numerical values will \r\n \tbe interpreted as <code>y</code> options. The <code>x</code> values will be automatically calculated,\r\n \teither starting at 0 and incremented by 1, or from <code>pointStart</code> \r\n \tand <code>pointInterval</code> given in the series options. If the axis\r\n \thas categories, these will be used.  Example:\r\n<pre>data: [0, 5, 3, 5]</pre>\r\n \t</li>\r\n \t<li><p>An array of arrays with 2 values. In this case, the values correspond to <code>x,y</code>. If the first value is a string, it is\r\n \tapplied as the name of the point, and the <code>x</code> value is inferred. <pre>data: [\n    [0, 6], \n    [1, 2], \n    [2, 6]\n]</pre></li>\r\n\r\n\r\n<li><p>An array of objects with named values. The objects are\r\n \tpoint configuration objects as seen below. If the total number of data points exceeds the series' <a href='#series<column>.turboThreshold'>turboThreshold</a>, this option is not available.</p>\r\n\r\n<pre>data: [{\n    x: 1,\n    y: 5,\n    name: \"Point2\",\n    color: \"#00FF00\"\n}, {\n    x: 1,\n    y: 9,\n    name: \"Point1\",\n    color: \"#FF00FF\"\n}]</pre></li>\r\n </ol>","demo":"<p>The demos use a line series, but the principle is the same for all types.</p>\n<ul>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">Numerical values</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays/\" target=\"_blank\">Arrays of numeric x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays-datetime/\" target=\"_blank\">Arrays of datetime x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-name-value/\" target=\"_blank\">Arrays of point.name and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\"> Config objects</a></li>\n</ul>"},{"name":"series<pyramid>-data","fullname":"series<pyramid>.data","title":"data","parent":"series<pyramid>","isParent":true,"returnType":"Array<Object|Number>","description":"An array of data points for the series. For the <code>pyramid</code> series type, points can be given in the following ways:\r\n <ol>\r\n \t<li>An array of numerical values. In this case, the numerical values will \r\n \tbe interpreted as <code>y</code> options.  Example:\r\n<pre>data: [0, 5, 3, 5]</pre>\r\n \t</li>\r\n <li><p>An array of objects with named values. The objects are\r\n \tpoint configuration objects as seen below. If the total number of data points exceeds the series' <a href='#series<pyramid>.turboThreshold'>turboThreshold</a>, this option is not available.</p>\r\n\r\n<pre>data: [{\n    y: 6,\n    name: \"Point2\",\n    color: \"#00FF00\"\n}, {\n    y: 7,\n    name: \"Point1\",\n    color: \"#FF00FF\"\n}]</pre></li>\r\n </ol>","demo":"<p>The demos use a line series, but the principle is the same for all types.</p>\n<ul>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">Numerical values</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays/\" target=\"_blank\">Arrays of numeric x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays-datetime/\" target=\"_blank\">Arrays of datetime x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-name-value/\" target=\"_blank\">Arrays of point.name and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\"> Config objects</a></li>\n</ul>"},{"name":"series<boxplot>-data","fullname":"series<boxplot>.data","title":"data","parent":"series<boxplot>","isParent":true,"returnType":"Array<Object|Array>","description":"An array of data points for the series. For the <code>boxplot</code> series type, points can be given in the following ways:\r\n <ol>\r\n \t<li><p>An array of arrays with 6 or 5 values. In this case, the values correspond to <code>x,low,q1,median,q3,high</code>. If the first value is a string, it is\r\n \tapplied as the name of the point, and the <code>x</code> value is inferred. The <code>x</code> value can also be omitted, in which case the inner arrays should be of length 5. Then the <code>x</code> value is automatically calculated, either starting at 0 and incremented by 1, or from <code>pointStart</code> \r\n \tand <code>pointInterval</code> given in the series options.</p>\r\n<pre>data: [\n    [0, 3, 0, 10, 3, 5], \n    [1, 7, 8, 7, 2, 9], \n    [2, 6, 9, 5, 1, 3]\n]</pre></li>\r\n\r\n\r\n<li><p>An array of objects with named values. The objects are\r\n \tpoint configuration objects as seen below. If the total number of data points exceeds the series' <a href='#series<boxplot>.turboThreshold'>turboThreshold</a>, this option is not available.</p>\r\n\r\n<pre>data: [{\n    x: 1,\n    low: 4,\n    q1: 9,\n    median: 9,\n    q3: 1,\n    high: 10,\n    name: \"Point2\",\n    color: \"#00FF00\"\n}, {\n    x: 1,\n    low: 5,\n    q1: 7,\n    median: 3,\n    q3: 6,\n    high: 2,\n    name: \"Point1\",\n    color: \"#FF00FF\"\n}]</pre></li>\r\n </ol>","demo":"<p>The demos use a line series, but the principle is the same for all types.</p>\n<ul>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">Numerical values</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays/\" target=\"_blank\">Arrays of numeric x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays-datetime/\" target=\"_blank\">Arrays of datetime x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-name-value/\" target=\"_blank\">Arrays of point.name and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\"> Config objects</a></li>\n</ul>"},{"name":"data","fullname":"data","title":"data","isParent":true,"since":"4.0","description":"<p>The Data module provides a simplified interface for adding data to a chart from sources like CVS, HTML tables or grid views. See also the <a href=\"http://www.highcharts.com/docs/working-with-data/data-module\">tutorial article on the Data module</a>.</p>\r\n\r\n<p>It requires the <code>modules/data.js</code> file to be loaded.</p>\r\n\r\n<p>Please note that the default way of adding data in Highcharts, without the need of a module, is through the <a href=\"#series.data\">series.data</a> option.</p>","demo":"Data from a <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/column-parsed/\" target=\"_blank\">HTML table</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/data/csv/\" target=\"_blank\">CSV</a>.","deprecated":false},{"name":"series<polygon>-data","fullname":"series<polygon>.data","title":"data","parent":"series<polygon>","isParent":true,"returnType":"Array<Object|Array>","description":"An array of data points for the series. For the <code>polygon</code> series type, points can be given in the following ways:\r\n <ol>\r\n \t<li>An array of numerical values. In this case, the numerical values will \r\n \tbe interpreted as <code>y</code> options. The <code>x</code> values will be automatically calculated,\r\n \teither starting at 0 and incremented by 1, or from <code>pointStart</code> \r\n \tand <code>pointInterval</code> given in the series options. If the axis\r\n \thas categories, these will be used.  Example:\r\n<pre>data: [0, 5, 3, 5]</pre>\r\n \t</li>\r\n \t<li><p>An array of arrays with 2 values. In this case, the values correspond to <code>x,y</code>. If the first value is a string, it is\r\n \tapplied as the name of the point, and the <code>x</code> value is inferred. <pre>data: [\n    [0, 10], \n    [1, 3], \n    [2, 1]\n]</pre></li>\r\n\r\n\r\n<li><p>An array of objects with named values. The objects are\r\n \tpoint configuration objects as seen below. If the total number of data points exceeds the series' <a href='#series<polygon>.turboThreshold'>turboThreshold</a>, this option is not available.</p>\r\n\r\n<pre>data: [{\n    x: 1,\n    y: 1,\n    name: \"Point2\",\n    color: \"#00FF00\"\n}, {\n    x: 1,\n    y: 8,\n    name: \"Point1\",\n    color: \"#FF00FF\"\n}]</pre></li>\r\n </ol>","demo":"<p>The demos use a line series, but the principle is the same for all types.</p>\n<ul>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">Numerical values</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays/\" target=\"_blank\">Arrays of numeric x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays-datetime/\" target=\"_blank\">Arrays of datetime x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-name-value/\" target=\"_blank\">Arrays of point.name and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\"> Config objects</a></li>\n</ul>"},{"name":"series<spline>-data","fullname":"series<spline>.data","title":"data","parent":"series<spline>","isParent":true,"returnType":"Array<Object|Array|Number>","description":"An array of data points for the series. For the <code>spline</code> series type, points can be given in the following ways:\r\n <ol>\r\n \t<li>An array of numerical values. In this case, the numerical values will \r\n \tbe interpreted as <code>y</code> options. The <code>x</code> values will be automatically calculated,\r\n \teither starting at 0 and incremented by 1, or from <code>pointStart</code> \r\n \tand <code>pointInterval</code> given in the series options. If the axis\r\n \thas categories, these will be used.  Example:\r\n<pre>data: [0, 5, 3, 5]</pre>\r\n \t</li>\r\n \t<li><p>An array of arrays with 2 values. In this case, the values correspond to <code>x,y</code>. If the first value is a string, it is\r\n \tapplied as the name of the point, and the <code>x</code> value is inferred. <pre>data: [\n    [0, 9], \n    [1, 2], \n    [2, 8]\n]</pre></li>\r\n\r\n\r\n<li><p>An array of objects with named values. The objects are\r\n \tpoint configuration objects as seen below. If the total number of data points exceeds the series' <a href='#series<spline>.turboThreshold'>turboThreshold</a>, this option is not available.</p>\r\n\r\n<pre>data: [{\n    x: 1,\n    y: 9,\n    name: \"Point2\",\n    color: \"#00FF00\"\n}, {\n    x: 1,\n    y: 0,\n    name: \"Point1\",\n    color: \"#FF00FF\"\n}]</pre></li>\r\n </ol>","demo":"<p>The demos use a line series, but the principle is the same for all types.</p>\n<ul>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">Numerical values</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays/\" target=\"_blank\">Arrays of numeric x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays-datetime/\" target=\"_blank\">Arrays of datetime x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-name-value/\" target=\"_blank\">Arrays of point.name and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\"> Config objects</a></li>\n</ul>"},{"name":"series<gauge>-data","fullname":"series<gauge>.data","title":"data","parent":"series<gauge>","isParent":true,"returnType":"Array<Object|Number>","description":"An array of data points for the series. For the <code>gauge</code> series type, points can be given in the following ways:\r\n <ol>\r\n \t<li>An array of numerical values. In this case, the numerical values will \r\n \tbe interpreted as <code>y</code> options.  Example:\r\n<pre>data: [0, 5, 3, 5]</pre>\r\n \t</li>\r\n <li><p>An array of objects with named values. The objects are\r\n \tpoint configuration objects as seen below. If the total number of data points exceeds the series' <a href='#series<gauge>.turboThreshold'>turboThreshold</a>, this option is not available.</p>\r\n\r\n<pre>data: [{\n    y: 6,\n    name: \"Point2\",\n    color: \"#00FF00\"\n}, {\n    y: 8,\n    name: \"Point1\",\n    color: \"#FF00FF\"\n}]</pre></li>\r\n </ol><p>The typical gauge only contains a single data value.</p>","demo":"<p>The demos use a line series, but the principle is the same for all types.</p>\n<ul>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">Numerical values</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays/\" target=\"_blank\">Arrays of numeric x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays-datetime/\" target=\"_blank\">Arrays of datetime x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-name-value/\" target=\"_blank\">Arrays of point.name and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\"> Config objects</a></li>\n</ul>"},{"name":"series<area>-data","fullname":"series<area>.data","title":"data","parent":"series<area>","isParent":true,"returnType":"Array<Object|Array|Number>","description":"An array of data points for the series. For the <code>area</code> series type, points can be given in the following ways:\r\n <ol>\r\n \t<li>An array of numerical values. In this case, the numerical values will \r\n \tbe interpreted as <code>y</code> options. The <code>x</code> values will be automatically calculated,\r\n \teither starting at 0 and incremented by 1, or from <code>pointStart</code> \r\n \tand <code>pointInterval</code> given in the series options. If the axis\r\n \thas categories, these will be used.  Example:\r\n<pre>data: [0, 5, 3, 5]</pre>\r\n \t</li>\r\n \t<li><p>An array of arrays with 2 values. In this case, the values correspond to <code>x,y</code>. If the first value is a string, it is\r\n \tapplied as the name of the point, and the <code>x</code> value is inferred. <pre>data: [\n    [0, 9], \n    [1, 7], \n    [2, 6]\n]</pre></li>\r\n\r\n\r\n<li><p>An array of objects with named values. The objects are\r\n \tpoint configuration objects as seen below. If the total number of data points exceeds the series' <a href='#series<area>.turboThreshold'>turboThreshold</a>, this option is not available.</p>\r\n\r\n<pre>data: [{\n    x: 1,\n    y: 9,\n    name: \"Point2\",\n    color: \"#00FF00\"\n}, {\n    x: 1,\n    y: 6,\n    name: \"Point1\",\n    color: \"#FF00FF\"\n}]</pre></li>\r\n </ol>","demo":"<p>The demos use a line series, but the principle is the same for all types.</p>\n<ul>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">Numerical values</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays/\" target=\"_blank\">Arrays of numeric x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays-datetime/\" target=\"_blank\">Arrays of datetime x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-name-value/\" target=\"_blank\">Arrays of point.name and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\"> Config objects</a></li>\n</ul>"},{"name":"series-data","fullname":"series.data","title":"data","parent":"series","isParent":true,"returnType":"Array<Object|Array|Number>","description":"An array of data points for the series. The points can be given in three ways:\r\n <ol>\r\n \t<li>An array of numerical values. In this case, the numerical values will \r\n \tbe interpreted as y values, and x values will be automatically calculated,\r\n \teither starting at 0 and incrementing by 1, or from <code>pointStart</code> \r\n \tand <code>pointInterval</code> given in the plotOptions. If the axis is\r\n \thas categories, these will be used. This option is not available for range series. Example:\r\n<pre>data: [0, 5, 3, 5]</pre>\r\n \t</li>\r\n \t<li><p>An array of arrays with two values. In this case, the first value is the\r\n \tx value and the second is the y value. If the first value is a string, it is\r\n \tapplied as the name of the point, and the x value is incremented following\r\n \tthe above rules.</p>\r\n<p>For range series, the arrays will be interpreted as <code>[x, low, high]</code>. In this cases, the X value can be skipped altogether to make use of <code>pointStart</code> and <code>pointRange</code>.</p>\r\n\r\n Example:\r\n<pre>data: [[5, 2], [6, 3], [8, 2]]</pre></li>\r\n\r\n\r\n<li><p>An array of objects with named values. In this case the objects are\r\n \tpoint configuration objects as seen below.</p>\r\n\r\n<p>Range series values are given by <code>low</code> and <code>high</code>.</p>\r\n\r\nExample:\r\n<pre>data: [{\r\n\tname: 'Point 1',\r\n\tcolor: '#00FF00',\r\n\ty: 0\r\n}, {\r\n\tname: 'Point 2',\r\n\tcolor: '#FF00FF',\r\n\ty: 5\r\n}]</pre></li>\r\n </ol>\r\n\r\n<p>Note that line series and derived types like spline and area, require data to be sorted by X because it interpolates mouse coordinates for the tooltip. Column and scatter series, where each point has its own mouse event, does not require sorting.</p>","demo":"<ul>\r\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">1) Numerical values</a></li>\r\n\r\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays/\" target=\"_blank\">2a) arrays of numeric x and y</a></li>\r\n\r\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays-datetime/\" target=\"_blank\">2b) arrays of datetime x and y</a></li>\r\n\r\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-name-value/\" target=\"_blank\">2c) arrays of point.name and y</a></li>\r\n\r\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\">3) config objects</a></li>\r\n\r\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/3d-column-null-values/\" target=\"_blank\">4) 3D column with null values</a></li>\r\n</ul>","deprecated":false},{"name":"series<areasplinerange>-data","fullname":"series<areasplinerange>.data","title":"data","parent":"series<areasplinerange>","isParent":true,"returnType":"Array<Object|Array>","description":"An array of data points for the series. For the <code>areasplinerange</code> series type, points can be given in the following ways:\r\n <ol>\r\n \t<li><p>An array of arrays with 3 or 2 values. In this case, the values correspond to <code>x,low,high</code>. If the first value is a string, it is\r\n \tapplied as the name of the point, and the <code>x</code> value is inferred. The <code>x</code> value can also be omitted, in which case the inner arrays should be of length 2. Then the <code>x</code> value is automatically calculated, either starting at 0 and incremented by 1, or from <code>pointStart</code> \r\n \tand <code>pointInterval</code> given in the series options.</p>\r\n<pre>data: [\n    [0, 0, 5], \n    [1, 9, 1], \n    [2, 5, 2]\n]</pre></li>\r\n\r\n\r\n<li><p>An array of objects with named values. The objects are\r\n \tpoint configuration objects as seen below. If the total number of data points exceeds the series' <a href='#series<areasplinerange>.turboThreshold'>turboThreshold</a>, this option is not available.</p>\r\n\r\n<pre>data: [{\n    x: 1,\n    low: 5,\n    high: 0,\n    name: \"Point2\",\n    color: \"#00FF00\"\n}, {\n    x: 1,\n    low: 4,\n    high: 1,\n    name: \"Point1\",\n    color: \"#FF00FF\"\n}]</pre></li>\r\n </ol>","demo":"<p>The demos use a line series, but the principle is the same for all types.</p>\n<ul>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">Numerical values</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays/\" target=\"_blank\">Arrays of numeric x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays-datetime/\" target=\"_blank\">Arrays of datetime x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-name-value/\" target=\"_blank\">Arrays of point.name and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\"> Config objects</a></li>\n</ul>"},{"name":"series<areaspline>-data","fullname":"series<areaspline>.data","title":"data","parent":"series<areaspline>","isParent":true,"returnType":"Array<Object|Array|Number>","description":"An array of data points for the series. For the <code>areaspline</code> series type, points can be given in the following ways:\r\n <ol>\r\n \t<li>An array of numerical values. In this case, the numerical values will \r\n \tbe interpreted as <code>y</code> options. The <code>x</code> values will be automatically calculated,\r\n \teither starting at 0 and incremented by 1, or from <code>pointStart</code> \r\n \tand <code>pointInterval</code> given in the series options. If the axis\r\n \thas categories, these will be used.  Example:\r\n<pre>data: [0, 5, 3, 5]</pre>\r\n \t</li>\r\n \t<li><p>An array of arrays with 2 values. In this case, the values correspond to <code>x,y</code>. If the first value is a string, it is\r\n \tapplied as the name of the point, and the <code>x</code> value is inferred. <pre>data: [\n    [0, 10], \n    [1, 9], \n    [2, 3]\n]</pre></li>\r\n\r\n\r\n<li><p>An array of objects with named values. The objects are\r\n \tpoint configuration objects as seen below. If the total number of data points exceeds the series' <a href='#series<areaspline>.turboThreshold'>turboThreshold</a>, this option is not available.</p>\r\n\r\n<pre>data: [{\n    x: 1,\n    y: 4,\n    name: \"Point2\",\n    color: \"#00FF00\"\n}, {\n    x: 1,\n    y: 4,\n    name: \"Point1\",\n    color: \"#FF00FF\"\n}]</pre></li>\r\n </ol>","demo":"<p>The demos use a line series, but the principle is the same for all types.</p>\n<ul>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">Numerical values</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays/\" target=\"_blank\">Arrays of numeric x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays-datetime/\" target=\"_blank\">Arrays of datetime x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-name-value/\" target=\"_blank\">Arrays of point.name and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\"> Config objects</a></li>\n</ul>"},{"name":"series<pie>-data","fullname":"series<pie>.data","title":"data","parent":"series<pie>","isParent":true,"returnType":"Array<Object|Number>","description":"An array of data points for the series. For the <code>pie</code> series type, points can be given in the following ways:\r\n <ol>\r\n \t<li>An array of numerical values. In this case, the numerical values will \r\n \tbe interpreted as <code>y</code> options.  Example:\r\n<pre>data: [0, 5, 3, 5]</pre>\r\n \t</li>\r\n <li><p>An array of objects with named values. The objects are\r\n \tpoint configuration objects as seen below. If the total number of data points exceeds the series' <a href='#series<pie>.turboThreshold'>turboThreshold</a>, this option is not available.</p>\r\n\r\n<pre>data: [{\n    y: 1,\n    name: \"Point2\",\n    color: \"#00FF00\"\n}, {\n    y: 7,\n    name: \"Point1\",\n    color: \"#FF00FF\"\n}]</pre></li>\r\n </ol>","demo":"<p>The demos use a line series, but the principle is the same for all types.</p>\n<ul>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">Numerical values</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays/\" target=\"_blank\">Arrays of numeric x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays-datetime/\" target=\"_blank\">Arrays of datetime x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-name-value/\" target=\"_blank\">Arrays of point.name and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\"> Config objects</a></li>\n</ul>"},{"name":"series<waterfall>-data","fullname":"series<waterfall>.data","title":"data","parent":"series<waterfall>","isParent":true,"returnType":"Array<Object|Array|Number>","description":"An array of data points for the series. For the <code>waterfall</code> series type, points can be given in the following ways:\r\n <ol>\r\n \t<li>An array of numerical values. In this case, the numerical values will \r\n \tbe interpreted as <code>y</code> options. The <code>x</code> values will be automatically calculated,\r\n \teither starting at 0 and incremented by 1, or from <code>pointStart</code> \r\n \tand <code>pointInterval</code> given in the series options. If the axis\r\n \thas categories, these will be used.  Example:\r\n<pre>data: [0, 5, 3, 5]</pre>\r\n \t</li>\r\n \t<li><p>An array of arrays with 2 values. In this case, the values correspond to <code>x,y</code>. If the first value is a string, it is\r\n \tapplied as the name of the point, and the <code>x</code> value is inferred. <pre>data: [\n    [0, 7], \n    [1, 8], \n    [2, 3]\n]</pre></li>\r\n\r\n\r\n<li><p>An array of objects with named values. The objects are\r\n \tpoint configuration objects as seen below. If the total number of data points exceeds the series' <a href='#series<waterfall>.turboThreshold'>turboThreshold</a>, this option is not available.</p>\r\n\r\n<pre>data: [{\n    x: 1,\n    y: 8,\n    name: \"Point2\",\n    color: \"#00FF00\"\n}, {\n    x: 1,\n    y: 8,\n    name: \"Point1\",\n    color: \"#FF00FF\"\n}]</pre></li>\r\n </ol>","demo":"<p>The demos use a line series, but the principle is the same for all types.</p>\n<ul>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">Numerical values</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays/\" target=\"_blank\">Arrays of numeric x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays-datetime/\" target=\"_blank\">Arrays of datetime x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-name-value/\" target=\"_blank\">Arrays of point.name and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\"> Config objects</a></li>\n</ul>"},{"name":"series<funnel>-data","fullname":"series<funnel>.data","title":"data","parent":"series<funnel>","isParent":true,"returnType":"Array<Object|Number>","description":"An array of data points for the series. For the <code>funnel</code> series type, points can be given in the following ways:\r\n <ol>\r\n \t<li>An array of numerical values. In this case, the numerical values will \r\n \tbe interpreted as <code>y</code> options.  Example:\r\n<pre>data: [0, 5, 3, 5]</pre>\r\n \t</li>\r\n <li><p>An array of objects with named values. The objects are\r\n \tpoint configuration objects as seen below. If the total number of data points exceeds the series' <a href='#series<funnel>.turboThreshold'>turboThreshold</a>, this option is not available.</p>\r\n\r\n<pre>data: [{\n    y: 3,\n    name: \"Point2\",\n    color: \"#00FF00\"\n}, {\n    y: 1,\n    name: \"Point1\",\n    color: \"#FF00FF\"\n}]</pre></li>\r\n </ol>","demo":"<p>The demos use a line series, but the principle is the same for all types.</p>\n<ul>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">Numerical values</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays/\" target=\"_blank\">Arrays of numeric x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays-datetime/\" target=\"_blank\">Arrays of datetime x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-name-value/\" target=\"_blank\">Arrays of point.name and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\"> Config objects</a></li>\n</ul>"},{"name":"series<heatmap>-data","fullname":"series<heatmap>.data","title":"data","parent":"series<heatmap>","isParent":true,"returnType":"Array<Object|Array>","description":"An array of data points for the series. For the <code>heatmap</code> series type, points can be given in the following ways:\r\n <ol>\r\n \t<li><p>An array of arrays with 3 or 2 values. In this case, the values correspond to <code>x,y,value</code>. If the first value is a string, it is\r\n \tapplied as the name of the point, and the <code>x</code> value is inferred. The <code>x</code> value can also be omitted, in which case the inner arrays should be of length 2. Then the <code>x</code> value is automatically calculated, either starting at 0 and incremented by 1, or from <code>pointStart</code> \r\n \tand <code>pointInterval</code> given in the series options.</p>\r\n<pre>data: [\n    [0, 9, 7], \n    [1, 10, 4], \n    [2, 6, 3]\n]</pre></li>\r\n\r\n\r\n<li><p>An array of objects with named values. The objects are\r\n \tpoint configuration objects as seen below. If the total number of data points exceeds the series' <a href='#series<heatmap>.turboThreshold'>turboThreshold</a>, this option is not available.</p>\r\n\r\n<pre>data: [{\n    x: 1,\n    y: 3,\n    value: 10,\n    name: \"Point2\",\n    color: \"#00FF00\"\n}, {\n    x: 1,\n    y: 7,\n    value: 10,\n    name: \"Point1\",\n    color: \"#FF00FF\"\n}]</pre></li>\r\n </ol>","demo":"<p>The demos use a line series, but the principle is the same for all types.</p>\n<ul>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">Numerical values</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays/\" target=\"_blank\">Arrays of numeric x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays-datetime/\" target=\"_blank\">Arrays of datetime x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-name-value/\" target=\"_blank\">Arrays of point.name and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\"> Config objects</a></li>\n</ul>"},{"name":"series<columnrange>-data","fullname":"series<columnrange>.data","title":"data","parent":"series<columnrange>","isParent":true,"returnType":"Array<Object|Array>","description":"An array of data points for the series. For the <code>columnrange</code> series type, points can be given in the following ways:\r\n <ol>\r\n \t<li><p>An array of arrays with 3 or 2 values. In this case, the values correspond to <code>x,low,high</code>. If the first value is a string, it is\r\n \tapplied as the name of the point, and the <code>x</code> value is inferred. The <code>x</code> value can also be omitted, in which case the inner arrays should be of length 2. Then the <code>x</code> value is automatically calculated, either starting at 0 and incremented by 1, or from <code>pointStart</code> \r\n \tand <code>pointInterval</code> given in the series options.</p>\r\n<pre>data: [\n    [0, 4, 2], \n    [1, 2, 1], \n    [2, 9, 10]\n]</pre></li>\r\n\r\n\r\n<li><p>An array of objects with named values. The objects are\r\n \tpoint configuration objects as seen below. If the total number of data points exceeds the series' <a href='#series<columnrange>.turboThreshold'>turboThreshold</a>, this option is not available.</p>\r\n\r\n<pre>data: [{\n    x: 1,\n    low: 0,\n    high: 4,\n    name: \"Point2\",\n    color: \"#00FF00\"\n}, {\n    x: 1,\n    low: 5,\n    high: 3,\n    name: \"Point1\",\n    color: \"#FF00FF\"\n}]</pre></li>\r\n </ol>","demo":"<p>The demos use a line series, but the principle is the same for all types.</p>\n<ul>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">Numerical values</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays/\" target=\"_blank\">Arrays of numeric x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays-datetime/\" target=\"_blank\">Arrays of datetime x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-name-value/\" target=\"_blank\">Arrays of point.name and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\"> Config objects</a></li>\n</ul>"},{"name":"series<line>-data","fullname":"series<line>.data","title":"data","parent":"series<line>","isParent":true,"returnType":"Array<Object|Array|Number>","description":"An array of data points for the series. For the <code>line</code> series type, points can be given in the following ways:\r\n <ol>\r\n \t<li>An array of numerical values. In this case, the numerical values will \r\n \tbe interpreted as <code>y</code> options. The <code>x</code> values will be automatically calculated,\r\n \teither starting at 0 and incremented by 1, or from <code>pointStart</code> \r\n \tand <code>pointInterval</code> given in the series options. If the axis\r\n \thas categories, these will be used.  Example:\r\n<pre>data: [0, 5, 3, 5]</pre>\r\n \t</li>\r\n \t<li><p>An array of arrays with 2 values. In this case, the values correspond to <code>x,y</code>. If the first value is a string, it is\r\n \tapplied as the name of the point, and the <code>x</code> value is inferred. <pre>data: [\n    [0, 1], \n    [1, 2], \n    [2, 8]\n]</pre></li>\r\n\r\n\r\n<li><p>An array of objects with named values. The objects are\r\n \tpoint configuration objects as seen below. If the total number of data points exceeds the series' <a href='#series<line>.turboThreshold'>turboThreshold</a>, this option is not available.</p>\r\n\r\n<pre>data: [{\n    x: 1,\n    y: 10,\n    name: \"Point2\",\n    color: \"#00FF00\"\n}, {\n    x: 1,\n    y: 6,\n    name: \"Point1\",\n    color: \"#FF00FF\"\n}]</pre></li>\r\n </ol>","demo":"<ul>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">Numerical values</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays/\" target=\"_blank\">Arrays of numeric x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays-datetime/\" target=\"_blank\">Arrays of datetime x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-name-value/\" target=\"_blank\">Arrays of point.name and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\"> Config objects</a></li>\n</ul>","deprecated":false},{"name":"series<errorbar>-data","fullname":"series<errorbar>.data","title":"data","parent":"series<errorbar>","isParent":true,"returnType":"Array<Object|Array>","description":"An array of data points for the series. For the <code>errorbar</code> series type, points can be given in the following ways:\r\n <ol>\r\n \t<li><p>An array of arrays with 3 or 2 values. In this case, the values correspond to <code>x,low,high</code>. If the first value is a string, it is\r\n \tapplied as the name of the point, and the <code>x</code> value is inferred. The <code>x</code> value can also be omitted, in which case the inner arrays should be of length 2. Then the <code>x</code> value is automatically calculated, either starting at 0 and incremented by 1, or from <code>pointStart</code> \r\n \tand <code>pointInterval</code> given in the series options.</p>\r\n<pre>data: [\n    [0, 10, 2], \n    [1, 1, 8], \n    [2, 4, 5]\n]</pre></li>\r\n\r\n\r\n<li><p>An array of objects with named values. The objects are\r\n \tpoint configuration objects as seen below. If the total number of data points exceeds the series' <a href='#series<errorbar>.turboThreshold'>turboThreshold</a>, this option is not available.</p>\r\n\r\n<pre>data: [{\n    x: 1,\n    low: 0,\n    high: 0,\n    name: \"Point2\",\n    color: \"#00FF00\"\n}, {\n    x: 1,\n    low: 5,\n    high: 5,\n    name: \"Point1\",\n    color: \"#FF00FF\"\n}]</pre></li>\r\n </ol>","demo":"<p>The demos use a line series, but the principle is the same for all types.</p>\n<ul>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">Numerical values</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays/\" target=\"_blank\">Arrays of numeric x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays-datetime/\" target=\"_blank\">Arrays of datetime x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-name-value/\" target=\"_blank\">Arrays of point.name and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\"> Config objects</a></li>\n</ul>"},{"name":"series<arearange>-data","fullname":"series<arearange>.data","title":"data","parent":"series<arearange>","isParent":true,"returnType":"Array<Object|Array>","description":"An array of data points for the series. For the <code>arearange</code> series type, points can be given in the following ways:\r\n <ol>\r\n \t<li><p>An array of arrays with 3 or 2 values. In this case, the values correspond to <code>x,low,high</code>. If the first value is a string, it is\r\n \tapplied as the name of the point, and the <code>x</code> value is inferred. The <code>x</code> value can also be omitted, in which case the inner arrays should be of length 2. Then the <code>x</code> value is automatically calculated, either starting at 0 and incremented by 1, or from <code>pointStart</code> \r\n \tand <code>pointInterval</code> given in the series options.</p>\r\n<pre>data: [\n    [0, 8, 3], \n    [1, 1, 1], \n    [2, 6, 8]\n]</pre></li>\r\n\r\n\r\n<li><p>An array of objects with named values. The objects are\r\n \tpoint configuration objects as seen below. If the total number of data points exceeds the series' <a href='#series<arearange>.turboThreshold'>turboThreshold</a>, this option is not available.</p>\r\n\r\n<pre>data: [{\n    x: 1,\n    low: 9,\n    high: 0,\n    name: \"Point2\",\n    color: \"#00FF00\"\n}, {\n    x: 1,\n    low: 3,\n    high: 4,\n    name: \"Point1\",\n    color: \"#FF00FF\"\n}]</pre></li>\r\n </ol>","demo":"<p>The demos use a line series, but the principle is the same for all types.</p>\n<ul>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">Numerical values</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays/\" target=\"_blank\">Arrays of numeric x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays-datetime/\" target=\"_blank\">Arrays of datetime x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-name-value/\" target=\"_blank\">Arrays of point.name and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\"> Config objects</a></li>\n</ul>"},{"name":"series<solidgauge>-data","fullname":"series<solidgauge>.data","title":"data","parent":"series<solidgauge>","isParent":true,"returnType":"Array<Object|Number>","description":"An array of data points for the series. For the <code>solidgauge</code> series type, points can be given in the following ways:\r\n <ol>\r\n \t<li>An array of numerical values. In this case, the numerical values will \r\n \tbe interpreted as <code>y</code> options.  Example:\r\n<pre>data: [0, 5, 3, 5]</pre>\r\n \t</li>\r\n <li><p>An array of objects with named values. The objects are\r\n \tpoint configuration objects as seen below. If the total number of data points exceeds the series' <a href='#series<solidgauge>.turboThreshold'>turboThreshold</a>, this option is not available.</p>\r\n\r\n<pre>data: [{\n    y: 5,\n    name: \"Point2\",\n    color: \"#00FF00\"\n}, {\n    y: 7,\n    name: \"Point1\",\n    color: \"#FF00FF\"\n}]</pre></li>\r\n </ol><p>The typical gauge only contains a single data value.</p>","demo":"<p>The demos use a line series, but the principle is the same for all types.</p>\n<ul>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">Numerical values</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays/\" target=\"_blank\">Arrays of numeric x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays-datetime/\" target=\"_blank\">Arrays of datetime x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-name-value/\" target=\"_blank\">Arrays of point.name and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\"> Config objects</a></li>\n</ul>"},{"name":"series<bubble>-data","fullname":"series<bubble>.data","title":"data","parent":"series<bubble>","isParent":true,"returnType":"Array<Object|Array>","description":"An array of data points for the series. For the <code>bubble</code> series type, points can be given in the following ways:\r\n <ol>\r\n \t<li><p>An array of arrays with 3 or 2 values. In this case, the values correspond to <code>x,y,z</code>. If the first value is a string, it is\r\n \tapplied as the name of the point, and the <code>x</code> value is inferred. The <code>x</code> value can also be omitted, in which case the inner arrays should be of length 2. Then the <code>x</code> value is automatically calculated, either starting at 0 and incremented by 1, or from <code>pointStart</code> \r\n \tand <code>pointInterval</code> given in the series options.</p>\r\n<pre>data: [\n    [0, 1, 2], \n    [1, 5, 5], \n    [2, 0, 2]\n]</pre></li>\r\n\r\n\r\n<li><p>An array of objects with named values. The objects are\r\n \tpoint configuration objects as seen below. If the total number of data points exceeds the series' <a href='#series<bubble>.turboThreshold'>turboThreshold</a>, this option is not available.</p>\r\n\r\n<pre>data: [{\n    x: 1,\n    y: 1,\n    z: 1,\n    name: \"Point2\",\n    color: \"#00FF00\"\n}, {\n    x: 1,\n    y: 5,\n    z: 4,\n    name: \"Point1\",\n    color: \"#FF00FF\"\n}]</pre></li>\r\n </ol>","demo":"<p>The demos use a line series, but the principle is the same for all types.</p>\n<ul>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">Numerical values</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays/\" target=\"_blank\">Arrays of numeric x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays-datetime/\" target=\"_blank\">Arrays of datetime x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-name-value/\" target=\"_blank\">Arrays of point.name and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\"> Config objects</a></li>\n</ul>"},{"name":"series<scatter>-data","fullname":"series<scatter>.data","title":"data","parent":"series<scatter>","isParent":true,"returnType":"Array<Object|Array|Number>","description":"An array of data points for the series. For the <code>scatter</code> series type, points can be given in the following ways:\r\n <ol>\r\n \t<li>An array of numerical values. In this case, the numerical values will \r\n \tbe interpreted as <code>y</code> options. The <code>x</code> values will be automatically calculated,\r\n \teither starting at 0 and incremented by 1, or from <code>pointStart</code> \r\n \tand <code>pointInterval</code> given in the series options. If the axis\r\n \thas categories, these will be used.  Example:\r\n<pre>data: [0, 5, 3, 5]</pre>\r\n \t</li>\r\n \t<li><p>An array of arrays with 2 values. In this case, the values correspond to <code>x,y</code>. If the first value is a string, it is\r\n \tapplied as the name of the point, and the <code>x</code> value is inferred. <pre>data: [\n    [0, 0], \n    [1, 8], \n    [2, 9]\n]</pre></li>\r\n\r\n\r\n<li><p>An array of objects with named values. The objects are\r\n \tpoint configuration objects as seen below. If the total number of data points exceeds the series' <a href='#series<scatter>.turboThreshold'>turboThreshold</a>, this option is not available.</p>\r\n\r\n<pre>data: [{\n    x: 1,\n    y: 2,\n    name: \"Point2\",\n    color: \"#00FF00\"\n}, {\n    x: 1,\n    y: 4,\n    name: \"Point1\",\n    color: \"#FF00FF\"\n}]</pre></li>\r\n </ol>","demo":"<p>The demos use a line series, but the principle is the same for all types.</p>\n<ul>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">Numerical values</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays/\" target=\"_blank\">Arrays of numeric x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays-datetime/\" target=\"_blank\">Arrays of datetime x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-name-value/\" target=\"_blank\">Arrays of point.name and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\"> Config objects</a></li>\n</ul>"},{"name":"series<treemap>-data","fullname":"series<treemap>.data","title":"data","parent":"series<treemap>","isParent":true,"returnType":"Array<Object|Number>","description":"An array of data points for the series. For the <code>treemap</code> series type, points can be given in the following ways:\r\n <ol>\r\n \t<li>An array of numerical values. In this case, the numerical values will \r\n \tbe interpreted as <code>value</code> options.  Example:\r\n<pre>data: [0, 5, 3, 5]</pre>\r\n \t</li>\r\n <li><p>An array of objects with named values. The objects are\r\n \tpoint configuration objects as seen below. If the total number of data points exceeds the series' <a href='#series<treemap>.turboThreshold'>turboThreshold</a>, this option is not available.</p>\r\n\r\n<pre>data: [{\n    value: 7,\n    name: \"Point2\",\n    color: \"#00FF00\"\n}, {\n    value: 2,\n    name: \"Point1\",\n    color: \"#FF00FF\"\n}]</pre></li>\r\n </ol>","demo":"<p>The demos use a line series, but the principle is the same for all types.</p>\n<ul>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">Numerical values</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays/\" target=\"_blank\">Arrays of numeric x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays-datetime/\" target=\"_blank\">Arrays of datetime x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-name-value/\" target=\"_blank\">Arrays of point.name and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\"> Config objects</a></li>\n</ul>"},{"name":"series<bar>-data","fullname":"series<bar>.data","title":"data","parent":"series<bar>","isParent":true,"returnType":"Array<Object|Array|Number>","description":"An array of data points for the series. For the <code>bar</code> series type, points can be given in the following ways:\r\n <ol>\r\n \t<li>An array of numerical values. In this case, the numerical values will \r\n \tbe interpreted as <code>y</code> options. The <code>x</code> values will be automatically calculated,\r\n \teither starting at 0 and incremented by 1, or from <code>pointStart</code> \r\n \tand <code>pointInterval</code> given in the series options. If the axis\r\n \thas categories, these will be used.  Example:\r\n<pre>data: [0, 5, 3, 5]</pre>\r\n \t</li>\r\n \t<li><p>An array of arrays with 2 values. In this case, the values correspond to <code>x,y</code>. If the first value is a string, it is\r\n \tapplied as the name of the point, and the <code>x</code> value is inferred. <pre>data: [\n    [0, 5], \n    [1, 10], \n    [2, 3]\n]</pre></li>\r\n\r\n\r\n<li><p>An array of objects with named values. The objects are\r\n \tpoint configuration objects as seen below. If the total number of data points exceeds the series' <a href='#series<bar>.turboThreshold'>turboThreshold</a>, this option is not available.</p>\r\n\r\n<pre>data: [{\n    x: 1,\n    y: 1,\n    name: \"Point2\",\n    color: \"#00FF00\"\n}, {\n    x: 1,\n    y: 10,\n    name: \"Point1\",\n    color: \"#FF00FF\"\n}]</pre></li>\r\n </ol>","demo":"<p>The demos use a line series, but the principle is the same for all types.</p>\n<ul>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">Numerical values</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays/\" target=\"_blank\">Arrays of numeric x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-arrays-datetime/\" target=\"_blank\">Arrays of datetime x and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-name-value/\" target=\"_blank\">Arrays of point.name and y</a></li>\n<li><a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\"> Config objects</a></li>\n</ul>"},{"name":"series<arearange>-dataLabels","fullname":"series<arearange>.dataLabels","title":"dataLabels","parent":"series<arearange>","isParent":true,"returnType":"Object","defaults":"","since":"2.3.0","description":"Extended data labels for range series types. Range series  data labels have no <code>x</code> and <code>y</code> options. Instead, they have <code>xLow</code>, <code>xHigh</code>, <code>yLow</code> and <code>yHigh</code> options to allow the higher and lower data label sets individually. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-dataLabels","fullname":"plotOptions.pyramid.dataLabels","title":"dataLabels","parent":"plotOptions-pyramid","isParent":true,"deprecated":false},{"name":"plotOptions-gauge-dataLabels","fullname":"plotOptions.gauge.dataLabels","title":"dataLabels","parent":"plotOptions-gauge","isParent":true,"returnType":"Object","since":"2.3.0","description":"Data labels for the gauge. For gauges, the data labels are enabled by default and shown in a bordered box below the point.","demo":"","deprecated":false},{"name":"plotOptions-pie-dataLabels","fullname":"plotOptions.pie.dataLabels","title":"dataLabels","parent":"plotOptions-pie","isParent":true,"deprecated":false},{"name":"series<treemap>-data--dataLabels","fullname":"series<treemap>.data.dataLabels","title":"dataLabels","parent":"series<treemap>-data","isParent":false,"returnType":"Object","description":"Individual data label for each point. The options are the same as the ones for  <a class=\"internal\" href=\"#plotOptions.series.dataLabels\">plotOptions.series.dataLabels</a>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/datalabels/\" target=\"_blank\">Show a label for the last value</a>","deprecated":false},{"name":"series<area>-dataLabels","fullname":"series<area>.dataLabels","title":"dataLabels","parent":"series<area>","isParent":true,"deprecated":false},{"name":"series<solidgauge>-dataLabels","fullname":"series<solidgauge>.dataLabels","title":"dataLabels","parent":"series<solidgauge>","isParent":true,"returnType":"Object","since":"2.3.0","description":"Data labels for the gauge. For gauges, the data labels are enabled by default and shown in a bordered box below the point.","demo":"","deprecated":false},{"name":"series<line>-data--dataLabels","fullname":"series<line>.data.dataLabels","title":"dataLabels","parent":"series<line>-data","isParent":false,"returnType":"Object","description":"Individual data label for each point. The options are the same as the ones for  <a class=\"internal\" href=\"#plotOptions.series.dataLabels\">plotOptions.series.dataLabels</a>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/datalabels/\" target=\"_blank\">Show a label for the last value</a>","deprecated":false},{"name":"plotOptions-treemap-levels--dataLabels","fullname":"plotOptions.treemap.levels.dataLabels","title":"dataLabels","parent":"plotOptions-treemap-levels","isParent":false,"returnType":"Object","defaults":"undefined","values":"","since":"4.1.0","description":"Can set the options of dataLabels on each point which lies on the level.\r\n<a href=\"#plotOptions.treemap.dataLabels\">plotOptions.treemap.dataLabels</a> for possible values.","demo":"","seeAlso":"","deprecated":false},{"name":"series<heatmap>-dataLabels","fullname":"series<heatmap>.dataLabels","title":"dataLabels","parent":"series<heatmap>","isParent":true,"deprecated":false},{"name":"series<areasplinerange>-data--dataLabels","fullname":"series<areasplinerange>.data.dataLabels","title":"dataLabels","parent":"series<areasplinerange>-data","isParent":false,"returnType":"Object","description":"Individual data label for each point. The options are the same as the ones for  <a class=\"internal\" href=\"#plotOptions.series.dataLabels\">plotOptions.series.dataLabels</a>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/datalabels/\" target=\"_blank\">Show a label for the last value</a>","deprecated":false},{"name":"series<bar>-dataLabels","fullname":"series<bar>.dataLabels","title":"dataLabels","parent":"series<bar>","isParent":true},{"name":"series<area>-data--dataLabels","fullname":"series<area>.data.dataLabels","title":"dataLabels","parent":"series<area>-data","isParent":false,"returnType":"Object","description":"Individual data label for each point. The options are the same as the ones for  <a class=\"internal\" href=\"#plotOptions.series.dataLabels\">plotOptions.series.dataLabels</a>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/datalabels/\" target=\"_blank\">Show a label for the last value</a>","deprecated":false},{"name":"plotOptions-treemap-dataLabels","fullname":"plotOptions.treemap.dataLabels","title":"dataLabels","parent":"plotOptions-treemap","isParent":true,"returnType":"","context":"","defaults":"","values":"","since":"4.1.0","description":"","demo":"","seeAlso":"","deprecated":false},{"name":"series<gauge>-dataLabels","fullname":"series<gauge>.dataLabels","title":"dataLabels","parent":"series<gauge>","isParent":true,"returnType":"Object","since":"2.3.0","description":"Data labels for the gauge. For gauges, the data labels are enabled by default and shown in a bordered box below the point.","demo":"","deprecated":false},{"name":"plotOptions-scatter-dataLabels","fullname":"plotOptions.scatter.dataLabels","title":"dataLabels","parent":"plotOptions-scatter","isParent":true,"deprecated":false},{"name":"series<waterfall>-data--dataLabels","fullname":"series<waterfall>.data.dataLabels","title":"dataLabels","parent":"series<waterfall>-data","isParent":false,"returnType":"Object","description":"Individual data label for each point. The options are the same as the ones for  <a class=\"internal\" href=\"#plotOptions.series.dataLabels\">plotOptions.series.dataLabels</a>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/datalabels/\" target=\"_blank\">Show a label for the last value</a>","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels","fullname":"plotOptions.areasplinerange.dataLabels","title":"dataLabels","parent":"plotOptions-areasplinerange","isParent":true,"returnType":"Object","defaults":"","since":"2.3.0","description":"Extended data labels for range series types. Range series  data labels have no <code>x</code> and <code>y</code> options. Instead, they have <code>xLow</code>, <code>xHigh</code>, <code>yLow</code> and <code>yHigh</code> options to allow the higher and lower data label sets individually. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<polygon>-data--dataLabels","fullname":"series<polygon>.data.dataLabels","title":"dataLabels","parent":"series<polygon>-data","isParent":false,"returnType":"Object","description":"Individual data label for each point. The options are the same as the ones for  <a class=\"internal\" href=\"#plotOptions.series.dataLabels\">plotOptions.series.dataLabels</a>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/datalabels/\" target=\"_blank\">Show a label for the last value</a>","deprecated":false},{"name":"series<line>-dataLabels","fullname":"series<line>.dataLabels","title":"dataLabels","parent":"series<line>","isParent":true,"deprecated":false},{"name":"series<treemap>-dataLabels","fullname":"series<treemap>.dataLabels","title":"dataLabels","parent":"series<treemap>","isParent":true,"returnType":"","context":"","defaults":"","values":"","since":"4.1.0","description":"","demo":"","seeAlso":"","deprecated":false},{"name":"series<polygon>-dataLabels","fullname":"series<polygon>.dataLabels","title":"dataLabels","parent":"series<polygon>","isParent":true,"deprecated":false},{"name":"plotOptions-columnrange-dataLabels","fullname":"plotOptions.columnrange.dataLabels","title":"dataLabels","parent":"plotOptions-columnrange","isParent":true,"returnType":"Object","defaults":"","since":"2.3.0","description":"Extended data labels for range series types. Range series  data labels have no <code>x</code> and <code>y</code> options. Instead, they have <code>xLow</code>, <code>xHigh</code>, <code>yLow</code> and <code>yHigh</code> options to allow the higher and lower data label sets individually. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<heatmap>-data--dataLabels","fullname":"series<heatmap>.data.dataLabels","title":"dataLabels","parent":"series<heatmap>-data","isParent":false,"returnType":"Object","description":"Individual data label for each point. The options are the same as the ones for  <a class=\"internal\" href=\"#plotOptions.series.dataLabels\">plotOptions.series.dataLabels</a>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/datalabels/\" target=\"_blank\">Show a label for the last value</a>","deprecated":false},{"name":"series<waterfall>-dataLabels","fullname":"series<waterfall>.dataLabels","title":"dataLabels","parent":"series<waterfall>","isParent":true,"deprecated":false},{"name":"plotOptions-waterfall-dataLabels","fullname":"plotOptions.waterfall.dataLabels","title":"dataLabels","parent":"plotOptions-waterfall","isParent":true,"deprecated":false},{"name":"series<pyramid>-data--dataLabels","fullname":"series<pyramid>.data.dataLabels","title":"dataLabels","parent":"series<pyramid>-data","isParent":false,"returnType":"Object","description":"Individual data label for each point. The options are the same as the ones for  <a class=\"internal\" href=\"#plotOptions.series.dataLabels\">plotOptions.series.dataLabels</a>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/datalabels/\" target=\"_blank\">Show a label for the last value</a>","deprecated":false},{"name":"series<areasplinerange>-dataLabels","fullname":"series<areasplinerange>.dataLabels","title":"dataLabels","parent":"series<areasplinerange>","isParent":true,"returnType":"Object","defaults":"","since":"2.3.0","description":"Extended data labels for range series types. Range series  data labels have no <code>x</code> and <code>y</code> options. Instead, they have <code>xLow</code>, <code>xHigh</code>, <code>yLow</code> and <code>yHigh</code> options to allow the higher and lower data label sets individually. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<pie>-dataLabels","fullname":"series<pie>.dataLabels","title":"dataLabels","parent":"series<pie>","isParent":true,"deprecated":false},{"name":"plotOptions-arearange-dataLabels","fullname":"plotOptions.arearange.dataLabels","title":"dataLabels","parent":"plotOptions-arearange","isParent":true,"returnType":"Object","defaults":"","since":"2.3.0","description":"Extended data labels for range series types. Range series  data labels have no <code>x</code> and <code>y</code> options. Instead, they have <code>xLow</code>, <code>xHigh</code>, <code>yLow</code> and <code>yHigh</code> options to allow the higher and lower data label sets individually. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-series-dataLabels","fullname":"plotOptions.series.dataLabels","title":"dataLabels","parent":"plotOptions-series","isParent":true,"deprecated":false},{"name":"series<bar>-data--dataLabels","fullname":"series<bar>.data.dataLabels","title":"dataLabels","parent":"series<bar>-data","isParent":false,"returnType":"Object","description":"Individual data label for each point. The options are the same as the ones for  <a class=\"internal\" href=\"#plotOptions.series.dataLabels\">plotOptions.series.dataLabels</a>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/datalabels/\" target=\"_blank\">Show a label for the last value</a>","deprecated":false},{"name":"series<bubble>-data--dataLabels","fullname":"series<bubble>.data.dataLabels","title":"dataLabels","parent":"series<bubble>-data","isParent":false,"returnType":"Object","description":"Individual data label for each point. The options are the same as the ones for  <a class=\"internal\" href=\"#plotOptions.series.dataLabels\">plotOptions.series.dataLabels</a>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/datalabels/\" target=\"_blank\">Show a label for the last value</a>","deprecated":false},{"name":"plotOptions-line-dataLabels","fullname":"plotOptions.line.dataLabels","title":"dataLabels","parent":"plotOptions-line","isParent":true,"deprecated":false},{"name":"series<funnel>-data--dataLabels","fullname":"series<funnel>.data.dataLabels","title":"dataLabels","parent":"series<funnel>-data","isParent":false,"returnType":"Object","description":"Individual data label for each point. The options are the same as the ones for  <a class=\"internal\" href=\"#plotOptions.series.dataLabels\">plotOptions.series.dataLabels</a>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/datalabels/\" target=\"_blank\">Show a label for the last value</a>","deprecated":false},{"name":"series<arearange>-data--dataLabels","fullname":"series<arearange>.data.dataLabels","title":"dataLabels","parent":"series<arearange>-data","isParent":false,"returnType":"Object","description":"Individual data label for each point. The options are the same as the ones for  <a class=\"internal\" href=\"#plotOptions.series.dataLabels\">plotOptions.series.dataLabels</a>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/datalabels/\" target=\"_blank\">Show a label for the last value</a>","deprecated":false},{"name":"plotOptions-spline-dataLabels","fullname":"plotOptions.spline.dataLabels","title":"dataLabels","parent":"plotOptions-spline","isParent":true,"deprecated":false},{"name":"series<areaspline>-dataLabels","fullname":"series<areaspline>.dataLabels","title":"dataLabels","parent":"series<areaspline>","isParent":true,"deprecated":false},{"name":"series<scatter>-dataLabels","fullname":"series<scatter>.dataLabels","title":"dataLabels","parent":"series<scatter>","isParent":true,"deprecated":false},{"name":"plotOptions-heatmap-dataLabels","fullname":"plotOptions.heatmap.dataLabels","title":"dataLabels","parent":"plotOptions-heatmap","isParent":true,"deprecated":false},{"name":"series<solidgauge>-data--dataLabels","fullname":"series<solidgauge>.data.dataLabels","title":"dataLabels","parent":"series<solidgauge>-data","isParent":false,"returnType":"Object","description":"Individual data label for each point. The options are the same as the ones for  <a class=\"internal\" href=\"#plotOptions.series.dataLabels\">plotOptions.series.dataLabels</a>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/datalabels/\" target=\"_blank\">Show a label for the last value</a>","deprecated":false},{"name":"plotOptions-bar-dataLabels","fullname":"plotOptions.bar.dataLabels","title":"dataLabels","parent":"plotOptions-bar","isParent":true},{"name":"series<columnrange>-dataLabels","fullname":"series<columnrange>.dataLabels","title":"dataLabels","parent":"series<columnrange>","isParent":true,"returnType":"Object","defaults":"","since":"2.3.0","description":"Extended data labels for range series types. Range series  data labels have no <code>x</code> and <code>y</code> options. Instead, they have <code>xLow</code>, <code>xHigh</code>, <code>yLow</code> and <code>yHigh</code> options to allow the higher and lower data label sets individually. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column-dataLabels","fullname":"plotOptions.column.dataLabels","title":"dataLabels","parent":"plotOptions-column","isParent":true,"deprecated":false},{"name":"series<bubble>-dataLabels","fullname":"series<bubble>.dataLabels","title":"dataLabels","parent":"series<bubble>","isParent":true,"deprecated":false},{"name":"series<treemap>-levels--dataLabels","fullname":"series<treemap>.levels.dataLabels","title":"dataLabels","parent":"series<treemap>-levels","isParent":false,"returnType":"Object","defaults":"undefined","values":"","since":"4.1.0","description":"Can set the options of dataLabels on each point which lies on the level.\r\n<a href=\"#plotOptions.treemap.dataLabels\">plotOptions.treemap.dataLabels</a> for possible values.","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>-dataLabels","fullname":"series<spline>.dataLabels","title":"dataLabels","parent":"series<spline>","isParent":true,"deprecated":false},{"name":"plotOptions-funnel-dataLabels","fullname":"plotOptions.funnel.dataLabels","title":"dataLabels","parent":"plotOptions-funnel","isParent":true,"deprecated":false},{"name":"series<scatter>-data--dataLabels","fullname":"series<scatter>.data.dataLabels","title":"dataLabels","parent":"series<scatter>-data","isParent":false,"returnType":"Object","description":"Individual data label for each point. The options are the same as the ones for  <a class=\"internal\" href=\"#plotOptions.series.dataLabels\">plotOptions.series.dataLabels</a>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/datalabels/\" target=\"_blank\">Show a label for the last value</a>","deprecated":false},{"name":"plotOptions-areaspline-dataLabels","fullname":"plotOptions.areaspline.dataLabels","title":"dataLabels","parent":"plotOptions-areaspline","isParent":true,"deprecated":false},{"name":"series<column>-data--dataLabels","fullname":"series<column>.data.dataLabels","title":"dataLabels","parent":"series<column>-data","isParent":false,"returnType":"Object","description":"Individual data label for each point. The options are the same as the ones for  <a class=\"internal\" href=\"#plotOptions.series.dataLabels\">plotOptions.series.dataLabels</a>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/datalabels/\" target=\"_blank\">Show a label for the last value</a>","deprecated":false},{"name":"series<pyramid>-dataLabels","fullname":"series<pyramid>.dataLabels","title":"dataLabels","parent":"series<pyramid>","isParent":true,"deprecated":false},{"name":"plotOptions-area-dataLabels","fullname":"plotOptions.area.dataLabels","title":"dataLabels","parent":"plotOptions-area","isParent":true,"deprecated":false},{"name":"series<column>-dataLabels","fullname":"series<column>.dataLabels","title":"dataLabels","parent":"series<column>","isParent":true,"deprecated":false},{"name":"series<boxplot>-data--dataLabels","fullname":"series<boxplot>.data.dataLabels","title":"dataLabels","parent":"series<boxplot>-data","isParent":false,"returnType":"Object","description":"Individual data label for each point. The options are the same as the ones for  <a class=\"internal\" href=\"#plotOptions.series.dataLabels\">plotOptions.series.dataLabels</a>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/datalabels/\" target=\"_blank\">Show a label for the last value</a>","deprecated":false},{"name":"series<funnel>-dataLabels","fullname":"series<funnel>.dataLabels","title":"dataLabels","parent":"series<funnel>","isParent":true,"deprecated":false},{"name":"series<pie>-data--dataLabels","fullname":"series<pie>.data.dataLabels","title":"dataLabels","parent":"series<pie>-data","isParent":false,"returnType":"Object","description":"Individual data label for each point. The options are the same as the ones for  <a class=\"internal\" href=\"#plotOptions.series.dataLabels\">plotOptions.series.dataLabels</a>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/datalabels/\" target=\"_blank\">Show a label for the last value</a>","deprecated":false},{"name":"series<spline>-data--dataLabels","fullname":"series<spline>.data.dataLabels","title":"dataLabels","parent":"series<spline>-data","isParent":false,"returnType":"Object","description":"Individual data label for each point. The options are the same as the ones for  <a class=\"internal\" href=\"#plotOptions.series.dataLabels\">plotOptions.series.dataLabels</a>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/datalabels/\" target=\"_blank\">Show a label for the last value</a>","deprecated":false},{"name":"series<gauge>-data--dataLabels","fullname":"series<gauge>.data.dataLabels","title":"dataLabels","parent":"series<gauge>-data","isParent":false,"returnType":"Object","description":"Individual data label for each point. The options are the same as the ones for  <a class=\"internal\" href=\"#plotOptions.series.dataLabels\">plotOptions.series.dataLabels</a>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/datalabels/\" target=\"_blank\">Show a label for the last value</a>","deprecated":false},{"name":"series<columnrange>-data--dataLabels","fullname":"series<columnrange>.data.dataLabels","title":"dataLabels","parent":"series<columnrange>-data","isParent":false,"returnType":"Object","description":"Individual data label for each point. The options are the same as the ones for  <a class=\"internal\" href=\"#plotOptions.series.dataLabels\">plotOptions.series.dataLabels</a>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/datalabels/\" target=\"_blank\">Show a label for the last value</a>","deprecated":false},{"name":"plotOptions-polygon-dataLabels","fullname":"plotOptions.polygon.dataLabels","title":"dataLabels","parent":"plotOptions-polygon","isParent":true,"deprecated":false},{"name":"plotOptions-solidgauge-dataLabels","fullname":"plotOptions.solidgauge.dataLabels","title":"dataLabels","parent":"plotOptions-solidgauge","isParent":true,"returnType":"Object","since":"2.3.0","description":"Data labels for the gauge. For gauges, the data labels are enabled by default and shown in a bordered box below the point.","demo":"","deprecated":false},{"name":"plotOptions-bubble-dataLabels","fullname":"plotOptions.bubble.dataLabels","title":"dataLabels","parent":"plotOptions-bubble","isParent":true,"deprecated":false},{"name":"series<areaspline>-data--dataLabels","fullname":"series<areaspline>.data.dataLabels","title":"dataLabels","parent":"series<areaspline>-data","isParent":false,"returnType":"Object","description":"Individual data label for each point. The options are the same as the ones for  <a class=\"internal\" href=\"#plotOptions.series.dataLabels\">plotOptions.series.dataLabels</a>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/datalabels/\" target=\"_blank\">Show a label for the last value</a>","deprecated":false},{"name":"series--dataParser","fullname":"series.dataParser","title":"dataParser","parent":"series","isParent":false,"returnType":"Function","since":"","description":"This method is deprecated as of version 2.0. Instead, use options preprocessing as described in <a href=\"http://docs.highcharts.com/#preprocessing\">the docs</a>.","demo":"","seeAlso":"","deprecated":true},{"name":"series--dataURL","fullname":"series.dataURL","title":"dataURL","parent":"series","isParent":false,"returnType":"String","since":"","description":"This method is deprecated as of version 2.0. Instead, load the data using jQuery.ajax and use options preprocessing as described in <a href=\"http://docs.highcharts.com/#preprocessing\">the docs</a>.","demo":"","seeAlso":"","deprecated":true},{"name":"data--dateFormat","fullname":"data.dateFormat","title":"dateFormat","parent":"data","isParent":false,"returnType":"String","since":"4.0","description":"<p>Which of the predefined date formats in Date.prototype.dateFormats to use to parse date values. Defaults to a best guess based on what format gives valid and ordered dates.</p>\r\n\r\n<p>Valid options include:\r\n<ul>\r\n<li><code>YYYY-mm-dd</code></li>\r\n<li><code>dd/mm/YYYY</code></li>\r\n<li><code>mm/dd/YYYY</code></li>\r\n<li><code>dd/mm/YY</code></li>\r\n<li><code>mm/dd/YY</code></li>\r\n</ul>\r\n</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/data/dateformat-auto/\" target=\"_blank\">Best guess date format</a>","seeAlso":"<a href=\"#data.parseDate\">data.parseDate</a>","deprecated":false},{"name":"xAxis--dateTimeLabelFormats","fullname":"xAxis.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"xAxis","isParent":false,"returnType":"Object","description":"For a datetime axis, the scale will automatically adjust to the appropriate unit.\r This member gives the default string representations used for each unit. For an\r overview of the replacement codes, see dateFormat.\r Defaults to:\r\n<pre>{\r\n\tmillisecond: '%H:%M:%S.%L',\r\n\tsecond: '%H:%M:%S',\r\n\tminute: '%H:%M',\r\n\thour: '%H:%M',\r\n\tday: '%e. %b',\r\n\tweek: '%e. %b',\r\n\tmonth: '%b \\'%y',\r\n\tyear: '%Y'\r\n}</pre>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/datetimelabelformats/\" target=\"_blank\">Different day format on X axis</a>","deprecated":false},{"name":"series<area>-tooltip--dateTimeLabelFormats","fullname":"series<area>.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"series<area>-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"plotOptions-scatter-tooltip--dateTimeLabelFormats","fullname":"plotOptions.scatter.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"plotOptions-scatter-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"series<gauge>-tooltip--dateTimeLabelFormats","fullname":"series<gauge>.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"series<gauge>-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"series<areaspline>-tooltip--dateTimeLabelFormats","fullname":"series<areaspline>.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"series<areaspline>-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"plotOptions-polygon-tooltip--dateTimeLabelFormats","fullname":"plotOptions.polygon.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"plotOptions-polygon-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"series<solidgauge>-tooltip--dateTimeLabelFormats","fullname":"series<solidgauge>.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"series<solidgauge>-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"series<line>-tooltip--dateTimeLabelFormats","fullname":"series<line>.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"series<line>-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"plotOptions-solidgauge-tooltip--dateTimeLabelFormats","fullname":"plotOptions.solidgauge.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"plotOptions-solidgauge-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"plotOptions-areaspline-tooltip--dateTimeLabelFormats","fullname":"plotOptions.areaspline.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"plotOptions-areaspline-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"series<bubble>-tooltip--dateTimeLabelFormats","fullname":"series<bubble>.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"series<bubble>-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"plotOptions-bar-tooltip--dateTimeLabelFormats","fullname":"plotOptions.bar.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"plotOptions-bar-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"plotOptions-pie-tooltip--dateTimeLabelFormats","fullname":"plotOptions.pie.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"plotOptions-pie-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"plotOptions-funnel-tooltip--dateTimeLabelFormats","fullname":"plotOptions.funnel.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"plotOptions-funnel-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"plotOptions-treemap-tooltip--dateTimeLabelFormats","fullname":"plotOptions.treemap.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"plotOptions-treemap-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"plotOptions-gauge-tooltip--dateTimeLabelFormats","fullname":"plotOptions.gauge.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"plotOptions-gauge-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"plotOptions-errorbar-tooltip--dateTimeLabelFormats","fullname":"plotOptions.errorbar.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"plotOptions-errorbar-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"series<areasplinerange>-tooltip--dateTimeLabelFormats","fullname":"series<areasplinerange>.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"series<areasplinerange>-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"plotOptions-arearange-tooltip--dateTimeLabelFormats","fullname":"plotOptions.arearange.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"plotOptions-arearange-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"yAxis--dateTimeLabelFormats","fullname":"yAxis.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"yAxis","isParent":false,"returnType":"Object","description":"For a datetime axis, the scale will automatically adjust to the appropriate unit.\r This member gives the default string representations used for each unit. For an\r overview of the replacement codes, see dateFormat.\r Defaults to:\r\n<pre>{\r\n\tmillisecond: '%H:%M:%S.%L',\r\n\tsecond: '%H:%M:%S',\r\n\tminute: '%H:%M',\r\n\thour: '%H:%M',\r\n\tday: '%e. %b',\r\n\tweek: '%e. %b',\r\n\tmonth: '%b \\'%y',\r\n\tyear: '%Y'\r\n}</pre>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/datetimelabelformats/\" target=\"_blank\">Different day format on X axis</a>","deprecated":false},{"name":"series<pyramid>-tooltip--dateTimeLabelFormats","fullname":"series<pyramid>.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"series<pyramid>-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"series<column>-tooltip--dateTimeLabelFormats","fullname":"series<column>.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"series<column>-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"plotOptions-areasplinerange-tooltip--dateTimeLabelFormats","fullname":"plotOptions.areasplinerange.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"plotOptions-areasplinerange-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"plotOptions-line-tooltip--dateTimeLabelFormats","fullname":"plotOptions.line.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"plotOptions-line-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"series<treemap>-tooltip--dateTimeLabelFormats","fullname":"series<treemap>.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"series<treemap>-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"plotOptions-boxplot-tooltip--dateTimeLabelFormats","fullname":"plotOptions.boxplot.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"plotOptions-boxplot-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"series<scatter>-tooltip--dateTimeLabelFormats","fullname":"series<scatter>.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"series<scatter>-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"series<spline>-tooltip--dateTimeLabelFormats","fullname":"series<spline>.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"series<spline>-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"plotOptions-waterfall-tooltip--dateTimeLabelFormats","fullname":"plotOptions.waterfall.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"plotOptions-waterfall-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"series<errorbar>-tooltip--dateTimeLabelFormats","fullname":"series<errorbar>.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"series<errorbar>-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"plotOptions-series-tooltip--dateTimeLabelFormats","fullname":"plotOptions.series.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"plotOptions-series-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"tooltip--date","fullname":"tooltip.date","title":"dateTimeLabelFormats","parent":"tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"plotOptions-heatmap-tooltip--dateTimeLabelFormats","fullname":"plotOptions.heatmap.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"plotOptions-heatmap-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"plotOptions-area-tooltip--dateTimeLabelFormats","fullname":"plotOptions.area.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"plotOptions-area-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"series<columnrange>-tooltip--dateTimeLabelFormats","fullname":"series<columnrange>.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"series<columnrange>-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"plotOptions-columnrange-tooltip--dateTimeLabelFormats","fullname":"plotOptions.columnrange.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"plotOptions-columnrange-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"series<bar>-tooltip--dateTimeLabelFormats","fullname":"series<bar>.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"series<bar>-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"series<heatmap>-tooltip--dateTimeLabelFormats","fullname":"series<heatmap>.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"series<heatmap>-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"plotOptions-column-tooltip--dateTimeLabelFormats","fullname":"plotOptions.column.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"plotOptions-column-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"series<waterfall>-tooltip--dateTimeLabelFormats","fullname":"series<waterfall>.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"series<waterfall>-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"plotOptions-spline-tooltip--dateTimeLabelFormats","fullname":"plotOptions.spline.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"plotOptions-spline-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"series<polygon>-tooltip--dateTimeLabelFormats","fullname":"series<polygon>.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"series<polygon>-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"series<arearange>-tooltip--dateTimeLabelFormats","fullname":"series<arearange>.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"series<arearange>-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"series<pie>-tooltip--dateTimeLabelFormats","fullname":"series<pie>.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"series<pie>-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"series<boxplot>-tooltip--dateTimeLabelFormats","fullname":"series<boxplot>.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"series<boxplot>-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"plotOptions-bubble-tooltip--dateTimeLabelFormats","fullname":"plotOptions.bubble.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"plotOptions-bubble-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"plotOptions-pyramid-tooltip--dateTimeLabelFormats","fullname":"plotOptions.pyramid.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"plotOptions-pyramid-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"series<funnel>-tooltip--dateTimeLabelFormats","fullname":"series<funnel>.tooltip.dateTimeLabelFormats","title":"dateTimeLabelFormats","parent":"series<funnel>-tooltip","isParent":false,"returnType":"Object","defaults":"","values":"","since":"","description":"<p>For series on a datetime axes, the date format in the tooltip's header will by default be guessed based on the closest data points. This member gives the default string representations used for each unit. For an overview of the replacement codes, see <a href=\"#Highcharts.dateFormat\">dateFormat</a>.</p>\r\n\r\n<p>Defaults to:\r\n<pre>{\r\n    millisecond:\"%A, %b %e, %H:%M:%S.%L\",\r\n    second:\"%A, %b %e, %H:%M:%S\",\r\n    minute:\"%A, %b %e, %H:%M\",\r\n    hour:\"%A, %b %e, %H:%M\",\r\n    day:\"%A, %b %e, %Y\",\r\n    week:\"Week from %A, %b %e, %Y\",\r\n    month:\"%B %Y\",\r\n    year:\"%Y\"\r\n}</pre>\r\n</p>","demo":"","seeAlso":"<a href=\"#xAxis.dateTimeLabelFormats\">xAxis.dateTimeLabelFormats</a>","deprecated":false},{"name":"data--decimalPoint","fullname":"data.decimalPoint","title":"decimalPoint","parent":"data","isParent":false,"returnType":"String","defaults":".","values":"","since":"4.1.0","description":"The decimal point used for parsing numbers in the CSV.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/data/delimiters/\" target=\"_blank\">Comma as decimal point</a>","seeAlso":"","deprecated":false},{"name":"lang--decimalPoint","fullname":"lang.decimalPoint","title":"decimalPoint","parent":"lang","isParent":false,"returnType":"String","defaults":".","since":"1.2.2","description":"The default decimal point used in the <code>Highcharts.numberFormat</code> method unless otherwise specified in the function arguments."},{"name":"chart--defaultSeriesType","fullname":"chart.defaultSeriesType","title":"defaultSeriesType","parent":"chart","isParent":false,"returnType":"String","defaults":"line","values":"[\"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\"]","description":"Alias of <code>type</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/defaultseriestype/\" target=\"_blank\">Bar</a>","deprecated":true},{"name":"plotOptions-gauge-dataLabels--defer","fullname":"plotOptions.gauge.dataLabels.defer","title":"defer","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble-dataLabels--defer","fullname":"plotOptions.bubble.dataLabels.defer","title":"defer","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange-dataLabels--defer","fullname":"plotOptions.columnrange.dataLabels.defer","title":"defer","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column-dataLabels--defer","fullname":"plotOptions.column.dataLabels.defer","title":"defer","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areaspline>-dataLabels--defer","fullname":"series<areaspline>.dataLabels.defer","title":"defer","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-dataLabels--defer","fullname":"plotOptions.areaspline.dataLabels.defer","title":"defer","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"series<columnrange>-dataLabels--defer","fullname":"series<columnrange>.dataLabels.defer","title":"defer","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"series<heatmap>-dataLabels--defer","fullname":"series<heatmap>.dataLabels.defer","title":"defer","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"series<scatter>-dataLabels--defer","fullname":"series<scatter>.dataLabels.defer","title":"defer","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"series<solidgauge>-dataLabels--defer","fullname":"series<solidgauge>.dataLabels.defer","title":"defer","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bar>-dataLabels--defer","fullname":"series<bar>.dataLabels.defer","title":"defer","parent":"series<bar>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-dataLabels--defer","fullname":"plotOptions.polygon.dataLabels.defer","title":"defer","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-area-dataLabels--defer","fullname":"plotOptions.area.dataLabels.defer","title":"defer","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap-dataLabels--defer","fullname":"plotOptions.treemap.dataLabels.defer","title":"defer","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"Boolean","context":"","defaults":"false","values":"","since":"4.1.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"series<treemap>-dataLabels--defer","fullname":"series<treemap>.dataLabels.defer","title":"defer","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"Boolean","context":"","defaults":"false","values":"","since":"4.1.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels--defer","fullname":"plotOptions.areasplinerange.dataLabels.defer","title":"defer","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bar-dataLabels--defer","fullname":"plotOptions.bar.dataLabels.defer","title":"defer","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap-dataLabels--defer","fullname":"plotOptions.heatmap.dataLabels.defer","title":"defer","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"series<funnel>-dataLabels--defer","fullname":"series<funnel>.dataLabels.defer","title":"defer","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"series<area>-dataLabels--defer","fullname":"series<area>.dataLabels.defer","title":"defer","parent":"series<area>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"series<gauge>-dataLabels--defer","fullname":"series<gauge>.dataLabels.defer","title":"defer","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-solidgauge-dataLabels--defer","fullname":"plotOptions.solidgauge.dataLabels.defer","title":"defer","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-line-dataLabels--defer","fullname":"plotOptions.line.dataLabels.defer","title":"defer","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"series<line>-dataLabels--defer","fullname":"series<line>.dataLabels.defer","title":"defer","parent":"series<line>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>-dataLabels--defer","fullname":"series<spline>.dataLabels.defer","title":"defer","parent":"series<spline>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"series<polygon>-dataLabels--defer","fullname":"series<polygon>.dataLabels.defer","title":"defer","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel-dataLabels--defer","fullname":"plotOptions.funnel.dataLabels.defer","title":"defer","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-dataLabels--defer","fullname":"plotOptions.spline.dataLabels.defer","title":"defer","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall-dataLabels--defer","fullname":"plotOptions.waterfall.dataLabels.defer","title":"defer","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"series<arearange>-dataLabels--defer","fullname":"series<arearange>.dataLabels.defer","title":"defer","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pyramid>-dataLabels--defer","fullname":"series<pyramid>.dataLabels.defer","title":"defer","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-dataLabels--defer","fullname":"series<areasplinerange>.dataLabels.defer","title":"defer","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pie-dataLabels--defer","fullname":"plotOptions.pie.dataLabels.defer","title":"defer","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bubble>-dataLabels--defer","fullname":"series<bubble>.dataLabels.defer","title":"defer","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"series<column>-dataLabels--defer","fullname":"series<column>.dataLabels.defer","title":"defer","parent":"series<column>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange-dataLabels--defer","fullname":"plotOptions.arearange.dataLabels.defer","title":"defer","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-series-dataLabels--defer","fullname":"plotOptions.series.dataLabels.defer","title":"defer","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-dataLabels--defer","fullname":"plotOptions.pyramid.dataLabels.defer","title":"defer","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pie>-dataLabels--defer","fullname":"series<pie>.dataLabels.defer","title":"defer","parent":"series<pie>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"series<waterfall>-dataLabels--defer","fullname":"series<waterfall>.dataLabels.defer","title":"defer","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter-dataLabels--defer","fullname":"plotOptions.scatter.dataLabels.defer","title":"defer","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"4.0","description":"Whether to defer displaying the data labels until the initial series animation has finished.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel--depth","fullname":"plotOptions.funnel.depth","title":"depth","parent":"plotOptions-funnel","isParent":false,"returnType":"Number","defaults":"0","since":"4.0","description":"The thickness of a 3D pie. Requires <code>highcharts-3d.js</code>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/3d-pie/\">Basic 3D pie chart</a>","deprecated":false},{"name":"series<column>--depth","fullname":"series<column>.depth","title":"depth","parent":"series<column>","isParent":false,"returnType":"Number","defaults":"25","since":"4.0","description":"Depth of the columns in a 3D column chart. Requires <code>highcharts-3d.js</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/3d/column/\">Basic 3D column chart</a>","deprecated":false},{"name":"chart-options3d--depth","fullname":"chart.options3d.depth","title":"depth","parent":"chart-options3d","isParent":false,"returnType":"Number","defaults":"100","values":"","since":"4.0","description":"The total depth of the chart.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar--depth","fullname":"plotOptions.errorbar.depth","title":"depth","parent":"plotOptions-errorbar","isParent":false,"returnType":"Number","defaults":"25","since":"4.0","description":"Depth of the columns in a 3D column chart. Requires <code>highcharts-3d.js</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/3d/column/\">Basic 3D column chart</a>","deprecated":false},{"name":"plotOptions-pie--depth","fullname":"plotOptions.pie.depth","title":"depth","parent":"plotOptions-pie","isParent":false,"returnType":"Number","defaults":"0","since":"4.0","description":"The thickness of a 3D pie. Requires <code>highcharts-3d.js</code>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/3d-pie/\">Basic 3D pie chart</a>","deprecated":false},{"name":"plotOptions-column--depth","fullname":"plotOptions.column.depth","title":"depth","parent":"plotOptions-column","isParent":false,"returnType":"Number","defaults":"25","since":"4.0","description":"Depth of the columns in a 3D column chart. Requires <code>highcharts-3d.js</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/3d/column/\">Basic 3D column chart</a>","deprecated":false},{"name":"plotOptions-pyramid--depth","fullname":"plotOptions.pyramid.depth","title":"depth","parent":"plotOptions-pyramid","isParent":false,"returnType":"Number","defaults":"0","since":"4.0","description":"The thickness of a 3D pie. Requires <code>highcharts-3d.js</code>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/3d-pie/\">Basic 3D pie chart</a>","deprecated":false},{"name":"series<errorbar>--depth","fullname":"series<errorbar>.depth","title":"depth","parent":"series<errorbar>","isParent":false,"returnType":"Number","defaults":"25","since":"4.0","description":"Depth of the columns in a 3D column chart. Requires <code>highcharts-3d.js</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/3d/column/\">Basic 3D column chart</a>","deprecated":false},{"name":"series<bar>--depth","fullname":"series<bar>.depth","title":"depth","parent":"series<bar>","isParent":false,"returnType":"Number","defaults":"25","since":"4.0","description":"Depth of the columns in a 3D column chart. Requires <code>highcharts-3d.js</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/3d/column/\">Basic 3D column chart</a>","deprecated":false},{"name":"series<waterfall>--depth","fullname":"series<waterfall>.depth","title":"depth","parent":"series<waterfall>","isParent":false,"returnType":"Number","defaults":"25","since":"4.0","description":"Depth of the columns in a 3D column chart. Requires <code>highcharts-3d.js</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/3d/column/\">Basic 3D column chart</a>","deprecated":false},{"name":"series<funnel>--depth","fullname":"series<funnel>.depth","title":"depth","parent":"series<funnel>","isParent":false,"returnType":"Number","defaults":"0","since":"4.0","description":"The thickness of a 3D pie. Requires <code>highcharts-3d.js</code>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/3d-pie/\">Basic 3D pie chart</a>","deprecated":false},{"name":"series<boxplot>--depth","fullname":"series<boxplot>.depth","title":"depth","parent":"series<boxplot>","isParent":false,"returnType":"Number","defaults":"25","since":"4.0","description":"Depth of the columns in a 3D column chart. Requires <code>highcharts-3d.js</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/3d/column/\">Basic 3D column chart</a>","deprecated":false},{"name":"series<pyramid>--depth","fullname":"series<pyramid>.depth","title":"depth","parent":"series<pyramid>","isParent":false,"returnType":"Number","defaults":"0","since":"4.0","description":"The thickness of a 3D pie. Requires <code>highcharts-3d.js</code>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/3d-pie/\">Basic 3D pie chart</a>","deprecated":false},{"name":"plotOptions-columnrange--depth","fullname":"plotOptions.columnrange.depth","title":"depth","parent":"plotOptions-columnrange","isParent":false,"returnType":"Number","defaults":"25","since":"4.0","description":"Depth of the columns in a 3D column chart. Requires <code>highcharts-3d.js</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/3d/column/\">Basic 3D column chart</a>","deprecated":false},{"name":"plotOptions-waterfall--depth","fullname":"plotOptions.waterfall.depth","title":"depth","parent":"plotOptions-waterfall","isParent":false,"returnType":"Number","defaults":"25","since":"4.0","description":"Depth of the columns in a 3D column chart. Requires <code>highcharts-3d.js</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/3d/column/\">Basic 3D column chart</a>","deprecated":false},{"name":"series<pie>--depth","fullname":"series<pie>.depth","title":"depth","parent":"series<pie>","isParent":false,"returnType":"Number","defaults":"0","since":"4.0","description":"The thickness of a 3D pie. Requires <code>highcharts-3d.js</code>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/3d-pie/\">Basic 3D pie chart</a>","deprecated":false},{"name":"plotOptions-boxplot--depth","fullname":"plotOptions.boxplot.depth","title":"depth","parent":"plotOptions-boxplot","isParent":false,"returnType":"Number","defaults":"25","since":"4.0","description":"Depth of the columns in a 3D column chart. Requires <code>highcharts-3d.js</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/3d/column/\">Basic 3D column chart</a>","deprecated":false},{"name":"series<columnrange>--depth","fullname":"series<columnrange>.depth","title":"depth","parent":"series<columnrange>","isParent":false,"returnType":"Number","defaults":"25","since":"4.0","description":"Depth of the columns in a 3D column chart. Requires <code>highcharts-3d.js</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/3d/column/\">Basic 3D column chart</a>","deprecated":false},{"name":"plotOptions-bar--depth","fullname":"plotOptions.bar.depth","title":"depth","parent":"plotOptions-bar","isParent":false,"returnType":"Number","defaults":"25","since":"4.0","description":"Depth of the columns in a 3D column chart. Requires <code>highcharts-3d.js</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/3d/column/\">Basic 3D column chart</a>","deprecated":false},{"name":"plotOptions-gauge-dial","fullname":"plotOptions.gauge.dial","title":"dial","parent":"plotOptions-gauge","isParent":true,"returnType":"Object","defaults":"","since":"2.3.0","description":"Options for the dial or arrow pointer of the gauge.","demo":"","seeAlso":"","deprecated":false},{"name":"series<gauge>-dial","fullname":"series<gauge>.dial","title":"dial","parent":"series<gauge>","isParent":true,"returnType":"Object","defaults":"","since":"2.3.0","description":"Options for the dial or arrow pointer of the gauge.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble--displayNegative","fullname":"plotOptions.bubble.displayNegative","title":"displayNegative","parent":"plotOptions-bubble","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"3.0","description":"Whether to display negative sized bubbles. The threshold is given by the <a href=\"#plotOptions.bubble.zThreshold\">zThreshold</a> option, and negative bubbles can be visualized by setting <a href=\"#plotOptions.bubble.negativeColor\">negativeColor</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/bubble-negative/\" target=\"_blank\">Negative bubbles</a>","seeAlso":"","deprecated":false},{"name":"series<bubble>--displayNegative","fullname":"series<bubble>.displayNegative","title":"displayNegative","parent":"series<bubble>","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"3.0","description":"Whether to display negative sized bubbles. The threshold is given by the <a href=\"#plotOptions.bubble.zThreshold\">zThreshold</a> option, and negative bubbles can be visualized by setting <a href=\"#plotOptions.bubble.negativeColor\">negativeColor</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/bubble-negative/\" target=\"_blank\">Negative bubbles</a>","seeAlso":"","deprecated":false},{"name":"yAxis-labels--distance","fullname":"yAxis.labels.distance","title":"distance","parent":"yAxis-labels","isParent":false,"returnType":"Number","defaults":"15","values":"","since":"","description":"Angular gauges and solid gauges only. The label's pixel distance from the perimeter of the plot area.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pie>-dataLabels--distance","fullname":"series<pie>.dataLabels.distance","title":"distance","parent":"series<pie>-dataLabels","isParent":false,"returnType":"Number","defaults":"30","since":"2.1","description":"The distance of the data label from the pie's edge. Negative numbers put the data label on top of the pie slices. Connectors are only shown for data labels outside the pie.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-distance/\" target=\"_blank\">Data labels on top of the pie</a>"},{"name":"series<funnel>-dataLabels--distance","fullname":"series<funnel>.dataLabels.distance","title":"distance","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"Number","defaults":"30","since":"2.1","description":"The distance of the data label from the pie's edge. Negative numbers put the data label on top of the pie slices. Connectors are only shown for data labels outside the pie.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-distance/\" target=\"_blank\">Data labels on top of the pie</a>"},{"name":"plotOptions-funnel-dataLabels--distance","fullname":"plotOptions.funnel.dataLabels.distance","title":"distance","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"Number","defaults":"30","since":"2.1","description":"The distance of the data label from the pie's edge. Negative numbers put the data label on top of the pie slices. Connectors are only shown for data labels outside the pie.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-distance/\" target=\"_blank\">Data labels on top of the pie</a>"},{"name":"plotOptions-pie-dataLabels--distance","fullname":"plotOptions.pie.dataLabels.distance","title":"distance","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"Number","defaults":"30","since":"2.1","description":"The distance of the data label from the pie's edge. Negative numbers put the data label on top of the pie slices. Connectors are only shown for data labels outside the pie.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-distance/\" target=\"_blank\">Data labels on top of the pie</a>"},{"name":"xAxis-labels--distance","fullname":"xAxis.labels.distance","title":"distance","parent":"xAxis-labels","isParent":false,"returnType":"Number","defaults":"15","values":"","since":"","description":"Polar charts only. The label's pixel distance from the perimeter of the plot area.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pyramid>-dataLabels--distance","fullname":"series<pyramid>.dataLabels.distance","title":"distance","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"Number","defaults":"30","since":"2.1","description":"The distance of the data label from the pie's edge. Negative numbers put the data label on top of the pie slices. Connectors are only shown for data labels outside the pie.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-distance/\" target=\"_blank\">Data labels on top of the pie</a>"},{"name":"plotOptions-pyramid-dataLabels--distance","fullname":"plotOptions.pyramid.dataLabels.distance","title":"distance","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"Number","defaults":"30","since":"2.1","description":"The distance of the data label from the pie's edge. Negative numbers put the data label on top of the pie slices. Connectors are only shown for data labels outside the pie.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-distance/\" target=\"_blank\">Data labels on top of the pie</a>"},{"name":"lang--downloadJPEG","fullname":"lang.downloadJPEG","title":"downloadJPEG","parent":"lang","isParent":false,"returnType":"String","defaults":"Download JPEG image","since":"2.0","description":"Exporting module only. The text for the JPEG download menu item."},{"name":"lang--downloadPDF","fullname":"lang.downloadPDF","title":"downloadPDF","parent":"lang","isParent":false,"returnType":"String","defaults":"Download PDF document","since":"2.0","description":"Exporting module only. The text for the PDF download menu item."},{"name":"lang--downloadPNG","fullname":"lang.downloadPNG","title":"downloadPNG","parent":"lang","isParent":false,"returnType":"String","defaults":"Download PNG image","since":"2.0","description":"Exporting module only. The text for the PNG download menu item."},{"name":"lang--downloadSVG","fullname":"lang.downloadSVG","title":"downloadSVG","parent":"lang","isParent":false,"returnType":"String","defaults":"Download SVG vector image","since":"2.0","description":"Exporting module only. The text for the SVG download menu item."},{"name":"drilldown-drillUpButton","fullname":"drilldown.drillUpButton","title":"drillUpButton","parent":"drilldown","isParent":true,"returnType":"Object","since":"3.0.8","description":"Options for the drill up button that appears when drilling down on a series. The text for the button is defined in <a href=\"#lang.drillUpText\">lang.drillUpText</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/drillupbutton/\" target=\"_blank\">Drill up button</a>","deprecated":false},{"name":"lang--drillUpText","fullname":"lang.drillUpText","title":"drillUpText","parent":"lang","isParent":false,"returnType":"String","defaults":"Back to {series.name}","since":"3.0.8","description":"The text for the button that appears when drilling down, linking back to the parent series. The parent series' name is inserted for <code>{series.name}</code>.","deprecated":false},{"name":"series<boxplot>-data--drilldown","fullname":"series<boxplot>.data.drilldown","title":"drilldown","parent":"series<boxplot>-data","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0.8","description":"The <code>id</code> of a series in the <a href=\"#drilldown.series\">drilldown.series</a> array to use for a drilldown for this point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/basic/\" target=\"_blank\">Basic drilldown</a>","seeAlso":"","deprecated":false},{"name":"drilldown","fullname":"drilldown","title":"drilldown","isParent":true,"since":"3.0.8","description":"<p>Options for drill down, the concept of inspecting increasingly high resolution data through clicking on chart items like columns or pie slices.</p>\r\n\r\n<p>The drilldown feature requires the <code>drilldown.js</code> file to be loaded, found in the <code>modules</code> directory of the download package, or online at <a href=\"http://code.highcharts.com/modules/drilldown.js\">code.highcharts.com/modules/drilldown.js</a>.</p>\r\n\r\n","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/basic/\" target=\"_blank\">Basic drilldown</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/column-drilldown/\" target=\"_blank\">generated column drilldown</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/pie-drilldown/\" target=\"_blank\">pie drilldown</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/across-types/\" target=\"_blank\">drilldown across series types</a>.","deprecated":false},{"name":"series<treemap>-data--drilldown","fullname":"series<treemap>.data.drilldown","title":"drilldown","parent":"series<treemap>-data","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0.8","description":"The <code>id</code> of a series in the <a href=\"#drilldown.series\">drilldown.series</a> array to use for a drilldown for this point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/basic/\" target=\"_blank\">Basic drilldown</a>","seeAlso":"","deprecated":false},{"name":"series<scatter>-data--drilldown","fullname":"series<scatter>.data.drilldown","title":"drilldown","parent":"series<scatter>-data","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0.8","description":"The <code>id</code> of a series in the <a href=\"#drilldown.series\">drilldown.series</a> array to use for a drilldown for this point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/basic/\" target=\"_blank\">Basic drilldown</a>","seeAlso":"","deprecated":false},{"name":"series<areaspline>-data--drilldown","fullname":"series<areaspline>.data.drilldown","title":"drilldown","parent":"series<areaspline>-data","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0.8","description":"The <code>id</code> of a series in the <a href=\"#drilldown.series\">drilldown.series</a> array to use for a drilldown for this point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/basic/\" target=\"_blank\">Basic drilldown</a>","seeAlso":"","deprecated":false},{"name":"series<pie>-data--drilldown","fullname":"series<pie>.data.drilldown","title":"drilldown","parent":"series<pie>-data","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0.8","description":"The <code>id</code> of a series in the <a href=\"#drilldown.series\">drilldown.series</a> array to use for a drilldown for this point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/basic/\" target=\"_blank\">Basic drilldown</a>","seeAlso":"","deprecated":false},{"name":"series<spline>-data--drilldown","fullname":"series<spline>.data.drilldown","title":"drilldown","parent":"series<spline>-data","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0.8","description":"The <code>id</code> of a series in the <a href=\"#drilldown.series\">drilldown.series</a> array to use for a drilldown for this point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/basic/\" target=\"_blank\">Basic drilldown</a>","seeAlso":"","deprecated":false},{"name":"series<heatmap>-data--drilldown","fullname":"series<heatmap>.data.drilldown","title":"drilldown","parent":"series<heatmap>-data","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0.8","description":"The <code>id</code> of a series in the <a href=\"#drilldown.series\">drilldown.series</a> array to use for a drilldown for this point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/basic/\" target=\"_blank\">Basic drilldown</a>","seeAlso":"","deprecated":false},{"name":"series<area>-data--drilldown","fullname":"series<area>.data.drilldown","title":"drilldown","parent":"series<area>-data","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0.8","description":"The <code>id</code> of a series in the <a href=\"#drilldown.series\">drilldown.series</a> array to use for a drilldown for this point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/basic/\" target=\"_blank\">Basic drilldown</a>","seeAlso":"","deprecated":false},{"name":"chart-events--drilldown","fullname":"chart.events.drilldown","title":"drilldown","parent":"chart-events","isParent":false,"returnType":"Function","context":"Chart","since":"3.0.8","description":"<p>Fires when a drilldown point is clicked, before the new series is added. Event arguments:</p>\r\n\r\n<dl>\r\n\r\n  <dt><code>category</code></dt>\r\n  <dd>If a category label was clicked, which index.</dd>\r\n\r\n  <dt><code>point</code></dt>\r\n  <dd>The originating point.</dd>\r\n\r\n  <dt><code>points</code></dt>\r\n  <dd>If a category label was clicked, this array holds all points corresponing to the category.</dd>\r\n\r\n  <dt><code>seriesOptions</code></dt>\r\n  <dd>Options for the new series</dd>\r\n\r\n</dl>\r\n<p>This event is also utilized for async drilldown, where the seriesOptions are not added by option, but rather loaded async.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/async/\" target=\"_blank\">Async drilldown</a>","deprecated":false},{"name":"series<columnrange>-data--drilldown","fullname":"series<columnrange>.data.drilldown","title":"drilldown","parent":"series<columnrange>-data","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0.8","description":"The <code>id</code> of a series in the <a href=\"#drilldown.series\">drilldown.series</a> array to use for a drilldown for this point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/basic/\" target=\"_blank\">Basic drilldown</a>","seeAlso":"","deprecated":false},{"name":"series<waterfall>-data--drilldown","fullname":"series<waterfall>.data.drilldown","title":"drilldown","parent":"series<waterfall>-data","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0.8","description":"The <code>id</code> of a series in the <a href=\"#drilldown.series\">drilldown.series</a> array to use for a drilldown for this point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/basic/\" target=\"_blank\">Basic drilldown</a>","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-data--drilldown","fullname":"series<areasplinerange>.data.drilldown","title":"drilldown","parent":"series<areasplinerange>-data","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0.8","description":"The <code>id</code> of a series in the <a href=\"#drilldown.series\">drilldown.series</a> array to use for a drilldown for this point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/basic/\" target=\"_blank\">Basic drilldown</a>","seeAlso":"","deprecated":false},{"name":"series<funnel>-data--drilldown","fullname":"series<funnel>.data.drilldown","title":"drilldown","parent":"series<funnel>-data","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0.8","description":"The <code>id</code> of a series in the <a href=\"#drilldown.series\">drilldown.series</a> array to use for a drilldown for this point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/basic/\" target=\"_blank\">Basic drilldown</a>","seeAlso":"","deprecated":false},{"name":"series<arearange>-data--drilldown","fullname":"series<arearange>.data.drilldown","title":"drilldown","parent":"series<arearange>-data","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0.8","description":"The <code>id</code> of a series in the <a href=\"#drilldown.series\">drilldown.series</a> array to use for a drilldown for this point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/basic/\" target=\"_blank\">Basic drilldown</a>","seeAlso":"","deprecated":false},{"name":"series<bubble>-data--drilldown","fullname":"series<bubble>.data.drilldown","title":"drilldown","parent":"series<bubble>-data","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0.8","description":"The <code>id</code> of a series in the <a href=\"#drilldown.series\">drilldown.series</a> array to use for a drilldown for this point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/basic/\" target=\"_blank\">Basic drilldown</a>","seeAlso":"","deprecated":false},{"name":"series<column>-data--drilldown","fullname":"series<column>.data.drilldown","title":"drilldown","parent":"series<column>-data","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0.8","description":"The <code>id</code> of a series in the <a href=\"#drilldown.series\">drilldown.series</a> array to use for a drilldown for this point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/basic/\" target=\"_blank\">Basic drilldown</a>","seeAlso":"","deprecated":false},{"name":"series<bar>-data--drilldown","fullname":"series<bar>.data.drilldown","title":"drilldown","parent":"series<bar>-data","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0.8","description":"The <code>id</code> of a series in the <a href=\"#drilldown.series\">drilldown.series</a> array to use for a drilldown for this point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/basic/\" target=\"_blank\">Basic drilldown</a>","seeAlso":"","deprecated":false},{"name":"series<polygon>-data--drilldown","fullname":"series<polygon>.data.drilldown","title":"drilldown","parent":"series<polygon>-data","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0.8","description":"The <code>id</code> of a series in the <a href=\"#drilldown.series\">drilldown.series</a> array to use for a drilldown for this point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/basic/\" target=\"_blank\">Basic drilldown</a>","seeAlso":"","deprecated":false},{"name":"series<pyramid>-data--drilldown","fullname":"series<pyramid>.data.drilldown","title":"drilldown","parent":"series<pyramid>-data","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0.8","description":"The <code>id</code> of a series in the <a href=\"#drilldown.series\">drilldown.series</a> array to use for a drilldown for this point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/basic/\" target=\"_blank\">Basic drilldown</a>","seeAlso":"","deprecated":false},{"name":"series<line>-data--drilldown","fullname":"series<line>.data.drilldown","title":"drilldown","parent":"series<line>-data","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0.8","description":"The <code>id</code> of a series in the <a href=\"#drilldown.series\">drilldown.series</a> array to use for a drilldown for this point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/basic/\" target=\"_blank\">Basic drilldown</a>","seeAlso":"","deprecated":false},{"name":"chart-events--drillup","fullname":"chart.events.drillup","title":"drillup","parent":"chart-events","isParent":false,"returnType":"Function","context":"Chart","since":"3.0.8","description":"Fires when drilling up from a drilldown series.","deprecated":false},{"name":"series<columnrange>--edgeColor","fullname":"series<columnrange>.edgeColor","title":"edgeColor","parent":"series<columnrange>","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"3D columns only. The color of the edges. Similar to <code>borderColor</code>, except it defaults to the same color as the column.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar--edgeColor","fullname":"plotOptions.errorbar.edgeColor","title":"edgeColor","parent":"plotOptions-errorbar","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"3D columns only. The color of the edges. Similar to <code>borderColor</code>, except it defaults to the same color as the column.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column--edgeColor","fullname":"plotOptions.column.edgeColor","title":"edgeColor","parent":"plotOptions-column","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"3D columns only. The color of the edges. Similar to <code>borderColor</code>, except it defaults to the same color as the column.","demo":"","seeAlso":"","deprecated":false},{"name":"series<column>--edgeColor","fullname":"series<column>.edgeColor","title":"edgeColor","parent":"series<column>","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"3D columns only. The color of the edges. Similar to <code>borderColor</code>, except it defaults to the same color as the column.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall--edgeColor","fullname":"plotOptions.waterfall.edgeColor","title":"edgeColor","parent":"plotOptions-waterfall","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"3D columns only. The color of the edges. Similar to <code>borderColor</code>, except it defaults to the same color as the column.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bar>--edgeColor","fullname":"series<bar>.edgeColor","title":"edgeColor","parent":"series<bar>","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"3D columns only. The color of the edges. Similar to <code>borderColor</code>, except it defaults to the same color as the column.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange--edgeColor","fullname":"plotOptions.columnrange.edgeColor","title":"edgeColor","parent":"plotOptions-columnrange","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"3D columns only. The color of the edges. Similar to <code>borderColor</code>, except it defaults to the same color as the column.","demo":"","seeAlso":"","deprecated":false},{"name":"series<boxplot>--edgeColor","fullname":"series<boxplot>.edgeColor","title":"edgeColor","parent":"series<boxplot>","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"3D columns only. The color of the edges. Similar to <code>borderColor</code>, except it defaults to the same color as the column.","demo":"","seeAlso":"","deprecated":false},{"name":"series<errorbar>--edgeColor","fullname":"series<errorbar>.edgeColor","title":"edgeColor","parent":"series<errorbar>","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"3D columns only. The color of the edges. Similar to <code>borderColor</code>, except it defaults to the same color as the column.","demo":"","seeAlso":"","deprecated":false},{"name":"series<waterfall>--edgeColor","fullname":"series<waterfall>.edgeColor","title":"edgeColor","parent":"series<waterfall>","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"3D columns only. The color of the edges. Similar to <code>borderColor</code>, except it defaults to the same color as the column.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bar--edgeColor","fullname":"plotOptions.bar.edgeColor","title":"edgeColor","parent":"plotOptions-bar","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"3D columns only. The color of the edges. Similar to <code>borderColor</code>, except it defaults to the same color as the column.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot--edgeColor","fullname":"plotOptions.boxplot.edgeColor","title":"edgeColor","parent":"plotOptions-boxplot","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"3D columns only. The color of the edges. Similar to <code>borderColor</code>, except it defaults to the same color as the column.","demo":"","seeAlso":"","deprecated":false},{"name":"series<column>--edgeWidth","fullname":"series<column>.edgeWidth","title":"edgeWidth","parent":"series<column>","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"","description":"3D columns only. The width of the colored edges.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall--edgeWidth","fullname":"plotOptions.waterfall.edgeWidth","title":"edgeWidth","parent":"plotOptions-waterfall","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"","description":"3D columns only. The width of the colored edges.","demo":"","seeAlso":"","deprecated":false},{"name":"series<boxplot>--edgeWidth","fullname":"series<boxplot>.edgeWidth","title":"edgeWidth","parent":"series<boxplot>","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"","description":"3D columns only. The width of the colored edges.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange--edgeWidth","fullname":"plotOptions.columnrange.edgeWidth","title":"edgeWidth","parent":"plotOptions-columnrange","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"","description":"3D columns only. The width of the colored edges.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot--edgeWidth","fullname":"plotOptions.boxplot.edgeWidth","title":"edgeWidth","parent":"plotOptions-boxplot","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"","description":"3D columns only. The width of the colored edges.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bar>--edgeWidth","fullname":"series<bar>.edgeWidth","title":"edgeWidth","parent":"series<bar>","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"","description":"3D columns only. The width of the colored edges.","demo":"","seeAlso":"","deprecated":false},{"name":"series<errorbar>--edgeWidth","fullname":"series<errorbar>.edgeWidth","title":"edgeWidth","parent":"series<errorbar>","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"","description":"3D columns only. The width of the colored edges.","demo":"","seeAlso":"","deprecated":false},{"name":"series<columnrange>--edgeWidth","fullname":"series<columnrange>.edgeWidth","title":"edgeWidth","parent":"series<columnrange>","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"","description":"3D columns only. The width of the colored edges.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column--edgeWidth","fullname":"plotOptions.column.edgeWidth","title":"edgeWidth","parent":"plotOptions-column","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"","description":"3D columns only. The width of the colored edges.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar--edgeWidth","fullname":"plotOptions.errorbar.edgeWidth","title":"edgeWidth","parent":"plotOptions-errorbar","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"","description":"3D columns only. The width of the colored edges.","demo":"","seeAlso":"","deprecated":false},{"name":"series<waterfall>--edgeWidth","fullname":"series<waterfall>.edgeWidth","title":"edgeWidth","parent":"series<waterfall>","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"","description":"3D columns only. The width of the colored edges.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bar--edgeWidth","fullname":"plotOptions.bar.edgeWidth","title":"edgeWidth","parent":"plotOptions-bar","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"","description":"3D columns only. The width of the colored edges.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bar--enableMouseTracking","fullname":"plotOptions.bar.enableMouseTracking","title":"enableMouseTracking","parent":"plotOptions-bar","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"series<arearange>--enableMouseTracking","fullname":"series<arearange>.enableMouseTracking","title":"enableMouseTracking","parent":"series<arearange>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"series<scatter>--enableMouseTracking","fullname":"series<scatter>.enableMouseTracking","title":"enableMouseTracking","parent":"series<scatter>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"series<funnel>--enableMouseTracking","fullname":"series<funnel>.enableMouseTracking","title":"enableMouseTracking","parent":"series<funnel>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"plotOptions-polygon--enableMouseTracking","fullname":"plotOptions.polygon.enableMouseTracking","title":"enableMouseTracking","parent":"plotOptions-polygon","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"series<areasplinerange>--enableMouseTracking","fullname":"series<areasplinerange>.enableMouseTracking","title":"enableMouseTracking","parent":"series<areasplinerange>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"series<spline>--enableMouseTracking","fullname":"series<spline>.enableMouseTracking","title":"enableMouseTracking","parent":"series<spline>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"plotOptions-areaspline--enableMouseTracking","fullname":"plotOptions.areaspline.enableMouseTracking","title":"enableMouseTracking","parent":"plotOptions-areaspline","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"plotOptions-gauge--enableMouseTracking","fullname":"plotOptions.gauge.enableMouseTracking","title":"enableMouseTracking","parent":"plotOptions-gauge","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"series<area>--enableMouseTracking","fullname":"series<area>.enableMouseTracking","title":"enableMouseTracking","parent":"series<area>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"plotOptions-arearange--enableMouseTracking","fullname":"plotOptions.arearange.enableMouseTracking","title":"enableMouseTracking","parent":"plotOptions-arearange","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"plotOptions-scatter--enableMouseTracking","fullname":"plotOptions.scatter.enableMouseTracking","title":"enableMouseTracking","parent":"plotOptions-scatter","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"series<polygon>--enableMouseTracking","fullname":"series<polygon>.enableMouseTracking","title":"enableMouseTracking","parent":"series<polygon>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"series<columnrange>--enableMouseTracking","fullname":"series<columnrange>.enableMouseTracking","title":"enableMouseTracking","parent":"series<columnrange>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"series<treemap>--enableMouseTracking","fullname":"series<treemap>.enableMouseTracking","title":"enableMouseTracking","parent":"series<treemap>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"plotOptions-pie--enableMouseTracking","fullname":"plotOptions.pie.enableMouseTracking","title":"enableMouseTracking","parent":"plotOptions-pie","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"series<heatmap>--enableMouseTracking","fullname":"series<heatmap>.enableMouseTracking","title":"enableMouseTracking","parent":"series<heatmap>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"series<solidgauge>--enableMouseTracking","fullname":"series<solidgauge>.enableMouseTracking","title":"enableMouseTracking","parent":"series<solidgauge>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"series<boxplot>--enableMouseTracking","fullname":"series<boxplot>.enableMouseTracking","title":"enableMouseTracking","parent":"series<boxplot>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"plotOptions-columnrange--enableMouseTracking","fullname":"plotOptions.columnrange.enableMouseTracking","title":"enableMouseTracking","parent":"plotOptions-columnrange","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"plotOptions-pyramid--enableMouseTracking","fullname":"plotOptions.pyramid.enableMouseTracking","title":"enableMouseTracking","parent":"plotOptions-pyramid","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"series<bar>--enableMouseTracking","fullname":"series<bar>.enableMouseTracking","title":"enableMouseTracking","parent":"series<bar>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"plotOptions-series--enableMouseTracking","fullname":"plotOptions.series.enableMouseTracking","title":"enableMouseTracking","parent":"plotOptions-series","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"plotOptions-areasplinerange--enableMouseTracking","fullname":"plotOptions.areasplinerange.enableMouseTracking","title":"enableMouseTracking","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"series<areaspline>--enableMouseTracking","fullname":"series<areaspline>.enableMouseTracking","title":"enableMouseTracking","parent":"series<areaspline>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"series<line>--enableMouseTracking","fullname":"series<line>.enableMouseTracking","title":"enableMouseTracking","parent":"series<line>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"plotOptions-treemap--enableMouseTracking","fullname":"plotOptions.treemap.enableMouseTracking","title":"enableMouseTracking","parent":"plotOptions-treemap","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"series<pyramid>--enableMouseTracking","fullname":"series<pyramid>.enableMouseTracking","title":"enableMouseTracking","parent":"series<pyramid>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"plotOptions-line--enableMouseTracking","fullname":"plotOptions.line.enableMouseTracking","title":"enableMouseTracking","parent":"plotOptions-line","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"series<pie>--enableMouseTracking","fullname":"series<pie>.enableMouseTracking","title":"enableMouseTracking","parent":"series<pie>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"plotOptions-funnel--enableMouseTracking","fullname":"plotOptions.funnel.enableMouseTracking","title":"enableMouseTracking","parent":"plotOptions-funnel","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"plotOptions-waterfall--enableMouseTracking","fullname":"plotOptions.waterfall.enableMouseTracking","title":"enableMouseTracking","parent":"plotOptions-waterfall","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"plotOptions-errorbar--enableMouseTracking","fullname":"plotOptions.errorbar.enableMouseTracking","title":"enableMouseTracking","parent":"plotOptions-errorbar","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"series<gauge>--enableMouseTracking","fullname":"series<gauge>.enableMouseTracking","title":"enableMouseTracking","parent":"series<gauge>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"plotOptions-column--enableMouseTracking","fullname":"plotOptions.column.enableMouseTracking","title":"enableMouseTracking","parent":"plotOptions-column","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"plotOptions-area--enableMouseTracking","fullname":"plotOptions.area.enableMouseTracking","title":"enableMouseTracking","parent":"plotOptions-area","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"series<bubble>--enableMouseTracking","fullname":"series<bubble>.enableMouseTracking","title":"enableMouseTracking","parent":"series<bubble>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"series<waterfall>--enableMouseTracking","fullname":"series<waterfall>.enableMouseTracking","title":"enableMouseTracking","parent":"series<waterfall>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"plotOptions-spline--enableMouseTracking","fullname":"plotOptions.spline.enableMouseTracking","title":"enableMouseTracking","parent":"plotOptions-spline","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"plotOptions-solidgauge--enableMouseTracking","fullname":"plotOptions.solidgauge.enableMouseTracking","title":"enableMouseTracking","parent":"plotOptions-solidgauge","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"plotOptions-bubble--enableMouseTracking","fullname":"plotOptions.bubble.enableMouseTracking","title":"enableMouseTracking","parent":"plotOptions-bubble","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"plotOptions-boxplot--enableMouseTracking","fullname":"plotOptions.boxplot.enableMouseTracking","title":"enableMouseTracking","parent":"plotOptions-boxplot","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"series<column>--enableMouseTracking","fullname":"series<column>.enableMouseTracking","title":"enableMouseTracking","parent":"series<column>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"series<errorbar>--enableMouseTracking","fullname":"series<errorbar>.enableMouseTracking","title":"enableMouseTracking","parent":"series<errorbar>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"plotOptions-heatmap--enableMouseTracking","fullname":"plotOptions.heatmap.enableMouseTracking","title":"enableMouseTracking","parent":"plotOptions-heatmap","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the mouse tracking for a specific series. This includes point tooltips and click events on graphs and points. For large datasets it improves performance.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-enablemousetracking-false/\" target=\"_blank\">No mouse tracking</a>"},{"name":"series<boxplot>-states-hover-marker--enabled","fullname":"series<boxplot>.states.hover.marker.enabled","title":"enabled","parent":"series<boxplot>-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-line-marker-states-select--enabled","fullname":"plotOptions.line.marker.states.select.enabled","title":"enabled","parent":"plotOptions-line-marker-states-select","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable visible feedback for selection.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-enabled/\" target=\"_blank\">Disabled select state</a>"},{"name":"series<area>-dataLabels--enabled","fullname":"series<area>.dataLabels.enabled","title":"enabled","parent":"series<area>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"plotOptions-line-marker--enabled","fullname":"plotOptions.line.marker.enabled","title":"enabled","parent":"plotOptions-line-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<column>-dataLabels--enabled","fullname":"series<column>.dataLabels.enabled","title":"enabled","parent":"series<column>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"tooltip--enabled","fullname":"tooltip.enabled","title":"enabled","parent":"tooltip","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the tooltip.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/enabled/\" target=\"_blank\">Disabled</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">disable tooltip and show values on chart instead</a>."},{"name":"series<area>-states-hover--enabled","fullname":"series<area>.states.hover.enabled","title":"enabled","parent":"series<area>-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"series<column>-states-hover--enabled","fullname":"series<column>.states.hover.enabled","title":"enabled","parent":"series<column>-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"series<heatmap>-dataLabels--enabled","fullname":"series<heatmap>.dataLabels.enabled","title":"enabled","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"series<areaspline>-states-hover--enabled","fullname":"series<areaspline>.states.hover.enabled","title":"enabled","parent":"series<areaspline>-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"series<line>-states-hover--enabled","fullname":"series<line>.states.hover.enabled","title":"enabled","parent":"series<line>-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-areaspline-marker--enabled","fullname":"plotOptions.areaspline.marker.enabled","title":"enabled","parent":"plotOptions-areaspline-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-area-marker--enabled","fullname":"plotOptions.area.marker.enabled","title":"enabled","parent":"plotOptions-area-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-series-marker-states-hover--enabled","fullname":"plotOptions.series.marker.states.hover.enabled","title":"enabled","parent":"plotOptions-series-marker-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-enabled/\" target=\"_blank\">Disabled hover state</a>"},{"name":"plotOptions-areaspline-states-hover-marker--enabled","fullname":"plotOptions.areaspline.states.hover.marker.enabled","title":"enabled","parent":"plotOptions-areaspline-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-waterfall-states-hover--enabled","fullname":"plotOptions.waterfall.states.hover.enabled","title":"enabled","parent":"plotOptions-waterfall-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-line-marker-states-hover--enabled","fullname":"plotOptions.line.marker.states.hover.enabled","title":"enabled","parent":"plotOptions-line-marker-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-enabled/\" target=\"_blank\">Disabled hover state</a>"},{"name":"series<treemap>-states-hover-marker--enabled","fullname":"series<treemap>.states.hover.marker.enabled","title":"enabled","parent":"series<treemap>-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<pie>-states-hover--enabled","fullname":"series<pie>.states.hover.enabled","title":"enabled","parent":"series<pie>-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"series<areaspline>-marker--enabled","fullname":"series<areaspline>.marker.enabled","title":"enabled","parent":"series<areaspline>-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<polygon>-marker-states-hover--enabled","fullname":"series<polygon>.marker.states.hover.enabled","title":"enabled","parent":"series<polygon>-marker-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-enabled/\" target=\"_blank\">Disabled hover state</a>"},{"name":"series<pie>-dataLabels--enabled","fullname":"series<pie>.dataLabels.enabled","title":"enabled","parent":"series<pie>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.1","description":"Enable or disable the data labels."},{"name":"series<solidgauge>-states-hover--enabled","fullname":"series<solidgauge>.states.hover.enabled","title":"enabled","parent":"series<solidgauge>-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"series<polygon>-dataLabels--enabled","fullname":"series<polygon>.dataLabels.enabled","title":"enabled","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"series<treemap>-states-hover--enabled","fullname":"series<treemap>.states.hover.enabled","title":"enabled","parent":"series<treemap>-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"series<area>-data-marker-states-select--enabled","fullname":"series<area>.data.marker.states.select.enabled","title":"enabled","parent":"series<area>-data-marker-states-select","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable visible feedback for selection.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-enabled/\" target=\"_blank\">Disabled select state</a>"},{"name":"plotOptions-treemap-dataLabels--enabled","fullname":"plotOptions.treemap.dataLabels.enabled","title":"enabled","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"Boolean","context":"","defaults":"true","values":"","since":"4.1.0","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-area-marker-states-hover--enabled","fullname":"plotOptions.area.marker.states.hover.enabled","title":"enabled","parent":"plotOptions-area-marker-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-enabled/\" target=\"_blank\">Disabled hover state</a>"},{"name":"plotOptions-column-states-hover--enabled","fullname":"plotOptions.column.states.hover.enabled","title":"enabled","parent":"plotOptions-column-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-pie-states-hover-marker--enabled","fullname":"plotOptions.pie.states.hover.marker.enabled","title":"enabled","parent":"plotOptions-pie-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-scatter-marker--enabled","fullname":"plotOptions.scatter.marker.enabled","title":"enabled","parent":"plotOptions-scatter-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-spline-states-hover--enabled","fullname":"plotOptions.spline.states.hover.enabled","title":"enabled","parent":"plotOptions-spline-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"credits--enabled","fullname":"credits.enabled","title":"enabled","parent":"credits","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to show the credits text.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/credits/enabled-false/\" target=\"_blank\">Credits disabled</a>"},{"name":"series<areaspline>-marker-states-hover--enabled","fullname":"series<areaspline>.marker.states.hover.enabled","title":"enabled","parent":"series<areaspline>-marker-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-enabled/\" target=\"_blank\">Disabled hover state</a>"},{"name":"series<spline>-data-marker-states-select--enabled","fullname":"series<spline>.data.marker.states.select.enabled","title":"enabled","parent":"series<spline>-data-marker-states-select","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable visible feedback for selection.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-enabled/\" target=\"_blank\">Disabled select state</a>"},{"name":"plotOptions-gauge-dataLabels--enabled","fullname":"plotOptions.gauge.dataLabels.enabled","title":"enabled","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.3.0","description":"Enable or disable the data labels.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-marker-states-hover--enabled","fullname":"plotOptions.polygon.marker.states.hover.enabled","title":"enabled","parent":"plotOptions-polygon-marker-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-enabled/\" target=\"_blank\">Disabled hover state</a>"},{"name":"series<polygon>-data-marker-states-hover--enabled","fullname":"series<polygon>.data.marker.states.hover.enabled","title":"enabled","parent":"series<polygon>-data-marker-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-enabled/\" target=\"_blank\">Disabled hover state</a>"},{"name":"plotOptions-solidgauge-dataLabels--enabled","fullname":"plotOptions.solidgauge.dataLabels.enabled","title":"enabled","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.3.0","description":"Enable or disable the data labels.","demo":"","seeAlso":"","deprecated":false},{"name":"series<waterfall>-states-hover-marker--enabled","fullname":"series<waterfall>.states.hover.marker.enabled","title":"enabled","parent":"series<waterfall>-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<columnrange>-states-hover-marker--enabled","fullname":"series<columnrange>.states.hover.marker.enabled","title":"enabled","parent":"series<columnrange>-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<line>-marker-states-hover--enabled","fullname":"series<line>.marker.states.hover.enabled","title":"enabled","parent":"series<line>-marker-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-enabled/\" target=\"_blank\">Disabled hover state</a>"},{"name":"plotOptions-areaspline-dataLabels--enabled","fullname":"plotOptions.areaspline.dataLabels.enabled","title":"enabled","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"yAxis-labels--enabled","fullname":"yAxis.labels.enabled","title":"enabled","parent":"yAxis-labels","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the axis labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-enabled/\" target=\"_blank\">X axis labels disabled</a>"},{"name":"series<funnel>-states-hover-marker--enabled","fullname":"series<funnel>.states.hover.marker.enabled","title":"enabled","parent":"series<funnel>-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<bubble>-marker-states-hover--enabled","fullname":"series<bubble>.marker.states.hover.enabled","title":"enabled","parent":"series<bubble>-marker-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-enabled/\" target=\"_blank\">Disabled hover state</a>"},{"name":"series<spline>-marker-states-hover--enabled","fullname":"series<spline>.marker.states.hover.enabled","title":"enabled","parent":"series<spline>-marker-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-enabled/\" target=\"_blank\">Disabled hover state</a>"},{"name":"series<scatter>-data-marker-states-hover--enabled","fullname":"series<scatter>.data.marker.states.hover.enabled","title":"enabled","parent":"series<scatter>-data-marker-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-enabled/\" target=\"_blank\">Disabled hover state</a>"},{"name":"exporting--enabled","fullname":"exporting.enabled","title":"enabled","parent":"exporting","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Whether to enable the exporting module. Disabling the module will hide the context button, but API methods will still be available.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/exporting/enabled-false/\" target=\"_blank\">Exporting module is loaded but disabled</a>","deprecated":false},{"name":"series<arearange>-states-hover--enabled","fullname":"series<arearange>.states.hover.enabled","title":"enabled","parent":"series<arearange>-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-scatter-marker-states-select--enabled","fullname":"plotOptions.scatter.marker.states.select.enabled","title":"enabled","parent":"plotOptions-scatter-marker-states-select","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable visible feedback for selection.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-enabled/\" target=\"_blank\">Disabled select state</a>"},{"name":"plotOptions-series-states-hover-marker--enabled","fullname":"plotOptions.series.states.hover.marker.enabled","title":"enabled","parent":"plotOptions-series-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-spline-marker--enabled","fullname":"plotOptions.spline.marker.enabled","title":"enabled","parent":"plotOptions-spline-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-areasplinerange-states-hover--enabled","fullname":"plotOptions.areasplinerange.states.hover.enabled","title":"enabled","parent":"plotOptions-areasplinerange-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-spline-states-hover-marker--enabled","fullname":"plotOptions.spline.states.hover.marker.enabled","title":"enabled","parent":"plotOptions-spline-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<spline>-marker--enabled","fullname":"series<spline>.marker.enabled","title":"enabled","parent":"series<spline>-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-columnrange-states-hover-marker--enabled","fullname":"plotOptions.columnrange.states.hover.marker.enabled","title":"enabled","parent":"plotOptions-columnrange-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<errorbar>-states-hover--enabled","fullname":"series<errorbar>.states.hover.enabled","title":"enabled","parent":"series<errorbar>-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"yAxis-title--enabled","fullname":"yAxis.title.enabled","title":"enabled","parent":"yAxis-title","isParent":false,"returnType":"String","defaults":"middle","description":"Deprecated. Set the <code>text</code> to <code>null</code> to disable the title.","deprecated":true},{"name":"plotOptions-waterfall-dataLabels--enabled","fullname":"plotOptions.waterfall.dataLabels.enabled","title":"enabled","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"series<polygon>-marker--enabled","fullname":"series<polygon>.marker.enabled","title":"enabled","parent":"series<polygon>-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-areasplinerange-states-hover-marker--enabled","fullname":"plotOptions.areasplinerange.states.hover.marker.enabled","title":"enabled","parent":"plotOptions-areasplinerange-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<treemap>-dataLabels--enabled","fullname":"series<treemap>.dataLabels.enabled","title":"enabled","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"Boolean","context":"","defaults":"true","values":"","since":"4.1.0","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-line-states-hover-marker--enabled","fullname":"plotOptions.line.states.hover.marker.enabled","title":"enabled","parent":"plotOptions-line-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<errorbar>-states-hover-marker--enabled","fullname":"series<errorbar>.states.hover.marker.enabled","title":"enabled","parent":"series<errorbar>-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<solidgauge>-dataLabels--enabled","fullname":"series<solidgauge>.dataLabels.enabled","title":"enabled","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.3.0","description":"Enable or disable the data labels.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areaspline>-dataLabels--enabled","fullname":"series<areaspline>.dataLabels.enabled","title":"enabled","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"plotOptions-heatmap-dataLabels--enabled","fullname":"plotOptions.heatmap.dataLabels.enabled","title":"enabled","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"plotOptions-funnel-dataLabels--enabled","fullname":"plotOptions.funnel.dataLabels.enabled","title":"enabled","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.1","description":"Enable or disable the data labels."},{"name":"plotOptions-spline-marker-states-hover--enabled","fullname":"plotOptions.spline.marker.states.hover.enabled","title":"enabled","parent":"plotOptions-spline-marker-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-enabled/\" target=\"_blank\">Disabled hover state</a>"},{"name":"plotOptions-arearange-states-hover-marker--enabled","fullname":"plotOptions.arearange.states.hover.marker.enabled","title":"enabled","parent":"plotOptions-arearange-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-pyramid-states-hover--enabled","fullname":"plotOptions.pyramid.states.hover.enabled","title":"enabled","parent":"plotOptions-pyramid-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-arearange-states-hover--enabled","fullname":"plotOptions.arearange.states.hover.enabled","title":"enabled","parent":"plotOptions-arearange-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"series<spline>-marker-states-select--enabled","fullname":"series<spline>.marker.states.select.enabled","title":"enabled","parent":"series<spline>-marker-states-select","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable visible feedback for selection.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-enabled/\" target=\"_blank\">Disabled select state</a>"},{"name":"series<bubble>-marker--enabled","fullname":"series<bubble>.marker.enabled","title":"enabled","parent":"series<bubble>-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-column-states-hover-marker--enabled","fullname":"plotOptions.column.states.hover.marker.enabled","title":"enabled","parent":"plotOptions-column-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-bubble-states-hover-marker--enabled","fullname":"plotOptions.bubble.states.hover.marker.enabled","title":"enabled","parent":"plotOptions-bubble-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-line-dataLabels--enabled","fullname":"plotOptions.line.dataLabels.enabled","title":"enabled","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"series<areaspline>-marker-states-select--enabled","fullname":"series<areaspline>.marker.states.select.enabled","title":"enabled","parent":"series<areaspline>-marker-states-select","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable visible feedback for selection.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-enabled/\" target=\"_blank\">Disabled select state</a>"},{"name":"series<heatmap>-states-hover-marker--enabled","fullname":"series<heatmap>.states.hover.marker.enabled","title":"enabled","parent":"series<heatmap>-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<waterfall>-states-hover--enabled","fullname":"series<waterfall>.states.hover.enabled","title":"enabled","parent":"series<waterfall>-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"xAxis-labels--enabled","fullname":"xAxis.labels.enabled","title":"enabled","parent":"xAxis-labels","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the axis labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-enabled/\" target=\"_blank\">X axis labels disabled</a>"},{"name":"series<area>-marker--enabled","fullname":"series<area>.marker.enabled","title":"enabled","parent":"series<area>-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<areaspline>-states-hover-marker--enabled","fullname":"series<areaspline>.states.hover.marker.enabled","title":"enabled","parent":"series<areaspline>-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<boxplot>-states-hover--enabled","fullname":"series<boxplot>.states.hover.enabled","title":"enabled","parent":"series<boxplot>-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"series<scatter>-dataLabels--enabled","fullname":"series<scatter>.dataLabels.enabled","title":"enabled","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"plotOptions-series-dataLabels--enabled","fullname":"plotOptions.series.dataLabels.enabled","title":"enabled","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"series<line>-marker-states-select--enabled","fullname":"series<line>.marker.states.select.enabled","title":"enabled","parent":"series<line>-marker-states-select","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable visible feedback for selection.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-enabled/\" target=\"_blank\">Disabled select state</a>"},{"name":"plotOptions-bubble-states-hover--enabled","fullname":"plotOptions.bubble.states.hover.enabled","title":"enabled","parent":"plotOptions-bubble-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"series<bubble>-states-hover-marker--enabled","fullname":"series<bubble>.states.hover.marker.enabled","title":"enabled","parent":"series<bubble>-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<gauge>-states-hover-marker--enabled","fullname":"series<gauge>.states.hover.marker.enabled","title":"enabled","parent":"series<gauge>-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-bubble-marker--enabled","fullname":"plotOptions.bubble.marker.enabled","title":"enabled","parent":"plotOptions-bubble-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-series-marker-states-select--enabled","fullname":"plotOptions.series.marker.states.select.enabled","title":"enabled","parent":"plotOptions-series-marker-states-select","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable visible feedback for selection.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-enabled/\" target=\"_blank\">Disabled select state</a>"},{"name":"plotOptions-pie-states-hover--enabled","fullname":"plotOptions.pie.states.hover.enabled","title":"enabled","parent":"plotOptions-pie-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-polygon-marker--enabled","fullname":"plotOptions.polygon.marker.enabled","title":"enabled","parent":"plotOptions-polygon-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<areaspline>-data-marker-states-select--enabled","fullname":"series<areaspline>.data.marker.states.select.enabled","title":"enabled","parent":"series<areaspline>-data-marker-states-select","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable visible feedback for selection.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-enabled/\" target=\"_blank\">Disabled select state</a>"},{"name":"plotOptions-heatmap-states-hover--enabled","fullname":"plotOptions.heatmap.states.hover.enabled","title":"enabled","parent":"plotOptions-heatmap-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-polygon-dataLabels--enabled","fullname":"plotOptions.polygon.dataLabels.enabled","title":"enabled","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"exporting-buttons-contextButton--enabled","fullname":"exporting.buttons.contextButton.enabled","title":"enabled","parent":"exporting-buttons-contextButton","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Whether to enable buttons.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-enabled/\" target=\"_blank\">Exporting module loaded but buttons disabled</a>"},{"name":"series<bubble>-states-hover--enabled","fullname":"series<bubble>.states.hover.enabled","title":"enabled","parent":"series<bubble>-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"series<bubble>-marker-states-select--enabled","fullname":"series<bubble>.marker.states.select.enabled","title":"enabled","parent":"series<bubble>-marker-states-select","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable visible feedback for selection.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-enabled/\" target=\"_blank\">Disabled select state</a>"},{"name":"plotOptions-bar-states-hover--enabled","fullname":"plotOptions.bar.states.hover.enabled","title":"enabled","parent":"plotOptions-bar-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"series<areaspline>-data-marker--enabled","fullname":"series<areaspline>.data.marker.enabled","title":"enabled","parent":"series<areaspline>-data-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<spline>-states-hover-marker--enabled","fullname":"series<spline>.states.hover.marker.enabled","title":"enabled","parent":"series<spline>-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<polygon>-states-hover-marker--enabled","fullname":"series<polygon>.states.hover.marker.enabled","title":"enabled","parent":"series<polygon>-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-area-marker-states-select--enabled","fullname":"plotOptions.area.marker.states.select.enabled","title":"enabled","parent":"plotOptions-area-marker-states-select","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable visible feedback for selection.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-enabled/\" target=\"_blank\">Disabled select state</a>"},{"name":"plotOptions-scatter-states-hover-marker--enabled","fullname":"plotOptions.scatter.states.hover.marker.enabled","title":"enabled","parent":"plotOptions-scatter-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<arearange>-states-hover-marker--enabled","fullname":"series<arearange>.states.hover.marker.enabled","title":"enabled","parent":"series<arearange>-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-bar-dataLabels--enabled","fullname":"plotOptions.bar.dataLabels.enabled","title":"enabled","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"plotOptions-bubble-marker-states-select--enabled","fullname":"plotOptions.bubble.marker.states.select.enabled","title":"enabled","parent":"plotOptions-bubble-marker-states-select","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable visible feedback for selection.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-enabled/\" target=\"_blank\">Disabled select state</a>"},{"name":"series<line>-dataLabels--enabled","fullname":"series<line>.dataLabels.enabled","title":"enabled","parent":"series<line>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"navigation-buttonOptions--enabled","fullname":"navigation.buttonOptions.enabled","title":"enabled","parent":"navigation-buttonOptions","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Whether to enable buttons.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-enabled/\" target=\"_blank\">Exporting module loaded but buttons disabled</a>"},{"name":"plotOptions-boxplot-states-hover-marker--enabled","fullname":"plotOptions.boxplot.states.hover.marker.enabled","title":"enabled","parent":"plotOptions-boxplot-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<bar>-dataLabels--enabled","fullname":"series<bar>.dataLabels.enabled","title":"enabled","parent":"series<bar>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"plotOptions-pyramid-states-hover-marker--enabled","fullname":"plotOptions.pyramid.states.hover.marker.enabled","title":"enabled","parent":"plotOptions-pyramid-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-treemap-states-hover-marker--enabled","fullname":"plotOptions.treemap.states.hover.marker.enabled","title":"enabled","parent":"plotOptions-treemap-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"chart-options3d--enabled","fullname":"chart.options3d.enabled","title":"enabled","parent":"chart-options3d","isParent":false,"returnType":"Boolean","defaults":"false","since":"4.0","description":"Wether to render the chart using the 3D functionality.","deprecated":false},{"name":"series<line>-states-hover-marker--enabled","fullname":"series<line>.states.hover.marker.enabled","title":"enabled","parent":"series<line>-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<scatter>-data-marker--enabled","fullname":"series<scatter>.data.marker.enabled","title":"enabled","parent":"series<scatter>-data-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<scatter>-data-marker-states-select--enabled","fullname":"series<scatter>.data.marker.states.select.enabled","title":"enabled","parent":"series<scatter>-data-marker-states-select","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable visible feedback for selection.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-enabled/\" target=\"_blank\">Disabled select state</a>"},{"name":"plotOptions-columnrange-states-hover--enabled","fullname":"plotOptions.columnrange.states.hover.enabled","title":"enabled","parent":"plotOptions-columnrange-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"series<scatter>-states-hover--enabled","fullname":"series<scatter>.states.hover.enabled","title":"enabled","parent":"series<scatter>-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"series<line>-data-marker-states-select--enabled","fullname":"series<line>.data.marker.states.select.enabled","title":"enabled","parent":"series<line>-data-marker-states-select","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable visible feedback for selection.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-enabled/\" target=\"_blank\">Disabled select state</a>"},{"name":"plotOptions-bubble-dataLabels--enabled","fullname":"plotOptions.bubble.dataLabels.enabled","title":"enabled","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"series<polygon>-marker-states-select--enabled","fullname":"series<polygon>.marker.states.select.enabled","title":"enabled","parent":"series<polygon>-marker-states-select","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable visible feedback for selection.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-enabled/\" target=\"_blank\">Disabled select state</a>"},{"name":"series<columnrange>-states-hover--enabled","fullname":"series<columnrange>.states.hover.enabled","title":"enabled","parent":"series<columnrange>-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-polygon-marker-states-select--enabled","fullname":"plotOptions.polygon.marker.states.select.enabled","title":"enabled","parent":"plotOptions-polygon-marker-states-select","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable visible feedback for selection.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-enabled/\" target=\"_blank\">Disabled select state</a>"},{"name":"series<area>-data-marker-states-hover--enabled","fullname":"series<area>.data.marker.states.hover.enabled","title":"enabled","parent":"series<area>-data-marker-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-enabled/\" target=\"_blank\">Disabled hover state</a>"},{"name":"series<waterfall>-dataLabels--enabled","fullname":"series<waterfall>.dataLabels.enabled","title":"enabled","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels--enabled","fullname":"plotOptions.areasplinerange.dataLabels.enabled","title":"enabled","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"series<solidgauge>-states-hover-marker--enabled","fullname":"series<solidgauge>.states.hover.marker.enabled","title":"enabled","parent":"series<solidgauge>-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<areasplinerange>-states-hover-marker--enabled","fullname":"series<areasplinerange>.states.hover.marker.enabled","title":"enabled","parent":"series<areasplinerange>-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-solidgauge-states-hover-marker--enabled","fullname":"plotOptions.solidgauge.states.hover.marker.enabled","title":"enabled","parent":"plotOptions-solidgauge-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<spline>-data-marker--enabled","fullname":"series<spline>.data.marker.enabled","title":"enabled","parent":"series<spline>-data-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-pie-dataLabels--enabled","fullname":"plotOptions.pie.dataLabels.enabled","title":"enabled","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.1","description":"Enable or disable the data labels."},{"name":"series<bar>-states-hover--enabled","fullname":"series<bar>.states.hover.enabled","title":"enabled","parent":"series<bar>-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-errorbar-states-hover-marker--enabled","fullname":"plotOptions.errorbar.states.hover.marker.enabled","title":"enabled","parent":"plotOptions-errorbar-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-scatter-dataLabels--enabled","fullname":"plotOptions.scatter.dataLabels.enabled","title":"enabled","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"plotOptions-boxplot-states-hover--enabled","fullname":"plotOptions.boxplot.states.hover.enabled","title":"enabled","parent":"plotOptions-boxplot-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-bar-states-hover-marker--enabled","fullname":"plotOptions.bar.states.hover.marker.enabled","title":"enabled","parent":"plotOptions-bar-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-column-dataLabels--enabled","fullname":"plotOptions.column.dataLabels.enabled","title":"enabled","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"series<scatter>-marker-states-hover--enabled","fullname":"series<scatter>.marker.states.hover.enabled","title":"enabled","parent":"series<scatter>-marker-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-enabled/\" target=\"_blank\">Disabled hover state</a>"},{"name":"plotOptions-solidgauge-states-hover--enabled","fullname":"plotOptions.solidgauge.states.hover.enabled","title":"enabled","parent":"plotOptions-solidgauge-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-pyramid-dataLabels--enabled","fullname":"plotOptions.pyramid.dataLabels.enabled","title":"enabled","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.1","description":"Enable or disable the data labels."},{"name":"series<pyramid>-states-hover--enabled","fullname":"series<pyramid>.states.hover.enabled","title":"enabled","parent":"series<pyramid>-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"series<arearange>-dataLabels--enabled","fullname":"series<arearange>.dataLabels.enabled","title":"enabled","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"plotOptions-arearange-dataLabels--enabled","fullname":"plotOptions.arearange.dataLabels.enabled","title":"enabled","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"series<areasplinerange>-states-hover--enabled","fullname":"series<areasplinerange>.states.hover.enabled","title":"enabled","parent":"series<areasplinerange>-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-line-states-hover--enabled","fullname":"plotOptions.line.states.hover.enabled","title":"enabled","parent":"plotOptions-line-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-area-states-hover-marker--enabled","fullname":"plotOptions.area.states.hover.marker.enabled","title":"enabled","parent":"plotOptions-area-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<polygon>-data-marker-states-select--enabled","fullname":"series<polygon>.data.marker.states.select.enabled","title":"enabled","parent":"series<polygon>-data-marker-states-select","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable visible feedback for selection.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-enabled/\" target=\"_blank\">Disabled select state</a>"},{"name":"plotOptions-gauge-states-hover--enabled","fullname":"plotOptions.gauge.states.hover.enabled","title":"enabled","parent":"plotOptions-gauge-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"series<scatter>-marker--enabled","fullname":"series<scatter>.marker.enabled","title":"enabled","parent":"series<scatter>-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<polygon>-data-marker--enabled","fullname":"series<polygon>.data.marker.enabled","title":"enabled","parent":"series<polygon>-data-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<scatter>-marker-states-select--enabled","fullname":"series<scatter>.marker.states.select.enabled","title":"enabled","parent":"series<scatter>-marker-states-select","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable visible feedback for selection.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-enabled/\" target=\"_blank\">Disabled select state</a>"},{"name":"plotOptions-gauge-states-hover-marker--enabled","fullname":"plotOptions.gauge.states.hover.marker.enabled","title":"enabled","parent":"plotOptions-gauge-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-spline-marker-states-select--enabled","fullname":"plotOptions.spline.marker.states.select.enabled","title":"enabled","parent":"plotOptions-spline-marker-states-select","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable visible feedback for selection.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-enabled/\" target=\"_blank\">Disabled select state</a>"},{"name":"plotOptions-waterfall-states-hover-marker--enabled","fullname":"plotOptions.waterfall.states.hover.marker.enabled","title":"enabled","parent":"plotOptions-waterfall-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<areasplinerange>-dataLabels--enabled","fullname":"series<areasplinerange>.dataLabels.enabled","title":"enabled","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"series<bubble>-dataLabels--enabled","fullname":"series<bubble>.dataLabels.enabled","title":"enabled","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"series<column>-states-hover-marker--enabled","fullname":"series<column>.states.hover.marker.enabled","title":"enabled","parent":"series<column>-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-bubble-marker-states-hover--enabled","fullname":"plotOptions.bubble.marker.states.hover.enabled","title":"enabled","parent":"plotOptions-bubble-marker-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-enabled/\" target=\"_blank\">Disabled hover state</a>"},{"name":"series<heatmap>-states-hover--enabled","fullname":"series<heatmap>.states.hover.enabled","title":"enabled","parent":"series<heatmap>-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"series<scatter>-states-hover-marker--enabled","fullname":"series<scatter>.states.hover.marker.enabled","title":"enabled","parent":"series<scatter>-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<columnrange>-dataLabels--enabled","fullname":"series<columnrange>.dataLabels.enabled","title":"enabled","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"plotOptions-series-states-hover--enabled","fullname":"plotOptions.series.states.hover.enabled","title":"enabled","parent":"plotOptions-series-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"series<line>-data-marker-states-hover--enabled","fullname":"series<line>.data.marker.states.hover.enabled","title":"enabled","parent":"series<line>-data-marker-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-enabled/\" target=\"_blank\">Disabled hover state</a>"},{"name":"series<area>-states-hover-marker--enabled","fullname":"series<area>.states.hover.marker.enabled","title":"enabled","parent":"series<area>-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<gauge>-states-hover--enabled","fullname":"series<gauge>.states.hover.enabled","title":"enabled","parent":"series<gauge>-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-scatter-states-hover--enabled","fullname":"plotOptions.scatter.states.hover.enabled","title":"enabled","parent":"plotOptions-scatter-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-areaspline-marker-states-select--enabled","fullname":"plotOptions.areaspline.marker.states.select.enabled","title":"enabled","parent":"plotOptions-areaspline-marker-states-select","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable visible feedback for selection.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-enabled/\" target=\"_blank\">Disabled select state</a>"},{"name":"series<area>-marker-states-select--enabled","fullname":"series<area>.marker.states.select.enabled","title":"enabled","parent":"series<area>-marker-states-select","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable visible feedback for selection.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-enabled/\" target=\"_blank\">Disabled select state</a>"},{"name":"series<line>-marker--enabled","fullname":"series<line>.marker.enabled","title":"enabled","parent":"series<line>-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<spline>-dataLabels--enabled","fullname":"series<spline>.dataLabels.enabled","title":"enabled","parent":"series<spline>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"plotOptions-polygon-states-hover-marker--enabled","fullname":"plotOptions.polygon.states.hover.marker.enabled","title":"enabled","parent":"plotOptions-polygon-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-scatter-marker-states-hover--enabled","fullname":"plotOptions.scatter.marker.states.hover.enabled","title":"enabled","parent":"plotOptions-scatter-marker-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-enabled/\" target=\"_blank\">Disabled hover state</a>"},{"name":"legend--enabled","fullname":"legend.enabled","title":"enabled","parent":"legend","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the legend.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/enabled-false/\" target=\"_blank\">Legend disabled</a>"},{"name":"xAxis-title--enabled","fullname":"xAxis.title.enabled","title":"enabled","parent":"xAxis-title","isParent":false,"returnType":"String","defaults":"middle","description":"Deprecated. Set the <code>text</code> to <code>null</code> to disable the title.","deprecated":true},{"name":"plotOptions-columnrange-dataLabels--enabled","fullname":"plotOptions.columnrange.dataLabels.enabled","title":"enabled","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"series<pyramid>-dataLabels--enabled","fullname":"series<pyramid>.dataLabels.enabled","title":"enabled","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.1","description":"Enable or disable the data labels."},{"name":"plotOptions-area-states-hover--enabled","fullname":"plotOptions.area.states.hover.enabled","title":"enabled","parent":"plotOptions-area-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"series<areaspline>-data-marker-states-hover--enabled","fullname":"series<areaspline>.data.marker.states.hover.enabled","title":"enabled","parent":"series<areaspline>-data-marker-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-enabled/\" target=\"_blank\">Disabled hover state</a>"},{"name":"series<line>-data-marker--enabled","fullname":"series<line>.data.marker.enabled","title":"enabled","parent":"series<line>-data-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-areaspline-marker-states-hover--enabled","fullname":"plotOptions.areaspline.marker.states.hover.enabled","title":"enabled","parent":"plotOptions-areaspline-marker-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-enabled/\" target=\"_blank\">Disabled hover state</a>"},{"name":"series<polygon>-states-hover--enabled","fullname":"series<polygon>.states.hover.enabled","title":"enabled","parent":"series<polygon>-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"yAxis-stackLabels--enabled","fullname":"yAxis.stackLabels.enabled","title":"enabled","parent":"yAxis-stackLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.1.5","description":"Enable or disable the stack total labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/stacklabels-enabled/\" target=\"_blank\">Enabled stack total labels</a>"},{"name":"plotOptions-funnel-states-hover-marker--enabled","fullname":"plotOptions.funnel.states.hover.marker.enabled","title":"enabled","parent":"plotOptions-funnel-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-area-dataLabels--enabled","fullname":"plotOptions.area.dataLabels.enabled","title":"enabled","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"plotOptions-errorbar-states-hover--enabled","fullname":"plotOptions.errorbar.states.hover.enabled","title":"enabled","parent":"plotOptions-errorbar-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"series<pyramid>-states-hover-marker--enabled","fullname":"series<pyramid>.states.hover.marker.enabled","title":"enabled","parent":"series<pyramid>-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-areaspline-states-hover--enabled","fullname":"plotOptions.areaspline.states.hover.enabled","title":"enabled","parent":"plotOptions-areaspline-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"series<funnel>-states-hover--enabled","fullname":"series<funnel>.states.hover.enabled","title":"enabled","parent":"series<funnel>-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-polygon-states-hover--enabled","fullname":"plotOptions.polygon.states.hover.enabled","title":"enabled","parent":"plotOptions-polygon-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-treemap-states-hover--enabled","fullname":"plotOptions.treemap.states.hover.enabled","title":"enabled","parent":"plotOptions-treemap-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"plotOptions-heatmap-states-hover-marker--enabled","fullname":"plotOptions.heatmap.states.hover.marker.enabled","title":"enabled","parent":"plotOptions-heatmap-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<pie>-states-hover-marker--enabled","fullname":"series<pie>.states.hover.marker.enabled","title":"enabled","parent":"series<pie>-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<area>-marker-states-hover--enabled","fullname":"series<area>.marker.states.hover.enabled","title":"enabled","parent":"series<area>-marker-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-enabled/\" target=\"_blank\">Disabled hover state</a>"},{"name":"series<bar>-states-hover-marker--enabled","fullname":"series<bar>.states.hover.marker.enabled","title":"enabled","parent":"series<bar>-states-hover-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-spline-dataLabels--enabled","fullname":"plotOptions.spline.dataLabels.enabled","title":"enabled","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Enable or disable the data labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-enabled/\" target=\"_blank\">Data labels enabled</a>","deprecated":false},{"name":"series<area>-data-marker--enabled","fullname":"series<area>.data.marker.enabled","title":"enabled","parent":"series<area>-data-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"series<gauge>-dataLabels--enabled","fullname":"series<gauge>.dataLabels.enabled","title":"enabled","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.3.0","description":"Enable or disable the data labels.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-series-marker--enabled","fullname":"plotOptions.series.marker.enabled","title":"enabled","parent":"plotOptions-series-marker","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled/\" target=\"_blank\">Disabled markers</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-enabled-false/\" target=\"_blank\">disabled in normal state but enabled on hover</a>"},{"name":"plotOptions-funnel-states-hover--enabled","fullname":"plotOptions.funnel.states.hover.enabled","title":"enabled","parent":"plotOptions-funnel-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"series<spline>-data-marker-states-hover--enabled","fullname":"series<spline>.data.marker.states.hover.enabled","title":"enabled","parent":"series<spline>-data-marker-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","description":"Enable or disable the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-enabled/\" target=\"_blank\">Disabled hover state</a>"},{"name":"series<spline>-states-hover--enabled","fullname":"series<spline>.states.hover.enabled","title":"enabled","parent":"series<spline>-states-hover","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2","description":"Enable separate styles for the hovered series to visualize that the user hovers either the series itself or the legend.\t\t\t.","demo":"Disable hover on <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled/\" target=\"_blank\">line</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-column/\" target=\"_blank\">column</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-enabled-pie/\" target=\"_blank\">pie</a>"},{"name":"series<funnel>-dataLabels--enabled","fullname":"series<funnel>.dataLabels.enabled","title":"enabled","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.1","description":"Enable or disable the data labels."},{"name":"plotOptions-pie--endAngle","fullname":"plotOptions.pie.endAngle","title":"endAngle","parent":"plotOptions-pie","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"1.3.6","description":"The end angle of the pie in degrees where 0 is top and 90 is right. Defaults to <code>startAngle</code> plus 360.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/pie-semi-circle/\" target=\"_blank\">Semi-circle donut</a>","seeAlso":"","deprecated":false},{"name":"series<pie>--endAngle","fullname":"series<pie>.endAngle","title":"endAngle","parent":"series<pie>","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"1.3.6","description":"The end angle of the pie in degrees where 0 is top and 90 is right. Defaults to <code>startAngle</code> plus 360.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/pie-semi-circle/\" target=\"_blank\">Semi-circle donut</a>","seeAlso":"","deprecated":false},{"name":"pane--endAngle","fullname":"pane.endAngle","title":"endAngle","parent":"pane","isParent":false,"returnType":"Number","since":"2.3.0","description":"The end angle of the polar X axis or gauge value axis, given in degrees where 0 is north. Defaults to <a href=\"#pane.startAngle\">startAngle</a> + 360.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/gauge-vu-meter/\" target=\"_blank\">VU-meter with custom start and end angle</a>.","deprecated":false},{"name":"data--endColumn","fullname":"data.endColumn","title":"endColumn","parent":"data","isParent":false,"returnType":"Number","defaults":"","values":"","since":"4.0","description":"In tabular input data, the last column (indexed by 0) to use. Defaults to the last column containing data.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/data/start-end/\" target=\"_blank\">Limited data</a>","seeAlso":"","deprecated":false},{"name":"yAxis--endOnTick","fullname":"yAxis.endOnTick","title":"endOnTick","parent":"yAxis","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2.0","description":"Whether to force the axis to end on a tick. Use this option with the <code>maxPadding</code> option to control the axis end.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">True by default</a> and\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/endontick-false/\" target=\"_blank\">false</a> for Y axis,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/endontick-log-false/\" target=\"_blank\">false</a> for logarithmic Y axis"},{"name":"xAxis--endOnTick","fullname":"xAxis.endOnTick","title":"endOnTick","parent":"xAxis","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to force the axis to end on a tick. Use this option with the <code>maxPadding</code> option to control the axis end.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">True by default</a> and\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/endontick/\" target=\"_blank\">false</a> for Y axis"},{"name":"data--endRow","fullname":"data.endRow","title":"endRow","parent":"data","isParent":false,"returnType":"Number","defaults":"","values":"","since":"4.0.4","description":"In tabular input data, the last row (indexed by 0) to use. Defaults to the last row containing data.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/data/start-end/\" target=\"_blank\">Limited data</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar","fullname":"plotOptions.errorbar","title":"errorbar","parent":"plotOptions","isParent":true,"returnType":"Object","defaults":"","values":"","since":"3.0","description":"Error bars are a graphical representation of the variability of data and are used on graphs to indicate the error, or uncertainty in a reported measurement. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>-data-events","fullname":"series<spline>.data.events","title":"events","parent":"series<spline>-data","isParent":true,"returnType":"","defaults":"","since":"","description":"Individual point events","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-point-events","fullname":"plotOptions.spline.point.events","title":"events","parent":"plotOptions-spline-point","isParent":true,"description":"Events for each single point"},{"name":"series<bubble>-data-events","fullname":"series<bubble>.data.events","title":"events","parent":"series<bubble>-data","isParent":true,"returnType":"","defaults":"","since":"","description":"Individual point events","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot-events","fullname":"plotOptions.boxplot.events","title":"events","parent":"plotOptions-boxplot","isParent":true},{"name":"series<areasplinerange>-point-events","fullname":"series<areasplinerange>.point.events","title":"events","parent":"series<areasplinerange>-point","isParent":true,"description":"Events for each single point"},{"name":"series<boxplot>-data-events","fullname":"series<boxplot>.data.events","title":"events","parent":"series<boxplot>-data","isParent":true,"returnType":"","defaults":"","since":"","description":"Individual point events","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-solidgauge-events","fullname":"plotOptions.solidgauge.events","title":"events","parent":"plotOptions-solidgauge","isParent":true},{"name":"series<columnrange>-events","fullname":"series<columnrange>.events","title":"events","parent":"series<columnrange>","isParent":true},{"name":"plotOptions-line-point-events","fullname":"plotOptions.line.point.events","title":"events","parent":"plotOptions-line-point","isParent":true,"description":"Events for each single point"},{"name":"plotOptions-scatter-events","fullname":"plotOptions.scatter.events","title":"events","parent":"plotOptions-scatter","isParent":true},{"name":"series<area>-events","fullname":"series<area>.events","title":"events","parent":"series<area>","isParent":true},{"name":"series<scatter>-data-events","fullname":"series<scatter>.data.events","title":"events","parent":"series<scatter>-data","isParent":true,"returnType":"","defaults":"","since":"","description":"Individual point events","demo":"","seeAlso":"","deprecated":false},{"name":"series<column>-events","fullname":"series<column>.events","title":"events","parent":"series<column>","isParent":true},{"name":"series<errorbar>-point-events","fullname":"series<errorbar>.point.events","title":"events","parent":"series<errorbar>-point","isParent":true,"description":"Events for each single point"},{"name":"series<areaspline>-events","fullname":"series<areaspline>.events","title":"events","parent":"series<areaspline>","isParent":true},{"name":"plotOptions-areaspline-point-events","fullname":"plotOptions.areaspline.point.events","title":"events","parent":"plotOptions-areaspline-point","isParent":true,"description":"Events for each single point"},{"name":"plotOptions-series-point-events","fullname":"plotOptions.series.point.events","title":"events","parent":"plotOptions-series-point","isParent":true,"description":"Events for each single point"},{"name":"plotOptions-columnrange-point-events","fullname":"plotOptions.columnrange.point.events","title":"events","parent":"plotOptions-columnrange-point","isParent":true,"description":"Events for each single point"},{"name":"series<boxplot>-events","fullname":"series<boxplot>.events","title":"events","parent":"series<boxplot>","isParent":true},{"name":"series<columnrange>-point-events","fullname":"series<columnrange>.point.events","title":"events","parent":"series<columnrange>-point","isParent":true,"description":"Events for each single point"},{"name":"plotOptions-gauge-point-events","fullname":"plotOptions.gauge.point.events","title":"events","parent":"plotOptions-gauge-point","isParent":true,"description":"Events for each single point"},{"name":"plotOptions-boxplot-point-events","fullname":"plotOptions.boxplot.point.events","title":"events","parent":"plotOptions-boxplot-point","isParent":true,"description":"Events for each single point"},{"name":"plotOptions-pyramid-point-events","fullname":"plotOptions.pyramid.point.events","title":"events","parent":"plotOptions-pyramid-point","isParent":true,"description":"Events for each single point"},{"name":"plotOptions-funnel-point-events","fullname":"plotOptions.funnel.point.events","title":"events","parent":"plotOptions-funnel-point","isParent":true,"description":"Events for each single point"},{"name":"series<pyramid>-point-events","fullname":"series<pyramid>.point.events","title":"events","parent":"series<pyramid>-point","isParent":true,"description":"Events for each single point"},{"name":"series<spline>-point-events","fullname":"series<spline>.point.events","title":"events","parent":"series<spline>-point","isParent":true,"description":"Events for each single point"},{"name":"series<funnel>-point-events","fullname":"series<funnel>.point.events","title":"events","parent":"series<funnel>-point","isParent":true,"description":"Events for each single point"},{"name":"series<boxplot>-point-events","fullname":"series<boxplot>.point.events","title":"events","parent":"series<boxplot>-point","isParent":true,"description":"Events for each single point"},{"name":"plotOptions-area-events","fullname":"plotOptions.area.events","title":"events","parent":"plotOptions-area","isParent":true},{"name":"plotOptions-areasplinerange-point-events","fullname":"plotOptions.areasplinerange.point.events","title":"events","parent":"plotOptions-areasplinerange-point","isParent":true,"description":"Events for each single point"},{"name":"yAxis-events","fullname":"yAxis.events","title":"events","parent":"yAxis","isParent":true},{"name":"plotOptions-bar-point-events","fullname":"plotOptions.bar.point.events","title":"events","parent":"plotOptions-bar-point","isParent":true,"description":"Events for each single point"},{"name":"xAxis-events","fullname":"xAxis.events","title":"events","parent":"xAxis","isParent":true,"description":"Event handlers for the axis."},{"name":"plotOptions-line-events","fullname":"plotOptions.line.events","title":"events","parent":"plotOptions-line","isParent":true},{"name":"series<solidgauge>-point-events","fullname":"series<solidgauge>.point.events","title":"events","parent":"series<solidgauge>-point","isParent":true,"description":"Events for each single point"},{"name":"series<pie>-events","fullname":"series<pie>.events","title":"events","parent":"series<pie>","isParent":true},{"name":"series<funnel>-data-events","fullname":"series<funnel>.data.events","title":"events","parent":"series<funnel>-data","isParent":true,"returnType":"","defaults":"","since":"","description":"Individual point events","demo":"","seeAlso":"","deprecated":false},{"name":"series<areaspline>-point-events","fullname":"series<areaspline>.point.events","title":"events","parent":"series<areaspline>-point","isParent":true,"description":"Events for each single point"},{"name":"yAxis-plotBands--events","fullname":"yAxis.plotBands.events","title":"events","parent":"yAxis-plotBands","isParent":false,"returnType":"Object","context":"PlotLineOrBand","since":"1.2","description":"An object defining mouse events for the plot band. Supported properties are <code>click</code>, <code>mouseover</code>, <code>mouseout</code>, <code>mousemove</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-events/\" target=\"_blank\">Mouse events demonstrated</a>","deprecated":false},{"name":"series<bubble>-events","fullname":"series<bubble>.events","title":"events","parent":"series<bubble>","isParent":true},{"name":"series<arearange>-data-events","fullname":"series<arearange>.data.events","title":"events","parent":"series<arearange>-data","isParent":true,"returnType":"","defaults":"","since":"","description":"Individual point events","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column-events","fullname":"plotOptions.column.events","title":"events","parent":"plotOptions-column","isParent":true},{"name":"plotOptions-bubble-point-events","fullname":"plotOptions.bubble.point.events","title":"events","parent":"plotOptions-bubble-point","isParent":true,"description":"Events for each single point"},{"name":"series<waterfall>-events","fullname":"series<waterfall>.events","title":"events","parent":"series<waterfall>","isParent":true},{"name":"yAxis-plotLines--events","fullname":"yAxis.plotLines.events","title":"events","parent":"yAxis-plotLines","isParent":false,"returnType":"Object","context":"PlotLineOrBand","since":"1.2","description":"An object defining mouse events for the plot line. Supported properties are <code>click</code>, <code>mouseover</code>, <code>mouseout</code>, <code>mousemove</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-events/\" target=\"_blank\">Mouse events demonstrated</a>","deprecated":false},{"name":"plotOptions-pie-point-events","fullname":"plotOptions.pie.point.events","title":"events","parent":"plotOptions-pie-point","isParent":true,"description":"Events for each single point"},{"name":"plotOptions-funnel-events","fullname":"plotOptions.funnel.events","title":"events","parent":"plotOptions-funnel","isParent":true},{"name":"plotOptions-arearange-events","fullname":"plotOptions.arearange.events","title":"events","parent":"plotOptions-arearange","isParent":true},{"name":"series<areasplinerange>-events","fullname":"series<areasplinerange>.events","title":"events","parent":"series<areasplinerange>","isParent":true},{"name":"plotOptions-arearange-point-events","fullname":"plotOptions.arearange.point.events","title":"events","parent":"plotOptions-arearange-point","isParent":true,"description":"Events for each single point"},{"name":"plotOptions-bubble-events","fullname":"plotOptions.bubble.events","title":"events","parent":"plotOptions-bubble","isParent":true},{"name":"series<gauge>-data-events","fullname":"series<gauge>.data.events","title":"events","parent":"series<gauge>-data","isParent":true,"returnType":"","defaults":"","since":"","description":"Individual point events","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap-events","fullname":"plotOptions.heatmap.events","title":"events","parent":"plotOptions-heatmap","isParent":true},{"name":"series<line>-data-events","fullname":"series<line>.data.events","title":"events","parent":"series<line>-data","isParent":true,"returnType":"","defaults":"","since":"","description":"Individual point events","demo":"","seeAlso":"","deprecated":false},{"name":"series<line>-events","fullname":"series<line>.events","title":"events","parent":"series<line>","isParent":true},{"name":"plotOptions-waterfall-events","fullname":"plotOptions.waterfall.events","title":"events","parent":"plotOptions-waterfall","isParent":true},{"name":"series<treemap>-point-events","fullname":"series<treemap>.point.events","title":"events","parent":"series<treemap>-point","isParent":true,"description":"Events for each single point"},{"name":"plotOptions-pie-events","fullname":"plotOptions.pie.events","title":"events","parent":"plotOptions-pie","isParent":true},{"name":"series<gauge>-point-events","fullname":"series<gauge>.point.events","title":"events","parent":"series<gauge>-point","isParent":true,"description":"Events for each single point"},{"name":"series<bubble>-point-events","fullname":"series<bubble>.point.events","title":"events","parent":"series<bubble>-point","isParent":true,"description":"Events for each single point"},{"name":"series<solidgauge>-data-events","fullname":"series<solidgauge>.data.events","title":"events","parent":"series<solidgauge>-data","isParent":true,"returnType":"","defaults":"","since":"","description":"Individual point events","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange-events","fullname":"plotOptions.areasplinerange.events","title":"events","parent":"plotOptions-areasplinerange","isParent":true},{"name":"series<heatmap>-data-events","fullname":"series<heatmap>.data.events","title":"events","parent":"series<heatmap>-data","isParent":true,"returnType":"","defaults":"","since":"","description":"Individual point events","demo":"","seeAlso":"","deprecated":false},{"name":"series<columnrange>-data-events","fullname":"series<columnrange>.data.events","title":"events","parent":"series<columnrange>-data","isParent":true,"returnType":"","defaults":"","since":"","description":"Individual point events","demo":"","seeAlso":"","deprecated":false},{"name":"series<polygon>-data-events","fullname":"series<polygon>.data.events","title":"events","parent":"series<polygon>-data","isParent":true,"returnType":"","defaults":"","since":"","description":"Individual point events","demo":"","seeAlso":"","deprecated":false},{"name":"series<bar>-point-events","fullname":"series<bar>.point.events","title":"events","parent":"series<bar>-point","isParent":true,"description":"Events for each single point"},{"name":"chart-events","fullname":"chart.events","title":"events","parent":"chart","isParent":true,"description":"Event listeners for the chart."},{"name":"series<spline>-events","fullname":"series<spline>.events","title":"events","parent":"series<spline>","isParent":true},{"name":"plotOptions-treemap-point-events","fullname":"plotOptions.treemap.point.events","title":"events","parent":"plotOptions-treemap-point","isParent":true,"description":"Events for each single point"},{"name":"plotOptions-errorbar-point-events","fullname":"plotOptions.errorbar.point.events","title":"events","parent":"plotOptions-errorbar-point","isParent":true,"description":"Events for each single point"},{"name":"series<treemap>-data-events","fullname":"series<treemap>.data.events","title":"events","parent":"series<treemap>-data","isParent":true,"returnType":"","defaults":"","since":"","description":"Individual point events","demo":"","seeAlso":"","deprecated":false},{"name":"series<errorbar>-events","fullname":"series<errorbar>.events","title":"events","parent":"series<errorbar>","isParent":true},{"name":"plotOptions-pyramid-events","fullname":"plotOptions.pyramid.events","title":"events","parent":"plotOptions-pyramid","isParent":true},{"name":"series<errorbar>-data-events","fullname":"series<errorbar>.data.events","title":"events","parent":"series<errorbar>-data","isParent":true,"returnType":"","defaults":"","since":"","description":"Individual point events","demo":"","seeAlso":"","deprecated":false},{"name":"series<line>-point-events","fullname":"series<line>.point.events","title":"events","parent":"series<line>-point","isParent":true,"description":"Events for each single point"},{"name":"series<areaspline>-data-events","fullname":"series<areaspline>.data.events","title":"events","parent":"series<areaspline>-data","isParent":true,"returnType":"","defaults":"","since":"","description":"Individual point events","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-events","fullname":"plotOptions.areaspline.events","title":"events","parent":"plotOptions-areaspline","isParent":true},{"name":"series<pyramid>-events","fullname":"series<pyramid>.events","title":"events","parent":"series<pyramid>","isParent":true},{"name":"xAxis-plotBands--events","fullname":"xAxis.plotBands.events","title":"events","parent":"xAxis-plotBands","isParent":false,"returnType":"Object","context":"PlotLineOrBand","since":"1.2","description":"An object defining mouse events for the plot band. Supported properties are <code>click</code>, <code>mouseover</code>, <code>mouseout</code>, <code>mousemove</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-events/\" target=\"_blank\">Mouse events demonstrated</a>","deprecated":false},{"name":"series<heatmap>-events","fullname":"series<heatmap>.events","title":"events","parent":"series<heatmap>","isParent":true},{"name":"series<pie>-point-events","fullname":"series<pie>.point.events","title":"events","parent":"series<pie>-point","isParent":true,"description":"Events for each single point"},{"name":"series<bar>-data-events","fullname":"series<bar>.data.events","title":"events","parent":"series<bar>-data","isParent":true,"returnType":"","defaults":"","since":"","description":"Individual point events","demo":"","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-data-events","fullname":"series<areasplinerange>.data.events","title":"events","parent":"series<areasplinerange>-data","isParent":true,"returnType":"","defaults":"","since":"","description":"Individual point events","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-events","fullname":"plotOptions.polygon.events","title":"events","parent":"plotOptions-polygon","isParent":true},{"name":"series<heatmap>-point-events","fullname":"series<heatmap>.point.events","title":"events","parent":"series<heatmap>-point","isParent":true,"description":"Events for each single point"},{"name":"plotOptions-spline-events","fullname":"plotOptions.spline.events","title":"events","parent":"plotOptions-spline","isParent":true},{"name":"plotOptions-waterfall-point-events","fullname":"plotOptions.waterfall.point.events","title":"events","parent":"plotOptions-waterfall-point","isParent":true,"description":"Events for each single point"},{"name":"plotOptions-series-events","fullname":"plotOptions.series.events","title":"events","parent":"plotOptions-series","isParent":true},{"name":"plotOptions-columnrange-events","fullname":"plotOptions.columnrange.events","title":"events","parent":"plotOptions-columnrange","isParent":true},{"name":"series<polygon>-events","fullname":"series<polygon>.events","title":"events","parent":"series<polygon>","isParent":true},{"name":"plotOptions-errorbar-events","fullname":"plotOptions.errorbar.events","title":"events","parent":"plotOptions-errorbar","isParent":true},{"name":"series<column>-point-events","fullname":"series<column>.point.events","title":"events","parent":"series<column>-point","isParent":true,"description":"Events for each single point"},{"name":"xAxis-plotLines--events","fullname":"xAxis.plotLines.events","title":"events","parent":"xAxis-plotLines","isParent":false,"returnType":"Object","context":"PlotLineOrBand","since":"1.2","description":"An object defining mouse events for the plot line. Supported properties are <code>click</code>, <code>mouseover</code>, <code>mouseout</code>, <code>mousemove</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-events/\" target=\"_blank\">Mouse events demonstrated</a>","deprecated":false},{"name":"plotOptions-scatter-point-events","fullname":"plotOptions.scatter.point.events","title":"events","parent":"plotOptions-scatter-point","isParent":true,"description":"Events for each single point"},{"name":"series<pie>-data-events","fullname":"series<pie>.data.events","title":"events","parent":"series<pie>-data","isParent":true,"returnType":"","defaults":"","since":"","description":"Individual point events","demo":"","seeAlso":"","deprecated":false},{"name":"series<waterfall>-point-events","fullname":"series<waterfall>.point.events","title":"events","parent":"series<waterfall>-point","isParent":true,"description":"Events for each single point"},{"name":"series<polygon>-point-events","fullname":"series<polygon>.point.events","title":"events","parent":"series<polygon>-point","isParent":true,"description":"Events for each single point"},{"name":"series<arearange>-point-events","fullname":"series<arearange>.point.events","title":"events","parent":"series<arearange>-point","isParent":true,"description":"Events for each single point"},{"name":"series<arearange>-events","fullname":"series<arearange>.events","title":"events","parent":"series<arearange>","isParent":true},{"name":"plotOptions-bar-events","fullname":"plotOptions.bar.events","title":"events","parent":"plotOptions-bar","isParent":true},{"name":"series<area>-data-events","fullname":"series<area>.data.events","title":"events","parent":"series<area>-data","isParent":true,"returnType":"","defaults":"","since":"","description":"Individual point events","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap-events","fullname":"plotOptions.treemap.events","title":"events","parent":"plotOptions-treemap","isParent":true},{"name":"series<funnel>-events","fullname":"series<funnel>.events","title":"events","parent":"series<funnel>","isParent":true},{"name":"plotOptions-heatmap-point-events","fullname":"plotOptions.heatmap.point.events","title":"events","parent":"plotOptions-heatmap-point","isParent":true,"description":"Events for each single point"},{"name":"series<bar>-events","fullname":"series<bar>.events","title":"events","parent":"series<bar>","isParent":true},{"name":"plotOptions-gauge-events","fullname":"plotOptions.gauge.events","title":"events","parent":"plotOptions-gauge","isParent":true},{"name":"series<scatter>-events","fullname":"series<scatter>.events","title":"events","parent":"series<scatter>","isParent":true},{"name":"plotOptions-solidgauge-point-events","fullname":"plotOptions.solidgauge.point.events","title":"events","parent":"plotOptions-solidgauge-point","isParent":true,"description":"Events for each single point"},{"name":"plotOptions-area-point-events","fullname":"plotOptions.area.point.events","title":"events","parent":"plotOptions-area-point","isParent":true,"description":"Events for each single point"},{"name":"series<column>-data-events","fullname":"series<column>.data.events","title":"events","parent":"series<column>-data","isParent":true,"returnType":"","defaults":"","since":"","description":"Individual point events","demo":"","seeAlso":"","deprecated":false},{"name":"series<gauge>-events","fullname":"series<gauge>.events","title":"events","parent":"series<gauge>","isParent":true},{"name":"series<solidgauge>-events","fullname":"series<solidgauge>.events","title":"events","parent":"series<solidgauge>","isParent":true},{"name":"series<pyramid>-data-events","fullname":"series<pyramid>.data.events","title":"events","parent":"series<pyramid>-data","isParent":true,"returnType":"","defaults":"","since":"","description":"Individual point events","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-point-events","fullname":"plotOptions.polygon.point.events","title":"events","parent":"plotOptions-polygon-point","isParent":true,"description":"Events for each single point"},{"name":"series<waterfall>-data-events","fullname":"series<waterfall>.data.events","title":"events","parent":"series<waterfall>-data","isParent":true,"returnType":"","defaults":"","since":"","description":"Individual point events","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column-point-events","fullname":"plotOptions.column.point.events","title":"events","parent":"plotOptions-column-point","isParent":true,"description":"Events for each single point"},{"name":"series<treemap>-events","fullname":"series<treemap>.events","title":"events","parent":"series<treemap>","isParent":true},{"name":"series<area>-point-events","fullname":"series<area>.point.events","title":"events","parent":"series<area>-point","isParent":true,"description":"Events for each single point"},{"name":"series<scatter>-point-events","fullname":"series<scatter>.point.events","title":"events","parent":"series<scatter>-point","isParent":true,"description":"Events for each single point"},{"name":"exporting","fullname":"exporting","title":"exporting","isParent":true,"description":"Options for the exporting module. For an overview on the matter, see <a href=\"http://www.highcharts.com/docs/export-module/export-module-overview\">the docs</a>.","deprecated":false},{"name":"exporting--filename","fullname":"exporting.filename","title":"filename","parent":"exporting","isParent":false,"returnType":"String","defaults":"chart","since":"2.0","description":"The filename, without extension, to use for the exported chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/exporting/filename/\" target=\"_blank\">Custom file name</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-states-hover-marker--fillColor","fullname":"plotOptions.pyramid.states.hover.marker.fillColor","title":"fillColor","parent":"plotOptions-pyramid-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-area-zones--fillColor","fullname":"plotOptions.area.zones.fillColor","title":"fillColor","parent":"plotOptions-area-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<treemap>-zones--fillColor","fullname":"series<treemap>.zones.fillColor","title":"fillColor","parent":"series<treemap>-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<solidgauge>-zones--fillColor","fullname":"series<solidgauge>.zones.fillColor","title":"fillColor","parent":"series<solidgauge>-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"plotOptions-series-marker-states-select--fillColor","fullname":"plotOptions.series.marker.states.select.fillColor","title":"fillColor","parent":"plotOptions-series-marker-states-select","isParent":false,"returnType":"Color","description":"The fill color of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-fillcolor/\" target=\"_blank\">Solid red discs for selected points</a>","deprecated":false},{"name":"plotOptions-bubble-zones--fillColor","fullname":"plotOptions.bubble.zones.fillColor","title":"fillColor","parent":"plotOptions-bubble-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<bar>-zones--fillColor","fullname":"series<bar>.zones.fillColor","title":"fillColor","parent":"series<bar>-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<line>-data-marker-states-hover--fillColor","fullname":"series<line>.data.marker.states.hover.fillColor","title":"fillColor","parent":"series<line>-data-marker-states-hover","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"The fill color of the marker in hover state.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-marker-states-hover--fillColor","fullname":"plotOptions.areaspline.marker.states.hover.fillColor","title":"fillColor","parent":"plotOptions-areaspline-marker-states-hover","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"The fill color of the marker in hover state.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-series-zones--fillColor","fullname":"plotOptions.series.zones.fillColor","title":"fillColor","parent":"plotOptions-series-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"plotOptions-columnrange-states-hover-marker--fillColor","fullname":"plotOptions.columnrange.states.hover.marker.fillColor","title":"fillColor","parent":"plotOptions-columnrange-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<spline>-marker--fillColor","fullname":"series<spline>.marker.fillColor","title":"fillColor","parent":"series<spline>-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-pie-states-hover-marker--fillColor","fullname":"plotOptions.pie.states.hover.marker.fillColor","title":"fillColor","parent":"plotOptions-pie-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<columnrange>-states-hover-marker--fillColor","fullname":"series<columnrange>.states.hover.marker.fillColor","title":"fillColor","parent":"series<columnrange>-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<arearange>--fillColor","fullname":"series<arearange>.fillColor","title":"fillColor","parent":"series<arearange>","isParent":false,"returnType":"Color","description":"Fill color or gradient for the area. When <code>null</code>, the series' <code>color</code>  is  used with the series' <code>fillOpacity</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillcolor-default/\" target=\"_blank\">Null by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillcolor-gradient/\" target=\"_blank\">gradient</a>"},{"name":"series<area>-marker-states-select--fillColor","fullname":"series<area>.marker.states.select.fillColor","title":"fillColor","parent":"series<area>-marker-states-select","isParent":false,"returnType":"Color","description":"The fill color of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-fillcolor/\" target=\"_blank\">Solid red discs for selected points</a>","deprecated":false},{"name":"series<waterfall>-zones--fillColor","fullname":"series<waterfall>.zones.fillColor","title":"fillColor","parent":"series<waterfall>-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<column>-states-hover-marker--fillColor","fullname":"series<column>.states.hover.marker.fillColor","title":"fillColor","parent":"series<column>-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<areaspline>--fillColor","fullname":"series<areaspline>.fillColor","title":"fillColor","parent":"series<areaspline>","isParent":false,"returnType":"Color","description":"Fill color or gradient for the area. When <code>null</code>, the series' <code>color</code>  is  used with the series' <code>fillOpacity</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillcolor-default/\" target=\"_blank\">Null by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillcolor-gradient/\" target=\"_blank\">gradient</a>"},{"name":"plotOptions-pie-zones--fillColor","fullname":"plotOptions.pie.zones.fillColor","title":"fillColor","parent":"plotOptions-pie-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"plotOptions-series-marker-states-hover--fillColor","fullname":"plotOptions.series.marker.states.hover.fillColor","title":"fillColor","parent":"plotOptions-series-marker-states-hover","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"The fill color of the marker in hover state.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-marker-states-select--fillColor","fullname":"plotOptions.areaspline.marker.states.select.fillColor","title":"fillColor","parent":"plotOptions-areaspline-marker-states-select","isParent":false,"returnType":"Color","description":"The fill color of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-fillcolor/\" target=\"_blank\">Solid red discs for selected points</a>","deprecated":false},{"name":"plotOptions-areaspline-states-hover-marker--fillColor","fullname":"plotOptions.areaspline.states.hover.marker.fillColor","title":"fillColor","parent":"plotOptions-areaspline-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-boxplot-states-hover-marker--fillColor","fullname":"plotOptions.boxplot.states.hover.marker.fillColor","title":"fillColor","parent":"plotOptions-boxplot-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<treemap>-states-hover-marker--fillColor","fullname":"series<treemap>.states.hover.marker.fillColor","title":"fillColor","parent":"series<treemap>-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<areasplinerange>-states-hover-marker--fillColor","fullname":"series<areasplinerange>.states.hover.marker.fillColor","title":"fillColor","parent":"series<areasplinerange>-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<polygon>-marker-states-hover--fillColor","fullname":"series<polygon>.marker.states.hover.fillColor","title":"fillColor","parent":"series<polygon>-marker-states-hover","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"The fill color of the marker in hover state.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-zones--fillColor","fullname":"plotOptions.pyramid.zones.fillColor","title":"fillColor","parent":"plotOptions-pyramid-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<pyramid>-states-hover-marker--fillColor","fullname":"series<pyramid>.states.hover.marker.fillColor","title":"fillColor","parent":"series<pyramid>-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-polygon-marker-states-select--fillColor","fullname":"plotOptions.polygon.marker.states.select.fillColor","title":"fillColor","parent":"plotOptions-polygon-marker-states-select","isParent":false,"returnType":"Color","description":"The fill color of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-fillcolor/\" target=\"_blank\">Solid red discs for selected points</a>","deprecated":false},{"name":"series<polygon>-states-hover-marker--fillColor","fullname":"series<polygon>.states.hover.marker.fillColor","title":"fillColor","parent":"series<polygon>-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-funnel-zones--fillColor","fullname":"plotOptions.funnel.zones.fillColor","title":"fillColor","parent":"plotOptions-funnel-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"plotOptions-boxplot-zones--fillColor","fullname":"plotOptions.boxplot.zones.fillColor","title":"fillColor","parent":"plotOptions-boxplot-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"plotOptions-series-states-hover-marker--fillColor","fullname":"plotOptions.series.states.hover.marker.fillColor","title":"fillColor","parent":"plotOptions-series-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<line>-states-hover-marker--fillColor","fullname":"series<line>.states.hover.marker.fillColor","title":"fillColor","parent":"series<line>-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<gauge>-states-hover-marker--fillColor","fullname":"series<gauge>.states.hover.marker.fillColor","title":"fillColor","parent":"series<gauge>-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<funnel>-zones--fillColor","fullname":"series<funnel>.zones.fillColor","title":"fillColor","parent":"series<funnel>-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<spline>-data-marker--fillColor","fullname":"series<spline>.data.marker.fillColor","title":"fillColor","parent":"series<spline>-data-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<pie>-states-hover-marker--fillColor","fullname":"series<pie>.states.hover.marker.fillColor","title":"fillColor","parent":"series<pie>-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<columnrange>-zones--fillColor","fullname":"series<columnrange>.zones.fillColor","title":"fillColor","parent":"series<columnrange>-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"plotOptions-bubble-marker-states-select--fillColor","fullname":"plotOptions.bubble.marker.states.select.fillColor","title":"fillColor","parent":"plotOptions-bubble-marker-states-select","isParent":false,"returnType":"Color","description":"The fill color of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-fillcolor/\" target=\"_blank\">Solid red discs for selected points</a>","deprecated":false},{"name":"series<areasplinerange>--fillColor","fullname":"series<areasplinerange>.fillColor","title":"fillColor","parent":"series<areasplinerange>","isParent":false,"returnType":"Color","description":"Fill color or gradient for the area. When <code>null</code>, the series' <code>color</code>  is  used with the series' <code>fillOpacity</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillcolor-default/\" target=\"_blank\">Null by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillcolor-gradient/\" target=\"_blank\">gradient</a>"},{"name":"series<line>-marker-states-hover--fillColor","fullname":"series<line>.marker.states.hover.fillColor","title":"fillColor","parent":"series<line>-marker-states-hover","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"The fill color of the marker in hover state.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall-states-hover-marker--fillColor","fullname":"plotOptions.waterfall.states.hover.marker.fillColor","title":"fillColor","parent":"plotOptions-waterfall-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-polygon-zones--fillColor","fullname":"plotOptions.polygon.zones.fillColor","title":"fillColor","parent":"plotOptions-polygon-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"plotOptions-scatter-zones--fillColor","fullname":"plotOptions.scatter.zones.fillColor","title":"fillColor","parent":"plotOptions-scatter-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<gauge>-zones--fillColor","fullname":"series<gauge>.zones.fillColor","title":"fillColor","parent":"series<gauge>-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<area>-data-marker-states-select--fillColor","fullname":"series<area>.data.marker.states.select.fillColor","title":"fillColor","parent":"series<area>-data-marker-states-select","isParent":false,"returnType":"Color","description":"The fill color of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-fillcolor/\" target=\"_blank\">Solid red discs for selected points</a>","deprecated":false},{"name":"series<polygon>-data-marker-states-hover--fillColor","fullname":"series<polygon>.data.marker.states.hover.fillColor","title":"fillColor","parent":"series<polygon>-data-marker-states-hover","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"The fill color of the marker in hover state.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-area-states-hover-marker--fillColor","fullname":"plotOptions.area.states.hover.marker.fillColor","title":"fillColor","parent":"plotOptions-area-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<area>-data-marker--fillColor","fullname":"series<area>.data.marker.fillColor","title":"fillColor","parent":"series<area>-data-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<spline>-data-marker-states-hover--fillColor","fullname":"series<spline>.data.marker.states.hover.fillColor","title":"fillColor","parent":"series<spline>-data-marker-states-hover","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"The fill color of the marker in hover state.","demo":"","seeAlso":"","deprecated":false},{"name":"series<line>-data-marker-states-select--fillColor","fullname":"series<line>.data.marker.states.select.fillColor","title":"fillColor","parent":"series<line>-data-marker-states-select","isParent":false,"returnType":"Color","description":"The fill color of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-fillcolor/\" target=\"_blank\">Solid red discs for selected points</a>","deprecated":false},{"name":"plotOptions-line-marker-states-select--fillColor","fullname":"plotOptions.line.marker.states.select.fillColor","title":"fillColor","parent":"plotOptions-line-marker-states-select","isParent":false,"returnType":"Color","description":"The fill color of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-fillcolor/\" target=\"_blank\">Solid red discs for selected points</a>","deprecated":false},{"name":"series<spline>-data-marker-states-select--fillColor","fullname":"series<spline>.data.marker.states.select.fillColor","title":"fillColor","parent":"series<spline>-data-marker-states-select","isParent":false,"returnType":"Color","description":"The fill color of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-fillcolor/\" target=\"_blank\">Solid red discs for selected points</a>","deprecated":false},{"name":"series<areasplinerange>-zones--fillColor","fullname":"series<areasplinerange>.zones.fillColor","title":"fillColor","parent":"series<areasplinerange>-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"plotOptions-bar-zones--fillColor","fullname":"plotOptions.bar.zones.fillColor","title":"fillColor","parent":"plotOptions-bar-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<scatter>-marker-states-hover--fillColor","fullname":"series<scatter>.marker.states.hover.fillColor","title":"fillColor","parent":"series<scatter>-marker-states-hover","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"The fill color of the marker in hover state.","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>-zones--fillColor","fullname":"series<spline>.zones.fillColor","title":"fillColor","parent":"series<spline>-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"plotOptions-line-marker--fillColor","fullname":"plotOptions.line.marker.fillColor","title":"fillColor","parent":"plotOptions-line-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-boxplot--fillColor","fullname":"plotOptions.boxplot.fillColor","title":"fillColor","parent":"plotOptions-boxplot","isParent":false,"returnType":"Color","defaults":"#FFFFFF","values":"","since":"3.0","description":"The fill color of the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-area-marker-states-hover--fillColor","fullname":"plotOptions.area.marker.states.hover.fillColor","title":"fillColor","parent":"plotOptions-area-marker-states-hover","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"The fill color of the marker in hover state.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bubble>-marker-states-select--fillColor","fullname":"series<bubble>.marker.states.select.fillColor","title":"fillColor","parent":"series<bubble>-marker-states-select","isParent":false,"returnType":"Color","description":"The fill color of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-fillcolor/\" target=\"_blank\">Solid red discs for selected points</a>","deprecated":false},{"name":"series<errorbar>-zones--fillColor","fullname":"series<errorbar>.zones.fillColor","title":"fillColor","parent":"series<errorbar>-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<areaspline>-data-marker-states-select--fillColor","fullname":"series<areaspline>.data.marker.states.select.fillColor","title":"fillColor","parent":"series<areaspline>-data-marker-states-select","isParent":false,"returnType":"Color","description":"The fill color of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-fillcolor/\" target=\"_blank\">Solid red discs for selected points</a>","deprecated":false},{"name":"plotOptions-spline-marker-states-select--fillColor","fullname":"plotOptions.spline.marker.states.select.fillColor","title":"fillColor","parent":"plotOptions-spline-marker-states-select","isParent":false,"returnType":"Color","description":"The fill color of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-fillcolor/\" target=\"_blank\">Solid red discs for selected points</a>","deprecated":false},{"name":"series<heatmap>-states-hover-marker--fillColor","fullname":"series<heatmap>.states.hover.marker.fillColor","title":"fillColor","parent":"series<heatmap>-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<polygon>-data-marker--fillColor","fullname":"series<polygon>.data.marker.fillColor","title":"fillColor","parent":"series<polygon>-data-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<scatter>-data-marker-states-select--fillColor","fullname":"series<scatter>.data.marker.states.select.fillColor","title":"fillColor","parent":"series<scatter>-data-marker-states-select","isParent":false,"returnType":"Color","description":"The fill color of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-fillcolor/\" target=\"_blank\">Solid red discs for selected points</a>","deprecated":false},{"name":"series<area>-states-hover-marker--fillColor","fullname":"series<area>.states.hover.marker.fillColor","title":"fillColor","parent":"series<area>-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-series-marker--fillColor","fullname":"plotOptions.series.marker.fillColor","title":"fillColor","parent":"plotOptions-series-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<waterfall>-states-hover-marker--fillColor","fullname":"series<waterfall>.states.hover.marker.fillColor","title":"fillColor","parent":"series<waterfall>-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-areasplinerange--fillColor","fullname":"plotOptions.areasplinerange.fillColor","title":"fillColor","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"Color","description":"Fill color or gradient for the area. When <code>null</code>, the series' <code>color</code>  is  used with the series' <code>fillOpacity</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillcolor-default/\" target=\"_blank\">Null by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillcolor-gradient/\" target=\"_blank\">gradient</a>"},{"name":"plotOptions-scatter-marker-states-select--fillColor","fullname":"plotOptions.scatter.marker.states.select.fillColor","title":"fillColor","parent":"plotOptions-scatter-marker-states-select","isParent":false,"returnType":"Color","description":"The fill color of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-fillcolor/\" target=\"_blank\">Solid red discs for selected points</a>","deprecated":false},{"name":"series<areaspline>-zones--fillColor","fullname":"series<areaspline>.zones.fillColor","title":"fillColor","parent":"series<areaspline>-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"plotOptions-bar-states-hover-marker--fillColor","fullname":"plotOptions.bar.states.hover.marker.fillColor","title":"fillColor","parent":"plotOptions-bar-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<area>-marker-states-hover--fillColor","fullname":"series<area>.marker.states.hover.fillColor","title":"fillColor","parent":"series<area>-marker-states-hover","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"The fill color of the marker in hover state.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areaspline>-marker--fillColor","fullname":"series<areaspline>.marker.fillColor","title":"fillColor","parent":"series<areaspline>-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-arearange--fillColor","fullname":"plotOptions.arearange.fillColor","title":"fillColor","parent":"plotOptions-arearange","isParent":false,"returnType":"Color","description":"Fill color or gradient for the area. When <code>null</code>, the series' <code>color</code>  is  used with the series' <code>fillOpacity</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillcolor-default/\" target=\"_blank\">Null by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillcolor-gradient/\" target=\"_blank\">gradient</a>"},{"name":"series<scatter>-marker--fillColor","fullname":"series<scatter>.marker.fillColor","title":"fillColor","parent":"series<scatter>-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<scatter>-states-hover-marker--fillColor","fullname":"series<scatter>.states.hover.marker.fillColor","title":"fillColor","parent":"series<scatter>-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<bubble>-marker-states-hover--fillColor","fullname":"series<bubble>.marker.states.hover.fillColor","title":"fillColor","parent":"series<bubble>-marker-states-hover","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"The fill color of the marker in hover state.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap-states-hover-marker--fillColor","fullname":"plotOptions.treemap.states.hover.marker.fillColor","title":"fillColor","parent":"plotOptions-treemap-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-polygon-states-hover-marker--fillColor","fullname":"plotOptions.polygon.states.hover.marker.fillColor","title":"fillColor","parent":"plotOptions-polygon-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-spline-marker-states-hover--fillColor","fullname":"plotOptions.spline.marker.states.hover.fillColor","title":"fillColor","parent":"plotOptions-spline-marker-states-hover","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"The fill color of the marker in hover state.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areaspline>-states-hover-marker--fillColor","fullname":"series<areaspline>.states.hover.marker.fillColor","title":"fillColor","parent":"series<areaspline>-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-bubble-states-hover-marker--fillColor","fullname":"plotOptions.bubble.states.hover.marker.fillColor","title":"fillColor","parent":"plotOptions-bubble-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-columnrange-zones--fillColor","fullname":"plotOptions.columnrange.zones.fillColor","title":"fillColor","parent":"plotOptions-columnrange-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<areaspline>-data-marker--fillColor","fullname":"series<areaspline>.data.marker.fillColor","title":"fillColor","parent":"series<areaspline>-data-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<line>-marker-states-select--fillColor","fullname":"series<line>.marker.states.select.fillColor","title":"fillColor","parent":"series<line>-marker-states-select","isParent":false,"returnType":"Color","description":"The fill color of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-fillcolor/\" target=\"_blank\">Solid red discs for selected points</a>","deprecated":false},{"name":"series<heatmap>-zones--fillColor","fullname":"series<heatmap>.zones.fillColor","title":"fillColor","parent":"series<heatmap>-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"plotOptions-solidgauge-zones--fillColor","fullname":"plotOptions.solidgauge.zones.fillColor","title":"fillColor","parent":"plotOptions-solidgauge-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"plotOptions-line-marker-states-hover--fillColor","fullname":"plotOptions.line.marker.states.hover.fillColor","title":"fillColor","parent":"plotOptions-line-marker-states-hover","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"The fill color of the marker in hover state.","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>-marker-states-select--fillColor","fullname":"series<spline>.marker.states.select.fillColor","title":"fillColor","parent":"series<spline>-marker-states-select","isParent":false,"returnType":"Color","description":"The fill color of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-fillcolor/\" target=\"_blank\">Solid red discs for selected points</a>","deprecated":false},{"name":"plotOptions-area-marker--fillColor","fullname":"plotOptions.area.marker.fillColor","title":"fillColor","parent":"plotOptions-area-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<funnel>-states-hover-marker--fillColor","fullname":"series<funnel>.states.hover.marker.fillColor","title":"fillColor","parent":"series<funnel>-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<line>-marker--fillColor","fullname":"series<line>.marker.fillColor","title":"fillColor","parent":"series<line>-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<area>-data-marker-states-hover--fillColor","fullname":"series<area>.data.marker.states.hover.fillColor","title":"fillColor","parent":"series<area>-data-marker-states-hover","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"The fill color of the marker in hover state.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-marker--fillColor","fullname":"plotOptions.polygon.marker.fillColor","title":"fillColor","parent":"plotOptions-polygon-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-line-zones--fillColor","fullname":"plotOptions.line.zones.fillColor","title":"fillColor","parent":"plotOptions-line-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"plotOptions-solidgauge-states-hover-marker--fillColor","fullname":"plotOptions.solidgauge.states.hover.marker.fillColor","title":"fillColor","parent":"plotOptions-solidgauge-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-arearange-states-hover-marker--fillColor","fullname":"plotOptions.arearange.states.hover.marker.fillColor","title":"fillColor","parent":"plotOptions-arearange-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-areasplinerange-zones--fillColor","fullname":"plotOptions.areasplinerange.zones.fillColor","title":"fillColor","parent":"plotOptions-areasplinerange-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"plotOptions-areaspline-zones--fillColor","fullname":"plotOptions.areaspline.zones.fillColor","title":"fillColor","parent":"plotOptions-areaspline-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"plotOptions-gauge-zones--fillColor","fullname":"plotOptions.gauge.zones.fillColor","title":"fillColor","parent":"plotOptions-gauge-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<boxplot>-states-hover-marker--fillColor","fullname":"series<boxplot>.states.hover.marker.fillColor","title":"fillColor","parent":"series<boxplot>-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-line-states-hover-marker--fillColor","fullname":"plotOptions.line.states.hover.marker.fillColor","title":"fillColor","parent":"plotOptions-line-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-errorbar-zones--fillColor","fullname":"plotOptions.errorbar.zones.fillColor","title":"fillColor","parent":"plotOptions-errorbar-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<solidgauge>-states-hover-marker--fillColor","fullname":"series<solidgauge>.states.hover.marker.fillColor","title":"fillColor","parent":"series<solidgauge>-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<bubble>-marker--fillColor","fullname":"series<bubble>.marker.fillColor","title":"fillColor","parent":"series<bubble>-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<polygon>-zones--fillColor","fullname":"series<polygon>.zones.fillColor","title":"fillColor","parent":"series<polygon>-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<bar>-states-hover-marker--fillColor","fullname":"series<bar>.states.hover.marker.fillColor","title":"fillColor","parent":"series<bar>-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-scatter-states-hover-marker--fillColor","fullname":"plotOptions.scatter.states.hover.marker.fillColor","title":"fillColor","parent":"plotOptions-scatter-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-column-states-hover-marker--fillColor","fullname":"plotOptions.column.states.hover.marker.fillColor","title":"fillColor","parent":"plotOptions-column-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<scatter>-data-marker-states-hover--fillColor","fullname":"series<scatter>.data.marker.states.hover.fillColor","title":"fillColor","parent":"series<scatter>-data-marker-states-hover","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"The fill color of the marker in hover state.","demo":"","seeAlso":"","deprecated":false},{"name":"series<scatter>-data-marker--fillColor","fullname":"series<scatter>.data.marker.fillColor","title":"fillColor","parent":"series<scatter>-data-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-bubble-marker-states-hover--fillColor","fullname":"plotOptions.bubble.marker.states.hover.fillColor","title":"fillColor","parent":"plotOptions-bubble-marker-states-hover","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"The fill color of the marker in hover state.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-states-hover-marker--fillColor","fullname":"plotOptions.spline.states.hover.marker.fillColor","title":"fillColor","parent":"plotOptions-spline-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-spline-marker--fillColor","fullname":"plotOptions.spline.marker.fillColor","title":"fillColor","parent":"plotOptions-spline-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-bubble-marker--fillColor","fullname":"plotOptions.bubble.marker.fillColor","title":"fillColor","parent":"plotOptions-bubble-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-heatmap-states-hover-marker--fillColor","fullname":"plotOptions.heatmap.states.hover.marker.fillColor","title":"fillColor","parent":"plotOptions-heatmap-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<spline>-marker-states-hover--fillColor","fullname":"series<spline>.marker.states.hover.fillColor","title":"fillColor","parent":"series<spline>-marker-states-hover","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"The fill color of the marker in hover state.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-area--fillColor","fullname":"plotOptions.area.fillColor","title":"fillColor","parent":"plotOptions-area","isParent":false,"returnType":"Color","description":"Fill color or gradient for the area. When <code>null</code>, the series' <code>color</code>  is  used with the series' <code>fillOpacity</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillcolor-default/\" target=\"_blank\">Null by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillcolor-gradient/\" target=\"_blank\">gradient</a>"},{"name":"plotOptions-areaspline--fillColor","fullname":"plotOptions.areaspline.fillColor","title":"fillColor","parent":"plotOptions-areaspline","isParent":false,"returnType":"Color","description":"Fill color or gradient for the area. When <code>null</code>, the series' <code>color</code>  is  used with the series' <code>fillOpacity</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillcolor-default/\" target=\"_blank\">Null by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillcolor-gradient/\" target=\"_blank\">gradient</a>"},{"name":"series<areaspline>-data-marker-states-hover--fillColor","fullname":"series<areaspline>.data.marker.states.hover.fillColor","title":"fillColor","parent":"series<areaspline>-data-marker-states-hover","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"The fill color of the marker in hover state.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap-zones--fillColor","fullname":"plotOptions.treemap.zones.fillColor","title":"fillColor","parent":"plotOptions-treemap-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"plotOptions-waterfall-zones--fillColor","fullname":"plotOptions.waterfall.zones.fillColor","title":"fillColor","parent":"plotOptions-waterfall-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<boxplot>-zones--fillColor","fullname":"series<boxplot>.zones.fillColor","title":"fillColor","parent":"series<boxplot>-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<area>--fillColor","fullname":"series<area>.fillColor","title":"fillColor","parent":"series<area>","isParent":false,"returnType":"Color","description":"Fill color or gradient for the area. When <code>null</code>, the series' <code>color</code>  is  used with the series' <code>fillOpacity</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillcolor-default/\" target=\"_blank\">Null by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillcolor-gradient/\" target=\"_blank\">gradient</a>"},{"name":"plotOptions-polygon-marker-states-hover--fillColor","fullname":"plotOptions.polygon.marker.states.hover.fillColor","title":"fillColor","parent":"plotOptions-polygon-marker-states-hover","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"The fill color of the marker in hover state.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter-marker-states-hover--fillColor","fullname":"plotOptions.scatter.marker.states.hover.fillColor","title":"fillColor","parent":"plotOptions-scatter-marker-states-hover","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"The fill color of the marker in hover state.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bubble>-states-hover-marker--fillColor","fullname":"series<bubble>.states.hover.marker.fillColor","title":"fillColor","parent":"series<bubble>-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<areaspline>-marker-states-hover--fillColor","fullname":"series<areaspline>.marker.states.hover.fillColor","title":"fillColor","parent":"series<areaspline>-marker-states-hover","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"The fill color of the marker in hover state.","demo":"","seeAlso":"","deprecated":false},{"name":"series<scatter>-marker-states-select--fillColor","fullname":"series<scatter>.marker.states.select.fillColor","title":"fillColor","parent":"series<scatter>-marker-states-select","isParent":false,"returnType":"Color","description":"The fill color of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-fillcolor/\" target=\"_blank\">Solid red discs for selected points</a>","deprecated":false},{"name":"plotOptions-area-marker-states-select--fillColor","fullname":"plotOptions.area.marker.states.select.fillColor","title":"fillColor","parent":"plotOptions-area-marker-states-select","isParent":false,"returnType":"Color","description":"The fill color of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-fillcolor/\" target=\"_blank\">Solid red discs for selected points</a>","deprecated":false},{"name":"series<area>-marker--fillColor","fullname":"series<area>.marker.fillColor","title":"fillColor","parent":"series<area>-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<polygon>-marker-states-select--fillColor","fullname":"series<polygon>.marker.states.select.fillColor","title":"fillColor","parent":"series<polygon>-marker-states-select","isParent":false,"returnType":"Color","description":"The fill color of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-fillcolor/\" target=\"_blank\">Solid red discs for selected points</a>","deprecated":false},{"name":"series<polygon>-data-marker-states-select--fillColor","fullname":"series<polygon>.data.marker.states.select.fillColor","title":"fillColor","parent":"series<polygon>-data-marker-states-select","isParent":false,"returnType":"Color","description":"The fill color of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-fillcolor/\" target=\"_blank\">Solid red discs for selected points</a>","deprecated":false},{"name":"plotOptions-arearange-zones--fillColor","fullname":"plotOptions.arearange.zones.fillColor","title":"fillColor","parent":"plotOptions-arearange-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<column>-zones--fillColor","fullname":"series<column>.zones.fillColor","title":"fillColor","parent":"series<column>-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"plotOptions-spline-zones--fillColor","fullname":"plotOptions.spline.zones.fillColor","title":"fillColor","parent":"plotOptions-spline-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<polygon>-marker--fillColor","fullname":"series<polygon>.marker.fillColor","title":"fillColor","parent":"series<polygon>-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<pie>-zones--fillColor","fullname":"series<pie>.zones.fillColor","title":"fillColor","parent":"series<pie>-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<errorbar>-states-hover-marker--fillColor","fullname":"series<errorbar>.states.hover.marker.fillColor","title":"fillColor","parent":"series<errorbar>-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<line>-data-marker--fillColor","fullname":"series<line>.data.marker.fillColor","title":"fillColor","parent":"series<line>-data-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-gauge-states-hover-marker--fillColor","fullname":"plotOptions.gauge.states.hover.marker.fillColor","title":"fillColor","parent":"plotOptions-gauge-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-areaspline-marker--fillColor","fullname":"plotOptions.areaspline.marker.fillColor","title":"fillColor","parent":"plotOptions-areaspline-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-scatter-marker--fillColor","fullname":"plotOptions.scatter.marker.fillColor","title":"fillColor","parent":"plotOptions-scatter-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<bubble>-zones--fillColor","fullname":"series<bubble>.zones.fillColor","title":"fillColor","parent":"series<bubble>-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<spline>-states-hover-marker--fillColor","fullname":"series<spline>.states.hover.marker.fillColor","title":"fillColor","parent":"series<spline>-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<area>-zones--fillColor","fullname":"series<area>.zones.fillColor","title":"fillColor","parent":"series<area>-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"plotOptions-column-zones--fillColor","fullname":"plotOptions.column.zones.fillColor","title":"fillColor","parent":"plotOptions-column-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<line>-zones--fillColor","fullname":"series<line>.zones.fillColor","title":"fillColor","parent":"series<line>-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<areaspline>-marker-states-select--fillColor","fullname":"series<areaspline>.marker.states.select.fillColor","title":"fillColor","parent":"series<areaspline>-marker-states-select","isParent":false,"returnType":"Color","description":"The fill color of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-fillcolor/\" target=\"_blank\">Solid red discs for selected points</a>","deprecated":false},{"name":"series<scatter>-zones--fillColor","fullname":"series<scatter>.zones.fillColor","title":"fillColor","parent":"series<scatter>-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"plotOptions-areasplinerange-states-hover-marker--fillColor","fullname":"plotOptions.areasplinerange.states.hover.marker.fillColor","title":"fillColor","parent":"plotOptions-areasplinerange-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"series<arearange>-states-hover-marker--fillColor","fullname":"series<arearange>.states.hover.marker.fillColor","title":"fillColor","parent":"series<arearange>-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-heatmap-zones--fillColor","fullname":"plotOptions.heatmap.zones.fillColor","title":"fillColor","parent":"plotOptions-heatmap-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<arearange>-zones--fillColor","fullname":"series<arearange>.zones.fillColor","title":"fillColor","parent":"series<arearange>-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"series<boxplot>--fillColor","fullname":"series<boxplot>.fillColor","title":"fillColor","parent":"series<boxplot>","isParent":false,"returnType":"Color","defaults":"#FFFFFF","values":"","since":"3.0","description":"The fill color of the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>","seeAlso":"","deprecated":false},{"name":"series<pyramid>-zones--fillColor","fullname":"series<pyramid>.zones.fillColor","title":"fillColor","parent":"series<pyramid>-zones","isParent":false,"returnType":"Color","context":"","defaults":"","values":"","since":"4.1.0","description":"Defines the fill color for the series (in area type series)","demo":"","seeAlso":"<a href=\"#plotOption.area.fillColor\">fillColor</a>","deprecated":false},{"name":"plotOptions-funnel-states-hover-marker--fillColor","fullname":"plotOptions.funnel.states.hover.marker.fillColor","title":"fillColor","parent":"plotOptions-funnel-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-errorbar-states-hover-marker--fillColor","fullname":"plotOptions.errorbar.states.hover.marker.fillColor","title":"fillColor","parent":"plotOptions-errorbar-states-hover-marker","isParent":false,"returnType":"Color","description":"The fill color of the point marker. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">White fill</a>"},{"name":"plotOptions-areaspline--fillOpacity","fullname":"plotOptions.areaspline.fillOpacity","title":"fillOpacity","parent":"plotOptions-areaspline","isParent":false,"returnType":"Number","defaults":"0.75","description":"Fill opacity for the area. Note that when you set an explicit <code>fillColor</code>, the <code>fillOpacity</code> is not applied. Instead, you should define the opacity in the <code>fillColor</code> with an rgba color definition.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillopacity/\" target=\"_blank\">Automatic fill color and fill opacity of 0.1</a>","deprecated":false},{"name":"series<area>--fillOpacity","fullname":"series<area>.fillOpacity","title":"fillOpacity","parent":"series<area>","isParent":false,"returnType":"Number","defaults":"0.75","description":"Fill opacity for the area. Note that when you set an explicit <code>fillColor</code>, the <code>fillOpacity</code> is not applied. Instead, you should define the opacity in the <code>fillColor</code> with an rgba color definition.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillopacity/\" target=\"_blank\">Automatic fill color and fill opacity of 0.1</a>","deprecated":false},{"name":"series<areaspline>--fillOpacity","fullname":"series<areaspline>.fillOpacity","title":"fillOpacity","parent":"series<areaspline>","isParent":false,"returnType":"Number","defaults":"0.75","description":"Fill opacity for the area. Note that when you set an explicit <code>fillColor</code>, the <code>fillOpacity</code> is not applied. Instead, you should define the opacity in the <code>fillColor</code> with an rgba color definition.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillopacity/\" target=\"_blank\">Automatic fill color and fill opacity of 0.1</a>","deprecated":false},{"name":"series<arearange>--fillOpacity","fullname":"series<arearange>.fillOpacity","title":"fillOpacity","parent":"series<arearange>","isParent":false,"returnType":"Number","defaults":"0.75","description":"Fill opacity for the area. Note that when you set an explicit <code>fillColor</code>, the <code>fillOpacity</code> is not applied. Instead, you should define the opacity in the <code>fillColor</code> with an rgba color definition.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillopacity/\" target=\"_blank\">Automatic fill color and fill opacity of 0.1</a>","deprecated":false},{"name":"series<areasplinerange>--fillOpacity","fullname":"series<areasplinerange>.fillOpacity","title":"fillOpacity","parent":"series<areasplinerange>","isParent":false,"returnType":"Number","defaults":"0.75","description":"Fill opacity for the area. Note that when you set an explicit <code>fillColor</code>, the <code>fillOpacity</code> is not applied. Instead, you should define the opacity in the <code>fillColor</code> with an rgba color definition.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillopacity/\" target=\"_blank\">Automatic fill color and fill opacity of 0.1</a>","deprecated":false},{"name":"plotOptions-arearange--fillOpacity","fullname":"plotOptions.arearange.fillOpacity","title":"fillOpacity","parent":"plotOptions-arearange","isParent":false,"returnType":"Number","defaults":"0.75","description":"Fill opacity for the area. Note that when you set an explicit <code>fillColor</code>, the <code>fillOpacity</code> is not applied. Instead, you should define the opacity in the <code>fillColor</code> with an rgba color definition.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillopacity/\" target=\"_blank\">Automatic fill color and fill opacity of 0.1</a>","deprecated":false},{"name":"plotOptions-area--fillOpacity","fullname":"plotOptions.area.fillOpacity","title":"fillOpacity","parent":"plotOptions-area","isParent":false,"returnType":"Number","defaults":"0.75","description":"Fill opacity for the area. Note that when you set an explicit <code>fillColor</code>, the <code>fillOpacity</code> is not applied. Instead, you should define the opacity in the <code>fillColor</code> with an rgba color definition.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillopacity/\" target=\"_blank\">Automatic fill color and fill opacity of 0.1</a>","deprecated":false},{"name":"plotOptions-areasplinerange--fillOpacity","fullname":"plotOptions.areasplinerange.fillOpacity","title":"fillOpacity","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"Number","defaults":"0.75","description":"Fill opacity for the area. Note that when you set an explicit <code>fillColor</code>, the <code>fillOpacity</code> is not applied. Instead, you should define the opacity in the <code>fillColor</code> with an rgba color definition.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-fillopacity/\" target=\"_blank\">Automatic fill color and fill opacity of 0.1</a>","deprecated":false},{"name":"data--firstRowAsNames","fullname":"data.firstRowAsNames","title":"firstRowAsNames","parent":"data","isParent":false,"returnType":"Boolean","context":"","defaults":"true","values":"","since":"4.1.0","description":"Whether to use the first row in the data set as series names. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/data/start-end/\" target=\"_blank\">Don't get series names from the CSV</a>","seeAlso":"","deprecated":false},{"name":"legend--floating","fullname":"legend.floating","title":"floating","parent":"legend","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.1","description":"When the legend is floating, the plot area ignores it and is allowed to be placed below it.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/floating-false/\" target=\"_blank\">False by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/floating-true/\" target=\"_blank\">true</a>."},{"name":"title--floating","fullname":"title.floating","title":"floating","parent":"title","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.1","description":"When the title is floating, the plot area will not move to make space for it.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/zoomtype-none/\" target=\"_blank\">False by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/title/floating/\" target=\"_blank\">true - title on top of the plot area</a>."},{"name":"subtitle--floating","fullname":"subtitle.floating","title":"floating","parent":"subtitle","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.1","description":"When the subtitle is floating, the plot area will not move to make space for it.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/subtitle/floating/\" target=\"_blank\">Floating title and subtitle</a>."},{"name":"xAxis--floor","fullname":"xAxis.floor","title":"floor","parent":"xAxis","isParent":false,"returnType":"Number","defaults":"null","since":"4.0","description":"The lowest allowed value for automatically computed axis extremes.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/floor-ceiling/\" target=\"_blank\">Floor and ceiling</a>","seeAlso":"<a href=\"#yAxis.ceiling\">ceiling</a>","deprecated":false},{"name":"yAxis--floor","fullname":"yAxis.floor","title":"floor","parent":"yAxis","isParent":false,"returnType":"Number","defaults":"null","since":"4.0","description":"The lowest allowed value for automatically computed axis extremes.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/floor-ceiling/\" target=\"_blank\">Floor and ceiling</a>","seeAlso":"<a href=\"#yAxis.ceiling\">ceiling</a>","deprecated":false},{"name":"series<bar>-tooltip--followPointer","fullname":"series<bar>.tooltip.followPointer","title":"followPointer","parent":"series<bar>-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"series<funnel>-tooltip--followPointer","fullname":"series<funnel>.tooltip.followPointer","title":"followPointer","parent":"series<funnel>-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"series<bubble>-tooltip--followPointer","fullname":"series<bubble>.tooltip.followPointer","title":"followPointer","parent":"series<bubble>-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"series<columnrange>-tooltip--followPointer","fullname":"series<columnrange>.tooltip.followPointer","title":"followPointer","parent":"series<columnrange>-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter-tooltip--followPointer","fullname":"plotOptions.scatter.tooltip.followPointer","title":"followPointer","parent":"plotOptions-scatter-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap-tooltip--followPointer","fullname":"plotOptions.heatmap.tooltip.followPointer","title":"followPointer","parent":"plotOptions-heatmap-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-series-tooltip--followPointer","fullname":"plotOptions.series.tooltip.followPointer","title":"followPointer","parent":"plotOptions-series-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-tooltip--followPointer","fullname":"plotOptions.pyramid.tooltip.followPointer","title":"followPointer","parent":"plotOptions-pyramid-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange-tooltip--followPointer","fullname":"plotOptions.arearange.tooltip.followPointer","title":"followPointer","parent":"plotOptions-arearange-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-tooltip--followPointer","fullname":"series<areasplinerange>.tooltip.followPointer","title":"followPointer","parent":"series<areasplinerange>-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"series<boxplot>-tooltip--followPointer","fullname":"series<boxplot>.tooltip.followPointer","title":"followPointer","parent":"series<boxplot>-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall-tooltip--followPointer","fullname":"plotOptions.waterfall.tooltip.followPointer","title":"followPointer","parent":"plotOptions-waterfall-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column-tooltip--followPointer","fullname":"plotOptions.column.tooltip.followPointer","title":"followPointer","parent":"plotOptions-column-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"series<gauge>-tooltip--followPointer","fullname":"series<gauge>.tooltip.followPointer","title":"followPointer","parent":"series<gauge>-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar-tooltip--followPointer","fullname":"plotOptions.errorbar.tooltip.followPointer","title":"followPointer","parent":"plotOptions-errorbar-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"series<arearange>-tooltip--followPointer","fullname":"series<arearange>.tooltip.followPointer","title":"followPointer","parent":"series<arearange>-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-tooltip--followPointer","fullname":"plotOptions.polygon.tooltip.followPointer","title":"followPointer","parent":"plotOptions-polygon-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"series<treemap>-tooltip--followPointer","fullname":"series<treemap>.tooltip.followPointer","title":"followPointer","parent":"series<treemap>-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"series<column>-tooltip--followPointer","fullname":"series<column>.tooltip.followPointer","title":"followPointer","parent":"series<column>-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"series<waterfall>-tooltip--followPointer","fullname":"series<waterfall>.tooltip.followPointer","title":"followPointer","parent":"series<waterfall>-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-tooltip--followPointer","fullname":"plotOptions.spline.tooltip.followPointer","title":"followPointer","parent":"plotOptions-spline-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"series<solidgauge>-tooltip--followPointer","fullname":"series<solidgauge>.tooltip.followPointer","title":"followPointer","parent":"series<solidgauge>-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"series<scatter>-tooltip--followPointer","fullname":"series<scatter>.tooltip.followPointer","title":"followPointer","parent":"series<scatter>-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"series<heatmap>-tooltip--followPointer","fullname":"series<heatmap>.tooltip.followPointer","title":"followPointer","parent":"series<heatmap>-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap-tooltip--followPointer","fullname":"plotOptions.treemap.tooltip.followPointer","title":"followPointer","parent":"plotOptions-treemap-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge-tooltip--followPointer","fullname":"plotOptions.gauge.tooltip.followPointer","title":"followPointer","parent":"plotOptions-gauge-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"series<polygon>-tooltip--followPointer","fullname":"series<polygon>.tooltip.followPointer","title":"followPointer","parent":"series<polygon>-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble-tooltip--followPointer","fullname":"plotOptions.bubble.tooltip.followPointer","title":"followPointer","parent":"plotOptions-bubble-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"series<errorbar>-tooltip--followPointer","fullname":"series<errorbar>.tooltip.followPointer","title":"followPointer","parent":"series<errorbar>-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel-tooltip--followPointer","fullname":"plotOptions.funnel.tooltip.followPointer","title":"followPointer","parent":"plotOptions-funnel-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange-tooltip--followPointer","fullname":"plotOptions.columnrange.tooltip.followPointer","title":"followPointer","parent":"plotOptions-columnrange-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>-tooltip--followPointer","fullname":"series<spline>.tooltip.followPointer","title":"followPointer","parent":"series<spline>-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pie-tooltip--followPointer","fullname":"plotOptions.pie.tooltip.followPointer","title":"followPointer","parent":"plotOptions-pie-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"series<line>-tooltip--followPointer","fullname":"series<line>.tooltip.followPointer","title":"followPointer","parent":"series<line>-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-tooltip--followPointer","fullname":"plotOptions.areaspline.tooltip.followPointer","title":"followPointer","parent":"plotOptions-areaspline-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-line-tooltip--followPointer","fullname":"plotOptions.line.tooltip.followPointer","title":"followPointer","parent":"plotOptions-line-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot-tooltip--followPointer","fullname":"plotOptions.boxplot.tooltip.followPointer","title":"followPointer","parent":"plotOptions-boxplot-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"series<pie>-tooltip--followPointer","fullname":"series<pie>.tooltip.followPointer","title":"followPointer","parent":"series<pie>-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bar-tooltip--followPointer","fullname":"plotOptions.bar.tooltip.followPointer","title":"followPointer","parent":"plotOptions-bar-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-area-tooltip--followPointer","fullname":"plotOptions.area.tooltip.followPointer","title":"followPointer","parent":"plotOptions-area-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"series<areaspline>-tooltip--followPointer","fullname":"series<areaspline>.tooltip.followPointer","title":"followPointer","parent":"series<areaspline>-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange-tooltip--followPointer","fullname":"plotOptions.areasplinerange.tooltip.followPointer","title":"followPointer","parent":"plotOptions-areasplinerange-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-solidgauge-tooltip--followPointer","fullname":"plotOptions.solidgauge.tooltip.followPointer","title":"followPointer","parent":"plotOptions-solidgauge-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"series<pyramid>-tooltip--followPointer","fullname":"series<pyramid>.tooltip.followPointer","title":"followPointer","parent":"series<pyramid>-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"tooltip--followPointer","fullname":"tooltip.followPointer","title":"followPointer","parent":"tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"series<area>-tooltip--followPointer","fullname":"series<area>.tooltip.followPointer","title":"followPointer","parent":"series<area>-tooltip","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"<p>Whether the tooltip should follow the mouse as it moves across columns, pie slices and other point types with an extent. By default it behaves this way for scatter, bubble and pie series by override in the <code>plotOptions</code> for those series types. </p>\r\n<p>For touch moves to behave the same way, <a href=\"#tooltip.followTouchMove\">followTouchMove</a> must be <code>true</code> also.</p>","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange-tooltip--followTouchMove","fullname":"plotOptions.arearange.tooltip.followTouchMove","title":"followTouchMove","parent":"plotOptions-arearange-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"plotOptions-solidgauge-tooltip--followTouchMove","fullname":"plotOptions.solidgauge.tooltip.followTouchMove","title":"followTouchMove","parent":"plotOptions-solidgauge-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"series<column>-tooltip--followTouchMove","fullname":"series<column>.tooltip.followTouchMove","title":"followTouchMove","parent":"series<column>-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"plotOptions-area-tooltip--followTouchMove","fullname":"plotOptions.area.tooltip.followTouchMove","title":"followTouchMove","parent":"plotOptions-area-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"series<areaspline>-tooltip--followTouchMove","fullname":"series<areaspline>.tooltip.followTouchMove","title":"followTouchMove","parent":"series<areaspline>-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"plotOptions-waterfall-tooltip--followTouchMove","fullname":"plotOptions.waterfall.tooltip.followTouchMove","title":"followTouchMove","parent":"plotOptions-waterfall-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"series<areasplinerange>-tooltip--followTouchMove","fullname":"series<areasplinerange>.tooltip.followTouchMove","title":"followTouchMove","parent":"series<areasplinerange>-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"series<spline>-tooltip--followTouchMove","fullname":"series<spline>.tooltip.followTouchMove","title":"followTouchMove","parent":"series<spline>-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"series<errorbar>-tooltip--followTouchMove","fullname":"series<errorbar>.tooltip.followTouchMove","title":"followTouchMove","parent":"series<errorbar>-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"plotOptions-column-tooltip--followTouchMove","fullname":"plotOptions.column.tooltip.followTouchMove","title":"followTouchMove","parent":"plotOptions-column-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"series<polygon>-tooltip--followTouchMove","fullname":"series<polygon>.tooltip.followTouchMove","title":"followTouchMove","parent":"series<polygon>-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"series<heatmap>-tooltip--followTouchMove","fullname":"series<heatmap>.tooltip.followTouchMove","title":"followTouchMove","parent":"series<heatmap>-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"series<bubble>-tooltip--followTouchMove","fullname":"series<bubble>.tooltip.followTouchMove","title":"followTouchMove","parent":"series<bubble>-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"series<boxplot>-tooltip--followTouchMove","fullname":"series<boxplot>.tooltip.followTouchMove","title":"followTouchMove","parent":"series<boxplot>-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"plotOptions-polygon-tooltip--followTouchMove","fullname":"plotOptions.polygon.tooltip.followTouchMove","title":"followTouchMove","parent":"plotOptions-polygon-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"series<treemap>-tooltip--followTouchMove","fullname":"series<treemap>.tooltip.followTouchMove","title":"followTouchMove","parent":"series<treemap>-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"plotOptions-scatter-tooltip--followTouchMove","fullname":"plotOptions.scatter.tooltip.followTouchMove","title":"followTouchMove","parent":"plotOptions-scatter-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"plotOptions-gauge-tooltip--followTouchMove","fullname":"plotOptions.gauge.tooltip.followTouchMove","title":"followTouchMove","parent":"plotOptions-gauge-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"plotOptions-funnel-tooltip--followTouchMove","fullname":"plotOptions.funnel.tooltip.followTouchMove","title":"followTouchMove","parent":"plotOptions-funnel-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"tooltip--followTouchMove","fullname":"tooltip.followTouchMove","title":"followTouchMove","parent":"tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"plotOptions-heatmap-tooltip--followTouchMove","fullname":"plotOptions.heatmap.tooltip.followTouchMove","title":"followTouchMove","parent":"plotOptions-heatmap-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"series<columnrange>-tooltip--followTouchMove","fullname":"series<columnrange>.tooltip.followTouchMove","title":"followTouchMove","parent":"series<columnrange>-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"plotOptions-areaspline-tooltip--followTouchMove","fullname":"plotOptions.areaspline.tooltip.followTouchMove","title":"followTouchMove","parent":"plotOptions-areaspline-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"plotOptions-pie-tooltip--followTouchMove","fullname":"plotOptions.pie.tooltip.followTouchMove","title":"followTouchMove","parent":"plotOptions-pie-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"plotOptions-series-tooltip--followTouchMove","fullname":"plotOptions.series.tooltip.followTouchMove","title":"followTouchMove","parent":"plotOptions-series-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"series<solidgauge>-tooltip--followTouchMove","fullname":"series<solidgauge>.tooltip.followTouchMove","title":"followTouchMove","parent":"series<solidgauge>-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"series<gauge>-tooltip--followTouchMove","fullname":"series<gauge>.tooltip.followTouchMove","title":"followTouchMove","parent":"series<gauge>-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"plotOptions-pyramid-tooltip--followTouchMove","fullname":"plotOptions.pyramid.tooltip.followTouchMove","title":"followTouchMove","parent":"plotOptions-pyramid-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"series<line>-tooltip--followTouchMove","fullname":"series<line>.tooltip.followTouchMove","title":"followTouchMove","parent":"series<line>-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"plotOptions-spline-tooltip--followTouchMove","fullname":"plotOptions.spline.tooltip.followTouchMove","title":"followTouchMove","parent":"plotOptions-spline-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"series<area>-tooltip--followTouchMove","fullname":"series<area>.tooltip.followTouchMove","title":"followTouchMove","parent":"series<area>-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"plotOptions-bar-tooltip--followTouchMove","fullname":"plotOptions.bar.tooltip.followTouchMove","title":"followTouchMove","parent":"plotOptions-bar-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"plotOptions-areasplinerange-tooltip--followTouchMove","fullname":"plotOptions.areasplinerange.tooltip.followTouchMove","title":"followTouchMove","parent":"plotOptions-areasplinerange-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"plotOptions-treemap-tooltip--followTouchMove","fullname":"plotOptions.treemap.tooltip.followTouchMove","title":"followTouchMove","parent":"plotOptions-treemap-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"plotOptions-columnrange-tooltip--followTouchMove","fullname":"plotOptions.columnrange.tooltip.followTouchMove","title":"followTouchMove","parent":"plotOptions-columnrange-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"series<pyramid>-tooltip--followTouchMove","fullname":"series<pyramid>.tooltip.followTouchMove","title":"followTouchMove","parent":"series<pyramid>-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"plotOptions-line-tooltip--followTouchMove","fullname":"plotOptions.line.tooltip.followTouchMove","title":"followTouchMove","parent":"plotOptions-line-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"plotOptions-errorbar-tooltip--followTouchMove","fullname":"plotOptions.errorbar.tooltip.followTouchMove","title":"followTouchMove","parent":"plotOptions-errorbar-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"plotOptions-bubble-tooltip--followTouchMove","fullname":"plotOptions.bubble.tooltip.followTouchMove","title":"followTouchMove","parent":"plotOptions-bubble-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"series<scatter>-tooltip--followTouchMove","fullname":"series<scatter>.tooltip.followTouchMove","title":"followTouchMove","parent":"series<scatter>-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"series<arearange>-tooltip--followTouchMove","fullname":"series<arearange>.tooltip.followTouchMove","title":"followTouchMove","parent":"series<arearange>-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"series<funnel>-tooltip--followTouchMove","fullname":"series<funnel>.tooltip.followTouchMove","title":"followTouchMove","parent":"series<funnel>-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"series<bar>-tooltip--followTouchMove","fullname":"series<bar>.tooltip.followTouchMove","title":"followTouchMove","parent":"series<bar>-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"series<waterfall>-tooltip--followTouchMove","fullname":"series<waterfall>.tooltip.followTouchMove","title":"followTouchMove","parent":"series<waterfall>-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"series<pie>-tooltip--followTouchMove","fullname":"series<pie>.tooltip.followTouchMove","title":"followTouchMove","parent":"series<pie>-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"plotOptions-boxplot-tooltip--followTouchMove","fullname":"plotOptions.boxplot.tooltip.followTouchMove","title":"followTouchMove","parent":"plotOptions-boxplot-tooltip","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.1","description":"Whether the tooltip should follow the finger as it moves on a touch device. If <a href=\"#chart.zoomType\">chart.zoomType</a> is set, it will override <code>followTouchMove</code>.","deprecated":false},{"name":"series<errorbar>-tooltip--footerFormat","fullname":"series<errorbar>.tooltip.footerFormat","title":"footerFormat","parent":"series<errorbar>-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"series<solidgauge>-tooltip--footerFormat","fullname":"series<solidgauge>.tooltip.footerFormat","title":"footerFormat","parent":"series<solidgauge>-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"plotOptions-arearange-tooltip--footerFormat","fullname":"plotOptions.arearange.tooltip.footerFormat","title":"footerFormat","parent":"plotOptions-arearange-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"tooltip--footerFormat","fullname":"tooltip.footerFormat","title":"footerFormat","parent":"tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"plotOptions-solidgauge-tooltip--footerFormat","fullname":"plotOptions.solidgauge.tooltip.footerFormat","title":"footerFormat","parent":"plotOptions-solidgauge-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"series<areaspline>-tooltip--footerFormat","fullname":"series<areaspline>.tooltip.footerFormat","title":"footerFormat","parent":"series<areaspline>-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"plotOptions-line-tooltip--footerFormat","fullname":"plotOptions.line.tooltip.footerFormat","title":"footerFormat","parent":"plotOptions-line-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"plotOptions-pie-tooltip--footerFormat","fullname":"plotOptions.pie.tooltip.footerFormat","title":"footerFormat","parent":"plotOptions-pie-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"series<area>-tooltip--footerFormat","fullname":"series<area>.tooltip.footerFormat","title":"footerFormat","parent":"series<area>-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"series<funnel>-tooltip--footerFormat","fullname":"series<funnel>.tooltip.footerFormat","title":"footerFormat","parent":"series<funnel>-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"plotOptions-area-tooltip--footerFormat","fullname":"plotOptions.area.tooltip.footerFormat","title":"footerFormat","parent":"plotOptions-area-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"plotOptions-waterfall-tooltip--footerFormat","fullname":"plotOptions.waterfall.tooltip.footerFormat","title":"footerFormat","parent":"plotOptions-waterfall-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"series<column>-tooltip--footerFormat","fullname":"series<column>.tooltip.footerFormat","title":"footerFormat","parent":"series<column>-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"series<heatmap>-tooltip--footerFormat","fullname":"series<heatmap>.tooltip.footerFormat","title":"footerFormat","parent":"series<heatmap>-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"series<line>-tooltip--footerFormat","fullname":"series<line>.tooltip.footerFormat","title":"footerFormat","parent":"series<line>-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"series<spline>-tooltip--footerFormat","fullname":"series<spline>.tooltip.footerFormat","title":"footerFormat","parent":"series<spline>-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"plotOptions-boxplot-tooltip--footerFormat","fullname":"plotOptions.boxplot.tooltip.footerFormat","title":"footerFormat","parent":"plotOptions-boxplot-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"series<bar>-tooltip--footerFormat","fullname":"series<bar>.tooltip.footerFormat","title":"footerFormat","parent":"series<bar>-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"plotOptions-columnrange-tooltip--footerFormat","fullname":"plotOptions.columnrange.tooltip.footerFormat","title":"footerFormat","parent":"plotOptions-columnrange-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"series<scatter>-tooltip--footerFormat","fullname":"series<scatter>.tooltip.footerFormat","title":"footerFormat","parent":"series<scatter>-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"plotOptions-spline-tooltip--footerFormat","fullname":"plotOptions.spline.tooltip.footerFormat","title":"footerFormat","parent":"plotOptions-spline-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"plotOptions-funnel-tooltip--footerFormat","fullname":"plotOptions.funnel.tooltip.footerFormat","title":"footerFormat","parent":"plotOptions-funnel-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"series<treemap>-tooltip--footerFormat","fullname":"series<treemap>.tooltip.footerFormat","title":"footerFormat","parent":"series<treemap>-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"plotOptions-gauge-tooltip--footerFormat","fullname":"plotOptions.gauge.tooltip.footerFormat","title":"footerFormat","parent":"plotOptions-gauge-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"series<arearange>-tooltip--footerFormat","fullname":"series<arearange>.tooltip.footerFormat","title":"footerFormat","parent":"series<arearange>-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"plotOptions-series-tooltip--footerFormat","fullname":"plotOptions.series.tooltip.footerFormat","title":"footerFormat","parent":"plotOptions-series-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"series<columnrange>-tooltip--footerFormat","fullname":"series<columnrange>.tooltip.footerFormat","title":"footerFormat","parent":"series<columnrange>-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"plotOptions-areaspline-tooltip--footerFormat","fullname":"plotOptions.areaspline.tooltip.footerFormat","title":"footerFormat","parent":"plotOptions-areaspline-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"series<pyramid>-tooltip--footerFormat","fullname":"series<pyramid>.tooltip.footerFormat","title":"footerFormat","parent":"series<pyramid>-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"plotOptions-treemap-tooltip--footerFormat","fullname":"plotOptions.treemap.tooltip.footerFormat","title":"footerFormat","parent":"plotOptions-treemap-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"plotOptions-heatmap-tooltip--footerFormat","fullname":"plotOptions.heatmap.tooltip.footerFormat","title":"footerFormat","parent":"plotOptions-heatmap-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"series<bubble>-tooltip--footerFormat","fullname":"series<bubble>.tooltip.footerFormat","title":"footerFormat","parent":"series<bubble>-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"series<polygon>-tooltip--footerFormat","fullname":"series<polygon>.tooltip.footerFormat","title":"footerFormat","parent":"series<polygon>-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"series<areasplinerange>-tooltip--footerFormat","fullname":"series<areasplinerange>.tooltip.footerFormat","title":"footerFormat","parent":"series<areasplinerange>-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"plotOptions-polygon-tooltip--footerFormat","fullname":"plotOptions.polygon.tooltip.footerFormat","title":"footerFormat","parent":"plotOptions-polygon-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"series<boxplot>-tooltip--footerFormat","fullname":"series<boxplot>.tooltip.footerFormat","title":"footerFormat","parent":"series<boxplot>-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"plotOptions-scatter-tooltip--footerFormat","fullname":"plotOptions.scatter.tooltip.footerFormat","title":"footerFormat","parent":"plotOptions-scatter-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"series<gauge>-tooltip--footerFormat","fullname":"series<gauge>.tooltip.footerFormat","title":"footerFormat","parent":"series<gauge>-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"plotOptions-bar-tooltip--footerFormat","fullname":"plotOptions.bar.tooltip.footerFormat","title":"footerFormat","parent":"plotOptions-bar-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"plotOptions-pyramid-tooltip--footerFormat","fullname":"plotOptions.pyramid.tooltip.footerFormat","title":"footerFormat","parent":"plotOptions-pyramid-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"series<waterfall>-tooltip--footerFormat","fullname":"series<waterfall>.tooltip.footerFormat","title":"footerFormat","parent":"series<waterfall>-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"plotOptions-bubble-tooltip--footerFormat","fullname":"plotOptions.bubble.tooltip.footerFormat","title":"footerFormat","parent":"plotOptions-bubble-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"plotOptions-column-tooltip--footerFormat","fullname":"plotOptions.column.tooltip.footerFormat","title":"footerFormat","parent":"plotOptions-column-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"plotOptions-areasplinerange-tooltip--footerFormat","fullname":"plotOptions.areasplinerange.tooltip.footerFormat","title":"footerFormat","parent":"plotOptions-areasplinerange-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"plotOptions-errorbar-tooltip--footerFormat","fullname":"plotOptions.errorbar.tooltip.footerFormat","title":"footerFormat","parent":"plotOptions-errorbar-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"series<pie>-tooltip--footerFormat","fullname":"series<pie>.tooltip.footerFormat","title":"footerFormat","parent":"series<pie>-tooltip","isParent":false,"returnType":"String","defaults":"false","since":"2.2","description":"A string to append to the tooltip format.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>"},{"name":"exporting--formAttributes","fullname":"exporting.formAttributes","title":"formAttributes","parent":"exporting","isParent":false,"returnType":"Object","defaults":"","values":"","since":"3.0.8","description":"An object containing additional attributes for the POST form that sends the SVG to the export server. For example, a <code>target</code> can be set to make sure the generated image is received in another frame, or a custom <code>enctype</code> or <code>encoding</code> can be set.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble-dataLabels--format","fullname":"plotOptions.bubble.dataLabels.format","title":"format","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"plotOptions-funnel-dataLabels--format","fullname":"plotOptions.funnel.dataLabels.format","title":"format","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"plotOptions-series-dataLabels--format","fullname":"plotOptions.series.dataLabels.format","title":"format","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"plotOptions-solidgauge-dataLabels--format","fullname":"plotOptions.solidgauge.dataLabels.format","title":"format","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"yAxis-stackLabels--format","fullname":"yAxis.stackLabels.format","title":"format","parent":"yAxis-stackLabels","isParent":false,"returnType":"String","defaults":"{total}","values":"","since":"3.0.2","description":"A <a href=\"http://docs.highcharts.com/#formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap-dataLabels--format","fullname":"plotOptions.heatmap.dataLabels.format","title":"format","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"plotOptions-pie-dataLabels--format","fullname":"plotOptions.pie.dataLabels.format","title":"format","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"plotOptions-line-dataLabels--format","fullname":"plotOptions.line.dataLabels.format","title":"format","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"yAxis-labels--format","fullname":"yAxis.labels.format","title":"format","parent":"yAxis-labels","isParent":false,"returnType":"String","defaults":"{value}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the axis label. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/labels-format/\" target=\"_blank\">Add units to Y axis label</a>","deprecated":false},{"name":"series<treemap>-dataLabels--format","fullname":"series<treemap>.dataLabels.format","title":"format","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"series<spline>-dataLabels--format","fullname":"series<spline>.dataLabels.format","title":"format","parent":"series<spline>-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"series<arearange>-dataLabels--format","fullname":"series<arearange>.dataLabels.format","title":"format","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"plotOptions-columnrange-dataLabels--format","fullname":"plotOptions.columnrange.dataLabels.format","title":"format","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"series<pyramid>-dataLabels--format","fullname":"series<pyramid>.dataLabels.format","title":"format","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"series<column>-dataLabels--format","fullname":"series<column>.dataLabels.format","title":"format","parent":"series<column>-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"plotOptions-treemap-dataLabels--format","fullname":"plotOptions.treemap.dataLabels.format","title":"format","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels--format","fullname":"plotOptions.areasplinerange.dataLabels.format","title":"format","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"plotOptions-gauge-dataLabels--format","fullname":"plotOptions.gauge.dataLabels.format","title":"format","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"plotOptions-column-dataLabels--format","fullname":"plotOptions.column.dataLabels.format","title":"format","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"series<areasplinerange>-dataLabels--format","fullname":"series<areasplinerange>.dataLabels.format","title":"format","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"series<bar>-dataLabels--format","fullname":"series<bar>.dataLabels.format","title":"format","parent":"series<bar>-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"series<waterfall>-dataLabels--format","fullname":"series<waterfall>.dataLabels.format","title":"format","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"plotOptions-pyramid-dataLabels--format","fullname":"plotOptions.pyramid.dataLabels.format","title":"format","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"series<pie>-dataLabels--format","fullname":"series<pie>.dataLabels.format","title":"format","parent":"series<pie>-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"plotOptions-arearange-dataLabels--format","fullname":"plotOptions.arearange.dataLabels.format","title":"format","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"plotOptions-scatter-dataLabels--format","fullname":"plotOptions.scatter.dataLabels.format","title":"format","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"plotOptions-waterfall-dataLabels--format","fullname":"plotOptions.waterfall.dataLabels.format","title":"format","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"series<scatter>-dataLabels--format","fullname":"series<scatter>.dataLabels.format","title":"format","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"plotOptions-areaspline-dataLabels--format","fullname":"plotOptions.areaspline.dataLabels.format","title":"format","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"series<columnrange>-dataLabels--format","fullname":"series<columnrange>.dataLabels.format","title":"format","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"series<funnel>-dataLabels--format","fullname":"series<funnel>.dataLabels.format","title":"format","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"xAxis-labels--format","fullname":"xAxis.labels.format","title":"format","parent":"xAxis-labels","isParent":false,"returnType":"String","defaults":"{value}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the axis label. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/labels-format/\" target=\"_blank\">Add units to Y axis label</a>","deprecated":false},{"name":"series<heatmap>-dataLabels--format","fullname":"series<heatmap>.dataLabels.format","title":"format","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"plotOptions-bar-dataLabels--format","fullname":"plotOptions.bar.dataLabels.format","title":"format","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"plotOptions-spline-dataLabels--format","fullname":"plotOptions.spline.dataLabels.format","title":"format","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"series<polygon>-dataLabels--format","fullname":"series<polygon>.dataLabels.format","title":"format","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"series<solidgauge>-dataLabels--format","fullname":"series<solidgauge>.dataLabels.format","title":"format","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"series<line>-dataLabels--format","fullname":"series<line>.dataLabels.format","title":"format","parent":"series<line>-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"series<gauge>-dataLabels--format","fullname":"series<gauge>.dataLabels.format","title":"format","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"series<areaspline>-dataLabels--format","fullname":"series<areaspline>.dataLabels.format","title":"format","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"series<bubble>-dataLabels--format","fullname":"series<bubble>.dataLabels.format","title":"format","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"plotOptions-polygon-dataLabels--format","fullname":"plotOptions.polygon.dataLabels.format","title":"format","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"series<area>-dataLabels--format","fullname":"series<area>.dataLabels.format","title":"format","parent":"series<area>-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"plotOptions-area-dataLabels--format","fullname":"plotOptions.area.dataLabels.format","title":"format","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"String","defaults":"{y}","since":"3.0","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for the data label. Available variables are the same as for <code>formatter</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-format/\" target=\"_blank\">Add a unit</a>","deprecated":false},{"name":"plotOptions-columnrange-dataLabels--formatter","fullname":"plotOptions.columnrange.dataLabels.formatter","title":"formatter","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"series<treemap>-dataLabels--formatter","fullname":"series<treemap>.dataLabels.formatter","title":"formatter","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"series<areaspline>-dataLabels--formatter","fullname":"series<areaspline>.dataLabels.formatter","title":"formatter","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"plotOptions-line-dataLabels--formatter","fullname":"plotOptions.line.dataLabels.formatter","title":"formatter","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"series<columnrange>-dataLabels--formatter","fullname":"series<columnrange>.dataLabels.formatter","title":"formatter","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"tooltip--formatter","fullname":"tooltip.formatter","title":"formatter","parent":"tooltip","isParent":false,"returnType":"Function","description":"<p>Callback function to format the text of the tooltip. Return false to disable tooltip for a specific point on series.</p> <p>A subset of HTML is supported. The HTML of the tooltip is parsed and converted to SVG,  therefore this isn't a complete HTML renderer. The following tabs are supported:  <code>&lt;b&gt;</code>, <code>&lt;strong&gt;</code>, <code>&lt;i&gt;</code>, <code>&lt;em&gt;</code>, <code>&lt;br/&gt;</code>, <code>&lt;span&gt;</code>. Spans can be styled with a <code>style</code> attribute, but only text-related CSS that is  shared with SVG is handled. </p> <p>Since version 2.1 the tooltip can be shared between multiple series through  the <code>shared</code> option. The available data in the formatter differ a bit depending on whether the tooltip is shared or not. In a shared tooltip, all  properties except <code>x</code>, which is common for all points, are kept in  an array, <code>this.points</code>.</p>  <p>Available data are:</p> <dl> \t<dt>this.percentage (not shared) / this.points[i].percentage (shared)</dt> \t<dd>Stacked series and pies only. The point's percentage of the total.</dd> \t \t<dt>this.point (not shared) / this.points[i].point (shared)</dt> \t<dd>The point object. The point name, if defined, is available  through <code>this.point.name</code>.</dd> \t \t<dt>this.points</dt> \t<dd>In a shared tooltip, this is an array containing all other properties for each point.</dd> \t \t<dt>this.series (not shared) / this.points[i].series (shared)</dt> \t<dd>The series object. The series name is available  through <code>this.series.name</code>.</dd>  \t<dt>this.total (not shared) / this.points[i].total (shared)</dt> \t<dd>Stacked series only. The total value at this point's x value.</dd> \t \t<dt>this.x</dt> \t<dd>The x value. This property is the same regardless of the tooltip being shared or not.</dd> \t \t<dt>this.y (not shared) / this.points[i].y (shared)</dt> \t<dd>The y value.</dd>  </dl>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/formatter-simple/\" target=\"_blank\">Simple string formatting</a>,\t\t\t\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/formatter-shared/\" target=\"_blank\">formatting with shared tooltip</a>"},{"name":"plotOptions-polygon-dataLabels--formatter","fullname":"plotOptions.polygon.dataLabels.formatter","title":"formatter","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"plotOptions-bubble-dataLabels--formatter","fullname":"plotOptions.bubble.dataLabels.formatter","title":"formatter","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"plotOptions-scatter-dataLabels--formatter","fullname":"plotOptions.scatter.dataLabels.formatter","title":"formatter","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"plotOptions-funnel-dataLabels--formatter","fullname":"plotOptions.funnel.dataLabels.formatter","title":"formatter","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"plotOptions-solidgauge-dataLabels--formatter","fullname":"plotOptions.solidgauge.dataLabels.formatter","title":"formatter","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"series<bubble>-dataLabels--formatter","fullname":"series<bubble>.dataLabels.formatter","title":"formatter","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"plotOptions-pie-dataLabels--formatter","fullname":"plotOptions.pie.dataLabels.formatter","title":"formatter","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"plotOptions-treemap-dataLabels--formatter","fullname":"plotOptions.treemap.dataLabels.formatter","title":"formatter","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"series<waterfall>-dataLabels--formatter","fullname":"series<waterfall>.dataLabels.formatter","title":"formatter","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"series<spline>-dataLabels--formatter","fullname":"series<spline>.dataLabels.formatter","title":"formatter","parent":"series<spline>-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"plotOptions-areaspline-dataLabels--formatter","fullname":"plotOptions.areaspline.dataLabels.formatter","title":"formatter","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"series<pie>-dataLabels--formatter","fullname":"series<pie>.dataLabels.formatter","title":"formatter","parent":"series<pie>-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"series<gauge>-dataLabels--formatter","fullname":"series<gauge>.dataLabels.formatter","title":"formatter","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"plotOptions-heatmap-dataLabels--formatter","fullname":"plotOptions.heatmap.dataLabels.formatter","title":"formatter","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"plotOptions-bar-dataLabels--formatter","fullname":"plotOptions.bar.dataLabels.formatter","title":"formatter","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"series<scatter>-dataLabels--formatter","fullname":"series<scatter>.dataLabels.formatter","title":"formatter","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels--formatter","fullname":"plotOptions.areasplinerange.dataLabels.formatter","title":"formatter","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"series<polygon>-dataLabels--formatter","fullname":"series<polygon>.dataLabels.formatter","title":"formatter","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"series<arearange>-dataLabels--formatter","fullname":"series<arearange>.dataLabels.formatter","title":"formatter","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"plotOptions-spline-dataLabels--formatter","fullname":"plotOptions.spline.dataLabels.formatter","title":"formatter","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"plotOptions-pyramid-dataLabels--formatter","fullname":"plotOptions.pyramid.dataLabels.formatter","title":"formatter","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"series<column>-dataLabels--formatter","fullname":"series<column>.dataLabels.formatter","title":"formatter","parent":"series<column>-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"plotOptions-waterfall-dataLabels--formatter","fullname":"plotOptions.waterfall.dataLabels.formatter","title":"formatter","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"series<pyramid>-dataLabels--formatter","fullname":"series<pyramid>.dataLabels.formatter","title":"formatter","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"series<funnel>-dataLabels--formatter","fullname":"series<funnel>.dataLabels.formatter","title":"formatter","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"yAxis-labels--formatter","fullname":"yAxis.labels.formatter","title":"formatter","parent":"yAxis-labels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the label. The value is \r given by <code>this.value</code>. Additional properties for <code>this</code> are\r <code>axis</code>, <code>chart</code>, <code>isFirst</code> and <code>isLast</code>.\r Defaults to: \r\n<pre>function() {\r\n\treturn this.value;\r\n}</pre>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-formatter-linked/\" target=\"_blank\">Linked category names</a>","deprecated":false},{"name":"series<solidgauge>-dataLabels--formatter","fullname":"series<solidgauge>.dataLabels.formatter","title":"formatter","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"series<area>-dataLabels--formatter","fullname":"series<area>.dataLabels.formatter","title":"formatter","parent":"series<area>-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"plotOptions-gauge-dataLabels--formatter","fullname":"plotOptions.gauge.dataLabels.formatter","title":"formatter","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"series<line>-dataLabels--formatter","fullname":"series<line>.dataLabels.formatter","title":"formatter","parent":"series<line>-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"series<areasplinerange>-dataLabels--formatter","fullname":"series<areasplinerange>.dataLabels.formatter","title":"formatter","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"plotOptions-arearange-dataLabels--formatter","fullname":"plotOptions.arearange.dataLabels.formatter","title":"formatter","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"plotOptions-column-dataLabels--formatter","fullname":"plotOptions.column.dataLabels.formatter","title":"formatter","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"xAxis-labels--formatter","fullname":"xAxis.labels.formatter","title":"formatter","parent":"xAxis-labels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the label. The value is \r given by <code>this.value</code>. Additional properties for <code>this</code> are\r <code>axis</code>, <code>chart</code>, <code>isFirst</code> and <code>isLast</code>.\r Defaults to: \r\n<pre>function() {\r\n\treturn this.value;\r\n}</pre>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-formatter-linked/\" target=\"_blank\">Linked category names</a>","deprecated":false},{"name":"plotOptions-series-dataLabels--formatter","fullname":"plotOptions.series.dataLabels.formatter","title":"formatter","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"yAxis-stackLabels--formatter","fullname":"yAxis.stackLabels.formatter","title":"formatter","parent":"yAxis-stackLabels","isParent":false,"returnType":"Function","since":"2.1.5","description":"Callback JavaScript function to format the label. The value is  given by <code>this.total</code>. Defaults to: \n<pre>function() {\n\treturn this.total;\n}</pre>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/stacklabels-formatter/\" target=\"_blank\">Added units to stack total value</a>"},{"name":"series<bar>-dataLabels--formatter","fullname":"series<bar>.dataLabels.formatter","title":"formatter","parent":"series<bar>-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"series<heatmap>-dataLabels--formatter","fullname":"series<heatmap>.dataLabels.formatter","title":"formatter","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"plotOptions-area-dataLabels--formatter","fullname":"plotOptions.area.dataLabels.formatter","title":"formatter","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"Function","description":"Callback JavaScript function to format the data label. Note that if a <code>format</code> is defined, the format takes precedence and the formatter is ignored. Available data are:\r\n<table>\r\n<tbody><tr>\r\n  <td><code>this.percentage</code></td>\r\n  <td>Stacked series and pies only. The point's percentage of the total.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.point</code></td>\r\n  <td>The point object. The point name, if defined, is available \r\nthrough <code>this.point.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.series</code>:</td>\r\n  <td>The series object. The series name is available \r\nthrough <code>this.series.name</code>.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.total</code></td>\r\n  <td>Stacked series only. The total value at this point's x value.</td>\r\n</tr>\t\t\t\t\r\n<tr>\r\n  <td><code>this.x</code>:</td>\r\n  <td>The x value.</td>\r\n</tr>\r\n<tr>\r\n  <td><code>this.y</code>:</td>\r\n  <td>The y value.</td>\r\n</tr>\r\n</tbody></table>","deprecated":false},{"name":"chart-options3d-frame","fullname":"chart.options3d.frame","title":"frame","parent":"chart-options3d","isParent":true,"since":"4.0","description":"Provides the option to draw a frame around the charts by defining a bottom, front and back panel. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/3d/column-frame/\">Framed column chart</a>","deprecated":false},{"name":"yAxis-plotBands--from","fullname":"yAxis.plotBands.from","title":"from","parent":"yAxis-plotBands","isParent":false,"returnType":"Number","description":"The start position of the plot band in axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-color/\" target=\"_blank\">Datetime axis</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-from/\" target=\"_blank\">categorized axis</a>,"},{"name":"yAxis-breaks--from","fullname":"yAxis.breaks.from","title":"from","parent":"yAxis-breaks","isParent":false,"returnType":"Number","context":"","defaults":"","values":"","since":"4.1.0","description":"The point where the break starts.","demo":"","seeAlso":"","deprecated":false},{"name":"xAxis-breaks--from","fullname":"xAxis.breaks.from","title":"from","parent":"xAxis-breaks","isParent":false,"returnType":"Number","context":"","defaults":"","values":"","since":"4.1.0","description":"The point where the break starts.","demo":"","seeAlso":"","deprecated":false},{"name":"xAxis-plotBands--from","fullname":"xAxis.plotBands.from","title":"from","parent":"xAxis-plotBands","isParent":false,"returnType":"Number","description":"The start position of the plot band in axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-color/\" target=\"_blank\">Datetime axis</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-from/\" target=\"_blank\">categorized axis</a>,"},{"name":"plotOptions-funnel","fullname":"plotOptions.funnel","title":"funnel","parent":"plotOptions","isParent":true,"returnType":"Object","since":"3.0","description":"Funnel charts are a type of chart often used to visualize stages in a sales project, where the top are the initial stages with the most clients. It requires that the <code>modules/funnel.js</code> file is loaded.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/funnel/\" target=\"_blank\">Funnel demo</a>","deprecated":false},{"name":"plotOptions-gauge","fullname":"plotOptions.gauge","title":"gauge","parent":"plotOptions","isParent":true,"returnType":"Object","since":"2.3.0","description":"General plotting options for the gauge series type. Requires <code>highcharts-more.js</code>","deprecated":false},{"name":"plotOptions--getExtremesFromAll","fullname":"plotOptions.getExtremesFromAll","title":"getExtremesFromAll","parent":"plotOptions","isParent":false,"returnType":"Boolean","context":"","defaults":"false","values":"","since":"4.1.6","description":"Whether to use the Y extremes of the total chart width or only the zoomed area when zooming in on parts of the X axis. By default, the Y axis adjusts to the min and max of the visible data.","demo":"","seeAlso":"","deprecated":false},{"name":"global--getTimezoneOffset","fullname":"global.getTimezoneOffset","title":"getTimezoneOffset","parent":"global","isParent":false,"returnType":"Function","context":"","defaults":"","values":"","since":"4.1.0","description":"A callback to return the time zone offset for a given datetime. It takes the timestamp in terms of milliseconds since January 1 1970, and returns the timezone offset in minutes. This provides a hook for drawing time based charts in specific time zones using their local DST crossover dates, with the help of external libraries. ","demo":" <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/global/gettimezoneoffset/\" target=\"_blank\">Use moment.js to draw Oslo time regardless of browser locale</a>","seeAlso":"<a href=\"#global.timezoneOffset\">global.timezoneOffset</a>","deprecated":false},{"name":"global","fullname":"global","title":"global","isParent":true,"description":"Global options that don't apply to each chart. These options, like the <code>lang</code>\n\t\toptions, must be set using the <code>Highcharts.setOptions</code> method.\n<pre>Highcharts.setOptions({\n\tglobal: {\n\t\tuseUTC: false\n\t}\n});</pre>"},{"name":"data--googleSpreadsheetKey","fullname":"data.googleSpreadsheetKey","title":"googleSpreadsheetKey","parent":"data","isParent":false,"returnType":"String","defaults":"","values":"","since":"4.0","description":"The key for a Google Spreadsheet to load. See <a href=\"https://developers.google.com/gdata/samples/spreadsheet_sample\">general information on GS</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/data/google-spreadsheet/\" target=\"_blank\">Load a Google Spreadsheet</a>","seeAlso":"","deprecated":false},{"name":"data--googleSpreadsheetWorksheet","fullname":"data.googleSpreadsheetWorksheet","title":"googleSpreadsheetWorksheet","parent":"data","isParent":false,"returnType":"String","since":"4.0","description":"The Google Spreadsheet worksheet to use in combination with <a href=\"#data.googleSpreadsheetKey\">googleSpreadsheetKey</a>. The available id's from your sheet can be read from <code>https://spreadsheets.google.com/feeds/worksheets/{key}/public/basic</code>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/data/google-spreadsheet/\" target=\"_blank\">Load a Google Spreadsheet</a>","deprecated":false},{"name":"xAxis--gridLineColor","fullname":"xAxis.gridLineColor","title":"gridLineColor","parent":"xAxis","isParent":false,"returnType":"Color","defaults":"#D8D8D8","description":"Color of the grid lines extending the ticks across the plot area.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/gridlinecolor/\" target=\"_blank\">Green lines</a>","deprecated":false},{"name":"yAxis--gridLineColor","fullname":"yAxis.gridLineColor","title":"gridLineColor","parent":"yAxis","isParent":false,"returnType":"Color","defaults":"#D8D8D8","description":"Color of the grid lines extending the ticks across the plot area.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/gridlinecolor/\" target=\"_blank\">Green lines</a>","deprecated":false},{"name":"yAxis--gridLineDashStyle","fullname":"yAxis.gridLineDashStyle","title":"gridLineDashStyle","parent":"yAxis","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"1.2","description":"The dash or dot style of the grid lines. For possible values, see <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\">this demonstration</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/gridlinedashstyle/\" target=\"_blank\">Long dashes</a>","deprecated":false},{"name":"xAxis--gridLineDashStyle","fullname":"xAxis.gridLineDashStyle","title":"gridLineDashStyle","parent":"xAxis","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"1.2","description":"The dash or dot style of the grid lines. For possible values, see <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\">this demonstration</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/gridlinedashstyle/\" target=\"_blank\">Long dashes</a>","deprecated":false},{"name":"yAxis--gridLineInterpolation","fullname":"yAxis.gridLineInterpolation","title":"gridLineInterpolation","parent":"yAxis","isParent":false,"returnType":"String","defaults":"null","values":"[\"circle\", \"polygon\"]","description":"Polar charts only. Whether the grid lines should draw as a polygon with straight lines between categories, or as circles. Can be either <code>circle</code> or <code>polygon</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/polar-spider/\" target=\"_blank\">Polygon grid lines</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/gridlineinterpolation/\" target=\"_blank\">circle and polygon</a>","deprecated":false},{"name":"yAxis--gridLineWidth","fullname":"yAxis.gridLineWidth","title":"gridLineWidth","parent":"yAxis","isParent":false,"returnType":"Number","defaults":"1","description":"The width of the grid lines extending the ticks across the plot area.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/gridlinewidth/\" target=\"_blank\">2px lines</a>"},{"name":"xAxis--gridLineWidth","fullname":"xAxis.gridLineWidth","title":"gridLineWidth","parent":"xAxis","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the grid lines extending the ticks across the plot area.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/gridlinewidth/\" target=\"_blank\">2px lines</a>"},{"name":"xAxis--gridZIndex","fullname":"xAxis.gridZIndex","title":"gridZIndex","parent":"xAxis","isParent":false,"returnType":"Number","defaults":"1","description":"The Z index of the grid lines.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/gridzindex/\" target=\"_blank\">A Z index of 4 renders the grid above the graph</a>","deprecated":false},{"name":"yAxis--gridZIndex","fullname":"yAxis.gridZIndex","title":"gridZIndex","parent":"yAxis","isParent":false,"returnType":"Number","defaults":"1","description":"The Z index of the grid lines.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/gridzindex/\" target=\"_blank\">A Z index of 4 renders the grid above the graph</a>","deprecated":false},{"name":"plotOptions-column--groupPadding","fullname":"plotOptions.column.groupPadding","title":"groupPadding","parent":"plotOptions-column","isParent":false,"returnType":"Number","defaults":"0.2","description":"Padding between each value groups, in x axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouppadding-default/\" target=\"_blank\">0.2 by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouppadding-none/\" target=\"_blank\">no group padding - all \n\t\t\tcolumns are evenly spaced</a>"},{"name":"plotOptions-boxplot--groupPadding","fullname":"plotOptions.boxplot.groupPadding","title":"groupPadding","parent":"plotOptions-boxplot","isParent":false,"returnType":"Number","defaults":"0.2","description":"Padding between each value groups, in x axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouppadding-default/\" target=\"_blank\">0.2 by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouppadding-none/\" target=\"_blank\">no group padding - all \n\t\t\tcolumns are evenly spaced</a>"},{"name":"series<boxplot>--groupPadding","fullname":"series<boxplot>.groupPadding","title":"groupPadding","parent":"series<boxplot>","isParent":false,"returnType":"Number","defaults":"0.2","description":"Padding between each value groups, in x axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouppadding-default/\" target=\"_blank\">0.2 by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouppadding-none/\" target=\"_blank\">no group padding - all \n\t\t\tcolumns are evenly spaced</a>"},{"name":"series<column>--groupPadding","fullname":"series<column>.groupPadding","title":"groupPadding","parent":"series<column>","isParent":false,"returnType":"Number","defaults":"0.2","description":"Padding between each value groups, in x axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouppadding-default/\" target=\"_blank\">0.2 by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouppadding-none/\" target=\"_blank\">no group padding - all \n\t\t\tcolumns are evenly spaced</a>"},{"name":"plotOptions-bar--groupPadding","fullname":"plotOptions.bar.groupPadding","title":"groupPadding","parent":"plotOptions-bar","isParent":false,"returnType":"Number","defaults":"0.2","description":"Padding between each value groups, in x axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouppadding-default/\" target=\"_blank\">0.2 by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouppadding-none/\" target=\"_blank\">no group padding - all \n\t\t\tcolumns are evenly spaced</a>"},{"name":"plotOptions-waterfall--groupPadding","fullname":"plotOptions.waterfall.groupPadding","title":"groupPadding","parent":"plotOptions-waterfall","isParent":false,"returnType":"Number","defaults":"0.2","description":"Padding between each value groups, in x axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouppadding-default/\" target=\"_blank\">0.2 by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouppadding-none/\" target=\"_blank\">no group padding - all \n\t\t\tcolumns are evenly spaced</a>"},{"name":"series<bar>--groupPadding","fullname":"series<bar>.groupPadding","title":"groupPadding","parent":"series<bar>","isParent":false,"returnType":"Number","defaults":"0.2","description":"Padding between each value groups, in x axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouppadding-default/\" target=\"_blank\">0.2 by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouppadding-none/\" target=\"_blank\">no group padding - all \n\t\t\tcolumns are evenly spaced</a>"},{"name":"plotOptions-columnrange--groupPadding","fullname":"plotOptions.columnrange.groupPadding","title":"groupPadding","parent":"plotOptions-columnrange","isParent":false,"returnType":"Number","defaults":"0.2","description":"Padding between each value groups, in x axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouppadding-default/\" target=\"_blank\">0.2 by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouppadding-none/\" target=\"_blank\">no group padding - all \n\t\t\tcolumns are evenly spaced</a>"},{"name":"series<waterfall>--groupPadding","fullname":"series<waterfall>.groupPadding","title":"groupPadding","parent":"series<waterfall>","isParent":false,"returnType":"Number","defaults":"0.2","description":"Padding between each value groups, in x axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouppadding-default/\" target=\"_blank\">0.2 by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouppadding-none/\" target=\"_blank\">no group padding - all \n\t\t\tcolumns are evenly spaced</a>"},{"name":"series<columnrange>--groupPadding","fullname":"series<columnrange>.groupPadding","title":"groupPadding","parent":"series<columnrange>","isParent":false,"returnType":"Number","defaults":"0.2","description":"Padding between each value groups, in x axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouppadding-default/\" target=\"_blank\">0.2 by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouppadding-none/\" target=\"_blank\">no group padding - all \n\t\t\tcolumns are evenly spaced</a>"},{"name":"series<columnrange>--groupZPadding","fullname":"series<columnrange>.groupZPadding","title":"groupZPadding","parent":"series<columnrange>","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0","description":"The spacing between columns on the Z Axis in a 3D chart. Requires <code>highcharts-3d.js</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar--groupZPadding","fullname":"plotOptions.errorbar.groupZPadding","title":"groupZPadding","parent":"plotOptions-errorbar","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0","description":"The spacing between columns on the Z Axis in a 3D chart. Requires <code>highcharts-3d.js</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<column>--groupZPadding","fullname":"series<column>.groupZPadding","title":"groupZPadding","parent":"series<column>","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0","description":"The spacing between columns on the Z Axis in a 3D chart. Requires <code>highcharts-3d.js</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot--groupZPadding","fullname":"plotOptions.boxplot.groupZPadding","title":"groupZPadding","parent":"plotOptions-boxplot","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0","description":"The spacing between columns on the Z Axis in a 3D chart. Requires <code>highcharts-3d.js</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange--groupZPadding","fullname":"plotOptions.columnrange.groupZPadding","title":"groupZPadding","parent":"plotOptions-columnrange","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0","description":"The spacing between columns on the Z Axis in a 3D chart. Requires <code>highcharts-3d.js</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bar--groupZPadding","fullname":"plotOptions.bar.groupZPadding","title":"groupZPadding","parent":"plotOptions-bar","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0","description":"The spacing between columns on the Z Axis in a 3D chart. Requires <code>highcharts-3d.js</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<errorbar>--groupZPadding","fullname":"series<errorbar>.groupZPadding","title":"groupZPadding","parent":"series<errorbar>","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0","description":"The spacing between columns on the Z Axis in a 3D chart. Requires <code>highcharts-3d.js</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bar>--groupZPadding","fullname":"series<bar>.groupZPadding","title":"groupZPadding","parent":"series<bar>","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0","description":"The spacing between columns on the Z Axis in a 3D chart. Requires <code>highcharts-3d.js</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<waterfall>--groupZPadding","fullname":"series<waterfall>.groupZPadding","title":"groupZPadding","parent":"series<waterfall>","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0","description":"The spacing between columns on the Z Axis in a 3D chart. Requires <code>highcharts-3d.js</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall--groupZPadding","fullname":"plotOptions.waterfall.groupZPadding","title":"groupZPadding","parent":"plotOptions-waterfall","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0","description":"The spacing between columns on the Z Axis in a 3D chart. Requires <code>highcharts-3d.js</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column--groupZPadding","fullname":"plotOptions.column.groupZPadding","title":"groupZPadding","parent":"plotOptions-column","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0","description":"The spacing between columns on the Z Axis in a 3D chart. Requires <code>highcharts-3d.js</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<boxplot>--groupZPadding","fullname":"series<boxplot>.groupZPadding","title":"groupZPadding","parent":"series<boxplot>","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0","description":"The spacing between columns on the Z Axis in a 3D chart. Requires <code>highcharts-3d.js</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column--grouping","fullname":"plotOptions.column.grouping","title":"grouping","parent":"plotOptions-column","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Whether to group non-stacked columns or to let them render independent of each other. Non-grouped columns will be laid out individually and overlap each other.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouping-false/\" target=\"_blank\">Grouping disabled</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-bar--grouping","fullname":"plotOptions.bar.grouping","title":"grouping","parent":"plotOptions-bar","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Whether to group non-stacked columns or to let them render independent of each other. Non-grouped columns will be laid out individually and overlap each other.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouping-false/\" target=\"_blank\">Grouping disabled</a>","seeAlso":"","deprecated":false},{"name":"series<bar>--grouping","fullname":"series<bar>.grouping","title":"grouping","parent":"series<bar>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Whether to group non-stacked columns or to let them render independent of each other. Non-grouped columns will be laid out individually and overlap each other.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouping-false/\" target=\"_blank\">Grouping disabled</a>","seeAlso":"","deprecated":false},{"name":"series<waterfall>--grouping","fullname":"series<waterfall>.grouping","title":"grouping","parent":"series<waterfall>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Whether to group non-stacked columns or to let them render independent of each other. Non-grouped columns will be laid out individually and overlap each other.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouping-false/\" target=\"_blank\">Grouping disabled</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall--grouping","fullname":"plotOptions.waterfall.grouping","title":"grouping","parent":"plotOptions-waterfall","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Whether to group non-stacked columns or to let them render independent of each other. Non-grouped columns will be laid out individually and overlap each other.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouping-false/\" target=\"_blank\">Grouping disabled</a>","seeAlso":"","deprecated":false},{"name":"series<boxplot>--grouping","fullname":"series<boxplot>.grouping","title":"grouping","parent":"series<boxplot>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Whether to group non-stacked columns or to let them render independent of each other. Non-grouped columns will be laid out individually and overlap each other.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouping-false/\" target=\"_blank\">Grouping disabled</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange--grouping","fullname":"plotOptions.columnrange.grouping","title":"grouping","parent":"plotOptions-columnrange","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Whether to group non-stacked columns or to let them render independent of each other. Non-grouped columns will be laid out individually and overlap each other.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouping-false/\" target=\"_blank\">Grouping disabled</a>","seeAlso":"","deprecated":false},{"name":"series<columnrange>--grouping","fullname":"series<columnrange>.grouping","title":"grouping","parent":"series<columnrange>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Whether to group non-stacked columns or to let them render independent of each other. Non-grouped columns will be laid out individually and overlap each other.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouping-false/\" target=\"_blank\">Grouping disabled</a>","seeAlso":"","deprecated":false},{"name":"series<column>--grouping","fullname":"series<column>.grouping","title":"grouping","parent":"series<column>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Whether to group non-stacked columns or to let them render independent of each other. Non-grouped columns will be laid out individually and overlap each other.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouping-false/\" target=\"_blank\">Grouping disabled</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot--grouping","fullname":"plotOptions.boxplot.grouping","title":"grouping","parent":"plotOptions-boxplot","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Whether to group non-stacked columns or to let them render independent of each other. Non-grouped columns will be laid out individually and overlap each other.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-grouping-false/\" target=\"_blank\">Grouping disabled</a>","seeAlso":"","deprecated":false},{"name":"series<polygon>-states-hover-halo","fullname":"series<polygon>.states.hover.halo","title":"halo","parent":"series<polygon>-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"plotOptions-waterfall-states-hover-halo","fullname":"plotOptions.waterfall.states.hover.halo","title":"halo","parent":"plotOptions-waterfall-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"plotOptions-series-states-hover-halo","fullname":"plotOptions.series.states.hover.halo","title":"halo","parent":"plotOptions-series-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"series<spline>-states-hover-halo","fullname":"series<spline>.states.hover.halo","title":"halo","parent":"series<spline>-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"plotOptions-gauge-states-hover-halo","fullname":"plotOptions.gauge.states.hover.halo","title":"halo","parent":"plotOptions-gauge-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"series<areasplinerange>-states-hover-halo","fullname":"series<areasplinerange>.states.hover.halo","title":"halo","parent":"series<areasplinerange>-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"plotOptions-funnel-states-hover-halo","fullname":"plotOptions.funnel.states.hover.halo","title":"halo","parent":"plotOptions-funnel-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"series<boxplot>-states-hover-halo","fullname":"series<boxplot>.states.hover.halo","title":"halo","parent":"series<boxplot>-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"plotOptions-bubble-states-hover-halo","fullname":"plotOptions.bubble.states.hover.halo","title":"halo","parent":"plotOptions-bubble-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"series<funnel>-states-hover-halo","fullname":"series<funnel>.states.hover.halo","title":"halo","parent":"series<funnel>-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"plotOptions-scatter-states-hover-halo","fullname":"plotOptions.scatter.states.hover.halo","title":"halo","parent":"plotOptions-scatter-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"plotOptions-line-states-hover-halo","fullname":"plotOptions.line.states.hover.halo","title":"halo","parent":"plotOptions-line-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"plotOptions-spline-states-hover-halo","fullname":"plotOptions.spline.states.hover.halo","title":"halo","parent":"plotOptions-spline-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"plotOptions-solidgauge-states-hover-halo","fullname":"plotOptions.solidgauge.states.hover.halo","title":"halo","parent":"plotOptions-solidgauge-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"plotOptions-boxplot-states-hover-halo","fullname":"plotOptions.boxplot.states.hover.halo","title":"halo","parent":"plotOptions-boxplot-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"plotOptions-pyramid-states-hover-halo","fullname":"plotOptions.pyramid.states.hover.halo","title":"halo","parent":"plotOptions-pyramid-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"series<column>-states-hover-halo","fullname":"series<column>.states.hover.halo","title":"halo","parent":"series<column>-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"plotOptions-areaspline-states-hover-halo","fullname":"plotOptions.areaspline.states.hover.halo","title":"halo","parent":"plotOptions-areaspline-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"series<pyramid>-states-hover-halo","fullname":"series<pyramid>.states.hover.halo","title":"halo","parent":"series<pyramid>-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"plotOptions-columnrange-states-hover-halo","fullname":"plotOptions.columnrange.states.hover.halo","title":"halo","parent":"plotOptions-columnrange-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"series<columnrange>-states-hover-halo","fullname":"series<columnrange>.states.hover.halo","title":"halo","parent":"series<columnrange>-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"plotOptions-pie-states-hover-halo","fullname":"plotOptions.pie.states.hover.halo","title":"halo","parent":"plotOptions-pie-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"series<bubble>-states-hover-halo","fullname":"series<bubble>.states.hover.halo","title":"halo","parent":"series<bubble>-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"series<area>-states-hover-halo","fullname":"series<area>.states.hover.halo","title":"halo","parent":"series<area>-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"plotOptions-arearange-states-hover-halo","fullname":"plotOptions.arearange.states.hover.halo","title":"halo","parent":"plotOptions-arearange-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"series<heatmap>-states-hover-halo","fullname":"series<heatmap>.states.hover.halo","title":"halo","parent":"series<heatmap>-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"plotOptions-treemap-states-hover-halo","fullname":"plotOptions.treemap.states.hover.halo","title":"halo","parent":"plotOptions-treemap-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"plotOptions-column-states-hover-halo","fullname":"plotOptions.column.states.hover.halo","title":"halo","parent":"plotOptions-column-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"series<bar>-states-hover-halo","fullname":"series<bar>.states.hover.halo","title":"halo","parent":"series<bar>-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"plotOptions-areasplinerange-states-hover-halo","fullname":"plotOptions.areasplinerange.states.hover.halo","title":"halo","parent":"plotOptions-areasplinerange-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"plotOptions-polygon-states-hover-halo","fullname":"plotOptions.polygon.states.hover.halo","title":"halo","parent":"plotOptions-polygon-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"plotOptions-heatmap-states-hover-halo","fullname":"plotOptions.heatmap.states.hover.halo","title":"halo","parent":"plotOptions-heatmap-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"series<pie>-states-hover-halo","fullname":"series<pie>.states.hover.halo","title":"halo","parent":"series<pie>-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"series<gauge>-states-hover-halo","fullname":"series<gauge>.states.hover.halo","title":"halo","parent":"series<gauge>-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"plotOptions-bar-states-hover-halo","fullname":"plotOptions.bar.states.hover.halo","title":"halo","parent":"plotOptions-bar-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"series<line>-states-hover-halo","fullname":"series<line>.states.hover.halo","title":"halo","parent":"series<line>-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"series<arearange>-states-hover-halo","fullname":"series<arearange>.states.hover.halo","title":"halo","parent":"series<arearange>-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"series<errorbar>-states-hover-halo","fullname":"series<errorbar>.states.hover.halo","title":"halo","parent":"series<errorbar>-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"series<treemap>-states-hover-halo","fullname":"series<treemap>.states.hover.halo","title":"halo","parent":"series<treemap>-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"series<waterfall>-states-hover-halo","fullname":"series<waterfall>.states.hover.halo","title":"halo","parent":"series<waterfall>-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"series<areaspline>-states-hover-halo","fullname":"series<areaspline>.states.hover.halo","title":"halo","parent":"series<areaspline>-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"plotOptions-errorbar-states-hover-halo","fullname":"plotOptions.errorbar.states.hover.halo","title":"halo","parent":"plotOptions-errorbar-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"plotOptions-area-states-hover-halo","fullname":"plotOptions.area.states.hover.halo","title":"halo","parent":"plotOptions-area-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"series<solidgauge>-states-hover-halo","fullname":"series<solidgauge>.states.hover.halo","title":"halo","parent":"series<solidgauge>-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"series<scatter>-states-hover-halo","fullname":"series<scatter>.states.hover.halo","title":"halo","parent":"series<scatter>-states-hover","isParent":true,"returnType":"Object","since":"4.0","description":"Options for the halo appearing around the hovered point in line-type series as well as outside the hovered slice in pie charts. By default the halo is filled by the current point or series color with an opacity of 0.25. The halo can be disabled by setting the <code>halo</code> option to <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/halo/\" target=\"_blank\">Halo options</a>","deprecated":false},{"name":"series<funnel>-tooltip--headerFormat","fullname":"series<funnel>.tooltip.headerFormat","title":"headerFormat","parent":"series<funnel>-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"series<polygon>-tooltip--headerFormat","fullname":"series<polygon>.tooltip.headerFormat","title":"headerFormat","parent":"series<polygon>-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-tooltip--headerFormat","fullname":"plotOptions.areaspline.tooltip.headerFormat","title":"headerFormat","parent":"plotOptions-areaspline-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"series<heatmap>-tooltip--headerFormat","fullname":"series<heatmap>.tooltip.headerFormat","title":"headerFormat","parent":"series<heatmap>-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"series<solidgauge>-tooltip--headerFormat","fullname":"series<solidgauge>.tooltip.headerFormat","title":"headerFormat","parent":"series<solidgauge>-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"series<spline>-tooltip--headerFormat","fullname":"series<spline>.tooltip.headerFormat","title":"headerFormat","parent":"series<spline>-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-line-tooltip--headerFormat","fullname":"plotOptions.line.tooltip.headerFormat","title":"headerFormat","parent":"plotOptions-line-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-tooltip--headerFormat","fullname":"plotOptions.spline.tooltip.headerFormat","title":"headerFormat","parent":"plotOptions-spline-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange-tooltip--headerFormat","fullname":"plotOptions.columnrange.tooltip.headerFormat","title":"headerFormat","parent":"plotOptions-columnrange-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange-tooltip--headerFormat","fullname":"plotOptions.arearange.tooltip.headerFormat","title":"headerFormat","parent":"plotOptions-arearange-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"series<errorbar>-tooltip--headerFormat","fullname":"series<errorbar>.tooltip.headerFormat","title":"headerFormat","parent":"series<errorbar>-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-tooltip--headerFormat","fullname":"plotOptions.polygon.tooltip.headerFormat","title":"headerFormat","parent":"plotOptions-polygon-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-pie-tooltip--headerFormat","fullname":"plotOptions.pie.tooltip.headerFormat","title":"headerFormat","parent":"plotOptions-pie-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"series<boxplot>-tooltip--headerFormat","fullname":"series<boxplot>.tooltip.headerFormat","title":"headerFormat","parent":"series<boxplot>-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"series<treemap>-tooltip--headerFormat","fullname":"series<treemap>.tooltip.headerFormat","title":"headerFormat","parent":"series<treemap>-tooltip","isParent":false,"returnType":"String","context":"","defaults":"\"\"","values":"","since":"4.1.0","description":"The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\tare point.key, series.name, series.color and other members from the point and series objects. The point.key variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the point.key date format can be set using tooltip.xDateFormat.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"series<area>-tooltip--headerFormat","fullname":"series<area>.tooltip.headerFormat","title":"headerFormat","parent":"series<area>-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"series<bubble>-tooltip--headerFormat","fullname":"series<bubble>.tooltip.headerFormat","title":"headerFormat","parent":"series<bubble>-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"series<gauge>-tooltip--headerFormat","fullname":"series<gauge>.tooltip.headerFormat","title":"headerFormat","parent":"series<gauge>-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"tooltip--headerFormat","fullname":"tooltip.headerFormat","title":"headerFormat","parent":"tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-column-tooltip--headerFormat","fullname":"plotOptions.column.tooltip.headerFormat","title":"headerFormat","parent":"plotOptions-column-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge-tooltip--headerFormat","fullname":"plotOptions.gauge.tooltip.headerFormat","title":"headerFormat","parent":"plotOptions-gauge-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"series<columnrange>-tooltip--headerFormat","fullname":"series<columnrange>.tooltip.headerFormat","title":"headerFormat","parent":"series<columnrange>-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-bar-tooltip--headerFormat","fullname":"plotOptions.bar.tooltip.headerFormat","title":"headerFormat","parent":"plotOptions-bar-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot-tooltip--headerFormat","fullname":"plotOptions.boxplot.tooltip.headerFormat","title":"headerFormat","parent":"plotOptions-boxplot-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-tooltip--headerFormat","fullname":"plotOptions.pyramid.tooltip.headerFormat","title":"headerFormat","parent":"plotOptions-pyramid-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"series<line>-tooltip--headerFormat","fullname":"series<line>.tooltip.headerFormat","title":"headerFormat","parent":"series<line>-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"series<areaspline>-tooltip--headerFormat","fullname":"series<areaspline>.tooltip.headerFormat","title":"headerFormat","parent":"series<areaspline>-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar-tooltip--headerFormat","fullname":"plotOptions.errorbar.tooltip.headerFormat","title":"headerFormat","parent":"plotOptions-errorbar-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble-tooltip--headerFormat","fullname":"plotOptions.bubble.tooltip.headerFormat","title":"headerFormat","parent":"plotOptions-bubble-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"series<scatter>-tooltip--headerFormat","fullname":"series<scatter>.tooltip.headerFormat","title":"headerFormat","parent":"series<scatter>-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap-tooltip--headerFormat","fullname":"plotOptions.treemap.tooltip.headerFormat","title":"headerFormat","parent":"plotOptions-treemap-tooltip","isParent":false,"returnType":"String","context":"","defaults":"\"\"","values":"","since":"4.1.0","description":"The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\tare point.key, series.name, series.color and other members from the point and series objects. The point.key variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the point.key date format can be set using tooltip.xDateFormat.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-area-tooltip--headerFormat","fullname":"plotOptions.area.tooltip.headerFormat","title":"headerFormat","parent":"plotOptions-area-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"series<arearange>-tooltip--headerFormat","fullname":"series<arearange>.tooltip.headerFormat","title":"headerFormat","parent":"series<arearange>-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-series-tooltip--headerFormat","fullname":"plotOptions.series.tooltip.headerFormat","title":"headerFormat","parent":"plotOptions-series-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange-tooltip--headerFormat","fullname":"plotOptions.areasplinerange.tooltip.headerFormat","title":"headerFormat","parent":"plotOptions-areasplinerange-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall-tooltip--headerFormat","fullname":"plotOptions.waterfall.tooltip.headerFormat","title":"headerFormat","parent":"plotOptions-waterfall-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"series<waterfall>-tooltip--headerFormat","fullname":"series<waterfall>.tooltip.headerFormat","title":"headerFormat","parent":"series<waterfall>-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter-tooltip--headerFormat","fullname":"plotOptions.scatter.tooltip.headerFormat","title":"headerFormat","parent":"plotOptions-scatter-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel-tooltip--headerFormat","fullname":"plotOptions.funnel.tooltip.headerFormat","title":"headerFormat","parent":"plotOptions-funnel-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"series<column>-tooltip--headerFormat","fullname":"series<column>.tooltip.headerFormat","title":"headerFormat","parent":"series<column>-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-tooltip--headerFormat","fullname":"series<areasplinerange>.tooltip.headerFormat","title":"headerFormat","parent":"series<areasplinerange>-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap-tooltip--headerFormat","fullname":"plotOptions.heatmap.tooltip.headerFormat","title":"headerFormat","parent":"plotOptions-heatmap-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"series<pie>-tooltip--headerFormat","fullname":"series<pie>.tooltip.headerFormat","title":"headerFormat","parent":"series<pie>-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"series<bar>-tooltip--headerFormat","fullname":"series<bar>.tooltip.headerFormat","title":"headerFormat","parent":"series<bar>-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"series<pyramid>-tooltip--headerFormat","fullname":"series<pyramid>.tooltip.headerFormat","title":"headerFormat","parent":"series<pyramid>-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-solidgauge-tooltip--headerFormat","fullname":"plotOptions.solidgauge.tooltip.headerFormat","title":"headerFormat","parent":"plotOptions-solidgauge-tooltip","isParent":false,"returnType":"String","defaults":"","values":"","since":"","description":"<p>The HTML of the tooltip header line. Variables are enclosed by curly brackets. Available variables\t\t\tare <code>point.key</code>, <code>series.name</code>, <code>series.color</code> and other members from the <code>point</code> and <code>series</code> objects. The <code>point.key</code> variable contains the category name, x value or datetime string depending on the type of axis. For datetime axes, the <code>point.key</code> date format can be set using tooltip.xDateFormat.</p>\r \r\n<p>Defaults to <code>&lt;span style=\"font-size: 10px\"&gt;{point.key}&lt;/span&gt;&lt;br/&gt;</code></p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A HTML table in the tooltip</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap","fullname":"plotOptions.heatmap","title":"heatmap","parent":"plotOptions","isParent":true,"returnType":"Object","since":"4.0","description":"<p>The heatmap series type. This series type is available both in Highcharts and Highmaps.</p>\r\n\r\n<p>The colors of each heat map point is usually determined by its value and controlled by settings on the <a href=\"#colorAxis\">colorAxis</a>.</p>","deprecated":false},{"name":"series<polygon>-data-marker--height","fullname":"series<polygon>.data.marker.height","title":"height","parent":"series<polygon>-data-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-area-marker--height","fullname":"plotOptions.area.marker.height","title":"height","parent":"plotOptions-area-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-marker--height","fullname":"plotOptions.polygon.marker.height","title":"height","parent":"plotOptions-polygon-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<bubble>-marker--height","fullname":"series<bubble>.marker.height","title":"height","parent":"series<bubble>-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-states-hover-marker--height","fullname":"plotOptions.polygon.states.hover.marker.height","title":"height","parent":"plotOptions-polygon-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-marker--height","fullname":"plotOptions.spline.marker.height","title":"height","parent":"plotOptions-spline-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-area-states-hover-marker--height","fullname":"plotOptions.area.states.hover.marker.height","title":"height","parent":"plotOptions-area-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel--height","fullname":"plotOptions.funnel.height","title":"height","parent":"plotOptions-funnel","isParent":false,"returnType":"Number|String","since":"3.0","description":"The height of the funnel or pyramid. If it is a number it defines the pixel height, if it is a percentage string it is the percentage of the plot area height.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/funnel/\" target=\"_blank\">Funnel demo</a>","deprecated":false},{"name":"series<bubble>-states-hover-marker--height","fullname":"series<bubble>.states.hover.marker.height","title":"height","parent":"series<bubble>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<area>-data-marker--height","fullname":"series<area>.data.marker.height","title":"height","parent":"series<area>-data-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<areaspline>-marker--height","fullname":"series<areaspline>.marker.height","title":"height","parent":"series<areaspline>-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<line>-states-hover-marker--height","fullname":"series<line>.states.hover.marker.height","title":"height","parent":"series<line>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-states-hover-marker--height","fullname":"plotOptions.spline.states.hover.marker.height","title":"height","parent":"plotOptions-spline-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble-marker--height","fullname":"plotOptions.bubble.marker.height","title":"height","parent":"plotOptions-bubble-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<arearange>-states-hover-marker--height","fullname":"series<arearange>.states.hover.marker.height","title":"height","parent":"series<arearange>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<solidgauge>-states-hover-marker--height","fullname":"series<solidgauge>.states.hover.marker.height","title":"height","parent":"series<solidgauge>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-pie-states-hover-marker--height","fullname":"plotOptions.pie.states.hover.marker.height","title":"height","parent":"plotOptions-pie-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<area>-marker--height","fullname":"series<area>.marker.height","title":"height","parent":"series<area>-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-solidgauge-states-hover-marker--height","fullname":"plotOptions.solidgauge.states.hover.marker.height","title":"height","parent":"plotOptions-solidgauge-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-states-hover-marker--height","fullname":"series<areasplinerange>.states.hover.marker.height","title":"height","parent":"series<areasplinerange>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<boxplot>-states-hover-marker--height","fullname":"series<boxplot>.states.hover.marker.height","title":"height","parent":"series<boxplot>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<scatter>-states-hover-marker--height","fullname":"series<scatter>.states.hover.marker.height","title":"height","parent":"series<scatter>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall-states-hover-marker--height","fullname":"plotOptions.waterfall.states.hover.marker.height","title":"height","parent":"plotOptions-waterfall-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange-states-hover-marker--height","fullname":"plotOptions.columnrange.states.hover.marker.height","title":"height","parent":"plotOptions-columnrange-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<pyramid>-states-hover-marker--height","fullname":"series<pyramid>.states.hover.marker.height","title":"height","parent":"series<pyramid>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<pie>-states-hover-marker--height","fullname":"series<pie>.states.hover.marker.height","title":"height","parent":"series<pie>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<waterfall>-states-hover-marker--height","fullname":"series<waterfall>.states.hover.marker.height","title":"height","parent":"series<waterfall>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-states-hover-marker--height","fullname":"plotOptions.pyramid.states.hover.marker.height","title":"height","parent":"plotOptions-pyramid-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-line-marker--height","fullname":"plotOptions.line.marker.height","title":"height","parent":"plotOptions-line-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<treemap>-states-hover-marker--height","fullname":"series<treemap>.states.hover.marker.height","title":"height","parent":"series<treemap>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<heatmap>-states-hover-marker--height","fullname":"series<heatmap>.states.hover.marker.height","title":"height","parent":"series<heatmap>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap-states-hover-marker--height","fullname":"plotOptions.heatmap.states.hover.marker.height","title":"height","parent":"plotOptions-heatmap-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-marker--height","fullname":"plotOptions.areaspline.marker.height","title":"height","parent":"plotOptions-areaspline-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<funnel>-states-hover-marker--height","fullname":"series<funnel>.states.hover.marker.height","title":"height","parent":"series<funnel>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-states-hover-marker--height","fullname":"plotOptions.areaspline.states.hover.marker.height","title":"height","parent":"plotOptions-areaspline-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<areaspline>-states-hover-marker--height","fullname":"series<areaspline>.states.hover.marker.height","title":"height","parent":"series<areaspline>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<polygon>-marker--height","fullname":"series<polygon>.marker.height","title":"height","parent":"series<polygon>-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<spline>-marker--height","fullname":"series<spline>.marker.height","title":"height","parent":"series<spline>-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<errorbar>-states-hover-marker--height","fullname":"series<errorbar>.states.hover.marker.height","title":"height","parent":"series<errorbar>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-bar-states-hover-marker--height","fullname":"plotOptions.bar.states.hover.marker.height","title":"height","parent":"plotOptions-bar-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<line>-data-marker--height","fullname":"series<line>.data.marker.height","title":"height","parent":"series<line>-data-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-series-states-hover-marker--height","fullname":"plotOptions.series.states.hover.marker.height","title":"height","parent":"plotOptions-series-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<funnel>--height","fullname":"series<funnel>.height","title":"height","parent":"series<funnel>","isParent":false,"returnType":"Number|String","since":"3.0","description":"The height of the funnel or pyramid. If it is a number it defines the pixel height, if it is a percentage string it is the percentage of the plot area height.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/funnel/\" target=\"_blank\">Funnel demo</a>","deprecated":false},{"name":"plotOptions-line-states-hover-marker--height","fullname":"plotOptions.line.states.hover.marker.height","title":"height","parent":"plotOptions-line-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid--height","fullname":"plotOptions.pyramid.height","title":"height","parent":"plotOptions-pyramid","isParent":false,"returnType":"Number|String","since":"3.0","description":"The height of the funnel or pyramid. If it is a number it defines the pixel height, if it is a percentage string it is the percentage of the plot area height.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/funnel/\" target=\"_blank\">Funnel demo</a>","deprecated":false},{"name":"series<scatter>-data-marker--height","fullname":"series<scatter>.data.marker.height","title":"height","parent":"series<scatter>-data-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<gauge>-states-hover-marker--height","fullname":"series<gauge>.states.hover.marker.height","title":"height","parent":"series<gauge>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<areaspline>-data-marker--height","fullname":"series<areaspline>.data.marker.height","title":"height","parent":"series<areaspline>-data-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<columnrange>-states-hover-marker--height","fullname":"series<columnrange>.states.hover.marker.height","title":"height","parent":"series<columnrange>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<spline>-data-marker--height","fullname":"series<spline>.data.marker.height","title":"height","parent":"series<spline>-data-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter-states-hover-marker--height","fullname":"plotOptions.scatter.states.hover.marker.height","title":"height","parent":"plotOptions-scatter-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter-marker--height","fullname":"plotOptions.scatter.marker.height","title":"height","parent":"plotOptions-scatter-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<polygon>-states-hover-marker--height","fullname":"series<polygon>.states.hover.marker.height","title":"height","parent":"series<polygon>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-series-marker--height","fullname":"plotOptions.series.marker.height","title":"height","parent":"plotOptions-series-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<spline>-states-hover-marker--height","fullname":"series<spline>.states.hover.marker.height","title":"height","parent":"series<spline>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<area>-states-hover-marker--height","fullname":"series<area>.states.hover.marker.height","title":"height","parent":"series<area>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar-states-hover-marker--height","fullname":"plotOptions.errorbar.states.hover.marker.height","title":"height","parent":"plotOptions-errorbar-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"navigation-buttonOptions--height","fullname":"navigation.buttonOptions.height","title":"height","parent":"navigation-buttonOptions","isParent":false,"returnType":"Number","defaults":"20","since":"2.0","description":"Pixel height of the buttons.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-height/\" target=\"_blank\">Bigger buttons</a>"},{"name":"plotOptions-gauge-states-hover-marker--height","fullname":"plotOptions.gauge.states.hover.marker.height","title":"height","parent":"plotOptions-gauge-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<scatter>-marker--height","fullname":"series<scatter>.marker.height","title":"height","parent":"series<scatter>-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"exporting-buttons-contextButton--height","fullname":"exporting.buttons.contextButton.height","title":"height","parent":"exporting-buttons-contextButton","isParent":false,"returnType":"Number","defaults":"20","since":"2.0","description":"Pixel height of the buttons.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-height/\" target=\"_blank\">Bigger buttons</a>"},{"name":"plotOptions-boxplot-states-hover-marker--height","fullname":"plotOptions.boxplot.states.hover.marker.height","title":"height","parent":"plotOptions-boxplot-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<line>-marker--height","fullname":"series<line>.marker.height","title":"height","parent":"series<line>-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap-states-hover-marker--height","fullname":"plotOptions.treemap.states.hover.marker.height","title":"height","parent":"plotOptions-treemap-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange-states-hover-marker--height","fullname":"plotOptions.areasplinerange.states.hover.marker.height","title":"height","parent":"plotOptions-areasplinerange-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel-states-hover-marker--height","fullname":"plotOptions.funnel.states.hover.marker.height","title":"height","parent":"plotOptions-funnel-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"chart--height","fullname":"chart.height","title":"height","parent":"chart","isParent":false,"returnType":"Number","description":"An explicit height for the chart. By default the height is calculated from the offset height of the containing element, or 400 pixels if the containing element's height is 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/height/\" target=\"_blank\">500px height</a>","deprecated":false},{"name":"plotOptions-arearange-states-hover-marker--height","fullname":"plotOptions.arearange.states.hover.marker.height","title":"height","parent":"plotOptions-arearange-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<pyramid>--height","fullname":"series<pyramid>.height","title":"height","parent":"series<pyramid>","isParent":false,"returnType":"Number|String","since":"3.0","description":"The height of the funnel or pyramid. If it is a number it defines the pixel height, if it is a percentage string it is the percentage of the plot area height.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/funnel/\" target=\"_blank\">Funnel demo</a>","deprecated":false},{"name":"series<column>-states-hover-marker--height","fullname":"series<column>.states.hover.marker.height","title":"height","parent":"series<column>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<bar>-states-hover-marker--height","fullname":"series<bar>.states.hover.marker.height","title":"height","parent":"series<bar>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble-states-hover-marker--height","fullname":"plotOptions.bubble.states.hover.marker.height","title":"height","parent":"plotOptions-bubble-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-column-states-hover-marker--height","fullname":"plotOptions.column.states.hover.marker.height","title":"height","parent":"plotOptions-column-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>width</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<waterfall>-events--hide","fullname":"series<waterfall>.events.hide","title":"hide","parent":"series<waterfall>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"series<column>-events--hide","fullname":"series<column>.events.hide","title":"hide","parent":"series<column>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-pie-events--hide","fullname":"plotOptions.pie.events.hide","title":"hide","parent":"plotOptions-pie-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-areasplinerange-events--hide","fullname":"plotOptions.areasplinerange.events.hide","title":"hide","parent":"plotOptions-areasplinerange-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-polygon-events--hide","fullname":"plotOptions.polygon.events.hide","title":"hide","parent":"plotOptions-polygon-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-bubble-events--hide","fullname":"plotOptions.bubble.events.hide","title":"hide","parent":"plotOptions-bubble-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"series<funnel>-events--hide","fullname":"series<funnel>.events.hide","title":"hide","parent":"series<funnel>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"series<columnrange>-events--hide","fullname":"series<columnrange>.events.hide","title":"hide","parent":"series<columnrange>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"series<bar>-events--hide","fullname":"series<bar>.events.hide","title":"hide","parent":"series<bar>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-treemap-events--hide","fullname":"plotOptions.treemap.events.hide","title":"hide","parent":"plotOptions-treemap-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-funnel-events--hide","fullname":"plotOptions.funnel.events.hide","title":"hide","parent":"plotOptions-funnel-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"series<spline>-events--hide","fullname":"series<spline>.events.hide","title":"hide","parent":"series<spline>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-errorbar-events--hide","fullname":"plotOptions.errorbar.events.hide","title":"hide","parent":"plotOptions-errorbar-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-areaspline-events--hide","fullname":"plotOptions.areaspline.events.hide","title":"hide","parent":"plotOptions-areaspline-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-scatter-events--hide","fullname":"plotOptions.scatter.events.hide","title":"hide","parent":"plotOptions-scatter-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-series-events--hide","fullname":"plotOptions.series.events.hide","title":"hide","parent":"plotOptions-series-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"series<boxplot>-events--hide","fullname":"series<boxplot>.events.hide","title":"hide","parent":"series<boxplot>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-column-events--hide","fullname":"plotOptions.column.events.hide","title":"hide","parent":"plotOptions-column-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"series<errorbar>-events--hide","fullname":"series<errorbar>.events.hide","title":"hide","parent":"series<errorbar>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-solidgauge-events--hide","fullname":"plotOptions.solidgauge.events.hide","title":"hide","parent":"plotOptions-solidgauge-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"series<pyramid>-events--hide","fullname":"series<pyramid>.events.hide","title":"hide","parent":"series<pyramid>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"series<treemap>-events--hide","fullname":"series<treemap>.events.hide","title":"hide","parent":"series<treemap>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-boxplot-events--hide","fullname":"plotOptions.boxplot.events.hide","title":"hide","parent":"plotOptions-boxplot-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"series<pie>-events--hide","fullname":"series<pie>.events.hide","title":"hide","parent":"series<pie>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"series<bubble>-events--hide","fullname":"series<bubble>.events.hide","title":"hide","parent":"series<bubble>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-heatmap-events--hide","fullname":"plotOptions.heatmap.events.hide","title":"hide","parent":"plotOptions-heatmap-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-pyramid-events--hide","fullname":"plotOptions.pyramid.events.hide","title":"hide","parent":"plotOptions-pyramid-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"series<heatmap>-events--hide","fullname":"series<heatmap>.events.hide","title":"hide","parent":"series<heatmap>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"series<arearange>-events--hide","fullname":"series<arearange>.events.hide","title":"hide","parent":"series<arearange>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"series<areaspline>-events--hide","fullname":"series<areaspline>.events.hide","title":"hide","parent":"series<areaspline>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"series<scatter>-events--hide","fullname":"series<scatter>.events.hide","title":"hide","parent":"series<scatter>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-columnrange-events--hide","fullname":"plotOptions.columnrange.events.hide","title":"hide","parent":"plotOptions-columnrange-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"series<gauge>-events--hide","fullname":"series<gauge>.events.hide","title":"hide","parent":"series<gauge>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-spline-events--hide","fullname":"plotOptions.spline.events.hide","title":"hide","parent":"plotOptions-spline-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-waterfall-events--hide","fullname":"plotOptions.waterfall.events.hide","title":"hide","parent":"plotOptions-waterfall-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-bar-events--hide","fullname":"plotOptions.bar.events.hide","title":"hide","parent":"plotOptions-bar-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"series<solidgauge>-events--hide","fullname":"series<solidgauge>.events.hide","title":"hide","parent":"series<solidgauge>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-line-events--hide","fullname":"plotOptions.line.events.hide","title":"hide","parent":"plotOptions-line-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"series<polygon>-events--hide","fullname":"series<polygon>.events.hide","title":"hide","parent":"series<polygon>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-gauge-events--hide","fullname":"plotOptions.gauge.events.hide","title":"hide","parent":"plotOptions-gauge-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"series<areasplinerange>-events--hide","fullname":"series<areasplinerange>.events.hide","title":"hide","parent":"series<areasplinerange>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-area-events--hide","fullname":"plotOptions.area.events.hide","title":"hide","parent":"plotOptions-area-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"series<line>-events--hide","fullname":"series<line>.events.hide","title":"hide","parent":"series<line>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"series<area>-events--hide","fullname":"series<area>.events.hide","title":"hide","parent":"series<area>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-arearange-events--hide","fullname":"plotOptions.arearange.events.hide","title":"hide","parent":"plotOptions-arearange-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is hidden after chart generation time, either by clicking the legend item or by calling <code>.hide()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-hide/\" target=\"_blank\">Alert when the series is hidden by clicking \r\n\t\t\tthe legend item</a>","deprecated":false},{"name":"plotOptions-area-tooltip--hideDelay","fullname":"plotOptions.area.tooltip.hideDelay","title":"hideDelay","parent":"plotOptions-area-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<area>-tooltip--hideDelay","fullname":"series<area>.tooltip.hideDelay","title":"hideDelay","parent":"series<area>-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<column>-tooltip--hideDelay","fullname":"series<column>.tooltip.hideDelay","title":"hideDelay","parent":"series<column>-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<waterfall>-tooltip--hideDelay","fullname":"series<waterfall>.tooltip.hideDelay","title":"hideDelay","parent":"series<waterfall>-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange-tooltip--hideDelay","fullname":"plotOptions.columnrange.tooltip.hideDelay","title":"hideDelay","parent":"plotOptions-columnrange-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<polygon>-tooltip--hideDelay","fullname":"series<polygon>.tooltip.hideDelay","title":"hideDelay","parent":"series<polygon>-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<line>-tooltip--hideDelay","fullname":"series<line>.tooltip.hideDelay","title":"hideDelay","parent":"series<line>-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<bubble>-tooltip--hideDelay","fullname":"series<bubble>.tooltip.hideDelay","title":"hideDelay","parent":"series<bubble>-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<scatter>-tooltip--hideDelay","fullname":"series<scatter>.tooltip.hideDelay","title":"hideDelay","parent":"series<scatter>-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange-tooltip--hideDelay","fullname":"plotOptions.areasplinerange.tooltip.hideDelay","title":"hideDelay","parent":"plotOptions-areasplinerange-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>-tooltip--hideDelay","fullname":"series<spline>.tooltip.hideDelay","title":"hideDelay","parent":"series<spline>-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<funnel>-tooltip--hideDelay","fullname":"series<funnel>.tooltip.hideDelay","title":"hideDelay","parent":"series<funnel>-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<pyramid>-tooltip--hideDelay","fullname":"series<pyramid>.tooltip.hideDelay","title":"hideDelay","parent":"series<pyramid>-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column-tooltip--hideDelay","fullname":"plotOptions.column.tooltip.hideDelay","title":"hideDelay","parent":"plotOptions-column-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bar-tooltip--hideDelay","fullname":"plotOptions.bar.tooltip.hideDelay","title":"hideDelay","parent":"plotOptions-bar-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-tooltip--hideDelay","fullname":"plotOptions.polygon.tooltip.hideDelay","title":"hideDelay","parent":"plotOptions-polygon-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-series-tooltip--hideDelay","fullname":"plotOptions.series.tooltip.hideDelay","title":"hideDelay","parent":"plotOptions-series-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar-tooltip--hideDelay","fullname":"plotOptions.errorbar.tooltip.hideDelay","title":"hideDelay","parent":"plotOptions-errorbar-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<boxplot>-tooltip--hideDelay","fullname":"series<boxplot>.tooltip.hideDelay","title":"hideDelay","parent":"series<boxplot>-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pie-tooltip--hideDelay","fullname":"plotOptions.pie.tooltip.hideDelay","title":"hideDelay","parent":"plotOptions-pie-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-tooltip--hideDelay","fullname":"plotOptions.spline.tooltip.hideDelay","title":"hideDelay","parent":"plotOptions-spline-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<areaspline>-tooltip--hideDelay","fullname":"series<areaspline>.tooltip.hideDelay","title":"hideDelay","parent":"series<areaspline>-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-tooltip--hideDelay","fullname":"plotOptions.pyramid.tooltip.hideDelay","title":"hideDelay","parent":"plotOptions-pyramid-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall-tooltip--hideDelay","fullname":"plotOptions.waterfall.tooltip.hideDelay","title":"hideDelay","parent":"plotOptions-waterfall-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<arearange>-tooltip--hideDelay","fullname":"series<arearange>.tooltip.hideDelay","title":"hideDelay","parent":"series<arearange>-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble-tooltip--hideDelay","fullname":"plotOptions.bubble.tooltip.hideDelay","title":"hideDelay","parent":"plotOptions-bubble-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap-tooltip--hideDelay","fullname":"plotOptions.heatmap.tooltip.hideDelay","title":"hideDelay","parent":"plotOptions-heatmap-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<heatmap>-tooltip--hideDelay","fullname":"series<heatmap>.tooltip.hideDelay","title":"hideDelay","parent":"series<heatmap>-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge-tooltip--hideDelay","fullname":"plotOptions.gauge.tooltip.hideDelay","title":"hideDelay","parent":"plotOptions-gauge-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<errorbar>-tooltip--hideDelay","fullname":"series<errorbar>.tooltip.hideDelay","title":"hideDelay","parent":"series<errorbar>-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-line-tooltip--hideDelay","fullname":"plotOptions.line.tooltip.hideDelay","title":"hideDelay","parent":"plotOptions-line-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<solidgauge>-tooltip--hideDelay","fullname":"series<solidgauge>.tooltip.hideDelay","title":"hideDelay","parent":"series<solidgauge>-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"tooltip--hideDelay","fullname":"tooltip.hideDelay","title":"hideDelay","parent":"tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter-tooltip--hideDelay","fullname":"plotOptions.scatter.tooltip.hideDelay","title":"hideDelay","parent":"plotOptions-scatter-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<gauge>-tooltip--hideDelay","fullname":"series<gauge>.tooltip.hideDelay","title":"hideDelay","parent":"series<gauge>-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel-tooltip--hideDelay","fullname":"plotOptions.funnel.tooltip.hideDelay","title":"hideDelay","parent":"plotOptions-funnel-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<columnrange>-tooltip--hideDelay","fullname":"series<columnrange>.tooltip.hideDelay","title":"hideDelay","parent":"series<columnrange>-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-tooltip--hideDelay","fullname":"series<areasplinerange>.tooltip.hideDelay","title":"hideDelay","parent":"series<areasplinerange>-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<treemap>-tooltip--hideDelay","fullname":"series<treemap>.tooltip.hideDelay","title":"hideDelay","parent":"series<treemap>-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot-tooltip--hideDelay","fullname":"plotOptions.boxplot.tooltip.hideDelay","title":"hideDelay","parent":"plotOptions-boxplot-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap-tooltip--hideDelay","fullname":"plotOptions.treemap.tooltip.hideDelay","title":"hideDelay","parent":"plotOptions-treemap-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-tooltip--hideDelay","fullname":"plotOptions.areaspline.tooltip.hideDelay","title":"hideDelay","parent":"plotOptions-areaspline-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<pie>-tooltip--hideDelay","fullname":"series<pie>.tooltip.hideDelay","title":"hideDelay","parent":"series<pie>-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-solidgauge-tooltip--hideDelay","fullname":"plotOptions.solidgauge.tooltip.hideDelay","title":"hideDelay","parent":"plotOptions-solidgauge-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange-tooltip--hideDelay","fullname":"plotOptions.arearange.tooltip.hideDelay","title":"hideDelay","parent":"plotOptions-arearange-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<bar>-tooltip--hideDelay","fullname":"series<bar>.tooltip.hideDelay","title":"hideDelay","parent":"series<bar>-tooltip","isParent":false,"returnType":"Number","defaults":"500","values":"","since":"3.0","description":"The number of milliseconds to wait until the tooltip is hidden when mouse out from a point or chart. ","demo":"","seeAlso":"","deprecated":false},{"name":"loading--hideDuration","fullname":"loading.hideDuration","title":"hideDuration","parent":"loading","isParent":false,"returnType":"Number","defaults":"100","since":"1.2.0","description":"The duration in milliseconds of the fade out effect.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/loading/hideduration/\" target=\"_blank\">Fade in and out over a second</a>"},{"name":"series<arearange>-data--high","fullname":"series<arearange>.data.high","title":"high","parent":"series<arearange>-data","isParent":false,"returnType":"Number","description":"The high or maximum value for each data point."},{"name":"series<errorbar>-data--high","fullname":"series<errorbar>.data.high","title":"high","parent":"series<errorbar>-data","isParent":false,"returnType":"Number","description":"The high or maximum value for each data point."},{"name":"series<areasplinerange>-data--high","fullname":"series<areasplinerange>.data.high","title":"high","parent":"series<areasplinerange>-data","isParent":false,"returnType":"Number","description":"The high or maximum value for each data point."},{"name":"series<columnrange>-data--high","fullname":"series<columnrange>.data.high","title":"high","parent":"series<columnrange>-data","isParent":false,"returnType":"Number","description":"The high or maximum value for each data point."},{"name":"series<boxplot>-data--high","fullname":"series<boxplot>.data.high","title":"high","parent":"series<boxplot>-data","isParent":false,"returnType":"Number","description":"The <code>high</code> value for each data point, signifying the highest value in the sample set. The top whisker is drawn here."},{"name":"series<bar>-states-hover","fullname":"series<bar>.states.hover","title":"hover","parent":"series<bar>-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"plotOptions-bar-states-hover","fullname":"plotOptions.bar.states.hover","title":"hover","parent":"plotOptions-bar-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<spline>-states-hover","fullname":"series<spline>.states.hover","title":"hover","parent":"series<spline>-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<area>-states-hover","fullname":"series<area>.states.hover","title":"hover","parent":"series<area>-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"plotOptions-solidgauge-states-hover","fullname":"plotOptions.solidgauge.states.hover","title":"hover","parent":"plotOptions-solidgauge-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<polygon>-marker-states-hover","fullname":"series<polygon>.marker.states.hover","title":"hover","parent":"series<polygon>-marker-states","isParent":true},{"name":"series<area>-marker-states-hover","fullname":"series<area>.marker.states.hover","title":"hover","parent":"series<area>-marker-states","isParent":true},{"name":"plotOptions-areasplinerange-states-hover","fullname":"plotOptions.areasplinerange.states.hover","title":"hover","parent":"plotOptions-areasplinerange-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<areaspline>-marker-states-hover","fullname":"series<areaspline>.marker.states.hover","title":"hover","parent":"series<areaspline>-marker-states","isParent":true},{"name":"series<line>-data-marker-states-hover","fullname":"series<line>.data.marker.states.hover","title":"hover","parent":"series<line>-data-marker-states","isParent":true},{"name":"plotOptions-scatter-states-hover","fullname":"plotOptions.scatter.states.hover","title":"hover","parent":"plotOptions-scatter-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"plotOptions-boxplot-states-hover","fullname":"plotOptions.boxplot.states.hover","title":"hover","parent":"plotOptions-boxplot-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"plotOptions-arearange-states-hover","fullname":"plotOptions.arearange.states.hover","title":"hover","parent":"plotOptions-arearange-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<gauge>-states-hover","fullname":"series<gauge>.states.hover","title":"hover","parent":"series<gauge>-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"plotOptions-area-states-hover","fullname":"plotOptions.area.states.hover","title":"hover","parent":"plotOptions-area-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<spline>-marker-states-hover","fullname":"series<spline>.marker.states.hover","title":"hover","parent":"series<spline>-marker-states","isParent":true},{"name":"series<errorbar>-states-hover","fullname":"series<errorbar>.states.hover","title":"hover","parent":"series<errorbar>-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<line>-states-hover","fullname":"series<line>.states.hover","title":"hover","parent":"series<line>-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<areasplinerange>-states-hover","fullname":"series<areasplinerange>.states.hover","title":"hover","parent":"series<areasplinerange>-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"plotOptions-area-marker-states-hover","fullname":"plotOptions.area.marker.states.hover","title":"hover","parent":"plotOptions-area-marker-states","isParent":true},{"name":"plotOptions-line-marker-states-hover","fullname":"plotOptions.line.marker.states.hover","title":"hover","parent":"plotOptions-line-marker-states","isParent":true},{"name":"plotOptions-bubble-states-hover","fullname":"plotOptions.bubble.states.hover","title":"hover","parent":"plotOptions-bubble-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<polygon>-states-hover","fullname":"series<polygon>.states.hover","title":"hover","parent":"series<polygon>-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<column>-states-hover","fullname":"series<column>.states.hover","title":"hover","parent":"series<column>-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<boxplot>-states-hover","fullname":"series<boxplot>.states.hover","title":"hover","parent":"series<boxplot>-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<area>-data-marker-states-hover","fullname":"series<area>.data.marker.states.hover","title":"hover","parent":"series<area>-data-marker-states","isParent":true},{"name":"plotOptions-waterfall-states-hover","fullname":"plotOptions.waterfall.states.hover","title":"hover","parent":"plotOptions-waterfall-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<spline>-data-marker-states-hover","fullname":"series<spline>.data.marker.states.hover","title":"hover","parent":"series<spline>-data-marker-states","isParent":true},{"name":"series<bubble>-marker-states-hover","fullname":"series<bubble>.marker.states.hover","title":"hover","parent":"series<bubble>-marker-states","isParent":true},{"name":"plotOptions-areaspline-marker-states-hover","fullname":"plotOptions.areaspline.marker.states.hover","title":"hover","parent":"plotOptions-areaspline-marker-states","isParent":true},{"name":"plotOptions-series-states-hover","fullname":"plotOptions.series.states.hover","title":"hover","parent":"plotOptions-series-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"plotOptions-treemap-states-hover","fullname":"plotOptions.treemap.states.hover","title":"hover","parent":"plotOptions-treemap-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<scatter>-marker-states-hover","fullname":"series<scatter>.marker.states.hover","title":"hover","parent":"series<scatter>-marker-states","isParent":true},{"name":"series<pie>-states-hover","fullname":"series<pie>.states.hover","title":"hover","parent":"series<pie>-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<waterfall>-states-hover","fullname":"series<waterfall>.states.hover","title":"hover","parent":"series<waterfall>-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"plotOptions-funnel-states-hover","fullname":"plotOptions.funnel.states.hover","title":"hover","parent":"plotOptions-funnel-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<pyramid>-states-hover","fullname":"series<pyramid>.states.hover","title":"hover","parent":"series<pyramid>-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<scatter>-data-marker-states-hover","fullname":"series<scatter>.data.marker.states.hover","title":"hover","parent":"series<scatter>-data-marker-states","isParent":true},{"name":"plotOptions-scatter-marker-states-hover","fullname":"plotOptions.scatter.marker.states.hover","title":"hover","parent":"plotOptions-scatter-marker-states","isParent":true},{"name":"plotOptions-spline-states-hover","fullname":"plotOptions.spline.states.hover","title":"hover","parent":"plotOptions-spline-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<columnrange>-states-hover","fullname":"series<columnrange>.states.hover","title":"hover","parent":"series<columnrange>-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"plotOptions-polygon-marker-states-hover","fullname":"plotOptions.polygon.marker.states.hover","title":"hover","parent":"plotOptions-polygon-marker-states","isParent":true},{"name":"plotOptions-areaspline-states-hover","fullname":"plotOptions.areaspline.states.hover","title":"hover","parent":"plotOptions-areaspline-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<areaspline>-data-marker-states-hover","fullname":"series<areaspline>.data.marker.states.hover","title":"hover","parent":"series<areaspline>-data-marker-states","isParent":true},{"name":"plotOptions-pie-states-hover","fullname":"plotOptions.pie.states.hover","title":"hover","parent":"plotOptions-pie-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"plotOptions-bubble-marker-states-hover","fullname":"plotOptions.bubble.marker.states.hover","title":"hover","parent":"plotOptions-bubble-marker-states","isParent":true},{"name":"plotOptions-heatmap-states-hover","fullname":"plotOptions.heatmap.states.hover","title":"hover","parent":"plotOptions-heatmap-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<scatter>-states-hover","fullname":"series<scatter>.states.hover","title":"hover","parent":"series<scatter>-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<heatmap>-states-hover","fullname":"series<heatmap>.states.hover","title":"hover","parent":"series<heatmap>-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"plotOptions-line-states-hover","fullname":"plotOptions.line.states.hover","title":"hover","parent":"plotOptions-line-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<bubble>-states-hover","fullname":"series<bubble>.states.hover","title":"hover","parent":"series<bubble>-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"plotOptions-spline-marker-states-hover","fullname":"plotOptions.spline.marker.states.hover","title":"hover","parent":"plotOptions-spline-marker-states","isParent":true},{"name":"series<areaspline>-states-hover","fullname":"series<areaspline>.states.hover","title":"hover","parent":"series<areaspline>-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"plotOptions-columnrange-states-hover","fullname":"plotOptions.columnrange.states.hover","title":"hover","parent":"plotOptions-columnrange-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<funnel>-states-hover","fullname":"series<funnel>.states.hover","title":"hover","parent":"series<funnel>-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"plotOptions-series-marker-states-hover","fullname":"plotOptions.series.marker.states.hover","title":"hover","parent":"plotOptions-series-marker-states","isParent":true},{"name":"plotOptions-gauge-states-hover","fullname":"plotOptions.gauge.states.hover","title":"hover","parent":"plotOptions-gauge-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<polygon>-data-marker-states-hover","fullname":"series<polygon>.data.marker.states.hover","title":"hover","parent":"series<polygon>-data-marker-states","isParent":true},{"name":"series<treemap>-states-hover","fullname":"series<treemap>.states.hover","title":"hover","parent":"series<treemap>-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"plotOptions-errorbar-states-hover","fullname":"plotOptions.errorbar.states.hover","title":"hover","parent":"plotOptions-errorbar-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"plotOptions-column-states-hover","fullname":"plotOptions.column.states.hover","title":"hover","parent":"plotOptions-column-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<line>-marker-states-hover","fullname":"series<line>.marker.states.hover","title":"hover","parent":"series<line>-marker-states","isParent":true},{"name":"plotOptions-polygon-states-hover","fullname":"plotOptions.polygon.states.hover","title":"hover","parent":"plotOptions-polygon-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<solidgauge>-states-hover","fullname":"series<solidgauge>.states.hover","title":"hover","parent":"series<solidgauge>-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"plotOptions-pyramid-states-hover","fullname":"plotOptions.pyramid.states.hover","title":"hover","parent":"plotOptions-pyramid-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"series<arearange>-states-hover","fullname":"series<arearange>.states.hover","title":"hover","parent":"series<arearange>-states","isParent":true,"description":"Options for the hovered series","deprecated":false},{"name":"credits--href","fullname":"credits.href","title":"href","parent":"credits","isParent":false,"returnType":"String","defaults":"http://www.highcharts.com","description":"The URL for the credits label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/credits/href/\" target=\"_blank\">Custom URL and text</a>"},{"name":"labels-items--html","fullname":"labels.items.html","title":"html","parent":"labels-items","isParent":false,"returnType":"String","description":"Inner HTML or text for the label."},{"name":"series<arearange>-data--id","fullname":"series<arearange>.data.id","title":"id","parent":"series<arearange>-data","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the point. This can be used after render time to get a pointer to the point object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/id/\" target=\"_blank\">Remove an id'd point</a>"},{"name":"series<areasplinerange>-data--id","fullname":"series<areasplinerange>.data.id","title":"id","parent":"series<areasplinerange>-data","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the point. This can be used after render time to get a pointer to the point object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/id/\" target=\"_blank\">Remove an id'd point</a>"},{"name":"series<pyramid>-data--id","fullname":"series<pyramid>.data.id","title":"id","parent":"series<pyramid>-data","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the point. This can be used after render time to get a pointer to the point object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/id/\" target=\"_blank\">Remove an id'd point</a>"},{"name":"series<areaspline>-data--id","fullname":"series<areaspline>.data.id","title":"id","parent":"series<areaspline>-data","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the point. This can be used after render time to get a pointer to the point object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/id/\" target=\"_blank\">Remove an id'd point</a>"},{"name":"xAxis-plotBands--id","fullname":"xAxis.plotBands.id","title":"id","parent":"xAxis-plotBands","isParent":false,"returnType":"String","description":"An id used for identifying the plot band in Axis.removePlotBand.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-id/\" target=\"_blank\">Remove plot band by id</a>"},{"name":"series<column>-data--id","fullname":"series<column>.data.id","title":"id","parent":"series<column>-data","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the point. This can be used after render time to get a pointer to the point object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/id/\" target=\"_blank\">Remove an id'd point</a>"},{"name":"series<polygon>--id","fullname":"series<polygon>.id","title":"id","parent":"series<polygon>","isParent":false,"returnType":"String","defaults":"","values":"","since":"1.2.0","description":"An id for the series. This can be used after render time to get a pointer to the series object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","seeAlso":"","deprecated":false},{"name":"series<pie>--id","fullname":"series<pie>.id","title":"id","parent":"series<pie>","isParent":false,"returnType":"String","defaults":"","values":"","since":"1.2.0","description":"An id for the series. This can be used after render time to get a pointer to the series object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","seeAlso":"","deprecated":false},{"name":"series<bar>--id","fullname":"series<bar>.id","title":"id","parent":"series<bar>","isParent":false,"returnType":"String","defaults":"","values":"","since":"1.2.0","description":"An id for the series. This can be used after render time to get a pointer to the series object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","seeAlso":"","deprecated":false},{"name":"series<errorbar>-data--id","fullname":"series<errorbar>.data.id","title":"id","parent":"series<errorbar>-data","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the point. This can be used after render time to get a pointer to the point object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/id/\" target=\"_blank\">Remove an id'd point</a>"},{"name":"series<boxplot>-data--id","fullname":"series<boxplot>.data.id","title":"id","parent":"series<boxplot>-data","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the point. This can be used after render time to get a pointer to the point object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/id/\" target=\"_blank\">Remove an id'd point</a>"},{"name":"series<column>--id","fullname":"series<column>.id","title":"id","parent":"series<column>","isParent":false,"returnType":"String","defaults":"","values":"","since":"1.2.0","description":"An id for the series. This can be used after render time to get a pointer to the series object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","seeAlso":"","deprecated":false},{"name":"series<line>-data--id","fullname":"series<line>.data.id","title":"id","parent":"series<line>-data","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the point. This can be used after render time to get a pointer to the point object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/id/\" target=\"_blank\">Remove an id'd point</a>"},{"name":"series<bar>-data--id","fullname":"series<bar>.data.id","title":"id","parent":"series<bar>-data","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the point. This can be used after render time to get a pointer to the point object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/id/\" target=\"_blank\">Remove an id'd point</a>"},{"name":"series<gauge>--id","fullname":"series<gauge>.id","title":"id","parent":"series<gauge>","isParent":false,"returnType":"String","defaults":"","values":"","since":"1.2.0","description":"An id for the series. This can be used after render time to get a pointer to the series object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","seeAlso":"","deprecated":false},{"name":"series<solidgauge>-data--id","fullname":"series<solidgauge>.data.id","title":"id","parent":"series<solidgauge>-data","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the point. This can be used after render time to get a pointer to the point object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/id/\" target=\"_blank\">Remove an id'd point</a>"},{"name":"series<bubble>-data--id","fullname":"series<bubble>.data.id","title":"id","parent":"series<bubble>-data","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the point. This can be used after render time to get a pointer to the point object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/id/\" target=\"_blank\">Remove an id'd point</a>"},{"name":"xAxis--id","fullname":"xAxis.id","title":"id","parent":"xAxis","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the axis. This can be used after render time to get a pointer to the axis object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/id/\" target=\"_blank\">Get the object</a>"},{"name":"series<spline>-data--id","fullname":"series<spline>.data.id","title":"id","parent":"series<spline>-data","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the point. This can be used after render time to get a pointer to the point object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/id/\" target=\"_blank\">Remove an id'd point</a>"},{"name":"series<columnrange>--id","fullname":"series<columnrange>.id","title":"id","parent":"series<columnrange>","isParent":false,"returnType":"String","defaults":"","values":"","since":"1.2.0","description":"An id for the series. This can be used after render time to get a pointer to the series object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","seeAlso":"","deprecated":false},{"name":"series<columnrange>-data--id","fullname":"series<columnrange>.data.id","title":"id","parent":"series<columnrange>-data","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the point. This can be used after render time to get a pointer to the point object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/id/\" target=\"_blank\">Remove an id'd point</a>"},{"name":"series<solidgauge>--id","fullname":"series<solidgauge>.id","title":"id","parent":"series<solidgauge>","isParent":false,"returnType":"String","defaults":"","values":"","since":"1.2.0","description":"An id for the series. This can be used after render time to get a pointer to the series object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","seeAlso":"","deprecated":false},{"name":"series<pie>-data--id","fullname":"series<pie>.data.id","title":"id","parent":"series<pie>-data","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the point. This can be used after render time to get a pointer to the point object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/id/\" target=\"_blank\">Remove an id'd point</a>"},{"name":"xAxis-plotLines--id","fullname":"xAxis.plotLines.id","title":"id","parent":"xAxis-plotLines","isParent":false,"returnType":"String","description":"An id used for identifying the plot line in Axis.removePlotLine.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-id/\" target=\"_blank\">Remove plot line by id</a>"},{"name":"series<errorbar>--id","fullname":"series<errorbar>.id","title":"id","parent":"series<errorbar>","isParent":false,"returnType":"String","defaults":"","values":"","since":"1.2.0","description":"An id for the series. This can be used after render time to get a pointer to the series object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","seeAlso":"","deprecated":false},{"name":"series<waterfall>-data--id","fullname":"series<waterfall>.data.id","title":"id","parent":"series<waterfall>-data","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the point. This can be used after render time to get a pointer to the point object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/id/\" target=\"_blank\">Remove an id'd point</a>"},{"name":"series<scatter>--id","fullname":"series<scatter>.id","title":"id","parent":"series<scatter>","isParent":false,"returnType":"String","defaults":"","values":"","since":"1.2.0","description":"An id for the series. This can be used after render time to get a pointer to the series object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","seeAlso":"","deprecated":false},{"name":"series<heatmap>-data--id","fullname":"series<heatmap>.data.id","title":"id","parent":"series<heatmap>-data","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the point. This can be used after render time to get a pointer to the point object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/id/\" target=\"_blank\">Remove an id'd point</a>"},{"name":"series<gauge>-data--id","fullname":"series<gauge>.data.id","title":"id","parent":"series<gauge>-data","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the point. This can be used after render time to get a pointer to the point object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/id/\" target=\"_blank\">Remove an id'd point</a>"},{"name":"series<area>--id","fullname":"series<area>.id","title":"id","parent":"series<area>","isParent":false,"returnType":"String","defaults":"","values":"","since":"1.2.0","description":"An id for the series. This can be used after render time to get a pointer to the series object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","seeAlso":"","deprecated":false},{"name":"series<spline>--id","fullname":"series<spline>.id","title":"id","parent":"series<spline>","isParent":false,"returnType":"String","defaults":"","values":"","since":"1.2.0","description":"An id for the series. This can be used after render time to get a pointer to the series object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","seeAlso":"","deprecated":false},{"name":"series<treemap>--id","fullname":"series<treemap>.id","title":"id","parent":"series<treemap>","isParent":false,"returnType":"String","defaults":"","values":"","since":"1.2.0","description":"An id for the series. This can be used after render time to get a pointer to the series object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","seeAlso":"","deprecated":false},{"name":"series<pyramid>--id","fullname":"series<pyramid>.id","title":"id","parent":"series<pyramid>","isParent":false,"returnType":"String","defaults":"","values":"","since":"1.2.0","description":"An id for the series. This can be used after render time to get a pointer to the series object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","seeAlso":"","deprecated":false},{"name":"series<areaspline>--id","fullname":"series<areaspline>.id","title":"id","parent":"series<areaspline>","isParent":false,"returnType":"String","defaults":"","values":"","since":"1.2.0","description":"An id for the series. This can be used after render time to get a pointer to the series object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","seeAlso":"","deprecated":false},{"name":"series<bubble>--id","fullname":"series<bubble>.id","title":"id","parent":"series<bubble>","isParent":false,"returnType":"String","defaults":"","values":"","since":"1.2.0","description":"An id for the series. This can be used after render time to get a pointer to the series object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","seeAlso":"","deprecated":false},{"name":"series<heatmap>--id","fullname":"series<heatmap>.id","title":"id","parent":"series<heatmap>","isParent":false,"returnType":"String","defaults":"","values":"","since":"1.2.0","description":"An id for the series. This can be used after render time to get a pointer to the series object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","seeAlso":"","deprecated":false},{"name":"yAxis--id","fullname":"yAxis.id","title":"id","parent":"yAxis","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the axis. This can be used after render time to get a pointer to the axis object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/id/\" target=\"_blank\">Get the object</a>"},{"name":"series<area>-data--id","fullname":"series<area>.data.id","title":"id","parent":"series<area>-data","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the point. This can be used after render time to get a pointer to the point object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/id/\" target=\"_blank\">Remove an id'd point</a>"},{"name":"series--id","fullname":"series.id","title":"id","parent":"series","isParent":false,"returnType":"String","defaults":"","values":"","since":"1.2.0","description":"An id for the series. This can be used after render time to get a pointer to the series object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","seeAlso":"","deprecated":false},{"name":"series<scatter>-data--id","fullname":"series<scatter>.data.id","title":"id","parent":"series<scatter>-data","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the point. This can be used after render time to get a pointer to the point object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/id/\" target=\"_blank\">Remove an id'd point</a>"},{"name":"series<boxplot>--id","fullname":"series<boxplot>.id","title":"id","parent":"series<boxplot>","isParent":false,"returnType":"String","defaults":"","values":"","since":"1.2.0","description":"An id for the series. This can be used after render time to get a pointer to the series object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","seeAlso":"","deprecated":false},{"name":"series<waterfall>--id","fullname":"series<waterfall>.id","title":"id","parent":"series<waterfall>","isParent":false,"returnType":"String","defaults":"","values":"","since":"1.2.0","description":"An id for the series. This can be used after render time to get a pointer to the series object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","seeAlso":"","deprecated":false},{"name":"series<line>--id","fullname":"series<line>.id","title":"id","parent":"series<line>","isParent":false,"returnType":"String","defaults":"","values":"","since":"1.2.0","description":"An id for the series. This can be used after render time to get a pointer to the series object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>--id","fullname":"series<areasplinerange>.id","title":"id","parent":"series<areasplinerange>","isParent":false,"returnType":"String","defaults":"","values":"","since":"1.2.0","description":"An id for the series. This can be used after render time to get a pointer to the series object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","seeAlso":"","deprecated":false},{"name":"series<arearange>--id","fullname":"series<arearange>.id","title":"id","parent":"series<arearange>","isParent":false,"returnType":"String","defaults":"","values":"","since":"1.2.0","description":"An id for the series. This can be used after render time to get a pointer to the series object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","seeAlso":"","deprecated":false},{"name":"series<funnel>-data--id","fullname":"series<funnel>.data.id","title":"id","parent":"series<funnel>-data","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the point. This can be used after render time to get a pointer to the point object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/id/\" target=\"_blank\">Remove an id'd point</a>"},{"name":"yAxis-plotLines--id","fullname":"yAxis.plotLines.id","title":"id","parent":"yAxis-plotLines","isParent":false,"returnType":"String","description":"An id used for identifying the plot line in Axis.removePlotLine.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-id/\" target=\"_blank\">Remove plot line by id</a>"},{"name":"series<treemap>-data--id","fullname":"series<treemap>.data.id","title":"id","parent":"series<treemap>-data","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the point. This can be used after render time to get a pointer to the point object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/id/\" target=\"_blank\">Remove an id'd point</a>"},{"name":"yAxis-plotBands--id","fullname":"yAxis.plotBands.id","title":"id","parent":"yAxis-plotBands","isParent":false,"returnType":"String","description":"An id used for identifying the plot band in Axis.removePlotBand.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-id/\" target=\"_blank\">Remove plot band by id</a>"},{"name":"series<funnel>--id","fullname":"series<funnel>.id","title":"id","parent":"series<funnel>","isParent":false,"returnType":"String","defaults":"","values":"","since":"1.2.0","description":"An id for the series. This can be used after render time to get a pointer to the series object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-id/\" target=\"_blank\">Get series by id</a>","seeAlso":"","deprecated":false},{"name":"series<polygon>-data--id","fullname":"series<polygon>.data.id","title":"id","parent":"series<polygon>-data","isParent":false,"returnType":"String","since":"1.2.0","description":"An id for the point. This can be used after render time to get a pointer to the point object through <code>chart.get()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/id/\" target=\"_blank\">Remove an id'd point</a>"},{"name":"plotOptions-pie--ignoreHiddenPoint","fullname":"plotOptions.pie.ignoreHiddenPoint","title":"ignoreHiddenPoint","parent":"plotOptions-pie","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"<p>Equivalent to <a href=\"#chart.ignoreHiddenSeries\">chart.ignoreHiddenSeries</a>, this option tells whether the series shall be redrawn as if the hidden point were <code>null</code>.</p>\r\n<p>The default value changed from <code>false</code> to <code>true</code> with Highcharts 3.0.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-ignorehiddenpoint/\" target=\"_blank\">True, the hiddden point is ignored</a>","seeAlso":"","deprecated":false},{"name":"series<pie>--ignoreHiddenPoint","fullname":"series<pie>.ignoreHiddenPoint","title":"ignoreHiddenPoint","parent":"series<pie>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"<p>Equivalent to <a href=\"#chart.ignoreHiddenSeries\">chart.ignoreHiddenSeries</a>, this option tells whether the series shall be redrawn as if the hidden point were <code>null</code>.</p>\r\n<p>The default value changed from <code>false</code> to <code>true</code> with Highcharts 3.0.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-ignorehiddenpoint/\" target=\"_blank\">True, the hiddden point is ignored</a>","seeAlso":"","deprecated":false},{"name":"chart--ignoreHiddenSeries","fullname":"chart.ignoreHiddenSeries","title":"ignoreHiddenSeries","parent":"chart","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2.0","description":"If true, the axes will scale to the remaining visible series once one series is hidden. If false, hiding and showing a series will not affect the axes or the other series. For stacks, once one series within the stack is hidden, the rest of the stack will close in around it even if the axis is not affected.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/ignorehiddenseries-true/\" target=\"_blank\">True by default</a>\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/ignorehiddenseries-false/\" target=\"_blank\">false</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/ignorehiddenseries-true-stacked/\" target=\"_blank\">true with stack</a>"},{"name":"legend-navigation--inactiveColor","fullname":"legend.navigation.inactiveColor","title":"inactiveColor","parent":"legend-navigation","isParent":false,"returnType":"Color","defaults":"#CCC","since":"2.2.4","description":"The color of the inactive up or down arrow in the legend page navigation.  .","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/navigation/\" target=\"_blank\">\n\t\t\t\tLegend page navigation demonstrated</a>"},{"name":"series<areasplinerange>--index","fullname":"series<areasplinerange>.index","title":"index","parent":"series<areasplinerange>","isParent":false,"returnType":"Number","since":"2.3.0","description":"The index of the series in the chart, affecting the internal index in the <code>chart.series</code> array, the visible Z index as well as the order in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series<arearange>--index","fullname":"series<arearange>.index","title":"index","parent":"series<arearange>","isParent":false,"returnType":"Number","since":"2.3.0","description":"The index of the series in the chart, affecting the internal index in the <code>chart.series</code> array, the visible Z index as well as the order in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series<columnrange>--index","fullname":"series<columnrange>.index","title":"index","parent":"series<columnrange>","isParent":false,"returnType":"Number","since":"2.3.0","description":"The index of the series in the chart, affecting the internal index in the <code>chart.series</code> array, the visible Z index as well as the order in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series<column>--index","fullname":"series<column>.index","title":"index","parent":"series<column>","isParent":false,"returnType":"Number","since":"2.3.0","description":"The index of the series in the chart, affecting the internal index in the <code>chart.series</code> array, the visible Z index as well as the order in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series<gauge>--index","fullname":"series<gauge>.index","title":"index","parent":"series<gauge>","isParent":false,"returnType":"Number","since":"2.3.0","description":"The index of the series in the chart, affecting the internal index in the <code>chart.series</code> array, the visible Z index as well as the order in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pyramid>--index","fullname":"series<pyramid>.index","title":"index","parent":"series<pyramid>","isParent":false,"returnType":"Number","since":"2.3.0","description":"The index of the series in the chart, affecting the internal index in the <code>chart.series</code> array, the visible Z index as well as the order in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pie>--index","fullname":"series<pie>.index","title":"index","parent":"series<pie>","isParent":false,"returnType":"Number","since":"2.3.0","description":"The index of the series in the chart, affecting the internal index in the <code>chart.series</code> array, the visible Z index as well as the order in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series<funnel>--index","fullname":"series<funnel>.index","title":"index","parent":"series<funnel>","isParent":false,"returnType":"Number","since":"2.3.0","description":"The index of the series in the chart, affecting the internal index in the <code>chart.series</code> array, the visible Z index as well as the order in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series<boxplot>--index","fullname":"series<boxplot>.index","title":"index","parent":"series<boxplot>","isParent":false,"returnType":"Number","since":"2.3.0","description":"The index of the series in the chart, affecting the internal index in the <code>chart.series</code> array, the visible Z index as well as the order in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series--index","fullname":"series.index","title":"index","parent":"series","isParent":false,"returnType":"Number","since":"2.3.0","description":"The index of the series in the chart, affecting the internal index in the <code>chart.series</code> array, the visible Z index as well as the order in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>--index","fullname":"series<spline>.index","title":"index","parent":"series<spline>","isParent":false,"returnType":"Number","since":"2.3.0","description":"The index of the series in the chart, affecting the internal index in the <code>chart.series</code> array, the visible Z index as well as the order in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bar>--index","fullname":"series<bar>.index","title":"index","parent":"series<bar>","isParent":false,"returnType":"Number","since":"2.3.0","description":"The index of the series in the chart, affecting the internal index in the <code>chart.series</code> array, the visible Z index as well as the order in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series<solidgauge>--index","fullname":"series<solidgauge>.index","title":"index","parent":"series<solidgauge>","isParent":false,"returnType":"Number","since":"2.3.0","description":"The index of the series in the chart, affecting the internal index in the <code>chart.series</code> array, the visible Z index as well as the order in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series<scatter>--index","fullname":"series<scatter>.index","title":"index","parent":"series<scatter>","isParent":false,"returnType":"Number","since":"2.3.0","description":"The index of the series in the chart, affecting the internal index in the <code>chart.series</code> array, the visible Z index as well as the order in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series<line>--index","fullname":"series<line>.index","title":"index","parent":"series<line>","isParent":false,"returnType":"Number","since":"2.3.0","description":"The index of the series in the chart, affecting the internal index in the <code>chart.series</code> array, the visible Z index as well as the order in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series<polygon>--index","fullname":"series<polygon>.index","title":"index","parent":"series<polygon>","isParent":false,"returnType":"Number","since":"2.3.0","description":"The index of the series in the chart, affecting the internal index in the <code>chart.series</code> array, the visible Z index as well as the order in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bubble>--index","fullname":"series<bubble>.index","title":"index","parent":"series<bubble>","isParent":false,"returnType":"Number","since":"2.3.0","description":"The index of the series in the chart, affecting the internal index in the <code>chart.series</code> array, the visible Z index as well as the order in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series<waterfall>--index","fullname":"series<waterfall>.index","title":"index","parent":"series<waterfall>","isParent":false,"returnType":"Number","since":"2.3.0","description":"The index of the series in the chart, affecting the internal index in the <code>chart.series</code> array, the visible Z index as well as the order in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series<heatmap>--index","fullname":"series<heatmap>.index","title":"index","parent":"series<heatmap>","isParent":false,"returnType":"Number","since":"2.3.0","description":"The index of the series in the chart, affecting the internal index in the <code>chart.series</code> array, the visible Z index as well as the order in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series<errorbar>--index","fullname":"series<errorbar>.index","title":"index","parent":"series<errorbar>","isParent":false,"returnType":"Number","since":"2.3.0","description":"The index of the series in the chart, affecting the internal index in the <code>chart.series</code> array, the visible Z index as well as the order in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series<area>--index","fullname":"series<area>.index","title":"index","parent":"series<area>","isParent":false,"returnType":"Number","since":"2.3.0","description":"The index of the series in the chart, affecting the internal index in the <code>chart.series</code> array, the visible Z index as well as the order in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series<treemap>--index","fullname":"series<treemap>.index","title":"index","parent":"series<treemap>","isParent":false,"returnType":"Number","since":"2.3.0","description":"The index of the series in the chart, affecting the internal index in the <code>chart.series</code> array, the visible Z index as well as the order in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areaspline>--index","fullname":"series<areaspline>.index","title":"index","parent":"series<areaspline>","isParent":false,"returnType":"Number","since":"2.3.0","description":"The index of the series in the chart, affecting the internal index in the <code>chart.series</code> array, the visible Z index as well as the order in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series<solidgauge>-data--innerRadius","fullname":"series<solidgauge>.data.innerRadius","title":"innerRadius","parent":"series<solidgauge>-data","isParent":false,"returnType":"Number|String","context":"","defaults":"","values":"","since":"4.1.6","description":"The inner radius of an individual point in a solid gauge. Can be given as a number (pixels) or percentage string.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/solidgauge-radius/\" target=\"_blank\">Individual radius and innerRadius</a>","seeAlso":"","deprecated":false},{"name":"yAxis-plotBands--innerRadius","fullname":"yAxis.plotBands.innerRadius","title":"innerRadius","parent":"yAxis-plotBands","isParent":false,"returnType":"Number|String","defaults":"null","since":"2.3","description":"In a gauge chart, this option determines the inner radius of the plot band that stretches along the perimeter. It can be given as a percentage string, like <code>\"100%\"</code>, or as a pixel number, like <code>100</code>. By default, the inner radius is controlled by the <a href=\"#yAxis.plotBands.thickness\">thickness</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-gauge\" target=\"_blank\">Gauge plot band</a>","deprecated":false},{"name":"series<pie>--innerSize","fullname":"series<pie>.innerSize","title":"innerSize","parent":"series<pie>","isParent":false,"returnType":"String|Number","defaults":"0","since":"2.0","description":"<p>The size of the inner diameter for the pie. A size greater than 0 renders a donut chart. Can be a percentage or pixel value. Percentages are relative to the pie size. Pixel values are given as integers.</p>\r\n\r\n<p>Note: in Highcharts < 4.1.2, the percentage was relative to the plot area, not the pie size.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-innersize-80px/\" target=\"_blank\">80px inner size</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-innersize-50percent/\" target=\"_blank\">50% of the plot area</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/3d-pie-donut/\" target=\"_blank\">3D donut</a>.","deprecated":false},{"name":"plotOptions-pie--innerSize","fullname":"plotOptions.pie.innerSize","title":"innerSize","parent":"plotOptions-pie","isParent":false,"returnType":"String|Number","defaults":"0","since":"2.0","description":"<p>The size of the inner diameter for the pie. A size greater than 0 renders a donut chart. Can be a percentage or pixel value. Percentages are relative to the pie size. Pixel values are given as integers.</p>\r\n\r\n<p>Note: in Highcharts < 4.1.2, the percentage was relative to the plot area, not the pie size.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-innersize-80px/\" target=\"_blank\">80px inner size</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-innersize-50percent/\" target=\"_blank\">50% of the plot area</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/3d-pie-donut/\" target=\"_blank\">3D donut</a>.","deprecated":false},{"name":"plotOptions-solidgauge-dataLabels--inside","fullname":"plotOptions.solidgauge.dataLabels.inside","title":"inside","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"series<solidgauge>-dataLabels--inside","fullname":"series<solidgauge>.dataLabels.inside","title":"inside","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"series<funnel>-dataLabels--inside","fullname":"series<funnel>.dataLabels.inside","title":"inside","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"series<column>-dataLabels--inside","fullname":"series<column>.dataLabels.inside","title":"inside","parent":"series<column>-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"series<polygon>-dataLabels--inside","fullname":"series<polygon>.dataLabels.inside","title":"inside","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"series<bubble>-dataLabels--inside","fullname":"series<bubble>.dataLabels.inside","title":"inside","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"plotOptions-bar-dataLabels--inside","fullname":"plotOptions.bar.dataLabels.inside","title":"inside","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"plotOptions-gauge-dataLabels--inside","fullname":"plotOptions.gauge.dataLabels.inside","title":"inside","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"plotOptions-spline-dataLabels--inside","fullname":"plotOptions.spline.dataLabels.inside","title":"inside","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"series<gauge>-dataLabels--inside","fullname":"series<gauge>.dataLabels.inside","title":"inside","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"plotOptions-areaspline-dataLabels--inside","fullname":"plotOptions.areaspline.dataLabels.inside","title":"inside","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"plotOptions-bubble-dataLabels--inside","fullname":"plotOptions.bubble.dataLabels.inside","title":"inside","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"series<pyramid>-dataLabels--inside","fullname":"series<pyramid>.dataLabels.inside","title":"inside","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"series<spline>-dataLabels--inside","fullname":"series<spline>.dataLabels.inside","title":"inside","parent":"series<spline>-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"plotOptions-pyramid-dataLabels--inside","fullname":"plotOptions.pyramid.dataLabels.inside","title":"inside","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"series<areaspline>-dataLabels--inside","fullname":"series<areaspline>.dataLabels.inside","title":"inside","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"series<treemap>-dataLabels--inside","fullname":"series<treemap>.dataLabels.inside","title":"inside","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"Boolean","context":"","defaults":"true","values":"","since":"4.1.0","description":"Whether to align the data label inside the box or to the actual value point. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<pie>-dataLabels--inside","fullname":"series<pie>.dataLabels.inside","title":"inside","parent":"series<pie>-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"plotOptions-funnel-dataLabels--inside","fullname":"plotOptions.funnel.dataLabels.inside","title":"inside","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"plotOptions-polygon-dataLabels--inside","fullname":"plotOptions.polygon.dataLabels.inside","title":"inside","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"plotOptions-arearange-dataLabels--inside","fullname":"plotOptions.arearange.dataLabels.inside","title":"inside","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"series<area>-dataLabels--inside","fullname":"series<area>.dataLabels.inside","title":"inside","parent":"series<area>-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels--inside","fullname":"plotOptions.areasplinerange.dataLabels.inside","title":"inside","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"series<heatmap>-dataLabels--inside","fullname":"series<heatmap>.dataLabels.inside","title":"inside","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"series<scatter>-dataLabels--inside","fullname":"series<scatter>.dataLabels.inside","title":"inside","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"series<line>-dataLabels--inside","fullname":"series<line>.dataLabels.inside","title":"inside","parent":"series<line>-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"series<columnrange>-dataLabels--inside","fullname":"series<columnrange>.dataLabels.inside","title":"inside","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"plotOptions-pie-dataLabels--inside","fullname":"plotOptions.pie.dataLabels.inside","title":"inside","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"plotOptions-waterfall-dataLabels--inside","fullname":"plotOptions.waterfall.dataLabels.inside","title":"inside","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"plotOptions-heatmap-dataLabels--inside","fullname":"plotOptions.heatmap.dataLabels.inside","title":"inside","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"plotOptions-column-dataLabels--inside","fullname":"plotOptions.column.dataLabels.inside","title":"inside","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"series<bar>-dataLabels--inside","fullname":"series<bar>.dataLabels.inside","title":"inside","parent":"series<bar>-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"plotOptions-series-dataLabels--inside","fullname":"plotOptions.series.dataLabels.inside","title":"inside","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"plotOptions-line-dataLabels--inside","fullname":"plotOptions.line.dataLabels.inside","title":"inside","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"series<waterfall>-dataLabels--inside","fullname":"series<waterfall>.dataLabels.inside","title":"inside","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"plotOptions-scatter-dataLabels--inside","fullname":"plotOptions.scatter.dataLabels.inside","title":"inside","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"series<arearange>-dataLabels--inside","fullname":"series<arearange>.dataLabels.inside","title":"inside","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"plotOptions-treemap-dataLabels--inside","fullname":"plotOptions.treemap.dataLabels.inside","title":"inside","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"Boolean","context":"","defaults":"true","values":"","since":"4.1.0","description":"Whether to align the data label inside the box or to the actual value point. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange-dataLabels--inside","fullname":"plotOptions.columnrange.dataLabels.inside","title":"inside","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"series<areasplinerange>-dataLabels--inside","fullname":"series<areasplinerange>.dataLabels.inside","title":"inside","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"plotOptions-area-dataLabels--inside","fullname":"plotOptions.area.dataLabels.inside","title":"inside","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"Boolean","since":"3.0","description":"For points with an extent, like columns, whether to align the data label inside the box or to the actual value point. Defaults to <code>false</code> in most cases, <code>true</code> in stacked columns.","deprecated":false},{"name":"series<treemap>--interactByLeaf","fullname":"series<treemap>.interactByLeaf","title":"interactByLeaf","parent":"series<treemap>","isParent":false,"returnType":"Boolean","values":"false, true","since":"4.1.2","description":"This option decides if the user can interact with the parent nodes or just the leaf nodes. When this option is undefined, it will be true by default. However when allowDrillToNode is true, then it will be false by default.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/treemap-interactbyleaf-false/\" target=\"_blank\">false</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/treemap-interactbyleaf-true-and-allowdrilltonode/\" target=\"_blank\">interactByLeaf and allowDrillToNode is true</a>","deprecated":false},{"name":"plotOptions-treemap--interactByLeaf","fullname":"plotOptions.treemap.interactByLeaf","title":"interactByLeaf","parent":"plotOptions-treemap","isParent":false,"returnType":"Boolean","values":"false, true","since":"4.1.2","description":"This option decides if the user can interact with the parent nodes or just the leaf nodes. When this option is undefined, it will be true by default. However when allowDrillToNode is true, then it will be false by default.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/treemap-interactbyleaf-false/\" target=\"_blank\">false</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/treemap-interactbyleaf-true-and-allowdrilltonode/\" target=\"_blank\">interactByLeaf and allowDrillToNode is true</a>","deprecated":false},{"name":"chart--inverted","fullname":"chart.inverted","title":"inverted","parent":"chart","isParent":false,"returnType":"Boolean","defaults":"false","since":"","description":"Whether to invert the axes so that the x axis is vertical and y axis is horizontal.\r When true, the x axis is reversed by default. If a bar series is present in the chart,\r it will be inverted automatically.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/inverted/\" target=\"_blank\">Inverted line</a>","seeAlso":"","deprecated":false},{"name":"series<waterfall>-data--isIntermediateSum","fullname":"series<waterfall>.data.isIntermediateSum","title":"isIntermediateSum","parent":"series<waterfall>-data","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"","description":"When this property is true, the points acts as a summary column for the values added or substracted since the last intermediate sum, or since the start of the series. The <code>y</code> value is ignored.","demo":" <a href=\"http://jsfiddle.net/gh/get/jquery/1.9.1/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/waterfall/\" target=\"_blank\">Waterfall</a>","seeAlso":"","deprecated":false},{"name":"series<waterfall>-data--isSum","fullname":"series<waterfall>.data.isSum","title":"isSum","parent":"series<waterfall>-data","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"","description":"When this property is true, the point display the total sum across the entire series. The <code>y</code> value is ignored.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.9.1/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/waterfall/\" target=\"_blank\">Waterfall</a>","seeAlso":"","deprecated":false},{"name":"data--itemDelimiter","fullname":"data.itemDelimiter","title":"itemDelimiter","parent":"data","isParent":false,"returnType":"String","defaults":"","values":"","since":"4.0","description":"Item or cell delimiter for parsing CSV. Defaults to the tab character <code>\\t</code> if a tab character is found in the CSV string, if not it defaults to <code>,</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/data/delimiters/\" target=\"_blank\">Delimiters</a>","seeAlso":"","deprecated":false},{"name":"legend--itemDistance","fullname":"legend.itemDistance","title":"itemDistance","parent":"legend","isParent":false,"returnType":"Number","defaults":"20","since":"3.0.3","description":"In a legend with horizontal layout, the itemDistance defines the pixel distance between each item. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/layout-horizontal/\" target=\"_blank\">50px item distance</a>","deprecated":false},{"name":"legend--itemHiddenStyle","fullname":"legend.itemHiddenStyle","title":"itemHiddenStyle","parent":"legend","isParent":false,"returnType":"CSSObject","description":"CSS styles for each legend item when the corresponding series or point is hidden. Only a subset of CSS is supported, notably those options related to text. Properties are inherited from <code>style</code> unless overridden here. Defaults to:\r\n<pre>itemHiddenStyle: {\r\n\tcolor: '#CCC'\r\n}</pre>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/itemhiddenstyle/\" target=\"_blank\">Darker gray color</a>","deprecated":false},{"name":"legend--itemHoverStyle","fullname":"legend.itemHoverStyle","title":"itemHoverStyle","parent":"legend","isParent":false,"returnType":"CSSObject","description":"CSS styles for each legend item in hover mode. Only a subset of CSS is supported, notably those options related to text. Properties are inherited from <code>style</code> unless overridden here. Defaults to:\r\n<pre>itemHoverStyle: {\r\n\tcolor: '#000'\r\n}</pre>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/itemhoverstyle/\" target=\"_blank\">Red on hover</a>","deprecated":false},{"name":"legend--itemMarginBottom","fullname":"legend.itemMarginBottom","title":"itemMarginBottom","parent":"legend","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.0","description":"The pixel bottom margin for each legend item.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/padding-itemmargin/\" target=\"_blank\">\r\n\t\t\t\tPadding and item margins demonstrated</a>","deprecated":false},{"name":"legend--itemMarginTop","fullname":"legend.itemMarginTop","title":"itemMarginTop","parent":"legend","isParent":false,"returnType":"Number","defaults":"0","since":"2.2.0","description":"The pixel top margin for each legend item.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/padding-itemmargin/\" target=\"_blank\">\r\n\t\t\t\tPadding and item margins demonstrated</a>","deprecated":false},{"name":"legend--itemStyle","fullname":"legend.itemStyle","title":"itemStyle","parent":"legend","isParent":false,"returnType":"CSSObject","defaults":"{ \"color\": \"#333333\", \"cursor\": \"pointer\", \"fontSize\": \"12px\", \"fontWeight\": \"bold\" }","description":"CSS styles for each legend item. Only a subset of CSS is supported, notably those options related to text.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/itemstyle/\" target=\"_blank\">Bold black text</a>","deprecated":false},{"name":"legend--itemWidth","fullname":"legend.itemWidth","title":"itemWidth","parent":"legend","isParent":false,"returnType":"Number","since":"2.0","description":"The width for each legend item. This is useful in a horizontal layout with many items when you want the items to align vertically.  .","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/itemwidth-default/\" target=\"_blank\">Null by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/itemwidth-80/\" target=\"_blank\">80 for aligned legend items</a>"},{"name":"labels-items","fullname":"labels.items","title":"items","parent":"labels","isParent":true,"returnType":"Array<Object>","description":"A HTML label that can be positioned anywhere in the chart area.","deprecated":false},{"name":"series<spline>--keys","fullname":"series<spline>.keys","title":"keys","parent":"series<spline>","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"plotOptions-errorbar--keys","fullname":"plotOptions.errorbar.keys","title":"keys","parent":"plotOptions-errorbar","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"plotOptions-columnrange--keys","fullname":"plotOptions.columnrange.keys","title":"keys","parent":"plotOptions-columnrange","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"series<columnrange>--keys","fullname":"series<columnrange>.keys","title":"keys","parent":"series<columnrange>","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"series<treemap>--keys","fullname":"series<treemap>.keys","title":"keys","parent":"series<treemap>","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"series<area>--keys","fullname":"series<area>.keys","title":"keys","parent":"series<area>","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"series<bar>--keys","fullname":"series<bar>.keys","title":"keys","parent":"series<bar>","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"series<heatmap>--keys","fullname":"series<heatmap>.keys","title":"keys","parent":"series<heatmap>","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"plotOptions-area--keys","fullname":"plotOptions.area.keys","title":"keys","parent":"plotOptions-area","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"series<areasplinerange>--keys","fullname":"series<areasplinerange>.keys","title":"keys","parent":"series<areasplinerange>","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"plotOptions-waterfall--keys","fullname":"plotOptions.waterfall.keys","title":"keys","parent":"plotOptions-waterfall","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"plotOptions-areaspline--keys","fullname":"plotOptions.areaspline.keys","title":"keys","parent":"plotOptions-areaspline","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"plotOptions-spline--keys","fullname":"plotOptions.spline.keys","title":"keys","parent":"plotOptions-spline","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"series<polygon>--keys","fullname":"series<polygon>.keys","title":"keys","parent":"series<polygon>","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"plotOptions-line--keys","fullname":"plotOptions.line.keys","title":"keys","parent":"plotOptions-line","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"series<line>--keys","fullname":"series<line>.keys","title":"keys","parent":"series<line>","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"series<areaspline>--keys","fullname":"series<areaspline>.keys","title":"keys","parent":"series<areaspline>","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"plotOptions-polygon--keys","fullname":"plotOptions.polygon.keys","title":"keys","parent":"plotOptions-polygon","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"series<gauge>--keys","fullname":"series<gauge>.keys","title":"keys","parent":"series<gauge>","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"series<pie>--keys","fullname":"series<pie>.keys","title":"keys","parent":"series<pie>","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"plotOptions-series--keys","fullname":"plotOptions.series.keys","title":"keys","parent":"plotOptions-series","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"series<funnel>--keys","fullname":"series<funnel>.keys","title":"keys","parent":"series<funnel>","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"series<errorbar>--keys","fullname":"series<errorbar>.keys","title":"keys","parent":"series<errorbar>","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"plotOptions-solidgauge--keys","fullname":"plotOptions.solidgauge.keys","title":"keys","parent":"plotOptions-solidgauge","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"plotOptions-treemap--keys","fullname":"plotOptions.treemap.keys","title":"keys","parent":"plotOptions-treemap","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"plotOptions-boxplot--keys","fullname":"plotOptions.boxplot.keys","title":"keys","parent":"plotOptions-boxplot","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"series<column>--keys","fullname":"series<column>.keys","title":"keys","parent":"series<column>","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"plotOptions-gauge--keys","fullname":"plotOptions.gauge.keys","title":"keys","parent":"plotOptions-gauge","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"plotOptions-pie--keys","fullname":"plotOptions.pie.keys","title":"keys","parent":"plotOptions-pie","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"series<pyramid>--keys","fullname":"series<pyramid>.keys","title":"keys","parent":"series<pyramid>","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"plotOptions-bar--keys","fullname":"plotOptions.bar.keys","title":"keys","parent":"plotOptions-bar","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"series<boxplot>--keys","fullname":"series<boxplot>.keys","title":"keys","parent":"series<boxplot>","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"plotOptions-arearange--keys","fullname":"plotOptions.arearange.keys","title":"keys","parent":"plotOptions-arearange","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"plotOptions-funnel--keys","fullname":"plotOptions.funnel.keys","title":"keys","parent":"plotOptions-funnel","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"plotOptions-areasplinerange--keys","fullname":"plotOptions.areasplinerange.keys","title":"keys","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"series<waterfall>--keys","fullname":"series<waterfall>.keys","title":"keys","parent":"series<waterfall>","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"plotOptions-scatter--keys","fullname":"plotOptions.scatter.keys","title":"keys","parent":"plotOptions-scatter","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"series<arearange>--keys","fullname":"series<arearange>.keys","title":"keys","parent":"series<arearange>","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"plotOptions-column--keys","fullname":"plotOptions.column.keys","title":"keys","parent":"plotOptions-column","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"series<bubble>--keys","fullname":"series<bubble>.keys","title":"keys","parent":"series<bubble>","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"plotOptions-bubble--keys","fullname":"plotOptions.bubble.keys","title":"keys","parent":"plotOptions-bubble","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"series<scatter>--keys","fullname":"series<scatter>.keys","title":"keys","parent":"series<scatter>","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"plotOptions-pyramid--keys","fullname":"plotOptions.pyramid.keys","title":"keys","parent":"plotOptions-pyramid","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"plotOptions-heatmap--keys","fullname":"plotOptions.heatmap.keys","title":"keys","parent":"plotOptions-heatmap","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"series<solidgauge>--keys","fullname":"series<solidgauge>.keys","title":"keys","parent":"series<solidgauge>","isParent":false,"returnType":"Array<String>","context":"","defaults":"","values":"","since":"4.1.6","description":"An array specifying which option maps to which key in the data point array. This makes it convenient to work with unstructured data arrays from different sources.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/data-keys/\" target=\"_blank\">An extended data array with keys</a>","seeAlso":"<a href=\"#series<line>.data\">series.data</a>","deprecated":false},{"name":"yAxis-plotBands-label","fullname":"yAxis.plotBands.label","title":"label","parent":"yAxis-plotBands","isParent":true,"description":"Text labels for the plot bands"},{"name":"xAxis-plotBands-label","fullname":"xAxis.plotBands.label","title":"label","parent":"xAxis-plotBands","isParent":true,"description":"Text labels for the plot bands"},{"name":"xAxis-plotLines-label","fullname":"xAxis.plotLines.label","title":"label","parent":"xAxis-plotLines","isParent":true,"description":"Text labels for the plot bands"},{"name":"yAxis-plotLines-label","fullname":"yAxis.plotLines.label","title":"label","parent":"yAxis-plotLines","isParent":true,"description":"Text labels for the plot bands"},{"name":"legend--labelFormat","fullname":"legend.labelFormat","title":"labelFormat","parent":"legend","isParent":false,"returnType":"String","defaults":"{name}","since":"1.3","description":"A <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting\">format string</a> for each legend label. Available variables relates to properties on the series, or the point in case of pies.","deprecated":false},{"name":"legend--labelFormatter","fullname":"legend.labelFormatter","title":"labelFormatter","parent":"legend","isParent":false,"returnType":"Function","description":"Callback function to format each of the series' labels. The <em>this</em> keyword refers to the series object, or the point object in case of pie charts. By default the series or point name is printed.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/labelformatter/\" target=\"_blank\">Add text</a>","deprecated":false},{"name":"loading--labelStyle","fullname":"loading.labelStyle","title":"labelStyle","parent":"loading","isParent":false,"returnType":"CSSObject","defaults":"{ \"fontWeight\": \"bold\", \"position\": \"relative\", \"top\": \"45%\" }","since":"1.2.0","description":"CSS styles for the loading label <code>span</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/loading/labelstyle/\" target=\"_blank\">Vertically centered</a>","deprecated":false},{"name":"yAxis-labels","fullname":"yAxis.labels","title":"labels","parent":"yAxis","isParent":true,"deprecated":false},{"name":"xAxis-labels","fullname":"xAxis.labels","title":"labels","parent":"xAxis","isParent":true,"description":"The axis labels show the number or category for each tick."},{"name":"labels","fullname":"labels","title":"labels","isParent":true,"description":"HTML labels that can be positioned anywhere in the chart area.","deprecated":false},{"name":"lang","fullname":"lang","title":"lang","isParent":true,"description":"Language object. The language object is global and it can't\n\t\tbe set on each chart initiation. Instead, use <code>Highcharts.setOptions</code> to\n\t\tset it before any chart is initiated. \n<pre>Highcharts.setOptions({\n\tlang: {\n\t\tmonths: ['Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin',  'Juillet', 'Août', 'Septembre', 'Octobre', 'Novembre', 'Décembre'],\n\t\tweekdays: ['Dimanche', 'Lundi', 'Mardi', 'Mercredi', 'Jeudi', 'Vendredi', 'Samedi']\n\t}\n});</pre>"},{"name":"legend--layout","fullname":"legend.layout","title":"layout","parent":"legend","isParent":false,"returnType":"String","defaults":"horizontal","values":"[\"horizontal\", \"vertical\"]","description":"The layout of the legend items. Can be one of \"horizontal\" or \"vertical\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/layout-horizontal/\" target=\"_blank\">Horizontal by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/layout-vertical/\" target=\"_blank\">vertical</a>"},{"name":"plotOptions-treemap--layoutAlgorithm","fullname":"plotOptions.treemap.layoutAlgorithm","title":"layoutAlgorithm","parent":"plotOptions-treemap","isParent":false,"returnType":"String","defaults":"sliceAndDice","values":"[\"sliceAndDice\", \"stripes\", \"squarified\", \"strip\"]","since":"4.1.0","description":"This option decides which algorithm is used for setting position and dimensions of the points. Can be one of <code>sliceAndDice</code>, <code>stripes</code>, <code>squarified</code> or <code>strip</code>. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/treemap-layoutalgorithm-sliceanddice/\" target=\"_blank\">sliceAndDice by default</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/treemap-layoutalgorithm-stripes/\" target=\"_blank\">stripes</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/treemap-layoutalgorithm-squarified/\" target=\"_blank\">squarified</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/treemap-layoutalgorithm-strip/\" target=\"_blank\">strip</a>","seeAlso":"<a href=\"http://www.highcharts.com/docs/chart-and-series-types/treemap\">How to write your own algorithm</a>","deprecated":false},{"name":"series<treemap>--layoutAlgorithm","fullname":"series<treemap>.layoutAlgorithm","title":"layoutAlgorithm","parent":"series<treemap>","isParent":false,"returnType":"String","defaults":"sliceAndDice","values":"[\"sliceAndDice\", \"stripes\", \"squarified\", \"strip\"]","since":"4.1.0","description":"This option decides which algorithm is used for setting position and dimensions of the points. Can be one of <code>sliceAndDice</code>, <code>stripes</code>, <code>squarified</code> or <code>strip</code>. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/treemap-layoutalgorithm-sliceanddice/\" target=\"_blank\">sliceAndDice by default</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/treemap-layoutalgorithm-stripes/\" target=\"_blank\">stripes</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/treemap-layoutalgorithm-squarified/\" target=\"_blank\">squarified</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/treemap-layoutalgorithm-strip/\" target=\"_blank\">strip</a>","seeAlso":"<a href=\"http://www.highcharts.com/docs/chart-and-series-types/treemap\">How to write your own algorithm</a>","deprecated":false},{"name":"plotOptions-treemap-levels--layoutAlgorithm","fullname":"plotOptions.treemap.levels.layoutAlgorithm","title":"layoutAlgorithm","parent":"plotOptions-treemap-levels","isParent":false,"returnType":"String","values":"[\"sliceAndDice\", \"stripes\", \"squarified\", \"strip\"]","since":"4.1.0","description":"Can set the layoutAlgorithm option on a specific level. ","deprecated":false},{"name":"series<treemap>-levels--layoutAlgorithm","fullname":"series<treemap>.levels.layoutAlgorithm","title":"layoutAlgorithm","parent":"series<treemap>-levels","isParent":false,"returnType":"String","values":"[\"sliceAndDice\", \"stripes\", \"squarified\", \"strip\"]","since":"4.1.0","description":"Can set the layoutAlgorithm option on a specific level. ","deprecated":false},{"name":"series<treemap>--layoutStartingDirection","fullname":"series<treemap>.layoutStartingDirection","title":"layoutStartingDirection","parent":"series<treemap>","isParent":false,"returnType":"String","defaults":"vertical","values":"[\"vertical\", \"horizontal\"]","since":"4.1.0","description":"Defines which direction the layout algorithm will start drawing. Possible values are \"vertical\" and \"horizontal\".","deprecated":false},{"name":"plotOptions-treemap-levels--layoutStartingDirection","fullname":"plotOptions.treemap.levels.layoutStartingDirection","title":"layoutStartingDirection","parent":"plotOptions-treemap-levels","isParent":false,"returnType":"String","values":"[\"vertical\", \"horizontal\"]","since":"4.1.0","description":"Can set the layoutStartingDirection option on a specific level.","deprecated":false},{"name":"series<treemap>-levels--layoutStartingDirection","fullname":"series<treemap>.levels.layoutStartingDirection","title":"layoutStartingDirection","parent":"series<treemap>-levels","isParent":false,"returnType":"String","values":"[\"vertical\", \"horizontal\"]","since":"4.1.0","description":"Can set the layoutStartingDirection option on a specific level.","deprecated":false},{"name":"plotOptions-treemap--layoutStartingDirection","fullname":"plotOptions.treemap.layoutStartingDirection","title":"layoutStartingDirection","parent":"plotOptions-treemap","isParent":false,"returnType":"String","defaults":"vertical","values":"[\"vertical\", \"horizontal\"]","since":"4.1.0","description":"Defines which direction the layout algorithm will start drawing. Possible values are \"vertical\" and \"horizontal\".","deprecated":false},{"name":"legend","fullname":"legend","title":"legend","isParent":true,"description":"The legend is a box containing a symbol and name for each series item\n\tor point item in the chart."},{"name":"series<bubble>--legendIndex","fullname":"series<bubble>.legendIndex","title":"legendIndex","parent":"series<bubble>","isParent":false,"returnType":"Number","description":"The sequential index of the series in the legend.  <div class=\"demo\">Try it:  \t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/series/legendindex/\" target=\"_blank\">Legend in opposite order</a> </div>.","seeAlso":"<a href=\"#legend.reversed\">legend.reversed</a>, <a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<areaspline>--legendIndex","fullname":"series<areaspline>.legendIndex","title":"legendIndex","parent":"series<areaspline>","isParent":false,"returnType":"Number","description":"The sequential index of the series in the legend.  <div class=\"demo\">Try it:  \t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/series/legendindex/\" target=\"_blank\">Legend in opposite order</a> </div>.","seeAlso":"<a href=\"#legend.reversed\">legend.reversed</a>, <a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<errorbar>--legendIndex","fullname":"series<errorbar>.legendIndex","title":"legendIndex","parent":"series<errorbar>","isParent":false,"returnType":"Number","description":"The sequential index of the series in the legend.  <div class=\"demo\">Try it:  \t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/series/legendindex/\" target=\"_blank\">Legend in opposite order</a> </div>.","seeAlso":"<a href=\"#legend.reversed\">legend.reversed</a>, <a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<arearange>--legendIndex","fullname":"series<arearange>.legendIndex","title":"legendIndex","parent":"series<arearange>","isParent":false,"returnType":"Number","description":"The sequential index of the series in the legend.  <div class=\"demo\">Try it:  \t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/series/legendindex/\" target=\"_blank\">Legend in opposite order</a> </div>.","seeAlso":"<a href=\"#legend.reversed\">legend.reversed</a>, <a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<column>--legendIndex","fullname":"series<column>.legendIndex","title":"legendIndex","parent":"series<column>","isParent":false,"returnType":"Number","description":"The sequential index of the series in the legend.  <div class=\"demo\">Try it:  \t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/series/legendindex/\" target=\"_blank\">Legend in opposite order</a> </div>.","seeAlso":"<a href=\"#legend.reversed\">legend.reversed</a>, <a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<areasplinerange>--legendIndex","fullname":"series<areasplinerange>.legendIndex","title":"legendIndex","parent":"series<areasplinerange>","isParent":false,"returnType":"Number","description":"The sequential index of the series in the legend.  <div class=\"demo\">Try it:  \t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/series/legendindex/\" target=\"_blank\">Legend in opposite order</a> </div>.","seeAlso":"<a href=\"#legend.reversed\">legend.reversed</a>, <a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<pie>--legendIndex","fullname":"series<pie>.legendIndex","title":"legendIndex","parent":"series<pie>","isParent":false,"returnType":"Number","description":"The sequential index of the series in the legend.  <div class=\"demo\">Try it:  \t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/series/legendindex/\" target=\"_blank\">Legend in opposite order</a> </div>.","seeAlso":"<a href=\"#legend.reversed\">legend.reversed</a>, <a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<spline>--legendIndex","fullname":"series<spline>.legendIndex","title":"legendIndex","parent":"series<spline>","isParent":false,"returnType":"Number","description":"The sequential index of the series in the legend.  <div class=\"demo\">Try it:  \t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/series/legendindex/\" target=\"_blank\">Legend in opposite order</a> </div>.","seeAlso":"<a href=\"#legend.reversed\">legend.reversed</a>, <a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series--legendIndex","fullname":"series.legendIndex","title":"legendIndex","parent":"series","isParent":false,"returnType":"Number","description":"The sequential index of the series in the legend.  <div class=\"demo\">Try it:  \t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/series/legendindex/\" target=\"_blank\">Legend in opposite order</a> </div>.","seeAlso":"<a href=\"#legend.reversed\">legend.reversed</a>, <a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<funnel>--legendIndex","fullname":"series<funnel>.legendIndex","title":"legendIndex","parent":"series<funnel>","isParent":false,"returnType":"Number","description":"The sequential index of the series in the legend.  <div class=\"demo\">Try it:  \t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/series/legendindex/\" target=\"_blank\">Legend in opposite order</a> </div>.","seeAlso":"<a href=\"#legend.reversed\">legend.reversed</a>, <a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<columnrange>--legendIndex","fullname":"series<columnrange>.legendIndex","title":"legendIndex","parent":"series<columnrange>","isParent":false,"returnType":"Number","description":"The sequential index of the series in the legend.  <div class=\"demo\">Try it:  \t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/series/legendindex/\" target=\"_blank\">Legend in opposite order</a> </div>.","seeAlso":"<a href=\"#legend.reversed\">legend.reversed</a>, <a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<polygon>--legendIndex","fullname":"series<polygon>.legendIndex","title":"legendIndex","parent":"series<polygon>","isParent":false,"returnType":"Number","description":"The sequential index of the series in the legend.  <div class=\"demo\">Try it:  \t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/series/legendindex/\" target=\"_blank\">Legend in opposite order</a> </div>.","seeAlso":"<a href=\"#legend.reversed\">legend.reversed</a>, <a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<heatmap>--legendIndex","fullname":"series<heatmap>.legendIndex","title":"legendIndex","parent":"series<heatmap>","isParent":false,"returnType":"Number","description":"The sequential index of the series in the legend.  <div class=\"demo\">Try it:  \t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/series/legendindex/\" target=\"_blank\">Legend in opposite order</a> </div>.","seeAlso":"<a href=\"#legend.reversed\">legend.reversed</a>, <a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<scatter>--legendIndex","fullname":"series<scatter>.legendIndex","title":"legendIndex","parent":"series<scatter>","isParent":false,"returnType":"Number","description":"The sequential index of the series in the legend.  <div class=\"demo\">Try it:  \t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/series/legendindex/\" target=\"_blank\">Legend in opposite order</a> </div>.","seeAlso":"<a href=\"#legend.reversed\">legend.reversed</a>, <a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<waterfall>--legendIndex","fullname":"series<waterfall>.legendIndex","title":"legendIndex","parent":"series<waterfall>","isParent":false,"returnType":"Number","description":"The sequential index of the series in the legend.  <div class=\"demo\">Try it:  \t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/series/legendindex/\" target=\"_blank\">Legend in opposite order</a> </div>.","seeAlso":"<a href=\"#legend.reversed\">legend.reversed</a>, <a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<boxplot>--legendIndex","fullname":"series<boxplot>.legendIndex","title":"legendIndex","parent":"series<boxplot>","isParent":false,"returnType":"Number","description":"The sequential index of the series in the legend.  <div class=\"demo\">Try it:  \t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/series/legendindex/\" target=\"_blank\">Legend in opposite order</a> </div>.","seeAlso":"<a href=\"#legend.reversed\">legend.reversed</a>, <a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<pie>-data--legendIndex","fullname":"series<pie>.data.legendIndex","title":"legendIndex","parent":"series<pie>-data","isParent":false,"returnType":"Number","description":"The sequential index of the data point in the legend.","deprecated":false},{"name":"series<gauge>--legendIndex","fullname":"series<gauge>.legendIndex","title":"legendIndex","parent":"series<gauge>","isParent":false,"returnType":"Number","description":"The sequential index of the series in the legend.  <div class=\"demo\">Try it:  \t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/series/legendindex/\" target=\"_blank\">Legend in opposite order</a> </div>.","seeAlso":"<a href=\"#legend.reversed\">legend.reversed</a>, <a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<bar>--legendIndex","fullname":"series<bar>.legendIndex","title":"legendIndex","parent":"series<bar>","isParent":false,"returnType":"Number","description":"The sequential index of the series in the legend.  <div class=\"demo\">Try it:  \t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/series/legendindex/\" target=\"_blank\">Legend in opposite order</a> </div>.","seeAlso":"<a href=\"#legend.reversed\">legend.reversed</a>, <a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<area>--legendIndex","fullname":"series<area>.legendIndex","title":"legendIndex","parent":"series<area>","isParent":false,"returnType":"Number","description":"The sequential index of the series in the legend.  <div class=\"demo\">Try it:  \t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/series/legendindex/\" target=\"_blank\">Legend in opposite order</a> </div>.","seeAlso":"<a href=\"#legend.reversed\">legend.reversed</a>, <a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<line>--legendIndex","fullname":"series<line>.legendIndex","title":"legendIndex","parent":"series<line>","isParent":false,"returnType":"Number","description":"The sequential index of the series in the legend.  <div class=\"demo\">Try it:  \t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/series/legendindex/\" target=\"_blank\">Legend in opposite order</a> </div>.","seeAlso":"<a href=\"#legend.reversed\">legend.reversed</a>, <a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<treemap>--legendIndex","fullname":"series<treemap>.legendIndex","title":"legendIndex","parent":"series<treemap>","isParent":false,"returnType":"Number","description":"The sequential index of the series in the legend.  <div class=\"demo\">Try it:  \t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/series/legendindex/\" target=\"_blank\">Legend in opposite order</a> </div>.","seeAlso":"<a href=\"#legend.reversed\">legend.reversed</a>, <a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<pyramid>-data--legendIndex","fullname":"series<pyramid>.data.legendIndex","title":"legendIndex","parent":"series<pyramid>-data","isParent":false,"returnType":"Number","description":"The sequential index of the data point in the legend.","deprecated":false},{"name":"series<solidgauge>--legendIndex","fullname":"series<solidgauge>.legendIndex","title":"legendIndex","parent":"series<solidgauge>","isParent":false,"returnType":"Number","description":"The sequential index of the series in the legend.  <div class=\"demo\">Try it:  \t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/series/legendindex/\" target=\"_blank\">Legend in opposite order</a> </div>.","seeAlso":"<a href=\"#legend.reversed\">legend.reversed</a>, <a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<funnel>-data--legendIndex","fullname":"series<funnel>.data.legendIndex","title":"legendIndex","parent":"series<funnel>-data","isParent":false,"returnType":"Number","description":"The sequential index of the data point in the legend.","deprecated":false},{"name":"series<pyramid>--legendIndex","fullname":"series<pyramid>.legendIndex","title":"legendIndex","parent":"series<pyramid>","isParent":false,"returnType":"Number","description":"The sequential index of the series in the legend.  <div class=\"demo\">Try it:  \t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/series/legendindex/\" target=\"_blank\">Legend in opposite order</a> </div>.","seeAlso":"<a href=\"#legend.reversed\">legend.reversed</a>, <a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"plotOptions-column-events--legendItemClick","fullname":"plotOptions.column.events.legendItemClick","title":"legendItemClick","parent":"plotOptions-column-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"series<column>-events--legendItemClick","fullname":"series<column>.events.legendItemClick","title":"legendItemClick","parent":"series<column>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"plotOptions-solidgauge-events--legendItemClick","fullname":"plotOptions.solidgauge.events.legendItemClick","title":"legendItemClick","parent":"plotOptions-solidgauge-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"series<bubble>-events--legendItemClick","fullname":"series<bubble>.events.legendItemClick","title":"legendItemClick","parent":"series<bubble>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"series<bar>-events--legendItemClick","fullname":"series<bar>.events.legendItemClick","title":"legendItemClick","parent":"series<bar>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"plotOptions-pie-events--legendItemClick","fullname":"plotOptions.pie.events.legendItemClick","title":"legendItemClick","parent":"plotOptions-pie-events","isParent":false,"returnType":"Function","since":"1.2.0","description":"Not applicable to pies, as the legend item is per point. See point.events."},{"name":"series<heatmap>-events--legendItemClick","fullname":"series<heatmap>.events.legendItemClick","title":"legendItemClick","parent":"series<heatmap>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"plotOptions-arearange-events--legendItemClick","fullname":"plotOptions.arearange.events.legendItemClick","title":"legendItemClick","parent":"plotOptions-arearange-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"series<treemap>-events--legendItemClick","fullname":"series<treemap>.events.legendItemClick","title":"legendItemClick","parent":"series<treemap>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"plotOptions-pyramid-events--legendItemClick","fullname":"plotOptions.pyramid.events.legendItemClick","title":"legendItemClick","parent":"plotOptions-pyramid-events","isParent":false,"returnType":"Function","since":"1.2.0","description":"Not applicable to pies, as the legend item is per point. See point.events."},{"name":"plotOptions-bubble-events--legendItemClick","fullname":"plotOptions.bubble.events.legendItemClick","title":"legendItemClick","parent":"plotOptions-bubble-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"series<gauge>-events--legendItemClick","fullname":"series<gauge>.events.legendItemClick","title":"legendItemClick","parent":"series<gauge>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"series<areaspline>-events--legendItemClick","fullname":"series<areaspline>.events.legendItemClick","title":"legendItemClick","parent":"series<areaspline>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"series<arearange>-events--legendItemClick","fullname":"series<arearange>.events.legendItemClick","title":"legendItemClick","parent":"series<arearange>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"plotOptions-heatmap-events--legendItemClick","fullname":"plotOptions.heatmap.events.legendItemClick","title":"legendItemClick","parent":"plotOptions-heatmap-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"series<solidgauge>-events--legendItemClick","fullname":"series<solidgauge>.events.legendItemClick","title":"legendItemClick","parent":"series<solidgauge>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"series<funnel>-events--legendItemClick","fullname":"series<funnel>.events.legendItemClick","title":"legendItemClick","parent":"series<funnel>-events","isParent":false,"returnType":"Function","since":"1.2.0","description":"Not applicable to pies, as the legend item is per point. See point.events."},{"name":"plotOptions-bar-events--legendItemClick","fullname":"plotOptions.bar.events.legendItemClick","title":"legendItemClick","parent":"plotOptions-bar-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"plotOptions-boxplot-events--legendItemClick","fullname":"plotOptions.boxplot.events.legendItemClick","title":"legendItemClick","parent":"plotOptions-boxplot-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"plotOptions-gauge-events--legendItemClick","fullname":"plotOptions.gauge.events.legendItemClick","title":"legendItemClick","parent":"plotOptions-gauge-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"plotOptions-line-events--legendItemClick","fullname":"plotOptions.line.events.legendItemClick","title":"legendItemClick","parent":"plotOptions-line-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"series<columnrange>-events--legendItemClick","fullname":"series<columnrange>.events.legendItemClick","title":"legendItemClick","parent":"series<columnrange>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"plotOptions-area-events--legendItemClick","fullname":"plotOptions.area.events.legendItemClick","title":"legendItemClick","parent":"plotOptions-area-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"plotOptions-spline-events--legendItemClick","fullname":"plotOptions.spline.events.legendItemClick","title":"legendItemClick","parent":"plotOptions-spline-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"plotOptions-funnel-events--legendItemClick","fullname":"plotOptions.funnel.events.legendItemClick","title":"legendItemClick","parent":"plotOptions-funnel-events","isParent":false,"returnType":"Function","since":"1.2.0","description":"Not applicable to pies, as the legend item is per point. See point.events."},{"name":"series<line>-events--legendItemClick","fullname":"series<line>.events.legendItemClick","title":"legendItemClick","parent":"series<line>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"series<area>-events--legendItemClick","fullname":"series<area>.events.legendItemClick","title":"legendItemClick","parent":"series<area>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"series<spline>-events--legendItemClick","fullname":"series<spline>.events.legendItemClick","title":"legendItemClick","parent":"series<spline>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"plotOptions-waterfall-events--legendItemClick","fullname":"plotOptions.waterfall.events.legendItemClick","title":"legendItemClick","parent":"plotOptions-waterfall-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"series<errorbar>-events--legendItemClick","fullname":"series<errorbar>.events.legendItemClick","title":"legendItemClick","parent":"series<errorbar>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"plotOptions-areaspline-events--legendItemClick","fullname":"plotOptions.areaspline.events.legendItemClick","title":"legendItemClick","parent":"plotOptions-areaspline-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"plotOptions-areasplinerange-events--legendItemClick","fullname":"plotOptions.areasplinerange.events.legendItemClick","title":"legendItemClick","parent":"plotOptions-areasplinerange-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"series<areasplinerange>-events--legendItemClick","fullname":"series<areasplinerange>.events.legendItemClick","title":"legendItemClick","parent":"series<areasplinerange>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"plotOptions-scatter-events--legendItemClick","fullname":"plotOptions.scatter.events.legendItemClick","title":"legendItemClick","parent":"plotOptions-scatter-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"series<waterfall>-events--legendItemClick","fullname":"series<waterfall>.events.legendItemClick","title":"legendItemClick","parent":"series<waterfall>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"series<scatter>-events--legendItemClick","fullname":"series<scatter>.events.legendItemClick","title":"legendItemClick","parent":"series<scatter>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"plotOptions-treemap-events--legendItemClick","fullname":"plotOptions.treemap.events.legendItemClick","title":"legendItemClick","parent":"plotOptions-treemap-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"plotOptions-polygon-events--legendItemClick","fullname":"plotOptions.polygon.events.legendItemClick","title":"legendItemClick","parent":"plotOptions-polygon-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"plotOptions-columnrange-events--legendItemClick","fullname":"plotOptions.columnrange.events.legendItemClick","title":"legendItemClick","parent":"plotOptions-columnrange-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"series<boxplot>-events--legendItemClick","fullname":"series<boxplot>.events.legendItemClick","title":"legendItemClick","parent":"series<boxplot>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"plotOptions-errorbar-events--legendItemClick","fullname":"plotOptions.errorbar.events.legendItemClick","title":"legendItemClick","parent":"plotOptions-errorbar-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"plotOptions-series-events--legendItemClick","fullname":"plotOptions.series.events.legendItemClick","title":"legendItemClick","parent":"plotOptions-series-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"series<pyramid>-events--legendItemClick","fullname":"series<pyramid>.events.legendItemClick","title":"legendItemClick","parent":"series<pyramid>-events","isParent":false,"returnType":"Function","since":"1.2.0","description":"Not applicable to pies, as the legend item is per point. See point.events."},{"name":"series<pie>-events--legendItemClick","fullname":"series<pie>.events.legendItemClick","title":"legendItemClick","parent":"series<pie>-events","isParent":false,"returnType":"Function","since":"1.2.0","description":"Not applicable to pies, as the legend item is per point. See point.events."},{"name":"series<polygon>-events--legendItemClick","fullname":"series<polygon>.events.legendItemClick","title":"legendItemClick","parent":"series<polygon>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the legend item belonging to the series is clicked. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action is to toggle the visibility of the series. This can be prevented by returning <code>false</code> or calling <code>event.preventDefault()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-legenditemclick/\" target=\"_blank\">Confirm hiding and showing</a>","deprecated":false},{"name":"plotOptions-treemap-levels--level","fullname":"plotOptions.treemap.levels.level","title":"level","parent":"plotOptions-treemap-levels","isParent":false,"returnType":"Number","since":"4.1.0","description":"Decides which level takes effect from the options set in the levels object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/treemap-levels/\" target=\"_blank\">Styling of both levels</a>","deprecated":false},{"name":"series<treemap>-levels--level","fullname":"series<treemap>.levels.level","title":"level","parent":"series<treemap>-levels","isParent":false,"returnType":"Number","since":"4.1.0","description":"Decides which level takes effect from the options set in the levels object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/treemap-levels/\" target=\"_blank\">Styling of both levels</a>","deprecated":false},{"name":"series<treemap>--levelIsConstant","fullname":"series<treemap>.levelIsConstant","title":"levelIsConstant","parent":"series<treemap>","isParent":false,"returnType":"Boolean","defaults":"true","values":"[\"true\", \"false\"]","since":"4.1.0","description":"Used together with the levels and allowDrillToNode options. When set to false the first level visible when drilling is considered to be level one. Otherwise the level will be the same as the tree structure.","deprecated":false},{"name":"plotOptions-treemap--levelIsConstant","fullname":"plotOptions.treemap.levelIsConstant","title":"levelIsConstant","parent":"plotOptions-treemap","isParent":false,"returnType":"Boolean","defaults":"true","values":"[\"true\", \"false\"]","since":"4.1.0","description":"Used together with the levels and allowDrillToNode options. When set to false the first level visible when drilling is considered to be level one. Otherwise the level will be the same as the tree structure.","deprecated":false},{"name":"plotOptions-treemap-levels","fullname":"plotOptions.treemap.levels","title":"levels","parent":"plotOptions-treemap","isParent":true,"returnType":"Array<Object>","since":"4.1.0","description":"Set options on specific levels. Takes precedence over series options, but not point options.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/treemap-levels/\" target=\"_blank\">Styling dataLabels and borders</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/treemap-with-levels/\" target=\"_blank\">Different layoutAlgorithm</a>","deprecated":false},{"name":"series<treemap>-levels","fullname":"series<treemap>.levels","title":"levels","parent":"series<treemap>","isParent":true,"returnType":"Array<Object>","since":"4.1.0","description":"Set options on specific levels. Takes precedence over series options, but not point options.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/treemap-levels/\" target=\"_blank\">Styling dataLabels and borders</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/treemap-with-levels/\" target=\"_blank\">Different layoutAlgorithm</a>","deprecated":false},{"name":"plotOptions-line","fullname":"plotOptions.line","title":"line","parent":"plotOptions","isParent":true},{"name":"plotOptions-spline-marker--lineColor","fullname":"plotOptions.spline.marker.lineColor","title":"lineColor","parent":"plotOptions-spline-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<scatter>-data-marker--lineColor","fullname":"series<scatter>.data.marker.lineColor","title":"lineColor","parent":"series<scatter>-data-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<line>-states-hover-marker--lineColor","fullname":"series<line>.states.hover.marker.lineColor","title":"lineColor","parent":"series<line>-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<spline>-marker--lineColor","fullname":"series<spline>.marker.lineColor","title":"lineColor","parent":"series<spline>-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<area>-states-hover-marker--lineColor","fullname":"series<area>.states.hover.marker.lineColor","title":"lineColor","parent":"series<area>-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<areaspline>-marker-states-select--lineColor","fullname":"series<areaspline>.marker.states.select.lineColor","title":"lineColor","parent":"series<areaspline>-marker-states-select","isParent":false,"returnType":"Color","defaults":"#000000","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linecolor/\" target=\"_blank\">Red line color for selected points</a>"},{"name":"series<column>-states-hover-marker--lineColor","fullname":"series<column>.states.hover.marker.lineColor","title":"lineColor","parent":"series<column>-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-boxplot-states-hover-marker--lineColor","fullname":"plotOptions.boxplot.states.hover.marker.lineColor","title":"lineColor","parent":"plotOptions-boxplot-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-column-states-hover-marker--lineColor","fullname":"plotOptions.column.states.hover.marker.lineColor","title":"lineColor","parent":"plotOptions-column-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<area>-data-marker-states-hover--lineColor","fullname":"series<area>.data.marker.states.hover.lineColor","title":"lineColor","parent":"series<area>-data-marker-states-hover","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linecolor/\" target=\"_blank\">White fill color, black line color</a>"},{"name":"plotOptions-area-states-hover-marker--lineColor","fullname":"plotOptions.area.states.hover.marker.lineColor","title":"lineColor","parent":"plotOptions-area-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-area--lineColor","fullname":"plotOptions.area.lineColor","title":"lineColor","parent":"plotOptions-area","isParent":false,"returnType":"Color","description":"A separate color for the graph line. By default the line takes the <code>color</code> of the series, but the lineColor setting allows setting a separate color for the line without altering the <code>fillColor</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-linecolor/\" target=\"_blank\">Dark gray line</a>"},{"name":"plotOptions-arearange-states-hover-marker--lineColor","fullname":"plotOptions.arearange.states.hover.marker.lineColor","title":"lineColor","parent":"plotOptions-arearange-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<areaspline>-marker--lineColor","fullname":"series<areaspline>.marker.lineColor","title":"lineColor","parent":"series<areaspline>-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<polygon>-states-hover-marker--lineColor","fullname":"series<polygon>.states.hover.marker.lineColor","title":"lineColor","parent":"series<polygon>-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<areaspline>--lineColor","fullname":"series<areaspline>.lineColor","title":"lineColor","parent":"series<areaspline>","isParent":false,"returnType":"Color","description":"A separate color for the graph line. By default the line takes the <code>color</code> of the series, but the lineColor setting allows setting a separate color for the line without altering the <code>fillColor</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-linecolor/\" target=\"_blank\">Dark gray line</a>"},{"name":"series<area>--lineColor","fullname":"series<area>.lineColor","title":"lineColor","parent":"series<area>","isParent":false,"returnType":"Color","description":"A separate color for the graph line. By default the line takes the <code>color</code> of the series, but the lineColor setting allows setting a separate color for the line without altering the <code>fillColor</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-linecolor/\" target=\"_blank\">Dark gray line</a>"},{"name":"series<pyramid>-states-hover-marker--lineColor","fullname":"series<pyramid>.states.hover.marker.lineColor","title":"lineColor","parent":"series<pyramid>-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<areaspline>-data-marker-states-hover--lineColor","fullname":"series<areaspline>.data.marker.states.hover.lineColor","title":"lineColor","parent":"series<areaspline>-data-marker-states-hover","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linecolor/\" target=\"_blank\">White fill color, black line color</a>"},{"name":"series<heatmap>-states-hover-marker--lineColor","fullname":"series<heatmap>.states.hover.marker.lineColor","title":"lineColor","parent":"series<heatmap>-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<spline>-marker-states-select--lineColor","fullname":"series<spline>.marker.states.select.lineColor","title":"lineColor","parent":"series<spline>-marker-states-select","isParent":false,"returnType":"Color","defaults":"#000000","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linecolor/\" target=\"_blank\">Red line color for selected points</a>"},{"name":"plotOptions-area-marker-states-hover--lineColor","fullname":"plotOptions.area.marker.states.hover.lineColor","title":"lineColor","parent":"plotOptions-area-marker-states-hover","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linecolor/\" target=\"_blank\">White fill color, black line color</a>"},{"name":"plotOptions-spline-marker-states-select--lineColor","fullname":"plotOptions.spline.marker.states.select.lineColor","title":"lineColor","parent":"plotOptions-spline-marker-states-select","isParent":false,"returnType":"Color","defaults":"#000000","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linecolor/\" target=\"_blank\">Red line color for selected points</a>"},{"name":"series<spline>-data-marker-states-hover--lineColor","fullname":"series<spline>.data.marker.states.hover.lineColor","title":"lineColor","parent":"series<spline>-data-marker-states-hover","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linecolor/\" target=\"_blank\">White fill color, black line color</a>"},{"name":"plotOptions-scatter-marker-states-select--lineColor","fullname":"plotOptions.scatter.marker.states.select.lineColor","title":"lineColor","parent":"plotOptions-scatter-marker-states-select","isParent":false,"returnType":"Color","defaults":"#000000","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linecolor/\" target=\"_blank\">Red line color for selected points</a>"},{"name":"plotOptions-bubble-marker--lineColor","fullname":"plotOptions.bubble.marker.lineColor","title":"lineColor","parent":"plotOptions-bubble-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-bar-states-hover-marker--lineColor","fullname":"plotOptions.bar.states.hover.marker.lineColor","title":"lineColor","parent":"plotOptions-bar-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<areasplinerange>-states-hover-marker--lineColor","fullname":"series<areasplinerange>.states.hover.marker.lineColor","title":"lineColor","parent":"series<areasplinerange>-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<polygon>-marker-states-select--lineColor","fullname":"series<polygon>.marker.states.select.lineColor","title":"lineColor","parent":"series<polygon>-marker-states-select","isParent":false,"returnType":"Color","defaults":"#000000","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linecolor/\" target=\"_blank\">Red line color for selected points</a>"},{"name":"plotOptions-areaspline-states-hover-marker--lineColor","fullname":"plotOptions.areaspline.states.hover.marker.lineColor","title":"lineColor","parent":"plotOptions-areaspline-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-errorbar-states-hover-marker--lineColor","fullname":"plotOptions.errorbar.states.hover.marker.lineColor","title":"lineColor","parent":"plotOptions-errorbar-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-area-marker--lineColor","fullname":"plotOptions.area.marker.lineColor","title":"lineColor","parent":"plotOptions-area-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-pyramid-states-hover-marker--lineColor","fullname":"plotOptions.pyramid.states.hover.marker.lineColor","title":"lineColor","parent":"plotOptions-pyramid-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"xAxis--lineColor","fullname":"xAxis.lineColor","title":"lineColor","parent":"xAxis","isParent":false,"returnType":"Color","defaults":"#C0D0E0","description":"The color of the line marking the axis itself.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/linecolor/\" target=\"_blank\">A red line on Y axis</a>"},{"name":"plotOptions-bubble-marker-states-select--lineColor","fullname":"plotOptions.bubble.marker.states.select.lineColor","title":"lineColor","parent":"plotOptions-bubble-marker-states-select","isParent":false,"returnType":"Color","defaults":"#000000","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linecolor/\" target=\"_blank\">Red line color for selected points</a>"},{"name":"plotOptions-line-marker-states-hover--lineColor","fullname":"plotOptions.line.marker.states.hover.lineColor","title":"lineColor","parent":"plotOptions-line-marker-states-hover","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linecolor/\" target=\"_blank\">White fill color, black line color</a>"},{"name":"series<area>-marker-states-select--lineColor","fullname":"series<area>.marker.states.select.lineColor","title":"lineColor","parent":"series<area>-marker-states-select","isParent":false,"returnType":"Color","defaults":"#000000","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linecolor/\" target=\"_blank\">Red line color for selected points</a>"},{"name":"plotOptions-series-states-hover-marker--lineColor","fullname":"plotOptions.series.states.hover.marker.lineColor","title":"lineColor","parent":"plotOptions-series-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-series-marker--lineColor","fullname":"plotOptions.series.marker.lineColor","title":"lineColor","parent":"plotOptions-series-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<waterfall>-states-hover-marker--lineColor","fullname":"series<waterfall>.states.hover.marker.lineColor","title":"lineColor","parent":"series<waterfall>-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<area>-data-marker-states-select--lineColor","fullname":"series<area>.data.marker.states.select.lineColor","title":"lineColor","parent":"series<area>-data-marker-states-select","isParent":false,"returnType":"Color","defaults":"#000000","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linecolor/\" target=\"_blank\">Red line color for selected points</a>"},{"name":"series<scatter>-marker--lineColor","fullname":"series<scatter>.marker.lineColor","title":"lineColor","parent":"series<scatter>-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<boxplot>-states-hover-marker--lineColor","fullname":"series<boxplot>.states.hover.marker.lineColor","title":"lineColor","parent":"series<boxplot>-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-treemap-states-hover-marker--lineColor","fullname":"plotOptions.treemap.states.hover.marker.lineColor","title":"lineColor","parent":"plotOptions-treemap-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-polygon-states-hover-marker--lineColor","fullname":"plotOptions.polygon.states.hover.marker.lineColor","title":"lineColor","parent":"plotOptions-polygon-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<areaspline>-data-marker-states-select--lineColor","fullname":"series<areaspline>.data.marker.states.select.lineColor","title":"lineColor","parent":"series<areaspline>-data-marker-states-select","isParent":false,"returnType":"Color","defaults":"#000000","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linecolor/\" target=\"_blank\">Red line color for selected points</a>"},{"name":"plotOptions-pie-states-hover-marker--lineColor","fullname":"plotOptions.pie.states.hover.marker.lineColor","title":"lineColor","parent":"plotOptions-pie-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-funnel-states-hover-marker--lineColor","fullname":"plotOptions.funnel.states.hover.marker.lineColor","title":"lineColor","parent":"plotOptions-funnel-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<area>-marker-states-hover--lineColor","fullname":"series<area>.marker.states.hover.lineColor","title":"lineColor","parent":"series<area>-marker-states-hover","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linecolor/\" target=\"_blank\">White fill color, black line color</a>"},{"name":"series<line>-marker-states-hover--lineColor","fullname":"series<line>.marker.states.hover.lineColor","title":"lineColor","parent":"series<line>-marker-states-hover","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linecolor/\" target=\"_blank\">White fill color, black line color</a>"},{"name":"series<spline>-data-marker-states-select--lineColor","fullname":"series<spline>.data.marker.states.select.lineColor","title":"lineColor","parent":"series<spline>-data-marker-states-select","isParent":false,"returnType":"Color","defaults":"#000000","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linecolor/\" target=\"_blank\">Red line color for selected points</a>"},{"name":"yAxis--lineColor","fullname":"yAxis.lineColor","title":"lineColor","parent":"yAxis","isParent":false,"returnType":"Color","defaults":"#C0D0E0","description":"The color of the line marking the axis itself.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/linecolor/\" target=\"_blank\">A red line on Y axis</a>"},{"name":"series<funnel>-states-hover-marker--lineColor","fullname":"series<funnel>.states.hover.marker.lineColor","title":"lineColor","parent":"series<funnel>-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<areasplinerange>--lineColor","fullname":"series<areasplinerange>.lineColor","title":"lineColor","parent":"series<areasplinerange>","isParent":false,"returnType":"Color","description":"A separate color for the graph line. By default the line takes the <code>color</code> of the series, but the lineColor setting allows setting a separate color for the line without altering the <code>fillColor</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-linecolor/\" target=\"_blank\">Dark gray line</a>"},{"name":"plotOptions-scatter-marker-states-hover--lineColor","fullname":"plotOptions.scatter.marker.states.hover.lineColor","title":"lineColor","parent":"plotOptions-scatter-marker-states-hover","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linecolor/\" target=\"_blank\">White fill color, black line color</a>"},{"name":"series<bubble>-marker-states-select--lineColor","fullname":"series<bubble>.marker.states.select.lineColor","title":"lineColor","parent":"series<bubble>-marker-states-select","isParent":false,"returnType":"Color","defaults":"#000000","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linecolor/\" target=\"_blank\">Red line color for selected points</a>"},{"name":"series<scatter>-data-marker-states-select--lineColor","fullname":"series<scatter>.data.marker.states.select.lineColor","title":"lineColor","parent":"series<scatter>-data-marker-states-select","isParent":false,"returnType":"Color","defaults":"#000000","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linecolor/\" target=\"_blank\">Red line color for selected points</a>"},{"name":"plotOptions-heatmap-states-hover-marker--lineColor","fullname":"plotOptions.heatmap.states.hover.marker.lineColor","title":"lineColor","parent":"plotOptions-heatmap-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-arearange--lineColor","fullname":"plotOptions.arearange.lineColor","title":"lineColor","parent":"plotOptions-arearange","isParent":false,"returnType":"Color","description":"A separate color for the graph line. By default the line takes the <code>color</code> of the series, but the lineColor setting allows setting a separate color for the line without altering the <code>fillColor</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-linecolor/\" target=\"_blank\">Dark gray line</a>"},{"name":"series<polygon>-data-marker--lineColor","fullname":"series<polygon>.data.marker.lineColor","title":"lineColor","parent":"series<polygon>-data-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<pie>-states-hover-marker--lineColor","fullname":"series<pie>.states.hover.marker.lineColor","title":"lineColor","parent":"series<pie>-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-area-marker-states-select--lineColor","fullname":"plotOptions.area.marker.states.select.lineColor","title":"lineColor","parent":"plotOptions-area-marker-states-select","isParent":false,"returnType":"Color","defaults":"#000000","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linecolor/\" target=\"_blank\">Red line color for selected points</a>"},{"name":"plotOptions-columnrange-states-hover-marker--lineColor","fullname":"plotOptions.columnrange.states.hover.marker.lineColor","title":"lineColor","parent":"plotOptions-columnrange-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-gauge-states-hover-marker--lineColor","fullname":"plotOptions.gauge.states.hover.marker.lineColor","title":"lineColor","parent":"plotOptions-gauge-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-waterfall--lineColor","fullname":"plotOptions.waterfall.lineColor","title":"lineColor","parent":"plotOptions-waterfall","isParent":false,"returnType":"Color","defaults":"#333333","values":"","since":"3.0","description":"The color of the line that connects columns in a waterfall series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange-states-hover-marker--lineColor","fullname":"plotOptions.areasplinerange.states.hover.marker.lineColor","title":"lineColor","parent":"plotOptions-areasplinerange-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<polygon>-marker-states-hover--lineColor","fullname":"series<polygon>.marker.states.hover.lineColor","title":"lineColor","parent":"series<polygon>-marker-states-hover","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linecolor/\" target=\"_blank\">White fill color, black line color</a>"},{"name":"plotOptions-polygon-marker-states-select--lineColor","fullname":"plotOptions.polygon.marker.states.select.lineColor","title":"lineColor","parent":"plotOptions-polygon-marker-states-select","isParent":false,"returnType":"Color","defaults":"#000000","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linecolor/\" target=\"_blank\">Red line color for selected points</a>"},{"name":"series<scatter>-states-hover-marker--lineColor","fullname":"series<scatter>.states.hover.marker.lineColor","title":"lineColor","parent":"series<scatter>-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-areaspline--lineColor","fullname":"plotOptions.areaspline.lineColor","title":"lineColor","parent":"plotOptions-areaspline","isParent":false,"returnType":"Color","description":"A separate color for the graph line. By default the line takes the <code>color</code> of the series, but the lineColor setting allows setting a separate color for the line without altering the <code>fillColor</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-linecolor/\" target=\"_blank\">Dark gray line</a>"},{"name":"plotOptions-series-marker-states-select--lineColor","fullname":"plotOptions.series.marker.states.select.lineColor","title":"lineColor","parent":"plotOptions-series-marker-states-select","isParent":false,"returnType":"Color","defaults":"#000000","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linecolor/\" target=\"_blank\">Red line color for selected points</a>"},{"name":"series<bubble>-states-hover-marker--lineColor","fullname":"series<bubble>.states.hover.marker.lineColor","title":"lineColor","parent":"series<bubble>-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<polygon>-data-marker-states-select--lineColor","fullname":"series<polygon>.data.marker.states.select.lineColor","title":"lineColor","parent":"series<polygon>-data-marker-states-select","isParent":false,"returnType":"Color","defaults":"#000000","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linecolor/\" target=\"_blank\">Red line color for selected points</a>"},{"name":"plotOptions-areasplinerange--lineColor","fullname":"plotOptions.areasplinerange.lineColor","title":"lineColor","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"Color","description":"A separate color for the graph line. By default the line takes the <code>color</code> of the series, but the lineColor setting allows setting a separate color for the line without altering the <code>fillColor</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-linecolor/\" target=\"_blank\">Dark gray line</a>"},{"name":"plotOptions-areaspline-marker-states-hover--lineColor","fullname":"plotOptions.areaspline.marker.states.hover.lineColor","title":"lineColor","parent":"plotOptions-areaspline-marker-states-hover","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linecolor/\" target=\"_blank\">White fill color, black line color</a>"},{"name":"series<treemap>-states-hover-marker--lineColor","fullname":"series<treemap>.states.hover.marker.lineColor","title":"lineColor","parent":"series<treemap>-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-series-marker-states-hover--lineColor","fullname":"plotOptions.series.marker.states.hover.lineColor","title":"lineColor","parent":"plotOptions-series-marker-states-hover","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linecolor/\" target=\"_blank\">White fill color, black line color</a>"},{"name":"series<line>-marker-states-select--lineColor","fullname":"series<line>.marker.states.select.lineColor","title":"lineColor","parent":"series<line>-marker-states-select","isParent":false,"returnType":"Color","defaults":"#000000","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linecolor/\" target=\"_blank\">Red line color for selected points</a>"},{"name":"series<line>-data-marker-states-select--lineColor","fullname":"series<line>.data.marker.states.select.lineColor","title":"lineColor","parent":"series<line>-data-marker-states-select","isParent":false,"returnType":"Color","defaults":"#000000","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linecolor/\" target=\"_blank\">Red line color for selected points</a>"},{"name":"plotOptions-line-states-hover-marker--lineColor","fullname":"plotOptions.line.states.hover.marker.lineColor","title":"lineColor","parent":"plotOptions-line-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<spline>-data-marker--lineColor","fullname":"series<spline>.data.marker.lineColor","title":"lineColor","parent":"series<spline>-data-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<areaspline>-states-hover-marker--lineColor","fullname":"series<areaspline>.states.hover.marker.lineColor","title":"lineColor","parent":"series<areaspline>-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<arearange>-states-hover-marker--lineColor","fullname":"series<arearange>.states.hover.marker.lineColor","title":"lineColor","parent":"series<arearange>-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<solidgauge>-states-hover-marker--lineColor","fullname":"series<solidgauge>.states.hover.marker.lineColor","title":"lineColor","parent":"series<solidgauge>-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-solidgauge-states-hover-marker--lineColor","fullname":"plotOptions.solidgauge.states.hover.marker.lineColor","title":"lineColor","parent":"plotOptions-solidgauge-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-polygon-marker-states-hover--lineColor","fullname":"plotOptions.polygon.marker.states.hover.lineColor","title":"lineColor","parent":"plotOptions-polygon-marker-states-hover","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linecolor/\" target=\"_blank\">White fill color, black line color</a>"},{"name":"series<bubble>-marker--lineColor","fullname":"series<bubble>.marker.lineColor","title":"lineColor","parent":"series<bubble>-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-spline-states-hover-marker--lineColor","fullname":"plotOptions.spline.states.hover.marker.lineColor","title":"lineColor","parent":"plotOptions-spline-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-polygon-marker--lineColor","fullname":"plotOptions.polygon.marker.lineColor","title":"lineColor","parent":"plotOptions-polygon-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-bubble-states-hover-marker--lineColor","fullname":"plotOptions.bubble.states.hover.marker.lineColor","title":"lineColor","parent":"plotOptions-bubble-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-line-marker--lineColor","fullname":"plotOptions.line.marker.lineColor","title":"lineColor","parent":"plotOptions-line-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<spline>-states-hover-marker--lineColor","fullname":"series<spline>.states.hover.marker.lineColor","title":"lineColor","parent":"series<spline>-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<scatter>-marker-states-hover--lineColor","fullname":"series<scatter>.marker.states.hover.lineColor","title":"lineColor","parent":"series<scatter>-marker-states-hover","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linecolor/\" target=\"_blank\">White fill color, black line color</a>"},{"name":"plotOptions-spline-marker-states-hover--lineColor","fullname":"plotOptions.spline.marker.states.hover.lineColor","title":"lineColor","parent":"plotOptions-spline-marker-states-hover","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linecolor/\" target=\"_blank\">White fill color, black line color</a>"},{"name":"series<polygon>-data-marker-states-hover--lineColor","fullname":"series<polygon>.data.marker.states.hover.lineColor","title":"lineColor","parent":"series<polygon>-data-marker-states-hover","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linecolor/\" target=\"_blank\">White fill color, black line color</a>"},{"name":"series<area>-marker--lineColor","fullname":"series<area>.marker.lineColor","title":"lineColor","parent":"series<area>-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<errorbar>-states-hover-marker--lineColor","fullname":"series<errorbar>.states.hover.marker.lineColor","title":"lineColor","parent":"series<errorbar>-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<scatter>-data-marker-states-hover--lineColor","fullname":"series<scatter>.data.marker.states.hover.lineColor","title":"lineColor","parent":"series<scatter>-data-marker-states-hover","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linecolor/\" target=\"_blank\">White fill color, black line color</a>"},{"name":"series<waterfall>--lineColor","fullname":"series<waterfall>.lineColor","title":"lineColor","parent":"series<waterfall>","isParent":false,"returnType":"Color","defaults":"#333333","values":"","since":"3.0","description":"The color of the line that connects columns in a waterfall series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<columnrange>-states-hover-marker--lineColor","fullname":"series<columnrange>.states.hover.marker.lineColor","title":"lineColor","parent":"series<columnrange>-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<area>-data-marker--lineColor","fullname":"series<area>.data.marker.lineColor","title":"lineColor","parent":"series<area>-data-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-line-marker-states-select--lineColor","fullname":"plotOptions.line.marker.states.select.lineColor","title":"lineColor","parent":"plotOptions-line-marker-states-select","isParent":false,"returnType":"Color","defaults":"#000000","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linecolor/\" target=\"_blank\">Red line color for selected points</a>"},{"name":"plotOptions-scatter-marker--lineColor","fullname":"plotOptions.scatter.marker.lineColor","title":"lineColor","parent":"plotOptions-scatter-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<line>-data-marker--lineColor","fullname":"series<line>.data.marker.lineColor","title":"lineColor","parent":"series<line>-data-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-areaspline-marker--lineColor","fullname":"plotOptions.areaspline.marker.lineColor","title":"lineColor","parent":"plotOptions-areaspline-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<polygon>-marker--lineColor","fullname":"series<polygon>.marker.lineColor","title":"lineColor","parent":"series<polygon>-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<bar>-states-hover-marker--lineColor","fullname":"series<bar>.states.hover.marker.lineColor","title":"lineColor","parent":"series<bar>-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<gauge>-states-hover-marker--lineColor","fullname":"series<gauge>.states.hover.marker.lineColor","title":"lineColor","parent":"series<gauge>-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"plotOptions-areaspline-marker-states-select--lineColor","fullname":"plotOptions.areaspline.marker.states.select.lineColor","title":"lineColor","parent":"plotOptions-areaspline-marker-states-select","isParent":false,"returnType":"Color","defaults":"#000000","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linecolor/\" target=\"_blank\">Red line color for selected points</a>"},{"name":"series<line>-data-marker-states-hover--lineColor","fullname":"series<line>.data.marker.states.hover.lineColor","title":"lineColor","parent":"series<line>-data-marker-states-hover","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linecolor/\" target=\"_blank\">White fill color, black line color</a>"},{"name":"plotOptions-bubble-marker-states-hover--lineColor","fullname":"plotOptions.bubble.marker.states.hover.lineColor","title":"lineColor","parent":"plotOptions-bubble-marker-states-hover","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linecolor/\" target=\"_blank\">White fill color, black line color</a>"},{"name":"series<areaspline>-data-marker--lineColor","fullname":"series<areaspline>.data.marker.lineColor","title":"lineColor","parent":"series<areaspline>-data-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<areaspline>-marker-states-hover--lineColor","fullname":"series<areaspline>.marker.states.hover.lineColor","title":"lineColor","parent":"series<areaspline>-marker-states-hover","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linecolor/\" target=\"_blank\">White fill color, black line color</a>"},{"name":"plotOptions-waterfall-states-hover-marker--lineColor","fullname":"plotOptions.waterfall.states.hover.marker.lineColor","title":"lineColor","parent":"plotOptions-waterfall-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<bubble>-marker-states-hover--lineColor","fullname":"series<bubble>.marker.states.hover.lineColor","title":"lineColor","parent":"series<bubble>-marker-states-hover","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linecolor/\" target=\"_blank\">White fill color, black line color</a>"},{"name":"series<arearange>--lineColor","fullname":"series<arearange>.lineColor","title":"lineColor","parent":"series<arearange>","isParent":false,"returnType":"Color","description":"A separate color for the graph line. By default the line takes the <code>color</code> of the series, but the lineColor setting allows setting a separate color for the line without altering the <code>fillColor</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-linecolor/\" target=\"_blank\">Dark gray line</a>"},{"name":"series<scatter>-marker-states-select--lineColor","fullname":"series<scatter>.marker.states.select.lineColor","title":"lineColor","parent":"series<scatter>-marker-states-select","isParent":false,"returnType":"Color","defaults":"#000000","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linecolor/\" target=\"_blank\">Red line color for selected points</a>"},{"name":"plotOptions-scatter-states-hover-marker--lineColor","fullname":"plotOptions.scatter.states.hover.marker.lineColor","title":"lineColor","parent":"plotOptions-scatter-states-hover-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<line>-marker--lineColor","fullname":"series<line>.marker.lineColor","title":"lineColor","parent":"series<line>-marker","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">Inherit from series color (null)</a>"},{"name":"series<spline>-marker-states-hover--lineColor","fullname":"series<spline>.marker.states.hover.lineColor","title":"lineColor","parent":"series<spline>-marker-states-hover","isParent":false,"returnType":"Color","defaults":"#FFFFFF","description":"The color of the point marker's outline. When <code>null</code>, the series' or point's color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linecolor/\" target=\"_blank\">White fill color, black line color</a>"},{"name":"data--lineDelimiter","fullname":"data.lineDelimiter","title":"lineDelimiter","parent":"data","isParent":false,"returnType":"String","defaults":"\\n","values":"","since":"4.0","description":"Line delimiter for parsing CSV.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/data/delimiters/\" target=\"_blank\">Delimiters</a>","seeAlso":"","deprecated":false},{"name":"legend--lineHeight","fullname":"legend.lineHeight","title":"lineHeight","parent":"legend","isParent":false,"returnType":"Number","defaults":"16","since":"2.0","description":"Line height for the legend items. Deprecated as of 2.1. Instead, the line height for each  item can be set using itemStyle.lineHeight, and the padding between items using itemMarginTop and itemMarginBottom.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/lineheight/\" target=\"_blank\">Setting padding</a>."},{"name":"series<areasplinerange>--lineWidth","fullname":"series<areasplinerange>.lineWidth","title":"lineWidth","parent":"series<areasplinerange>","isParent":false,"returnType":"Number","defaults":"1","since":"2.3.0","description":"Pixel width of the arearange graph line.","demo":"","seeAlso":"","deprecated":false},{"name":"series<area>-data-marker-states-hover--lineWidth","fullname":"series<area>.data.marker.states.hover.lineWidth","title":"lineWidth","parent":"series<area>-data-marker-states-hover","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linewidth/\" target=\"_blank\">3px line width</a>"},{"name":"series<scatter>-marker-states-hover--lineWidth","fullname":"series<scatter>.marker.states.hover.lineWidth","title":"lineWidth","parent":"series<scatter>-marker-states-hover","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linewidth/\" target=\"_blank\">3px line width</a>"},{"name":"plotOptions-scatter--lineWidth","fullname":"plotOptions.scatter.lineWidth","title":"lineWidth","parent":"plotOptions-scatter","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the line connecting the data points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/scatter-linewidth-none/\" target=\"_blank\">0 by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/scatter-linewidth-1/\" target=\"_blank\">1px</a>"},{"name":"plotOptions-bubble-marker-states-select--lineWidth","fullname":"plotOptions.bubble.marker.states.select.lineWidth","title":"lineWidth","parent":"plotOptions-bubble-marker-states-select","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linewidth/\" target=\"_blank\">3px line width for selected points</a>"},{"name":"series<polygon>-data-marker-states-select--lineWidth","fullname":"series<polygon>.data.marker.states.select.lineWidth","title":"lineWidth","parent":"series<polygon>-data-marker-states-select","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linewidth/\" target=\"_blank\">3px line width for selected points</a>"},{"name":"plotOptions-scatter-states-hover--lineWidth","fullname":"plotOptions.scatter.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-scatter-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<arearange>-states-hover--lineWidth","fullname":"series<arearange>.states.hover.lineWidth","title":"lineWidth","parent":"series<arearange>-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"plotOptions-boxplot--lineWidth","fullname":"plotOptions.boxplot.lineWidth","title":"lineWidth","parent":"plotOptions-boxplot","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"3.0","description":"The width of the line surrounding the box. If any of <a href=\"#plotOptions.boxplot.stemWidth\">stemWidth</a>, <a href=\"#plotOptions.boxplot.medianWidth\">medianWidth</a> or <a href=\"#plotOptions.boxplot.whiskerWidth\">whiskerWidth</a> are <code>null</code>, the lineWidth also applies to these lines.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/error-bar-styling/\" target=\"_blank\">error bar styling</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot-states-hover--lineWidth","fullname":"plotOptions.boxplot.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-boxplot-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<polygon>--lineWidth","fullname":"series<polygon>.lineWidth","title":"lineWidth","parent":"series<polygon>","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the line connecting the data points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/scatter-linewidth-none/\" target=\"_blank\">0 by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/scatter-linewidth-1/\" target=\"_blank\">1px</a>"},{"name":"series<polygon>-marker--lineWidth","fullname":"series<polygon>.marker.lineWidth","title":"lineWidth","parent":"series<polygon>-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<areaspline>-marker-states-select--lineWidth","fullname":"series<areaspline>.marker.states.select.lineWidth","title":"lineWidth","parent":"series<areaspline>-marker-states-select","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linewidth/\" target=\"_blank\">3px line width for selected points</a>"},{"name":"series<areaspline>-data-marker-states-hover--lineWidth","fullname":"series<areaspline>.data.marker.states.hover.lineWidth","title":"lineWidth","parent":"series<areaspline>-data-marker-states-hover","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linewidth/\" target=\"_blank\">3px line width</a>"},{"name":"plotOptions-columnrange-states-hover-marker--lineWidth","fullname":"plotOptions.columnrange.states.hover.marker.lineWidth","title":"lineWidth","parent":"plotOptions-columnrange-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<line>-data-marker-states-select--lineWidth","fullname":"series<line>.data.marker.states.select.lineWidth","title":"lineWidth","parent":"series<line>-data-marker-states-select","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linewidth/\" target=\"_blank\">3px line width for selected points</a>"},{"name":"plotOptions-line-marker-states-hover--lineWidth","fullname":"plotOptions.line.marker.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-line-marker-states-hover","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linewidth/\" target=\"_blank\">3px line width</a>"},{"name":"plotOptions-columnrange-states-hover--lineWidth","fullname":"plotOptions.columnrange.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-columnrange-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<column>-states-hover-marker--lineWidth","fullname":"series<column>.states.hover.marker.lineWidth","title":"lineWidth","parent":"series<column>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<spline>--lineWidth","fullname":"series<spline>.lineWidth","title":"lineWidth","parent":"series<spline>","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"5px <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-linewidth-general/\" target=\"_blank\">on all series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-linewidth-specific/\" target=\"_blank\">on one single series</a>"},{"name":"plotOptions-bubble--lineWidth","fullname":"plotOptions.bubble.lineWidth","title":"lineWidth","parent":"plotOptions-bubble","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the line connecting the data points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/scatter-linewidth-none/\" target=\"_blank\">0 by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/scatter-linewidth-1/\" target=\"_blank\">1px</a>"},{"name":"plotOptions-areaspline-marker--lineWidth","fullname":"plotOptions.areaspline.marker.lineWidth","title":"lineWidth","parent":"plotOptions-areaspline-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"plotOptions-polygon--lineWidth","fullname":"plotOptions.polygon.lineWidth","title":"lineWidth","parent":"plotOptions-polygon","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the line connecting the data points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/scatter-linewidth-none/\" target=\"_blank\">0 by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/scatter-linewidth-1/\" target=\"_blank\">1px</a>"},{"name":"plotOptions-area--lineWidth","fullname":"plotOptions.area.lineWidth","title":"lineWidth","parent":"plotOptions-area","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"5px <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-linewidth-general/\" target=\"_blank\">on all series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-linewidth-specific/\" target=\"_blank\">on one single series</a>"},{"name":"plotOptions-treemap-states-hover--lineWidth","fullname":"plotOptions.treemap.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-treemap-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<bubble>-marker-states-select--lineWidth","fullname":"series<bubble>.marker.states.select.lineWidth","title":"lineWidth","parent":"series<bubble>-marker-states-select","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linewidth/\" target=\"_blank\">3px line width for selected points</a>"},{"name":"series<areaspline>-marker-states-hover--lineWidth","fullname":"series<areaspline>.marker.states.hover.lineWidth","title":"lineWidth","parent":"series<areaspline>-marker-states-hover","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linewidth/\" target=\"_blank\">3px line width</a>"},{"name":"plotOptions-polygon-marker-states-hover--lineWidth","fullname":"plotOptions.polygon.marker.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-polygon-marker-states-hover","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linewidth/\" target=\"_blank\">3px line width</a>"},{"name":"series<spline>-marker-states-hover--lineWidth","fullname":"series<spline>.marker.states.hover.lineWidth","title":"lineWidth","parent":"series<spline>-marker-states-hover","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linewidth/\" target=\"_blank\">3px line width</a>"},{"name":"plotOptions-funnel-states-hover-marker--lineWidth","fullname":"plotOptions.funnel.states.hover.marker.lineWidth","title":"lineWidth","parent":"plotOptions-funnel-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<polygon>-states-hover--lineWidth","fullname":"series<polygon>.states.hover.lineWidth","title":"lineWidth","parent":"series<polygon>-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<boxplot>--lineWidth","fullname":"series<boxplot>.lineWidth","title":"lineWidth","parent":"series<boxplot>","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"3.0","description":"The width of the line surrounding the box. If any of <a href=\"#plotOptions.boxplot.stemWidth\">stemWidth</a>, <a href=\"#plotOptions.boxplot.medianWidth\">medianWidth</a> or <a href=\"#plotOptions.boxplot.whiskerWidth\">whiskerWidth</a> are <code>null</code>, the lineWidth also applies to these lines.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/error-bar-styling/\" target=\"_blank\">error bar styling</a>","seeAlso":"","deprecated":false},{"name":"series<polygon>-marker-states-select--lineWidth","fullname":"series<polygon>.marker.states.select.lineWidth","title":"lineWidth","parent":"series<polygon>-marker-states-select","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linewidth/\" target=\"_blank\">3px line width for selected points</a>"},{"name":"plotOptions-line--lineWidth","fullname":"plotOptions.line.lineWidth","title":"lineWidth","parent":"plotOptions-line","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"5px <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-linewidth-general/\" target=\"_blank\">on all series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-linewidth-specific/\" target=\"_blank\">on one single series</a>"},{"name":"series<areaspline>--lineWidth","fullname":"series<areaspline>.lineWidth","title":"lineWidth","parent":"series<areaspline>","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"5px <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-linewidth-general/\" target=\"_blank\">on all series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-linewidth-specific/\" target=\"_blank\">on one single series</a>"},{"name":"plotOptions-errorbar-states-hover-marker--lineWidth","fullname":"plotOptions.errorbar.states.hover.marker.lineWidth","title":"lineWidth","parent":"plotOptions-errorbar-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<pie>-states-hover-marker--lineWidth","fullname":"series<pie>.states.hover.marker.lineWidth","title":"lineWidth","parent":"series<pie>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<bar>-states-hover--lineWidth","fullname":"series<bar>.states.hover.lineWidth","title":"lineWidth","parent":"series<bar>-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<line>-data-marker--lineWidth","fullname":"series<line>.data.marker.lineWidth","title":"lineWidth","parent":"series<line>-data-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"plotOptions-areasplinerange-states-hover-marker--lineWidth","fullname":"plotOptions.areasplinerange.states.hover.marker.lineWidth","title":"lineWidth","parent":"plotOptions-areasplinerange-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"plotOptions-arearange-states-hover-marker--lineWidth","fullname":"plotOptions.arearange.states.hover.marker.lineWidth","title":"lineWidth","parent":"plotOptions-arearange-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"plotOptions-treemap-states-hover-marker--lineWidth","fullname":"plotOptions.treemap.states.hover.marker.lineWidth","title":"lineWidth","parent":"plotOptions-treemap-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<areaspline>-states-hover-marker--lineWidth","fullname":"series<areaspline>.states.hover.marker.lineWidth","title":"lineWidth","parent":"series<areaspline>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<spline>-data-marker--lineWidth","fullname":"series<spline>.data.marker.lineWidth","title":"lineWidth","parent":"series<spline>-data-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"plotOptions-spline-marker-states-hover--lineWidth","fullname":"plotOptions.spline.marker.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-spline-marker-states-hover","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linewidth/\" target=\"_blank\">3px line width</a>"},{"name":"plotOptions-bubble-states-hover--lineWidth","fullname":"plotOptions.bubble.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-bubble-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"plotOptions-line-marker-states-select--lineWidth","fullname":"plotOptions.line.marker.states.select.lineWidth","title":"lineWidth","parent":"plotOptions-line-marker-states-select","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linewidth/\" target=\"_blank\">3px line width for selected points</a>"},{"name":"series<spline>-data-marker-states-hover--lineWidth","fullname":"series<spline>.data.marker.states.hover.lineWidth","title":"lineWidth","parent":"series<spline>-data-marker-states-hover","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linewidth/\" target=\"_blank\">3px line width</a>"},{"name":"series<line>-states-hover--lineWidth","fullname":"series<line>.states.hover.lineWidth","title":"lineWidth","parent":"series<line>-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<bubble>-marker-states-hover--lineWidth","fullname":"series<bubble>.marker.states.hover.lineWidth","title":"lineWidth","parent":"series<bubble>-marker-states-hover","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linewidth/\" target=\"_blank\">3px line width</a>"},{"name":"plotOptions-arearange--lineWidth","fullname":"plotOptions.arearange.lineWidth","title":"lineWidth","parent":"plotOptions-arearange","isParent":false,"returnType":"Number","defaults":"1","since":"2.3.0","description":"Pixel width of the arearange graph line.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-area-marker-states-select--lineWidth","fullname":"plotOptions.area.marker.states.select.lineWidth","title":"lineWidth","parent":"plotOptions-area-marker-states-select","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linewidth/\" target=\"_blank\">3px line width for selected points</a>"},{"name":"plotOptions-area-marker--lineWidth","fullname":"plotOptions.area.marker.lineWidth","title":"lineWidth","parent":"plotOptions-area-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"plotOptions-spline-marker-states-select--lineWidth","fullname":"plotOptions.spline.marker.states.select.lineWidth","title":"lineWidth","parent":"plotOptions-spline-marker-states-select","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linewidth/\" target=\"_blank\">3px line width for selected points</a>"},{"name":"series<scatter>-marker-states-select--lineWidth","fullname":"series<scatter>.marker.states.select.lineWidth","title":"lineWidth","parent":"series<scatter>-marker-states-select","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linewidth/\" target=\"_blank\">3px line width for selected points</a>"},{"name":"series<areaspline>-marker--lineWidth","fullname":"series<areaspline>.marker.lineWidth","title":"lineWidth","parent":"series<areaspline>-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"plotOptions-bubble-marker--lineWidth","fullname":"plotOptions.bubble.marker.lineWidth","title":"lineWidth","parent":"plotOptions-bubble-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<waterfall>-states-hover-marker--lineWidth","fullname":"series<waterfall>.states.hover.marker.lineWidth","title":"lineWidth","parent":"series<waterfall>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<area>-states-hover--lineWidth","fullname":"series<area>.states.hover.lineWidth","title":"lineWidth","parent":"series<area>-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<area>-marker-states-hover--lineWidth","fullname":"series<area>.marker.states.hover.lineWidth","title":"lineWidth","parent":"series<area>-marker-states-hover","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linewidth/\" target=\"_blank\">3px line width</a>"},{"name":"plotOptions-gauge-states-hover--lineWidth","fullname":"plotOptions.gauge.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-gauge-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<errorbar>--lineWidth","fullname":"series<errorbar>.lineWidth","title":"lineWidth","parent":"series<errorbar>","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"3.0","description":"The width of the line surrounding the box. If any of <a href=\"#plotOptions.boxplot.stemWidth\">stemWidth</a>, <a href=\"#plotOptions.boxplot.medianWidth\">medianWidth</a> or <a href=\"#plotOptions.boxplot.whiskerWidth\">whiskerWidth</a> are <code>null</code>, the lineWidth also applies to these lines.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/error-bar-styling/\" target=\"_blank\">error bar styling</a>","seeAlso":"","deprecated":false},{"name":"series<spline>-states-hover--lineWidth","fullname":"series<spline>.states.hover.lineWidth","title":"lineWidth","parent":"series<spline>-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<scatter>-states-hover--lineWidth","fullname":"series<scatter>.states.hover.lineWidth","title":"lineWidth","parent":"series<scatter>-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"plotOptions-line-states-hover-marker--lineWidth","fullname":"plotOptions.line.states.hover.marker.lineWidth","title":"lineWidth","parent":"plotOptions-line-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<pie>-states-hover--lineWidth","fullname":"series<pie>.states.hover.lineWidth","title":"lineWidth","parent":"series<pie>-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<scatter>-data-marker--lineWidth","fullname":"series<scatter>.data.marker.lineWidth","title":"lineWidth","parent":"series<scatter>-data-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<bar>-states-hover-marker--lineWidth","fullname":"series<bar>.states.hover.marker.lineWidth","title":"lineWidth","parent":"series<bar>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<areasplinerange>-states-hover-marker--lineWidth","fullname":"series<areasplinerange>.states.hover.marker.lineWidth","title":"lineWidth","parent":"series<areasplinerange>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"plotOptions-errorbar-states-hover--lineWidth","fullname":"plotOptions.errorbar.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-errorbar-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"plotOptions-line-marker--lineWidth","fullname":"plotOptions.line.marker.lineWidth","title":"lineWidth","parent":"plotOptions-line-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<line>-marker-states-select--lineWidth","fullname":"series<line>.marker.states.select.lineWidth","title":"lineWidth","parent":"series<line>-marker-states-select","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linewidth/\" target=\"_blank\">3px line width for selected points</a>"},{"name":"series<area>-marker-states-select--lineWidth","fullname":"series<area>.marker.states.select.lineWidth","title":"lineWidth","parent":"series<area>-marker-states-select","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linewidth/\" target=\"_blank\">3px line width for selected points</a>"},{"name":"plotOptions-spline--lineWidth","fullname":"plotOptions.spline.lineWidth","title":"lineWidth","parent":"plotOptions-spline","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"5px <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-linewidth-general/\" target=\"_blank\">on all series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-linewidth-specific/\" target=\"_blank\">on one single series</a>"},{"name":"series<gauge>-states-hover--lineWidth","fullname":"series<gauge>.states.hover.lineWidth","title":"lineWidth","parent":"series<gauge>-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"plotOptions-pie-states-hover--lineWidth","fullname":"plotOptions.pie.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-pie-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<errorbar>-states-hover--lineWidth","fullname":"series<errorbar>.states.hover.lineWidth","title":"lineWidth","parent":"series<errorbar>-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<columnrange>-states-hover-marker--lineWidth","fullname":"series<columnrange>.states.hover.marker.lineWidth","title":"lineWidth","parent":"series<columnrange>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<treemap>-states-hover-marker--lineWidth","fullname":"series<treemap>.states.hover.marker.lineWidth","title":"lineWidth","parent":"series<treemap>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"yAxis--lineWidth","fullname":"yAxis.lineWidth","title":"lineWidth","parent":"yAxis","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the line marking the axis itself.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/linecolor/\" target=\"_blank\">A 1px line on Y axis</a>"},{"name":"plotOptions-areasplinerange-states-hover--lineWidth","fullname":"plotOptions.areasplinerange.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-areasplinerange-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<polygon>-data-marker--lineWidth","fullname":"series<polygon>.data.marker.lineWidth","title":"lineWidth","parent":"series<polygon>-data-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"plotOptions-gauge-states-hover-marker--lineWidth","fullname":"plotOptions.gauge.states.hover.marker.lineWidth","title":"lineWidth","parent":"plotOptions-gauge-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<scatter>-data-marker-states-hover--lineWidth","fullname":"series<scatter>.data.marker.states.hover.lineWidth","title":"lineWidth","parent":"series<scatter>-data-marker-states-hover","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linewidth/\" target=\"_blank\">3px line width</a>"},{"name":"series<scatter>-states-hover-marker--lineWidth","fullname":"series<scatter>.states.hover.marker.lineWidth","title":"lineWidth","parent":"series<scatter>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<bubble>-marker--lineWidth","fullname":"series<bubble>.marker.lineWidth","title":"lineWidth","parent":"series<bubble>-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"plotOptions-area-states-hover-marker--lineWidth","fullname":"plotOptions.area.states.hover.marker.lineWidth","title":"lineWidth","parent":"plotOptions-area-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<area>-states-hover-marker--lineWidth","fullname":"series<area>.states.hover.marker.lineWidth","title":"lineWidth","parent":"series<area>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"plotOptions-scatter-marker-states-hover--lineWidth","fullname":"plotOptions.scatter.marker.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-scatter-marker-states-hover","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linewidth/\" target=\"_blank\">3px line width</a>"},{"name":"plotOptions-area-marker-states-hover--lineWidth","fullname":"plotOptions.area.marker.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-area-marker-states-hover","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linewidth/\" target=\"_blank\">3px line width</a>"},{"name":"plotOptions-polygon-marker--lineWidth","fullname":"plotOptions.polygon.marker.lineWidth","title":"lineWidth","parent":"plotOptions-polygon-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<polygon>-data-marker-states-hover--lineWidth","fullname":"series<polygon>.data.marker.states.hover.lineWidth","title":"lineWidth","parent":"series<polygon>-data-marker-states-hover","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linewidth/\" target=\"_blank\">3px line width</a>"},{"name":"series<spline>-states-hover-marker--lineWidth","fullname":"series<spline>.states.hover.marker.lineWidth","title":"lineWidth","parent":"series<spline>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"plotOptions-area-states-hover--lineWidth","fullname":"plotOptions.area.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-area-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"plotOptions-funnel-states-hover--lineWidth","fullname":"plotOptions.funnel.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-funnel-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<pyramid>-states-hover-marker--lineWidth","fullname":"series<pyramid>.states.hover.marker.lineWidth","title":"lineWidth","parent":"series<pyramid>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<pyramid>-states-hover--lineWidth","fullname":"series<pyramid>.states.hover.lineWidth","title":"lineWidth","parent":"series<pyramid>-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"plotOptions-bubble-states-hover-marker--lineWidth","fullname":"plotOptions.bubble.states.hover.marker.lineWidth","title":"lineWidth","parent":"plotOptions-bubble-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<waterfall>-states-hover--lineWidth","fullname":"series<waterfall>.states.hover.lineWidth","title":"lineWidth","parent":"series<waterfall>-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"plotOptions-heatmap-states-hover--lineWidth","fullname":"plotOptions.heatmap.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-heatmap-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"plotOptions-areaspline-states-hover-marker--lineWidth","fullname":"plotOptions.areaspline.states.hover.marker.lineWidth","title":"lineWidth","parent":"plotOptions-areaspline-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"plotOptions-heatmap-states-hover-marker--lineWidth","fullname":"plotOptions.heatmap.states.hover.marker.lineWidth","title":"lineWidth","parent":"plotOptions-heatmap-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<treemap>-states-hover--lineWidth","fullname":"series<treemap>.states.hover.lineWidth","title":"lineWidth","parent":"series<treemap>-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<scatter>--lineWidth","fullname":"series<scatter>.lineWidth","title":"lineWidth","parent":"series<scatter>","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the line connecting the data points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/scatter-linewidth-none/\" target=\"_blank\">0 by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/scatter-linewidth-1/\" target=\"_blank\">1px</a>"},{"name":"plotOptions-pyramid-states-hover-marker--lineWidth","fullname":"plotOptions.pyramid.states.hover.marker.lineWidth","title":"lineWidth","parent":"plotOptions-pyramid-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<gauge>-states-hover-marker--lineWidth","fullname":"series<gauge>.states.hover.marker.lineWidth","title":"lineWidth","parent":"series<gauge>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"plotOptions-series--lineWidth","fullname":"plotOptions.series.lineWidth","title":"lineWidth","parent":"plotOptions-series","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"5px <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-linewidth-general/\" target=\"_blank\">on all series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-linewidth-specific/\" target=\"_blank\">on one single series</a>"},{"name":"plotOptions-arearange-states-hover--lineWidth","fullname":"plotOptions.arearange.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-arearange-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"plotOptions-areaspline-marker-states-hover--lineWidth","fullname":"plotOptions.areaspline.marker.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-areaspline-marker-states-hover","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linewidth/\" target=\"_blank\">3px line width</a>"},{"name":"plotOptions-errorbar--lineWidth","fullname":"plotOptions.errorbar.lineWidth","title":"lineWidth","parent":"plotOptions-errorbar","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"3.0","description":"The width of the line surrounding the box. If any of <a href=\"#plotOptions.boxplot.stemWidth\">stemWidth</a>, <a href=\"#plotOptions.boxplot.medianWidth\">medianWidth</a> or <a href=\"#plotOptions.boxplot.whiskerWidth\">whiskerWidth</a> are <code>null</code>, the lineWidth also applies to these lines.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/error-bar-styling/\" target=\"_blank\">error bar styling</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-states-hover-marker--lineWidth","fullname":"plotOptions.spline.states.hover.marker.lineWidth","title":"lineWidth","parent":"plotOptions-spline-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<areaspline>-data-marker--lineWidth","fullname":"series<areaspline>.data.marker.lineWidth","title":"lineWidth","parent":"series<areaspline>-data-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<bubble>-states-hover-marker--lineWidth","fullname":"series<bubble>.states.hover.marker.lineWidth","title":"lineWidth","parent":"series<bubble>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<scatter>-data-marker-states-select--lineWidth","fullname":"series<scatter>.data.marker.states.select.lineWidth","title":"lineWidth","parent":"series<scatter>-data-marker-states-select","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linewidth/\" target=\"_blank\">3px line width for selected points</a>"},{"name":"plotOptions-column-states-hover-marker--lineWidth","fullname":"plotOptions.column.states.hover.marker.lineWidth","title":"lineWidth","parent":"plotOptions-column-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<polygon>-states-hover-marker--lineWidth","fullname":"series<polygon>.states.hover.marker.lineWidth","title":"lineWidth","parent":"series<polygon>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"plotOptions-line-states-hover--lineWidth","fullname":"plotOptions.line.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-line-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"plotOptions-polygon-states-hover-marker--lineWidth","fullname":"plotOptions.polygon.states.hover.marker.lineWidth","title":"lineWidth","parent":"plotOptions-polygon-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"plotOptions-scatter-states-hover-marker--lineWidth","fullname":"plotOptions.scatter.states.hover.marker.lineWidth","title":"lineWidth","parent":"plotOptions-scatter-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<bubble>--lineWidth","fullname":"series<bubble>.lineWidth","title":"lineWidth","parent":"series<bubble>","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the line connecting the data points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/scatter-linewidth-none/\" target=\"_blank\">0 by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/scatter-linewidth-1/\" target=\"_blank\">1px</a>"},{"name":"series<funnel>-states-hover--lineWidth","fullname":"series<funnel>.states.hover.lineWidth","title":"lineWidth","parent":"series<funnel>-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<line>-marker--lineWidth","fullname":"series<line>.marker.lineWidth","title":"lineWidth","parent":"series<line>-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<area>-marker--lineWidth","fullname":"series<area>.marker.lineWidth","title":"lineWidth","parent":"series<area>-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<areaspline>-states-hover--lineWidth","fullname":"series<areaspline>.states.hover.lineWidth","title":"lineWidth","parent":"series<areaspline>-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<heatmap>-states-hover-marker--lineWidth","fullname":"series<heatmap>.states.hover.marker.lineWidth","title":"lineWidth","parent":"series<heatmap>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<areaspline>-data-marker-states-select--lineWidth","fullname":"series<areaspline>.data.marker.states.select.lineWidth","title":"lineWidth","parent":"series<areaspline>-data-marker-states-select","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linewidth/\" target=\"_blank\">3px line width for selected points</a>"},{"name":"plotOptions-polygon-states-hover--lineWidth","fullname":"plotOptions.polygon.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-polygon-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<column>-states-hover--lineWidth","fullname":"series<column>.states.hover.lineWidth","title":"lineWidth","parent":"series<column>-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"plotOptions-spline-marker--lineWidth","fullname":"plotOptions.spline.marker.lineWidth","title":"lineWidth","parent":"plotOptions-spline-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"plotOptions-spline-states-hover--lineWidth","fullname":"plotOptions.spline.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-spline-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<areasplinerange>-states-hover--lineWidth","fullname":"series<areasplinerange>.states.hover.lineWidth","title":"lineWidth","parent":"series<areasplinerange>-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"plotOptions-pyramid-states-hover--lineWidth","fullname":"plotOptions.pyramid.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-pyramid-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<errorbar>-states-hover-marker--lineWidth","fullname":"series<errorbar>.states.hover.marker.lineWidth","title":"lineWidth","parent":"series<errorbar>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<bubble>-states-hover--lineWidth","fullname":"series<bubble>.states.hover.lineWidth","title":"lineWidth","parent":"series<bubble>-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<heatmap>-states-hover--lineWidth","fullname":"series<heatmap>.states.hover.lineWidth","title":"lineWidth","parent":"series<heatmap>-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"plotOptions-bar-states-hover-marker--lineWidth","fullname":"plotOptions.bar.states.hover.marker.lineWidth","title":"lineWidth","parent":"plotOptions-bar-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"plotOptions-solidgauge-states-hover-marker--lineWidth","fullname":"plotOptions.solidgauge.states.hover.marker.lineWidth","title":"lineWidth","parent":"plotOptions-solidgauge-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"plotOptions-polygon-marker-states-select--lineWidth","fullname":"plotOptions.polygon.marker.states.select.lineWidth","title":"lineWidth","parent":"plotOptions-polygon-marker-states-select","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linewidth/\" target=\"_blank\">3px line width for selected points</a>"},{"name":"plotOptions-waterfall-states-hover--lineWidth","fullname":"plotOptions.waterfall.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-waterfall-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"plotOptions-series-marker-states-hover--lineWidth","fullname":"plotOptions.series.marker.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-series-marker-states-hover","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linewidth/\" target=\"_blank\">3px line width</a>"},{"name":"xAxis--lineWidth","fullname":"xAxis.lineWidth","title":"lineWidth","parent":"xAxis","isParent":false,"returnType":"Number","defaults":"1","description":"The width of the line marking the axis itself.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/linecolor/\" target=\"_blank\">A 1px line on Y axis</a>"},{"name":"series<funnel>-states-hover-marker--lineWidth","fullname":"series<funnel>.states.hover.marker.lineWidth","title":"lineWidth","parent":"series<funnel>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<line>--lineWidth","fullname":"series<line>.lineWidth","title":"lineWidth","parent":"series<line>","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"5px <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-linewidth-general/\" target=\"_blank\">on all series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-linewidth-specific/\" target=\"_blank\">on one single series</a>"},{"name":"plotOptions-pie-states-hover-marker--lineWidth","fullname":"plotOptions.pie.states.hover.marker.lineWidth","title":"lineWidth","parent":"plotOptions-pie-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<arearange>--lineWidth","fullname":"series<arearange>.lineWidth","title":"lineWidth","parent":"series<arearange>","isParent":false,"returnType":"Number","defaults":"1","since":"2.3.0","description":"Pixel width of the arearange graph line.","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>-data-marker-states-select--lineWidth","fullname":"series<spline>.data.marker.states.select.lineWidth","title":"lineWidth","parent":"series<spline>-data-marker-states-select","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linewidth/\" target=\"_blank\">3px line width for selected points</a>"},{"name":"plotOptions-scatter-marker--lineWidth","fullname":"plotOptions.scatter.marker.lineWidth","title":"lineWidth","parent":"plotOptions-scatter-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<line>-marker-states-hover--lineWidth","fullname":"series<line>.marker.states.hover.lineWidth","title":"lineWidth","parent":"series<line>-marker-states-hover","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linewidth/\" target=\"_blank\">3px line width</a>"},{"name":"plotOptions-boxplot-states-hover-marker--lineWidth","fullname":"plotOptions.boxplot.states.hover.marker.lineWidth","title":"lineWidth","parent":"plotOptions-boxplot-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<solidgauge>-states-hover-marker--lineWidth","fullname":"series<solidgauge>.states.hover.marker.lineWidth","title":"lineWidth","parent":"series<solidgauge>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"plotOptions-series-states-hover--lineWidth","fullname":"plotOptions.series.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-series-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<arearange>-states-hover-marker--lineWidth","fullname":"series<arearange>.states.hover.marker.lineWidth","title":"lineWidth","parent":"series<arearange>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<area>-data-marker--lineWidth","fullname":"series<area>.data.marker.lineWidth","title":"lineWidth","parent":"series<area>-data-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"plotOptions-areaspline--lineWidth","fullname":"plotOptions.areaspline.lineWidth","title":"lineWidth","parent":"plotOptions-areaspline","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"5px <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-linewidth-general/\" target=\"_blank\">on all series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-linewidth-specific/\" target=\"_blank\">on one single series</a>"},{"name":"series<boxplot>-states-hover-marker--lineWidth","fullname":"series<boxplot>.states.hover.marker.lineWidth","title":"lineWidth","parent":"series<boxplot>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<solidgauge>-states-hover--lineWidth","fullname":"series<solidgauge>.states.hover.lineWidth","title":"lineWidth","parent":"series<solidgauge>-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"plotOptions-series-states-hover-marker--lineWidth","fullname":"plotOptions.series.states.hover.marker.lineWidth","title":"lineWidth","parent":"plotOptions-series-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<spline>-marker-states-select--lineWidth","fullname":"series<spline>.marker.states.select.lineWidth","title":"lineWidth","parent":"series<spline>-marker-states-select","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linewidth/\" target=\"_blank\">3px line width for selected points</a>"},{"name":"plotOptions-waterfall-states-hover-marker--lineWidth","fullname":"plotOptions.waterfall.states.hover.marker.lineWidth","title":"lineWidth","parent":"plotOptions-waterfall-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<polygon>-marker-states-hover--lineWidth","fullname":"series<polygon>.marker.states.hover.lineWidth","title":"lineWidth","parent":"series<polygon>-marker-states-hover","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linewidth/\" target=\"_blank\">3px line width</a>"},{"name":"plotOptions-bubble-marker-states-hover--lineWidth","fullname":"plotOptions.bubble.marker.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-bubble-marker-states-hover","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linewidth/\" target=\"_blank\">3px line width</a>"},{"name":"plotOptions-solidgauge-states-hover--lineWidth","fullname":"plotOptions.solidgauge.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-solidgauge-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"plotOptions-series-marker-states-select--lineWidth","fullname":"plotOptions.series.marker.states.select.lineWidth","title":"lineWidth","parent":"plotOptions-series-marker-states-select","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linewidth/\" target=\"_blank\">3px line width for selected points</a>"},{"name":"series<spline>-marker--lineWidth","fullname":"series<spline>.marker.lineWidth","title":"lineWidth","parent":"series<spline>-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"plotOptions-series-marker--lineWidth","fullname":"plotOptions.series.marker.lineWidth","title":"lineWidth","parent":"plotOptions-series-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<line>-states-hover-marker--lineWidth","fullname":"series<line>.states.hover.marker.lineWidth","title":"lineWidth","parent":"series<line>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"series<scatter>-marker--lineWidth","fullname":"series<scatter>.marker.lineWidth","title":"lineWidth","parent":"series<scatter>-marker","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-fillcolor/\" target=\"_blank\">2px blue marker</a>"},{"name":"plotOptions-areaspline-states-hover--lineWidth","fullname":"plotOptions.areaspline.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-areaspline-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<line>-data-marker-states-hover--lineWidth","fullname":"series<line>.data.marker.states.hover.lineWidth","title":"lineWidth","parent":"series<line>-data-marker-states-hover","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-linewidth/\" target=\"_blank\">3px line width</a>"},{"name":"plotOptions-areasplinerange--lineWidth","fullname":"plotOptions.areasplinerange.lineWidth","title":"lineWidth","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"Number","defaults":"1","since":"2.3.0","description":"Pixel width of the arearange graph line.","demo":"","seeAlso":"","deprecated":false},{"name":"series<boxplot>-states-hover--lineWidth","fullname":"series<boxplot>.states.hover.lineWidth","title":"lineWidth","parent":"series<boxplot>-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<area>-data-marker-states-select--lineWidth","fullname":"series<area>.data.marker.states.select.lineWidth","title":"lineWidth","parent":"series<area>-data-marker-states-select","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linewidth/\" target=\"_blank\">3px line width for selected points</a>"},{"name":"series<columnrange>-states-hover--lineWidth","fullname":"series<columnrange>.states.hover.lineWidth","title":"lineWidth","parent":"series<columnrange>-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"plotOptions-areaspline-marker-states-select--lineWidth","fullname":"plotOptions.areaspline.marker.states.select.lineWidth","title":"lineWidth","parent":"plotOptions-areaspline-marker-states-select","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linewidth/\" target=\"_blank\">3px line width for selected points</a>"},{"name":"plotOptions-column-states-hover--lineWidth","fullname":"plotOptions.column.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-column-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"plotOptions-bar-states-hover--lineWidth","fullname":"plotOptions.bar.states.hover.lineWidth","title":"lineWidth","parent":"plotOptions-bar-states-hover","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidth/\" target=\"_blank\">5px line on hover</a>"},{"name":"series<area>--lineWidth","fullname":"series<area>.lineWidth","title":"lineWidth","parent":"series<area>","isParent":false,"returnType":"Number","defaults":"2","description":"Pixel with of the graph line.","demo":"5px <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-linewidth-general/\" target=\"_blank\">on all series</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-linewidth-specific/\" target=\"_blank\">on one single series</a>"},{"name":"plotOptions-scatter-marker-states-select--lineWidth","fullname":"plotOptions.scatter.marker.states.select.lineWidth","title":"lineWidth","parent":"plotOptions-scatter-marker-states-select","isParent":false,"returnType":"Number","defaults":"0","description":"The width of the point marker's outline.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-linewidth/\" target=\"_blank\">3px line width for selected points</a>"},{"name":"series<spline>-data-marker-states-hover--lineWidthPlus","fullname":"series<spline>.data.marker.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<spline>-data-marker-states-hover","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0.3","description":"The additional line width for a hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">2 pixels wider on hover</a>","seeAlso":"","deprecated":false},{"name":"series<scatter>-data-marker-states-hover--lineWidthPlus","fullname":"series<scatter>.data.marker.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<scatter>-data-marker-states-hover","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0.3","description":"The additional line width for a hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">2 pixels wider on hover</a>","seeAlso":"","deprecated":false},{"name":"series<areaspline>-states-hover--lineWidthPlus","fullname":"series<areaspline>.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<areaspline>-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"plotOptions-line-states-hover--lineWidthPlus","fullname":"plotOptions.line.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-line-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"series<columnrange>-states-hover--lineWidthPlus","fullname":"series<columnrange>.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<columnrange>-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"series<spline>-marker-states-hover--lineWidthPlus","fullname":"series<spline>.marker.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<spline>-marker-states-hover","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0.3","description":"The additional line width for a hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">2 pixels wider on hover</a>","seeAlso":"","deprecated":false},{"name":"series<area>-data-marker-states-hover--lineWidthPlus","fullname":"series<area>.data.marker.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<area>-data-marker-states-hover","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0.3","description":"The additional line width for a hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">2 pixels wider on hover</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-area-marker-states-hover--lineWidthPlus","fullname":"plotOptions.area.marker.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-area-marker-states-hover","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0.3","description":"The additional line width for a hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">2 pixels wider on hover</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange-states-hover--lineWidthPlus","fullname":"plotOptions.columnrange.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-columnrange-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"plotOptions-gauge-states-hover--lineWidthPlus","fullname":"plotOptions.gauge.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-gauge-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"plotOptions-scatter-marker-states-hover--lineWidthPlus","fullname":"plotOptions.scatter.marker.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-scatter-marker-states-hover","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0.3","description":"The additional line width for a hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">2 pixels wider on hover</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-pie-states-hover--lineWidthPlus","fullname":"plotOptions.pie.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-pie-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"plotOptions-area-states-hover--lineWidthPlus","fullname":"plotOptions.area.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-area-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"plotOptions-areaspline-marker-states-hover--lineWidthPlus","fullname":"plotOptions.areaspline.marker.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-areaspline-marker-states-hover","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0.3","description":"The additional line width for a hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">2 pixels wider on hover</a>","seeAlso":"","deprecated":false},{"name":"series<line>-marker-states-hover--lineWidthPlus","fullname":"series<line>.marker.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<line>-marker-states-hover","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0.3","description":"The additional line width for a hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">2 pixels wider on hover</a>","seeAlso":"","deprecated":false},{"name":"series<scatter>-states-hover--lineWidthPlus","fullname":"series<scatter>.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<scatter>-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"plotOptions-waterfall-states-hover--lineWidthPlus","fullname":"plotOptions.waterfall.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-waterfall-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"plotOptions-bubble-states-hover--lineWidthPlus","fullname":"plotOptions.bubble.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-bubble-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"plotOptions-polygon-marker-states-hover--lineWidthPlus","fullname":"plotOptions.polygon.marker.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-polygon-marker-states-hover","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0.3","description":"The additional line width for a hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">2 pixels wider on hover</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar-states-hover--lineWidthPlus","fullname":"plotOptions.errorbar.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-errorbar-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"plotOptions-arearange-states-hover--lineWidthPlus","fullname":"plotOptions.arearange.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-arearange-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"plotOptions-areaspline-states-hover--lineWidthPlus","fullname":"plotOptions.areaspline.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-areaspline-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"series<treemap>-states-hover--lineWidthPlus","fullname":"series<treemap>.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<treemap>-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"series<line>-data-marker-states-hover--lineWidthPlus","fullname":"series<line>.data.marker.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<line>-data-marker-states-hover","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0.3","description":"The additional line width for a hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">2 pixels wider on hover</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap-states-hover--lineWidthPlus","fullname":"plotOptions.heatmap.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-heatmap-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"plotOptions-boxplot-states-hover--lineWidthPlus","fullname":"plotOptions.boxplot.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-boxplot-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"series<areaspline>-marker-states-hover--lineWidthPlus","fullname":"series<areaspline>.marker.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<areaspline>-marker-states-hover","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0.3","description":"The additional line width for a hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">2 pixels wider on hover</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-marker-states-hover--lineWidthPlus","fullname":"plotOptions.spline.marker.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-spline-marker-states-hover","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0.3","description":"The additional line width for a hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">2 pixels wider on hover</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-series-marker-states-hover--lineWidthPlus","fullname":"plotOptions.series.marker.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-series-marker-states-hover","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0.3","description":"The additional line width for a hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">2 pixels wider on hover</a>","seeAlso":"","deprecated":false},{"name":"series<polygon>-marker-states-hover--lineWidthPlus","fullname":"series<polygon>.marker.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<polygon>-marker-states-hover","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0.3","description":"The additional line width for a hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">2 pixels wider on hover</a>","seeAlso":"","deprecated":false},{"name":"series<spline>-states-hover--lineWidthPlus","fullname":"series<spline>.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<spline>-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"series<bubble>-marker-states-hover--lineWidthPlus","fullname":"series<bubble>.marker.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<bubble>-marker-states-hover","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0.3","description":"The additional line width for a hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">2 pixels wider on hover</a>","seeAlso":"","deprecated":false},{"name":"series<polygon>-data-marker-states-hover--lineWidthPlus","fullname":"series<polygon>.data.marker.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<polygon>-data-marker-states-hover","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0.3","description":"The additional line width for a hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">2 pixels wider on hover</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-states-hover--lineWidthPlus","fullname":"plotOptions.pyramid.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-pyramid-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"plotOptions-bar-states-hover--lineWidthPlus","fullname":"plotOptions.bar.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-bar-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"series<gauge>-states-hover--lineWidthPlus","fullname":"series<gauge>.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<gauge>-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"series<bar>-states-hover--lineWidthPlus","fullname":"series<bar>.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<bar>-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"plotOptions-polygon-states-hover--lineWidthPlus","fullname":"plotOptions.polygon.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-polygon-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"series<bubble>-states-hover--lineWidthPlus","fullname":"series<bubble>.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<bubble>-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"series<areasplinerange>-states-hover--lineWidthPlus","fullname":"series<areasplinerange>.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<areasplinerange>-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"series<area>-states-hover--lineWidthPlus","fullname":"series<area>.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<area>-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"series<area>-marker-states-hover--lineWidthPlus","fullname":"series<area>.marker.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<area>-marker-states-hover","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0.3","description":"The additional line width for a hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">2 pixels wider on hover</a>","seeAlso":"","deprecated":false},{"name":"series<pie>-states-hover--lineWidthPlus","fullname":"series<pie>.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<pie>-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"plotOptions-line-marker-states-hover--lineWidthPlus","fullname":"plotOptions.line.marker.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-line-marker-states-hover","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0.3","description":"The additional line width for a hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">2 pixels wider on hover</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-states-hover--lineWidthPlus","fullname":"plotOptions.spline.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-spline-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"series<waterfall>-states-hover--lineWidthPlus","fullname":"series<waterfall>.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<waterfall>-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"series<errorbar>-states-hover--lineWidthPlus","fullname":"series<errorbar>.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<errorbar>-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"plotOptions-bubble-marker-states-hover--lineWidthPlus","fullname":"plotOptions.bubble.marker.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-bubble-marker-states-hover","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0.3","description":"The additional line width for a hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">2 pixels wider on hover</a>","seeAlso":"","deprecated":false},{"name":"series<heatmap>-states-hover--lineWidthPlus","fullname":"series<heatmap>.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<heatmap>-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"plotOptions-solidgauge-states-hover--lineWidthPlus","fullname":"plotOptions.solidgauge.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-solidgauge-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"plotOptions-series-states-hover--lineWidthPlus","fullname":"plotOptions.series.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-series-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"series<polygon>-states-hover--lineWidthPlus","fullname":"series<polygon>.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<polygon>-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"series<pyramid>-states-hover--lineWidthPlus","fullname":"series<pyramid>.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<pyramid>-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"plotOptions-areasplinerange-states-hover--lineWidthPlus","fullname":"plotOptions.areasplinerange.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-areasplinerange-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"plotOptions-column-states-hover--lineWidthPlus","fullname":"plotOptions.column.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-column-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"plotOptions-treemap-states-hover--lineWidthPlus","fullname":"plotOptions.treemap.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-treemap-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"series<solidgauge>-states-hover--lineWidthPlus","fullname":"series<solidgauge>.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<solidgauge>-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"series<scatter>-marker-states-hover--lineWidthPlus","fullname":"series<scatter>.marker.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<scatter>-marker-states-hover","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0.3","description":"The additional line width for a hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">2 pixels wider on hover</a>","seeAlso":"","deprecated":false},{"name":"series<boxplot>-states-hover--lineWidthPlus","fullname":"series<boxplot>.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<boxplot>-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"plotOptions-scatter-states-hover--lineWidthPlus","fullname":"plotOptions.scatter.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-scatter-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"plotOptions-funnel-states-hover--lineWidthPlus","fullname":"plotOptions.funnel.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"plotOptions-funnel-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"series<funnel>-states-hover--lineWidthPlus","fullname":"series<funnel>.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<funnel>-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"series<areaspline>-data-marker-states-hover--lineWidthPlus","fullname":"series<areaspline>.data.marker.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<areaspline>-data-marker-states-hover","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0.3","description":"The additional line width for a hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">2 pixels wider on hover</a>","seeAlso":"","deprecated":false},{"name":"series<column>-states-hover--lineWidthPlus","fullname":"series<column>.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<column>-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"series<arearange>-states-hover--lineWidthPlus","fullname":"series<arearange>.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<arearange>-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"series<line>-states-hover--lineWidthPlus","fullname":"series<line>.states.hover.lineWidthPlus","title":"lineWidthPlus","parent":"series<line>-states-hover","isParent":false,"returnType":"Number","defaults":"1","since":"4.0.3","description":"The additional line width for the graph of a hovered series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels wider</a>","deprecated":false},{"name":"plotOptions-areaspline--linkedTo","fullname":"plotOptions.areaspline.linkedTo","title":"linkedTo","parent":"plotOptions-areaspline","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar--linkedTo","fullname":"plotOptions.errorbar.linkedTo","title":"linkedTo","parent":"plotOptions-errorbar","isParent":false,"returnType":"String","defaults":":previous","values":"","since":"3.0","description":"The parent series of the error bar. The default value links it to the previous series. Otherwise, use the id of the parent series.","demo":"","seeAlso":"","deprecated":false},{"name":"yAxis--linkedTo","fullname":"yAxis.linkedTo","title":"linkedTo","parent":"yAxis","isParent":false,"returnType":"Number","since":"2.0.2","description":"Index of another axis that this axis is linked to. When an axis is linked to a master axis, it will take the same extremes as the master, but as assigned by min or max or by setExtremes. It can be used to show additional info, or to ease reading the chart by duplicating the scales.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/linkedto/\" target=\"_blank\">Different string formats of the same date</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/linkedto/\" target=\"_blank\">Y values on both sides</a>"},{"name":"series<waterfall>--linkedTo","fullname":"series<waterfall>.linkedTo","title":"linkedTo","parent":"series<waterfall>","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>--linkedTo","fullname":"series<areasplinerange>.linkedTo","title":"linkedTo","parent":"series<areasplinerange>","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"series<boxplot>--linkedTo","fullname":"series<boxplot>.linkedTo","title":"linkedTo","parent":"series<boxplot>","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid--linkedTo","fullname":"plotOptions.pyramid.linkedTo","title":"linkedTo","parent":"plotOptions-pyramid","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall--linkedTo","fullname":"plotOptions.waterfall.linkedTo","title":"linkedTo","parent":"plotOptions-waterfall","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"series<pyramid>--linkedTo","fullname":"series<pyramid>.linkedTo","title":"linkedTo","parent":"series<pyramid>","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"series<polygon>--linkedTo","fullname":"series<polygon>.linkedTo","title":"linkedTo","parent":"series<polygon>","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-area--linkedTo","fullname":"plotOptions.area.linkedTo","title":"linkedTo","parent":"plotOptions-area","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"series<treemap>--linkedTo","fullname":"series<treemap>.linkedTo","title":"linkedTo","parent":"series<treemap>","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap--linkedTo","fullname":"plotOptions.treemap.linkedTo","title":"linkedTo","parent":"plotOptions-treemap","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange--linkedTo","fullname":"plotOptions.arearange.linkedTo","title":"linkedTo","parent":"plotOptions-arearange","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"series<area>--linkedTo","fullname":"series<area>.linkedTo","title":"linkedTo","parent":"series<area>","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"series<arearange>--linkedTo","fullname":"series<arearange>.linkedTo","title":"linkedTo","parent":"series<arearange>","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter--linkedTo","fullname":"plotOptions.scatter.linkedTo","title":"linkedTo","parent":"plotOptions-scatter","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap--linkedTo","fullname":"plotOptions.heatmap.linkedTo","title":"linkedTo","parent":"plotOptions-heatmap","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel--linkedTo","fullname":"plotOptions.funnel.linkedTo","title":"linkedTo","parent":"plotOptions-funnel","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"series<funnel>--linkedTo","fullname":"series<funnel>.linkedTo","title":"linkedTo","parent":"series<funnel>","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"series<bubble>--linkedTo","fullname":"series<bubble>.linkedTo","title":"linkedTo","parent":"series<bubble>","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble--linkedTo","fullname":"plotOptions.bubble.linkedTo","title":"linkedTo","parent":"plotOptions-bubble","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"series<heatmap>--linkedTo","fullname":"series<heatmap>.linkedTo","title":"linkedTo","parent":"series<heatmap>","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-column--linkedTo","fullname":"plotOptions.column.linkedTo","title":"linkedTo","parent":"plotOptions-column","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange--linkedTo","fullname":"plotOptions.columnrange.linkedTo","title":"linkedTo","parent":"plotOptions-columnrange","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"series<spline>--linkedTo","fullname":"series<spline>.linkedTo","title":"linkedTo","parent":"series<spline>","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-line--linkedTo","fullname":"plotOptions.line.linkedTo","title":"linkedTo","parent":"plotOptions-line","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"series<bar>--linkedTo","fullname":"series<bar>.linkedTo","title":"linkedTo","parent":"series<bar>","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon--linkedTo","fullname":"plotOptions.polygon.linkedTo","title":"linkedTo","parent":"plotOptions-polygon","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot--linkedTo","fullname":"plotOptions.boxplot.linkedTo","title":"linkedTo","parent":"plotOptions-boxplot","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange--linkedTo","fullname":"plotOptions.areasplinerange.linkedTo","title":"linkedTo","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"series<line>--linkedTo","fullname":"series<line>.linkedTo","title":"linkedTo","parent":"series<line>","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge--linkedTo","fullname":"plotOptions.gauge.linkedTo","title":"linkedTo","parent":"plotOptions-gauge","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"series<column>--linkedTo","fullname":"series<column>.linkedTo","title":"linkedTo","parent":"series<column>","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-pie--linkedTo","fullname":"plotOptions.pie.linkedTo","title":"linkedTo","parent":"plotOptions-pie","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"series<scatter>--linkedTo","fullname":"series<scatter>.linkedTo","title":"linkedTo","parent":"series<scatter>","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"xAxis--linkedTo","fullname":"xAxis.linkedTo","title":"linkedTo","parent":"xAxis","isParent":false,"returnType":"Number","since":"2.0.2","description":"Index of another axis that this axis is linked to. When an axis is linked to a master axis, it will take the same extremes as the master, but as assigned by min or max or by setExtremes. It can be used to show additional info, or to ease reading the chart by duplicating the scales.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/linkedto/\" target=\"_blank\">Different string formats of the same date</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/linkedto/\" target=\"_blank\">Y values on both sides</a>"},{"name":"series<areaspline>--linkedTo","fullname":"series<areaspline>.linkedTo","title":"linkedTo","parent":"series<areaspline>","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"series<columnrange>--linkedTo","fullname":"series<columnrange>.linkedTo","title":"linkedTo","parent":"series<columnrange>","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"series<gauge>--linkedTo","fullname":"series<gauge>.linkedTo","title":"linkedTo","parent":"series<gauge>","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-bar--linkedTo","fullname":"plotOptions.bar.linkedTo","title":"linkedTo","parent":"plotOptions-bar","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-spline--linkedTo","fullname":"plotOptions.spline.linkedTo","title":"linkedTo","parent":"plotOptions-spline","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"series<pie>--linkedTo","fullname":"series<pie>.linkedTo","title":"linkedTo","parent":"series<pie>","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"series<errorbar>--linkedTo","fullname":"series<errorbar>.linkedTo","title":"linkedTo","parent":"series<errorbar>","isParent":false,"returnType":"String","defaults":":previous","values":"","since":"3.0","description":"The parent series of the error bar. The default value links it to the previous series. Otherwise, use the id of the parent series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-series--linkedTo","fullname":"plotOptions.series.linkedTo","title":"linkedTo","parent":"plotOptions-series","isParent":false,"returnType":"String","defaults":"","values":"","since":"3.0","description":"The <a href=\"#series.id\">id</a> of another series to link to. Additionally, the value can be \":previous\" to link to the previous series. When two series are linked, only the first one appears in the legend. Toggling the visibility of this also toggles the linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/arearange-line/\" target=\"_blank\">Linked series</a>","seeAlso":"","deprecated":false},{"name":"chart-events--load","fullname":"chart.events.load","title":"load","parent":"chart-events","isParent":false,"returnType":"Function","context":"Chart","description":"<p>Fires when the chart is finished loading. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.</p>\r\n\r\n<p>From version 2.0.4, there is also a second parameter to <code>Highcharts.Chart</code> where a callback function can be passed to be executed on chart.load.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/events-load/\" target=\"_blank\">Alert on chart load</a>","deprecated":false},{"name":"loading","fullname":"loading","title":"loading","isParent":true,"description":"The loading options control the appearance of the loading screen that covers the \n\tplot area on chart operations. This screen only appears after an explicit call\n\tto <code>chart.showLoading()</code>. It is a utility for developers to communicate\n\tto the end user that something is going on, for example while retrieving new data\n\tvia an XHR connection. The \"Loading...\" text itself is not part of this configuration\n\tobject, but part of the <code>lang</code> object."},{"name":"lang--loading","fullname":"lang.loading","title":"loading","parent":"lang","isParent":false,"returnType":"String","defaults":"Loading...","description":"The loading text that appears when the chart is set into the loading state following a call to <code>chart.showLoading</code>."},{"name":"series<areasplinerange>-data--low","fullname":"series<areasplinerange>.data.low","title":"low","parent":"series<areasplinerange>-data","isParent":false,"returnType":"Number","description":"The low or minimum value for each data point."},{"name":"series<arearange>-data--low","fullname":"series<arearange>.data.low","title":"low","parent":"series<arearange>-data","isParent":false,"returnType":"Number","description":"The low or minimum value for each data point."},{"name":"series<columnrange>-data--low","fullname":"series<columnrange>.data.low","title":"low","parent":"series<columnrange>-data","isParent":false,"returnType":"Number","description":"The low or minimum value for each data point."},{"name":"series<boxplot>-data--low","fullname":"series<boxplot>.data.low","title":"low","parent":"series<boxplot>-data","isParent":false,"returnType":"Number","description":"The <code>low</code> value for each data point, signifying the lowest value in the sample set. The bottom whisker is drawn here."},{"name":"series<errorbar>-data--low","fullname":"series<errorbar>.data.low","title":"low","parent":"series<errorbar>-data","isParent":false,"returnType":"Number","description":"The low or minimum value for each data point."},{"name":"legend--margin","fullname":"legend.margin","title":"margin","parent":"legend","isParent":false,"returnType":"Number","defaults":"12","since":"2.1","description":"If the plot area sized is calculated automatically and the legend is not floating, the legend margin is the  space between the legend and the axis labels or plot area.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/margin-default/\" target=\"_blank\">12 pixels by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/margin-30/\" target=\"_blank\">30 pixels</a>.","deprecated":false},{"name":"chart--margin","fullname":"chart.margin","title":"margin","parent":"chart","isParent":false,"returnType":"Array","description":"<p>The margin between the outer edge of the chart and the plot area. The numbers in the array designate top, right, bottom and left respectively. Use the options <code>marginTop</code>, <code>marginRight</code>, <code>marginBottom</code> and <code>marginLeft</code> for shorthand setting of one option.</p> <p>Since version 2.1, the margin is 0 by default. The actual space is dynamically calculated  from the offset of axis labels, axis title, title, subtitle and legend in addition to the <code>spacingTop</code>, <code>spacingRight</code>, <code>spacingBottom</code> and <code>spacingLeft</code> options.</p>\n\t\t Defaults to <code>[null]</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/margins-zero/\" target=\"_blank\">Zero margins</a>"},{"name":"xAxis-title--margin","fullname":"xAxis.title.margin","title":"margin","parent":"xAxis-title","isParent":false,"returnType":"Number","description":"The pixel distance between the axis labels or line and the title. Defaults to 0 for horizontal axes, 10 for vertical","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/title-margin/\" target=\"_blank\">Y axis title margin of 60</a>"},{"name":"title--margin","fullname":"title.margin","title":"margin","parent":"title","isParent":false,"returnType":"Number","defaults":"15","since":"2.1","description":"The margin between the title and the plot area, or if a subtitle is present, the margin between the subtitle and the plot area.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/title/margin-50/\" target=\"_blank\">A chart title margin of 50</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/title/margin-subtitle/\" target=\"_blank\">the same margin applied with a subtitle</a>."},{"name":"yAxis-title--margin","fullname":"yAxis.title.margin","title":"margin","parent":"yAxis-title","isParent":false,"returnType":"Number","defaults":"40","description":"The pixel distance between the axis labels and the title. Positive values are outside the axis line, negative are inside.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/title-margin/\" target=\"_blank\">Y axis title margin of 60</a>"},{"name":"chart--marginBottom","fullname":"chart.marginBottom","title":"marginBottom","parent":"chart","isParent":false,"returnType":"Number","since":"2.0","description":"The margin between the bottom outer edge of the chart and the plot area. Use this to set a fixed\r pixel value for the margin as opposed to the default dynamic margin. See also <code>spacingBottom</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/marginbottom/\" target=\"_blank\">100px bottom margin</a>","seeAlso":"","deprecated":false},{"name":"chart--marginLeft","fullname":"chart.marginLeft","title":"marginLeft","parent":"chart","isParent":false,"returnType":"Number","since":"2.0","description":"The margin between the left outer edge of the chart and the plot area. Use this to set a fixed\r pixel value for the margin as opposed to the default dynamic margin. See also <code>spacingLeft</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/marginleft/\" target=\"_blank\">150px left margin</a>","seeAlso":"","deprecated":false},{"name":"chart--marginRight","fullname":"chart.marginRight","title":"marginRight","parent":"chart","isParent":false,"returnType":"Number","since":"2.0","description":"The margin between the right outer edge of the chart and the plot area. Use this to set a fixed\r pixel value for the margin as opposed to the default dynamic margin. See also <code>spacingRight</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/marginright/\" target=\"_blank\">100px right margin</a>","seeAlso":"","deprecated":false},{"name":"chart--marginTop","fullname":"chart.marginTop","title":"marginTop","parent":"chart","isParent":false,"returnType":"Number","since":"2.0","description":"The margin between the top outer edge of the chart and the plot area. Use this to set a fixed pixel value for the margin as opposed to the default dynamic margin. See also <code>spacingTop</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/margintop/\" target=\"_blank\">100px top margin</a>"},{"name":"series<errorbar>-states-hover-marker","fullname":"series<errorbar>.states.hover.marker","title":"marker","parent":"series<errorbar>-states-hover","isParent":true},{"name":"plotOptions-line-states-hover-marker","fullname":"plotOptions.line.states.hover.marker","title":"marker","parent":"plotOptions-line-states-hover","isParent":true},{"name":"plotOptions-scatter-marker","fullname":"plotOptions.scatter.marker","title":"marker","parent":"plotOptions-scatter","isParent":true},{"name":"series<columnrange>-states-hover-marker","fullname":"series<columnrange>.states.hover.marker","title":"marker","parent":"series<columnrange>-states-hover","isParent":true},{"name":"plotOptions-areaspline-marker","fullname":"plotOptions.areaspline.marker","title":"marker","parent":"plotOptions-areaspline","isParent":true},{"name":"series<polygon>-data-marker","fullname":"series<polygon>.data.marker","title":"marker","parent":"series<polygon>-data","isParent":true},{"name":"series<areaspline>-marker","fullname":"series<areaspline>.marker","title":"marker","parent":"series<areaspline>","isParent":true},{"name":"series<areaspline>-data-marker","fullname":"series<areaspline>.data.marker","title":"marker","parent":"series<areaspline>-data","isParent":true},{"name":"plotOptions-areasplinerange-states-hover-marker","fullname":"plotOptions.areasplinerange.states.hover.marker","title":"marker","parent":"plotOptions-areasplinerange-states-hover","isParent":true},{"name":"series<spline>-states-hover-marker","fullname":"series<spline>.states.hover.marker","title":"marker","parent":"series<spline>-states-hover","isParent":true},{"name":"plotOptions-heatmap-states-hover-marker","fullname":"plotOptions.heatmap.states.hover.marker","title":"marker","parent":"plotOptions-heatmap-states-hover","isParent":true},{"name":"plotOptions-line-marker","fullname":"plotOptions.line.marker","title":"marker","parent":"plotOptions-line","isParent":true},{"name":"plotOptions-scatter-states-hover-marker","fullname":"plotOptions.scatter.states.hover.marker","title":"marker","parent":"plotOptions-scatter-states-hover","isParent":true},{"name":"series<polygon>-states-hover-marker","fullname":"series<polygon>.states.hover.marker","title":"marker","parent":"series<polygon>-states-hover","isParent":true},{"name":"series<solidgauge>-states-hover-marker","fullname":"series<solidgauge>.states.hover.marker","title":"marker","parent":"series<solidgauge>-states-hover","isParent":true},{"name":"plotOptions-areaspline-states-hover-marker","fullname":"plotOptions.areaspline.states.hover.marker","title":"marker","parent":"plotOptions-areaspline-states-hover","isParent":true},{"name":"plotOptions-treemap-states-hover-marker","fullname":"plotOptions.treemap.states.hover.marker","title":"marker","parent":"plotOptions-treemap-states-hover","isParent":true},{"name":"series<pyramid>-states-hover-marker","fullname":"series<pyramid>.states.hover.marker","title":"marker","parent":"series<pyramid>-states-hover","isParent":true},{"name":"series<area>-states-hover-marker","fullname":"series<area>.states.hover.marker","title":"marker","parent":"series<area>-states-hover","isParent":true},{"name":"series<areasplinerange>-states-hover-marker","fullname":"series<areasplinerange>.states.hover.marker","title":"marker","parent":"series<areasplinerange>-states-hover","isParent":true},{"name":"series<heatmap>-states-hover-marker","fullname":"series<heatmap>.states.hover.marker","title":"marker","parent":"series<heatmap>-states-hover","isParent":true},{"name":"plotOptions-spline-marker","fullname":"plotOptions.spline.marker","title":"marker","parent":"plotOptions-spline","isParent":true},{"name":"plotOptions-bubble-marker","fullname":"plotOptions.bubble.marker","title":"marker","parent":"plotOptions-bubble","isParent":true},{"name":"series<bubble>-states-hover-marker","fullname":"series<bubble>.states.hover.marker","title":"marker","parent":"series<bubble>-states-hover","isParent":true},{"name":"plotOptions-pie-states-hover-marker","fullname":"plotOptions.pie.states.hover.marker","title":"marker","parent":"plotOptions-pie-states-hover","isParent":true},{"name":"series<scatter>-data-marker","fullname":"series<scatter>.data.marker","title":"marker","parent":"series<scatter>-data","isParent":true},{"name":"series<spline>-marker","fullname":"series<spline>.marker","title":"marker","parent":"series<spline>","isParent":true},{"name":"plotOptions-funnel-states-hover-marker","fullname":"plotOptions.funnel.states.hover.marker","title":"marker","parent":"plotOptions-funnel-states-hover","isParent":true},{"name":"plotOptions-polygon-marker","fullname":"plotOptions.polygon.marker","title":"marker","parent":"plotOptions-polygon","isParent":true},{"name":"series<area>-marker","fullname":"series<area>.marker","title":"marker","parent":"series<area>","isParent":true},{"name":"series<boxplot>-states-hover-marker","fullname":"series<boxplot>.states.hover.marker","title":"marker","parent":"series<boxplot>-states-hover","isParent":true},{"name":"series<areaspline>-states-hover-marker","fullname":"series<areaspline>.states.hover.marker","title":"marker","parent":"series<areaspline>-states-hover","isParent":true},{"name":"plotOptions-errorbar-states-hover-marker","fullname":"plotOptions.errorbar.states.hover.marker","title":"marker","parent":"plotOptions-errorbar-states-hover","isParent":true},{"name":"plotOptions-boxplot-states-hover-marker","fullname":"plotOptions.boxplot.states.hover.marker","title":"marker","parent":"plotOptions-boxplot-states-hover","isParent":true},{"name":"plotOptions-columnrange-states-hover-marker","fullname":"plotOptions.columnrange.states.hover.marker","title":"marker","parent":"plotOptions-columnrange-states-hover","isParent":true},{"name":"plotOptions-arearange-states-hover-marker","fullname":"plotOptions.arearange.states.hover.marker","title":"marker","parent":"plotOptions-arearange-states-hover","isParent":true},{"name":"plotOptions-area-states-hover-marker","fullname":"plotOptions.area.states.hover.marker","title":"marker","parent":"plotOptions-area-states-hover","isParent":true},{"name":"plotOptions-pyramid-states-hover-marker","fullname":"plotOptions.pyramid.states.hover.marker","title":"marker","parent":"plotOptions-pyramid-states-hover","isParent":true},{"name":"series<waterfall>-states-hover-marker","fullname":"series<waterfall>.states.hover.marker","title":"marker","parent":"series<waterfall>-states-hover","isParent":true},{"name":"series<bubble>-marker","fullname":"series<bubble>.marker","title":"marker","parent":"series<bubble>","isParent":true},{"name":"plotOptions-area-marker","fullname":"plotOptions.area.marker","title":"marker","parent":"plotOptions-area","isParent":true},{"name":"series<polygon>-marker","fullname":"series<polygon>.marker","title":"marker","parent":"series<polygon>","isParent":true},{"name":"series<funnel>-states-hover-marker","fullname":"series<funnel>.states.hover.marker","title":"marker","parent":"series<funnel>-states-hover","isParent":true},{"name":"series<column>-states-hover-marker","fullname":"series<column>.states.hover.marker","title":"marker","parent":"series<column>-states-hover","isParent":true},{"name":"series<line>-marker","fullname":"series<line>.marker","title":"marker","parent":"series<line>","isParent":true},{"name":"series<treemap>-states-hover-marker","fullname":"series<treemap>.states.hover.marker","title":"marker","parent":"series<treemap>-states-hover","isParent":true},{"name":"plotOptions-polygon-states-hover-marker","fullname":"plotOptions.polygon.states.hover.marker","title":"marker","parent":"plotOptions-polygon-states-hover","isParent":true},{"name":"series<gauge>-states-hover-marker","fullname":"series<gauge>.states.hover.marker","title":"marker","parent":"series<gauge>-states-hover","isParent":true},{"name":"plotOptions-gauge-states-hover-marker","fullname":"plotOptions.gauge.states.hover.marker","title":"marker","parent":"plotOptions-gauge-states-hover","isParent":true},{"name":"series<line>-states-hover-marker","fullname":"series<line>.states.hover.marker","title":"marker","parent":"series<line>-states-hover","isParent":true},{"name":"series<spline>-data-marker","fullname":"series<spline>.data.marker","title":"marker","parent":"series<spline>-data","isParent":true},{"name":"plotOptions-waterfall-states-hover-marker","fullname":"plotOptions.waterfall.states.hover.marker","title":"marker","parent":"plotOptions-waterfall-states-hover","isParent":true},{"name":"series<scatter>-marker","fullname":"series<scatter>.marker","title":"marker","parent":"series<scatter>","isParent":true},{"name":"plotOptions-bubble-states-hover-marker","fullname":"plotOptions.bubble.states.hover.marker","title":"marker","parent":"plotOptions-bubble-states-hover","isParent":true},{"name":"plotOptions-series-states-hover-marker","fullname":"plotOptions.series.states.hover.marker","title":"marker","parent":"plotOptions-series-states-hover","isParent":true},{"name":"series<pie>-states-hover-marker","fullname":"series<pie>.states.hover.marker","title":"marker","parent":"series<pie>-states-hover","isParent":true},{"name":"series<line>-data-marker","fullname":"series<line>.data.marker","title":"marker","parent":"series<line>-data","isParent":true},{"name":"series<bar>-states-hover-marker","fullname":"series<bar>.states.hover.marker","title":"marker","parent":"series<bar>-states-hover","isParent":true},{"name":"plotOptions-column-states-hover-marker","fullname":"plotOptions.column.states.hover.marker","title":"marker","parent":"plotOptions-column-states-hover","isParent":true},{"name":"plotOptions-series-marker","fullname":"plotOptions.series.marker","title":"marker","parent":"plotOptions-series","isParent":true},{"name":"series<area>-data-marker","fullname":"series<area>.data.marker","title":"marker","parent":"series<area>-data","isParent":true},{"name":"plotOptions-bar-states-hover-marker","fullname":"plotOptions.bar.states.hover.marker","title":"marker","parent":"plotOptions-bar-states-hover","isParent":true},{"name":"series<arearange>-states-hover-marker","fullname":"series<arearange>.states.hover.marker","title":"marker","parent":"series<arearange>-states-hover","isParent":true},{"name":"series<scatter>-states-hover-marker","fullname":"series<scatter>.states.hover.marker","title":"marker","parent":"series<scatter>-states-hover","isParent":true},{"name":"plotOptions-solidgauge-states-hover-marker","fullname":"plotOptions.solidgauge.states.hover.marker","title":"marker","parent":"plotOptions-solidgauge-states-hover","isParent":true},{"name":"plotOptions-spline-states-hover-marker","fullname":"plotOptions.spline.states.hover.marker","title":"marker","parent":"plotOptions-spline-states-hover","isParent":true},{"name":"xAxis--max","fullname":"xAxis.max","title":"max","parent":"xAxis","isParent":false,"returnType":"Number","description":"The maximum value of the axis. If <code>null</code>, the max value is automatically calculated. If the <code>endOnTick</code> option is true, the <code>max</code> value might be rounded up. The actual maximum value is also influenced by  <a class=\"internal\" href=\"#chart\">chart.alignTicks</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/max-200/\" target=\"_blank\">Y axis max of 200</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/max-logarithmic/\" target=\"_blank\">Y axis max on logarithmic axis</a>"},{"name":"yAxis--max","fullname":"yAxis.max","title":"max","parent":"yAxis","isParent":false,"returnType":"Number","description":"The maximum value of the axis. If <code>null</code>, the max value is automatically calculated. If the <code>endOnTick</code> option is true, the <code>max</code> value might be rounded up. The actual maximum value is also influenced by  <a class=\"internal\" href=\"#chart\">chart.alignTicks</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/max-200/\" target=\"_blank\">Y axis max of 200</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/max-logarithmic/\" target=\"_blank\">Y axis max on logarithmic axis</a>"},{"name":"yAxis--maxColor","fullname":"yAxis.maxColor","title":"maxColor","parent":"yAxis","isParent":false,"returnType":"Color","defaults":"#102D4C","values":"","since":"4.0","description":"Solid gauge only. Unless <a href=\"#yAxis.stops\">stops</a> are set, the color to represent the maximum value of the Y axis.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/mincolor-maxcolor/\" target=\"_blank\">Min and max colors</a>","seeAlso":"","deprecated":false},{"name":"legend--maxHeight","fullname":"legend.maxHeight","title":"maxHeight","parent":"legend","isParent":false,"returnType":"Number","since":"2.3.0","description":"Maximum pixel height for the legend. When the maximum height is extended, navigation will show.","demo":"","seeAlso":"","deprecated":false},{"name":"yAxis--maxPadding","fullname":"yAxis.maxPadding","title":"maxPadding","parent":"yAxis","isParent":false,"returnType":"Number","defaults":"0.05","since":"1.2.0","description":"Padding of the max value relative to the length of the axis. A padding of 0.05 will make a 100px axis 5px longer. This is useful when you don't want the highest data value to appear on the edge of the plot area.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/maxpadding-02/\" target=\"_blank\">Max padding of 0.2</a>"},{"name":"xAxis--maxPadding","fullname":"xAxis.maxPadding","title":"maxPadding","parent":"xAxis","isParent":false,"returnType":"Number","defaults":"0.01","since":"1.2.0","description":"Padding of the max value relative to the length of the axis. A padding of 0.05 will make a 100px axis 5px longer. This is useful when you don't want the highest data value to appear on the edge of the plot area. When the axis' <code>max</code> option is set or a max extreme is set using <code>axis.setExtremes()</code>, the maxPadding will be ignored.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/maxpadding/\" target=\"_blank\">Max padding of 0.25 on y axis</a>"},{"name":"plotOptions-bubble--maxSize","fullname":"plotOptions.bubble.maxSize","title":"maxSize","parent":"plotOptions-bubble","isParent":false,"returnType":"String","defaults":"20%","values":"","since":"3.0","description":"Maximum bubble size. Bubbles will automatically size between the <code>minSize</code> and <code>maxSize</code> to reflect the <code>z</code> value of each bubble. Can be either pixels (when no unit is given), or a percentage of the smallest one of the plot width and height. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/bubble-size/\" target=\"_blank\">Bubble size</a>","seeAlso":"","deprecated":false},{"name":"series<bubble>--maxSize","fullname":"series<bubble>.maxSize","title":"maxSize","parent":"series<bubble>","isParent":false,"returnType":"String","defaults":"20%","values":"","since":"3.0","description":"Maximum bubble size. Bubbles will automatically size between the <code>minSize</code> and <code>maxSize</code> to reflect the <code>z</code> value of each bubble. Can be either pixels (when no unit is given), or a percentage of the smallest one of the plot width and height. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/bubble-size/\" target=\"_blank\">Bubble size</a>","seeAlso":"","deprecated":false},{"name":"yAxis-labels--maxStaggerLines","fullname":"yAxis.labels.maxStaggerLines","title":"maxStaggerLines","parent":"yAxis-labels","isParent":false,"returnType":"Number","defaults":"5","since":"3.0.3","description":"Horizontal axis only. When <code>staggerLines</code> is not set, <code>maxStaggerLines</code> defines how many lines the axis is allowed to add to automatically avoid overlapping X labels. Set to <code>1</code> to disable overlap detection. ","deprecated":true},{"name":"xAxis-labels--maxStaggerLines","fullname":"xAxis.labels.maxStaggerLines","title":"maxStaggerLines","parent":"xAxis-labels","isParent":false,"returnType":"Number","defaults":"5","since":"3.0.3","description":"Horizontal axis only. When <code>staggerLines</code> is not set, <code>maxStaggerLines</code> defines how many lines the axis is allowed to add to automatically avoid overlapping X labels. Set to <code>1</code> to disable overlap detection. ","deprecated":true},{"name":"yAxis--maxZoom","fullname":"yAxis.maxZoom","title":"maxZoom","parent":"yAxis","isParent":false,"returnType":"Number","description":"Deprecated. Renamed to <code>minRange</code> as of Highcharts 2.2.","deprecated":true},{"name":"xAxis--maxZoom","fullname":"xAxis.maxZoom","title":"maxZoom","parent":"xAxis","isParent":false,"returnType":"Number","description":"Deprecated. Renamed to <code>minRange</code> as of Highcharts 2.2.","deprecated":true},{"name":"series<boxplot>-data--median","fullname":"series<boxplot>.data.median","title":"median","parent":"series<boxplot>-data","isParent":false,"returnType":"Number","description":"The median for each data point. This is drawn as a line through the middle area of the box."},{"name":"plotOptions-boxplot--medianColor","fullname":"plotOptions.boxplot.medianColor","title":"medianColor","parent":"plotOptions-boxplot","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color of the median line. If <code>null</code>, the general series color applies.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/error-bar-styling/\" target=\"_blank\">error bar styling</a>","seeAlso":"","deprecated":false},{"name":"series<boxplot>--medianColor","fullname":"series<boxplot>.medianColor","title":"medianColor","parent":"series<boxplot>","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color of the median line. If <code>null</code>, the general series color applies.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/error-bar-styling/\" target=\"_blank\">error bar styling</a>","seeAlso":"","deprecated":false},{"name":"series<boxplot>--medianWidth","fullname":"series<boxplot>.medianWidth","title":"medianWidth","parent":"series<boxplot>","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"3.0","description":"The pixel width of the median line. If <code>null</code>, the <a href=\"#plotOptions.boxplot.lineWidth\">lineWidth</a> is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot--medianWidth","fullname":"plotOptions.boxplot.medianWidth","title":"medianWidth","parent":"plotOptions-boxplot","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"3.0","description":"The pixel width of the median line. If <code>null</code>, the <a href=\"#plotOptions.boxplot.lineWidth\">lineWidth</a> is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>","seeAlso":"","deprecated":false},{"name":"navigation--menuItemHoverStyle","fullname":"navigation.menuItemHoverStyle","title":"menuItemHoverStyle","parent":"navigation","isParent":false,"returnType":"CSSObject","since":"2.0","description":"CSS styles for the hover state of the individual items within the popup menu appearing by  default when the export icon is clicked. The menu items are rendered in HTML. Defaults to \n<pre>menuItemHoverStyle: {\n\tbackground: '#4572A5',\n\tcolor: '#FFFFFF'\n}</pre>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/menuitemhoverstyle/\" target=\"_blank\">Bold text on hover</a>"},{"name":"navigation--menuItemStyle","fullname":"navigation.menuItemStyle","title":"menuItemStyle","parent":"navigation","isParent":false,"returnType":"CSSObject","since":"2.0","description":"CSS styles for the individual items within the popup menu appearing by  default when the export icon is clicked. The menu items are rendered in HTML. Defaults to \n<pre>menuItemStyle: {\n\tpadding: '0 5px',\n\tbackground: NONE,\n\tcolor: '#303030'\n}</pre>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/menuitemstyle/\" target=\"_blank\">Add a grey stripe to the left</a>"},{"name":"exporting-buttons-contextButton--menuItems","fullname":"exporting.buttons.contextButton.menuItems","title":"menuItems","parent":"exporting-buttons-contextButton","isParent":false,"returnType":"Array<Object>","since":"2.0","description":"<p>A collection of config options for the menu items. Each options object consists\r of a <code>text</code> option which is a string to show in the menu item, as\r well as an <code>onclick</code> parameter which is a callback function to run\r on click.</p>\r <p>By default, there is the \"Print\" menu item plus one menu item for each of the available export types.\r Menu items can be customized by defining a new array of items and assigning \r <code>null</code> to unwanted positions (see override example below).</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/exporting/buttons-contextbutton-onclick/\" target=\"_blank\">Skip the menu and export the chart directly</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/exporting/buttons-contextbutton-menuitems/\" target=\"_blank\">override the menu items</a>","seeAlso":"","deprecated":false},{"name":"navigation--menuStyle","fullname":"navigation.menuStyle","title":"menuStyle","parent":"navigation","isParent":false,"returnType":"CSSObject","since":"2.0","description":"CSS styles for the popup menu appearing by default when the export icon is clicked. This menu is rendered in HTML. Defaults to \n<pre>menuStyle: {\n\tborder: '1px solid #A0A0A0',\n\tbackground: '#FFFFFF'\n}</pre>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/menustyle/\" target=\"_blank\">Light gray menu background</a>"},{"name":"xAxis--min","fullname":"xAxis.min","title":"min","parent":"xAxis","isParent":false,"returnType":"Number","description":"The minimum value of the axis. If <code>null</code> the min value is automatically calculated. If the <code>startOnTick</code> option is true, the <code>min</code> value might be rounded down.","demo":"Y axis min of <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/min-startontick-false/\" target=\"_blank\">-50 with startOnTick to false</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/min-startontick-true/\" target=\"_blank\">-50 with startOnTick true by default</a>"},{"name":"yAxis--min","fullname":"yAxis.min","title":"min","parent":"yAxis","isParent":false,"returnType":"Number","description":"The minimum value of the axis. If <code>null</code> the min value is automatically calculated. If the <code>startOnTick</code> option is true, the <code>min</code> value might be rounded down.","demo":"Y axis min of <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/min-startontick-false/\" target=\"_blank\">-50 with startOnTick to false</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/min-startontick-true/\" target=\"_blank\">-50 with startOnTick true by default</a>"},{"name":"yAxis--minColor","fullname":"yAxis.minColor","title":"minColor","parent":"yAxis","isParent":false,"returnType":"Color","defaults":"#EFEFFF","values":"","since":"4.0","description":"Solid gauge only. Unless <a href=\"#yAxis.stops\">stops</a> are set, the color to represent the minimum value of the Y axis.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/mincolor-maxcolor/\" target=\"_blank\">Min and max color</a>","seeAlso":"","deprecated":false},{"name":"xAxis--minPadding","fullname":"xAxis.minPadding","title":"minPadding","parent":"xAxis","isParent":false,"returnType":"Number","defaults":"0.01","since":"1.2.0","description":"Padding of the min value relative to the length of the axis. A padding of 0.05 will make a 100px axis 5px longer. This is useful when you don't want the lowest data value to appear on the edge of the plot area. When the axis' <code>min</code> option is set or a min extreme is set using <code>axis.setExtremes()</code>, the minPadding will be ignored.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minpadding/\" target=\"_blank\">Min padding of 0.2</a>"},{"name":"yAxis--minPadding","fullname":"yAxis.minPadding","title":"minPadding","parent":"yAxis","isParent":false,"returnType":"Number","defaults":"0.05","since":"1.2.0","description":"Padding of the min value relative to the length of the axis. A padding of 0.05 will make a 100px axis 5px longer. This is useful when you don't want the lowest data value to appear on the edge of the plot area.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minpadding/\" target=\"_blank\">Min padding of 0.2</a>"},{"name":"plotOptions-waterfall--minPointLength","fullname":"plotOptions.waterfall.minPointLength","title":"minPointLength","parent":"plotOptions-waterfall","isParent":false,"returnType":"Number","defaults":"0","description":"The minimal height for a column or width for a bar. By default, 0 values are not shown. To visualize a 0 (or close to zero) point, set the minimal point length to a  pixel value like 3. In stacked column charts, minPointLength might not be respected for tightly packed values.","demo":"Set to three with <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-minpointlength/\" target=\"_blank\">zero base value</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-minpointlength-pos-and-neg/\" target=\"_blank\">positive and negative close to zero values</a>"},{"name":"plotOptions-column--minPointLength","fullname":"plotOptions.column.minPointLength","title":"minPointLength","parent":"plotOptions-column","isParent":false,"returnType":"Number","defaults":"0","description":"The minimal height for a column or width for a bar. By default, 0 values are not shown. To visualize a 0 (or close to zero) point, set the minimal point length to a  pixel value like 3. In stacked column charts, minPointLength might not be respected for tightly packed values.","demo":"Set to three with <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-minpointlength/\" target=\"_blank\">zero base value</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-minpointlength-pos-and-neg/\" target=\"_blank\">positive and negative close to zero values</a>"},{"name":"series<columnrange>--minPointLength","fullname":"series<columnrange>.minPointLength","title":"minPointLength","parent":"series<columnrange>","isParent":false,"returnType":"Number","defaults":"0","description":"The minimal height for a column or width for a bar. By default, 0 values are not shown. To visualize a 0 (or close to zero) point, set the minimal point length to a  pixel value like 3. In stacked column charts, minPointLength might not be respected for tightly packed values.","demo":"Set to three with <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-minpointlength/\" target=\"_blank\">zero base value</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-minpointlength-pos-and-neg/\" target=\"_blank\">positive and negative close to zero values</a>"},{"name":"plotOptions-columnrange--minPointLength","fullname":"plotOptions.columnrange.minPointLength","title":"minPointLength","parent":"plotOptions-columnrange","isParent":false,"returnType":"Number","defaults":"0","description":"The minimal height for a column or width for a bar. By default, 0 values are not shown. To visualize a 0 (or close to zero) point, set the minimal point length to a  pixel value like 3. In stacked column charts, minPointLength might not be respected for tightly packed values.","demo":"Set to three with <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-minpointlength/\" target=\"_blank\">zero base value</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-minpointlength-pos-and-neg/\" target=\"_blank\">positive and negative close to zero values</a>"},{"name":"series<waterfall>--minPointLength","fullname":"series<waterfall>.minPointLength","title":"minPointLength","parent":"series<waterfall>","isParent":false,"returnType":"Number","defaults":"0","description":"The minimal height for a column or width for a bar. By default, 0 values are not shown. To visualize a 0 (or close to zero) point, set the minimal point length to a  pixel value like 3. In stacked column charts, minPointLength might not be respected for tightly packed values.","demo":"Set to three with <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-minpointlength/\" target=\"_blank\">zero base value</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-minpointlength-pos-and-neg/\" target=\"_blank\">positive and negative close to zero values</a>"},{"name":"series<column>--minPointLength","fullname":"series<column>.minPointLength","title":"minPointLength","parent":"series<column>","isParent":false,"returnType":"Number","defaults":"0","description":"The minimal height for a column or width for a bar. By default, 0 values are not shown. To visualize a 0 (or close to zero) point, set the minimal point length to a  pixel value like 3. In stacked column charts, minPointLength might not be respected for tightly packed values.","demo":"Set to three with <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-minpointlength/\" target=\"_blank\">zero base value</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-minpointlength-pos-and-neg/\" target=\"_blank\">positive and negative close to zero values</a>"},{"name":"series<bar>--minPointLength","fullname":"series<bar>.minPointLength","title":"minPointLength","parent":"series<bar>","isParent":false,"returnType":"Number","defaults":"0","description":"The minimal height for a column or width for a bar. By default, 0 values are not shown. To visualize a 0 (or close to zero) point, set the minimal point length to a  pixel value like 3. In stacked column charts, minPointLength might not be respected for tightly packed values.","demo":"Set to three with <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-minpointlength/\" target=\"_blank\">zero base value</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-minpointlength-pos-and-neg/\" target=\"_blank\">positive and negative close to zero values</a>"},{"name":"plotOptions-bar--minPointLength","fullname":"plotOptions.bar.minPointLength","title":"minPointLength","parent":"plotOptions-bar","isParent":false,"returnType":"Number","defaults":"0","description":"The minimal height for a column or width for a bar. By default, 0 values are not shown. To visualize a 0 (or close to zero) point, set the minimal point length to a  pixel value like 3. In stacked column charts, minPointLength might not be respected for tightly packed values.","demo":"Set to three with <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-minpointlength/\" target=\"_blank\">zero base value</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-minpointlength-pos-and-neg/\" target=\"_blank\">positive and negative close to zero values</a>"},{"name":"xAxis--minRange","fullname":"xAxis.minRange","title":"minRange","parent":"xAxis","isParent":false,"returnType":"Number","description":"<p>The minimum range to display on this axis. The entire axis will not be allowed to span over a smaller interval than this. For example, for a datetime axis the main unit is milliseconds. If minRange is set to 3600000, you can't zoom in more than to one hour.</p> <p>The default minRange for the x axis is five times the smallest interval between any of the data points.</p> <p>On a logarithmic axis, the unit for the minimum range is the power. So a minRange of \t1 means that the axis can be zoomed to 10-100, 100-1000, 1000-10000 etc.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/minrange/\" target=\"_blank\">Minimum range of 5</a>"},{"name":"yAxis--minRange","fullname":"yAxis.minRange","title":"minRange","parent":"yAxis","isParent":false,"returnType":"Number","description":"<p>The minimum range to display on this axis. The entire axis will not be allowed to span over a smaller interval than this. For example, for a datetime axis the main unit is milliseconds. If minRange is set to 3600000, you can't zoom in more than to one hour.</p> <p>The default minRange for the x axis is five times the smallest interval between any of the data points.</p> <p>On a logarithmic axis, the unit for the minimum range is the power. So a minRange of \t1 means that the axis can be zoomed to 10-100, 100-1000, 1000-10000 etc.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/minrange/\" target=\"_blank\">Minimum range of 5</a>"},{"name":"series<pie>--minSize","fullname":"series<pie>.minSize","title":"minSize","parent":"series<pie>","isParent":false,"returnType":"Number","defaults":"80","values":"","since":"3.0","description":"The minimum size for a pie in response to auto margins. The pie will try to shrink to make room for data labels in side the plot area, but only to this size.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bubble>--minSize","fullname":"series<bubble>.minSize","title":"minSize","parent":"series<bubble>","isParent":false,"returnType":"String","defaults":"8","values":"","since":"3.0","description":"Minimum bubble size. Bubbles will automatically size between the <code>minSize</code> and <code>maxSize</code> to reflect the <code>z</code> value of each bubble. Can be either pixels (when no unit is given), or a percentage of the smallest one of the plot width and height. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/bubble-size/\" target=\"_blank\">Bubble size</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble--minSize","fullname":"plotOptions.bubble.minSize","title":"minSize","parent":"plotOptions-bubble","isParent":false,"returnType":"String","defaults":"8","values":"","since":"3.0","description":"Minimum bubble size. Bubbles will automatically size between the <code>minSize</code> and <code>maxSize</code> to reflect the <code>z</code> value of each bubble. Can be either pixels (when no unit is given), or a percentage of the smallest one of the plot width and height. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/bubble-size/\" target=\"_blank\">Bubble size</a>","seeAlso":"","deprecated":false},{"name":"series<funnel>--minSize","fullname":"series<funnel>.minSize","title":"minSize","parent":"series<funnel>","isParent":false,"returnType":"Number","defaults":"80","values":"","since":"3.0","description":"The minimum size for a pie in response to auto margins. The pie will try to shrink to make room for data labels in side the plot area, but only to this size.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pyramid>--minSize","fullname":"series<pyramid>.minSize","title":"minSize","parent":"series<pyramid>","isParent":false,"returnType":"Number","defaults":"80","values":"","since":"3.0","description":"The minimum size for a pie in response to auto margins. The pie will try to shrink to make room for data labels in side the plot area, but only to this size.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid--minSize","fullname":"plotOptions.pyramid.minSize","title":"minSize","parent":"plotOptions-pyramid","isParent":false,"returnType":"Number","defaults":"80","values":"","since":"3.0","description":"The minimum size for a pie in response to auto margins. The pie will try to shrink to make room for data labels in side the plot area, but only to this size.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pie--minSize","fullname":"plotOptions.pie.minSize","title":"minSize","parent":"plotOptions-pie","isParent":false,"returnType":"Number","defaults":"80","values":"","since":"3.0","description":"The minimum size for a pie in response to auto margins. The pie will try to shrink to make room for data labels in side the plot area, but only to this size.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel--minSize","fullname":"plotOptions.funnel.minSize","title":"minSize","parent":"plotOptions-funnel","isParent":false,"returnType":"Number","defaults":"80","values":"","since":"3.0","description":"The minimum size for a pie in response to auto margins. The pie will try to shrink to make room for data labels in side the plot area, but only to this size.","demo":"","seeAlso":"","deprecated":false},{"name":"xAxis--minTickInterval","fullname":"xAxis.minTickInterval","title":"minTickInterval","parent":"xAxis","isParent":false,"returnType":"Number","since":"2.3.0","description":"The minimum tick interval allowed in axis values. For example on zooming in on an axis with daily data, this can be used to prevent the axis from showing hours. Defaults to the closest distance between two points on the axis.","deprecated":false},{"name":"yAxis--minTickInterval","fullname":"yAxis.minTickInterval","title":"minTickInterval","parent":"yAxis","isParent":false,"returnType":"Number","since":"2.3.0","description":"The minimum tick interval allowed in axis values. For example on zooming in on an axis with daily data, this can be used to prevent the axis from showing hours. Defaults to the closest distance between two points on the axis.","deprecated":false},{"name":"xAxis--minorGridLineColor","fullname":"xAxis.minorGridLineColor","title":"minorGridLineColor","parent":"xAxis","isParent":false,"returnType":"Color","defaults":"#E0E0E0","description":"Color of the minor, secondary grid lines.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minorgridlinecolor/\" target=\"_blank\">Bright grey lines from Y axis</a>"},{"name":"yAxis--minorGridLineColor","fullname":"yAxis.minorGridLineColor","title":"minorGridLineColor","parent":"yAxis","isParent":false,"returnType":"Color","defaults":"#E0E0E0","description":"Color of the minor, secondary grid lines.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minorgridlinecolor/\" target=\"_blank\">Bright grey lines from Y axis</a>"},{"name":"xAxis--minorGridLineDashStyle","fullname":"xAxis.minorGridLineDashStyle","title":"minorGridLineDashStyle","parent":"xAxis","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"1.2","description":"The dash or dot style of the minor grid lines. For possible values, see <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\">this demonstration</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minorgridlinedashstyle/\" target=\"_blank\">Long dashes on minor grid lines</a>","deprecated":false},{"name":"yAxis--minorGridLineDashStyle","fullname":"yAxis.minorGridLineDashStyle","title":"minorGridLineDashStyle","parent":"yAxis","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"1.2","description":"The dash or dot style of the minor grid lines. For possible values, see <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.1/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-dashstyle-all/\">this demonstration</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minorgridlinedashstyle/\" target=\"_blank\">Long dashes on minor grid lines</a>","deprecated":false},{"name":"xAxis--minorGridLineWidth","fullname":"xAxis.minorGridLineWidth","title":"minorGridLineWidth","parent":"xAxis","isParent":false,"returnType":"Number","defaults":"1","description":"Width of the minor, secondary grid lines.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minorgridlinewidth/\" target=\"_blank\">2px lines from Y axis </a>"},{"name":"yAxis--minorGridLineWidth","fullname":"yAxis.minorGridLineWidth","title":"minorGridLineWidth","parent":"yAxis","isParent":false,"returnType":"Number","defaults":"1","description":"Width of the minor, secondary grid lines.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minorgridlinewidth/\" target=\"_blank\">2px lines from Y axis </a>"},{"name":"yAxis--minorTickColor","fullname":"yAxis.minorTickColor","title":"minorTickColor","parent":"yAxis","isParent":false,"returnType":"Color","defaults":"#A0A0A0","description":"Color for the minor tick marks.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minortickcolor/\" target=\"_blank\">Black tick marks on Y axis</a>"},{"name":"xAxis--minorTickColor","fullname":"xAxis.minorTickColor","title":"minorTickColor","parent":"xAxis","isParent":false,"returnType":"Color","defaults":"#A0A0A0","description":"Color for the minor tick marks.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minortickcolor/\" target=\"_blank\">Black tick marks on Y axis</a>"},{"name":"yAxis--minorTickInterval","fullname":"yAxis.minorTickInterval","title":"minorTickInterval","parent":"yAxis","isParent":false,"returnType":"String|Number","description":"<p>Tick interval in scale units for the minor ticks. On a linear axis, if <code>\"auto\"</code>, \r\n the minor tick interval is calculated as a fifth of the tickInterval. If\r\n <code>null</code>, minor ticks are not shown.</p>\r\n <p>On logarithmic axes, the unit is the power of the value. For example, setting\r\n \tthe minorTickInterval to 1 puts one tick on each of 0.1, 1, 10, 100 etc. Setting\r\n \tthe minorTickInterval to 0.1 produces 9 ticks between 1 and 10, \r\n \t10 and 100 etc. A minorTickInterval of \"auto\" on a log axis results in a best guess,\r\n \tattempting to enter approximately 5 minor ticks between each major tick.</p>\r\n\r\n<p>If user settings dictate minor ticks to become too dense, they don't make sense, and will be ignored to prevent performance problems.</a>\r\n\r\n<p>On axes using <a href=\"#xAxis.categories\">categories</a>, minor ticks are not supported.</p>\r\n\r\n","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minortickinterval-null/\" target=\"_blank\">Null by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minortickinterval-auto/\" target=\"_blank\">\"auto\" on linear Y axis</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minortickinterval-5/\" target=\"_blank\">5 units</a> on linear Y axis, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minortickinterval-log-auto/\" target=\"_blank\">\"auto\"</a> on logarithmic Y axis,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minortickinterval-log/\" target=\"_blank\">0.1</a> on logarithmic Y axis.","deprecated":false},{"name":"xAxis--minorTickInterval","fullname":"xAxis.minorTickInterval","title":"minorTickInterval","parent":"xAxis","isParent":false,"returnType":"String|Number","description":"<p>Tick interval in scale units for the minor ticks. On a linear axis, if <code>\"auto\"</code>, \r\n the minor tick interval is calculated as a fifth of the tickInterval. If\r\n <code>null</code>, minor ticks are not shown.</p>\r\n <p>On logarithmic axes, the unit is the power of the value. For example, setting\r\n \tthe minorTickInterval to 1 puts one tick on each of 0.1, 1, 10, 100 etc. Setting\r\n \tthe minorTickInterval to 0.1 produces 9 ticks between 1 and 10, \r\n \t10 and 100 etc. A minorTickInterval of \"auto\" on a log axis results in a best guess,\r\n \tattempting to enter approximately 5 minor ticks between each major tick.</p>\r\n\r\n<p>If user settings dictate minor ticks to become too dense, they don't make sense, and will be ignored to prevent performance problems.</a>\r\n\r\n<p>On axes using <a href=\"#xAxis.categories\">categories</a>, minor ticks are not supported.</p>\r\n\r\n","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minortickinterval-null/\" target=\"_blank\">Null by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minortickinterval-auto/\" target=\"_blank\">\"auto\" on linear Y axis</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minortickinterval-5/\" target=\"_blank\">5 units</a> on linear Y axis, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minortickinterval-log-auto/\" target=\"_blank\">\"auto\"</a> on logarithmic Y axis,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minortickinterval-log/\" target=\"_blank\">0.1</a> on logarithmic Y axis.","deprecated":false},{"name":"yAxis--minorTickLength","fullname":"yAxis.minorTickLength","title":"minorTickLength","parent":"yAxis","isParent":false,"returnType":"Number","defaults":"2","description":"The pixel length of the minor tick marks.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minorticklength/\" target=\"_blank\">10px on Y axis</a>"},{"name":"xAxis--minorTickLength","fullname":"xAxis.minorTickLength","title":"minorTickLength","parent":"xAxis","isParent":false,"returnType":"Number","defaults":"2","description":"The pixel length of the minor tick marks.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minorticklength/\" target=\"_blank\">10px on Y axis</a>"},{"name":"yAxis--minorTickPosition","fullname":"yAxis.minorTickPosition","title":"minorTickPosition","parent":"yAxis","isParent":false,"returnType":"String","defaults":"outside","values":"[\"inside\", \"outside\"]","description":"The position of the minor tick marks relative to the axis line. Can be one of <code>inside</code> and <code>outside</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minortickposition-outside/\" target=\"_blank\">Outside by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minortickposition-inside/\" target=\"_blank\">inside</a>"},{"name":"xAxis--minorTickPosition","fullname":"xAxis.minorTickPosition","title":"minorTickPosition","parent":"xAxis","isParent":false,"returnType":"String","defaults":"outside","values":"[\"inside\", \"outside\"]","description":"The position of the minor tick marks relative to the axis line. Can be one of <code>inside</code> and <code>outside</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minortickposition-outside/\" target=\"_blank\">Outside by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minortickposition-inside/\" target=\"_blank\">inside</a>"},{"name":"xAxis--minorTickWidth","fullname":"xAxis.minorTickWidth","title":"minorTickWidth","parent":"xAxis","isParent":false,"returnType":"Number","defaults":"0","description":"The pixel width of the minor tick mark.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minortickwidth/\" target=\"_blank\">3px width</a>"},{"name":"yAxis--minorTickWidth","fullname":"yAxis.minorTickWidth","title":"minorTickWidth","parent":"yAxis","isParent":false,"returnType":"Number","defaults":"0","description":"The pixel width of the minor tick mark.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/minortickwidth/\" target=\"_blank\">3px width</a>"},{"name":"lang--months","fullname":"lang.months","title":"months","parent":"lang","isParent":false,"returnType":"Array<String>","defaults":"[ \"January\" , \"February\" , \"March\" , \"April\" , \"May\" , \"June\" , \"July\" , \"August\" , \"September\" , \"October\" , \"November\" , \"December\"]","since":"","description":"An array containing the months names. Corresponds to the \r <code>%B</code> format in <code>Highcharts.dateFormat()</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter-events--mouseOut","fullname":"plotOptions.scatter.events.mouseOut","title":"mouseOut","parent":"plotOptions-scatter-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-waterfall-events--mouseOut","fullname":"plotOptions.waterfall.events.mouseOut","title":"mouseOut","parent":"plotOptions-waterfall-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<solidgauge>-events--mouseOut","fullname":"series<solidgauge>.events.mouseOut","title":"mouseOut","parent":"series<solidgauge>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-polygon-events--mouseOut","fullname":"plotOptions.polygon.events.mouseOut","title":"mouseOut","parent":"plotOptions-polygon-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-areasplinerange-events--mouseOut","fullname":"plotOptions.areasplinerange.events.mouseOut","title":"mouseOut","parent":"plotOptions-areasplinerange-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<funnel>-point-events--mouseOut","fullname":"series<funnel>.point.events.mouseOut","title":"mouseOut","parent":"series<funnel>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<pie>-events--mouseOut","fullname":"series<pie>.events.mouseOut","title":"mouseOut","parent":"series<pie>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-line-point-events--mouseOut","fullname":"plotOptions.line.point.events.mouseOut","title":"mouseOut","parent":"plotOptions-line-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<areasplinerange>-point-events--mouseOut","fullname":"series<areasplinerange>.point.events.mouseOut","title":"mouseOut","parent":"series<areasplinerange>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<area>-events--mouseOut","fullname":"series<area>.events.mouseOut","title":"mouseOut","parent":"series<area>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-columnrange-events--mouseOut","fullname":"plotOptions.columnrange.events.mouseOut","title":"mouseOut","parent":"plotOptions-columnrange-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<areaspline>-point-events--mouseOut","fullname":"series<areaspline>.point.events.mouseOut","title":"mouseOut","parent":"series<areaspline>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<bubble>-point-events--mouseOut","fullname":"series<bubble>.point.events.mouseOut","title":"mouseOut","parent":"series<bubble>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<areaspline>-data-events--mouseOut","fullname":"series<areaspline>.data.events.mouseOut","title":"mouseOut","parent":"series<areaspline>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<area>-data-events--mouseOut","fullname":"series<area>.data.events.mouseOut","title":"mouseOut","parent":"series<area>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<heatmap>-point-events--mouseOut","fullname":"series<heatmap>.point.events.mouseOut","title":"mouseOut","parent":"series<heatmap>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-column-events--mouseOut","fullname":"plotOptions.column.events.mouseOut","title":"mouseOut","parent":"plotOptions-column-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<errorbar>-point-events--mouseOut","fullname":"series<errorbar>.point.events.mouseOut","title":"mouseOut","parent":"series<errorbar>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<spline>-point-events--mouseOut","fullname":"series<spline>.point.events.mouseOut","title":"mouseOut","parent":"series<spline>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<pyramid>-events--mouseOut","fullname":"series<pyramid>.events.mouseOut","title":"mouseOut","parent":"series<pyramid>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-pie-events--mouseOut","fullname":"plotOptions.pie.events.mouseOut","title":"mouseOut","parent":"plotOptions-pie-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-treemap-events--mouseOut","fullname":"plotOptions.treemap.events.mouseOut","title":"mouseOut","parent":"plotOptions-treemap-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<scatter>-events--mouseOut","fullname":"series<scatter>.events.mouseOut","title":"mouseOut","parent":"series<scatter>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<heatmap>-events--mouseOut","fullname":"series<heatmap>.events.mouseOut","title":"mouseOut","parent":"series<heatmap>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<boxplot>-events--mouseOut","fullname":"series<boxplot>.events.mouseOut","title":"mouseOut","parent":"series<boxplot>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-areasplinerange-point-events--mouseOut","fullname":"plotOptions.areasplinerange.point.events.mouseOut","title":"mouseOut","parent":"plotOptions-areasplinerange-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<columnrange>-data-events--mouseOut","fullname":"series<columnrange>.data.events.mouseOut","title":"mouseOut","parent":"series<columnrange>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<errorbar>-data-events--mouseOut","fullname":"series<errorbar>.data.events.mouseOut","title":"mouseOut","parent":"series<errorbar>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-pyramid-point-events--mouseOut","fullname":"plotOptions.pyramid.point.events.mouseOut","title":"mouseOut","parent":"plotOptions-pyramid-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-bubble-point-events--mouseOut","fullname":"plotOptions.bubble.point.events.mouseOut","title":"mouseOut","parent":"plotOptions-bubble-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-bubble-events--mouseOut","fullname":"plotOptions.bubble.events.mouseOut","title":"mouseOut","parent":"plotOptions-bubble-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-area-events--mouseOut","fullname":"plotOptions.area.events.mouseOut","title":"mouseOut","parent":"plotOptions-area-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<bar>-events--mouseOut","fullname":"series<bar>.events.mouseOut","title":"mouseOut","parent":"series<bar>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<line>-point-events--mouseOut","fullname":"series<line>.point.events.mouseOut","title":"mouseOut","parent":"series<line>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-pie-point-events--mouseOut","fullname":"plotOptions.pie.point.events.mouseOut","title":"mouseOut","parent":"plotOptions-pie-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-columnrange-point-events--mouseOut","fullname":"plotOptions.columnrange.point.events.mouseOut","title":"mouseOut","parent":"plotOptions-columnrange-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-errorbar-events--mouseOut","fullname":"plotOptions.errorbar.events.mouseOut","title":"mouseOut","parent":"plotOptions-errorbar-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-area-point-events--mouseOut","fullname":"plotOptions.area.point.events.mouseOut","title":"mouseOut","parent":"plotOptions-area-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-series-events--mouseOut","fullname":"plotOptions.series.events.mouseOut","title":"mouseOut","parent":"plotOptions-series-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<errorbar>-events--mouseOut","fullname":"series<errorbar>.events.mouseOut","title":"mouseOut","parent":"series<errorbar>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<spline>-events--mouseOut","fullname":"series<spline>.events.mouseOut","title":"mouseOut","parent":"series<spline>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<pie>-point-events--mouseOut","fullname":"series<pie>.point.events.mouseOut","title":"mouseOut","parent":"series<pie>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-treemap-point-events--mouseOut","fullname":"plotOptions.treemap.point.events.mouseOut","title":"mouseOut","parent":"plotOptions-treemap-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-arearange-events--mouseOut","fullname":"plotOptions.arearange.events.mouseOut","title":"mouseOut","parent":"plotOptions-arearange-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-gauge-events--mouseOut","fullname":"plotOptions.gauge.events.mouseOut","title":"mouseOut","parent":"plotOptions-gauge-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<bar>-data-events--mouseOut","fullname":"series<bar>.data.events.mouseOut","title":"mouseOut","parent":"series<bar>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-heatmap-events--mouseOut","fullname":"plotOptions.heatmap.events.mouseOut","title":"mouseOut","parent":"plotOptions-heatmap-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<boxplot>-data-events--mouseOut","fullname":"series<boxplot>.data.events.mouseOut","title":"mouseOut","parent":"series<boxplot>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-line-events--mouseOut","fullname":"plotOptions.line.events.mouseOut","title":"mouseOut","parent":"plotOptions-line-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<gauge>-data-events--mouseOut","fullname":"series<gauge>.data.events.mouseOut","title":"mouseOut","parent":"series<gauge>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<areasplinerange>-events--mouseOut","fullname":"series<areasplinerange>.events.mouseOut","title":"mouseOut","parent":"series<areasplinerange>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<spline>-data-events--mouseOut","fullname":"series<spline>.data.events.mouseOut","title":"mouseOut","parent":"series<spline>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-spline-point-events--mouseOut","fullname":"plotOptions.spline.point.events.mouseOut","title":"mouseOut","parent":"plotOptions-spline-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<areaspline>-events--mouseOut","fullname":"series<areaspline>.events.mouseOut","title":"mouseOut","parent":"series<areaspline>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-arearange-point-events--mouseOut","fullname":"plotOptions.arearange.point.events.mouseOut","title":"mouseOut","parent":"plotOptions-arearange-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-waterfall-point-events--mouseOut","fullname":"plotOptions.waterfall.point.events.mouseOut","title":"mouseOut","parent":"plotOptions-waterfall-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<areasplinerange>-data-events--mouseOut","fullname":"series<areasplinerange>.data.events.mouseOut","title":"mouseOut","parent":"series<areasplinerange>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<waterfall>-events--mouseOut","fullname":"series<waterfall>.events.mouseOut","title":"mouseOut","parent":"series<waterfall>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<column>-data-events--mouseOut","fullname":"series<column>.data.events.mouseOut","title":"mouseOut","parent":"series<column>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<arearange>-data-events--mouseOut","fullname":"series<arearange>.data.events.mouseOut","title":"mouseOut","parent":"series<arearange>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<line>-data-events--mouseOut","fullname":"series<line>.data.events.mouseOut","title":"mouseOut","parent":"series<line>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<columnrange>-events--mouseOut","fullname":"series<columnrange>.events.mouseOut","title":"mouseOut","parent":"series<columnrange>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-bar-point-events--mouseOut","fullname":"plotOptions.bar.point.events.mouseOut","title":"mouseOut","parent":"plotOptions-bar-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<pyramid>-point-events--mouseOut","fullname":"series<pyramid>.point.events.mouseOut","title":"mouseOut","parent":"series<pyramid>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<arearange>-events--mouseOut","fullname":"series<arearange>.events.mouseOut","title":"mouseOut","parent":"series<arearange>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<columnrange>-point-events--mouseOut","fullname":"series<columnrange>.point.events.mouseOut","title":"mouseOut","parent":"series<columnrange>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<area>-point-events--mouseOut","fullname":"series<area>.point.events.mouseOut","title":"mouseOut","parent":"series<area>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-errorbar-point-events--mouseOut","fullname":"plotOptions.errorbar.point.events.mouseOut","title":"mouseOut","parent":"plotOptions-errorbar-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<solidgauge>-data-events--mouseOut","fullname":"series<solidgauge>.data.events.mouseOut","title":"mouseOut","parent":"series<solidgauge>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<bubble>-events--mouseOut","fullname":"series<bubble>.events.mouseOut","title":"mouseOut","parent":"series<bubble>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<column>-events--mouseOut","fullname":"series<column>.events.mouseOut","title":"mouseOut","parent":"series<column>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-boxplot-point-events--mouseOut","fullname":"plotOptions.boxplot.point.events.mouseOut","title":"mouseOut","parent":"plotOptions-boxplot-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<gauge>-point-events--mouseOut","fullname":"series<gauge>.point.events.mouseOut","title":"mouseOut","parent":"series<gauge>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<waterfall>-data-events--mouseOut","fullname":"series<waterfall>.data.events.mouseOut","title":"mouseOut","parent":"series<waterfall>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<line>-events--mouseOut","fullname":"series<line>.events.mouseOut","title":"mouseOut","parent":"series<line>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<treemap>-events--mouseOut","fullname":"series<treemap>.events.mouseOut","title":"mouseOut","parent":"series<treemap>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-column-point-events--mouseOut","fullname":"plotOptions.column.point.events.mouseOut","title":"mouseOut","parent":"plotOptions-column-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-areaspline-point-events--mouseOut","fullname":"plotOptions.areaspline.point.events.mouseOut","title":"mouseOut","parent":"plotOptions-areaspline-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<waterfall>-point-events--mouseOut","fullname":"series<waterfall>.point.events.mouseOut","title":"mouseOut","parent":"series<waterfall>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<bar>-point-events--mouseOut","fullname":"series<bar>.point.events.mouseOut","title":"mouseOut","parent":"series<bar>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<treemap>-point-events--mouseOut","fullname":"series<treemap>.point.events.mouseOut","title":"mouseOut","parent":"series<treemap>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<pyramid>-data-events--mouseOut","fullname":"series<pyramid>.data.events.mouseOut","title":"mouseOut","parent":"series<pyramid>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-pyramid-events--mouseOut","fullname":"plotOptions.pyramid.events.mouseOut","title":"mouseOut","parent":"plotOptions-pyramid-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<pie>-data-events--mouseOut","fullname":"series<pie>.data.events.mouseOut","title":"mouseOut","parent":"series<pie>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-series-point-events--mouseOut","fullname":"plotOptions.series.point.events.mouseOut","title":"mouseOut","parent":"plotOptions-series-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-polygon-point-events--mouseOut","fullname":"plotOptions.polygon.point.events.mouseOut","title":"mouseOut","parent":"plotOptions-polygon-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<scatter>-point-events--mouseOut","fullname":"series<scatter>.point.events.mouseOut","title":"mouseOut","parent":"series<scatter>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-scatter-point-events--mouseOut","fullname":"plotOptions.scatter.point.events.mouseOut","title":"mouseOut","parent":"plotOptions-scatter-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<bubble>-data-events--mouseOut","fullname":"series<bubble>.data.events.mouseOut","title":"mouseOut","parent":"series<bubble>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<heatmap>-data-events--mouseOut","fullname":"series<heatmap>.data.events.mouseOut","title":"mouseOut","parent":"series<heatmap>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<funnel>-data-events--mouseOut","fullname":"series<funnel>.data.events.mouseOut","title":"mouseOut","parent":"series<funnel>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-funnel-events--mouseOut","fullname":"plotOptions.funnel.events.mouseOut","title":"mouseOut","parent":"plotOptions-funnel-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-bar-events--mouseOut","fullname":"plotOptions.bar.events.mouseOut","title":"mouseOut","parent":"plotOptions-bar-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<column>-point-events--mouseOut","fullname":"series<column>.point.events.mouseOut","title":"mouseOut","parent":"series<column>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<polygon>-data-events--mouseOut","fullname":"series<polygon>.data.events.mouseOut","title":"mouseOut","parent":"series<polygon>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<polygon>-point-events--mouseOut","fullname":"series<polygon>.point.events.mouseOut","title":"mouseOut","parent":"series<polygon>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<polygon>-events--mouseOut","fullname":"series<polygon>.events.mouseOut","title":"mouseOut","parent":"series<polygon>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<gauge>-events--mouseOut","fullname":"series<gauge>.events.mouseOut","title":"mouseOut","parent":"series<gauge>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-funnel-point-events--mouseOut","fullname":"plotOptions.funnel.point.events.mouseOut","title":"mouseOut","parent":"plotOptions-funnel-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-solidgauge-events--mouseOut","fullname":"plotOptions.solidgauge.events.mouseOut","title":"mouseOut","parent":"plotOptions-solidgauge-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-heatmap-point-events--mouseOut","fullname":"plotOptions.heatmap.point.events.mouseOut","title":"mouseOut","parent":"plotOptions-heatmap-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-areaspline-events--mouseOut","fullname":"plotOptions.areaspline.events.mouseOut","title":"mouseOut","parent":"plotOptions-areaspline-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<scatter>-data-events--mouseOut","fullname":"series<scatter>.data.events.mouseOut","title":"mouseOut","parent":"series<scatter>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-solidgauge-point-events--mouseOut","fullname":"plotOptions.solidgauge.point.events.mouseOut","title":"mouseOut","parent":"plotOptions-solidgauge-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-boxplot-events--mouseOut","fullname":"plotOptions.boxplot.events.mouseOut","title":"mouseOut","parent":"plotOptions-boxplot-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<funnel>-events--mouseOut","fullname":"series<funnel>.events.mouseOut","title":"mouseOut","parent":"series<funnel>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-spline-events--mouseOut","fullname":"plotOptions.spline.events.mouseOut","title":"mouseOut","parent":"plotOptions-spline-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse leaves the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. If the  <a class=\"internal\" href=\"#plotOptions.series\">stickyTracking</a> option is true, <code>mouseOut</code> doesn't happen before the mouse enters another graph or leaves the plot area.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<boxplot>-point-events--mouseOut","fullname":"series<boxplot>.point.events.mouseOut","title":"mouseOut","parent":"series<boxplot>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-gauge-point-events--mouseOut","fullname":"plotOptions.gauge.point.events.mouseOut","title":"mouseOut","parent":"plotOptions-gauge-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<arearange>-point-events--mouseOut","fullname":"series<arearange>.point.events.mouseOut","title":"mouseOut","parent":"series<arearange>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<treemap>-data-events--mouseOut","fullname":"series<treemap>.data.events.mouseOut","title":"mouseOut","parent":"series<treemap>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<solidgauge>-point-events--mouseOut","fullname":"series<solidgauge>.point.events.mouseOut","title":"mouseOut","parent":"series<solidgauge>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse leaves the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-spline-events--mouseOver","fullname":"plotOptions.spline.events.mouseOver","title":"mouseOver","parent":"plotOptions-spline-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-heatmap-point-events--mouseOver","fullname":"plotOptions.heatmap.point.events.mouseOver","title":"mouseOver","parent":"plotOptions-heatmap-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<line>-point-events--mouseOver","fullname":"series<line>.point.events.mouseOver","title":"mouseOver","parent":"series<line>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<errorbar>-events--mouseOver","fullname":"series<errorbar>.events.mouseOver","title":"mouseOver","parent":"series<errorbar>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<polygon>-events--mouseOver","fullname":"series<polygon>.events.mouseOver","title":"mouseOver","parent":"series<polygon>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<arearange>-point-events--mouseOver","fullname":"series<arearange>.point.events.mouseOver","title":"mouseOver","parent":"series<arearange>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<bubble>-events--mouseOver","fullname":"series<bubble>.events.mouseOver","title":"mouseOver","parent":"series<bubble>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-pyramid-events--mouseOver","fullname":"plotOptions.pyramid.events.mouseOver","title":"mouseOver","parent":"plotOptions-pyramid-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-arearange-point-events--mouseOver","fullname":"plotOptions.arearange.point.events.mouseOver","title":"mouseOver","parent":"plotOptions-arearange-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-solidgauge-events--mouseOver","fullname":"plotOptions.solidgauge.events.mouseOver","title":"mouseOver","parent":"plotOptions-solidgauge-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<bubble>-point-events--mouseOver","fullname":"series<bubble>.point.events.mouseOver","title":"mouseOver","parent":"series<bubble>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-columnrange-point-events--mouseOver","fullname":"plotOptions.columnrange.point.events.mouseOver","title":"mouseOver","parent":"plotOptions-columnrange-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-area-point-events--mouseOver","fullname":"plotOptions.area.point.events.mouseOver","title":"mouseOver","parent":"plotOptions-area-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-column-point-events--mouseOver","fullname":"plotOptions.column.point.events.mouseOver","title":"mouseOver","parent":"plotOptions-column-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<solidgauge>-point-events--mouseOver","fullname":"series<solidgauge>.point.events.mouseOver","title":"mouseOver","parent":"series<solidgauge>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<treemap>-point-events--mouseOver","fullname":"series<treemap>.point.events.mouseOver","title":"mouseOver","parent":"series<treemap>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<bubble>-data-events--mouseOver","fullname":"series<bubble>.data.events.mouseOver","title":"mouseOver","parent":"series<bubble>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<polygon>-point-events--mouseOver","fullname":"series<polygon>.point.events.mouseOver","title":"mouseOver","parent":"series<polygon>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<polygon>-data-events--mouseOver","fullname":"series<polygon>.data.events.mouseOver","title":"mouseOver","parent":"series<polygon>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-series-events--mouseOver","fullname":"plotOptions.series.events.mouseOver","title":"mouseOver","parent":"plotOptions-series-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-arearange-events--mouseOver","fullname":"plotOptions.arearange.events.mouseOver","title":"mouseOver","parent":"plotOptions-arearange-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<scatter>-point-events--mouseOver","fullname":"series<scatter>.point.events.mouseOver","title":"mouseOver","parent":"series<scatter>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<columnrange>-events--mouseOver","fullname":"series<columnrange>.events.mouseOver","title":"mouseOver","parent":"series<columnrange>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-heatmap-events--mouseOver","fullname":"plotOptions.heatmap.events.mouseOver","title":"mouseOver","parent":"plotOptions-heatmap-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-areasplinerange-point-events--mouseOver","fullname":"plotOptions.areasplinerange.point.events.mouseOver","title":"mouseOver","parent":"plotOptions-areasplinerange-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<boxplot>-data-events--mouseOver","fullname":"series<boxplot>.data.events.mouseOver","title":"mouseOver","parent":"series<boxplot>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-bubble-point-events--mouseOver","fullname":"plotOptions.bubble.point.events.mouseOver","title":"mouseOver","parent":"plotOptions-bubble-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<treemap>-data-events--mouseOver","fullname":"series<treemap>.data.events.mouseOver","title":"mouseOver","parent":"series<treemap>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-funnel-events--mouseOver","fullname":"plotOptions.funnel.events.mouseOver","title":"mouseOver","parent":"plotOptions-funnel-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-bubble-events--mouseOver","fullname":"plotOptions.bubble.events.mouseOver","title":"mouseOver","parent":"plotOptions-bubble-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<funnel>-point-events--mouseOver","fullname":"series<funnel>.point.events.mouseOver","title":"mouseOver","parent":"series<funnel>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<arearange>-data-events--mouseOver","fullname":"series<arearange>.data.events.mouseOver","title":"mouseOver","parent":"series<arearange>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<heatmap>-data-events--mouseOver","fullname":"series<heatmap>.data.events.mouseOver","title":"mouseOver","parent":"series<heatmap>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<column>-data-events--mouseOver","fullname":"series<column>.data.events.mouseOver","title":"mouseOver","parent":"series<column>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<pie>-data-events--mouseOver","fullname":"series<pie>.data.events.mouseOver","title":"mouseOver","parent":"series<pie>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<boxplot>-point-events--mouseOver","fullname":"series<boxplot>.point.events.mouseOver","title":"mouseOver","parent":"series<boxplot>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-areasplinerange-events--mouseOver","fullname":"plotOptions.areasplinerange.events.mouseOver","title":"mouseOver","parent":"plotOptions-areasplinerange-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-scatter-events--mouseOver","fullname":"plotOptions.scatter.events.mouseOver","title":"mouseOver","parent":"plotOptions-scatter-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-areaspline-events--mouseOver","fullname":"plotOptions.areaspline.events.mouseOver","title":"mouseOver","parent":"plotOptions-areaspline-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<areaspline>-data-events--mouseOver","fullname":"series<areaspline>.data.events.mouseOver","title":"mouseOver","parent":"series<areaspline>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-polygon-events--mouseOver","fullname":"plotOptions.polygon.events.mouseOver","title":"mouseOver","parent":"plotOptions-polygon-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<scatter>-events--mouseOver","fullname":"series<scatter>.events.mouseOver","title":"mouseOver","parent":"series<scatter>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<errorbar>-point-events--mouseOver","fullname":"series<errorbar>.point.events.mouseOver","title":"mouseOver","parent":"series<errorbar>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<areasplinerange>-data-events--mouseOver","fullname":"series<areasplinerange>.data.events.mouseOver","title":"mouseOver","parent":"series<areasplinerange>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-bar-point-events--mouseOver","fullname":"plotOptions.bar.point.events.mouseOver","title":"mouseOver","parent":"plotOptions-bar-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<line>-data-events--mouseOver","fullname":"series<line>.data.events.mouseOver","title":"mouseOver","parent":"series<line>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<area>-point-events--mouseOver","fullname":"series<area>.point.events.mouseOver","title":"mouseOver","parent":"series<area>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<areaspline>-point-events--mouseOver","fullname":"series<areaspline>.point.events.mouseOver","title":"mouseOver","parent":"series<areaspline>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<spline>-point-events--mouseOver","fullname":"series<spline>.point.events.mouseOver","title":"mouseOver","parent":"series<spline>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<areasplinerange>-point-events--mouseOver","fullname":"series<areasplinerange>.point.events.mouseOver","title":"mouseOver","parent":"series<areasplinerange>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-line-point-events--mouseOver","fullname":"plotOptions.line.point.events.mouseOver","title":"mouseOver","parent":"plotOptions-line-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<bar>-events--mouseOver","fullname":"series<bar>.events.mouseOver","title":"mouseOver","parent":"series<bar>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-columnrange-events--mouseOver","fullname":"plotOptions.columnrange.events.mouseOver","title":"mouseOver","parent":"plotOptions-columnrange-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-waterfall-point-events--mouseOver","fullname":"plotOptions.waterfall.point.events.mouseOver","title":"mouseOver","parent":"plotOptions-waterfall-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<heatmap>-events--mouseOver","fullname":"series<heatmap>.events.mouseOver","title":"mouseOver","parent":"series<heatmap>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<heatmap>-point-events--mouseOver","fullname":"series<heatmap>.point.events.mouseOver","title":"mouseOver","parent":"series<heatmap>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-polygon-point-events--mouseOver","fullname":"plotOptions.polygon.point.events.mouseOver","title":"mouseOver","parent":"plotOptions-polygon-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-area-events--mouseOver","fullname":"plotOptions.area.events.mouseOver","title":"mouseOver","parent":"plotOptions-area-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<scatter>-data-events--mouseOver","fullname":"series<scatter>.data.events.mouseOver","title":"mouseOver","parent":"series<scatter>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<column>-point-events--mouseOver","fullname":"series<column>.point.events.mouseOver","title":"mouseOver","parent":"series<column>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-pie-events--mouseOver","fullname":"plotOptions.pie.events.mouseOver","title":"mouseOver","parent":"plotOptions-pie-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-areaspline-point-events--mouseOver","fullname":"plotOptions.areaspline.point.events.mouseOver","title":"mouseOver","parent":"plotOptions-areaspline-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-treemap-events--mouseOver","fullname":"plotOptions.treemap.events.mouseOver","title":"mouseOver","parent":"plotOptions-treemap-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<spline>-events--mouseOver","fullname":"series<spline>.events.mouseOver","title":"mouseOver","parent":"series<spline>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<column>-events--mouseOver","fullname":"series<column>.events.mouseOver","title":"mouseOver","parent":"series<column>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<gauge>-point-events--mouseOver","fullname":"series<gauge>.point.events.mouseOver","title":"mouseOver","parent":"series<gauge>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<arearange>-events--mouseOver","fullname":"series<arearange>.events.mouseOver","title":"mouseOver","parent":"series<arearange>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-series-point-events--mouseOver","fullname":"plotOptions.series.point.events.mouseOver","title":"mouseOver","parent":"plotOptions-series-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<line>-events--mouseOver","fullname":"series<line>.events.mouseOver","title":"mouseOver","parent":"series<line>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<waterfall>-point-events--mouseOver","fullname":"series<waterfall>.point.events.mouseOver","title":"mouseOver","parent":"series<waterfall>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-boxplot-events--mouseOver","fullname":"plotOptions.boxplot.events.mouseOver","title":"mouseOver","parent":"plotOptions-boxplot-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-treemap-point-events--mouseOver","fullname":"plotOptions.treemap.point.events.mouseOver","title":"mouseOver","parent":"plotOptions-treemap-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-gauge-events--mouseOver","fullname":"plotOptions.gauge.events.mouseOver","title":"mouseOver","parent":"plotOptions-gauge-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<waterfall>-data-events--mouseOver","fullname":"series<waterfall>.data.events.mouseOver","title":"mouseOver","parent":"series<waterfall>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-bar-events--mouseOver","fullname":"plotOptions.bar.events.mouseOver","title":"mouseOver","parent":"plotOptions-bar-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<solidgauge>-events--mouseOver","fullname":"series<solidgauge>.events.mouseOver","title":"mouseOver","parent":"series<solidgauge>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-gauge-point-events--mouseOver","fullname":"plotOptions.gauge.point.events.mouseOver","title":"mouseOver","parent":"plotOptions-gauge-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<errorbar>-data-events--mouseOver","fullname":"series<errorbar>.data.events.mouseOver","title":"mouseOver","parent":"series<errorbar>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<pyramid>-data-events--mouseOver","fullname":"series<pyramid>.data.events.mouseOver","title":"mouseOver","parent":"series<pyramid>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<pie>-point-events--mouseOver","fullname":"series<pie>.point.events.mouseOver","title":"mouseOver","parent":"series<pie>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-pyramid-point-events--mouseOver","fullname":"plotOptions.pyramid.point.events.mouseOver","title":"mouseOver","parent":"plotOptions-pyramid-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<waterfall>-events--mouseOver","fullname":"series<waterfall>.events.mouseOver","title":"mouseOver","parent":"series<waterfall>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-waterfall-events--mouseOver","fullname":"plotOptions.waterfall.events.mouseOver","title":"mouseOver","parent":"plotOptions-waterfall-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<columnrange>-point-events--mouseOver","fullname":"series<columnrange>.point.events.mouseOver","title":"mouseOver","parent":"series<columnrange>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<solidgauge>-data-events--mouseOver","fullname":"series<solidgauge>.data.events.mouseOver","title":"mouseOver","parent":"series<solidgauge>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-solidgauge-point-events--mouseOver","fullname":"plotOptions.solidgauge.point.events.mouseOver","title":"mouseOver","parent":"plotOptions-solidgauge-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<funnel>-data-events--mouseOver","fullname":"series<funnel>.data.events.mouseOver","title":"mouseOver","parent":"series<funnel>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<gauge>-data-events--mouseOver","fullname":"series<gauge>.data.events.mouseOver","title":"mouseOver","parent":"series<gauge>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<spline>-data-events--mouseOver","fullname":"series<spline>.data.events.mouseOver","title":"mouseOver","parent":"series<spline>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-column-events--mouseOver","fullname":"plotOptions.column.events.mouseOver","title":"mouseOver","parent":"plotOptions-column-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<boxplot>-events--mouseOver","fullname":"series<boxplot>.events.mouseOver","title":"mouseOver","parent":"series<boxplot>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-errorbar-events--mouseOver","fullname":"plotOptions.errorbar.events.mouseOver","title":"mouseOver","parent":"plotOptions-errorbar-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-spline-point-events--mouseOver","fullname":"plotOptions.spline.point.events.mouseOver","title":"mouseOver","parent":"plotOptions-spline-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<funnel>-events--mouseOver","fullname":"series<funnel>.events.mouseOver","title":"mouseOver","parent":"series<funnel>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<area>-data-events--mouseOver","fullname":"series<area>.data.events.mouseOver","title":"mouseOver","parent":"series<area>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<columnrange>-data-events--mouseOver","fullname":"series<columnrange>.data.events.mouseOver","title":"mouseOver","parent":"series<columnrange>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<area>-events--mouseOver","fullname":"series<area>.events.mouseOver","title":"mouseOver","parent":"series<area>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-boxplot-point-events--mouseOver","fullname":"plotOptions.boxplot.point.events.mouseOver","title":"mouseOver","parent":"plotOptions-boxplot-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<areaspline>-events--mouseOver","fullname":"series<areaspline>.events.mouseOver","title":"mouseOver","parent":"series<areaspline>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-errorbar-point-events--mouseOver","fullname":"plotOptions.errorbar.point.events.mouseOver","title":"mouseOver","parent":"plotOptions-errorbar-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-scatter-point-events--mouseOver","fullname":"plotOptions.scatter.point.events.mouseOver","title":"mouseOver","parent":"plotOptions-scatter-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<pyramid>-events--mouseOver","fullname":"series<pyramid>.events.mouseOver","title":"mouseOver","parent":"series<pyramid>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<bar>-point-events--mouseOver","fullname":"series<bar>.point.events.mouseOver","title":"mouseOver","parent":"series<bar>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<areasplinerange>-events--mouseOver","fullname":"series<areasplinerange>.events.mouseOver","title":"mouseOver","parent":"series<areasplinerange>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-funnel-point-events--mouseOver","fullname":"plotOptions.funnel.point.events.mouseOver","title":"mouseOver","parent":"plotOptions-funnel-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<bar>-data-events--mouseOver","fullname":"series<bar>.data.events.mouseOver","title":"mouseOver","parent":"series<bar>-data-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<treemap>-events--mouseOver","fullname":"series<treemap>.events.mouseOver","title":"mouseOver","parent":"series<treemap>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<pie>-events--mouseOver","fullname":"series<pie>.events.mouseOver","title":"mouseOver","parent":"series<pie>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"plotOptions-pie-point-events--mouseOver","fullname":"plotOptions.pie.point.events.mouseOver","title":"mouseOver","parent":"plotOptions-pie-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"plotOptions-line-events--mouseOver","fullname":"plotOptions.line.events.mouseOver","title":"mouseOver","parent":"plotOptions-line-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<gauge>-events--mouseOver","fullname":"series<gauge>.events.mouseOver","title":"mouseOver","parent":"series<gauge>-events","isParent":false,"returnType":"Function","context":"Series","description":"Fires when the mouse enters the graph. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"Log mouse over and out <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-sticky/\" target=\"_blank\">with sticky tracking\r\n\t\t\tby default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-mouseover-no-sticky/\" target=\"_blank\">without sticky tracking</a>","deprecated":false},{"name":"series<pyramid>-point-events--mouseOver","fullname":"series<pyramid>.point.events.mouseOver","title":"mouseOver","parent":"series<pyramid>-point-events","isParent":false,"returnType":"Function","context":"Point","description":"Fires when the mouse enters the area close to the point. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-mouseover/\" target=\"_blank\">Show values in the chart's corner on mouse over</a>","deprecated":false},{"name":"series<column>--name","fullname":"series<column>.name","title":"name","parent":"series<column>","isParent":false,"returnType":"String","description":"The name of the series as shown in the legend, tooltip etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/name/\" target=\"_blank\">Series name</a>"},{"name":"series<line>-data--name","fullname":"series<line>.data.name","title":"name","parent":"series<line>-data","isParent":false,"returnType":"String","description":"<p>The name of the point as shown in the legend, tooltip, dataLabel etc.</p>\r\n\r\n<p>If the <a href=\"#xAxis.type\">xAxis.type</a> is set to <code>category</code>, and no <a href=\"#xAxis.categories\">categories</a> option exists, the category will be pulled from the <code>point.name</code> of the last series defined. For multiple series, best practice however is to define <code>xAxis.categories</code>.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\">Point names</a>","deprecated":false},{"name":"series<areaspline>-data--name","fullname":"series<areaspline>.data.name","title":"name","parent":"series<areaspline>-data","isParent":false,"returnType":"String","description":"<p>The name of the point as shown in the legend, tooltip, dataLabel etc.</p>\r\n\r\n<p>If the <a href=\"#xAxis.type\">xAxis.type</a> is set to <code>category</code>, and no <a href=\"#xAxis.categories\">categories</a> option exists, the category will be pulled from the <code>point.name</code> of the last series defined. For multiple series, best practice however is to define <code>xAxis.categories</code>.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\">Point names</a>","deprecated":false},{"name":"series<polygon>-data--name","fullname":"series<polygon>.data.name","title":"name","parent":"series<polygon>-data","isParent":false,"returnType":"String","description":"<p>The name of the point as shown in the legend, tooltip, dataLabel etc.</p>\r\n\r\n<p>If the <a href=\"#xAxis.type\">xAxis.type</a> is set to <code>category</code>, and no <a href=\"#xAxis.categories\">categories</a> option exists, the category will be pulled from the <code>point.name</code> of the last series defined. For multiple series, best practice however is to define <code>xAxis.categories</code>.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\">Point names</a>","deprecated":false},{"name":"series<heatmap>-data--name","fullname":"series<heatmap>.data.name","title":"name","parent":"series<heatmap>-data","isParent":false,"returnType":"String","description":"<p>The name of the point as shown in the legend, tooltip, dataLabel etc.</p>\r\n\r\n<p>If the <a href=\"#xAxis.type\">xAxis.type</a> is set to <code>category</code>, and no <a href=\"#xAxis.categories\">categories</a> option exists, the category will be pulled from the <code>point.name</code> of the last series defined. For multiple series, best practice however is to define <code>xAxis.categories</code>.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\">Point names</a>","deprecated":false},{"name":"series<columnrange>-data--name","fullname":"series<columnrange>.data.name","title":"name","parent":"series<columnrange>-data","isParent":false,"returnType":"String","description":"<p>The name of the point as shown in the legend, tooltip, dataLabel etc.</p>\r\n\r\n<p>If the <a href=\"#xAxis.type\">xAxis.type</a> is set to <code>category</code>, and no <a href=\"#xAxis.categories\">categories</a> option exists, the category will be pulled from the <code>point.name</code> of the last series defined. For multiple series, best practice however is to define <code>xAxis.categories</code>.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\">Point names</a>","deprecated":false},{"name":"series<pie>--name","fullname":"series<pie>.name","title":"name","parent":"series<pie>","isParent":false,"returnType":"String","description":"The name of the series as shown in the legend, tooltip etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/name/\" target=\"_blank\">Series name</a>"},{"name":"series<boxplot>-data--name","fullname":"series<boxplot>.data.name","title":"name","parent":"series<boxplot>-data","isParent":false,"returnType":"String","description":"<p>The name of the point as shown in the legend, tooltip, dataLabel etc.</p>\r\n\r\n<p>If the <a href=\"#xAxis.type\">xAxis.type</a> is set to <code>category</code>, and no <a href=\"#xAxis.categories\">categories</a> option exists, the category will be pulled from the <code>point.name</code> of the last series defined. For multiple series, best practice however is to define <code>xAxis.categories</code>.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\">Point names</a>","deprecated":false},{"name":"series<pyramid>-data--name","fullname":"series<pyramid>.data.name","title":"name","parent":"series<pyramid>-data","isParent":false,"returnType":"String","description":"<p>The name of the point as shown in the legend, tooltip, dataLabel etc.</p>\r\n\r\n<p>If the <a href=\"#xAxis.type\">xAxis.type</a> is set to <code>category</code>, and no <a href=\"#xAxis.categories\">categories</a> option exists, the category will be pulled from the <code>point.name</code> of the last series defined. For multiple series, best practice however is to define <code>xAxis.categories</code>.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\">Point names</a>","deprecated":false},{"name":"series<boxplot>--name","fullname":"series<boxplot>.name","title":"name","parent":"series<boxplot>","isParent":false,"returnType":"String","description":"The name of the series as shown in the legend, tooltip etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/name/\" target=\"_blank\">Series name</a>"},{"name":"series<errorbar>-data--name","fullname":"series<errorbar>.data.name","title":"name","parent":"series<errorbar>-data","isParent":false,"returnType":"String","description":"<p>The name of the point as shown in the legend, tooltip, dataLabel etc.</p>\r\n\r\n<p>If the <a href=\"#xAxis.type\">xAxis.type</a> is set to <code>category</code>, and no <a href=\"#xAxis.categories\">categories</a> option exists, the category will be pulled from the <code>point.name</code> of the last series defined. For multiple series, best practice however is to define <code>xAxis.categories</code>.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\">Point names</a>","deprecated":false},{"name":"series<solidgauge>--name","fullname":"series<solidgauge>.name","title":"name","parent":"series<solidgauge>","isParent":false,"returnType":"String","description":"The name of the series as shown in the legend, tooltip etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/name/\" target=\"_blank\">Series name</a>"},{"name":"series<area>--name","fullname":"series<area>.name","title":"name","parent":"series<area>","isParent":false,"returnType":"String","description":"The name of the series as shown in the legend, tooltip etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/name/\" target=\"_blank\">Series name</a>"},{"name":"series<spline>--name","fullname":"series<spline>.name","title":"name","parent":"series<spline>","isParent":false,"returnType":"String","description":"The name of the series as shown in the legend, tooltip etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/name/\" target=\"_blank\">Series name</a>"},{"name":"series<scatter>--name","fullname":"series<scatter>.name","title":"name","parent":"series<scatter>","isParent":false,"returnType":"String","description":"The name of the series as shown in the legend, tooltip etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/name/\" target=\"_blank\">Series name</a>"},{"name":"series<bubble>-data--name","fullname":"series<bubble>.data.name","title":"name","parent":"series<bubble>-data","isParent":false,"returnType":"String","description":"<p>The name of the point as shown in the legend, tooltip, dataLabel etc.</p>\r\n\r\n<p>If the <a href=\"#xAxis.type\">xAxis.type</a> is set to <code>category</code>, and no <a href=\"#xAxis.categories\">categories</a> option exists, the category will be pulled from the <code>point.name</code> of the last series defined. For multiple series, best practice however is to define <code>xAxis.categories</code>.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\">Point names</a>","deprecated":false},{"name":"series<gauge>--name","fullname":"series<gauge>.name","title":"name","parent":"series<gauge>","isParent":false,"returnType":"String","description":"The name of the series as shown in the legend, tooltip etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/name/\" target=\"_blank\">Series name</a>"},{"name":"series<pyramid>--name","fullname":"series<pyramid>.name","title":"name","parent":"series<pyramid>","isParent":false,"returnType":"String","description":"The name of the series as shown in the legend, tooltip etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/name/\" target=\"_blank\">Series name</a>"},{"name":"series<line>--name","fullname":"series<line>.name","title":"name","parent":"series<line>","isParent":false,"returnType":"String","description":"The name of the series as shown in the legend, tooltip etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/name/\" target=\"_blank\">Series name</a>"},{"name":"series<arearange>-data--name","fullname":"series<arearange>.data.name","title":"name","parent":"series<arearange>-data","isParent":false,"returnType":"String","description":"<p>The name of the point as shown in the legend, tooltip, dataLabel etc.</p>\r\n\r\n<p>If the <a href=\"#xAxis.type\">xAxis.type</a> is set to <code>category</code>, and no <a href=\"#xAxis.categories\">categories</a> option exists, the category will be pulled from the <code>point.name</code> of the last series defined. For multiple series, best practice however is to define <code>xAxis.categories</code>.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\">Point names</a>","deprecated":false},{"name":"series<columnrange>--name","fullname":"series<columnrange>.name","title":"name","parent":"series<columnrange>","isParent":false,"returnType":"String","description":"The name of the series as shown in the legend, tooltip etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/name/\" target=\"_blank\">Series name</a>"},{"name":"series<treemap>--name","fullname":"series<treemap>.name","title":"name","parent":"series<treemap>","isParent":false,"returnType":"String","description":"The name of the series as shown in the legend, tooltip etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/name/\" target=\"_blank\">Series name</a>"},{"name":"series<area>-data--name","fullname":"series<area>.data.name","title":"name","parent":"series<area>-data","isParent":false,"returnType":"String","description":"<p>The name of the point as shown in the legend, tooltip, dataLabel etc.</p>\r\n\r\n<p>If the <a href=\"#xAxis.type\">xAxis.type</a> is set to <code>category</code>, and no <a href=\"#xAxis.categories\">categories</a> option exists, the category will be pulled from the <code>point.name</code> of the last series defined. For multiple series, best practice however is to define <code>xAxis.categories</code>.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\">Point names</a>","deprecated":false},{"name":"series<spline>-data--name","fullname":"series<spline>.data.name","title":"name","parent":"series<spline>-data","isParent":false,"returnType":"String","description":"<p>The name of the point as shown in the legend, tooltip, dataLabel etc.</p>\r\n\r\n<p>If the <a href=\"#xAxis.type\">xAxis.type</a> is set to <code>category</code>, and no <a href=\"#xAxis.categories\">categories</a> option exists, the category will be pulled from the <code>point.name</code> of the last series defined. For multiple series, best practice however is to define <code>xAxis.categories</code>.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\">Point names</a>","deprecated":false},{"name":"series<funnel>-data--name","fullname":"series<funnel>.data.name","title":"name","parent":"series<funnel>-data","isParent":false,"returnType":"String","description":"<p>The name of the point as shown in the legend, tooltip, dataLabel etc.</p>\r\n\r\n<p>If the <a href=\"#xAxis.type\">xAxis.type</a> is set to <code>category</code>, and no <a href=\"#xAxis.categories\">categories</a> option exists, the category will be pulled from the <code>point.name</code> of the last series defined. For multiple series, best practice however is to define <code>xAxis.categories</code>.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\">Point names</a>","deprecated":false},{"name":"series<pie>-data--name","fullname":"series<pie>.data.name","title":"name","parent":"series<pie>-data","isParent":false,"returnType":"String","description":"<p>The name of the point as shown in the legend, tooltip, dataLabel etc.</p>\r\n\r\n<p>If the <a href=\"#xAxis.type\">xAxis.type</a> is set to <code>category</code>, and no <a href=\"#xAxis.categories\">categories</a> option exists, the category will be pulled from the <code>point.name</code> of the last series defined. For multiple series, best practice however is to define <code>xAxis.categories</code>.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\">Point names</a>","deprecated":false},{"name":"series<column>-data--name","fullname":"series<column>.data.name","title":"name","parent":"series<column>-data","isParent":false,"returnType":"String","description":"<p>The name of the point as shown in the legend, tooltip, dataLabel etc.</p>\r\n\r\n<p>If the <a href=\"#xAxis.type\">xAxis.type</a> is set to <code>category</code>, and no <a href=\"#xAxis.categories\">categories</a> option exists, the category will be pulled from the <code>point.name</code> of the last series defined. For multiple series, best practice however is to define <code>xAxis.categories</code>.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\">Point names</a>","deprecated":false},{"name":"series<gauge>-data--name","fullname":"series<gauge>.data.name","title":"name","parent":"series<gauge>-data","isParent":false,"returnType":"String","description":"<p>The name of the point as shown in the legend, tooltip, dataLabel etc.</p>\r\n\r\n<p>If the <a href=\"#xAxis.type\">xAxis.type</a> is set to <code>category</code>, and no <a href=\"#xAxis.categories\">categories</a> option exists, the category will be pulled from the <code>point.name</code> of the last series defined. For multiple series, best practice however is to define <code>xAxis.categories</code>.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\">Point names</a>","deprecated":false},{"name":"series<arearange>--name","fullname":"series<arearange>.name","title":"name","parent":"series<arearange>","isParent":false,"returnType":"String","description":"The name of the series as shown in the legend, tooltip etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/name/\" target=\"_blank\">Series name</a>"},{"name":"series--name","fullname":"series.name","title":"name","parent":"series","isParent":false,"returnType":"String","description":"The name of the series as shown in the legend, tooltip etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/name/\" target=\"_blank\">Series name</a>"},{"name":"series<solidgauge>-data--name","fullname":"series<solidgauge>.data.name","title":"name","parent":"series<solidgauge>-data","isParent":false,"returnType":"String","description":"<p>The name of the point as shown in the legend, tooltip, dataLabel etc.</p>\r\n\r\n<p>If the <a href=\"#xAxis.type\">xAxis.type</a> is set to <code>category</code>, and no <a href=\"#xAxis.categories\">categories</a> option exists, the category will be pulled from the <code>point.name</code> of the last series defined. For multiple series, best practice however is to define <code>xAxis.categories</code>.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\">Point names</a>","deprecated":false},{"name":"series<waterfall>-data--name","fullname":"series<waterfall>.data.name","title":"name","parent":"series<waterfall>-data","isParent":false,"returnType":"String","description":"<p>The name of the point as shown in the legend, tooltip, dataLabel etc.</p>\r\n\r\n<p>If the <a href=\"#xAxis.type\">xAxis.type</a> is set to <code>category</code>, and no <a href=\"#xAxis.categories\">categories</a> option exists, the category will be pulled from the <code>point.name</code> of the last series defined. For multiple series, best practice however is to define <code>xAxis.categories</code>.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\">Point names</a>","deprecated":false},{"name":"series<scatter>-data--name","fullname":"series<scatter>.data.name","title":"name","parent":"series<scatter>-data","isParent":false,"returnType":"String","description":"<p>The name of the point as shown in the legend, tooltip, dataLabel etc.</p>\r\n\r\n<p>If the <a href=\"#xAxis.type\">xAxis.type</a> is set to <code>category</code>, and no <a href=\"#xAxis.categories\">categories</a> option exists, the category will be pulled from the <code>point.name</code> of the last series defined. For multiple series, best practice however is to define <code>xAxis.categories</code>.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\">Point names</a>","deprecated":false},{"name":"series<polygon>--name","fullname":"series<polygon>.name","title":"name","parent":"series<polygon>","isParent":false,"returnType":"String","description":"The name of the series as shown in the legend, tooltip etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/name/\" target=\"_blank\">Series name</a>"},{"name":"series<heatmap>--name","fullname":"series<heatmap>.name","title":"name","parent":"series<heatmap>","isParent":false,"returnType":"String","description":"The name of the series as shown in the legend, tooltip etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/name/\" target=\"_blank\">Series name</a>"},{"name":"series<areaspline>--name","fullname":"series<areaspline>.name","title":"name","parent":"series<areaspline>","isParent":false,"returnType":"String","description":"The name of the series as shown in the legend, tooltip etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/name/\" target=\"_blank\">Series name</a>"},{"name":"series<bubble>--name","fullname":"series<bubble>.name","title":"name","parent":"series<bubble>","isParent":false,"returnType":"String","description":"The name of the series as shown in the legend, tooltip etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/name/\" target=\"_blank\">Series name</a>"},{"name":"series<areasplinerange>-data--name","fullname":"series<areasplinerange>.data.name","title":"name","parent":"series<areasplinerange>-data","isParent":false,"returnType":"String","description":"<p>The name of the point as shown in the legend, tooltip, dataLabel etc.</p>\r\n\r\n<p>If the <a href=\"#xAxis.type\">xAxis.type</a> is set to <code>category</code>, and no <a href=\"#xAxis.categories\">categories</a> option exists, the category will be pulled from the <code>point.name</code> of the last series defined. For multiple series, best practice however is to define <code>xAxis.categories</code>.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\">Point names</a>","deprecated":false},{"name":"series<waterfall>--name","fullname":"series<waterfall>.name","title":"name","parent":"series<waterfall>","isParent":false,"returnType":"String","description":"The name of the series as shown in the legend, tooltip etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/name/\" target=\"_blank\">Series name</a>"},{"name":"series<bar>--name","fullname":"series<bar>.name","title":"name","parent":"series<bar>","isParent":false,"returnType":"String","description":"The name of the series as shown in the legend, tooltip etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/name/\" target=\"_blank\">Series name</a>"},{"name":"series<treemap>-data--name","fullname":"series<treemap>.data.name","title":"name","parent":"series<treemap>-data","isParent":false,"returnType":"String","description":"<p>The name of the point as shown in the legend, tooltip, dataLabel etc.</p>\r\n\r\n<p>If the <a href=\"#xAxis.type\">xAxis.type</a> is set to <code>category</code>, and no <a href=\"#xAxis.categories\">categories</a> option exists, the category will be pulled from the <code>point.name</code> of the last series defined. For multiple series, best practice however is to define <code>xAxis.categories</code>.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\">Point names</a>","deprecated":false},{"name":"series<areasplinerange>--name","fullname":"series<areasplinerange>.name","title":"name","parent":"series<areasplinerange>","isParent":false,"returnType":"String","description":"The name of the series as shown in the legend, tooltip etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/name/\" target=\"_blank\">Series name</a>"},{"name":"series<errorbar>--name","fullname":"series<errorbar>.name","title":"name","parent":"series<errorbar>","isParent":false,"returnType":"String","description":"The name of the series as shown in the legend, tooltip etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/name/\" target=\"_blank\">Series name</a>"},{"name":"series<funnel>--name","fullname":"series<funnel>.name","title":"name","parent":"series<funnel>","isParent":false,"returnType":"String","description":"The name of the series as shown in the legend, tooltip etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/name/\" target=\"_blank\">Series name</a>"},{"name":"series<bar>-data--name","fullname":"series<bar>.data.name","title":"name","parent":"series<bar>-data","isParent":false,"returnType":"String","description":"<p>The name of the point as shown in the legend, tooltip, dataLabel etc.</p>\r\n\r\n<p>If the <a href=\"#xAxis.type\">xAxis.type</a> is set to <code>category</code>, and no <a href=\"#xAxis.categories\">categories</a> option exists, the category will be pulled from the <code>point.name</code> of the last series defined. For multiple series, best practice however is to define <code>xAxis.categories</code>.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/data-array-of-objects/\" target=\"_blank\">Point names</a>","deprecated":false},{"name":"legend-navigation","fullname":"legend.navigation","title":"navigation","parent":"legend","isParent":true,"description":"Options for the paging or navigation appearing when the legend is overflown. When <a href=\"#legend.useHTML\">legend.useHTML</a> is enabled, navigation is disabled. ","deprecated":false},{"name":"navigation","fullname":"navigation","title":"navigation","isParent":true,"description":"A collection of options for buttons and menus appearing in the exporting module."},{"name":"series<funnel>--neckHeight","fullname":"series<funnel>.neckHeight","title":"neckHeight","parent":"series<funnel>","isParent":false,"returnType":"Number|String","defaults":"25%","values":"","since":"","description":"The height of the neck, the lower part of the funnel. A number defines pixel width, a percentage string defines a percentage of the plot area height.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel--neckHeight","fullname":"plotOptions.funnel.neckHeight","title":"neckHeight","parent":"plotOptions-funnel","isParent":false,"returnType":"Number|String","defaults":"25%","values":"","since":"","description":"The height of the neck, the lower part of the funnel. A number defines pixel width, a percentage string defines a percentage of the plot area height.","demo":"","seeAlso":"","deprecated":false},{"name":"series<funnel>--neckWidth","fullname":"series<funnel>.neckWidth","title":"neckWidth","parent":"series<funnel>","isParent":false,"returnType":"Number|String","defaults":"30%","since":"3.0","description":"The width of the neck, the lower part of the funnel. A number defines pixel width, a percentage string defines a percentage of the plot area width.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/funnel/\" target=\"_blank\">Funnel demo</a>","deprecated":false},{"name":"plotOptions-funnel--neckWidth","fullname":"plotOptions.funnel.neckWidth","title":"neckWidth","parent":"plotOptions-funnel","isParent":false,"returnType":"Number|String","defaults":"30%","since":"3.0","description":"The width of the neck, the lower part of the funnel. A number defines pixel width, a percentage string defines a percentage of the plot area width.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/funnel/\" target=\"_blank\">Funnel demo</a>","deprecated":false},{"name":"series<gauge>--negativeColor","fullname":"series<gauge>.negativeColor","title":"negativeColor","parent":"series<gauge>","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"series<spline>--negativeColor","fullname":"series<spline>.negativeColor","title":"negativeColor","parent":"series<spline>","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"series<scatter>--negativeColor","fullname":"series<scatter>.negativeColor","title":"negativeColor","parent":"series<scatter>","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-line--negativeColor","fullname":"plotOptions.line.negativeColor","title":"negativeColor","parent":"plotOptions-line","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"series<boxplot>--negativeColor","fullname":"series<boxplot>.negativeColor","title":"negativeColor","parent":"series<boxplot>","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon--negativeColor","fullname":"plotOptions.polygon.negativeColor","title":"negativeColor","parent":"plotOptions-polygon","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"series<bubble>--negativeColor","fullname":"series<bubble>.negativeColor","title":"negativeColor","parent":"series<bubble>","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"When a point's Z value is below the <a href=\"#plotOptions.bubble.zThreshold\">zThreshold</a> setting, this color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/bubble-negative/\" target=\"_blank\">Negative bubbles</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline--negativeColor","fullname":"plotOptions.areaspline.negativeColor","title":"negativeColor","parent":"plotOptions-areaspline","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-spline--negativeColor","fullname":"plotOptions.spline.negativeColor","title":"negativeColor","parent":"plotOptions-spline","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"series<bar>--negativeColor","fullname":"series<bar>.negativeColor","title":"negativeColor","parent":"series<bar>","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"series<areaspline>--negativeColor","fullname":"series<areaspline>.negativeColor","title":"negativeColor","parent":"series<areaspline>","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"series<column>--negativeColor","fullname":"series<column>.negativeColor","title":"negativeColor","parent":"series<column>","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-series--negativeColor","fullname":"plotOptions.series.negativeColor","title":"negativeColor","parent":"plotOptions-series","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar--negativeColor","fullname":"plotOptions.errorbar.negativeColor","title":"negativeColor","parent":"plotOptions-errorbar","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-bar--negativeColor","fullname":"plotOptions.bar.negativeColor","title":"negativeColor","parent":"plotOptions-bar","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-area--negativeColor","fullname":"plotOptions.area.negativeColor","title":"negativeColor","parent":"plotOptions-area","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble--negativeColor","fullname":"plotOptions.bubble.negativeColor","title":"negativeColor","parent":"plotOptions-bubble","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"When a point's Z value is below the <a href=\"#plotOptions.bubble.zThreshold\">zThreshold</a> setting, this color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/bubble-negative/\" target=\"_blank\">Negative bubbles</a>","seeAlso":"","deprecated":false},{"name":"series<errorbar>--negativeColor","fullname":"series<errorbar>.negativeColor","title":"negativeColor","parent":"series<errorbar>","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge--negativeColor","fullname":"plotOptions.gauge.negativeColor","title":"negativeColor","parent":"plotOptions-gauge","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter--negativeColor","fullname":"plotOptions.scatter.negativeColor","title":"negativeColor","parent":"plotOptions-scatter","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"series<polygon>--negativeColor","fullname":"series<polygon>.negativeColor","title":"negativeColor","parent":"series<polygon>","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>--negativeColor","fullname":"series<areasplinerange>.negativeColor","title":"negativeColor","parent":"series<areasplinerange>","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange--negativeColor","fullname":"plotOptions.areasplinerange.negativeColor","title":"negativeColor","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-column--negativeColor","fullname":"plotOptions.column.negativeColor","title":"negativeColor","parent":"plotOptions-column","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"series<line>--negativeColor","fullname":"series<line>.negativeColor","title":"negativeColor","parent":"series<line>","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"series<area>--negativeColor","fullname":"series<area>.negativeColor","title":"negativeColor","parent":"series<area>","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange--negativeColor","fullname":"plotOptions.arearange.negativeColor","title":"negativeColor","parent":"plotOptions-arearange","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot--negativeColor","fullname":"plotOptions.boxplot.negativeColor","title":"negativeColor","parent":"plotOptions-boxplot","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"series<arearange>--negativeColor","fullname":"series<arearange>.negativeColor","title":"negativeColor","parent":"series<arearange>","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color for the parts of the graph or points that are below the <a href=\"#plotOptions.series.threshold\">threshold</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-negative-color/\" target=\"_blank\">Spline, area and column</a> - <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-negativecolor/\" target=\"_blank\">arearange</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline--negativeFillColor","fullname":"plotOptions.areaspline.negativeFillColor","title":"negativeFillColor","parent":"plotOptions-areaspline","isParent":false,"returnType":"Color","defaults":"","values":"","since":"3.0","description":"A separate color for the negative part of the area.","demo":"","seeAlso":"<a href=\"#plotOptions.area.negativeColor\">negativeColor</a>","deprecated":false},{"name":"series<arearange>--negativeFillColor","fullname":"series<arearange>.negativeFillColor","title":"negativeFillColor","parent":"series<arearange>","isParent":false,"returnType":"Color","defaults":"","values":"","since":"3.0","description":"A separate color for the negative part of the area.","demo":"","seeAlso":"<a href=\"#plotOptions.area.negativeColor\">negativeColor</a>","deprecated":false},{"name":"plotOptions-area--negativeFillColor","fullname":"plotOptions.area.negativeFillColor","title":"negativeFillColor","parent":"plotOptions-area","isParent":false,"returnType":"Color","defaults":"","values":"","since":"3.0","description":"A separate color for the negative part of the area.","demo":"","seeAlso":"<a href=\"#plotOptions.area.negativeColor\">negativeColor</a>","deprecated":false},{"name":"plotOptions-areasplinerange--negativeFillColor","fullname":"plotOptions.areasplinerange.negativeFillColor","title":"negativeFillColor","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"Color","defaults":"","values":"","since":"3.0","description":"A separate color for the negative part of the area.","demo":"","seeAlso":"<a href=\"#plotOptions.area.negativeColor\">negativeColor</a>","deprecated":false},{"name":"series<areaspline>--negativeFillColor","fullname":"series<areaspline>.negativeFillColor","title":"negativeFillColor","parent":"series<areaspline>","isParent":false,"returnType":"Color","defaults":"","values":"","since":"3.0","description":"A separate color for the negative part of the area.","demo":"","seeAlso":"<a href=\"#plotOptions.area.negativeColor\">negativeColor</a>","deprecated":false},{"name":"plotOptions-arearange--negativeFillColor","fullname":"plotOptions.arearange.negativeFillColor","title":"negativeFillColor","parent":"plotOptions-arearange","isParent":false,"returnType":"Color","defaults":"","values":"","since":"3.0","description":"A separate color for the negative part of the area.","demo":"","seeAlso":"<a href=\"#plotOptions.area.negativeColor\">negativeColor</a>","deprecated":false},{"name":"series<area>--negativeFillColor","fullname":"series<area>.negativeFillColor","title":"negativeFillColor","parent":"series<area>","isParent":false,"returnType":"Color","defaults":"","values":"","since":"3.0","description":"A separate color for the negative part of the area.","demo":"","seeAlso":"<a href=\"#plotOptions.area.negativeColor\">negativeColor</a>","deprecated":false},{"name":"series<areasplinerange>--negativeFillColor","fullname":"series<areasplinerange>.negativeFillColor","title":"negativeFillColor","parent":"series<areasplinerange>","isParent":false,"returnType":"Color","defaults":"","values":"","since":"3.0","description":"A separate color for the negative part of the area.","demo":"","seeAlso":"<a href=\"#plotOptions.area.negativeColor\">negativeColor</a>","deprecated":false},{"name":"lang--noData","fullname":"lang.noData","title":"noData","parent":"lang","isParent":false,"returnType":"String","defaults":"No data to display","values":"","since":"3.0.8","description":"The text to display when the chart contains no data. Requires the no-data module, see <a href=\"#noData\">noData</a>.","demo":"","seeAlso":"","deprecated":false},{"name":"noData","fullname":"noData","title":"noData","isParent":true,"since":"3.0.8","description":"Options for displaying a message like \"No data to display\". This feature requires the file <code>no-data-to-display.js</code> to be loaded in the page. The actual text to display is set in the <a href=\"#lang.noData\">lang.noData</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/no-data-to-display/no-data-line/\" target=\"_blank\">Line series</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/no-data-to-display/no-data-pie/\" target=\"_blank\">pie series</a>.","deprecated":false},{"name":"lang--numericSymbols","fullname":"lang.numericSymbols","title":"numericSymbols","parent":"lang","isParent":false,"returnType":"Array<String>","defaults":"[ \"k\" , \"M\" , \"G\" , \"T\" , \"P\" , \"E\"]","since":"2.3.0","description":"<a href=\"http://en.wikipedia.org/wiki/Metric_prefix\">Metric prefixes</a> used to shorten high numbers in axis labels. Replacing any of the positions with <code>null</code> causes the full number to be written. Setting <code>numericSymbols</code> to <code>null</code> disables shortening altogether.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/lang/numericsymbols/\" target=\"_blank\">Replacing the symbols with text</a>","deprecated":false},{"name":"xAxis--offset","fullname":"xAxis.offset","title":"offset","parent":"xAxis","isParent":false,"returnType":"Number","defaults":"0","description":"The distance in pixels from the plot area to the axis line. A positive offset moves the axis with it's line, labels and ticks away from the plot area. This is typically used when two or more axes are displayed on the same side of the plot.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/offset/\" target=\"_blank\">Y axis offset of 70</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/offset-centered/\" target=\"_blank\">Axes positioned in the center of the plot</a>"},{"name":"xAxis-title--offset","fullname":"xAxis.title.offset","title":"offset","parent":"xAxis-title","isParent":false,"returnType":"Number","since":"2.2.0","description":"The distance of the axis title from the axis line. By default, this distance is  computed from the offset width of the labels, the labels' distance from  the axis and the title's margin. However when the offset option is set, it overrides all this.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/title-offset/\" target=\"_blank\">Place the axis title on top of the axis</a>","deprecated":false},{"name":"yAxis--offset","fullname":"yAxis.offset","title":"offset","parent":"yAxis","isParent":false,"returnType":"Number","defaults":"0","description":"The distance in pixels from the plot area to the axis line. A positive offset moves the axis with it's line, labels and ticks away from the plot area. This is typically used when two or more axes are displayed on the same side of the plot.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/offset/\" target=\"_blank\">Y axis offset of 70</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/offset-centered/\" target=\"_blank\">Axes positioned in the center of the plot</a>"},{"name":"yAxis-title--offset","fullname":"yAxis.title.offset","title":"offset","parent":"yAxis-title","isParent":false,"returnType":"Number","since":"2.2.0","description":"The distance of the axis title from the axis line. By default, this distance is  computed from the offset width of the labels, the labels' distance from  the axis and the title's margin. However when the offset option is set, it overrides all this.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/title-offset/\" target=\"_blank\">Place the axis title on top of the axis</a>","deprecated":false},{"name":"exporting-buttons-contextButton--onclick","fullname":"exporting.buttons.contextButton.onclick","title":"onclick","parent":"exporting-buttons-contextButton","isParent":false,"returnType":"Function","since":"2.0","description":"A click handler callback to use on the button directly instead of the popup menu.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/exporting/buttons-contextbutton-onclick/\" target=\"_blank\">Skip the menu and export the chart directly</a>","deprecated":false},{"name":"plotOptions-solidgauge-states-hover-halo--opacity","fullname":"plotOptions.solidgauge.states.hover.halo.opacity","title":"opacity","parent":"plotOptions-solidgauge-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"series<polygon>-states-hover-halo--opacity","fullname":"series<polygon>.states.hover.halo.opacity","title":"opacity","parent":"series<polygon>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"plotOptions-polygon-states-hover-halo--opacity","fullname":"plotOptions.polygon.states.hover.halo.opacity","title":"opacity","parent":"plotOptions-polygon-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"plotOptions-funnel-states-hover-halo--opacity","fullname":"plotOptions.funnel.states.hover.halo.opacity","title":"opacity","parent":"plotOptions-funnel-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"plotOptions-series-states-hover-halo--opacity","fullname":"plotOptions.series.states.hover.halo.opacity","title":"opacity","parent":"plotOptions-series-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"series<line>-states-hover-halo--opacity","fullname":"series<line>.states.hover.halo.opacity","title":"opacity","parent":"series<line>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"series<boxplot>-states-hover-halo--opacity","fullname":"series<boxplot>.states.hover.halo.opacity","title":"opacity","parent":"series<boxplot>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"plotOptions-bubble-states-hover-halo--opacity","fullname":"plotOptions.bubble.states.hover.halo.opacity","title":"opacity","parent":"plotOptions-bubble-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"plotOptions-spline-states-hover-halo--opacity","fullname":"plotOptions.spline.states.hover.halo.opacity","title":"opacity","parent":"plotOptions-spline-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"plotOptions-gauge-states-hover-halo--opacity","fullname":"plotOptions.gauge.states.hover.halo.opacity","title":"opacity","parent":"plotOptions-gauge-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"series<pyramid>-states-hover-halo--opacity","fullname":"series<pyramid>.states.hover.halo.opacity","title":"opacity","parent":"series<pyramid>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"series<columnrange>-states-hover-halo--opacity","fullname":"series<columnrange>.states.hover.halo.opacity","title":"opacity","parent":"series<columnrange>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"plotOptions-columnrange-states-hover-halo--opacity","fullname":"plotOptions.columnrange.states.hover.halo.opacity","title":"opacity","parent":"plotOptions-columnrange-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"plotOptions-treemap-states-hover-halo--opacity","fullname":"plotOptions.treemap.states.hover.halo.opacity","title":"opacity","parent":"plotOptions-treemap-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"plotOptions-errorbar-states-hover-halo--opacity","fullname":"plotOptions.errorbar.states.hover.halo.opacity","title":"opacity","parent":"plotOptions-errorbar-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"plotOptions-column-states-hover-halo--opacity","fullname":"plotOptions.column.states.hover.halo.opacity","title":"opacity","parent":"plotOptions-column-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"series<arearange>-states-hover-halo--opacity","fullname":"series<arearange>.states.hover.halo.opacity","title":"opacity","parent":"series<arearange>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"plotOptions-arearange-states-hover-halo--opacity","fullname":"plotOptions.arearange.states.hover.halo.opacity","title":"opacity","parent":"plotOptions-arearange-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"series<bubble>-states-hover-halo--opacity","fullname":"series<bubble>.states.hover.halo.opacity","title":"opacity","parent":"series<bubble>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"plotOptions-bar-states-hover-halo--opacity","fullname":"plotOptions.bar.states.hover.halo.opacity","title":"opacity","parent":"plotOptions-bar-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"series<gauge>-states-hover-halo--opacity","fullname":"series<gauge>.states.hover.halo.opacity","title":"opacity","parent":"series<gauge>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"series<heatmap>-states-hover-halo--opacity","fullname":"series<heatmap>.states.hover.halo.opacity","title":"opacity","parent":"series<heatmap>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"plotOptions-pyramid-states-hover-halo--opacity","fullname":"plotOptions.pyramid.states.hover.halo.opacity","title":"opacity","parent":"plotOptions-pyramid-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"series<areaspline>-states-hover-halo--opacity","fullname":"series<areaspline>.states.hover.halo.opacity","title":"opacity","parent":"series<areaspline>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"plotOptions-scatter-states-hover-halo--opacity","fullname":"plotOptions.scatter.states.hover.halo.opacity","title":"opacity","parent":"plotOptions-scatter-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"plotOptions-pie-states-hover-halo--opacity","fullname":"plotOptions.pie.states.hover.halo.opacity","title":"opacity","parent":"plotOptions-pie-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"series<column>-states-hover-halo--opacity","fullname":"series<column>.states.hover.halo.opacity","title":"opacity","parent":"series<column>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"plotOptions-waterfall-states-hover-halo--opacity","fullname":"plotOptions.waterfall.states.hover.halo.opacity","title":"opacity","parent":"plotOptions-waterfall-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"series<treemap>-states-hover-halo--opacity","fullname":"series<treemap>.states.hover.halo.opacity","title":"opacity","parent":"series<treemap>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"plotOptions-area-states-hover-halo--opacity","fullname":"plotOptions.area.states.hover.halo.opacity","title":"opacity","parent":"plotOptions-area-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"plotOptions-heatmap-states-hover-halo--opacity","fullname":"plotOptions.heatmap.states.hover.halo.opacity","title":"opacity","parent":"plotOptions-heatmap-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"series<areasplinerange>-states-hover-halo--opacity","fullname":"series<areasplinerange>.states.hover.halo.opacity","title":"opacity","parent":"series<areasplinerange>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"series<spline>-states-hover-halo--opacity","fullname":"series<spline>.states.hover.halo.opacity","title":"opacity","parent":"series<spline>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"series<waterfall>-states-hover-halo--opacity","fullname":"series<waterfall>.states.hover.halo.opacity","title":"opacity","parent":"series<waterfall>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"series<solidgauge>-states-hover-halo--opacity","fullname":"series<solidgauge>.states.hover.halo.opacity","title":"opacity","parent":"series<solidgauge>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"plotOptions-areaspline-states-hover-halo--opacity","fullname":"plotOptions.areaspline.states.hover.halo.opacity","title":"opacity","parent":"plotOptions-areaspline-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"series<area>-states-hover-halo--opacity","fullname":"series<area>.states.hover.halo.opacity","title":"opacity","parent":"series<area>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"series<errorbar>-states-hover-halo--opacity","fullname":"series<errorbar>.states.hover.halo.opacity","title":"opacity","parent":"series<errorbar>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"plotOptions-boxplot-states-hover-halo--opacity","fullname":"plotOptions.boxplot.states.hover.halo.opacity","title":"opacity","parent":"plotOptions-boxplot-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"series<scatter>-states-hover-halo--opacity","fullname":"series<scatter>.states.hover.halo.opacity","title":"opacity","parent":"series<scatter>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"plotOptions-line-states-hover-halo--opacity","fullname":"plotOptions.line.states.hover.halo.opacity","title":"opacity","parent":"plotOptions-line-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"plotOptions-areasplinerange-states-hover-halo--opacity","fullname":"plotOptions.areasplinerange.states.hover.halo.opacity","title":"opacity","parent":"plotOptions-areasplinerange-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"series<bar>-states-hover-halo--opacity","fullname":"series<bar>.states.hover.halo.opacity","title":"opacity","parent":"series<bar>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"series<pie>-states-hover-halo--opacity","fullname":"series<pie>.states.hover.halo.opacity","title":"opacity","parent":"series<pie>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"series<funnel>-states-hover-halo--opacity","fullname":"series<funnel>.states.hover.halo.opacity","title":"opacity","parent":"series<funnel>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"0.25","since":"4.0","description":"Opacity for the halo unless a specific fill is overridden using the <code>attributes</code> setting. Note that Highcharts is only able to apply opacity to colors of hex or rgb(a) formats.","deprecated":false},{"name":"yAxis--opposite","fullname":"yAxis.opposite","title":"opposite","parent":"yAxis","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to display the axis on the opposite side of the normal. The normal is on the left side for vertical axes and bottom for horizontal, so the opposite sides will be right and top respectively. This is typically used with dual or multiple axes.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/opposite/\" target=\"_blank\">Secondary Y axis opposite</a>"},{"name":"xAxis--opposite","fullname":"xAxis.opposite","title":"opposite","parent":"xAxis","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to display the axis on the opposite side of the normal. The normal is on the left side for vertical axes and bottom for horizontal, so the opposite sides will be right and top respectively. This is typically used with dual or multiple axes.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/opposite/\" target=\"_blank\">Secondary Y axis opposite</a>"},{"name":"chart-options3d","fullname":"chart.options3d","title":"options3d","parent":"chart","isParent":true,"since":"4.0","description":"Options to render charts in 3 dimensions. This feature requires <code>highcharts-3d.js</code>, found in the download package or online at <a href=\"http://code.highcharts.com/highcharts-3d.js\">code.highcharts.com/highcharts-3d.js</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/3d/column/\">Basic 3D columns</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/3d-pie/\">basic 3D pie</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/3d/scatter/\">basic 3D scatter chart</a>.","deprecated":false},{"name":"yAxis-plotBands--outerRadius","fullname":"yAxis.plotBands.outerRadius","title":"outerRadius","parent":"yAxis-plotBands","isParent":false,"returnType":"Number|String","defaults":"100%","since":"2.3","description":"In a gauge chart, this option determines the outer radius of the plot band that stretches along the perimeter. It can be given as a percentage string, like <code>\"100%\"</code>, or as a pixel number, like <code>100</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-gauge\" target=\"_blank\">Gauge plot band</a>","deprecated":false},{"name":"plotOptions-areaspline-dataLabels--overflow","fullname":"plotOptions.areaspline.dataLabels.overflow","title":"overflow","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels--overflow","fullname":"plotOptions.areasplinerange.dataLabels.overflow","title":"overflow","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-series-dataLabels--overflow","fullname":"plotOptions.series.dataLabels.overflow","title":"overflow","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-dataLabels--overflow","fullname":"plotOptions.spline.dataLabels.overflow","title":"overflow","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange-dataLabels--overflow","fullname":"plotOptions.arearange.dataLabels.overflow","title":"overflow","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>-dataLabels--overflow","fullname":"series<spline>.dataLabels.overflow","title":"overflow","parent":"series<spline>-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<scatter>-dataLabels--overflow","fullname":"series<scatter>.dataLabels.overflow","title":"overflow","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<solidgauge>-dataLabels--overflow","fullname":"series<solidgauge>.dataLabels.overflow","title":"overflow","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-area-dataLabels--overflow","fullname":"plotOptions.area.dataLabels.overflow","title":"overflow","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-dataLabels--overflow","fullname":"series<areasplinerange>.dataLabels.overflow","title":"overflow","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-line-dataLabels--overflow","fullname":"plotOptions.line.dataLabels.overflow","title":"overflow","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-solidgauge-dataLabels--overflow","fullname":"plotOptions.solidgauge.dataLabels.overflow","title":"overflow","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areaspline>-dataLabels--overflow","fullname":"series<areaspline>.dataLabels.overflow","title":"overflow","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<area>-dataLabels--overflow","fullname":"series<area>.dataLabels.overflow","title":"overflow","parent":"series<area>-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<treemap>-dataLabels--overflow","fullname":"series<treemap>.dataLabels.overflow","title":"overflow","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"yAxis-labels--overflow","fullname":"yAxis.labels.overflow","title":"overflow","parent":"yAxis-labels","isParent":false,"returnType":"String","values":"[null, \"justify\"]","since":"2.2.5","description":"How to handle overflowing labels on horizontal axis. Can be undefined, <code>false</code> or <code>\"justify\"</code>. By default it aligns inside the chart area. If \"justify\", labels will not render outside the plot area. If <code>false</code>, it will not be aligned at all. If there is room to move it, it will be aligned to the edge, else it will be removed.","deprecated":true},{"name":"plotOptions-funnel-dataLabels--overflow","fullname":"plotOptions.funnel.dataLabels.overflow","title":"overflow","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bubble>-dataLabels--overflow","fullname":"series<bubble>.dataLabels.overflow","title":"overflow","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall-dataLabels--overflow","fullname":"plotOptions.waterfall.dataLabels.overflow","title":"overflow","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange-dataLabels--overflow","fullname":"plotOptions.columnrange.dataLabels.overflow","title":"overflow","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap-dataLabels--overflow","fullname":"plotOptions.heatmap.dataLabels.overflow","title":"overflow","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-dataLabels--overflow","fullname":"plotOptions.pyramid.dataLabels.overflow","title":"overflow","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<line>-dataLabels--overflow","fullname":"series<line>.dataLabels.overflow","title":"overflow","parent":"series<line>-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pyramid>-dataLabels--overflow","fullname":"series<pyramid>.dataLabels.overflow","title":"overflow","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bar-dataLabels--overflow","fullname":"plotOptions.bar.dataLabels.overflow","title":"overflow","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<funnel>-dataLabels--overflow","fullname":"series<funnel>.dataLabels.overflow","title":"overflow","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<gauge>-dataLabels--overflow","fullname":"series<gauge>.dataLabels.overflow","title":"overflow","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pie>-dataLabels--overflow","fullname":"series<pie>.dataLabels.overflow","title":"overflow","parent":"series<pie>-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<waterfall>-dataLabels--overflow","fullname":"series<waterfall>.dataLabels.overflow","title":"overflow","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter-dataLabels--overflow","fullname":"plotOptions.scatter.dataLabels.overflow","title":"overflow","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-dataLabels--overflow","fullname":"plotOptions.polygon.dataLabels.overflow","title":"overflow","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<heatmap>-dataLabels--overflow","fullname":"series<heatmap>.dataLabels.overflow","title":"overflow","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pie-dataLabels--overflow","fullname":"plotOptions.pie.dataLabels.overflow","title":"overflow","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble-dataLabels--overflow","fullname":"plotOptions.bubble.dataLabels.overflow","title":"overflow","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"xAxis-labels--overflow","fullname":"xAxis.labels.overflow","title":"overflow","parent":"xAxis-labels","isParent":false,"returnType":"String","values":"[null, \"justify\"]","since":"2.2.5","description":"How to handle overflowing labels on horizontal axis. Can be undefined, <code>false</code> or <code>\"justify\"</code>. By default it aligns inside the chart area. If \"justify\", labels will not render outside the plot area. If <code>false</code>, it will not be aligned at all. If there is room to move it, it will be aligned to the edge, else it will be removed.","deprecated":true},{"name":"series<arearange>-dataLabels--overflow","fullname":"series<arearange>.dataLabels.overflow","title":"overflow","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<columnrange>-dataLabels--overflow","fullname":"series<columnrange>.dataLabels.overflow","title":"overflow","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<column>-dataLabels--overflow","fullname":"series<column>.dataLabels.overflow","title":"overflow","parent":"series<column>-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<polygon>-dataLabels--overflow","fullname":"series<polygon>.dataLabels.overflow","title":"overflow","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge-dataLabels--overflow","fullname":"plotOptions.gauge.dataLabels.overflow","title":"overflow","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap-dataLabels--overflow","fullname":"plotOptions.treemap.dataLabels.overflow","title":"overflow","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column-dataLabels--overflow","fullname":"plotOptions.column.dataLabels.overflow","title":"overflow","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bar>-dataLabels--overflow","fullname":"series<bar>.dataLabels.overflow","title":"overflow","parent":"series<bar>-dataLabels","isParent":false,"returnType":"String","defaults":"justify","values":"[\"justify\", \"none\"]","since":"3.0.6","description":"How to handle data labels that flow outside the plot area. The default is <code>justify</code>, which aligns them inside the plot area. For columns and bars, this means it will be moved inside the bar. To display data labels outside the plot area, set <code>crop</code> to <code>false</code> and <code>overflow</code> to <code>\"none\"</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge--overshoot","fullname":"plotOptions.gauge.overshoot","title":"overshoot","parent":"plotOptions-gauge","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"3.0.10","description":"Allow the dial to overshoot the end of the perimeter axis by this many degrees. Say if the gauge axis goes from 0 to 60, a value of 100, or 1000, will show 5 degrees beyond the end of the axis.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-overshoot/\" target=\"_blank\">Allow 5 degrees overshoot</a>","seeAlso":"<a href=\"#plotOptions.gauge.wrap\">wrap</a>","deprecated":false},{"name":"plotOptions-solidgauge--overshoot","fullname":"plotOptions.solidgauge.overshoot","title":"overshoot","parent":"plotOptions-solidgauge","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"3.0.10","description":"Allow the dial to overshoot the end of the perimeter axis by this many degrees. Say if the gauge axis goes from 0 to 60, a value of 100, or 1000, will show 5 degrees beyond the end of the axis.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-overshoot/\" target=\"_blank\">Allow 5 degrees overshoot</a>","seeAlso":"<a href=\"#plotOptions.gauge.wrap\">wrap</a>","deprecated":false},{"name":"series<solidgauge>--overshoot","fullname":"series<solidgauge>.overshoot","title":"overshoot","parent":"series<solidgauge>","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"3.0.10","description":"Allow the dial to overshoot the end of the perimeter axis by this many degrees. Say if the gauge axis goes from 0 to 60, a value of 100, or 1000, will show 5 degrees beyond the end of the axis.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-overshoot/\" target=\"_blank\">Allow 5 degrees overshoot</a>","seeAlso":"<a href=\"#plotOptions.gauge.wrap\">wrap</a>","deprecated":false},{"name":"series<gauge>--overshoot","fullname":"series<gauge>.overshoot","title":"overshoot","parent":"series<gauge>","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"3.0.10","description":"Allow the dial to overshoot the end of the perimeter axis by this many degrees. Say if the gauge axis goes from 0 to 60, a value of 100, or 1000, will show 5 degrees beyond the end of the axis.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-overshoot/\" target=\"_blank\">Allow 5 degrees overshoot</a>","seeAlso":"<a href=\"#plotOptions.gauge.wrap\">wrap</a>","deprecated":false},{"name":"plotOptions-funnel-dataLabels--padding","fullname":"plotOptions.funnel.dataLabels.padding","title":"padding","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<areasplinerange>-dataLabels--padding","fullname":"series<areasplinerange>.dataLabels.padding","title":"padding","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-polygon-dataLabels--padding","fullname":"plotOptions.polygon.dataLabels.padding","title":"padding","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-gauge-dataLabels--padding","fullname":"plotOptions.gauge.dataLabels.padding","title":"padding","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-columnrange-dataLabels--padding","fullname":"plotOptions.columnrange.dataLabels.padding","title":"padding","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-scatter-dataLabels--padding","fullname":"plotOptions.scatter.dataLabels.padding","title":"padding","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<pyramid>-dataLabels--padding","fullname":"series<pyramid>.dataLabels.padding","title":"padding","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"legend--padding","fullname":"legend.padding","title":"padding","parent":"legend","isParent":false,"returnType":"Number","defaults":"8","since":"2.2.0","description":"The inner padding of the legend box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/padding-itemmargin/\" target=\"_blank\">\r\n\t\t\t\tPadding and item margins demonstrated</a>","deprecated":false},{"name":"series<areaspline>-dataLabels--padding","fullname":"series<areaspline>.dataLabels.padding","title":"padding","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-heatmap-dataLabels--padding","fullname":"plotOptions.heatmap.dataLabels.padding","title":"padding","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-treemap-dataLabels--padding","fullname":"plotOptions.treemap.dataLabels.padding","title":"padding","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"xAxis-labels--padding","fullname":"xAxis.labels.padding","title":"padding","parent":"xAxis-labels","isParent":false,"returnType":"Number","context":"","defaults":"5","values":"","since":"","description":"The pixel padding for axis labels, to ensure white space between them.","demo":"","seeAlso":"","deprecated":false},{"name":"yAxis-labels--padding","fullname":"yAxis.labels.padding","title":"padding","parent":"yAxis-labels","isParent":false,"returnType":"Number","context":"","defaults":"5","values":"","since":"","description":"The pixel padding for axis labels, to ensure white space between them.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-line-dataLabels--padding","fullname":"plotOptions.line.dataLabels.padding","title":"padding","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-series-dataLabels--padding","fullname":"plotOptions.series.dataLabels.padding","title":"padding","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<bar>-dataLabels--padding","fullname":"series<bar>.dataLabels.padding","title":"padding","parent":"series<bar>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<heatmap>-dataLabels--padding","fullname":"series<heatmap>.dataLabels.padding","title":"padding","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<arearange>-dataLabels--padding","fullname":"series<arearange>.dataLabels.padding","title":"padding","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<column>-dataLabels--padding","fullname":"series<column>.dataLabels.padding","title":"padding","parent":"series<column>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<scatter>-dataLabels--padding","fullname":"series<scatter>.dataLabels.padding","title":"padding","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-area-dataLabels--padding","fullname":"plotOptions.area.dataLabels.padding","title":"padding","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<line>-dataLabels--padding","fullname":"series<line>.dataLabels.padding","title":"padding","parent":"series<line>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-column-dataLabels--padding","fullname":"plotOptions.column.dataLabels.padding","title":"padding","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<pie>-dataLabels--padding","fullname":"series<pie>.dataLabels.padding","title":"padding","parent":"series<pie>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-solidgauge-dataLabels--padding","fullname":"plotOptions.solidgauge.dataLabels.padding","title":"padding","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-areaspline-dataLabels--padding","fullname":"plotOptions.areaspline.dataLabels.padding","title":"padding","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<bubble>-dataLabels--padding","fullname":"series<bubble>.dataLabels.padding","title":"padding","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<columnrange>-dataLabels--padding","fullname":"series<columnrange>.dataLabels.padding","title":"padding","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<polygon>-dataLabels--padding","fullname":"series<polygon>.dataLabels.padding","title":"padding","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<treemap>-dataLabels--padding","fullname":"series<treemap>.dataLabels.padding","title":"padding","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-waterfall-dataLabels--padding","fullname":"plotOptions.waterfall.dataLabels.padding","title":"padding","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-bubble-dataLabels--padding","fullname":"plotOptions.bubble.dataLabels.padding","title":"padding","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<waterfall>-dataLabels--padding","fullname":"series<waterfall>.dataLabels.padding","title":"padding","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-arearange-dataLabels--padding","fullname":"plotOptions.arearange.dataLabels.padding","title":"padding","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<spline>-dataLabels--padding","fullname":"series<spline>.dataLabels.padding","title":"padding","parent":"series<spline>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-pie-dataLabels--padding","fullname":"plotOptions.pie.dataLabels.padding","title":"padding","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-bar-dataLabels--padding","fullname":"plotOptions.bar.dataLabels.padding","title":"padding","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<area>-dataLabels--padding","fullname":"series<area>.dataLabels.padding","title":"padding","parent":"series<area>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-pyramid-dataLabels--padding","fullname":"plotOptions.pyramid.dataLabels.padding","title":"padding","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<funnel>-dataLabels--padding","fullname":"series<funnel>.dataLabels.padding","title":"padding","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels--padding","fullname":"plotOptions.areasplinerange.dataLabels.padding","title":"padding","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"plotOptions-spline-dataLabels--padding","fullname":"plotOptions.spline.dataLabels.padding","title":"padding","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<solidgauge>-dataLabels--padding","fullname":"series<solidgauge>.dataLabels.padding","title":"padding","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"series<gauge>-dataLabels--padding","fullname":"series<gauge>.dataLabels.padding","title":"padding","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","since":"2.2.1","description":"When either the <code>borderWidth</code> or the <code>backgroundColor</code> is set, this\t\tis the padding within the box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","deprecated":false},{"name":"chart--panKey","fullname":"chart.panKey","title":"panKey","parent":"chart","isParent":false,"returnType":"String","defaults":"","values":"","since":"4.0.3","description":"Allows setting a key to switch between zooming and panning. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/pankey/\" target=\"_blank\">Hold down <em>shift</em> to pan</a>","seeAlso":"","deprecated":false},{"name":"pane","fullname":"pane","title":"pane","isParent":true,"returnType":"Object","since":"2.3.0","description":"Applies only to polar charts and angular gauges. This configuration object holds general options for the combined X and Y axes set. Each xAxis or yAxis can reference the pane by index.","demo":"","deprecated":false},{"name":"chart--panning","fullname":"chart.panning","title":"panning","parent":"chart","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"4.0.3","description":"Allow panning in a chart. Best used with <a href=\"#chart.panKey\">panKey</a> to combine zooming and panning.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/pankey/\" target=\"_blank\">Zooming and panning</a>","seeAlso":"","deprecated":false},{"name":"series<treemap>-data--parent","fullname":"series<treemap>.data.parent","title":"parent","parent":"series<treemap>-data","isParent":false,"returnType":"String","defaults":"undefined","since":"4.1.0","description":"Only for treemap. Use this option to build a tree structure. The value should be the id of the point which is the parent. If no points has a matching id, or this option is undefined, then the parent will be set to the root.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/parent/\" target=\"_blank\">Point parent</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/treemap-with-levels/\" target=\"_blank\">Example where parent id is not matching</a>","deprecated":false},{"name":"data--parseDate","fullname":"data.parseDate","title":"parseDate","parent":"data","isParent":false,"returnType":"Function","defaults":"","values":"","since":"4.0","description":"A callback function to parse string representations of dates into JavaScript timestamps. Should return an integer timestamp on success.","demo":"","seeAlso":"<a href=\"#data.dateFormat\">dateFormat</a>","deprecated":false},{"name":"data--parsed","fullname":"data.parsed","title":"parsed","parent":"data","isParent":false,"returnType":"Function","defaults":"","values":"","since":"4.0","description":"A callback function to access the parsed columns, the two-dimentional input data array directly, before they are interpreted into series data and categories. Return <code>false</code> to stop completion, or call <code>this.complete()</code> to continue async.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/data/parsed/\" target=\"_blank\">Modify data after parse</a>","seeAlso":"<a href=\"#data.complete\">data.complete</a>","deprecated":false},{"name":"plotOptions-pie","fullname":"plotOptions.pie","title":"pie","parent":"plotOptions","isParent":true,"description":"A pie chart is a circular chart divided into sectors, illustrating numerical proportion.","demo":" <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/pie-basic/\" target=\"_blank\">Pie chart</a>,  \r\n\r\n<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/3d-pie/\" target=\"_blank\">3D pie</a>","deprecated":false},{"name":"chart--pinchType","fullname":"chart.pinchType","title":"pinchType","parent":"chart","isParent":false,"returnType":"String","defaults":"null","values":"[\"x\", \"y\", \"xy\"]","since":"3.0","description":"Equivalent to <a href=\"#chart.zoomType\">zoomType</a>, but for multitouch gestures only. By default, the <code>pinchType</code> is the same as the <code>zoomType</code> setting. However, pinching can be enabled separately in some cases, for example in stock charts where a mouse drag pans the chart, while pinching is enabled.","demo":"","seeAlso":"","deprecated":false},{"name":"series<gauge>-pivot","fullname":"series<gauge>.pivot","title":"pivot","parent":"series<gauge>","isParent":true,"returnType":"Object","defaults":"","since":"2.3.0","description":"Options for the pivot or the center point of the gauge.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge-pivot","fullname":"plotOptions.gauge.pivot","title":"pivot","parent":"plotOptions-gauge","isParent":true,"returnType":"Object","defaults":"","since":"2.3.0","description":"Options for the pivot or the center point of the gauge.","demo":"","seeAlso":"","deprecated":false},{"name":"chart--plotBackgroundColor","fullname":"chart.plotBackgroundColor","title":"plotBackgroundColor","parent":"chart","isParent":false,"returnType":"Color","description":"The background color or gradient for the plot area.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/plotbackgroundcolor-color/\" target=\"_blank\">Color</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/plotbackgroundcolor-gradient/\" target=\"_blank\">gradient</a>"},{"name":"chart--plotBackgroundImage","fullname":"chart.plotBackgroundImage","title":"plotBackgroundImage","parent":"chart","isParent":false,"returnType":"String","description":"The URL for an image to use as the plot background. To set an image as the background for the entire chart, set a CSS background image to the container element. Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/plotbackgroundimage/\" target=\"_blank\">Skies</a>","deprecated":false},{"name":"yAxis-plotBands","fullname":"yAxis.plotBands","title":"plotBands","parent":"yAxis","isParent":true,"returnType":"Array<Object>","description":"An array of objects defining plot bands on the Y axis.","deprecated":false},{"name":"xAxis-plotBands","fullname":"xAxis.plotBands","title":"plotBands","parent":"xAxis","isParent":true,"returnType":"Array<Object>","description":"<p>An array of colored bands stretching across the plot area marking an interval on the axis.</p>\r\n\r\n<p>In a gauge, a plot band on the Y axis (value axis) will stretch along the perimeter of the gauge.</p>","deprecated":false},{"name":"chart--plotBorderColor","fullname":"chart.plotBorderColor","title":"plotBorderColor","parent":"chart","isParent":false,"returnType":"Color","defaults":"#C0C0C0","description":"The color of the inner chart or plot area border.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/plotbordercolor/\" target=\"_blank\">Blue border</a>"},{"name":"chart--plotBorderWidth","fullname":"chart.plotBorderWidth","title":"plotBorderWidth","parent":"chart","isParent":false,"returnType":"Number","defaults":"0","description":"The pixel width of the plot area border.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/plotborderwidth/\" target=\"_blank\">1px border</a>"},{"name":"yAxis-plotLines","fullname":"yAxis.plotLines","title":"plotLines","parent":"yAxis","isParent":true,"returnType":"Array<Object>","description":"An array of objects representing plot lines on the X axis","deprecated":false},{"name":"xAxis-plotLines","fullname":"xAxis.plotLines","title":"plotLines","parent":"xAxis","isParent":true,"returnType":"Array<Object>","description":"An array of lines stretching across the plot area, marking a specific value on one of the axes.","deprecated":false},{"name":"plotOptions","fullname":"plotOptions","title":"plotOptions","isParent":true,"description":"<p>The plotOptions is a wrapper object for config objects for each series type.\n\t\tThe config objects for each series can also be overridden for each series \n\t\titem as given in the series array.</p>\n\t\t<p>Configuration options for the series are given in three levels. Options\n\t\tfor all series in a chart are given in the <a class=\"internal\" href=\"#plotOptions.series\">plotOptions.series</a> object. Then options for all series\n\t\tof a specific type are given in the plotOptions of that type, for example plotOptions.line.\n\t\tNext, options for one single series are given in <a class=\"internal\" href=\"#series\">the \n\t\tseries array</a>.</p>"},{"name":"chart--plotShadow","fullname":"chart.plotShadow","title":"plotShadow","parent":"chart","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the plot area. Requires that plotBackgroundColor be set. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/plotshadow/\" target=\"_blank\">Plot shadow</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-point","fullname":"plotOptions.polygon.point","title":"point","parent":"plotOptions-polygon","isParent":true,"description":"Properties for each single point"},{"name":"series<errorbar>-point","fullname":"series<errorbar>.point","title":"point","parent":"series<errorbar>","isParent":true,"description":"Properties for each single point"},{"name":"plotOptions-funnel-point","fullname":"plotOptions.funnel.point","title":"point","parent":"plotOptions-funnel","isParent":true,"description":"Properties for each single point"},{"name":"series<arearange>-point","fullname":"series<arearange>.point","title":"point","parent":"series<arearange>","isParent":true,"description":"Properties for each single point"},{"name":"plotOptions-heatmap-point","fullname":"plotOptions.heatmap.point","title":"point","parent":"plotOptions-heatmap","isParent":true,"description":"Properties for each single point"},{"name":"series<area>-point","fullname":"series<area>.point","title":"point","parent":"series<area>","isParent":true,"description":"Properties for each single point"},{"name":"plotOptions-boxplot-point","fullname":"plotOptions.boxplot.point","title":"point","parent":"plotOptions-boxplot","isParent":true,"description":"Properties for each single point"},{"name":"plotOptions-area-point","fullname":"plotOptions.area.point","title":"point","parent":"plotOptions-area","isParent":true,"description":"Properties for each single point"},{"name":"plotOptions-treemap-point","fullname":"plotOptions.treemap.point","title":"point","parent":"plotOptions-treemap","isParent":true,"description":"Properties for each single point"},{"name":"series<columnrange>-point","fullname":"series<columnrange>.point","title":"point","parent":"series<columnrange>","isParent":true,"description":"Properties for each single point"},{"name":"plotOptions-arearange-point","fullname":"plotOptions.arearange.point","title":"point","parent":"plotOptions-arearange","isParent":true,"description":"Properties for each single point"},{"name":"plotOptions-pie-point","fullname":"plotOptions.pie.point","title":"point","parent":"plotOptions-pie","isParent":true,"description":"Properties for each single point"},{"name":"series<treemap>-point","fullname":"series<treemap>.point","title":"point","parent":"series<treemap>","isParent":true,"description":"Properties for each single point"},{"name":"series<heatmap>-point","fullname":"series<heatmap>.point","title":"point","parent":"series<heatmap>","isParent":true,"description":"Properties for each single point"},{"name":"plotOptions-line-point","fullname":"plotOptions.line.point","title":"point","parent":"plotOptions-line","isParent":true,"description":"Properties for each single point"},{"name":"plotOptions-bubble-point","fullname":"plotOptions.bubble.point","title":"point","parent":"plotOptions-bubble","isParent":true,"description":"Properties for each single point"},{"name":"plotOptions-waterfall-point","fullname":"plotOptions.waterfall.point","title":"point","parent":"plotOptions-waterfall","isParent":true,"description":"Properties for each single point"},{"name":"plotOptions-column-point","fullname":"plotOptions.column.point","title":"point","parent":"plotOptions-column","isParent":true,"description":"Properties for each single point"},{"name":"series<solidgauge>-point","fullname":"series<solidgauge>.point","title":"point","parent":"series<solidgauge>","isParent":true,"description":"Properties for each single point"},{"name":"series<areasplinerange>-point","fullname":"series<areasplinerange>.point","title":"point","parent":"series<areasplinerange>","isParent":true,"description":"Properties for each single point"},{"name":"series<bar>-point","fullname":"series<bar>.point","title":"point","parent":"series<bar>","isParent":true,"description":"Properties for each single point"},{"name":"plotOptions-gauge-point","fullname":"plotOptions.gauge.point","title":"point","parent":"plotOptions-gauge","isParent":true,"description":"Properties for each single point"},{"name":"series<polygon>-point","fullname":"series<polygon>.point","title":"point","parent":"series<polygon>","isParent":true,"description":"Properties for each single point"},{"name":"series<waterfall>-point","fullname":"series<waterfall>.point","title":"point","parent":"series<waterfall>","isParent":true,"description":"Properties for each single point"},{"name":"plotOptions-errorbar-point","fullname":"plotOptions.errorbar.point","title":"point","parent":"plotOptions-errorbar","isParent":true,"description":"Properties for each single point"},{"name":"plotOptions-bar-point","fullname":"plotOptions.bar.point","title":"point","parent":"plotOptions-bar","isParent":true,"description":"Properties for each single point"},{"name":"series<spline>-point","fullname":"series<spline>.point","title":"point","parent":"series<spline>","isParent":true,"description":"Properties for each single point"},{"name":"series<pyramid>-point","fullname":"series<pyramid>.point","title":"point","parent":"series<pyramid>","isParent":true,"description":"Properties for each single point"},{"name":"series<gauge>-point","fullname":"series<gauge>.point","title":"point","parent":"series<gauge>","isParent":true,"description":"Properties for each single point"},{"name":"plotOptions-solidgauge-point","fullname":"plotOptions.solidgauge.point","title":"point","parent":"plotOptions-solidgauge","isParent":true,"description":"Properties for each single point"},{"name":"plotOptions-pyramid-point","fullname":"plotOptions.pyramid.point","title":"point","parent":"plotOptions-pyramid","isParent":true,"description":"Properties for each single point"},{"name":"plotOptions-columnrange-point","fullname":"plotOptions.columnrange.point","title":"point","parent":"plotOptions-columnrange","isParent":true,"description":"Properties for each single point"},{"name":"series<boxplot>-point","fullname":"series<boxplot>.point","title":"point","parent":"series<boxplot>","isParent":true,"description":"Properties for each single point"},{"name":"plotOptions-scatter-point","fullname":"plotOptions.scatter.point","title":"point","parent":"plotOptions-scatter","isParent":true,"description":"Properties for each single point"},{"name":"series<line>-point","fullname":"series<line>.point","title":"point","parent":"series<line>","isParent":true,"description":"Properties for each single point"},{"name":"plotOptions-areasplinerange-point","fullname":"plotOptions.areasplinerange.point","title":"point","parent":"plotOptions-areasplinerange","isParent":true,"description":"Properties for each single point"},{"name":"series<scatter>-point","fullname":"series<scatter>.point","title":"point","parent":"series<scatter>","isParent":true,"description":"Properties for each single point"},{"name":"plotOptions-spline-point","fullname":"plotOptions.spline.point","title":"point","parent":"plotOptions-spline","isParent":true,"description":"Properties for each single point"},{"name":"series<column>-point","fullname":"series<column>.point","title":"point","parent":"series<column>","isParent":true,"description":"Properties for each single point"},{"name":"series<funnel>-point","fullname":"series<funnel>.point","title":"point","parent":"series<funnel>","isParent":true,"description":"Properties for each single point"},{"name":"series<areaspline>-point","fullname":"series<areaspline>.point","title":"point","parent":"series<areaspline>","isParent":true,"description":"Properties for each single point"},{"name":"series<pie>-point","fullname":"series<pie>.point","title":"point","parent":"series<pie>","isParent":true,"description":"Properties for each single point"},{"name":"plotOptions-areaspline-point","fullname":"plotOptions.areaspline.point","title":"point","parent":"plotOptions-areaspline","isParent":true,"description":"Properties for each single point"},{"name":"plotOptions-series-point","fullname":"plotOptions.series.point","title":"point","parent":"plotOptions-series","isParent":true,"description":"Properties for each single point"},{"name":"series<bubble>-point","fullname":"series<bubble>.point","title":"point","parent":"series<bubble>","isParent":true,"description":"Properties for each single point"},{"name":"xAxis-events--pointBreak","fullname":"xAxis.events.pointBreak","title":"pointBreak","parent":"xAxis-events","isParent":false,"returnType":"Function","context":"Axis","since":"4.1.0","description":"An event fired when a break from this axis occurs on a point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/axisbreak/break-visualized/\" target=\"_blank\">Visualization of a Break</a>","seeAlso":"<a href=\"#xAxis.breaks\">breaks</a>","deprecated":false},{"name":"yAxis-events--pointBreak","fullname":"yAxis.events.pointBreak","title":"pointBreak","parent":"yAxis-events","isParent":false,"returnType":"Function","context":"Axis","since":"4.1.0","description":"An event fired when a break from this axis occurs on a point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/axisbreak/break-visualized/\" target=\"_blank\">Visualization of a Break</a>","seeAlso":"<a href=\"#xAxis.breaks\">breaks</a>","deprecated":false},{"name":"plotOptions-areasplinerange-tooltip--pointFormat","fullname":"plotOptions.areasplinerange.tooltip.pointFormat","title":"pointFormat","parent":"plotOptions-areasplinerange-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"plotOptions-areaspline-tooltip--pointFormat","fullname":"plotOptions.areaspline.tooltip.pointFormat","title":"pointFormat","parent":"plotOptions-areaspline-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"series<line>-tooltip--pointFormat","fullname":"series<line>.tooltip.pointFormat","title":"pointFormat","parent":"series<line>-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"plotOptions-errorbar-tooltip--pointFormat","fullname":"plotOptions.errorbar.tooltip.pointFormat","title":"pointFormat","parent":"plotOptions-errorbar-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"plotOptions-bar-tooltip--pointFormat","fullname":"plotOptions.bar.tooltip.pointFormat","title":"pointFormat","parent":"plotOptions-bar-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"series<bubble>-tooltip--pointFormat","fullname":"series<bubble>.tooltip.pointFormat","title":"pointFormat","parent":"series<bubble>-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"plotOptions-solidgauge-tooltip--pointFormat","fullname":"plotOptions.solidgauge.tooltip.pointFormat","title":"pointFormat","parent":"plotOptions-solidgauge-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"plotOptions-gauge-tooltip--pointFormat","fullname":"plotOptions.gauge.tooltip.pointFormat","title":"pointFormat","parent":"plotOptions-gauge-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"series<area>-tooltip--pointFormat","fullname":"series<area>.tooltip.pointFormat","title":"pointFormat","parent":"series<area>-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"series<column>-tooltip--pointFormat","fullname":"series<column>.tooltip.pointFormat","title":"pointFormat","parent":"series<column>-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"plotOptions-polygon-tooltip--pointFormat","fullname":"plotOptions.polygon.tooltip.pointFormat","title":"pointFormat","parent":"plotOptions-polygon-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"plotOptions-spline-tooltip--pointFormat","fullname":"plotOptions.spline.tooltip.pointFormat","title":"pointFormat","parent":"plotOptions-spline-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"series<heatmap>-tooltip--pointFormat","fullname":"series<heatmap>.tooltip.pointFormat","title":"pointFormat","parent":"series<heatmap>-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"plotOptions-heatmap-tooltip--pointFormat","fullname":"plotOptions.heatmap.tooltip.pointFormat","title":"pointFormat","parent":"plotOptions-heatmap-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"series<solidgauge>-tooltip--pointFormat","fullname":"series<solidgauge>.tooltip.pointFormat","title":"pointFormat","parent":"series<solidgauge>-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"plotOptions-funnel-tooltip--pointFormat","fullname":"plotOptions.funnel.tooltip.pointFormat","title":"pointFormat","parent":"plotOptions-funnel-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"series<pyramid>-tooltip--pointFormat","fullname":"series<pyramid>.tooltip.pointFormat","title":"pointFormat","parent":"series<pyramid>-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"plotOptions-bubble-tooltip--pointFormat","fullname":"plotOptions.bubble.tooltip.pointFormat","title":"pointFormat","parent":"plotOptions-bubble-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"series<arearange>-tooltip--pointFormat","fullname":"series<arearange>.tooltip.pointFormat","title":"pointFormat","parent":"series<arearange>-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"series<pie>-tooltip--pointFormat","fullname":"series<pie>.tooltip.pointFormat","title":"pointFormat","parent":"series<pie>-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"plotOptions-treemap-tooltip--pointFormat","fullname":"plotOptions.treemap.tooltip.pointFormat","title":"pointFormat","parent":"plotOptions-treemap-tooltip","isParent":false,"returnType":"String","defaults":"\"&#60;b&#62;{point.name}&#60;/b&#62;: {point.value}&#60;/b&#62;&#60;br/&#62;\"","since":"4.1.0","description":"The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore, point.y can be extended by the tooltip.yPrefix and tooltip.ySuffix variables. This can also be overridden for each series, which makes it a good hook for displaying units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"series<gauge>-tooltip--pointFormat","fullname":"series<gauge>.tooltip.pointFormat","title":"pointFormat","parent":"series<gauge>-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"series<scatter>-tooltip--pointFormat","fullname":"series<scatter>.tooltip.pointFormat","title":"pointFormat","parent":"series<scatter>-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"plotOptions-series-tooltip--pointFormat","fullname":"plotOptions.series.tooltip.pointFormat","title":"pointFormat","parent":"plotOptions-series-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"series<errorbar>-tooltip--pointFormat","fullname":"series<errorbar>.tooltip.pointFormat","title":"pointFormat","parent":"series<errorbar>-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"plotOptions-area-tooltip--pointFormat","fullname":"plotOptions.area.tooltip.pointFormat","title":"pointFormat","parent":"plotOptions-area-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"series<bar>-tooltip--pointFormat","fullname":"series<bar>.tooltip.pointFormat","title":"pointFormat","parent":"series<bar>-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"plotOptions-column-tooltip--pointFormat","fullname":"plotOptions.column.tooltip.pointFormat","title":"pointFormat","parent":"plotOptions-column-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"plotOptions-waterfall-tooltip--pointFormat","fullname":"plotOptions.waterfall.tooltip.pointFormat","title":"pointFormat","parent":"plotOptions-waterfall-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"series<columnrange>-tooltip--pointFormat","fullname":"series<columnrange>.tooltip.pointFormat","title":"pointFormat","parent":"series<columnrange>-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"series<treemap>-tooltip--pointFormat","fullname":"series<treemap>.tooltip.pointFormat","title":"pointFormat","parent":"series<treemap>-tooltip","isParent":false,"returnType":"String","defaults":"\"&#60;b&#62;{point.name}&#60;/b&#62;: {point.value}&#60;/b&#62;&#60;br/&#62;\"","since":"4.1.0","description":"The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore, point.y can be extended by the tooltip.yPrefix and tooltip.ySuffix variables. This can also be overridden for each series, which makes it a good hook for displaying units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"series<spline>-tooltip--pointFormat","fullname":"series<spline>.tooltip.pointFormat","title":"pointFormat","parent":"series<spline>-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"series<funnel>-tooltip--pointFormat","fullname":"series<funnel>.tooltip.pointFormat","title":"pointFormat","parent":"series<funnel>-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"plotOptions-line-tooltip--pointFormat","fullname":"plotOptions.line.tooltip.pointFormat","title":"pointFormat","parent":"plotOptions-line-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"plotOptions-columnrange-tooltip--pointFormat","fullname":"plotOptions.columnrange.tooltip.pointFormat","title":"pointFormat","parent":"plotOptions-columnrange-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"tooltip--pointFormat","fullname":"tooltip.pointFormat","title":"pointFormat","parent":"tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"series<waterfall>-tooltip--pointFormat","fullname":"series<waterfall>.tooltip.pointFormat","title":"pointFormat","parent":"series<waterfall>-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"series<boxplot>-tooltip--pointFormat","fullname":"series<boxplot>.tooltip.pointFormat","title":"pointFormat","parent":"series<boxplot>-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"series<polygon>-tooltip--pointFormat","fullname":"series<polygon>.tooltip.pointFormat","title":"pointFormat","parent":"series<polygon>-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"plotOptions-pie-tooltip--pointFormat","fullname":"plotOptions.pie.tooltip.pointFormat","title":"pointFormat","parent":"plotOptions-pie-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"plotOptions-boxplot-tooltip--pointFormat","fullname":"plotOptions.boxplot.tooltip.pointFormat","title":"pointFormat","parent":"plotOptions-boxplot-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"series<areaspline>-tooltip--pointFormat","fullname":"series<areaspline>.tooltip.pointFormat","title":"pointFormat","parent":"series<areaspline>-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"plotOptions-pyramid-tooltip--pointFormat","fullname":"plotOptions.pyramid.tooltip.pointFormat","title":"pointFormat","parent":"plotOptions-pyramid-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"series<areasplinerange>-tooltip--pointFormat","fullname":"series<areasplinerange>.tooltip.pointFormat","title":"pointFormat","parent":"series<areasplinerange>-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"plotOptions-arearange-tooltip--pointFormat","fullname":"plotOptions.arearange.tooltip.pointFormat","title":"pointFormat","parent":"plotOptions-arearange-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"plotOptions-scatter-tooltip--pointFormat","fullname":"plotOptions.scatter.tooltip.pointFormat","title":"pointFormat","parent":"plotOptions-scatter-tooltip","isParent":false,"returnType":"String","defaults":"<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b><br/>","since":"2.2","description":"<p>The HTML of the point's line in the tooltip. Variables are enclosed by curly brackets. Available variables are point.x, point.y, series.name and series.color and other properties on the same form. Furthermore,  point.y can be extended by the <code>tooltip.valuePrefix</code> and <code>tooltip.valueSuffix</code> variables. This can also be overridden for each series, which makes it a good hook for displaying units.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/pointformat/\" target=\"_blank\">A different point format with value suffix</a>","deprecated":false},{"name":"plotOptions-areasplinerange-tooltip--pointFormatter","fullname":"plotOptions.areasplinerange.tooltip.pointFormatter","title":"pointFormatter","parent":"plotOptions-areasplinerange-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"series<area>-tooltip--pointFormatter","fullname":"series<area>.tooltip.pointFormatter","title":"pointFormatter","parent":"series<area>-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areaspline>-tooltip--pointFormatter","fullname":"series<areaspline>.tooltip.pointFormatter","title":"pointFormatter","parent":"series<areaspline>-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"tooltip--pointFormatter","fullname":"tooltip.pointFormatter","title":"pointFormatter","parent":"tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot-tooltip--pointFormatter","fullname":"plotOptions.boxplot.tooltip.pointFormatter","title":"pointFormatter","parent":"plotOptions-boxplot-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"series<columnrange>-tooltip--pointFormatter","fullname":"series<columnrange>.tooltip.pointFormatter","title":"pointFormatter","parent":"series<columnrange>-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"series<funnel>-tooltip--pointFormatter","fullname":"series<funnel>.tooltip.pointFormatter","title":"pointFormatter","parent":"series<funnel>-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pie>-tooltip--pointFormatter","fullname":"series<pie>.tooltip.pointFormatter","title":"pointFormatter","parent":"series<pie>-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"series<arearange>-tooltip--pointFormatter","fullname":"series<arearange>.tooltip.pointFormatter","title":"pointFormatter","parent":"series<arearange>-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"series<treemap>-tooltip--pointFormatter","fullname":"series<treemap>.tooltip.pointFormatter","title":"pointFormatter","parent":"series<treemap>-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble-tooltip--pointFormatter","fullname":"plotOptions.bubble.tooltip.pointFormatter","title":"pointFormatter","parent":"plotOptions-bubble-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall-tooltip--pointFormatter","fullname":"plotOptions.waterfall.tooltip.pointFormatter","title":"pointFormatter","parent":"plotOptions-waterfall-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column-tooltip--pointFormatter","fullname":"plotOptions.column.tooltip.pointFormatter","title":"pointFormatter","parent":"plotOptions-column-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"series<waterfall>-tooltip--pointFormatter","fullname":"series<waterfall>.tooltip.pointFormatter","title":"pointFormatter","parent":"series<waterfall>-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bar>-tooltip--pointFormatter","fullname":"series<bar>.tooltip.pointFormatter","title":"pointFormatter","parent":"series<bar>-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge-tooltip--pointFormatter","fullname":"plotOptions.gauge.tooltip.pointFormatter","title":"pointFormatter","parent":"plotOptions-gauge-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter-tooltip--pointFormatter","fullname":"plotOptions.scatter.tooltip.pointFormatter","title":"pointFormatter","parent":"plotOptions-scatter-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap-tooltip--pointFormatter","fullname":"plotOptions.heatmap.tooltip.pointFormatter","title":"pointFormatter","parent":"plotOptions-heatmap-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"series<column>-tooltip--pointFormatter","fullname":"series<column>.tooltip.pointFormatter","title":"pointFormatter","parent":"series<column>-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>-tooltip--pointFormatter","fullname":"series<spline>.tooltip.pointFormatter","title":"pointFormatter","parent":"series<spline>-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"series<line>-tooltip--pointFormatter","fullname":"series<line>.tooltip.pointFormatter","title":"pointFormatter","parent":"series<line>-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel-tooltip--pointFormatter","fullname":"plotOptions.funnel.tooltip.pointFormatter","title":"pointFormatter","parent":"plotOptions-funnel-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-line-tooltip--pointFormatter","fullname":"plotOptions.line.tooltip.pointFormatter","title":"pointFormatter","parent":"plotOptions-line-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"series<heatmap>-tooltip--pointFormatter","fullname":"series<heatmap>.tooltip.pointFormatter","title":"pointFormatter","parent":"series<heatmap>-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange-tooltip--pointFormatter","fullname":"plotOptions.columnrange.tooltip.pointFormatter","title":"pointFormatter","parent":"plotOptions-columnrange-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"series<scatter>-tooltip--pointFormatter","fullname":"series<scatter>.tooltip.pointFormatter","title":"pointFormatter","parent":"series<scatter>-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bar-tooltip--pointFormatter","fullname":"plotOptions.bar.tooltip.pointFormatter","title":"pointFormatter","parent":"plotOptions-bar-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap-tooltip--pointFormatter","fullname":"plotOptions.treemap.tooltip.pointFormatter","title":"pointFormatter","parent":"plotOptions-treemap-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-area-tooltip--pointFormatter","fullname":"plotOptions.area.tooltip.pointFormatter","title":"pointFormatter","parent":"plotOptions-area-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"series<boxplot>-tooltip--pointFormatter","fullname":"series<boxplot>.tooltip.pointFormatter","title":"pointFormatter","parent":"series<boxplot>-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange-tooltip--pointFormatter","fullname":"plotOptions.arearange.tooltip.pointFormatter","title":"pointFormatter","parent":"plotOptions-arearange-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-tooltip--pointFormatter","fullname":"plotOptions.spline.tooltip.pointFormatter","title":"pointFormatter","parent":"plotOptions-spline-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-series-tooltip--pointFormatter","fullname":"plotOptions.series.tooltip.pointFormatter","title":"pointFormatter","parent":"plotOptions-series-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"series<gauge>-tooltip--pointFormatter","fullname":"series<gauge>.tooltip.pointFormatter","title":"pointFormatter","parent":"series<gauge>-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"series<polygon>-tooltip--pointFormatter","fullname":"series<polygon>.tooltip.pointFormatter","title":"pointFormatter","parent":"series<polygon>-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pie-tooltip--pointFormatter","fullname":"plotOptions.pie.tooltip.pointFormatter","title":"pointFormatter","parent":"plotOptions-pie-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-tooltip--pointFormatter","fullname":"plotOptions.areaspline.tooltip.pointFormatter","title":"pointFormatter","parent":"plotOptions-areaspline-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-tooltip--pointFormatter","fullname":"series<areasplinerange>.tooltip.pointFormatter","title":"pointFormatter","parent":"series<areasplinerange>-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-tooltip--pointFormatter","fullname":"plotOptions.polygon.tooltip.pointFormatter","title":"pointFormatter","parent":"plotOptions-polygon-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pyramid>-tooltip--pointFormatter","fullname":"series<pyramid>.tooltip.pointFormatter","title":"pointFormatter","parent":"series<pyramid>-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-tooltip--pointFormatter","fullname":"plotOptions.pyramid.tooltip.pointFormatter","title":"pointFormatter","parent":"plotOptions-pyramid-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar-tooltip--pointFormatter","fullname":"plotOptions.errorbar.tooltip.pointFormatter","title":"pointFormatter","parent":"plotOptions-errorbar-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"series<errorbar>-tooltip--pointFormatter","fullname":"series<errorbar>.tooltip.pointFormatter","title":"pointFormatter","parent":"series<errorbar>-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-solidgauge-tooltip--pointFormatter","fullname":"plotOptions.solidgauge.tooltip.pointFormatter","title":"pointFormatter","parent":"plotOptions-solidgauge-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bubble>-tooltip--pointFormatter","fullname":"series<bubble>.tooltip.pointFormatter","title":"pointFormatter","parent":"series<bubble>-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"series<solidgauge>-tooltip--pointFormatter","fullname":"series<solidgauge>.tooltip.pointFormatter","title":"pointFormatter","parent":"series<solidgauge>-tooltip","isParent":false,"returnType":"Function","context":"Point","defaults":"","values":"","since":"4.1.0","description":"A callback function for formatting the HTML output for a single point in the tooltip. Like the <code>pointFormat</code> string, but with more flexibility.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall--pointInterval","fullname":"plotOptions.waterfall.pointInterval","title":"pointInterval","parent":"plotOptions-waterfall","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"plotOptions-areaspline--pointInterval","fullname":"plotOptions.areaspline.pointInterval","title":"pointInterval","parent":"plotOptions-areaspline","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"series<spline>--pointInterval","fullname":"series<spline>.pointInterval","title":"pointInterval","parent":"series<spline>","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"plotOptions-bubble--pointInterval","fullname":"plotOptions.bubble.pointInterval","title":"pointInterval","parent":"plotOptions-bubble","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"series<bubble>--pointInterval","fullname":"series<bubble>.pointInterval","title":"pointInterval","parent":"series<bubble>","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"series<waterfall>--pointInterval","fullname":"series<waterfall>.pointInterval","title":"pointInterval","parent":"series<waterfall>","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"plotOptions-scatter--pointInterval","fullname":"plotOptions.scatter.pointInterval","title":"pointInterval","parent":"plotOptions-scatter","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"plotOptions-columnrange--pointInterval","fullname":"plotOptions.columnrange.pointInterval","title":"pointInterval","parent":"plotOptions-columnrange","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"plotOptions-boxplot--pointInterval","fullname":"plotOptions.boxplot.pointInterval","title":"pointInterval","parent":"plotOptions-boxplot","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"series<boxplot>--pointInterval","fullname":"series<boxplot>.pointInterval","title":"pointInterval","parent":"series<boxplot>","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"series<areasplinerange>--pointInterval","fullname":"series<areasplinerange>.pointInterval","title":"pointInterval","parent":"series<areasplinerange>","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"plotOptions-series--pointInterval","fullname":"plotOptions.series.pointInterval","title":"pointInterval","parent":"plotOptions-series","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"plotOptions-areasplinerange--pointInterval","fullname":"plotOptions.areasplinerange.pointInterval","title":"pointInterval","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"plotOptions-column--pointInterval","fullname":"plotOptions.column.pointInterval","title":"pointInterval","parent":"plotOptions-column","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"series<areaspline>--pointInterval","fullname":"series<areaspline>.pointInterval","title":"pointInterval","parent":"series<areaspline>","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"series<arearange>--pointInterval","fullname":"series<arearange>.pointInterval","title":"pointInterval","parent":"series<arearange>","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"plotOptions-arearange--pointInterval","fullname":"plotOptions.arearange.pointInterval","title":"pointInterval","parent":"plotOptions-arearange","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"series<line>--pointInterval","fullname":"series<line>.pointInterval","title":"pointInterval","parent":"series<line>","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"plotOptions-spline--pointInterval","fullname":"plotOptions.spline.pointInterval","title":"pointInterval","parent":"plotOptions-spline","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"series<columnrange>--pointInterval","fullname":"series<columnrange>.pointInterval","title":"pointInterval","parent":"series<columnrange>","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"series<area>--pointInterval","fullname":"series<area>.pointInterval","title":"pointInterval","parent":"series<area>","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"series<column>--pointInterval","fullname":"series<column>.pointInterval","title":"pointInterval","parent":"series<column>","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"series<polygon>--pointInterval","fullname":"series<polygon>.pointInterval","title":"pointInterval","parent":"series<polygon>","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"plotOptions-errorbar--pointInterval","fullname":"plotOptions.errorbar.pointInterval","title":"pointInterval","parent":"plotOptions-errorbar","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"plotOptions-bar--pointInterval","fullname":"plotOptions.bar.pointInterval","title":"pointInterval","parent":"plotOptions-bar","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"plotOptions-area--pointInterval","fullname":"plotOptions.area.pointInterval","title":"pointInterval","parent":"plotOptions-area","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"series<errorbar>--pointInterval","fullname":"series<errorbar>.pointInterval","title":"pointInterval","parent":"series<errorbar>","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"plotOptions-line--pointInterval","fullname":"plotOptions.line.pointInterval","title":"pointInterval","parent":"plotOptions-line","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"plotOptions-polygon--pointInterval","fullname":"plotOptions.polygon.pointInterval","title":"pointInterval","parent":"plotOptions-polygon","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"series<bar>--pointInterval","fullname":"series<bar>.pointInterval","title":"pointInterval","parent":"series<bar>","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"series<scatter>--pointInterval","fullname":"series<scatter>.pointInterval","title":"pointInterval","parent":"series<scatter>","isParent":false,"returnType":"Number","defaults":"1","description":"<p>If no x values are given for the points in a series, pointInterval defines\r\n the interval of the x values. For example, if a series contains one value\r\n every decade starting from year 0, set pointInterval to 10.</p>\r\n<p>Since Highcharts 4.1, it can be combined with <code>pointIntervalUnit</code> to draw irregular intervals.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">Datetime X axis</a>","deprecated":false},{"name":"plotOptions-bubble--pointIntervalUnit","fullname":"plotOptions.bubble.pointIntervalUnit","title":"pointIntervalUnit","parent":"plotOptions-bubble","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"plotOptions-columnrange--pointIntervalUnit","fullname":"plotOptions.columnrange.pointIntervalUnit","title":"pointIntervalUnit","parent":"plotOptions-columnrange","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"plotOptions-arearange--pointIntervalUnit","fullname":"plotOptions.arearange.pointIntervalUnit","title":"pointIntervalUnit","parent":"plotOptions-arearange","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"plotOptions-series--pointIntervalUnit","fullname":"plotOptions.series.pointIntervalUnit","title":"pointIntervalUnit","parent":"plotOptions-series","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"plotOptions-line--pointIntervalUnit","fullname":"plotOptions.line.pointIntervalUnit","title":"pointIntervalUnit","parent":"plotOptions-line","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"series<scatter>--pointIntervalUnit","fullname":"series<scatter>.pointIntervalUnit","title":"pointIntervalUnit","parent":"series<scatter>","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"plotOptions-areaspline--pointIntervalUnit","fullname":"plotOptions.areaspline.pointIntervalUnit","title":"pointIntervalUnit","parent":"plotOptions-areaspline","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"series<areaspline>--pointIntervalUnit","fullname":"series<areaspline>.pointIntervalUnit","title":"pointIntervalUnit","parent":"series<areaspline>","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"plotOptions-areasplinerange--pointIntervalUnit","fullname":"plotOptions.areasplinerange.pointIntervalUnit","title":"pointIntervalUnit","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"series<boxplot>--pointIntervalUnit","fullname":"series<boxplot>.pointIntervalUnit","title":"pointIntervalUnit","parent":"series<boxplot>","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"series<polygon>--pointIntervalUnit","fullname":"series<polygon>.pointIntervalUnit","title":"pointIntervalUnit","parent":"series<polygon>","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"series<arearange>--pointIntervalUnit","fullname":"series<arearange>.pointIntervalUnit","title":"pointIntervalUnit","parent":"series<arearange>","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"series<bubble>--pointIntervalUnit","fullname":"series<bubble>.pointIntervalUnit","title":"pointIntervalUnit","parent":"series<bubble>","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"plotOptions-column--pointIntervalUnit","fullname":"plotOptions.column.pointIntervalUnit","title":"pointIntervalUnit","parent":"plotOptions-column","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"series<waterfall>--pointIntervalUnit","fullname":"series<waterfall>.pointIntervalUnit","title":"pointIntervalUnit","parent":"series<waterfall>","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"plotOptions-waterfall--pointIntervalUnit","fullname":"plotOptions.waterfall.pointIntervalUnit","title":"pointIntervalUnit","parent":"plotOptions-waterfall","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"series<areasplinerange>--pointIntervalUnit","fullname":"series<areasplinerange>.pointIntervalUnit","title":"pointIntervalUnit","parent":"series<areasplinerange>","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"plotOptions-bar--pointIntervalUnit","fullname":"plotOptions.bar.pointIntervalUnit","title":"pointIntervalUnit","parent":"plotOptions-bar","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"plotOptions-scatter--pointIntervalUnit","fullname":"plotOptions.scatter.pointIntervalUnit","title":"pointIntervalUnit","parent":"plotOptions-scatter","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"series<area>--pointIntervalUnit","fullname":"series<area>.pointIntervalUnit","title":"pointIntervalUnit","parent":"series<area>","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"plotOptions-polygon--pointIntervalUnit","fullname":"plotOptions.polygon.pointIntervalUnit","title":"pointIntervalUnit","parent":"plotOptions-polygon","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"series<column>--pointIntervalUnit","fullname":"series<column>.pointIntervalUnit","title":"pointIntervalUnit","parent":"series<column>","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"plotOptions-errorbar--pointIntervalUnit","fullname":"plotOptions.errorbar.pointIntervalUnit","title":"pointIntervalUnit","parent":"plotOptions-errorbar","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"series<spline>--pointIntervalUnit","fullname":"series<spline>.pointIntervalUnit","title":"pointIntervalUnit","parent":"series<spline>","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"plotOptions-area--pointIntervalUnit","fullname":"plotOptions.area.pointIntervalUnit","title":"pointIntervalUnit","parent":"plotOptions-area","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"series<errorbar>--pointIntervalUnit","fullname":"series<errorbar>.pointIntervalUnit","title":"pointIntervalUnit","parent":"series<errorbar>","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"plotOptions-spline--pointIntervalUnit","fullname":"plotOptions.spline.pointIntervalUnit","title":"pointIntervalUnit","parent":"plotOptions-spline","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"series<columnrange>--pointIntervalUnit","fullname":"series<columnrange>.pointIntervalUnit","title":"pointIntervalUnit","parent":"series<columnrange>","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"plotOptions-boxplot--pointIntervalUnit","fullname":"plotOptions.boxplot.pointIntervalUnit","title":"pointIntervalUnit","parent":"plotOptions-boxplot","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"series<line>--pointIntervalUnit","fullname":"series<line>.pointIntervalUnit","title":"pointIntervalUnit","parent":"series<line>","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"series<bar>--pointIntervalUnit","fullname":"series<bar>.pointIntervalUnit","title":"pointIntervalUnit","parent":"series<bar>","isParent":false,"returnType":"String","values":"[null, \"month\", \"year\"]","since":"4.1.0","description":"On datetime series, this allows for setting the <a href=\"plotOptions.series.pointInterval\">pointInterval</a> to the two irregular time units, <code>month</code> and <code>year</code>. Combine it with <code>pointInterval</code> to draw quarters, 6 months, 10 years etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointintervalunit/\" target=\"_blank\">One point a month</a>","deprecated":false},{"name":"plotOptions-errorbar--pointPadding","fullname":"plotOptions.errorbar.pointPadding","title":"pointPadding","parent":"plotOptions-errorbar","isParent":false,"returnType":"Number","defaults":"0.1","description":"Padding between each column or bar, in x axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-default/\" target=\"_blank\">0.1 by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-025/\" target=\"_blank\">0.25</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-none/\" target=\"_blank\">0 for tightly packed columns</a>,"},{"name":"series<column>--pointPadding","fullname":"series<column>.pointPadding","title":"pointPadding","parent":"series<column>","isParent":false,"returnType":"Number","defaults":"0.1","description":"Padding between each column or bar, in x axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-default/\" target=\"_blank\">0.1 by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-025/\" target=\"_blank\">0.25</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-none/\" target=\"_blank\">0 for tightly packed columns</a>,"},{"name":"series<columnrange>--pointPadding","fullname":"series<columnrange>.pointPadding","title":"pointPadding","parent":"series<columnrange>","isParent":false,"returnType":"Number","defaults":"0.1","description":"Padding between each column or bar, in x axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-default/\" target=\"_blank\">0.1 by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-025/\" target=\"_blank\">0.25</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-none/\" target=\"_blank\">0 for tightly packed columns</a>,"},{"name":"series<boxplot>--pointPadding","fullname":"series<boxplot>.pointPadding","title":"pointPadding","parent":"series<boxplot>","isParent":false,"returnType":"Number","defaults":"0.1","description":"Padding between each column or bar, in x axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-default/\" target=\"_blank\">0.1 by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-025/\" target=\"_blank\">0.25</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-none/\" target=\"_blank\">0 for tightly packed columns</a>,"},{"name":"series<errorbar>--pointPadding","fullname":"series<errorbar>.pointPadding","title":"pointPadding","parent":"series<errorbar>","isParent":false,"returnType":"Number","defaults":"0.1","description":"Padding between each column or bar, in x axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-default/\" target=\"_blank\">0.1 by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-025/\" target=\"_blank\">0.25</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-none/\" target=\"_blank\">0 for tightly packed columns</a>,"},{"name":"series<bar>--pointPadding","fullname":"series<bar>.pointPadding","title":"pointPadding","parent":"series<bar>","isParent":false,"returnType":"Number","defaults":"0.1","description":"Padding between each column or bar, in x axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-default/\" target=\"_blank\">0.1 by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-025/\" target=\"_blank\">0.25</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-none/\" target=\"_blank\">0 for tightly packed columns</a>,"},{"name":"plotOptions-waterfall--pointPadding","fullname":"plotOptions.waterfall.pointPadding","title":"pointPadding","parent":"plotOptions-waterfall","isParent":false,"returnType":"Number","defaults":"0.1","description":"Padding between each column or bar, in x axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-default/\" target=\"_blank\">0.1 by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-025/\" target=\"_blank\">0.25</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-none/\" target=\"_blank\">0 for tightly packed columns</a>,"},{"name":"plotOptions-boxplot--pointPadding","fullname":"plotOptions.boxplot.pointPadding","title":"pointPadding","parent":"plotOptions-boxplot","isParent":false,"returnType":"Number","defaults":"0.1","description":"Padding between each column or bar, in x axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-default/\" target=\"_blank\">0.1 by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-025/\" target=\"_blank\">0.25</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-none/\" target=\"_blank\">0 for tightly packed columns</a>,"},{"name":"plotOptions-bar--pointPadding","fullname":"plotOptions.bar.pointPadding","title":"pointPadding","parent":"plotOptions-bar","isParent":false,"returnType":"Number","defaults":"0.1","description":"Padding between each column or bar, in x axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-default/\" target=\"_blank\">0.1 by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-025/\" target=\"_blank\">0.25</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-none/\" target=\"_blank\">0 for tightly packed columns</a>,"},{"name":"series<waterfall>--pointPadding","fullname":"series<waterfall>.pointPadding","title":"pointPadding","parent":"series<waterfall>","isParent":false,"returnType":"Number","defaults":"0.1","description":"Padding between each column or bar, in x axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-default/\" target=\"_blank\">0.1 by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-025/\" target=\"_blank\">0.25</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-none/\" target=\"_blank\">0 for tightly packed columns</a>,"},{"name":"plotOptions-columnrange--pointPadding","fullname":"plotOptions.columnrange.pointPadding","title":"pointPadding","parent":"plotOptions-columnrange","isParent":false,"returnType":"Number","defaults":"0.1","description":"Padding between each column or bar, in x axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-default/\" target=\"_blank\">0.1 by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-025/\" target=\"_blank\">0.25</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-none/\" target=\"_blank\">0 for tightly packed columns</a>,"},{"name":"plotOptions-column--pointPadding","fullname":"plotOptions.column.pointPadding","title":"pointPadding","parent":"plotOptions-column","isParent":false,"returnType":"Number","defaults":"0.1","description":"Padding between each column or bar, in x axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-default/\" target=\"_blank\">0.1 by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-025/\" target=\"_blank\">0.25</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointpadding-none/\" target=\"_blank\">0 for tightly packed columns</a>,"},{"name":"plotOptions-arearange--pointPlacement","fullname":"plotOptions.arearange.pointPlacement","title":"pointPlacement","parent":"plotOptions-arearange","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"plotOptions-series--pointPlacement","fullname":"plotOptions.series.pointPlacement","title":"pointPlacement","parent":"plotOptions-series","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"plotOptions-areaspline--pointPlacement","fullname":"plotOptions.areaspline.pointPlacement","title":"pointPlacement","parent":"plotOptions-areaspline","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"series<waterfall>--pointPlacement","fullname":"series<waterfall>.pointPlacement","title":"pointPlacement","parent":"series<waterfall>","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"plotOptions-areasplinerange--pointPlacement","fullname":"plotOptions.areasplinerange.pointPlacement","title":"pointPlacement","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"plotOptions-area--pointPlacement","fullname":"plotOptions.area.pointPlacement","title":"pointPlacement","parent":"plotOptions-area","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"plotOptions-boxplot--pointPlacement","fullname":"plotOptions.boxplot.pointPlacement","title":"pointPlacement","parent":"plotOptions-boxplot","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"series<areasplinerange>--pointPlacement","fullname":"series<areasplinerange>.pointPlacement","title":"pointPlacement","parent":"series<areasplinerange>","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"series<column>--pointPlacement","fullname":"series<column>.pointPlacement","title":"pointPlacement","parent":"series<column>","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"series<boxplot>--pointPlacement","fullname":"series<boxplot>.pointPlacement","title":"pointPlacement","parent":"series<boxplot>","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"plotOptions-line--pointPlacement","fullname":"plotOptions.line.pointPlacement","title":"pointPlacement","parent":"plotOptions-line","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"plotOptions-columnrange--pointPlacement","fullname":"plotOptions.columnrange.pointPlacement","title":"pointPlacement","parent":"plotOptions-columnrange","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"plotOptions-waterfall--pointPlacement","fullname":"plotOptions.waterfall.pointPlacement","title":"pointPlacement","parent":"plotOptions-waterfall","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"plotOptions-errorbar--pointPlacement","fullname":"plotOptions.errorbar.pointPlacement","title":"pointPlacement","parent":"plotOptions-errorbar","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"plotOptions-column--pointPlacement","fullname":"plotOptions.column.pointPlacement","title":"pointPlacement","parent":"plotOptions-column","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"series<arearange>--pointPlacement","fullname":"series<arearange>.pointPlacement","title":"pointPlacement","parent":"series<arearange>","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"series<areaspline>--pointPlacement","fullname":"series<areaspline>.pointPlacement","title":"pointPlacement","parent":"series<areaspline>","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"plotOptions-bar--pointPlacement","fullname":"plotOptions.bar.pointPlacement","title":"pointPlacement","parent":"plotOptions-bar","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"plotOptions-spline--pointPlacement","fullname":"plotOptions.spline.pointPlacement","title":"pointPlacement","parent":"plotOptions-spline","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"series<area>--pointPlacement","fullname":"series<area>.pointPlacement","title":"pointPlacement","parent":"series<area>","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"series<columnrange>--pointPlacement","fullname":"series<columnrange>.pointPlacement","title":"pointPlacement","parent":"series<columnrange>","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"series<errorbar>--pointPlacement","fullname":"series<errorbar>.pointPlacement","title":"pointPlacement","parent":"series<errorbar>","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"series<line>--pointPlacement","fullname":"series<line>.pointPlacement","title":"pointPlacement","parent":"series<line>","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"series<spline>--pointPlacement","fullname":"series<spline>.pointPlacement","title":"pointPlacement","parent":"series<spline>","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"series<bar>--pointPlacement","fullname":"series<bar>.pointPlacement","title":"pointPlacement","parent":"series<bar>","isParent":false,"returnType":"String|Number","values":"[null, \"on\", \"between\"]","since":"2.3.0","description":"<p>Possible values: <code>null</code>, <code>\"on\"</code>, <code>\"between\"</code>.</p>\r\n<p>In a column chart, when pointPlacement is <code>\"on\"</code>, the point will not create any padding of the X axis. In a polar column chart this means that the first column points directly north. If the pointPlacement is <code>\"between\"</code>, the columns will be laid out between ticks. This is useful for example for visualising an amount between two points in time or in a certain sector of a polar chart.</p>\r\n<p>Since Highcharts 3.0.2, the point placement can also be numeric, where 0 is on the axis value, -0.5 is between this value and the previous, and 0.5 is between this value and the next. Unlike the textual options, numeric point placement options won't affect axis padding.</p>\r\n<p>Note that pointPlacement needs a <a href=\"#plotOptions.series.pointRange\">pointRange</a> to work. For column series this is computed, but for line-type series it needs to be set.</p>\r\n<p>Defaults to <code>null</code> in cartesian charts, <code>\"between\"</code> in polar charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-between/\" target=\"_blank\">Between in a column chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointplacement-numeric/\" target=\"_blank\">numeric placement for custom layout</a>.","seeAlso":"<a href=\"#xAxis.tickmarkPlacement\">xAxis.tickmarkPlacement</a>","deprecated":false},{"name":"plotOptions-columnrange--pointRange","fullname":"plotOptions.columnrange.pointRange","title":"pointRange","parent":"plotOptions-columnrange","isParent":false,"returnType":"Number","since":"2.3","description":"The X axis range that each point is valid for. This determines the width of the column. On a categorized axis, the range will be 1 by default (one category unit). On linear and datetime axes, the range will be computed as the distance between the two closest data points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointrange/\" target=\"_blank\">Set the point range to one day on a data set with one week between the points</a>","seeAlso":"","deprecated":false},{"name":"series<columnrange>--pointRange","fullname":"series<columnrange>.pointRange","title":"pointRange","parent":"series<columnrange>","isParent":false,"returnType":"Number","since":"2.3","description":"The X axis range that each point is valid for. This determines the width of the column. On a categorized axis, the range will be 1 by default (one category unit). On linear and datetime axes, the range will be computed as the distance between the two closest data points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointrange/\" target=\"_blank\">Set the point range to one day on a data set with one week between the points</a>","seeAlso":"","deprecated":false},{"name":"series<waterfall>--pointRange","fullname":"series<waterfall>.pointRange","title":"pointRange","parent":"series<waterfall>","isParent":false,"returnType":"Number","since":"2.3","description":"The X axis range that each point is valid for. This determines the width of the column. On a categorized axis, the range will be 1 by default (one category unit). On linear and datetime axes, the range will be computed as the distance between the two closest data points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointrange/\" target=\"_blank\">Set the point range to one day on a data set with one week between the points</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-column--pointRange","fullname":"plotOptions.column.pointRange","title":"pointRange","parent":"plotOptions-column","isParent":false,"returnType":"Number","since":"2.3","description":"The X axis range that each point is valid for. This determines the width of the column. On a categorized axis, the range will be 1 by default (one category unit). On linear and datetime axes, the range will be computed as the distance between the two closest data points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointrange/\" target=\"_blank\">Set the point range to one day on a data set with one week between the points</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall--pointRange","fullname":"plotOptions.waterfall.pointRange","title":"pointRange","parent":"plotOptions-waterfall","isParent":false,"returnType":"Number","since":"2.3","description":"The X axis range that each point is valid for. This determines the width of the column. On a categorized axis, the range will be 1 by default (one category unit). On linear and datetime axes, the range will be computed as the distance between the two closest data points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointrange/\" target=\"_blank\">Set the point range to one day on a data set with one week between the points</a>","seeAlso":"","deprecated":false},{"name":"series<boxplot>--pointRange","fullname":"series<boxplot>.pointRange","title":"pointRange","parent":"series<boxplot>","isParent":false,"returnType":"Number","since":"2.3","description":"The X axis range that each point is valid for. This determines the width of the column. On a categorized axis, the range will be 1 by default (one category unit). On linear and datetime axes, the range will be computed as the distance between the two closest data points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointrange/\" target=\"_blank\">Set the point range to one day on a data set with one week between the points</a>","seeAlso":"","deprecated":false},{"name":"series<column>--pointRange","fullname":"series<column>.pointRange","title":"pointRange","parent":"series<column>","isParent":false,"returnType":"Number","since":"2.3","description":"The X axis range that each point is valid for. This determines the width of the column. On a categorized axis, the range will be 1 by default (one category unit). On linear and datetime axes, the range will be computed as the distance between the two closest data points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointrange/\" target=\"_blank\">Set the point range to one day on a data set with one week between the points</a>","seeAlso":"","deprecated":false},{"name":"series<errorbar>--pointRange","fullname":"series<errorbar>.pointRange","title":"pointRange","parent":"series<errorbar>","isParent":false,"returnType":"Number","since":"2.3","description":"The X axis range that each point is valid for. This determines the width of the column. On a categorized axis, the range will be 1 by default (one category unit). On linear and datetime axes, the range will be computed as the distance between the two closest data points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointrange/\" target=\"_blank\">Set the point range to one day on a data set with one week between the points</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot--pointRange","fullname":"plotOptions.boxplot.pointRange","title":"pointRange","parent":"plotOptions-boxplot","isParent":false,"returnType":"Number","since":"2.3","description":"The X axis range that each point is valid for. This determines the width of the column. On a categorized axis, the range will be 1 by default (one category unit). On linear and datetime axes, the range will be computed as the distance between the two closest data points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointrange/\" target=\"_blank\">Set the point range to one day on a data set with one week between the points</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-bar--pointRange","fullname":"plotOptions.bar.pointRange","title":"pointRange","parent":"plotOptions-bar","isParent":false,"returnType":"Number","since":"2.3","description":"The X axis range that each point is valid for. This determines the width of the column. On a categorized axis, the range will be 1 by default (one category unit). On linear and datetime axes, the range will be computed as the distance between the two closest data points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointrange/\" target=\"_blank\">Set the point range to one day on a data set with one week between the points</a>","seeAlso":"","deprecated":false},{"name":"series<bar>--pointRange","fullname":"series<bar>.pointRange","title":"pointRange","parent":"series<bar>","isParent":false,"returnType":"Number","since":"2.3","description":"The X axis range that each point is valid for. This determines the width of the column. On a categorized axis, the range will be 1 by default (one category unit). On linear and datetime axes, the range will be computed as the distance between the two closest data points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointrange/\" target=\"_blank\">Set the point range to one day on a data set with one week between the points</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar--pointRange","fullname":"plotOptions.errorbar.pointRange","title":"pointRange","parent":"plotOptions-errorbar","isParent":false,"returnType":"Number","since":"2.3","description":"The X axis range that each point is valid for. This determines the width of the column. On a categorized axis, the range will be 1 by default (one category unit). On linear and datetime axes, the range will be computed as the distance between the two closest data points.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointrange/\" target=\"_blank\">Set the point range to one day on a data set with one week between the points</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange--pointStart","fullname":"plotOptions.areasplinerange.pointStart","title":"pointStart","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"series<bar>--pointStart","fullname":"series<bar>.pointStart","title":"pointStart","parent":"series<bar>","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"plotOptions-series--pointStart","fullname":"plotOptions.series.pointStart","title":"pointStart","parent":"plotOptions-series","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"plotOptions-errorbar--pointStart","fullname":"plotOptions.errorbar.pointStart","title":"pointStart","parent":"plotOptions-errorbar","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"plotOptions-bar--pointStart","fullname":"plotOptions.bar.pointStart","title":"pointStart","parent":"plotOptions-bar","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"series<arearange>--pointStart","fullname":"series<arearange>.pointStart","title":"pointStart","parent":"series<arearange>","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"series<areaspline>--pointStart","fullname":"series<areaspline>.pointStart","title":"pointStart","parent":"series<areaspline>","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"series<area>--pointStart","fullname":"series<area>.pointStart","title":"pointStart","parent":"series<area>","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"plotOptions-area--pointStart","fullname":"plotOptions.area.pointStart","title":"pointStart","parent":"plotOptions-area","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"series<scatter>--pointStart","fullname":"series<scatter>.pointStart","title":"pointStart","parent":"series<scatter>","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"series<columnrange>--pointStart","fullname":"series<columnrange>.pointStart","title":"pointStart","parent":"series<columnrange>","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"series<line>--pointStart","fullname":"series<line>.pointStart","title":"pointStart","parent":"series<line>","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"plotOptions-scatter--pointStart","fullname":"plotOptions.scatter.pointStart","title":"pointStart","parent":"plotOptions-scatter","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"series<spline>--pointStart","fullname":"series<spline>.pointStart","title":"pointStart","parent":"series<spline>","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"series<errorbar>--pointStart","fullname":"series<errorbar>.pointStart","title":"pointStart","parent":"series<errorbar>","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"plotOptions-column--pointStart","fullname":"plotOptions.column.pointStart","title":"pointStart","parent":"plotOptions-column","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"series<bubble>--pointStart","fullname":"series<bubble>.pointStart","title":"pointStart","parent":"series<bubble>","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"plotOptions-areaspline--pointStart","fullname":"plotOptions.areaspline.pointStart","title":"pointStart","parent":"plotOptions-areaspline","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"series<boxplot>--pointStart","fullname":"series<boxplot>.pointStart","title":"pointStart","parent":"series<boxplot>","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"series<waterfall>--pointStart","fullname":"series<waterfall>.pointStart","title":"pointStart","parent":"series<waterfall>","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"plotOptions-line--pointStart","fullname":"plotOptions.line.pointStart","title":"pointStart","parent":"plotOptions-line","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"plotOptions-arearange--pointStart","fullname":"plotOptions.arearange.pointStart","title":"pointStart","parent":"plotOptions-arearange","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"plotOptions-columnrange--pointStart","fullname":"plotOptions.columnrange.pointStart","title":"pointStart","parent":"plotOptions-columnrange","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"series<areasplinerange>--pointStart","fullname":"series<areasplinerange>.pointStart","title":"pointStart","parent":"series<areasplinerange>","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"series<column>--pointStart","fullname":"series<column>.pointStart","title":"pointStart","parent":"series<column>","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"plotOptions-bubble--pointStart","fullname":"plotOptions.bubble.pointStart","title":"pointStart","parent":"plotOptions-bubble","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"plotOptions-waterfall--pointStart","fullname":"plotOptions.waterfall.pointStart","title":"pointStart","parent":"plotOptions-waterfall","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"series<polygon>--pointStart","fullname":"series<polygon>.pointStart","title":"pointStart","parent":"series<polygon>","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"plotOptions-boxplot--pointStart","fullname":"plotOptions.boxplot.pointStart","title":"pointStart","parent":"plotOptions-boxplot","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"plotOptions-polygon--pointStart","fullname":"plotOptions.polygon.pointStart","title":"pointStart","parent":"plotOptions-polygon","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"plotOptions-spline--pointStart","fullname":"plotOptions.spline.pointStart","title":"pointStart","parent":"plotOptions-spline","isParent":false,"returnType":"Number","defaults":"0","description":"If no x values are given for the points in a series, pointStart defines on what value to start. For example, if a series contains one yearly value starting from 1945, set pointStart to 1945.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-linear/\" target=\"_blank\">Linear</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-pointstart-datetime/\" target=\"_blank\">datetime</a> X axis"},{"name":"plotOptions-boxplot--pointWidth","fullname":"plotOptions.boxplot.pointWidth","title":"pointWidth","parent":"plotOptions-boxplot","isParent":false,"returnType":"Number","since":"1.2.5","description":"A pixel value specifying a fixed width for each column or bar. When <code>null</code>, the width is calculated from the <code>pointPadding</code> and <code>groupPadding</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointwidth-20/\" target=\"_blank\">20px wide columns regardless of chart width\n\t\t\tor the amount of data points</a>"},{"name":"plotOptions-column--pointWidth","fullname":"plotOptions.column.pointWidth","title":"pointWidth","parent":"plotOptions-column","isParent":false,"returnType":"Number","since":"1.2.5","description":"A pixel value specifying a fixed width for each column or bar. When <code>null</code>, the width is calculated from the <code>pointPadding</code> and <code>groupPadding</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointwidth-20/\" target=\"_blank\">20px wide columns regardless of chart width\n\t\t\tor the amount of data points</a>"},{"name":"series<errorbar>--pointWidth","fullname":"series<errorbar>.pointWidth","title":"pointWidth","parent":"series<errorbar>","isParent":false,"returnType":"Number","since":"1.2.5","description":"A pixel value specifying a fixed width for each column or bar. When <code>null</code>, the width is calculated from the <code>pointPadding</code> and <code>groupPadding</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointwidth-20/\" target=\"_blank\">20px wide columns regardless of chart width\n\t\t\tor the amount of data points</a>"},{"name":"plotOptions-columnrange--pointWidth","fullname":"plotOptions.columnrange.pointWidth","title":"pointWidth","parent":"plotOptions-columnrange","isParent":false,"returnType":"Number","since":"1.2.5","description":"A pixel value specifying a fixed width for each column or bar. When <code>null</code>, the width is calculated from the <code>pointPadding</code> and <code>groupPadding</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointwidth-20/\" target=\"_blank\">20px wide columns regardless of chart width\n\t\t\tor the amount of data points</a>"},{"name":"series<column>--pointWidth","fullname":"series<column>.pointWidth","title":"pointWidth","parent":"series<column>","isParent":false,"returnType":"Number","since":"1.2.5","description":"A pixel value specifying a fixed width for each column or bar. When <code>null</code>, the width is calculated from the <code>pointPadding</code> and <code>groupPadding</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointwidth-20/\" target=\"_blank\">20px wide columns regardless of chart width\n\t\t\tor the amount of data points</a>"},{"name":"plotOptions-errorbar--pointWidth","fullname":"plotOptions.errorbar.pointWidth","title":"pointWidth","parent":"plotOptions-errorbar","isParent":false,"returnType":"Number","since":"1.2.5","description":"A pixel value specifying a fixed width for each column or bar. When <code>null</code>, the width is calculated from the <code>pointPadding</code> and <code>groupPadding</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointwidth-20/\" target=\"_blank\">20px wide columns regardless of chart width\n\t\t\tor the amount of data points</a>"},{"name":"plotOptions-bar--pointWidth","fullname":"plotOptions.bar.pointWidth","title":"pointWidth","parent":"plotOptions-bar","isParent":false,"returnType":"Number","since":"1.2.5","description":"A pixel value specifying a fixed width for each column or bar. When <code>null</code>, the width is calculated from the <code>pointPadding</code> and <code>groupPadding</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointwidth-20/\" target=\"_blank\">20px wide columns regardless of chart width\n\t\t\tor the amount of data points</a>"},{"name":"series<bar>--pointWidth","fullname":"series<bar>.pointWidth","title":"pointWidth","parent":"series<bar>","isParent":false,"returnType":"Number","since":"1.2.5","description":"A pixel value specifying a fixed width for each column or bar. When <code>null</code>, the width is calculated from the <code>pointPadding</code> and <code>groupPadding</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointwidth-20/\" target=\"_blank\">20px wide columns regardless of chart width\n\t\t\tor the amount of data points</a>"},{"name":"series<boxplot>--pointWidth","fullname":"series<boxplot>.pointWidth","title":"pointWidth","parent":"series<boxplot>","isParent":false,"returnType":"Number","since":"1.2.5","description":"A pixel value specifying a fixed width for each column or bar. When <code>null</code>, the width is calculated from the <code>pointPadding</code> and <code>groupPadding</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointwidth-20/\" target=\"_blank\">20px wide columns regardless of chart width\n\t\t\tor the amount of data points</a>"},{"name":"series<columnrange>--pointWidth","fullname":"series<columnrange>.pointWidth","title":"pointWidth","parent":"series<columnrange>","isParent":false,"returnType":"Number","since":"1.2.5","description":"A pixel value specifying a fixed width for each column or bar. When <code>null</code>, the width is calculated from the <code>pointPadding</code> and <code>groupPadding</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointwidth-20/\" target=\"_blank\">20px wide columns regardless of chart width\n\t\t\tor the amount of data points</a>"},{"name":"series<waterfall>--pointWidth","fullname":"series<waterfall>.pointWidth","title":"pointWidth","parent":"series<waterfall>","isParent":false,"returnType":"Number","since":"1.2.5","description":"A pixel value specifying a fixed width for each column or bar. When <code>null</code>, the width is calculated from the <code>pointPadding</code> and <code>groupPadding</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointwidth-20/\" target=\"_blank\">20px wide columns regardless of chart width\n\t\t\tor the amount of data points</a>"},{"name":"plotOptions-waterfall--pointWidth","fullname":"plotOptions.waterfall.pointWidth","title":"pointWidth","parent":"plotOptions-waterfall","isParent":false,"returnType":"Number","since":"1.2.5","description":"A pixel value specifying a fixed width for each column or bar. When <code>null</code>, the width is calculated from the <code>pointPadding</code> and <code>groupPadding</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/column-pointwidth-20/\" target=\"_blank\">20px wide columns regardless of chart width\n\t\t\tor the amount of data points</a>"},{"name":"chart--polar","fullname":"chart.polar","title":"polar","parent":"chart","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.3.0","description":"When true, cartesian charts like line, spline, area and column are transformed into the polar coordinate system. Requires <code>highcharts-more.js</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/polar-line/\">Polar line</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/polar-area/\">polar area</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/alignticks-true/\">polar column</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/polar/\">combined series types</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/polar-spider/\">spider chart</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/polar-wind-rose/\">wind rose</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon","fullname":"plotOptions.polygon","title":"polygon","parent":"plotOptions","isParent":true,"returnType":"Object","since":"4.1.0","description":"A polygon series can be used to draw any freeform shape in the cartesian coordinate system. A fill is applied with the <code>color</code> option, and stroke is applied through <code>lineWidth</code> and <code>lineColor</code> options. Requires the <code>highcharts-more.js</code> file.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/polygon/\" target=\"_blank\">Polygon</a>","deprecated":false},{"name":"noData--position","fullname":"noData.position","title":"position","parent":"noData","isParent":false,"returnType":"Object","defaults":"{ \"x\": 0, \"y\": 0, \"align\": \"center\", \"verticalAlign\": \"middle\" }","values":"","since":"3.0.8","description":"The position of the no-data label, relative to the plot area. ","demo":"","seeAlso":"","deprecated":false},{"name":"credits--position","fullname":"credits.position","title":"position","parent":"credits","isParent":false,"returnType":"Object","since":"2.1","description":"Position configuration for the credits label. Supported properties are  <code>align</code>, <code>verticalAlign</code>, <code>x</code> and <code>y</code>. Defaults to \r\n<pre>position: {\r\n\talign: 'right',\r\n\tx: -10,\r\n\tverticalAlign: 'bottom',\r\n\ty: -5\r\n}</pre>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/credits/position-left/\" target=\"_blank\">Left aligned</a>","deprecated":false},{"name":"drilldown-drillUpButton--position","fullname":"drilldown.drillUpButton.position","title":"position","parent":"drilldown-drillUpButton","isParent":false,"returnType":"Object","defaults":"","values":"","since":"3.0.8","description":"Positioning options for the button within the <code>relativeTo</code> box. Available properties are <code>x</code>, <code>y</code>, <code>align</code> and <code>verticalAlign</code>.","demo":"","seeAlso":"","deprecated":false},{"name":"chart-resetZoomButton--position","fullname":"chart.resetZoomButton.position","title":"position","parent":"chart-resetZoomButton","isParent":false,"returnType":"Object","since":"2.2","description":"The position of the button. This is an object that can hold the properties <code>align</code>, <code>verticalAlign</code>, <code>x</code> and <code>y</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/resetzoombutton-position/\" target=\"_blank\">Above the plot area</a>","deprecated":false},{"name":"tooltip--positioner","fullname":"tooltip.positioner","title":"positioner","parent":"tooltip","isParent":false,"returnType":"Function","since":"2.2.4","description":"<p>A callback function to place the tooltip in a default position. The callback receives three parameters: <code>labelWidth</code>, <code>labelHeight</code> and <code>point</code>, where point contains values for <code>plotX</code> and <code>plotY</code> telling where the reference point is in the plot area. Add <code>chart.plotLeft</code> and <code>chart.plotTop</code> to get the full coordinates.</p>\r\n\r\n<p>The return should be an object containing x and y values, for example <code>{ x: 100, y: 100 }</code>.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/positioner/\" target=\"_blank\">\r\n\t\t\t\tA fixed tooltip position</a>","deprecated":false},{"name":"lang--printChart","fullname":"lang.printChart","title":"printChart","parent":"lang","isParent":false,"returnType":"String","defaults":"Print chart","values":"","since":"3.0.1","description":"Exporting module only. The text for the menu item to print the chart.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid","fullname":"plotOptions.pyramid","title":"pyramid","parent":"plotOptions","isParent":true,"returnType":"Object","since":"3.0.10","description":"A pyramid chart consists of a single pyramid with item heights corresponding to each point value. Technically it is the same as a reversed funnel chart without a neck.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/pyramid/\" target=\"_blank\">Pyramid chart</a>","deprecated":false},{"name":"series<boxplot>-data--q1","fullname":"series<boxplot>.data.q1","title":"q1","parent":"series<boxplot>-data","isParent":false,"returnType":"Number","description":"The lower quartile for each data point. This is the bottom of the box."},{"name":"series<boxplot>-data--q3","fullname":"series<boxplot>.data.q3","title":"q3","parent":"series<boxplot>-data","isParent":false,"returnType":"Number","description":"The higher quartile for each data point. This is the top of the box."},{"name":"series<scatter>-data-marker--radius","fullname":"series<scatter>.data.marker.radius","title":"radius","parent":"series<scatter>-data-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-line-marker-states-select--radius","fullname":"plotOptions.line.marker.states.select.radius","title":"radius","parent":"plotOptions-line-marker-states-select","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults\n\t\tto the normal state's radius + 2.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-radius/\" target=\"_blank\">10px radius for selected points</a>"},{"name":"plotOptions-series-marker--radius","fullname":"plotOptions.series.marker.radius","title":"radius","parent":"plotOptions-series-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<solidgauge>-data--radius","fullname":"series<solidgauge>.data.radius","title":"radius","parent":"series<solidgauge>-data","isParent":false,"returnType":"Number|String","context":"","defaults":"","values":"","since":"4.1.6","description":"The outer radius of an individual point in a solid gauge. Can be given as a number (pixels) or percentage string.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/solidgauge-radius/\" target=\"_blank\">Individual radius and innerRadius</a>","seeAlso":"","deprecated":false},{"name":"series<bubble>-marker--radius","fullname":"series<bubble>.marker.radius","title":"radius","parent":"series<bubble>-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<area>-marker-states-hover--radius","fullname":"series<area>.marker.states.hover.radius","title":"radius","parent":"series<area>-marker-states-hover","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults to the normal state's radius + 2 as per the <a href=\"#plotOptions.series.marker.states.hover.radiusPlus\">radiusPlus</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-radius/\" target=\"_blank\">10px radius</a>","deprecated":false},{"name":"series<errorbar>-states-hover-marker--radius","fullname":"series<errorbar>.states.hover.marker.radius","title":"radius","parent":"series<errorbar>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-polygon-marker-states-select--radius","fullname":"plotOptions.polygon.marker.states.select.radius","title":"radius","parent":"plotOptions-polygon-marker-states-select","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults\n\t\tto the normal state's radius + 2.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-radius/\" target=\"_blank\">10px radius for selected points</a>"},{"name":"series<pie>-states-hover-marker--radius","fullname":"series<pie>.states.hover.marker.radius","title":"radius","parent":"series<pie>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<area>-data-marker-states-hover--radius","fullname":"series<area>.data.marker.states.hover.radius","title":"radius","parent":"series<area>-data-marker-states-hover","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults to the normal state's radius + 2 as per the <a href=\"#plotOptions.series.marker.states.hover.radiusPlus\">radiusPlus</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-radius/\" target=\"_blank\">10px radius</a>","deprecated":false},{"name":"plotOptions-bar-states-hover-marker--radius","fullname":"plotOptions.bar.states.hover.marker.radius","title":"radius","parent":"plotOptions-bar-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<spline>-marker-states-hover--radius","fullname":"series<spline>.marker.states.hover.radius","title":"radius","parent":"series<spline>-marker-states-hover","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults to the normal state's radius + 2 as per the <a href=\"#plotOptions.series.marker.states.hover.radiusPlus\">radiusPlus</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-radius/\" target=\"_blank\">10px radius</a>","deprecated":false},{"name":"plotOptions-solidgauge-states-hover-marker--radius","fullname":"plotOptions.solidgauge.states.hover.marker.radius","title":"radius","parent":"plotOptions-solidgauge-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-area-states-hover-marker--radius","fullname":"plotOptions.area.states.hover.marker.radius","title":"radius","parent":"plotOptions-area-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<areaspline>-data-marker--radius","fullname":"series<areaspline>.data.marker.radius","title":"radius","parent":"series<areaspline>-data-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<areaspline>-marker-states-hover--radius","fullname":"series<areaspline>.marker.states.hover.radius","title":"radius","parent":"series<areaspline>-marker-states-hover","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults to the normal state's radius + 2 as per the <a href=\"#plotOptions.series.marker.states.hover.radiusPlus\">radiusPlus</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-radius/\" target=\"_blank\">10px radius</a>","deprecated":false},{"name":"series<bubble>-marker-states-select--radius","fullname":"series<bubble>.marker.states.select.radius","title":"radius","parent":"series<bubble>-marker-states-select","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults\n\t\tto the normal state's radius + 2.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-radius/\" target=\"_blank\">10px radius for selected points</a>"},{"name":"series<scatter>-marker-states-select--radius","fullname":"series<scatter>.marker.states.select.radius","title":"radius","parent":"series<scatter>-marker-states-select","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults\n\t\tto the normal state's radius + 2.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-radius/\" target=\"_blank\">10px radius for selected points</a>"},{"name":"series<spline>-states-hover-marker--radius","fullname":"series<spline>.states.hover.marker.radius","title":"radius","parent":"series<spline>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<area>-states-hover-marker--radius","fullname":"series<area>.states.hover.marker.radius","title":"radius","parent":"series<area>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-areaspline-marker-states-hover--radius","fullname":"plotOptions.areaspline.marker.states.hover.radius","title":"radius","parent":"plotOptions-areaspline-marker-states-hover","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults to the normal state's radius + 2 as per the <a href=\"#plotOptions.series.marker.states.hover.radiusPlus\">radiusPlus</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-radius/\" target=\"_blank\">10px radius</a>","deprecated":false},{"name":"plotOptions-spline-marker-states-hover--radius","fullname":"plotOptions.spline.marker.states.hover.radius","title":"radius","parent":"plotOptions-spline-marker-states-hover","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults to the normal state's radius + 2 as per the <a href=\"#plotOptions.series.marker.states.hover.radiusPlus\">radiusPlus</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-radius/\" target=\"_blank\">10px radius</a>","deprecated":false},{"name":"plotOptions-spline-states-hover-marker--radius","fullname":"plotOptions.spline.states.hover.marker.radius","title":"radius","parent":"plotOptions-spline-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-series-marker-states-hover--radius","fullname":"plotOptions.series.marker.states.hover.radius","title":"radius","parent":"plotOptions-series-marker-states-hover","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults to the normal state's radius + 2 as per the <a href=\"#plotOptions.series.marker.states.hover.radiusPlus\">radiusPlus</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-radius/\" target=\"_blank\">10px radius</a>","deprecated":false},{"name":"plotOptions-pyramid-states-hover-marker--radius","fullname":"plotOptions.pyramid.states.hover.marker.radius","title":"radius","parent":"plotOptions-pyramid-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<polygon>-data-marker--radius","fullname":"series<polygon>.data.marker.radius","title":"radius","parent":"series<polygon>-data-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-gauge-states-hover-marker--radius","fullname":"plotOptions.gauge.states.hover.marker.radius","title":"radius","parent":"plotOptions-gauge-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<areaspline>-marker-states-select--radius","fullname":"series<areaspline>.marker.states.select.radius","title":"radius","parent":"series<areaspline>-marker-states-select","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults\n\t\tto the normal state's radius + 2.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-radius/\" target=\"_blank\">10px radius for selected points</a>"},{"name":"plotOptions-funnel-states-hover-marker--radius","fullname":"plotOptions.funnel.states.hover.marker.radius","title":"radius","parent":"plotOptions-funnel-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<spline>-marker-states-select--radius","fullname":"series<spline>.marker.states.select.radius","title":"radius","parent":"series<spline>-marker-states-select","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults\n\t\tto the normal state's radius + 2.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-radius/\" target=\"_blank\">10px radius for selected points</a>"},{"name":"series<area>-marker-states-select--radius","fullname":"series<area>.marker.states.select.radius","title":"radius","parent":"series<area>-marker-states-select","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults\n\t\tto the normal state's radius + 2.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-radius/\" target=\"_blank\">10px radius for selected points</a>"},{"name":"plotOptions-areaspline-states-hover-marker--radius","fullname":"plotOptions.areaspline.states.hover.marker.radius","title":"radius","parent":"plotOptions-areaspline-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<polygon>-data-marker-states-select--radius","fullname":"series<polygon>.data.marker.states.select.radius","title":"radius","parent":"series<polygon>-data-marker-states-select","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults\n\t\tto the normal state's radius + 2.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-radius/\" target=\"_blank\">10px radius for selected points</a>"},{"name":"plotOptions-arearange-states-hover-marker--radius","fullname":"plotOptions.arearange.states.hover.marker.radius","title":"radius","parent":"plotOptions-arearange-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<pyramid>-states-hover-marker--radius","fullname":"series<pyramid>.states.hover.marker.radius","title":"radius","parent":"series<pyramid>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<line>-marker-states-hover--radius","fullname":"series<line>.marker.states.hover.radius","title":"radius","parent":"series<line>-marker-states-hover","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults to the normal state's radius + 2 as per the <a href=\"#plotOptions.series.marker.states.hover.radiusPlus\">radiusPlus</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-radius/\" target=\"_blank\">10px radius</a>","deprecated":false},{"name":"series<areasplinerange>-states-hover-marker--radius","fullname":"series<areasplinerange>.states.hover.marker.radius","title":"radius","parent":"series<areasplinerange>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<area>-marker--radius","fullname":"series<area>.marker.radius","title":"radius","parent":"series<area>-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<scatter>-marker-states-hover--radius","fullname":"series<scatter>.marker.states.hover.radius","title":"radius","parent":"series<scatter>-marker-states-hover","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults to the normal state's radius + 2 as per the <a href=\"#plotOptions.series.marker.states.hover.radiusPlus\">radiusPlus</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-radius/\" target=\"_blank\">10px radius</a>","deprecated":false},{"name":"plotOptions-boxplot-states-hover-marker--radius","fullname":"plotOptions.boxplot.states.hover.marker.radius","title":"radius","parent":"plotOptions-boxplot-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<area>-data-marker-states-select--radius","fullname":"series<area>.data.marker.states.select.radius","title":"radius","parent":"series<area>-data-marker-states-select","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults\n\t\tto the normal state's radius + 2.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-radius/\" target=\"_blank\">10px radius for selected points</a>"},{"name":"plotOptions-waterfall-states-hover-marker--radius","fullname":"plotOptions.waterfall.states.hover.marker.radius","title":"radius","parent":"plotOptions-waterfall-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-columnrange-states-hover-marker--radius","fullname":"plotOptions.columnrange.states.hover.marker.radius","title":"radius","parent":"plotOptions-columnrange-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-areasplinerange-states-hover-marker--radius","fullname":"plotOptions.areasplinerange.states.hover.marker.radius","title":"radius","parent":"plotOptions-areasplinerange-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-line-marker--radius","fullname":"plotOptions.line.marker.radius","title":"radius","parent":"plotOptions-line-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-errorbar-states-hover-marker--radius","fullname":"plotOptions.errorbar.states.hover.marker.radius","title":"radius","parent":"plotOptions-errorbar-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<gauge>-pivot--radius","fullname":"series<gauge>.pivot.radius","title":"radius","parent":"series<gauge>-pivot","isParent":false,"returnType":"Number","defaults":"5","since":"2.3.0","description":"The pixel radius of the pivot.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-pivot/\" target=\"_blank\">Pivot options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"series<line>-marker--radius","fullname":"series<line>.marker.radius","title":"radius","parent":"series<line>-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<scatter>-data-marker-states-select--radius","fullname":"series<scatter>.data.marker.states.select.radius","title":"radius","parent":"series<scatter>-data-marker-states-select","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults\n\t\tto the normal state's radius + 2.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-radius/\" target=\"_blank\">10px radius for selected points</a>"},{"name":"plotOptions-scatter-marker--radius","fullname":"plotOptions.scatter.marker.radius","title":"radius","parent":"plotOptions-scatter-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<areaspline>-data-marker-states-select--radius","fullname":"series<areaspline>.data.marker.states.select.radius","title":"radius","parent":"series<areaspline>-data-marker-states-select","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults\n\t\tto the normal state's radius + 2.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-radius/\" target=\"_blank\">10px radius for selected points</a>"},{"name":"series<spline>-data-marker-states-hover--radius","fullname":"series<spline>.data.marker.states.hover.radius","title":"radius","parent":"series<spline>-data-marker-states-hover","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults to the normal state's radius + 2 as per the <a href=\"#plotOptions.series.marker.states.hover.radiusPlus\">radiusPlus</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-radius/\" target=\"_blank\">10px radius</a>","deprecated":false},{"name":"plotOptions-column-states-hover-marker--radius","fullname":"plotOptions.column.states.hover.marker.radius","title":"radius","parent":"plotOptions-column-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<areaspline>-data-marker-states-hover--radius","fullname":"series<areaspline>.data.marker.states.hover.radius","title":"radius","parent":"series<areaspline>-data-marker-states-hover","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults to the normal state's radius + 2 as per the <a href=\"#plotOptions.series.marker.states.hover.radiusPlus\">radiusPlus</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-radius/\" target=\"_blank\">10px radius</a>","deprecated":false},{"name":"series<line>-states-hover-marker--radius","fullname":"series<line>.states.hover.marker.radius","title":"radius","parent":"series<line>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<bubble>-marker-states-hover--radius","fullname":"series<bubble>.marker.states.hover.radius","title":"radius","parent":"series<bubble>-marker-states-hover","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults to the normal state's radius + 2 as per the <a href=\"#plotOptions.series.marker.states.hover.radiusPlus\">radiusPlus</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-radius/\" target=\"_blank\">10px radius</a>","deprecated":false},{"name":"series<areaspline>-states-hover-marker--radius","fullname":"series<areaspline>.states.hover.marker.radius","title":"radius","parent":"series<areaspline>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-scatter-marker-states-select--radius","fullname":"plotOptions.scatter.marker.states.select.radius","title":"radius","parent":"plotOptions-scatter-marker-states-select","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults\n\t\tto the normal state's radius + 2.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-radius/\" target=\"_blank\">10px radius for selected points</a>"},{"name":"series<arearange>-states-hover-marker--radius","fullname":"series<arearange>.states.hover.marker.radius","title":"radius","parent":"series<arearange>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<scatter>-marker--radius","fullname":"series<scatter>.marker.radius","title":"radius","parent":"series<scatter>-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<bubble>-states-hover-marker--radius","fullname":"series<bubble>.states.hover.marker.radius","title":"radius","parent":"series<bubble>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-treemap-states-hover-marker--radius","fullname":"plotOptions.treemap.states.hover.marker.radius","title":"radius","parent":"plotOptions-treemap-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-line-states-hover-marker--radius","fullname":"plotOptions.line.states.hover.marker.radius","title":"radius","parent":"plotOptions-line-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<solidgauge>-states-hover-marker--radius","fullname":"series<solidgauge>.states.hover.marker.radius","title":"radius","parent":"series<solidgauge>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-polygon-marker-states-hover--radius","fullname":"plotOptions.polygon.marker.states.hover.radius","title":"radius","parent":"plotOptions-polygon-marker-states-hover","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults to the normal state's radius + 2 as per the <a href=\"#plotOptions.series.marker.states.hover.radiusPlus\">radiusPlus</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-radius/\" target=\"_blank\">10px radius</a>","deprecated":false},{"name":"plotOptions-area-marker--radius","fullname":"plotOptions.area.marker.radius","title":"radius","parent":"plotOptions-area-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-gauge-pivot--radius","fullname":"plotOptions.gauge.pivot.radius","title":"radius","parent":"plotOptions-gauge-pivot","isParent":false,"returnType":"Number","defaults":"5","since":"2.3.0","description":"The pixel radius of the pivot.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-pivot/\" target=\"_blank\">Pivot options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"series<spline>-data-marker-states-select--radius","fullname":"series<spline>.data.marker.states.select.radius","title":"radius","parent":"series<spline>-data-marker-states-select","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults\n\t\tto the normal state's radius + 2.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-radius/\" target=\"_blank\">10px radius for selected points</a>"},{"name":"series<polygon>-states-hover-marker--radius","fullname":"series<polygon>.states.hover.marker.radius","title":"radius","parent":"series<polygon>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<line>-data-marker--radius","fullname":"series<line>.data.marker.radius","title":"radius","parent":"series<line>-data-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-bubble-marker-states-select--radius","fullname":"plotOptions.bubble.marker.states.select.radius","title":"radius","parent":"plotOptions-bubble-marker-states-select","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults\n\t\tto the normal state's radius + 2.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-radius/\" target=\"_blank\">10px radius for selected points</a>"},{"name":"series<gauge>-dial--radius","fullname":"series<gauge>.dial.radius","title":"radius","parent":"series<gauge>-dial","isParent":false,"returnType":"String","defaults":"80%","since":"2.3.0","description":"The radius or length of the dial, in percentages relative to the radius of the gauge itself.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-dial/\" target=\"_blank\">Dial options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble-states-hover-marker--radius","fullname":"plotOptions.bubble.states.hover.marker.radius","title":"radius","parent":"plotOptions-bubble-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<gauge>-states-hover-marker--radius","fullname":"series<gauge>.states.hover.marker.radius","title":"radius","parent":"series<gauge>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<scatter>-states-hover-marker--radius","fullname":"series<scatter>.states.hover.marker.radius","title":"radius","parent":"series<scatter>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-areaspline-marker-states-select--radius","fullname":"plotOptions.areaspline.marker.states.select.radius","title":"radius","parent":"plotOptions-areaspline-marker-states-select","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults\n\t\tto the normal state's radius + 2.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-radius/\" target=\"_blank\">10px radius for selected points</a>"},{"name":"plotOptions-pie-states-hover-marker--radius","fullname":"plotOptions.pie.states.hover.marker.radius","title":"radius","parent":"plotOptions-pie-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<waterfall>-states-hover-marker--radius","fullname":"series<waterfall>.states.hover.marker.radius","title":"radius","parent":"series<waterfall>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-area-marker-states-hover--radius","fullname":"plotOptions.area.marker.states.hover.radius","title":"radius","parent":"plotOptions-area-marker-states-hover","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults to the normal state's radius + 2 as per the <a href=\"#plotOptions.series.marker.states.hover.radiusPlus\">radiusPlus</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-radius/\" target=\"_blank\">10px radius</a>","deprecated":false},{"name":"series<columnrange>-states-hover-marker--radius","fullname":"series<columnrange>.states.hover.marker.radius","title":"radius","parent":"series<columnrange>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<line>-data-marker-states-hover--radius","fullname":"series<line>.data.marker.states.hover.radius","title":"radius","parent":"series<line>-data-marker-states-hover","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults to the normal state's radius + 2 as per the <a href=\"#plotOptions.series.marker.states.hover.radiusPlus\">radiusPlus</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-radius/\" target=\"_blank\">10px radius</a>","deprecated":false},{"name":"plotOptions-heatmap-states-hover-marker--radius","fullname":"plotOptions.heatmap.states.hover.marker.radius","title":"radius","parent":"plotOptions-heatmap-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-polygon-states-hover-marker--radius","fullname":"plotOptions.polygon.states.hover.marker.radius","title":"radius","parent":"plotOptions-polygon-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-bubble-marker-states-hover--radius","fullname":"plotOptions.bubble.marker.states.hover.radius","title":"radius","parent":"plotOptions-bubble-marker-states-hover","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults to the normal state's radius + 2 as per the <a href=\"#plotOptions.series.marker.states.hover.radiusPlus\">radiusPlus</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-radius/\" target=\"_blank\">10px radius</a>","deprecated":false},{"name":"series<line>-marker-states-select--radius","fullname":"series<line>.marker.states.select.radius","title":"radius","parent":"series<line>-marker-states-select","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults\n\t\tto the normal state's radius + 2.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-radius/\" target=\"_blank\">10px radius for selected points</a>"},{"name":"series<bar>-states-hover-marker--radius","fullname":"series<bar>.states.hover.marker.radius","title":"radius","parent":"series<bar>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<column>-states-hover-marker--radius","fullname":"series<column>.states.hover.marker.radius","title":"radius","parent":"series<column>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<boxplot>-states-hover-marker--radius","fullname":"series<boxplot>.states.hover.marker.radius","title":"radius","parent":"series<boxplot>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-bubble-marker--radius","fullname":"plotOptions.bubble.marker.radius","title":"radius","parent":"plotOptions-bubble-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<area>-data-marker--radius","fullname":"series<area>.data.marker.radius","title":"radius","parent":"series<area>-data-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-spline-marker-states-select--radius","fullname":"plotOptions.spline.marker.states.select.radius","title":"radius","parent":"plotOptions-spline-marker-states-select","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults\n\t\tto the normal state's radius + 2.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-radius/\" target=\"_blank\">10px radius for selected points</a>"},{"name":"series<polygon>-marker-states-hover--radius","fullname":"series<polygon>.marker.states.hover.radius","title":"radius","parent":"series<polygon>-marker-states-hover","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults to the normal state's radius + 2 as per the <a href=\"#plotOptions.series.marker.states.hover.radiusPlus\">radiusPlus</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-radius/\" target=\"_blank\">10px radius</a>","deprecated":false},{"name":"series<spline>-data-marker--radius","fullname":"series<spline>.data.marker.radius","title":"radius","parent":"series<spline>-data-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-gauge-dial--radius","fullname":"plotOptions.gauge.dial.radius","title":"radius","parent":"plotOptions-gauge-dial","isParent":false,"returnType":"String","defaults":"80%","since":"2.3.0","description":"The radius or length of the dial, in percentages relative to the radius of the gauge itself.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-dial/\" target=\"_blank\">Dial options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"series<funnel>-states-hover-marker--radius","fullname":"series<funnel>.states.hover.marker.radius","title":"radius","parent":"series<funnel>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-polygon-marker--radius","fullname":"plotOptions.polygon.marker.radius","title":"radius","parent":"plotOptions-polygon-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<polygon>-marker--radius","fullname":"series<polygon>.marker.radius","title":"radius","parent":"series<polygon>-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-series-marker-states-select--radius","fullname":"plotOptions.series.marker.states.select.radius","title":"radius","parent":"plotOptions-series-marker-states-select","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults\n\t\tto the normal state's radius + 2.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-radius/\" target=\"_blank\">10px radius for selected points</a>"},{"name":"plotOptions-series-states-hover-marker--radius","fullname":"plotOptions.series.states.hover.marker.radius","title":"radius","parent":"plotOptions-series-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<polygon>-marker-states-select--radius","fullname":"series<polygon>.marker.states.select.radius","title":"radius","parent":"series<polygon>-marker-states-select","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults\n\t\tto the normal state's radius + 2.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-radius/\" target=\"_blank\">10px radius for selected points</a>"},{"name":"plotOptions-spline-marker--radius","fullname":"plotOptions.spline.marker.radius","title":"radius","parent":"plotOptions-spline-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-areaspline-marker--radius","fullname":"plotOptions.areaspline.marker.radius","title":"radius","parent":"plotOptions-areaspline-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-scatter-marker-states-hover--radius","fullname":"plotOptions.scatter.marker.states.hover.radius","title":"radius","parent":"plotOptions-scatter-marker-states-hover","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults to the normal state's radius + 2 as per the <a href=\"#plotOptions.series.marker.states.hover.radiusPlus\">radiusPlus</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-radius/\" target=\"_blank\">10px radius</a>","deprecated":false},{"name":"plotOptions-line-marker-states-hover--radius","fullname":"plotOptions.line.marker.states.hover.radius","title":"radius","parent":"plotOptions-line-marker-states-hover","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults to the normal state's radius + 2 as per the <a href=\"#plotOptions.series.marker.states.hover.radiusPlus\">radiusPlus</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-radius/\" target=\"_blank\">10px radius</a>","deprecated":false},{"name":"series<areaspline>-marker--radius","fullname":"series<areaspline>.marker.radius","title":"radius","parent":"series<areaspline>-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<treemap>-states-hover-marker--radius","fullname":"series<treemap>.states.hover.marker.radius","title":"radius","parent":"series<treemap>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<heatmap>-states-hover-marker--radius","fullname":"series<heatmap>.states.hover.marker.radius","title":"radius","parent":"series<heatmap>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<line>-data-marker-states-select--radius","fullname":"series<line>.data.marker.states.select.radius","title":"radius","parent":"series<line>-data-marker-states-select","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults\n\t\tto the normal state's radius + 2.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-radius/\" target=\"_blank\">10px radius for selected points</a>"},{"name":"series<scatter>-data-marker-states-hover--radius","fullname":"series<scatter>.data.marker.states.hover.radius","title":"radius","parent":"series<scatter>-data-marker-states-hover","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults to the normal state's radius + 2 as per the <a href=\"#plotOptions.series.marker.states.hover.radiusPlus\">radiusPlus</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-radius/\" target=\"_blank\">10px radius</a>","deprecated":false},{"name":"series<polygon>-data-marker-states-hover--radius","fullname":"series<polygon>.data.marker.states.hover.radius","title":"radius","parent":"series<polygon>-data-marker-states-hover","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults to the normal state's radius + 2 as per the <a href=\"#plotOptions.series.marker.states.hover.radiusPlus\">radiusPlus</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-hover-radius/\" target=\"_blank\">10px radius</a>","deprecated":false},{"name":"plotOptions-scatter-states-hover-marker--radius","fullname":"plotOptions.scatter.states.hover.marker.radius","title":"radius","parent":"plotOptions-scatter-states-hover-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"series<spline>-marker--radius","fullname":"series<spline>.marker.radius","title":"radius","parent":"series<spline>-marker","isParent":false,"returnType":"Number","defaults":"4","description":"The radius of the point marker.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-radius/\" target=\"_blank\">Bigger markers</a>","deprecated":false},{"name":"plotOptions-area-marker-states-select--radius","fullname":"plotOptions.area.marker.states.select.radius","title":"radius","parent":"plotOptions-area-marker-states-select","isParent":false,"returnType":"Number","description":"The radius of the point marker. In hover state, it defaults\n\t\tto the normal state's radius + 2.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-states-select-radius/\" target=\"_blank\">10px radius for selected points</a>"},{"name":"series<area>-marker-states-hover--radiusPlus","fullname":"series<area>.marker.states.hover.radiusPlus","title":"radiusPlus","parent":"series<area>-marker-states-hover","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"4.0.3","description":"The number of pixels to increase the radius of the hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels greater radius on hover</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-line-marker-states-hover--radiusPlus","fullname":"plotOptions.line.marker.states.hover.radiusPlus","title":"radiusPlus","parent":"plotOptions-line-marker-states-hover","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"4.0.3","description":"The number of pixels to increase the radius of the hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels greater radius on hover</a>","seeAlso":"","deprecated":false},{"name":"series<polygon>-data-marker-states-hover--radiusPlus","fullname":"series<polygon>.data.marker.states.hover.radiusPlus","title":"radiusPlus","parent":"series<polygon>-data-marker-states-hover","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"4.0.3","description":"The number of pixels to increase the radius of the hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels greater radius on hover</a>","seeAlso":"","deprecated":false},{"name":"series<bubble>-marker-states-hover--radiusPlus","fullname":"series<bubble>.marker.states.hover.radiusPlus","title":"radiusPlus","parent":"series<bubble>-marker-states-hover","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"4.0.3","description":"The number of pixels to increase the radius of the hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels greater radius on hover</a>","seeAlso":"","deprecated":false},{"name":"series<spline>-marker-states-hover--radiusPlus","fullname":"series<spline>.marker.states.hover.radiusPlus","title":"radiusPlus","parent":"series<spline>-marker-states-hover","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"4.0.3","description":"The number of pixels to increase the radius of the hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels greater radius on hover</a>","seeAlso":"","deprecated":false},{"name":"series<scatter>-marker-states-hover--radiusPlus","fullname":"series<scatter>.marker.states.hover.radiusPlus","title":"radiusPlus","parent":"series<scatter>-marker-states-hover","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"4.0.3","description":"The number of pixels to increase the radius of the hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels greater radius on hover</a>","seeAlso":"","deprecated":false},{"name":"series<scatter>-data-marker-states-hover--radiusPlus","fullname":"series<scatter>.data.marker.states.hover.radiusPlus","title":"radiusPlus","parent":"series<scatter>-data-marker-states-hover","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"4.0.3","description":"The number of pixels to increase the radius of the hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels greater radius on hover</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-marker-states-hover--radiusPlus","fullname":"plotOptions.polygon.marker.states.hover.radiusPlus","title":"radiusPlus","parent":"plotOptions-polygon-marker-states-hover","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"4.0.3","description":"The number of pixels to increase the radius of the hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels greater radius on hover</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-series-marker-states-hover--radiusPlus","fullname":"plotOptions.series.marker.states.hover.radiusPlus","title":"radiusPlus","parent":"plotOptions-series-marker-states-hover","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"4.0.3","description":"The number of pixels to increase the radius of the hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels greater radius on hover</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-area-marker-states-hover--radiusPlus","fullname":"plotOptions.area.marker.states.hover.radiusPlus","title":"radiusPlus","parent":"plotOptions-area-marker-states-hover","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"4.0.3","description":"The number of pixels to increase the radius of the hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels greater radius on hover</a>","seeAlso":"","deprecated":false},{"name":"series<areaspline>-marker-states-hover--radiusPlus","fullname":"series<areaspline>.marker.states.hover.radiusPlus","title":"radiusPlus","parent":"series<areaspline>-marker-states-hover","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"4.0.3","description":"The number of pixels to increase the radius of the hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels greater radius on hover</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter-marker-states-hover--radiusPlus","fullname":"plotOptions.scatter.marker.states.hover.radiusPlus","title":"radiusPlus","parent":"plotOptions-scatter-marker-states-hover","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"4.0.3","description":"The number of pixels to increase the radius of the hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels greater radius on hover</a>","seeAlso":"","deprecated":false},{"name":"series<areaspline>-data-marker-states-hover--radiusPlus","fullname":"series<areaspline>.data.marker.states.hover.radiusPlus","title":"radiusPlus","parent":"series<areaspline>-data-marker-states-hover","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"4.0.3","description":"The number of pixels to increase the radius of the hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels greater radius on hover</a>","seeAlso":"","deprecated":false},{"name":"series<area>-data-marker-states-hover--radiusPlus","fullname":"series<area>.data.marker.states.hover.radiusPlus","title":"radiusPlus","parent":"series<area>-data-marker-states-hover","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"4.0.3","description":"The number of pixels to increase the radius of the hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels greater radius on hover</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-marker-states-hover--radiusPlus","fullname":"plotOptions.spline.marker.states.hover.radiusPlus","title":"radiusPlus","parent":"plotOptions-spline-marker-states-hover","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"4.0.3","description":"The number of pixels to increase the radius of the hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels greater radius on hover</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-marker-states-hover--radiusPlus","fullname":"plotOptions.areaspline.marker.states.hover.radiusPlus","title":"radiusPlus","parent":"plotOptions-areaspline-marker-states-hover","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"4.0.3","description":"The number of pixels to increase the radius of the hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels greater radius on hover</a>","seeAlso":"","deprecated":false},{"name":"series<line>-marker-states-hover--radiusPlus","fullname":"series<line>.marker.states.hover.radiusPlus","title":"radiusPlus","parent":"series<line>-marker-states-hover","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"4.0.3","description":"The number of pixels to increase the radius of the hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels greater radius on hover</a>","seeAlso":"","deprecated":false},{"name":"series<polygon>-marker-states-hover--radiusPlus","fullname":"series<polygon>.marker.states.hover.radiusPlus","title":"radiusPlus","parent":"series<polygon>-marker-states-hover","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"4.0.3","description":"The number of pixels to increase the radius of the hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels greater radius on hover</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble-marker-states-hover--radiusPlus","fullname":"plotOptions.bubble.marker.states.hover.radiusPlus","title":"radiusPlus","parent":"plotOptions-bubble-marker-states-hover","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"4.0.3","description":"The number of pixels to increase the radius of the hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels greater radius on hover</a>","seeAlso":"","deprecated":false},{"name":"series<spline>-data-marker-states-hover--radiusPlus","fullname":"series<spline>.data.marker.states.hover.radiusPlus","title":"radiusPlus","parent":"series<spline>-data-marker-states-hover","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"4.0.3","description":"The number of pixels to increase the radius of the hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels greater radius on hover</a>","seeAlso":"","deprecated":false},{"name":"series<line>-data-marker-states-hover--radiusPlus","fullname":"series<line>.data.marker.states.hover.radiusPlus","title":"radiusPlus","parent":"series<line>-data-marker-states-hover","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"4.0.3","description":"The number of pixels to increase the radius of the hovered point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-states-hover-linewidthplus/\" target=\"_blank\">5 pixels greater radius on hover</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge-dial--rearLength","fullname":"plotOptions.gauge.dial.rearLength","title":"rearLength","parent":"plotOptions-gauge-dial","isParent":false,"returnType":"String","defaults":"10%","since":"2.3.0","description":"The length of the dial's rear end, the part that extends out on the other side of the pivot. Relative to the dial's length. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-dial/\" target=\"_blank\">Dial options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"series<gauge>-dial--rearLength","fullname":"series<gauge>.dial.rearLength","title":"rearLength","parent":"series<gauge>-dial","isParent":false,"returnType":"String","defaults":"10%","since":"2.3.0","description":"The length of the dial's rear end, the part that extends out on the other side of the pivot. Relative to the dial's length. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-dial/\" target=\"_blank\">Dial options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"chart-events--redraw","fullname":"chart.events.redraw","title":"redraw","parent":"chart-events","isParent":false,"returnType":"Function","context":"Chart","since":"1.2.0","description":"Fires when the chart is redrawn, either after a call to chart.redraw() or after an axis, series or point is modified with the <code>redraw</code> option set to true. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/events-redraw/\" target=\"_blank\">Alert on chart redraw</a>","deprecated":false},{"name":"chart--reflow","fullname":"chart.reflow","title":"reflow","parent":"chart","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.1","description":"Whether to reflow the chart to fit the width of the container div on resizing the window.","demo":"Move the bar between the JavaScript frame and the Preview frame to see the effect: \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">True by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-false/\" target=\"_blank\">false</a>."},{"name":"chart-resetZoomButton--relativeTo","fullname":"chart.resetZoomButton.relativeTo","title":"relativeTo","parent":"chart-resetZoomButton","isParent":false,"returnType":"String","defaults":"plot","values":"[\"plot\", \"chart\"]","since":"2.2","description":"What frame the button should be placed related to. Can be either \"plot\" or \"chart\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/resetzoombutton-relativeto/\" target=\"_blank\">Relative to the chart</a>"},{"name":"drilldown-drillUpButton--relativeTo","fullname":"drilldown.drillUpButton.relativeTo","title":"relativeTo","parent":"drilldown-drillUpButton","isParent":false,"returnType":"String","defaults":"plotBox","values":"","since":"3.0.8","description":"What box to align the button to. Can be either \"plotBox\" or \"spacingBox\".","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column-point-events--remove","fullname":"plotOptions.column.point.events.remove","title":"remove","parent":"plotOptions-column-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<spline>-data-events--remove","fullname":"series<spline>.data.events.remove","title":"remove","parent":"series<spline>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<polygon>-point-events--remove","fullname":"series<polygon>.point.events.remove","title":"remove","parent":"series<polygon>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<gauge>-point-events--remove","fullname":"series<gauge>.point.events.remove","title":"remove","parent":"series<gauge>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<boxplot>-point-events--remove","fullname":"series<boxplot>.point.events.remove","title":"remove","parent":"series<boxplot>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<line>-point-events--remove","fullname":"series<line>.point.events.remove","title":"remove","parent":"series<line>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<pie>-point-events--remove","fullname":"series<pie>.point.events.remove","title":"remove","parent":"series<pie>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"plotOptions-polygon-point-events--remove","fullname":"plotOptions.polygon.point.events.remove","title":"remove","parent":"plotOptions-polygon-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<arearange>-point-events--remove","fullname":"series<arearange>.point.events.remove","title":"remove","parent":"series<arearange>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<solidgauge>-data-events--remove","fullname":"series<solidgauge>.data.events.remove","title":"remove","parent":"series<solidgauge>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<line>-data-events--remove","fullname":"series<line>.data.events.remove","title":"remove","parent":"series<line>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<column>-point-events--remove","fullname":"series<column>.point.events.remove","title":"remove","parent":"series<column>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"plotOptions-arearange-point-events--remove","fullname":"plotOptions.arearange.point.events.remove","title":"remove","parent":"plotOptions-arearange-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<pie>-data-events--remove","fullname":"series<pie>.data.events.remove","title":"remove","parent":"series<pie>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<heatmap>-data-events--remove","fullname":"series<heatmap>.data.events.remove","title":"remove","parent":"series<heatmap>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<gauge>-data-events--remove","fullname":"series<gauge>.data.events.remove","title":"remove","parent":"series<gauge>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<scatter>-point-events--remove","fullname":"series<scatter>.point.events.remove","title":"remove","parent":"series<scatter>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<areaspline>-point-events--remove","fullname":"series<areaspline>.point.events.remove","title":"remove","parent":"series<areaspline>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<arearange>-data-events--remove","fullname":"series<arearange>.data.events.remove","title":"remove","parent":"series<arearange>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"plotOptions-bar-point-events--remove","fullname":"plotOptions.bar.point.events.remove","title":"remove","parent":"plotOptions-bar-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"plotOptions-line-point-events--remove","fullname":"plotOptions.line.point.events.remove","title":"remove","parent":"plotOptions-line-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"plotOptions-areasplinerange-point-events--remove","fullname":"plotOptions.areasplinerange.point.events.remove","title":"remove","parent":"plotOptions-areasplinerange-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<columnrange>-point-events--remove","fullname":"series<columnrange>.point.events.remove","title":"remove","parent":"series<columnrange>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"plotOptions-boxplot-point-events--remove","fullname":"plotOptions.boxplot.point.events.remove","title":"remove","parent":"plotOptions-boxplot-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<waterfall>-point-events--remove","fullname":"series<waterfall>.point.events.remove","title":"remove","parent":"series<waterfall>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<areaspline>-data-events--remove","fullname":"series<areaspline>.data.events.remove","title":"remove","parent":"series<areaspline>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"plotOptions-area-point-events--remove","fullname":"plotOptions.area.point.events.remove","title":"remove","parent":"plotOptions-area-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<heatmap>-point-events--remove","fullname":"series<heatmap>.point.events.remove","title":"remove","parent":"series<heatmap>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<bar>-point-events--remove","fullname":"series<bar>.point.events.remove","title":"remove","parent":"series<bar>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<polygon>-data-events--remove","fullname":"series<polygon>.data.events.remove","title":"remove","parent":"series<polygon>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<columnrange>-data-events--remove","fullname":"series<columnrange>.data.events.remove","title":"remove","parent":"series<columnrange>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<errorbar>-data-events--remove","fullname":"series<errorbar>.data.events.remove","title":"remove","parent":"series<errorbar>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<column>-data-events--remove","fullname":"series<column>.data.events.remove","title":"remove","parent":"series<column>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<pyramid>-point-events--remove","fullname":"series<pyramid>.point.events.remove","title":"remove","parent":"series<pyramid>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<bubble>-data-events--remove","fullname":"series<bubble>.data.events.remove","title":"remove","parent":"series<bubble>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<waterfall>-data-events--remove","fullname":"series<waterfall>.data.events.remove","title":"remove","parent":"series<waterfall>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"plotOptions-waterfall-point-events--remove","fullname":"plotOptions.waterfall.point.events.remove","title":"remove","parent":"plotOptions-waterfall-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<area>-data-events--remove","fullname":"series<area>.data.events.remove","title":"remove","parent":"series<area>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"plotOptions-pyramid-point-events--remove","fullname":"plotOptions.pyramid.point.events.remove","title":"remove","parent":"plotOptions-pyramid-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<bar>-data-events--remove","fullname":"series<bar>.data.events.remove","title":"remove","parent":"series<bar>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"plotOptions-solidgauge-point-events--remove","fullname":"plotOptions.solidgauge.point.events.remove","title":"remove","parent":"plotOptions-solidgauge-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<treemap>-point-events--remove","fullname":"series<treemap>.point.events.remove","title":"remove","parent":"series<treemap>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<treemap>-data-events--remove","fullname":"series<treemap>.data.events.remove","title":"remove","parent":"series<treemap>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"plotOptions-treemap-point-events--remove","fullname":"plotOptions.treemap.point.events.remove","title":"remove","parent":"plotOptions-treemap-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<areasplinerange>-point-events--remove","fullname":"series<areasplinerange>.point.events.remove","title":"remove","parent":"series<areasplinerange>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<pyramid>-data-events--remove","fullname":"series<pyramid>.data.events.remove","title":"remove","parent":"series<pyramid>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<solidgauge>-point-events--remove","fullname":"series<solidgauge>.point.events.remove","title":"remove","parent":"series<solidgauge>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<errorbar>-point-events--remove","fullname":"series<errorbar>.point.events.remove","title":"remove","parent":"series<errorbar>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<spline>-point-events--remove","fullname":"series<spline>.point.events.remove","title":"remove","parent":"series<spline>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"plotOptions-series-point-events--remove","fullname":"plotOptions.series.point.events.remove","title":"remove","parent":"plotOptions-series-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<areasplinerange>-data-events--remove","fullname":"series<areasplinerange>.data.events.remove","title":"remove","parent":"series<areasplinerange>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"plotOptions-bubble-point-events--remove","fullname":"plotOptions.bubble.point.events.remove","title":"remove","parent":"plotOptions-bubble-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<funnel>-data-events--remove","fullname":"series<funnel>.data.events.remove","title":"remove","parent":"series<funnel>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"plotOptions-heatmap-point-events--remove","fullname":"plotOptions.heatmap.point.events.remove","title":"remove","parent":"plotOptions-heatmap-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<funnel>-point-events--remove","fullname":"series<funnel>.point.events.remove","title":"remove","parent":"series<funnel>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"plotOptions-scatter-point-events--remove","fullname":"plotOptions.scatter.point.events.remove","title":"remove","parent":"plotOptions-scatter-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"plotOptions-pie-point-events--remove","fullname":"plotOptions.pie.point.events.remove","title":"remove","parent":"plotOptions-pie-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"plotOptions-areaspline-point-events--remove","fullname":"plotOptions.areaspline.point.events.remove","title":"remove","parent":"plotOptions-areaspline-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"plotOptions-errorbar-point-events--remove","fullname":"plotOptions.errorbar.point.events.remove","title":"remove","parent":"plotOptions-errorbar-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"plotOptions-gauge-point-events--remove","fullname":"plotOptions.gauge.point.events.remove","title":"remove","parent":"plotOptions-gauge-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"plotOptions-columnrange-point-events--remove","fullname":"plotOptions.columnrange.point.events.remove","title":"remove","parent":"plotOptions-columnrange-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"plotOptions-spline-point-events--remove","fullname":"plotOptions.spline.point.events.remove","title":"remove","parent":"plotOptions-spline-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<scatter>-data-events--remove","fullname":"series<scatter>.data.events.remove","title":"remove","parent":"series<scatter>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<bubble>-point-events--remove","fullname":"series<bubble>.point.events.remove","title":"remove","parent":"series<bubble>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<area>-point-events--remove","fullname":"series<area>.point.events.remove","title":"remove","parent":"series<area>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"series<boxplot>-data-events--remove","fullname":"series<boxplot>.data.events.remove","title":"remove","parent":"series<boxplot>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"plotOptions-funnel-point-events--remove","fullname":"plotOptions.funnel.point.events.remove","title":"remove","parent":"plotOptions-funnel-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is removed using the <code>.remove()</code> method. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-remove/\" target=\"_blank\">Remove point and confirm</a>","deprecated":false},{"name":"chart--renderTo","fullname":"chart.renderTo","title":"renderTo","parent":"chart","isParent":false,"returnType":"String|Object","description":"The HTML element where the chart will be rendered. If it is a string, the element by that id is used. The HTML element can also be passed by direct reference.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/reflow-true/\" target=\"_blank\">String</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/renderto-object/\" target=\"_blank\">object reference</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/renderto-jquery/\" target=\"_blank\">object reference through jQuery</a>,"},{"name":"xAxis-breaks--repeat","fullname":"xAxis.breaks.repeat","title":"repeat","parent":"xAxis-breaks","isParent":false,"returnType":"Number","defaults":"0","since":"4.1.0","description":"Defines an interval after which the break appears again. By default the breaks do not repeat.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/axisbreak/break-repeated/\">Repeated Break</a>","deprecated":false},{"name":"yAxis-breaks--repeat","fullname":"yAxis.breaks.repeat","title":"repeat","parent":"yAxis-breaks","isParent":false,"returnType":"Number","defaults":"0","since":"4.1.0","description":"Defines an interval after which the break appears again. By default the breaks do not repeat.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/axisbreak/break-repeated/\">Repeated Break</a>","deprecated":false},{"name":"lang--resetZoom","fullname":"lang.resetZoom","title":"resetZoom","parent":"lang","isParent":false,"returnType":"String","defaults":"Reset zoom","since":"1.2.4","description":"The text for the label appearing when a chart is zoomed."},{"name":"chart-resetZoomButton","fullname":"chart.resetZoomButton","title":"resetZoomButton","parent":"chart","isParent":true,"description":"The button that appears after a selection zoom, allowing the user to reset zoom."},{"name":"lang--resetZoomTitle","fullname":"lang.resetZoomTitle","title":"resetZoomTitle","parent":"lang","isParent":false,"returnType":"String","defaults":"Reset zoom level 1:1","since":"1.2.4","description":"The tooltip title for the label appearing when a chart is zoomed."},{"name":"xAxis--reversed","fullname":"xAxis.reversed","title":"reversed","parent":"xAxis","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to reverse the axis so that the highest number is closest to the origin. If the chart is inverted, the x axis is reversed by default.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/reversed/\" target=\"_blank\">Reversed Y axis</a>","deprecated":false},{"name":"series<pyramid>--reversed","fullname":"series<pyramid>.reversed","title":"reversed","parent":"series<pyramid>","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"3.0.10","description":"The pyramid is reversed by default, as opposed to the funnel, which shares the layout engine, and is not reversed.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel--reversed","fullname":"plotOptions.funnel.reversed","title":"reversed","parent":"plotOptions-funnel","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0.10","description":"A reversed funnel has the widest area down. A reversed funnel with no neck width and neck height is a pyramid.","demo":"","seeAlso":"","deprecated":false},{"name":"yAxis--reversed","fullname":"yAxis.reversed","title":"reversed","parent":"yAxis","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to reverse the axis so that the highest number is closest to the origin. If the chart is inverted, the x axis is reversed by default.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/reversed/\" target=\"_blank\">Reversed Y axis</a>","deprecated":false},{"name":"plotOptions-pyramid--reversed","fullname":"plotOptions.pyramid.reversed","title":"reversed","parent":"plotOptions-pyramid","isParent":false,"returnType":"Boolean","defaults":"true","values":"","since":"3.0.10","description":"The pyramid is reversed by default, as opposed to the funnel, which shares the layout engine, and is not reversed.","demo":"","seeAlso":"","deprecated":false},{"name":"legend--reversed","fullname":"legend.reversed","title":"reversed","parent":"legend","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.5","description":"Whether to reverse the order of the legend items compared to the order of the series or points as defined in the configuration object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/reversed/\" target=\"_blank\">Stacked bar with reversed legend</a>","seeAlso":"<a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>, <a href=\"#series.legendIndex\">series.legendIndex</a>","deprecated":false},{"name":"series<funnel>--reversed","fullname":"series<funnel>.reversed","title":"reversed","parent":"series<funnel>","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0.10","description":"A reversed funnel has the widest area down. A reversed funnel with no neck width and neck height is a pyramid.","demo":"","seeAlso":"","deprecated":false},{"name":"yAxis--reversedStacks","fullname":"yAxis.reversedStacks","title":"reversedStacks","parent":"yAxis","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0.10","description":"If <code>true</code>, the first series in a stack will be drawn on top in a positive, non-reversed Y axis. If <code>false</code>, the first series is in the base of the stack.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/reversedstacks-false/\" target=\"_blank\">Non-reversed stacks</a>.","deprecated":false},{"name":"plotOptions-bubble-dataLabels--rotation","fullname":"plotOptions.bubble.dataLabels.rotation","title":"rotation","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"series<areaspline>-dataLabels--rotation","fullname":"series<areaspline>.dataLabels.rotation","title":"rotation","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels--rotation","fullname":"plotOptions.areasplinerange.dataLabels.rotation","title":"rotation","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"series<solidgauge>-dataLabels--rotation","fullname":"series<solidgauge>.dataLabels.rotation","title":"rotation","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"plotOptions-scatter-dataLabels--rotation","fullname":"plotOptions.scatter.dataLabels.rotation","title":"rotation","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"series<scatter>-dataLabels--rotation","fullname":"series<scatter>.dataLabels.rotation","title":"rotation","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"series<pyramid>-dataLabels--rotation","fullname":"series<pyramid>.dataLabels.rotation","title":"rotation","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"yAxis-stackLabels--rotation","fullname":"yAxis.stackLabels.rotation","title":"rotation","parent":"yAxis-stackLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.1.5","description":"Rotation of the labels in degrees.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/stacklabels-rotation/\" target=\"_blank\">Labels rotated 45°</a>"},{"name":"series<columnrange>-dataLabels--rotation","fullname":"series<columnrange>.dataLabels.rotation","title":"rotation","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"plotOptions-polygon-dataLabels--rotation","fullname":"plotOptions.polygon.dataLabels.rotation","title":"rotation","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"plotOptions-heatmap-dataLabels--rotation","fullname":"plotOptions.heatmap.dataLabels.rotation","title":"rotation","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"xAxis-title--rotation","fullname":"xAxis.title.rotation","title":"rotation","parent":"xAxis-title","isParent":false,"returnType":"Number","defaults":"0","description":"The rotation of the text in degrees. 0 is horizontal, 270 is vertical reading from bottom to top.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/title-offset/\" target=\"_blank\">Horizontal</a> Y axis title","deprecated":false},{"name":"plotOptions-pyramid-dataLabels--rotation","fullname":"plotOptions.pyramid.dataLabels.rotation","title":"rotation","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"plotOptions-waterfall-dataLabels--rotation","fullname":"plotOptions.waterfall.dataLabels.rotation","title":"rotation","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"plotOptions-areaspline-dataLabels--rotation","fullname":"plotOptions.areaspline.dataLabels.rotation","title":"rotation","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"series<heatmap>-dataLabels--rotation","fullname":"series<heatmap>.dataLabels.rotation","title":"rotation","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"plotOptions-arearange-dataLabels--rotation","fullname":"plotOptions.arearange.dataLabels.rotation","title":"rotation","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"yAxis-plotLines-label--rotation","fullname":"yAxis.plotLines.label.rotation","title":"rotation","parent":"yAxis-plotLines-label","isParent":false,"returnType":"Number","since":"2.1","description":"Rotation of the text label in degrees. Defaults to 0 for horizontal plot lines and 90 for vertical lines.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-label-verticalalign-middle/\" target=\"_blank\">Slanted text</a>"},{"name":"yAxis-plotBands-label--rotation","fullname":"yAxis.plotBands.label.rotation","title":"rotation","parent":"yAxis-plotBands-label","isParent":false,"returnType":"Number","defaults":"0","since":"2.1","description":"Rotation of the text label in degrees .","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-label-rotation/\" target=\"_blank\">Vertical text</a>"},{"name":"plotOptions-solidgauge-dataLabels--rotation","fullname":"plotOptions.solidgauge.dataLabels.rotation","title":"rotation","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"series<bubble>-dataLabels--rotation","fullname":"series<bubble>.dataLabels.rotation","title":"rotation","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"plotOptions-line-dataLabels--rotation","fullname":"plotOptions.line.dataLabels.rotation","title":"rotation","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"plotOptions-area-dataLabels--rotation","fullname":"plotOptions.area.dataLabels.rotation","title":"rotation","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"series<areasplinerange>-dataLabels--rotation","fullname":"series<areasplinerange>.dataLabels.rotation","title":"rotation","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"series<spline>-dataLabels--rotation","fullname":"series<spline>.dataLabels.rotation","title":"rotation","parent":"series<spline>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"plotOptions-funnel-dataLabels--rotation","fullname":"plotOptions.funnel.dataLabels.rotation","title":"rotation","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"xAxis-plotLines-label--rotation","fullname":"xAxis.plotLines.label.rotation","title":"rotation","parent":"xAxis-plotLines-label","isParent":false,"returnType":"Number","since":"2.1","description":"Rotation of the text label in degrees. Defaults to 0 for horizontal plot lines and 90 for vertical lines.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-label-verticalalign-middle/\" target=\"_blank\">Slanted text</a>"},{"name":"plotOptions-spline-dataLabels--rotation","fullname":"plotOptions.spline.dataLabels.rotation","title":"rotation","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"yAxis-title--rotation","fullname":"yAxis.title.rotation","title":"rotation","parent":"yAxis-title","isParent":false,"returnType":"Number","defaults":"270","description":"The rotation of the text in degrees. 0 is horizontal, 270 is  vertical reading from bottom to top.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/title-offset/\" target=\"_blank\">Horizontal</a> Y axis title","deprecated":false},{"name":"series<column>-dataLabels--rotation","fullname":"series<column>.dataLabels.rotation","title":"rotation","parent":"series<column>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"series<treemap>-dataLabels--rotation","fullname":"series<treemap>.dataLabels.rotation","title":"rotation","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"series<polygon>-dataLabels--rotation","fullname":"series<polygon>.dataLabels.rotation","title":"rotation","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"xAxis-labels--rotation","fullname":"xAxis.labels.rotation","title":"rotation","parent":"xAxis-labels","isParent":false,"returnType":"Number","defaults":"0","description":"Rotation of the labels in degrees.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-rotation/\" target=\"_blank\">X axis labels rotated 90°</a>"},{"name":"plotOptions-column-dataLabels--rotation","fullname":"plotOptions.column.dataLabels.rotation","title":"rotation","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"plotOptions-pie-dataLabels--rotation","fullname":"plotOptions.pie.dataLabels.rotation","title":"rotation","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"plotOptions-bar-dataLabels--rotation","fullname":"plotOptions.bar.dataLabels.rotation","title":"rotation","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"series<pie>-dataLabels--rotation","fullname":"series<pie>.dataLabels.rotation","title":"rotation","parent":"series<pie>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"xAxis-plotBands-label--rotation","fullname":"xAxis.plotBands.label.rotation","title":"rotation","parent":"xAxis-plotBands-label","isParent":false,"returnType":"Number","defaults":"0","since":"2.1","description":"Rotation of the text label in degrees .","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-label-rotation/\" target=\"_blank\">Vertical text</a>"},{"name":"yAxis-labels--rotation","fullname":"yAxis.labels.rotation","title":"rotation","parent":"yAxis-labels","isParent":false,"returnType":"Number","defaults":"0","description":"Rotation of the labels in degrees.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-rotation/\" target=\"_blank\">X axis labels rotated 90°</a>"},{"name":"plotOptions-gauge-dataLabels--rotation","fullname":"plotOptions.gauge.dataLabels.rotation","title":"rotation","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"series<funnel>-dataLabels--rotation","fullname":"series<funnel>.dataLabels.rotation","title":"rotation","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"series<area>-dataLabels--rotation","fullname":"series<area>.dataLabels.rotation","title":"rotation","parent":"series<area>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"plotOptions-columnrange-dataLabels--rotation","fullname":"plotOptions.columnrange.dataLabels.rotation","title":"rotation","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"series<line>-dataLabels--rotation","fullname":"series<line>.dataLabels.rotation","title":"rotation","parent":"series<line>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"series<gauge>-dataLabels--rotation","fullname":"series<gauge>.dataLabels.rotation","title":"rotation","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"plotOptions-series-dataLabels--rotation","fullname":"plotOptions.series.dataLabels.rotation","title":"rotation","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"series<bar>-dataLabels--rotation","fullname":"series<bar>.dataLabels.rotation","title":"rotation","parent":"series<bar>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"series<waterfall>-dataLabels--rotation","fullname":"series<waterfall>.dataLabels.rotation","title":"rotation","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"plotOptions-treemap-dataLabels--rotation","fullname":"plotOptions.treemap.dataLabels.rotation","title":"rotation","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"series<arearange>-dataLabels--rotation","fullname":"series<arearange>.dataLabels.rotation","title":"rotation","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"Text rotation in degrees. Note that due to a more complex structure, backgrounds, borders and padding will be lost on a rotated data label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical labels</a>","deprecated":false},{"name":"data--rows","fullname":"data.rows","title":"rows","parent":"data","isParent":false,"returnType":"Array<Array<Mixed>>","defaults":"","values":"","since":"4.0","description":"The same as the columns input option, but defining rows intead of columns.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/data/rows/\" target=\"_blank\">Data in rows</a>","seeAlso":"<a href=\"#data.columns\">data.columns</a>","deprecated":false},{"name":"plotOptions-heatmap--rowsize","fullname":"plotOptions.heatmap.rowsize","title":"rowsize","parent":"plotOptions-heatmap","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0","description":"The row size - how many Y axis units each heatmap row should span.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/maps/demo/heatmap/\" target=\"_blank\">1 by default</a>","seeAlso":"","deprecated":false},{"name":"series<heatmap>--rowsize","fullname":"series<heatmap>.rowsize","title":"rowsize","parent":"series<heatmap>","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0","description":"The row size - how many Y axis units each heatmap row should span.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/maps/demo/heatmap/\" target=\"_blank\">1 by default</a>","seeAlso":"","deprecated":false},{"name":"legend--rtl","fullname":"legend.rtl","title":"rtl","parent":"legend","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.2","description":"Whether to show the symbol on the right side of the text rather than the left side.  This is common in Arabic and Hebraic.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/rtl/\" target=\"_blank\">Symbol to the right</a>"},{"name":"exporting--scale","fullname":"exporting.scale","title":"scale","parent":"exporting","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"3.0","description":"Defines the scale or zoom factor for the exported image compared to the on-screen display. While for instance a 600px wide chart may look good on a website, it will look bad in print. The default scale of 2 makes this chart export to a 1200px PNG or JPG. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/exporting/scale/\" target=\"_blank\">Scale demonstrated</a>","seeAlso":"<a href=\"#chart.width\">chart.width</a>, <a href=\"#exporting.sourceWidth\">exporting.sourceWidth</a>","deprecated":false},{"name":"plotOptions-scatter","fullname":"plotOptions.scatter","title":"scatter","parent":"plotOptions","isParent":true,"returnType":"","defaults":"","since":"","description":"","demo":"","seeAlso":"","deprecated":false},{"name":"series<bubble>-data-events--select","fullname":"series<bubble>.data.events.select","title":"select","parent":"series<bubble>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-line-point-events--select","fullname":"plotOptions.line.point.events.select","title":"select","parent":"plotOptions-line-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<line>-point-events--select","fullname":"series<line>.point.events.select","title":"select","parent":"series<line>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-spline-marker-states-select","fullname":"plotOptions.spline.marker.states.select","title":"select","parent":"plotOptions-spline-marker-states","isParent":true,"description":"The appearance of the point marker when selected. In order to allow a point to be \n\t\tselected, set the <code>series.allowPointSelect</code> option to true."},{"name":"series<funnel>-data-events--select","fullname":"series<funnel>.data.events.select","title":"select","parent":"series<funnel>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<areaspline>-point-events--select","fullname":"series<areaspline>.point.events.select","title":"select","parent":"series<areaspline>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-bubble-marker-states-select","fullname":"plotOptions.bubble.marker.states.select","title":"select","parent":"plotOptions-bubble-marker-states","isParent":true,"description":"The appearance of the point marker when selected. In order to allow a point to be \n\t\tselected, set the <code>series.allowPointSelect</code> option to true."},{"name":"series<arearange>-data-events--select","fullname":"series<arearange>.data.events.select","title":"select","parent":"series<arearange>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<area>-marker-states-select","fullname":"series<area>.marker.states.select","title":"select","parent":"series<area>-marker-states","isParent":true,"description":"The appearance of the point marker when selected. In order to allow a point to be \n\t\tselected, set the <code>series.allowPointSelect</code> option to true."},{"name":"series<pyramid>-data-events--select","fullname":"series<pyramid>.data.events.select","title":"select","parent":"series<pyramid>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<areaspline>-data-events--select","fullname":"series<areaspline>.data.events.select","title":"select","parent":"series<areaspline>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<line>-marker-states-select","fullname":"series<line>.marker.states.select","title":"select","parent":"series<line>-marker-states","isParent":true,"description":"The appearance of the point marker when selected. In order to allow a point to be \n\t\tselected, set the <code>series.allowPointSelect</code> option to true."},{"name":"plotOptions-areaspline-point-events--select","fullname":"plotOptions.areaspline.point.events.select","title":"select","parent":"plotOptions-areaspline-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<heatmap>-point-events--select","fullname":"series<heatmap>.point.events.select","title":"select","parent":"series<heatmap>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-columnrange-point-events--select","fullname":"plotOptions.columnrange.point.events.select","title":"select","parent":"plotOptions-columnrange-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-series-marker-states-select","fullname":"plotOptions.series.marker.states.select","title":"select","parent":"plotOptions-series-marker-states","isParent":true,"description":"The appearance of the point marker when selected. In order to allow a point to be \n\t\tselected, set the <code>series.allowPointSelect</code> option to true."},{"name":"series<pie>-data-events--select","fullname":"series<pie>.data.events.select","title":"select","parent":"series<pie>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<area>-point-events--select","fullname":"series<area>.point.events.select","title":"select","parent":"series<area>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<boxplot>-data-events--select","fullname":"series<boxplot>.data.events.select","title":"select","parent":"series<boxplot>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-gauge-point-events--select","fullname":"plotOptions.gauge.point.events.select","title":"select","parent":"plotOptions-gauge-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<polygon>-data-events--select","fullname":"series<polygon>.data.events.select","title":"select","parent":"series<polygon>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<line>-data-events--select","fullname":"series<line>.data.events.select","title":"select","parent":"series<line>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<solidgauge>-data-events--select","fullname":"series<solidgauge>.data.events.select","title":"select","parent":"series<solidgauge>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<areaspline>-data-marker-states-select","fullname":"series<areaspline>.data.marker.states.select","title":"select","parent":"series<areaspline>-data-marker-states","isParent":true,"description":"The appearance of the point marker when selected. In order to allow a point to be \n\t\tselected, set the <code>series.allowPointSelect</code> option to true."},{"name":"plotOptions-scatter-marker-states-select","fullname":"plotOptions.scatter.marker.states.select","title":"select","parent":"plotOptions-scatter-marker-states","isParent":true,"description":"The appearance of the point marker when selected. In order to allow a point to be \n\t\tselected, set the <code>series.allowPointSelect</code> option to true."},{"name":"plotOptions-arearange-point-events--select","fullname":"plotOptions.arearange.point.events.select","title":"select","parent":"plotOptions-arearange-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<waterfall>-data-events--select","fullname":"series<waterfall>.data.events.select","title":"select","parent":"series<waterfall>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-column-point-events--select","fullname":"plotOptions.column.point.events.select","title":"select","parent":"plotOptions-column-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<spline>-point-events--select","fullname":"series<spline>.point.events.select","title":"select","parent":"series<spline>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-bubble-point-events--select","fullname":"plotOptions.bubble.point.events.select","title":"select","parent":"plotOptions-bubble-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<polygon>-data-marker-states-select","fullname":"series<polygon>.data.marker.states.select","title":"select","parent":"series<polygon>-data-marker-states","isParent":true,"description":"The appearance of the point marker when selected. In order to allow a point to be \n\t\tselected, set the <code>series.allowPointSelect</code> option to true."},{"name":"plotOptions-spline-point-events--select","fullname":"plotOptions.spline.point.events.select","title":"select","parent":"plotOptions-spline-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<scatter>-data-marker-states-select","fullname":"series<scatter>.data.marker.states.select","title":"select","parent":"series<scatter>-data-marker-states","isParent":true,"description":"The appearance of the point marker when selected. In order to allow a point to be \n\t\tselected, set the <code>series.allowPointSelect</code> option to true."},{"name":"series<boxplot>-point-events--select","fullname":"series<boxplot>.point.events.select","title":"select","parent":"series<boxplot>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<areasplinerange>-data-events--select","fullname":"series<areasplinerange>.data.events.select","title":"select","parent":"series<areasplinerange>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-area-point-events--select","fullname":"plotOptions.area.point.events.select","title":"select","parent":"plotOptions-area-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<areaspline>-marker-states-select","fullname":"series<areaspline>.marker.states.select","title":"select","parent":"series<areaspline>-marker-states","isParent":true,"description":"The appearance of the point marker when selected. In order to allow a point to be \n\t\tselected, set the <code>series.allowPointSelect</code> option to true."},{"name":"series<heatmap>-data-events--select","fullname":"series<heatmap>.data.events.select","title":"select","parent":"series<heatmap>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-errorbar-point-events--select","fullname":"plotOptions.errorbar.point.events.select","title":"select","parent":"plotOptions-errorbar-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<area>-data-events--select","fullname":"series<area>.data.events.select","title":"select","parent":"series<area>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<area>-data-marker-states-select","fullname":"series<area>.data.marker.states.select","title":"select","parent":"series<area>-data-marker-states","isParent":true,"description":"The appearance of the point marker when selected. In order to allow a point to be \n\t\tselected, set the <code>series.allowPointSelect</code> option to true."},{"name":"series<scatter>-data-events--select","fullname":"series<scatter>.data.events.select","title":"select","parent":"series<scatter>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-waterfall-point-events--select","fullname":"plotOptions.waterfall.point.events.select","title":"select","parent":"plotOptions-waterfall-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<waterfall>-point-events--select","fullname":"series<waterfall>.point.events.select","title":"select","parent":"series<waterfall>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-solidgauge-point-events--select","fullname":"plotOptions.solidgauge.point.events.select","title":"select","parent":"plotOptions-solidgauge-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<column>-data-events--select","fullname":"series<column>.data.events.select","title":"select","parent":"series<column>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<spline>-data-marker-states-select","fullname":"series<spline>.data.marker.states.select","title":"select","parent":"series<spline>-data-marker-states","isParent":true,"description":"The appearance of the point marker when selected. In order to allow a point to be \n\t\tselected, set the <code>series.allowPointSelect</code> option to true."},{"name":"series<scatter>-point-events--select","fullname":"series<scatter>.point.events.select","title":"select","parent":"series<scatter>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-areasplinerange-point-events--select","fullname":"plotOptions.areasplinerange.point.events.select","title":"select","parent":"plotOptions-areasplinerange-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-areaspline-marker-states-select","fullname":"plotOptions.areaspline.marker.states.select","title":"select","parent":"plotOptions-areaspline-marker-states","isParent":true,"description":"The appearance of the point marker when selected. In order to allow a point to be \n\t\tselected, set the <code>series.allowPointSelect</code> option to true."},{"name":"series<polygon>-point-events--select","fullname":"series<polygon>.point.events.select","title":"select","parent":"series<polygon>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<bubble>-marker-states-select","fullname":"series<bubble>.marker.states.select","title":"select","parent":"series<bubble>-marker-states","isParent":true,"description":"The appearance of the point marker when selected. In order to allow a point to be \n\t\tselected, set the <code>series.allowPointSelect</code> option to true."},{"name":"plotOptions-boxplot-point-events--select","fullname":"plotOptions.boxplot.point.events.select","title":"select","parent":"plotOptions-boxplot-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<bar>-point-events--select","fullname":"series<bar>.point.events.select","title":"select","parent":"series<bar>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<bubble>-point-events--select","fullname":"series<bubble>.point.events.select","title":"select","parent":"series<bubble>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<line>-data-marker-states-select","fullname":"series<line>.data.marker.states.select","title":"select","parent":"series<line>-data-marker-states","isParent":true,"description":"The appearance of the point marker when selected. In order to allow a point to be \n\t\tselected, set the <code>series.allowPointSelect</code> option to true."},{"name":"plotOptions-scatter-point-events--select","fullname":"plotOptions.scatter.point.events.select","title":"select","parent":"plotOptions-scatter-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<errorbar>-data-events--select","fullname":"series<errorbar>.data.events.select","title":"select","parent":"series<errorbar>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-bar-point-events--select","fullname":"plotOptions.bar.point.events.select","title":"select","parent":"plotOptions-bar-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<spline>-marker-states-select","fullname":"series<spline>.marker.states.select","title":"select","parent":"series<spline>-marker-states","isParent":true,"description":"The appearance of the point marker when selected. In order to allow a point to be \n\t\tselected, set the <code>series.allowPointSelect</code> option to true."},{"name":"series<scatter>-marker-states-select","fullname":"series<scatter>.marker.states.select","title":"select","parent":"series<scatter>-marker-states","isParent":true,"description":"The appearance of the point marker when selected. In order to allow a point to be \n\t\tselected, set the <code>series.allowPointSelect</code> option to true."},{"name":"series<gauge>-point-events--select","fullname":"series<gauge>.point.events.select","title":"select","parent":"series<gauge>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-series-point-events--select","fullname":"plotOptions.series.point.events.select","title":"select","parent":"plotOptions-series-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<columnrange>-point-events--select","fullname":"series<columnrange>.point.events.select","title":"select","parent":"series<columnrange>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<pyramid>-point-events--select","fullname":"series<pyramid>.point.events.select","title":"select","parent":"series<pyramid>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-pie-point-events--select","fullname":"plotOptions.pie.point.events.select","title":"select","parent":"plotOptions-pie-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-heatmap-point-events--select","fullname":"plotOptions.heatmap.point.events.select","title":"select","parent":"plotOptions-heatmap-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-line-marker-states-select","fullname":"plotOptions.line.marker.states.select","title":"select","parent":"plotOptions-line-marker-states","isParent":true,"description":"The appearance of the point marker when selected. In order to allow a point to be \n\t\tselected, set the <code>series.allowPointSelect</code> option to true."},{"name":"series<spline>-data-events--select","fullname":"series<spline>.data.events.select","title":"select","parent":"series<spline>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<column>-point-events--select","fullname":"series<column>.point.events.select","title":"select","parent":"series<column>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-area-marker-states-select","fullname":"plotOptions.area.marker.states.select","title":"select","parent":"plotOptions-area-marker-states","isParent":true,"description":"The appearance of the point marker when selected. In order to allow a point to be \n\t\tselected, set the <code>series.allowPointSelect</code> option to true."},{"name":"series<gauge>-data-events--select","fullname":"series<gauge>.data.events.select","title":"select","parent":"series<gauge>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<funnel>-point-events--select","fullname":"series<funnel>.point.events.select","title":"select","parent":"series<funnel>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-polygon-point-events--select","fullname":"plotOptions.polygon.point.events.select","title":"select","parent":"plotOptions-polygon-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-pyramid-point-events--select","fullname":"plotOptions.pyramid.point.events.select","title":"select","parent":"plotOptions-pyramid-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-polygon-marker-states-select","fullname":"plotOptions.polygon.marker.states.select","title":"select","parent":"plotOptions-polygon-marker-states","isParent":true,"description":"The appearance of the point marker when selected. In order to allow a point to be \n\t\tselected, set the <code>series.allowPointSelect</code> option to true."},{"name":"series<errorbar>-point-events--select","fullname":"series<errorbar>.point.events.select","title":"select","parent":"series<errorbar>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<areasplinerange>-point-events--select","fullname":"series<areasplinerange>.point.events.select","title":"select","parent":"series<areasplinerange>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<bar>-data-events--select","fullname":"series<bar>.data.events.select","title":"select","parent":"series<bar>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-funnel-point-events--select","fullname":"plotOptions.funnel.point.events.select","title":"select","parent":"plotOptions-funnel-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<polygon>-marker-states-select","fullname":"series<polygon>.marker.states.select","title":"select","parent":"series<polygon>-marker-states","isParent":true,"description":"The appearance of the point marker when selected. In order to allow a point to be \n\t\tselected, set the <code>series.allowPointSelect</code> option to true."},{"name":"series<columnrange>-data-events--select","fullname":"series<columnrange>.data.events.select","title":"select","parent":"series<columnrange>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<treemap>-point-events--select","fullname":"series<treemap>.point.events.select","title":"select","parent":"series<treemap>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<arearange>-point-events--select","fullname":"series<arearange>.point.events.select","title":"select","parent":"series<arearange>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<pie>-point-events--select","fullname":"series<pie>.point.events.select","title":"select","parent":"series<pie>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"plotOptions-treemap-point-events--select","fullname":"plotOptions.treemap.point.events.select","title":"select","parent":"plotOptions-treemap-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<solidgauge>-point-events--select","fullname":"series<solidgauge>.point.events.select","title":"select","parent":"series<solidgauge>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<treemap>-data-events--select","fullname":"series<treemap>.data.events.select","title":"select","parent":"series<treemap>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is selected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-select/\" target=\"_blank\">Report the last selected point</a>","deprecated":false},{"name":"series<arearange>--selected","fullname":"series<arearange>.selected","title":"selected","parent":"series<arearange>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<line>--selected","fullname":"series<line>.selected","title":"selected","parent":"series<line>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<areasplinerange>--selected","fullname":"series<areasplinerange>.selected","title":"selected","parent":"series<areasplinerange>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<polygon>-data--selected","fullname":"series<polygon>.data.selected","title":"selected","parent":"series<polygon>-data","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether the data point is selected initially."},{"name":"series<bar>-data--selected","fullname":"series<bar>.data.selected","title":"selected","parent":"series<bar>-data","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether the data point is selected initially."},{"name":"series<areasplinerange>-data--selected","fullname":"series<areasplinerange>.data.selected","title":"selected","parent":"series<areasplinerange>-data","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether the data point is selected initially."},{"name":"series<funnel>--selected","fullname":"series<funnel>.selected","title":"selected","parent":"series<funnel>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"plotOptions-polygon--selected","fullname":"plotOptions.polygon.selected","title":"selected","parent":"plotOptions-polygon","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<areaspline>-data--selected","fullname":"series<areaspline>.data.selected","title":"selected","parent":"series<areaspline>-data","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether the data point is selected initially."},{"name":"series<errorbar>--selected","fullname":"series<errorbar>.selected","title":"selected","parent":"series<errorbar>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"plotOptions-waterfall--selected","fullname":"plotOptions.waterfall.selected","title":"selected","parent":"plotOptions-waterfall","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<gauge>--selected","fullname":"series<gauge>.selected","title":"selected","parent":"series<gauge>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<scatter>--selected","fullname":"series<scatter>.selected","title":"selected","parent":"series<scatter>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<area>-data--selected","fullname":"series<area>.data.selected","title":"selected","parent":"series<area>-data","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether the data point is selected initially."},{"name":"series<spline>--selected","fullname":"series<spline>.selected","title":"selected","parent":"series<spline>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<errorbar>-data--selected","fullname":"series<errorbar>.data.selected","title":"selected","parent":"series<errorbar>-data","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether the data point is selected initially."},{"name":"plotOptions-columnrange--selected","fullname":"plotOptions.columnrange.selected","title":"selected","parent":"plotOptions-columnrange","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<bubble>-data--selected","fullname":"series<bubble>.data.selected","title":"selected","parent":"series<bubble>-data","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether the data point is selected initially."},{"name":"series<waterfall>--selected","fullname":"series<waterfall>.selected","title":"selected","parent":"series<waterfall>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<arearange>-data--selected","fullname":"series<arearange>.data.selected","title":"selected","parent":"series<arearange>-data","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether the data point is selected initially."},{"name":"plotOptions-line--selected","fullname":"plotOptions.line.selected","title":"selected","parent":"plotOptions-line","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<boxplot>--selected","fullname":"series<boxplot>.selected","title":"selected","parent":"series<boxplot>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<column>--selected","fullname":"series<column>.selected","title":"selected","parent":"series<column>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<pyramid>-data--selected","fullname":"series<pyramid>.data.selected","title":"selected","parent":"series<pyramid>-data","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether the data point is selected initially."},{"name":"plotOptions-bubble--selected","fullname":"plotOptions.bubble.selected","title":"selected","parent":"plotOptions-bubble","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"plotOptions-gauge--selected","fullname":"plotOptions.gauge.selected","title":"selected","parent":"plotOptions-gauge","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<areaspline>--selected","fullname":"series<areaspline>.selected","title":"selected","parent":"series<areaspline>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<heatmap>-data--selected","fullname":"series<heatmap>.data.selected","title":"selected","parent":"series<heatmap>-data","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether the data point is selected initially."},{"name":"plotOptions-boxplot--selected","fullname":"plotOptions.boxplot.selected","title":"selected","parent":"plotOptions-boxplot","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<pie>--selected","fullname":"series<pie>.selected","title":"selected","parent":"series<pie>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<columnrange>-data--selected","fullname":"series<columnrange>.data.selected","title":"selected","parent":"series<columnrange>-data","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether the data point is selected initially."},{"name":"series<column>-data--selected","fullname":"series<column>.data.selected","title":"selected","parent":"series<column>-data","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether the data point is selected initially."},{"name":"series<treemap>--selected","fullname":"series<treemap>.selected","title":"selected","parent":"series<treemap>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"plotOptions-heatmap--selected","fullname":"plotOptions.heatmap.selected","title":"selected","parent":"plotOptions-heatmap","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<solidgauge>-data--selected","fullname":"series<solidgauge>.data.selected","title":"selected","parent":"series<solidgauge>-data","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether the data point is selected initially."},{"name":"series<area>--selected","fullname":"series<area>.selected","title":"selected","parent":"series<area>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<solidgauge>--selected","fullname":"series<solidgauge>.selected","title":"selected","parent":"series<solidgauge>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<bar>--selected","fullname":"series<bar>.selected","title":"selected","parent":"series<bar>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"plotOptions-column--selected","fullname":"plotOptions.column.selected","title":"selected","parent":"plotOptions-column","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<columnrange>--selected","fullname":"series<columnrange>.selected","title":"selected","parent":"series<columnrange>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<pie>-data--selected","fullname":"series<pie>.data.selected","title":"selected","parent":"series<pie>-data","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether the data point is selected initially."},{"name":"plotOptions-solidgauge--selected","fullname":"plotOptions.solidgauge.selected","title":"selected","parent":"plotOptions-solidgauge","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"plotOptions-errorbar--selected","fullname":"plotOptions.errorbar.selected","title":"selected","parent":"plotOptions-errorbar","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<heatmap>--selected","fullname":"series<heatmap>.selected","title":"selected","parent":"series<heatmap>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"plotOptions-treemap--selected","fullname":"plotOptions.treemap.selected","title":"selected","parent":"plotOptions-treemap","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<gauge>-data--selected","fullname":"series<gauge>.data.selected","title":"selected","parent":"series<gauge>-data","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether the data point is selected initially."},{"name":"series<scatter>-data--selected","fullname":"series<scatter>.data.selected","title":"selected","parent":"series<scatter>-data","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether the data point is selected initially."},{"name":"plotOptions-series--selected","fullname":"plotOptions.series.selected","title":"selected","parent":"plotOptions-series","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<pyramid>--selected","fullname":"series<pyramid>.selected","title":"selected","parent":"series<pyramid>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<waterfall>-data--selected","fullname":"series<waterfall>.data.selected","title":"selected","parent":"series<waterfall>-data","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether the data point is selected initially."},{"name":"plotOptions-areasplinerange--selected","fullname":"plotOptions.areasplinerange.selected","title":"selected","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"plotOptions-pyramid--selected","fullname":"plotOptions.pyramid.selected","title":"selected","parent":"plotOptions-pyramid","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"plotOptions-spline--selected","fullname":"plotOptions.spline.selected","title":"selected","parent":"plotOptions-spline","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<spline>-data--selected","fullname":"series<spline>.data.selected","title":"selected","parent":"series<spline>-data","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether the data point is selected initially."},{"name":"plotOptions-funnel--selected","fullname":"plotOptions.funnel.selected","title":"selected","parent":"plotOptions-funnel","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"plotOptions-scatter--selected","fullname":"plotOptions.scatter.selected","title":"selected","parent":"plotOptions-scatter","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"plotOptions-arearange--selected","fullname":"plotOptions.arearange.selected","title":"selected","parent":"plotOptions-arearange","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"plotOptions-pie--selected","fullname":"plotOptions.pie.selected","title":"selected","parent":"plotOptions-pie","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<bubble>--selected","fullname":"series<bubble>.selected","title":"selected","parent":"series<bubble>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"plotOptions-bar--selected","fullname":"plotOptions.bar.selected","title":"selected","parent":"plotOptions-bar","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<boxplot>-data--selected","fullname":"series<boxplot>.data.selected","title":"selected","parent":"series<boxplot>-data","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether the data point is selected initially."},{"name":"series<treemap>-data--selected","fullname":"series<treemap>.data.selected","title":"selected","parent":"series<treemap>-data","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether the data point is selected initially."},{"name":"series<funnel>-data--selected","fullname":"series<funnel>.data.selected","title":"selected","parent":"series<funnel>-data","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether the data point is selected initially."},{"name":"series<polygon>--selected","fullname":"series<polygon>.selected","title":"selected","parent":"series<polygon>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"plotOptions-areaspline--selected","fullname":"plotOptions.areaspline.selected","title":"selected","parent":"plotOptions-areaspline","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"series<line>-data--selected","fullname":"series<line>.data.selected","title":"selected","parent":"series<line>-data","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether the data point is selected initially."},{"name":"plotOptions-area--selected","fullname":"plotOptions.area.selected","title":"selected","parent":"plotOptions-area","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to select the series initially. If <code>showCheckbox</code> is true, the checkbox next to the series name will be checked for a selected series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-selected/\" target=\"_blank\">One out of two series selected</a>"},{"name":"chart-events--selection","fullname":"chart.events.selection","title":"selection","parent":"chart-events","isParent":false,"returnType":"Function","description":"<p>Fires when an area of the chart has been selected. Selection is enabled by setting the chart's zoomType. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on  which library is used as the base for Highcharts. The default action for the  selection event is to zoom the  chart to the selected area. It can be prevented by calling  <code>event.preventDefault()</code>.</p> <p>Information on the selected area can be found through <code>event.xAxis</code> and  <code>event.yAxis</code>, which are arrays containing the axes of each dimension and each axis' min and max values. The primary axes are <code>event.xAxis[0]</code> and <code>event.yAxis[0]</code>. Remember the unit of a datetime axis is milliseconds since 1970-01-01 00:00:00.</p> \r\n<pre>selection: function(event) {\r\n\t// log the min and max of the primary, datetime x-axis\r\n\tconsole.log(\r\n\t\tHighcharts.dateFormat('%Y-%m-%d %H:%M:%S', event.xAxis[0].min),\r\n\t\tHighcharts.dateFormat('%Y-%m-%d %H:%M:%S', event.xAxis[0].max)\r\n\t);\r\n\t// log the min and max of the y axis\r\n\tconsole.log(event.yAxis[0].min, event.yAxis[0].max);\r\n}</pre>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/events-selection/\" target=\"_blank\">Report on selection and reset</a>","deprecated":false},{"name":"chart--selectionMarkerFill","fullname":"chart.selectionMarkerFill","title":"selectionMarkerFill","parent":"chart","isParent":false,"returnType":"Color","defaults":"rgba(69,114,167,0.25)","since":"2.1.7","description":"The background color of the marker square when selecting (zooming in on) an area of the chart.","deprecated":false},{"name":"plotOptions-series","fullname":"plotOptions.series","title":"series","parent":"plotOptions","isParent":true,"description":"<p>General options for all series types.</p>"},{"name":"drilldown--series","fullname":"drilldown.series","title":"series","parent":"drilldown","isParent":false,"returnType":"Array<Object>","since":"3.0.8","description":"An array of series configurations for the drill down. Each series configuration uses the same syntax as the <a href=\"#series\">series</a> option set. These drilldown series are hidden by default. The drilldown series is linked to the parent series' point by its <code>id</code>.","deprecated":false},{"name":"series","fullname":"series","title":"series","isParent":true,"returnType":"Array<Object>","since":"","description":"The actual series to append to the chart. In addition to \r\n\tthe members listed below, any member of the <code>plotOptions</code> for that specific\r\n\ttype of plot can be added to a series individually. For example, even though a general\r\n\t<code>lineWidth</code> is specified in <code>plotOptions.series</code>, an individual\r\n\t<code>lineWidth</code> can be specified for each series.","demo":"","deprecated":false},{"name":"series<area>","fullname":"series<area>","title":"series<area>","isParent":true,"returnType":"Array<Object>","since":"","description":"<p>A <code>area</code> series. If the <a href=\"#series<area>.type\">type</a> option is not specified, it is inherited from <a href=\"#chart.type\">chart.type</a>.</p>\r\n\r\n<p>For options that apply to multiple series, it is recommended to add them to the <a href=\"#pointOptions.series\">pointOptions.series</a> options structure. To apply to all series of this specific type, apply it to <a href=\"#plotOptions.area\">plotOptions.area</a>.</p>","demo":"","deprecated":false},{"name":"series<arearange>","fullname":"series<arearange>","title":"series<arearange>","isParent":true,"returnType":"Array<Object>","since":"","description":"<p>A <code>arearange</code> series. If the <a href=\"#series<arearange>.type\">type</a> option is not specified, it is inherited from <a href=\"#chart.type\">chart.type</a>.</p>\r\n\r\n<p>For options that apply to multiple series, it is recommended to add them to the <a href=\"#pointOptions.series\">pointOptions.series</a> options structure. To apply to all series of this specific type, apply it to <a href=\"#plotOptions.arearange\">plotOptions.arearange</a>.</p>","demo":"","deprecated":false},{"name":"series<areaspline>","fullname":"series<areaspline>","title":"series<areaspline>","isParent":true,"returnType":"Array<Object>","since":"","description":"<p>A <code>areaspline</code> series. If the <a href=\"#series<areaspline>.type\">type</a> option is not specified, it is inherited from <a href=\"#chart.type\">chart.type</a>.</p>\r\n\r\n<p>For options that apply to multiple series, it is recommended to add them to the <a href=\"#pointOptions.series\">pointOptions.series</a> options structure. To apply to all series of this specific type, apply it to <a href=\"#plotOptions.areaspline\">plotOptions.areaspline</a>.</p>","demo":"","deprecated":false},{"name":"series<areasplinerange>","fullname":"series<areasplinerange>","title":"series<areasplinerange>","isParent":true,"returnType":"Array<Object>","since":"","description":"<p>A <code>areasplinerange</code> series. If the <a href=\"#series<areasplinerange>.type\">type</a> option is not specified, it is inherited from <a href=\"#chart.type\">chart.type</a>.</p>\r\n\r\n<p>For options that apply to multiple series, it is recommended to add them to the <a href=\"#pointOptions.series\">pointOptions.series</a> options structure. To apply to all series of this specific type, apply it to <a href=\"#plotOptions.areasplinerange\">plotOptions.areasplinerange</a>.</p>","demo":"","deprecated":false},{"name":"series<bar>","fullname":"series<bar>","title":"series<bar>","isParent":true,"returnType":"Array<Object>","since":"","description":"<p>A <code>bar</code> series. If the <a href=\"#series<bar>.type\">type</a> option is not specified, it is inherited from <a href=\"#chart.type\">chart.type</a>.</p>\r\n\r\n<p>For options that apply to multiple series, it is recommended to add them to the <a href=\"#pointOptions.series\">pointOptions.series</a> options structure. To apply to all series of this specific type, apply it to <a href=\"#plotOptions.bar\">plotOptions.bar</a>.</p>","demo":"","deprecated":false},{"name":"series<boxplot>","fullname":"series<boxplot>","title":"series<boxplot>","isParent":true,"returnType":"Array<Object>","since":"","description":"<p>A <code>boxplot</code> series. If the <a href=\"#series<boxplot>.type\">type</a> option is not specified, it is inherited from <a href=\"#chart.type\">chart.type</a>.</p>\r\n\r\n<p>For options that apply to multiple series, it is recommended to add them to the <a href=\"#pointOptions.series\">pointOptions.series</a> options structure. To apply to all series of this specific type, apply it to <a href=\"#plotOptions.boxplot\">plotOptions.boxplot</a>.</p>","demo":"","deprecated":false},{"name":"series<bubble>","fullname":"series<bubble>","title":"series<bubble>","isParent":true,"returnType":"Array<Object>","since":"","description":"<p>A <code>bubble</code> series. If the <a href=\"#series<bubble>.type\">type</a> option is not specified, it is inherited from <a href=\"#chart.type\">chart.type</a>.</p>\r\n\r\n<p>For options that apply to multiple series, it is recommended to add them to the <a href=\"#pointOptions.series\">pointOptions.series</a> options structure. To apply to all series of this specific type, apply it to <a href=\"#plotOptions.bubble\">plotOptions.bubble</a>.</p>","demo":"","deprecated":false},{"name":"series<column>","fullname":"series<column>","title":"series<column>","isParent":true,"returnType":"Array<Object>","since":"","description":"<p>A <code>column</code> series. If the <a href=\"#series<column>.type\">type</a> option is not specified, it is inherited from <a href=\"#chart.type\">chart.type</a>.</p>\r\n\r\n<p>For options that apply to multiple series, it is recommended to add them to the <a href=\"#pointOptions.series\">pointOptions.series</a> options structure. To apply to all series of this specific type, apply it to <a href=\"#plotOptions.column\">plotOptions.column</a>.</p>","demo":"","deprecated":false},{"name":"series<columnrange>","fullname":"series<columnrange>","title":"series<columnrange>","isParent":true,"returnType":"Array<Object>","since":"","description":"<p>A <code>columnrange</code> series. If the <a href=\"#series<columnrange>.type\">type</a> option is not specified, it is inherited from <a href=\"#chart.type\">chart.type</a>.</p>\r\n\r\n<p>For options that apply to multiple series, it is recommended to add them to the <a href=\"#pointOptions.series\">pointOptions.series</a> options structure. To apply to all series of this specific type, apply it to <a href=\"#plotOptions.columnrange\">plotOptions.columnrange</a>.</p>","demo":"","deprecated":false},{"name":"series<errorbar>","fullname":"series<errorbar>","title":"series<errorbar>","isParent":true,"returnType":"Array<Object>","since":"","description":"<p>A <code>errorbar</code> series. If the <a href=\"#series<errorbar>.type\">type</a> option is not specified, it is inherited from <a href=\"#chart.type\">chart.type</a>.</p>\r\n\r\n<p>For options that apply to multiple series, it is recommended to add them to the <a href=\"#pointOptions.series\">pointOptions.series</a> options structure. To apply to all series of this specific type, apply it to <a href=\"#plotOptions.errorbar\">plotOptions.errorbar</a>.</p>","demo":"","deprecated":false},{"name":"series<funnel>","fullname":"series<funnel>","title":"series<funnel>","isParent":true,"returnType":"Array<Object>","since":"","description":"<p>A <code>funnel</code> series. If the <a href=\"#series<funnel>.type\">type</a> option is not specified, it is inherited from <a href=\"#chart.type\">chart.type</a>.</p>\r\n\r\n<p>For options that apply to multiple series, it is recommended to add them to the <a href=\"#pointOptions.series\">pointOptions.series</a> options structure. To apply to all series of this specific type, apply it to <a href=\"#plotOptions.funnel\">plotOptions.funnel</a>.</p>","demo":"","deprecated":false},{"name":"series<gauge>","fullname":"series<gauge>","title":"series<gauge>","isParent":true,"returnType":"Array<Object>","since":"","description":"<p>A <code>gauge</code> series. If the <a href=\"#series<gauge>.type\">type</a> option is not specified, it is inherited from <a href=\"#chart.type\">chart.type</a>.</p>\r\n\r\n<p>For options that apply to multiple series, it is recommended to add them to the <a href=\"#pointOptions.series\">pointOptions.series</a> options structure. To apply to all series of this specific type, apply it to <a href=\"#plotOptions.gauge\">plotOptions.gauge</a>.</p>","demo":"","deprecated":false},{"name":"series<heatmap>","fullname":"series<heatmap>","title":"series<heatmap>","isParent":true,"returnType":"Array<Object>","since":"","description":"<p>A <code>heatmap</code> series. If the <a href=\"#series<heatmap>.type\">type</a> option is not specified, it is inherited from <a href=\"#chart.type\">chart.type</a>.</p>\r\n\r\n<p>For options that apply to multiple series, it is recommended to add them to the <a href=\"#pointOptions.series\">pointOptions.series</a> options structure. To apply to all series of this specific type, apply it to <a href=\"#plotOptions.heatmap\">plotOptions.heatmap</a>.</p>","demo":"","deprecated":false},{"name":"series<line>","fullname":"series<line>","title":"series<line>","isParent":true,"returnType":"Array<Object>","since":"","description":"<p>A <code>line</code> series. If the <a href=\"#series<line>.type\">type</a> option is not specified, it is inherited from <a href=\"#chart.type\">chart.type</a>.</p>\r\n\r\n<p>For options that apply to multiple series, it is recommended to add them to the <a href=\"#pointOptions.series\">pointOptions.series</a> options structure. To apply to all series of this specific type, apply it to <a href=\"#plotOptions.line\">plotOptions.line</a>.</p>","demo":"","deprecated":false},{"name":"series<pie>","fullname":"series<pie>","title":"series<pie>","isParent":true,"returnType":"Array<Object>","since":"","description":"<p>A <code>pie</code> series. If the <a href=\"#series<pie>.type\">type</a> option is not specified, it is inherited from <a href=\"#chart.type\">chart.type</a>.</p>\r\n\r\n<p>For options that apply to multiple series, it is recommended to add them to the <a href=\"#pointOptions.series\">pointOptions.series</a> options structure. To apply to all series of this specific type, apply it to <a href=\"#plotOptions.pie\">plotOptions.pie</a>.</p>","demo":"","deprecated":false},{"name":"series<polygon>","fullname":"series<polygon>","title":"series<polygon>","isParent":true,"returnType":"Array<Object>","since":"","description":"<p>A <code>polygon</code> series. If the <a href=\"#series<polygon>.type\">type</a> option is not specified, it is inherited from <a href=\"#chart.type\">chart.type</a>.</p>\r\n\r\n<p>For options that apply to multiple series, it is recommended to add them to the <a href=\"#pointOptions.series\">pointOptions.series</a> options structure. To apply to all series of this specific type, apply it to <a href=\"#plotOptions.polygon\">plotOptions.polygon</a>.</p>","demo":"","deprecated":false},{"name":"series<pyramid>","fullname":"series<pyramid>","title":"series<pyramid>","isParent":true,"returnType":"Array<Object>","since":"","description":"<p>A <code>pyramid</code> series. If the <a href=\"#series<pyramid>.type\">type</a> option is not specified, it is inherited from <a href=\"#chart.type\">chart.type</a>.</p>\r\n\r\n<p>For options that apply to multiple series, it is recommended to add them to the <a href=\"#pointOptions.series\">pointOptions.series</a> options structure. To apply to all series of this specific type, apply it to <a href=\"#plotOptions.pyramid\">plotOptions.pyramid</a>.</p>","demo":"","deprecated":false},{"name":"series<scatter>","fullname":"series<scatter>","title":"series<scatter>","isParent":true,"returnType":"Array<Object>","since":"","description":"<p>A <code>scatter</code> series. If the <a href=\"#series<scatter>.type\">type</a> option is not specified, it is inherited from <a href=\"#chart.type\">chart.type</a>.</p>\r\n\r\n<p>For options that apply to multiple series, it is recommended to add them to the <a href=\"#pointOptions.series\">pointOptions.series</a> options structure. To apply to all series of this specific type, apply it to <a href=\"#plotOptions.scatter\">plotOptions.scatter</a>.</p>","demo":"","deprecated":false},{"name":"series<solidgauge>","fullname":"series<solidgauge>","title":"series<solidgauge>","isParent":true,"returnType":"Array<Object>","since":"","description":"<p>A <code>solidgauge</code> series. If the <a href=\"#series<solidgauge>.type\">type</a> option is not specified, it is inherited from <a href=\"#chart.type\">chart.type</a>.</p>\r\n\r\n<p>For options that apply to multiple series, it is recommended to add them to the <a href=\"#pointOptions.series\">pointOptions.series</a> options structure. To apply to all series of this specific type, apply it to <a href=\"#plotOptions.solidgauge\">plotOptions.solidgauge</a>.</p>","demo":"","deprecated":false},{"name":"series<spline>","fullname":"series<spline>","title":"series<spline>","isParent":true,"returnType":"Array<Object>","since":"","description":"<p>A <code>spline</code> series. If the <a href=\"#series<spline>.type\">type</a> option is not specified, it is inherited from <a href=\"#chart.type\">chart.type</a>.</p>\r\n\r\n<p>For options that apply to multiple series, it is recommended to add them to the <a href=\"#pointOptions.series\">pointOptions.series</a> options structure. To apply to all series of this specific type, apply it to <a href=\"#plotOptions.spline\">plotOptions.spline</a>.</p>","demo":"","deprecated":false},{"name":"series<treemap>","fullname":"series<treemap>","title":"series<treemap>","isParent":true,"returnType":"Array<Object>","since":"","description":"<p>A <code>treemap</code> series. If the <a href=\"#series<treemap>.type\">type</a> option is not specified, it is inherited from <a href=\"#chart.type\">chart.type</a>.</p>\r\n\r\n<p>For options that apply to multiple series, it is recommended to add them to the <a href=\"#pointOptions.series\">pointOptions.series</a> options structure. To apply to all series of this specific type, apply it to <a href=\"#plotOptions.treemap\">plotOptions.treemap</a>.</p>","demo":"","deprecated":false},{"name":"series<waterfall>","fullname":"series<waterfall>","title":"series<waterfall>","isParent":true,"returnType":"Array<Object>","since":"","description":"<p>A <code>waterfall</code> series. If the <a href=\"#series<waterfall>.type\">type</a> option is not specified, it is inherited from <a href=\"#chart.type\">chart.type</a>.</p>\r\n\r\n<p>For options that apply to multiple series, it is recommended to add them to the <a href=\"#pointOptions.series\">pointOptions.series</a> options structure. To apply to all series of this specific type, apply it to <a href=\"#plotOptions.waterfall\">plotOptions.waterfall</a>.</p>","demo":"","deprecated":false},{"name":"data--seriesMapping","fullname":"data.seriesMapping","title":"seriesMapping","parent":"data","isParent":false,"returnType":"Array<Object>","since":"4.0.4","description":"An array containing object with Point property names along with what column id the property should be taken from.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/data/seriesmapping-label/\" target=\"_blank\">Label from data set</a>","deprecated":false},{"name":"xAxis-events--setExtremes","fullname":"xAxis.events.setExtremes","title":"setExtremes","parent":"xAxis-events","isParent":false,"returnType":"Function","context":"Axis","since":"1.2.0","description":"<p>Fires when the minimum and maximum is set for the axis, either by calling the <code>.setExtremes()</code> method or by selecting an area in the chart. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on which library is used as the base for Highcharts.</p>\r\n\r\n<p>The new user set minimum and maximum values can be found by <code>event.min</code> and <code>event.max</code>. When an axis is zoomed all the way out from the \"Reset zoom\" button, <code>event.min</code> and <code>event.max</code> are null, and the new extremes are set based on <code>this.dataMin</code> and <code>this.dataMax</code>.</p>","deprecated":false},{"name":"yAxis-events--setExtremes","fullname":"yAxis.events.setExtremes","title":"setExtremes","parent":"yAxis-events","isParent":false,"returnType":"Function","context":"Axis","since":"1.2.0","description":"<p>Fires when the minimum and maximum is set for the axis, either by calling the <code>.setExtremes()</code> method or by selecting an area in the chart. One parameter, <code>event</code>, is passed to the function. This contains common event information based on jQuery or MooTools depending on which library is used as the base for Highcharts.</p>\r\n\r\n<p>The new user set minimum and maximum values can be found by <code>event.min</code> and <code>event.max</code>. When an axis is zoomed all the way out from the \"Reset zoom\" button, <code>event.min</code> and <code>event.max</code> are null, and the new extremes are set based on <code>this.dataMin</code> and <code>this.dataMax</code>.</p>","deprecated":false},{"name":"series<waterfall>--shadow","fullname":"series<waterfall>.shadow","title":"shadow","parent":"series<waterfall>","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-dataLabels--shadow","fullname":"plotOptions.pyramid.dataLabels.shadow","title":"shadow","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"series<column>-dataLabels--shadow","fullname":"series<column>.dataLabels.shadow","title":"shadow","parent":"series<column>-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-dataLabels--shadow","fullname":"plotOptions.polygon.dataLabels.shadow","title":"shadow","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall-dataLabels--shadow","fullname":"plotOptions.waterfall.dataLabels.shadow","title":"shadow","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"series<funnel>-dataLabels--shadow","fullname":"series<funnel>.dataLabels.shadow","title":"shadow","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange--shadow","fullname":"plotOptions.arearange.shadow","title":"shadow","parent":"plotOptions-arearange","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<line>-dataLabels--shadow","fullname":"series<line>.dataLabels.shadow","title":"shadow","parent":"series<line>-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-column-dataLabels--shadow","fullname":"plotOptions.column.dataLabels.shadow","title":"shadow","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-spline--shadow","fullname":"plotOptions.spline.shadow","title":"shadow","parent":"plotOptions-spline","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-column--shadow","fullname":"plotOptions.column.shadow","title":"shadow","parent":"plotOptions-column","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-solidgauge-dataLabels--shadow","fullname":"plotOptions.solidgauge.dataLabels.shadow","title":"shadow","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange-dataLabels--shadow","fullname":"plotOptions.arearange.dataLabels.shadow","title":"shadow","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"series<pie>-dataLabels--shadow","fullname":"series<pie>.dataLabels.shadow","title":"shadow","parent":"series<pie>-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange--shadow","fullname":"plotOptions.columnrange.shadow","title":"shadow","parent":"plotOptions-columnrange","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap--shadow","fullname":"plotOptions.treemap.shadow","title":"shadow","parent":"plotOptions-treemap","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"series<waterfall>-dataLabels--shadow","fullname":"series<waterfall>.dataLabels.shadow","title":"shadow","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid--shadow","fullname":"plotOptions.pyramid.shadow","title":"shadow","parent":"plotOptions-pyramid","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-line--shadow","fullname":"plotOptions.line.shadow","title":"shadow","parent":"plotOptions-line","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"series<pyramid>-dataLabels--shadow","fullname":"series<pyramid>.dataLabels.shadow","title":"shadow","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>--shadow","fullname":"series<areasplinerange>.shadow","title":"shadow","parent":"series<areasplinerange>","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel--shadow","fullname":"plotOptions.funnel.shadow","title":"shadow","parent":"plotOptions-funnel","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"series<pyramid>--shadow","fullname":"series<pyramid>.shadow","title":"shadow","parent":"series<pyramid>","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"series<gauge>-dataLabels--shadow","fullname":"series<gauge>.dataLabels.shadow","title":"shadow","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter-dataLabels--shadow","fullname":"plotOptions.scatter.dataLabels.shadow","title":"shadow","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"series<treemap>--shadow","fullname":"series<treemap>.shadow","title":"shadow","parent":"series<treemap>","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-bar-dataLabels--shadow","fullname":"plotOptions.bar.dataLabels.shadow","title":"shadow","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"series<polygon>--shadow","fullname":"series<polygon>.shadow","title":"shadow","parent":"series<polygon>","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap-dataLabels--shadow","fullname":"plotOptions.heatmap.dataLabels.shadow","title":"shadow","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble-dataLabels--shadow","fullname":"plotOptions.bubble.dataLabels.shadow","title":"shadow","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange--shadow","fullname":"plotOptions.areasplinerange.shadow","title":"shadow","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<arearange>--shadow","fullname":"series<arearange>.shadow","title":"shadow","parent":"series<arearange>","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-area--shadow","fullname":"plotOptions.area.shadow","title":"shadow","parent":"plotOptions-area","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-pie-dataLabels--shadow","fullname":"plotOptions.pie.dataLabels.shadow","title":"shadow","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"legend--shadow","fullname":"legend.shadow","title":"shadow","parent":"legend","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the legend. A <code>backgroundColor</code>\r also needs to be applied for this to take effect. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/shadow/\" target=\"_blank\">White background and drop shadow</a>","seeAlso":"","deprecated":false},{"name":"series<areaspline>--shadow","fullname":"series<areaspline>.shadow","title":"shadow","parent":"series<areaspline>","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap--shadow","fullname":"plotOptions.heatmap.shadow","title":"shadow","parent":"plotOptions-heatmap","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels--shadow","fullname":"plotOptions.areasplinerange.dataLabels.shadow","title":"shadow","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-dataLabels--shadow","fullname":"series<areasplinerange>.dataLabels.shadow","title":"shadow","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"tooltip--shadow","fullname":"tooltip.shadow","title":"shadow","parent":"tooltip","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to apply a drop shadow to the tooltip.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/bordercolor-default/\" target=\"_blank\">True by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/shadow/\" target=\"_blank\">false</a>"},{"name":"plotOptions-pie--shadow","fullname":"plotOptions.pie.shadow","title":"shadow","parent":"plotOptions-pie","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"series<bubble>--shadow","fullname":"series<bubble>.shadow","title":"shadow","parent":"series<bubble>","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel-dataLabels--shadow","fullname":"plotOptions.funnel.dataLabels.shadow","title":"shadow","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"series<line>--shadow","fullname":"series<line>.shadow","title":"shadow","parent":"series<line>","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"series<heatmap>-dataLabels--shadow","fullname":"series<heatmap>.dataLabels.shadow","title":"shadow","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-series-dataLabels--shadow","fullname":"plotOptions.series.dataLabels.shadow","title":"shadow","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-bar--shadow","fullname":"plotOptions.bar.shadow","title":"shadow","parent":"plotOptions-bar","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge-dataLabels--shadow","fullname":"plotOptions.gauge.dataLabels.shadow","title":"shadow","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble--shadow","fullname":"plotOptions.bubble.shadow","title":"shadow","parent":"plotOptions-bubble","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"series<bubble>-dataLabels--shadow","fullname":"series<bubble>.dataLabels.shadow","title":"shadow","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline--shadow","fullname":"plotOptions.areaspline.shadow","title":"shadow","parent":"plotOptions-areaspline","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall--shadow","fullname":"plotOptions.waterfall.shadow","title":"shadow","parent":"plotOptions-waterfall","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"series<column>--shadow","fullname":"series<column>.shadow","title":"shadow","parent":"series<column>","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"series<heatmap>--shadow","fullname":"series<heatmap>.shadow","title":"shadow","parent":"series<heatmap>","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"series<pie>--shadow","fullname":"series<pie>.shadow","title":"shadow","parent":"series<pie>","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"series<scatter>-dataLabels--shadow","fullname":"series<scatter>.dataLabels.shadow","title":"shadow","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-dataLabels--shadow","fullname":"plotOptions.areaspline.dataLabels.shadow","title":"shadow","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"series<arearange>-dataLabels--shadow","fullname":"series<arearange>.dataLabels.shadow","title":"shadow","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"series<treemap>-dataLabels--shadow","fullname":"series<treemap>.dataLabels.shadow","title":"shadow","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"series<bar>-dataLabels--shadow","fullname":"series<bar>.dataLabels.shadow","title":"shadow","parent":"series<bar>-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"series<spline>--shadow","fullname":"series<spline>.shadow","title":"shadow","parent":"series<spline>","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"series<area>--shadow","fullname":"series<area>.shadow","title":"shadow","parent":"series<area>","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"series<columnrange>--shadow","fullname":"series<columnrange>.shadow","title":"shadow","parent":"series<columnrange>","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-area-dataLabels--shadow","fullname":"plotOptions.area.dataLabels.shadow","title":"shadow","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"series<solidgauge>-dataLabels--shadow","fullname":"series<solidgauge>.dataLabels.shadow","title":"shadow","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"series<scatter>--shadow","fullname":"series<scatter>.shadow","title":"shadow","parent":"series<scatter>","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"series<polygon>-dataLabels--shadow","fullname":"series<polygon>.dataLabels.shadow","title":"shadow","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-line-dataLabels--shadow","fullname":"plotOptions.line.dataLabels.shadow","title":"shadow","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon--shadow","fullname":"plotOptions.polygon.shadow","title":"shadow","parent":"plotOptions-polygon","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-series--shadow","fullname":"plotOptions.series.shadow","title":"shadow","parent":"plotOptions-series","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-dataLabels--shadow","fullname":"plotOptions.spline.dataLabels.shadow","title":"shadow","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"chart--shadow","fullname":"chart.shadow","title":"shadow","parent":"chart","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the outer chart area. Requires that \r backgroundColor be set. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/shadow/\" target=\"_blank\">Shadow</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter--shadow","fullname":"plotOptions.scatter.shadow","title":"shadow","parent":"plotOptions-scatter","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"series<spline>-dataLabels--shadow","fullname":"series<spline>.dataLabels.shadow","title":"shadow","parent":"series<spline>-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"series<columnrange>-dataLabels--shadow","fullname":"series<columnrange>.dataLabels.shadow","title":"shadow","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"series<areaspline>-dataLabels--shadow","fullname":"series<areaspline>.dataLabels.shadow","title":"shadow","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"series<bar>--shadow","fullname":"series<bar>.shadow","title":"shadow","parent":"series<bar>","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange-dataLabels--shadow","fullname":"plotOptions.columnrange.dataLabels.shadow","title":"shadow","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap-dataLabels--shadow","fullname":"plotOptions.treemap.dataLabels.shadow","title":"shadow","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"series<funnel>--shadow","fullname":"series<funnel>.shadow","title":"shadow","parent":"series<funnel>","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"","description":"Whether to apply a drop shadow to the graph line. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-shadow/\" target=\"_blank\">Shadow enabled</a>","seeAlso":"","deprecated":false},{"name":"series<area>-dataLabels--shadow","fullname":"series<area>.dataLabels.shadow","title":"shadow","parent":"series<area>-dataLabels","isParent":false,"returnType":"Boolean|Object","defaults":"false","since":"2.2.1","description":"The shadow of the box. Works best with <code>borderWidth</code> or <code>backgroundColor</code>. Since 2.3 the shadow can be an object configuration containing <code>color</code>, <code>offsetX</code>, <code>offsetY</code>, <code>opacity</code> and <code>width</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-box/\" target=\"_blank\">Data labels box options</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-tooltip--shape","fullname":"plotOptions.areaspline.tooltip.shape","title":"shape","parent":"plotOptions-areaspline-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-tooltip--shape","fullname":"series<areasplinerange>.tooltip.shape","title":"shape","parent":"series<areasplinerange>-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<treemap>-dataLabels--shape","fullname":"series<treemap>.dataLabels.shape","title":"shape","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"series<area>-dataLabels--shape","fullname":"series<area>.dataLabels.shape","title":"shape","parent":"series<area>-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"series<scatter>-dataLabels--shape","fullname":"series<scatter>.dataLabels.shape","title":"shape","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-column-tooltip--shape","fullname":"plotOptions.column.tooltip.shape","title":"shape","parent":"plotOptions-column-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap-tooltip--shape","fullname":"plotOptions.heatmap.tooltip.shape","title":"shape","parent":"plotOptions-heatmap-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<columnrange>-tooltip--shape","fullname":"series<columnrange>.tooltip.shape","title":"shape","parent":"series<columnrange>-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge-tooltip--shape","fullname":"plotOptions.gauge.tooltip.shape","title":"shape","parent":"plotOptions-gauge-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<area>-tooltip--shape","fullname":"series<area>.tooltip.shape","title":"shape","parent":"series<area>-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-area-dataLabels--shape","fullname":"plotOptions.area.dataLabels.shape","title":"shape","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-pie-dataLabels--shape","fullname":"plotOptions.pie.dataLabels.shape","title":"shape","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-boxplot-tooltip--shape","fullname":"plotOptions.boxplot.tooltip.shape","title":"shape","parent":"plotOptions-boxplot-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-line-tooltip--shape","fullname":"plotOptions.line.tooltip.shape","title":"shape","parent":"plotOptions-line-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<polygon>-dataLabels--shape","fullname":"series<polygon>.dataLabels.shape","title":"shape","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-bubble-tooltip--shape","fullname":"plotOptions.bubble.tooltip.shape","title":"shape","parent":"plotOptions-bubble-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel-tooltip--shape","fullname":"plotOptions.funnel.tooltip.shape","title":"shape","parent":"plotOptions-funnel-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<pie>-dataLabels--shape","fullname":"series<pie>.dataLabels.shape","title":"shape","parent":"series<pie>-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"series<bar>-tooltip--shape","fullname":"series<bar>.tooltip.shape","title":"shape","parent":"series<bar>-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<errorbar>-tooltip--shape","fullname":"series<errorbar>.tooltip.shape","title":"shape","parent":"series<errorbar>-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<solidgauge>-dataLabels--shape","fullname":"series<solidgauge>.dataLabels.shape","title":"shape","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-waterfall-dataLabels--shape","fullname":"plotOptions.waterfall.dataLabels.shape","title":"shape","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-funnel-dataLabels--shape","fullname":"plotOptions.funnel.dataLabels.shape","title":"shape","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-pyramid-dataLabels--shape","fullname":"plotOptions.pyramid.dataLabels.shape","title":"shape","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"series<funnel>-dataLabels--shape","fullname":"series<funnel>.dataLabels.shape","title":"shape","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"series<bar>-dataLabels--shape","fullname":"series<bar>.dataLabels.shape","title":"shape","parent":"series<bar>-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-errorbar-tooltip--shape","fullname":"plotOptions.errorbar.tooltip.shape","title":"shape","parent":"plotOptions-errorbar-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<column>-dataLabels--shape","fullname":"series<column>.dataLabels.shape","title":"shape","parent":"series<column>-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"series<gauge>-dataLabels--shape","fullname":"series<gauge>.dataLabels.shape","title":"shape","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-areasplinerange-tooltip--shape","fullname":"plotOptions.areasplinerange.tooltip.shape","title":"shape","parent":"plotOptions-areasplinerange-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange-tooltip--shape","fullname":"plotOptions.columnrange.tooltip.shape","title":"shape","parent":"plotOptions-columnrange-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<areaspline>-dataLabels--shape","fullname":"series<areaspline>.dataLabels.shape","title":"shape","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-polygon-tooltip--shape","fullname":"plotOptions.polygon.tooltip.shape","title":"shape","parent":"plotOptions-polygon-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap-dataLabels--shape","fullname":"plotOptions.treemap.dataLabels.shape","title":"shape","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-waterfall-tooltip--shape","fullname":"plotOptions.waterfall.tooltip.shape","title":"shape","parent":"plotOptions-waterfall-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>-dataLabels--shape","fullname":"series<spline>.dataLabels.shape","title":"shape","parent":"series<spline>-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-bubble-dataLabels--shape","fullname":"plotOptions.bubble.dataLabels.shape","title":"shape","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"series<arearange>-tooltip--shape","fullname":"series<arearange>.tooltip.shape","title":"shape","parent":"series<arearange>-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<bubble>-tooltip--shape","fullname":"series<bubble>.tooltip.shape","title":"shape","parent":"series<bubble>-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>-tooltip--shape","fullname":"series<spline>.tooltip.shape","title":"shape","parent":"series<spline>-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-tooltip--shape","fullname":"plotOptions.pyramid.tooltip.shape","title":"shape","parent":"plotOptions-pyramid-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-dataLabels--shape","fullname":"plotOptions.polygon.dataLabels.shape","title":"shape","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-columnrange-dataLabels--shape","fullname":"plotOptions.columnrange.dataLabels.shape","title":"shape","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"series<waterfall>-dataLabels--shape","fullname":"series<waterfall>.dataLabels.shape","title":"shape","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-spline-tooltip--shape","fullname":"plotOptions.spline.tooltip.shape","title":"shape","parent":"plotOptions-spline-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-area-tooltip--shape","fullname":"plotOptions.area.tooltip.shape","title":"shape","parent":"plotOptions-area-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-series-tooltip--shape","fullname":"plotOptions.series.tooltip.shape","title":"shape","parent":"plotOptions-series-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<pie>-tooltip--shape","fullname":"series<pie>.tooltip.shape","title":"shape","parent":"series<pie>-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<areaspline>-tooltip--shape","fullname":"series<areaspline>.tooltip.shape","title":"shape","parent":"series<areaspline>-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange-tooltip--shape","fullname":"plotOptions.arearange.tooltip.shape","title":"shape","parent":"plotOptions-arearange-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-dataLabels--shape","fullname":"plotOptions.areaspline.dataLabels.shape","title":"shape","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"series<areasplinerange>-dataLabels--shape","fullname":"series<areasplinerange>.dataLabels.shape","title":"shape","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"series<solidgauge>-tooltip--shape","fullname":"series<solidgauge>.tooltip.shape","title":"shape","parent":"series<solidgauge>-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<columnrange>-dataLabels--shape","fullname":"series<columnrange>.dataLabels.shape","title":"shape","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"series<gauge>-tooltip--shape","fullname":"series<gauge>.tooltip.shape","title":"shape","parent":"series<gauge>-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<bubble>-dataLabels--shape","fullname":"series<bubble>.dataLabels.shape","title":"shape","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"series<line>-dataLabels--shape","fullname":"series<line>.dataLabels.shape","title":"shape","parent":"series<line>-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-solidgauge-tooltip--shape","fullname":"plotOptions.solidgauge.tooltip.shape","title":"shape","parent":"plotOptions-solidgauge-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<line>-tooltip--shape","fullname":"series<line>.tooltip.shape","title":"shape","parent":"series<line>-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-solidgauge-dataLabels--shape","fullname":"plotOptions.solidgauge.dataLabels.shape","title":"shape","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels--shape","fullname":"plotOptions.areasplinerange.dataLabels.shape","title":"shape","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-arearange-dataLabels--shape","fullname":"plotOptions.arearange.dataLabels.shape","title":"shape","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-gauge-dataLabels--shape","fullname":"plotOptions.gauge.dataLabels.shape","title":"shape","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-pie-tooltip--shape","fullname":"plotOptions.pie.tooltip.shape","title":"shape","parent":"plotOptions-pie-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"tooltip--shape","fullname":"tooltip.shape","title":"shape","parent":"tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<scatter>-tooltip--shape","fullname":"series<scatter>.tooltip.shape","title":"shape","parent":"series<scatter>-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<heatmap>-tooltip--shape","fullname":"series<heatmap>.tooltip.shape","title":"shape","parent":"series<heatmap>-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bar-tooltip--shape","fullname":"plotOptions.bar.tooltip.shape","title":"shape","parent":"plotOptions-bar-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column-dataLabels--shape","fullname":"plotOptions.column.dataLabels.shape","title":"shape","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"series<pyramid>-dataLabels--shape","fullname":"series<pyramid>.dataLabels.shape","title":"shape","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-scatter-tooltip--shape","fullname":"plotOptions.scatter.tooltip.shape","title":"shape","parent":"plotOptions-scatter-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<waterfall>-tooltip--shape","fullname":"series<waterfall>.tooltip.shape","title":"shape","parent":"series<waterfall>-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap-dataLabels--shape","fullname":"plotOptions.heatmap.dataLabels.shape","title":"shape","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-spline-dataLabels--shape","fullname":"plotOptions.spline.dataLabels.shape","title":"shape","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"series<heatmap>-dataLabels--shape","fullname":"series<heatmap>.dataLabels.shape","title":"shape","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-bar-dataLabels--shape","fullname":"plotOptions.bar.dataLabels.shape","title":"shape","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-series-dataLabels--shape","fullname":"plotOptions.series.dataLabels.shape","title":"shape","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"series<boxplot>-tooltip--shape","fullname":"series<boxplot>.tooltip.shape","title":"shape","parent":"series<boxplot>-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<treemap>-tooltip--shape","fullname":"series<treemap>.tooltip.shape","title":"shape","parent":"series<treemap>-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<polygon>-tooltip--shape","fullname":"series<polygon>.tooltip.shape","title":"shape","parent":"series<polygon>-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<arearange>-dataLabels--shape","fullname":"series<arearange>.dataLabels.shape","title":"shape","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-treemap-tooltip--shape","fullname":"plotOptions.treemap.tooltip.shape","title":"shape","parent":"plotOptions-treemap-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<column>-tooltip--shape","fullname":"series<column>.tooltip.shape","title":"shape","parent":"series<column>-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter-dataLabels--shape","fullname":"plotOptions.scatter.dataLabels.shape","title":"shape","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"plotOptions-line-dataLabels--shape","fullname":"plotOptions.line.dataLabels.shape","title":"shape","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"String","defaults":"square","since":"4.1.2","description":"The name of a symbol to use for the border around the label. Symbols are predefined functions on the Renderer object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-shape/\" target=\"_blank\">A callout for annotations</a>","deprecated":false},{"name":"series<funnel>-tooltip--shape","fullname":"series<funnel>.tooltip.shape","title":"shape","parent":"series<funnel>-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<pyramid>-tooltip--shape","fullname":"series<pyramid>.tooltip.shape","title":"shape","parent":"series<pyramid>-tooltip","isParent":false,"returnType":"String","defaults":"callout","values":"","since":"4.0","description":"The name of a symbol to use for the border around the tooltip. In Highcharts 3.x and less, the shape was <code>square</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"tooltip--shared","fullname":"tooltip.shared","title":"shared","parent":"tooltip","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.1","description":"When the tooltip is shared, the entire plot area will capture mouse movement or touch events. Tooltip texts for series types with ordered data (not pie, scatter, flags etc) will be shown in a single bubble. This is recommended for single series charts and for tablet/mobile optimized charts.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/shared-false/\" target=\"_blank\">False by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/shared-true/\" target=\"_blank\">true</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/shared-x-crosshair/\" target=\"_blank\">true with x axis crosshair</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/shared-true-mixed-types/\" target=\"_blank\">true with mixed series types</a>.","deprecated":false},{"name":"lang--shortMonths","fullname":"lang.shortMonths","title":"shortMonths","parent":"lang","isParent":false,"returnType":"Array<String>","defaults":"[ \"Jan\" , \"Feb\" , \"Mar\" , \"Apr\" , \"May\" , \"Jun\" , \"Jul\" , \"Aug\" , \"Sep\" , \"Oct\" , \"Nov\" , \"Dec\"]","since":"","description":"An array containing the months names in abbreviated form. Corresponds to the \r <code>%b</code> format in <code>Highcharts.dateFormat()</code>. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-events--show","fullname":"series<areasplinerange>.events.show","title":"show","parent":"series<areasplinerange>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"series<boxplot>-events--show","fullname":"series<boxplot>.events.show","title":"show","parent":"series<boxplot>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"plotOptions-columnrange-events--show","fullname":"plotOptions.columnrange.events.show","title":"show","parent":"plotOptions-columnrange-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"plotOptions-bubble-events--show","fullname":"plotOptions.bubble.events.show","title":"show","parent":"plotOptions-bubble-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"plotOptions-solidgauge-events--show","fullname":"plotOptions.solidgauge.events.show","title":"show","parent":"plotOptions-solidgauge-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"plotOptions-areasplinerange-events--show","fullname":"plotOptions.areasplinerange.events.show","title":"show","parent":"plotOptions-areasplinerange-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"plotOptions-gauge-events--show","fullname":"plotOptions.gauge.events.show","title":"show","parent":"plotOptions-gauge-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"plotOptions-area-events--show","fullname":"plotOptions.area.events.show","title":"show","parent":"plotOptions-area-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"series<bar>-events--show","fullname":"series<bar>.events.show","title":"show","parent":"series<bar>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"plotOptions-pyramid-events--show","fullname":"plotOptions.pyramid.events.show","title":"show","parent":"plotOptions-pyramid-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"plotOptions-treemap-events--show","fullname":"plotOptions.treemap.events.show","title":"show","parent":"plotOptions-treemap-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"series<scatter>-events--show","fullname":"series<scatter>.events.show","title":"show","parent":"series<scatter>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"series<columnrange>-events--show","fullname":"series<columnrange>.events.show","title":"show","parent":"series<columnrange>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"series<treemap>-events--show","fullname":"series<treemap>.events.show","title":"show","parent":"series<treemap>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"plotOptions-arearange-events--show","fullname":"plotOptions.arearange.events.show","title":"show","parent":"plotOptions-arearange-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"series<errorbar>-events--show","fullname":"series<errorbar>.events.show","title":"show","parent":"series<errorbar>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"series<areaspline>-events--show","fullname":"series<areaspline>.events.show","title":"show","parent":"series<areaspline>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"plotOptions-spline-events--show","fullname":"plotOptions.spline.events.show","title":"show","parent":"plotOptions-spline-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"series<arearange>-events--show","fullname":"series<arearange>.events.show","title":"show","parent":"series<arearange>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"series<funnel>-events--show","fullname":"series<funnel>.events.show","title":"show","parent":"series<funnel>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"plotOptions-series-events--show","fullname":"plotOptions.series.events.show","title":"show","parent":"plotOptions-series-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"plotOptions-pie-events--show","fullname":"plotOptions.pie.events.show","title":"show","parent":"plotOptions-pie-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"series<area>-events--show","fullname":"series<area>.events.show","title":"show","parent":"series<area>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"series<solidgauge>-events--show","fullname":"series<solidgauge>.events.show","title":"show","parent":"series<solidgauge>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"plotOptions-bar-events--show","fullname":"plotOptions.bar.events.show","title":"show","parent":"plotOptions-bar-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"plotOptions-waterfall-events--show","fullname":"plotOptions.waterfall.events.show","title":"show","parent":"plotOptions-waterfall-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"series<heatmap>-events--show","fullname":"series<heatmap>.events.show","title":"show","parent":"series<heatmap>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"plotOptions-polygon-events--show","fullname":"plotOptions.polygon.events.show","title":"show","parent":"plotOptions-polygon-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"plotOptions-errorbar-events--show","fullname":"plotOptions.errorbar.events.show","title":"show","parent":"plotOptions-errorbar-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"plotOptions-heatmap-events--show","fullname":"plotOptions.heatmap.events.show","title":"show","parent":"plotOptions-heatmap-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"series<pie>-events--show","fullname":"series<pie>.events.show","title":"show","parent":"series<pie>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"series<bubble>-events--show","fullname":"series<bubble>.events.show","title":"show","parent":"series<bubble>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"series<waterfall>-events--show","fullname":"series<waterfall>.events.show","title":"show","parent":"series<waterfall>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"series<gauge>-events--show","fullname":"series<gauge>.events.show","title":"show","parent":"series<gauge>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"series<column>-events--show","fullname":"series<column>.events.show","title":"show","parent":"series<column>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"plotOptions-column-events--show","fullname":"plotOptions.column.events.show","title":"show","parent":"plotOptions-column-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"plotOptions-areaspline-events--show","fullname":"plotOptions.areaspline.events.show","title":"show","parent":"plotOptions-areaspline-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"series<line>-events--show","fullname":"series<line>.events.show","title":"show","parent":"series<line>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"plotOptions-funnel-events--show","fullname":"plotOptions.funnel.events.show","title":"show","parent":"plotOptions-funnel-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"plotOptions-line-events--show","fullname":"plotOptions.line.events.show","title":"show","parent":"plotOptions-line-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"plotOptions-scatter-events--show","fullname":"plotOptions.scatter.events.show","title":"show","parent":"plotOptions-scatter-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"series<pyramid>-events--show","fullname":"series<pyramid>.events.show","title":"show","parent":"series<pyramid>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"series<spline>-events--show","fullname":"series<spline>.events.show","title":"show","parent":"series<spline>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"series<polygon>-events--show","fullname":"series<polygon>.events.show","title":"show","parent":"series<polygon>-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"plotOptions-boxplot-events--show","fullname":"plotOptions.boxplot.events.show","title":"show","parent":"plotOptions-boxplot-events","isParent":false,"returnType":"Function","context":"Series","since":"1.2.0","description":"Fires when the series is shown after chart generation time, either by clicking the legend item or by calling <code>.show()</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-events-show/\" target=\"_blank\">Alert when the series is shown by clicking \r\n\t\t\tthe legend item.</a>","deprecated":false},{"name":"chart--showAxes","fullname":"chart.showAxes","title":"showAxes","parent":"chart","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.5","description":"Whether to show the axes initially. This only applies to empty charts where series are added dynamically, as axes are automatically added to cartesian series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/showaxes-false/\" target=\"_blank\">False by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/showaxes-true/\" target=\"_blank\">true</a>"},{"name":"series<columnrange>--showCheckbox","fullname":"series<columnrange>.showCheckbox","title":"showCheckbox","parent":"series<columnrange>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"plotOptions-scatter--showCheckbox","fullname":"plotOptions.scatter.showCheckbox","title":"showCheckbox","parent":"plotOptions-scatter","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"plotOptions-waterfall--showCheckbox","fullname":"plotOptions.waterfall.showCheckbox","title":"showCheckbox","parent":"plotOptions-waterfall","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"plotOptions-boxplot--showCheckbox","fullname":"plotOptions.boxplot.showCheckbox","title":"showCheckbox","parent":"plotOptions-boxplot","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"series<gauge>--showCheckbox","fullname":"series<gauge>.showCheckbox","title":"showCheckbox","parent":"series<gauge>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"series<waterfall>--showCheckbox","fullname":"series<waterfall>.showCheckbox","title":"showCheckbox","parent":"series<waterfall>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"series<line>--showCheckbox","fullname":"series<line>.showCheckbox","title":"showCheckbox","parent":"series<line>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"plotOptions-heatmap--showCheckbox","fullname":"plotOptions.heatmap.showCheckbox","title":"showCheckbox","parent":"plotOptions-heatmap","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"series<bar>--showCheckbox","fullname":"series<bar>.showCheckbox","title":"showCheckbox","parent":"series<bar>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"plotOptions-line--showCheckbox","fullname":"plotOptions.line.showCheckbox","title":"showCheckbox","parent":"plotOptions-line","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"series<bubble>--showCheckbox","fullname":"series<bubble>.showCheckbox","title":"showCheckbox","parent":"series<bubble>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"plotOptions-spline--showCheckbox","fullname":"plotOptions.spline.showCheckbox","title":"showCheckbox","parent":"plotOptions-spline","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"plotOptions-bubble--showCheckbox","fullname":"plotOptions.bubble.showCheckbox","title":"showCheckbox","parent":"plotOptions-bubble","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"series<area>--showCheckbox","fullname":"series<area>.showCheckbox","title":"showCheckbox","parent":"series<area>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"series<areaspline>--showCheckbox","fullname":"series<areaspline>.showCheckbox","title":"showCheckbox","parent":"series<areaspline>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"series<column>--showCheckbox","fullname":"series<column>.showCheckbox","title":"showCheckbox","parent":"series<column>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"series<treemap>--showCheckbox","fullname":"series<treemap>.showCheckbox","title":"showCheckbox","parent":"series<treemap>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"series<heatmap>--showCheckbox","fullname":"series<heatmap>.showCheckbox","title":"showCheckbox","parent":"series<heatmap>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"series<areasplinerange>--showCheckbox","fullname":"series<areasplinerange>.showCheckbox","title":"showCheckbox","parent":"series<areasplinerange>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"plotOptions-columnrange--showCheckbox","fullname":"plotOptions.columnrange.showCheckbox","title":"showCheckbox","parent":"plotOptions-columnrange","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"plotOptions-treemap--showCheckbox","fullname":"plotOptions.treemap.showCheckbox","title":"showCheckbox","parent":"plotOptions-treemap","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"series<polygon>--showCheckbox","fullname":"series<polygon>.showCheckbox","title":"showCheckbox","parent":"series<polygon>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"plotOptions-areaspline--showCheckbox","fullname":"plotOptions.areaspline.showCheckbox","title":"showCheckbox","parent":"plotOptions-areaspline","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"series<spline>--showCheckbox","fullname":"series<spline>.showCheckbox","title":"showCheckbox","parent":"series<spline>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"plotOptions-bar--showCheckbox","fullname":"plotOptions.bar.showCheckbox","title":"showCheckbox","parent":"plotOptions-bar","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"plotOptions-polygon--showCheckbox","fullname":"plotOptions.polygon.showCheckbox","title":"showCheckbox","parent":"plotOptions-polygon","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"plotOptions-column--showCheckbox","fullname":"plotOptions.column.showCheckbox","title":"showCheckbox","parent":"plotOptions-column","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"plotOptions-series--showCheckbox","fullname":"plotOptions.series.showCheckbox","title":"showCheckbox","parent":"plotOptions-series","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"series<arearange>--showCheckbox","fullname":"series<arearange>.showCheckbox","title":"showCheckbox","parent":"series<arearange>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"plotOptions-solidgauge--showCheckbox","fullname":"plotOptions.solidgauge.showCheckbox","title":"showCheckbox","parent":"plotOptions-solidgauge","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"plotOptions-area--showCheckbox","fullname":"plotOptions.area.showCheckbox","title":"showCheckbox","parent":"plotOptions-area","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"series<solidgauge>--showCheckbox","fullname":"series<solidgauge>.showCheckbox","title":"showCheckbox","parent":"series<solidgauge>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"plotOptions-gauge--showCheckbox","fullname":"plotOptions.gauge.showCheckbox","title":"showCheckbox","parent":"plotOptions-gauge","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"series<scatter>--showCheckbox","fullname":"series<scatter>.showCheckbox","title":"showCheckbox","parent":"series<scatter>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"plotOptions-areasplinerange--showCheckbox","fullname":"plotOptions.areasplinerange.showCheckbox","title":"showCheckbox","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"series<boxplot>--showCheckbox","fullname":"series<boxplot>.showCheckbox","title":"showCheckbox","parent":"series<boxplot>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"plotOptions-arearange--showCheckbox","fullname":"plotOptions.arearange.showCheckbox","title":"showCheckbox","parent":"plotOptions-arearange","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"If true, a checkbox is displayed next to the legend item to allow selecting the series. The state of the checkbox is determined by the <code>selected</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showcheckbox-true/\" target=\"_blank\">Show select box</a>"},{"name":"loading--showDuration","fullname":"loading.showDuration","title":"showDuration","parent":"loading","isParent":false,"returnType":"Number","defaults":"100","since":"1.2.0","description":"The duration in milliseconds of the fade in effect.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/loading/hideduration/\" target=\"_blank\">Fade in and out over a second</a>"},{"name":"xAxis--showEmpty","fullname":"xAxis.showEmpty","title":"showEmpty","parent":"xAxis","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.1","description":"Whether to show the axis line and title when the axis has no data.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/showempty/\" target=\"_blank\">When clicking the legend to hide series, one axis preserves line and title, the other doesn't</a>","deprecated":false},{"name":"yAxis--showEmpty","fullname":"yAxis.showEmpty","title":"showEmpty","parent":"yAxis","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.1","description":"Whether to show the axis line and title when the axis has no data.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/showempty/\" target=\"_blank\">When clicking the legend to hide series, one axis preserves line and title, the other doesn't</a>","deprecated":false},{"name":"yAxis--showFirstLabel","fullname":"yAxis.showFirstLabel","title":"showFirstLabel","parent":"yAxis","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to show the first tick label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/showfirstlabel-false/\" target=\"_blank\">Set to false on X axis</a>"},{"name":"xAxis--showFirstLabel","fullname":"xAxis.showFirstLabel","title":"showFirstLabel","parent":"xAxis","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to show the first tick label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/showfirstlabel-false/\" target=\"_blank\">Set to false on X axis</a>"},{"name":"series<bar>--showInLegend","fullname":"series<bar>.showInLegend","title":"showInLegend","parent":"series<bar>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"series<boxplot>--showInLegend","fullname":"series<boxplot>.showInLegend","title":"showInLegend","parent":"series<boxplot>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"series<heatmap>--showInLegend","fullname":"series<heatmap>.showInLegend","title":"showInLegend","parent":"series<heatmap>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"series<pyramid>--showInLegend","fullname":"series<pyramid>.showInLegend","title":"showInLegend","parent":"series<pyramid>","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to display this particular series or series type in the legend. Since 2.1, pies are not shown in the legend by default.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>"},{"name":"plotOptions-gauge--showInLegend","fullname":"plotOptions.gauge.showInLegend","title":"showInLegend","parent":"plotOptions-gauge","isParent":false,"returnType":"Boolean","since":"2.3.0","description":"Whether to display this particular series or series type in the legend. Defaults to false for gauge series.","demo":"","deprecated":false},{"name":"plotOptions-series--showInLegend","fullname":"plotOptions.series.showInLegend","title":"showInLegend","parent":"plotOptions-series","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"plotOptions-waterfall--showInLegend","fullname":"plotOptions.waterfall.showInLegend","title":"showInLegend","parent":"plotOptions-waterfall","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"series<gauge>--showInLegend","fullname":"series<gauge>.showInLegend","title":"showInLegend","parent":"series<gauge>","isParent":false,"returnType":"Boolean","since":"2.3.0","description":"Whether to display this particular series or series type in the legend. Defaults to false for gauge series.","demo":"","deprecated":false},{"name":"series<funnel>--showInLegend","fullname":"series<funnel>.showInLegend","title":"showInLegend","parent":"series<funnel>","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to display this particular series or series type in the legend. Since 2.1, pies are not shown in the legend by default.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>"},{"name":"plotOptions-areasplinerange--showInLegend","fullname":"plotOptions.areasplinerange.showInLegend","title":"showInLegend","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"series<waterfall>--showInLegend","fullname":"series<waterfall>.showInLegend","title":"showInLegend","parent":"series<waterfall>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"plotOptions-arearange--showInLegend","fullname":"plotOptions.arearange.showInLegend","title":"showInLegend","parent":"plotOptions-arearange","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"series<areaspline>--showInLegend","fullname":"series<areaspline>.showInLegend","title":"showInLegend","parent":"series<areaspline>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"plotOptions-boxplot--showInLegend","fullname":"plotOptions.boxplot.showInLegend","title":"showInLegend","parent":"plotOptions-boxplot","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"plotOptions-polygon--showInLegend","fullname":"plotOptions.polygon.showInLegend","title":"showInLegend","parent":"plotOptions-polygon","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"series<pie>--showInLegend","fullname":"series<pie>.showInLegend","title":"showInLegend","parent":"series<pie>","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to display this particular series or series type in the legend. Since 2.1, pies are not shown in the legend by default.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>"},{"name":"plotOptions-bar--showInLegend","fullname":"plotOptions.bar.showInLegend","title":"showInLegend","parent":"plotOptions-bar","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"series<arearange>--showInLegend","fullname":"series<arearange>.showInLegend","title":"showInLegend","parent":"series<arearange>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"series<areasplinerange>--showInLegend","fullname":"series<areasplinerange>.showInLegend","title":"showInLegend","parent":"series<areasplinerange>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"plotOptions-bubble--showInLegend","fullname":"plotOptions.bubble.showInLegend","title":"showInLegend","parent":"plotOptions-bubble","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"plotOptions-heatmap--showInLegend","fullname":"plotOptions.heatmap.showInLegend","title":"showInLegend","parent":"plotOptions-heatmap","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"series<line>--showInLegend","fullname":"series<line>.showInLegend","title":"showInLegend","parent":"series<line>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"plotOptions-funnel--showInLegend","fullname":"plotOptions.funnel.showInLegend","title":"showInLegend","parent":"plotOptions-funnel","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to display this particular series or series type in the legend. Since 2.1, pies are not shown in the legend by default.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>"},{"name":"plotOptions-column--showInLegend","fullname":"plotOptions.column.showInLegend","title":"showInLegend","parent":"plotOptions-column","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"plotOptions-scatter--showInLegend","fullname":"plotOptions.scatter.showInLegend","title":"showInLegend","parent":"plotOptions-scatter","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"series<bubble>--showInLegend","fullname":"series<bubble>.showInLegend","title":"showInLegend","parent":"series<bubble>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"plotOptions-columnrange--showInLegend","fullname":"plotOptions.columnrange.showInLegend","title":"showInLegend","parent":"plotOptions-columnrange","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"plotOptions-pie--showInLegend","fullname":"plotOptions.pie.showInLegend","title":"showInLegend","parent":"plotOptions-pie","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to display this particular series or series type in the legend. Since 2.1, pies are not shown in the legend by default.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>"},{"name":"plotOptions-solidgauge--showInLegend","fullname":"plotOptions.solidgauge.showInLegend","title":"showInLegend","parent":"plotOptions-solidgauge","isParent":false,"returnType":"Boolean","since":"2.3.0","description":"Whether to display this particular series or series type in the legend. Defaults to false for gauge series.","demo":"","deprecated":false},{"name":"plotOptions-areaspline--showInLegend","fullname":"plotOptions.areaspline.showInLegend","title":"showInLegend","parent":"plotOptions-areaspline","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"series<columnrange>--showInLegend","fullname":"series<columnrange>.showInLegend","title":"showInLegend","parent":"series<columnrange>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"series<column>--showInLegend","fullname":"series<column>.showInLegend","title":"showInLegend","parent":"series<column>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"plotOptions-area--showInLegend","fullname":"plotOptions.area.showInLegend","title":"showInLegend","parent":"plotOptions-area","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"plotOptions-treemap--showInLegend","fullname":"plotOptions.treemap.showInLegend","title":"showInLegend","parent":"plotOptions-treemap","isParent":false,"returnType":"Boolean","context":"","defaults":"false","values":"","since":"","description":"Whether to display this series type or specific series item in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>--showInLegend","fullname":"series<spline>.showInLegend","title":"showInLegend","parent":"series<spline>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"series<solidgauge>--showInLegend","fullname":"series<solidgauge>.showInLegend","title":"showInLegend","parent":"series<solidgauge>","isParent":false,"returnType":"Boolean","since":"2.3.0","description":"Whether to display this particular series or series type in the legend. Defaults to false for gauge series.","demo":"","deprecated":false},{"name":"series<area>--showInLegend","fullname":"series<area>.showInLegend","title":"showInLegend","parent":"series<area>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"plotOptions-line--showInLegend","fullname":"plotOptions.line.showInLegend","title":"showInLegend","parent":"plotOptions-line","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"plotOptions-spline--showInLegend","fullname":"plotOptions.spline.showInLegend","title":"showInLegend","parent":"plotOptions-spline","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"series<polygon>--showInLegend","fullname":"series<polygon>.showInLegend","title":"showInLegend","parent":"series<polygon>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"series<scatter>--showInLegend","fullname":"series<scatter>.showInLegend","title":"showInLegend","parent":"series<scatter>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to display this particular series or series type in the legend. The default value is <code>true</code> for standalone series, <code>false</code> for linked series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>","deprecated":false},{"name":"series<treemap>--showInLegend","fullname":"series<treemap>.showInLegend","title":"showInLegend","parent":"series<treemap>","isParent":false,"returnType":"Boolean","context":"","defaults":"false","values":"","since":"","description":"Whether to display this series type or specific series item in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid--showInLegend","fullname":"plotOptions.pyramid.showInLegend","title":"showInLegend","parent":"plotOptions-pyramid","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to display this particular series or series type in the legend. Since 2.1, pies are not shown in the legend by default.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-showinlegend/\" target=\"_blank\">One series in the legend, one hidden</a>"},{"name":"yAxis--showLastLabel","fullname":"yAxis.showLastLabel","title":"showLastLabel","parent":"yAxis","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to show the last tick label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/showlastlabel-true/\" target=\"_blank\">Set to true on X axis</a>"},{"name":"xAxis--showLastLabel","fullname":"xAxis.showLastLabel","title":"showLastLabel","parent":"xAxis","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to show the last tick label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/showlastlabel-true/\" target=\"_blank\">Set to true on X axis</a>","deprecated":false},{"name":"chart-options3d-frame-side","fullname":"chart.options3d.frame.side","title":"side","parent":"chart-options3d-frame","isParent":true,"returnType":"","defaults":"","values":"","since":"4.0","description":"The side for the frame around a 3D chart.","demo":"","seeAlso":"","deprecated":false},{"name":"series<gauge>-states-hover-halo--size","fullname":"series<gauge>.states.hover.halo.size","title":"size","parent":"series<gauge>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-states-hover-halo--size","fullname":"plotOptions.areaspline.states.hover.halo.size","title":"size","parent":"plotOptions-areaspline-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap-states-hover-halo--size","fullname":"plotOptions.heatmap.states.hover.halo.size","title":"size","parent":"plotOptions-heatmap-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"series<line>-states-hover-halo--size","fullname":"series<line>.states.hover.halo.size","title":"size","parent":"series<line>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pyramid>-states-hover-halo--size","fullname":"series<pyramid>.states.hover.halo.size","title":"size","parent":"series<pyramid>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"pane--size","fullname":"pane.size","title":"size","parent":"pane","isParent":false,"returnType":"Number|String","defaults":"85%","description":"The size of the pane, either as a number defining pixels, or a percentage defining a percentage of the plot are.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/gauge-vu-meter/\" target=\"_blank\">Smaller size</a>","deprecated":false},{"name":"series<pie>--size","fullname":"series<pie>.size","title":"size","parent":"series<pie>","isParent":false,"returnType":"String|Number","defaults":" ","description":"The diameter of the pie relative to the plot area. Can be a percentage or pixel value. Pixel values are given as integers. The default behaviour (as of 3.0) is to scale to the plot area and give room for data labels within the plot area. As a consequence, the size of the pie may vary when points are updated and data labels more around. In that case it is best to set a fixed value, for example <code>\"75%\"</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-size/\" target=\"_blank\">Smaller pie</a>","deprecated":false},{"name":"chart-options3d-frame-back--size","fullname":"chart.options3d.frame.back.size","title":"size","parent":"chart-options3d-frame-back","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0","description":"Thickness of the panel.","demo":"","seeAlso":"","deprecated":false},{"name":"chart-options3d-frame-bottom--size","fullname":"chart.options3d.frame.bottom.size","title":"size","parent":"chart-options3d-frame-bottom","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0","description":"The thickness of the panel.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap-states-hover-halo--size","fullname":"plotOptions.treemap.states.hover.halo.size","title":"size","parent":"plotOptions-treemap-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"series<boxplot>-states-hover-halo--size","fullname":"series<boxplot>.states.hover.halo.size","title":"size","parent":"series<boxplot>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-states-hover-halo--size","fullname":"plotOptions.polygon.states.hover.halo.size","title":"size","parent":"plotOptions-polygon-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"series<solidgauge>-states-hover-halo--size","fullname":"series<solidgauge>.states.hover.halo.size","title":"size","parent":"series<solidgauge>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall-states-hover-halo--size","fullname":"plotOptions.waterfall.states.hover.halo.size","title":"size","parent":"plotOptions-waterfall-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pie-states-hover-halo--size","fullname":"plotOptions.pie.states.hover.halo.size","title":"size","parent":"plotOptions-pie-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"series<arearange>-states-hover-halo--size","fullname":"series<arearange>.states.hover.halo.size","title":"size","parent":"series<arearange>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"series<funnel>-states-hover-halo--size","fullname":"series<funnel>.states.hover.halo.size","title":"size","parent":"series<funnel>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column-states-hover-halo--size","fullname":"plotOptions.column.states.hover.halo.size","title":"size","parent":"plotOptions-column-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble-states-hover-halo--size","fullname":"plotOptions.bubble.states.hover.halo.size","title":"size","parent":"plotOptions-bubble-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-series-states-hover-halo--size","fullname":"plotOptions.series.states.hover.halo.size","title":"size","parent":"plotOptions-series-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter-states-hover-halo--size","fullname":"plotOptions.scatter.states.hover.halo.size","title":"size","parent":"plotOptions-scatter-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange-states-hover-halo--size","fullname":"plotOptions.columnrange.states.hover.halo.size","title":"size","parent":"plotOptions-columnrange-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"chart-options3d-frame-side--size","fullname":"chart.options3d.frame.side.size","title":"size","parent":"chart-options3d-frame-side","isParent":false,"returnType":"Number","defaults":"1","values":"","since":"4.0","description":"The thickness of the panel.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel-states-hover-halo--size","fullname":"plotOptions.funnel.states.hover.halo.size","title":"size","parent":"plotOptions-funnel-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>-states-hover-halo--size","fullname":"series<spline>.states.hover.halo.size","title":"size","parent":"series<spline>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-states-hover-halo--size","fullname":"series<areasplinerange>.states.hover.halo.size","title":"size","parent":"series<areasplinerange>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"series<errorbar>-states-hover-halo--size","fullname":"series<errorbar>.states.hover.halo.size","title":"size","parent":"series<errorbar>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-area-states-hover-halo--size","fullname":"plotOptions.area.states.hover.halo.size","title":"size","parent":"plotOptions-area-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"series<column>-states-hover-halo--size","fullname":"series<column>.states.hover.halo.size","title":"size","parent":"series<column>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"series<treemap>-states-hover-halo--size","fullname":"series<treemap>.states.hover.halo.size","title":"size","parent":"series<treemap>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"series<scatter>-states-hover-halo--size","fullname":"series<scatter>.states.hover.halo.size","title":"size","parent":"series<scatter>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot-states-hover-halo--size","fullname":"plotOptions.boxplot.states.hover.halo.size","title":"size","parent":"plotOptions-boxplot-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-states-hover-halo--size","fullname":"plotOptions.pyramid.states.hover.halo.size","title":"size","parent":"plotOptions-pyramid-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bar>-states-hover-halo--size","fullname":"series<bar>.states.hover.halo.size","title":"size","parent":"series<bar>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"series<heatmap>-states-hover-halo--size","fullname":"series<heatmap>.states.hover.halo.size","title":"size","parent":"series<heatmap>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-line-states-hover-halo--size","fullname":"plotOptions.line.states.hover.halo.size","title":"size","parent":"plotOptions-line-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bar-states-hover-halo--size","fullname":"plotOptions.bar.states.hover.halo.size","title":"size","parent":"plotOptions-bar-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"series<waterfall>-states-hover-halo--size","fullname":"series<waterfall>.states.hover.halo.size","title":"size","parent":"series<waterfall>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar-states-hover-halo--size","fullname":"plotOptions.errorbar.states.hover.halo.size","title":"size","parent":"plotOptions-errorbar-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pie--size","fullname":"plotOptions.pie.size","title":"size","parent":"plotOptions-pie","isParent":false,"returnType":"String|Number","defaults":" ","description":"The diameter of the pie relative to the plot area. Can be a percentage or pixel value. Pixel values are given as integers. The default behaviour (as of 3.0) is to scale to the plot area and give room for data labels within the plot area. As a consequence, the size of the pie may vary when points are updated and data labels more around. In that case it is best to set a fixed value, for example <code>\"75%\"</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-size/\" target=\"_blank\">Smaller pie</a>","deprecated":false},{"name":"plotOptions-solidgauge-states-hover-halo--size","fullname":"plotOptions.solidgauge.states.hover.halo.size","title":"size","parent":"plotOptions-solidgauge-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange-states-hover-halo--size","fullname":"plotOptions.areasplinerange.states.hover.halo.size","title":"size","parent":"plotOptions-areasplinerange-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"series<polygon>-states-hover-halo--size","fullname":"series<polygon>.states.hover.halo.size","title":"size","parent":"series<polygon>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-states-hover-halo--size","fullname":"plotOptions.spline.states.hover.halo.size","title":"size","parent":"plotOptions-spline-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge-states-hover-halo--size","fullname":"plotOptions.gauge.states.hover.halo.size","title":"size","parent":"plotOptions-gauge-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pie>-states-hover-halo--size","fullname":"series<pie>.states.hover.halo.size","title":"size","parent":"series<pie>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bubble>-states-hover-halo--size","fullname":"series<bubble>.states.hover.halo.size","title":"size","parent":"series<bubble>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areaspline>-states-hover-halo--size","fullname":"series<areaspline>.states.hover.halo.size","title":"size","parent":"series<areaspline>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange-states-hover-halo--size","fullname":"plotOptions.arearange.states.hover.halo.size","title":"size","parent":"plotOptions-arearange-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"series<area>-states-hover-halo--size","fullname":"series<area>.states.hover.halo.size","title":"size","parent":"series<area>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"series<columnrange>-states-hover-halo--size","fullname":"series<columnrange>.states.hover.halo.size","title":"size","parent":"series<columnrange>-states-hover-halo","isParent":false,"returnType":"Number","defaults":"10","values":"","since":"4.0","description":"The pixel size of the halo. For point markers this is the radius of the halo. For pie slices it is the width of the halo outside the slice. For bubbles it defaults to 5 and is the width of the halo outside the bubble.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble--sizeBy","fullname":"plotOptions.bubble.sizeBy","title":"sizeBy","parent":"plotOptions-bubble","isParent":false,"returnType":"String","defaults":"area","values":"[\"area\", \"width\"]","since":"3.0.7","description":"Whether the bubble's value should be represented by the area or the width of the bubble. The default, <code>area</code>, corresponds best to the human perception of the size of each bubble. ","demo":" <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/bubble-sizeby/\" target=\"_blank\">Comparison of area and size</a>","seeAlso":"","deprecated":false},{"name":"series<bubble>--sizeBy","fullname":"series<bubble>.sizeBy","title":"sizeBy","parent":"series<bubble>","isParent":false,"returnType":"String","defaults":"area","values":"[\"area\", \"width\"]","since":"3.0.7","description":"Whether the bubble's value should be represented by the area or the width of the bubble. The default, <code>area</code>, corresponds best to the human perception of the size of each bubble. ","demo":" <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/bubble-sizeby/\" target=\"_blank\">Comparison of area and size</a>","seeAlso":"","deprecated":false},{"name":"series<pie>-data--sliced","fullname":"series<pie>.data.sliced","title":"sliced","parent":"series<pie>-data","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to display a slice offset from the center.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/point/sliced/\" target=\"_blank\">One sliced point</a>"},{"name":"plotOptions-funnel--slicedOffset","fullname":"plotOptions.funnel.slicedOffset","title":"slicedOffset","parent":"plotOptions-funnel","isParent":false,"returnType":"Number","defaults":"10","description":"If a point is sliced, moved out from the center, how many pixels should  it be moved?.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-slicedoffset-20/\" target=\"_blank\">20px offset</a>"},{"name":"series<pie>--slicedOffset","fullname":"series<pie>.slicedOffset","title":"slicedOffset","parent":"series<pie>","isParent":false,"returnType":"Number","defaults":"10","description":"If a point is sliced, moved out from the center, how many pixels should  it be moved?.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-slicedoffset-20/\" target=\"_blank\">20px offset</a>"},{"name":"series<funnel>--slicedOffset","fullname":"series<funnel>.slicedOffset","title":"slicedOffset","parent":"series<funnel>","isParent":false,"returnType":"Number","defaults":"10","description":"If a point is sliced, moved out from the center, how many pixels should  it be moved?.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-slicedoffset-20/\" target=\"_blank\">20px offset</a>"},{"name":"plotOptions-pyramid--slicedOffset","fullname":"plotOptions.pyramid.slicedOffset","title":"slicedOffset","parent":"plotOptions-pyramid","isParent":false,"returnType":"Number","defaults":"10","description":"If a point is sliced, moved out from the center, how many pixels should  it be moved?.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-slicedoffset-20/\" target=\"_blank\">20px offset</a>"},{"name":"series<pyramid>--slicedOffset","fullname":"series<pyramid>.slicedOffset","title":"slicedOffset","parent":"series<pyramid>","isParent":false,"returnType":"Number","defaults":"10","description":"If a point is sliced, moved out from the center, how many pixels should  it be moved?.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-slicedoffset-20/\" target=\"_blank\">20px offset</a>"},{"name":"plotOptions-pie--slicedOffset","fullname":"plotOptions.pie.slicedOffset","title":"slicedOffset","parent":"plotOptions-pie","isParent":false,"returnType":"Number","defaults":"10","description":"If a point is sliced, moved out from the center, how many pixels should  it be moved?.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-slicedoffset-20/\" target=\"_blank\">20px offset</a>"},{"name":"tooltip--snap","fullname":"tooltip.snap","title":"snap","parent":"tooltip","isParent":false,"returnType":"Number","since":"1.2.0","description":"Proximity snap for graphs or single points. Does not apply to bars, columns and pie slices. It defaults to 10 for mouse-powered devices and 25 for touch  devices. Note that since Highcharts 4.1 the whole plot area by default captures pointer events in order to show the tooltip, so for tooltip.snap to make sense, <a href=\"#plotOptions.series.stickyTracking\">stickyTracking</a> must be <code>false</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/bordercolor-default/\" target=\"_blank\">10 px by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/snap-50/\" target=\"_blank\">50 px on graph</a>","deprecated":false},{"name":"series<funnel>-dataLabels--softConnector","fullname":"series<funnel>.dataLabels.softConnector","title":"softConnector","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.1.7","description":"Whether to render the connector as a soft arc or a line with sharp break.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-softconnector-true/\" target=\"_blank\">Soft</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-softconnector-false/\" target=\"_blank\">non soft</a> connectors."},{"name":"series<pie>-dataLabels--softConnector","fullname":"series<pie>.dataLabels.softConnector","title":"softConnector","parent":"series<pie>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.1.7","description":"Whether to render the connector as a soft arc or a line with sharp break.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-softconnector-true/\" target=\"_blank\">Soft</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-softconnector-false/\" target=\"_blank\">non soft</a> connectors."},{"name":"plotOptions-pie-dataLabels--softConnector","fullname":"plotOptions.pie.dataLabels.softConnector","title":"softConnector","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.1.7","description":"Whether to render the connector as a soft arc or a line with sharp break.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-softconnector-true/\" target=\"_blank\">Soft</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-softconnector-false/\" target=\"_blank\">non soft</a> connectors."},{"name":"plotOptions-pyramid-dataLabels--softConnector","fullname":"plotOptions.pyramid.dataLabels.softConnector","title":"softConnector","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.1.7","description":"Whether to render the connector as a soft arc or a line with sharp break.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-softconnector-true/\" target=\"_blank\">Soft</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-softconnector-false/\" target=\"_blank\">non soft</a> connectors."},{"name":"series<pyramid>-dataLabels--softConnector","fullname":"series<pyramid>.dataLabels.softConnector","title":"softConnector","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.1.7","description":"Whether to render the connector as a soft arc or a line with sharp break.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-softconnector-true/\" target=\"_blank\">Soft</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-softconnector-false/\" target=\"_blank\">non soft</a> connectors."},{"name":"plotOptions-funnel-dataLabels--softConnector","fullname":"plotOptions.funnel.dataLabels.softConnector","title":"softConnector","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.1.7","description":"Whether to render the connector as a soft arc or a line with sharp break.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-softconnector-true/\" target=\"_blank\">Soft</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-datalabels-softconnector-false/\" target=\"_blank\">non soft</a> connectors."},{"name":"plotOptions-solidgauge","fullname":"plotOptions.solidgauge","title":"solidgauge","parent":"plotOptions","isParent":true,"returnType":"Object","since":"4.0","description":"A gauge showing values using a filled arc with colors indicating the value. The solid gauge plots values against the <code>yAxis</code>, which is extended with some color options, <a href=\"#yAxis.minColor\">minColor</a>, <a href=\"#yAxis.maxColor\">maxColor</a> and <a href=\"#yAxis.stops\">stops</a>, to control the color of the gauge itself.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/gauge-solid/\" target=\"_blank\">Solid gauge</a>","deprecated":false},{"name":"exporting--sourceHeight","fullname":"exporting.sourceHeight","title":"sourceHeight","parent":"exporting","isParent":false,"returnType":"Number","defaults":"","values":"","since":"3.0","description":"Analogous to <a href=\"#exporting.sourceWidth\">sourceWidth</a>","demo":"","seeAlso":"","deprecated":false},{"name":"exporting--sourceWidth","fullname":"exporting.sourceWidth","title":"sourceWidth","parent":"exporting","isParent":false,"returnType":"Number","defaults":"","values":"","since":"3.0","description":"The width of the original chart when exported, unless an explicit <a href=\"#chart.width\">chart.width</a> is set. The width exported raster image is then multiplied by <a href=\"#exporting.scale\">scale</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/exporting/sourcewidth/\" target=\"_blank\">Source size demo</a>","seeAlso":"","deprecated":false},{"name":"chart--spacing","fullname":"chart.spacing","title":"spacing","parent":"chart","isParent":false,"returnType":"Array<Number>","defaults":"[10, 10, 15, 10]","values":"","since":"3.0.6","description":"The distance between the outer edge of the chart and the content, like title, legend, axis title or labels. The numbers in the array designate top, right, bottom and left respectively. Use the options spacingTop, spacingRight, spacingBottom and spacingLeft options for shorthand setting of one option.","demo":"","seeAlso":"<a href=\"#chart.margin\">chart.margin</a>","deprecated":false},{"name":"chart--spacingBottom","fullname":"chart.spacingBottom","title":"spacingBottom","parent":"chart","isParent":false,"returnType":"Number","defaults":"15","since":"2.1","description":"<p>The space between the bottom edge of the chart and the content (plot area, axis title and labels, title, subtitle or \r legend in top position).</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/spacingbottom/\" target=\"_blank\">Spacing bottom set to 100</a>.","deprecated":false},{"name":"chart--spacingLeft","fullname":"chart.spacingLeft","title":"spacingLeft","parent":"chart","isParent":false,"returnType":"Number","defaults":"10","since":"2.1","description":"<p>The space between the left edge of the chart and the content (plot area, axis title and labels, title, subtitle or \r legend in top position).</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/spacingleft/\" target=\"_blank\">Spacing left set to 100</a>","deprecated":false},{"name":"chart--spacingRight","fullname":"chart.spacingRight","title":"spacingRight","parent":"chart","isParent":false,"returnType":"Number","defaults":"10","since":"2.1","description":"<p>The space between the right edge of the chart and the content (plot area, axis title and labels, title, subtitle or \r legend in top position).</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/spacingright-100/\" target=\"_blank\">Spacing set to 100</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/spacingright-legend/\" target=\"_blank\">legend in right position with default spacing</a>","deprecated":false},{"name":"chart--spacingTop","fullname":"chart.spacingTop","title":"spacingTop","parent":"chart","isParent":false,"returnType":"Number","defaults":"10","since":"2.1","description":"<p>The space between the top edge of the chart and the content (plot area, axis title and labels, title, subtitle or \r\n legend in top position).</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/spacingtop-100/\" target=\"_blank\">A top spacing of 100</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/spacingtop-10/\" target=\"_blank\">floating chart title makes the plot area align to the \r\n\t\t\tdefault spacingTop of 10.</a>.","deprecated":false},{"name":"plotOptions-spline","fullname":"plotOptions.spline","title":"spline","parent":"plotOptions","isParent":true},{"name":"series<area>--stack","fullname":"series<area>.stack","title":"stack","parent":"series<area>","isParent":false,"returnType":"String","since":"2.1","description":"This option allows grouping series in a stacked chart. The stack option can be a string  or a number or anything else, as long as the grouped series' stack options match each other.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/stack/\" target=\"_blank\">Stacked and grouped columns</a>","deprecated":false},{"name":"series<spline>--stack","fullname":"series<spline>.stack","title":"stack","parent":"series<spline>","isParent":false,"returnType":"String","since":"2.1","description":"This option allows grouping series in a stacked chart. The stack option can be a string  or a number or anything else, as long as the grouped series' stack options match each other.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/stack/\" target=\"_blank\">Stacked and grouped columns</a>","deprecated":false},{"name":"series<line>--stack","fullname":"series<line>.stack","title":"stack","parent":"series<line>","isParent":false,"returnType":"String","since":"2.1","description":"This option allows grouping series in a stacked chart. The stack option can be a string  or a number or anything else, as long as the grouped series' stack options match each other.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/stack/\" target=\"_blank\">Stacked and grouped columns</a>","deprecated":false},{"name":"series--stack","fullname":"series.stack","title":"stack","parent":"series","isParent":false,"returnType":"String","since":"2.1","description":"This option allows grouping series in a stacked chart. The stack option can be a string  or a number or anything else, as long as the grouped series' stack options match each other.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/stack/\" target=\"_blank\">Stacked and grouped columns</a>","deprecated":false},{"name":"series<waterfall>--stack","fullname":"series<waterfall>.stack","title":"stack","parent":"series<waterfall>","isParent":false,"returnType":"String","since":"2.1","description":"This option allows grouping series in a stacked chart. The stack option can be a string  or a number or anything else, as long as the grouped series' stack options match each other.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/stack/\" target=\"_blank\">Stacked and grouped columns</a>","deprecated":false},{"name":"series<areaspline>--stack","fullname":"series<areaspline>.stack","title":"stack","parent":"series<areaspline>","isParent":false,"returnType":"String","since":"2.1","description":"This option allows grouping series in a stacked chart. The stack option can be a string  or a number or anything else, as long as the grouped series' stack options match each other.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/stack/\" target=\"_blank\">Stacked and grouped columns</a>","deprecated":false},{"name":"series<column>--stack","fullname":"series<column>.stack","title":"stack","parent":"series<column>","isParent":false,"returnType":"String","since":"2.1","description":"This option allows grouping series in a stacked chart. The stack option can be a string  or a number or anything else, as long as the grouped series' stack options match each other.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/stack/\" target=\"_blank\">Stacked and grouped columns</a>","deprecated":false},{"name":"series<bar>--stack","fullname":"series<bar>.stack","title":"stack","parent":"series<bar>","isParent":false,"returnType":"String","since":"2.1","description":"This option allows grouping series in a stacked chart. The stack option can be a string  or a number or anything else, as long as the grouped series' stack options match each other.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/stack/\" target=\"_blank\">Stacked and grouped columns</a>","deprecated":false},{"name":"yAxis-stackLabels","fullname":"yAxis.stackLabels","title":"stackLabels","parent":"yAxis","isParent":true,"description":"The stack labels show the total value for each bar in a stacked column or bar chart. The label will be placed on top of\n\tpositive columns and below negative columns. In case of an inverted column chart or a bar chart the label is placed to \n\tthe right of positive bars and to the left of negative bars."},{"name":"series<areaspline>--stacking","fullname":"series<areaspline>.stacking","title":"stacking","parent":"series<areaspline>","isParent":false,"returnType":"String","values":"[null, \"normal\", \"percent\"]","description":"Whether to stack the values of each series on top of each other. Possible values are null to disable, \"normal\" to stack by value or \"percent\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-area/\" target=\"_blank\">area</a> with \"normal\" stacking. \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-area/\" target=\"_blank\">area</a> with \"percent\" stacking.","seeAlso":"<a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"plotOptions-column--stacking","fullname":"plotOptions.column.stacking","title":"stacking","parent":"plotOptions-column","isParent":false,"returnType":"String","values":"[null, \"normal\", \"percent\"]","description":"Whether to stack the values of each series on top of each other. Possible values are null to disable, \"normal\" to stack by value or \"percent\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-area/\" target=\"_blank\">area</a> with \"normal\" stacking. \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-area/\" target=\"_blank\">area</a> with \"percent\" stacking.","seeAlso":"<a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<bar>--stacking","fullname":"series<bar>.stacking","title":"stacking","parent":"series<bar>","isParent":false,"returnType":"String","values":"[null, \"normal\", \"percent\"]","description":"Whether to stack the values of each series on top of each other. Possible values are null to disable, \"normal\" to stack by value or \"percent\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-area/\" target=\"_blank\">area</a> with \"normal\" stacking. \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-area/\" target=\"_blank\">area</a> with \"percent\" stacking.","seeAlso":"<a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<line>--stacking","fullname":"series<line>.stacking","title":"stacking","parent":"series<line>","isParent":false,"returnType":"String","values":"[null, \"normal\", \"percent\"]","description":"Whether to stack the values of each series on top of each other. Possible values are null to disable, \"normal\" to stack by value or \"percent\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-area/\" target=\"_blank\">area</a> with \"normal\" stacking. \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-area/\" target=\"_blank\">area</a> with \"percent\" stacking.","seeAlso":"<a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"plotOptions-line--stacking","fullname":"plotOptions.line.stacking","title":"stacking","parent":"plotOptions-line","isParent":false,"returnType":"String","values":"[null, \"normal\", \"percent\"]","description":"Whether to stack the values of each series on top of each other. Possible values are null to disable, \"normal\" to stack by value or \"percent\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-area/\" target=\"_blank\">area</a> with \"normal\" stacking. \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-area/\" target=\"_blank\">area</a> with \"percent\" stacking.","seeAlso":"<a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"plotOptions-area--stacking","fullname":"plotOptions.area.stacking","title":"stacking","parent":"plotOptions-area","isParent":false,"returnType":"String","values":"[null, \"normal\", \"percent\"]","description":"Whether to stack the values of each series on top of each other. Possible values are null to disable, \"normal\" to stack by value or \"percent\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-area/\" target=\"_blank\">area</a> with \"normal\" stacking. \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-area/\" target=\"_blank\">area</a> with \"percent\" stacking.","seeAlso":"<a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"plotOptions-spline--stacking","fullname":"plotOptions.spline.stacking","title":"stacking","parent":"plotOptions-spline","isParent":false,"returnType":"String","values":"[null, \"normal\", \"percent\"]","description":"Whether to stack the values of each series on top of each other. Possible values are null to disable, \"normal\" to stack by value or \"percent\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-area/\" target=\"_blank\">area</a> with \"normal\" stacking. \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-area/\" target=\"_blank\">area</a> with \"percent\" stacking.","seeAlso":"<a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<spline>--stacking","fullname":"series<spline>.stacking","title":"stacking","parent":"series<spline>","isParent":false,"returnType":"String","values":"[null, \"normal\", \"percent\"]","description":"Whether to stack the values of each series on top of each other. Possible values are null to disable, \"normal\" to stack by value or \"percent\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-area/\" target=\"_blank\">area</a> with \"normal\" stacking. \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-area/\" target=\"_blank\">area</a> with \"percent\" stacking.","seeAlso":"<a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"plotOptions-bar--stacking","fullname":"plotOptions.bar.stacking","title":"stacking","parent":"plotOptions-bar","isParent":false,"returnType":"String","values":"[null, \"normal\", \"percent\"]","description":"Whether to stack the values of each series on top of each other. Possible values are null to disable, \"normal\" to stack by value or \"percent\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-area/\" target=\"_blank\">area</a> with \"normal\" stacking. \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-area/\" target=\"_blank\">area</a> with \"percent\" stacking.","seeAlso":"<a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"plotOptions-areaspline--stacking","fullname":"plotOptions.areaspline.stacking","title":"stacking","parent":"plotOptions-areaspline","isParent":false,"returnType":"String","values":"[null, \"normal\", \"percent\"]","description":"Whether to stack the values of each series on top of each other. Possible values are null to disable, \"normal\" to stack by value or \"percent\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-area/\" target=\"_blank\">area</a> with \"normal\" stacking. \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-area/\" target=\"_blank\">area</a> with \"percent\" stacking.","seeAlso":"<a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<column>--stacking","fullname":"series<column>.stacking","title":"stacking","parent":"series<column>","isParent":false,"returnType":"String","values":"[null, \"normal\", \"percent\"]","description":"Whether to stack the values of each series on top of each other. Possible values are null to disable, \"normal\" to stack by value or \"percent\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-area/\" target=\"_blank\">area</a> with \"normal\" stacking. \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-area/\" target=\"_blank\">area</a> with \"percent\" stacking.","seeAlso":"<a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"series<area>--stacking","fullname":"series<area>.stacking","title":"stacking","parent":"series<area>","isParent":false,"returnType":"String","values":"[null, \"normal\", \"percent\"]","description":"Whether to stack the values of each series on top of each other. Possible values are null to disable, \"normal\" to stack by value or \"percent\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-area/\" target=\"_blank\">area</a> with \"normal\" stacking. \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-area/\" target=\"_blank\">area</a> with \"percent\" stacking.","seeAlso":"<a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"plotOptions-series--stacking","fullname":"plotOptions.series.stacking","title":"stacking","parent":"plotOptions-series","isParent":false,"returnType":"String","values":"[null, \"normal\", \"percent\"]","description":"Whether to stack the values of each series on top of each other. Possible values are null to disable, \"normal\" to stack by value or \"percent\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-area/\" target=\"_blank\">area</a> with \"normal\" stacking. \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-line/\" target=\"_blank\">Line</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-column/\" target=\"_blank\">column</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-bar/\" target=\"_blank\">bar</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stacking-percent-area/\" target=\"_blank\">area</a> with \"percent\" stacking.","seeAlso":"<a href=\"#yAxis.reversedStacks\">yAxis.reversedStacks</a>","deprecated":false},{"name":"yAxis-labels--staggerLines","fullname":"yAxis.labels.staggerLines","title":"staggerLines","parent":"yAxis-labels","isParent":false,"returnType":"Number","since":"2.1","description":"Horizontal axes only. The number of lines to spread the labels over to make room or tighter labels.  .","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-staggerlines/\" target=\"_blank\">Show labels over two lines</a>"},{"name":"xAxis-labels--staggerLines","fullname":"xAxis.labels.staggerLines","title":"staggerLines","parent":"xAxis-labels","isParent":false,"returnType":"Number","since":"2.1","description":"Horizontal axes only. The number of lines to spread the labels over to make room or tighter labels.  .","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-staggerlines/\" target=\"_blank\">Show labels over two lines</a>"},{"name":"plotOptions-pie--startAngle","fullname":"plotOptions.pie.startAngle","title":"startAngle","parent":"plotOptions-pie","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"2.3.4","description":"The start angle of the pie slices in degrees where 0 is top and 90 right. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-startangle-90/\" target=\"_blank\">Start from right</a>","seeAlso":"","deprecated":false},{"name":"pane--startAngle","fullname":"pane.startAngle","title":"startAngle","parent":"pane","isParent":false,"returnType":"Number","since":"2.3.0","description":"The start angle of the polar X axis or gauge axis, given in degrees where 0 is north. Defaults to 0.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/gauge-vu-meter/\" target=\"_blank\">VU-meter with custom start and end angle</a>.","deprecated":false},{"name":"series<pie>--startAngle","fullname":"series<pie>.startAngle","title":"startAngle","parent":"series<pie>","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"2.3.4","description":"The start angle of the pie slices in degrees where 0 is top and 90 right. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/pie-startangle-90/\" target=\"_blank\">Start from right</a>","seeAlso":"","deprecated":false},{"name":"data--startColumn","fullname":"data.startColumn","title":"startColumn","parent":"data","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"4.0","description":"In tabular input data, the first column (indexed by 0) to use.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/data/start-end/\" target=\"_blank\">Limited data</a>","seeAlso":"","deprecated":false},{"name":"xAxis--startOfWeek","fullname":"xAxis.startOfWeek","title":"startOfWeek","parent":"xAxis","isParent":false,"returnType":"Number","defaults":"1","description":"For datetime axes, this decides where to put the tick between weeks. 0 = Sunday, 1 = Monday.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/startofweek-monday/\" target=\"_blank\">Monday by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/startofweek-sunday/\" target=\"_blank\">Sunday</a>"},{"name":"yAxis--startOfWeek","fullname":"yAxis.startOfWeek","title":"startOfWeek","parent":"yAxis","isParent":false,"returnType":"Number","defaults":"1","description":"For datetime axes, this decides where to put the tick between weeks. 0 = Sunday, 1 = Monday.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/startofweek-monday/\" target=\"_blank\">Monday by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/startofweek-sunday/\" target=\"_blank\">Sunday</a>"},{"name":"yAxis--startOnTick","fullname":"yAxis.startOnTick","title":"startOnTick","parent":"yAxis","isParent":false,"returnType":"Boolean","defaults":"true","since":"1.2.0","description":"Whether to force the axis to start on a tick. Use this option with the <code>maxPadding</code> option to control the axis start.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/startontick-false/\" target=\"_blank\">False by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/startontick-true/\" target=\"_blank\">true</a> on X axis"},{"name":"xAxis--startOnTick","fullname":"xAxis.startOnTick","title":"startOnTick","parent":"xAxis","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.2.0","description":"Whether to force the axis to start on a tick. Use this option with the <code>maxPadding</code> option to control the axis start.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/startontick-false/\" target=\"_blank\">False by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/startontick-true/\" target=\"_blank\">true</a> on X axis"},{"name":"data--startRow","fullname":"data.startRow","title":"startRow","parent":"data","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"4.0","description":"In tabular input data, the first row (indexed by 0) to use.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/data/start-end/\" target=\"_blank\">Limited data</a>","seeAlso":"","deprecated":false},{"name":"series<column>-states-hover-marker--states","fullname":"series<column>.states.hover.marker.states","title":"states","parent":"series<column>-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<scatter>-marker-states","fullname":"series<scatter>.marker.states","title":"states","parent":"series<scatter>-marker","isParent":true},{"name":"plotOptions-series-states-hover-marker--states","fullname":"plotOptions.series.states.hover.marker.states","title":"states","parent":"plotOptions-series-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"plotOptions-polygon-marker-states","fullname":"plotOptions.polygon.marker.states","title":"states","parent":"plotOptions-polygon-marker","isParent":true},{"name":"series<polygon>-states-hover-marker--states","fullname":"series<polygon>.states.hover.marker.states","title":"states","parent":"series<polygon>-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<pie>-states","fullname":"series<pie>.states","title":"states","parent":"series<pie>","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-columnrange-states-hover-marker--states","fullname":"plotOptions.columnrange.states.hover.marker.states","title":"states","parent":"plotOptions-columnrange-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"plotOptions-funnel-states-hover-marker--states","fullname":"plotOptions.funnel.states.hover.marker.states","title":"states","parent":"plotOptions-funnel-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<bar>-states","fullname":"series<bar>.states","title":"states","parent":"series<bar>","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"series<bubble>-states","fullname":"series<bubble>.states","title":"states","parent":"series<bubble>","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-waterfall-states","fullname":"plotOptions.waterfall.states","title":"states","parent":"plotOptions-waterfall","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-arearange-states","fullname":"plotOptions.arearange.states","title":"states","parent":"plotOptions-arearange","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-spline-marker-states","fullname":"plotOptions.spline.marker.states","title":"states","parent":"plotOptions-spline-marker","isParent":true},{"name":"plotOptions-bar-states-hover-marker--states","fullname":"plotOptions.bar.states.hover.marker.states","title":"states","parent":"plotOptions-bar-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<polygon>-data-marker-states","fullname":"series<polygon>.data.marker.states","title":"states","parent":"series<polygon>-data-marker","isParent":true},{"name":"series<solidgauge>-states","fullname":"series<solidgauge>.states","title":"states","parent":"series<solidgauge>","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"series<heatmap>-states-hover-marker--states","fullname":"series<heatmap>.states.hover.marker.states","title":"states","parent":"series<heatmap>-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"plotOptions-line-states","fullname":"plotOptions.line.states","title":"states","parent":"plotOptions-line","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-areaspline-states","fullname":"plotOptions.areaspline.states","title":"states","parent":"plotOptions-areaspline","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-heatmap-states","fullname":"plotOptions.heatmap.states","title":"states","parent":"plotOptions-heatmap","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"series<pyramid>-states","fullname":"series<pyramid>.states","title":"states","parent":"series<pyramid>","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"series<errorbar>-states-hover-marker--states","fullname":"series<errorbar>.states.hover.marker.states","title":"states","parent":"series<errorbar>-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"plotOptions-columnrange-states","fullname":"plotOptions.columnrange.states","title":"states","parent":"plotOptions-columnrange","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-column-states-hover-marker--states","fullname":"plotOptions.column.states.hover.marker.states","title":"states","parent":"plotOptions-column-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<bubble>-marker-states","fullname":"series<bubble>.marker.states","title":"states","parent":"series<bubble>-marker","isParent":true},{"name":"series<line>-marker-states","fullname":"series<line>.marker.states","title":"states","parent":"series<line>-marker","isParent":true},{"name":"series<waterfall>-states","fullname":"series<waterfall>.states","title":"states","parent":"series<waterfall>","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-arearange-states-hover-marker--states","fullname":"plotOptions.arearange.states.hover.marker.states","title":"states","parent":"plotOptions-arearange-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"plotOptions-series-states","fullname":"plotOptions.series.states","title":"states","parent":"plotOptions-series","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"series<area>-states","fullname":"series<area>.states","title":"states","parent":"series<area>","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-funnel-states","fullname":"plotOptions.funnel.states","title":"states","parent":"plotOptions-funnel","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"series<areasplinerange>-states","fullname":"series<areasplinerange>.states","title":"states","parent":"series<areasplinerange>","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-line-marker-states","fullname":"plotOptions.line.marker.states","title":"states","parent":"plotOptions-line-marker","isParent":true},{"name":"plotOptions-heatmap-states-hover-marker--states","fullname":"plotOptions.heatmap.states.hover.marker.states","title":"states","parent":"plotOptions-heatmap-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"plotOptions-solidgauge-states-hover-marker--states","fullname":"plotOptions.solidgauge.states.hover.marker.states","title":"states","parent":"plotOptions-solidgauge-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"plotOptions-scatter-states","fullname":"plotOptions.scatter.states","title":"states","parent":"plotOptions-scatter","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-pyramid-states","fullname":"plotOptions.pyramid.states","title":"states","parent":"plotOptions-pyramid","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"series<arearange>-states-hover-marker--states","fullname":"series<arearange>.states.hover.marker.states","title":"states","parent":"series<arearange>-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"plotOptions-series-marker-states","fullname":"plotOptions.series.marker.states","title":"states","parent":"plotOptions-series-marker","isParent":true},{"name":"series<heatmap>-states","fullname":"series<heatmap>.states","title":"states","parent":"series<heatmap>","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"series<areaspline>-marker-states","fullname":"series<areaspline>.marker.states","title":"states","parent":"series<areaspline>-marker","isParent":true},{"name":"series<pyramid>-states-hover-marker--states","fullname":"series<pyramid>.states.hover.marker.states","title":"states","parent":"series<pyramid>-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<area>-marker-states","fullname":"series<area>.marker.states","title":"states","parent":"series<area>-marker","isParent":true},{"name":"plotOptions-spline-states","fullname":"plotOptions.spline.states","title":"states","parent":"plotOptions-spline","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"series<areasplinerange>-states-hover-marker--states","fullname":"series<areasplinerange>.states.hover.marker.states","title":"states","parent":"series<areasplinerange>-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<boxplot>-states","fullname":"series<boxplot>.states","title":"states","parent":"series<boxplot>","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-gauge-states-hover-marker--states","fullname":"plotOptions.gauge.states.hover.marker.states","title":"states","parent":"plotOptions-gauge-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<scatter>-states-hover-marker--states","fullname":"series<scatter>.states.hover.marker.states","title":"states","parent":"series<scatter>-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<polygon>-marker-states","fullname":"series<polygon>.marker.states","title":"states","parent":"series<polygon>-marker","isParent":true},{"name":"series<columnrange>-states","fullname":"series<columnrange>.states","title":"states","parent":"series<columnrange>","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"series<spline>-data-marker-states","fullname":"series<spline>.data.marker.states","title":"states","parent":"series<spline>-data-marker","isParent":true},{"name":"plotOptions-boxplot-states","fullname":"plotOptions.boxplot.states","title":"states","parent":"plotOptions-boxplot","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-area-states-hover-marker--states","fullname":"plotOptions.area.states.hover.marker.states","title":"states","parent":"plotOptions-area-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"plotOptions-line-states-hover-marker--states","fullname":"plotOptions.line.states.hover.marker.states","title":"states","parent":"plotOptions-line-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<scatter>-data-marker-states","fullname":"series<scatter>.data.marker.states","title":"states","parent":"series<scatter>-data-marker","isParent":true},{"name":"series<line>-states","fullname":"series<line>.states","title":"states","parent":"series<line>","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"series<areaspline>-states-hover-marker--states","fullname":"series<areaspline>.states.hover.marker.states","title":"states","parent":"series<areaspline>-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<scatter>-states","fullname":"series<scatter>.states","title":"states","parent":"series<scatter>","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-areasplinerange-states","fullname":"plotOptions.areasplinerange.states","title":"states","parent":"plotOptions-areasplinerange","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-polygon-states","fullname":"plotOptions.polygon.states","title":"states","parent":"plotOptions-polygon","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-areasplinerange-states-hover-marker--states","fullname":"plotOptions.areasplinerange.states.hover.marker.states","title":"states","parent":"plotOptions-areasplinerange-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<treemap>-states-hover-marker--states","fullname":"series<treemap>.states.hover.marker.states","title":"states","parent":"series<treemap>-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"plotOptions-scatter-marker-states","fullname":"plotOptions.scatter.marker.states","title":"states","parent":"plotOptions-scatter-marker","isParent":true},{"name":"plotOptions-solidgauge-states","fullname":"plotOptions.solidgauge.states","title":"states","parent":"plotOptions-solidgauge","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"series<treemap>-states","fullname":"series<treemap>.states","title":"states","parent":"series<treemap>","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"series<polygon>-states","fullname":"series<polygon>.states","title":"states","parent":"series<polygon>","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-boxplot-states-hover-marker--states","fullname":"plotOptions.boxplot.states.hover.marker.states","title":"states","parent":"plotOptions-boxplot-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<bar>-states-hover-marker--states","fullname":"series<bar>.states.hover.marker.states","title":"states","parent":"series<bar>-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<area>-data-marker-states","fullname":"series<area>.data.marker.states","title":"states","parent":"series<area>-data-marker","isParent":true},{"name":"series<line>-data-marker-states","fullname":"series<line>.data.marker.states","title":"states","parent":"series<line>-data-marker","isParent":true},{"name":"series<arearange>-states","fullname":"series<arearange>.states","title":"states","parent":"series<arearange>","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-area-states","fullname":"plotOptions.area.states","title":"states","parent":"plotOptions-area","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"series<spline>-states-hover-marker--states","fullname":"series<spline>.states.hover.marker.states","title":"states","parent":"series<spline>-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<columnrange>-states-hover-marker--states","fullname":"series<columnrange>.states.hover.marker.states","title":"states","parent":"series<columnrange>-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<line>-states-hover-marker--states","fullname":"series<line>.states.hover.marker.states","title":"states","parent":"series<line>-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"plotOptions-treemap-states","fullname":"plotOptions.treemap.states","title":"states","parent":"plotOptions-treemap","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"series<errorbar>-states","fullname":"series<errorbar>.states","title":"states","parent":"series<errorbar>","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-waterfall-states-hover-marker--states","fullname":"plotOptions.waterfall.states.hover.marker.states","title":"states","parent":"plotOptions-waterfall-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<gauge>-states-hover-marker--states","fullname":"series<gauge>.states.hover.marker.states","title":"states","parent":"series<gauge>-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<gauge>-states","fullname":"series<gauge>.states","title":"states","parent":"series<gauge>","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-column-states","fullname":"plotOptions.column.states","title":"states","parent":"plotOptions-column","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-bubble-states-hover-marker--states","fullname":"plotOptions.bubble.states.hover.marker.states","title":"states","parent":"plotOptions-bubble-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<boxplot>-states-hover-marker--states","fullname":"series<boxplot>.states.hover.marker.states","title":"states","parent":"series<boxplot>-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"plotOptions-bubble-states","fullname":"plotOptions.bubble.states","title":"states","parent":"plotOptions-bubble","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-bubble-marker-states","fullname":"plotOptions.bubble.marker.states","title":"states","parent":"plotOptions-bubble-marker","isParent":true},{"name":"series<funnel>-states","fullname":"series<funnel>.states","title":"states","parent":"series<funnel>","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-errorbar-states","fullname":"plotOptions.errorbar.states","title":"states","parent":"plotOptions-errorbar","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-spline-states-hover-marker--states","fullname":"plotOptions.spline.states.hover.marker.states","title":"states","parent":"plotOptions-spline-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<solidgauge>-states-hover-marker--states","fullname":"series<solidgauge>.states.hover.marker.states","title":"states","parent":"series<solidgauge>-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<spline>-marker-states","fullname":"series<spline>.marker.states","title":"states","parent":"series<spline>-marker","isParent":true},{"name":"series<column>-states","fullname":"series<column>.states","title":"states","parent":"series<column>","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-pie-states","fullname":"plotOptions.pie.states","title":"states","parent":"plotOptions-pie","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"series<funnel>-states-hover-marker--states","fullname":"series<funnel>.states.hover.marker.states","title":"states","parent":"series<funnel>-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"plotOptions-errorbar-states-hover-marker--states","fullname":"plotOptions.errorbar.states.hover.marker.states","title":"states","parent":"plotOptions-errorbar-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"plotOptions-scatter-states-hover-marker--states","fullname":"plotOptions.scatter.states.hover.marker.states","title":"states","parent":"plotOptions-scatter-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<areaspline>-states","fullname":"series<areaspline>.states","title":"states","parent":"series<areaspline>","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"series<area>-states-hover-marker--states","fullname":"series<area>.states.hover.marker.states","title":"states","parent":"series<area>-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"plotOptions-bar-states","fullname":"plotOptions.bar.states","title":"states","parent":"plotOptions-bar","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-area-marker-states","fullname":"plotOptions.area.marker.states","title":"states","parent":"plotOptions-area-marker","isParent":true},{"name":"plotOptions-polygon-states-hover-marker--states","fullname":"plotOptions.polygon.states.hover.marker.states","title":"states","parent":"plotOptions-polygon-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"plotOptions-pyramid-states-hover-marker--states","fullname":"plotOptions.pyramid.states.hover.marker.states","title":"states","parent":"plotOptions-pyramid-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<waterfall>-states-hover-marker--states","fullname":"series<waterfall>.states.hover.marker.states","title":"states","parent":"series<waterfall>-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"plotOptions-gauge-states","fullname":"plotOptions.gauge.states","title":"states","parent":"plotOptions-gauge","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"plotOptions-areaspline-marker-states","fullname":"plotOptions.areaspline.marker.states","title":"states","parent":"plotOptions-areaspline-marker","isParent":true},{"name":"series<bubble>-states-hover-marker--states","fullname":"series<bubble>.states.hover.marker.states","title":"states","parent":"series<bubble>-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<pie>-states-hover-marker--states","fullname":"series<pie>.states.hover.marker.states","title":"states","parent":"series<pie>-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<spline>-states","fullname":"series<spline>.states","title":"states","parent":"series<spline>","isParent":true,"returnType":"plotOptions.series.states","since":"","description":"A wrapper object for all the series options in specific states.","demo":"","deprecated":false},{"name":"series<areaspline>-data-marker-states","fullname":"series<areaspline>.data.marker.states","title":"states","parent":"series<areaspline>-data-marker","isParent":true},{"name":"plotOptions-pie-states-hover-marker--states","fullname":"plotOptions.pie.states.hover.marker.states","title":"states","parent":"plotOptions-pie-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"plotOptions-treemap-states-hover-marker--states","fullname":"plotOptions.treemap.states.hover.marker.states","title":"states","parent":"plotOptions-treemap-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"plotOptions-areaspline-states-hover-marker--states","fullname":"plotOptions.areaspline.states.hover.marker.states","title":"states","parent":"plotOptions-areaspline-states-hover-marker","isParent":false,"returnType":"","description":""},{"name":"series<boxplot>--stemColor","fullname":"series<boxplot>.stemColor","title":"stemColor","parent":"series<boxplot>","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color of the stem, the vertical line extending from the box to the whiskers. If <code>null</code>, the series color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/error-bar-styling/\" target=\"_blank\">error bar styling</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot--stemColor","fullname":"plotOptions.boxplot.stemColor","title":"stemColor","parent":"plotOptions-boxplot","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color of the stem, the vertical line extending from the box to the whiskers. If <code>null</code>, the series color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/error-bar-styling/\" target=\"_blank\">error bar styling</a>","seeAlso":"","deprecated":false},{"name":"series<errorbar>--stemColor","fullname":"series<errorbar>.stemColor","title":"stemColor","parent":"series<errorbar>","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color of the stem, the vertical line extending from the box to the whiskers. If <code>null</code>, the series color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/error-bar-styling/\" target=\"_blank\">error bar styling</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar--stemColor","fullname":"plotOptions.errorbar.stemColor","title":"stemColor","parent":"plotOptions-errorbar","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color of the stem, the vertical line extending from the box to the whiskers. If <code>null</code>, the series color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/error-bar-styling/\" target=\"_blank\">error bar styling</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot--stemDashStyle","fullname":"plotOptions.boxplot.stemDashStyle","title":"stemDashStyle","parent":"plotOptions-boxplot","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"3.0","description":"The dash style of the stem, the vertical line extending from the box to the whiskers.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/error-bar-styling/\" target=\"_blank\">error bar styling</a>","seeAlso":"","deprecated":false},{"name":"series<errorbar>--stemDashStyle","fullname":"series<errorbar>.stemDashStyle","title":"stemDashStyle","parent":"series<errorbar>","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"3.0","description":"The dash style of the stem, the vertical line extending from the box to the whiskers.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/error-bar-styling/\" target=\"_blank\">error bar styling</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar--stemDashStyle","fullname":"plotOptions.errorbar.stemDashStyle","title":"stemDashStyle","parent":"plotOptions-errorbar","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"3.0","description":"The dash style of the stem, the vertical line extending from the box to the whiskers.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/error-bar-styling/\" target=\"_blank\">error bar styling</a>","seeAlso":"","deprecated":false},{"name":"series<boxplot>--stemDashStyle","fullname":"series<boxplot>.stemDashStyle","title":"stemDashStyle","parent":"series<boxplot>","isParent":false,"returnType":"String","defaults":"Solid","values":"[\"Solid\", \"ShortDash\", \"ShortDot\", \"ShortDashDot\", \"ShortDashDotDot\", \"Dot\", \"Dash\" ,\"LongDash\", \"DashDot\", \"LongDashDot\", \"LongDashDotDot\"]","since":"3.0","description":"The dash style of the stem, the vertical line extending from the box to the whiskers.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/error-bar-styling/\" target=\"_blank\">error bar styling</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar--stemWidth","fullname":"plotOptions.errorbar.stemWidth","title":"stemWidth","parent":"plotOptions-errorbar","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"3.0","description":"The width of the stem, the vertical line extending from the box to the whiskers. If <code>null</code>, the width is inherited from the <a href=\"#plotOptions.boxplot.lineWidth\">lineWidth</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/error-bar-styling/\" target=\"_blank\">error bar styling</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot--stemWidth","fullname":"plotOptions.boxplot.stemWidth","title":"stemWidth","parent":"plotOptions-boxplot","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"3.0","description":"The width of the stem, the vertical line extending from the box to the whiskers. If <code>null</code>, the width is inherited from the <a href=\"#plotOptions.boxplot.lineWidth\">lineWidth</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/error-bar-styling/\" target=\"_blank\">error bar styling</a>","seeAlso":"","deprecated":false},{"name":"series<errorbar>--stemWidth","fullname":"series<errorbar>.stemWidth","title":"stemWidth","parent":"series<errorbar>","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"3.0","description":"The width of the stem, the vertical line extending from the box to the whiskers. If <code>null</code>, the width is inherited from the <a href=\"#plotOptions.boxplot.lineWidth\">lineWidth</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/error-bar-styling/\" target=\"_blank\">error bar styling</a>","seeAlso":"","deprecated":false},{"name":"series<boxplot>--stemWidth","fullname":"series<boxplot>.stemWidth","title":"stemWidth","parent":"series<boxplot>","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"3.0","description":"The width of the stem, the vertical line extending from the box to the whiskers. If <code>null</code>, the width is inherited from the <a href=\"#plotOptions.boxplot.lineWidth\">lineWidth</a> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/error-bar-styling/\" target=\"_blank\">error bar styling</a>","seeAlso":"","deprecated":false},{"name":"series<line>--step","fullname":"series<line>.step","title":"step","parent":"series<line>","isParent":false,"returnType":"String","defaults":"false","values":"[\"left\", \"center\", \"right\"]","since":"1.2.5","description":"Whether to apply steps to the line. Possible values are <code>left</code>, <code>center</code> and <code>right</code>. Prior to 2.3.5, only <code>left</code> was supported.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/line-step/\" target=\"_blank\">Different step line options</a>","deprecated":false},{"name":"xAxis-labels--step","fullname":"xAxis.labels.step","title":"step","parent":"xAxis-labels","isParent":false,"returnType":"Number","since":"2.1","description":"<p>To show only every <em>n</em>'th label on the axis, set the step to <em>n</em>. Setting the step to 2 shows every other label.</p>\r\n\r\n<p>By default, the step is calculated automatically to avoid overlap. To prevent this, set it to 1. This usually only happens on a category axis, and is often a sign that you have chosen the wrong axis type. Read more at <a href=\"http://www.highcharts.com/docs/chart-concepts/axes\">Axis docs</a> => What axis should I use?</p> ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-step/\" target=\"_blank\">Showing only every other axis label on a categorized x axis</a>. <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-step-auto/\" target=\"_blank\">Auto steps on a category axis</a>.","deprecated":false},{"name":"series<areaspline>--step","fullname":"series<areaspline>.step","title":"step","parent":"series<areaspline>","isParent":false,"returnType":"String","defaults":"false","values":"[\"left\", \"center\", \"right\"]","since":"1.2.5","description":"Whether to apply steps to the line. Possible values are <code>left</code>, <code>center</code> and <code>right</code>. Prior to 2.3.5, only <code>left</code> was supported.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/line-step/\" target=\"_blank\">Different step line options</a>","deprecated":false},{"name":"plotOptions-area--step","fullname":"plotOptions.area.step","title":"step","parent":"plotOptions-area","isParent":false,"returnType":"String","defaults":"false","values":"[\"left\", \"center\", \"right\"]","since":"1.2.5","description":"Whether to apply steps to the line. Possible values are <code>left</code>, <code>center</code> and <code>right</code>. Prior to 2.3.5, only <code>left</code> was supported.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/line-step/\" target=\"_blank\">Different step line options</a>","deprecated":false},{"name":"series<area>--step","fullname":"series<area>.step","title":"step","parent":"series<area>","isParent":false,"returnType":"String","defaults":"false","values":"[\"left\", \"center\", \"right\"]","since":"1.2.5","description":"Whether to apply steps to the line. Possible values are <code>left</code>, <code>center</code> and <code>right</code>. Prior to 2.3.5, only <code>left</code> was supported.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/line-step/\" target=\"_blank\">Different step line options</a>","deprecated":false},{"name":"series<areasplinerange>--step","fullname":"series<areasplinerange>.step","title":"step","parent":"series<areasplinerange>","isParent":false,"returnType":"String","defaults":"false","values":"[\"left\", \"center\", \"right\"]","since":"1.2.5","description":"Whether to apply steps to the line. Possible values are <code>left</code>, <code>center</code> and <code>right</code>. Prior to 2.3.5, only <code>left</code> was supported.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/line-step/\" target=\"_blank\">Different step line options</a>","deprecated":false},{"name":"plotOptions-line--step","fullname":"plotOptions.line.step","title":"step","parent":"plotOptions-line","isParent":false,"returnType":"String","defaults":"false","values":"[\"left\", \"center\", \"right\"]","since":"1.2.5","description":"Whether to apply steps to the line. Possible values are <code>left</code>, <code>center</code> and <code>right</code>. Prior to 2.3.5, only <code>left</code> was supported.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/line-step/\" target=\"_blank\">Different step line options</a>","deprecated":false},{"name":"series<arearange>--step","fullname":"series<arearange>.step","title":"step","parent":"series<arearange>","isParent":false,"returnType":"String","defaults":"false","values":"[\"left\", \"center\", \"right\"]","since":"1.2.5","description":"Whether to apply steps to the line. Possible values are <code>left</code>, <code>center</code> and <code>right</code>. Prior to 2.3.5, only <code>left</code> was supported.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/line-step/\" target=\"_blank\">Different step line options</a>","deprecated":false},{"name":"plotOptions-areaspline--step","fullname":"plotOptions.areaspline.step","title":"step","parent":"plotOptions-areaspline","isParent":false,"returnType":"String","defaults":"false","values":"[\"left\", \"center\", \"right\"]","since":"1.2.5","description":"Whether to apply steps to the line. Possible values are <code>left</code>, <code>center</code> and <code>right</code>. Prior to 2.3.5, only <code>left</code> was supported.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/line-step/\" target=\"_blank\">Different step line options</a>","deprecated":false},{"name":"plotOptions-arearange--step","fullname":"plotOptions.arearange.step","title":"step","parent":"plotOptions-arearange","isParent":false,"returnType":"String","defaults":"false","values":"[\"left\", \"center\", \"right\"]","since":"1.2.5","description":"Whether to apply steps to the line. Possible values are <code>left</code>, <code>center</code> and <code>right</code>. Prior to 2.3.5, only <code>left</code> was supported.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/line-step/\" target=\"_blank\">Different step line options</a>","deprecated":false},{"name":"yAxis-labels--step","fullname":"yAxis.labels.step","title":"step","parent":"yAxis-labels","isParent":false,"returnType":"Number","since":"2.1","description":"<p>To show only every <em>n</em>'th label on the axis, set the step to <em>n</em>. Setting the step to 2 shows every other label.</p>\r\n\r\n<p>By default, the step is calculated automatically to avoid overlap. To prevent this, set it to 1. This usually only happens on a category axis, and is often a sign that you have chosen the wrong axis type. Read more at <a href=\"http://www.highcharts.com/docs/chart-concepts/axes\">Axis docs</a> => What axis should I use?</p> ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-step/\" target=\"_blank\">Showing only every other axis label on a categorized x axis</a>. <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-step-auto/\" target=\"_blank\">Auto steps on a category axis</a>.","deprecated":false},{"name":"plotOptions-areasplinerange--step","fullname":"plotOptions.areasplinerange.step","title":"step","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"String","defaults":"false","values":"[\"left\", \"center\", \"right\"]","since":"1.2.5","description":"Whether to apply steps to the line. Possible values are <code>left</code>, <code>center</code> and <code>right</code>. Prior to 2.3.5, only <code>left</code> was supported.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/line-step/\" target=\"_blank\">Different step line options</a>","deprecated":false},{"name":"series<gauge>--stickyTracking","fullname":"series<gauge>.stickyTracking","title":"stickyTracking","parent":"series<gauge>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-bar--stickyTracking","fullname":"plotOptions.bar.stickyTracking","title":"stickyTracking","parent":"plotOptions-bar","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel--stickyTracking","fullname":"plotOptions.funnel.stickyTracking","title":"stickyTracking","parent":"plotOptions-funnel","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<arearange>--stickyTracking","fullname":"series<arearange>.stickyTracking","title":"stickyTracking","parent":"series<arearange>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar--stickyTracking","fullname":"plotOptions.errorbar.stickyTracking","title":"stickyTracking","parent":"plotOptions-errorbar","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline--stickyTracking","fullname":"plotOptions.areaspline.stickyTracking","title":"stickyTracking","parent":"plotOptions-areaspline","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"series<column>--stickyTracking","fullname":"series<column>.stickyTracking","title":"stickyTracking","parent":"series<column>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-column--stickyTracking","fullname":"plotOptions.column.stickyTracking","title":"stickyTracking","parent":"plotOptions-column","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange--stickyTracking","fullname":"plotOptions.areasplinerange.stickyTracking","title":"stickyTracking","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter--stickyTracking","fullname":"plotOptions.scatter.stickyTracking","title":"stickyTracking","parent":"plotOptions-scatter","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot--stickyTracking","fullname":"plotOptions.boxplot.stickyTracking","title":"stickyTracking","parent":"plotOptions-boxplot","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"series<columnrange>--stickyTracking","fullname":"series<columnrange>.stickyTracking","title":"stickyTracking","parent":"series<columnrange>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge--stickyTracking","fullname":"plotOptions.gauge.stickyTracking","title":"stickyTracking","parent":"plotOptions-gauge","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"series<funnel>--stickyTracking","fullname":"series<funnel>.stickyTracking","title":"stickyTracking","parent":"series<funnel>","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>--stickyTracking","fullname":"series<spline>.stickyTracking","title":"stickyTracking","parent":"series<spline>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"series<pie>--stickyTracking","fullname":"series<pie>.stickyTracking","title":"stickyTracking","parent":"series<pie>","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pie--stickyTracking","fullname":"plotOptions.pie.stickyTracking","title":"stickyTracking","parent":"plotOptions-pie","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid--stickyTracking","fullname":"plotOptions.pyramid.stickyTracking","title":"stickyTracking","parent":"plotOptions-pyramid","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<treemap>--stickyTracking","fullname":"series<treemap>.stickyTracking","title":"stickyTracking","parent":"series<treemap>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"series<heatmap>--stickyTracking","fullname":"series<heatmap>.stickyTracking","title":"stickyTracking","parent":"series<heatmap>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-spline--stickyTracking","fullname":"plotOptions.spline.stickyTracking","title":"stickyTracking","parent":"plotOptions-spline","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"series<scatter>--stickyTracking","fullname":"series<scatter>.stickyTracking","title":"stickyTracking","parent":"series<scatter>","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap--stickyTracking","fullname":"plotOptions.treemap.stickyTracking","title":"stickyTracking","parent":"plotOptions-treemap","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap--stickyTracking","fullname":"plotOptions.heatmap.stickyTracking","title":"stickyTracking","parent":"plotOptions-heatmap","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange--stickyTracking","fullname":"plotOptions.columnrange.stickyTracking","title":"stickyTracking","parent":"plotOptions-columnrange","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"series<line>--stickyTracking","fullname":"series<line>.stickyTracking","title":"stickyTracking","parent":"series<line>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"series<pyramid>--stickyTracking","fullname":"series<pyramid>.stickyTracking","title":"stickyTracking","parent":"series<pyramid>","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<waterfall>--stickyTracking","fullname":"series<waterfall>.stickyTracking","title":"stickyTracking","parent":"series<waterfall>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-series--stickyTracking","fullname":"plotOptions.series.stickyTracking","title":"stickyTracking","parent":"plotOptions-series","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"series<solidgauge>--stickyTracking","fullname":"series<solidgauge>.stickyTracking","title":"stickyTracking","parent":"series<solidgauge>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-solidgauge--stickyTracking","fullname":"plotOptions.solidgauge.stickyTracking","title":"stickyTracking","parent":"plotOptions-solidgauge","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble--stickyTracking","fullname":"plotOptions.bubble.stickyTracking","title":"stickyTracking","parent":"plotOptions-bubble","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<area>--stickyTracking","fullname":"series<area>.stickyTracking","title":"stickyTracking","parent":"series<area>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon--stickyTracking","fullname":"plotOptions.polygon.stickyTracking","title":"stickyTracking","parent":"plotOptions-polygon","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bar>--stickyTracking","fullname":"series<bar>.stickyTracking","title":"stickyTracking","parent":"series<bar>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"series<bubble>--stickyTracking","fullname":"series<bubble>.stickyTracking","title":"stickyTracking","parent":"series<bubble>","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-line--stickyTracking","fullname":"plotOptions.line.stickyTracking","title":"stickyTracking","parent":"plotOptions-line","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange--stickyTracking","fullname":"plotOptions.arearange.stickyTracking","title":"stickyTracking","parent":"plotOptions-arearange","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"series<boxplot>--stickyTracking","fullname":"series<boxplot>.stickyTracking","title":"stickyTracking","parent":"series<boxplot>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall--stickyTracking","fullname":"plotOptions.waterfall.stickyTracking","title":"stickyTracking","parent":"plotOptions-waterfall","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"series<areaspline>--stickyTracking","fullname":"series<areaspline>.stickyTracking","title":"stickyTracking","parent":"series<areaspline>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>--stickyTracking","fullname":"series<areasplinerange>.stickyTracking","title":"stickyTracking","parent":"series<areasplinerange>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-area--stickyTracking","fullname":"plotOptions.area.stickyTracking","title":"stickyTracking","parent":"plotOptions-area","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"series<errorbar>--stickyTracking","fullname":"series<errorbar>.stickyTracking","title":"stickyTracking","parent":"series<errorbar>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.0","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series. Defaults to true for line and area type series, but to false for columns, pies etc.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-true/\" target=\"_blank\">True by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-stickytracking-false/\" target=\"_blank\">false</a>","seeAlso":"","deprecated":false},{"name":"series<polygon>--stickyTracking","fullname":"series<polygon>.stickyTracking","title":"stickyTracking","parent":"series<polygon>","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"","description":"Sticky tracking of mouse events. When true, the <code>mouseOut</code> event\r on a series isn't triggered until the mouse moves over another series, or out\r of the plot area. When false, the <code>mouseOut</code> event on a series is\r triggered when the mouse leaves the area around the series' graph or markers.\r This also implies the tooltip. When <code>stickyTracking</code> is false and <code>tooltip.shared</code> is false, the \r tooltip will be hidden when moving the mouse between series.","demo":"","seeAlso":"","deprecated":false},{"name":"yAxis--stops","fullname":"yAxis.stops","title":"stops","parent":"yAxis","isParent":false,"returnType":"Array<Array>","since":"4.0","description":"<p>Solid gauge series only. Color stops for the solid gauge. Use this in cases where a linear gradient between a <code>minColor</code> and <code>maxColor</code> is not sufficient. The stops is an array of tuples, where the first item is a float between 0 and 1 assigning the relative position in the gradient, and the second item is the color.</p>\r\n\r\n<p>For solid gauges, the Y axis also inherits the concept of <a href=\"http://api.highcharts.com/highmaps#colorAxis.dataClasses\">data classes</a> from the Highmaps color axis.</p>\r\n","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/gauge-solid/\" target=\"_blank\">True by default</a>","seeAlso":"<a href=\"#yAxis.minColor\">minColor</a>, <a href=\"#yAxis.maxColor\">maxColor</a>.","deprecated":false},{"name":"xAxis-plotBands-label--style","fullname":"xAxis.plotBands.label.style","title":"style","parent":"xAxis-plotBands-label","isParent":false,"returnType":"Object","since":"2.1","description":"CSS styles for the text label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-label-style/\" target=\"_blank\">Blue and bold label</a>"},{"name":"series<waterfall>-dataLabels--style","fullname":"series<waterfall>.dataLabels.style","title":"style","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"yAxis-stackLabels--style","fullname":"yAxis.stackLabels.style","title":"style","parent":"yAxis-stackLabels","isParent":false,"returnType":"CSSObject","defaults":"{ \"color\": \"#000000\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 00 3px contrast\" }","since":"2.1.5","description":"CSS styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/stacklabels-style/\" target=\"_blank\">Red stack total labels</a>","deprecated":false},{"name":"plotOptions-treemap-dataLabels--style","fullname":"plotOptions.treemap.dataLabels.style","title":"style","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"yAxis-plotLines-label--style","fullname":"yAxis.plotLines.label.style","title":"style","parent":"yAxis-plotLines-label","isParent":false,"returnType":"Object","since":"2.1","description":"CSS styles for the text label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-label-style/\" target=\"_blank\">Blue and bold label</a>"},{"name":"plotOptions-spline-dataLabels--style","fullname":"plotOptions.spline.dataLabels.style","title":"style","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"plotOptions-funnel-dataLabels--style","fullname":"plotOptions.funnel.dataLabels.style","title":"style","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"legend-title--style","fullname":"legend.title.style","title":"style","parent":"legend-title","isParent":false,"returnType":"CSSObject","defaults":"{\"fontWeight\":\"bold\"}","values":"","since":"3.0","description":"Generic CSS styles for the legend title. Defaults to:\r\n<pre>style: {\r\n   fontWeight: 'bold'\r\n}</pre>","demo":"","seeAlso":"","deprecated":false},{"name":"chart--style","fullname":"chart.style","title":"style","parent":"chart","isParent":false,"returnType":"CSSObject","defaults":"{\"fontFamily\":\"\\\"Lucida Grande\\\", \\\"Lucida Sans Unicode\\\", Verdana, Arial, Helvetica, sans-serif\",\"fontSize\":\"12px\"}","description":"Additional CSS styles to apply inline to the container <code>div</code>. Note that since the default font styles are applied in the renderer, it is ignorant of the individual chart  options and must be set globally. Defaults to:\n<pre>style: {\n\tfontFamily: '\"Lucida Grande\", \"Lucida Sans Unicode\", Verdana, Arial, Helvetica, sans-serif', // default font\n\tfontSize: '12px'\n}</pre>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/style-serif-font/\" target=\"_blank\">Using a serif type font</a>"},{"name":"tooltip--style","fullname":"tooltip.style","title":"style","parent":"tooltip","isParent":false,"returnType":"CSSObject","description":"CSS styles for the tooltip. The tooltip can also be styled through the CSS\r class <code>.highcharts-tooltip</code>.\r Default value:\r\n<pre>style: {\r\n\tcolor: '#333333',\r\n\tfontSize: '12px',\r\n\tpadding: '8px'\r\n}</pre>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/style/\" target=\"_blank\">Greater padding, bold text</a>","deprecated":false},{"name":"plotOptions-polygon-dataLabels--style","fullname":"plotOptions.polygon.dataLabels.style","title":"style","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"xAxis-title--style","fullname":"xAxis.title.style","title":"style","parent":"xAxis-title","isParent":false,"returnType":"CSSObject","defaults":"{ \"color\": \"#707070\", \"fontWeight\": \"bold\" }","description":"CSS styles for the title. When titles are rotated they are rendered using vector graphic techniques and not all styles are applicable.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/title-style/\" target=\"_blank\">Red</a> Y axis title","deprecated":false},{"name":"subtitle--style","fullname":"subtitle.style","title":"style","parent":"subtitle","isParent":false,"returnType":"CSSObject","defaults":"{ \"color\": \"#555555\" }","description":"CSS styles for the title. Exact positioning of the title can be achieved by changing the margin property, or by adding <code>position: \"absolute\"</code> and  left and top properties.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/subtitle/style/\" target=\"_blank\">Custom color and weight</a>","deprecated":false},{"name":"series<area>-dataLabels--style","fullname":"series<area>.dataLabels.style","title":"style","parent":"series<area>-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"plotOptions-bar-dataLabels--style","fullname":"plotOptions.bar.dataLabels.style","title":"style","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"plotOptions-gauge-dataLabels--style","fullname":"plotOptions.gauge.dataLabels.style","title":"style","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"plotOptions-pie-dataLabels--style","fullname":"plotOptions.pie.dataLabels.style","title":"style","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels--style","fullname":"plotOptions.areasplinerange.dataLabels.style","title":"style","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"xAxis-labels--style","fullname":"xAxis.labels.style","title":"style","parent":"xAxis-labels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\":\"#6D869F\",\"fontWeight\":\"bold\"}","description":"CSS styles for the label. Use <code>whiteSpace: 'nowrap'</code> to prevent wrapping of category labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-style/\" target=\"_blank\">Red X axis labels</a>","deprecated":false},{"name":"series<polygon>-dataLabels--style","fullname":"series<polygon>.dataLabels.style","title":"style","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"loading--style","fullname":"loading.style","title":"style","parent":"loading","isParent":false,"returnType":"CSSObject","since":"1.2.0","description":"CSS styles for the loading screen that covers the plot area. Defaults to:\n<pre>style: {\n\tposition: 'absolute',\n\tbackgroundColor: 'white',\n\topacity: 0.5,\n\ttextAlign: 'center'\n}</pre>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/loading/style/\" target=\"_blank\">Gray plot area, white text</a>"},{"name":"plotOptions-areaspline-dataLabels--style","fullname":"plotOptions.areaspline.dataLabels.style","title":"style","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"plotOptions-bubble-dataLabels--style","fullname":"plotOptions.bubble.dataLabels.style","title":"style","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"plotOptions-series-dataLabels--style","fullname":"plotOptions.series.dataLabels.style","title":"style","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"xAxis-plotLines-label--style","fullname":"xAxis.plotLines.label.style","title":"style","parent":"xAxis-plotLines-label","isParent":false,"returnType":"Object","since":"2.1","description":"CSS styles for the text label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-label-style/\" target=\"_blank\">Blue and bold label</a>"},{"name":"plotOptions-solidgauge-dataLabels--style","fullname":"plotOptions.solidgauge.dataLabels.style","title":"style","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"legend--style","fullname":"legend.style","title":"style","parent":"legend","isParent":false,"returnType":"CSSObject","description":"CSS styles for the legend area. In the 1.x versions the position of the legend area was determined by CSS. In 2.x, the position is determined by properties like  <code>align</code>, <code>verticalAlign</code>, <code>x</code> and <code>y</code>, but the styles are still parsed for backwards compatibility.","deprecated":true},{"name":"series<solidgauge>-dataLabels--style","fullname":"series<solidgauge>.dataLabels.style","title":"style","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"series<pyramid>-dataLabels--style","fullname":"series<pyramid>.dataLabels.style","title":"style","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"plotOptions-scatter-dataLabels--style","fullname":"plotOptions.scatter.dataLabels.style","title":"style","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"series<bar>-dataLabels--style","fullname":"series<bar>.dataLabels.style","title":"style","parent":"series<bar>-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"plotOptions-column-dataLabels--style","fullname":"plotOptions.column.dataLabels.style","title":"style","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"labels-items--style","fullname":"labels.items.style","title":"style","parent":"labels-items","isParent":false,"returnType":"CSSObject","description":"CSS styles for each label. To position the label, use left and top like this:\n<pre>style: {\n\tleft: '100px',\n\ttop: '100px'\n}</pre>"},{"name":"plotOptions-columnrange-dataLabels--style","fullname":"plotOptions.columnrange.dataLabels.style","title":"style","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"plotOptions-pyramid-dataLabels--style","fullname":"plotOptions.pyramid.dataLabels.style","title":"style","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"series<column>-dataLabels--style","fullname":"series<column>.dataLabels.style","title":"style","parent":"series<column>-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"series<pie>-dataLabels--style","fullname":"series<pie>.dataLabels.style","title":"style","parent":"series<pie>-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"series<areaspline>-dataLabels--style","fullname":"series<areaspline>.dataLabels.style","title":"style","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"series<scatter>-dataLabels--style","fullname":"series<scatter>.dataLabels.style","title":"style","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"plotOptions-line-dataLabels--style","fullname":"plotOptions.line.dataLabels.style","title":"style","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"series<spline>-dataLabels--style","fullname":"series<spline>.dataLabels.style","title":"style","parent":"series<spline>-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"series<line>-dataLabels--style","fullname":"series<line>.dataLabels.style","title":"style","parent":"series<line>-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"yAxis-title--style","fullname":"yAxis.title.style","title":"style","parent":"yAxis-title","isParent":false,"returnType":"CSSObject","defaults":"{ \"color\": \"#707070\", \"fontWeight\": \"bold\" }","description":"CSS styles for the title. When titles are rotated they are rendered using vector graphic techniques and not all styles are applicable.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/title-style/\" target=\"_blank\">Red</a> Y axis title","deprecated":false},{"name":"title--style","fullname":"title.style","title":"style","parent":"title","isParent":false,"returnType":"CSSObject","defaults":"{ \"color\": \"#333333\", \"fontSize\": \"18px\" }","description":"CSS styles for the title. Use this for font styling, but use <code>align</code>, <code>x</code> and <code>y</code> for text alignment.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/title/style/\" target=\"_blank\">Custom color and weight</a>","deprecated":false},{"name":"series<treemap>-dataLabels--style","fullname":"series<treemap>.dataLabels.style","title":"style","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"noData--style","fullname":"noData.style","title":"style","parent":"noData","isParent":false,"returnType":"CSSObject","defaults":"{ \"fontSize\": \"12px\", \"fontWeight\": \"bold\", \"color\": \"#60606a\" }","values":"","since":"3.0.8","description":"CSS styles for the no-data label. ","demo":"","seeAlso":"","deprecated":false},{"name":"legend-navigation--style","fullname":"legend.navigation.style","title":"style","parent":"legend-navigation","isParent":false,"returnType":"CSSObject","since":"2.2.4","description":"Text styles for the legend page navigation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/navigation/\" target=\"_blank\">\n\t\t\t\tLegend page navigation demonstrated</a>"},{"name":"series<bubble>-dataLabels--style","fullname":"series<bubble>.dataLabels.style","title":"style","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"plotOptions-area-dataLabels--style","fullname":"plotOptions.area.dataLabels.style","title":"style","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"series<columnrange>-dataLabels--style","fullname":"series<columnrange>.dataLabels.style","title":"style","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"plotOptions-waterfall-dataLabels--style","fullname":"plotOptions.waterfall.dataLabels.style","title":"style","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"plotOptions-heatmap-dataLabels--style","fullname":"plotOptions.heatmap.dataLabels.style","title":"style","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"yAxis-plotBands-label--style","fullname":"yAxis.plotBands.label.style","title":"style","parent":"yAxis-plotBands-label","isParent":false,"returnType":"Object","since":"2.1","description":"CSS styles for the text label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-label-style/\" target=\"_blank\">Blue and bold label</a>"},{"name":"series<areasplinerange>-dataLabels--style","fullname":"series<areasplinerange>.dataLabels.style","title":"style","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"series<gauge>-dataLabels--style","fullname":"series<gauge>.dataLabels.style","title":"style","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"credits--style","fullname":"credits.style","title":"style","parent":"credits","isParent":false,"returnType":"CSSObject","description":"CSS styles for the credits label. Defaults to:\r\n<pre>style: {\r\n\tcursor: 'pointer',\r\n\tcolor: '#909090',\r\n\tfontSize: '10px'\r\n\r\n}</pre>","deprecated":false},{"name":"series<heatmap>-dataLabels--style","fullname":"series<heatmap>.dataLabels.style","title":"style","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"labels--style","fullname":"labels.style","title":"style","parent":"labels","isParent":false,"returnType":"CSSObject","description":"Shared CSS styles for all labels. Defaults to:\n<pre>style: {\n\tcolor: '#3E576F'\n}</pre>"},{"name":"series<arearange>-dataLabels--style","fullname":"series<arearange>.dataLabels.style","title":"style","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"plotOptions-arearange-dataLabels--style","fullname":"plotOptions.arearange.dataLabels.style","title":"style","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"series<funnel>-dataLabels--style","fullname":"series<funnel>.dataLabels.style","title":"style","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\": \"contrast\", \"fontSize\": \"11px\", \"fontWeight\": \"bold\", \"textShadow\": \"0 0 6px contrast, 0 0 3px contrast\" }","since":"4.1.0","description":"Styles for the label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-style/\" target=\"_blank\">Bold labels</a>","deprecated":false},{"name":"yAxis-labels--style","fullname":"yAxis.labels.style","title":"style","parent":"yAxis-labels","isParent":false,"returnType":"CSSObject","defaults":"{\"color\":\"#6D869F\",\"fontWeight\":\"bold\"}","description":"CSS styles for the label. Use <code>whiteSpace: 'nowrap'</code> to prevent wrapping of category labels.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-style/\" target=\"_blank\">Red X axis labels</a>","deprecated":false},{"name":"subtitle","fullname":"subtitle","title":"subtitle","isParent":true,"description":"The chart's subtitle"},{"name":"data--switchRowsAndColumns","fullname":"data.switchRowsAndColumns","title":"switchRowsAndColumns","parent":"data","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"4.0","description":"Switch rows and columns of the input data, so that <code>this.columns</code> effectively becomes the rows of the data set, and the rows are interpreted as series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/data/switchrowsandcolumns/\" target=\"_blank\">Switch rows and columns</a>","seeAlso":"","deprecated":false},{"name":"series<bubble>-states-hover-marker--symbol","fullname":"series<bubble>.states.hover.marker.symbol","title":"symbol","parent":"series<bubble>-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-line-states-hover-marker--symbol","fullname":"plotOptions.line.states.hover.marker.symbol","title":"symbol","parent":"plotOptions-line-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-scatter-states-hover-marker--symbol","fullname":"plotOptions.scatter.states.hover.marker.symbol","title":"symbol","parent":"plotOptions-scatter-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<line>-marker--symbol","fullname":"series<line>.marker.symbol","title":"symbol","parent":"series<line>-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-funnel-states-hover-marker--symbol","fullname":"plotOptions.funnel.states.hover.marker.symbol","title":"symbol","parent":"plotOptions-funnel-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-areaspline-marker--symbol","fullname":"plotOptions.areaspline.marker.symbol","title":"symbol","parent":"plotOptions-areaspline-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-errorbar-states-hover-marker--symbol","fullname":"plotOptions.errorbar.states.hover.marker.symbol","title":"symbol","parent":"plotOptions-errorbar-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-scatter-marker--symbol","fullname":"plotOptions.scatter.marker.symbol","title":"symbol","parent":"plotOptions-scatter-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-areasplinerange-states-hover-marker--symbol","fullname":"plotOptions.areasplinerange.states.hover.marker.symbol","title":"symbol","parent":"plotOptions-areasplinerange-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<column>-states-hover-marker--symbol","fullname":"series<column>.states.hover.marker.symbol","title":"symbol","parent":"series<column>-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<gauge>-states-hover-marker--symbol","fullname":"series<gauge>.states.hover.marker.symbol","title":"symbol","parent":"series<gauge>-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-polygon-states-hover-marker--symbol","fullname":"plotOptions.polygon.states.hover.marker.symbol","title":"symbol","parent":"plotOptions-polygon-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<spline>-marker--symbol","fullname":"series<spline>.marker.symbol","title":"symbol","parent":"series<spline>-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<heatmap>-states-hover-marker--symbol","fullname":"series<heatmap>.states.hover.marker.symbol","title":"symbol","parent":"series<heatmap>-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<scatter>-states-hover-marker--symbol","fullname":"series<scatter>.states.hover.marker.symbol","title":"symbol","parent":"series<scatter>-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-bubble-states-hover-marker--symbol","fullname":"plotOptions.bubble.states.hover.marker.symbol","title":"symbol","parent":"plotOptions-bubble-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<bar>-states-hover-marker--symbol","fullname":"series<bar>.states.hover.marker.symbol","title":"symbol","parent":"series<bar>-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-series-states-hover-marker--symbol","fullname":"plotOptions.series.states.hover.marker.symbol","title":"symbol","parent":"plotOptions-series-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-spline-states-hover-marker--symbol","fullname":"plotOptions.spline.states.hover.marker.symbol","title":"symbol","parent":"plotOptions-spline-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<columnrange>-states-hover-marker--symbol","fullname":"series<columnrange>.states.hover.marker.symbol","title":"symbol","parent":"series<columnrange>-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<boxplot>-states-hover-marker--symbol","fullname":"series<boxplot>.states.hover.marker.symbol","title":"symbol","parent":"series<boxplot>-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<polygon>-marker--symbol","fullname":"series<polygon>.marker.symbol","title":"symbol","parent":"series<polygon>-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-area-marker--symbol","fullname":"plotOptions.area.marker.symbol","title":"symbol","parent":"plotOptions-area-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<line>-states-hover-marker--symbol","fullname":"series<line>.states.hover.marker.symbol","title":"symbol","parent":"series<line>-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-arearange-states-hover-marker--symbol","fullname":"plotOptions.arearange.states.hover.marker.symbol","title":"symbol","parent":"plotOptions-arearange-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<pie>-states-hover-marker--symbol","fullname":"series<pie>.states.hover.marker.symbol","title":"symbol","parent":"series<pie>-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<areasplinerange>-states-hover-marker--symbol","fullname":"series<areasplinerange>.states.hover.marker.symbol","title":"symbol","parent":"series<areasplinerange>-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<funnel>-states-hover-marker--symbol","fullname":"series<funnel>.states.hover.marker.symbol","title":"symbol","parent":"series<funnel>-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<polygon>-data-marker--symbol","fullname":"series<polygon>.data.marker.symbol","title":"symbol","parent":"series<polygon>-data-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<polygon>-states-hover-marker--symbol","fullname":"series<polygon>.states.hover.marker.symbol","title":"symbol","parent":"series<polygon>-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<line>-data-marker--symbol","fullname":"series<line>.data.marker.symbol","title":"symbol","parent":"series<line>-data-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<scatter>-marker--symbol","fullname":"series<scatter>.marker.symbol","title":"symbol","parent":"series<scatter>-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-boxplot-states-hover-marker--symbol","fullname":"plotOptions.boxplot.states.hover.marker.symbol","title":"symbol","parent":"plotOptions-boxplot-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<areaspline>-states-hover-marker--symbol","fullname":"series<areaspline>.states.hover.marker.symbol","title":"symbol","parent":"series<areaspline>-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-waterfall-states-hover-marker--symbol","fullname":"plotOptions.waterfall.states.hover.marker.symbol","title":"symbol","parent":"plotOptions-waterfall-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-heatmap-states-hover-marker--symbol","fullname":"plotOptions.heatmap.states.hover.marker.symbol","title":"symbol","parent":"plotOptions-heatmap-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-pyramid-states-hover-marker--symbol","fullname":"plotOptions.pyramid.states.hover.marker.symbol","title":"symbol","parent":"plotOptions-pyramid-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-spline-marker--symbol","fullname":"plotOptions.spline.marker.symbol","title":"symbol","parent":"plotOptions-spline-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<pyramid>-states-hover-marker--symbol","fullname":"series<pyramid>.states.hover.marker.symbol","title":"symbol","parent":"series<pyramid>-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<bubble>-marker--symbol","fullname":"series<bubble>.marker.symbol","title":"symbol","parent":"series<bubble>-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<areaspline>-data-marker--symbol","fullname":"series<areaspline>.data.marker.symbol","title":"symbol","parent":"series<areaspline>-data-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-areaspline-states-hover-marker--symbol","fullname":"plotOptions.areaspline.states.hover.marker.symbol","title":"symbol","parent":"plotOptions-areaspline-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-pie-states-hover-marker--symbol","fullname":"plotOptions.pie.states.hover.marker.symbol","title":"symbol","parent":"plotOptions-pie-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-area-states-hover-marker--symbol","fullname":"plotOptions.area.states.hover.marker.symbol","title":"symbol","parent":"plotOptions-area-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<spline>-states-hover-marker--symbol","fullname":"series<spline>.states.hover.marker.symbol","title":"symbol","parent":"series<spline>-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-line-marker--symbol","fullname":"plotOptions.line.marker.symbol","title":"symbol","parent":"plotOptions-line-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-polygon-marker--symbol","fullname":"plotOptions.polygon.marker.symbol","title":"symbol","parent":"plotOptions-polygon-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<areaspline>-marker--symbol","fullname":"series<areaspline>.marker.symbol","title":"symbol","parent":"series<areaspline>-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-column-states-hover-marker--symbol","fullname":"plotOptions.column.states.hover.marker.symbol","title":"symbol","parent":"plotOptions-column-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"exporting-buttons-contextButton--symbol","fullname":"exporting.buttons.contextButton.symbol","title":"symbol","parent":"exporting-buttons-contextButton","isParent":false,"returnType":"String","defaults":"menu","values":"[\"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\", \"menu\"]","since":"2.0","description":"The symbol for the button. Points to a definition function in the \r <code>Highcharts.Renderer.symbols</code> collection. The default\r <code>exportIcon</code> function is part of the exporting module.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/exporting/buttons-contextbutton-symbol/\" target=\"_blank\">Use a circle for symbol</a>","deprecated":false},{"name":"series<area>-marker--symbol","fullname":"series<area>.marker.symbol","title":"symbol","parent":"series<area>-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-bubble-marker--symbol","fullname":"plotOptions.bubble.marker.symbol","title":"symbol","parent":"plotOptions-bubble-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<solidgauge>-states-hover-marker--symbol","fullname":"series<solidgauge>.states.hover.marker.symbol","title":"symbol","parent":"series<solidgauge>-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<scatter>-data-marker--symbol","fullname":"series<scatter>.data.marker.symbol","title":"symbol","parent":"series<scatter>-data-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-treemap-states-hover-marker--symbol","fullname":"plotOptions.treemap.states.hover.marker.symbol","title":"symbol","parent":"plotOptions-treemap-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<area>-data-marker--symbol","fullname":"series<area>.data.marker.symbol","title":"symbol","parent":"series<area>-data-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<spline>-data-marker--symbol","fullname":"series<spline>.data.marker.symbol","title":"symbol","parent":"series<spline>-data-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<treemap>-states-hover-marker--symbol","fullname":"series<treemap>.states.hover.marker.symbol","title":"symbol","parent":"series<treemap>-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-gauge-states-hover-marker--symbol","fullname":"plotOptions.gauge.states.hover.marker.symbol","title":"symbol","parent":"plotOptions-gauge-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<waterfall>-states-hover-marker--symbol","fullname":"series<waterfall>.states.hover.marker.symbol","title":"symbol","parent":"series<waterfall>-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<errorbar>-states-hover-marker--symbol","fullname":"series<errorbar>.states.hover.marker.symbol","title":"symbol","parent":"series<errorbar>-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<arearange>-states-hover-marker--symbol","fullname":"series<arearange>.states.hover.marker.symbol","title":"symbol","parent":"series<arearange>-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"series<area>-states-hover-marker--symbol","fullname":"series<area>.states.hover.marker.symbol","title":"symbol","parent":"series<area>-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-columnrange-states-hover-marker--symbol","fullname":"plotOptions.columnrange.states.hover.marker.symbol","title":"symbol","parent":"plotOptions-columnrange-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-solidgauge-states-hover-marker--symbol","fullname":"plotOptions.solidgauge.states.hover.marker.symbol","title":"symbol","parent":"plotOptions-solidgauge-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-bar-states-hover-marker--symbol","fullname":"plotOptions.bar.states.hover.marker.symbol","title":"symbol","parent":"plotOptions-bar-states-hover-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"plotOptions-series-marker--symbol","fullname":"plotOptions.series.marker.symbol","title":"symbol","parent":"plotOptions-series-marker","isParent":false,"returnType":"String","values":"[null, \"circle\", \"square\", \"diamond\", \"triangle\", \"triangle-down\"]","description":"<p>A predefined shape or symbol for the marker. When null, the symbol is pulled from options.symbols. Other possible values are \"circle\", \"square\", \"diamond\", \"triangle\" and \"triangle-down\".</p>\r\n\r\n<p>Additionally, the URL to a graphic can be given on this form:  \"url(graphic.png)\". Note that for the image to be applied to exported charts, its URL needs to be accessible by the export server.</p>\r\n\r\n<p>Custom callbacks for symbol path generation can also be added to <code>Highcharts.SVGRenderer.prototype.symbols</code>. The callback is then used by its method name, as shown in the demo.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-symbol/\" target=\"_blank\">Predefined, graphic and custom markers</a>","deprecated":false},{"name":"navigation-buttonOptions--symbolFill","fullname":"navigation.buttonOptions.symbolFill","title":"symbolFill","parent":"navigation-buttonOptions","isParent":false,"returnType":"Color","defaults":"#E0E0E0","since":"2.0","description":"Fill color for the symbol within the button.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-symbolfill/\" target=\"_blank\">Blue symbol stroke for one of the buttons</a>"},{"name":"exporting-buttons-contextButton--symbolFill","fullname":"exporting.buttons.contextButton.symbolFill","title":"symbolFill","parent":"exporting-buttons-contextButton","isParent":false,"returnType":"Color","defaults":"#A8BF77","since":"2.0","description":"See <a class=\"internal\" href=\"#navigation.buttonOptions\">navigation.buttonOptions</a> =&gt; symbolFill.","deprecated":false},{"name":"legend--symbolHeight","fullname":"legend.symbolHeight","title":"symbolHeight","parent":"legend","isParent":false,"returnType":"Number","since":"3.0.8","description":"The pixel height of the symbol for series types that use a rectangle in the legend. Defaults to the font size of legend items.","deprecated":false},{"name":"legend--symbolPadding","fullname":"legend.symbolPadding","title":"symbolPadding","parent":"legend","isParent":false,"returnType":"Number","defaults":"5","description":"The pixel padding between the legend item symbol and the legend item text.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/symbolpadding/\" target=\"_blank\">Greater symbol width and padding</a>"},{"name":"legend--symbolRadius","fullname":"legend.symbolRadius","title":"symbolRadius","parent":"legend","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"3.0.8","description":"The border radius of the symbol for series types that use a rectangle in the legend.","demo":"","seeAlso":"","deprecated":false},{"name":"navigation-buttonOptions--symbolSize","fullname":"navigation.buttonOptions.symbolSize","title":"symbolSize","parent":"navigation-buttonOptions","isParent":false,"returnType":"Number","defaults":"14","since":"2.0","description":"The pixel size of the symbol on the button.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-height/\" target=\"_blank\">Bigger buttons</a>","deprecated":false},{"name":"exporting-buttons-contextButton--symbolSize","fullname":"exporting.buttons.contextButton.symbolSize","title":"symbolSize","parent":"exporting-buttons-contextButton","isParent":false,"returnType":"Number","defaults":"14","since":"2.0","description":"The pixel size of the symbol on the button.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-height/\" target=\"_blank\">Bigger buttons</a>","deprecated":false},{"name":"exporting-buttons-contextButton--symbolStroke","fullname":"exporting.buttons.contextButton.symbolStroke","title":"symbolStroke","parent":"exporting-buttons-contextButton","isParent":false,"returnType":"Color","defaults":"#666","since":"2.0","description":"The color of the symbol's stroke or line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-symbolstroke/\" target=\"_blank\">Blue symbol stroke</a>","deprecated":false},{"name":"navigation-buttonOptions--symbolStroke","fullname":"navigation.buttonOptions.symbolStroke","title":"symbolStroke","parent":"navigation-buttonOptions","isParent":false,"returnType":"Color","defaults":"#666","since":"2.0","description":"The color of the symbol's stroke or line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-symbolstroke/\" target=\"_blank\">Blue symbol stroke</a>","deprecated":false},{"name":"navigation-buttonOptions--symbolStrokeWidth","fullname":"navigation.buttonOptions.symbolStrokeWidth","title":"symbolStrokeWidth","parent":"navigation-buttonOptions","isParent":false,"returnType":"Number","defaults":"1","since":"2.0","description":"The pixel stroke width of the symbol on the button.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-height/\" target=\"_blank\">Bigger buttons</a>"},{"name":"exporting-buttons-contextButton--symbolStrokeWidth","fullname":"exporting.buttons.contextButton.symbolStrokeWidth","title":"symbolStrokeWidth","parent":"exporting-buttons-contextButton","isParent":false,"returnType":"Number","defaults":"1","since":"2.0","description":"The pixel stroke width of the symbol on the button.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-height/\" target=\"_blank\">Bigger buttons</a>"},{"name":"legend--symbolWidth","fullname":"legend.symbolWidth","title":"symbolWidth","parent":"legend","isParent":false,"returnType":"Number","defaults":"16","description":"The pixel width of the legend item symbol.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/symbolwidth/\" target=\"_blank\">Greater symbol width and padding</a>","deprecated":false},{"name":"exporting-buttons-contextButton--symbolX","fullname":"exporting.buttons.contextButton.symbolX","title":"symbolX","parent":"exporting-buttons-contextButton","isParent":false,"returnType":"Number","defaults":"12.5","since":"2.0","description":"The x position of the center of the symbol inside the button.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-height/\" target=\"_blank\">Bigger buttons</a>","deprecated":false},{"name":"navigation-buttonOptions--symbolX","fullname":"navigation.buttonOptions.symbolX","title":"symbolX","parent":"navigation-buttonOptions","isParent":false,"returnType":"Number","defaults":"12.5","since":"2.0","description":"The x position of the center of the symbol inside the button.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-height/\" target=\"_blank\">Bigger buttons</a>","deprecated":false},{"name":"exporting-buttons-contextButton--symbolY","fullname":"exporting.buttons.contextButton.symbolY","title":"symbolY","parent":"exporting-buttons-contextButton","isParent":false,"returnType":"Number","defaults":"10.5","since":"2.0","description":"The y position of the center of the symbol inside the button.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-height/\" target=\"_blank\">Bigger buttons</a>"},{"name":"navigation-buttonOptions--symbolY","fullname":"navigation.buttonOptions.symbolY","title":"symbolY","parent":"navigation-buttonOptions","isParent":false,"returnType":"Number","defaults":"10.5","since":"2.0","description":"The y position of the center of the symbol inside the button.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-height/\" target=\"_blank\">Bigger buttons</a>"},{"name":"data--table","fullname":"data.table","title":"table","parent":"data","isParent":false,"returnType":"String|HTMLElement","defaults":"","values":"","since":"4.0","description":"A HTML table or the id of such to be parsed as input data. Related options are <code>startRow</code>, <code>endRow</code>, <code>startColumn</code> and <code>endColumn</code> to delimit what part of the table is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/column-parsed/\" target=\"_blank\">Parsed table</a>","seeAlso":"","deprecated":false},{"name":"navigation-buttonOptions--text","fullname":"navigation.buttonOptions.text","title":"text","parent":"navigation-buttonOptions","isParent":false,"returnType":"String","defaults":"null","values":"","since":"3.0","description":"A text string to add to the individual button. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/exporting/buttons-text/\" target=\"_blank\">Full text button</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/exporting/buttons-text-symbol/\" target=\"_blank\">combined symbol and text</a> ","seeAlso":"","deprecated":false},{"name":"yAxis-plotBands-label--text","fullname":"yAxis.plotBands.label.text","title":"text","parent":"yAxis-plotBands-label","isParent":false,"returnType":"String","since":"2.1","description":"The string text itself. A subset of HTML is supported."},{"name":"xAxis-plotLines-label--text","fullname":"xAxis.plotLines.label.text","title":"text","parent":"xAxis-plotLines-label","isParent":false,"returnType":"String","defaults":"","values":"","since":"2.1","description":"The text itself. A subset of HTML is supported.","demo":"","seeAlso":"","deprecated":false},{"name":"xAxis-title--text","fullname":"xAxis.title.text","title":"text","parent":"xAxis-title","isParent":false,"returnType":"String","description":"The actual text of the axis title. It can contain basic HTML text markup like &lt;b&gt;, &lt;i&gt; and spans with style.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/title-text/\" target=\"_blank\">Custom HTML</a> title for X axis"},{"name":"exporting-buttons-contextButton--text","fullname":"exporting.buttons.contextButton.text","title":"text","parent":"exporting-buttons-contextButton","isParent":false,"returnType":"String","defaults":"null","values":"","since":"3.0","description":"A text string to add to the individual button. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/exporting/buttons-text/\" target=\"_blank\">Full text button</a>, <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/exporting/buttons-text-symbol/\" target=\"_blank\">combined symbol and text</a> ","seeAlso":"","deprecated":false},{"name":"xAxis-plotBands-label--text","fullname":"xAxis.plotBands.label.text","title":"text","parent":"xAxis-plotBands-label","isParent":false,"returnType":"String","since":"2.1","description":"The string text itself. A subset of HTML is supported."},{"name":"yAxis-title--text","fullname":"yAxis.title.text","title":"text","parent":"yAxis-title","isParent":false,"returnType":"String","defaults":"Values","description":"The actual text of the axis title. Horizontal texts can contain HTML, \r but rotated texts are painted using vector techniques and must be \r clean text. The Y axis title is disabled by setting the <code>text</code>\r option to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/title-text/\" target=\"_blank\">Custom HTML</a> title for X axis","deprecated":false},{"name":"legend-title--text","fullname":"legend.title.text","title":"text","parent":"legend-title","isParent":false,"returnType":"String","defaults":"null","values":"","since":"3.0","description":"A text or HTML string for the title. ","demo":"","seeAlso":"","deprecated":false},{"name":"yAxis-plotLines-label--text","fullname":"yAxis.plotLines.label.text","title":"text","parent":"yAxis-plotLines-label","isParent":false,"returnType":"String","defaults":"","values":"","since":"2.1","description":"The text itself. A subset of HTML is supported.","demo":"","seeAlso":"","deprecated":false},{"name":"subtitle--text","fullname":"subtitle.text","title":"text","parent":"subtitle","isParent":false,"returnType":"String","description":"The subtitle of the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/subtitle/text/\" target=\"_blank\">Custom subtitle</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/subtitle/text-formatted/\" target=\"_blank\">formatted and linked text.</a>"},{"name":"title--text","fullname":"title.text","title":"text","parent":"title","isParent":false,"returnType":"String","defaults":"Chart title","description":"The title of the chart. To disable the title, set the <code>text</code> to <code>null</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/title/text/\" target=\"_blank\">Custom title</a>"},{"name":"credits--text","fullname":"credits.text","title":"text","parent":"credits","isParent":false,"returnType":"String","defaults":"Highcharts.com","description":"The text for the credits label.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/credits/href/\" target=\"_blank\">Custom URL and text</a>"},{"name":"yAxis-plotBands-label--textAlign","fullname":"yAxis.plotBands.label.textAlign","title":"textAlign","parent":"yAxis-plotBands-label","isParent":false,"returnType":"String","since":"2.1","description":"The text alignment for the label. While <code>align</code> determines where the texts anchor point is placed within the plot band, <code>textAlign</code> determines how the text is aligned against its anchor point. Possible values are \"left\", \"center\" and \"right\". Defaults to the same as the <code>align</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-label-rotation/\" target=\"_blank\">Vertical text in center position but text-aligned left</a>"},{"name":"yAxis-stackLabels--textAlign","fullname":"yAxis.stackLabels.textAlign","title":"textAlign","parent":"yAxis-stackLabels","isParent":false,"returnType":"String","values":"[\"left\", \"center\", \"right\"]","since":"2.1.5","description":"The text alignment for the label. While <code>align</code> determines where the texts anchor point is placed with regards to the stack, <code>textAlign</code> determines how the text is aligned against its anchor point. Possible values are <code>\"left\"</code>, <code>\"center\"</code> and <code>\"right\"</code>. The default value is calculated at runtime and depends on orientation and whether the stack is positive or negative.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/stacklabels-textalign-left/\" target=\"_blank\">Label in center position but text-aligned left</a>"},{"name":"yAxis-plotLines-label--textAlign","fullname":"yAxis.plotLines.label.textAlign","title":"textAlign","parent":"yAxis-plotLines-label","isParent":false,"returnType":"String","since":"2.1","description":"The text alignment for the label. While <code>align</code> determines where the texts anchor point is placed within the plot band, <code>textAlign</code> determines how the text is aligned against its anchor point. Possible values are \"left\", \"center\" and \"right\". Defaults to the same as the <code>align</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-label-textalign/\" target=\"_blank\">Text label in bottom position</a>"},{"name":"xAxis-plotBands-label--textAlign","fullname":"xAxis.plotBands.label.textAlign","title":"textAlign","parent":"xAxis-plotBands-label","isParent":false,"returnType":"String","since":"2.1","description":"The text alignment for the label. While <code>align</code> determines where the texts anchor point is placed within the plot band, <code>textAlign</code> determines how the text is aligned against its anchor point. Possible values are \"left\", \"center\" and \"right\". Defaults to the same as the <code>align</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-label-rotation/\" target=\"_blank\">Vertical text in center position but text-aligned left</a>"},{"name":"xAxis-plotLines-label--textAlign","fullname":"xAxis.plotLines.label.textAlign","title":"textAlign","parent":"xAxis-plotLines-label","isParent":false,"returnType":"String","since":"2.1","description":"The text alignment for the label. While <code>align</code> determines where the texts anchor point is placed within the plot band, <code>textAlign</code> determines how the text is aligned against its anchor point. Possible values are \"left\", \"center\" and \"right\". Defaults to the same as the <code>align</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-label-textalign/\" target=\"_blank\">Text label in bottom position</a>"},{"name":"drilldown-drillUpButton--theme","fullname":"drilldown.drillUpButton.theme","title":"theme","parent":"drilldown-drillUpButton","isParent":false,"returnType":"Object","defaults":"","values":"","since":"3.0.8","description":"A collection of attributes for the button. The object takes SVG attributes like  <code>fill</code>, <code>stroke</code>, <code>stroke-width</code> or <code>r</code>, the border radius. The theme also supports <code>style</code>, a collection of CSS properties for the text. Equivalent attributes for the hover state are given in <code>theme.states.hover</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/drilldown/drillupbutton/\" target=\"_blank\">Button theming</a>","seeAlso":"","deprecated":false},{"name":"navigation-buttonOptions--theme","fullname":"navigation.buttonOptions.theme","title":"theme","parent":"navigation-buttonOptions","isParent":false,"returnType":"Object","defaults":"","values":"","since":"3.0","description":"A configuration object for the button theme. The object accepts SVG properties like <code>stroke-width</code>, <code>stroke</code> and <code>fill</code>. Tri-state button styles are supported by the <code>states.hover</code> and <code>states.select</code> objects.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-theme/\" target=\"_blank\">Theming the buttons</a>","seeAlso":"","deprecated":false},{"name":"chart-resetZoomButton--theme","fullname":"chart.resetZoomButton.theme","title":"theme","parent":"chart-resetZoomButton","isParent":false,"returnType":"Object","since":"2.2","description":"A collection of attributes for the button. The object takes SVG attributes like  <code>fill</code>, <code>stroke</code>, <code>stroke-width</code> or <code>r</code>, the border radius. The theme also supports <code>style</code>, a collection of CSS properties for the text. Equivalent attributes for the hover state are given in <code>theme.states.hover</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/resetzoombutton-theme/\" target=\"_blank\">Theming the button</a>"},{"name":"exporting-buttons-contextButton--theme","fullname":"exporting.buttons.contextButton.theme","title":"theme","parent":"exporting-buttons-contextButton","isParent":false,"returnType":"Object","defaults":"","values":"","since":"3.0","description":"A configuration object for the button theme. The object accepts SVG properties like <code>stroke-width</code>, <code>stroke</code> and <code>fill</code>. Tri-state button styles are supported by the <code>states.hover</code> and <code>states.select</code> objects.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-theme/\" target=\"_blank\">Theming the buttons</a>","seeAlso":"","deprecated":false},{"name":"yAxis-plotBands--thickness","fullname":"yAxis.plotBands.thickness","title":"thickness","parent":"yAxis-plotBands","isParent":false,"returnType":"Number|String","defaults":"10","values":"","since":"2.3","description":"In a gauge chart, this option sets the width of the plot band stretching along the perimeter. It can be given as a percentage string, like <code>\"10%\"</code>, or as a pixel number, like <code>10</code>. The default value 10 is the same as the default <a href=\"#yAxis.tickLength\">tickLength</a>, thus making the plot band act as a background for the tick markers. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-gauge\" target=\"_blank\">Gauge plot band</a>","seeAlso":"","deprecated":false},{"name":"lang--thousandsSep","fullname":"lang.thousandsSep","title":"thousandsSep","parent":"lang","isParent":false,"returnType":"String","defaults":" ","since":"1.2.2","description":"The default thousands separator used in the <code>Highcharts.numberFormat</code> method unless otherwise specified in the function arguments. Since Highcharts 4.1 it defaults to a single space character, which is compatible with ISO and works across Anglo-American and continental European languages.","deprecated":false},{"name":"plotOptions-waterfall--threshold","fullname":"plotOptions.waterfall.threshold","title":"threshold","parent":"plotOptions-waterfall","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"2.0","description":"The Y axis value to serve as the base for the columns, for distinguishing between values above and below a threshold. If <code>null</code>, the columns extend from the padding Y axis minimum.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bubble>--threshold","fullname":"series<bubble>.threshold","title":"threshold","parent":"series<bubble>","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"3.0","description":"The threshold, also called zero level or base level. For line type series this is only used in conjunction with <a href=\"#plotOptions.series.negativeColor\">negativeColor</a>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-spline--threshold","fullname":"plotOptions.spline.threshold","title":"threshold","parent":"plotOptions-spline","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"3.0","description":"The threshold, also called zero level or base level. For line type series this is only used in conjunction with <a href=\"#plotOptions.series.negativeColor\">negativeColor</a>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-area--threshold","fullname":"plotOptions.area.threshold","title":"threshold","parent":"plotOptions-area","isParent":false,"returnType":"Number","defaults":"0","since":"2.0","description":"The Y axis value to serve as the base for the area, for distinguishing between values above and below a threshold. If <code>null</code>, the area behaves\r like a line series with fill between the graph and the Y axis minimum.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-threshold/\" target=\"_blank\">A threshold of 100</a>","seeAlso":"","deprecated":false},{"name":"series<waterfall>--threshold","fullname":"series<waterfall>.threshold","title":"threshold","parent":"series<waterfall>","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"2.0","description":"The Y axis value to serve as the base for the columns, for distinguishing between values above and below a threshold. If <code>null</code>, the columns extend from the padding Y axis minimum.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bar--threshold","fullname":"plotOptions.bar.threshold","title":"threshold","parent":"plotOptions-bar","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"2.0","description":"The Y axis value to serve as the base for the columns, for distinguishing between values above and below a threshold. If <code>null</code>, the columns extend from the padding Y axis minimum.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-line--threshold","fullname":"plotOptions.line.threshold","title":"threshold","parent":"plotOptions-line","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"3.0","description":"The threshold, also called zero level or base level. For line type series this is only used in conjunction with <a href=\"#plotOptions.series.negativeColor\">negativeColor</a>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<polygon>--threshold","fullname":"series<polygon>.threshold","title":"threshold","parent":"series<polygon>","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"3.0","description":"The threshold, also called zero level or base level. For line type series this is only used in conjunction with <a href=\"#plotOptions.series.negativeColor\">negativeColor</a>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<line>--threshold","fullname":"series<line>.threshold","title":"threshold","parent":"series<line>","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"3.0","description":"The threshold, also called zero level or base level. For line type series this is only used in conjunction with <a href=\"#plotOptions.series.negativeColor\">negativeColor</a>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange--threshold","fullname":"plotOptions.columnrange.threshold","title":"threshold","parent":"plotOptions-columnrange","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"2.0","description":"The Y axis value to serve as the base for the columns, for distinguishing between values above and below a threshold. If <code>null</code>, the columns extend from the padding Y axis minimum.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble--threshold","fullname":"plotOptions.bubble.threshold","title":"threshold","parent":"plotOptions-bubble","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"3.0","description":"The threshold, also called zero level or base level. For line type series this is only used in conjunction with <a href=\"#plotOptions.series.negativeColor\">negativeColor</a>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<area>--threshold","fullname":"series<area>.threshold","title":"threshold","parent":"series<area>","isParent":false,"returnType":"Number","defaults":"0","since":"2.0","description":"The Y axis value to serve as the base for the area, for distinguishing between values above and below a threshold. If <code>null</code>, the area behaves\r like a line series with fill between the graph and the Y axis minimum.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-threshold/\" target=\"_blank\">A threshold of 100</a>","seeAlso":"","deprecated":false},{"name":"series<scatter>--threshold","fullname":"series<scatter>.threshold","title":"threshold","parent":"series<scatter>","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"3.0","description":"The threshold, also called zero level or base level. For line type series this is only used in conjunction with <a href=\"#plotOptions.series.negativeColor\">negativeColor</a>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter--threshold","fullname":"plotOptions.scatter.threshold","title":"threshold","parent":"plotOptions-scatter","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"3.0","description":"The threshold, also called zero level or base level. For line type series this is only used in conjunction with <a href=\"#plotOptions.series.negativeColor\">negativeColor</a>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon--threshold","fullname":"plotOptions.polygon.threshold","title":"threshold","parent":"plotOptions-polygon","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"3.0","description":"The threshold, also called zero level or base level. For line type series this is only used in conjunction with <a href=\"#plotOptions.series.negativeColor\">negativeColor</a>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areaspline>--threshold","fullname":"series<areaspline>.threshold","title":"threshold","parent":"series<areaspline>","isParent":false,"returnType":"Number","defaults":"0","since":"2.0","description":"The Y axis value to serve as the base for the area, for distinguishing between values above and below a threshold. If <code>null</code>, the area behaves\r like a line series with fill between the graph and the Y axis minimum.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-threshold/\" target=\"_blank\">A threshold of 100</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline--threshold","fullname":"plotOptions.areaspline.threshold","title":"threshold","parent":"plotOptions-areaspline","isParent":false,"returnType":"Number","defaults":"0","since":"2.0","description":"The Y axis value to serve as the base for the area, for distinguishing between values above and below a threshold. If <code>null</code>, the area behaves\r like a line series with fill between the graph and the Y axis minimum.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-threshold/\" target=\"_blank\">A threshold of 100</a>","seeAlso":"","deprecated":false},{"name":"series<column>--threshold","fullname":"series<column>.threshold","title":"threshold","parent":"series<column>","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"2.0","description":"The Y axis value to serve as the base for the columns, for distinguishing between values above and below a threshold. If <code>null</code>, the columns extend from the padding Y axis minimum.","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>--threshold","fullname":"series<spline>.threshold","title":"threshold","parent":"series<spline>","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"3.0","description":"The threshold, also called zero level or base level. For line type series this is only used in conjunction with <a href=\"#plotOptions.series.negativeColor\">negativeColor</a>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bar>--threshold","fullname":"series<bar>.threshold","title":"threshold","parent":"series<bar>","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"2.0","description":"The Y axis value to serve as the base for the columns, for distinguishing between values above and below a threshold. If <code>null</code>, the columns extend from the padding Y axis minimum.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-series--threshold","fullname":"plotOptions.series.threshold","title":"threshold","parent":"plotOptions-series","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"3.0","description":"The threshold, also called zero level or base level. For line type series this is only used in conjunction with <a href=\"#plotOptions.series.negativeColor\">negativeColor</a>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge--threshold","fullname":"plotOptions.gauge.threshold","title":"threshold","parent":"plotOptions-gauge","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"3.0","description":"The threshold, also called zero level or base level. For line type series this is only used in conjunction with <a href=\"#plotOptions.series.negativeColor\">negativeColor</a>.","demo":"","seeAlso":"","deprecated":false},{"name":"series<gauge>--threshold","fullname":"series<gauge>.threshold","title":"threshold","parent":"series<gauge>","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"3.0","description":"The threshold, also called zero level or base level. For line type series this is only used in conjunction with <a href=\"#plotOptions.series.negativeColor\">negativeColor</a>.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column--threshold","fullname":"plotOptions.column.threshold","title":"threshold","parent":"plotOptions-column","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"2.0","description":"The Y axis value to serve as the base for the columns, for distinguishing between values above and below a threshold. If <code>null</code>, the columns extend from the padding Y axis minimum.","demo":"","seeAlso":"","deprecated":false},{"name":"series<columnrange>--threshold","fullname":"series<columnrange>.threshold","title":"threshold","parent":"series<columnrange>","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"2.0","description":"The Y axis value to serve as the base for the columns, for distinguishing between values above and below a threshold. If <code>null</code>, the columns extend from the padding Y axis minimum.","demo":"","seeAlso":"","deprecated":false},{"name":"xAxis--tickAmount","fullname":"xAxis.tickAmount","title":"tickAmount","parent":"xAxis","isParent":false,"returnType":"Number","since":"4.1.0","description":"<p>The amount of ticks to draw on the axis. This opens up for aligning the ticks of multiple charts or panes within a chart. This option overrides the <code>tickPixelInterval</code> option.</p>\r\n<p>This option only has an effect on linear axes. Datetime, logarithmic or category axes are not affected.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/tickamount/\" target=\"_blank\">8 ticks on Y axis</a>","deprecated":false},{"name":"yAxis--tickAmount","fullname":"yAxis.tickAmount","title":"tickAmount","parent":"yAxis","isParent":false,"returnType":"Number","since":"4.1.0","description":"<p>The amount of ticks to draw on the axis. This opens up for aligning the ticks of multiple charts or panes within a chart. This option overrides the <code>tickPixelInterval</code> option.</p>\r\n<p>This option only has an effect on linear axes. Datetime, logarithmic or category axes are not affected.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/tickamount/\" target=\"_blank\">8 ticks on Y axis</a>","deprecated":false},{"name":"xAxis--tickColor","fullname":"xAxis.tickColor","title":"tickColor","parent":"xAxis","isParent":false,"returnType":"Color","defaults":"#C0D0E0","description":"Color for the main tick marks.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/tickcolor/\" target=\"_blank\">Red ticks on X axis</a>"},{"name":"yAxis--tickColor","fullname":"yAxis.tickColor","title":"tickColor","parent":"yAxis","isParent":false,"returnType":"Color","defaults":"#C0D0E0","description":"Color for the main tick marks.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/tickcolor/\" target=\"_blank\">Red ticks on X axis</a>"},{"name":"yAxis--tickInterval","fullname":"yAxis.tickInterval","title":"tickInterval","parent":"yAxis","isParent":false,"returnType":"Number","description":"<p>The interval of the tick marks in axis units. When <code>null</code>, the tick interval\r\n is computed to approximately follow the <a href=\"#xAxis.tickPixelInterval\">tickPixelInterval</a> on linear and datetime axes.\r\n On categorized axes, a <code>null</code> tickInterval will default to 1, one category. \r\n Note that datetime axes are based on milliseconds, so for \r\n example an interval of one day is expressed as <code>24 * 3600 * 1000</code>.</p>\r\n <p>On logarithmic axes, the tickInterval is based on powers, so a tickInterval of 1 means\r\n \tone tick on each of 0.1, 1, 10, 100 etc. A tickInterval of 2 means a tick of 0.1, 10, 1000 etc.\r\n \tA tickInterval of 0.2 puts a tick on 0.1, 0.2, 0.4, 0.6, 0.8, 1, 2, 4, 6, 8, 10, 20, 40 etc.</p>\r\n<p>If the tickInterval is too dense for labels to be drawn, Highcharts may remove ticks.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/tickinterval-5/\" target=\"_blank\">Tick interval of 5 on a linear axis</a>","seeAlso":"<a href=\"#xAxis.tickPixelInterval\">tickPixelInterval</a>, <a href=\"#xAxis.tickPositions\">tickPositions</a>, <a href=\"#xAxis.tickPositioner\">tickPositioner</a>","deprecated":false},{"name":"xAxis--tickInterval","fullname":"xAxis.tickInterval","title":"tickInterval","parent":"xAxis","isParent":false,"returnType":"Number","description":"<p>The interval of the tick marks in axis units. When <code>null</code>, the tick interval\r\n is computed to approximately follow the <a href=\"#xAxis.tickPixelInterval\">tickPixelInterval</a> on linear and datetime axes.\r\n On categorized axes, a <code>null</code> tickInterval will default to 1, one category. \r\n Note that datetime axes are based on milliseconds, so for \r\n example an interval of one day is expressed as <code>24 * 3600 * 1000</code>.</p>\r\n <p>On logarithmic axes, the tickInterval is based on powers, so a tickInterval of 1 means\r\n \tone tick on each of 0.1, 1, 10, 100 etc. A tickInterval of 2 means a tick of 0.1, 10, 1000 etc.\r\n \tA tickInterval of 0.2 puts a tick on 0.1, 0.2, 0.4, 0.6, 0.8, 1, 2, 4, 6, 8, 10, 20, 40 etc.</p>\r\n<p>If the tickInterval is too dense for labels to be drawn, Highcharts may remove ticks.</p>","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/tickinterval-5/\" target=\"_blank\">Tick interval of 5 on a linear axis</a>","seeAlso":"<a href=\"#xAxis.tickPixelInterval\">tickPixelInterval</a>, <a href=\"#xAxis.tickPositions\">tickPositions</a>, <a href=\"#xAxis.tickPositioner\">tickPositioner</a>","deprecated":false},{"name":"xAxis--tickLength","fullname":"xAxis.tickLength","title":"tickLength","parent":"xAxis","isParent":false,"returnType":"Number","defaults":"10","description":"The pixel length of the main tick marks.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/ticklength/\" target=\"_blank\">20 px tick length on the X axis</a>","deprecated":false},{"name":"yAxis--tickLength","fullname":"yAxis.tickLength","title":"tickLength","parent":"yAxis","isParent":false,"returnType":"Number","defaults":"10","description":"The pixel length of the main tick marks.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/ticklength/\" target=\"_blank\">20 px tick length on the X axis</a>","deprecated":false},{"name":"yAxis--tickPixelInterval","fullname":"yAxis.tickPixelInterval","title":"tickPixelInterval","parent":"yAxis","isParent":false,"returnType":"Number","description":"If tickInterval is <code>null</code> this option sets the approximate pixel interval of the\r tick marks. Not applicable to categorized axis. Defaults to <code>72</code> \r for the Y axis and <code>100</code> for\tthe X axis.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/tickpixelinterval-50/\" target=\"_blank\">50 px on X axis</a>","seeAlso":"<a href=\"#xAxis.tickInterval\">tickInterval</a>, <a href=\"#xAxis.tickPositioner\">tickPositioner</a>, <a href=\"#xAxis.tickPositions\">tickPositions</a>-","deprecated":false},{"name":"xAxis--tickPixelInterval","fullname":"xAxis.tickPixelInterval","title":"tickPixelInterval","parent":"xAxis","isParent":false,"returnType":"Number","description":"If tickInterval is <code>null</code> this option sets the approximate pixel interval of the\r tick marks. Not applicable to categorized axis. Defaults to <code>72</code> \r for the Y axis and <code>100</code> for\tthe X axis.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/tickpixelinterval-50/\" target=\"_blank\">50 px on X axis</a>","seeAlso":"<a href=\"#xAxis.tickInterval\">tickInterval</a>, <a href=\"#xAxis.tickPositioner\">tickPositioner</a>, <a href=\"#xAxis.tickPositions\">tickPositions</a>-","deprecated":false},{"name":"yAxis--tickPosition","fullname":"yAxis.tickPosition","title":"tickPosition","parent":"yAxis","isParent":false,"returnType":"String","defaults":"outside","values":"[\"inside\", \"outside\"]","description":"The position of the major tick marks relative to the axis line. Can be one of <code>inside</code> and <code>outside</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/tickposition-outside/\" target=\"_blank\">\"outside\" by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/tickposition-inside/\" target=\"_blank\">\"inside\"</a> on X axis"},{"name":"xAxis--tickPosition","fullname":"xAxis.tickPosition","title":"tickPosition","parent":"xAxis","isParent":false,"returnType":"String","defaults":"outside","values":"[\"inside\", \"outside\"]","description":"The position of the major tick marks relative to the axis line. Can be one of <code>inside</code> and <code>outside</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/tickposition-outside/\" target=\"_blank\">\"outside\" by default</a>, \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/tickposition-inside/\" target=\"_blank\">\"inside\"</a> on X axis"},{"name":"yAxis--tickPositioner","fullname":"yAxis.tickPositioner","title":"tickPositioner","parent":"yAxis","isParent":false,"returnType":"Function","description":"A callback function returning array defining where the ticks are laid out on the axis. This overrides the default behaviour of <a href=\"#xAxis.tickPixelInterval\">tickPixelInterval</a> and <a href=\"#xAxis.tickInterval\">tickInterval</a>. The automatic tick positions are accessible through <code>this.tickPositions</code> and can be modified by the callback.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/tickpositions-tickpositioner/\" target=\"_blank\">Demo of tickPositions and tickPositioner</a>","seeAlso":"<a href=\"#xAxis.tickPositions\">tickPositions</a>","deprecated":false},{"name":"xAxis--tickPositioner","fullname":"xAxis.tickPositioner","title":"tickPositioner","parent":"xAxis","isParent":false,"returnType":"Function","description":"A callback function returning array defining where the ticks are laid out on the axis. This overrides the default behaviour of <a href=\"#xAxis.tickPixelInterval\">tickPixelInterval</a> and <a href=\"#xAxis.tickInterval\">tickInterval</a>. The automatic tick positions are accessible through <code>this.tickPositions</code> and can be modified by the callback.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/tickpositions-tickpositioner/\" target=\"_blank\">Demo of tickPositions and tickPositioner</a>","seeAlso":"<a href=\"#xAxis.tickPositions\">tickPositions</a>","deprecated":false},{"name":"xAxis--tickPositions","fullname":"xAxis.tickPositions","title":"tickPositions","parent":"xAxis","isParent":false,"returnType":"Array<Number>","description":"An array defining where the ticks are laid out on the axis. This overrides the default behaviour of <a href=\"#xAxis.tickPixelInterval\">tickPixelInterval</a> and <a href=\"#xAxis.tickInterval\">tickInterval</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/tickpositions-tickpositioner/\" target=\"_blank\">Demo of tickPositions and tickPositioner</a>","seeAlso":"<a href=\"#xAxis.tickPositioner\">tickPositioner</a>","deprecated":false},{"name":"yAxis--tickPositions","fullname":"yAxis.tickPositions","title":"tickPositions","parent":"yAxis","isParent":false,"returnType":"Array<Number>","description":"An array defining where the ticks are laid out on the axis. This overrides the default behaviour of <a href=\"#xAxis.tickPixelInterval\">tickPixelInterval</a> and <a href=\"#xAxis.tickInterval\">tickInterval</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/tickpositions-tickpositioner/\" target=\"_blank\">Demo of tickPositions and tickPositioner</a>","seeAlso":"<a href=\"#xAxis.tickPositioner\">tickPositioner</a>","deprecated":false},{"name":"xAxis--tickWidth","fullname":"xAxis.tickWidth","title":"tickWidth","parent":"xAxis","isParent":false,"returnType":"Number","defaults":"1","description":"The pixel width of the major tick marks.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/tickwidth/\" target=\"_blank\">10 px width</a>"},{"name":"yAxis--tickWidth","fullname":"yAxis.tickWidth","title":"tickWidth","parent":"yAxis","isParent":false,"returnType":"Number","defaults":"0","description":"The pixel width of the major tick marks.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/tickwidth/\" target=\"_blank\">10 px width</a>"},{"name":"yAxis--tickmarkPlacement","fullname":"yAxis.tickmarkPlacement","title":"tickmarkPlacement","parent":"yAxis","isParent":false,"returnType":"String","defaults":"null","values":"[null, \"on\", \"between\"]","description":"For categorized axes only. If <code>on</code> the tick mark is placed in the center of  the category, if <code>between</code> the tick mark is placed between categories. The default is <code>between</code> if the <code>tickInterval</code> is 1, else <code>on</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/tickmarkplacement-between/\" target=\"_blank\">\"between\" by default</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/tickmarkplacement-on/\" target=\"_blank\">\"on\"</a>","deprecated":false},{"name":"xAxis--tickmarkPlacement","fullname":"xAxis.tickmarkPlacement","title":"tickmarkPlacement","parent":"xAxis","isParent":false,"returnType":"String","defaults":"null","values":"[null, \"on\", \"between\"]","description":"For categorized axes only. If <code>on</code> the tick mark is placed in the center of  the category, if <code>between</code> the tick mark is placed between categories. The default is <code>between</code> if the <code>tickInterval</code> is 1, else <code>on</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/tickmarkplacement-between/\" target=\"_blank\">\"between\" by default</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/tickmarkplacement-on/\" target=\"_blank\">\"on\"</a>","deprecated":false},{"name":"global--timezoneOffset","fullname":"global.timezoneOffset","title":"timezoneOffset","parent":"global","isParent":false,"returnType":"Number","defaults":"0","since":"3.0.8","description":"The timezone offset in minutes. Positive values are west, negative values are east of UTC, as in the ECMAScript <a href=\"https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/getTimezoneOffset\">getTimezoneOffset</a> method. Use this to display UTC based data in a predefined time zone. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/global/timezoneoffset/\" target=\"_blank\">Timezone offset</a>","seeAlso":"<a href=\"#global.getTimezoneOffset\">global.getTimezoneOffset</a>","deprecated":false},{"name":"title","fullname":"title","title":"title","isParent":true,"description":"The chart's main title."},{"name":"legend-title","fullname":"legend.title","title":"title","parent":"legend","isParent":true,"returnType":"","defaults":"","values":"","since":"3.0","description":"A title to be added on top of the legend.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/title/\" target=\"_blank\">Legend title</a>","seeAlso":"","deprecated":false},{"name":"xAxis-title","fullname":"xAxis.title","title":"title","parent":"xAxis","isParent":true,"description":"The axis title, showing next to the axis line."},{"name":"yAxis-title","fullname":"yAxis.title","title":"title","parent":"yAxis","isParent":true},{"name":"yAxis-plotBands--to","fullname":"yAxis.plotBands.to","title":"to","parent":"yAxis-plotBands","isParent":false,"returnType":"Number","description":"The end position of the plot band in axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-color/\" target=\"_blank\">Datetime axis</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-from/\" target=\"_blank\">categorized axis</a>,"},{"name":"yAxis-breaks--to","fullname":"yAxis.breaks.to","title":"to","parent":"yAxis-breaks","isParent":false,"returnType":"Number","context":"","defaults":"","values":"","since":"4.1.0","description":"The point where the break ends.","demo":"","seeAlso":"","deprecated":false},{"name":"xAxis-breaks--to","fullname":"xAxis.breaks.to","title":"to","parent":"xAxis-breaks","isParent":false,"returnType":"Number","context":"","defaults":"","values":"","since":"4.1.0","description":"The point where the break ends.","demo":"","seeAlso":"","deprecated":false},{"name":"xAxis-plotBands--to","fullname":"xAxis.plotBands.to","title":"to","parent":"xAxis-plotBands","isParent":false,"returnType":"Number","description":"The end position of the plot band in axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-color/\" target=\"_blank\">Datetime axis</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-from/\" target=\"_blank\">categorized axis</a>,"},{"name":"series<bar>-tooltip","fullname":"series<bar>.tooltip","title":"tooltip","parent":"series<bar>","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"tooltip","fullname":"tooltip","title":"tooltip","isParent":true,"description":"Options for the tooltip that appears when the user hovers over a series or point."},{"name":"plotOptions-boxplot-tooltip","fullname":"plotOptions.boxplot.tooltip","title":"tooltip","parent":"plotOptions-boxplot","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"series<boxplot>-tooltip","fullname":"series<boxplot>.tooltip","title":"tooltip","parent":"series<boxplot>","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"series<solidgauge>-tooltip","fullname":"series<solidgauge>.tooltip","title":"tooltip","parent":"series<solidgauge>","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall-tooltip","fullname":"plotOptions.waterfall.tooltip","title":"tooltip","parent":"plotOptions-waterfall","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pie-tooltip","fullname":"plotOptions.pie.tooltip","title":"tooltip","parent":"plotOptions-pie","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bar-tooltip","fullname":"plotOptions.bar.tooltip","title":"tooltip","parent":"plotOptions-bar","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-tooltip","fullname":"plotOptions.areaspline.tooltip","title":"tooltip","parent":"plotOptions-areaspline","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"series<funnel>-tooltip","fullname":"series<funnel>.tooltip","title":"tooltip","parent":"series<funnel>","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange-tooltip","fullname":"plotOptions.areasplinerange.tooltip","title":"tooltip","parent":"plotOptions-areasplinerange","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-area-tooltip","fullname":"plotOptions.area.tooltip","title":"tooltip","parent":"plotOptions-area","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-tooltip","fullname":"plotOptions.spline.tooltip","title":"tooltip","parent":"plotOptions-spline","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"series<scatter>-tooltip","fullname":"series<scatter>.tooltip","title":"tooltip","parent":"series<scatter>","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge-tooltip","fullname":"plotOptions.gauge.tooltip","title":"tooltip","parent":"plotOptions-gauge","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bubble>-tooltip","fullname":"series<bubble>.tooltip","title":"tooltip","parent":"series<bubble>","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"series<heatmap>-tooltip","fullname":"series<heatmap>.tooltip","title":"tooltip","parent":"series<heatmap>","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column-tooltip","fullname":"plotOptions.column.tooltip","title":"tooltip","parent":"plotOptions-column","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>-tooltip","fullname":"series<spline>.tooltip","title":"tooltip","parent":"series<spline>","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"series<area>-tooltip","fullname":"series<area>.tooltip","title":"tooltip","parent":"series<area>","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"series<treemap>-tooltip","fullname":"series<treemap>.tooltip","title":"tooltip","parent":"series<treemap>","isParent":true,"returnType":"","context":"","defaults":"","values":"","since":"4.1.0","description":"","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar-tooltip","fullname":"plotOptions.errorbar.tooltip","title":"tooltip","parent":"plotOptions-errorbar","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"series<column>-tooltip","fullname":"series<column>.tooltip","title":"tooltip","parent":"series<column>","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap-tooltip","fullname":"plotOptions.treemap.tooltip","title":"tooltip","parent":"plotOptions-treemap","isParent":true,"returnType":"","context":"","defaults":"","values":"","since":"4.1.0","description":"","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-line-tooltip","fullname":"plotOptions.line.tooltip","title":"tooltip","parent":"plotOptions-line","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange-tooltip","fullname":"plotOptions.arearange.tooltip","title":"tooltip","parent":"plotOptions-arearange","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"series<polygon>-tooltip","fullname":"series<polygon>.tooltip","title":"tooltip","parent":"series<polygon>","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange-tooltip","fullname":"plotOptions.columnrange.tooltip","title":"tooltip","parent":"plotOptions-columnrange","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap-tooltip","fullname":"plotOptions.heatmap.tooltip","title":"tooltip","parent":"plotOptions-heatmap","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter-tooltip","fullname":"plotOptions.scatter.tooltip","title":"tooltip","parent":"plotOptions-scatter","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-tooltip","fullname":"series<areasplinerange>.tooltip","title":"tooltip","parent":"series<areasplinerange>","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pie>-tooltip","fullname":"series<pie>.tooltip","title":"tooltip","parent":"series<pie>","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"series<columnrange>-tooltip","fullname":"series<columnrange>.tooltip","title":"tooltip","parent":"series<columnrange>","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-tooltip","fullname":"plotOptions.pyramid.tooltip","title":"tooltip","parent":"plotOptions-pyramid","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel-tooltip","fullname":"plotOptions.funnel.tooltip","title":"tooltip","parent":"plotOptions-funnel","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-tooltip","fullname":"plotOptions.polygon.tooltip","title":"tooltip","parent":"plotOptions-polygon","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-series-tooltip","fullname":"plotOptions.series.tooltip","title":"tooltip","parent":"plotOptions-series","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"series<errorbar>-tooltip","fullname":"series<errorbar>.tooltip","title":"tooltip","parent":"series<errorbar>","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"series<waterfall>-tooltip","fullname":"series<waterfall>.tooltip","title":"tooltip","parent":"series<waterfall>","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"series<arearange>-tooltip","fullname":"series<arearange>.tooltip","title":"tooltip","parent":"series<arearange>","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"series<gauge>-tooltip","fullname":"series<gauge>.tooltip","title":"tooltip","parent":"series<gauge>","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areaspline>-tooltip","fullname":"series<areaspline>.tooltip","title":"tooltip","parent":"series<areaspline>","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble-tooltip","fullname":"plotOptions.bubble.tooltip","title":"tooltip","parent":"plotOptions-bubble","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-solidgauge-tooltip","fullname":"plotOptions.solidgauge.tooltip","title":"tooltip","parent":"plotOptions-solidgauge","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pyramid>-tooltip","fullname":"series<pyramid>.tooltip","title":"tooltip","parent":"series<pyramid>","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"series<line>-tooltip","fullname":"series<line>.tooltip","title":"tooltip","parent":"series<line>","isParent":true,"returnType":"Object","defaults":"","values":"","since":"2.3","description":"A configuration object for the tooltip rendering of each single series. Properties are inherited from <a href=\"#tooltip\">tooltip</a>, but only the following properties can be defined on a series level.","demo":"","seeAlso":"","deprecated":false},{"name":"series<gauge>-dial--topWidth","fullname":"series<gauge>.dial.topWidth","title":"topWidth","parent":"series<gauge>-dial","isParent":false,"returnType":"Number","defaults":"1","since":"2.3.0","description":"The width of the top of the dial, closest to the perimeter. The pivot narrows in from the base to the top.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-dial/\" target=\"_blank\">Dial options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge-dial--topWidth","fullname":"plotOptions.gauge.dial.topWidth","title":"topWidth","parent":"plotOptions-gauge-dial","isParent":false,"returnType":"Number","defaults":"1","since":"2.3.0","description":"The width of the top of the dial, closest to the perimeter. The pivot narrows in from the base to the top.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/gauge-dial/\" target=\"_blank\">Dial options demonstrated</a>","seeAlso":"","deprecated":false},{"name":"series<areaspline>--trackByArea","fullname":"series<areaspline>.trackByArea","title":"trackByArea","parent":"series<areaspline>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.1.6","description":"Whether the whole area or just the line should respond to mouseover tooltips and other mouse or touch events.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-trackbyarea/\" target=\"_blank\">Display the tooltip when the\n\t\t\t\tarea is hovered</a>"},{"name":"series<areasplinerange>--trackByArea","fullname":"series<areasplinerange>.trackByArea","title":"trackByArea","parent":"series<areasplinerange>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Whether the whole area or just the line should respond to mouseover tooltips and other mouse or touch events.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-area--trackByArea","fullname":"plotOptions.area.trackByArea","title":"trackByArea","parent":"plotOptions-area","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.1.6","description":"Whether the whole area or just the line should respond to mouseover tooltips and other mouse or touch events.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-trackbyarea/\" target=\"_blank\">Display the tooltip when the\n\t\t\t\tarea is hovered</a>"},{"name":"series<area>--trackByArea","fullname":"series<area>.trackByArea","title":"trackByArea","parent":"series<area>","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.1.6","description":"Whether the whole area or just the line should respond to mouseover tooltips and other mouse or touch events.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-trackbyarea/\" target=\"_blank\">Display the tooltip when the\n\t\t\t\tarea is hovered</a>"},{"name":"plotOptions-arearange--trackByArea","fullname":"plotOptions.arearange.trackByArea","title":"trackByArea","parent":"plotOptions-arearange","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Whether the whole area or just the line should respond to mouseover tooltips and other mouse or touch events.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline--trackByArea","fullname":"plotOptions.areaspline.trackByArea","title":"trackByArea","parent":"plotOptions-areaspline","isParent":false,"returnType":"Boolean","defaults":"false","since":"1.1.6","description":"Whether the whole area or just the line should respond to mouseover tooltips and other mouse or touch events.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/area-trackbyarea/\" target=\"_blank\">Display the tooltip when the\n\t\t\t\tarea is hovered</a>"},{"name":"series<arearange>--trackByArea","fullname":"series<arearange>.trackByArea","title":"trackByArea","parent":"series<arearange>","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Whether the whole area or just the line should respond to mouseover tooltips and other mouse or touch events.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange--trackByArea","fullname":"plotOptions.areasplinerange.trackByArea","title":"trackByArea","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"Boolean","defaults":"true","since":"2.3.0","description":"Whether the whole area or just the line should respond to mouseover tooltips and other mouse or touch events.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap","fullname":"plotOptions.treemap","title":"treemap","parent":"plotOptions","isParent":true,"returnType":"Object","since":"4.1.0","description":"The size of the point shape is determined by its value relative to its siblings values.\r\nRequires the module <code>heatmap.js</code> as well, if functionality such as the <a href=\"http://api.highcharts.com/highmaps#colorAxis\">colorAxis</a> is to be used.","deprecated":false},{"name":"plotOptions-line--turboThreshold","fullname":"plotOptions.line.turboThreshold","title":"turboThreshold","parent":"plotOptions-line","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"series<boxplot>--turboThreshold","fullname":"series<boxplot>.turboThreshold","title":"turboThreshold","parent":"series<boxplot>","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"series<areaspline>--turboThreshold","fullname":"series<areaspline>.turboThreshold","title":"turboThreshold","parent":"series<areaspline>","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"series<polygon>--turboThreshold","fullname":"series<polygon>.turboThreshold","title":"turboThreshold","parent":"series<polygon>","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"series<arearange>--turboThreshold","fullname":"series<arearange>.turboThreshold","title":"turboThreshold","parent":"series<arearange>","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"series<column>--turboThreshold","fullname":"series<column>.turboThreshold","title":"turboThreshold","parent":"series<column>","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"plotOptions-polygon--turboThreshold","fullname":"plotOptions.polygon.turboThreshold","title":"turboThreshold","parent":"plotOptions-polygon","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"series<line>--turboThreshold","fullname":"series<line>.turboThreshold","title":"turboThreshold","parent":"series<line>","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"plotOptions-bar--turboThreshold","fullname":"plotOptions.bar.turboThreshold","title":"turboThreshold","parent":"plotOptions-bar","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"plotOptions-columnrange--turboThreshold","fullname":"plotOptions.columnrange.turboThreshold","title":"turboThreshold","parent":"plotOptions-columnrange","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"plotOptions-boxplot--turboThreshold","fullname":"plotOptions.boxplot.turboThreshold","title":"turboThreshold","parent":"plotOptions-boxplot","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"plotOptions-spline--turboThreshold","fullname":"plotOptions.spline.turboThreshold","title":"turboThreshold","parent":"plotOptions-spline","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"plotOptions-column--turboThreshold","fullname":"plotOptions.column.turboThreshold","title":"turboThreshold","parent":"plotOptions-column","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"series<heatmap>--turboThreshold","fullname":"series<heatmap>.turboThreshold","title":"turboThreshold","parent":"series<heatmap>","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"plotOptions-areaspline--turboThreshold","fullname":"plotOptions.areaspline.turboThreshold","title":"turboThreshold","parent":"plotOptions-areaspline","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"plotOptions-area--turboThreshold","fullname":"plotOptions.area.turboThreshold","title":"turboThreshold","parent":"plotOptions-area","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"series<columnrange>--turboThreshold","fullname":"series<columnrange>.turboThreshold","title":"turboThreshold","parent":"series<columnrange>","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"plotOptions-scatter--turboThreshold","fullname":"plotOptions.scatter.turboThreshold","title":"turboThreshold","parent":"plotOptions-scatter","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"plotOptions-series--turboThreshold","fullname":"plotOptions.series.turboThreshold","title":"turboThreshold","parent":"plotOptions-series","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"series<scatter>--turboThreshold","fullname":"series<scatter>.turboThreshold","title":"turboThreshold","parent":"series<scatter>","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"plotOptions-heatmap--turboThreshold","fullname":"plotOptions.heatmap.turboThreshold","title":"turboThreshold","parent":"plotOptions-heatmap","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"series<treemap>--turboThreshold","fullname":"series<treemap>.turboThreshold","title":"turboThreshold","parent":"series<treemap>","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"series<spline>--turboThreshold","fullname":"series<spline>.turboThreshold","title":"turboThreshold","parent":"series<spline>","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"series<bar>--turboThreshold","fullname":"series<bar>.turboThreshold","title":"turboThreshold","parent":"series<bar>","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"plotOptions-areasplinerange--turboThreshold","fullname":"plotOptions.areasplinerange.turboThreshold","title":"turboThreshold","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"series<errorbar>--turboThreshold","fullname":"series<errorbar>.turboThreshold","title":"turboThreshold","parent":"series<errorbar>","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"series<area>--turboThreshold","fullname":"series<area>.turboThreshold","title":"turboThreshold","parent":"series<area>","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"series<areasplinerange>--turboThreshold","fullname":"series<areasplinerange>.turboThreshold","title":"turboThreshold","parent":"series<areasplinerange>","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"plotOptions-errorbar--turboThreshold","fullname":"plotOptions.errorbar.turboThreshold","title":"turboThreshold","parent":"plotOptions-errorbar","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"plotOptions-treemap--turboThreshold","fullname":"plotOptions.treemap.turboThreshold","title":"turboThreshold","parent":"plotOptions-treemap","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"plotOptions-arearange--turboThreshold","fullname":"plotOptions.arearange.turboThreshold","title":"turboThreshold","parent":"plotOptions-arearange","isParent":false,"returnType":"Number","defaults":"1000","since":"2.2","description":"When a series contains a data array that is longer than this, only one dimensional arrays of numbers,\r or two dimensional arrays with x and y values are allowed. Also, only the first\r point is tested, and the rest are assumed to be the same format. This saves expensive\r data checking and indexing in long series. Set it to <code>0</code> disable.","deprecated":false},{"name":"yAxis--type","fullname":"yAxis.type","title":"type","parent":"yAxis","isParent":false,"returnType":"String","defaults":"linear","values":"[\"linear\", \"logarithmic\", \"datetime\", \"category\"]","description":"The type of axis. Can be one of <code>\"linear\"</code>, <code>\"logarithmic\"</code>, <code>\"datetime\"</code> or <code>\"category\"</code>. In a datetime axis, the numbers are given in milliseconds, and tick marks are placed \t\ton appropriate values like full hours or days. In a category axis, the <a href=\"#series.data\">point names</a> of the chart's series are used for categories, if not a <a href=\"#xAxis.categories\">categories</a> array is defined.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/type-linear/\" target=\"_blank\">\"linear\"</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/type-datetime/\" target=\"_blank\">\"datetime\" with regular intervals</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/type-datetime-irregular/\" target=\"_blank\">\"datetime\" with irregular intervals</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/type-log/\" target=\"_blank\">\"logarithmic\"</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/type-log-minorgrid/\" target=\"_blank\">\"logarithmic\" with minor grid lines</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/type-log-both/\" target=\"_blank\">\"logarithmic\" on two axes</a>.","deprecated":false},{"name":"series--type","fullname":"series.type","title":"type","parent":"series","isParent":false,"returnType":"String","values":"[null, \"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"","description":"The type of series. Can be one of <code>area</code>, <code>areaspline</code>,\r <code>bar</code>, <code>column</code>, <code>line</code>, <code>pie</code>,\r <code>scatter</code> or <code>spline</code>. From version 2.3, <code>arearange</code>, <code>areasplinerange</code> and <code>columnrange</code> are supported with the highcharts-more.js component.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/type/\" target=\"_blank\">Line and column in the same chart</a>","seeAlso":"","deprecated":false},{"name":"series<columnrange>--type","fullname":"series<columnrange>.type","title":"type","parent":"series<columnrange>","isParent":false,"returnType":"String","values":"[null, \"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"","description":"The type of series. Can be one of <code>area</code>, <code>areaspline</code>,\r <code>bar</code>, <code>column</code>, <code>line</code>, <code>pie</code>,\r <code>scatter</code> or <code>spline</code>. From version 2.3, <code>arearange</code>, <code>areasplinerange</code> and <code>columnrange</code> are supported with the highcharts-more.js component.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/type/\" target=\"_blank\">Line and column in the same chart</a>","seeAlso":"","deprecated":false},{"name":"series<gauge>--type","fullname":"series<gauge>.type","title":"type","parent":"series<gauge>","isParent":false,"returnType":"String","values":"[null, \"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"","description":"The type of series. Can be one of <code>area</code>, <code>areaspline</code>,\r <code>bar</code>, <code>column</code>, <code>line</code>, <code>pie</code>,\r <code>scatter</code> or <code>spline</code>. From version 2.3, <code>arearange</code>, <code>areasplinerange</code> and <code>columnrange</code> are supported with the highcharts-more.js component.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/type/\" target=\"_blank\">Line and column in the same chart</a>","seeAlso":"","deprecated":false},{"name":"series<treemap>--type","fullname":"series<treemap>.type","title":"type","parent":"series<treemap>","isParent":false,"returnType":"String","values":"[null, \"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"","description":"The type of series. Can be one of <code>area</code>, <code>areaspline</code>,\r <code>bar</code>, <code>column</code>, <code>line</code>, <code>pie</code>,\r <code>scatter</code> or <code>spline</code>. From version 2.3, <code>arearange</code>, <code>areasplinerange</code> and <code>columnrange</code> are supported with the highcharts-more.js component.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/type/\" target=\"_blank\">Line and column in the same chart</a>","seeAlso":"","deprecated":false},{"name":"series<waterfall>--type","fullname":"series<waterfall>.type","title":"type","parent":"series<waterfall>","isParent":false,"returnType":"String","values":"[null, \"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"","description":"The type of series. Can be one of <code>area</code>, <code>areaspline</code>,\r <code>bar</code>, <code>column</code>, <code>line</code>, <code>pie</code>,\r <code>scatter</code> or <code>spline</code>. From version 2.3, <code>arearange</code>, <code>areasplinerange</code> and <code>columnrange</code> are supported with the highcharts-more.js component.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/type/\" target=\"_blank\">Line and column in the same chart</a>","seeAlso":"","deprecated":false},{"name":"series<errorbar>--type","fullname":"series<errorbar>.type","title":"type","parent":"series<errorbar>","isParent":false,"returnType":"String","values":"[null, \"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"","description":"The type of series. Can be one of <code>area</code>, <code>areaspline</code>,\r <code>bar</code>, <code>column</code>, <code>line</code>, <code>pie</code>,\r <code>scatter</code> or <code>spline</code>. From version 2.3, <code>arearange</code>, <code>areasplinerange</code> and <code>columnrange</code> are supported with the highcharts-more.js component.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/type/\" target=\"_blank\">Line and column in the same chart</a>","seeAlso":"","deprecated":false},{"name":"series<bar>--type","fullname":"series<bar>.type","title":"type","parent":"series<bar>","isParent":false,"returnType":"String","values":"[null, \"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"","description":"The type of series. Can be one of <code>area</code>, <code>areaspline</code>,\r <code>bar</code>, <code>column</code>, <code>line</code>, <code>pie</code>,\r <code>scatter</code> or <code>spline</code>. From version 2.3, <code>arearange</code>, <code>areasplinerange</code> and <code>columnrange</code> are supported with the highcharts-more.js component.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/type/\" target=\"_blank\">Line and column in the same chart</a>","seeAlso":"","deprecated":false},{"name":"series<pyramid>--type","fullname":"series<pyramid>.type","title":"type","parent":"series<pyramid>","isParent":false,"returnType":"String","values":"[null, \"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"","description":"The type of series. Can be one of <code>area</code>, <code>areaspline</code>,\r <code>bar</code>, <code>column</code>, <code>line</code>, <code>pie</code>,\r <code>scatter</code> or <code>spline</code>. From version 2.3, <code>arearange</code>, <code>areasplinerange</code> and <code>columnrange</code> are supported with the highcharts-more.js component.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/type/\" target=\"_blank\">Line and column in the same chart</a>","seeAlso":"","deprecated":false},{"name":"series<polygon>--type","fullname":"series<polygon>.type","title":"type","parent":"series<polygon>","isParent":false,"returnType":"String","values":"[null, \"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"","description":"The type of series. Can be one of <code>area</code>, <code>areaspline</code>,\r <code>bar</code>, <code>column</code>, <code>line</code>, <code>pie</code>,\r <code>scatter</code> or <code>spline</code>. From version 2.3, <code>arearange</code>, <code>areasplinerange</code> and <code>columnrange</code> are supported with the highcharts-more.js component.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/type/\" target=\"_blank\">Line and column in the same chart</a>","seeAlso":"","deprecated":false},{"name":"series<boxplot>--type","fullname":"series<boxplot>.type","title":"type","parent":"series<boxplot>","isParent":false,"returnType":"String","values":"[null, \"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"","description":"The type of series. Can be one of <code>area</code>, <code>areaspline</code>,\r <code>bar</code>, <code>column</code>, <code>line</code>, <code>pie</code>,\r <code>scatter</code> or <code>spline</code>. From version 2.3, <code>arearange</code>, <code>areasplinerange</code> and <code>columnrange</code> are supported with the highcharts-more.js component.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/type/\" target=\"_blank\">Line and column in the same chart</a>","seeAlso":"","deprecated":false},{"name":"series<area>--type","fullname":"series<area>.type","title":"type","parent":"series<area>","isParent":false,"returnType":"String","values":"[null, \"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"","description":"The type of series. Can be one of <code>area</code>, <code>areaspline</code>,\r <code>bar</code>, <code>column</code>, <code>line</code>, <code>pie</code>,\r <code>scatter</code> or <code>spline</code>. From version 2.3, <code>arearange</code>, <code>areasplinerange</code> and <code>columnrange</code> are supported with the highcharts-more.js component.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/type/\" target=\"_blank\">Line and column in the same chart</a>","seeAlso":"","deprecated":false},{"name":"series<heatmap>--type","fullname":"series<heatmap>.type","title":"type","parent":"series<heatmap>","isParent":false,"returnType":"String","values":"[null, \"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"","description":"The type of series. Can be one of <code>area</code>, <code>areaspline</code>,\r <code>bar</code>, <code>column</code>, <code>line</code>, <code>pie</code>,\r <code>scatter</code> or <code>spline</code>. From version 2.3, <code>arearange</code>, <code>areasplinerange</code> and <code>columnrange</code> are supported with the highcharts-more.js component.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/type/\" target=\"_blank\">Line and column in the same chart</a>","seeAlso":"","deprecated":false},{"name":"series<arearange>--type","fullname":"series<arearange>.type","title":"type","parent":"series<arearange>","isParent":false,"returnType":"String","values":"[null, \"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"","description":"The type of series. Can be one of <code>area</code>, <code>areaspline</code>,\r <code>bar</code>, <code>column</code>, <code>line</code>, <code>pie</code>,\r <code>scatter</code> or <code>spline</code>. From version 2.3, <code>arearange</code>, <code>areasplinerange</code> and <code>columnrange</code> are supported with the highcharts-more.js component.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/type/\" target=\"_blank\">Line and column in the same chart</a>","seeAlso":"","deprecated":false},{"name":"series<spline>--type","fullname":"series<spline>.type","title":"type","parent":"series<spline>","isParent":false,"returnType":"String","values":"[null, \"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"","description":"The type of series. Can be one of <code>area</code>, <code>areaspline</code>,\r <code>bar</code>, <code>column</code>, <code>line</code>, <code>pie</code>,\r <code>scatter</code> or <code>spline</code>. From version 2.3, <code>arearange</code>, <code>areasplinerange</code> and <code>columnrange</code> are supported with the highcharts-more.js component.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/type/\" target=\"_blank\">Line and column in the same chart</a>","seeAlso":"","deprecated":false},{"name":"series<solidgauge>--type","fullname":"series<solidgauge>.type","title":"type","parent":"series<solidgauge>","isParent":false,"returnType":"String","values":"[null, \"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"","description":"The type of series. Can be one of <code>area</code>, <code>areaspline</code>,\r <code>bar</code>, <code>column</code>, <code>line</code>, <code>pie</code>,\r <code>scatter</code> or <code>spline</code>. From version 2.3, <code>arearange</code>, <code>areasplinerange</code> and <code>columnrange</code> are supported with the highcharts-more.js component.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/type/\" target=\"_blank\">Line and column in the same chart</a>","seeAlso":"","deprecated":false},{"name":"series<scatter>--type","fullname":"series<scatter>.type","title":"type","parent":"series<scatter>","isParent":false,"returnType":"String","values":"[null, \"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"","description":"The type of series. Can be one of <code>area</code>, <code>areaspline</code>,\r <code>bar</code>, <code>column</code>, <code>line</code>, <code>pie</code>,\r <code>scatter</code> or <code>spline</code>. From version 2.3, <code>arearange</code>, <code>areasplinerange</code> and <code>columnrange</code> are supported with the highcharts-more.js component.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/type/\" target=\"_blank\">Line and column in the same chart</a>","seeAlso":"","deprecated":false},{"name":"series<pie>--type","fullname":"series<pie>.type","title":"type","parent":"series<pie>","isParent":false,"returnType":"String","values":"[null, \"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"","description":"The type of series. Can be one of <code>area</code>, <code>areaspline</code>,\r <code>bar</code>, <code>column</code>, <code>line</code>, <code>pie</code>,\r <code>scatter</code> or <code>spline</code>. From version 2.3, <code>arearange</code>, <code>areasplinerange</code> and <code>columnrange</code> are supported with the highcharts-more.js component.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/type/\" target=\"_blank\">Line and column in the same chart</a>","seeAlso":"","deprecated":false},{"name":"series<funnel>--type","fullname":"series<funnel>.type","title":"type","parent":"series<funnel>","isParent":false,"returnType":"String","values":"[null, \"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"","description":"The type of series. Can be one of <code>area</code>, <code>areaspline</code>,\r <code>bar</code>, <code>column</code>, <code>line</code>, <code>pie</code>,\r <code>scatter</code> or <code>spline</code>. From version 2.3, <code>arearange</code>, <code>areasplinerange</code> and <code>columnrange</code> are supported with the highcharts-more.js component.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/type/\" target=\"_blank\">Line and column in the same chart</a>","seeAlso":"","deprecated":false},{"name":"series<column>--type","fullname":"series<column>.type","title":"type","parent":"series<column>","isParent":false,"returnType":"String","values":"[null, \"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"","description":"The type of series. Can be one of <code>area</code>, <code>areaspline</code>,\r <code>bar</code>, <code>column</code>, <code>line</code>, <code>pie</code>,\r <code>scatter</code> or <code>spline</code>. From version 2.3, <code>arearange</code>, <code>areasplinerange</code> and <code>columnrange</code> are supported with the highcharts-more.js component.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/type/\" target=\"_blank\">Line and column in the same chart</a>","seeAlso":"","deprecated":false},{"name":"chart--type","fullname":"chart.type","title":"type","parent":"chart","isParent":false,"returnType":"String","defaults":"line","values":"[\"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"2.1.0","description":"The default series type for the chart. Can be any of the chart types listed under <a href=\"#plotOptions\">plotOptions</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/type-bar/\" target=\"_blank\">Bar</a>","deprecated":false},{"name":"series<areaspline>--type","fullname":"series<areaspline>.type","title":"type","parent":"series<areaspline>","isParent":false,"returnType":"String","values":"[null, \"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"","description":"The type of series. Can be one of <code>area</code>, <code>areaspline</code>,\r <code>bar</code>, <code>column</code>, <code>line</code>, <code>pie</code>,\r <code>scatter</code> or <code>spline</code>. From version 2.3, <code>arearange</code>, <code>areasplinerange</code> and <code>columnrange</code> are supported with the highcharts-more.js component.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/type/\" target=\"_blank\">Line and column in the same chart</a>","seeAlso":"","deprecated":false},{"name":"exporting--type","fullname":"exporting.type","title":"type","parent":"exporting","isParent":false,"returnType":"String","defaults":"image/png","values":"[\"image/png\", \"image/jpeg\", \"application/pdf\", \"image/svg+xml\"]","since":"2.0","description":"Default MIME type for exporting if <code>chart.exportChart()</code> is called without specifying a <code>type</code> option. Possible values are <code>image/png</code>, <code>image/jpeg</code>, <code>application/pdf</code> and <code>image/svg+xml</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/exporting/type/\" target=\"_blank\">Default type set to <code>image/jpeg</code></a>"},{"name":"xAxis--type","fullname":"xAxis.type","title":"type","parent":"xAxis","isParent":false,"returnType":"String","defaults":"linear","values":"[\"linear\", \"logarithmic\", \"datetime\", \"category\"]","description":"The type of axis. Can be one of <code>\"linear\"</code>, <code>\"logarithmic\"</code>, <code>\"datetime\"</code> or <code>\"category\"</code>. In a datetime axis, the numbers are given in milliseconds, and tick marks are placed \t\ton appropriate values like full hours or days. In a category axis, the <a href=\"#series.data\">point names</a> of the chart's series are used for categories, if not a <a href=\"#xAxis.categories\">categories</a> array is defined.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/type-linear/\" target=\"_blank\">\"linear\"</a>, \r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/type-datetime/\" target=\"_blank\">\"datetime\" with regular intervals</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/type-datetime-irregular/\" target=\"_blank\">\"datetime\" with irregular intervals</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/type-log/\" target=\"_blank\">\"logarithmic\"</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/type-log-minorgrid/\" target=\"_blank\">\"logarithmic\" with minor grid lines</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/type-log-both/\" target=\"_blank\">\"logarithmic\" on two axes</a>.","deprecated":false},{"name":"series<bubble>--type","fullname":"series<bubble>.type","title":"type","parent":"series<bubble>","isParent":false,"returnType":"String","values":"[null, \"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"","description":"The type of series. Can be one of <code>area</code>, <code>areaspline</code>,\r <code>bar</code>, <code>column</code>, <code>line</code>, <code>pie</code>,\r <code>scatter</code> or <code>spline</code>. From version 2.3, <code>arearange</code>, <code>areasplinerange</code> and <code>columnrange</code> are supported with the highcharts-more.js component.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/type/\" target=\"_blank\">Line and column in the same chart</a>","seeAlso":"","deprecated":false},{"name":"series<line>--type","fullname":"series<line>.type","title":"type","parent":"series<line>","isParent":false,"returnType":"String","values":"[null, \"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"","description":"The type of series. Can be one of <code>area</code>, <code>areaspline</code>,\r <code>bar</code>, <code>column</code>, <code>line</code>, <code>pie</code>,\r <code>scatter</code> or <code>spline</code>. From version 2.3, <code>arearange</code>, <code>areasplinerange</code> and <code>columnrange</code> are supported with the highcharts-more.js component.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/type/\" target=\"_blank\">Line and column in the same chart</a>","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>--type","fullname":"series<areasplinerange>.type","title":"type","parent":"series<areasplinerange>","isParent":false,"returnType":"String","values":"[null, \"line\", \"spline\", \"column\", \"area\", \"areaspline\", \"pie\", \"arearange\", \"areasplinerange\", \"boxplot\", \"bubble\", \"columnrange\", \"errorbar\", \"funnel\", \"gauge\", \"scatter\", \"waterfall\"]","since":"","description":"The type of series. Can be one of <code>area</code>, <code>areaspline</code>,\r <code>bar</code>, <code>column</code>, <code>line</code>, <code>pie</code>,\r <code>scatter</code> or <code>spline</code>. From version 2.3, <code>arearange</code>, <code>areasplinerange</code> and <code>columnrange</code> are supported with the highcharts-more.js component.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/type/\" target=\"_blank\">Line and column in the same chart</a>","seeAlso":"","deprecated":false},{"name":"yAxis--units","fullname":"yAxis.units","title":"units","parent":"yAxis","isParent":false,"returnType":"Array","defaults":"","values":"","since":"","description":"Datetime axis only. An array determining what time intervals the ticks are allowed to fall on. Each array item is an array where the first value is the time unit and the  second value another array of allowed multiples. Defaults to:\r\n<pre>units: [[\r\n\t'millisecond', // unit name\r\n\t[1, 2, 5, 10, 20, 25, 50, 100, 200, 500] // allowed multiples\r\n], [\r\n\t'second',\r\n\t[1, 2, 5, 10, 15, 30]\r\n], [\r\n\t'minute',\r\n\t[1, 2, 5, 10, 15, 30]\r\n], [\r\n\t'hour',\r\n\t[1, 2, 3, 4, 6, 8, 12]\r\n], [\r\n\t'day',\r\n\t[1]\r\n], [\r\n\t'week',\r\n\t[1]\r\n], [\r\n\t'month',\r\n\t[1, 3, 6]\r\n], [\r\n\t'year',\r\n\tnull\r\n]]</pre>","demo":"","seeAlso":"","deprecated":false},{"name":"xAxis--units","fullname":"xAxis.units","title":"units","parent":"xAxis","isParent":false,"returnType":"Array","defaults":"","values":"","since":"","description":"Datetime axis only. An array determining what time intervals the ticks are allowed to fall on. Each array item is an array where the first value is the time unit and the  second value another array of allowed multiples. Defaults to:\r\n<pre>units: [[\r\n\t'millisecond', // unit name\r\n\t[1, 2, 5, 10, 20, 25, 50, 100, 200, 500] // allowed multiples\r\n], [\r\n\t'second',\r\n\t[1, 2, 5, 10, 15, 30]\r\n], [\r\n\t'minute',\r\n\t[1, 2, 5, 10, 15, 30]\r\n], [\r\n\t'hour',\r\n\t[1, 2, 3, 4, 6, 8, 12]\r\n], [\r\n\t'day',\r\n\t[1]\r\n], [\r\n\t'week',\r\n\t[1]\r\n], [\r\n\t'month',\r\n\t[1, 3, 6]\r\n], [\r\n\t'year',\r\n\tnull\r\n]]</pre>","demo":"","seeAlso":"","deprecated":false},{"name":"series<areaspline>-data-events--unselect","fullname":"series<areaspline>.data.events.unselect","title":"unselect","parent":"series<areaspline>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-spline-point-events--unselect","fullname":"plotOptions.spline.point.events.unselect","title":"unselect","parent":"plotOptions-spline-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-bar-point-events--unselect","fullname":"plotOptions.bar.point.events.unselect","title":"unselect","parent":"plotOptions-bar-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<funnel>-point-events--unselect","fullname":"series<funnel>.point.events.unselect","title":"unselect","parent":"series<funnel>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<heatmap>-point-events--unselect","fullname":"series<heatmap>.point.events.unselect","title":"unselect","parent":"series<heatmap>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-treemap-point-events--unselect","fullname":"plotOptions.treemap.point.events.unselect","title":"unselect","parent":"plotOptions-treemap-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<errorbar>-point-events--unselect","fullname":"series<errorbar>.point.events.unselect","title":"unselect","parent":"series<errorbar>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<solidgauge>-point-events--unselect","fullname":"series<solidgauge>.point.events.unselect","title":"unselect","parent":"series<solidgauge>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-gauge-point-events--unselect","fullname":"plotOptions.gauge.point.events.unselect","title":"unselect","parent":"plotOptions-gauge-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<arearange>-data-events--unselect","fullname":"series<arearange>.data.events.unselect","title":"unselect","parent":"series<arearange>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-areasplinerange-point-events--unselect","fullname":"plotOptions.areasplinerange.point.events.unselect","title":"unselect","parent":"plotOptions-areasplinerange-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<arearange>-point-events--unselect","fullname":"series<arearange>.point.events.unselect","title":"unselect","parent":"series<arearange>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-bubble-point-events--unselect","fullname":"plotOptions.bubble.point.events.unselect","title":"unselect","parent":"plotOptions-bubble-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-polygon-point-events--unselect","fullname":"plotOptions.polygon.point.events.unselect","title":"unselect","parent":"plotOptions-polygon-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<bubble>-data-events--unselect","fullname":"series<bubble>.data.events.unselect","title":"unselect","parent":"series<bubble>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<areasplinerange>-data-events--unselect","fullname":"series<areasplinerange>.data.events.unselect","title":"unselect","parent":"series<areasplinerange>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<scatter>-point-events--unselect","fullname":"series<scatter>.point.events.unselect","title":"unselect","parent":"series<scatter>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<solidgauge>-data-events--unselect","fullname":"series<solidgauge>.data.events.unselect","title":"unselect","parent":"series<solidgauge>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-areaspline-point-events--unselect","fullname":"plotOptions.areaspline.point.events.unselect","title":"unselect","parent":"plotOptions-areaspline-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<area>-point-events--unselect","fullname":"series<area>.point.events.unselect","title":"unselect","parent":"series<area>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<columnrange>-point-events--unselect","fullname":"series<columnrange>.point.events.unselect","title":"unselect","parent":"series<columnrange>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<pyramid>-point-events--unselect","fullname":"series<pyramid>.point.events.unselect","title":"unselect","parent":"series<pyramid>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<bubble>-point-events--unselect","fullname":"series<bubble>.point.events.unselect","title":"unselect","parent":"series<bubble>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<pie>-point-events--unselect","fullname":"series<pie>.point.events.unselect","title":"unselect","parent":"series<pie>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-series-point-events--unselect","fullname":"plotOptions.series.point.events.unselect","title":"unselect","parent":"plotOptions-series-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<polygon>-data-events--unselect","fullname":"series<polygon>.data.events.unselect","title":"unselect","parent":"series<polygon>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-boxplot-point-events--unselect","fullname":"plotOptions.boxplot.point.events.unselect","title":"unselect","parent":"plotOptions-boxplot-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<pyramid>-data-events--unselect","fullname":"series<pyramid>.data.events.unselect","title":"unselect","parent":"series<pyramid>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<scatter>-data-events--unselect","fullname":"series<scatter>.data.events.unselect","title":"unselect","parent":"series<scatter>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<heatmap>-data-events--unselect","fullname":"series<heatmap>.data.events.unselect","title":"unselect","parent":"series<heatmap>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<areaspline>-point-events--unselect","fullname":"series<areaspline>.point.events.unselect","title":"unselect","parent":"series<areaspline>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-area-point-events--unselect","fullname":"plotOptions.area.point.events.unselect","title":"unselect","parent":"plotOptions-area-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-errorbar-point-events--unselect","fullname":"plotOptions.errorbar.point.events.unselect","title":"unselect","parent":"plotOptions-errorbar-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-heatmap-point-events--unselect","fullname":"plotOptions.heatmap.point.events.unselect","title":"unselect","parent":"plotOptions-heatmap-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<bar>-point-events--unselect","fullname":"series<bar>.point.events.unselect","title":"unselect","parent":"series<bar>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<line>-data-events--unselect","fullname":"series<line>.data.events.unselect","title":"unselect","parent":"series<line>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<spline>-point-events--unselect","fullname":"series<spline>.point.events.unselect","title":"unselect","parent":"series<spline>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<gauge>-point-events--unselect","fullname":"series<gauge>.point.events.unselect","title":"unselect","parent":"series<gauge>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<boxplot>-point-events--unselect","fullname":"series<boxplot>.point.events.unselect","title":"unselect","parent":"series<boxplot>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-columnrange-point-events--unselect","fullname":"plotOptions.columnrange.point.events.unselect","title":"unselect","parent":"plotOptions-columnrange-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-line-point-events--unselect","fullname":"plotOptions.line.point.events.unselect","title":"unselect","parent":"plotOptions-line-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-arearange-point-events--unselect","fullname":"plotOptions.arearange.point.events.unselect","title":"unselect","parent":"plotOptions-arearange-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<pie>-data-events--unselect","fullname":"series<pie>.data.events.unselect","title":"unselect","parent":"series<pie>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<errorbar>-data-events--unselect","fullname":"series<errorbar>.data.events.unselect","title":"unselect","parent":"series<errorbar>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<spline>-data-events--unselect","fullname":"series<spline>.data.events.unselect","title":"unselect","parent":"series<spline>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<area>-data-events--unselect","fullname":"series<area>.data.events.unselect","title":"unselect","parent":"series<area>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<waterfall>-point-events--unselect","fullname":"series<waterfall>.point.events.unselect","title":"unselect","parent":"series<waterfall>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<treemap>-point-events--unselect","fullname":"series<treemap>.point.events.unselect","title":"unselect","parent":"series<treemap>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-solidgauge-point-events--unselect","fullname":"plotOptions.solidgauge.point.events.unselect","title":"unselect","parent":"plotOptions-solidgauge-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<columnrange>-data-events--unselect","fullname":"series<columnrange>.data.events.unselect","title":"unselect","parent":"series<columnrange>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-column-point-events--unselect","fullname":"plotOptions.column.point.events.unselect","title":"unselect","parent":"plotOptions-column-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<bar>-data-events--unselect","fullname":"series<bar>.data.events.unselect","title":"unselect","parent":"series<bar>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<areasplinerange>-point-events--unselect","fullname":"series<areasplinerange>.point.events.unselect","title":"unselect","parent":"series<areasplinerange>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-pyramid-point-events--unselect","fullname":"plotOptions.pyramid.point.events.unselect","title":"unselect","parent":"plotOptions-pyramid-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<treemap>-data-events--unselect","fullname":"series<treemap>.data.events.unselect","title":"unselect","parent":"series<treemap>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-waterfall-point-events--unselect","fullname":"plotOptions.waterfall.point.events.unselect","title":"unselect","parent":"plotOptions-waterfall-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<column>-point-events--unselect","fullname":"series<column>.point.events.unselect","title":"unselect","parent":"series<column>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-funnel-point-events--unselect","fullname":"plotOptions.funnel.point.events.unselect","title":"unselect","parent":"plotOptions-funnel-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-scatter-point-events--unselect","fullname":"plotOptions.scatter.point.events.unselect","title":"unselect","parent":"plotOptions-scatter-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<boxplot>-data-events--unselect","fullname":"series<boxplot>.data.events.unselect","title":"unselect","parent":"series<boxplot>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<gauge>-data-events--unselect","fullname":"series<gauge>.data.events.unselect","title":"unselect","parent":"series<gauge>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<funnel>-data-events--unselect","fullname":"series<funnel>.data.events.unselect","title":"unselect","parent":"series<funnel>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<waterfall>-data-events--unselect","fullname":"series<waterfall>.data.events.unselect","title":"unselect","parent":"series<waterfall>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-pie-point-events--unselect","fullname":"plotOptions.pie.point.events.unselect","title":"unselect","parent":"plotOptions-pie-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<polygon>-point-events--unselect","fullname":"series<polygon>.point.events.unselect","title":"unselect","parent":"series<polygon>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<column>-data-events--unselect","fullname":"series<column>.data.events.unselect","title":"unselect","parent":"series<column>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"series<line>-point-events--unselect","fullname":"series<line>.point.events.unselect","title":"unselect","parent":"series<line>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is unselected either programmatically or following a click on the point. One parameter, <code>event</code>, is passed to the function. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-unselect/\" target=\"_blank\">Report the last unselected point</a>","deprecated":false},{"name":"plotOptions-waterfall--upColor","fullname":"plotOptions.waterfall.upColor","title":"upColor","parent":"plotOptions-waterfall","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"The color used specifically for positive point columns. When not specified, the general series color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/waterfall/\" target=\"_blank\">Waterfall</a>","seeAlso":"","deprecated":false},{"name":"series<waterfall>--upColor","fullname":"series<waterfall>.upColor","title":"upColor","parent":"series<waterfall>","isParent":false,"returnType":"Color","defaults":"","values":"","since":"","description":"The color used specifically for positive point columns. When not specified, the general series color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/waterfall/\" target=\"_blank\">Waterfall</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar-point-events--update","fullname":"plotOptions.errorbar.point.events.update","title":"update","parent":"plotOptions-errorbar-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"plotOptions-polygon-point-events--update","fullname":"plotOptions.polygon.point.events.update","title":"update","parent":"plotOptions-polygon-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"plotOptions-waterfall-point-events--update","fullname":"plotOptions.waterfall.point.events.update","title":"update","parent":"plotOptions-waterfall-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"plotOptions-funnel-point-events--update","fullname":"plotOptions.funnel.point.events.update","title":"update","parent":"plotOptions-funnel-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<line>-data-events--update","fullname":"series<line>.data.events.update","title":"update","parent":"series<line>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"plotOptions-area-point-events--update","fullname":"plotOptions.area.point.events.update","title":"update","parent":"plotOptions-area-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"plotOptions-series-point-events--update","fullname":"plotOptions.series.point.events.update","title":"update","parent":"plotOptions-series-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<bubble>-data-events--update","fullname":"series<bubble>.data.events.update","title":"update","parent":"series<bubble>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"plotOptions-bubble-point-events--update","fullname":"plotOptions.bubble.point.events.update","title":"update","parent":"plotOptions-bubble-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<bar>-data-events--update","fullname":"series<bar>.data.events.update","title":"update","parent":"series<bar>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<polygon>-point-events--update","fullname":"series<polygon>.point.events.update","title":"update","parent":"series<polygon>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<bubble>-point-events--update","fullname":"series<bubble>.point.events.update","title":"update","parent":"series<bubble>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"plotOptions-spline-point-events--update","fullname":"plotOptions.spline.point.events.update","title":"update","parent":"plotOptions-spline-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<waterfall>-point-events--update","fullname":"series<waterfall>.point.events.update","title":"update","parent":"series<waterfall>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<funnel>-point-events--update","fullname":"series<funnel>.point.events.update","title":"update","parent":"series<funnel>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<boxplot>-data-events--update","fullname":"series<boxplot>.data.events.update","title":"update","parent":"series<boxplot>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<gauge>-point-events--update","fullname":"series<gauge>.point.events.update","title":"update","parent":"series<gauge>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<solidgauge>-data-events--update","fullname":"series<solidgauge>.data.events.update","title":"update","parent":"series<solidgauge>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<columnrange>-point-events--update","fullname":"series<columnrange>.point.events.update","title":"update","parent":"series<columnrange>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<heatmap>-point-events--update","fullname":"series<heatmap>.point.events.update","title":"update","parent":"series<heatmap>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"plotOptions-column-point-events--update","fullname":"plotOptions.column.point.events.update","title":"update","parent":"plotOptions-column-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<area>-point-events--update","fullname":"series<area>.point.events.update","title":"update","parent":"series<area>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<pyramid>-point-events--update","fullname":"series<pyramid>.point.events.update","title":"update","parent":"series<pyramid>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"plotOptions-bar-point-events--update","fullname":"plotOptions.bar.point.events.update","title":"update","parent":"plotOptions-bar-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<scatter>-data-events--update","fullname":"series<scatter>.data.events.update","title":"update","parent":"series<scatter>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<arearange>-point-events--update","fullname":"series<arearange>.point.events.update","title":"update","parent":"series<arearange>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<line>-point-events--update","fullname":"series<line>.point.events.update","title":"update","parent":"series<line>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<column>-data-events--update","fullname":"series<column>.data.events.update","title":"update","parent":"series<column>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<errorbar>-data-events--update","fullname":"series<errorbar>.data.events.update","title":"update","parent":"series<errorbar>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<column>-point-events--update","fullname":"series<column>.point.events.update","title":"update","parent":"series<column>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"plotOptions-pie-point-events--update","fullname":"plotOptions.pie.point.events.update","title":"update","parent":"plotOptions-pie-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<heatmap>-data-events--update","fullname":"series<heatmap>.data.events.update","title":"update","parent":"series<heatmap>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"plotOptions-scatter-point-events--update","fullname":"plotOptions.scatter.point.events.update","title":"update","parent":"plotOptions-scatter-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<pie>-data-events--update","fullname":"series<pie>.data.events.update","title":"update","parent":"series<pie>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<funnel>-data-events--update","fullname":"series<funnel>.data.events.update","title":"update","parent":"series<funnel>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"plotOptions-gauge-point-events--update","fullname":"plotOptions.gauge.point.events.update","title":"update","parent":"plotOptions-gauge-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<areasplinerange>-point-events--update","fullname":"series<areasplinerange>.point.events.update","title":"update","parent":"series<areasplinerange>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<solidgauge>-point-events--update","fullname":"series<solidgauge>.point.events.update","title":"update","parent":"series<solidgauge>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"plotOptions-areasplinerange-point-events--update","fullname":"plotOptions.areasplinerange.point.events.update","title":"update","parent":"plotOptions-areasplinerange-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<areaspline>-data-events--update","fullname":"series<areaspline>.data.events.update","title":"update","parent":"series<areaspline>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<areasplinerange>-data-events--update","fullname":"series<areasplinerange>.data.events.update","title":"update","parent":"series<areasplinerange>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<boxplot>-point-events--update","fullname":"series<boxplot>.point.events.update","title":"update","parent":"series<boxplot>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"plotOptions-columnrange-point-events--update","fullname":"plotOptions.columnrange.point.events.update","title":"update","parent":"plotOptions-columnrange-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"plotOptions-pyramid-point-events--update","fullname":"plotOptions.pyramid.point.events.update","title":"update","parent":"plotOptions-pyramid-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"plotOptions-areaspline-point-events--update","fullname":"plotOptions.areaspline.point.events.update","title":"update","parent":"plotOptions-areaspline-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<pie>-point-events--update","fullname":"series<pie>.point.events.update","title":"update","parent":"series<pie>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<columnrange>-data-events--update","fullname":"series<columnrange>.data.events.update","title":"update","parent":"series<columnrange>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"plotOptions-solidgauge-point-events--update","fullname":"plotOptions.solidgauge.point.events.update","title":"update","parent":"plotOptions-solidgauge-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<pyramid>-data-events--update","fullname":"series<pyramid>.data.events.update","title":"update","parent":"series<pyramid>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<errorbar>-point-events--update","fullname":"series<errorbar>.point.events.update","title":"update","parent":"series<errorbar>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<scatter>-point-events--update","fullname":"series<scatter>.point.events.update","title":"update","parent":"series<scatter>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<waterfall>-data-events--update","fullname":"series<waterfall>.data.events.update","title":"update","parent":"series<waterfall>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<polygon>-data-events--update","fullname":"series<polygon>.data.events.update","title":"update","parent":"series<polygon>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"plotOptions-treemap-point-events--update","fullname":"plotOptions.treemap.point.events.update","title":"update","parent":"plotOptions-treemap-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"plotOptions-arearange-point-events--update","fullname":"plotOptions.arearange.point.events.update","title":"update","parent":"plotOptions-arearange-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"plotOptions-boxplot-point-events--update","fullname":"plotOptions.boxplot.point.events.update","title":"update","parent":"plotOptions-boxplot-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<area>-data-events--update","fullname":"series<area>.data.events.update","title":"update","parent":"series<area>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"plotOptions-line-point-events--update","fullname":"plotOptions.line.point.events.update","title":"update","parent":"plotOptions-line-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"plotOptions-heatmap-point-events--update","fullname":"plotOptions.heatmap.point.events.update","title":"update","parent":"plotOptions-heatmap-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<treemap>-point-events--update","fullname":"series<treemap>.point.events.update","title":"update","parent":"series<treemap>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<spline>-data-events--update","fullname":"series<spline>.data.events.update","title":"update","parent":"series<spline>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<bar>-point-events--update","fullname":"series<bar>.point.events.update","title":"update","parent":"series<bar>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<spline>-point-events--update","fullname":"series<spline>.point.events.update","title":"update","parent":"series<spline>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<gauge>-data-events--update","fullname":"series<gauge>.data.events.update","title":"update","parent":"series<gauge>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<treemap>-data-events--update","fullname":"series<treemap>.data.events.update","title":"update","parent":"series<treemap>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<areaspline>-point-events--update","fullname":"series<areaspline>.point.events.update","title":"update","parent":"series<areaspline>-point-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"series<arearange>-data-events--update","fullname":"series<arearange>.data.events.update","title":"update","parent":"series<arearange>-data-events","isParent":false,"returnType":"Function","context":"Point","since":"1.2.0","description":"Fires when the point is updated programmatically through the <code>.update()</code> method. One parameter, <code>event</code>, is passed to the function. The  new point options can be accessed through <code>event.options</code>. Returning <code>false</code> cancels the operation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-point-events-update/\" target=\"_blank\">Confirm point updating</a>","deprecated":false},{"name":"exporting--url","fullname":"exporting.url","title":"url","parent":"exporting","isParent":false,"returnType":"String","defaults":"http://export.highcharts.com","since":"2.0","description":"The URL for the server module converting the SVG string to an image format. By default this points to Highslide Software's free web service."},{"name":"plotOptions-series-dataLabels--useHTML","fullname":"plotOptions.series.dataLabels.useHTML","title":"useHTML","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"series<treemap>-dataLabels--useHTML","fullname":"series<treemap>.dataLabels.useHTML","title":"useHTML","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"title--useHTML","fullname":"title.useHTML","title":"useHTML","parent":"title","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the text.","deprecated":false},{"name":"series<columnrange>-dataLabels--useHTML","fullname":"series<columnrange>.dataLabels.useHTML","title":"useHTML","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"series<pyramid>-dataLabels--useHTML","fullname":"series<pyramid>.dataLabels.useHTML","title":"useHTML","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"series<bar>-dataLabels--useHTML","fullname":"series<bar>.dataLabels.useHTML","title":"useHTML","parent":"series<bar>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"series<areasplinerange>-dataLabels--useHTML","fullname":"series<areasplinerange>.dataLabels.useHTML","title":"useHTML","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"plotOptions-columnrange-dataLabels--useHTML","fullname":"plotOptions.columnrange.dataLabels.useHTML","title":"useHTML","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"plotOptions-areaspline-dataLabels--useHTML","fullname":"plotOptions.areaspline.dataLabels.useHTML","title":"useHTML","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"series<spline>-dataLabels--useHTML","fullname":"series<spline>.dataLabels.useHTML","title":"useHTML","parent":"series<spline>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"tooltip--useHTML","fullname":"tooltip.useHTML","title":"useHTML","parent":"tooltip","isParent":false,"returnType":"Boolean","defaults":"false","since":"2.2","description":"Use HTML to render the contents of the tooltip instead of SVG. Using HTML allows advanced formatting like tables and images in the tooltip. It is also recommended for rtl languages as it works around rtl bugs in early Firefox.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/footerformat/\" target=\"_blank\">A table for value alignment</a>. <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/fullhtml/\" target=\"_blank\">Full HTML tooltip</a>.","deprecated":false},{"name":"series<arearange>-dataLabels--useHTML","fullname":"series<arearange>.dataLabels.useHTML","title":"useHTML","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"xAxis-labels--useHTML","fullname":"xAxis.labels.useHTML","title":"useHTML","parent":"xAxis-labels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"series<waterfall>-dataLabels--useHTML","fullname":"series<waterfall>.dataLabels.useHTML","title":"useHTML","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"series<line>-dataLabels--useHTML","fullname":"series<line>.dataLabels.useHTML","title":"useHTML","parent":"series<line>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"series<pie>-dataLabels--useHTML","fullname":"series<pie>.dataLabels.useHTML","title":"useHTML","parent":"series<pie>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"plotOptions-polygon-dataLabels--useHTML","fullname":"plotOptions.polygon.dataLabels.useHTML","title":"useHTML","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"plotOptions-bar-dataLabels--useHTML","fullname":"plotOptions.bar.dataLabels.useHTML","title":"useHTML","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"series<areaspline>-dataLabels--useHTML","fullname":"series<areaspline>.dataLabels.useHTML","title":"useHTML","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"series<scatter>-dataLabels--useHTML","fullname":"series<scatter>.dataLabels.useHTML","title":"useHTML","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"series<column>-dataLabels--useHTML","fullname":"series<column>.dataLabels.useHTML","title":"useHTML","parent":"series<column>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"plotOptions-gauge-dataLabels--useHTML","fullname":"plotOptions.gauge.dataLabels.useHTML","title":"useHTML","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"xAxis-plotLines-label--useHTML","fullname":"xAxis.plotLines.label.useHTML","title":"useHTML","parent":"xAxis-plotLines-label","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0.3","description":"<p>Whether to <a href=\"http://docs.highcharts.com/#formatting$html\">use HTML</a> to render the labels.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bubble>-dataLabels--useHTML","fullname":"series<bubble>.dataLabels.useHTML","title":"useHTML","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"series<funnel>-dataLabels--useHTML","fullname":"series<funnel>.dataLabels.useHTML","title":"useHTML","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"series<solidgauge>-dataLabels--useHTML","fullname":"series<solidgauge>.dataLabels.useHTML","title":"useHTML","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"yAxis-stackLabels--useHTML","fullname":"yAxis.stackLabels.useHTML","title":"useHTML","parent":"yAxis-stackLabels","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0","description":"Whether to <a href=\"http://docs.highcharts.com/#formatting$html\">use HTML</a> to render the labels.","demo":"","seeAlso":"","deprecated":false},{"name":"legend--useHTML","fullname":"legend.useHTML","title":"useHTML","parent":"legend","isParent":false,"returnType":"Boolean","defaults":"false","description":"<p>Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the legend item texts. When using HTML, <a href=\"#legend.navigation\">legend.navigation</a> is disabled.</p>","deprecated":false},{"name":"plotOptions-column-dataLabels--useHTML","fullname":"plotOptions.column.dataLabels.useHTML","title":"useHTML","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"xAxis-plotBands-label--useHTML","fullname":"xAxis.plotBands.label.useHTML","title":"useHTML","parent":"xAxis-plotBands-label","isParent":false,"returnType":"Boolean","defaults":"false","since":"3.0.3","description":"<p>Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"plotOptions-line-dataLabels--useHTML","fullname":"plotOptions.line.dataLabels.useHTML","title":"useHTML","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"plotOptions-scatter-dataLabels--useHTML","fullname":"plotOptions.scatter.dataLabels.useHTML","title":"useHTML","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"plotOptions-treemap-dataLabels--useHTML","fullname":"plotOptions.treemap.dataLabels.useHTML","title":"useHTML","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"series<heatmap>-dataLabels--useHTML","fullname":"series<heatmap>.dataLabels.useHTML","title":"useHTML","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"plotOptions-bubble-dataLabels--useHTML","fullname":"plotOptions.bubble.dataLabels.useHTML","title":"useHTML","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"plotOptions-pyramid-dataLabels--useHTML","fullname":"plotOptions.pyramid.dataLabels.useHTML","title":"useHTML","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"plotOptions-spline-dataLabels--useHTML","fullname":"plotOptions.spline.dataLabels.useHTML","title":"useHTML","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"plotOptions-pie-dataLabels--useHTML","fullname":"plotOptions.pie.dataLabels.useHTML","title":"useHTML","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"series<gauge>-dataLabels--useHTML","fullname":"series<gauge>.dataLabels.useHTML","title":"useHTML","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"plotOptions-heatmap-dataLabels--useHTML","fullname":"plotOptions.heatmap.dataLabels.useHTML","title":"useHTML","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"plotOptions-waterfall-dataLabels--useHTML","fullname":"plotOptions.waterfall.dataLabels.useHTML","title":"useHTML","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"plotOptions-funnel-dataLabels--useHTML","fullname":"plotOptions.funnel.dataLabels.useHTML","title":"useHTML","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"plotOptions-area-dataLabels--useHTML","fullname":"plotOptions.area.dataLabels.useHTML","title":"useHTML","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"yAxis-plotBands-label--useHTML","fullname":"yAxis.plotBands.label.useHTML","title":"useHTML","parent":"yAxis-plotBands-label","isParent":false,"returnType":"Boolean","defaults":"false","since":"3.0.3","description":"<p>Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"plotOptions-arearange-dataLabels--useHTML","fullname":"plotOptions.arearange.dataLabels.useHTML","title":"useHTML","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"plotOptions-solidgauge-dataLabels--useHTML","fullname":"plotOptions.solidgauge.dataLabels.useHTML","title":"useHTML","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"subtitle--useHTML","fullname":"subtitle.useHTML","title":"useHTML","parent":"subtitle","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the text.","deprecated":false},{"name":"yAxis-labels--useHTML","fullname":"yAxis.labels.useHTML","title":"useHTML","parent":"yAxis-labels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"yAxis-plotLines-label--useHTML","fullname":"yAxis.plotLines.label.useHTML","title":"useHTML","parent":"yAxis-plotLines-label","isParent":false,"returnType":"Boolean","defaults":"false","values":"","since":"3.0.3","description":"<p>Whether to <a href=\"http://docs.highcharts.com/#formatting$html\">use HTML</a> to render the labels.","demo":"","seeAlso":"","deprecated":false},{"name":"series<area>-dataLabels--useHTML","fullname":"series<area>.dataLabels.useHTML","title":"useHTML","parent":"series<area>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"series<polygon>-dataLabels--useHTML","fullname":"series<polygon>.dataLabels.useHTML","title":"useHTML","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels--useHTML","fullname":"plotOptions.areasplinerange.dataLabels.useHTML","title":"useHTML","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"Boolean","defaults":"false","description":"Whether to <a href=\"http://www.highcharts.com/docs/chart-concepts/labels-and-string-formatting#html\">use HTML</a> to render the labels.","deprecated":false},{"name":"global--useUTC","fullname":"global.useUTC","title":"useUTC","parent":"global","isParent":false,"returnType":"Boolean","defaults":"true","description":"Whether to use UTC time for axis scaling, tickmark placement and time display in  <code>Highcharts.dateFormat</code>. Advantages of using UTC is that the time displays equally regardless of the user agent's time zone settings. Local time can be used when the data is loaded in real time or when correct Daylight Saving Time transitions are required.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/global/useutc-true/\" target=\"_blank\">True by default</a> - the starting point which is \n\t\t\tat 00:00 UTC, is displayed as 00:00 in the axis labels and in the tooltip. \n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/global/useutc-false/\" target=\"_blank\">False</a> - the starting point which is \n\t\t\tat 00:00 UTC, is displayed as your local browser time in the axis labels and in \n\t\t\tthe tooltip."},{"name":"series<bubble>-zones--value","fullname":"series<bubble>.zones.value","title":"value","parent":"series<bubble>-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<column>-zones--value","fullname":"series<column>.zones.value","title":"value","parent":"series<column>-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<polygon>-zones--value","fullname":"series<polygon>.zones.value","title":"value","parent":"series<polygon>-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange-zones--value","fullname":"plotOptions.arearange.zones.value","title":"value","parent":"plotOptions-arearange-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<heatmap>-zones--value","fullname":"series<heatmap>.zones.value","title":"value","parent":"series<heatmap>-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bar-zones--value","fullname":"plotOptions.bar.zones.value","title":"value","parent":"plotOptions-bar-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-zones--value","fullname":"plotOptions.polygon.zones.value","title":"value","parent":"plotOptions-polygon-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<gauge>-zones--value","fullname":"series<gauge>.zones.value","title":"value","parent":"series<gauge>-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>-zones--value","fullname":"series<spline>.zones.value","title":"value","parent":"series<spline>-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<funnel>-zones--value","fullname":"series<funnel>.zones.value","title":"value","parent":"series<funnel>-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<boxplot>-zones--value","fullname":"series<boxplot>.zones.value","title":"value","parent":"series<boxplot>-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pyramid>-zones--value","fullname":"series<pyramid>.zones.value","title":"value","parent":"series<pyramid>-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-zones--value","fullname":"plotOptions.areaspline.zones.value","title":"value","parent":"plotOptions-areaspline-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot-zones--value","fullname":"plotOptions.boxplot.zones.value","title":"value","parent":"plotOptions-boxplot-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<scatter>-zones--value","fullname":"series<scatter>.zones.value","title":"value","parent":"series<scatter>-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<arearange>-zones--value","fullname":"series<arearange>.zones.value","title":"value","parent":"series<arearange>-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<line>-zones--value","fullname":"series<line>.zones.value","title":"value","parent":"series<line>-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pie>-zones--value","fullname":"series<pie>.zones.value","title":"value","parent":"series<pie>-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<solidgauge>-zones--value","fullname":"series<solidgauge>.zones.value","title":"value","parent":"series<solidgauge>-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bar>-zones--value","fullname":"series<bar>.zones.value","title":"value","parent":"series<bar>-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<columnrange>-zones--value","fullname":"series<columnrange>.zones.value","title":"value","parent":"series<columnrange>-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter-zones--value","fullname":"plotOptions.scatter.zones.value","title":"value","parent":"plotOptions-scatter-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange-zones--value","fullname":"plotOptions.columnrange.zones.value","title":"value","parent":"plotOptions-columnrange-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<treemap>-zones--value","fullname":"series<treemap>.zones.value","title":"value","parent":"series<treemap>-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange-zones--value","fullname":"plotOptions.areasplinerange.zones.value","title":"value","parent":"plotOptions-areasplinerange-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap-zones--value","fullname":"plotOptions.heatmap.zones.value","title":"value","parent":"plotOptions-heatmap-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-zones--value","fullname":"plotOptions.pyramid.zones.value","title":"value","parent":"plotOptions-pyramid-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<heatmap>-data--value","fullname":"series<heatmap>.data.value","title":"value","parent":"series<heatmap>-data","isParent":false,"returnType":"Number","description":"The value of the point, resulting in a color controled by options as set in the <a href=\"#colorAxis\">colorAxis</a> configuration."},{"name":"plotOptions-funnel-zones--value","fullname":"plotOptions.funnel.zones.value","title":"value","parent":"plotOptions-funnel-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar-zones--value","fullname":"plotOptions.errorbar.zones.value","title":"value","parent":"plotOptions-errorbar-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-solidgauge-zones--value","fullname":"plotOptions.solidgauge.zones.value","title":"value","parent":"plotOptions-solidgauge-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-zones--value","fullname":"plotOptions.spline.zones.value","title":"value","parent":"plotOptions-spline-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-area-zones--value","fullname":"plotOptions.area.zones.value","title":"value","parent":"plotOptions-area-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<errorbar>-zones--value","fullname":"series<errorbar>.zones.value","title":"value","parent":"series<errorbar>-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-line-zones--value","fullname":"plotOptions.line.zones.value","title":"value","parent":"plotOptions-line-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-zones--value","fullname":"series<areasplinerange>.zones.value","title":"value","parent":"series<areasplinerange>-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-series-zones--value","fullname":"plotOptions.series.zones.value","title":"value","parent":"plotOptions-series-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"xAxis-plotLines--value","fullname":"xAxis.plotLines.value","title":"value","parent":"xAxis-plotLines","isParent":false,"returnType":"Number","description":"The position of the line in axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-color/\" target=\"_blank\">Between two categories on X axis</a>"},{"name":"yAxis-plotLines--value","fullname":"yAxis.plotLines.value","title":"value","parent":"yAxis-plotLines","isParent":false,"returnType":"Number","description":"The position of the line in axis units.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-color/\" target=\"_blank\">Between two categories on X axis</a>"},{"name":"series<areaspline>-zones--value","fullname":"series<areaspline>.zones.value","title":"value","parent":"series<areaspline>-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall-zones--value","fullname":"plotOptions.waterfall.zones.value","title":"value","parent":"plotOptions-waterfall-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pie-zones--value","fullname":"plotOptions.pie.zones.value","title":"value","parent":"plotOptions-pie-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column-zones--value","fullname":"plotOptions.column.zones.value","title":"value","parent":"plotOptions-column-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<waterfall>-zones--value","fullname":"series<waterfall>.zones.value","title":"value","parent":"series<waterfall>-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble-zones--value","fullname":"plotOptions.bubble.zones.value","title":"value","parent":"plotOptions-bubble-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge-zones--value","fullname":"plotOptions.gauge.zones.value","title":"value","parent":"plotOptions-gauge-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<treemap>-data--value","fullname":"series<treemap>.data.value","title":"value","parent":"series<treemap>-data","isParent":false,"returnType":"Number","description":"The value of the point, resulting in a relative area of the point in the treemap."},{"name":"series<area>-zones--value","fullname":"series<area>.zones.value","title":"value","parent":"series<area>-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap-zones--value","fullname":"plotOptions.treemap.zones.value","title":"value","parent":"plotOptions-treemap-zones","isParent":false,"returnType":"Number","context":"","defaults":"undefined","values":"","since":"4.1.0","description":"The value up to where the zone extends, if undefined the zones stretches to the last value in the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bar>-tooltip--valueDecimals","fullname":"series<bar>.tooltip.valueDecimals","title":"valueDecimals","parent":"series<bar>-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<errorbar>-tooltip--valueDecimals","fullname":"series<errorbar>.tooltip.valueDecimals","title":"valueDecimals","parent":"series<errorbar>-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-columnrange-tooltip--valueDecimals","fullname":"plotOptions.columnrange.tooltip.valueDecimals","title":"valueDecimals","parent":"plotOptions-columnrange-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<areasplinerange>-tooltip--valueDecimals","fullname":"series<areasplinerange>.tooltip.valueDecimals","title":"valueDecimals","parent":"series<areasplinerange>-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-treemap-tooltip--valueDecimals","fullname":"plotOptions.treemap.tooltip.valueDecimals","title":"valueDecimals","parent":"plotOptions-treemap-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<spline>-tooltip--valueDecimals","fullname":"series<spline>.tooltip.valueDecimals","title":"valueDecimals","parent":"series<spline>-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-funnel-tooltip--valueDecimals","fullname":"plotOptions.funnel.tooltip.valueDecimals","title":"valueDecimals","parent":"plotOptions-funnel-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-bar-tooltip--valueDecimals","fullname":"plotOptions.bar.tooltip.valueDecimals","title":"valueDecimals","parent":"plotOptions-bar-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<line>-tooltip--valueDecimals","fullname":"series<line>.tooltip.valueDecimals","title":"valueDecimals","parent":"series<line>-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-solidgauge-tooltip--valueDecimals","fullname":"plotOptions.solidgauge.tooltip.valueDecimals","title":"valueDecimals","parent":"plotOptions-solidgauge-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<boxplot>-tooltip--valueDecimals","fullname":"series<boxplot>.tooltip.valueDecimals","title":"valueDecimals","parent":"series<boxplot>-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<column>-tooltip--valueDecimals","fullname":"series<column>.tooltip.valueDecimals","title":"valueDecimals","parent":"series<column>-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-area-tooltip--valueDecimals","fullname":"plotOptions.area.tooltip.valueDecimals","title":"valueDecimals","parent":"plotOptions-area-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<areaspline>-tooltip--valueDecimals","fullname":"series<areaspline>.tooltip.valueDecimals","title":"valueDecimals","parent":"series<areaspline>-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-polygon-tooltip--valueDecimals","fullname":"plotOptions.polygon.tooltip.valueDecimals","title":"valueDecimals","parent":"plotOptions-polygon-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-column-tooltip--valueDecimals","fullname":"plotOptions.column.tooltip.valueDecimals","title":"valueDecimals","parent":"plotOptions-column-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<area>-tooltip--valueDecimals","fullname":"series<area>.tooltip.valueDecimals","title":"valueDecimals","parent":"series<area>-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<pyramid>-tooltip--valueDecimals","fullname":"series<pyramid>.tooltip.valueDecimals","title":"valueDecimals","parent":"series<pyramid>-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-scatter-tooltip--valueDecimals","fullname":"plotOptions.scatter.tooltip.valueDecimals","title":"valueDecimals","parent":"plotOptions-scatter-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-arearange-tooltip--valueDecimals","fullname":"plotOptions.arearange.tooltip.valueDecimals","title":"valueDecimals","parent":"plotOptions-arearange-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-series-tooltip--valueDecimals","fullname":"plotOptions.series.tooltip.valueDecimals","title":"valueDecimals","parent":"plotOptions-series-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-boxplot-tooltip--valueDecimals","fullname":"plotOptions.boxplot.tooltip.valueDecimals","title":"valueDecimals","parent":"plotOptions-boxplot-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-waterfall-tooltip--valueDecimals","fullname":"plotOptions.waterfall.tooltip.valueDecimals","title":"valueDecimals","parent":"plotOptions-waterfall-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<polygon>-tooltip--valueDecimals","fullname":"series<polygon>.tooltip.valueDecimals","title":"valueDecimals","parent":"series<polygon>-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<heatmap>-tooltip--valueDecimals","fullname":"series<heatmap>.tooltip.valueDecimals","title":"valueDecimals","parent":"series<heatmap>-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<gauge>-tooltip--valueDecimals","fullname":"series<gauge>.tooltip.valueDecimals","title":"valueDecimals","parent":"series<gauge>-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-areaspline-tooltip--valueDecimals","fullname":"plotOptions.areaspline.tooltip.valueDecimals","title":"valueDecimals","parent":"plotOptions-areaspline-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<solidgauge>-tooltip--valueDecimals","fullname":"series<solidgauge>.tooltip.valueDecimals","title":"valueDecimals","parent":"series<solidgauge>-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<scatter>-tooltip--valueDecimals","fullname":"series<scatter>.tooltip.valueDecimals","title":"valueDecimals","parent":"series<scatter>-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<treemap>-tooltip--valueDecimals","fullname":"series<treemap>.tooltip.valueDecimals","title":"valueDecimals","parent":"series<treemap>-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-spline-tooltip--valueDecimals","fullname":"plotOptions.spline.tooltip.valueDecimals","title":"valueDecimals","parent":"plotOptions-spline-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<columnrange>-tooltip--valueDecimals","fullname":"series<columnrange>.tooltip.valueDecimals","title":"valueDecimals","parent":"series<columnrange>-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<arearange>-tooltip--valueDecimals","fullname":"series<arearange>.tooltip.valueDecimals","title":"valueDecimals","parent":"series<arearange>-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"tooltip--valueDecimals","fullname":"tooltip.valueDecimals","title":"valueDecimals","parent":"tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<pie>-tooltip--valueDecimals","fullname":"series<pie>.tooltip.valueDecimals","title":"valueDecimals","parent":"series<pie>-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<funnel>-tooltip--valueDecimals","fullname":"series<funnel>.tooltip.valueDecimals","title":"valueDecimals","parent":"series<funnel>-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-bubble-tooltip--valueDecimals","fullname":"plotOptions.bubble.tooltip.valueDecimals","title":"valueDecimals","parent":"plotOptions-bubble-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<waterfall>-tooltip--valueDecimals","fullname":"series<waterfall>.tooltip.valueDecimals","title":"valueDecimals","parent":"series<waterfall>-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<bubble>-tooltip--valueDecimals","fullname":"series<bubble>.tooltip.valueDecimals","title":"valueDecimals","parent":"series<bubble>-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-line-tooltip--valueDecimals","fullname":"plotOptions.line.tooltip.valueDecimals","title":"valueDecimals","parent":"plotOptions-line-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-pyramid-tooltip--valueDecimals","fullname":"plotOptions.pyramid.tooltip.valueDecimals","title":"valueDecimals","parent":"plotOptions-pyramid-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-areasplinerange-tooltip--valueDecimals","fullname":"plotOptions.areasplinerange.tooltip.valueDecimals","title":"valueDecimals","parent":"plotOptions-areasplinerange-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-gauge-tooltip--valueDecimals","fullname":"plotOptions.gauge.tooltip.valueDecimals","title":"valueDecimals","parent":"plotOptions-gauge-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-pie-tooltip--valueDecimals","fullname":"plotOptions.pie.tooltip.valueDecimals","title":"valueDecimals","parent":"plotOptions-pie-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-heatmap-tooltip--valueDecimals","fullname":"plotOptions.heatmap.tooltip.valueDecimals","title":"valueDecimals","parent":"plotOptions-heatmap-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-errorbar-tooltip--valueDecimals","fullname":"plotOptions.errorbar.tooltip.valueDecimals","title":"valueDecimals","parent":"plotOptions-errorbar-tooltip","isParent":false,"returnType":"Number","since":"2.2","description":"How many decimals to show in each series' y value. This is overridable in each series' tooltip options object. The default is to preserve all decimals.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<columnrange>-tooltip--valuePrefix","fullname":"series<columnrange>.tooltip.valuePrefix","title":"valuePrefix","parent":"series<columnrange>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<pie>-tooltip--valuePrefix","fullname":"series<pie>.tooltip.valuePrefix","title":"valuePrefix","parent":"series<pie>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<bar>-tooltip--valuePrefix","fullname":"series<bar>.tooltip.valuePrefix","title":"valuePrefix","parent":"series<bar>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-line-tooltip--valuePrefix","fullname":"plotOptions.line.tooltip.valuePrefix","title":"valuePrefix","parent":"plotOptions-line-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-bubble-tooltip--valuePrefix","fullname":"plotOptions.bubble.tooltip.valuePrefix","title":"valuePrefix","parent":"plotOptions-bubble-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-gauge-tooltip--valuePrefix","fullname":"plotOptions.gauge.tooltip.valuePrefix","title":"valuePrefix","parent":"plotOptions-gauge-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<column>-tooltip--valuePrefix","fullname":"series<column>.tooltip.valuePrefix","title":"valuePrefix","parent":"series<column>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<gauge>-tooltip--valuePrefix","fullname":"series<gauge>.tooltip.valuePrefix","title":"valuePrefix","parent":"series<gauge>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-series-tooltip--valuePrefix","fullname":"plotOptions.series.tooltip.valuePrefix","title":"valuePrefix","parent":"plotOptions-series-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"tooltip--valuePrefix","fullname":"tooltip.valuePrefix","title":"valuePrefix","parent":"tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<boxplot>-tooltip--valuePrefix","fullname":"series<boxplot>.tooltip.valuePrefix","title":"valuePrefix","parent":"series<boxplot>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<scatter>-tooltip--valuePrefix","fullname":"series<scatter>.tooltip.valuePrefix","title":"valuePrefix","parent":"series<scatter>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<area>-tooltip--valuePrefix","fullname":"series<area>.tooltip.valuePrefix","title":"valuePrefix","parent":"series<area>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<errorbar>-tooltip--valuePrefix","fullname":"series<errorbar>.tooltip.valuePrefix","title":"valuePrefix","parent":"series<errorbar>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-area-tooltip--valuePrefix","fullname":"plotOptions.area.tooltip.valuePrefix","title":"valuePrefix","parent":"plotOptions-area-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-bar-tooltip--valuePrefix","fullname":"plotOptions.bar.tooltip.valuePrefix","title":"valuePrefix","parent":"plotOptions-bar-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-spline-tooltip--valuePrefix","fullname":"plotOptions.spline.tooltip.valuePrefix","title":"valuePrefix","parent":"plotOptions-spline-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<areaspline>-tooltip--valuePrefix","fullname":"series<areaspline>.tooltip.valuePrefix","title":"valuePrefix","parent":"series<areaspline>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<heatmap>-tooltip--valuePrefix","fullname":"series<heatmap>.tooltip.valuePrefix","title":"valuePrefix","parent":"series<heatmap>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-errorbar-tooltip--valuePrefix","fullname":"plotOptions.errorbar.tooltip.valuePrefix","title":"valuePrefix","parent":"plotOptions-errorbar-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<polygon>-tooltip--valuePrefix","fullname":"series<polygon>.tooltip.valuePrefix","title":"valuePrefix","parent":"series<polygon>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<treemap>-tooltip--valuePrefix","fullname":"series<treemap>.tooltip.valuePrefix","title":"valuePrefix","parent":"series<treemap>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-arearange-tooltip--valuePrefix","fullname":"plotOptions.arearange.tooltip.valuePrefix","title":"valuePrefix","parent":"plotOptions-arearange-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-columnrange-tooltip--valuePrefix","fullname":"plotOptions.columnrange.tooltip.valuePrefix","title":"valuePrefix","parent":"plotOptions-columnrange-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-waterfall-tooltip--valuePrefix","fullname":"plotOptions.waterfall.tooltip.valuePrefix","title":"valuePrefix","parent":"plotOptions-waterfall-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-column-tooltip--valuePrefix","fullname":"plotOptions.column.tooltip.valuePrefix","title":"valuePrefix","parent":"plotOptions-column-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-funnel-tooltip--valuePrefix","fullname":"plotOptions.funnel.tooltip.valuePrefix","title":"valuePrefix","parent":"plotOptions-funnel-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-treemap-tooltip--valuePrefix","fullname":"plotOptions.treemap.tooltip.valuePrefix","title":"valuePrefix","parent":"plotOptions-treemap-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<solidgauge>-tooltip--valuePrefix","fullname":"series<solidgauge>.tooltip.valuePrefix","title":"valuePrefix","parent":"series<solidgauge>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<areasplinerange>-tooltip--valuePrefix","fullname":"series<areasplinerange>.tooltip.valuePrefix","title":"valuePrefix","parent":"series<areasplinerange>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-boxplot-tooltip--valuePrefix","fullname":"plotOptions.boxplot.tooltip.valuePrefix","title":"valuePrefix","parent":"plotOptions-boxplot-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<arearange>-tooltip--valuePrefix","fullname":"series<arearange>.tooltip.valuePrefix","title":"valuePrefix","parent":"series<arearange>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-areasplinerange-tooltip--valuePrefix","fullname":"plotOptions.areasplinerange.tooltip.valuePrefix","title":"valuePrefix","parent":"plotOptions-areasplinerange-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-pie-tooltip--valuePrefix","fullname":"plotOptions.pie.tooltip.valuePrefix","title":"valuePrefix","parent":"plotOptions-pie-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<pyramid>-tooltip--valuePrefix","fullname":"series<pyramid>.tooltip.valuePrefix","title":"valuePrefix","parent":"series<pyramid>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<funnel>-tooltip--valuePrefix","fullname":"series<funnel>.tooltip.valuePrefix","title":"valuePrefix","parent":"series<funnel>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-areaspline-tooltip--valuePrefix","fullname":"plotOptions.areaspline.tooltip.valuePrefix","title":"valuePrefix","parent":"plotOptions-areaspline-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<line>-tooltip--valuePrefix","fullname":"series<line>.tooltip.valuePrefix","title":"valuePrefix","parent":"series<line>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<spline>-tooltip--valuePrefix","fullname":"series<spline>.tooltip.valuePrefix","title":"valuePrefix","parent":"series<spline>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<waterfall>-tooltip--valuePrefix","fullname":"series<waterfall>.tooltip.valuePrefix","title":"valuePrefix","parent":"series<waterfall>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-polygon-tooltip--valuePrefix","fullname":"plotOptions.polygon.tooltip.valuePrefix","title":"valuePrefix","parent":"plotOptions-polygon-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-solidgauge-tooltip--valuePrefix","fullname":"plotOptions.solidgauge.tooltip.valuePrefix","title":"valuePrefix","parent":"plotOptions-solidgauge-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-scatter-tooltip--valuePrefix","fullname":"plotOptions.scatter.tooltip.valuePrefix","title":"valuePrefix","parent":"plotOptions-scatter-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-heatmap-tooltip--valuePrefix","fullname":"plotOptions.heatmap.tooltip.valuePrefix","title":"valuePrefix","parent":"plotOptions-heatmap-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<bubble>-tooltip--valuePrefix","fullname":"series<bubble>.tooltip.valuePrefix","title":"valuePrefix","parent":"series<bubble>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-pyramid-tooltip--valuePrefix","fullname":"plotOptions.pyramid.tooltip.valuePrefix","title":"valuePrefix","parent":"plotOptions-pyramid-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to prepend to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-area-tooltip--valueSuffix","fullname":"plotOptions.area.tooltip.valueSuffix","title":"valueSuffix","parent":"plotOptions-area-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-columnrange-tooltip--valueSuffix","fullname":"plotOptions.columnrange.tooltip.valueSuffix","title":"valueSuffix","parent":"plotOptions-columnrange-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-funnel-tooltip--valueSuffix","fullname":"plotOptions.funnel.tooltip.valueSuffix","title":"valueSuffix","parent":"plotOptions-funnel-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-errorbar-tooltip--valueSuffix","fullname":"plotOptions.errorbar.tooltip.valueSuffix","title":"valueSuffix","parent":"plotOptions-errorbar-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<columnrange>-tooltip--valueSuffix","fullname":"series<columnrange>.tooltip.valueSuffix","title":"valueSuffix","parent":"series<columnrange>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-boxplot-tooltip--valueSuffix","fullname":"plotOptions.boxplot.tooltip.valueSuffix","title":"valueSuffix","parent":"plotOptions-boxplot-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-scatter-tooltip--valueSuffix","fullname":"plotOptions.scatter.tooltip.valueSuffix","title":"valueSuffix","parent":"plotOptions-scatter-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<bar>-tooltip--valueSuffix","fullname":"series<bar>.tooltip.valueSuffix","title":"valueSuffix","parent":"series<bar>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-solidgauge-tooltip--valueSuffix","fullname":"plotOptions.solidgauge.tooltip.valueSuffix","title":"valueSuffix","parent":"plotOptions-solidgauge-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<pie>-tooltip--valueSuffix","fullname":"series<pie>.tooltip.valueSuffix","title":"valueSuffix","parent":"series<pie>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<heatmap>-tooltip--valueSuffix","fullname":"series<heatmap>.tooltip.valueSuffix","title":"valueSuffix","parent":"series<heatmap>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<pyramid>-tooltip--valueSuffix","fullname":"series<pyramid>.tooltip.valueSuffix","title":"valueSuffix","parent":"series<pyramid>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-treemap-tooltip--valueSuffix","fullname":"plotOptions.treemap.tooltip.valueSuffix","title":"valueSuffix","parent":"plotOptions-treemap-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<waterfall>-tooltip--valueSuffix","fullname":"series<waterfall>.tooltip.valueSuffix","title":"valueSuffix","parent":"series<waterfall>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<area>-tooltip--valueSuffix","fullname":"series<area>.tooltip.valueSuffix","title":"valueSuffix","parent":"series<area>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-areasplinerange-tooltip--valueSuffix","fullname":"plotOptions.areasplinerange.tooltip.valueSuffix","title":"valueSuffix","parent":"plotOptions-areasplinerange-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<areaspline>-tooltip--valueSuffix","fullname":"series<areaspline>.tooltip.valueSuffix","title":"valueSuffix","parent":"series<areaspline>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<funnel>-tooltip--valueSuffix","fullname":"series<funnel>.tooltip.valueSuffix","title":"valueSuffix","parent":"series<funnel>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-polygon-tooltip--valueSuffix","fullname":"plotOptions.polygon.tooltip.valueSuffix","title":"valueSuffix","parent":"plotOptions-polygon-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<solidgauge>-tooltip--valueSuffix","fullname":"series<solidgauge>.tooltip.valueSuffix","title":"valueSuffix","parent":"series<solidgauge>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<areasplinerange>-tooltip--valueSuffix","fullname":"series<areasplinerange>.tooltip.valueSuffix","title":"valueSuffix","parent":"series<areasplinerange>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<gauge>-tooltip--valueSuffix","fullname":"series<gauge>.tooltip.valueSuffix","title":"valueSuffix","parent":"series<gauge>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-bar-tooltip--valueSuffix","fullname":"plotOptions.bar.tooltip.valueSuffix","title":"valueSuffix","parent":"plotOptions-bar-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-arearange-tooltip--valueSuffix","fullname":"plotOptions.arearange.tooltip.valueSuffix","title":"valueSuffix","parent":"plotOptions-arearange-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-heatmap-tooltip--valueSuffix","fullname":"plotOptions.heatmap.tooltip.valueSuffix","title":"valueSuffix","parent":"plotOptions-heatmap-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<treemap>-tooltip--valueSuffix","fullname":"series<treemap>.tooltip.valueSuffix","title":"valueSuffix","parent":"series<treemap>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-spline-tooltip--valueSuffix","fullname":"plotOptions.spline.tooltip.valueSuffix","title":"valueSuffix","parent":"plotOptions-spline-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-pie-tooltip--valueSuffix","fullname":"plotOptions.pie.tooltip.valueSuffix","title":"valueSuffix","parent":"plotOptions-pie-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<spline>-tooltip--valueSuffix","fullname":"series<spline>.tooltip.valueSuffix","title":"valueSuffix","parent":"series<spline>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<column>-tooltip--valueSuffix","fullname":"series<column>.tooltip.valueSuffix","title":"valueSuffix","parent":"series<column>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<scatter>-tooltip--valueSuffix","fullname":"series<scatter>.tooltip.valueSuffix","title":"valueSuffix","parent":"series<scatter>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<bubble>-tooltip--valueSuffix","fullname":"series<bubble>.tooltip.valueSuffix","title":"valueSuffix","parent":"series<bubble>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<boxplot>-tooltip--valueSuffix","fullname":"series<boxplot>.tooltip.valueSuffix","title":"valueSuffix","parent":"series<boxplot>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-gauge-tooltip--valueSuffix","fullname":"plotOptions.gauge.tooltip.valueSuffix","title":"valueSuffix","parent":"plotOptions-gauge-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<polygon>-tooltip--valueSuffix","fullname":"series<polygon>.tooltip.valueSuffix","title":"valueSuffix","parent":"series<polygon>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-line-tooltip--valueSuffix","fullname":"plotOptions.line.tooltip.valueSuffix","title":"valueSuffix","parent":"plotOptions-line-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-bubble-tooltip--valueSuffix","fullname":"plotOptions.bubble.tooltip.valueSuffix","title":"valueSuffix","parent":"plotOptions-bubble-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-waterfall-tooltip--valueSuffix","fullname":"plotOptions.waterfall.tooltip.valueSuffix","title":"valueSuffix","parent":"plotOptions-waterfall-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"tooltip--valueSuffix","fullname":"tooltip.valueSuffix","title":"valueSuffix","parent":"tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<arearange>-tooltip--valueSuffix","fullname":"series<arearange>.tooltip.valueSuffix","title":"valueSuffix","parent":"series<arearange>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-pyramid-tooltip--valueSuffix","fullname":"plotOptions.pyramid.tooltip.valueSuffix","title":"valueSuffix","parent":"plotOptions-pyramid-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-series-tooltip--valueSuffix","fullname":"plotOptions.series.tooltip.valueSuffix","title":"valueSuffix","parent":"plotOptions-series-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-areaspline-tooltip--valueSuffix","fullname":"plotOptions.areaspline.tooltip.valueSuffix","title":"valueSuffix","parent":"plotOptions-areaspline-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-column-tooltip--valueSuffix","fullname":"plotOptions.column.tooltip.valueSuffix","title":"valueSuffix","parent":"plotOptions-column-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<line>-tooltip--valueSuffix","fullname":"series<line>.tooltip.valueSuffix","title":"valueSuffix","parent":"series<line>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"series<errorbar>-tooltip--valueSuffix","fullname":"series<errorbar>.tooltip.valueSuffix","title":"valueSuffix","parent":"series<errorbar>-tooltip","isParent":false,"returnType":"String","since":"2.2","description":"A string to append to each series' y value. Overridable in each series' tooltip options object.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/valuedecimals/\" target=\"_blank\">Set decimals, prefix and suffix for the value</a>"},{"name":"plotOptions-columnrange-dataLabels--verticalAlign","fullname":"plotOptions.columnrange.dataLabels.verticalAlign","title":"verticalAlign","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"legend--verticalAlign","fullname":"legend.verticalAlign","title":"verticalAlign","parent":"legend","isParent":false,"returnType":"String","defaults":"bottom","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.0","description":"The vertical alignment of the legend box. Can be one of \"top\", \"middle\" or  \"bottom\". Vertical position can be further determined by the <code>y</code> option.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/verticalalign/\" target=\"_blank\">Legend 100px from the top of the chart</a>"},{"name":"series<area>-dataLabels--verticalAlign","fullname":"series<area>.dataLabels.verticalAlign","title":"verticalAlign","parent":"series<area>-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"title--verticalAlign","fullname":"title.verticalAlign","title":"verticalAlign","parent":"title","isParent":false,"returnType":"String","defaults":" ","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.1","description":"The vertical alignment of the title. Can be one of \"top\", \"middle\" and \"bottom\". When a value is given, the title behaves as floating.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/title/verticalalign/\" target=\"_blank\">Chart title in bottom right corner</a>","deprecated":false},{"name":"exporting-buttons-contextButton--verticalAlign","fullname":"exporting.buttons.contextButton.verticalAlign","title":"verticalAlign","parent":"exporting-buttons-contextButton","isParent":false,"returnType":"String","defaults":"top","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.0","description":"The vertical alignment of the buttons. Can be one of \"top\", \"middle\" or \"bottom\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-verticalalign/\" target=\"_blank\">Buttons at lower right</a>"},{"name":"series<bar>-dataLabels--verticalAlign","fullname":"series<bar>.dataLabels.verticalAlign","title":"verticalAlign","parent":"series<bar>-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"yAxis-plotBands-label--verticalAlign","fullname":"yAxis.plotBands.label.verticalAlign","title":"verticalAlign","parent":"yAxis-plotBands-label","isParent":false,"returnType":"String","defaults":"top","since":"2.1","description":"Vertical alignment of the label relative to the plot band. Can be one of \"top\", \"middle\" or \"bottom\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-label-verticalalign/\" target=\"_blank\">Vertically centered label</a>"},{"name":"series<scatter>-dataLabels--verticalAlign","fullname":"series<scatter>.dataLabels.verticalAlign","title":"verticalAlign","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"series<columnrange>-dataLabels--verticalAlign","fullname":"series<columnrange>.dataLabels.verticalAlign","title":"verticalAlign","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"series<waterfall>-dataLabels--verticalAlign","fullname":"series<waterfall>.dataLabels.verticalAlign","title":"verticalAlign","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column-dataLabels--verticalAlign","fullname":"plotOptions.column.dataLabels.verticalAlign","title":"verticalAlign","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"series<heatmap>-dataLabels--verticalAlign","fullname":"series<heatmap>.dataLabels.verticalAlign","title":"verticalAlign","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"subtitle--verticalAlign","fullname":"subtitle.verticalAlign","title":"verticalAlign","parent":"subtitle","isParent":false,"returnType":"String","defaults":" ","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.1","description":"The vertical alignment of the title. Can be one of \"top\", \"middle\" and \"bottom\". When a value is given, the title behaves as floating.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/subtitle/verticalalign/\" target=\"_blank\">Footnote at the bottom right of plot area</a>","deprecated":false},{"name":"series<column>-dataLabels--verticalAlign","fullname":"series<column>.dataLabels.verticalAlign","title":"verticalAlign","parent":"series<column>-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-dataLabels--verticalAlign","fullname":"plotOptions.pyramid.dataLabels.verticalAlign","title":"verticalAlign","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall-dataLabels--verticalAlign","fullname":"plotOptions.waterfall.dataLabels.verticalAlign","title":"verticalAlign","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"xAxis-plotBands-label--verticalAlign","fullname":"xAxis.plotBands.label.verticalAlign","title":"verticalAlign","parent":"xAxis-plotBands-label","isParent":false,"returnType":"String","defaults":"top","since":"2.1","description":"Vertical alignment of the label relative to the plot band. Can be one of \"top\", \"middle\" or \"bottom\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-label-verticalalign/\" target=\"_blank\">Vertically centered label</a>"},{"name":"plotOptions-line-dataLabels--verticalAlign","fullname":"plotOptions.line.dataLabels.verticalAlign","title":"verticalAlign","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-dataLabels--verticalAlign","fullname":"plotOptions.polygon.dataLabels.verticalAlign","title":"verticalAlign","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"series<solidgauge>-dataLabels--verticalAlign","fullname":"series<solidgauge>.dataLabels.verticalAlign","title":"verticalAlign","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"String","defaults":"top","since":"","description":"The vertical alignment of the data label.","demo":"","seeAlso":"","deprecated":false},{"name":"series<line>-dataLabels--verticalAlign","fullname":"series<line>.dataLabels.verticalAlign","title":"verticalAlign","parent":"series<line>-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"series<funnel>-dataLabels--verticalAlign","fullname":"series<funnel>.dataLabels.verticalAlign","title":"verticalAlign","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"series<treemap>-dataLabels--verticalAlign","fullname":"series<treemap>.dataLabels.verticalAlign","title":"verticalAlign","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"String","context":"","defaults":"middle","values":"","since":"4.1.0","description":"The vertical alignment of a data label. Can be one of top, middle or bottom. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"navigation-buttonOptions--verticalAlign","fullname":"navigation.buttonOptions.verticalAlign","title":"verticalAlign","parent":"navigation-buttonOptions","isParent":false,"returnType":"String","defaults":"top","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.0","description":"The vertical alignment of the buttons. Can be one of \"top\", \"middle\" or \"bottom\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-verticalalign/\" target=\"_blank\">Buttons at lower right</a>"},{"name":"xAxis-plotLines-label--verticalAlign","fullname":"xAxis.plotLines.label.verticalAlign","title":"verticalAlign","parent":"xAxis-plotLines-label","isParent":false,"returnType":"String","defaults":"top","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.1","description":"Vertical alignment of the label relative to the plot band. Can be one of \"top\", \"middle\" or \"bottom\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-label-verticalalign-middle/\" target=\"_blank\">Vertically centered label</a>","deprecated":false},{"name":"yAxis-stackLabels--verticalAlign","fullname":"yAxis.stackLabels.verticalAlign","title":"verticalAlign","parent":"yAxis-stackLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.1.5","description":"Defines the vertical alignment of the stack total label. Can be one of <code>\"top\"</code>, <code>\"middle\"</code> or <code>\"bottom\"</code>. The default value is calculated at runtime and depends on orientation and whether  the stack is positive or negative.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/stacklabels-verticalalign-top/\" target=\"_blank\">\"Vertically aligned top\"</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/stacklabels-verticalalign-middle/\" target=\"_blank\">\"Vertically aligned middle\"</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/stacklabels-verticalalign-bottom/\" target=\"_blank\">\"Vertically aligned bottom\"</a>"},{"name":"plotOptions-pie-dataLabels--verticalAlign","fullname":"plotOptions.pie.dataLabels.verticalAlign","title":"verticalAlign","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areaspline>-dataLabels--verticalAlign","fullname":"series<areaspline>.dataLabels.verticalAlign","title":"verticalAlign","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-dataLabels--verticalAlign","fullname":"series<areasplinerange>.dataLabels.verticalAlign","title":"verticalAlign","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"yAxis-plotLines-label--verticalAlign","fullname":"yAxis.plotLines.label.verticalAlign","title":"verticalAlign","parent":"yAxis-plotLines-label","isParent":false,"returnType":"String","defaults":"top","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.1","description":"Vertical alignment of the label relative to the plot band. Can be one of \"top\", \"middle\" or \"bottom\".","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-label-verticalalign-middle/\" target=\"_blank\">Vertically centered label</a>","deprecated":false},{"name":"plotOptions-bubble-dataLabels--verticalAlign","fullname":"plotOptions.bubble.dataLabels.verticalAlign","title":"verticalAlign","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap-dataLabels--verticalAlign","fullname":"plotOptions.treemap.dataLabels.verticalAlign","title":"verticalAlign","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"String","context":"","defaults":"middle","values":"","since":"4.1.0","description":"The vertical alignment of a data label. Can be one of top, middle or bottom. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"series<gauge>-dataLabels--verticalAlign","fullname":"series<gauge>.dataLabels.verticalAlign","title":"verticalAlign","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"String","defaults":"top","since":"","description":"The vertical alignment of the data label.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pie>-dataLabels--verticalAlign","fullname":"series<pie>.dataLabels.verticalAlign","title":"verticalAlign","parent":"series<pie>-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels--verticalAlign","fullname":"plotOptions.areasplinerange.dataLabels.verticalAlign","title":"verticalAlign","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange-dataLabels--verticalAlign","fullname":"plotOptions.arearange.dataLabels.verticalAlign","title":"verticalAlign","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-dataLabels--verticalAlign","fullname":"plotOptions.areaspline.dataLabels.verticalAlign","title":"verticalAlign","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bubble>-dataLabels--verticalAlign","fullname":"series<bubble>.dataLabels.verticalAlign","title":"verticalAlign","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel-dataLabels--verticalAlign","fullname":"plotOptions.funnel.dataLabels.verticalAlign","title":"verticalAlign","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bar-dataLabels--verticalAlign","fullname":"plotOptions.bar.dataLabels.verticalAlign","title":"verticalAlign","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-dataLabels--verticalAlign","fullname":"plotOptions.spline.dataLabels.verticalAlign","title":"verticalAlign","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pyramid>-dataLabels--verticalAlign","fullname":"series<pyramid>.dataLabels.verticalAlign","title":"verticalAlign","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter-dataLabels--verticalAlign","fullname":"plotOptions.scatter.dataLabels.verticalAlign","title":"verticalAlign","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"series<polygon>-dataLabels--verticalAlign","fullname":"series<polygon>.dataLabels.verticalAlign","title":"verticalAlign","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"series<arearange>-dataLabels--verticalAlign","fullname":"series<arearange>.dataLabels.verticalAlign","title":"verticalAlign","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-series-dataLabels--verticalAlign","fullname":"plotOptions.series.dataLabels.verticalAlign","title":"verticalAlign","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>-dataLabels--verticalAlign","fullname":"series<spline>.dataLabels.verticalAlign","title":"verticalAlign","parent":"series<spline>-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-area-dataLabels--verticalAlign","fullname":"plotOptions.area.dataLabels.verticalAlign","title":"verticalAlign","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap-dataLabels--verticalAlign","fullname":"plotOptions.heatmap.dataLabels.verticalAlign","title":"verticalAlign","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"String","values":"[\"top\", \"middle\", \"bottom\"]","since":"2.3.3","description":"The vertical alignment of a data label. Can be one of <code>top</code>, <code>middle</code> or <code>bottom</code>. The default value depends on the data, for instance in a column chart, the label is above positive values and below negative values.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-solidgauge-dataLabels--verticalAlign","fullname":"plotOptions.solidgauge.dataLabels.verticalAlign","title":"verticalAlign","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"String","defaults":"top","since":"","description":"The vertical alignment of the data label.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge-dataLabels--verticalAlign","fullname":"plotOptions.gauge.dataLabels.verticalAlign","title":"verticalAlign","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"String","defaults":"top","since":"","description":"The vertical alignment of the data label.","demo":"","seeAlso":"","deprecated":false},{"name":"chart-options3d--viewDistance","fullname":"chart.options3d.viewDistance","title":"viewDistance","parent":"chart-options3d","isParent":false,"returnType":"Number","defaults":"100","values":"","since":"4.0","description":"Defines the distance the viewer is standing in front of the chart, this setting is important to calculate the perspective effect in column and scatter charts.\r\nIt is not used for 3D pie charts.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bar--visible","fullname":"plotOptions.bar.visible","title":"visible","parent":"plotOptions-bar","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"plotOptions-areasplinerange--visible","fullname":"plotOptions.areasplinerange.visible","title":"visible","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"series<pyramid>--visible","fullname":"series<pyramid>.visible","title":"visible","parent":"series<pyramid>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"series<pie>--visible","fullname":"series<pie>.visible","title":"visible","parent":"series<pie>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"plotOptions-solidgauge--visible","fullname":"plotOptions.solidgauge.visible","title":"visible","parent":"plotOptions-solidgauge","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"series<errorbar>--visible","fullname":"series<errorbar>.visible","title":"visible","parent":"series<errorbar>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"plotOptions-spline--visible","fullname":"plotOptions.spline.visible","title":"visible","parent":"plotOptions-spline","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"series<arearange>--visible","fullname":"series<arearange>.visible","title":"visible","parent":"series<arearange>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"plotOptions-heatmap--visible","fullname":"plotOptions.heatmap.visible","title":"visible","parent":"plotOptions-heatmap","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"plotOptions-pie--visible","fullname":"plotOptions.pie.visible","title":"visible","parent":"plotOptions-pie","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"plotOptions-pyramid--visible","fullname":"plotOptions.pyramid.visible","title":"visible","parent":"plotOptions-pyramid","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"series<gauge>--visible","fullname":"series<gauge>.visible","title":"visible","parent":"series<gauge>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"plotOptions-columnrange--visible","fullname":"plotOptions.columnrange.visible","title":"visible","parent":"plotOptions-columnrange","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"series<solidgauge>--visible","fullname":"series<solidgauge>.visible","title":"visible","parent":"series<solidgauge>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"series<columnrange>--visible","fullname":"series<columnrange>.visible","title":"visible","parent":"series<columnrange>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"plotOptions-boxplot--visible","fullname":"plotOptions.boxplot.visible","title":"visible","parent":"plotOptions-boxplot","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"plotOptions-line--visible","fullname":"plotOptions.line.visible","title":"visible","parent":"plotOptions-line","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"plotOptions-bubble--visible","fullname":"plotOptions.bubble.visible","title":"visible","parent":"plotOptions-bubble","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"series<area>--visible","fullname":"series<area>.visible","title":"visible","parent":"series<area>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"series<column>--visible","fullname":"series<column>.visible","title":"visible","parent":"series<column>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"plotOptions-treemap--visible","fullname":"plotOptions.treemap.visible","title":"visible","parent":"plotOptions-treemap","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"plotOptions-column--visible","fullname":"plotOptions.column.visible","title":"visible","parent":"plotOptions-column","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"plotOptions-waterfall--visible","fullname":"plotOptions.waterfall.visible","title":"visible","parent":"plotOptions-waterfall","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"plotOptions-gauge--visible","fullname":"plotOptions.gauge.visible","title":"visible","parent":"plotOptions-gauge","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"plotOptions-area--visible","fullname":"plotOptions.area.visible","title":"visible","parent":"plotOptions-area","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"series<areasplinerange>--visible","fullname":"series<areasplinerange>.visible","title":"visible","parent":"series<areasplinerange>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"plotOptions-funnel--visible","fullname":"plotOptions.funnel.visible","title":"visible","parent":"plotOptions-funnel","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"series<boxplot>--visible","fullname":"series<boxplot>.visible","title":"visible","parent":"series<boxplot>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"series<treemap>--visible","fullname":"series<treemap>.visible","title":"visible","parent":"series<treemap>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"series<heatmap>--visible","fullname":"series<heatmap>.visible","title":"visible","parent":"series<heatmap>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"plotOptions-series--visible","fullname":"plotOptions.series.visible","title":"visible","parent":"plotOptions-series","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"series<funnel>--visible","fullname":"series<funnel>.visible","title":"visible","parent":"series<funnel>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"series<areaspline>--visible","fullname":"series<areaspline>.visible","title":"visible","parent":"series<areaspline>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"series<spline>--visible","fullname":"series<spline>.visible","title":"visible","parent":"series<spline>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"plotOptions-areaspline--visible","fullname":"plotOptions.areaspline.visible","title":"visible","parent":"plotOptions-areaspline","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"series<polygon>--visible","fullname":"series<polygon>.visible","title":"visible","parent":"series<polygon>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"plotOptions-scatter--visible","fullname":"plotOptions.scatter.visible","title":"visible","parent":"plotOptions-scatter","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"series<bubble>--visible","fullname":"series<bubble>.visible","title":"visible","parent":"series<bubble>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"series<waterfall>--visible","fullname":"series<waterfall>.visible","title":"visible","parent":"series<waterfall>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"plotOptions-errorbar--visible","fullname":"plotOptions.errorbar.visible","title":"visible","parent":"plotOptions-errorbar","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"plotOptions-arearange--visible","fullname":"plotOptions.arearange.visible","title":"visible","parent":"plotOptions-arearange","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"series<scatter>--visible","fullname":"series<scatter>.visible","title":"visible","parent":"series<scatter>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"plotOptions-polygon--visible","fullname":"plotOptions.polygon.visible","title":"visible","parent":"plotOptions-polygon","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"series<line>--visible","fullname":"series<line>.visible","title":"visible","parent":"series<line>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"series<bar>--visible","fullname":"series<bar>.visible","title":"visible","parent":"series<bar>","isParent":false,"returnType":"Boolean","defaults":"true","description":"Set the initial visibility of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-visible/\" target=\"_blank\">Two series, one hidden and one visible</a>"},{"name":"plotOptions-waterfall","fullname":"plotOptions.waterfall","title":"waterfall","parent":"plotOptions","isParent":true,"returnType":"Object","defaults":"","values":"","since":"3.0","description":"Options for the waterfall series type.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/demo/waterfall/\" target=\"_blank\">Waterfall chart</a>","seeAlso":"","deprecated":false},{"name":"lang--weekdays","fullname":"lang.weekdays","title":"weekdays","parent":"lang","isParent":false,"returnType":"Array<String>","defaults":"[\"Sunday\", \"Monday\", \"Tuesday\", \"Wednesday\", \"Thursday\", \"Friday\", \"Saturday\"]","since":"","description":"An array containing the weekday names.\t\t ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar--whiskerColor","fullname":"plotOptions.errorbar.whiskerColor","title":"whiskerColor","parent":"plotOptions-errorbar","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color of the whiskers, the horizontal lines marking low and high values. When <code>null</code>, the general series color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>","seeAlso":"","deprecated":false},{"name":"series<errorbar>--whiskerColor","fullname":"series<errorbar>.whiskerColor","title":"whiskerColor","parent":"series<errorbar>","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color of the whiskers, the horizontal lines marking low and high values. When <code>null</code>, the general series color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot--whiskerColor","fullname":"plotOptions.boxplot.whiskerColor","title":"whiskerColor","parent":"plotOptions-boxplot","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color of the whiskers, the horizontal lines marking low and high values. When <code>null</code>, the general series color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>","seeAlso":"","deprecated":false},{"name":"series<boxplot>--whiskerColor","fullname":"series<boxplot>.whiskerColor","title":"whiskerColor","parent":"series<boxplot>","isParent":false,"returnType":"Color","defaults":"null","values":"","since":"3.0","description":"The color of the whiskers, the horizontal lines marking low and high values. When <code>null</code>, the general series color is used.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>","seeAlso":"","deprecated":false},{"name":"series<errorbar>--whiskerLength","fullname":"series<errorbar>.whiskerLength","title":"whiskerLength","parent":"series<errorbar>","isParent":false,"returnType":"Number|String","defaults":"50%","values":"","since":"3.0","description":"The length of the whiskers, the horizontal lines marking low and high values. It can be a numerical pixel value, or a percentage value of the box width. Set <code>0</code> to disable whiskers.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">True by default</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar--whiskerLength","fullname":"plotOptions.errorbar.whiskerLength","title":"whiskerLength","parent":"plotOptions-errorbar","isParent":false,"returnType":"Number|String","defaults":"50%","values":"","since":"3.0","description":"The length of the whiskers, the horizontal lines marking low and high values. It can be a numerical pixel value, or a percentage value of the box width. Set <code>0</code> to disable whiskers.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">True by default</a>","seeAlso":"","deprecated":false},{"name":"series<boxplot>--whiskerLength","fullname":"series<boxplot>.whiskerLength","title":"whiskerLength","parent":"series<boxplot>","isParent":false,"returnType":"Number|String","defaults":"50%","values":"","since":"3.0","description":"The length of the whiskers, the horizontal lines marking low and high values. It can be a numerical pixel value, or a percentage value of the box width. Set <code>0</code> to disable whiskers.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">True by default</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot--whiskerLength","fullname":"plotOptions.boxplot.whiskerLength","title":"whiskerLength","parent":"plotOptions-boxplot","isParent":false,"returnType":"Number|String","defaults":"50%","values":"","since":"3.0","description":"The length of the whiskers, the horizontal lines marking low and high values. It can be a numerical pixel value, or a percentage value of the box width. Set <code>0</code> to disable whiskers.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">True by default</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot--whiskerWidth","fullname":"plotOptions.boxplot.whiskerWidth","title":"whiskerWidth","parent":"plotOptions-boxplot","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"3.0","description":"The line width of the whiskers, the horizontal lines marking low and high values. When <code>null</code>, the general <a href=\"#plotOptions.boxplot.lineWidth\">lineWidth</a> applies.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>","seeAlso":"","deprecated":false},{"name":"series<errorbar>--whiskerWidth","fullname":"series<errorbar>.whiskerWidth","title":"whiskerWidth","parent":"series<errorbar>","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"3.0","description":"The line width of the whiskers, the horizontal lines marking low and high values. When <code>null</code>, the general <a href=\"#plotOptions.errorbar.lineWidth\">lineWidth</a> applies.","demo":" <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/error-bar-styling/\" target=\"_blank\">Error bar styling</a>","seeAlso":"","deprecated":false},{"name":"series<boxplot>--whiskerWidth","fullname":"series<boxplot>.whiskerWidth","title":"whiskerWidth","parent":"series<boxplot>","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"3.0","description":"The line width of the whiskers, the horizontal lines marking low and high values. When <code>null</code>, the general <a href=\"#plotOptions.boxplot.lineWidth\">lineWidth</a> applies.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/box-plot-styling/\" target=\"_blank\">Box plot styling</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar--whiskerWidth","fullname":"plotOptions.errorbar.whiskerWidth","title":"whiskerWidth","parent":"plotOptions-errorbar","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"3.0","description":"The line width of the whiskers, the horizontal lines marking low and high values. When <code>null</code>, the general <a href=\"#plotOptions.errorbar.lineWidth\">lineWidth</a> applies.","demo":" <a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/error-bar-styling/\" target=\"_blank\">Error bar styling</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange-states-hover-marker--width","fullname":"plotOptions.columnrange.states.hover.marker.width","title":"width","parent":"plotOptions-columnrange-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap-states-hover-marker--width","fullname":"plotOptions.heatmap.states.hover.marker.width","title":"width","parent":"plotOptions-heatmap-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-area-marker--width","fullname":"plotOptions.area.marker.width","title":"width","parent":"plotOptions-area-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter-states-hover-marker--width","fullname":"plotOptions.scatter.states.hover.marker.width","title":"width","parent":"plotOptions-scatter-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-series-states-hover-marker--width","fullname":"plotOptions.series.states.hover.marker.width","title":"width","parent":"plotOptions-series-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-states-hover-marker--width","fullname":"series<areasplinerange>.states.hover.marker.width","title":"width","parent":"series<areasplinerange>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<bar>-states-hover-marker--width","fullname":"series<bar>.states.hover.marker.width","title":"width","parent":"series<bar>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"xAxis-plotLines--width","fullname":"xAxis.plotLines.width","title":"width","parent":"xAxis-plotLines","isParent":false,"returnType":"Number","description":"The width or thickness of the plot line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-color/\" target=\"_blank\">2px wide line from X axis</a>"},{"name":"plotOptions-arearange-states-hover-marker--width","fullname":"plotOptions.arearange.states.hover.marker.width","title":"width","parent":"plotOptions-arearange-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<pyramid>-states-hover-marker--width","fullname":"series<pyramid>.states.hover.marker.width","title":"width","parent":"series<pyramid>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<heatmap>-states-hover-marker--width","fullname":"series<heatmap>.states.hover.marker.width","title":"width","parent":"series<heatmap>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<spline>-states-hover-marker--width","fullname":"series<spline>.states.hover.marker.width","title":"width","parent":"series<spline>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-states-hover-marker--width","fullname":"plotOptions.spline.states.hover.marker.width","title":"width","parent":"plotOptions-spline-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<scatter>-marker--width","fullname":"series<scatter>.marker.width","title":"width","parent":"series<scatter>-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-marker--width","fullname":"plotOptions.spline.marker.width","title":"width","parent":"plotOptions-spline-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<line>-marker--width","fullname":"series<line>.marker.width","title":"width","parent":"series<line>-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-area-states-hover-marker--width","fullname":"plotOptions.area.states.hover.marker.width","title":"width","parent":"plotOptions-area-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-series-marker--width","fullname":"plotOptions.series.marker.width","title":"width","parent":"plotOptions-series-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"exporting-buttons-contextButton--width","fullname":"exporting.buttons.contextButton.width","title":"width","parent":"exporting-buttons-contextButton","isParent":false,"returnType":"Number","defaults":"24","since":"2.0","description":"The pixel width of the button.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-height/\" target=\"_blank\">Bigger buttons</a>"},{"name":"series<treemap>-states-hover-marker--width","fullname":"series<treemap>.states.hover.marker.width","title":"width","parent":"series<treemap>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<pyramid>--width","fullname":"series<pyramid>.width","title":"width","parent":"series<pyramid>","isParent":false,"returnType":"Number|String","defaults":"90%","values":"","since":"3.0","description":"The width of the funnel compared to the width of the plot area, or the pixel width if it is a number.","demo":"","seeAlso":"","deprecated":false},{"name":"series<boxplot>-states-hover-marker--width","fullname":"series<boxplot>.states.hover.marker.width","title":"width","parent":"series<boxplot>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<columnrange>-states-hover-marker--width","fullname":"series<columnrange>.states.hover.marker.width","title":"width","parent":"series<columnrange>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<scatter>-states-hover-marker--width","fullname":"series<scatter>.states.hover.marker.width","title":"width","parent":"series<scatter>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble-states-hover-marker--width","fullname":"plotOptions.bubble.states.hover.marker.width","title":"width","parent":"plotOptions-bubble-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble-marker--width","fullname":"plotOptions.bubble.marker.width","title":"width","parent":"plotOptions-bubble-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<polygon>-data-marker--width","fullname":"series<polygon>.data.marker.width","title":"width","parent":"series<polygon>-data-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<areaspline>-states-hover-marker--width","fullname":"series<areaspline>.states.hover.marker.width","title":"width","parent":"series<areaspline>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<line>-states-hover-marker--width","fullname":"series<line>.states.hover.marker.width","title":"width","parent":"series<line>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<polygon>-marker--width","fullname":"series<polygon>.marker.width","title":"width","parent":"series<polygon>-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-pie-states-hover-marker--width","fullname":"plotOptions.pie.states.hover.marker.width","title":"width","parent":"plotOptions-pie-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-states-hover-marker--width","fullname":"plotOptions.pyramid.states.hover.marker.width","title":"width","parent":"plotOptions-pyramid-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-boxplot-states-hover-marker--width","fullname":"plotOptions.boxplot.states.hover.marker.width","title":"width","parent":"plotOptions-boxplot-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<polygon>-states-hover-marker--width","fullname":"series<polygon>.states.hover.marker.width","title":"width","parent":"series<polygon>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"yAxis-plotLines--width","fullname":"yAxis.plotLines.width","title":"width","parent":"yAxis-plotLines","isParent":false,"returnType":"Number","description":"The width or thickness of the plot line.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-color/\" target=\"_blank\">2px wide line from X axis</a>"},{"name":"exporting--width","fullname":"exporting.width","title":"width","parent":"exporting","isParent":false,"returnType":"Number","defaults":"undefined","since":"2.0","description":"The pixel width of charts exported to PNG or JPG. As of Highcharts 3.0, the default pixel width is a function of the <a href=\"#chart.width\">chart.width</a> or <a href=\"#exporting.sourceWidth\">exporting.sourceWidth</a> and the <a href=\"#exporting.scale\">exporting.scale</a>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/exporting/width/\" target=\"_blank\">Export to 200px wide images</a>","deprecated":false},{"name":"plotOptions-treemap-states-hover-marker--width","fullname":"plotOptions.treemap.states.hover.marker.width","title":"width","parent":"plotOptions-treemap-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel--width","fullname":"plotOptions.funnel.width","title":"width","parent":"plotOptions-funnel","isParent":false,"returnType":"Number|String","defaults":"90%","values":"","since":"3.0","description":"The width of the funnel compared to the width of the plot area, or the pixel width if it is a number.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-marker--width","fullname":"plotOptions.areaspline.marker.width","title":"width","parent":"plotOptions-areaspline-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-waterfall-states-hover-marker--width","fullname":"plotOptions.waterfall.states.hover.marker.width","title":"width","parent":"plotOptions-waterfall-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<areaspline>-marker--width","fullname":"series<areaspline>.marker.width","title":"width","parent":"series<areaspline>-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter-marker--width","fullname":"plotOptions.scatter.marker.width","title":"width","parent":"plotOptions-scatter-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<bubble>-marker--width","fullname":"series<bubble>.marker.width","title":"width","parent":"series<bubble>-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-states-hover-marker--width","fullname":"plotOptions.areaspline.states.hover.marker.width","title":"width","parent":"plotOptions-areaspline-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<area>-marker--width","fullname":"series<area>.marker.width","title":"width","parent":"series<area>-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<area>-states-hover-marker--width","fullname":"series<area>.states.hover.marker.width","title":"width","parent":"series<area>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<scatter>-data-marker--width","fullname":"series<scatter>.data.marker.width","title":"width","parent":"series<scatter>-data-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid--width","fullname":"plotOptions.pyramid.width","title":"width","parent":"plotOptions-pyramid","isParent":false,"returnType":"Number|String","defaults":"90%","values":"","since":"3.0","description":"The width of the funnel compared to the width of the plot area, or the pixel width if it is a number.","demo":"","seeAlso":"","deprecated":false},{"name":"series<waterfall>-states-hover-marker--width","fullname":"series<waterfall>.states.hover.marker.width","title":"width","parent":"series<waterfall>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<column>-states-hover-marker--width","fullname":"series<column>.states.hover.marker.width","title":"width","parent":"series<column>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"chart--width","fullname":"chart.width","title":"width","parent":"chart","isParent":false,"returnType":"Number","description":"An explicit width for the chart. By default the width is calculated from the offset width of the containing element.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/width/\" target=\"_blank\">800px wide</a>"},{"name":"plotOptions-solidgauge-states-hover-marker--width","fullname":"plotOptions.solidgauge.states.hover.marker.width","title":"width","parent":"plotOptions-solidgauge-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<spline>-marker--width","fullname":"series<spline>.marker.width","title":"width","parent":"series<spline>-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-column-states-hover-marker--width","fullname":"plotOptions.column.states.hover.marker.width","title":"width","parent":"plotOptions-column-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<arearange>-states-hover-marker--width","fullname":"series<arearange>.states.hover.marker.width","title":"width","parent":"series<arearange>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange-states-hover-marker--width","fullname":"plotOptions.areasplinerange.states.hover.marker.width","title":"width","parent":"plotOptions-areasplinerange-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<bubble>-states-hover-marker--width","fullname":"series<bubble>.states.hover.marker.width","title":"width","parent":"series<bubble>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<line>-data-marker--width","fullname":"series<line>.data.marker.width","title":"width","parent":"series<line>-data-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<gauge>-states-hover-marker--width","fullname":"series<gauge>.states.hover.marker.width","title":"width","parent":"series<gauge>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-states-hover-marker--width","fullname":"plotOptions.polygon.states.hover.marker.width","title":"width","parent":"plotOptions-polygon-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-line-marker--width","fullname":"plotOptions.line.marker.width","title":"width","parent":"plotOptions-line-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<spline>-data-marker--width","fullname":"series<spline>.data.marker.width","title":"width","parent":"series<spline>-data-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-marker--width","fullname":"plotOptions.polygon.marker.width","title":"width","parent":"plotOptions-polygon-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"navigation-buttonOptions--width","fullname":"navigation.buttonOptions.width","title":"width","parent":"navigation-buttonOptions","isParent":false,"returnType":"Number","defaults":"24","since":"2.0","description":"The pixel width of the button.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-height/\" target=\"_blank\">Bigger buttons</a>"},{"name":"series<pie>-states-hover-marker--width","fullname":"series<pie>.states.hover.marker.width","title":"width","parent":"series<pie>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-errorbar-states-hover-marker--width","fullname":"plotOptions.errorbar.states.hover.marker.width","title":"width","parent":"plotOptions-errorbar-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<funnel>--width","fullname":"series<funnel>.width","title":"width","parent":"series<funnel>","isParent":false,"returnType":"Number|String","defaults":"90%","values":"","since":"3.0","description":"The width of the funnel compared to the width of the plot area, or the pixel width if it is a number.","demo":"","seeAlso":"","deprecated":false},{"name":"series<area>-data-marker--width","fullname":"series<area>.data.marker.width","title":"width","parent":"series<area>-data-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<solidgauge>-states-hover-marker--width","fullname":"series<solidgauge>.states.hover.marker.width","title":"width","parent":"series<solidgauge>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<errorbar>-states-hover-marker--width","fullname":"series<errorbar>.states.hover.marker.width","title":"width","parent":"series<errorbar>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-bar-states-hover-marker--width","fullname":"plotOptions.bar.states.hover.marker.width","title":"width","parent":"plotOptions-bar-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel-states-hover-marker--width","fullname":"plotOptions.funnel.states.hover.marker.width","title":"width","parent":"plotOptions-funnel-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge-states-hover-marker--width","fullname":"plotOptions.gauge.states.hover.marker.width","title":"width","parent":"plotOptions-gauge-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"legend--width","fullname":"legend.width","title":"width","parent":"legend","isParent":false,"returnType":"Number","since":"2.0","description":"The width of the legend box.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/width/\" target=\"_blank\">Aligned to the plot area</a>","deprecated":false},{"name":"plotOptions-line-states-hover-marker--width","fullname":"plotOptions.line.states.hover.marker.width","title":"width","parent":"plotOptions-line-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<funnel>-states-hover-marker--width","fullname":"series<funnel>.states.hover.marker.width","title":"width","parent":"series<funnel>-states-hover-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<areaspline>-data-marker--width","fullname":"series<areaspline>.data.marker.width","title":"width","parent":"series<areaspline>-data-marker","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.4","description":"Image markers only. Set the image width explicitly. When using this option, a <code>height</code> must also be set.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-marker-width-height/\" target=\"_blank\">Fixed width and height</a>","seeAlso":"","deprecated":false},{"name":"series<gauge>--wrap","fullname":"series<gauge>.wrap","title":"wrap","parent":"series<gauge>","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0","description":"When this option is <code>true</code>, the dial will wrap around the axes. For instance, in a full-range gauge going from 0 to 360, a value of 400 will point to 40. When <code>wrap</code> is <code>false</code>, the dial stops at 360.","seeAlso":"<a href=\"#plotOptions.gauge.overshoot\">overshoot</a>","deprecated":false},{"name":"plotOptions-gauge--wrap","fullname":"plotOptions.gauge.wrap","title":"wrap","parent":"plotOptions-gauge","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0","description":"When this option is <code>true</code>, the dial will wrap around the axes. For instance, in a full-range gauge going from 0 to 360, a value of 400 will point to 40. When <code>wrap</code> is <code>false</code>, the dial stops at 360.","seeAlso":"<a href=\"#plotOptions.gauge.overshoot\">overshoot</a>","deprecated":false},{"name":"plotOptions-solidgauge--wrap","fullname":"plotOptions.solidgauge.wrap","title":"wrap","parent":"plotOptions-solidgauge","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0","description":"When this option is <code>true</code>, the dial will wrap around the axes. For instance, in a full-range gauge going from 0 to 360, a value of 400 will point to 40. When <code>wrap</code> is <code>false</code>, the dial stops at 360.","seeAlso":"<a href=\"#plotOptions.gauge.overshoot\">overshoot</a>","deprecated":false},{"name":"series<solidgauge>--wrap","fullname":"series<solidgauge>.wrap","title":"wrap","parent":"series<solidgauge>","isParent":false,"returnType":"Boolean","defaults":"true","since":"3.0","description":"When this option is <code>true</code>, the dial will wrap around the axes. For instance, in a full-range gauge going from 0 to 360, a value of 400 will point to 40. When <code>wrap</code> is <code>false</code>, the dial stops at 360.","seeAlso":"<a href=\"#plotOptions.gauge.overshoot\">overshoot</a>","deprecated":false},{"name":"series<heatmap>-dataLabels--x","fullname":"series<heatmap>.dataLabels.x","title":"x","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"plotOptions-line-dataLabels--x","fullname":"plotOptions.line.dataLabels.x","title":"x","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"plotOptions-gauge-dataLabels--x","fullname":"plotOptions.gauge.dataLabels.x","title":"x","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"series<areaspline>-data--x","fullname":"series<areaspline>.data.x","title":"x","parent":"series<areaspline>-data","isParent":false,"returnType":"Number","description":"The x value of the point. For datetime axes, the X value is the timestamp in milliseconds since 1970.","deprecated":false},{"name":"series<area>-data--x","fullname":"series<area>.data.x","title":"x","parent":"series<area>-data","isParent":false,"returnType":"Number","description":"The x value of the point. For datetime axes, the X value is the timestamp in milliseconds since 1970.","deprecated":false},{"name":"series<treemap>-dataLabels--x","fullname":"series<treemap>.dataLabels.x","title":"x","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"plotOptions-area-dataLabels--x","fullname":"plotOptions.area.dataLabels.x","title":"x","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"series<heatmap>-data--x","fullname":"series<heatmap>.data.x","title":"x","parent":"series<heatmap>-data","isParent":false,"returnType":"Number","description":"The x value of the point. For datetime axes, the X value is the timestamp in milliseconds since 1970.","deprecated":false},{"name":"series<polygon>-dataLabels--x","fullname":"series<polygon>.dataLabels.x","title":"x","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"series<waterfall>-dataLabels--x","fullname":"series<waterfall>.dataLabels.x","title":"x","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"series<errorbar>-data--x","fullname":"series<errorbar>.data.x","title":"x","parent":"series<errorbar>-data","isParent":false,"returnType":"Number","description":"The x value of the point. For datetime axes, the X value is the timestamp in milliseconds since 1970.","deprecated":false},{"name":"series<bubble>-data--x","fullname":"series<bubble>.data.x","title":"x","parent":"series<bubble>-data","isParent":false,"returnType":"Number","description":"The x value of the point. For datetime axes, the X value is the timestamp in milliseconds since 1970.","deprecated":false},{"name":"plotOptions-spline-dataLabels--x","fullname":"plotOptions.spline.dataLabels.x","title":"x","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"series<solidgauge>-dataLabels--x","fullname":"series<solidgauge>.dataLabels.x","title":"x","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"series<gauge>-dataLabels--x","fullname":"series<gauge>.dataLabels.x","title":"x","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"series<columnrange>-data--x","fullname":"series<columnrange>.data.x","title":"x","parent":"series<columnrange>-data","isParent":false,"returnType":"Number","description":"The x value of the point. For datetime axes, the X value is the timestamp in milliseconds since 1970.","deprecated":false},{"name":"plotOptions-polygon-dataLabels--x","fullname":"plotOptions.polygon.dataLabels.x","title":"x","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"series<scatter>-data--x","fullname":"series<scatter>.data.x","title":"x","parent":"series<scatter>-data","isParent":false,"returnType":"Number","description":"The x value of the point. For datetime axes, the X value is the timestamp in milliseconds since 1970.","deprecated":false},{"name":"legend--x","fullname":"legend.x","title":"x","parent":"legend","isParent":false,"returnType":"Number","defaults":"0","since":"2.0","description":"The x offset of the legend relative to its horizontal alignment <code>align</code> within chart.spacingLeft and chart.spacingRight. Negative x moves it to the left, positive x moves it to the right. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/width/\" target=\"_blank\">Aligned to the plot area</a>","deprecated":false},{"name":"series<line>-data--x","fullname":"series<line>.data.x","title":"x","parent":"series<line>-data","isParent":false,"returnType":"Number","description":"The x value of the point. For datetime axes, the X value is the timestamp in milliseconds since 1970.","deprecated":false},{"name":"series<pie>-dataLabels--x","fullname":"series<pie>.dataLabels.x","title":"x","parent":"series<pie>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"yAxis-labels--x","fullname":"yAxis.labels.x","title":"x","parent":"yAxis-labels","isParent":false,"returnType":"Number","description":"The x position offset of the label relative to the tick position on the axis. Defaults to -15 for left axis, 15 for right axis.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-x/\" target=\"_blank\">Y axis labels placed on grid lines</a>","deprecated":false},{"name":"plotOptions-bar-dataLabels--x","fullname":"plotOptions.bar.dataLabels.x","title":"x","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"Number","defaults":"5","description":"The x position of the data label relative to the data point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/bar-datalabels-align-inside-bar/\" target=\"_blank\">Data labels inside the bar</a>"},{"name":"plotOptions-treemap-dataLabels--x","fullname":"plotOptions.treemap.dataLabels.x","title":"x","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"plotOptions-column-dataLabels--x","fullname":"plotOptions.column.dataLabels.x","title":"x","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"series<areaspline>-dataLabels--x","fullname":"series<areaspline>.dataLabels.x","title":"x","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"plotOptions-waterfall-dataLabels--x","fullname":"plotOptions.waterfall.dataLabels.x","title":"x","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"xAxis-labels--x","fullname":"xAxis.labels.x","title":"x","parent":"xAxis-labels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the tick position on the axis.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-x/\" target=\"_blank\">Y axis labels placed on grid lines</a>"},{"name":"series<funnel>-dataLabels--x","fullname":"series<funnel>.dataLabels.x","title":"x","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"series<column>-data--x","fullname":"series<column>.data.x","title":"x","parent":"series<column>-data","isParent":false,"returnType":"Number","description":"The x value of the point. For datetime axes, the X value is the timestamp in milliseconds since 1970.","deprecated":false},{"name":"plotOptions-series-dataLabels--x","fullname":"plotOptions.series.dataLabels.x","title":"x","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"series<spline>-data--x","fullname":"series<spline>.data.x","title":"x","parent":"series<spline>-data","isParent":false,"returnType":"Number","description":"The x value of the point. For datetime axes, the X value is the timestamp in milliseconds since 1970.","deprecated":false},{"name":"series<column>-dataLabels--x","fullname":"series<column>.dataLabels.x","title":"x","parent":"series<column>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"xAxis-plotLines-label--x","fullname":"xAxis.plotLines.label.x","title":"x","parent":"xAxis-plotLines-label","isParent":false,"returnType":"Number","since":"2.1","description":"Horizontal position relative the alignment. Default varies by orientation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-label-align-right/\" target=\"_blank\">Aligned 10px from the right edge</a>"},{"name":"series<bar>-data--x","fullname":"series<bar>.data.x","title":"x","parent":"series<bar>-data","isParent":false,"returnType":"Number","description":"The x value of the point. For datetime axes, the X value is the timestamp in milliseconds since 1970.","deprecated":false},{"name":"title--x","fullname":"title.x","title":"x","parent":"title","isParent":false,"returnType":"Number","defaults":"0","since":"2.0","description":"The x position of the title relative to the alignment within chart.spacingLeft and chart.spacingRight.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/title/align/\" target=\"_blank\">Aligned to the plot area (x = 70px \n\t\t\t= margin left - spacing left)</a>"},{"name":"plotOptions-funnel-dataLabels--x","fullname":"plotOptions.funnel.dataLabels.x","title":"x","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"plotOptions-solidgauge-dataLabels--x","fullname":"plotOptions.solidgauge.dataLabels.x","title":"x","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"plotOptions-scatter-dataLabels--x","fullname":"plotOptions.scatter.dataLabels.x","title":"x","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"xAxis-title--x","fullname":"xAxis.title.x","title":"x","parent":"xAxis-title","isParent":false,"returnType":"Number","defaults":"0","since":"4.1.6","description":"Horizontal pixel offset of the title position.","deprecated":false},{"name":"series<areasplinerange>-data--x","fullname":"series<areasplinerange>.data.x","title":"x","parent":"series<areasplinerange>-data","isParent":false,"returnType":"Number","description":"The x value of the point. For datetime axes, the X value is the timestamp in milliseconds since 1970.","deprecated":false},{"name":"series<waterfall>-data--x","fullname":"series<waterfall>.data.x","title":"x","parent":"series<waterfall>-data","isParent":false,"returnType":"Number","description":"The x value of the point. For datetime axes, the X value is the timestamp in milliseconds since 1970.","deprecated":false},{"name":"plotOptions-pie-dataLabels--x","fullname":"plotOptions.pie.dataLabels.x","title":"x","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"series<line>-dataLabels--x","fullname":"series<line>.dataLabels.x","title":"x","parent":"series<line>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"series<pyramid>-dataLabels--x","fullname":"series<pyramid>.dataLabels.x","title":"x","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"yAxis-title--x","fullname":"yAxis.title.x","title":"x","parent":"yAxis-title","isParent":false,"returnType":"Number","defaults":"0","since":"4.1.6","description":"Horizontal pixel offset of the title position.","deprecated":false},{"name":"series<arearange>-data--x","fullname":"series<arearange>.data.x","title":"x","parent":"series<arearange>-data","isParent":false,"returnType":"Number","description":"The x value of the point. For datetime axes, the X value is the timestamp in milliseconds since 1970.","deprecated":false},{"name":"series<spline>-dataLabels--x","fullname":"series<spline>.dataLabels.x","title":"x","parent":"series<spline>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"yAxis-plotBands-label--x","fullname":"yAxis.plotBands.label.x","title":"x","parent":"yAxis-plotBands-label","isParent":false,"returnType":"Number","since":"2.1","description":"Horizontal position relative the alignment. Default varies by orientation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-label-align/\" target=\"_blank\">Aligned 10px from the right edge</a>"},{"name":"series<scatter>-dataLabels--x","fullname":"series<scatter>.dataLabels.x","title":"x","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"yAxis-plotLines-label--x","fullname":"yAxis.plotLines.label.x","title":"x","parent":"yAxis-plotLines-label","isParent":false,"returnType":"Number","since":"2.1","description":"Horizontal position relative the alignment. Default varies by orientation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-label-align-right/\" target=\"_blank\">Aligned 10px from the right edge</a>"},{"name":"subtitle--x","fullname":"subtitle.x","title":"x","parent":"subtitle","isParent":false,"returnType":"Number","defaults":"0","since":"2.0","description":"The x position of the subtitle relative to the alignment within chart.spacingLeft and chart.spacingRight.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/subtitle/align/\" target=\"_blank\">Footnote at right of plot area</a>"},{"name":"series<boxplot>-data--x","fullname":"series<boxplot>.data.x","title":"x","parent":"series<boxplot>-data","isParent":false,"returnType":"Number","description":"The x value of the point. For datetime axes, the X value is the timestamp in milliseconds since 1970.","deprecated":false},{"name":"series<bar>-dataLabels--x","fullname":"series<bar>.dataLabels.x","title":"x","parent":"series<bar>-dataLabels","isParent":false,"returnType":"Number","defaults":"5","description":"The x position of the data label relative to the data point.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/bar-datalabels-align-inside-bar/\" target=\"_blank\">Data labels inside the bar</a>"},{"name":"yAxis-stackLabels--x","fullname":"yAxis.stackLabels.x","title":"x","parent":"yAxis-stackLabels","isParent":false,"returnType":"Number","since":"2.1.5","description":"The x position offset of the label relative to the left of the stacked bar. The default value is calculated at runtime and depends on orientation and whether the stack is positive or negative.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/stacklabels-x/\" target=\"_blank\">Stack total labels with x offset</a>"},{"name":"series<area>-dataLabels--x","fullname":"series<area>.dataLabels.x","title":"x","parent":"series<area>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"plotOptions-pyramid-dataLabels--x","fullname":"plotOptions.pyramid.dataLabels.x","title":"x","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"xAxis-plotBands-label--x","fullname":"xAxis.plotBands.label.x","title":"x","parent":"xAxis-plotBands-label","isParent":false,"returnType":"Number","since":"2.1","description":"Horizontal position relative the alignment. Default varies by orientation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-label-align/\" target=\"_blank\">Aligned 10px from the right edge</a>"},{"name":"series<bubble>-dataLabels--x","fullname":"series<bubble>.dataLabels.x","title":"x","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"plotOptions-heatmap-dataLabels--x","fullname":"plotOptions.heatmap.dataLabels.x","title":"x","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"plotOptions-areaspline-dataLabels--x","fullname":"plotOptions.areaspline.dataLabels.x","title":"x","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"series<polygon>-data--x","fullname":"series<polygon>.data.x","title":"x","parent":"series<polygon>-data","isParent":false,"returnType":"Number","description":"The x value of the point. For datetime axes, the X value is the timestamp in milliseconds since 1970.","deprecated":false},{"name":"exporting-buttons-contextButton--x","fullname":"exporting.buttons.contextButton.x","title":"x","parent":"exporting-buttons-contextButton","isParent":false,"returnType":"Number","defaults":"-10","since":"2.0","description":"The horizontal position of the button relative to the <code>align</code>\r\n option.","demo":" ","deprecated":false},{"name":"plotOptions-bubble-dataLabels--x","fullname":"plotOptions.bubble.dataLabels.x","title":"x","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"Number","defaults":"0","description":"The x position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","deprecated":false},{"name":"series<column>--xAxis","fullname":"series<column>.xAxis","title":"xAxis","parent":"series<column>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple x axes, this number defines which xAxis the particular series is connected to. It refers to either the <a href=\"#xAxis.id\">axis id</a> or the index of the axis in the xAxis array, with 0 being the first.","deprecated":false},{"name":"series<arearange>--xAxis","fullname":"series<arearange>.xAxis","title":"xAxis","parent":"series<arearange>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple x axes, this number defines which xAxis the particular series is connected to. It refers to either the <a href=\"#xAxis.id\">axis id</a> or the index of the axis in the xAxis array, with 0 being the first.","deprecated":false},{"name":"series<area>--xAxis","fullname":"series<area>.xAxis","title":"xAxis","parent":"series<area>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple x axes, this number defines which xAxis the particular series is connected to. It refers to either the <a href=\"#xAxis.id\">axis id</a> or the index of the axis in the xAxis array, with 0 being the first.","deprecated":false},{"name":"series<gauge>--xAxis","fullname":"series<gauge>.xAxis","title":"xAxis","parent":"series<gauge>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple x axes, this number defines which xAxis the particular series is connected to. It refers to either the <a href=\"#xAxis.id\">axis id</a> or the index of the axis in the xAxis array, with 0 being the first.","deprecated":false},{"name":"series--xAxis","fullname":"series.xAxis","title":"xAxis","parent":"series","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple x axes, this number defines which xAxis the particular series is connected to. It refers to either the <a href=\"#xAxis.id\">axis id</a> or the index of the axis in the xAxis array, with 0 being the first.","deprecated":false},{"name":"series<line>--xAxis","fullname":"series<line>.xAxis","title":"xAxis","parent":"series<line>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple x axes, this number defines which xAxis the particular series is connected to. It refers to either the <a href=\"#xAxis.id\">axis id</a> or the index of the axis in the xAxis array, with 0 being the first.","deprecated":false},{"name":"series<boxplot>--xAxis","fullname":"series<boxplot>.xAxis","title":"xAxis","parent":"series<boxplot>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple x axes, this number defines which xAxis the particular series is connected to. It refers to either the <a href=\"#xAxis.id\">axis id</a> or the index of the axis in the xAxis array, with 0 being the first.","deprecated":false},{"name":"series<spline>--xAxis","fullname":"series<spline>.xAxis","title":"xAxis","parent":"series<spline>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple x axes, this number defines which xAxis the particular series is connected to. It refers to either the <a href=\"#xAxis.id\">axis id</a> or the index of the axis in the xAxis array, with 0 being the first.","deprecated":false},{"name":"series<treemap>--xAxis","fullname":"series<treemap>.xAxis","title":"xAxis","parent":"series<treemap>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple x axes, this number defines which xAxis the particular series is connected to. It refers to either the <a href=\"#xAxis.id\">axis id</a> or the index of the axis in the xAxis array, with 0 being the first.","deprecated":false},{"name":"xAxis","fullname":"xAxis","title":"xAxis","isParent":true,"description":"<p>The X axis or category axis. Normally this is the horizontal axis, though if the \r\n\tchart is inverted this is the vertical axis. In case of multiple axes, the xAxis\r\n\tnode is an array of configuration objects.</p>\r\n\t<p>See <a class=\"internal\" href=\"#axis.object\">the Axis object</a> for programmatic\r\n\taccess to the axis.</p>","deprecated":false},{"name":"series<polygon>--xAxis","fullname":"series<polygon>.xAxis","title":"xAxis","parent":"series<polygon>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple x axes, this number defines which xAxis the particular series is connected to. It refers to either the <a href=\"#xAxis.id\">axis id</a> or the index of the axis in the xAxis array, with 0 being the first.","deprecated":false},{"name":"series<heatmap>--xAxis","fullname":"series<heatmap>.xAxis","title":"xAxis","parent":"series<heatmap>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple x axes, this number defines which xAxis the particular series is connected to. It refers to either the <a href=\"#xAxis.id\">axis id</a> or the index of the axis in the xAxis array, with 0 being the first.","deprecated":false},{"name":"series<waterfall>--xAxis","fullname":"series<waterfall>.xAxis","title":"xAxis","parent":"series<waterfall>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple x axes, this number defines which xAxis the particular series is connected to. It refers to either the <a href=\"#xAxis.id\">axis id</a> or the index of the axis in the xAxis array, with 0 being the first.","deprecated":false},{"name":"series<errorbar>--xAxis","fullname":"series<errorbar>.xAxis","title":"xAxis","parent":"series<errorbar>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple x axes, this number defines which xAxis the particular series is connected to. It refers to either the <a href=\"#xAxis.id\">axis id</a> or the index of the axis in the xAxis array, with 0 being the first.","deprecated":false},{"name":"series<areaspline>--xAxis","fullname":"series<areaspline>.xAxis","title":"xAxis","parent":"series<areaspline>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple x axes, this number defines which xAxis the particular series is connected to. It refers to either the <a href=\"#xAxis.id\">axis id</a> or the index of the axis in the xAxis array, with 0 being the first.","deprecated":false},{"name":"series<solidgauge>--xAxis","fullname":"series<solidgauge>.xAxis","title":"xAxis","parent":"series<solidgauge>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple x axes, this number defines which xAxis the particular series is connected to. It refers to either the <a href=\"#xAxis.id\">axis id</a> or the index of the axis in the xAxis array, with 0 being the first.","deprecated":false},{"name":"series<areasplinerange>--xAxis","fullname":"series<areasplinerange>.xAxis","title":"xAxis","parent":"series<areasplinerange>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple x axes, this number defines which xAxis the particular series is connected to. It refers to either the <a href=\"#xAxis.id\">axis id</a> or the index of the axis in the xAxis array, with 0 being the first.","deprecated":false},{"name":"series<bar>--xAxis","fullname":"series<bar>.xAxis","title":"xAxis","parent":"series<bar>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple x axes, this number defines which xAxis the particular series is connected to. It refers to either the <a href=\"#xAxis.id\">axis id</a> or the index of the axis in the xAxis array, with 0 being the first.","deprecated":false},{"name":"series<scatter>--xAxis","fullname":"series<scatter>.xAxis","title":"xAxis","parent":"series<scatter>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple x axes, this number defines which xAxis the particular series is connected to. It refers to either the <a href=\"#xAxis.id\">axis id</a> or the index of the axis in the xAxis array, with 0 being the first.","deprecated":false},{"name":"series<columnrange>--xAxis","fullname":"series<columnrange>.xAxis","title":"xAxis","parent":"series<columnrange>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple x axes, this number defines which xAxis the particular series is connected to. It refers to either the <a href=\"#xAxis.id\">axis id</a> or the index of the axis in the xAxis array, with 0 being the first.","deprecated":false},{"name":"series<bubble>--xAxis","fullname":"series<bubble>.xAxis","title":"xAxis","parent":"series<bubble>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple x axes, this number defines which xAxis the particular series is connected to. It refers to either the <a href=\"#xAxis.id\">axis id</a> or the index of the axis in the xAxis array, with 0 being the first.","deprecated":false},{"name":"series<areaspline>-tooltip--xDateFormat","fullname":"series<areaspline>.tooltip.xDateFormat","title":"xDateFormat","parent":"series<areaspline>-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-pyramid-tooltip--xDateFormat","fullname":"plotOptions.pyramid.tooltip.xDateFormat","title":"xDateFormat","parent":"plotOptions-pyramid-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-heatmap-tooltip--xDateFormat","fullname":"plotOptions.heatmap.tooltip.xDateFormat","title":"xDateFormat","parent":"plotOptions-heatmap-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-spline-tooltip--xDateFormat","fullname":"plotOptions.spline.tooltip.xDateFormat","title":"xDateFormat","parent":"plotOptions-spline-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"series<bubble>-tooltip--xDateFormat","fullname":"series<bubble>.tooltip.xDateFormat","title":"xDateFormat","parent":"series<bubble>-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-boxplot-tooltip--xDateFormat","fullname":"plotOptions.boxplot.tooltip.xDateFormat","title":"xDateFormat","parent":"plotOptions-boxplot-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-pie-tooltip--xDateFormat","fullname":"plotOptions.pie.tooltip.xDateFormat","title":"xDateFormat","parent":"plotOptions-pie-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"series<area>-tooltip--xDateFormat","fullname":"series<area>.tooltip.xDateFormat","title":"xDateFormat","parent":"series<area>-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-gauge-tooltip--xDateFormat","fullname":"plotOptions.gauge.tooltip.xDateFormat","title":"xDateFormat","parent":"plotOptions-gauge-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-arearange-tooltip--xDateFormat","fullname":"plotOptions.arearange.tooltip.xDateFormat","title":"xDateFormat","parent":"plotOptions-arearange-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"series<spline>-tooltip--xDateFormat","fullname":"series<spline>.tooltip.xDateFormat","title":"xDateFormat","parent":"series<spline>-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-area-tooltip--xDateFormat","fullname":"plotOptions.area.tooltip.xDateFormat","title":"xDateFormat","parent":"plotOptions-area-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"tooltip--xDateFormat","fullname":"tooltip.xDateFormat","title":"xDateFormat","parent":"tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-areasplinerange-tooltip--xDateFormat","fullname":"plotOptions.areasplinerange.tooltip.xDateFormat","title":"xDateFormat","parent":"plotOptions-areasplinerange-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"series<arearange>-tooltip--xDateFormat","fullname":"series<arearange>.tooltip.xDateFormat","title":"xDateFormat","parent":"series<arearange>-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"series<column>-tooltip--xDateFormat","fullname":"series<column>.tooltip.xDateFormat","title":"xDateFormat","parent":"series<column>-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-areaspline-tooltip--xDateFormat","fullname":"plotOptions.areaspline.tooltip.xDateFormat","title":"xDateFormat","parent":"plotOptions-areaspline-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"series<bar>-tooltip--xDateFormat","fullname":"series<bar>.tooltip.xDateFormat","title":"xDateFormat","parent":"series<bar>-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"series<funnel>-tooltip--xDateFormat","fullname":"series<funnel>.tooltip.xDateFormat","title":"xDateFormat","parent":"series<funnel>-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-treemap-tooltip--xDateFormat","fullname":"plotOptions.treemap.tooltip.xDateFormat","title":"xDateFormat","parent":"plotOptions-treemap-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"series<boxplot>-tooltip--xDateFormat","fullname":"series<boxplot>.tooltip.xDateFormat","title":"xDateFormat","parent":"series<boxplot>-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"series<errorbar>-tooltip--xDateFormat","fullname":"series<errorbar>.tooltip.xDateFormat","title":"xDateFormat","parent":"series<errorbar>-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"series<treemap>-tooltip--xDateFormat","fullname":"series<treemap>.tooltip.xDateFormat","title":"xDateFormat","parent":"series<treemap>-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-polygon-tooltip--xDateFormat","fullname":"plotOptions.polygon.tooltip.xDateFormat","title":"xDateFormat","parent":"plotOptions-polygon-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"series<waterfall>-tooltip--xDateFormat","fullname":"series<waterfall>.tooltip.xDateFormat","title":"xDateFormat","parent":"series<waterfall>-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-line-tooltip--xDateFormat","fullname":"plotOptions.line.tooltip.xDateFormat","title":"xDateFormat","parent":"plotOptions-line-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"series<areasplinerange>-tooltip--xDateFormat","fullname":"series<areasplinerange>.tooltip.xDateFormat","title":"xDateFormat","parent":"series<areasplinerange>-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-funnel-tooltip--xDateFormat","fullname":"plotOptions.funnel.tooltip.xDateFormat","title":"xDateFormat","parent":"plotOptions-funnel-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"series<columnrange>-tooltip--xDateFormat","fullname":"series<columnrange>.tooltip.xDateFormat","title":"xDateFormat","parent":"series<columnrange>-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"series<solidgauge>-tooltip--xDateFormat","fullname":"series<solidgauge>.tooltip.xDateFormat","title":"xDateFormat","parent":"series<solidgauge>-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"series<gauge>-tooltip--xDateFormat","fullname":"series<gauge>.tooltip.xDateFormat","title":"xDateFormat","parent":"series<gauge>-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-series-tooltip--xDateFormat","fullname":"plotOptions.series.tooltip.xDateFormat","title":"xDateFormat","parent":"plotOptions-series-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"series<polygon>-tooltip--xDateFormat","fullname":"series<polygon>.tooltip.xDateFormat","title":"xDateFormat","parent":"series<polygon>-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"series<pie>-tooltip--xDateFormat","fullname":"series<pie>.tooltip.xDateFormat","title":"xDateFormat","parent":"series<pie>-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-columnrange-tooltip--xDateFormat","fullname":"plotOptions.columnrange.tooltip.xDateFormat","title":"xDateFormat","parent":"plotOptions-columnrange-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"series<heatmap>-tooltip--xDateFormat","fullname":"series<heatmap>.tooltip.xDateFormat","title":"xDateFormat","parent":"series<heatmap>-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"series<scatter>-tooltip--xDateFormat","fullname":"series<scatter>.tooltip.xDateFormat","title":"xDateFormat","parent":"series<scatter>-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"series<pyramid>-tooltip--xDateFormat","fullname":"series<pyramid>.tooltip.xDateFormat","title":"xDateFormat","parent":"series<pyramid>-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-waterfall-tooltip--xDateFormat","fullname":"plotOptions.waterfall.tooltip.xDateFormat","title":"xDateFormat","parent":"plotOptions-waterfall-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-column-tooltip--xDateFormat","fullname":"plotOptions.column.tooltip.xDateFormat","title":"xDateFormat","parent":"plotOptions-column-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-bar-tooltip--xDateFormat","fullname":"plotOptions.bar.tooltip.xDateFormat","title":"xDateFormat","parent":"plotOptions-bar-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"series<line>-tooltip--xDateFormat","fullname":"series<line>.tooltip.xDateFormat","title":"xDateFormat","parent":"series<line>-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-solidgauge-tooltip--xDateFormat","fullname":"plotOptions.solidgauge.tooltip.xDateFormat","title":"xDateFormat","parent":"plotOptions-solidgauge-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-scatter-tooltip--xDateFormat","fullname":"plotOptions.scatter.tooltip.xDateFormat","title":"xDateFormat","parent":"plotOptions-scatter-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-errorbar-tooltip--xDateFormat","fullname":"plotOptions.errorbar.tooltip.xDateFormat","title":"xDateFormat","parent":"plotOptions-errorbar-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-bubble-tooltip--xDateFormat","fullname":"plotOptions.bubble.tooltip.xDateFormat","title":"xDateFormat","parent":"plotOptions-bubble-tooltip","isParent":false,"returnType":"String","description":"The format for the date in the tooltip header if the X axis is a datetime axis. The default is a best guess based on the smallest distance between points in the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/tooltip/xdateformat/\" target=\"_blank\">A different format</a>"},{"name":"plotOptions-areasplinerange-dataLabels--xHigh","fullname":"plotOptions.areasplinerange.dataLabels.xHigh","title":"xHigh","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.3.0","description":"X offset of the higher data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-dataLabels--xHigh","fullname":"series<areasplinerange>.dataLabels.xHigh","title":"xHigh","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.3.0","description":"X offset of the higher data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"series<columnrange>-dataLabels--xHigh","fullname":"series<columnrange>.dataLabels.xHigh","title":"xHigh","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.3.0","description":"X offset of the higher data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange-dataLabels--xHigh","fullname":"plotOptions.arearange.dataLabels.xHigh","title":"xHigh","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.3.0","description":"X offset of the higher data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"series<arearange>-dataLabels--xHigh","fullname":"series<arearange>.dataLabels.xHigh","title":"xHigh","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.3.0","description":"X offset of the higher data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange-dataLabels--xHigh","fullname":"plotOptions.columnrange.dataLabels.xHigh","title":"xHigh","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.3.0","description":"X offset of the higher data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange-dataLabels--xLow","fullname":"plotOptions.arearange.dataLabels.xLow","title":"xLow","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.3.0","description":"X offset of the lower data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-dataLabels--xLow","fullname":"series<areasplinerange>.dataLabels.xLow","title":"xLow","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.3.0","description":"X offset of the lower data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"series<columnrange>-dataLabels--xLow","fullname":"series<columnrange>.dataLabels.xLow","title":"xLow","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.3.0","description":"X offset of the lower data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels--xLow","fullname":"plotOptions.areasplinerange.dataLabels.xLow","title":"xLow","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.3.0","description":"X offset of the lower data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange-dataLabels--xLow","fullname":"plotOptions.columnrange.dataLabels.xLow","title":"xLow","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.3.0","description":"X offset of the lower data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"series<arearange>-dataLabels--xLow","fullname":"series<arearange>.dataLabels.xLow","title":"xLow","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"Number","defaults":"0","since":"2.3.0","description":"X offset of the lower data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"legend--y","fullname":"legend.y","title":"y","parent":"legend","isParent":false,"returnType":"Number","defaults":"0","since":"2.0","description":"The vertical offset of the legend relative to it's vertical alignment <code>verticalAlign</code> within chart.spacingTop and chart.spacingBottom. Negative y moves it up, positive y moves it down.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/legend/verticalalign/\" target=\"_blank\">Legend 100px from the top of the chart</a>"},{"name":"series<solidgauge>-dataLabels--y","fullname":"series<solidgauge>.dataLabels.y","title":"y","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"Number","defaults":"15","since":"2.3.0","description":"The y position offset of the label relative to the center of the gauge. ","demo":"","seeAlso":"","deprecated":false},{"name":"series<pie>-data--y","fullname":"series<pie>.data.y","title":"y","parent":"series<pie>-data","isParent":false,"returnType":"Number","description":"The y value of the point."},{"name":"subtitle--y","fullname":"subtitle.y","title":"y","parent":"subtitle","isParent":false,"returnType":"Number","defaults":" null","since":"2.0","description":"The y position of the subtitle relative to the alignment within chart.spacingTop and chart.spacingBottom. By default the subtitle is laid out below the title unless the title is floating.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/subtitle/verticalalign/\" target=\"_blank\">Footnote at the bottom right of plot area</a>","deprecated":false},{"name":"series<heatmap>-dataLabels--y","fullname":"series<heatmap>.dataLabels.y","title":"y","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-solidgauge-dataLabels--y","fullname":"plotOptions.solidgauge.dataLabels.y","title":"y","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"Number","defaults":"15","since":"2.3.0","description":"The y position offset of the label relative to the center of the gauge. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-dataLabels--y","fullname":"plotOptions.pyramid.dataLabels.y","title":"y","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"navigation-buttonOptions--y","fullname":"navigation.buttonOptions.y","title":"y","parent":"navigation-buttonOptions","isParent":false,"returnType":"Number","defaults":"0","since":"2.0","description":"The vertical offset of the button's position relative to its <code>verticalAlign</code>.\t\t\t .","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-verticalalign/\" target=\"_blank\">Buttons at lower right</a>","deprecated":false},{"name":"series<areaspline>-dataLabels--y","fullname":"series<areaspline>.dataLabels.y","title":"y","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"series<gauge>-data--y","fullname":"series<gauge>.data.y","title":"y","parent":"series<gauge>-data","isParent":false,"returnType":"Number","description":"The y value of the point."},{"name":"series<areaspline>-data--y","fullname":"series<areaspline>.data.y","title":"y","parent":"series<areaspline>-data","isParent":false,"returnType":"Number","description":"The y value of the point."},{"name":"title--y","fullname":"title.y","title":"y","parent":"title","isParent":false,"returnType":"Number","since":"2.0","description":"The y position of the title relative to the alignment within <a href=\"#chart.spacingTop\">chart.spacingTop</a> and <a href=\"#chart.spacingBottom\">chart.spacingBottom</a>. By default it depends on the font size.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/title/y/\" target=\"_blank\">Title inside the plot area</a>","deprecated":false},{"name":"yAxis-plotBands-label--y","fullname":"yAxis.plotBands.label.y","title":"y","parent":"yAxis-plotBands-label","isParent":false,"returnType":"Number","since":"2.1","description":"Vertical position of the text baseline relative to the alignment. Default varies by orientation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-label-y/\" target=\"_blank\">Label on x axis</a>"},{"name":"series<line>-data--y","fullname":"series<line>.data.y","title":"y","parent":"series<line>-data","isParent":false,"returnType":"Number","description":"The y value of the point."},{"name":"series<gauge>-dataLabels--y","fullname":"series<gauge>.dataLabels.y","title":"y","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"Number","defaults":"15","since":"2.3.0","description":"The y position offset of the label relative to the center of the gauge. ","demo":"","seeAlso":"","deprecated":false},{"name":"yAxis-title--y","fullname":"yAxis.title.y","title":"y","parent":"yAxis-title","isParent":false,"returnType":"Number","context":"","defaults":"","values":"","since":"","description":"Vertical pixel offset of the title position.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-series-dataLabels--y","fullname":"plotOptions.series.dataLabels.y","title":"y","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"series<pyramid>-dataLabels--y","fullname":"series<pyramid>.dataLabels.y","title":"y","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"series<bubble>-data--y","fullname":"series<bubble>.data.y","title":"y","parent":"series<bubble>-data","isParent":false,"returnType":"Number","description":"The y value of the point."},{"name":"series<area>-data--y","fullname":"series<area>.data.y","title":"y","parent":"series<area>-data","isParent":false,"returnType":"Number","description":"The y value of the point."},{"name":"xAxis-plotBands-label--y","fullname":"xAxis.plotBands.label.y","title":"y","parent":"xAxis-plotBands-label","isParent":false,"returnType":"Number","since":"2.1","description":"Vertical position of the text baseline relative to the alignment. Default varies by orientation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-label-y/\" target=\"_blank\">Label on x axis</a>"},{"name":"series<bar>-dataLabels--y","fullname":"series<bar>.dataLabels.y","title":"y","parent":"series<bar>-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"series<pie>-dataLabels--y","fullname":"series<pie>.dataLabels.y","title":"y","parent":"series<pie>-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"yAxis-plotLines-label--y","fullname":"yAxis.plotLines.label.y","title":"y","parent":"yAxis-plotLines-label","isParent":false,"returnType":"Number","since":"2.1","description":"Vertical position of the text baseline relative to the alignment. Default varies by orientation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-label-y/\" target=\"_blank\">Label below the plot line</a>"},{"name":"plotOptions-heatmap-dataLabels--y","fullname":"plotOptions.heatmap.dataLabels.y","title":"y","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-pie-dataLabels--y","fullname":"plotOptions.pie.dataLabels.y","title":"y","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"series<scatter>-data--y","fullname":"series<scatter>.data.y","title":"y","parent":"series<scatter>-data","isParent":false,"returnType":"Number","description":"The y value of the point."},{"name":"series<pyramid>-data--y","fullname":"series<pyramid>.data.y","title":"y","parent":"series<pyramid>-data","isParent":false,"returnType":"Number","description":"The y value of the point."},{"name":"plotOptions-bar-dataLabels--y","fullname":"plotOptions.bar.dataLabels.y","title":"y","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"series<waterfall>-dataLabels--y","fullname":"series<waterfall>.dataLabels.y","title":"y","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-dataLabels--y","fullname":"plotOptions.areaspline.dataLabels.y","title":"y","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"series<waterfall>-data--y","fullname":"series<waterfall>.data.y","title":"y","parent":"series<waterfall>-data","isParent":false,"returnType":"Number","description":"The y value of the point."},{"name":"yAxis-labels--y","fullname":"yAxis.labels.y","title":"y","parent":"yAxis-labels","isParent":false,"returnType":"Number","defaults":"3","description":"The y position offset of the label relative to the tick position on the axis.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-x/\" target=\"_blank\">Y axis labels placed on grid lines</a>"},{"name":"yAxis-stackLabels--y","fullname":"yAxis.stackLabels.y","title":"y","parent":"yAxis-stackLabels","isParent":false,"returnType":"Number","since":"2.1.5","description":"The y position offset of the label relative to the tick position on the axis. The default value is calculated at runtime and depends on orientation and whether  the stack is positive or negative.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/yaxis/stacklabels-y/\" target=\"_blank\">Stack total labels with y offset</a>"},{"name":"plotOptions-column-dataLabels--y","fullname":"plotOptions.column.dataLabels.y","title":"y","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel-dataLabels--y","fullname":"plotOptions.funnel.dataLabels.y","title":"y","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"xAxis-title--y","fullname":"xAxis.title.y","title":"y","parent":"xAxis-title","isParent":false,"returnType":"Number","context":"","defaults":"","values":"","since":"","description":"Vertical pixel offset of the title position.","demo":"","seeAlso":"","deprecated":false},{"name":"series<funnel>-dataLabels--y","fullname":"series<funnel>.dataLabels.y","title":"y","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter-dataLabels--y","fullname":"plotOptions.scatter.dataLabels.y","title":"y","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"series<area>-dataLabels--y","fullname":"series<area>.dataLabels.y","title":"y","parent":"series<area>-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"series<polygon>-data--y","fullname":"series<polygon>.data.y","title":"y","parent":"series<polygon>-data","isParent":false,"returnType":"Number","description":"The y value of the point."},{"name":"xAxis-plotLines-label--y","fullname":"xAxis.plotLines.label.y","title":"y","parent":"xAxis-plotLines-label","isParent":false,"returnType":"Number","since":"2.1","description":"Vertical position of the text baseline relative to the alignment. Default varies by orientation.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-label-y/\" target=\"_blank\">Label below the plot line</a>"},{"name":"series<boxplot>-data--y","fullname":"series<boxplot>.data.y","title":"y","parent":"series<boxplot>-data","isParent":false,"returnType":"Number","description":"The y value of the point."},{"name":"plotOptions-waterfall-dataLabels--y","fullname":"plotOptions.waterfall.dataLabels.y","title":"y","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"series<spline>-dataLabels--y","fullname":"series<spline>.dataLabels.y","title":"y","parent":"series<spline>-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"series<heatmap>-data--y","fullname":"series<heatmap>.data.y","title":"y","parent":"series<heatmap>-data","isParent":false,"returnType":"Number","description":"The y value of the point."},{"name":"plotOptions-spline-dataLabels--y","fullname":"plotOptions.spline.dataLabels.y","title":"y","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap-dataLabels--y","fullname":"plotOptions.treemap.dataLabels.y","title":"y","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"series<polygon>-dataLabels--y","fullname":"series<polygon>.dataLabels.y","title":"y","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"xAxis-labels--y","fullname":"xAxis.labels.y","title":"y","parent":"xAxis-labels","isParent":false,"returnType":"Number","defaults":"null","description":"The y position offset of the label relative to the tick position on the axis. The default makes it adapt to the font size on bottom axis.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/labels-x/\" target=\"_blank\">Y axis labels placed on grid lines</a>","deprecated":false},{"name":"series<solidgauge>-data--y","fullname":"series<solidgauge>.data.y","title":"y","parent":"series<solidgauge>-data","isParent":false,"returnType":"Number","description":"The y value of the point."},{"name":"series<treemap>-dataLabels--y","fullname":"series<treemap>.dataLabels.y","title":"y","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"series<scatter>-dataLabels--y","fullname":"series<scatter>.dataLabels.y","title":"y","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble-dataLabels--y","fullname":"plotOptions.bubble.dataLabels.y","title":"y","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"series<line>-dataLabels--y","fullname":"series<line>.dataLabels.y","title":"y","parent":"series<line>-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"exporting-buttons-contextButton--y","fullname":"exporting.buttons.contextButton.y","title":"y","parent":"exporting-buttons-contextButton","isParent":false,"returnType":"Number","defaults":"0","since":"2.0","description":"The vertical offset of the button's position relative to its <code>verticalAlign</code>.\t\t\t .","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/navigation/buttonoptions-verticalalign/\" target=\"_blank\">Buttons at lower right</a>","deprecated":false},{"name":"series<funnel>-data--y","fullname":"series<funnel>.data.y","title":"y","parent":"series<funnel>-data","isParent":false,"returnType":"Number","description":"The y value of the point."},{"name":"series<spline>-data--y","fullname":"series<spline>.data.y","title":"y","parent":"series<spline>-data","isParent":false,"returnType":"Number","description":"The y value of the point."},{"name":"plotOptions-gauge-dataLabels--y","fullname":"plotOptions.gauge.dataLabels.y","title":"y","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"Number","defaults":"15","since":"2.3.0","description":"The y position offset of the label relative to the center of the gauge. ","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-line-dataLabels--y","fullname":"plotOptions.line.dataLabels.y","title":"y","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"series<bubble>-dataLabels--y","fullname":"series<bubble>.dataLabels.y","title":"y","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"series<column>-dataLabels--y","fullname":"series<column>.dataLabels.y","title":"y","parent":"series<column>-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"series<bar>-data--y","fullname":"series<bar>.data.y","title":"y","parent":"series<bar>-data","isParent":false,"returnType":"Number","description":"The y value of the point."},{"name":"plotOptions-area-dataLabels--y","fullname":"plotOptions.area.dataLabels.y","title":"y","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-dataLabels--y","fullname":"plotOptions.polygon.dataLabels.y","title":"y","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"","description":"The y position offset of the label relative to the point. ","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-datalabels-rotation/\" target=\"_blank\">Vertical and positioned</a>","seeAlso":"","deprecated":false},{"name":"series<column>-data--y","fullname":"series<column>.data.y","title":"y","parent":"series<column>-data","isParent":false,"returnType":"Number","description":"The y value of the point."},{"name":"series<spline>--yAxis","fullname":"series<spline>.yAxis","title":"yAxis","parent":"series<spline>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple y axes, this number defines which yAxis the particular series is connected to. It refers to either the <a href=\"#yAxis.id\">axis id</a> or the index of the axis in the yAxis array, with 0 being the first.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/yaxis/\" target=\"_blank\">Apply the column series to the secondary Y axis</a>","deprecated":false},{"name":"series<area>--yAxis","fullname":"series<area>.yAxis","title":"yAxis","parent":"series<area>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple y axes, this number defines which yAxis the particular series is connected to. It refers to either the <a href=\"#yAxis.id\">axis id</a> or the index of the axis in the yAxis array, with 0 being the first.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/yaxis/\" target=\"_blank\">Apply the column series to the secondary Y axis</a>","deprecated":false},{"name":"series<waterfall>--yAxis","fullname":"series<waterfall>.yAxis","title":"yAxis","parent":"series<waterfall>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple y axes, this number defines which yAxis the particular series is connected to. It refers to either the <a href=\"#yAxis.id\">axis id</a> or the index of the axis in the yAxis array, with 0 being the first.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/yaxis/\" target=\"_blank\">Apply the column series to the secondary Y axis</a>","deprecated":false},{"name":"series<heatmap>--yAxis","fullname":"series<heatmap>.yAxis","title":"yAxis","parent":"series<heatmap>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple y axes, this number defines which yAxis the particular series is connected to. It refers to either the <a href=\"#yAxis.id\">axis id</a> or the index of the axis in the yAxis array, with 0 being the first.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/yaxis/\" target=\"_blank\">Apply the column series to the secondary Y axis</a>","deprecated":false},{"name":"series<boxplot>--yAxis","fullname":"series<boxplot>.yAxis","title":"yAxis","parent":"series<boxplot>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple y axes, this number defines which yAxis the particular series is connected to. It refers to either the <a href=\"#yAxis.id\">axis id</a> or the index of the axis in the yAxis array, with 0 being the first.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/yaxis/\" target=\"_blank\">Apply the column series to the secondary Y axis</a>","deprecated":false},{"name":"series<gauge>--yAxis","fullname":"series<gauge>.yAxis","title":"yAxis","parent":"series<gauge>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple y axes, this number defines which yAxis the particular series is connected to. It refers to either the <a href=\"#yAxis.id\">axis id</a> or the index of the axis in the yAxis array, with 0 being the first.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/yaxis/\" target=\"_blank\">Apply the column series to the secondary Y axis</a>","deprecated":false},{"name":"series<treemap>--yAxis","fullname":"series<treemap>.yAxis","title":"yAxis","parent":"series<treemap>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple y axes, this number defines which yAxis the particular series is connected to. It refers to either the <a href=\"#yAxis.id\">axis id</a> or the index of the axis in the yAxis array, with 0 being the first.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/yaxis/\" target=\"_blank\">Apply the column series to the secondary Y axis</a>","deprecated":false},{"name":"series--yAxis","fullname":"series.yAxis","title":"yAxis","parent":"series","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple y axes, this number defines which yAxis the particular series is connected to. It refers to either the <a href=\"#yAxis.id\">axis id</a> or the index of the axis in the yAxis array, with 0 being the first.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/yaxis/\" target=\"_blank\">Apply the column series to the secondary Y axis</a>","deprecated":false},{"name":"series<areaspline>--yAxis","fullname":"series<areaspline>.yAxis","title":"yAxis","parent":"series<areaspline>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple y axes, this number defines which yAxis the particular series is connected to. It refers to either the <a href=\"#yAxis.id\">axis id</a> or the index of the axis in the yAxis array, with 0 being the first.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/yaxis/\" target=\"_blank\">Apply the column series to the secondary Y axis</a>","deprecated":false},{"name":"series<columnrange>--yAxis","fullname":"series<columnrange>.yAxis","title":"yAxis","parent":"series<columnrange>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple y axes, this number defines which yAxis the particular series is connected to. It refers to either the <a href=\"#yAxis.id\">axis id</a> or the index of the axis in the yAxis array, with 0 being the first.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/yaxis/\" target=\"_blank\">Apply the column series to the secondary Y axis</a>","deprecated":false},{"name":"series<errorbar>--yAxis","fullname":"series<errorbar>.yAxis","title":"yAxis","parent":"series<errorbar>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple y axes, this number defines which yAxis the particular series is connected to. It refers to either the <a href=\"#yAxis.id\">axis id</a> or the index of the axis in the yAxis array, with 0 being the first.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/yaxis/\" target=\"_blank\">Apply the column series to the secondary Y axis</a>","deprecated":false},{"name":"series<column>--yAxis","fullname":"series<column>.yAxis","title":"yAxis","parent":"series<column>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple y axes, this number defines which yAxis the particular series is connected to. It refers to either the <a href=\"#yAxis.id\">axis id</a> or the index of the axis in the yAxis array, with 0 being the first.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/yaxis/\" target=\"_blank\">Apply the column series to the secondary Y axis</a>","deprecated":false},{"name":"series<polygon>--yAxis","fullname":"series<polygon>.yAxis","title":"yAxis","parent":"series<polygon>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple y axes, this number defines which yAxis the particular series is connected to. It refers to either the <a href=\"#yAxis.id\">axis id</a> or the index of the axis in the yAxis array, with 0 being the first.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/yaxis/\" target=\"_blank\">Apply the column series to the secondary Y axis</a>","deprecated":false},{"name":"series<bubble>--yAxis","fullname":"series<bubble>.yAxis","title":"yAxis","parent":"series<bubble>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple y axes, this number defines which yAxis the particular series is connected to. It refers to either the <a href=\"#yAxis.id\">axis id</a> or the index of the axis in the yAxis array, with 0 being the first.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/yaxis/\" target=\"_blank\">Apply the column series to the secondary Y axis</a>","deprecated":false},{"name":"series<bar>--yAxis","fullname":"series<bar>.yAxis","title":"yAxis","parent":"series<bar>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple y axes, this number defines which yAxis the particular series is connected to. It refers to either the <a href=\"#yAxis.id\">axis id</a> or the index of the axis in the yAxis array, with 0 being the first.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/yaxis/\" target=\"_blank\">Apply the column series to the secondary Y axis</a>","deprecated":false},{"name":"series<scatter>--yAxis","fullname":"series<scatter>.yAxis","title":"yAxis","parent":"series<scatter>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple y axes, this number defines which yAxis the particular series is connected to. It refers to either the <a href=\"#yAxis.id\">axis id</a> or the index of the axis in the yAxis array, with 0 being the first.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/yaxis/\" target=\"_blank\">Apply the column series to the secondary Y axis</a>","deprecated":false},{"name":"series<arearange>--yAxis","fullname":"series<arearange>.yAxis","title":"yAxis","parent":"series<arearange>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple y axes, this number defines which yAxis the particular series is connected to. It refers to either the <a href=\"#yAxis.id\">axis id</a> or the index of the axis in the yAxis array, with 0 being the first.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/yaxis/\" target=\"_blank\">Apply the column series to the secondary Y axis</a>","deprecated":false},{"name":"series<solidgauge>--yAxis","fullname":"series<solidgauge>.yAxis","title":"yAxis","parent":"series<solidgauge>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple y axes, this number defines which yAxis the particular series is connected to. It refers to either the <a href=\"#yAxis.id\">axis id</a> or the index of the axis in the yAxis array, with 0 being the first.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/yaxis/\" target=\"_blank\">Apply the column series to the secondary Y axis</a>","deprecated":false},{"name":"series<line>--yAxis","fullname":"series<line>.yAxis","title":"yAxis","parent":"series<line>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple y axes, this number defines which yAxis the particular series is connected to. It refers to either the <a href=\"#yAxis.id\">axis id</a> or the index of the axis in the yAxis array, with 0 being the first.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/yaxis/\" target=\"_blank\">Apply the column series to the secondary Y axis</a>","deprecated":false},{"name":"yAxis","fullname":"yAxis","title":"yAxis","isParent":true,"description":"<p>The Y axis or value axis. Normally this is the vertical axis, though if the \r\n\tchart is inverted this is the horizontal axis. In case of multiple axes, the yAxis\r\n\tnode is an array of configuration objects.</p>\r\n\t<p>See <a class=\"internal\" href=\"#axis.object\">the Axis object</a> for programmatic\r\n\taccess to the axis.</p>","deprecated":false},{"name":"series<areasplinerange>--yAxis","fullname":"series<areasplinerange>.yAxis","title":"yAxis","parent":"series<areasplinerange>","isParent":false,"returnType":"Number|String","defaults":"0","description":"When using dual or multiple y axes, this number defines which yAxis the particular series is connected to. It refers to either the <a href=\"#yAxis.id\">axis id</a> or the index of the axis in the yAxis array, with 0 being the first.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/yaxis/\" target=\"_blank\">Apply the column series to the secondary Y axis</a>","deprecated":false},{"name":"plotOptions-columnrange-dataLabels--yHigh","fullname":"plotOptions.columnrange.dataLabels.yHigh","title":"yHigh","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"2.3.0","description":"Y offset of the higher data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"series<columnrange>-dataLabels--yHigh","fullname":"series<columnrange>.dataLabels.yHigh","title":"yHigh","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"2.3.0","description":"Y offset of the higher data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"series<arearange>-dataLabels--yHigh","fullname":"series<arearange>.dataLabels.yHigh","title":"yHigh","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"2.3.0","description":"Y offset of the higher data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels--yHigh","fullname":"plotOptions.areasplinerange.dataLabels.yHigh","title":"yHigh","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"2.3.0","description":"Y offset of the higher data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange-dataLabels--yHigh","fullname":"plotOptions.arearange.dataLabels.yHigh","title":"yHigh","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"2.3.0","description":"Y offset of the higher data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-dataLabels--yHigh","fullname":"series<areasplinerange>.dataLabels.yHigh","title":"yHigh","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"Number","defaults":"-6","since":"2.3.0","description":"Y offset of the higher data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-dataLabels--yLow","fullname":"series<areasplinerange>.dataLabels.yLow","title":"yLow","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"Number","defaults":"16","since":"2.3.0","description":"Y offset of the lower data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels--yLow","fullname":"plotOptions.areasplinerange.dataLabels.yLow","title":"yLow","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"Number","defaults":"16","since":"2.3.0","description":"Y offset of the lower data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"series<arearange>-dataLabels--yLow","fullname":"series<arearange>.dataLabels.yLow","title":"yLow","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"Number","defaults":"16","since":"2.3.0","description":"Y offset of the lower data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange-dataLabels--yLow","fullname":"plotOptions.columnrange.dataLabels.yLow","title":"yLow","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"Number","defaults":"16","since":"2.3.0","description":"Y offset of the lower data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange-dataLabels--yLow","fullname":"plotOptions.arearange.dataLabels.yLow","title":"yLow","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"Number","defaults":"16","since":"2.3.0","description":"Y offset of the lower data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"series<columnrange>-dataLabels--yLow","fullname":"series<columnrange>.dataLabels.yLow","title":"yLow","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"Number","defaults":"16","since":"2.3.0","description":"Y offset of the lower data labels relative to the point value.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/arearange-datalabels/\" target=\"_blank\">Data labels on range series</a>","seeAlso":"","deprecated":false},{"name":"series<bubble>-data--z","fullname":"series<bubble>.data.z","title":"z","parent":"series<bubble>-data","isParent":false,"returnType":"Number","description":"The size value for each bubble. The bubbles' diameters are computed based on the <code>z</code>, and controlled by series options like <code>minSize</code>, <code>maxSize</code>, <code>sizeBy</code>, <code>zMin</code> and <code>zMax</code>."},{"name":"plotOptions-line-dataLabels--zIndex","fullname":"plotOptions.line.dataLabels.zIndex","title":"zIndex","parent":"plotOptions-line-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<gauge>-dataLabels--zIndex","fullname":"series<gauge>.dataLabels.zIndex","title":"zIndex","parent":"series<gauge>-dataLabels","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"2.1.5","description":"The Z index of the data labels. A value of 2 display them behind the dial.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-heatmap-dataLabels--zIndex","fullname":"plotOptions.heatmap.dataLabels.zIndex","title":"zIndex","parent":"plotOptions-heatmap-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>--zIndex","fullname":"series<spline>.zIndex","title":"zIndex","parent":"series<spline>","isParent":false,"returnType":"Number","defaults":"","values":"","since":"","description":"Define the visual z index of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex-default/\" target=\"_blank\">With no z index, the series defined last are on top</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex/\" target=\"_blank\">with a z index, the series with the highest z index is on top</a>.","seeAlso":"","deprecated":false},{"name":"series<pyramid>--zIndex","fullname":"series<pyramid>.zIndex","title":"zIndex","parent":"series<pyramid>","isParent":false,"returnType":"Number","defaults":"","values":"","since":"","description":"Define the visual z index of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex-default/\" target=\"_blank\">With no z index, the series defined last are on top</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex/\" target=\"_blank\">with a z index, the series with the highest z index is on top</a>.","seeAlso":"","deprecated":false},{"name":"series<columnrange>-dataLabels--zIndex","fullname":"series<columnrange>.dataLabels.zIndex","title":"zIndex","parent":"series<columnrange>-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-scatter-dataLabels--zIndex","fullname":"plotOptions.scatter.dataLabels.zIndex","title":"zIndex","parent":"plotOptions-scatter-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bar>--zIndex","fullname":"series<bar>.zIndex","title":"zIndex","parent":"series<bar>","isParent":false,"returnType":"Number","defaults":"","values":"","since":"","description":"Define the visual z index of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex-default/\" target=\"_blank\">With no z index, the series defined last are on top</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex/\" target=\"_blank\">with a z index, the series with the highest z index is on top</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-areasplinerange-dataLabels--zIndex","fullname":"plotOptions.areasplinerange.dataLabels.zIndex","title":"zIndex","parent":"plotOptions-areasplinerange-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>--zIndex","fullname":"series<areasplinerange>.zIndex","title":"zIndex","parent":"series<areasplinerange>","isParent":false,"returnType":"Number","defaults":"","values":"","since":"","description":"Define the visual z index of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex-default/\" target=\"_blank\">With no z index, the series defined last are on top</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex/\" target=\"_blank\">with a z index, the series with the highest z index is on top</a>.","seeAlso":"","deprecated":false},{"name":"series<bubble>--zIndex","fullname":"series<bubble>.zIndex","title":"zIndex","parent":"series<bubble>","isParent":false,"returnType":"Number","defaults":"","values":"","since":"","description":"Define the visual z index of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex-default/\" target=\"_blank\">With no z index, the series defined last are on top</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex/\" target=\"_blank\">with a z index, the series with the highest z index is on top</a>.","seeAlso":"","deprecated":false},{"name":"yAxis-plotBands--zIndex","fullname":"yAxis.plotBands.zIndex","title":"zIndex","parent":"yAxis-plotBands","isParent":false,"returnType":"Number","since":"1.2","description":"The z index of the plot band within the chart, relative to other elements. Using the same z index as another element may give unpredictable results, as the last rendered element will be on top. Values from 0 to 20 make sense.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-color/\" target=\"_blank\">Behind plot lines by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-zindex/\" target=\"_blank\">above plot lines</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-zindex-above-series/\" target=\"_blank\">above plot lines and series</a>.","deprecated":false},{"name":"series<polygon>--zIndex","fullname":"series<polygon>.zIndex","title":"zIndex","parent":"series<polygon>","isParent":false,"returnType":"Number","defaults":"","values":"","since":"","description":"Define the visual z index of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex-default/\" target=\"_blank\">With no z index, the series defined last are on top</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex/\" target=\"_blank\">with a z index, the series with the highest z index is on top</a>.","seeAlso":"","deprecated":false},{"name":"series<arearange>--zIndex","fullname":"series<arearange>.zIndex","title":"zIndex","parent":"series<arearange>","isParent":false,"returnType":"Number","defaults":"","values":"","since":"","description":"Define the visual z index of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex-default/\" target=\"_blank\">With no z index, the series defined last are on top</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex/\" target=\"_blank\">with a z index, the series with the highest z index is on top</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-polygon-dataLabels--zIndex","fullname":"plotOptions.polygon.dataLabels.zIndex","title":"zIndex","parent":"plotOptions-polygon-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-areaspline-dataLabels--zIndex","fullname":"plotOptions.areaspline.dataLabels.zIndex","title":"zIndex","parent":"plotOptions-areaspline-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-gauge-dataLabels--zIndex","fullname":"plotOptions.gauge.dataLabels.zIndex","title":"zIndex","parent":"plotOptions-gauge-dataLabels","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"2.1.5","description":"The Z index of the data labels. A value of 2 display them behind the dial.","demo":"","seeAlso":"","deprecated":false},{"name":"series<area>-dataLabels--zIndex","fullname":"series<area>.dataLabels.zIndex","title":"zIndex","parent":"series<area>-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areaspline>-dataLabels--zIndex","fullname":"series<areaspline>.dataLabels.zIndex","title":"zIndex","parent":"series<areaspline>-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pie>-dataLabels--zIndex","fullname":"series<pie>.dataLabels.zIndex","title":"zIndex","parent":"series<pie>-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<columnrange>--zIndex","fullname":"series<columnrange>.zIndex","title":"zIndex","parent":"series<columnrange>","isParent":false,"returnType":"Number","defaults":"","values":"","since":"","description":"Define the visual z index of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex-default/\" target=\"_blank\">With no z index, the series defined last are on top</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex/\" target=\"_blank\">with a z index, the series with the highest z index is on top</a>.","seeAlso":"","deprecated":false},{"name":"series<waterfall>-dataLabels--zIndex","fullname":"series<waterfall>.dataLabels.zIndex","title":"zIndex","parent":"series<waterfall>-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-treemap-dataLabels--zIndex","fullname":"plotOptions.treemap.dataLabels.zIndex","title":"zIndex","parent":"plotOptions-treemap-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"xAxis-labels--zIndex","fullname":"xAxis.labels.zIndex","title":"zIndex","parent":"xAxis-labels","isParent":false,"returnType":"Number","defaults":"7","values":"","since":"","description":"The Z index for the axis labels.","demo":"","seeAlso":"","deprecated":false},{"name":"series<pyramid>-dataLabels--zIndex","fullname":"series<pyramid>.dataLabels.zIndex","title":"zIndex","parent":"series<pyramid>-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bubble>-dataLabels--zIndex","fullname":"series<bubble>.dataLabels.zIndex","title":"zIndex","parent":"series<bubble>-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-series-dataLabels--zIndex","fullname":"plotOptions.series.dataLabels.zIndex","title":"zIndex","parent":"plotOptions-series-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pyramid-dataLabels--zIndex","fullname":"plotOptions.pyramid.dataLabels.zIndex","title":"zIndex","parent":"plotOptions-pyramid-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<line>--zIndex","fullname":"series<line>.zIndex","title":"zIndex","parent":"series<line>","isParent":false,"returnType":"Number","defaults":"","values":"","since":"","description":"Define the visual z index of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex-default/\" target=\"_blank\">With no z index, the series defined last are on top</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex/\" target=\"_blank\">with a z index, the series with the highest z index is on top</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-bar-dataLabels--zIndex","fullname":"plotOptions.bar.dataLabels.zIndex","title":"zIndex","parent":"plotOptions-bar-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<arearange>-dataLabels--zIndex","fullname":"series<arearange>.dataLabels.zIndex","title":"zIndex","parent":"series<arearange>-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<treemap>-dataLabels--zIndex","fullname":"series<treemap>.dataLabels.zIndex","title":"zIndex","parent":"series<treemap>-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<bar>-dataLabels--zIndex","fullname":"series<bar>.dataLabels.zIndex","title":"zIndex","parent":"series<bar>-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<errorbar>--zIndex","fullname":"series<errorbar>.zIndex","title":"zIndex","parent":"series<errorbar>","isParent":false,"returnType":"Number","defaults":"","values":"","since":"","description":"Define the visual z index of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex-default/\" target=\"_blank\">With no z index, the series defined last are on top</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex/\" target=\"_blank\">with a z index, the series with the highest z index is on top</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-spline-dataLabels--zIndex","fullname":"plotOptions.spline.dataLabels.zIndex","title":"zIndex","parent":"plotOptions-spline-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<funnel>--zIndex","fullname":"series<funnel>.zIndex","title":"zIndex","parent":"series<funnel>","isParent":false,"returnType":"Number","defaults":"","values":"","since":"","description":"Define the visual z index of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex-default/\" target=\"_blank\">With no z index, the series defined last are on top</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex/\" target=\"_blank\">with a z index, the series with the highest z index is on top</a>.","seeAlso":"","deprecated":false},{"name":"series<line>-dataLabels--zIndex","fullname":"series<line>.dataLabels.zIndex","title":"zIndex","parent":"series<line>-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series--zIndex","fullname":"series.zIndex","title":"zIndex","parent":"series","isParent":false,"returnType":"Number","defaults":"","values":"","since":"","description":"Define the visual z index of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex-default/\" target=\"_blank\">With no z index, the series defined last are on top</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex/\" target=\"_blank\">with a z index, the series with the highest z index is on top</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-solidgauge-dataLabels--zIndex","fullname":"plotOptions.solidgauge.dataLabels.zIndex","title":"zIndex","parent":"plotOptions-solidgauge-dataLabels","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"2.1.5","description":"The Z index of the data labels. A value of 2 display them behind the dial.","demo":"","seeAlso":"","deprecated":false},{"name":"series<solidgauge>-dataLabels--zIndex","fullname":"series<solidgauge>.dataLabels.zIndex","title":"zIndex","parent":"series<solidgauge>-dataLabels","isParent":false,"returnType":"Number","defaults":"2","values":"","since":"2.1.5","description":"The Z index of the data labels. A value of 2 display them behind the dial.","demo":"","seeAlso":"","deprecated":false},{"name":"yAxis-labels--zIndex","fullname":"yAxis.labels.zIndex","title":"zIndex","parent":"yAxis-labels","isParent":false,"returnType":"Number","defaults":"7","values":"","since":"","description":"The Z index for the axis labels.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-area-dataLabels--zIndex","fullname":"plotOptions.area.dataLabels.zIndex","title":"zIndex","parent":"plotOptions-area-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"xAxis-plotBands--zIndex","fullname":"xAxis.plotBands.zIndex","title":"zIndex","parent":"xAxis-plotBands","isParent":false,"returnType":"Number","since":"1.2","description":"The z index of the plot band within the chart, relative to other elements. Using the same z index as another element may give unpredictable results, as the last rendered element will be on top. Values from 0 to 20 make sense.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-color/\" target=\"_blank\">Behind plot lines by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-zindex/\" target=\"_blank\">above plot lines</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotbands-zindex-above-series/\" target=\"_blank\">above plot lines and series</a>.","deprecated":false},{"name":"plotOptions-waterfall-dataLabels--zIndex","fullname":"plotOptions.waterfall.dataLabels.zIndex","title":"zIndex","parent":"plotOptions-waterfall-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<polygon>-dataLabels--zIndex","fullname":"series<polygon>.dataLabels.zIndex","title":"zIndex","parent":"series<polygon>-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-pie-dataLabels--zIndex","fullname":"plotOptions.pie.dataLabels.zIndex","title":"zIndex","parent":"plotOptions-pie-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<funnel>-dataLabels--zIndex","fullname":"series<funnel>.dataLabels.zIndex","title":"zIndex","parent":"series<funnel>-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-arearange-dataLabels--zIndex","fullname":"plotOptions.arearange.dataLabels.zIndex","title":"zIndex","parent":"plotOptions-arearange-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<heatmap>-dataLabels--zIndex","fullname":"series<heatmap>.dataLabels.zIndex","title":"zIndex","parent":"series<heatmap>-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble-dataLabels--zIndex","fullname":"plotOptions.bubble.dataLabels.zIndex","title":"zIndex","parent":"plotOptions-bubble-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-column-dataLabels--zIndex","fullname":"plotOptions.column.dataLabels.zIndex","title":"zIndex","parent":"plotOptions-column-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"plotOptions-funnel-dataLabels--zIndex","fullname":"plotOptions.funnel.dataLabels.zIndex","title":"zIndex","parent":"plotOptions-funnel-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<scatter>--zIndex","fullname":"series<scatter>.zIndex","title":"zIndex","parent":"series<scatter>","isParent":false,"returnType":"Number","defaults":"","values":"","since":"","description":"Define the visual z index of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex-default/\" target=\"_blank\">With no z index, the series defined last are on top</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex/\" target=\"_blank\">with a z index, the series with the highest z index is on top</a>.","seeAlso":"","deprecated":false},{"name":"yAxis-plotLines--zIndex","fullname":"yAxis.plotLines.zIndex","title":"zIndex","parent":"yAxis-plotLines","isParent":false,"returnType":"Number","since":"1.2","description":"The z index of the plot line within the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-zindex-behind/\" target=\"_blank\">Behind plot lines by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-zindex-above/\" target=\"_blank\">above plot lines</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-zindex-above-all/\" target=\"_blank\">above plot lines and series</a>."},{"name":"series<waterfall>--zIndex","fullname":"series<waterfall>.zIndex","title":"zIndex","parent":"series<waterfall>","isParent":false,"returnType":"Number","defaults":"","values":"","since":"","description":"Define the visual z index of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex-default/\" target=\"_blank\">With no z index, the series defined last are on top</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex/\" target=\"_blank\">with a z index, the series with the highest z index is on top</a>.","seeAlso":"","deprecated":false},{"name":"series<area>--zIndex","fullname":"series<area>.zIndex","title":"zIndex","parent":"series<area>","isParent":false,"returnType":"Number","defaults":"","values":"","since":"","description":"Define the visual z index of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex-default/\" target=\"_blank\">With no z index, the series defined last are on top</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex/\" target=\"_blank\">with a z index, the series with the highest z index is on top</a>.","seeAlso":"","deprecated":false},{"name":"series<scatter>-dataLabels--zIndex","fullname":"series<scatter>.dataLabels.zIndex","title":"zIndex","parent":"series<scatter>-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<boxplot>--zIndex","fullname":"series<boxplot>.zIndex","title":"zIndex","parent":"series<boxplot>","isParent":false,"returnType":"Number","defaults":"","values":"","since":"","description":"Define the visual z index of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex-default/\" target=\"_blank\">With no z index, the series defined last are on top</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex/\" target=\"_blank\">with a z index, the series with the highest z index is on top</a>.","seeAlso":"","deprecated":false},{"name":"series<solidgauge>--zIndex","fullname":"series<solidgauge>.zIndex","title":"zIndex","parent":"series<solidgauge>","isParent":false,"returnType":"Number","defaults":"","values":"","since":"","description":"Define the visual z index of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex-default/\" target=\"_blank\">With no z index, the series defined last are on top</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex/\" target=\"_blank\">with a z index, the series with the highest z index is on top</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-columnrange-dataLabels--zIndex","fullname":"plotOptions.columnrange.dataLabels.zIndex","title":"zIndex","parent":"plotOptions-columnrange-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<areaspline>--zIndex","fullname":"series<areaspline>.zIndex","title":"zIndex","parent":"series<areaspline>","isParent":false,"returnType":"Number","defaults":"","values":"","since":"","description":"Define the visual z index of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex-default/\" target=\"_blank\">With no z index, the series defined last are on top</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex/\" target=\"_blank\">with a z index, the series with the highest z index is on top</a>.","seeAlso":"","deprecated":false},{"name":"series<column>-dataLabels--zIndex","fullname":"series<column>.dataLabels.zIndex","title":"zIndex","parent":"series<column>-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<spline>-dataLabels--zIndex","fullname":"series<spline>.dataLabels.zIndex","title":"zIndex","parent":"series<spline>-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"xAxis-plotLines--zIndex","fullname":"xAxis.plotLines.zIndex","title":"zIndex","parent":"xAxis-plotLines","isParent":false,"returnType":"Number","since":"1.2","description":"The z index of the plot line within the chart.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-zindex-behind/\" target=\"_blank\">Behind plot lines by default</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-zindex-above/\" target=\"_blank\">above plot lines</a>,\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/xaxis/plotlines-zindex-above-all/\" target=\"_blank\">above plot lines and series</a>."},{"name":"series<heatmap>--zIndex","fullname":"series<heatmap>.zIndex","title":"zIndex","parent":"series<heatmap>","isParent":false,"returnType":"Number","defaults":"","values":"","since":"","description":"Define the visual z index of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex-default/\" target=\"_blank\">With no z index, the series defined last are on top</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex/\" target=\"_blank\">with a z index, the series with the highest z index is on top</a>.","seeAlso":"","deprecated":false},{"name":"series<column>--zIndex","fullname":"series<column>.zIndex","title":"zIndex","parent":"series<column>","isParent":false,"returnType":"Number","defaults":"","values":"","since":"","description":"Define the visual z index of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex-default/\" target=\"_blank\">With no z index, the series defined last are on top</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex/\" target=\"_blank\">with a z index, the series with the highest z index is on top</a>.","seeAlso":"","deprecated":false},{"name":"series<areasplinerange>-dataLabels--zIndex","fullname":"series<areasplinerange>.dataLabels.zIndex","title":"zIndex","parent":"series<areasplinerange>-dataLabels","isParent":false,"returnType":"Number","defaults":"6","values":"","since":"2.3.5","description":"The Z index of the data labels. The default Z index puts it above the series. Use a Z index of 2 to display it behind the series.","demo":"","seeAlso":"","deprecated":false},{"name":"series<treemap>--zIndex","fullname":"series<treemap>.zIndex","title":"zIndex","parent":"series<treemap>","isParent":false,"returnType":"Number","defaults":"","values":"","since":"","description":"Define the visual z index of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex-default/\" target=\"_blank\">With no z index, the series defined last are on top</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex/\" target=\"_blank\">with a z index, the series with the highest z index is on top</a>.","seeAlso":"","deprecated":false},{"name":"series<gauge>--zIndex","fullname":"series<gauge>.zIndex","title":"zIndex","parent":"series<gauge>","isParent":false,"returnType":"Number","defaults":"","values":"","since":"","description":"Define the visual z index of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex-default/\" target=\"_blank\">With no z index, the series defined last are on top</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex/\" target=\"_blank\">with a z index, the series with the highest z index is on top</a>.","seeAlso":"","deprecated":false},{"name":"series<pie>--zIndex","fullname":"series<pie>.zIndex","title":"zIndex","parent":"series<pie>","isParent":false,"returnType":"Number","defaults":"","values":"","since":"","description":"Define the visual z index of the series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex-default/\" target=\"_blank\">With no z index, the series defined last are on top</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/series-zindex/\" target=\"_blank\">with a z index, the series with the highest z index is on top</a>.","seeAlso":"","deprecated":false},{"name":"plotOptions-bubble--zMax","fullname":"plotOptions.bubble.zMax","title":"zMax","parent":"plotOptions-bubble","isParent":false,"returnType":"Number","defaults":"null","since":"4.0.3","description":"The minimum for the Z value range. Defaults to the highest Z value in the data.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/bubble-zmin-zmax/\" target=\"_blank\">Z has a possible range of 0-100</a>","seeAlso":"<a href=\"#plotOptions.bubble.zMin\">zMax</a>","deprecated":false},{"name":"series<bubble>--zMax","fullname":"series<bubble>.zMax","title":"zMax","parent":"series<bubble>","isParent":false,"returnType":"Number","defaults":"null","since":"4.0.3","description":"The minimum for the Z value range. Defaults to the highest Z value in the data.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/bubble-zmin-zmax/\" target=\"_blank\">Z has a possible range of 0-100</a>","seeAlso":"<a href=\"#plotOptions.bubble.zMin\">zMax</a>","deprecated":false},{"name":"series<bubble>--zMin","fullname":"series<bubble>.zMin","title":"zMin","parent":"series<bubble>","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.3","description":"The minimum for the Z value range. Defaults to the lowest Z value in the data.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/bubble-zmin-zmax/\" target=\"_blank\">Z has a possible range of 0-100</a>","seeAlso":"<a href=\"#plotOptions.bubble.zMax\">zMax</a>","deprecated":false},{"name":"plotOptions-bubble--zMin","fullname":"plotOptions.bubble.zMin","title":"zMin","parent":"plotOptions-bubble","isParent":false,"returnType":"Number","defaults":"null","values":"","since":"4.0.3","description":"The minimum for the Z value range. Defaults to the lowest Z value in the data.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/bubble-zmin-zmax/\" target=\"_blank\">Z has a possible range of 0-100</a>","seeAlso":"<a href=\"#plotOptions.bubble.zMax\">zMax</a>","deprecated":false},{"name":"plotOptions-bubble--zThreshold","fullname":"plotOptions.bubble.zThreshold","title":"zThreshold","parent":"plotOptions-bubble","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"3.0","description":"When <a href=\"#plotOptions.bubble.displayNegative\">displayNegative</a> is <code>false</code>, bubbles with lower Z values are skipped. When <code>displayNegative</code> is <code>true</code> and a <a href=\"#plotOptions.bubble.negativeColor\">negativeColor</a> is given, points with lower Z is colored.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/bubble-negative/\" target=\"_blank\">Negative bubbles</a>","seeAlso":"","deprecated":false},{"name":"series<bubble>--zThreshold","fullname":"series<bubble>.zThreshold","title":"zThreshold","parent":"series<bubble>","isParent":false,"returnType":"Number","defaults":"0","values":"","since":"3.0","description":"When <a href=\"#plotOptions.bubble.displayNegative\">displayNegative</a> is <code>false</code>, bubbles with lower Z values are skipped. When <code>displayNegative</code> is <code>true</code> and a <a href=\"#plotOptions.bubble.negativeColor\">negativeColor</a> is given, points with lower Z is colored.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/plotoptions/bubble-negative/\" target=\"_blank\">Negative bubbles</a>","seeAlso":"","deprecated":false},{"name":"series<columnrange>--zoneAxis","fullname":"series<columnrange>.zoneAxis","title":"zoneAxis","parent":"series<columnrange>","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-areasplinerange--zoneAxis","fullname":"plotOptions.areasplinerange.zoneAxis","title":"zoneAxis","parent":"plotOptions-areasplinerange","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"series<waterfall>--zoneAxis","fullname":"series<waterfall>.zoneAxis","title":"zoneAxis","parent":"series<waterfall>","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"series<line>--zoneAxis","fullname":"series<line>.zoneAxis","title":"zoneAxis","parent":"series<line>","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"series<scatter>--zoneAxis","fullname":"series<scatter>.zoneAxis","title":"zoneAxis","parent":"series<scatter>","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"series<heatmap>--zoneAxis","fullname":"series<heatmap>.zoneAxis","title":"zoneAxis","parent":"series<heatmap>","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-area--zoneAxis","fullname":"plotOptions.area.zoneAxis","title":"zoneAxis","parent":"plotOptions-area","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-waterfall--zoneAxis","fullname":"plotOptions.waterfall.zoneAxis","title":"zoneAxis","parent":"plotOptions-waterfall","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-column--zoneAxis","fullname":"plotOptions.column.zoneAxis","title":"zoneAxis","parent":"plotOptions-column","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-columnrange--zoneAxis","fullname":"plotOptions.columnrange.zoneAxis","title":"zoneAxis","parent":"plotOptions-columnrange","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"series<column>--zoneAxis","fullname":"series<column>.zoneAxis","title":"zoneAxis","parent":"series<column>","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"series<gauge>--zoneAxis","fullname":"series<gauge>.zoneAxis","title":"zoneAxis","parent":"series<gauge>","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"series<pie>--zoneAxis","fullname":"series<pie>.zoneAxis","title":"zoneAxis","parent":"series<pie>","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"series<polygon>--zoneAxis","fullname":"series<polygon>.zoneAxis","title":"zoneAxis","parent":"series<polygon>","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"series<funnel>--zoneAxis","fullname":"series<funnel>.zoneAxis","title":"zoneAxis","parent":"series<funnel>","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"series<areasplinerange>--zoneAxis","fullname":"series<areasplinerange>.zoneAxis","title":"zoneAxis","parent":"series<areasplinerange>","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-boxplot--zoneAxis","fullname":"plotOptions.boxplot.zoneAxis","title":"zoneAxis","parent":"plotOptions-boxplot","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"series<boxplot>--zoneAxis","fullname":"series<boxplot>.zoneAxis","title":"zoneAxis","parent":"series<boxplot>","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-areaspline--zoneAxis","fullname":"plotOptions.areaspline.zoneAxis","title":"zoneAxis","parent":"plotOptions-areaspline","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-gauge--zoneAxis","fullname":"plotOptions.gauge.zoneAxis","title":"zoneAxis","parent":"plotOptions-gauge","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-spline--zoneAxis","fullname":"plotOptions.spline.zoneAxis","title":"zoneAxis","parent":"plotOptions-spline","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"series<bar>--zoneAxis","fullname":"series<bar>.zoneAxis","title":"zoneAxis","parent":"series<bar>","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"series<treemap>--zoneAxis","fullname":"series<treemap>.zoneAxis","title":"zoneAxis","parent":"series<treemap>","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"series<solidgauge>--zoneAxis","fullname":"series<solidgauge>.zoneAxis","title":"zoneAxis","parent":"series<solidgauge>","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-arearange--zoneAxis","fullname":"plotOptions.arearange.zoneAxis","title":"zoneAxis","parent":"plotOptions-arearange","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-series--zoneAxis","fullname":"plotOptions.series.zoneAxis","title":"zoneAxis","parent":"plotOptions-series","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"series<area>--zoneAxis","fullname":"series<area>.zoneAxis","title":"zoneAxis","parent":"series<area>","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"series<spline>--zoneAxis","fullname":"series<spline>.zoneAxis","title":"zoneAxis","parent":"series<spline>","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-line--zoneAxis","fullname":"plotOptions.line.zoneAxis","title":"zoneAxis","parent":"plotOptions-line","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-funnel--zoneAxis","fullname":"plotOptions.funnel.zoneAxis","title":"zoneAxis","parent":"plotOptions-funnel","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-pie--zoneAxis","fullname":"plotOptions.pie.zoneAxis","title":"zoneAxis","parent":"plotOptions-pie","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-pyramid--zoneAxis","fullname":"plotOptions.pyramid.zoneAxis","title":"zoneAxis","parent":"plotOptions-pyramid","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-heatmap--zoneAxis","fullname":"plotOptions.heatmap.zoneAxis","title":"zoneAxis","parent":"plotOptions-heatmap","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-bubble--zoneAxis","fullname":"plotOptions.bubble.zoneAxis","title":"zoneAxis","parent":"plotOptions-bubble","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"series<bubble>--zoneAxis","fullname":"series<bubble>.zoneAxis","title":"zoneAxis","parent":"series<bubble>","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-errorbar--zoneAxis","fullname":"plotOptions.errorbar.zoneAxis","title":"zoneAxis","parent":"plotOptions-errorbar","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"series<areaspline>--zoneAxis","fullname":"series<areaspline>.zoneAxis","title":"zoneAxis","parent":"series<areaspline>","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"series<arearange>--zoneAxis","fullname":"series<arearange>.zoneAxis","title":"zoneAxis","parent":"series<arearange>","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-treemap--zoneAxis","fullname":"plotOptions.treemap.zoneAxis","title":"zoneAxis","parent":"plotOptions-treemap","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-bar--zoneAxis","fullname":"plotOptions.bar.zoneAxis","title":"zoneAxis","parent":"plotOptions-bar","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"series<errorbar>--zoneAxis","fullname":"series<errorbar>.zoneAxis","title":"zoneAxis","parent":"series<errorbar>","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-solidgauge--zoneAxis","fullname":"plotOptions.solidgauge.zoneAxis","title":"zoneAxis","parent":"plotOptions-solidgauge","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-polygon--zoneAxis","fullname":"plotOptions.polygon.zoneAxis","title":"zoneAxis","parent":"plotOptions-polygon","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-scatter--zoneAxis","fullname":"plotOptions.scatter.zoneAxis","title":"zoneAxis","parent":"plotOptions-scatter","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"series<pyramid>--zoneAxis","fullname":"series<pyramid>.zoneAxis","title":"zoneAxis","parent":"series<pyramid>","isParent":false,"returnType":"String","defaults":"y","since":"4.1.0","description":"Defines the Axis on which the zones are applied.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-zoneaxis-x/\" target=\"_blank\">Zones on the X-Axis</a>","seeAlso":"<a href=\"#plotOption.series.zones\">zones</a>","deprecated":false},{"name":"plotOptions-errorbar-zones","fullname":"plotOptions.errorbar.zones","title":"zones","parent":"plotOptions-errorbar","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"plotOptions-area-zones","fullname":"plotOptions.area.zones","title":"zones","parent":"plotOptions-area","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"series<columnrange>-zones","fullname":"series<columnrange>.zones","title":"zones","parent":"series<columnrange>","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"series<treemap>-zones","fullname":"series<treemap>.zones","title":"zones","parent":"series<treemap>","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"plotOptions-pyramid-zones","fullname":"plotOptions.pyramid.zones","title":"zones","parent":"plotOptions-pyramid","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"plotOptions-column-zones","fullname":"plotOptions.column.zones","title":"zones","parent":"plotOptions-column","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"series<gauge>-zones","fullname":"series<gauge>.zones","title":"zones","parent":"series<gauge>","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"plotOptions-heatmap-zones","fullname":"plotOptions.heatmap.zones","title":"zones","parent":"plotOptions-heatmap","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"series<bar>-zones","fullname":"series<bar>.zones","title":"zones","parent":"series<bar>","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"plotOptions-funnel-zones","fullname":"plotOptions.funnel.zones","title":"zones","parent":"plotOptions-funnel","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"series<arearange>-zones","fullname":"series<arearange>.zones","title":"zones","parent":"series<arearange>","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"series<spline>-zones","fullname":"series<spline>.zones","title":"zones","parent":"series<spline>","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"plotOptions-areaspline-zones","fullname":"plotOptions.areaspline.zones","title":"zones","parent":"plotOptions-areaspline","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"plotOptions-columnrange-zones","fullname":"plotOptions.columnrange.zones","title":"zones","parent":"plotOptions-columnrange","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"series<line>-zones","fullname":"series<line>.zones","title":"zones","parent":"series<line>","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"series<pie>-zones","fullname":"series<pie>.zones","title":"zones","parent":"series<pie>","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"series<areaspline>-zones","fullname":"series<areaspline>.zones","title":"zones","parent":"series<areaspline>","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"plotOptions-bar-zones","fullname":"plotOptions.bar.zones","title":"zones","parent":"plotOptions-bar","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"series<areasplinerange>-zones","fullname":"series<areasplinerange>.zones","title":"zones","parent":"series<areasplinerange>","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"series<column>-zones","fullname":"series<column>.zones","title":"zones","parent":"series<column>","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"series<solidgauge>-zones","fullname":"series<solidgauge>.zones","title":"zones","parent":"series<solidgauge>","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"series<polygon>-zones","fullname":"series<polygon>.zones","title":"zones","parent":"series<polygon>","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"series<heatmap>-zones","fullname":"series<heatmap>.zones","title":"zones","parent":"series<heatmap>","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"series<boxplot>-zones","fullname":"series<boxplot>.zones","title":"zones","parent":"series<boxplot>","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"series<bubble>-zones","fullname":"series<bubble>.zones","title":"zones","parent":"series<bubble>","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"series<waterfall>-zones","fullname":"series<waterfall>.zones","title":"zones","parent":"series<waterfall>","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"plotOptions-areasplinerange-zones","fullname":"plotOptions.areasplinerange.zones","title":"zones","parent":"plotOptions-areasplinerange","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"plotOptions-polygon-zones","fullname":"plotOptions.polygon.zones","title":"zones","parent":"plotOptions-polygon","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"series<pyramid>-zones","fullname":"series<pyramid>.zones","title":"zones","parent":"series<pyramid>","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"plotOptions-treemap-zones","fullname":"plotOptions.treemap.zones","title":"zones","parent":"plotOptions-treemap","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"plotOptions-scatter-zones","fullname":"plotOptions.scatter.zones","title":"zones","parent":"plotOptions-scatter","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"series<scatter>-zones","fullname":"series<scatter>.zones","title":"zones","parent":"series<scatter>","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"plotOptions-series-zones","fullname":"plotOptions.series.zones","title":"zones","parent":"plotOptions-series","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"plotOptions-gauge-zones","fullname":"plotOptions.gauge.zones","title":"zones","parent":"plotOptions-gauge","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"series<funnel>-zones","fullname":"series<funnel>.zones","title":"zones","parent":"series<funnel>","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"plotOptions-spline-zones","fullname":"plotOptions.spline.zones","title":"zones","parent":"plotOptions-spline","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"plotOptions-pie-zones","fullname":"plotOptions.pie.zones","title":"zones","parent":"plotOptions-pie","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"plotOptions-bubble-zones","fullname":"plotOptions.bubble.zones","title":"zones","parent":"plotOptions-bubble","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"plotOptions-solidgauge-zones","fullname":"plotOptions.solidgauge.zones","title":"zones","parent":"plotOptions-solidgauge","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"plotOptions-waterfall-zones","fullname":"plotOptions.waterfall.zones","title":"zones","parent":"plotOptions-waterfall","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"plotOptions-line-zones","fullname":"plotOptions.line.zones","title":"zones","parent":"plotOptions-line","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"plotOptions-arearange-zones","fullname":"plotOptions.arearange.zones","title":"zones","parent":"plotOptions-arearange","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"series<area>-zones","fullname":"series<area>.zones","title":"zones","parent":"series<area>","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"plotOptions-boxplot-zones","fullname":"plotOptions.boxplot.zones","title":"zones","parent":"plotOptions-boxplot","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"series<errorbar>-zones","fullname":"series<errorbar>.zones","title":"zones","parent":"series<errorbar>","isParent":true,"returnType":"Array","since":"4.1.0","description":"An array defining zones within a series.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/series/color-zones-simple/\" target=\"_blank\">Color zones</a>","seeAlso":"<a href=\"#plotOption.series.zoneAxis\">zoneAxis</a>","deprecated":false},{"name":"chart--zoomType","fullname":"chart.zoomType","title":"zoomType","parent":"chart","isParent":false,"returnType":"String","values":"[null, \"x\", \"y\", \"xy\"]","description":"Decides in what dimensions the user can zoom by dragging the mouse. Can be one of <code>x</code>, <code>y</code> or <code>xy</code>.","demo":"<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/zoomtype-none/\" target=\"_blank\">None by default</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/zoomtype-x/\" target=\"_blank\">x</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/zoomtype-y/\" target=\"_blank\">y</a>,\r\n\t\t\t<a href=\"http://jsfiddle.net/gh/get/jquery/1.7.2/highslide-software/highcharts.com/tree/master/samples/highcharts/chart/zoomtype-xy/\" target=\"_blank\">xy</a>","seeAlso":"<a href=\"#chart.panKey\">panKey</a>","deprecated":false}];
diff --git a/data/interfaces/default/js/highcharts/api/js/jquery-ui.min.js b/data/interfaces/default/js/highcharts/api/js/jquery-ui.min.js
new file mode 100644
index 00000000..4b4a5fa4
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/api/js/jquery-ui.min.js
@@ -0,0 +1,12 @@
+/*! jQuery UI - v1.10.3 - 2013-05-03
+* http://jqueryui.com
+* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.draggable.js, jquery.ui.droppable.js, jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js, jquery.ui.effect.js, jquery.ui.accordion.js, jquery.ui.autocomplete.js, jquery.ui.button.js, jquery.ui.datepicker.js, jquery.ui.dialog.js, jquery.ui.effect-blind.js, jquery.ui.effect-bounce.js, jquery.ui.effect-clip.js, jquery.ui.effect-drop.js, jquery.ui.effect-explode.js, jquery.ui.effect-fade.js, jquery.ui.effect-fold.js, jquery.ui.effect-highlight.js, jquery.ui.effect-pulsate.js, jquery.ui.effect-scale.js, jquery.ui.effect-shake.js, jquery.ui.effect-slide.js, jquery.ui.effect-transfer.js, jquery.ui.menu.js, jquery.ui.position.js, jquery.ui.progressbar.js, jquery.ui.slider.js, jquery.ui.spinner.js, jquery.ui.tabs.js, jquery.ui.tooltip.js
+* Copyright 2013 jQuery Foundation and other contributors; Licensed MIT */
+(function(t,e){function i(e,i){var n,o,a,r=e.nodeName.toLowerCase();return"area"===r?(n=e.parentNode,o=n.name,e.href&&o&&"map"===n.nodeName.toLowerCase()?(a=t("img[usemap=#"+o+"]")[0],!!a&&s(a)):!1):(/input|select|textarea|button|object/.test(r)?!e.disabled:"a"===r?e.href||i:i)&&s(e)}function s(e){return t.expr.filters.visible(e)&&!t(e).parents().addBack().filter(function(){return"hidden"===t.css(this,"visibility")}).length}var n=0,o=/^ui-id-\d+$/;t.ui=t.ui||{},t.extend(t.ui,{version:"1.10.3",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),t.fn.extend({focus:function(e){return function(i,s){return"number"==typeof i?this.each(function(){var e=this;setTimeout(function(){t(e).focus(),s&&s.call(e)},i)}):e.apply(this,arguments)}}(t.fn.focus),scrollParent:function(){var e;return e=t.ui.ie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(t.css(this,"position"))&&/(auto|scroll)/.test(t.css(this,"overflow")+t.css(this,"overflow-y")+t.css(this,"overflow-x"))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(t.css(this,"overflow")+t.css(this,"overflow-y")+t.css(this,"overflow-x"))}).eq(0),/fixed/.test(this.css("position"))||!e.length?t(document):e},zIndex:function(i){if(i!==e)return this.css("zIndex",i);if(this.length)for(var s,n,o=t(this[0]);o.length&&o[0]!==document;){if(s=o.css("position"),("absolute"===s||"relative"===s||"fixed"===s)&&(n=parseInt(o.css("zIndex"),10),!isNaN(n)&&0!==n))return n;o=o.parent()}return 0},uniqueId:function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++n)})},removeUniqueId:function(){return this.each(function(){o.test(this.id)&&t(this).removeAttr("id")})}}),t.extend(t.expr[":"],{data:t.expr.createPseudo?t.expr.createPseudo(function(e){return function(i){return!!t.data(i,e)}}):function(e,i,s){return!!t.data(e,s[3])},focusable:function(e){return i(e,!isNaN(t.attr(e,"tabindex")))},tabbable:function(e){var s=t.attr(e,"tabindex"),n=isNaN(s);return(n||s>=0)&&i(e,!n)}}),t("<a>").outerWidth(1).jquery||t.each(["Width","Height"],function(i,s){function n(e,i,s,n){return t.each(o,function(){i-=parseFloat(t.css(e,"padding"+this))||0,s&&(i-=parseFloat(t.css(e,"border"+this+"Width"))||0),n&&(i-=parseFloat(t.css(e,"margin"+this))||0)}),i}var o="Width"===s?["Left","Right"]:["Top","Bottom"],a=s.toLowerCase(),r={innerWidth:t.fn.innerWidth,innerHeight:t.fn.innerHeight,outerWidth:t.fn.outerWidth,outerHeight:t.fn.outerHeight};t.fn["inner"+s]=function(i){return i===e?r["inner"+s].call(this):this.each(function(){t(this).css(a,n(this,i)+"px")})},t.fn["outer"+s]=function(e,i){return"number"!=typeof e?r["outer"+s].call(this,e):this.each(function(){t(this).css(a,n(this,e,!0,i)+"px")})}}),t.fn.addBack||(t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t("<a>").data("a-b","a").removeData("a-b").data("a-b")&&(t.fn.removeData=function(e){return function(i){return arguments.length?e.call(this,t.camelCase(i)):e.call(this)}}(t.fn.removeData)),t.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),t.support.selectstart="onselectstart"in document.createElement("div"),t.fn.extend({disableSelection:function(){return this.bind((t.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(t){t.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}}),t.extend(t.ui,{plugin:{add:function(e,i,s){var n,o=t.ui[e].prototype;for(n in s)o.plugins[n]=o.plugins[n]||[],o.plugins[n].push([i,s[n]])},call:function(t,e,i){var s,n=t.plugins[e];if(n&&t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType)for(s=0;n.length>s;s++)t.options[n[s][0]]&&n[s][1].apply(t.element,i)}},hasScroll:function(e,i){if("hidden"===t(e).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return e[s]>0?!0:(e[s]=1,n=e[s]>0,e[s]=0,n)}})})(jQuery),function(t,e){var i=0,s=Array.prototype.slice,n=t.cleanData;t.cleanData=function(e){for(var i,s=0;null!=(i=e[s]);s++)try{t(i).triggerHandler("remove")}catch(o){}n(e)},t.widget=function(i,s,n){var o,a,r,h,l={},c=i.split(".")[0];i=i.split(".")[1],o=c+"-"+i,n||(n=s,s=t.Widget),t.expr[":"][o.toLowerCase()]=function(e){return!!t.data(e,o)},t[c]=t[c]||{},a=t[c][i],r=t[c][i]=function(t,i){return this._createWidget?(arguments.length&&this._createWidget(t,i),e):new r(t,i)},t.extend(r,a,{version:n.version,_proto:t.extend({},n),_childConstructors:[]}),h=new s,h.options=t.widget.extend({},h.options),t.each(n,function(i,n){return t.isFunction(n)?(l[i]=function(){var t=function(){return s.prototype[i].apply(this,arguments)},e=function(t){return s.prototype[i].apply(this,t)};return function(){var i,s=this._super,o=this._superApply;return this._super=t,this._superApply=e,i=n.apply(this,arguments),this._super=s,this._superApply=o,i}}(),e):(l[i]=n,e)}),r.prototype=t.widget.extend(h,{widgetEventPrefix:a?h.widgetEventPrefix:i},l,{constructor:r,namespace:c,widgetName:i,widgetFullName:o}),a?(t.each(a._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,r,i._proto)}),delete a._childConstructors):s._childConstructors.push(r),t.widget.bridge(i,r)},t.widget.extend=function(i){for(var n,o,a=s.call(arguments,1),r=0,h=a.length;h>r;r++)for(n in a[r])o=a[r][n],a[r].hasOwnProperty(n)&&o!==e&&(i[n]=t.isPlainObject(o)?t.isPlainObject(i[n])?t.widget.extend({},i[n],o):t.widget.extend({},o):o);return i},t.widget.bridge=function(i,n){var o=n.prototype.widgetFullName||i;t.fn[i]=function(a){var r="string"==typeof a,h=s.call(arguments,1),l=this;return a=!r&&h.length?t.widget.extend.apply(null,[a].concat(h)):a,r?this.each(function(){var s,n=t.data(this,o);return n?t.isFunction(n[a])&&"_"!==a.charAt(0)?(s=n[a].apply(n,h),s!==n&&s!==e?(l=s&&s.jquery?l.pushStack(s.get()):s,!1):e):t.error("no such method '"+a+"' for "+i+" widget instance"):t.error("cannot call methods on "+i+" prior to initialization; "+"attempted to call method '"+a+"'")}):this.each(function(){var e=t.data(this,o);e?e.option(a||{})._init():t.data(this,o,new n(a,this))}),l}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(e,s){s=t(s||this.defaultElement||this)[0],this.element=t(s),this.uuid=i++,this.eventNamespace="."+this.widgetName+this.uuid,this.options=t.widget.extend({},this.options,this._getCreateOptions(),e),this.bindings=t(),this.hoverable=t(),this.focusable=t(),s!==this&&(t.data(s,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===s&&this.destroy()}}),this.document=t(s.style?s.ownerDocument:s.document||s),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:t.noop,_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetName).removeData(this.widgetFullName).removeData(t.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:t.noop,widget:function(){return this.element},option:function(i,s){var n,o,a,r=i;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof i)if(r={},n=i.split("."),i=n.shift(),n.length){for(o=r[i]=t.widget.extend({},this.options[i]),a=0;n.length-1>a;a++)o[n[a]]=o[n[a]]||{},o=o[n[a]];if(i=n.pop(),s===e)return o[i]===e?null:o[i];o[i]=s}else{if(s===e)return this.options[i]===e?null:this.options[i];r[i]=s}return this._setOptions(r),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return this.options[t]=e,"disabled"===t&&(this.widget().toggleClass(this.widgetFullName+"-disabled ui-state-disabled",!!e).attr("aria-disabled",e),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")),this},enable:function(){return this._setOption("disabled",!1)},disable:function(){return this._setOption("disabled",!0)},_on:function(i,s,n){var o,a=this;"boolean"!=typeof i&&(n=s,s=i,i=!1),n?(s=o=t(s),this.bindings=this.bindings.add(s)):(n=s,s=this.element,o=this.widget()),t.each(n,function(n,r){function h(){return i||a.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof r?a[r]:r).apply(a,arguments):e}"string"!=typeof r&&(h.guid=r.guid=r.guid||h.guid||t.guid++);var l=n.match(/^(\w+)\s*(.*)$/),c=l[1]+a.eventNamespace,u=l[2];u?o.delegate(u,c,h):s.bind(c,h)})},_off:function(t,e){e=(e||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,t.unbind(e).undelegate(e)},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){t(e.currentTarget).addClass("ui-state-hover")},mouseleave:function(e){t(e.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){t(e.currentTarget).addClass("ui-state-focus")},focusout:function(e){t(e.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(e,i,s){var n,o,a=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],o=i.originalEvent)for(n in o)n in i||(i[n]=o[n]);return this.element.trigger(i,s),!(t.isFunction(a)&&a.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,o){"string"==typeof n&&(n={effect:n});var a,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),a=!t.isEmptyObject(n),n.complete=o,n.delay&&s.delay(n.delay),a&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,o):s.queue(function(i){t(this)[e](),o&&o.call(s[0]),i()})}})}(jQuery),function(t){var e=!1;t(document).mouseup(function(){e=!1}),t.widget("ui.mouse",{version:"1.10.3",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.bind("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).bind("click."+this.widgetName,function(i){return!0===t.data(i.target,e.widgetName+".preventClickEvent")?(t.removeData(i.target,e.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):undefined}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&t(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(i){if(!e){this._mouseStarted&&this._mouseUp(i),this._mouseDownEvent=i;var s=this,n=1===i.which,o="string"==typeof this.options.cancel&&i.target.nodeName?t(i.target).closest(this.options.cancel).length:!1;return n&&!o&&this._mouseCapture(i)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){s.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(i)&&this._mouseDelayMet(i)&&(this._mouseStarted=this._mouseStart(i)!==!1,!this._mouseStarted)?(i.preventDefault(),!0):(!0===t.data(i.target,this.widgetName+".preventClickEvent")&&t.removeData(i.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return s._mouseMove(t)},this._mouseUpDelegate=function(t){return s._mouseUp(t)},t(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),i.preventDefault(),e=!0,!0)):!0}},_mouseMove:function(e){return t.ui.ie&&(!document.documentMode||9>document.documentMode)&&!e.button?this._mouseUp(e):this._mouseStarted?(this._mouseDrag(e),e.preventDefault()):(this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,e)!==!1,this._mouseStarted?this._mouseDrag(e):this._mouseUp(e)),!this._mouseStarted)},_mouseUp:function(e){return t(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,e.target===this._mouseDownEvent.target&&t.data(e.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(e)),!1},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}})}(jQuery),function(t){t.widget("ui.draggable",t.ui.mouse,{version:"1.10.3",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"!==this.options.helper||/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative"),this.options.addClasses&&this.element.addClass("ui-draggable"),this.options.disabled&&this.element.addClass("ui-draggable-disabled"),this._mouseInit()},_destroy:function(){this.element.removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled"),this._mouseDestroy()},_mouseCapture:function(e){var i=this.options;return this.helper||i.disabled||t(e.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(e),this.handle?(t(i.iframeFix===!0?"iframe":i.iframeFix).each(function(){t("<div class='ui-draggable-iframeFix' style='background: #fff;'></div>").css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1e3}).css(t(this).offset()).appendTo("body")}),!0):!1)},_mouseStart:function(e){var i=this.options;return this.helper=this._createHelper(e),this.helper.addClass("ui-draggable-dragging"),this._cacheHelperProportions(),t.ui.ddmanager&&(t.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(),this.offsetParent=this.helper.offsetParent(),this.offsetParentCssPosition=this.offsetParent.css("position"),this.offset=this.positionAbs=this.element.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},this.offset.scroll=!1,t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.originalPosition=this.position=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",e)===!1?(this._clear(),!1):(this._cacheHelperProportions(),t.ui.ddmanager&&!i.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this._mouseDrag(e,!0),t.ui.ddmanager&&t.ui.ddmanager.dragStart(this,e),!0)},_mouseDrag:function(e,i){if("fixed"===this.offsetParentCssPosition&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",e,s)===!1)return this._mouseUp({}),!1;this.position=s.position}return this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),!1},_mouseStop:function(e){var i=this,s=!1;return t.ui.ddmanager&&!this.options.dropBehaviour&&(s=t.ui.ddmanager.drop(this,e)),this.dropped&&(s=this.dropped,this.dropped=!1),"original"!==this.options.helper||t.contains(this.element[0].ownerDocument,this.element[0])?("invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||t.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?t(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",e)!==!1&&i._clear()}):this._trigger("stop",e)!==!1&&this._clear(),!1):!1},_mouseUp:function(e){return t("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)}),t.ui.ddmanager&&t.ui.ddmanager.dragStop(this,e),t.ui.mouse.prototype._mouseUp.call(this,e)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear(),this},_getHandle:function(e){return this.options.handle?!!t(e.target).closest(this.element.find(this.options.handle)).length:!0},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return s.parents("body").length||s.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s[0]===this.element[0]||/(fixed|absolute)/.test(s.css("position"))||s.css("position","absolute"),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===document.body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.element.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;return n.containment?"window"===n.containment?(this.containment=[t(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,t(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,t(window).scrollLeft()+t(window).width()-this.helperProportions.width-this.margins.left,t(window).scrollTop()+(t(window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],undefined):"document"===n.containment?(this.containment=[0,0,t(document).width()-this.helperProportions.width-this.margins.left,(t(document).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],undefined):n.containment.constructor===Array?(this.containment=n.containment,undefined):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=t(n.containment),s=i[0],s&&(e="hidden"!==i.css("overflow"),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(e?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(e?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relative_container=i),undefined):(this.containment=null,undefined)},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent;return this.offset.scroll||(this.offset.scroll={top:n.scrollTop(),left:n.scrollLeft()}),{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():this.offset.scroll.top)*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():this.offset.scroll.left)*s}},_generatePosition:function(e){var i,s,n,o,a=this.options,r="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=e.pageX,l=e.pageY;return this.offset.scroll||(this.offset.scroll={top:r.scrollTop(),left:r.scrollLeft()}),this.originalPosition&&(this.containment&&(this.relative_container?(s=this.relative_container.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,e.pageX-this.offset.click.left<i[0]&&(h=i[0]+this.offset.click.left),e.pageY-this.offset.click.top<i[1]&&(l=i[1]+this.offset.click.top),e.pageX-this.offset.click.left>i[2]&&(h=i[2]+this.offset.click.left),e.pageY-this.offset.click.top>i[3]&&(l=i[3]+this.offset.click.top)),a.grid&&(n=a.grid[1]?this.originalPageY+Math.round((l-this.originalPageY)/a.grid[1])*a.grid[1]:this.originalPageY,l=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-a.grid[1]:n+a.grid[1]:n,o=a.grid[0]?this.originalPageX+Math.round((h-this.originalPageX)/a.grid[0])*a.grid[0]:this.originalPageX,h=i?o-this.offset.click.left>=i[0]||o-this.offset.click.left>i[2]?o:o-this.offset.click.left>=i[0]?o-a.grid[0]:o+a.grid[0]:o)),{top:l-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():this.offset.scroll.top),left:h-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():this.offset.scroll.left)}},_clear:function(){this.helper.removeClass("ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1},_trigger:function(e,i,s){return s=s||this._uiHash(),t.ui.plugin.call(this,e,[i,s]),"drag"===e&&(this.positionAbs=this._convertPositionTo("absolute")),t.Widget.prototype._trigger.call(this,e,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),t.ui.plugin.add("draggable","connectToSortable",{start:function(e,i){var s=t(this).data("ui-draggable"),n=s.options,o=t.extend({},i,{item:s.element});s.sortables=[],t(n.connectToSortable).each(function(){var i=t.data(this,"ui-sortable");i&&!i.options.disabled&&(s.sortables.push({instance:i,shouldRevert:i.options.revert}),i.refreshPositions(),i._trigger("activate",e,o))})},stop:function(e,i){var s=t(this).data("ui-draggable"),n=t.extend({},i,{item:s.element});t.each(s.sortables,function(){this.instance.isOver?(this.instance.isOver=0,s.cancelHelperRemoval=!0,this.instance.cancelHelperRemoval=!1,this.shouldRevert&&(this.instance.options.revert=this.shouldRevert),this.instance._mouseStop(e),this.instance.options.helper=this.instance.options._helper,"original"===s.options.helper&&this.instance.currentItem.css({top:"auto",left:"auto"})):(this.instance.cancelHelperRemoval=!1,this.instance._trigger("deactivate",e,n))})},drag:function(e,i){var s=t(this).data("ui-draggable"),n=this;t.each(s.sortables,function(){var o=!1,a=this;this.instance.positionAbs=s.positionAbs,this.instance.helperProportions=s.helperProportions,this.instance.offset.click=s.offset.click,this.instance._intersectsWith(this.instance.containerCache)&&(o=!0,t.each(s.sortables,function(){return this.instance.positionAbs=s.positionAbs,this.instance.helperProportions=s.helperProportions,this.instance.offset.click=s.offset.click,this!==a&&this.instance._intersectsWith(this.instance.containerCache)&&t.contains(a.instance.element[0],this.instance.element[0])&&(o=!1),o})),o?(this.instance.isOver||(this.instance.isOver=1,this.instance.currentItem=t(n).clone().removeAttr("id").appendTo(this.instance.element).data("ui-sortable-item",!0),this.instance.options._helper=this.instance.options.helper,this.instance.options.helper=function(){return i.helper[0]},e.target=this.instance.currentItem[0],this.instance._mouseCapture(e,!0),this.instance._mouseStart(e,!0,!0),this.instance.offset.click.top=s.offset.click.top,this.instance.offset.click.left=s.offset.click.left,this.instance.offset.parent.left-=s.offset.parent.left-this.instance.offset.parent.left,this.instance.offset.parent.top-=s.offset.parent.top-this.instance.offset.parent.top,s._trigger("toSortable",e),s.dropped=this.instance.element,s.currentItem=s.element,this.instance.fromOutside=s),this.instance.currentItem&&this.instance._mouseDrag(e)):this.instance.isOver&&(this.instance.isOver=0,this.instance.cancelHelperRemoval=!0,this.instance.options.revert=!1,this.instance._trigger("out",e,this.instance._uiHash(this.instance)),this.instance._mouseStop(e,!0),this.instance.options.helper=this.instance.options._helper,this.instance.currentItem.remove(),this.instance.placeholder&&this.instance.placeholder.remove(),s._trigger("fromSortable",e),s.dropped=!1)})}}),t.ui.plugin.add("draggable","cursor",{start:function(){var e=t("body"),i=t(this).data("ui-draggable").options;e.css("cursor")&&(i._cursor=e.css("cursor")),e.css("cursor",i.cursor)},stop:function(){var e=t(this).data("ui-draggable").options;e._cursor&&t("body").css("cursor",e._cursor)}}),t.ui.plugin.add("draggable","opacity",{start:function(e,i){var s=t(i.helper),n=t(this).data("ui-draggable").options;s.css("opacity")&&(n._opacity=s.css("opacity")),s.css("opacity",n.opacity)},stop:function(e,i){var s=t(this).data("ui-draggable").options;s._opacity&&t(i.helper).css("opacity",s._opacity)}}),t.ui.plugin.add("draggable","scroll",{start:function(){var e=t(this).data("ui-draggable");e.scrollParent[0]!==document&&"HTML"!==e.scrollParent[0].tagName&&(e.overflowOffset=e.scrollParent.offset())},drag:function(e){var i=t(this).data("ui-draggable"),s=i.options,n=!1;i.scrollParent[0]!==document&&"HTML"!==i.scrollParent[0].tagName?(s.axis&&"x"===s.axis||(i.overflowOffset.top+i.scrollParent[0].offsetHeight-e.pageY<s.scrollSensitivity?i.scrollParent[0].scrollTop=n=i.scrollParent[0].scrollTop+s.scrollSpeed:e.pageY-i.overflowOffset.top<s.scrollSensitivity&&(i.scrollParent[0].scrollTop=n=i.scrollParent[0].scrollTop-s.scrollSpeed)),s.axis&&"y"===s.axis||(i.overflowOffset.left+i.scrollParent[0].offsetWidth-e.pageX<s.scrollSensitivity?i.scrollParent[0].scrollLeft=n=i.scrollParent[0].scrollLeft+s.scrollSpeed:e.pageX-i.overflowOffset.left<s.scrollSensitivity&&(i.scrollParent[0].scrollLeft=n=i.scrollParent[0].scrollLeft-s.scrollSpeed))):(s.axis&&"x"===s.axis||(e.pageY-t(document).scrollTop()<s.scrollSensitivity?n=t(document).scrollTop(t(document).scrollTop()-s.scrollSpeed):t(window).height()-(e.pageY-t(document).scrollTop())<s.scrollSensitivity&&(n=t(document).scrollTop(t(document).scrollTop()+s.scrollSpeed))),s.axis&&"y"===s.axis||(e.pageX-t(document).scrollLeft()<s.scrollSensitivity?n=t(document).scrollLeft(t(document).scrollLeft()-s.scrollSpeed):t(window).width()-(e.pageX-t(document).scrollLeft())<s.scrollSensitivity&&(n=t(document).scrollLeft(t(document).scrollLeft()+s.scrollSpeed)))),n!==!1&&t.ui.ddmanager&&!s.dropBehaviour&&t.ui.ddmanager.prepareOffsets(i,e)}}),t.ui.plugin.add("draggable","snap",{start:function(){var e=t(this).data("ui-draggable"),i=e.options;e.snapElements=[],t(i.snap.constructor!==String?i.snap.items||":data(ui-draggable)":i.snap).each(function(){var i=t(this),s=i.offset();this!==e.element[0]&&e.snapElements.push({item:this,width:i.outerWidth(),height:i.outerHeight(),top:s.top,left:s.left})})},drag:function(e,i){var s,n,o,a,r,h,l,c,u,d,p=t(this).data("ui-draggable"),f=p.options,g=f.snapTolerance,m=i.offset.left,v=m+p.helperProportions.width,_=i.offset.top,b=_+p.helperProportions.height;for(u=p.snapElements.length-1;u>=0;u--)r=p.snapElements[u].left,h=r+p.snapElements[u].width,l=p.snapElements[u].top,c=l+p.snapElements[u].height,r-g>v||m>h+g||l-g>b||_>c+g||!t.contains(p.snapElements[u].item.ownerDocument,p.snapElements[u].item)?(p.snapElements[u].snapping&&p.options.snap.release&&p.options.snap.release.call(p.element,e,t.extend(p._uiHash(),{snapItem:p.snapElements[u].item})),p.snapElements[u].snapping=!1):("inner"!==f.snapMode&&(s=g>=Math.abs(l-b),n=g>=Math.abs(c-_),o=g>=Math.abs(r-v),a=g>=Math.abs(h-m),s&&(i.position.top=p._convertPositionTo("relative",{top:l-p.helperProportions.height,left:0}).top-p.margins.top),n&&(i.position.top=p._convertPositionTo("relative",{top:c,left:0}).top-p.margins.top),o&&(i.position.left=p._convertPositionTo("relative",{top:0,left:r-p.helperProportions.width}).left-p.margins.left),a&&(i.position.left=p._convertPositionTo("relative",{top:0,left:h}).left-p.margins.left)),d=s||n||o||a,"outer"!==f.snapMode&&(s=g>=Math.abs(l-_),n=g>=Math.abs(c-b),o=g>=Math.abs(r-m),a=g>=Math.abs(h-v),s&&(i.position.top=p._convertPositionTo("relative",{top:l,left:0}).top-p.margins.top),n&&(i.position.top=p._convertPositionTo("relative",{top:c-p.helperProportions.height,left:0}).top-p.margins.top),o&&(i.position.left=p._convertPositionTo("relative",{top:0,left:r}).left-p.margins.left),a&&(i.position.left=p._convertPositionTo("relative",{top:0,left:h-p.helperProportions.width}).left-p.margins.left)),!p.snapElements[u].snapping&&(s||n||o||a||d)&&p.options.snap.snap&&p.options.snap.snap.call(p.element,e,t.extend(p._uiHash(),{snapItem:p.snapElements[u].item})),p.snapElements[u].snapping=s||n||o||a||d)}}),t.ui.plugin.add("draggable","stack",{start:function(){var e,i=this.data("ui-draggable").options,s=t.makeArray(t(i.stack)).sort(function(e,i){return(parseInt(t(e).css("zIndex"),10)||0)-(parseInt(t(i).css("zIndex"),10)||0)});s.length&&(e=parseInt(t(s[0]).css("zIndex"),10)||0,t(s).each(function(i){t(this).css("zIndex",e+i)}),this.css("zIndex",e+s.length))}}),t.ui.plugin.add("draggable","zIndex",{start:function(e,i){var s=t(i.helper),n=t(this).data("ui-draggable").options;s.css("zIndex")&&(n._zIndex=s.css("zIndex")),s.css("zIndex",n.zIndex)},stop:function(e,i){var s=t(this).data("ui-draggable").options;s._zIndex&&t(i.helper).css("zIndex",s._zIndex)}})}(jQuery),function(t){function e(t,e,i){return t>e&&e+i>t}t.widget("ui.droppable",{version:"1.10.3",widgetEventPrefix:"drop",options:{accept:"*",activeClass:!1,addClasses:!0,greedy:!1,hoverClass:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var e=this.options,i=e.accept;this.isover=!1,this.isout=!0,this.accept=t.isFunction(i)?i:function(t){return t.is(i)
+},this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight},t.ui.ddmanager.droppables[e.scope]=t.ui.ddmanager.droppables[e.scope]||[],t.ui.ddmanager.droppables[e.scope].push(this),e.addClasses&&this.element.addClass("ui-droppable")},_destroy:function(){for(var e=0,i=t.ui.ddmanager.droppables[this.options.scope];i.length>e;e++)i[e]===this&&i.splice(e,1);this.element.removeClass("ui-droppable ui-droppable-disabled")},_setOption:function(e,i){"accept"===e&&(this.accept=t.isFunction(i)?i:function(t){return t.is(i)}),t.Widget.prototype._setOption.apply(this,arguments)},_activate:function(e){var i=t.ui.ddmanager.current;this.options.activeClass&&this.element.addClass(this.options.activeClass),i&&this._trigger("activate",e,this.ui(i))},_deactivate:function(e){var i=t.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass),i&&this._trigger("deactivate",e,this.ui(i))},_over:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.addClass(this.options.hoverClass),this._trigger("over",e,this.ui(i)))},_out:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("out",e,this.ui(i)))},_drop:function(e,i){var s=i||t.ui.ddmanager.current,n=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var e=t.data(this,"ui-droppable");return e.options.greedy&&!e.options.disabled&&e.options.scope===s.options.scope&&e.accept.call(e.element[0],s.currentItem||s.element)&&t.ui.intersect(s,t.extend(e,{offset:e.element.offset()}),e.options.tolerance)?(n=!0,!1):undefined}),n?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this.options.activeClass&&this.element.removeClass(this.options.activeClass),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass),this._trigger("drop",e,this.ui(s)),this.element):!1):!1},ui:function(t){return{draggable:t.currentItem||t.element,helper:t.helper,position:t.position,offset:t.positionAbs}}}),t.ui.intersect=function(t,i,s){if(!i.offset)return!1;var n,o,a=(t.positionAbs||t.position.absolute).left,r=a+t.helperProportions.width,h=(t.positionAbs||t.position.absolute).top,l=h+t.helperProportions.height,c=i.offset.left,u=c+i.proportions.width,d=i.offset.top,p=d+i.proportions.height;switch(s){case"fit":return a>=c&&u>=r&&h>=d&&p>=l;case"intersect":return a+t.helperProportions.width/2>c&&u>r-t.helperProportions.width/2&&h+t.helperProportions.height/2>d&&p>l-t.helperProportions.height/2;case"pointer":return n=(t.positionAbs||t.position.absolute).left+(t.clickOffset||t.offset.click).left,o=(t.positionAbs||t.position.absolute).top+(t.clickOffset||t.offset.click).top,e(o,d,i.proportions.height)&&e(n,c,i.proportions.width);case"touch":return(h>=d&&p>=h||l>=d&&p>=l||d>h&&l>p)&&(a>=c&&u>=a||r>=c&&u>=r||c>a&&r>u);default:return!1}},t.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(e,i){var s,n,o=t.ui.ddmanager.droppables[e.options.scope]||[],a=i?i.type:null,r=(e.currentItem||e.element).find(":data(ui-droppable)").addBack();t:for(s=0;o.length>s;s++)if(!(o[s].options.disabled||e&&!o[s].accept.call(o[s].element[0],e.currentItem||e.element))){for(n=0;r.length>n;n++)if(r[n]===o[s].element[0]){o[s].proportions.height=0;continue t}o[s].visible="none"!==o[s].element.css("display"),o[s].visible&&("mousedown"===a&&o[s]._activate.call(o[s],i),o[s].offset=o[s].element.offset(),o[s].proportions={width:o[s].element[0].offsetWidth,height:o[s].element[0].offsetHeight})}},drop:function(e,i){var s=!1;return t.each((t.ui.ddmanager.droppables[e.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&t.ui.intersect(e,this,this.options.tolerance)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],e.currentItem||e.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(e,i){e.element.parentsUntil("body").bind("scroll.droppable",function(){e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)})},drag:function(e,i){e.options.refreshPositions&&t.ui.ddmanager.prepareOffsets(e,i),t.each(t.ui.ddmanager.droppables[e.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,n,o,a=t.ui.intersect(e,this,this.options.tolerance),r=!a&&this.isover?"isout":a&&!this.isover?"isover":null;r&&(this.options.greedy&&(n=this.options.scope,o=this.element.parents(":data(ui-droppable)").filter(function(){return t.data(this,"ui-droppable").options.scope===n}),o.length&&(s=t.data(o[0],"ui-droppable"),s.greedyChild="isover"===r)),s&&"isover"===r&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[r]=!0,this["isout"===r?"isover":"isout"]=!1,this["isover"===r?"_over":"_out"].call(this,i),s&&"isout"===r&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(e,i){e.element.parentsUntil("body").unbind("scroll.droppable"),e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)}}}(jQuery),function(t){function e(t){return parseInt(t,10)||0}function i(t){return!isNaN(parseInt(t,10))}t.widget("ui.resizable",t.ui.mouse,{version:"1.10.3",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_create:function(){var e,i,s,n,o,a=this,r=this.options;if(this.element.addClass("ui-resizable"),t.extend(this,{_aspectRatio:!!r.aspectRatio,aspectRatio:r.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:r.helper||r.ghost||r.animate?r.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)&&(this.element.wrap(t("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.data("ui-resizable")),this.elementIsWrapper=!0,this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0}),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css({margin:this.originalElement.css("margin")}),this._proportionallyResize()),this.handles=r.handles||(t(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),e=this.handles.split(","),this.handles={},i=0;e.length>i;i++)s=t.trim(e[i]),o="ui-resizable-"+s,n=t("<div class='ui-resizable-handle "+o+"'></div>"),n.css({zIndex:r.zIndex}),"se"===s&&n.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[s]=".ui-resizable-"+s,this.element.append(n);this._renderAxis=function(e){var i,s,n,o;e=e||this.element;for(i in this.handles)this.handles[i].constructor===String&&(this.handles[i]=t(this.handles[i],this.element).show()),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)&&(s=t(this.handles[i],this.element),o=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),e.css(n,o),this._proportionallyResize()),t(this.handles[i]).length},this._renderAxis(this.element),this._handles=t(".ui-resizable-handle",this.element).disableSelection(),this._handles.mouseover(function(){a.resizing||(this.className&&(n=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),a.axis=n&&n[1]?n[1]:"se")}),r.autoHide&&(this._handles.hide(),t(this.element).addClass("ui-resizable-autohide").mouseenter(function(){r.disabled||(t(this).removeClass("ui-resizable-autohide"),a._handles.show())}).mouseleave(function(){r.disabled||a.resizing||(t(this).addClass("ui-resizable-autohide"),a._handles.hide())})),this._mouseInit()},_destroy:function(){this._mouseDestroy();var e,i=function(e){t(e).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),e=this.element,this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")}).insertAfter(e),e.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_mouseCapture:function(e){var i,s,n=!1;for(i in this.handles)s=t(this.handles[i])[0],(s===e.target||t.contains(s,e.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(i){var s,n,o,a=this.options,r=this.element.position(),h=this.element;return this.resizing=!0,/absolute/.test(h.css("position"))?h.css({position:"absolute",top:h.css("top"),left:h.css("left")}):h.is(".ui-draggable")&&h.css({position:"absolute",top:r.top,left:r.left}),this._renderProxy(),s=e(this.helper.css("left")),n=e(this.helper.css("top")),a.containment&&(s+=t(a.containment).scrollLeft()||0,n+=t(a.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:s,top:n},this.size=this._helper?{width:h.outerWidth(),height:h.outerHeight()}:{width:h.width(),height:h.height()},this.originalSize=this._helper?{width:h.outerWidth(),height:h.outerHeight()}:{width:h.width(),height:h.height()},this.originalPosition={left:s,top:n},this.sizeDiff={width:h.outerWidth()-h.width(),height:h.outerHeight()-h.height()},this.originalMousePosition={left:i.pageX,top:i.pageY},this.aspectRatio="number"==typeof a.aspectRatio?a.aspectRatio:this.originalSize.width/this.originalSize.height||1,o=t(".ui-resizable-"+this.axis).css("cursor"),t("body").css("cursor","auto"===o?this.axis+"-resize":o),h.addClass("ui-resizable-resizing"),this._propagate("start",i),!0},_mouseDrag:function(e){var i,s=this.helper,n={},o=this.originalMousePosition,a=this.axis,r=this.position.top,h=this.position.left,l=this.size.width,c=this.size.height,u=e.pageX-o.left||0,d=e.pageY-o.top||0,p=this._change[a];return p?(i=p.apply(this,[e,u,d]),this._updateVirtualBoundaries(e.shiftKey),(this._aspectRatio||e.shiftKey)&&(i=this._updateRatio(i,e)),i=this._respectSize(i,e),this._updateCache(i),this._propagate("resize",e),this.position.top!==r&&(n.top=this.position.top+"px"),this.position.left!==h&&(n.left=this.position.left+"px"),this.size.width!==l&&(n.width=this.size.width+"px"),this.size.height!==c&&(n.height=this.size.height+"px"),s.css(n),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),t.isEmptyObject(n)||this._trigger("resize",e,this.ui()),!1):!1},_mouseStop:function(e){this.resizing=!1;var i,s,n,o,a,r,h,l=this.options,c=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&t.ui.hasScroll(i[0],"left")?0:c.sizeDiff.height,o=s?0:c.sizeDiff.width,a={width:c.helper.width()-o,height:c.helper.height()-n},r=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null,h=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null,l.animate||this.element.css(t.extend(a,{top:h,left:r})),c.helper.height(c.size.height),c.helper.width(c.size.width),this._helper&&!l.animate&&this._proportionallyResize()),t("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",e),this._helper&&this.helper.remove(),!1},_updateVirtualBoundaries:function(t){var e,s,n,o,a,r=this.options;a={minWidth:i(r.minWidth)?r.minWidth:0,maxWidth:i(r.maxWidth)?r.maxWidth:1/0,minHeight:i(r.minHeight)?r.minHeight:0,maxHeight:i(r.maxHeight)?r.maxHeight:1/0},(this._aspectRatio||t)&&(e=a.minHeight*this.aspectRatio,n=a.minWidth/this.aspectRatio,s=a.maxHeight*this.aspectRatio,o=a.maxWidth/this.aspectRatio,e>a.minWidth&&(a.minWidth=e),n>a.minHeight&&(a.minHeight=n),a.maxWidth>s&&(a.maxWidth=s),a.maxHeight>o&&(a.maxHeight=o)),this._vBoundaries=a},_updateCache:function(t){this.offset=this.helper.offset(),i(t.left)&&(this.position.left=t.left),i(t.top)&&(this.position.top=t.top),i(t.height)&&(this.size.height=t.height),i(t.width)&&(this.size.width=t.width)},_updateRatio:function(t){var e=this.position,s=this.size,n=this.axis;return i(t.height)?t.width=t.height*this.aspectRatio:i(t.width)&&(t.height=t.width/this.aspectRatio),"sw"===n&&(t.left=e.left+(s.width-t.width),t.top=null),"nw"===n&&(t.top=e.top+(s.height-t.height),t.left=e.left+(s.width-t.width)),t},_respectSize:function(t){var e=this._vBoundaries,s=this.axis,n=i(t.width)&&e.maxWidth&&e.maxWidth<t.width,o=i(t.height)&&e.maxHeight&&e.maxHeight<t.height,a=i(t.width)&&e.minWidth&&e.minWidth>t.width,r=i(t.height)&&e.minHeight&&e.minHeight>t.height,h=this.originalPosition.left+this.originalSize.width,l=this.position.top+this.size.height,c=/sw|nw|w/.test(s),u=/nw|ne|n/.test(s);return a&&(t.width=e.minWidth),r&&(t.height=e.minHeight),n&&(t.width=e.maxWidth),o&&(t.height=e.maxHeight),a&&c&&(t.left=h-e.minWidth),n&&c&&(t.left=h-e.maxWidth),r&&u&&(t.top=l-e.minHeight),o&&u&&(t.top=l-e.maxHeight),t.width||t.height||t.left||!t.top?t.width||t.height||t.top||!t.left||(t.left=null):t.top=null,t},_proportionallyResize:function(){if(this._proportionallyResizeElements.length){var t,e,i,s,n,o=this.helper||this.element;for(t=0;this._proportionallyResizeElements.length>t;t++){if(n=this._proportionallyResizeElements[t],!this.borderDif)for(this.borderDif=[],i=[n.css("borderTopWidth"),n.css("borderRightWidth"),n.css("borderBottomWidth"),n.css("borderLeftWidth")],s=[n.css("paddingTop"),n.css("paddingRight"),n.css("paddingBottom"),n.css("paddingLeft")],e=0;i.length>e;e++)this.borderDif[e]=(parseInt(i[e],10)||0)+(parseInt(s[e],10)||0);n.css({height:o.height()-this.borderDif[0]-this.borderDif[2]||0,width:o.width()-this.borderDif[1]-this.borderDif[3]||0})}}},_renderProxy:function(){var e=this.element,i=this.options;this.elementOffset=e.offset(),this._helper?(this.helper=this.helper||t("<div style='overflow:hidden;'></div>"),this.helper.addClass(this._helper).css({width:this.element.outerWidth()-1,height:this.element.outerHeight()-1,position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(t,e){return{width:this.originalSize.width+e}},w:function(t,e){var i=this.originalSize,s=this.originalPosition;return{left:s.left+e,width:i.width-e}},n:function(t,e,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(t,e,i){return{height:this.originalSize.height+i}},se:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},sw:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,i,s]))},ne:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},nw:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,i,s]))}},_propagate:function(e,i){t.ui.plugin.call(this,e,[i,this.ui()]),"resize"!==e&&this._trigger(e,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),t.ui.plugin.add("resizable","animate",{stop:function(e){var i=t(this).data("ui-resizable"),s=i.options,n=i._proportionallyResizeElements,o=n.length&&/textarea/i.test(n[0].nodeName),a=o&&t.ui.hasScroll(n[0],"left")?0:i.sizeDiff.height,r=o?0:i.sizeDiff.width,h={width:i.size.width-r,height:i.size.height-a},l=parseInt(i.element.css("left"),10)+(i.position.left-i.originalPosition.left)||null,c=parseInt(i.element.css("top"),10)+(i.position.top-i.originalPosition.top)||null;i.element.animate(t.extend(h,c&&l?{top:c,left:l}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseInt(i.element.css("width"),10),height:parseInt(i.element.css("height"),10),top:parseInt(i.element.css("top"),10),left:parseInt(i.element.css("left"),10)};n&&n.length&&t(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",e)}})}}),t.ui.plugin.add("resizable","containment",{start:function(){var i,s,n,o,a,r,h,l=t(this).data("ui-resizable"),c=l.options,u=l.element,d=c.containment,p=d instanceof t?d.get(0):/parent/.test(d)?u.parent().get(0):d;p&&(l.containerElement=t(p),/document/.test(d)||d===document?(l.containerOffset={left:0,top:0},l.containerPosition={left:0,top:0},l.parentData={element:t(document),left:0,top:0,width:t(document).width(),height:t(document).height()||document.body.parentNode.scrollHeight}):(i=t(p),s=[],t(["Top","Right","Left","Bottom"]).each(function(t,n){s[t]=e(i.css("padding"+n))}),l.containerOffset=i.offset(),l.containerPosition=i.position(),l.containerSize={height:i.innerHeight()-s[3],width:i.innerWidth()-s[1]},n=l.containerOffset,o=l.containerSize.height,a=l.containerSize.width,r=t.ui.hasScroll(p,"left")?p.scrollWidth:a,h=t.ui.hasScroll(p)?p.scrollHeight:o,l.parentData={element:p,left:n.left,top:n.top,width:r,height:h}))},resize:function(e){var i,s,n,o,a=t(this).data("ui-resizable"),r=a.options,h=a.containerOffset,l=a.position,c=a._aspectRatio||e.shiftKey,u={top:0,left:0},d=a.containerElement;d[0]!==document&&/static/.test(d.css("position"))&&(u=h),l.left<(a._helper?h.left:0)&&(a.size.width=a.size.width+(a._helper?a.position.left-h.left:a.position.left-u.left),c&&(a.size.height=a.size.width/a.aspectRatio),a.position.left=r.helper?h.left:0),l.top<(a._helper?h.top:0)&&(a.size.height=a.size.height+(a._helper?a.position.top-h.top:a.position.top),c&&(a.size.width=a.size.height*a.aspectRatio),a.position.top=a._helper?h.top:0),a.offset.left=a.parentData.left+a.position.left,a.offset.top=a.parentData.top+a.position.top,i=Math.abs((a._helper?a.offset.left-u.left:a.offset.left-u.left)+a.sizeDiff.width),s=Math.abs((a._helper?a.offset.top-u.top:a.offset.top-h.top)+a.sizeDiff.height),n=a.containerElement.get(0)===a.element.parent().get(0),o=/relative|absolute/.test(a.containerElement.css("position")),n&&o&&(i-=a.parentData.left),i+a.size.width>=a.parentData.width&&(a.size.width=a.parentData.width-i,c&&(a.size.height=a.size.width/a.aspectRatio)),s+a.size.height>=a.parentData.height&&(a.size.height=a.parentData.height-s,c&&(a.size.width=a.size.height*a.aspectRatio))},stop:function(){var e=t(this).data("ui-resizable"),i=e.options,s=e.containerOffset,n=e.containerPosition,o=e.containerElement,a=t(e.helper),r=a.offset(),h=a.outerWidth()-e.sizeDiff.width,l=a.outerHeight()-e.sizeDiff.height;e._helper&&!i.animate&&/relative/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l}),e._helper&&!i.animate&&/static/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l})}}),t.ui.plugin.add("resizable","alsoResize",{start:function(){var e=t(this).data("ui-resizable"),i=e.options,s=function(e){t(e).each(function(){var e=t(this);e.data("ui-resizable-alsoresize",{width:parseInt(e.width(),10),height:parseInt(e.height(),10),left:parseInt(e.css("left"),10),top:parseInt(e.css("top"),10)})})};"object"!=typeof i.alsoResize||i.alsoResize.parentNode?s(i.alsoResize):i.alsoResize.length?(i.alsoResize=i.alsoResize[0],s(i.alsoResize)):t.each(i.alsoResize,function(t){s(t)})},resize:function(e,i){var s=t(this).data("ui-resizable"),n=s.options,o=s.originalSize,a=s.originalPosition,r={height:s.size.height-o.height||0,width:s.size.width-o.width||0,top:s.position.top-a.top||0,left:s.position.left-a.left||0},h=function(e,s){t(e).each(function(){var e=t(this),n=t(this).data("ui-resizable-alsoresize"),o={},a=s&&s.length?s:e.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];t.each(a,function(t,e){var i=(n[e]||0)+(r[e]||0);i&&i>=0&&(o[e]=i||null)}),e.css(o)})};"object"!=typeof n.alsoResize||n.alsoResize.nodeType?h(n.alsoResize):t.each(n.alsoResize,function(t,e){h(t,e)})},stop:function(){t(this).removeData("resizable-alsoresize")}}),t.ui.plugin.add("resizable","ghost",{start:function(){var e=t(this).data("ui-resizable"),i=e.options,s=e.size;e.ghost=e.originalElement.clone(),e.ghost.css({opacity:.25,display:"block",position:"relative",height:s.height,width:s.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass("string"==typeof i.ghost?i.ghost:""),e.ghost.appendTo(e.helper)},resize:function(){var e=t(this).data("ui-resizable");e.ghost&&e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})},stop:function(){var e=t(this).data("ui-resizable");e.ghost&&e.helper&&e.helper.get(0).removeChild(e.ghost.get(0))}}),t.ui.plugin.add("resizable","grid",{resize:function(){var e=t(this).data("ui-resizable"),i=e.options,s=e.size,n=e.originalSize,o=e.originalPosition,a=e.axis,r="number"==typeof i.grid?[i.grid,i.grid]:i.grid,h=r[0]||1,l=r[1]||1,c=Math.round((s.width-n.width)/h)*h,u=Math.round((s.height-n.height)/l)*l,d=n.width+c,p=n.height+u,f=i.maxWidth&&d>i.maxWidth,g=i.maxHeight&&p>i.maxHeight,m=i.minWidth&&i.minWidth>d,v=i.minHeight&&i.minHeight>p;i.grid=r,m&&(d+=h),v&&(p+=l),f&&(d-=h),g&&(p-=l),/^(se|s|e)$/.test(a)?(e.size.width=d,e.size.height=p):/^(ne)$/.test(a)?(e.size.width=d,e.size.height=p,e.position.top=o.top-u):/^(sw)$/.test(a)?(e.size.width=d,e.size.height=p,e.position.left=o.left-c):(e.size.width=d,e.size.height=p,e.position.top=o.top-u,e.position.left=o.left-c)}})}(jQuery),function(t){t.widget("ui.selectable",t.ui.mouse,{version:"1.10.3",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var e,i=this;this.element.addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){e=t(i.options.filter,i.element[0]),e.addClass("ui-selectee"),e.each(function(){var e=t(this),i=e.offset();t.data(this,"selectable-item",{element:this,$element:e,left:i.left,top:i.top,right:i.left+e.outerWidth(),bottom:i.top+e.outerHeight(),startselected:!1,selected:e.hasClass("ui-selected"),selecting:e.hasClass("ui-selecting"),unselecting:e.hasClass("ui-unselecting")})})},this.refresh(),this.selectees=e.addClass("ui-selectee"),this._mouseInit(),this.helper=t("<div class='ui-selectable-helper'></div>")},_destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item"),this.element.removeClass("ui-selectable ui-selectable-disabled"),this._mouseDestroy()},_mouseStart:function(e){var i=this,s=this.options;this.opos=[e.pageX,e.pageY],this.options.disabled||(this.selectees=t(s.filter,this.element[0]),this._trigger("start",e),t(s.appendTo).append(this.helper),this.helper.css({left:e.pageX,top:e.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=t.data(this,"selectable-item");s.startselected=!0,e.metaKey||e.ctrlKey||(s.$element.removeClass("ui-selected"),s.selected=!1,s.$element.addClass("ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",e,{unselecting:s.element}))}),t(e.target).parents().addBack().each(function(){var s,n=t.data(this,"selectable-item");return n?(s=!e.metaKey&&!e.ctrlKey||!n.$element.hasClass("ui-selected"),n.$element.removeClass(s?"ui-unselecting":"ui-selected").addClass(s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",e,{selecting:n.element}):i._trigger("unselecting",e,{unselecting:n.element}),!1):undefined}))},_mouseDrag:function(e){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,o=this.opos[0],a=this.opos[1],r=e.pageX,h=e.pageY;return o>r&&(i=r,r=o,o=i),a>h&&(i=h,h=a,a=i),this.helper.css({left:o,top:a,width:r-o,height:h-a}),this.selectees.each(function(){var i=t.data(this,"selectable-item"),l=!1;i&&i.element!==s.element[0]&&("touch"===n.tolerance?l=!(i.left>r||o>i.right||i.top>h||a>i.bottom):"fit"===n.tolerance&&(l=i.left>o&&r>i.right&&i.top>a&&h>i.bottom),l?(i.selected&&(i.$element.removeClass("ui-selected"),i.selected=!1),i.unselecting&&(i.$element.removeClass("ui-unselecting"),i.unselecting=!1),i.selecting||(i.$element.addClass("ui-selecting"),i.selecting=!0,s._trigger("selecting",e,{selecting:i.element}))):(i.selecting&&((e.metaKey||e.ctrlKey)&&i.startselected?(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.$element.addClass("ui-selected"),i.selected=!0):(i.$element.removeClass("ui-selecting"),i.selecting=!1,i.startselected&&(i.$element.addClass("ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",e,{unselecting:i.element}))),i.selected&&(e.metaKey||e.ctrlKey||i.startselected||(i.$element.removeClass("ui-selected"),i.selected=!1,i.$element.addClass("ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",e,{unselecting:i.element})))))}),!1}},_mouseStop:function(e){var i=this;return this.dragged=!1,t(".ui-unselecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");s.$element.removeClass("ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",e,{unselected:s.element})}),t(".ui-selecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");s.$element.removeClass("ui-selecting").addClass("ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",e,{selected:s.element})}),this._trigger("stop",e),this.helper.remove(),!1}})}(jQuery),function(t){function e(t,e,i){return t>e&&e+i>t}function i(t){return/left|right/.test(t.css("float"))||/inline|table-cell/.test(t.css("display"))}t.widget("ui.sortable",t.ui.mouse,{version:"1.10.3",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_create:function(){var t=this.options;this.containerCache={},this.element.addClass("ui-sortable"),this.refresh(),this.floating=this.items.length?"x"===t.axis||i(this.items[0].item):!1,this.offset=this.element.offset(),this._mouseInit(),this.ready=!0},_destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled"),this._mouseDestroy();for(var t=this.items.length-1;t>=0;t--)this.items[t].item.removeData(this.widgetName+"-item");return this},_setOption:function(e,i){"disabled"===e?(this.options[e]=i,this.widget().toggleClass("ui-sortable-disabled",!!i)):t.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(e,i){var s=null,n=!1,o=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(e),t(e.target).parents().each(function(){return t.data(this,o.widgetName+"-item")===o?(s=t(this),!1):undefined}),t.data(e.target,o.widgetName+"-item")===o&&(s=t(e.target)),s?!this.options.handle||i||(t(this.options.handle,s).find("*").addBack().each(function(){this===e.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(e,i,s){var n,o,a=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(e),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,a.cursorAt&&this._adjustOffsetFromHelper(a.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),a.containment&&this._setContainment(),a.cursor&&"auto"!==a.cursor&&(o=this.document.find("body"),this.storedCursor=o.css("cursor"),o.css("cursor",a.cursor),this.storedStylesheet=t("<style>*{ cursor: "+a.cursor+" !important; }</style>").appendTo(o)),a.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",a.opacity)),a.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",a.zIndex)),this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",e,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",e,this._uiHash(this));return t.ui.ddmanager&&(t.ui.ddmanager.current=this),t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this.dragging=!0,this.helper.addClass("ui-sortable-helper"),this._mouseDrag(e),!0},_mouseDrag:function(e){var i,s,n,o,a=this.options,r=!1;for(this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==document&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-e.pageY<a.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+a.scrollSpeed:e.pageY-this.overflowOffset.top<a.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-a.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-e.pageX<a.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+a.scrollSpeed:e.pageX-this.overflowOffset.left<a.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-a.scrollSpeed)):(e.pageY-t(document).scrollTop()<a.scrollSensitivity?r=t(document).scrollTop(t(document).scrollTop()-a.scrollSpeed):t(window).height()-(e.pageY-t(document).scrollTop())<a.scrollSensitivity&&(r=t(document).scrollTop(t(document).scrollTop()+a.scrollSpeed)),e.pageX-t(document).scrollLeft()<a.scrollSensitivity?r=t(document).scrollLeft(t(document).scrollLeft()-a.scrollSpeed):t(window).width()-(e.pageX-t(document).scrollLeft())<a.scrollSensitivity&&(r=t(document).scrollLeft(t(document).scrollLeft()+a.scrollSpeed))),r!==!1&&t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],o=this._intersectsWithPointer(s),o&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===o?"next":"prev"]()[0]!==n&&!t.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!t.contains(this.element[0],n):!0)){if(this.direction=1===o?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;
+this._rearrange(e,s),this._trigger("change",e,this._uiHash());break}return this._contactContainers(e),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),this._trigger("sort",e,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(e,i){if(e){if(t.ui.ddmanager&&!this.options.dropBehaviour&&t.ui.ddmanager.drop(this,e),this.options.revert){var s=this,n=this.placeholder.offset(),o=this.options.axis,a={};o&&"x"!==o||(a.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollLeft)),o&&"y"!==o||(a.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===document.body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,t(this.helper).animate(a,parseInt(this.options.revert,10)||500,function(){s._clear(e)})}else this._clear(e,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp({target:null}),"original"===this.options.helper?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("deactivate",null,this._uiHash(this)),this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",null,this._uiHash(this)),this.containers[e].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),t.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?t(this.domPosition.prev).after(this.currentItem):t(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},t(i).each(function(){var i=(t(e.item||this).attr(e.attribute||"id")||"").match(e.expression||/(.+)[\-=_](.+)/);i&&s.push((e.key||i[1]+"[]")+"="+(e.key&&e.expression?i[1]:i[2]))}),!s.length&&e.key&&s.push(e.key+"="),s.join("&")},toArray:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},i.each(function(){s.push(t(e.item||this).attr(e.attribute||"id")||"")}),s},_intersectsWith:function(t){var e=this.positionAbs.left,i=e+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,o=t.left,a=o+t.width,r=t.top,h=r+t.height,l=this.offset.click.top,c=this.offset.click.left,u="x"===this.options.axis||s+l>r&&h>s+l,d="y"===this.options.axis||e+c>o&&a>e+c,p=u&&d;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>t[this.floating?"width":"height"]?p:e+this.helperProportions.width/2>o&&a>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&h>n-this.helperProportions.height/2},_intersectsWithPointer:function(t){var i="x"===this.options.axis||e(this.positionAbs.top+this.offset.click.top,t.top,t.height),s="y"===this.options.axis||e(this.positionAbs.left+this.offset.click.left,t.left,t.width),n=i&&s,o=this._getDragVerticalDirection(),a=this._getDragHorizontalDirection();return n?this.floating?a&&"right"===a||"down"===o?2:1:o&&("down"===o?2:1):!1},_intersectsWithSides:function(t){var i=e(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),s=e(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),n=this._getDragVerticalDirection(),o=this._getDragHorizontalDirection();return this.floating&&o?"right"===o&&s||"left"===o&&!s:n&&("down"===n&&i||"up"===n&&!i)},_getDragVerticalDirection:function(){var t=this.positionAbs.top-this.lastPositionAbs.top;return 0!==t&&(t>0?"down":"up")},_getDragHorizontalDirection:function(){var t=this.positionAbs.left-this.lastPositionAbs.left;return 0!==t&&(t>0?"right":"left")},refresh:function(t){return this._refreshItems(t),this.refreshPositions(),this},_connectWith:function(){var t=this.options;return t.connectWith.constructor===String?[t.connectWith]:t.connectWith},_getItemsAsjQuery:function(e){var i,s,n,o,a=[],r=[],h=this._connectWith();if(h&&e)for(i=h.length-1;i>=0;i--)for(n=t(h[i]),s=n.length-1;s>=0;s--)o=t.data(n[s],this.widgetFullName),o&&o!==this&&!o.options.disabled&&r.push([t.isFunction(o.options.items)?o.options.items.call(o.element):t(o.options.items,o.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),o]);for(r.push([t.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):t(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),i=r.length-1;i>=0;i--)r[i][0].each(function(){a.push(this)});return t(a)},_removeCurrentsFromItems:function(){var e=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=t.grep(this.items,function(t){for(var i=0;e.length>i;i++)if(e[i]===t.item[0])return!1;return!0})},_refreshItems:function(e){this.items=[],this.containers=[this];var i,s,n,o,a,r,h,l,c=this.items,u=[[t.isFunction(this.options.items)?this.options.items.call(this.element[0],e,{item:this.currentItem}):t(this.options.items,this.element),this]],d=this._connectWith();if(d&&this.ready)for(i=d.length-1;i>=0;i--)for(n=t(d[i]),s=n.length-1;s>=0;s--)o=t.data(n[s],this.widgetFullName),o&&o!==this&&!o.options.disabled&&(u.push([t.isFunction(o.options.items)?o.options.items.call(o.element[0],e,{item:this.currentItem}):t(o.options.items,o.element),o]),this.containers.push(o));for(i=u.length-1;i>=0;i--)for(a=u[i][1],r=u[i][0],s=0,l=r.length;l>s;s++)h=t(r[s]),h.data(this.widgetName+"-item",a),c.push({item:h,instance:a,width:0,height:0,left:0,top:0})},refreshPositions:function(e){this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,o;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?t(this.options.toleranceElement,s.item):s.item,e||(s.width=n.outerWidth(),s.height=n.outerHeight()),o=n.offset(),s.left=o.left,s.top=o.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)o=this.containers[i].element.offset(),this.containers[i].containerCache.left=o.left,this.containers[i].containerCache.top=o.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(e){e=e||this;var i,s=e.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=e.currentItem[0].nodeName.toLowerCase(),n=t("<"+s+">",e.document[0]).addClass(i||e.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper");return"tr"===s?e.currentItem.children().each(function(){t("<td>&#160;</td>",e.document[0]).attr("colspan",t(this).attr("colspan")||1).appendTo(n)}):"img"===s&&n.attr("src",e.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(t,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(e.currentItem.innerHeight()-parseInt(e.currentItem.css("paddingTop")||0,10)-parseInt(e.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(e.currentItem.innerWidth()-parseInt(e.currentItem.css("paddingLeft")||0,10)-parseInt(e.currentItem.css("paddingRight")||0,10)))}}),e.placeholder=t(s.placeholder.element.call(e.element,e.currentItem)),e.currentItem.after(e.placeholder),s.placeholder.update(e,e.placeholder)},_contactContainers:function(s){var n,o,a,r,h,l,c,u,d,p,f=null,g=null;for(n=this.containers.length-1;n>=0;n--)if(!t.contains(this.currentItem[0],this.containers[n].element[0]))if(this._intersectsWith(this.containers[n].containerCache)){if(f&&t.contains(this.containers[n].element[0],f.element[0]))continue;f=this.containers[n],g=n}else this.containers[n].containerCache.over&&(this.containers[n]._trigger("out",s,this._uiHash(this)),this.containers[n].containerCache.over=0);if(f)if(1===this.containers.length)this.containers[g].containerCache.over||(this.containers[g]._trigger("over",s,this._uiHash(this)),this.containers[g].containerCache.over=1);else{for(a=1e4,r=null,p=f.floating||i(this.currentItem),h=p?"left":"top",l=p?"width":"height",c=this.positionAbs[h]+this.offset.click[h],o=this.items.length-1;o>=0;o--)t.contains(this.containers[g].element[0],this.items[o].item[0])&&this.items[o].item[0]!==this.currentItem[0]&&(!p||e(this.positionAbs.top+this.offset.click.top,this.items[o].top,this.items[o].height))&&(u=this.items[o].item.offset()[h],d=!1,Math.abs(u-c)>Math.abs(u+this.items[o][l]-c)&&(d=!0,u+=this.items[o][l]),a>Math.abs(u-c)&&(a=Math.abs(u-c),r=this.items[o],this.direction=d?"up":"down"));if(!r&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[g])return;r?this._rearrange(s,r,null,!0):this._rearrange(s,null,this.containers[g].element,!0),this._trigger("change",s,this._uiHash()),this.containers[g]._trigger("change",s,this._uiHash(this)),this.currentContainer=this.containers[g],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[g]._trigger("over",s,this._uiHash(this)),this.containers[g].containerCache.over=1}},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||t("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===document.body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.currentItem.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,t("document"===n.containment?document:window).width()-this.helperProportions.width-this.margins.left,(t("document"===n.containment?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(e=t(n.containment)[0],i=t(n.containment).offset(),s="hidden"!==t(e).css("overflow"),this.containment=[i.left+(parseInt(t(e).css("borderLeftWidth"),10)||0)+(parseInt(t(e).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(t(e).css("borderTopWidth"),10)||0)+(parseInt(t(e).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(e.scrollWidth,e.offsetWidth):e.offsetWidth)-(parseInt(t(e).css("borderLeftWidth"),10)||0)-(parseInt(t(e).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(e.scrollHeight,e.offsetHeight):e.offsetHeight)-(parseInt(t(e).css("borderTopWidth"),10)||0)-(parseInt(t(e).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():o?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():o?0:n.scrollLeft())*s}},_generatePosition:function(e){var i,s,n=this.options,o=e.pageX,a=e.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==document&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==document&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(e.pageX-this.offset.click.left<this.containment[0]&&(o=this.containment[0]+this.offset.click.left),e.pageY-this.offset.click.top<this.containment[1]&&(a=this.containment[1]+this.offset.click.top),e.pageX-this.offset.click.left>this.containment[2]&&(o=this.containment[2]+this.offset.click.left),e.pageY-this.offset.click.top>this.containment[3]&&(a=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((a-this.originalPageY)/n.grid[1])*n.grid[1],a=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((o-this.originalPageX)/n.grid[0])*n.grid[0],o=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:a-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():h?0:r.scrollTop()),left:o-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():h?0:r.scrollLeft())}},_rearrange:function(t,e,i,s){i?i[0].appendChild(this.placeholder[0]):e.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?e.item[0]:e.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){this.reverting=!1;var i,s=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(i in this._storedCSS)("auto"===this._storedCSS[i]||"static"===this._storedCSS[i])&&(this._storedCSS[i]="");this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!e&&s.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||s.push(function(t){this._trigger("update",t,this._uiHash())}),this!==this.currentContainer&&(e||(s.push(function(t){this._trigger("remove",t,this._uiHash())}),s.push(function(t){return function(e){t._trigger("receive",e,this._uiHash(this))}}.call(this,this.currentContainer)),s.push(function(t){return function(e){t._trigger("update",e,this._uiHash(this))}}.call(this,this.currentContainer)))),i=this.containers.length-1;i>=0;i--)e||s.push(function(t){return function(e){t._trigger("deactivate",e,this._uiHash(this))}}.call(this,this.containers[i])),this.containers[i].containerCache.over&&(s.push(function(t){return function(e){t._trigger("out",e,this._uiHash(this))}}.call(this,this.containers[i])),this.containers[i].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,this.cancelHelperRemoval){if(!e){for(this._trigger("beforeStop",t,this._uiHash()),i=0;s.length>i;i++)s[i].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!1}if(e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null,!e){for(i=0;s.length>i;i++)s[i].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!0},_trigger:function(){t.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(e){var i=e||this;return{helper:i.helper,placeholder:i.placeholder||t([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:e?e.element:null}}})}(jQuery),function(t,e){var i="ui-effects-";t.effects={effect:{}},function(t,e){function i(t,e,i){var s=u[e.type]||{};return null==t?i||!e.def?null:e.def:(t=s.floor?~~t:parseFloat(t),isNaN(t)?e.def:s.mod?(t+s.mod)%s.mod:0>t?0:t>s.max?s.max:t)}function s(i){var s=l(),n=s._rgba=[];return i=i.toLowerCase(),f(h,function(t,o){var a,r=o.re.exec(i),h=r&&o.parse(r),l=o.space||"rgba";return h?(a=s[l](h),s[c[l].cache]=a[c[l].cache],n=s._rgba=a._rgba,!1):e}),n.length?("0,0,0,0"===n.join()&&t.extend(n,o.transparent),s):o[i]}function n(t,e,i){return i=(i+1)%1,1>6*i?t+6*(e-t)*i:1>2*i?e:2>3*i?t+6*(e-t)*(2/3-i):t}var o,a="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,h=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[t[1],t[2],t[3],t[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[2.55*t[1],2.55*t[2],2.55*t[3],t[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(t){return[parseInt(t[1],16),parseInt(t[2],16),parseInt(t[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(t){return[parseInt(t[1]+t[1],16),parseInt(t[2]+t[2],16),parseInt(t[3]+t[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(t){return[t[1],t[2]/100,t[3]/100,t[4]]}}],l=t.Color=function(e,i,s,n){return new t.Color.fn.parse(e,i,s,n)},c={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},u={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},d=l.support={},p=t("<p>")[0],f=t.each;p.style.cssText="background-color:rgba(1,1,1,.5)",d.rgba=p.style.backgroundColor.indexOf("rgba")>-1,f(c,function(t,e){e.cache="_"+t,e.props.alpha={idx:3,type:"percent",def:1}}),l.fn=t.extend(l.prototype,{parse:function(n,a,r,h){if(n===e)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=t(n).css(a),a=e);var u=this,d=t.type(n),p=this._rgba=[];return a!==e&&(n=[n,a,r,h],d="array"),"string"===d?this.parse(s(n)||o._default):"array"===d?(f(c.rgba.props,function(t,e){p[e.idx]=i(n[e.idx],e)}),this):"object"===d?(n instanceof l?f(c,function(t,e){n[e.cache]&&(u[e.cache]=n[e.cache].slice())}):f(c,function(e,s){var o=s.cache;f(s.props,function(t,e){if(!u[o]&&s.to){if("alpha"===t||null==n[t])return;u[o]=s.to(u._rgba)}u[o][e.idx]=i(n[t],e,!0)}),u[o]&&0>t.inArray(null,u[o].slice(0,3))&&(u[o][3]=1,s.from&&(u._rgba=s.from(u[o])))}),this):e},is:function(t){var i=l(t),s=!0,n=this;return f(c,function(t,o){var a,r=i[o.cache];return r&&(a=n[o.cache]||o.to&&o.to(n._rgba)||[],f(o.props,function(t,i){return null!=r[i.idx]?s=r[i.idx]===a[i.idx]:e})),s}),s},_space:function(){var t=[],e=this;return f(c,function(i,s){e[s.cache]&&t.push(i)}),t.pop()},transition:function(t,e){var s=l(t),n=s._space(),o=c[n],a=0===this.alpha()?l("transparent"):this,r=a[o.cache]||o.to(a._rgba),h=r.slice();return s=s[o.cache],f(o.props,function(t,n){var o=n.idx,a=r[o],l=s[o],c=u[n.type]||{};null!==l&&(null===a?h[o]=l:(c.mod&&(l-a>c.mod/2?a+=c.mod:a-l>c.mod/2&&(a-=c.mod)),h[o]=i((l-a)*e+a,n)))}),this[n](h)},blend:function(e){if(1===this._rgba[3])return this;var i=this._rgba.slice(),s=i.pop(),n=l(e)._rgba;return l(t.map(i,function(t,e){return(1-s)*n[e]+s*t}))},toRgbaString:function(){var e="rgba(",i=t.map(this._rgba,function(t,e){return null==t?e>2?1:0:t});return 1===i[3]&&(i.pop(),e="rgb("),e+i.join()+")"},toHslaString:function(){var e="hsla(",i=t.map(this.hsla(),function(t,e){return null==t&&(t=e>2?1:0),e&&3>e&&(t=Math.round(100*t)+"%"),t});return 1===i[3]&&(i.pop(),e="hsl("),e+i.join()+")"},toHexString:function(e){var i=this._rgba.slice(),s=i.pop();return e&&i.push(~~(255*s)),"#"+t.map(i,function(t){return t=(t||0).toString(16),1===t.length?"0"+t:t}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),l.fn.parse.prototype=l.fn,c.hsla.to=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e,i,s=t[0]/255,n=t[1]/255,o=t[2]/255,a=t[3],r=Math.max(s,n,o),h=Math.min(s,n,o),l=r-h,c=r+h,u=.5*c;return e=h===r?0:s===r?60*(n-o)/l+360:n===r?60*(o-s)/l+120:60*(s-n)/l+240,i=0===l?0:.5>=u?l/c:l/(2-c),[Math.round(e)%360,i,u,null==a?1:a]},c.hsla.from=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e=t[0]/360,i=t[1],s=t[2],o=t[3],a=.5>=s?s*(1+i):s+i-s*i,r=2*s-a;return[Math.round(255*n(r,a,e+1/3)),Math.round(255*n(r,a,e)),Math.round(255*n(r,a,e-1/3)),o]},f(c,function(s,n){var o=n.props,a=n.cache,h=n.to,c=n.from;l.fn[s]=function(s){if(h&&!this[a]&&(this[a]=h(this._rgba)),s===e)return this[a].slice();var n,r=t.type(s),u="array"===r||"object"===r?s:arguments,d=this[a].slice();return f(o,function(t,e){var s=u["object"===r?t:e.idx];null==s&&(s=d[e.idx]),d[e.idx]=i(s,e)}),c?(n=l(c(d)),n[a]=d,n):l(d)},f(o,function(e,i){l.fn[e]||(l.fn[e]=function(n){var o,a=t.type(n),h="alpha"===e?this._hsla?"hsla":"rgba":s,l=this[h](),c=l[i.idx];return"undefined"===a?c:("function"===a&&(n=n.call(this,c),a=t.type(n)),null==n&&i.empty?this:("string"===a&&(o=r.exec(n),o&&(n=c+parseFloat(o[2])*("+"===o[1]?1:-1))),l[i.idx]=n,this[h](l)))})})}),l.hook=function(e){var i=e.split(" ");f(i,function(e,i){t.cssHooks[i]={set:function(e,n){var o,a,r="";if("transparent"!==n&&("string"!==t.type(n)||(o=s(n)))){if(n=l(o||n),!d.rgba&&1!==n._rgba[3]){for(a="backgroundColor"===i?e.parentNode:e;(""===r||"transparent"===r)&&a&&a.style;)try{r=t.css(a,"backgroundColor"),a=a.parentNode}catch(h){}n=n.blend(r&&"transparent"!==r?r:"_default")}n=n.toRgbaString()}try{e.style[i]=n}catch(h){}}},t.fx.step[i]=function(e){e.colorInit||(e.start=l(e.elem,i),e.end=l(e.end),e.colorInit=!0),t.cssHooks[i].set(e.elem,e.start.transition(e.end,e.pos))}})},l.hook(a),t.cssHooks.borderColor={expand:function(t){var e={};return f(["Top","Right","Bottom","Left"],function(i,s){e["border"+s+"Color"]=t}),e}},o=t.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(jQuery),function(){function i(e){var i,s,n=e.ownerDocument.defaultView?e.ownerDocument.defaultView.getComputedStyle(e,null):e.currentStyle,o={};if(n&&n.length&&n[0]&&n[n[0]])for(s=n.length;s--;)i=n[s],"string"==typeof n[i]&&(o[t.camelCase(i)]=n[i]);else for(i in n)"string"==typeof n[i]&&(o[i]=n[i]);return o}function s(e,i){var s,n,a={};for(s in i)n=i[s],e[s]!==n&&(o[s]||(t.fx.step[s]||!isNaN(parseFloat(n)))&&(a[s]=n));return a}var n=["add","remove","toggle"],o={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};t.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(e,i){t.fx.step[i]=function(t){("none"!==t.end&&!t.setAttr||1===t.pos&&!t.setAttr)&&(jQuery.style(t.elem,i,t.end),t.setAttr=!0)}}),t.fn.addBack||(t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.effects.animateClass=function(e,o,a,r){var h=t.speed(o,a,r);return this.queue(function(){var o,a=t(this),r=a.attr("class")||"",l=h.children?a.find("*").addBack():a;l=l.map(function(){var e=t(this);return{el:e,start:i(this)}}),o=function(){t.each(n,function(t,i){e[i]&&a[i+"Class"](e[i])})},o(),l=l.map(function(){return this.end=i(this.el[0]),this.diff=s(this.start,this.end),this}),a.attr("class",r),l=l.map(function(){var e=this,i=t.Deferred(),s=t.extend({},h,{queue:!1,complete:function(){i.resolve(e)}});return this.el.animate(this.diff,s),i.promise()}),t.when.apply(t,l.get()).done(function(){o(),t.each(arguments,function(){var e=this.el;t.each(this.diff,function(t){e.css(t,"")})}),h.complete.call(a[0])})})},t.fn.extend({addClass:function(e){return function(i,s,n,o){return s?t.effects.animateClass.call(this,{add:i},s,n,o):e.apply(this,arguments)}}(t.fn.addClass),removeClass:function(e){return function(i,s,n,o){return arguments.length>1?t.effects.animateClass.call(this,{remove:i},s,n,o):e.apply(this,arguments)}}(t.fn.removeClass),toggleClass:function(i){return function(s,n,o,a,r){return"boolean"==typeof n||n===e?o?t.effects.animateClass.call(this,n?{add:s}:{remove:s},o,a,r):i.apply(this,arguments):t.effects.animateClass.call(this,{toggle:s},n,o,a)}}(t.fn.toggleClass),switchClass:function(e,i,s,n,o){return t.effects.animateClass.call(this,{add:i,remove:e},s,n,o)}})}(),function(){function s(e,i,s,n){return t.isPlainObject(e)&&(i=e,e=e.effect),e={effect:e},null==i&&(i={}),t.isFunction(i)&&(n=i,s=null,i={}),("number"==typeof i||t.fx.speeds[i])&&(n=s,s=i,i={}),t.isFunction(s)&&(n=s,s=null),i&&t.extend(e,i),s=s||i.duration,e.duration=t.fx.off?0:"number"==typeof s?s:s in t.fx.speeds?t.fx.speeds[s]:t.fx.speeds._default,e.complete=n||i.complete,e}function n(e){return!e||"number"==typeof e||t.fx.speeds[e]?!0:"string"!=typeof e||t.effects.effect[e]?t.isFunction(e)?!0:"object"!=typeof e||e.effect?!1:!0:!0}t.extend(t.effects,{version:"1.10.3",save:function(t,e){for(var s=0;e.length>s;s++)null!==e[s]&&t.data(i+e[s],t[0].style[e[s]])},restore:function(t,s){var n,o;for(o=0;s.length>o;o++)null!==s[o]&&(n=t.data(i+s[o]),n===e&&(n=""),t.css(s[o],n))},setMode:function(t,e){return"toggle"===e&&(e=t.is(":hidden")?"show":"hide"),e},getBaseline:function(t,e){var i,s;switch(t[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=t[0]/e.height}switch(t[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=t[1]/e.width}return{x:s,y:i}},createWrapper:function(e){if(e.parent().is(".ui-effects-wrapper"))return e.parent();var i={width:e.outerWidth(!0),height:e.outerHeight(!0),"float":e.css("float")},s=t("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),n={width:e.width(),height:e.height()},o=document.activeElement;try{o.id}catch(a){o=document.body}return e.wrap(s),(e[0]===o||t.contains(e[0],o))&&t(o).focus(),s=e.parent(),"static"===e.css("position")?(s.css({position:"relative"}),e.css({position:"relative"})):(t.extend(i,{position:e.css("position"),zIndex:e.css("z-index")}),t.each(["top","left","bottom","right"],function(t,s){i[s]=e.css(s),isNaN(parseInt(i[s],10))&&(i[s]="auto")}),e.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),e.css(n),s.css(i).show()},removeWrapper:function(e){var i=document.activeElement;return e.parent().is(".ui-effects-wrapper")&&(e.parent().replaceWith(e),(e[0]===i||t.contains(e[0],i))&&t(i).focus()),e},setTransition:function(e,i,s,n){return n=n||{},t.each(i,function(t,i){var o=e.cssUnit(i);o[0]>0&&(n[i]=o[0]*s+o[1])}),n}}),t.fn.extend({effect:function(){function e(e){function s(){t.isFunction(o)&&o.call(n[0]),t.isFunction(e)&&e()}var n=t(this),o=i.complete,r=i.mode;(n.is(":hidden")?"hide"===r:"show"===r)?(n[r](),s()):a.call(n[0],i,s)}var i=s.apply(this,arguments),n=i.mode,o=i.queue,a=t.effects.effect[i.effect];return t.fx.off||!a?n?this[n](i.duration,i.complete):this.each(function(){i.complete&&i.complete.call(this)}):o===!1?this.each(e):this.queue(o||"fx",e)},show:function(t){return function(e){if(n(e))return t.apply(this,arguments);var i=s.apply(this,arguments);return i.mode="show",this.effect.call(this,i)}}(t.fn.show),hide:function(t){return function(e){if(n(e))return t.apply(this,arguments);var i=s.apply(this,arguments);return i.mode="hide",this.effect.call(this,i)}}(t.fn.hide),toggle:function(t){return function(e){if(n(e)||"boolean"==typeof e)return t.apply(this,arguments);var i=s.apply(this,arguments);return i.mode="toggle",this.effect.call(this,i)}}(t.fn.toggle),cssUnit:function(e){var i=this.css(e),s=[];return t.each(["em","px","%","pt"],function(t,e){i.indexOf(e)>0&&(s=[parseFloat(i),e])}),s}})}(),function(){var e={};t.each(["Quad","Cubic","Quart","Quint","Expo"],function(t,i){e[i]=function(e){return Math.pow(e,t+2)}}),t.extend(e,{Sine:function(t){return 1-Math.cos(t*Math.PI/2)},Circ:function(t){return 1-Math.sqrt(1-t*t)},Elastic:function(t){return 0===t||1===t?t:-Math.pow(2,8*(t-1))*Math.sin((80*(t-1)-7.5)*Math.PI/15)},Back:function(t){return t*t*(3*t-2)},Bounce:function(t){for(var e,i=4;((e=Math.pow(2,--i))-1)/11>t;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*e-2)/22-t,2)}}),t.each(e,function(e,i){t.easing["easeIn"+e]=i,t.easing["easeOut"+e]=function(t){return 1-i(1-t)},t.easing["easeInOut"+e]=function(t){return.5>t?i(2*t)/2:1-i(-2*t+2)/2}})}()}(jQuery),function(t){var e=0,i={},s={};i.height=i.paddingTop=i.paddingBottom=i.borderTopWidth=i.borderBottomWidth="hide",s.height=s.paddingTop=s.paddingBottom=s.borderTopWidth=s.borderBottomWidth="show",t.widget("ui.accordion",{version:"1.10.3",options:{active:0,animate:{},collapsible:!1,event:"click",header:"> li > :first-child,> :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},_create:function(){var e=this.options;this.prevShow=this.prevHide=t(),this.element.addClass("ui-accordion ui-widget ui-helper-reset").attr("role","tablist"),e.collapsible||e.active!==!1&&null!=e.active||(e.active=0),this._processPanels(),0>e.active&&(e.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():t(),content:this.active.length?this.active.next():t()}},_createIcons:function(){var e=this.options.icons;e&&(t("<span>").addClass("ui-accordion-header-icon ui-icon "+e.header).prependTo(this.headers),this.active.children(".ui-accordion-header-icon").removeClass(e.header).addClass(e.activeHeader),this.headers.addClass("ui-accordion-icons"))
+},_destroyIcons:function(){this.headers.removeClass("ui-accordion-icons").children(".ui-accordion-header-icon").remove()},_destroy:function(){var t;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role"),this.headers.removeClass("ui-accordion-header ui-accordion-header-active ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-selected").removeAttr("aria-controls").removeAttr("tabIndex").each(function(){/^ui-accordion/.test(this.id)&&this.removeAttribute("id")}),this._destroyIcons(),t=this.headers.next().css("display","").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-labelledby").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-state-disabled").each(function(){/^ui-accordion/.test(this.id)&&this.removeAttribute("id")}),"content"!==this.options.heightStyle&&t.css("height","")},_setOption:function(t,e){return"active"===t?(this._activate(e),undefined):("event"===t&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(e)),this._super(t,e),"collapsible"!==t||e||this.options.active!==!1||this._activate(0),"icons"===t&&(this._destroyIcons(),e&&this._createIcons()),"disabled"===t&&this.headers.add(this.headers.next()).toggleClass("ui-state-disabled",!!e),undefined)},_keydown:function(e){if(!e.altKey&&!e.ctrlKey){var i=t.ui.keyCode,s=this.headers.length,n=this.headers.index(e.target),o=!1;switch(e.keyCode){case i.RIGHT:case i.DOWN:o=this.headers[(n+1)%s];break;case i.LEFT:case i.UP:o=this.headers[(n-1+s)%s];break;case i.SPACE:case i.ENTER:this._eventHandler(e);break;case i.HOME:o=this.headers[0];break;case i.END:o=this.headers[s-1]}o&&(t(e.target).attr("tabIndex",-1),t(o).attr("tabIndex",0),o.focus(),e.preventDefault())}},_panelKeyDown:function(e){e.keyCode===t.ui.keyCode.UP&&e.ctrlKey&&t(e.currentTarget).prev().focus()},refresh:function(){var e=this.options;this._processPanels(),e.active===!1&&e.collapsible===!0||!this.headers.length?(e.active=!1,this.active=t()):e.active===!1?this._activate(0):this.active.length&&!t.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(e.active=!1,this.active=t()):this._activate(Math.max(0,e.active-1)):e.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){this.headers=this.element.find(this.options.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all"),this.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom").filter(":not(.ui-accordion-content-active)").hide()},_refresh:function(){var i,s=this.options,n=s.heightStyle,o=this.element.parent(),a=this.accordionId="ui-accordion-"+(this.element.attr("id")||++e);this.active=this._findActive(s.active).addClass("ui-accordion-header-active ui-state-active ui-corner-top").removeClass("ui-corner-all"),this.active.next().addClass("ui-accordion-content-active").show(),this.headers.attr("role","tab").each(function(e){var i=t(this),s=i.attr("id"),n=i.next(),o=n.attr("id");s||(s=a+"-header-"+e,i.attr("id",s)),o||(o=a+"-panel-"+e,n.attr("id",o)),i.attr("aria-controls",o),n.attr("aria-labelledby",s)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false",tabIndex:-1}).next().attr({"aria-expanded":"false","aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true",tabIndex:0}).next().attr({"aria-expanded":"true","aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(s.event),"fill"===n?(i=o.height(),this.element.siblings(":visible").each(function(){var e=t(this),s=e.css("position");"absolute"!==s&&"fixed"!==s&&(i-=e.outerHeight(!0))}),this.headers.each(function(){i-=t(this).outerHeight(!0)}),this.headers.next().each(function(){t(this).height(Math.max(0,i-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===n&&(i=0,this.headers.next().each(function(){i=Math.max(i,t(this).css("height","").height())}).height(i))},_activate:function(e){var i=this._findActive(e)[0];i!==this.active[0]&&(i=i||this.active[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return"number"==typeof e?this.headers.eq(e):t()},_setupEvents:function(e){var i={keydown:"_keydown"};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(e){var i=this.options,s=this.active,n=t(e.currentTarget),o=n[0]===s[0],a=o&&i.collapsible,r=a?t():n.next(),h=s.next(),l={oldHeader:s,oldPanel:h,newHeader:a?t():n,newPanel:r};e.preventDefault(),o&&!i.collapsible||this._trigger("beforeActivate",e,l)===!1||(i.active=a?!1:this.headers.index(n),this.active=o?t():n,this._toggle(l),s.removeClass("ui-accordion-header-active ui-state-active"),i.icons&&s.children(".ui-accordion-header-icon").removeClass(i.icons.activeHeader).addClass(i.icons.header),o||(n.removeClass("ui-corner-all").addClass("ui-accordion-header-active ui-state-active ui-corner-top"),i.icons&&n.children(".ui-accordion-header-icon").removeClass(i.icons.header).addClass(i.icons.activeHeader),n.next().addClass("ui-accordion-content-active")))},_toggle:function(e){var i=e.newPanel,s=this.prevShow.length?this.prevShow:e.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=i,this.prevHide=s,this.options.animate?this._animate(i,s,e):(s.hide(),i.show(),this._toggleComplete(e)),s.attr({"aria-expanded":"false","aria-hidden":"true"}),s.prev().attr("aria-selected","false"),i.length&&s.length?s.prev().attr("tabIndex",-1):i.length&&this.headers.filter(function(){return 0===t(this).attr("tabIndex")}).attr("tabIndex",-1),i.attr({"aria-expanded":"true","aria-hidden":"false"}).prev().attr({"aria-selected":"true",tabIndex:0})},_animate:function(t,e,n){var o,a,r,h=this,l=0,c=t.length&&(!e.length||t.index()<e.index()),u=this.options.animate||{},d=c&&u.down||u,p=function(){h._toggleComplete(n)};return"number"==typeof d&&(r=d),"string"==typeof d&&(a=d),a=a||d.easing||u.easing,r=r||d.duration||u.duration,e.length?t.length?(o=t.show().outerHeight(),e.animate(i,{duration:r,easing:a,step:function(t,e){e.now=Math.round(t)}}),t.hide().animate(s,{duration:r,easing:a,complete:p,step:function(t,i){i.now=Math.round(t),"height"!==i.prop?l+=i.now:"content"!==h.options.heightStyle&&(i.now=Math.round(o-e.outerHeight()-l),l=0)}}),undefined):e.animate(i,r,a,p):t.animate(s,r,a,p)},_toggleComplete:function(t){var e=t.oldPanel;e.removeClass("ui-accordion-content-active").prev().removeClass("ui-corner-top").addClass("ui-corner-all"),e.length&&(e.parent()[0].className=e.parent()[0].className),this._trigger("activate",null,t)}})}(jQuery),function(t){var e=0;t.widget("ui.autocomplete",{version:"1.10.3",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},pending:0,_create:function(){var e,i,s,n=this.element[0].nodeName.toLowerCase(),o="textarea"===n,a="input"===n;this.isMultiLine=o?!0:a?!1:this.element.prop("isContentEditable"),this.valueMethod=this.element[o||a?"val":"text"],this.isNewMenu=!0,this.element.addClass("ui-autocomplete-input").attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return e=!0,s=!0,i=!0,undefined;e=!1,s=!1,i=!1;var o=t.ui.keyCode;switch(n.keyCode){case o.PAGE_UP:e=!0,this._move("previousPage",n);break;case o.PAGE_DOWN:e=!0,this._move("nextPage",n);break;case o.UP:e=!0,this._keyEvent("previous",n);break;case o.DOWN:e=!0,this._keyEvent("next",n);break;case o.ENTER:case o.NUMPAD_ENTER:this.menu.active&&(e=!0,n.preventDefault(),this.menu.select(n));break;case o.TAB:this.menu.active&&this.menu.select(n);break;case o.ESCAPE:this.menu.element.is(":visible")&&(this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(e)return e=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),undefined;if(!i){var n=t.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(t){return s?(s=!1,t.preventDefault(),undefined):(this._searchTimeout(t),undefined)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,undefined):(clearTimeout(this.searching),this.close(t),this._change(t),undefined)}}),this._initSource(),this.menu=t("<ul>").addClass("ui-autocomplete ui-front").appendTo(this._appendTo()).menu({role:null}).hide().data("ui-menu"),this._on(this.menu.element,{mousedown:function(e){e.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur});var i=this.menu.element[0];t(e.target).closest(".ui-menu-item").length||this._delay(function(){var e=this;this.document.one("mousedown",function(s){s.target===e.element[0]||s.target===i||t.contains(i,s.target)||e.close()})})},menufocus:function(e,i){if(this.isNewMenu&&(this.isNewMenu=!1,e.originalEvent&&/^mouse/.test(e.originalEvent.type)))return this.menu.blur(),this.document.one("mousemove",function(){t(e.target).trigger(e.originalEvent)}),undefined;var s=i.item.data("ui-autocomplete-item");!1!==this._trigger("focus",e,{item:s})?e.originalEvent&&/^key/.test(e.originalEvent.type)&&this._value(s.value):this.liveRegion.text(s.value)},menuselect:function(t,e){var i=e.item.data("ui-autocomplete-item"),s=this.previous;this.element[0]!==this.document[0].activeElement&&(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s,this.selectedItem=i})),!1!==this._trigger("select",t,{item:i})&&this._value(i.value),this.term=this._value(),this.close(t),this.selectedItem=i}}),this.liveRegion=t("<span>",{role:"status","aria-live":"polite"}).addClass("ui-helper-hidden-accessible").insertBefore(this.element),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(t,e){this._super(t,e),"source"===t&&this._initSource(),"appendTo"===t&&this.menu.element.appendTo(this._appendTo()),"disabled"===t&&e&&this.xhr&&this.xhr.abort()},_appendTo:function(){var e=this.options.appendTo;return e&&(e=e.jquery||e.nodeType?t(e):this.document.find(e).eq(0)),e||(e=this.element.closest(".ui-front")),e.length||(e=this.document[0].body),e},_initSource:function(){var e,i,s=this;t.isArray(this.options.source)?(e=this.options.source,this.source=function(i,s){s(t.ui.autocomplete.filter(e,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(e,n){s.xhr&&s.xhr.abort(),s.xhr=t.ajax({url:i,data:e,dataType:"json",success:function(t){n(t)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(t){clearTimeout(this.searching),this.searching=this._delay(function(){this.term!==this._value()&&(this.selectedItem=null,this.search(null,t))},this.options.delay)},search:function(t,e){return t=null!=t?t:this._value(),this.term=this._value(),t.length<this.options.minLength?this.close(e):this._trigger("search",e)!==!1?this._search(t):undefined},_search:function(t){this.pending++,this.element.addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:t},this._response())},_response:function(){var t=this,i=++e;return function(s){i===e&&t.__response(s),t.pending--,t.pending||t.element.removeClass("ui-autocomplete-loading")}},__response:function(t){t&&(t=this._normalize(t)),this._trigger("response",null,{content:t}),!this.options.disabled&&t&&t.length&&!this.cancelSearch?(this._suggest(t),this._trigger("open")):this._close()},close:function(t){this.cancelSearch=!0,this._close(t)},_close:function(t){this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",t))},_change:function(t){this.previous!==this._value()&&this._trigger("change",t,{item:this.selectedItem})},_normalize:function(e){return e.length&&e[0].label&&e[0].value?e:t.map(e,function(e){return"string"==typeof e?{label:e,value:e}:t.extend({label:e.label||e.value,value:e.value||e.label},e)})},_suggest:function(e){var i=this.menu.element.empty();this._renderMenu(i,e),this.isNewMenu=!0,this.menu.refresh(),i.show(),this._resizeMenu(),i.position(t.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next()},_resizeMenu:function(){var t=this.menu.element;t.outerWidth(Math.max(t.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(e,i){var s=this;t.each(i,function(t,i){s._renderItemData(e,i)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-autocomplete-item",e)},_renderItem:function(e,i){return t("<li>").append(t("<a>").text(i.label)).appendTo(e)},_move:function(t,e){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(t)||this.menu.isLastItem()&&/^next/.test(t)?(this._value(this.term),this.menu.blur(),undefined):(this.menu[t](e),undefined):(this.search(null,e),undefined)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(t,e){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(t,e),e.preventDefault())}}),t.extend(t.ui.autocomplete,{escapeRegex:function(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(e,i){var s=RegExp(t.ui.autocomplete.escapeRegex(i),"i");return t.grep(e,function(t){return s.test(t.label||t.value||t)})}}),t.widget("ui.autocomplete",t.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(t){return t+(t>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(t){var e;this._superApply(arguments),this.options.disabled||this.cancelSearch||(e=t&&t.length?this.options.messages.results(t.length):this.options.messages.noResults,this.liveRegion.text(e))}})}(jQuery),function(t){var e,i,s,n,o="ui-button ui-widget ui-state-default ui-corner-all",a="ui-state-hover ui-state-active ",r="ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",h=function(){var e=t(this);setTimeout(function(){e.find(":ui-button").button("refresh")},1)},l=function(e){var i=e.name,s=e.form,n=t([]);return i&&(i=i.replace(/'/g,"\\'"),n=s?t(s).find("[name='"+i+"']"):t("[name='"+i+"']",e.ownerDocument).filter(function(){return!this.form})),n};t.widget("ui.button",{version:"1.10.3",defaultElement:"<button>",options:{disabled:null,text:!0,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset"+this.eventNamespace).bind("reset"+this.eventNamespace,h),"boolean"!=typeof this.options.disabled?this.options.disabled=!!this.element.prop("disabled"):this.element.prop("disabled",this.options.disabled),this._determineButtonType(),this.hasTitle=!!this.buttonElement.attr("title");var a=this,r=this.options,c="checkbox"===this.type||"radio"===this.type,u=c?"":"ui-state-active",d="ui-state-focus";null===r.label&&(r.label="input"===this.type?this.buttonElement.val():this.buttonElement.html()),this._hoverable(this.buttonElement),this.buttonElement.addClass(o).attr("role","button").bind("mouseenter"+this.eventNamespace,function(){r.disabled||this===e&&t(this).addClass("ui-state-active")}).bind("mouseleave"+this.eventNamespace,function(){r.disabled||t(this).removeClass(u)}).bind("click"+this.eventNamespace,function(t){r.disabled&&(t.preventDefault(),t.stopImmediatePropagation())}),this.element.bind("focus"+this.eventNamespace,function(){a.buttonElement.addClass(d)}).bind("blur"+this.eventNamespace,function(){a.buttonElement.removeClass(d)}),c&&(this.element.bind("change"+this.eventNamespace,function(){n||a.refresh()}),this.buttonElement.bind("mousedown"+this.eventNamespace,function(t){r.disabled||(n=!1,i=t.pageX,s=t.pageY)}).bind("mouseup"+this.eventNamespace,function(t){r.disabled||(i!==t.pageX||s!==t.pageY)&&(n=!0)})),"checkbox"===this.type?this.buttonElement.bind("click"+this.eventNamespace,function(){return r.disabled||n?!1:undefined}):"radio"===this.type?this.buttonElement.bind("click"+this.eventNamespace,function(){if(r.disabled||n)return!1;t(this).addClass("ui-state-active"),a.buttonElement.attr("aria-pressed","true");var e=a.element[0];l(e).not(e).map(function(){return t(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed","false")}):(this.buttonElement.bind("mousedown"+this.eventNamespace,function(){return r.disabled?!1:(t(this).addClass("ui-state-active"),e=this,a.document.one("mouseup",function(){e=null}),undefined)}).bind("mouseup"+this.eventNamespace,function(){return r.disabled?!1:(t(this).removeClass("ui-state-active"),undefined)}).bind("keydown"+this.eventNamespace,function(e){return r.disabled?!1:((e.keyCode===t.ui.keyCode.SPACE||e.keyCode===t.ui.keyCode.ENTER)&&t(this).addClass("ui-state-active"),undefined)}).bind("keyup"+this.eventNamespace+" blur"+this.eventNamespace,function(){t(this).removeClass("ui-state-active")}),this.buttonElement.is("a")&&this.buttonElement.keyup(function(e){e.keyCode===t.ui.keyCode.SPACE&&t(this).click()})),this._setOption("disabled",r.disabled),this._resetButton()},_determineButtonType:function(){var t,e,i;this.type=this.element.is("[type=checkbox]")?"checkbox":this.element.is("[type=radio]")?"radio":this.element.is("input")?"input":"button","checkbox"===this.type||"radio"===this.type?(t=this.element.parents().last(),e="label[for='"+this.element.attr("id")+"']",this.buttonElement=t.find(e),this.buttonElement.length||(t=t.length?t.siblings():this.element.siblings(),this.buttonElement=t.filter(e),this.buttonElement.length||(this.buttonElement=t.find(e))),this.element.addClass("ui-helper-hidden-accessible"),i=this.element.is(":checked"),i&&this.buttonElement.addClass("ui-state-active"),this.buttonElement.prop("aria-pressed",i)):this.buttonElement=this.element},widget:function(){return this.buttonElement},_destroy:function(){this.element.removeClass("ui-helper-hidden-accessible"),this.buttonElement.removeClass(o+" "+a+" "+r).removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html()),this.hasTitle||this.buttonElement.removeAttr("title")},_setOption:function(t,e){return this._super(t,e),"disabled"===t?(e?this.element.prop("disabled",!0):this.element.prop("disabled",!1),undefined):(this._resetButton(),undefined)},refresh:function(){var e=this.element.is("input, button")?this.element.is(":disabled"):this.element.hasClass("ui-button-disabled");e!==this.options.disabled&&this._setOption("disabled",e),"radio"===this.type?l(this.element[0]).each(function(){t(this).is(":checked")?t(this).button("widget").addClass("ui-state-active").attr("aria-pressed","true"):t(this).button("widget").removeClass("ui-state-active").attr("aria-pressed","false")}):"checkbox"===this.type&&(this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed","false"))},_resetButton:function(){if("input"===this.type)return this.options.label&&this.element.val(this.options.label),undefined;var e=this.buttonElement.removeClass(r),i=t("<span></span>",this.document[0]).addClass("ui-button-text").html(this.options.label).appendTo(e.empty()).text(),s=this.options.icons,n=s.primary&&s.secondary,o=[];s.primary||s.secondary?(this.options.text&&o.push("ui-button-text-icon"+(n?"s":s.primary?"-primary":"-secondary")),s.primary&&e.prepend("<span class='ui-button-icon-primary ui-icon "+s.primary+"'></span>"),s.secondary&&e.append("<span class='ui-button-icon-secondary ui-icon "+s.secondary+"'></span>"),this.options.text||(o.push(n?"ui-button-icons-only":"ui-button-icon-only"),this.hasTitle||e.attr("title",t.trim(i)))):o.push("ui-button-text-only"),e.addClass(o.join(" "))}}),t.widget("ui.buttonset",{version:"1.10.3",options:{items:"button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(t,e){"disabled"===t&&this.buttons.button("option",t,e),this._super(t,e)},refresh:function(){var e="rtl"===this.element.css("direction");this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return t(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(e?"ui-corner-right":"ui-corner-left").end().filter(":last").addClass(e?"ui-corner-left":"ui-corner-right").end().end()},_destroy:function(){this.element.removeClass("ui-buttonset"),this.buttons.map(function(){return t(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy")}})}(jQuery),function(t,e){function i(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},t.extend(this._defaults,this.regional[""]),this.dpDiv=s(t("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}function s(e){var i="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return e.delegate(i,"mouseout",function(){t(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).removeClass("ui-datepicker-next-hover")}).delegate(i,"mouseover",function(){t.datepicker._isDisabledDatepicker(o.inline?e.parent()[0]:o.input[0])||(t(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),t(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).addClass("ui-datepicker-next-hover"))})}function n(e,i){t.extend(e,i);for(var s in i)null==i[s]&&(e[s]=i[s]);return e}t.extend(t.ui,{datepicker:{version:"1.10.3"}});var o,a="datepicker";t.extend(i.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(t){return n(this._defaults,t||{}),this},_attachDatepicker:function(e,i){var s,n,o;s=e.nodeName.toLowerCase(),n="div"===s||"span"===s,e.id||(this.uuid+=1,e.id="dp"+this.uuid),o=this._newInst(t(e),n),o.settings=t.extend({},i||{}),"input"===s?this._connectDatepicker(e,o):n&&this._inlineDatepicker(e,o)},_newInst:function(e,i){var n=e[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1");return{id:n,input:e,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:i,dpDiv:i?s(t("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(e,i){var s=t(e);i.append=t([]),i.trigger=t([]),s.hasClass(this.markerClassName)||(this._attachments(s,i),s.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp),this._autoSize(i),t.data(e,a,i),i.settings.disabled&&this._disableDatepicker(e))},_attachments:function(e,i){var s,n,o,a=this._get(i,"appendText"),r=this._get(i,"isRTL");i.append&&i.append.remove(),a&&(i.append=t("<span class='"+this._appendClass+"'>"+a+"</span>"),e[r?"before":"after"](i.append)),e.unbind("focus",this._showDatepicker),i.trigger&&i.trigger.remove(),s=this._get(i,"showOn"),("focus"===s||"both"===s)&&e.focus(this._showDatepicker),("button"===s||"both"===s)&&(n=this._get(i,"buttonText"),o=this._get(i,"buttonImage"),i.trigger=t(this._get(i,"buttonImageOnly")?t("<img/>").addClass(this._triggerClass).attr({src:o,alt:n,title:n}):t("<button type='button'></button>").addClass(this._triggerClass).html(o?t("<img/>").attr({src:o,alt:n,title:n}):n)),e[r?"before":"after"](i.trigger),i.trigger.click(function(){return t.datepicker._datepickerShowing&&t.datepicker._lastInput===e[0]?t.datepicker._hideDatepicker():t.datepicker._datepickerShowing&&t.datepicker._lastInput!==e[0]?(t.datepicker._hideDatepicker(),t.datepicker._showDatepicker(e[0])):t.datepicker._showDatepicker(e[0]),!1}))},_autoSize:function(t){if(this._get(t,"autoSize")&&!t.inline){var e,i,s,n,o=new Date(2009,11,20),a=this._get(t,"dateFormat");a.match(/[DM]/)&&(e=function(t){for(i=0,s=0,n=0;t.length>n;n++)t[n].length>i&&(i=t[n].length,s=n);return s},o.setMonth(e(this._get(t,a.match(/MM/)?"monthNames":"monthNamesShort"))),o.setDate(e(this._get(t,a.match(/DD/)?"dayNames":"dayNamesShort"))+20-o.getDay())),t.input.attr("size",this._formatDate(t,o).length)}},_inlineDatepicker:function(e,i){var s=t(e);s.hasClass(this.markerClassName)||(s.addClass(this.markerClassName).append(i.dpDiv),t.data(e,a,i),this._setDate(i,this._getDefaultDate(i),!0),this._updateDatepicker(i),this._updateAlternate(i),i.settings.disabled&&this._disableDatepicker(e),i.dpDiv.css("display","block"))},_dialogDatepicker:function(e,i,s,o,r){var h,l,c,u,d,p=this._dialogInst;return p||(this.uuid+=1,h="dp"+this.uuid,this._dialogInput=t("<input type='text' id='"+h+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.keydown(this._doKeyDown),t("body").append(this._dialogInput),p=this._dialogInst=this._newInst(this._dialogInput,!1),p.settings={},t.data(this._dialogInput[0],a,p)),n(p.settings,o||{}),i=i&&i.constructor===Date?this._formatDate(p,i):i,this._dialogInput.val(i),this._pos=r?r.length?r:[r.pageX,r.pageY]:null,this._pos||(l=document.documentElement.clientWidth,c=document.documentElement.clientHeight,u=document.documentElement.scrollLeft||document.body.scrollLeft,d=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[l/2-100+u,c/2-150+d]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),p.settings.onSelect=s,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),t.blockUI&&t.blockUI(this.dpDiv),t.data(this._dialogInput[0],a,p),this},_destroyDatepicker:function(e){var i,s=t(e),n=t.data(e,a);s.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),t.removeData(e,a),"input"===i?(n.append.remove(),n.trigger.remove(),s.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)):("div"===i||"span"===i)&&s.removeClass(this.markerClassName).empty())},_enableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,a);n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!1,o.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().removeClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}))},_disableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,a);n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!0,o.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().addClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}),this._disabledInputs[this._disabledInputs.length]=e)},_isDisabledDatepicker:function(t){if(!t)return!1;for(var e=0;this._disabledInputs.length>e;e++)if(this._disabledInputs[e]===t)return!0;return!1},_getInst:function(e){try{return t.data(e,a)}catch(i){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(i,s,o){var a,r,h,l,c=this._getInst(i);return 2===arguments.length&&"string"==typeof s?"defaults"===s?t.extend({},t.datepicker._defaults):c?"all"===s?t.extend({},c.settings):this._get(c,s):null:(a=s||{},"string"==typeof s&&(a={},a[s]=o),c&&(this._curInst===c&&this._hideDatepicker(),r=this._getDateDatepicker(i,!0),h=this._getMinMaxDate(c,"min"),l=this._getMinMaxDate(c,"max"),n(c.settings,a),null!==h&&a.dateFormat!==e&&a.minDate===e&&(c.settings.minDate=this._formatDate(c,h)),null!==l&&a.dateFormat!==e&&a.maxDate===e&&(c.settings.maxDate=this._formatDate(c,l)),"disabled"in a&&(a.disabled?this._disableDatepicker(i):this._enableDatepicker(i)),this._attachments(t(i),c),this._autoSize(c),this._setDate(c,r),this._updateAlternate(c),this._updateDatepicker(c)),e)},_changeDatepicker:function(t,e,i){this._optionDatepicker(t,e,i)},_refreshDatepicker:function(t){var e=this._getInst(t);e&&this._updateDatepicker(e)},_setDateDatepicker:function(t,e){var i=this._getInst(t);i&&(this._setDate(i,e),this._updateDatepicker(i),this._updateAlternate(i))},_getDateDatepicker:function(t,e){var i=this._getInst(t);return i&&!i.inline&&this._setDateFromField(i,e),i?this._getDate(i):null},_doKeyDown:function(e){var i,s,n,o=t.datepicker._getInst(e.target),a=!0,r=o.dpDiv.is(".ui-datepicker-rtl");if(o._keyEvent=!0,t.datepicker._datepickerShowing)switch(e.keyCode){case 9:t.datepicker._hideDatepicker(),a=!1;break;case 13:return n=t("td."+t.datepicker._dayOverClass+":not(."+t.datepicker._currentClass+")",o.dpDiv),n[0]&&t.datepicker._selectDay(e.target,o.selectedMonth,o.selectedYear,n[0]),i=t.datepicker._get(o,"onSelect"),i?(s=t.datepicker._formatDate(o),i.apply(o.input?o.input[0]:null,[s,o])):t.datepicker._hideDatepicker(),!1;
+case 27:t.datepicker._hideDatepicker();break;case 33:t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M");break;case 34:t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");break;case 35:(e.ctrlKey||e.metaKey)&&t.datepicker._clearDate(e.target),a=e.ctrlKey||e.metaKey;break;case 36:(e.ctrlKey||e.metaKey)&&t.datepicker._gotoToday(e.target),a=e.ctrlKey||e.metaKey;break;case 37:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?1:-1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M");break;case 38:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,-7,"D"),a=e.ctrlKey||e.metaKey;break;case 39:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?-1:1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");break;case 40:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,7,"D"),a=e.ctrlKey||e.metaKey;break;default:a=!1}else 36===e.keyCode&&e.ctrlKey?t.datepicker._showDatepicker(this):a=!1;a&&(e.preventDefault(),e.stopPropagation())},_doKeyPress:function(i){var s,n,o=t.datepicker._getInst(i.target);return t.datepicker._get(o,"constrainInput")?(s=t.datepicker._possibleChars(t.datepicker._get(o,"dateFormat")),n=String.fromCharCode(null==i.charCode?i.keyCode:i.charCode),i.ctrlKey||i.metaKey||" ">n||!s||s.indexOf(n)>-1):e},_doKeyUp:function(e){var i,s=t.datepicker._getInst(e.target);if(s.input.val()!==s.lastVal)try{i=t.datepicker.parseDate(t.datepicker._get(s,"dateFormat"),s.input?s.input.val():null,t.datepicker._getFormatConfig(s)),i&&(t.datepicker._setDateFromField(s),t.datepicker._updateAlternate(s),t.datepicker._updateDatepicker(s))}catch(n){}return!0},_showDatepicker:function(e){if(e=e.target||e,"input"!==e.nodeName.toLowerCase()&&(e=t("input",e.parentNode)[0]),!t.datepicker._isDisabledDatepicker(e)&&t.datepicker._lastInput!==e){var i,s,o,a,r,h,l;i=t.datepicker._getInst(e),t.datepicker._curInst&&t.datepicker._curInst!==i&&(t.datepicker._curInst.dpDiv.stop(!0,!0),i&&t.datepicker._datepickerShowing&&t.datepicker._hideDatepicker(t.datepicker._curInst.input[0])),s=t.datepicker._get(i,"beforeShow"),o=s?s.apply(e,[e,i]):{},o!==!1&&(n(i.settings,o),i.lastVal=null,t.datepicker._lastInput=e,t.datepicker._setDateFromField(i),t.datepicker._inDialog&&(e.value=""),t.datepicker._pos||(t.datepicker._pos=t.datepicker._findPos(e),t.datepicker._pos[1]+=e.offsetHeight),a=!1,t(e).parents().each(function(){return a|="fixed"===t(this).css("position"),!a}),r={left:t.datepicker._pos[0],top:t.datepicker._pos[1]},t.datepicker._pos=null,i.dpDiv.empty(),i.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),t.datepicker._updateDatepicker(i),r=t.datepicker._checkOffset(i,r,a),i.dpDiv.css({position:t.datepicker._inDialog&&t.blockUI?"static":a?"fixed":"absolute",display:"none",left:r.left+"px",top:r.top+"px"}),i.inline||(h=t.datepicker._get(i,"showAnim"),l=t.datepicker._get(i,"duration"),i.dpDiv.zIndex(t(e).zIndex()+1),t.datepicker._datepickerShowing=!0,t.effects&&t.effects.effect[h]?i.dpDiv.show(h,t.datepicker._get(i,"showOptions"),l):i.dpDiv[h||"show"](h?l:null),t.datepicker._shouldFocusInput(i)&&i.input.focus(),t.datepicker._curInst=i))}},_updateDatepicker:function(e){this.maxRows=4,o=e,e.dpDiv.empty().append(this._generateHTML(e)),this._attachHandlers(e),e.dpDiv.find("."+this._dayOverClass+" a").mouseover();var i,s=this._getNumberOfMonths(e),n=s[1],a=17;e.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),n>1&&e.dpDiv.addClass("ui-datepicker-multi-"+n).css("width",a*n+"em"),e.dpDiv[(1!==s[0]||1!==s[1]?"add":"remove")+"Class"]("ui-datepicker-multi"),e.dpDiv[(this._get(e,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),e===t.datepicker._curInst&&t.datepicker._datepickerShowing&&t.datepicker._shouldFocusInput(e)&&e.input.focus(),e.yearshtml&&(i=e.yearshtml,setTimeout(function(){i===e.yearshtml&&e.yearshtml&&e.dpDiv.find("select.ui-datepicker-year:first").replaceWith(e.yearshtml),i=e.yearshtml=null},0))},_shouldFocusInput:function(t){return t.input&&t.input.is(":visible")&&!t.input.is(":disabled")&&!t.input.is(":focus")},_checkOffset:function(e,i,s){var n=e.dpDiv.outerWidth(),o=e.dpDiv.outerHeight(),a=e.input?e.input.outerWidth():0,r=e.input?e.input.outerHeight():0,h=document.documentElement.clientWidth+(s?0:t(document).scrollLeft()),l=document.documentElement.clientHeight+(s?0:t(document).scrollTop());return i.left-=this._get(e,"isRTL")?n-a:0,i.left-=s&&i.left===e.input.offset().left?t(document).scrollLeft():0,i.top-=s&&i.top===e.input.offset().top+r?t(document).scrollTop():0,i.left-=Math.min(i.left,i.left+n>h&&h>n?Math.abs(i.left+n-h):0),i.top-=Math.min(i.top,i.top+o>l&&l>o?Math.abs(o+r):0),i},_findPos:function(e){for(var i,s=this._getInst(e),n=this._get(s,"isRTL");e&&("hidden"===e.type||1!==e.nodeType||t.expr.filters.hidden(e));)e=e[n?"previousSibling":"nextSibling"];return i=t(e).offset(),[i.left,i.top]},_hideDatepicker:function(e){var i,s,n,o,r=this._curInst;!r||e&&r!==t.data(e,a)||this._datepickerShowing&&(i=this._get(r,"showAnim"),s=this._get(r,"duration"),n=function(){t.datepicker._tidyDialog(r)},t.effects&&(t.effects.effect[i]||t.effects[i])?r.dpDiv.hide(i,t.datepicker._get(r,"showOptions"),s,n):r.dpDiv["slideDown"===i?"slideUp":"fadeIn"===i?"fadeOut":"hide"](i?s:null,n),i||n(),this._datepickerShowing=!1,o=this._get(r,"onClose"),o&&o.apply(r.input?r.input[0]:null,[r.input?r.input.val():"",r]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),t.blockUI&&(t.unblockUI(),t("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(t){t.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(e){if(t.datepicker._curInst){var i=t(e.target),s=t.datepicker._getInst(i[0]);(i[0].id!==t.datepicker._mainDivId&&0===i.parents("#"+t.datepicker._mainDivId).length&&!i.hasClass(t.datepicker.markerClassName)&&!i.closest("."+t.datepicker._triggerClass).length&&t.datepicker._datepickerShowing&&(!t.datepicker._inDialog||!t.blockUI)||i.hasClass(t.datepicker.markerClassName)&&t.datepicker._curInst!==s)&&t.datepicker._hideDatepicker()}},_adjustDate:function(e,i,s){var n=t(e),o=this._getInst(n[0]);this._isDisabledDatepicker(n[0])||(this._adjustInstDate(o,i+("M"===s?this._get(o,"showCurrentAtPos"):0),s),this._updateDatepicker(o))},_gotoToday:function(e){var i,s=t(e),n=this._getInst(s[0]);this._get(n,"gotoCurrent")&&n.currentDay?(n.selectedDay=n.currentDay,n.drawMonth=n.selectedMonth=n.currentMonth,n.drawYear=n.selectedYear=n.currentYear):(i=new Date,n.selectedDay=i.getDate(),n.drawMonth=n.selectedMonth=i.getMonth(),n.drawYear=n.selectedYear=i.getFullYear()),this._notifyChange(n),this._adjustDate(s)},_selectMonthYear:function(e,i,s){var n=t(e),o=this._getInst(n[0]);o["selected"+("M"===s?"Month":"Year")]=o["draw"+("M"===s?"Month":"Year")]=parseInt(i.options[i.selectedIndex].value,10),this._notifyChange(o),this._adjustDate(n)},_selectDay:function(e,i,s,n){var o,a=t(e);t(n).hasClass(this._unselectableClass)||this._isDisabledDatepicker(a[0])||(o=this._getInst(a[0]),o.selectedDay=o.currentDay=t("a",n).html(),o.selectedMonth=o.currentMonth=i,o.selectedYear=o.currentYear=s,this._selectDate(e,this._formatDate(o,o.currentDay,o.currentMonth,o.currentYear)))},_clearDate:function(e){var i=t(e);this._selectDate(i,"")},_selectDate:function(e,i){var s,n=t(e),o=this._getInst(n[0]);i=null!=i?i:this._formatDate(o),o.input&&o.input.val(i),this._updateAlternate(o),s=this._get(o,"onSelect"),s?s.apply(o.input?o.input[0]:null,[i,o]):o.input&&o.input.trigger("change"),o.inline?this._updateDatepicker(o):(this._hideDatepicker(),this._lastInput=o.input[0],"object"!=typeof o.input[0]&&o.input.focus(),this._lastInput=null)},_updateAlternate:function(e){var i,s,n,o=this._get(e,"altField");o&&(i=this._get(e,"altFormat")||this._get(e,"dateFormat"),s=this._getDate(e),n=this.formatDate(i,s,this._getFormatConfig(e)),t(o).each(function(){t(this).val(n)}))},noWeekends:function(t){var e=t.getDay();return[e>0&&6>e,""]},iso8601Week:function(t){var e,i=new Date(t.getTime());return i.setDate(i.getDate()+4-(i.getDay()||7)),e=i.getTime(),i.setMonth(0),i.setDate(1),Math.floor(Math.round((e-i)/864e5)/7)+1},parseDate:function(i,s,n){if(null==i||null==s)throw"Invalid arguments";if(s="object"==typeof s?""+s:s+"",""===s)return null;var o,a,r,h,l=0,c=(n?n.shortYearCutoff:null)||this._defaults.shortYearCutoff,u="string"!=typeof c?c:(new Date).getFullYear()%100+parseInt(c,10),d=(n?n.dayNamesShort:null)||this._defaults.dayNamesShort,p=(n?n.dayNames:null)||this._defaults.dayNames,f=(n?n.monthNamesShort:null)||this._defaults.monthNamesShort,g=(n?n.monthNames:null)||this._defaults.monthNames,m=-1,v=-1,_=-1,b=-1,y=!1,w=function(t){var e=i.length>o+1&&i.charAt(o+1)===t;return e&&o++,e},k=function(t){var e=w(t),i="@"===t?14:"!"===t?20:"y"===t&&e?4:"o"===t?3:2,n=RegExp("^\\d{1,"+i+"}"),o=s.substring(l).match(n);if(!o)throw"Missing number at position "+l;return l+=o[0].length,parseInt(o[0],10)},x=function(i,n,o){var a=-1,r=t.map(w(i)?o:n,function(t,e){return[[e,t]]}).sort(function(t,e){return-(t[1].length-e[1].length)});if(t.each(r,function(t,i){var n=i[1];return s.substr(l,n.length).toLowerCase()===n.toLowerCase()?(a=i[0],l+=n.length,!1):e}),-1!==a)return a+1;throw"Unknown name at position "+l},D=function(){if(s.charAt(l)!==i.charAt(o))throw"Unexpected literal at position "+l;l++};for(o=0;i.length>o;o++)if(y)"'"!==i.charAt(o)||w("'")?D():y=!1;else switch(i.charAt(o)){case"d":_=k("d");break;case"D":x("D",d,p);break;case"o":b=k("o");break;case"m":v=k("m");break;case"M":v=x("M",f,g);break;case"y":m=k("y");break;case"@":h=new Date(k("@")),m=h.getFullYear(),v=h.getMonth()+1,_=h.getDate();break;case"!":h=new Date((k("!")-this._ticksTo1970)/1e4),m=h.getFullYear(),v=h.getMonth()+1,_=h.getDate();break;case"'":w("'")?D():y=!0;break;default:D()}if(s.length>l&&(r=s.substr(l),!/^\s+/.test(r)))throw"Extra/unparsed characters found in date: "+r;if(-1===m?m=(new Date).getFullYear():100>m&&(m+=(new Date).getFullYear()-(new Date).getFullYear()%100+(u>=m?0:-100)),b>-1)for(v=1,_=b;;){if(a=this._getDaysInMonth(m,v-1),a>=_)break;v++,_-=a}if(h=this._daylightSavingAdjust(new Date(m,v-1,_)),h.getFullYear()!==m||h.getMonth()+1!==v||h.getDate()!==_)throw"Invalid date";return h},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:1e7*60*60*24*(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925)),formatDate:function(t,e,i){if(!e)return"";var s,n=(i?i.dayNamesShort:null)||this._defaults.dayNamesShort,o=(i?i.dayNames:null)||this._defaults.dayNames,a=(i?i.monthNamesShort:null)||this._defaults.monthNamesShort,r=(i?i.monthNames:null)||this._defaults.monthNames,h=function(e){var i=t.length>s+1&&t.charAt(s+1)===e;return i&&s++,i},l=function(t,e,i){var s=""+e;if(h(t))for(;i>s.length;)s="0"+s;return s},c=function(t,e,i,s){return h(t)?s[e]:i[e]},u="",d=!1;if(e)for(s=0;t.length>s;s++)if(d)"'"!==t.charAt(s)||h("'")?u+=t.charAt(s):d=!1;else switch(t.charAt(s)){case"d":u+=l("d",e.getDate(),2);break;case"D":u+=c("D",e.getDay(),n,o);break;case"o":u+=l("o",Math.round((new Date(e.getFullYear(),e.getMonth(),e.getDate()).getTime()-new Date(e.getFullYear(),0,0).getTime())/864e5),3);break;case"m":u+=l("m",e.getMonth()+1,2);break;case"M":u+=c("M",e.getMonth(),a,r);break;case"y":u+=h("y")?e.getFullYear():(10>e.getYear()%100?"0":"")+e.getYear()%100;break;case"@":u+=e.getTime();break;case"!":u+=1e4*e.getTime()+this._ticksTo1970;break;case"'":h("'")?u+="'":d=!0;break;default:u+=t.charAt(s)}return u},_possibleChars:function(t){var e,i="",s=!1,n=function(i){var s=t.length>e+1&&t.charAt(e+1)===i;return s&&e++,s};for(e=0;t.length>e;e++)if(s)"'"!==t.charAt(e)||n("'")?i+=t.charAt(e):s=!1;else switch(t.charAt(e)){case"d":case"m":case"y":case"@":i+="0123456789";break;case"D":case"M":return null;case"'":n("'")?i+="'":s=!0;break;default:i+=t.charAt(e)}return i},_get:function(t,i){return t.settings[i]!==e?t.settings[i]:this._defaults[i]},_setDateFromField:function(t,e){if(t.input.val()!==t.lastVal){var i=this._get(t,"dateFormat"),s=t.lastVal=t.input?t.input.val():null,n=this._getDefaultDate(t),o=n,a=this._getFormatConfig(t);try{o=this.parseDate(i,s,a)||n}catch(r){s=e?"":s}t.selectedDay=o.getDate(),t.drawMonth=t.selectedMonth=o.getMonth(),t.drawYear=t.selectedYear=o.getFullYear(),t.currentDay=s?o.getDate():0,t.currentMonth=s?o.getMonth():0,t.currentYear=s?o.getFullYear():0,this._adjustInstDate(t)}},_getDefaultDate:function(t){return this._restrictMinMax(t,this._determineDate(t,this._get(t,"defaultDate"),new Date))},_determineDate:function(e,i,s){var n=function(t){var e=new Date;return e.setDate(e.getDate()+t),e},o=function(i){try{return t.datepicker.parseDate(t.datepicker._get(e,"dateFormat"),i,t.datepicker._getFormatConfig(e))}catch(s){}for(var n=(i.toLowerCase().match(/^c/)?t.datepicker._getDate(e):null)||new Date,o=n.getFullYear(),a=n.getMonth(),r=n.getDate(),h=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,l=h.exec(i);l;){switch(l[2]||"d"){case"d":case"D":r+=parseInt(l[1],10);break;case"w":case"W":r+=7*parseInt(l[1],10);break;case"m":case"M":a+=parseInt(l[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a));break;case"y":case"Y":o+=parseInt(l[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a))}l=h.exec(i)}return new Date(o,a,r)},a=null==i||""===i?s:"string"==typeof i?o(i):"number"==typeof i?isNaN(i)?s:n(i):new Date(i.getTime());return a=a&&"Invalid Date"==""+a?s:a,a&&(a.setHours(0),a.setMinutes(0),a.setSeconds(0),a.setMilliseconds(0)),this._daylightSavingAdjust(a)},_daylightSavingAdjust:function(t){return t?(t.setHours(t.getHours()>12?t.getHours()+2:0),t):null},_setDate:function(t,e,i){var s=!e,n=t.selectedMonth,o=t.selectedYear,a=this._restrictMinMax(t,this._determineDate(t,e,new Date));t.selectedDay=t.currentDay=a.getDate(),t.drawMonth=t.selectedMonth=t.currentMonth=a.getMonth(),t.drawYear=t.selectedYear=t.currentYear=a.getFullYear(),n===t.selectedMonth&&o===t.selectedYear||i||this._notifyChange(t),this._adjustInstDate(t),t.input&&t.input.val(s?"":this._formatDate(t))},_getDate:function(t){var e=!t.currentYear||t.input&&""===t.input.val()?null:this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return e},_attachHandlers:function(e){var i=this._get(e,"stepMonths"),s="#"+e.id.replace(/\\\\/g,"\\");e.dpDiv.find("[data-handler]").map(function(){var e={prev:function(){t.datepicker._adjustDate(s,-i,"M")},next:function(){t.datepicker._adjustDate(s,+i,"M")},hide:function(){t.datepicker._hideDatepicker()},today:function(){t.datepicker._gotoToday(s)},selectDay:function(){return t.datepicker._selectDay(s,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return t.datepicker._selectMonthYear(s,this,"M"),!1},selectYear:function(){return t.datepicker._selectMonthYear(s,this,"Y"),!1}};t(this).bind(this.getAttribute("data-event"),e[this.getAttribute("data-handler")])})},_generateHTML:function(t){var e,i,s,n,o,a,r,h,l,c,u,d,p,f,g,m,v,_,b,y,w,k,x,D,C,I,P,T,M,S,z,A,H,E,N,W,O,F,R,L=new Date,j=this._daylightSavingAdjust(new Date(L.getFullYear(),L.getMonth(),L.getDate())),Y=this._get(t,"isRTL"),B=this._get(t,"showButtonPanel"),V=this._get(t,"hideIfNoPrevNext"),K=this._get(t,"navigationAsDateFormat"),U=this._getNumberOfMonths(t),q=this._get(t,"showCurrentAtPos"),Q=this._get(t,"stepMonths"),X=1!==U[0]||1!==U[1],$=this._daylightSavingAdjust(t.currentDay?new Date(t.currentYear,t.currentMonth,t.currentDay):new Date(9999,9,9)),G=this._getMinMaxDate(t,"min"),J=this._getMinMaxDate(t,"max"),Z=t.drawMonth-q,te=t.drawYear;if(0>Z&&(Z+=12,te--),J)for(e=this._daylightSavingAdjust(new Date(J.getFullYear(),J.getMonth()-U[0]*U[1]+1,J.getDate())),e=G&&G>e?G:e;this._daylightSavingAdjust(new Date(te,Z,1))>e;)Z--,0>Z&&(Z=11,te--);for(t.drawMonth=Z,t.drawYear=te,i=this._get(t,"prevText"),i=K?this.formatDate(i,this._daylightSavingAdjust(new Date(te,Z-Q,1)),this._getFormatConfig(t)):i,s=this._canAdjustMonth(t,-1,te,Z)?"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>":V?"":"<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>",n=this._get(t,"nextText"),n=K?this.formatDate(n,this._daylightSavingAdjust(new Date(te,Z+Q,1)),this._getFormatConfig(t)):n,o=this._canAdjustMonth(t,1,te,Z)?"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>":V?"":"<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>",a=this._get(t,"currentText"),r=this._get(t,"gotoCurrent")&&t.currentDay?$:j,a=K?this.formatDate(a,r,this._getFormatConfig(t)):a,h=t.inline?"":"<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>"+this._get(t,"closeText")+"</button>",l=B?"<div class='ui-datepicker-buttonpane ui-widget-content'>"+(Y?h:"")+(this._isInRange(t,r)?"<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'>"+a+"</button>":"")+(Y?"":h)+"</div>":"",c=parseInt(this._get(t,"firstDay"),10),c=isNaN(c)?0:c,u=this._get(t,"showWeek"),d=this._get(t,"dayNames"),p=this._get(t,"dayNamesMin"),f=this._get(t,"monthNames"),g=this._get(t,"monthNamesShort"),m=this._get(t,"beforeShowDay"),v=this._get(t,"showOtherMonths"),_=this._get(t,"selectOtherMonths"),b=this._getDefaultDate(t),y="",k=0;U[0]>k;k++){for(x="",this.maxRows=4,D=0;U[1]>D;D++){if(C=this._daylightSavingAdjust(new Date(te,Z,t.selectedDay)),I=" ui-corner-all",P="",X){if(P+="<div class='ui-datepicker-group",U[1]>1)switch(D){case 0:P+=" ui-datepicker-group-first",I=" ui-corner-"+(Y?"right":"left");break;case U[1]-1:P+=" ui-datepicker-group-last",I=" ui-corner-"+(Y?"left":"right");break;default:P+=" ui-datepicker-group-middle",I=""}P+="'>"}for(P+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+I+"'>"+(/all|left/.test(I)&&0===k?Y?o:s:"")+(/all|right/.test(I)&&0===k?Y?s:o:"")+this._generateMonthYearHeader(t,Z,te,G,J,k>0||D>0,f,g)+"</div><table class='ui-datepicker-calendar'><thead>"+"<tr>",T=u?"<th class='ui-datepicker-week-col'>"+this._get(t,"weekHeader")+"</th>":"",w=0;7>w;w++)M=(w+c)%7,T+="<th"+((w+c+6)%7>=5?" class='ui-datepicker-week-end'":"")+">"+"<span title='"+d[M]+"'>"+p[M]+"</span></th>";for(P+=T+"</tr></thead><tbody>",S=this._getDaysInMonth(te,Z),te===t.selectedYear&&Z===t.selectedMonth&&(t.selectedDay=Math.min(t.selectedDay,S)),z=(this._getFirstDayOfMonth(te,Z)-c+7)%7,A=Math.ceil((z+S)/7),H=X?this.maxRows>A?this.maxRows:A:A,this.maxRows=H,E=this._daylightSavingAdjust(new Date(te,Z,1-z)),N=0;H>N;N++){for(P+="<tr>",W=u?"<td class='ui-datepicker-week-col'>"+this._get(t,"calculateWeek")(E)+"</td>":"",w=0;7>w;w++)O=m?m.apply(t.input?t.input[0]:null,[E]):[!0,""],F=E.getMonth()!==Z,R=F&&!_||!O[0]||G&&G>E||J&&E>J,W+="<td class='"+((w+c+6)%7>=5?" ui-datepicker-week-end":"")+(F?" ui-datepicker-other-month":"")+(E.getTime()===C.getTime()&&Z===t.selectedMonth&&t._keyEvent||b.getTime()===E.getTime()&&b.getTime()===C.getTime()?" "+this._dayOverClass:"")+(R?" "+this._unselectableClass+" ui-state-disabled":"")+(F&&!v?"":" "+O[1]+(E.getTime()===$.getTime()?" "+this._currentClass:"")+(E.getTime()===j.getTime()?" ui-datepicker-today":""))+"'"+(F&&!v||!O[2]?"":" title='"+O[2].replace(/'/g,"&#39;")+"'")+(R?"":" data-handler='selectDay' data-event='click' data-month='"+E.getMonth()+"' data-year='"+E.getFullYear()+"'")+">"+(F&&!v?"&#xa0;":R?"<span class='ui-state-default'>"+E.getDate()+"</span>":"<a class='ui-state-default"+(E.getTime()===j.getTime()?" ui-state-highlight":"")+(E.getTime()===$.getTime()?" ui-state-active":"")+(F?" ui-priority-secondary":"")+"' href='#'>"+E.getDate()+"</a>")+"</td>",E.setDate(E.getDate()+1),E=this._daylightSavingAdjust(E);P+=W+"</tr>"}Z++,Z>11&&(Z=0,te++),P+="</tbody></table>"+(X?"</div>"+(U[0]>0&&D===U[1]-1?"<div class='ui-datepicker-row-break'></div>":""):""),x+=P}y+=x}return y+=l,t._keyEvent=!1,y},_generateMonthYearHeader:function(t,e,i,s,n,o,a,r){var h,l,c,u,d,p,f,g,m=this._get(t,"changeMonth"),v=this._get(t,"changeYear"),_=this._get(t,"showMonthAfterYear"),b="<div class='ui-datepicker-title'>",y="";if(o||!m)y+="<span class='ui-datepicker-month'>"+a[e]+"</span>";else{for(h=s&&s.getFullYear()===i,l=n&&n.getFullYear()===i,y+="<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>",c=0;12>c;c++)(!h||c>=s.getMonth())&&(!l||n.getMonth()>=c)&&(y+="<option value='"+c+"'"+(c===e?" selected='selected'":"")+">"+r[c]+"</option>");y+="</select>"}if(_||(b+=y+(!o&&m&&v?"":"&#xa0;")),!t.yearshtml)if(t.yearshtml="",o||!v)b+="<span class='ui-datepicker-year'>"+i+"</span>";else{for(u=this._get(t,"yearRange").split(":"),d=(new Date).getFullYear(),p=function(t){var e=t.match(/c[+\-].*/)?i+parseInt(t.substring(1),10):t.match(/[+\-].*/)?d+parseInt(t,10):parseInt(t,10);return isNaN(e)?d:e},f=p(u[0]),g=Math.max(f,p(u[1]||"")),f=s?Math.max(f,s.getFullYear()):f,g=n?Math.min(g,n.getFullYear()):g,t.yearshtml+="<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";g>=f;f++)t.yearshtml+="<option value='"+f+"'"+(f===i?" selected='selected'":"")+">"+f+"</option>";t.yearshtml+="</select>",b+=t.yearshtml,t.yearshtml=null}return b+=this._get(t,"yearSuffix"),_&&(b+=(!o&&m&&v?"":"&#xa0;")+y),b+="</div>"},_adjustInstDate:function(t,e,i){var s=t.drawYear+("Y"===i?e:0),n=t.drawMonth+("M"===i?e:0),o=Math.min(t.selectedDay,this._getDaysInMonth(s,n))+("D"===i?e:0),a=this._restrictMinMax(t,this._daylightSavingAdjust(new Date(s,n,o)));t.selectedDay=a.getDate(),t.drawMonth=t.selectedMonth=a.getMonth(),t.drawYear=t.selectedYear=a.getFullYear(),("M"===i||"Y"===i)&&this._notifyChange(t)},_restrictMinMax:function(t,e){var i=this._getMinMaxDate(t,"min"),s=this._getMinMaxDate(t,"max"),n=i&&i>e?i:e;return s&&n>s?s:n},_notifyChange:function(t){var e=this._get(t,"onChangeMonthYear");e&&e.apply(t.input?t.input[0]:null,[t.selectedYear,t.selectedMonth+1,t])},_getNumberOfMonths:function(t){var e=this._get(t,"numberOfMonths");return null==e?[1,1]:"number"==typeof e?[1,e]:e},_getMinMaxDate:function(t,e){return this._determineDate(t,this._get(t,e+"Date"),null)},_getDaysInMonth:function(t,e){return 32-this._daylightSavingAdjust(new Date(t,e,32)).getDate()},_getFirstDayOfMonth:function(t,e){return new Date(t,e,1).getDay()},_canAdjustMonth:function(t,e,i,s){var n=this._getNumberOfMonths(t),o=this._daylightSavingAdjust(new Date(i,s+(0>e?e:n[0]*n[1]),1));return 0>e&&o.setDate(this._getDaysInMonth(o.getFullYear(),o.getMonth())),this._isInRange(t,o)},_isInRange:function(t,e){var i,s,n=this._getMinMaxDate(t,"min"),o=this._getMinMaxDate(t,"max"),a=null,r=null,h=this._get(t,"yearRange");return h&&(i=h.split(":"),s=(new Date).getFullYear(),a=parseInt(i[0],10),r=parseInt(i[1],10),i[0].match(/[+\-].*/)&&(a+=s),i[1].match(/[+\-].*/)&&(r+=s)),(!n||e.getTime()>=n.getTime())&&(!o||e.getTime()<=o.getTime())&&(!a||e.getFullYear()>=a)&&(!r||r>=e.getFullYear())},_getFormatConfig:function(t){var e=this._get(t,"shortYearCutoff");return e="string"!=typeof e?e:(new Date).getFullYear()%100+parseInt(e,10),{shortYearCutoff:e,dayNamesShort:this._get(t,"dayNamesShort"),dayNames:this._get(t,"dayNames"),monthNamesShort:this._get(t,"monthNamesShort"),monthNames:this._get(t,"monthNames")}},_formatDate:function(t,e,i,s){e||(t.currentDay=t.selectedDay,t.currentMonth=t.selectedMonth,t.currentYear=t.selectedYear);var n=e?"object"==typeof e?e:this._daylightSavingAdjust(new Date(s,i,e)):this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return this.formatDate(this._get(t,"dateFormat"),n,this._getFormatConfig(t))}}),t.fn.datepicker=function(e){if(!this.length)return this;t.datepicker.initialized||(t(document).mousedown(t.datepicker._checkExternalClick),t.datepicker.initialized=!0),0===t("#"+t.datepicker._mainDivId).length&&t("body").append(t.datepicker.dpDiv);var i=Array.prototype.slice.call(arguments,1);return"string"!=typeof e||"isDisabled"!==e&&"getDate"!==e&&"widget"!==e?"option"===e&&2===arguments.length&&"string"==typeof arguments[1]?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i)):this.each(function(){"string"==typeof e?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this].concat(i)):t.datepicker._attachDatepicker(this,e)}):t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i))},t.datepicker=new i,t.datepicker.initialized=!1,t.datepicker.uuid=(new Date).getTime(),t.datepicker.version="1.10.3"}(jQuery),function(t){var e={buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},i={maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0};t.widget("ui.dialog",{version:"1.10.3",options:{appendTo:"body",autoOpen:!0,buttons:[],closeOnEscape:!0,closeText:"close",dialogClass:"",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(e){var i=t(this).css(e).offset().top;0>i&&t(this).css("top",e.top-i)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),this.options.title=this.options.title||this.originalTitle,this._createWrapper(),this.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(this.uiDialog),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&t.fn.draggable&&this._makeDraggable(),this.options.resizable&&t.fn.resizable&&this._makeResizable(),this._isOpen=!1},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var e=this.options.appendTo;return e&&(e.jquery||e.nodeType)?t(e):this.document.find(e||"body").eq(0)},_destroy:function(){var t,e=this.originalPosition;this._destroyOverlay(),this.element.removeUniqueId().removeClass("ui-dialog-content ui-widget-content").css(this.originalCss).detach(),this.uiDialog.stop(!0,!0).remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),t=e.parent.children().eq(e.index),t.length&&t[0]!==this.element[0]?t.before(this.element):e.parent.append(this.element)},widget:function(){return this.uiDialog},disable:t.noop,enable:t.noop,close:function(e){var i=this;this._isOpen&&this._trigger("beforeClose",e)!==!1&&(this._isOpen=!1,this._destroyOverlay(),this.opener.filter(":focusable").focus().length||t(this.document[0].activeElement).blur(),this._hide(this.uiDialog,this.options.hide,function(){i._trigger("close",e)}))},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(t,e){var i=!!this.uiDialog.nextAll(":visible").insertBefore(this.uiDialog).length;return i&&!e&&this._trigger("focus",t),i},open:function(){var e=this;return this._isOpen?(this._moveToTop()&&this._focusTabbable(),undefined):(this._isOpen=!0,this.opener=t(this.document[0].activeElement),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this._show(this.uiDialog,this.options.show,function(){e._focusTabbable(),e._trigger("focus")}),this._trigger("open"),undefined)},_focusTabbable:function(){var t=this.element.find("[autofocus]");t.length||(t=this.element.find(":tabbable")),t.length||(t=this.uiDialogButtonPane.find(":tabbable")),t.length||(t=this.uiDialogTitlebarClose.filter(":tabbable")),t.length||(t=this.uiDialog),t.eq(0).focus()},_keepFocus:function(e){function i(){var e=this.document[0].activeElement,i=this.uiDialog[0]===e||t.contains(this.uiDialog[0],e);i||this._focusTabbable()}e.preventDefault(),i.call(this),this._delay(i)},_createWrapper:function(){this.uiDialog=t("<div>").addClass("ui-dialog ui-widget ui-widget-content ui-corner-all ui-front "+this.options.dialogClass).hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._on(this.uiDialog,{keydown:function(e){if(this.options.closeOnEscape&&!e.isDefaultPrevented()&&e.keyCode&&e.keyCode===t.ui.keyCode.ESCAPE)return e.preventDefault(),this.close(e),undefined;if(e.keyCode===t.ui.keyCode.TAB){var i=this.uiDialog.find(":tabbable"),s=i.filter(":first"),n=i.filter(":last");e.target!==n[0]&&e.target!==this.uiDialog[0]||e.shiftKey?e.target!==s[0]&&e.target!==this.uiDialog[0]||!e.shiftKey||(n.focus(1),e.preventDefault()):(s.focus(1),e.preventDefault())}},mousedown:function(t){this._moveToTop(t)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var e;this.uiDialogTitlebar=t("<div>").addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(this.uiDialog),this._on(this.uiDialogTitlebar,{mousedown:function(e){t(e.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.focus()}}),this.uiDialogTitlebarClose=t("<button></button>").button({label:this.options.closeText,icons:{primary:"ui-icon-closethick"},text:!1}).addClass("ui-dialog-titlebar-close").appendTo(this.uiDialogTitlebar),this._on(this.uiDialogTitlebarClose,{click:function(t){t.preventDefault(),this.close(t)}}),e=t("<span>").uniqueId().addClass("ui-dialog-title").prependTo(this.uiDialogTitlebar),this._title(e),this.uiDialog.attr({"aria-labelledby":e.attr("id")})},_title:function(t){this.options.title||t.html("&#160;"),t.text(this.options.title)},_createButtonPane:function(){this.uiDialogButtonPane=t("<div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),this.uiButtonSet=t("<div>").addClass("ui-dialog-buttonset").appendTo(this.uiDialogButtonPane),this._createButtons()},_createButtons:function(){var e=this,i=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),t.isEmptyObject(i)||t.isArray(i)&&!i.length?(this.uiDialog.removeClass("ui-dialog-buttons"),undefined):(t.each(i,function(i,s){var n,o;s=t.isFunction(s)?{click:s,text:i}:s,s=t.extend({type:"button"},s),n=s.click,s.click=function(){n.apply(e.element[0],arguments)},o={icons:s.icons,text:s.showText},delete s.icons,delete s.showText,t("<button></button>",s).button(o).appendTo(e.uiButtonSet)}),this.uiDialog.addClass("ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog),undefined)},_makeDraggable:function(){function e(t){return{position:t.position,offset:t.offset}}var i=this,s=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(s,n){t(this).addClass("ui-dialog-dragging"),i._blockFrames(),i._trigger("dragStart",s,e(n))},drag:function(t,s){i._trigger("drag",t,e(s))},stop:function(n,o){s.position=[o.position.left-i.document.scrollLeft(),o.position.top-i.document.scrollTop()],t(this).removeClass("ui-dialog-dragging"),i._unblockFrames(),i._trigger("dragStop",n,e(o))}})},_makeResizable:function(){function e(t){return{originalPosition:t.originalPosition,originalSize:t.originalSize,position:t.position,size:t.size}
+}var i=this,s=this.options,n=s.resizable,o=this.uiDialog.css("position"),a="string"==typeof n?n:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:s.maxWidth,maxHeight:s.maxHeight,minWidth:s.minWidth,minHeight:this._minHeight(),handles:a,start:function(s,n){t(this).addClass("ui-dialog-resizing"),i._blockFrames(),i._trigger("resizeStart",s,e(n))},resize:function(t,s){i._trigger("resize",t,e(s))},stop:function(n,o){s.height=t(this).height(),s.width=t(this).width(),t(this).removeClass("ui-dialog-resizing"),i._unblockFrames(),i._trigger("resizeStop",n,e(o))}}).css("position",o)},_minHeight:function(){var t=this.options;return"auto"===t.height?t.minHeight:Math.min(t.minHeight,t.height)},_position:function(){var t=this.uiDialog.is(":visible");t||this.uiDialog.show(),this.uiDialog.position(this.options.position),t||this.uiDialog.hide()},_setOptions:function(s){var n=this,o=!1,a={};t.each(s,function(t,s){n._setOption(t,s),t in e&&(o=!0),t in i&&(a[t]=s)}),o&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",a)},_setOption:function(t,e){var i,s,n=this.uiDialog;"dialogClass"===t&&n.removeClass(this.options.dialogClass).addClass(e),"disabled"!==t&&(this._super(t,e),"appendTo"===t&&this.uiDialog.appendTo(this._appendTo()),"buttons"===t&&this._createButtons(),"closeText"===t&&this.uiDialogTitlebarClose.button({label:""+e}),"draggable"===t&&(i=n.is(":data(ui-draggable)"),i&&!e&&n.draggable("destroy"),!i&&e&&this._makeDraggable()),"position"===t&&this._position(),"resizable"===t&&(s=n.is(":data(ui-resizable)"),s&&!e&&n.resizable("destroy"),s&&"string"==typeof e&&n.resizable("option","handles",e),s||e===!1||this._makeResizable()),"title"===t&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var t,e,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),t=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),e=Math.max(0,s.minHeight-t),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-t):"none","auto"===s.height?this.element.css({minHeight:e,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-t)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var e=t(this);return t("<div>").css({position:"absolute",width:e.outerWidth(),height:e.outerHeight()}).appendTo(e.parent()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(e){return t(e.target).closest(".ui-dialog").length?!0:!!t(e.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var e=this,i=this.widgetFullName;t.ui.dialog.overlayInstances||this._delay(function(){t.ui.dialog.overlayInstances&&this.document.bind("focusin.dialog",function(s){e._allowInteraction(s)||(s.preventDefault(),t(".ui-dialog:visible:last .ui-dialog-content").data(i)._focusTabbable())})}),this.overlay=t("<div>").addClass("ui-widget-overlay ui-front").appendTo(this._appendTo()),this._on(this.overlay,{mousedown:"_keepFocus"}),t.ui.dialog.overlayInstances++}},_destroyOverlay:function(){this.options.modal&&this.overlay&&(t.ui.dialog.overlayInstances--,t.ui.dialog.overlayInstances||this.document.unbind("focusin.dialog"),this.overlay.remove(),this.overlay=null)}}),t.ui.dialog.overlayInstances=0,t.uiBackCompat!==!1&&t.widget("ui.dialog",t.ui.dialog,{_position:function(){var e,i=this.options.position,s=[],n=[0,0];i?(("string"==typeof i||"object"==typeof i&&"0"in i)&&(s=i.split?i.split(" "):[i[0],i[1]],1===s.length&&(s[1]=s[0]),t.each(["left","top"],function(t,e){+s[t]===s[t]&&(n[t]=s[t],s[t]=e)}),i={my:s[0]+(0>n[0]?n[0]:"+"+n[0])+" "+s[1]+(0>n[1]?n[1]:"+"+n[1]),at:s.join(" ")}),i=t.extend({},t.ui.dialog.prototype.options.position,i)):i=t.ui.dialog.prototype.options.position,e=this.uiDialog.is(":visible"),e||this.uiDialog.show(),this.uiDialog.position(i),e||this.uiDialog.hide()}})}(jQuery),function(t){var e=/up|down|vertical/,i=/up|left|vertical|horizontal/;t.effects.effect.blind=function(s,n){var o,a,r,h=t(this),l=["position","top","bottom","left","right","height","width"],c=t.effects.setMode(h,s.mode||"hide"),u=s.direction||"up",d=e.test(u),p=d?"height":"width",f=d?"top":"left",g=i.test(u),m={},v="show"===c;h.parent().is(".ui-effects-wrapper")?t.effects.save(h.parent(),l):t.effects.save(h,l),h.show(),o=t.effects.createWrapper(h).css({overflow:"hidden"}),a=o[p](),r=parseFloat(o.css(f))||0,m[p]=v?a:0,g||(h.css(d?"bottom":"right",0).css(d?"top":"left","auto").css({position:"absolute"}),m[f]=v?r:a+r),v&&(o.css(p,0),g||o.css(f,r+a)),o.animate(m,{duration:s.duration,easing:s.easing,queue:!1,complete:function(){"hide"===c&&h.hide(),t.effects.restore(h,l),t.effects.removeWrapper(h),n()}})}}(jQuery),function(t){t.effects.effect.bounce=function(e,i){var s,n,o,a=t(this),r=["position","top","bottom","left","right","height","width"],h=t.effects.setMode(a,e.mode||"effect"),l="hide"===h,c="show"===h,u=e.direction||"up",d=e.distance,p=e.times||5,f=2*p+(c||l?1:0),g=e.duration/f,m=e.easing,v="up"===u||"down"===u?"top":"left",_="up"===u||"left"===u,b=a.queue(),y=b.length;for((c||l)&&r.push("opacity"),t.effects.save(a,r),a.show(),t.effects.createWrapper(a),d||(d=a["top"===v?"outerHeight":"outerWidth"]()/3),c&&(o={opacity:1},o[v]=0,a.css("opacity",0).css(v,_?2*-d:2*d).animate(o,g,m)),l&&(d/=Math.pow(2,p-1)),o={},o[v]=0,s=0;p>s;s++)n={},n[v]=(_?"-=":"+=")+d,a.animate(n,g,m).animate(o,g,m),d=l?2*d:d/2;l&&(n={opacity:0},n[v]=(_?"-=":"+=")+d,a.animate(n,g,m)),a.queue(function(){l&&a.hide(),t.effects.restore(a,r),t.effects.removeWrapper(a),i()}),y>1&&b.splice.apply(b,[1,0].concat(b.splice(y,f+1))),a.dequeue()}}(jQuery),function(t){t.effects.effect.clip=function(e,i){var s,n,o,a=t(this),r=["position","top","bottom","left","right","height","width"],h=t.effects.setMode(a,e.mode||"hide"),l="show"===h,c=e.direction||"vertical",u="vertical"===c,d=u?"height":"width",p=u?"top":"left",f={};t.effects.save(a,r),a.show(),s=t.effects.createWrapper(a).css({overflow:"hidden"}),n="IMG"===a[0].tagName?s:a,o=n[d](),l&&(n.css(d,0),n.css(p,o/2)),f[d]=l?o:0,f[p]=l?0:o/2,n.animate(f,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){l||a.hide(),t.effects.restore(a,r),t.effects.removeWrapper(a),i()}})}}(jQuery),function(t){t.effects.effect.drop=function(e,i){var s,n=t(this),o=["position","top","bottom","left","right","opacity","height","width"],a=t.effects.setMode(n,e.mode||"hide"),r="show"===a,h=e.direction||"left",l="up"===h||"down"===h?"top":"left",c="up"===h||"left"===h?"pos":"neg",u={opacity:r?1:0};t.effects.save(n,o),n.show(),t.effects.createWrapper(n),s=e.distance||n["top"===l?"outerHeight":"outerWidth"](!0)/2,r&&n.css("opacity",0).css(l,"pos"===c?-s:s),u[l]=(r?"pos"===c?"+=":"-=":"pos"===c?"-=":"+=")+s,n.animate(u,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){"hide"===a&&n.hide(),t.effects.restore(n,o),t.effects.removeWrapper(n),i()}})}}(jQuery),function(t){t.effects.effect.explode=function(e,i){function s(){b.push(this),b.length===u*d&&n()}function n(){p.css({visibility:"visible"}),t(b).remove(),g||p.hide(),i()}var o,a,r,h,l,c,u=e.pieces?Math.round(Math.sqrt(e.pieces)):3,d=u,p=t(this),f=t.effects.setMode(p,e.mode||"hide"),g="show"===f,m=p.show().css("visibility","hidden").offset(),v=Math.ceil(p.outerWidth()/d),_=Math.ceil(p.outerHeight()/u),b=[];for(o=0;u>o;o++)for(h=m.top+o*_,c=o-(u-1)/2,a=0;d>a;a++)r=m.left+a*v,l=a-(d-1)/2,p.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-a*v,top:-o*_}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:v,height:_,left:r+(g?l*v:0),top:h+(g?c*_:0),opacity:g?0:1}).animate({left:r+(g?0:l*v),top:h+(g?0:c*_),opacity:g?1:0},e.duration||500,e.easing,s)}}(jQuery),function(t){t.effects.effect.fade=function(e,i){var s=t(this),n=t.effects.setMode(s,e.mode||"toggle");s.animate({opacity:n},{queue:!1,duration:e.duration,easing:e.easing,complete:i})}}(jQuery),function(t){t.effects.effect.fold=function(e,i){var s,n,o=t(this),a=["position","top","bottom","left","right","height","width"],r=t.effects.setMode(o,e.mode||"hide"),h="show"===r,l="hide"===r,c=e.size||15,u=/([0-9]+)%/.exec(c),d=!!e.horizFirst,p=h!==d,f=p?["width","height"]:["height","width"],g=e.duration/2,m={},v={};t.effects.save(o,a),o.show(),s=t.effects.createWrapper(o).css({overflow:"hidden"}),n=p?[s.width(),s.height()]:[s.height(),s.width()],u&&(c=parseInt(u[1],10)/100*n[l?0:1]),h&&s.css(d?{height:0,width:c}:{height:c,width:0}),m[f[0]]=h?n[0]:c,v[f[1]]=h?n[1]:0,s.animate(m,g,e.easing).animate(v,g,e.easing,function(){l&&o.hide(),t.effects.restore(o,a),t.effects.removeWrapper(o),i()})}}(jQuery),function(t){t.effects.effect.highlight=function(e,i){var s=t(this),n=["backgroundImage","backgroundColor","opacity"],o=t.effects.setMode(s,e.mode||"show"),a={backgroundColor:s.css("backgroundColor")};"hide"===o&&(a.opacity=0),t.effects.save(s,n),s.show().css({backgroundImage:"none",backgroundColor:e.color||"#ffff99"}).animate(a,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){"hide"===o&&s.hide(),t.effects.restore(s,n),i()}})}}(jQuery),function(t){t.effects.effect.pulsate=function(e,i){var s,n=t(this),o=t.effects.setMode(n,e.mode||"show"),a="show"===o,r="hide"===o,h=a||"hide"===o,l=2*(e.times||5)+(h?1:0),c=e.duration/l,u=0,d=n.queue(),p=d.length;for((a||!n.is(":visible"))&&(n.css("opacity",0).show(),u=1),s=1;l>s;s++)n.animate({opacity:u},c,e.easing),u=1-u;n.animate({opacity:u},c,e.easing),n.queue(function(){r&&n.hide(),i()}),p>1&&d.splice.apply(d,[1,0].concat(d.splice(p,l+1))),n.dequeue()}}(jQuery),function(t){t.effects.effect.puff=function(e,i){var s=t(this),n=t.effects.setMode(s,e.mode||"hide"),o="hide"===n,a=parseInt(e.percent,10)||150,r=a/100,h={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()};t.extend(e,{effect:"scale",queue:!1,fade:!0,mode:n,complete:i,percent:o?a:100,from:o?h:{height:h.height*r,width:h.width*r,outerHeight:h.outerHeight*r,outerWidth:h.outerWidth*r}}),s.effect(e)},t.effects.effect.scale=function(e,i){var s=t(this),n=t.extend(!0,{},e),o=t.effects.setMode(s,e.mode||"effect"),a=parseInt(e.percent,10)||(0===parseInt(e.percent,10)?0:"hide"===o?0:100),r=e.direction||"both",h=e.origin,l={height:s.height(),width:s.width(),outerHeight:s.outerHeight(),outerWidth:s.outerWidth()},c={y:"horizontal"!==r?a/100:1,x:"vertical"!==r?a/100:1};n.effect="size",n.queue=!1,n.complete=i,"effect"!==o&&(n.origin=h||["middle","center"],n.restore=!0),n.from=e.from||("show"===o?{height:0,width:0,outerHeight:0,outerWidth:0}:l),n.to={height:l.height*c.y,width:l.width*c.x,outerHeight:l.outerHeight*c.y,outerWidth:l.outerWidth*c.x},n.fade&&("show"===o&&(n.from.opacity=0,n.to.opacity=1),"hide"===o&&(n.from.opacity=1,n.to.opacity=0)),s.effect(n)},t.effects.effect.size=function(e,i){var s,n,o,a=t(this),r=["position","top","bottom","left","right","width","height","overflow","opacity"],h=["position","top","bottom","left","right","overflow","opacity"],l=["width","height","overflow"],c=["fontSize"],u=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],d=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],p=t.effects.setMode(a,e.mode||"effect"),f=e.restore||"effect"!==p,g=e.scale||"both",m=e.origin||["middle","center"],v=a.css("position"),_=f?r:h,b={height:0,width:0,outerHeight:0,outerWidth:0};"show"===p&&a.show(),s={height:a.height(),width:a.width(),outerHeight:a.outerHeight(),outerWidth:a.outerWidth()},"toggle"===e.mode&&"show"===p?(a.from=e.to||b,a.to=e.from||s):(a.from=e.from||("show"===p?b:s),a.to=e.to||("hide"===p?b:s)),o={from:{y:a.from.height/s.height,x:a.from.width/s.width},to:{y:a.to.height/s.height,x:a.to.width/s.width}},("box"===g||"both"===g)&&(o.from.y!==o.to.y&&(_=_.concat(u),a.from=t.effects.setTransition(a,u,o.from.y,a.from),a.to=t.effects.setTransition(a,u,o.to.y,a.to)),o.from.x!==o.to.x&&(_=_.concat(d),a.from=t.effects.setTransition(a,d,o.from.x,a.from),a.to=t.effects.setTransition(a,d,o.to.x,a.to))),("content"===g||"both"===g)&&o.from.y!==o.to.y&&(_=_.concat(c).concat(l),a.from=t.effects.setTransition(a,c,o.from.y,a.from),a.to=t.effects.setTransition(a,c,o.to.y,a.to)),t.effects.save(a,_),a.show(),t.effects.createWrapper(a),a.css("overflow","hidden").css(a.from),m&&(n=t.effects.getBaseline(m,s),a.from.top=(s.outerHeight-a.outerHeight())*n.y,a.from.left=(s.outerWidth-a.outerWidth())*n.x,a.to.top=(s.outerHeight-a.to.outerHeight)*n.y,a.to.left=(s.outerWidth-a.to.outerWidth)*n.x),a.css(a.from),("content"===g||"both"===g)&&(u=u.concat(["marginTop","marginBottom"]).concat(c),d=d.concat(["marginLeft","marginRight"]),l=r.concat(u).concat(d),a.find("*[width]").each(function(){var i=t(this),s={height:i.height(),width:i.width(),outerHeight:i.outerHeight(),outerWidth:i.outerWidth()};f&&t.effects.save(i,l),i.from={height:s.height*o.from.y,width:s.width*o.from.x,outerHeight:s.outerHeight*o.from.y,outerWidth:s.outerWidth*o.from.x},i.to={height:s.height*o.to.y,width:s.width*o.to.x,outerHeight:s.height*o.to.y,outerWidth:s.width*o.to.x},o.from.y!==o.to.y&&(i.from=t.effects.setTransition(i,u,o.from.y,i.from),i.to=t.effects.setTransition(i,u,o.to.y,i.to)),o.from.x!==o.to.x&&(i.from=t.effects.setTransition(i,d,o.from.x,i.from),i.to=t.effects.setTransition(i,d,o.to.x,i.to)),i.css(i.from),i.animate(i.to,e.duration,e.easing,function(){f&&t.effects.restore(i,l)})})),a.animate(a.to,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){0===a.to.opacity&&a.css("opacity",a.from.opacity),"hide"===p&&a.hide(),t.effects.restore(a,_),f||("static"===v?a.css({position:"relative",top:a.to.top,left:a.to.left}):t.each(["top","left"],function(t,e){a.css(e,function(e,i){var s=parseInt(i,10),n=t?a.to.left:a.to.top;return"auto"===i?n+"px":s+n+"px"})})),t.effects.removeWrapper(a),i()}})}}(jQuery),function(t){t.effects.effect.shake=function(e,i){var s,n=t(this),o=["position","top","bottom","left","right","height","width"],a=t.effects.setMode(n,e.mode||"effect"),r=e.direction||"left",h=e.distance||20,l=e.times||3,c=2*l+1,u=Math.round(e.duration/c),d="up"===r||"down"===r?"top":"left",p="up"===r||"left"===r,f={},g={},m={},v=n.queue(),_=v.length;for(t.effects.save(n,o),n.show(),t.effects.createWrapper(n),f[d]=(p?"-=":"+=")+h,g[d]=(p?"+=":"-=")+2*h,m[d]=(p?"-=":"+=")+2*h,n.animate(f,u,e.easing),s=1;l>s;s++)n.animate(g,u,e.easing).animate(m,u,e.easing);n.animate(g,u,e.easing).animate(f,u/2,e.easing).queue(function(){"hide"===a&&n.hide(),t.effects.restore(n,o),t.effects.removeWrapper(n),i()}),_>1&&v.splice.apply(v,[1,0].concat(v.splice(_,c+1))),n.dequeue()}}(jQuery),function(t){t.effects.effect.slide=function(e,i){var s,n=t(this),o=["position","top","bottom","left","right","width","height"],a=t.effects.setMode(n,e.mode||"show"),r="show"===a,h=e.direction||"left",l="up"===h||"down"===h?"top":"left",c="up"===h||"left"===h,u={};t.effects.save(n,o),n.show(),s=e.distance||n["top"===l?"outerHeight":"outerWidth"](!0),t.effects.createWrapper(n).css({overflow:"hidden"}),r&&n.css(l,c?isNaN(s)?"-"+s:-s:s),u[l]=(r?c?"+=":"-=":c?"-=":"+=")+s,n.animate(u,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){"hide"===a&&n.hide(),t.effects.restore(n,o),t.effects.removeWrapper(n),i()}})}}(jQuery),function(t){t.effects.effect.transfer=function(e,i){var s=t(this),n=t(e.to),o="fixed"===n.css("position"),a=t("body"),r=o?a.scrollTop():0,h=o?a.scrollLeft():0,l=n.offset(),c={top:l.top-r,left:l.left-h,height:n.innerHeight(),width:n.innerWidth()},u=s.offset(),d=t("<div class='ui-effects-transfer'></div>").appendTo(document.body).addClass(e.className).css({top:u.top-r,left:u.left-h,height:s.innerHeight(),width:s.innerWidth(),position:o?"fixed":"absolute"}).animate(c,e.duration,e.easing,function(){d.remove(),i()})}}(jQuery),function(t){t.widget("ui.menu",{version:"1.10.3",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-carat-1-e"},menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().addClass("ui-menu ui-widget ui-widget-content ui-corner-all").toggleClass("ui-menu-icons",!!this.element.find(".ui-icon").length).attr({role:this.options.role,tabIndex:0}).bind("click"+this.eventNamespace,t.proxy(function(t){this.options.disabled&&t.preventDefault()},this)),this.options.disabled&&this.element.addClass("ui-state-disabled").attr("aria-disabled","true"),this._on({"mousedown .ui-menu-item > a":function(t){t.preventDefault()},"click .ui-state-disabled > a":function(t){t.preventDefault()},"click .ui-menu-item:has(a)":function(e){var i=t(e.target).closest(".ui-menu-item");!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.mouseHandled=!0,this.select(e),i.has(".ui-menu").length?this.expand(e):this.element.is(":focus")||(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(e){var i=t(e.currentTarget);i.siblings().children(".ui-state-active").removeClass("ui-state-active"),this.focus(e,i)},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this.element.children(".ui-menu-item").eq(0);e||this.focus(t,i)},blur:function(e){this._delay(function(){t.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(e)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(e){t(e.target).closest(".ui-menu").length||this.collapseAll(e),this.mouseHandled=!1}})},_destroy:function(){this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeClass("ui-menu ui-widget ui-widget-content ui-corner-all ui-menu-icons").removeAttr("role").removeAttr("tabIndex").removeAttr("aria-labelledby").removeAttr("aria-expanded").removeAttr("aria-hidden").removeAttr("aria-disabled").removeUniqueId().show(),this.element.find(".ui-menu-item").removeClass("ui-menu-item").removeAttr("role").removeAttr("aria-disabled").children("a").removeUniqueId().removeClass("ui-corner-all ui-state-hover").removeAttr("tabIndex").removeAttr("role").removeAttr("aria-haspopup").children().each(function(){var e=t(this);e.data("ui-menu-submenu-carat")&&e.remove()}),this.element.find(".ui-menu-divider").removeClass("ui-menu-divider ui-widget-content")},_keydown:function(e){function i(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")}var s,n,o,a,r,h=!0;switch(e.keyCode){case t.ui.keyCode.PAGE_UP:this.previousPage(e);break;case t.ui.keyCode.PAGE_DOWN:this.nextPage(e);break;case t.ui.keyCode.HOME:this._move("first","first",e);break;case t.ui.keyCode.END:this._move("last","last",e);break;case t.ui.keyCode.UP:this.previous(e);break;case t.ui.keyCode.DOWN:this.next(e);break;case t.ui.keyCode.LEFT:this.collapse(e);break;case t.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(e);break;case t.ui.keyCode.ENTER:case t.ui.keyCode.SPACE:this._activate(e);break;case t.ui.keyCode.ESCAPE:this.collapse(e);break;default:h=!1,n=this.previousFilter||"",o=String.fromCharCode(e.keyCode),a=!1,clearTimeout(this.filterTimer),o===n?a=!0:o=n+o,r=RegExp("^"+i(o),"i"),s=this.activeMenu.children(".ui-menu-item").filter(function(){return r.test(t(this).children("a").text())}),s=a&&-1!==s.index(this.active.next())?this.active.nextAll(".ui-menu-item"):s,s.length||(o=String.fromCharCode(e.keyCode),r=RegExp("^"+i(o),"i"),s=this.activeMenu.children(".ui-menu-item").filter(function(){return r.test(t(this).children("a").text())})),s.length?(this.focus(e,s),s.length>1?(this.previousFilter=o,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter):delete this.previousFilter}h&&e.preventDefault()},_activate:function(t){this.active.is(".ui-state-disabled")||(this.active.children("a[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var e,i=this.options.icons.submenu,s=this.element.find(this.options.menus);s.filter(":not(.ui-menu)").addClass("ui-menu ui-widget ui-widget-content ui-corner-all").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var e=t(this),s=e.prev("a"),n=t("<span>").addClass("ui-menu-icon ui-icon "+i).data("ui-menu-submenu-carat",!0);s.attr("aria-haspopup","true").prepend(n),e.attr("aria-labelledby",s.attr("id"))}),e=s.add(this.element),e.children(":not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","presentation").children("a").uniqueId().addClass("ui-corner-all").attr({tabIndex:-1,role:this._itemRole()}),e.children(":not(.ui-menu-item)").each(function(){var e=t(this);/[^\-\u2014\u2013\s]/.test(e.text())||e.addClass("ui-widget-content ui-menu-divider")}),e.children(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!t.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){"icons"===t&&this.element.find(".ui-menu-icon").removeClass(this.options.icons.submenu).addClass(e.submenu),this._super(t,e)},focus:function(t,e){var i,s;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),s=this.active.children("a").addClass("ui-state-focus"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),this.active.parent().closest(".ui-menu-item").children("a:first").addClass("ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=e.children(".ui-menu"),i.length&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(e){var i,s,n,o,a,r;this._hasScroll()&&(i=parseFloat(t.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(t.css(this.activeMenu[0],"paddingTop"))||0,n=e.offset().top-this.activeMenu.offset().top-i-s,o=this.activeMenu.scrollTop(),a=this.activeMenu.height(),r=e.height(),0>n?this.activeMenu.scrollTop(o+n):n+r>a&&this.activeMenu.scrollTop(o+n-a+r))},blur:function(t,e){e||clearTimeout(this.timer),this.active&&(this.active.children("a").removeClass("ui-state-focus"),this.active=null,this._trigger("blur",t,{item:this.active}))},_startOpening:function(t){clearTimeout(this.timer),"true"===t.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(t)},this.delay))},_open:function(e){var i=t.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(e.parents(".ui-menu")).hide().attr("aria-hidden","true"),e.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(e,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:t(e&&e.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(e),this.activeMenu=s},this.delay)},_close:function(t){t||(t=this.active?this.active.parent():this.element),t.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false").end().find("a.ui-state-active").removeClass("ui-state-active")},collapse:function(t){var e=this.active&&this.active.parent().closest(".ui-menu-item",this.element);e&&e.length&&(this._close(),this.focus(t,e))},expand:function(t){var e=this.active&&this.active.children(".ui-menu ").children(".ui-menu-item").first();e&&e.length&&(this._open(e.parent()),this._delay(function(){this.focus(t,e)}))},next:function(t){this._move("next","first",t)},previous:function(t){this._move("prev","last",t)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(t,e,i){var s;this.active&&(s="first"===t||"last"===t?this.active["first"===t?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[t+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.children(".ui-menu-item")[e]()),this.focus(i,s)},nextPage:function(e){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=t(this),0>i.offset().top-s-n}),this.focus(e,i)):this.focus(e,this.activeMenu.children(".ui-menu-item")[this.active?"last":"first"]())),undefined):(this.next(e),undefined)},previousPage:function(e){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=t(this),i.offset().top-s+n>0}),this.focus(e,i)):this.focus(e,this.activeMenu.children(".ui-menu-item").first())),undefined):(this.next(e),undefined)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(e){this.active=this.active||t(e.target).closest(".ui-menu-item");var i={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(e,!0),this._trigger("select",e,i)}})}(jQuery),function(t,e){function i(t,e,i){return[parseFloat(t[0])*(p.test(t[0])?e/100:1),parseFloat(t[1])*(p.test(t[1])?i/100:1)]}function s(e,i){return parseInt(t.css(e,i),10)||0}function n(e){var i=e[0];return 9===i.nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:t.isWindow(i)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()}}t.ui=t.ui||{};var o,a=Math.max,r=Math.abs,h=Math.round,l=/left|center|right/,c=/top|center|bottom/,u=/[\+\-]\d+(\.[\d]+)?%?/,d=/^\w+/,p=/%$/,f=t.fn.position;t.position={scrollbarWidth:function(){if(o!==e)return o;var i,s,n=t("<div style='display:block;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),a=n.children()[0];return t("body").append(n),i=a.offsetWidth,n.css("overflow","scroll"),s=a.offsetWidth,i===s&&(s=n[0].clientWidth),n.remove(),o=i-s},getScrollInfo:function(e){var i=e.isWindow?"":e.element.css("overflow-x"),s=e.isWindow?"":e.element.css("overflow-y"),n="scroll"===i||"auto"===i&&e.width<e.element[0].scrollWidth,o="scroll"===s||"auto"===s&&e.height<e.element[0].scrollHeight;return{width:o?t.position.scrollbarWidth():0,height:n?t.position.scrollbarWidth():0}},getWithinInfo:function(e){var i=t(e||window),s=t.isWindow(i[0]);return{element:i,isWindow:s,offset:i.offset()||{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:s?i.width():i.outerWidth(),height:s?i.height():i.outerHeight()}}},t.fn.position=function(e){if(!e||!e.of)return f.apply(this,arguments);e=t.extend({},e);var o,p,g,m,v,_,b=t(e.of),y=t.position.getWithinInfo(e.within),w=t.position.getScrollInfo(y),k=(e.collision||"flip").split(" "),x={};return _=n(b),b[0].preventDefault&&(e.at="left top"),p=_.width,g=_.height,m=_.offset,v=t.extend({},m),t.each(["my","at"],function(){var t,i,s=(e[this]||"").split(" ");1===s.length&&(s=l.test(s[0])?s.concat(["center"]):c.test(s[0])?["center"].concat(s):["center","center"]),s[0]=l.test(s[0])?s[0]:"center",s[1]=c.test(s[1])?s[1]:"center",t=u.exec(s[0]),i=u.exec(s[1]),x[this]=[t?t[0]:0,i?i[0]:0],e[this]=[d.exec(s[0])[0],d.exec(s[1])[0]]}),1===k.length&&(k[1]=k[0]),"right"===e.at[0]?v.left+=p:"center"===e.at[0]&&(v.left+=p/2),"bottom"===e.at[1]?v.top+=g:"center"===e.at[1]&&(v.top+=g/2),o=i(x.at,p,g),v.left+=o[0],v.top+=o[1],this.each(function(){var n,l,c=t(this),u=c.outerWidth(),d=c.outerHeight(),f=s(this,"marginLeft"),_=s(this,"marginTop"),D=u+f+s(this,"marginRight")+w.width,C=d+_+s(this,"marginBottom")+w.height,I=t.extend({},v),P=i(x.my,c.outerWidth(),c.outerHeight());"right"===e.my[0]?I.left-=u:"center"===e.my[0]&&(I.left-=u/2),"bottom"===e.my[1]?I.top-=d:"center"===e.my[1]&&(I.top-=d/2),I.left+=P[0],I.top+=P[1],t.support.offsetFractions||(I.left=h(I.left),I.top=h(I.top)),n={marginLeft:f,marginTop:_},t.each(["left","top"],function(i,s){t.ui.position[k[i]]&&t.ui.position[k[i]][s](I,{targetWidth:p,targetHeight:g,elemWidth:u,elemHeight:d,collisionPosition:n,collisionWidth:D,collisionHeight:C,offset:[o[0]+P[0],o[1]+P[1]],my:e.my,at:e.at,within:y,elem:c})}),e.using&&(l=function(t){var i=m.left-I.left,s=i+p-u,n=m.top-I.top,o=n+g-d,h={target:{element:b,left:m.left,top:m.top,width:p,height:g},element:{element:c,left:I.left,top:I.top,width:u,height:d},horizontal:0>s?"left":i>0?"right":"center",vertical:0>o?"top":n>0?"bottom":"middle"};u>p&&p>r(i+s)&&(h.horizontal="center"),d>g&&g>r(n+o)&&(h.vertical="middle"),h.important=a(r(i),r(s))>a(r(n),r(o))?"horizontal":"vertical",e.using.call(this,t,h)}),c.offset(t.extend(I,{using:l}))})},t.ui.position={fit:{left:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollLeft:s.offset.left,o=s.width,r=t.left-e.collisionPosition.marginLeft,h=n-r,l=r+e.collisionWidth-o-n;e.collisionWidth>o?h>0&&0>=l?(i=t.left+h+e.collisionWidth-o-n,t.left+=h-i):t.left=l>0&&0>=h?n:h>l?n+o-e.collisionWidth:n:h>0?t.left+=h:l>0?t.left-=l:t.left=a(t.left-r,t.left)},top:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollTop:s.offset.top,o=e.within.height,r=t.top-e.collisionPosition.marginTop,h=n-r,l=r+e.collisionHeight-o-n;e.collisionHeight>o?h>0&&0>=l?(i=t.top+h+e.collisionHeight-o-n,t.top+=h-i):t.top=l>0&&0>=h?n:h>l?n+o-e.collisionHeight:n:h>0?t.top+=h:l>0?t.top-=l:t.top=a(t.top-r,t.top)}},flip:{left:function(t,e){var i,s,n=e.within,o=n.offset.left+n.scrollLeft,a=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=t.left-e.collisionPosition.marginLeft,c=l-h,u=l+e.collisionWidth-a-h,d="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,p="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,f=-2*e.offset[0];0>c?(i=t.left+d+p+f+e.collisionWidth-a-o,(0>i||r(c)>i)&&(t.left+=d+p+f)):u>0&&(s=t.left-e.collisionPosition.marginLeft+d+p+f-h,(s>0||u>r(s))&&(t.left+=d+p+f))},top:function(t,e){var i,s,n=e.within,o=n.offset.top+n.scrollTop,a=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=t.top-e.collisionPosition.marginTop,c=l-h,u=l+e.collisionHeight-a-h,d="top"===e.my[1],p=d?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,f="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,g=-2*e.offset[1];0>c?(s=t.top+p+f+g+e.collisionHeight-a-o,t.top+p+f+g>c&&(0>s||r(c)>s)&&(t.top+=p+f+g)):u>0&&(i=t.top-e.collisionPosition.marginTop+p+f+g-h,t.top+p+f+g>u&&(i>0||u>r(i))&&(t.top+=p+f+g))}},flipfit:{left:function(){t.ui.position.flip.left.apply(this,arguments),t.ui.position.fit.left.apply(this,arguments)},top:function(){t.ui.position.flip.top.apply(this,arguments),t.ui.position.fit.top.apply(this,arguments)}}},function(){var e,i,s,n,o,a=document.getElementsByTagName("body")[0],r=document.createElement("div");e=document.createElement(a?"div":"body"),s={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},a&&t.extend(s,{position:"absolute",left:"-1000px",top:"-1000px"});for(o in s)e.style[o]=s[o];e.appendChild(r),i=a||document.documentElement,i.insertBefore(e,i.firstChild),r.style.cssText="position: absolute; left: 10.7432222px;",n=t(r).offset().left,t.support.offsetFractions=n>10&&11>n,e.innerHTML="",i.removeChild(e)}()}(jQuery),function(t,e){t.widget("ui.progressbar",{version:"1.10.3",options:{max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min}),this.valueDiv=t("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element),this._refreshValue()},_destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.valueDiv.remove()
+},value:function(t){return t===e?this.options.value:(this.options.value=this._constrainedValue(t),this._refreshValue(),e)},_constrainedValue:function(t){return t===e&&(t=this.options.value),this.indeterminate=t===!1,"number"!=typeof t&&(t=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,t))},_setOptions:function(t){var e=t.value;delete t.value,this._super(t),this.options.value=this._constrainedValue(e),this._refreshValue()},_setOption:function(t,e){"max"===t&&(e=Math.max(this.min,e)),this._super(t,e)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var e=this.options.value,i=this._percentage();this.valueDiv.toggle(this.indeterminate||e>this.min).toggleClass("ui-corner-right",e===this.options.max).width(i.toFixed(0)+"%"),this.element.toggleClass("ui-progressbar-indeterminate",this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=t("<div class='ui-progressbar-overlay'></div>").appendTo(this.valueDiv))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":e}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==e&&(this.oldValue=e,this._trigger("change")),e===this.options.max&&this._trigger("complete")}})}(jQuery),function(t){var e=5;t.widget("ui.slider",t.ui.mouse,{version:"1.10.3",widgetEventPrefix:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget"+" ui-widget-content"+" ui-corner-all"),this._refresh(),this._setOption("disabled",this.options.disabled),this._animateOff=!1},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var e,i,s=this.options,n=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),o="<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>",a=[];for(i=s.values&&s.values.length||1,n.length>i&&(n.slice(i).remove(),n=n.slice(0,i)),e=n.length;i>e;e++)a.push(o);this.handles=n.add(t(a.join("")).appendTo(this.element)),this.handle=this.handles.eq(0),this.handles.each(function(e){t(this).data("ui-slider-handle-index",e)})},_createRange:function(){var e=this.options,i="";e.range?(e.range===!0&&(e.values?e.values.length&&2!==e.values.length?e.values=[e.values[0],e.values[0]]:t.isArray(e.values)&&(e.values=e.values.slice(0)):e.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?this.range.removeClass("ui-slider-range-min ui-slider-range-max").css({left:"",bottom:""}):(this.range=t("<div></div>").appendTo(this.element),i="ui-slider-range ui-widget-header ui-corner-all"),this.range.addClass(i+("min"===e.range||"max"===e.range?" ui-slider-range-"+e.range:""))):this.range=t([])},_setupEvents:function(){var t=this.handles.add(this.range).filter("a");this._off(t),this._on(t,this._handleEvents),this._hoverable(t),this._focusable(t)},_destroy:function(){this.handles.remove(),this.range.remove(),this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-widget ui-widget-content ui-corner-all"),this._mouseDestroy()},_mouseCapture:function(e){var i,s,n,o,a,r,h,l,c=this,u=this.options;return u.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),i={x:e.pageX,y:e.pageY},s=this._normValueFromMouse(i),n=this._valueMax()-this._valueMin()+1,this.handles.each(function(e){var i=Math.abs(s-c.values(e));(n>i||n===i&&(e===c._lastChangedValue||c.values(e)===u.min))&&(n=i,o=t(this),a=e)}),r=this._start(e,a),r===!1?!1:(this._mouseSliding=!0,this._handleIndex=a,o.addClass("ui-state-active").focus(),h=o.offset(),l=!t(e.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=l?{left:0,top:0}:{left:e.pageX-h.left-o.width()/2,top:e.pageY-h.top-o.height()/2-(parseInt(o.css("borderTopWidth"),10)||0)-(parseInt(o.css("borderBottomWidth"),10)||0)+(parseInt(o.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(e,a,s),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(t){var e={x:t.pageX,y:t.pageY},i=this._normValueFromMouse(e);return this._slide(t,this._handleIndex,i),!1},_mouseStop:function(t){return this.handles.removeClass("ui-state-active"),this._mouseSliding=!1,this._stop(t,this._handleIndex),this._change(t,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(t){var e,i,s,n,o;return"horizontal"===this.orientation?(e=this.elementSize.width,i=t.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(e=this.elementSize.height,i=t.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),s=i/e,s>1&&(s=1),0>s&&(s=0),"vertical"===this.orientation&&(s=1-s),n=this._valueMax()-this._valueMin(),o=this._valueMin()+s*n,this._trimAlignValue(o)},_start:function(t,e){var i={handle:this.handles[e],value:this.value()};return this.options.values&&this.options.values.length&&(i.value=this.values(e),i.values=this.values()),this._trigger("start",t,i)},_slide:function(t,e,i){var s,n,o;this.options.values&&this.options.values.length?(s=this.values(e?0:1),2===this.options.values.length&&this.options.range===!0&&(0===e&&i>s||1===e&&s>i)&&(i=s),i!==this.values(e)&&(n=this.values(),n[e]=i,o=this._trigger("slide",t,{handle:this.handles[e],value:i,values:n}),s=this.values(e?0:1),o!==!1&&this.values(e,i,!0))):i!==this.value()&&(o=this._trigger("slide",t,{handle:this.handles[e],value:i}),o!==!1&&this.value(i))},_stop:function(t,e){var i={handle:this.handles[e],value:this.value()};this.options.values&&this.options.values.length&&(i.value=this.values(e),i.values=this.values()),this._trigger("stop",t,i)},_change:function(t,e){if(!this._keySliding&&!this._mouseSliding){var i={handle:this.handles[e],value:this.value()};this.options.values&&this.options.values.length&&(i.value=this.values(e),i.values=this.values()),this._lastChangedValue=e,this._trigger("change",t,i)}},value:function(t){return arguments.length?(this.options.value=this._trimAlignValue(t),this._refreshValue(),this._change(null,0),undefined):this._value()},values:function(e,i){var s,n,o;if(arguments.length>1)return this.options.values[e]=this._trimAlignValue(i),this._refreshValue(),this._change(null,e),undefined;if(!arguments.length)return this._values();if(!t.isArray(arguments[0]))return this.options.values&&this.options.values.length?this._values(e):this.value();for(s=this.options.values,n=arguments[0],o=0;s.length>o;o+=1)s[o]=this._trimAlignValue(n[o]),this._change(null,o);this._refreshValue()},_setOption:function(e,i){var s,n=0;switch("range"===e&&this.options.range===!0&&("min"===i?(this.options.value=this._values(0),this.options.values=null):"max"===i&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),t.isArray(this.options.values)&&(n=this.options.values.length),t.Widget.prototype._setOption.apply(this,arguments),e){case"orientation":this._detectOrientation(),this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation),this._refreshValue();break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),s=0;n>s;s+=1)this._change(null,s);this._animateOff=!1;break;case"min":case"max":this._animateOff=!0,this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_value:function(){var t=this.options.value;return t=this._trimAlignValue(t)},_values:function(t){var e,i,s;if(arguments.length)return e=this.options.values[t],e=this._trimAlignValue(e);if(this.options.values&&this.options.values.length){for(i=this.options.values.slice(),s=0;i.length>s;s+=1)i[s]=this._trimAlignValue(i[s]);return i}return[]},_trimAlignValue:function(t){if(this._valueMin()>=t)return this._valueMin();if(t>=this._valueMax())return this._valueMax();var e=this.options.step>0?this.options.step:1,i=(t-this._valueMin())%e,s=t-i;return 2*Math.abs(i)>=e&&(s+=i>0?e:-e),parseFloat(s.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var e,i,s,n,o,a=this.options.range,r=this.options,h=this,l=this._animateOff?!1:r.animate,c={};this.options.values&&this.options.values.length?this.handles.each(function(s){i=100*((h.values(s)-h._valueMin())/(h._valueMax()-h._valueMin())),c["horizontal"===h.orientation?"left":"bottom"]=i+"%",t(this).stop(1,1)[l?"animate":"css"](c,r.animate),h.options.range===!0&&("horizontal"===h.orientation?(0===s&&h.range.stop(1,1)[l?"animate":"css"]({left:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({width:i-e+"%"},{queue:!1,duration:r.animate})):(0===s&&h.range.stop(1,1)[l?"animate":"css"]({bottom:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({height:i-e+"%"},{queue:!1,duration:r.animate}))),e=i}):(s=this.value(),n=this._valueMin(),o=this._valueMax(),i=o!==n?100*((s-n)/(o-n)):0,c["horizontal"===this.orientation?"left":"bottom"]=i+"%",this.handle.stop(1,1)[l?"animate":"css"](c,r.animate),"min"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:i+"%"},r.animate),"max"===a&&"horizontal"===this.orientation&&this.range[l?"animate":"css"]({width:100-i+"%"},{queue:!1,duration:r.animate}),"min"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:i+"%"},r.animate),"max"===a&&"vertical"===this.orientation&&this.range[l?"animate":"css"]({height:100-i+"%"},{queue:!1,duration:r.animate}))},_handleEvents:{keydown:function(i){var s,n,o,a,r=t(i.target).data("ui-slider-handle-index");switch(i.keyCode){case t.ui.keyCode.HOME:case t.ui.keyCode.END:case t.ui.keyCode.PAGE_UP:case t.ui.keyCode.PAGE_DOWN:case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(i.preventDefault(),!this._keySliding&&(this._keySliding=!0,t(i.target).addClass("ui-state-active"),s=this._start(i,r),s===!1))return}switch(a=this.options.step,n=o=this.options.values&&this.options.values.length?this.values(r):this.value(),i.keyCode){case t.ui.keyCode.HOME:o=this._valueMin();break;case t.ui.keyCode.END:o=this._valueMax();break;case t.ui.keyCode.PAGE_UP:o=this._trimAlignValue(n+(this._valueMax()-this._valueMin())/e);break;case t.ui.keyCode.PAGE_DOWN:o=this._trimAlignValue(n-(this._valueMax()-this._valueMin())/e);break;case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:if(n===this._valueMax())return;o=this._trimAlignValue(n+a);break;case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(n===this._valueMin())return;o=this._trimAlignValue(n-a)}this._slide(i,r,o)},click:function(t){t.preventDefault()},keyup:function(e){var i=t(e.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(e,i),this._change(e,i),t(e.target).removeClass("ui-state-active"))}}})}(jQuery),function(t){function e(t){return function(){var e=this.element.val();t.apply(this,arguments),this._refresh(),e!==this.element.val()&&this._trigger("change")}}t.widget("ui.spinner",{version:"1.10.3",defaultElement:"<input>",widgetEventPrefix:"spin",options:{culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var e={},i=this.element;return t.each(["min","max","step"],function(t,s){var n=i.attr(s);void 0!==n&&n.length&&(e[s]=n)}),e},_events:{keydown:function(t){this._start(t)&&this._keydown(t)&&t.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",t),void 0)},mousewheel:function(t,e){if(e){if(!this.spinning&&!this._start(t))return!1;this._spin((e>0?1:-1)*this.options.step,t),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(t)},100),t.preventDefault()}},"mousedown .ui-spinner-button":function(e){function i(){var t=this.element[0]===this.document[0].activeElement;t||(this.element.focus(),this.previous=s,this._delay(function(){this.previous=s}))}var s;s=this.element[0]===this.document[0].activeElement?this.previous:this.element.val(),e.preventDefault(),i.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,i.call(this)}),this._start(e)!==!1&&this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(e){return t(e.currentTarget).hasClass("ui-state-active")?this._start(e)===!1?!1:(this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e),void 0):void 0},"mouseleave .ui-spinner-button":"_stop"},_draw:function(){var t=this.uiSpinner=this.element.addClass("ui-spinner-input").attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml());this.element.attr("role","spinbutton"),this.buttons=t.find(".ui-spinner-button").attr("tabIndex",-1).button().removeClass("ui-corner-all"),this.buttons.height()>Math.ceil(.5*t.height())&&t.height()>0&&t.height(t.height()),this.options.disabled&&this.disable()},_keydown:function(e){var i=this.options,s=t.ui.keyCode;switch(e.keyCode){case s.UP:return this._repeat(null,1,e),!0;case s.DOWN:return this._repeat(null,-1,e),!0;case s.PAGE_UP:return this._repeat(null,i.page,e),!0;case s.PAGE_DOWN:return this._repeat(null,-i.page,e),!0}return!1},_uiSpinnerHtml:function(){return"<span class='ui-spinner ui-widget ui-widget-content ui-corner-all'></span>"},_buttonHtml:function(){return"<a class='ui-spinner-button ui-spinner-up ui-corner-tr'><span class='ui-icon "+this.options.icons.up+"'>&#9650;</span>"+"</a>"+"<a class='ui-spinner-button ui-spinner-down ui-corner-br'>"+"<span class='ui-icon "+this.options.icons.down+"'>&#9660;</span>"+"</a>"},_start:function(t){return this.spinning||this._trigger("start",t)!==!1?(this.counter||(this.counter=1),this.spinning=!0,!0):!1},_repeat:function(t,e,i){t=t||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,e,i)},t),this._spin(e*this.options.step,i)},_spin:function(t,e){var i=this.value()||0;this.counter||(this.counter=1),i=this._adjustValue(i+t*this._increment(this.counter)),this.spinning&&this._trigger("spin",e,{value:i})===!1||(this._value(i),this.counter++)},_increment:function(e){var i=this.options.incremental;return i?t.isFunction(i)?i(e):Math.floor(e*e*e/5e4-e*e/500+17*e/200+1):1},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_adjustValue:function(t){var e,i,s=this.options;return e=null!==s.min?s.min:0,i=t-e,i=Math.round(i/s.step)*s.step,t=e+i,t=parseFloat(t.toFixed(this._precision())),null!==s.max&&t>s.max?s.max:null!==s.min&&s.min>t?s.min:t},_stop:function(t){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",t))},_setOption:function(t,e){if("culture"===t||"numberFormat"===t){var i=this._parse(this.element.val());return this.options[t]=e,this.element.val(this._format(i)),void 0}("max"===t||"min"===t||"step"===t)&&"string"==typeof e&&(e=this._parse(e)),"icons"===t&&(this.buttons.first().find(".ui-icon").removeClass(this.options.icons.up).addClass(e.up),this.buttons.last().find(".ui-icon").removeClass(this.options.icons.down).addClass(e.down)),this._super(t,e),"disabled"===t&&(e?(this.element.prop("disabled",!0),this.buttons.button("disable")):(this.element.prop("disabled",!1),this.buttons.button("enable")))},_setOptions:e(function(t){this._super(t),this._value(this.element.val())}),_parse:function(t){return"string"==typeof t&&""!==t&&(t=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(t,10,this.options.culture):+t),""===t||isNaN(t)?null:t},_format:function(t){return""===t?"":window.Globalize&&this.options.numberFormat?Globalize.format(t,this.options.numberFormat,this.options.culture):t},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},_value:function(t,e){var i;""!==t&&(i=this._parse(t),null!==i&&(e||(i=this._adjustValue(i)),t=this._format(i))),this.element.val(t),this._refresh()},_destroy:function(){this.element.removeClass("ui-spinner-input").prop("disabled",!1).removeAttr("autocomplete").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:e(function(t){this._stepUp(t)}),_stepUp:function(t){this._start()&&(this._spin((t||1)*this.options.step),this._stop())},stepDown:e(function(t){this._stepDown(t)}),_stepDown:function(t){this._start()&&(this._spin((t||1)*-this.options.step),this._stop())},pageUp:e(function(t){this._stepUp((t||1)*this.options.page)}),pageDown:e(function(t){this._stepDown((t||1)*this.options.page)}),value:function(t){return arguments.length?(e(this._value).call(this,t),void 0):this._parse(this.element.val())},widget:function(){return this.uiSpinner}})}(jQuery),function(t,e){function i(){return++n}function s(t){return t.hash.length>1&&decodeURIComponent(t.href.replace(o,""))===decodeURIComponent(location.href.replace(o,""))}var n=0,o=/#.*$/;t.widget("ui.tabs",{version:"1.10.3",delay:300,options:{active:null,collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_create:function(){var e=this,i=this.options;this.running=!1,this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all").toggleClass("ui-tabs-collapsible",i.collapsible).delegate(".ui-tabs-nav > li","mousedown"+this.eventNamespace,function(e){t(this).is(".ui-state-disabled")&&e.preventDefault()}).delegate(".ui-tabs-anchor","focus"+this.eventNamespace,function(){t(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this._processTabs(),i.active=this._initialActive(),t.isArray(i.disabled)&&(i.disabled=t.unique(i.disabled.concat(t.map(this.tabs.filter(".ui-state-disabled"),function(t){return e.tabs.index(t)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(i.active):t(),this._refresh(),this.active.length&&this.load(i.active)},_initialActive:function(){var i=this.options.active,s=this.options.collapsible,n=location.hash.substring(1);return null===i&&(n&&this.tabs.each(function(s,o){return t(o).attr("aria-controls")===n?(i=s,!1):e}),null===i&&(i=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===i||-1===i)&&(i=this.tabs.length?0:!1)),i!==!1&&(i=this.tabs.index(this.tabs.eq(i)),-1===i&&(i=s?!1:0)),!s&&i===!1&&this.anchors.length&&(i=0),i},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):t()}},_tabKeydown:function(i){var s=t(this.document[0].activeElement).closest("li"),n=this.tabs.index(s),o=!0;if(!this._handlePageNav(i)){switch(i.keyCode){case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:n++;break;case t.ui.keyCode.UP:case t.ui.keyCode.LEFT:o=!1,n--;break;case t.ui.keyCode.END:n=this.anchors.length-1;break;case t.ui.keyCode.HOME:n=0;break;case t.ui.keyCode.SPACE:return i.preventDefault(),clearTimeout(this.activating),this._activate(n),e;case t.ui.keyCode.ENTER:return i.preventDefault(),clearTimeout(this.activating),this._activate(n===this.options.active?!1:n),e;default:return}i.preventDefault(),clearTimeout(this.activating),n=this._focusNextTab(n,o),i.ctrlKey||(s.attr("aria-selected","false"),this.tabs.eq(n).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",n)},this.delay))}},_panelKeydown:function(e){this._handlePageNav(e)||e.ctrlKey&&e.keyCode===t.ui.keyCode.UP&&(e.preventDefault(),this.active.focus())},_handlePageNav:function(i){return i.altKey&&i.keyCode===t.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):i.altKey&&i.keyCode===t.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):e},_findNextTab:function(e,i){function s(){return e>n&&(e=0),0>e&&(e=n),e}for(var n=this.tabs.length-1;-1!==t.inArray(s(),this.options.disabled);)e=i?e+1:e-1;return e},_focusNextTab:function(t,e){return t=this._findNextTab(t,e),this.tabs.eq(t).focus(),t},_setOption:function(t,i){return"active"===t?(this._activate(i),e):"disabled"===t?(this._setupDisabled(i),e):(this._super(t,i),"collapsible"===t&&(this.element.toggleClass("ui-tabs-collapsible",i),i||this.options.active!==!1||this._activate(0)),"event"===t&&this._setupEvents(i),"heightStyle"===t&&this._setupHeightStyle(i),e)},_tabId:function(t){return t.attr("aria-controls")||"ui-tabs-"+i()},_sanitizeSelector:function(t){return t?t.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var e=this.options,i=this.tablist.children(":has(a[href])");e.disabled=t.map(i.filter(".ui-state-disabled"),function(t){return i.index(t)}),this._processTabs(),e.active!==!1&&this.anchors.length?this.active.length&&!t.contains(this.tablist[0],this.active[0])?this.tabs.length===e.disabled.length?(e.active=!1,this.active=t()):this._activate(this._findNextTab(Math.max(0,e.active-1),!1)):e.active=this.tabs.index(this.active):(e.active=!1,this.active=t()),this._refresh()},_refresh:function(){this._setupDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-expanded":"false","aria-hidden":"true"}),this.active.length?(this.active.addClass("ui-tabs-active ui-state-active").attr({"aria-selected":"true",tabIndex:0}),this._getPanelForTab(this.active).show().attr({"aria-expanded":"true","aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var e=this;this.tablist=this._getList().addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").attr("role","tablist"),this.tabs=this.tablist.find("> li:has(a[href])").addClass("ui-state-default ui-corner-top").attr({role:"tab",tabIndex:-1}),this.anchors=this.tabs.map(function(){return t("a",this)[0]}).addClass("ui-tabs-anchor").attr({role:"presentation",tabIndex:-1}),this.panels=t(),this.anchors.each(function(i,n){var o,a,r,h=t(n).uniqueId().attr("id"),l=t(n).closest("li"),c=l.attr("aria-controls");s(n)?(o=n.hash,a=e.element.find(e._sanitizeSelector(o))):(r=e._tabId(l),o="#"+r,a=e.element.find(o),a.length||(a=e._createPanel(r),a.insertAfter(e.panels[i-1]||e.tablist)),a.attr("aria-live","polite")),a.length&&(e.panels=e.panels.add(a)),c&&l.data("ui-tabs-aria-controls",c),l.attr({"aria-controls":o.substring(1),"aria-labelledby":h}),a.attr("aria-labelledby",h)}),this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").attr("role","tabpanel")},_getList:function(){return this.element.find("ol,ul").eq(0)},_createPanel:function(e){return t("<div>").attr("id",e).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").data("ui-tabs-destroy",!0)},_setupDisabled:function(e){t.isArray(e)&&(e.length?e.length===this.anchors.length&&(e=!0):e=!1);for(var i,s=0;i=this.tabs[s];s++)e===!0||-1!==t.inArray(s,e)?t(i).addClass("ui-state-disabled").attr("aria-disabled","true"):t(i).removeClass("ui-state-disabled").removeAttr("aria-disabled");this.options.disabled=e},_setupEvents:function(e){var i={click:function(t){t.preventDefault()}};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(this.anchors,i),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(e){var i,s=this.element.parent();"fill"===e?(i=s.height(),i-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var e=t(this),s=e.css("position");"absolute"!==s&&"fixed"!==s&&(i-=e.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){i-=t(this).outerHeight(!0)}),this.panels.each(function(){t(this).height(Math.max(0,i-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===e&&(i=0,this.panels.each(function(){i=Math.max(i,t(this).height("").height())}).height(i))},_eventHandler:function(e){var i=this.options,s=this.active,n=t(e.currentTarget),o=n.closest("li"),a=o[0]===s[0],r=a&&i.collapsible,h=r?t():this._getPanelForTab(o),l=s.length?this._getPanelForTab(s):t(),c={oldTab:s,oldPanel:l,newTab:r?t():o,newPanel:h};e.preventDefault(),o.hasClass("ui-state-disabled")||o.hasClass("ui-tabs-loading")||this.running||a&&!i.collapsible||this._trigger("beforeActivate",e,c)===!1||(i.active=r?!1:this.tabs.index(o),this.active=a?t():o,this.xhr&&this.xhr.abort(),l.length||h.length||t.error("jQuery UI Tabs: Mismatching fragment identifier."),h.length&&this.load(this.tabs.index(o),e),this._toggle(e,c))},_toggle:function(e,i){function s(){o.running=!1,o._trigger("activate",e,i)}function n(){i.newTab.closest("li").addClass("ui-tabs-active ui-state-active"),a.length&&o.options.show?o._show(a,o.options.show,s):(a.show(),s())}var o=this,a=i.newPanel,r=i.oldPanel;this.running=!0,r.length&&this.options.hide?this._hide(r,this.options.hide,function(){i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),n()}):(i.oldTab.closest("li").removeClass("ui-tabs-active ui-state-active"),r.hide(),n()),r.attr({"aria-expanded":"false","aria-hidden":"true"}),i.oldTab.attr("aria-selected","false"),a.length&&r.length?i.oldTab.attr("tabIndex",-1):a.length&&this.tabs.filter(function(){return 0===t(this).attr("tabIndex")}).attr("tabIndex",-1),a.attr({"aria-expanded":"true","aria-hidden":"false"}),i.newTab.attr({"aria-selected":"true",tabIndex:0})},_activate:function(e){var i,s=this._findActive(e);s[0]!==this.active[0]&&(s.length||(s=this.active),i=s.find(".ui-tabs-anchor")[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return e===!1?t():this.tabs.eq(e)},_getIndex:function(t){return"string"==typeof t&&(t=this.anchors.index(this.anchors.filter("[href$='"+t+"']"))),t},_destroy:function(){this.xhr&&this.xhr.abort(),this.element.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible"),this.tablist.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").removeAttr("role"),this.anchors.removeClass("ui-tabs-anchor").removeAttr("role").removeAttr("tabIndex").removeUniqueId(),this.tabs.add(this.panels).each(function(){t.data(this,"ui-tabs-destroy")?t(this).remove():t(this).removeClass("ui-state-default ui-state-active ui-state-disabled ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel").removeAttr("tabIndex").removeAttr("aria-live").removeAttr("aria-busy").removeAttr("aria-selected").removeAttr("aria-labelledby").removeAttr("aria-hidden").removeAttr("aria-expanded").removeAttr("role")}),this.tabs.each(function(){var e=t(this),i=e.data("ui-tabs-aria-controls");i?e.attr("aria-controls",i).removeData("ui-tabs-aria-controls"):e.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(i){var s=this.options.disabled;s!==!1&&(i===e?s=!1:(i=this._getIndex(i),s=t.isArray(s)?t.map(s,function(t){return t!==i?t:null}):t.map(this.tabs,function(t,e){return e!==i?e:null})),this._setupDisabled(s))},disable:function(i){var s=this.options.disabled;if(s!==!0){if(i===e)s=!0;else{if(i=this._getIndex(i),-1!==t.inArray(i,s))return;s=t.isArray(s)?t.merge([i],s).sort():[i]}this._setupDisabled(s)}},load:function(e,i){e=this._getIndex(e);var n=this,o=this.tabs.eq(e),a=o.find(".ui-tabs-anchor"),r=this._getPanelForTab(o),h={tab:o,panel:r};s(a[0])||(this.xhr=t.ajax(this._ajaxSettings(a,i,h)),this.xhr&&"canceled"!==this.xhr.statusText&&(o.addClass("ui-tabs-loading"),r.attr("aria-busy","true"),this.xhr.success(function(t){setTimeout(function(){r.html(t),n._trigger("load",i,h)},1)}).complete(function(t,e){setTimeout(function(){"abort"===e&&n.panels.stop(!1,!0),o.removeClass("ui-tabs-loading"),r.removeAttr("aria-busy"),t===n.xhr&&delete n.xhr},1)})))},_ajaxSettings:function(e,i,s){var n=this;return{url:e.attr("href"),beforeSend:function(e,o){return n._trigger("beforeLoad",i,t.extend({jqXHR:e,ajaxSettings:o},s))}}},_getPanelForTab:function(e){var i=t(e).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+i))}})}(jQuery),function(t){function e(e,i){var s=(e.attr("aria-describedby")||"").split(/\s+/);s.push(i),e.data("ui-tooltip-id",i).attr("aria-describedby",t.trim(s.join(" ")))}function i(e){var i=e.data("ui-tooltip-id"),s=(e.attr("aria-describedby")||"").split(/\s+/),n=t.inArray(i,s);-1!==n&&s.splice(n,1),e.removeData("ui-tooltip-id"),s=t.trim(s.join(" ")),s?e.attr("aria-describedby",s):e.removeAttr("aria-describedby")}var s=0;t.widget("ui.tooltip",{version:"1.10.3",options:{content:function(){var e=t(this).attr("title")||"";return t("<a>").text(e).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,tooltipClass:null,track:!1,close:null,open:null},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.options.disabled&&this._disable()},_setOption:function(e,i){var s=this;return"disabled"===e?(this[i?"_disable":"_enable"](),this.options[e]=i,void 0):(this._super(e,i),"content"===e&&t.each(this.tooltips,function(t,e){s._updateContent(e)}),void 0)},_disable:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur");n.target=n.currentTarget=s[0],e.close(n,!0)}),this.element.find(this.options.items).addBack().each(function(){var e=t(this);e.is("[title]")&&e.data("ui-tooltip-title",e.attr("title")).attr("title","")})},_enable:function(){this.element.find(this.options.items).addBack().each(function(){var e=t(this);e.data("ui-tooltip-title")&&e.attr("title",e.data("ui-tooltip-title"))})},open:function(e){var i=this,s=t(e?e.target:this.element).closest(this.options.items);s.length&&!s.data("ui-tooltip-id")&&(s.attr("title")&&s.data("ui-tooltip-title",s.attr("title")),s.data("ui-tooltip-open",!0),e&&"mouseover"===e.type&&s.parents().each(function(){var e,s=t(this);s.data("ui-tooltip-open")&&(e=t.Event("blur"),e.target=e.currentTarget=this,i.close(e,!0)),s.attr("title")&&(s.uniqueId(),i.parents[this.id]={element:this,title:s.attr("title")},s.attr("title",""))}),this._updateContent(s,e))},_updateContent:function(t,e){var i,s=this.options.content,n=this,o=e?e.type:null;return"string"==typeof s?this._open(e,t,s):(i=s.call(t[0],function(i){t.data("ui-tooltip-open")&&n._delay(function(){e&&(e.type=o),this._open(e,t,i)})}),i&&this._open(e,t,i),void 0)},_open:function(i,s,n){function o(t){l.of=t,a.is(":hidden")||a.position(l)}var a,r,h,l=t.extend({},this.options.position);
+if(n){if(a=this._find(s),a.length)return a.find(".ui-tooltip-content").html(n),void 0;s.is("[title]")&&(i&&"mouseover"===i.type?s.attr("title",""):s.removeAttr("title")),a=this._tooltip(s),e(s,a.attr("id")),a.find(".ui-tooltip-content").html(n),this.options.track&&i&&/^mouse/.test(i.type)?(this._on(this.document,{mousemove:o}),o(i)):a.position(t.extend({of:s},this.options.position)),a.hide(),this._show(a,this.options.show),this.options.show&&this.options.show.delay&&(h=this.delayedShow=setInterval(function(){a.is(":visible")&&(o(l.of),clearInterval(h))},t.fx.interval)),this._trigger("open",i,{tooltip:a}),r={keyup:function(e){if(e.keyCode===t.ui.keyCode.ESCAPE){var i=t.Event(e);i.currentTarget=s[0],this.close(i,!0)}},remove:function(){this._removeTooltip(a)}},i&&"mouseover"!==i.type||(r.mouseleave="close"),i&&"focusin"!==i.type||(r.focusout="close"),this._on(!0,s,r)}},close:function(e){var s=this,n=t(e?e.currentTarget:this.element),o=this._find(n);this.closing||(clearInterval(this.delayedShow),n.data("ui-tooltip-title")&&n.attr("title",n.data("ui-tooltip-title")),i(n),o.stop(!0),this._hide(o,this.options.hide,function(){s._removeTooltip(t(this))}),n.removeData("ui-tooltip-open"),this._off(n,"mouseleave focusout keyup"),n[0]!==this.element[0]&&this._off(n,"remove"),this._off(this.document,"mousemove"),e&&"mouseleave"===e.type&&t.each(this.parents,function(e,i){t(i.element).attr("title",i.title),delete s.parents[e]}),this.closing=!0,this._trigger("close",e,{tooltip:o}),this.closing=!1)},_tooltip:function(e){var i="ui-tooltip-"+s++,n=t("<div>").attr({id:i,role:"tooltip"}).addClass("ui-tooltip ui-widget ui-corner-all ui-widget-content "+(this.options.tooltipClass||""));return t("<div>").addClass("ui-tooltip-content").appendTo(n),n.appendTo(this.document[0].body),this.tooltips[i]=e,n},_find:function(e){var i=e.data("ui-tooltip-id");return i?t("#"+i):t()},_removeTooltip:function(t){t.remove(),delete this.tooltips[t.attr("id")]},_destroy:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur");n.target=n.currentTarget=s[0],e.close(n,!0),t("#"+i).remove(),s.data("ui-tooltip-title")&&(s.attr("title",s.data("ui-tooltip-title")),s.removeData("ui-tooltip-title"))})}})}(jQuery);
diff --git a/data/interfaces/default/js/highcharts/api/js/jquery.min.js b/data/interfaces/default/js/highcharts/api/js/jquery.min.js
new file mode 100644
index 00000000..32d50cb0
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/api/js/jquery.min.js
@@ -0,0 +1,5 @@
+/*! jQuery v1.9.1 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license
+//@ sourceMappingURL=jquery.min.map
+*/(function(e,t){var n,r,i=typeof t,o=e.document,a=e.location,s=e.jQuery,u=e.$,l={},c=[],p="1.9.1",f=c.concat,d=c.push,h=c.slice,g=c.indexOf,m=l.toString,y=l.hasOwnProperty,v=p.trim,b=function(e,t){return new b.fn.init(e,t,r)},x=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,w=/\S+/g,T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,k=/^[\],:{}\s]*$/,E=/(?:^|:|,)(?:\s*\[)+/g,S=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,A=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,j=/^-ms-/,D=/-([\da-z])/gi,L=function(e,t){return t.toUpperCase()},H=function(e){(o.addEventListener||"load"===e.type||"complete"===o.readyState)&&(q(),b.ready())},q=function(){o.addEventListener?(o.removeEventListener("DOMContentLoaded",H,!1),e.removeEventListener("load",H,!1)):(o.detachEvent("onreadystatechange",H),e.detachEvent("onload",H))};b.fn=b.prototype={jquery:p,constructor:b,init:function(e,n,r){var i,a;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof b?n[0]:n,b.merge(this,b.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:o,!0)),C.test(i[1])&&b.isPlainObject(n))for(i in n)b.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(a=o.getElementById(i[2]),a&&a.parentNode){if(a.id!==i[2])return r.find(e);this.length=1,this[0]=a}return this.context=o,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):b.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),b.makeArray(e,this))},selector:"",length:0,size:function(){return this.length},toArray:function(){return h.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=b.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return b.each(this,e,t)},ready:function(e){return b.ready.promise().done(e),this},slice:function(){return this.pushStack(h.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(b.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:d,sort:[].sort,splice:[].splice},b.fn.init.prototype=b.fn,b.extend=b.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},u=1,l=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},u=2),"object"==typeof s||b.isFunction(s)||(s={}),l===u&&(s=this,--u);l>u;u++)if(null!=(o=arguments[u]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(b.isPlainObject(r)||(n=b.isArray(r)))?(n?(n=!1,a=e&&b.isArray(e)?e:[]):a=e&&b.isPlainObject(e)?e:{},s[i]=b.extend(c,a,r)):r!==t&&(s[i]=r));return s},b.extend({noConflict:function(t){return e.$===b&&(e.$=u),t&&e.jQuery===b&&(e.jQuery=s),b},isReady:!1,readyWait:1,holdReady:function(e){e?b.readyWait++:b.ready(!0)},ready:function(e){if(e===!0?!--b.readyWait:!b.isReady){if(!o.body)return setTimeout(b.ready);b.isReady=!0,e!==!0&&--b.readyWait>0||(n.resolveWith(o,[b]),b.fn.trigger&&b(o).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===b.type(e)},isArray:Array.isArray||function(e){return"array"===b.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[m.call(e)]||"object":typeof e},isPlainObject:function(e){if(!e||"object"!==b.type(e)||e.nodeType||b.isWindow(e))return!1;try{if(e.constructor&&!y.call(e,"constructor")&&!y.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||y.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||o;var r=C.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=b.buildFragment([e],t,i),i&&b(i).remove(),b.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=b.trim(n),n&&k.test(n.replace(S,"@").replace(A,"]").replace(E,"")))?Function("return "+n)():(b.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||b.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&b.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(j,"ms-").replace(D,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:v&&!v.call("\ufeff\u00a0")?function(e){return null==e?"":v.call(e)}:function(e){return null==e?"":(e+"").replace(T,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?b.merge(n,"string"==typeof e?[e]:e):d.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(g)return g.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return f.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),b.isFunction(e)?(r=h.call(arguments,2),i=function(){return e.apply(n||this,r.concat(h.call(arguments)))},i.guid=e.guid=e.guid||b.guid++,i):t},access:function(e,n,r,i,o,a,s){var u=0,l=e.length,c=null==r;if("object"===b.type(r)){o=!0;for(u in r)b.access(e,n,u,r[u],!0,a,s)}else if(i!==t&&(o=!0,b.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(b(e),n)})),n))for(;l>u;u++)n(e[u],r,s?i:i.call(e[u],u,n(e[u],r)));return o?e:c?n.call(e):l?n(e[0],r):a},now:function(){return(new Date).getTime()}}),b.ready.promise=function(t){if(!n)if(n=b.Deferred(),"complete"===o.readyState)setTimeout(b.ready);else if(o.addEventListener)o.addEventListener("DOMContentLoaded",H,!1),e.addEventListener("load",H,!1);else{o.attachEvent("onreadystatechange",H),e.attachEvent("onload",H);var r=!1;try{r=null==e.frameElement&&o.documentElement}catch(i){}r&&r.doScroll&&function a(){if(!b.isReady){try{r.doScroll("left")}catch(e){return setTimeout(a,50)}q(),b.ready()}}()}return n.promise(t)},b.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=b.type(e);return b.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=b(o);var _={};function F(e){var t=_[e]={};return b.each(e.match(w)||[],function(e,n){t[n]=!0}),t}b.Callbacks=function(e){e="string"==typeof e?_[e]||F(e):b.extend({},e);var n,r,i,o,a,s,u=[],l=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=u.length,n=!0;u&&o>a;a++)if(u[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,u&&(l?l.length&&c(l.shift()):r?u=[]:p.disable())},p={add:function(){if(u){var t=u.length;(function i(t){b.each(t,function(t,n){var r=b.type(n);"function"===r?e.unique&&p.has(n)||u.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=u.length:r&&(s=t,c(r))}return this},remove:function(){return u&&b.each(arguments,function(e,t){var r;while((r=b.inArray(t,u,r))>-1)u.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?b.inArray(e,u)>-1:!(!u||!u.length)},empty:function(){return u=[],this},disable:function(){return u=l=r=t,this},disabled:function(){return!u},lock:function(){return l=t,r||p.disable(),this},locked:function(){return!l},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!u||i&&!l||(n?l.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},b.extend({Deferred:function(e){var t=[["resolve","done",b.Callbacks("once memory"),"resolved"],["reject","fail",b.Callbacks("once memory"),"rejected"],["notify","progress",b.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return b.Deferred(function(n){b.each(t,function(t,o){var a=o[0],s=b.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&b.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?b.extend(e,r):r}},i={};return r.pipe=r.then,b.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=h.call(arguments),r=n.length,i=1!==r||e&&b.isFunction(e.promise)?r:0,o=1===i?e:b.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?h.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,u,l;if(r>1)for(s=Array(r),u=Array(r),l=Array(r);r>t;t++)n[t]&&b.isFunction(n[t].promise)?n[t].promise().done(a(t,l,n)).fail(o.reject).progress(a(t,u,s)):--i;return i||o.resolveWith(l,n),o.promise()}}),b.support=function(){var t,n,r,a,s,u,l,c,p,f,d=o.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*"),r=d.getElementsByTagName("a")[0],!n||!r||!n.length)return{};s=o.createElement("select"),l=s.appendChild(o.createElement("option")),a=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={getSetAttribute:"t"!==d.className,leadingWhitespace:3===d.firstChild.nodeType,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:"/a"===r.getAttribute("href"),opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:!!a.value,optSelected:l.selected,enctype:!!o.createElement("form").enctype,html5Clone:"<:nav></:nav>"!==o.createElement("nav").cloneNode(!0).outerHTML,boxModel:"CSS1Compat"===o.compatMode,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},a.checked=!0,t.noCloneChecked=a.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!l.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}a=o.createElement("input"),a.setAttribute("value",""),t.input=""===a.getAttribute("value"),a.value="t",a.setAttribute("type","radio"),t.radioValue="t"===a.value,a.setAttribute("checked","t"),a.setAttribute("name","t"),u=o.createDocumentFragment(),u.appendChild(a),t.appendChecked=a.checked,t.checkClone=u.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;return d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip,b(function(){var n,r,a,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",u=o.getElementsByTagName("body")[0];u&&(n=o.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",u.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",a=d.getElementsByTagName("td"),a[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===a[0].offsetHeight,a[0].style.display="",a[1].style.display="none",t.reliableHiddenOffsets=p&&0===a[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=4===d.offsetWidth,t.doesNotIncludeMarginInBodyOffset=1!==u.offsetTop,e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(o.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(u.style.zoom=1)),u.removeChild(n),n=d=a=r=null)}),n=s=u=l=r=a=null,t}();var O=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,B=/([A-Z])/g;function P(e,n,r,i){if(b.acceptData(e)){var o,a,s=b.expando,u="string"==typeof n,l=e.nodeType,p=l?b.cache:e,f=l?e[s]:e[s]&&s;if(f&&p[f]&&(i||p[f].data)||!u||r!==t)return f||(l?e[s]=f=c.pop()||b.guid++:f=s),p[f]||(p[f]={},l||(p[f].toJSON=b.noop)),("object"==typeof n||"function"==typeof n)&&(i?p[f]=b.extend(p[f],n):p[f].data=b.extend(p[f].data,n)),o=p[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[b.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[b.camelCase(n)])):a=o,a}}function R(e,t,n){if(b.acceptData(e)){var r,i,o,a=e.nodeType,s=a?b.cache:e,u=a?e[b.expando]:b.expando;if(s[u]){if(t&&(o=n?s[u]:s[u].data)){b.isArray(t)?t=t.concat(b.map(t,b.camelCase)):t in o?t=[t]:(t=b.camelCase(t),t=t in o?[t]:t.split(" "));for(r=0,i=t.length;i>r;r++)delete o[t[r]];if(!(n?$:b.isEmptyObject)(o))return}(n||(delete s[u].data,$(s[u])))&&(a?b.cleanData([e],!0):b.support.deleteExpando||s!=s.window?delete s[u]:s[u]=null)}}}b.extend({cache:{},expando:"jQuery"+(p+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?b.cache[e[b.expando]]:e[b.expando],!!e&&!$(e)},data:function(e,t,n){return P(e,t,n)},removeData:function(e,t){return R(e,t)},_data:function(e,t,n){return P(e,t,n,!0)},_removeData:function(e,t){return R(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&b.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),b.fn.extend({data:function(e,n){var r,i,o=this[0],a=0,s=null;if(e===t){if(this.length&&(s=b.data(o),1===o.nodeType&&!b._data(o,"parsedAttrs"))){for(r=o.attributes;r.length>a;a++)i=r[a].name,i.indexOf("data-")||(i=b.camelCase(i.slice(5)),W(o,i,s[i]));b._data(o,"parsedAttrs",!0)}return s}return"object"==typeof e?this.each(function(){b.data(this,e)}):b.access(this,function(n){return n===t?o?W(o,e,b.data(o,e)):null:(this.each(function(){b.data(this,e,n)}),t)},null,n,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){b.removeData(this,e)})}});function W(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(B,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:O.test(r)?b.parseJSON(r):r}catch(o){}b.data(e,n,r)}else r=t}return r}function $(e){var t;for(t in e)if(("data"!==t||!b.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}b.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=b._data(e,n),r&&(!i||b.isArray(r)?i=b._data(e,n,b.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=b.queue(e,t),r=n.length,i=n.shift(),o=b._queueHooks(e,t),a=function(){b.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),o.cur=i,i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return b._data(e,n)||b._data(e,n,{empty:b.Callbacks("once memory").add(function(){b._removeData(e,t+"queue"),b._removeData(e,n)})})}}),b.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?b.queue(this[0],e):n===t?this:this.each(function(){var t=b.queue(this,e,n);b._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&b.dequeue(this,e)})},dequeue:function(e){return this.each(function(){b.dequeue(this,e)})},delay:function(e,t){return e=b.fx?b.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=b.Deferred(),a=this,s=this.length,u=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=b._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(u));return u(),o.promise(n)}});var I,z,X=/[\t\r\n]/g,U=/\r/g,V=/^(?:input|select|textarea|button|object)$/i,Y=/^(?:a|area)$/i,J=/^(?:checked|selected|autofocus|autoplay|async|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped)$/i,G=/^(?:checked|selected)$/i,Q=b.support.getSetAttribute,K=b.support.input;b.fn.extend({attr:function(e,t){return b.access(this,b.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){b.removeAttr(this,e)})},prop:function(e,t){return b.access(this,b.prop,e,t,arguments.length>1)},removeProp:function(e){return e=b.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,u="string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=b.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,u=0===arguments.length||"string"==typeof e&&e;if(b.isFunction(e))return this.each(function(t){b(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(X," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?b.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return b.isFunction(e)?this.each(function(n){b(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var o,a=0,s=b(this),u=t,l=e.match(w)||[];while(o=l[a++])u=r?u:!s.hasClass(o),s[u?"addClass":"removeClass"](o)}else(n===i||"boolean"===n)&&(this.className&&b._data(this,"__className__",this.className),this.className=this.className||e===!1?"":b._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(X," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=b.isFunction(e),this.each(function(n){var o,a=b(this);1===this.nodeType&&(o=i?e.call(this,n,a.val()):e,null==o?o="":"number"==typeof o?o+="":b.isArray(o)&&(o=b.map(o,function(e){return null==e?"":e+""})),r=b.valHooks[this.type]||b.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=b.valHooks[o.type]||b.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(U,""):null==n?"":n)}}}),b.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,u=0>i?s:o?i:0;for(;s>u;u++)if(n=r[u],!(!n.selected&&u!==i||(b.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&b.nodeName(n.parentNode,"optgroup"))){if(t=b(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n=b.makeArray(t);return b(e).find("option").each(function(){this.selected=b.inArray(b(this).val(),n)>=0}),n.length||(e.selectedIndex=-1),n}}},attr:function(e,n,r){var o,a,s,u=e.nodeType;if(e&&3!==u&&8!==u&&2!==u)return typeof e.getAttribute===i?b.prop(e,n,r):(a=1!==u||!b.isXMLDoc(e),a&&(n=n.toLowerCase(),o=b.attrHooks[n]||(J.test(n)?z:I)),r===t?o&&a&&"get"in o&&null!==(s=o.get(e,n))?s:(typeof e.getAttribute!==i&&(s=e.getAttribute(n)),null==s?t:s):null!==r?o&&a&&"set"in o&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r):(b.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(w);if(o&&1===e.nodeType)while(n=o[i++])r=b.propFix[n]||n,J.test(n)?!Q&&G.test(n)?e[b.camelCase("default-"+n)]=e[r]=!1:e[r]=!1:b.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!b.support.radioValue&&"radio"===t&&b.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!b.isXMLDoc(e),a&&(n=b.propFix[n]||n,o=b.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var n=e.getAttributeNode("tabindex");return n&&n.specified?parseInt(n.value,10):V.test(e.nodeName)||Y.test(e.nodeName)&&e.href?0:t}}}}),z={get:function(e,n){var r=b.prop(e,n),i="boolean"==typeof r&&e.getAttribute(n),o="boolean"==typeof r?K&&Q?null!=i:G.test(n)?e[b.camelCase("default-"+n)]:!!i:e.getAttributeNode(n);return o&&o.value!==!1?n.toLowerCase():t},set:function(e,t,n){return t===!1?b.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&b.propFix[n]||n,n):e[b.camelCase("default-"+n)]=e[n]=!0,n}},K&&Q||(b.attrHooks.value={get:function(e,n){var r=e.getAttributeNode(n);return b.nodeName(e,"input")?e.defaultValue:r&&r.specified?r.value:t},set:function(e,n,r){return b.nodeName(e,"input")?(e.defaultValue=n,t):I&&I.set(e,n,r)}}),Q||(I=b.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&("id"===n||"name"===n||"coords"===n?""!==r.value:r.specified)?r.value:t},set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},b.attrHooks.contenteditable={get:I.get,set:function(e,t,n){I.set(e,""===t?!1:t,n)}},b.each(["width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}})})),b.support.hrefNormalized||(b.each(["href","src","width","height"],function(e,n){b.attrHooks[n]=b.extend(b.attrHooks[n],{get:function(e){var r=e.getAttribute(n,2);return null==r?t:r}})}),b.each(["href","src"],function(e,t){b.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}})),b.support.style||(b.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),b.support.optSelected||(b.propHooks.selected=b.extend(b.propHooks.selected,{get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}})),b.support.enctype||(b.propFix.enctype="encoding"),b.support.checkOn||b.each(["radio","checkbox"],function(){b.valHooks[this]={get:function(e){return null===e.getAttribute("value")?"on":e.value}}}),b.each(["radio","checkbox"],function(){b.valHooks[this]=b.extend(b.valHooks[this],{set:function(e,n){return b.isArray(n)?e.checked=b.inArray(b(e).val(),n)>=0:t}})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}b.event={global:{},add:function(e,n,r,o,a){var s,u,l,c,p,f,d,h,g,m,y,v=b._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=b.guid++),(u=v.events)||(u=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof b===i||e&&b.event.triggered===e.type?t:b.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(w)||[""],l=n.length;while(l--)s=rt.exec(n[l])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),p=b.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=b.event.special[g]||{},d=b.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&b.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=u[g])||(h=u[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),b.event.global[g]=!0;e=null}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,p,f,d,h,g,m=b.hasData(e)&&b._data(e);if(m&&(c=m.events)){t=(t||"").match(w)||[""],l=t.length;while(l--)if(s=rt.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=b.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),u=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));u&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||b.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)b.event.remove(e,d+t[l],n,r,!0);b.isEmptyObject(c)&&(delete m.handle,b._removeData(e,"events"))}},trigger:function(n,r,i,a){var s,u,l,c,p,f,d,h=[i||o],g=y.call(n,"type")?n.type:n,m=y.call(n,"namespace")?n.namespace.split("."):[];if(l=f=i=i||o,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+b.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),u=0>g.indexOf(":")&&"on"+g,n=n[b.expando]?n:new b.Event(g,"object"==typeof n&&n),n.isTrigger=!0,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:b.makeArray(r,[n]),p=b.event.special[g]||{},a||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!a&&!p.noBubble&&!b.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(l=l.parentNode);l;l=l.parentNode)h.push(l),f=l;f===(i.ownerDocument||o)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((l=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(b._data(l,"events")||{})[n.type]&&b._data(l,"handle"),s&&s.apply(l,r),s=u&&l[u],s&&b.acceptData(l)&&s.apply&&s.apply(l,r)===!1&&n.preventDefault();if(n.type=g,!(a||n.isDefaultPrevented()||p._default&&p._default.apply(i.ownerDocument,r)!==!1||"click"===g&&b.nodeName(i,"a")||!b.acceptData(i)||!u||!i[g]||b.isWindow(i))){f=i[u],f&&(i[u]=null),b.event.triggered=g;try{i[g]()}catch(v){}b.event.triggered=t,f&&(i[u]=f)}return n.result}},dispatch:function(e){e=b.event.fix(e);var n,r,i,o,a,s=[],u=h.call(arguments),l=(b._data(this,"events")||{})[e.type]||[],c=b.event.special[e.type]||{};if(u[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=b.event.handlers.call(this,e,l),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((b.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,u),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],u=n.delegateCount,l=e.target;if(u&&l.nodeType&&(!e.button||"click"!==e.type))for(;l!=this;l=l.parentNode||this)if(1===l.nodeType&&(l.disabled!==!0||"click"!==e.type)){for(o=[],a=0;u>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?b(r,this).index(l)>=0:b.find(r,this,null,[l]).length),o[r]&&o.push(i);o.length&&s.push({elem:l,handlers:o})}return n.length>u&&s.push({elem:this,handlers:n.slice(u)}),s},fix:function(e){if(e[b.expando])return e;var t,n,r,i=e.type,a=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new b.Event(a),t=r.length;while(t--)n=r[t],e[n]=a[n];return e.target||(e.target=a.srcElement||o),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,a):e},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(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,a,s=n.button,u=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||o,a=i.documentElement,r=i.body,e.pageX=n.clientX+(a&&a.scrollLeft||r&&r.scrollLeft||0)-(a&&a.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(a&&a.scrollTop||r&&r.scrollTop||0)-(a&&a.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&u&&(e.relatedTarget=u===e.target?n.toElement:u),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},click:{trigger:function(){return b.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t}},focus:{trigger:function(){if(this!==o.activeElement&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===o.activeElement&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=b.extend(new b.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?b.event.trigger(i,null,t):b.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},b.removeEvent=o.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},b.Event=function(e,n){return this instanceof b.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&b.extend(this,n),this.timeStamp=e&&e.timeStamp||b.now(),this[b.expando]=!0,t):new b.Event(e,n)},b.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},b.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){b.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;
+return(!i||i!==r&&!b.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),b.support.submitBubbles||(b.event.special.submit={setup:function(){return b.nodeName(this,"form")?!1:(b.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=b.nodeName(n,"input")||b.nodeName(n,"button")?n.form:t;r&&!b._data(r,"submitBubbles")&&(b.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),b._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&b.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return b.nodeName(this,"form")?!1:(b.event.remove(this,"._submit"),t)}}),b.support.changeBubbles||(b.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(b.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),b.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),b.event.simulate("change",this,e,!0)})),!1):(b.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!b._data(t,"changeBubbles")&&(b.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||b.event.simulate("change",this.parentNode,e,!0)}),b._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return b.event.remove(this,"._change"),!Z.test(this.nodeName)}}),b.support.focusinBubbles||b.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){b.event.simulate(t,e.target,b.event.fix(e),!0)};b.event.special[t]={setup:function(){0===n++&&o.addEventListener(e,r,!0)},teardown:function(){0===--n&&o.removeEventListener(e,r,!0)}}}),b.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return b().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=b.guid++)),this.each(function(){b.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,b(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){b.event.remove(this,e,r,n)})},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},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)},trigger:function(e,t){return this.each(function(){b.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?b.event.trigger(e,n,r,!0):t}}),function(e,t){var n,r,i,o,a,s,u,l,c,p,f,d,h,g,m,y,v,x="sizzle"+-new Date,w=e.document,T={},N=0,C=0,k=it(),E=it(),S=it(),A=typeof t,j=1<<31,D=[],L=D.pop,H=D.push,q=D.slice,M=D.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},_="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=F.replace("w","w#"),B="([*^$|!~]?=)",P="\\["+_+"*("+F+")"+_+"*(?:"+B+_+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+O+")|)|)"+_+"*\\]",R=":("+F+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+P.replace(3,8)+")*)|.*)\\)|)",W=RegExp("^"+_+"+|((?:^|[^\\\\])(?:\\\\.)*)"+_+"+$","g"),$=RegExp("^"+_+"*,"+_+"*"),I=RegExp("^"+_+"*([\\x20\\t\\r\\n\\f>+~])"+_+"*"),z=RegExp(R),X=RegExp("^"+O+"$"),U={ID:RegExp("^#("+F+")"),CLASS:RegExp("^\\.("+F+")"),NAME:RegExp("^\\[name=['\"]?("+F+")['\"]?\\]"),TAG:RegExp("^("+F.replace("w","w*")+")"),ATTR:RegExp("^"+P),PSEUDO:RegExp("^"+R),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+_+"*(even|odd|(([+-]|)(\\d*)n|)"+_+"*(?:([+-]|)"+_+"*(\\d+)|))"+_+"*\\)|)","i"),needsContext:RegExp("^"+_+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+_+"*((?:-\\d)?\\d*)"+_+"*\\)|)(?=[^-]|$)","i")},V=/[\x20\t\r\n\f]*[+~]/,Y=/^[^{]+\{\s*\[native code/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,G=/^(?:input|select|textarea|button)$/i,Q=/^h\d$/i,K=/'|\\/g,Z=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,et=/\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,tt=function(e,t){var n="0x"+t-65536;return n!==n?t:0>n?String.fromCharCode(n+65536):String.fromCharCode(55296|n>>10,56320|1023&n)};try{q.call(w.documentElement.childNodes,0)[0].nodeType}catch(nt){q=function(e){var t,n=[];while(t=this[e++])n.push(t);return n}}function rt(e){return Y.test(e+"")}function it(){var e,t=[];return e=function(n,r){return t.push(n+=" ")>i.cacheLength&&delete e[t.shift()],e[n]=r}}function ot(e){return e[x]=!0,e}function at(e){var t=p.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}}function st(e,t,n,r){var i,o,a,s,u,l,f,g,m,v;if((t?t.ownerDocument||t:w)!==p&&c(t),t=t||p,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(!d&&!r){if(i=J.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&y(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return H.apply(n,q.call(t.getElementsByTagName(e),0)),n;if((a=i[3])&&T.getByClassName&&t.getElementsByClassName)return H.apply(n,q.call(t.getElementsByClassName(a),0)),n}if(T.qsa&&!h.test(e)){if(f=!0,g=x,m=t,v=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){l=ft(e),(f=t.getAttribute("id"))?g=f.replace(K,"\\$&"):t.setAttribute("id",g),g="[id='"+g+"'] ",u=l.length;while(u--)l[u]=g+dt(l[u]);m=V.test(e)&&t.parentNode||t,v=l.join(",")}if(v)try{return H.apply(n,q.call(m.querySelectorAll(v),0)),n}catch(b){}finally{f||t.removeAttribute("id")}}}return wt(e.replace(W,"$1"),t,n,r)}a=st.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},c=st.setDocument=function(e){var n=e?e.ownerDocument||e:w;return n!==p&&9===n.nodeType&&n.documentElement?(p=n,f=n.documentElement,d=a(n),T.tagNameNoComments=at(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),T.attributes=at(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return"boolean"!==t&&"string"!==t}),T.getByClassName=at(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",e.getElementsByClassName&&e.getElementsByClassName("e").length?(e.lastChild.className="e",2===e.getElementsByClassName("e").length):!1}),T.getByName=at(function(e){e.id=x+0,e.innerHTML="<a name='"+x+"'></a><div name='"+x+"'></div>",f.insertBefore(e,f.firstChild);var t=n.getElementsByName&&n.getElementsByName(x).length===2+n.getElementsByName(x+0).length;return T.getIdNotName=!n.getElementById(x),f.removeChild(e),t}),i.attrHandle=at(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==A&&"#"===e.firstChild.getAttribute("href")})?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},T.getIdNotName?(i.find.ID=function(e,t){if(typeof t.getElementById!==A&&!d){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){return e.getAttribute("id")===t}}):(i.find.ID=function(e,n){if(typeof n.getElementById!==A&&!d){var r=n.getElementById(e);return r?r.id===e||typeof r.getAttributeNode!==A&&r.getAttributeNode("id").value===e?[r]:t:[]}},i.filter.ID=function(e){var t=e.replace(et,tt);return function(e){var n=typeof e.getAttributeNode!==A&&e.getAttributeNode("id");return n&&n.value===t}}),i.find.TAG=T.tagNameNoComments?function(e,n){return typeof n.getElementsByTagName!==A?n.getElementsByTagName(e):t}: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},i.find.NAME=T.getByName&&function(e,n){return typeof n.getElementsByName!==A?n.getElementsByName(name):t},i.find.CLASS=T.getByClassName&&function(e,n){return typeof n.getElementsByClassName===A||d?t:n.getElementsByClassName(e)},g=[],h=[":focus"],(T.qsa=rt(n.querySelectorAll))&&(at(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||h.push("\\["+_+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||h.push(":checked")}),at(function(e){e.innerHTML="<input type='hidden' i=''/>",e.querySelectorAll("[i^='']").length&&h.push("[*^$]="+_+"*(?:\"\"|'')"),e.querySelectorAll(":enabled").length||h.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),h.push(",.*:")})),(T.matchesSelector=rt(m=f.matchesSelector||f.mozMatchesSelector||f.webkitMatchesSelector||f.oMatchesSelector||f.msMatchesSelector))&&at(function(e){T.disconnectedMatch=m.call(e,"div"),m.call(e,"[s!='']:x"),g.push("!=",R)}),h=RegExp(h.join("|")),g=RegExp(g.join("|")),y=rt(f.contains)||f.compareDocumentPosition?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},v=f.compareDocumentPosition?function(e,t){var r;return e===t?(u=!0,0):(r=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t))?1&r||e.parentNode&&11===e.parentNode.nodeType?e===n||y(w,e)?-1:t===n||y(w,t)?1:0:4&r?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return u=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:0;if(o===a)return ut(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?ut(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},u=!1,[0,0].sort(v),T.detectDuplicates=u,p):p},st.matches=function(e,t){return st(e,null,null,t)},st.matchesSelector=function(e,t){if((e.ownerDocument||e)!==p&&c(e),t=t.replace(Z,"='$1']"),!(!T.matchesSelector||d||g&&g.test(t)||h.test(t)))try{var n=m.call(e,t);if(n||T.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(r){}return st(t,p,null,[e]).length>0},st.contains=function(e,t){return(e.ownerDocument||e)!==p&&c(e),y(e,t)},st.attr=function(e,t){var n;return(e.ownerDocument||e)!==p&&c(e),d||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):d||T.attributes?e.getAttribute(t):((n=e.getAttributeNode(t))||e.getAttribute(t))&&e[t]===!0?t:n&&n.specified?n.value:null},st.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},st.uniqueSort=function(e){var t,n=[],r=1,i=0;if(u=!T.detectDuplicates,e.sort(v),u){for(;t=e[r];r++)t===e[r-1]&&(i=n.push(r));while(i--)e.splice(n[i],1)}return e};function ut(e,t){var n=t&&e,r=n&&(~t.sourceIndex||j)-(~e.sourceIndex||j);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function lt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function ct(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function pt(e){return ot(function(t){return t=+t,ot(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}o=st.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 for(;t=e[r];r++)n+=o(t);return n},i=st.selectors={cacheLength:50,createPseudo:ot,match:U,find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(et,tt),e[3]=(e[4]||e[5]||"").replace(et,tt),"~="===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]||st.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]&&st.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return U.CHILD.test(e[0])?null:(e[4]?e[2]=e[4]:n&&z.test(n)&&(t=ft(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){return"*"===e?function(){return!0}:(e=e.replace(et,tt).toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[e+" "];return t||(t=RegExp("(^|"+_+")"+e+"("+_+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==A&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=st.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!u&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[x]||(m[x]={}),l=c[e]||[],d=l[0]===N&&l[1],f=l[0]===N&&l[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[N,d,f];break}}else if(v&&(l=(t[x]||(t[x]={}))[e])&&l[0]===N)f=l[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[x]||(p[x]={}))[e]=[N,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||st.error("unsupported pseudo: "+e);return r[x]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?ot(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=M.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:ot(function(e){var t=[],n=[],r=s(e.replace(W,"$1"));return r[x]?ot(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:ot(function(e){return function(t){return st(e,t).length>0}}),contains:ot(function(e){return function(t){return(t.textContent||t.innerText||o(t)).indexOf(e)>-1}}),lang:ot(function(e){return X.test(e||"")||st.error("unsupported lang: "+e),e=e.replace(et,tt).toLowerCase(),function(t){var n;do if(n=d?t.getAttribute("xml:lang")||t.getAttribute("lang"):t.lang)return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===f},focus:function(e){return e===p.activeElement&&(!p.hasFocus||p.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!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,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!i.pseudos.empty(e)},header:function(e){return Q.test(e.nodeName)},input:function(e){return G.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"))||t.toLowerCase()===e.type)},first:pt(function(){return[0]}),last:pt(function(e,t){return[t-1]}),eq:pt(function(e,t,n){return[0>n?n+t:n]}),even:pt(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:pt(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:pt(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:pt(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}};for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})i.pseudos[n]=lt(n);for(n in{submit:!0,reset:!0})i.pseudos[n]=ct(n);function ft(e,t){var n,r,o,a,s,u,l,c=E[e+" "];if(c)return t?0:c.slice(0);s=e,u=[],l=i.preFilter;while(s){(!n||(r=$.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),u.push(o=[])),n=!1,(r=I.exec(s))&&(n=r.shift(),o.push({value:n,type:r[0].replace(W," ")}),s=s.slice(n.length));for(a in i.filter)!(r=U[a].exec(s))||l[a]&&!(r=l[a](r))||(n=r.shift(),o.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?st.error(e):E(e,u).slice(0)}function dt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function ht(e,t,n){var i=t.dir,o=n&&"parentNode"===i,a=C++;return t.first?function(t,n,r){while(t=t[i])if(1===t.nodeType||o)return e(t,n,r)}:function(t,n,s){var u,l,c,p=N+" "+a;if(s){while(t=t[i])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[i])if(1===t.nodeType||o)if(c=t[x]||(t[x]={}),(l=c[i])&&l[0]===p){if((u=l[1])===!0||u===r)return u===!0}else if(l=c[i]=[p],l[1]=e(t,n,s)||r,l[1]===!0)return!0}}function gt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function mt(e,t,n,r,i){var o,a=[],s=0,u=e.length,l=null!=t;for(;u>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),l&&t.push(s));return a}function yt(e,t,n,r,i,o){return r&&!r[x]&&(r=yt(r)),i&&!i[x]&&(i=yt(i,o)),ot(function(o,a,s,u){var l,c,p,f=[],d=[],h=a.length,g=o||xt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:mt(g,f,e,s,u),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,u),r){l=mt(y,d),r(l,[],s,u),c=l.length;while(c--)(p=l[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){l=[],c=y.length;while(c--)(p=y[c])&&l.push(m[c]=p);i(null,y=[],l,u)}c=y.length;while(c--)(p=y[c])&&(l=i?M.call(o,p):f[c])>-1&&(o[l]=!(a[l]=p))}}else y=mt(y===a?y.splice(h,y.length):y),i?i(null,a,y,u):H.apply(a,y)})}function vt(e){var t,n,r,o=e.length,a=i.relative[e[0].type],s=a||i.relative[" "],u=a?1:0,c=ht(function(e){return e===t},s,!0),p=ht(function(e){return M.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;o>u;u++)if(n=i.relative[e[u].type])f=[ht(gt(f),n)];else{if(n=i.filter[e[u].type].apply(null,e[u].matches),n[x]){for(r=++u;o>r;r++)if(i.relative[e[r].type])break;return yt(u>1&&gt(f),u>1&&dt(e.slice(0,u-1)).replace(W,"$1"),n,r>u&&vt(e.slice(u,r)),o>r&&vt(e=e.slice(r)),o>r&&dt(e))}f.push(n)}return gt(f)}function bt(e,t){var n=0,o=t.length>0,a=e.length>0,s=function(s,u,c,f,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,T=l,C=s||a&&i.find.TAG("*",d&&u.parentNode||u),k=N+=null==T?1:Math.random()||.1;for(w&&(l=u!==p&&u,r=n);null!=(h=C[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,u,c)){f.push(h);break}w&&(N=k,r=++n)}o&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,o&&b!==v){g=0;while(m=t[g++])m(x,y,u,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=L.call(f));y=mt(y)}H.apply(f,y),w&&!s&&y.length>0&&v+t.length>1&&st.uniqueSort(f)}return w&&(N=k,l=T),x};return o?ot(s):s}s=st.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=ft(e)),n=t.length;while(n--)o=vt(t[n]),o[x]?r.push(o):i.push(o);o=S(e,bt(i,r))}return o};function xt(e,t,n){var r=0,i=t.length;for(;i>r;r++)st(e,t[r],n);return n}function wt(e,t,n,r){var o,a,u,l,c,p=ft(e);if(!r&&1===p.length){if(a=p[0]=p[0].slice(0),a.length>2&&"ID"===(u=a[0]).type&&9===t.nodeType&&!d&&i.relative[a[1].type]){if(t=i.find.ID(u.matches[0].replace(et,tt),t)[0],!t)return n;e=e.slice(a.shift().value.length)}o=U.needsContext.test(e)?0:a.length;while(o--){if(u=a[o],i.relative[l=u.type])break;if((c=i.find[l])&&(r=c(u.matches[0].replace(et,tt),V.test(a[0].type)&&t.parentNode||t))){if(a.splice(o,1),e=r.length&&dt(a),!e)return H.apply(n,q.call(r,0)),n;break}}}return s(e,p)(r,t,d,n,V.test(e)),n}i.pseudos.nth=i.pseudos.eq;function Tt(){}i.filters=Tt.prototype=i.pseudos,i.setFilters=new Tt,c(),st.attr=b.attr,b.find=st,b.expr=st.selectors,b.expr[":"]=b.expr.pseudos,b.unique=st.uniqueSort,b.text=st.getText,b.isXMLDoc=st.isXML,b.contains=st.contains}(e);var at=/Until$/,st=/^(?:parents|prev(?:Until|All))/,ut=/^.[^:#\[\.,]*$/,lt=b.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};b.fn.extend({find:function(e){var t,n,r,i=this.length;if("string"!=typeof e)return r=this,this.pushStack(b(e).filter(function(){for(t=0;i>t;t++)if(b.contains(r[t],this))return!0}));for(n=[],t=0;i>t;t++)b.find(e,this[t],n);return n=this.pushStack(i>1?b.unique(n):n),n.selector=(this.selector?this.selector+" ":"")+e,n},has:function(e){var t,n=b(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(b.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e,!1))},filter:function(e){return this.pushStack(ft(this,e,!0))},is:function(e){return!!e&&("string"==typeof e?lt.test(e)?b(e,this.context).index(this[0])>=0:b.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,o=[],a=lt.test(e)||"string"!=typeof e?b(e,t||this.context):0;for(;i>r;r++){n=this[r];while(n&&n.ownerDocument&&n!==t&&11!==n.nodeType){if(a?a.index(n)>-1:b.find.matchesSelector(n,e)){o.push(n);break}n=n.parentNode}}return this.pushStack(o.length>1?b.unique(o):o)},index:function(e){return e?"string"==typeof e?b.inArray(this[0],b(e)):b.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?b(e,t):b.makeArray(e&&e.nodeType?[e]:e),r=b.merge(this.get(),n);return this.pushStack(b.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),b.fn.andSelf=b.fn.addBack;function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}b.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return b.dir(e,"parentNode")},parentsUntil:function(e,t,n){return b.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return b.dir(e,"nextSibling")},prevAll:function(e){return b.dir(e,"previousSibling")},nextUntil:function(e,t,n){return b.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return b.dir(e,"previousSibling",n)},siblings:function(e){return b.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return b.sibling(e.firstChild)},contents:function(e){return b.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:b.merge([],e.childNodes)}},function(e,t){b.fn[e]=function(n,r){var i=b.map(this,t,n);return at.test(e)||(r=n),r&&"string"==typeof r&&(i=b.filter(r,i)),i=this.length>1&&!ct[e]?b.unique(i):i,this.length>1&&st.test(e)&&(i=i.reverse()),this.pushStack(i)}}),b.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),1===t.length?b.find.matchesSelector(t[0],e)?[t[0]]:[]:b.find.matches(e,t)},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!b(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(t=t||0,b.isFunction(t))return b.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return b.grep(e,function(e){return e===t===n});if("string"==typeof t){var r=b.grep(e,function(e){return 1===e.nodeType});if(ut.test(t))return b.filter(t,r,!n);t=b.filter(t,r)}return b.grep(e,function(e){return b.inArray(e,t)>=0===n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Nt=/^(?:checkbox|radio)$/i,Ct=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={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:b.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(o),Dt=jt.appendChild(o.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,b.fn.extend({text:function(e){return b.access(this,function(e){return e===t?b.text(this):this.empty().append((this[0]&&this[0].ownerDocument||o).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(b.isFunction(e))return this.each(function(t){b(this).wrapAll(e.call(this,t))});if(this[0]){var t=b(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return b.isFunction(e)?this.each(function(t){b(this).wrapInner(e.call(this,t))}):this.each(function(){var t=b(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=b.isFunction(e);return this.each(function(n){b(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){b.nodeName(this,"body")||b(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&this.insertBefore(e,this.firstChild)})},before:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,!1,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=0;for(;null!=(n=this[r]);r++)(!e||b.filter(e,[n]).length>0)&&(t||1!==n.nodeType||b.cleanData(Ot(n)),n.parentNode&&(t&&b.contains(n.ownerDocument,n)&&Mt(Ot(n,"script")),n.parentNode.removeChild(n)));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&b.cleanData(Ot(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&b.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return b.clone(this,e,t)})},html:function(e){return b.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!b.support.htmlSerialize&&mt.test(e)||!b.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(b.cleanData(Ot(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(e){var t=b.isFunction(e);return t||"string"==typeof e||(e=b(e).not(this).detach()),this.domManip([e],!0,function(e){var t=this.nextSibling,n=this.parentNode;n&&(b(this).remove(),n.insertBefore(e,t))})},detach:function(e){return this.remove(e,!0)},domManip:function(e,n,r){e=f.apply([],e);var i,o,a,s,u,l,c=0,p=this.length,d=this,h=p-1,g=e[0],m=b.isFunction(g);if(m||!(1>=p||"string"!=typeof g||b.support.checkClone)&&Ct.test(g))return this.each(function(i){var o=d.eq(i);m&&(e[0]=g.call(this,i,n?o.html():t)),o.domManip(e,n,r)});if(p&&(l=b.buildFragment(e,this[0].ownerDocument,!1,this),i=l.firstChild,1===l.childNodes.length&&(l=i),i)){for(n=n&&b.nodeName(i,"tr"),s=b.map(Ot(l,"script"),Ht),a=s.length;p>c;c++)o=l,c!==h&&(o=b.clone(o,!0,!0),a&&b.merge(s,Ot(o,"script"))),r.call(n&&b.nodeName(this[c],"table")?Lt(this[c],"tbody"):this[c],o,c);if(a)for(u=s[s.length-1].ownerDocument,b.map(s,qt),c=0;a>c;c++)o=s[c],kt.test(o.type||"")&&!b._data(o,"globalEval")&&b.contains(u,o)&&(o.src?b.ajax({url:o.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):b.globalEval((o.text||o.textContent||o.innerHTML||"").replace(St,"")));l=i=null}return this}});function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function Ht(e){var t=e.getAttributeNode("type");return e.type=(t&&t.specified)+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function Mt(e,t){var n,r=0;for(;null!=(n=e[r]);r++)b._data(n,"globalEval",!t||b._data(t[r],"globalEval"))}function _t(e,t){if(1===t.nodeType&&b.hasData(e)){var n,r,i,o=b._data(e),a=b._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)b.event.add(t,n,s[n][r])}a.data&&(a.data=b.extend({},a.data))}}function Ft(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!b.support.noCloneEvent&&t[b.expando]){i=b._data(t);for(r in i.events)b.removeEvent(t,r,i.handle);t.removeAttribute(b.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),b.support.html5Clone&&e.innerHTML&&!b.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Nt.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}b.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){b.fn[e]=function(e){var n,r=0,i=[],o=b(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),b(o[r])[t](n),d.apply(i,n.get());return this.pushStack(i)}});function Ot(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||b.nodeName(o,n)?s.push(o):b.merge(s,Ot(o,n));return n===t||n&&b.nodeName(e,n)?b.merge([e],s):s}function Bt(e){Nt.test(e.type)&&(e.defaultChecked=e.checked)}b.extend({clone:function(e,t,n){var r,i,o,a,s,u=b.contains(e.ownerDocument,e);if(b.support.html5Clone||b.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(b.support.noCloneEvent&&b.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||b.isXMLDoc(e)))for(r=Ot(o),s=Ot(e),a=0;null!=(i=s[a]);++a)r[a]&&Ft(i,r[a]);if(t)if(n)for(s=s||Ot(e),r=r||Ot(o),a=0;null!=(i=s[a]);a++)_t(i,r[a]);else _t(e,o);return r=Ot(o,"script"),r.length>0&&Mt(r,!u&&Ot(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,u,l,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===b.type(o))b.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),u=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[u]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!b.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!b.support.tbody){o="table"!==u||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)b.nodeName(l=o.childNodes[i],"tbody")&&!l.childNodes.length&&o.removeChild(l)
+}b.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),b.support.appendChecked||b.grep(Ot(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===b.inArray(o,r))&&(a=b.contains(o.ownerDocument,o),s=Ot(f.appendChild(o),"script"),a&&Mt(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,u=b.expando,l=b.cache,p=b.support.deleteExpando,f=b.event.special;for(;null!=(n=e[s]);s++)if((t||b.acceptData(n))&&(o=n[u],a=o&&l[o])){if(a.events)for(r in a.events)f[r]?b.event.remove(n,r):b.removeEvent(n,r,a.handle);l[o]&&(delete l[o],p?delete n[u]:typeof n.removeAttribute!==i?n.removeAttribute(u):n[u]=null,c.push(o))}}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+x+")(.*)$","i"),Yt=RegExp("^("+x+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+x+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===b.css(e,"display")||!b.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=b._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=b._data(r,"olddisplay",un(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&b._data(r,"olddisplay",i?n:b.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}b.fn.extend({css:function(e,n){return b.access(this,function(e,n,r){var i,o,a={},s=0;if(b.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=b.css(e,n[s],!1,o);return a}return r!==t?b.style(e,n,r):b.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:nn(this))?b(this).show():b(this).hide()})}}),b.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":b.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,u=b.camelCase(n),l=e.style;if(n=b.cssProps[u]||(b.cssProps[u]=tn(l,u)),s=b.cssHooks[n]||b.cssHooks[u],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:l[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(b.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||b.cssNumber[u]||(r+="px"),b.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(l[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{l[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,u=b.camelCase(n);return n=b.cssProps[u]||(b.cssProps[u]=tn(e.style,u)),s=b.cssHooks[n]||b.cssHooks[u],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||b.isNumeric(o)?o||0:a):a},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s.getPropertyValue(n)||s[n]:t,l=e.style;return s&&(""!==u||b.contains(e.ownerDocument,e)||(u=b.style(e,n)),Yt.test(u)&&Ut.test(n)&&(i=l.width,o=l.minWidth,a=l.maxWidth,l.minWidth=l.maxWidth=l.width=u,u=s.width,l.width=i,l.minWidth=o,l.maxWidth=a)),u}):o.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),u=s?s[n]:t,l=e.style;return null==u&&l&&l[n]&&(u=l[n]),Yt.test(u)&&!zt.test(n)&&(i=l.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),l.left="fontSize"===n?"1em":u,u=l.pixelLeft+"px",l.left=i,a&&(o.left=a)),""===u?"auto":u});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=b.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=b.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=b.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=b.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=b.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(b.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function un(e){var t=o,n=Gt[e];return n||(n=ln(e,t),"none"!==n&&n||(Pt=(Pt||b("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=ln(e,t),Pt.detach()),Gt[e]=n),n}function ln(e,t){var n=b(t.createElement(e)).appendTo(t.body),r=b.css(n[0],"display");return n.remove(),r}b.each(["height","width"],function(e,n){b.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(b.css(e,"display"))?b.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,b.support.boxSizing&&"border-box"===b.css(e,"boxSizing",!1,i),i):0)}}}),b.support.opacity||(b.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=b.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===b.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),b(function(){b.support.reliableMarginRight||(b.cssHooks.marginRight={get:function(e,n){return n?b.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!b.support.pixelPosition&&b.fn.position&&b.each(["top","left"],function(e,n){b.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?b(e).position()[n]+"px":r):t}}})}),b.expr&&b.expr.filters&&(b.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!b.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||b.css(e,"display"))},b.expr.filters.visible=function(e){return!b.expr.filters.hidden(e)}),b.each({margin:"",padding:"",border:"Width"},function(e,t){b.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(b.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;b.fn.extend({serialize:function(){return b.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=b.prop(this,"elements");return e?b.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!b(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Nt.test(e))}).map(function(e,t){var n=b(this).val();return null==n?null:b.isArray(n)?b.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),b.param=function(e,n){var r,i=[],o=function(e,t){t=b.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=b.ajaxSettings&&b.ajaxSettings.traditional),b.isArray(e)||e.jquery&&!b.isPlainObject(e))b.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(b.isArray(t))b.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==b.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}b.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){b.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),b.fn.hover=function(e,t){return this.mouseenter(e).mouseleave(t||e)};var mn,yn,vn=b.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Nn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Cn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=b.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=a.href}catch(Ln){yn=o.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(w)||[];if(b.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(u){var l;return o[u]=!0,b.each(e[u]||[],function(e,u){var c=u(n,r,i);return"string"!=typeof c||a||o[c]?a?!(l=c):t:(n.dataTypes.unshift(c),s(c),!1)}),l}return s(n.dataTypes[0])||!o["*"]&&s("*")}function Mn(e,n){var r,i,o=b.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&b.extend(!0,e,r),e}b.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,u=e.indexOf(" ");return u>=0&&(i=e.slice(u,e.length),e=e.slice(0,u)),b.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&b.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?b("<div>").append(b.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},b.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){b.fn[t]=function(e){return this.on(t,e)}}),b.each(["get","post"],function(e,n){b[n]=function(e,r,i,o){return b.isFunction(r)&&(o=o||i,i=r,r=t),b.ajax({url:e,type:n,dataType:o,data:r,success:i})}}),b.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Nn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,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"},converters:{"* text":e.String,"text html":!0,"text json":b.parseJSON,"text xml":b.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Mn(Mn(e,b.ajaxSettings),t):Mn(b.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,u,l,c,p=b.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?b(f):b.event,h=b.Deferred(),g=b.Callbacks("once memory"),m=p.statusCode||{},y={},v={},x=0,T="canceled",N={readyState:0,getResponseHeader:function(e){var t;if(2===x){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===x?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return x||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return x||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>x)for(t in e)m[t]=[m[t],e[t]];else N.always(e[N.status]);return this},abort:function(e){var t=e||T;return l&&l.abort(t),k(0,t),this}};if(h.promise(N).complete=g.add,N.success=N.done,N.error=N.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=b.trim(p.dataType||"*").toLowerCase().match(w)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?80:443))==(mn[3]||("http:"===mn[1]?80:443)))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=b.param(p.data,p.traditional)),qn(An,p,n,N),2===x)return N;u=p.global,u&&0===b.active++&&b.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Cn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(b.lastModified[o]&&N.setRequestHeader("If-Modified-Since",b.lastModified[o]),b.etag[o]&&N.setRequestHeader("If-None-Match",b.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&N.setRequestHeader("Content-Type",p.contentType),N.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)N.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,N,p)===!1||2===x))return N.abort();T="abort";for(i in{success:1,error:1,complete:1})N[i](p[i]);if(l=qn(jn,p,n,N)){N.readyState=1,u&&d.trigger("ajaxSend",[N,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){N.abort("timeout")},p.timeout));try{x=1,l.send(y,k)}catch(C){if(!(2>x))throw C;k(-1,C)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,C=n;2!==x&&(x=2,s&&clearTimeout(s),l=t,a=i||"",N.readyState=e>0?4:0,r&&(w=_n(p,N,r)),e>=200&&300>e||304===e?(p.ifModified&&(T=N.getResponseHeader("Last-Modified"),T&&(b.lastModified[o]=T),T=N.getResponseHeader("etag"),T&&(b.etag[o]=T)),204===e?(c=!0,C="nocontent"):304===e?(c=!0,C="notmodified"):(c=Fn(p,w),C=c.state,y=c.data,v=c.error,c=!v)):(v=C,(e||!C)&&(C="error",0>e&&(e=0))),N.status=e,N.statusText=(n||C)+"",c?h.resolveWith(f,[y,C,N]):h.rejectWith(f,[N,C,v]),N.statusCode(m),m=t,u&&d.trigger(c?"ajaxSuccess":"ajaxError",[N,p,c?y:v]),g.fireWith(f,[N,C]),u&&(d.trigger("ajaxComplete",[N,p]),--b.active||b.event.trigger("ajaxStop")))}return N},getScript:function(e,n){return b.get(e,t,n,"script")},getJSON:function(e,t,n){return b.get(e,t,n,"json")}});function _n(e,n,r){var i,o,a,s,u=e.contents,l=e.dataTypes,c=e.responseFields;for(s in c)s in r&&(n[c[s]]=r[s]);while("*"===l[0])l.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in u)if(u[s]&&u[s].test(o)){l.unshift(s);break}if(l[0]in r)a=l[0];else{for(s in r){if(!l[0]||e.converters[s+" "+l[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==l[0]&&l.unshift(a),r[a]):t}function Fn(e,t){var n,r,i,o,a={},s=0,u=e.dataTypes.slice(),l=u[0];if(e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u[1])for(i in e.converters)a[i.toLowerCase()]=e.converters[i];for(;r=u[++s];)if("*"!==r){if("*"!==l&&l!==r){if(i=a[l+" "+r]||a["* "+r],!i)for(n in a)if(o=n.split(" "),o[1]===r&&(i=a[l+" "+o[0]]||a["* "+o[0]])){i===!0?i=a[n]:a[n]!==!0&&(r=o[0],u.splice(s--,0,r));break}if(i!==!0)if(i&&e["throws"])t=i(t);else try{t=i(t)}catch(c){return{state:"parsererror",error:i?c:"No conversion from "+l+" to "+r}}}l=r}return{state:"success",data:t}}b.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return b.globalEval(e),e}}}),b.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),b.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=o.head||b("head")[0]||o.documentElement;return{send:function(t,i){n=o.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var On=[],Bn=/(=)\?(?=&|$)|\?\?/;b.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=On.pop()||b.expando+"_"+vn++;return this[e]=!0,e}}),b.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,u=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return u||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=b.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,u?n[u]=n[u].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||b.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,On.push(o)),s&&b.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}b.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=b.ajaxSettings.xhr(),b.support.cors=!!Rn&&"withCredentials"in Rn,Rn=b.support.ajax=!!Rn,Rn&&b.ajaxTransport(function(n){if(!n.crossDomain||b.support.cors){var r;return{send:function(i,o){var a,s,u=n.xhr();if(n.username?u.open(n.type,n.url,n.async,n.username,n.password):u.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)u[s]=n.xhrFields[s];n.mimeType&&u.overrideMimeType&&u.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)u.setRequestHeader(s,i[s])}catch(l){}u.send(n.hasContent&&n.data||null),r=function(e,i){var s,l,c,p;try{if(r&&(i||4===u.readyState))if(r=t,a&&(u.onreadystatechange=b.noop,$n&&delete Pn[a]),i)4!==u.readyState&&u.abort();else{p={},s=u.status,l=u.getAllResponseHeaders(),"string"==typeof u.responseText&&(p.text=u.responseText);try{c=u.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,l)},n.async?4===u.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},b(e).unload($n)),Pn[a]=r),u.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+x+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n,r,i=this.createTween(e,t),o=Yn.exec(t),a=i.cur(),s=+a||0,u=1,l=20;if(o){if(n=+o[2],r=o[3]||(b.cssNumber[e]?"":"px"),"px"!==r&&s){s=b.css(i.elem,e,!0)||n||1;do u=u||".5",s/=u,b.style(i.elem,e,s+r);while(u!==(u=i.cur()/a)&&1!==u&&--l)}i.unit=r,i.start=s,i.end=o[1]?s+(o[1]+1)*n:n}return i}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=b.now()}function Zn(e,t){b.each(t,function(t,n){var r=(Qn[t]||[]).concat(Qn["*"]),i=0,o=r.length;for(;o>i;i++)if(r[i].call(e,t,n))return})}function er(e,t,n){var r,i,o=0,a=Gn.length,s=b.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,l.startTime+l.duration-t),r=n/l.duration||0,o=1-r,a=0,u=l.tweens.length;for(;u>a;a++)l.tweens[a].run(o);return s.notifyWith(e,[l,o,n]),1>o&&u?n:(s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:b.extend({},t),opts:b.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=b.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)l.tweens[n].run(1);return t?s.resolveWith(e,[l,t]):s.rejectWith(e,[l,t]),this}}),c=l.props;for(tr(c,l.opts.specialEasing);a>o;o++)if(r=Gn[o].call(l,e,c,l.opts))return r;return Zn(l,c),b.isFunction(l.opts.start)&&l.opts.start.call(e,l),b.fx.timer(b.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always)}function tr(e,t){var n,r,i,o,a;for(i in e)if(r=b.camelCase(i),o=t[r],n=e[i],b.isArray(n)&&(o=n[1],n=e[i]=n[0]),i!==r&&(e[r]=n,delete e[i]),a=b.cssHooks[r],a&&"expand"in a){n=a.expand(n),delete e[r];for(i in n)i in e||(e[i]=n[i],t[i]=o)}else t[r]=o}b.Animation=b.extend(er,{tweener:function(e,t){b.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,u,l,c,p,f=this,d=e.style,h={},g=[],m=e.nodeType&&nn(e);n.queue||(c=b._queueHooks(e,"fx"),null==c.unqueued&&(c.unqueued=0,p=c.empty.fire,c.empty.fire=function(){c.unqueued||p()}),c.unqueued++,f.always(function(){f.always(function(){c.unqueued--,b.queue(e,"fx").length||c.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[d.overflow,d.overflowX,d.overflowY],"inline"===b.css(e,"display")&&"none"===b.css(e,"float")&&(b.support.inlineBlockNeedsLayout&&"inline"!==un(e.nodeName)?d.zoom=1:d.display="inline-block")),n.overflow&&(d.overflow="hidden",b.support.shrinkWrapBlocks||f.always(function(){d.overflow=n.overflow[0],d.overflowX=n.overflow[1],d.overflowY=n.overflow[2]}));for(i in t)if(a=t[i],Vn.exec(a)){if(delete t[i],u=u||"toggle"===a,a===(m?"hide":"show"))continue;g.push(i)}if(o=g.length){s=b._data(e,"fxshow")||b._data(e,"fxshow",{}),"hidden"in s&&(m=s.hidden),u&&(s.hidden=!m),m?b(e).show():f.done(function(){b(e).hide()}),f.done(function(){var t;b._removeData(e,"fxshow");for(t in h)b.style(e,t,h[t])});for(i=0;o>i;i++)r=g[i],l=f.createTween(r,m?s[r]:0),h[r]=s[r]||b.style(e,r),r in s||(s[r]=l.start,m&&(l.end=l.start,l.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}b.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(b.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?b.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):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):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=b.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){b.fx.step[e.prop]?b.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[b.cssProps[e.prop]]||b.cssHooks[e.prop])?b.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},b.each(["toggle","show","hide"],function(e,t){var n=b.fn[t];b.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),b.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=b.isEmptyObject(e),o=b.speed(t,n,r),a=function(){var t=er(this,b.extend({},e),o);a.finish=function(){t.stop(!0)},(i||b._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=b.timers,a=b._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&b.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=b._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=b.timers,a=r?r.length:0;for(n.finish=!0,b.queue(this,e,[]),i&&i.cur&&i.cur.finish&&i.cur.finish.call(this),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}b.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){b.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),b.speed=function(e,t,n){var r=e&&"object"==typeof e?b.extend({},e):{complete:n||!n&&t||b.isFunction(e)&&e,duration:e,easing:n&&t||t&&!b.isFunction(t)&&t};return r.duration=b.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in b.fx.speeds?b.fx.speeds[r.duration]:b.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){b.isFunction(r.old)&&r.old.call(this),r.queue&&b.dequeue(this,r.queue)},r},b.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},b.timers=[],b.fx=rr.prototype.init,b.fx.tick=function(){var e,n=b.timers,r=0;for(Xn=b.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||b.fx.stop(),Xn=t},b.fx.timer=function(e){e()&&b.timers.push(e)&&b.fx.start()},b.fx.interval=13,b.fx.start=function(){Un||(Un=setInterval(b.fx.tick,b.fx.interval))},b.fx.stop=function(){clearInterval(Un),Un=null},b.fx.speeds={slow:600,fast:200,_default:400},b.fx.step={},b.expr&&b.expr.filters&&(b.expr.filters.animated=function(e){return b.grep(b.timers,function(t){return e===t.elem}).length}),b.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){b.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,b.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},b.offset={setOffset:function(e,t,n){var r=b.css(e,"position");"static"===r&&(e.style.position="relative");var i=b(e),o=i.offset(),a=b.css(e,"top"),s=b.css(e,"left"),u=("absolute"===r||"fixed"===r)&&b.inArray("auto",[a,s])>-1,l={},c={},p,f;u?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),b.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(l.top=t.top-o.top+p),null!=t.left&&(l.left=t.left-o.left+f),"using"in t?t.using.call(e,l):i.css(l)}},b.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===b.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),b.nodeName(e[0],"html")||(n=e.offset()),n.top+=b.css(e[0],"borderTopWidth",!0),n.left+=b.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-b.css(r,"marginTop",!0),left:t.left-n.left-b.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||o.documentElement;while(e&&!b.nodeName(e,"html")&&"static"===b.css(e,"position"))e=e.offsetParent;return e||o.documentElement})}}),b.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);b.fn[e]=function(i){return b.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?b(a).scrollLeft():o,r?o:b(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return b.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}b.each({Height:"height",Width:"width"},function(e,n){b.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){b.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return b.access(this,function(n,r,i){var o;return b.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?b.css(n,r,s):b.style(n,r,i,s)},n,a?i:t,a,null)}})}),e.jQuery=e.$=b,"function"==typeof define&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return b})})(window);
diff --git a/data/interfaces/default/js/highcharts/api/js/ref.js b/data/interfaces/default/js/highcharts/api/js/ref.js
new file mode 100644
index 00000000..9defb186
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/api/js/ref.js
@@ -0,0 +1,863 @@
+var $hilighted,
+	$hilightedMenuItem,
+	optionDictionary = {},
+	names = [],
+	buildApiOffline,
+	initOffline,
+	offline = {},
+	API = {},
+	buildPage;
+
+function loadScript(url, callback) {
+	//http://www.nczonline.net/blog/2009/07/28/the-best-way-to-load-external-javascript/
+	var script = document.createElement("script");
+	script.type = "text/javascript";
+	if (script.readyState){  //IE
+		script.onreadystatechange = function(){
+			if (script.readyState == "loaded" ||
+					script.readyState == "complete"){
+				script.onreadystatechange = null;
+				callback();
+			}
+		};
+	} else {  //Others
+		script.onload = function() {
+			callback();
+		};
+	}
+
+	script.src = url;
+	document.getElementsByTagName("head")[0].appendChild(script);
+}
+
+function toDot (id){
+	return id.replace(/[-]+/g,'.');
+};
+
+function escapeHTML(html) {
+	if (typeof html === 'string') {
+		html = html
+			.replace('\u25CF', '\\u25CF')
+			.replace(/</g, '&lt;')
+			.replace(/>/g, '&gt;');
+	}
+	return html;
+}
+
+function escapeSelector (name) {
+	return name.replace('<', '\\<').replace('>', '\\>');
+}
+
+function activateInternalLinks($parent) {
+	$('a[href^="#"]', $parent).each(function (i, anchor) {
+		$(anchor).click(function () {
+			gotoSection(anchor.href.split('#')[1], true);
+			return false;
+		});
+	});
+}
+
+
+/**
+ * Highligth a specific option by coloring it in the menu view and section view
+ */
+function hilight (id) {
+	var linkId, $el, $detailsWrap = $('#details-wrap');
+
+	$el = $('div.member#' + escapeSelector(id));
+
+	// clear old
+	if ($hilighted) {
+		$hilighted.removeClass('hilighted');
+	}
+	if ($hilightedMenuItem) {
+		$hilightedMenuItem.removeClass('hilighted');
+	}
+
+	if ($el.length === 0) {
+		$detailsWrap.scrollTop(0);
+	} else {
+		// hilight new
+		$hilighted = $el;
+		$hilighted.addClass('hilighted');
+		$detailsWrap.scrollTop($hilighted.offset().top + $detailsWrap.scrollTop() - 160);
+	}
+	linkId = id.replace(/[^a-z0-9<>\\]+/gi,'.');
+
+	$hilightedMenuItem = $('a[href="#'+ linkId +'"]').not('.plus');
+	$hilightedMenuItem.addClass('hilighted');
+
+}
+
+/**
+ * Expand and load children when necessary of current level
+ */
+function toggleExpand($elem, callback) {
+	var $_menu = $elem.find('div[id$="-menu"]').first(),
+		_id = $_menu.attr('id').replace("-menu",""),
+		displayChildrenCallback = function () {
+
+			$('.dots', $elem).removeClass('loading');
+			$elem.removeClass("collapsed");
+			$elem.addClass("expanded");
+			$_menu.slideDown();
+			// show relevant section
+
+			if (/[A-Z]/.test(_id[0])) {
+				_id = 'object-' + _id;
+			}
+			toggleSection(_id);
+
+			if (callback) {
+				callback();
+			}
+
+		};
+
+
+	if ($elem.hasClass('collapsed')) {
+
+		/* if not loaded, load children, standard we have three children */
+		if ($_menu.children().size() == 1) {
+			$('.dots', $elem).addClass('loading');
+			loadChildren(_id, false, displayChildrenCallback);
+
+		} else {
+			displayChildrenCallback();
+		}
+	} else {
+		// hide children
+		$_menu.slideUp('normal',function(){
+			$elem.removeClass("expanded");
+			$elem.addClass("collapsed");
+		});
+	}
+};
+
+function toggleSection(sectionId) {
+	$section = $("#details > div.section:visible");
+
+	// hide current section
+	if($section){
+		$section.hide();
+	}
+	if (/[^\\]</.test(sectionId)) {
+		sectionId = sectionId.replace('<', '\\<').replace('>', '\\>');
+	}
+	$('#details > div.section#' + sectionId).show();
+}
+
+
+function addSectionOption(val){
+	$section = $('<div class="section" id="' + val.name + '" style="display:none;"></div>').appendTo('#details');
+	$('<h1>' + val.fullname.replace('<', '&lt;').replace('>', '&gt;') + '</h1>'
+	+ (val.description ? '<div class="section-description">' + val.description + '</div>': '')
+	+ (val.demo ? '<div class="demo"><h4>Try it:</h4> ' + val.demo + '</div>': '' )).appendTo($section);
+
+	activateInternalLinks($section);
+	$(document).triggerHandler({ type:"xtra.btn.section.event",id: optionDictionary[val.fullname], table: 'option' });
+}
+
+function addSectionObject(val){
+	$section = $('<div class="section" id="object-' + val.name + '" style="display:none;"></div>').appendTo('#details');
+	$('<h1>' + val.title + '</h1>').appendTo($section);
+	$('<div class="section-description">' + val.description + '</div>').appendTo($section);
+
+	activateInternalLinks($section);
+	$(document).triggerHandler({ type:"xtra.btn.section.event",id: 'object-'+ val.name, table: 'object'});
+}
+
+function markupReturnType(s) {
+	s = s.replace(/[<>]/g, function (a) {
+		return {
+			'<': '&lt;',
+			'>': '&gt;'
+		}[a];
+	});
+	s = s.replace(/(Axis|Chart|Element|Highcharts|Point|Renderer|Series)/g, '<a href="#$1">$1</a>');
+	return s;
+}
+
+function loadOptionMemberInSection(obj, isParent){
+	//add member to section in div#details
+	var $_section = $('div#' + obj.parent.replace('<', '\\<').replace('>', '\\>') + '.section'),
+		$_inheritedLink,
+		$memberDiv,
+		contextClass = obj.description && obj.description.indexOf('<p>') > -1 ? '' : ' context';
+
+	$memberDiv = $('<div class="member" id="' + obj.name + '"><span class="title">' + obj.title + '</span>'
+			+ (obj.returnType ? '<span class="returnType">: ' + markupReturnType(obj.returnType) + '</span>' : '')
+			+ (obj.deprecated ? '<div class="deprecated"><p>Deprecated</p></div>' : '' )
+			+ (obj.since ? '<div class="since">Since ' + obj.since + '</div>' : '' )
+			+ (obj.description ? '<div class="description">' + obj.description
+					+ (obj.defaults ? ' Defaults to <code>' + escapeHTML(obj.defaults) + '</code>.'  : '')
+					+ '</div>' : '')
+			+ (obj.context ? '<div class="description' + contextClass + '">The <code>this</code> keyword refers to the '+ markupReturnType(obj.context) +' object.</div>' : '')
+			+ (obj.demo ? '<div class="demo"><h4>Try it:</h4> ' + obj.demo + '</div>': '' )
+			+ (obj.seeAlso ? '<div class="seeAlso">See also: ' + obj.seeAlso + '</div>': '' )
+			+ '</div>').appendTo($_section);
+
+	activateInternalLinks($memberDiv);
+
+	if (isParent) {
+		$('div#' + escapeSelector(obj.name) + '.member span.title').html(function() {
+			var title = $.trim($(this).text());
+			return $('<a href="#' + obj.fullname + '">' + title + '</a>').click(function(){
+				gotoSection(obj.fullname, true);
+			});
+		});
+	}
+}
+
+function loadObjectMemberInSection(obj) {
+	$memberDiv = $('<div class="member" id="' + obj.name + '">'
+			+ '<span class="title">' + obj.title + '</span> '
+			+ (obj.params ? '<span class="parameters">' + obj.params + '</span>' : '')
+			+ (obj.since ? '<div class="since">Since ' + obj.since + '</div>' : '' )
+			+ (obj.deprecated ? '<div class="deprecated"><p>Deprecated</p></div>' : '' )
+			+ '<div class="description"><p>' + obj.description +  '</p>'
+			+ (obj.paramsDescription ? '<h4>Parameters</h4><ul id="paramdesc"><li>' +
+					obj.paramsDescription.replace(/\|\|/g,'</li><li>') + '</li></ul>' : '')
+			+ (obj.returnType ? '<h4>Returns</h4><ul id="returns"><li>' + markupReturnType(obj.returnType) + '</li></ul>' : '')
+			+ '</div>'
+			+ (obj.demo ? '<div class="demo"><h4>Try it:</h4> ' + obj.demo + '</div>': '' )
+			+ '</div>').appendTo('div#object-' + obj.parent + '.section');
+
+	activateInternalLinks($memberDiv);
+}
+
+function loadChildren(name, silent, callback) {
+
+	var isObject = /[A-Z]/.test(name[0]),
+		url = isObject ?
+			'object/'+ PRODUCTNAME + '-obj/child/' + name :
+			'option/'+ PRODUCTNAME + '/child/' + name;
+
+	$.ajax({
+		type: "GET",
+		url: url,
+		dataType: "json",
+		error: function () {
+			var $menu;
+			$menu = $('div#' + escapeSelector(name) + '-menu');
+			$('.dots', $menu.parent()).removeClass('loading').addClass('error').html('Error');
+		},
+		success: function (data) {
+			var display = 'block',
+			display, $menu, $menuItem;
+
+			if (silent){
+				display = 'none';
+			}
+
+			name = name.replace('<', '\\<').replace('>', '\\>');
+			$menu = $('div#' + name + '-menu');
+
+
+			$.each(data, function (key, val) {
+				var $div = $('<div></div>').appendTo($menu), $plus, $menuLink, parts,
+				tie, dottedName, internalName,
+				name,
+				title,
+				defaults,
+				cls;
+
+				/*if (val.type === 'method') {
+					name = val.name.replace('--', '.') + '()';
+				} else if (val.type === 'property') {
+					name = val.name.replace('--', '.');
+				} else {
+					name = val.fullname;
+				}*/
+				name = val.fullname;
+
+				if (val.isParent) {
+					var preBracket = '{',
+						postBracket = '}';
+
+					if (val.returnType && val.returnType.indexOf('Array') === 0 ) {
+						preBracket = '[{';
+						postBracket = '}]';
+					}
+
+
+
+					$menuItem = $('<div class="menuitem collapsed"></div>');
+					$menuLink = $('<a href="#' + name + '">' + val.title + '</a>').appendTo($menuItem);
+
+					$menuLink.click(function(){
+						gotoSection(val.fullname, true);
+					});
+					$plus = $('<a href="#' + name + '" class="plus"></a>').appendTo($menuItem);
+					$plus.click(function () {
+						toggleExpand($plus.parent());
+					});
+					$menuItem.append(':&nbsp;'+ preBracket +'<span class="dots"><span>…</span></span>');
+					// add empty submenu
+					$subMenu = $('<div id="' + val.name + '-menu" style="display:none"><div>').appendTo($menuItem);
+					$menuItem.append(postBracket);
+					$menuItem.appendTo($menu);
+					addSectionOption(val);
+				} else {
+					if (val.type === 'method') {
+						title = val.title + '()';
+					} else {
+						title = val.title;
+					}
+
+					$menuLink = $('<a href="#' + name + '">' + title + '</a>').appendTo($div);
+					$menuLink.click(function() {
+						gotoSection(name, true);
+					});
+					if (val.type === 'method') {
+						defaults = '[function]';
+					} else if (val.type === 'property') {
+						defaults = '[' + val.returnType + ']';
+					} else if (val.defaults === 'null' || val.defaults === 'undefined' || val.defaults === '' || val.defaults === undefined) {
+						defaults = val.defaults;
+					} else if (val.returnType === 'String' || val.returnType === 'Color') {
+						defaults = '"' + val.defaults + '"';
+
+					} else {
+						defaults = val.defaults;
+					}
+
+					if (val.returnType) {
+						cls = val.returnType.toLowerCase();
+					} else {
+						cls = '';
+						console.warn('Missing returnType for ' + val.fullname);
+					}
+						
+
+					$('<span class="value value-' + cls + '">: ' + escapeHTML(defaults) + '</span>').appendTo($div);
+				}
+				if (isObject) {
+					loadObjectMemberInSection(val);
+				} else {
+					loadOptionMemberInSection(val, val.isParent);
+				}
+			});
+
+			$(document).triggerHandler({
+				type:"xtra.btn.member.event",
+				id: isObject ? 'object-' + name : name,
+				table: isObject ? 'object' : 'option'
+			});
+
+			if (callback) {
+				callback();
+			}
+		}
+	});
+};
+
+function loadObjectMembers(name){
+	$.ajax({
+		type: "GET",
+		url: 'object/'+ PRODUCTNAME + '-obj/child/' + name,
+		async: false,
+		dataType: "json",
+		success: function (data) {
+			$.each(data, function (key, val) {
+				loadObjectMemberInSection(val);
+			});
+		}
+	});
+	$(document).triggerHandler({ type:"xtra.btn.member.event", id: 'object-' + name,table:'object'});
+};
+
+function gotoSection(anchor, hilighted) {
+
+	var name, levels, member, isObjectArr, isObject, parts, $_parent, $_parentparent, $_menu,
+		sectionId, parent,
+		i,
+		callbackStack = [];
+
+	// is it an option-section or an object-section?
+	parts = anchor.split("-");
+
+	// Handle typed parent item, like series<line>
+	name = anchor.split('.');
+	if (name.length > 1) {
+		name[name.length - 1] = '-' + name[name.length - 1];
+	}
+	name = name.join('-');
+
+	levels = name.split(/[-]{1,2}/);
+
+	isObject = (parts.length > 1 && parts[0] == 'object' || /[A-Z]/.test(name[0]));
+
+	// Asyncronously expand parent elements of selected item
+	$.each(levels, function(i) {
+		callbackStack.push(function () {
+			var proceed = true,
+				level,
+				$_menu,
+				$_parent;
+
+			if (levels[i]) {
+				level = levels.slice(0, i + 1).join('-');
+
+				if (level.indexOf('<') > -1) {
+					$_parentparent = $('#' + level.split('<')[0] + '-menu').parent();
+					level = escapeSelector(level);
+				}
+
+				$_menu = $('#' + level + '-menu');
+				$_parent = $_menu.parent();
+
+				if ($_menu && $_parent.hasClass('collapsed')) {
+
+					if ($_parentparent && $_parentparent.hasClass('collapsed')) {
+						toggleExpand($_parentparent);
+					}
+
+					// Do the toggle, and pass the next level as the callback argument
+					toggleExpand($_parent, callbackStack[i + 1]);
+					proceed = false;
+
+				}
+			}
+
+			// For the last path item, show the section etc
+			if (/[A-Z]/.test(level[0])) {
+				level = 'object-' + level;
+			}
+			if ($('#details > div.section#' + level).length) {
+				toggleSection(level);
+
+				// empty search
+				$("#search").val("");
+				window.location.hash = anchor;
+			}
+
+			if (proceed && callbackStack[i + 1]) {
+				callbackStack[i + 1]();
+			}
+		});
+	});
+
+	// Hilighting is the last operation in the async stack
+	if (hilighted) {
+		callbackStack.push(function () {
+			hilight(name);
+		});
+	}
+
+	// Start the recursive iteration
+	callbackStack[0]();
+
+
+
+}
+/*
+function addToSelectBox(key, val, type) {
+
+	var $menuItem = $('<div class="menuitem collapsed"></div>').appendTo('#' + type + 's'),
+		splut = val.fullname.split('<'),
+		commonName = splut[0],
+		templateName = splut[1].split('>')[0],
+		$menuLink = $('#' + commonName + '-menulink'),
+		$selectbox = $('#' + commonName + '-selectbox');
+
+	// The first time we encounter the series, generate the menu item for it.
+	if ($menuLink.length === 0) {
+		$menuLink = $('<a href="#' + commonName + '" id="' + commonName + '-menulink">' + commonName + '</a>')
+			.appendTo($menuItem);
+
+		$menuItem.append(': { type: ');
+
+		$selectbox = $('<select id="'+ commonName +'-selectbox">')
+			.bind('change', function () {
+				console.log(this.value);
+			})
+			.appendTo($menuItem);
+
+		$menuItem.append(' }');
+
+	}
+
+	$selectbox.append('<option>' + templateName + '</option>')
+		.attr({
+			name: templateName
+		});
+}
+*/
+/**
+ * Add the first level menu items on page load
+ */
+function addFirstLevelMenuItem(key, val, type) {
+
+
+	var $menuItem = $('<div class="menuitem collapsed"></div>').appendTo('#' + type + 's'),
+		$plus, anchor, $menu, levels, level, member, $menuLink,
+		sectionId = val.fullname || val.name,
+		title = escapeHTML(val.title),
+		mainSection,
+		name = val.name,
+		recurseToType = false,
+		menuItemPrefix = '';
+		prefix = ': {',
+		suffix = '}';
+
+	if (val.returnType && val.returnType.indexOf('Array') === 0) {
+		if (val.returnType === 'Array<Object>') {
+			prefix = ': [{';
+			suffix = '}]';
+		} else {
+			prefix = ': [';
+			suffix = ']';
+		}		
+	}
+	
+	// Global options
+	if ($.inArray(val.name, ['global', 'lang']) !== -1) {
+		$menuItem = $('<div class="menuitem collapsed"></div>').appendTo('#global-options');
+	}
+
+
+	// Handle the series<line> syntax
+	if (sectionId.indexOf('<') > -1) {
+		mainSection = sectionId.split('<')[0];
+
+		// The first time we encounter a menu item on the syntax series<line>, add the series menu item
+		if ($('#' + mainSection + '-menu').length === 0) {
+			sectionId = title = name = mainSection;
+			prefix = ': [';
+			suffix = ']';
+			recurseToType = true; // run this method again, but now for the { type: "line" } menu item
+		} else {
+			$menuItem.appendTo($('#' + mainSection + '-menu'));
+			menuItemPrefix = '{<br class="typed"/>';
+			title = '<span class="typed">type: "' + sectionId.split('<')[1].split('>')[0] + '"</span>';
+			prefix = ', ';
+		}
+
+
+	}
+
+	if (menuItemPrefix) {
+		$menuItem.append(menuItemPrefix);
+	}
+
+	$menuLink = $('<a href="#' + sectionId + '">' + title + '</a>')
+		.appendTo($menuItem)
+		.click(function(){
+			gotoSection(sectionId, true);
+			return false;
+		});
+
+	if (val.isParent) {
+		$plus = $('<a href="#' + sectionId + '" class="plus"></a>')
+			.appendTo($menuItem)
+			.click(function () {
+				toggleExpand($plus.parent());
+			});
+	}
+
+	$menuItem.append(prefix);
+
+	$('<span class="dots"><span>…</span></span>').appendTo($menuItem);
+
+	if(val.isParent) {
+		$subMenu = $('<div id="' + name + '-menu" style="display:none"><div>').appendTo($menuItem);
+	}
+	
+	$menuItem.append(suffix);
+
+
+	// create sections in div#details
+	if (type === 'option') {
+		addSectionOption(val);
+	} else {
+		addSectionObject(val);
+	}
+
+	if (recurseToType) {
+		addFirstLevelMenuItem.apply(null, arguments);
+	}
+}
+
+prepareOffline = function(callback) {
+
+	offline = {highcharts: {}, highstock: {}, highmaps: {}};
+
+	// now we have the data loaded we rewrite $.ajax for offline use
+	$.ajax = function(obj) {
+		var result,
+			type,
+			splitted;
+
+		if (obj.url === PRODUCTNAME + '/names') {
+			result = API[PRODUCTNAME].names;
+		}
+
+		var type = obj.url.split('/');		
+
+		if (obj.url === 'option/'+ PRODUCTNAME + '/main') {
+			result = API[PRODUCTNAME].main.option;
+		}
+
+		if (obj.url === 'object/'+ PRODUCTNAME + '-obj/main') {
+			result = API[PRODUCTNAME].main.object;
+		}
+
+		splitted = obj.url.split('object/' + PRODUCTNAME + '-obj/child/');
+		if (splitted.length > 1) {
+			result = API[PRODUCTNAME].object[splitted[1]].children;
+		}
+		splitted = obj.url.split('option/' + PRODUCTNAME + '/child/');
+		if (splitted.length > 1) {
+			result = API[PRODUCTNAME].option[splitted[1]].children;
+		}
+		
+		// result to handler
+		obj.success(result);
+	};
+
+	callback();
+}
+
+// build dictionary for offline use
+buildApiOffline = function(data, callback) {
+
+	var option,		
+		main,
+		names,
+		type,
+		i = 0;
+
+	API[PRODUCTNAME] = { option: [], object: [], main: {}, names: [] };
+		
+	names = API[PRODUCTNAME].names;
+
+	function fillWithType(type) {
+		var idx,
+			slot = API[PRODUCTNAME][type],
+			main = API[PRODUCTNAME].main[type] = [];
+			name,
+			parent;
+		
+		// Loop over options in dump file
+		for (idx = 0; idx < data[type].length; idx++) {
+			option = data[type][idx];
+			name = option.name;
+			names.push(name);
+
+			if (option.isParent) {
+		
+				// Store main options separately
+				if (!/-/.test(name)) {	  
+					main.push(option);
+				}
+		
+				if (slot[name] == undefined) {
+					slot[name] = {details: option, children: []};
+				} else {
+					/* In case the parent option was already 
+					 * deducted from a child option 
+					 */            	
+					slot[name].details = option;
+				}            
+			}
+
+			// we have a child!
+			if (slot.hasOwnProperty(option.parent)) {
+				slot[option.parent].children.push(option);
+			} else {
+				slot[option.parent] = {details: null, children: [option]};
+			}
+		}	
+	}
+
+	while(i < 2) {
+		type = ['option', 'object'][i];
+		fillWithType(type);
+		i++
+	}
+
+	callback();
+
+};
+
+buildPage = function() {
+
+		// autocomplete
+		$.ajax({
+			type: "GET",
+			url: PRODUCTNAME + '/names',
+			async: false,
+			dataType: "json",
+			success: function (data) {
+				$.each(data, function (key, val) {
+					var dotted = toDot(val);
+					names.push(dotted);
+					optionDictionary[dotted] = val;
+				});
+
+				$("#search" ).autocomplete({
+					source: names,
+					autoFocus: true,
+					minLength: 2,
+					select: function( event, ui ) {
+							gotoSection(ui.item.value, true);
+					},
+					position: {
+						my: 'left top',
+						of: '#search-wrap'
+					}
+				});
+			}
+		});
+
+		// load main options and build folded menu tree
+		$.ajax({
+			type: "GET",
+			url: 'option/' + PRODUCTNAME + '/main',
+			async: false,
+			dataType: "json",
+			success: function (data) {
+				$.each(data, function (key, val) {
+					addFirstLevelMenuItem(key, val, 'option');
+				});
+			}
+		});
+
+		// load objects of product
+		$.ajax({
+			type: "GET",
+			url: 'object/' + PRODUCTNAME + '-obj/main',
+			async: false,
+			dataType: "json",
+
+			success: function (data) {
+
+				$.each(data, function (key, val) {
+					addFirstLevelMenuItem(key, val, 'object');
+				});
+			}
+		});
+
+		 // check url for anchor, remove also '()' from old links for object.method().
+		 anchor = window.location.hash.replace('#', '').replace('()','');
+		 if (anchor) {
+			gotoSection(anchor, true);
+		 }
+
+		if (/\?object_not_found=true/.test(window.location.search)) {
+				dottedName = window.location.hash.split('#').pop();
+				internalName = optionDictionary[dottedName];
+				$('div#' + internalName).append('<div class="error">The object/option wasn\'t found in the database, maybe iẗ́\'s inherited??</div>');
+		}
+
+		 // focus search
+		 $("#search")[0].focus();
+	}
+
+// Startup
+$(document).ready( function () {
+	
+	if (runDB) {
+		buildPage();		
+	} else {
+		// prepare dump object
+		prepareOffline(function () {
+			// load offline data
+			loadScript('./js/' + PRODUCTNAME + '.json', function() { 
+				buildApiOffline(offline[PRODUCTNAME], buildPage);
+			});
+		});
+		// hide elements that don't make sence in offline mode
+		$('.hidden-offline').hide();
+	};
+
+	// convert hash from redirected dash syntax to new dot syntax
+	if (/-/.test(location.hash)) {
+		location.hash = location.hash.replace(/(--|-)/g, '.');
+	}
+
+	// Add scrollanimation to button
+	$("a[href='#top']").click(function() {
+		$("html, body").animate({ scrollTop: 0 }, "slow");
+		return false;
+	});
+
+	$(window).on('scroll', function() {
+		button = $("#scrollTop");
+		if (!$("#top").isOnScreen()) {
+			if (button.css('display') == 'none') {
+				button.fadeIn("slow");
+			}
+		} else {
+			if (button.css('display') == 'block') {
+				button.fadeOut("slow");
+			} 
+		}
+	});
+
+	$.fn.isOnScreen = function(){
+		var win = $(window),
+			viewport = {
+				top : win.scrollTop(),
+				left : win.scrollLeft()
+			};
+		
+		viewport.right = viewport.left + win.width();
+		viewport.bottom = viewport.top + win.height();
+		
+		var bounds = this.offset();
+		bounds.right = bounds.left + this.outerWidth();
+		bounds.bottom = bounds.top + this.outerHeight();
+		
+		return (!(viewport.right < bounds.left || viewport.left > bounds.right || viewport.bottom < bounds.top || viewport.top > bounds.bottom));
+		
+	};
+
+	function updateHeight() {
+		if (jQuery(window).width() >= 768) {
+			// Disable 
+			var padding,
+			height = $(window).height() - $('#top').height() - $('#footer').height();
+			$("#wrapper").height(height);
+			padding = $("#wrapper .container").innerHeight() - $("#wrapper .container").height();
+			height = $("#wrapper").height() - padding;
+			$("#wrapper-inner").height(height);
+			$("#nav-wrap").height(height);
+			$("#details-wrap").height(height);
+		} else {
+			// no height defined on the element for mobile devices
+			$('#nav-wrap').removeAttr('style');
+		}
+	};      
+	
+	updateHeight();
+
+	$(window).resize(updateHeight);
+
+	// Make the Highcharts/Highstock links dynamic
+	$('#highstock-link, #highcharts-link').click(function () {
+		this.href += location.hash;
+	});
+
+	// Login shortcut (hot corner)
+	$("<div>")
+		.css({
+			position: 'absolute',
+			display: 'block',
+			width: '10px',
+			height: '10px',
+			right: 0,
+			cursor: 'pointer'
+		})
+		.click(function () {
+				$('<iframe src="auth/login">').dialog({
+					height: 300
+				});
+		})
+		.prependTo('#top .container');
+	
+});
+
+
+
diff --git a/data/interfaces/default/js/highcharts/gfx/vml-radial-gradient.png b/data/interfaces/default/js/highcharts/gfx/vml-radial-gradient.png
new file mode 100644
index 00000000..504ef6e0
Binary files /dev/null and b/data/interfaces/default/js/highcharts/gfx/vml-radial-gradient.png differ
diff --git a/data/interfaces/default/js/highcharts/graphics/meteogram-symbols-30px.png b/data/interfaces/default/js/highcharts/graphics/meteogram-symbols-30px.png
new file mode 100644
index 00000000..c770615c
Binary files /dev/null and b/data/interfaces/default/js/highcharts/graphics/meteogram-symbols-30px.png differ
diff --git a/data/interfaces/default/js/highcharts/graphics/skies.jpg b/data/interfaces/default/js/highcharts/graphics/skies.jpg
new file mode 100644
index 00000000..259f46a2
Binary files /dev/null and b/data/interfaces/default/js/highcharts/graphics/skies.jpg differ
diff --git a/data/interfaces/default/js/highcharts/graphics/snow.png b/data/interfaces/default/js/highcharts/graphics/snow.png
new file mode 100644
index 00000000..0171485b
Binary files /dev/null and b/data/interfaces/default/js/highcharts/graphics/snow.png differ
diff --git a/data/interfaces/default/js/highcharts/graphics/sun.png b/data/interfaces/default/js/highcharts/graphics/sun.png
new file mode 100644
index 00000000..2c89e40b
Binary files /dev/null and b/data/interfaces/default/js/highcharts/graphics/sun.png differ
diff --git a/data/interfaces/default/js/highcharts/js/adapters/standalone-framework.js b/data/interfaces/default/js/highcharts/js/adapters/standalone-framework.js
new file mode 100644
index 00000000..47bed974
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/adapters/standalone-framework.js
@@ -0,0 +1,18 @@
+/*
+ Highcharts JS v4.1.6 (2015-06-12)
+
+ Standalone Highcharts Framework
+
+ License: MIT License
+*/
+var HighchartsAdapter=function(){function p(c){function b(b,a,d){b.removeEventListener(a,d,!1)}function d(b,a,d){d=b.HCProxiedMethods[d.toString()];b.detachEvent("on"+a,d)}function a(a,c){var f=a.HCEvents,i,g,k,j;if(a.removeEventListener)i=b;else if(a.attachEvent)i=d;else return;c?(g={},g[c]=!0):g=f;for(j in g)if(f[j])for(k=f[j].length;k--;)i(a,j,f[j][k])}c.HCExtended||Highcharts.extend(c,{HCExtended:!0,HCEvents:{},bind:function(b,a){var d=this,c=this.HCEvents,g;if(d.addEventListener)d.addEventListener(b,
+a,!1);else if(d.attachEvent){g=function(b){b.target=b.srcElement||window;a.call(d,b)};if(!d.HCProxiedMethods)d.HCProxiedMethods={};d.HCProxiedMethods[a.toString()]=g;d.attachEvent("on"+b,g)}c[b]===s&&(c[b]=[]);c[b].push(a)},unbind:function(c,h){var f,i;c?(f=this.HCEvents[c]||[],h?(i=HighchartsAdapter.inArray(h,f),i>-1&&(f.splice(i,1),this.HCEvents[c]=f),this.removeEventListener?b(this,c,h):this.attachEvent&&d(this,c,h)):(a(this,c),this.HCEvents[c]=[])):(a(this),this.HCEvents={})},trigger:function(b,
+a){var d=this.HCEvents[b]||[],c=d.length,g,k,j;k=function(){a.defaultPrevented=!0};for(g=0;g<c;g++){j=d[g];if(a.stopped)break;a.preventDefault=k;a.target=this;if(!a.type)a.type=b;j.call(this,a)===!1&&a.preventDefault()}}});return c}var s,l=document,q=[],m=[],r,n={},o;Math.easeInOutSine=function(c,b,d,a){return-d/2*(Math.cos(Math.PI*c/a)-1)+b};return{init:function(c){if(!l.defaultView)this._getStyle=function(b,d){var a;return b.style[d]?b.style[d]:(d==="opacity"&&(d="filter"),a=b.currentStyle[d.replace(/\-(\w)/g,
+function(b,a){return a.toUpperCase()})],d==="filter"&&(a=a.replace(/alpha\(opacity=([0-9]+)\)/,function(b,a){return a/100})),a===""?1:a)},this.adapterRun=function(b,d){var a={width:"clientWidth",height:"clientHeight"}[d];if(a)return b.style.zoom=1,b[a]-2*parseInt(HighchartsAdapter._getStyle(b,"padding"),10)};if(!Array.prototype.forEach)this.each=function(b,d){for(var a=0,c=b.length;a<c;a++)if(d.call(b[a],b[a],a,b)===!1)return a};if(!Array.prototype.indexOf)this.inArray=function(b,d){var a,c=0;if(d)for(a=
+d.length;c<a;c++)if(d[c]===b)return c;return-1};if(!Array.prototype.filter)this.grep=function(b,d){for(var a=[],c=0,h=b.length;c<h;c++)d(b[c],c)&&a.push(b[c]);return a};o=function(b,c,a){this.options=c;this.elem=b;this.prop=a};o.prototype={update:function(){var b;b=this.paths;var d=this.elem,a=d.element;if(n[this.prop])n[this.prop](this);else b&&a?d.attr("d",c.step(b[0],b[1],this.now,this.toD)):d.attr?a&&d.attr(this.prop,this.now):(b={},b[this.prop]=this.now+this.unit,Highcharts.css(d,b));this.options.step&&
+this.options.step.call(this.elem,this.now,this)},custom:function(b,c,a){var e=this,h=function(a){return e.step(a)},f;this.startTime=+new Date;this.start=b;this.end=c;this.unit=a;this.now=this.start;this.pos=this.state=0;h.elem=this.elem;h()&&m.push(h)===1&&(r=setInterval(function(){for(f=0;f<m.length;f++)m[f]()||m.splice(f--,1);m.length||clearInterval(r)},13))},step:function(b){var c=+new Date,a;a=this.options;var e=this.elem,h;if(e.stopAnimation||e.attr&&!e.element)a=!1;else if(b||c>=a.duration+
+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();b=this.options.curAnim[this.prop]=!0;for(h in a.curAnim)a.curAnim[h]!==!0&&(b=!1);b&&a.complete&&a.complete.call(e);a=!1}else e=c-this.startTime,this.state=e/a.duration,this.pos=a.easing(e,0,1,a.duration),this.now=this.start+(this.end-this.start)*this.pos,this.update(),a=!0;return a}};this.animate=function(b,d,a){var e,h="",f,i,g;b.stopAnimation=!1;if(typeof a!=="object"||a===null)e=arguments,a={duration:e[2],easing:e[3],complete:e[4]};
+if(typeof a.duration!=="number")a.duration=400;a.easing=Math[a.easing]||Math.easeInOutSine;a.curAnim=Highcharts.extend({},d);for(g in d)i=new o(b,a,g),f=null,g==="d"?(i.paths=c.init(b,b.d,d.d),i.toD=d.d,e=0,f=1):b.attr?e=b.attr(g):(e=parseFloat(HighchartsAdapter._getStyle(b,g))||0,g!=="opacity"&&(h="px")),f||(f=d[g]),i.custom(e,f,h)}},_getStyle:function(c,b){return window.getComputedStyle(c,void 0).getPropertyValue(b)},addAnimSetter:function(c,b){n[c]=b},getScript:function(c,b){var d=l.getElementsByTagName("head")[0],
+a=l.createElement("script");a.type="text/javascript";a.src=c;a.onload=b;d.appendChild(a)},inArray:function(c,b){return b.indexOf?b.indexOf(c):q.indexOf.call(b,c)},adapterRun:function(c,b){return parseInt(HighchartsAdapter._getStyle(c,b),10)},grep:function(c,b){return q.filter.call(c,b)},map:function(c,b){for(var d=[],a=0,e=c.length;a<e;a++)d[a]=b.call(c[a],c[a],a,c);return d},offset:function(c){var b=document.documentElement,c=c.getBoundingClientRect();return{top:c.top+(window.pageYOffset||b.scrollTop)-
+(b.clientTop||0),left:c.left+(window.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}},addEvent:function(c,b,d){p(c).bind(b,d)},removeEvent:function(c,b,d){p(c).unbind(b,d)},fireEvent:function(c,b,d,a){var e;l.createEvent&&(c.dispatchEvent||c.fireEvent)?(e=l.createEvent("Events"),e.initEvent(b,!0,!0),e.target=c,Highcharts.extend(e,d),c.dispatchEvent?c.dispatchEvent(e):c.fireEvent(b,e)):c.HCExtended===!0&&(d=d||{},c.trigger(b,d));d&&d.defaultPrevented&&(a=null);a&&a(d)},washMouseEvent:function(c){return c},
+stop:function(c){c.stopAnimation=!0},each:function(c,b){return Array.prototype.forEach.call(c,b)}}}();
diff --git a/data/interfaces/default/js/highcharts/js/adapters/standalone-framework.src.js b/data/interfaces/default/js/highcharts/js/adapters/standalone-framework.src.js
new file mode 100644
index 00000000..5f82e2c2
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/adapters/standalone-framework.src.js
@@ -0,0 +1,603 @@
+/**
+ * @license Highcharts JS v4.1.6 (2015-06-12)
+ *
+ * Standalone Highcharts Framework
+ *
+ * License: MIT License
+ */
+
+
+/*global Highcharts */
+var HighchartsAdapter = (function () {
+
+var UNDEFINED,
+	doc = document,
+	emptyArray = [],
+	timers = [],
+	timerId,
+	animSetters = {},
+	Fx;
+
+Math.easeInOutSine = function (t, b, c, d) {
+	return -c / 2 * (Math.cos(Math.PI * t / d) - 1) + b;
+};
+
+
+
+/**
+ * Extend given object with custom events
+ */
+function augment(obj) {
+	function removeOneEvent(el, type, fn) {
+		el.removeEventListener(type, fn, false);
+	}
+
+	function IERemoveOneEvent(el, type, fn) {
+		fn = el.HCProxiedMethods[fn.toString()];
+		el.detachEvent('on' + type, fn);
+	}
+
+	function removeAllEvents(el, type) {
+		var events = el.HCEvents,
+			remove,
+			types,
+			len,
+			n;
+
+		if (el.removeEventListener) {
+			remove = removeOneEvent;
+		} else if (el.attachEvent) {
+			remove = IERemoveOneEvent;
+		} else {
+			return; // break on non-DOM events
+		}
+
+
+		if (type) {
+			types = {};
+			types[type] = true;
+		} else {
+			types = events;
+		}
+
+		for (n in types) {
+			if (events[n]) {
+				len = events[n].length;
+				while (len--) {
+					remove(el, n, events[n][len]);
+				}
+			}
+		}
+	}
+
+	if (!obj.HCExtended) {
+		Highcharts.extend(obj, {
+			HCExtended: true,
+
+			HCEvents: {},
+
+			bind: function (name, fn) {
+				var el = this,
+					events = this.HCEvents,
+					wrappedFn;
+
+				// handle DOM events in modern browsers
+				if (el.addEventListener) {
+					el.addEventListener(name, fn, false);
+
+				// handle old IE implementation
+				} else if (el.attachEvent) {
+					
+					wrappedFn = function (e) {
+						e.target = e.srcElement || window; // #2820
+						fn.call(el, e);
+					};
+
+					if (!el.HCProxiedMethods) {
+						el.HCProxiedMethods = {};
+					}
+
+					// link wrapped fn with original fn, so we can get this in removeEvent
+					el.HCProxiedMethods[fn.toString()] = wrappedFn;
+
+					el.attachEvent('on' + name, wrappedFn);
+				}
+
+
+				if (events[name] === UNDEFINED) {
+					events[name] = [];
+				}
+
+				events[name].push(fn);
+			},
+
+			unbind: function (name, fn) {
+				var events,
+					index;
+
+				if (name) {
+					events = this.HCEvents[name] || [];
+					if (fn) {
+						index = HighchartsAdapter.inArray(fn, events);
+						if (index > -1) {
+							events.splice(index, 1);
+							this.HCEvents[name] = events;
+						}
+						if (this.removeEventListener) {
+							removeOneEvent(this, name, fn);
+						} else if (this.attachEvent) {
+							IERemoveOneEvent(this, name, fn);
+						}
+					} else {
+						removeAllEvents(this, name);
+						this.HCEvents[name] = [];
+					}
+				} else {
+					removeAllEvents(this);
+					this.HCEvents = {};
+				}
+			},
+
+			trigger: function (name, args) {
+				var events = this.HCEvents[name] || [],
+					target = this,
+					len = events.length,
+					i,
+					preventDefault,
+					fn;
+
+				// Attach a simple preventDefault function to skip default handler if called
+				preventDefault = function () {
+					args.defaultPrevented = true;
+				};
+				
+				for (i = 0; i < len; i++) {
+					fn = events[i];
+
+					// args is never null here
+					if (args.stopped) {
+						return;
+					}
+
+					args.preventDefault = preventDefault;
+					args.target = target;
+
+					// If the type is not set, we're running a custom event (#2297). If it is set,
+					// we're running a browser event, and setting it will cause en error in
+					// IE8 (#2465).
+					if (!args.type) {
+						args.type = name;
+					}
+					
+
+					
+					// If the event handler return false, prevent the default handler from executing
+					if (fn.call(this, args) === false) {
+						args.preventDefault();
+					}
+				}
+			}
+		});
+	}
+
+	return obj;
+}
+
+
+return {
+
+	/**
+	 * Initialize the adapter. This is run once as Highcharts is first run.
+	 */
+	init: function (pathAnim) {
+
+		/**
+		 * Compatibility section to add support for legacy IE. This can be removed if old IE 
+		 * support is not needed.
+		 */
+		if (!doc.defaultView) {
+			this._getStyle = function (el, prop) {
+				var val;
+				if (el.style[prop]) {
+					return el.style[prop];
+				} else {
+					if (prop === 'opacity') {
+						prop = 'filter';
+					}
+					/*jslint unparam: true*/
+					val = el.currentStyle[prop.replace(/\-(\w)/g, function (a, b) { return b.toUpperCase(); })];
+					if (prop === 'filter') {
+						val = val.replace(
+							/alpha\(opacity=([0-9]+)\)/, 
+							function (a, b) { 
+								return b / 100; 
+							}
+						);
+					}
+					/*jslint unparam: false*/
+					return val === '' ? 1 : val;
+				} 
+			};
+			this.adapterRun = function (elem, method) {
+				var alias = { width: 'clientWidth', height: 'clientHeight' }[method];
+
+				if (alias) {
+					elem.style.zoom = 1;
+					return elem[alias] - 2 * parseInt(HighchartsAdapter._getStyle(elem, 'padding'), 10);
+				}
+			};
+		}
+
+		if (!Array.prototype.forEach) {
+			this.each = function (arr, fn) { // legacy
+				var i = 0, 
+					len = arr.length;
+				for (; i < len; i++) {
+					if (fn.call(arr[i], arr[i], i, arr) === false) {
+						return i;
+					}
+				}
+			};
+		}
+
+		if (!Array.prototype.indexOf) {
+			this.inArray = function (item, arr) {
+				var len, 
+					i = 0;
+
+				if (arr) {
+					len = arr.length;
+					
+					for (; i < len; i++) {
+						if (arr[i] === item) {
+							return i;
+						}
+					}
+				}
+
+				return -1;
+			};
+		}
+
+		if (!Array.prototype.filter) {
+			this.grep = function (elements, callback) {
+				var ret = [],
+					i = 0,
+					length = elements.length;
+
+				for (; i < length; i++) {
+					if (!!callback(elements[i], i)) {
+						ret.push(elements[i]);
+					}
+				}
+
+				return ret;
+			};
+		}
+
+		//--- End compatibility section ---
+
+
+		/**
+		 * Start of animation specific code
+		 */
+		Fx = function (elem, options, prop) {
+			this.options = options;
+			this.elem = elem;
+			this.prop = prop;
+		};
+		Fx.prototype = {
+			
+			update: function () {
+				var styles,
+					paths = this.paths,
+					elem = this.elem,
+					elemelem = elem.element; // if destroyed, it is null
+
+				// Animation setter defined from outside
+				if (animSetters[this.prop]) {
+					animSetters[this.prop](this);
+
+				// Animating a path definition on SVGElement
+				} else if (paths && elemelem) {
+					elem.attr('d', pathAnim.step(paths[0], paths[1], this.now, this.toD));
+
+				// Other animations on SVGElement
+				} else if (elem.attr) {
+					if (elemelem) {
+						elem.attr(this.prop, this.now);
+					}
+
+				// HTML styles
+				} else {
+					styles = {};
+					styles[this.prop] = this.now + this.unit;
+					Highcharts.css(elem, styles);
+				}
+				
+				if (this.options.step) {
+					this.options.step.call(this.elem, this.now, this);
+				}
+
+			},
+			custom: function (from, to, unit) {
+				var self = this,
+					t = function (gotoEnd) {
+						return self.step(gotoEnd);
+					},
+					i;
+
+				this.startTime = +new Date();
+				this.start = from;
+				this.end = to;
+				this.unit = unit;
+				this.now = this.start;
+				this.pos = this.state = 0;
+
+				t.elem = this.elem;
+
+				if (t() && timers.push(t) === 1) {
+					timerId = setInterval(function () {
+						
+						for (i = 0; i < timers.length; i++) {
+							if (!timers[i]()) {
+								timers.splice(i--, 1);
+							}
+						}
+
+						if (!timers.length) {
+							clearInterval(timerId);
+						}
+					}, 13);
+				}
+			},
+			
+			step: function (gotoEnd) {
+				var t = +new Date(),
+					ret,
+					done,
+					options = this.options,
+					elem = this.elem,
+					i;
+				
+				if (elem.stopAnimation || (elem.attr && !elem.element)) { // #2616, element including flag is destroyed
+					ret = false;
+
+				} else if (gotoEnd || t >= options.duration + this.startTime) {
+					this.now = this.end;
+					this.pos = this.state = 1;
+					this.update();
+
+					this.options.curAnim[this.prop] = true;
+
+					done = true;
+					for (i in options.curAnim) {
+						if (options.curAnim[i] !== true) {
+							done = false;
+						}
+					}
+
+					if (done) {
+						if (options.complete) {
+							options.complete.call(elem);
+						}
+					}
+					ret = false;
+
+				} else {
+					var n = t - this.startTime;
+					this.state = n / options.duration;
+					this.pos = options.easing(n, 0, 1, options.duration);
+					this.now = this.start + ((this.end - this.start) * this.pos);
+					this.update();
+					ret = true;
+				}
+				return ret;
+			}
+		};
+
+		/**
+		 * The adapter animate method
+		 */
+		this.animate = function (el, prop, opt) {
+			var start,
+				unit = '',
+				end,
+				fx,
+				args,
+				name;
+
+			el.stopAnimation = false; // ready for new
+
+			if (typeof opt !== 'object' || opt === null) {
+				args = arguments;
+				opt = {
+					duration: args[2],
+					easing: args[3],
+					complete: args[4]
+				};
+			}
+			if (typeof opt.duration !== 'number') {
+				opt.duration = 400;
+			}
+			opt.easing = Math[opt.easing] || Math.easeInOutSine;
+			opt.curAnim = Highcharts.extend({}, prop);
+			
+			for (name in prop) {
+				fx = new Fx(el, opt, name);
+				end = null;
+				
+				if (name === 'd') {
+					fx.paths = pathAnim.init(
+						el,
+						el.d,
+						prop.d
+					);
+					fx.toD = prop.d;
+					start = 0;
+					end = 1;
+				} else if (el.attr) {
+					start = el.attr(name);
+				} else {
+					start = parseFloat(HighchartsAdapter._getStyle(el, name)) || 0;
+					if (name !== 'opacity') {
+						unit = 'px';
+					}
+				}
+	
+				if (!end) {
+					end = prop[name];
+				}
+				fx.custom(start, end, unit);
+			}	
+		};
+	},
+
+	/**
+	 * Internal method to return CSS value for given element and property
+	 */
+	_getStyle: function (el, prop) {
+		return window.getComputedStyle(el, undefined).getPropertyValue(prop);
+	},
+
+	/**
+	 * Add an animation setter for a specific property
+	 */
+	addAnimSetter: function (prop, fn) {
+		animSetters[prop] = fn;
+	},
+
+	/**
+	 * Downloads a script and executes a callback when done.
+	 * @param {String} scriptLocation
+	 * @param {Function} callback
+	 */
+	getScript: function (scriptLocation, callback) {
+		// We cannot assume that Assets class from mootools-more is available so instead insert a script tag to download script.
+		var head = doc.getElementsByTagName('head')[0],
+			script = doc.createElement('script');
+
+		script.type = 'text/javascript';
+		script.src = scriptLocation;
+		script.onload = callback;
+
+		head.appendChild(script);
+	},
+
+	/**
+	 * Return the index of an item in an array, or -1 if not found
+	 */
+	inArray: function (item, arr) {
+		return arr.indexOf ? arr.indexOf(item) : emptyArray.indexOf.call(arr, item);
+	},
+
+
+	/**
+	 * A direct link to adapter methods
+	 */
+	adapterRun: function (elem, method) {
+		return parseInt(HighchartsAdapter._getStyle(elem, method), 10);
+	},
+
+	/**
+	 * Filter an array
+	 */
+	grep: function (elements, callback) {
+		return emptyArray.filter.call(elements, callback);
+	},
+
+	/**
+	 * Map an array
+	 */
+	map: function (arr, fn) {
+		var results = [], i = 0, len = arr.length;
+
+		for (; i < len; i++) {
+			results[i] = fn.call(arr[i], arr[i], i, arr);
+		}
+
+		return results;
+	},
+
+	/**
+	 * Get the element's offset position, corrected by overflow:auto. Loosely based on jQuery's offset method.
+	 */
+	offset: function (el) {
+		var docElem = document.documentElement,
+			box = el.getBoundingClientRect();
+
+		return {
+			top: box.top  + (window.pageYOffset || docElem.scrollTop)  - (docElem.clientTop  || 0),
+			left: box.left + (window.pageXOffset || docElem.scrollLeft) - (docElem.clientLeft || 0)
+		};
+	},
+
+	/**
+	 * Add an event listener
+	 */
+	addEvent: function (el, type, fn) {
+		augment(el).bind(type, fn);
+	},
+
+	/**
+	 * Remove event added with addEvent
+	 */
+	removeEvent: function (el, type, fn) {
+		augment(el).unbind(type, fn);
+	},
+
+	/**
+	 * Fire an event on a custom object
+	 */
+	fireEvent: function (el, type, eventArguments, defaultFunction) {
+		var e;
+
+		if (doc.createEvent && (el.dispatchEvent || el.fireEvent)) {
+			e = doc.createEvent('Events');
+			e.initEvent(type, true, true);
+			e.target = el;
+
+			Highcharts.extend(e, eventArguments);
+
+			if (el.dispatchEvent) {
+				el.dispatchEvent(e);
+			} else {
+				el.fireEvent(type, e);
+			}
+
+		} else if (el.HCExtended === true) {
+			eventArguments = eventArguments || {};
+			el.trigger(type, eventArguments);
+		}
+
+		if (eventArguments && eventArguments.defaultPrevented) {
+			defaultFunction = null;
+		}
+
+		if (defaultFunction) {
+			defaultFunction(eventArguments);
+		}
+	},
+
+	washMouseEvent: function (e) {
+		return e;
+	},
+
+
+	/**
+	 * Stop running animation
+	 */
+	stop: function (el) {
+		el.stopAnimation = true;
+	},
+
+	/**
+	 * Utility for iterating over an array. Parameters are reversed compared to jQuery.
+	 * @param {Array} arr
+	 * @param {Function} fn
+	 */
+	each: function (arr, fn) { // modern browsers
+		return Array.prototype.forEach.call(arr, fn);
+	}
+};
+}());
diff --git a/data/interfaces/default/js/highcharts/js/highcharts.js b/data/interfaces/default/js/highcharts/js/highcharts.js
new file mode 100644
index 00000000..61344d66
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/highcharts.js
@@ -0,0 +1,325 @@
+/*
+ Highcharts JS v4.1.6 (2015-06-12)
+
+ (c) 2009-2014 Torstein Honsi
+
+ License: www.highcharts.com/license
+*/
+(function(){function A(){var a,b=arguments,c,d={},e=function(a,b){var c,d;typeof a!=="object"&&(a={});for(d in b)b.hasOwnProperty(d)&&(c=b[d],a[d]=c&&typeof c==="object"&&Object.prototype.toString.call(c)!=="[object Array]"&&d!=="renderTo"&&typeof c.nodeType!=="number"?e(a[d]||{},c):b[d]);return a};b[0]===!0&&(d=b[1],b=Array.prototype.slice.call(b,2));c=b.length;for(a=0;a<c;a++)d=e(d,b[a]);return d}function F(a,b){return parseInt(a,b||10)}function Da(a){return typeof a==="string"}function da(a){return a&&
+typeof a==="object"}function Ha(a){return Object.prototype.toString.call(a)==="[object Array]"}function ra(a){return typeof a==="number"}function Ea(a){return W.log(a)/W.LN10}function ia(a){return W.pow(10,a)}function ja(a,b){for(var c=a.length;c--;)if(a[c]===b){a.splice(c,1);break}}function q(a){return a!==y&&a!==null}function J(a,b,c){var d,e;if(Da(b))q(c)?a.setAttribute(b,c):a&&a.getAttribute&&(e=a.getAttribute(b));else if(q(b)&&da(b))for(d in b)a.setAttribute(d,b[d]);return e}function sa(a){return Ha(a)?
+a:[a]}function L(a,b){if(ya&&!ca&&b&&b.opacity!==y)b.filter="alpha(opacity="+b.opacity*100+")";x(a.style,b)}function $(a,b,c,d,e){a=B.createElement(a);b&&x(a,b);e&&L(a,{padding:0,border:O,margin:0});c&&L(a,c);d&&d.appendChild(a);return a}function ka(a,b){var c=function(){return y};c.prototype=new a;x(c.prototype,b);return c}function Ia(a,b){return Array((b||2)+1-String(a).length).join(0)+a}function Wa(a){return(eb&&eb(a)||ob||0)*6E4}function Ja(a,b){for(var c="{",d=!1,e,f,g,h,i,j=[];(c=a.indexOf(c))!==
+-1;){e=a.slice(0,c);if(d){f=e.split(":");g=f.shift().split(".");i=g.length;e=b;for(h=0;h<i;h++)e=e[g[h]];if(f.length)f=f.join(":"),g=/\.([0-9])/,h=T.lang,i=void 0,/f$/.test(f)?(i=(i=f.match(g))?i[1]:-1,e!==null&&(e=z.numberFormat(e,i,h.decimalPoint,f.indexOf(",")>-1?h.thousandsSep:""))):e=Oa(f,e)}j.push(e);a=a.slice(c+1);c=(d=!d)?"}":"{"}j.push(a);return j.join("")}function pb(a){return W.pow(10,V(W.log(a)/W.LN10))}function qb(a,b,c,d,e){var f,g=a,c=p(c,1);f=a/c;b||(b=[1,2,2.5,5,10],d===!1&&(c===
+1?b=[1,2,5,10]:c<=0.1&&(b=[1/c])));for(d=0;d<b.length;d++)if(g=b[d],e&&g*c>=a||!e&&f<=(b[d]+(b[d+1]||b[d]))/2)break;g*=c;return g}function rb(a,b){var c=a.length,d,e;for(e=0;e<c;e++)a[e].ss_i=e;a.sort(function(a,c){d=b(a,c);return d===0?a.ss_i-c.ss_i:d});for(e=0;e<c;e++)delete a[e].ss_i}function Pa(a){for(var b=a.length,c=a[0];b--;)a[b]<c&&(c=a[b]);return c}function Fa(a){for(var b=a.length,c=a[0];b--;)a[b]>c&&(c=a[b]);return c}function Qa(a,b){for(var c in a)a[c]&&a[c]!==b&&a[c].destroy&&a[c].destroy(),
+delete a[c]}function Ra(a){fb||(fb=$(Ka));a&&fb.appendChild(a);fb.innerHTML=""}function la(a,b){var c="Highcharts error #"+a+": www.highcharts.com/errors/"+a;if(b)throw c;K.console&&console.log(c)}function ea(a){return parseFloat(a.toPrecision(14))}function Sa(a,b){za=p(a,b.animation)}function Cb(){var a=T.global,b=a.useUTC,c=b?"getUTC":"get",d=b?"setUTC":"set";Aa=a.Date||window.Date;ob=b&&a.timezoneOffset;eb=b&&a.getTimezoneOffset;gb=function(a,c,d,h,i,j){var k;b?(k=Aa.UTC.apply(0,arguments),k+=
+Wa(k)):k=(new Aa(a,c,p(d,1),p(h,0),p(i,0),p(j,0))).getTime();return k};sb=c+"Minutes";tb=c+"Hours";ub=c+"Day";Xa=c+"Date";Ya=c+"Month";Za=c+"FullYear";Db=d+"Milliseconds";Eb=d+"Seconds";Fb=d+"Minutes";Gb=d+"Hours";vb=d+"Date";wb=d+"Month";xb=d+"FullYear"}function P(){}function Ta(a,b,c,d){this.axis=a;this.pos=b;this.type=c||"";this.isNew=!0;!c&&!d&&this.addLabel()}function Hb(a,b,c,d,e){var f=a.chart.inverted;this.axis=a;this.isNegative=c;this.options=b;this.x=d;this.total=null;this.points={};this.stack=
+e;this.alignOptions={align:b.align||(f?c?"left":"right":"center"),verticalAlign:b.verticalAlign||(f?"middle":c?"bottom":"top"),y:p(b.y,f?4:c?14:-6),x:p(b.x,f?c?-6:6:0)};this.textAlign=b.textAlign||(f?c?"right":"left":"center")}var y,B=document,K=window,W=Math,s=W.round,V=W.floor,ta=W.ceil,v=W.max,C=W.min,N=W.abs,X=W.cos,aa=W.sin,ma=W.PI,ha=ma*2/360,Ba=navigator.userAgent,Ib=K.opera,ya=/(msie|trident)/i.test(Ba)&&!Ib,hb=B.documentMode===8,ib=/AppleWebKit/.test(Ba),La=/Firefox/.test(Ba),Jb=/(Mobile|Android|Windows Phone)/.test(Ba),
+Ca="http://www.w3.org/2000/svg",ca=!!B.createElementNS&&!!B.createElementNS(Ca,"svg").createSVGRect,Nb=La&&parseInt(Ba.split("Firefox/")[1],10)<4,fa=!ca&&!ya&&!!B.createElement("canvas").getContext,$a,ab,Kb={},yb=0,fb,T,Oa,za,zb,D,na=function(){return y},Y=[],bb=0,Ka="div",O="none",Ob=/^[0-9]+$/,jb=["plotTop","marginRight","marginBottom","plotLeft"],Pb="stroke-width",Aa,gb,ob,eb,sb,tb,ub,Xa,Ya,Za,Db,Eb,Fb,Gb,vb,wb,xb,M={},z;z=K.Highcharts=K.Highcharts?la(16,!0):{};z.seriesTypes=M;var x=z.extend=function(a,
+b){var c;a||(a={});for(c in b)a[c]=b[c];return a},p=z.pick=function(){var a=arguments,b,c,d=a.length;for(b=0;b<d;b++)if(c=a[b],c!==y&&c!==null)return c},cb=z.wrap=function(a,b,c){var d=a[b];a[b]=function(){var a=Array.prototype.slice.call(arguments);a.unshift(d);return c.apply(this,a)}};Oa=function(a,b,c){if(!q(b)||isNaN(b))return"Invalid date";var a=p(a,"%Y-%m-%d %H:%M:%S"),d=new Aa(b-Wa(b)),e,f=d[tb](),g=d[ub](),h=d[Xa](),i=d[Ya](),j=d[Za](),k=T.lang,l=k.weekdays,d=x({a:l[g].substr(0,3),A:l[g],
+d:Ia(h),e:h,w:g,b:k.shortMonths[i],B:k.months[i],m:Ia(i+1),y:j.toString().substr(2,2),Y:j,H:Ia(f),I:Ia(f%12||12),l:f%12||12,M:Ia(d[sb]()),p:f<12?"AM":"PM",P:f<12?"am":"pm",S:Ia(d.getSeconds()),L:Ia(s(b%1E3),3)},z.dateFormats);for(e in d)for(;a.indexOf("%"+e)!==-1;)a=a.replace("%"+e,typeof d[e]==="function"?d[e](b):d[e]);return c?a.substr(0,1).toUpperCase()+a.substr(1):a};D={millisecond:1,second:1E3,minute:6E4,hour:36E5,day:864E5,week:6048E5,month:24192E5,year:314496E5};z.numberFormat=function(a,b,
+c,d){var e=T.lang,a=+a||0,f=b===-1?C((a.toString().split(".")[1]||"").length,20):isNaN(b=N(b))?2:b,b=c===void 0?e.decimalPoint:c,d=d===void 0?e.thousandsSep:d,e=a<0?"-":"",c=String(F(a=N(a).toFixed(f))),g=c.length>3?c.length%3:0;return e+(g?c.substr(0,g)+d:"")+c.substr(g).replace(/(\d{3})(?=\d)/g,"$1"+d)+(f?b+N(a-c).toFixed(f).slice(2):"")};zb={init:function(a,b,c){var b=b||"",d=a.shift,e=b.indexOf("C")>-1,f=e?7:3,g,b=b.split(" "),c=[].concat(c),h,i,j=function(a){for(g=a.length;g--;)a[g]==="M"&&a.splice(g+
+1,0,a[g+1],a[g+2],a[g+1],a[g+2])};e&&(j(b),j(c));a.isArea&&(h=b.splice(b.length-6,6),i=c.splice(c.length-6,6));if(d<=c.length/f&&b.length===c.length)for(;d--;)c=[].concat(c).splice(0,f).concat(c);a.shift=0;if(b.length)for(a=c.length;b.length<a;)d=[].concat(b).splice(b.length-f,f),e&&(d[f-6]=d[f-2],d[f-5]=d[f-1]),b=b.concat(d);h&&(b=b.concat(h),c=c.concat(i));return[b,c]},step:function(a,b,c,d){var e=[],f=a.length;if(c===1)e=d;else if(f===b.length&&c<1)for(;f--;)d=parseFloat(a[f]),e[f]=isNaN(d)?a[f]:
+c*parseFloat(b[f]-d)+d;else e=b;return e}};(function(a){K.HighchartsAdapter=K.HighchartsAdapter||a&&{init:function(b){var c=a.fx;a.extend(a.easing,{easeOutQuad:function(a,b,c,g,h){return-g*(b/=h)*(b-2)+c}});a.each(["cur","_default","width","height","opacity"],function(b,e){var f=c.step,g;e==="cur"?f=c.prototype:e==="_default"&&a.Tween&&(f=a.Tween.propHooks[e],e="set");(g=f[e])&&(f[e]=function(a){var c,a=b?a:this;if(a.prop!=="align")return c=a.elem,c.attr?c.attr(a.prop,e==="cur"?y:a.now):g.apply(this,
+arguments)})});cb(a.cssHooks.opacity,"get",function(a,b,c){return b.attr?b.opacity||0:a.call(this,b,c)});this.addAnimSetter("d",function(a){var c=a.elem,f;if(!a.started)f=b.init(c,c.d,c.toD),a.start=f[0],a.end=f[1],a.started=!0;c.attr("d",b.step(a.start,a.end,a.pos,c.toD))});this.each=Array.prototype.forEach?function(a,b){return Array.prototype.forEach.call(a,b)}:function(a,b){var c,g=a.length;for(c=0;c<g;c++)if(b.call(a[c],a[c],c,a)===!1)return c};a.fn.highcharts=function(){var a="Chart",b=arguments,
+c,g;if(this[0]){Da(b[0])&&(a=b[0],b=Array.prototype.slice.call(b,1));c=b[0];if(c!==y)c.chart=c.chart||{},c.chart.renderTo=this[0],new z[a](c,b[1]),g=this;c===y&&(g=Y[J(this[0],"data-highcharts-chart")])}return g}},addAnimSetter:function(b,c){a.Tween?a.Tween.propHooks[b]={set:c}:a.fx.step[b]=c},getScript:a.getScript,inArray:a.inArray,adapterRun:function(b,c){return a(b)[c]()},grep:a.grep,map:function(a,c){for(var d=[],e=0,f=a.length;e<f;e++)d[e]=c.call(a[e],a[e],e,a);return d},offset:function(b){return a(b).offset()},
+addEvent:function(b,c,d){a(b).bind(c,d)},removeEvent:function(b,c,d){var e=B.removeEventListener?"removeEventListener":"detachEvent";B[e]&&b&&!b[e]&&(b[e]=function(){});a(b).unbind(c,d)},fireEvent:function(b,c,d,e){var f=a.Event(c),g="detached"+c,h;!ya&&d&&(delete d.layerX,delete d.layerY,delete d.returnValue);x(f,d);b[c]&&(b[g]=b[c],b[c]=null);a.each(["preventDefault","stopPropagation"],function(a,b){var c=f[b];f[b]=function(){try{c.call(f)}catch(a){b==="preventDefault"&&(h=!0)}}});a(b).trigger(f);
+b[g]&&(b[c]=b[g],b[g]=null);e&&!f.isDefaultPrevented()&&!h&&e(f)},washMouseEvent:function(a){var c=a.originalEvent||a;if(c.pageX===y)c.pageX=a.pageX,c.pageY=a.pageY;return c},animate:function(b,c,d){var e=a(b);if(!b.style)b.style={};if(c.d)b.toD=c.d,c.d=1;e.stop();c.opacity!==y&&b.attr&&(c.opacity+="px");b.hasAnim=1;e.animate(c,d)},stop:function(b){b.hasAnim&&a(b).stop()}}})(K.jQuery);var U=K.HighchartsAdapter,E=U||{};U&&U.init.call(U,zb);var kb=E.adapterRun,Qb=E.getScript,Ma=E.inArray,o=z.each=E.each,
+lb=E.grep,Rb=E.offset,Ua=E.map,H=E.addEvent,Z=E.removeEvent,I=E.fireEvent,Sb=E.washMouseEvent,mb=E.animate,db=E.stop;T={colors:"#7cb5ec,#434348,#90ed7d,#f7a35c,#8085e9,#f15c80,#e4d354,#2b908f,#f45b5b,#91e8e1".split(","),symbols:["circle","diamond","square","triangle","triangle-down"],lang:{loading:"Loading...",months:"January,February,March,April,May,June,July,August,September,October,November,December".split(","),shortMonths:"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec".split(","),weekdays:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday".split(","),
+decimalPoint:".",numericSymbols:"k,M,G,T,P,E".split(","),resetZoom:"Reset zoom",resetZoomTitle:"Reset zoom level 1:1",thousandsSep:" "},global:{useUTC:!0,canvasToolsURL:"http://code.highcharts.com/4.1.6/modules/canvas-tools.js",VMLRadialGradientURL:"http://code.highcharts.com/4.1.6/gfx/vml-radial-gradient.png"},chart:{borderColor:"#4572A7",borderRadius:0,defaultSeriesType:"line",ignoreHiddenSeries:!0,spacing:[10,10,15,10],backgroundColor:"#FFFFFF",plotBorderColor:"#C0C0C0",resetZoomButton:{theme:{zIndex:20},
+position:{align:"right",x:-10,y:10}}},title:{text:"Chart title",align:"center",margin:15,style:{color:"#333333",fontSize:"18px"}},subtitle:{text:"",align:"center",style:{color:"#555555"}},plotOptions:{line:{allowPointSelect:!1,showCheckbox:!1,animation:{duration:1E3},events:{},lineWidth:2,marker:{lineWidth:0,radius:4,lineColor:"#FFFFFF",states:{hover:{enabled:!0,lineWidthPlus:1,radiusPlus:2},select:{fillColor:"#FFFFFF",lineColor:"#000000",lineWidth:2}}},point:{events:{}},dataLabels:{align:"center",
+formatter:function(){return this.y===null?"":z.numberFormat(this.y,-1)},style:{color:"contrast",fontSize:"11px",fontWeight:"bold",textShadow:"0 0 6px contrast, 0 0 3px contrast"},verticalAlign:"bottom",x:0,y:0,padding:5},cropThreshold:300,pointRange:0,states:{hover:{lineWidthPlus:1,marker:{},halo:{size:10,opacity:0.25}},select:{marker:{}}},stickyTracking:!0,turboThreshold:1E3}},labels:{style:{position:"absolute",color:"#3E576F"}},legend:{enabled:!0,align:"center",layout:"horizontal",labelFormatter:function(){return this.name},
+borderColor:"#909090",borderRadius:0,navigation:{activeColor:"#274b6d",inactiveColor:"#CCC"},shadow:!1,itemStyle:{color:"#333333",fontSize:"12px",fontWeight:"bold"},itemHoverStyle:{color:"#000"},itemHiddenStyle:{color:"#CCC"},itemCheckboxStyle:{position:"absolute",width:"13px",height:"13px"},symbolPadding:5,verticalAlign:"bottom",x:0,y:0,title:{style:{fontWeight:"bold"}}},loading:{labelStyle:{fontWeight:"bold",position:"relative",top:"45%"},style:{position:"absolute",backgroundColor:"white",opacity:0.5,
+textAlign:"center"}},tooltip:{enabled:!0,animation:ca,backgroundColor:"rgba(249, 249, 249, .85)",borderWidth:1,borderRadius:3,dateTimeLabelFormats:{millisecond:"%A, %b %e, %H:%M:%S.%L",second:"%A, %b %e, %H:%M:%S",minute:"%A, %b %e, %H:%M",hour:"%A, %b %e, %H:%M",day:"%A, %b %e, %Y",week:"Week from %A, %b %e, %Y",month:"%B %Y",year:"%Y"},footerFormat:"",headerFormat:'<span style="font-size: 10px">{point.key}</span><br/>',pointFormat:'<span style="color:{point.color}">\u25CF</span> {series.name}: <b>{point.y}</b><br/>',
+shadow:!0,snap:Jb?25:10,style:{color:"#333333",cursor:"default",fontSize:"12px",padding:"8px",whiteSpace:"nowrap"}},credits:{enabled:!0,text:"Highcharts.com",href:"http://www.highcharts.com",position:{align:"right",x:-10,verticalAlign:"bottom",y:-5},style:{cursor:"pointer",color:"#909090",fontSize:"9px"}}};var ba=T.plotOptions,U=ba.line;Cb();var Tb=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]?(?:\.[0-9]+)?)\s*\)/,Ub=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/,
+Vb=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/,oa=function(a){var b=[],c,d;(function(a){a&&a.stops?d=Ua(a.stops,function(a){return oa(a[1])}):(c=Tb.exec(a))?b=[F(c[1]),F(c[2]),F(c[3]),parseFloat(c[4],10)]:(c=Ub.exec(a))?b=[F(c[1],16),F(c[2],16),F(c[3],16),1]:(c=Vb.exec(a))&&(b=[F(c[1]),F(c[2]),F(c[3]),1])})(a);return{get:function(c){var f;d?(f=A(a),f.stops=[].concat(f.stops),o(d,function(a,b){f.stops[b]=[f.stops[b][0],a.get(c)]})):f=b&&!isNaN(b[0])?c==="rgb"?"rgb("+b[0]+","+
+b[1]+","+b[2]+")":c==="a"?b[3]:"rgba("+b.join(",")+")":a;return f},brighten:function(a){if(d)o(d,function(b){b.brighten(a)});else if(ra(a)&&a!==0){var c;for(c=0;c<3;c++)b[c]+=F(a*255),b[c]<0&&(b[c]=0),b[c]>255&&(b[c]=255)}return this},rgba:b,setOpacity:function(a){b[3]=a;return this},raw:a}};P.prototype={opacity:1,textProps:"fontSize,fontWeight,fontFamily,fontStyle,color,lineHeight,width,textDecoration,textShadow".split(","),init:function(a,b){this.element=b==="span"?$(b):B.createElementNS(Ca,b);
+this.renderer=a},animate:function(a,b,c){b=p(b,za,!0);db(this);if(b){b=A(b,{});if(c)b.complete=c;mb(this,a,b)}else this.attr(a),c&&c();return this},colorGradient:function(a,b,c){var d=this.renderer,e,f,g,h,i,j,k,l,m,n,u=[];a.linearGradient?f="linearGradient":a.radialGradient&&(f="radialGradient");if(f){g=a[f];h=d.gradients;j=a.stops;m=c.radialReference;Ha(g)&&(a[f]=g={x1:g[0],y1:g[1],x2:g[2],y2:g[3],gradientUnits:"userSpaceOnUse"});f==="radialGradient"&&m&&!q(g.gradientUnits)&&(g=A(g,{cx:m[0]-m[2]/
+2+g.cx*m[2],cy:m[1]-m[2]/2+g.cy*m[2],r:g.r*m[2],gradientUnits:"userSpaceOnUse"}));for(n in g)n!=="id"&&u.push(n,g[n]);for(n in j)u.push(j[n]);u=u.join(",");h[u]?a=h[u].attr("id"):(g.id=a="highcharts-"+yb++,h[u]=i=d.createElement(f).attr(g).add(d.defs),i.stops=[],o(j,function(a){a[1].indexOf("rgba")===0?(e=oa(a[1]),k=e.get("rgb"),l=e.get("a")):(k=a[1],l=1);a=d.createElement("stop").attr({offset:a[0],"stop-color":k,"stop-opacity":l}).add(i);i.stops.push(a)}));c.setAttribute(b,"url("+d.url+"#"+a+")")}},
+applyTextShadow:function(a){var b=this.element,c,d=a.indexOf("contrast")!==-1,e={},f=this.renderer.forExport||b.style.textShadow!==y&&!ya;if(d)e.textShadow=a=a.replace(/contrast/g,this.renderer.getContrast(b.style.fill));if(ib)e.textRendering="geometricPrecision";f?L(b,e):(this.fakeTS=!0,this.ySetter=this.xSetter,c=[].slice.call(b.getElementsByTagName("tspan")),o(a.split(/\s?,\s?/g),function(a){var d=b.firstChild,e,f,a=a.split(" ");e=a[a.length-1];(f=a[a.length-2])&&o(c,function(a,c){var g;c===0&&
+(a.setAttribute("x",b.getAttribute("x")),c=b.getAttribute("y"),a.setAttribute("y",c||0),c===null&&b.setAttribute("y",0));g=a.cloneNode(1);J(g,{"class":"highcharts-text-shadow",fill:e,stroke:e,"stroke-opacity":1/v(F(f),3),"stroke-width":f,"stroke-linejoin":"round"});b.insertBefore(g,d)})}))},attr:function(a,b){var c,d,e=this.element,f,g=this,h;typeof a==="string"&&b!==y&&(c=a,a={},a[c]=b);if(typeof a==="string")g=(this[a+"Getter"]||this._defaultGetter).call(this,a,e);else{for(c in a){d=a[c];h=!1;this.symbolName&&
+/^(x|y|width|height|r|start|end|innerR|anchorX|anchorY)/.test(c)&&(f||(this.symbolAttr(a),f=!0),h=!0);if(this.rotation&&(c==="x"||c==="y"))this.doTransform=!0;h||(this[c+"Setter"]||this._defaultSetter).call(this,d,c,e);this.shadows&&/^(width|height|visibility|x|y|d|transform|cx|cy|r)$/.test(c)&&this.updateShadows(c,d)}if(this.doTransform)this.updateTransform(),this.doTransform=!1}return g},updateShadows:function(a,b){for(var c=this.shadows,d=c.length;d--;)c[d].setAttribute(a,a==="height"?v(b-(c[d].cutHeight||
+0),0):a==="d"?this.d:b)},addClass:function(a){var b=this.element,c=J(b,"class")||"";c.indexOf(a)===-1&&J(b,"class",c+" "+a);return this},symbolAttr:function(a){var b=this;o("x,y,r,start,end,width,height,innerR,anchorX,anchorY".split(","),function(c){b[c]=p(a[c],b[c])});b.attr({d:b.renderer.symbols[b.symbolName](b.x,b.y,b.width,b.height,b)})},clip:function(a){return this.attr("clip-path",a?"url("+this.renderer.url+"#"+a.id+")":O)},crisp:function(a){var b,c={},d,e=a.strokeWidth||this.strokeWidth||0;
+d=s(e)%2/2;a.x=V(a.x||this.x||0)+d;a.y=V(a.y||this.y||0)+d;a.width=V((a.width||this.width||0)-2*d);a.height=V((a.height||this.height||0)-2*d);a.strokeWidth=e;for(b in a)this[b]!==a[b]&&(this[b]=c[b]=a[b]);return c},css:function(a){var b=this.styles,c={},d=this.element,e,f,g="";e=!b;if(a&&a.color)a.fill=a.color;if(b)for(f in a)a[f]!==b[f]&&(c[f]=a[f],e=!0);if(e){e=this.textWidth=a&&a.width&&d.nodeName.toLowerCase()==="text"&&F(a.width)||this.textWidth;b&&(a=x(b,c));this.styles=a;e&&(fa||!ca&&this.renderer.forExport)&&
+delete a.width;if(ya&&!ca)L(this.element,a);else{b=function(a,b){return"-"+b.toLowerCase()};for(f in a)g+=f.replace(/([A-Z])/g,b)+":"+a[f]+";";J(d,"style",g)}e&&this.added&&this.renderer.buildText(this)}return this},on:function(a,b){var c=this,d=c.element;ab&&a==="click"?(d.ontouchstart=function(a){c.touchEventFired=Aa.now();a.preventDefault();b.call(d,a)},d.onclick=function(a){(Ba.indexOf("Android")===-1||Aa.now()-(c.touchEventFired||0)>1100)&&b.call(d,a)}):d["on"+a]=b;return this},setRadialReference:function(a){this.element.radialReference=
+a;return this},translate:function(a,b){return this.attr({translateX:a,translateY:b})},invert:function(){this.inverted=!0;this.updateTransform();return this},updateTransform:function(){var a=this.translateX||0,b=this.translateY||0,c=this.scaleX,d=this.scaleY,e=this.inverted,f=this.rotation,g=this.element;e&&(a+=this.attr("width"),b+=this.attr("height"));a=["translate("+a+","+b+")"];e?a.push("rotate(90) scale(-1,1)"):f&&a.push("rotate("+f+" "+(g.getAttribute("x")||0)+" "+(g.getAttribute("y")||0)+")");
+(q(c)||q(d))&&a.push("scale("+p(c,1)+" "+p(d,1)+")");a.length&&g.setAttribute("transform",a.join(" "))},toFront:function(){var a=this.element;a.parentNode.appendChild(a);return this},align:function(a,b,c){var d,e,f,g,h={};e=this.renderer;f=e.alignedObjects;if(a){if(this.alignOptions=a,this.alignByTranslate=b,!c||Da(c))this.alignTo=d=c||"renderer",ja(f,this),f.push(this),c=null}else a=this.alignOptions,b=this.alignByTranslate,d=this.alignTo;c=p(c,e[d],e);d=a.align;e=a.verticalAlign;f=(c.x||0)+(a.x||
+0);g=(c.y||0)+(a.y||0);if(d==="right"||d==="center")f+=(c.width-(a.width||0))/{right:1,center:2}[d];h[b?"translateX":"x"]=s(f);if(e==="bottom"||e==="middle")g+=(c.height-(a.height||0))/({bottom:1,middle:2}[e]||1);h[b?"translateY":"y"]=s(g);this[this.placed?"animate":"attr"](h);this.placed=!0;this.alignAttr=h;return this},getBBox:function(a){var b,c=this.renderer,d,e=this.rotation,f=this.element,g=this.styles,h=e*ha;d=this.textStr;var i,j=f.style,k,l;d!==y&&(l=["",e||0,g&&g.fontSize,f.style.width].join(","),
+l=d===""||Ob.test(d)?"num:"+d.toString().length+l:d+l);l&&!a&&(b=c.cache[l]);if(!b){if(f.namespaceURI===Ca||c.forExport){try{k=this.fakeTS&&function(a){o(f.querySelectorAll(".highcharts-text-shadow"),function(b){b.style.display=a})},La&&j.textShadow?(i=j.textShadow,j.textShadow=""):k&&k(O),b=f.getBBox?x({},f.getBBox()):{width:f.offsetWidth,height:f.offsetHeight},i?j.textShadow=i:k&&k("")}catch(m){}if(!b||b.width<0)b={width:0,height:0}}else b=this.htmlGetBBox();if(c.isSVG){a=b.width;d=b.height;if(ya&&
+g&&g.fontSize==="11px"&&d.toPrecision(3)==="16.9")b.height=d=14;if(e)b.width=N(d*aa(h))+N(a*X(h)),b.height=N(d*X(h))+N(a*aa(h))}c.cache[l]=b}return b},show:function(a){a&&this.element.namespaceURI===Ca?this.element.removeAttribute("visibility"):this.attr({visibility:a?"inherit":"visible"});return this},hide:function(){return this.attr({visibility:"hidden"})},fadeOut:function(a){var b=this;b.animate({opacity:0},{duration:a||150,complete:function(){b.attr({y:-9999})}})},add:function(a){var b=this.renderer,
+c=this.element,d;if(a)this.parentGroup=a;this.parentInverted=a&&a.inverted;this.textStr!==void 0&&b.buildText(this);this.added=!0;if(!a||a.handleZ||this.zIndex)d=this.zIndexSetter();d||(a?a.element:b.box).appendChild(c);if(this.onAdd)this.onAdd();return this},safeRemoveChild:function(a){var b=a.parentNode;b&&b.removeChild(a)},destroy:function(){var a=this,b=a.element||{},c=a.shadows,d=a.renderer.isSVG&&b.nodeName==="SPAN"&&a.parentGroup,e,f;b.onclick=b.onmouseout=b.onmouseover=b.onmousemove=b.point=
+null;db(a);if(a.clipPath)a.clipPath=a.clipPath.destroy();if(a.stops){for(f=0;f<a.stops.length;f++)a.stops[f]=a.stops[f].destroy();a.stops=null}a.safeRemoveChild(b);for(c&&o(c,function(b){a.safeRemoveChild(b)});d&&d.div&&d.div.childNodes.length===0;)b=d.parentGroup,a.safeRemoveChild(d.div),delete d.div,d=b;a.alignTo&&ja(a.renderer.alignedObjects,a);for(e in a)delete a[e];return null},shadow:function(a,b,c){var d=[],e,f,g=this.element,h,i,j,k;if(a){i=p(a.width,3);j=(a.opacity||0.15)/i;k=this.parentInverted?
+"(-1,-1)":"("+p(a.offsetX,1)+", "+p(a.offsetY,1)+")";for(e=1;e<=i;e++){f=g.cloneNode(0);h=i*2+1-2*e;J(f,{isShadow:"true",stroke:a.color||"black","stroke-opacity":j*e,"stroke-width":h,transform:"translate"+k,fill:O});if(c)J(f,"height",v(J(f,"height")-h,0)),f.cutHeight=h;b?b.element.appendChild(f):g.parentNode.insertBefore(f,g);d.push(f)}this.shadows=d}return this},xGetter:function(a){this.element.nodeName==="circle"&&(a={x:"cx",y:"cy"}[a]||a);return this._defaultGetter(a)},_defaultGetter:function(a){a=
+p(this[a],this.element?this.element.getAttribute(a):null,0);/^[\-0-9\.]+$/.test(a)&&(a=parseFloat(a));return a},dSetter:function(a,b,c){a&&a.join&&(a=a.join(" "));/(NaN| {2}|^$)/.test(a)&&(a="M 0 0");c.setAttribute(b,a);this[b]=a},dashstyleSetter:function(a){var b;if(a=a&&a.toLowerCase()){a=a.replace("shortdashdotdot","3,1,1,1,1,1,").replace("shortdashdot","3,1,1,1").replace("shortdot","1,1,").replace("shortdash","3,1,").replace("longdash","8,3,").replace(/dot/g,"1,3,").replace("dash","4,3,").replace(/,$/,
+"").split(",");for(b=a.length;b--;)a[b]=F(a[b])*this["stroke-width"];a=a.join(",").replace("NaN","none");this.element.setAttribute("stroke-dasharray",a)}},alignSetter:function(a){this.element.setAttribute("text-anchor",{left:"start",center:"middle",right:"end"}[a])},opacitySetter:function(a,b,c){this[b]=a;c.setAttribute(b,a)},titleSetter:function(a){var b=this.element.getElementsByTagName("title")[0];b||(b=B.createElementNS(Ca,"title"),this.element.appendChild(b));b.textContent=String(p(a),"").replace(/<[^>]*>/g,
+"")},textSetter:function(a){if(a!==this.textStr)delete this.bBox,this.textStr=a,this.added&&this.renderer.buildText(this)},fillSetter:function(a,b,c){typeof a==="string"?c.setAttribute(b,a):a&&this.colorGradient(a,b,c)},zIndexSetter:function(a,b){var c=this.renderer,d=this.parentGroup,c=(d||c).element||c.box,e,f,g=this.element,h;e=this.added;var i;q(a)&&(g.setAttribute(b,a),a=+a,this[b]===a&&(e=!1),this[b]=a);if(e){if((a=this.zIndex)&&d)d.handleZ=!0;d=c.childNodes;for(i=0;i<d.length&&!h;i++)if(e=
+d[i],f=J(e,"zIndex"),e!==g&&(F(f)>a||!q(a)&&q(f)))c.insertBefore(g,e),h=!0;h||c.appendChild(g)}return h},_defaultSetter:function(a,b,c){c.setAttribute(b,a)}};P.prototype.yGetter=P.prototype.xGetter;P.prototype.translateXSetter=P.prototype.translateYSetter=P.prototype.rotationSetter=P.prototype.verticalAlignSetter=P.prototype.scaleXSetter=P.prototype.scaleYSetter=function(a,b){this[b]=a;this.doTransform=!0};P.prototype["stroke-widthSetter"]=P.prototype.strokeSetter=function(a,b,c){this[b]=a;if(this.stroke&&
+this["stroke-width"])this.strokeWidth=this["stroke-width"],P.prototype.fillSetter.call(this,this.stroke,"stroke",c),c.setAttribute("stroke-width",this["stroke-width"]),this.hasStroke=!0;else if(b==="stroke-width"&&a===0&&this.hasStroke)c.removeAttribute("stroke"),this.hasStroke=!1};var ua=function(){this.init.apply(this,arguments)};ua.prototype={Element:P,init:function(a,b,c,d,e){var f=location,g,d=this.createElement("svg").attr({version:"1.1"}).css(this.getStyle(d));g=d.element;a.appendChild(g);
+a.innerHTML.indexOf("xmlns")===-1&&J(g,"xmlns",Ca);this.isSVG=!0;this.box=g;this.boxWrapper=d;this.alignedObjects=[];this.url=(La||ib)&&B.getElementsByTagName("base").length?f.href.replace(/#.*?$/,"").replace(/([\('\)])/g,"\\$1").replace(/ /g,"%20"):"";this.createElement("desc").add().element.appendChild(B.createTextNode("Created with Highcharts 4.1.6"));this.defs=this.createElement("defs").add();this.forExport=e;this.gradients={};this.cache={};this.setSize(b,c,!1);var h;if(La&&a.getBoundingClientRect)this.subPixelFix=
+b=function(){L(a,{left:0,top:0});h=a.getBoundingClientRect();L(a,{left:ta(h.left)-h.left+"px",top:ta(h.top)-h.top+"px"})},b(),H(K,"resize",b)},getStyle:function(a){return this.style=x({fontFamily:'"Lucida Grande", "Lucida Sans Unicode", Arial, Helvetica, sans-serif',fontSize:"12px"},a)},isHidden:function(){return!this.boxWrapper.getBBox().width},destroy:function(){var a=this.defs;this.box=null;this.boxWrapper=this.boxWrapper.destroy();Qa(this.gradients||{});this.gradients=null;if(a)this.defs=a.destroy();
+this.subPixelFix&&Z(K,"resize",this.subPixelFix);return this.alignedObjects=null},createElement:function(a){var b=new this.Element;b.init(this,a);return b},draw:function(){},buildText:function(a){for(var b=a.element,c=this,d=c.forExport,e=p(a.textStr,"").toString(),f=e.indexOf("<")!==-1,g=b.childNodes,h,i,j=J(b,"x"),k=a.styles,l=a.textWidth,m=k&&k.lineHeight,n=k&&k.textShadow,u=k&&k.textOverflow==="ellipsis",r=g.length,S=l&&!a.added&&this.box,Q=function(a){return m?F(m):c.fontMetrics(/(px|em)$/.test(a&&
+a.style.fontSize)?a.style.fontSize:k&&k.fontSize||c.style.fontSize||12,a).h},t=function(a){return a.replace(/&lt;/g,"<").replace(/&gt;/g,">")};r--;)b.removeChild(g[r]);!f&&!n&&!u&&e.indexOf(" ")===-1?b.appendChild(B.createTextNode(t(e))):(h=/<.*style="([^"]+)".*>/,i=/<.*href="(http[^"]+)".*>/,S&&S.appendChild(b),e=f?e.replace(/<(b|strong)>/g,'<span style="font-weight:bold">').replace(/<(i|em)>/g,'<span style="font-style:italic">').replace(/<a/g,"<span").replace(/<\/(b|strong|i|em|a)>/g,"</span>").split(/<br.*?>/g):
+[e],e[e.length-1]===""&&e.pop(),o(e,function(e,f){var g,m=0,e=e.replace(/<span/g,"|||<span").replace(/<\/span>/g,"</span>|||");g=e.split("|||");o(g,function(e){if(e!==""||g.length===1){var n={},r=B.createElementNS(Ca,"tspan"),p;h.test(e)&&(p=e.match(h)[1].replace(/(;| |^)color([ :])/,"$1fill$2"),J(r,"style",p));i.test(e)&&!d&&(J(r,"onclick",'location.href="'+e.match(i)[1]+'"'),L(r,{cursor:"pointer"}));e=t(e.replace(/<(.|\n)*?>/g,"")||" ");if(e!==" "){r.appendChild(B.createTextNode(e));if(m)n.dx=0;
+else if(f&&j!==null)n.x=j;J(r,n);b.appendChild(r);!m&&f&&(!ca&&d&&L(r,{display:"block"}),J(r,"dy",Q(r)));if(l){for(var n=e.replace(/([^\^])-/g,"$1- ").split(" "),o=g.length>1||f||n.length>1&&k.whiteSpace!=="nowrap",S,w,q,v=[],y=Q(r),s=1,x=a.rotation,A=e,C=A.length;(o||u)&&(n.length||v.length);)a.rotation=0,S=a.getBBox(!0),q=S.width,!ca&&c.forExport&&(q=c.measureSpanWidth(r.firstChild.data,a.styles)),S=q>l,w===void 0&&(w=S),u&&w?(C/=2,A===""||!S&&C<0.5?n=[]:(S&&(w=!0),A=e.substring(0,A.length+(S?-1:
+1)*ta(C)),n=[A+(l>3?"…":"")],r.removeChild(r.firstChild))):!S||n.length===1?(n=v,v=[],n.length&&(s++,r=B.createElementNS(Ca,"tspan"),J(r,{dy:y,x:j}),p&&J(r,"style",p),b.appendChild(r)),q>l&&(l=q)):(r.removeChild(r.firstChild),v.unshift(n.pop())),n.length&&r.appendChild(B.createTextNode(n.join(" ").replace(/- /g,"-")));w&&a.attr("title",a.textStr);a.rotation=x}m++}}})}),S&&S.removeChild(b),n&&a.applyTextShadow&&a.applyTextShadow(n))},getContrast:function(a){a=oa(a).rgba;return a[0]+a[1]+a[2]>384?"#000000":
+"#FFFFFF"},button:function(a,b,c,d,e,f,g,h,i){var j=this.label(a,b,c,i,null,null,null,null,"button"),k=0,l,m,n,u,r,p,a={x1:0,y1:0,x2:0,y2:1},e=A({"stroke-width":1,stroke:"#CCCCCC",fill:{linearGradient:a,stops:[[0,"#FEFEFE"],[1,"#F6F6F6"]]},r:2,padding:5,style:{color:"black"}},e);n=e.style;delete e.style;f=A(e,{stroke:"#68A",fill:{linearGradient:a,stops:[[0,"#FFF"],[1,"#ACF"]]}},f);u=f.style;delete f.style;g=A(e,{stroke:"#68A",fill:{linearGradient:a,stops:[[0,"#9BD"],[1,"#CDF"]]}},g);r=g.style;delete g.style;
+h=A(e,{style:{color:"#CCC"}},h);p=h.style;delete h.style;H(j.element,ya?"mouseover":"mouseenter",function(){k!==3&&j.attr(f).css(u)});H(j.element,ya?"mouseout":"mouseleave",function(){k!==3&&(l=[e,f,g][k],m=[n,u,r][k],j.attr(l).css(m))});j.setState=function(a){(j.state=k=a)?a===2?j.attr(g).css(r):a===3&&j.attr(h).css(p):j.attr(e).css(n)};return j.on("click",function(){k!==3&&d.call(j)}).attr(e).css(x({cursor:"default"},n))},crispLine:function(a,b){a[1]===a[4]&&(a[1]=a[4]=s(a[1])-b%2/2);a[2]===a[5]&&
+(a[2]=a[5]=s(a[2])+b%2/2);return a},path:function(a){var b={fill:O};Ha(a)?b.d=a:da(a)&&x(b,a);return this.createElement("path").attr(b)},circle:function(a,b,c){a=da(a)?a:{x:a,y:b,r:c};b=this.createElement("circle");b.xSetter=function(a){this.element.setAttribute("cx",a)};b.ySetter=function(a){this.element.setAttribute("cy",a)};return b.attr(a)},arc:function(a,b,c,d,e,f){if(da(a))b=a.y,c=a.r,d=a.innerR,e=a.start,f=a.end,a=a.x;a=this.symbol("arc",a||0,b||0,c||0,c||0,{innerR:d||0,start:e||0,end:f||0});
+a.r=c;return a},rect:function(a,b,c,d,e,f){var e=da(a)?a.r:e,g=this.createElement("rect"),a=da(a)?a:a===y?{}:{x:a,y:b,width:v(c,0),height:v(d,0)};if(f!==y)a.strokeWidth=f,a=g.crisp(a);if(e)a.r=e;g.rSetter=function(a){J(this.element,{rx:a,ry:a})};return g.attr(a)},setSize:function(a,b,c){var d=this.alignedObjects,e=d.length;this.width=a;this.height=b;for(this.boxWrapper[p(c,!0)?"animate":"attr"]({width:a,height:b});e--;)d[e].align()},g:function(a){var b=this.createElement("g");return q(a)?b.attr({"class":"highcharts-"+
+a}):b},image:function(a,b,c,d,e){var f={preserveAspectRatio:O};arguments.length>1&&x(f,{x:b,y:c,width:d,height:e});f=this.createElement("image").attr(f);f.element.setAttributeNS?f.element.setAttributeNS("http://www.w3.org/1999/xlink","href",a):f.element.setAttribute("hc-svg-href",a);return f},symbol:function(a,b,c,d,e,f){var g,h=this.symbols[a],h=h&&h(s(b),s(c),d,e,f),i=/^url\((.*?)\)$/,j,k;if(h)g=this.path(h),x(g,{symbolName:a,x:b,y:c,width:d,height:e}),f&&x(g,f);else if(i.test(a))k=function(a,b){a.element&&
+(a.attr({width:b[0],height:b[1]}),a.alignByTranslate||a.translate(s((d-b[0])/2),s((e-b[1])/2)))},j=a.match(i)[1],a=Kb[j]||f&&f.width&&f.height&&[f.width,f.height],g=this.image(j).attr({x:b,y:c}),g.isImg=!0,a?k(g,a):(g.attr({width:0,height:0}),$("img",{onload:function(){k(g,Kb[j]=[this.width,this.height])},src:j}));return g},symbols:{circle:function(a,b,c,d){var e=0.166*c;return["M",a+c/2,b,"C",a+c+e,b,a+c+e,b+d,a+c/2,b+d,"C",a-e,b+d,a-e,b,a+c/2,b,"Z"]},square:function(a,b,c,d){return["M",a,b,"L",
+a+c,b,a+c,b+d,a,b+d,"Z"]},triangle:function(a,b,c,d){return["M",a+c/2,b,"L",a+c,b+d,a,b+d,"Z"]},"triangle-down":function(a,b,c,d){return["M",a,b,"L",a+c,b,a+c/2,b+d,"Z"]},diamond:function(a,b,c,d){return["M",a+c/2,b,"L",a+c,b+d/2,a+c/2,b+d,a,b+d/2,"Z"]},arc:function(a,b,c,d,e){var f=e.start,c=e.r||c||d,g=e.end-0.001,d=e.innerR,h=e.open,i=X(f),j=aa(f),k=X(g),g=aa(g),e=e.end-f<ma?0:1;return["M",a+c*i,b+c*j,"A",c,c,0,e,1,a+c*k,b+c*g,h?"M":"L",a+d*k,b+d*g,"A",d,d,0,e,0,a+d*i,b+d*j,h?"":"Z"]},callout:function(a,
+b,c,d,e){var f=C(e&&e.r||0,c,d),g=f+6,h=e&&e.anchorX,e=e&&e.anchorY,i;i=["M",a+f,b,"L",a+c-f,b,"C",a+c,b,a+c,b,a+c,b+f,"L",a+c,b+d-f,"C",a+c,b+d,a+c,b+d,a+c-f,b+d,"L",a+f,b+d,"C",a,b+d,a,b+d,a,b+d-f,"L",a,b+f,"C",a,b,a,b,a+f,b];h&&h>c&&e>b+g&&e<b+d-g?i.splice(13,3,"L",a+c,e-6,a+c+6,e,a+c,e+6,a+c,b+d-f):h&&h<0&&e>b+g&&e<b+d-g?i.splice(33,3,"L",a,e+6,a-6,e,a,e-6,a,b+f):e&&e>d&&h>a+g&&h<a+c-g?i.splice(23,3,"L",h+6,b+d,h,b+d+6,h-6,b+d,a+f,b+d):e&&e<0&&h>a+g&&h<a+c-g&&i.splice(3,3,"L",h-6,b,h,b-6,h+6,
+b,c-f,b);return i}},clipRect:function(a,b,c,d){var e="highcharts-"+yb++,f=this.createElement("clipPath").attr({id:e}).add(this.defs),a=this.rect(a,b,c,d,0).add(f);a.id=e;a.clipPath=f;a.count=0;return a},text:function(a,b,c,d){var e=fa||!ca&&this.forExport,f={};if(d&&!this.forExport)return this.html(a,b,c);f.x=Math.round(b||0);if(c)f.y=Math.round(c);if(a||a===0)f.text=a;a=this.createElement("text").attr(f);e&&a.css({position:"absolute"});if(!d)a.xSetter=function(a,b,c){var d=c.getElementsByTagName("tspan"),
+e,f=c.getAttribute(b),m;for(m=0;m<d.length;m++)e=d[m],e.getAttribute(b)===f&&e.setAttribute(b,a);c.setAttribute(b,a)};return a},fontMetrics:function(a,b){a=a||this.style.fontSize;if(b&&K.getComputedStyle)b=b.element||b,a=K.getComputedStyle(b,"").fontSize;var a=/px/.test(a)?F(a):/em/.test(a)?parseFloat(a)*12:12,c=a<24?a+3:s(a*1.2),d=s(c*0.8);return{h:c,b:d,f:a}},rotCorr:function(a,b,c){var d=a;b&&c&&(d=v(d*X(b*ha),4));return{x:-a/3*aa(b*ha),y:d}},label:function(a,b,c,d,e,f,g,h,i){function j(){var a,
+b;a=u.element.style;p=(ga===void 0||v===void 0||n.styles.textAlign)&&q(u.textStr)&&u.getBBox();n.width=(ga||p.width||0)+2*t+w;n.height=(v||p.height||0)+2*t;F=t+m.fontMetrics(a&&a.fontSize,u).b;if(E){if(!r)a=s(-Q*t)+z,b=(h?-F:0)+z,n.box=r=d?m.symbol(d,a,b,n.width,n.height,G):m.rect(a,b,n.width,n.height,0,G[Pb]),r.attr("fill",O).add(n);r.isImg||r.attr(x({width:s(n.width),height:s(n.height)},G));G=null}}function k(){var a=n.styles,a=a&&a.textAlign,b=w+t*(1-Q),c;c=h?0:F;if(q(ga)&&p&&(a==="center"||a===
+"right"))b+={center:0.5,right:1}[a]*(ga-p.width);if(b!==u.x||c!==u.y)u.attr("x",b),c!==y&&u.attr("y",c);u.x=b;u.y=c}function l(a,b){r?r.attr(a,b):G[a]=b}var m=this,n=m.g(i),u=m.text("",0,0,g).attr({zIndex:1}),r,p,Q=0,t=3,w=0,ga,v,C,B,z=0,G={},F,E;n.onAdd=function(){u.add(n);n.attr({text:a||a===0?a:"",x:b,y:c});r&&q(e)&&n.attr({anchorX:e,anchorY:f})};n.widthSetter=function(a){ga=a};n.heightSetter=function(a){v=a};n.paddingSetter=function(a){if(q(a)&&a!==t)t=n.padding=a,k()};n.paddingLeftSetter=function(a){q(a)&&
+a!==w&&(w=a,k())};n.alignSetter=function(a){Q={left:0,center:0.5,right:1}[a]};n.textSetter=function(a){a!==y&&u.textSetter(a);j();k()};n["stroke-widthSetter"]=function(a,b){a&&(E=!0);z=a%2/2;l(b,a)};n.strokeSetter=n.fillSetter=n.rSetter=function(a,b){b==="fill"&&a&&(E=!0);l(b,a)};n.anchorXSetter=function(a,b){e=a;l(b,s(a)-z-C)};n.anchorYSetter=function(a,b){f=a;l(b,a-B)};n.xSetter=function(a){n.x=a;Q&&(a-=Q*((ga||p.width)+t));C=s(a);n.attr("translateX",C)};n.ySetter=function(a){B=n.y=s(a);n.attr("translateY",
+B)};var D=n.css;return x(n,{css:function(a){if(a){var b={},a=A(a);o(n.textProps,function(c){a[c]!==y&&(b[c]=a[c],delete a[c])});u.css(b)}return D.call(n,a)},getBBox:function(){return{width:p.width+2*t,height:p.height+2*t,x:p.x-t,y:p.y-t}},shadow:function(a){r&&r.shadow(a);return n},destroy:function(){Z(n.element,"mouseenter");Z(n.element,"mouseleave");u&&(u=u.destroy());r&&(r=r.destroy());P.prototype.destroy.call(n);n=m=j=k=l=null}})}};$a=ua;x(P.prototype,{htmlCss:function(a){var b=this.element;if(b=
+a&&b.tagName==="SPAN"&&a.width)delete a.width,this.textWidth=b,this.updateTransform();if(a&&a.textOverflow==="ellipsis")a.whiteSpace="nowrap",a.overflow="hidden";this.styles=x(this.styles,a);L(this.element,a);return this},htmlGetBBox:function(){var a=this.element;if(a.nodeName==="text")a.style.position="absolute";return{x:a.offsetLeft,y:a.offsetTop,width:a.offsetWidth,height:a.offsetHeight}},htmlUpdateTransform:function(){if(this.added){var a=this.renderer,b=this.element,c=this.translateX||0,d=this.translateY||
+0,e=this.x||0,f=this.y||0,g=this.textAlign||"left",h={left:0,center:0.5,right:1}[g],i=this.shadows,j=this.styles;L(b,{marginLeft:c,marginTop:d});i&&o(i,function(a){L(a,{marginLeft:c+1,marginTop:d+1})});this.inverted&&o(b.childNodes,function(c){a.invertChild(c,b)});if(b.tagName==="SPAN"){var k=this.rotation,l,m=F(this.textWidth),n=[k,g,b.innerHTML,this.textWidth].join(",");if(n!==this.cTT){l=a.fontMetrics(b.style.fontSize).b;q(k)&&this.setSpanRotation(k,h,l);i=p(this.elemWidth,b.offsetWidth);if(i>
+m&&/[ \-]/.test(b.textContent||b.innerText))L(b,{width:m+"px",display:"block",whiteSpace:j&&j.whiteSpace||"normal"}),i=m;this.getSpanCorrection(i,l,h,k,g)}L(b,{left:e+(this.xCorr||0)+"px",top:f+(this.yCorr||0)+"px"});if(ib)l=b.offsetHeight;this.cTT=n}}else this.alignOnAdd=!0},setSpanRotation:function(a,b,c){var d={},e=ya?"-ms-transform":ib?"-webkit-transform":La?"MozTransform":Ib?"-o-transform":"";d[e]=d.transform="rotate("+a+"deg)";d[e+(La?"Origin":"-origin")]=d.transformOrigin=b*100+"% "+c+"px";
+L(this.element,d)},getSpanCorrection:function(a,b,c){this.xCorr=-a*c;this.yCorr=-b}});x(ua.prototype,{html:function(a,b,c){var d=this.createElement("span"),e=d.element,f=d.renderer;d.textSetter=function(a){a!==e.innerHTML&&delete this.bBox;e.innerHTML=this.textStr=a};d.xSetter=d.ySetter=d.alignSetter=d.rotationSetter=function(a,b){b==="align"&&(b="textAlign");d[b]=a;d.htmlUpdateTransform()};d.attr({text:a,x:s(b),y:s(c)}).css({position:"absolute",fontFamily:this.style.fontFamily,fontSize:this.style.fontSize});
+e.style.whiteSpace="nowrap";d.css=d.htmlCss;if(f.isSVG)d.add=function(a){var b,c=f.box.parentNode,j=[];if(this.parentGroup=a){if(b=a.div,!b){for(;a;)j.push(a),a=a.parentGroup;o(j.reverse(),function(a){var d;b=a.div=a.div||$(Ka,{className:J(a.element,"class")},{position:"absolute",left:(a.translateX||0)+"px",top:(a.translateY||0)+"px"},b||c);d=b.style;x(a,{translateXSetter:function(b,c){d.left=b+"px";a[c]=b;a.doTransform=!0},translateYSetter:function(b,c){d.top=b+"px";a[c]=b;a.doTransform=!0},visibilitySetter:function(a,
+b){d[b]=a}})})}}else b=c;b.appendChild(e);d.added=!0;d.alignOnAdd&&d.htmlUpdateTransform();return d};return d}});if(!ca&&!fa){E={init:function(a,b){var c=["<",b,' filled="f" stroked="f"'],d=["position: ","absolute",";"],e=b===Ka;(b==="shape"||e)&&d.push("left:0;top:0;width:1px;height:1px;");d.push("visibility: ",e?"hidden":"visible");c.push(' style="',d.join(""),'"/>');if(b)c=e||b==="span"||b==="img"?c.join(""):a.prepVML(c),this.element=$(c);this.renderer=a},add:function(a){var b=this.renderer,c=
+this.element,d=b.box,d=a?a.element||a:d;a&&a.inverted&&b.invertChild(c,d);d.appendChild(c);this.added=!0;this.alignOnAdd&&!this.deferUpdateTransform&&this.updateTransform();if(this.onAdd)this.onAdd();return this},updateTransform:P.prototype.htmlUpdateTransform,setSpanRotation:function(){var a=this.rotation,b=X(a*ha),c=aa(a*ha);L(this.element,{filter:a?["progid:DXImageTransform.Microsoft.Matrix(M11=",b,", M12=",-c,", M21=",c,", M22=",b,", sizingMethod='auto expand')"].join(""):O})},getSpanCorrection:function(a,
+b,c,d,e){var f=d?X(d*ha):1,g=d?aa(d*ha):0,h=p(this.elemHeight,this.element.offsetHeight),i;this.xCorr=f<0&&-a;this.yCorr=g<0&&-h;i=f*g<0;this.xCorr+=g*b*(i?1-c:c);this.yCorr-=f*b*(d?i?c:1-c:1);e&&e!=="left"&&(this.xCorr-=a*c*(f<0?-1:1),d&&(this.yCorr-=h*c*(g<0?-1:1)),L(this.element,{textAlign:e}))},pathToVML:function(a){for(var b=a.length,c=[];b--;)if(ra(a[b]))c[b]=s(a[b]*10)-5;else if(a[b]==="Z")c[b]="x";else if(c[b]=a[b],a.isArc&&(a[b]==="wa"||a[b]==="at"))c[b+5]===c[b+7]&&(c[b+7]+=a[b+7]>a[b+5]?
+1:-1),c[b+6]===c[b+8]&&(c[b+8]+=a[b+8]>a[b+6]?1:-1);return c.join(" ")||"x"},clip:function(a){var b=this,c;a?(c=a.members,ja(c,b),c.push(b),b.destroyClip=function(){ja(c,b)},a=a.getCSS(b)):(b.destroyClip&&b.destroyClip(),a={clip:hb?"inherit":"rect(auto)"});return b.css(a)},css:P.prototype.htmlCss,safeRemoveChild:function(a){a.parentNode&&Ra(a)},destroy:function(){this.destroyClip&&this.destroyClip();return P.prototype.destroy.apply(this)},on:function(a,b){this.element["on"+a]=function(){var a=K.event;
+a.target=a.srcElement;b(a)};return this},cutOffPath:function(a,b){var c,a=a.split(/[ ,]/);c=a.length;if(c===9||c===11)a[c-4]=a[c-2]=F(a[c-2])-10*b;return a.join(" ")},shadow:function(a,b,c){var d=[],e,f=this.element,g=this.renderer,h,i=f.style,j,k=f.path,l,m,n,u;k&&typeof k.value!=="string"&&(k="x");m=k;if(a){n=p(a.width,3);u=(a.opacity||0.15)/n;for(e=1;e<=3;e++){l=n*2+1-2*e;c&&(m=this.cutOffPath(k.value,l+0.5));j=['<shape isShadow="true" strokeweight="',l,'" filled="false" path="',m,'" coordsize="10 10" style="',
+f.style.cssText,'" />'];h=$(g.prepVML(j),null,{left:F(i.left)+p(a.offsetX,1),top:F(i.top)+p(a.offsetY,1)});if(c)h.cutOff=l+1;j=['<stroke color="',a.color||"black",'" opacity="',u*e,'"/>'];$(g.prepVML(j),null,null,h);b?b.element.appendChild(h):f.parentNode.insertBefore(h,f);d.push(h)}this.shadows=d}return this},updateShadows:na,setAttr:function(a,b){hb?this.element[a]=b:this.element.setAttribute(a,b)},classSetter:function(a){this.element.className=a},dashstyleSetter:function(a,b,c){(c.getElementsByTagName("stroke")[0]||
+$(this.renderer.prepVML(["<stroke/>"]),null,null,c))[b]=a||"solid";this[b]=a},dSetter:function(a,b,c){var d=this.shadows,a=a||[];this.d=a.join&&a.join(" ");c.path=a=this.pathToVML(a);if(d)for(c=d.length;c--;)d[c].path=d[c].cutOff?this.cutOffPath(a,d[c].cutOff):a;this.setAttr(b,a)},fillSetter:function(a,b,c){var d=c.nodeName;if(d==="SPAN")c.style.color=a;else if(d!=="IMG")c.filled=a!==O,this.setAttr("fillcolor",this.renderer.color(a,c,b,this))},opacitySetter:na,rotationSetter:function(a,b,c){c=c.style;
+this[b]=c[b]=a;c.left=-s(aa(a*ha)+1)+"px";c.top=s(X(a*ha))+"px"},strokeSetter:function(a,b,c){this.setAttr("strokecolor",this.renderer.color(a,c,b))},"stroke-widthSetter":function(a,b,c){c.stroked=!!a;this[b]=a;ra(a)&&(a+="px");this.setAttr("strokeweight",a)},titleSetter:function(a,b){this.setAttr(b,a)},visibilitySetter:function(a,b,c){a==="inherit"&&(a="visible");this.shadows&&o(this.shadows,function(c){c.style[b]=a});c.nodeName==="DIV"&&(a=a==="hidden"?"-999em":0,hb||(c.style[b]=a?"visible":"hidden"),
+b="top");c.style[b]=a},xSetter:function(a,b,c){this[b]=a;b==="x"?b="left":b==="y"&&(b="top");this.updateClipping?(this[b]=a,this.updateClipping()):c.style[b]=a},zIndexSetter:function(a,b,c){c.style[b]=a}};z.VMLElement=E=ka(P,E);E.prototype.ySetter=E.prototype.widthSetter=E.prototype.heightSetter=E.prototype.xSetter;var Na={Element:E,isIE8:Ba.indexOf("MSIE 8.0")>-1,init:function(a,b,c,d){var e;this.alignedObjects=[];d=this.createElement(Ka).css(x(this.getStyle(d),{position:"relative"}));e=d.element;
+a.appendChild(d.element);this.isVML=!0;this.box=e;this.boxWrapper=d;this.cache={};this.setSize(b,c,!1);if(!B.namespaces.hcv){B.namespaces.add("hcv","urn:schemas-microsoft-com:vml");try{B.createStyleSheet().cssText="hcv\\:fill, hcv\\:path, hcv\\:shape, hcv\\:stroke{ behavior:url(#default#VML); display: inline-block; } "}catch(f){B.styleSheets[0].cssText+="hcv\\:fill, hcv\\:path, hcv\\:shape, hcv\\:stroke{ behavior:url(#default#VML); display: inline-block; } "}}},isHidden:function(){return!this.box.offsetWidth},
+clipRect:function(a,b,c,d){var e=this.createElement(),f=da(a);return x(e,{members:[],count:0,left:(f?a.x:a)+1,top:(f?a.y:b)+1,width:(f?a.width:c)-1,height:(f?a.height:d)-1,getCSS:function(a){var b=a.element,c=b.nodeName,a=a.inverted,d=this.top-(c==="shape"?b.offsetTop:0),e=this.left,b=e+this.width,f=d+this.height,d={clip:"rect("+s(a?e:d)+"px,"+s(a?f:b)+"px,"+s(a?b:f)+"px,"+s(a?d:e)+"px)"};!a&&hb&&c==="DIV"&&x(d,{width:b+"px",height:f+"px"});return d},updateClipping:function(){o(e.members,function(a){a.element&&
+a.css(e.getCSS(a))})}})},color:function(a,b,c,d){var e=this,f,g=/^rgba/,h,i,j=O;a&&a.linearGradient?i="gradient":a&&a.radialGradient&&(i="pattern");if(i){var k,l,m=a.linearGradient||a.radialGradient,n,u,r,p,Q,t="",a=a.stops,w,ga=[],q=function(){h=['<fill colors="'+ga.join(",")+'" opacity="',r,'" o:opacity2="',u,'" type="',i,'" ',t,'focus="100%" method="any" />'];$(e.prepVML(h),null,null,b)};n=a[0];w=a[a.length-1];n[0]>0&&a.unshift([0,n[1]]);w[0]<1&&a.push([1,w[1]]);o(a,function(a,b){g.test(a[1])?
+(f=oa(a[1]),k=f.get("rgb"),l=f.get("a")):(k=a[1],l=1);ga.push(a[0]*100+"% "+k);b?(r=l,p=k):(u=l,Q=k)});if(c==="fill")if(i==="gradient")c=m.x1||m[0]||0,a=m.y1||m[1]||0,n=m.x2||m[2]||0,m=m.y2||m[3]||0,t='angle="'+(90-W.atan((m-a)/(n-c))*180/ma)+'"',q();else{var j=m.r,v=j*2,y=j*2,s=m.cx,x=m.cy,C=b.radialReference,A,j=function(){C&&(A=d.getBBox(),s+=(C[0]-A.x)/A.width-0.5,x+=(C[1]-A.y)/A.height-0.5,v*=C[2]/A.width,y*=C[2]/A.height);t='src="'+T.global.VMLRadialGradientURL+'" size="'+v+","+y+'" origin="0.5,0.5" position="'+
+s+","+x+'" color2="'+Q+'" ';q()};d.added?j():d.onAdd=j;j=p}else j=k}else if(g.test(a)&&b.tagName!=="IMG")f=oa(a),h=["<",c,' opacity="',f.get("a"),'"/>'],$(this.prepVML(h),null,null,b),j=f.get("rgb");else{j=b.getElementsByTagName(c);if(j.length)j[0].opacity=1,j[0].type="solid";j=a}return j},prepVML:function(a){var b=this.isIE8,a=a.join("");b?(a=a.replace("/>",' xmlns="urn:schemas-microsoft-com:vml" />'),a=a.indexOf('style="')===-1?a.replace("/>",' style="display:inline-block;behavior:url(#default#VML);" />'):
+a.replace('style="','style="display:inline-block;behavior:url(#default#VML);')):a=a.replace("<","<hcv:");return a},text:ua.prototype.html,path:function(a){var b={coordsize:"10 10"};Ha(a)?b.d=a:da(a)&&x(b,a);return this.createElement("shape").attr(b)},circle:function(a,b,c){var d=this.symbol("circle");if(da(a))c=a.r,b=a.y,a=a.x;d.isCircle=!0;d.r=c;return d.attr({x:a,y:b})},g:function(a){var b;a&&(b={className:"highcharts-"+a,"class":"highcharts-"+a});return this.createElement(Ka).attr(b)},image:function(a,
+b,c,d,e){var f=this.createElement("img").attr({src:a});arguments.length>1&&f.attr({x:b,y:c,width:d,height:e});return f},createElement:function(a){return a==="rect"?this.symbol(a):ua.prototype.createElement.call(this,a)},invertChild:function(a,b){var c=this,d=b.style,e=a.tagName==="IMG"&&a.style;L(a,{flip:"x",left:F(d.width)-(e?F(e.top):1),top:F(d.height)-(e?F(e.left):1),rotation:-90});o(a.childNodes,function(b){c.invertChild(b,a)})},symbols:{arc:function(a,b,c,d,e){var f=e.start,g=e.end,h=e.r||c||
+d,c=e.innerR,d=X(f),i=aa(f),j=X(g),k=aa(g);if(g-f===0)return["x"];f=["wa",a-h,b-h,a+h,b+h,a+h*d,b+h*i,a+h*j,b+h*k];e.open&&!c&&f.push("e","M",a,b);f.push("at",a-c,b-c,a+c,b+c,a+c*j,b+c*k,a+c*d,b+c*i,"x","e");f.isArc=!0;return f},circle:function(a,b,c,d,e){e&&(c=d=2*e.r);e&&e.isCircle&&(a-=c/2,b-=d/2);return["wa",a,b,a+c,b+d,a+c,b+d/2,a+c,b+d/2,"e"]},rect:function(a,b,c,d,e){return ua.prototype.symbols[!q(e)||!e.r?"square":"callout"].call(0,a,b,c,d,e)}}};z.VMLRenderer=E=function(){this.init.apply(this,
+arguments)};E.prototype=A(ua.prototype,Na);$a=E}ua.prototype.measureSpanWidth=function(a,b){var c=B.createElement("span"),d;d=B.createTextNode(a);c.appendChild(d);L(c,b);this.box.appendChild(c);d=c.offsetWidth;Ra(c);return d};var Lb;if(fa)z.CanVGRenderer=E=function(){Ca="http://www.w3.org/1999/xhtml"},E.prototype.symbols={},Lb=function(){function a(){var a=b.length,d;for(d=0;d<a;d++)b[d]();b=[]}var b=[];return{push:function(c,d){b.length===0&&Qb(d,a);b.push(c)}}}(),$a=E;Ta.prototype={addLabel:function(){var a=
+this.axis,b=a.options,c=a.chart,d=a.categories,e=a.names,f=this.pos,g=b.labels,h=a.tickPositions,i=f===h[0],j=f===h[h.length-1],e=d?p(d[f],e[f],f):f,d=this.label,h=h.info,k;a.isDatetimeAxis&&h&&(k=b.dateTimeLabelFormats[h.higherRanks[f]||h.unitName]);this.isFirst=i;this.isLast=j;b=a.labelFormatter.call({axis:a,chart:c,isFirst:i,isLast:j,dateTimeLabelFormat:k,value:a.isLog?ea(ia(e)):e});q(d)?d&&d.attr({text:b}):(this.labelLength=(this.label=d=q(b)&&g.enabled?c.renderer.text(b,0,0,g.useHTML).css(A(g.style)).add(a.labelGroup):
+null)&&d.getBBox().width,this.rotation=0)},getLabelSize:function(){return this.label?this.label.getBBox()[this.axis.horiz?"height":"width"]:0},handleOverflow:function(a){var b=this.axis,c=a.x,d=b.chart.chartWidth,e=b.chart.spacing,f=p(b.labelLeft,e[3]),e=p(b.labelRight,d-e[1]),g=this.label,h=this.rotation,i={left:0,center:0.5,right:1}[b.labelAlign],j=g.getBBox().width,k=b.slotWidth,l=1,m;if(h)h<0&&c-i*j<f?m=s(c/X(h*ha)-f):h>0&&c+i*j>e&&(m=s((d-c)/X(h*ha)));else if(d=c+(1-i)*j,c-i*j<f?k=a.x+k*(1-i)-
+f:d>e&&(k=e-a.x+k*i,l=-1),k=C(b.slotWidth,k),k<b.slotWidth&&b.labelAlign==="center"&&(a.x+=l*(b.slotWidth-k-i*(b.slotWidth-C(j,k)))),j>k||b.autoRotation&&g.styles.width)m=k;m&&g.css({width:m,textOverflow:"ellipsis"})},getPosition:function(a,b,c,d){var e=this.axis,f=e.chart,g=d&&f.oldChartHeight||f.chartHeight;return{x:a?e.translate(b+c,null,null,d)+e.transB:e.left+e.offset+(e.opposite?(d&&f.oldChartWidth||f.chartWidth)-e.right-e.left:0),y:a?g-e.bottom+e.offset-(e.opposite?e.height:0):g-e.translate(b+
+c,null,null,d)-e.transB}},getLabelPosition:function(a,b,c,d,e,f,g,h){var i=this.axis,j=i.transA,k=i.reversed,l=i.staggerLines,m=i.tickRotCorr||{x:0,y:0},c=p(e.y,m.y+(i.side===2?8:-(c.getBBox().height/2))),a=a+e.x+m.x-(f&&d?f*j*(k?-1:1):0),b=b+c-(f&&!d?f*j*(k?1:-1):0);l&&(b+=g/(h||1)%l*(i.labelOffset/l));return{x:a,y:s(b)}},getMarkPath:function(a,b,c,d,e,f){return f.crispLine(["M",a,b,"L",a+(e?0:-c),b+(e?c:0)],d)},render:function(a,b,c){var d=this.axis,e=d.options,f=d.chart.renderer,g=d.horiz,h=this.type,
+i=this.label,j=this.pos,k=e.labels,l=this.gridLine,m=h?h+"Grid":"grid",n=h?h+"Tick":"tick",u=e[m+"LineWidth"],r=e[m+"LineColor"],o=e[m+"LineDashStyle"],Q=e[n+"Length"],m=e[n+"Width"]||0,t=e[n+"Color"],w=e[n+"Position"],n=this.mark,ga=k.step,q=!0,v=d.tickmarkOffset,s=this.getPosition(g,j,v,b),x=s.x,s=s.y,A=g&&x===d.pos+d.len||!g&&s===d.pos?-1:1,c=p(c,1);this.isActive=!0;if(u){j=d.getPlotLinePath(j+v,u*A,b,!0);if(l===y){l={stroke:r,"stroke-width":u};if(o)l.dashstyle=o;if(!h)l.zIndex=1;if(b)l.opacity=
+0;this.gridLine=l=u?f.path(j).attr(l).add(d.gridGroup):null}if(!b&&l&&j)l[this.isNew?"attr":"animate"]({d:j,opacity:c})}if(m&&Q)w==="inside"&&(Q=-Q),d.opposite&&(Q=-Q),h=this.getMarkPath(x,s,Q,m*A,g,f),n?n.animate({d:h,opacity:c}):this.mark=f.path(h).attr({stroke:t,"stroke-width":m,opacity:c}).add(d.axisGroup);if(i&&!isNaN(x))i.xy=s=this.getLabelPosition(x,s,i,g,k,v,a,ga),this.isFirst&&!this.isLast&&!p(e.showFirstLabel,1)||this.isLast&&!this.isFirst&&!p(e.showLastLabel,1)?q=!1:g&&!d.isRadial&&!k.step&&
+!k.rotation&&!b&&c!==0&&this.handleOverflow(s),ga&&a%ga&&(q=!1),q&&!isNaN(s.y)?(s.opacity=c,i[this.isNew?"attr":"animate"](s),this.isNew=!1):i.attr("y",-9999)},destroy:function(){Qa(this,this.axis)}};z.PlotLineOrBand=function(a,b){this.axis=a;if(b)this.options=b,this.id=b.id};z.PlotLineOrBand.prototype={render:function(){var a=this,b=a.axis,c=b.horiz,d=a.options,e=d.label,f=a.label,g=d.width,h=d.to,i=d.from,j=q(i)&&q(h),k=d.value,l=d.dashStyle,m=a.svgElem,n=[],u,r=d.color,p=d.zIndex,o=d.events,t=
+{},w=b.chart.renderer;b.isLog&&(i=Ea(i),h=Ea(h),k=Ea(k));if(g){if(n=b.getPlotLinePath(k,g),t={stroke:r,"stroke-width":g},l)t.dashstyle=l}else if(j){n=b.getPlotBandPath(i,h,d);if(r)t.fill=r;if(d.borderWidth)t.stroke=d.borderColor,t["stroke-width"]=d.borderWidth}else return;if(q(p))t.zIndex=p;if(m)if(n)m.animate({d:n},null,m.onGetPath);else{if(m.hide(),m.onGetPath=function(){m.show()},f)a.label=f=f.destroy()}else if(n&&n.length&&(a.svgElem=m=w.path(n).attr(t).add(),o))for(u in d=function(b){m.on(b,
+function(c){o[b].apply(a,[c])})},o)d(u);if(e&&q(e.text)&&n&&n.length&&b.width>0&&b.height>0){e=A({align:c&&j&&"center",x:c?!j&&4:10,verticalAlign:!c&&j&&"middle",y:c?j?16:10:j?6:-4,rotation:c&&!j&&90},e);if(!f){t={align:e.textAlign||e.align,rotation:e.rotation};if(q(p))t.zIndex=p;a.label=f=w.text(e.text,0,0,e.useHTML).attr(t).css(e.style).add()}b=[n[1],n[4],j?n[6]:n[1]];j=[n[2],n[5],j?n[7]:n[2]];n=Pa(b);c=Pa(j);f.align(e,!1,{x:n,y:c,width:Fa(b)-n,height:Fa(j)-c});f.show()}else f&&f.hide();return a},
+destroy:function(){ja(this.axis.plotLinesAndBands,this);delete this.axis;Qa(this)}};var va=z.Axis=function(){this.init.apply(this,arguments)};va.prototype={defaultOptions:{dateTimeLabelFormats:{millisecond:"%H:%M:%S.%L",second:"%H:%M:%S",minute:"%H:%M",hour:"%H:%M",day:"%e. %b",week:"%e. %b",month:"%b '%y",year:"%Y"},endOnTick:!1,gridLineColor:"#D8D8D8",labels:{enabled:!0,style:{color:"#606060",cursor:"default",fontSize:"11px"},x:0,y:15},lineColor:"#C0D0E0",lineWidth:1,minPadding:0.01,maxPadding:0.01,
+minorGridLineColor:"#E0E0E0",minorGridLineWidth:1,minorTickColor:"#A0A0A0",minorTickLength:2,minorTickPosition:"outside",startOfWeek:1,startOnTick:!1,tickColor:"#C0D0E0",tickLength:10,tickmarkPlacement:"between",tickPixelInterval:100,tickPosition:"outside",tickWidth:1,title:{align:"middle",style:{color:"#707070"}},type:"linear"},defaultYAxisOptions:{endOnTick:!0,gridLineWidth:1,tickPixelInterval:72,showLastLabel:!0,labels:{x:-8,y:3},lineWidth:0,maxPadding:0.05,minPadding:0.05,startOnTick:!0,tickWidth:0,
+title:{rotation:270,text:"Values"},stackLabels:{enabled:!1,formatter:function(){return z.numberFormat(this.total,-1)},style:A(ba.line.dataLabels.style,{color:"#000000"})}},defaultLeftAxisOptions:{labels:{x:-15,y:null},title:{rotation:270}},defaultRightAxisOptions:{labels:{x:15,y:null},title:{rotation:90}},defaultBottomAxisOptions:{labels:{autoRotation:[-45],x:0,y:null},title:{rotation:0}},defaultTopAxisOptions:{labels:{autoRotation:[-45],x:0,y:-15},title:{rotation:0}},init:function(a,b){var c=b.isX;
+this.horiz=a.inverted?!c:c;this.coll=(this.isXAxis=c)?"xAxis":"yAxis";this.opposite=b.opposite;this.side=b.side||(this.horiz?this.opposite?0:2:this.opposite?1:3);this.setOptions(b);var d=this.options,e=d.type;this.labelFormatter=d.labels.formatter||this.defaultLabelFormatter;this.userOptions=b;this.minPixelPadding=0;this.chart=a;this.reversed=d.reversed;this.zoomEnabled=d.zoomEnabled!==!1;this.categories=d.categories||e==="category";this.names=this.names||[];this.isLog=e==="logarithmic";this.isDatetimeAxis=
+e==="datetime";this.isLinked=q(d.linkedTo);this.ticks={};this.labelEdge=[];this.minorTicks={};this.plotLinesAndBands=[];this.alternateBands={};this.len=0;this.minRange=this.userMinRange=d.minRange||d.maxZoom;this.range=d.range;this.offset=d.offset||0;this.stacks={};this.oldStacks={};this.min=this.max=null;this.crosshair=p(d.crosshair,sa(a.options.tooltip.crosshairs)[c?0:1],!1);var f,d=this.options.events;Ma(this,a.axes)===-1&&(c&&!this.isColorAxis?a.axes.splice(a.xAxis.length,0,this):a.axes.push(this),
+a[this.coll].push(this));this.series=this.series||[];if(a.inverted&&c&&this.reversed===y)this.reversed=!0;this.removePlotLine=this.removePlotBand=this.removePlotBandOrLine;for(f in d)H(this,f,d[f]);if(this.isLog)this.val2lin=Ea,this.lin2val=ia},setOptions:function(a){this.options=A(this.defaultOptions,this.isXAxis?{}:this.defaultYAxisOptions,[this.defaultTopAxisOptions,this.defaultRightAxisOptions,this.defaultBottomAxisOptions,this.defaultLeftAxisOptions][this.side],A(T[this.coll],a))},defaultLabelFormatter:function(){var a=
+this.axis,b=this.value,c=a.categories,d=this.dateTimeLabelFormat,e=T.lang.numericSymbols,f=e&&e.length,g,h=a.options.labels.format,a=a.isLog?b:a.tickInterval;if(h)g=Ja(h,this);else if(c)g=b;else if(d)g=Oa(d,b);else if(f&&a>=1E3)for(;f--&&g===y;)c=Math.pow(1E3,f+1),a>=c&&e[f]!==null&&(g=z.numberFormat(b/c,-1)+e[f]);g===y&&(g=N(b)>=1E4?z.numberFormat(b,0):z.numberFormat(b,-1,y,""));return g},getSeriesExtremes:function(){var a=this,b=a.chart;a.hasVisibleSeries=!1;a.dataMin=a.dataMax=a.ignoreMinPadding=
+a.ignoreMaxPadding=null;a.buildStacks&&a.buildStacks();o(a.series,function(c){if(c.visible||!b.options.chart.ignoreHiddenSeries){var d;d=c.options.threshold;var e;a.hasVisibleSeries=!0;a.isLog&&d<=0&&(d=null);if(a.isXAxis){if(d=c.xData,d.length)a.dataMin=C(p(a.dataMin,d[0]),Pa(d)),a.dataMax=v(p(a.dataMax,d[0]),Fa(d))}else{c.getExtremes();e=c.dataMax;c=c.dataMin;if(q(c)&&q(e))a.dataMin=C(p(a.dataMin,c),c),a.dataMax=v(p(a.dataMax,e),e);if(q(d))if(a.dataMin>=d)a.dataMin=d,a.ignoreMinPadding=!0;else if(a.dataMax<
+d)a.dataMax=d,a.ignoreMaxPadding=!0}}})},translate:function(a,b,c,d,e,f){var g=this.linkedParent||this,h=1,i=0,j=d?g.oldTransA:g.transA,d=d?g.oldMin:g.min,k=g.minPixelPadding,e=(g.doPostTranslate||g.isLog&&e)&&g.lin2val;if(!j)j=g.transA;if(c)h*=-1,i=g.len;g.reversed&&(h*=-1,i-=h*(g.sector||g.len));b?(a=a*h+i,a-=k,a=a/j+d,e&&(a=g.lin2val(a))):(e&&(a=g.val2lin(a)),f==="between"&&(f=0.5),a=h*(a-d)*j+i+h*k+(ra(f)?j*f*g.pointRange:0));return a},toPixels:function(a,b){return this.translate(a,!1,!this.horiz,
+null,!0)+(b?0:this.pos)},toValue:function(a,b){return this.translate(a-(b?0:this.pos),!0,!this.horiz,null,!0)},getPlotLinePath:function(a,b,c,d,e){var f=this.chart,g=this.left,h=this.top,i,j,k=c&&f.oldChartHeight||f.chartHeight,l=c&&f.oldChartWidth||f.chartWidth,m;i=this.transB;var n=function(a,b,c){if(a<b||a>c)d?a=C(v(b,a),c):m=!0;return a},e=p(e,this.translate(a,null,null,c)),a=c=s(e+i);i=j=s(k-e-i);isNaN(e)?m=!0:this.horiz?(i=h,j=k-this.bottom,a=c=n(a,g,g+this.width)):(a=g,c=l-this.right,i=j=n(i,
+h,h+this.height));return m&&!d?null:f.renderer.crispLine(["M",a,i,"L",c,j],b||1)},getLinearTickPositions:function(a,b,c){var d,e=ea(V(b/a)*a),f=ea(ta(c/a)*a),g=[];if(b===c&&ra(b))return[b];for(b=e;b<=f;){g.push(b);b=ea(b+a);if(b===d)break;d=b}return g},getMinorTickPositions:function(){var a=this.options,b=this.tickPositions,c=this.minorTickInterval,d=[],e,f=this.min;e=this.max;var g=e-f;if(g&&g/c<this.len/3)if(this.isLog){a=b.length;for(e=1;e<a;e++)d=d.concat(this.getLogTickPositions(c,b[e-1],b[e],
+!0))}else if(this.isDatetimeAxis&&a.minorTickInterval==="auto")d=d.concat(this.getTimeTicks(this.normalizeTimeTickInterval(c),f,e,a.startOfWeek));else for(b=f+(b[0]-f)%c;b<=e;b+=c)d.push(b);this.trimTicks(d);return d},adjustForMinRange:function(){var a=this.options,b=this.min,c=this.max,d,e=this.dataMax-this.dataMin>=this.minRange,f,g,h,i,j;if(this.isXAxis&&this.minRange===y&&!this.isLog)q(a.min)||q(a.max)?this.minRange=null:(o(this.series,function(a){i=a.xData;for(g=j=a.xIncrement?1:i.length-1;g>
+0;g--)if(h=i[g]-i[g-1],f===y||h<f)f=h}),this.minRange=C(f*5,this.dataMax-this.dataMin));if(c-b<this.minRange){var k=this.minRange;d=(k-c+b)/2;d=[b-d,p(a.min,b-d)];if(e)d[2]=this.dataMin;b=Fa(d);c=[b+k,p(a.max,b+k)];if(e)c[2]=this.dataMax;c=Pa(c);c-b<k&&(d[0]=c-k,d[1]=p(a.min,c-k),b=Fa(d))}this.min=b;this.max=c},setAxisTranslation:function(a){var b=this,c=b.max-b.min,d=b.axisPointRange||0,e,f=0,g=0,h=b.linkedParent,i=!!b.categories,j=b.transA,k=b.isXAxis;if(k||i||d)if(h?(f=h.minPointOffset,g=h.pointRangePadding):
+o(b.series,function(a){var h=i?1:k?a.pointRange:b.axisPointRange||0,j=a.options.pointPlacement,u=a.closestPointRange;h>c&&(h=0);d=v(d,h);b.single||(f=v(f,Da(j)?0:h/2),g=v(g,j==="on"?0:h));!a.noSharedTooltip&&q(u)&&(e=q(e)?C(e,u):u)}),h=b.ordinalSlope&&e?b.ordinalSlope/e:1,b.minPointOffset=f*=h,b.pointRangePadding=g*=h,b.pointRange=C(d,c),k)b.closestPointRange=e;if(a)b.oldTransA=j;b.translationSlope=b.transA=j=b.len/(c+g||1);b.transB=b.horiz?b.left:b.bottom;b.minPixelPadding=j*f},setTickInterval:function(a){var b=
+this,c=b.chart,d=b.options,e=b.isLog,f=b.isDatetimeAxis,g=b.isXAxis,h=b.isLinked,i=d.maxPadding,j=d.minPadding,k=d.tickInterval,l=d.tickPixelInterval,m=b.categories;!f&&!m&&!h&&this.getTickAmount();h?(b.linkedParent=c[b.coll][d.linkedTo],c=b.linkedParent.getExtremes(),b.min=p(c.min,c.dataMin),b.max=p(c.max,c.dataMax),d.type!==b.linkedParent.options.type&&la(11,1)):(b.min=p(b.userMin,d.min,b.dataMin),b.max=p(b.userMax,d.max,b.dataMax));if(e)!a&&C(b.min,p(b.dataMin,b.min))<=0&&la(10,1),b.min=ea(Ea(b.min)),
+b.max=ea(Ea(b.max));if(b.range&&q(b.max))b.userMin=b.min=v(b.min,b.max-b.range),b.userMax=b.max,b.range=null;b.beforePadding&&b.beforePadding();b.adjustForMinRange();if(!m&&!b.axisPointRange&&!b.usePercentage&&!h&&q(b.min)&&q(b.max)&&(c=b.max-b.min)){if(!q(d.min)&&!q(b.userMin)&&j&&(b.dataMin<0||!b.ignoreMinPadding))b.min-=c*j;if(!q(d.max)&&!q(b.userMax)&&i&&(b.dataMax>0||!b.ignoreMaxPadding))b.max+=c*i}if(ra(d.floor))b.min=v(b.min,d.floor);if(ra(d.ceiling))b.max=C(b.max,d.ceiling);b.tickInterval=
+b.min===b.max||b.min===void 0||b.max===void 0?1:h&&!k&&l===b.linkedParent.options.tickPixelInterval?k=b.linkedParent.tickInterval:p(k,this.tickAmount?(b.max-b.min)/v(this.tickAmount-1,1):void 0,m?1:(b.max-b.min)*l/v(b.len,l));g&&!a&&o(b.series,function(a){a.processData(b.min!==b.oldMin||b.max!==b.oldMax)});b.setAxisTranslation(!0);b.beforeSetTickPositions&&b.beforeSetTickPositions();if(b.postProcessTickInterval)b.tickInterval=b.postProcessTickInterval(b.tickInterval);if(b.pointRange)b.tickInterval=
+v(b.pointRange,b.tickInterval);a=p(d.minTickInterval,b.isDatetimeAxis&&b.closestPointRange);if(!k&&b.tickInterval<a)b.tickInterval=a;if(!f&&!e&&!k)b.tickInterval=qb(b.tickInterval,null,pb(b.tickInterval),p(d.allowDecimals,!(b.tickInterval>0.5&&b.tickInterval<5&&b.max>1E3&&b.max<9999)),!!this.tickAmount);if(!this.tickAmount&&this.len)b.tickInterval=b.unsquish();this.setTickPositions()},setTickPositions:function(){var a=this.options,b,c=a.tickPositions,d=a.tickPositioner,e=a.startOnTick,f=a.endOnTick,
+g;this.tickmarkOffset=this.categories&&a.tickmarkPlacement==="between"&&this.tickInterval===1?0.5:0;this.minorTickInterval=a.minorTickInterval==="auto"&&this.tickInterval?this.tickInterval/5:a.minorTickInterval;this.tickPositions=b=c&&c.slice();if(!b&&(this.tickPositions=b=this.isDatetimeAxis?this.getTimeTicks(this.normalizeTimeTickInterval(this.tickInterval,a.units),this.min,this.max,a.startOfWeek,this.ordinalPositions,this.closestPointRange,!0):this.isLog?this.getLogTickPositions(this.tickInterval,
+this.min,this.max):this.getLinearTickPositions(this.tickInterval,this.min,this.max),d&&(d=d.apply(this,[this.min,this.max]))))this.tickPositions=b=d;if(!this.isLinked)this.trimTicks(b,e,f),this.min===this.max&&q(this.min)&&!this.tickAmount&&(g=!0,this.min-=0.5,this.max+=0.5),this.single=g,!c&&!d&&this.adjustTickAmount()},trimTicks:function(a,b,c){var d=a[0],e=a[a.length-1],f=this.minPointOffset||0;b?this.min=d:this.min-f>d&&a.shift();c?this.max=e:this.max+f<e&&a.pop();a.length===0&&q(d)&&a.push((e+
+d)/2)},getTickAmount:function(){var a={},b,c=this.options,d=c.tickAmount,e=c.tickPixelInterval;!q(c.tickInterval)&&this.len<e&&!this.isRadial&&!this.isLog&&c.startOnTick&&c.endOnTick&&(d=2);!d&&this.chart.options.chart.alignTicks!==!1&&c.alignTicks!==!1&&(o(this.chart[this.coll],function(c){var d=c.options,e=c.horiz,d=[e?d.left:d.top,e?d.width:d.height,d.pane].join(",");a[d]?c.series.length&&(b=!0):a[d]=1}),b&&(d=ta(this.len/e)+1));if(d<4)this.finalTickAmt=d,d=5;this.tickAmount=d},adjustTickAmount:function(){var a=
+this.tickInterval,b=this.tickPositions,c=this.tickAmount,d=this.finalTickAmt,e=b&&b.length;if(e<c){for(;b.length<c;)b.push(ea(b[b.length-1]+a));this.transA*=(e-1)/(c-1);this.max=b[b.length-1]}else e>c&&(this.tickInterval*=2,this.setTickPositions());if(q(d)){for(a=c=b.length;a--;)(d===3&&a%2===1||d<=2&&a>0&&a<c-1)&&b.splice(a,1);this.finalTickAmt=y}},setScale:function(){var a=this.stacks,b,c,d,e;this.oldMin=this.min;this.oldMax=this.max;this.oldAxisLength=this.len;this.setAxisSize();e=this.len!==this.oldAxisLength;
+o(this.series,function(a){if(a.isDirtyData||a.isDirty||a.xAxis.isDirty)d=!0});if(e||d||this.isLinked||this.forceRedraw||this.userMin!==this.oldUserMin||this.userMax!==this.oldUserMax){if(!this.isXAxis)for(b in a)for(c in a[b])a[b][c].total=null,a[b][c].cum=0;this.forceRedraw=!1;this.getSeriesExtremes();this.setTickInterval();this.oldUserMin=this.userMin;this.oldUserMax=this.userMax;if(!this.isDirty)this.isDirty=e||this.min!==this.oldMin||this.max!==this.oldMax}else if(!this.isXAxis){if(this.oldStacks)a=
+this.stacks=this.oldStacks;for(b in a)for(c in a[b])a[b][c].cum=a[b][c].total}},setExtremes:function(a,b,c,d,e){var f=this,g=f.chart,c=p(c,!0);o(f.series,function(a){delete a.kdTree});e=x(e,{min:a,max:b});I(f,"setExtremes",e,function(){f.userMin=a;f.userMax=b;f.eventArgs=e;f.isDirtyExtremes=!0;c&&g.redraw(d)})},zoom:function(a,b){var c=this.dataMin,d=this.dataMax,e=this.options;this.allowZoomOutside||(q(c)&&a<=C(c,p(e.min,c))&&(a=y),q(d)&&b>=v(d,p(e.max,d))&&(b=y));this.displayBtn=a!==y||b!==y;this.setExtremes(a,
+b,!1,y,{trigger:"zoom"});return!0},setAxisSize:function(){var a=this.chart,b=this.options,c=b.offsetLeft||0,d=this.horiz,e=p(b.width,a.plotWidth-c+(b.offsetRight||0)),f=p(b.height,a.plotHeight),g=p(b.top,a.plotTop),b=p(b.left,a.plotLeft+c),c=/%$/;c.test(f)&&(f=parseFloat(f)/100*a.plotHeight);c.test(g)&&(g=parseFloat(g)/100*a.plotHeight+a.plotTop);this.left=b;this.top=g;this.width=e;this.height=f;this.bottom=a.chartHeight-f-g;this.right=a.chartWidth-e-b;this.len=v(d?e:f,0);this.pos=d?b:g},getExtremes:function(){var a=
+this.isLog;return{min:a?ea(ia(this.min)):this.min,max:a?ea(ia(this.max)):this.max,dataMin:this.dataMin,dataMax:this.dataMax,userMin:this.userMin,userMax:this.userMax}},getThreshold:function(a){var b=this.isLog,c=b?ia(this.min):this.min,b=b?ia(this.max):this.max;c>a||a===null?a=c:b<a&&(a=b);return this.translate(a,0,1,0,1)},autoLabelAlign:function(a){a=(p(a,0)-this.side*90+720)%360;return a>15&&a<165?"right":a>195&&a<345?"left":"center"},unsquish:function(){var a=this.ticks,b=this.options.labels,c=
+this.horiz,d=this.tickInterval,e=d,f=this.len/(((this.categories?1:0)+this.max-this.min)/d),g,h=b.rotation,i=this.chart.renderer.fontMetrics(b.style.fontSize,a[0]&&a[0].label),j,k=Number.MAX_VALUE,l,m=function(a){a/=f||1;a=a>1?ta(a):1;return a*d};c?(l=q(h)?[h]:f<p(b.autoRotationLimit,80)&&!b.staggerLines&&!b.step&&b.autoRotation)&&o(l,function(a){var b;if(a===h||a&&a>=-90&&a<=90)j=m(N(i.h/aa(ha*a))),b=j+N(a/360),b<k&&(k=b,g=a,e=j)}):e=m(i.h);this.autoRotation=l;this.labelRotation=g;return e},renderUnsquish:function(){var a=
+this.chart,b=a.renderer,c=this.tickPositions,d=this.ticks,e=this.options.labels,f=this.horiz,g=a.margin,h=this.categories?c.length:c.length-1,h=this.slotWidth=f&&!e.step&&!e.rotation&&(this.staggerLines||1)*a.plotWidth/h||!f&&(g[3]&&g[3]-a.spacing[3]||a.chartWidth*0.33),i=v(1,s(h-2*(e.padding||5))),j={},g=b.fontMetrics(e.style.fontSize,d[0]&&d[0].label),k,l=0;if(!Da(e.rotation))j.rotation=e.rotation;if(this.autoRotation)o(c,function(a){if((a=d[a])&&a.labelLength>l)l=a.labelLength}),l>i&&l>g.h?j.rotation=
+this.labelRotation:this.labelRotation=0;else if(h){k={width:i+"px",textOverflow:"clip"};for(h=c.length;!f&&h--;)if(i=c[h],i=d[i].label)if(i.styles.textOverflow==="ellipsis"&&i.css({textOverflow:"clip"}),i.getBBox().height>this.len/c.length-(g.h-g.f))i.specCss={textOverflow:"ellipsis"}}j.rotation&&(k={width:(l>a.chartHeight*0.5?a.chartHeight*0.33:a.chartHeight)+"px",textOverflow:"ellipsis"});this.labelAlign=j.align=e.align||this.autoLabelAlign(this.labelRotation);o(c,function(a){var b=(a=d[a])&&a.label;
+if(b)k&&b.css(A(k,b.specCss)),delete b.specCss,b.attr(j),a.rotation=j.rotation});this.tickRotCorr=b.rotCorr(g.b,this.labelRotation||0,this.side===2)},getOffset:function(){var a=this,b=a.chart,c=b.renderer,d=a.options,e=a.tickPositions,f=a.ticks,g=a.horiz,h=a.side,i=b.inverted?[1,0,3,2][h]:h,j,k,l=0,m,n=0,u=d.title,r=d.labels,S=0,Q=b.axisOffset,b=b.clipOffset,t=[-1,1,1,-1][h],w;a.hasData=j=a.hasVisibleSeries||q(a.min)&&q(a.max)&&!!e;a.showAxis=k=j||p(d.showEmpty,!0);a.staggerLines=a.horiz&&r.staggerLines;
+if(!a.axisGroup)a.gridGroup=c.g("grid").attr({zIndex:d.gridZIndex||1}).add(),a.axisGroup=c.g("axis").attr({zIndex:d.zIndex||2}).add(),a.labelGroup=c.g("axis-labels").attr({zIndex:r.zIndex||7}).addClass("highcharts-"+a.coll.toLowerCase()+"-labels").add();if(j||a.isLinked){if(o(e,function(b){f[b]?f[b].addLabel():f[b]=new Ta(a,b)}),a.renderUnsquish(),o(e,function(b){if(h===0||h===2||{1:"left",3:"right"}[h]===a.labelAlign)S=v(f[b].getLabelSize(),S)}),a.staggerLines)S*=a.staggerLines,a.labelOffset=S}else for(w in f)f[w].destroy(),
+delete f[w];if(u&&u.text&&u.enabled!==!1){if(!a.axisTitle)a.axisTitle=c.text(u.text,0,0,u.useHTML).attr({zIndex:7,rotation:u.rotation||0,align:u.textAlign||{low:"left",middle:"center",high:"right"}[u.align]}).addClass("highcharts-"+this.coll.toLowerCase()+"-title").css(u.style).add(a.axisGroup),a.axisTitle.isNew=!0;if(k)l=a.axisTitle.getBBox()[g?"height":"width"],m=u.offset,n=q(m)?0:p(u.margin,g?5:10);a.axisTitle[k?"show":"hide"]()}a.offset=t*p(d.offset,Q[h]);a.tickRotCorr=a.tickRotCorr||{x:0,y:0};
+c=h===2?a.tickRotCorr.y:0;g=S+n+(S&&t*(g?p(r.y,a.tickRotCorr.y+8):r.x)-c);a.axisTitleMargin=p(m,g);Q[h]=v(Q[h],a.axisTitleMargin+l+t*a.offset,g);b[i]=v(b[i],V(d.lineWidth/2)*2)},getLinePath:function(a){var b=this.chart,c=this.opposite,d=this.offset,e=this.horiz,f=this.left+(c?this.width:0)+d,d=b.chartHeight-this.bottom-(c?this.height:0)+d;c&&(a*=-1);return b.renderer.crispLine(["M",e?this.left:f,e?d:this.top,"L",e?b.chartWidth-this.right:f,e?d:b.chartHeight-this.bottom],a)},getTitlePosition:function(){var a=
+this.horiz,b=this.left,c=this.top,d=this.len,e=this.options.title,f=a?b:c,g=this.opposite,h=this.offset,i=e.x||0,j=e.y||0,k=F(e.style.fontSize||12),d={low:f+(a?0:d),middle:f+d/2,high:f+(a?d:0)}[e.align],b=(a?c+this.height:b)+(a?1:-1)*(g?-1:1)*this.axisTitleMargin+(this.side===2?k:0);return{x:a?d+i:b+(g?this.width:0)+h+i,y:a?b+j-(g?this.height:0)+h:d+j}},render:function(){var a=this,b=a.chart,c=b.renderer,d=a.options,e=a.isLog,f=a.isLinked,g=a.tickPositions,h=a.axisTitle,i=a.ticks,j=a.minorTicks,k=
+a.alternateBands,l=d.stackLabels,m=d.alternateGridColor,n=a.tickmarkOffset,u=d.lineWidth,r,p=b.hasRendered&&q(a.oldMin)&&!isNaN(a.oldMin);r=a.hasData;var Q=a.showAxis,t,w;a.labelEdge.length=0;a.overlap=!1;o([i,j,k],function(a){for(var b in a)a[b].isActive=!1});if(r||f){a.minorTickInterval&&!a.categories&&o(a.getMinorTickPositions(),function(b){j[b]||(j[b]=new Ta(a,b,"minor"));p&&j[b].isNew&&j[b].render(null,!0);j[b].render(null,!1,1)});if(g.length&&(o(g,function(b,c){if(!f||b>=a.min&&b<=a.max)i[b]||
+(i[b]=new Ta(a,b)),p&&i[b].isNew&&i[b].render(c,!0,0.1),i[b].render(c)}),n&&(a.min===0||a.single)))i[-1]||(i[-1]=new Ta(a,-1,null,!0)),i[-1].render(-1);m&&o(g,function(b,c){if(c%2===0&&b<a.max)k[b]||(k[b]=new z.PlotLineOrBand(a)),t=b+n,w=g[c+1]!==y?g[c+1]+n:a.max,k[b].options={from:e?ia(t):t,to:e?ia(w):w,color:m},k[b].render(),k[b].isActive=!0});if(!a._addedPlotLB)o((d.plotLines||[]).concat(d.plotBands||[]),function(b){a.addPlotBandOrLine(b)}),a._addedPlotLB=!0}o([i,j,k],function(a){var c,d,e=[],
+f=za?za.duration||500:0,g=function(){for(d=e.length;d--;)a[e[d]]&&!a[e[d]].isActive&&(a[e[d]].destroy(),delete a[e[d]])};for(c in a)if(!a[c].isActive)a[c].render(c,!1,0),a[c].isActive=!1,e.push(c);a===k||!b.hasRendered||!f?g():f&&setTimeout(g,f)});if(u)r=a.getLinePath(u),a.axisLine?a.axisLine.animate({d:r}):a.axisLine=c.path(r).attr({stroke:d.lineColor,"stroke-width":u,zIndex:7}).add(a.axisGroup),a.axisLine[Q?"show":"hide"]();if(h&&Q)h[h.isNew?"attr":"animate"](a.getTitlePosition()),h.isNew=!1;l&&
+l.enabled&&a.renderStackTotals();a.isDirty=!1},redraw:function(){this.render();o(this.plotLinesAndBands,function(a){a.render()});o(this.series,function(a){a.isDirty=!0})},destroy:function(a){var b=this,c=b.stacks,d,e=b.plotLinesAndBands;a||Z(b);for(d in c)Qa(c[d]),c[d]=null;o([b.ticks,b.minorTicks,b.alternateBands],function(a){Qa(a)});for(a=e.length;a--;)e[a].destroy();o("stackTotalGroup,axisLine,axisTitle,axisGroup,cross,gridGroup,labelGroup".split(","),function(a){b[a]&&(b[a]=b[a].destroy())});
+this.cross&&this.cross.destroy()},drawCrosshair:function(a,b){var c,d=this.crosshair,e=d.animation;if(!this.crosshair||(q(b)||!p(this.crosshair.snap,!0))===!1||b&&b.series&&b.series[this.coll]!==this)this.hideCrosshair();else if(p(d.snap,!0)?q(b)&&(c=this.isXAxis?b.plotX:this.len-b.plotY):c=this.horiz?a.chartX-this.pos:this.len-a.chartY+this.pos,c=this.isRadial?this.getPlotLinePath(this.isXAxis?b.x:p(b.stackY,b.y))||null:this.getPlotLinePath(null,null,null,null,c)||null,c===null)this.hideCrosshair();
+else if(this.cross)this.cross.attr({visibility:"visible"})[e?"animate":"attr"]({d:c},e);else{e=this.categories&&!this.isRadial;e={"stroke-width":d.width||(e?this.transA:1),stroke:d.color||(e?"rgba(155,200,255,0.2)":"#C0C0C0"),zIndex:d.zIndex||2};if(d.dashStyle)e.dashstyle=d.dashStyle;this.cross=this.chart.renderer.path(c).attr(e).add()}},hideCrosshair:function(){this.cross&&this.cross.hide()}};x(va.prototype,{getPlotBandPath:function(a,b){var c=this.getPlotLinePath(b,null,null,!0),d=this.getPlotLinePath(a,
+null,null,!0);d&&c&&d.toString()!==c.toString()?d.push(c[4],c[5],c[1],c[2]):d=null;return d},addPlotBand:function(a){return this.addPlotBandOrLine(a,"plotBands")},addPlotLine:function(a){return this.addPlotBandOrLine(a,"plotLines")},addPlotBandOrLine:function(a,b){var c=(new z.PlotLineOrBand(this,a)).render(),d=this.userOptions;c&&(b&&(d[b]=d[b]||[],d[b].push(a)),this.plotLinesAndBands.push(c));return c},removePlotBandOrLine:function(a){for(var b=this.plotLinesAndBands,c=this.options,d=this.userOptions,
+e=b.length;e--;)b[e].id===a&&b[e].destroy();o([c.plotLines||[],d.plotLines||[],c.plotBands||[],d.plotBands||[]],function(b){for(e=b.length;e--;)b[e].id===a&&ja(b,b[e])})}});va.prototype.getTimeTicks=function(a,b,c,d){var e=[],f={},g=T.global.useUTC,h,i=new Aa(b-Wa(b)),j=a.unitRange,k=a.count;if(q(b)){i[Db](j>=D.second?0:k*V(i.getMilliseconds()/k));if(j>=D.second)i[Eb](j>=D.minute?0:k*V(i.getSeconds()/k));if(j>=D.minute)i[Fb](j>=D.hour?0:k*V(i[sb]()/k));if(j>=D.hour)i[Gb](j>=D.day?0:k*V(i[tb]()/k));
+if(j>=D.day)i[vb](j>=D.month?1:k*V(i[Xa]()/k));j>=D.month&&(i[wb](j>=D.year?0:k*V(i[Ya]()/k)),h=i[Za]());j>=D.year&&(h-=h%k,i[xb](h));if(j===D.week)i[vb](i[Xa]()-i[ub]()+p(d,1));b=1;if(ob||eb)i=i.getTime(),i=new Aa(i+Wa(i));h=i[Za]();for(var d=i.getTime(),l=i[Ya](),m=i[Xa](),n=(D.day+(g?Wa(i):i.getTimezoneOffset()*6E4))%D.day;d<c;)e.push(d),j===D.year?d=gb(h+b*k,0):j===D.month?d=gb(h,l+b*k):!g&&(j===D.day||j===D.week)?d=gb(h,l,m+b*k*(j===D.day?1:7)):d+=j*k,b++;e.push(d);o(lb(e,function(a){return j<=
+D.hour&&a%D.day===n}),function(a){f[a]="day"})}e.info=x(a,{higherRanks:f,totalRange:j*k});return e};va.prototype.normalizeTimeTickInterval=function(a,b){var c=b||[["millisecond",[1,2,5,10,20,25,50,100,200,500]],["second",[1,2,5,10,15,30]],["minute",[1,2,5,10,15,30]],["hour",[1,2,3,4,6,8,12]],["day",[1,2]],["week",[1,2]],["month",[1,2,3,4,6]],["year",null]],d=c[c.length-1],e=D[d[0]],f=d[1],g;for(g=0;g<c.length;g++)if(d=c[g],e=D[d[0]],f=d[1],c[g+1]&&a<=(e*f[f.length-1]+D[c[g+1][0]])/2)break;e===D.year&&
+a<5*e&&(f=[1,2,5]);c=qb(a/e,f,d[0]==="year"?v(pb(a/e),1):1);return{unitRange:e,count:c,unitName:d[0]}};va.prototype.getLogTickPositions=function(a,b,c,d){var e=this.options,f=this.len,g=[];if(!d)this._minorAutoInterval=null;if(a>=0.5)a=s(a),g=this.getLinearTickPositions(a,b,c);else if(a>=0.08)for(var f=V(b),h,i,j,k,l,e=a>0.3?[1,2,4]:a>0.15?[1,2,4,6,8]:[1,2,3,4,5,6,7,8,9];f<c+1&&!l;f++){i=e.length;for(h=0;h<i&&!l;h++)j=Ea(ia(f)*e[h]),j>b&&(!d||k<=c)&&k!==y&&g.push(k),k>c&&(l=!0),k=j}else if(b=ia(b),
+c=ia(c),a=e[d?"minorTickInterval":"tickInterval"],a=p(a==="auto"?null:a,this._minorAutoInterval,(c-b)*(e.tickPixelInterval/(d?5:1))/((d?f/this.tickPositions.length:f)||1)),a=qb(a,null,pb(a)),g=Ua(this.getLinearTickPositions(a,b,c),Ea),!d)this._minorAutoInterval=a/5;if(!d)this.tickInterval=a;return g};var Mb=z.Tooltip=function(){this.init.apply(this,arguments)};Mb.prototype={init:function(a,b){var c=b.borderWidth,d=b.style,e=F(d.padding);this.chart=a;this.options=b;this.crosshairs=[];this.now={x:0,
+y:0};this.isHidden=!0;this.label=a.renderer.label("",0,0,b.shape||"callout",null,null,b.useHTML,null,"tooltip").attr({padding:e,fill:b.backgroundColor,"stroke-width":c,r:b.borderRadius,zIndex:8}).css(d).css({padding:0}).add().attr({y:-9999});fa||this.label.shadow(b.shadow);this.shared=b.shared},destroy:function(){if(this.label)this.label=this.label.destroy();clearTimeout(this.hideTimer);clearTimeout(this.tooltipTimeout)},move:function(a,b,c,d){var e=this,f=e.now,g=e.options.animation!==!1&&!e.isHidden&&
+(N(a-f.x)>1||N(b-f.y)>1),h=e.followPointer||e.len>1;x(f,{x:g?(2*f.x+a)/3:a,y:g?(f.y+b)/2:b,anchorX:h?y:g?(2*f.anchorX+c)/3:c,anchorY:h?y:g?(f.anchorY+d)/2:d});e.label.attr(f);if(g)clearTimeout(this.tooltipTimeout),this.tooltipTimeout=setTimeout(function(){e&&e.move(a,b,c,d)},32)},hide:function(a){var b=this;clearTimeout(this.hideTimer);if(!this.isHidden)this.hideTimer=setTimeout(function(){b.label.fadeOut();b.isHidden=!0},p(a,this.options.hideDelay,500))},getAnchor:function(a,b){var c,d=this.chart,
+e=d.inverted,f=d.plotTop,g=d.plotLeft,h=0,i=0,j,k,a=sa(a);c=a[0].tooltipPos;this.followPointer&&b&&(b.chartX===y&&(b=d.pointer.normalize(b)),c=[b.chartX-d.plotLeft,b.chartY-f]);c||(o(a,function(a){j=a.series.yAxis;k=a.series.xAxis;h+=a.plotX+(!e&&k?k.left-g:0);i+=(a.plotLow?(a.plotLow+a.plotHigh)/2:a.plotY)+(!e&&j?j.top-f:0)}),h/=a.length,i/=a.length,c=[e?d.plotWidth-i:h,this.shared&&!e&&a.length>1&&b?b.chartY-f:e?d.plotHeight-h:i]);return Ua(c,s)},getPosition:function(a,b,c){var d=this.chart,e=this.distance,
+f={},g=c.h||0,h,i=["y",d.chartHeight,b,c.plotY+d.plotTop],j=["x",d.chartWidth,a,c.plotX+d.plotLeft],k=p(c.ttBelow,d.inverted&&!c.negative||!d.inverted&&c.negative),l=function(a,b,c,d){var h=c<d-e,i=d+e+c<b,j=d-e-c;d+=e;if(k&&i)f[a]=d;else if(!k&&h)f[a]=j;else if(h)f[a]=j-g<0?j:j-g;else if(i)f[a]=d+g+c>b?d:d+g;else return!1},m=function(a,b,c,d){if(d<e||d>b-e)return!1;else f[a]=d<c/2?1:d>b-c/2?b-c-2:d-c/2},n=function(a){var b=i;i=j;j=b;h=a},u=function(){l.apply(0,i)!==!1?m.apply(0,j)===!1&&!h&&(n(!0),
+u()):h?f.x=f.y=0:(n(!0),u())};(d.inverted||this.len>1)&&n();u();return f},defaultFormatter:function(a){var b=this.points||sa(this),c;c=[a.tooltipFooterHeaderFormatter(b[0])];c=c.concat(a.bodyFormatter(b));c.push(a.tooltipFooterHeaderFormatter(b[0],!0));return c.join("")},refresh:function(a,b){var c=this.chart,d=this.label,e=this.options,f,g,h,i={},j,k=[];j=e.formatter||this.defaultFormatter;var i=c.hoverPoints,l,m=this.shared;clearTimeout(this.hideTimer);this.followPointer=sa(a)[0].series.tooltipOptions.followPointer;
+h=this.getAnchor(a,b);f=h[0];g=h[1];m&&(!a.series||!a.series.noSharedTooltip)?(c.hoverPoints=a,i&&o(i,function(a){a.setState()}),o(a,function(a){a.setState("hover");k.push(a.getLabelConfig())}),i={x:a[0].category,y:a[0].y},i.points=k,this.len=k.length,a=a[0]):i=a.getLabelConfig();j=j.call(i,this);i=a.series;this.distance=p(i.tooltipOptions.distance,16);j===!1?this.hide():(this.isHidden&&(db(d),d.attr("opacity",1).show()),d.attr({text:j}),l=e.borderColor||a.color||i.color||"#606060",d.attr({stroke:l}),
+this.updatePosition({plotX:f,plotY:g,negative:a.negative,ttBelow:a.ttBelow,h:h[2]||0}),this.isHidden=!1);I(c,"tooltipRefresh",{text:j,x:f+c.plotLeft,y:g+c.plotTop,borderColor:l})},updatePosition:function(a){var b=this.chart,c=this.label,c=(this.options.positioner||this.getPosition).call(this,c.width,c.height,a);this.move(s(c.x),s(c.y||0),a.plotX+b.plotLeft,a.plotY+b.plotTop)},getXDateFormat:function(a,b,c){var d,b=b.dateTimeLabelFormats,e=c&&c.closestPointRange,f,g={millisecond:15,second:12,minute:9,
+hour:6,day:3},h,i="millisecond";if(e){h=Oa("%m-%d %H:%M:%S.%L",a.x);for(f in D){if(e===D.week&&+Oa("%w",a.x)===c.options.startOfWeek&&h.substr(6)==="00:00:00.000"){f="week";break}else if(D[f]>e){f=i;break}else if(g[f]&&h.substr(g[f])!=="01-01 00:00:00.000".substr(g[f]))break;f!=="week"&&(i=f)}f&&(d=b[f])}else d=b.day;return d||b.year},tooltipFooterHeaderFormatter:function(a,b){var c=b?"footer":"header",d=a.series,e=d.tooltipOptions,f=e.xDateFormat,g=d.xAxis,h=g&&g.options.type==="datetime"&&ra(a.key),
+c=e[c+"Format"];h&&!f&&(f=this.getXDateFormat(a,e,g));h&&f&&(c=c.replace("{point.key}","{point.key:"+f+"}"));return Ja(c,{point:a,series:d})},bodyFormatter:function(a){return Ua(a,function(a){var c=a.series.tooltipOptions;return(c.pointFormatter||a.point.tooltipFormatter).call(a.point,c.pointFormat)})}};var pa;ab=B.documentElement.ontouchstart!==y;var Va=z.Pointer=function(a,b){this.init(a,b)};Va.prototype={init:function(a,b){var c=b.chart,d=c.events,e=fa?"":c.zoomType,c=a.inverted,f;this.options=
+b;this.chart=a;this.zoomX=f=/x/.test(e);this.zoomY=e=/y/.test(e);this.zoomHor=f&&!c||e&&c;this.zoomVert=e&&!c||f&&c;this.hasZoom=f||e;this.runChartClick=d&&!!d.click;this.pinchDown=[];this.lastValidTouch={};if(z.Tooltip&&b.tooltip.enabled)a.tooltip=new Mb(a,b.tooltip),this.followTouchMove=p(b.tooltip.followTouchMove,!0);this.setDOMEvents()},normalize:function(a,b){var c,d,a=a||window.event,a=Sb(a);if(!a.target)a.target=a.srcElement;d=a.touches?a.touches.length?a.touches.item(0):a.changedTouches[0]:
+a;if(!b)this.chartPosition=b=Rb(this.chart.container);d.pageX===y?(c=v(a.x,a.clientX-b.left),d=a.y):(c=d.pageX-b.left,d=d.pageY-b.top);return x(a,{chartX:s(c),chartY:s(d)})},getCoordinates:function(a){var b={xAxis:[],yAxis:[]};o(this.chart.axes,function(c){b[c.isXAxis?"xAxis":"yAxis"].push({axis:c,value:c.toValue(a[c.horiz?"chartX":"chartY"])})});return b},runPointActions:function(a){var b=this.chart,c=b.series,d=b.tooltip,e=d?d.shared:!1,f=b.hoverPoint,g=b.hoverSeries,h,i=b.chartWidth,j,k,l=[],m,
+n;if(!e&&!g)for(h=0;h<c.length;h++)if(c[h].directTouch||!c[h].options.stickyTracking)c=[];!e&&g&&g.directTouch&&f?m=f:(o(c,function(b){j=b.noSharedTooltip&&e;k=!e&&b.directTouch;b.visible&&!j&&!k&&p(b.options.enableMouseTracking,!0)&&(n=b.searchPoint(a,!j&&b.kdDimensions===1))&&l.push(n)}),o(l,function(a){if(a&&typeof a.dist==="number"&&a.dist<i)i=a.dist,m=a}));if(m&&(m!==this.prevKDPoint||d&&d.isHidden)){if(e&&!m.series.noSharedTooltip){for(h=l.length;h--;)(l[h].clientX!==m.clientX||l[h].series.noSharedTooltip)&&
+l.splice(h,1);l.length&&d&&d.refresh(l,a);o(l,function(b){if(b!==m)b.onMouseOver(a)});(g&&g.directTouch&&f||m).onMouseOver(a)}else d&&d.refresh(m,a),m.onMouseOver(a);this.prevKDPoint=m}else c=g&&g.tooltipOptions.followPointer,d&&c&&!d.isHidden&&(c=d.getAnchor([{}],a),d.updatePosition({plotX:c[0],plotY:c[1]}));if(d&&!this._onDocumentMouseMove)this._onDocumentMouseMove=function(a){if(Y[pa])Y[pa].pointer.onDocumentMouseMove(a)},H(B,"mousemove",this._onDocumentMouseMove);o(b.axes,function(b){b.drawCrosshair(a,
+p(m,f))})},reset:function(a,b){var c=this.chart,d=c.hoverSeries,e=c.hoverPoint,f=c.hoverPoints,g=c.tooltip,h=g&&g.shared?f:e;(a=a&&g&&h)&&sa(h)[0].plotX===y&&(a=!1);if(a)g.refresh(h),e&&(e.setState(e.state,!0),o(c.axes,function(a){p(a.options.crosshair&&a.options.crosshair.snap,!0)?a.drawCrosshair(null,e):a.hideCrosshair()}));else{if(e)e.onMouseOut();f&&o(f,function(a){a.setState()});if(d)d.onMouseOut();g&&g.hide(b);if(this._onDocumentMouseMove)Z(B,"mousemove",this._onDocumentMouseMove),this._onDocumentMouseMove=
+null;o(c.axes,function(a){a.hideCrosshair()});this.hoverX=c.hoverPoints=c.hoverPoint=null}},scaleGroups:function(a,b){var c=this.chart,d;o(c.series,function(e){d=a||e.getPlotBox();e.xAxis&&e.xAxis.zoomEnabled&&(e.group.attr(d),e.markerGroup&&(e.markerGroup.attr(d),e.markerGroup.clip(b?c.clipRect:null)),e.dataLabelsGroup&&e.dataLabelsGroup.attr(d))});c.clipRect.attr(b||c.clipBox)},dragStart:function(a){var b=this.chart;b.mouseIsDown=a.type;b.cancelClick=!1;b.mouseDownX=this.mouseDownX=a.chartX;b.mouseDownY=
+this.mouseDownY=a.chartY},drag:function(a){var b=this.chart,c=b.options.chart,d=a.chartX,e=a.chartY,f=this.zoomHor,g=this.zoomVert,h=b.plotLeft,i=b.plotTop,j=b.plotWidth,k=b.plotHeight,l,m=this.mouseDownX,n=this.mouseDownY,u=c.panKey&&a[c.panKey+"Key"];d<h?d=h:d>h+j&&(d=h+j);e<i?e=i:e>i+k&&(e=i+k);this.hasDragged=Math.sqrt(Math.pow(m-d,2)+Math.pow(n-e,2));if(this.hasDragged>10){l=b.isInsidePlot(m-h,n-i);if(b.hasCartesianSeries&&(this.zoomX||this.zoomY)&&l&&!u&&!this.selectionMarker)this.selectionMarker=
+b.renderer.rect(h,i,f?1:j,g?1:k,0).attr({fill:c.selectionMarkerFill||"rgba(69,114,167,0.25)",zIndex:7}).add();this.selectionMarker&&f&&(d-=m,this.selectionMarker.attr({width:N(d),x:(d>0?0:d)+m}));this.selectionMarker&&g&&(d=e-n,this.selectionMarker.attr({height:N(d),y:(d>0?0:d)+n}));l&&!this.selectionMarker&&c.panning&&b.pan(a,c.panning)}},drop:function(a){var b=this,c=this.chart,d=this.hasPinched;if(this.selectionMarker){var e={xAxis:[],yAxis:[],originalEvent:a.originalEvent||a},f=this.selectionMarker,
+g=f.attr?f.attr("x"):f.x,h=f.attr?f.attr("y"):f.y,i=f.attr?f.attr("width"):f.width,j=f.attr?f.attr("height"):f.height,k;if(this.hasDragged||d)o(c.axes,function(c){if(c.zoomEnabled&&q(c.min)&&(d||b[{xAxis:"zoomX",yAxis:"zoomY"}[c.coll]])){var f=c.horiz,n=a.type==="touchend"?c.minPixelPadding:0,u=c.toValue((f?g:h)+n),f=c.toValue((f?g+i:h+j)-n);e[c.coll].push({axis:c,min:C(u,f),max:v(u,f)});k=!0}}),k&&I(c,"selection",e,function(a){c.zoom(x(a,d?{animation:!1}:null))});this.selectionMarker=this.selectionMarker.destroy();
+d&&this.scaleGroups()}if(c)L(c.container,{cursor:c._cursor}),c.cancelClick=this.hasDragged>10,c.mouseIsDown=this.hasDragged=this.hasPinched=!1,this.pinchDown=[]},onContainerMouseDown:function(a){a=this.normalize(a);a.preventDefault&&a.preventDefault();this.dragStart(a)},onDocumentMouseUp:function(a){Y[pa]&&Y[pa].pointer.drop(a)},onDocumentMouseMove:function(a){var b=this.chart,c=this.chartPosition,a=this.normalize(a,c);c&&!this.inClass(a.target,"highcharts-tracker")&&!b.isInsidePlot(a.chartX-b.plotLeft,
+a.chartY-b.plotTop)&&this.reset()},onContainerMouseLeave:function(){var a=Y[pa];if(a)a.pointer.reset(),a.pointer.chartPosition=null},onContainerMouseMove:function(a){var b=this.chart;pa=b.index;a=this.normalize(a);a.returnValue=!1;b.mouseIsDown==="mousedown"&&this.drag(a);(this.inClass(a.target,"highcharts-tracker")||b.isInsidePlot(a.chartX-b.plotLeft,a.chartY-b.plotTop))&&!b.openMenu&&this.runPointActions(a)},inClass:function(a,b){for(var c;a;){if(c=J(a,"class"))if(c.indexOf(b)!==-1)return!0;else if(c.indexOf("highcharts-container")!==
+-1)return!1;a=a.parentNode}},onTrackerMouseOut:function(a){var b=this.chart.hoverSeries,c=(a=a.relatedTarget||a.toElement)&&a.point&&a.point.series;if(b&&!b.options.stickyTracking&&!this.inClass(a,"highcharts-tooltip")&&c!==b)b.onMouseOut()},onContainerClick:function(a){var b=this.chart,c=b.hoverPoint,d=b.plotLeft,e=b.plotTop,a=this.normalize(a);a.originalEvent=a;b.cancelClick||(c&&this.inClass(a.target,"highcharts-tracker")?(I(c.series,"click",x(a,{point:c})),b.hoverPoint&&c.firePointEvent("click",
+a)):(x(a,this.getCoordinates(a)),b.isInsidePlot(a.chartX-d,a.chartY-e)&&I(b,"click",a)))},setDOMEvents:function(){var a=this,b=a.chart.container;b.onmousedown=function(b){a.onContainerMouseDown(b)};b.onmousemove=function(b){a.onContainerMouseMove(b)};b.onclick=function(b){a.onContainerClick(b)};H(b,"mouseleave",a.onContainerMouseLeave);bb===1&&H(B,"mouseup",a.onDocumentMouseUp);if(ab)b.ontouchstart=function(b){a.onContainerTouchStart(b)},b.ontouchmove=function(b){a.onContainerTouchMove(b)},bb===1&&
+H(B,"touchend",a.onDocumentTouchEnd)},destroy:function(){var a;Z(this.chart.container,"mouseleave",this.onContainerMouseLeave);bb||(Z(B,"mouseup",this.onDocumentMouseUp),Z(B,"touchend",this.onDocumentTouchEnd));clearInterval(this.tooltipTimeout);for(a in this)this[a]=null}};x(z.Pointer.prototype,{pinchTranslate:function(a,b,c,d,e,f){(this.zoomHor||this.pinchHor)&&this.pinchTranslateDirection(!0,a,b,c,d,e,f);(this.zoomVert||this.pinchVert)&&this.pinchTranslateDirection(!1,a,b,c,d,e,f)},pinchTranslateDirection:function(a,
+b,c,d,e,f,g,h){var i=this.chart,j=a?"x":"y",k=a?"X":"Y",l="chart"+k,m=a?"width":"height",n=i["plot"+(a?"Left":"Top")],u,r,p=h||1,o=i.inverted,t=i.bounds[a?"h":"v"],w=b.length===1,q=b[0][l],v=c[0][l],s=!w&&b[1][l],y=!w&&c[1][l],x,c=function(){!w&&N(q-s)>20&&(p=h||N(v-y)/N(q-s));r=(n-v)/p+q;u=i["plot"+(a?"Width":"Height")]/p};c();b=r;b<t.min?(b=t.min,x=!0):b+u>t.max&&(b=t.max-u,x=!0);x?(v-=0.8*(v-g[j][0]),w||(y-=0.8*(y-g[j][1])),c()):g[j]=[v,y];o||(f[j]=r-n,f[m]=u);f=o?1/p:p;e[m]=u;e[j]=b;d[o?a?"scaleY":
+"scaleX":"scale"+k]=p;d["translate"+k]=f*n+(v-f*q)},pinch:function(a){var b=this,c=b.chart,d=b.pinchDown,e=a.touches,f=e.length,g=b.lastValidTouch,h=b.hasZoom,i=b.selectionMarker,j={},k=f===1&&(b.inClass(a.target,"highcharts-tracker")&&c.runTrackerClick||b.runChartClick),l={};if(f>1)b.initiated=!0;h&&b.initiated&&!k&&a.preventDefault();Ua(e,function(a){return b.normalize(a)});if(a.type==="touchstart")o(e,function(a,b){d[b]={chartX:a.chartX,chartY:a.chartY}}),g.x=[d[0].chartX,d[1]&&d[1].chartX],g.y=
+[d[0].chartY,d[1]&&d[1].chartY],o(c.axes,function(a){if(a.zoomEnabled){var b=c.bounds[a.horiz?"h":"v"],d=a.minPixelPadding,e=a.toPixels(p(a.options.min,a.dataMin)),f=a.toPixels(p(a.options.max,a.dataMax)),g=C(e,f),e=v(e,f);b.min=C(a.pos,g-d);b.max=v(a.pos+a.len,e+d)}}),b.res=!0;else if(d.length){if(!i)b.selectionMarker=i=x({destroy:na},c.plotBox);b.pinchTranslate(d,e,j,i,l,g);b.hasPinched=h;b.scaleGroups(j,l);if(!h&&b.followTouchMove&&f===1)this.runPointActions(b.normalize(a));else if(b.res)b.res=
+!1,this.reset(!1,0)}},touch:function(a,b){var c=this.chart;pa=c.index;a.touches.length===1?(a=this.normalize(a),c.isInsidePlot(a.chartX-c.plotLeft,a.chartY-c.plotTop)&&!c.openMenu?(b&&this.runPointActions(a),this.pinch(a)):b&&this.reset()):a.touches.length===2&&this.pinch(a)},onContainerTouchStart:function(a){this.touch(a,!0)},onContainerTouchMove:function(a){this.touch(a)},onDocumentTouchEnd:function(a){Y[pa]&&Y[pa].pointer.drop(a)}});if(K.PointerEvent||K.MSPointerEvent){var wa={},Ab=!!K.PointerEvent,
+Wb=function(){var a,b=[];b.item=function(a){return this[a]};for(a in wa)wa.hasOwnProperty(a)&&b.push({pageX:wa[a].pageX,pageY:wa[a].pageY,target:wa[a].target});return b},Bb=function(a,b,c,d){a=a.originalEvent||a;if((a.pointerType==="touch"||a.pointerType===a.MSPOINTER_TYPE_TOUCH)&&Y[pa])d(a),d=Y[pa].pointer,d[b]({type:c,target:a.currentTarget,preventDefault:na,touches:Wb()})};x(Va.prototype,{onContainerPointerDown:function(a){Bb(a,"onContainerTouchStart","touchstart",function(a){wa[a.pointerId]={pageX:a.pageX,
+pageY:a.pageY,target:a.currentTarget}})},onContainerPointerMove:function(a){Bb(a,"onContainerTouchMove","touchmove",function(a){wa[a.pointerId]={pageX:a.pageX,pageY:a.pageY};if(!wa[a.pointerId].target)wa[a.pointerId].target=a.currentTarget})},onDocumentPointerUp:function(a){Bb(a,"onDocumentTouchEnd","touchend",function(a){delete wa[a.pointerId]})},batchMSEvents:function(a){a(this.chart.container,Ab?"pointerdown":"MSPointerDown",this.onContainerPointerDown);a(this.chart.container,Ab?"pointermove":
+"MSPointerMove",this.onContainerPointerMove);a(B,Ab?"pointerup":"MSPointerUp",this.onDocumentPointerUp)}});cb(Va.prototype,"init",function(a,b,c){a.call(this,b,c);this.hasZoom&&L(b.container,{"-ms-touch-action":O,"touch-action":O})});cb(Va.prototype,"setDOMEvents",function(a){a.apply(this);(this.hasZoom||this.followTouchMove)&&this.batchMSEvents(H)});cb(Va.prototype,"destroy",function(a){this.batchMSEvents(Z);a.call(this)})}var nb=z.Legend=function(a,b){this.init(a,b)};nb.prototype={init:function(a,
+b){var c=this,d=b.itemStyle,e=b.itemMarginTop||0;this.options=b;if(b.enabled)c.itemStyle=d,c.itemHiddenStyle=A(d,b.itemHiddenStyle),c.itemMarginTop=e,c.padding=d=p(b.padding,8),c.initialItemX=d,c.initialItemY=d-5,c.maxItemWidth=0,c.chart=a,c.itemHeight=0,c.symbolWidth=p(b.symbolWidth,16),c.pages=[],c.render(),H(c.chart,"endResize",function(){c.positionCheckboxes()})},colorizeItem:function(a,b){var c=this.options,d=a.legendItem,e=a.legendLine,f=a.legendSymbol,g=this.itemHiddenStyle.color,c=b?c.itemStyle.color:
+g,h=b?a.legendColor||a.color||"#CCC":g,g=a.options&&a.options.marker,i={fill:h},j;d&&d.css({fill:c,color:c});e&&e.attr({stroke:h});if(f){if(g&&f.isMarker)for(j in i.stroke=h,g=a.convertAttribs(g),g)d=g[j],d!==y&&(i[j]=d);f.attr(i)}},positionItem:function(a){var b=this.options,c=b.symbolPadding,b=!b.rtl,d=a._legendItemPos,e=d[0],d=d[1],f=a.checkbox;(a=a.legendGroup)&&a.element&&a.translate(b?e:this.legendWidth-e-2*c-4,d);if(f)f.x=e,f.y=d},destroyItem:function(a){var b=a.checkbox;o(["legendItem","legendLine",
+"legendSymbol","legendGroup"],function(b){a[b]&&(a[b]=a[b].destroy())});b&&Ra(a.checkbox)},destroy:function(){var a=this.group,b=this.box;if(b)this.box=b.destroy();if(a)this.group=a.destroy()},positionCheckboxes:function(a){var b=this.group.alignAttr,c,d=this.clipHeight||this.legendHeight;if(b)c=b.translateY,o(this.allItems,function(e){var f=e.checkbox,g;f&&(g=c+f.y+(a||0)+3,L(f,{left:b.translateX+e.checkboxOffset+f.x-20+"px",top:g+"px",display:g>c-6&&g<c+d-6?"":O}))})},renderTitle:function(){var a=
+this.padding,b=this.options.title,c=0;if(b.text){if(!this.title)this.title=this.chart.renderer.label(b.text,a-3,a-4,null,null,null,null,null,"legend-title").attr({zIndex:1}).css(b.style).add(this.group);a=this.title.getBBox();c=a.height;this.offsetWidth=a.width;this.contentGroup.attr({translateY:c})}this.titleHeight=c},setText:function(a){var b=this.options;a.legendItem.attr({text:b.labelFormat?Ja(b.labelFormat,a):b.labelFormatter.call(a)})},renderItem:function(a){var b=this.chart,c=b.renderer,d=
+this.options,e=d.layout==="horizontal",f=this.symbolWidth,g=d.symbolPadding,h=this.itemStyle,i=this.itemHiddenStyle,j=this.padding,k=e?p(d.itemDistance,20):0,l=!d.rtl,m=d.width,n=d.itemMarginBottom||0,u=this.itemMarginTop,r=this.initialItemX,o=a.legendItem,q=a.series&&a.series.drawLegendSymbol?a.series:a,t=q.options,t=this.createCheckboxForItem&&t&&t.showCheckbox,w=d.useHTML;if(!o){a.legendGroup=c.g("legend-item").attr({zIndex:1}).add(this.scrollGroup);a.legendItem=o=c.text("",l?f+g:-g,this.baseline||
+0,w).css(A(a.visible?h:i)).attr({align:l?"left":"right",zIndex:2}).add(a.legendGroup);if(!this.baseline)this.fontMetrics=c.fontMetrics(h.fontSize,o),this.baseline=this.fontMetrics.f+3+u,o.attr("y",this.baseline);q.drawLegendSymbol(this,a);this.setItemEvents&&this.setItemEvents(a,o,w,h,i);this.colorizeItem(a,a.visible);t&&this.createCheckboxForItem(a)}this.setText(a);c=o.getBBox();f=a.checkboxOffset=d.itemWidth||a.legendItemWidth||f+g+c.width+k+(t?20:0);this.itemHeight=g=s(a.legendItemHeight||c.height);
+if(e&&this.itemX-r+f>(m||b.chartWidth-2*j-r-d.x))this.itemX=r,this.itemY+=u+this.lastLineHeight+n,this.lastLineHeight=0;this.maxItemWidth=v(this.maxItemWidth,f);this.lastItemY=u+this.itemY+n;this.lastLineHeight=v(g,this.lastLineHeight);a._legendItemPos=[this.itemX,this.itemY];e?this.itemX+=f:(this.itemY+=u+g+n,this.lastLineHeight=g);this.offsetWidth=m||v((e?this.itemX-r-k:f)+j,this.offsetWidth)},getAllItems:function(){var a=[];o(this.chart.series,function(b){var c=b.options;if(p(c.showInLegend,!q(c.linkedTo)?
+y:!1,!0))a=a.concat(b.legendItems||(c.legendType==="point"?b.data:b))});return a},adjustMargins:function(a,b){var c=this.chart,d=this.options,e=d.align[0]+d.verticalAlign[0]+d.layout[0];this.display&&!d.floating&&o([/(lth|ct|rth)/,/(rtv|rm|rbv)/,/(rbh|cb|lbh)/,/(lbv|lm|ltv)/],function(f,g){f.test(e)&&!q(a[g])&&(c[jb[g]]=v(c[jb[g]],c.legend[(g+1)%2?"legendHeight":"legendWidth"]+[1,-1,-1,1][g]*d[g%2?"x":"y"]+p(d.margin,12)+b[g]))})},render:function(){var a=this,b=a.chart,c=b.renderer,d=a.group,e,f,
+g,h,i=a.box,j=a.options,k=a.padding,l=j.borderWidth,m=j.backgroundColor;a.itemX=a.initialItemX;a.itemY=a.initialItemY;a.offsetWidth=0;a.lastItemY=0;if(!d)a.group=d=c.g("legend").attr({zIndex:7}).add(),a.contentGroup=c.g().attr({zIndex:1}).add(d),a.scrollGroup=c.g().add(a.contentGroup);a.renderTitle();e=a.getAllItems();rb(e,function(a,b){return(a.options&&a.options.legendIndex||0)-(b.options&&b.options.legendIndex||0)});j.reversed&&e.reverse();a.allItems=e;a.display=f=!!e.length;a.lastLineHeight=0;
+o(e,function(b){a.renderItem(b)});g=(j.width||a.offsetWidth)+k;h=a.lastItemY+a.lastLineHeight+a.titleHeight;h=a.handleOverflow(h);h+=k;if(l||m){if(i){if(g>0&&h>0)i[i.isNew?"attr":"animate"](i.crisp({width:g,height:h})),i.isNew=!1}else a.box=i=c.rect(0,0,g,h,j.borderRadius,l||0).attr({stroke:j.borderColor,"stroke-width":l||0,fill:m||O}).add(d).shadow(j.shadow),i.isNew=!0;i[f?"show":"hide"]()}a.legendWidth=g;a.legendHeight=h;o(e,function(b){a.positionItem(b)});f&&d.align(x({width:g,height:h},j),!0,
+"spacingBox");b.isResizing||this.positionCheckboxes()},handleOverflow:function(a){var b=this,c=this.chart,d=c.renderer,e=this.options,f=e.y,f=c.spacingBox.height+(e.verticalAlign==="top"?-f:f)-this.padding,g=e.maxHeight,h,i=this.clipRect,j=e.navigation,k=p(j.animation,!0),l=j.arrowSize||12,m=this.nav,n=this.pages,u,r=this.allItems;e.layout==="horizontal"&&(f/=2);g&&(f=C(f,g));n.length=0;if(a>f&&!e.useHTML){this.clipHeight=h=v(f-20-this.titleHeight-this.padding,0);this.currentPage=p(this.currentPage,
+1);this.fullHeight=a;o(r,function(a,b){var c=a._legendItemPos[1],d=s(a.legendItem.getBBox().height),e=n.length;if(!e||c-n[e-1]>h&&(u||c)!==n[e-1])n.push(u||c),e++;b===r.length-1&&c+d-n[e-1]>h&&n.push(c);c!==u&&(u=c)});if(!i)i=b.clipRect=d.clipRect(0,this.padding,9999,0),b.contentGroup.clip(i);i.attr({height:h});if(!m)this.nav=m=d.g().attr({zIndex:1}).add(this.group),this.up=d.symbol("triangle",0,0,l,l).on("click",function(){b.scroll(-1,k)}).add(m),this.pager=d.text("",15,10).css(j.style).add(m),this.down=
+d.symbol("triangle-down",0,0,l,l).on("click",function(){b.scroll(1,k)}).add(m);b.scroll(0);a=f}else if(m)i.attr({height:c.chartHeight}),m.hide(),this.scrollGroup.attr({translateY:1}),this.clipHeight=0;return a},scroll:function(a,b){var c=this.pages,d=c.length,e=this.currentPage+a,f=this.clipHeight,g=this.options.navigation,h=g.activeColor,g=g.inactiveColor,i=this.pager,j=this.padding;e>d&&(e=d);if(e>0)b!==y&&Sa(b,this.chart),this.nav.attr({translateX:j,translateY:f+this.padding+7+this.titleHeight,
+visibility:"visible"}),this.up.attr({fill:e===1?g:h}).css({cursor:e===1?"default":"pointer"}),i.attr({text:e+"/"+d}),this.down.attr({x:18+this.pager.getBBox().width,fill:e===d?g:h}).css({cursor:e===d?"default":"pointer"}),c=-c[e-1]+this.initialItemY,this.scrollGroup.animate({translateY:c}),this.currentPage=e,this.positionCheckboxes(c)}};Na=z.LegendSymbolMixin={drawRectangle:function(a,b){var c=a.options.symbolHeight||a.fontMetrics.f;b.legendSymbol=this.chart.renderer.rect(0,a.baseline-c+1,a.symbolWidth,
+c,a.options.symbolRadius||0).attr({zIndex:3}).add(b.legendGroup)},drawLineMarker:function(a){var b=this.options,c=b.marker,d;d=a.symbolWidth;var e=this.chart.renderer,f=this.legendGroup,a=a.baseline-s(a.fontMetrics.b*0.3),g;if(b.lineWidth){g={"stroke-width":b.lineWidth};if(b.dashStyle)g.dashstyle=b.dashStyle;this.legendLine=e.path(["M",0,a,"L",d,a]).attr(g).add(f)}if(c&&c.enabled!==!1)b=c.radius,this.legendSymbol=d=e.symbol(this.symbol,d/2-b,a-b,2*b,2*b).add(f),d.isMarker=!0}};(/Trident\/7\.0/.test(Ba)||
+La)&&cb(nb.prototype,"positionItem",function(a,b){var c=this,d=function(){b._legendItemPos&&a.call(c,b)};d();setTimeout(d)});E=z.Chart=function(){this.init.apply(this,arguments)};E.prototype={callbacks:[],init:function(a,b){var c,d=a.series;a.series=null;c=A(T,a);c.series=a.series=d;this.userOptions=a;d=c.chart;this.margin=this.splashArray("margin",d);this.spacing=this.splashArray("spacing",d);var e=d.events;this.bounds={h:{},v:{}};this.callback=b;this.isResizing=0;this.options=c;this.axes=[];this.series=
+[];this.hasCartesianSeries=d.showAxes;var f=this,g;f.index=Y.length;Y.push(f);bb++;d.reflow!==!1&&H(f,"load",function(){f.initReflow()});if(e)for(g in e)H(f,g,e[g]);f.xAxis=[];f.yAxis=[];f.animation=fa?!1:p(d.animation,!0);f.pointCount=f.colorCounter=f.symbolCounter=0;f.firstRender()},initSeries:function(a){var b=this.options.chart;(b=M[a.type||b.type||b.defaultSeriesType])||la(17,!0);b=new b;b.init(this,a);return b},isInsidePlot:function(a,b,c){var d=c?b:a,a=c?a:b;return d>=0&&d<=this.plotWidth&&
+a>=0&&a<=this.plotHeight},redraw:function(a){var b=this.axes,c=this.series,d=this.pointer,e=this.legend,f=this.isDirtyLegend,g,h,i=this.hasCartesianSeries,j=this.isDirtyBox,k=c.length,l=k,m=this.renderer,n=m.isHidden(),p=[];Sa(a,this);n&&this.cloneRenderTo();for(this.layOutTitles();l--;)if(a=c[l],a.options.stacking&&(g=!0,a.isDirty)){h=!0;break}if(h)for(l=k;l--;)if(a=c[l],a.options.stacking)a.isDirty=!0;o(c,function(a){a.isDirty&&a.options.legendType==="point"&&(a.updateTotals&&a.updateTotals(),f=
+!0)});if(f&&e.options.enabled)e.render(),this.isDirtyLegend=!1;g&&this.getStacks();if(i&&!this.isResizing)this.maxTicks=null,o(b,function(a){a.setScale()});this.getMargins();i&&(o(b,function(a){a.isDirty&&(j=!0)}),o(b,function(a){if(a.isDirtyExtremes)a.isDirtyExtremes=!1,p.push(function(){I(a,"afterSetExtremes",x(a.eventArgs,a.getExtremes()));delete a.eventArgs});(j||g)&&a.redraw()}));j&&this.drawChartBox();o(c,function(a){a.isDirty&&a.visible&&(!a.isCartesian||a.xAxis)&&a.redraw()});d&&d.reset(!0);
+m.draw();I(this,"redraw");n&&this.cloneRenderTo(!0);o(p,function(a){a.call()})},get:function(a){var b=this.axes,c=this.series,d,e;for(d=0;d<b.length;d++)if(b[d].options.id===a)return b[d];for(d=0;d<c.length;d++)if(c[d].options.id===a)return c[d];for(d=0;d<c.length;d++){e=c[d].points||[];for(b=0;b<e.length;b++)if(e[b].id===a)return e[b]}return null},getAxes:function(){var a=this,b=this.options,c=b.xAxis=sa(b.xAxis||{}),b=b.yAxis=sa(b.yAxis||{});o(c,function(a,b){a.index=b;a.isX=!0});o(b,function(a,
+b){a.index=b});c=c.concat(b);o(c,function(b){new va(a,b)})},getSelectedPoints:function(){var a=[];o(this.series,function(b){a=a.concat(lb(b.points||[],function(a){return a.selected}))});return a},getSelectedSeries:function(){return lb(this.series,function(a){return a.selected})},getStacks:function(){var a=this;o(a.yAxis,function(a){if(a.stacks&&a.hasVisibleSeries)a.oldStacks=a.stacks});o(a.series,function(b){if(b.options.stacking&&(b.visible===!0||a.options.chart.ignoreHiddenSeries===!1))b.stackKey=
+b.type+p(b.options.stack,"")})},setTitle:function(a,b,c){var g;var d=this,e=d.options,f;f=e.title=A(e.title,a);g=e.subtitle=A(e.subtitle,b),e=g;o([["title",a,f],["subtitle",b,e]],function(a){var b=a[0],c=d[b],e=a[1],a=a[2];c&&e&&(d[b]=c=c.destroy());a&&a.text&&!c&&(d[b]=d.renderer.text(a.text,0,0,a.useHTML).attr({align:a.align,"class":"highcharts-"+b,zIndex:a.zIndex||4}).css(a.style).add())});d.layOutTitles(c)},layOutTitles:function(a){var b=0,c=this.title,d=this.subtitle,e=this.options,f=e.title,
+e=e.subtitle,g=this.renderer,h=this.spacingBox.width-44;if(c&&(c.css({width:(f.width||h)+"px"}).align(x({y:g.fontMetrics(f.style.fontSize,c).b-3},f),!1,"spacingBox"),!f.floating&&!f.verticalAlign))b=c.getBBox().height;d&&(d.css({width:(e.width||h)+"px"}).align(x({y:b+(f.margin-13)+g.fontMetrics(f.style.fontSize,d).b},e),!1,"spacingBox"),!e.floating&&!e.verticalAlign&&(b=ta(b+d.getBBox().height)));c=this.titleOffset!==b;this.titleOffset=b;if(!this.isDirtyBox&&c)this.isDirtyBox=c,this.hasRendered&&
+p(a,!0)&&this.isDirtyBox&&this.redraw()},getChartSize:function(){var a=this.options.chart,b=a.width,a=a.height,c=this.renderToClone||this.renderTo;if(!q(b))this.containerWidth=kb(c,"width");if(!q(a))this.containerHeight=kb(c,"height");this.chartWidth=v(0,b||this.containerWidth||600);this.chartHeight=v(0,p(a,this.containerHeight>19?this.containerHeight:400))},cloneRenderTo:function(a){var b=this.renderToClone,c=this.container;a?b&&(this.renderTo.appendChild(c),Ra(b),delete this.renderToClone):(c&&
+c.parentNode===this.renderTo&&this.renderTo.removeChild(c),this.renderToClone=b=this.renderTo.cloneNode(0),L(b,{position:"absolute",top:"-9999px",display:"block"}),b.style.setProperty&&b.style.setProperty("display","block","important"),B.body.appendChild(b),c&&b.appendChild(c))},getContainer:function(){var a,b=this.options.chart,c,d,e;this.renderTo=a=b.renderTo;e="highcharts-"+yb++;if(Da(a))this.renderTo=a=B.getElementById(a);a||la(13,!0);c=F(J(a,"data-highcharts-chart"));!isNaN(c)&&Y[c]&&Y[c].hasRendered&&
+Y[c].destroy();J(a,"data-highcharts-chart",this.index);a.innerHTML="";!b.skipClone&&!a.offsetWidth&&this.cloneRenderTo();this.getChartSize();c=this.chartWidth;d=this.chartHeight;this.container=a=$(Ka,{className:"highcharts-container"+(b.className?" "+b.className:""),id:e},x({position:"relative",overflow:"hidden",width:c+"px",height:d+"px",textAlign:"left",lineHeight:"normal",zIndex:0,"-webkit-tap-highlight-color":"rgba(0,0,0,0)"},b.style),this.renderToClone||a);this._cursor=a.style.cursor;this.renderer=
+b.forExport?new ua(a,c,d,b.style,!0):new $a(a,c,d,b.style);fa&&this.renderer.create(this,a,c,d);this.renderer.chartIndex=this.index},getMargins:function(a){var b=this.spacing,c=this.margin,d=this.titleOffset;this.resetMargins();if(d&&!q(c[0]))this.plotTop=v(this.plotTop,d+this.options.title.margin+b[0]);this.legend.adjustMargins(c,b);this.extraBottomMargin&&(this.marginBottom+=this.extraBottomMargin);this.extraTopMargin&&(this.plotTop+=this.extraTopMargin);a||this.getAxisMargins()},getAxisMargins:function(){var a=
+this,b=a.axisOffset=[0,0,0,0],c=a.margin;a.hasCartesianSeries&&o(a.axes,function(a){a.getOffset()});o(jb,function(d,e){q(c[e])||(a[d]+=b[e])});a.setChartSize()},reflow:function(a){var b=this,c=b.options.chart,d=b.renderTo,e=c.width||kb(d,"width"),f=c.height||kb(d,"height"),c=a?a.target:K,d=function(){if(b.container)b.setSize(e,f,!1),b.hasUserSize=null};if(!b.hasUserSize&&!b.isPrinting&&e&&f&&(c===K||c===B)){if(e!==b.containerWidth||f!==b.containerHeight)clearTimeout(b.reflowTimeout),a?b.reflowTimeout=
+setTimeout(d,100):d();b.containerWidth=e;b.containerHeight=f}},initReflow:function(){var a=this,b=function(b){a.reflow(b)};H(K,"resize",b);H(a,"destroy",function(){Z(K,"resize",b)})},setSize:function(a,b,c){var d=this,e,f,g;d.isResizing+=1;g=function(){d&&I(d,"endResize",null,function(){d.isResizing-=1})};Sa(c,d);d.oldChartHeight=d.chartHeight;d.oldChartWidth=d.chartWidth;if(q(a))d.chartWidth=e=v(0,s(a)),d.hasUserSize=!!e;if(q(b))d.chartHeight=f=v(0,s(b));(za?mb:L)(d.container,{width:e+"px",height:f+
+"px"},za);d.setChartSize(!0);d.renderer.setSize(e,f,c);d.maxTicks=null;o(d.axes,function(a){a.isDirty=!0;a.setScale()});o(d.series,function(a){a.isDirty=!0});d.isDirtyLegend=!0;d.isDirtyBox=!0;d.layOutTitles();d.getMargins();d.redraw(c);d.oldChartHeight=null;I(d,"resize");za===!1?g():setTimeout(g,za&&za.duration||500)},setChartSize:function(a){var b=this.inverted,c=this.renderer,d=this.chartWidth,e=this.chartHeight,f=this.options.chart,g=this.spacing,h=this.clipOffset,i,j,k,l;this.plotLeft=i=s(this.plotLeft);
+this.plotTop=j=s(this.plotTop);this.plotWidth=k=v(0,s(d-i-this.marginRight));this.plotHeight=l=v(0,s(e-j-this.marginBottom));this.plotSizeX=b?l:k;this.plotSizeY=b?k:l;this.plotBorderWidth=f.plotBorderWidth||0;this.spacingBox=c.spacingBox={x:g[3],y:g[0],width:d-g[3]-g[1],height:e-g[0]-g[2]};this.plotBox=c.plotBox={x:i,y:j,width:k,height:l};d=2*V(this.plotBorderWidth/2);b=ta(v(d,h[3])/2);c=ta(v(d,h[0])/2);this.clipBox={x:b,y:c,width:V(this.plotSizeX-v(d,h[1])/2-b),height:v(0,V(this.plotSizeY-v(d,h[2])/
+2-c))};a||o(this.axes,function(a){a.setAxisSize();a.setAxisTranslation()})},resetMargins:function(){var a=this;o(jb,function(b,c){a[b]=p(a.margin[c],a.spacing[c])});a.axisOffset=[0,0,0,0];a.clipOffset=[0,0,0,0]},drawChartBox:function(){var a=this.options.chart,b=this.renderer,c=this.chartWidth,d=this.chartHeight,e=this.chartBackground,f=this.plotBackground,g=this.plotBorder,h=this.plotBGImage,i=a.borderWidth||0,j=a.backgroundColor,k=a.plotBackgroundColor,l=a.plotBackgroundImage,m=a.plotBorderWidth||
+0,n,p=this.plotLeft,o=this.plotTop,q=this.plotWidth,v=this.plotHeight,t=this.plotBox,w=this.clipRect,s=this.clipBox;n=i+(a.shadow?8:0);if(i||j)if(e)e.animate(e.crisp({width:c-n,height:d-n}));else{e={fill:j||O};if(i)e.stroke=a.borderColor,e["stroke-width"]=i;this.chartBackground=b.rect(n/2,n/2,c-n,d-n,a.borderRadius,i).attr(e).addClass("highcharts-background").add().shadow(a.shadow)}if(k)f?f.animate(t):this.plotBackground=b.rect(p,o,q,v,0).attr({fill:k}).add().shadow(a.plotShadow);if(l)h?h.animate(t):
+this.plotBGImage=b.image(l,p,o,q,v).add();w?w.animate({width:s.width,height:s.height}):this.clipRect=b.clipRect(s);if(m)g?g.animate(g.crisp({x:p,y:o,width:q,height:v,strokeWidth:-m})):this.plotBorder=b.rect(p,o,q,v,0,-m).attr({stroke:a.plotBorderColor,"stroke-width":m,fill:O,zIndex:1}).add();this.isDirtyBox=!1},propFromSeries:function(){var a=this,b=a.options.chart,c,d=a.options.series,e,f;o(["inverted","angular","polar"],function(g){c=M[b.type||b.defaultSeriesType];f=a[g]||b[g]||c&&c.prototype[g];
+for(e=d&&d.length;!f&&e--;)(c=M[d[e].type])&&c.prototype[g]&&(f=!0);a[g]=f})},linkSeries:function(){var a=this,b=a.series;o(b,function(a){a.linkedSeries.length=0});o(b,function(b){var d=b.options.linkedTo;if(Da(d)&&(d=d===":previous"?a.series[b.index-1]:a.get(d)))d.linkedSeries.push(b),b.linkedParent=d})},renderSeries:function(){o(this.series,function(a){a.translate();a.render()})},renderLabels:function(){var a=this,b=a.options.labels;b.items&&o(b.items,function(c){var d=x(b.style,c.style),e=F(d.left)+
+a.plotLeft,f=F(d.top)+a.plotTop+12;delete d.left;delete d.top;a.renderer.text(c.html,e,f).attr({zIndex:2}).css(d).add()})},render:function(){var a=this.axes,b=this.renderer,c=this.options,d,e,f,g;this.setTitle();this.legend=new nb(this,c.legend);this.getStacks();this.getMargins(!0);this.setChartSize();d=this.plotWidth;e=this.plotHeight-=13;o(a,function(a){a.setScale()});this.getAxisMargins();f=d/this.plotWidth>1.1;g=e/this.plotHeight>1.1;if(f||g)this.maxTicks=null,o(a,function(a){(a.horiz&&f||!a.horiz&&
+g)&&a.setTickInterval(!0)}),this.getMargins();this.drawChartBox();this.hasCartesianSeries&&o(a,function(a){a.render()});if(!this.seriesGroup)this.seriesGroup=b.g("series-group").attr({zIndex:3}).add();this.renderSeries();this.renderLabels();this.showCredits(c.credits);this.hasRendered=!0},showCredits:function(a){if(a.enabled&&!this.credits)this.credits=this.renderer.text(a.text,0,0).on("click",function(){if(a.href)location.href=a.href}).attr({align:a.position.align,zIndex:8}).css(a.style).add().align(a.position)},
+destroy:function(){var a=this,b=a.axes,c=a.series,d=a.container,e,f=d&&d.parentNode;I(a,"destroy");Y[a.index]=y;bb--;a.renderTo.removeAttribute("data-highcharts-chart");Z(a);for(e=b.length;e--;)b[e]=b[e].destroy();for(e=c.length;e--;)c[e]=c[e].destroy();o("title,subtitle,chartBackground,plotBackground,plotBGImage,plotBorder,seriesGroup,clipRect,credits,pointer,scroller,rangeSelector,legend,resetZoomButton,tooltip,renderer".split(","),function(b){var c=a[b];c&&c.destroy&&(a[b]=c.destroy())});if(d)d.innerHTML=
+"",Z(d),f&&Ra(d);for(e in a)delete a[e]},isReadyToRender:function(){var a=this;return!ca&&K==K.top&&B.readyState!=="complete"||fa&&!K.canvg?(fa?Lb.push(function(){a.firstRender()},a.options.global.canvasToolsURL):B.attachEvent("onreadystatechange",function(){B.detachEvent("onreadystatechange",a.firstRender);B.readyState==="complete"&&a.firstRender()}),!1):!0},firstRender:function(){var a=this,b=a.options,c=a.callback;if(a.isReadyToRender()){a.getContainer();I(a,"init");a.resetMargins();a.setChartSize();
+a.propFromSeries();a.getAxes();o(b.series||[],function(b){a.initSeries(b)});a.linkSeries();I(a,"beforeRender");if(z.Pointer)a.pointer=new Va(a,b);a.render();a.renderer.draw();c&&c.apply(a,[a]);o(a.callbacks,function(b){a.index!==y&&b.apply(a,[a])});I(a,"load");a.cloneRenderTo(!0)}},splashArray:function(a,b){var c=b[a],c=da(c)?c:[c,c,c,c];return[p(b[a+"Top"],c[0]),p(b[a+"Right"],c[1]),p(b[a+"Bottom"],c[2]),p(b[a+"Left"],c[3])]}};var Xb=z.CenteredSeriesMixin={getCenter:function(){var a=this.options,
+b=this.chart,c=2*(a.slicedOffset||0),d=b.plotWidth-2*c,b=b.plotHeight-2*c,e=a.center,e=[p(e[0],"50%"),p(e[1],"50%"),a.size||"100%",a.innerSize||0],f=C(d,b),g,h;for(g=0;g<4;++g)h=e[g],a=g<2||g===2&&/%$/.test(h),e[g]=(/%$/.test(h)?[d,b,f,e[2]][g]*parseFloat(h)/100:parseFloat(h))+(a?c:0);return e}},Ga=function(){};Ga.prototype={init:function(a,b,c){this.series=a;this.color=a.color;this.applyOptions(b,c);this.pointAttr={};if(a.options.colorByPoint&&(b=a.options.colors||a.chart.options.colors,this.color=
+this.color||b[a.colorCounter++],a.colorCounter===b.length))a.colorCounter=0;a.chart.pointCount++;return this},applyOptions:function(a,b){var c=this.series,d=c.options.pointValKey||c.pointValKey,a=Ga.prototype.optionsToObject.call(this,a);x(this,a);this.options=this.options?x(this.options,a):a;if(d)this.y=this[d];if(this.x===y&&c)this.x=b===y?c.autoIncrement():b;return this},optionsToObject:function(a){var b={},c=this.series,d=c.options.keys,e=d||c.pointArrayMap||["y"],f=e.length,g=0,h=0;if(typeof a===
+"number"||a===null)b[e[0]]=a;else if(Ha(a)){if(!d&&a.length>f){c=typeof a[0];if(c==="string")b.name=a[0];else if(c==="number")b.x=a[0];g++}for(;h<f;)b[e[h++]]=a[g++]}else if(typeof a==="object"){b=a;if(a.dataLabels)c._hasPointLabels=!0;if(a.marker)c._hasPointMarkers=!0}return b},destroy:function(){var a=this.series.chart,b=a.hoverPoints,c;a.pointCount--;if(b&&(this.setState(),ja(b,this),!b.length))a.hoverPoints=null;if(this===a.hoverPoint)this.onMouseOut();if(this.graphic||this.dataLabel)Z(this),
+this.destroyElements();this.legendItem&&a.legend.destroyItem(this);for(c in this)this[c]=null},destroyElements:function(){for(var a="graphic,dataLabel,dataLabelUpper,group,connector,shadowGroup".split(","),b,c=6;c--;)b=a[c],this[b]&&(this[b]=this[b].destroy())},getLabelConfig:function(){return{x:this.category,y:this.y,key:this.name||this.category,series:this.series,point:this,percentage:this.percentage,total:this.total||this.stackTotal}},tooltipFormatter:function(a){var b=this.series,c=b.tooltipOptions,
+d=p(c.valueDecimals,""),e=c.valuePrefix||"",f=c.valueSuffix||"";o(b.pointArrayMap||["y"],function(b){b="{point."+b;if(e||f)a=a.replace(b+"}",e+b+"}"+f);a=a.replace(b+"}",b+":,."+d+"f}")});return Ja(a,{point:this,series:this.series})},firePointEvent:function(a,b,c){var d=this,e=this.series.options;(e.point.events[a]||d.options&&d.options.events&&d.options.events[a])&&this.importEvents();a==="click"&&e.allowPointSelect&&(c=function(a){d.select(null,a.ctrlKey||a.metaKey||a.shiftKey)});I(this,a,b,c)}};
+var R=z.Series=function(){};R.prototype={isCartesian:!0,type:"line",pointClass:Ga,sorted:!0,requireSorting:!0,pointAttrToOptions:{stroke:"lineColor","stroke-width":"lineWidth",fill:"fillColor",r:"radius"},axisTypes:["xAxis","yAxis"],colorCounter:0,parallelArrays:["x","y"],init:function(a,b){var c=this,d,e,f=a.series,g=function(a,b){return p(a.options.index,a._i)-p(b.options.index,b._i)};c.chart=a;c.options=b=c.setOptions(b);c.linkedSeries=[];c.bindAxes();x(c,{name:b.name,state:"",pointAttr:{},visible:b.visible!==
+!1,selected:b.selected===!0});if(fa)b.animation=!1;e=b.events;for(d in e)H(c,d,e[d]);if(e&&e.click||b.point&&b.point.events&&b.point.events.click||b.allowPointSelect)a.runTrackerClick=!0;c.getColor();c.getSymbol();o(c.parallelArrays,function(a){c[a+"Data"]=[]});c.setData(b.data,!1);if(c.isCartesian)a.hasCartesianSeries=!0;f.push(c);c._i=f.length-1;rb(f,g);this.yAxis&&rb(this.yAxis.series,g);o(f,function(a,b){a.index=b;a.name=a.name||"Series "+(b+1)})},bindAxes:function(){var a=this,b=a.options,c=
+a.chart,d;o(a.axisTypes||[],function(e){o(c[e],function(c){d=c.options;if(b[e]===d.index||b[e]!==y&&b[e]===d.id||b[e]===y&&d.index===0)c.series.push(a),a[e]=c,c.isDirty=!0});!a[e]&&a.optionalAxis!==e&&la(18,!0)})},updateParallelArrays:function(a,b){var c=a.series,d=arguments;o(c.parallelArrays,typeof b==="number"?function(d){var f=d==="y"&&c.toYData?c.toYData(a):a[d];c[d+"Data"][b]=f}:function(a){Array.prototype[b].apply(c[a+"Data"],Array.prototype.slice.call(d,2))})},autoIncrement:function(){var a=
+this.options,b=this.xIncrement,c,d=a.pointIntervalUnit,b=p(b,a.pointStart,0);this.pointInterval=c=p(this.pointInterval,a.pointInterval,1);if(d==="month"||d==="year")a=new Aa(b),a=d==="month"?+a[wb](a[Ya]()+c):+a[xb](a[Za]()+c),c=a-b;this.xIncrement=b+c;return b},getSegments:function(){var a=-1,b=[],c,d=this.points,e=d.length;if(e)if(this.options.connectNulls){for(c=e;c--;)d[c].y===null&&d.splice(c,1);d.length&&(b=[d])}else o(d,function(c,g){c.y===null?(g>a+1&&b.push(d.slice(a+1,g)),a=g):g===e-1&&
+b.push(d.slice(a+1,g+1))});this.segments=b},setOptions:function(a){var b=this.chart,c=b.options.plotOptions,b=b.userOptions||{},d=b.plotOptions||{},e=c[this.type];this.userOptions=a;c=A(e,c.series,a);this.tooltipOptions=A(T.tooltip,T.plotOptions[this.type].tooltip,b.tooltip,d.series&&d.series.tooltip,d[this.type]&&d[this.type].tooltip,a.tooltip);e.marker===null&&delete c.marker;this.zoneAxis=c.zoneAxis;a=this.zones=(c.zones||[]).slice();if((c.negativeColor||c.negativeFillColor)&&!c.zones)a.push({value:c[this.zoneAxis+
+"Threshold"]||c.threshold||0,color:c.negativeColor,fillColor:c.negativeFillColor});a.length&&q(a[a.length-1].value)&&a.push({color:this.color,fillColor:this.fillColor});return c},getCyclic:function(a,b,c){var d=this.userOptions,e="_"+a+"Index",f=a+"Counter";b||(q(d[e])?b=d[e]:(d[e]=b=this.chart[f]%c.length,this.chart[f]+=1),b=c[b]);this[a]=b},getColor:function(){this.options.colorByPoint||this.getCyclic("color",this.options.color||ba[this.type].color,this.chart.options.colors)},getSymbol:function(){var a=
+this.options.marker;this.getCyclic("symbol",a.symbol,this.chart.options.symbols);if(/^url/.test(this.symbol))a.radius=0},drawLegendSymbol:Na.drawLineMarker,setData:function(a,b,c,d){var e=this,f=e.points,g=f&&f.length||0,h,i=e.options,j=e.chart,k=null,l=e.xAxis,m=l&&!!l.categories,n=i.turboThreshold,u=this.xData,r=this.yData,q=(h=e.pointArrayMap)&&h.length,a=a||[];h=a.length;b=p(b,!0);if(d!==!1&&h&&g===h&&!e.cropped&&!e.hasGroupedData&&e.visible)o(a,function(a,b){f[b].update(a,!1,null,!1)});else{e.xIncrement=
+null;e.pointRange=m?1:i.pointRange;e.colorCounter=0;o(this.parallelArrays,function(a){e[a+"Data"].length=0});if(n&&h>n){for(c=0;k===null&&c<h;)k=a[c],c++;if(ra(k)){m=p(i.pointStart,0);i=p(i.pointInterval,1);for(c=0;c<h;c++)u[c]=m,r[c]=a[c],m+=i;e.xIncrement=m}else if(Ha(k))if(q)for(c=0;c<h;c++)i=a[c],u[c]=i[0],r[c]=i.slice(1,q+1);else for(c=0;c<h;c++)i=a[c],u[c]=i[0],r[c]=i[1];else la(12)}else for(c=0;c<h;c++)if(a[c]!==y&&(i={series:e},e.pointClass.prototype.applyOptions.apply(i,[a[c]]),e.updateParallelArrays(i,
+c),m&&i.name))l.names[i.x]=i.name;Da(r[0])&&la(14,!0);e.data=[];e.options.data=a;for(c=g;c--;)f[c]&&f[c].destroy&&f[c].destroy();if(l)l.minRange=l.userMinRange;e.isDirty=e.isDirtyData=j.isDirtyBox=!0;c=!1}b&&j.redraw(c)},processData:function(a){var b=this.xData,c=this.yData,d=b.length,e;e=0;var f,g,h=this.xAxis,i,j=this.options;i=j.cropThreshold;var k=this.isCartesian,l,m;if(k&&!this.isDirty&&!h.isDirty&&!this.yAxis.isDirty&&!a)return!1;if(h)a=h.getExtremes(),l=a.min,m=a.max;if(k&&this.sorted&&(!i||
+d>i||this.forceCrop))if(b[d-1]<l||b[0]>m)b=[],c=[];else if(b[0]<l||b[d-1]>m)e=this.cropData(this.xData,this.yData,l,m),b=e.xData,c=e.yData,e=e.start,f=!0;for(i=b.length-1;i>=0;i--)d=b[i]-b[i-1],d>0&&(g===y||d<g)?g=d:d<0&&this.requireSorting&&la(15);this.cropped=f;this.cropStart=e;this.processedXData=b;this.processedYData=c;if(j.pointRange===null)this.pointRange=g||1;this.closestPointRange=g},cropData:function(a,b,c,d){var e=a.length,f=0,g=e,h=p(this.cropShoulder,1),i;for(i=0;i<e;i++)if(a[i]>=c){f=
+v(0,i-h);break}for(;i<e;i++)if(a[i]>d){g=i+h;break}return{xData:a.slice(f,g),yData:b.slice(f,g),start:f,end:g}},generatePoints:function(){var a=this.options.data,b=this.data,c,d=this.processedXData,e=this.processedYData,f=this.pointClass,g=d.length,h=this.cropStart||0,i,j=this.hasGroupedData,k,l=[],m;if(!b&&!j)b=[],b.length=a.length,b=this.data=b;for(m=0;m<g;m++)i=h+m,j?l[m]=(new f).init(this,[d[m]].concat(sa(e[m]))):(b[i]?k=b[i]:a[i]!==y&&(b[i]=k=(new f).init(this,a[i],d[m])),l[m]=k),l[m].index=
+i;if(b&&(g!==(c=b.length)||j))for(m=0;m<c;m++)if(m===h&&!j&&(m+=g),b[m])b[m].destroyElements(),b[m].plotX=y;this.data=b;this.points=l},getExtremes:function(a){var b=this.yAxis,c=this.processedXData,d,e=[],f=0;d=this.xAxis.getExtremes();var g=d.min,h=d.max,i,j,k,l,a=a||this.stackedYData||this.processedYData;d=a.length;for(l=0;l<d;l++)if(j=c[l],k=a[l],i=k!==null&&k!==y&&(!b.isLog||k.length||k>0),j=this.getExtremesFromAll||this.options.getExtremesFromAll||this.cropped||(c[l+1]||j)>=g&&(c[l-1]||j)<=h,
+i&&j)if(i=k.length)for(;i--;)k[i]!==null&&(e[f++]=k[i]);else e[f++]=k;this.dataMin=Pa(e);this.dataMax=Fa(e)},translate:function(){this.processedXData||this.processData();this.generatePoints();for(var a=this.options,b=a.stacking,c=this.xAxis,d=c.categories,e=this.yAxis,f=this.points,g=f.length,h=!!this.modifyValue,i=a.pointPlacement,j=i==="between"||ra(i),k=a.threshold,l=a.startFromThreshold?k:0,m,n,u,o=Number.MAX_VALUE,a=0;a<g;a++){var s=f[a],x=s.x,t=s.y;n=s.low;var w=b&&e.stacks[(this.negStacks&&
+t<(l?0:k)?"-":"")+this.stackKey];if(e.isLog&&t!==null&&t<=0)s.y=t=null,la(10);s.plotX=m=C(v(-1E5,c.translate(x,0,0,0,1,i,this.type==="flags")),1E5);if(b&&this.visible&&w&&w[x])w=w[x],t=w.points[this.index+","+a],n=t[0],t=t[1],n===l&&(n=p(k,e.min)),e.isLog&&n<=0&&(n=null),s.total=s.stackTotal=w.total,s.percentage=w.total&&s.y/w.total*100,s.stackY=t,w.setOffset(this.pointXOffset||0,this.barW||0);s.yBottom=q(n)?e.translate(n,0,1,0,1):null;h&&(t=this.modifyValue(t,s));s.plotY=n=typeof t==="number"&&t!==
+Infinity?C(v(-1E5,e.translate(t,0,1,0,1)),1E5):y;s.isInside=n!==y&&n>=0&&n<=e.len&&m>=0&&m<=c.len;s.clientX=j?c.translate(x,0,0,0,1):m;s.negative=s.y<(k||0);s.category=d&&d[s.x]!==y?d[s.x]:s.x;a&&(o=C(o,N(m-u)));u=m}this.closestPointRangePx=o;this.getSegments()},setClip:function(a){var b=this.chart,c=b.renderer,d=b.inverted,e=this.clipBox,f=e||b.clipBox,g=this.sharedClipKey||["_sharedClip",a&&a.duration,a&&a.easing,f.height].join(","),h=b[g],i=b[g+"m"];if(!h){if(a)f.width=0,b[g+"m"]=i=c.clipRect(-99,
+d?-b.plotLeft:-b.plotTop,99,d?b.chartWidth:b.chartHeight);b[g]=h=c.clipRect(f)}a&&(h.count+=1);if(this.options.clip!==!1)this.group.clip(a||e?h:b.clipRect),this.markerGroup.clip(i),this.sharedClipKey=g;a||(h.count-=1,h.count<=0&&g&&b[g]&&(e||(b[g]=b[g].destroy()),b[g+"m"]&&(b[g+"m"]=b[g+"m"].destroy())))},animate:function(a){var b=this.chart,c=this.options.animation,d;if(c&&!da(c))c=ba[this.type].animation;a?this.setClip(c):(d=this.sharedClipKey,(a=b[d])&&a.animate({width:b.plotSizeX},c),b[d+"m"]&&
+b[d+"m"].animate({width:b.plotSizeX+99},c),this.animate=null)},afterAnimate:function(){this.setClip();I(this,"afterAnimate")},drawPoints:function(){var a,b=this.points,c=this.chart,d,e,f,g,h,i,j,k,l=this.options.marker,m=this.pointAttr[""],n,u,o,s=this.markerGroup,q=p(l.enabled,this.xAxis.isRadial,this.closestPointRangePx>2*l.radius);if(l.enabled!==!1||this._hasPointMarkers)for(f=b.length;f--;)if(g=b[f],d=V(g.plotX),e=g.plotY,k=g.graphic,n=g.marker||{},u=!!g.marker,a=q&&n.enabled===y||n.enabled,o=
+g.isInside,a&&e!==y&&!isNaN(e)&&g.y!==null)if(a=g.pointAttr[g.selected?"select":""]||m,h=a.r,i=p(n.symbol,this.symbol),j=i.indexOf("url")===0,k)k[o?"show":"hide"](!0).animate(x({x:d-h,y:e-h},k.symbolName?{width:2*h,height:2*h}:{}));else{if(o&&(h>0||j))g.graphic=c.renderer.symbol(i,d-h,e-h,2*h,2*h,u?n:l).attr(a).add(s)}else if(k)g.graphic=k.destroy()},convertAttribs:function(a,b,c,d){var e=this.pointAttrToOptions,f,g,h={},a=a||{},b=b||{},c=c||{},d=d||{};for(f in e)g=e[f],h[f]=p(a[g],b[f],c[f],d[f]);
+return h},getAttribs:function(){var a=this,b=a.options,c=ba[a.type].marker?b.marker:b,d=c.states,e=d.hover,f,g=a.color,h=a.options.negativeColor;f={stroke:g,fill:g};var i=a.points||[],j,k=[],l,m=a.pointAttrToOptions;l=a.hasPointSpecificOptions;var n=c.lineColor,p=c.fillColor;j=b.turboThreshold;var r=a.zones,s=a.zoneAxis||"y",v;b.marker?(e.radius=e.radius||c.radius+e.radiusPlus,e.lineWidth=e.lineWidth||c.lineWidth+e.lineWidthPlus):(e.color=e.color||oa(e.color||g).brighten(e.brightness).get(),e.negativeColor=
+e.negativeColor||oa(e.negativeColor||h).brighten(e.brightness).get());k[""]=a.convertAttribs(c,f);o(["hover","select"],function(b){k[b]=a.convertAttribs(d[b],k[""])});a.pointAttr=k;g=i.length;if(!j||g<j||l)for(;g--;){j=i[g];if((c=j.options&&j.options.marker||j.options)&&c.enabled===!1)c.radius=0;if(r.length){l=0;for(f=r[l];j[s]>=f.value;)f=r[++l];j.color=j.fillColor=f.color}l=b.colorByPoint||j.color;if(j.options)for(v in m)q(c[m[v]])&&(l=!0);if(l){c=c||{};l=[];d=c.states||{};f=d.hover=d.hover||{};
+if(!b.marker)f.color=f.color||!j.options.color&&e[j.negative&&h?"negativeColor":"color"]||oa(j.color).brighten(f.brightness||e.brightness).get();f={color:j.color};if(!p)f.fillColor=j.color;if(!n)f.lineColor=j.color;c.hasOwnProperty("color")&&!c.color&&delete c.color;l[""]=a.convertAttribs(x(f,c),k[""]);l.hover=a.convertAttribs(d.hover,k.hover,l[""]);l.select=a.convertAttribs(d.select,k.select,l[""])}else l=k;j.pointAttr=l}},destroy:function(){var a=this,b=a.chart,c=/AppleWebKit\/533/.test(Ba),d,e=
+a.data||[],f,g,h;I(a,"destroy");Z(a);o(a.axisTypes||[],function(b){if(h=a[b])ja(h.series,a),h.isDirty=h.forceRedraw=!0});a.legendItem&&a.chart.legend.destroyItem(a);for(d=e.length;d--;)(f=e[d])&&f.destroy&&f.destroy();a.points=null;clearTimeout(a.animationTimeout);for(g in a)a[g]instanceof P&&!a[g].survive&&(d=c&&g==="group"?"hide":"destroy",a[g][d]());if(b.hoverSeries===a)b.hoverSeries=null;ja(b.series,a);for(g in a)delete a[g]},getSegmentPath:function(a){var b=this,c=[],d=b.options.step;o(a,function(e,
+f){var g=e.plotX,h=e.plotY,i;b.getPointSpline?c.push.apply(c,b.getPointSpline(a,e,f)):(c.push(f?"L":"M"),d&&f&&(i=a[f-1],d==="right"?c.push(i.plotX,h):d==="center"?c.push((i.plotX+g)/2,i.plotY,(i.plotX+g)/2,h):c.push(g,i.plotY)),c.push(e.plotX,e.plotY))});return c},getGraphPath:function(){var a=this,b=[],c,d=[];o(a.segments,function(e){c=a.getSegmentPath(e);e.length>1?b=b.concat(c):d.push(e[0])});a.singlePoints=d;return a.graphPath=b},drawGraph:function(){var a=this,b=this.options,c=[["graph",b.lineColor||
+this.color,b.dashStyle]],d=b.lineWidth,e=b.linecap!=="square",f=this.getGraphPath(),g=this.fillGraph&&this.color||O;o(this.zones,function(d,e){c.push(["zoneGraph"+e,d.color||a.color,d.dashStyle||b.dashStyle])});o(c,function(c,i){var j=c[0],k=a[j];if(k)db(k),k.animate({d:f});else if((d||g)&&f.length)k={stroke:c[1],"stroke-width":d,fill:g,zIndex:1},c[2]?k.dashstyle=c[2]:e&&(k["stroke-linecap"]=k["stroke-linejoin"]="round"),a[j]=a.chart.renderer.path(f).attr(k).add(a.group).shadow(i<2&&b.shadow)})},
+applyZones:function(){var a=this,b=this.chart,c=b.renderer,d=this.zones,e,f,g=this.clips||[],h,i=this.graph,j=this.area,k=v(b.chartWidth,b.chartHeight),l=this[(this.zoneAxis||"y")+"Axis"],m,n=l.reversed,u=b.inverted,r=l.horiz,q,x,t,w=!1;if(d.length&&(i||j))i&&i.hide(),j&&j.hide(),m=l.getExtremes(),o(d,function(d,o){e=n?r?b.plotWidth:0:r?0:l.toPixels(m.min);e=C(v(p(f,e),0),k);f=C(v(s(l.toPixels(p(d.value,m.max),!0)),0),k);w&&(e=f=l.toPixels(m.max));q=Math.abs(e-f);x=C(e,f);t=v(e,f);if(l.isXAxis){if(h=
+{x:u?t:x,y:0,width:q,height:k},!r)h.x=b.plotHeight-h.x}else if(h={x:0,y:u?t:x,width:k,height:q},r)h.y=b.plotWidth-h.y;b.inverted&&c.isVML&&(h=l.isXAxis?{x:0,y:n?x:t,height:h.width,width:b.chartWidth}:{x:h.y-b.plotLeft-b.spacingBox.x,y:0,width:h.height,height:b.chartHeight});g[o]?g[o].animate(h):(g[o]=c.clipRect(h),i&&a["zoneGraph"+o].clip(g[o]),j&&a["zoneArea"+o].clip(g[o]));w=d.value>m.max}),this.clips=g},invertGroups:function(){function a(){var a={width:b.yAxis.len,height:b.xAxis.len};o(["group",
+"markerGroup"],function(c){b[c]&&b[c].attr(a).invert()})}var b=this,c=b.chart;if(b.xAxis)H(c,"resize",a),H(b,"destroy",function(){Z(c,"resize",a)}),a(),b.invertGroups=a},plotGroup:function(a,b,c,d,e){var f=this[a],g=!f;g&&(this[a]=f=this.chart.renderer.g(b).attr({visibility:c,zIndex:d||0.1}).add(e));f[g?"attr":"animate"](this.getPlotBox());return f},getPlotBox:function(){var a=this.chart,b=this.xAxis,c=this.yAxis;if(a.inverted)b=c,c=this.xAxis;return{translateX:b?b.left:a.plotLeft,translateY:c?c.top:
+a.plotTop,scaleX:1,scaleY:1}},render:function(){var a=this,b=a.chart,c,d=a.options,e=(c=d.animation)&&!!a.animate&&b.renderer.isSVG&&p(c.duration,500)||0,f=a.visible?"visible":"hidden",g=d.zIndex,h=a.hasRendered,i=b.seriesGroup;c=a.plotGroup("group","series",f,g,i);a.markerGroup=a.plotGroup("markerGroup","markers",f,g,i);e&&a.animate(!0);a.getAttribs();c.inverted=a.isCartesian?b.inverted:!1;a.drawGraph&&(a.drawGraph(),a.applyZones());o(a.points,function(a){a.redraw&&a.redraw()});a.drawDataLabels&&
+a.drawDataLabels();a.visible&&a.drawPoints();a.drawTracker&&a.options.enableMouseTracking!==!1&&a.drawTracker();b.inverted&&a.invertGroups();d.clip!==!1&&!a.sharedClipKey&&!h&&c.clip(b.clipRect);e&&a.animate();if(!h)e?a.animationTimeout=setTimeout(function(){a.afterAnimate()},e):a.afterAnimate();a.isDirty=a.isDirtyData=!1;a.hasRendered=!0},redraw:function(){var a=this.chart,b=this.isDirtyData,c=this.isDirty,d=this.group,e=this.xAxis,f=this.yAxis;d&&(a.inverted&&d.attr({width:a.plotWidth,height:a.plotHeight}),
+d.animate({translateX:p(e&&e.left,a.plotLeft),translateY:p(f&&f.top,a.plotTop)}));this.translate();this.render();b&&I(this,"updatedData");(c||b)&&delete this.kdTree},kdDimensions:1,kdAxisArray:["clientX","plotY"],searchPoint:function(a,b){var c=this.xAxis,d=this.yAxis,e=this.chart.inverted;return this.searchKDTree({clientX:e?c.len-a.chartY+c.pos:a.chartX-c.pos,plotY:e?d.len-a.chartX+d.pos:a.chartY-d.pos},b)},buildKDTree:function(){function a(b,d,g){var h,i;if(i=b&&b.length)return h=c.kdAxisArray[d%
+g],b.sort(function(a,b){return a[h]-b[h]}),i=Math.floor(i/2),{point:b[i],left:a(b.slice(0,i),d+1,g),right:a(b.slice(i+1),d+1,g)}}function b(){var b=lb(c.points,function(a){return a.y!==null});c.kdTree=a(b,d,d)}var c=this,d=c.kdDimensions;delete c.kdTree;c.options.kdSync?b():setTimeout(b)},searchKDTree:function(a,b){function c(a,b,j,k){var l=b.point,m=d.kdAxisArray[j%k],n,p,o=l;p=q(a[e])&&q(l[e])?Math.pow(a[e]-l[e],2):null;n=q(a[f])&&q(l[f])?Math.pow(a[f]-l[f],2):null;n=(p||0)+(n||0);l.dist=q(n)?Math.sqrt(n):
+Number.MAX_VALUE;l.distX=q(p)?Math.sqrt(p):Number.MAX_VALUE;m=a[m]-l[m];n=m<0?"left":"right";p=m<0?"right":"left";b[n]&&(n=c(a,b[n],j+1,k),o=n[g]<o[g]?n:l);b[p]&&Math.sqrt(m*m)<o[g]&&(a=c(a,b[p],j+1,k),o=a[g]<o[g]?a:o);return o}var d=this,e=this.kdAxisArray[0],f=this.kdAxisArray[1],g=b?"distX":"dist";this.kdTree||this.buildKDTree();if(this.kdTree)return c(a,this.kdTree,this.kdDimensions,this.kdDimensions)}};Hb.prototype={destroy:function(){Qa(this,this.axis)},render:function(a){var b=this.options,
+c=b.format,c=c?Ja(c,this):b.formatter.call(this);this.label?this.label.attr({text:c,visibility:"hidden"}):this.label=this.axis.chart.renderer.text(c,null,null,b.useHTML).css(b.style).attr({align:this.textAlign,rotation:b.rotation,visibility:"hidden"}).add(a)},setOffset:function(a,b){var c=this.axis,d=c.chart,e=d.inverted,f=c.reversed,f=this.isNegative&&!f||!this.isNegative&&f,g=c.translate(c.usePercentage?100:this.total,0,0,0,1),c=c.translate(0),c=N(g-c),h=d.xAxis[0].translate(this.x)+a,i=d.plotHeight,
+f={x:e?f?g:g-c:h,y:e?i-h-b:f?i-g-c:i-g,width:e?c:b,height:e?b:c};if(e=this.label)e.align(this.alignOptions,null,f),f=e.alignAttr,e[this.options.crop===!1||d.isInsidePlot(f.x,f.y)?"show":"hide"](!0)}};va.prototype.buildStacks=function(){var a=this.series,b=p(this.options.reversedStacks,!0),c=a.length;if(!this.isXAxis){for(this.usePercentage=!1;c--;)a[b?c:a.length-c-1].setStackedPoints();if(this.usePercentage)for(c=0;c<a.length;c++)a[c].setPercentStacks()}};va.prototype.renderStackTotals=function(){var a=
+this.chart,b=a.renderer,c=this.stacks,d,e,f=this.stackTotalGroup;if(!f)this.stackTotalGroup=f=b.g("stack-labels").attr({visibility:"visible",zIndex:6}).add();f.translate(a.plotLeft,a.plotTop);for(d in c)for(e in a=c[d],a)a[e].render(f)};R.prototype.setStackedPoints=function(){if(this.options.stacking&&!(this.visible!==!0&&this.chart.options.chart.ignoreHiddenSeries!==!1)){var a=this.processedXData,b=this.processedYData,c=[],d=b.length,e=this.options,f=e.threshold,g=e.startFromThreshold?f:0,h=e.stack,
+e=e.stacking,i=this.stackKey,j="-"+i,k=this.negStacks,l=this.yAxis,m=l.stacks,n=l.oldStacks,o,r,s,q,t,w;for(q=0;q<d;q++){t=a[q];w=b[q];s=this.index+","+q;r=(o=k&&w<(g?0:f))?j:i;m[r]||(m[r]={});if(!m[r][t])n[r]&&n[r][t]?(m[r][t]=n[r][t],m[r][t].total=null):m[r][t]=new Hb(l,l.options.stackLabels,o,t,h);r=m[r][t];r.points[s]=[p(r.cum,g)];e==="percent"?(o=o?i:j,k&&m[o]&&m[o][t]?(o=m[o][t],r.total=o.total=v(o.total,r.total)+N(w)||0):r.total=ea(r.total+(N(w)||0))):r.total=ea(r.total+(w||0));r.cum=p(r.cum,
+g)+(w||0);r.points[s].push(r.cum);c[q]=r.cum}if(e==="percent")l.usePercentage=!0;this.stackedYData=c;l.oldStacks={}}};R.prototype.setPercentStacks=function(){var a=this,b=a.stackKey,c=a.yAxis.stacks,d=a.processedXData;o([b,"-"+b],function(b){var e;for(var f=d.length,g,h;f--;)if(g=d[f],e=(h=c[b]&&c[b][g])&&h.points[a.index+","+f],g=e)h=h.total?100/h.total:0,g[0]=ea(g[0]*h),g[1]=ea(g[1]*h),a.stackedYData[f]=g[1]})};x(E.prototype,{addSeries:function(a,b,c){var d,e=this;a&&(b=p(b,!0),I(e,"addSeries",
+{options:a},function(){d=e.initSeries(a);e.isDirtyLegend=!0;e.linkSeries();b&&e.redraw(c)}));return d},addAxis:function(a,b,c,d){var e=b?"xAxis":"yAxis",f=this.options;new va(this,A(a,{index:this[e].length,isX:b}));f[e]=sa(f[e]||{});f[e].push(a);p(c,!0)&&this.redraw(d)},showLoading:function(a){var b=this,c=b.options,d=b.loadingDiv,e=c.loading,f=function(){d&&L(d,{left:b.plotLeft+"px",top:b.plotTop+"px",width:b.plotWidth+"px",height:b.plotHeight+"px"})};if(!d)b.loadingDiv=d=$(Ka,{className:"highcharts-loading"},
+x(e.style,{zIndex:10,display:O}),b.container),b.loadingSpan=$("span",null,e.labelStyle,d),H(b,"redraw",f);b.loadingSpan.innerHTML=a||c.lang.loading;if(!b.loadingShown)L(d,{opacity:0,display:""}),mb(d,{opacity:e.style.opacity},{duration:e.showDuration||0}),b.loadingShown=!0;f()},hideLoading:function(){var a=this.options,b=this.loadingDiv;b&&mb(b,{opacity:0},{duration:a.loading.hideDuration||100,complete:function(){L(b,{display:O})}});this.loadingShown=!1}});x(Ga.prototype,{update:function(a,b,c,d){function e(){f.applyOptions(a);
+if(f.y===null&&h)f.graphic=h.destroy();if(da(a)&&!Ha(a))f.redraw=function(){if(h)if(a&&a.marker&&a.marker.symbol)f.graphic=h.destroy();else h.attr(f.pointAttr[f.state||""])[f.visible?"show":"hide"](!0);if(a&&a.dataLabels&&f.dataLabel)f.dataLabel=f.dataLabel.destroy();f.redraw=null};i=f.index;g.updateParallelArrays(f,i);if(l&&f.name)l[f.x]=f.name;k.data[i]=f.options;g.isDirty=g.isDirtyData=!0;if(!g.fixedBox&&g.hasCartesianSeries)j.isDirtyBox=!0;if(k.legendType==="point")j.isDirtyLegend=!0;b&&j.redraw(c)}
+var f=this,g=f.series,h=f.graphic,i,j=g.chart,k=g.options,l=g.xAxis&&g.xAxis.names,b=p(b,!0);d===!1?e():f.firePointEvent("update",{options:a},e)},remove:function(a,b){this.series.removePoint(Ma(this,this.series.data),a,b)}});x(R.prototype,{addPoint:function(a,b,c,d){var e=this,f=e.options,g=e.data,h=e.graph,i=e.area,j=e.chart,k=e.xAxis&&e.xAxis.names,l=h&&h.shift||0,m=["graph","area"],h=f.data,n,u=e.xData;Sa(d,j);if(c){for(d=e.zones.length;d--;)m.push("zoneGraph"+d,"zoneArea"+d);o(m,function(a){if(e[a])e[a].shift=
+l+1})}if(i)i.isArea=!0;b=p(b,!0);i={series:e};e.pointClass.prototype.applyOptions.apply(i,[a]);m=i.x;d=u.length;if(e.requireSorting&&m<u[d-1])for(n=!0;d&&u[d-1]>m;)d--;e.updateParallelArrays(i,"splice",d,0,0);e.updateParallelArrays(i,d);if(k&&i.name)k[m]=i.name;h.splice(d,0,a);n&&(e.data.splice(d,0,null),e.processData());f.legendType==="point"&&e.generatePoints();c&&(g[0]&&g[0].remove?g[0].remove(!1):(g.shift(),e.updateParallelArrays(i,"shift"),h.shift()));e.isDirty=!0;e.isDirtyData=!0;b&&(e.getAttribs(),
+j.redraw())},removePoint:function(a,b,c){var d=this,e=d.data,f=e[a],g=d.points,h=d.chart,i=function(){e.length===g.length&&g.splice(a,1);e.splice(a,1);d.options.data.splice(a,1);d.updateParallelArrays(f||{series:d},"splice",a,1);f&&f.destroy();d.isDirty=!0;d.isDirtyData=!0;b&&h.redraw()};Sa(c,h);b=p(b,!0);f?f.firePointEvent("remove",null,i):i()},remove:function(a,b){var c=this,d=c.chart,a=p(a,!0);if(!c.isRemoving)c.isRemoving=!0,I(c,"remove",null,function(){c.destroy();d.isDirtyLegend=d.isDirtyBox=
+!0;d.linkSeries();a&&d.redraw(b)});c.isRemoving=!1},update:function(a,b){var c=this,d=this.chart,e=this.userOptions,f=this.type,g=M[f].prototype,h=["group","markerGroup","dataLabelsGroup"],i;if(a.type&&a.type!==f||a.zIndex!==void 0)h.length=0;o(h,function(a){h[a]=c[a];delete c[a]});a=A(e,{animation:!1,index:this.index,pointStart:this.xData[0]},{data:this.options.data},a);this.remove(!1);for(i in g)this[i]=y;x(this,M[a.type||f].prototype);o(h,function(a){c[a]=h[a]});this.init(d,a);d.linkSeries();p(b,
+!0)&&d.redraw(!1)}});x(va.prototype,{update:function(a,b){var c=this.chart,a=c.options[this.coll][this.options.index]=A(this.userOptions,a);this.destroy(!0);this._addedPlotLB=y;this.init(c,x(a,{events:y}));c.isDirtyBox=!0;p(b,!0)&&c.redraw()},remove:function(a){for(var b=this.chart,c=this.coll,d=this.series,e=d.length;e--;)d[e]&&d[e].remove(!1);ja(b.axes,this);ja(b[c],this);b.options[c].splice(this.options.index,1);o(b[c],function(a,b){a.options.index=b});this.destroy();b.isDirtyBox=!0;p(a,!0)&&b.redraw()},
+setTitle:function(a,b){this.update({title:a},b)},setCategories:function(a,b){this.update({categories:a},b)}});var xa=ka(R);M.line=xa;ba.area=A(U,{threshold:0});var qa=ka(R,{type:"area",getSegments:function(){var a=this,b=[],c=[],d=[],e=this.xAxis,f=this.yAxis,g=f.stacks[this.stackKey],h={},i,j,k=this.points,l=this.options.connectNulls,m,n;if(this.options.stacking&&!this.cropped){for(m=0;m<k.length;m++)h[k[m].x]=k[m];for(n in g)g[n].total!==null&&d.push(+n);d.sort(function(a,b){return a-b});o(d,function(b){var d=
+0,k;if(!l||h[b]&&h[b].y!==null)if(h[b])c.push(h[b]);else{for(m=a.index;m<=f.series.length;m++)if(k=g[b].points[m+","+b]){d=k[1];break}i=e.translate(b);j=f.toPixels(d,!0);c.push({y:null,plotX:i,clientX:i,plotY:j,yBottom:j,onMouseOver:na})}});c.length&&b.push(c)}else R.prototype.getSegments.call(this),b=this.segments;this.segments=b},getSegmentPath:function(a){var b=R.prototype.getSegmentPath.call(this,a),c=[].concat(b),d,e=this.options;d=b.length;var f=this.yAxis.getThreshold(e.threshold),g;d===3&&
+c.push("L",b[1],b[2]);if(e.stacking&&!this.closedStacks)for(d=a.length-1;d>=0;d--)g=p(a[d].yBottom,f),d<a.length-1&&e.step&&c.push(a[d+1].plotX,g),c.push(a[d].plotX,g);else this.closeSegment(c,a,f);this.areaPath=this.areaPath.concat(c);return b},closeSegment:function(a,b,c){a.push("L",b[b.length-1].plotX,c,"L",b[0].plotX,c)},drawGraph:function(){this.areaPath=[];R.prototype.drawGraph.apply(this);var a=this,b=this.areaPath,c=this.options,d=[["area",this.color,c.fillColor]];o(this.zones,function(b,
+f){d.push(["zoneArea"+f,b.color||a.color,b.fillColor||c.fillColor])});o(d,function(d){var f=d[0],g=a[f];g?g.animate({d:b}):a[f]=a.chart.renderer.path(b).attr({fill:p(d[2],oa(d[1]).setOpacity(p(c.fillOpacity,0.75)).get()),zIndex:0}).add(a.group)})},drawLegendSymbol:Na.drawRectangle});M.area=qa;ba.spline=A(U);xa=ka(R,{type:"spline",getPointSpline:function(a,b,c){var d=b.plotX,e=b.plotY,f=a[c-1],g=a[c+1],h,i,j,k;if(f&&g){a=f.plotY;j=g.plotX;var g=g.plotY,l;h=(1.5*d+f.plotX)/2.5;i=(1.5*e+a)/2.5;j=(1.5*
+d+j)/2.5;k=(1.5*e+g)/2.5;l=(k-i)*(j-d)/(j-h)+e-k;i+=l;k+=l;i>a&&i>e?(i=v(a,e),k=2*e-i):i<a&&i<e&&(i=C(a,e),k=2*e-i);k>g&&k>e?(k=v(g,e),i=2*e-k):k<g&&k<e&&(k=C(g,e),i=2*e-k);b.rightContX=j;b.rightContY=k}c?(b=["C",f.rightContX||f.plotX,f.rightContY||f.plotY,h||d,i||e,d,e],f.rightContX=f.rightContY=null):b=["M",d,e];return b}});M.spline=xa;ba.areaspline=A(ba.area);qa=qa.prototype;xa=ka(xa,{type:"areaspline",closedStacks:!0,getSegmentPath:qa.getSegmentPath,closeSegment:qa.closeSegment,drawGraph:qa.drawGraph,
+drawLegendSymbol:Na.drawRectangle});M.areaspline=xa;ba.column=A(U,{borderColor:"#FFFFFF",borderRadius:0,groupPadding:0.2,marker:null,pointPadding:0.1,minPointLength:0,cropThreshold:50,pointRange:null,states:{hover:{brightness:0.1,shadow:!1,halo:!1},select:{color:"#C0C0C0",borderColor:"#000000",shadow:!1}},dataLabels:{align:null,verticalAlign:null,y:null},startFromThreshold:!0,stickyTracking:!1,tooltip:{distance:6},threshold:0});xa=ka(R,{type:"column",pointAttrToOptions:{stroke:"borderColor",fill:"color",
+r:"borderRadius"},cropShoulder:0,directTouch:!0,trackerGroups:["group","dataLabelsGroup"],negStacks:!0,init:function(){R.prototype.init.apply(this,arguments);var a=this,b=a.chart;b.hasRendered&&o(b.series,function(b){if(b.type===a.type)b.isDirty=!0})},getColumnMetrics:function(){var a=this,b=a.options,c=a.xAxis,d=a.yAxis,e=c.reversed,f,g={},h,i=0;b.grouping===!1?i=1:o(a.chart.series,function(b){var c=b.options,e=b.yAxis;if(b.type===a.type&&b.visible&&d.len===e.len&&d.pos===e.pos)c.stacking?(f=b.stackKey,
+g[f]===y&&(g[f]=i++),h=g[f]):c.grouping!==!1&&(h=i++),b.columnIndex=h});var c=C(N(c.transA)*(c.ordinalSlope||b.pointRange||c.closestPointRange||c.tickInterval||1),c.len),j=c*b.groupPadding,k=(c-2*j)/i,l=b.pointWidth,b=q(l)?(k-l)/2:k*b.pointPadding,l=p(l,k-2*b);return a.columnMetrics={width:l,offset:b+(j+((e?i-(a.columnIndex||0):a.columnIndex)||0)*k-c/2)*(e?-1:1)}},translate:function(){var a=this,b=a.chart,c=a.options,d=a.borderWidth=p(c.borderWidth,a.closestPointRange*a.xAxis.transA<2?0:1),e=a.yAxis,
+f=a.translatedThreshold=e.getThreshold(c.threshold),g=p(c.minPointLength,5),h=a.getColumnMetrics(),i=h.width,j=a.barW=v(i,1+2*d),k=a.pointXOffset=h.offset,l=-(d%2?0.5:0),m=d%2?0.5:1;b.inverted&&(f-=0.5,b.renderer.isVML&&(m+=1));c.pointPadding&&(j=ta(j));R.prototype.translate.apply(a);o(a.points,function(c){var d=p(c.yBottom,f),h=999+N(d),h=C(v(-h,c.plotY),e.len+h),o=c.plotX+k,q=j,t=C(h,d),w,x;w=v(h,d)-t;N(w)<g&&g&&(w=g,x=!e.reversed&&!c.negative||e.reversed&&c.negative,t=s(N(t-f)>g?d-g:f-(x?g:0)));
+c.barX=o;c.pointWidth=i;q=s(o+q)+l;o=s(o)+l;q-=o;d=N(t)<0.5;w=C(s(t+w)+m,9E4);t=s(t)+m;w-=t;d&&(t-=1,w+=1);c.tooltipPos=b.inverted?[e.len+e.pos-b.plotLeft-h,a.xAxis.len-o-q/2,w]:[o+q/2,h+e.pos-b.plotTop,w];c.shapeType="rect";c.shapeArgs={x:o,y:t,width:q,height:w}})},getSymbol:na,drawLegendSymbol:Na.drawRectangle,drawGraph:na,drawPoints:function(){var a=this,b=this.chart,c=a.options,d=b.renderer,e=c.animationLimit||250,f,g;o(a.points,function(h){var i=h.plotY,j=h.graphic;if(i!==y&&!isNaN(i)&&h.y!==
+null)f=h.shapeArgs,i=q(a.borderWidth)?{"stroke-width":a.borderWidth}:{},g=h.pointAttr[h.selected?"select":""]||a.pointAttr[""],j?(db(j),j.attr(i)[b.pointCount<e?"animate":"attr"](A(f))):h.graphic=d[h.shapeType](f).attr(i).attr(g).add(a.group).shadow(c.shadow,null,c.stacking&&!c.borderRadius);else if(j)h.graphic=j.destroy()})},animate:function(a){var b=this.yAxis,c=this.options,d=this.chart.inverted,e={};if(ca)a?(e.scaleY=0.001,a=C(b.pos+b.len,v(b.pos,b.toPixels(c.threshold))),d?e.translateX=a-b.len:
+e.translateY=a,this.group.attr(e)):(e.scaleY=1,e[d?"translateX":"translateY"]=b.pos,this.group.animate(e,this.options.animation),this.animate=null)},remove:function(){var a=this,b=a.chart;b.hasRendered&&o(b.series,function(b){if(b.type===a.type)b.isDirty=!0});R.prototype.remove.apply(a,arguments)}});M.column=xa;ba.bar=A(ba.column);qa=ka(xa,{type:"bar",inverted:!0});M.bar=qa;ba.scatter=A(U,{lineWidth:0,marker:{enabled:!0},tooltip:{headerFormat:'<span style="color:{series.color}">\u25CF</span> <span style="font-size: 10px;"> {series.name}</span><br/>',
+pointFormat:"x: <b>{point.x}</b><br/>y: <b>{point.y}</b><br/>"}});qa=ka(R,{type:"scatter",sorted:!1,requireSorting:!1,noSharedTooltip:!0,trackerGroups:["group","markerGroup","dataLabelsGroup"],takeOrdinalPosition:!1,kdDimensions:2,drawGraph:function(){this.options.lineWidth&&R.prototype.drawGraph.call(this)}});M.scatter=qa;ba.pie=A(U,{borderColor:"#FFFFFF",borderWidth:1,center:[null,null],clip:!1,colorByPoint:!0,dataLabels:{distance:30,enabled:!0,formatter:function(){return this.point.name},x:0},
+ignoreHiddenPoint:!0,legendType:"point",marker:null,size:null,showInLegend:!1,slicedOffset:10,states:{hover:{brightness:0.1,shadow:!1}},stickyTracking:!1,tooltip:{followPointer:!0}});U={type:"pie",isCartesian:!1,pointClass:ka(Ga,{init:function(){Ga.prototype.init.apply(this,arguments);var a=this,b;x(a,{visible:a.visible!==!1,name:p(a.name,"Slice")});b=function(b){a.slice(b.type==="select")};H(a,"select",b);H(a,"unselect",b);return a},setVisible:function(a,b){var c=this,d=c.series,e=d.chart,f=d.options.ignoreHiddenPoint,
+b=p(b,f);if(a!==c.visible){c.visible=c.options.visible=a=a===y?!c.visible:a;d.options.data[Ma(c,d.data)]=c.options;o(["graphic","dataLabel","connector","shadowGroup"],function(b){if(c[b])c[b][a?"show":"hide"](!0)});c.legendItem&&e.legend.colorizeItem(c,a);if(f)d.isDirty=!0;b&&e.redraw()}},slice:function(a,b,c){var d=this.series;Sa(c,d.chart);p(b,!0);this.sliced=this.options.sliced=a=q(a)?a:!this.sliced;d.options.data[Ma(this,d.data)]=this.options;a=a?this.slicedTranslation:{translateX:0,translateY:0};
+this.graphic.animate(a);this.shadowGroup&&this.shadowGroup.animate(a)},haloPath:function(a){var b=this.shapeArgs,c=this.series.chart;return this.sliced||!this.visible?[]:this.series.chart.renderer.symbols.arc(c.plotLeft+b.x,c.plotTop+b.y,b.r+a,b.r+a,{innerR:this.shapeArgs.r,start:b.start,end:b.end})}}),requireSorting:!1,directTouch:!0,noSharedTooltip:!0,trackerGroups:["group","dataLabelsGroup"],axisTypes:[],pointAttrToOptions:{stroke:"borderColor","stroke-width":"borderWidth",fill:"color"},getColor:na,
+animate:function(a){var b=this,c=b.points,d=b.startAngleRad;if(!a)o(c,function(a){var c=a.graphic,g=a.shapeArgs;c&&(c.attr({r:a.startR||b.center[3]/2,start:d,end:d}),c.animate({r:g.r,start:g.start,end:g.end},b.options.animation))}),b.animate=null},setData:function(a,b,c,d){R.prototype.setData.call(this,a,!1,c,d);this.processData();this.generatePoints();p(b,!0)&&this.chart.redraw(c)},updateTotals:function(){var a,b=0,c=this.points,d=c.length,e,f=this.options.ignoreHiddenPoint;for(a=0;a<d;a++)e=c[a],
+b+=f&&!e.visible?0:e.y;this.total=b;for(a=0;a<d;a++)e=c[a],e.percentage=b>0&&(e.visible||!f)?e.y/b*100:0,e.total=b},generatePoints:function(){R.prototype.generatePoints.call(this);this.updateTotals()},translate:function(a){this.generatePoints();var b=0,c=this.options,d=c.slicedOffset,e=d+c.borderWidth,f,g,h,i=c.startAngle||0,j=this.startAngleRad=ma/180*(i-90),i=(this.endAngleRad=ma/180*(p(c.endAngle,i+360)-90))-j,k=this.points,l=c.dataLabels.distance,c=c.ignoreHiddenPoint,m,n=k.length,o;if(!a)this.center=
+a=this.getCenter();this.getX=function(b,c){h=W.asin(C((b-a[1])/(a[2]/2+l),1));return a[0]+(c?-1:1)*X(h)*(a[2]/2+l)};for(m=0;m<n;m++){o=k[m];f=j+b*i;if(!c||o.visible)b+=o.percentage/100;g=j+b*i;o.shapeType="arc";o.shapeArgs={x:a[0],y:a[1],r:a[2]/2,innerR:a[3]/2,start:s(f*1E3)/1E3,end:s(g*1E3)/1E3};h=(g+f)/2;h>1.5*ma?h-=2*ma:h<-ma/2&&(h+=2*ma);o.slicedTranslation={translateX:s(X(h)*d),translateY:s(aa(h)*d)};f=X(h)*a[2]/2;g=aa(h)*a[2]/2;o.tooltipPos=[a[0]+f*0.7,a[1]+g*0.7];o.half=h<-ma/2||h>ma/2?1:0;
+o.angle=h;e=C(e,l/2);o.labelPos=[a[0]+f+X(h)*l,a[1]+g+aa(h)*l,a[0]+f+X(h)*e,a[1]+g+aa(h)*e,a[0]+f,a[1]+g,l<0?"center":o.half?"right":"left",h]}},drawGraph:null,drawPoints:function(){var a=this,b=a.chart.renderer,c,d,e=a.options.shadow,f,g,h;if(e&&!a.shadowGroup)a.shadowGroup=b.g("shadow").add(a.group);o(a.points,function(i){d=i.graphic;g=i.shapeArgs;f=i.shadowGroup;if(e&&!f)f=i.shadowGroup=b.g("shadow").add(a.shadowGroup);c=i.sliced?i.slicedTranslation:{translateX:0,translateY:0};f&&f.attr(c);if(d)d.animate(x(g,
+c));else{h={"stroke-linejoin":"round"};if(!i.visible)h.visibility="hidden";i.graphic=d=b[i.shapeType](g).setRadialReference(a.center).attr(i.pointAttr[i.selected?"select":""]).attr(h).attr(c).add(a.group).shadow(e,f)}})},searchPoint:na,sortByAngle:function(a,b){a.sort(function(a,d){return a.angle!==void 0&&(d.angle-a.angle)*b})},drawLegendSymbol:Na.drawRectangle,getCenter:Xb.getCenter,getSymbol:na};U=ka(R,U);M.pie=U;R.prototype.drawDataLabels=function(){var a=this,b=a.options,c=b.cursor,d=b.dataLabels,
+e=a.points,f,g,h=a.hasRendered||0,i,j,k=a.chart.renderer;if(d.enabled||a._hasPointLabels)a.dlProcessOptions&&a.dlProcessOptions(d),j=a.plotGroup("dataLabelsGroup","data-labels",d.defer?"hidden":"visible",d.zIndex||6),p(d.defer,!0)&&(j.attr({opacity:+h}),h||H(a,"afterAnimate",function(){a.visible&&j.show();j[b.animation?"animate":"attr"]({opacity:1},{duration:200})})),g=d,o(e,function(e){var h,n=e.dataLabel,o,r,s=e.connector,v=!0,t,w={};f=e.dlOptions||e.options&&e.options.dataLabels;h=p(f&&f.enabled,
+g.enabled);if(n&&!h)e.dataLabel=n.destroy();else if(h){d=A(g,f);t=d.style;h=d.rotation;o=e.getLabelConfig();i=d.format?Ja(d.format,o):d.formatter.call(o,d);t.color=p(d.color,t.color,a.color,"black");if(n)if(q(i))n.attr({text:i}),v=!1;else{if(e.dataLabel=n=n.destroy(),s)e.connector=s.destroy()}else if(q(i)){n={fill:d.backgroundColor,stroke:d.borderColor,"stroke-width":d.borderWidth,r:d.borderRadius||0,rotation:h,padding:d.padding,zIndex:1};if(t.color==="contrast")w.color=d.inside||d.distance<0||b.stacking?
+k.getContrast(e.color||a.color):"#000000";if(c)w.cursor=c;for(r in n)n[r]===y&&delete n[r];n=e.dataLabel=k[h?"text":"label"](i,0,-999,d.shape,null,null,d.useHTML).attr(n).css(x(t,w)).add(j).shadow(d.shadow)}n&&a.alignDataLabel(e,n,d,null,v)}})};R.prototype.alignDataLabel=function(a,b,c,d,e){var f=this.chart,g=f.inverted,h=p(a.plotX,-999),i=p(a.plotY,-999),j=b.getBBox(),k=f.renderer.fontMetrics(c.style.fontSize).b,l=this.visible&&(a.series.forceDL||f.isInsidePlot(h,s(i),g)||d&&f.isInsidePlot(h,g?d.x+
+1:d.y+d.height-1,g));if(l)d=x({x:g?f.plotWidth-i:h,y:s(g?f.plotHeight-h:i),width:0,height:0},d),x(c,{width:j.width,height:j.height}),c.rotation?(a=f.renderer.rotCorr(k,c.rotation),b[e?"attr":"animate"]({x:d.x+c.x+d.width/2+a.x,y:d.y+c.y+d.height/2}).attr({align:c.align})):(b.align(c,null,d),g=b.alignAttr,p(c.overflow,"justify")==="justify"?this.justifyDataLabel(b,c,g,j,d,e):p(c.crop,!0)&&(l=f.isInsidePlot(g.x,g.y)&&f.isInsidePlot(g.x+j.width,g.y+j.height)),c.shape&&b.attr({anchorX:a.plotX,anchorY:a.plotY}));
+if(!l)b.attr({y:-999}),b.placed=!1};R.prototype.justifyDataLabel=function(a,b,c,d,e,f){var g=this.chart,h=b.align,i=b.verticalAlign,j,k,l=a.box?0:a.padding||0;j=c.x+l;if(j<0)h==="right"?b.align="left":b.x=-j,k=!0;j=c.x+d.width-l;if(j>g.plotWidth)h==="left"?b.align="right":b.x=g.plotWidth-j,k=!0;j=c.y+l;if(j<0)i==="bottom"?b.verticalAlign="top":b.y=-j,k=!0;j=c.y+d.height-l;if(j>g.plotHeight)i==="top"?b.verticalAlign="bottom":b.y=g.plotHeight-j,k=!0;if(k)a.placed=!f,a.align(b,null,e)};if(M.pie)M.pie.prototype.drawDataLabels=
+function(){var a=this,b=a.data,c,d=a.chart,e=a.options.dataLabels,f=p(e.connectorPadding,10),g=p(e.connectorWidth,1),h=d.plotWidth,i=d.plotHeight,j,k,l=p(e.softConnector,!0),m=e.distance,n=a.center,q=n[2]/2,r=n[1],x=m>0,y,t,w,A=[[],[]],B,z,F,E,G,D=[0,0,0,0],L=function(a,b){return b.y-a.y};if(a.visible&&(e.enabled||a._hasPointLabels)){R.prototype.drawDataLabels.apply(a);o(b,function(a){a.dataLabel&&a.visible&&A[a.half].push(a)});for(E=2;E--;){var I=[],M=[],H=A[E],K=H.length,J;if(K){a.sortByAngle(H,
+E-0.5);for(G=b=0;!b&&H[G];)b=H[G]&&H[G].dataLabel&&(H[G].dataLabel.getBBox().height||21),G++;if(m>0){t=C(r+q+m,d.plotHeight);for(G=v(0,r-q-m);G<=t;G+=b)I.push(G);t=I.length;if(K>t){c=[].concat(H);c.sort(L);for(G=K;G--;)c[G].rank=G;for(G=K;G--;)H[G].rank>=t&&H.splice(G,1);K=H.length}for(G=0;G<K;G++){c=H[G];w=c.labelPos;c=9999;var P,O;for(O=0;O<t;O++)P=N(I[O]-w[1]),P<c&&(c=P,J=O);if(J<G&&I[G]!==null)J=G;else for(t<K-G+J&&I[G]!==null&&(J=t-K+G);I[J]===null;)J++;M.push({i:J,y:I[J]});I[J]=null}M.sort(L)}for(G=
+0;G<K;G++){c=H[G];w=c.labelPos;y=c.dataLabel;F=c.visible===!1?"hidden":"inherit";c=w[1];if(m>0){if(t=M.pop(),J=t.i,z=t.y,c>z&&I[J+1]!==null||c<z&&I[J-1]!==null)z=C(v(0,c),d.plotHeight)}else z=c;B=e.justify?n[0]+(E?-1:1)*(q+m):a.getX(z===r-q-m||z===r+q+m?c:z,E);y._attr={visibility:F,align:w[6]};y._pos={x:B+e.x+({left:f,right:-f}[w[6]]||0),y:z+e.y-10};y.connX=B;y.connY=z;if(this.options.size===null)t=y.width,B-t<f?D[3]=v(s(t-B+f),D[3]):B+t>h-f&&(D[1]=v(s(B+t-h+f),D[1])),z-b/2<0?D[0]=v(s(-z+b/2),D[0]):
+z+b/2>i&&(D[2]=v(s(z+b/2-i),D[2]))}}}if(Fa(D)===0||this.verifyDataLabelOverflow(D))this.placeDataLabels(),x&&g&&o(this.points,function(b){j=b.connector;w=b.labelPos;if((y=b.dataLabel)&&y._pos&&b.visible)F=y._attr.visibility,B=y.connX,z=y.connY,k=l?["M",B+(w[6]==="left"?5:-5),z,"C",B,z,2*w[2]-w[4],2*w[3]-w[5],w[2],w[3],"L",w[4],w[5]]:["M",B+(w[6]==="left"?5:-5),z,"L",w[2],w[3],"L",w[4],w[5]],j?(j.animate({d:k}),j.attr("visibility",F)):b.connector=j=a.chart.renderer.path(k).attr({"stroke-width":g,stroke:e.connectorColor||
+b.color||"#606060",visibility:F}).add(a.dataLabelsGroup);else if(j)b.connector=j.destroy()})}},M.pie.prototype.placeDataLabels=function(){o(this.points,function(a){var b=a.dataLabel;if(b&&a.visible)(a=b._pos)?(b.attr(b._attr),b[b.moved?"animate":"attr"](a),b.moved=!0):b&&b.attr({y:-999})})},M.pie.prototype.alignDataLabel=na,M.pie.prototype.verifyDataLabelOverflow=function(a){var b=this.center,c=this.options,d=c.center,e=c.minSize||80,f=e,g;d[0]!==null?f=v(b[2]-v(a[1],a[3]),e):(f=v(b[2]-a[1]-a[3],
+e),b[0]+=(a[3]-a[1])/2);d[1]!==null?f=v(C(f,b[2]-v(a[0],a[2])),e):(f=v(C(f,b[2]-a[0]-a[2]),e),b[1]+=(a[0]-a[2])/2);f<b[2]?(b[2]=f,b[3]=/%$/.test(c.innerSize||0)?f*parseFloat(c.innerSize||0)/100:parseFloat(c.innerSize||0),this.translate(b),o(this.points,function(a){if(a.dataLabel)a.dataLabel._pos=null}),this.drawDataLabels&&this.drawDataLabels()):g=!0;return g};if(M.column)M.column.prototype.alignDataLabel=function(a,b,c,d,e){var f=this.chart.inverted,g=a.series,h=a.dlBox||a.shapeArgs,i=p(a.below,
+a.plotY>p(this.translatedThreshold,g.yAxis.len)),j=p(c.inside,!!this.options.stacking);if(h&&(d=A(h),f&&(d={x:g.yAxis.len-d.y-d.height,y:g.xAxis.len-d.x-d.width,width:d.height,height:d.width}),!j))f?(d.x+=i?0:d.width,d.width=0):(d.y+=i?d.height:0,d.height=0);c.align=p(c.align,!f||j?"center":i?"right":"left");c.verticalAlign=p(c.verticalAlign,f||j?"middle":i?"top":"bottom");R.prototype.alignDataLabel.call(this,a,b,c,d,e)};(function(a){var b=a.Chart,c=a.each,d=a.pick,e=HighchartsAdapter.addEvent;b.prototype.callbacks.push(function(a){function b(){var e=
+[];c(a.series,function(a){var b=a.options.dataLabels;(b.enabled||a._hasPointLabels)&&!b.allowOverlap&&a.visible&&c(a.points,function(a){if(a.dataLabel)a.dataLabel.labelrank=d(a.labelrank,a.shapeArgs&&a.shapeArgs.height),e.push(a.dataLabel)})});a.hideOverlappingLabels(e)}b();e(a,"redraw",b)});b.prototype.hideOverlappingLabels=function(a){var b=a.length,c,d,e,k;for(d=0;d<b;d++)if(c=a[d])c.oldOpacity=c.opacity,c.newOpacity=1;a.sort(function(a,b){return b.labelrank-a.labelrank});for(d=0;d<b;d++){e=a[d];
+for(c=d+1;c<b;++c)if(k=a[c],e&&k&&e.placed&&k.placed&&e.newOpacity!==0&&k.newOpacity!==0&&!(k.alignAttr.x>e.alignAttr.x+e.width||k.alignAttr.x+k.width<e.alignAttr.x||k.alignAttr.y>e.alignAttr.y+e.height||k.alignAttr.y+k.height<e.alignAttr.y))(e.labelrank<k.labelrank?e:k).newOpacity=0}for(d=0;d<b;d++)if(c=a[d]){if(c.oldOpacity!==c.newOpacity&&c.placed)c.alignAttr.opacity=c.newOpacity,c[c.isOld&&c.newOpacity?"animate":"attr"](c.alignAttr);c.isOld=!0}}})(z);U=z.TrackerMixin={drawTrackerPoint:function(){var a=
+this,b=a.chart,c=b.pointer,d=a.options.cursor,e=d&&{cursor:d},f=function(a){for(var c=a.target,d;c&&!d;)d=c.point,c=c.parentNode;if(d!==y&&d!==b.hoverPoint)d.onMouseOver(a)};o(a.points,function(a){if(a.graphic)a.graphic.element.point=a;if(a.dataLabel)a.dataLabel.element.point=a});if(!a._hasTracking)o(a.trackerGroups,function(b){if(a[b]&&(a[b].addClass("highcharts-tracker").on("mouseover",f).on("mouseout",function(a){c.onTrackerMouseOut(a)}).css(e),ab))a[b].on("touchstart",f)}),a._hasTracking=!0},
+drawTrackerGraph:function(){var a=this,b=a.options,c=b.trackByArea,d=[].concat(c?a.areaPath:a.graphPath),e=d.length,f=a.chart,g=f.pointer,h=f.renderer,i=f.options.tooltip.snap,j=a.tracker,k=b.cursor,l=k&&{cursor:k},k=a.singlePoints,m,n=function(){if(f.hoverSeries!==a)a.onMouseOver()},p="rgba(192,192,192,"+(ca?1.0E-4:0.002)+")";if(e&&!c)for(m=e+1;m--;)d[m]==="M"&&d.splice(m+1,0,d[m+1]-i,d[m+2],"L"),(m&&d[m]==="M"||m===e)&&d.splice(m,0,"L",d[m-2]+i,d[m-1]);for(m=0;m<k.length;m++)e=k[m],d.push("M",e.plotX-
+i,e.plotY,"L",e.plotX+i,e.plotY);j?j.attr({d:d}):(a.tracker=h.path(d).attr({"stroke-linejoin":"round",visibility:a.visible?"visible":"hidden",stroke:p,fill:c?p:O,"stroke-width":b.lineWidth+(c?0:2*i),zIndex:2}).add(a.group),o([a.tracker,a.markerGroup],function(a){a.addClass("highcharts-tracker").on("mouseover",n).on("mouseout",function(a){g.onTrackerMouseOut(a)}).css(l);if(ab)a.on("touchstart",n)}))}};if(M.column)xa.prototype.drawTracker=U.drawTrackerPoint;if(M.pie)M.pie.prototype.drawTracker=U.drawTrackerPoint;
+if(M.scatter)qa.prototype.drawTracker=U.drawTrackerPoint;x(nb.prototype,{setItemEvents:function(a,b,c,d,e){var f=this;(c?b:a.legendGroup).on("mouseover",function(){a.setState("hover");b.css(f.options.itemHoverStyle)}).on("mouseout",function(){b.css(a.visible?d:e);a.setState()}).on("click",function(b){var c=function(){a.setVisible()},b={browserEvent:b};a.firePointEvent?a.firePointEvent("legendItemClick",b,c):I(a,"legendItemClick",b,c)})},createCheckboxForItem:function(a){a.checkbox=$("input",{type:"checkbox",
+checked:a.selected,defaultChecked:a.selected},this.options.itemCheckboxStyle,this.chart.container);H(a.checkbox,"click",function(b){I(a.series||a,"checkboxClick",{checked:b.target.checked,item:a},function(){a.select()})})}});T.legend.itemStyle.cursor="pointer";x(E.prototype,{showResetZoom:function(){var a=this,b=T.lang,c=a.options.chart.resetZoomButton,d=c.theme,e=d.states,f=c.relativeTo==="chart"?null:"plotBox";this.resetZoomButton=a.renderer.button(b.resetZoom,null,null,function(){a.zoomOut()},
+d,e&&e.hover).attr({align:c.position.align,title:b.resetZoomTitle}).add().align(c.position,!1,f)},zoomOut:function(){var a=this;I(a,"selection",{resetSelection:!0},function(){a.zoom()})},zoom:function(a){var b,c=this.pointer,d=!1,e;!a||a.resetSelection?o(this.axes,function(a){b=a.zoom()}):o(a.xAxis.concat(a.yAxis),function(a){var e=a.axis,h=e.isXAxis;if(c[h?"zoomX":"zoomY"]||c[h?"pinchX":"pinchY"])b=e.zoom(a.min,a.max),e.displayBtn&&(d=!0)});e=this.resetZoomButton;if(d&&!e)this.showResetZoom();else if(!d&&
+da(e))this.resetZoomButton=e.destroy();b&&this.redraw(p(this.options.chart.animation,a&&a.animation,this.pointCount<100))},pan:function(a,b){var c=this,d=c.hoverPoints,e;d&&o(d,function(a){a.setState()});o(b==="xy"?[1,0]:[1],function(b){var d=a[b?"chartX":"chartY"],h=c[b?"xAxis":"yAxis"][0],i=c[b?"mouseDownX":"mouseDownY"],j=(h.pointRange||0)/2,k=h.getExtremes(),l=h.toValue(i-d,!0)+j,j=h.toValue(i+c[b?"plotWidth":"plotHeight"]-d,!0)-j,i=i>d;if(h.series.length&&(i||l>C(k.dataMin,k.min))&&(!i||j<v(k.dataMax,
+k.max)))h.setExtremes(l,j,!1,!1,{trigger:"pan"}),e=!0;c[b?"mouseDownX":"mouseDownY"]=d});e&&c.redraw(!1);L(c.container,{cursor:"move"})}});x(Ga.prototype,{select:function(a,b){var c=this,d=c.series,e=d.chart,a=p(a,!c.selected);c.firePointEvent(a?"select":"unselect",{accumulate:b},function(){c.selected=c.options.selected=a;d.options.data[Ma(c,d.data)]=c.options;c.setState(a&&"select");b||o(e.getSelectedPoints(),function(a){if(a.selected&&a!==c)a.selected=a.options.selected=!1,d.options.data[Ma(a,d.data)]=
+a.options,a.setState(""),a.firePointEvent("unselect")})})},onMouseOver:function(a){var b=this.series,c=b.chart,d=c.tooltip,e=c.hoverPoint;if(c.hoverSeries!==b)b.onMouseOver();if(e&&e!==this)e.onMouseOut();this.firePointEvent("mouseOver");d&&(!d.shared||b.noSharedTooltip)&&d.refresh(this,a);this.setState("hover");c.hoverPoint=this},onMouseOut:function(){var a=this.series.chart,b=a.hoverPoints;this.firePointEvent("mouseOut");if(!b||Ma(this,b)===-1)this.setState(),a.hoverPoint=null},importEvents:function(){if(!this.hasImportedEvents){var a=
+A(this.series.options.point,this.options).events,b;this.events=a;for(b in a)H(this,b,a[b]);this.hasImportedEvents=!0}},setState:function(a,b){var c=this.plotX,d=this.plotY,e=this.series,f=e.options.states,g=ba[e.type].marker&&e.options.marker,h=g&&!g.enabled,i=g&&g.states[a],j=i&&i.enabled===!1,k=e.stateMarkerGraphic,l=this.marker||{},m=e.chart,n=e.halo,o,a=a||"";o=this.pointAttr[a]||e.pointAttr[a];if(!(a===this.state&&!b||this.selected&&a!=="select"||f[a]&&f[a].enabled===!1||a&&(j||h&&i.enabled===
+!1)||a&&l.states&&l.states[a]&&l.states[a].enabled===!1)){if(this.graphic)g=g&&this.graphic.symbolName&&o.r,this.graphic.attr(A(o,g?{x:c-g,y:d-g,width:2*g,height:2*g}:{})),k&&k.hide();else{if(a&&i)if(g=i.radius,l=l.symbol||e.symbol,k&&k.currentSymbol!==l&&(k=k.destroy()),k)k[b?"animate":"attr"]({x:c-g,y:d-g});else if(l)e.stateMarkerGraphic=k=m.renderer.symbol(l,c-g,d-g,2*g,2*g).attr(o).add(e.markerGroup),k.currentSymbol=l;if(k)k[a&&m.isInsidePlot(c,d,m.inverted)?"show":"hide"]()}if((c=f[a]&&f[a].halo)&&
+c.size){if(!n)e.halo=n=m.renderer.path().add(m.seriesGroup);n.attr(x({fill:oa(this.color||e.color).setOpacity(c.opacity).get()},c.attributes))[b?"animate":"attr"]({d:this.haloPath(c.size)})}else n&&n.attr({d:[]});this.state=a}},haloPath:function(a){var b=this.series,c=b.chart,d=b.getPlotBox(),e=c.inverted;return c.renderer.symbols.circle(d.translateX+(e?b.yAxis.len-this.plotY:this.plotX)-a,d.translateY+(e?b.xAxis.len-this.plotX:this.plotY)-a,a*2,a*2)}});x(R.prototype,{onMouseOver:function(){var a=
+this.chart,b=a.hoverSeries;if(b&&b!==this)b.onMouseOut();this.options.events.mouseOver&&I(this,"mouseOver");this.setState("hover");a.hoverSeries=this},onMouseOut:function(){var a=this.options,b=this.chart,c=b.tooltip,d=b.hoverPoint;b.hoverSeries=null;if(d)d.onMouseOut();this&&a.events.mouseOut&&I(this,"mouseOut");c&&!a.stickyTracking&&(!c.shared||this.noSharedTooltip)&&c.hide();this.setState()},setState:function(a){var b=this.options,c=this.graph,d=b.states,e=b.lineWidth,b=0,a=a||"";if(this.state!==
+a&&(this.state=a,!(d[a]&&d[a].enabled===!1)&&(a&&(e=d[a].lineWidth||e+(d[a].lineWidthPlus||0)),c&&!c.dashstyle))){a={"stroke-width":e};for(c.attr(a);this["zoneGraph"+b];)this["zoneGraph"+b].attr(a),b+=1}},setVisible:function(a,b){var c=this,d=c.chart,e=c.legendItem,f,g=d.options.chart.ignoreHiddenSeries,h=c.visible;f=(c.visible=a=c.userOptions.visible=a===y?!h:a)?"show":"hide";o(["group","dataLabelsGroup","markerGroup","tracker"],function(a){if(c[a])c[a][f]()});if(d.hoverSeries===c||(d.hoverPoint&&
+d.hoverPoint.series)===c)c.onMouseOut();e&&d.legend.colorizeItem(c,a);c.isDirty=!0;c.options.stacking&&o(d.series,function(a){if(a.options.stacking&&a.visible)a.isDirty=!0});o(c.linkedSeries,function(b){b.setVisible(a,!1)});if(g)d.isDirtyBox=!0;b!==!1&&d.redraw();I(c,f)},show:function(){this.setVisible(!0)},hide:function(){this.setVisible(!1)},select:function(a){this.selected=a=a===y?!this.selected:a;if(this.checkbox)this.checkbox.checked=a;I(this,a?"select":"unselect")},drawTracker:U.drawTrackerGraph});
+x(z,{Color:oa,Point:Ga,Tick:Ta,Renderer:$a,SVGElement:P,SVGRenderer:ua,arrayMin:Pa,arrayMax:Fa,charts:Y,dateFormat:Oa,error:la,format:Ja,pathAnim:zb,getOptions:function(){return T},hasBidiBug:Nb,isTouchDevice:Jb,setOptions:function(a){T=A(!0,T,a);Cb();return T},addEvent:H,removeEvent:Z,createElement:$,discardElement:Ra,css:L,each:o,map:Ua,merge:A,splat:sa,extendClass:ka,pInt:F,svg:ca,canvas:fa,vml:!ca&&!fa,product:"Highcharts",version:"4.1.6"})})();
diff --git a/data/interfaces/default/js/highcharts/js/modules/broken-axis.js b/data/interfaces/default/js/highcharts/js/modules/broken-axis.js
new file mode 100644
index 00000000..1ccc85bf
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/modules/broken-axis.js
@@ -0,0 +1,6 @@
+(function(h){function p(){return Array.prototype.slice.call(arguments,1)}var q=h.pick,n=h.wrap,r=h.extend,o=HighchartsAdapter.fireEvent,k=h.Axis,s=h.Series;r(k.prototype,{isInBreak:function(f,d){var a=f.repeat||Infinity,c=f.from,b=f.to-f.from,a=d>=c?(d-c)%a:a-(c-d)%a;return f.inclusive?a<=b:a<b&&a!==0},isInAnyBreak:function(f,d){if(!this.options.breaks)return!1;for(var a=this.options.breaks,c=a.length,b=!1,e=!1;c--;)this.isInBreak(a[c],f)&&(b=!0,e||(e=q(a[c].showPoints,this.isXAxis?!1:!0)));return b&&
+d?b&&!e:b}});n(k.prototype,"setTickPositions",function(f){f.apply(this,Array.prototype.slice.call(arguments,1));if(this.options.breaks){var d=this.tickPositions,a=this.tickPositions.info,c=[],b;if(!(a&&a.totalRange>=this.closestPointRange)){for(b=0;b<d.length;b++)this.isInAnyBreak(d[b])||c.push(d[b]);this.tickPositions=c;this.tickPositions.info=a}}});n(k.prototype,"init",function(f,d,a){if(a.breaks&&a.breaks.length)a.ordinal=!1;f.call(this,d,a);if(this.options.breaks){var c=this;c.doPostTranslate=
+!0;this.val2lin=function(b){var e=b,a,d;for(d=0;d<c.breakArray.length;d++)if(a=c.breakArray[d],a.to<=b)e-=a.len;else if(a.from>=b)break;else if(c.isInBreak(a,b)){e-=b-a.from;break}return e};this.lin2val=function(b){var e,a;for(a=0;a<c.breakArray.length;a++)if(e=c.breakArray[a],e.from>=b)break;else e.to<b?b+=e.to-e.from:c.isInBreak(e,b)&&(b+=e.to-e.from);return b};this.setExtremes=function(b,c,a,d,f){for(;this.isInAnyBreak(b);)b-=this.closestPointRange;for(;this.isInAnyBreak(c);)c-=this.closestPointRange;
+k.prototype.setExtremes.call(this,b,c,a,d,f)};this.setAxisTranslation=function(b){k.prototype.setAxisTranslation.call(this,b);var a=c.options.breaks,b=[],d=[],f=0,j,g,l=c.userMin||c.min,m=c.userMax||c.max,i,h;for(h in a)g=a[h],j=g.repeat||Infinity,c.isInBreak(g,l)&&(l+=g.to%j-l%j),c.isInBreak(g,m)&&(m-=m%j-g.from%j);for(h in a){g=a[h];i=g.from;for(j=g.repeat||Infinity;i-j>l;)i-=j;for(;i<l;)i+=j;for(;i<m;i+=j)b.push({value:i,move:"in"}),b.push({value:i+(g.to-g.from),move:"out",size:g.breakSize})}b.sort(function(a,
+b){return a.value===b.value?(a.move==="in"?0:1)-(b.move==="in"?0:1):a.value-b.value});a=0;i=l;for(h in b){g=b[h];a+=g.move==="in"?1:-1;if(a===1&&g.move==="in")i=g.value;a===0&&(d.push({from:i,to:g.value,len:g.value-i-(g.size||0)}),f+=g.value-i-(g.size||0))}c.breakArray=d;o(c,"afterBreaks");c.transA*=(m-c.min)/(m-l-f);c.min=l;c.max=m}}});n(s.prototype,"generatePoints",function(f){f.apply(this,p(arguments));var d=this.xAxis,a=this.yAxis,c=this.points,b,e=c.length;if(d&&a&&(d.options.breaks||a.options.breaks))for(;e--;)if(b=
+c[e],d.isInAnyBreak(b.x,!0)||a.isInAnyBreak(b.y,!0))c.splice(e,1),this.data[e]&&this.data[e].destroyElements()});n(h.seriesTypes.column.prototype,"drawPoints",function(f){f.apply(this);var f=this.points,d=this.yAxis,a=d.breakArray||[],c,b,e,h,k;for(e=0;e<f.length;e++){c=f[e];k=c.stackY||c.y;for(h=0;h<a.length;h++)if(b=a[h],k<b.from)break;else k>b.to?o(d,"pointBreak",{point:c,brk:b}):o(d,"pointInBreak",{point:c,brk:b})}})})(Highcharts);
diff --git a/data/interfaces/default/js/highcharts/js/modules/broken-axis.src.js b/data/interfaces/default/js/highcharts/js/modules/broken-axis.src.js
new file mode 100644
index 00000000..00eaa126
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/modules/broken-axis.src.js
@@ -0,0 +1,306 @@
+/**
+ * Highcharts JS v4.1.6 (2015-06-12)
+ * Highcharts Broken Axis module
+ * 
+ * Author: Stephane Vanraes, Torstein Honsi
+ * License: www.highcharts.com/license
+ */
+
+/*global HighchartsAdapter*/
+(function (H) {	
+
+	"use strict";
+
+	var pick = H.pick,
+		wrap = H.wrap,
+		extend = H.extend,
+		fireEvent = HighchartsAdapter.fireEvent,
+		Axis = H.Axis,
+		Series = H.Series;
+
+	function stripArguments() {
+		return Array.prototype.slice.call(arguments, 1);
+	}
+
+	extend(Axis.prototype, {
+		isInBreak: function (brk, val) {
+			var repeat = brk.repeat || Infinity,
+				from = brk.from,
+				length = brk.to - brk.from,
+				test = (val >= from ? (val - from) % repeat :  repeat - ((from - val) % repeat));
+
+			if (!brk.inclusive) {
+				return (test < length && test !== 0);
+			} else {
+				return (test <= length);
+			}
+		},
+
+		isInAnyBreak: function (val, testKeep) {
+			// Sanity Check			
+			if (!this.options.breaks) { return false; }
+
+			var breaks = this.options.breaks,
+				i = breaks.length,
+				inbrk = false,
+				keep = false;
+
+
+			while (i--) {
+				if (this.isInBreak(breaks[i], val)) {
+					inbrk = true;
+					if (!keep) {
+						keep = pick(breaks[i].showPoints, this.isXAxis ? false : true);
+					}
+				}
+			}
+
+			if (inbrk && testKeep) {
+				return inbrk && !keep;
+			} else {
+				return inbrk;
+			}
+		}
+	});
+
+	wrap(Axis.prototype, 'setTickPositions', function (proceed) {
+		proceed.apply(this, Array.prototype.slice.call(arguments, 1));
+		
+		if (this.options.breaks) {
+			var axis = this,
+				tickPositions = this.tickPositions,
+				info = this.tickPositions.info,
+				newPositions = [],
+				i;
+
+			if (info && info.totalRange >= axis.closestPointRange) { 
+				return;
+			}
+
+			for (i = 0; i < tickPositions.length; i++) {
+				if (!axis.isInAnyBreak(tickPositions[i])) {
+					newPositions.push(tickPositions[i]);
+				}
+			}
+
+			this.tickPositions = newPositions;
+			this.tickPositions.info = info;
+		}
+	});
+	
+	wrap(Axis.prototype, 'init', function (proceed, chart, userOptions) {
+		// Force Axis to be not-ordinal when breaks are defined
+		if (userOptions.breaks && userOptions.breaks.length) {
+			userOptions.ordinal = false;
+		}
+
+		proceed.call(this, chart, userOptions);
+
+		if (this.options.breaks) {
+
+			var axis = this;
+			
+			axis.doPostTranslate = true;
+
+			this.val2lin = function (val) {
+				var nval = val,
+					brk,
+					i;
+
+				for (i = 0; i < axis.breakArray.length; i++) {
+					brk = axis.breakArray[i];
+					if (brk.to <= val) {
+						nval -= (brk.len);
+					} else if (brk.from >= val) {
+						break;
+					} else if (axis.isInBreak(brk, val)) {
+						nval -= (val - brk.from);
+						break;
+					}
+				}
+
+				return nval;
+			};
+			
+			this.lin2val = function (val) {
+				var nval = val,
+					brk,
+					i;
+
+				for (i = 0; i < axis.breakArray.length; i++) {
+					brk = axis.breakArray[i];
+					if (brk.from >= nval) {
+						break;
+					} else if (brk.to < nval) {
+						nval += (brk.to - brk.from);
+					} else if (axis.isInBreak(brk, nval)) {
+						nval += (brk.to - brk.from);
+					}
+				}
+
+				return nval;
+			};
+
+			this.setExtremes = function (newMin, newMax, redraw, animation, eventArguments) {
+				// If trying to set extremes inside a break, extend it to before and after the break ( #3857 )
+				while (this.isInAnyBreak(newMin)) {
+					newMin -= this.closestPointRange;
+				}				
+				while (this.isInAnyBreak(newMax)) {
+					newMax -= this.closestPointRange;
+				}
+				Axis.prototype.setExtremes.call(this, newMin, newMax, redraw, animation, eventArguments);
+			};
+
+			this.setAxisTranslation = function (saveOld) {
+				Axis.prototype.setAxisTranslation.call(this, saveOld);
+
+				var breaks = axis.options.breaks,
+					breakArrayT = [],	// Temporary one
+					breakArray = [],
+					length = 0, 
+					inBrk,
+					repeat,
+					brk,
+					min = axis.userMin || axis.min,
+					max = axis.userMax || axis.max,
+					start,
+					i,
+					j;
+
+				// Min & max check (#4247)
+				for (i in breaks) {
+					brk = breaks[i];
+					repeat = brk.repeat || Infinity;
+					if (axis.isInBreak(brk, min)) {
+						min += (brk.to % repeat) - (min % repeat);
+					}
+					if (axis.isInBreak(brk, max)) {
+						max -= (max % repeat) - (brk.from % repeat);
+					}
+				}
+
+				// Construct an array holding all breaks in the axis
+				for (i in breaks) {
+					brk = breaks[i];
+					start = brk.from;
+					repeat = brk.repeat || Infinity;
+
+					while (start - repeat > min) {
+						start -= repeat;
+					}
+					while (start < min) {
+						start += repeat;
+					}
+
+					for (j = start; j < max; j += repeat) {
+						breakArrayT.push({
+							value: j,
+							move: 'in'
+						});
+						breakArrayT.push({
+							value: j + (brk.to - brk.from),
+							move: 'out',
+							size: brk.breakSize
+						});
+					}
+				}
+
+				breakArrayT.sort(function (a, b) {
+					if (a.value === b.value) {
+						return (a.move === 'in' ? 0 : 1) - (b.move === 'in' ? 0 : 1);
+					} else {
+						return a.value - b.value;
+					}
+				});
+				
+				// Simplify the breaks
+				inBrk = 0;
+				start = min;
+
+				for (i in breakArrayT) {
+					brk = breakArrayT[i];
+					inBrk += (brk.move === 'in' ? 1 : -1);
+
+					if (inBrk === 1 && brk.move === 'in') {
+						start = brk.value;
+					}
+					if (inBrk === 0) {
+						breakArray.push({
+							from: start,
+							to: brk.value,
+							len: brk.value - start - (brk.size || 0)
+						});
+						length += brk.value - start - (brk.size || 0);
+					}
+				}
+
+				axis.breakArray = breakArray;
+
+				fireEvent(axis, 'afterBreaks');
+				
+				axis.transA *= ((max - axis.min) / (max - min - length));
+
+				axis.min = min;
+				axis.max = max;
+			};
+		}
+	});
+
+	wrap(Series.prototype, 'generatePoints', function (proceed) {
+
+		proceed.apply(this, stripArguments(arguments));
+
+		var series = this,
+			xAxis = series.xAxis,
+			yAxis = series.yAxis,
+			points = series.points,
+			point,
+			i = points.length;
+
+
+		if (xAxis && yAxis && (xAxis.options.breaks || yAxis.options.breaks)) {
+			while (i--) {
+				point = points[i];
+
+				if (xAxis.isInAnyBreak(point.x, true) || yAxis.isInAnyBreak(point.y, true)) {
+					points.splice(i, 1);
+					if (this.data[i]) {
+						this.data[i].destroyElements(); // removes the graphics for this point if they exist
+					}
+				}
+			}
+		}
+
+	});
+
+	wrap(H.seriesTypes.column.prototype, 'drawPoints', function (proceed) {
+		proceed.apply(this);
+
+		var series = this,
+			points = series.points,
+			yAxis = series.yAxis,
+			breaks = yAxis.breakArray || [],
+			point,
+			brk,
+			i,
+			j,
+			y;
+
+		for (i = 0; i < points.length; i++) {
+			point = points[i];
+			y = point.stackY || point.y;
+			for (j = 0; j < breaks.length; j++) {
+				brk = breaks[j];
+				if (y < brk.from) {
+					break;
+				} else if (y > brk.to) {
+					fireEvent(yAxis, 'pointBreak', {point: point, brk: brk});
+				} else {
+					fireEvent(yAxis, 'pointInBreak', {point: point, brk: brk});
+				}
+			}
+		}
+
+	});
+}(Highcharts));
diff --git a/data/interfaces/default/js/highcharts/js/modules/canvas-tools.js b/data/interfaces/default/js/highcharts/js/modules/canvas-tools.js
new file mode 100644
index 00000000..a1d36fbb
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/modules/canvas-tools.js
@@ -0,0 +1,133 @@
+/*
+ A class to parse color values
+ @author Stoyan Stefanov <sstoo@gmail.com>
+ @link   http://www.phpied.com/rgb-color-parser-in-javascript/
+ Use it if you like it
+
+ canvg.js - Javascript SVG parser and renderer on Canvas
+ MIT Licensed 
+ Gabe Lerner (gabelerner@gmail.com)
+ http://code.google.com/p/canvg/
+
+ Requires: rgbcolor.js - http://www.phpied.com/rgb-color-parser-in-javascript/
+
+ Highcharts JS v4.1.6 (2015-06-12)
+ CanVGRenderer Extension module
+
+ (c) 2011-2012 Torstein Honsi, Erik Olsson
+
+ License: www.highcharts.com/license
+*/
+function RGBColor(m){this.ok=!1;m.charAt(0)=="#"&&(m=m.substr(1,6));var m=m.replace(/ /g,""),m=m.toLowerCase(),a={aliceblue:"f0f8ff",antiquewhite:"faebd7",aqua:"00ffff",aquamarine:"7fffd4",azure:"f0ffff",beige:"f5f5dc",bisque:"ffe4c4",black:"000000",blanchedalmond:"ffebcd",blue:"0000ff",blueviolet:"8a2be2",brown:"a52a2a",burlywood:"deb887",cadetblue:"5f9ea0",chartreuse:"7fff00",chocolate:"d2691e",coral:"ff7f50",cornflowerblue:"6495ed",cornsilk:"fff8dc",crimson:"dc143c",cyan:"00ffff",darkblue:"00008b",
+darkcyan:"008b8b",darkgoldenrod:"b8860b",darkgray:"a9a9a9",darkgreen:"006400",darkkhaki:"bdb76b",darkmagenta:"8b008b",darkolivegreen:"556b2f",darkorange:"ff8c00",darkorchid:"9932cc",darkred:"8b0000",darksalmon:"e9967a",darkseagreen:"8fbc8f",darkslateblue:"483d8b",darkslategray:"2f4f4f",darkturquoise:"00ced1",darkviolet:"9400d3",deeppink:"ff1493",deepskyblue:"00bfff",dimgray:"696969",dodgerblue:"1e90ff",feldspar:"d19275",firebrick:"b22222",floralwhite:"fffaf0",forestgreen:"228b22",fuchsia:"ff00ff",
+gainsboro:"dcdcdc",ghostwhite:"f8f8ff",gold:"ffd700",goldenrod:"daa520",gray:"808080",green:"008000",greenyellow:"adff2f",honeydew:"f0fff0",hotpink:"ff69b4",indianred:"cd5c5c",indigo:"4b0082",ivory:"fffff0",khaki:"f0e68c",lavender:"e6e6fa",lavenderblush:"fff0f5",lawngreen:"7cfc00",lemonchiffon:"fffacd",lightblue:"add8e6",lightcoral:"f08080",lightcyan:"e0ffff",lightgoldenrodyellow:"fafad2",lightgrey:"d3d3d3",lightgreen:"90ee90",lightpink:"ffb6c1",lightsalmon:"ffa07a",lightseagreen:"20b2aa",lightskyblue:"87cefa",
+lightslateblue:"8470ff",lightslategray:"778899",lightsteelblue:"b0c4de",lightyellow:"ffffe0",lime:"00ff00",limegreen:"32cd32",linen:"faf0e6",magenta:"ff00ff",maroon:"800000",mediumaquamarine:"66cdaa",mediumblue:"0000cd",mediumorchid:"ba55d3",mediumpurple:"9370d8",mediumseagreen:"3cb371",mediumslateblue:"7b68ee",mediumspringgreen:"00fa9a",mediumturquoise:"48d1cc",mediumvioletred:"c71585",midnightblue:"191970",mintcream:"f5fffa",mistyrose:"ffe4e1",moccasin:"ffe4b5",navajowhite:"ffdead",navy:"000080",
+oldlace:"fdf5e6",olive:"808000",olivedrab:"6b8e23",orange:"ffa500",orangered:"ff4500",orchid:"da70d6",palegoldenrod:"eee8aa",palegreen:"98fb98",paleturquoise:"afeeee",palevioletred:"d87093",papayawhip:"ffefd5",peachpuff:"ffdab9",peru:"cd853f",pink:"ffc0cb",plum:"dda0dd",powderblue:"b0e0e6",purple:"800080",red:"ff0000",rosybrown:"bc8f8f",royalblue:"4169e1",saddlebrown:"8b4513",salmon:"fa8072",sandybrown:"f4a460",seagreen:"2e8b57",seashell:"fff5ee",sienna:"a0522d",silver:"c0c0c0",skyblue:"87ceeb",slateblue:"6a5acd",
+slategray:"708090",snow:"fffafa",springgreen:"00ff7f",steelblue:"4682b4",tan:"d2b48c",teal:"008080",thistle:"d8bfd8",tomato:"ff6347",turquoise:"40e0d0",violet:"ee82ee",violetred:"d02090",wheat:"f5deb3",white:"ffffff",whitesmoke:"f5f5f5",yellow:"ffff00",yellowgreen:"9acd32"},c;for(c in a)m==c&&(m=a[c]);var d=[{re:/^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/,example:["rgb(123, 234, 45)","rgb(255,234,245)"],process:function(b){return[parseInt(b[1]),parseInt(b[2]),parseInt(b[3])]}},{re:/^(\w{2})(\w{2})(\w{2})$/,
+example:["#00ff00","336699"],process:function(b){return[parseInt(b[1],16),parseInt(b[2],16),parseInt(b[3],16)]}},{re:/^(\w{1})(\w{1})(\w{1})$/,example:["#fb0","f0f"],process:function(b){return[parseInt(b[1]+b[1],16),parseInt(b[2]+b[2],16),parseInt(b[3]+b[3],16)]}}];for(c=0;c<d.length;c++){var b=d[c].process,k=d[c].re.exec(m);if(k)channels=b(k),this.r=channels[0],this.g=channels[1],this.b=channels[2],this.ok=!0}this.r=this.r<0||isNaN(this.r)?0:this.r>255?255:this.r;this.g=this.g<0||isNaN(this.g)?0:
+this.g>255?255:this.g;this.b=this.b<0||isNaN(this.b)?0:this.b>255?255:this.b;this.toRGB=function(){return"rgb("+this.r+", "+this.g+", "+this.b+")"};this.toHex=function(){var b=this.r.toString(16),a=this.g.toString(16),d=this.b.toString(16);b.length==1&&(b="0"+b);a.length==1&&(a="0"+a);d.length==1&&(d="0"+d);return"#"+b+a+d};this.getHelpXML=function(){for(var b=[],k=0;k<d.length;k++)for(var c=d[k].example,j=0;j<c.length;j++)b[b.length]=c[j];for(var h in a)b[b.length]=h;c=document.createElement("ul");
+c.setAttribute("id","rgbcolor-examples");for(k=0;k<b.length;k++)try{var l=document.createElement("li"),o=new RGBColor(b[k]),n=document.createElement("div");n.style.cssText="margin: 3px; border: 1px solid black; background:"+o.toHex()+"; color:"+o.toHex();n.appendChild(document.createTextNode("test"));var q=document.createTextNode(" "+b[k]+" -> "+o.toRGB()+" -> "+o.toHex());l.appendChild(n);l.appendChild(q);c.appendChild(l)}catch(p){}return c}}
+if(!window.console)window.console={},window.console.log=function(){},window.console.dir=function(){};if(!Array.prototype.indexOf)Array.prototype.indexOf=function(m){for(var a=0;a<this.length;a++)if(this[a]==m)return a;return-1};
+(function(){function m(){var a={FRAMERATE:30,MAX_VIRTUAL_PIXELS:3E4};a.init=function(c){a.Definitions={};a.Styles={};a.Animations=[];a.Images=[];a.ctx=c;a.ViewPort=new function(){this.viewPorts=[];this.Clear=function(){this.viewPorts=[]};this.SetCurrent=function(a,b){this.viewPorts.push({width:a,height:b})};this.RemoveCurrent=function(){this.viewPorts.pop()};this.Current=function(){return this.viewPorts[this.viewPorts.length-1]};this.width=function(){return this.Current().width};this.height=function(){return this.Current().height};
+this.ComputeSize=function(a){return a!=null&&typeof a=="number"?a:a=="x"?this.width():a=="y"?this.height():Math.sqrt(Math.pow(this.width(),2)+Math.pow(this.height(),2))/Math.sqrt(2)}}};a.init();a.ImagesLoaded=function(){for(var c=0;c<a.Images.length;c++)if(!a.Images[c].loaded)return!1;return!0};a.trim=function(a){return a.replace(/^\s+|\s+$/g,"")};a.compressSpaces=function(a){return a?a.replace(/[\s\r\t\n]+/gm," "):""};a.ajax=function(a){var d;return(d=window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject("Microsoft.XMLHTTP"))?
+(d.open("GET",a,!1),d.send(null),d.responseText):null};a.parseXml=function(a){if(window.DOMParser)return(new DOMParser).parseFromString(a,"text/xml");else{var a=a.replace(/<!DOCTYPE svg[^>]*>/,""),d=new ActiveXObject("Microsoft.XMLDOM");d.async="false";d.loadXML(a);return d}};a.Property=function(c,d){this.name=c;this.value=d;this.hasValue=function(){return this.value!=null&&this.value!==""};this.numValue=function(){if(!this.hasValue())return 0;var b=parseFloat(this.value);(this.value+"").match(/%$/)&&
+(b/=100);return b};this.valueOrDefault=function(b){return this.hasValue()?this.value:b};this.numValueOrDefault=function(b){return this.hasValue()?this.numValue():b};var b=this;this.Color={addOpacity:function(d){var c=b.value;if(d!=null&&d!=""){var f=new RGBColor(b.value);f.ok&&(c="rgba("+f.r+", "+f.g+", "+f.b+", "+d+")")}return new a.Property(b.name,c)}};this.Definition={getDefinition:function(){var d=b.value.replace(/^(url\()?#([^\)]+)\)?$/,"$2");return a.Definitions[d]},isUrl:function(){return b.value.indexOf("url(")==
+0},getFillStyle:function(b){var d=this.getDefinition();return d!=null&&d.createGradient?d.createGradient(a.ctx,b):d!=null&&d.createPattern?d.createPattern(a.ctx,b):null}};this.Length={DPI:function(){return 96},EM:function(b){var d=12,c=new a.Property("fontSize",a.Font.Parse(a.ctx.font).fontSize);c.hasValue()&&(d=c.Length.toPixels(b));return d},toPixels:function(d){if(!b.hasValue())return 0;var c=b.value+"";return c.match(/em$/)?b.numValue()*this.EM(d):c.match(/ex$/)?b.numValue()*this.EM(d)/2:c.match(/px$/)?
+b.numValue():c.match(/pt$/)?b.numValue()*1.25:c.match(/pc$/)?b.numValue()*15:c.match(/cm$/)?b.numValue()*this.DPI(d)/2.54:c.match(/mm$/)?b.numValue()*this.DPI(d)/25.4:c.match(/in$/)?b.numValue()*this.DPI(d):c.match(/%$/)?b.numValue()*a.ViewPort.ComputeSize(d):b.numValue()}};this.Time={toMilliseconds:function(){if(!b.hasValue())return 0;var a=b.value+"";if(a.match(/s$/))return b.numValue()*1E3;a.match(/ms$/);return b.numValue()}};this.Angle={toRadians:function(){if(!b.hasValue())return 0;var a=b.value+
+"";return a.match(/deg$/)?b.numValue()*(Math.PI/180):a.match(/grad$/)?b.numValue()*(Math.PI/200):a.match(/rad$/)?b.numValue():b.numValue()*(Math.PI/180)}}};a.Font=new function(){this.Styles=["normal","italic","oblique","inherit"];this.Variants=["normal","small-caps","inherit"];this.Weights="normal,bold,bolder,lighter,100,200,300,400,500,600,700,800,900,inherit".split(",");this.CreateFont=function(d,b,c,e,f,g){g=g!=null?this.Parse(g):this.CreateFont("","","","","",a.ctx.font);return{fontFamily:f||
+g.fontFamily,fontSize:e||g.fontSize,fontStyle:d||g.fontStyle,fontWeight:c||g.fontWeight,fontVariant:b||g.fontVariant,toString:function(){return[this.fontStyle,this.fontVariant,this.fontWeight,this.fontSize,this.fontFamily].join(" ")}}};var c=this;this.Parse=function(d){for(var b={},d=a.trim(a.compressSpaces(d||"")).split(" "),k=!1,e=!1,f=!1,g=!1,j="",h=0;h<d.length;h++)if(!e&&c.Styles.indexOf(d[h])!=-1){if(d[h]!="inherit")b.fontStyle=d[h];e=!0}else if(!g&&c.Variants.indexOf(d[h])!=-1){if(d[h]!="inherit")b.fontVariant=
+d[h];e=g=!0}else if(!f&&c.Weights.indexOf(d[h])!=-1){if(d[h]!="inherit")b.fontWeight=d[h];e=g=f=!0}else if(k)d[h]!="inherit"&&(j+=d[h]);else{if(d[h]!="inherit")b.fontSize=d[h].split("/")[0];e=g=f=k=!0}if(j!="")b.fontFamily=j;return b}};a.ToNumberArray=function(c){for(var c=a.trim(a.compressSpaces((c||"").replace(/,/g," "))).split(" "),d=0;d<c.length;d++)c[d]=parseFloat(c[d]);return c};a.Point=function(a,d){this.x=a;this.y=d;this.angleTo=function(b){return Math.atan2(b.y-this.y,b.x-this.x)};this.applyTransform=
+function(b){var a=this.x*b[1]+this.y*b[3]+b[5];this.x=this.x*b[0]+this.y*b[2]+b[4];this.y=a}};a.CreatePoint=function(c){c=a.ToNumberArray(c);return new a.Point(c[0],c[1])};a.CreatePath=function(c){for(var c=a.ToNumberArray(c),d=[],b=0;b<c.length;b+=2)d.push(new a.Point(c[b],c[b+1]));return d};a.BoundingBox=function(a,d,b,k){this.y2=this.x2=this.y1=this.x1=Number.NaN;this.x=function(){return this.x1};this.y=function(){return this.y1};this.width=function(){return this.x2-this.x1};this.height=function(){return this.y2-
+this.y1};this.addPoint=function(b,a){if(b!=null){if(isNaN(this.x1)||isNaN(this.x2))this.x2=this.x1=b;if(b<this.x1)this.x1=b;if(b>this.x2)this.x2=b}if(a!=null){if(isNaN(this.y1)||isNaN(this.y2))this.y2=this.y1=a;if(a<this.y1)this.y1=a;if(a>this.y2)this.y2=a}};this.addX=function(b){this.addPoint(b,null)};this.addY=function(b){this.addPoint(null,b)};this.addBoundingBox=function(b){this.addPoint(b.x1,b.y1);this.addPoint(b.x2,b.y2)};this.addQuadraticCurve=function(b,a,d,c,k,l){d=b+2/3*(d-b);c=a+2/3*(c-
+a);this.addBezierCurve(b,a,d,d+1/3*(k-b),c,c+1/3*(l-a),k,l)};this.addBezierCurve=function(b,a,d,c,k,l,o,n){var q=[b,a],p=[d,c],t=[k,l],m=[o,n];this.addPoint(q[0],q[1]);this.addPoint(m[0],m[1]);for(i=0;i<=1;i++)b=function(b){return Math.pow(1-b,3)*q[i]+3*Math.pow(1-b,2)*b*p[i]+3*(1-b)*Math.pow(b,2)*t[i]+Math.pow(b,3)*m[i]},a=6*q[i]-12*p[i]+6*t[i],d=-3*q[i]+9*p[i]-9*t[i]+3*m[i],c=3*p[i]-3*q[i],d==0?a!=0&&(a=-c/a,0<a&&a<1&&(i==0&&this.addX(b(a)),i==1&&this.addY(b(a)))):(c=Math.pow(a,2)-4*c*d,c<0||(k=
+(-a+Math.sqrt(c))/(2*d),0<k&&k<1&&(i==0&&this.addX(b(k)),i==1&&this.addY(b(k))),a=(-a-Math.sqrt(c))/(2*d),0<a&&a<1&&(i==0&&this.addX(b(a)),i==1&&this.addY(b(a)))))};this.isPointInBox=function(b,a){return this.x1<=b&&b<=this.x2&&this.y1<=a&&a<=this.y2};this.addPoint(a,d);this.addPoint(b,k)};a.Transform=function(c){var d=this;this.Type={};this.Type.translate=function(b){this.p=a.CreatePoint(b);this.apply=function(b){b.translate(this.p.x||0,this.p.y||0)};this.applyToPoint=function(b){b.applyTransform([1,
+0,0,1,this.p.x||0,this.p.y||0])}};this.Type.rotate=function(b){b=a.ToNumberArray(b);this.angle=new a.Property("angle",b[0]);this.cx=b[1]||0;this.cy=b[2]||0;this.apply=function(b){b.translate(this.cx,this.cy);b.rotate(this.angle.Angle.toRadians());b.translate(-this.cx,-this.cy)};this.applyToPoint=function(b){var a=this.angle.Angle.toRadians();b.applyTransform([1,0,0,1,this.p.x||0,this.p.y||0]);b.applyTransform([Math.cos(a),Math.sin(a),-Math.sin(a),Math.cos(a),0,0]);b.applyTransform([1,0,0,1,-this.p.x||
+0,-this.p.y||0])}};this.Type.scale=function(b){this.p=a.CreatePoint(b);this.apply=function(b){b.scale(this.p.x||1,this.p.y||this.p.x||1)};this.applyToPoint=function(b){b.applyTransform([this.p.x||0,0,0,this.p.y||0,0,0])}};this.Type.matrix=function(b){this.m=a.ToNumberArray(b);this.apply=function(b){b.transform(this.m[0],this.m[1],this.m[2],this.m[3],this.m[4],this.m[5])};this.applyToPoint=function(b){b.applyTransform(this.m)}};this.Type.SkewBase=function(b){this.base=d.Type.matrix;this.base(b);this.angle=
+new a.Property("angle",b)};this.Type.SkewBase.prototype=new this.Type.matrix;this.Type.skewX=function(b){this.base=d.Type.SkewBase;this.base(b);this.m=[1,0,Math.tan(this.angle.Angle.toRadians()),1,0,0]};this.Type.skewX.prototype=new this.Type.SkewBase;this.Type.skewY=function(b){this.base=d.Type.SkewBase;this.base(b);this.m=[1,Math.tan(this.angle.Angle.toRadians()),0,1,0,0]};this.Type.skewY.prototype=new this.Type.SkewBase;this.transforms=[];this.apply=function(b){for(var a=0;a<this.transforms.length;a++)this.transforms[a].apply(b)};
+this.applyToPoint=function(b){for(var a=0;a<this.transforms.length;a++)this.transforms[a].applyToPoint(b)};for(var c=a.trim(a.compressSpaces(c)).split(/\s(?=[a-z])/),b=0;b<c.length;b++){var k=c[b].split("(")[0],e=c[b].split("(")[1].replace(")","");this.transforms.push(new this.Type[k](e))}};a.AspectRatio=function(c,d,b,k,e,f,g,j,h,l){var d=a.compressSpaces(d),d=d.replace(/^defer\s/,""),o=d.split(" ")[0]||"xMidYMid",d=d.split(" ")[1]||"meet",n=b/k,q=e/f,p=Math.min(n,q),m=Math.max(n,q);d=="meet"&&(k*=
+p,f*=p);d=="slice"&&(k*=m,f*=m);h=new a.Property("refX",h);l=new a.Property("refY",l);h.hasValue()&&l.hasValue()?c.translate(-p*h.Length.toPixels("x"),-p*l.Length.toPixels("y")):(o.match(/^xMid/)&&(d=="meet"&&p==q||d=="slice"&&m==q)&&c.translate(b/2-k/2,0),o.match(/YMid$/)&&(d=="meet"&&p==n||d=="slice"&&m==n)&&c.translate(0,e/2-f/2),o.match(/^xMax/)&&(d=="meet"&&p==q||d=="slice"&&m==q)&&c.translate(b-k,0),o.match(/YMax$/)&&(d=="meet"&&p==n||d=="slice"&&m==n)&&c.translate(0,e-f));o=="none"?c.scale(n,
+q):d=="meet"?c.scale(p,p):d=="slice"&&c.scale(m,m);c.translate(g==null?0:-g,j==null?0:-j)};a.Element={};a.Element.ElementBase=function(c){this.attributes={};this.styles={};this.children=[];this.attribute=function(b,d){var c=this.attributes[b];if(c!=null)return c;c=new a.Property(b,"");d==!0&&(this.attributes[b]=c);return c};this.style=function(b,d){var c=this.styles[b];if(c!=null)return c;c=this.attribute(b);if(c!=null&&c.hasValue())return c;c=this.parent;if(c!=null&&(c=c.style(b),c!=null&&c.hasValue()))return c;
+c=new a.Property(b,"");d==!0&&(this.styles[b]=c);return c};this.render=function(b){if(this.style("display").value!="none"&&this.attribute("visibility").value!="hidden"){b.save();this.setContext(b);if(this.attribute("mask").hasValue()){var a=this.attribute("mask").Definition.getDefinition();a!=null&&a.apply(b,this)}else this.style("filter").hasValue()?(a=this.style("filter").Definition.getDefinition(),a!=null&&a.apply(b,this)):this.renderChildren(b);this.clearContext(b);b.restore()}};this.setContext=
+function(){};this.clearContext=function(){};this.renderChildren=function(b){for(var a=0;a<this.children.length;a++)this.children[a].render(b)};this.addChild=function(b,d){var c=b;d&&(c=a.CreateElement(b));c.parent=this;this.children.push(c)};if(c!=null&&c.nodeType==1){for(var d=0;d<c.childNodes.length;d++){var b=c.childNodes[d];b.nodeType==1&&this.addChild(b,!0)}for(d=0;d<c.attributes.length;d++)b=c.attributes[d],this.attributes[b.nodeName]=new a.Property(b.nodeName,b.nodeValue);b=a.Styles[c.nodeName];
+if(b!=null)for(var k in b)this.styles[k]=b[k];if(this.attribute("class").hasValue())for(var d=a.compressSpaces(this.attribute("class").value).split(" "),e=0;e<d.length;e++){b=a.Styles["."+d[e]];if(b!=null)for(k in b)this.styles[k]=b[k];b=a.Styles[c.nodeName+"."+d[e]];if(b!=null)for(k in b)this.styles[k]=b[k]}if(this.attribute("style").hasValue()){b=this.attribute("style").value.split(";");for(d=0;d<b.length;d++)a.trim(b[d])!=""&&(c=b[d].split(":"),k=a.trim(c[0]),c=a.trim(c[1]),this.styles[k]=new a.Property(k,
+c))}this.attribute("id").hasValue()&&a.Definitions[this.attribute("id").value]==null&&(a.Definitions[this.attribute("id").value]=this)}};a.Element.RenderedElementBase=function(c){this.base=a.Element.ElementBase;this.base(c);this.setContext=function(d){if(this.style("fill").Definition.isUrl()){var b=this.style("fill").Definition.getFillStyle(this);if(b!=null)d.fillStyle=b}else if(this.style("fill").hasValue())b=this.style("fill"),this.style("fill-opacity").hasValue()&&(b=b.Color.addOpacity(this.style("fill-opacity").value)),
+d.fillStyle=b.value=="none"?"rgba(0,0,0,0)":b.value;if(this.style("stroke").Definition.isUrl()){if(b=this.style("stroke").Definition.getFillStyle(this),b!=null)d.strokeStyle=b}else if(this.style("stroke").hasValue())b=this.style("stroke"),this.style("stroke-opacity").hasValue()&&(b=b.Color.addOpacity(this.style("stroke-opacity").value)),d.strokeStyle=b.value=="none"?"rgba(0,0,0,0)":b.value;if(this.style("stroke-width").hasValue())d.lineWidth=this.style("stroke-width").Length.toPixels();if(this.style("stroke-linecap").hasValue())d.lineCap=
+this.style("stroke-linecap").value;if(this.style("stroke-linejoin").hasValue())d.lineJoin=this.style("stroke-linejoin").value;if(this.style("stroke-miterlimit").hasValue())d.miterLimit=this.style("stroke-miterlimit").value;if(typeof d.font!="undefined")d.font=a.Font.CreateFont(this.style("font-style").value,this.style("font-variant").value,this.style("font-weight").value,this.style("font-size").hasValue()?this.style("font-size").Length.toPixels()+"px":"",this.style("font-family").value).toString();
+this.attribute("transform").hasValue()&&(new a.Transform(this.attribute("transform").value)).apply(d);this.attribute("clip-path").hasValue()&&(b=this.attribute("clip-path").Definition.getDefinition(),b!=null&&b.apply(d));if(this.style("opacity").hasValue())d.globalAlpha=this.style("opacity").numValue()}};a.Element.RenderedElementBase.prototype=new a.Element.ElementBase;a.Element.PathElementBase=function(c){this.base=a.Element.RenderedElementBase;this.base(c);this.path=function(d){d!=null&&d.beginPath();
+return new a.BoundingBox};this.renderChildren=function(d){this.path(d);a.Mouse.checkPath(this,d);d.fillStyle!=""&&d.fill();d.strokeStyle!=""&&d.stroke();var b=this.getMarkers();if(b!=null){if(this.style("marker-start").Definition.isUrl()){var c=this.style("marker-start").Definition.getDefinition();c.render(d,b[0][0],b[0][1])}if(this.style("marker-mid").Definition.isUrl())for(var c=this.style("marker-mid").Definition.getDefinition(),e=1;e<b.length-1;e++)c.render(d,b[e][0],b[e][1]);this.style("marker-end").Definition.isUrl()&&
+(c=this.style("marker-end").Definition.getDefinition(),c.render(d,b[b.length-1][0],b[b.length-1][1]))}};this.getBoundingBox=function(){return this.path()};this.getMarkers=function(){return null}};a.Element.PathElementBase.prototype=new a.Element.RenderedElementBase;a.Element.svg=function(c){this.base=a.Element.RenderedElementBase;this.base(c);this.baseClearContext=this.clearContext;this.clearContext=function(d){this.baseClearContext(d);a.ViewPort.RemoveCurrent()};this.baseSetContext=this.setContext;
+this.setContext=function(d){d.strokeStyle="rgba(0,0,0,0)";d.lineCap="butt";d.lineJoin="miter";d.miterLimit=4;this.baseSetContext(d);this.attribute("x").hasValue()&&this.attribute("y").hasValue()&&d.translate(this.attribute("x").Length.toPixels("x"),this.attribute("y").Length.toPixels("y"));var b=a.ViewPort.width(),c=a.ViewPort.height();if(typeof this.root=="undefined"&&this.attribute("width").hasValue()&&this.attribute("height").hasValue()){var b=this.attribute("width").Length.toPixels("x"),c=this.attribute("height").Length.toPixels("y"),
+e=0,f=0;this.attribute("refX").hasValue()&&this.attribute("refY").hasValue()&&(e=-this.attribute("refX").Length.toPixels("x"),f=-this.attribute("refY").Length.toPixels("y"));d.beginPath();d.moveTo(e,f);d.lineTo(b,f);d.lineTo(b,c);d.lineTo(e,c);d.closePath();d.clip()}a.ViewPort.SetCurrent(b,c);if(this.attribute("viewBox").hasValue()){var e=a.ToNumberArray(this.attribute("viewBox").value),f=e[0],g=e[1],b=e[2],c=e[3];a.AspectRatio(d,this.attribute("preserveAspectRatio").value,a.ViewPort.width(),b,a.ViewPort.height(),
+c,f,g,this.attribute("refX").value,this.attribute("refY").value);a.ViewPort.RemoveCurrent();a.ViewPort.SetCurrent(e[2],e[3])}}};a.Element.svg.prototype=new a.Element.RenderedElementBase;a.Element.rect=function(c){this.base=a.Element.PathElementBase;this.base(c);this.path=function(d){var b=this.attribute("x").Length.toPixels("x"),c=this.attribute("y").Length.toPixels("y"),e=this.attribute("width").Length.toPixels("x"),f=this.attribute("height").Length.toPixels("y"),g=this.attribute("rx").Length.toPixels("x"),
+j=this.attribute("ry").Length.toPixels("y");this.attribute("rx").hasValue()&&!this.attribute("ry").hasValue()&&(j=g);this.attribute("ry").hasValue()&&!this.attribute("rx").hasValue()&&(g=j);d!=null&&(d.beginPath(),d.moveTo(b+g,c),d.lineTo(b+e-g,c),d.quadraticCurveTo(b+e,c,b+e,c+j),d.lineTo(b+e,c+f-j),d.quadraticCurveTo(b+e,c+f,b+e-g,c+f),d.lineTo(b+g,c+f),d.quadraticCurveTo(b,c+f,b,c+f-j),d.lineTo(b,c+j),d.quadraticCurveTo(b,c,b+g,c),d.closePath());return new a.BoundingBox(b,c,b+e,c+f)}};a.Element.rect.prototype=
+new a.Element.PathElementBase;a.Element.circle=function(c){this.base=a.Element.PathElementBase;this.base(c);this.path=function(d){var b=this.attribute("cx").Length.toPixels("x"),c=this.attribute("cy").Length.toPixels("y"),e=this.attribute("r").Length.toPixels();d!=null&&(d.beginPath(),d.arc(b,c,e,0,Math.PI*2,!0),d.closePath());return new a.BoundingBox(b-e,c-e,b+e,c+e)}};a.Element.circle.prototype=new a.Element.PathElementBase;a.Element.ellipse=function(c){this.base=a.Element.PathElementBase;this.base(c);
+this.path=function(d){var b=4*((Math.sqrt(2)-1)/3),c=this.attribute("rx").Length.toPixels("x"),e=this.attribute("ry").Length.toPixels("y"),f=this.attribute("cx").Length.toPixels("x"),g=this.attribute("cy").Length.toPixels("y");d!=null&&(d.beginPath(),d.moveTo(f,g-e),d.bezierCurveTo(f+b*c,g-e,f+c,g-b*e,f+c,g),d.bezierCurveTo(f+c,g+b*e,f+b*c,g+e,f,g+e),d.bezierCurveTo(f-b*c,g+e,f-c,g+b*e,f-c,g),d.bezierCurveTo(f-c,g-b*e,f-b*c,g-e,f,g-e),d.closePath());return new a.BoundingBox(f-c,g-e,f+c,g+e)}};a.Element.ellipse.prototype=
+new a.Element.PathElementBase;a.Element.line=function(c){this.base=a.Element.PathElementBase;this.base(c);this.getPoints=function(){return[new a.Point(this.attribute("x1").Length.toPixels("x"),this.attribute("y1").Length.toPixels("y")),new a.Point(this.attribute("x2").Length.toPixels("x"),this.attribute("y2").Length.toPixels("y"))]};this.path=function(d){var b=this.getPoints();d!=null&&(d.beginPath(),d.moveTo(b[0].x,b[0].y),d.lineTo(b[1].x,b[1].y));return new a.BoundingBox(b[0].x,b[0].y,b[1].x,b[1].y)};
+this.getMarkers=function(){var a=this.getPoints(),b=a[0].angleTo(a[1]);return[[a[0],b],[a[1],b]]}};a.Element.line.prototype=new a.Element.PathElementBase;a.Element.polyline=function(c){this.base=a.Element.PathElementBase;this.base(c);this.points=a.CreatePath(this.attribute("points").value);this.path=function(d){var b=new a.BoundingBox(this.points[0].x,this.points[0].y);d!=null&&(d.beginPath(),d.moveTo(this.points[0].x,this.points[0].y));for(var c=1;c<this.points.length;c++)b.addPoint(this.points[c].x,
+this.points[c].y),d!=null&&d.lineTo(this.points[c].x,this.points[c].y);return b};this.getMarkers=function(){for(var a=[],b=0;b<this.points.length-1;b++)a.push([this.points[b],this.points[b].angleTo(this.points[b+1])]);a.push([this.points[this.points.length-1],a[a.length-1][1]]);return a}};a.Element.polyline.prototype=new a.Element.PathElementBase;a.Element.polygon=function(c){this.base=a.Element.polyline;this.base(c);this.basePath=this.path;this.path=function(a){var b=this.basePath(a);a!=null&&(a.lineTo(this.points[0].x,
+this.points[0].y),a.closePath());return b}};a.Element.polygon.prototype=new a.Element.polyline;a.Element.path=function(c){this.base=a.Element.PathElementBase;this.base(c);c=this.attribute("d").value;c=c.replace(/,/gm," ");c=c.replace(/([MmZzLlHhVvCcSsQqTtAa])([MmZzLlHhVvCcSsQqTtAa])/gm,"$1 $2");c=c.replace(/([MmZzLlHhVvCcSsQqTtAa])([MmZzLlHhVvCcSsQqTtAa])/gm,"$1 $2");c=c.replace(/([MmZzLlHhVvCcSsQqTtAa])([^\s])/gm,"$1 $2");c=c.replace(/([^\s])([MmZzLlHhVvCcSsQqTtAa])/gm,"$1 $2");c=c.replace(/([0-9])([+\-])/gm,
+"$1 $2");c=c.replace(/(\.[0-9]*)(\.)/gm,"$1 $2");c=c.replace(/([Aa](\s+[0-9]+){3})\s+([01])\s*([01])/gm,"$1 $3 $4 ");c=a.compressSpaces(c);c=a.trim(c);this.PathParser=new function(d){this.tokens=d.split(" ");this.reset=function(){this.i=-1;this.previousCommand=this.command="";this.start=new a.Point(0,0);this.control=new a.Point(0,0);this.current=new a.Point(0,0);this.points=[];this.angles=[]};this.isEnd=function(){return this.i>=this.tokens.length-1};this.isCommandOrEnd=function(){return this.isEnd()?
+!0:this.tokens[this.i+1].match(/^[A-Za-z]$/)!=null};this.isRelativeCommand=function(){return this.command==this.command.toLowerCase()};this.getToken=function(){this.i+=1;return this.tokens[this.i]};this.getScalar=function(){return parseFloat(this.getToken())};this.nextCommand=function(){this.previousCommand=this.command;this.command=this.getToken()};this.getPoint=function(){return this.makeAbsolute(new a.Point(this.getScalar(),this.getScalar()))};this.getAsControlPoint=function(){var b=this.getPoint();
+return this.control=b};this.getAsCurrentPoint=function(){var b=this.getPoint();return this.current=b};this.getReflectedControlPoint=function(){return this.previousCommand.toLowerCase()!="c"&&this.previousCommand.toLowerCase()!="s"?this.current:new a.Point(2*this.current.x-this.control.x,2*this.current.y-this.control.y)};this.makeAbsolute=function(b){if(this.isRelativeCommand())b.x=this.current.x+b.x,b.y=this.current.y+b.y;return b};this.addMarker=function(b,a,d){d!=null&&this.angles.length>0&&this.angles[this.angles.length-
+1]==null&&(this.angles[this.angles.length-1]=this.points[this.points.length-1].angleTo(d));this.addMarkerAngle(b,a==null?null:a.angleTo(b))};this.addMarkerAngle=function(b,a){this.points.push(b);this.angles.push(a)};this.getMarkerPoints=function(){return this.points};this.getMarkerAngles=function(){for(var b=0;b<this.angles.length;b++)if(this.angles[b]==null)for(var a=b+1;a<this.angles.length;a++)if(this.angles[a]!=null){this.angles[b]=this.angles[a];break}return this.angles}}(c);this.path=function(d){var b=
+this.PathParser;b.reset();var c=new a.BoundingBox;for(d!=null&&d.beginPath();!b.isEnd();)switch(b.nextCommand(),b.command.toUpperCase()){case "M":var e=b.getAsCurrentPoint();b.addMarker(e);c.addPoint(e.x,e.y);d!=null&&d.moveTo(e.x,e.y);for(b.start=b.current;!b.isCommandOrEnd();)e=b.getAsCurrentPoint(),b.addMarker(e,b.start),c.addPoint(e.x,e.y),d!=null&&d.lineTo(e.x,e.y);break;case "L":for(;!b.isCommandOrEnd();){var f=b.current,e=b.getAsCurrentPoint();b.addMarker(e,f);c.addPoint(e.x,e.y);d!=null&&
+d.lineTo(e.x,e.y)}break;case "H":for(;!b.isCommandOrEnd();)e=new a.Point((b.isRelativeCommand()?b.current.x:0)+b.getScalar(),b.current.y),b.addMarker(e,b.current),b.current=e,c.addPoint(b.current.x,b.current.y),d!=null&&d.lineTo(b.current.x,b.current.y);break;case "V":for(;!b.isCommandOrEnd();)e=new a.Point(b.current.x,(b.isRelativeCommand()?b.current.y:0)+b.getScalar()),b.addMarker(e,b.current),b.current=e,c.addPoint(b.current.x,b.current.y),d!=null&&d.lineTo(b.current.x,b.current.y);break;case "C":for(;!b.isCommandOrEnd();){var g=
+b.current,f=b.getPoint(),j=b.getAsControlPoint(),e=b.getAsCurrentPoint();b.addMarker(e,j,f);c.addBezierCurve(g.x,g.y,f.x,f.y,j.x,j.y,e.x,e.y);d!=null&&d.bezierCurveTo(f.x,f.y,j.x,j.y,e.x,e.y)}break;case "S":for(;!b.isCommandOrEnd();)g=b.current,f=b.getReflectedControlPoint(),j=b.getAsControlPoint(),e=b.getAsCurrentPoint(),b.addMarker(e,j,f),c.addBezierCurve(g.x,g.y,f.x,f.y,j.x,j.y,e.x,e.y),d!=null&&d.bezierCurveTo(f.x,f.y,j.x,j.y,e.x,e.y);break;case "Q":for(;!b.isCommandOrEnd();)g=b.current,j=b.getAsControlPoint(),
+e=b.getAsCurrentPoint(),b.addMarker(e,j,j),c.addQuadraticCurve(g.x,g.y,j.x,j.y,e.x,e.y),d!=null&&d.quadraticCurveTo(j.x,j.y,e.x,e.y);break;case "T":for(;!b.isCommandOrEnd();)g=b.current,j=b.getReflectedControlPoint(),b.control=j,e=b.getAsCurrentPoint(),b.addMarker(e,j,j),c.addQuadraticCurve(g.x,g.y,j.x,j.y,e.x,e.y),d!=null&&d.quadraticCurveTo(j.x,j.y,e.x,e.y);break;case "A":for(;!b.isCommandOrEnd();){var g=b.current,h=b.getScalar(),l=b.getScalar(),f=b.getScalar()*(Math.PI/180),o=b.getScalar(),j=b.getScalar(),
+e=b.getAsCurrentPoint(),n=new a.Point(Math.cos(f)*(g.x-e.x)/2+Math.sin(f)*(g.y-e.y)/2,-Math.sin(f)*(g.x-e.x)/2+Math.cos(f)*(g.y-e.y)/2),q=Math.pow(n.x,2)/Math.pow(h,2)+Math.pow(n.y,2)/Math.pow(l,2);q>1&&(h*=Math.sqrt(q),l*=Math.sqrt(q));o=(o==j?-1:1)*Math.sqrt((Math.pow(h,2)*Math.pow(l,2)-Math.pow(h,2)*Math.pow(n.y,2)-Math.pow(l,2)*Math.pow(n.x,2))/(Math.pow(h,2)*Math.pow(n.y,2)+Math.pow(l,2)*Math.pow(n.x,2)));isNaN(o)&&(o=0);var p=new a.Point(o*h*n.y/l,o*-l*n.x/h),g=new a.Point((g.x+e.x)/2+Math.cos(f)*
+p.x-Math.sin(f)*p.y,(g.y+e.y)/2+Math.sin(f)*p.x+Math.cos(f)*p.y),m=function(b,a){return(b[0]*a[0]+b[1]*a[1])/(Math.sqrt(Math.pow(b[0],2)+Math.pow(b[1],2))*Math.sqrt(Math.pow(a[0],2)+Math.pow(a[1],2)))},s=function(b,a){return(b[0]*a[1]<b[1]*a[0]?-1:1)*Math.acos(m(b,a))},o=s([1,0],[(n.x-p.x)/h,(n.y-p.y)/l]),q=[(n.x-p.x)/h,(n.y-p.y)/l],p=[(-n.x-p.x)/h,(-n.y-p.y)/l],n=s(q,p);if(m(q,p)<=-1)n=Math.PI;m(q,p)>=1&&(n=0);j==0&&n>0&&(n-=2*Math.PI);j==1&&n<0&&(n+=2*Math.PI);q=new a.Point(g.x-h*Math.cos((o+n)/
+2),g.y-l*Math.sin((o+n)/2));b.addMarkerAngle(q,(o+n)/2+(j==0?1:-1)*Math.PI/2);b.addMarkerAngle(e,n+(j==0?1:-1)*Math.PI/2);c.addPoint(e.x,e.y);d!=null&&(m=h>l?h:l,e=h>l?1:h/l,h=h>l?l/h:1,d.translate(g.x,g.y),d.rotate(f),d.scale(e,h),d.arc(0,0,m,o,o+n,1-j),d.scale(1/e,1/h),d.rotate(-f),d.translate(-g.x,-g.y))}break;case "Z":d!=null&&d.closePath(),b.current=b.start}return c};this.getMarkers=function(){for(var a=this.PathParser.getMarkerPoints(),b=this.PathParser.getMarkerAngles(),c=[],e=0;e<a.length;e++)c.push([a[e],
+b[e]]);return c}};a.Element.path.prototype=new a.Element.PathElementBase;a.Element.pattern=function(c){this.base=a.Element.ElementBase;this.base(c);this.createPattern=function(d){var b=new a.Element.svg;b.attributes.viewBox=new a.Property("viewBox",this.attribute("viewBox").value);b.attributes.x=new a.Property("x",this.attribute("x").value);b.attributes.y=new a.Property("y",this.attribute("y").value);b.attributes.width=new a.Property("width",this.attribute("width").value);b.attributes.height=new a.Property("height",
+this.attribute("height").value);b.children=this.children;var c=document.createElement("canvas");c.width=this.attribute("width").Length.toPixels("x");c.height=this.attribute("height").Length.toPixels("y");b.render(c.getContext("2d"));return d.createPattern(c,"repeat")}};a.Element.pattern.prototype=new a.Element.ElementBase;a.Element.marker=function(c){this.base=a.Element.ElementBase;this.base(c);this.baseRender=this.render;this.render=function(d,b,c){d.translate(b.x,b.y);this.attribute("orient").valueOrDefault("auto")==
+"auto"&&d.rotate(c);this.attribute("markerUnits").valueOrDefault("strokeWidth")=="strokeWidth"&&d.scale(d.lineWidth,d.lineWidth);d.save();var e=new a.Element.svg;e.attributes.viewBox=new a.Property("viewBox",this.attribute("viewBox").value);e.attributes.refX=new a.Property("refX",this.attribute("refX").value);e.attributes.refY=new a.Property("refY",this.attribute("refY").value);e.attributes.width=new a.Property("width",this.attribute("markerWidth").value);e.attributes.height=new a.Property("height",
+this.attribute("markerHeight").value);e.attributes.fill=new a.Property("fill",this.attribute("fill").valueOrDefault("black"));e.attributes.stroke=new a.Property("stroke",this.attribute("stroke").valueOrDefault("none"));e.children=this.children;e.render(d);d.restore();this.attribute("markerUnits").valueOrDefault("strokeWidth")=="strokeWidth"&&d.scale(1/d.lineWidth,1/d.lineWidth);this.attribute("orient").valueOrDefault("auto")=="auto"&&d.rotate(-c);d.translate(-b.x,-b.y)}};a.Element.marker.prototype=
+new a.Element.ElementBase;a.Element.defs=function(c){this.base=a.Element.ElementBase;this.base(c);this.render=function(){}};a.Element.defs.prototype=new a.Element.ElementBase;a.Element.GradientBase=function(c){this.base=a.Element.ElementBase;this.base(c);this.gradientUnits=this.attribute("gradientUnits").valueOrDefault("objectBoundingBox");this.stops=[];for(c=0;c<this.children.length;c++)this.stops.push(this.children[c]);this.getGradient=function(){};this.createGradient=function(d,b){var c=this;this.attribute("xlink:href").hasValue()&&
+(c=this.attribute("xlink:href").Definition.getDefinition());for(var e=this.getGradient(d,b),f=0;f<c.stops.length;f++)e.addColorStop(c.stops[f].offset,c.stops[f].color);if(this.attribute("gradientTransform").hasValue()){c=a.ViewPort.viewPorts[0];f=new a.Element.rect;f.attributes.x=new a.Property("x",-a.MAX_VIRTUAL_PIXELS/3);f.attributes.y=new a.Property("y",-a.MAX_VIRTUAL_PIXELS/3);f.attributes.width=new a.Property("width",a.MAX_VIRTUAL_PIXELS);f.attributes.height=new a.Property("height",a.MAX_VIRTUAL_PIXELS);
+var g=new a.Element.g;g.attributes.transform=new a.Property("transform",this.attribute("gradientTransform").value);g.children=[f];f=new a.Element.svg;f.attributes.x=new a.Property("x",0);f.attributes.y=new a.Property("y",0);f.attributes.width=new a.Property("width",c.width);f.attributes.height=new a.Property("height",c.height);f.children=[g];g=document.createElement("canvas");g.width=c.width;g.height=c.height;c=g.getContext("2d");c.fillStyle=e;f.render(c);return c.createPattern(g,"no-repeat")}return e}};
+a.Element.GradientBase.prototype=new a.Element.ElementBase;a.Element.linearGradient=function(c){this.base=a.Element.GradientBase;this.base(c);this.getGradient=function(a,b){var c=b.getBoundingBox(),e=this.gradientUnits=="objectBoundingBox"?c.x()+c.width()*this.attribute("x1").numValue():this.attribute("x1").Length.toPixels("x"),f=this.gradientUnits=="objectBoundingBox"?c.y()+c.height()*this.attribute("y1").numValue():this.attribute("y1").Length.toPixels("y"),g=this.gradientUnits=="objectBoundingBox"?
+c.x()+c.width()*this.attribute("x2").numValue():this.attribute("x2").Length.toPixels("x"),c=this.gradientUnits=="objectBoundingBox"?c.y()+c.height()*this.attribute("y2").numValue():this.attribute("y2").Length.toPixels("y");return a.createLinearGradient(e,f,g,c)}};a.Element.linearGradient.prototype=new a.Element.GradientBase;a.Element.radialGradient=function(c){this.base=a.Element.GradientBase;this.base(c);this.getGradient=function(a,b){var c=b.getBoundingBox(),e=this.gradientUnits=="objectBoundingBox"?
+c.x()+c.width()*this.attribute("cx").numValue():this.attribute("cx").Length.toPixels("x"),f=this.gradientUnits=="objectBoundingBox"?c.y()+c.height()*this.attribute("cy").numValue():this.attribute("cy").Length.toPixels("y"),g=e,j=f;this.attribute("fx").hasValue()&&(g=this.gradientUnits=="objectBoundingBox"?c.x()+c.width()*this.attribute("fx").numValue():this.attribute("fx").Length.toPixels("x"));this.attribute("fy").hasValue()&&(j=this.gradientUnits=="objectBoundingBox"?c.y()+c.height()*this.attribute("fy").numValue():
+this.attribute("fy").Length.toPixels("y"));c=this.gradientUnits=="objectBoundingBox"?(c.width()+c.height())/2*this.attribute("r").numValue():this.attribute("r").Length.toPixels();return a.createRadialGradient(g,j,0,e,f,c)}};a.Element.radialGradient.prototype=new a.Element.GradientBase;a.Element.stop=function(c){this.base=a.Element.ElementBase;this.base(c);this.offset=this.attribute("offset").numValue();c=this.style("stop-color");this.style("stop-opacity").hasValue()&&(c=c.Color.addOpacity(this.style("stop-opacity").value));
+this.color=c.value};a.Element.stop.prototype=new a.Element.ElementBase;a.Element.AnimateBase=function(c){this.base=a.Element.ElementBase;this.base(c);a.Animations.push(this);this.duration=0;this.begin=this.attribute("begin").Time.toMilliseconds();this.maxDuration=this.begin+this.attribute("dur").Time.toMilliseconds();this.getProperty=function(){var a=this.attribute("attributeType").value,b=this.attribute("attributeName").value;return a=="CSS"?this.parent.style(b,!0):this.parent.attribute(b,!0)};this.initialValue=
+null;this.removed=!1;this.calcValue=function(){return""};this.update=function(a){if(this.initialValue==null)this.initialValue=this.getProperty().value;if(this.duration>this.maxDuration)if(this.attribute("repeatCount").value=="indefinite")this.duration=0;else return this.attribute("fill").valueOrDefault("remove")=="remove"&&!this.removed?(this.removed=!0,this.getProperty().value=this.initialValue,!0):!1;this.duration+=a;a=!1;if(this.begin<this.duration)a=this.calcValue(),this.attribute("type").hasValue()&&
+(a=this.attribute("type").value+"("+a+")"),this.getProperty().value=a,a=!0;return a};this.progress=function(){return(this.duration-this.begin)/(this.maxDuration-this.begin)}};a.Element.AnimateBase.prototype=new a.Element.ElementBase;a.Element.animate=function(c){this.base=a.Element.AnimateBase;this.base(c);this.calcValue=function(){var a=this.attribute("from").numValue(),b=this.attribute("to").numValue();return a+(b-a)*this.progress()}};a.Element.animate.prototype=new a.Element.AnimateBase;a.Element.animateColor=
+function(c){this.base=a.Element.AnimateBase;this.base(c);this.calcValue=function(){var a=new RGBColor(this.attribute("from").value),b=new RGBColor(this.attribute("to").value);if(a.ok&&b.ok){var c=a.r+(b.r-a.r)*this.progress(),e=a.g+(b.g-a.g)*this.progress(),a=a.b+(b.b-a.b)*this.progress();return"rgb("+parseInt(c,10)+","+parseInt(e,10)+","+parseInt(a,10)+")"}return this.attribute("from").value}};a.Element.animateColor.prototype=new a.Element.AnimateBase;a.Element.animateTransform=function(c){this.base=
+a.Element.animate;this.base(c)};a.Element.animateTransform.prototype=new a.Element.animate;a.Element.font=function(c){this.base=a.Element.ElementBase;this.base(c);this.horizAdvX=this.attribute("horiz-adv-x").numValue();this.isArabic=this.isRTL=!1;this.missingGlyph=this.fontFace=null;this.glyphs=[];for(c=0;c<this.children.length;c++){var d=this.children[c];if(d.type=="font-face")this.fontFace=d,d.style("font-family").hasValue()&&(a.Definitions[d.style("font-family").value]=this);else if(d.type=="missing-glyph")this.missingGlyph=
+d;else if(d.type=="glyph")d.arabicForm!=""?(this.isArabic=this.isRTL=!0,typeof this.glyphs[d.unicode]=="undefined"&&(this.glyphs[d.unicode]=[]),this.glyphs[d.unicode][d.arabicForm]=d):this.glyphs[d.unicode]=d}};a.Element.font.prototype=new a.Element.ElementBase;a.Element.fontface=function(c){this.base=a.Element.ElementBase;this.base(c);this.ascent=this.attribute("ascent").value;this.descent=this.attribute("descent").value;this.unitsPerEm=this.attribute("units-per-em").numValue()};a.Element.fontface.prototype=
+new a.Element.ElementBase;a.Element.missingglyph=function(c){this.base=a.Element.path;this.base(c);this.horizAdvX=0};a.Element.missingglyph.prototype=new a.Element.path;a.Element.glyph=function(c){this.base=a.Element.path;this.base(c);this.horizAdvX=this.attribute("horiz-adv-x").numValue();this.unicode=this.attribute("unicode").value;this.arabicForm=this.attribute("arabic-form").value};a.Element.glyph.prototype=new a.Element.path;a.Element.text=function(c){this.base=a.Element.RenderedElementBase;
+this.base(c);if(c!=null){this.children=[];for(var d=0;d<c.childNodes.length;d++){var b=c.childNodes[d];b.nodeType==1?this.addChild(b,!0):b.nodeType==3&&this.addChild(new a.Element.tspan(b),!1)}}this.baseSetContext=this.setContext;this.setContext=function(b){this.baseSetContext(b);if(this.style("dominant-baseline").hasValue())b.textBaseline=this.style("dominant-baseline").value;if(this.style("alignment-baseline").hasValue())b.textBaseline=this.style("alignment-baseline").value};this.renderChildren=
+function(b){for(var a=this.style("text-anchor").valueOrDefault("start"),c=this.attribute("x").Length.toPixels("x"),d=this.attribute("y").Length.toPixels("y"),j=0;j<this.children.length;j++){var h=this.children[j];h.attribute("x").hasValue()?h.x=h.attribute("x").Length.toPixels("x"):(h.attribute("dx").hasValue()&&(c+=h.attribute("dx").Length.toPixels("x")),h.x=c);c=h.measureText?h.measureText(b):0;if(a!="start"&&(j==0||h.attribute("x").hasValue())){for(var l=c,o=j+1;o<this.children.length;o++){var n=
+this.children[o];if(n.attribute("x").hasValue())break;l+=n.measureText?n.measureText(b):0}h.x-=a=="end"?l:l/2}c=h.x+c;h.attribute("y").hasValue()?h.y=h.attribute("y").Length.toPixels("y"):(h.attribute("dy").hasValue()&&(d+=h.attribute("dy").Length.toPixels("y")),h.y=d);d=h.y;h.render(b)}}};a.Element.text.prototype=new a.Element.RenderedElementBase;a.Element.TextElementBase=function(c){this.base=a.Element.RenderedElementBase;this.base(c);this.getGlyph=function(a,b,c){var e=b[c],f=null;if(a.isArabic){var g=
+"isolated";if((c==0||b[c-1]==" ")&&c<b.length-2&&b[c+1]!=" ")g="terminal";c>0&&b[c-1]!=" "&&c<b.length-2&&b[c+1]!=" "&&(g="medial");if(c>0&&b[c-1]!=" "&&(c==b.length-1||b[c+1]==" "))g="initial";typeof a.glyphs[e]!="undefined"&&(f=a.glyphs[e][g],f==null&&a.glyphs[e].type=="glyph"&&(f=a.glyphs[e]))}else f=a.glyphs[e];if(f==null)f=a.missingGlyph;return f};this.renderChildren=function(c){var b=this.parent.style("font-family").Definition.getDefinition();if(b!=null){var k=this.parent.style("font-size").numValueOrDefault(a.Font.Parse(a.ctx.font).fontSize),
+e=this.parent.style("font-style").valueOrDefault(a.Font.Parse(a.ctx.font).fontStyle),f=this.getText();b.isRTL&&(f=f.split("").reverse().join(""));for(var g=a.ToNumberArray(this.parent.attribute("dx").value),j=0;j<f.length;j++){var h=this.getGlyph(b,f,j),l=k/b.fontFace.unitsPerEm;c.translate(this.x,this.y);c.scale(l,-l);var o=c.lineWidth;c.lineWidth=c.lineWidth*b.fontFace.unitsPerEm/k;e=="italic"&&c.transform(1,0,0.4,1,0,0);h.render(c);e=="italic"&&c.transform(1,0,-0.4,1,0,0);c.lineWidth=o;c.scale(1/
+l,-1/l);c.translate(-this.x,-this.y);this.x+=k*(h.horizAdvX||b.horizAdvX)/b.fontFace.unitsPerEm;typeof g[j]!="undefined"&&!isNaN(g[j])&&(this.x+=g[j])}}else c.strokeStyle!=""&&c.strokeText(a.compressSpaces(this.getText()),this.x,this.y),c.fillStyle!=""&&c.fillText(a.compressSpaces(this.getText()),this.x,this.y)};this.getText=function(){};this.measureText=function(c){var b=this.parent.style("font-family").Definition.getDefinition();if(b!=null){var c=this.parent.style("font-size").numValueOrDefault(a.Font.Parse(a.ctx.font).fontSize),
+k=0,e=this.getText();b.isRTL&&(e=e.split("").reverse().join(""));for(var f=a.ToNumberArray(this.parent.attribute("dx").value),g=0;g<e.length;g++){var j=this.getGlyph(b,e,g);k+=(j.horizAdvX||b.horizAdvX)*c/b.fontFace.unitsPerEm;typeof f[g]!="undefined"&&!isNaN(f[g])&&(k+=f[g])}return k}b=a.compressSpaces(this.getText());if(!c.measureText)return b.length*10;c.save();this.setContext(c);b=c.measureText(b).width;c.restore();return b}};a.Element.TextElementBase.prototype=new a.Element.RenderedElementBase;
+a.Element.tspan=function(c){this.base=a.Element.TextElementBase;this.base(c);this.text=c.nodeType==3?c.nodeValue:c.childNodes.length>0?c.childNodes[0].nodeValue:c.text;this.getText=function(){return this.text}};a.Element.tspan.prototype=new a.Element.TextElementBase;a.Element.tref=function(c){this.base=a.Element.TextElementBase;this.base(c);this.getText=function(){var a=this.attribute("xlink:href").Definition.getDefinition();if(a!=null)return a.children[0].getText()}};a.Element.tref.prototype=new a.Element.TextElementBase;
+a.Element.a=function(c){this.base=a.Element.TextElementBase;this.base(c);this.hasText=!0;for(var d=0;d<c.childNodes.length;d++)if(c.childNodes[d].nodeType!=3)this.hasText=!1;this.text=this.hasText?c.childNodes[0].nodeValue:"";this.getText=function(){return this.text};this.baseRenderChildren=this.renderChildren;this.renderChildren=function(b){if(this.hasText){this.baseRenderChildren(b);var c=new a.Property("fontSize",a.Font.Parse(a.ctx.font).fontSize);a.Mouse.checkBoundingBox(this,new a.BoundingBox(this.x,
+this.y-c.Length.toPixels("y"),this.x+this.measureText(b),this.y))}else c=new a.Element.g,c.children=this.children,c.parent=this,c.render(b)};this.onclick=function(){window.open(this.attribute("xlink:href").value)};this.onmousemove=function(){a.ctx.canvas.style.cursor="pointer"}};a.Element.a.prototype=new a.Element.TextElementBase;a.Element.image=function(c){this.base=a.Element.RenderedElementBase;this.base(c);a.Images.push(this);this.img=document.createElement("img");this.loaded=!1;var d=this;this.img.onload=
+function(){d.loaded=!0};this.img.src=this.attribute("xlink:href").value;this.renderChildren=function(b){var c=this.attribute("x").Length.toPixels("x"),d=this.attribute("y").Length.toPixels("y"),f=this.attribute("width").Length.toPixels("x"),g=this.attribute("height").Length.toPixels("y");f==0||g==0||(b.save(),b.translate(c,d),a.AspectRatio(b,this.attribute("preserveAspectRatio").value,f,this.img.width,g,this.img.height,0,0),b.drawImage(this.img,0,0),b.restore())}};a.Element.image.prototype=new a.Element.RenderedElementBase;
+a.Element.g=function(c){this.base=a.Element.RenderedElementBase;this.base(c);this.getBoundingBox=function(){for(var c=new a.BoundingBox,b=0;b<this.children.length;b++)c.addBoundingBox(this.children[b].getBoundingBox());return c}};a.Element.g.prototype=new a.Element.RenderedElementBase;a.Element.symbol=function(c){this.base=a.Element.RenderedElementBase;this.base(c);this.baseSetContext=this.setContext;this.setContext=function(c){this.baseSetContext(c);if(this.attribute("viewBox").hasValue()){var b=
+a.ToNumberArray(this.attribute("viewBox").value),k=b[0],e=b[1];width=b[2];height=b[3];a.AspectRatio(c,this.attribute("preserveAspectRatio").value,this.attribute("width").Length.toPixels("x"),width,this.attribute("height").Length.toPixels("y"),height,k,e);a.ViewPort.SetCurrent(b[2],b[3])}}};a.Element.symbol.prototype=new a.Element.RenderedElementBase;a.Element.style=function(c){this.base=a.Element.ElementBase;this.base(c);for(var c=c.childNodes[0].nodeValue+(c.childNodes.length>1?c.childNodes[1].nodeValue:
+""),c=c.replace(/(\/\*([^*]|[\r\n]|(\*+([^*\/]|[\r\n])))*\*+\/)|(^[\s]*\/\/.*)/gm,""),c=a.compressSpaces(c),c=c.split("}"),d=0;d<c.length;d++)if(a.trim(c[d])!="")for(var b=c[d].split("{"),k=b[0].split(","),b=b[1].split(";"),e=0;e<k.length;e++){var f=a.trim(k[e]);if(f!=""){for(var g={},j=0;j<b.length;j++){var h=b[j].indexOf(":"),l=b[j].substr(0,h),h=b[j].substr(h+1,b[j].length-h);l!=null&&h!=null&&(g[a.trim(l)]=new a.Property(a.trim(l),a.trim(h)))}a.Styles[f]=g;if(f=="@font-face"){f=g["font-family"].value.replace(/"/g,
+"");g=g.src.value.split(",");for(j=0;j<g.length;j++)if(g[j].indexOf('format("svg")')>0){l=g[j].indexOf("url");h=g[j].indexOf(")",l);l=g[j].substr(l+5,h-l-6);l=a.parseXml(a.ajax(l)).getElementsByTagName("font");for(h=0;h<l.length;h++){var o=a.CreateElement(l[h]);a.Definitions[f]=o}}}}}};a.Element.style.prototype=new a.Element.ElementBase;a.Element.use=function(c){this.base=a.Element.RenderedElementBase;this.base(c);this.baseSetContext=this.setContext;this.setContext=function(a){this.baseSetContext(a);
+this.attribute("x").hasValue()&&a.translate(this.attribute("x").Length.toPixels("x"),0);this.attribute("y").hasValue()&&a.translate(0,this.attribute("y").Length.toPixels("y"))};this.getDefinition=function(){var a=this.attribute("xlink:href").Definition.getDefinition();if(this.attribute("width").hasValue())a.attribute("width",!0).value=this.attribute("width").value;if(this.attribute("height").hasValue())a.attribute("height",!0).value=this.attribute("height").value;return a};this.path=function(a){var b=
+this.getDefinition();b!=null&&b.path(a)};this.renderChildren=function(a){var b=this.getDefinition();b!=null&&b.render(a)}};a.Element.use.prototype=new a.Element.RenderedElementBase;a.Element.mask=function(c){this.base=a.Element.ElementBase;this.base(c);this.apply=function(a,b){var c=this.attribute("x").Length.toPixels("x"),e=this.attribute("y").Length.toPixels("y"),f=this.attribute("width").Length.toPixels("x"),g=this.attribute("height").Length.toPixels("y"),j=b.attribute("mask").value;b.attribute("mask").value=
+"";var h=document.createElement("canvas");h.width=c+f;h.height=e+g;var l=h.getContext("2d");this.renderChildren(l);var o=document.createElement("canvas");o.width=c+f;o.height=e+g;var n=o.getContext("2d");b.render(n);n.globalCompositeOperation="destination-in";n.fillStyle=l.createPattern(h,"no-repeat");n.fillRect(0,0,c+f,e+g);a.fillStyle=n.createPattern(o,"no-repeat");a.fillRect(0,0,c+f,e+g);b.attribute("mask").value=j};this.render=function(){}};a.Element.mask.prototype=new a.Element.ElementBase;a.Element.clipPath=
+function(c){this.base=a.Element.ElementBase;this.base(c);this.apply=function(a){for(var b=0;b<this.children.length;b++)this.children[b].path&&(this.children[b].path(a),a.clip())};this.render=function(){}};a.Element.clipPath.prototype=new a.Element.ElementBase;a.Element.filter=function(c){this.base=a.Element.ElementBase;this.base(c);this.apply=function(a,b){var c=b.getBoundingBox(),e=this.attribute("x").Length.toPixels("x"),f=this.attribute("y").Length.toPixels("y");if(e==0||f==0)e=c.x1,f=c.y1;var g=
+this.attribute("width").Length.toPixels("x"),j=this.attribute("height").Length.toPixels("y");if(g==0||j==0)g=c.width(),j=c.height();c=b.style("filter").value;b.style("filter").value="";var h=0.2*g,l=0.2*j,o=document.createElement("canvas");o.width=g+2*h;o.height=j+2*l;var n=o.getContext("2d");n.translate(-e+h,-f+l);b.render(n);for(var q=0;q<this.children.length;q++)this.children[q].apply(n,0,0,g+2*h,j+2*l);a.drawImage(o,0,0,g+2*h,j+2*l,e-h,f-l,g+2*h,j+2*l);b.style("filter",!0).value=c};this.render=
+function(){}};a.Element.filter.prototype=new a.Element.ElementBase;a.Element.feGaussianBlur=function(c){function d(a,c,d,f,g){for(var j=0;j<g;j++)for(var h=0;h<f;h++)for(var l=a[j*f*4+h*4+3]/255,o=0;o<4;o++){for(var n=d[0]*(l==0?255:a[j*f*4+h*4+o])*(l==0||o==3?1:l),q=1;q<d.length;q++){var p=Math.max(h-q,0),m=a[j*f*4+p*4+3]/255,p=Math.min(h+q,f-1),p=a[j*f*4+p*4+3]/255,s=d[q],r;m==0?r=255:(r=Math.max(h-q,0),r=a[j*f*4+r*4+o]);m=r*(m==0||o==3?1:m);p==0?r=255:(r=Math.min(h+q,f-1),r=a[j*f*4+r*4+o]);n+=
+s*(m+r*(p==0||o==3?1:p))}c[h*g*4+j*4+o]=n}}this.base=a.Element.ElementBase;this.base(c);this.apply=function(a,c,e,f,g){var e=this.attribute("stdDeviation").numValue(),c=a.getImageData(0,0,f,g),e=Math.max(e,0.01),j=Math.ceil(e*4)+1;mask=[];for(var h=0;h<j;h++)mask[h]=Math.exp(-0.5*(h/e)*(h/e));e=mask;j=0;for(h=1;h<e.length;h++)j+=Math.abs(e[h]);j=2*j+Math.abs(e[0]);for(h=0;h<e.length;h++)e[h]/=j;tmp=[];d(c.data,tmp,e,f,g);d(tmp,c.data,e,g,f);a.clearRect(0,0,f,g);a.putImageData(c,0,0)}};a.Element.filter.prototype=
+new a.Element.feGaussianBlur;a.Element.title=function(){};a.Element.title.prototype=new a.Element.ElementBase;a.Element.desc=function(){};a.Element.desc.prototype=new a.Element.ElementBase;a.Element.MISSING=function(a){console.log("ERROR: Element '"+a.nodeName+"' not yet implemented.")};a.Element.MISSING.prototype=new a.Element.ElementBase;a.CreateElement=function(c){var d=c.nodeName.replace(/^[^:]+:/,""),d=d.replace(/\-/g,""),b=null,b=typeof a.Element[d]!="undefined"?new a.Element[d](c):new a.Element.MISSING(c);
+b.type=c.nodeName;return b};a.load=function(c,d){a.loadXml(c,a.ajax(d))};a.loadXml=function(c,d){a.loadXmlDoc(c,a.parseXml(d))};a.loadXmlDoc=function(c,d){a.init(c);var b=function(a){for(var b=c.canvas;b;)a.x-=b.offsetLeft,a.y-=b.offsetTop,b=b.offsetParent;window.scrollX&&(a.x+=window.scrollX);window.scrollY&&(a.y+=window.scrollY);return a};if(a.opts.ignoreMouse!=!0)c.canvas.onclick=function(c){c=b(new a.Point(c!=null?c.clientX:event.clientX,c!=null?c.clientY:event.clientY));a.Mouse.onclick(c.x,c.y)},
+c.canvas.onmousemove=function(c){c=b(new a.Point(c!=null?c.clientX:event.clientX,c!=null?c.clientY:event.clientY));a.Mouse.onmousemove(c.x,c.y)};var k=a.CreateElement(d.documentElement),e=k.root=!0,f=function(){a.ViewPort.Clear();c.canvas.parentNode&&a.ViewPort.SetCurrent(c.canvas.parentNode.clientWidth,c.canvas.parentNode.clientHeight);if(a.opts.ignoreDimensions!=!0){if(k.style("width").hasValue())c.canvas.width=k.style("width").Length.toPixels("x"),c.canvas.style.width=c.canvas.width+"px";if(k.style("height").hasValue())c.canvas.height=
+k.style("height").Length.toPixels("y"),c.canvas.style.height=c.canvas.height+"px"}var b=c.canvas.clientWidth||c.canvas.width,d=c.canvas.clientHeight||c.canvas.height;a.ViewPort.SetCurrent(b,d);if(a.opts!=null&&a.opts.offsetX!=null)k.attribute("x",!0).value=a.opts.offsetX;if(a.opts!=null&&a.opts.offsetY!=null)k.attribute("y",!0).value=a.opts.offsetY;if(a.opts!=null&&a.opts.scaleWidth!=null&&a.opts.scaleHeight!=null){var f=1,g=1;k.attribute("width").hasValue()&&(f=k.attribute("width").Length.toPixels("x")/
+a.opts.scaleWidth);k.attribute("height").hasValue()&&(g=k.attribute("height").Length.toPixels("y")/a.opts.scaleHeight);k.attribute("width",!0).value=a.opts.scaleWidth;k.attribute("height",!0).value=a.opts.scaleHeight;k.attribute("viewBox",!0).value="0 0 "+b*f+" "+d*g;k.attribute("preserveAspectRatio",!0).value="none"}a.opts.ignoreClear!=!0&&c.clearRect(0,0,b,d);k.render(c);e&&(e=!1,a.opts!=null&&typeof a.opts.renderCallback=="function"&&a.opts.renderCallback())},g=!0;a.ImagesLoaded()&&(g=!1,f());
+a.intervalID=setInterval(function(){var b=!1;g&&a.ImagesLoaded()&&(g=!1,b=!0);a.opts.ignoreMouse!=!0&&(b|=a.Mouse.hasEvents());if(a.opts.ignoreAnimation!=!0)for(var c=0;c<a.Animations.length;c++)b|=a.Animations[c].update(1E3/a.FRAMERATE);a.opts!=null&&typeof a.opts.forceRedraw=="function"&&a.opts.forceRedraw()==!0&&(b=!0);b&&(f(),a.Mouse.runEvents())},1E3/a.FRAMERATE)};a.stop=function(){a.intervalID&&clearInterval(a.intervalID)};a.Mouse=new function(){this.events=[];this.hasEvents=function(){return this.events.length!=
+0};this.onclick=function(a,d){this.events.push({type:"onclick",x:a,y:d,run:function(a){if(a.onclick)a.onclick()}})};this.onmousemove=function(a,d){this.events.push({type:"onmousemove",x:a,y:d,run:function(a){if(a.onmousemove)a.onmousemove()}})};this.eventElements=[];this.checkPath=function(a,d){for(var b=0;b<this.events.length;b++){var k=this.events[b];d.isPointInPath&&d.isPointInPath(k.x,k.y)&&(this.eventElements[b]=a)}};this.checkBoundingBox=function(a,d){for(var b=0;b<this.events.length;b++){var k=
+this.events[b];d.isPointInBox(k.x,k.y)&&(this.eventElements[b]=a)}};this.runEvents=function(){a.ctx.canvas.style.cursor="";for(var c=0;c<this.events.length;c++)for(var d=this.events[c],b=this.eventElements[c];b;)d.run(b),b=b.parent;this.events=[];this.eventElements=[]}};return a}this.canvg=function(a,c,d){if(a==null&&c==null&&d==null)for(var c=document.getElementsByTagName("svg"),b=0;b<c.length;b++){a=c[b];d=document.createElement("canvas");d.width=a.clientWidth;d.height=a.clientHeight;a.parentNode.insertBefore(d,
+a);a.parentNode.removeChild(a);var k=document.createElement("div");k.appendChild(a);canvg(d,k.innerHTML)}else d=d||{},typeof a=="string"&&(a=document.getElementById(a)),a.svg==null?(b=m(),a.svg=b):(b=a.svg,b.stop()),b.opts=d,a=a.getContext("2d"),typeof c.documentElement!="undefined"?b.loadXmlDoc(a,c):c.substr(0,1)=="<"?b.loadXml(a,c):b.load(a,c)}})();
+if(CanvasRenderingContext2D)CanvasRenderingContext2D.prototype.drawSvg=function(m,a,c,d,b){canvg(this.canvas,m,{ignoreMouse:!0,ignoreAnimation:!0,ignoreDimensions:!0,ignoreClear:!0,offsetX:a,offsetY:c,scaleWidth:d,scaleHeight:b})};
+(function(m){var a=m.css,c=m.CanVGRenderer,d=m.SVGRenderer,b=m.extend,k=m.merge,e=m.addEvent,f=m.createElement,g=m.discardElement;b(c.prototype,d.prototype);b(c.prototype,{create:function(a,b,c,d){this.setContainer(b,c,d);this.configure(a)},setContainer:function(a,b,c){var d=a.style,e=a.parentNode,g=d.left,d=d.top,k=a.offsetWidth,m=a.offsetHeight,s={visibility:"hidden",position:"absolute"};this.init.apply(this,[a,b,c]);this.canvas=f("canvas",{width:k,height:m},{position:"relative",left:g,top:d},a);
+this.ttLine=f("div",null,s,e);this.ttDiv=f("div",null,s,e);this.ttTimer=void 0;this.hiddenSvg=a=f("div",{width:k,height:m},{visibility:"hidden",left:g,top:d},e);a.appendChild(this.box)},configure:function(b){var c=this,d=b.options.tooltip,f=d.borderWidth,g=c.ttDiv,m=d.style,p=c.ttLine,t=parseInt(m.padding,10),m=k(m,{padding:t+"px","background-color":d.backgroundColor,"border-style":"solid","border-width":f+"px","border-radius":d.borderRadius+"px"});d.shadow&&(m=k(m,{"box-shadow":"1px 1px 3px gray",
+"-webkit-box-shadow":"1px 1px 3px gray"}));a(g,m);a(p,{"border-left":"1px solid darkgray"});e(b,"tooltipRefresh",function(d){var e=b.container,f=e.offsetLeft,e=e.offsetTop,k;g.innerHTML=d.text;k=b.tooltip.getPosition(g.offsetWidth,g.offsetHeight,{plotX:d.x,plotY:d.y});a(g,{visibility:"visible",left:k.x+"px",top:k.y+"px","border-color":d.borderColor});a(p,{visibility:"visible",left:f+d.x+"px",top:e+b.plotTop+"px",height:b.plotHeight+"px"});c.ttTimer!==void 0&&clearTimeout(c.ttTimer);c.ttTimer=setTimeout(function(){a(g,
+{visibility:"hidden"});a(p,{visibility:"hidden"})},3E3)})},destroy:function(){g(this.canvas);this.ttTimer!==void 0&&clearTimeout(this.ttTimer);g(this.ttLine);g(this.ttDiv);g(this.hiddenSvg);return d.prototype.destroy.apply(this)},color:function(a,b,c){a&&a.linearGradient&&(a=a.stops[a.stops.length-1][1]);return d.prototype.color.call(this,a,b,c)},draw:function(){window.canvg(this.canvas,this.hiddenSvg.innerHTML)}})})(Highcharts);
diff --git a/data/interfaces/default/js/highcharts/js/modules/canvas-tools.src.js b/data/interfaces/default/js/highcharts/js/modules/canvas-tools.src.js
new file mode 100644
index 00000000..5c7ff64a
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/modules/canvas-tools.src.js
@@ -0,0 +1,3113 @@
+/**
+ * @license A class to parse color values
+ * @author Stoyan Stefanov <sstoo@gmail.com>
+ * @link   http://www.phpied.com/rgb-color-parser-in-javascript/
+ * Use it if you like it
+ *
+ */
+function RGBColor(color_string)
+{
+    this.ok = false;
+
+    // strip any leading #
+    if (color_string.charAt(0) == '#') { // remove # if any
+        color_string = color_string.substr(1,6);
+    }
+
+    color_string = color_string.replace(/ /g,'');
+    color_string = color_string.toLowerCase();
+
+    // before getting into regexps, try simple matches
+    // and overwrite the input
+    var simple_colors = {
+        aliceblue: 'f0f8ff',
+        antiquewhite: 'faebd7',
+        aqua: '00ffff',
+        aquamarine: '7fffd4',
+        azure: 'f0ffff',
+        beige: 'f5f5dc',
+        bisque: 'ffe4c4',
+        black: '000000',
+        blanchedalmond: 'ffebcd',
+        blue: '0000ff',
+        blueviolet: '8a2be2',
+        brown: 'a52a2a',
+        burlywood: 'deb887',
+        cadetblue: '5f9ea0',
+        chartreuse: '7fff00',
+        chocolate: 'd2691e',
+        coral: 'ff7f50',
+        cornflowerblue: '6495ed',
+        cornsilk: 'fff8dc',
+        crimson: 'dc143c',
+        cyan: '00ffff',
+        darkblue: '00008b',
+        darkcyan: '008b8b',
+        darkgoldenrod: 'b8860b',
+        darkgray: 'a9a9a9',
+        darkgreen: '006400',
+        darkkhaki: 'bdb76b',
+        darkmagenta: '8b008b',
+        darkolivegreen: '556b2f',
+        darkorange: 'ff8c00',
+        darkorchid: '9932cc',
+        darkred: '8b0000',
+        darksalmon: 'e9967a',
+        darkseagreen: '8fbc8f',
+        darkslateblue: '483d8b',
+        darkslategray: '2f4f4f',
+        darkturquoise: '00ced1',
+        darkviolet: '9400d3',
+        deeppink: 'ff1493',
+        deepskyblue: '00bfff',
+        dimgray: '696969',
+        dodgerblue: '1e90ff',
+        feldspar: 'd19275',
+        firebrick: 'b22222',
+        floralwhite: 'fffaf0',
+        forestgreen: '228b22',
+        fuchsia: 'ff00ff',
+        gainsboro: 'dcdcdc',
+        ghostwhite: 'f8f8ff',
+        gold: 'ffd700',
+        goldenrod: 'daa520',
+        gray: '808080',
+        green: '008000',
+        greenyellow: 'adff2f',
+        honeydew: 'f0fff0',
+        hotpink: 'ff69b4',
+        indianred : 'cd5c5c',
+        indigo : '4b0082',
+        ivory: 'fffff0',
+        khaki: 'f0e68c',
+        lavender: 'e6e6fa',
+        lavenderblush: 'fff0f5',
+        lawngreen: '7cfc00',
+        lemonchiffon: 'fffacd',
+        lightblue: 'add8e6',
+        lightcoral: 'f08080',
+        lightcyan: 'e0ffff',
+        lightgoldenrodyellow: 'fafad2',
+        lightgrey: 'd3d3d3',
+        lightgreen: '90ee90',
+        lightpink: 'ffb6c1',
+        lightsalmon: 'ffa07a',
+        lightseagreen: '20b2aa',
+        lightskyblue: '87cefa',
+        lightslateblue: '8470ff',
+        lightslategray: '778899',
+        lightsteelblue: 'b0c4de',
+        lightyellow: 'ffffe0',
+        lime: '00ff00',
+        limegreen: '32cd32',
+        linen: 'faf0e6',
+        magenta: 'ff00ff',
+        maroon: '800000',
+        mediumaquamarine: '66cdaa',
+        mediumblue: '0000cd',
+        mediumorchid: 'ba55d3',
+        mediumpurple: '9370d8',
+        mediumseagreen: '3cb371',
+        mediumslateblue: '7b68ee',
+        mediumspringgreen: '00fa9a',
+        mediumturquoise: '48d1cc',
+        mediumvioletred: 'c71585',
+        midnightblue: '191970',
+        mintcream: 'f5fffa',
+        mistyrose: 'ffe4e1',
+        moccasin: 'ffe4b5',
+        navajowhite: 'ffdead',
+        navy: '000080',
+        oldlace: 'fdf5e6',
+        olive: '808000',
+        olivedrab: '6b8e23',
+        orange: 'ffa500',
+        orangered: 'ff4500',
+        orchid: 'da70d6',
+        palegoldenrod: 'eee8aa',
+        palegreen: '98fb98',
+        paleturquoise: 'afeeee',
+        palevioletred: 'd87093',
+        papayawhip: 'ffefd5',
+        peachpuff: 'ffdab9',
+        peru: 'cd853f',
+        pink: 'ffc0cb',
+        plum: 'dda0dd',
+        powderblue: 'b0e0e6',
+        purple: '800080',
+        red: 'ff0000',
+        rosybrown: 'bc8f8f',
+        royalblue: '4169e1',
+        saddlebrown: '8b4513',
+        salmon: 'fa8072',
+        sandybrown: 'f4a460',
+        seagreen: '2e8b57',
+        seashell: 'fff5ee',
+        sienna: 'a0522d',
+        silver: 'c0c0c0',
+        skyblue: '87ceeb',
+        slateblue: '6a5acd',
+        slategray: '708090',
+        snow: 'fffafa',
+        springgreen: '00ff7f',
+        steelblue: '4682b4',
+        tan: 'd2b48c',
+        teal: '008080',
+        thistle: 'd8bfd8',
+        tomato: 'ff6347',
+        turquoise: '40e0d0',
+        violet: 'ee82ee',
+        violetred: 'd02090',
+        wheat: 'f5deb3',
+        white: 'ffffff',
+        whitesmoke: 'f5f5f5',
+        yellow: 'ffff00',
+        yellowgreen: '9acd32'
+    };
+    for (var key in simple_colors) {
+        if (color_string == key) {
+            color_string = simple_colors[key];
+        }
+    }
+    // emd of simple type-in colors
+
+    // array of color definition objects
+    var color_defs = [
+        {
+            re: /^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/,
+            example: ['rgb(123, 234, 45)', 'rgb(255,234,245)'],
+            process: function (bits){
+                return [
+                    parseInt(bits[1]),
+                    parseInt(bits[2]),
+                    parseInt(bits[3])
+                ];
+            }
+        },
+        {
+            re: /^(\w{2})(\w{2})(\w{2})$/,
+            example: ['#00ff00', '336699'],
+            process: function (bits){
+                return [
+                    parseInt(bits[1], 16),
+                    parseInt(bits[2], 16),
+                    parseInt(bits[3], 16)
+                ];
+            }
+        },
+        {
+            re: /^(\w{1})(\w{1})(\w{1})$/,
+            example: ['#fb0', 'f0f'],
+            process: function (bits){
+                return [
+                    parseInt(bits[1] + bits[1], 16),
+                    parseInt(bits[2] + bits[2], 16),
+                    parseInt(bits[3] + bits[3], 16)
+                ];
+            }
+        }
+    ];
+
+    // search through the definitions to find a match
+    for (var i = 0; i < color_defs.length; i++) {
+        var re = color_defs[i].re;
+        var processor = color_defs[i].process;
+        var bits = re.exec(color_string);
+        if (bits) {
+            channels = processor(bits);
+            this.r = channels[0];
+            this.g = channels[1];
+            this.b = channels[2];
+            this.ok = true;
+        }
+
+    }
+
+    // validate/cleanup values
+    this.r = (this.r < 0 || isNaN(this.r)) ? 0 : ((this.r > 255) ? 255 : this.r);
+    this.g = (this.g < 0 || isNaN(this.g)) ? 0 : ((this.g > 255) ? 255 : this.g);
+    this.b = (this.b < 0 || isNaN(this.b)) ? 0 : ((this.b > 255) ? 255 : this.b);
+
+    // some getters
+    this.toRGB = function () {
+        return 'rgb(' + this.r + ', ' + this.g + ', ' + this.b + ')';
+    }
+    this.toHex = function () {
+        var r = this.r.toString(16);
+        var g = this.g.toString(16);
+        var b = this.b.toString(16);
+        if (r.length == 1) r = '0' + r;
+        if (g.length == 1) g = '0' + g;
+        if (b.length == 1) b = '0' + b;
+        return '#' + r + g + b;
+    }
+
+    // help
+    this.getHelpXML = function () {
+
+        var examples = new Array();
+        // add regexps
+        for (var i = 0; i < color_defs.length; i++) {
+            var example = color_defs[i].example;
+            for (var j = 0; j < example.length; j++) {
+                examples[examples.length] = example[j];
+            }
+        }
+        // add type-in colors
+        for (var sc in simple_colors) {
+            examples[examples.length] = sc;
+        }
+
+        var xml = document.createElement('ul');
+        xml.setAttribute('id', 'rgbcolor-examples');
+        for (var i = 0; i < examples.length; i++) {
+            try {
+                var list_item = document.createElement('li');
+                var list_color = new RGBColor(examples[i]);
+                var example_div = document.createElement('div');
+                example_div.style.cssText =
+                        'margin: 3px; '
+                        + 'border: 1px solid black; '
+                        + 'background:' + list_color.toHex() + '; '
+                        + 'color:' + list_color.toHex()
+                ;
+                example_div.appendChild(document.createTextNode('test'));
+                var list_item_value = document.createTextNode(
+                    ' ' + examples[i] + ' -> ' + list_color.toRGB() + ' -> ' + list_color.toHex()
+                );
+                list_item.appendChild(example_div);
+                list_item.appendChild(list_item_value);
+                xml.appendChild(list_item);
+
+            } catch(e){}
+        }
+        return xml;
+
+    }
+
+}
+
+/**
+ * @license canvg.js - Javascript SVG parser and renderer on Canvas
+ * MIT Licensed 
+ * Gabe Lerner (gabelerner@gmail.com)
+ * http://code.google.com/p/canvg/
+ *
+ * Requires: rgbcolor.js - http://www.phpied.com/rgb-color-parser-in-javascript/
+ *
+ */
+if(!window.console) {
+	window.console = {};
+	window.console.log = function(str) {};
+	window.console.dir = function(str) {};
+}
+
+if(!Array.prototype.indexOf){
+	Array.prototype.indexOf = function(obj){
+		for(var i=0; i<this.length; i++){
+			if(this[i]==obj){
+				return i;
+			}
+		}
+		return -1;
+	}
+}
+
+(function(){
+	// canvg(target, s)
+	// empty parameters: replace all 'svg' elements on page with 'canvas' elements
+	// target: canvas element or the id of a canvas element
+	// s: svg string, url to svg file, or xml document
+	// opts: optional hash of options
+	//		 ignoreMouse: true => ignore mouse events
+	//		 ignoreAnimation: true => ignore animations
+	//		 ignoreDimensions: true => does not try to resize canvas
+	//		 ignoreClear: true => does not clear canvas
+	//		 offsetX: int => draws at a x offset
+	//		 offsetY: int => draws at a y offset
+	//		 scaleWidth: int => scales horizontally to width
+	//		 scaleHeight: int => scales vertically to height
+	//		 renderCallback: function => will call the function after the first render is completed
+	//		 forceRedraw: function => will call the function on every frame, if it returns true, will redraw
+	this.canvg = function (target, s, opts) {
+		// no parameters
+		if (target == null && s == null && opts == null) {
+			var svgTags = document.getElementsByTagName('svg');
+			for (var i=0; i<svgTags.length; i++) {
+				var svgTag = svgTags[i];
+				var c = document.createElement('canvas');
+				c.width = svgTag.clientWidth;
+				c.height = svgTag.clientHeight;
+				svgTag.parentNode.insertBefore(c, svgTag);
+				svgTag.parentNode.removeChild(svgTag);
+				var div = document.createElement('div');
+				div.appendChild(svgTag);
+				canvg(c, div.innerHTML);
+			}
+			return;
+		}	
+		opts = opts || {};
+	
+		if (typeof target == 'string') {
+			target = document.getElementById(target);
+		}
+		
+		// reuse class per canvas
+		var svg;
+		if (target.svg == null) {
+			svg = build();
+			target.svg = svg;
+		}
+		else {
+			svg = target.svg;
+			svg.stop();
+		}
+		svg.opts = opts;
+		
+		var ctx = target.getContext('2d');
+		if (typeof(s.documentElement) != 'undefined') {
+			// load from xml doc
+			svg.loadXmlDoc(ctx, s);
+		}
+		else if (s.substr(0,1) == '<') {
+			// load from xml string
+			svg.loadXml(ctx, s);
+		}
+		else {
+			// load from url
+			svg.load(ctx, s);
+		}
+	}
+
+	function build() {
+		var svg = { };
+		
+		svg.FRAMERATE = 30;
+		svg.MAX_VIRTUAL_PIXELS = 30000;
+		
+		// globals
+		svg.init = function(ctx) {
+			svg.Definitions = {};
+			svg.Styles = {};
+			svg.Animations = [];
+			svg.Images = [];
+			svg.ctx = ctx;
+			svg.ViewPort = new (function () {
+				this.viewPorts = [];
+				this.Clear = function() { this.viewPorts = []; }
+				this.SetCurrent = function(width, height) { this.viewPorts.push({ width: width, height: height }); }
+				this.RemoveCurrent = function() { this.viewPorts.pop(); }
+				this.Current = function() { return this.viewPorts[this.viewPorts.length - 1]; }
+				this.width = function() { return this.Current().width; }
+				this.height = function() { return this.Current().height; }
+				this.ComputeSize = function(d) {
+					if (d != null && typeof(d) == 'number') return d;
+					if (d == 'x') return this.width();
+					if (d == 'y') return this.height();
+					return Math.sqrt(Math.pow(this.width(), 2) + Math.pow(this.height(), 2)) / Math.sqrt(2);			
+				}
+			});
+		}
+		svg.init();
+		
+		// images loaded
+		svg.ImagesLoaded = function() { 
+			for (var i=0; i<svg.Images.length; i++) {
+				if (!svg.Images[i].loaded) return false;
+			}
+			return true;
+		}
+
+		// trim
+		svg.trim = function(s) { return s.replace(/^\s+|\s+$/g, ''); }
+		
+		// compress spaces
+		svg.compressSpaces = function(s) { return s ? s.replace(/[\s\r\t\n]+/gm,' ') : ''; }
+		
+		// ajax
+		svg.ajax = function(url) {
+			var AJAX;
+			if(window.XMLHttpRequest){AJAX=new XMLHttpRequest();}
+			else{AJAX=new ActiveXObject('Microsoft.XMLHTTP');}
+			if(AJAX){
+			   AJAX.open('GET',url,false);
+			   AJAX.send(null);
+			   return AJAX.responseText;
+			}
+			return null;
+		} 
+		
+		// parse xml
+		svg.parseXml = function(xml) {
+			if (window.DOMParser)
+			{
+				var parser = new DOMParser();
+				return parser.parseFromString(xml, 'text/xml');
+			}
+			else 
+			{
+				xml = xml.replace(/<!DOCTYPE svg[^>]*>/, '');
+				var xmlDoc = new ActiveXObject('Microsoft.XMLDOM');
+				xmlDoc.async = 'false';
+				xmlDoc.loadXML(xml); 
+				return xmlDoc;
+			}		
+		}
+		
+		svg.Property = function(name, value) {
+			this.name = name;
+			this.value = value;
+			
+			this.hasValue = function() {
+				return (this.value != null && this.value !== '');
+			}
+							
+			// return the numerical value of the property
+			this.numValue = function() {
+				if (!this.hasValue()) return 0;
+				
+				var n = parseFloat(this.value);
+				if ((this.value + '').match(/%$/)) {
+					n = n / 100.0;
+				}
+				return n;
+			}
+			
+			this.valueOrDefault = function(def) {
+				if (this.hasValue()) return this.value;
+				return def;
+			}
+			
+			this.numValueOrDefault = function(def) {
+				if (this.hasValue()) return this.numValue();
+				return def;
+			}
+			
+			/* EXTENSIONS */
+			var that = this;
+			
+			// color extensions
+			this.Color = {
+				// augment the current color value with the opacity
+				addOpacity: function(opacity) {
+					var newValue = that.value;
+					if (opacity != null && opacity != '') {
+						var color = new RGBColor(that.value);
+						if (color.ok) {
+							newValue = 'rgba(' + color.r + ', ' + color.g + ', ' + color.b + ', ' + opacity + ')';
+						}
+					}
+					return new svg.Property(that.name, newValue);
+				}
+			}
+			
+			// definition extensions
+			this.Definition = {
+				// get the definition from the definitions table
+				getDefinition: function() {
+					var name = that.value.replace(/^(url\()?#([^\)]+)\)?$/, '$2');
+					return svg.Definitions[name];
+				},
+				
+				isUrl: function() {
+					return that.value.indexOf('url(') == 0
+				},
+				
+				getFillStyle: function(e) {
+					var def = this.getDefinition();
+					
+					// gradient
+					if (def != null && def.createGradient) {
+						return def.createGradient(svg.ctx, e);
+					}
+					
+					// pattern
+					if (def != null && def.createPattern) {
+						return def.createPattern(svg.ctx, e);
+					}
+					
+					return null;
+				}
+			}
+			
+			// length extensions
+			this.Length = {
+				DPI: function(viewPort) {
+					return 96.0; // TODO: compute?
+				},
+				
+				EM: function(viewPort) {
+					var em = 12;
+					
+					var fontSize = new svg.Property('fontSize', svg.Font.Parse(svg.ctx.font).fontSize);
+					if (fontSize.hasValue()) em = fontSize.Length.toPixels(viewPort);
+					
+					return em;
+				},
+			
+				// get the length as pixels
+				toPixels: function(viewPort) {
+					if (!that.hasValue()) return 0;
+					var s = that.value+'';
+					if (s.match(/em$/)) return that.numValue() * this.EM(viewPort);
+					if (s.match(/ex$/)) return that.numValue() * this.EM(viewPort) / 2.0;
+					if (s.match(/px$/)) return that.numValue();
+					if (s.match(/pt$/)) return that.numValue() * 1.25;
+					if (s.match(/pc$/)) return that.numValue() * 15;
+					if (s.match(/cm$/)) return that.numValue() * this.DPI(viewPort) / 2.54;
+					if (s.match(/mm$/)) return that.numValue() * this.DPI(viewPort) / 25.4;
+					if (s.match(/in$/)) return that.numValue() * this.DPI(viewPort);
+					if (s.match(/%$/)) return that.numValue() * svg.ViewPort.ComputeSize(viewPort);
+					return that.numValue();
+				}
+			}
+			
+			// time extensions
+			this.Time = {
+				// get the time as milliseconds
+				toMilliseconds: function() {
+					if (!that.hasValue()) return 0;
+					var s = that.value+'';
+					if (s.match(/s$/)) return that.numValue() * 1000;
+					if (s.match(/ms$/)) return that.numValue();
+					return that.numValue();
+				}
+			}
+			
+			// angle extensions
+			this.Angle = {
+				// get the angle as radians
+				toRadians: function() {
+					if (!that.hasValue()) return 0;
+					var s = that.value+'';
+					if (s.match(/deg$/)) return that.numValue() * (Math.PI / 180.0);
+					if (s.match(/grad$/)) return that.numValue() * (Math.PI / 200.0);
+					if (s.match(/rad$/)) return that.numValue();
+					return that.numValue() * (Math.PI / 180.0);
+				}
+			}
+		}
+		
+		// fonts
+		svg.Font = new (function() {
+			this.Styles = ['normal','italic','oblique','inherit'];
+			this.Variants = ['normal','small-caps','inherit'];
+			this.Weights = ['normal','bold','bolder','lighter','100','200','300','400','500','600','700','800','900','inherit'];
+			
+			this.CreateFont = function(fontStyle, fontVariant, fontWeight, fontSize, fontFamily, inherit) { 
+				var f = inherit != null ? this.Parse(inherit) : this.CreateFont('', '', '', '', '', svg.ctx.font);
+				return { 
+					fontFamily: fontFamily || f.fontFamily, 
+					fontSize: fontSize || f.fontSize, 
+					fontStyle: fontStyle || f.fontStyle, 
+					fontWeight: fontWeight || f.fontWeight, 
+					fontVariant: fontVariant || f.fontVariant,
+					toString: function () { return [this.fontStyle, this.fontVariant, this.fontWeight, this.fontSize, this.fontFamily].join(' ') } 
+				} 
+			}
+			
+			var that = this;
+			this.Parse = function(s) {
+				var f = {};
+				var d = svg.trim(svg.compressSpaces(s || '')).split(' ');
+				var set = { fontSize: false, fontStyle: false, fontWeight: false, fontVariant: false }
+				var ff = '';
+				for (var i=0; i<d.length; i++) {
+					if (!set.fontStyle && that.Styles.indexOf(d[i]) != -1) { if (d[i] != 'inherit') f.fontStyle = d[i]; set.fontStyle = true; }
+					else if (!set.fontVariant && that.Variants.indexOf(d[i]) != -1) { if (d[i] != 'inherit') f.fontVariant = d[i]; set.fontStyle = set.fontVariant = true;	}
+					else if (!set.fontWeight && that.Weights.indexOf(d[i]) != -1) {	if (d[i] != 'inherit') f.fontWeight = d[i]; set.fontStyle = set.fontVariant = set.fontWeight = true; }
+					else if (!set.fontSize) { if (d[i] != 'inherit') f.fontSize = d[i].split('/')[0]; set.fontStyle = set.fontVariant = set.fontWeight = set.fontSize = true; }
+					else { if (d[i] != 'inherit') ff += d[i]; }
+				} if (ff != '') f.fontFamily = ff;
+				return f;
+			}
+		});
+		
+		// points and paths
+		svg.ToNumberArray = function(s) {
+			var a = svg.trim(svg.compressSpaces((s || '').replace(/,/g, ' '))).split(' ');
+			for (var i=0; i<a.length; i++) {
+				a[i] = parseFloat(a[i]);
+			}
+			return a;
+		}		
+		svg.Point = function(x, y) {
+			this.x = x;
+			this.y = y;
+			
+			this.angleTo = function(p) {
+				return Math.atan2(p.y - this.y, p.x - this.x);
+			}
+			
+			this.applyTransform = function(v) {
+				var xp = this.x * v[0] + this.y * v[2] + v[4];
+				var yp = this.x * v[1] + this.y * v[3] + v[5];
+				this.x = xp;
+				this.y = yp;
+			}
+		}
+		svg.CreatePoint = function(s) {
+			var a = svg.ToNumberArray(s);
+			return new svg.Point(a[0], a[1]);
+		}
+		svg.CreatePath = function(s) {
+			var a = svg.ToNumberArray(s);
+			var path = [];
+			for (var i=0; i<a.length; i+=2) {
+				path.push(new svg.Point(a[i], a[i+1]));
+			}
+			return path;
+		}
+		
+		// bounding box
+		svg.BoundingBox = function(x1, y1, x2, y2) { // pass in initial points if you want
+			this.x1 = Number.NaN;
+			this.y1 = Number.NaN;
+			this.x2 = Number.NaN;
+			this.y2 = Number.NaN;
+			
+			this.x = function() { return this.x1; }
+			this.y = function() { return this.y1; }
+			this.width = function() { return this.x2 - this.x1; }
+			this.height = function() { return this.y2 - this.y1; }
+			
+			this.addPoint = function(x, y) {	
+				if (x != null) {
+					if (isNaN(this.x1) || isNaN(this.x2)) {
+						this.x1 = x;
+						this.x2 = x;
+					}
+					if (x < this.x1) this.x1 = x;
+					if (x > this.x2) this.x2 = x;
+				}
+			
+				if (y != null) {
+					if (isNaN(this.y1) || isNaN(this.y2)) {
+						this.y1 = y;
+						this.y2 = y;
+					}
+					if (y < this.y1) this.y1 = y;
+					if (y > this.y2) this.y2 = y;
+				}
+			}			
+			this.addX = function(x) { this.addPoint(x, null); }
+			this.addY = function(y) { this.addPoint(null, y); }
+			
+			this.addBoundingBox = function(bb) {
+				this.addPoint(bb.x1, bb.y1);
+				this.addPoint(bb.x2, bb.y2);
+			}
+			
+			this.addQuadraticCurve = function(p0x, p0y, p1x, p1y, p2x, p2y) {
+				var cp1x = p0x + 2/3 * (p1x - p0x); // CP1 = QP0 + 2/3 *(QP1-QP0)
+				var cp1y = p0y + 2/3 * (p1y - p0y); // CP1 = QP0 + 2/3 *(QP1-QP0)
+				var cp2x = cp1x + 1/3 * (p2x - p0x); // CP2 = CP1 + 1/3 *(QP2-QP0)
+				var cp2y = cp1y + 1/3 * (p2y - p0y); // CP2 = CP1 + 1/3 *(QP2-QP0)
+				this.addBezierCurve(p0x, p0y, cp1x, cp2x, cp1y,	cp2y, p2x, p2y);
+			}
+			
+			this.addBezierCurve = function(p0x, p0y, p1x, p1y, p2x, p2y, p3x, p3y) {
+				// from http://blog.hackers-cafe.net/2009/06/how-to-calculate-bezier-curves-bounding.html
+				var p0 = [p0x, p0y], p1 = [p1x, p1y], p2 = [p2x, p2y], p3 = [p3x, p3y];
+				this.addPoint(p0[0], p0[1]);
+				this.addPoint(p3[0], p3[1]);
+				
+				for (i=0; i<=1; i++) {
+					var f = function(t) { 
+						return Math.pow(1-t, 3) * p0[i]
+						+ 3 * Math.pow(1-t, 2) * t * p1[i]
+						+ 3 * (1-t) * Math.pow(t, 2) * p2[i]
+						+ Math.pow(t, 3) * p3[i];
+					}
+					
+					var b = 6 * p0[i] - 12 * p1[i] + 6 * p2[i];
+					var a = -3 * p0[i] + 9 * p1[i] - 9 * p2[i] + 3 * p3[i];
+					var c = 3 * p1[i] - 3 * p0[i];
+					
+					if (a == 0) {
+						if (b == 0) continue;
+						var t = -c / b;
+						if (0 < t && t < 1) {
+							if (i == 0) this.addX(f(t));
+							if (i == 1) this.addY(f(t));
+						}
+						continue;
+					}
+					
+					var b2ac = Math.pow(b, 2) - 4 * c * a;
+					if (b2ac < 0) continue;
+					var t1 = (-b + Math.sqrt(b2ac)) / (2 * a);
+					if (0 < t1 && t1 < 1) {
+						if (i == 0) this.addX(f(t1));
+						if (i == 1) this.addY(f(t1));
+					}
+					var t2 = (-b - Math.sqrt(b2ac)) / (2 * a);
+					if (0 < t2 && t2 < 1) {
+						if (i == 0) this.addX(f(t2));
+						if (i == 1) this.addY(f(t2));
+					}
+				}
+			}
+			
+			this.isPointInBox = function(x, y) {
+				return (this.x1 <= x && x <= this.x2 && this.y1 <= y && y <= this.y2);
+			}
+			
+			this.addPoint(x1, y1);
+			this.addPoint(x2, y2);
+		}
+		
+		// transforms
+		svg.Transform = function(v) {	
+			var that = this;
+			this.Type = {}
+		
+			// translate
+			this.Type.translate = function(s) {
+				this.p = svg.CreatePoint(s);			
+				this.apply = function(ctx) {
+					ctx.translate(this.p.x || 0.0, this.p.y || 0.0);
+				}
+				this.applyToPoint = function(p) {
+					p.applyTransform([1, 0, 0, 1, this.p.x || 0.0, this.p.y || 0.0]);
+				}
+			}
+			
+			// rotate
+			this.Type.rotate = function(s) {
+				var a = svg.ToNumberArray(s);
+				this.angle = new svg.Property('angle', a[0]);
+				this.cx = a[1] || 0;
+				this.cy = a[2] || 0;
+				this.apply = function(ctx) {
+					ctx.translate(this.cx, this.cy);
+					ctx.rotate(this.angle.Angle.toRadians());
+					ctx.translate(-this.cx, -this.cy);
+				}
+				this.applyToPoint = function(p) {
+					var a = this.angle.Angle.toRadians();
+					p.applyTransform([1, 0, 0, 1, this.p.x || 0.0, this.p.y || 0.0]);
+					p.applyTransform([Math.cos(a), Math.sin(a), -Math.sin(a), Math.cos(a), 0, 0]);
+					p.applyTransform([1, 0, 0, 1, -this.p.x || 0.0, -this.p.y || 0.0]);
+				}			
+			}
+			
+			this.Type.scale = function(s) {
+				this.p = svg.CreatePoint(s);
+				this.apply = function(ctx) {
+					ctx.scale(this.p.x || 1.0, this.p.y || this.p.x || 1.0);
+				}
+				this.applyToPoint = function(p) {
+					p.applyTransform([this.p.x || 0.0, 0, 0, this.p.y || 0.0, 0, 0]);
+				}				
+			}
+			
+			this.Type.matrix = function(s) {
+				this.m = svg.ToNumberArray(s);
+				this.apply = function(ctx) {
+					ctx.transform(this.m[0], this.m[1], this.m[2], this.m[3], this.m[4], this.m[5]);
+				}
+				this.applyToPoint = function(p) {
+					p.applyTransform(this.m);
+				}					
+			}
+			
+			this.Type.SkewBase = function(s) {
+				this.base = that.Type.matrix;
+				this.base(s);
+				this.angle = new svg.Property('angle', s);
+			}
+			this.Type.SkewBase.prototype = new this.Type.matrix;
+			
+			this.Type.skewX = function(s) {
+				this.base = that.Type.SkewBase;
+				this.base(s);
+				this.m = [1, 0, Math.tan(this.angle.Angle.toRadians()), 1, 0, 0];
+			}
+			this.Type.skewX.prototype = new this.Type.SkewBase;
+			
+			this.Type.skewY = function(s) {
+				this.base = that.Type.SkewBase;
+				this.base(s);
+				this.m = [1, Math.tan(this.angle.Angle.toRadians()), 0, 1, 0, 0];
+			}
+			this.Type.skewY.prototype = new this.Type.SkewBase;
+		
+			this.transforms = [];
+			
+			this.apply = function(ctx) {
+				for (var i=0; i<this.transforms.length; i++) {
+					this.transforms[i].apply(ctx);
+				}
+			}
+			
+			this.applyToPoint = function(p) {
+				for (var i=0; i<this.transforms.length; i++) {
+					this.transforms[i].applyToPoint(p);
+				}
+			}
+			
+			var data = svg.trim(svg.compressSpaces(v)).split(/\s(?=[a-z])/);
+			for (var i=0; i<data.length; i++) {
+				var type = data[i].split('(')[0];
+				var s = data[i].split('(')[1].replace(')','');
+				var transform = new this.Type[type](s);
+				this.transforms.push(transform);
+			}
+		}
+		
+		// aspect ratio
+		svg.AspectRatio = function(ctx, aspectRatio, width, desiredWidth, height, desiredHeight, minX, minY, refX, refY) {
+			// aspect ratio - http://www.w3.org/TR/SVG/coords.html#PreserveAspectRatioAttribute
+			aspectRatio = svg.compressSpaces(aspectRatio);
+			aspectRatio = aspectRatio.replace(/^defer\s/,''); // ignore defer
+			var align = aspectRatio.split(' ')[0] || 'xMidYMid';
+			var meetOrSlice = aspectRatio.split(' ')[1] || 'meet';					
+	
+			// calculate scale
+			var scaleX = width / desiredWidth;
+			var scaleY = height / desiredHeight;
+			var scaleMin = Math.min(scaleX, scaleY);
+			var scaleMax = Math.max(scaleX, scaleY);
+			if (meetOrSlice == 'meet') { desiredWidth *= scaleMin; desiredHeight *= scaleMin; }
+			if (meetOrSlice == 'slice') { desiredWidth *= scaleMax; desiredHeight *= scaleMax; }	
+			
+			refX = new svg.Property('refX', refX);
+			refY = new svg.Property('refY', refY);
+			if (refX.hasValue() && refY.hasValue()) {				
+				ctx.translate(-scaleMin * refX.Length.toPixels('x'), -scaleMin * refY.Length.toPixels('y'));
+			} 
+			else {					
+				// align
+				if (align.match(/^xMid/) && ((meetOrSlice == 'meet' && scaleMin == scaleY) || (meetOrSlice == 'slice' && scaleMax == scaleY))) ctx.translate(width / 2.0 - desiredWidth / 2.0, 0); 
+				if (align.match(/YMid$/) && ((meetOrSlice == 'meet' && scaleMin == scaleX) || (meetOrSlice == 'slice' && scaleMax == scaleX))) ctx.translate(0, height / 2.0 - desiredHeight / 2.0); 
+				if (align.match(/^xMax/) && ((meetOrSlice == 'meet' && scaleMin == scaleY) || (meetOrSlice == 'slice' && scaleMax == scaleY))) ctx.translate(width - desiredWidth, 0); 
+				if (align.match(/YMax$/) && ((meetOrSlice == 'meet' && scaleMin == scaleX) || (meetOrSlice == 'slice' && scaleMax == scaleX))) ctx.translate(0, height - desiredHeight); 
+			}
+			
+			// scale
+			if (align == 'none') ctx.scale(scaleX, scaleY);
+			else if (meetOrSlice == 'meet') ctx.scale(scaleMin, scaleMin); 
+			else if (meetOrSlice == 'slice') ctx.scale(scaleMax, scaleMax); 	
+			
+			// translate
+			ctx.translate(minX == null ? 0 : -minX, minY == null ? 0 : -minY);			
+		}
+		
+		// elements
+		svg.Element = {}
+		
+		svg.Element.ElementBase = function(node) {	
+			this.attributes = {};
+			this.styles = {};
+			this.children = [];
+			
+			// get or create attribute
+			this.attribute = function(name, createIfNotExists) {
+				var a = this.attributes[name];
+				if (a != null) return a;
+							
+				a = new svg.Property(name, '');
+				if (createIfNotExists == true) this.attributes[name] = a;
+				return a;
+			}
+			
+			// get or create style, crawls up node tree
+			this.style = function(name, createIfNotExists) {
+				var s = this.styles[name];
+				if (s != null) return s;
+				
+				var a = this.attribute(name);
+				if (a != null && a.hasValue()) {
+					return a;
+				}
+				
+				var p = this.parent;
+				if (p != null) {
+					var ps = p.style(name);
+					if (ps != null && ps.hasValue()) {
+						return ps;
+					}
+				}
+					
+				s = new svg.Property(name, '');
+				if (createIfNotExists == true) this.styles[name] = s;
+				return s;
+			}
+			
+			// base render
+			this.render = function(ctx) {
+				// don't render display=none
+				if (this.style('display').value == 'none') return;
+				
+				// don't render visibility=hidden
+				if (this.attribute('visibility').value == 'hidden') return;
+			
+				ctx.save();
+					this.setContext(ctx);
+						// mask
+						if (this.attribute('mask').hasValue()) {
+							var mask = this.attribute('mask').Definition.getDefinition();
+							if (mask != null) mask.apply(ctx, this);
+						}
+						else if (this.style('filter').hasValue()) {
+							var filter = this.style('filter').Definition.getDefinition();
+							if (filter != null) filter.apply(ctx, this);
+						}
+						else this.renderChildren(ctx);				
+					this.clearContext(ctx);
+				ctx.restore();
+			}
+			
+			// base set context
+			this.setContext = function(ctx) {
+				// OVERRIDE ME!
+			}
+			
+			// base clear context
+			this.clearContext = function(ctx) {
+				// OVERRIDE ME!
+			}			
+			
+			// base render children
+			this.renderChildren = function(ctx) {
+				for (var i=0; i<this.children.length; i++) {
+					this.children[i].render(ctx);
+				}
+			}
+			
+			this.addChild = function(childNode, create) {
+				var child = childNode;
+				if (create) child = svg.CreateElement(childNode);
+				child.parent = this;
+				this.children.push(child);			
+			}
+				
+			if (node != null && node.nodeType == 1) { //ELEMENT_NODE
+				// add children
+				for (var i=0; i<node.childNodes.length; i++) {
+					var childNode = node.childNodes[i];
+					if (childNode.nodeType == 1) this.addChild(childNode, true); //ELEMENT_NODE
+				}
+				
+				// add attributes
+				for (var i=0; i<node.attributes.length; i++) {
+					var attribute = node.attributes[i];
+					this.attributes[attribute.nodeName] = new svg.Property(attribute.nodeName, attribute.nodeValue);
+				}
+										
+				// add tag styles
+				var styles = svg.Styles[node.nodeName];
+				if (styles != null) {
+					for (var name in styles) {
+						this.styles[name] = styles[name];
+					}
+				}					
+				
+				// add class styles
+				if (this.attribute('class').hasValue()) {
+					var classes = svg.compressSpaces(this.attribute('class').value).split(' ');
+					for (var j=0; j<classes.length; j++) {
+						styles = svg.Styles['.'+classes[j]];
+						if (styles != null) {
+							for (var name in styles) {
+								this.styles[name] = styles[name];
+							}
+						}
+						styles = svg.Styles[node.nodeName+'.'+classes[j]];
+						if (styles != null) {
+							for (var name in styles) {
+								this.styles[name] = styles[name];
+							}
+						}
+					}
+				}
+				
+				// add inline styles
+				if (this.attribute('style').hasValue()) {
+					var styles = this.attribute('style').value.split(';');
+					for (var i=0; i<styles.length; i++) {
+						if (svg.trim(styles[i]) != '') {
+							var style = styles[i].split(':');
+							var name = svg.trim(style[0]);
+							var value = svg.trim(style[1]);
+							this.styles[name] = new svg.Property(name, value);
+						}
+					}
+				}	
+
+				// add id
+				if (this.attribute('id').hasValue()) {
+					if (svg.Definitions[this.attribute('id').value] == null) {
+						svg.Definitions[this.attribute('id').value] = this;
+					}
+				}
+			}
+		}
+		
+		svg.Element.RenderedElementBase = function(node) {
+			this.base = svg.Element.ElementBase;
+			this.base(node);
+			
+			this.setContext = function(ctx) {
+				// fill
+				if (this.style('fill').Definition.isUrl()) {
+					var fs = this.style('fill').Definition.getFillStyle(this);
+					if (fs != null) ctx.fillStyle = fs;
+				}
+				else if (this.style('fill').hasValue()) {
+					var fillStyle = this.style('fill');
+					if (this.style('fill-opacity').hasValue()) fillStyle = fillStyle.Color.addOpacity(this.style('fill-opacity').value);
+					ctx.fillStyle = (fillStyle.value == 'none' ? 'rgba(0,0,0,0)' : fillStyle.value);
+				}
+									
+				// stroke
+				if (this.style('stroke').Definition.isUrl()) {
+					var fs = this.style('stroke').Definition.getFillStyle(this);
+					if (fs != null) ctx.strokeStyle = fs;
+				}
+				else if (this.style('stroke').hasValue()) {
+					var strokeStyle = this.style('stroke');
+					if (this.style('stroke-opacity').hasValue()) strokeStyle = strokeStyle.Color.addOpacity(this.style('stroke-opacity').value);
+					ctx.strokeStyle = (strokeStyle.value == 'none' ? 'rgba(0,0,0,0)' : strokeStyle.value);
+				}
+				if (this.style('stroke-width').hasValue()) ctx.lineWidth = this.style('stroke-width').Length.toPixels();
+				if (this.style('stroke-linecap').hasValue()) ctx.lineCap = this.style('stroke-linecap').value;
+				if (this.style('stroke-linejoin').hasValue()) ctx.lineJoin = this.style('stroke-linejoin').value;
+				if (this.style('stroke-miterlimit').hasValue()) ctx.miterLimit = this.style('stroke-miterlimit').value;
+
+				// font
+				if (typeof(ctx.font) != 'undefined') {
+					ctx.font = svg.Font.CreateFont( 
+						this.style('font-style').value, 
+						this.style('font-variant').value, 
+						this.style('font-weight').value, 
+						this.style('font-size').hasValue() ? this.style('font-size').Length.toPixels() + 'px' : '', 
+						this.style('font-family').value).toString();
+				}
+				
+				// transform
+				if (this.attribute('transform').hasValue()) { 
+					var transform = new svg.Transform(this.attribute('transform').value);
+					transform.apply(ctx);
+				}
+				
+				// clip
+				if (this.attribute('clip-path').hasValue()) {
+					var clip = this.attribute('clip-path').Definition.getDefinition();
+					if (clip != null) clip.apply(ctx);
+				}
+				
+				// opacity
+				if (this.style('opacity').hasValue()) {
+					ctx.globalAlpha = this.style('opacity').numValue();
+				}
+			}		
+		}
+		svg.Element.RenderedElementBase.prototype = new svg.Element.ElementBase;
+		
+		svg.Element.PathElementBase = function(node) {
+			this.base = svg.Element.RenderedElementBase;
+			this.base(node);
+			
+			this.path = function(ctx) {
+				if (ctx != null) ctx.beginPath();
+				return new svg.BoundingBox();
+			}
+			
+			this.renderChildren = function(ctx) {
+				this.path(ctx);
+				svg.Mouse.checkPath(this, ctx);
+				if (ctx.fillStyle != '') ctx.fill();
+				if (ctx.strokeStyle != '') ctx.stroke();
+				
+				var markers = this.getMarkers();
+				if (markers != null) {
+					if (this.style('marker-start').Definition.isUrl()) {
+						var marker = this.style('marker-start').Definition.getDefinition();
+						marker.render(ctx, markers[0][0], markers[0][1]);
+					}
+					if (this.style('marker-mid').Definition.isUrl()) {
+						var marker = this.style('marker-mid').Definition.getDefinition();
+						for (var i=1;i<markers.length-1;i++) {
+							marker.render(ctx, markers[i][0], markers[i][1]);
+						}
+					}
+					if (this.style('marker-end').Definition.isUrl()) {
+						var marker = this.style('marker-end').Definition.getDefinition();
+						marker.render(ctx, markers[markers.length-1][0], markers[markers.length-1][1]);
+					}
+				}					
+			}
+			
+			this.getBoundingBox = function() {
+				return this.path();
+			}
+			
+			this.getMarkers = function() {
+				return null;
+			}
+		}
+		svg.Element.PathElementBase.prototype = new svg.Element.RenderedElementBase;
+		
+		// svg element
+		svg.Element.svg = function(node) {
+			this.base = svg.Element.RenderedElementBase;
+			this.base(node);
+			
+			this.baseClearContext = this.clearContext;
+			this.clearContext = function(ctx) {
+				this.baseClearContext(ctx);
+				svg.ViewPort.RemoveCurrent();
+			}
+			
+			this.baseSetContext = this.setContext;
+			this.setContext = function(ctx) {
+				// initial values
+				ctx.strokeStyle = 'rgba(0,0,0,0)';
+				ctx.lineCap = 'butt';
+				ctx.lineJoin = 'miter';
+				ctx.miterLimit = 4;			
+			
+				this.baseSetContext(ctx);
+				
+				// create new view port
+				if (this.attribute('x').hasValue() && this.attribute('y').hasValue()) {
+					ctx.translate(this.attribute('x').Length.toPixels('x'), this.attribute('y').Length.toPixels('y'));
+				}
+				
+				var width = svg.ViewPort.width();
+				var height = svg.ViewPort.height();
+				if (typeof(this.root) == 'undefined' && this.attribute('width').hasValue() && this.attribute('height').hasValue()) {
+					width = this.attribute('width').Length.toPixels('x');
+					height = this.attribute('height').Length.toPixels('y');
+					
+					var x = 0;
+					var y = 0;
+					if (this.attribute('refX').hasValue() && this.attribute('refY').hasValue()) {
+						x = -this.attribute('refX').Length.toPixels('x');
+						y = -this.attribute('refY').Length.toPixels('y');
+					}
+					
+					ctx.beginPath();
+					ctx.moveTo(x, y);
+					ctx.lineTo(width, y);
+					ctx.lineTo(width, height);
+					ctx.lineTo(x, height);
+					ctx.closePath();
+					ctx.clip();
+				}
+				svg.ViewPort.SetCurrent(width, height);	
+						
+				// viewbox
+				if (this.attribute('viewBox').hasValue()) {				
+					var viewBox = svg.ToNumberArray(this.attribute('viewBox').value);
+					var minX = viewBox[0];
+					var minY = viewBox[1];
+					width = viewBox[2];
+					height = viewBox[3];
+					
+					svg.AspectRatio(ctx,
+									this.attribute('preserveAspectRatio').value, 
+									svg.ViewPort.width(), 
+									width,
+									svg.ViewPort.height(),
+									height,
+									minX,
+									minY,
+									this.attribute('refX').value,
+									this.attribute('refY').value);
+										
+					svg.ViewPort.RemoveCurrent();	
+					svg.ViewPort.SetCurrent(viewBox[2], viewBox[3]);						
+				}				
+			}
+		}
+		svg.Element.svg.prototype = new svg.Element.RenderedElementBase;
+
+		// rect element
+		svg.Element.rect = function(node) {
+			this.base = svg.Element.PathElementBase;
+			this.base(node);
+			
+			this.path = function(ctx) {
+				var x = this.attribute('x').Length.toPixels('x');
+				var y = this.attribute('y').Length.toPixels('y');
+				var width = this.attribute('width').Length.toPixels('x');
+				var height = this.attribute('height').Length.toPixels('y');
+				var rx = this.attribute('rx').Length.toPixels('x');
+				var ry = this.attribute('ry').Length.toPixels('y');
+				if (this.attribute('rx').hasValue() && !this.attribute('ry').hasValue()) ry = rx;
+				if (this.attribute('ry').hasValue() && !this.attribute('rx').hasValue()) rx = ry;
+				
+				if (ctx != null) {
+					ctx.beginPath();
+					ctx.moveTo(x + rx, y);
+					ctx.lineTo(x + width - rx, y);
+					ctx.quadraticCurveTo(x + width, y, x + width, y + ry)
+					ctx.lineTo(x + width, y + height - ry);
+					ctx.quadraticCurveTo(x + width, y + height, x + width - rx, y + height)
+					ctx.lineTo(x + rx, y + height);
+					ctx.quadraticCurveTo(x, y + height, x, y + height - ry)
+					ctx.lineTo(x, y + ry);
+					ctx.quadraticCurveTo(x, y, x + rx, y)
+					ctx.closePath();
+				}
+				
+				return new svg.BoundingBox(x, y, x + width, y + height);
+			}
+		}
+		svg.Element.rect.prototype = new svg.Element.PathElementBase;
+		
+		// circle element
+		svg.Element.circle = function(node) {
+			this.base = svg.Element.PathElementBase;
+			this.base(node);
+			
+			this.path = function(ctx) {
+				var cx = this.attribute('cx').Length.toPixels('x');
+				var cy = this.attribute('cy').Length.toPixels('y');
+				var r = this.attribute('r').Length.toPixels();
+			
+				if (ctx != null) {
+					ctx.beginPath();
+					ctx.arc(cx, cy, r, 0, Math.PI * 2, true); 
+					ctx.closePath();
+				}
+				
+				return new svg.BoundingBox(cx - r, cy - r, cx + r, cy + r);
+			}
+		}
+		svg.Element.circle.prototype = new svg.Element.PathElementBase;	
+
+		// ellipse element
+		svg.Element.ellipse = function(node) {
+			this.base = svg.Element.PathElementBase;
+			this.base(node);
+			
+			this.path = function(ctx) {
+				var KAPPA = 4 * ((Math.sqrt(2) - 1) / 3);
+				var rx = this.attribute('rx').Length.toPixels('x');
+				var ry = this.attribute('ry').Length.toPixels('y');
+				var cx = this.attribute('cx').Length.toPixels('x');
+				var cy = this.attribute('cy').Length.toPixels('y');
+				
+				if (ctx != null) {
+					ctx.beginPath();
+					ctx.moveTo(cx, cy - ry);
+					ctx.bezierCurveTo(cx + (KAPPA * rx), cy - ry,  cx + rx, cy - (KAPPA * ry), cx + rx, cy);
+					ctx.bezierCurveTo(cx + rx, cy + (KAPPA * ry), cx + (KAPPA * rx), cy + ry, cx, cy + ry);
+					ctx.bezierCurveTo(cx - (KAPPA * rx), cy + ry, cx - rx, cy + (KAPPA * ry), cx - rx, cy);
+					ctx.bezierCurveTo(cx - rx, cy - (KAPPA * ry), cx - (KAPPA * rx), cy - ry, cx, cy - ry);
+					ctx.closePath();
+				}
+				
+				return new svg.BoundingBox(cx - rx, cy - ry, cx + rx, cy + ry);
+			}
+		}
+		svg.Element.ellipse.prototype = new svg.Element.PathElementBase;			
+		
+		// line element
+		svg.Element.line = function(node) {
+			this.base = svg.Element.PathElementBase;
+			this.base(node);
+			
+			this.getPoints = function() {
+				return [
+					new svg.Point(this.attribute('x1').Length.toPixels('x'), this.attribute('y1').Length.toPixels('y')),
+					new svg.Point(this.attribute('x2').Length.toPixels('x'), this.attribute('y2').Length.toPixels('y'))];
+			}
+								
+			this.path = function(ctx) {
+				var points = this.getPoints();
+				
+				if (ctx != null) {
+					ctx.beginPath();
+					ctx.moveTo(points[0].x, points[0].y);
+					ctx.lineTo(points[1].x, points[1].y);
+				}
+				
+				return new svg.BoundingBox(points[0].x, points[0].y, points[1].x, points[1].y);
+			}
+			
+			this.getMarkers = function() {
+				var points = this.getPoints();	
+				var a = points[0].angleTo(points[1]);
+				return [[points[0], a], [points[1], a]];
+			}
+		}
+		svg.Element.line.prototype = new svg.Element.PathElementBase;		
+				
+		// polyline element
+		svg.Element.polyline = function(node) {
+			this.base = svg.Element.PathElementBase;
+			this.base(node);
+			
+			this.points = svg.CreatePath(this.attribute('points').value);
+			this.path = function(ctx) {
+				var bb = new svg.BoundingBox(this.points[0].x, this.points[0].y);
+				if (ctx != null) {
+					ctx.beginPath();
+					ctx.moveTo(this.points[0].x, this.points[0].y);
+				}
+				for (var i=1; i<this.points.length; i++) {
+					bb.addPoint(this.points[i].x, this.points[i].y);
+					if (ctx != null) ctx.lineTo(this.points[i].x, this.points[i].y);
+				}
+				return bb;
+			}
+			
+			this.getMarkers = function() {
+				var markers = [];
+				for (var i=0; i<this.points.length - 1; i++) {
+					markers.push([this.points[i], this.points[i].angleTo(this.points[i+1])]);
+				}
+				markers.push([this.points[this.points.length-1], markers[markers.length-1][1]]);
+				return markers;
+			}			
+		}
+		svg.Element.polyline.prototype = new svg.Element.PathElementBase;				
+				
+		// polygon element
+		svg.Element.polygon = function(node) {
+			this.base = svg.Element.polyline;
+			this.base(node);
+			
+			this.basePath = this.path;
+			this.path = function(ctx) {
+				var bb = this.basePath(ctx);
+				if (ctx != null) {
+					ctx.lineTo(this.points[0].x, this.points[0].y);
+					ctx.closePath();
+				}
+				return bb;
+			}
+		}
+		svg.Element.polygon.prototype = new svg.Element.polyline;
+
+		// path element
+		svg.Element.path = function(node) {
+			this.base = svg.Element.PathElementBase;
+			this.base(node);
+					
+			var d = this.attribute('d').value;
+			// TODO: convert to real lexer based on http://www.w3.org/TR/SVG11/paths.html#PathDataBNF
+			d = d.replace(/,/gm,' '); // get rid of all commas
+			d = d.replace(/([MmZzLlHhVvCcSsQqTtAa])([MmZzLlHhVvCcSsQqTtAa])/gm,'$1 $2'); // separate commands from commands
+			d = d.replace(/([MmZzLlHhVvCcSsQqTtAa])([MmZzLlHhVvCcSsQqTtAa])/gm,'$1 $2'); // separate commands from commands
+			d = d.replace(/([MmZzLlHhVvCcSsQqTtAa])([^\s])/gm,'$1 $2'); // separate commands from points
+			d = d.replace(/([^\s])([MmZzLlHhVvCcSsQqTtAa])/gm,'$1 $2'); // separate commands from points
+			d = d.replace(/([0-9])([+\-])/gm,'$1 $2'); // separate digits when no comma
+			d = d.replace(/(\.[0-9]*)(\.)/gm,'$1 $2'); // separate digits when no comma
+			d = d.replace(/([Aa](\s+[0-9]+){3})\s+([01])\s*([01])/gm,'$1 $3 $4 '); // shorthand elliptical arc path syntax
+			d = svg.compressSpaces(d); // compress multiple spaces
+			d = svg.trim(d);
+			this.PathParser = new (function(d) {
+				this.tokens = d.split(' ');
+				
+				this.reset = function() {
+					this.i = -1;
+					this.command = '';
+					this.previousCommand = '';
+					this.start = new svg.Point(0, 0);
+					this.control = new svg.Point(0, 0);
+					this.current = new svg.Point(0, 0);
+					this.points = [];
+					this.angles = [];
+				}
+								
+				this.isEnd = function() {
+					return this.i >= this.tokens.length - 1;
+				}
+				
+				this.isCommandOrEnd = function() {
+					if (this.isEnd()) return true;
+					return this.tokens[this.i + 1].match(/^[A-Za-z]$/) != null;
+				}
+				
+				this.isRelativeCommand = function() {
+					return this.command == this.command.toLowerCase();
+				}
+							
+				this.getToken = function() {
+					this.i = this.i + 1;
+					return this.tokens[this.i];
+				}
+				
+				this.getScalar = function() {
+					return parseFloat(this.getToken());
+				}
+				
+				this.nextCommand = function() {
+					this.previousCommand = this.command;
+					this.command = this.getToken();
+				}				
+				
+				this.getPoint = function() {
+					var p = new svg.Point(this.getScalar(), this.getScalar());
+					return this.makeAbsolute(p);
+				}
+				
+				this.getAsControlPoint = function() {
+					var p = this.getPoint();
+					this.control = p;
+					return p;
+				}
+				
+				this.getAsCurrentPoint = function() {
+					var p = this.getPoint();
+					this.current = p;
+					return p;	
+				}
+				
+				this.getReflectedControlPoint = function() {
+					if (this.previousCommand.toLowerCase() != 'c' && this.previousCommand.toLowerCase() != 's') {
+						return this.current;
+					}
+					
+					// reflect point
+					var p = new svg.Point(2 * this.current.x - this.control.x, 2 * this.current.y - this.control.y);					
+					return p;
+				}
+				
+				this.makeAbsolute = function(p) {
+					if (this.isRelativeCommand()) {
+						p.x = this.current.x + p.x;
+						p.y = this.current.y + p.y;
+					}
+					return p;
+				}
+				
+				this.addMarker = function(p, from, priorTo) {
+					// if the last angle isn't filled in because we didn't have this point yet ...
+					if (priorTo != null && this.angles.length > 0 && this.angles[this.angles.length-1] == null) {
+						this.angles[this.angles.length-1] = this.points[this.points.length-1].angleTo(priorTo);
+					}
+					this.addMarkerAngle(p, from == null ? null : from.angleTo(p));
+				}
+				
+				this.addMarkerAngle = function(p, a) {
+					this.points.push(p);
+					this.angles.push(a);
+				}				
+				
+				this.getMarkerPoints = function() { return this.points; }
+				this.getMarkerAngles = function() {
+					for (var i=0; i<this.angles.length; i++) {
+						if (this.angles[i] == null) {
+							for (var j=i+1; j<this.angles.length; j++) {
+								if (this.angles[j] != null) {
+									this.angles[i] = this.angles[j];
+									break;
+								}
+							}
+						}
+					}
+					return this.angles;
+				}
+			})(d);
+
+			this.path = function(ctx) {
+				var pp = this.PathParser;
+				pp.reset();
+
+				var bb = new svg.BoundingBox();
+				if (ctx != null) ctx.beginPath();
+				while (!pp.isEnd()) {
+					pp.nextCommand();
+					switch (pp.command.toUpperCase()) {
+					case 'M':
+						var p = pp.getAsCurrentPoint();
+						pp.addMarker(p);
+						bb.addPoint(p.x, p.y);
+						if (ctx != null) ctx.moveTo(p.x, p.y);
+						pp.start = pp.current;
+						while (!pp.isCommandOrEnd()) {
+							var p = pp.getAsCurrentPoint();
+							pp.addMarker(p, pp.start);
+							bb.addPoint(p.x, p.y);
+							if (ctx != null) ctx.lineTo(p.x, p.y);
+						}
+						break;
+					case 'L':
+						while (!pp.isCommandOrEnd()) {
+							var c = pp.current;
+							var p = pp.getAsCurrentPoint();
+							pp.addMarker(p, c);
+							bb.addPoint(p.x, p.y);
+							if (ctx != null) ctx.lineTo(p.x, p.y);
+						}
+						break;
+					case 'H':
+						while (!pp.isCommandOrEnd()) {
+							var newP = new svg.Point((pp.isRelativeCommand() ? pp.current.x : 0) + pp.getScalar(), pp.current.y);
+							pp.addMarker(newP, pp.current);
+							pp.current = newP;
+							bb.addPoint(pp.current.x, pp.current.y);
+							if (ctx != null) ctx.lineTo(pp.current.x, pp.current.y);
+						}
+						break;
+					case 'V':
+						while (!pp.isCommandOrEnd()) {
+							var newP = new svg.Point(pp.current.x, (pp.isRelativeCommand() ? pp.current.y : 0) + pp.getScalar());
+							pp.addMarker(newP, pp.current);
+							pp.current = newP;
+							bb.addPoint(pp.current.x, pp.current.y);
+							if (ctx != null) ctx.lineTo(pp.current.x, pp.current.y);
+						}
+						break;
+					case 'C':
+						while (!pp.isCommandOrEnd()) {
+							var curr = pp.current;
+							var p1 = pp.getPoint();
+							var cntrl = pp.getAsControlPoint();
+							var cp = pp.getAsCurrentPoint();
+							pp.addMarker(cp, cntrl, p1);
+							bb.addBezierCurve(curr.x, curr.y, p1.x, p1.y, cntrl.x, cntrl.y, cp.x, cp.y);
+							if (ctx != null) ctx.bezierCurveTo(p1.x, p1.y, cntrl.x, cntrl.y, cp.x, cp.y);
+						}
+						break;
+					case 'S':
+						while (!pp.isCommandOrEnd()) {
+							var curr = pp.current;
+							var p1 = pp.getReflectedControlPoint();
+							var cntrl = pp.getAsControlPoint();
+							var cp = pp.getAsCurrentPoint();
+							pp.addMarker(cp, cntrl, p1);
+							bb.addBezierCurve(curr.x, curr.y, p1.x, p1.y, cntrl.x, cntrl.y, cp.x, cp.y);
+							if (ctx != null) ctx.bezierCurveTo(p1.x, p1.y, cntrl.x, cntrl.y, cp.x, cp.y);
+						}
+						break;
+					case 'Q':
+						while (!pp.isCommandOrEnd()) {
+							var curr = pp.current;
+							var cntrl = pp.getAsControlPoint();
+							var cp = pp.getAsCurrentPoint();
+							pp.addMarker(cp, cntrl, cntrl);
+							bb.addQuadraticCurve(curr.x, curr.y, cntrl.x, cntrl.y, cp.x, cp.y);
+							if (ctx != null) ctx.quadraticCurveTo(cntrl.x, cntrl.y, cp.x, cp.y);
+						}
+						break;
+					case 'T':
+						while (!pp.isCommandOrEnd()) {
+							var curr = pp.current;
+							var cntrl = pp.getReflectedControlPoint();
+							pp.control = cntrl;
+							var cp = pp.getAsCurrentPoint();
+							pp.addMarker(cp, cntrl, cntrl);
+							bb.addQuadraticCurve(curr.x, curr.y, cntrl.x, cntrl.y, cp.x, cp.y);
+							if (ctx != null) ctx.quadraticCurveTo(cntrl.x, cntrl.y, cp.x, cp.y);
+						}
+						break;
+					case 'A':
+						while (!pp.isCommandOrEnd()) {
+						    var curr = pp.current;
+							var rx = pp.getScalar();
+							var ry = pp.getScalar();
+							var xAxisRotation = pp.getScalar() * (Math.PI / 180.0);
+							var largeArcFlag = pp.getScalar();
+							var sweepFlag = pp.getScalar();
+							var cp = pp.getAsCurrentPoint();
+
+							// Conversion from endpoint to center parameterization
+							// http://www.w3.org/TR/SVG11/implnote.html#ArcImplementationNotes
+							// x1', y1'
+							var currp = new svg.Point(
+								Math.cos(xAxisRotation) * (curr.x - cp.x) / 2.0 + Math.sin(xAxisRotation) * (curr.y - cp.y) / 2.0,
+								-Math.sin(xAxisRotation) * (curr.x - cp.x) / 2.0 + Math.cos(xAxisRotation) * (curr.y - cp.y) / 2.0
+							);
+							// adjust radii
+							var l = Math.pow(currp.x,2)/Math.pow(rx,2)+Math.pow(currp.y,2)/Math.pow(ry,2);
+							if (l > 1) {
+								rx *= Math.sqrt(l);
+								ry *= Math.sqrt(l);
+							}
+							// cx', cy'
+							var s = (largeArcFlag == sweepFlag ? -1 : 1) * Math.sqrt(
+								((Math.pow(rx,2)*Math.pow(ry,2))-(Math.pow(rx,2)*Math.pow(currp.y,2))-(Math.pow(ry,2)*Math.pow(currp.x,2))) /
+								(Math.pow(rx,2)*Math.pow(currp.y,2)+Math.pow(ry,2)*Math.pow(currp.x,2))
+							);
+							if (isNaN(s)) s = 0;
+							var cpp = new svg.Point(s * rx * currp.y / ry, s * -ry * currp.x / rx);
+							// cx, cy
+							var centp = new svg.Point(
+								(curr.x + cp.x) / 2.0 + Math.cos(xAxisRotation) * cpp.x - Math.sin(xAxisRotation) * cpp.y,
+								(curr.y + cp.y) / 2.0 + Math.sin(xAxisRotation) * cpp.x + Math.cos(xAxisRotation) * cpp.y
+							);
+							// vector magnitude
+							var m = function(v) { return Math.sqrt(Math.pow(v[0],2) + Math.pow(v[1],2)); }
+							// ratio between two vectors
+							var r = function(u, v) { return (u[0]*v[0]+u[1]*v[1]) / (m(u)*m(v)) }
+							// angle between two vectors
+							var a = function(u, v) { return (u[0]*v[1] < u[1]*v[0] ? -1 : 1) * Math.acos(r(u,v)); }
+							// initial angle
+							var a1 = a([1,0], [(currp.x-cpp.x)/rx,(currp.y-cpp.y)/ry]);
+							// angle delta
+							var u = [(currp.x-cpp.x)/rx,(currp.y-cpp.y)/ry];
+							var v = [(-currp.x-cpp.x)/rx,(-currp.y-cpp.y)/ry];
+							var ad = a(u, v);
+							if (r(u,v) <= -1) ad = Math.PI;
+							if (r(u,v) >= 1) ad = 0;
+
+							if (sweepFlag == 0 && ad > 0) ad = ad - 2 * Math.PI;
+							if (sweepFlag == 1 && ad < 0) ad = ad + 2 * Math.PI;
+
+							// for markers
+							var halfWay = new svg.Point(
+								centp.x - rx * Math.cos((a1 + ad) / 2),
+								centp.y - ry * Math.sin((a1 + ad) / 2)
+							);
+							pp.addMarkerAngle(halfWay, (a1 + ad) / 2 + (sweepFlag == 0 ? 1 : -1) * Math.PI / 2);
+							pp.addMarkerAngle(cp, ad + (sweepFlag == 0 ? 1 : -1) * Math.PI / 2);
+
+							bb.addPoint(cp.x, cp.y); // TODO: this is too naive, make it better
+							if (ctx != null) {
+								var r = rx > ry ? rx : ry;
+								var sx = rx > ry ? 1 : rx / ry;
+								var sy = rx > ry ? ry / rx : 1;
+
+								ctx.translate(centp.x, centp.y);
+								ctx.rotate(xAxisRotation);
+								ctx.scale(sx, sy);
+								ctx.arc(0, 0, r, a1, a1 + ad, 1 - sweepFlag);
+								ctx.scale(1/sx, 1/sy);
+								ctx.rotate(-xAxisRotation);
+								ctx.translate(-centp.x, -centp.y);
+							}
+						}
+						break;
+					case 'Z':
+						if (ctx != null) ctx.closePath();
+						pp.current = pp.start;
+					}
+				}
+
+				return bb;
+			}
+
+			this.getMarkers = function() {
+				var points = this.PathParser.getMarkerPoints();
+				var angles = this.PathParser.getMarkerAngles();
+				
+				var markers = [];
+				for (var i=0; i<points.length; i++) {
+					markers.push([points[i], angles[i]]);
+				}
+				return markers;
+			}
+		}
+		svg.Element.path.prototype = new svg.Element.PathElementBase;
+		
+		// pattern element
+		svg.Element.pattern = function(node) {
+			this.base = svg.Element.ElementBase;
+			this.base(node);
+			
+			this.createPattern = function(ctx, element) {
+				// render me using a temporary svg element
+				var tempSvg = new svg.Element.svg();
+				tempSvg.attributes['viewBox'] = new svg.Property('viewBox', this.attribute('viewBox').value);
+				tempSvg.attributes['x'] = new svg.Property('x', this.attribute('x').value);
+				tempSvg.attributes['y'] = new svg.Property('y', this.attribute('y').value);
+				tempSvg.attributes['width'] = new svg.Property('width', this.attribute('width').value);
+				tempSvg.attributes['height'] = new svg.Property('height', this.attribute('height').value);
+				tempSvg.children = this.children;
+				
+				var c = document.createElement('canvas');
+				c.width = this.attribute('width').Length.toPixels('x');
+				c.height = this.attribute('height').Length.toPixels('y');
+				tempSvg.render(c.getContext('2d'));		
+				return ctx.createPattern(c, 'repeat');
+			}
+		}
+		svg.Element.pattern.prototype = new svg.Element.ElementBase;
+		
+		// marker element
+		svg.Element.marker = function(node) {
+			this.base = svg.Element.ElementBase;
+			this.base(node);
+			
+			this.baseRender = this.render;
+			this.render = function(ctx, point, angle) {
+				ctx.translate(point.x, point.y);
+				if (this.attribute('orient').valueOrDefault('auto') == 'auto') ctx.rotate(angle);
+				if (this.attribute('markerUnits').valueOrDefault('strokeWidth') == 'strokeWidth') ctx.scale(ctx.lineWidth, ctx.lineWidth);
+				ctx.save();
+							
+				// render me using a temporary svg element
+				var tempSvg = new svg.Element.svg();
+				tempSvg.attributes['viewBox'] = new svg.Property('viewBox', this.attribute('viewBox').value);
+				tempSvg.attributes['refX'] = new svg.Property('refX', this.attribute('refX').value);
+				tempSvg.attributes['refY'] = new svg.Property('refY', this.attribute('refY').value);
+				tempSvg.attributes['width'] = new svg.Property('width', this.attribute('markerWidth').value);
+				tempSvg.attributes['height'] = new svg.Property('height', this.attribute('markerHeight').value);
+				tempSvg.attributes['fill'] = new svg.Property('fill', this.attribute('fill').valueOrDefault('black'));
+				tempSvg.attributes['stroke'] = new svg.Property('stroke', this.attribute('stroke').valueOrDefault('none'));
+				tempSvg.children = this.children;
+				tempSvg.render(ctx);
+				
+				ctx.restore();
+				if (this.attribute('markerUnits').valueOrDefault('strokeWidth') == 'strokeWidth') ctx.scale(1/ctx.lineWidth, 1/ctx.lineWidth);
+				if (this.attribute('orient').valueOrDefault('auto') == 'auto') ctx.rotate(-angle);
+				ctx.translate(-point.x, -point.y);
+			}
+		}
+		svg.Element.marker.prototype = new svg.Element.ElementBase;
+		
+		// definitions element
+		svg.Element.defs = function(node) {
+			this.base = svg.Element.ElementBase;
+			this.base(node);	
+			
+			this.render = function(ctx) {
+				// NOOP
+			}
+		}
+		svg.Element.defs.prototype = new svg.Element.ElementBase;
+		
+		// base for gradients
+		svg.Element.GradientBase = function(node) {
+			this.base = svg.Element.ElementBase;
+			this.base(node);
+			
+			this.gradientUnits = this.attribute('gradientUnits').valueOrDefault('objectBoundingBox');
+			
+			this.stops = [];			
+			for (var i=0; i<this.children.length; i++) {
+				var child = this.children[i];
+				this.stops.push(child);
+			}	
+			
+			this.getGradient = function() {
+				// OVERRIDE ME!
+			}			
+
+			this.createGradient = function(ctx, element) {
+				var stopsContainer = this;
+				if (this.attribute('xlink:href').hasValue()) {
+					stopsContainer = this.attribute('xlink:href').Definition.getDefinition();
+				}
+			
+				var g = this.getGradient(ctx, element);
+				for (var i=0; i<stopsContainer.stops.length; i++) {
+					g.addColorStop(stopsContainer.stops[i].offset, stopsContainer.stops[i].color);
+				}
+				
+				if (this.attribute('gradientTransform').hasValue()) {
+					// render as transformed pattern on temporary canvas
+					var rootView = svg.ViewPort.viewPorts[0];
+					
+					var rect = new svg.Element.rect();
+					rect.attributes['x'] = new svg.Property('x', -svg.MAX_VIRTUAL_PIXELS/3.0);
+					rect.attributes['y'] = new svg.Property('y', -svg.MAX_VIRTUAL_PIXELS/3.0);
+					rect.attributes['width'] = new svg.Property('width', svg.MAX_VIRTUAL_PIXELS);
+					rect.attributes['height'] = new svg.Property('height', svg.MAX_VIRTUAL_PIXELS);
+					
+					var group = new svg.Element.g();
+					group.attributes['transform'] = new svg.Property('transform', this.attribute('gradientTransform').value);
+					group.children = [ rect ];
+					
+					var tempSvg = new svg.Element.svg();
+					tempSvg.attributes['x'] = new svg.Property('x', 0);
+					tempSvg.attributes['y'] = new svg.Property('y', 0);
+					tempSvg.attributes['width'] = new svg.Property('width', rootView.width);
+					tempSvg.attributes['height'] = new svg.Property('height', rootView.height);
+					tempSvg.children = [ group ];
+					
+					var c = document.createElement('canvas');
+					c.width = rootView.width;
+					c.height = rootView.height;
+					var tempCtx = c.getContext('2d');
+					tempCtx.fillStyle = g;
+					tempSvg.render(tempCtx);		
+					return tempCtx.createPattern(c, 'no-repeat');
+				}
+				
+				return g;				
+			}
+		}
+		svg.Element.GradientBase.prototype = new svg.Element.ElementBase;
+		
+		// linear gradient element
+		svg.Element.linearGradient = function(node) {
+			this.base = svg.Element.GradientBase;
+			this.base(node);
+			
+			this.getGradient = function(ctx, element) {
+				var bb = element.getBoundingBox();
+				
+				var x1 = (this.gradientUnits == 'objectBoundingBox' 
+					? bb.x() + bb.width() * this.attribute('x1').numValue() 
+					: this.attribute('x1').Length.toPixels('x'));
+				var y1 = (this.gradientUnits == 'objectBoundingBox' 
+					? bb.y() + bb.height() * this.attribute('y1').numValue()
+					: this.attribute('y1').Length.toPixels('y'));
+				var x2 = (this.gradientUnits == 'objectBoundingBox' 
+					? bb.x() + bb.width() * this.attribute('x2').numValue()
+					: this.attribute('x2').Length.toPixels('x'));
+				var y2 = (this.gradientUnits == 'objectBoundingBox' 
+					? bb.y() + bb.height() * this.attribute('y2').numValue()
+					: this.attribute('y2').Length.toPixels('y'));
+
+				return ctx.createLinearGradient(x1, y1, x2, y2);
+			}
+		}
+		svg.Element.linearGradient.prototype = new svg.Element.GradientBase;
+		
+		// radial gradient element
+		svg.Element.radialGradient = function(node) {
+			this.base = svg.Element.GradientBase;
+			this.base(node);
+			
+			this.getGradient = function(ctx, element) {
+				var bb = element.getBoundingBox();
+				
+				var cx = (this.gradientUnits == 'objectBoundingBox' 
+					? bb.x() + bb.width() * this.attribute('cx').numValue() 
+					: this.attribute('cx').Length.toPixels('x'));
+				var cy = (this.gradientUnits == 'objectBoundingBox' 
+					? bb.y() + bb.height() * this.attribute('cy').numValue() 
+					: this.attribute('cy').Length.toPixels('y'));
+				
+				var fx = cx;
+				var fy = cy;
+				if (this.attribute('fx').hasValue()) {
+					fx = (this.gradientUnits == 'objectBoundingBox' 
+					? bb.x() + bb.width() * this.attribute('fx').numValue() 
+					: this.attribute('fx').Length.toPixels('x'));
+				}
+				if (this.attribute('fy').hasValue()) {
+					fy = (this.gradientUnits == 'objectBoundingBox' 
+					? bb.y() + bb.height() * this.attribute('fy').numValue() 
+					: this.attribute('fy').Length.toPixels('y'));
+				}
+				
+				var r = (this.gradientUnits == 'objectBoundingBox' 
+					? (bb.width() + bb.height()) / 2.0 * this.attribute('r').numValue()
+					: this.attribute('r').Length.toPixels());
+				
+				return ctx.createRadialGradient(fx, fy, 0, cx, cy, r);
+			}
+		}
+		svg.Element.radialGradient.prototype = new svg.Element.GradientBase;
+		
+		// gradient stop element
+		svg.Element.stop = function(node) {
+			this.base = svg.Element.ElementBase;
+			this.base(node);
+			
+			this.offset = this.attribute('offset').numValue();
+			
+			var stopColor = this.style('stop-color');
+			if (this.style('stop-opacity').hasValue()) stopColor = stopColor.Color.addOpacity(this.style('stop-opacity').value);
+			this.color = stopColor.value;
+		}
+		svg.Element.stop.prototype = new svg.Element.ElementBase;
+		
+		// animation base element
+		svg.Element.AnimateBase = function(node) {
+			this.base = svg.Element.ElementBase;
+			this.base(node);
+			
+			svg.Animations.push(this);
+			
+			this.duration = 0.0;
+			this.begin = this.attribute('begin').Time.toMilliseconds();
+			this.maxDuration = this.begin + this.attribute('dur').Time.toMilliseconds();
+			
+			this.getProperty = function() {
+				var attributeType = this.attribute('attributeType').value;
+				var attributeName = this.attribute('attributeName').value;
+				
+				if (attributeType == 'CSS') {
+					return this.parent.style(attributeName, true);
+				}
+				return this.parent.attribute(attributeName, true);			
+			};
+			
+			this.initialValue = null;
+			this.removed = false;			
+
+			this.calcValue = function() {
+				// OVERRIDE ME!
+				return '';
+			}
+			
+			this.update = function(delta) {	
+				// set initial value
+				if (this.initialValue == null) {
+					this.initialValue = this.getProperty().value;
+				}
+			
+				// if we're past the end time
+				if (this.duration > this.maxDuration) {
+					// loop for indefinitely repeating animations
+					if (this.attribute('repeatCount').value == 'indefinite') {
+						this.duration = 0.0
+					}
+					else if (this.attribute('fill').valueOrDefault('remove') == 'remove' && !this.removed) {
+						this.removed = true;
+						this.getProperty().value = this.initialValue;
+						return true;
+					}
+					else {
+						return false; // no updates made
+					}
+				}			
+				this.duration = this.duration + delta;
+			
+				// if we're past the begin time
+				var updated = false;
+				if (this.begin < this.duration) {
+					var newValue = this.calcValue(); // tween
+					
+					if (this.attribute('type').hasValue()) {
+						// for transform, etc.
+						var type = this.attribute('type').value;
+						newValue = type + '(' + newValue + ')';
+					}
+					
+					this.getProperty().value = newValue;
+					updated = true;
+				}
+				
+				return updated;
+			}
+			
+			// fraction of duration we've covered
+			this.progress = function() {
+				return ((this.duration - this.begin) / (this.maxDuration - this.begin));
+			}			
+		}
+		svg.Element.AnimateBase.prototype = new svg.Element.ElementBase;
+		
+		// animate element
+		svg.Element.animate = function(node) {
+			this.base = svg.Element.AnimateBase;
+			this.base(node);
+			
+			this.calcValue = function() {
+				var from = this.attribute('from').numValue();
+				var to = this.attribute('to').numValue();
+				
+				// tween value linearly
+				return from + (to - from) * this.progress(); 
+			};
+		}
+		svg.Element.animate.prototype = new svg.Element.AnimateBase;
+			
+		// animate color element
+		svg.Element.animateColor = function(node) {
+			this.base = svg.Element.AnimateBase;
+			this.base(node);
+
+			this.calcValue = function() {
+				var from = new RGBColor(this.attribute('from').value);
+				var to = new RGBColor(this.attribute('to').value);
+				
+				if (from.ok && to.ok) {
+					// tween color linearly
+					var r = from.r + (to.r - from.r) * this.progress();
+					var g = from.g + (to.g - from.g) * this.progress();
+					var b = from.b + (to.b - from.b) * this.progress();
+					return 'rgb('+parseInt(r,10)+','+parseInt(g,10)+','+parseInt(b,10)+')';
+				}
+				return this.attribute('from').value;
+			};
+		}
+		svg.Element.animateColor.prototype = new svg.Element.AnimateBase;
+		
+		// animate transform element
+		svg.Element.animateTransform = function(node) {
+			this.base = svg.Element.animate;
+			this.base(node);
+		}
+		svg.Element.animateTransform.prototype = new svg.Element.animate;
+		
+		// font element
+		svg.Element.font = function(node) {
+			this.base = svg.Element.ElementBase;
+			this.base(node);
+
+			this.horizAdvX = this.attribute('horiz-adv-x').numValue();			
+			
+			this.isRTL = false;
+			this.isArabic = false;
+			this.fontFace = null;
+			this.missingGlyph = null;
+			this.glyphs = [];			
+			for (var i=0; i<this.children.length; i++) {
+				var child = this.children[i];
+				if (child.type == 'font-face') {
+					this.fontFace = child;
+					if (child.style('font-family').hasValue()) {
+						svg.Definitions[child.style('font-family').value] = this;
+					}
+				}
+				else if (child.type == 'missing-glyph') this.missingGlyph = child;
+				else if (child.type == 'glyph') {
+					if (child.arabicForm != '') {
+						this.isRTL = true;
+						this.isArabic = true;
+						if (typeof(this.glyphs[child.unicode]) == 'undefined') this.glyphs[child.unicode] = [];
+						this.glyphs[child.unicode][child.arabicForm] = child;
+					}
+					else {
+						this.glyphs[child.unicode] = child;
+					}
+				}
+			}	
+		}
+		svg.Element.font.prototype = new svg.Element.ElementBase;
+		
+		// font-face element
+		svg.Element.fontface = function(node) {
+			this.base = svg.Element.ElementBase;
+			this.base(node);	
+			
+			this.ascent = this.attribute('ascent').value;
+			this.descent = this.attribute('descent').value;
+			this.unitsPerEm = this.attribute('units-per-em').numValue();				
+		}
+		svg.Element.fontface.prototype = new svg.Element.ElementBase;
+		
+		// missing-glyph element
+		svg.Element.missingglyph = function(node) {
+			this.base = svg.Element.path;
+			this.base(node);	
+			
+			this.horizAdvX = 0;
+		}
+		svg.Element.missingglyph.prototype = new svg.Element.path;
+		
+		// glyph element
+		svg.Element.glyph = function(node) {
+			this.base = svg.Element.path;
+			this.base(node);	
+			
+			this.horizAdvX = this.attribute('horiz-adv-x').numValue();
+			this.unicode = this.attribute('unicode').value;
+			this.arabicForm = this.attribute('arabic-form').value;
+		}
+		svg.Element.glyph.prototype = new svg.Element.path;
+		
+		// text element
+		svg.Element.text = function(node) {
+			this.base = svg.Element.RenderedElementBase;
+			this.base(node);
+			
+			if (node != null) {
+				// add children
+				this.children = [];
+				for (var i=0; i<node.childNodes.length; i++) {
+					var childNode = node.childNodes[i];
+					if (childNode.nodeType == 1) { // capture tspan and tref nodes
+						this.addChild(childNode, true);
+					}
+					else if (childNode.nodeType == 3) { // capture text
+						this.addChild(new svg.Element.tspan(childNode), false);
+					}
+				}
+			}
+			
+			this.baseSetContext = this.setContext;
+			this.setContext = function(ctx) {
+				this.baseSetContext(ctx);
+				if (this.style('dominant-baseline').hasValue()) ctx.textBaseline = this.style('dominant-baseline').value;
+				if (this.style('alignment-baseline').hasValue()) ctx.textBaseline = this.style('alignment-baseline').value;
+			}
+			
+			this.renderChildren = function(ctx) {
+				var textAnchor = this.style('text-anchor').valueOrDefault('start');
+				var x = this.attribute('x').Length.toPixels('x');
+				var y = this.attribute('y').Length.toPixels('y');
+				for (var i=0; i<this.children.length; i++) {
+					var child = this.children[i];
+				
+					if (child.attribute('x').hasValue()) {
+						child.x = child.attribute('x').Length.toPixels('x');
+					}
+					else {
+						if (child.attribute('dx').hasValue()) x += child.attribute('dx').Length.toPixels('x');
+						child.x = x;
+					}
+					
+					var childLength = child.measureText ? child.measureText(ctx) : 0;
+					if (textAnchor != 'start' && (i==0 || child.attribute('x').hasValue())) { // new group?
+						// loop through rest of children
+						var groupLength = childLength;
+						for (var j=i+1; j<this.children.length; j++) {
+							var childInGroup = this.children[j];
+							if (childInGroup.attribute('x').hasValue()) break; // new group
+							groupLength += childInGroup.measureText ? childInGroup.measureText(ctx) : 0;
+						}
+						child.x -= (textAnchor == 'end' ? groupLength : groupLength / 2.0);
+					}
+					x = child.x + childLength;
+					
+					if (child.attribute('y').hasValue()) {
+						child.y = child.attribute('y').Length.toPixels('y');
+					}
+					else {
+						if (child.attribute('dy').hasValue()) y += child.attribute('dy').Length.toPixels('y');
+						child.y = y;
+					}	
+					y = child.y;
+					
+					child.render(ctx);
+				}
+			}
+		}
+		svg.Element.text.prototype = new svg.Element.RenderedElementBase;
+		
+		// text base
+		svg.Element.TextElementBase = function(node) {
+			this.base = svg.Element.RenderedElementBase;
+			this.base(node);
+			
+			this.getGlyph = function(font, text, i) {
+				var c = text[i];
+				var glyph = null;
+				if (font.isArabic) {
+					var arabicForm = 'isolated';
+					if ((i==0 || text[i-1]==' ') && i<text.length-2 && text[i+1]!=' ') arabicForm = 'terminal'; 
+					if (i>0 && text[i-1]!=' ' && i<text.length-2 && text[i+1]!=' ') arabicForm = 'medial';
+					if (i>0 && text[i-1]!=' ' && (i == text.length-1 || text[i+1]==' ')) arabicForm = 'initial';
+					if (typeof(font.glyphs[c]) != 'undefined') {
+						glyph = font.glyphs[c][arabicForm];
+						if (glyph == null && font.glyphs[c].type == 'glyph') glyph = font.glyphs[c];
+					}
+				}
+				else {
+					glyph = font.glyphs[c];
+				}
+				if (glyph == null) glyph = font.missingGlyph;
+				return glyph;
+			}
+			
+			this.renderChildren = function(ctx) {
+				var customFont = this.parent.style('font-family').Definition.getDefinition();
+				if (customFont != null) {
+					var fontSize = this.parent.style('font-size').numValueOrDefault(svg.Font.Parse(svg.ctx.font).fontSize);
+					var fontStyle = this.parent.style('font-style').valueOrDefault(svg.Font.Parse(svg.ctx.font).fontStyle);
+					var text = this.getText();
+					if (customFont.isRTL) text = text.split("").reverse().join("");
+					
+					var dx = svg.ToNumberArray(this.parent.attribute('dx').value);
+					for (var i=0; i<text.length; i++) {
+						var glyph = this.getGlyph(customFont, text, i);
+						var scale = fontSize / customFont.fontFace.unitsPerEm;
+						ctx.translate(this.x, this.y);
+						ctx.scale(scale, -scale);
+						var lw = ctx.lineWidth;
+						ctx.lineWidth = ctx.lineWidth * customFont.fontFace.unitsPerEm / fontSize;
+						if (fontStyle == 'italic') ctx.transform(1, 0, .4, 1, 0, 0);
+						glyph.render(ctx);
+						if (fontStyle == 'italic') ctx.transform(1, 0, -.4, 1, 0, 0);
+						ctx.lineWidth = lw;
+						ctx.scale(1/scale, -1/scale);
+						ctx.translate(-this.x, -this.y);	
+						
+						this.x += fontSize * (glyph.horizAdvX || customFont.horizAdvX) / customFont.fontFace.unitsPerEm;
+						if (typeof(dx[i]) != 'undefined' && !isNaN(dx[i])) {
+							this.x += dx[i];
+						}
+					}
+					return;
+				}
+			
+				if (ctx.strokeStyle != '') ctx.strokeText(svg.compressSpaces(this.getText()), this.x, this.y);
+				if (ctx.fillStyle != '') ctx.fillText(svg.compressSpaces(this.getText()), this.x, this.y);
+			}
+			
+			this.getText = function() {
+				// OVERRIDE ME
+			}
+			
+			this.measureText = function(ctx) {
+				var customFont = this.parent.style('font-family').Definition.getDefinition();
+				if (customFont != null) {
+					var fontSize = this.parent.style('font-size').numValueOrDefault(svg.Font.Parse(svg.ctx.font).fontSize);
+					var measure = 0;
+					var text = this.getText();
+					if (customFont.isRTL) text = text.split("").reverse().join("");
+					var dx = svg.ToNumberArray(this.parent.attribute('dx').value);
+					for (var i=0; i<text.length; i++) {
+						var glyph = this.getGlyph(customFont, text, i);
+						measure += (glyph.horizAdvX || customFont.horizAdvX) * fontSize / customFont.fontFace.unitsPerEm;
+						if (typeof(dx[i]) != 'undefined' && !isNaN(dx[i])) {
+							measure += dx[i];
+						}
+					}
+					return measure;
+				}
+			
+				var textToMeasure = svg.compressSpaces(this.getText());
+				if (!ctx.measureText) return textToMeasure.length * 10;
+				
+				ctx.save();
+				this.setContext(ctx);
+				var width = ctx.measureText(textToMeasure).width;
+				ctx.restore();
+				return width;
+			}
+		}
+		svg.Element.TextElementBase.prototype = new svg.Element.RenderedElementBase;
+		
+		// tspan 
+		svg.Element.tspan = function(node) {
+			this.base = svg.Element.TextElementBase;
+			this.base(node);
+			
+			this.text = node.nodeType == 3 ? node.nodeValue : // text
+						node.childNodes.length > 0 ? node.childNodes[0].nodeValue : // element
+						node.text;
+			this.getText = function() {
+				return this.text;
+			}
+		}
+		svg.Element.tspan.prototype = new svg.Element.TextElementBase;
+		
+		// tref
+		svg.Element.tref = function(node) {
+			this.base = svg.Element.TextElementBase;
+			this.base(node);
+			
+			this.getText = function() {
+				var element = this.attribute('xlink:href').Definition.getDefinition();
+				if (element != null) return element.children[0].getText();
+			}
+		}
+		svg.Element.tref.prototype = new svg.Element.TextElementBase;		
+		
+		// a element
+		svg.Element.a = function(node) {
+			this.base = svg.Element.TextElementBase;
+			this.base(node);
+			
+			this.hasText = true;
+			for (var i=0; i<node.childNodes.length; i++) {
+				if (node.childNodes[i].nodeType != 3) this.hasText = false;
+			}
+			
+			// this might contain text
+			this.text = this.hasText ? node.childNodes[0].nodeValue : '';
+			this.getText = function() {
+				return this.text;
+			}		
+
+			this.baseRenderChildren = this.renderChildren;
+			this.renderChildren = function(ctx) {
+				if (this.hasText) {
+					// render as text element
+					this.baseRenderChildren(ctx);
+					var fontSize = new svg.Property('fontSize', svg.Font.Parse(svg.ctx.font).fontSize);
+					svg.Mouse.checkBoundingBox(this, new svg.BoundingBox(this.x, this.y - fontSize.Length.toPixels('y'), this.x + this.measureText(ctx), this.y));					
+				}
+				else {
+					// render as temporary group
+					var g = new svg.Element.g();
+					g.children = this.children;
+					g.parent = this;
+					g.render(ctx);
+				}
+			}
+			
+			this.onclick = function() {
+				window.open(this.attribute('xlink:href').value);
+			}
+			
+			this.onmousemove = function() {
+				svg.ctx.canvas.style.cursor = 'pointer';
+			}
+		}
+		svg.Element.a.prototype = new svg.Element.TextElementBase;		
+		
+		// image element
+		svg.Element.image = function(node) {
+			this.base = svg.Element.RenderedElementBase;
+			this.base(node);
+			
+			svg.Images.push(this);
+			this.img = document.createElement('img');
+			this.loaded = false;
+			var that = this;
+			this.img.onload = function() { that.loaded = true; }
+			this.img.src = this.attribute('xlink:href').value;
+			
+			this.renderChildren = function(ctx) {
+				var x = this.attribute('x').Length.toPixels('x');
+				var y = this.attribute('y').Length.toPixels('y');
+				
+				var width = this.attribute('width').Length.toPixels('x');
+				var height = this.attribute('height').Length.toPixels('y');			
+				if (width == 0 || height == 0) return;
+			
+				ctx.save();
+				ctx.translate(x, y);
+				svg.AspectRatio(ctx,
+								this.attribute('preserveAspectRatio').value,
+								width,
+								this.img.width,
+								height,
+								this.img.height,
+								0,
+								0);	
+				ctx.drawImage(this.img, 0, 0);			
+				ctx.restore();
+			}
+		}
+		svg.Element.image.prototype = new svg.Element.RenderedElementBase;
+		
+		// group element
+		svg.Element.g = function(node) {
+			this.base = svg.Element.RenderedElementBase;
+			this.base(node);
+			
+			this.getBoundingBox = function() {
+				var bb = new svg.BoundingBox();
+				for (var i=0; i<this.children.length; i++) {
+					bb.addBoundingBox(this.children[i].getBoundingBox());
+				}
+				return bb;
+			};
+		}
+		svg.Element.g.prototype = new svg.Element.RenderedElementBase;
+
+		// symbol element
+		svg.Element.symbol = function(node) {
+			this.base = svg.Element.RenderedElementBase;
+			this.base(node);
+			
+			this.baseSetContext = this.setContext;
+			this.setContext = function(ctx) {		
+				this.baseSetContext(ctx);
+				
+				// viewbox
+				if (this.attribute('viewBox').hasValue()) {				
+					var viewBox = svg.ToNumberArray(this.attribute('viewBox').value);
+					var minX = viewBox[0];
+					var minY = viewBox[1];
+					width = viewBox[2];
+					height = viewBox[3];
+					
+					svg.AspectRatio(ctx,
+									this.attribute('preserveAspectRatio').value, 
+									this.attribute('width').Length.toPixels('x'),
+									width,
+									this.attribute('height').Length.toPixels('y'),
+									height,
+									minX,
+									minY);
+
+					svg.ViewPort.SetCurrent(viewBox[2], viewBox[3]);						
+				}
+			}			
+		}
+		svg.Element.symbol.prototype = new svg.Element.RenderedElementBase;		
+			
+		// style element
+		svg.Element.style = function(node) { 
+			this.base = svg.Element.ElementBase;
+			this.base(node);
+			
+			// text, or spaces then CDATA
+			var css = node.childNodes[0].nodeValue + (node.childNodes.length > 1 ? node.childNodes[1].nodeValue : '');
+			css = css.replace(/(\/\*([^*]|[\r\n]|(\*+([^*\/]|[\r\n])))*\*+\/)|(^[\s]*\/\/.*)/gm, ''); // remove comments
+			css = svg.compressSpaces(css); // replace whitespace
+			var cssDefs = css.split('}');
+			for (var i=0; i<cssDefs.length; i++) {
+				if (svg.trim(cssDefs[i]) != '') {
+					var cssDef = cssDefs[i].split('{');
+					var cssClasses = cssDef[0].split(',');
+					var cssProps = cssDef[1].split(';');
+					for (var j=0; j<cssClasses.length; j++) {
+						var cssClass = svg.trim(cssClasses[j]);
+						if (cssClass != '') {
+							var props = {};
+							for (var k=0; k<cssProps.length; k++) {
+								var prop = cssProps[k].indexOf(':');
+								var name = cssProps[k].substr(0, prop);
+								var value = cssProps[k].substr(prop + 1, cssProps[k].length - prop);
+								if (name != null && value != null) {
+									props[svg.trim(name)] = new svg.Property(svg.trim(name), svg.trim(value));
+								}
+							}
+							svg.Styles[cssClass] = props;
+							if (cssClass == '@font-face') {
+								var fontFamily = props['font-family'].value.replace(/"/g,'');
+								var srcs = props['src'].value.split(',');
+								for (var s=0; s<srcs.length; s++) {
+									if (srcs[s].indexOf('format("svg")') > 0) {
+										var urlStart = srcs[s].indexOf('url');
+										var urlEnd = srcs[s].indexOf(')', urlStart);
+										var url = srcs[s].substr(urlStart + 5, urlEnd - urlStart - 6);
+										var doc = svg.parseXml(svg.ajax(url));
+										var fonts = doc.getElementsByTagName('font');
+										for (var f=0; f<fonts.length; f++) {
+											var font = svg.CreateElement(fonts[f]);
+											svg.Definitions[fontFamily] = font;
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		svg.Element.style.prototype = new svg.Element.ElementBase;
+		
+		// use element 
+		svg.Element.use = function(node) {
+			this.base = svg.Element.RenderedElementBase;
+			this.base(node);
+			
+			this.baseSetContext = this.setContext;
+			this.setContext = function(ctx) {
+				this.baseSetContext(ctx);
+				if (this.attribute('x').hasValue()) ctx.translate(this.attribute('x').Length.toPixels('x'), 0);
+				if (this.attribute('y').hasValue()) ctx.translate(0, this.attribute('y').Length.toPixels('y'));
+			}
+			
+			this.getDefinition = function() {
+				var element = this.attribute('xlink:href').Definition.getDefinition();
+				if (this.attribute('width').hasValue()) element.attribute('width', true).value = this.attribute('width').value;
+				if (this.attribute('height').hasValue()) element.attribute('height', true).value = this.attribute('height').value;
+				return element;
+			}
+			
+			this.path = function(ctx) {
+				var element = this.getDefinition();
+				if (element != null) element.path(ctx);
+			}
+			
+			this.renderChildren = function(ctx) {
+				var element = this.getDefinition();
+				if (element != null) element.render(ctx);
+			}
+		}
+		svg.Element.use.prototype = new svg.Element.RenderedElementBase;
+		
+		// mask element
+		svg.Element.mask = function(node) {
+			this.base = svg.Element.ElementBase;
+			this.base(node);
+						
+			this.apply = function(ctx, element) {
+				// render as temp svg	
+				var x = this.attribute('x').Length.toPixels('x');
+				var y = this.attribute('y').Length.toPixels('y');
+				var width = this.attribute('width').Length.toPixels('x');
+				var height = this.attribute('height').Length.toPixels('y');
+				
+				// temporarily remove mask to avoid recursion
+				var mask = element.attribute('mask').value;
+				element.attribute('mask').value = '';
+				
+					var cMask = document.createElement('canvas');
+					cMask.width = x + width;
+					cMask.height = y + height;
+					var maskCtx = cMask.getContext('2d');
+					this.renderChildren(maskCtx);
+				
+					var c = document.createElement('canvas');
+					c.width = x + width;
+					c.height = y + height;
+					var tempCtx = c.getContext('2d');
+					element.render(tempCtx);
+					tempCtx.globalCompositeOperation = 'destination-in';
+					tempCtx.fillStyle = maskCtx.createPattern(cMask, 'no-repeat');
+					tempCtx.fillRect(0, 0, x + width, y + height);
+					
+					ctx.fillStyle = tempCtx.createPattern(c, 'no-repeat');
+					ctx.fillRect(0, 0, x + width, y + height);
+					
+				// reassign mask
+				element.attribute('mask').value = mask;	
+			}
+			
+			this.render = function(ctx) {
+				// NO RENDER
+			}
+		}
+		svg.Element.mask.prototype = new svg.Element.ElementBase;
+		
+		// clip element
+		svg.Element.clipPath = function(node) {
+			this.base = svg.Element.ElementBase;
+			this.base(node);
+			
+			this.apply = function(ctx) {
+				for (var i=0; i<this.children.length; i++) {
+					if (this.children[i].path) {
+						this.children[i].path(ctx);
+						ctx.clip();
+					}
+				}
+			}
+			
+			this.render = function(ctx) {
+				// NO RENDER
+			}
+		}
+		svg.Element.clipPath.prototype = new svg.Element.ElementBase;
+
+		// filters
+		svg.Element.filter = function(node) {
+			this.base = svg.Element.ElementBase;
+			this.base(node);
+						
+			this.apply = function(ctx, element) {
+				// render as temp svg	
+				var bb = element.getBoundingBox();
+				var x = this.attribute('x').Length.toPixels('x');
+				var y = this.attribute('y').Length.toPixels('y');
+				if (x == 0 || y == 0) {
+					x = bb.x1;
+					y = bb.y1;
+				}
+				var width = this.attribute('width').Length.toPixels('x');
+				var height = this.attribute('height').Length.toPixels('y');
+				if (width == 0 || height == 0) {
+					width = bb.width();
+					height = bb.height();
+				}
+				
+				// temporarily remove filter to avoid recursion
+				var filter = element.style('filter').value;
+				element.style('filter').value = '';
+				
+				// max filter distance
+				var extraPercent = .20;
+				var px = extraPercent * width;
+				var py = extraPercent * height;
+				
+				var c = document.createElement('canvas');
+				c.width = width + 2*px;
+				c.height = height + 2*py;
+				var tempCtx = c.getContext('2d');
+				tempCtx.translate(-x + px, -y + py);
+				element.render(tempCtx);
+			
+				// apply filters
+				for (var i=0; i<this.children.length; i++) {
+					this.children[i].apply(tempCtx, 0, 0, width + 2*px, height + 2*py);
+				}
+				
+				// render on me
+				ctx.drawImage(c, 0, 0, width + 2*px, height + 2*py, x - px, y - py, width + 2*px, height + 2*py);
+				
+				// reassign filter
+				element.style('filter', true).value = filter;	
+			}
+			
+			this.render = function(ctx) {
+				// NO RENDER
+			}		
+		}
+		svg.Element.filter.prototype = new svg.Element.ElementBase;
+		
+		svg.Element.feGaussianBlur = function(node) {
+			this.base = svg.Element.ElementBase;
+			this.base(node);	
+			
+			function make_fgauss(sigma) {
+				sigma = Math.max(sigma, 0.01);			      
+				var len = Math.ceil(sigma * 4.0) + 1;                     
+				mask = [];                               
+				for (var i = 0; i < len; i++) {                             
+					mask[i] = Math.exp(-0.5 * (i / sigma) * (i / sigma));                                           
+				}                                                           
+				return mask; 
+			}
+			
+			function normalize(mask) {
+				var sum = 0;
+				for (var i = 1; i < mask.length; i++) {
+					sum += Math.abs(mask[i]);
+				}
+				sum = 2 * sum + Math.abs(mask[0]);
+				for (var i = 0; i < mask.length; i++) {
+					mask[i] /= sum;
+				}
+				return mask;
+			}
+			
+			function convolve_even(src, dst, mask, width, height) {
+			  for (var y = 0; y < height; y++) {
+				for (var x = 0; x < width; x++) {
+				  var a = imGet(src, x, y, width, height, 3)/255;
+				  for (var rgba = 0; rgba < 4; rgba++) {					  
+					  var sum = mask[0] * (a==0?255:imGet(src, x, y, width, height, rgba)) * (a==0||rgba==3?1:a);
+					  for (var i = 1; i < mask.length; i++) {
+						var a1 = imGet(src, Math.max(x-i,0), y, width, height, 3)/255;
+					    var a2 = imGet(src, Math.min(x+i, width-1), y, width, height, 3)/255;
+						sum += mask[i] * 
+						  ((a1==0?255:imGet(src, Math.max(x-i,0), y, width, height, rgba)) * (a1==0||rgba==3?1:a1) + 
+						   (a2==0?255:imGet(src, Math.min(x+i, width-1), y, width, height, rgba)) * (a2==0||rgba==3?1:a2));
+					  }
+					  imSet(dst, y, x, height, width, rgba, sum);
+				  }			  
+				}
+			  }
+			}		
+
+			function imGet(img, x, y, width, height, rgba) {
+				return img[y*width*4 + x*4 + rgba];
+			}
+			
+			function imSet(img, x, y, width, height, rgba, val) {
+				img[y*width*4 + x*4 + rgba] = val;
+			}
+						
+			function blur(ctx, width, height, sigma)
+			{
+				var srcData = ctx.getImageData(0, 0, width, height);
+				var mask = make_fgauss(sigma);
+				mask = normalize(mask);
+				tmp = [];
+				convolve_even(srcData.data, tmp, mask, width, height);
+				convolve_even(tmp, srcData.data, mask, height, width);
+				ctx.clearRect(0, 0, width, height);
+				ctx.putImageData(srcData, 0, 0);
+			}			
+		
+			this.apply = function(ctx, x, y, width, height) {
+				// assuming x==0 && y==0 for now
+				blur(ctx, width, height, this.attribute('stdDeviation').numValue());
+			}
+		}
+		svg.Element.filter.prototype = new svg.Element.feGaussianBlur;
+		
+		// title element, do nothing
+		svg.Element.title = function(node) {
+		}
+		svg.Element.title.prototype = new svg.Element.ElementBase;
+
+		// desc element, do nothing
+		svg.Element.desc = function(node) {
+		}
+		svg.Element.desc.prototype = new svg.Element.ElementBase;		
+		
+		svg.Element.MISSING = function(node) {
+			console.log('ERROR: Element \'' + node.nodeName + '\' not yet implemented.');
+		}
+		svg.Element.MISSING.prototype = new svg.Element.ElementBase;
+		
+		// element factory
+		svg.CreateElement = function(node) {	
+			var className = node.nodeName.replace(/^[^:]+:/,''); // remove namespace
+			className = className.replace(/\-/g,''); // remove dashes
+			var e = null;
+			if (typeof(svg.Element[className]) != 'undefined') {
+				e = new svg.Element[className](node);
+			}
+			else {
+				e = new svg.Element.MISSING(node);
+			}
+
+			e.type = node.nodeName;
+			return e;
+		}
+				
+		// load from url
+		svg.load = function(ctx, url) {
+			svg.loadXml(ctx, svg.ajax(url));
+		}
+		
+		// load from xml
+		svg.loadXml = function(ctx, xml) {
+			svg.loadXmlDoc(ctx, svg.parseXml(xml));
+		}
+		
+		svg.loadXmlDoc = function(ctx, dom) {
+			svg.init(ctx);
+			
+			var mapXY = function(p) {
+				var e = ctx.canvas;
+				while (e) {
+					p.x -= e.offsetLeft;
+					p.y -= e.offsetTop;
+					e = e.offsetParent;
+				}
+				if (window.scrollX) p.x += window.scrollX;
+				if (window.scrollY) p.y += window.scrollY;
+				return p;
+			}
+			
+			// bind mouse
+			if (svg.opts['ignoreMouse'] != true) {
+				ctx.canvas.onclick = function(e) {
+					var p = mapXY(new svg.Point(e != null ? e.clientX : event.clientX, e != null ? e.clientY : event.clientY));
+					svg.Mouse.onclick(p.x, p.y);
+				};
+				ctx.canvas.onmousemove = function(e) {
+					var p = mapXY(new svg.Point(e != null ? e.clientX : event.clientX, e != null ? e.clientY : event.clientY));
+					svg.Mouse.onmousemove(p.x, p.y);
+				};
+			}
+		
+			var e = svg.CreateElement(dom.documentElement);
+			e.root = true;
+					
+			// render loop
+			var isFirstRender = true;
+			var draw = function() {
+				svg.ViewPort.Clear();
+				if (ctx.canvas.parentNode) svg.ViewPort.SetCurrent(ctx.canvas.parentNode.clientWidth, ctx.canvas.parentNode.clientHeight);
+			
+				if (svg.opts['ignoreDimensions'] != true) {
+					// set canvas size
+					if (e.style('width').hasValue()) {
+						ctx.canvas.width = e.style('width').Length.toPixels('x');
+						ctx.canvas.style.width = ctx.canvas.width + 'px';
+					}
+					if (e.style('height').hasValue()) {
+						ctx.canvas.height = e.style('height').Length.toPixels('y');
+						ctx.canvas.style.height = ctx.canvas.height + 'px';
+					}
+				}
+				var cWidth = ctx.canvas.clientWidth || ctx.canvas.width;
+				var cHeight = ctx.canvas.clientHeight || ctx.canvas.height;
+				svg.ViewPort.SetCurrent(cWidth, cHeight);		
+				
+				if (svg.opts != null && svg.opts['offsetX'] != null) e.attribute('x', true).value = svg.opts['offsetX'];
+				if (svg.opts != null && svg.opts['offsetY'] != null) e.attribute('y', true).value = svg.opts['offsetY'];
+				if (svg.opts != null && svg.opts['scaleWidth'] != null && svg.opts['scaleHeight'] != null) {
+					var xRatio = 1, yRatio = 1;
+					if (e.attribute('width').hasValue()) xRatio = e.attribute('width').Length.toPixels('x') / svg.opts['scaleWidth'];
+					if (e.attribute('height').hasValue()) yRatio = e.attribute('height').Length.toPixels('y') / svg.opts['scaleHeight'];
+				
+					e.attribute('width', true).value = svg.opts['scaleWidth'];
+					e.attribute('height', true).value = svg.opts['scaleHeight'];			
+					e.attribute('viewBox', true).value = '0 0 ' + (cWidth * xRatio) + ' ' + (cHeight * yRatio);
+					e.attribute('preserveAspectRatio', true).value = 'none';
+				}
+			
+				// clear and render
+				if (svg.opts['ignoreClear'] != true) {
+					ctx.clearRect(0, 0, cWidth, cHeight);
+				}
+				e.render(ctx);
+				if (isFirstRender) {
+					isFirstRender = false;
+					if (svg.opts != null && typeof(svg.opts['renderCallback']) == 'function') svg.opts['renderCallback']();
+				}			
+			}
+			
+			var waitingForImages = true;
+			if (svg.ImagesLoaded()) {
+				waitingForImages = false;
+				draw();
+			}
+			svg.intervalID = setInterval(function() { 
+				var needUpdate = false;
+				
+				if (waitingForImages && svg.ImagesLoaded()) {
+					waitingForImages = false;
+					needUpdate = true;
+				}
+			
+				// need update from mouse events?
+				if (svg.opts['ignoreMouse'] != true) {
+					needUpdate = needUpdate | svg.Mouse.hasEvents();
+				}
+			
+				// need update from animations?
+				if (svg.opts['ignoreAnimation'] != true) {
+					for (var i=0; i<svg.Animations.length; i++) {
+						needUpdate = needUpdate | svg.Animations[i].update(1000 / svg.FRAMERATE);
+					}
+				}
+				
+				// need update from redraw?
+				if (svg.opts != null && typeof(svg.opts['forceRedraw']) == 'function') {
+					if (svg.opts['forceRedraw']() == true) needUpdate = true;
+				}
+				
+				// render if needed
+				if (needUpdate) {
+					draw();				
+					svg.Mouse.runEvents(); // run and clear our events
+				}
+			}, 1000 / svg.FRAMERATE);
+		}
+		
+		svg.stop = function() {
+			if (svg.intervalID) {
+				clearInterval(svg.intervalID);
+			}
+		}
+		
+		svg.Mouse = new (function() {
+			this.events = [];
+			this.hasEvents = function() { return this.events.length != 0; }
+		
+			this.onclick = function(x, y) {
+				this.events.push({ type: 'onclick', x: x, y: y, 
+					run: function(e) { if (e.onclick) e.onclick(); }
+				});
+			}
+			
+			this.onmousemove = function(x, y) {
+				this.events.push({ type: 'onmousemove', x: x, y: y,
+					run: function(e) { if (e.onmousemove) e.onmousemove(); }
+				});
+			}			
+			
+			this.eventElements = [];
+			
+			this.checkPath = function(element, ctx) {
+				for (var i=0; i<this.events.length; i++) {
+					var e = this.events[i];
+					if (ctx.isPointInPath && ctx.isPointInPath(e.x, e.y)) this.eventElements[i] = element;
+				}
+			}
+			
+			this.checkBoundingBox = function(element, bb) {
+				for (var i=0; i<this.events.length; i++) {
+					var e = this.events[i];
+					if (bb.isPointInBox(e.x, e.y)) this.eventElements[i] = element;
+				}			
+			}
+			
+			this.runEvents = function() {
+				svg.ctx.canvas.style.cursor = '';
+				
+				for (var i=0; i<this.events.length; i++) {
+					var e = this.events[i];
+					var element = this.eventElements[i];
+					while (element) {
+						e.run(element);
+						element = element.parent;
+					}
+				}		
+			
+				// done running, clear
+				this.events = []; 
+				this.eventElements = [];
+			}
+		});
+		
+		return svg;
+	}
+})();
+
+if (CanvasRenderingContext2D) {
+	CanvasRenderingContext2D.prototype.drawSvg = function(s, dx, dy, dw, dh) {
+		canvg(this.canvas, s, { 
+			ignoreMouse: true, 
+			ignoreAnimation: true, 
+			ignoreDimensions: true, 
+			ignoreClear: true, 
+			offsetX: dx, 
+			offsetY: dy, 
+			scaleWidth: dw, 
+			scaleHeight: dh
+		});
+	}
+}/**
+ * @license Highcharts JS v4.1.6 (2015-06-12)
+ * CanVGRenderer Extension module
+ *
+ * (c) 2011-2012 Torstein Honsi, Erik Olsson
+ *
+ * License: www.highcharts.com/license
+ */
+
+// JSLint options:
+/*global Highcharts */
+
+(function (Highcharts) { // encapsulate
+	var UNDEFINED,
+		DIV = 'div',
+		ABSOLUTE = 'absolute',
+		RELATIVE = 'relative',
+		HIDDEN = 'hidden',
+		VISIBLE = 'visible',
+		PX = 'px',
+		css = Highcharts.css,
+		CanVGRenderer = Highcharts.CanVGRenderer,
+		SVGRenderer = Highcharts.SVGRenderer,
+		extend = Highcharts.extend,
+		merge = Highcharts.merge,
+		addEvent = Highcharts.addEvent,
+		createElement = Highcharts.createElement,
+		discardElement = Highcharts.discardElement;
+
+	// Extend CanVG renderer on demand, inherit from SVGRenderer
+	extend(CanVGRenderer.prototype, SVGRenderer.prototype);
+
+	// Add additional functionality:
+	extend(CanVGRenderer.prototype, {
+		create: function (chart, container, chartWidth, chartHeight) {
+			this.setContainer(container, chartWidth, chartHeight);
+			this.configure(chart);
+		},
+		setContainer: function (container, chartWidth, chartHeight) {
+			var containerStyle = container.style,
+				containerParent = container.parentNode,
+				containerLeft = containerStyle.left,
+				containerTop = containerStyle.top,
+				containerOffsetWidth = container.offsetWidth,
+				containerOffsetHeight = container.offsetHeight,
+				canvas,
+				initialHiddenStyle = { visibility: HIDDEN, position: ABSOLUTE };
+
+			this.init.apply(this, [container, chartWidth, chartHeight]);
+
+			// add the canvas above it
+			canvas = createElement('canvas', {
+				width: containerOffsetWidth,
+				height: containerOffsetHeight
+			}, {
+				position: RELATIVE,
+				left: containerLeft,
+				top: containerTop
+			}, container);
+			this.canvas = canvas;
+
+			// Create the tooltip line and div, they are placed as siblings to
+			// the container (and as direct childs to the div specified in the html page)
+			this.ttLine = createElement(DIV, null, initialHiddenStyle, containerParent);
+			this.ttDiv = createElement(DIV, null, initialHiddenStyle, containerParent);
+			this.ttTimer = UNDEFINED;
+
+			// Move away the svg node to a new div inside the container's parent so we can hide it.
+			var hiddenSvg = createElement(DIV, {
+				width: containerOffsetWidth,
+				height: containerOffsetHeight
+			}, {
+				visibility: HIDDEN,
+				left: containerLeft,
+				top: containerTop
+			}, containerParent);
+			this.hiddenSvg = hiddenSvg;
+			hiddenSvg.appendChild(this.box);
+		},
+
+		/**
+		 * Configures the renderer with the chart. Attach a listener to the event tooltipRefresh.
+		 **/
+		configure: function (chart) {
+			var renderer = this,
+				options = chart.options.tooltip,
+				borderWidth = options.borderWidth,
+				tooltipDiv = renderer.ttDiv,
+				tooltipDivStyle = options.style,
+				tooltipLine = renderer.ttLine,
+				padding = parseInt(tooltipDivStyle.padding, 10);
+
+			// Add border styling from options to the style
+			tooltipDivStyle = merge(tooltipDivStyle, {
+				padding: padding + PX,
+				'background-color': options.backgroundColor,
+				'border-style': 'solid',
+				'border-width': borderWidth + PX,
+				'border-radius': options.borderRadius + PX
+			});
+
+			// Optionally add shadow
+			if (options.shadow) {
+				tooltipDivStyle = merge(tooltipDivStyle, {
+					'box-shadow': '1px 1px 3px gray', // w3c
+					'-webkit-box-shadow': '1px 1px 3px gray' // webkit
+				});
+			}
+			css(tooltipDiv, tooltipDivStyle);
+
+			// Set simple style on the line
+			css(tooltipLine, {
+				'border-left': '1px solid darkgray'
+			});
+
+			// This event is triggered when a new tooltip should be shown
+			addEvent(chart, 'tooltipRefresh', function (args) {
+				var chartContainer = chart.container,
+					offsetLeft = chartContainer.offsetLeft,
+					offsetTop = chartContainer.offsetTop,
+					position;
+
+				// Set the content of the tooltip
+				tooltipDiv.innerHTML = args.text;
+
+				// Compute the best position for the tooltip based on the divs size and container size.
+				position = chart.tooltip.getPosition(tooltipDiv.offsetWidth, tooltipDiv.offsetHeight, {plotX: args.x, plotY: args.y});
+
+				css(tooltipDiv, {
+					visibility: VISIBLE,
+					left: position.x + PX,
+					top: position.y + PX,
+					'border-color': args.borderColor
+				});
+
+				// Position the tooltip line
+				css(tooltipLine, {
+					visibility: VISIBLE,
+					left: offsetLeft + args.x + PX,
+					top: offsetTop + chart.plotTop + PX,
+					height: chart.plotHeight  + PX
+				});
+
+				// This timeout hides the tooltip after 3 seconds
+				// First clear any existing timer
+				if (renderer.ttTimer !== UNDEFINED) {
+					clearTimeout(renderer.ttTimer);
+				}
+
+				// Start a new timer that hides tooltip and line
+				renderer.ttTimer = setTimeout(function () {
+					css(tooltipDiv, { visibility: HIDDEN });
+					css(tooltipLine, { visibility: HIDDEN });
+				}, 3000);
+			});
+		},
+
+		/**
+		 * Extend SVGRenderer.destroy to also destroy the elements added by CanVGRenderer.
+		 */
+		destroy: function () {
+			var renderer = this;
+
+			// Remove the canvas
+			discardElement(renderer.canvas);
+
+			// Kill the timer
+			if (renderer.ttTimer !== UNDEFINED) {
+				clearTimeout(renderer.ttTimer);
+			}
+
+			// Remove the divs for tooltip and line
+			discardElement(renderer.ttLine);
+			discardElement(renderer.ttDiv);
+			discardElement(renderer.hiddenSvg);
+
+			// Continue with base class
+			return SVGRenderer.prototype.destroy.apply(renderer);
+		},
+
+		/**
+		 * Take a color and return it if it's a string, do not make it a gradient even if it is a
+		 * gradient. Currently canvg cannot render gradients (turns out black),
+		 * see: http://code.google.com/p/canvg/issues/detail?id=104
+		 *
+		 * @param {Object} color The color or config object
+		 */
+		color: function (color, elem, prop) {
+			if (color && color.linearGradient) {
+				// Pick the end color and forward to base implementation
+				color = color.stops[color.stops.length - 1][1];
+			}
+			return SVGRenderer.prototype.color.call(this, color, elem, prop);
+		},
+
+		/**
+		 * Draws the SVG on the canvas or adds a draw invokation to the deferred list.
+		 */
+		draw: function () {
+			var renderer = this;
+			window.canvg(renderer.canvas, renderer.hiddenSvg.innerHTML);
+		}
+	});
+}(Highcharts));
diff --git a/data/interfaces/default/js/highcharts/js/modules/data.js b/data/interfaces/default/js/highcharts/js/modules/data.js
new file mode 100644
index 00000000..4bb7de1a
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/modules/data.js
@@ -0,0 +1,26 @@
+/*
+ Highcharts JS v4.1.6 (2015-06-12)
+ Data module
+
+ (c) 2012-2014 Torstein Honsi
+
+ License: www.highcharts.com/license
+*/
+(function(g){var k=g.each,t=g.pick,r=HighchartsAdapter.inArray,u=g.splat,j,p=function(b,a){this.init(b,a)};g.extend(p.prototype,{init:function(b,a){this.options=b;this.chartOptions=a;this.columns=b.columns||this.rowsToColumns(b.rows)||[];this.firstRowAsNames=t(b.firstRowAsNames,!0);this.decimalRegex=b.decimalPoint&&RegExp("^([0-9]+)"+b.decimalPoint+"([0-9]+)$");this.rawColumns=[];this.columns.length?this.dataFound():(this.parseCSV(),this.parseTable(),this.parseGoogleSpreadsheet())},getColumnDistribution:function(){var b=
+this.chartOptions,a=this.options,e=[],f=function(b){return(g.seriesTypes[b||"line"].prototype.pointArrayMap||[0]).length},d=b&&b.chart&&b.chart.type,c=[],h=[],n=0,i;k(b&&b.series||[],function(b){c.push(f(b.type||d))});k(a&&a.seriesMapping||[],function(b){e.push(b.x||0)});e.length===0&&e.push(0);k(a&&a.seriesMapping||[],function(a){var e=new j,o,q=c[n]||f(d),m=g.seriesTypes[((b&&b.series||[])[n]||{}).type||d||"line"].prototype.pointArrayMap||["y"];e.addColumnReader(a.x,"x");for(o in a)a.hasOwnProperty(o)&&
+o!=="x"&&e.addColumnReader(a[o],o);for(i=0;i<q;i++)e.hasReader(m[i])||e.addColumnReader(void 0,m[i]);h.push(e);n++});a=g.seriesTypes[d||"line"].prototype.pointArrayMap;a===void 0&&(a=["y"]);this.valueCount={global:f(d),xColumns:e,individual:c,seriesBuilders:h,globalPointArrayMap:a}},dataFound:function(){if(this.options.switchRowsAndColumns)this.columns=this.rowsToColumns(this.columns);this.getColumnDistribution();this.parseTypes();this.parsed()!==!1&&this.complete()},parseCSV:function(){var b=this,
+a=this.options,e=a.csv,f=this.columns,d=a.startRow||0,c=a.endRow||Number.MAX_VALUE,h=a.startColumn||0,n=a.endColumn||Number.MAX_VALUE,i,g,s=0;e&&(g=e.replace(/\r\n/g,"\n").replace(/\r/g,"\n").split(a.lineDelimiter||"\n"),i=a.itemDelimiter||(e.indexOf("\t")!==-1?"\t":","),k(g,function(a,e){var g=b.trim(a),v=g.indexOf("#")===0;e>=d&&e<=c&&!v&&g!==""&&(g=a.split(i),k(g,function(b,a){a>=h&&a<=n&&(f[a-h]||(f[a-h]=[]),f[a-h][s]=b)}),s+=1)}),this.dataFound())},parseTable:function(){var b=this.options,a=
+b.table,e=this.columns,f=b.startRow||0,d=b.endRow||Number.MAX_VALUE,c=b.startColumn||0,h=b.endColumn||Number.MAX_VALUE;a&&(typeof a==="string"&&(a=document.getElementById(a)),k(a.getElementsByTagName("tr"),function(b,a){a>=f&&a<=d&&k(b.children,function(b,d){if((b.tagName==="TD"||b.tagName==="TH")&&d>=c&&d<=h)e[d-c]||(e[d-c]=[]),e[d-c][a-f]=b.innerHTML})}),this.dataFound())},parseGoogleSpreadsheet:function(){var b=this,a=this.options,e=a.googleSpreadsheetKey,f=this.columns,d=a.startRow||0,c=a.endRow||
+Number.MAX_VALUE,h=a.startColumn||0,n=a.endColumn||Number.MAX_VALUE,i,g;e&&jQuery.ajax({dataType:"json",url:"https://spreadsheets.google.com/feeds/cells/"+e+"/"+(a.googleSpreadsheetWorksheet||"od6")+"/public/values?alt=json-in-script&callback=?",error:a.error,success:function(a){var a=a.feed.entry,e,k=a.length,m=0,j=0,l;for(l=0;l<k;l++)e=a[l],m=Math.max(m,e.gs$cell.col),j=Math.max(j,e.gs$cell.row);for(l=0;l<m;l++)if(l>=h&&l<=n)f[l-h]=[],f[l-h].length=Math.min(j,c-d);for(l=0;l<k;l++)if(e=a[l],i=e.gs$cell.row-
+1,g=e.gs$cell.col-1,g>=h&&g<=n&&i>=d&&i<=c)f[g-h][i-d]=e.content.$t;b.dataFound()}})},trim:function(b,a){typeof b==="string"&&(b=b.replace(/^\s+|\s+$/g,""),a&&/^[0-9\s]+$/.test(b)&&(b=b.replace(/\s/g,"")),this.decimalRegex&&(b=b.replace(this.decimalRegex,"$1.$2")));return b},parseTypes:function(){for(var b=this.columns,a=b.length;a--;)this.parseColumn(b[a],a)},parseColumn:function(b,a){var e=this.rawColumns,f=this.columns,d=b.length,c,h,g,i,k=this.firstRowAsNames,j=r(a,this.valueCount.xColumns)!==
+-1,o=[],q=this.chartOptions,m,p=(this.options.columnTypes||[])[a],q=j&&(q&&q.xAxis&&u(q.xAxis)[0].type==="category"||p==="string");for(e[a]||(e[a]=[]);d--;)if(c=o[d]||b[d],g=this.trim(c),i=this.trim(c,!0),h=parseFloat(i),e[a][d]===void 0&&(e[a][d]=g),q||d===0&&k)b[d]=g;else if(+i===h)b[d]=h,h>31536E6&&p!=="float"?b.isDatetime=!0:b.isNumeric=!0,b[d+1]!==void 0&&(m=h>b[d+1]);else if(h=this.parseDate(c),j&&typeof h==="number"&&!isNaN(h)&&p!=="float"){if(o[d]=c,b[d]=h,b.isDatetime=!0,b[d+1]!==void 0){c=
+h>b[d+1];if(c!==m&&m!==void 0)this.alternativeFormat?(this.dateFormat=this.alternativeFormat,d=b.length,this.alternativeFormat=this.dateFormats[this.dateFormat].alternative):b.unsorted=!0;m=c}}else if(b[d]=g===""?null:g,d!==0&&(b.isDatetime||b.isNumeric))b.mixed=!0;j&&b.mixed&&(f[a]=e[a]);if(j&&m&&this.options.sort)for(a=0;a<f.length;a++)f[a].reverse(),k&&f[a].unshift(f[a].pop())},dateFormats:{"YYYY-mm-dd":{regex:/^([0-9]{4})[\-\/\.]([0-9]{2})[\-\/\.]([0-9]{2})$/,parser:function(b){return Date.UTC(+b[1],
+b[2]-1,+b[3])}},"dd/mm/YYYY":{regex:/^([0-9]{1,2})[\-\/\.]([0-9]{1,2})[\-\/\.]([0-9]{4})$/,parser:function(b){return Date.UTC(+b[3],b[2]-1,+b[1])},alternative:"mm/dd/YYYY"},"mm/dd/YYYY":{regex:/^([0-9]{1,2})[\-\/\.]([0-9]{1,2})[\-\/\.]([0-9]{4})$/,parser:function(b){return Date.UTC(+b[3],b[1]-1,+b[2])}},"dd/mm/YY":{regex:/^([0-9]{1,2})[\-\/\.]([0-9]{1,2})[\-\/\.]([0-9]{2})$/,parser:function(b){return Date.UTC(+b[3]+2E3,b[2]-1,+b[1])},alternative:"mm/dd/YY"},"mm/dd/YY":{regex:/^([0-9]{1,2})[\-\/\.]([0-9]{1,2})[\-\/\.]([0-9]{2})$/,
+parser:function(b){return Date.UTC(+b[3]+2E3,b[1]-1,+b[2])}}},parseDate:function(b){var a=this.options.parseDate,e,f,d=this.options.dateFormat||this.dateFormat,c;if(a)e=a(b);else if(typeof b==="string"){if(d)a=this.dateFormats[d],(c=b.match(a.regex))&&(e=a.parser(c));else for(f in this.dateFormats)if(a=this.dateFormats[f],c=b.match(a.regex)){this.dateFormat=f;this.alternativeFormat=a.alternative;e=a.parser(c);break}c||(c=Date.parse(b),typeof c==="object"&&c!==null&&c.getTime?e=c.getTime()-c.getTimezoneOffset()*
+6E4:typeof c==="number"&&!isNaN(c)&&(e=c-(new Date(c)).getTimezoneOffset()*6E4))}return e},rowsToColumns:function(b){var a,e,f,d,c;if(b){c=[];e=b.length;for(a=0;a<e;a++){d=b[a].length;for(f=0;f<d;f++)c[f]||(c[f]=[]),c[f][a]=b[a][f]}}return c},parsed:function(){if(this.options.parsed)return this.options.parsed.call(this,this.columns)},getFreeIndexes:function(b,a){var e,f,d=[],c=[],h;for(f=0;f<b;f+=1)d.push(!0);for(e=0;e<a.length;e+=1){h=a[e].getReferencedColumnIndexes();for(f=0;f<h.length;f+=1)d[h[f]]=
+!1}for(f=0;f<d.length;f+=1)d[f]&&c.push(f);return c},complete:function(){var b=this.columns,a,e=this.options,f,d,c,h,g=[],i;if(e.complete||e.afterComplete){for(c=0;c<b.length;c++)if(this.firstRowAsNames)b[c].name=b[c].shift();f=[];d=this.getFreeIndexes(b.length,this.valueCount.seriesBuilders);for(c=0;c<this.valueCount.seriesBuilders.length;c++)i=this.valueCount.seriesBuilders[c],i.populateColumns(d)&&g.push(i);for(;d.length>0;){i=new j;i.addColumnReader(0,"x");c=r(0,d);c!==-1&&d.splice(c,1);for(c=
+0;c<this.valueCount.global;c++)i.addColumnReader(void 0,this.valueCount.globalPointArrayMap[c]);i.populateColumns(d)&&g.push(i)}g.length>0&&g[0].readers.length>0&&(i=b[g[0].readers[0].columnIndex],i!==void 0&&(i.isDatetime?a="datetime":i.isNumeric||(a="category")));if(a==="category")for(c=0;c<g.length;c++){i=g[c];for(d=0;d<i.readers.length;d++)if(i.readers[d].configName==="x")i.readers[d].configName="name"}for(c=0;c<g.length;c++){i=g[c];d=[];for(h=0;h<b[0].length;h++)d[h]=i.read(b,h);f[c]={data:d};
+if(i.name)f[c].name=i.name;if(a==="category")f[c].turboThreshold=0}b={series:f};if(a)b.xAxis={type:a};e.complete&&e.complete(b);e.afterComplete&&e.afterComplete(b)}}});g.Data=p;g.data=function(b,a){return new p(b,a)};g.wrap(g.Chart.prototype,"init",function(b,a,e){var f=this;a&&a.data?g.data(g.extend(a.data,{afterComplete:function(d){var c,h;if(a.hasOwnProperty("series"))if(typeof a.series==="object")for(c=Math.max(a.series.length,d.series.length);c--;)h=a.series[c]||{},a.series[c]=g.merge(h,d.series[c]);
+else delete a.series;a=g.merge(d,a);b.call(f,a,e)}}),a):b.call(f,a,e)});j=function(){this.readers=[];this.pointIsArray=!0};j.prototype.populateColumns=function(b){var a=!0;k(this.readers,function(a){if(a.columnIndex===void 0)a.columnIndex=b.shift()});k(this.readers,function(b){b.columnIndex===void 0&&(a=!1)});return a};j.prototype.read=function(b,a){var e=this.pointIsArray,f=e?[]:{},d;k(this.readers,function(c){var d=b[c.columnIndex][a];e?f.push(d):f[c.configName]=d});if(this.name===void 0&&this.readers.length>=
+2&&(d=this.getReferencedColumnIndexes(),d.length>=2))d.shift(),d.sort(),this.name=b[d.shift()].name;return f};j.prototype.addColumnReader=function(b,a){this.readers.push({columnIndex:b,configName:a});if(!(a==="x"||a==="y"||a===void 0))this.pointIsArray=!1};j.prototype.getReferencedColumnIndexes=function(){var b,a=[],e;for(b=0;b<this.readers.length;b+=1)e=this.readers[b],e.columnIndex!==void 0&&a.push(e.columnIndex);return a};j.prototype.hasReader=function(b){var a,e;for(a=0;a<this.readers.length;a+=
+1)if(e=this.readers[a],e.configName===b)return!0}})(Highcharts);
diff --git a/data/interfaces/default/js/highcharts/js/modules/data.src.js b/data/interfaces/default/js/highcharts/js/modules/data.src.js
new file mode 100644
index 00000000..1dd3fc9e
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/modules/data.src.js
@@ -0,0 +1,953 @@
+/**
+ * @license Highcharts JS v4.1.6 (2015-06-12)
+ * Data module
+ *
+ * (c) 2012-2014 Torstein Honsi
+ *
+ * License: www.highcharts.com/license
+ */
+
+// JSLint options:
+/*global jQuery, HighchartsAdapter */
+
+(function (Highcharts) {
+	
+	// Utilities
+	var each = Highcharts.each,
+		pick = Highcharts.pick,
+		inArray = HighchartsAdapter.inArray,
+		splat = Highcharts.splat,
+		SeriesBuilder;
+	
+	
+	// The Data constructor
+	var Data = function (dataOptions, chartOptions) {
+		this.init(dataOptions, chartOptions);
+	};
+	
+	// Set the prototype properties
+	Highcharts.extend(Data.prototype, {
+		
+	/**
+	 * Initialize the Data object with the given options
+	 */
+	init: function (options, chartOptions) {
+		this.options = options;
+		this.chartOptions = chartOptions;
+		this.columns = options.columns || this.rowsToColumns(options.rows) || [];
+		this.firstRowAsNames = pick(options.firstRowAsNames, true);
+		this.decimalRegex = options.decimalPoint && new RegExp('^([0-9]+)' + options.decimalPoint + '([0-9]+)$');
+
+		// This is a two-dimensional array holding the raw, trimmed string values
+		// with the same organisation as the columns array. It makes it possible
+		// for example to revert from interpreted timestamps to string-based
+		// categories.
+		this.rawColumns = [];
+
+		// No need to parse or interpret anything
+		if (this.columns.length) {
+			this.dataFound();
+
+		// Parse and interpret
+		} else {
+
+			// Parse a CSV string if options.csv is given
+			this.parseCSV();
+			
+			// Parse a HTML table if options.table is given
+			this.parseTable();
+
+			// Parse a Google Spreadsheet 
+			this.parseGoogleSpreadsheet();	
+		}
+
+	},
+
+	/**
+	 * Get the column distribution. For example, a line series takes a single column for 
+	 * Y values. A range series takes two columns for low and high values respectively,
+	 * and an OHLC series takes four columns.
+	 */
+	getColumnDistribution: function () {
+		var chartOptions = this.chartOptions,
+			options = this.options,
+			xColumns = [],
+			getValueCount = function (type) {
+				return (Highcharts.seriesTypes[type || 'line'].prototype.pointArrayMap || [0]).length;
+			},
+			getPointArrayMap = function (type) {
+				return Highcharts.seriesTypes[type || 'line'].prototype.pointArrayMap;
+			},
+			globalType = chartOptions && chartOptions.chart && chartOptions.chart.type,
+			individualCounts = [],
+			seriesBuilders = [],
+			seriesIndex = 0,
+			i;
+
+		each((chartOptions && chartOptions.series) || [], function (series) {
+			individualCounts.push(getValueCount(series.type || globalType));
+		});
+
+		// Collect the x-column indexes from seriesMapping
+		each((options && options.seriesMapping) || [], function (mapping) {
+			xColumns.push(mapping.x || 0);
+		});
+
+		// If there are no defined series with x-columns, use the first column as x column
+		if (xColumns.length === 0) {
+			xColumns.push(0);
+		}
+
+		// Loop all seriesMappings and constructs SeriesBuilders from
+		// the mapping options.
+		each((options && options.seriesMapping) || [], function (mapping) {
+			var builder = new SeriesBuilder(),
+				name,
+				numberOfValueColumnsNeeded = individualCounts[seriesIndex] || getValueCount(globalType),
+				seriesArr = (chartOptions && chartOptions.series) || [],
+				series = seriesArr[seriesIndex] || {},
+				pointArrayMap = getPointArrayMap(series.type || globalType) || ['y'];
+
+			// Add an x reader from the x property or from an undefined column
+			// if the property is not set. It will then be auto populated later.
+			builder.addColumnReader(mapping.x, 'x');
+
+			// Add all column mappings
+			for (name in mapping) {
+				if (mapping.hasOwnProperty(name) && name !== 'x') {
+					builder.addColumnReader(mapping[name], name);
+				}
+			}
+
+			// Add missing columns
+			for (i = 0; i < numberOfValueColumnsNeeded; i++) {
+				if (!builder.hasReader(pointArrayMap[i])) {
+					//builder.addNextColumnReader(pointArrayMap[i]);
+					// Create and add a column reader for the next free column index
+					builder.addColumnReader(undefined, pointArrayMap[i]);
+				}
+			}
+
+			seriesBuilders.push(builder);
+			seriesIndex++;
+		});
+
+		var globalPointArrayMap = getPointArrayMap(globalType);
+		if (globalPointArrayMap === undefined) {
+			globalPointArrayMap = ['y'];
+		}
+
+		this.valueCount = {
+			global: getValueCount(globalType),
+			xColumns: xColumns,
+			individual: individualCounts,
+			seriesBuilders: seriesBuilders,
+			globalPointArrayMap: globalPointArrayMap
+		};
+	},
+
+	/**
+	 * When the data is parsed into columns, either by CSV, table, GS or direct input,
+	 * continue with other operations.
+	 */
+	dataFound: function () {
+		
+		if (this.options.switchRowsAndColumns) {
+			this.columns = this.rowsToColumns(this.columns);
+		}
+
+		// Interpret the info about series and columns
+		this.getColumnDistribution();
+
+		// Interpret the values into right types
+		this.parseTypes();
+		
+		// Handle columns if a handleColumns callback is given
+		if (this.parsed() !== false) {
+		
+			// Complete if a complete callback is given
+			this.complete();
+		}
+		
+	},
+	
+	/**
+	 * Parse a CSV input string
+	 */
+	parseCSV: function () {
+		var self = this,
+			options = this.options,
+			csv = options.csv,
+			columns = this.columns,
+			startRow = options.startRow || 0,
+			endRow = options.endRow || Number.MAX_VALUE,
+			startColumn = options.startColumn || 0,
+			endColumn = options.endColumn || Number.MAX_VALUE,
+			itemDelimiter,
+			lines,
+			activeRowNo = 0;
+			
+		if (csv) {
+			
+			lines = csv
+				.replace(/\r\n/g, "\n") // Unix
+				.replace(/\r/g, "\n") // Mac
+				.split(options.lineDelimiter || "\n");
+
+			itemDelimiter = options.itemDelimiter || (csv.indexOf('\t') !== -1 ? '\t' : ',');
+			
+			each(lines, function (line, rowNo) {
+				var trimmed = self.trim(line),
+					isComment = trimmed.indexOf('#') === 0,
+					isBlank = trimmed === '',
+					items;
+				
+				if (rowNo >= startRow && rowNo <= endRow && !isComment && !isBlank) {
+					items = line.split(itemDelimiter);
+					each(items, function (item, colNo) {
+						if (colNo >= startColumn && colNo <= endColumn) {
+							if (!columns[colNo - startColumn]) {
+								columns[colNo - startColumn] = [];					
+							}
+							
+							columns[colNo - startColumn][activeRowNo] = item;
+						}
+					});
+					activeRowNo += 1;
+				}
+			});
+
+			this.dataFound();
+		}
+	},
+	
+	/**
+	 * Parse a HTML table
+	 */
+	parseTable: function () {
+		var options = this.options,
+			table = options.table,
+			columns = this.columns,
+			startRow = options.startRow || 0,
+			endRow = options.endRow || Number.MAX_VALUE,
+			startColumn = options.startColumn || 0,
+			endColumn = options.endColumn || Number.MAX_VALUE;
+
+		if (table) {
+			
+			if (typeof table === 'string') {
+				table = document.getElementById(table);
+			}
+			
+			each(table.getElementsByTagName('tr'), function (tr, rowNo) {
+				if (rowNo >= startRow && rowNo <= endRow) {
+					each(tr.children, function (item, colNo) {
+						if ((item.tagName === 'TD' || item.tagName === 'TH') && colNo >= startColumn && colNo <= endColumn) {
+							if (!columns[colNo - startColumn]) {
+								columns[colNo - startColumn] = [];					
+							}
+							
+							columns[colNo - startColumn][rowNo - startRow] = item.innerHTML;
+						}
+					});
+				}
+			});
+
+			this.dataFound(); // continue
+		}
+	},
+
+	/**
+	 */
+	parseGoogleSpreadsheet: function () {
+		var self = this,
+			options = this.options,
+			googleSpreadsheetKey = options.googleSpreadsheetKey,
+			columns = this.columns,
+			startRow = options.startRow || 0,
+			endRow = options.endRow || Number.MAX_VALUE,
+			startColumn = options.startColumn || 0,
+			endColumn = options.endColumn || Number.MAX_VALUE,
+			gr, // google row
+			gc; // google column
+
+		if (googleSpreadsheetKey) {
+			jQuery.ajax({
+				dataType: 'json', 
+				url: 'https://spreadsheets.google.com/feeds/cells/' + 
+				  googleSpreadsheetKey + '/' + (options.googleSpreadsheetWorksheet || 'od6') +
+					  '/public/values?alt=json-in-script&callback=?',
+				error: options.error,
+				success: function (json) {
+					// Prepare the data from the spreadsheat
+					var cells = json.feed.entry,
+						cell,
+						cellCount = cells.length,
+						colCount = 0,
+						rowCount = 0,
+						i;
+				
+					// First, find the total number of columns and rows that 
+					// are actually filled with data
+					for (i = 0; i < cellCount; i++) {
+						cell = cells[i];
+						colCount = Math.max(colCount, cell.gs$cell.col);
+						rowCount = Math.max(rowCount, cell.gs$cell.row);			
+					}
+				
+					// Set up arrays containing the column data
+					for (i = 0; i < colCount; i++) {
+						if (i >= startColumn && i <= endColumn) {
+							// Create new columns with the length of either end-start or rowCount
+							columns[i - startColumn] = [];
+
+							// Setting the length to avoid jslint warning
+							columns[i - startColumn].length = Math.min(rowCount, endRow - startRow);
+						}
+					}
+					
+					// Loop over the cells and assign the value to the right
+					// place in the column arrays
+					for (i = 0; i < cellCount; i++) {
+						cell = cells[i];
+						gr = cell.gs$cell.row - 1; // rows start at 1
+						gc = cell.gs$cell.col - 1; // columns start at 1
+
+						// If both row and col falls inside start and end
+						// set the transposed cell value in the newly created columns
+						if (gc >= startColumn && gc <= endColumn &&
+							gr >= startRow && gr <= endRow) {
+							columns[gc - startColumn][gr - startRow] = cell.content.$t;
+						}
+					}
+					self.dataFound();
+				}
+			});
+		}
+	},
+	
+	/**
+	 * Trim a string from whitespace
+	 */
+	trim: function (str, inside) {
+		if (typeof str === 'string') {
+			str = str.replace(/^\s+|\s+$/g, '');
+
+			// Clear white space insdie the string, like thousands separators
+			if (inside && /^[0-9\s]+$/.test(str)) { 
+				str = str.replace(/\s/g, '');
+			}
+
+			if (this.decimalRegex) {
+				str = str.replace(this.decimalRegex, '$1.$2');
+			}
+		}
+		return str;
+	},
+	
+	/**
+	 * Parse numeric cells in to number types and date types in to true dates.
+	 */
+	parseTypes: function () {
+		var columns = this.columns,
+			col = columns.length;
+
+		while (col--) {
+			this.parseColumn(columns[col], col);
+		}
+
+	},
+
+	/**
+	 * Parse a single column. Set properties like .isDatetime and .isNumeric.
+	 */
+	parseColumn: function (column, col) {
+		var rawColumns = this.rawColumns,
+			columns = this.columns, 
+			row = column.length,
+			val,
+			floatVal,
+			trimVal,
+			trimInsideVal,
+			firstRowAsNames = this.firstRowAsNames,
+			isXColumn = inArray(col, this.valueCount.xColumns) !== -1,
+			dateVal,
+			backup = [],
+			diff,
+			chartOptions = this.chartOptions,
+			descending,
+			columnTypes = this.options.columnTypes || [],
+			columnType = columnTypes[col],
+			forceCategory = isXColumn && ((chartOptions && chartOptions.xAxis && splat(chartOptions.xAxis)[0].type === 'category') || columnType === 'string');
+		
+		if (!rawColumns[col]) {
+			rawColumns[col] = [];
+		}
+		while (row--) {
+			val = backup[row] || column[row];
+			
+			trimVal = this.trim(val);
+			trimInsideVal = this.trim(val, true);
+			floatVal = parseFloat(trimInsideVal);
+
+			// Set it the first time
+			if (rawColumns[col][row] === undefined) {
+				rawColumns[col][row] = trimVal;
+			}
+			
+			// Disable number or date parsing by setting the X axis type to category
+			if (forceCategory || (row === 0 && firstRowAsNames)) {
+				column[row] = trimVal;
+
+			} else if (+trimInsideVal === floatVal) { // is numeric
+			
+				column[row] = floatVal;
+				
+				// If the number is greater than milliseconds in a year, assume datetime
+				if (floatVal > 365 * 24 * 3600 * 1000 && columnType !== 'float') {
+					column.isDatetime = true;
+				} else {
+					column.isNumeric = true;
+				}
+
+				if (column[row + 1] !== undefined) {
+					descending = floatVal > column[row + 1];
+				}
+			
+			// String, continue to determine if it is a date string or really a string
+			} else {
+				dateVal = this.parseDate(val);
+				// Only allow parsing of dates if this column is an x-column
+				if (isXColumn && typeof dateVal === 'number' && !isNaN(dateVal) && columnType !== 'float') { // is date
+					backup[row] = val; 
+					column[row] = dateVal;
+					column.isDatetime = true;
+
+					// Check if the dates are uniformly descending or ascending. If they 
+					// are not, chances are that they are a different time format, so check
+					// for alternative.
+					if (column[row + 1] !== undefined) {
+						diff = dateVal > column[row + 1];
+						if (diff !== descending && descending !== undefined) {
+							if (this.alternativeFormat) {
+								this.dateFormat = this.alternativeFormat;
+								row = column.length;
+								this.alternativeFormat = this.dateFormats[this.dateFormat].alternative;
+							} else {
+								column.unsorted = true;
+							}
+						}
+						descending = diff;
+					}
+				
+				} else { // string
+					column[row] = trimVal === '' ? null : trimVal;
+					if (row !== 0 && (column.isDatetime || column.isNumeric)) {
+						column.mixed = true;
+					}
+				}
+			}
+		}
+
+		// If strings are intermixed with numbers or dates in a parsed column, it is an indication
+		// that parsing went wrong or the data was not intended to display as numbers or dates and 
+		// parsing is too aggressive. Fall back to categories. Demonstrated in the 
+		// highcharts/demo/column-drilldown sample.
+		if (isXColumn && column.mixed) {
+			columns[col] = rawColumns[col];
+		}
+
+		// If the 0 column is date or number and descending, reverse all columns. 
+		if (isXColumn && descending && this.options.sort) {
+			for (col = 0; col < columns.length; col++) {
+				columns[col].reverse();
+				if (firstRowAsNames) {
+					columns[col].unshift(columns[col].pop());
+				}
+			}
+		}
+	},
+	
+	/**
+	 * A collection of available date formats, extendable from the outside to support
+	 * custom date formats.
+	 */
+	dateFormats: {
+		'YYYY-mm-dd': {
+			regex: /^([0-9]{4})[\-\/\.]([0-9]{2})[\-\/\.]([0-9]{2})$/,
+			parser: function (match) {
+				return Date.UTC(+match[1], match[2] - 1, +match[3]);
+			}
+		},
+		'dd/mm/YYYY': {
+			regex: /^([0-9]{1,2})[\-\/\.]([0-9]{1,2})[\-\/\.]([0-9]{4})$/,
+			parser: function (match) {
+				return Date.UTC(+match[3], match[2] - 1, +match[1]);
+			},
+			alternative: 'mm/dd/YYYY' // different format with the same regex
+		},
+		'mm/dd/YYYY': {
+			regex: /^([0-9]{1,2})[\-\/\.]([0-9]{1,2})[\-\/\.]([0-9]{4})$/,
+			parser: function (match) {
+				return Date.UTC(+match[3], match[1] - 1, +match[2]);
+			}
+		},
+		'dd/mm/YY': {
+			regex: /^([0-9]{1,2})[\-\/\.]([0-9]{1,2})[\-\/\.]([0-9]{2})$/,
+			parser: function (match) {
+				return Date.UTC(+match[3] + 2000, match[2] - 1, +match[1]);
+			},
+			alternative: 'mm/dd/YY' // different format with the same regex
+		},
+		'mm/dd/YY': {
+			regex: /^([0-9]{1,2})[\-\/\.]([0-9]{1,2})[\-\/\.]([0-9]{2})$/,
+			parser: function (match) {
+				return Date.UTC(+match[3] + 2000, match[1] - 1, +match[2]);
+			}
+		}
+	},
+	
+	/**
+	 * Parse a date and return it as a number. Overridable through options.parseDate.
+	 */
+	parseDate: function (val) {
+		var parseDate = this.options.parseDate,
+			ret,
+			key,
+			format,
+			dateFormat = this.options.dateFormat || this.dateFormat,
+			match;
+
+		if (parseDate) {
+			ret = parseDate(val);
+		
+		} else if (typeof val === 'string') {
+			// Auto-detect the date format the first time
+			if (!dateFormat) {
+				for (key in this.dateFormats) {
+					format = this.dateFormats[key];
+					match = val.match(format.regex);
+					if (match) {
+						this.dateFormat = dateFormat = key;
+						this.alternativeFormat = format.alternative;
+						ret = format.parser(match);
+						break;
+					}
+				}
+			// Next time, use the one previously found
+			} else {
+				format = this.dateFormats[dateFormat];
+				match = val.match(format.regex);
+				if (match) {
+					ret = format.parser(match);
+				}
+			}
+			// Fall back to Date.parse		
+			if (!match) {
+				match = Date.parse(val);
+				// External tools like Date.js and MooTools extend Date object and
+				// returns a date.
+				if (typeof match === 'object' && match !== null && match.getTime) {
+					ret = match.getTime() - match.getTimezoneOffset() * 60000;
+				
+				// Timestamp
+				} else if (typeof match === 'number' && !isNaN(match)) {
+					ret = match - (new Date(match)).getTimezoneOffset() * 60000;
+				}
+			}
+		}
+		return ret;
+	},
+	
+	/**
+	 * Reorganize rows into columns
+	 */
+	rowsToColumns: function (rows) {
+		var row,
+			rowsLength,
+			col,
+			colsLength,
+			columns;
+
+		if (rows) {
+			columns = [];
+			rowsLength = rows.length;
+			for (row = 0; row < rowsLength; row++) {
+				colsLength = rows[row].length;
+				for (col = 0; col < colsLength; col++) {
+					if (!columns[col]) {
+						columns[col] = [];
+					}
+					columns[col][row] = rows[row][col];
+				}
+			}
+		}
+		return columns;
+	},
+	
+	/**
+	 * A hook for working directly on the parsed columns
+	 */
+	parsed: function () {
+		if (this.options.parsed) {
+			return this.options.parsed.call(this, this.columns);
+		}
+	},
+
+	getFreeIndexes: function (numberOfColumns, seriesBuilders) {
+		var s,
+			i,
+			freeIndexes = [],
+			freeIndexValues = [],
+			referencedIndexes;
+
+		// Add all columns as free
+		for (i = 0; i < numberOfColumns; i = i + 1) {
+			freeIndexes.push(true);
+		}
+
+		// Loop all defined builders and remove their referenced columns
+		for (s = 0; s < seriesBuilders.length; s = s + 1) {
+			referencedIndexes = seriesBuilders[s].getReferencedColumnIndexes();
+
+			for (i = 0; i < referencedIndexes.length; i = i + 1) {
+				freeIndexes[referencedIndexes[i]] = false;
+			}
+		}
+
+		// Collect the values for the free indexes
+		for (i = 0; i < freeIndexes.length; i = i + 1) {
+			if (freeIndexes[i]) {
+				freeIndexValues.push(i);
+			}
+		}
+
+		return freeIndexValues;
+	},
+	
+	/**
+	 * If a complete callback function is provided in the options, interpret the 
+	 * columns into a Highcharts options object.
+	 */
+	complete: function () {
+		
+		var columns = this.columns,
+			xColumns = [],
+			type,
+			options = this.options,
+			series,
+			data,
+			i,
+			j,
+			r,
+			seriesIndex,
+			chartOptions,
+			allSeriesBuilders = [],
+			builder,
+			freeIndexes,
+			typeCol,
+			index;
+
+		xColumns.length = columns.length;
+		if (options.complete || options.afterComplete) {
+
+			// Get the names and shift the top row
+			for (i = 0; i < columns.length; i++) {
+				if (this.firstRowAsNames) {
+					columns[i].name = columns[i].shift();
+				}
+			}
+			
+			// Use the next columns for series
+			series = [];
+			freeIndexes = this.getFreeIndexes(columns.length, this.valueCount.seriesBuilders);
+
+			// Populate defined series
+			for (seriesIndex = 0; seriesIndex < this.valueCount.seriesBuilders.length; seriesIndex++) {
+				builder = this.valueCount.seriesBuilders[seriesIndex];
+
+				// If the builder can be populated with remaining columns, then add it to allBuilders
+				if (builder.populateColumns(freeIndexes)) {
+					allSeriesBuilders.push(builder);
+				}
+			}
+
+			// Populate dynamic series
+			while (freeIndexes.length > 0) {
+				builder = new SeriesBuilder();
+				builder.addColumnReader(0, 'x');
+				
+				// Mark index as used (not free)
+				index = inArray(0, freeIndexes);
+				if (index !== -1) {
+					freeIndexes.splice(index, 1);
+				}
+
+				for (i = 0; i < this.valueCount.global; i++) {
+					// Create and add a column reader for the next free column index
+					builder.addColumnReader(undefined, this.valueCount.globalPointArrayMap[i]);
+				}
+
+				// If the builder can be populated with remaining columns, then add it to allBuilders
+				if (builder.populateColumns(freeIndexes)) {
+					allSeriesBuilders.push(builder);
+				}
+			}
+
+			// Get the data-type from the first series x column
+			if (allSeriesBuilders.length > 0 && allSeriesBuilders[0].readers.length > 0) {
+				typeCol = columns[allSeriesBuilders[0].readers[0].columnIndex];
+				if (typeCol !== undefined) {
+					if (typeCol.isDatetime) {
+						type = 'datetime';
+					} else if (!typeCol.isNumeric) {
+						type = 'category';
+					}
+				}
+			}
+			// Axis type is category, then the "x" column should be called "name"
+			if (type === 'category') {
+				for (seriesIndex = 0; seriesIndex < allSeriesBuilders.length; seriesIndex++) {
+					builder = allSeriesBuilders[seriesIndex];
+					for (r = 0; r < builder.readers.length; r++) {
+						if (builder.readers[r].configName === 'x') {
+							builder.readers[r].configName = 'name';
+						}
+					}
+				}
+			}
+
+			// Read data for all builders
+			for (seriesIndex = 0; seriesIndex < allSeriesBuilders.length; seriesIndex++) {
+				builder = allSeriesBuilders[seriesIndex];
+
+				// Iterate down the cells of each column and add data to the series
+				data = [];
+				for (j = 0; j < columns[0].length; j++) { // TODO: which column's length should we use here
+					data[j] = builder.read(columns, j);
+				}
+
+				// Add the series
+				series[seriesIndex] = {
+					data: data
+				};
+				if (builder.name) {
+					series[seriesIndex].name = builder.name;
+				}
+				if (type === 'category') {
+					series[seriesIndex].turboThreshold = 0;
+				}
+			}
+
+
+
+			// Do the callback
+			chartOptions = {
+				series: series
+			};
+			if (type) {
+				chartOptions.xAxis = {
+					type: type
+				};
+			}
+			
+			if (options.complete) {
+				options.complete(chartOptions);
+			}
+
+			// The afterComplete hook is used internally to avoid conflict with the externally
+			// available complete option.
+			if (options.afterComplete) {
+				options.afterComplete(chartOptions);
+			}
+		}
+	}
+	});
+	
+	// Register the Data prototype and data function on Highcharts
+	Highcharts.Data = Data;
+	Highcharts.data = function (options, chartOptions) {
+		return new Data(options, chartOptions);
+	};
+
+	// Extend Chart.init so that the Chart constructor accepts a new configuration
+	// option group, data.
+	Highcharts.wrap(Highcharts.Chart.prototype, 'init', function (proceed, userOptions, callback) {
+		var chart = this;
+
+		if (userOptions && userOptions.data) {
+			Highcharts.data(Highcharts.extend(userOptions.data, {
+
+				afterComplete: function (dataOptions) {
+					var i, series;
+					
+					// Merge series configs
+					if (userOptions.hasOwnProperty('series')) {
+						if (typeof userOptions.series === 'object') {
+							i = Math.max(userOptions.series.length, dataOptions.series.length);
+							while (i--) {
+								series = userOptions.series[i] || {};
+								userOptions.series[i] = Highcharts.merge(series, dataOptions.series[i]);
+							}
+						} else { // Allow merging in dataOptions.series (#2856)
+							delete userOptions.series;
+						}
+					}
+
+					// Do the merge
+					userOptions = Highcharts.merge(dataOptions, userOptions);
+
+					proceed.call(chart, userOptions, callback);
+				}
+			}), userOptions);
+		} else {
+			proceed.call(chart, userOptions, callback);
+		}
+	});
+
+	/**
+	 * Creates a new SeriesBuilder. A SeriesBuilder consists of a number
+	 * of ColumnReaders that reads columns and give them a name.
+	 * Ex: A series builder can be constructed to read column 3 as 'x' and
+	 * column 7 and 8 as 'y1' and 'y2'.
+	 * The output would then be points/rows of the form {x: 11, y1: 22, y2: 33}
+	 * 
+	 * The name of the builder is taken from the second column. In the above
+	 * example it would be the column with index 7.
+	 * @constructor
+	 */
+	SeriesBuilder = function () {
+		this.readers = [];
+		this.pointIsArray = true;
+	};
+
+	/**
+	 * Populates readers with column indexes. A reader can be added without
+	 * a specific index and for those readers the index is taken sequentially
+	 * from the free columns (this is handled by the ColumnCursor instance).
+	 * @returns {boolean}
+	 */
+	SeriesBuilder.prototype.populateColumns = function (freeIndexes) {
+		var builder = this,
+			enoughColumns = true;
+
+		// Loop each reader and give it an index if its missing.
+		// The freeIndexes.shift() will return undefined if there
+		// are no more columns.
+		each(builder.readers, function (reader) {
+			if (reader.columnIndex === undefined) {
+				reader.columnIndex = freeIndexes.shift();
+			}
+		});
+
+		// Now, all readers should have columns mapped. If not
+		// then return false to signal that this series should
+		// not be added.
+		each(builder.readers, function (reader) {
+			if (reader.columnIndex === undefined) {
+				enoughColumns = false;
+			}
+		});
+
+		return enoughColumns;
+	};
+
+	/**
+	 * Reads a row from the dataset and returns a point or array depending
+	 * on the names of the readers.
+	 * @param columns
+	 * @param rowIndex
+	 * @returns {Array | Object}
+	 */
+	SeriesBuilder.prototype.read = function (columns, rowIndex) {
+		var builder = this,
+			pointIsArray = builder.pointIsArray,
+			point = pointIsArray ? [] : {},
+			columnIndexes;
+
+		// Loop each reader and ask it to read its value.
+		// Then, build an array or point based on the readers names.
+		each(builder.readers, function (reader) {
+			var value = columns[reader.columnIndex][rowIndex];
+			if (pointIsArray) {
+				point.push(value);
+			} else {
+				point[reader.configName] = value; 
+			}
+		});
+
+		// The name comes from the first column (excluding the x column)
+		if (this.name === undefined && builder.readers.length >= 2) {
+			columnIndexes = builder.getReferencedColumnIndexes();
+			if (columnIndexes.length >= 2) {
+				// remove the first one (x col)
+				columnIndexes.shift();
+
+				// Sort the remaining
+				columnIndexes.sort();
+
+				// Now use the lowest index as name column
+				this.name = columns[columnIndexes.shift()].name;
+			}
+		}
+
+		return point;
+	};
+
+	/**
+	 * Creates and adds ColumnReader from the given columnIndex and configName.
+	 * ColumnIndex can be undefined and in that case the reader will be given
+	 * an index when columns are populated.
+	 * @param columnIndex {Number | undefined}
+	 * @param configName
+	 */
+	SeriesBuilder.prototype.addColumnReader = function (columnIndex, configName) {
+		this.readers.push({
+			columnIndex: columnIndex, 
+			configName: configName
+		});
+
+		if (!(configName === 'x' || configName === 'y' || configName === undefined)) {
+			this.pointIsArray = false;
+		}
+	};
+
+	/**
+	 * Returns an array of column indexes that the builder will use when
+	 * reading data.
+	 * @returns {Array}
+	 */
+	SeriesBuilder.prototype.getReferencedColumnIndexes = function () {
+		var i,
+			referencedColumnIndexes = [],
+			columnReader;
+		
+		for (i = 0; i < this.readers.length; i = i + 1) {
+			columnReader = this.readers[i];
+			if (columnReader.columnIndex !== undefined) {
+				referencedColumnIndexes.push(columnReader.columnIndex);
+			}
+		}
+
+		return referencedColumnIndexes;
+	};
+
+	/**
+	 * Returns true if the builder has a reader for the given configName.
+	 * @param configName
+	 * @returns {boolean}
+	 */
+	SeriesBuilder.prototype.hasReader = function (configName) {
+		var i, columnReader;
+		for (i = 0; i < this.readers.length; i = i + 1) {
+			columnReader = this.readers[i];
+			if (columnReader.configName === configName) {
+				return true;
+			}
+		}
+		// Else return undefined
+	};
+
+
+
+}(Highcharts));
diff --git a/data/interfaces/default/js/highcharts/js/modules/drilldown.js b/data/interfaces/default/js/highcharts/js/modules/drilldown.js
new file mode 100644
index 00000000..7a7c52f6
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/modules/drilldown.js
@@ -0,0 +1,17 @@
+(function(f){function A(a,b,c){var d;!b.rgba.length||!a.rgba.length?a=b.raw||"none":(a=a.rgba,b=b.rgba,d=b[3]!==1||a[3]!==1,a=(d?"rgba(":"rgb(")+Math.round(b[0]+(a[0]-b[0])*(1-c))+","+Math.round(b[1]+(a[1]-b[1])*(1-c))+","+Math.round(b[2]+(a[2]-b[2])*(1-c))+(d?","+(b[3]+(a[3]-b[3])*(1-c)):"")+")");return a}var t=function(){},q=f.getOptions(),h=f.each,l=f.extend,B=f.format,u=f.pick,r=f.wrap,m=f.Chart,p=f.seriesTypes,v=p.pie,n=p.column,w=f.Tick,x=HighchartsAdapter.fireEvent,y=HighchartsAdapter.inArray,
+z=1;h(["fill","stroke"],function(a){HighchartsAdapter.addAnimSetter(a,function(b){b.elem.attr(a,A(f.Color(b.start),f.Color(b.end),b.pos))})});l(q.lang,{drillUpText:"â—� Back to {series.name}"});q.drilldown={activeAxisLabelStyle:{cursor:"pointer",color:"#0d233a",fontWeight:"bold",textDecoration:"underline"},activeDataLabelStyle:{cursor:"pointer",color:"#0d233a",fontWeight:"bold",textDecoration:"underline"},animation:{duration:500},drillUpButton:{position:{align:"right",x:-10,y:10}}};f.SVGRenderer.prototype.Element.prototype.fadeIn=
+function(a){this.attr({opacity:0.1,visibility:"inherit"}).animate({opacity:u(this.newOpacity,1)},a||{duration:250})};m.prototype.addSeriesAsDrilldown=function(a,b){this.addSingleSeriesAsDrilldown(a,b);this.applyDrilldown()};m.prototype.addSingleSeriesAsDrilldown=function(a,b){var c=a.series,d=c.xAxis,g=c.yAxis,e;e=a.color||c.color;var i,f=[],j=[],k,o;if(!this.drilldownLevels)this.drilldownLevels=[];k=c.options._levelNumber||0;(o=this.drilldownLevels[this.drilldownLevels.length-1])&&o.levelNumber!==
+k&&(o=void 0);b=l({color:e,_ddSeriesId:z++},b);i=y(a,c.points);h(c.chart.series,function(a){if(a.xAxis===d&&!a.isDrilling)a.options._ddSeriesId=a.options._ddSeriesId||z++,a.options._colorIndex=a.userOptions._colorIndex,a.options._levelNumber=a.options._levelNumber||k,o?(f=o.levelSeries,j=o.levelSeriesOptions):(f.push(a),j.push(a.options))});e={levelNumber:k,seriesOptions:c.options,levelSeriesOptions:j,levelSeries:f,shapeArgs:a.shapeArgs,bBox:a.graphic?a.graphic.getBBox():{},color:e,lowerSeriesOptions:b,
+pointOptions:c.options.data[i],pointIndex:i,oldExtremes:{xMin:d&&d.userMin,xMax:d&&d.userMax,yMin:g&&g.userMin,yMax:g&&g.userMax}};this.drilldownLevels.push(e);e=e.lowerSeries=this.addSeries(b,!1);e.options._levelNumber=k+1;if(d)d.oldPos=d.pos,d.userMin=d.userMax=null,g.userMin=g.userMax=null;if(c.type===e.type)e.animate=e.animateDrilldown||t,e.options.animation=!0};m.prototype.applyDrilldown=function(){var a=this.drilldownLevels,b;if(a&&a.length>0)b=a[a.length-1].levelNumber,h(this.drilldownLevels,
+function(a){a.levelNumber===b&&h(a.levelSeries,function(a){a.options&&a.options._levelNumber===b&&a.remove(!1)})});this.redraw();this.showDrillUpButton()};m.prototype.getDrilldownBackText=function(){var a=this.drilldownLevels;if(a&&a.length>0)return a=a[a.length-1],a.series=a.seriesOptions,B(this.options.lang.drillUpText,a)};m.prototype.showDrillUpButton=function(){var a=this,b=this.getDrilldownBackText(),c=a.options.drilldown.drillUpButton,d,g;this.drillUpButton?this.drillUpButton.attr({text:b}).align():
+(g=(d=c.theme)&&d.states,this.drillUpButton=this.renderer.button(b,null,null,function(){a.drillUp()},d,g&&g.hover,g&&g.select).attr({align:c.position.align,zIndex:9}).add().align(c.position,!1,c.relativeTo||"plotBox"))};m.prototype.drillUp=function(){for(var a=this,b=a.drilldownLevels,c=b[b.length-1].levelNumber,d=b.length,g=a.series,e,i,f,j,k=function(b){var c;h(g,function(a){a.options._ddSeriesId===b._ddSeriesId&&(c=a)});c=c||a.addSeries(b,!1);if(c.type===f.type&&c.animateDrillupTo)c.animate=c.animateDrillupTo;
+b===i.seriesOptions&&(j=c)};d--;)if(i=b[d],i.levelNumber===c){b.pop();f=i.lowerSeries;if(!f.chart)for(e=g.length;e--;)if(g[e].options.id===i.lowerSeriesOptions.id&&g[e].options._levelNumber===c+1){f=g[e];break}f.xData=[];h(i.levelSeriesOptions,k);x(a,"drillup",{seriesOptions:i.seriesOptions});if(j.type===f.type)j.drilldownLevel=i,j.options.animation=a.options.drilldown.animation,f.animateDrillupFrom&&f.chart&&f.animateDrillupFrom(i);j.options._levelNumber=c;f.remove(!1);if(j.xAxis)e=i.oldExtremes,
+j.xAxis.setExtremes(e.xMin,e.xMax,!1),j.yAxis.setExtremes(e.yMin,e.yMax,!1)}this.redraw();this.drilldownLevels.length===0?this.drillUpButton=this.drillUpButton.destroy():this.drillUpButton.attr({text:this.getDrilldownBackText()}).align();this.ddDupes.length=[]};n.prototype.supportsDrilldown=!0;n.prototype.animateDrillupTo=function(a){if(!a){var b=this,c=b.drilldownLevel;h(this.points,function(a){a.graphic&&a.graphic.hide();a.dataLabel&&a.dataLabel.hide();a.connector&&a.connector.hide()});setTimeout(function(){b.points&&
+h(b.points,function(a,b){var e=b===(c&&c.pointIndex)?"show":"fadeIn",f=e==="show"?!0:void 0;if(a.graphic)a.graphic[e](f);if(a.dataLabel)a.dataLabel[e](f);if(a.connector)a.connector[e](f)})},Math.max(this.chart.options.drilldown.animation.duration-50,0));this.animate=t}};n.prototype.animateDrilldown=function(a){var b=this,c=this.chart.drilldownLevels,d,g=this.chart.options.drilldown.animation,e=this.xAxis;if(!a)h(c,function(a){if(b.options._ddSeriesId===a.lowerSeriesOptions._ddSeriesId)d=a.shapeArgs,
+d.fill=a.color}),d.x+=u(e.oldPos,e.pos)-e.pos,h(this.points,function(a){a.graphic&&a.graphic.attr(d).animate(l(a.shapeArgs,{fill:a.color}),g);a.dataLabel&&a.dataLabel.fadeIn(g)}),this.animate=null};n.prototype.animateDrillupFrom=function(a){var b=this.chart.options.drilldown.animation,c=this.group,d=this;h(d.trackerGroups,function(a){if(d[a])d[a].on("mouseover")});delete this.group;h(this.points,function(d){var e=d.graphic,i=function(){e.destroy();c&&(c=c.destroy())};e&&(delete d.graphic,b?e.animate(l(a.shapeArgs,
+{fill:a.color}),f.merge(b,{complete:i})):(e.attr(a.shapeArgs),i()))})};v&&l(v.prototype,{supportsDrilldown:!0,animateDrillupTo:n.prototype.animateDrillupTo,animateDrillupFrom:n.prototype.animateDrillupFrom,animateDrilldown:function(a){var b=this.chart.drilldownLevels[this.chart.drilldownLevels.length-1],c=this.chart.options.drilldown.animation,d=b.shapeArgs,g=d.start,e=(d.end-g)/this.points.length;if(!a)h(this.points,function(a,h){a.graphic.attr(f.merge(d,{start:g+h*e,end:g+(h+1)*e,fill:b.color}))[c?
+"animate":"attr"](l(a.shapeArgs,{fill:a.color}),c)}),this.animate=null}});f.Point.prototype.doDrilldown=function(a,b){var c=this.series.chart,d=c.options.drilldown,f=(d.series||[]).length,e;if(!c.ddDupes)c.ddDupes=[];for(;f--&&!e;)d.series[f].id===this.drilldown&&y(this.drilldown,c.ddDupes)===-1&&(e=d.series[f],c.ddDupes.push(this.drilldown));x(c,"drilldown",{point:this,seriesOptions:e,category:b,points:b!==void 0&&this.series.xAxis.ddPoints[b].slice(0)});e&&(a?c.addSingleSeriesAsDrilldown(this,e):
+c.addSeriesAsDrilldown(this,e))};f.Axis.prototype.drilldownCategory=function(a){var b,c,d=this.ddPoints[a];for(b in d)(c=d[b])&&c.series&&c.series.visible&&c.doDrilldown&&c.doDrilldown(!0,a);this.chart.applyDrilldown()};f.Axis.prototype.getDDPoints=function(a,b){var c=this.ddPoints;if(!c)this.ddPoints=c={};c[a]||(c[a]=[]);if(c[a].levelNumber!==b)c[a].length=0;return c[a]};w.prototype.drillable=function(){var a=this.pos,b=this.label,c=this.axis,d=c.ddPoints&&c.ddPoints[a];if(b&&d&&d.length){if(!b.basicStyles)b.basicStyles=
+f.merge(b.styles);b.addClass("highcharts-drilldown-axis-label").css(c.chart.options.drilldown.activeAxisLabelStyle).on("click",function(){c.drilldownCategory(a)})}else if(b&&b.basicStyles)b.styles={},b.css(b.basicStyles),b.on("click",null)};r(w.prototype,"addLabel",function(a){a.call(this);this.drillable()});r(f.Point.prototype,"init",function(a,b,c,d){var g=a.call(this,b,c,d),a=(c=b.xAxis)&&c.ticks[d],d=c&&c.getDDPoints(d,b.options._levelNumber);if(g.drilldown&&(f.addEvent(g,"click",function(){g.doDrilldown()}),
+d))d.push(g),d.levelNumber=b.options._levelNumber;a&&a.drillable();return g});r(f.Series.prototype,"drawDataLabels",function(a){var b=this.chart.options.drilldown.activeDataLabelStyle;a.call(this);h(this.points,function(a){a.drilldown&&a.dataLabel&&a.dataLabel.attr({"class":"highcharts-drilldown-data-label"}).css(b)})});var s,q=function(a){a.call(this);h(this.points,function(a){a.drilldown&&a.graphic&&a.graphic.attr({"class":"highcharts-drilldown-point"}).css({cursor:"pointer"})})};for(s in p)p[s].prototype.supportsDrilldown&&
+r(p[s].prototype,"drawTracker",q)})(Highcharts);
diff --git a/data/interfaces/default/js/highcharts/js/modules/drilldown.src.js b/data/interfaces/default/js/highcharts/js/modules/drilldown.src.js
new file mode 100644
index 00000000..850d9ad5
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/modules/drilldown.src.js
@@ -0,0 +1,709 @@
+/**
+ * Highcharts Drilldown plugin
+ * 
+ * Author: Torstein Honsi
+ * License: MIT License
+ *
+ * Demo: http://jsfiddle.net/highcharts/Vf3yT/
+ */
+
+/*global Highcharts,HighchartsAdapter*/
+(function (H) {
+
+	"use strict";
+
+	var noop = function () {},
+		defaultOptions = H.getOptions(),
+		each = H.each,
+		extend = H.extend,
+		format = H.format,
+		pick = H.pick,
+		wrap = H.wrap,
+		Chart = H.Chart,
+		seriesTypes = H.seriesTypes,
+		PieSeries = seriesTypes.pie,
+		ColumnSeries = seriesTypes.column,
+		Tick = H.Tick,
+		fireEvent = HighchartsAdapter.fireEvent,
+		inArray = HighchartsAdapter.inArray,
+		ddSeriesId = 1;
+
+	// Utilities
+	/*
+	 * Return an intermediate color between two colors, according to pos where 0
+	 * is the from color and 1 is the to color. This method is copied from ColorAxis.js
+	 * and should always be kept updated, until we get AMD support.
+	 */
+	function tweenColors(from, to, pos) {
+		// Check for has alpha, because rgba colors perform worse due to lack of
+		// support in WebKit.
+		var hasAlpha,
+			ret;
+
+		// Unsupported color, return to-color (#3920)
+		if (!to.rgba.length || !from.rgba.length) {
+			ret = to.raw || 'none';
+
+		// Interpolate
+		} else {
+			from = from.rgba;
+			to = to.rgba;
+			hasAlpha = (to[3] !== 1 || from[3] !== 1);
+			ret = (hasAlpha ? 'rgba(' : 'rgb(') + 
+				Math.round(to[0] + (from[0] - to[0]) * (1 - pos)) + ',' + 
+				Math.round(to[1] + (from[1] - to[1]) * (1 - pos)) + ',' + 
+				Math.round(to[2] + (from[2] - to[2]) * (1 - pos)) + 
+				(hasAlpha ? (',' + (to[3] + (from[3] - to[3]) * (1 - pos))) : '') + ')';
+		}
+		return ret;
+	}
+	/**
+	 * Handle animation of the color attributes directly
+	 */
+	each(['fill', 'stroke'], function (prop) {
+		HighchartsAdapter.addAnimSetter(prop, function (fx) {
+			fx.elem.attr(prop, tweenColors(H.Color(fx.start), H.Color(fx.end), fx.pos));
+		});
+	});
+
+	// Add language
+	extend(defaultOptions.lang, {
+		drillUpText: 'â—� Back to {series.name}'
+	});
+	defaultOptions.drilldown = {
+		activeAxisLabelStyle: {
+			cursor: 'pointer',
+			color: '#0d233a',
+			fontWeight: 'bold',
+			textDecoration: 'underline'			
+		},
+		activeDataLabelStyle: {
+			cursor: 'pointer',
+			color: '#0d233a',
+			fontWeight: 'bold',
+			textDecoration: 'underline'			
+		},
+		animation: {
+			duration: 500
+		},
+		drillUpButton: {
+			position: { 
+				align: 'right',
+				x: -10,
+				y: 10
+			}
+			// relativeTo: 'plotBox'
+			// theme
+		}
+	};	
+
+	/**
+	 * A general fadeIn method
+	 */
+	H.SVGRenderer.prototype.Element.prototype.fadeIn = function (animation) {
+		this
+		.attr({
+			opacity: 0.1,
+			visibility: 'inherit'
+		})
+		.animate({
+			opacity: pick(this.newOpacity, 1) // newOpacity used in maps
+		}, animation || {
+			duration: 250
+		});
+	};
+
+	Chart.prototype.addSeriesAsDrilldown = function (point, ddOptions) {
+		this.addSingleSeriesAsDrilldown(point, ddOptions);
+		this.applyDrilldown();
+	};
+	Chart.prototype.addSingleSeriesAsDrilldown = function (point, ddOptions) {
+		var oldSeries = point.series,
+			xAxis = oldSeries.xAxis,
+			yAxis = oldSeries.yAxis,
+			newSeries,
+			color = point.color || oldSeries.color,
+			pointIndex,
+			levelSeries = [],
+			levelSeriesOptions = [],
+			level,
+			levelNumber,
+			last;
+
+		if (!this.drilldownLevels) {
+			this.drilldownLevels = [];
+		}
+		
+		levelNumber = oldSeries.options._levelNumber || 0;
+
+		// See if we can reuse the registered series from last run
+		last = this.drilldownLevels[this.drilldownLevels.length - 1];
+		if (last && last.levelNumber !== levelNumber) {
+			last = undefined;
+		}
+		
+			
+		ddOptions = extend({
+			color: color,
+			_ddSeriesId: ddSeriesId++
+		}, ddOptions);
+		pointIndex = inArray(point, oldSeries.points);
+
+		// Record options for all current series
+		each(oldSeries.chart.series, function (series) {
+			if (series.xAxis === xAxis && !series.isDrilling) {
+				series.options._ddSeriesId = series.options._ddSeriesId || ddSeriesId++;
+				series.options._colorIndex = series.userOptions._colorIndex;
+				series.options._levelNumber = series.options._levelNumber || levelNumber; // #3182
+
+				if (last) {
+					levelSeries = last.levelSeries;
+					levelSeriesOptions = last.levelSeriesOptions;
+				} else {
+					levelSeries.push(series);
+					levelSeriesOptions.push(series.options);
+				}
+			}
+		});
+
+		// Add a record of properties for each drilldown level
+		level = {
+			levelNumber: levelNumber,
+			seriesOptions: oldSeries.options,
+			levelSeriesOptions: levelSeriesOptions,
+			levelSeries: levelSeries,
+			shapeArgs: point.shapeArgs,
+			bBox: point.graphic ? point.graphic.getBBox() : {}, // no graphic in line series with markers disabled
+			color: color,
+			lowerSeriesOptions: ddOptions,
+			pointOptions: oldSeries.options.data[pointIndex],
+			pointIndex: pointIndex,
+			oldExtremes: {
+				xMin: xAxis && xAxis.userMin,
+				xMax: xAxis && xAxis.userMax,
+				yMin: yAxis && yAxis.userMin,
+				yMax: yAxis && yAxis.userMax
+			}
+		};
+
+		// Push it to the lookup array
+		this.drilldownLevels.push(level);
+
+		newSeries = level.lowerSeries = this.addSeries(ddOptions, false);
+		newSeries.options._levelNumber = levelNumber + 1;
+		if (xAxis) {
+			xAxis.oldPos = xAxis.pos;
+			xAxis.userMin = xAxis.userMax = null;
+			yAxis.userMin = yAxis.userMax = null;
+		}
+
+		// Run fancy cross-animation on supported and equal types
+		if (oldSeries.type === newSeries.type) {
+			newSeries.animate = newSeries.animateDrilldown || noop;
+			newSeries.options.animation = true;
+		}
+	};
+
+	Chart.prototype.applyDrilldown = function () {
+		var drilldownLevels = this.drilldownLevels, 
+			levelToRemove;
+		
+		if (drilldownLevels && drilldownLevels.length > 0) { // #3352, async loading
+			levelToRemove = drilldownLevels[drilldownLevels.length - 1].levelNumber;
+			each(this.drilldownLevels, function (level) {
+				if (level.levelNumber === levelToRemove) {
+					each(level.levelSeries, function (series) {
+						if (series.options && series.options._levelNumber === levelToRemove) { // Not removed, not added as part of a multi-series drilldown
+							series.remove(false);
+						}
+					});
+				}
+			});
+		}
+		
+		this.redraw();
+		this.showDrillUpButton();
+	};
+
+	Chart.prototype.getDrilldownBackText = function () {
+		var drilldownLevels = this.drilldownLevels,
+			lastLevel;
+		if (drilldownLevels && drilldownLevels.length > 0) { // #3352, async loading
+			lastLevel = drilldownLevels[drilldownLevels.length - 1];
+			lastLevel.series = lastLevel.seriesOptions;
+			return format(this.options.lang.drillUpText, lastLevel);
+		}
+
+	};
+
+	Chart.prototype.showDrillUpButton = function () {
+		var chart = this,
+			backText = this.getDrilldownBackText(),
+			buttonOptions = chart.options.drilldown.drillUpButton,
+			attr,
+			states;
+			
+
+		if (!this.drillUpButton) {
+			attr = buttonOptions.theme;
+			states = attr && attr.states;
+						
+			this.drillUpButton = this.renderer.button(
+				backText,
+				null,
+				null,
+				function () {
+					chart.drillUp(); 
+				},
+				attr, 
+				states && states.hover,
+				states && states.select
+			)
+			.attr({
+				align: buttonOptions.position.align,
+				zIndex: 9
+			})
+			.add()
+			.align(buttonOptions.position, false, buttonOptions.relativeTo || 'plotBox');
+		} else {
+			this.drillUpButton.attr({
+				text: backText
+			})
+			.align();
+		}
+	};
+
+	Chart.prototype.drillUp = function () {
+		var chart = this,
+			drilldownLevels = chart.drilldownLevels,
+			levelNumber = drilldownLevels[drilldownLevels.length - 1].levelNumber,
+			i = drilldownLevels.length,
+			chartSeries = chart.series,
+			seriesI,
+			level,
+			oldSeries,
+			newSeries,
+			oldExtremes,
+			addSeries = function (seriesOptions) {
+				var addedSeries;
+				each(chartSeries, function (series) {
+					if (series.options._ddSeriesId === seriesOptions._ddSeriesId) {
+						addedSeries = series;
+					}
+				});
+
+				addedSeries = addedSeries || chart.addSeries(seriesOptions, false);
+				if (addedSeries.type === oldSeries.type && addedSeries.animateDrillupTo) {
+					addedSeries.animate = addedSeries.animateDrillupTo;
+				}
+				if (seriesOptions === level.seriesOptions) {
+					newSeries = addedSeries;
+				}
+			};
+
+		while (i--) {
+
+			level = drilldownLevels[i];
+			if (level.levelNumber === levelNumber) {
+				drilldownLevels.pop();
+				
+				// Get the lower series by reference or id
+				oldSeries = level.lowerSeries;
+				if (!oldSeries.chart) {  // #2786
+					seriesI = chartSeries.length; // #2919
+					while (seriesI--) {
+						if (chartSeries[seriesI].options.id === level.lowerSeriesOptions.id && 
+								chartSeries[seriesI].options._levelNumber === levelNumber + 1) { // #3867
+							oldSeries = chartSeries[seriesI];
+							break;
+						}
+					}
+				}
+				oldSeries.xData = []; // Overcome problems with minRange (#2898)
+
+				each(level.levelSeriesOptions, addSeries);
+				
+				fireEvent(chart, 'drillup', { seriesOptions: level.seriesOptions });
+
+				if (newSeries.type === oldSeries.type) {
+					newSeries.drilldownLevel = level;
+					newSeries.options.animation = chart.options.drilldown.animation;
+
+					if (oldSeries.animateDrillupFrom && oldSeries.chart) { // #2919
+						oldSeries.animateDrillupFrom(level);
+					}
+				}
+				newSeries.options._levelNumber = levelNumber;
+				
+				oldSeries.remove(false);
+
+				// Reset the zoom level of the upper series
+				if (newSeries.xAxis) {
+					oldExtremes = level.oldExtremes;
+					newSeries.xAxis.setExtremes(oldExtremes.xMin, oldExtremes.xMax, false);
+					newSeries.yAxis.setExtremes(oldExtremes.yMin, oldExtremes.yMax, false);
+				}
+			}
+		}
+
+		this.redraw();
+
+		if (this.drilldownLevels.length === 0) {
+			this.drillUpButton = this.drillUpButton.destroy();
+		} else {
+			this.drillUpButton.attr({
+				text: this.getDrilldownBackText()
+			})
+			.align();
+		}
+
+		this.ddDupes.length = []; // #3315
+	};
+
+
+	ColumnSeries.prototype.supportsDrilldown = true;
+	
+	/**
+	 * When drilling up, keep the upper series invisible until the lower series has
+	 * moved into place
+	 */
+	ColumnSeries.prototype.animateDrillupTo = function (init) {
+		if (!init) {
+			var newSeries = this,
+				level = newSeries.drilldownLevel;
+
+			each(this.points, function (point) {
+				if (point.graphic) { // #3407
+					point.graphic.hide();
+				}
+				if (point.dataLabel) {
+					point.dataLabel.hide();
+				}
+				if (point.connector) {
+					point.connector.hide();
+				}
+			});
+
+
+			// Do dummy animation on first point to get to complete
+			setTimeout(function () {
+				if (newSeries.points) { // May be destroyed in the meantime, #3389
+					each(newSeries.points, function (point, i) {  
+						// Fade in other points			  
+						var verb = i === (level && level.pointIndex) ? 'show' : 'fadeIn',
+							inherit = verb === 'show' ? true : undefined;
+						if (point.graphic) { // #3407
+							point.graphic[verb](inherit);
+						}
+						if (point.dataLabel) {
+							point.dataLabel[verb](inherit);
+						}
+						if (point.connector) {
+							point.connector[verb](inherit);
+						}
+					});
+				}
+			}, Math.max(this.chart.options.drilldown.animation.duration - 50, 0));
+
+			// Reset
+			this.animate = noop;
+		}
+
+	};
+	
+	ColumnSeries.prototype.animateDrilldown = function (init) {
+		var series = this,
+			drilldownLevels = this.chart.drilldownLevels,
+			animateFrom,
+			animationOptions = this.chart.options.drilldown.animation,
+			xAxis = this.xAxis;
+			
+		if (!init) {
+			each(drilldownLevels, function (level) {
+				if (series.options._ddSeriesId === level.lowerSeriesOptions._ddSeriesId) {
+					animateFrom = level.shapeArgs;
+					animateFrom.fill = level.color;
+				}
+			});
+
+			animateFrom.x += (pick(xAxis.oldPos, xAxis.pos) - xAxis.pos);
+
+			each(this.points, function (point) {
+				if (point.graphic) {
+					point.graphic
+						.attr(animateFrom)
+						.animate(
+							extend(point.shapeArgs, { fill: point.color }), 
+							animationOptions
+						);
+				}
+				if (point.dataLabel) {
+					point.dataLabel.fadeIn(animationOptions);
+				}
+			});
+			this.animate = null;
+		}
+		
+	};
+
+	/**
+	 * When drilling up, pull out the individual point graphics from the lower series
+	 * and animate them into the origin point in the upper series.
+	 */
+	ColumnSeries.prototype.animateDrillupFrom = function (level) {
+		var animationOptions = this.chart.options.drilldown.animation,
+			group = this.group,
+			series = this;
+
+		// Cancel mouse events on the series group (#2787)
+		each(series.trackerGroups, function (key) {
+			if (series[key]) { // we don't always have dataLabelsGroup
+				series[key].on('mouseover');
+			}
+		});
+			
+
+		delete this.group;
+		each(this.points, function (point) {
+			var graphic = point.graphic,
+				complete = function () {
+					graphic.destroy();
+					if (group) {
+						group = group.destroy();
+					}
+				};
+
+			if (graphic) {
+			
+				delete point.graphic;
+
+				if (animationOptions) {
+					graphic.animate(
+						extend(level.shapeArgs, { fill: level.color }),
+						H.merge(animationOptions, { complete: complete })
+					);
+				} else {
+					graphic.attr(level.shapeArgs);
+					complete();
+				}
+			}
+		});
+	};
+
+	if (PieSeries) {
+		extend(PieSeries.prototype, {
+			supportsDrilldown: true,
+			animateDrillupTo: ColumnSeries.prototype.animateDrillupTo,
+			animateDrillupFrom: ColumnSeries.prototype.animateDrillupFrom,
+
+			animateDrilldown: function (init) {
+				var level = this.chart.drilldownLevels[this.chart.drilldownLevels.length - 1],
+					animationOptions = this.chart.options.drilldown.animation,
+					animateFrom = level.shapeArgs,
+					start = animateFrom.start,
+					angle = animateFrom.end - start,
+					startAngle = angle / this.points.length;
+
+				if (!init) {
+					each(this.points, function (point, i) {
+						point.graphic
+							.attr(H.merge(animateFrom, {
+								start: start + i * startAngle,
+								end: start + (i + 1) * startAngle,
+								fill: level.color
+							}))[animationOptions ? 'animate' : 'attr'](
+								extend(point.shapeArgs, { fill: point.color }), 
+								animationOptions
+							);
+					});
+					this.animate = null;
+				}
+			}
+		});
+	}
+	
+	H.Point.prototype.doDrilldown = function (_holdRedraw, category) {
+		var series = this.series,
+			chart = series.chart,
+			drilldown = chart.options.drilldown,
+			i = (drilldown.series || []).length,
+			seriesOptions;
+
+		if (!chart.ddDupes) {
+			chart.ddDupes = [];
+		}
+		
+		while (i-- && !seriesOptions) {
+			if (drilldown.series[i].id === this.drilldown && inArray(this.drilldown, chart.ddDupes) === -1) {
+				seriesOptions = drilldown.series[i];
+				chart.ddDupes.push(this.drilldown);
+			}
+		}
+
+		// Fire the event. If seriesOptions is undefined, the implementer can check for 
+		// seriesOptions, and call addSeriesAsDrilldown async if necessary.
+		fireEvent(chart, 'drilldown', { 
+			point: this,
+			seriesOptions: seriesOptions,
+			category: category,
+			points: category !== undefined && this.series.xAxis.ddPoints[category].slice(0)
+		});
+		
+		if (seriesOptions) {
+			if (_holdRedraw) {
+				chart.addSingleSeriesAsDrilldown(this, seriesOptions);
+			} else {
+				chart.addSeriesAsDrilldown(this, seriesOptions);
+			}
+		}
+	};
+
+	/**
+	 * Drill down to a given category. This is the same as clicking on an axis label.
+	 */
+	H.Axis.prototype.drilldownCategory = function (x) {
+		var key,
+			point,
+			ddPointsX = this.ddPoints[x];
+		for (key in ddPointsX) {
+			point = ddPointsX[key];
+			if (point && point.series && point.series.visible && point.doDrilldown) { // #3197
+				point.doDrilldown(true, x);
+			}
+		}
+		this.chart.applyDrilldown();
+	};
+
+	/**
+	 * Create and return a collection of points associated with the X position. Reset it for each level.
+	 */	
+	H.Axis.prototype.getDDPoints = function (x, levelNumber) {
+		var ddPoints = this.ddPoints;
+		if (!ddPoints) {
+			this.ddPoints = ddPoints = {};
+		}
+		if (!ddPoints[x]) {
+			ddPoints[x] = [];
+		}
+		if (ddPoints[x].levelNumber !== levelNumber) {
+			ddPoints[x].length = 0; // reset
+		}
+		return ddPoints[x];
+	};
+
+
+	/**
+	 * Make a tick label drillable, or remove drilling on update
+	 */
+	Tick.prototype.drillable = function () {
+		var pos = this.pos,
+			label = this.label,
+			axis = this.axis,
+			ddPointsX = axis.ddPoints && axis.ddPoints[pos];
+
+		if (label && ddPointsX && ddPointsX.length) {
+			if (!label.basicStyles) {
+				label.basicStyles = H.merge(label.styles);
+			}
+			label
+				.addClass('highcharts-drilldown-axis-label')
+				.css(axis.chart.options.drilldown.activeAxisLabelStyle)
+				.on('click', function () {
+					axis.drilldownCategory(pos);
+				});
+
+		} else if (label && label.basicStyles) {
+			label.styles = {}; // reset for full overwrite of styles
+			label.css(label.basicStyles);
+			label.on('click', null); // #3806			
+		}
+	};
+
+	/**
+	 * Always keep the drillability updated (#3951)
+	 */
+	wrap(Tick.prototype, 'addLabel', function (proceed) {
+		proceed.call(this);
+		this.drillable();
+	});
+	
+
+	/**
+	 * On initialization of each point, identify its label and make it clickable. Also, provide a
+	 * list of points associated to that label.
+	 */
+	wrap(H.Point.prototype, 'init', function (proceed, series, options, x) {
+		var point = proceed.call(this, series, options, x),
+			xAxis = series.xAxis,
+			tick = xAxis && xAxis.ticks[x],
+			ddPointsX = xAxis && xAxis.getDDPoints(x, series.options._levelNumber);
+
+		if (point.drilldown) {
+			
+			// Add the click event to the point 
+			H.addEvent(point, 'click', function () {
+				point.doDrilldown();
+			});
+			/*wrap(point, 'importEvents', function (proceed) { // wrapping importEvents makes point.click event work
+				if (!this.hasImportedEvents) {
+					proceed.call(this);
+					H.addEvent(this, 'click', function () {
+						this.doDrilldown();
+					});
+				}
+			});*/
+
+
+			// Register drilldown points on this X value
+			if (ddPointsX) {
+				ddPointsX.push(point);
+				ddPointsX.levelNumber = series.options._levelNumber;
+			}
+
+		}
+
+		// Add or remove click handler and style on the tick label
+		if (tick) {
+			tick.drillable();
+		}
+
+		return point;
+	});
+
+	wrap(H.Series.prototype, 'drawDataLabels', function (proceed) {
+		var css = this.chart.options.drilldown.activeDataLabelStyle;
+
+		proceed.call(this);
+
+		each(this.points, function (point) {
+			if (point.drilldown && point.dataLabel) {
+				point.dataLabel
+					.attr({
+						'class': 'highcharts-drilldown-data-label'
+					})
+					.css(css);
+			}
+		});
+	});
+
+	// Mark the trackers with a pointer 
+	var type, 
+		drawTrackerWrapper = function (proceed) {
+			proceed.call(this);
+			each(this.points, function (point) {
+				if (point.drilldown && point.graphic) {
+					point.graphic
+						.attr({
+							'class': 'highcharts-drilldown-point'
+						})
+						.css({ cursor: 'pointer' });
+				}
+			});
+		};
+	for (type in seriesTypes) {
+		if (seriesTypes[type].prototype.supportsDrilldown) {
+			wrap(seriesTypes[type].prototype, 'drawTracker', drawTrackerWrapper);
+		}
+	}
+		
+}(Highcharts));
diff --git a/data/interfaces/default/js/highcharts/js/modules/exporting.js b/data/interfaces/default/js/highcharts/js/modules/exporting.js
new file mode 100644
index 00000000..afcaaf70
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/modules/exporting.js
@@ -0,0 +1,23 @@
+/*
+ Highcharts JS v4.1.6 (2015-06-12)
+ Exporting module
+
+ (c) 2010-2014 Torstein Honsi
+
+ License: www.highcharts.com/license
+*/
+(function(f){var z=f.Chart,s=f.addEvent,A=f.removeEvent,B=HighchartsAdapter.fireEvent,j=f.createElement,p=f.discardElement,u=f.css,l=f.merge,m=f.each,q=f.extend,E=f.splat,F=Math.max,k=document,C=window,G=f.isTouchDevice,H=f.Renderer.prototype.symbols,r=f.getOptions(),x;q(r.lang,{printChart:"Print chart",downloadPNG:"Download PNG image",downloadJPEG:"Download JPEG image",downloadPDF:"Download PDF document",downloadSVG:"Download SVG vector image",contextButtonTitle:"Chart context menu"});r.navigation=
+{menuStyle:{border:"1px solid #A0A0A0",background:"#FFFFFF",padding:"5px 0"},menuItemStyle:{padding:"0 10px",background:"none",color:"#303030",fontSize:G?"14px":"11px"},menuItemHoverStyle:{background:"#4572A5",color:"#FFFFFF"},buttonOptions:{symbolFill:"#E0E0E0",symbolSize:14,symbolStroke:"#666",symbolStrokeWidth:3,symbolX:12.5,symbolY:10.5,align:"right",buttonSpacing:3,height:22,theme:{fill:"white",stroke:"none"},verticalAlign:"top",width:24}};r.exporting={type:"image/png",url:"http://export.highcharts.com/",
+buttons:{contextButton:{menuClassName:"highcharts-contextmenu",symbol:"menu",_titleKey:"contextButtonTitle",menuItems:[{textKey:"printChart",onclick:function(){this.print()}},{separator:!0},{textKey:"downloadPNG",onclick:function(){this.exportChart()}},{textKey:"downloadJPEG",onclick:function(){this.exportChart({type:"image/jpeg"})}},{textKey:"downloadPDF",onclick:function(){this.exportChart({type:"application/pdf"})}},{textKey:"downloadSVG",onclick:function(){this.exportChart({type:"image/svg+xml"})}}]}}};
+f.post=function(b,a,e){var c,b=j("form",l({method:"post",action:b,enctype:"multipart/form-data"},e),{display:"none"},k.body);for(c in a)j("input",{type:"hidden",name:c,value:a[c]},null,b);b.submit();p(b)};q(z.prototype,{sanitizeSVG:function(b){return b.replace(/zIndex="[^"]+"/g,"").replace(/isShadow="[^"]+"/g,"").replace(/symbolName="[^"]+"/g,"").replace(/jQuery[0-9]+="[^"]+"/g,"").replace(/url\([^#]+#/g,"url(#").replace(/<svg /,'<svg xmlns:xlink="http://www.w3.org/1999/xlink" ').replace(/ (NS[0-9]+\:)?href=/g,
+" xlink:href=").replace(/\n/," ").replace(/<\/svg>.*?$/,"</svg>").replace(/(fill|stroke)="rgba\(([ 0-9]+,[ 0-9]+,[ 0-9]+),([ 0-9\.]+)\)"/g,'$1="rgb($2)" $1-opacity="$3"').replace(/&nbsp;/g," ").replace(/&shy;/g,"­").replace(/<IMG /g,"<image ").replace(/height=([^" ]+)/g,'height="$1"').replace(/width=([^" ]+)/g,'width="$1"').replace(/hc-svg-href="([^"]+)">/g,'xlink:href="$1"/>').replace(/ id=([^" >]+)/g,'id="$1"').replace(/class=([^" >]+)/g,'class="$1"').replace(/ transform /g," ").replace(/:(path|rect)/g,
+"$1").replace(/style="([^"]+)"/g,function(a){return a.toLowerCase()})},getSVG:function(b){var a=this,e,c,g,y,h,d=l(a.options,b);if(!k.createElementNS)k.createElementNS=function(a,b){return k.createElement(b)};c=j("div",null,{position:"absolute",top:"-9999em",width:a.chartWidth+"px",height:a.chartHeight+"px"},k.body);g=a.renderTo.style.width;h=a.renderTo.style.height;g=d.exporting.sourceWidth||d.chart.width||/px$/.test(g)&&parseInt(g,10)||600;h=d.exporting.sourceHeight||d.chart.height||/px$/.test(h)&&
+parseInt(h,10)||400;q(d.chart,{animation:!1,renderTo:c,forExport:!0,width:g,height:h});d.exporting.enabled=!1;delete d.data;d.series=[];m(a.series,function(a){y=l(a.options,{animation:!1,enableMouseTracking:!1,showCheckbox:!1,visible:a.visible});y.isInternal||d.series.push(y)});b&&m(["xAxis","yAxis"],function(a){m(E(b[a]),function(b,c){d[a][c]=l(d[a][c],b)})});e=new f.Chart(d,a.callback);m(["xAxis","yAxis"],function(b){m(a[b],function(a,d){var c=e[b][d],g=a.getExtremes(),h=g.userMin,g=g.userMax;c&&
+(h!==void 0||g!==void 0)&&c.setExtremes(h,g,!0,!1)})});g=e.container.innerHTML;d=null;e.destroy();p(c);g=this.sanitizeSVG(g);return g=g.replace(/(url\(#highcharts-[0-9]+)&quot;/g,"$1").replace(/&quot;/g,"'")},getSVGForExport:function(b,a){var e=this.options.exporting;return this.getSVG(l({chart:{borderRadius:0}},e.chartOptions,a,{exporting:{sourceWidth:b&&b.sourceWidth||e.sourceWidth,sourceHeight:b&&b.sourceHeight||e.sourceHeight}}))},exportChart:function(b,a){var e=this.getSVGForExport(b,a),b=l(this.options.exporting,
+b);f.post(b.url,{filename:b.filename||"chart",type:b.type,width:b.width||0,scale:b.scale||2,svg:e},b.formAttributes)},print:function(){var b=this,a=b.container,e=[],c=a.parentNode,g=k.body,f=g.childNodes;if(!b.isPrinting)b.isPrinting=!0,B(b,"beforePrint"),m(f,function(a,b){if(a.nodeType===1)e[b]=a.style.display,a.style.display="none"}),g.appendChild(a),C.focus(),C.print(),setTimeout(function(){c.appendChild(a);m(f,function(a,b){if(a.nodeType===1)a.style.display=e[b]});b.isPrinting=!1;B(b,"afterPrint")},
+1E3)},contextMenu:function(b,a,e,c,g,f,h){var d=this,l=d.options.navigation,D=l.menuItemStyle,n=d.chartWidth,o=d.chartHeight,k="cache-"+b,i=d[k],t=F(g,f),v,w,p,r=function(a){d.pointer.inClass(a.target,b)||w()};if(!i)d[k]=i=j("div",{className:b},{position:"absolute",zIndex:1E3,padding:t+"px"},d.container),v=j("div",null,q({MozBoxShadow:"3px 3px 10px #888",WebkitBoxShadow:"3px 3px 10px #888",boxShadow:"3px 3px 10px #888"},l.menuStyle),i),w=function(){u(i,{display:"none"});h&&h.setState(0);d.openMenu=
+!1},s(i,"mouseleave",function(){p=setTimeout(w,500)}),s(i,"mouseenter",function(){clearTimeout(p)}),s(document,"mouseup",r),s(d,"destroy",function(){A(document,"mouseup",r)}),m(a,function(a){if(a){var b=a.separator?j("hr",null,null,v):j("div",{onmouseover:function(){u(this,l.menuItemHoverStyle)},onmouseout:function(){u(this,D)},onclick:function(){w();a.onclick&&a.onclick.apply(d,arguments)},innerHTML:a.text||d.options.lang[a.textKey]},q({cursor:"pointer"},D),v);d.exportDivElements.push(b)}}),d.exportDivElements.push(v,
+i),d.exportMenuWidth=i.offsetWidth,d.exportMenuHeight=i.offsetHeight;a={display:"block"};e+d.exportMenuWidth>n?a.right=n-e-g-t+"px":a.left=e-t+"px";c+f+d.exportMenuHeight>o&&h.alignOptions.verticalAlign!=="top"?a.bottom=o-c-t+"px":a.top=c+f-t+"px";u(i,a);d.openMenu=!0},addButton:function(b){var a=this,e=a.renderer,c=l(a.options.navigation.buttonOptions,b),g=c.onclick,k=c.menuItems,h,d,m={stroke:c.symbolStroke,fill:c.symbolFill},j=c.symbolSize||12;if(!a.btnCount)a.btnCount=0;if(!a.exportDivElements)a.exportDivElements=
+[],a.exportSVGElements=[];if(c.enabled!==!1){var n=c.theme,o=n.states,p=o&&o.hover,o=o&&o.select,i;delete n.states;g?i=function(){g.apply(a,arguments)}:k&&(i=function(){a.contextMenu(d.menuClassName,k,d.translateX,d.translateY,d.width,d.height,d);d.setState(2)});c.text&&c.symbol?n.paddingLeft=f.pick(n.paddingLeft,25):c.text||q(n,{width:c.width,height:c.height,padding:0});d=e.button(c.text,0,0,i,n,p,o).attr({title:a.options.lang[c._titleKey],"stroke-linecap":"round"});d.menuClassName=b.menuClassName||
+"highcharts-menu-"+a.btnCount++;c.symbol&&(h=e.symbol(c.symbol,c.symbolX-j/2,c.symbolY-j/2,j,j).attr(q(m,{"stroke-width":c.symbolStrokeWidth||1,zIndex:1})).add(d));d.add().align(q(c,{width:d.width,x:f.pick(c.x,x)}),!0,"spacingBox");x+=(d.width+c.buttonSpacing)*(c.align==="right"?-1:1);a.exportSVGElements.push(d,h)}},destroyExport:function(b){var b=b.target,a,e;for(a=0;a<b.exportSVGElements.length;a++)if(e=b.exportSVGElements[a])e.onclick=e.ontouchstart=null,b.exportSVGElements[a]=e.destroy();for(a=
+0;a<b.exportDivElements.length;a++)e=b.exportDivElements[a],A(e,"mouseleave"),b.exportDivElements[a]=e.onmouseout=e.onmouseover=e.ontouchstart=e.onclick=null,p(e)}});H.menu=function(b,a,e,c){return["M",b,a+2.5,"L",b+e,a+2.5,"M",b,a+c/2+0.5,"L",b+e,a+c/2+0.5,"M",b,a+c-1.5,"L",b+e,a+c-1.5]};z.prototype.callbacks.push(function(b){var a,e=b.options.exporting,c=e.buttons;x=0;if(e.enabled!==!1){for(a in c)b.addButton(c[a]);s(b,"destroy",b.destroyExport)}})})(Highcharts);
diff --git a/data/interfaces/default/js/highcharts/js/modules/exporting.src.js b/data/interfaces/default/js/highcharts/js/modules/exporting.src.js
new file mode 100644
index 00000000..03b9bb4e
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/modules/exporting.src.js
@@ -0,0 +1,748 @@
+/**
+ * @license Highcharts JS v4.1.6 (2015-06-12)
+ * Exporting module
+ *
+ * (c) 2010-2014 Torstein Honsi
+ *
+ * License: www.highcharts.com/license
+ */
+
+// JSLint options:
+/*global Highcharts, HighchartsAdapter, document, window, Math, setTimeout */
+
+(function (Highcharts) { // encapsulate
+
+// create shortcuts
+var Chart = Highcharts.Chart,
+	addEvent = Highcharts.addEvent,
+	removeEvent = Highcharts.removeEvent,
+	fireEvent = HighchartsAdapter.fireEvent,
+	createElement = Highcharts.createElement,
+	discardElement = Highcharts.discardElement,
+	css = Highcharts.css,
+	merge = Highcharts.merge,
+	each = Highcharts.each,
+	extend = Highcharts.extend,
+	splat = Highcharts.splat,
+	math = Math,
+	mathMax = math.max,
+	doc = document,
+	win = window,
+	isTouchDevice = Highcharts.isTouchDevice,
+	M = 'M',
+	L = 'L',
+	DIV = 'div',
+	HIDDEN = 'hidden',
+	NONE = 'none',
+	PREFIX = 'highcharts-',
+	ABSOLUTE = 'absolute',
+	PX = 'px',
+	UNDEFINED,
+	symbols = Highcharts.Renderer.prototype.symbols,
+	defaultOptions = Highcharts.getOptions(),
+	buttonOffset;
+
+	// Add language
+	extend(defaultOptions.lang, {
+		printChart: 'Print chart',
+		downloadPNG: 'Download PNG image',
+		downloadJPEG: 'Download JPEG image',
+		downloadPDF: 'Download PDF document',
+		downloadSVG: 'Download SVG vector image',
+		contextButtonTitle: 'Chart context menu'
+	});
+
+// Buttons and menus are collected in a separate config option set called 'navigation'.
+// This can be extended later to add control buttons like zoom and pan right click menus.
+defaultOptions.navigation = {
+	menuStyle: {
+		border: '1px solid #A0A0A0',
+		background: '#FFFFFF',
+		padding: '5px 0'
+	},
+	menuItemStyle: {
+		padding: '0 10px',
+		background: NONE,
+		color: '#303030',
+		fontSize: isTouchDevice ? '14px' : '11px'
+	},
+	menuItemHoverStyle: {
+		background: '#4572A5',
+		color: '#FFFFFF'
+	},
+
+	buttonOptions: {
+		symbolFill: '#E0E0E0',
+		symbolSize: 14,
+		symbolStroke: '#666',
+		symbolStrokeWidth: 3,
+		symbolX: 12.5,
+		symbolY: 10.5,
+		align: 'right',
+		buttonSpacing: 3,
+		height: 22,
+		// text: null,
+		theme: {
+			fill: 'white', // capture hover
+			stroke: 'none'
+		},
+		verticalAlign: 'top',
+		width: 24
+	}
+};
+
+
+
+// Add the export related options
+defaultOptions.exporting = {
+	//enabled: true,
+	//filename: 'chart',
+	type: 'image/png',
+	url: 'http://export.highcharts.com/',
+	//width: undefined,
+	//scale: 2
+	buttons: {
+		contextButton: {
+			menuClassName: PREFIX + 'contextmenu',
+			//x: -10,
+			symbol: 'menu',
+			_titleKey: 'contextButtonTitle',
+			menuItems: [{
+				textKey: 'printChart',
+				onclick: function () {
+					this.print();
+				}
+			}, {
+				separator: true
+			}, {
+				textKey: 'downloadPNG',
+				onclick: function () {
+					this.exportChart();
+				}
+			}, {
+				textKey: 'downloadJPEG',
+				onclick: function () {
+					this.exportChart({
+						type: 'image/jpeg'
+					});
+				}
+			}, {
+				textKey: 'downloadPDF',
+				onclick: function () {
+					this.exportChart({
+						type: 'application/pdf'
+					});
+				}
+			}, {
+				textKey: 'downloadSVG',
+				onclick: function () {
+					this.exportChart({
+						type: 'image/svg+xml'
+					});
+				}
+			}
+			// Enable this block to add "View SVG" to the dropdown menu
+			/*
+			,{
+
+				text: 'View SVG',
+				onclick: function () {
+					var svg = this.getSVG()
+						.replace(/</g, '\n&lt;')
+						.replace(/>/g, '&gt;');
+
+					doc.body.innerHTML = '<pre>' + svg + '</pre>';
+				}
+			} // */
+			]
+		}
+	}
+};
+
+// Add the Highcharts.post utility
+Highcharts.post = function (url, data, formAttributes) {
+	var name,
+		form;
+
+	// create the form
+	form = createElement('form', merge({
+		method: 'post',
+		action: url,
+		enctype: 'multipart/form-data'
+	}, formAttributes), {
+		display: NONE
+	}, doc.body);
+
+	// add the data
+	for (name in data) {
+		createElement('input', {
+			type: HIDDEN,
+			name: name,
+			value: data[name]
+		}, null, form);
+	}
+
+	// submit
+	form.submit();
+
+	// clean up
+	discardElement(form);
+};
+
+extend(Chart.prototype, {
+
+	/**
+	 * A collection of regex fixes on the produces SVG to account for expando properties,
+	 * browser bugs, VML problems and other. Returns a cleaned SVG.
+	 */
+	sanitizeSVG: function (svg) {
+		return svg
+			.replace(/zIndex="[^"]+"/g, '')
+			.replace(/isShadow="[^"]+"/g, '')
+			.replace(/symbolName="[^"]+"/g, '')
+			.replace(/jQuery[0-9]+="[^"]+"/g, '')
+			.replace(/url\([^#]+#/g, 'url(#')
+			.replace(/<svg /, '<svg xmlns:xlink="http://www.w3.org/1999/xlink" ')
+			.replace(/ (NS[0-9]+\:)?href=/g, ' xlink:href=') // #3567
+			.replace(/\n/, ' ')
+			// Any HTML added to the container after the SVG (#894)
+			.replace(/<\/svg>.*?$/, '</svg>') 
+			// Batik doesn't support rgba fills and strokes (#3095)
+			.replace(/(fill|stroke)="rgba\(([ 0-9]+,[ 0-9]+,[ 0-9]+),([ 0-9\.]+)\)"/g, '$1="rgb($2)" $1-opacity="$3"')
+			/* This fails in IE < 8
+			.replace(/([0-9]+)\.([0-9]+)/g, function(s1, s2, s3) { // round off to save weight
+				return s2 +'.'+ s3[0];
+			})*/
+
+			// Replace HTML entities, issue #347
+			.replace(/&nbsp;/g, '\u00A0') // no-break space
+			.replace(/&shy;/g,  '\u00AD') // soft hyphen
+
+			// IE specific
+			.replace(/<IMG /g, '<image ')
+			.replace(/height=([^" ]+)/g, 'height="$1"')
+			.replace(/width=([^" ]+)/g, 'width="$1"')
+			.replace(/hc-svg-href="([^"]+)">/g, 'xlink:href="$1"/>')
+			.replace(/ id=([^" >]+)/g, 'id="$1"') // #4003
+			.replace(/class=([^" >]+)/g, 'class="$1"')
+			.replace(/ transform /g, ' ')
+			.replace(/:(path|rect)/g, '$1')
+			.replace(/style="([^"]+)"/g, function (s) {
+				return s.toLowerCase();
+			});
+	},
+
+	/**
+	 * Return an SVG representation of the chart
+	 *
+	 * @param additionalOptions {Object} Additional chart options for the generated SVG representation
+	 */
+	getSVG: function (additionalOptions) {
+		var chart = this,
+			chartCopy,
+			sandbox,
+			svg,
+			seriesOptions,
+			sourceWidth,
+			sourceHeight,
+			cssWidth,
+			cssHeight,
+			options = merge(chart.options, additionalOptions); // copy the options and add extra options
+
+		// IE compatibility hack for generating SVG content that it doesn't really understand
+		if (!doc.createElementNS) {
+			/*jslint unparam: true*//* allow unused parameter ns in function below */
+			doc.createElementNS = function (ns, tagName) {
+				return doc.createElement(tagName);
+			};
+			/*jslint unparam: false*/
+		}
+
+		// create a sandbox where a new chart will be generated
+		sandbox = createElement(DIV, null, {
+			position: ABSOLUTE,
+			top: '-9999em',
+			width: chart.chartWidth + PX,
+			height: chart.chartHeight + PX
+		}, doc.body);
+
+		// get the source size
+		cssWidth = chart.renderTo.style.width;
+		cssHeight = chart.renderTo.style.height;
+		sourceWidth = options.exporting.sourceWidth ||
+			options.chart.width ||
+			(/px$/.test(cssWidth) && parseInt(cssWidth, 10)) ||
+			600;
+		sourceHeight = options.exporting.sourceHeight ||
+			options.chart.height ||
+			(/px$/.test(cssHeight) && parseInt(cssHeight, 10)) ||
+			400;
+
+		// override some options
+		extend(options.chart, {
+			animation: false,
+			renderTo: sandbox,
+			forExport: true,
+			width: sourceWidth,
+			height: sourceHeight
+		});
+		options.exporting.enabled = false; // hide buttons in print
+		delete options.data; // #3004
+
+		// prepare for replicating the chart
+		options.series = [];
+		each(chart.series, function (serie) {
+			seriesOptions = merge(serie.options, {
+				animation: false, // turn off animation
+				enableMouseTracking: false,
+				showCheckbox: false,
+				visible: serie.visible
+			});
+
+			if (!seriesOptions.isInternal) { // used for the navigator series that has its own option set
+				options.series.push(seriesOptions);
+			}
+		});
+
+		// Axis options must be merged in one by one, since it may be an array or an object (#2022, #3900)
+		if (additionalOptions) {
+			each(['xAxis', 'yAxis'], function (axisType) {
+				each(splat(additionalOptions[axisType]), function (axisOptions, i) {
+					options[axisType][i] = merge(options[axisType][i], axisOptions);
+				});
+			});
+		}
+
+		// generate the chart copy
+		chartCopy = new Highcharts.Chart(options, chart.callback);
+
+		// reflect axis extremes in the export
+		each(['xAxis', 'yAxis'], function (axisType) {
+			each(chart[axisType], function (axis, i) {
+				var axisCopy = chartCopy[axisType][i],
+					extremes = axis.getExtremes(),
+					userMin = extremes.userMin,
+					userMax = extremes.userMax;
+
+				if (axisCopy && (userMin !== UNDEFINED || userMax !== UNDEFINED)) {
+					axisCopy.setExtremes(userMin, userMax, true, false);
+				}
+			});
+		});
+
+		// get the SVG from the container's innerHTML
+		svg = chartCopy.container.innerHTML;
+
+		// free up memory
+		options = null;
+		chartCopy.destroy();
+		discardElement(sandbox);
+
+		// sanitize
+		svg = this.sanitizeSVG(svg);
+
+		// IE9 beta bugs with innerHTML. Test again with final IE9.
+		svg = svg.replace(/(url\(#highcharts-[0-9]+)&quot;/g, '$1')
+			.replace(/&quot;/g, "'");
+
+		return svg;
+	},
+
+	getSVGForExport: function (options, chartOptions) {
+		var chartExportingOptions = this.options.exporting;
+
+		return this.getSVG(merge(
+			{ chart: { borderRadius: 0 } },
+			chartExportingOptions.chartOptions,
+			chartOptions,
+			{
+				exporting: {
+					sourceWidth: (options && options.sourceWidth) || chartExportingOptions.sourceWidth,
+					sourceHeight: (options && options.sourceHeight) || chartExportingOptions.sourceHeight
+				}
+			}
+		));
+	},
+
+	/**
+	 * Submit the SVG representation of the chart to the server
+	 * @param {Object} options Exporting options. Possible members are url, type, width and formAttributes.
+	 * @param {Object} chartOptions Additional chart options for the SVG representation of the chart
+	 */
+	exportChart: function (options, chartOptions) {
+		
+		var svg = this.getSVGForExport(options, chartOptions);
+
+		// merge the options
+		options = merge(this.options.exporting, options);
+
+		// do the post
+		Highcharts.post(options.url, {
+			filename: options.filename || 'chart',
+			type: options.type,
+			width: options.width || 0, // IE8 fails to post undefined correctly, so use 0
+			scale: options.scale || 2,
+			svg: svg
+		}, options.formAttributes);
+
+	},
+
+	/**
+	 * Print the chart
+	 */
+	print: function () {
+
+		var chart = this,
+			container = chart.container,
+			origDisplay = [],
+			origParent = container.parentNode,
+			body = doc.body,
+			childNodes = body.childNodes;
+
+		if (chart.isPrinting) { // block the button while in printing mode
+			return;
+		}
+
+		chart.isPrinting = true;
+
+		fireEvent(chart, 'beforePrint');
+
+		// hide all body content
+		each(childNodes, function (node, i) {
+			if (node.nodeType === 1) {
+				origDisplay[i] = node.style.display;
+				node.style.display = NONE;
+			}
+		});
+
+		// pull out the chart
+		body.appendChild(container);
+
+		// print
+		win.focus(); // #1510
+		win.print();
+
+		// allow the browser to prepare before reverting
+		setTimeout(function () {
+
+			// put the chart back in
+			origParent.appendChild(container);
+
+			// restore all body content
+			each(childNodes, function (node, i) {
+				if (node.nodeType === 1) {
+					node.style.display = origDisplay[i];
+				}
+			});
+
+			chart.isPrinting = false;
+
+			fireEvent(chart, 'afterPrint');
+
+		}, 1000);
+
+	},
+
+	/**
+	 * Display a popup menu for choosing the export type
+	 *
+	 * @param {String} className An identifier for the menu
+	 * @param {Array} items A collection with text and onclicks for the items
+	 * @param {Number} x The x position of the opener button
+	 * @param {Number} y The y position of the opener button
+	 * @param {Number} width The width of the opener button
+	 * @param {Number} height The height of the opener button
+	 */
+	contextMenu: function (className, items, x, y, width, height, button) {
+		var chart = this,
+			navOptions = chart.options.navigation,
+			menuItemStyle = navOptions.menuItemStyle,
+			chartWidth = chart.chartWidth,
+			chartHeight = chart.chartHeight,
+			cacheName = 'cache-' + className,
+			menu = chart[cacheName],
+			menuPadding = mathMax(width, height), // for mouse leave detection
+			boxShadow = '3px 3px 10px #888',
+			innerMenu,
+			hide,
+			hideTimer,
+			menuStyle,
+			docMouseUpHandler = function (e) {
+				if (!chart.pointer.inClass(e.target, className)) {
+					hide();
+				}
+			};
+
+		// create the menu only the first time
+		if (!menu) {
+
+			// create a HTML element above the SVG
+			chart[cacheName] = menu = createElement(DIV, {
+				className: className
+			}, {
+				position: ABSOLUTE,
+				zIndex: 1000,
+				padding: menuPadding + PX
+			}, chart.container);
+
+			innerMenu = createElement(DIV, null,
+				extend({
+					MozBoxShadow: boxShadow,
+					WebkitBoxShadow: boxShadow,
+					boxShadow: boxShadow
+				}, navOptions.menuStyle), menu);
+
+			// hide on mouse out
+			hide = function () {
+				css(menu, { display: NONE });
+				if (button) {
+					button.setState(0);
+				}
+				chart.openMenu = false;
+			};
+
+			// Hide the menu some time after mouse leave (#1357)
+			addEvent(menu, 'mouseleave', function () {
+				hideTimer = setTimeout(hide, 500);
+			});
+			addEvent(menu, 'mouseenter', function () {
+				clearTimeout(hideTimer);
+			});
+
+
+			// Hide it on clicking or touching outside the menu (#2258, #2335, #2407)
+			addEvent(document, 'mouseup', docMouseUpHandler);
+			addEvent(chart, 'destroy', function () {
+				removeEvent(document, 'mouseup', docMouseUpHandler);
+			});
+
+
+			// create the items
+			each(items, function (item) {
+				if (item) {
+					var element = item.separator ?
+						createElement('hr', null, null, innerMenu) :
+						createElement(DIV, {
+							onmouseover: function () {
+								css(this, navOptions.menuItemHoverStyle);
+							},
+							onmouseout: function () {
+								css(this, menuItemStyle);
+							},
+							onclick: function () {
+								hide();
+								if (item.onclick) {
+									item.onclick.apply(chart, arguments);
+								}
+							},
+							innerHTML: item.text || chart.options.lang[item.textKey]
+						}, extend({
+							cursor: 'pointer'
+						}, menuItemStyle), innerMenu);
+
+
+					// Keep references to menu divs to be able to destroy them
+					chart.exportDivElements.push(element);
+				}
+			});
+
+			// Keep references to menu and innerMenu div to be able to destroy them
+			chart.exportDivElements.push(innerMenu, menu);
+
+			chart.exportMenuWidth = menu.offsetWidth;
+			chart.exportMenuHeight = menu.offsetHeight;
+		}
+
+		menuStyle = { display: 'block' };
+
+		// if outside right, right align it
+		if (x + chart.exportMenuWidth > chartWidth) {
+			menuStyle.right = (chartWidth - x - width - menuPadding) + PX;
+		} else {
+			menuStyle.left = (x - menuPadding) + PX;
+		}
+		// if outside bottom, bottom align it
+		if (y + height + chart.exportMenuHeight > chartHeight && button.alignOptions.verticalAlign !== 'top') {
+			menuStyle.bottom = (chartHeight - y - menuPadding)  + PX;
+		} else {
+			menuStyle.top = (y + height - menuPadding) + PX;
+		}
+
+		css(menu, menuStyle);
+		chart.openMenu = true;
+	},
+
+	/**
+	 * Add the export button to the chart
+	 */
+	addButton: function (options) {
+		var chart = this,
+			renderer = chart.renderer,
+			btnOptions = merge(chart.options.navigation.buttonOptions, options),
+			onclick = btnOptions.onclick,
+			menuItems = btnOptions.menuItems,
+			symbol,
+			button,
+			symbolAttr = {
+				stroke: btnOptions.symbolStroke,
+				fill: btnOptions.symbolFill
+			},
+			symbolSize = btnOptions.symbolSize || 12;
+		if (!chart.btnCount) {
+			chart.btnCount = 0;
+		}
+
+		// Keeps references to the button elements
+		if (!chart.exportDivElements) {
+			chart.exportDivElements = [];
+			chart.exportSVGElements = [];
+		}
+
+		if (btnOptions.enabled === false) {
+			return;
+		}
+
+
+		var attr = btnOptions.theme,
+			states = attr.states,
+			hover = states && states.hover,
+			select = states && states.select,
+			callback;
+
+		delete attr.states;
+
+		if (onclick) {
+			callback = function () {
+				onclick.apply(chart, arguments);
+			};
+
+		} else if (menuItems) {
+			callback = function () {
+				chart.contextMenu(
+					button.menuClassName,
+					menuItems,
+					button.translateX,
+					button.translateY,
+					button.width,
+					button.height,
+					button
+				);
+				button.setState(2);
+			};
+		}
+
+
+		if (btnOptions.text && btnOptions.symbol) {
+			attr.paddingLeft = Highcharts.pick(attr.paddingLeft, 25);
+
+		} else if (!btnOptions.text) {
+			extend(attr, {
+				width: btnOptions.width,
+				height: btnOptions.height,
+				padding: 0
+			});
+		}
+
+		button = renderer.button(btnOptions.text, 0, 0, callback, attr, hover, select)
+			.attr({
+				title: chart.options.lang[btnOptions._titleKey],
+				'stroke-linecap': 'round'
+			});
+		button.menuClassName = options.menuClassName || PREFIX + 'menu-' + chart.btnCount++;
+
+		if (btnOptions.symbol) {
+			symbol = renderer.symbol(
+					btnOptions.symbol,
+					btnOptions.symbolX - (symbolSize / 2),
+					btnOptions.symbolY - (symbolSize / 2),
+					symbolSize,
+					symbolSize
+				)
+				.attr(extend(symbolAttr, {
+					'stroke-width': btnOptions.symbolStrokeWidth || 1,
+					zIndex: 1
+				})).add(button);
+		}
+
+		button.add()
+			.align(extend(btnOptions, {
+				width: button.width,
+				x: Highcharts.pick(btnOptions.x, buttonOffset) // #1654
+			}), true, 'spacingBox');
+
+		buttonOffset += (button.width + btnOptions.buttonSpacing) * (btnOptions.align === 'right' ? -1 : 1);
+
+		chart.exportSVGElements.push(button, symbol);
+
+	},
+
+	/**
+	 * Destroy the buttons.
+	 */
+	destroyExport: function (e) {
+		var chart = e.target,
+			i,
+			elem;
+
+		// Destroy the extra buttons added
+		for (i = 0; i < chart.exportSVGElements.length; i++) {
+			elem = chart.exportSVGElements[i];
+
+			// Destroy and null the svg/vml elements
+			if (elem) { // #1822
+				elem.onclick = elem.ontouchstart = null;
+				chart.exportSVGElements[i] = elem.destroy();
+			}
+		}
+
+		// Destroy the divs for the menu
+		for (i = 0; i < chart.exportDivElements.length; i++) {
+			elem = chart.exportDivElements[i];
+
+			// Remove the event handler
+			removeEvent(elem, 'mouseleave');
+
+			// Remove inline events
+			chart.exportDivElements[i] = elem.onmouseout = elem.onmouseover = elem.ontouchstart = elem.onclick = null;
+
+			// Destroy the div by moving to garbage bin
+			discardElement(elem);
+		}
+	}
+});
+
+
+symbols.menu = function (x, y, width, height) {
+	var arr = [
+		M, x, y + 2.5,
+		L, x + width, y + 2.5,
+		M, x, y + height / 2 + 0.5,
+		L, x + width, y + height / 2 + 0.5,
+		M, x, y + height - 1.5,
+		L, x + width, y + height - 1.5
+	];
+	return arr;
+};
+
+// Add the buttons on chart load
+Chart.prototype.callbacks.push(function (chart) {
+	var n,
+		exportingOptions = chart.options.exporting,
+		buttons = exportingOptions.buttons;
+
+	buttonOffset = 0;
+
+	if (exportingOptions.enabled !== false) {
+
+		for (n in buttons) {
+			chart.addButton(buttons[n]);
+		}
+
+		// Destroy the export elements at chart destroy
+		addEvent(chart, 'destroy', chart.destroyExport);
+	}
+
+});
+
+
+}(Highcharts));
diff --git a/data/interfaces/default/js/highcharts/js/modules/funnel.js b/data/interfaces/default/js/highcharts/js/modules/funnel.js
new file mode 100644
index 00000000..6b4f42c9
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/modules/funnel.js
@@ -0,0 +1,13 @@
+/*
+ 
+ Highcharts funnel module
+
+ (c) 2010-2014 Torstein Honsi
+
+ License: www.highcharts.com/license
+*/
+(function(b){var q=b.getOptions(),w=q.plotOptions,r=b.seriesTypes,G=b.merge,E=function(){},B=b.each,F=b.pick;w.funnel=G(w.pie,{animation:!1,center:["50%","50%"],width:"90%",neckWidth:"30%",height:"100%",neckHeight:"25%",reversed:!1,dataLabels:{connectorWidth:1,connectorColor:"#606060"},size:!0,states:{select:{color:"#C0C0C0",borderColor:"#000000",shadow:!1}}});r.funnel=b.extendClass(r.pie,{type:"funnel",animate:E,translate:function(){var a=function(i,a){return/%$/.test(i)?a*parseInt(i,10)/100:parseInt(i,
+10)},C=0,e=this.chart,c=this.options,b=c.reversed,j=e.plotWidth,f=e.plotHeight,n=0,e=c.center,g=a(e[0],j),q=a(e[1],f),r=a(c.width,j),k,s,d=a(c.height,f),t=a(c.neckWidth,j),u=a(c.neckHeight,f),x=d-u,a=this.data,y,z,w=c.dataLabels.position==="left"?1:0,A,l,D,p,h,v,m;this.getWidthAt=s=function(i){return i>d-u||d===u?t:t+(r-t)*((d-u-i)/(d-u))};this.getX=function(i,a){return g+(a?-1:1)*(s(b?f-i:i)/2+c.dataLabels.distance)};this.center=[g,q,d];this.centerX=g;B(a,function(a){C+=a.y});B(a,function(a){m=null;
+z=C?a.y/C:0;l=q-d/2+n*d;h=l+z*d;k=s(l);A=g-k/2;D=A+k;k=s(h);p=g-k/2;v=p+k;l>x?(A=p=g-t/2,D=v=g+t/2):h>x&&(m=h,k=s(x),p=g-k/2,v=p+k,h=x);b&&(l=d-l,h=d-h,m=m?d-m:null);y=["M",A,l,"L",D,l,v,h];m&&y.push(v,m,p,m);y.push(p,h,"Z");a.shapeType="path";a.shapeArgs={d:y};a.percentage=z*100;a.plotX=g;a.plotY=(l+(m||h))/2;a.tooltipPos=[g,a.plotY];a.slice=E;a.half=w;n+=z})},drawPoints:function(){var a=this,b=a.options,e=a.chart.renderer;B(a.data,function(c){var o=c.options,j=c.graphic,f=c.shapeArgs;j?j.animate(f):
+c.graphic=e.path(f).attr({fill:c.color,stroke:F(o.borderColor,b.borderColor),"stroke-width":F(o.borderWidth,b.borderWidth)}).add(a.group)})},sortByAngle:function(a){a.sort(function(a,b){return a.plotY-b.plotY})},drawDataLabels:function(){var a=this.data,b=this.options.dataLabels.distance,e,c,o,j=a.length,f,n;for(this.center[2]-=2*b;j--;)o=a[j],c=(e=o.half)?1:-1,n=o.plotY,f=this.getX(n,e),o.labelPos=[0,n,f+(b-5)*c,n,f+b*c,n,e?"right":"left",0];r.pie.prototype.drawDataLabels.call(this)}});q.plotOptions.pyramid=
+b.merge(q.plotOptions.funnel,{neckWidth:"0%",neckHeight:"0%",reversed:!0});b.seriesTypes.pyramid=b.extendClass(b.seriesTypes.funnel,{type:"pyramid"})})(Highcharts);
diff --git a/data/interfaces/default/js/highcharts/js/modules/funnel.src.js b/data/interfaces/default/js/highcharts/js/modules/funnel.src.js
new file mode 100644
index 00000000..e58d1091
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/modules/funnel.src.js
@@ -0,0 +1,310 @@
+/**
+ * @license 
+ * Highcharts funnel module
+ *
+ * (c) 2010-2014 Torstein Honsi
+ *
+ * License: www.highcharts.com/license
+ */
+
+/*global Highcharts */
+(function (Highcharts) {
+	
+'use strict';
+
+// create shortcuts
+var defaultOptions = Highcharts.getOptions(),
+	defaultPlotOptions = defaultOptions.plotOptions,
+	seriesTypes = Highcharts.seriesTypes,
+	merge = Highcharts.merge,
+	noop = function () {},
+	each = Highcharts.each,
+	pick = Highcharts.pick;
+
+// set default options
+defaultPlotOptions.funnel = merge(defaultPlotOptions.pie, {
+	animation: false,
+	center: ['50%', '50%'],
+	width: '90%',
+	neckWidth: '30%',
+	height: '100%',
+	neckHeight: '25%',
+	reversed: false,
+	dataLabels: {
+		//position: 'right',
+		connectorWidth: 1,
+		connectorColor: '#606060'
+	},
+	size: true, // to avoid adapting to data label size in Pie.drawDataLabels
+	states: {
+		select: {
+			color: '#C0C0C0',
+			borderColor: '#000000',
+			shadow: false
+		}
+	}	
+});
+
+
+seriesTypes.funnel = Highcharts.extendClass(seriesTypes.pie, {
+	
+	type: 'funnel',
+	animate: noop,
+
+	/**
+	 * Overrides the pie translate method
+	 */
+	translate: function () {
+		
+		var 
+			// Get positions - either an integer or a percentage string must be given
+			getLength = function (length, relativeTo) {
+				return (/%$/).test(length) ?
+					relativeTo * parseInt(length, 10) / 100 :
+					parseInt(length, 10);
+			},
+			
+			sum = 0,
+			series = this,
+			chart = series.chart,
+			options = series.options,
+			reversed = options.reversed,
+			plotWidth = chart.plotWidth,
+			plotHeight = chart.plotHeight,
+			cumulative = 0, // start at top
+			center = options.center,
+			centerX = getLength(center[0], plotWidth),
+			centerY = getLength(center[1], plotHeight),
+			width = getLength(options.width, plotWidth),
+			tempWidth,
+			getWidthAt,
+			height = getLength(options.height, plotHeight),
+			neckWidth = getLength(options.neckWidth, plotWidth),
+			neckHeight = getLength(options.neckHeight, plotHeight),
+			neckY = height - neckHeight,
+			data = series.data,
+			path,
+			fraction,
+			half = options.dataLabels.position === 'left' ? 1 : 0,
+
+			x1, 
+			y1, 
+			x2, 
+			x3, 
+			y3, 
+			x4, 
+			y5;
+
+		// Return the width at a specific y coordinate
+		series.getWidthAt = getWidthAt = function (y) {
+			return y > height - neckHeight || height === neckHeight ?
+				neckWidth :
+				neckWidth + (width - neckWidth) * ((height - neckHeight - y) / (height - neckHeight));
+		};
+		series.getX = function (y, half) {
+					return centerX + (half ? -1 : 1) * ((getWidthAt(reversed ? plotHeight - y : y) / 2) + options.dataLabels.distance);
+		};
+
+		// Expose
+		series.center = [centerX, centerY, height];
+		series.centerX = centerX;
+
+		/*
+		 * Individual point coordinate naming:
+		 *
+		 * x1,y1 _________________ x2,y1
+		 *  \                         /
+		 *   \                       /
+		 *    \                     /
+		 *     \                   /
+		 *      \                 /
+		 *     x3,y3 _________ x4,y3
+		 *
+		 * Additional for the base of the neck:
+		 *
+		 *       |               |
+		 *       |               |
+		 *       |               |
+		 *     x3,y5 _________ x4,y5
+		 */
+
+
+
+
+		// get the total sum
+		each(data, function (point) {
+			sum += point.y;
+		});
+
+		each(data, function (point) {
+			// set start and end positions
+			y5 = null;
+			fraction = sum ? point.y / sum : 0;
+			y1 = centerY - height / 2 + cumulative * height;
+			y3 = y1 + fraction * height;
+			//tempWidth = neckWidth + (width - neckWidth) * ((height - neckHeight - y1) / (height - neckHeight));
+			tempWidth = getWidthAt(y1);
+			x1 = centerX - tempWidth / 2;
+			x2 = x1 + tempWidth;
+			tempWidth = getWidthAt(y3);
+			x3 = centerX - tempWidth / 2;
+			x4 = x3 + tempWidth;
+
+			// the entire point is within the neck
+			if (y1 > neckY) {
+				x1 = x3 = centerX - neckWidth / 2;
+				x2 = x4 = centerX + neckWidth / 2;
+			
+			// the base of the neck
+			} else if (y3 > neckY) {
+				y5 = y3;
+
+				tempWidth = getWidthAt(neckY);
+				x3 = centerX - tempWidth / 2;
+				x4 = x3 + tempWidth;
+
+				y3 = neckY;
+			}
+
+			if (reversed) {
+				y1 = height - y1;
+				y3 = height - y3;
+				y5 = (y5 ? height - y5 : null);
+			}
+			// save the path
+			path = [
+				'M',
+				x1, y1,
+				'L',
+				x2, y1,
+				x4, y3
+			];
+			if (y5) {
+				path.push(x4, y5, x3, y5);
+			}
+			path.push(x3, y3, 'Z');
+
+			// prepare for using shared dr
+			point.shapeType = 'path';
+			point.shapeArgs = { d: path };
+
+
+			// for tooltips and data labels
+			point.percentage = fraction * 100;
+			point.plotX = centerX;
+			point.plotY = (y1 + (y5 || y3)) / 2;
+
+			// Placement of tooltips and data labels
+			point.tooltipPos = [
+				centerX,
+				point.plotY
+			];
+
+			// Slice is a noop on funnel points
+			point.slice = noop;
+			
+			// Mimicking pie data label placement logic
+			point.half = half;
+
+			cumulative += fraction;
+		});		
+	},
+	/**
+	 * Draw a single point (wedge)
+	 * @param {Object} point The point object
+	 * @param {Object} color The color of the point
+	 * @param {Number} brightness The brightness relative to the color
+	 */
+	drawPoints: function () {
+		var series = this,
+			options = series.options,
+			chart = series.chart,
+			renderer = chart.renderer;
+
+		each(series.data, function (point) {
+			var pointOptions = point.options,
+				graphic = point.graphic,
+				shapeArgs = point.shapeArgs;
+
+			if (!graphic) { // Create the shapes				
+				point.graphic = renderer.path(shapeArgs).
+					attr({
+						fill: point.color,
+						stroke: pick(pointOptions.borderColor, options.borderColor),
+						'stroke-width': pick(pointOptions.borderWidth, options.borderWidth)
+					}).
+					add(series.group);
+					
+			} else { // Update the shapes
+				graphic.animate(shapeArgs);
+			}
+		});
+	},
+
+	/**
+	 * Funnel items don't have angles (#2289)
+	 */
+	sortByAngle: function (points) {
+		points.sort(function (a, b) {
+			return a.plotY - b.plotY;
+		});
+	},
+	
+	/**
+	 * Extend the pie data label method
+	 */
+	drawDataLabels: function () {
+		var data = this.data,
+			labelDistance = this.options.dataLabels.distance,
+			leftSide,
+			sign,
+			point,
+			i = data.length,
+			x,
+			y;
+		
+		// In the original pie label anticollision logic, the slots are distributed
+		// from one labelDistance above to one labelDistance below the pie. In funnels
+		// we don't want this.
+		this.center[2] -= 2 * labelDistance;
+		
+		// Set the label position array for each point.
+		while (i--) {
+			point = data[i];
+			leftSide = point.half;
+			sign = leftSide ? 1 : -1;
+			y = point.plotY;
+			x = this.getX(y, leftSide);
+				
+			// set the anchor point for data labels
+			point.labelPos = [
+				0, // first break of connector
+				y, // a/a
+				x + (labelDistance - 5) * sign, // second break, right outside point shape
+				y, // a/a
+				x + labelDistance * sign, // landing point for connector
+				y, // a/a
+				leftSide ? 'right' : 'left', // alignment
+				0 // center angle
+			];
+		}
+		
+		seriesTypes.pie.prototype.drawDataLabels.call(this);
+	}
+
+});
+
+/** 
+ * Pyramid series type.
+ * A pyramid series is a special type of funnel, without neck and reversed by default.
+ */
+defaultOptions.plotOptions.pyramid = Highcharts.merge(defaultOptions.plotOptions.funnel, {        
+	neckWidth: '0%',
+	neckHeight: '0%',
+	reversed: true
+});
+Highcharts.seriesTypes.pyramid = Highcharts.extendClass(Highcharts.seriesTypes.funnel, {
+	type: 'pyramid'
+});
+
+}(Highcharts));
diff --git a/data/interfaces/default/js/highcharts/js/modules/heatmap.js b/data/interfaces/default/js/highcharts/js/modules/heatmap.js
new file mode 100644
index 00000000..38c6beba
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/modules/heatmap.js
@@ -0,0 +1,23 @@
+/*
+ Highcharts JS v4.1.6 (2015-06-12)
+
+ (c) 2011-2014 Torstein Honsi
+
+ License: www.highcharts.com/license
+*/
+(function(h){var n=h.Axis,r=h.Chart,k=h.Color,x=h.Legend,t=h.LegendSymbolMixin,u=h.Series,v=h.getOptions(),i=h.each,s=h.extend,y=h.extendClass,l=h.merge,m=h.pick,p=h.seriesTypes,w=h.wrap,o=function(){},q=h.ColorAxis=function(){this.isColorAxis=!0;this.init.apply(this,arguments)};s(q.prototype,n.prototype);s(q.prototype,{defaultColorAxisOptions:{lineWidth:0,gridLineWidth:1,tickPixelInterval:72,startOnTick:!0,endOnTick:!0,offset:0,marker:{animation:{duration:50},color:"gray",width:0.01},labels:{overflow:"justify"},
+minColor:"#EFEFFF",maxColor:"#003875",tickLength:5},init:function(a,b){var d=a.options.legend.layout!=="vertical",c;c=l(this.defaultColorAxisOptions,{side:d?2:1,reversed:!d},b,{isX:d,opposite:!d,showEmpty:!1,title:null,isColor:!0});n.prototype.init.call(this,a,c);b.dataClasses&&this.initDataClasses(b);this.initStops(b);this.isXAxis=!0;this.horiz=d;this.zoomEnabled=!1},tweenColors:function(a,b,d){var c;!b.rgba.length||!a.rgba.length?a=b.raw||"none":(a=a.rgba,b=b.rgba,c=b[3]!==1||a[3]!==1,a=(c?"rgba(":
+"rgb(")+Math.round(b[0]+(a[0]-b[0])*(1-d))+","+Math.round(b[1]+(a[1]-b[1])*(1-d))+","+Math.round(b[2]+(a[2]-b[2])*(1-d))+(c?","+(b[3]+(a[3]-b[3])*(1-d)):"")+")");return a},initDataClasses:function(a){var b=this,d=this.chart,c,e=0,f=this.options,g=a.dataClasses.length;this.dataClasses=c=[];this.legendItems=[];i(a.dataClasses,function(a,h){var i,a=l(a);c.push(a);if(!a.color)f.dataClassColor==="category"?(i=d.options.colors,a.color=i[e++],e===i.length&&(e=0)):a.color=b.tweenColors(k(f.minColor),k(f.maxColor),
+g<2?0.5:h/(g-1))})},initStops:function(a){this.stops=a.stops||[[0,this.options.minColor],[1,this.options.maxColor]];i(this.stops,function(a){a.color=k(a[1])})},setOptions:function(a){n.prototype.setOptions.call(this,a);this.options.crosshair=this.options.marker;this.coll="colorAxis"},setAxisSize:function(){var a=this.legendSymbol,b=this.chart,d,c,e;if(a)this.left=d=a.attr("x"),this.top=c=a.attr("y"),this.width=e=a.attr("width"),this.height=a=a.attr("height"),this.right=b.chartWidth-d-e,this.bottom=
+b.chartHeight-c-a,this.len=this.horiz?e:a,this.pos=this.horiz?d:c},toColor:function(a,b){var d,c=this.stops,e,f=this.dataClasses,g,j;if(f)for(j=f.length;j--;){if(g=f[j],e=g.from,c=g.to,(e===void 0||a>=e)&&(c===void 0||a<=c)){d=g.color;if(b)b.dataClass=j;break}}else{this.isLog&&(a=this.val2lin(a));d=1-(this.max-a)/(this.max-this.min||1);for(j=c.length;j--;)if(d>c[j][0])break;e=c[j]||c[j+1];c=c[j+1]||e;d=1-(c[0]-d)/(c[0]-e[0]||1);d=this.tweenColors(e.color,c.color,d)}return d},getOffset:function(){var a=
+this.legendGroup,b=this.chart.axisOffset[this.side];if(a){n.prototype.getOffset.call(this);if(!this.axisGroup.parentGroup)this.axisGroup.add(a),this.gridGroup.add(a),this.labelGroup.add(a),this.added=!0,this.labelLeft=0,this.labelRight=this.width;this.chart.axisOffset[this.side]=b}},setLegendColor:function(){var a,b=this.options;a=this.reversed;a=this.horiz?[+a,0,+!a,0]:[0,+!a,0,+a];this.legendColor={linearGradient:{x1:a[0],y1:a[1],x2:a[2],y2:a[3]},stops:b.stops||[[0,b.minColor],[1,b.maxColor]]}},
+drawLegendSymbol:function(a,b){var d=a.padding,c=a.options,e=this.horiz,f=m(c.symbolWidth,e?200:12),g=m(c.symbolHeight,e?12:200),j=m(c.labelPadding,e?16:30),c=m(c.itemDistance,10);this.setLegendColor();b.legendSymbol=this.chart.renderer.rect(0,a.baseline-11,f,g).attr({zIndex:1}).add(b.legendGroup);b.legendSymbol.getBBox();this.legendItemWidth=f+d+(e?c:j);this.legendItemHeight=g+d+(e?j:0)},setState:o,visible:!0,setVisible:o,getSeriesExtremes:function(){var a;if(this.series.length)a=this.series[0],
+this.dataMin=a.valueMin,this.dataMax=a.valueMax},drawCrosshair:function(a,b){var d=b&&b.plotX,c=b&&b.plotY,e,f=this.pos,g=this.len;if(b)e=this.toPixels(b[b.series.colorKey]),e<f?e=f-2:e>f+g&&(e=f+g+2),b.plotX=e,b.plotY=this.len-e,n.prototype.drawCrosshair.call(this,a,b),b.plotX=d,b.plotY=c,this.cross&&this.cross.attr({fill:this.crosshair.color}).add(this.legendGroup)},getPlotLinePath:function(a,b,d,c,e){return typeof e==="number"?this.horiz?["M",e-4,this.top-6,"L",e+4,this.top-6,e,this.top,"Z"]:["M",
+this.left,e,"L",this.left-6,e+6,this.left-6,e-6,"Z"]:n.prototype.getPlotLinePath.call(this,a,b,d,c)},update:function(a,b){var d=this.chart,c=d.legend;i(this.series,function(a){a.isDirtyData=!0});if(a.dataClasses)i(c.allItems,function(a){a.isDataClass&&a.legendGroup.destroy()}),d.isDirtyLegend=!0;d.options[this.coll]=l(this.userOptions,a);n.prototype.update.call(this,a,b);this.legendItem&&(this.setLegendColor(),c.colorizeItem(this,!0))},getDataClassLegendSymbols:function(){var a=this,b=this.chart,
+d=this.legendItems,c=b.options.legend,e=c.valueDecimals,f=c.valueSuffix||"",g;d.length||i(this.dataClasses,function(c,n){var k=!0,l=c.from,m=c.to;g="";l===void 0?g="< ":m===void 0&&(g="> ");l!==void 0&&(g+=h.numberFormat(l,e)+f);l!==void 0&&m!==void 0&&(g+=" - ");m!==void 0&&(g+=h.numberFormat(m,e)+f);d.push(s({chart:b,name:g,options:{},drawLegendSymbol:t.drawRectangle,visible:!0,setState:o,isDataClass:!0,setVisible:function(){k=this.visible=!k;i(a.series,function(a){i(a.points,function(a){a.dataClass===
+n&&a.setVisible(k)})});b.legend.colorizeItem(this,k)}},c))});return d},name:""});i(["fill","stroke"],function(a){HighchartsAdapter.addAnimSetter(a,function(b){b.elem.attr(a,q.prototype.tweenColors(k(b.start),k(b.end),b.pos))})});w(r.prototype,"getAxes",function(a){var b=this.options.colorAxis;a.call(this);this.colorAxis=[];b&&new q(this,b)});w(x.prototype,"getAllItems",function(a){var b=[],d=this.chart.colorAxis[0];d&&(d.options.dataClasses?b=b.concat(d.getDataClassLegendSymbols()):b.push(d),i(d.series,
+function(a){a.options.showInLegend=!1}));return b.concat(a.call(this))});r={pointAttrToOptions:{stroke:"borderColor","stroke-width":"borderWidth",fill:"color",dashstyle:"dashStyle"},pointArrayMap:["value"],axisTypes:["xAxis","yAxis","colorAxis"],optionalAxis:"colorAxis",trackerGroups:["group","markerGroup","dataLabelsGroup"],getSymbol:o,parallelArrays:["x","y","value"],colorKey:"value",translateColors:function(){var a=this,b=this.options.nullColor,d=this.colorAxis,c=this.colorKey;i(this.data,function(e){var f=
+e[c];if(f=f===null?b:d&&f!==void 0?d.toColor(f,e):e.color||a.color)e.color=f})}};v.plotOptions.heatmap=l(v.plotOptions.scatter,{animation:!1,borderWidth:0,nullColor:"#F8F8F8",dataLabels:{formatter:function(){return this.point.value},inside:!0,verticalAlign:"middle",crop:!1,overflow:!1,padding:0},marker:null,pointRange:null,tooltip:{pointFormat:"{point.x}, {point.y}: {point.value}<br/>"},states:{normal:{animation:!0},hover:{halo:!1,brightness:0.2}}});p.heatmap=y(p.scatter,l(r,{type:"heatmap",pointArrayMap:["y",
+"value"],hasPointSpecificOptions:!0,supportsDrilldown:!0,getExtremesFromAll:!0,directTouch:!0,init:function(){var a;p.scatter.prototype.init.apply(this,arguments);a=this.options;this.pointRange=a.pointRange=m(a.pointRange,a.colsize||1);this.yAxis.axisPointRange=a.rowsize||1},translate:function(){var a=this.options,b=this.xAxis,d=this.yAxis;this.generatePoints();i(this.points,function(c){var e=(a.colsize||1)/2,f=(a.rowsize||1)/2,g=Math.round(b.len-b.translate(c.x-e,0,1,0,1)),e=Math.round(b.len-b.translate(c.x+
+e,0,1,0,1)),h=Math.round(d.translate(c.y-f,0,1,0,1)),f=Math.round(d.translate(c.y+f,0,1,0,1));c.plotX=c.clientX=(g+e)/2;c.plotY=(h+f)/2;c.shapeType="rect";c.shapeArgs={x:Math.min(g,e),y:Math.min(h,f),width:Math.abs(e-g),height:Math.abs(f-h)}});this.translateColors();this.chart.hasRendered&&i(this.points,function(a){a.shapeArgs.fill=a.options.color||a.color})},drawPoints:p.column.prototype.drawPoints,animate:o,getBox:o,drawLegendSymbol:t.drawRectangle,getExtremes:function(){u.prototype.getExtremes.call(this,
+this.valueData);this.valueMin=this.dataMin;this.valueMax=this.dataMax;u.prototype.getExtremes.call(this)}}))})(Highcharts);
diff --git a/data/interfaces/default/js/highcharts/js/modules/heatmap.src.js b/data/interfaces/default/js/highcharts/js/modules/heatmap.src.js
new file mode 100644
index 00000000..8160107f
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/modules/heatmap.src.js
@@ -0,0 +1,680 @@
+/**
+ * @license Highcharts JS v4.1.6 (2015-06-12)
+ *
+ * (c) 2011-2014 Torstein Honsi
+ *
+ * License: www.highcharts.com/license
+ */
+
+/*global HighchartsAdapter*/
+(function (Highcharts) {
+
+
+var UNDEFINED,
+	Axis = Highcharts.Axis,
+	Chart = Highcharts.Chart,
+	Color = Highcharts.Color,
+	Legend = Highcharts.Legend,
+	LegendSymbolMixin = Highcharts.LegendSymbolMixin,
+	Series = Highcharts.Series,
+	
+	defaultOptions = Highcharts.getOptions(),
+	each = Highcharts.each,
+	extend = Highcharts.extend,
+	extendClass = Highcharts.extendClass,
+	merge = Highcharts.merge,
+	pick = Highcharts.pick,
+	seriesTypes = Highcharts.seriesTypes,
+	wrap = Highcharts.wrap,
+	noop = function () {};
+
+	
+
+
+/**
+ * The ColorAxis object for inclusion in gradient legends
+ */
+var ColorAxis = Highcharts.ColorAxis = function () {
+	this.isColorAxis = true;
+	this.init.apply(this, arguments);
+};
+extend(ColorAxis.prototype, Axis.prototype);
+extend(ColorAxis.prototype, {
+	defaultColorAxisOptions: {
+		lineWidth: 0,
+		gridLineWidth: 1,
+		tickPixelInterval: 72,
+		startOnTick: true,
+		endOnTick: true,
+		offset: 0,
+		marker: {
+			animation: {
+				duration: 50
+			},
+			color: 'gray',
+			width: 0.01
+		},
+		labels: {
+			overflow: 'justify'
+		},
+		minColor: '#EFEFFF',
+		maxColor: '#003875',
+		tickLength: 5
+	},
+	init: function (chart, userOptions) {
+		var horiz = chart.options.legend.layout !== 'vertical',
+			options;
+
+		// Build the options
+		options = merge(this.defaultColorAxisOptions, {
+			side: horiz ? 2 : 1,
+			reversed: !horiz
+		}, userOptions, {
+			isX: horiz,
+			opposite: !horiz,
+			showEmpty: false,
+			title: null,
+			isColor: true
+		});
+
+		Axis.prototype.init.call(this, chart, options);
+
+		// Base init() pushes it to the xAxis array, now pop it again
+		//chart[this.isXAxis ? 'xAxis' : 'yAxis'].pop();
+
+		// Prepare data classes
+		if (userOptions.dataClasses) {
+			this.initDataClasses(userOptions);
+		}
+		this.initStops(userOptions);
+
+		// Override original axis properties
+		this.isXAxis = true;
+		this.horiz = horiz;
+		this.zoomEnabled = false;
+	},
+
+	/*
+	 * Return an intermediate color between two colors, according to pos where 0
+	 * is the from color and 1 is the to color. 
+	 * NOTE: Changes here should be copied
+	 * to the same function in drilldown.src.js and solid-gauge-src.js.
+	 */
+	tweenColors: function (from, to, pos) {
+		// Check for has alpha, because rgba colors perform worse due to lack of
+		// support in WebKit.
+		var hasAlpha,
+			ret;
+
+		// Unsupported color, return to-color (#3920)
+		if (!to.rgba.length || !from.rgba.length) {
+			ret = to.raw || 'none';
+
+		// Interpolate
+		} else {
+			from = from.rgba;
+			to = to.rgba;
+			hasAlpha = (to[3] !== 1 || from[3] !== 1);
+			ret = (hasAlpha ? 'rgba(' : 'rgb(') + 
+				Math.round(to[0] + (from[0] - to[0]) * (1 - pos)) + ',' + 
+				Math.round(to[1] + (from[1] - to[1]) * (1 - pos)) + ',' + 
+				Math.round(to[2] + (from[2] - to[2]) * (1 - pos)) + 
+				(hasAlpha ? (',' + (to[3] + (from[3] - to[3]) * (1 - pos))) : '') + ')';
+		}
+		return ret;
+	},
+
+	initDataClasses: function (userOptions) {
+		var axis = this,
+			chart = this.chart,
+			dataClasses,
+			colorCounter = 0,
+			options = this.options,
+			len = userOptions.dataClasses.length;
+		this.dataClasses = dataClasses = [];
+		this.legendItems = [];
+
+		each(userOptions.dataClasses, function (dataClass, i) {
+			var colors;
+
+			dataClass = merge(dataClass);
+			dataClasses.push(dataClass);
+			if (!dataClass.color) {
+				if (options.dataClassColor === 'category') {
+					colors = chart.options.colors;
+					dataClass.color = colors[colorCounter++];
+					// loop back to zero
+					if (colorCounter === colors.length) {
+						colorCounter = 0;
+					}
+				} else {
+					dataClass.color = axis.tweenColors(
+						Color(options.minColor), 
+						Color(options.maxColor), 
+						len < 2 ? 0.5 : i / (len - 1) // #3219
+					);
+				}
+			}
+		});
+	},
+
+	initStops: function (userOptions) {
+		this.stops = userOptions.stops || [
+			[0, this.options.minColor],
+			[1, this.options.maxColor]
+		];
+		each(this.stops, function (stop) {
+			stop.color = Color(stop[1]);
+		});
+	},
+
+	/**
+	 * Extend the setOptions method to process extreme colors and color
+	 * stops.
+	 */
+	setOptions: function (userOptions) {
+		Axis.prototype.setOptions.call(this, userOptions);
+
+		this.options.crosshair = this.options.marker;
+		this.coll = 'colorAxis';
+	},
+
+	setAxisSize: function () {
+		var symbol = this.legendSymbol,
+			chart = this.chart,
+			x,
+			y,
+			width,
+			height;
+
+		if (symbol) {
+			this.left = x = symbol.attr('x');
+			this.top = y = symbol.attr('y');
+			this.width = width = symbol.attr('width');
+			this.height = height = symbol.attr('height');
+			this.right = chart.chartWidth - x - width;
+			this.bottom = chart.chartHeight - y - height;
+
+			this.len = this.horiz ? width : height;
+			this.pos = this.horiz ? x : y;
+		}
+	},
+
+	/** 
+	 * Translate from a value to a color
+	 */
+	toColor: function (value, point) {
+		var pos,
+			stops = this.stops,
+			from,
+			to,
+			color,
+			dataClasses = this.dataClasses,
+			dataClass,
+			i;
+
+		if (dataClasses) {
+			i = dataClasses.length;
+			while (i--) {
+				dataClass = dataClasses[i];
+				from = dataClass.from;
+				to = dataClass.to;
+				if ((from === UNDEFINED || value >= from) && (to === UNDEFINED || value <= to)) {
+					color = dataClass.color;
+					if (point) {
+						point.dataClass = i;
+					}
+					break;
+				}	
+			}
+
+		} else {
+
+			if (this.isLog) {
+				value = this.val2lin(value);
+			}
+			pos = 1 - ((this.max - value) / ((this.max - this.min) || 1));
+			i = stops.length;
+			while (i--) {
+				if (pos > stops[i][0]) {
+					break;
+				}
+			}
+			from = stops[i] || stops[i + 1];
+			to = stops[i + 1] || from;
+
+			// The position within the gradient
+			pos = 1 - (to[0] - pos) / ((to[0] - from[0]) || 1);
+
+			color = this.tweenColors(
+				from.color, 
+				to.color,
+				pos
+			);
+		}
+		return color;
+	},
+
+	getOffset: function () {
+		var group = this.legendGroup,
+			sideOffset = this.chart.axisOffset[this.side];
+		
+		if (group) {
+
+			Axis.prototype.getOffset.call(this);
+			
+			if (!this.axisGroup.parentGroup) {
+
+				// Move the axis elements inside the legend group
+				this.axisGroup.add(group);
+				this.gridGroup.add(group);
+				this.labelGroup.add(group);
+
+				this.added = true;
+
+				this.labelLeft = 0;
+				this.labelRight = this.width;
+			}
+			// Reset it to avoid color axis reserving space
+			this.chart.axisOffset[this.side] = sideOffset;
+		}
+	},
+
+	/**
+	 * Create the color gradient
+	 */
+	setLegendColor: function () {
+		var grad,
+			horiz = this.horiz,
+			options = this.options,
+			reversed = this.reversed;
+
+		grad = horiz ? [+reversed, 0, +!reversed, 0] : [0, +!reversed, 0, +reversed]; // #3190
+		this.legendColor = {
+			linearGradient: { x1: grad[0], y1: grad[1], x2: grad[2], y2: grad[3] },
+			stops: options.stops || [
+				[0, options.minColor],
+				[1, options.maxColor]
+			]
+		};
+	},
+
+	/**
+	 * The color axis appears inside the legend and has its own legend symbol
+	 */
+	drawLegendSymbol: function (legend, item) {
+		var padding = legend.padding,
+			legendOptions = legend.options,
+			horiz = this.horiz,
+			box,
+			width = pick(legendOptions.symbolWidth, horiz ? 200 : 12),
+			height = pick(legendOptions.symbolHeight, horiz ? 12 : 200),
+			labelPadding = pick(legendOptions.labelPadding, horiz ? 16 : 30),
+			itemDistance = pick(legendOptions.itemDistance, 10);
+
+		this.setLegendColor();
+
+		// Create the gradient
+		item.legendSymbol = this.chart.renderer.rect(
+			0,
+			legend.baseline - 11,
+			width,
+			height
+		).attr({
+			zIndex: 1
+		}).add(item.legendGroup);
+		box = item.legendSymbol.getBBox();
+
+		// Set how much space this legend item takes up
+		this.legendItemWidth = width + padding + (horiz ? itemDistance : labelPadding);
+		this.legendItemHeight = height + padding + (horiz ? labelPadding : 0);
+	},
+	/**
+	 * Fool the legend
+	 */
+	setState: noop,
+	visible: true,
+	setVisible: noop,
+	getSeriesExtremes: function () {
+		var series;
+		if (this.series.length) {
+			series = this.series[0];
+			this.dataMin = series.valueMin;
+			this.dataMax = series.valueMax;
+		}
+	},
+	drawCrosshair: function (e, point) {
+		var plotX = point && point.plotX,
+			plotY = point && point.plotY,
+			crossPos,
+			axisPos = this.pos,
+			axisLen = this.len;
+		
+		if (point) {
+			crossPos = this.toPixels(point[point.series.colorKey]);
+			if (crossPos < axisPos) {
+				crossPos = axisPos - 2;
+			} else if (crossPos > axisPos + axisLen) {
+				crossPos = axisPos + axisLen + 2;
+			}
+			
+			point.plotX = crossPos;
+			point.plotY = this.len - crossPos;
+			Axis.prototype.drawCrosshair.call(this, e, point);
+			point.plotX = plotX;
+			point.plotY = plotY;
+			
+			if (this.cross) {
+				this.cross
+					.attr({
+						fill: this.crosshair.color
+					})
+					.add(this.legendGroup);
+			}
+		}
+	},
+	getPlotLinePath: function (a, b, c, d, pos) {
+		if (typeof pos === 'number') { // crosshairs only // #3969 pos can be 0 !!
+			return this.horiz ? 
+				['M', pos - 4, this.top - 6, 'L', pos + 4, this.top - 6, pos, this.top, 'Z'] : 
+				['M', this.left, pos, 'L', this.left - 6, pos + 6, this.left - 6, pos - 6, 'Z'];
+		} else {
+			return Axis.prototype.getPlotLinePath.call(this, a, b, c, d);
+		}
+	},
+
+	update: function (newOptions, redraw) {
+		var chart = this.chart,
+			legend = chart.legend;
+
+		each(this.series, function (series) {
+			series.isDirtyData = true; // Needed for Axis.update when choropleth colors change
+		});
+
+		// When updating data classes, destroy old items and make sure new ones are created (#3207)
+		if (newOptions.dataClasses) {
+			each(legend.allItems, function (item) {
+				if (item.isDataClass) {
+					item.legendGroup.destroy();
+				}
+			});			
+			chart.isDirtyLegend = true;
+		}
+
+		// Keep the options structure updated for export. Unlike xAxis and yAxis, the colorAxis is 
+		// not an array. (#3207)
+		chart.options[this.coll] = merge(this.userOptions, newOptions);
+
+		Axis.prototype.update.call(this, newOptions, redraw);
+		if (this.legendItem) {
+			this.setLegendColor();
+			legend.colorizeItem(this, true);
+		}
+	},
+
+	/**
+	 * Get the legend item symbols for data classes
+	 */
+	getDataClassLegendSymbols: function () {
+		var axis = this,
+			chart = this.chart,
+			legendItems = this.legendItems,
+			legendOptions = chart.options.legend,
+			valueDecimals = legendOptions.valueDecimals,
+			valueSuffix = legendOptions.valueSuffix || '',
+			name;
+
+		if (!legendItems.length) {
+			each(this.dataClasses, function (dataClass, i) {
+				var vis = true,
+					from = dataClass.from,
+					to = dataClass.to;
+				
+				// Assemble the default name. This can be overridden by legend.options.labelFormatter
+				name = '';
+				if (from === UNDEFINED) {
+					name = '< ';
+				} else if (to === UNDEFINED) {
+					name = '> ';
+				}
+				if (from !== UNDEFINED) {
+					name += Highcharts.numberFormat(from, valueDecimals) + valueSuffix;
+				}
+				if (from !== UNDEFINED && to !== UNDEFINED) {
+					name += ' - ';
+				}
+				if (to !== UNDEFINED) {
+					name += Highcharts.numberFormat(to, valueDecimals) + valueSuffix;
+				}
+				
+				// Add a mock object to the legend items
+				legendItems.push(extend({
+					chart: chart,
+					name: name,
+					options: {},
+					drawLegendSymbol: LegendSymbolMixin.drawRectangle,
+					visible: true,
+					setState: noop,
+					isDataClass: true,
+					setVisible: function () {
+						vis = this.visible = !vis;
+						each(axis.series, function (series) {
+							each(series.points, function (point) {
+								if (point.dataClass === i) {
+									point.setVisible(vis);
+								}
+							});
+						});
+						
+						chart.legend.colorizeItem(this, vis);
+					}
+				}, dataClass));
+			});
+		}
+		return legendItems;
+	},
+	name: '' // Prevents 'undefined' in legend in IE8
+});
+
+/**
+ * Handle animation of the color attributes directly
+ */
+each(['fill', 'stroke'], function (prop) {
+	HighchartsAdapter.addAnimSetter(prop, function (fx) {
+		fx.elem.attr(prop, ColorAxis.prototype.tweenColors(Color(fx.start), Color(fx.end), fx.pos));
+	});
+});
+
+/**
+ * Extend the chart getAxes method to also get the color axis
+ */
+wrap(Chart.prototype, 'getAxes', function (proceed) {
+
+	var options = this.options,
+		colorAxisOptions = options.colorAxis;
+
+	proceed.call(this);
+
+	this.colorAxis = [];
+	if (colorAxisOptions) {
+		proceed = new ColorAxis(this, colorAxisOptions); // Fake assignment for jsLint
+	}
+});
+
+
+/**
+ * Wrap the legend getAllItems method to add the color axis. This also removes the 
+ * axis' own series to prevent them from showing up individually.
+ */
+wrap(Legend.prototype, 'getAllItems', function (proceed) {
+	var allItems = [],
+		colorAxis = this.chart.colorAxis[0];
+
+	if (colorAxis) {
+
+		// Data classes
+		if (colorAxis.options.dataClasses) {
+			allItems = allItems.concat(colorAxis.getDataClassLegendSymbols());
+		// Gradient legend
+		} else {
+			// Add this axis on top
+			allItems.push(colorAxis);
+		}
+
+		// Don't add the color axis' series
+		each(colorAxis.series, function (series) {
+			series.options.showInLegend = false;
+		});
+	}
+
+	return allItems.concat(proceed.call(this));
+});/**
+ * Mixin for maps and heatmaps
+ */
+var colorSeriesMixin = {
+
+	pointAttrToOptions: { // mapping between SVG attributes and the corresponding options
+		stroke: 'borderColor',
+		'stroke-width': 'borderWidth',
+		fill: 'color',
+		dashstyle: 'dashStyle'
+	},
+	pointArrayMap: ['value'],
+	axisTypes: ['xAxis', 'yAxis', 'colorAxis'],
+	optionalAxis: 'colorAxis',
+	trackerGroups: ['group', 'markerGroup', 'dataLabelsGroup'],
+	getSymbol: noop,
+	parallelArrays: ['x', 'y', 'value'],
+	colorKey: 'value',
+	
+	/**
+	 * In choropleth maps, the color is a result of the value, so this needs translation too
+	 */
+	translateColors: function () {
+		var series = this,
+			nullColor = this.options.nullColor,
+			colorAxis = this.colorAxis,
+			colorKey = this.colorKey;
+
+		each(this.data, function (point) {
+			var value = point[colorKey],
+				color;
+
+			color = value === null ? nullColor : (colorAxis && value !== undefined) ? colorAxis.toColor(value, point) : point.color || series.color;
+
+			if (color) {
+				point.color = color;
+			}
+		});
+	}
+};
+/**
+ * Extend the default options with map options
+ */
+defaultOptions.plotOptions.heatmap = merge(defaultOptions.plotOptions.scatter, {
+	animation: false,
+	borderWidth: 0,
+	nullColor: '#F8F8F8',
+	dataLabels: {
+		formatter: function () { // #2945
+			return this.point.value;
+		},
+		inside: true,
+		verticalAlign: 'middle',
+		crop: false,
+		overflow: false,
+		padding: 0 // #3837
+	},
+	marker: null,
+	pointRange: null, // dynamically set to colsize by default
+	tooltip: {
+		pointFormat: '{point.x}, {point.y}: {point.value}<br/>'
+	},
+	states: {
+		normal: {
+			animation: true
+		},
+		hover: {
+			halo: false,  // #3406, halo is not required on heatmaps
+			brightness: 0.2
+		}
+	}
+});
+
+// The Heatmap series type
+seriesTypes.heatmap = extendClass(seriesTypes.scatter, merge(colorSeriesMixin, {
+	type: 'heatmap',
+	pointArrayMap: ['y', 'value'],
+	hasPointSpecificOptions: true,
+	supportsDrilldown: true,
+	getExtremesFromAll: true,
+	directTouch: true,
+
+	/**
+	 * Override the init method to add point ranges on both axes.
+	 */
+	init: function () {
+		var options;
+		seriesTypes.scatter.prototype.init.apply(this, arguments);
+
+		options = this.options;
+		this.pointRange = options.pointRange = pick(options.pointRange, options.colsize || 1); // #3758, prevent resetting in setData
+		this.yAxis.axisPointRange = options.rowsize || 1; // general point range
+	},
+	translate: function () {
+		var series = this,
+			options = series.options,
+			xAxis = series.xAxis,
+			yAxis = series.yAxis;
+
+		series.generatePoints();
+
+		each(series.points, function (point) {
+			var xPad = (options.colsize || 1) / 2,
+				yPad = (options.rowsize || 1) / 2,
+				x1 = Math.round(xAxis.len - xAxis.translate(point.x - xPad, 0, 1, 0, 1)),
+				x2 = Math.round(xAxis.len - xAxis.translate(point.x + xPad, 0, 1, 0, 1)),
+				y1 = Math.round(yAxis.translate(point.y - yPad, 0, 1, 0, 1)),
+				y2 = Math.round(yAxis.translate(point.y + yPad, 0, 1, 0, 1));
+
+			// Set plotX and plotY for use in K-D-Tree and more
+			point.plotX = point.clientX = (x1 + x2) / 2;
+			point.plotY = (y1 + y2) / 2;
+
+			point.shapeType = 'rect';
+			point.shapeArgs = {
+				x: Math.min(x1, x2),
+				y: Math.min(y1, y2),
+				width: Math.abs(x2 - x1),
+				height: Math.abs(y2 - y1)
+			};
+		});
+		
+		series.translateColors();
+
+		// Make sure colors are updated on colorAxis update (#2893)
+		if (this.chart.hasRendered) {
+			each(series.points, function (point) {
+				point.shapeArgs.fill = point.options.color || point.color; // #3311
+			});
+		}
+	},
+	drawPoints: seriesTypes.column.prototype.drawPoints,
+	animate: noop,
+	getBox: noop,
+	drawLegendSymbol: LegendSymbolMixin.drawRectangle,
+
+	getExtremes: function () {
+		// Get the extremes from the value data
+		Series.prototype.getExtremes.call(this, this.valueData);
+		this.valueMin = this.dataMin;
+		this.valueMax = this.dataMax;
+
+		// Get the extremes from the y data
+		Series.prototype.getExtremes.call(this);
+	}
+		
+}));
+
+
+}(Highcharts));
diff --git a/data/interfaces/default/js/highcharts/js/modules/no-data-to-display.js b/data/interfaces/default/js/highcharts/js/modules/no-data-to-display.js
new file mode 100644
index 00000000..2bf9e75e
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/modules/no-data-to-display.js
@@ -0,0 +1,12 @@
+/*
+ Highcharts JS v4.1.6 (2015-06-12)
+ Plugin for displaying a message when there is no data visible in chart.
+
+ (c) 2010-2014 Highsoft AS
+ Author: Oystein Moseng
+
+ License: www.highcharts.com/license
+*/
+(function(c){function i(){return!!this.points.length}function e(){this.hasData()?this.hideNoData():this.showNoData()}var f=c.seriesTypes,d=c.Chart.prototype,g=c.getOptions(),h=c.extend,j=c.each;h(g.lang,{noData:"No data to display"});g.noData={position:{x:0,y:0,align:"center",verticalAlign:"middle"},attr:{},style:{fontWeight:"bold",fontSize:"12px",color:"#60606a"}};j(["pie","gauge","waterfall","bubble"],function(a){if(f[a])f[a].prototype.hasData=i});c.Series.prototype.hasData=function(){return this.visible&&
+this.dataMax!==void 0&&this.dataMin!==void 0};d.showNoData=function(a){var b=this.options,a=a||b.lang.noData,b=b.noData;if(!this.noDataLabel)this.noDataLabel=this.renderer.label(a,0,0,null,null,null,null,null,"no-data").attr(b.attr).css(b.style).add(),this.noDataLabel.align(h(this.noDataLabel.getBBox(),b.position),!1,"plotBox")};d.hideNoData=function(){if(this.noDataLabel)this.noDataLabel=this.noDataLabel.destroy()};d.hasData=function(){for(var a=this.series,b=a.length;b--;)if(a[b].hasData()&&!a[b].options.isInternal)return!0;
+return!1};d.callbacks.push(function(a){c.addEvent(a,"load",e);c.addEvent(a,"redraw",e)})})(Highcharts);
diff --git a/data/interfaces/default/js/highcharts/js/modules/no-data-to-display.src.js b/data/interfaces/default/js/highcharts/js/modules/no-data-to-display.src.js
new file mode 100644
index 00000000..9a7bf89b
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/modules/no-data-to-display.src.js
@@ -0,0 +1,125 @@
+/**
+ * @license Highcharts JS v4.1.6 (2015-06-12)
+ * Plugin for displaying a message when there is no data visible in chart.
+ *
+ * (c) 2010-2014 Highsoft AS
+ * Author: Oystein Moseng
+ *
+ * License: www.highcharts.com/license
+ */
+
+(function (H) {
+	
+	var seriesTypes = H.seriesTypes,
+		chartPrototype = H.Chart.prototype,
+		defaultOptions = H.getOptions(),
+		extend = H.extend,
+		each = H.each;
+
+	// Add language option
+	extend(defaultOptions.lang, {
+		noData: 'No data to display'
+	});
+	
+	// Add default display options for message
+	defaultOptions.noData = {
+		position: {
+			x: 0,
+			y: 0,			
+			align: 'center',
+			verticalAlign: 'middle'
+		},
+		attr: {						
+		},
+		style: {	
+			fontWeight: 'bold',		
+			fontSize: '12px',
+			color: '#60606a'		
+		}
+	};
+
+	/**
+	 * Define hasData functions for series. These return true if there are data points on this series within the plot area
+	 */	
+	function hasDataPie() {
+		return !!this.points.length; /* != 0 */
+	}
+
+	each(['pie', 'gauge', 'waterfall', 'bubble'], function (type) {
+		if (seriesTypes[type]) {
+			seriesTypes[type].prototype.hasData = hasDataPie;
+		}
+	});
+
+	H.Series.prototype.hasData = function () {
+		return this.visible && this.dataMax !== undefined && this.dataMin !== undefined; // #3703
+	};
+	
+	/**
+	 * Display a no-data message.
+	 *
+	 * @param {String} str An optional message to show in place of the default one 
+	 */
+	chartPrototype.showNoData = function (str) {
+		var chart = this,
+			options = chart.options,
+			text = str || options.lang.noData,
+			noDataOptions = options.noData;
+
+		if (!chart.noDataLabel) {
+			chart.noDataLabel = chart.renderer.label(text, 0, 0, null, null, null, null, null, 'no-data')
+				.attr(noDataOptions.attr)
+				.css(noDataOptions.style)
+				.add();
+			chart.noDataLabel.align(extend(chart.noDataLabel.getBBox(), noDataOptions.position), false, 'plotBox');
+		}
+	};
+
+	/**
+	 * Hide no-data message	
+	 */	
+	chartPrototype.hideNoData = function () {
+		var chart = this;
+		if (chart.noDataLabel) {
+			chart.noDataLabel = chart.noDataLabel.destroy();
+		}
+	};
+
+	/**
+	 * Returns true if there are data points within the plot area now
+	 */	
+	chartPrototype.hasData = function () {
+		var chart = this,
+			series = chart.series,
+			i = series.length;
+
+		while (i--) {
+			if (series[i].hasData() && !series[i].options.isInternal) { 
+				return true;
+			}	
+		}
+
+		return false;
+	};
+
+	/**
+	 * Show no-data message if there is no data in sight. Otherwise, hide it.
+	 */
+	function handleNoData() {
+		var chart = this;
+		if (chart.hasData()) {
+			chart.hideNoData();
+		} else {
+			chart.showNoData();
+		}
+	}
+
+	/**
+	 * Add event listener to handle automatic display of no-data message
+	 */
+	chartPrototype.callbacks.push(function (chart) {
+		H.addEvent(chart, 'load', handleNoData);
+		H.addEvent(chart, 'redraw', handleNoData);
+	});
+
+}(Highcharts));
diff --git a/data/interfaces/default/js/highcharts/js/modules/solid-gauge.js b/data/interfaces/default/js/highcharts/js/modules/solid-gauge.js
new file mode 100644
index 00000000..69b11a2e
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/modules/solid-gauge.js
@@ -0,0 +1,14 @@
+/*
+  Highcharts JS v4.1.6 (2015-06-12)
+ Solid angular gauge module
+
+ (c) 2010-2014 Torstein Honsi
+
+ License: www.highcharts.com/license
+*/
+(function(b){var q=b.getOptions().plotOptions,r=b.pInt,s=b.pick,j=b.each,k;q.solidgauge=b.merge(q.gauge,{colorByPoint:!0});k={initDataClasses:function(a){var c=this,e=this.chart,d,o=0,f=this.options;this.dataClasses=d=[];j(a.dataClasses,function(g,h){var p,g=b.merge(g);d.push(g);if(!g.color)f.dataClassColor==="category"?(p=e.options.colors,g.color=p[o++],o===p.length&&(o=0)):g.color=c.tweenColors(b.Color(f.minColor),b.Color(f.maxColor),h/(a.dataClasses.length-1))})},initStops:function(a){this.stops=
+a.stops||[[0,this.options.minColor],[1,this.options.maxColor]];j(this.stops,function(a){a.color=b.Color(a[1])})},toColor:function(a,c){var e,d=this.stops,b,f=this.dataClasses,g,h;if(f)for(h=f.length;h--;){if(g=f[h],b=g.from,d=g.to,(b===void 0||a>=b)&&(d===void 0||a<=d)){e=g.color;if(c)c.dataClass=h;break}}else{this.isLog&&(a=this.val2lin(a));e=1-(this.max-a)/(this.max-this.min);for(h=d.length;h--;)if(e>d[h][0])break;b=d[h]||d[h+1];d=d[h+1]||b;e=1-(d[0]-e)/(d[0]-b[0]||1);e=this.tweenColors(b.color,
+d.color,e)}return e},tweenColors:function(a,c,b){var d;!c.rgba.length||!a.rgba.length?a=c.raw||"none":(a=a.rgba,c=c.rgba,d=c[3]!==1||a[3]!==1,a=(d?"rgba(":"rgb(")+Math.round(c[0]+(a[0]-c[0])*(1-b))+","+Math.round(c[1]+(a[1]-c[1])*(1-b))+","+Math.round(c[2]+(a[2]-c[2])*(1-b))+(d?","+(c[3]+(a[3]-c[3])*(1-b)):"")+")");return a}};j(["fill","stroke"],function(a){HighchartsAdapter.addAnimSetter(a,function(c){c.elem.attr(a,k.tweenColors(b.Color(c.start),b.Color(c.end),c.pos))})});b.seriesTypes.solidgauge=
+b.extendClass(b.seriesTypes.gauge,{type:"solidgauge",bindAxes:function(){var a;b.seriesTypes.gauge.prototype.bindAxes.call(this);a=this.yAxis;b.extend(a,k);a.options.dataClasses&&a.initDataClasses(a.options);a.initStops(a.options)},drawPoints:function(){var a=this,c=a.yAxis,e=c.center,d=a.options,o=a.chart.renderer,f=d.overshoot,g=f&&typeof f==="number"?f/180*Math.PI:0;b.each(a.points,function(b){var f=b.graphic,i=c.startAngleRad+c.translate(b.y,null,null,null,!0),j=r(s(b.options.radius,d.radius,
+100))*e[2]/200,l=r(s(b.options.innerRadius,d.innerRadius,60))*e[2]/200,m=c.toColor(b.y,b);m==="none"&&(m=b.color||a.color||"none");if(m!=="none")b.color=m;i=Math.max(c.startAngleRad-g,Math.min(c.endAngleRad+g,i));d.wrap===!1&&(i=Math.max(c.startAngleRad,Math.min(c.endAngleRad,i)));var i=i*180/Math.PI,n=i/(180/Math.PI),k=c.startAngleRad,i=Math.min(n,k),n=Math.max(n,k);n-i>2*Math.PI&&(n=i+2*Math.PI);b.shapeArgs=l={x:e[0],y:e[1],r:j,innerR:l,start:i,end:n,fill:m};b.startR=j;f?(b=l.d,f.animate(l),l.d=
+b):b.graphic=o.arc(l).attr({stroke:d.borderColor||"none","stroke-width":d.borderWidth||0,fill:m,"sweep-flag":0}).add(a.group)})},animate:function(a){if(!a)this.startAngleRad=this.yAxis.startAngleRad,b.seriesTypes.pie.prototype.animate.call(this,a)}})})(Highcharts);
diff --git a/data/interfaces/default/js/highcharts/js/modules/solid-gauge.src.js b/data/interfaces/default/js/highcharts/js/modules/solid-gauge.src.js
new file mode 100644
index 00000000..49ba5484
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/modules/solid-gauge.src.js
@@ -0,0 +1,267 @@
+/**
+ * @license  Highcharts JS v4.1.6 (2015-06-12)
+ * Solid angular gauge module
+ *
+ * (c) 2010-2014 Torstein Honsi
+ *
+ * License: www.highcharts.com/license
+ */
+
+/*global Highcharts, HighchartsAdapter*/
+(function (H) {
+	"use strict";
+
+	var defaultPlotOptions = H.getOptions().plotOptions,
+		pInt = H.pInt,
+		pick = H.pick,
+		each = H.each,
+		colorAxisMethods,
+		UNDEFINED;
+
+	// The default options
+	defaultPlotOptions.solidgauge = H.merge(defaultPlotOptions.gauge, {
+		colorByPoint: true
+	});
+
+
+	// These methods are defined in the ColorAxis object, and copied here.
+	// If we implement an AMD system we should make ColorAxis a dependency.
+	colorAxisMethods = {
+
+
+		initDataClasses: function (userOptions) {
+			var axis = this,
+				chart = this.chart,
+				dataClasses,
+				colorCounter = 0,
+				options = this.options;
+			this.dataClasses = dataClasses = [];
+
+			each(userOptions.dataClasses, function (dataClass, i) {
+				var colors;
+
+				dataClass = H.merge(dataClass);
+				dataClasses.push(dataClass);
+				if (!dataClass.color) {
+					if (options.dataClassColor === 'category') {
+						colors = chart.options.colors;
+						dataClass.color = colors[colorCounter++];
+						// loop back to zero
+						if (colorCounter === colors.length) {
+							colorCounter = 0;
+						}
+					} else {
+						dataClass.color = axis.tweenColors(H.Color(options.minColor), H.Color(options.maxColor), i / (userOptions.dataClasses.length - 1));
+					}
+				}
+			});
+		},
+
+		initStops: function (userOptions) {
+			this.stops = userOptions.stops || [
+				[0, this.options.minColor],
+				[1, this.options.maxColor]
+			];
+			each(this.stops, function (stop) {
+				stop.color = H.Color(stop[1]);
+			});
+		},
+		/** 
+		 * Translate from a value to a color
+		 */
+		toColor: function (value, point) {
+			var pos,
+				stops = this.stops,
+				from,
+				to,
+				color,
+				dataClasses = this.dataClasses,
+				dataClass,
+				i;
+
+			if (dataClasses) {
+				i = dataClasses.length;
+				while (i--) {
+					dataClass = dataClasses[i];
+					from = dataClass.from;
+					to = dataClass.to;
+					if ((from === UNDEFINED || value >= from) && (to === UNDEFINED || value <= to)) {
+						color = dataClass.color;
+						if (point) {
+							point.dataClass = i;
+						}
+						break;
+					}   
+				}
+
+			} else {
+
+				if (this.isLog) {
+					value = this.val2lin(value);
+				}
+				pos = 1 - ((this.max - value) / (this.max - this.min));
+				i = stops.length;
+				while (i--) {
+					if (pos > stops[i][0]) {
+						break;
+					}
+				}
+				from = stops[i] || stops[i + 1];
+				to = stops[i + 1] || from;
+
+				// The position within the gradient
+				pos = 1 - (to[0] - pos) / ((to[0] - from[0]) || 1);
+				
+				color = this.tweenColors(
+					from.color, 
+					to.color,
+					pos
+				);
+			}
+			return color;
+		},
+		/*
+		 * Return an intermediate color between two colors, according to pos where 0
+		 * is the from color and 1 is the to color.
+		 */
+		tweenColors: function (from, to, pos) {
+			// Check for has alpha, because rgba colors perform worse due to lack of
+			// support in WebKit.
+			var hasAlpha,
+				ret;
+
+			// Unsupported color, return to-color (#3920)
+			if (!to.rgba.length || !from.rgba.length) {
+				ret = to.raw || 'none';
+
+			// Interpolate
+			} else {
+				from = from.rgba;
+				to = to.rgba;
+				hasAlpha = (to[3] !== 1 || from[3] !== 1);
+				ret = (hasAlpha ? 'rgba(' : 'rgb(') + 
+					Math.round(to[0] + (from[0] - to[0]) * (1 - pos)) + ',' + 
+					Math.round(to[1] + (from[1] - to[1]) * (1 - pos)) + ',' + 
+					Math.round(to[2] + (from[2] - to[2]) * (1 - pos)) + 
+					(hasAlpha ? (',' + (to[3] + (from[3] - to[3]) * (1 - pos))) : '') + ')';
+			}
+			return ret;
+		}
+	};
+
+	/**
+	 * Handle animation of the color attributes directly
+	 */
+	each(['fill', 'stroke'], function (prop) {
+		HighchartsAdapter.addAnimSetter(prop, function (fx) {
+			fx.elem.attr(prop, colorAxisMethods.tweenColors(H.Color(fx.start), H.Color(fx.end), fx.pos));
+		});
+	});
+
+	// The series prototype
+	H.seriesTypes.solidgauge = H.extendClass(H.seriesTypes.gauge, {
+		type: 'solidgauge',
+
+		bindAxes: function () {
+			var axis;
+			H.seriesTypes.gauge.prototype.bindAxes.call(this);
+
+			axis = this.yAxis;
+			H.extend(axis, colorAxisMethods);
+
+			// Prepare data classes
+			if (axis.options.dataClasses) {
+				axis.initDataClasses(axis.options);
+			}
+			axis.initStops(axis.options);
+		},
+
+		/**
+		 * Draw the points where each point is one needle
+		 */
+		drawPoints: function () {
+			var series = this,
+				yAxis = series.yAxis,
+				center = yAxis.center,
+				options = series.options,
+				renderer = series.chart.renderer,
+				overshoot = options.overshoot,
+				overshootVal = overshoot && typeof overshoot === 'number' ? overshoot / 180 * Math.PI : 0;
+
+			H.each(series.points, function (point) {
+				var graphic = point.graphic,
+					rotation = yAxis.startAngleRad + yAxis.translate(point.y, null, null, null, true),
+					radius = (pInt(pick(point.options.radius, options.radius, 100)) * center[2]) / 200,
+					innerRadius = (pInt(pick(point.options.innerRadius, options.innerRadius, 60)) * center[2]) / 200,
+					shapeArgs,
+					d,
+					toColor = yAxis.toColor(point.y, point),
+					fromColor;
+
+				if (toColor === 'none') { // #3708
+					toColor = point.color || series.color || 'none';
+				}
+				if (toColor !== 'none') {
+					fromColor = point.color;
+					point.color = toColor;
+				}
+
+				// Handle overshoot and clipping to axis max/min
+				rotation = Math.max(yAxis.startAngleRad - overshootVal, Math.min(yAxis.endAngleRad + overshootVal, rotation));
+
+				// Handle the wrap option
+				if (options.wrap === false) {
+					rotation = Math.max(yAxis.startAngleRad, Math.min(yAxis.endAngleRad, rotation));
+				}
+				rotation = rotation * 180 / Math.PI;
+
+				var angle1 = rotation / (180 / Math.PI),
+					angle2 = yAxis.startAngleRad,
+					minAngle = Math.min(angle1, angle2),
+					maxAngle = Math.max(angle1, angle2);
+
+				if (maxAngle - minAngle > 2 * Math.PI) {
+					maxAngle = minAngle + 2 * Math.PI;
+				}
+
+				point.shapeArgs = shapeArgs = {
+					x: center[0],
+					y: center[1],
+					r: radius,
+					innerR: innerRadius,
+					start: minAngle,
+					end: maxAngle,
+					fill: toColor
+				};
+				point.startR = radius; // For PieSeries.animate
+
+				if (graphic) {
+					d = shapeArgs.d;
+					graphic.animate(shapeArgs);
+					shapeArgs.d = d; // animate alters it
+				} else {					
+					point.graphic = renderer.arc(shapeArgs)
+						.attr({
+							stroke: options.borderColor || 'none',
+							'stroke-width': options.borderWidth || 0,
+							fill: toColor,
+							'sweep-flag': 0
+						})
+						.add(series.group);
+				}
+			});
+		},
+
+		/**
+		 * Extend the pie slice animation by animating from start angle and up
+		 */
+		animate: function (init) {
+
+			if (!init) {
+				this.startAngleRad = this.yAxis.startAngleRad;
+				H.seriesTypes.pie.prototype.animate.call(this, init);
+			}
+		}
+	});
+
+}(Highcharts));
diff --git a/data/interfaces/default/js/highcharts/js/modules/treemap.js b/data/interfaces/default/js/highcharts/js/modules/treemap.js
new file mode 100644
index 00000000..726de1c2
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/modules/treemap.js
@@ -0,0 +1,29 @@
+/*
+ Highcharts JS v4.1.6 (2015-06-12)
+
+ (c) 2014 Highsoft AS
+ Authors: Jon Arild Nygard / Oystein Moseng
+
+ License: www.highcharts.com/license
+*/
+(function(g){var h=g.seriesTypes,l=g.merge,t=g.extendClass,u=g.getOptions().plotOptions,v=function(){},m=g.each,r=g.pick,p=g.Series,s=g.Color;u.treemap=l(u.scatter,{showInLegend:!1,marker:!1,borderColor:"#E0E0E0",borderWidth:1,dataLabels:{enabled:!0,defer:!1,verticalAlign:"middle",formatter:function(){return this.point.name||this.point.id},inside:!0},tooltip:{headerFormat:"",pointFormat:"<b>{point.name}</b>: {point.node.val}</b><br/>"},layoutAlgorithm:"sliceAndDice",layoutStartingDirection:"vertical",
+alternateStartingDirection:!1,levelIsConstant:!0,states:{hover:{borderColor:"#A0A0A0",brightness:h.heatmap?0:0.1,shadow:!1}},drillUpButton:{position:{align:"left",x:10,y:-50}}});h.treemap=t(h.scatter,l({pointAttrToOptions:{stroke:"borderColor","stroke-width":"borderWidth",fill:"color",dashstyle:"borderDashStyle"},pointArrayMap:["value"],axisTypes:h.heatmap?["xAxis","yAxis","colorAxis"]:["xAxis","yAxis"],optionalAxis:"colorAxis",getSymbol:v,parallelArrays:["x","y","value","colorValue"],colorKey:"colorValue",
+translateColors:h.heatmap&&h.heatmap.prototype.translateColors},{type:"treemap",trackerGroups:["group","dataLabelsGroup"],pointClass:t(g.Point,{setState:function(a,b){g.Point.prototype.setState.call(this,a,b);a==="hover"?this.dataLabel&&this.dataLabel.attr({zIndex:1002}):this.dataLabel&&this.dataLabel.attr({zIndex:this.pointAttr[""].zIndex+1})},setVisible:h.pie.prototype.pointClass.prototype.setVisible}),handleLayout:function(){var a=this.tree,b;if(this.points.length)this.nodeMap=[],a=this.tree=this.getTree(),
+this.rootNode=r(this.rootNode,""),this.levelMap=this.getLevels(),m(this.points,function(a){delete a.plotX;delete a.plotY}),b=this.getSeriesArea(a.val),this.nodeMap[""].values=b,this.calculateArea(a,b),this.setPointValues()},getTree:function(){var a=this,b=0,c=[],d=[],e,f=function(a){m(c[a],function(a){c[""].push(a)})},j=function(b,c,d,e,f,k,o){var g=[],h=0,q;q=f[c];var l,p;o&&(o=r(q&&q.visible,!0));p=r(q&&q.name,"");e[b]!==void 0&&m(e[b],function(c){l=j(f[c].id,c,d+1,e,f,b,o);if(l.visible||!a.options.ignoreHiddenPoint)h+=
+l.val,a.insertElementSorted(g,l,function(a,b){return a.val>b.val})});q=r(f[c]&&f[c].value,h,0);o=q>0?o:!1;c={id:b,i:c,children:g,childrenTotal:h,val:q,level:d,parent:k,name:p,visible:o};return a.nodeMap[c.id]=c};m(this.points,function(a){var e="";d.push(a.id);if(a.parent!==void 0)e=a.parent;c[e]===void 0&&(c[e]=[]);c[e].push(b);b+=1});for(e in c)c.hasOwnProperty(e)&&e!==""&&HighchartsAdapter.inArray(e,d)===-1&&(f(e),delete c[e]);return j("",-1,0,c,this.points,null,!0)},calculateArea:function(a,b){var c=
+[],d,e=this,f=e.options,j=f.layoutAlgorithm,g=f.alternateStartingDirection,w=this.nodeMap[this.rootNode].level,n=0,i,h=f.levelIsConstant?a.level:a.level-w,k,h=h>0?h:0;if(this.levelMap[h+1]){i=this.levelMap[h+1];if(i.layoutAlgorithm&&e[i.layoutAlgorithm])j=i.layoutAlgorithm;if(i.layoutStartingDirection)b.direction=i.layoutStartingDirection==="vertical"?0:1}c=e[j](b,a.children);m(a.children,function(a){h=f.levelIsConstant?a.level:a.level-w;k=e.points[a.i];k.level=h;d=c[n];d.val=a.childrenTotal;d.direction=
+b.direction;if(g)d.direction=1-d.direction;a.values=d;k.node=a;k.isLeaf=!0;if(a.children.length)k.isLeaf=!1,e.calculateArea(a,d);n+=1})},setPointValues:function(){var a=this,b=a.xAxis,c=a.yAxis;a.nodeMap[""].values={x:0,y:0,width:100,height:100};m(a.points,function(d){var e=d.node,f=e.values,j,g,h;f.x/=a.axisRatio;f.width/=a.axisRatio;j=Math.round(b.translate(f.x,0,0,0,1));g=Math.round(b.translate(f.x+f.width,0,0,0,1));h=Math.round(c.translate(f.y,0,0,0,1));f=Math.round(c.translate(f.y+f.height,0,
+0,0,1));if(e.visible||!a.options.ignoreHiddenPoint)d.shapeType="rect",d.shapeArgs={x:Math.min(j,g),y:Math.min(h,f),width:Math.abs(g-j),height:Math.abs(f-h)},d.plotX=d.shapeArgs.x+d.shapeArgs.width/2,d.plotY=d.shapeArgs.y+d.shapeArgs.height/2})},getSeriesArea:function(a){var b=this.options.layoutStartingDirection==="vertical"?0:1;return{x:0,y:0,width:100*(this.axisRatio=this.xAxis.len/this.yAxis.len),height:100,direction:b,val:a}},getLevels:function(){var a=[],b=this.options.levels;b&&m(b,function(b){b.level!==
+void 0&&(a[b.level]=b)});return a},setColorRecursive:function(a,b){var c=this,d,e;if(a){d=c.points[a.i];e=c.levelMap[a.level];b=r(d&&d.options.color,e&&e.color,b);if(d)d.color=b;a.children.length&&m(a.children,function(a){c.setColorRecursive(a,b)})}},alg_func_group:function(a,b,c,d){this.height=a;this.width=b;this.plot=d;this.startDirection=this.direction=c;this.lH=this.nH=this.lW=this.nW=this.total=0;this.elArr=[];this.lP={total:0,lH:0,nH:0,lW:0,nW:0,nR:0,lR:0,aspectRatio:function(a,b){return Math.max(a/
+b,b/a)}};this.addElement=function(a){this.lP.total=this.elArr[this.elArr.length-1];this.total+=a;this.direction===0?(this.lW=this.nW,this.lP.lH=this.lP.total/this.lW,this.lP.lR=this.lP.aspectRatio(this.lW,this.lP.lH),this.nW=this.total/this.height,this.lP.nH=this.lP.total/this.nW,this.lP.nR=this.lP.aspectRatio(this.nW,this.lP.nH)):(this.lH=this.nH,this.lP.lW=this.lP.total/this.lH,this.lP.lR=this.lP.aspectRatio(this.lP.lW,this.lH),this.nH=this.total/this.width,this.lP.nW=this.lP.total/this.nH,this.lP.nR=
+this.lP.aspectRatio(this.lP.nW,this.nH));this.elArr.push(a)};this.reset=function(){this.lW=this.nW=0;this.elArr=[];this.total=0}},alg_func_calcPoints:function(a,b,c,d){var e,f,j,g,h=c.lW,n=c.lH,i=c.plot,l,k=0,o=c.elArr.length-1;b?(h=c.nW,n=c.nH):l=c.elArr[c.elArr.length-1];m(c.elArr,function(a){if(b||k<o)c.direction===0?(e=i.x,f=i.y,j=h,g=a/j):(e=i.x,f=i.y,g=n,j=a/g),d.push({x:e,y:f,width:j,height:g}),c.direction===0?i.y+=g:i.x+=j;k+=1});c.reset();c.direction===0?c.width-=h:c.height-=n;i.y=i.parent.y+
+(i.parent.height-c.height);i.x=i.parent.x+(i.parent.width-c.width);if(a)c.direction=1-c.direction;b||c.addElement(l)},alg_func_lowAspectRatio:function(a,b,c){var d=[],e=this,f,j={x:b.x,y:b.y,parent:b},g=0,h=c.length-1,n=new this.alg_func_group(b.height,b.width,b.direction,j);m(c,function(c){f=b.width*b.height*(c.val/b.val);n.addElement(f);n.lP.nR>n.lP.lR&&e.alg_func_calcPoints(a,!1,n,d,j);g===h&&e.alg_func_calcPoints(a,!0,n,d,j);g+=1});return d},alg_func_fill:function(a,b,c){var d=[],e,f=b.direction,
+j=b.x,g=b.y,h=b.width,n=b.height,i,l,k,o;m(c,function(c){e=b.width*b.height*(c.val/b.val);i=j;l=g;f===0?(o=n,k=e/o,h-=k,j+=k):(k=h,o=e/k,n-=o,g+=o);d.push({x:i,y:l,width:k,height:o});a&&(f=1-f)});return d},strip:function(a,b){return this.alg_func_lowAspectRatio(!1,a,b)},squarified:function(a,b){return this.alg_func_lowAspectRatio(!0,a,b)},sliceAndDice:function(a,b){return this.alg_func_fill(!0,a,b)},stripes:function(a,b){return this.alg_func_fill(!1,a,b)},translate:function(){p.prototype.translate.call(this);
+this.handleLayout();this.colorAxis?this.translateColors():this.options.colorByPoint||this.setColorRecursive(this.tree,void 0)},drawDataLabels:function(){var a=this,b=a.dataLabelsGroup,c,d;m(a.points,function(b){d=a.levelMap[b.level];c={style:{}};if(!b.isLeaf)c.enabled=!1;if(d&&d.dataLabels)c=l(c,d.dataLabels),a._hasPointLabels=!0;if(b.shapeArgs)c.style.width=b.shapeArgs.width;b.dlOptions=l(c,b.options.dataLabels)});this.dataLabelsGroup=this.group;p.prototype.drawDataLabels.call(this);this.dataLabelsGroup=
+b},alignDataLabel:h.column.prototype.alignDataLabel,drawPoints:function(){var a=this,b=a.points,c=a.options,d,e,f;m(b,function(b){f=a.levelMap[b.level];d={stroke:c.borderColor,"stroke-width":c.borderWidth,dashstyle:c.borderDashStyle,r:0,fill:r(b.color,a.color)};if(f)d.stroke=f.borderColor||d.stroke,d["stroke-width"]=f.borderWidth||d["stroke-width"],d.dashstyle=f.borderDashStyle||d.dashstyle;d.stroke=b.borderColor||d.stroke;d["stroke-width"]=b.borderWidth||d["stroke-width"];d.dashstyle=b.borderDashStyle||
+d.dashstyle;d.zIndex=1E3-b.level*2;b.pointAttr=l(b.pointAttr);e=b.pointAttr.hover;e.zIndex=1001;e.fill=s(d.fill).brighten(c.states.hover.brightness).get();if(!b.isLeaf)r(c.interactByLeaf,!c.allowDrillToNode)?(d.fill="none",delete e.fill):(d.fill=s(d.fill).setOpacity(0.15).get(),e.fill=s(e.fill).setOpacity(0.75).get());if(b.node.level<=a.nodeMap[a.rootNode].level)d.fill="none",d.zIndex=0,delete e.fill;b.pointAttr[""]=g.extend(b.pointAttr[""],d);b.dataLabel&&b.dataLabel.attr({zIndex:b.pointAttr[""].zIndex+
+1})});h.column.prototype.drawPoints.call(this);m(b,function(a){a.graphic&&a.graphic.attr(a.pointAttr[""])});c.allowDrillToNode&&a.drillTo()},insertElementSorted:function(a,b,c){var d=0,e=!1;a.length!==0&&m(a,function(f){c(b,f)&&!e&&(a.splice(d,0,b),e=!0);d+=1});e||a.push(b)},drillTo:function(){var a=this;m(a.points,function(b){var c,d;g.removeEvent(b,"click.drillTo");b.graphic&&b.graphic.css({cursor:"default"});if(c=a.options.interactByLeaf?a.drillToByLeaf(b):a.drillToByGroup(b))d=a.nodeMap[a.rootNode].name||
+a.rootNode,b.graphic&&b.graphic.css({cursor:"pointer"}),g.addEvent(b,"click.drillTo",function(){b.setState("");a.drillToNode(c);a.showDrillUpButton(d)})})},drillToByGroup:function(a){var b=!1;if(a.node.level-this.nodeMap[this.rootNode].level===1&&!a.isLeaf)b=a.id;return b},drillToByLeaf:function(a){var b=!1;if(a.node.parent!==this.rootNode&&a.isLeaf)for(a=a.node;!b;)if(a=this.nodeMap[a.parent],a.parent===this.rootNode)b=a.id;return b},drillUp:function(){var a=null;this.rootNode&&(a=this.nodeMap[this.rootNode],
+a=a.parent!==null?this.nodeMap[a.parent]:this.nodeMap[""]);if(a!==null)this.drillToNode(a.id),a.id===""?this.drillUpButton=this.drillUpButton.destroy():(a=this.nodeMap[a.parent],this.showDrillUpButton(a.name||a.id))},drillToNode:function(a){var b=this.nodeMap[a].values;this.rootNode=a;this.xAxis.setExtremes(b.x,b.x+b.width,!1);this.yAxis.setExtremes(b.y,b.y+b.height,!1);this.isDirty=!0;this.chart.redraw()},showDrillUpButton:function(a){var b=this,a=a||"< Back",c=b.options.drillUpButton,d,e;if(c.text)a=
+c.text;this.drillUpButton?this.drillUpButton.attr({text:a}).align():(e=(d=c.theme)&&d.states,this.drillUpButton=this.chart.renderer.button(a,null,null,function(){b.drillUp()},d,e&&e.hover,e&&e.select).attr({align:c.position.align,zIndex:9}).add().align(c.position,!1,c.relativeTo||"plotBox"))},buildKDTree:v,drawLegendSymbol:g.LegendSymbolMixin.drawRectangle,getExtremes:function(){p.prototype.getExtremes.call(this,this.colorValueData);this.valueMin=this.dataMin;this.valueMax=this.dataMax;p.prototype.getExtremes.call(this)},
+getExtremesFromAll:!0,bindAxes:function(){var a={endOnTick:!1,gridLineWidth:0,lineWidth:0,min:0,dataMin:0,minPadding:0,max:100,dataMax:100,maxPadding:0,startOnTick:!1,title:null,tickPositions:[]};p.prototype.bindAxes.call(this);g.extend(this.yAxis.options,a);g.extend(this.xAxis.options,a)}}))})(Highcharts);
diff --git a/data/interfaces/default/js/highcharts/js/modules/treemap.src.js b/data/interfaces/default/js/highcharts/js/modules/treemap.src.js
new file mode 100644
index 00000000..27a2a9cc
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/modules/treemap.src.js
@@ -0,0 +1,854 @@
+/**
+ * @license Highcharts JS v4.1.6 (2015-06-12)
+ *
+ * (c) 2014 Highsoft AS
+ * Authors: Jon Arild Nygard / Oystein Moseng
+ *
+ * License: www.highcharts.com/license
+ */
+
+/*global HighchartsAdapter */
+(function (H) {
+	var seriesTypes = H.seriesTypes,
+		merge = H.merge,
+		extendClass = H.extendClass,
+		defaultOptions = H.getOptions(),
+		plotOptions = defaultOptions.plotOptions,
+		noop = function () { return; },
+		each = H.each,
+		pick = H.pick,
+		Series = H.Series,
+		Color = H.Color;
+
+	// Define default options
+	plotOptions.treemap = merge(plotOptions.scatter, {
+		showInLegend: false,
+		marker: false,
+		borderColor: '#E0E0E0',
+		borderWidth: 1,
+		dataLabels: {
+			enabled: true,
+			defer: false,
+			verticalAlign: 'middle',
+			formatter: function () { // #2945
+				return this.point.name || this.point.id;
+			},
+			inside: true
+		},
+		tooltip: {
+			headerFormat: '',
+			pointFormat: '<b>{point.name}</b>: {point.node.val}</b><br/>'
+		},
+		layoutAlgorithm: 'sliceAndDice',
+		layoutStartingDirection: 'vertical',
+		alternateStartingDirection: false,
+		levelIsConstant: true,
+		states: {
+			hover: {
+				borderColor: '#A0A0A0',
+				brightness: seriesTypes.heatmap ? 0 : 0.1,
+				shadow: false
+			}
+		},
+		drillUpButton: {
+			position: { 
+				align: 'left',
+				x: 10,
+				y: -50
+			}
+		}
+	});
+	
+	// Stolen from heatmap	
+	var colorSeriesMixin = {
+		// mapping between SVG attributes and the corresponding options
+		pointAttrToOptions: { 
+			stroke: 'borderColor',
+			'stroke-width': 'borderWidth',
+			fill: 'color',
+			dashstyle: 'borderDashStyle'
+		},
+		pointArrayMap: ['value'],
+		axisTypes: seriesTypes.heatmap ? ['xAxis', 'yAxis', 'colorAxis'] : ['xAxis', 'yAxis'],
+		optionalAxis: 'colorAxis',
+		getSymbol: noop,
+		parallelArrays: ['x', 'y', 'value', 'colorValue'],
+		colorKey: 'colorValue', // Point color option key
+		translateColors: seriesTypes.heatmap && seriesTypes.heatmap.prototype.translateColors
+	};
+
+	// The Treemap series type
+	seriesTypes.treemap = extendClass(seriesTypes.scatter, merge(colorSeriesMixin, {
+		type: 'treemap',
+		trackerGroups: ['group', 'dataLabelsGroup'],
+		pointClass: extendClass(H.Point, {
+			setState: function (state, move) {
+				H.Point.prototype.setState.call(this, state, move);
+				if (state === 'hover') {
+					if (this.dataLabel) {
+						this.dataLabel.attr({ zIndex: 1002 });
+					}
+				} else {
+					if (this.dataLabel) {
+						this.dataLabel.attr({ zIndex: (this.pointAttr[''].zIndex + 1) });
+					}
+				}
+			},
+			setVisible: seriesTypes.pie.prototype.pointClass.prototype.setVisible
+		}),
+		handleLayout: function () {
+			var series = this,
+				tree = this.tree,
+				seriesArea;
+			if (this.points.length) {
+				// Assign variables
+				this.nodeMap = [];
+				tree = this.tree = this.getTree();
+				this.rootNode = pick(this.rootNode, "");
+				this.levelMap = this.getLevels();
+				each(series.points, function (point) {
+					// Reset visibility
+					delete point.plotX;
+					delete point.plotY;
+				});
+				seriesArea = this.getSeriesArea(tree.val);
+				this.nodeMap[""].values = seriesArea;
+				this.calculateArea(tree, seriesArea);
+				this.setPointValues();
+			}
+		},
+		/**
+		* Creates a tree structured object from the series points
+		*/
+		getTree: function () {
+			var tree,
+				series = this,
+				i = 0,
+				parentList = [],
+				allIds = [],
+				key,
+				insertItem = function (key) {
+					each(parentList[key], function (item) {
+						parentList[""].push(item);
+					});
+				},
+				getNodeTree = function (id, i, level, list, points, parent, visible) {
+					var children = [],
+						childrenTotal = 0,
+						val,
+						point = points[i],
+						nodeTree,
+						node,
+						name;
+
+					// Actions
+					if (visible) {
+						visible = pick(point && point.visible, true);
+					}
+					name = pick(point && point.name, "");
+					if (list[id] !== undefined) {
+						each(list[id], function (i) {
+							node = getNodeTree(points[i].id, i, (level + 1), list, points, id, visible);
+							if (node.visible || !series.options.ignoreHiddenPoint) {
+								childrenTotal += node.val;
+								series.insertElementSorted(children, node, function (el, el2) {
+									return el.val > el2.val; 
+								});
+							}
+						});
+					}
+					val = pick((points[i] && points[i].value), childrenTotal, 0);
+					visible = val > 0 ? visible : false;
+					nodeTree = {
+						id: id,
+						i: i,
+						children: children,
+						childrenTotal: childrenTotal,
+						val: val,
+						level: level,
+						parent: parent,
+						name: name,
+						visible: visible
+					};
+					series.nodeMap[nodeTree.id] = nodeTree;
+					return nodeTree;
+				};
+			// Actions
+			// Map children to index
+			each(this.points, function (point) {
+				var parent = "";
+				allIds.push(point.id);
+				if (point.parent !== undefined) {
+					parent = point.parent;
+				}
+				if (parentList[parent] === undefined) {
+					parentList[parent] = [];
+				}
+				parentList[parent].push(i);
+				i = i + 1;
+			});
+			/* 
+			*  Quality check:
+			*  - If parent does not exist, then set parent to tree root
+			*  - Add node id to parents children list
+			*/  
+			for (key in parentList) {
+				if (parentList.hasOwnProperty(key)) {
+					if (key !== "") {
+						if (HighchartsAdapter.inArray(key, allIds) === -1) {
+							insertItem(key);
+							delete parentList[key];
+						}
+					}
+				}
+			}
+			tree = getNodeTree("", -1, 0, parentList, this.points, null, true);
+			return tree;
+		},
+		calculateArea: function (node, area) {
+			var childrenValues = [],
+				childValues,
+				series = this,
+				options = series.options,
+				algorithm = options.layoutAlgorithm,
+				alternate = options.alternateStartingDirection,
+				levelRoot = this.nodeMap[this.rootNode].level,							
+				i = 0,
+				level,
+				levelNr = options.levelIsConstant ? node.level : (node.level - levelRoot),
+				point;
+			levelNr = (levelNr > 0) ? levelNr : 0;
+			// If layoutAlgorithm is set for the level of the children, then default is overwritten
+			if (this.levelMap[levelNr + 1]) {
+				level = this.levelMap[levelNr + 1];
+				if (level.layoutAlgorithm && series[level.layoutAlgorithm]) {
+					algorithm = level.layoutAlgorithm;
+				}
+				if (level.layoutStartingDirection) {
+					area.direction = level.layoutStartingDirection === 'vertical' ? 0 : 1;
+				}
+			}
+			childrenValues = series[algorithm](area, node.children);
+			each(node.children, function (child) {
+				levelNr = options.levelIsConstant ? child.level : (child.level - levelRoot);
+				point = series.points[child.i];
+				point.level = levelNr;
+				childValues = childrenValues[i];
+				childValues.val = child.childrenTotal;
+				childValues.direction = area.direction;
+				if (alternate) {
+					childValues.direction = 1 - childValues.direction;
+				}
+				child.values = childValues;
+				point.node = child;
+				point.isLeaf = true;
+				// If node has children, then call method recursively
+				if (child.children.length) {
+					point.isLeaf = false;
+					series.calculateArea(child, childValues);
+				}
+				i = i + 1;
+			});
+		},
+		setPointValues: function () {
+			var series = this,
+				xAxis = series.xAxis,
+				yAxis = series.yAxis;
+			series.nodeMap[""].values = {
+				x: 0,
+				y: 0,
+				width: 100,
+				height: 100
+			};
+			each(series.points, function (point) {
+				var node = point.node,
+					values = node.values,
+					x1,
+					x2,
+					y1,
+					y2;
+				values.x = values.x / series.axisRatio;
+				values.width = values.width / series.axisRatio;
+				x1 = Math.round(xAxis.translate(values.x, 0, 0, 0, 1));
+				x2 = Math.round(xAxis.translate(values.x + values.width, 0, 0, 0, 1));
+				y1 = Math.round(yAxis.translate(values.y, 0, 0, 0, 1));
+				y2 = Math.round(yAxis.translate(values.y + values.height, 0, 0, 0, 1));
+				if (node.visible || !series.options.ignoreHiddenPoint) {
+					// Set point values
+					point.shapeType = 'rect';
+					point.shapeArgs = {
+						x: Math.min(x1, x2),
+						y: Math.min(y1, y2),
+						width: Math.abs(x2 - x1),
+						height: Math.abs(y2 - y1)
+					};
+					point.plotX = point.shapeArgs.x + (point.shapeArgs.width / 2);
+					point.plotY = point.shapeArgs.y + (point.shapeArgs.height / 2);
+				}
+			});
+		},
+		getSeriesArea: function (val) {
+			var x = 0,
+				y = 0,
+				h = 100,
+				r = this.axisRatio = (this.xAxis.len / this.yAxis.len),
+				w = 100 * r,
+				d = this.options.layoutStartingDirection === 'vertical' ? 0 : 1,
+				seriesArea = {
+					x: x,
+					y: y,
+					width: w,
+					height: h,
+					direction: d,
+					val: val
+				};
+			return seriesArea;
+		},
+		getLevels: function () {
+			var map = [],
+				levels = this.options.levels;
+			if (levels) {
+				each(levels, function (level) {
+					if (level.level !== undefined) {
+						map[level.level] = level;
+					}
+				});
+			}
+			return map;
+		},
+		setColorRecursive: function (node, color) {
+			var series = this,
+				point,
+				level;
+			if (node) {
+				point = series.points[node.i];
+				level = series.levelMap[node.level];
+				// Select either point color, level color or inherited color.
+				color = pick(point && point.options.color, level && level.color, color);
+				if (point) {
+					point.color = color;
+				}
+				// Do it all again with the children	
+				if (node.children.length) {
+					each(node.children, function (child) {
+						series.setColorRecursive(child, color);
+					});
+				}
+			}
+		},
+		alg_func_group: function (h, w, d, p) {
+			this.height = h;
+			this.width = w;
+			this.plot = p;
+			this.direction = d;
+			this.startDirection = d;
+			this.total = 0;
+			this.nW = 0;
+			this.lW = 0;
+			this.nH = 0;
+			this.lH = 0;
+			this.elArr = [];
+			this.lP = {
+				total: 0,
+				lH: 0,
+				nH: 0,
+				lW: 0,
+				nW: 0,
+				nR: 0,
+				lR: 0,
+				aspectRatio: function (w, h) {
+					return Math.max((w / h), (h / w));
+				}
+			};
+			this.addElement = function (el) {
+				this.lP.total = this.elArr[this.elArr.length - 1];
+				this.total = this.total + el;
+				if (this.direction === 0) {
+					// Calculate last point old aspect ratio
+					this.lW = this.nW;
+					this.lP.lH = this.lP.total / this.lW;
+					this.lP.lR = this.lP.aspectRatio(this.lW, this.lP.lH);
+					// Calculate last point new aspect ratio
+					this.nW = this.total / this.height;
+					this.lP.nH = this.lP.total / this.nW;
+					this.lP.nR = this.lP.aspectRatio(this.nW, this.lP.nH);
+				} else {
+					// Calculate last point old aspect ratio
+					this.lH = this.nH;
+					this.lP.lW = this.lP.total / this.lH;
+					this.lP.lR = this.lP.aspectRatio(this.lP.lW, this.lH);
+					// Calculate last point new aspect ratio
+					this.nH = this.total / this.width;
+					this.lP.nW = this.lP.total / this.nH;
+					this.lP.nR = this.lP.aspectRatio(this.lP.nW, this.nH);
+				}
+				this.elArr.push(el);						
+			};
+			this.reset = function () {
+				this.nW = 0;
+				this.lW = 0;
+				this.elArr = [];
+				this.total = 0;
+			};
+		},
+		alg_func_calcPoints: function (directionChange, last, group, childrenArea) {
+			var pX,
+				pY,
+				pW,
+				pH,
+				gW = group.lW,
+				gH = group.lH,
+				plot = group.plot,
+				keep,
+				i = 0,
+				end = group.elArr.length - 1;
+			if (last) {
+				gW = group.nW;
+				gH = group.nH;
+			} else {
+				keep = group.elArr[group.elArr.length - 1];
+			}
+			each(group.elArr, function (p) {
+				if (last || (i < end)) {
+					if (group.direction === 0) {
+						pX = plot.x;
+						pY = plot.y; 
+						pW = gW;
+						pH = p / pW;
+					} else {
+						pX = plot.x;
+						pY = plot.y;
+						pH = gH;
+						pW = p / pH;
+					}
+					childrenArea.push({
+						x: pX,
+						y: pY,
+						width: pW,
+						height: pH
+					});
+					if (group.direction === 0) {
+						plot.y = plot.y + pH;
+					} else {
+						plot.x = plot.x + pW;
+					}						
+				}
+				i = i + 1;
+			});
+			// Reset variables
+			group.reset();
+			if (group.direction === 0) {
+				group.width = group.width - gW;
+			} else {
+				group.height = group.height - gH;
+			}
+			plot.y = plot.parent.y + (plot.parent.height - group.height);
+			plot.x = plot.parent.x + (plot.parent.width - group.width);
+			if (directionChange) {
+				group.direction = 1 - group.direction;
+			}
+			// If not last, then add uncalculated element
+			if (!last) {
+				group.addElement(keep);
+			}
+		},
+		alg_func_lowAspectRatio: function (directionChange, parent, children) {
+			var childrenArea = [],
+				series = this,
+				pTot,
+				plot = {
+					x: parent.x,
+					y: parent.y,
+					parent: parent
+				},
+				direction = parent.direction,
+				i = 0,
+				end = children.length - 1,
+				group = new this.alg_func_group(parent.height, parent.width, direction, plot);
+			// Loop through and calculate all areas
+			each(children, function (child) {
+				pTot = (parent.width * parent.height) * (child.val / parent.val);
+				group.addElement(pTot);
+				if (group.lP.nR > group.lP.lR) {
+					series.alg_func_calcPoints(directionChange, false, group, childrenArea, plot);
+				}
+				// If last child, then calculate all remaining areas
+				if (i === end) {
+					series.alg_func_calcPoints(directionChange, true, group, childrenArea, plot);
+				}
+				i = i + 1;
+			});
+			return childrenArea;
+		},
+		alg_func_fill: function (directionChange, parent, children) {
+			var childrenArea = [],
+				pTot,
+				direction = parent.direction,
+				x = parent.x,
+				y = parent.y,
+				width = parent.width,
+				height = parent.height,
+				pX,
+				pY,
+				pW,
+				pH;
+			each(children, function (child) {
+				pTot = (parent.width * parent.height) * (child.val / parent.val);
+				pX = x;
+				pY = y;
+				if (direction === 0) {
+					pH = height;
+					pW = pTot / pH;
+					width = width - pW;
+					x = x + pW;
+				} else {
+					pW = width;
+					pH = pTot / pW;
+					height = height - pH;
+					y = y + pH;
+				}
+				childrenArea.push({
+					x: pX,
+					y: pY,
+					width: pW,
+					height: pH
+				});
+				if (directionChange) {
+					direction = 1 - direction;
+				}
+			});
+			return childrenArea;
+		},
+		strip: function (parent, children) {
+			return this.alg_func_lowAspectRatio(false, parent, children);
+		},
+		squarified: function (parent, children) {
+			return this.alg_func_lowAspectRatio(true, parent, children);
+		},
+		sliceAndDice: function (parent, children) {
+			return this.alg_func_fill(true, parent, children);
+		},
+		stripes: function (parent, children) {
+			return this.alg_func_fill(false, parent, children);
+		},
+		translate: function () {
+			// Call prototype function
+			Series.prototype.translate.call(this);
+			this.handleLayout();
+
+			// If a colorAxis is defined
+			if (this.colorAxis) {
+				this.translateColors();
+			} else if (!this.options.colorByPoint) {
+				this.setColorRecursive(this.tree, undefined);
+			}
+		},
+		/**
+		 * Extend drawDataLabels with logic to handle custom options related to the treemap series:
+		 * - Points which is not a leaf node, has dataLabels disabled by default.
+		 * - Options set on series.levels is merged in.
+		 * - Width of the dataLabel is set to match the width of the point shape.
+		 */
+		drawDataLabels: function () {
+			var series = this,
+				dataLabelsGroup = series.dataLabelsGroup,
+				points = series.points,
+				options,
+				level;
+			each(points, function (point) {
+				level = series.levelMap[point.level];
+				// Set options to new object to problems with scope
+				options = {style: {}};
+
+				// If not a leaf, then label should be disabled as default
+				if (!point.isLeaf) {
+					options.enabled = false;
+				}
+
+				// If options for level exists, include them as well
+				if (level && level.dataLabels) {
+					options = merge(options, level.dataLabels);
+					series._hasPointLabels = true;
+				}
+
+				// Set dataLabel width to the width of the point shape.
+				if (point.shapeArgs) {
+					options.style.width = point.shapeArgs.width;
+				}
+
+				// Merge custom options with point options
+				point.dlOptions = merge(options, point.options.dataLabels);
+			});
+
+			this.dataLabelsGroup = this.group; // Draw dataLabels in same group as points, because of z-index on hover
+			Series.prototype.drawDataLabels.call(this);
+			this.dataLabelsGroup = dataLabelsGroup;
+		},
+		alignDataLabel: seriesTypes.column.prototype.alignDataLabel,
+		/**
+		* Extending ColumnSeries drawPoints
+		*/
+		drawPoints: function () {
+			var series = this,
+				points = series.points,
+				seriesOptions = series.options,
+				attr,
+				hover,
+				level;
+			each(points, function (point) {
+				level = series.levelMap[point.level];
+				attr = {
+					stroke: seriesOptions.borderColor,
+					'stroke-width': seriesOptions.borderWidth,
+					dashstyle: seriesOptions.borderDashStyle,
+					r: 0, // borderRadius gives wrong size relations and should always be disabled
+					fill: pick(point.color, series.color)
+				};
+				// Overwrite standard series options with level options			
+				if (level) {
+					attr.stroke = level.borderColor || attr.stroke;
+					attr['stroke-width'] = level.borderWidth || attr['stroke-width'];
+					attr.dashstyle = level.borderDashStyle || attr.dashstyle;
+				}
+				// Merge with point attributes
+				attr.stroke = point.borderColor || attr.stroke;
+				attr['stroke-width'] = point.borderWidth || attr['stroke-width'];
+				attr.dashstyle = point.borderDashStyle || attr.dashstyle;
+				attr.zIndex = (1000 - (point.level * 2));
+
+				// Make a copy to prevent overwriting individual props
+				point.pointAttr = merge(point.pointAttr);
+				hover = point.pointAttr.hover;
+				hover.zIndex = 1001;
+				hover.fill = Color(attr.fill).brighten(seriesOptions.states.hover.brightness).get();
+				// If not a leaf, then remove fill
+				if (!point.isLeaf) {
+					if (pick(seriesOptions.interactByLeaf, !seriesOptions.allowDrillToNode)) {
+						attr.fill = 'none';
+						delete hover.fill;
+					} else {
+						// TODO: let users set the opacity
+						attr.fill = Color(attr.fill).setOpacity(0.15).get();
+						hover.fill = Color(hover.fill).setOpacity(0.75).get();
+					}
+				}
+				if (point.node.level <= series.nodeMap[series.rootNode].level) {
+					attr.fill = 'none';
+					attr.zIndex = 0;
+					delete hover.fill;
+				}
+				point.pointAttr[''] = H.extend(point.pointAttr[''], attr);
+				if (point.dataLabel) {
+					point.dataLabel.attr({ zIndex: (point.pointAttr[''].zIndex + 1) });
+				}
+			});
+			// Call standard drawPoints
+			seriesTypes.column.prototype.drawPoints.call(this);
+
+			each(points, function (point) {
+				if (point.graphic) {
+					point.graphic.attr(point.pointAttr['']);
+				}
+			});
+
+			// Set click events on points 
+			if (seriesOptions.allowDrillToNode) {
+				series.drillTo();
+			}
+		},
+		/**
+		 * Inserts an element into an array, sorted by a condition.
+		 * Modifies the referenced array
+		 * @param {*[]} arr The array which the element is inserted into.
+		 * @param {*} el The element to insert.
+		 * @param {function} cond The condition to sort on. First parameter is el, second parameter is array element
+		 */
+		insertElementSorted: function (arr, el, cond) {
+			var i = 0,
+				inserted = false;
+			if (arr.length !== 0) {
+				each(arr, function (arrayElement) {
+					if (cond(el, arrayElement) && !inserted) {
+						arr.splice(i, 0, el);
+						inserted = true;
+					}
+					i = i + 1;					
+				});
+			} 
+			if (!inserted) {
+				arr.push(el);
+			}
+		},
+		/**
+		* Add drilling on the suitable points
+		*/
+		drillTo: function () {
+			var series = this,
+				points = series.points;
+			each(points, function (point) {
+				var drillId,
+					drillName;
+				H.removeEvent(point, 'click.drillTo');
+				if (point.graphic) {
+					point.graphic.css({ cursor: 'default' });
+				}
+
+				// Get the drill to id
+				if (series.options.interactByLeaf) {
+					drillId = series.drillToByLeaf(point);
+				} else {
+					drillId = series.drillToByGroup(point);
+				}
+
+				// If a drill id is returned, add click event and cursor. 
+				if (drillId) {
+					drillName = series.nodeMap[series.rootNode].name || series.rootNode;
+					if (point.graphic) {
+						point.graphic.css({ cursor: 'pointer' });
+					}
+					H.addEvent(point, 'click.drillTo', function () {
+						point.setState(''); // Remove hover
+						series.drillToNode(drillId);
+						series.showDrillUpButton(drillName);
+					});
+				}
+			});
+		},
+		/**
+		* Finds the drill id for a parent node.
+		* Returns false if point should not have a click event
+		* @param {Object} point
+		* @return {string || boolean} Drill to id or false when point should not have a click event
+		*/
+		drillToByGroup: function (point) {
+			var series = this,
+				drillId = false;
+			if ((point.node.level - series.nodeMap[series.rootNode].level) === 1 && !point.isLeaf) {
+				drillId = point.id;
+			}
+			return drillId;
+		},
+		/**
+		* Finds the drill id for a leaf node.
+		* Returns false if point should not have a click event
+		* @param {Object} point
+		* @return {string || boolean} Drill to id or false when point should not have a click event
+		*/
+		drillToByLeaf: function (point) {
+			var series = this,
+				drillId = false,
+				nodeParent;
+			if ((point.node.parent !== series.rootNode) && (point.isLeaf)) {
+				nodeParent = point.node;
+				while (!drillId) {
+					nodeParent = series.nodeMap[nodeParent.parent];
+					if (nodeParent.parent === series.rootNode) {
+						drillId = nodeParent.id;
+					}
+				}
+			}
+			return drillId;
+		},
+		drillUp: function () {
+			var drillPoint = null,
+				node,
+				parent;
+			if (this.rootNode) {
+				node = this.nodeMap[this.rootNode];
+				if (node.parent !== null) {
+					drillPoint = this.nodeMap[node.parent];
+				} else {
+					drillPoint = this.nodeMap[""];
+				}
+			}
+
+			if (drillPoint !== null) {
+				this.drillToNode(drillPoint.id);
+				if (drillPoint.id === "") {
+					this.drillUpButton = this.drillUpButton.destroy();
+				} else {
+					parent = this.nodeMap[drillPoint.parent];
+					this.showDrillUpButton((parent.name || parent.id));
+				}
+			} 
+		},
+		drillToNode: function (id) {
+			var node = this.nodeMap[id],
+				val = node.values;
+			this.rootNode = id;
+			this.xAxis.setExtremes(val.x, val.x + val.width, false);
+			this.yAxis.setExtremes(val.y, val.y + val.height, false);
+			this.isDirty = true; // Force redraw
+			this.chart.redraw();
+		},
+		showDrillUpButton: function (name) {
+			var series = this,
+				backText = (name || '< Back'),
+				buttonOptions = series.options.drillUpButton,
+				attr,
+				states;
+
+			if (buttonOptions.text) {
+				backText = buttonOptions.text;
+			}
+			if (!this.drillUpButton) {
+				attr = buttonOptions.theme;
+				states = attr && attr.states;
+							
+				this.drillUpButton = this.chart.renderer.button(
+					backText,
+					null,
+					null,
+					function () {
+						series.drillUp(); 
+					},
+					attr, 
+					states && states.hover,
+					states && states.select
+				)
+				.attr({
+					align: buttonOptions.position.align,
+					zIndex: 9
+				})
+				.add()
+				.align(buttonOptions.position, false, buttonOptions.relativeTo || 'plotBox');
+			} else {
+				this.drillUpButton.attr({
+					text: backText
+				})
+				.align();
+			}
+		},
+		buildKDTree: noop,
+		drawLegendSymbol: H.LegendSymbolMixin.drawRectangle,
+		getExtremes: function () {
+			// Get the extremes from the value data
+			Series.prototype.getExtremes.call(this, this.colorValueData);
+			this.valueMin = this.dataMin;
+			this.valueMax = this.dataMax;
+
+			// Get the extremes from the y data
+			Series.prototype.getExtremes.call(this);
+		},
+		getExtremesFromAll: true,
+		bindAxes: function () {
+			var treeAxis = {
+				endOnTick: false,
+				gridLineWidth: 0,
+				lineWidth: 0,
+				min: 0,
+				dataMin: 0,
+				minPadding: 0,
+				max: 100,
+				dataMax: 100,
+				maxPadding: 0,
+				startOnTick: false,
+				title: null,
+				tickPositions: []
+			};
+			Series.prototype.bindAxes.call(this);
+			H.extend(this.yAxis.options, treeAxis);
+			H.extend(this.xAxis.options, treeAxis);
+		}
+	}));
+}(Highcharts));
diff --git a/data/interfaces/default/js/highcharts/js/themes/dark-blue.js b/data/interfaces/default/js/highcharts/js/themes/dark-blue.js
new file mode 100644
index 00000000..7cf7138a
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/themes/dark-blue.js
@@ -0,0 +1,254 @@
+/**
+ * Dark blue theme for Highcharts JS
+ * @author Torstein Honsi
+ */
+
+Highcharts.theme = {
+	colors: ["#DDDF0D", "#55BF3B", "#DF5353", "#7798BF", "#aaeeee", "#ff0066", "#eeaaee",
+		"#55BF3B", "#DF5353", "#7798BF", "#aaeeee"],
+	chart: {
+		backgroundColor: {
+			linearGradient: { x1: 0, y1: 0, x2: 1, y2: 1 },
+			stops: [
+				[0, 'rgb(48, 48, 96)'],
+				[1, 'rgb(0, 0, 0)']
+			]
+		},
+		borderColor: '#000000',
+		borderWidth: 2,
+		className: 'dark-container',
+		plotBackgroundColor: 'rgba(255, 255, 255, .1)',
+		plotBorderColor: '#CCCCCC',
+		plotBorderWidth: 1
+	},
+	title: {
+		style: {
+			color: '#C0C0C0',
+			font: 'bold 16px "Trebuchet MS", Verdana, sans-serif'
+		}
+	},
+	subtitle: {
+		style: {
+			color: '#666666',
+			font: 'bold 12px "Trebuchet MS", Verdana, sans-serif'
+		}
+	},
+	xAxis: {
+		gridLineColor: '#333333',
+		gridLineWidth: 1,
+		labels: {
+			style: {
+				color: '#A0A0A0'
+			}
+		},
+		lineColor: '#A0A0A0',
+		tickColor: '#A0A0A0',
+		title: {
+			style: {
+				color: '#CCC',
+				fontWeight: 'bold',
+				fontSize: '12px',
+				fontFamily: 'Trebuchet MS, Verdana, sans-serif'
+
+			}
+		}
+	},
+	yAxis: {
+		gridLineColor: '#333333',
+		labels: {
+			style: {
+				color: '#A0A0A0'
+			}
+		},
+		lineColor: '#A0A0A0',
+		minorTickInterval: null,
+		tickColor: '#A0A0A0',
+		tickWidth: 1,
+		title: {
+			style: {
+				color: '#CCC',
+				fontWeight: 'bold',
+				fontSize: '12px',
+				fontFamily: 'Trebuchet MS, Verdana, sans-serif'
+			}
+		}
+	},
+	tooltip: {
+		backgroundColor: 'rgba(0, 0, 0, 0.75)',
+		style: {
+			color: '#F0F0F0'
+		}
+	},
+	toolbar: {
+		itemStyle: {
+			color: 'silver'
+		}
+	},
+	plotOptions: {
+		line: {
+			dataLabels: {
+				color: '#CCC'
+			},
+			marker: {
+				lineColor: '#333'
+			}
+		},
+		spline: {
+			marker: {
+				lineColor: '#333'
+			}
+		},
+		scatter: {
+			marker: {
+				lineColor: '#333'
+			}
+		},
+		candlestick: {
+			lineColor: 'white'
+		}
+	},
+	legend: {
+		itemStyle: {
+			font: '9pt Trebuchet MS, Verdana, sans-serif',
+			color: '#A0A0A0'
+		},
+		itemHoverStyle: {
+			color: '#FFF'
+		},
+		itemHiddenStyle: {
+			color: '#444'
+		}
+	},
+	credits: {
+		style: {
+			color: '#666'
+		}
+	},
+	labels: {
+		style: {
+			color: '#CCC'
+		}
+	},
+
+	navigation: {
+		buttonOptions: {
+			symbolStroke: '#DDDDDD',
+			hoverSymbolStroke: '#FFFFFF',
+			theme: {
+				fill: {
+					linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+					stops: [
+						[0.4, '#606060'],
+						[0.6, '#333333']
+					]
+				},
+				stroke: '#000000'
+			}
+		}
+	},
+
+	// scroll charts
+	rangeSelector: {
+		buttonTheme: {
+			fill: {
+				linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+				stops: [
+					[0.4, '#888'],
+					[0.6, '#555']
+				]
+			},
+			stroke: '#000000',
+			style: {
+				color: '#CCC',
+				fontWeight: 'bold'
+			},
+			states: {
+				hover: {
+					fill: {
+						linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+						stops: [
+							[0.4, '#BBB'],
+							[0.6, '#888']
+						]
+					},
+					stroke: '#000000',
+					style: {
+						color: 'white'
+					}
+				},
+				select: {
+					fill: {
+						linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+						stops: [
+							[0.1, '#000'],
+							[0.3, '#333']
+						]
+					},
+					stroke: '#000000',
+					style: {
+						color: 'yellow'
+					}
+				}
+			}
+		},
+		inputStyle: {
+			backgroundColor: '#333',
+			color: 'silver'
+		},
+		labelStyle: {
+			color: 'silver'
+		}
+	},
+
+	navigator: {
+		handles: {
+			backgroundColor: '#666',
+			borderColor: '#AAA'
+		},
+		outlineColor: '#CCC',
+		maskFill: 'rgba(16, 16, 16, 0.5)',
+		series: {
+			color: '#7798BF',
+			lineColor: '#A6C7ED'
+		}
+	},
+
+	scrollbar: {
+		barBackgroundColor: {
+				linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+				stops: [
+					[0.4, '#888'],
+					[0.6, '#555']
+				]
+			},
+		barBorderColor: '#CCC',
+		buttonArrowColor: '#CCC',
+		buttonBackgroundColor: {
+				linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+				stops: [
+					[0.4, '#888'],
+					[0.6, '#555']
+				]
+			},
+		buttonBorderColor: '#CCC',
+		rifleColor: '#FFF',
+		trackBackgroundColor: {
+			linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+			stops: [
+				[0, '#000'],
+				[1, '#333']
+			]
+		},
+		trackBorderColor: '#666'
+	},
+
+	// special colors for some of the
+	legendBackgroundColor: 'rgba(0, 0, 0, 0.5)',
+	background2: 'rgb(35, 35, 70)',
+	dataLabelsColor: '#444',
+	textColor: '#C0C0C0',
+	maskColor: 'rgba(255,255,255,0.3)'
+};
+
+// Apply the theme
+var highchartsOptions = Highcharts.setOptions(Highcharts.theme);
diff --git a/data/interfaces/default/js/highcharts/js/themes/dark-green.js b/data/interfaces/default/js/highcharts/js/themes/dark-green.js
new file mode 100644
index 00000000..4a7ad586
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/themes/dark-green.js
@@ -0,0 +1,255 @@
+/**
+ * Dark blue theme for Highcharts JS
+ * @author Torstein Honsi
+ */
+
+Highcharts.theme = {
+	colors: ["#DDDF0D", "#55BF3B", "#DF5353", "#7798BF", "#aaeeee", "#ff0066", "#eeaaee",
+		"#55BF3B", "#DF5353", "#7798BF", "#aaeeee"],
+	chart: {
+		backgroundColor: {
+			linearGradient: [0, 0, 250, 500],
+			stops: [
+				[0, 'rgb(48, 96, 48)'],
+				[1, 'rgb(0, 0, 0)']
+			]
+		},
+		borderColor: '#000000',
+		borderWidth: 2,
+		className: 'dark-container',
+		plotBackgroundColor: 'rgba(255, 255, 255, .1)',
+		plotBorderColor: '#CCCCCC',
+		plotBorderWidth: 1
+	},
+	title: {
+		style: {
+			color: '#C0C0C0',
+			font: 'bold 16px "Trebuchet MS", Verdana, sans-serif'
+		}
+	},
+	subtitle: {
+		style: {
+			color: '#666666',
+			font: 'bold 12px "Trebuchet MS", Verdana, sans-serif'
+		}
+	},
+	xAxis: {
+		gridLineColor: '#333333',
+		gridLineWidth: 1,
+		labels: {
+			style: {
+				color: '#A0A0A0'
+			}
+		},
+		lineColor: '#A0A0A0',
+		tickColor: '#A0A0A0',
+		title: {
+			style: {
+				color: '#CCC',
+				fontWeight: 'bold',
+				fontSize: '12px',
+				fontFamily: 'Trebuchet MS, Verdana, sans-serif'
+
+			}
+		}
+	},
+	yAxis: {
+		gridLineColor: '#333333',
+		labels: {
+			style: {
+				color: '#A0A0A0'
+			}
+		},
+		lineColor: '#A0A0A0',
+		minorTickInterval: null,
+		tickColor: '#A0A0A0',
+		tickWidth: 1,
+		title: {
+			style: {
+				color: '#CCC',
+				fontWeight: 'bold',
+				fontSize: '12px',
+				fontFamily: 'Trebuchet MS, Verdana, sans-serif'
+			}
+		}
+	},
+	tooltip: {
+		backgroundColor: 'rgba(0, 0, 0, 0.75)',
+		style: {
+			color: '#F0F0F0'
+		}
+	},
+	toolbar: {
+		itemStyle: {
+			color: 'silver'
+		}
+	},
+	plotOptions: {
+		line: {
+			dataLabels: {
+				color: '#CCC'
+			},
+			marker: {
+				lineColor: '#333'
+			}
+		},
+		spline: {
+			marker: {
+				lineColor: '#333'
+			}
+		},
+		scatter: {
+			marker: {
+				lineColor: '#333'
+			}
+		},
+		candlestick: {
+			lineColor: 'white'
+		}
+	},
+	legend: {
+		itemStyle: {
+			font: '9pt Trebuchet MS, Verdana, sans-serif',
+			color: '#A0A0A0'
+		},
+		itemHoverStyle: {
+			color: '#FFF'
+		},
+		itemHiddenStyle: {
+			color: '#444'
+		}
+	},
+	credits: {
+		style: {
+			color: '#666'
+		}
+	},
+	labels: {
+		style: {
+			color: '#CCC'
+		}
+	},
+
+
+	navigation: {
+		buttonOptions: {
+			symbolStroke: '#DDDDDD',
+			hoverSymbolStroke: '#FFFFFF',
+			theme: {
+				fill: {
+					linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+					stops: [
+						[0.4, '#606060'],
+						[0.6, '#333333']
+					]
+				},
+				stroke: '#000000'
+			}
+		}
+	},
+
+	// scroll charts
+	rangeSelector: {
+		buttonTheme: {
+			fill: {
+				linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+				stops: [
+					[0.4, '#888'],
+					[0.6, '#555']
+				]
+			},
+			stroke: '#000000',
+			style: {
+				color: '#CCC',
+				fontWeight: 'bold'
+			},
+			states: {
+				hover: {
+					fill: {
+						linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+						stops: [
+							[0.4, '#BBB'],
+							[0.6, '#888']
+						]
+					},
+					stroke: '#000000',
+					style: {
+						color: 'white'
+					}
+				},
+				select: {
+					fill: {
+						linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+						stops: [
+							[0.1, '#000'],
+							[0.3, '#333']
+						]
+					},
+					stroke: '#000000',
+					style: {
+						color: 'yellow'
+					}
+				}
+			}
+		},
+		inputStyle: {
+			backgroundColor: '#333',
+			color: 'silver'
+		},
+		labelStyle: {
+			color: 'silver'
+		}
+	},
+
+	navigator: {
+		handles: {
+			backgroundColor: '#666',
+			borderColor: '#AAA'
+		},
+		outlineColor: '#CCC',
+		maskFill: 'rgba(16, 16, 16, 0.5)',
+		series: {
+			color: '#7798BF',
+			lineColor: '#A6C7ED'
+		}
+	},
+
+	scrollbar: {
+		barBackgroundColor: {
+				linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+				stops: [
+					[0.4, '#888'],
+					[0.6, '#555']
+				]
+			},
+		barBorderColor: '#CCC',
+		buttonArrowColor: '#CCC',
+		buttonBackgroundColor: {
+				linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+				stops: [
+					[0.4, '#888'],
+					[0.6, '#555']
+				]
+			},
+		buttonBorderColor: '#CCC',
+		rifleColor: '#FFF',
+		trackBackgroundColor: {
+			linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+			stops: [
+				[0, '#000'],
+				[1, '#333']
+			]
+		},
+		trackBorderColor: '#666'
+	},
+
+	// special colors for some of the
+	legendBackgroundColor: 'rgba(0, 0, 0, 0.5)',
+	background2: 'rgb(35, 35, 70)',
+	dataLabelsColor: '#444',
+	textColor: '#C0C0C0',
+	maskColor: 'rgba(255,255,255,0.3)'
+};
+
+// Apply the theme
+var highchartsOptions = Highcharts.setOptions(Highcharts.theme);
diff --git a/data/interfaces/default/js/highcharts/js/themes/dark-unica.js b/data/interfaces/default/js/highcharts/js/themes/dark-unica.js
new file mode 100644
index 00000000..598c061c
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/themes/dark-unica.js
@@ -0,0 +1,213 @@
+/**
+ * Dark theme for Highcharts JS
+ * @author Torstein Honsi
+ */
+
+// Load the fonts
+Highcharts.createElement('link', {
+	href: '//fonts.googleapis.com/css?family=Unica+One',
+	rel: 'stylesheet',
+	type: 'text/css'
+}, null, document.getElementsByTagName('head')[0]);
+
+Highcharts.theme = {
+	colors: ["#2b908f", "#90ee7e", "#f45b5b", "#7798BF", "#aaeeee", "#ff0066", "#eeaaee",
+		"#55BF3B", "#DF5353", "#7798BF", "#aaeeee"],
+	chart: {
+		backgroundColor: {
+			linearGradient: { x1: 0, y1: 0, x2: 1, y2: 1 },
+			stops: [
+				[0, '#2a2a2b'],
+				[1, '#3e3e40']
+			]
+		},
+		style: {
+			fontFamily: "'Unica One', sans-serif"
+		},
+		plotBorderColor: '#606063'
+	},
+	title: {
+		style: {
+			color: '#E0E0E3',
+			textTransform: 'uppercase',
+			fontSize: '20px'
+		}
+	},
+	subtitle: {
+		style: {
+			color: '#E0E0E3',
+			textTransform: 'uppercase'
+		}
+	},
+	xAxis: {
+		gridLineColor: '#707073',
+		labels: {
+			style: {
+				color: '#E0E0E3'
+			}
+		},
+		lineColor: '#707073',
+		minorGridLineColor: '#505053',
+		tickColor: '#707073',
+		title: {
+			style: {
+				color: '#A0A0A3'
+
+			}
+		}
+	},
+	yAxis: {
+		gridLineColor: '#707073',
+		labels: {
+			style: {
+				color: '#E0E0E3'
+			}
+		},
+		lineColor: '#707073',
+		minorGridLineColor: '#505053',
+		tickColor: '#707073',
+		tickWidth: 1,
+		title: {
+			style: {
+				color: '#A0A0A3'
+			}
+		}
+	},
+	tooltip: {
+		backgroundColor: 'rgba(0, 0, 0, 0.85)',
+		style: {
+			color: '#F0F0F0'
+		}
+	},
+	plotOptions: {
+		series: {
+			dataLabels: {
+				color: '#B0B0B3'
+			},
+			marker: {
+				lineColor: '#333'
+			}
+		},
+		boxplot: {
+			fillColor: '#505053'
+		},
+		candlestick: {
+			lineColor: 'white'
+		},
+		errorbar: {
+			color: 'white'
+		}
+	},
+	legend: {
+		itemStyle: {
+			color: '#E0E0E3'
+		},
+		itemHoverStyle: {
+			color: '#FFF'
+		},
+		itemHiddenStyle: {
+			color: '#606063'
+		}
+	},
+	credits: {
+		style: {
+			color: '#666'
+		}
+	},
+	labels: {
+		style: {
+			color: '#707073'
+		}
+	},
+
+	drilldown: {
+		activeAxisLabelStyle: {
+			color: '#F0F0F3'
+		},
+		activeDataLabelStyle: {
+			color: '#F0F0F3'
+		}
+	},
+
+	navigation: {
+		buttonOptions: {
+			symbolStroke: '#DDDDDD',
+			theme: {
+				fill: '#505053'
+			}
+		}
+	},
+
+	// scroll charts
+	rangeSelector: {
+		buttonTheme: {
+			fill: '#505053',
+			stroke: '#000000',
+			style: {
+				color: '#CCC'
+			},
+			states: {
+				hover: {
+					fill: '#707073',
+					stroke: '#000000',
+					style: {
+						color: 'white'
+					}
+				},
+				select: {
+					fill: '#000003',
+					stroke: '#000000',
+					style: {
+						color: 'white'
+					}
+				}
+			}
+		},
+		inputBoxBorderColor: '#505053',
+		inputStyle: {
+			backgroundColor: '#333',
+			color: 'silver'
+		},
+		labelStyle: {
+			color: 'silver'
+		}
+	},
+
+	navigator: {
+		handles: {
+			backgroundColor: '#666',
+			borderColor: '#AAA'
+		},
+		outlineColor: '#CCC',
+		maskFill: 'rgba(255,255,255,0.1)',
+		series: {
+			color: '#7798BF',
+			lineColor: '#A6C7ED'
+		},
+		xAxis: {
+			gridLineColor: '#505053'
+		}
+	},
+
+	scrollbar: {
+		barBackgroundColor: '#808083',
+		barBorderColor: '#808083',
+		buttonArrowColor: '#CCC',
+		buttonBackgroundColor: '#606063',
+		buttonBorderColor: '#606063',
+		rifleColor: '#FFF',
+		trackBackgroundColor: '#404043',
+		trackBorderColor: '#404043'
+	},
+
+	// special colors for some of the
+	legendBackgroundColor: 'rgba(0, 0, 0, 0.5)',
+	background2: '#505053',
+	dataLabelsColor: '#B0B0B3',
+	textColor: '#C0C0C0',
+	contrastTextColor: '#F0F0F3',
+	maskColor: 'rgba(255,255,255,0.3)'
+};
+
+// Apply the theme
+Highcharts.setOptions(Highcharts.theme);
diff --git a/data/interfaces/default/js/highcharts/js/themes/gray.js b/data/interfaces/default/js/highcharts/js/themes/gray.js
new file mode 100644
index 00000000..d9a40169
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/themes/gray.js
@@ -0,0 +1,257 @@
+/**
+ * Gray theme for Highcharts JS
+ * @author Torstein Honsi
+ */
+
+Highcharts.theme = {
+	colors: ["#DDDF0D", "#7798BF", "#55BF3B", "#DF5353", "#aaeeee", "#ff0066", "#eeaaee",
+		"#55BF3B", "#DF5353", "#7798BF", "#aaeeee"],
+	chart: {
+		backgroundColor: {
+			linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+			stops: [
+				[0, 'rgb(96, 96, 96)'],
+				[1, 'rgb(16, 16, 16)']
+			]
+		},
+		borderWidth: 0,
+		borderRadius: 0,
+		plotBackgroundColor: null,
+		plotShadow: false,
+		plotBorderWidth: 0
+	},
+	title: {
+		style: {
+			color: '#FFF',
+			font: '16px Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif'
+		}
+	},
+	subtitle: {
+		style: {
+			color: '#DDD',
+			font: '12px Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif'
+		}
+	},
+	xAxis: {
+		gridLineWidth: 0,
+		lineColor: '#999',
+		tickColor: '#999',
+		labels: {
+			style: {
+				color: '#999',
+				fontWeight: 'bold'
+			}
+		},
+		title: {
+			style: {
+				color: '#AAA',
+				font: 'bold 12px Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif'
+			}
+		}
+	},
+	yAxis: {
+		alternateGridColor: null,
+		minorTickInterval: null,
+		gridLineColor: 'rgba(255, 255, 255, .1)',
+		minorGridLineColor: 'rgba(255,255,255,0.07)',
+		lineWidth: 0,
+		tickWidth: 0,
+		labels: {
+			style: {
+				color: '#999',
+				fontWeight: 'bold'
+			}
+		},
+		title: {
+			style: {
+				color: '#AAA',
+				font: 'bold 12px Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif'
+			}
+		}
+	},
+	legend: {
+		itemStyle: {
+			color: '#CCC'
+		},
+		itemHoverStyle: {
+			color: '#FFF'
+		},
+		itemHiddenStyle: {
+			color: '#333'
+		}
+	},
+	labels: {
+		style: {
+			color: '#CCC'
+		}
+	},
+	tooltip: {
+		backgroundColor: {
+			linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+			stops: [
+				[0, 'rgba(96, 96, 96, .8)'],
+				[1, 'rgba(16, 16, 16, .8)']
+			]
+		},
+		borderWidth: 0,
+		style: {
+			color: '#FFF'
+		}
+	},
+
+
+	plotOptions: {
+		series: {
+			nullColor: '#444444'
+		},
+		line: {
+			dataLabels: {
+				color: '#CCC'
+			},
+			marker: {
+				lineColor: '#333'
+			}
+		},
+		spline: {
+			marker: {
+				lineColor: '#333'
+			}
+		},
+		scatter: {
+			marker: {
+				lineColor: '#333'
+			}
+		},
+		candlestick: {
+			lineColor: 'white'
+		}
+	},
+
+	toolbar: {
+		itemStyle: {
+			color: '#CCC'
+		}
+	},
+
+	navigation: {
+		buttonOptions: {
+			symbolStroke: '#DDDDDD',
+			hoverSymbolStroke: '#FFFFFF',
+			theme: {
+				fill: {
+					linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+					stops: [
+						[0.4, '#606060'],
+						[0.6, '#333333']
+					]
+				},
+				stroke: '#000000'
+			}
+		}
+	},
+
+	// scroll charts
+	rangeSelector: {
+		buttonTheme: {
+			fill: {
+				linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+				stops: [
+					[0.4, '#888'],
+					[0.6, '#555']
+				]
+			},
+			stroke: '#000000',
+			style: {
+				color: '#CCC',
+				fontWeight: 'bold'
+			},
+			states: {
+				hover: {
+					fill: {
+						linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+						stops: [
+							[0.4, '#BBB'],
+							[0.6, '#888']
+						]
+					},
+					stroke: '#000000',
+					style: {
+						color: 'white'
+					}
+				},
+				select: {
+					fill: {
+						linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+						stops: [
+							[0.1, '#000'],
+							[0.3, '#333']
+						]
+					},
+					stroke: '#000000',
+					style: {
+						color: 'yellow'
+					}
+				}
+			}
+		},
+		inputStyle: {
+			backgroundColor: '#333',
+			color: 'silver'
+		},
+		labelStyle: {
+			color: 'silver'
+		}
+	},
+
+	navigator: {
+		handles: {
+			backgroundColor: '#666',
+			borderColor: '#AAA'
+		},
+		outlineColor: '#CCC',
+		maskFill: 'rgba(16, 16, 16, 0.5)',
+		series: {
+			color: '#7798BF',
+			lineColor: '#A6C7ED'
+		}
+	},
+
+	scrollbar: {
+		barBackgroundColor: {
+				linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+				stops: [
+					[0.4, '#888'],
+					[0.6, '#555']
+				]
+			},
+		barBorderColor: '#CCC',
+		buttonArrowColor: '#CCC',
+		buttonBackgroundColor: {
+				linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+				stops: [
+					[0.4, '#888'],
+					[0.6, '#555']
+				]
+			},
+		buttonBorderColor: '#CCC',
+		rifleColor: '#FFF',
+		trackBackgroundColor: {
+			linearGradient: { x1: 0, y1: 0, x2: 0, y2: 1 },
+			stops: [
+				[0, '#000'],
+				[1, '#333']
+			]
+		},
+		trackBorderColor: '#666'
+	},
+
+	// special colors for some of the demo examples
+	legendBackgroundColor: 'rgba(48, 48, 48, 0.8)',
+	background2: 'rgb(70, 70, 70)',
+	dataLabelsColor: '#444',
+	textColor: '#E0E0E0',
+	maskColor: 'rgba(255,255,255,0.3)'
+};
+
+// Apply the theme
+var highchartsOptions = Highcharts.setOptions(Highcharts.theme);
diff --git a/data/interfaces/default/js/highcharts/js/themes/grid-light.js b/data/interfaces/default/js/highcharts/js/themes/grid-light.js
new file mode 100644
index 00000000..35c34dbe
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/themes/grid-light.js
@@ -0,0 +1,74 @@
+/**
+ * Grid-light theme for Highcharts JS
+ * @author Torstein Honsi
+ */
+
+// Load the fonts
+Highcharts.createElement('link', {
+	href: '//fonts.googleapis.com/css?family=Dosis:400,600',
+	rel: 'stylesheet',
+	type: 'text/css'
+}, null, document.getElementsByTagName('head')[0]);
+
+Highcharts.theme = {
+	colors: ["#7cb5ec", "#f7a35c", "#90ee7e", "#7798BF", "#aaeeee", "#ff0066", "#eeaaee",
+		"#55BF3B", "#DF5353", "#7798BF", "#aaeeee"],
+	chart: {
+		backgroundColor: null,
+		style: {
+			fontFamily: "Dosis, sans-serif"
+		}
+	},
+	title: {
+		style: {
+			fontSize: '16px',
+			fontWeight: 'bold',
+			textTransform: 'uppercase'
+		}
+	},
+	tooltip: {
+		borderWidth: 0,
+		backgroundColor: 'rgba(219,219,216,0.8)',
+		shadow: false
+	},
+	legend: {
+		itemStyle: {
+			fontWeight: 'bold',
+			fontSize: '13px'
+		}
+	},
+	xAxis: {
+		gridLineWidth: 1,
+		labels: {
+			style: {
+				fontSize: '12px'
+			}
+		}
+	},
+	yAxis: {
+		minorTickInterval: 'auto',
+		title: {
+			style: {
+				textTransform: 'uppercase'
+			}
+		},
+		labels: {
+			style: {
+				fontSize: '12px'
+			}
+		}
+	},
+	plotOptions: {
+		candlestick: {
+			lineColor: '#404048'
+		}
+	},
+
+
+	// General
+	background2: '#F0F0EA'
+	
+};
+
+// Apply the theme
+Highcharts.setOptions(Highcharts.theme);
diff --git a/data/interfaces/default/js/highcharts/js/themes/grid.js b/data/interfaces/default/js/highcharts/js/themes/grid.js
new file mode 100644
index 00000000..70342f5e
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/themes/grid.js
@@ -0,0 +1,103 @@
+/**
+ * Grid theme for Highcharts JS
+ * @author Torstein Honsi
+ */
+
+Highcharts.theme = {
+	colors: ['#058DC7', '#50B432', '#ED561B', '#DDDF00', '#24CBE5', '#64E572', '#FF9655', '#FFF263', '#6AF9C4'],
+	chart: {
+		backgroundColor: {
+			linearGradient: { x1: 0, y1: 0, x2: 1, y2: 1 },
+			stops: [
+				[0, 'rgb(255, 255, 255)'],
+				[1, 'rgb(240, 240, 255)']
+			]
+		},
+		borderWidth: 2,
+		plotBackgroundColor: 'rgba(255, 255, 255, .9)',
+		plotShadow: true,
+		plotBorderWidth: 1
+	},
+	title: {
+		style: {
+			color: '#000',
+			font: 'bold 16px "Trebuchet MS", Verdana, sans-serif'
+		}
+	},
+	subtitle: {
+		style: {
+			color: '#666666',
+			font: 'bold 12px "Trebuchet MS", Verdana, sans-serif'
+		}
+	},
+	xAxis: {
+		gridLineWidth: 1,
+		lineColor: '#000',
+		tickColor: '#000',
+		labels: {
+			style: {
+				color: '#000',
+				font: '11px Trebuchet MS, Verdana, sans-serif'
+			}
+		},
+		title: {
+			style: {
+				color: '#333',
+				fontWeight: 'bold',
+				fontSize: '12px',
+				fontFamily: 'Trebuchet MS, Verdana, sans-serif'
+
+			}
+		}
+	},
+	yAxis: {
+		minorTickInterval: 'auto',
+		lineColor: '#000',
+		lineWidth: 1,
+		tickWidth: 1,
+		tickColor: '#000',
+		labels: {
+			style: {
+				color: '#000',
+				font: '11px Trebuchet MS, Verdana, sans-serif'
+			}
+		},
+		title: {
+			style: {
+				color: '#333',
+				fontWeight: 'bold',
+				fontSize: '12px',
+				fontFamily: 'Trebuchet MS, Verdana, sans-serif'
+			}
+		}
+	},
+	legend: {
+		itemStyle: {
+			font: '9pt Trebuchet MS, Verdana, sans-serif',
+			color: 'black'
+
+		},
+		itemHoverStyle: {
+			color: '#039'
+		},
+		itemHiddenStyle: {
+			color: 'gray'
+		}
+	},
+	labels: {
+		style: {
+			color: '#99b'
+		}
+	},
+
+	navigation: {
+		buttonOptions: {
+			theme: {
+				stroke: '#CCCCCC'
+			}
+		}
+	}
+};
+
+// Apply the theme
+var highchartsOptions = Highcharts.setOptions(Highcharts.theme);
diff --git a/data/interfaces/default/js/highcharts/js/themes/sand-signika.js b/data/interfaces/default/js/highcharts/js/themes/sand-signika.js
new file mode 100644
index 00000000..67246ee1
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/themes/sand-signika.js
@@ -0,0 +1,104 @@
+/**
+ * Sand-Signika theme for Highcharts JS
+ * @author Torstein Honsi
+ */
+
+// Load the fonts
+Highcharts.createElement('link', {
+	href: '//fonts.googleapis.com/css?family=Signika:400,700',
+	rel: 'stylesheet',
+	type: 'text/css'
+}, null, document.getElementsByTagName('head')[0]);
+
+// Add the background image to the container
+Highcharts.wrap(Highcharts.Chart.prototype, 'getContainer', function (proceed) {
+	proceed.call(this);
+	this.container.style.background = 'url(http://www.highcharts.com/samples/graphics/sand.png)';
+});
+
+
+Highcharts.theme = {
+	colors: ["#f45b5b", "#8085e9", "#8d4654", "#7798BF", "#aaeeee", "#ff0066", "#eeaaee",
+		"#55BF3B", "#DF5353", "#7798BF", "#aaeeee"],
+	chart: {
+		backgroundColor: null,
+		style: {
+			fontFamily: "Signika, serif"
+		}
+	},
+	title: {
+		style: {
+			color: 'black',
+			fontSize: '16px',
+			fontWeight: 'bold'
+		}
+	},
+	subtitle: {
+		style: {
+			color: 'black'
+		}
+	},
+	tooltip: {
+		borderWidth: 0
+	},
+	legend: {
+		itemStyle: {
+			fontWeight: 'bold',
+			fontSize: '13px'
+		}
+	},
+	xAxis: {
+		labels: {
+			style: {
+				color: '#6e6e70'
+			}
+		}
+	},
+	yAxis: {
+		labels: {
+			style: {
+				color: '#6e6e70'
+			}
+		}
+	},
+	plotOptions: {
+		series: {
+			shadow: true
+		},
+		candlestick: {
+			lineColor: '#404048'
+		},
+		map: {
+			shadow: false
+		}
+	},
+
+	// Highstock specific
+	navigator: {
+		xAxis: {
+			gridLineColor: '#D0D0D8'
+		}
+	},
+	rangeSelector: {
+		buttonTheme: {
+			fill: 'white',
+			stroke: '#C0C0C8',
+			'stroke-width': 1,
+			states: {
+				select: {
+					fill: '#D0D0D8'
+				}
+			}
+		}
+	},
+	scrollbar: {
+		trackBorderColor: '#C0C0C8'
+	},
+
+	// General
+	background2: '#E0E0E8'
+	
+};
+
+// Apply the theme
+Highcharts.setOptions(Highcharts.theme);
diff --git a/data/interfaces/default/js/highcharts/js/themes/skies.js b/data/interfaces/default/js/highcharts/js/themes/skies.js
new file mode 100644
index 00000000..d58b1f24
--- /dev/null
+++ b/data/interfaces/default/js/highcharts/js/themes/skies.js
@@ -0,0 +1,89 @@
+/**
+ * Skies theme for Highcharts JS
+ * @author Torstein Honsi
+ */
+
+Highcharts.theme = {
+	colors: ["#514F78", "#42A07B", "#9B5E4A", "#72727F", "#1F949A", "#82914E", "#86777F", "#42A07B"],
+	chart: {
+		className: 'skies',
+		borderWidth: 0,
+		plotShadow: true,
+		plotBackgroundImage: 'http://www.highcharts.com/demo/gfx/skies.jpg',
+		plotBackgroundColor: {
+			linearGradient: [0, 0, 250, 500],
+			stops: [
+				[0, 'rgba(255, 255, 255, 1)'],
+				[1, 'rgba(255, 255, 255, 0)']
+			]
+		},
+		plotBorderWidth: 1
+	},
+	title: {
+		style: {
+			color: '#3E576F',
+			font: '16px Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif'
+		}
+	},
+	subtitle: {
+		style: {
+			color: '#6D869F',
+			font: '12px Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif'
+		}
+	},
+	xAxis: {
+		gridLineWidth: 0,
+		lineColor: '#C0D0E0',
+		tickColor: '#C0D0E0',
+		labels: {
+			style: {
+				color: '#666',
+				fontWeight: 'bold'
+			}
+		},
+		title: {
+			style: {
+				color: '#666',
+				font: '12px Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif'
+			}
+		}
+	},
+	yAxis: {
+		alternateGridColor: 'rgba(255, 255, 255, .5)',
+		lineColor: '#C0D0E0',
+		tickColor: '#C0D0E0',
+		tickWidth: 1,
+		labels: {
+			style: {
+				color: '#666',
+				fontWeight: 'bold'
+			}
+		},
+		title: {
+			style: {
+				color: '#666',
+				font: '12px Lucida Grande, Lucida Sans Unicode, Verdana, Arial, Helvetica, sans-serif'
+			}
+		}
+	},
+	legend: {
+		itemStyle: {
+			font: '9pt Trebuchet MS, Verdana, sans-serif',
+			color: '#3E576F'
+		},
+		itemHoverStyle: {
+			color: 'black'
+		},
+		itemHiddenStyle: {
+			color: 'silver'
+		}
+	},
+	labels: {
+		style: {
+			color: '#3E576F'
+		}
+	}
+};
+
+// Apply the theme
+var highchartsOptions = Highcharts.setOptions(Highcharts.theme);
diff --git a/data/interfaces/default/js/ipaddr.min.js b/data/interfaces/default/js/ipaddr.min.js
deleted file mode 100644
index 68821d2a..00000000
--- a/data/interfaces/default/js/ipaddr.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(t){!function(t){"use strict";const r="(0?\\d+|0x[a-f0-9]+)",e={fourOctet:new RegExp(`^${r}\\.${r}\\.${r}\\.${r}$`,"i"),threeOctet:new RegExp(`^${r}\\.${r}\\.${r}$`,"i"),twoOctet:new RegExp(`^${r}\\.${r}$`,"i"),longValue:new RegExp(`^${r}$`,"i")},n=new RegExp("^0[0-7]+$","i"),i=new RegExp("^0x[a-f0-9]+$","i"),o="(?:[0-9a-f]+::?)+",s={zoneIndex:new RegExp("%[0-9a-z]{1,}","i"),native:new RegExp(`^(::)?(${o})?([0-9a-f]+)?(::)?(%[0-9a-z]{1,})?$`,"i"),deprecatedTransitional:new RegExp(`^(?:::)(${r}\\.${r}\\.${r}\\.${r}(%[0-9a-z]{1,})?)$`,"i"),transitional:new RegExp(`^((?:${o})|(?:::)(?:${o})?)${r}\\.${r}\\.${r}\\.${r}(%[0-9a-z]{1,})?$`,"i")};function a(t,r){if(t.indexOf("::")!==t.lastIndexOf("::"))return null;let e,n,i=0,o=-1,a=(t.match(s.zoneIndex)||[])[0];for(a&&(a=a.substring(1),t=t.replace(/%.+$/,""));(o=t.indexOf(":",o+1))>=0;)i++;if("::"===t.substr(0,2)&&i--,"::"===t.substr(-2,2)&&i--,i>r)return null;for(n=r-i,e=":";n--;)e+="0:";return":"===(t=t.replace("::",e))[0]&&(t=t.slice(1)),":"===t[t.length-1]&&(t=t.slice(0,-1)),{parts:r=function(){const r=t.split(":"),e=[];for(let t=0;t<r.length;t++)e.push(parseInt(r[t],16));return e}(),zoneId:a}}function p(t,r,e,n){if(t.length!==r.length)throw new Error("ipaddr: cannot match CIDR for objects with different lengths");let i,o=0;for(;n>0;){if((i=e-n)<0&&(i=0),t[o]>>i!=r[o]>>i)return!1;n-=e,o+=1}return!0}function u(t){if(i.test(t))return parseInt(t,16);if("0"===t[0]&&!isNaN(parseInt(t[1],10))){if(n.test(t))return parseInt(t,8);throw new Error(`ipaddr: cannot parse ${t} as octal`)}return parseInt(t,10)}function d(t,r){for(;t.length<r;)t=`0${t}`;return t}const c={};c.IPv4=function(){function t(t){if(4!==t.length)throw new Error("ipaddr: ipv4 octet count should be 4");let r,e;for(r=0;r<t.length;r++)if(!(0<=(e=t[r])&&e<=255))throw new Error("ipaddr: ipv4 octet should fit in 8 bits");this.octets=t}return t.prototype.SpecialRanges={unspecified:[[new t([0,0,0,0]),8]],broadcast:[[new t([255,255,255,255]),32]],multicast:[[new t([224,0,0,0]),4]],linkLocal:[[new t([169,254,0,0]),16]],loopback:[[new t([127,0,0,0]),8]],carrierGradeNat:[[new t([100,64,0,0]),10]],private:[[new t([10,0,0,0]),8],[new t([172,16,0,0]),12],[new t([192,168,0,0]),16]],reserved:[[new t([192,0,0,0]),24],[new t([192,0,2,0]),24],[new t([192,88,99,0]),24],[new t([198,51,100,0]),24],[new t([203,0,113,0]),24],[new t([240,0,0,0]),4]]},t.prototype.kind=function(){return"ipv4"},t.prototype.match=function(t,r){let e;if(void 0===r&&(t=(e=t)[0],r=e[1]),"ipv4"!==t.kind())throw new Error("ipaddr: cannot match ipv4 address with non-ipv4 one");return p(this.octets,t.octets,8,r)},t.prototype.prefixLengthFromSubnetMask=function(){let t=0,r=!1;const e={0:8,128:7,192:6,224:5,240:4,248:3,252:2,254:1,255:0};let n,i,o;for(n=3;n>=0;n-=1){if(!((i=this.octets[n])in e))return null;if(o=e[i],r&&0!==o)return null;8!==o&&(r=!0),t+=o}return 32-t},t.prototype.range=function(){return c.subnetMatch(this,this.SpecialRanges)},t.prototype.toByteArray=function(){return this.octets.slice(0)},t.prototype.toIPv4MappedAddress=function(){return c.IPv6.parse(`::ffff:${this.toString()}`)},t.prototype.toNormalizedString=function(){return this.toString()},t.prototype.toString=function(){return this.octets.join(".")},t}(),c.IPv4.broadcastAddressFromCIDR=function(t){try{const r=this.parseCIDR(t),e=r[0].toByteArray(),n=this.subnetMaskFromPrefixLength(r[1]).toByteArray(),i=[];let o=0;for(;o<4;)i.push(parseInt(e[o],10)|255^parseInt(n[o],10)),o++;return new this(i)}catch(t){throw new Error("ipaddr: the address does not have IPv4 CIDR format")}},c.IPv4.isIPv4=function(t){return null!==this.parser(t)},c.IPv4.isValid=function(t){try{return new this(this.parser(t)),!0}catch(t){return!1}},c.IPv4.isValidFourPartDecimal=function(t){return!(!c.IPv4.isValid(t)||!t.match(/^(0|[1-9]\d*)(\.(0|[1-9]\d*)){3}$/))},c.IPv4.networkAddressFromCIDR=function(t){let r,e,n,i,o;try{for(n=(r=this.parseCIDR(t))[0].toByteArray(),o=this.subnetMaskFromPrefixLength(r[1]).toByteArray(),i=[],e=0;e<4;)i.push(parseInt(n[e],10)&parseInt(o[e],10)),e++;return new this(i)}catch(t){throw new Error("ipaddr: the address does not have IPv4 CIDR format")}},c.IPv4.parse=function(t){const r=this.parser(t);if(null===r)throw new Error("ipaddr: string is not formatted like an IPv4 Address");return new this(r)},c.IPv4.parseCIDR=function(t){let r;if(r=t.match(/^(.+)\/(\d+)$/)){const t=parseInt(r[2]);if(t>=0&&t<=32){const e=[this.parse(r[1]),t];return Object.defineProperty(e,"toString",{value:function(){return this.join("/")}}),e}}throw new Error("ipaddr: string is not formatted like an IPv4 CIDR range")},c.IPv4.parser=function(t){let r,n,i;if(r=t.match(e.fourOctet))return function(){const t=r.slice(1,6),e=[];for(let r=0;r<t.length;r++)n=t[r],e.push(u(n));return e}();if(r=t.match(e.longValue)){if((i=u(r[1]))>4294967295||i<0)throw new Error("ipaddr: address outside defined range");return function(){const t=[];let r;for(r=0;r<=24;r+=8)t.push(i>>r&255);return t}().reverse()}return(r=t.match(e.twoOctet))?function(){const t=r.slice(1,4),e=[];if((i=u(t[1]))>16777215||i<0)throw new Error("ipaddr: address outside defined range");return e.push(u(t[0])),e.push(i>>16&255),e.push(i>>8&255),e.push(255&i),e}():(r=t.match(e.threeOctet))?function(){const t=r.slice(1,5),e=[];if((i=u(t[2]))>65535||i<0)throw new Error("ipaddr: address outside defined range");return e.push(u(t[0])),e.push(u(t[1])),e.push(i>>8&255),e.push(255&i),e}():null},c.IPv4.subnetMaskFromPrefixLength=function(t){if((t=parseInt(t))<0||t>32)throw new Error("ipaddr: invalid IPv4 prefix length");const r=[0,0,0,0];let e=0;const n=Math.floor(t/8);for(;e<n;)r[e]=255,e++;return n<4&&(r[n]=Math.pow(2,t%8)-1<<8-t%8),new this(r)},c.IPv6=function(){function t(t,r){let e,n;if(16===t.length)for(this.parts=[],e=0;e<=14;e+=2)this.parts.push(t[e]<<8|t[e+1]);else{if(8!==t.length)throw new Error("ipaddr: ipv6 part count should be 8 or 16");this.parts=t}for(e=0;e<this.parts.length;e++)if(!(0<=(n=this.parts[e])&&n<=65535))throw new Error("ipaddr: ipv6 part should fit in 16 bits");r&&(this.zoneId=r)}return t.prototype.SpecialRanges={unspecified:[new t([0,0,0,0,0,0,0,0]),128],linkLocal:[new t([65152,0,0,0,0,0,0,0]),10],multicast:[new t([65280,0,0,0,0,0,0,0]),8],loopback:[new t([0,0,0,0,0,0,0,1]),128],uniqueLocal:[new t([64512,0,0,0,0,0,0,0]),7],ipv4Mapped:[new t([0,0,0,0,0,65535,0,0]),96],rfc6145:[new t([0,0,0,0,65535,0,0,0]),96],rfc6052:[new t([100,65435,0,0,0,0,0,0]),96],"6to4":[new t([8194,0,0,0,0,0,0,0]),16],teredo:[new t([8193,0,0,0,0,0,0,0]),32],reserved:[[new t([8193,3512,0,0,0,0,0,0]),32]]},t.prototype.isIPv4MappedAddress=function(){return"ipv4Mapped"===this.range()},t.prototype.kind=function(){return"ipv6"},t.prototype.match=function(t,r){let e;if(void 0===r&&(t=(e=t)[0],r=e[1]),"ipv6"!==t.kind())throw new Error("ipaddr: cannot match ipv6 address with non-ipv6 one");return p(this.parts,t.parts,16,r)},t.prototype.prefixLengthFromSubnetMask=function(){let t=0,r=!1;const e={0:16,32768:15,49152:14,57344:13,61440:12,63488:11,64512:10,65024:9,65280:8,65408:7,65472:6,65504:5,65520:4,65528:3,65532:2,65534:1,65535:0};let n,i;for(let o=7;o>=0;o-=1){if(!((n=this.parts[o])in e))return null;if(i=e[n],r&&0!==i)return null;16!==i&&(r=!0),t+=i}return 128-t},t.prototype.range=function(){return c.subnetMatch(this,this.SpecialRanges)},t.prototype.toByteArray=function(){let t;const r=[],e=this.parts;for(let n=0;n<e.length;n++)t=e[n],r.push(t>>8),r.push(255&t);return r},t.prototype.toFixedLengthString=function(){const t=function(){const t=[];for(let r=0;r<this.parts.length;r++)t.push(d(this.parts[r].toString(16),4));return t}.call(this).join(":");let r="";return this.zoneId&&(r=`%${this.zoneId}`),t+r},t.prototype.toIPv4Address=function(){if(!this.isIPv4MappedAddress())throw new Error("ipaddr: trying to convert a generic ipv6 address to ipv4");const t=this.parts.slice(-2),r=t[0],e=t[1];return new c.IPv4([r>>8,255&r,e>>8,255&e])},t.prototype.toNormalizedString=function(){const t=function(){const t=[];for(let r=0;r<this.parts.length;r++)t.push(this.parts[r].toString(16));return t}.call(this).join(":");let r="";return this.zoneId&&(r=`%${this.zoneId}`),t+r},t.prototype.toRFC5952String=function(){const t=/((^|:)(0(:|$)){2,})/g,r=this.toNormalizedString();let e,n=0,i=-1;for(;e=t.exec(r);)e[0].length>i&&(n=e.index,i=e[0].length);return i<0?r:`${r.substring(0,n)}::${r.substring(n+i)}`},t.prototype.toString=function(){return this.toNormalizedString().replace(/((^|:)(0(:|$))+)/,"::")},t}(),c.IPv6.isIPv6=function(t){return null!==this.parser(t)},c.IPv6.isValid=function(t){if("string"==typeof t&&-1===t.indexOf(":"))return!1;try{const r=this.parser(t);return new this(r.parts,r.zoneId),!0}catch(t){return!1}},c.IPv6.parse=function(t){const r=this.parser(t);if(null===r.parts)throw new Error("ipaddr: string is not formatted like an IPv6 Address");return new this(r.parts,r.zoneId)},c.IPv6.parseCIDR=function(t){let r,e,n;if((e=t.match(/^(.+)\/(\d+)$/))&&(r=parseInt(e[2]))>=0&&r<=128)return n=[this.parse(e[1]),r],Object.defineProperty(n,"toString",{value:function(){return this.join("/")}}),n;throw new Error("ipaddr: string is not formatted like an IPv6 CIDR range")},c.IPv6.parser=function(t){let r,e,n,i,o,p;if(n=t.match(s.deprecatedTransitional))return this.parser(`::ffff:${n[1]}`);if(s.native.test(t))return a(t,8);if((n=t.match(s.transitional))&&(p=n[6]||"",(r=a(n[1].slice(0,-1)+p,6)).parts)){for(o=[parseInt(n[2]),parseInt(n[3]),parseInt(n[4]),parseInt(n[5])],e=0;e<o.length;e++)if(!(0<=(i=o[e])&&i<=255))return null;return r.parts.push(o[0]<<8|o[1]),r.parts.push(o[2]<<8|o[3]),{parts:r.parts,zoneId:r.zoneId}}return null},c.fromByteArray=function(t){const r=t.length;if(4===r)return new c.IPv4(t);if(16===r)return new c.IPv6(t);throw new Error("ipaddr: the binary input is neither an IPv6 nor IPv4 address")},c.isValid=function(t){return c.IPv6.isValid(t)||c.IPv4.isValid(t)},c.parse=function(t){if(c.IPv6.isValid(t))return c.IPv6.parse(t);if(c.IPv4.isValid(t))return c.IPv4.parse(t);throw new Error("ipaddr: the address has neither IPv6 nor IPv4 format")},c.parseCIDR=function(t){try{return c.IPv6.parseCIDR(t)}catch(r){try{return c.IPv4.parseCIDR(t)}catch(t){throw new Error("ipaddr: the address has neither IPv6 nor IPv4 CIDR format")}}},c.process=function(t){const r=this.parse(t);return"ipv6"===r.kind()&&r.isIPv4MappedAddress()?r.toIPv4Address():r},c.subnetMatch=function(t,r,e){let n,i,o,s;for(i in void 0!==e&&null!==e||(e="unicast"),r)if(Object.prototype.hasOwnProperty.call(r,i))for(!(o=r[i])[0]||o[0]instanceof Array||(o=[o]),n=0;n<o.length;n++)if(s=o[n],t.kind()===s[0].kind()&&t.match.apply(t,s))return i;return e},"undefined"!=typeof module&&module.exports?module.exports=c:t.ipaddr=c}(this)}("undefined"==typeof window?window={}:window);
\ No newline at end of file
diff --git a/data/interfaces/default/js/jquery-2.1.4.min.js b/data/interfaces/default/js/jquery-2.1.4.min.js
new file mode 100644
index 00000000..49990d6e
--- /dev/null
+++ b/data/interfaces/default/js/jquery-2.1.4.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v2.1.4 | (c) 2005, 2015 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=a.document,m="2.1.4",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,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=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.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},n.extend=n.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||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return!n.isArray(a)&&a-parseFloat(a)+1>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!j.call(a.constructor.prototype,"isPrototypeOf")?!1:!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=l.createElement("script"),b.text=a,l.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},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=s(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(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;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=s(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&&(c=a[b],b=a,a=c),n.isFunction(a)?(e=d.call(arguments,2),f=function(){return a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:k}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b="length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N=M.replace("w","w#"),O="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+N+"))|)"+L+"*\\]",P=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+O+")*)|.*)\\)|)",Q=new RegExp(L+"+","g"),R=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),S=new RegExp("^"+L+"*,"+L+"*"),T=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),U=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),V=new RegExp(P),W=new RegExp("^"+N+"$"),X={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+O),PSEUDO:new RegExp("^"+P),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,aa=/[+~]/,ba=/'|\\/g,ca=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),da=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)},ea=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(fa){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(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||[],k=b.nodeType,"string"!=typeof a||!a||1!==k&&9!==k&&11!==k)return d;if(!e&&p){if(11!==k&&(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 H.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName)return H.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=1!==k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(ba,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+ra(o[l]);w=aa.test(a)&&pa(b.parentNode)||b,x=o.join(",")}if(x)try{return H.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return ia(function(b){return b=+b,ia(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 pa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=g.documentElement,e=g.defaultView,e&&e!==e.top&&(e.addEventListener?e.addEventListener("unload",ea,!1):e.attachEvent&&e.attachEvent("onunload",ea)),p=!f(g),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(g.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(g.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!g.getElementsByName||!g.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ca,da);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(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 p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(g.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\f]' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){var b=g.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),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))&&ja(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",P)}),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===g||a.ownerDocument===v&&t(v,a)?-1:b===g||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,h=[a],i=[b];if(!e||!f)return a===g?-1:b===g?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return la(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?la(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},g):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.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 ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.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},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.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=ga.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=ga.selectors={cacheLength:50,createPseudo:ia,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(ca,da),a[3]=(a[3]||a[4]||a[5]||"").replace(ca,da),"~="===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]||ga.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]&&ga.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(ca,da).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("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.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.replace(Q," ")+" ").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()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?ia(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),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(ca,da),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return W.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(ca,da).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:oa(function(){return[0]}),last:oa(function(a,b){return[b-1]}),eq:oa(function(a,b,c){return[0>c?c+b:c]}),even:oa(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:oa(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:oa(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:oa(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]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function qa(){}qa.prototype=d.filters=d.pseudos,d.setFilters=new qa,g=ga.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?ga.error(a):z(a,i).slice(0)};function ra(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function sa(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 ta(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 ua(a,b,c){for(var d=0,e=b.length;e>d;d++)ga(a,b[d],c);return c}function va(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 wa(a,b,c,d,e,f){return d&&!d[u]&&(d=wa(d)),e&&!e[u]&&(e=wa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ua(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:va(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=va(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?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=va(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function xa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=sa(function(a){return a===b},h,!0),l=sa(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[sa(ta(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 wa(i>1&&ta(m),i>1&&ra(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&xa(a.slice(i,e)),f>e&&xa(a=a.slice(e)),f>e&&ra(a))}m.push(c)}return ta(m)}function ya(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]=F.call(i));s=va(s)}H.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&ga.uniqueSort(i)}return k&&(w=v,j=t),r};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=xa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,ya(e,d)),f.selector=a}return f},i=ga.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(ca,da),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(ca,da),aa.test(j[0].type)&&pa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&ra(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,aa.test(a)&&pa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ja(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return g.call(b,a)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:l,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=l.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=l,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};A.prototype=n.fn,y=n(l);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(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&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?g.call(n(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(C[a]||n.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return n.each(a.match(E)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(h[g].apply(l[0],l[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&n.each(arguments,function(a,b){var c;while((c=n.inArray(b,h,c))>-1)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.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?n.extend(a,d):d}},e={};return d.pipe=d.then,n.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&&n.isFunction(a.promise)?e:0,g=1===f?a:n.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]&&n.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;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(H.resolveWith(l,[n]),n.fn.triggerHandler&&(n(l).triggerHandler("ready"),n(l).off("ready"))))}});function I(){l.removeEventListener("DOMContentLoaded",I,!1),a.removeEventListener("load",I,!1),n.ready()}n.ready.promise=function(b){return H||(H=n.Deferred(),"complete"===l.readyState?setTimeout(n.ready):(l.addEventListener("DOMContentLoaded",I,!1),a.addEventListener("load",I,!1))),H.promise(b)},n.ready.promise();var J=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(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};n.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function K(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=n.expando+K.uid++}K.uid=1,K.accepts=n.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,n.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(n.isEmptyObject(f))n.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;while(c--)delete g[d[c]]}},hasData:function(a){return!n.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(O,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}M.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){
+return M.access(a,b,c)},removeData:function(a,b){M.remove(a,b)},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),n.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.get(f),1===f.nodeType&&!L.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));L.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=n.camelCase(a);if(f&&void 0===b){if(c=M.get(f,a),void 0!==c)return c;if(c=M.get(f,d),void 0!==c)return c;if(c=P(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=L.get(a,b),c&&(!d||n.isArray(c)?d=L.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.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 L.get(a,c)||L.access(a,c,{empty:n.Callbacks("once memory").add(function(){L.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.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=L.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var Q=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,R=["Top","Right","Bottom","Left"],S=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)},T=/^(?:checkbox|radio)$/i;!function(){var a=l.createDocumentFragment(),b=a.appendChild(l.createElement("div")),c=l.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),k.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U="undefined";k.focusinBubbles="onfocusin"in a;var V=/^key/,W=/^(?:mouse|pointer|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\.(.+)|)$/;function Z(){return!0}function $(){return!1}function _(){try{return l.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof n!==U&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(E)||[""],j=b.length;while(j--)h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&(delete r.handle,L.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,m,o,p=[d||l],q=j.call(b,"type")?b.type:b,r=j.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||l,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+n.event.triggered)&&(q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),k=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},e||!o.trigger||o.trigger.apply(d,c)!==!1)){if(!e&&!o.noBubble&&!n.isWindow(d)){for(i=o.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||l)&&p.push(h.defaultView||h.parentWindow||a)}f=0;while((g=p[f++])&&!b.isPropagationStopped())b.type=f>1?i:o.bindType||q,m=(L.get(g,"events")||{})[b.type]&&L.get(g,"handle"),m&&m.apply(g,c),m=k&&g[k],m&&m.apply&&n.acceptData(g)&&(b.result=m.apply(g,c),b.result===!1&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!n.acceptData(d)||k&&n.isFunction(d[q])&&!n.isWindow(d)&&(h=d[k],h&&(d[k]=null),n.event.triggered=q,d[q](),n.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,e=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(a.result=e)===!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(i.disabled!==!0||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>=0:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},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 offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,d,e,f=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||l,d=c.documentElement,e=c.body,a.pageX=b.clientX+(d&&d.scrollLeft||e&&e.scrollLeft||0)-(d&&d.clientLeft||e&&e.clientLeft||0),a.pageY=b.clientY+(d&&d.scrollTop||e&&e.scrollTop||0)-(d&&d.clientTop||e&&e.clientTop||0)),a.which||void 0===f||(a.which=1&f?1:2&f?3:4&f?2:0),a}},fix:function(a){if(a[n.expando])return a;var b,c,d,e=a.type,f=a,g=this.fixHooks[e];g||(this.fixHooks[e]=g=W.test(e)?this.mouseHooks:V.test(e)?this.keyHooks:{}),d=g.props?this.props.concat(g.props):this.props,a=new n.Event(f),b=d.length;while(b--)c=d[b],a[c]=f[c];return a.target||(a.target=l),3===a.target.nodeType&&(a.target=a.target.parentNode),g.filter?g.filter(a,f):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==_()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===_()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&n.nodeName(this,"input")?(this.click(),!1):void 0},_default:function(a){return n.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=n.extend(new n.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?n.event.trigger(e,null,b):n.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},n.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?Z:$):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={isDefaultPrevented:$,isPropagationStopped:$,isImmediatePropagationStopped:$,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=Z,a&&a.preventDefault&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=Z,a&&a.stopPropagation&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=Z,a&&a.stopImmediatePropagation&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return(!e||e!==d&&!n.contains(d,e))&&(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),k.focusinBubbles||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a),!0)};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=L.access(d,b);e||d.addEventListener(a,c,!0),L.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=L.access(d,b)-1;e?L.access(d,b,e):(d.removeEventListener(a,c,!0),L.remove(d,b))}}}),n.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(g in a)this.on(g,b,c,a[g],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=$;else if(!d)return this;return 1===e&&(f=d,d=function(a){return n().off(a),f.apply(this,arguments)},d.guid=f.guid||(f.guid=n.guid++)),this.each(function(){n.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,n(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=$),this.each(function(){n.event.remove(this,a,c,b)})},trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}});var aa=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,ba=/<([\w:]+)/,ca=/<|&#?\w+;/,da=/<(?:script|style|link)/i,ea=/checked\s*(?:[^=]|=\s*.checked.)/i,fa=/^$|\/(?:java|ecma)script/i,ga=/^true\/(.*)/,ha=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,ia={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,"",""]};ia.optgroup=ia.option,ia.tbody=ia.tfoot=ia.colgroup=ia.caption=ia.thead,ia.th=ia.td;function ja(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function ka(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function la(a){var b=ga.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function ma(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function na(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(L.hasData(a)&&(f=L.access(a),g=L.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}M.hasData(a)&&(h=M.access(a),i=n.extend({},h),M.set(b,i))}}function oa(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function pa(a,b){var c=b.nodeName.toLowerCase();"input"===c&&T.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}n.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=oa(h),f=oa(a),d=0,e=f.length;e>d;d++)pa(f[d],g[d]);if(b)if(c)for(f=f||oa(a),g=g||oa(h),d=0,e=f.length;e>d;d++)na(f[d],g[d]);else na(a,h);return g=oa(h,"script"),g.length>0&&ma(g,!i&&oa(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,o=a.length;o>m;m++)if(e=a[m],e||0===e)if("object"===n.type(e))n.merge(l,e.nodeType?[e]:e);else if(ca.test(e)){f=f||k.appendChild(b.createElement("div")),g=(ba.exec(e)||["",""])[1].toLowerCase(),h=ia[g]||ia._default,f.innerHTML=h[1]+e.replace(aa,"<$1></$2>")+h[2],j=h[0];while(j--)f=f.lastChild;n.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));k.textContent="",m=0;while(e=l[m++])if((!d||-1===n.inArray(e,d))&&(i=n.contains(e.ownerDocument,e),f=oa(k.appendChild(e),"script"),i&&ma(f),c)){j=0;while(e=f[j++])fa.test(e.type||"")&&c.push(e)}return k},cleanData:function(a){for(var b,c,d,e,f=n.event.special,g=0;void 0!==(c=a[g]);g++){if(n.acceptData(c)&&(e=c[L.expando],e&&(b=L.cache[e]))){if(b.events)for(d in b.events)f[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);L.cache[e]&&delete L.cache[e]}delete M.cache[c[M.expando]]}}}),n.fn.extend({text:function(a){return J(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=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=ja(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=ja(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?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(oa(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&ma(oa(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(oa(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!da.test(a)&&!ia[(ba.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(aa,"<$1></$2>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(oa(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,n.cleanData(oa(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,m=this,o=l-1,p=a[0],q=n.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&ea.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(c=n.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=n.map(oa(c,"script"),ka),g=f.length;l>j;j++)h=c,j!==o&&(h=n.clone(h,!0,!0),g&&n.merge(f,oa(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,n.map(f,la),j=0;g>j;j++)h=f[j],fa.test(h.type||"")&&!L.access(h,"globalEval")&&n.contains(i,h)&&(h.src?n._evalUrl&&n._evalUrl(h.src):n.globalEval(h.textContent.replace(ha,"")))}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),n(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qa,ra={};function sa(b,c){var d,e=n(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:n.css(e[0],"display");return e.detach(),f}function ta(a){var b=l,c=ra[a];return c||(c=sa(a,b),"none"!==c&&c||(qa=(qa||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=qa[0].contentDocument,b.write(),b.close(),c=sa(a,b),qa.detach()),ra[a]=c),c}var ua=/^margin/,va=new RegExp("^("+Q+")(?!px)[a-z%]+$","i"),wa=function(b){return b.ownerDocument.defaultView.opener?b.ownerDocument.defaultView.getComputedStyle(b,null):a.getComputedStyle(b,null)};function xa(a,b,c){var d,e,f,g,h=a.style;return c=c||wa(a),c&&(g=c.getPropertyValue(b)||c[b]),c&&(""!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),va.test(g)&&ua.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}function ya(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}!function(){var b,c,d=l.documentElement,e=l.createElement("div"),f=l.createElement("div");if(f.style){f.style.backgroundClip="content-box",f.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===f.style.backgroundClip,e.style.cssText="border:0;width:0;height:0;top:0;left:-9999px;margin-top:1px;position:absolute",e.appendChild(f);function g(){f.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",f.innerHTML="",d.appendChild(e);var g=a.getComputedStyle(f,null);b="1%"!==g.top,c="4px"===g.width,d.removeChild(e)}a.getComputedStyle&&n.extend(k,{pixelPosition:function(){return g(),b},boxSizingReliable:function(){return null==c&&g(),c},reliableMarginRight:function(){var b,c=f.appendChild(l.createElement("div"));return c.style.cssText=f.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",f.style.width="1px",d.appendChild(e),b=!parseFloat(a.getComputedStyle(c,null).marginRight),d.removeChild(e),f.removeChild(c),b}})}}(),n.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 za=/^(none|table(?!-c[ea]).+)/,Aa=new RegExp("^("+Q+")(.*)$","i"),Ba=new RegExp("^([+-])=("+Q+")","i"),Ca={position:"absolute",visibility:"hidden",display:"block"},Da={letterSpacing:"0",fontWeight:"400"},Ea=["Webkit","O","Moz","ms"];function Fa(a,b){if(b in a)return b;var c=b[0].toUpperCase()+b.slice(1),d=b,e=Ea.length;while(e--)if(b=Ea[e]+c,b in a)return b;return d}function Ga(a,b,c){var d=Aa.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function Ha(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+=n.css(a,c+R[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+R[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+R[f]+"Width",!0,e))):(g+=n.css(a,"padding"+R[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+R[f]+"Width",!0,e)));return g}function Ia(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=wa(a),g="border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=xa(a,b,f),(0>e||null==e)&&(e=a.style[b]),va.test(e))return e;d=g&&(k.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Ha(a,b,c||(g?"border":"content"),d,f)+"px"}function Ja(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=L.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&S(d)&&(f[g]=L.access(d,"olddisplay",ta(d.nodeName)))):(e=S(d),"none"===c&&e||L.set(d,"olddisplay",e?c:n.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}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=xa(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":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;return b=n.cssProps[h]||(n.cssProps[h]=Fa(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=Ba.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),null!=c&&c===c&&("number"!==f||n.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))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Fa(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=xa(a,b,d)),"normal"===e&&b in Da&&(e=Da[b]),""===c||c?(f=parseFloat(e),c===!0||n.isNumeric(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?za.test(n.css(a,"display"))&&0===a.offsetWidth?n.swap(a,Ca,function(){return Ia(a,b,d)}):Ia(a,b,d):void 0},set:function(a,c,d){var e=d&&wa(a);return Ga(a,c,d?Ha(a,b,d,"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),n.cssHooks.marginRight=ya(k.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},xa,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+R[d]+b]=f[d]||f[d-2]||f[0];return e}},ua.test(a)||(n.cssHooks[a+b].set=Ga)}),n.fn.extend({css:function(a,b){return J(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=wa(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return Ja(this,!0)},hide:function(){return Ja(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){S(this)?n(this).show():n(this).hide()})}});function Ka(a,b,c,d,e){return new Ka.prototype.init(a,b,c,d,e)}n.Tween=Ka,Ka.prototype={constructor:Ka,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||(n.cssNumber[c]?"":"px")},cur:function(){var a=Ka.propHooks[this.prop];return a&&a.get?a.get(this):Ka.propHooks._default.get(this)},run:function(a){var b,c=Ka.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=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):Ka.propHooks._default.set(this),this}},Ka.prototype.init.prototype=Ka.prototype,Ka.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Ka.propHooks.scrollTop=Ka.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=Ka.prototype.init,n.fx.step={};var La,Ma,Na=/^(?:toggle|show|hide)$/,Oa=new RegExp("^(?:([+-])=|)("+Q+")([a-z%]*)$","i"),Pa=/queueHooks$/,Qa=[Va],Ra={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=Oa.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&Oa.exec(n.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,n.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 Sa(){return setTimeout(function(){La=void 0}),La=n.now()}function Ta(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=R[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ua(a,b,c){for(var d,e=(Ra[b]||[]).concat(Ra["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Va(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&S(a),q=L.get(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,l.always(function(){l.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=n.css(a,"display"),k="none"===j?L.get(a,"olddisplay")||ta(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(o.display="inline-block")),c.overflow&&(o.overflow="hidden",l.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],Na.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}m[d]=q&&q[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(m))"inline"===("none"===j?ta(a.nodeName):j)&&(o.display=j);else{q?"hidden"in q&&(p=q.hidden):q=L.access(a,"fxshow",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;L.remove(a,"fxshow");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ua(p?q[d]:0,d,l),d in q||(q[d]=g.start,p&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function Wa(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.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 Xa(a,b,c){var d,e,f=0,g=Qa.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=La||Sa(),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:n.extend({},b),opts:n.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:La||Sa(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.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(Wa(k,j.opts.specialEasing);g>f;f++)if(d=Qa[f].call(j,a,k,j.opts))return d;return n.map(k,Ua,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.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)}n.Animation=n.extend(Xa,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],Ra[c]=Ra[c]||[],Ra[c].unshift(b)},prefilter:function(a,b){b?Qa.unshift(a):Qa.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||d.queue===!0)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(S).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=Xa(this,n.extend({},a),f);(e||L.get(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=n.timers,g=L.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Pa.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)&&n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=L.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.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})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(Ta(b,!0),a,d,e)}}),n.each({slideDown:Ta("show"),slideUp:Ta("hide"),slideToggle:Ta("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=0,c=n.timers;for(La=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),La=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){Ma||(Ma=setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){clearInterval(Ma),Ma=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(a,b){return a=n.fx?n.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=l.createElement("input"),b=l.createElement("select"),c=b.appendChild(l.createElement("option"));a.type="checkbox",k.checkOn=""!==a.value,k.optSelected=c.selected,b.disabled=!0,k.optDisabled=!c.disabled,a=l.createElement("input"),a.value="t",a.type="radio",k.radioValue="t"===a.value}();var Ya,Za,$a=n.expr.attrHandle;n.fn.extend({attr:function(a,b){return J(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===U?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?Za:Ya)),
+void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.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 n.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=n.propFix[c]||c,n.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),Za={set:function(a,b,c){return b===!1?n.removeAttr(a,c):a.setAttribute(c,c),c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=$a[b]||n.find.attr;$a[b]=function(a,b,d){var e,f;return d||(f=$a[b],$a[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,$a[b]=f),e}});var _a=/^(?:input|select|textarea|button)$/i;n.fn.extend({prop:function(a,b){return J(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.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||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.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){return a.hasAttribute("tabindex")||_a.test(a.nodeName)||a.href?a.tabIndex:-1}}}}),k.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this});var ab=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h="string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ab," "):" ")){f=0;while(e=b[f++])d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0===arguments.length||"string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ab," "):"")){f=0;while(e=b[f++])while(d.indexOf(" "+e+" ")>=0)d=d.replace(" "+e+" "," ");g=a?n.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(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c){var b,d=0,e=n(this),f=a.match(E)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else(c===U||"boolean"===c)&&(this.className&&L.set(this,"__className__",this.className),this.className=this.className||a===!1?"":L.get(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(ab," ").indexOf(b)>=0)return!0;return!1}});var bb=/\r/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(bb,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.trim(n.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&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=n.inArray(d.value,f)>=0)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},k.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})}),n.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){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.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 cb=n.now(),db=/\?/;n.parseJSON=function(a){return JSON.parse(a+"")},n.parseXML=function(a){var b,c;if(!a||"string"!=typeof a)return null;try{c=new DOMParser,b=c.parseFromString(a,"text/xml")}catch(d){b=void 0}return(!b||b.getElementsByTagName("parsererror").length)&&n.error("Invalid XML: "+a),b};var eb=/#.*$/,fb=/([?&])_=[^&]*/,gb=/^(.*?):[ \t]*([^\r\n]*)$/gm,hb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,ib=/^(?:GET|HEAD)$/,jb=/^\/\//,kb=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,lb={},mb={},nb="*/".concat("*"),ob=a.location.href,pb=kb.exec(ob.toLowerCase())||[];function qb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(E)||[];if(n.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function rb(a,b,c,d){var e={},f=a===mb;function g(h){var i;return e[h]=!0,n.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 sb(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&n.extend(!0,a,d),a}function tb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function ub(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}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:ob,type:"GET",isLocal:hb.test(pb[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":nb,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":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?sb(sb(a,n.ajaxSettings),b):sb(n.ajaxSettings,a)},ajaxPrefilter:qb(lb),ajaxTransport:qb(mb),ajax:function(a,b){"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!f){f={};while(b=gb.exec(e))f[b[1].toLowerCase()]=b[2]}b=f[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?e: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 c&&c.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||ob)+"").replace(eb,"").replace(jb,pb[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(h=kb.exec(k.url.toLowerCase()),k.crossDomain=!(!h||h[1]===pb[1]&&h[2]===pb[2]&&(h[3]||("http:"===h[1]?"80":"443"))===(pb[3]||("http:"===pb[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),rb(lb,k,b,v),2===t)return v;i=n.event&&k.global,i&&0===n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!ib.test(k.type),d=k.url,k.hasContent||(k.data&&(d=k.url+=(db.test(d)?"&":"?")+k.data,delete k.data),k.cache===!1&&(k.url=fb.test(d)?d.replace(fb,"$1_="+cb++):d+(db.test(d)?"&":"?")+"_="+cb++)),k.ifModified&&(n.lastModified[d]&&v.setRequestHeader("If-Modified-Since",n.lastModified[d]),n.etag[d]&&v.setRequestHeader("If-None-Match",n.etag[d])),(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]?", "+nb+"; q=0.01":""):k.accepts["*"]);for(j in k.headers)v.setRequestHeader(j,k.headers[j]);if(k.beforeSend&&(k.beforeSend.call(l,v,k)===!1||2===t))return v.abort();u="abort";for(j in{success:1,error:1,complete:1})v[j](k[j]);if(c=rb(mb,k,b,v)){v.readyState=1,i&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,c.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");function x(a,b,f,h){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),c=void 0,e=h||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,f&&(u=tb(k,v,f)),u=ub(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[d]=w),w=v.getResponseHeader("etag"),w&&(n.etag[d]=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,i&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),i&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){var b;return n.isFunction(a)?this.each(function(b){n(this).wrapAll(a.call(this,b))}):(this[0]&&(b=n(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var vb=/%20/g,wb=/\[\]$/,xb=/\r?\n/g,yb=/^(?:submit|button|image|reset|file)$/i,zb=/^(?:input|select|textarea|keygen)/i;function Ab(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||wb.test(a)?d(a,e):Ab(a+"["+("object"==typeof e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Ab(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Ab(c,a[c],b,e);return d.join("&").replace(vb,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&zb.test(this.nodeName)&&!yb.test(a)&&(this.checked||!T.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(xb,"\r\n")}}):{name:b.name,value:c.replace(xb,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new XMLHttpRequest}catch(a){}};var Bb=0,Cb={},Db={0:200,1223:204},Eb=n.ajaxSettings.xhr();a.attachEvent&&a.attachEvent("onunload",function(){for(var a in Cb)Cb[a]()}),k.cors=!!Eb&&"withCredentials"in Eb,k.ajax=Eb=!!Eb,n.ajaxTransport(function(a){var b;return k.cors||Eb&&!a.crossDomain?{send:function(c,d){var e,f=a.xhr(),g=++Bb;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)f.setRequestHeader(e,c[e]);b=function(a){return function(){b&&(delete Cb[g],b=f.onload=f.onerror=null,"abort"===a?f.abort():"error"===a?d(f.status,f.statusText):d(Db[f.status]||f.status,f.statusText,"string"==typeof f.responseText?{text:f.responseText}:void 0,f.getAllResponseHeaders()))}},f.onload=b(),f.onerror=b("error"),b=Cb[g]=b("abort");try{f.send(a.hasContent&&a.data||null)}catch(h){if(b)throw h}},abort:function(){b&&b()}}:void 0}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(d,e){b=n("<script>").prop({async:!0,charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&e("error"===a.type?404:200,a.type)}),l.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Fb=[],Gb=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Fb.pop()||n.expando+"_"+cb++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Gb.test(b.url)?"url":"string"==typeof b.data&&!(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Gb.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Gb,"$1"+e):b.jsonp!==!1&&(b.url+=(db.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.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,Fb.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||l;var d=v.exec(a),e=!c&&[];return d?[b.createElement(d[1])]:(d=n.buildFragment([a],b,e),e&&e.length&&n(e).remove(),n.merge([],d.childNodes))};var Hb=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&Hb)return Hb.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>=0&&(d=n.trim(a.slice(h)),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&n.ajax({url:a,type:e,dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).complete(c&&function(a,b){g.each(c,f||[a.responseText,b,a])}),this},n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};var Ib=a.document.documentElement;function Jb(a){return n.isWindow(a)?a:9===a.nodeType&&a.defaultView}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,h)),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d=this[0],e={top:0,left:0},f=d&&d.ownerDocument;if(f)return b=f.documentElement,n.contains(b,d)?(typeof d.getBoundingClientRect!==U&&(e=d.getBoundingClientRect()),c=Jb(f),{top:e.top+c.pageYOffset-b.clientTop,left:e.left+c.pageXOffset-b.clientLeft}):e},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===n.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(d=a.offset()),d.top+=n.css(a[0],"borderTopWidth",!0),d.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-d.top-n.css(c,"marginTop",!0),left:b.left-d.left-n.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||Ib;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Ib})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(b,c){var d="pageYOffset"===c;n.fn[b]=function(e){return J(this,function(b,e,f){var g=Jb(b);return void 0===f?g?g[c]:b[e]:void(g?g.scrollTo(d?a.pageXOffset:f,d?f:a.pageYOffset):b[e]=f)},b,e,arguments.length,null)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=ya(k.pixelPosition,function(a,c){return c?(c=xa(a,b),va.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return J(this,function(b,c,d){var e;return n.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?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var Kb=a.jQuery,Lb=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Lb),b&&a.jQuery===n&&(a.jQuery=Kb),n},typeof b===U&&(a.jQuery=a.$=n),n});
diff --git a/data/interfaces/default/js/jquery-3.6.0.min.js b/data/interfaces/default/js/jquery-3.6.0.min.js
deleted file mode 100644
index 200b54e4..00000000
--- a/data/interfaces/default/js/jquery-3.6.0.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v3.6.0 | (c) OpenJS 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=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},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&&"function"!=typeof e.item},x=function(e){return null!=e&&e===e.window},E=C.document,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.6.0",S=function(e,t){return new S.fn.init(e,t)};function p(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)}S.fn=S.prototype={jquery:f,constructor:S,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=S.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return S.each(this,e)},map:function(n){return this.pushStack(S.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)},even:function(){return this.pushStack(S.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(S.grep(this,function(e,t){return t%2}))},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},S.extend=S.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&&(S.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||S.isPlainObject(n)?n:{},i=!1,a[t]=S.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},S.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,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(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},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?S.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(p(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(a)},guid:1,support:y}),"function"==typeof Symbol&&(S.fn[Symbol.iterator]=t[Symbol.iterator]),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,S="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),j=function(e,t){return e===t&&(l=!0),0},D={}.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="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",B=new RegExp(M+"+","g"),$=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),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-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|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(p.childNodes),p.childNodes),t[p.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&&(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&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$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[S]=!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&&e.namespaceURI,n=e&&(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:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),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=S,!C.getElementsByName||!C.getElementsByName(S).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){var t;a.appendChild(e).innerHTML="<a id='"+S+"'></a><select id='"+S+"-\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~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),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("!=",F)}),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},j=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==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,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]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[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){N(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&&D.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(j),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=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(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(B," ")+" ").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)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&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]=[k,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&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[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[k,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[S]?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($,"$1"));return s[S]?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=[k,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[S]||(e[S]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===k&&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[S]&&(v=Ce(v)),y&&!y[S]&&(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))[S]){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($,"$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($," ")}),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=A[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[S]?i.push(a):o.push(a);(a=A(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=k+=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&&(k=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&&(k=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=S.split("").sort(j).join("")===S,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);S.find=d,S.expr=d.selectors,S.expr[":"]=S.expr.pseudos,S.uniqueSort=S.unique=d.uniqueSort,S.text=d.getText,S.isXMLDoc=d.isXML,S.contains=d.contains,S.escapeSelector=d.escape;var h=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&S(e).is(n))break;r.push(e)}return r},T=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},k=S.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var N=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1<i.call(n,e)!==r}):S.filter(n,e,r)}S.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?S.find.matchesSelector(r,e)?[r]:[]:S.find.matches(e,S.grep(t,function(e){return 1===e.nodeType}))},S.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(S(e).filter(function(){for(t=0;t<r;t++)if(S.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)S.find(e,i[t],n);return 1<r?S.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&&k.test(e)?S(e):e||[],!1).length}});var D,q=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||D,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.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 S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.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(S):S.makeArray(e,this)}).prototype=S.fn,D=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(S.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&S(e);if(!k.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&&S.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?S.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(S(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(S.uniqueSort(S.merge(this.get(),S(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),S.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t,n){return h(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return h(e,"nextSibling")},prevAll:function(e){return h(e,"previousSibling")},nextUntil:function(e,t,n){return h(e,"nextSibling",n)},prevUntil:function(e,t,n){return h(e,"previousSibling",n)},siblings:function(e){return T((e.parentNode||{}).firstChild,e)},children:function(e){return T(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(A(e,"template")&&(e=e.content||e),S.merge([],e.childNodes))}},function(r,i){S.fn[r]=function(e,t){var n=S.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=S.filter(t,n)),1<this.length&&(H[r]||S.uniqueSort(n),L.test(r)&&n.reverse()),this.pushStack(n)}});var P=/[^\x20\t\r\n\f]+/g;function R(e){return e}function M(e){throw e}function I(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])}}S.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},S.each(e.match(P)||[],function(e,t){n[t]=!0}),n):S.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){S.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 S.each(arguments,function(e,t){var n;while(-1<(n=S.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<S.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},S.extend({Deferred:function(e){var o=[["notify","progress",S.Callbacks("memory"),S.Callbacks("memory"),2],["resolve","done",S.Callbacks("once memory"),S.Callbacks("once memory"),0,"resolved"],["reject","fail",S.Callbacks("once memory"),S.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 S.Deferred(function(r){S.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,R,s),l(u,o,M,s)):(u++,t.call(e,l(u,o,R,s),l(u,o,M,s),l(u,o,R,o.notifyWith))):(a!==R&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){S.Deferred.exceptionHook&&S.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==M&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(S.Deferred.getStackHook&&(t.stackTrace=S.Deferred.getStackHook()),C.setTimeout(t))}}return S.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:R,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:R)),o[2][3].add(l(0,e,m(n)?n:M))}).promise()},promise:function(e){return null!=e?S.extend(e,a):a}},s={};return S.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=S.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&&(I(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)I(i[t],a(t),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;S.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&W.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},S.readyException=function(e){C.setTimeout(function(){throw e})};var F=S.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),S.ready()}S.fn.ready=function(e){return F.then(e)["catch"](function(e){S.readyException(e)}),this},S.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--S.readyWait:S.isReady)||(S.isReady=!0)!==e&&0<--S.readyWait||F.resolveWith(E,[S])}}),S.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(S.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(S(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},_=/^-ms-/,z=/-([a-z])/g;function U(e,t){return t.toUpperCase()}function X(e){return e.replace(_,"ms-").replace(z,U)}var V=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function G(){this.expando=S.expando+G.uid++}G.uid=1,G.prototype={cache:function(e){var t=e[this.expando];return t||(t={},V(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[X(t)]=n;else for(r in t)i[X(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][X(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(X):(t=X(t))in r?[t]:t.match(P)||[]).length;while(n--)delete r[t[n]]}(void 0===t||S.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&&!S.isEmptyObject(t)}};var Y=new G,Q=new G,J=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,K=/[A-Z]/g;function Z(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(K,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:J.test(i)?JSON.parse(i):i)}catch(e){}Q.set(e,t,n)}else n=void 0;return n}S.extend({hasData:function(e){return Q.hasData(e)||Y.hasData(e)},data:function(e,t,n){return Q.access(e,t,n)},removeData:function(e,t){Q.remove(e,t)},_data:function(e,t,n){return Y.access(e,t,n)},_removeData:function(e,t){Y.remove(e,t)}}),S.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=Q.get(o),1===o.nodeType&&!Y.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=X(r.slice(5)),Z(o,r,i[r]));Y.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){Q.set(this,n)}):$(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=Q.get(o,n))?t:void 0!==(t=Z(o,n))?t:void 0;this.each(function(){Q.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),S.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Y.get(e,t),n&&(!r||Array.isArray(n)?r=Y.access(e,t,S.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=S.queue(e,t),r=n.length,i=n.shift(),o=S._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){S.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Y.get(e,n)||Y.access(e,n,{empty:S.Callbacks("once memory").add(function(){Y.remove(e,[t+"queue",n])})})}}),S.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?S.queue(this[0],t):void 0===n?this:this.each(function(){var e=S.queue(this,t,n);S._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&S.dequeue(this,t)})},dequeue:function(e){return this.each(function(){S.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=S.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=Y.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var ee=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,te=new RegExp("^(?:([+-])=|)("+ee+")([a-z%]*)$","i"),ne=["Top","Right","Bottom","Left"],re=E.documentElement,ie=function(e){return S.contains(e.ownerDocument,e)},oe={composed:!0};re.getRootNode&&(ie=function(e){return S.contains(e.ownerDocument,e)||e.getRootNode(oe)===e.ownerDocument});var ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&ie(e)&&"none"===S.css(e,"display")};function se(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return S.css(e,t,"")},u=s(),l=n&&n[3]||(S.cssNumber[t]?"":"px"),c=e.nodeType&&(S.cssNumber[t]||"px"!==l&&+u)&&te.exec(S.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)S.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,S.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 ue={};function le(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]=Y.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ae(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ue[s])||(o=a.body.appendChild(a.createElement(s)),u=S.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ue[s]=u)))):"none"!==n&&(l[c]="none",Y.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}S.fn.extend({show:function(){return le(this,!0)},hide:function(){return le(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?S(this).show():S(this).hide()})}});var ce,fe,pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="<option></option>",y.option=!!ce.lastChild;var ge={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)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Y.set(e[n],"globalEval",!t||Y.get(t[n],"globalEval"))}ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td,y.option||(ge.optgroup=ge.option=[1,"<select multiple='multiple'>","</select>"]);var me=/<|&#?\w+;/;function xe(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))S.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+S.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;S.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<S.inArray(o,r))i&&i.push(o);else if(l=ie(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}var be=/^([^.]*)(?:\.(.+)|)/;function we(){return!0}function Te(){return!1}function Ce(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ee(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)Ee(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=Te;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return S().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=S.guid++)),e.each(function(){S.event.add(this,t,i,r,n)})}function Se(e,i,o){o?(Y.set(e,i,!1),S.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Y.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(S.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Y.set(this,i,r),t=o(this,i),this[i](),r!==(n=Y.get(this,i))||t?Y.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n&&n.value}else r.length&&(Y.set(this,i,{value:S.event.trigger(S.extend(r[0],S.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Y.get(e,i)&&S.event.add(e,i,we)}S.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.get(t);if(V(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&S.find.matchesSelector(re,i),n.guid||(n.guid=S.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof S&&S.event.triggered!==e.type?S.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(P)||[""]).length;while(l--)d=g=(s=be.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=S.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=S.event.special[d]||{},c=S.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&S.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),S.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.hasData(e)&&Y.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(P)||[""]).length;while(l--)if(d=g=(s=be.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=S.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)||S.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)S.event.remove(e,d+t[l],n,r,!0);S.isEmptyObject(u)&&Y.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=S.event.fix(e),l=(Y.get(this,"events")||Object.create(null))[u.type]||[],c=S.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=S.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((S.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.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<S(i,this).index(l):S.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(S.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[S.expando]?e:new S.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Se(t,"click",we),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Se(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Y.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},S.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},S.Event=function(e,t){if(!(this instanceof S.Event))return new S.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?we:Te,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&&S.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[S.expando]=!0},S.Event.prototype={constructor:S.Event,isDefaultPrevented:Te,isPropagationStopped:Te,isImmediatePropagationStopped:Te,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=we,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=we,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=we,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},S.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:!0},S.event.addProp),S.each({focus:"focusin",blur:"focusout"},function(e,t){S.event.special[e]={setup:function(){return Se(this,e,Ce),!1},trigger:function(){return Se(this,e),!0},_default:function(){return!0},delegateType:t}}),S.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){S.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||S.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),S.fn.extend({on:function(e,t,n,r){return Ee(this,e,t,n,r)},one:function(e,t,n,r){return Ee(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,S(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=Te),this.each(function(){S.event.remove(this,e,n,t)})}});var ke=/<script|<style|<link/i,Ae=/checked\s*(?:[^=]|=\s*.checked.)/i,Ne=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function je(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function De(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function qe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Le(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)S.event.add(t,i,s[i][n]);Q.hasData(e)&&(o=Q.access(e),a=S.extend({},o),Q.set(t,a))}}function He(n,r,i,o){r=g(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&&Ae.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),He(t,r,i,o)});if(f&&(t=(e=xe(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=S.map(ve(e,"script"),De)).length;c<f;c++)u=e,c!==p&&(u=S.clone(u,!0,!0),s&&S.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,S.map(a,qe),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Y.access(u,"globalEval")&&S.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?S._evalUrl&&!u.noModule&&S._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):b(u.textContent.replace(Ne,""),u,l))}return n}function Oe(e,t,n){for(var r,i=t?S.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||S.cleanData(ve(r)),r.parentNode&&(n&&ie(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}S.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=ie(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||S.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++)Le(o[r],a[r]);else Le(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=S.event.special,o=0;void 0!==(n=e[o]);o++)if(V(n)){if(t=n[Y.expando]){if(t.events)for(r in t.events)i[r]?S.event.remove(n,r):S.removeEvent(n,r,t.handle);n[Y.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),S.fn.extend({detach:function(e){return Oe(this,e,!0)},remove:function(e){return Oe(this,e)},text:function(e){return $(this,function(e){return void 0===e?S.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 He(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||je(this,e).appendChild(e)})},prepend:function(){return He(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=je(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return He(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return He(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&&(S.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 S.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&&!ke.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=S.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(S.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 He(this,arguments,function(e){var t=this.parentNode;S.inArray(this,n)<0&&(S.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),S.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){S.fn[e]=function(e){for(var t,n=[],r=S(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),S(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var Pe=new RegExp("^("+ee+")(?!px)[a-z%]+$","i"),Re=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Me=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Ie=new RegExp(ne.join("|"),"i");function We(e,t,n){var r,i,o,a,s=e.style;return(n=n||Re(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||ie(e)||(a=S.style(e,t)),!y.pixelBoxStyles()&&Pe.test(a)&&Ie.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 Fe(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",re.appendChild(u).appendChild(l);var e=C.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),re.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=E.createElement("div"),l=E.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===l.style.backgroundClip,S.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=E.createElement("table"),t=E.createElement("tr"),n=E.createElement("div"),e.style.cssText="position:absolute;left:-11111px;border-collapse:separate",t.style.cssText="border:1px solid",t.style.height="1px",n.style.height="9px",n.style.display="block",re.appendChild(e).appendChild(t).appendChild(n),r=C.getComputedStyle(t),a=parseInt(r.height,10)+parseInt(r.borderTopWidth,10)+parseInt(r.borderBottomWidth,10)===t.offsetHeight,re.removeChild(e)),a}}))}();var Be=["Webkit","Moz","ms"],$e=E.createElement("div").style,_e={};function ze(e){var t=S.cssProps[e]||_e[e];return t||(e in $e?e:_e[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Be.length;while(n--)if((e=Be[n]+t)in $e)return e}(e)||e)}var Ue=/^(none|table(?!-c[ea]).+)/,Xe=/^--/,Ve={position:"absolute",visibility:"hidden",display:"block"},Ge={letterSpacing:"0",fontWeight:"400"};function Ye(e,t,n){var r=te.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Qe(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+=S.css(e,n+ne[a],!0,i)),r?("content"===n&&(u-=S.css(e,"padding"+ne[a],!0,i)),"margin"!==n&&(u-=S.css(e,"border"+ne[a]+"Width",!0,i))):(u+=S.css(e,"padding"+ne[a],!0,i),"padding"!==n?u+=S.css(e,"border"+ne[a]+"Width",!0,i):s+=S.css(e,"border"+ne[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 Je(e,t,n){var r=Re(e),i=(!y.boxSizingReliable()||n)&&"border-box"===S.css(e,"boxSizing",!1,r),o=i,a=We(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Pe.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||!y.reliableTrDimensions()&&A(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===S.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===S.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+Qe(e,t,n||(i?"border":"content"),o,r,a)+"px"}function Ke(e,t,n,r,i){return new Ke.prototype.init(e,t,n,r,i)}S.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=We(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=X(t),u=Xe.test(t),l=e.style;if(u||(t=ze(s)),a=S.cssHooks[t]||S.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=te.exec(n))&&i[1]&&(n=se(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(S.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=X(t);return Xe.test(t)||(t=ze(s)),(a=S.cssHooks[t]||S.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=We(e,t,r)),"normal"===i&&t in Ge&&(i=Ge[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),S.each(["height","width"],function(e,u){S.cssHooks[u]={get:function(e,t,n){if(t)return!Ue.test(S.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?Je(e,u,n):Me(e,Ve,function(){return Je(e,u,n)})},set:function(e,t,n){var r,i=Re(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===S.css(e,"boxSizing",!1,i),s=n?Qe(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-Qe(e,u,"border",!1,i)-.5)),s&&(r=te.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=S.css(e,u)),Ye(0,t,s)}}}),S.cssHooks.marginLeft=Fe(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(We(e,"marginLeft"))||e.getBoundingClientRect().left-Me(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),S.each({margin:"",padding:"",border:"Width"},function(i,o){S.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+ne[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(S.cssHooks[i+o].set=Ye)}),S.fn.extend({css:function(e,t){return $(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Re(e),i=t.length;a<i;a++)o[t[a]]=S.css(e,t[a],!1,r);return o}return void 0!==n?S.style(e,t,n):S.css(e,t)},e,t,1<arguments.length)}}),((S.Tween=Ke).prototype={constructor:Ke,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||S.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(S.cssNumber[n]?"":"px")},cur:function(){var e=Ke.propHooks[this.prop];return e&&e.get?e.get(this):Ke.propHooks._default.get(this)},run:function(e){var t,n=Ke.propHooks[this.prop];return this.options.duration?this.pos=t=S.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):Ke.propHooks._default.set(this),this}}).init.prototype=Ke.prototype,(Ke.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=S.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){S.fx.step[e.prop]?S.fx.step[e.prop](e):1!==e.elem.nodeType||!S.cssHooks[e.prop]&&null==e.elem.style[ze(e.prop)]?e.elem[e.prop]=e.now:S.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=Ke.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},S.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},S.fx=Ke.prototype.init,S.fx.step={};var Ze,et,tt,nt,rt=/^(?:toggle|show|hide)$/,it=/queueHooks$/;function ot(){et&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(ot):C.setTimeout(ot,S.fx.interval),S.fx.tick())}function at(){return C.setTimeout(function(){Ze=void 0}),Ze=Date.now()}function st(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=ne[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function ut(e,t,n){for(var r,i=(lt.tweeners[t]||[]).concat(lt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function lt(o,e,t){var n,a,r=0,i=lt.prefilters.length,s=S.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=Ze||at(),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:S.extend({},e),opts:S.extend(!0,{specialEasing:{},easing:S.easing._default},t),originalProperties:e,originalOptions:t,startTime:Ze||at(),duration:t.duration,tweens:[],createTween:function(e,t){var n=S.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=X(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=S.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=lt.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(S._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return S.map(c,ut,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),S.fx.timer(S.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}S.Animation=S.extend(lt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return se(n.elem,e,te.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(P);for(var n,r=0,i=e.length;r<i;r++)n=e[r],lt.tweeners[n]=lt.tweeners[n]||[],lt.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&&ae(e),v=Y.get(e,"fxshow");for(r in n.queue||(null==(a=S._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--,S.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],rt.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]||S.style(e,r)}if((u=!S.isEmptyObject(t))||!S.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Y.get(e,"display")),"none"===(c=S.css(e,"display"))&&(l?c=l:(le([e],!0),l=e.style.display||l,c=S.css(e,"display"),le([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===S.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=Y.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&le([e],!0),p.done(function(){for(r in g||le([e]),Y.remove(e,"fxshow"),d)S.style(e,r,d[r])})),u=ut(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?lt.prefilters.unshift(e):lt.prefilters.push(e)}}),S.speed=function(e,t,n){var r=e&&"object"==typeof e?S.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return S.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in S.fx.speeds?r.duration=S.fx.speeds[r.duration]:r.duration=S.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&&S.dequeue(this,r.queue)},r},S.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=S.isEmptyObject(t),o=S.speed(e,n,r),a=function(){var e=lt(this,S.extend({},t),o);(i||Y.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&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=S.timers,r=Y.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&it.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||S.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Y.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=S.timers,o=n?n.length:0;for(t.finish=!0,S.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})}}),S.each(["toggle","show","hide"],function(e,r){var i=S.fn[r];S.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(st(r,!0),e,t,n)}}),S.each({slideDown:st("show"),slideUp:st("hide"),slideToggle:st("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){S.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),S.timers=[],S.fx.tick=function(){var e,t=0,n=S.timers;for(Ze=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||S.fx.stop(),Ze=void 0},S.fx.timer=function(e){S.timers.push(e),S.fx.start()},S.fx.interval=13,S.fx.start=function(){et||(et=!0,ot())},S.fx.stop=function(){et=null},S.fx.speeds={slow:600,fast:200,_default:400},S.fn.delay=function(r,e){return r=S.fx&&S.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)}})},tt=E.createElement("input"),nt=E.createElement("select").appendChild(E.createElement("option")),tt.type="checkbox",y.checkOn=""!==tt.value,y.optSelected=nt.selected,(tt=E.createElement("input")).value="t",tt.type="radio",y.radioValue="t"===tt.value;var ct,ft=S.expr.attrHandle;S.fn.extend({attr:function(e,t){return $(this,S.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){S.removeAttr(this,e)})}}),S.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?S.prop(e,t,n):(1===o&&S.isXMLDoc(e)||(i=S.attrHooks[t.toLowerCase()]||(S.expr.match.bool.test(t)?ct:void 0)),void 0!==n?null===n?void S.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=S.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(P);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),ct={set:function(e,t,n){return!1===t?S.removeAttr(e,n):e.setAttribute(n,n),n}},S.each(S.expr.match.bool.source.match(/\w+/g),function(e,t){var a=ft[t]||S.find.attr;ft[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=ft[o],ft[o]=r,r=null!=a(e,t,n)?o:null,ft[o]=i),r}});var pt=/^(?:input|select|textarea|button)$/i,dt=/^(?:a|area)$/i;function ht(e){return(e.match(P)||[]).join(" ")}function gt(e){return e.getAttribute&&e.getAttribute("class")||""}function vt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(P)||[]}S.fn.extend({prop:function(e,t){return $(this,S.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[S.propFix[e]||e]})}}),S.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&S.isXMLDoc(e)||(t=S.propFix[t]||t,i=S.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=S.find.attr(e,"tabindex");return t?parseInt(t,10):pt.test(e.nodeName)||dt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(S.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)}}),S.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){S.propFix[this.toLowerCase()]=this}),S.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).addClass(t.call(this,e,gt(this)))});if((e=vt(t)).length)while(n=this[u++])if(i=gt(n),r=1===n.nodeType&&" "+ht(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=ht(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){S(this).removeClass(t.call(this,e,gt(this)))});if(!arguments.length)return this.attr("class","");if((e=vt(t)).length)while(n=this[u++])if(i=gt(n),r=1===n.nodeType&&" "+ht(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=ht(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){S(this).toggleClass(i.call(this,e,gt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=S(this),r=vt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=gt(this))&&Y.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Y.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+ht(gt(n))+" ").indexOf(t))return!0;return!1}});var yt=/\r/g;S.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,S(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=S.map(t,function(e){return null==e?"":e+""})),(r=S.valHooks[this.type]||S.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=S.valHooks[t.type]||S.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(yt,""):null==e?"":e:void 0}}),S.extend({valHooks:{option:{get:function(e){var t=S.find.attr(e,"value");return null!=t?t:ht(S.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=S(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=S.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<S.inArray(S.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),S.each(["radio","checkbox"],function(){S.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<S.inArray(S(e).val(),t)}},y.checkOn||(S.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var mt=/^(?:focusinfocus|focusoutblur)$/,xt=function(e){e.stopPropagation()};S.extend(S.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&&!mt.test(d+S.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[S.expando]?e:new S.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]:S.makeArray(t,[e]),c=S.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,mt.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=(Y.get(o,"events")||Object.create(null))[e.type]&&Y.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&V(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)||!V(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),S.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,xt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,xt),S.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=S.extend(new S.Event,n,{type:e,isSimulated:!0});S.event.trigger(r,null,t)}}),S.fn.extend({trigger:function(e,t){return this.each(function(){S.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return S.event.trigger(e,t,n,!0)}}),y.focusin||S.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){S.event.simulate(r,e.target,S.event.fix(e))};S.event.special[r]={setup:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r);t||e.addEventListener(n,i,!0),Y.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r)-1;t?Y.access(e,r,t):(e.removeEventListener(n,i,!0),Y.remove(e,r))}}});var bt=C.location,wt={guid:Date.now()},Tt=/\?/;S.parseXML=function(e){var t,n;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){}return n=t&&t.getElementsByTagName("parsererror")[0],t&&!n||S.error("Invalid XML: "+(n?S.map(n.childNodes,function(e){return e.textContent}).join("\n"):e)),t};var Ct=/\[\]$/,Et=/\r?\n/g,St=/^(?:submit|button|image|reset|file)$/i,kt=/^(?:input|select|textarea|keygen)/i;function At(n,e,r,i){var t;if(Array.isArray(e))S.each(e,function(e,t){r||Ct.test(n)?i(n,t):At(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)At(n+"["+t+"]",e[t],r,i)}S.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&&!S.isPlainObject(e))S.each(e,function(){i(this.name,this.value)});else for(n in e)At(n,e[n],t,i);return r.join("&")},S.fn.extend({serialize:function(){return S.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=S.prop(this,"elements");return e?S.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!S(this).is(":disabled")&&kt.test(this.nodeName)&&!St.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=S(this).val();return null==n?null:Array.isArray(n)?S.map(n,function(e){return{name:t.name,value:e.replace(Et,"\r\n")}}):{name:t.name,value:n.replace(Et,"\r\n")}}).get()}});var Nt=/%20/g,jt=/#.*$/,Dt=/([?&])_=[^&]*/,qt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Lt=/^(?:GET|HEAD)$/,Ht=/^\/\//,Ot={},Pt={},Rt="*/".concat("*"),Mt=E.createElement("a");function It(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(P)||[];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 Wt(t,i,o,a){var s={},u=t===Pt;function l(e){var r;return s[e]=!0,S.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 Ft(e,t){var n,r,i=S.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&S.extend(!0,e,r),e}Mt.href=bt.href,S.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:bt.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(bt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Rt,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":S.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Ft(Ft(e,S.ajaxSettings),t):Ft(S.ajaxSettings,e)},ajaxPrefilter:It(Ot),ajaxTransport:It(Pt),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=S.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?S(y):S.event,x=S.Deferred(),b=S.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=qt.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||bt.href)+"").replace(Ht,bt.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(P)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Mt.protocol+"//"+Mt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=S.param(v.data,v.traditional)),Wt(Ot,v,t,T),h)return T;for(i in(g=S.event&&v.global)&&0==S.active++&&S.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Lt.test(v.type),f=v.url.replace(jt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Nt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(Tt.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Dt,"$1"),o=(Tt.test(f)?"&":"?")+"_="+wt.guid+++o),v.url=f+o),v.ifModified&&(S.lastModified[f]&&T.setRequestHeader("If-Modified-Since",S.lastModified[f]),S.etag[f]&&T.setRequestHeader("If-None-Match",S.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]?", "+Rt+"; 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=Wt(Pt,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)),!i&&-1<S.inArray("script",v.dataTypes)&&S.inArray("json",v.dataTypes)<0&&(v.converters["text script"]=function(){}),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"))&&(S.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(S.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]),--S.active||S.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return S.get(e,t,n,"json")},getScript:function(e,t){return S.get(e,void 0,t,"script")}}),S.each(["get","post"],function(e,i){S[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),S.ajax(S.extend({url:e,type:i,dataType:r,data:t,success:n},S.isPlainObject(e)&&e))}}),S.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),S._evalUrl=function(e,t,n){return S.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){S.globalEval(e,t,n)}})},S.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=S(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){S(this).wrapInner(n.call(this,e))}):this.each(function(){var e=S(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){S(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){S(this).replaceWith(this.childNodes)}),this}}),S.expr.pseudos.hidden=function(e){return!S.expr.pseudos.visible(e)},S.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},S.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var Bt={0:200,1223:204},$t=S.ajaxSettings.xhr();y.cors=!!$t&&"withCredentials"in $t,y.ajax=$t=!!$t,S.ajaxTransport(function(i){var o,a;if(y.cors||$t&&!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(Bt[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()}}}),S.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),S.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 S.globalEval(e),e}}}),S.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),S.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=S("<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 _t,zt=[],Ut=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=zt.pop()||S.expando+"_"+wt.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Ut.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Ut.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(Ut,"$1"+r):!1!==e.jsonp&&(e.url+=(Tt.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.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?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,zt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((_t=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===_t.childNodes.length),S.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=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=ht(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&S.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?S("<div>").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.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,S.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)}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.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"===S.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"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.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)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=Fe(y.pixelPosition,function(e,t){if(t)return t=We(e,n),Pe.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.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?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.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)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.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){S.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var Xt=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;S.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||S.guid++,i},S.holdReady=function(e){e?S.readyWait++:S.ready(!0)},S.isArray=Array.isArray,S.parseJSON=JSON.parse,S.nodeName=A,S.isFunction=m,S.isWindow=x,S.camelCase=X,S.type=w,S.now=Date.now,S.isNumeric=function(e){var t=S.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},S.trim=function(e){return null==e?"":(e+"").replace(Xt,"")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return S});var Vt=C.jQuery,Gt=C.$;return S.noConflict=function(e){return C.$===S&&(C.$=Gt),e&&C.jQuery===S&&(C.jQuery=Vt),S},"undefined"==typeof e&&(C.jQuery=C.$=S),S});
\ No newline at end of file
diff --git a/data/interfaces/default/js/jquery-cron-min.js b/data/interfaces/default/js/jquery-cron-min.js
deleted file mode 100644
index 87aa765a..00000000
--- a/data/interfaces/default/js/jquery-cron-min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(e){function t(e){return"undefined"==typeof e?!1:!0}function n(e){return!t(e)||"object"==typeof e}function s(n,s){if(t(s.customValues))for(key in s.customValues)if(n==s.customValues[key])return key;var a=/^((\d{1,2}|\*)\s){4}(\d{1,2}|\*)$/;if("string"!=typeof n||!a.test(n))return void e.error("cron: invalid initial value");for(var i=n.split(" "),r=[0,0,1,1,0],l=[59,23,31,12,6],c=0;c<i.length;c++)if("*"!=i[c]){var d=parseInt(i[c]);if(!(t(d)&&d<=l[c]&&d>=r[c]))return void e.error("cron: invalid value found (col "+(c+1)+") in "+o.initial)}for(var u in k)if(k[u].test(n))return u;return void e.error("cron: valid but unsupported cron format. sorry.")}function a(o,a){if(!t(s(a.initial,a)))return!0;if(!n(a.customValues))return!0;if(t(a.customValues))for(key in a.customValues)if(k.hasOwnProperty(key))return e.error("cron: reserved keyword '"+key+"' should not be used as customValues key."),!0;return!1}function i(e){var t=e.data("block"),o=hour=day=month=dow="*",n=t.period.find("select").val();switch(n){case"minute":break;case"hour":o=t.mins.find("select").val();break;case"day":o=t.time.find("select.cron-time-min").val(),hour=t.time.find("select.cron-time-hour").val();break;case"week":o=t.time.find("select.cron-time-min").val(),hour=t.time.find("select.cron-time-hour").val(),dow=t.dow.find("select").val();break;case"month":o=t.time.find("select.cron-time-min").val(),hour=t.time.find("select.cron-time-hour").val(),day=t.dom.find("select").val();break;case"year":o=t.time.find("select.cron-time-min").val(),hour=t.time.find("select.cron-time-hour").val(),day=t.dom.find("select").val(),month=t.month.find("select").val();break;default:return n}return[o,hour,day,month,dow].join(" ")}for(var r={initial:"* * * * *",minuteOpts:{minWidth:100,itemWidth:30,columns:4,rows:void 0,title:"Minutes Past the Hour"},timeHourOpts:{minWidth:100,itemWidth:20,columns:2,rows:void 0,title:"Time: Hour"},domOpts:{minWidth:100,itemWidth:30,columns:void 0,rows:10,title:"Day of Month"},monthOpts:{minWidth:100,itemWidth:100,columns:2,rows:void 0,title:void 0},dowOpts:{minWidth:100,itemWidth:void 0,columns:void 0,rows:void 0,title:void 0},timeMinuteOpts:{minWidth:100,itemWidth:20,columns:4,rows:void 0,title:"Time: Minute"},effectOpts:{openSpeed:400,closeSpeed:400,openEffect:"slide",closeEffect:"slide",hideOnMouseOut:!0},url_set:void 0,customValues:void 0,onChange:void 0,useGentleSelect:!1},l="",c=0;60>c;c++){var d=10>c?"0":"";l+="<option value='"+c+"'>"+d+c+"</option>\n"}for(var u="",c=0;24>c;c++){var d=10>c?"0":"";u+="<option value='"+c+"'>"+d+c+"</option>\n"}for(var m="",c=1;32>c;c++){if(1==c||21==c||31==c)var h="st";else if(2==c||22==c)var h="nd";else if(3==c||23==c)var h="rd";else var h="th";m+="<option value='"+c+"'>"+c+h+"</option>\n"}for(var p="",v=["January","February","March","April","May","June","July","August","September","October","November","December"],c=0;c<v.length;c++)p+="<option value='"+(c+1)+"'>"+v[c]+"</option>\n";for(var f="",y=["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],c=0;c<y.length;c++)f+="<option value='"+c+"'>"+y[c]+"</option>\n";for(var g="",b=["minute","hour","day","week","month","year"],c=0;c<b.length;c++)g+="<option value='"+b[c]+"'>"+b[c]+"</option>\n";var O={minute:[],hour:["mins"],day:["time"],week:["dow","time"],month:["dom","time"],year:["dom","month","time"]},k={minute:/^(\*\s){4}\*$/,hour:/^\d{1,2}\s(\*\s){3}\*$/,day:/^(\d{1,2}\s){2}(\*\s){2}\*$/,week:/^(\d{1,2}\s){2}(\*\s){2}\d{1,2}$/,month:/^(\d{1,2}\s){3}\*\s\*$/,year:/^(\d{1,2}\s){4}\*$/},w={init:function(o){var n=o?o:{},s=e.extend([],r,n),i=e.extend({},r.effectOpts,n.effectOpts);if(e.extend(s,{minuteOpts:e.extend({},r.minuteOpts,i,n.minuteOpts),domOpts:e.extend({},r.domOpts,i,n.domOpts),monthOpts:e.extend({},r.monthOpts,i,n.monthOpts),dowOpts:e.extend({},r.dowOpts,i,n.dowOpts),timeHourOpts:e.extend({},r.timeHourOpts,i,n.timeHourOpts),timeMinuteOpts:e.extend({},r.timeMinuteOpts,i,n.timeMinuteOpts)}),a(this,s))return this;var c=[],d="",h=s.customValues;if(t(h))for(var v in h)d+="<option value='"+h[v]+"'>"+v+"</option>\n";c.period=e("<span class='cron-period'>Every <select name='cron-period' class='"+n.classes+"'>"+d+g+"</select> </span>").appendTo(this).data("root",this);var y=c.period.find("select");return y.bind("change.cron",S.periodChanged).data("root",this),s.useGentleSelect&&y.gentleSelect(i),c.dom=e("<span class='cron-block cron-block-dom'> on the <select name='cron-dom' class='"+n.classes+"'>"+m+"</select> </span>").appendTo(this).data("root",this),y=c.dom.find("select").data("root",this),s.useGentleSelect&&y.gentleSelect(s.domOpts),c.month=e("<span class='cron-block cron-block-month'> of <select name='cron-month' class='"+n.classes+"'>"+p+"</select> </span>").appendTo(this).data("root",this),y=c.month.find("select").data("root",this),s.useGentleSelect&&y.gentleSelect(s.monthOpts),c.mins=e("<span class='cron-block cron-block-mins'> at <select name='cron-mins' class='"+n.classes+"'>"+l+"</select> minutes past the hour </span>").appendTo(this).data("root",this),y=c.mins.find("select").data("root",this),s.useGentleSelect&&y.gentleSelect(s.minuteOpts),c.dow=e("<span class='cron-block cron-block-dow'> on <select name='cron-dow' class='"+n.classes+"'>"+f+"</select> </span>").appendTo(this).data("root",this),y=c.dow.find("select").data("root",this),s.useGentleSelect&&y.gentleSelect(s.dowOpts),c.time=e("<span class='cron-block cron-block-time'> at <select name='cron-time-hour' class='cron-time-hour "+n.classes+"'>"+u+"</select>:<select name='cron-time-min' class='cron-time-min "+n.classes+"'>"+l+" </span>").appendTo(this).data("root",this),y=c.time.find("select.cron-time-hour").data("root",this),s.useGentleSelect&&y.gentleSelect(s.timeHourOpts),y=c.time.find("select.cron-time-min").data("root",this),s.useGentleSelect&&y.gentleSelect(s.timeMinuteOpts),c.controls=e("<span class='cron-controls'>&laquo; save <span class='cron-button cron-button-save'></span> </span>").appendTo(this).data("root",this).find("span.cron-button-save").bind("click.cron",S.saveClicked).data("root",this).end(),this.find("select").bind("change.cron-callback",S.somethingChanged),this.data("options",s).data("block",c),this.data("current_value",s.initial),w.value.call(this,s.initial)},value:function(e){if(!e)return i(this);var o=this.data("options"),n=this.data("block"),a=o.useGentleSelect,r=s(e,o);if(!t(r))return!1;if(t(o.customValues)&&o.customValues.hasOwnProperty(r))r=o.customValues[r];else for(var l=e.split(" "),c={mins:l[0],hour:l[1],dom:l[2],month:l[3],dow:l[4]},d=O[r],u=0;u<d.length;u++){var m=d[u];if("time"==m){var h=n[m].find("select.cron-time-hour").val(c.hour);a&&h.gentleSelect("update"),h=n[m].find("select.cron-time-min").val(c.mins),a&&h.gentleSelect("update")}else{var h=n[m].find("select").val(c[m]);a&&h.gentleSelect("update")}}var p=n.period.find("select").val(r);return a&&p.gentleSelect("update"),p.trigger("change"),this}},S={periodChanged:function(){var t=e(this).data("root"),o=t.data("block"),n=(t.data("options"),e(this).val());if(t.find("span.cron-block").hide(),O.hasOwnProperty(n))for(var s=O[e(this).val()],a=0;a<s.length;a++)o[s[a]].show()},somethingChanged:function(){root=e(this).data("root"),t(root.data("options").url_set)?w.value.call(root)!=root.data("current_value")?(root.addClass("cron-changed"),root.data("block").controls.fadeIn()):(root.removeClass("cron-changed"),root.data("block").controls.fadeOut()):root.data("block").controls.hide();var o=root.data("options").onChange;t(o)&&e.isFunction(o)&&o.call(root)},saveClicked:function(){var t=e(this),o=t.data("root"),n=w.value.call(o);t.hasClass("cron-loading")||(t.addClass("cron-loading"),e.ajax({type:"POST",url:o.data("options").url_set,data:{cron:n},success:function(){o.data("current_value",n),t.removeClass("cron-loading"),n==w.value.call(o)&&(o.removeClass("cron-changed"),o.data("block").controls.fadeOut())},error:function(){alert("An error occured when submitting your request. Try again?"),t.removeClass("cron-loading")}}))}};e.fn.cron=function(t){return w[t]?w[t].apply(this,Array.prototype.slice.call(arguments,1)):"object"!=typeof t&&t?void e.error("Method "+t+" does not exist on jQuery.cron"):w.init.apply(this,arguments)}}(jQuery);
\ No newline at end of file
diff --git a/data/interfaces/default/js/jquery.dataTables.min.js b/data/interfaces/default/js/jquery.dataTables.min.js
index ff23e914..85dd817e 100644
--- a/data/interfaces/default/js/jquery.dataTables.min.js
+++ b/data/interfaces/default/js/jquery.dataTables.min.js
@@ -1,187 +1,160 @@
-/*!
-   Copyright 2008-2021 SpryMedia Ltd.
-
- This source file is free software, available under the following license:
-   MIT license - http://datatables.net/license
-
- This source file 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 license files for details.
-
- For details please refer to: http://www.datatables.net
- DataTables 1.11.3
- ©2008-2021 SpryMedia Ltd - datatables.net/license
-*/
-var $jscomp=$jscomp||{};$jscomp.scope={};$jscomp.findInternal=function(l,z,A){l instanceof String&&(l=String(l));for(var q=l.length,E=0;E<q;E++){var P=l[E];if(z.call(A,P,E,l))return{i:E,v:P}}return{i:-1,v:void 0}};$jscomp.ASSUME_ES5=!1;$jscomp.ASSUME_NO_NATIVE_MAP=!1;$jscomp.ASSUME_NO_NATIVE_SET=!1;$jscomp.SIMPLE_FROUND_POLYFILL=!1;$jscomp.ISOLATE_POLYFILLS=!1;
-$jscomp.defineProperty=$jscomp.ASSUME_ES5||"function"==typeof Object.defineProperties?Object.defineProperty:function(l,z,A){if(l==Array.prototype||l==Object.prototype)return l;l[z]=A.value;return l};$jscomp.getGlobal=function(l){l=["object"==typeof globalThis&&globalThis,l,"object"==typeof window&&window,"object"==typeof self&&self,"object"==typeof global&&global];for(var z=0;z<l.length;++z){var A=l[z];if(A&&A.Math==Math)return A}throw Error("Cannot find global object");};$jscomp.global=$jscomp.getGlobal(this);
-$jscomp.IS_SYMBOL_NATIVE="function"===typeof Symbol&&"symbol"===typeof Symbol("x");$jscomp.TRUST_ES6_POLYFILLS=!$jscomp.ISOLATE_POLYFILLS||$jscomp.IS_SYMBOL_NATIVE;$jscomp.polyfills={};$jscomp.propertyToPolyfillSymbol={};$jscomp.POLYFILL_PREFIX="$jscp$";var $jscomp$lookupPolyfilledValue=function(l,z){var A=$jscomp.propertyToPolyfillSymbol[z];if(null==A)return l[z];A=l[A];return void 0!==A?A:l[z]};
-$jscomp.polyfill=function(l,z,A,q){z&&($jscomp.ISOLATE_POLYFILLS?$jscomp.polyfillIsolated(l,z,A,q):$jscomp.polyfillUnisolated(l,z,A,q))};$jscomp.polyfillUnisolated=function(l,z,A,q){A=$jscomp.global;l=l.split(".");for(q=0;q<l.length-1;q++){var E=l[q];if(!(E in A))return;A=A[E]}l=l[l.length-1];q=A[l];z=z(q);z!=q&&null!=z&&$jscomp.defineProperty(A,l,{configurable:!0,writable:!0,value:z})};
-$jscomp.polyfillIsolated=function(l,z,A,q){var E=l.split(".");l=1===E.length;q=E[0];q=!l&&q in $jscomp.polyfills?$jscomp.polyfills:$jscomp.global;for(var P=0;P<E.length-1;P++){var ma=E[P];if(!(ma in q))return;q=q[ma]}E=E[E.length-1];A=$jscomp.IS_SYMBOL_NATIVE&&"es6"===A?q[E]:null;z=z(A);null!=z&&(l?$jscomp.defineProperty($jscomp.polyfills,E,{configurable:!0,writable:!0,value:z}):z!==A&&($jscomp.propertyToPolyfillSymbol[E]=$jscomp.IS_SYMBOL_NATIVE?$jscomp.global.Symbol(E):$jscomp.POLYFILL_PREFIX+E,
-E=$jscomp.propertyToPolyfillSymbol[E],$jscomp.defineProperty(q,E,{configurable:!0,writable:!0,value:z})))};$jscomp.polyfill("Array.prototype.find",function(l){return l?l:function(z,A){return $jscomp.findInternal(this,z,A).v}},"es6","es3");
-(function(l){"function"===typeof define&&define.amd?define(["jquery"],function(z){return l(z,window,document)}):"object"===typeof exports?module.exports=function(z,A){z||(z=window);A||(A="undefined"!==typeof window?require("jquery"):require("jquery")(z));return l(A,z,z.document)}:window.DataTable=l(jQuery,window,document)})(function(l,z,A,q){function E(a){var b,c,d={};l.each(a,function(e,h){(b=e.match(/^([^A-Z]+?)([A-Z])/))&&-1!=="a aa ai ao as b fn i m o s ".indexOf(b[1]+" ")&&(c=e.replace(b[0],
-b[2].toLowerCase()),d[c]=e,"o"===b[1]&&E(a[e]))});a._hungarianMap=d}function P(a,b,c){a._hungarianMap||E(a);var d;l.each(b,function(e,h){d=a._hungarianMap[e];d===q||!c&&b[d]!==q||("o"===d.charAt(0)?(b[d]||(b[d]={}),l.extend(!0,b[d],b[e]),P(a[d],b[d],c)):b[d]=b[e])})}function ma(a){var b=u.defaults.oLanguage,c=b.sDecimal;c&&Wa(c);if(a){var d=a.sZeroRecords;!a.sEmptyTable&&d&&"No data available in table"===b.sEmptyTable&&X(a,a,"sZeroRecords","sEmptyTable");!a.sLoadingRecords&&d&&"Loading..."===b.sLoadingRecords&&
-X(a,a,"sZeroRecords","sLoadingRecords");a.sInfoThousands&&(a.sThousands=a.sInfoThousands);(a=a.sDecimal)&&c!==a&&Wa(a)}}function zb(a){S(a,"ordering","bSort");S(a,"orderMulti","bSortMulti");S(a,"orderClasses","bSortClasses");S(a,"orderCellsTop","bSortCellsTop");S(a,"order","aaSorting");S(a,"orderFixed","aaSortingFixed");S(a,"paging","bPaginate");S(a,"pagingType","sPaginationType");S(a,"pageLength","iDisplayLength");S(a,"searching","bFilter");"boolean"===typeof a.sScrollX&&(a.sScrollX=a.sScrollX?"100%":
-"");"boolean"===typeof a.scrollX&&(a.scrollX=a.scrollX?"100%":"");if(a=a.aoSearchCols)for(var b=0,c=a.length;b<c;b++)a[b]&&P(u.models.oSearch,a[b])}function Ab(a){S(a,"orderable","bSortable");S(a,"orderData","aDataSort");S(a,"orderSequence","asSorting");S(a,"orderDataType","sortDataType");var b=a.aDataSort;"number"!==typeof b||Array.isArray(b)||(a.aDataSort=[b])}function Bb(a){if(!u.__browser){var b={};u.__browser=b;var c=l("<div/>").css({position:"fixed",top:0,left:-1*l(z).scrollLeft(),height:1,
-width:1,overflow:"hidden"}).append(l("<div/>").css({position:"absolute",top:1,left:1,width:100,overflow:"scroll"}).append(l("<div/>").css({width:"100%",height:10}))).appendTo("body"),d=c.children(),e=d.children();b.barWidth=d[0].offsetWidth-d[0].clientWidth;b.bScrollOversize=100===e[0].offsetWidth&&100!==d[0].clientWidth;b.bScrollbarLeft=1!==Math.round(e.offset().left);b.bBounding=c[0].getBoundingClientRect().width?!0:!1;c.remove()}l.extend(a.oBrowser,u.__browser);a.oScroll.iBarWidth=u.__browser.barWidth}
-function Cb(a,b,c,d,e,h){var f=!1;if(c!==q){var g=c;f=!0}for(;d!==e;)a.hasOwnProperty(d)&&(g=f?b(g,a[d],d,a):a[d],f=!0,d+=h);return g}function Xa(a,b){var c=u.defaults.column,d=a.aoColumns.length;c=l.extend({},u.models.oColumn,c,{nTh:b?b:A.createElement("th"),sTitle:c.sTitle?c.sTitle:b?b.innerHTML:"",aDataSort:c.aDataSort?c.aDataSort:[d],mData:c.mData?c.mData:d,idx:d});a.aoColumns.push(c);c=a.aoPreSearchCols;c[d]=l.extend({},u.models.oSearch,c[d]);Ga(a,d,l(b).data())}function Ga(a,b,c){b=a.aoColumns[b];
-var d=a.oClasses,e=l(b.nTh);if(!b.sWidthOrig){b.sWidthOrig=e.attr("width")||null;var h=(e.attr("style")||"").match(/width:\s*(\d+[pxem%]+)/);h&&(b.sWidthOrig=h[1])}c!==q&&null!==c&&(Ab(c),P(u.defaults.column,c,!0),c.mDataProp===q||c.mData||(c.mData=c.mDataProp),c.sType&&(b._sManualType=c.sType),c.className&&!c.sClass&&(c.sClass=c.className),c.sClass&&e.addClass(c.sClass),l.extend(b,c),X(b,c,"sWidth","sWidthOrig"),c.iDataSort!==q&&(b.aDataSort=[c.iDataSort]),X(b,c,"aDataSort"));var f=b.mData,g=na(f),
-k=b.mRender?na(b.mRender):null;c=function(m){return"string"===typeof m&&-1!==m.indexOf("@")};b._bAttrSrc=l.isPlainObject(f)&&(c(f.sort)||c(f.type)||c(f.filter));b._setter=null;b.fnGetData=function(m,n,p){var t=g(m,n,q,p);return k&&n?k(t,n,m,p):t};b.fnSetData=function(m,n,p){return ha(f)(m,n,p)};"number"!==typeof f&&(a._rowReadObject=!0);a.oFeatures.bSort||(b.bSortable=!1,e.addClass(d.sSortableNone));a=-1!==l.inArray("asc",b.asSorting);c=-1!==l.inArray("desc",b.asSorting);b.bSortable&&(a||c)?a&&!c?
-(b.sSortingClass=d.sSortableAsc,b.sSortingClassJUI=d.sSortJUIAscAllowed):!a&&c?(b.sSortingClass=d.sSortableDesc,b.sSortingClassJUI=d.sSortJUIDescAllowed):(b.sSortingClass=d.sSortable,b.sSortingClassJUI=d.sSortJUI):(b.sSortingClass=d.sSortableNone,b.sSortingClassJUI="")}function ta(a){if(!1!==a.oFeatures.bAutoWidth){var b=a.aoColumns;Ya(a);for(var c=0,d=b.length;c<d;c++)b[c].nTh.style.width=b[c].sWidth}b=a.oScroll;""===b.sY&&""===b.sX||Ha(a);F(a,null,"column-sizing",[a])}function ua(a,b){a=Ia(a,"bVisible");
-return"number"===typeof a[b]?a[b]:null}function va(a,b){a=Ia(a,"bVisible");b=l.inArray(b,a);return-1!==b?b:null}function oa(a){var b=0;l.each(a.aoColumns,function(c,d){d.bVisible&&"none"!==l(d.nTh).css("display")&&b++});return b}function Ia(a,b){var c=[];l.map(a.aoColumns,function(d,e){d[b]&&c.push(e)});return c}function Za(a){var b=a.aoColumns,c=a.aoData,d=u.ext.type.detect,e,h,f;var g=0;for(e=b.length;g<e;g++){var k=b[g];var m=[];if(!k.sType&&k._sManualType)k.sType=k._sManualType;else if(!k.sType){var n=
-0;for(h=d.length;n<h;n++){var p=0;for(f=c.length;p<f;p++){m[p]===q&&(m[p]=T(a,p,g,"type"));var t=d[n](m[p],a);if(!t&&n!==d.length-1)break;if("html"===t&&!Z(m[p]))break}if(t){k.sType=t;break}}k.sType||(k.sType="string")}}}function Db(a,b,c,d){var e,h,f,g=a.aoColumns;if(b)for(e=b.length-1;0<=e;e--){var k=b[e];var m=k.targets!==q?k.targets:k.aTargets;Array.isArray(m)||(m=[m]);var n=0;for(h=m.length;n<h;n++)if("number"===typeof m[n]&&0<=m[n]){for(;g.length<=m[n];)Xa(a);d(m[n],k)}else if("number"===typeof m[n]&&
-0>m[n])d(g.length+m[n],k);else if("string"===typeof m[n]){var p=0;for(f=g.length;p<f;p++)("_all"==m[n]||l(g[p].nTh).hasClass(m[n]))&&d(p,k)}}if(c)for(e=0,a=c.length;e<a;e++)d(e,c[e])}function ia(a,b,c,d){var e=a.aoData.length,h=l.extend(!0,{},u.models.oRow,{src:c?"dom":"data",idx:e});h._aData=b;a.aoData.push(h);for(var f=a.aoColumns,g=0,k=f.length;g<k;g++)f[g].sType=null;a.aiDisplayMaster.push(e);b=a.rowIdFn(b);b!==q&&(a.aIds[b]=h);!c&&a.oFeatures.bDeferRender||$a(a,e,c,d);return e}function Ja(a,
-b){var c;b instanceof l||(b=l(b));return b.map(function(d,e){c=ab(a,e);return ia(a,c.data,e,c.cells)})}function T(a,b,c,d){"search"===d?d="filter":"order"===d&&(d="sort");var e=a.iDraw,h=a.aoColumns[c],f=a.aoData[b]._aData,g=h.sDefaultContent,k=h.fnGetData(f,d,{settings:a,row:b,col:c});if(k===q)return a.iDrawError!=e&&null===g&&(da(a,0,"Requested unknown parameter "+("function"==typeof h.mData?"{function}":"'"+h.mData+"'")+" for row "+b+", column "+c,4),a.iDrawError=e),g;if((k===f||null===k)&&null!==
-g&&d!==q)k=g;else if("function"===typeof k)return k.call(f);if(null===k&&"display"===d)return"";"filter"===d&&(a=u.ext.type.search,a[h.sType]&&(k=a[h.sType](k)));return k}function Eb(a,b,c,d){a.aoColumns[c].fnSetData(a.aoData[b]._aData,d,{settings:a,row:b,col:c})}function bb(a){return l.map(a.match(/(\\.|[^\.])+/g)||[""],function(b){return b.replace(/\\\./g,".")})}function cb(a){return U(a.aoData,"_aData")}function Ka(a){a.aoData.length=0;a.aiDisplayMaster.length=0;a.aiDisplay.length=0;a.aIds={}}
-function La(a,b,c){for(var d=-1,e=0,h=a.length;e<h;e++)a[e]==b?d=e:a[e]>b&&a[e]--; -1!=d&&c===q&&a.splice(d,1)}function wa(a,b,c,d){var e=a.aoData[b],h,f=function(k,m){for(;k.childNodes.length;)k.removeChild(k.firstChild);k.innerHTML=T(a,b,m,"display")};if("dom"!==c&&(c&&"auto"!==c||"dom"!==e.src)){var g=e.anCells;if(g)if(d!==q)f(g[d],d);else for(c=0,h=g.length;c<h;c++)f(g[c],c)}else e._aData=ab(a,e,d,d===q?q:e._aData).data;e._aSortData=null;e._aFilterData=null;f=a.aoColumns;if(d!==q)f[d].sType=null;
-else{c=0;for(h=f.length;c<h;c++)f[c].sType=null;db(a,e)}}function ab(a,b,c,d){var e=[],h=b.firstChild,f,g=0,k,m=a.aoColumns,n=a._rowReadObject;d=d!==q?d:n?{}:[];var p=function(x,w){if("string"===typeof x){var r=x.indexOf("@");-1!==r&&(r=x.substring(r+1),ha(x)(d,w.getAttribute(r)))}},t=function(x){if(c===q||c===g)f=m[g],k=x.innerHTML.trim(),f&&f._bAttrSrc?(ha(f.mData._)(d,k),p(f.mData.sort,x),p(f.mData.type,x),p(f.mData.filter,x)):n?(f._setter||(f._setter=ha(f.mData)),f._setter(d,k)):d[g]=k;g++};if(h)for(;h;){var v=
-h.nodeName.toUpperCase();if("TD"==v||"TH"==v)t(h),e.push(h);h=h.nextSibling}else for(e=b.anCells,h=0,v=e.length;h<v;h++)t(e[h]);(b=b.firstChild?b:b.nTr)&&(b=b.getAttribute("id"))&&ha(a.rowId)(d,b);return{data:d,cells:e}}function $a(a,b,c,d){var e=a.aoData[b],h=e._aData,f=[],g,k;if(null===e.nTr){var m=c||A.createElement("tr");e.nTr=m;e.anCells=f;m._DT_RowIndex=b;db(a,e);var n=0;for(g=a.aoColumns.length;n<g;n++){var p=a.aoColumns[n];e=(k=c?!1:!0)?A.createElement(p.sCellType):d[n];e._DT_CellIndex={row:b,
-column:n};f.push(e);if(k||!(!p.mRender&&p.mData===n||l.isPlainObject(p.mData)&&p.mData._===n+".display"))e.innerHTML=T(a,b,n,"display");p.sClass&&(e.className+=" "+p.sClass);p.bVisible&&!c?m.appendChild(e):!p.bVisible&&c&&e.parentNode.removeChild(e);p.fnCreatedCell&&p.fnCreatedCell.call(a.oInstance,e,T(a,b,n),h,b,n)}F(a,"aoRowCreatedCallback",null,[m,h,b,f])}}function db(a,b){var c=b.nTr,d=b._aData;if(c){if(a=a.rowIdFn(d))c.id=a;d.DT_RowClass&&(a=d.DT_RowClass.split(" "),b.__rowc=b.__rowc?Ma(b.__rowc.concat(a)):
-a,l(c).removeClass(b.__rowc.join(" ")).addClass(d.DT_RowClass));d.DT_RowAttr&&l(c).attr(d.DT_RowAttr);d.DT_RowData&&l(c).data(d.DT_RowData)}}function Fb(a){var b,c,d=a.nTHead,e=a.nTFoot,h=0===l("th, td",d).length,f=a.oClasses,g=a.aoColumns;h&&(c=l("<tr/>").appendTo(d));var k=0;for(b=g.length;k<b;k++){var m=g[k];var n=l(m.nTh).addClass(m.sClass);h&&n.appendTo(c);a.oFeatures.bSort&&(n.addClass(m.sSortingClass),!1!==m.bSortable&&(n.attr("tabindex",a.iTabIndex).attr("aria-controls",a.sTableId),eb(a,m.nTh,
-k)));m.sTitle!=n[0].innerHTML&&n.html(m.sTitle);fb(a,"header")(a,n,m,f)}h&&xa(a.aoHeader,d);l(d).children("tr").children("th, td").addClass(f.sHeaderTH);l(e).children("tr").children("th, td").addClass(f.sFooterTH);if(null!==e)for(a=a.aoFooter[0],k=0,b=a.length;k<b;k++)m=g[k],m.nTf=a[k].cell,m.sClass&&l(m.nTf).addClass(m.sClass)}function ya(a,b,c){var d,e,h=[],f=[],g=a.aoColumns.length;if(b){c===q&&(c=!1);var k=0;for(d=b.length;k<d;k++){h[k]=b[k].slice();h[k].nTr=b[k].nTr;for(e=g-1;0<=e;e--)a.aoColumns[e].bVisible||
-c||h[k].splice(e,1);f.push([])}k=0;for(d=h.length;k<d;k++){if(a=h[k].nTr)for(;e=a.firstChild;)a.removeChild(e);e=0;for(b=h[k].length;e<b;e++){var m=g=1;if(f[k][e]===q){a.appendChild(h[k][e].cell);for(f[k][e]=1;h[k+g]!==q&&h[k][e].cell==h[k+g][e].cell;)f[k+g][e]=1,g++;for(;h[k][e+m]!==q&&h[k][e].cell==h[k][e+m].cell;){for(c=0;c<g;c++)f[k+c][e+m]=1;m++}l(h[k][e].cell).attr("rowspan",g).attr("colspan",m)}}}}}function ja(a,b){var c=F(a,"aoPreDrawCallback","preDraw",[a]);if(-1!==l.inArray(!1,c))V(a,!1);
-else{c=[];var d=0,e=a.asStripeClasses,h=e.length,f=a.oLanguage,g=a.iInitDisplayStart,k="ssp"==Q(a),m=a.aiDisplay;a.bDrawing=!0;g!==q&&-1!==g&&(a._iDisplayStart=k?g:g>=a.fnRecordsDisplay()?0:g,a.iInitDisplayStart=-1);g=a._iDisplayStart;var n=a.fnDisplayEnd();if(a.bDeferLoading)a.bDeferLoading=!1,a.iDraw++,V(a,!1);else if(!k)a.iDraw++;else if(!a.bDestroying&&!b){Gb(a);return}if(0!==m.length)for(b=k?a.aoData.length:n,f=k?0:g;f<b;f++){k=m[f];var p=a.aoData[k];null===p.nTr&&$a(a,k);var t=p.nTr;if(0!==
-h){var v=e[d%h];p._sRowStripe!=v&&(l(t).removeClass(p._sRowStripe).addClass(v),p._sRowStripe=v)}F(a,"aoRowCallback",null,[t,p._aData,d,f,k]);c.push(t);d++}else d=f.sZeroRecords,1==a.iDraw&&"ajax"==Q(a)?d=f.sLoadingRecords:f.sEmptyTable&&0===a.fnRecordsTotal()&&(d=f.sEmptyTable),c[0]=l("<tr/>",{"class":h?e[0]:""}).append(l("<td />",{valign:"top",colSpan:oa(a),"class":a.oClasses.sRowEmpty}).html(d))[0];F(a,"aoHeaderCallback","header",[l(a.nTHead).children("tr")[0],cb(a),g,n,m]);F(a,"aoFooterCallback",
-"footer",[l(a.nTFoot).children("tr")[0],cb(a),g,n,m]);e=l(a.nTBody);e.children().detach();e.append(l(c));F(a,"aoDrawCallback","draw",[a]);a.bSorted=!1;a.bFiltered=!1;a.bDrawing=!1}}function ka(a,b){var c=a.oFeatures,d=c.bFilter;c.bSort&&Hb(a);d?za(a,a.oPreviousSearch):a.aiDisplay=a.aiDisplayMaster.slice();!0!==b&&(a._iDisplayStart=0);a._drawHold=b;ja(a);a._drawHold=!1}function Ib(a){var b=a.oClasses,c=l(a.nTable);c=l("<div/>").insertBefore(c);var d=a.oFeatures,e=l("<div/>",{id:a.sTableId+"_wrapper",
-"class":b.sWrapper+(a.nTFoot?"":" "+b.sNoFooter)});a.nHolding=c[0];a.nTableWrapper=e[0];a.nTableReinsertBefore=a.nTable.nextSibling;for(var h=a.sDom.split(""),f,g,k,m,n,p,t=0;t<h.length;t++){f=null;g=h[t];if("<"==g){k=l("<div/>")[0];m=h[t+1];if("'"==m||'"'==m){n="";for(p=2;h[t+p]!=m;)n+=h[t+p],p++;"H"==n?n=b.sJUIHeader:"F"==n&&(n=b.sJUIFooter);-1!=n.indexOf(".")?(m=n.split("."),k.id=m[0].substr(1,m[0].length-1),k.className=m[1]):"#"==n.charAt(0)?k.id=n.substr(1,n.length-1):k.className=n;t+=p}e.append(k);
-e=l(k)}else if(">"==g)e=e.parent();else if("l"==g&&d.bPaginate&&d.bLengthChange)f=Jb(a);else if("f"==g&&d.bFilter)f=Kb(a);else if("r"==g&&d.bProcessing)f=Lb(a);else if("t"==g)f=Mb(a);else if("i"==g&&d.bInfo)f=Nb(a);else if("p"==g&&d.bPaginate)f=Ob(a);else if(0!==u.ext.feature.length)for(k=u.ext.feature,p=0,m=k.length;p<m;p++)if(g==k[p].cFeature){f=k[p].fnInit(a);break}f&&(k=a.aanFeatures,k[g]||(k[g]=[]),k[g].push(f),e.append(f))}c.replaceWith(e);a.nHolding=null}function xa(a,b){b=l(b).children("tr");
-var c,d,e;a.splice(0,a.length);var h=0;for(e=b.length;h<e;h++)a.push([]);h=0;for(e=b.length;h<e;h++){var f=b[h];for(c=f.firstChild;c;){if("TD"==c.nodeName.toUpperCase()||"TH"==c.nodeName.toUpperCase()){var g=1*c.getAttribute("colspan");var k=1*c.getAttribute("rowspan");g=g&&0!==g&&1!==g?g:1;k=k&&0!==k&&1!==k?k:1;var m=0;for(d=a[h];d[m];)m++;var n=m;var p=1===g?!0:!1;for(d=0;d<g;d++)for(m=0;m<k;m++)a[h+m][n+d]={cell:c,unique:p},a[h+m].nTr=f}c=c.nextSibling}}}function Na(a,b,c){var d=[];c||(c=a.aoHeader,
-b&&(c=[],xa(c,b)));b=0;for(var e=c.length;b<e;b++)for(var h=0,f=c[b].length;h<f;h++)!c[b][h].unique||d[h]&&a.bSortCellsTop||(d[h]=c[b][h].cell);return d}function Oa(a,b,c){F(a,"aoServerParams","serverParams",[b]);if(b&&Array.isArray(b)){var d={},e=/(.*?)\[\]$/;l.each(b,function(n,p){(n=p.name.match(e))?(n=n[0],d[n]||(d[n]=[]),d[n].push(p.value)):d[p.name]=p.value});b=d}var h=a.ajax,f=a.oInstance,g=function(n){var p=a.jqXhr?a.jqXhr.status:null;if(null===n||"number"===typeof p&&204==p)n={},Aa(a,n,[]);
-(p=n.error||n.sError)&&da(a,0,p);a.json=n;F(a,null,"xhr",[a,n,a.jqXHR]);c(n)};if(l.isPlainObject(h)&&h.data){var k=h.data;var m="function"===typeof k?k(b,a):k;b="function"===typeof k&&m?m:l.extend(!0,b,m);delete h.data}m={data:b,success:g,dataType:"json",cache:!1,type:a.sServerMethod,error:function(n,p,t){t=F(a,null,"xhr",[a,null,a.jqXHR]);-1===l.inArray(!0,t)&&("parsererror"==p?da(a,0,"Invalid JSON response",1):4===n.readyState&&da(a,0,"Ajax error",7));V(a,!1)}};a.oAjaxData=b;F(a,null,"preXhr",[a,
-b]);a.fnServerData?a.fnServerData.call(f,a.sAjaxSource,l.map(b,function(n,p){return{name:p,value:n}}),g,a):a.sAjaxSource||"string"===typeof h?a.jqXHR=l.ajax(l.extend(m,{url:h||a.sAjaxSource})):"function"===typeof h?a.jqXHR=h.call(f,b,g,a):(a.jqXHR=l.ajax(l.extend(m,h)),h.data=k)}function Gb(a){a.iDraw++;V(a,!0);Oa(a,Pb(a),function(b){Qb(a,b)})}function Pb(a){var b=a.aoColumns,c=b.length,d=a.oFeatures,e=a.oPreviousSearch,h=a.aoPreSearchCols,f=[],g=pa(a);var k=a._iDisplayStart;var m=!1!==d.bPaginate?
-a._iDisplayLength:-1;var n=function(x,w){f.push({name:x,value:w})};n("sEcho",a.iDraw);n("iColumns",c);n("sColumns",U(b,"sName").join(","));n("iDisplayStart",k);n("iDisplayLength",m);var p={draw:a.iDraw,columns:[],order:[],start:k,length:m,search:{value:e.sSearch,regex:e.bRegex}};for(k=0;k<c;k++){var t=b[k];var v=h[k];m="function"==typeof t.mData?"function":t.mData;p.columns.push({data:m,name:t.sName,searchable:t.bSearchable,orderable:t.bSortable,search:{value:v.sSearch,regex:v.bRegex}});n("mDataProp_"+
-k,m);d.bFilter&&(n("sSearch_"+k,v.sSearch),n("bRegex_"+k,v.bRegex),n("bSearchable_"+k,t.bSearchable));d.bSort&&n("bSortable_"+k,t.bSortable)}d.bFilter&&(n("sSearch",e.sSearch),n("bRegex",e.bRegex));d.bSort&&(l.each(g,function(x,w){p.order.push({column:w.col,dir:w.dir});n("iSortCol_"+x,w.col);n("sSortDir_"+x,w.dir)}),n("iSortingCols",g.length));b=u.ext.legacy.ajax;return null===b?a.sAjaxSource?f:p:b?f:p}function Qb(a,b){var c=function(f,g){return b[f]!==q?b[f]:b[g]},d=Aa(a,b),e=c("sEcho","draw"),h=
-c("iTotalRecords","recordsTotal");c=c("iTotalDisplayRecords","recordsFiltered");if(e!==q){if(1*e<a.iDraw)return;a.iDraw=1*e}d||(d=[]);Ka(a);a._iRecordsTotal=parseInt(h,10);a._iRecordsDisplay=parseInt(c,10);e=0;for(h=d.length;e<h;e++)ia(a,d[e]);a.aiDisplay=a.aiDisplayMaster.slice();ja(a,!0);a._bInitComplete||Pa(a,b);V(a,!1)}function Aa(a,b,c){a=l.isPlainObject(a.ajax)&&a.ajax.dataSrc!==q?a.ajax.dataSrc:a.sAjaxDataProp;if(!c)return"data"===a?b.aaData||b[a]:""!==a?na(a)(b):b;ha(a)(b,c)}function Kb(a){var b=
-a.oClasses,c=a.sTableId,d=a.oLanguage,e=a.oPreviousSearch,h=a.aanFeatures,f='<input type="search" class="'+b.sFilterInput+'"/>',g=d.sSearch;g=g.match(/_INPUT_/)?g.replace("_INPUT_",f):g+f;b=l("<div/>",{id:h.f?null:c+"_filter","class":b.sFilter}).append(l("<label/>").append(g));var k=function(n){var p=this.value?this.value:"";e.return&&"Enter"!==n.key||p==e.sSearch||(za(a,{sSearch:p,bRegex:e.bRegex,bSmart:e.bSmart,bCaseInsensitive:e.bCaseInsensitive,"return":e.return}),a._iDisplayStart=0,ja(a))};h=
-null!==a.searchDelay?a.searchDelay:"ssp"===Q(a)?400:0;var m=l("input",b).val(e.sSearch).attr("placeholder",d.sSearchPlaceholder).on("keyup.DT search.DT input.DT paste.DT cut.DT",h?gb(k,h):k).on("mouseup",function(n){setTimeout(function(){k.call(m[0],n)},10)}).on("keypress.DT",function(n){if(13==n.keyCode)return!1}).attr("aria-controls",c);l(a.nTable).on("search.dt.DT",function(n,p){if(a===p)try{m[0]!==A.activeElement&&m.val(e.sSearch)}catch(t){}});return b[0]}function za(a,b,c){var d=a.oPreviousSearch,
-e=a.aoPreSearchCols,h=function(g){d.sSearch=g.sSearch;d.bRegex=g.bRegex;d.bSmart=g.bSmart;d.bCaseInsensitive=g.bCaseInsensitive;d.return=g.return},f=function(g){return g.bEscapeRegex!==q?!g.bEscapeRegex:g.bRegex};Za(a);if("ssp"!=Q(a)){Rb(a,b.sSearch,c,f(b),b.bSmart,b.bCaseInsensitive,b.return);h(b);for(b=0;b<e.length;b++)Sb(a,e[b].sSearch,b,f(e[b]),e[b].bSmart,e[b].bCaseInsensitive);Tb(a)}else h(b);a.bFiltered=!0;F(a,null,"search",[a])}function Tb(a){for(var b=u.ext.search,c=a.aiDisplay,d,e,h=0,f=
-b.length;h<f;h++){for(var g=[],k=0,m=c.length;k<m;k++)e=c[k],d=a.aoData[e],b[h](a,d._aFilterData,e,d._aData,k)&&g.push(e);c.length=0;l.merge(c,g)}}function Sb(a,b,c,d,e,h){if(""!==b){var f=[],g=a.aiDisplay;d=hb(b,d,e,h);for(e=0;e<g.length;e++)b=a.aoData[g[e]]._aFilterData[c],d.test(b)&&f.push(g[e]);a.aiDisplay=f}}function Rb(a,b,c,d,e,h){e=hb(b,d,e,h);var f=a.oPreviousSearch.sSearch,g=a.aiDisplayMaster;h=[];0!==u.ext.search.length&&(c=!0);var k=Ub(a);if(0>=b.length)a.aiDisplay=g.slice();else{if(k||
-c||d||f.length>b.length||0!==b.indexOf(f)||a.bSorted)a.aiDisplay=g.slice();b=a.aiDisplay;for(c=0;c<b.length;c++)e.test(a.aoData[b[c]]._sFilterRow)&&h.push(b[c]);a.aiDisplay=h}}function hb(a,b,c,d){a=b?a:ib(a);c&&(a="^(?=.*?"+l.map(a.match(/"[^"]+"|[^ ]+/g)||[""],function(e){if('"'===e.charAt(0)){var h=e.match(/^"(.*)"$/);e=h?h[1]:e}return e.replace('"',"")}).join(")(?=.*?")+").*$");return new RegExp(a,d?"i":"")}function Ub(a){var b=a.aoColumns,c,d;var e=!1;var h=0;for(c=a.aoData.length;h<c;h++){var f=
-a.aoData[h];if(!f._aFilterData){var g=[];e=0;for(d=b.length;e<d;e++){var k=b[e];k.bSearchable?(k=T(a,h,e,"filter"),null===k&&(k=""),"string"!==typeof k&&k.toString&&(k=k.toString())):k="";k.indexOf&&-1!==k.indexOf("&")&&(Qa.innerHTML=k,k=sc?Qa.textContent:Qa.innerText);k.replace&&(k=k.replace(/[\r\n\u2028]/g,""));g.push(k)}f._aFilterData=g;f._sFilterRow=g.join("  ");e=!0}}return e}function Vb(a){return{search:a.sSearch,smart:a.bSmart,regex:a.bRegex,caseInsensitive:a.bCaseInsensitive}}function Wb(a){return{sSearch:a.search,
-bSmart:a.smart,bRegex:a.regex,bCaseInsensitive:a.caseInsensitive}}function Nb(a){var b=a.sTableId,c=a.aanFeatures.i,d=l("<div/>",{"class":a.oClasses.sInfo,id:c?null:b+"_info"});c||(a.aoDrawCallback.push({fn:Xb,sName:"information"}),d.attr("role","status").attr("aria-live","polite"),l(a.nTable).attr("aria-describedby",b+"_info"));return d[0]}function Xb(a){var b=a.aanFeatures.i;if(0!==b.length){var c=a.oLanguage,d=a._iDisplayStart+1,e=a.fnDisplayEnd(),h=a.fnRecordsTotal(),f=a.fnRecordsDisplay(),g=
-f?c.sInfo:c.sInfoEmpty;f!==h&&(g+=" "+c.sInfoFiltered);g+=c.sInfoPostFix;g=Yb(a,g);c=c.fnInfoCallback;null!==c&&(g=c.call(a.oInstance,a,d,e,h,f,g));l(b).html(g)}}function Yb(a,b){var c=a.fnFormatNumber,d=a._iDisplayStart+1,e=a._iDisplayLength,h=a.fnRecordsDisplay(),f=-1===e;return b.replace(/_START_/g,c.call(a,d)).replace(/_END_/g,c.call(a,a.fnDisplayEnd())).replace(/_MAX_/g,c.call(a,a.fnRecordsTotal())).replace(/_TOTAL_/g,c.call(a,h)).replace(/_PAGE_/g,c.call(a,f?1:Math.ceil(d/e))).replace(/_PAGES_/g,
-c.call(a,f?1:Math.ceil(h/e)))}function Ba(a){var b=a.iInitDisplayStart,c=a.aoColumns;var d=a.oFeatures;var e=a.bDeferLoading;if(a.bInitialised){Ib(a);Fb(a);ya(a,a.aoHeader);ya(a,a.aoFooter);V(a,!0);d.bAutoWidth&&Ya(a);var h=0;for(d=c.length;h<d;h++){var f=c[h];f.sWidth&&(f.nTh.style.width=K(f.sWidth))}F(a,null,"preInit",[a]);ka(a);c=Q(a);if("ssp"!=c||e)"ajax"==c?Oa(a,[],function(g){var k=Aa(a,g);for(h=0;h<k.length;h++)ia(a,k[h]);a.iInitDisplayStart=b;ka(a);V(a,!1);Pa(a,g)},a):(V(a,!1),Pa(a))}else setTimeout(function(){Ba(a)},
-200)}function Pa(a,b){a._bInitComplete=!0;(b||a.oInit.aaData)&&ta(a);F(a,null,"plugin-init",[a,b]);F(a,"aoInitComplete","init",[a,b])}function jb(a,b){b=parseInt(b,10);a._iDisplayLength=b;kb(a);F(a,null,"length",[a,b])}function Jb(a){var b=a.oClasses,c=a.sTableId,d=a.aLengthMenu,e=Array.isArray(d[0]),h=e?d[0]:d;d=e?d[1]:d;e=l("<select/>",{name:c+"_length","aria-controls":c,"class":b.sLengthSelect});for(var f=0,g=h.length;f<g;f++)e[0][f]=new Option("number"===typeof d[f]?a.fnFormatNumber(d[f]):d[f],
-h[f]);var k=l("<div><label/></div>").addClass(b.sLength);a.aanFeatures.l||(k[0].id=c+"_length");k.children().append(a.oLanguage.sLengthMenu.replace("_MENU_",e[0].outerHTML));l("select",k).val(a._iDisplayLength).on("change.DT",function(m){jb(a,l(this).val());ja(a)});l(a.nTable).on("length.dt.DT",function(m,n,p){a===n&&l("select",k).val(p)});return k[0]}function Ob(a){var b=a.sPaginationType,c=u.ext.pager[b],d="function"===typeof c,e=function(f){ja(f)};b=l("<div/>").addClass(a.oClasses.sPaging+b)[0];
-var h=a.aanFeatures;d||c.fnInit(a,b,e);h.p||(b.id=a.sTableId+"_paginate",a.aoDrawCallback.push({fn:function(f){if(d){var g=f._iDisplayStart,k=f._iDisplayLength,m=f.fnRecordsDisplay(),n=-1===k;g=n?0:Math.ceil(g/k);k=n?1:Math.ceil(m/k);m=c(g,k);var p;n=0;for(p=h.p.length;n<p;n++)fb(f,"pageButton")(f,h.p[n],n,m,g,k)}else c.fnUpdate(f,e)},sName:"pagination"}));return b}function lb(a,b,c){var d=a._iDisplayStart,e=a._iDisplayLength,h=a.fnRecordsDisplay();0===h||-1===e?d=0:"number"===typeof b?(d=b*e,d>h&&
-(d=0)):"first"==b?d=0:"previous"==b?(d=0<=e?d-e:0,0>d&&(d=0)):"next"==b?d+e<h&&(d+=e):"last"==b?d=Math.floor((h-1)/e)*e:da(a,0,"Unknown paging action: "+b,5);b=a._iDisplayStart!==d;a._iDisplayStart=d;b&&(F(a,null,"page",[a]),c&&ja(a));return b}function Lb(a){return l("<div/>",{id:a.aanFeatures.r?null:a.sTableId+"_processing","class":a.oClasses.sProcessing}).html(a.oLanguage.sProcessing).insertBefore(a.nTable)[0]}function V(a,b){a.oFeatures.bProcessing&&l(a.aanFeatures.r).css("display",b?"block":"none");
-F(a,null,"processing",[a,b])}function Mb(a){var b=l(a.nTable),c=a.oScroll;if(""===c.sX&&""===c.sY)return a.nTable;var d=c.sX,e=c.sY,h=a.oClasses,f=b.children("caption"),g=f.length?f[0]._captionSide:null,k=l(b[0].cloneNode(!1)),m=l(b[0].cloneNode(!1)),n=b.children("tfoot");n.length||(n=null);k=l("<div/>",{"class":h.sScrollWrapper}).append(l("<div/>",{"class":h.sScrollHead}).css({overflow:"hidden",position:"relative",border:0,width:d?d?K(d):null:"100%"}).append(l("<div/>",{"class":h.sScrollHeadInner}).css({"box-sizing":"content-box",
-width:c.sXInner||"100%"}).append(k.removeAttr("id").css("margin-left",0).append("top"===g?f:null).append(b.children("thead"))))).append(l("<div/>",{"class":h.sScrollBody}).css({position:"relative",overflow:"auto",width:d?K(d):null}).append(b));n&&k.append(l("<div/>",{"class":h.sScrollFoot}).css({overflow:"hidden",border:0,width:d?d?K(d):null:"100%"}).append(l("<div/>",{"class":h.sScrollFootInner}).append(m.removeAttr("id").css("margin-left",0).append("bottom"===g?f:null).append(b.children("tfoot")))));
-b=k.children();var p=b[0];h=b[1];var t=n?b[2]:null;if(d)l(h).on("scroll.DT",function(v){v=this.scrollLeft;p.scrollLeft=v;n&&(t.scrollLeft=v)});l(h).css("max-height",e);c.bCollapse||l(h).css("height",e);a.nScrollHead=p;a.nScrollBody=h;a.nScrollFoot=t;a.aoDrawCallback.push({fn:Ha,sName:"scrolling"});return k[0]}function Ha(a){var b=a.oScroll,c=b.sX,d=b.sXInner,e=b.sY;b=b.iBarWidth;var h=l(a.nScrollHead),f=h[0].style,g=h.children("div"),k=g[0].style,m=g.children("table");g=a.nScrollBody;var n=l(g),p=
-g.style,t=l(a.nScrollFoot).children("div"),v=t.children("table"),x=l(a.nTHead),w=l(a.nTable),r=w[0],C=r.style,G=a.nTFoot?l(a.nTFoot):null,aa=a.oBrowser,L=aa.bScrollOversize;U(a.aoColumns,"nTh");var O=[],I=[],H=[],ea=[],Y,Ca=function(D){D=D.style;D.paddingTop="0";D.paddingBottom="0";D.borderTopWidth="0";D.borderBottomWidth="0";D.height=0};var fa=g.scrollHeight>g.clientHeight;if(a.scrollBarVis!==fa&&a.scrollBarVis!==q)a.scrollBarVis=fa,ta(a);else{a.scrollBarVis=fa;w.children("thead, tfoot").remove();
-if(G){var ba=G.clone().prependTo(w);var la=G.find("tr");ba=ba.find("tr")}var mb=x.clone().prependTo(w);x=x.find("tr");fa=mb.find("tr");mb.find("th, td").removeAttr("tabindex");c||(p.width="100%",h[0].style.width="100%");l.each(Na(a,mb),function(D,W){Y=ua(a,D);W.style.width=a.aoColumns[Y].sWidth});G&&ca(function(D){D.style.width=""},ba);h=w.outerWidth();""===c?(C.width="100%",L&&(w.find("tbody").height()>g.offsetHeight||"scroll"==n.css("overflow-y"))&&(C.width=K(w.outerWidth()-b)),h=w.outerWidth()):
-""!==d&&(C.width=K(d),h=w.outerWidth());ca(Ca,fa);ca(function(D){var W=z.getComputedStyle?z.getComputedStyle(D).width:K(l(D).width());H.push(D.innerHTML);O.push(W)},fa);ca(function(D,W){D.style.width=O[W]},x);l(fa).height(0);G&&(ca(Ca,ba),ca(function(D){ea.push(D.innerHTML);I.push(K(l(D).css("width")))},ba),ca(function(D,W){D.style.width=I[W]},la),l(ba).height(0));ca(function(D,W){D.innerHTML='<div class="dataTables_sizing">'+H[W]+"</div>";D.childNodes[0].style.height="0";D.childNodes[0].style.overflow=
-"hidden";D.style.width=O[W]},fa);G&&ca(function(D,W){D.innerHTML='<div class="dataTables_sizing">'+ea[W]+"</div>";D.childNodes[0].style.height="0";D.childNodes[0].style.overflow="hidden";D.style.width=I[W]},ba);w.outerWidth()<h?(la=g.scrollHeight>g.offsetHeight||"scroll"==n.css("overflow-y")?h+b:h,L&&(g.scrollHeight>g.offsetHeight||"scroll"==n.css("overflow-y"))&&(C.width=K(la-b)),""!==c&&""===d||da(a,1,"Possible column misalignment",6)):la="100%";p.width=K(la);f.width=K(la);G&&(a.nScrollFoot.style.width=
-K(la));!e&&L&&(p.height=K(r.offsetHeight+b));c=w.outerWidth();m[0].style.width=K(c);k.width=K(c);d=w.height()>g.clientHeight||"scroll"==n.css("overflow-y");e="padding"+(aa.bScrollbarLeft?"Left":"Right");k[e]=d?b+"px":"0px";G&&(v[0].style.width=K(c),t[0].style.width=K(c),t[0].style[e]=d?b+"px":"0px");w.children("colgroup").insertBefore(w.children("thead"));n.trigger("scroll");!a.bSorted&&!a.bFiltered||a._drawHold||(g.scrollTop=0)}}function ca(a,b,c){for(var d=0,e=0,h=b.length,f,g;e<h;){f=b[e].firstChild;
-for(g=c?c[e].firstChild:null;f;)1===f.nodeType&&(c?a(f,g,d):a(f,d),d++),f=f.nextSibling,g=c?g.nextSibling:null;e++}}function Ya(a){var b=a.nTable,c=a.aoColumns,d=a.oScroll,e=d.sY,h=d.sX,f=d.sXInner,g=c.length,k=Ia(a,"bVisible"),m=l("th",a.nTHead),n=b.getAttribute("width"),p=b.parentNode,t=!1,v,x=a.oBrowser;d=x.bScrollOversize;(v=b.style.width)&&-1!==v.indexOf("%")&&(n=v);for(v=0;v<k.length;v++){var w=c[k[v]];null!==w.sWidth&&(w.sWidth=Zb(w.sWidthOrig,p),t=!0)}if(d||!t&&!h&&!e&&g==oa(a)&&g==m.length)for(v=
-0;v<g;v++)k=ua(a,v),null!==k&&(c[k].sWidth=K(m.eq(v).width()));else{g=l(b).clone().css("visibility","hidden").removeAttr("id");g.find("tbody tr").remove();var r=l("<tr/>").appendTo(g.find("tbody"));g.find("thead, tfoot").remove();g.append(l(a.nTHead).clone()).append(l(a.nTFoot).clone());g.find("tfoot th, tfoot td").css("width","");m=Na(a,g.find("thead")[0]);for(v=0;v<k.length;v++)w=c[k[v]],m[v].style.width=null!==w.sWidthOrig&&""!==w.sWidthOrig?K(w.sWidthOrig):"",w.sWidthOrig&&h&&l(m[v]).append(l("<div/>").css({width:w.sWidthOrig,
-margin:0,padding:0,border:0,height:1}));if(a.aoData.length)for(v=0;v<k.length;v++)t=k[v],w=c[t],l($b(a,t)).clone(!1).append(w.sContentPadding).appendTo(r);l("[name]",g).removeAttr("name");w=l("<div/>").css(h||e?{position:"absolute",top:0,left:0,height:1,right:0,overflow:"hidden"}:{}).append(g).appendTo(p);h&&f?g.width(f):h?(g.css("width","auto"),g.removeAttr("width"),g.width()<p.clientWidth&&n&&g.width(p.clientWidth)):e?g.width(p.clientWidth):n&&g.width(n);for(v=e=0;v<k.length;v++)p=l(m[v]),f=p.outerWidth()-
-p.width(),p=x.bBounding?Math.ceil(m[v].getBoundingClientRect().width):p.outerWidth(),e+=p,c[k[v]].sWidth=K(p-f);b.style.width=K(e);w.remove()}n&&(b.style.width=K(n));!n&&!h||a._reszEvt||(b=function(){l(z).on("resize.DT-"+a.sInstance,gb(function(){ta(a)}))},d?setTimeout(b,1E3):b(),a._reszEvt=!0)}function Zb(a,b){if(!a)return 0;a=l("<div/>").css("width",K(a)).appendTo(b||A.body);b=a[0].offsetWidth;a.remove();return b}function $b(a,b){var c=ac(a,b);if(0>c)return null;var d=a.aoData[c];return d.nTr?d.anCells[b]:
-l("<td/>").html(T(a,c,b,"display"))[0]}function ac(a,b){for(var c,d=-1,e=-1,h=0,f=a.aoData.length;h<f;h++)c=T(a,h,b,"display")+"",c=c.replace(tc,""),c=c.replace(/&nbsp;/g," "),c.length>d&&(d=c.length,e=h);return e}function K(a){return null===a?"0px":"number"==typeof a?0>a?"0px":a+"px":a.match(/\d$/)?a+"px":a}function pa(a){var b=[],c=a.aoColumns;var d=a.aaSortingFixed;var e=l.isPlainObject(d);var h=[];var f=function(n){n.length&&!Array.isArray(n[0])?h.push(n):l.merge(h,n)};Array.isArray(d)&&f(d);
-e&&d.pre&&f(d.pre);f(a.aaSorting);e&&d.post&&f(d.post);for(a=0;a<h.length;a++){var g=h[a][0];f=c[g].aDataSort;d=0;for(e=f.length;d<e;d++){var k=f[d];var m=c[k].sType||"string";h[a]._idx===q&&(h[a]._idx=l.inArray(h[a][1],c[k].asSorting));b.push({src:g,col:k,dir:h[a][1],index:h[a]._idx,type:m,formatter:u.ext.type.order[m+"-pre"]})}}return b}function Hb(a){var b,c=[],d=u.ext.type.order,e=a.aoData,h=0,f=a.aiDisplayMaster;Za(a);var g=pa(a);var k=0;for(b=g.length;k<b;k++){var m=g[k];m.formatter&&h++;bc(a,
-m.col)}if("ssp"!=Q(a)&&0!==g.length){k=0;for(b=f.length;k<b;k++)c[f[k]]=k;h===g.length?f.sort(function(n,p){var t,v=g.length,x=e[n]._aSortData,w=e[p]._aSortData;for(t=0;t<v;t++){var r=g[t];var C=x[r.col];var G=w[r.col];C=C<G?-1:C>G?1:0;if(0!==C)return"asc"===r.dir?C:-C}C=c[n];G=c[p];return C<G?-1:C>G?1:0}):f.sort(function(n,p){var t,v=g.length,x=e[n]._aSortData,w=e[p]._aSortData;for(t=0;t<v;t++){var r=g[t];var C=x[r.col];var G=w[r.col];r=d[r.type+"-"+r.dir]||d["string-"+r.dir];C=r(C,G);if(0!==C)return C}C=
-c[n];G=c[p];return C<G?-1:C>G?1:0})}a.bSorted=!0}function cc(a){var b=a.aoColumns,c=pa(a);a=a.oLanguage.oAria;for(var d=0,e=b.length;d<e;d++){var h=b[d];var f=h.asSorting;var g=h.ariaTitle||h.sTitle.replace(/<.*?>/g,"");var k=h.nTh;k.removeAttribute("aria-sort");h.bSortable&&(0<c.length&&c[0].col==d?(k.setAttribute("aria-sort","asc"==c[0].dir?"ascending":"descending"),h=f[c[0].index+1]||f[0]):h=f[0],g+="asc"===h?a.sSortAscending:a.sSortDescending);k.setAttribute("aria-label",g)}}function nb(a,b,c,
-d){var e=a.aaSorting,h=a.aoColumns[b].asSorting,f=function(g,k){var m=g._idx;m===q&&(m=l.inArray(g[1],h));return m+1<h.length?m+1:k?null:0};"number"===typeof e[0]&&(e=a.aaSorting=[e]);c&&a.oFeatures.bSortMulti?(c=l.inArray(b,U(e,"0")),-1!==c?(b=f(e[c],!0),null===b&&1===e.length&&(b=0),null===b?e.splice(c,1):(e[c][1]=h[b],e[c]._idx=b)):(e.push([b,h[0],0]),e[e.length-1]._idx=0)):e.length&&e[0][0]==b?(b=f(e[0]),e.length=1,e[0][1]=h[b],e[0]._idx=b):(e.length=0,e.push([b,h[0]]),e[0]._idx=0);ka(a);"function"==
-typeof d&&d(a)}function eb(a,b,c,d){var e=a.aoColumns[c];ob(b,{},function(h){!1!==e.bSortable&&(a.oFeatures.bProcessing?(V(a,!0),setTimeout(function(){nb(a,c,h.shiftKey,d);"ssp"!==Q(a)&&V(a,!1)},0)):nb(a,c,h.shiftKey,d))})}function Ra(a){var b=a.aLastSort,c=a.oClasses.sSortColumn,d=pa(a),e=a.oFeatures,h;if(e.bSort&&e.bSortClasses){e=0;for(h=b.length;e<h;e++){var f=b[e].src;l(U(a.aoData,"anCells",f)).removeClass(c+(2>e?e+1:3))}e=0;for(h=d.length;e<h;e++)f=d[e].src,l(U(a.aoData,"anCells",f)).addClass(c+
-(2>e?e+1:3))}a.aLastSort=d}function bc(a,b){var c=a.aoColumns[b],d=u.ext.order[c.sSortDataType],e;d&&(e=d.call(a.oInstance,a,b,va(a,b)));for(var h,f=u.ext.type.order[c.sType+"-pre"],g=0,k=a.aoData.length;g<k;g++)if(c=a.aoData[g],c._aSortData||(c._aSortData=[]),!c._aSortData[b]||d)h=d?e[g]:T(a,g,b,"sort"),c._aSortData[b]=f?f(h):h}function qa(a){if(!a._bLoadingState){var b={time:+new Date,start:a._iDisplayStart,length:a._iDisplayLength,order:l.extend(!0,[],a.aaSorting),search:Vb(a.oPreviousSearch),
-columns:l.map(a.aoColumns,function(c,d){return{visible:c.bVisible,search:Vb(a.aoPreSearchCols[d])}})};a.oSavedState=b;F(a,"aoStateSaveParams","stateSaveParams",[a,b]);a.oFeatures.bStateSave&&!a.bDestroying&&a.fnStateSaveCallback.call(a.oInstance,a,b)}}function dc(a,b,c){if(a.oFeatures.bStateSave)return b=a.fnStateLoadCallback.call(a.oInstance,a,function(d){pb(a,d,c)}),b!==q&&pb(a,b,c),!0;c()}function pb(a,b,c){var d,e=a.aoColumns;a._bLoadingState=!0;var h=a._bInitComplete?new u.Api(a):null;if(b&&
-b.time){var f=F(a,"aoStateLoadParams","stateLoadParams",[a,b]);if(-1!==l.inArray(!1,f))a._bLoadingState=!1;else if(f=a.iStateDuration,0<f&&b.time<+new Date-1E3*f)a._bLoadingState=!1;else if(b.columns&&e.length!==b.columns.length)a._bLoadingState=!1;else{a.oLoadedState=l.extend(!0,{},b);b.start!==q&&(a._iDisplayStart=b.start,null===h&&(a.iInitDisplayStart=b.start));b.length!==q&&(a._iDisplayLength=b.length);b.order!==q&&(a.aaSorting=[],l.each(b.order,function(k,m){a.aaSorting.push(m[0]>=e.length?[0,
-m[1]]:m)}));b.search!==q&&l.extend(a.oPreviousSearch,Wb(b.search));if(b.columns){f=0;for(d=b.columns.length;f<d;f++){var g=b.columns[f];g.visible!==q&&(h?h.column(f).visible(g.visible,!1):e[f].bVisible=g.visible);g.search!==q&&l.extend(a.aoPreSearchCols[f],Wb(g.search))}h&&h.columns.adjust()}a._bLoadingState=!1;F(a,"aoStateLoaded","stateLoaded",[a,b])}}else a._bLoadingState=!1;c()}function Sa(a){var b=u.settings;a=l.inArray(a,U(b,"nTable"));return-1!==a?b[a]:null}function da(a,b,c,d){c="DataTables warning: "+
-(a?"table id="+a.sTableId+" - ":"")+c;d&&(c+=". For more information about this error, please see http://datatables.net/tn/"+d);if(b)z.console&&console.log&&console.log(c);else if(b=u.ext,b=b.sErrMode||b.errMode,a&&F(a,null,"error",[a,d,c]),"alert"==b)alert(c);else{if("throw"==b)throw Error(c);"function"==typeof b&&b(a,d,c)}}function X(a,b,c,d){Array.isArray(c)?l.each(c,function(e,h){Array.isArray(h)?X(a,b,h[0],h[1]):X(a,b,h)}):(d===q&&(d=c),b[c]!==q&&(a[d]=b[c]))}function qb(a,b,c){var d;for(d in b)if(b.hasOwnProperty(d)){var e=
-b[d];l.isPlainObject(e)?(l.isPlainObject(a[d])||(a[d]={}),l.extend(!0,a[d],e)):c&&"data"!==d&&"aaData"!==d&&Array.isArray(e)?a[d]=e.slice():a[d]=e}return a}function ob(a,b,c){l(a).on("click.DT",b,function(d){l(a).trigger("blur");c(d)}).on("keypress.DT",b,function(d){13===d.which&&(d.preventDefault(),c(d))}).on("selectstart.DT",function(){return!1})}function R(a,b,c,d){c&&a[b].push({fn:c,sName:d})}function F(a,b,c,d){var e=[];b&&(e=l.map(a[b].slice().reverse(),function(h,f){return h.fn.apply(a.oInstance,
-d)}));null!==c&&(b=l.Event(c+".dt"),l(a.nTable).trigger(b,d),e.push(b.result));return e}function kb(a){var b=a._iDisplayStart,c=a.fnDisplayEnd(),d=a._iDisplayLength;b>=c&&(b=c-d);b-=b%d;if(-1===d||0>b)b=0;a._iDisplayStart=b}function fb(a,b){a=a.renderer;var c=u.ext.renderer[b];return l.isPlainObject(a)&&a[b]?c[a[b]]||c._:"string"===typeof a?c[a]||c._:c._}function Q(a){return a.oFeatures.bServerSide?"ssp":a.ajax||a.sAjaxSource?"ajax":"dom"}function Da(a,b){var c=ec.numbers_length,d=Math.floor(c/2);
-b<=c?a=ra(0,b):a<=d?(a=ra(0,c-2),a.push("ellipsis"),a.push(b-1)):(a>=b-1-d?a=ra(b-(c-2),b):(a=ra(a-d+2,a+d-1),a.push("ellipsis"),a.push(b-1)),a.splice(0,0,"ellipsis"),a.splice(0,0,0));a.DT_el="span";return a}function Wa(a){l.each({num:function(b){return Ta(b,a)},"num-fmt":function(b){return Ta(b,a,rb)},"html-num":function(b){return Ta(b,a,Ua)},"html-num-fmt":function(b){return Ta(b,a,Ua,rb)}},function(b,c){M.type.order[b+a+"-pre"]=c;b.match(/^html\-/)&&(M.type.search[b+a]=M.type.search.html)})}function fc(a){return function(){var b=
-[Sa(this[u.ext.iApiIndex])].concat(Array.prototype.slice.call(arguments));return u.ext.internal[a].apply(this,b)}}var u=function(a,b){if(this instanceof u)return l(a).DataTable(b);b=a;this.$=function(f,g){return this.api(!0).$(f,g)};this._=function(f,g){return this.api(!0).rows(f,g).data()};this.api=function(f){return f?new B(Sa(this[M.iApiIndex])):new B(this)};this.fnAddData=function(f,g){var k=this.api(!0);f=Array.isArray(f)&&(Array.isArray(f[0])||l.isPlainObject(f[0]))?k.rows.add(f):k.row.add(f);
-(g===q||g)&&k.draw();return f.flatten().toArray()};this.fnAdjustColumnSizing=function(f){var g=this.api(!0).columns.adjust(),k=g.settings()[0],m=k.oScroll;f===q||f?g.draw(!1):(""!==m.sX||""!==m.sY)&&Ha(k)};this.fnClearTable=function(f){var g=this.api(!0).clear();(f===q||f)&&g.draw()};this.fnClose=function(f){this.api(!0).row(f).child.hide()};this.fnDeleteRow=function(f,g,k){var m=this.api(!0);f=m.rows(f);var n=f.settings()[0],p=n.aoData[f[0][0]];f.remove();g&&g.call(this,n,p);(k===q||k)&&m.draw();
-return p};this.fnDestroy=function(f){this.api(!0).destroy(f)};this.fnDraw=function(f){this.api(!0).draw(f)};this.fnFilter=function(f,g,k,m,n,p){n=this.api(!0);null===g||g===q?n.search(f,k,m,p):n.column(g).search(f,k,m,p);n.draw()};this.fnGetData=function(f,g){var k=this.api(!0);if(f!==q){var m=f.nodeName?f.nodeName.toLowerCase():"";return g!==q||"td"==m||"th"==m?k.cell(f,g).data():k.row(f).data()||null}return k.data().toArray()};this.fnGetNodes=function(f){var g=this.api(!0);return f!==q?g.row(f).node():
-g.rows().nodes().flatten().toArray()};this.fnGetPosition=function(f){var g=this.api(!0),k=f.nodeName.toUpperCase();return"TR"==k?g.row(f).index():"TD"==k||"TH"==k?(f=g.cell(f).index(),[f.row,f.columnVisible,f.column]):null};this.fnIsOpen=function(f){return this.api(!0).row(f).child.isShown()};this.fnOpen=function(f,g,k){return this.api(!0).row(f).child(g,k).show().child()[0]};this.fnPageChange=function(f,g){f=this.api(!0).page(f);(g===q||g)&&f.draw(!1)};this.fnSetColumnVis=function(f,g,k){f=this.api(!0).column(f).visible(g);
-(k===q||k)&&f.columns.adjust().draw()};this.fnSettings=function(){return Sa(this[M.iApiIndex])};this.fnSort=function(f){this.api(!0).order(f).draw()};this.fnSortListener=function(f,g,k){this.api(!0).order.listener(f,g,k)};this.fnUpdate=function(f,g,k,m,n){var p=this.api(!0);k===q||null===k?p.row(g).data(f):p.cell(g,k).data(f);(n===q||n)&&p.columns.adjust();(m===q||m)&&p.draw();return 0};this.fnVersionCheck=M.fnVersionCheck;var c=this,d=b===q,e=this.length;d&&(b={});this.oApi=this.internal=M.internal;
-for(var h in u.ext.internal)h&&(this[h]=fc(h));this.each(function(){var f={},g=1<e?qb(f,b,!0):b,k=0,m;f=this.getAttribute("id");var n=!1,p=u.defaults,t=l(this);if("table"!=this.nodeName.toLowerCase())da(null,0,"Non-table node initialisation ("+this.nodeName+")",2);else{zb(p);Ab(p.column);P(p,p,!0);P(p.column,p.column,!0);P(p,l.extend(g,t.data()),!0);var v=u.settings;k=0;for(m=v.length;k<m;k++){var x=v[k];if(x.nTable==this||x.nTHead&&x.nTHead.parentNode==this||x.nTFoot&&x.nTFoot.parentNode==this){var w=
-g.bRetrieve!==q?g.bRetrieve:p.bRetrieve;if(d||w)return x.oInstance;if(g.bDestroy!==q?g.bDestroy:p.bDestroy){x.oInstance.fnDestroy();break}else{da(x,0,"Cannot reinitialise DataTable",3);return}}if(x.sTableId==this.id){v.splice(k,1);break}}if(null===f||""===f)this.id=f="DataTables_Table_"+u.ext._unique++;var r=l.extend(!0,{},u.models.oSettings,{sDestroyWidth:t[0].style.width,sInstance:f,sTableId:f});r.nTable=this;r.oApi=c.internal;r.oInit=g;v.push(r);r.oInstance=1===c.length?c:t.dataTable();zb(g);ma(g.oLanguage);
-g.aLengthMenu&&!g.iDisplayLength&&(g.iDisplayLength=Array.isArray(g.aLengthMenu[0])?g.aLengthMenu[0][0]:g.aLengthMenu[0]);g=qb(l.extend(!0,{},p),g);X(r.oFeatures,g,"bPaginate bLengthChange bFilter bSort bSortMulti bInfo bProcessing bAutoWidth bSortClasses bServerSide bDeferRender".split(" "));X(r,g,["asStripeClasses","ajax","fnServerData","fnFormatNumber","sServerMethod","aaSorting","aaSortingFixed","aLengthMenu","sPaginationType","sAjaxSource","sAjaxDataProp","iStateDuration","sDom","bSortCellsTop",
-"iTabIndex","fnStateLoadCallback","fnStateSaveCallback","renderer","searchDelay","rowId",["iCookieDuration","iStateDuration"],["oSearch","oPreviousSearch"],["aoSearchCols","aoPreSearchCols"],["iDisplayLength","_iDisplayLength"]]);X(r.oScroll,g,[["sScrollX","sX"],["sScrollXInner","sXInner"],["sScrollY","sY"],["bScrollCollapse","bCollapse"]]);X(r.oLanguage,g,"fnInfoCallback");R(r,"aoDrawCallback",g.fnDrawCallback,"user");R(r,"aoServerParams",g.fnServerParams,"user");R(r,"aoStateSaveParams",g.fnStateSaveParams,
-"user");R(r,"aoStateLoadParams",g.fnStateLoadParams,"user");R(r,"aoStateLoaded",g.fnStateLoaded,"user");R(r,"aoRowCallback",g.fnRowCallback,"user");R(r,"aoRowCreatedCallback",g.fnCreatedRow,"user");R(r,"aoHeaderCallback",g.fnHeaderCallback,"user");R(r,"aoFooterCallback",g.fnFooterCallback,"user");R(r,"aoInitComplete",g.fnInitComplete,"user");R(r,"aoPreDrawCallback",g.fnPreDrawCallback,"user");r.rowIdFn=na(g.rowId);Bb(r);var C=r.oClasses;l.extend(C,u.ext.classes,g.oClasses);t.addClass(C.sTable);r.iInitDisplayStart===
-q&&(r.iInitDisplayStart=g.iDisplayStart,r._iDisplayStart=g.iDisplayStart);null!==g.iDeferLoading&&(r.bDeferLoading=!0,f=Array.isArray(g.iDeferLoading),r._iRecordsDisplay=f?g.iDeferLoading[0]:g.iDeferLoading,r._iRecordsTotal=f?g.iDeferLoading[1]:g.iDeferLoading);var G=r.oLanguage;l.extend(!0,G,g.oLanguage);G.sUrl?(l.ajax({dataType:"json",url:G.sUrl,success:function(I){P(p.oLanguage,I);ma(I);l.extend(!0,G,I);F(r,null,"i18n",[r]);Ba(r)},error:function(){Ba(r)}}),n=!0):F(r,null,"i18n",[r]);null===g.asStripeClasses&&
-(r.asStripeClasses=[C.sStripeOdd,C.sStripeEven]);f=r.asStripeClasses;var aa=t.children("tbody").find("tr").eq(0);-1!==l.inArray(!0,l.map(f,function(I,H){return aa.hasClass(I)}))&&(l("tbody tr",this).removeClass(f.join(" ")),r.asDestroyStripes=f.slice());f=[];v=this.getElementsByTagName("thead");0!==v.length&&(xa(r.aoHeader,v[0]),f=Na(r));if(null===g.aoColumns)for(v=[],k=0,m=f.length;k<m;k++)v.push(null);else v=g.aoColumns;k=0;for(m=v.length;k<m;k++)Xa(r,f?f[k]:null);Db(r,g.aoColumnDefs,v,function(I,
-H){Ga(r,I,H)});if(aa.length){var L=function(I,H){return null!==I.getAttribute("data-"+H)?H:null};l(aa[0]).children("th, td").each(function(I,H){var ea=r.aoColumns[I];if(ea.mData===I){var Y=L(H,"sort")||L(H,"order");H=L(H,"filter")||L(H,"search");if(null!==Y||null!==H)ea.mData={_:I+".display",sort:null!==Y?I+".@data-"+Y:q,type:null!==Y?I+".@data-"+Y:q,filter:null!==H?I+".@data-"+H:q},Ga(r,I)}})}var O=r.oFeatures;f=function(){if(g.aaSorting===q){var I=r.aaSorting;k=0;for(m=I.length;k<m;k++)I[k][1]=
-r.aoColumns[k].asSorting[0]}Ra(r);O.bSort&&R(r,"aoDrawCallback",function(){if(r.bSorted){var Y=pa(r),Ca={};l.each(Y,function(fa,ba){Ca[ba.src]=ba.dir});F(r,null,"order",[r,Y,Ca]);cc(r)}});R(r,"aoDrawCallback",function(){(r.bSorted||"ssp"===Q(r)||O.bDeferRender)&&Ra(r)},"sc");I=t.children("caption").each(function(){this._captionSide=l(this).css("caption-side")});var H=t.children("thead");0===H.length&&(H=l("<thead/>").appendTo(t));r.nTHead=H[0];var ea=t.children("tbody");0===ea.length&&(ea=l("<tbody/>").insertAfter(H));
-r.nTBody=ea[0];H=t.children("tfoot");0===H.length&&0<I.length&&(""!==r.oScroll.sX||""!==r.oScroll.sY)&&(H=l("<tfoot/>").appendTo(t));0===H.length||0===H.children().length?t.addClass(C.sNoFooter):0<H.length&&(r.nTFoot=H[0],xa(r.aoFooter,r.nTFoot));if(g.aaData)for(k=0;k<g.aaData.length;k++)ia(r,g.aaData[k]);else(r.bDeferLoading||"dom"==Q(r))&&Ja(r,l(r.nTBody).children("tr"));r.aiDisplay=r.aiDisplayMaster.slice();r.bInitialised=!0;!1===n&&Ba(r)};R(r,"aoDrawCallback",qa,"state_save");g.bStateSave?(O.bStateSave=
-!0,dc(r,g,f)):f()}});c=null;return this},M,y,J,sb={},gc=/[\r\n\u2028]/g,Ua=/<.*?>/g,uc=/^\d{2,4}[\.\/\-]\d{1,2}[\.\/\-]\d{1,2}([T ]{1}\d{1,2}[:\.]\d{2}([\.:]\d{2})?)?$/,vc=/(\/|\.|\*|\+|\?|\||\(|\)|\[|\]|\{|\}|\\|\$|\^|\-)/g,rb=/['\u00A0,$£€¥%\u2009\u202F\u20BD\u20a9\u20BArfkɃΞ]/gi,Z=function(a){return a&&!0!==a&&"-"!==a?!1:!0},hc=function(a){var b=parseInt(a,10);return!isNaN(b)&&isFinite(a)?b:null},ic=function(a,b){sb[b]||(sb[b]=new RegExp(ib(b),"g"));return"string"===typeof a&&"."!==b?a.replace(/\./g,
-"").replace(sb[b],"."):a},tb=function(a,b,c){var d="string"===typeof a;if(Z(a))return!0;b&&d&&(a=ic(a,b));c&&d&&(a=a.replace(rb,""));return!isNaN(parseFloat(a))&&isFinite(a)},jc=function(a,b,c){return Z(a)?!0:Z(a)||"string"===typeof a?tb(a.replace(Ua,""),b,c)?!0:null:null},U=function(a,b,c){var d=[],e=0,h=a.length;if(c!==q)for(;e<h;e++)a[e]&&a[e][b]&&d.push(a[e][b][c]);else for(;e<h;e++)a[e]&&d.push(a[e][b]);return d},Ea=function(a,b,c,d){var e=[],h=0,f=b.length;if(d!==q)for(;h<f;h++)a[b[h]][c]&&
-e.push(a[b[h]][c][d]);else for(;h<f;h++)e.push(a[b[h]][c]);return e},ra=function(a,b){var c=[];if(b===q){b=0;var d=a}else d=b,b=a;for(a=b;a<d;a++)c.push(a);return c},kc=function(a){for(var b=[],c=0,d=a.length;c<d;c++)a[c]&&b.push(a[c]);return b},Ma=function(a){a:{if(!(2>a.length)){var b=a.slice().sort();for(var c=b[0],d=1,e=b.length;d<e;d++){if(b[d]===c){b=!1;break a}c=b[d]}}b=!0}if(b)return a.slice();b=[];e=a.length;var h,f=0;d=0;a:for(;d<e;d++){c=a[d];for(h=0;h<f;h++)if(b[h]===c)continue a;b.push(c);
-f++}return b},lc=function(a,b){if(Array.isArray(b))for(var c=0;c<b.length;c++)lc(a,b[c]);else a.push(b);return a},mc=function(a,b){b===q&&(b=0);return-1!==this.indexOf(a,b)};Array.isArray||(Array.isArray=function(a){return"[object Array]"===Object.prototype.toString.call(a)});Array.prototype.includes||(Array.prototype.includes=mc);String.prototype.trim||(String.prototype.trim=function(){return this.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")});String.prototype.includes||(String.prototype.includes=
-mc);u.util={throttle:function(a,b){var c=b!==q?b:200,d,e;return function(){var h=this,f=+new Date,g=arguments;d&&f<d+c?(clearTimeout(e),e=setTimeout(function(){d=q;a.apply(h,g)},c)):(d=f,a.apply(h,g))}},escapeRegex:function(a){return a.replace(vc,"\\$1")},set:function(a){if(l.isPlainObject(a))return u.util.set(a._);if(null===a)return function(){};if("function"===typeof a)return function(c,d,e){a(c,"set",d,e)};if("string"!==typeof a||-1===a.indexOf(".")&&-1===a.indexOf("[")&&-1===a.indexOf("("))return function(c,
-d){c[a]=d};var b=function(c,d,e){e=bb(e);var h=e[e.length-1];for(var f,g,k=0,m=e.length-1;k<m;k++){if("__proto__"===e[k]||"constructor"===e[k])throw Error("Cannot set prototype values");f=e[k].match(Fa);g=e[k].match(sa);if(f){e[k]=e[k].replace(Fa,"");c[e[k]]=[];h=e.slice();h.splice(0,k+1);f=h.join(".");if(Array.isArray(d))for(g=0,m=d.length;g<m;g++)h={},b(h,d[g],f),c[e[k]].push(h);else c[e[k]]=d;return}g&&(e[k]=e[k].replace(sa,""),c=c[e[k]](d));if(null===c[e[k]]||c[e[k]]===q)c[e[k]]={};c=c[e[k]]}if(h.match(sa))c[h.replace(sa,
-"")](d);else c[h.replace(Fa,"")]=d};return function(c,d){return b(c,d,a)}},get:function(a){if(l.isPlainObject(a)){var b={};l.each(a,function(d,e){e&&(b[d]=u.util.get(e))});return function(d,e,h,f){var g=b[e]||b._;return g!==q?g(d,e,h,f):d}}if(null===a)return function(d){return d};if("function"===typeof a)return function(d,e,h,f){return a(d,e,h,f)};if("string"!==typeof a||-1===a.indexOf(".")&&-1===a.indexOf("[")&&-1===a.indexOf("("))return function(d,e){return d[a]};var c=function(d,e,h){if(""!==h){var f=
-bb(h);for(var g=0,k=f.length;g<k;g++){h=f[g].match(Fa);var m=f[g].match(sa);if(h){f[g]=f[g].replace(Fa,"");""!==f[g]&&(d=d[f[g]]);m=[];f.splice(0,g+1);f=f.join(".");if(Array.isArray(d))for(g=0,k=d.length;g<k;g++)m.push(c(d[g],e,f));d=h[0].substring(1,h[0].length-1);d=""===d?m:m.join(d);break}else if(m){f[g]=f[g].replace(sa,"");d=d[f[g]]();continue}if(null===d||d[f[g]]===q)return q;d=d[f[g]]}}return d};return function(d,e){return c(d,e,a)}}};var S=function(a,b,c){a[b]!==q&&(a[c]=a[b])},Fa=/\[.*?\]$/,
-sa=/\(\)$/,na=u.util.get,ha=u.util.set,ib=u.util.escapeRegex,Qa=l("<div>")[0],sc=Qa.textContent!==q,tc=/<.*?>/g,gb=u.util.throttle,nc=[],N=Array.prototype,wc=function(a){var b,c=u.settings,d=l.map(c,function(h,f){return h.nTable});if(a){if(a.nTable&&a.oApi)return[a];if(a.nodeName&&"table"===a.nodeName.toLowerCase()){var e=l.inArray(a,d);return-1!==e?[c[e]]:null}if(a&&"function"===typeof a.settings)return a.settings().toArray();"string"===typeof a?b=l(a):a instanceof l&&(b=a)}else return[];if(b)return b.map(function(h){e=
-l.inArray(this,d);return-1!==e?c[e]:null}).toArray()};var B=function(a,b){if(!(this instanceof B))return new B(a,b);var c=[],d=function(f){(f=wc(f))&&c.push.apply(c,f)};if(Array.isArray(a))for(var e=0,h=a.length;e<h;e++)d(a[e]);else d(a);this.context=Ma(c);b&&l.merge(this,b);this.selector={rows:null,cols:null,opts:null};B.extend(this,this,nc)};u.Api=B;l.extend(B.prototype,{any:function(){return 0!==this.count()},concat:N.concat,context:[],count:function(){return this.flatten().length},each:function(a){for(var b=
-0,c=this.length;b<c;b++)a.call(this,this[b],b,this);return this},eq:function(a){var b=this.context;return b.length>a?new B(b[a],this[a]):null},filter:function(a){var b=[];if(N.filter)b=N.filter.call(this,a,this);else for(var c=0,d=this.length;c<d;c++)a.call(this,this[c],c,this)&&b.push(this[c]);return new B(this.context,b)},flatten:function(){var a=[];return new B(this.context,a.concat.apply(a,this.toArray()))},join:N.join,indexOf:N.indexOf||function(a,b){b=b||0;for(var c=this.length;b<c;b++)if(this[b]===
-a)return b;return-1},iterator:function(a,b,c,d){var e=[],h,f,g=this.context,k,m=this.selector;"string"===typeof a&&(d=c,c=b,b=a,a=!1);var n=0;for(h=g.length;n<h;n++){var p=new B(g[n]);if("table"===b){var t=c.call(p,g[n],n);t!==q&&e.push(t)}else if("columns"===b||"rows"===b)t=c.call(p,g[n],this[n],n),t!==q&&e.push(t);else if("column"===b||"column-rows"===b||"row"===b||"cell"===b){var v=this[n];"column-rows"===b&&(k=Va(g[n],m.opts));var x=0;for(f=v.length;x<f;x++)t=v[x],t="cell"===b?c.call(p,g[n],t.row,
-t.column,n,x):c.call(p,g[n],t,n,x,k),t!==q&&e.push(t)}}return e.length||d?(a=new B(g,a?e.concat.apply([],e):e),b=a.selector,b.rows=m.rows,b.cols=m.cols,b.opts=m.opts,a):this},lastIndexOf:N.lastIndexOf||function(a,b){return this.indexOf.apply(this.toArray.reverse(),arguments)},length:0,map:function(a){var b=[];if(N.map)b=N.map.call(this,a,this);else for(var c=0,d=this.length;c<d;c++)b.push(a.call(this,this[c],c));return new B(this.context,b)},pluck:function(a){return this.map(function(b){return b[a]})},
-pop:N.pop,push:N.push,reduce:N.reduce||function(a,b){return Cb(this,a,b,0,this.length,1)},reduceRight:N.reduceRight||function(a,b){return Cb(this,a,b,this.length-1,-1,-1)},reverse:N.reverse,selector:null,shift:N.shift,slice:function(){return new B(this.context,this)},sort:N.sort,splice:N.splice,toArray:function(){return N.slice.call(this)},to$:function(){return l(this)},toJQuery:function(){return l(this)},unique:function(){return new B(this.context,Ma(this))},unshift:N.unshift});B.extend=function(a,
-b,c){if(c.length&&b&&(b instanceof B||b.__dt_wrapper)){var d,e=function(g,k,m){return function(){var n=k.apply(g,arguments);B.extend(n,n,m.methodExt);return n}};var h=0;for(d=c.length;h<d;h++){var f=c[h];b[f.name]="function"===f.type?e(a,f.val,f):"object"===f.type?{}:f.val;b[f.name].__dt_wrapper=!0;B.extend(a,b[f.name],f.propExt)}}};B.register=y=function(a,b){if(Array.isArray(a))for(var c=0,d=a.length;c<d;c++)B.register(a[c],b);else{d=a.split(".");var e=nc,h;a=0;for(c=d.length;a<c;a++){var f=(h=-1!==
-d[a].indexOf("()"))?d[a].replace("()",""):d[a];a:{var g=0;for(var k=e.length;g<k;g++)if(e[g].name===f){g=e[g];break a}g=null}g||(g={name:f,val:{},methodExt:[],propExt:[],type:"object"},e.push(g));a===c-1?(g.val=b,g.type="function"===typeof b?"function":l.isPlainObject(b)?"object":"other"):e=h?g.methodExt:g.propExt}}};B.registerPlural=J=function(a,b,c){B.register(a,c);B.register(b,function(){var d=c.apply(this,arguments);return d===this?this:d instanceof B?d.length?Array.isArray(d[0])?new B(d.context,
-d[0]):d[0]:q:d})};var oc=function(a,b){if(Array.isArray(a))return l.map(a,function(d){return oc(d,b)});if("number"===typeof a)return[b[a]];var c=l.map(b,function(d,e){return d.nTable});return l(c).filter(a).map(function(d){d=l.inArray(this,c);return b[d]}).toArray()};y("tables()",function(a){return a!==q&&null!==a?new B(oc(a,this.context)):this});y("table()",function(a){a=this.tables(a);var b=a.context;return b.length?new B(b[0]):a});J("tables().nodes()","table().node()",function(){return this.iterator("table",
-function(a){return a.nTable},1)});J("tables().body()","table().body()",function(){return this.iterator("table",function(a){return a.nTBody},1)});J("tables().header()","table().header()",function(){return this.iterator("table",function(a){return a.nTHead},1)});J("tables().footer()","table().footer()",function(){return this.iterator("table",function(a){return a.nTFoot},1)});J("tables().containers()","table().container()",function(){return this.iterator("table",function(a){return a.nTableWrapper},1)});
-y("draw()",function(a){return this.iterator("table",function(b){"page"===a?ja(b):("string"===typeof a&&(a="full-hold"===a?!1:!0),ka(b,!1===a))})});y("page()",function(a){return a===q?this.page.info().page:this.iterator("table",function(b){lb(b,a)})});y("page.info()",function(a){if(0===this.context.length)return q;a=this.context[0];var b=a._iDisplayStart,c=a.oFeatures.bPaginate?a._iDisplayLength:-1,d=a.fnRecordsDisplay(),e=-1===c;return{page:e?0:Math.floor(b/c),pages:e?1:Math.ceil(d/c),start:b,end:a.fnDisplayEnd(),
-length:c,recordsTotal:a.fnRecordsTotal(),recordsDisplay:d,serverSide:"ssp"===Q(a)}});y("page.len()",function(a){return a===q?0!==this.context.length?this.context[0]._iDisplayLength:q:this.iterator("table",function(b){jb(b,a)})});var pc=function(a,b,c){if(c){var d=new B(a);d.one("draw",function(){c(d.ajax.json())})}if("ssp"==Q(a))ka(a,b);else{V(a,!0);var e=a.jqXHR;e&&4!==e.readyState&&e.abort();Oa(a,[],function(h){Ka(a);h=Aa(a,h);for(var f=0,g=h.length;f<g;f++)ia(a,h[f]);ka(a,b);V(a,!1)})}};y("ajax.json()",
-function(){var a=this.context;if(0<a.length)return a[0].json});y("ajax.params()",function(){var a=this.context;if(0<a.length)return a[0].oAjaxData});y("ajax.reload()",function(a,b){return this.iterator("table",function(c){pc(c,!1===b,a)})});y("ajax.url()",function(a){var b=this.context;if(a===q){if(0===b.length)return q;b=b[0];return b.ajax?l.isPlainObject(b.ajax)?b.ajax.url:b.ajax:b.sAjaxSource}return this.iterator("table",function(c){l.isPlainObject(c.ajax)?c.ajax.url=a:c.ajax=a})});y("ajax.url().load()",
-function(a,b){return this.iterator("table",function(c){pc(c,!1===b,a)})});var ub=function(a,b,c,d,e){var h=[],f,g,k;var m=typeof b;b&&"string"!==m&&"function"!==m&&b.length!==q||(b=[b]);m=0;for(g=b.length;m<g;m++){var n=b[m]&&b[m].split&&!b[m].match(/[\[\(:]/)?b[m].split(","):[b[m]];var p=0;for(k=n.length;p<k;p++)(f=c("string"===typeof n[p]?n[p].trim():n[p]))&&f.length&&(h=h.concat(f))}a=M.selector[a];if(a.length)for(m=0,g=a.length;m<g;m++)h=a[m](d,e,h);return Ma(h)},vb=function(a){a||(a={});a.filter&&
-a.search===q&&(a.search=a.filter);return l.extend({search:"none",order:"current",page:"all"},a)},wb=function(a){for(var b=0,c=a.length;b<c;b++)if(0<a[b].length)return a[0]=a[b],a[0].length=1,a.length=1,a.context=[a.context[b]],a;a.length=0;return a},Va=function(a,b){var c=[],d=a.aiDisplay;var e=a.aiDisplayMaster;var h=b.search;var f=b.order;b=b.page;if("ssp"==Q(a))return"removed"===h?[]:ra(0,e.length);if("current"==b)for(f=a._iDisplayStart,a=a.fnDisplayEnd();f<a;f++)c.push(d[f]);else if("current"==
-f||"applied"==f)if("none"==h)c=e.slice();else if("applied"==h)c=d.slice();else{if("removed"==h){var g={};f=0;for(a=d.length;f<a;f++)g[d[f]]=null;c=l.map(e,function(k){return g.hasOwnProperty(k)?null:k})}}else if("index"==f||"original"==f)for(f=0,a=a.aoData.length;f<a;f++)"none"==h?c.push(f):(e=l.inArray(f,d),(-1===e&&"removed"==h||0<=e&&"applied"==h)&&c.push(f));return c},xc=function(a,b,c){var d;return ub("row",b,function(e){var h=hc(e),f=a.aoData;if(null!==h&&!c)return[h];d||(d=Va(a,c));if(null!==
-h&&-1!==l.inArray(h,d))return[h];if(null===e||e===q||""===e)return d;if("function"===typeof e)return l.map(d,function(k){var m=f[k];return e(k,m._aData,m.nTr)?k:null});if(e.nodeName){h=e._DT_RowIndex;var g=e._DT_CellIndex;if(h!==q)return f[h]&&f[h].nTr===e?[h]:[];if(g)return f[g.row]&&f[g.row].nTr===e.parentNode?[g.row]:[];h=l(e).closest("*[data-dt-row]");return h.length?[h.data("dt-row")]:[]}if("string"===typeof e&&"#"===e.charAt(0)&&(h=a.aIds[e.replace(/^#/,"")],h!==q))return[h.idx];h=kc(Ea(a.aoData,
-d,"nTr"));return l(h).filter(e).map(function(){return this._DT_RowIndex}).toArray()},a,c)};y("rows()",function(a,b){a===q?a="":l.isPlainObject(a)&&(b=a,a="");b=vb(b);var c=this.iterator("table",function(d){return xc(d,a,b)},1);c.selector.rows=a;c.selector.opts=b;return c});y("rows().nodes()",function(){return this.iterator("row",function(a,b){return a.aoData[b].nTr||q},1)});y("rows().data()",function(){return this.iterator(!0,"rows",function(a,b){return Ea(a.aoData,b,"_aData")},1)});J("rows().cache()",
-"row().cache()",function(a){return this.iterator("row",function(b,c){b=b.aoData[c];return"search"===a?b._aFilterData:b._aSortData},1)});J("rows().invalidate()","row().invalidate()",function(a){return this.iterator("row",function(b,c){wa(b,c,a)})});J("rows().indexes()","row().index()",function(){return this.iterator("row",function(a,b){return b},1)});J("rows().ids()","row().id()",function(a){for(var b=[],c=this.context,d=0,e=c.length;d<e;d++)for(var h=0,f=this[d].length;h<f;h++){var g=c[d].rowIdFn(c[d].aoData[this[d][h]]._aData);
-b.push((!0===a?"#":"")+g)}return new B(c,b)});J("rows().remove()","row().remove()",function(){var a=this;this.iterator("row",function(b,c,d){var e=b.aoData,h=e[c],f,g;e.splice(c,1);var k=0;for(f=e.length;k<f;k++){var m=e[k];var n=m.anCells;null!==m.nTr&&(m.nTr._DT_RowIndex=k);if(null!==n)for(m=0,g=n.length;m<g;m++)n[m]._DT_CellIndex.row=k}La(b.aiDisplayMaster,c);La(b.aiDisplay,c);La(a[d],c,!1);0<b._iRecordsDisplay&&b._iRecordsDisplay--;kb(b);c=b.rowIdFn(h._aData);c!==q&&delete b.aIds[c]});this.iterator("table",
-function(b){for(var c=0,d=b.aoData.length;c<d;c++)b.aoData[c].idx=c});return this});y("rows.add()",function(a){var b=this.iterator("table",function(d){var e,h=[];var f=0;for(e=a.length;f<e;f++){var g=a[f];g.nodeName&&"TR"===g.nodeName.toUpperCase()?h.push(Ja(d,g)[0]):h.push(ia(d,g))}return h},1),c=this.rows(-1);c.pop();l.merge(c,b);return c});y("row()",function(a,b){return wb(this.rows(a,b))});y("row().data()",function(a){var b=this.context;if(a===q)return b.length&&this.length?b[0].aoData[this[0]]._aData:
-q;var c=b[0].aoData[this[0]];c._aData=a;Array.isArray(a)&&c.nTr&&c.nTr.id&&ha(b[0].rowId)(a,c.nTr.id);wa(b[0],this[0],"data");return this});y("row().node()",function(){var a=this.context;return a.length&&this.length?a[0].aoData[this[0]].nTr||null:null});y("row.add()",function(a){a instanceof l&&a.length&&(a=a[0]);var b=this.iterator("table",function(c){return a.nodeName&&"TR"===a.nodeName.toUpperCase()?Ja(c,a)[0]:ia(c,a)});return this.row(b[0])});l(A).on("plugin-init.dt",function(a,b){var c=new B(b);
-c.on("stateSaveParams",function(d,e,h){d=c.rows().iterator("row",function(f,g){return f.aoData[g]._detailsShow?g:q});h.childRows=c.rows(d).ids(!0).toArray()});(a=c.state.loaded())&&a.childRows&&c.rows(a.childRows).every(function(){F(b,null,"requestChild",[this])})});var yc=function(a,b,c,d){var e=[],h=function(f,g){if(Array.isArray(f)||f instanceof l)for(var k=0,m=f.length;k<m;k++)h(f[k],g);else f.nodeName&&"tr"===f.nodeName.toLowerCase()?e.push(f):(k=l("<tr><td></td></tr>").addClass(g),l("td",k).addClass(g).html(f)[0].colSpan=
-oa(a),e.push(k[0]))};h(c,d);b._details&&b._details.detach();b._details=l(e);b._detailsShow&&b._details.insertAfter(b.nTr)},xb=function(a,b){var c=a.context;c.length&&(a=c[0].aoData[b!==q?b:a[0]])&&a._details&&(a._details.remove(),a._detailsShow=q,a._details=q,l(a.nTr).removeClass("dt-hasChild"),qa(c[0]))},qc=function(a,b){var c=a.context;if(c.length&&a.length){var d=c[0].aoData[a[0]];d._details&&((d._detailsShow=b)?(d._details.insertAfter(d.nTr),l(d.nTr).addClass("dt-hasChild")):(d._details.detach(),
-l(d.nTr).removeClass("dt-hasChild")),F(c[0],null,"childRow",[b,a.row(a[0])]),zc(c[0]),qa(c[0]))}},zc=function(a){var b=new B(a),c=a.aoData;b.off("draw.dt.DT_details column-visibility.dt.DT_details destroy.dt.DT_details");0<U(c,"_details").length&&(b.on("draw.dt.DT_details",function(d,e){a===e&&b.rows({page:"current"}).eq(0).each(function(h){h=c[h];h._detailsShow&&h._details.insertAfter(h.nTr)})}),b.on("column-visibility.dt.DT_details",function(d,e,h,f){if(a===e)for(e=oa(e),h=0,f=c.length;h<f;h++)d=
-c[h],d._details&&d._details.children("td[colspan]").attr("colspan",e)}),b.on("destroy.dt.DT_details",function(d,e){if(a===e)for(d=0,e=c.length;d<e;d++)c[d]._details&&xb(b,d)}))};y("row().child()",function(a,b){var c=this.context;if(a===q)return c.length&&this.length?c[0].aoData[this[0]]._details:q;!0===a?this.child.show():!1===a?xb(this):c.length&&this.length&&yc(c[0],c[0].aoData[this[0]],a,b);return this});y(["row().child.show()","row().child().show()"],function(a){qc(this,!0);return this});y(["row().child.hide()",
-"row().child().hide()"],function(){qc(this,!1);return this});y(["row().child.remove()","row().child().remove()"],function(){xb(this);return this});y("row().child.isShown()",function(){var a=this.context;return a.length&&this.length?a[0].aoData[this[0]]._detailsShow||!1:!1});var Ac=/^([^:]+):(name|visIdx|visible)$/,rc=function(a,b,c,d,e){c=[];d=0;for(var h=e.length;d<h;d++)c.push(T(a,e[d],b));return c},Bc=function(a,b,c){var d=a.aoColumns,e=U(d,"sName"),h=U(d,"nTh");return ub("column",b,function(f){var g=
-hc(f);if(""===f)return ra(d.length);if(null!==g)return[0<=g?g:d.length+g];if("function"===typeof f){var k=Va(a,c);return l.map(d,function(p,t){return f(t,rc(a,t,0,0,k),h[t])?t:null})}var m="string"===typeof f?f.match(Ac):"";if(m)switch(m[2]){case "visIdx":case "visible":g=parseInt(m[1],10);if(0>g){var n=l.map(d,function(p,t){return p.bVisible?t:null});return[n[n.length+g]]}return[ua(a,g)];case "name":return l.map(e,function(p,t){return p===m[1]?t:null});default:return[]}if(f.nodeName&&f._DT_CellIndex)return[f._DT_CellIndex.column];
-g=l(h).filter(f).map(function(){return l.inArray(this,h)}).toArray();if(g.length||!f.nodeName)return g;g=l(f).closest("*[data-dt-column]");return g.length?[g.data("dt-column")]:[]},a,c)};y("columns()",function(a,b){a===q?a="":l.isPlainObject(a)&&(b=a,a="");b=vb(b);var c=this.iterator("table",function(d){return Bc(d,a,b)},1);c.selector.cols=a;c.selector.opts=b;return c});J("columns().header()","column().header()",function(a,b){return this.iterator("column",function(c,d){return c.aoColumns[d].nTh},
-1)});J("columns().footer()","column().footer()",function(a,b){return this.iterator("column",function(c,d){return c.aoColumns[d].nTf},1)});J("columns().data()","column().data()",function(){return this.iterator("column-rows",rc,1)});J("columns().dataSrc()","column().dataSrc()",function(){return this.iterator("column",function(a,b){return a.aoColumns[b].mData},1)});J("columns().cache()","column().cache()",function(a){return this.iterator("column-rows",function(b,c,d,e,h){return Ea(b.aoData,h,"search"===
-a?"_aFilterData":"_aSortData",c)},1)});J("columns().nodes()","column().nodes()",function(){return this.iterator("column-rows",function(a,b,c,d,e){return Ea(a.aoData,e,"anCells",b)},1)});J("columns().visible()","column().visible()",function(a,b){var c=this,d=this.iterator("column",function(e,h){if(a===q)return e.aoColumns[h].bVisible;var f=e.aoColumns,g=f[h],k=e.aoData,m;if(a!==q&&g.bVisible!==a){if(a){var n=l.inArray(!0,U(f,"bVisible"),h+1);f=0;for(m=k.length;f<m;f++){var p=k[f].nTr;e=k[f].anCells;
-p&&p.insertBefore(e[h],e[n]||null)}}else l(U(e.aoData,"anCells",h)).detach();g.bVisible=a}});a!==q&&this.iterator("table",function(e){ya(e,e.aoHeader);ya(e,e.aoFooter);e.aiDisplay.length||l(e.nTBody).find("td[colspan]").attr("colspan",oa(e));qa(e);c.iterator("column",function(h,f){F(h,null,"column-visibility",[h,f,a,b])});(b===q||b)&&c.columns.adjust()});return d});J("columns().indexes()","column().index()",function(a){return this.iterator("column",function(b,c){return"visible"===a?va(b,c):c},1)});
-y("columns.adjust()",function(){return this.iterator("table",function(a){ta(a)},1)});y("column.index()",function(a,b){if(0!==this.context.length){var c=this.context[0];if("fromVisible"===a||"toData"===a)return ua(c,b);if("fromData"===a||"toVisible"===a)return va(c,b)}});y("column()",function(a,b){return wb(this.columns(a,b))});var Cc=function(a,b,c){var d=a.aoData,e=Va(a,c),h=kc(Ea(d,e,"anCells")),f=l(lc([],h)),g,k=a.aoColumns.length,m,n,p,t,v,x;return ub("cell",b,function(w){var r="function"===typeof w;
-if(null===w||w===q||r){m=[];n=0;for(p=e.length;n<p;n++)for(g=e[n],t=0;t<k;t++)v={row:g,column:t},r?(x=d[g],w(v,T(a,g,t),x.anCells?x.anCells[t]:null)&&m.push(v)):m.push(v);return m}if(l.isPlainObject(w))return w.column!==q&&w.row!==q&&-1!==l.inArray(w.row,e)?[w]:[];r=f.filter(w).map(function(C,G){return{row:G._DT_CellIndex.row,column:G._DT_CellIndex.column}}).toArray();if(r.length||!w.nodeName)return r;x=l(w).closest("*[data-dt-row]");return x.length?[{row:x.data("dt-row"),column:x.data("dt-column")}]:
-[]},a,c)};y("cells()",function(a,b,c){l.isPlainObject(a)&&(a.row===q?(c=a,a=null):(c=b,b=null));l.isPlainObject(b)&&(c=b,b=null);if(null===b||b===q)return this.iterator("table",function(n){return Cc(n,a,vb(c))});var d=c?{page:c.page,order:c.order,search:c.search}:{},e=this.columns(b,d),h=this.rows(a,d),f,g,k,m;d=this.iterator("table",function(n,p){n=[];f=0;for(g=h[p].length;f<g;f++)for(k=0,m=e[p].length;k<m;k++)n.push({row:h[p][f],column:e[p][k]});return n},1);d=c&&c.selected?this.cells(d,c):d;l.extend(d.selector,
-{cols:b,rows:a,opts:c});return d});J("cells().nodes()","cell().node()",function(){return this.iterator("cell",function(a,b,c){return(a=a.aoData[b])&&a.anCells?a.anCells[c]:q},1)});y("cells().data()",function(){return this.iterator("cell",function(a,b,c){return T(a,b,c)},1)});J("cells().cache()","cell().cache()",function(a){a="search"===a?"_aFilterData":"_aSortData";return this.iterator("cell",function(b,c,d){return b.aoData[c][a][d]},1)});J("cells().render()","cell().render()",function(a){return this.iterator("cell",
-function(b,c,d){return T(b,c,d,a)},1)});J("cells().indexes()","cell().index()",function(){return this.iterator("cell",function(a,b,c){return{row:b,column:c,columnVisible:va(a,c)}},1)});J("cells().invalidate()","cell().invalidate()",function(a){return this.iterator("cell",function(b,c,d){wa(b,c,a,d)})});y("cell()",function(a,b,c){return wb(this.cells(a,b,c))});y("cell().data()",function(a){var b=this.context,c=this[0];if(a===q)return b.length&&c.length?T(b[0],c[0].row,c[0].column):q;Eb(b[0],c[0].row,
-c[0].column,a);wa(b[0],c[0].row,"data",c[0].column);return this});y("order()",function(a,b){var c=this.context;if(a===q)return 0!==c.length?c[0].aaSorting:q;"number"===typeof a?a=[[a,b]]:a.length&&!Array.isArray(a[0])&&(a=Array.prototype.slice.call(arguments));return this.iterator("table",function(d){d.aaSorting=a.slice()})});y("order.listener()",function(a,b,c){return this.iterator("table",function(d){eb(d,a,b,c)})});y("order.fixed()",function(a){if(!a){var b=this.context;b=b.length?b[0].aaSortingFixed:
-q;return Array.isArray(b)?{pre:b}:b}return this.iterator("table",function(c){c.aaSortingFixed=l.extend(!0,{},a)})});y(["columns().order()","column().order()"],function(a){var b=this;return this.iterator("table",function(c,d){var e=[];l.each(b[d],function(h,f){e.push([f,a])});c.aaSorting=e})});y("search()",function(a,b,c,d){var e=this.context;return a===q?0!==e.length?e[0].oPreviousSearch.sSearch:q:this.iterator("table",function(h){h.oFeatures.bFilter&&za(h,l.extend({},h.oPreviousSearch,{sSearch:a+
-"",bRegex:null===b?!1:b,bSmart:null===c?!0:c,bCaseInsensitive:null===d?!0:d}),1)})});J("columns().search()","column().search()",function(a,b,c,d){return this.iterator("column",function(e,h){var f=e.aoPreSearchCols;if(a===q)return f[h].sSearch;e.oFeatures.bFilter&&(l.extend(f[h],{sSearch:a+"",bRegex:null===b?!1:b,bSmart:null===c?!0:c,bCaseInsensitive:null===d?!0:d}),za(e,e.oPreviousSearch,1))})});y("state()",function(){return this.context.length?this.context[0].oSavedState:null});y("state.clear()",
-function(){return this.iterator("table",function(a){a.fnStateSaveCallback.call(a.oInstance,a,{})})});y("state.loaded()",function(){return this.context.length?this.context[0].oLoadedState:null});y("state.save()",function(){return this.iterator("table",function(a){qa(a)})});u.versionCheck=u.fnVersionCheck=function(a){var b=u.version.split(".");a=a.split(".");for(var c,d,e=0,h=a.length;e<h;e++)if(c=parseInt(b[e],10)||0,d=parseInt(a[e],10)||0,c!==d)return c>d;return!0};u.isDataTable=u.fnIsDataTable=function(a){var b=
-l(a).get(0),c=!1;if(a instanceof u.Api)return!0;l.each(u.settings,function(d,e){d=e.nScrollHead?l("table",e.nScrollHead)[0]:null;var h=e.nScrollFoot?l("table",e.nScrollFoot)[0]:null;if(e.nTable===b||d===b||h===b)c=!0});return c};u.tables=u.fnTables=function(a){var b=!1;l.isPlainObject(a)&&(b=a.api,a=a.visible);var c=l.map(u.settings,function(d){if(!a||a&&l(d.nTable).is(":visible"))return d.nTable});return b?new B(c):c};u.camelToHungarian=P;y("$()",function(a,b){b=this.rows(b).nodes();b=l(b);return l([].concat(b.filter(a).toArray(),
-b.find(a).toArray()))});l.each(["on","one","off"],function(a,b){y(b+"()",function(){var c=Array.prototype.slice.call(arguments);c[0]=l.map(c[0].split(/\s/),function(e){return e.match(/\.dt\b/)?e:e+".dt"}).join(" ");var d=l(this.tables().nodes());d[b].apply(d,c);return this})});y("clear()",function(){return this.iterator("table",function(a){Ka(a)})});y("settings()",function(){return new B(this.context,this.context)});y("init()",function(){var a=this.context;return a.length?a[0].oInit:null});y("data()",
-function(){return this.iterator("table",function(a){return U(a.aoData,"_aData")}).flatten()});y("destroy()",function(a){a=a||!1;return this.iterator("table",function(b){var c=b.nTableWrapper.parentNode,d=b.oClasses,e=b.nTable,h=b.nTBody,f=b.nTHead,g=b.nTFoot,k=l(e);h=l(h);var m=l(b.nTableWrapper),n=l.map(b.aoData,function(t){return t.nTr}),p;b.bDestroying=!0;F(b,"aoDestroyCallback","destroy",[b]);a||(new B(b)).columns().visible(!0);m.off(".DT").find(":not(tbody *)").off(".DT");l(z).off(".DT-"+b.sInstance);
-e!=f.parentNode&&(k.children("thead").detach(),k.append(f));g&&e!=g.parentNode&&(k.children("tfoot").detach(),k.append(g));b.aaSorting=[];b.aaSortingFixed=[];Ra(b);l(n).removeClass(b.asStripeClasses.join(" "));l("th, td",f).removeClass(d.sSortable+" "+d.sSortableAsc+" "+d.sSortableDesc+" "+d.sSortableNone);h.children().detach();h.append(n);f=a?"remove":"detach";k[f]();m[f]();!a&&c&&(c.insertBefore(e,b.nTableReinsertBefore),k.css("width",b.sDestroyWidth).removeClass(d.sTable),(p=b.asDestroyStripes.length)&&
-h.children().each(function(t){l(this).addClass(b.asDestroyStripes[t%p])}));c=l.inArray(b,u.settings);-1!==c&&u.settings.splice(c,1)})});l.each(["column","row","cell"],function(a,b){y(b+"s().every()",function(c){var d=this.selector.opts,e=this;return this.iterator(b,function(h,f,g,k,m){c.call(e[b](f,"cell"===b?g:d,"cell"===b?d:q),f,g,k,m)})})});y("i18n()",function(a,b,c){var d=this.context[0];a=na(a)(d.oLanguage);a===q&&(a=b);c!==q&&l.isPlainObject(a)&&(a=a[c]!==q?a[c]:a._);return a.replace("%d",c)});
-u.version="1.11.3";u.settings=[];u.models={};u.models.oSearch={bCaseInsensitive:!0,sSearch:"",bRegex:!1,bSmart:!0,"return":!1};u.models.oRow={nTr:null,anCells:null,_aData:[],_aSortData:null,_aFilterData:null,_sFilterRow:null,_sRowStripe:"",src:null,idx:-1};u.models.oColumn={idx:null,aDataSort:null,asSorting:null,bSearchable:null,bSortable:null,bVisible:null,_sManualType:null,_bAttrSrc:!1,fnCreatedCell:null,fnGetData:null,fnSetData:null,mData:null,mRender:null,nTh:null,nTf:null,sClass:null,sContentPadding:null,
-sDefaultContent:null,sName:null,sSortDataType:"std",sSortingClass:null,sSortingClassJUI:null,sTitle:null,sType:null,sWidth:null,sWidthOrig:null};u.defaults={aaData:null,aaSorting:[[0,"asc"]],aaSortingFixed:[],ajax:null,aLengthMenu:[10,25,50,100],aoColumns:null,aoColumnDefs:null,aoSearchCols:[],asStripeClasses:null,bAutoWidth:!0,bDeferRender:!1,bDestroy:!1,bFilter:!0,bInfo:!0,bLengthChange:!0,bPaginate:!0,bProcessing:!1,bRetrieve:!1,bScrollCollapse:!1,bServerSide:!1,bSort:!0,bSortMulti:!0,bSortCellsTop:!1,
-bSortClasses:!0,bStateSave:!1,fnCreatedRow:null,fnDrawCallback:null,fnFooterCallback:null,fnFormatNumber:function(a){return a.toString().replace(/\B(?=(\d{3})+(?!\d))/g,this.oLanguage.sThousands)},fnHeaderCallback:null,fnInfoCallback:null,fnInitComplete:null,fnPreDrawCallback:null,fnRowCallback:null,fnServerData:null,fnServerParams:null,fnStateLoadCallback:function(a){try{return JSON.parse((-1===a.iStateDuration?sessionStorage:localStorage).getItem("DataTables_"+a.sInstance+"_"+location.pathname))}catch(b){return{}}},
-fnStateLoadParams:null,fnStateLoaded:null,fnStateSaveCallback:function(a,b){try{(-1===a.iStateDuration?sessionStorage:localStorage).setItem("DataTables_"+a.sInstance+"_"+location.pathname,JSON.stringify(b))}catch(c){}},fnStateSaveParams:null,iStateDuration:7200,iDeferLoading:null,iDisplayLength:10,iDisplayStart:0,iTabIndex:0,oClasses:{},oLanguage:{oAria:{sSortAscending:": activate to sort column ascending",sSortDescending:": activate to sort column descending"},oPaginate:{sFirst:"First",sLast:"Last",
-sNext:"Next",sPrevious:"Previous"},sEmptyTable:"No data available in table",sInfo:"Showing _START_ to _END_ of _TOTAL_ entries",sInfoEmpty:"Showing 0 to 0 of 0 entries",sInfoFiltered:"(filtered from _MAX_ total entries)",sInfoPostFix:"",sDecimal:"",sThousands:",",sLengthMenu:"Show _MENU_ entries",sLoadingRecords:"Loading...",sProcessing:"Processing...",sSearch:"Search:",sSearchPlaceholder:"",sUrl:"",sZeroRecords:"No matching records found"},oSearch:l.extend({},u.models.oSearch),sAjaxDataProp:"data",
-sAjaxSource:null,sDom:"lfrtip",searchDelay:null,sPaginationType:"simple_numbers",sScrollX:"",sScrollXInner:"",sScrollY:"",sServerMethod:"GET",renderer:null,rowId:"DT_RowId"};E(u.defaults);u.defaults.column={aDataSort:null,iDataSort:-1,asSorting:["asc","desc"],bSearchable:!0,bSortable:!0,bVisible:!0,fnCreatedCell:null,mData:null,mRender:null,sCellType:"td",sClass:"",sContentPadding:"",sDefaultContent:null,sName:"",sSortDataType:"std",sTitle:null,sType:null,sWidth:null};E(u.defaults.column);u.models.oSettings=
-{oFeatures:{bAutoWidth:null,bDeferRender:null,bFilter:null,bInfo:null,bLengthChange:null,bPaginate:null,bProcessing:null,bServerSide:null,bSort:null,bSortMulti:null,bSortClasses:null,bStateSave:null},oScroll:{bCollapse:null,iBarWidth:0,sX:null,sXInner:null,sY:null},oLanguage:{fnInfoCallback:null},oBrowser:{bScrollOversize:!1,bScrollbarLeft:!1,bBounding:!1,barWidth:0},ajax:null,aanFeatures:[],aoData:[],aiDisplay:[],aiDisplayMaster:[],aIds:{},aoColumns:[],aoHeader:[],aoFooter:[],oPreviousSearch:{},
-aoPreSearchCols:[],aaSorting:null,aaSortingFixed:[],asStripeClasses:null,asDestroyStripes:[],sDestroyWidth:0,aoRowCallback:[],aoHeaderCallback:[],aoFooterCallback:[],aoDrawCallback:[],aoRowCreatedCallback:[],aoPreDrawCallback:[],aoInitComplete:[],aoStateSaveParams:[],aoStateLoadParams:[],aoStateLoaded:[],sTableId:"",nTable:null,nTHead:null,nTFoot:null,nTBody:null,nTableWrapper:null,bDeferLoading:!1,bInitialised:!1,aoOpenRows:[],sDom:null,searchDelay:null,sPaginationType:"two_button",iStateDuration:0,
-aoStateSave:[],aoStateLoad:[],oSavedState:null,oLoadedState:null,sAjaxSource:null,sAjaxDataProp:null,jqXHR:null,json:q,oAjaxData:q,fnServerData:null,aoServerParams:[],sServerMethod:null,fnFormatNumber:null,aLengthMenu:null,iDraw:0,bDrawing:!1,iDrawError:-1,_iDisplayLength:10,_iDisplayStart:0,_iRecordsTotal:0,_iRecordsDisplay:0,oClasses:{},bFiltered:!1,bSorted:!1,bSortCellsTop:null,oInit:null,aoDestroyCallback:[],fnRecordsTotal:function(){return"ssp"==Q(this)?1*this._iRecordsTotal:this.aiDisplayMaster.length},
-fnRecordsDisplay:function(){return"ssp"==Q(this)?1*this._iRecordsDisplay:this.aiDisplay.length},fnDisplayEnd:function(){var a=this._iDisplayLength,b=this._iDisplayStart,c=b+a,d=this.aiDisplay.length,e=this.oFeatures,h=e.bPaginate;return e.bServerSide?!1===h||-1===a?b+d:Math.min(b+a,this._iRecordsDisplay):!h||c>d||-1===a?d:c},oInstance:null,sInstance:null,iTabIndex:0,nScrollHead:null,nScrollFoot:null,aLastSort:[],oPlugins:{},rowIdFn:null,rowId:null};u.ext=M={buttons:{},classes:{},builder:"-source-",
-errMode:"alert",feature:[],search:[],selector:{cell:[],column:[],row:[]},internal:{},legacy:{ajax:null},pager:{},renderer:{pageButton:{},header:{}},order:{},type:{detect:[],search:{},order:{}},_unique:0,fnVersionCheck:u.fnVersionCheck,iApiIndex:0,oJUIClasses:{},sVersion:u.version};l.extend(M,{afnFiltering:M.search,aTypes:M.type.detect,ofnSearch:M.type.search,oSort:M.type.order,afnSortData:M.order,aoFeatures:M.feature,oApi:M.internal,oStdClasses:M.classes,oPagination:M.pager});l.extend(u.ext.classes,
-{sTable:"dataTable",sNoFooter:"no-footer",sPageButton:"paginate_button",sPageButtonActive:"current",sPageButtonDisabled:"disabled",sStripeOdd:"odd",sStripeEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"sorting_asc",sSortDesc:"sorting_desc",sSortable:"sorting",sSortableAsc:"sorting_desc_disabled",sSortableDesc:"sorting_asc_disabled",
-sSortableNone:"sorting_disabled",sSortColumn:"sorting_",sFilterInput:"",sLengthSelect:"",sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead",sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot",sScrollFootInner:"dataTables_scrollFootInner",sHeaderTH:"",sFooterTH:"",sSortJUIAsc:"",sSortJUIDesc:"",sSortJUI:"",sSortJUIAscAllowed:"",sSortJUIDescAllowed:"",sSortJUIWrapper:"",sSortIcon:"",sJUIHeader:"",sJUIFooter:""});var ec=
-u.ext.pager;l.extend(ec,{simple:function(a,b){return["previous","next"]},full:function(a,b){return["first","previous","next","last"]},numbers:function(a,b){return[Da(a,b)]},simple_numbers:function(a,b){return["previous",Da(a,b),"next"]},full_numbers:function(a,b){return["first","previous",Da(a,b),"next","last"]},first_last_numbers:function(a,b){return["first",Da(a,b),"last"]},_numbers:Da,numbers_length:7});l.extend(!0,u.ext.renderer,{pageButton:{_:function(a,b,c,d,e,h){var f=a.oClasses,g=a.oLanguage.oPaginate,
-k=a.oLanguage.oAria.paginate||{},m,n,p=0,t=function(x,w){var r,C=f.sPageButtonDisabled,G=function(I){lb(a,I.data.action,!0)};var aa=0;for(r=w.length;aa<r;aa++){var L=w[aa];if(Array.isArray(L)){var O=l("<"+(L.DT_el||"div")+"/>").appendTo(x);t(O,L)}else{m=null;n=L;O=a.iTabIndex;switch(L){case "ellipsis":x.append('<span class="ellipsis">&#x2026;</span>');break;case "first":m=g.sFirst;0===e&&(O=-1,n+=" "+C);break;case "previous":m=g.sPrevious;0===e&&(O=-1,n+=" "+C);break;case "next":m=g.sNext;if(0===
-h||e===h-1)O=-1,n+=" "+C;break;case "last":m=g.sLast;if(0===h||e===h-1)O=-1,n+=" "+C;break;default:m=a.fnFormatNumber(L+1),n=e===L?f.sPageButtonActive:""}null!==m&&(O=l("<a>",{"class":f.sPageButton+" "+n,"aria-controls":a.sTableId,"aria-label":k[L],"data-dt-idx":p,tabindex:O,id:0===c&&"string"===typeof L?a.sTableId+"_"+L:null}).html(m).appendTo(x),ob(O,{action:L},G),p++)}}};try{var v=l(b).find(A.activeElement).data("dt-idx")}catch(x){}t(l(b).empty(),d);v!==q&&l(b).find("[data-dt-idx="+v+"]").trigger("focus")}}});
-l.extend(u.ext.type.detect,[function(a,b){b=b.oLanguage.sDecimal;return tb(a,b)?"num"+b:null},function(a,b){if(a&&!(a instanceof Date)&&!uc.test(a))return null;b=Date.parse(a);return null!==b&&!isNaN(b)||Z(a)?"date":null},function(a,b){b=b.oLanguage.sDecimal;return tb(a,b,!0)?"num-fmt"+b:null},function(a,b){b=b.oLanguage.sDecimal;return jc(a,b)?"html-num"+b:null},function(a,b){b=b.oLanguage.sDecimal;return jc(a,b,!0)?"html-num-fmt"+b:null},function(a,b){return Z(a)||"string"===typeof a&&-1!==a.indexOf("<")?
-"html":null}]);l.extend(u.ext.type.search,{html:function(a){return Z(a)?a:"string"===typeof a?a.replace(gc," ").replace(Ua,""):""},string:function(a){return Z(a)?a:"string"===typeof a?a.replace(gc," "):a}});var Ta=function(a,b,c,d){if(0!==a&&(!a||"-"===a))return-Infinity;b&&(a=ic(a,b));a.replace&&(c&&(a=a.replace(c,"")),d&&(a=a.replace(d,"")));return 1*a};l.extend(M.type.order,{"date-pre":function(a){a=Date.parse(a);return isNaN(a)?-Infinity:a},"html-pre":function(a){return Z(a)?"":a.replace?a.replace(/<.*?>/g,
-"").toLowerCase():a+""},"string-pre":function(a){return Z(a)?"":"string"===typeof a?a.toLowerCase():a.toString?a.toString():""},"string-asc":function(a,b){return a<b?-1:a>b?1:0},"string-desc":function(a,b){return a<b?1:a>b?-1:0}});Wa("");l.extend(!0,u.ext.renderer,{header:{_:function(a,b,c,d){l(a.nTable).on("order.dt.DT",function(e,h,f,g){a===h&&(e=c.idx,b.removeClass(d.sSortAsc+" "+d.sSortDesc).addClass("asc"==g[e]?d.sSortAsc:"desc"==g[e]?d.sSortDesc:c.sSortingClass))})},jqueryui:function(a,b,c,
-d){l("<div/>").addClass(d.sSortJUIWrapper).append(b.contents()).append(l("<span/>").addClass(d.sSortIcon+" "+c.sSortingClassJUI)).appendTo(b);l(a.nTable).on("order.dt.DT",function(e,h,f,g){a===h&&(e=c.idx,b.removeClass(d.sSortAsc+" "+d.sSortDesc).addClass("asc"==g[e]?d.sSortAsc:"desc"==g[e]?d.sSortDesc:c.sSortingClass),b.find("span."+d.sSortIcon).removeClass(d.sSortJUIAsc+" "+d.sSortJUIDesc+" "+d.sSortJUI+" "+d.sSortJUIAscAllowed+" "+d.sSortJUIDescAllowed).addClass("asc"==g[e]?d.sSortJUIAsc:"desc"==
-g[e]?d.sSortJUIDesc:c.sSortingClassJUI))})}}});var yb=function(a){Array.isArray(a)&&(a=a.join(","));return"string"===typeof a?a.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;"):a};u.render={number:function(a,b,c,d,e){return{display:function(h){if("number"!==typeof h&&"string"!==typeof h)return h;var f=0>h?"-":"",g=parseFloat(h);if(isNaN(g))return yb(h);g=g.toFixed(c);h=Math.abs(g);g=parseInt(h,10);h=c?b+(h-g).toFixed(c).substring(2):"";0===g&&0===parseFloat(h)&&
-(f="");return f+(d||"")+g.toString().replace(/\B(?=(\d{3})+(?!\d))/g,a)+h+(e||"")}}},text:function(){return{display:yb,filter:yb}}};l.extend(u.ext.internal,{_fnExternApiFunc:fc,_fnBuildAjax:Oa,_fnAjaxUpdate:Gb,_fnAjaxParameters:Pb,_fnAjaxUpdateDraw:Qb,_fnAjaxDataSrc:Aa,_fnAddColumn:Xa,_fnColumnOptions:Ga,_fnAdjustColumnSizing:ta,_fnVisibleToColumnIndex:ua,_fnColumnIndexToVisible:va,_fnVisbleColumns:oa,_fnGetColumns:Ia,_fnColumnTypes:Za,_fnApplyColumnDefs:Db,_fnHungarianMap:E,_fnCamelToHungarian:P,
-_fnLanguageCompat:ma,_fnBrowserDetect:Bb,_fnAddData:ia,_fnAddTr:Ja,_fnNodeToDataIndex:function(a,b){return b._DT_RowIndex!==q?b._DT_RowIndex:null},_fnNodeToColumnIndex:function(a,b,c){return l.inArray(c,a.aoData[b].anCells)},_fnGetCellData:T,_fnSetCellData:Eb,_fnSplitObjNotation:bb,_fnGetObjectDataFn:na,_fnSetObjectDataFn:ha,_fnGetDataMaster:cb,_fnClearTable:Ka,_fnDeleteIndex:La,_fnInvalidate:wa,_fnGetRowElements:ab,_fnCreateTr:$a,_fnBuildHead:Fb,_fnDrawHead:ya,_fnDraw:ja,_fnReDraw:ka,_fnAddOptionsHtml:Ib,
-_fnDetectHeader:xa,_fnGetUniqueThs:Na,_fnFeatureHtmlFilter:Kb,_fnFilterComplete:za,_fnFilterCustom:Tb,_fnFilterColumn:Sb,_fnFilter:Rb,_fnFilterCreateSearch:hb,_fnEscapeRegex:ib,_fnFilterData:Ub,_fnFeatureHtmlInfo:Nb,_fnUpdateInfo:Xb,_fnInfoMacros:Yb,_fnInitialise:Ba,_fnInitComplete:Pa,_fnLengthChange:jb,_fnFeatureHtmlLength:Jb,_fnFeatureHtmlPaginate:Ob,_fnPageChange:lb,_fnFeatureHtmlProcessing:Lb,_fnProcessingDisplay:V,_fnFeatureHtmlTable:Mb,_fnScrollDraw:Ha,_fnApplyToChildren:ca,_fnCalculateColumnWidths:Ya,
-_fnThrottle:gb,_fnConvertToWidth:Zb,_fnGetWidestNode:$b,_fnGetMaxLenString:ac,_fnStringToCss:K,_fnSortFlatten:pa,_fnSort:Hb,_fnSortAria:cc,_fnSortListener:nb,_fnSortAttachListener:eb,_fnSortingClasses:Ra,_fnSortData:bc,_fnSaveState:qa,_fnLoadState:dc,_fnImplementState:pb,_fnSettingsFromNode:Sa,_fnLog:da,_fnMap:X,_fnBindAction:ob,_fnCallbackReg:R,_fnCallbackFire:F,_fnLengthOverflow:kb,_fnRenderer:fb,_fnDataSource:Q,_fnRowAttributes:db,_fnExtend:qb,_fnCalculateEnd:function(){}});l.fn.dataTable=u;u.$=
-l;l.fn.dataTableSettings=u.settings;l.fn.dataTableExt=u.ext;l.fn.DataTable=function(a){return l(this).dataTable(a).api()};l.each(u,function(a,b){l.fn.DataTable[a]=b});return u});
+/*! DataTables 1.10.7
+ * ©2008-2015 SpryMedia Ltd - datatables.net/license
+ */
+(function(Ea,Q,k){var P=function(h){function W(a){var b,c,e={};h.each(a,function(d){if((b=d.match(/^([^A-Z]+?)([A-Z])/))&&-1!=="a aa ai ao as b fn i m o s ".indexOf(b[1]+" "))c=d.replace(b[0],b[2].toLowerCase()),e[c]=d,"o"===b[1]&&W(a[d])});a._hungarianMap=e}function H(a,b,c){a._hungarianMap||W(a);var e;h.each(b,function(d){e=a._hungarianMap[d];if(e!==k&&(c||b[e]===k))"o"===e.charAt(0)?(b[e]||(b[e]={}),h.extend(!0,b[e],b[d]),H(a[e],b[e],c)):b[e]=b[d]})}function P(a){var b=m.defaults.oLanguage,c=a.sZeroRecords;
+!a.sEmptyTable&&(c&&"No data available in table"===b.sEmptyTable)&&E(a,a,"sZeroRecords","sEmptyTable");!a.sLoadingRecords&&(c&&"Loading..."===b.sLoadingRecords)&&E(a,a,"sZeroRecords","sLoadingRecords");a.sInfoThousands&&(a.sThousands=a.sInfoThousands);(a=a.sDecimal)&&db(a)}function eb(a){A(a,"ordering","bSort");A(a,"orderMulti","bSortMulti");A(a,"orderClasses","bSortClasses");A(a,"orderCellsTop","bSortCellsTop");A(a,"order","aaSorting");A(a,"orderFixed","aaSortingFixed");A(a,"paging","bPaginate");
+A(a,"pagingType","sPaginationType");A(a,"pageLength","iDisplayLength");A(a,"searching","bFilter");if(a=a.aoSearchCols)for(var b=0,c=a.length;b<c;b++)a[b]&&H(m.models.oSearch,a[b])}function fb(a){A(a,"orderable","bSortable");A(a,"orderData","aDataSort");A(a,"orderSequence","asSorting");A(a,"orderDataType","sortDataType");var b=a.aDataSort;b&&!h.isArray(b)&&(a.aDataSort=[b])}function gb(a){var a=a.oBrowser,b=h("<div/>").css({position:"absolute",top:0,left:0,height:1,width:1,overflow:"hidden"}).append(h("<div/>").css({position:"absolute",
+top:1,left:1,width:100,overflow:"scroll"}).append(h('<div class="test"/>').css({width:"100%",height:10}))).appendTo("body"),c=b.find(".test");a.bScrollOversize=100===c[0].offsetWidth;a.bScrollbarLeft=1!==Math.round(c.offset().left);b.remove()}function hb(a,b,c,e,d,f){var g,j=!1;c!==k&&(g=c,j=!0);for(;e!==d;)a.hasOwnProperty(e)&&(g=j?b(g,a[e],e,a):a[e],j=!0,e+=f);return g}function Fa(a,b){var c=m.defaults.column,e=a.aoColumns.length,c=h.extend({},m.models.oColumn,c,{nTh:b?b:Q.createElement("th"),sTitle:c.sTitle?
+c.sTitle:b?b.innerHTML:"",aDataSort:c.aDataSort?c.aDataSort:[e],mData:c.mData?c.mData:e,idx:e});a.aoColumns.push(c);c=a.aoPreSearchCols;c[e]=h.extend({},m.models.oSearch,c[e]);ka(a,e,h(b).data())}function ka(a,b,c){var b=a.aoColumns[b],e=a.oClasses,d=h(b.nTh);if(!b.sWidthOrig){b.sWidthOrig=d.attr("width")||null;var f=(d.attr("style")||"").match(/width:\s*(\d+[pxem%]+)/);f&&(b.sWidthOrig=f[1])}c!==k&&null!==c&&(fb(c),H(m.defaults.column,c),c.mDataProp!==k&&!c.mData&&(c.mData=c.mDataProp),c.sType&&
+(b._sManualType=c.sType),c.className&&!c.sClass&&(c.sClass=c.className),h.extend(b,c),E(b,c,"sWidth","sWidthOrig"),c.iDataSort!==k&&(b.aDataSort=[c.iDataSort]),E(b,c,"aDataSort"));var g=b.mData,j=R(g),i=b.mRender?R(b.mRender):null,c=function(a){return"string"===typeof a&&-1!==a.indexOf("@")};b._bAttrSrc=h.isPlainObject(g)&&(c(g.sort)||c(g.type)||c(g.filter));b.fnGetData=function(a,b,c){var e=j(a,b,k,c);return i&&b?i(e,b,a,c):e};b.fnSetData=function(a,b,c){return S(g)(a,b,c)};"number"!==typeof g&&
+(a._rowReadObject=!0);a.oFeatures.bSort||(b.bSortable=!1,d.addClass(e.sSortableNone));a=-1!==h.inArray("asc",b.asSorting);c=-1!==h.inArray("desc",b.asSorting);!b.bSortable||!a&&!c?(b.sSortingClass=e.sSortableNone,b.sSortingClassJUI=""):a&&!c?(b.sSortingClass=e.sSortableAsc,b.sSortingClassJUI=e.sSortJUIAscAllowed):!a&&c?(b.sSortingClass=e.sSortableDesc,b.sSortingClassJUI=e.sSortJUIDescAllowed):(b.sSortingClass=e.sSortable,b.sSortingClassJUI=e.sSortJUI)}function X(a){if(!1!==a.oFeatures.bAutoWidth){var b=
+a.aoColumns;Ga(a);for(var c=0,e=b.length;c<e;c++)b[c].nTh.style.width=b[c].sWidth}b=a.oScroll;(""!==b.sY||""!==b.sX)&&Y(a);w(a,null,"column-sizing",[a])}function la(a,b){var c=Z(a,"bVisible");return"number"===typeof c[b]?c[b]:null}function $(a,b){var c=Z(a,"bVisible"),c=h.inArray(b,c);return-1!==c?c:null}function aa(a){return Z(a,"bVisible").length}function Z(a,b){var c=[];h.map(a.aoColumns,function(a,d){a[b]&&c.push(d)});return c}function Ha(a){var b=a.aoColumns,c=a.aoData,e=m.ext.type.detect,d,
+f,g,j,i,h,l,q,n;d=0;for(f=b.length;d<f;d++)if(l=b[d],n=[],!l.sType&&l._sManualType)l.sType=l._sManualType;else if(!l.sType){g=0;for(j=e.length;g<j;g++){i=0;for(h=c.length;i<h;i++){n[i]===k&&(n[i]=x(a,i,d,"type"));q=e[g](n[i],a);if(!q&&g!==e.length-1)break;if("html"===q)break}if(q){l.sType=q;break}}l.sType||(l.sType="string")}}function ib(a,b,c,e){var d,f,g,j,i,o,l=a.aoColumns;if(b)for(d=b.length-1;0<=d;d--){o=b[d];var q=o.targets!==k?o.targets:o.aTargets;h.isArray(q)||(q=[q]);f=0;for(g=q.length;f<
+g;f++)if("number"===typeof q[f]&&0<=q[f]){for(;l.length<=q[f];)Fa(a);e(q[f],o)}else if("number"===typeof q[f]&&0>q[f])e(l.length+q[f],o);else if("string"===typeof q[f]){j=0;for(i=l.length;j<i;j++)("_all"==q[f]||h(l[j].nTh).hasClass(q[f]))&&e(j,o)}}if(c){d=0;for(a=c.length;d<a;d++)e(d,c[d])}}function K(a,b,c,e){var d=a.aoData.length,f=h.extend(!0,{},m.models.oRow,{src:c?"dom":"data"});f._aData=b;a.aoData.push(f);for(var b=a.aoColumns,f=0,g=b.length;f<g;f++)c&&Ia(a,d,f,x(a,d,f)),b[f].sType=null;a.aiDisplayMaster.push(d);
+(c||!a.oFeatures.bDeferRender)&&Ja(a,d,c,e);return d}function ma(a,b){var c;b instanceof h||(b=h(b));return b.map(function(b,d){c=na(a,d);return K(a,c.data,d,c.cells)})}function x(a,b,c,e){var d=a.iDraw,f=a.aoColumns[c],g=a.aoData[b]._aData,j=f.sDefaultContent,c=f.fnGetData(g,e,{settings:a,row:b,col:c});if(c===k)return a.iDrawError!=d&&null===j&&(I(a,0,"Requested unknown parameter "+("function"==typeof f.mData?"{function}":"'"+f.mData+"'")+" for row "+b,4),a.iDrawError=d),j;if((c===g||null===c)&&
+null!==j)c=j;else if("function"===typeof c)return c.call(g);return null===c&&"display"==e?"":c}function Ia(a,b,c,e){a.aoColumns[c].fnSetData(a.aoData[b]._aData,e,{settings:a,row:b,col:c})}function Ka(a){return h.map(a.match(/(\\.|[^\.])+/g),function(a){return a.replace(/\\./g,".")})}function R(a){if(h.isPlainObject(a)){var b={};h.each(a,function(a,c){c&&(b[a]=R(c))});return function(a,c,f,g){var j=b[c]||b._;return j!==k?j(a,c,f,g):a}}if(null===a)return function(a){return a};if("function"===typeof a)return function(b,
+c,f,g){return a(b,c,f,g)};if("string"===typeof a&&(-1!==a.indexOf(".")||-1!==a.indexOf("[")||-1!==a.indexOf("("))){var c=function(a,b,f){var g,j;if(""!==f){j=Ka(f);for(var i=0,h=j.length;i<h;i++){f=j[i].match(ba);g=j[i].match(T);if(f){j[i]=j[i].replace(ba,"");""!==j[i]&&(a=a[j[i]]);g=[];j.splice(0,i+1);j=j.join(".");i=0;for(h=a.length;i<h;i++)g.push(c(a[i],b,j));a=f[0].substring(1,f[0].length-1);a=""===a?g:g.join(a);break}else if(g){j[i]=j[i].replace(T,"");a=a[j[i]]();continue}if(null===a||a[j[i]]===
+k)return k;a=a[j[i]]}}return a};return function(b,d){return c(b,d,a)}}return function(b){return b[a]}}function S(a){if(h.isPlainObject(a))return S(a._);if(null===a)return function(){};if("function"===typeof a)return function(b,e,d){a(b,"set",e,d)};if("string"===typeof a&&(-1!==a.indexOf(".")||-1!==a.indexOf("[")||-1!==a.indexOf("("))){var b=function(a,e,d){var d=Ka(d),f;f=d[d.length-1];for(var g,j,i=0,h=d.length-1;i<h;i++){g=d[i].match(ba);j=d[i].match(T);if(g){d[i]=d[i].replace(ba,"");a[d[i]]=[];
+f=d.slice();f.splice(0,i+1);g=f.join(".");j=0;for(h=e.length;j<h;j++)f={},b(f,e[j],g),a[d[i]].push(f);return}j&&(d[i]=d[i].replace(T,""),a=a[d[i]](e));if(null===a[d[i]]||a[d[i]]===k)a[d[i]]={};a=a[d[i]]}if(f.match(T))a[f.replace(T,"")](e);else a[f.replace(ba,"")]=e};return function(c,e){return b(c,e,a)}}return function(b,e){b[a]=e}}function La(a){return D(a.aoData,"_aData")}function oa(a){a.aoData.length=0;a.aiDisplayMaster.length=0;a.aiDisplay.length=0}function pa(a,b,c){for(var e=-1,d=0,f=a.length;d<
+f;d++)a[d]==b?e=d:a[d]>b&&a[d]--; -1!=e&&c===k&&a.splice(e,1)}function ca(a,b,c,e){var d=a.aoData[b],f,g=function(c,f){for(;c.childNodes.length;)c.removeChild(c.firstChild);c.innerHTML=x(a,b,f,"display")};if("dom"===c||(!c||"auto"===c)&&"dom"===d.src)d._aData=na(a,d,e,e===k?k:d._aData).data;else{var j=d.anCells;if(j)if(e!==k)g(j[e],e);else{c=0;for(f=j.length;c<f;c++)g(j[c],c)}}d._aSortData=null;d._aFilterData=null;g=a.aoColumns;if(e!==k)g[e].sType=null;else{c=0;for(f=g.length;c<f;c++)g[c].sType=null;
+Ma(d)}}function na(a,b,c,e){var d=[],f=b.firstChild,g,j=0,i,o=a.aoColumns,l=a._rowReadObject,e=e||l?{}:[],q=function(a,b){if("string"===typeof a){var c=a.indexOf("@");-1!==c&&(c=a.substring(c+1),S(a)(e,b.getAttribute(c)))}},a=function(a){if(c===k||c===j)g=o[j],i=h.trim(a.innerHTML),g&&g._bAttrSrc?(S(g.mData._)(e,i),q(g.mData.sort,a),q(g.mData.type,a),q(g.mData.filter,a)):l?(g._setter||(g._setter=S(g.mData)),g._setter(e,i)):e[j]=i;j++};if(f)for(;f;){b=f.nodeName.toUpperCase();if("TD"==b||"TH"==b)a(f),
+d.push(f);f=f.nextSibling}else{d=b.anCells;f=0;for(b=d.length;f<b;f++)a(d[f])}return{data:e,cells:d}}function Ja(a,b,c,e){var d=a.aoData[b],f=d._aData,g=[],j,i,h,l,q;if(null===d.nTr){j=c||Q.createElement("tr");d.nTr=j;d.anCells=g;j._DT_RowIndex=b;Ma(d);l=0;for(q=a.aoColumns.length;l<q;l++){h=a.aoColumns[l];i=c?e[l]:Q.createElement(h.sCellType);g.push(i);if(!c||h.mRender||h.mData!==l)i.innerHTML=x(a,b,l,"display");h.sClass&&(i.className+=" "+h.sClass);h.bVisible&&!c?j.appendChild(i):!h.bVisible&&c&&
+i.parentNode.removeChild(i);h.fnCreatedCell&&h.fnCreatedCell.call(a.oInstance,i,x(a,b,l),f,b,l)}w(a,"aoRowCreatedCallback",null,[j,f,b])}d.nTr.setAttribute("role","row")}function Ma(a){var b=a.nTr,c=a._aData;if(b){c.DT_RowId&&(b.id=c.DT_RowId);if(c.DT_RowClass){var e=c.DT_RowClass.split(" ");a.__rowc=a.__rowc?Na(a.__rowc.concat(e)):e;h(b).removeClass(a.__rowc.join(" ")).addClass(c.DT_RowClass)}c.DT_RowAttr&&h(b).attr(c.DT_RowAttr);c.DT_RowData&&h(b).data(c.DT_RowData)}}function jb(a){var b,c,e,d,
+f,g=a.nTHead,j=a.nTFoot,i=0===h("th, td",g).length,o=a.oClasses,l=a.aoColumns;i&&(d=h("<tr/>").appendTo(g));b=0;for(c=l.length;b<c;b++)f=l[b],e=h(f.nTh).addClass(f.sClass),i&&e.appendTo(d),a.oFeatures.bSort&&(e.addClass(f.sSortingClass),!1!==f.bSortable&&(e.attr("tabindex",a.iTabIndex).attr("aria-controls",a.sTableId),Oa(a,f.nTh,b))),f.sTitle!=e.html()&&e.html(f.sTitle),Pa(a,"header")(a,e,f,o);i&&da(a.aoHeader,g);h(g).find(">tr").attr("role","row");h(g).find(">tr>th, >tr>td").addClass(o.sHeaderTH);
+h(j).find(">tr>th, >tr>td").addClass(o.sFooterTH);if(null!==j){a=a.aoFooter[0];b=0;for(c=a.length;b<c;b++)f=l[b],f.nTf=a[b].cell,f.sClass&&h(f.nTf).addClass(f.sClass)}}function ea(a,b,c){var e,d,f,g=[],j=[],i=a.aoColumns.length,o;if(b){c===k&&(c=!1);e=0;for(d=b.length;e<d;e++){g[e]=b[e].slice();g[e].nTr=b[e].nTr;for(f=i-1;0<=f;f--)!a.aoColumns[f].bVisible&&!c&&g[e].splice(f,1);j.push([])}e=0;for(d=g.length;e<d;e++){if(a=g[e].nTr)for(;f=a.firstChild;)a.removeChild(f);f=0;for(b=g[e].length;f<b;f++)if(o=
+i=1,j[e][f]===k){a.appendChild(g[e][f].cell);for(j[e][f]=1;g[e+i]!==k&&g[e][f].cell==g[e+i][f].cell;)j[e+i][f]=1,i++;for(;g[e][f+o]!==k&&g[e][f].cell==g[e][f+o].cell;){for(c=0;c<i;c++)j[e+c][f+o]=1;o++}h(g[e][f].cell).attr("rowspan",i).attr("colspan",o)}}}}function M(a){var b=w(a,"aoPreDrawCallback","preDraw",[a]);if(-1!==h.inArray(!1,b))C(a,!1);else{var b=[],c=0,e=a.asStripeClasses,d=e.length,f=a.oLanguage,g=a.iInitDisplayStart,j="ssp"==B(a),i=a.aiDisplay;a.bDrawing=!0;g!==k&&-1!==g&&(a._iDisplayStart=
+j?g:g>=a.fnRecordsDisplay()?0:g,a.iInitDisplayStart=-1);var g=a._iDisplayStart,o=a.fnDisplayEnd();if(a.bDeferLoading)a.bDeferLoading=!1,a.iDraw++,C(a,!1);else if(j){if(!a.bDestroying&&!kb(a))return}else a.iDraw++;if(0!==i.length){f=j?a.aoData.length:o;for(j=j?0:g;j<f;j++){var l=i[j],q=a.aoData[l];null===q.nTr&&Ja(a,l);l=q.nTr;if(0!==d){var n=e[c%d];q._sRowStripe!=n&&(h(l).removeClass(q._sRowStripe).addClass(n),q._sRowStripe=n)}w(a,"aoRowCallback",null,[l,q._aData,c,j]);b.push(l);c++}}else c=f.sZeroRecords,
+1==a.iDraw&&"ajax"==B(a)?c=f.sLoadingRecords:f.sEmptyTable&&0===a.fnRecordsTotal()&&(c=f.sEmptyTable),b[0]=h("<tr/>",{"class":d?e[0]:""}).append(h("<td />",{valign:"top",colSpan:aa(a),"class":a.oClasses.sRowEmpty}).html(c))[0];w(a,"aoHeaderCallback","header",[h(a.nTHead).children("tr")[0],La(a),g,o,i]);w(a,"aoFooterCallback","footer",[h(a.nTFoot).children("tr")[0],La(a),g,o,i]);e=h(a.nTBody);e.children().detach();e.append(h(b));w(a,"aoDrawCallback","draw",[a]);a.bSorted=!1;a.bFiltered=!1;a.bDrawing=
+!1}}function N(a,b){var c=a.oFeatures,e=c.bFilter;c.bSort&&lb(a);e?fa(a,a.oPreviousSearch):a.aiDisplay=a.aiDisplayMaster.slice();!0!==b&&(a._iDisplayStart=0);a._drawHold=b;M(a);a._drawHold=!1}function mb(a){var b=a.oClasses,c=h(a.nTable),c=h("<div/>").insertBefore(c),e=a.oFeatures,d=h("<div/>",{id:a.sTableId+"_wrapper","class":b.sWrapper+(a.nTFoot?"":" "+b.sNoFooter)});a.nHolding=c[0];a.nTableWrapper=d[0];a.nTableReinsertBefore=a.nTable.nextSibling;for(var f=a.sDom.split(""),g,j,i,o,l,q,n=0;n<f.length;n++){g=
+null;j=f[n];if("<"==j){i=h("<div/>")[0];o=f[n+1];if("'"==o||'"'==o){l="";for(q=2;f[n+q]!=o;)l+=f[n+q],q++;"H"==l?l=b.sJUIHeader:"F"==l&&(l=b.sJUIFooter);-1!=l.indexOf(".")?(o=l.split("."),i.id=o[0].substr(1,o[0].length-1),i.className=o[1]):"#"==l.charAt(0)?i.id=l.substr(1,l.length-1):i.className=l;n+=q}d.append(i);d=h(i)}else if(">"==j)d=d.parent();else if("l"==j&&e.bPaginate&&e.bLengthChange)g=nb(a);else if("f"==j&&e.bFilter)g=ob(a);else if("r"==j&&e.bProcessing)g=pb(a);else if("t"==j)g=qb(a);else if("i"==
+j&&e.bInfo)g=rb(a);else if("p"==j&&e.bPaginate)g=sb(a);else if(0!==m.ext.feature.length){i=m.ext.feature;q=0;for(o=i.length;q<o;q++)if(j==i[q].cFeature){g=i[q].fnInit(a);break}}g&&(i=a.aanFeatures,i[j]||(i[j]=[]),i[j].push(g),d.append(g))}c.replaceWith(d)}function da(a,b){var c=h(b).children("tr"),e,d,f,g,j,i,o,l,q,n;a.splice(0,a.length);f=0;for(i=c.length;f<i;f++)a.push([]);f=0;for(i=c.length;f<i;f++){e=c[f];for(d=e.firstChild;d;){if("TD"==d.nodeName.toUpperCase()||"TH"==d.nodeName.toUpperCase()){l=
+1*d.getAttribute("colspan");q=1*d.getAttribute("rowspan");l=!l||0===l||1===l?1:l;q=!q||0===q||1===q?1:q;g=0;for(j=a[f];j[g];)g++;o=g;n=1===l?!0:!1;for(j=0;j<l;j++)for(g=0;g<q;g++)a[f+g][o+j]={cell:d,unique:n},a[f+g].nTr=e}d=d.nextSibling}}}function qa(a,b,c){var e=[];c||(c=a.aoHeader,b&&(c=[],da(c,b)));for(var b=0,d=c.length;b<d;b++)for(var f=0,g=c[b].length;f<g;f++)if(c[b][f].unique&&(!e[f]||!a.bSortCellsTop))e[f]=c[b][f].cell;return e}function ra(a,b,c){w(a,"aoServerParams","serverParams",[b]);
+if(b&&h.isArray(b)){var e={},d=/(.*?)\[\]$/;h.each(b,function(a,b){var c=b.name.match(d);c?(c=c[0],e[c]||(e[c]=[]),e[c].push(b.value)):e[b.name]=b.value});b=e}var f,g=a.ajax,j=a.oInstance,i=function(b){w(a,null,"xhr",[a,b,a.jqXHR]);c(b)};if(h.isPlainObject(g)&&g.data){f=g.data;var o=h.isFunction(f)?f(b,a):f,b=h.isFunction(f)&&o?o:h.extend(!0,b,o);delete g.data}o={data:b,success:function(b){var c=b.error||b.sError;c&&I(a,0,c);a.json=b;i(b)},dataType:"json",cache:!1,type:a.sServerMethod,error:function(b,
+c){var f=w(a,null,"xhr",[a,null,a.jqXHR]);-1===h.inArray(!0,f)&&("parsererror"==c?I(a,0,"Invalid JSON response",1):4===b.readyState&&I(a,0,"Ajax error",7));C(a,!1)}};a.oAjaxData=b;w(a,null,"preXhr",[a,b]);a.fnServerData?a.fnServerData.call(j,a.sAjaxSource,h.map(b,function(a,b){return{name:b,value:a}}),i,a):a.sAjaxSource||"string"===typeof g?a.jqXHR=h.ajax(h.extend(o,{url:g||a.sAjaxSource})):h.isFunction(g)?a.jqXHR=g.call(j,b,i,a):(a.jqXHR=h.ajax(h.extend(o,g)),g.data=f)}function kb(a){return a.bAjaxDataGet?
+(a.iDraw++,C(a,!0),ra(a,tb(a),function(b){ub(a,b)}),!1):!0}function tb(a){var b=a.aoColumns,c=b.length,e=a.oFeatures,d=a.oPreviousSearch,f=a.aoPreSearchCols,g,j=[],i,o,l,q=U(a);g=a._iDisplayStart;i=!1!==e.bPaginate?a._iDisplayLength:-1;var n=function(a,b){j.push({name:a,value:b})};n("sEcho",a.iDraw);n("iColumns",c);n("sColumns",D(b,"sName").join(","));n("iDisplayStart",g);n("iDisplayLength",i);var k={draw:a.iDraw,columns:[],order:[],start:g,length:i,search:{value:d.sSearch,regex:d.bRegex}};for(g=
+0;g<c;g++)o=b[g],l=f[g],i="function"==typeof o.mData?"function":o.mData,k.columns.push({data:i,name:o.sName,searchable:o.bSearchable,orderable:o.bSortable,search:{value:l.sSearch,regex:l.bRegex}}),n("mDataProp_"+g,i),e.bFilter&&(n("sSearch_"+g,l.sSearch),n("bRegex_"+g,l.bRegex),n("bSearchable_"+g,o.bSearchable)),e.bSort&&n("bSortable_"+g,o.bSortable);e.bFilter&&(n("sSearch",d.sSearch),n("bRegex",d.bRegex));e.bSort&&(h.each(q,function(a,b){k.order.push({column:b.col,dir:b.dir});n("iSortCol_"+a,b.col);
+n("sSortDir_"+a,b.dir)}),n("iSortingCols",q.length));b=m.ext.legacy.ajax;return null===b?a.sAjaxSource?j:k:b?j:k}function ub(a,b){var c=sa(a,b),e=b.sEcho!==k?b.sEcho:b.draw,d=b.iTotalRecords!==k?b.iTotalRecords:b.recordsTotal,f=b.iTotalDisplayRecords!==k?b.iTotalDisplayRecords:b.recordsFiltered;if(e){if(1*e<a.iDraw)return;a.iDraw=1*e}oa(a);a._iRecordsTotal=parseInt(d,10);a._iRecordsDisplay=parseInt(f,10);e=0;for(d=c.length;e<d;e++)K(a,c[e]);a.aiDisplay=a.aiDisplayMaster.slice();a.bAjaxDataGet=!1;
+M(a);a._bInitComplete||ta(a,b);a.bAjaxDataGet=!0;C(a,!1)}function sa(a,b){var c=h.isPlainObject(a.ajax)&&a.ajax.dataSrc!==k?a.ajax.dataSrc:a.sAjaxDataProp;return"data"===c?b.aaData||b[c]:""!==c?R(c)(b):b}function ob(a){var b=a.oClasses,c=a.sTableId,e=a.oLanguage,d=a.oPreviousSearch,f=a.aanFeatures,g='<input type="search" class="'+b.sFilterInput+'"/>',j=e.sSearch,j=j.match(/_INPUT_/)?j.replace("_INPUT_",g):j+g,b=h("<div/>",{id:!f.f?c+"_filter":null,"class":b.sFilter}).append(h("<label/>").append(j)),
+f=function(){var b=!this.value?"":this.value;b!=d.sSearch&&(fa(a,{sSearch:b,bRegex:d.bRegex,bSmart:d.bSmart,bCaseInsensitive:d.bCaseInsensitive}),a._iDisplayStart=0,M(a))},g=null!==a.searchDelay?a.searchDelay:"ssp"===B(a)?400:0,i=h("input",b).val(d.sSearch).attr("placeholder",e.sSearchPlaceholder).bind("keyup.DT search.DT input.DT paste.DT cut.DT",g?ua(f,g):f).bind("keypress.DT",function(a){if(13==a.keyCode)return!1}).attr("aria-controls",c);h(a.nTable).on("search.dt.DT",function(b,c){if(a===c)try{i[0]!==
+Q.activeElement&&i.val(d.sSearch)}catch(f){}});return b[0]}function fa(a,b,c){var e=a.oPreviousSearch,d=a.aoPreSearchCols,f=function(a){e.sSearch=a.sSearch;e.bRegex=a.bRegex;e.bSmart=a.bSmart;e.bCaseInsensitive=a.bCaseInsensitive};Ha(a);if("ssp"!=B(a)){vb(a,b.sSearch,c,b.bEscapeRegex!==k?!b.bEscapeRegex:b.bRegex,b.bSmart,b.bCaseInsensitive);f(b);for(b=0;b<d.length;b++)wb(a,d[b].sSearch,b,d[b].bEscapeRegex!==k?!d[b].bEscapeRegex:d[b].bRegex,d[b].bSmart,d[b].bCaseInsensitive);xb(a)}else f(b);a.bFiltered=
+!0;w(a,null,"search",[a])}function xb(a){for(var b=m.ext.search,c=a.aiDisplay,e,d,f=0,g=b.length;f<g;f++){for(var j=[],i=0,h=c.length;i<h;i++)d=c[i],e=a.aoData[d],b[f](a,e._aFilterData,d,e._aData,i)&&j.push(d);c.length=0;c.push.apply(c,j)}}function wb(a,b,c,e,d,f){if(""!==b)for(var g=a.aiDisplay,e=Qa(b,e,d,f),d=g.length-1;0<=d;d--)b=a.aoData[g[d]]._aFilterData[c],e.test(b)||g.splice(d,1)}function vb(a,b,c,e,d,f){var e=Qa(b,e,d,f),d=a.oPreviousSearch.sSearch,f=a.aiDisplayMaster,g;0!==m.ext.search.length&&
+(c=!0);g=yb(a);if(0>=b.length)a.aiDisplay=f.slice();else{if(g||c||d.length>b.length||0!==b.indexOf(d)||a.bSorted)a.aiDisplay=f.slice();b=a.aiDisplay;for(c=b.length-1;0<=c;c--)e.test(a.aoData[b[c]]._sFilterRow)||b.splice(c,1)}}function Qa(a,b,c,e){a=b?a:va(a);c&&(a="^(?=.*?"+h.map(a.match(/"[^"]+"|[^ ]+/g)||[""],function(a){if('"'===a.charAt(0))var b=a.match(/^"(.*)"$/),a=b?b[1]:a;return a.replace('"',"")}).join(")(?=.*?")+").*$");return RegExp(a,e?"i":"")}function va(a){return a.replace(Yb,"\\$1")}
+function yb(a){var b=a.aoColumns,c,e,d,f,g,j,i,h,l=m.ext.type.search;c=!1;e=0;for(f=a.aoData.length;e<f;e++)if(h=a.aoData[e],!h._aFilterData){j=[];d=0;for(g=b.length;d<g;d++)c=b[d],c.bSearchable?(i=x(a,e,d,"filter"),l[c.sType]&&(i=l[c.sType](i)),null===i&&(i=""),"string"!==typeof i&&i.toString&&(i=i.toString())):i="",i.indexOf&&-1!==i.indexOf("&")&&(wa.innerHTML=i,i=Zb?wa.textContent:wa.innerText),i.replace&&(i=i.replace(/[\r\n]/g,"")),j.push(i);h._aFilterData=j;h._sFilterRow=j.join("  ");c=!0}return c}
+function zb(a){return{search:a.sSearch,smart:a.bSmart,regex:a.bRegex,caseInsensitive:a.bCaseInsensitive}}function Ab(a){return{sSearch:a.search,bSmart:a.smart,bRegex:a.regex,bCaseInsensitive:a.caseInsensitive}}function rb(a){var b=a.sTableId,c=a.aanFeatures.i,e=h("<div/>",{"class":a.oClasses.sInfo,id:!c?b+"_info":null});c||(a.aoDrawCallback.push({fn:Bb,sName:"information"}),e.attr("role","status").attr("aria-live","polite"),h(a.nTable).attr("aria-describedby",b+"_info"));return e[0]}function Bb(a){var b=
+a.aanFeatures.i;if(0!==b.length){var c=a.oLanguage,e=a._iDisplayStart+1,d=a.fnDisplayEnd(),f=a.fnRecordsTotal(),g=a.fnRecordsDisplay(),j=g?c.sInfo:c.sInfoEmpty;g!==f&&(j+=" "+c.sInfoFiltered);j+=c.sInfoPostFix;j=Cb(a,j);c=c.fnInfoCallback;null!==c&&(j=c.call(a.oInstance,a,e,d,f,g,j));h(b).html(j)}}function Cb(a,b){var c=a.fnFormatNumber,e=a._iDisplayStart+1,d=a._iDisplayLength,f=a.fnRecordsDisplay(),g=-1===d;return b.replace(/_START_/g,c.call(a,e)).replace(/_END_/g,c.call(a,a.fnDisplayEnd())).replace(/_MAX_/g,
+c.call(a,a.fnRecordsTotal())).replace(/_TOTAL_/g,c.call(a,f)).replace(/_PAGE_/g,c.call(a,g?1:Math.ceil(e/d))).replace(/_PAGES_/g,c.call(a,g?1:Math.ceil(f/d)))}function ga(a){var b,c,e=a.iInitDisplayStart,d=a.aoColumns,f;c=a.oFeatures;if(a.bInitialised){mb(a);jb(a);ea(a,a.aoHeader);ea(a,a.aoFooter);C(a,!0);c.bAutoWidth&&Ga(a);b=0;for(c=d.length;b<c;b++)f=d[b],f.sWidth&&(f.nTh.style.width=s(f.sWidth));N(a);d=B(a);"ssp"!=d&&("ajax"==d?ra(a,[],function(c){var f=sa(a,c);for(b=0;b<f.length;b++)K(a,f[b]);
+a.iInitDisplayStart=e;N(a);C(a,!1);ta(a,c)},a):(C(a,!1),ta(a)))}else setTimeout(function(){ga(a)},200)}function ta(a,b){a._bInitComplete=!0;b&&X(a);w(a,"aoInitComplete","init",[a,b])}function Ra(a,b){var c=parseInt(b,10);a._iDisplayLength=c;Sa(a);w(a,null,"length",[a,c])}function nb(a){for(var b=a.oClasses,c=a.sTableId,e=a.aLengthMenu,d=h.isArray(e[0]),f=d?e[0]:e,e=d?e[1]:e,d=h("<select/>",{name:c+"_length","aria-controls":c,"class":b.sLengthSelect}),g=0,j=f.length;g<j;g++)d[0][g]=new Option(e[g],
+f[g]);var i=h("<div><label/></div>").addClass(b.sLength);a.aanFeatures.l||(i[0].id=c+"_length");i.children().append(a.oLanguage.sLengthMenu.replace("_MENU_",d[0].outerHTML));h("select",i).val(a._iDisplayLength).bind("change.DT",function(){Ra(a,h(this).val());M(a)});h(a.nTable).bind("length.dt.DT",function(b,c,f){a===c&&h("select",i).val(f)});return i[0]}function sb(a){var b=a.sPaginationType,c=m.ext.pager[b],e="function"===typeof c,d=function(a){M(a)},b=h("<div/>").addClass(a.oClasses.sPaging+b)[0],
+f=a.aanFeatures;e||c.fnInit(a,b,d);f.p||(b.id=a.sTableId+"_paginate",a.aoDrawCallback.push({fn:function(a){if(e){var b=a._iDisplayStart,i=a._iDisplayLength,h=a.fnRecordsDisplay(),l=-1===i,b=l?0:Math.ceil(b/i),i=l?1:Math.ceil(h/i),h=c(b,i),q,l=0;for(q=f.p.length;l<q;l++)Pa(a,"pageButton")(a,f.p[l],l,h,b,i)}else c.fnUpdate(a,d)},sName:"pagination"}));return b}function Ta(a,b,c){var e=a._iDisplayStart,d=a._iDisplayLength,f=a.fnRecordsDisplay();0===f||-1===d?e=0:"number"===typeof b?(e=b*d,e>f&&(e=0)):
+"first"==b?e=0:"previous"==b?(e=0<=d?e-d:0,0>e&&(e=0)):"next"==b?e+d<f&&(e+=d):"last"==b?e=Math.floor((f-1)/d)*d:I(a,0,"Unknown paging action: "+b,5);b=a._iDisplayStart!==e;a._iDisplayStart=e;b&&(w(a,null,"page",[a]),c&&M(a));return b}function pb(a){return h("<div/>",{id:!a.aanFeatures.r?a.sTableId+"_processing":null,"class":a.oClasses.sProcessing}).html(a.oLanguage.sProcessing).insertBefore(a.nTable)[0]}function C(a,b){a.oFeatures.bProcessing&&h(a.aanFeatures.r).css("display",b?"block":"none");w(a,
+null,"processing",[a,b])}function qb(a){var b=h(a.nTable);b.attr("role","grid");var c=a.oScroll;if(""===c.sX&&""===c.sY)return a.nTable;var e=c.sX,d=c.sY,f=a.oClasses,g=b.children("caption"),j=g.length?g[0]._captionSide:null,i=h(b[0].cloneNode(!1)),o=h(b[0].cloneNode(!1)),l=b.children("tfoot");c.sX&&"100%"===b.attr("width")&&b.removeAttr("width");l.length||(l=null);c=h("<div/>",{"class":f.sScrollWrapper}).append(h("<div/>",{"class":f.sScrollHead}).css({overflow:"hidden",position:"relative",border:0,
+width:e?!e?null:s(e):"100%"}).append(h("<div/>",{"class":f.sScrollHeadInner}).css({"box-sizing":"content-box",width:c.sXInner||"100%"}).append(i.removeAttr("id").css("margin-left",0).append("top"===j?g:null).append(b.children("thead"))))).append(h("<div/>",{"class":f.sScrollBody}).css({overflow:"auto",height:!d?null:s(d),width:!e?null:s(e)}).append(b));l&&c.append(h("<div/>",{"class":f.sScrollFoot}).css({overflow:"hidden",border:0,width:e?!e?null:s(e):"100%"}).append(h("<div/>",{"class":f.sScrollFootInner}).append(o.removeAttr("id").css("margin-left",
+0).append("bottom"===j?g:null).append(b.children("tfoot")))));var b=c.children(),q=b[0],f=b[1],n=l?b[2]:null;if(e)h(f).on("scroll.DT",function(){var a=this.scrollLeft;q.scrollLeft=a;l&&(n.scrollLeft=a)});a.nScrollHead=q;a.nScrollBody=f;a.nScrollFoot=n;a.aoDrawCallback.push({fn:Y,sName:"scrolling"});return c[0]}function Y(a){var b=a.oScroll,c=b.sX,e=b.sXInner,d=b.sY,f=b.iBarWidth,g=h(a.nScrollHead),j=g[0].style,i=g.children("div"),o=i[0].style,l=i.children("table"),i=a.nScrollBody,q=h(i),n=i.style,
+k=h(a.nScrollFoot).children("div"),p=k.children("table"),m=h(a.nTHead),r=h(a.nTable),t=r[0],O=t.style,L=a.nTFoot?h(a.nTFoot):null,ha=a.oBrowser,w=ha.bScrollOversize,v,u,y,x,z,A=[],B=[],C=[],D,E=function(a){a=a.style;a.paddingTop="0";a.paddingBottom="0";a.borderTopWidth="0";a.borderBottomWidth="0";a.height=0};r.children("thead, tfoot").remove();z=m.clone().prependTo(r);v=m.find("tr");y=z.find("tr");z.find("th, td").removeAttr("tabindex");L&&(x=L.clone().prependTo(r),u=L.find("tr"),x=x.find("tr"));
+c||(n.width="100%",g[0].style.width="100%");h.each(qa(a,z),function(b,c){D=la(a,b);c.style.width=a.aoColumns[D].sWidth});L&&G(function(a){a.style.width=""},x);b.bCollapse&&""!==d&&(n.height=q[0].offsetHeight+m[0].offsetHeight+"px");g=r.outerWidth();if(""===c){if(O.width="100%",w&&(r.find("tbody").height()>i.offsetHeight||"scroll"==q.css("overflow-y")))O.width=s(r.outerWidth()-f)}else""!==e?O.width=s(e):g==q.width()&&q.height()<r.height()?(O.width=s(g-f),r.outerWidth()>g-f&&(O.width=s(g))):O.width=
+s(g);g=r.outerWidth();G(E,y);G(function(a){C.push(a.innerHTML);A.push(s(h(a).css("width")))},y);G(function(a,b){a.style.width=A[b]},v);h(y).height(0);L&&(G(E,x),G(function(a){B.push(s(h(a).css("width")))},x),G(function(a,b){a.style.width=B[b]},u),h(x).height(0));G(function(a,b){a.innerHTML='<div class="dataTables_sizing" style="height:0;overflow:hidden;">'+C[b]+"</div>";a.style.width=A[b]},y);L&&G(function(a,b){a.innerHTML="";a.style.width=B[b]},x);if(r.outerWidth()<g){u=i.scrollHeight>i.offsetHeight||
+"scroll"==q.css("overflow-y")?g+f:g;if(w&&(i.scrollHeight>i.offsetHeight||"scroll"==q.css("overflow-y")))O.width=s(u-f);(""===c||""!==e)&&I(a,1,"Possible column misalignment",6)}else u="100%";n.width=s(u);j.width=s(u);L&&(a.nScrollFoot.style.width=s(u));!d&&w&&(n.height=s(t.offsetHeight+f));d&&b.bCollapse&&(n.height=s(d),b=c&&t.offsetWidth>i.offsetWidth?f:0,t.offsetHeight<i.offsetHeight&&(n.height=s(t.offsetHeight+b)));b=r.outerWidth();l[0].style.width=s(b);o.width=s(b);l=r.height()>i.clientHeight||
+"scroll"==q.css("overflow-y");ha="padding"+(ha.bScrollbarLeft?"Left":"Right");o[ha]=l?f+"px":"0px";L&&(p[0].style.width=s(b),k[0].style.width=s(b),k[0].style[ha]=l?f+"px":"0px");q.scroll();if((a.bSorted||a.bFiltered)&&!a._drawHold)i.scrollTop=0}function G(a,b,c){for(var e=0,d=0,f=b.length,g,j;d<f;){g=b[d].firstChild;for(j=c?c[d].firstChild:null;g;)1===g.nodeType&&(c?a(g,j,e):a(g,e),e++),g=g.nextSibling,j=c?j.nextSibling:null;d++}}function Ga(a){var b=a.nTable,c=a.aoColumns,e=a.oScroll,d=e.sY,f=e.sX,
+g=e.sXInner,j=c.length,e=Z(a,"bVisible"),i=h("th",a.nTHead),o=b.getAttribute("width"),l=b.parentNode,k=!1,n,m;(n=b.style.width)&&-1!==n.indexOf("%")&&(o=n);for(n=0;n<e.length;n++)m=c[e[n]],null!==m.sWidth&&(m.sWidth=Db(m.sWidthOrig,l),k=!0);if(!k&&!f&&!d&&j==aa(a)&&j==i.length)for(n=0;n<j;n++)c[n].sWidth=s(i.eq(n).width());else{j=h(b).clone().css("visibility","hidden").removeAttr("id");j.find("tbody tr").remove();var p=h("<tr/>").appendTo(j.find("tbody"));j.find("tfoot th, tfoot td").css("width",
+"");i=qa(a,j.find("thead")[0]);for(n=0;n<e.length;n++)m=c[e[n]],i[n].style.width=null!==m.sWidthOrig&&""!==m.sWidthOrig?s(m.sWidthOrig):"";if(a.aoData.length)for(n=0;n<e.length;n++)k=e[n],m=c[k],h(Eb(a,k)).clone(!1).append(m.sContentPadding).appendTo(p);j.appendTo(l);f&&g?j.width(g):f?(j.css("width","auto"),j.width()<l.offsetWidth&&j.width(l.offsetWidth)):d?j.width(l.offsetWidth):o&&j.width(o);Fb(a,j[0]);if(f){for(n=g=0;n<e.length;n++)m=c[e[n]],d=h(i[n]).outerWidth(),g+=null===m.sWidthOrig?d:parseInt(m.sWidth,
+10)+d-h(i[n]).width();j.width(s(g));b.style.width=s(g)}for(n=0;n<e.length;n++)if(m=c[e[n]],d=h(i[n]).width())m.sWidth=s(d);b.style.width=s(j.css("width"));j.remove()}o&&(b.style.width=s(o));if((o||f)&&!a._reszEvt)b=function(){h(Ea).bind("resize.DT-"+a.sInstance,ua(function(){X(a)}))},a.oBrowser.bScrollOversize?setTimeout(b,1E3):b(),a._reszEvt=!0}function ua(a,b){var c=b!==k?b:200,e,d;return function(){var b=this,g=+new Date,j=arguments;e&&g<e+c?(clearTimeout(d),d=setTimeout(function(){e=k;a.apply(b,
+j)},c)):(e=g,a.apply(b,j))}}function Db(a,b){if(!a)return 0;var c=h("<div/>").css("width",s(a)).appendTo(b||Q.body),e=c[0].offsetWidth;c.remove();return e}function Fb(a,b){var c=a.oScroll;if(c.sX||c.sY)c=!c.sX?c.iBarWidth:0,b.style.width=s(h(b).outerWidth()-c)}function Eb(a,b){var c=Gb(a,b);if(0>c)return null;var e=a.aoData[c];return!e.nTr?h("<td/>").html(x(a,c,b,"display"))[0]:e.anCells[b]}function Gb(a,b){for(var c,e=-1,d=-1,f=0,g=a.aoData.length;f<g;f++)c=x(a,f,b,"display")+"",c=c.replace($b,""),
+c.length>e&&(e=c.length,d=f);return d}function s(a){return null===a?"0px":"number"==typeof a?0>a?"0px":a+"px":a.match(/\d$/)?a+"px":a}function Hb(){var a=m.__scrollbarWidth;if(a===k){var b=h("<p/>").css({position:"absolute",top:0,left:0,width:"100%",height:150,padding:0,overflow:"scroll",visibility:"hidden"}).appendTo("body"),a=b[0].offsetWidth-b[0].clientWidth;m.__scrollbarWidth=a;b.remove()}return a}function U(a){var b,c,e=[],d=a.aoColumns,f,g,j,i;b=a.aaSortingFixed;c=h.isPlainObject(b);var o=[];
+f=function(a){a.length&&!h.isArray(a[0])?o.push(a):o.push.apply(o,a)};h.isArray(b)&&f(b);c&&b.pre&&f(b.pre);f(a.aaSorting);c&&b.post&&f(b.post);for(a=0;a<o.length;a++){i=o[a][0];f=d[i].aDataSort;b=0;for(c=f.length;b<c;b++)g=f[b],j=d[g].sType||"string",o[a]._idx===k&&(o[a]._idx=h.inArray(o[a][1],d[g].asSorting)),e.push({src:i,col:g,dir:o[a][1],index:o[a]._idx,type:j,formatter:m.ext.type.order[j+"-pre"]})}return e}function lb(a){var b,c,e=[],d=m.ext.type.order,f=a.aoData,g=0,j,i=a.aiDisplayMaster,h;
+Ha(a);h=U(a);b=0;for(c=h.length;b<c;b++)j=h[b],j.formatter&&g++,Ib(a,j.col);if("ssp"!=B(a)&&0!==h.length){b=0;for(c=i.length;b<c;b++)e[i[b]]=b;g===h.length?i.sort(function(a,b){var c,d,g,j,i=h.length,k=f[a]._aSortData,m=f[b]._aSortData;for(g=0;g<i;g++)if(j=h[g],c=k[j.col],d=m[j.col],c=c<d?-1:c>d?1:0,0!==c)return"asc"===j.dir?c:-c;c=e[a];d=e[b];return c<d?-1:c>d?1:0}):i.sort(function(a,b){var c,g,j,i,k=h.length,m=f[a]._aSortData,r=f[b]._aSortData;for(j=0;j<k;j++)if(i=h[j],c=m[i.col],g=r[i.col],i=d[i.type+
+"-"+i.dir]||d["string-"+i.dir],c=i(c,g),0!==c)return c;c=e[a];g=e[b];return c<g?-1:c>g?1:0})}a.bSorted=!0}function Jb(a){for(var b,c,e=a.aoColumns,d=U(a),a=a.oLanguage.oAria,f=0,g=e.length;f<g;f++){c=e[f];var j=c.asSorting;b=c.sTitle.replace(/<.*?>/g,"");var i=c.nTh;i.removeAttribute("aria-sort");c.bSortable&&(0<d.length&&d[0].col==f?(i.setAttribute("aria-sort","asc"==d[0].dir?"ascending":"descending"),c=j[d[0].index+1]||j[0]):c=j[0],b+="asc"===c?a.sSortAscending:a.sSortDescending);i.setAttribute("aria-label",
+b)}}function Ua(a,b,c,e){var d=a.aaSorting,f=a.aoColumns[b].asSorting,g=function(a,b){var c=a._idx;c===k&&(c=h.inArray(a[1],f));return c+1<f.length?c+1:b?null:0};"number"===typeof d[0]&&(d=a.aaSorting=[d]);c&&a.oFeatures.bSortMulti?(c=h.inArray(b,D(d,"0")),-1!==c?(b=g(d[c],!0),null===b&&1===d.length&&(b=0),null===b?d.splice(c,1):(d[c][1]=f[b],d[c]._idx=b)):(d.push([b,f[0],0]),d[d.length-1]._idx=0)):d.length&&d[0][0]==b?(b=g(d[0]),d.length=1,d[0][1]=f[b],d[0]._idx=b):(d.length=0,d.push([b,f[0]]),d[0]._idx=
+0);N(a);"function"==typeof e&&e(a)}function Oa(a,b,c,e){var d=a.aoColumns[c];Va(b,{},function(b){!1!==d.bSortable&&(a.oFeatures.bProcessing?(C(a,!0),setTimeout(function(){Ua(a,c,b.shiftKey,e);"ssp"!==B(a)&&C(a,!1)},0)):Ua(a,c,b.shiftKey,e))})}function xa(a){var b=a.aLastSort,c=a.oClasses.sSortColumn,e=U(a),d=a.oFeatures,f,g;if(d.bSort&&d.bSortClasses){d=0;for(f=b.length;d<f;d++)g=b[d].src,h(D(a.aoData,"anCells",g)).removeClass(c+(2>d?d+1:3));d=0;for(f=e.length;d<f;d++)g=e[d].src,h(D(a.aoData,"anCells",
+g)).addClass(c+(2>d?d+1:3))}a.aLastSort=e}function Ib(a,b){var c=a.aoColumns[b],e=m.ext.order[c.sSortDataType],d;e&&(d=e.call(a.oInstance,a,b,$(a,b)));for(var f,g=m.ext.type.order[c.sType+"-pre"],j=0,i=a.aoData.length;j<i;j++)if(c=a.aoData[j],c._aSortData||(c._aSortData=[]),!c._aSortData[b]||e)f=e?d[j]:x(a,j,b,"sort"),c._aSortData[b]=g?g(f):f}function ya(a){if(a.oFeatures.bStateSave&&!a.bDestroying){var b={time:+new Date,start:a._iDisplayStart,length:a._iDisplayLength,order:h.extend(!0,[],a.aaSorting),
+search:zb(a.oPreviousSearch),columns:h.map(a.aoColumns,function(b,e){return{visible:b.bVisible,search:zb(a.aoPreSearchCols[e])}})};w(a,"aoStateSaveParams","stateSaveParams",[a,b]);a.oSavedState=b;a.fnStateSaveCallback.call(a.oInstance,a,b)}}function Kb(a){var b,c,e=a.aoColumns;if(a.oFeatures.bStateSave){var d=a.fnStateLoadCallback.call(a.oInstance,a);if(d&&d.time&&(b=w(a,"aoStateLoadParams","stateLoadParams",[a,d]),-1===h.inArray(!1,b)&&(b=a.iStateDuration,!(0<b&&d.time<+new Date-1E3*b)&&e.length===
+d.columns.length))){a.oLoadedState=h.extend(!0,{},d);d.start!==k&&(a._iDisplayStart=d.start,a.iInitDisplayStart=d.start);d.length!==k&&(a._iDisplayLength=d.length);d.order!==k&&(a.aaSorting=[],h.each(d.order,function(b,c){a.aaSorting.push(c[0]>=e.length?[0,c[1]]:c)}));d.search!==k&&h.extend(a.oPreviousSearch,Ab(d.search));b=0;for(c=d.columns.length;b<c;b++){var f=d.columns[b];f.visible!==k&&(e[b].bVisible=f.visible);f.search!==k&&h.extend(a.aoPreSearchCols[b],Ab(f.search))}w(a,"aoStateLoaded","stateLoaded",
+[a,d])}}}function za(a){var b=m.settings,a=h.inArray(a,D(b,"nTable"));return-1!==a?b[a]:null}function I(a,b,c,e){c="DataTables warning: "+(null!==a?"table id="+a.sTableId+" - ":"")+c;e&&(c+=". For more information about this error, please see http://datatables.net/tn/"+e);if(b)Ea.console&&console.log&&console.log(c);else if(b=m.ext,b=b.sErrMode||b.errMode,w(a,null,"error",[a,e,c]),"alert"==b)alert(c);else{if("throw"==b)throw Error(c);"function"==typeof b&&b(a,e,c)}}function E(a,b,c,e){h.isArray(c)?
+h.each(c,function(c,f){h.isArray(f)?E(a,b,f[0],f[1]):E(a,b,f)}):(e===k&&(e=c),b[c]!==k&&(a[e]=b[c]))}function Lb(a,b,c){var e,d;for(d in b)b.hasOwnProperty(d)&&(e=b[d],h.isPlainObject(e)?(h.isPlainObject(a[d])||(a[d]={}),h.extend(!0,a[d],e)):a[d]=c&&"data"!==d&&"aaData"!==d&&h.isArray(e)?e.slice():e);return a}function Va(a,b,c){h(a).bind("click.DT",b,function(b){a.blur();c(b)}).bind("keypress.DT",b,function(a){13===a.which&&(a.preventDefault(),c(a))}).bind("selectstart.DT",function(){return!1})}function z(a,
+b,c,e){c&&a[b].push({fn:c,sName:e})}function w(a,b,c,e){var d=[];b&&(d=h.map(a[b].slice().reverse(),function(b){return b.fn.apply(a.oInstance,e)}));null!==c&&(b=h.Event(c+".dt"),h(a.nTable).trigger(b,e),d.push(b.result));return d}function Sa(a){var b=a._iDisplayStart,c=a.fnDisplayEnd(),e=a._iDisplayLength;b>=c&&(b=c-e);b-=b%e;if(-1===e||0>b)b=0;a._iDisplayStart=b}function Pa(a,b){var c=a.renderer,e=m.ext.renderer[b];return h.isPlainObject(c)&&c[b]?e[c[b]]||e._:"string"===typeof c?e[c]||e._:e._}function B(a){return a.oFeatures.bServerSide?
+"ssp":a.ajax||a.sAjaxSource?"ajax":"dom"}function Wa(a,b){var c=[],c=Mb.numbers_length,e=Math.floor(c/2);b<=c?c=V(0,b):a<=e?(c=V(0,c-2),c.push("ellipsis"),c.push(b-1)):(a>=b-1-e?c=V(b-(c-2),b):(c=V(a-e+2,a+e-1),c.push("ellipsis"),c.push(b-1)),c.splice(0,0,"ellipsis"),c.splice(0,0,0));c.DT_el="span";return c}function db(a){h.each({num:function(b){return Aa(b,a)},"num-fmt":function(b){return Aa(b,a,Xa)},"html-num":function(b){return Aa(b,a,Ba)},"html-num-fmt":function(b){return Aa(b,a,Ba,Xa)}},function(b,
+c){u.type.order[b+a+"-pre"]=c;b.match(/^html\-/)&&(u.type.search[b+a]=u.type.search.html)})}function Nb(a){return function(){var b=[za(this[m.ext.iApiIndex])].concat(Array.prototype.slice.call(arguments));return m.ext.internal[a].apply(this,b)}}var m,u,t,r,v,Ya={},Ob=/[\r\n]/g,Ba=/<.*?>/g,ac=/^[\w\+\-]/,bc=/[\w\+\-]$/,Yb=RegExp("(\\/|\\.|\\*|\\+|\\?|\\||\\(|\\)|\\[|\\]|\\{|\\}|\\\\|\\$|\\^|\\-)","g"),Xa=/[',$\u00a3\u20ac\u00a5%\u2009\u202F\u20BD\u20a9\u20BArfk]/gi,J=function(a){return!a||!0===a||
+"-"===a?!0:!1},Pb=function(a){var b=parseInt(a,10);return!isNaN(b)&&isFinite(a)?b:null},Qb=function(a,b){Ya[b]||(Ya[b]=RegExp(va(b),"g"));return"string"===typeof a&&"."!==b?a.replace(/\./g,"").replace(Ya[b],"."):a},Za=function(a,b,c){var e="string"===typeof a;if(J(a))return!0;b&&e&&(a=Qb(a,b));c&&e&&(a=a.replace(Xa,""));return!isNaN(parseFloat(a))&&isFinite(a)},Rb=function(a,b,c){return J(a)?!0:!(J(a)||"string"===typeof a)?null:Za(a.replace(Ba,""),b,c)?!0:null},D=function(a,b,c){var e=[],d=0,f=a.length;
+if(c!==k)for(;d<f;d++)a[d]&&a[d][b]&&e.push(a[d][b][c]);else for(;d<f;d++)a[d]&&e.push(a[d][b]);return e},ia=function(a,b,c,e){var d=[],f=0,g=b.length;if(e!==k)for(;f<g;f++)a[b[f]][c]&&d.push(a[b[f]][c][e]);else for(;f<g;f++)d.push(a[b[f]][c]);return d},V=function(a,b){var c=[],e;b===k?(b=0,e=a):(e=b,b=a);for(var d=b;d<e;d++)c.push(d);return c},Sb=function(a){for(var b=[],c=0,e=a.length;c<e;c++)a[c]&&b.push(a[c]);return b},Na=function(a){var b=[],c,e,d=a.length,f,g=0;e=0;a:for(;e<d;e++){c=a[e];for(f=
+0;f<g;f++)if(b[f]===c)continue a;b.push(c);g++}return b},A=function(a,b,c){a[b]!==k&&(a[c]=a[b])},ba=/\[.*?\]$/,T=/\(\)$/,wa=h("<div>")[0],Zb=wa.textContent!==k,$b=/<.*?>/g;m=function(a){this.$=function(a,b){return this.api(!0).$(a,b)};this._=function(a,b){return this.api(!0).rows(a,b).data()};this.api=function(a){return a?new t(za(this[u.iApiIndex])):new t(this)};this.fnAddData=function(a,b){var c=this.api(!0),e=h.isArray(a)&&(h.isArray(a[0])||h.isPlainObject(a[0]))?c.rows.add(a):c.row.add(a);(b===
+k||b)&&c.draw();return e.flatten().toArray()};this.fnAdjustColumnSizing=function(a){var b=this.api(!0).columns.adjust(),c=b.settings()[0],e=c.oScroll;a===k||a?b.draw(!1):(""!==e.sX||""!==e.sY)&&Y(c)};this.fnClearTable=function(a){var b=this.api(!0).clear();(a===k||a)&&b.draw()};this.fnClose=function(a){this.api(!0).row(a).child.hide()};this.fnDeleteRow=function(a,b,c){var e=this.api(!0),a=e.rows(a),d=a.settings()[0],h=d.aoData[a[0][0]];a.remove();b&&b.call(this,d,h);(c===k||c)&&e.draw();return h};
+this.fnDestroy=function(a){this.api(!0).destroy(a)};this.fnDraw=function(a){this.api(!0).draw(a)};this.fnFilter=function(a,b,c,e,d,h){d=this.api(!0);null===b||b===k?d.search(a,c,e,h):d.column(b).search(a,c,e,h);d.draw()};this.fnGetData=function(a,b){var c=this.api(!0);if(a!==k){var e=a.nodeName?a.nodeName.toLowerCase():"";return b!==k||"td"==e||"th"==e?c.cell(a,b).data():c.row(a).data()||null}return c.data().toArray()};this.fnGetNodes=function(a){var b=this.api(!0);return a!==k?b.row(a).node():b.rows().nodes().flatten().toArray()};
+this.fnGetPosition=function(a){var b=this.api(!0),c=a.nodeName.toUpperCase();return"TR"==c?b.row(a).index():"TD"==c||"TH"==c?(a=b.cell(a).index(),[a.row,a.columnVisible,a.column]):null};this.fnIsOpen=function(a){return this.api(!0).row(a).child.isShown()};this.fnOpen=function(a,b,c){return this.api(!0).row(a).child(b,c).show().child()[0]};this.fnPageChange=function(a,b){var c=this.api(!0).page(a);(b===k||b)&&c.draw(!1)};this.fnSetColumnVis=function(a,b,c){a=this.api(!0).column(a).visible(b);(c===
+k||c)&&a.columns.adjust().draw()};this.fnSettings=function(){return za(this[u.iApiIndex])};this.fnSort=function(a){this.api(!0).order(a).draw()};this.fnSortListener=function(a,b,c){this.api(!0).order.listener(a,b,c)};this.fnUpdate=function(a,b,c,e,d){var h=this.api(!0);c===k||null===c?h.row(b).data(a):h.cell(b,c).data(a);(d===k||d)&&h.columns.adjust();(e===k||e)&&h.draw();return 0};this.fnVersionCheck=u.fnVersionCheck;var b=this,c=a===k,e=this.length;c&&(a={});this.oApi=this.internal=u.internal;for(var d in m.ext.internal)d&&
+(this[d]=Nb(d));this.each(function(){var d={},d=1<e?Lb(d,a,!0):a,g=0,j,i=this.getAttribute("id"),o=!1,l=m.defaults,q=h(this);if("table"!=this.nodeName.toLowerCase())I(null,0,"Non-table node initialisation ("+this.nodeName+")",2);else{eb(l);fb(l.column);H(l,l,!0);H(l.column,l.column,!0);H(l,h.extend(d,q.data()));var n=m.settings,g=0;for(j=n.length;g<j;g++){var r=n[g];if(r.nTable==this||r.nTHead.parentNode==this||r.nTFoot&&r.nTFoot.parentNode==this){g=d.bRetrieve!==k?d.bRetrieve:l.bRetrieve;if(c||g)return r.oInstance;
+if(d.bDestroy!==k?d.bDestroy:l.bDestroy){r.oInstance.fnDestroy();break}else{I(r,0,"Cannot reinitialise DataTable",3);return}}if(r.sTableId==this.id){n.splice(g,1);break}}if(null===i||""===i)this.id=i="DataTables_Table_"+m.ext._unique++;var p=h.extend(!0,{},m.models.oSettings,{sDestroyWidth:q[0].style.width,sInstance:i,sTableId:i});p.nTable=this;p.oApi=b.internal;p.oInit=d;n.push(p);p.oInstance=1===b.length?b:q.dataTable();eb(d);d.oLanguage&&P(d.oLanguage);d.aLengthMenu&&!d.iDisplayLength&&(d.iDisplayLength=
+h.isArray(d.aLengthMenu[0])?d.aLengthMenu[0][0]:d.aLengthMenu[0]);d=Lb(h.extend(!0,{},l),d);E(p.oFeatures,d,"bPaginate bLengthChange bFilter bSort bSortMulti bInfo bProcessing bAutoWidth bSortClasses bServerSide bDeferRender".split(" "));E(p,d,["asStripeClasses","ajax","fnServerData","fnFormatNumber","sServerMethod","aaSorting","aaSortingFixed","aLengthMenu","sPaginationType","sAjaxSource","sAjaxDataProp","iStateDuration","sDom","bSortCellsTop","iTabIndex","fnStateLoadCallback","fnStateSaveCallback",
+"renderer","searchDelay",["iCookieDuration","iStateDuration"],["oSearch","oPreviousSearch"],["aoSearchCols","aoPreSearchCols"],["iDisplayLength","_iDisplayLength"],["bJQueryUI","bJUI"]]);E(p.oScroll,d,[["sScrollX","sX"],["sScrollXInner","sXInner"],["sScrollY","sY"],["bScrollCollapse","bCollapse"]]);E(p.oLanguage,d,"fnInfoCallback");z(p,"aoDrawCallback",d.fnDrawCallback,"user");z(p,"aoServerParams",d.fnServerParams,"user");z(p,"aoStateSaveParams",d.fnStateSaveParams,"user");z(p,"aoStateLoadParams",
+d.fnStateLoadParams,"user");z(p,"aoStateLoaded",d.fnStateLoaded,"user");z(p,"aoRowCallback",d.fnRowCallback,"user");z(p,"aoRowCreatedCallback",d.fnCreatedRow,"user");z(p,"aoHeaderCallback",d.fnHeaderCallback,"user");z(p,"aoFooterCallback",d.fnFooterCallback,"user");z(p,"aoInitComplete",d.fnInitComplete,"user");z(p,"aoPreDrawCallback",d.fnPreDrawCallback,"user");i=p.oClasses;d.bJQueryUI?(h.extend(i,m.ext.oJUIClasses,d.oClasses),d.sDom===l.sDom&&"lfrtip"===l.sDom&&(p.sDom='<"H"lfr>t<"F"ip>'),p.renderer)?
+h.isPlainObject(p.renderer)&&!p.renderer.header&&(p.renderer.header="jqueryui"):p.renderer="jqueryui":h.extend(i,m.ext.classes,d.oClasses);q.addClass(i.sTable);if(""!==p.oScroll.sX||""!==p.oScroll.sY)p.oScroll.iBarWidth=Hb();!0===p.oScroll.sX&&(p.oScroll.sX="100%");p.iInitDisplayStart===k&&(p.iInitDisplayStart=d.iDisplayStart,p._iDisplayStart=d.iDisplayStart);null!==d.iDeferLoading&&(p.bDeferLoading=!0,g=h.isArray(d.iDeferLoading),p._iRecordsDisplay=g?d.iDeferLoading[0]:d.iDeferLoading,p._iRecordsTotal=
+g?d.iDeferLoading[1]:d.iDeferLoading);var t=p.oLanguage;h.extend(!0,t,d.oLanguage);""!==t.sUrl&&(h.ajax({dataType:"json",url:t.sUrl,success:function(a){P(a);H(l.oLanguage,a);h.extend(true,t,a);ga(p)},error:function(){ga(p)}}),o=!0);null===d.asStripeClasses&&(p.asStripeClasses=[i.sStripeOdd,i.sStripeEven]);var g=p.asStripeClasses,s=q.children("tbody").find("tr").eq(0);-1!==h.inArray(!0,h.map(g,function(a){return s.hasClass(a)}))&&(h("tbody tr",this).removeClass(g.join(" ")),p.asDestroyStripes=g.slice());
+n=[];g=this.getElementsByTagName("thead");0!==g.length&&(da(p.aoHeader,g[0]),n=qa(p));if(null===d.aoColumns){r=[];g=0;for(j=n.length;g<j;g++)r.push(null)}else r=d.aoColumns;g=0;for(j=r.length;g<j;g++)Fa(p,n?n[g]:null);ib(p,d.aoColumnDefs,r,function(a,b){ka(p,a,b)});if(s.length){var u=function(a,b){return a.getAttribute("data-"+b)!==null?b:null};h.each(na(p,s[0]).cells,function(a,b){var c=p.aoColumns[a];if(c.mData===a){var d=u(b,"sort")||u(b,"order"),e=u(b,"filter")||u(b,"search");if(d!==null||e!==
+null){c.mData={_:a+".display",sort:d!==null?a+".@data-"+d:k,type:d!==null?a+".@data-"+d:k,filter:e!==null?a+".@data-"+e:k};ka(p,a)}}})}var v=p.oFeatures;d.bStateSave&&(v.bStateSave=!0,Kb(p,d),z(p,"aoDrawCallback",ya,"state_save"));if(d.aaSorting===k){n=p.aaSorting;g=0;for(j=n.length;g<j;g++)n[g][1]=p.aoColumns[g].asSorting[0]}xa(p);v.bSort&&z(p,"aoDrawCallback",function(){if(p.bSorted){var a=U(p),b={};h.each(a,function(a,c){b[c.src]=c.dir});w(p,null,"order",[p,a,b]);Jb(p)}});z(p,"aoDrawCallback",
+function(){(p.bSorted||B(p)==="ssp"||v.bDeferRender)&&xa(p)},"sc");gb(p);g=q.children("caption").each(function(){this._captionSide=q.css("caption-side")});j=q.children("thead");0===j.length&&(j=h("<thead/>").appendTo(this));p.nTHead=j[0];j=q.children("tbody");0===j.length&&(j=h("<tbody/>").appendTo(this));p.nTBody=j[0];j=q.children("tfoot");if(0===j.length&&0<g.length&&(""!==p.oScroll.sX||""!==p.oScroll.sY))j=h("<tfoot/>").appendTo(this);0===j.length||0===j.children().length?q.addClass(i.sNoFooter):
+0<j.length&&(p.nTFoot=j[0],da(p.aoFooter,p.nTFoot));if(d.aaData)for(g=0;g<d.aaData.length;g++)K(p,d.aaData[g]);else(p.bDeferLoading||"dom"==B(p))&&ma(p,h(p.nTBody).children("tr"));p.aiDisplay=p.aiDisplayMaster.slice();p.bInitialised=!0;!1===o&&ga(p)}});b=null;return this};var Tb=[],y=Array.prototype,cc=function(a){var b,c,e=m.settings,d=h.map(e,function(a){return a.nTable});if(a){if(a.nTable&&a.oApi)return[a];if(a.nodeName&&"table"===a.nodeName.toLowerCase())return b=h.inArray(a,d),-1!==b?[e[b]]:
+null;if(a&&"function"===typeof a.settings)return a.settings().toArray();"string"===typeof a?c=h(a):a instanceof h&&(c=a)}else return[];if(c)return c.map(function(){b=h.inArray(this,d);return-1!==b?e[b]:null}).toArray()};t=function(a,b){if(!(this instanceof t))return new t(a,b);var c=[],e=function(a){(a=cc(a))&&c.push.apply(c,a)};if(h.isArray(a))for(var d=0,f=a.length;d<f;d++)e(a[d]);else e(a);this.context=Na(c);b&&this.push.apply(this,b.toArray?b.toArray():b);this.selector={rows:null,cols:null,opts:null};
+t.extend(this,this,Tb)};m.Api=t;t.prototype={any:function(){return 0!==this.flatten().length},concat:y.concat,context:[],each:function(a){for(var b=0,c=this.length;b<c;b++)a.call(this,this[b],b,this);return this},eq:function(a){var b=this.context;return b.length>a?new t(b[a],this[a]):null},filter:function(a){var b=[];if(y.filter)b=y.filter.call(this,a,this);else for(var c=0,e=this.length;c<e;c++)a.call(this,this[c],c,this)&&b.push(this[c]);return new t(this.context,b)},flatten:function(){var a=[];
+return new t(this.context,a.concat.apply(a,this.toArray()))},join:y.join,indexOf:y.indexOf||function(a,b){for(var c=b||0,e=this.length;c<e;c++)if(this[c]===a)return c;return-1},iterator:function(a,b,c,e){var d=[],f,g,h,i,o,l=this.context,q,n,m=this.selector;"string"===typeof a&&(e=c,c=b,b=a,a=!1);g=0;for(h=l.length;g<h;g++){var p=new t(l[g]);if("table"===b)f=c.call(p,l[g],g),f!==k&&d.push(f);else if("columns"===b||"rows"===b)f=c.call(p,l[g],this[g],g),f!==k&&d.push(f);else if("column"===b||"column-rows"===
+b||"row"===b||"cell"===b){n=this[g];"column-rows"===b&&(q=Ca(l[g],m.opts));i=0;for(o=n.length;i<o;i++)f=n[i],f="cell"===b?c.call(p,l[g],f.row,f.column,g,i):c.call(p,l[g],f,g,i,q),f!==k&&d.push(f)}}return d.length||e?(a=new t(l,a?d.concat.apply([],d):d),b=a.selector,b.rows=m.rows,b.cols=m.cols,b.opts=m.opts,a):this},lastIndexOf:y.lastIndexOf||function(a,b){return this.indexOf.apply(this.toArray.reverse(),arguments)},length:0,map:function(a){var b=[];if(y.map)b=y.map.call(this,a,this);else for(var c=
+0,e=this.length;c<e;c++)b.push(a.call(this,this[c],c));return new t(this.context,b)},pluck:function(a){return this.map(function(b){return b[a]})},pop:y.pop,push:y.push,reduce:y.reduce||function(a,b){return hb(this,a,b,0,this.length,1)},reduceRight:y.reduceRight||function(a,b){return hb(this,a,b,this.length-1,-1,-1)},reverse:y.reverse,selector:null,shift:y.shift,sort:y.sort,splice:y.splice,toArray:function(){return y.slice.call(this)},to$:function(){return h(this)},toJQuery:function(){return h(this)},
+unique:function(){return new t(this.context,Na(this))},unshift:y.unshift};t.extend=function(a,b,c){if(c.length&&b&&(b instanceof t||b.__dt_wrapper)){var e,d,f,g=function(a,b,c){return function(){var d=b.apply(a,arguments);t.extend(d,d,c.methodExt);return d}};e=0;for(d=c.length;e<d;e++)f=c[e],b[f.name]="function"===typeof f.val?g(a,f.val,f):h.isPlainObject(f.val)?{}:f.val,b[f.name].__dt_wrapper=!0,t.extend(a,b[f.name],f.propExt)}};t.register=r=function(a,b){if(h.isArray(a))for(var c=0,e=a.length;c<
+e;c++)t.register(a[c],b);else for(var d=a.split("."),f=Tb,g,j,c=0,e=d.length;c<e;c++){g=(j=-1!==d[c].indexOf("()"))?d[c].replace("()",""):d[c];var i;a:{i=0;for(var o=f.length;i<o;i++)if(f[i].name===g){i=f[i];break a}i=null}i||(i={name:g,val:{},methodExt:[],propExt:[]},f.push(i));c===e-1?i.val=b:f=j?i.methodExt:i.propExt}};t.registerPlural=v=function(a,b,c){t.register(a,c);t.register(b,function(){var a=c.apply(this,arguments);return a===this?this:a instanceof t?a.length?h.isArray(a[0])?new t(a.context,
+a[0]):a[0]:k:a})};r("tables()",function(a){var b;if(a){b=t;var c=this.context;if("number"===typeof a)a=[c[a]];else var e=h.map(c,function(a){return a.nTable}),a=h(e).filter(a).map(function(){var a=h.inArray(this,e);return c[a]}).toArray();b=new b(a)}else b=this;return b});r("table()",function(a){var a=this.tables(a),b=a.context;return b.length?new t(b[0]):a});v("tables().nodes()","table().node()",function(){return this.iterator("table",function(a){return a.nTable},1)});v("tables().body()","table().body()",
+function(){return this.iterator("table",function(a){return a.nTBody},1)});v("tables().header()","table().header()",function(){return this.iterator("table",function(a){return a.nTHead},1)});v("tables().footer()","table().footer()",function(){return this.iterator("table",function(a){return a.nTFoot},1)});v("tables().containers()","table().container()",function(){return this.iterator("table",function(a){return a.nTableWrapper},1)});r("draw()",function(a){return this.iterator("table",function(b){N(b,
+!1===a)})});r("page()",function(a){return a===k?this.page.info().page:this.iterator("table",function(b){Ta(b,a)})});r("page.info()",function(){if(0===this.context.length)return k;var a=this.context[0],b=a._iDisplayStart,c=a._iDisplayLength,e=a.fnRecordsDisplay(),d=-1===c;return{page:d?0:Math.floor(b/c),pages:d?1:Math.ceil(e/c),start:b,end:a.fnDisplayEnd(),length:c,recordsTotal:a.fnRecordsTotal(),recordsDisplay:e}});r("page.len()",function(a){return a===k?0!==this.context.length?this.context[0]._iDisplayLength:
+k:this.iterator("table",function(b){Ra(b,a)})});var Ub=function(a,b,c){if(c){var e=new t(a);e.one("draw",function(){c(e.ajax.json())})}"ssp"==B(a)?N(a,b):(C(a,!0),ra(a,[],function(c){oa(a);for(var c=sa(a,c),e=0,g=c.length;e<g;e++)K(a,c[e]);N(a,b);C(a,!1)}))};r("ajax.json()",function(){var a=this.context;if(0<a.length)return a[0].json});r("ajax.params()",function(){var a=this.context;if(0<a.length)return a[0].oAjaxData});r("ajax.reload()",function(a,b){return this.iterator("table",function(c){Ub(c,
+!1===b,a)})});r("ajax.url()",function(a){var b=this.context;if(a===k){if(0===b.length)return k;b=b[0];return b.ajax?h.isPlainObject(b.ajax)?b.ajax.url:b.ajax:b.sAjaxSource}return this.iterator("table",function(b){h.isPlainObject(b.ajax)?b.ajax.url=a:b.ajax=a})});r("ajax.url().load()",function(a,b){return this.iterator("table",function(c){Ub(c,!1===b,a)})});var $a=function(a,b,c,e,d){var f=[],g,j,i,o,l,q;i=typeof b;if(!b||"string"===i||"function"===i||b.length===k)b=[b];i=0;for(o=b.length;i<o;i++){j=
+b[i]&&b[i].split?b[i].split(","):[b[i]];l=0;for(q=j.length;l<q;l++)(g=c("string"===typeof j[l]?h.trim(j[l]):j[l]))&&g.length&&f.push.apply(f,g)}a=u.selector[a];if(a.length){i=0;for(o=a.length;i<o;i++)f=a[i](e,d,f)}return f},ab=function(a){a||(a={});a.filter&&a.search===k&&(a.search=a.filter);return h.extend({search:"none",order:"current",page:"all"},a)},bb=function(a){for(var b=0,c=a.length;b<c;b++)if(0<a[b].length)return a[0]=a[b],a[0].length=1,a.length=1,a.context=[a.context[b]],a;a.length=0;return a},
+Ca=function(a,b){var c,e,d,f=[],g=a.aiDisplay;c=a.aiDisplayMaster;var j=b.search;e=b.order;d=b.page;if("ssp"==B(a))return"removed"===j?[]:V(0,c.length);if("current"==d){c=a._iDisplayStart;for(e=a.fnDisplayEnd();c<e;c++)f.push(g[c])}else if("current"==e||"applied"==e)f="none"==j?c.slice():"applied"==j?g.slice():h.map(c,function(a){return-1===h.inArray(a,g)?a:null});else if("index"==e||"original"==e){c=0;for(e=a.aoData.length;c<e;c++)"none"==j?f.push(c):(d=h.inArray(c,g),(-1===d&&"removed"==j||0<=d&&
+"applied"==j)&&f.push(c))}return f};r("rows()",function(a,b){a===k?a="":h.isPlainObject(a)&&(b=a,a="");var b=ab(b),c=this.iterator("table",function(c){var d=b;return $a("row",a,function(a){var b=Pb(a);if(b!==null&&!d)return[b];var j=Ca(c,d);if(b!==null&&h.inArray(b,j)!==-1)return[b];if(!a)return j;if(typeof a==="function")return h.map(j,function(b){var d=c.aoData[b];return a(b,d._aData,d.nTr)?b:null});b=Sb(ia(c.aoData,j,"nTr"));return a.nodeName&&h.inArray(a,b)!==-1?[a._DT_RowIndex]:h(b).filter(a).map(function(){return this._DT_RowIndex}).toArray()},
+c,d)},1);c.selector.rows=a;c.selector.opts=b;return c});r("rows().nodes()",function(){return this.iterator("row",function(a,b){return a.aoData[b].nTr||k},1)});r("rows().data()",function(){return this.iterator(!0,"rows",function(a,b){return ia(a.aoData,b,"_aData")},1)});v("rows().cache()","row().cache()",function(a){return this.iterator("row",function(b,c){var e=b.aoData[c];return"search"===a?e._aFilterData:e._aSortData},1)});v("rows().invalidate()","row().invalidate()",function(a){return this.iterator("row",
+function(b,c){ca(b,c,a)})});v("rows().indexes()","row().index()",function(){return this.iterator("row",function(a,b){return b},1)});v("rows().remove()","row().remove()",function(){var a=this;return this.iterator("row",function(b,c,e){var d=b.aoData;d.splice(c,1);for(var f=0,g=d.length;f<g;f++)null!==d[f].nTr&&(d[f].nTr._DT_RowIndex=f);h.inArray(c,b.aiDisplay);pa(b.aiDisplayMaster,c);pa(b.aiDisplay,c);pa(a[e],c,!1);Sa(b)})});r("rows.add()",function(a){var b=this.iterator("table",function(b){var c,
+f,g,h=[];f=0;for(g=a.length;f<g;f++)c=a[f],c.nodeName&&"TR"===c.nodeName.toUpperCase()?h.push(ma(b,c)[0]):h.push(K(b,c));return h},1),c=this.rows(-1);c.pop();c.push.apply(c,b.toArray());return c});r("row()",function(a,b){return bb(this.rows(a,b))});r("row().data()",function(a){var b=this.context;if(a===k)return b.length&&this.length?b[0].aoData[this[0]]._aData:k;b[0].aoData[this[0]]._aData=a;ca(b[0],this[0],"data");return this});r("row().node()",function(){var a=this.context;return a.length&&this.length?
+a[0].aoData[this[0]].nTr||null:null});r("row.add()",function(a){a instanceof h&&a.length&&(a=a[0]);var b=this.iterator("table",function(b){return a.nodeName&&"TR"===a.nodeName.toUpperCase()?ma(b,a)[0]:K(b,a)});return this.row(b[0])});var cb=function(a,b){var c=a.context;c.length&&(c=c[0].aoData[b!==k?b:a[0]],c._details&&(c._details.remove(),c._detailsShow=k,c._details=k))},Vb=function(a,b){var c=a.context;if(c.length&&a.length){var e=c[0].aoData[a[0]];if(e._details){(e._detailsShow=b)?e._details.insertAfter(e.nTr):
+e._details.detach();var d=c[0],f=new t(d),g=d.aoData;f.off("draw.dt.DT_details column-visibility.dt.DT_details destroy.dt.DT_details");0<D(g,"_details").length&&(f.on("draw.dt.DT_details",function(a,b){d===b&&f.rows({page:"current"}).eq(0).each(function(a){a=g[a];a._detailsShow&&a._details.insertAfter(a.nTr)})}),f.on("column-visibility.dt.DT_details",function(a,b){if(d===b)for(var c,e=aa(b),f=0,h=g.length;f<h;f++)c=g[f],c._details&&c._details.children("td[colspan]").attr("colspan",e)}),f.on("destroy.dt.DT_details",
+function(a,b){if(d===b)for(var c=0,e=g.length;c<e;c++)g[c]._details&&cb(f,c)}))}}};r("row().child()",function(a,b){var c=this.context;if(a===k)return c.length&&this.length?c[0].aoData[this[0]]._details:k;if(!0===a)this.child.show();else if(!1===a)cb(this);else if(c.length&&this.length){var e=c[0],c=c[0].aoData[this[0]],d=[],f=function(a,b){if(h.isArray(a)||a instanceof h)for(var c=0,k=a.length;c<k;c++)f(a[c],b);else a.nodeName&&"tr"===a.nodeName.toLowerCase()?d.push(a):(c=h("<tr><td/></tr>").addClass(b),
+h("td",c).addClass(b).html(a)[0].colSpan=aa(e),d.push(c[0]))};f(a,b);c._details&&c._details.remove();c._details=h(d);c._detailsShow&&c._details.insertAfter(c.nTr)}return this});r(["row().child.show()","row().child().show()"],function(){Vb(this,!0);return this});r(["row().child.hide()","row().child().hide()"],function(){Vb(this,!1);return this});r(["row().child.remove()","row().child().remove()"],function(){cb(this);return this});r("row().child.isShown()",function(){var a=this.context;return a.length&&
+this.length?a[0].aoData[this[0]]._detailsShow||!1:!1});var dc=/^(.+):(name|visIdx|visible)$/,Wb=function(a,b,c,e,d){for(var c=[],e=0,f=d.length;e<f;e++)c.push(x(a,d[e],b));return c};r("columns()",function(a,b){a===k?a="":h.isPlainObject(a)&&(b=a,a="");var b=ab(b),c=this.iterator("table",function(c){var d=a,f=b,g=c.aoColumns,j=D(g,"sName"),i=D(g,"nTh");return $a("column",d,function(a){var b=Pb(a);if(a==="")return V(g.length);if(b!==null)return[b>=0?b:g.length+b];if(typeof a==="function"){var d=Ca(c,
+f);return h.map(g,function(b,f){return a(f,Wb(c,f,0,0,d),i[f])?f:null})}var k=typeof a==="string"?a.match(dc):"";if(k)switch(k[2]){case "visIdx":case "visible":b=parseInt(k[1],10);if(b<0){var m=h.map(g,function(a,b){return a.bVisible?b:null});return[m[m.length+b]]}return[la(c,b)];case "name":return h.map(j,function(a,b){return a===k[1]?b:null})}else return h(i).filter(a).map(function(){return h.inArray(this,i)}).toArray()},c,f)},1);c.selector.cols=a;c.selector.opts=b;return c});v("columns().header()",
+"column().header()",function(){return this.iterator("column",function(a,b){return a.aoColumns[b].nTh},1)});v("columns().footer()","column().footer()",function(){return this.iterator("column",function(a,b){return a.aoColumns[b].nTf},1)});v("columns().data()","column().data()",function(){return this.iterator("column-rows",Wb,1)});v("columns().dataSrc()","column().dataSrc()",function(){return this.iterator("column",function(a,b){return a.aoColumns[b].mData},1)});v("columns().cache()","column().cache()",
+function(a){return this.iterator("column-rows",function(b,c,e,d,f){return ia(b.aoData,f,"search"===a?"_aFilterData":"_aSortData",c)},1)});v("columns().nodes()","column().nodes()",function(){return this.iterator("column-rows",function(a,b,c,e,d){return ia(a.aoData,d,"anCells",b)},1)});v("columns().visible()","column().visible()",function(a,b){return this.iterator("column",function(c,e){if(a===k)return c.aoColumns[e].bVisible;var d=c.aoColumns,f=d[e],g=c.aoData,j,i,m;if(a!==k&&f.bVisible!==a){if(a){var l=
+h.inArray(!0,D(d,"bVisible"),e+1);j=0;for(i=g.length;j<i;j++)m=g[j].nTr,d=g[j].anCells,m&&m.insertBefore(d[e],d[l]||null)}else h(D(c.aoData,"anCells",e)).detach();f.bVisible=a;ea(c,c.aoHeader);ea(c,c.aoFooter);if(b===k||b)X(c),(c.oScroll.sX||c.oScroll.sY)&&Y(c);w(c,null,"column-visibility",[c,e,a]);ya(c)}})});v("columns().indexes()","column().index()",function(a){return this.iterator("column",function(b,c){return"visible"===a?$(b,c):c},1)});r("columns.adjust()",function(){return this.iterator("table",
+function(a){X(a)},1)});r("column.index()",function(a,b){if(0!==this.context.length){var c=this.context[0];if("fromVisible"===a||"toData"===a)return la(c,b);if("fromData"===a||"toVisible"===a)return $(c,b)}});r("column()",function(a,b){return bb(this.columns(a,b))});r("cells()",function(a,b,c){h.isPlainObject(a)&&(a.row===k?(c=a,a=null):(c=b,b=null));h.isPlainObject(b)&&(c=b,b=null);if(null===b||b===k)return this.iterator("table",function(b){var d=a,e=ab(c),f=b.aoData,g=Ca(b,e),i=Sb(ia(f,g,"anCells")),
+j=h([].concat.apply([],i)),l,m=b.aoColumns.length,o,r,t,s,u,v;return $a("cell",d,function(a){var c=typeof a==="function";if(a===null||a===k||c){o=[];r=0;for(t=g.length;r<t;r++){l=g[r];for(s=0;s<m;s++){u={row:l,column:s};if(c){v=b.aoData[l];a(u,x(b,l,s),v.anCells?v.anCells[s]:null)&&o.push(u)}else o.push(u)}}return o}return h.isPlainObject(a)?[a]:j.filter(a).map(function(a,b){l=b.parentNode._DT_RowIndex;return{row:l,column:h.inArray(b,f[l].anCells)}}).toArray()},b,e)});var e=this.columns(b,c),d=this.rows(a,
+c),f,g,j,i,m,l=this.iterator("table",function(a,b){f=[];g=0;for(j=d[b].length;g<j;g++){i=0;for(m=e[b].length;i<m;i++)f.push({row:d[b][g],column:e[b][i]})}return f},1);h.extend(l.selector,{cols:b,rows:a,opts:c});return l});v("cells().nodes()","cell().node()",function(){return this.iterator("cell",function(a,b,c){return(a=a.aoData[b].anCells)?a[c]:k},1)});r("cells().data()",function(){return this.iterator("cell",function(a,b,c){return x(a,b,c)},1)});v("cells().cache()","cell().cache()",function(a){a=
+"search"===a?"_aFilterData":"_aSortData";return this.iterator("cell",function(b,c,e){return b.aoData[c][a][e]},1)});v("cells().render()","cell().render()",function(a){return this.iterator("cell",function(b,c,e){return x(b,c,e,a)},1)});v("cells().indexes()","cell().index()",function(){return this.iterator("cell",function(a,b,c){return{row:b,column:c,columnVisible:$(a,c)}},1)});v("cells().invalidate()","cell().invalidate()",function(a){return this.iterator("cell",function(b,c,e){ca(b,c,a,e)})});r("cell()",
+function(a,b,c){return bb(this.cells(a,b,c))});r("cell().data()",function(a){var b=this.context,c=this[0];if(a===k)return b.length&&c.length?x(b[0],c[0].row,c[0].column):k;Ia(b[0],c[0].row,c[0].column,a);ca(b[0],c[0].row,"data",c[0].column);return this});r("order()",function(a,b){var c=this.context;if(a===k)return 0!==c.length?c[0].aaSorting:k;"number"===typeof a?a=[[a,b]]:h.isArray(a[0])||(a=Array.prototype.slice.call(arguments));return this.iterator("table",function(b){b.aaSorting=a.slice()})});
+r("order.listener()",function(a,b,c){return this.iterator("table",function(e){Oa(e,a,b,c)})});r(["columns().order()","column().order()"],function(a){var b=this;return this.iterator("table",function(c,e){var d=[];h.each(b[e],function(b,c){d.push([c,a])});c.aaSorting=d})});r("search()",function(a,b,c,e){var d=this.context;return a===k?0!==d.length?d[0].oPreviousSearch.sSearch:k:this.iterator("table",function(d){d.oFeatures.bFilter&&fa(d,h.extend({},d.oPreviousSearch,{sSearch:a+"",bRegex:null===b?!1:
+b,bSmart:null===c?!0:c,bCaseInsensitive:null===e?!0:e}),1)})});v("columns().search()","column().search()",function(a,b,c,e){return this.iterator("column",function(d,f){var g=d.aoPreSearchCols;if(a===k)return g[f].sSearch;d.oFeatures.bFilter&&(h.extend(g[f],{sSearch:a+"",bRegex:null===b?!1:b,bSmart:null===c?!0:c,bCaseInsensitive:null===e?!0:e}),fa(d,d.oPreviousSearch,1))})});r("state()",function(){return this.context.length?this.context[0].oSavedState:null});r("state.clear()",function(){return this.iterator("table",
+function(a){a.fnStateSaveCallback.call(a.oInstance,a,{})})});r("state.loaded()",function(){return this.context.length?this.context[0].oLoadedState:null});r("state.save()",function(){return this.iterator("table",function(a){ya(a)})});m.versionCheck=m.fnVersionCheck=function(a){for(var b=m.version.split("."),a=a.split("."),c,e,d=0,f=a.length;d<f;d++)if(c=parseInt(b[d],10)||0,e=parseInt(a[d],10)||0,c!==e)return c>e;return!0};m.isDataTable=m.fnIsDataTable=function(a){var b=h(a).get(0),c=!1;h.each(m.settings,
+function(a,d){var f=d.nScrollHead?h("table",d.nScrollHead)[0]:null,g=d.nScrollFoot?h("table",d.nScrollFoot)[0]:null;if(d.nTable===b||f===b||g===b)c=!0});return c};m.tables=m.fnTables=function(a){return h.map(m.settings,function(b){if(!a||a&&h(b.nTable).is(":visible"))return b.nTable})};m.util={throttle:ua,escapeRegex:va};m.camelToHungarian=H;r("$()",function(a,b){var c=this.rows(b).nodes(),c=h(c);return h([].concat(c.filter(a).toArray(),c.find(a).toArray()))});h.each(["on","one","off"],function(a,
+b){r(b+"()",function(){var a=Array.prototype.slice.call(arguments);a[0].match(/\.dt\b/)||(a[0]+=".dt");var e=h(this.tables().nodes());e[b].apply(e,a);return this})});r("clear()",function(){return this.iterator("table",function(a){oa(a)})});r("settings()",function(){return new t(this.context,this.context)});r("init()",function(){var a=this.context;return a.length?a[0].oInit:null});r("data()",function(){return this.iterator("table",function(a){return D(a.aoData,"_aData")}).flatten()});r("destroy()",
+function(a){a=a||!1;return this.iterator("table",function(b){var c=b.nTableWrapper.parentNode,e=b.oClasses,d=b.nTable,f=b.nTBody,g=b.nTHead,j=b.nTFoot,i=h(d),f=h(f),k=h(b.nTableWrapper),l=h.map(b.aoData,function(a){return a.nTr}),q;b.bDestroying=!0;w(b,"aoDestroyCallback","destroy",[b]);a||(new t(b)).columns().visible(!0);k.unbind(".DT").find(":not(tbody *)").unbind(".DT");h(Ea).unbind(".DT-"+b.sInstance);d!=g.parentNode&&(i.children("thead").detach(),i.append(g));j&&d!=j.parentNode&&(i.children("tfoot").detach(),
+i.append(j));i.detach();k.detach();b.aaSorting=[];b.aaSortingFixed=[];xa(b);h(l).removeClass(b.asStripeClasses.join(" "));h("th, td",g).removeClass(e.sSortable+" "+e.sSortableAsc+" "+e.sSortableDesc+" "+e.sSortableNone);b.bJUI&&(h("th span."+e.sSortIcon+", td span."+e.sSortIcon,g).detach(),h("th, td",g).each(function(){var a=h("div."+e.sSortJUIWrapper,this);h(this).append(a.contents());a.detach()}));!a&&c&&c.insertBefore(d,b.nTableReinsertBefore);f.children().detach();f.append(l);i.css("width",b.sDestroyWidth).removeClass(e.sTable);
+(q=b.asDestroyStripes.length)&&f.children().each(function(a){h(this).addClass(b.asDestroyStripes[a%q])});c=h.inArray(b,m.settings);-1!==c&&m.settings.splice(c,1)})});h.each(["column","row","cell"],function(a,b){r(b+"s().every()",function(a){return this.iterator(b,function(e,d,f){a.call((new t(e))[b](d,f))})})});r("i18n()",function(a,b,c){var e=this.context[0],a=R(a)(e.oLanguage);a===k&&(a=b);c!==k&&h.isPlainObject(a)&&(a=a[c]!==k?a[c]:a._);return a.replace("%d",c)});m.version="1.10.7";m.settings=
+[];m.models={};m.models.oSearch={bCaseInsensitive:!0,sSearch:"",bRegex:!1,bSmart:!0};m.models.oRow={nTr:null,anCells:null,_aData:[],_aSortData:null,_aFilterData:null,_sFilterRow:null,_sRowStripe:"",src:null};m.models.oColumn={idx:null,aDataSort:null,asSorting:null,bSearchable:null,bSortable:null,bVisible:null,_sManualType:null,_bAttrSrc:!1,fnCreatedCell:null,fnGetData:null,fnSetData:null,mData:null,mRender:null,nTh:null,nTf:null,sClass:null,sContentPadding:null,sDefaultContent:null,sName:null,sSortDataType:"std",
+sSortingClass:null,sSortingClassJUI:null,sTitle:null,sType:null,sWidth:null,sWidthOrig:null};m.defaults={aaData:null,aaSorting:[[0,"asc"]],aaSortingFixed:[],ajax:null,aLengthMenu:[10,25,50,100],aoColumns:null,aoColumnDefs:null,aoSearchCols:[],asStripeClasses:null,bAutoWidth:!0,bDeferRender:!1,bDestroy:!1,bFilter:!0,bInfo:!0,bJQueryUI:!1,bLengthChange:!0,bPaginate:!0,bProcessing:!1,bRetrieve:!1,bScrollCollapse:!1,bServerSide:!1,bSort:!0,bSortMulti:!0,bSortCellsTop:!1,bSortClasses:!0,bStateSave:!1,
+fnCreatedRow:null,fnDrawCallback:null,fnFooterCallback:null,fnFormatNumber:function(a){return a.toString().replace(/\B(?=(\d{3})+(?!\d))/g,this.oLanguage.sThousands)},fnHeaderCallback:null,fnInfoCallback:null,fnInitComplete:null,fnPreDrawCallback:null,fnRowCallback:null,fnServerData:null,fnServerParams:null,fnStateLoadCallback:function(a){try{return JSON.parse((-1===a.iStateDuration?sessionStorage:localStorage).getItem("DataTables_"+a.sInstance+"_"+location.pathname))}catch(b){}},fnStateLoadParams:null,
+fnStateLoaded:null,fnStateSaveCallback:function(a,b){try{(-1===a.iStateDuration?sessionStorage:localStorage).setItem("DataTables_"+a.sInstance+"_"+location.pathname,JSON.stringify(b))}catch(c){}},fnStateSaveParams:null,iStateDuration:7200,iDeferLoading:null,iDisplayLength:10,iDisplayStart:0,iTabIndex:0,oClasses:{},oLanguage:{oAria:{sSortAscending:": activate to sort column ascending",sSortDescending:": activate to sort column descending"},oPaginate:{sFirst:"First",sLast:"Last",sNext:"Next",sPrevious:"Previous"},
+sEmptyTable:"No data available in table",sInfo:"Showing _START_ to _END_ of _TOTAL_ entries",sInfoEmpty:"Showing 0 to 0 of 0 entries",sInfoFiltered:"(filtered from _MAX_ total entries)",sInfoPostFix:"",sDecimal:"",sThousands:",",sLengthMenu:"Show _MENU_ entries",sLoadingRecords:"Loading...",sProcessing:"Processing...",sSearch:"Search:",sSearchPlaceholder:"",sUrl:"",sZeroRecords:"No matching records found"},oSearch:h.extend({},m.models.oSearch),sAjaxDataProp:"data",sAjaxSource:null,sDom:"lfrtip",searchDelay:null,
+sPaginationType:"simple_numbers",sScrollX:"",sScrollXInner:"",sScrollY:"",sServerMethod:"GET",renderer:null};W(m.defaults);m.defaults.column={aDataSort:null,iDataSort:-1,asSorting:["asc","desc"],bSearchable:!0,bSortable:!0,bVisible:!0,fnCreatedCell:null,mData:null,mRender:null,sCellType:"td",sClass:"",sContentPadding:"",sDefaultContent:null,sName:"",sSortDataType:"std",sTitle:null,sType:null,sWidth:null};W(m.defaults.column);m.models.oSettings={oFeatures:{bAutoWidth:null,bDeferRender:null,bFilter:null,
+bInfo:null,bLengthChange:null,bPaginate:null,bProcessing:null,bServerSide:null,bSort:null,bSortMulti:null,bSortClasses:null,bStateSave:null},oScroll:{bCollapse:null,iBarWidth:0,sX:null,sXInner:null,sY:null},oLanguage:{fnInfoCallback:null},oBrowser:{bScrollOversize:!1,bScrollbarLeft:!1},ajax:null,aanFeatures:[],aoData:[],aiDisplay:[],aiDisplayMaster:[],aoColumns:[],aoHeader:[],aoFooter:[],oPreviousSearch:{},aoPreSearchCols:[],aaSorting:null,aaSortingFixed:[],asStripeClasses:null,asDestroyStripes:[],
+sDestroyWidth:0,aoRowCallback:[],aoHeaderCallback:[],aoFooterCallback:[],aoDrawCallback:[],aoRowCreatedCallback:[],aoPreDrawCallback:[],aoInitComplete:[],aoStateSaveParams:[],aoStateLoadParams:[],aoStateLoaded:[],sTableId:"",nTable:null,nTHead:null,nTFoot:null,nTBody:null,nTableWrapper:null,bDeferLoading:!1,bInitialised:!1,aoOpenRows:[],sDom:null,searchDelay:null,sPaginationType:"two_button",iStateDuration:0,aoStateSave:[],aoStateLoad:[],oSavedState:null,oLoadedState:null,sAjaxSource:null,sAjaxDataProp:null,
+bAjaxDataGet:!0,jqXHR:null,json:k,oAjaxData:k,fnServerData:null,aoServerParams:[],sServerMethod:null,fnFormatNumber:null,aLengthMenu:null,iDraw:0,bDrawing:!1,iDrawError:-1,_iDisplayLength:10,_iDisplayStart:0,_iRecordsTotal:0,_iRecordsDisplay:0,bJUI:null,oClasses:{},bFiltered:!1,bSorted:!1,bSortCellsTop:null,oInit:null,aoDestroyCallback:[],fnRecordsTotal:function(){return"ssp"==B(this)?1*this._iRecordsTotal:this.aiDisplayMaster.length},fnRecordsDisplay:function(){return"ssp"==B(this)?1*this._iRecordsDisplay:
+this.aiDisplay.length},fnDisplayEnd:function(){var a=this._iDisplayLength,b=this._iDisplayStart,c=b+a,e=this.aiDisplay.length,d=this.oFeatures,f=d.bPaginate;return d.bServerSide?!1===f||-1===a?b+e:Math.min(b+a,this._iRecordsDisplay):!f||c>e||-1===a?e:c},oInstance:null,sInstance:null,iTabIndex:0,nScrollHead:null,nScrollFoot:null,aLastSort:[],oPlugins:{}};m.ext=u={buttons:{},classes:{},errMode:"alert",feature:[],search:[],selector:{cell:[],column:[],row:[]},internal:{},legacy:{ajax:null},pager:{},renderer:{pageButton:{},
+header:{}},order:{},type:{detect:[],search:{},order:{}},_unique:0,fnVersionCheck:m.fnVersionCheck,iApiIndex:0,oJUIClasses:{},sVersion:m.version};h.extend(u,{afnFiltering:u.search,aTypes:u.type.detect,ofnSearch:u.type.search,oSort:u.type.order,afnSortData:u.order,aoFeatures:u.feature,oApi:u.internal,oStdClasses:u.classes,oPagination:u.pager});h.extend(m.ext.classes,{sTable:"dataTable",sNoFooter:"no-footer",sPageButton:"paginate_button",sPageButtonActive:"current",sPageButtonDisabled:"disabled",sStripeOdd:"odd",
+sStripeEven:"even",sRowEmpty:"dataTables_empty",sWrapper:"dataTables_wrapper",sFilter:"dataTables_filter",sInfo:"dataTables_info",sPaging:"dataTables_paginate paging_",sLength:"dataTables_length",sProcessing:"dataTables_processing",sSortAsc:"sorting_asc",sSortDesc:"sorting_desc",sSortable:"sorting",sSortableAsc:"sorting_asc_disabled",sSortableDesc:"sorting_desc_disabled",sSortableNone:"sorting_disabled",sSortColumn:"sorting_",sFilterInput:"",sLengthSelect:"",sScrollWrapper:"dataTables_scroll",sScrollHead:"dataTables_scrollHead",
+sScrollHeadInner:"dataTables_scrollHeadInner",sScrollBody:"dataTables_scrollBody",sScrollFoot:"dataTables_scrollFoot",sScrollFootInner:"dataTables_scrollFootInner",sHeaderTH:"",sFooterTH:"",sSortJUIAsc:"",sSortJUIDesc:"",sSortJUI:"",sSortJUIAscAllowed:"",sSortJUIDescAllowed:"",sSortJUIWrapper:"",sSortIcon:"",sJUIHeader:"",sJUIFooter:""});var Da="",Da="",F=Da+"ui-state-default",ja=Da+"css_right ui-icon ui-icon-",Xb=Da+"fg-toolbar ui-toolbar ui-widget-header ui-helper-clearfix";h.extend(m.ext.oJUIClasses,
+m.ext.classes,{sPageButton:"fg-button ui-button "+F,sPageButtonActive:"ui-state-disabled",sPageButtonDisabled:"ui-state-disabled",sPaging:"dataTables_paginate fg-buttonset ui-buttonset fg-buttonset-multi ui-buttonset-multi paging_",sSortAsc:F+" sorting_asc",sSortDesc:F+" sorting_desc",sSortable:F+" sorting",sSortableAsc:F+" sorting_asc_disabled",sSortableDesc:F+" sorting_desc_disabled",sSortableNone:F+" sorting_disabled",sSortJUIAsc:ja+"triangle-1-n",sSortJUIDesc:ja+"triangle-1-s",sSortJUI:ja+"carat-2-n-s",
+sSortJUIAscAllowed:ja+"carat-1-n",sSortJUIDescAllowed:ja+"carat-1-s",sSortJUIWrapper:"DataTables_sort_wrapper",sSortIcon:"DataTables_sort_icon",sScrollHead:"dataTables_scrollHead "+F,sScrollFoot:"dataTables_scrollFoot "+F,sHeaderTH:F,sFooterTH:F,sJUIHeader:Xb+" ui-corner-tl ui-corner-tr",sJUIFooter:Xb+" ui-corner-bl ui-corner-br"});var Mb=m.ext.pager;h.extend(Mb,{simple:function(){return["previous","next"]},full:function(){return["first","previous","next","last"]},simple_numbers:function(a,b){return["previous",
+Wa(a,b),"next"]},full_numbers:function(a,b){return["first","previous",Wa(a,b),"next","last"]},_numbers:Wa,numbers_length:7});h.extend(!0,m.ext.renderer,{pageButton:{_:function(a,b,c,e,d,f){var g=a.oClasses,j=a.oLanguage.oPaginate,i,k,l=0,m=function(b,e){var n,r,t,s,u=function(b){Ta(a,b.data.action,true)};n=0;for(r=e.length;n<r;n++){s=e[n];if(h.isArray(s)){t=h("<"+(s.DT_el||"div")+"/>").appendTo(b);m(t,s)}else{k=i="";switch(s){case "ellipsis":b.append('<span class="ellipsis">&#x2026;</span>');break;
+case "first":i=j.sFirst;k=s+(d>0?"":" "+g.sPageButtonDisabled);break;case "previous":i=j.sPrevious;k=s+(d>0?"":" "+g.sPageButtonDisabled);break;case "next":i=j.sNext;k=s+(d<f-1?"":" "+g.sPageButtonDisabled);break;case "last":i=j.sLast;k=s+(d<f-1?"":" "+g.sPageButtonDisabled);break;default:i=s+1;k=d===s?g.sPageButtonActive:""}if(i){t=h("<a>",{"class":g.sPageButton+" "+k,"aria-controls":a.sTableId,"data-dt-idx":l,tabindex:a.iTabIndex,id:c===0&&typeof s==="string"?a.sTableId+"_"+s:null}).html(i).appendTo(b);
+Va(t,{action:s},u);l++}}}},n;try{n=h(Q.activeElement).data("dt-idx")}catch(r){}m(h(b).empty(),e);n&&h(b).find("[data-dt-idx="+n+"]").focus()}}});h.extend(m.ext.type.detect,[function(a,b){var c=b.oLanguage.sDecimal;return Za(a,c)?"num"+c:null},function(a){if(a&&!(a instanceof Date)&&(!ac.test(a)||!bc.test(a)))return null;var b=Date.parse(a);return null!==b&&!isNaN(b)||J(a)?"date":null},function(a,b){var c=b.oLanguage.sDecimal;return Za(a,c,!0)?"num-fmt"+c:null},function(a,b){var c=b.oLanguage.sDecimal;
+return Rb(a,c)?"html-num"+c:null},function(a,b){var c=b.oLanguage.sDecimal;return Rb(a,c,!0)?"html-num-fmt"+c:null},function(a){return J(a)||"string"===typeof a&&-1!==a.indexOf("<")?"html":null}]);h.extend(m.ext.type.search,{html:function(a){return J(a)?a:"string"===typeof a?a.replace(Ob," ").replace(Ba,""):""},string:function(a){return J(a)?a:"string"===typeof a?a.replace(Ob," "):a}});var Aa=function(a,b,c,e){if(0!==a&&(!a||"-"===a))return-Infinity;b&&(a=Qb(a,b));a.replace&&(c&&(a=a.replace(c,"")),
+e&&(a=a.replace(e,"")));return 1*a};h.extend(u.type.order,{"date-pre":function(a){return Date.parse(a)||0},"html-pre":function(a){return J(a)?"":a.replace?a.replace(/<.*?>/g,"").toLowerCase():a+""},"string-pre":function(a){return J(a)?"":"string"===typeof a?a.toLowerCase():!a.toString?"":a.toString()},"string-asc":function(a,b){return a<b?-1:a>b?1:0},"string-desc":function(a,b){return a<b?1:a>b?-1:0}});db("");h.extend(!0,m.ext.renderer,{header:{_:function(a,b,c,e){h(a.nTable).on("order.dt.DT",function(d,
+f,g,h){if(a===f){d=c.idx;b.removeClass(c.sSortingClass+" "+e.sSortAsc+" "+e.sSortDesc).addClass(h[d]=="asc"?e.sSortAsc:h[d]=="desc"?e.sSortDesc:c.sSortingClass)}})},jqueryui:function(a,b,c,e){h("<div/>").addClass(e.sSortJUIWrapper).append(b.contents()).append(h("<span/>").addClass(e.sSortIcon+" "+c.sSortingClassJUI)).appendTo(b);h(a.nTable).on("order.dt.DT",function(d,f,g,h){if(a===f){d=c.idx;b.removeClass(e.sSortAsc+" "+e.sSortDesc).addClass(h[d]=="asc"?e.sSortAsc:h[d]=="desc"?e.sSortDesc:c.sSortingClass);
+b.find("span."+e.sSortIcon).removeClass(e.sSortJUIAsc+" "+e.sSortJUIDesc+" "+e.sSortJUI+" "+e.sSortJUIAscAllowed+" "+e.sSortJUIDescAllowed).addClass(h[d]=="asc"?e.sSortJUIAsc:h[d]=="desc"?e.sSortJUIDesc:c.sSortingClassJUI)}})}}});m.render={number:function(a,b,c,e){return{display:function(d){if("number"!==typeof d&&"string"!==typeof d)return d;var f=0>d?"-":"",d=Math.abs(parseFloat(d)),g=parseInt(d,10),d=c?b+(d-g).toFixed(c).substring(2):"";return f+(e||"")+g.toString().replace(/\B(?=(\d{3})+(?!\d))/g,
+a)+d}}}};h.extend(m.ext.internal,{_fnExternApiFunc:Nb,_fnBuildAjax:ra,_fnAjaxUpdate:kb,_fnAjaxParameters:tb,_fnAjaxUpdateDraw:ub,_fnAjaxDataSrc:sa,_fnAddColumn:Fa,_fnColumnOptions:ka,_fnAdjustColumnSizing:X,_fnVisibleToColumnIndex:la,_fnColumnIndexToVisible:$,_fnVisbleColumns:aa,_fnGetColumns:Z,_fnColumnTypes:Ha,_fnApplyColumnDefs:ib,_fnHungarianMap:W,_fnCamelToHungarian:H,_fnLanguageCompat:P,_fnBrowserDetect:gb,_fnAddData:K,_fnAddTr:ma,_fnNodeToDataIndex:function(a,b){return b._DT_RowIndex!==k?b._DT_RowIndex:
+null},_fnNodeToColumnIndex:function(a,b,c){return h.inArray(c,a.aoData[b].anCells)},_fnGetCellData:x,_fnSetCellData:Ia,_fnSplitObjNotation:Ka,_fnGetObjectDataFn:R,_fnSetObjectDataFn:S,_fnGetDataMaster:La,_fnClearTable:oa,_fnDeleteIndex:pa,_fnInvalidate:ca,_fnGetRowElements:na,_fnCreateTr:Ja,_fnBuildHead:jb,_fnDrawHead:ea,_fnDraw:M,_fnReDraw:N,_fnAddOptionsHtml:mb,_fnDetectHeader:da,_fnGetUniqueThs:qa,_fnFeatureHtmlFilter:ob,_fnFilterComplete:fa,_fnFilterCustom:xb,_fnFilterColumn:wb,_fnFilter:vb,_fnFilterCreateSearch:Qa,
+_fnEscapeRegex:va,_fnFilterData:yb,_fnFeatureHtmlInfo:rb,_fnUpdateInfo:Bb,_fnInfoMacros:Cb,_fnInitialise:ga,_fnInitComplete:ta,_fnLengthChange:Ra,_fnFeatureHtmlLength:nb,_fnFeatureHtmlPaginate:sb,_fnPageChange:Ta,_fnFeatureHtmlProcessing:pb,_fnProcessingDisplay:C,_fnFeatureHtmlTable:qb,_fnScrollDraw:Y,_fnApplyToChildren:G,_fnCalculateColumnWidths:Ga,_fnThrottle:ua,_fnConvertToWidth:Db,_fnScrollingWidthAdjust:Fb,_fnGetWidestNode:Eb,_fnGetMaxLenString:Gb,_fnStringToCss:s,_fnScrollBarWidth:Hb,_fnSortFlatten:U,
+_fnSort:lb,_fnSortAria:Jb,_fnSortListener:Ua,_fnSortAttachListener:Oa,_fnSortingClasses:xa,_fnSortData:Ib,_fnSaveState:ya,_fnLoadState:Kb,_fnSettingsFromNode:za,_fnLog:I,_fnMap:E,_fnBindAction:Va,_fnCallbackReg:z,_fnCallbackFire:w,_fnLengthOverflow:Sa,_fnRenderer:Pa,_fnDataSource:B,_fnRowAttributes:Ma,_fnCalculateEnd:function(){}});h.fn.dataTable=m;h.fn.dataTableSettings=m.settings;h.fn.dataTableExt=m.ext;h.fn.DataTable=function(a){return h(this).dataTable(a).api()};h.each(m,function(a,b){h.fn.DataTable[a]=
+b});return h.fn.dataTable};"function"===typeof define&&define.amd?define("datatables",["jquery"],P):"object"===typeof exports?module.exports=P(require("jquery")):jQuery&&!jQuery.fn.dataTable&&P(jQuery)})(window,document);
diff --git a/data/interfaces/default/js/jquery.inputaffix.min.js b/data/interfaces/default/js/jquery.inputaffix.min.js
deleted file mode 100644
index 059f7c5a..00000000
--- a/data/interfaces/default/js/jquery.inputaffix.min.js
+++ /dev/null
@@ -1 +0,0 @@
-"use strict";!function(t){if(!t)throw new Error("Input Affix: no jQuery found. Make sure window.jQuery exists.");t.fn.caret=function(t,e){var a,r,n=this[0];if("object"==typeof t&&"number"==typeof t.start)a=t.start,r="number"==typeof t.end?t.end:t.start;else if("number"==typeof t)a=t,r="number"==typeof e?e:a;else if("string"==typeof t)(a=n.value.indexOf(t))>-1?r=a+t.length:a=null;else if("[object RegExp]"===Object.prototype.toString.call(t)){var s=t.exec(n.value);null!=s&&(r=(a=s.index)+s[0].length)}if(void 0!==a){if(n.createTextRange){var i=n.createTextRange();i.collapse(!0),i.moveStart("character",a),i.moveEnd("character",r-a),i.select()}else n.selectionStart=a,n.selectionEnd=r;return n.focus(),this}if(document.selection){var l=document.selection;if("textarea"!=n.tagName.toLowerCase()){var h=this.val();(g=l.createRange().duplicate()).moveEnd("character",h.length);var f=""==g.text?h.length:h.lastIndexOf(g.text);(g=l.createRange().duplicate()).moveStart("character",-h.length);var u=g.text.length}else{var g,d=(g=l.createRange()).duplicate();d.moveToElementText(n),d.setEndPoint("EndToEnd",g);u=(f=d.text.length-g.text.length)+g.text.length}}else f=n.selectionStart,u=n.selectionEnd;var c=n.value.substring(f,u);return{start:f,end:u,text:c,replace:function(t){return n.value.substring(0,f)+t+n.value.substring(u,n.value.length)}}},t.fn.affixValue=function(t){if(void 0===t){t=this.val();var e=this.data("prefix"),a=this.data("suffix");return e&&t.substr(0,e.length)==e&&(t=t.substr(e.length)),a&&t.substr(t.length-a.length)==a&&(t=t.substr(0,t.length-a.length)),t}return t+="",this.data("prefix")&&(t=this.data("prefix")+t),this.data("suffix")&&(t+=this.data("suffix")),this.val(t),this},t.fn.prefix=function(e,a){if(void 0===e)return this.data("prefix");var r=this.val(),n=this.data("prefix");return n&&r.substr(0,n.length)==n&&(this.val(r.substr(n.length,r.length-n.length)),r=this.val()),"object"==typeof e?(this.data("prefix-list",e),e=e[a=a||0]):"number"==typeof e&&this.data("prefix-list")?(a=e,e=this.data("prefix-list")[a]):this.data("prefix-list",!1),this.data("prefix",e),this.data("prefixQueue",0),this.trigger("prefixchange",[e,a||0]),""==this.affixValue()&&this.attr("placeholder")||0==r.indexOf(e)||this.val(e+this.val()),this.on("keypress",function(a){var r=t(this),n=r.caret(),s=r.data("prefix"),i=r.val();if(!a.ctrlKey&&n.start<s.length){var l=r.data("prefix-list"),h=String.fromCharCode(a.which);if(l&&0==n.start)for(var f=0;f<l.length;f++)if(l[f].substr(0,1)==h){r.prefix(f);r.prefix();return r.caret({start:1}),void a.preventDefault()}if(l&&i.substr(0,e.length)!=e)return;var u=r.data("prefixQueue");if(n.start==n.end&&s.substr(n.start,1)==h)r.caret(n.start),r.data("prefixQueue",n.start+1),a.preventDefault();else if(n.start!=n.end&&s.substr(n.start,1)==h){var g=s+i.substr(n.end);r.data("suffix")&&(g+=r.data("suffix")),r.val(g),r.caret(n.start+1),a.preventDefault()}else if(n.start==n.end&&u==n.start){var d=n.start+s.length;r.val(s+i.substr(0,n.start)+h+i.substr(s.length)),r.caret(d+1),r.data("prefixQueue",0),a.preventDefault()}else r.caret({start:s.length,end:Math.max(n.end,s.length)})}}).on("keydown",function(e){var a=t(this),r=a.caret(),n=a.data("prefix");if(8==e.which||46==e.which){if(a.data("prefix-list"))return;8==e.which&&r.end<=n.length?(a.caret(n.length),e.preventDefault()):r.end<n.length?a.caret(n.length):r.start<n.length&&a.caret({start:n.length,end:r.end})}else if(86==e.which&&e.ctrlKey){if(a.data("prefix-list"))return;if(r.start<n.length){var s=r.end;s<n.length&&(s+=n.length),a.caret({start:n.length,end:s})}}else 36==e.which&&e.ctrlKey&&(e.shiftKey?a.caret({start:n.length,end:Math.max(r.start,n.length)}):a.caret({start:n.length,end:n.length}),e.preventDefault())}).on("paste",function(e){var a=t(this);setTimeout(function(){var t=a.data("prefix"),r=a.caret(),n=a.val(),s=r.end;if(a.data("prefix-list"))for(var i=a.data("prefix-list"),l=0;l<i.length;l++)if(n.substr(0,i[l].length)==i[l]){t=i[l],a.data("prefix",t),a.trigger("prefixchange",[t,l]);break}n.substr(0,t.length)!=t&&(n=t+n,s+=t.length);var h=n.substr(t.length),f=h;for(l=t.length-1;l>=0;l--)if(h.substr(0,l+1)==t.substr(t.length-1-l)){f=f.substr(l+1);break}a.val(t+f),a.caret({start:s,end:s}),e.preventDefault()})}).on("change",function(e){var a=t(this).data("prefix"),r=t(this).val();r.substr(0,a.length)!=a&&(r=a+r,t(this).val(r))}).on("blur",function(e){var a=t(this).data("prefix-list"),r=t(this).data("prefix"),n=t(this).val();if(a&&n.substr(0,r.length)!=r){for(var s=0;s<a.length;s++)if(n.substr(0,a[s].length)==a[s])return void t(this).prefix(s);n=r+n,t(this).val(n)}""==t(this).affixValue()&&t(this).attr("placeholder")&&t(this).val("")}).on("focus",function(e){""==t(this).affixValue()&&t(this).affixValue("")}),this},t.fn.suffix=function(e,a){if(void 0===e)return this.data("suffix");var r=this.val(),n=this.data("suffix");return n&&r.substr(r.length-n.length)==n&&this.val(r.substr(0,r.length-n.length)),"object"==typeof e?(this.data("suffix-list",e),e=e[a=a||0]):"number"==typeof e&&this.data("suffix-list")?(a=e,e=this.data("suffix-list")[a]):this.data("suffix-list",!1),this.data("suffix",e),this.data("suffixQueue",0),this.trigger("suffixchange",[e,a||0]),""==this.affixValue()&&this.attr("placeholder")||this.val().substr(this.val().length-e.length)===e||this.val(this.val()+e),this.on("keypress",function(a){var r=t(this),n=r.caret(),s=r.val(),i=r.data("suffix");if(n.end>=s.length-i.length){var l=r.data("suffix-list"),h=String.fromCharCode(a.which);if(l&&n.start>=s.length-i.length)for(var f=0;f<l.length;f++)if(l[f].substr(0,1)==h)return r.val(s.substr(0,n.start)),r.suffix(f),r.caret({start:r.val().length,end:r.val().length}),void a.preventDefault();if(l&&s.substr(s.length-e.length)!=i)return;if(n.start==n.end&&i.substr(n.end-s.length+i.length,1)==h)r.caret({start:n.end+1,end:n.end+1}),r.data("prefixQueue",n.end-s.length+i.length+1),a.preventDefault();else{var u=document.queryCommandValue("OverWrite");n.start==n.end&&r.data("prefixQueue")==n.end-s.length+i.length?(r.val(s.substr(0,n.start)+h+i),r.caret({start:n.start+1,end:n.start+1}),a.preventDefault()):u?(r.val(s.substr(0,n.start)+h+i),r.caret(s.length-i.length+1),a.preventDefault()):r.caret({start:Math.min(n.start,s.length-i.length),end:s.length-i.length})}}else n.end==s.length-i.length&&n.start==n.end&&i.substr(n.end-s.length+i.length,1)==h&&(r.caret({start:n.end+1,end:n.end+1}),a.preventDefault())}).on("keydown",function(e){var a=t(this),r=a.caret(),n=a.val(),s=a.data("suffix");if(8==e.which||46==e.which){if(a.data("suffix-list"))return;if(46==e.which&&r.start>=n.length-s.length)a.caret(n.length-s.length),e.preventDefault();else if(r.end>n.length-s.length){a.caret({start:Math.min(r.start,n.length-s.length),end:n.length-s.length});var i=a.data("prefix");i&&n.length==i.length+s.length&&e.preventDefault()}}else if(86==e.which&&e.ctrlKey){if(r.end>n.length-s.length){var l=r.start;l>n.length-s.length&&(l-=s.length),a.caret({start:l,end:n.length-s.length})}}else 35==e.which&&e.ctrlKey&&(e.shiftKey?a.caret({start:Math.min(n.length-s.length,r.end),end:n.length-s.length}):a.caret({start:n.length-s.length,end:n.length-s.length}),e.preventDefault())}).on("paste",function(e){var a=t(this);setTimeout(function(){var r=a.data("suffix"),n=a.caret(),s=a.val(),i=n.end;if(a.data("suffix-list"))for(var l=a.data("suffix-list"),h=0;h<l.length;h++)if(s.substr(s.length-l[h].length)==l[h]){r=l[h],a.data("suffix",r),a.trigger("suffixchange",[r,h]);break}s.substr(s.length-r.length)!=r&&(s+=r);var f=s.substr(0,s.length-r.length),u=f;n.end>s.length-r.length&&((i=n.start)>s.length-r.length&&(i-=r.length),t(this).caret({start:i,end:s.length-r.length}));for(h=r.length-1;h>=0;h--)if(f.substr(f.length-r.length+h)==r.substr(0,r.length-h)){u=u.substr(0,f.length-r.length+h);break}a.val(u+r),a.caret({start:i,end:i}),e.preventDefault()},1)}).on("change",function(e){var a=t(this).data("suffix"),r=t(this).val();r.substr(r.length-a.length)!=a&&(r+=a,t(this).val(r))}).on("blur",function(e){var a=t(this).data("suffix-list"),r=t(this).data("suffix"),n=t(this).val();if(a&&n.substr(n.length-r.length)!=r){for(var s=0;s<a.length;s++)if(n.substr(n.length-a[s].length)==a[s])return void t(this).suffix(s);n+=r,t(this).val(n)}""==t(this).affixValue()&&t(this).attr("placeholder")&&t(this).val("")}).on("focus",function(e){var a=t(this);if(""==a.affixValue()){a.affixValue("");var r=0;a.data("prefix")&&(r=a.data("prefix").length),setTimeout(function(){a.caret({start:r,end:r})},1),e.preventDefault()}}),this}}(window.jQuery);
\ No newline at end of file
diff --git a/data/interfaces/default/js/jquery.mousewheel.min.js b/data/interfaces/default/js/jquery.mousewheel.min.js
deleted file mode 100644
index 03bfd60c..00000000
--- a/data/interfaces/default/js/jquery.mousewheel.min.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*!
- * jQuery Mousewheel 3.1.13
- *
- * Copyright 2015 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof exports?module.exports=a:a(jQuery)}(function(a){function b(b){var g=b||window.event,h=i.call(arguments,1),j=0,l=0,m=0,n=0,o=0,p=0;if(b=a.event.fix(g),b.type="mousewheel","detail"in g&&(m=-1*g.detail),"wheelDelta"in g&&(m=g.wheelDelta),"wheelDeltaY"in g&&(m=g.wheelDeltaY),"wheelDeltaX"in g&&(l=-1*g.wheelDeltaX),"axis"in g&&g.axis===g.HORIZONTAL_AXIS&&(l=-1*m,m=0),j=0===m?l:m,"deltaY"in g&&(m=-1*g.deltaY,j=m),"deltaX"in g&&(l=g.deltaX,0===m&&(j=-1*l)),0!==m||0!==l){if(1===g.deltaMode){var q=a.data(this,"mousewheel-line-height");j*=q,m*=q,l*=q}else if(2===g.deltaMode){var r=a.data(this,"mousewheel-page-height");j*=r,m*=r,l*=r}if(n=Math.max(Math.abs(m),Math.abs(l)),(!f||f>n)&&(f=n,d(g,n)&&(f/=40)),d(g,n)&&(j/=40,l/=40,m/=40),j=Math[j>=1?"floor":"ceil"](j/f),l=Math[l>=1?"floor":"ceil"](l/f),m=Math[m>=1?"floor":"ceil"](m/f),k.settings.normalizeOffset&&this.getBoundingClientRect){var s=this.getBoundingClientRect();o=b.clientX-s.left,p=b.clientY-s.top}return b.deltaX=l,b.deltaY=m,b.deltaFactor=f,b.offsetX=o,b.offsetY=p,b.deltaMode=0,h.unshift(b,j,l,m),e&&clearTimeout(e),e=setTimeout(c,200),(a.event.dispatch||a.event.handle).apply(this,h)}}function c(){f=null}function d(a,b){return k.settings.adjustOldDeltas&&"mousewheel"===a.type&&b%120===0}var e,f,g=["wheel","mousewheel","DOMMouseScroll","MozMousePixelScroll"],h="onwheel"in document||document.documentMode>=9?["wheel"]:["mousewheel","DomMouseScroll","MozMousePixelScroll"],i=Array.prototype.slice;if(a.event.fixHooks)for(var j=g.length;j;)a.event.fixHooks[g[--j]]=a.event.mouseHooks;var k=a.event.special.mousewheel={version:"3.1.12",setup:function(){if(this.addEventListener)for(var c=h.length;c;)this.addEventListener(h[--c],b,!1);else this.onmousewheel=b;a.data(this,"mousewheel-line-height",k.getLineHeight(this)),a.data(this,"mousewheel-page-height",k.getPageHeight(this))},teardown:function(){if(this.removeEventListener)for(var c=h.length;c;)this.removeEventListener(h[--c],b,!1);else this.onmousewheel=null;a.removeData(this,"mousewheel-line-height"),a.removeData(this,"mousewheel-page-height")},getLineHeight:function(b){var c=a(b),d=c["offsetParent"in a.fn?"offsetParent":"parent"]();return d.length||(d=a("body")),parseInt(d.css("fontSize"),10)||parseInt(c.css("fontSize"),10)||16},getPageHeight:function(b){return a(b).height()},settings:{adjustOldDeltas:!0,normalizeOffset:!0}};a.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})});
\ No newline at end of file
diff --git a/data/interfaces/default/js/jquery.scrollbar.min.js b/data/interfaces/default/js/jquery.scrollbar.min.js
deleted file mode 100644
index cf9d8935..00000000
--- a/data/interfaces/default/js/jquery.scrollbar.min.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * jQuery CSS Customizable Scrollbar
- *
- * Copyright 2015, Yuriy Khabarov
- * Dual licensed under the MIT or GPL Version 2 licenses.
- *
- * If you found bug, please contact me via email <13real008@gmail.com>
- *
- * Compressed by http://jscompress.com/
- *
- * @author Yuriy Khabarov aka Gromo
- * @version 0.2.11
- * @url https://github.com/gromo/jquery.scrollbar/
- *
- */
-!function(a,b){"function"==typeof define&&define.amd?define(["jquery"],b):b("undefined"!=typeof exports?require("jquery"):a.jQuery)}(this,function(a){"use strict";function h(b){if(c.webkit&&!b)return{height:0,width:0};if(!c.data.outer){var d={border:"none","box-sizing":"content-box",height:"200px",margin:"0",padding:"0",width:"200px"};c.data.inner=a("<div>").css(a.extend({},d)),c.data.outer=a("<div>").css(a.extend({left:"-1000px",overflow:"scroll",position:"absolute",top:"-1000px"},d)).append(c.data.inner).appendTo("body")}return c.data.outer.scrollLeft(1e3).scrollTop(1e3),{height:Math.ceil(c.data.outer.offset().top-c.data.inner.offset().top||0),width:Math.ceil(c.data.outer.offset().left-c.data.inner.offset().left||0)}}function i(){var a=h(!0);return!(a.height||a.width)}function j(a){var b=a.originalEvent;return(!b.axis||b.axis!==b.HORIZONTAL_AXIS)&&!b.wheelDeltaX}var b=!1,c={data:{index:0,name:"scrollbar"},firefox:/firefox/i.test(navigator.userAgent),macosx:/mac/i.test(navigator.platform),msedge:/edge\/\d+/i.test(navigator.userAgent),msie:/(msie|trident)/i.test(navigator.userAgent),mobile:/android|webos|iphone|ipad|ipod|blackberry/i.test(navigator.userAgent),overlay:null,scroll:null,scrolls:[],webkit:/webkit/i.test(navigator.userAgent)&&!/edge\/\d+/i.test(navigator.userAgent)};c.scrolls.add=function(a){this.remove(a).push(a)},c.scrolls.remove=function(b){for(;a.inArray(b,this)>=0;)this.splice(a.inArray(b,this),1);return this};var d={autoScrollSize:!0,autoUpdate:!0,debug:!1,disableBodyScroll:!1,duration:200,ignoreMobile:!1,ignoreOverlay:!1,isRtl:!1,scrollStep:30,showArrows:!1,stepScrolling:!0,scrollx:null,scrolly:null,onDestroy:null,onFallback:null,onInit:null,onScroll:null,onUpdate:null},e=function(b){c.scroll||(c.overlay=i(),c.scroll=h(),g(),a(window).resize(function(){var a=!1;if(c.scroll&&(c.scroll.height||c.scroll.width)){var b=h();b.height===c.scroll.height&&b.width===c.scroll.width||(c.scroll=b,a=!0)}g(a)})),this.container=b,this.namespace=".scrollbar_"+c.data.index++,this.options=a.extend({},d,window.jQueryScrollbarOptions||{}),this.scrollTo=null,this.scrollx={},this.scrolly={},b.data(c.data.name,this),c.scrolls.add(this)};e.prototype={destroy:function(){if(this.wrapper){this.container.removeData(c.data.name),c.scrolls.remove(this);var b=this.container.scrollLeft(),d=this.container.scrollTop();this.container.insertBefore(this.wrapper).css({height:"",margin:"","max-height":""}).removeClass("scroll-content scroll-scrollx_visible scroll-scrolly_visible").off(this.namespace).scrollLeft(b).scrollTop(d),this.scrollx.scroll.removeClass("scroll-scrollx_visible").find("div").addBack().off(this.namespace),this.scrolly.scroll.removeClass("scroll-scrolly_visible").find("div").addBack().off(this.namespace),this.wrapper.remove(),a(document).add("body").off(this.namespace),a.isFunction(this.options.onDestroy)&&this.options.onDestroy.apply(this,[this.container])}},init:function(b){var d=this,e=this.container,f=this.containerWrapper||e,g=this.namespace,h=a.extend(this.options,b||{}),i={x:this.scrollx,y:this.scrolly},k=this.wrapper,l={},m={scrollLeft:e.scrollLeft(),scrollTop:e.scrollTop()};if(c.mobile&&h.ignoreMobile||c.overlay&&h.ignoreOverlay)return a.isFunction(h.onFallback)&&h.onFallback.apply(this,[e]),!1;if(k)l={height:"auto","margin-bottom":c.scroll.height*-1+"px","max-height":""},l[h.isRtl?"margin-left":"margin-right"]=c.scroll.width*-1+"px",f.css(l);else{if(this.wrapper=k=a("<div>").addClass("scroll-wrapper").addClass(e.attr("class")).css("position","absolute"===e.css("position")?"absolute":"relative").insertBefore(e).append(e),h.isRtl&&k.addClass("scroll--rtl"),e.is("textarea")&&(this.containerWrapper=f=a("<div>").insertBefore(e).append(e),k.addClass("scroll-textarea")),l={height:"auto","margin-bottom":c.scroll.height*-1+"px","max-height":""},l[h.isRtl?"margin-left":"margin-right"]=c.scroll.width*-1+"px",f.addClass("scroll-content").css(l),e.on("scroll"+g,function(b){var f=e.scrollLeft(),g=e.scrollTop();if(h.isRtl)switch(!0){case c.firefox:f=Math.abs(f);case c.msedge||c.msie:f=e[0].scrollWidth-e[0].clientWidth-f}a.isFunction(h.onScroll)&&h.onScroll.call(d,{maxScroll:i.y.maxScrollOffset,scroll:g,size:i.y.size,visible:i.y.visible},{maxScroll:i.x.maxScrollOffset,scroll:f,size:i.x.size,visible:i.x.visible}),i.x.isVisible&&i.x.scroll.bar.css("left",f*i.x.kx+"px"),i.y.isVisible&&i.y.scroll.bar.css("top",g*i.y.kx+"px")}),k.on("scroll"+g,function(){k.scrollTop(0).scrollLeft(0)}),h.disableBodyScroll){var n=function(a){j(a)?i.y.isVisible&&i.y.mousewheel(a):i.x.isVisible&&i.x.mousewheel(a)};k.on("MozMousePixelScroll"+g,n),k.on("mousewheel"+g,n),c.mobile&&k.on("touchstart"+g,function(b){var c=b.originalEvent.touches&&b.originalEvent.touches[0]||b,d={pageX:c.pageX,pageY:c.pageY},f={left:e.scrollLeft(),top:e.scrollTop()};a(document).on("touchmove"+g,function(a){var b=a.originalEvent.targetTouches&&a.originalEvent.targetTouches[0]||a;e.scrollLeft(f.left+d.pageX-b.pageX),e.scrollTop(f.top+d.pageY-b.pageY),a.preventDefault()}),a(document).on("touchend"+g,function(){a(document).off(g)})})}a.isFunction(h.onInit)&&h.onInit.apply(this,[e])}a.each(i,function(b,f){var k=null,l=1,m="x"===b?"scrollLeft":"scrollTop",n=h.scrollStep,o=function(){var a=e[m]();e[m](a+n),1==l&&a+n>=p&&(a=e[m]()),l==-1&&a+n<=p&&(a=e[m]()),e[m]()==a&&k&&k()},p=0;f.scroll||(f.scroll=d._getScroll(h["scroll"+b]).addClass("scroll-"+b),h.showArrows&&f.scroll.addClass("scroll-element_arrows_visible"),f.mousewheel=function(a){if(!f.isVisible||"x"===b&&j(a))return!0;if("y"===b&&!j(a))return i.x.mousewheel(a),!0;var c=a.originalEvent.wheelDelta*-1||a.originalEvent.detail,g=f.size-f.visible-f.offset;return c||("x"===b&&a.originalEvent.deltaX?c=40*a.originalEvent.deltaX:"y"===b&&a.originalEvent.deltaY&&(c=40*a.originalEvent.deltaY)),(c>0&&p<g||c<0&&p>0)&&(p+=c,p<0&&(p=0),p>g&&(p=g),d.scrollTo=d.scrollTo||{},d.scrollTo[m]=p,setTimeout(function(){d.scrollTo&&(e.stop().animate(d.scrollTo,240,"linear",function(){p=e[m]()}),d.scrollTo=null)},1)),a.preventDefault(),!1},f.scroll.on("MozMousePixelScroll"+g,f.mousewheel).on("mousewheel"+g,f.mousewheel).on("mouseenter"+g,function(){p=e[m]()}),f.scroll.find(".scroll-arrow, .scroll-element_track").on("mousedown"+g,function(g){if(1!=g.which)return!0;l=1;var i={eventOffset:g["x"===b?"pageX":"pageY"],maxScrollValue:f.size-f.visible-f.offset,scrollbarOffset:f.scroll.bar.offset()["x"===b?"left":"top"],scrollbarSize:f.scroll.bar["x"===b?"outerWidth":"outerHeight"]()},j=0,q=0;if(a(this).hasClass("scroll-arrow")){if(l=a(this).hasClass("scroll-arrow_more")?1:-1,n=h.scrollStep*l,p=l>0?i.maxScrollValue:0,h.isRtl)switch(!0){case c.firefox:p=l>0?0:i.maxScrollValue*-1;break;case c.msie||c.msedge:}}else l=i.eventOffset>i.scrollbarOffset+i.scrollbarSize?1:i.eventOffset<i.scrollbarOffset?-1:0,"x"===b&&h.isRtl&&(c.msie||c.msedge)&&(l*=-1),n=Math.round(.75*f.visible)*l,p=i.eventOffset-i.scrollbarOffset-(h.stepScrolling?1==l?i.scrollbarSize:0:Math.round(i.scrollbarSize/2)),p=e[m]()+p/f.kx;return d.scrollTo=d.scrollTo||{},d.scrollTo[m]=h.stepScrolling?e[m]()+n:p,h.stepScrolling&&(k=function(){p=e[m](),clearInterval(q),clearTimeout(j),j=0,q=0},j=setTimeout(function(){q=setInterval(o,40)},h.duration+100)),setTimeout(function(){d.scrollTo&&(e.animate(d.scrollTo,h.duration),d.scrollTo=null)},1),d._handleMouseDown(k,g)}),f.scroll.bar.on("mousedown"+g,function(i){if(1!=i.which)return!0;var j=i["x"===b?"pageX":"pageY"],k=e[m]();return f.scroll.addClass("scroll-draggable"),a(document).on("mousemove"+g,function(a){var d=parseInt((a["x"===b?"pageX":"pageY"]-j)/f.kx,10);"x"===b&&h.isRtl&&(c.msie||c.msedge)&&(d*=-1),e[m](k+d)}),d._handleMouseDown(function(){f.scroll.removeClass("scroll-draggable"),p=e[m]()},i)}))}),a.each(i,function(a,b){var c="scroll-scroll"+a+"_visible",d="x"==a?i.y:i.x;b.scroll.removeClass(c),d.scroll.removeClass(c),f.removeClass(c)}),a.each(i,function(b,c){a.extend(c,"x"==b?{offset:parseInt(e.css("left"),10)||0,size:e.prop("scrollWidth"),visible:k.width()}:{offset:parseInt(e.css("top"),10)||0,size:e.prop("scrollHeight"),visible:k.height()})}),this._updateScroll("x",this.scrollx),this._updateScroll("y",this.scrolly),a.isFunction(h.onUpdate)&&h.onUpdate.apply(this,[e]),a.each(i,function(a,b){var c="x"===a?"left":"top",d="x"===a?"outerWidth":"outerHeight",f="x"===a?"width":"height",g=parseInt(e.css(c),10)||0,i=b.size,j=b.visible+g,k=b.scroll.size[d]()+(parseInt(b.scroll.size.css(c),10)||0);h.autoScrollSize&&(b.scrollbarSize=parseInt(k*j/i,10),b.scroll.bar.css(f,b.scrollbarSize+"px")),b.scrollbarSize=b.scroll.bar[d](),b.kx=(k-b.scrollbarSize)/(i-j)||1,b.maxScrollOffset=i-j}),e.scrollLeft(m.scrollLeft).scrollTop(m.scrollTop).trigger("scroll")},_getScroll:function(b){var c={advanced:['<div class="scroll-element">','<div class="scroll-element_corner"></div>','<div class="scroll-arrow scroll-arrow_less"></div>','<div class="scroll-arrow scroll-arrow_more"></div>','<div class="scroll-element_outer">','<div class="scroll-element_size"></div>','<div class="scroll-element_inner-wrapper">','<div class="scroll-element_inner scroll-element_track">','<div class="scroll-element_inner-bottom"></div>',"</div>","</div>",'<div class="scroll-bar">','<div class="scroll-bar_body">','<div class="scroll-bar_body-inner"></div>',"</div>",'<div class="scroll-bar_bottom"></div>','<div class="scroll-bar_center"></div>',"</div>","</div>","</div>"].join(""),simple:['<div class="scroll-element">','<div class="scroll-element_outer">','<div class="scroll-element_size"></div>','<div class="scroll-element_track"></div>','<div class="scroll-bar"></div>',"</div>","</div>"].join("")};return c[b]&&(b=c[b]),b||(b=c.simple),b="string"==typeof b?a(b).appendTo(this.wrapper):a(b),a.extend(b,{bar:b.find(".scroll-bar"),size:b.find(".scroll-element_size"),track:b.find(".scroll-element_track")}),b},_handleMouseDown:function(b,c){var d=this.namespace;return a(document).on("blur"+d,function(){a(document).add("body").off(d),b&&b()}),a(document).on("dragstart"+d,function(a){return a.preventDefault(),!1}),a(document).on("mouseup"+d,function(){a(document).add("body").off(d),b&&b()}),a("body").on("selectstart"+d,function(a){return a.preventDefault(),!1}),c&&c.preventDefault(),!1},_updateScroll:function(b,d){var e=this.container,f=this.containerWrapper||e,g="scroll-scroll"+b+"_visible",h="x"===b?this.scrolly:this.scrollx,i=parseInt(this.container.css("x"===b?"left":"top"),10)||0,j=this.wrapper,k=d.size,l=d.visible+i;d.isVisible=k-l>1,d.isVisible?(d.scroll.addClass(g),h.scroll.addClass(g),f.addClass(g)):(d.scroll.removeClass(g),h.scroll.removeClass(g),f.removeClass(g)),"y"===b&&(e.is("textarea")||k<l?f.css({height:l+c.scroll.height+"px","max-height":"none"}):f.css({"max-height":l+c.scroll.height+"px"})),d.size==e.prop("scrollWidth")&&h.size==e.prop("scrollHeight")&&d.visible==j.width()&&h.visible==j.height()&&d.offset==(parseInt(e.css("left"),10)||0)&&h.offset==(parseInt(e.css("top"),10)||0)||(a.extend(this.scrollx,{offset:parseInt(e.css("left"),10)||0,size:e.prop("scrollWidth"),visible:j.width()}),a.extend(this.scrolly,{offset:parseInt(e.css("top"),10)||0,size:this.container.prop("scrollHeight"),visible:j.height()}),this._updateScroll("x"===b?"y":"x",h))}};var f=e;a.fn.scrollbar=function(b,d){return"string"!=typeof b&&(d=b,b="init"),"undefined"==typeof d&&(d=[]),a.isArray(d)||(d=[d]),this.not("body, .scroll-wrapper").each(function(){var e=a(this),g=e.data(c.data.name);(g||"init"===b)&&(g||(g=new f(e)),g[b]&&g[b].apply(g,d))}),this},a.fn.scrollbar.options=d;var g=function(){var a=0,d=0;return function(e){var f,h,i,j,k,l,m;for(f=0;f<c.scrolls.length;f++)j=c.scrolls[f],h=j.container,i=j.options,k=j.wrapper,l=j.scrollx,m=j.scrolly,(e||i.autoUpdate&&k&&k.is(":visible")&&(h.prop("scrollWidth")!=l.size||h.prop("scrollHeight")!=m.size||k.width()!=l.visible||k.height()!=m.visible))&&(j.init(),i.debug&&(window.console&&console.log({scrollHeight:h.prop("scrollHeight")+":"+j.scrolly.size,scrollWidth:h.prop("scrollWidth")+":"+j.scrollx.size,visibleHeight:k.height()+":"+j.scrolly.visible,visibleWidth:k.width()+":"+j.scrollx.visible},!0),d++));b&&d>10?(window.console&&console.log("Scroll updates exceed 10"),g=function(){}):(clearTimeout(a),a=setTimeout(g,300))}}();window.angular&&!function(a){a.module("jQueryScrollbar",[]).provider("jQueryScrollbar",function(){var b=d;return{setOptions:function(c){a.extend(b,c)},$get:function(){return{options:a.copy(b)}}}}).directive("jqueryScrollbar",["jQueryScrollbar","$parse",function(a,b){return{restrict:"AC",link:function(c,d,e){var f=b(e.jqueryScrollbar),g=f(c);d.scrollbar(g||a.options).on("$destroy",function(){d.scrollbar("destroy")})}}}])}(window.angular)});
\ No newline at end of file
diff --git a/data/interfaces/default/js/jquery.tripleclick.min.js b/data/interfaces/default/js/jquery.tripleclick.min.js
deleted file mode 100644
index 6733e104..00000000
--- a/data/interfaces/default/js/jquery.tripleclick.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(t){function i(t){var i=jQuery(this);settings=jQuery.extend({},e,t.data);var a=i.data("triclick_clicks")||0,c=i.data("triclick_start")||0;0===a&&(c=t.timeStamp),0!=c&&t.timeStamp>c+settings.threshold&&(a=0,c=t.timeStamp),a+=1,3===a&&(a=0,c=0,t.type="tripleclick",void 0===jQuery.event.handle?jQuery.event.dispatch.apply(this,arguments):jQuery.event.handle.apply(this,arguments)),i.data("triclick_clicks",a),i.data("triclick_start",c)}var e={threshold:1e3};t.event.special.tripleclick={setup:function(e,a){t(this).bind("touchstart click.triple",e,i)},teardown:function(e){t(this).unbind("touchstart click.triple",i)}}}(jQuery);
\ No newline at end of file
diff --git a/data/interfaces/default/js/kjua.min.js b/data/interfaces/default/js/kjua.min.js
deleted file mode 100644
index bd1f4845..00000000
--- a/data/interfaces/default/js/kjua.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! kjua v0.9.0 - https://larsjung.de/kjua/ */
-!function(t,r){"object"==typeof exports&&"object"==typeof module?module.exports=r():"function"==typeof define&&define.amd?define("kjua",[],r):"object"==typeof exports?exports.kjua=r():t.kjua=r()}("undefined"!=typeof self?self:this,function(){return n={},o.m=e=[function(t,r,e){function n(t){var r=Object.assign({},o,t),e=i(r.text,r.ecLevel,r.minVersion,r.quiet);return"svg"===r.render?u(e,r):a(e,r,"image"===r.render)}var o=e(1),i=e(2),a=e(4),u=e(8);t.exports=n;try{jQuery.fn.kjua=function(e){return this.each(function(t,r){return r.appendChild(n(e))})}}catch(t){}},function(t,r){t.exports={render:"image",crisp:!0,minVersion:1,ecLevel:"L",size:200,ratio:null,fill:"#333",back:"#fff",text:"no text",rounded:0,quiet:0,mode:"plain",mSize:30,mPosX:50,mPosY:50,label:"no label",fontname:"sans",fontcolor:"#333",image:null}},function(t,r,e){function u(t){return(u="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}var f=/code length overflow/i,c=e(3);c.stringToBytes=c.stringToBytesFuncs["UTF-8"];t.exports=function(t,r,e,n){var o,i=3<arguments.length&&void 0!==n?n:0,a=function(t,r,e){for(var n=2<arguments.length&&void 0!==e?e:1,o=n=Math.max(1,n);o<=40;o+=1)try{var i=function(){var e=c(o,r);e.addData(t),e.make();var n=e.getModuleCount();return{v:{text:t,level:r,version:o,module_count:n,is_dark:function(t,r){return 0<=t&&t<n&&0<=r&&r<n&&e.isDark(t,r)}}}}();if("object"===u(i))return i.v}catch(t){if(!(o<40&&f.test(t)))throw new Error(t)}return null}(0<arguments.length&&void 0!==t?t:"",1<arguments.length&&void 0!==r?r:"L",2<arguments.length&&void 0!==e?e:1);return a&&(o=a.is_dark,a.module_count+=2*i,a.is_dark=function(t,r){return o(t-i,r-i)}),a}},function(t,r,e){var n,o,i,a=function(){function i(t,r){function a(t,r){l=function(t){for(var r=new Array(t),e=0;e<t;e+=1){r[e]=new Array(t);for(var n=0;n<t;n+=1)r[e][n]=null}return r}(s=4*u+17),e(0,0),e(s-7,0),e(0,s-7),i(),o(),d(t,r),7<=u&&g(t),null==n&&(n=p(u,f,c)),v(n,r)}var u=t,f=w[r],l=null,s=0,n=null,c=[],h={},e=function(t,r){for(var e=-1;e<=7;e+=1)if(!(t+e<=-1||s<=t+e))for(var n=-1;n<=7;n+=1)r+n<=-1||s<=r+n||(l[t+e][r+n]=0<=e&&e<=6&&(0==n||6==n)||0<=n&&n<=6&&(0==e||6==e)||2<=e&&e<=4&&2<=n&&n<=4)},o=function(){for(var t=8;t<s-8;t+=1)null==l[t][6]&&(l[t][6]=t%2==0);for(var r=8;r<s-8;r+=1)null==l[6][r]&&(l[6][r]=r%2==0)},i=function(){for(var t=m.getPatternPosition(u),r=0;r<t.length;r+=1)for(var e=0;e<t.length;e+=1){var n=t[r],o=t[e];if(null==l[n][o])for(var i=-2;i<=2;i+=1)for(var a=-2;a<=2;a+=1)l[n+i][o+a]=-2==i||2==i||-2==a||2==a||0==i&&0==a}},g=function(t){for(var r=m.getBCHTypeNumber(u),e=0;e<18;e+=1){var n=!t&&1==(r>>e&1);l[Math.floor(e/3)][e%3+s-8-3]=n}for(e=0;e<18;e+=1){n=!t&&1==(r>>e&1);l[e%3+s-8-3][Math.floor(e/3)]=n}},d=function(t,r){for(var e=f<<3|r,n=m.getBCHTypeInfo(e),o=0;o<15;o+=1){var i=!t&&1==(n>>o&1);o<6?l[o][8]=i:o<8?l[o+1][8]=i:l[s-15+o][8]=i}for(o=0;o<15;o+=1){i=!t&&1==(n>>o&1);o<8?l[8][s-o-1]=i:o<9?l[8][15-o-1+1]=i:l[8][15-o-1]=i}l[s-8][8]=!t},v=function(t,r){for(var e=-1,n=s-1,o=7,i=0,a=m.getMaskFunction(r),u=s-1;0<u;u-=2)for(6==u&&--u;;){for(var f,c=0;c<2;c+=1){null==l[n][u-c]&&(f=!1,i<t.length&&(f=1==(t[i]>>>o&1)),a(n,u-c)&&(f=!f),l[n][u-c]=f,-1==--o&&(i+=1,o=7))}if((n+=e)<0||s<=n){n-=e,e=-e;break}}},p=function(t,r,e){for(var n=S.getRSBlocks(t,r),o=M(),i=0;i<e.length;i+=1){var a=e[i];o.put(a.getMode(),4),o.put(a.getLength(),m.getLengthInBits(a.getMode(),t)),a.write(o)}for(var u=0,i=0;i<n.length;i+=1)u+=n[i].dataCount;if(o.getLengthInBits()>8*u)throw"code length overflow. ("+o.getLengthInBits()+">"+8*u+")";for(o.getLengthInBits()+4<=8*u&&o.put(0,4);o.getLengthInBits()%8!=0;)o.putBit(!1);for(;!(o.getLengthInBits()>=8*u||(o.put(236,8),o.getLengthInBits()>=8*u));)o.put(17,8);return function(t,r){for(var e=0,n=0,o=0,i=new Array(r.length),a=new Array(r.length),u=0;u<r.length;u+=1){var f=r[u].dataCount,c=r[u].totalCount-f,n=Math.max(n,f),o=Math.max(o,c);i[u]=new Array(f);for(var l=0;l<i[u].length;l+=1)i[u][l]=255&t.getBuffer()[l+e];e+=f;var s=m.getErrorCorrectPolynomial(c),g=b(i[u],s.getLength()-1).mod(s);a[u]=new Array(s.getLength()-1);for(l=0;l<a[u].length;l+=1){var h=l+g.getLength()-a[u].length;a[u][l]=0<=h?g.getAt(h):0}}for(var d=0,l=0;l<r.length;l+=1)d+=r[l].totalCount;for(var v=new Array(d),p=0,l=0;l<n;l+=1)for(u=0;u<r.length;u+=1)l<i[u].length&&(v[p]=i[u][l],p+=1);for(l=0;l<o;l+=1)for(u=0;u<r.length;u+=1)l<a[u].length&&(v[p]=a[u][l],p+=1);return v}(o,n)};h.addData=function(t,r){var e=null;switch(r=r||"Byte"){case"Numeric":e=A(t);break;case"Alphanumeric":e=L(t);break;case"Byte":e=D(t);break;case"Kanji":e=_(t);break;default:throw"mode:"+r}c.push(e),n=null},h.isDark=function(t,r){if(t<0||s<=t||r<0||s<=r)throw t+","+r;return l[t][r]},h.getModuleCount=function(){return s},h.make=function(){if(u<1){for(var t=1;t<40;t++){for(var r=S.getRSBlocks(t,f),e=M(),n=0;n<c.length;n++){var o=c[n];e.put(o.getMode(),4),e.put(o.getLength(),m.getLengthInBits(o.getMode(),t)),o.write(e)}for(var i=0,n=0;n<r.length;n++)i+=r[n].dataCount;if(e.getLengthInBits()<=8*i)break}u=t}a(!1,function(){for(var t=0,r=0,e=0;e<8;e+=1){a(!0,e);var n=m.getLostPoint(h);(0==e||n<t)&&(t=n,r=e)}return r}())},h.createTableTag=function(t,r){t=t||2;var e="";e+='<table style="',e+=" border-width: 0px; border-style: none;",e+=" border-collapse: collapse;",e+=" padding: 0px; margin: "+(r=void 0===r?4*t:r)+"px;",e+='">',e+="<tbody>";for(var n=0;n<h.getModuleCount();n+=1){e+="<tr>";for(var o=0;o<h.getModuleCount();o+=1)e+='<td style="',e+=" border-width: 0px; border-style: none;",e+=" border-collapse: collapse;",e+=" padding: 0px; margin: 0px;",e+=" width: "+t+"px;",e+=" height: "+t+"px;",e+=" background-color: ",e+=h.isDark(n,o)?"#000000":"#ffffff",e+=";",e+='"/>';e+="</tr>"}return e+="</tbody>",e+="</table>"},h.createSvgTag=function(t,r,e,n){var o={};"object"==typeof arguments[0]&&(t=(o=arguments[0]).cellSize,r=o.margin,e=o.alt,n=o.title),t=t||2,r=void 0===r?4*t:r,(e="string"==typeof e?{text:e}:e||{}).text=e.text||null,e.id=e.text?e.id||"qrcode-description":null,(n="string"==typeof n?{text:n}:n||{}).text=n.text||null,n.id=n.text?n.id||"qrcode-title":null;var i,a,u,f=h.getModuleCount()*t+2*r,c="",l="l"+t+",0 0,"+t+" -"+t+",0 0,-"+t+"z ";for(c+='<svg version="1.1" xmlns="http://www.w3.org/2000/svg"',c+=o.scalable?"":' width="'+f+'px" height="'+f+'px"',c+=' viewBox="0 0 '+f+" "+f+'" ',c+=' preserveAspectRatio="xMinYMin meet"',c+=n.text||e.text?' role="img" aria-labelledby="'+y([n.id,e.id].join(" ").trim())+'"':"",c+=">",c+=n.text?'<title id="'+y(n.id)+'">'+y(n.text)+"</title>":"",c+=e.text?'<description id="'+y(e.id)+'">'+y(e.text)+"</description>":"",c+='<rect width="100%" height="100%" fill="white" cx="0" cy="0"/>',c+='<path d="',a=0;a<h.getModuleCount();a+=1)for(u=a*t+r,i=0;i<h.getModuleCount();i+=1)h.isDark(a,i)&&(c+="M"+(i*t+r)+","+u+l);return c+='" stroke="transparent" fill="black"/>',c+="</svg>"},h.createDataURL=function(o,t){o=o||2,t=void 0===t?4*o:t;var r=h.getModuleCount()*o+2*t,i=t,a=r-t;return P(r,r,function(t,r){if(i<=t&&t<a&&i<=r&&r<a){var e=Math.floor((t-i)/o),n=Math.floor((r-i)/o);return h.isDark(n,e)?0:1}return 1})},h.createImgTag=function(t,r,e){t=t||2,r=void 0===r?4*t:r;var n=h.getModuleCount()*t+2*r,o="";return o+="<img",o+=' src="',o+=h.createDataURL(t,r),o+='"',o+=' width="',o+=n,o+='"',o+=' height="',o+=n,o+='"',e&&(o+=' alt="',o+=y(e),o+='"'),o+="/>"};var y=function(t){for(var r="",e=0;e<t.length;e+=1){var n=t.charAt(e);switch(n){case"<":r+="&lt;";break;case">":r+="&gt;";break;case"&":r+="&amp;";break;case'"':r+="&quot;";break;default:r+=n}}return r};return h.createASCII=function(t,r){if((t=t||1)<2)return function(t){t=void 0===t?2:t;for(var r,e,n,o,i=+h.getModuleCount()+2*t,a=t,u=i-t,f={"██":"█","█ ":"▀"," █":"▄","  ":" "},c={"██":"▀","█ ":"▀"," █":" ","  ":" "},l="",s=0;s<i;s+=2){for(e=Math.floor(s-a),n=Math.floor(s+1-a),r=0;r<i;r+=1)o="█",a<=r&&r<u&&a<=s&&s<u&&h.isDark(e,Math.floor(r-a))&&(o=" "),a<=r&&r<u&&a<=s+1&&s+1<u&&h.isDark(n,Math.floor(r-a))?o+=" ":o+="█",l+=t<1&&u<=s+1?c[o]:f[o];l+="\n"}return i%2&&0<t?l.substring(0,l.length-i-1)+Array(1+i).join("▀"):l.substring(0,l.length-1)}(r);--t,r=void 0===r?2*t:r;for(var e,n,o,i=h.getModuleCount()*t+2*r,a=r,u=i-r,f=Array(t+1).join("██"),c=Array(t+1).join("  "),l="",s="",g=0;g<i;g+=1){for(n=Math.floor((g-a)/t),s="",e=0;e<i;e+=1)o=1,a<=e&&e<u&&a<=g&&g<u&&h.isDark(n,Math.floor((e-a)/t))&&(o=0),s+=o?f:c;for(n=0;n<t;n+=1)l+=s+"\n"}return l.substring(0,l.length-1)},h.renderTo2dContext=function(t,r){r=r||2;for(var e=h.getModuleCount(),n=0;n<e;n++)for(var o=0;o<e;o++)t.fillStyle=h.isDark(n,o)?"black":"white",t.fillRect(n*r,o*r,r,r)},h}i.stringToBytes=(i.stringToBytesFuncs={default:function(t){for(var r=[],e=0;e<t.length;e+=1){var n=t.charCodeAt(e);r.push(255&n)}return r}}).default,i.createStringToBytes=function(u,f){var i=function(){function t(){var t=r.read();if(-1==t)throw"eof";return t}for(var r=z(u),e=0,n={};;){var o=r.read();if(-1==o)break;var i=t(),a=t()<<8|t();n[String.fromCharCode(o<<8|i)]=a,e+=1}if(e!=f)throw e+" != "+f;return n}(),a="?".charCodeAt(0);return function(t){for(var r=[],e=0;e<t.length;e+=1){var n,o=t.charCodeAt(e);o<128?r.push(o):"number"==typeof(n=i[t.charAt(e)])?(255&n)==n?r.push(n):(r.push(n>>>8),r.push(255&n)):r.push(a)}return r}};var r,t,a=1,u=2,o=4,f=8,w={L:1,M:0,Q:3,H:2},e=0,n=1,c=2,l=3,s=4,g=5,h=6,d=7,m=(r=[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],(t={}).getBCHTypeInfo=function(t){for(var r=t<<10;0<=v(r)-v(1335);)r^=1335<<v(r)-v(1335);return 21522^(t<<10|r)},t.getBCHTypeNumber=function(t){for(var r=t<<12;0<=v(r)-v(7973);)r^=7973<<v(r)-v(7973);return t<<12|r},t.getPatternPosition=function(t){return r[t-1]},t.getMaskFunction=function(t){switch(t){case e:return function(t,r){return(t+r)%2==0};case n:return function(t,r){return t%2==0};case c:return function(t,r){return r%3==0};case l:return function(t,r){return(t+r)%3==0};case s:return function(t,r){return(Math.floor(t/2)+Math.floor(r/3))%2==0};case g:return function(t,r){return t*r%2+t*r%3==0};case h:return function(t,r){return(t*r%2+t*r%3)%2==0};case d:return function(t,r){return(t*r%3+(t+r)%2)%2==0};default:throw"bad maskPattern:"+t}},t.getErrorCorrectPolynomial=function(t){for(var r=b([1],0),e=0;e<t;e+=1)r=r.multiply(b([1,p.gexp(e)],0));return r},t.getLengthInBits=function(t,r){if(1<=r&&r<10)switch(t){case a:return 10;case u:return 9;case o:case f:return 8;default:throw"mode:"+t}else if(r<27)switch(t){case a:return 12;case u:return 11;case o:return 16;case f:return 10;default:throw"mode:"+t}else{if(!(r<41))throw"type:"+r;switch(t){case a:return 14;case u:return 13;case o:return 16;case f:return 12;default:throw"mode:"+t}}},t.getLostPoint=function(t){for(var r=t.getModuleCount(),e=0,n=0;n<r;n+=1)for(var o=0;o<r;o+=1){for(var i=0,a=t.isDark(n,o),u=-1;u<=1;u+=1)if(!(n+u<0||r<=n+u))for(var f=-1;f<=1;f+=1)o+f<0||r<=o+f||0==u&&0==f||a==t.isDark(n+u,o+f)&&(i+=1);5<i&&(e+=3+i-5)}for(n=0;n<r-1;n+=1)for(o=0;o<r-1;o+=1){var c=0;t.isDark(n,o)&&(c+=1),t.isDark(n+1,o)&&(c+=1),t.isDark(n,o+1)&&(c+=1),t.isDark(n+1,o+1)&&(c+=1),0!=c&&4!=c||(e+=3)}for(n=0;n<r;n+=1)for(o=0;o<r-6;o+=1)t.isDark(n,o)&&!t.isDark(n,o+1)&&t.isDark(n,o+2)&&t.isDark(n,o+3)&&t.isDark(n,o+4)&&!t.isDark(n,o+5)&&t.isDark(n,o+6)&&(e+=40);for(o=0;o<r;o+=1)for(n=0;n<r-6;n+=1)t.isDark(n,o)&&!t.isDark(n+1,o)&&t.isDark(n+2,o)&&t.isDark(n+3,o)&&t.isDark(n+4,o)&&!t.isDark(n+5,o)&&t.isDark(n+6,o)&&(e+=40);for(var l=0,o=0;o<r;o+=1)for(n=0;n<r;n+=1)t.isDark(n,o)&&(l+=1);return e+=Math.abs(100*l/r/r-50)/5*10},t);function v(t){for(var r=0;0!=t;)r+=1,t>>>=1;return r}var p=function(){for(var r=new Array(256),e=new Array(256),t=0;t<8;t+=1)r[t]=1<<t;for(t=8;t<256;t+=1)r[t]=r[t-4]^r[t-5]^r[t-6]^r[t-8];for(t=0;t<255;t+=1)e[r[t]]=t;var n={glog:function(t){if(t<1)throw"glog("+t+")";return e[t]},gexp:function(t){for(;t<0;)t+=255;for(;256<=t;)t-=255;return r[t]}};return n}();function b(n,o){if(void 0===n.length)throw n.length+"/"+o;var r=function(){for(var t=0;t<n.length&&0==n[t];)t+=1;for(var r=new Array(n.length-t+o),e=0;e<n.length-t;e+=1)r[e]=n[e+t];return r}(),i={getAt:function(t){return r[t]},getLength:function(){return r.length},multiply:function(t){for(var r=new Array(i.getLength()+t.getLength()-1),e=0;e<i.getLength();e+=1)for(var n=0;n<t.getLength();n+=1)r[e+n]^=p.gexp(p.glog(i.getAt(e))+p.glog(t.getAt(n)));return b(r,0)},mod:function(t){if(i.getLength()-t.getLength()<0)return i;for(var r=p.glog(i.getAt(0))-p.glog(t.getAt(0)),e=new Array(i.getLength()),n=0;n<i.getLength();n+=1)e[n]=i.getAt(n);for(n=0;n<t.getLength();n+=1)e[n]^=p.gexp(p.glog(t.getAt(n))+r);return b(e,0).mod(t)}};return i}function y(){var e=[],o={writeByte:function(t){e.push(255&t)},writeShort:function(t){o.writeByte(t),o.writeByte(t>>>8)},writeBytes:function(t,r,e){r=r||0,e=e||t.length;for(var n=0;n<e;n+=1)o.writeByte(t[n+r])},writeString:function(t){for(var r=0;r<t.length;r+=1)o.writeByte(t.charCodeAt(r))},toByteArray:function(){return e},toString:function(){var t="";t+="[";for(var r=0;r<e.length;r+=1)0<r&&(t+=","),t+=e[r];return t+="]"}};return o}function x(){function e(t){a+=String.fromCharCode(r(63&t))}var n=0,o=0,i=0,a="",t={},r=function(t){if(!(t<0)){if(t<26)return 65+t;if(t<52)return t-26+97;if(t<62)return t-52+48;if(62==t)return 43;if(63==t)return 47}throw"n:"+t};return t.writeByte=function(t){for(n=n<<8|255&t,o+=8,i+=1;6<=o;)e(n>>>o-6),o-=6},t.flush=function(){if(0<o&&(e(n<<6-o),o=n=0),i%3!=0)for(var t=3-i%3,r=0;r<t;r+=1)a+="="},t.toString=function(){return a},t}function k(t,r){var n=t,o=r,d=new Array(t*r),e={setPixel:function(t,r,e){d[r*n+t]=e},write:function(t){t.writeString("GIF87a"),t.writeShort(n),t.writeShort(o),t.writeByte(128),t.writeByte(0),t.writeByte(0),t.writeByte(0),t.writeByte(0),t.writeByte(0),t.writeByte(255),t.writeByte(255),t.writeByte(255),t.writeString(","),t.writeShort(0),t.writeShort(0),t.writeShort(n),t.writeShort(o),t.writeByte(0);var r=i(2);t.writeByte(2);for(var e=0;255<r.length-e;)t.writeByte(255),t.writeBytes(r,e,255),e+=255;t.writeByte(r.length-e),t.writeBytes(r,e,r.length-e),t.writeByte(0),t.writeString(";")}},i=function(t){for(var r=1<<t,e=1+(1<<t),n=t+1,o=v(),i=0;i<r;i+=1)o.add(String.fromCharCode(i));o.add(String.fromCharCode(r)),o.add(String.fromCharCode(e));var a,u,f,c=y(),l=(a=c,f=u=0,{write:function(t,r){if(t>>>r!=0)throw"length over";for(;8<=u+r;)a.writeByte(255&(t<<u|f)),r-=8-u,t>>>=8-u,u=f=0;f|=t<<u,u+=r},flush:function(){0<u&&a.writeByte(f)}});l.write(r,n);var s=0,g=String.fromCharCode(d[s]);for(s+=1;s<d.length;){var h=String.fromCharCode(d[s]);s+=1,o.contains(g+h)?g+=h:(l.write(o.indexOf(g),n),o.size()<4095&&(o.size()==1<<n&&(n+=1),o.add(g+h)),g=h)}return l.write(o.indexOf(g),n),l.write(e,n),l.flush(),c.toByteArray()},v=function(){var r={},e=0,n={add:function(t){if(n.contains(t))throw"dup key:"+t;r[t]=e,e+=1},size:function(){return e},indexOf:function(t){return r[t]},contains:function(t){return void 0!==r[t]}};return n};return e}var B,C,S=(B=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12,7,37,13],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]],(C={}).getRSBlocks=function(t,r){var e=function(t,r){switch(r){case w.L:return B[4*(t-1)+0];case w.M:return B[4*(t-1)+1];case w.Q:return B[4*(t-1)+2];case w.H:return B[4*(t-1)+3];default:return}}(t,r);if(void 0===e)throw"bad rs block @ typeNumber:"+t+"/errorCorrectionLevel:"+r;for(var n,o,i=e.length/3,a=[],u=0;u<i;u+=1)for(var f=e[3*u+0],c=e[3*u+1],l=e[3*u+2],s=0;s<f;s+=1)a.push((n=l,o=void 0,(o={}).totalCount=c,o.dataCount=n,o));return a},C),M=function(){var e=[],n=0,o={getBuffer:function(){return e},getAt:function(t){var r=Math.floor(t/8);return 1==(e[r]>>>7-t%8&1)},put:function(t,r){for(var e=0;e<r;e+=1)o.putBit(1==(t>>>r-e-1&1))},getLengthInBits:function(){return n},putBit:function(t){var r=Math.floor(n/8);e.length<=r&&e.push(0),t&&(e[r]|=128>>>n%8),n+=1}};return o},A=function(t){var r=a,n=t,e={getMode:function(){return r},getLength:function(t){return n.length},write:function(t){for(var r=n,e=0;e+2<r.length;)t.put(o(r.substring(e,e+3)),10),e+=3;e<r.length&&(r.length-e==1?t.put(o(r.substring(e,e+1)),4):r.length-e==2&&t.put(o(r.substring(e,e+2)),7))}},o=function(t){for(var r=0,e=0;e<t.length;e+=1)r=10*r+i(t.charAt(e));return r},i=function(t){if("0"<=t&&t<="9")return t.charCodeAt(0)-"0".charCodeAt(0);throw"illegal char :"+t};return e},L=function(t){var r=u,n=t,e={getMode:function(){return r},getLength:function(t){return n.length},write:function(t){for(var r=n,e=0;e+1<r.length;)t.put(45*o(r.charAt(e))+o(r.charAt(e+1)),11),e+=2;e<r.length&&t.put(o(r.charAt(e)),6)}},o=function(t){if("0"<=t&&t<="9")return t.charCodeAt(0)-"0".charCodeAt(0);if("A"<=t&&t<="Z")return t.charCodeAt(0)-"A".charCodeAt(0)+10;switch(t){case" ":return 36;case"$":return 37;case"%":return 38;case"*":return 39;case"+":return 40;case"-":return 41;case".":return 42;case"/":return 43;case":":return 44;default:throw"illegal char :"+t}};return e},D=function(t){var r=o,e=i.stringToBytes(t),n={getMode:function(){return r},getLength:function(t){return e.length},write:function(t){for(var r=0;r<e.length;r+=1)t.put(e[r],8)}};return n},_=function(t){var r=f,e=i.stringToBytesFuncs.SJIS;if(!e)throw"sjis not supported.";!function(){var t=e("�");if(2!=t.length||38726!=(t[0]<<8|t[1]))throw"sjis not supported."}();var o=e(t),n={getMode:function(){return r},getLength:function(t){return~~(o.length/2)},write:function(t){for(var r=o,e=0;e+1<r.length;){var n=(255&r[e])<<8|255&r[e+1];if(33088<=n&&n<=40956)n-=33088;else{if(!(57408<=n&&n<=60351))throw"illegal char at "+(e+1)+"/"+n;n-=49472}n=192*(n>>>8&255)+(255&n),t.put(n,13),e+=2}if(e<r.length)throw"illegal char at "+(e+1)}};return n},z=function(t){var e=t,n=0,o=0,i=0,r={read:function(){for(;i<8;){if(n>=e.length){if(0==i)return-1;throw"unexpected end of file./"+i}var t=e.charAt(n);if(n+=1,"="==t)return i=0,-1;t.match(/^\s$/)||(o=o<<6|a(t.charCodeAt(0)),i+=6)}var r=o>>>i-8&255;return i-=8,r}},a=function(t){if(65<=t&&t<=90)return t-65;if(97<=t&&t<=122)return t-97+26;if(48<=t&&t<=57)return t-48+52;if(43==t)return 62;if(47==t)return 63;throw"c:"+t};return r},P=function(t,r,e){for(var n=k(t,r),o=0;o<r;o+=1)for(var i=0;i<t;i+=1)n.setPixel(i,o,e(i,o));var a=y();n.write(a);for(var u=x(),f=a.toByteArray(),c=0;c<f.length;c+=1)u.writeByte(f[c]);return u.flush(),"data:image/gif;base64,"+u};return i}();a.stringToBytesFuncs["UTF-8"]=function(t){return function(t){for(var r=[],e=0;e<t.length;e++){var n=t.charCodeAt(e);n<128?r.push(n):n<2048?r.push(192|n>>6,128|63&n):n<55296||57344<=n?r.push(224|n>>12,128|n>>6&63,128|63&n):(e++,n=65536+((1023&n)<<10|1023&t.charCodeAt(e)),r.push(240|n>>18,128|n>>12&63,128|n>>6&63,128|63&n))}return r}(t)},o=[],void 0===(i="function"==typeof(n=function(){return a})?n.apply(r,o):n)||(t.exports=i)},function(t,r,e){function c(t,r,e,n,o,i){t.is_dark(o,i)&&r.rect(i*n,o*n,n,n)}function a(t,r,e){var n,o;n=r,(o=e).back&&(n.fillStyle=o.back,n.fillRect(0,0,o.size,o.size)),function(t,r,e){if(t){var n=0<e.rounded&&e.rounded<=100?l:c,o=t.module_count,i=e.size/o,a=0;e.crisp&&(i=Math.floor(i),a=Math.floor((e.size-i*o)/2)),r.translate(a,a),r.beginPath();for(var u=0;u<o;u+=1)for(var f=0;f<o;f+=1)n(t,r,e,i,u,f);r.fillStyle=e.fill,r.fill(),r.translate(-a,-a)}}(t,r,e),i(r,e)}var u=e(5),l=e(6),i=e(7);t.exports=function(t,r,e){var n=r.ratio||u.dpr,o=u.create_canvas(r.size,n),i=o.getContext("2d");return i.scale(n,n),a(t,i,r),e?u.canvas_to_img(o):o}},function(t,r){function e(t,r){return t.getAttribute(r)}function n(r,e){return Object.keys(e||{}).forEach(function(t){r.setAttribute(t,e[t])}),r}function o(t,r){return n(a.createElement(t),r)}var i=window,a=i.document,u=i.devicePixelRatio||1,f="http://www.w3.org/2000/svg";t.exports={dpr:u,SVG_NS:f,get_attr:e,create_el:o,create_svg_el:function(t,r){return n(a.createElementNS(f,t),r)},create_canvas:function(t,r){var e=o("canvas",{width:t*r,height:t*r});return e.style.width="".concat(t,"px"),e.style.height="".concat(t,"px"),e},canvas_to_img:function(t){var r=o("img",{crossOrigin:"anonymous",src:t.toDataURL("image/png"),width:e(t,"width"),height:e(t,"height")});return r.style.width=t.style.width,r.style.height=t.style.height,r}}},function(t,r){t.exports=function(t,r,e,n,o,i){var a,u,f,c,l,s,g,h,d,v,p,y,w,m,b,x,k,B,C,S,M=i*n,A=o*n,L=M+n,D=A+n,_=.005*e.rounded*n,z=t.is_dark,P=o-1,T=o+1,j=i-1,I=i+1,O=z(o,i),R=z(P,j),F=z(P,i),H=z(P,I),N=z(o,I),E=z(T,I),Y=z(T,i),q=z(T,j),U=z(o,j),W=(a=r,{m:function(t,r){return a.moveTo(t,r),this},l:function(t,r){return a.lineTo(t,r),this},a:function(){return a.arcTo.apply(a,arguments),this}});O?(p=W,y=M,w=A,m=L,b=D,x=_,B=!F&&!N,C=!Y&&!N,S=!Y&&!U,(k=!F&&!U)?p.m(y+x,w):p.m(y,w),B?p.l(m-x,w).a(m,w,m,b,x):p.l(m,w),C?p.l(m,b-x).a(m,b,y,b,x):p.l(m,b),S?p.l(y+x,b).a(y,b,y,w,x):p.l(y,b),k?p.l(y,w+x).a(y,w,m,w,x):p.l(y,w)):(u=W,f=M,c=A,l=L,s=D,g=_,h=F&&N&&H,d=Y&&N&&E,v=Y&&U&&q,F&&U&&R&&u.m(f+g,c).l(f,c).l(f,c+g).a(f,c,f+g,c,g),h&&u.m(l-g,c).l(l,c).l(l,c+g).a(l,c,l-g,c,g),d&&u.m(l-g,s).l(l,s).l(l,s-g).a(l,s,l-g,s,g),v&&u.m(f+g,s).l(f,s).l(f,s-g).a(f,s,f+g,s,g))}},function(t,r){t.exports=function(t,r){var e,n,o,i,a,u,f,c,l,s,g,h=r.mode;"label"===h?function(t,r){var e=r.size,n="bold "+.01*r.mSize*e+"px "+r.fontname;t.strokeStyle=r.back,t.lineWidth=.01*r.mSize*e*.1,t.fillStyle=r.fontcolor,t.font=n;var o=t.measureText(r.label).width,i=.01*r.mSize,a=(1-o/e)*r.mPosX*.01*e,u=(1-i)*r.mPosY*.01*e+.75*r.mSize*.01*e;t.strokeText(r.label,a,u),t.fillText(r.label,a,u)}(t,r):"image"===h&&(e=t,o=(n=r).size,i=n.image.naturalWidth||1,a=n.image.naturalHeight||1,u=.01*n.mSize,c=(1-(f=u*i/a))*n.mPosX*.01*o,l=(1-u)*n.mPosY*.01*o,s=f*o,g=u*o,e.drawImage(n.image,c,l,s,g))}},function(t,r,y){function J(n){function o(t){return Math.round(10*t)/10}function i(t){return Math.round(10*t)/10+n.o}return{m:function(t,r){return n.p+="M ".concat(i(t)," ").concat(i(r)," "),this},l:function(t,r){return n.p+="L ".concat(i(t)," ").concat(i(r)," "),this},a:function(t,r,e){return n.p+="A ".concat(o(e)," ").concat(o(e)," 0 0 1 ").concat(i(t)," ").concat(i(r)," "),this}}}var e=y(5),w=e.SVG_NS,m=e.get_attr,b=e.create_svg_el;t.exports=function(t,r){var e,n,o,i,a,u,f,c,l,s,g,h,d=r.size,v=r.mode,p=b("svg",{xmlns:w,width:d,height:d,viewBox:"0 0 ".concat(d," ").concat(d)});return p.style.width="".concat(d,"px"),p.style.height="".concat(d,"px"),r.back&&p.appendChild(b("rect",{x:0,y:0,width:d,height:d,fill:r.back})),p.appendChild(b("path",{d:function(t,r){if(!t)return"";var e={p:"",o:0},n=t.module_count,o=r.size/n;r.crisp&&(o=Math.floor(o),e.o=Math.floor((r.size-o*n)/2));for(var i,a,u,f,c,l,s,g,h,d,v,p,y,w,m,b,x,k,B,C,S,M,A,L,D,_,z,P,T,j,I,O,R,F,H,N,E,Y,q,U,W,X,V,G=J(e),Q=0;Q<n;Q+=1)for(var $=0;$<n;$+=1)i=t,a=G,V=X=W=U=q=Y=E=N=H=F=R=O=I=j=T=P=z=_=D=L=A=M=S=C=B=k=x=b=m=w=y=p=v=d=h=g=s=l=void 0,z=(D=(c=$)*(u=o))+u,P=(_=(f=Q)*u)+u,T=.005*r.rounded*u,j=i.is_dark,I=f-1,O=f+1,R=c-1,F=c+1,H=j(f,c),N=j(I,R),E=j(I,c),Y=j(I,F),q=j(f,F),U=j(O,F),W=j(O,c),X=j(O,R),V=j(f,R),H?(m=a,b=D,x=_,k=z,B=P,C=T,M=!E&&!q,A=!W&&!q,L=!W&&!V,(S=!E&&!V)?m.m(b+C,x):m.m(b,x),M?m.l(k-C,x).a(k,x+C,C):m.l(k,x),A?m.l(k,B-C).a(k-C,B,C):m.l(k,B),L?m.l(b+C,B).a(b,B-C,C):m.l(b,B),S?m.l(b,x+C).a(b+C,x,C):m.l(b,x)):(l=a,s=D,g=_,h=z,d=P,v=T,p=E&&q&&Y,y=W&&q&&U,w=W&&V&&X,E&&V&&N&&l.m(s+v,g).l(s,g).l(s,g+v).a(s+v,g,v),p&&l.m(h,g+v).l(h,g).l(h-v,g).a(h,g+v,v),y&&l.m(h-v,d).l(h,d).l(h,d-v).a(h-v,d,v),w&&l.m(s,d-v).l(s,d).l(s+v,d).a(s,d-v,v));return e.p}(t,r),fill:r.fill})),"label"===v?function(t,r){var e=r.size,n="bold "+.01*r.mSize*e+"px "+r.fontname,o=y(5),i=r.ratio||o.dpr,a=o.create_canvas(e,i).getContext("2d");a.strokeStyle=r.back,a.lineWidth=.01*r.mSize*e*.1,a.fillStyle=r.fontcolor,a.font=n;var u=a.measureText(r.label).width,f=.01*r.mSize,c=(1-u/e)*r.mPosX*.01*e,l=(1-f)*r.mPosY*.01*e+.75*r.mSize*.01*e,s=b("text",{x:c,y:l});Object.assign(s.style,{font:n,fill:r.fontcolor,"paint-order":"stroke",stroke:r.back,"stroke-width":a.lineWidth}),s.textContent=r.label,t.appendChild(s)}(p,r):"image"===v&&(e=p,o=(n=r).size,i=n.image.naturalWidth||1,a=n.image.naturalHeight||1,u=.01*n.mSize,c=(1-(f=u*i/a))*n.mPosX*.01*o,l=(1-u)*n.mPosY*.01*o,s=f*o,g=u*o,h=b("image",{href:m(n.image,"src"),x:c,y:l,width:s,height:g}),e.appendChild(h)),p}}],o.c=n,o.d=function(t,r,e){o.o(t,r)||Object.defineProperty(t,r,{enumerable:!0,get:e})},o.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},o.t=function(r,t){if(1&t&&(r=o(r)),8&t)return r;if(4&t&&"object"==typeof r&&r&&r.__esModule)return r;var e=Object.create(null);if(o.r(e),Object.defineProperty(e,"default",{enumerable:!0,value:r}),2&t&&"string"!=typeof r)for(var n in r)o.d(e,n,function(t){return r[t]}.bind(null,n));return e},o.n=function(t){var r=t&&t.__esModule?function(){return t.default}:function(){return t};return o.d(r,"a",r),r},o.o=function(t,r){return Object.prototype.hasOwnProperty.call(t,r)},o.p="",o(o.s=0);function o(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,o),r.l=!0,r.exports}var e,n});
\ No newline at end of file
diff --git a/data/interfaces/default/js/moment-duration-format.js b/data/interfaces/default/js/moment-duration-format.js
new file mode 100755
index 00000000..9e854210
--- /dev/null
+++ b/data/interfaces/default/js/moment-duration-format.js
@@ -0,0 +1,482 @@
+/*! Moment Duration Format v1.3.0
+ *  https://github.com/jsmreese/moment-duration-format 
+ *  Date: 2014-07-15
+ *
+ *  Duration format plugin function for the Moment.js library
+ *  http://momentjs.com/
+ *
+ *  Copyright 2014 John Madhavan-Reese
+ *  Released under the MIT license
+ */
+
+(function (root, undefined) {
+
+	// repeatZero(qty)
+	// returns "0" repeated qty times
+	function repeatZero(qty) {
+		var result = "";
+		
+		// exit early
+		// if qty is 0 or a negative number
+		// or doesn't coerce to an integer
+		qty = parseInt(qty, 10);
+		if (!qty || qty < 1) { return result; }
+		
+		while (qty) {
+			result += "0";
+			qty -= 1;
+		}
+		
+		return result;
+	}
+	
+	// padZero(str, len [, isRight])
+	// pads a string with zeros up to a specified length
+	// will not pad a string if its length is aready
+	// greater than or equal to the specified length
+	// default output pads with zeros on the left
+	// set isRight to `true` to pad with zeros on the right
+	function padZero(str, len, isRight) {
+		if (str == null) { str = ""; }
+		str = "" + str;
+		
+		return (isRight ? str : "") + repeatZero(len - str.length) + (isRight ? "" : str);
+	}
+	
+	// isArray
+	function isArray(array) {
+		return Object.prototype.toString.call(array) === "[object Array]";
+	}
+	
+	// isObject
+	function isObject(obj) {
+		return Object.prototype.toString.call(obj) === "[object Object]";
+	}
+	
+	// findLast
+	function findLast(array, callback) {
+		var index = array.length;
+
+		while (index -= 1) {
+			if (callback(array[index])) { return array[index]; }
+		}
+	}
+
+	// find
+	function find(array, callback) {
+		var index = 0,
+			max = array.length,
+			match;
+			
+		if (typeof callback !== "function") {
+			match = callback;
+			callback = function (item) {
+				return item === match;
+			};
+		}
+
+		while (index < max) {
+			if (callback(array[index])) { return array[index]; }
+			index += 1;
+		}
+	}
+	
+	// each
+	function each(array, callback) {
+		var index = 0,
+			max = array.length;
+			
+		if (!array || !max) { return; }
+
+		while (index < max) {
+			if (callback(array[index], index) === false) { return; }
+			index += 1;
+		}
+	}
+	
+	// map
+	function map(array, callback) {
+		var index = 0,
+			max = array.length,
+			ret = [];
+
+		if (!array || !max) { return ret; }
+				
+		while (index < max) {
+			ret[index] = callback(array[index], index);
+			index += 1;
+		}
+		
+		return ret;
+	}
+	
+	// pluck
+	function pluck(array, prop) {
+		return map(array, function (item) {
+			return item[prop];
+		});
+	}
+	
+	// compact
+	function compact(array) {
+		var ret = [];
+		
+		each(array, function (item) {
+			if (item) { ret.push(item); }
+		});
+		
+		return ret;
+	}
+	
+	// unique
+	function unique(array) {
+		var ret = [];
+		
+		each(array, function (_a) {
+			if (!find(ret, _a)) { ret.push(_a); }
+		});
+		
+		return ret;
+	}
+	
+	// intersection
+	function intersection(a, b) {
+		var ret = [];
+		
+		each(a, function (_a) {
+			each(b, function (_b) {
+				if (_a === _b) { ret.push(_a); }
+			});
+		});
+		
+		return unique(ret);
+	}
+	
+	// rest
+	function rest(array, callback) {
+		var ret = [];
+		
+		each(array, function (item, index) {
+			if (!callback(item)) {
+				ret = array.slice(index);
+				return false;
+			}
+		});
+		
+		return ret;
+	}
+
+	// initial
+	function initial(array, callback) {
+		var reversed = array.slice().reverse();
+		
+		return rest(reversed, callback).reverse();
+	}
+	
+	// extend
+	function extend(a, b) {
+		for (var key in b) {
+			if (b.hasOwnProperty(key)) { a[key] = b[key]; }
+		}
+		
+		return a;
+	}
+			
+	// define internal moment reference
+	var moment;
+
+	if (typeof require === "function") {
+		try { moment = require('moment'); } 
+		catch (e) {}
+	} 
+	
+	if (!moment && root.moment) {
+		moment = root.moment;
+	}
+	
+	if (!moment) {
+		throw "Moment Duration Format cannot find Moment.js";
+	}
+	
+	// moment.duration.format([template] [, precision] [, settings])
+	moment.duration.fn.format = function () {
+
+		var tokenizer, tokens, types, typeMap, momentTypes, foundFirst, trimIndex,
+			args = [].slice.call(arguments),
+			settings = extend({}, this.format.defaults),
+			// keep a shadow copy of this moment for calculating remainders
+			remainder = moment.duration(this);
+
+		// add a reference to this duration object to the settings for use
+		// in a template function
+		settings.duration = this;
+
+		// parse arguments
+		each(args, function (arg) {
+			if (typeof arg === "string" || typeof arg === "function") {
+				settings.template = arg;
+				return;
+			}
+
+			if (typeof arg === "number") {
+				settings.precision = arg;
+				return;
+			}
+
+			if (isObject(arg)) {
+				extend(settings, arg);
+			}
+		});
+
+		// types
+		types = settings.types = (isArray(settings.types) ? settings.types : settings.types.split(" "));
+
+		// template
+		if (typeof settings.template === "function") {
+			settings.template = settings.template.apply(settings);
+		}
+
+		// tokenizer regexp
+		tokenizer = new RegExp(map(types, function (type) {
+			return settings[type].source;
+		}).join("|"), "g");
+
+		// token type map function
+		typeMap = function (token) {
+			return find(types, function (type) {
+				return settings[type].test(token);
+			});
+		};
+
+		// tokens array
+		tokens = map(settings.template.match(tokenizer), function (token, index) {
+			var type = typeMap(token),
+				length = token.length;
+
+			return {
+				index: index,
+				length: length,
+
+				// replace escaped tokens with the non-escaped token text
+				token: (type === "escape" ? token.replace(settings.escape, "$1") : token),
+
+				// ignore type on non-moment tokens
+				type: ((type === "escape" || type === "general") ? null : type)
+
+				// calculate base value for all moment tokens
+				//baseValue: ((type === "escape" || type === "general") ? null : this.as(type))
+			};
+		}, this);
+
+		// unique moment token types in the template (in order of descending magnitude)
+		momentTypes = intersection(types, unique(compact(pluck(tokens, "type"))));
+
+		// exit early if there are no momentTypes
+		if (!momentTypes.length) {
+			return pluck(tokens, "token").join("");
+		}
+
+		// calculate values for each token type in the template
+		each(momentTypes, function (momentType, index) {
+			var value, wholeValue, decimalValue, isLeast, isMost;
+
+			// calculate integer and decimal value portions
+			value = remainder.as(momentType);
+			wholeValue = (value > 0 ? Math.floor(value) : Math.ceil(value));
+			decimalValue = value - wholeValue;
+
+			// is this the least-significant moment token found?
+			isLeast = ((index + 1) === momentTypes.length);
+
+			// is this the most-significant moment token found?
+			isMost = (!index);
+
+			// update tokens array
+			// using this algorithm to not assume anything about
+			// the order or frequency of any tokens
+			each(tokens, function (token) {
+				if (token.type === momentType) {
+					extend(token, {
+						value: value,
+						wholeValue: wholeValue,
+						decimalValue: decimalValue,
+						isLeast: isLeast,
+						isMost: isMost
+					});
+
+					if (isMost) {
+						// note the length of the most-significant moment token:
+						// if it is greater than one and forceLength is not set, default forceLength to `true`
+						if (settings.forceLength == null && token.length > 1) {
+							settings.forceLength = true;
+						}
+
+						// rationale is this:
+						// if the template is "h:mm:ss" and the moment value is 5 minutes, the user-friendly output is "5:00", not "05:00"
+						// shouldn't pad the `minutes` token even though it has length of two
+						// if the template is "hh:mm:ss", the user clearly wanted everything padded so we should output "05:00"
+						// if the user wanted the full padded output, they can set `{ trim: false }` to get "00:05:00"
+					}
+				}
+			});
+
+			// update remainder
+			remainder.subtract(wholeValue, momentType);
+		});
+	
+		// trim tokens array
+		if (settings.trim) {
+			tokens = (settings.trim === "left" ? rest : initial)(tokens, function (token) {
+				// return `true` if:
+				// the token is not the least moment token (don't trim the least moment token)
+				// the token is a moment token that does not have a value (don't trim moment tokens that have a whole value)
+				return !(token.isLeast || (token.type != null && token.wholeValue));
+			});
+		}
+		
+		
+		// build output
+
+		// the first moment token can have special handling
+		foundFirst = false;
+
+		// run the map in reverse order if trimming from the right
+		if (settings.trim === "right") {
+			tokens.reverse();
+		}
+
+		tokens = map(tokens, function (token) {
+			var val,
+				decVal;
+
+			if (!token.type) {
+				// if it is not a moment token, use the token as its own value
+				return token.token;
+			}
+
+			// apply negative precision formatting to the least-significant moment token
+			if (token.isLeast && (settings.precision < 0)) {
+				val = (Math.floor(token.wholeValue * Math.pow(10, settings.precision)) * Math.pow(10, -settings.precision)).toString();
+			} else {
+				val = token.wholeValue.toString();
+			}
+			
+			// remove negative sign from the beginning
+			val = val.replace(/^\-/, "");
+
+			// apply token length formatting
+			// special handling for the first moment token that is not the most significant in a trimmed template
+			if (token.length > 1 && (foundFirst || token.isMost || settings.forceLength)) {
+				val = padZero(val, token.length);
+			}
+
+			// add decimal value if precision > 0
+			if (token.isLeast && (settings.precision > 0)) {
+				decVal = token.decimalValue.toString().replace(/^\-/, "").split(/\.|e\-/);
+				switch (decVal.length) {
+					case 1:
+						val += "." + padZero(decVal[0], settings.precision, true).slice(0, settings.precision);
+						break;
+						
+					case 2:
+						val += "." + padZero(decVal[1], settings.precision, true).slice(0, settings.precision);		
+						break;
+						
+					case 3:
+						val += "." + padZero(repeatZero((+decVal[2]) - 1) + (decVal[0] || "0") + decVal[1], settings.precision, true).slice(0, settings.precision);		
+						break;
+					
+					default:
+						throw "Moment Duration Format: unable to parse token decimal value.";
+				}
+			}
+			
+			// add a negative sign if the value is negative and token is most significant
+			if (token.isMost && token.value < 0) {
+				val = "-" + val;
+			}
+
+			foundFirst = true;
+
+			return val;
+		});
+
+		// undo the reverse if trimming from the right
+		if (settings.trim === "right") {
+			tokens.reverse();
+		}
+
+		return tokens.join("");
+	};
+
+	moment.duration.fn.format.defaults = {
+		// token definitions
+		escape: /\[(.+?)\]/,
+		years: /[Yy]+/,
+		months: /M+/,
+		weeks: /[Ww]+/,
+		days: /[Dd]+/,
+		hours: /[Hh]+/,
+		minutes: /m+/,
+		seconds: /s+/,
+		milliseconds: /S+/,
+		general: /.+?/,
+
+		// token type names
+		// in order of descending magnitude
+		// can be a space-separated token name list or an array of token names
+		types: "escape years months weeks days hours minutes seconds milliseconds general",
+
+		// format options
+
+		// trim
+		// "left" - template tokens are trimmed from the left until the first moment token that has a value >= 1
+		// "right" - template tokens are trimmed from the right until the first moment token that has a value >= 1
+		// (the final moment token is not trimmed, regardless of value)
+		// `false` - template tokens are not trimmed
+		trim: "left",
+
+		// precision
+		// number of decimal digits to include after (to the right of) the decimal point (positive integer)
+		// or the number of digits to truncate to 0 before (to the left of) the decimal point (negative integer)
+		precision: 0,
+
+		// force first moment token with a value to render at full length even when template is trimmed and first moment token has length of 1
+		forceLength: null,
+
+		// template used to format duration
+		// may be a function or a string
+		// template functions are executed with the `this` binding of the settings object
+		// so that template strings may be dynamically generated based on the duration object
+		// (accessible via `this.duration`)
+		// or any of the other settings
+		template: function () {
+			var types = this.types,
+				dur = this.duration,
+				lastType = findLast(types, function (type) {
+					return dur._data[type];
+				});
+
+			// default template strings for each duration dimension type
+			switch (lastType) {
+				case "seconds":
+					return "h:mm:ss";
+				case "minutes":
+					return "d[d] h:mm";
+				case "hours":
+					return "d[d] h[h]";
+				case "days":
+					return "M[m] d[d]";
+				case "weeks":
+					return "y[y] w[w]";
+				case "months":
+					return "y[y] M[m]";
+				case "years":
+					return "y[y]";
+				default:
+					return "y[y] M[m] d[d] h:mm:ss";
+			}
+		}
+	};
+
+})(this);
diff --git a/data/interfaces/default/js/moment-duration-format.min.js b/data/interfaces/default/js/moment-duration-format.min.js
deleted file mode 100644
index 5f2bad7a..00000000
--- a/data/interfaces/default/js/moment-duration-format.min.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/*! Moment Duration Format v2.2.2
- *  https://github.com/jsmreese/moment-duration-format
- *  Date: 2018-02-16
- *
- *  Duration format plugin function for the Moment.js library
- *  http://momentjs.com/
- *
- *  Copyright 2018 John Madhavan-Reese
- *  Released under the MIT license
- */
- !function(e,t){if("function"==typeof define&&define.amd)define(["moment"],t);else if("object"==typeof exports)try{module.exports=t(require("moment"))}catch(e){module.exports=t}e&&(e.momentDurationFormatSetup=e.moment?t(e.moment):t)}(this,function(e){var t=!1,n=!1,i=!1,r=!1,a="escape years months weeks days hours minutes seconds milliseconds general".split(" "),u=[{type:"seconds",targets:[{type:"minutes",value:60},{type:"hours",value:3600},{type:"days",value:86400},{type:"weeks",value:604800},{type:"months",value:2678400},{type:"years",value:31536e3}]},{type:"minutes",targets:[{type:"hours",value:60},{type:"days",value:1440},{type:"weeks",value:10080},{type:"months",value:44640},{type:"years",value:525600}]},{type:"hours",targets:[{type:"days",value:24},{type:"weeks",value:168},{type:"months",value:744},{type:"years",value:8760}]},{type:"days",targets:[{type:"weeks",value:7},{type:"months",value:31},{type:"years",value:365}]},{type:"months",targets:[{type:"years",value:12}]}];function o(e,t){return!(t.length>e.length)&&-1!==e.indexOf(t)}function l(e){for(var t="";e;)t+="0",e-=1;return t}function s(e,t){var n=e+"+"+d(D(t).sort(),function(e){return e+":"+t[e]}).join(",");return s.cache[n]||(s.cache[n]=Intl.NumberFormat(e,t)),s.cache[n]}function c(e,t,a){var u,o,m,f=t.useToLocaleString,p=t.useGrouping,g=p&&t.grouping.slice(),h=t.maximumSignificantDigits,y=t.minimumIntegerDigits||1,d=t.fractionDigits||0,v=t.groupingSeparator,w=t.decimalSeparator;if(f&&a){var S={minimumIntegerDigits:y,useGrouping:p};if(d&&(S.maximumFractionDigits=d,S.minimumFractionDigits=d),h&&e>0&&(S.maximumSignificantDigits=h),i){var V;if(!r)(V=x({},t)).useGrouping=!1,V.decimalSeparator=".",e=parseFloat(c(e,V),10);return s(a,S).format(e)}return n||((V=x({},t)).useGrouping=!1,V.decimalSeparator=".",e=parseFloat(c(e,V),10)),e.toLocaleString(a,S)}var _=(h?e.toPrecision(h+1):e.toFixed(d+1)).split("e");m=_[1]||"",o=(_=_[0].split("."))[1]||"";var D=(u=_[0]||"").length,b=o.length,M=D+b,L=u+o;(h&&M===h+1||!h&&b===d+1)&&((L=function(e){for(var t=e.split("").reverse(),n=0,i=!0;i&&n<t.length;)n?"9"===t[n]?t[n]="0":(t[n]=(parseInt(t[n],10)+1).toString(),i=!1):(parseInt(t[n],10)<5&&(i=!1),t[n]="0"),n+=1;return i&&t.push("1"),t.reverse().join("")}(L)).length===M+1&&(D+=1),b&&(L=L.slice(0,-1)),u=L.slice(0,D),o=L.slice(D)),h&&(o=o.replace(/0*$/,""));var k=parseInt(m,10);k>0?o.length<=k?(u+=o+=l(k-o.length),o=""):(u+=o.slice(0,k),o=o.slice(k)):k<0&&(o=l(Math.abs(k)-u.length)+u+o,u="0"),h||((o=o.slice(0,d)).length<d&&(o+=l(d-o.length)),u.length<y&&(u=l(y-u.length)+u));var T,F="";if(p)for(_=u;_.length;)g.length&&(T=g.shift()),F&&(F=v+F),F=_.slice(-T)+F,_=_.slice(0,-T);else F=u;return o&&(F=F+w+o),F}function m(e,t){return e.label.length>t.label.length?-1:e.label.length<t.label.length?1:0}s.cache={};var f={durationLabelsStandard:{S:"millisecond",SS:"milliseconds",s:"second",ss:"seconds",m:"minute",mm:"minutes",h:"hour",hh:"hours",d:"day",dd:"days",w:"week",ww:"weeks",M:"month",MM:"months",y:"year",yy:"years"},durationLabelsShort:{S:"msec",SS:"msecs",s:"sec",ss:"secs",m:"min",mm:"mins",h:"hr",hh:"hrs",d:"dy",dd:"dys",w:"wk",ww:"wks",M:"mo",MM:"mos",y:"yr",yy:"yrs"},durationTimeTemplates:{HMS:"h:mm:ss",HM:"h:mm",MS:"m:ss"},durationLabelTypes:[{type:"standard",string:"__"},{type:"short",string:"_"}],durationPluralKey:function(e,t,n){return 1===t&&null===n?e:e+e}};function p(e){return"[object Array]"===Object.prototype.toString.call(e)}function g(e){return"[object Object]"===Object.prototype.toString.call(e)}function h(e,t){var n,i=0,r=e&&e.length||0;for("function"!=typeof t&&(n=t,t=function(e){return e===n});i<r;){if(t(e[i]))return e[i];i+=1}}function y(e,t){var n=0,i=e.length;if(e&&i)for(;n<i;){if(!1===t(e[n],n))return;n+=1}}function d(e,t){var n=0,i=e.length,r=[];if(!e||!i)return r;for(;n<i;)r[n]=t(e[n],n),n+=1;return r}function v(e,t){return d(e,function(e){return e[t]})}function w(e){var t=[];return y(e,function(e){e&&t.push(e)}),t}function S(e){var t=[];return y(e,function(e){h(t,e)||t.push(e)}),t}function V(e,t){var n=[];return y(e,function(e){y(t,function(t){e===t&&n.push(e)})}),S(n)}function _(e,t){var n=[];return y(e,function(i,r){if(!t(i))return n=e.slice(r),!1}),n}function x(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n]);return e}function D(e){var t=[];for(var n in e)e.hasOwnProperty(n)&&t.push(n);return t}function b(e,t){var n=0,i=e.length;if(!e||!i)return!1;for(;n<i;){if(!0===t(e[n],n))return!0;n+=1}return!1}function M(e){return"3.6"===e(3.55,"en",{useGrouping:!1,minimumIntegerDigits:1,minimumFractionDigits:1,maximumFractionDigits:1})}function L(e){var t=!0;return!!(t=(t=(t=t&&"1"===e(1,"en",{minimumIntegerDigits:1}))&&"01"===e(1,"en",{minimumIntegerDigits:2}))&&"001"===e(1,"en",{minimumIntegerDigits:3}))&&(!!(t=(t=(t=(t=t&&"100"===e(99.99,"en",{maximumFractionDigits:0,minimumFractionDigits:0}))&&"100.0"===e(99.99,"en",{maximumFractionDigits:1,minimumFractionDigits:1}))&&"99.99"===e(99.99,"en",{maximumFractionDigits:2,minimumFractionDigits:2}))&&"99.990"===e(99.99,"en",{maximumFractionDigits:3,minimumFractionDigits:3}))&&(!!(t=(t=(t=(t=(t=t&&"100"===e(99.99,"en",{maximumSignificantDigits:1}))&&"100"===e(99.99,"en",{maximumSignificantDigits:2}))&&"100"===e(99.99,"en",{maximumSignificantDigits:3}))&&"99.99"===e(99.99,"en",{maximumSignificantDigits:4}))&&"99.99"===e(99.99,"en",{maximumSignificantDigits:5}))&&!!(t=(t=t&&"1,000"===e(1e3,"en",{useGrouping:!0}))&&"1000"===e(1e3,"en",{useGrouping:!1}))))}function k(){var e,t=[].slice.call(arguments),n={};if(y(t,function(t,i){if(!i){if(!p(t))throw"Expected array as the first argument to durationsFormat.";e=t}"string"!=typeof t&&"function"!=typeof t?"number"!=typeof t?g(t)&&x(n,t):n.precision=t:n.template=t}),!e||!e.length)return[];n.returnMomentTypes=!0;var i,r=d(e,function(e){return e.format(n)}),u=V(a,S(v((i=[],y(r,function(e){i=i.concat(e)}),i),"type"))),o=n.largest;return o&&(u=u.slice(0,o)),n.returnMomentTypes=!1,n.outputTypes=u,d(e,function(e){return e.format(n)})}function T(){var n=[].slice.call(arguments),r=x({},this.format.defaults),l=this.asMilliseconds(),s=this.asMonths();"function"==typeof this.isValid&&!1===this.isValid()&&(l=0,s=0);var M=l<0,L=e.duration(Math.abs(l),"milliseconds"),k=e.duration(Math.abs(s),"months");y(n,function(e){"string"!=typeof e&&"function"!=typeof e?"number"!=typeof e?g(e)&&x(r,e):r.precision=e:r.template=e});var T={years:"y",months:"M",weeks:"w",days:"d",hours:"h",minutes:"m",seconds:"s",milliseconds:"S"},F={escape:/\[(.+?)\]/,years:/\*?[Yy]+/,months:/\*?M+/,weeks:/\*?[Ww]+/,days:/\*?[Dd]+/,hours:/\*?[Hh]+/,minutes:/\*?m+/,seconds:/\*?s+/,milliseconds:/\*?S+/,general:/.+?/};r.types=a;var I=function(e){return h(a,function(t){return F[t].test(e)})},j=new RegExp(d(a,function(e){return F[e].source}).join("|"),"g");r.duration=this;var G="function"==typeof r.template?r.template.apply(r):r.template,E=r.outputTypes,P=r.returnMomentTypes,O=r.largest,H=[];E||(p(r.stopTrim)&&(r.stopTrim=r.stopTrim.join("")),r.stopTrim&&y(r.stopTrim.match(j),function(e){var t=I(e);"escape"!==t&&"general"!==t&&H.push(t)}));var N=e.localeData();N||(N={}),y(D(f),function(e){"function"!=typeof f[e]?N["_"+e]||(N["_"+e]=f[e]):N[e]||(N[e]=f[e])}),y(D(N._durationTimeTemplates),function(e){G=G.replace("_"+e+"_",N._durationTimeTemplates[e])});var $=r.userLocale||e.locale(),K=r.useLeftUnits,R=r.usePlural,U=r.precision,q=r.forceLength,A=r.useGrouping,C=r.trunc,W=r.useSignificantDigits&&U>0,Y=W?r.precision:0,z=Y,B=r.minValue,J=!1,Q=r.maxValue,X=!1,Z=r.useToLocaleString,ee=r.groupingSeparator,te=r.decimalSeparator,ne=r.grouping;Z=Z&&(t||i);var ie=r.trim;p(ie)&&(ie=ie.join(" ")),null===ie&&(O||Q||W)&&(ie="all"),null!==ie&&!0!==ie&&"left"!==ie&&"right"!==ie||(ie="large"),!1===ie&&(ie="");var re=function(e){return e.test(ie)},ae=/both/,ue=/^all|[^sm]all/,oe=O>0||b([/large/,ae,ue],re),le=b([/small/,ae,ue],re),se=b([/mid/,ue],re),ce=b([/final/,ue],re),me=d(G.match(j),function(e,t){var n=I(e);return"*"===e.slice(0,1)&&(e=e.slice(1),"escape"!==n&&"general"!==n&&H.push(n)),{index:t,length:e.length,text:"",token:"escape"===n?e.replace(F.escape,"$1"):e,type:"escape"===n||"general"===n?null:n}}),fe={index:0,length:0,token:"",text:"",type:null},pe=[];K&&me.reverse(),y(me,function(e){if(e.type)return(fe.type||fe.text)&&pe.push(fe),void(fe=e);K?fe.text=e.token+fe.text:fe.text+=e.token}),(fe.type||fe.text)&&pe.push(fe),K&&pe.reverse();var ge=V(a,S(w(v(pe,"type"))));if(!ge.length)return v(pe,"text").join("");ge=d(ge,function(e,t){var n,i=t+1===ge.length,a=!t;n="years"===e||"months"===e?k.as(e):L.as(e);var u=Math.floor(n),o=n-u,l=h(pe,function(t){return e===t.type});return a&&Q&&n>Q&&(X=!0),i&&B&&Math.abs(r.duration.as(e))<B&&(J=!0),a&&null===q&&l.length>1&&(q=!0),L.subtract(u,e),k.subtract(u,e),{rawValue:n,wholeValue:u,decimalValue:i?o:0,isSmallest:i,isLargest:a,type:e,tokenLength:l.length}});var he,ye=C?Math.floor:Math.round,de=function(e,t){var n=Math.pow(10,t);return ye(e*n)/n},ve=!1,we=!1,Se=function(e,t){var n={useGrouping:A,groupingSeparator:ee,decimalSeparator:te,grouping:ne,useToLocaleString:Z};return W&&(Y<=0?(e.rawValue=0,e.wholeValue=0,e.decimalValue=0):(n.maximumSignificantDigits=Y,e.significantDigits=Y)),X&&!we&&(e.isLargest?(e.wholeValue=Q,e.decimalValue=0):(e.wholeValue=0,e.decimalValue=0)),J&&!we&&(e.isSmallest?(e.wholeValue=B,e.decimalValue=0):(e.wholeValue=0,e.decimalValue=0)),e.isSmallest||e.significantDigits&&e.significantDigits-e.wholeValue.toString().length<=0?U<0?e.value=de(e.wholeValue,U):0===U?e.value=ye(e.wholeValue+e.decimalValue):W?(e.value=C?de(e.rawValue,Y-e.wholeValue.toString().length):e.rawValue,e.wholeValue&&(Y-=e.wholeValue.toString().length)):(n.fractionDigits=U,e.value=C?e.wholeValue+de(e.decimalValue,U):e.wholeValue+e.decimalValue):W&&e.wholeValue?(e.value=Math.round(de(e.wholeValue,e.significantDigits-e.wholeValue.toString().length)),Y-=e.wholeValue.toString().length):e.value=e.wholeValue,e.tokenLength>1&&(q||ve)&&(n.minimumIntegerDigits=e.tokenLength,we&&n.maximumSignificantDigits<e.tokenLength&&delete n.maximumSignificantDigits),!ve&&(e.value>0||""===ie||h(H,e.type)||h(E,e.type))&&(ve=!0),e.formattedValue=c(e.value,n,$),n.useGrouping=!1,n.decimalSeparator=".",e.formattedValueEn=c(e.value,n,"en"),2===e.tokenLength&&"milliseconds"===e.type&&(e.formattedValueMS=c(e.value,{minimumIntegerDigits:3,useGrouping:!1},"en").slice(0,2)),e};if((ge=w(ge=d(ge,Se))).length>1){var Ve=function(e){return h(ge,function(t){return t.type===e})};y(u,function(e){var t=Ve(e.type);t&&y(e.targets,function(e){var n=Ve(e.type);n&&parseInt(t.formattedValueEn,10)===e.value&&(t.rawValue=0,t.wholeValue=0,t.decimalValue=0,n.rawValue+=1,n.wholeValue+=1,n.decimalValue=0,n.formattedValueEn=n.wholeValue.toString(),we=!0)})})}return we&&(ve=!1,Y=z,ge=w(ge=d(ge,Se))),!E||X&&!r.trim?(oe&&(ge=_(ge,function(e){return!e.isSmallest&&!e.wholeValue&&!h(H,e.type)})),O&&ge.length&&(ge=ge.slice(0,O)),le&&ge.length>1&&(he=function(e){return!e.wholeValue&&!h(H,e.type)&&!e.isLargest},ge=_(ge.slice().reverse(),he).reverse()),se&&(ge=w(ge=d(ge,function(e,t){return t>0&&t<ge.length-1&&!e.wholeValue?null:e}))),!ce||1!==ge.length||ge[0].wholeValue||!C&&ge[0].isSmallest&&ge[0].rawValue<B||(ge=[])):ge=w(ge=d(ge,function(e){return h(E,function(t){return e.type===t})?e:null})),P?ge:(y(pe,function(e){var t=T[e.type],n=h(ge,function(t){return t.type===e.type});if(t&&n){var i=n.formattedValueEn.split(".");i[0]=parseInt(i[0],10),i[1]?i[1]=parseFloat("0."+i[1],10):i[1]=null;var r=N.durationPluralKey(t,i[0],i[1]),a=function(e,t){var n=[];return y(D(t),function(i){if("_durationLabels"===i.slice(0,15)){var r=i.slice(15).toLowerCase();y(D(t[i]),function(a){a.slice(0,1)===e&&n.push({type:r,key:a,label:t[i][a]})})}}),n}(t,N),u=!1,l={};y(N._durationLabelTypes,function(t){var n=h(a,function(e){return e.type===t.type&&e.key===r});n&&(l[n.type]=n.label,o(e.text,t.string)&&(e.text=e.text.replace(t.string,n.label),u=!0))}),R&&!u&&(a.sort(m),y(a,function(t){return l[t.type]===t.label?!o(e.text,t.label)&&void 0:o(e.text,t.label)?(e.text=e.text.replace(t.label,l[t.type]),!1):void 0}))}}),(pe=d(pe,function(e){if(!e.type)return e.text;var t=h(ge,function(t){return t.type===e.type});if(!t)return"";var n="";return K&&(n+=e.text),(M&&X||!M&&J)&&(n+="< ",X=!1,J=!1),(M&&J||!M&&X)&&(n+="> ",X=!1,J=!1),M&&(t.value>0||""===ie||h(H,t.type)||h(E,t.type))&&(n+="-",M=!1),"milliseconds"===e.type&&t.formattedValueMS?n+=t.formattedValueMS:n+=t.formattedValue,K||(n+=e.text),n})).join("").replace(/(,| |:|\.)*$/,"").replace(/^(,| |:|\.)*/,""))}function F(){var e=this.duration,t=function(t){return e._data[t]},n=h(this.types,t),i=function(e,t){for(var n=e.length;n-=1;)if(t(e[n]))return e[n]}(this.types,t);switch(n){case"milliseconds":return"S __";case"seconds":case"minutes":return"*_MS_";case"hours":return"_HMS_";case"days":if(n===i)return"d __";case"weeks":return n===i?"w __":(null===this.trim&&(this.trim="both"),"w __, d __, h __");case"months":if(n===i)return"M __";case"years":return n===i?"y __":(null===this.trim&&(this.trim="both"),"y __, M __, d __");default:return null===this.trim&&(this.trim="both"),"y __, d __, h __, m __, s __"}}function I(e){if(!e)throw"Moment Duration Format init cannot find moment instance.";e.duration.format=k,e.duration.fn.format=T,e.duration.fn.format.defaults={trim:null,stopTrim:null,largest:null,maxValue:null,minValue:null,precision:0,trunc:!1,forceLength:null,userLocale:null,usePlural:!0,useLeftUnits:!1,useGrouping:!0,useSignificantDigits:!1,template:F,useToLocaleString:!0,groupingSeparator:",",decimalSeparator:".",grouping:[3]},e.updateLocale("en",f)}var j=function(e,t,n){return e.toLocaleString(t,n)};t=function(){try{(0).toLocaleString("i")}catch(e){return"RangeError"===e.name}return!1}()&&L(j),n=t&&M(j);var G=function(e,t,n){if("undefined"!=typeof window&&window&&window.Intl&&window.Intl.NumberFormat)return window.Intl.NumberFormat(t,n).format(e)};return i=L(G),r=i&&M(G),I(e),I});
\ No newline at end of file
diff --git a/data/interfaces/default/js/moment-with-locale.js b/data/interfaces/default/js/moment-with-locale.js
new file mode 100644
index 00000000..fc72213d
--- /dev/null
+++ b/data/interfaces/default/js/moment-with-locale.js
@@ -0,0 +1,10 @@
+//! moment.js
+//! version : 2.8.2
+//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
+//! license : MIT
+//! momentjs.com
+(function(a){function b(a,b,c){switch(arguments.length){case 2:return null!=a?a:b;case 3:return null!=a?a:null!=b?b:c;default:throw new Error("Implement me")}}function c(a,b){return yb.call(a,b)}function d(){return{empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1}}function e(a){sb.suppressDeprecationWarnings===!1&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+a)}function f(a,b){var c=!0;return m(function(){return c&&(e(a),c=!1),b.apply(this,arguments)},b)}function g(a,b){pc[a]||(e(b),pc[a]=!0)}function h(a,b){return function(c){return p(a.call(this,c),b)}}function i(a,b){return function(c){return this.localeData().ordinal(a.call(this,c),b)}}function j(){}function k(a,b){b!==!1&&F(a),n(this,a),this._d=new Date(+a._d)}function l(a){var b=y(a),c=b.year||0,d=b.quarter||0,e=b.month||0,f=b.week||0,g=b.day||0,h=b.hour||0,i=b.minute||0,j=b.second||0,k=b.millisecond||0;this._milliseconds=+k+1e3*j+6e4*i+36e5*h,this._days=+g+7*f,this._months=+e+3*d+12*c,this._data={},this._locale=sb.localeData(),this._bubble()}function m(a,b){for(var d in b)c(b,d)&&(a[d]=b[d]);return c(b,"toString")&&(a.toString=b.toString),c(b,"valueOf")&&(a.valueOf=b.valueOf),a}function n(a,b){var c,d,e;if("undefined"!=typeof b._isAMomentObject&&(a._isAMomentObject=b._isAMomentObject),"undefined"!=typeof b._i&&(a._i=b._i),"undefined"!=typeof b._f&&(a._f=b._f),"undefined"!=typeof b._l&&(a._l=b._l),"undefined"!=typeof b._strict&&(a._strict=b._strict),"undefined"!=typeof b._tzm&&(a._tzm=b._tzm),"undefined"!=typeof b._isUTC&&(a._isUTC=b._isUTC),"undefined"!=typeof b._offset&&(a._offset=b._offset),"undefined"!=typeof b._pf&&(a._pf=b._pf),"undefined"!=typeof b._locale&&(a._locale=b._locale),Hb.length>0)for(c in Hb)d=Hb[c],e=b[d],"undefined"!=typeof e&&(a[d]=e);return a}function o(a){return 0>a?Math.ceil(a):Math.floor(a)}function p(a,b,c){for(var d=""+Math.abs(a),e=a>=0;d.length<b;)d="0"+d;return(e?c?"+":"":"-")+d}function q(a,b){var c={milliseconds:0,months:0};return c.months=b.month()-a.month()+12*(b.year()-a.year()),a.clone().add(c.months,"M").isAfter(b)&&--c.months,c.milliseconds=+b-+a.clone().add(c.months,"M"),c}function r(a,b){var c;return b=K(b,a),a.isBefore(b)?c=q(a,b):(c=q(b,a),c.milliseconds=-c.milliseconds,c.months=-c.months),c}function s(a,b){return function(c,d){var e,f;return null===d||isNaN(+d)||(g(b,"moment()."+b+"(period, number) is deprecated. Please use moment()."+b+"(number, period)."),f=c,c=d,d=f),c="string"==typeof c?+c:c,e=sb.duration(c,d),t(this,e,a),this}}function t(a,b,c,d){var e=b._milliseconds,f=b._days,g=b._months;d=null==d?!0:d,e&&a._d.setTime(+a._d+e*c),f&&mb(a,"Date",lb(a,"Date")+f*c),g&&kb(a,lb(a,"Month")+g*c),d&&sb.updateOffset(a,f||g)}function u(a){return"[object Array]"===Object.prototype.toString.call(a)}function v(a){return"[object Date]"===Object.prototype.toString.call(a)||a instanceof Date}function w(a,b,c){var d,e=Math.min(a.length,b.length),f=Math.abs(a.length-b.length),g=0;for(d=0;e>d;d++)(c&&a[d]!==b[d]||!c&&A(a[d])!==A(b[d]))&&g++;return g+f}function x(a){if(a){var b=a.toLowerCase().replace(/(.)s$/,"$1");a=ic[a]||jc[b]||b}return a}function y(a){var b,d,e={};for(d in a)c(a,d)&&(b=x(d),b&&(e[b]=a[d]));return e}function z(b){var c,d;if(0===b.indexOf("week"))c=7,d="day";else{if(0!==b.indexOf("month"))return;c=12,d="month"}sb[b]=function(e,f){var g,h,i=sb._locale[b],j=[];if("number"==typeof e&&(f=e,e=a),h=function(a){var b=sb().utc().set(d,a);return i.call(sb._locale,b,e||"")},null!=f)return h(f);for(g=0;c>g;g++)j.push(h(g));return j}}function A(a){var b=+a,c=0;return 0!==b&&isFinite(b)&&(c=b>=0?Math.floor(b):Math.ceil(b)),c}function B(a,b){return new Date(Date.UTC(a,b+1,0)).getUTCDate()}function C(a,b,c){return gb(sb([a,11,31+b-c]),b,c).week}function D(a){return E(a)?366:365}function E(a){return a%4===0&&a%100!==0||a%400===0}function F(a){var b;a._a&&-2===a._pf.overflow&&(b=a._a[Ab]<0||a._a[Ab]>11?Ab:a._a[Bb]<1||a._a[Bb]>B(a._a[zb],a._a[Ab])?Bb:a._a[Cb]<0||a._a[Cb]>23?Cb:a._a[Db]<0||a._a[Db]>59?Db:a._a[Eb]<0||a._a[Eb]>59?Eb:a._a[Fb]<0||a._a[Fb]>999?Fb:-1,a._pf._overflowDayOfYear&&(zb>b||b>Bb)&&(b=Bb),a._pf.overflow=b)}function G(a){return null==a._isValid&&(a._isValid=!isNaN(a._d.getTime())&&a._pf.overflow<0&&!a._pf.empty&&!a._pf.invalidMonth&&!a._pf.nullInput&&!a._pf.invalidFormat&&!a._pf.userInvalidated,a._strict&&(a._isValid=a._isValid&&0===a._pf.charsLeftOver&&0===a._pf.unusedTokens.length)),a._isValid}function H(a){return a?a.toLowerCase().replace("_","-"):a}function I(a){for(var b,c,d,e,f=0;f<a.length;){for(e=H(a[f]).split("-"),b=e.length,c=H(a[f+1]),c=c?c.split("-"):null;b>0;){if(d=J(e.slice(0,b).join("-")))return d;if(c&&c.length>=b&&w(e,c,!0)>=b-1)break;b--}f++}return null}function J(a){var b=null;if(!Gb[a]&&Ib)try{b=sb.locale(),require("./locale/"+a),sb.locale(b)}catch(c){}return Gb[a]}function K(a,b){return b._isUTC?sb(a).zone(b._offset||0):sb(a).local()}function L(a){return a.match(/\[[\s\S]/)?a.replace(/^\[|\]$/g,""):a.replace(/\\/g,"")}function M(a){var b,c,d=a.match(Mb);for(b=0,c=d.length;c>b;b++)d[b]=oc[d[b]]?oc[d[b]]:L(d[b]);return function(e){var f="";for(b=0;c>b;b++)f+=d[b]instanceof Function?d[b].call(e,a):d[b];return f}}function N(a,b){return a.isValid()?(b=O(b,a.localeData()),kc[b]||(kc[b]=M(b)),kc[b](a)):a.localeData().invalidDate()}function O(a,b){function c(a){return b.longDateFormat(a)||a}var d=5;for(Nb.lastIndex=0;d>=0&&Nb.test(a);)a=a.replace(Nb,c),Nb.lastIndex=0,d-=1;return a}function P(a,b){var c,d=b._strict;switch(a){case"Q":return Yb;case"DDDD":return $b;case"YYYY":case"GGGG":case"gggg":return d?_b:Qb;case"Y":case"G":case"g":return bc;case"YYYYYY":case"YYYYY":case"GGGGG":case"ggggg":return d?ac:Rb;case"S":if(d)return Yb;case"SS":if(d)return Zb;case"SSS":if(d)return $b;case"DDD":return Pb;case"MMM":case"MMMM":case"dd":case"ddd":case"dddd":return Tb;case"a":case"A":return b._locale._meridiemParse;case"X":return Wb;case"Z":case"ZZ":return Ub;case"T":return Vb;case"SSSS":return Sb;case"MM":case"DD":case"YY":case"GG":case"gg":case"HH":case"hh":case"mm":case"ss":case"ww":case"WW":return d?Zb:Ob;case"M":case"D":case"d":case"H":case"h":case"m":case"s":case"w":case"W":case"e":case"E":return Ob;case"Do":return Xb;default:return c=new RegExp(Y(X(a.replace("\\","")),"i"))}}function Q(a){a=a||"";var b=a.match(Ub)||[],c=b[b.length-1]||[],d=(c+"").match(gc)||["-",0,0],e=+(60*d[1])+A(d[2]);return"+"===d[0]?-e:e}function R(a,b,c){var d,e=c._a;switch(a){case"Q":null!=b&&(e[Ab]=3*(A(b)-1));break;case"M":case"MM":null!=b&&(e[Ab]=A(b)-1);break;case"MMM":case"MMMM":d=c._locale.monthsParse(b),null!=d?e[Ab]=d:c._pf.invalidMonth=b;break;case"D":case"DD":null!=b&&(e[Bb]=A(b));break;case"Do":null!=b&&(e[Bb]=A(parseInt(b,10)));break;case"DDD":case"DDDD":null!=b&&(c._dayOfYear=A(b));break;case"YY":e[zb]=sb.parseTwoDigitYear(b);break;case"YYYY":case"YYYYY":case"YYYYYY":e[zb]=A(b);break;case"a":case"A":c._isPm=c._locale.isPM(b);break;case"H":case"HH":case"h":case"hh":e[Cb]=A(b);break;case"m":case"mm":e[Db]=A(b);break;case"s":case"ss":e[Eb]=A(b);break;case"S":case"SS":case"SSS":case"SSSS":e[Fb]=A(1e3*("0."+b));break;case"X":c._d=new Date(1e3*parseFloat(b));break;case"Z":case"ZZ":c._useUTC=!0,c._tzm=Q(b);break;case"dd":case"ddd":case"dddd":d=c._locale.weekdaysParse(b),null!=d?(c._w=c._w||{},c._w.d=d):c._pf.invalidWeekday=b;break;case"w":case"ww":case"W":case"WW":case"d":case"e":case"E":a=a.substr(0,1);case"gggg":case"GGGG":case"GGGGG":a=a.substr(0,2),b&&(c._w=c._w||{},c._w[a]=A(b));break;case"gg":case"GG":c._w=c._w||{},c._w[a]=sb.parseTwoDigitYear(b)}}function S(a){var c,d,e,f,g,h,i;c=a._w,null!=c.GG||null!=c.W||null!=c.E?(g=1,h=4,d=b(c.GG,a._a[zb],gb(sb(),1,4).year),e=b(c.W,1),f=b(c.E,1)):(g=a._locale._week.dow,h=a._locale._week.doy,d=b(c.gg,a._a[zb],gb(sb(),g,h).year),e=b(c.w,1),null!=c.d?(f=c.d,g>f&&++e):f=null!=c.e?c.e+g:g),i=hb(d,e,f,h,g),a._a[zb]=i.year,a._dayOfYear=i.dayOfYear}function T(a){var c,d,e,f,g=[];if(!a._d){for(e=V(a),a._w&&null==a._a[Bb]&&null==a._a[Ab]&&S(a),a._dayOfYear&&(f=b(a._a[zb],e[zb]),a._dayOfYear>D(f)&&(a._pf._overflowDayOfYear=!0),d=cb(f,0,a._dayOfYear),a._a[Ab]=d.getUTCMonth(),a._a[Bb]=d.getUTCDate()),c=0;3>c&&null==a._a[c];++c)a._a[c]=g[c]=e[c];for(;7>c;c++)a._a[c]=g[c]=null==a._a[c]?2===c?1:0:a._a[c];a._d=(a._useUTC?cb:bb).apply(null,g),null!=a._tzm&&a._d.setUTCMinutes(a._d.getUTCMinutes()+a._tzm)}}function U(a){var b;a._d||(b=y(a._i),a._a=[b.year,b.month,b.day,b.hour,b.minute,b.second,b.millisecond],T(a))}function V(a){var b=new Date;return a._useUTC?[b.getUTCFullYear(),b.getUTCMonth(),b.getUTCDate()]:[b.getFullYear(),b.getMonth(),b.getDate()]}function W(a){if(a._f===sb.ISO_8601)return void $(a);a._a=[],a._pf.empty=!0;var b,c,d,e,f,g=""+a._i,h=g.length,i=0;for(d=O(a._f,a._locale).match(Mb)||[],b=0;b<d.length;b++)e=d[b],c=(g.match(P(e,a))||[])[0],c&&(f=g.substr(0,g.indexOf(c)),f.length>0&&a._pf.unusedInput.push(f),g=g.slice(g.indexOf(c)+c.length),i+=c.length),oc[e]?(c?a._pf.empty=!1:a._pf.unusedTokens.push(e),R(e,c,a)):a._strict&&!c&&a._pf.unusedTokens.push(e);a._pf.charsLeftOver=h-i,g.length>0&&a._pf.unusedInput.push(g),a._isPm&&a._a[Cb]<12&&(a._a[Cb]+=12),a._isPm===!1&&12===a._a[Cb]&&(a._a[Cb]=0),T(a),F(a)}function X(a){return a.replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,function(a,b,c,d,e){return b||c||d||e})}function Y(a){return a.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}function Z(a){var b,c,e,f,g;if(0===a._f.length)return a._pf.invalidFormat=!0,void(a._d=new Date(0/0));for(f=0;f<a._f.length;f++)g=0,b=n({},a),b._pf=d(),b._f=a._f[f],W(b),G(b)&&(g+=b._pf.charsLeftOver,g+=10*b._pf.unusedTokens.length,b._pf.score=g,(null==e||e>g)&&(e=g,c=b));m(a,c||b)}function $(a){var b,c,d=a._i,e=cc.exec(d);if(e){for(a._pf.iso=!0,b=0,c=ec.length;c>b;b++)if(ec[b][1].exec(d)){a._f=ec[b][0]+(e[6]||" ");break}for(b=0,c=fc.length;c>b;b++)if(fc[b][1].exec(d)){a._f+=fc[b][0];break}d.match(Ub)&&(a._f+="Z"),W(a)}else a._isValid=!1}function _(a){$(a),a._isValid===!1&&(delete a._isValid,sb.createFromInputFallback(a))}function ab(b){var c,d=b._i;d===a?b._d=new Date:v(d)?b._d=new Date(+d):null!==(c=Jb.exec(d))?b._d=new Date(+c[1]):"string"==typeof d?_(b):u(d)?(b._a=d.slice(0),T(b)):"object"==typeof d?U(b):"number"==typeof d?b._d=new Date(d):sb.createFromInputFallback(b)}function bb(a,b,c,d,e,f,g){var h=new Date(a,b,c,d,e,f,g);return 1970>a&&h.setFullYear(a),h}function cb(a){var b=new Date(Date.UTC.apply(null,arguments));return 1970>a&&b.setUTCFullYear(a),b}function db(a,b){if("string"==typeof a)if(isNaN(a)){if(a=b.weekdaysParse(a),"number"!=typeof a)return null}else a=parseInt(a,10);return a}function eb(a,b,c,d,e){return e.relativeTime(b||1,!!c,a,d)}function fb(a,b,c){var d=sb.duration(a).abs(),e=xb(d.as("s")),f=xb(d.as("m")),g=xb(d.as("h")),h=xb(d.as("d")),i=xb(d.as("M")),j=xb(d.as("y")),k=e<lc.s&&["s",e]||1===f&&["m"]||f<lc.m&&["mm",f]||1===g&&["h"]||g<lc.h&&["hh",g]||1===h&&["d"]||h<lc.d&&["dd",h]||1===i&&["M"]||i<lc.M&&["MM",i]||1===j&&["y"]||["yy",j];return k[2]=b,k[3]=+a>0,k[4]=c,eb.apply({},k)}function gb(a,b,c){var d,e=c-b,f=c-a.day();return f>e&&(f-=7),e-7>f&&(f+=7),d=sb(a).add(f,"d"),{week:Math.ceil(d.dayOfYear()/7),year:d.year()}}function hb(a,b,c,d,e){var f,g,h=cb(a,0,1).getUTCDay();return h=0===h?7:h,c=null!=c?c:e,f=e-h+(h>d?7:0)-(e>h?7:0),g=7*(b-1)+(c-e)+f+1,{year:g>0?a:a-1,dayOfYear:g>0?g:D(a-1)+g}}function ib(b){var c=b._i,d=b._f;return b._locale=b._locale||sb.localeData(b._l),null===c||d===a&&""===c?sb.invalid({nullInput:!0}):("string"==typeof c&&(b._i=c=b._locale.preparse(c)),sb.isMoment(c)?new k(c,!0):(d?u(d)?Z(b):W(b):ab(b),new k(b)))}function jb(a,b){var c,d;if(1===b.length&&u(b[0])&&(b=b[0]),!b.length)return sb();for(c=b[0],d=1;d<b.length;++d)b[d][a](c)&&(c=b[d]);return c}function kb(a,b){var c;return"string"==typeof b&&(b=a.localeData().monthsParse(b),"number"!=typeof b)?a:(c=Math.min(a.date(),B(a.year(),b)),a._d["set"+(a._isUTC?"UTC":"")+"Month"](b,c),a)}function lb(a,b){return a._d["get"+(a._isUTC?"UTC":"")+b]()}function mb(a,b,c){return"Month"===b?kb(a,c):a._d["set"+(a._isUTC?"UTC":"")+b](c)}function nb(a,b){return function(c){return null!=c?(mb(this,a,c),sb.updateOffset(this,b),this):lb(this,a)}}function ob(a){return 400*a/146097}function pb(a){return 146097*a/400}function qb(a){sb.duration.fn[a]=function(){return this._data[a]}}function rb(a){"undefined"==typeof ender&&(tb=wb.moment,wb.moment=a?f("Accessing Moment through the global scope is deprecated, and will be removed in an upcoming release.",sb):sb)}for(var sb,tb,ub,vb="2.8.2",wb="undefined"!=typeof global?global:this,xb=Math.round,yb=Object.prototype.hasOwnProperty,zb=0,Ab=1,Bb=2,Cb=3,Db=4,Eb=5,Fb=6,Gb={},Hb=[],Ib="undefined"!=typeof module&&module.exports,Jb=/^\/?Date\((\-?\d+)/i,Kb=/(\-)?(?:(\d*)\.)?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?)?/,Lb=/^(-)?P(?:(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?|([0-9,.]*)W)$/,Mb=/(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Q|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,4}|X|zz?|ZZ?|.)/g,Nb=/(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g,Ob=/\d\d?/,Pb=/\d{1,3}/,Qb=/\d{1,4}/,Rb=/[+\-]?\d{1,6}/,Sb=/\d+/,Tb=/[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i,Ub=/Z|[\+\-]\d\d:?\d\d/gi,Vb=/T/i,Wb=/[\+\-]?\d+(\.\d{1,3})?/,Xb=/\d{1,2}/,Yb=/\d/,Zb=/\d\d/,$b=/\d{3}/,_b=/\d{4}/,ac=/[+-]?\d{6}/,bc=/[+-]?\d+/,cc=/^\s*(?:[+-]\d{6}|\d{4})-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,dc="YYYY-MM-DDTHH:mm:ssZ",ec=[["YYYYYY-MM-DD",/[+-]\d{6}-\d{2}-\d{2}/],["YYYY-MM-DD",/\d{4}-\d{2}-\d{2}/],["GGGG-[W]WW-E",/\d{4}-W\d{2}-\d/],["GGGG-[W]WW",/\d{4}-W\d{2}/],["YYYY-DDD",/\d{4}-\d{3}/]],fc=[["HH:mm:ss.SSSS",/(T| )\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss",/(T| )\d\d:\d\d:\d\d/],["HH:mm",/(T| )\d\d:\d\d/],["HH",/(T| )\d\d/]],gc=/([\+\-]|\d\d)/gi,hc=("Date|Hours|Minutes|Seconds|Milliseconds".split("|"),{Milliseconds:1,Seconds:1e3,Minutes:6e4,Hours:36e5,Days:864e5,Months:2592e6,Years:31536e6}),ic={ms:"millisecond",s:"second",m:"minute",h:"hour",d:"day",D:"date",w:"week",W:"isoWeek",M:"month",Q:"quarter",y:"year",DDD:"dayOfYear",e:"weekday",E:"isoWeekday",gg:"weekYear",GG:"isoWeekYear"},jc={dayofyear:"dayOfYear",isoweekday:"isoWeekday",isoweek:"isoWeek",weekyear:"weekYear",isoweekyear:"isoWeekYear"},kc={},lc={s:45,m:45,h:22,d:26,M:11},mc="DDD w W M D d".split(" "),nc="M D H h m s w W".split(" "),oc={M:function(){return this.month()+1},MMM:function(a){return this.localeData().monthsShort(this,a)},MMMM:function(a){return this.localeData().months(this,a)},D:function(){return this.date()},DDD:function(){return this.dayOfYear()},d:function(){return this.day()},dd:function(a){return this.localeData().weekdaysMin(this,a)},ddd:function(a){return this.localeData().weekdaysShort(this,a)},dddd:function(a){return this.localeData().weekdays(this,a)},w:function(){return this.week()},W:function(){return this.isoWeek()},YY:function(){return p(this.year()%100,2)},YYYY:function(){return p(this.year(),4)},YYYYY:function(){return p(this.year(),5)},YYYYYY:function(){var a=this.year(),b=a>=0?"+":"-";return b+p(Math.abs(a),6)},gg:function(){return p(this.weekYear()%100,2)},gggg:function(){return p(this.weekYear(),4)},ggggg:function(){return p(this.weekYear(),5)},GG:function(){return p(this.isoWeekYear()%100,2)},GGGG:function(){return p(this.isoWeekYear(),4)},GGGGG:function(){return p(this.isoWeekYear(),5)},e:function(){return this.weekday()},E:function(){return this.isoWeekday()},a:function(){return this.localeData().meridiem(this.hours(),this.minutes(),!0)},A:function(){return this.localeData().meridiem(this.hours(),this.minutes(),!1)},H:function(){return this.hours()},h:function(){return this.hours()%12||12},m:function(){return this.minutes()},s:function(){return this.seconds()},S:function(){return A(this.milliseconds()/100)},SS:function(){return p(A(this.milliseconds()/10),2)},SSS:function(){return p(this.milliseconds(),3)},SSSS:function(){return p(this.milliseconds(),3)},Z:function(){var a=-this.zone(),b="+";return 0>a&&(a=-a,b="-"),b+p(A(a/60),2)+":"+p(A(a)%60,2)},ZZ:function(){var a=-this.zone(),b="+";return 0>a&&(a=-a,b="-"),b+p(A(a/60),2)+p(A(a)%60,2)},z:function(){return this.zoneAbbr()},zz:function(){return this.zoneName()},X:function(){return this.unix()},Q:function(){return this.quarter()}},pc={},qc=["months","monthsShort","weekdays","weekdaysShort","weekdaysMin"];mc.length;)ub=mc.pop(),oc[ub+"o"]=i(oc[ub],ub);for(;nc.length;)ub=nc.pop(),oc[ub+ub]=h(oc[ub],2);oc.DDDD=h(oc.DDD,3),m(j.prototype,{set:function(a){var b,c;for(c in a)b=a[c],"function"==typeof b?this[c]=b:this["_"+c]=b},_months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),months:function(a){return this._months[a.month()]},_monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),monthsShort:function(a){return this._monthsShort[a.month()]},monthsParse:function(a){var b,c,d;for(this._monthsParse||(this._monthsParse=[]),b=0;12>b;b++)if(this._monthsParse[b]||(c=sb.utc([2e3,b]),d="^"+this.months(c,"")+"|^"+this.monthsShort(c,""),this._monthsParse[b]=new RegExp(d.replace(".",""),"i")),this._monthsParse[b].test(a))return b},_weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdays:function(a){return this._weekdays[a.day()]},_weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysShort:function(a){return this._weekdaysShort[a.day()]},_weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),weekdaysMin:function(a){return this._weekdaysMin[a.day()]},weekdaysParse:function(a){var b,c,d;for(this._weekdaysParse||(this._weekdaysParse=[]),b=0;7>b;b++)if(this._weekdaysParse[b]||(c=sb([2e3,1]).day(b),d="^"+this.weekdays(c,"")+"|^"+this.weekdaysShort(c,"")+"|^"+this.weekdaysMin(c,""),this._weekdaysParse[b]=new RegExp(d.replace(".",""),"i")),this._weekdaysParse[b].test(a))return b},_longDateFormat:{LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY LT",LLLL:"dddd, MMMM D, YYYY LT"},longDateFormat:function(a){var b=this._longDateFormat[a];return!b&&this._longDateFormat[a.toUpperCase()]&&(b=this._longDateFormat[a.toUpperCase()].replace(/MMMM|MM|DD|dddd/g,function(a){return a.slice(1)}),this._longDateFormat[a]=b),b},isPM:function(a){return"p"===(a+"").toLowerCase().charAt(0)},_meridiemParse:/[ap]\.?m?\.?/i,meridiem:function(a,b,c){return a>11?c?"pm":"PM":c?"am":"AM"},_calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},calendar:function(a,b){var c=this._calendar[a];return"function"==typeof c?c.apply(b):c},_relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},relativeTime:function(a,b,c,d){var e=this._relativeTime[c];return"function"==typeof e?e(a,b,c,d):e.replace(/%d/i,a)},pastFuture:function(a,b){var c=this._relativeTime[a>0?"future":"past"];return"function"==typeof c?c(b):c.replace(/%s/i,b)},ordinal:function(a){return this._ordinal.replace("%d",a)},_ordinal:"%d",preparse:function(a){return a},postformat:function(a){return a},week:function(a){return gb(a,this._week.dow,this._week.doy).week},_week:{dow:0,doy:6},_invalidDate:"Invalid date",invalidDate:function(){return this._invalidDate}}),sb=function(b,c,e,f){var g;return"boolean"==typeof e&&(f=e,e=a),g={},g._isAMomentObject=!0,g._i=b,g._f=c,g._l=e,g._strict=f,g._isUTC=!1,g._pf=d(),ib(g)},sb.suppressDeprecationWarnings=!1,sb.createFromInputFallback=f("moment construction falls back to js Date. This is discouraged and will be removed in upcoming major release. Please refer to https://github.com/moment/moment/issues/1407 for more info.",function(a){a._d=new Date(a._i)}),sb.min=function(){var a=[].slice.call(arguments,0);return jb("isBefore",a)},sb.max=function(){var a=[].slice.call(arguments,0);return jb("isAfter",a)},sb.utc=function(b,c,e,f){var g;return"boolean"==typeof e&&(f=e,e=a),g={},g._isAMomentObject=!0,g._useUTC=!0,g._isUTC=!0,g._l=e,g._i=b,g._f=c,g._strict=f,g._pf=d(),ib(g).utc()},sb.unix=function(a){return sb(1e3*a)},sb.duration=function(a,b){var d,e,f,g,h=a,i=null;return sb.isDuration(a)?h={ms:a._milliseconds,d:a._days,M:a._months}:"number"==typeof a?(h={},b?h[b]=a:h.milliseconds=a):(i=Kb.exec(a))?(d="-"===i[1]?-1:1,h={y:0,d:A(i[Bb])*d,h:A(i[Cb])*d,m:A(i[Db])*d,s:A(i[Eb])*d,ms:A(i[Fb])*d}):(i=Lb.exec(a))?(d="-"===i[1]?-1:1,f=function(a){var b=a&&parseFloat(a.replace(",","."));return(isNaN(b)?0:b)*d},h={y:f(i[2]),M:f(i[3]),d:f(i[4]),h:f(i[5]),m:f(i[6]),s:f(i[7]),w:f(i[8])}):"object"==typeof h&&("from"in h||"to"in h)&&(g=r(sb(h.from),sb(h.to)),h={},h.ms=g.milliseconds,h.M=g.months),e=new l(h),sb.isDuration(a)&&c(a,"_locale")&&(e._locale=a._locale),e},sb.version=vb,sb.defaultFormat=dc,sb.ISO_8601=function(){},sb.momentProperties=Hb,sb.updateOffset=function(){},sb.relativeTimeThreshold=function(b,c){return lc[b]===a?!1:c===a?lc[b]:(lc[b]=c,!0)},sb.lang=f("moment.lang is deprecated. Use moment.locale instead.",function(a,b){return sb.locale(a,b)}),sb.locale=function(a,b){var c;return a&&(c="undefined"!=typeof b?sb.defineLocale(a,b):sb.localeData(a),c&&(sb.duration._locale=sb._locale=c)),sb._locale._abbr},sb.defineLocale=function(a,b){return null!==b?(b.abbr=a,Gb[a]||(Gb[a]=new j),Gb[a].set(b),sb.locale(a),Gb[a]):(delete Gb[a],null)},sb.langData=f("moment.langData is deprecated. Use moment.localeData instead.",function(a){return sb.localeData(a)}),sb.localeData=function(a){var b;if(a&&a._locale&&a._locale._abbr&&(a=a._locale._abbr),!a)return sb._locale;if(!u(a)){if(b=J(a))return b;a=[a]}return I(a)},sb.isMoment=function(a){return a instanceof k||null!=a&&c(a,"_isAMomentObject")},sb.isDuration=function(a){return a instanceof l};for(ub=qc.length-1;ub>=0;--ub)z(qc[ub]);sb.normalizeUnits=function(a){return x(a)},sb.invalid=function(a){var b=sb.utc(0/0);return null!=a?m(b._pf,a):b._pf.userInvalidated=!0,b},sb.parseZone=function(){return sb.apply(null,arguments).parseZone()},sb.parseTwoDigitYear=function(a){return A(a)+(A(a)>68?1900:2e3)},m(sb.fn=k.prototype,{clone:function(){return sb(this)},valueOf:function(){return+this._d+6e4*(this._offset||0)},unix:function(){return Math.floor(+this/1e3)},toString:function(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},toDate:function(){return this._offset?new Date(+this):this._d},toISOString:function(){var a=sb(this).utc();return 0<a.year()&&a.year()<=9999?N(a,"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]"):N(a,"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]")},toArray:function(){var a=this;return[a.year(),a.month(),a.date(),a.hours(),a.minutes(),a.seconds(),a.milliseconds()]},isValid:function(){return G(this)},isDSTShifted:function(){return this._a?this.isValid()&&w(this._a,(this._isUTC?sb.utc(this._a):sb(this._a)).toArray())>0:!1},parsingFlags:function(){return m({},this._pf)},invalidAt:function(){return this._pf.overflow},utc:function(a){return this.zone(0,a)},local:function(a){return this._isUTC&&(this.zone(0,a),this._isUTC=!1,a&&this.add(this._d.getTimezoneOffset(),"m")),this},format:function(a){var b=N(this,a||sb.defaultFormat);return this.localeData().postformat(b)},add:s(1,"add"),subtract:s(-1,"subtract"),diff:function(a,b,c){var d,e,f=K(a,this),g=6e4*(this.zone()-f.zone());return b=x(b),"year"===b||"month"===b?(d=432e5*(this.daysInMonth()+f.daysInMonth()),e=12*(this.year()-f.year())+(this.month()-f.month()),e+=(this-sb(this).startOf("month")-(f-sb(f).startOf("month")))/d,e-=6e4*(this.zone()-sb(this).startOf("month").zone()-(f.zone()-sb(f).startOf("month").zone()))/d,"year"===b&&(e/=12)):(d=this-f,e="second"===b?d/1e3:"minute"===b?d/6e4:"hour"===b?d/36e5:"day"===b?(d-g)/864e5:"week"===b?(d-g)/6048e5:d),c?e:o(e)},from:function(a,b){return sb.duration({to:this,from:a}).locale(this.locale()).humanize(!b)},fromNow:function(a){return this.from(sb(),a)},calendar:function(a){var b=a||sb(),c=K(b,this).startOf("day"),d=this.diff(c,"days",!0),e=-6>d?"sameElse":-1>d?"lastWeek":0>d?"lastDay":1>d?"sameDay":2>d?"nextDay":7>d?"nextWeek":"sameElse";return this.format(this.localeData().calendar(e,this))},isLeapYear:function(){return E(this.year())},isDST:function(){return this.zone()<this.clone().month(0).zone()||this.zone()<this.clone().month(5).zone()},day:function(a){var b=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=a?(a=db(a,this.localeData()),this.add(a-b,"d")):b},month:nb("Month",!0),startOf:function(a){switch(a=x(a)){case"year":this.month(0);case"quarter":case"month":this.date(1);case"week":case"isoWeek":case"day":this.hours(0);case"hour":this.minutes(0);case"minute":this.seconds(0);case"second":this.milliseconds(0)}return"week"===a?this.weekday(0):"isoWeek"===a&&this.isoWeekday(1),"quarter"===a&&this.month(3*Math.floor(this.month()/3)),this},endOf:function(a){return a=x(a),this.startOf(a).add(1,"isoWeek"===a?"week":a).subtract(1,"ms")},isAfter:function(a,b){return b="undefined"!=typeof b?b:"millisecond",+this.clone().startOf(b)>+sb(a).startOf(b)},isBefore:function(a,b){return b="undefined"!=typeof b?b:"millisecond",+this.clone().startOf(b)<+sb(a).startOf(b)},isSame:function(a,b){return b=b||"ms",+this.clone().startOf(b)===+K(a,this).startOf(b)},min:f("moment().min is deprecated, use moment.min instead. https://github.com/moment/moment/issues/1548",function(a){return a=sb.apply(null,arguments),this>a?this:a}),max:f("moment().max is deprecated, use moment.max instead. https://github.com/moment/moment/issues/1548",function(a){return a=sb.apply(null,arguments),a>this?this:a}),zone:function(a,b){var c,d=this._offset||0;return null==a?this._isUTC?d:this._d.getTimezoneOffset():("string"==typeof a&&(a=Q(a)),Math.abs(a)<16&&(a=60*a),!this._isUTC&&b&&(c=this._d.getTimezoneOffset()),this._offset=a,this._isUTC=!0,null!=c&&this.subtract(c,"m"),d!==a&&(!b||this._changeInProgress?t(this,sb.duration(d-a,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,sb.updateOffset(this,!0),this._changeInProgress=null)),this)},zoneAbbr:function(){return this._isUTC?"UTC":""},zoneName:function(){return this._isUTC?"Coordinated Universal Time":""},parseZone:function(){return this._tzm?this.zone(this._tzm):"string"==typeof this._i&&this.zone(this._i),this},hasAlignedHourOffset:function(a){return a=a?sb(a).zone():0,(this.zone()-a)%60===0},daysInMonth:function(){return B(this.year(),this.month())},dayOfYear:function(a){var b=xb((sb(this).startOf("day")-sb(this).startOf("year"))/864e5)+1;return null==a?b:this.add(a-b,"d")},quarter:function(a){return null==a?Math.ceil((this.month()+1)/3):this.month(3*(a-1)+this.month()%3)},weekYear:function(a){var b=gb(this,this.localeData()._week.dow,this.localeData()._week.doy).year;return null==a?b:this.add(a-b,"y")},isoWeekYear:function(a){var b=gb(this,1,4).year;return null==a?b:this.add(a-b,"y")},week:function(a){var b=this.localeData().week(this);return null==a?b:this.add(7*(a-b),"d")},isoWeek:function(a){var b=gb(this,1,4).week;return null==a?b:this.add(7*(a-b),"d")},weekday:function(a){var b=(this.day()+7-this.localeData()._week.dow)%7;return null==a?b:this.add(a-b,"d")},isoWeekday:function(a){return null==a?this.day()||7:this.day(this.day()%7?a:a-7)},isoWeeksInYear:function(){return C(this.year(),1,4)},weeksInYear:function(){var a=this.localeData()._week;return C(this.year(),a.dow,a.doy)},get:function(a){return a=x(a),this[a]()},set:function(a,b){return a=x(a),"function"==typeof this[a]&&this[a](b),this},locale:function(b){return b===a?this._locale._abbr:(this._locale=sb.localeData(b),this)},lang:f("moment().lang() is deprecated. Use moment().localeData() instead.",function(b){return b===a?this.localeData():(this._locale=sb.localeData(b),this)}),localeData:function(){return this._locale}}),sb.fn.millisecond=sb.fn.milliseconds=nb("Milliseconds",!1),sb.fn.second=sb.fn.seconds=nb("Seconds",!1),sb.fn.minute=sb.fn.minutes=nb("Minutes",!1),sb.fn.hour=sb.fn.hours=nb("Hours",!0),sb.fn.date=nb("Date",!0),sb.fn.dates=f("dates accessor is deprecated. Use date instead.",nb("Date",!0)),sb.fn.year=nb("FullYear",!0),sb.fn.years=f("years accessor is deprecated. Use year instead.",nb("FullYear",!0)),sb.fn.days=sb.fn.day,sb.fn.months=sb.fn.month,sb.fn.weeks=sb.fn.week,sb.fn.isoWeeks=sb.fn.isoWeek,sb.fn.quarters=sb.fn.quarter,sb.fn.toJSON=sb.fn.toISOString,m(sb.duration.fn=l.prototype,{_bubble:function(){var a,b,c,d=this._milliseconds,e=this._days,f=this._months,g=this._data,h=0;g.milliseconds=d%1e3,a=o(d/1e3),g.seconds=a%60,b=o(a/60),g.minutes=b%60,c=o(b/60),g.hours=c%24,e+=o(c/24),h=o(ob(e)),e-=o(pb(h)),f+=o(e/30),e%=30,h+=o(f/12),f%=12,g.days=e,g.months=f,g.years=h},abs:function(){return this._milliseconds=Math.abs(this._milliseconds),this._days=Math.abs(this._days),this._months=Math.abs(this._months),this._data.milliseconds=Math.abs(this._data.milliseconds),this._data.seconds=Math.abs(this._data.seconds),this._data.minutes=Math.abs(this._data.minutes),this._data.hours=Math.abs(this._data.hours),this._data.months=Math.abs(this._data.months),this._data.years=Math.abs(this._data.years),this},weeks:function(){return o(this.days()/7)},valueOf:function(){return this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*A(this._months/12)},humanize:function(a){var b=fb(this,!a,this.localeData());return a&&(b=this.localeData().pastFuture(+this,b)),this.localeData().postformat(b)},add:function(a,b){var c=sb.duration(a,b);return this._milliseconds+=c._milliseconds,this._days+=c._days,this._months+=c._months,this._bubble(),this},subtract:function(a,b){var c=sb.duration(a,b);return this._milliseconds-=c._milliseconds,this._days-=c._days,this._months-=c._months,this._bubble(),this},get:function(a){return a=x(a),this[a.toLowerCase()+"s"]()},as:function(a){var b,c;if(a=x(a),b=this._days+this._milliseconds/864e5,"month"===a||"year"===a)return c=this._months+12*ob(b),"month"===a?c:c/12;switch(b+=pb(this._months/12),a){case"week":return b/7;case"day":return b;case"hour":return 24*b;case"minute":return 24*b*60;case"second":return 24*b*60*60;case"millisecond":return 24*b*60*60*1e3;default:throw new Error("Unknown unit "+a)}},lang:sb.fn.lang,locale:sb.fn.locale,toIsoString:f("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",function(){return this.toISOString()}),toISOString:function(){var a=Math.abs(this.years()),b=Math.abs(this.months()),c=Math.abs(this.days()),d=Math.abs(this.hours()),e=Math.abs(this.minutes()),f=Math.abs(this.seconds()+this.milliseconds()/1e3);return this.asSeconds()?(this.asSeconds()<0?"-":"")+"P"+(a?a+"Y":"")+(b?b+"M":"")+(c?c+"D":"")+(d||e||f?"T":"")+(d?d+"H":"")+(e?e+"M":"")+(f?f+"S":""):"P0D"},localeData:function(){return this._locale}}),sb.duration.fn.toString=sb.duration.fn.toISOString;for(ub in hc)c(hc,ub)&&qb(ub.toLowerCase());sb.duration.fn.asMilliseconds=function(){return this.as("ms")},sb.duration.fn.asSeconds=function(){return this.as("s")},sb.duration.fn.asMinutes=function(){return this.as("m")},sb.duration.fn.asHours=function(){return this.as("h")},sb.duration.fn.asDays=function(){return this.as("d")},sb.duration.fn.asWeeks=function(){return this.as("weeks")},sb.duration.fn.asMonths=function(){return this.as("M")},sb.duration.fn.asYears=function(){return this.as("y")},sb.locale("en",{ordinal:function(a){var b=a%10,c=1===A(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c}}),function(a){a(sb)}(function(a){return a.defineLocale("af",{months:"Januarie_Februarie_Maart_April_Mei_Junie_Julie_Augustus_September_Oktober_November_Desember".split("_"),monthsShort:"Jan_Feb_Mar_Apr_Mei_Jun_Jul_Aug_Sep_Okt_Nov_Des".split("_"),weekdays:"Sondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrydag_Saterdag".split("_"),weekdaysShort:"Son_Maa_Din_Woe_Don_Vry_Sat".split("_"),weekdaysMin:"So_Ma_Di_Wo_Do_Vr_Sa".split("_"),meridiem:function(a,b,c){return 12>a?c?"vm":"VM":c?"nm":"NM"},longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Vandag om] LT",nextDay:"[Môre om] LT",nextWeek:"dddd [om] LT",lastDay:"[Gister om] LT",lastWeek:"[Laas] dddd [om] LT",sameElse:"L"},relativeTime:{future:"oor %s",past:"%s gelede",s:"'n paar sekondes",m:"'n minuut",mm:"%d minute",h:"'n uur",hh:"%d ure",d:"'n dag",dd:"%d dae",M:"'n maand",MM:"%d maande",y:"'n jaar",yy:"%d jaar"},ordinal:function(a){return a+(1===a||8===a||a>=20?"ste":"de")
+},week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){return a.defineLocale("ar-ma",{months:"يناير_�براير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر".split("_"),monthsShort:"يناير_�براير_مارس_أبريل_ماي_يونيو_يوليوز_غشت_شتنبر_أكتوبر_نونبر_دجنبر".split("_"),weekdays:"الأحد_الإتنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),weekdaysShort:"احد_اتنين_ثلاثاء_اربعاء_خميس_جمعة_سبت".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[اليوم على الساعة] LT",nextDay:"[غدا على الساعة] LT",nextWeek:"dddd [على الساعة] LT",lastDay:"[أمس على الساعة] LT",lastWeek:"dddd [على الساعة] LT",sameElse:"L"},relativeTime:{future:"�ي %s",past:"منذ %s",s:"ثوان",m:"دقيقة",mm:"%d دقائق",h:"ساعة",hh:"%d ساعات",d:"يوم",dd:"%d أيام",M:"شهر",MM:"%d أشهر",y:"سنة",yy:"%d سنوات"},week:{dow:6,doy:12}})}),function(a){a(sb)}(function(a){var b={1:"١",2:"٢",3:"٣",4:"٤",5:"٥",6:"٦",7:"٧",8:"٨",9:"٩",0:"٠"},c={"١":"1","٢":"2","٣":"3","٤":"4","٥":"5","٦":"6","٧":"7","٨":"8","٩":"9","٠":"0"};return a.defineLocale("ar-sa",{months:"يناير_�براير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نو�مبر_ديسمبر".split("_"),monthsShort:"يناير_�براير_مارس_أبريل_مايو_يونيو_يوليو_أغسطس_سبتمبر_أكتوبر_نو�مبر_ديسمبر".split("_"),weekdays:"الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),weekdaysShort:"أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},meridiem:function(a){return 12>a?"ص":"م"},calendar:{sameDay:"[اليوم على الساعة] LT",nextDay:"[غدا على الساعة] LT",nextWeek:"dddd [على الساعة] LT",lastDay:"[أمس على الساعة] LT",lastWeek:"dddd [على الساعة] LT",sameElse:"L"},relativeTime:{future:"�ي %s",past:"منذ %s",s:"ثوان",m:"دقيقة",mm:"%d دقائق",h:"ساعة",hh:"%d ساعات",d:"يوم",dd:"%d أيام",M:"شهر",MM:"%d أشهر",y:"سنة",yy:"%d سنوات"},preparse:function(a){return a.replace(/[۰-۹]/g,function(a){return c[a]}).replace(/،/g,",")},postformat:function(a){return a.replace(/\d/g,function(a){return b[a]}).replace(/,/g,"،")},week:{dow:6,doy:12}})}),function(a){a(sb)}(function(a){var b={1:"١",2:"٢",3:"٣",4:"٤",5:"٥",6:"٦",7:"٧",8:"٨",9:"٩",0:"٠"},c={"١":"1","٢":"2","٣":"3","٤":"4","٥":"5","٦":"6","٧":"7","٨":"8","٩":"9","٠":"0"};return a.defineLocale("ar",{months:"يناير/ كانون الثاني_�براير/ شباط_مارس/ آذار_أبريل/ نيسان_مايو/ أيار_يونيو/ حزيران_يوليو/ تموز_أغسطس/ آب_سبتمبر/ أيلول_أكتوبر/ تشرين الأول_نو�مبر/ تشرين الثاني_ديسمبر/ كانون الأول".split("_"),monthsShort:"يناير/ كانون الثاني_�براير/ شباط_مارس/ آذار_أبريل/ نيسان_مايو/ أيار_يونيو/ حزيران_يوليو/ تموز_أغسطس/ آب_سبتمبر/ أيلول_أكتوبر/ تشرين الأول_نو�مبر/ تشرين الثاني_ديسمبر/ كانون الأول".split("_"),weekdays:"الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت".split("_"),weekdaysShort:"أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت".split("_"),weekdaysMin:"ح_ن_ث_ر_خ_ج_س".split("_"),longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},meridiem:function(a){return 12>a?"ص":"م"},calendar:{sameDay:"[اليوم على الساعة] LT",nextDay:"[غدا على الساعة] LT",nextWeek:"dddd [على الساعة] LT",lastDay:"[أمس على الساعة] LT",lastWeek:"dddd [على الساعة] LT",sameElse:"L"},relativeTime:{future:"�ي %s",past:"منذ %s",s:"ثوان",m:"دقيقة",mm:"%d دقائق",h:"ساعة",hh:"%d ساعات",d:"يوم",dd:"%d أيام",M:"شهر",MM:"%d أشهر",y:"سنة",yy:"%d سنوات"},preparse:function(a){return a.replace(/[۰-۹]/g,function(a){return c[a]}).replace(/،/g,",")},postformat:function(a){return a.replace(/\d/g,function(a){return b[a]}).replace(/,/g,"،")},week:{dow:6,doy:12}})}),function(a){a(sb)}(function(a){var b={1:"-inci",5:"-inci",8:"-inci",70:"-inci",80:"-inci",2:"-nci",7:"-nci",20:"-nci",50:"-nci",3:"-üncü",4:"-üncü",100:"-üncü",6:"-ncı",9:"-uncu",10:"-uncu",30:"-uncu",60:"-ıncı",90:"-ıncı"};return a.defineLocale("az",{months:"yanvar_fevral_mart_aprel_may_iyun_iyul_avqust_sentyabr_oktyabr_noyabr_dekabr".split("_"),monthsShort:"yan_fev_mar_apr_may_iyn_iyl_avq_sen_okt_noy_dek".split("_"),weekdays:"Bazar_Bazar ertəsi_Çərşənbə axşamı_Çərşənbə_Cümə axşamı_Cümə_Şənbə".split("_"),weekdaysShort:"Baz_BzE_ÇAx_Çər_CAx_Cüm_Şən".split("_"),weekdaysMin:"Bz_BE_ÇA_Çə_CA_Cü_Şə".split("_"),longDateFormat:{LT:"HH:mm",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[bugün saat] LT",nextDay:"[sabah saat] LT",nextWeek:"[gələn həftə] dddd [saat] LT",lastDay:"[dünən] LT",lastWeek:"[keçən həftə] dddd [saat] LT",sameElse:"L"},relativeTime:{future:"%s sonra",past:"%s əvvəl",s:"birneçə saniyyə",m:"bir dəqiqə",mm:"%d dəqiqə",h:"bir saat",hh:"%d saat",d:"bir gün",dd:"%d gün",M:"bir ay",MM:"%d ay",y:"bir il",yy:"%d il"},meridiem:function(a){return 4>a?"gecə":12>a?"səhər":17>a?"gündüz":"axşam"},ordinal:function(a){if(0===a)return a+"-ıncı";var c=a%10,d=a%100-c,e=a>=100?100:null;return a+(b[c]||b[d]||b[e])},week:{dow:1,doy:7}})}),function(a){a(sb)}(function(a){function b(a,b){var c=a.split("_");return b%10===1&&b%100!==11?c[0]:b%10>=2&&4>=b%10&&(10>b%100||b%100>=20)?c[1]:c[2]}function c(a,c,d){var e={mm:c?"хвіліна_хвіліны_хвілін":"хвіліну_хвіліны_хвілін",hh:c?"гадзіна_гадзіны_гадзін":"гадзіну_гадзіны_гадзін",dd:"дзень_дні_дзён",MM:"ме��ц_ме��цы_ме��цаў",yy:"год_гады_гадоў"};return"m"===d?c?"хвіліна":"хвіліну":"h"===d?c?"гадзіна":"гадзіну":a+" "+b(e[d],+a)}function d(a,b){var c={nominative:"�тудзень_люты_�акавік_кра�авік_травень_ч�рвень_ліпень_жнівень_вера�ень_ка�трычнік_лі�тапад_�нежань".split("_"),accusative:"�тудзен�_лютага_�акавіка_кра�авіка_траўн�_ч�рвен�_ліпен�_жніўн�_вера�н�_ка�трычніка_лі�тапада_�нежн�".split("_")},d=/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/.test(b)?"accusative":"nominative";return c[d][a.month()]}function e(a,b){var c={nominative:"н�дзел�_пан�дзелак_аўторак_�ерада_чацвер_п�тніца_�убота".split("_"),accusative:"н�дзелю_пан�дзелак_аўторак_�ераду_чацвер_п�тніцу_�уботу".split("_")},d=/\[ ?[Вв] ?(?:мінулую|на�тупную)? ?\] ?dddd/.test(b)?"accusative":"nominative";return c[d][a.day()]}return a.defineLocale("be",{months:d,monthsShort:"�туд_лют_�ак_кра�_трав_ч�рв_ліп_жнів_вер_ка�т_лі�т_�неж".split("_"),weekdays:e,weekdaysShort:"нд_пн_ат_�р_чц_пт_�б".split("_"),weekdaysMin:"нд_пн_ат_�р_чц_пт_�б".split("_"),longDateFormat:{LT:"HH:mm",L:"DD.MM.YYYY",LL:"D MMMM YYYY г.",LLL:"D MMMM YYYY г., LT",LLLL:"dddd, D MMMM YYYY г., LT"},calendar:{sameDay:"[Сённ� ў] LT",nextDay:"[Заўтра ў] LT",lastDay:"[Учора ў] LT",nextWeek:function(){return"[У] dddd [ў] LT"},lastWeek:function(){switch(this.day()){case 0:case 3:case 5:case 6:return"[У мінулую] dddd [ў] LT";case 1:case 2:case 4:return"[У мінулы] dddd [ў] LT"}},sameElse:"L"},relativeTime:{future:"праз %s",past:"%s таму",s:"некалькі �екунд",m:c,mm:c,h:c,hh:c,d:"дзень",dd:c,M:"ме��ц",MM:c,y:"год",yy:c},meridiem:function(a){return 4>a?"ночы":12>a?"раніцы":17>a?"дн�":"вечара"},ordinal:function(a,b){switch(b){case"M":case"d":case"DDD":case"w":case"W":return a%10!==2&&a%10!==3||a%100===12||a%100===13?a+"-ы":a+"-і";case"D":return a+"-га";default:return a}},week:{dow:1,doy:7}})}),function(a){a(sb)}(function(a){return a.defineLocale("bg",{months:"�нуари_февруари_март_април_май_юни_юли_авгу�т_�ептември_октомври_ноември_декември".split("_"),monthsShort:"�нр_фев_мар_апр_май_юни_юли_авг_�еп_окт_ное_дек".split("_"),weekdays:"недел�_понеделник_вторник_�р�да_четвъртък_петък_�ъбота".split("_"),weekdaysShort:"нед_пон_вто_�р�_чет_пет_�ъб".split("_"),weekdaysMin:"нд_пн_вт_�р_чт_пт_�б".split("_"),longDateFormat:{LT:"H:mm",L:"D.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Дне� в] LT",nextDay:"[Утре в] LT",nextWeek:"dddd [в] LT",lastDay:"[Вчера в] LT",lastWeek:function(){switch(this.day()){case 0:case 3:case 6:return"[В изминалата] dddd [в] LT";case 1:case 2:case 4:case 5:return"[В изминали�] dddd [в] LT"}},sameElse:"L"},relativeTime:{future:"�лед %s",past:"преди %s",s:"н�колко �екунди",m:"минута",mm:"%d минути",h:"ча�",hh:"%d ча�а",d:"ден",dd:"%d дни",M:"ме�ец",MM:"%d ме�еца",y:"година",yy:"%d години"},ordinal:function(a){var b=a%10,c=a%100;return 0===a?a+"-ев":0===c?a+"-ен":c>10&&20>c?a+"-ти":1===b?a+"-ви":2===b?a+"-ри":7===b||8===b?a+"-ми":a+"-ти"},week:{dow:1,doy:7}})}),function(a){a(sb)}(function(a){var b={1:"১",2:"২",3:"৩",4:"৪",5:"৫",6:"৬",7:"৭",8:"৮",9:"৯",0:"০"},c={"১":"1","২":"2","৩":"3","৪":"4","৫":"5","৬":"6","৭":"7","৮":"8","৯":"9","০":"0"};return a.defineLocale("bn",{months:"জান�য়ারী_ফেব�য়ারী_মার�চ_�প�রিল_মে_জ�ন_জ�লাই_অগাস�ট_সেপ�টেম�বর_অক�টোবর_নভেম�বর_ডিসেম�বর".split("_"),monthsShort:"জান�_ফেব_মার�চ_�পর_মে_জ�ন_জ�ল_অগ_সেপ�ট_অক�টো_নভ_ডিসেম�".split("_"),weekdays:"রবিবার_সোমবার_মঙ�গলবার_ব�ধবার_বৃহস�পত�তিবার_শ�ক�র�বার_শনিবার".split("_"),weekdaysShort:"রবি_সোম_মঙ�গল_ব�ধ_বৃহস�পত�তি_শ�ক�র�_শনি".split("_"),weekdaysMin:"রব_সম_মঙ�গ_ব�_ব�রিহ_শ�_শনি".split("_"),longDateFormat:{LT:"A h:mm সময়",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, LT",LLLL:"dddd, D MMMM YYYY, LT"},calendar:{sameDay:"[আজ] LT",nextDay:"[আগামীকাল] LT",nextWeek:"dddd, LT",lastDay:"[গতকাল] LT",lastWeek:"[গত] dddd, LT",sameElse:"L"},relativeTime:{future:"%s পরে",past:"%s আগে",s:"ক�ক সেকেন�ড",m:"�ক মিনিট",mm:"%d মিনিট",h:"�ক ঘন�টা",hh:"%d ঘন�টা",d:"�ক দিন",dd:"%d দিন",M:"�ক মাস",MM:"%d মাস",y:"�ক বছর",yy:"%d বছর"},preparse:function(a){return a.replace(/[১২৩৪৫৬৭৮৯০]/g,function(a){return c[a]})},postformat:function(a){return a.replace(/\d/g,function(a){return b[a]})},meridiem:function(a){return 4>a?"রাত":10>a?"শকাল":17>a?"দ�প�র":20>a?"বিকেল":"রাত"},week:{dow:0,doy:6}})}),function(a){a(sb)}(function(a){var b={1:"༡",2:"༢",3:"༣",4:"༤",5:"༥",6:"༦",7:"༧",8:"༨",9:"༩",0:"༠"},c={"༡":"1","༢":"2","༣":"3","༤":"4","༥":"5","༦":"6","༧":"7","༨":"8","༩":"9","༠":"0"};return a.defineLocale("bo",{months:"ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ".split("_"),monthsShort:"ཟླ་བ་དང་པོ_ཟླ་བ་གཉིས་པ_ཟླ་བ་གསུམ་པ_ཟླ་བ་བཞི་པ_ཟླ་བ་ལྔ་པ_ཟླ་བ་དྲུག་པ_ཟླ་བ་བདུན་པ_ཟླ་བ་བརྒྱད་པ_ཟླ་བ་དགུ་པ_ཟླ་བ་བཅུ་པ_ཟླ་བ་བཅུ་གཅིག་པ_ཟླ་བ་བཅུ་གཉིས་པ".split("_"),weekdays:"གཟའ་ཉི་མ་_གཟའ་ཟླ་བ་_གཟའ་མིག་དམར་_གཟའ་ལྷག་པ་_གཟའ་ཕུར་བུ_གཟའ་པ་སངས་_གཟའ་སྤེན་པ་".split("_"),weekdaysShort:"ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་".split("_"),weekdaysMin:"ཉི་མ་_ཟླ་བ་_མིག་དམར་_ལྷག་པ་_ཕུར་བུ_པ་སངས་_སྤེན་པ་".split("_"),longDateFormat:{LT:"A h:mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, LT",LLLL:"dddd, D MMMM YYYY, LT"},calendar:{sameDay:"[དི་རིང] LT",nextDay:"[སང་ཉིན] LT",nextWeek:"[བདུན་ཕྲག་རྗེས་མ], LT",lastDay:"[�་སང] LT",lastWeek:"[བདུན་ཕྲག་མ�འ་མ] dddd, LT",sameElse:"L"},relativeTime:{future:"%s ལ་",past:"%s སྔན་ལ",s:"ལམ་སང",m:"ས�ར་མ་གཅིག",mm:"%d ས�ར་མ",h:"ཆུ་ཚོད་གཅིག",hh:"%d ཆུ་ཚོད",d:"ཉིན་གཅིག",dd:"%d ཉིན་",M:"ཟླ་བ་གཅིག",MM:"%d ཟླ་བ",y:"ལོ་གཅིག",yy:"%d ལོ"},preparse:function(a){return a.replace(/[༡༢༣༤༥༦༧༨༩༠]/g,function(a){return c[a]})},postformat:function(a){return a.replace(/\d/g,function(a){return b[a]})},meridiem:function(a){return 4>a?"མཚན་མོ":10>a?"ཞོགས་ཀས":17>a?"ཉིན་གུང":20>a?"དགོང་དག":"མཚན་མོ"},week:{dow:0,doy:6}})}),function(a){a(sb)}(function(b){function c(a,b,c){var d={mm:"munutenn",MM:"miz",dd:"devezh"};return a+" "+f(d[c],a)}function d(a){switch(e(a)){case 1:case 3:case 4:case 5:case 9:return a+" bloaz";default:return a+" vloaz"}}function e(a){return a>9?e(a%10):a}function f(a,b){return 2===b?g(a):a}function g(b){var c={m:"v",b:"v",d:"z"};return c[b.charAt(0)]===a?b:c[b.charAt(0)]+b.substring(1)}return b.defineLocale("br",{months:"Genver_C'hwevrer_Meurzh_Ebrel_Mae_Mezheven_Gouere_Eost_Gwengolo_Here_Du_Kerzu".split("_"),monthsShort:"Gen_C'hwe_Meu_Ebr_Mae_Eve_Gou_Eos_Gwe_Her_Du_Ker".split("_"),weekdays:"Sul_Lun_Meurzh_Merc'her_Yaou_Gwener_Sadorn".split("_"),weekdaysShort:"Sul_Lun_Meu_Mer_Yao_Gwe_Sad".split("_"),weekdaysMin:"Su_Lu_Me_Mer_Ya_Gw_Sa".split("_"),longDateFormat:{LT:"h[e]mm A",L:"DD/MM/YYYY",LL:"D [a viz] MMMM YYYY",LLL:"D [a viz] MMMM YYYY LT",LLLL:"dddd, D [a viz] MMMM YYYY LT"},calendar:{sameDay:"[Hiziv da] LT",nextDay:"[Warc'hoazh da] LT",nextWeek:"dddd [da] LT",lastDay:"[Dec'h da] LT",lastWeek:"dddd [paset da] LT",sameElse:"L"},relativeTime:{future:"a-benn %s",past:"%s 'zo",s:"un nebeud segondennoù",m:"ur vunutenn",mm:c,h:"un eur",hh:"%d eur",d:"un devezh",dd:c,M:"ur miz",MM:c,y:"ur bloaz",yy:d},ordinal:function(a){var b=1===a?"añ":"vet";return a+b},week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){function b(a,b,c){var d=a+" ";switch(c){case"m":return b?"jedna minuta":"jedne minute";case"mm":return d+=1===a?"minuta":2===a||3===a||4===a?"minute":"minuta";case"h":return b?"jedan sat":"jednog sata";case"hh":return d+=1===a?"sat":2===a||3===a||4===a?"sata":"sati";case"dd":return d+=1===a?"dan":"dana";case"MM":return d+=1===a?"mjesec":2===a||3===a||4===a?"mjeseca":"mjeseci";case"yy":return d+=1===a?"godina":2===a||3===a||4===a?"godine":"godina"}}return a.defineLocale("bs",{months:"januar_februar_mart_april_maj_juni_juli_avgust_septembar_oktobar_novembar_decembar".split("_"),monthsShort:"jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.".split("_"),weekdays:"nedjelja_ponedjeljak_utorak_srijeda_�etvrtak_petak_subota".split("_"),weekdaysShort:"ned._pon._uto._sri._�et._pet._sub.".split("_"),weekdaysMin:"ne_po_ut_sr_�e_pe_su".split("_"),longDateFormat:{LT:"H:mm",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[danas u] LT",nextDay:"[sutra u] LT",nextWeek:function(){switch(this.day()){case 0:return"[u] [nedjelju] [u] LT";case 3:return"[u] [srijedu] [u] LT";case 6:return"[u] [subotu] [u] LT";case 1:case 2:case 4:case 5:return"[u] dddd [u] LT"}},lastDay:"[ju�er u] LT",lastWeek:function(){switch(this.day()){case 0:case 3:return"[prošlu] dddd [u] LT";case 6:return"[prošle] [subote] [u] LT";case 1:case 2:case 4:case 5:return"[prošli] dddd [u] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"prije %s",s:"par sekundi",m:b,mm:b,h:b,hh:b,d:"dan",dd:b,M:"mjesec",MM:b,y:"godinu",yy:b},ordinal:"%d.",week:{dow:1,doy:7}})}),function(a){a(sb)}(function(a){return a.defineLocale("ca",{months:"gener_febrer_març_abril_maig_juny_juliol_agost_setembre_octubre_novembre_desembre".split("_"),monthsShort:"gen._febr._mar._abr._mai._jun._jul._ag._set._oct._nov._des.".split("_"),weekdays:"diumenge_dilluns_dimarts_dimecres_dijous_divendres_dissabte".split("_"),weekdaysShort:"dg._dl._dt._dc._dj._dv._ds.".split("_"),weekdaysMin:"Dg_Dl_Dt_Dc_Dj_Dv_Ds".split("_"),longDateFormat:{LT:"H:mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:function(){return"[avui a "+(1!==this.hours()?"les":"la")+"] LT"},nextDay:function(){return"[demà a "+(1!==this.hours()?"les":"la")+"] LT"},nextWeek:function(){return"dddd [a "+(1!==this.hours()?"les":"la")+"] LT"},lastDay:function(){return"[ahir a "+(1!==this.hours()?"les":"la")+"] LT"},lastWeek:function(){return"[el] dddd [passat a "+(1!==this.hours()?"les":"la")+"] LT"},sameElse:"L"},relativeTime:{future:"en %s",past:"fa %s",s:"uns segons",m:"un minut",mm:"%d minuts",h:"una hora",hh:"%d hores",d:"un dia",dd:"%d dies",M:"un mes",MM:"%d mesos",y:"un any",yy:"%d anys"},ordinal:"%dº",week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){function b(a){return a>1&&5>a&&1!==~~(a/10)}function c(a,c,d,e){var f=a+" ";switch(d){case"s":return c||e?"pár sekund":"pár sekundami";case"m":return c?"minuta":e?"minutu":"minutou";case"mm":return c||e?f+(b(a)?"minuty":"minut"):f+"minutami";break;case"h":return c?"hodina":e?"hodinu":"hodinou";case"hh":return c||e?f+(b(a)?"hodiny":"hodin"):f+"hodinami";break;case"d":return c||e?"den":"dnem";case"dd":return c||e?f+(b(a)?"dny":"dní"):f+"dny";break;case"M":return c||e?"měsíc":"měsícem";case"MM":return c||e?f+(b(a)?"měsíce":"měsíců"):f+"měsíci";break;case"y":return c||e?"rok":"rokem";case"yy":return c||e?f+(b(a)?"roky":"let"):f+"lety"}}var d="leden_únor_březen_duben_květen_�erven_�ervenec_srpen_září_říjen_listopad_prosinec".split("_"),e="led_úno_bře_dub_kvě_�vn_�vc_srp_zář_říj_lis_pro".split("_");return a.defineLocale("cs",{months:d,monthsShort:e,monthsParse:function(a,b){var c,d=[];for(c=0;12>c;c++)d[c]=new RegExp("^"+a[c]+"$|^"+b[c]+"$","i");return d}(d,e),weekdays:"neděle_pondělí_úterý_středa_�tvrtek_pátek_sobota".split("_"),weekdaysShort:"ne_po_út_st_�t_pá_so".split("_"),weekdaysMin:"ne_po_út_st_�t_pá_so".split("_"),longDateFormat:{LT:"H.mm",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd D. MMMM YYYY LT"},calendar:{sameDay:"[dnes v] LT",nextDay:"[zítra v] LT",nextWeek:function(){switch(this.day()){case 0:return"[v neděli v] LT";case 1:case 2:return"[v] dddd [v] LT";case 3:return"[ve středu v] LT";case 4:return"[ve �tvrtek v] LT";case 5:return"[v pátek v] LT";case 6:return"[v sobotu v] LT"}},lastDay:"[v�era v] LT",lastWeek:function(){switch(this.day()){case 0:return"[minulou neděli v] LT";case 1:case 2:return"[minulé] dddd [v] LT";case 3:return"[minulou středu v] LT";case 4:case 5:return"[minulý] dddd [v] LT";case 6:return"[minulou sobotu v] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"před %s",s:c,m:c,mm:c,h:c,hh:c,d:c,dd:c,M:c,MM:c,y:c,yy:c},ordinal:"%d.",week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){return a.defineLocale("cv",{months:"кăрлач_нарă�_пуш_ака_май_çĕртме_утă_çурла_авăн_юпа_чӳк_раштав".split("_"),monthsShort:"кăр_нар_пуш_ака_май_çĕр_утă_çур_ав_юпа_чӳк_раш".split("_"),weekdays:"выр�арникун_тунтикун_ытларикун_юнкун_кĕçнерникун_�рнекун_шăматкун".split("_"),weekdaysShort:"выр_тун_ытл_юн_кĕç_�рн_шăм".split("_"),weekdaysMin:"вр_тн_ыт_юн_кç_�р_шм".split("_"),longDateFormat:{LT:"HH:mm",L:"DD-MM-YYYY",LL:"YYYY [çулхи] MMMM [уйăхĕн] D[-мĕшĕ]",LLL:"YYYY [çулхи] MMMM [уйăхĕн] D[-мĕшĕ], LT",LLLL:"dddd, YYYY [çулхи] MMMM [уйăхĕн] D[-мĕшĕ], LT"},calendar:{sameDay:"[Па�н] LT [�ехетре]",nextDay:"[Ыран] LT [�ехетре]",lastDay:"[Ĕнер] LT [�ехетре]",nextWeek:"[Çите�] dddd LT [�ехетре]",lastWeek:"[Иртнĕ] dddd LT [�ехетре]",sameElse:"L"},relativeTime:{future:function(a){var b=/�ехет$/i.exec(a)?"рен":/çул$/i.exec(a)?"тан":"ран";return a+b},past:"%s ка�лла",s:"пĕр-ик çеккунт",m:"пĕр минут",mm:"%d минут",h:"пĕр �ехет",hh:"%d �ехет",d:"пĕр кун",dd:"%d кун",M:"пĕр уйăх",MM:"%d уйăх",y:"пĕр çул",yy:"%d çул"},ordinal:"%d-мĕш",week:{dow:1,doy:7}})}),function(a){a(sb)}(function(a){return a.defineLocale("cy",{months:"Ionawr_Chwefror_Mawrth_Ebrill_Mai_Mehefin_Gorffennaf_Awst_Medi_Hydref_Tachwedd_Rhagfyr".split("_"),monthsShort:"Ion_Chwe_Maw_Ebr_Mai_Meh_Gor_Aws_Med_Hyd_Tach_Rhag".split("_"),weekdays:"Dydd Sul_Dydd Llun_Dydd Mawrth_Dydd Mercher_Dydd Iau_Dydd Gwener_Dydd Sadwrn".split("_"),weekdaysShort:"Sul_Llun_Maw_Mer_Iau_Gwe_Sad".split("_"),weekdaysMin:"Su_Ll_Ma_Me_Ia_Gw_Sa".split("_"),longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Heddiw am] LT",nextDay:"[Yfory am] LT",nextWeek:"dddd [am] LT",lastDay:"[Ddoe am] LT",lastWeek:"dddd [diwethaf am] LT",sameElse:"L"},relativeTime:{future:"mewn %s",past:"%s yn ôl",s:"ychydig eiliadau",m:"munud",mm:"%d munud",h:"awr",hh:"%d awr",d:"diwrnod",dd:"%d diwrnod",M:"mis",MM:"%d mis",y:"blwyddyn",yy:"%d flynedd"},ordinal:function(a){var b=a,c="",d=["","af","il","ydd","ydd","ed","ed","ed","fed","fed","fed","eg","fed","eg","eg","fed","eg","eg","fed","eg","fed"];return b>20?c=40===b||50===b||60===b||80===b||100===b?"fed":"ain":b>0&&(c=d[b]),a+c},week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){return a.defineLocale("da",{months:"januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec".split("_"),weekdays:"søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag".split("_"),weekdaysShort:"søn_man_tir_ons_tor_fre_lør".split("_"),weekdaysMin:"sø_ma_ti_on_to_fr_lø".split("_"),longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd [d.] D. MMMM YYYY LT"},calendar:{sameDay:"[I dag kl.] LT",nextDay:"[I morgen kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[I går kl.] LT",lastWeek:"[sidste] dddd [kl] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"%s siden",s:"få sekunder",m:"et minut",mm:"%d minutter",h:"en time",hh:"%d timer",d:"en dag",dd:"%d dage",M:"en måned",MM:"%d måneder",y:"et år",yy:"%d år"},ordinal:"%d.",week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){function b(a,b,c){var d={m:["eine Minute","einer Minute"],h:["eine Stunde","einer Stunde"],d:["ein Tag","einem Tag"],dd:[a+" Tage",a+" Tagen"],M:["ein Monat","einem Monat"],MM:[a+" Monate",a+" Monaten"],y:["ein Jahr","einem Jahr"],yy:[a+" Jahre",a+" Jahren"]};return b?d[c][0]:d[c][1]}return a.defineLocale("de-at",{months:"Jänner_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jän._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.".split("_"),weekdays:"Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"),weekdaysShort:"So._Mo._Di._Mi._Do._Fr._Sa.".split("_"),weekdaysMin:"So_Mo_Di_Mi_Do_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm [Uhr]",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[Heute um] LT",sameElse:"L",nextDay:"[Morgen um] LT",nextWeek:"dddd [um] LT",lastDay:"[Gestern um] LT",lastWeek:"[letzten] dddd [um] LT"},relativeTime:{future:"in %s",past:"vor %s",s:"ein paar Sekunden",m:b,mm:"%d Minuten",h:b,hh:"%d Stunden",d:b,dd:b,M:b,MM:b,y:b,yy:b},ordinal:"%d.",week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){function b(a,b,c){var d={m:["eine Minute","einer Minute"],h:["eine Stunde","einer Stunde"],d:["ein Tag","einem Tag"],dd:[a+" Tage",a+" Tagen"],M:["ein Monat","einem Monat"],MM:[a+" Monate",a+" Monaten"],y:["ein Jahr","einem Jahr"],yy:[a+" Jahre",a+" Jahren"]};return b?d[c][0]:d[c][1]}return a.defineLocale("de",{months:"Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jan._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.".split("_"),weekdays:"Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"),weekdaysShort:"So._Mo._Di._Mi._Do._Fr._Sa.".split("_"),weekdaysMin:"So_Mo_Di_Mi_Do_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm [Uhr]",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[Heute um] LT",sameElse:"L",nextDay:"[Morgen um] LT",nextWeek:"dddd [um] LT",lastDay:"[Gestern um] LT",lastWeek:"[letzten] dddd [um] LT"},relativeTime:{future:"in %s",past:"vor %s",s:"ein paar Sekunden",m:b,mm:"%d Minuten",h:b,hh:"%d Stunden",d:b,dd:b,M:b,MM:b,y:b,yy:b},ordinal:"%d.",week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){return a.defineLocale("el",{monthsNominativeEl:"Ιανουά�ιος_Φεβ�ουά�ιος_Μά�τιος_Απ�ίλιος_Μάιος_Ιο�νιος_Ιο�λιος_Α�γουστος_Σεπτέμβ�ιος_Οκτώβ�ιος_�οέμβ�ιος_Δεκέμβ�ιος".split("_"),monthsGenitiveEl:"Ιανουα�ίου_Φεβ�ουα�ίου_Μα�τίου_Απ�ιλίου_Μα�ου_Ιουνίου_Ιουλίου_Αυγο�στου_Σεπτεμβ�ίου_Οκτωβ�ίου_�οεμβ�ίου_Δεκεμβ�ίου".split("_"),months:function(a,b){return/D/.test(b.substring(0,b.indexOf("MMMM")))?this._monthsGenitiveEl[a.month()]:this._monthsNominativeEl[a.month()]},monthsShort:"Ιαν_Φεβ_Μα�_Απ�_Μαϊ_Ιουν_Ιουλ_Αυγ_Σεπ_Οκτ_�οε_Δεκ".split("_"),weekdays:"Κυ�ιακή_Δευτέ�α_Τ�ίτη_Τετά�τη_Πέμπτη_Πα�ασκευή_Σάββατο".split("_"),weekdaysShort:"Κυ�_Δευ_Τ�ι_Τετ_Πεμ_Πα�_Σαβ".split("_"),weekdaysMin:"Κυ_Δε_Τ�_Τε_Πε_Πα_Σα".split("_"),meridiem:function(a,b,c){return a>11?c?"μμ":"ΜΜ":c?"πμ":"ΠΜ"},isPM:function(a){return"μ"===(a+"").toLowerCase()[0]},meridiemParse:/[ΠΜ]\.?Μ?\.?/i,longDateFormat:{LT:"h:mm A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendarEl:{sameDay:"[Σήμε�α {}] LT",nextDay:"[Α��ιο {}] LT",nextWeek:"dddd [{}] LT",lastDay:"[Χθες {}] LT",lastWeek:function(){switch(this.day()){case 6:return"[το π�οηγο�μενο] dddd [{}] LT";default:return"[την π�οηγο�μενη] dddd [{}] LT"}},sameElse:"L"},calendar:function(a,b){var c=this._calendarEl[a],d=b&&b.hours();return"function"==typeof c&&(c=c.apply(b)),c.replace("{}",d%12===1?"στη":"στις")},relativeTime:{future:"σε %s",past:"%s π�ιν",s:"δευτε�όλεπτα",m:"ένα λεπτό",mm:"%d λεπτά",h:"μία ώ�α",hh:"%d ώ�ες",d:"μία μέ�α",dd:"%d μέ�ες",M:"ένας μήνας",MM:"%d μήνες",y:"ένας χ�όνος",yy:"%d χ�όνια"},ordinal:function(a){return a+"η"},week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){return a.defineLocale("en-au",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"h:mm A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c},week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){return a.defineLocale("en-ca",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"h:mm A",L:"YYYY-MM-DD",LL:"D MMMM, YYYY",LLL:"D MMMM, YYYY LT",LLLL:"dddd, D MMMM, YYYY LT"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c}})}),function(a){a(sb)}(function(a){return a.defineLocale("en-gb",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"th":1===b?"st":2===b?"nd":3===b?"rd":"th";return a+c},week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){return a.defineLocale("eo",{months:"januaro_februaro_marto_aprilo_majo_junio_julio_aŭgusto_septembro_oktobro_novembro_decembro".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_aŭg_sep_okt_nov_dec".split("_"),weekdays:"Dimanĉo_Lundo_Mardo_Merkredo_Ĵaŭdo_Vendredo_Sabato".split("_"),weekdaysShort:"Dim_Lun_Mard_Merk_Ĵaŭ_Ven_Sab".split("_"),weekdaysMin:"Di_Lu_Ma_Me_Ĵa_Ve_Sa".split("_"),longDateFormat:{LT:"HH:mm",L:"YYYY-MM-DD",LL:"D[-an de] MMMM, YYYY",LLL:"D[-an de] MMMM, YYYY LT",LLLL:"dddd, [la] D[-an de] MMMM, YYYY LT"},meridiem:function(a,b,c){return a>11?c?"p.t.m.":"P.T.M.":c?"a.t.m.":"A.T.M."},calendar:{sameDay:"[Hodiaŭ je] LT",nextDay:"[Morgaŭ je] LT",nextWeek:"dddd [je] LT",lastDay:"[Hieraŭ je] LT",lastWeek:"[pasinta] dddd [je] LT",sameElse:"L"},relativeTime:{future:"je %s",past:"antaŭ %s",s:"sekundoj",m:"minuto",mm:"%d minutoj",h:"horo",hh:"%d horoj",d:"tago",dd:"%d tagoj",M:"monato",MM:"%d monatoj",y:"jaro",yy:"%d jaroj"},ordinal:"%da",week:{dow:1,doy:7}})}),function(a){a(sb)}(function(a){var b="ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.".split("_"),c="ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic".split("_");return a.defineLocale("es",{months:"enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"),monthsShort:function(a,d){return/-MMM-/.test(d)?c[a.month()]:b[a.month()]},weekdays:"domingo_lunes_martes_miércoles_jueves_viernes_sábado".split("_"),weekdaysShort:"dom._lun._mar._mié._jue._vie._sáb.".split("_"),weekdaysMin:"Do_Lu_Ma_Mi_Ju_Vi_Sá".split("_"),longDateFormat:{LT:"H:mm",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY LT",LLLL:"dddd, D [de] MMMM [de] YYYY LT"},calendar:{sameDay:function(){return"[hoy a la"+(1!==this.hours()?"s":"")+"] LT"},nextDay:function(){return"[mañana a la"+(1!==this.hours()?"s":"")+"] LT"},nextWeek:function(){return"dddd [a la"+(1!==this.hours()?"s":"")+"] LT"},lastDay:function(){return"[ayer a la"+(1!==this.hours()?"s":"")+"] LT"},lastWeek:function(){return"[el] dddd [pasado a la"+(1!==this.hours()?"s":"")+"] LT"},sameElse:"L"},relativeTime:{future:"en %s",past:"hace %s",s:"unos segundos",m:"un minuto",mm:"%d minutos",h:"una hora",hh:"%d horas",d:"un día",dd:"%d días",M:"un mes",MM:"%d meses",y:"un año",yy:"%d años"},ordinal:"%dº",week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){function b(a,b,c,d){var e={s:["mõne sekundi","mõni sekund","paar sekundit"],m:["ühe minuti","üks minut"],mm:[a+" minuti",a+" minutit"],h:["ühe tunni","tund aega","üks tund"],hh:[a+" tunni",a+" tundi"],d:["ühe päeva","üks päev"],M:["kuu aja","kuu aega","üks kuu"],MM:[a+" kuu",a+" kuud"],y:["ühe aasta","aasta","üks aasta"],yy:[a+" aasta",a+" aastat"]};return b?e[c][2]?e[c][2]:e[c][1]:d?e[c][0]:e[c][1]}return a.defineLocale("et",{months:"jaanuar_veebruar_märts_aprill_mai_juuni_juuli_august_september_oktoober_november_detsember".split("_"),monthsShort:"jaan_veebr_märts_apr_mai_juuni_juuli_aug_sept_okt_nov_dets".split("_"),weekdays:"pühapäev_esmaspäev_teisipäev_kolmapäev_neljapäev_reede_laupäev".split("_"),weekdaysShort:"P_E_T_K_N_R_L".split("_"),weekdaysMin:"P_E_T_K_N_R_L".split("_"),longDateFormat:{LT:"H:mm",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[Täna,] LT",nextDay:"[Homme,] LT",nextWeek:"[Järgmine] dddd LT",lastDay:"[Eile,] LT",lastWeek:"[Eelmine] dddd LT",sameElse:"L"},relativeTime:{future:"%s pärast",past:"%s tagasi",s:b,m:b,mm:b,h:b,hh:b,d:b,dd:"%d päeva",M:b,MM:b,y:b,yy:b},ordinal:"%d.",week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){return a.defineLocale("eu",{months:"urtarrila_otsaila_martxoa_apirila_maiatza_ekaina_uztaila_abuztua_iraila_urria_azaroa_abendua".split("_"),monthsShort:"urt._ots._mar._api._mai._eka._uzt._abu._ira._urr._aza._abe.".split("_"),weekdays:"igandea_astelehena_asteartea_asteazkena_osteguna_ostirala_larunbata".split("_"),weekdaysShort:"ig._al._ar._az._og._ol._lr.".split("_"),weekdaysMin:"ig_al_ar_az_og_ol_lr".split("_"),longDateFormat:{LT:"HH:mm",L:"YYYY-MM-DD",LL:"YYYY[ko] MMMM[ren] D[a]",LLL:"YYYY[ko] MMMM[ren] D[a] LT",LLLL:"dddd, YYYY[ko] MMMM[ren] D[a] LT",l:"YYYY-M-D",ll:"YYYY[ko] MMM D[a]",lll:"YYYY[ko] MMM D[a] LT",llll:"ddd, YYYY[ko] MMM D[a] LT"},calendar:{sameDay:"[gaur] LT[etan]",nextDay:"[bihar] LT[etan]",nextWeek:"dddd LT[etan]",lastDay:"[atzo] LT[etan]",lastWeek:"[aurreko] dddd LT[etan]",sameElse:"L"},relativeTime:{future:"%s barru",past:"duela %s",s:"segundo batzuk",m:"minutu bat",mm:"%d minutu",h:"ordu bat",hh:"%d ordu",d:"egun bat",dd:"%d egun",M:"hilabete bat",MM:"%d hilabete",y:"urte bat",yy:"%d urte"},ordinal:"%d.",week:{dow:1,doy:7}})
+}),function(a){a(sb)}(function(a){var b={1:"۱",2:"۲",3:"۳",4:"۴",5:"۵",6:"۶",7:"۷",8:"۸",9:"۹",0:"۰"},c={"۱":"1","۲":"2","۳":"3","۴":"4","۵":"5","۶":"6","۷":"7","۸":"8","۹":"9","۰":"0"};return a.defineLocale("fa",{months:"ژانویه_�وریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر".split("_"),monthsShort:"ژانویه_�وریه_مارس_آوریل_مه_ژوئن_ژوئیه_اوت_سپتامبر_اکتبر_نوامبر_دسامبر".split("_"),weekdays:"یک‌شنبه_دوشنبه_سه‌شنبه_چهارشنبه_پنج‌شنبه_جمعه_شنبه".split("_"),weekdaysShort:"یک‌شنبه_دوشنبه_سه‌شنبه_چهارشنبه_پنج‌شنبه_جمعه_شنبه".split("_"),weekdaysMin:"ی_د_س_چ_پ_ج_ش".split("_"),longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},meridiem:function(a){return 12>a?"قبل از ظهر":"بعد از ظهر"},calendar:{sameDay:"[امروز ساعت] LT",nextDay:"[�ردا ساعت] LT",nextWeek:"dddd [ساعت] LT",lastDay:"[دیروز ساعت] LT",lastWeek:"dddd [پیش] [ساعت] LT",sameElse:"L"},relativeTime:{future:"در %s",past:"%s پیش",s:"چندین ثانیه",m:"یک دقیقه",mm:"%d دقیقه",h:"یک ساعت",hh:"%d ساعت",d:"یک روز",dd:"%d روز",M:"یک ماه",MM:"%d ماه",y:"یک سال",yy:"%d سال"},preparse:function(a){return a.replace(/[۰-۹]/g,function(a){return c[a]}).replace(/،/g,",")},postformat:function(a){return a.replace(/\d/g,function(a){return b[a]}).replace(/,/g,"،")},ordinal:"%dم",week:{dow:6,doy:12}})}),function(a){a(sb)}(function(a){function b(a,b,d,e){var f="";switch(d){case"s":return e?"muutaman sekunnin":"muutama sekunti";case"m":return e?"minuutin":"minuutti";case"mm":f=e?"minuutin":"minuuttia";break;case"h":return e?"tunnin":"tunti";case"hh":f=e?"tunnin":"tuntia";break;case"d":return e?"päivän":"päivä";case"dd":f=e?"päivän":"päivää";break;case"M":return e?"kuukauden":"kuukausi";case"MM":f=e?"kuukauden":"kuukautta";break;case"y":return e?"vuoden":"vuosi";case"yy":f=e?"vuoden":"vuotta"}return f=c(a,e)+" "+f}function c(a,b){return 10>a?b?e[a]:d[a]:a}var d="nolla yksi kaksi kolme neljä viisi kuusi seitsemän kahdeksan yhdeksän".split(" "),e=["nolla","yhden","kahden","kolmen","neljän","viiden","kuuden",d[7],d[8],d[9]];return a.defineLocale("fi",{months:"tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kesäkuu_heinäkuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu".split("_"),monthsShort:"tammi_helmi_maalis_huhti_touko_kesä_heinä_elo_syys_loka_marras_joulu".split("_"),weekdays:"sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai".split("_"),weekdaysShort:"su_ma_ti_ke_to_pe_la".split("_"),weekdaysMin:"su_ma_ti_ke_to_pe_la".split("_"),longDateFormat:{LT:"HH.mm",L:"DD.MM.YYYY",LL:"Do MMMM[ta] YYYY",LLL:"Do MMMM[ta] YYYY, [klo] LT",LLLL:"dddd, Do MMMM[ta] YYYY, [klo] LT",l:"D.M.YYYY",ll:"Do MMM YYYY",lll:"Do MMM YYYY, [klo] LT",llll:"ddd, Do MMM YYYY, [klo] LT"},calendar:{sameDay:"[tänään] [klo] LT",nextDay:"[huomenna] [klo] LT",nextWeek:"dddd [klo] LT",lastDay:"[eilen] [klo] LT",lastWeek:"[viime] dddd[na] [klo] LT",sameElse:"L"},relativeTime:{future:"%s päästä",past:"%s sitten",s:b,m:b,mm:b,h:b,hh:b,d:b,dd:b,M:b,MM:b,y:b,yy:b},ordinal:"%d.",week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){return a.defineLocale("fo",{months:"januar_februar_mars_apríl_mai_juni_juli_august_september_oktober_november_desember".split("_"),monthsShort:"jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_"),weekdays:"sunnudagur_mánadagur_týsdagur_mikudagur_hósdagur_fríggjadagur_leygardagur".split("_"),weekdaysShort:"sun_mán_týs_mik_hós_frí_ley".split("_"),weekdaysMin:"su_má_tý_mi_hó_fr_le".split("_"),longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D. MMMM, YYYY LT"},calendar:{sameDay:"[� dag kl.] LT",nextDay:"[� morgin kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[� gjár kl.] LT",lastWeek:"[síðstu] dddd [kl] LT",sameElse:"L"},relativeTime:{future:"um %s",past:"%s síðani",s:"fá sekund",m:"ein minutt",mm:"%d minuttir",h:"ein tími",hh:"%d tímar",d:"ein dagur",dd:"%d dagar",M:"ein mánaði",MM:"%d mánaðir",y:"eitt ár",yy:"%d ár"},ordinal:"%d.",week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){return a.defineLocale("fr-ca",{months:"janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"),monthsShort:"janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"),weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),weekdaysMin:"Di_Lu_Ma_Me_Je_Ve_Sa".split("_"),longDateFormat:{LT:"HH:mm",L:"YYYY-MM-DD",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[Aujourd'hui à] LT",nextDay:"[Demain à] LT",nextWeek:"dddd [à] LT",lastDay:"[Hier à] LT",lastWeek:"dddd [dernier à] LT",sameElse:"L"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"},ordinal:function(a){return a+(1===a?"er":"")}})}),function(a){a(sb)}(function(a){return a.defineLocale("fr",{months:"janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"),monthsShort:"janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"),weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),weekdaysMin:"Di_Lu_Ma_Me_Je_Ve_Sa".split("_"),longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[Aujourd'hui à] LT",nextDay:"[Demain à] LT",nextWeek:"dddd [à] LT",lastDay:"[Hier à] LT",lastWeek:"dddd [dernier à] LT",sameElse:"L"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"},ordinal:function(a){return a+(1===a?"er":"")},week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){return a.defineLocale("gl",{months:"Xaneiro_Febreiro_Marzo_Abril_Maio_Xuño_Xullo_Agosto_Setembro_Outubro_Novembro_Decembro".split("_"),monthsShort:"Xan._Feb._Mar._Abr._Mai._Xuñ._Xul._Ago._Set._Out._Nov._Dec.".split("_"),weekdays:"Domingo_Luns_Martes_Mércores_Xoves_Venres_Sábado".split("_"),weekdaysShort:"Dom._Lun._Mar._Mér._Xov._Ven._Sáb.".split("_"),weekdaysMin:"Do_Lu_Ma_Mé_Xo_Ve_Sá".split("_"),longDateFormat:{LT:"H:mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:function(){return"[hoxe "+(1!==this.hours()?"ás":"á")+"] LT"},nextDay:function(){return"[mañá "+(1!==this.hours()?"ás":"á")+"] LT"},nextWeek:function(){return"dddd ["+(1!==this.hours()?"ás":"a")+"] LT"},lastDay:function(){return"[onte "+(1!==this.hours()?"á":"a")+"] LT"},lastWeek:function(){return"[o] dddd [pasado "+(1!==this.hours()?"ás":"a")+"] LT"},sameElse:"L"},relativeTime:{future:function(a){return"uns segundos"===a?"nuns segundos":"en "+a},past:"hai %s",s:"uns segundos",m:"un minuto",mm:"%d minutos",h:"unha hora",hh:"%d horas",d:"un día",dd:"%d días",M:"un mes",MM:"%d meses",y:"un ano",yy:"%d anos"},ordinal:"%dº",week:{dow:1,doy:7}})}),function(a){a(sb)}(function(a){return a.defineLocale("he",{months:"ינו�ר_פברו�ר_מרץ_�פריל_מ�י_יוני_יולי_�וגוסט_ספטמבר_�וקטובר_נובמבר_דצמבר".split("_"),monthsShort:"ינו׳_פבר׳_מרץ_�פר׳_מ�י_יוני_יולי_�וג׳_ספט׳_�וק׳_נוב׳_דצמ׳".split("_"),weekdays:"ר�שון_שני_שלישי_רביעי_חמישי_שישי_שבת".split("_"),weekdaysShort:"�׳_ב׳_ג׳_ד׳_ה׳_ו׳_ש׳".split("_"),weekdaysMin:"�_ב_ג_ד_ה_ו_ש".split("_"),longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D [ב]MMMM YYYY",LLL:"D [ב]MMMM YYYY LT",LLLL:"dddd, D [ב]MMMM YYYY LT",l:"D/M/YYYY",ll:"D MMM YYYY",lll:"D MMM YYYY LT",llll:"ddd, D MMM YYYY LT"},calendar:{sameDay:"[היו� ב־]LT",nextDay:"[מחר ב־]LT",nextWeek:"dddd [בשעה] LT",lastDay:"[�תמול ב־]LT",lastWeek:"[ביו�] dddd [ה�חרון בשעה] LT",sameElse:"L"},relativeTime:{future:"בעוד %s",past:"לפני %s",s:"מספר שניות",m:"דקה",mm:"%d דקות",h:"שעה",hh:function(a){return 2===a?"שעתיי�":a+" שעות"},d:"יו�",dd:function(a){return 2===a?"יומיי�":a+" ימי�"},M:"חודש",MM:function(a){return 2===a?"חודשיי�":a+" חודשי�"},y:"שנה",yy:function(a){return 2===a?"שנתיי�":a+" שני�"}}})}),function(a){a(sb)}(function(a){var b={1:"१",2:"२",3:"३",4:"४",5:"५",6:"६",7:"७",8:"८",9:"९",0:"०"},c={"१":"1","२":"2","३":"3","४":"4","५":"5","६":"6","७":"7","८":"8","९":"9","०":"0"};return a.defineLocale("hi",{months:"जनवरी_फ़रवरी_मार�च_अप�रैल_मई_जून_ज�लाई_अगस�त_सितम�बर_अक�टूबर_नवम�बर_दिसम�बर".split("_"),monthsShort:"जन._फ़र._मार�च_अप�रै._मई_जून_ज�ल._अग._सित._अक�टू._नव._दिस.".split("_"),weekdays:"रविवार_सोमवार_मंगलवार_ब�धवार_ग�रूवार_श�क�रवार_शनिवार".split("_"),weekdaysShort:"रवि_सोम_मंगल_ब�ध_ग�रू_श�क�र_शनि".split("_"),weekdaysMin:"र_सो_मं_ब�_ग�_श�_श".split("_"),longDateFormat:{LT:"A h:mm बजे",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, LT",LLLL:"dddd, D MMMM YYYY, LT"},calendar:{sameDay:"[आज] LT",nextDay:"[कल] LT",nextWeek:"dddd, LT",lastDay:"[कल] LT",lastWeek:"[पिछले] dddd, LT",sameElse:"L"},relativeTime:{future:"%s में",past:"%s पहले",s:"क�छ ही क�षण",m:"�क मिनट",mm:"%d मिनट",h:"�क घंटा",hh:"%d घंटे",d:"�क दिन",dd:"%d दिन",M:"�क महीने",MM:"%d महीने",y:"�क वर�ष",yy:"%d वर�ष"},preparse:function(a){return a.replace(/[१२३४५६७८९०]/g,function(a){return c[a]})},postformat:function(a){return a.replace(/\d/g,function(a){return b[a]})},meridiem:function(a){return 4>a?"रात":10>a?"स�बह":17>a?"दोपहर":20>a?"शाम":"रात"},week:{dow:0,doy:6}})}),function(a){a(sb)}(function(a){function b(a,b,c){var d=a+" ";switch(c){case"m":return b?"jedna minuta":"jedne minute";case"mm":return d+=1===a?"minuta":2===a||3===a||4===a?"minute":"minuta";case"h":return b?"jedan sat":"jednog sata";case"hh":return d+=1===a?"sat":2===a||3===a||4===a?"sata":"sati";case"dd":return d+=1===a?"dan":"dana";case"MM":return d+=1===a?"mjesec":2===a||3===a||4===a?"mjeseca":"mjeseci";case"yy":return d+=1===a?"godina":2===a||3===a||4===a?"godine":"godina"}}return a.defineLocale("hr",{months:"sje�anj_velja�a_ožujak_travanj_svibanj_lipanj_srpanj_kolovoz_rujan_listopad_studeni_prosinac".split("_"),monthsShort:"sje._vel._ožu._tra._svi._lip._srp._kol._ruj._lis._stu._pro.".split("_"),weekdays:"nedjelja_ponedjeljak_utorak_srijeda_�etvrtak_petak_subota".split("_"),weekdaysShort:"ned._pon._uto._sri._�et._pet._sub.".split("_"),weekdaysMin:"ne_po_ut_sr_�e_pe_su".split("_"),longDateFormat:{LT:"H:mm",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[danas u] LT",nextDay:"[sutra u] LT",nextWeek:function(){switch(this.day()){case 0:return"[u] [nedjelju] [u] LT";case 3:return"[u] [srijedu] [u] LT";case 6:return"[u] [subotu] [u] LT";case 1:case 2:case 4:case 5:return"[u] dddd [u] LT"}},lastDay:"[ju�er u] LT",lastWeek:function(){switch(this.day()){case 0:case 3:return"[prošlu] dddd [u] LT";case 6:return"[prošle] [subote] [u] LT";case 1:case 2:case 4:case 5:return"[prošli] dddd [u] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"prije %s",s:"par sekundi",m:b,mm:b,h:b,hh:b,d:"dan",dd:b,M:"mjesec",MM:b,y:"godinu",yy:b},ordinal:"%d.",week:{dow:1,doy:7}})}),function(a){a(sb)}(function(a){function b(a,b,c,d){var e=a;switch(c){case"s":return d||b?"néhány másodperc":"néhány másodperce";case"m":return"egy"+(d||b?" perc":" perce");case"mm":return e+(d||b?" perc":" perce");case"h":return"egy"+(d||b?" óra":" órája");case"hh":return e+(d||b?" óra":" órája");case"d":return"egy"+(d||b?" nap":" napja");case"dd":return e+(d||b?" nap":" napja");case"M":return"egy"+(d||b?" hónap":" hónapja");case"MM":return e+(d||b?" hónap":" hónapja");case"y":return"egy"+(d||b?" év":" éve");case"yy":return e+(d||b?" év":" éve")}return""}function c(a){return(a?"":"[múlt] ")+"["+d[this.day()]+"] LT[-kor]"}var d="vasárnap hétfőn kedden szerdán csütörtökön pénteken szombaton".split(" ");return a.defineLocale("hu",{months:"január_február_március_április_május_június_július_augusztus_szeptember_október_november_december".split("_"),monthsShort:"jan_feb_márc_ápr_máj_jún_júl_aug_szept_okt_nov_dec".split("_"),weekdays:"vasárnap_hétfő_kedd_szerda_csütörtök_péntek_szombat".split("_"),weekdaysShort:"vas_hét_kedd_sze_csüt_pén_szo".split("_"),weekdaysMin:"v_h_k_sze_cs_p_szo".split("_"),longDateFormat:{LT:"H:mm",L:"YYYY.MM.DD.",LL:"YYYY. MMMM D.",LLL:"YYYY. MMMM D., LT",LLLL:"YYYY. MMMM D., dddd LT"},meridiem:function(a,b,c){return 12>a?c===!0?"de":"DE":c===!0?"du":"DU"},calendar:{sameDay:"[ma] LT[-kor]",nextDay:"[holnap] LT[-kor]",nextWeek:function(){return c.call(this,!0)},lastDay:"[tegnap] LT[-kor]",lastWeek:function(){return c.call(this,!1)},sameElse:"L"},relativeTime:{future:"%s múlva",past:"%s",s:b,m:b,mm:b,h:b,hh:b,d:b,dd:b,M:b,MM:b,y:b,yy:b},ordinal:"%d.",week:{dow:1,doy:7}})}),function(a){a(sb)}(function(a){function b(a,b){var c={nominative:"հունվար_փետրվար_մարտ_ապրիլ_մայիս_հունիս_հուլիս_օգոստոս_սեպտեմբեր_հոկտեմբեր_նոյեմբեր_դեկտեմբեր".split("_"),accusative:"հունվարի_փետրվարի_մարտի_ապրիլի_մայիսի_հունիսի_հուլիսի_օգոստոսի_սեպտեմբերի_հոկտեմբերի_նոյեմբերի_դեկտեմբերի".split("_")},d=/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/.test(b)?"accusative":"nominative";return c[d][a.month()]}function c(a){var b="հնվ_փտր_մրտ_ապր_մյս_հնս_հլս_օգս_սպտ_հկտ_նմբ_դկտ".split("_");return b[a.month()]}function d(a){var b="կիրակի_երկուշաբթի_երեքշաբթի_չորեքշաբթի_հինգշաբթի_ուրբաթ_շաբաթ".split("_");return b[a.day()]}return a.defineLocale("hy-am",{months:b,monthsShort:c,weekdays:d,weekdaysShort:"կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ".split("_"),weekdaysMin:"կրկ_երկ_երք_չրք_հնգ_ուրբ_շբթ".split("_"),longDateFormat:{LT:"HH:mm",L:"DD.MM.YYYY",LL:"D MMMM YYYY թ.",LLL:"D MMMM YYYY թ., LT",LLLL:"dddd, D MMMM YYYY թ., LT"},calendar:{sameDay:"[այսօր] LT",nextDay:"[վաղը] LT",lastDay:"[երեկ] LT",nextWeek:function(){return"dddd [օրը ժամը] LT"},lastWeek:function(){return"[ան�ած] dddd [օրը ժամը] LT"},sameElse:"L"},relativeTime:{future:"%s հետո",past:"%s առաջ",s:"մի քանի վայրկյան",m:"րոպե",mm:"%d րոպե",h:"ժամ",hh:"%d ժամ",d:"օր",dd:"%d օր",M:"ամիս",MM:"%d ամիս",y:"տարի",yy:"%d տարի"},meridiem:function(a){return 4>a?"գիշերվա":12>a?"առավոտվա":17>a?"�երեկվա":"երեկոյան"},ordinal:function(a,b){switch(b){case"DDD":case"w":case"W":case"DDDo":return 1===a?a+"-ին":a+"-րդ";default:return a}},week:{dow:1,doy:7}})}),function(a){a(sb)}(function(a){return a.defineLocale("id",{months:"Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_November_Desember".split("_"),monthsShort:"Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nov_Des".split("_"),weekdays:"Minggu_Senin_Selasa_Rabu_Kamis_Jumat_Sabtu".split("_"),weekdaysShort:"Min_Sen_Sel_Rab_Kam_Jum_Sab".split("_"),weekdaysMin:"Mg_Sn_Sl_Rb_Km_Jm_Sb".split("_"),longDateFormat:{LT:"HH.mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [pukul] LT",LLLL:"dddd, D MMMM YYYY [pukul] LT"},meridiem:function(a){return 11>a?"pagi":15>a?"siang":19>a?"sore":"malam"},calendar:{sameDay:"[Hari ini pukul] LT",nextDay:"[Besok pukul] LT",nextWeek:"dddd [pukul] LT",lastDay:"[Kemarin pukul] LT",lastWeek:"dddd [lalu pukul] LT",sameElse:"L"},relativeTime:{future:"dalam %s",past:"%s yang lalu",s:"beberapa detik",m:"semenit",mm:"%d menit",h:"sejam",hh:"%d jam",d:"sehari",dd:"%d hari",M:"sebulan",MM:"%d bulan",y:"setahun",yy:"%d tahun"},week:{dow:1,doy:7}})}),function(a){a(sb)}(function(a){function b(a){return a%100===11?!0:a%10===1?!1:!0}function c(a,c,d,e){var f=a+" ";switch(d){case"s":return c||e?"nokkrar sekúndur":"nokkrum sekúndum";case"m":return c?"mínúta":"mínútu";case"mm":return b(a)?f+(c||e?"mínútur":"mínútum"):c?f+"mínúta":f+"mínútu";case"hh":return b(a)?f+(c||e?"klukkustundir":"klukkustundum"):f+"klukkustund";case"d":return c?"dagur":e?"dag":"degi";case"dd":return b(a)?c?f+"dagar":f+(e?"daga":"dögum"):c?f+"dagur":f+(e?"dag":"degi");case"M":return c?"mánuður":e?"mánuð":"mánuði";case"MM":return b(a)?c?f+"mánuðir":f+(e?"mánuði":"mánuðum"):c?f+"mánuður":f+(e?"mánuð":"mánuði");case"y":return c||e?"ár":"ári";case"yy":return b(a)?f+(c||e?"ár":"árum"):f+(c||e?"ár":"ári")}}return a.defineLocale("is",{months:"janúar_febrúar_mars_apríl_maí_júní_júlí_ágúst_september_október_nóvember_desember".split("_"),monthsShort:"jan_feb_mar_apr_maí_jún_júl_ágú_sep_okt_nóv_des".split("_"),weekdays:"sunnudagur_mánudagur_þriðjudagur_miðvikudagur_fimmtudagur_föstudagur_laugardagur".split("_"),weekdaysShort:"sun_mán_þri_mið_fim_fös_lau".split("_"),weekdaysMin:"Su_Má_Þr_Mi_Fi_Fö_La".split("_"),longDateFormat:{LT:"H:mm",L:"DD/MM/YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY [kl.] LT",LLLL:"dddd, D. MMMM YYYY [kl.] LT"},calendar:{sameDay:"[í dag kl.] LT",nextDay:"[á morgun kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[í gær kl.] LT",lastWeek:"[síðasta] dddd [kl.] LT",sameElse:"L"},relativeTime:{future:"eftir %s",past:"fyrir %s síðan",s:c,m:c,mm:c,h:"klukkustund",hh:c,d:c,dd:c,M:c,MM:c,y:c,yy:c},ordinal:"%d.",week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){return a.defineLocale("it",{months:"gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre".split("_"),monthsShort:"gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic".split("_"),weekdays:"Domenica_Lunedì_Martedì_Mercoledì_Giovedì_Venerdì_Sabato".split("_"),weekdaysShort:"Dom_Lun_Mar_Mer_Gio_Ven_Sab".split("_"),weekdaysMin:"D_L_Ma_Me_G_V_S".split("_"),longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Oggi alle] LT",nextDay:"[Domani alle] LT",nextWeek:"dddd [alle] LT",lastDay:"[Ieri alle] LT",lastWeek:"[lo scorso] dddd [alle] LT",sameElse:"L"},relativeTime:{future:function(a){return(/^[0-9].+$/.test(a)?"tra":"in")+" "+a},past:"%s fa",s:"alcuni secondi",m:"un minuto",mm:"%d minuti",h:"un'ora",hh:"%d ore",d:"un giorno",dd:"%d giorni",M:"un mese",MM:"%d mesi",y:"un anno",yy:"%d anni"},ordinal:"%dº",week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){return a.defineLocale("ja",{months:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),weekdays:"日曜日_月曜日_�曜日_水曜日_木曜日_金曜日_土曜日".split("_"),weekdaysShort:"日_月_�_水_木_金_土".split("_"),weekdaysMin:"日_月_�_水_木_金_土".split("_"),longDateFormat:{LT:"Ah時m分",L:"YYYY/MM/DD",LL:"YYYY年M月D日",LLL:"YYYY年M月D日LT",LLLL:"YYYY年M月D日LT dddd"},meridiem:function(a){return 12>a?"��":"�後"},calendar:{sameDay:"[今日] LT",nextDay:"[明日] LT",nextWeek:"[�週]dddd LT",lastDay:"[昨日] LT",lastWeek:"[�週]dddd LT",sameElse:"L"},relativeTime:{future:"%s後",past:"%s�",s:"数秒",m:"1分",mm:"%d分",h:"1時間",hh:"%d時間",d:"1日",dd:"%d日",M:"1ヶ月",MM:"%dヶ月",y:"1年",yy:"%d年"}})}),function(a){a(sb)}(function(a){function b(a,b){var c={nominative:"ი�ნვ�რი_თებერვ�ლი_მ�რტი_�პრილი_მ�ისი_ივნისი_ივლისი_�გვისტ�_სექტემბერი_�ქტ�მბერი_ნ�ემბერი_დეკემბერი".split("_"),accusative:"ი�ნვ�რს_თებერვ�ლს_მ�რტს_�პრილის_მ�ისს_ივნისს_ივლისს_�გვისტს_სექტემბერს_�ქტ�მბერს_ნ�ემბერს_დეკემბერს".split("_")},d=/D[oD] *MMMM?/.test(b)?"accusative":"nominative";return c[d][a.month()]}function c(a,b){var c={nominative:"კვირ�_�რშ�ბ�თი_ს�მშ�ბ�თი_�თხშ�ბ�თი_ხუთშ�ბ�თი_პ�რ�სკევი_შ�ბ�თი".split("_"),accusative:"კვირ�ს_�რშ�ბ�თს_ს�მშ�ბ�თს_�თხშ�ბ�თს_ხუთშ�ბ�თს_პ�რ�სკევს_შ�ბ�თს".split("_")},d=/(წინ�|შემდეგ)/.test(b)?"accusative":"nominative";return c[d][a.day()]}return a.defineLocale("ka",{months:b,monthsShort:"ი�ნ_თებ_მ�რ_�პრ_მ�ი_ივნ_ივლ_�გვ_სექ_�ქტ_ნ�ე_დეკ".split("_"),weekdays:c,weekdaysShort:"კვი_�რშ_ს�მ_�თხ_ხუთ_პ�რ_შ�ბ".split("_"),weekdaysMin:"კვ_�რ_ს�_�თ_ხუ_პ�_შ�".split("_"),longDateFormat:{LT:"h:mm A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[დღეს] LT[-ზე]",nextDay:"[ხვ�ლ] LT[-ზე]",lastDay:"[გუშინ] LT[-ზე]",nextWeek:"[შემდეგ] dddd LT[-ზე]",lastWeek:"[წინ�] dddd LT-ზე",sameElse:"L"},relativeTime:{future:function(a){return/(წ�მი|წუთი|ს��თი|წელი)/.test(a)?a.replace(/ი$/,"ში"):a+"ში"},past:function(a){return/(წ�მი|წუთი|ს��თი|დღე|თვე)/.test(a)?a.replace(/(ი|ე)$/,"ის წინ"):/წელი/.test(a)?a.replace(/წელი$/,"წლის წინ"):void 0},s:"რ�მდენიმე წ�მი",m:"წუთი",mm:"%d წუთი",h:"ს��თი",hh:"%d ს��თი",d:"დღე",dd:"%d დღე",M:"თვე",MM:"%d თვე",y:"წელი",yy:"%d წელი"},ordinal:function(a){return 0===a?a:1===a?a+"-ლი":20>a||100>=a&&a%20===0||a%100===0?"მე-"+a:a+"-ე"},week:{dow:1,doy:7}})}),function(a){a(sb)}(function(a){return a.defineLocale("km",{months:"មករា_កុម្ភៈ_មិនា_ម�សា_ឧសភា_មិ�ុនា_កក្កដា_សីហា_កញ្ញា_�ុលា_វិច្ឆិកា_ធ្នូ".split("_"),monthsShort:"មករា_កុម្ភៈ_មិនា_ម�សា_ឧសភា_មិ�ុនា_កក្កដា_សីហា_កញ្ញា_�ុលា_វិច្ឆិកា_ធ្នូ".split("_"),weekdays:"អាទិ�្យ_ច�ន្ទ_អង្គារ_ពុធ_ព្រហស្ប�ិ�_សុក្រ_សៅរ�".split("_"),weekdaysShort:"អាទិ�្យ_ច�ន្ទ_អង្គារ_ពុធ_ព្រហស្ប�ិ�_សុក្រ_សៅរ�".split("_"),weekdaysMin:"អាទិ�្យ_ច�ន្ទ_អង្គារ_ពុធ_ព្រហស្ប�ិ�_សុក្រ_សៅរ�".split("_"),longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[�្ងៃនៈ ម៉ោង] LT",nextDay:"[ស្អែក ម៉ោង] LT",nextWeek:"dddd [ម៉ោង] LT",lastDay:"[ម្សិលមិញ ម៉ោង] LT",lastWeek:"dddd [សប្�ាហ�មុន] [ម៉ោង] LT",sameElse:"L"},relativeTime:{future:"%sទៀ�",past:"%sមុន",s:"ប៉ុន្មានវិនាទី",m:"មួយនាទី",mm:"%d នាទី",h:"មួយម៉ោង",hh:"%d ម៉ោង",d:"មួយ�្ងៃ",dd:"%d �្ងៃ",M:"មួយ�ែ",MM:"%d �ែ",y:"មួយឆ្នាំ",yy:"%d ឆ្នាំ"},week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){return a.defineLocale("ko",{months:"1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월".split("_"),monthsShort:"1월_2월_3월_4월_5월_6월_7월_8월_9월_10월_11월_12월".split("_"),weekdays:"�요�_월요�_화요�_수요�_목요�_금요�_토요�".split("_"),weekdaysShort:"�_월_화_수_목_금_토".split("_"),weekdaysMin:"�_월_화_수_목_금_토".split("_"),longDateFormat:{LT:"A h시 m분",L:"YYYY.MM.DD",LL:"YYYY년 MMMM D�",LLL:"YYYY년 MMMM D� LT",LLLL:"YYYY년 MMMM D� dddd LT"},meridiem:function(a){return 12>a?"오전":"오후"},calendar:{sameDay:"오늘 LT",nextDay:"내� LT",nextWeek:"dddd LT",lastDay:"어제 LT",lastWeek:"지난주 dddd LT",sameElse:"L"},relativeTime:{future:"%s 후",past:"%s 전",s:"몇초",ss:"%d초",m:"�분",mm:"%d분",h:"한시간",hh:"%d시간",d:"하루",dd:"%d�",M:"한달",MM:"%d달",y:"�년",yy:"%d년"},ordinal:"%d�",meridiemParse:/(오전|오후)/,isPM:function(a){return"오후"===a}})}),function(a){a(sb)}(function(a){function b(a,b,c){var d={m:["eng Minutt","enger Minutt"],h:["eng Stonn","enger Stonn"],d:["een Dag","engem Dag"],M:["ee Mount","engem Mount"],y:["ee Joer","engem Joer"]};return b?d[c][0]:d[c][1]}function c(a){var b=a.substr(0,a.indexOf(" "));return e(b)?"a "+a:"an "+a}function d(a){var b=a.substr(0,a.indexOf(" "));return e(b)?"viru "+a:"virun "+a}function e(a){if(a=parseInt(a,10),isNaN(a))return!1;if(0>a)return!0;if(10>a)return a>=4&&7>=a?!0:!1;if(100>a){var b=a%10,c=a/10;return e(0===b?c:b)}if(1e4>a){for(;a>=10;)a/=10;return e(a)}return a/=1e3,e(a)}return a.defineLocale("lb",{months:"Januar_Februar_Mäerz_Abrëll_Mee_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jan._Febr._Mrz._Abr._Mee_Jun._Jul._Aug._Sept._Okt._Nov._Dez.".split("_"),weekdays:"Sonndeg_Méindeg_Dënschdeg_Mëttwoch_Donneschdeg_Freideg_Samschdeg".split("_"),weekdaysShort:"So._Mé._Dë._Më._Do._Fr._Sa.".split("_"),weekdaysMin:"So_Mé_Dë_Më_Do_Fr_Sa".split("_"),longDateFormat:{LT:"H:mm [Auer]",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[Haut um] LT",sameElse:"L",nextDay:"[Muer um] LT",nextWeek:"dddd [um] LT",lastDay:"[Gëschter um] LT",lastWeek:function(){switch(this.day()){case 2:case 4:return"[Leschten] dddd [um] LT";default:return"[Leschte] dddd [um] LT"}}},relativeTime:{future:c,past:d,s:"e puer Sekonnen",m:b,mm:"%d Minutten",h:b,hh:"%d Stonnen",d:b,dd:"%d Deeg",M:b,MM:"%d Méint",y:b,yy:"%d Joer"},ordinal:"%d.",week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){function b(a,b,c,d){return b?"kelios sekundės":d?"kelių sekundžių":"kelias sekundes"}function c(a,b,c,d){return b?e(c)[0]:d?e(c)[1]:e(c)[2]}function d(a){return a%10===0||a>10&&20>a}function e(a){return h[a].split("_")}function f(a,b,f,g){var h=a+" ";return 1===a?h+c(a,b,f[0],g):b?h+(d(a)?e(f)[1]:e(f)[0]):g?h+e(f)[1]:h+(d(a)?e(f)[1]:e(f)[2])}function g(a,b){var c=-1===b.indexOf("dddd HH:mm"),d=i[a.day()];return c?d:d.substring(0,d.length-2)+"į"}var h={m:"minutė_minutės_minutę",mm:"minutės_minu�ių_minutes",h:"valanda_valandos_valandą",hh:"valandos_valandų_valandas",d:"diena_dienos_dieną",dd:"dienos_dienų_dienas",M:"mėnuo_mėnesio_mėnesį",MM:"mėnesiai_mėnesių_mėnesius",y:"metai_metų_metus",yy:"metai_metų_metus"},i="sekmadienis_pirmadienis_antradienis_tre�iadienis_ketvirtadienis_penktadienis_šeštadienis".split("_");return a.defineLocale("lt",{months:"sausio_vasario_kovo_balandžio_gegužės_birželio_liepos_rugpjū�io_rugsėjo_spalio_lapkri�io_gruodžio".split("_"),monthsShort:"sau_vas_kov_bal_geg_bir_lie_rgp_rgs_spa_lap_grd".split("_"),weekdays:g,weekdaysShort:"Sek_Pir_Ant_Tre_Ket_Pen_Šeš".split("_"),weekdaysMin:"S_P_A_T_K_Pn_Š".split("_"),longDateFormat:{LT:"HH:mm",L:"YYYY-MM-DD",LL:"YYYY [m.] MMMM D [d.]",LLL:"YYYY [m.] MMMM D [d.], LT [val.]",LLLL:"YYYY [m.] MMMM D [d.], dddd, LT [val.]",l:"YYYY-MM-DD",ll:"YYYY [m.] MMMM D [d.]",lll:"YYYY [m.] MMMM D [d.], LT [val.]",llll:"YYYY [m.] MMMM D [d.], ddd, LT [val.]"},calendar:{sameDay:"[Šiandien] LT",nextDay:"[Rytoj] LT",nextWeek:"dddd LT",lastDay:"[Vakar] LT",lastWeek:"[Praėjusį] dddd LT",sameElse:"L"},relativeTime:{future:"po %s",past:"prieš %s",s:b,m:c,mm:f,h:c,hh:f,d:c,dd:f,M:c,MM:f,y:c,yy:f},ordinal:function(a){return a+"-oji"},week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){function b(a,b,c){var d=a.split("_");return c?b%10===1&&11!==b?d[2]:d[3]:b%10===1&&11!==b?d[0]:d[1]}function c(a,c,e){return a+" "+b(d[e],a,c)}var d={mm:"minūti_minūtes_minūte_minūtes",hh:"stundu_stundas_stunda_stundas",dd:"dienu_dienas_diena_dienas",MM:"mēnesi_mēnešus_mēnesis_mēneši",yy:"gadu_gadus_gads_gadi"};return a.defineLocale("lv",{months:"janv�ris_febru�ris_marts_aprīlis_maijs_jūnijs_jūlijs_augusts_septembris_oktobris_novembris_decembris".split("_"),monthsShort:"jan_feb_mar_apr_mai_jūn_jūl_aug_sep_okt_nov_dec".split("_"),weekdays:"svētdiena_pirmdiena_otrdiena_trešdiena_ceturtdiena_piektdiena_sestdiena".split("_"),weekdaysShort:"Sv_P_O_T_C_Pk_S".split("_"),weekdaysMin:"Sv_P_O_T_C_Pk_S".split("_"),longDateFormat:{LT:"HH:mm",L:"DD.MM.YYYY",LL:"YYYY. [gada] D. MMMM",LLL:"YYYY. [gada] D. MMMM, LT",LLLL:"YYYY. [gada] D. MMMM, dddd, LT"},calendar:{sameDay:"[Šodien pulksten] LT",nextDay:"[Rīt pulksten] LT",nextWeek:"dddd [pulksten] LT",lastDay:"[Vakar pulksten] LT",lastWeek:"[Pag�juš�] dddd [pulksten] LT",sameElse:"L"},relativeTime:{future:"%s vēl�k",past:"%s agr�k",s:"dažas sekundes",m:"minūti",mm:c,h:"stundu",hh:c,d:"dienu",dd:c,M:"mēnesi",MM:c,y:"gadu",yy:c},ordinal:"%d.",week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){return a.defineLocale("mk",{months:"јануари_февруари_март_април_мај_јуни_јули_авгу�т_�ептември_октомври_ноември_декември".split("_"),monthsShort:"јан_фев_мар_апр_мај_јун_јул_авг_�еп_окт_ное_дек".split("_"),weekdays:"недела_понеделник_вторник_�реда_четврток_петок_�абота".split("_"),weekdaysShort:"нед_пон_вто_�ре_чет_пет_�аб".split("_"),weekdaysMin:"нe_пo_вт_�р_че_пе_�a".split("_"),longDateFormat:{LT:"H:mm",L:"D.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Дене� во] LT",nextDay:"[Утре во] LT",nextWeek:"dddd [во] LT",lastDay:"[Вчера во] LT",lastWeek:function(){switch(this.day()){case 0:case 3:case 6:return"[Во изминатата] dddd [во] LT";case 1:case 2:case 4:case 5:return"[Во изминатиот] dddd [во] LT"}},sameElse:"L"},relativeTime:{future:"по�ле %s",past:"пред %s",s:"неколку �екунди",m:"минута",mm:"%d минути",h:"ча�",hh:"%d ча�а",d:"ден",dd:"%d дена",M:"ме�ец",MM:"%d ме�еци",y:"година",yy:"%d години"},ordinal:function(a){var b=a%10,c=a%100;return 0===a?a+"-ев":0===c?a+"-ен":c>10&&20>c?a+"-ти":1===b?a+"-ви":2===b?a+"-ри":7===b||8===b?a+"-ми":a+"-ти"},week:{dow:1,doy:7}})}),function(a){a(sb)}(function(a){return a.defineLocale("ml",{months:"ജന�വരി_ഫെബ�ര�വരി_മാർച�ച�_�പ�രിൽ_മേയ�_ജൂൺ_ജൂലൈ_ഓഗസ�റ�റ�_സെപ�റ�റംബർ_ഒക�ടോബർ_നവംബർ_ഡിസംബർ".split("_"),monthsShort:"ജന�._ഫെബ�ര�._മാർ._�പ�രി._മേയ�_ജൂൺ_ജൂലൈ._ഓഗ._സെപ�റ�റ._ഒക�ടോ._നവം._ഡിസം.".split("_"),weekdays:"ഞായറാഴ�ച_തിങ�കളാഴ�ച_ചൊവ�വാഴ�ച_ബ�ധനാഴ�ച_വ�യാഴാഴ�ച_വെള�ളിയാഴ�ച_ശനിയാഴ�ച".split("_"),weekdaysShort:"ഞായർ_തിങ�കൾ_ചൊവ�വ_ബ�ധൻ_വ�യാഴം_വെള�ളി_ശനി".split("_"),weekdaysMin:"ഞാ_തി_ചൊ_ബ�_വ�യാ_വെ_ശ".split("_"),longDateFormat:{LT:"A h:mm -ന�",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, LT",LLLL:"dddd, D MMMM YYYY, LT"},calendar:{sameDay:"[ഇന�ന�] LT",nextDay:"[നാളെ] LT",nextWeek:"dddd, LT",lastDay:"[ഇന�നലെ] LT",lastWeek:"[കഴിഞ�ഞ] dddd, LT",sameElse:"L"},relativeTime:{future:"%s കഴിഞ�ഞ�",past:"%s മ�ൻപ�",s:"അൽപ നിമിഷങ�ങൾ",m:"ഒര� മിനിറ�റ�",mm:"%d മിനിറ�റ�",h:"ഒര� മണിക�കൂർ",hh:"%d മണിക�കൂർ",d:"ഒര� ദിവസം",dd:"%d ദിവസം",M:"ഒര� മാസം",MM:"%d മാസം",y:"ഒര� വർഷം",yy:"%d വർഷം"},meridiem:function(a){return 4>a?"രാത�രി":12>a?"രാവിലെ":17>a?"ഉച�ച കഴിഞ�ഞ�":20>a?"വൈക�ന�നേരം":"രാത�രി"}})}),function(a){a(sb)}(function(a){var b={1:"१",2:"२",3:"३",4:"४",5:"५",6:"६",7:"७",8:"८",9:"९",0:"०"},c={"१":"1","२":"2","३":"3","४":"4","५":"5","६":"6","७":"7","८":"8","९":"9","०":"0"};return a.defineLocale("mr",{months:"जानेवारी_फेब�र�वारी_मार�च_�प�रिल_मे_जून_ज�लै_ऑगस�ट_सप�टेंबर_ऑक�टोबर_नोव�हेंबर_डिसेंबर".split("_"),monthsShort:"जाने._फेब�र�._मार�च._�प�रि._मे._जून._ज�लै._ऑग._सप�टें._ऑक�टो._नोव�हें._डिसें.".split("_"),weekdays:"रविवार_सोमवार_मंगळवार_ब�धवार_ग�रूवार_श�क�रवार_शनिवार".split("_"),weekdaysShort:"रवि_सोम_मंगळ_ब�ध_ग�रू_श�क�र_शनि".split("_"),weekdaysMin:"र_सो_मं_ब�_ग�_श�_श".split("_"),longDateFormat:{LT:"A h:mm वाजता",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, LT",LLLL:"dddd, D MMMM YYYY, LT"},calendar:{sameDay:"[आज] LT",nextDay:"[उद�या] LT",nextWeek:"dddd, LT",lastDay:"[काल] LT",lastWeek:"[मागील] dddd, LT",sameElse:"L"},relativeTime:{future:"%s नंतर",past:"%s पूर�वी",s:"सेकंद",m:"�क मिनिट",mm:"%d मिनिटे",h:"�क तास",hh:"%d तास",d:"�क दिवस",dd:"%d दिवस",M:"�क महिना",MM:"%d महिने",y:"�क वर�ष",yy:"%d वर�षे"},preparse:function(a){return a.replace(/[१२३४५६७८९०]/g,function(a){return c[a]})},postformat:function(a){return a.replace(/\d/g,function(a){return b[a]})},meridiem:function(a){return 4>a?"रात�री":10>a?"सकाळी":17>a?"द�पारी":20>a?"सायंकाळी":"रात�री"},week:{dow:0,doy:6}})}),function(a){a(sb)}(function(a){return a.defineLocale("ms-my",{months:"Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember".split("_"),monthsShort:"Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis".split("_"),weekdays:"Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu".split("_"),weekdaysShort:"Ahd_Isn_Sel_Rab_Kha_Jum_Sab".split("_"),weekdaysMin:"Ah_Is_Sl_Rb_Km_Jm_Sb".split("_"),longDateFormat:{LT:"HH.mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [pukul] LT",LLLL:"dddd, D MMMM YYYY [pukul] LT"},meridiem:function(a){return 11>a?"pagi":15>a?"tengahari":19>a?"petang":"malam"},calendar:{sameDay:"[Hari ini pukul] LT",nextDay:"[Esok pukul] LT",nextWeek:"dddd [pukul] LT",lastDay:"[Kelmarin pukul] LT",lastWeek:"dddd [lepas pukul] LT",sameElse:"L"},relativeTime:{future:"dalam %s",past:"%s yang lepas",s:"beberapa saat",m:"seminit",mm:"%d minit",h:"sejam",hh:"%d jam",d:"sehari",dd:"%d hari",M:"sebulan",MM:"%d bulan",y:"setahun",yy:"%d tahun"},week:{dow:1,doy:7}})}),function(a){a(sb)}(function(a){var b={1:"�",2:"�",3:"�",4:"�",5:"�",6:"�",7:"�",8:"�",9:"�",0:"�"},c={"�":"1","�":"2","�":"3","�":"4","�":"5","�":"6","�":"7","�":"8","�":"9","�":"0"};return a.defineLocale("my",{months:"ဇန်န�ါရီ_ဖေဖော်�ါရီ_မ�်_ဧပြီ_မေ_ဇွန်_ဇူလိုင်_သြဂု�်_စက်�င်ဘာ_အောက်�ိုဘာ_နို�င်ဘာ_ဒီဇင်ဘာ".split("_"),monthsShort:"ဇန်_ဖေ_မ�်_ပြီ_မေ_ဇွန်_လိုင်_သြ_စက်_အောက်_နို_ဒီ".split("_"),weekdays:"�နင်္ဂနွေ_�နင်္လာ_အင်္ဂါ_ဗုဒ္ဓဟူး_ကြာသပ�ေး_သောကြာ_စနေ".split("_"),weekdaysShort:"နွေ_လာ_င်္ဂါ_ဟူး_ကြာ_သော_နေ".split("_"),weekdaysMin:"နွေ_လာ_င်္ဂါ_ဟူး_ကြာ_သော_နေ".split("_"),longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[ယနေ.] LT [မှာ]",nextDay:"[မနက်ဖြန်] LT [မှာ]",nextWeek:"dddd LT [မှာ]",lastDay:"[မနေ.က] LT [မှာ]",lastWeek:"[ပြီး�ဲ့သော] dddd LT [မှာ]",sameElse:"L"},relativeTime:{future:"လာမည့် %s မှာ",past:"လွန်�ဲ့သော %s က",s:"စက္ကန်.အနည်းငယ်",m:"�စ်မိနစ်",mm:"%d မိနစ်",h:"�စ်နာရီ",hh:"%d နာရီ",d:"�စ်ရက်",dd:"%d ရက်",M:"�စ်လ",MM:"%d လ",y:"�စ်နှစ်",yy:"%d နှစ်"},preparse:function(a){return a.replace(/[����������]/g,function(a){return c[a]})},postformat:function(a){return a.replace(/\d/g,function(a){return b[a]
+})},week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){return a.defineLocale("nb",{months:"januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember".split("_"),monthsShort:"jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_"),weekdays:"søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag".split("_"),weekdaysShort:"søn_man_tirs_ons_tors_fre_lør".split("_"),weekdaysMin:"sø_ma_ti_on_to_fr_lø".split("_"),longDateFormat:{LT:"H.mm",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY [kl.] LT",LLLL:"dddd D. MMMM YYYY [kl.] LT"},calendar:{sameDay:"[i dag kl.] LT",nextDay:"[i morgen kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[i går kl.] LT",lastWeek:"[forrige] dddd [kl.] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"for %s siden",s:"noen sekunder",m:"ett minutt",mm:"%d minutter",h:"en time",hh:"%d timer",d:"en dag",dd:"%d dager",M:"en måned",MM:"%d måneder",y:"ett år",yy:"%d år"},ordinal:"%d.",week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){var b={1:"१",2:"२",3:"३",4:"४",5:"५",6:"६",7:"७",8:"८",9:"९",0:"०"},c={"१":"1","२":"2","३":"3","४":"4","५":"5","६":"6","७":"7","८":"8","९":"9","०":"0"};return a.defineLocale("ne",{months:"जनवरी_फेब�र�वरी_मार�च_अप�रिल_मई_ज�न_ज�लाई_अगष�ट_सेप�टेम�बर_अक�टोबर_नोभेम�बर_डिसेम�बर".split("_"),monthsShort:"जन._फेब�र�._मार�च_अप�रि._मई_ज�न_ज�लाई._अग._सेप�ट._अक�टो._नोभे._डिसे.".split("_"),weekdays:"आइतबार_सोमबार_मङ�गलबार_ब�धबार_बिहिबार_श�क�रबार_शनिबार".split("_"),weekdaysShort:"आइत._सोम._मङ�गल._ब�ध._बिहि._श�क�र._शनि.".split("_"),weekdaysMin:"आइ._सो._मङ�_ब�._बि._श�._श.".split("_"),longDateFormat:{LT:"Aको h:mm बजे",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, LT",LLLL:"dddd, D MMMM YYYY, LT"},preparse:function(a){return a.replace(/[१२३४५६७८९०]/g,function(a){return c[a]})},postformat:function(a){return a.replace(/\d/g,function(a){return b[a]})},meridiem:function(a){return 3>a?"राती":10>a?"बिहान":15>a?"दिउ�सो":18>a?"बेल�का":20>a?"सा��":"राती"},calendar:{sameDay:"[आज] LT",nextDay:"[भोली] LT",nextWeek:"[आउ�दो] dddd[,] LT",lastDay:"[हिजो] LT",lastWeek:"[ग�को] dddd[,] LT",sameElse:"L"},relativeTime:{future:"%sमा",past:"%s अगाडी",s:"केही समय",m:"�क मिनेट",mm:"%d मिनेट",h:"�क घण�टा",hh:"%d घण�टा",d:"�क दिन",dd:"%d दिन",M:"�क महिना",MM:"%d महिना",y:"�क बर�ष",yy:"%d बर�ष"},week:{dow:1,doy:7}})}),function(a){a(sb)}(function(a){var b="jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.".split("_"),c="jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec".split("_");return a.defineLocale("nl",{months:"januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december".split("_"),monthsShort:function(a,d){return/-MMM-/.test(d)?c[a.month()]:b[a.month()]},weekdays:"zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag".split("_"),weekdaysShort:"zo._ma._di._wo._do._vr._za.".split("_"),weekdaysMin:"Zo_Ma_Di_Wo_Do_Vr_Za".split("_"),longDateFormat:{LT:"HH:mm",L:"DD-MM-YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[vandaag om] LT",nextDay:"[morgen om] LT",nextWeek:"dddd [om] LT",lastDay:"[gisteren om] LT",lastWeek:"[afgelopen] dddd [om] LT",sameElse:"L"},relativeTime:{future:"over %s",past:"%s geleden",s:"een paar seconden",m:"één minuut",mm:"%d minuten",h:"één uur",hh:"%d uur",d:"één dag",dd:"%d dagen",M:"één maand",MM:"%d maanden",y:"één jaar",yy:"%d jaar"},ordinal:function(a){return a+(1===a||8===a||a>=20?"ste":"de")},week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){return a.defineLocale("nn",{months:"januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember".split("_"),monthsShort:"jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_"),weekdays:"sundag_måndag_tysdag_onsdag_torsdag_fredag_laurdag".split("_"),weekdaysShort:"sun_mån_tys_ons_tor_fre_lau".split("_"),weekdaysMin:"su_må_ty_on_to_fr_lø".split("_"),longDateFormat:{LT:"HH:mm",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[I dag klokka] LT",nextDay:"[I morgon klokka] LT",nextWeek:"dddd [klokka] LT",lastDay:"[I går klokka] LT",lastWeek:"[Føregåande] dddd [klokka] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"for %s sidan",s:"nokre sekund",m:"eit minutt",mm:"%d minutt",h:"ein time",hh:"%d timar",d:"ein dag",dd:"%d dagar",M:"ein månad",MM:"%d månader",y:"eit år",yy:"%d år"},ordinal:"%d.",week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){function b(a){return 5>a%10&&a%10>1&&~~(a/10)%10!==1}function c(a,c,d){var e=a+" ";switch(d){case"m":return c?"minuta":"minutę";case"mm":return e+(b(a)?"minuty":"minut");case"h":return c?"godzina":"godzinę";case"hh":return e+(b(a)?"godziny":"godzin");case"MM":return e+(b(a)?"miesiące":"miesięcy");case"yy":return e+(b(a)?"lata":"lat")}}var d="styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień".split("_"),e="stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia".split("_");return a.defineLocale("pl",{months:function(a,b){return/D MMMM/.test(b)?e[a.month()]:d[a.month()]},monthsShort:"sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru".split("_"),weekdays:"niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota".split("_"),weekdaysShort:"nie_pon_wt_śr_czw_pt_sb".split("_"),weekdaysMin:"N_Pn_Wt_Śr_Cz_Pt_So".split("_"),longDateFormat:{LT:"HH:mm",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Dziś o] LT",nextDay:"[Jutro o] LT",nextWeek:"[W] dddd [o] LT",lastDay:"[Wczoraj o] LT",lastWeek:function(){switch(this.day()){case 0:return"[W zeszłą niedzielę o] LT";case 3:return"[W zeszłą środę o] LT";case 6:return"[W zeszłą sobotę o] LT";default:return"[W zeszły] dddd [o] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"%s temu",s:"kilka sekund",m:c,mm:c,h:c,hh:c,d:"1 dzień",dd:"%d dni",M:"miesiąc",MM:c,y:"rok",yy:c},ordinal:"%d.",week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){return a.defineLocale("pt-br",{months:"janeiro_fevereiro_março_abril_maio_junho_julho_agosto_setembro_outubro_novembro_dezembro".split("_"),monthsShort:"jan_fev_mar_abr_mai_jun_jul_ago_set_out_nov_dez".split("_"),weekdays:"domingo_segunda-feira_terça-feira_quarta-feira_quinta-feira_sexta-feira_sábado".split("_"),weekdaysShort:"dom_seg_ter_qua_qui_sex_sáb".split("_"),weekdaysMin:"dom_2ª_3ª_4ª_5ª_6ª_sáb".split("_"),longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY [às] LT",LLLL:"dddd, D [de] MMMM [de] YYYY [às] LT"},calendar:{sameDay:"[Hoje às] LT",nextDay:"[Amanhã às] LT",nextWeek:"dddd [às] LT",lastDay:"[Ontem às] LT",lastWeek:function(){return 0===this.day()||6===this.day()?"[Último] dddd [às] LT":"[Última] dddd [às] LT"},sameElse:"L"},relativeTime:{future:"em %s",past:"%s atrás",s:"segundos",m:"um minuto",mm:"%d minutos",h:"uma hora",hh:"%d horas",d:"um dia",dd:"%d dias",M:"um mês",MM:"%d meses",y:"um ano",yy:"%d anos"},ordinal:"%dº"})}),function(a){a(sb)}(function(a){return a.defineLocale("pt",{months:"janeiro_fevereiro_março_abril_maio_junho_julho_agosto_setembro_outubro_novembro_dezembro".split("_"),monthsShort:"jan_fev_mar_abr_mai_jun_jul_ago_set_out_nov_dez".split("_"),weekdays:"domingo_segunda-feira_terça-feira_quarta-feira_quinta-feira_sexta-feira_sábado".split("_"),weekdaysShort:"dom_seg_ter_qua_qui_sex_sáb".split("_"),weekdaysMin:"dom_2ª_3ª_4ª_5ª_6ª_sáb".split("_"),longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY LT",LLLL:"dddd, D [de] MMMM [de] YYYY LT"},calendar:{sameDay:"[Hoje às] LT",nextDay:"[Amanhã às] LT",nextWeek:"dddd [às] LT",lastDay:"[Ontem às] LT",lastWeek:function(){return 0===this.day()||6===this.day()?"[Último] dddd [às] LT":"[Última] dddd [às] LT"},sameElse:"L"},relativeTime:{future:"em %s",past:"há %s",s:"segundos",m:"um minuto",mm:"%d minutos",h:"uma hora",hh:"%d horas",d:"um dia",dd:"%d dias",M:"um mês",MM:"%d meses",y:"um ano",yy:"%d anos"},ordinal:"%dº",week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){function b(a,b,c){var d={mm:"minute",hh:"ore",dd:"zile",MM:"luni",yy:"ani"},e=" ";return(a%100>=20||a>=100&&a%100===0)&&(e=" de "),a+e+d[c]}return a.defineLocale("ro",{months:"ianuarie_februarie_martie_aprilie_mai_iunie_iulie_august_septembrie_octombrie_noiembrie_decembrie".split("_"),monthsShort:"ian._febr._mart._apr._mai_iun._iul._aug._sept._oct._nov._dec.".split("_"),weekdays:"duminică_luni_marți_miercuri_joi_vineri_sâmbătă".split("_"),weekdaysShort:"Dum_Lun_Mar_Mie_Joi_Vin_Sâm".split("_"),weekdaysMin:"Du_Lu_Ma_Mi_Jo_Vi_Sâ".split("_"),longDateFormat:{LT:"H:mm",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY H:mm",LLLL:"dddd, D MMMM YYYY H:mm"},calendar:{sameDay:"[azi la] LT",nextDay:"[mâine la] LT",nextWeek:"dddd [la] LT",lastDay:"[ieri la] LT",lastWeek:"[fosta] dddd [la] LT",sameElse:"L"},relativeTime:{future:"peste %s",past:"%s în urmă",s:"câteva secunde",m:"un minut",mm:b,h:"o oră",hh:b,d:"o zi",dd:b,M:"o lună",MM:b,y:"un an",yy:b},week:{dow:1,doy:7}})}),function(a){a(sb)}(function(a){function b(a,b){var c=a.split("_");return b%10===1&&b%100!==11?c[0]:b%10>=2&&4>=b%10&&(10>b%100||b%100>=20)?c[1]:c[2]}function c(a,c,d){var e={mm:c?"минута_минуты_минут":"минуту_минуты_минут",hh:"ча�_ча�а_ча�ов",dd:"день_дн�_дней",MM:"ме��ц_ме��ца_ме��цев",yy:"год_года_лет"};return"m"===d?c?"минута":"минуту":a+" "+b(e[d],+a)}function d(a,b){var c={nominative:"�нварь_февраль_март_апрель_май_июнь_июль_авгу�т_�ент�брь_окт�брь_но�брь_декабрь".split("_"),accusative:"�нвар�_феврал�_марта_апрел�_ма�_июн�_июл�_авгу�та_�ент�бр�_окт�бр�_но�бр�_декабр�".split("_")},d=/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/.test(b)?"accusative":"nominative";return c[d][a.month()]}function e(a,b){var c={nominative:"�нв_фев_мар_апр_май_июнь_июль_авг_�ен_окт_но�_дек".split("_"),accusative:"�нв_фев_мар_апр_ма�_июн�_июл�_авг_�ен_окт_но�_дек".split("_")},d=/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/.test(b)?"accusative":"nominative";return c[d][a.month()]}function f(a,b){var c={nominative:"во�кре�енье_понедельник_вторник_�реда_четверг_п�тница_�уббота".split("_"),accusative:"во�кре�енье_понедельник_вторник_�реду_четверг_п�тницу_�убботу".split("_")},d=/\[ ?[Вв] ?(?:прошлую|�ледующую)? ?\] ?dddd/.test(b)?"accusative":"nominative";return c[d][a.day()]}return a.defineLocale("ru",{months:d,monthsShort:e,weekdays:f,weekdaysShort:"в�_пн_вт_�р_чт_пт_�б".split("_"),weekdaysMin:"в�_пн_вт_�р_чт_пт_�б".split("_"),monthsParse:[/^�нв/i,/^фев/i,/^мар/i,/^апр/i,/^ма[й|�]/i,/^июн/i,/^июл/i,/^авг/i,/^�ен/i,/^окт/i,/^но�/i,/^дек/i],longDateFormat:{LT:"HH:mm",L:"DD.MM.YYYY",LL:"D MMMM YYYY г.",LLL:"D MMMM YYYY г., LT",LLLL:"dddd, D MMMM YYYY г., LT"},calendar:{sameDay:"[Сегодн� в] LT",nextDay:"[Завтра в] LT",lastDay:"[Вчера в] LT",nextWeek:function(){return 2===this.day()?"[Во] dddd [в] LT":"[В] dddd [в] LT"},lastWeek:function(){switch(this.day()){case 0:return"[В прошлое] dddd [в] LT";case 1:case 2:case 4:return"[В прошлый] dddd [в] LT";case 3:case 5:case 6:return"[В прошлую] dddd [в] LT"}},sameElse:"L"},relativeTime:{future:"через %s",past:"%s назад",s:"не�колько �екунд",m:c,mm:c,h:"ча�",hh:c,d:"день",dd:c,M:"ме��ц",MM:c,y:"год",yy:c},meridiemParse:/ночи|утра|дн�|вечера/i,isPM:function(a){return/^(дн�|вечера)$/.test(a)},meridiem:function(a){return 4>a?"ночи":12>a?"утра":17>a?"дн�":"вечера"},ordinal:function(a,b){switch(b){case"M":case"d":case"DDD":return a+"-й";case"D":return a+"-го";case"w":case"W":return a+"-�";default:return a}},week:{dow:1,doy:7}})}),function(a){a(sb)}(function(a){function b(a){return a>1&&5>a}function c(a,c,d,e){var f=a+" ";switch(d){case"s":return c||e?"pár sekúnd":"pár sekundami";case"m":return c?"minúta":e?"minútu":"minútou";case"mm":return c||e?f+(b(a)?"minúty":"minút"):f+"minútami";break;case"h":return c?"hodina":e?"hodinu":"hodinou";case"hh":return c||e?f+(b(a)?"hodiny":"hodín"):f+"hodinami";break;case"d":return c||e?"deň":"dňom";case"dd":return c||e?f+(b(a)?"dni":"dní"):f+"dňami";break;case"M":return c||e?"mesiac":"mesiacom";case"MM":return c||e?f+(b(a)?"mesiace":"mesiacov"):f+"mesiacmi";break;case"y":return c||e?"rok":"rokom";case"yy":return c||e?f+(b(a)?"roky":"rokov"):f+"rokmi"}}var d="január_február_marec_apríl_máj_jún_júl_august_september_október_november_december".split("_"),e="jan_feb_mar_apr_máj_jún_júl_aug_sep_okt_nov_dec".split("_");return a.defineLocale("sk",{months:d,monthsShort:e,monthsParse:function(a,b){var c,d=[];for(c=0;12>c;c++)d[c]=new RegExp("^"+a[c]+"$|^"+b[c]+"$","i");return d}(d,e),weekdays:"nedeľa_pondelok_utorok_streda_štvrtok_piatok_sobota".split("_"),weekdaysShort:"ne_po_ut_st_št_pi_so".split("_"),weekdaysMin:"ne_po_ut_st_št_pi_so".split("_"),longDateFormat:{LT:"H:mm",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd D. MMMM YYYY LT"},calendar:{sameDay:"[dnes o] LT",nextDay:"[zajtra o] LT",nextWeek:function(){switch(this.day()){case 0:return"[v nedeľu o] LT";case 1:case 2:return"[v] dddd [o] LT";case 3:return"[v stredu o] LT";case 4:return"[vo štvrtok o] LT";case 5:return"[v piatok o] LT";case 6:return"[v sobotu o] LT"}},lastDay:"[v�era o] LT",lastWeek:function(){switch(this.day()){case 0:return"[minulú nedeľu o] LT";case 1:case 2:return"[minulý] dddd [o] LT";case 3:return"[minulú stredu o] LT";case 4:case 5:return"[minulý] dddd [o] LT";case 6:return"[minulú sobotu o] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"pred %s",s:c,m:c,mm:c,h:c,hh:c,d:c,dd:c,M:c,MM:c,y:c,yy:c},ordinal:"%d.",week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){function b(a,b,c){var d=a+" ";switch(c){case"m":return b?"ena minuta":"eno minuto";case"mm":return d+=1===a?"minuta":2===a?"minuti":3===a||4===a?"minute":"minut";case"h":return b?"ena ura":"eno uro";case"hh":return d+=1===a?"ura":2===a?"uri":3===a||4===a?"ure":"ur";case"dd":return d+=1===a?"dan":"dni";case"MM":return d+=1===a?"mesec":2===a?"meseca":3===a||4===a?"mesece":"mesecev";case"yy":return d+=1===a?"leto":2===a?"leti":3===a||4===a?"leta":"let"}}return a.defineLocale("sl",{months:"januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december".split("_"),monthsShort:"jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.".split("_"),weekdays:"nedelja_ponedeljek_torek_sreda_�etrtek_petek_sobota".split("_"),weekdaysShort:"ned._pon._tor._sre._�et._pet._sob.".split("_"),weekdaysMin:"ne_po_to_sr_�e_pe_so".split("_"),longDateFormat:{LT:"H:mm",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[danes ob] LT",nextDay:"[jutri ob] LT",nextWeek:function(){switch(this.day()){case 0:return"[v] [nedeljo] [ob] LT";case 3:return"[v] [sredo] [ob] LT";case 6:return"[v] [soboto] [ob] LT";case 1:case 2:case 4:case 5:return"[v] dddd [ob] LT"}},lastDay:"[v�eraj ob] LT",lastWeek:function(){switch(this.day()){case 0:case 3:case 6:return"[prejšnja] dddd [ob] LT";case 1:case 2:case 4:case 5:return"[prejšnji] dddd [ob] LT"}},sameElse:"L"},relativeTime:{future:"�ez %s",past:"%s nazaj",s:"nekaj sekund",m:b,mm:b,h:b,hh:b,d:"en dan",dd:b,M:"en mesec",MM:b,y:"eno leto",yy:b},ordinal:"%d.",week:{dow:1,doy:7}})}),function(a){a(sb)}(function(a){return a.defineLocale("sq",{months:"Janar_Shkurt_Mars_Prill_Maj_Qershor_Korrik_Gusht_Shtator_Tetor_Nëntor_Dhjetor".split("_"),monthsShort:"Jan_Shk_Mar_Pri_Maj_Qer_Kor_Gus_Sht_Tet_Nën_Dhj".split("_"),weekdays:"E Diel_E Hënë_E Martë_E Mërkurë_E Enjte_E Premte_E Shtunë".split("_"),weekdaysShort:"Die_Hën_Mar_Mër_Enj_Pre_Sht".split("_"),weekdaysMin:"D_H_Ma_Më_E_P_Sh".split("_"),meridiem:function(a){return 12>a?"PD":"MD"},longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[Sot në] LT",nextDay:"[Nesër në] LT",nextWeek:"dddd [në] LT",lastDay:"[Dje në] LT",lastWeek:"dddd [e kaluar në] LT",sameElse:"L"},relativeTime:{future:"në %s",past:"%s më parë",s:"disa sekonda",m:"një minutë",mm:"%d minuta",h:"një orë",hh:"%d orë",d:"një ditë",dd:"%d ditë",M:"një muaj",MM:"%d muaj",y:"një vit",yy:"%d vite"},ordinal:"%d.",week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){var b={words:{m:["један минут","једне минуте"],mm:["минут","минуте","минута"],h:["један �ат","једног �ата"],hh:["�ат","�ата","�ати"],dd:["дан","дана","дана"],MM:["ме�ец","ме�еца","ме�еци"],yy:["година","године","година"]},correctGrammaticalCase:function(a,b){return 1===a?b[0]:a>=2&&4>=a?b[1]:b[2]},translate:function(a,c,d){var e=b.words[d];return 1===d.length?c?e[0]:e[1]:a+" "+b.correctGrammaticalCase(a,e)}};return a.defineLocale("sr-cyrl",{months:["јануар","фебруар","март","април","мај","јун","јул","авгу�т","�ептембар","октобар","новембар","децембар"],monthsShort:["јан.","феб.","мар.","апр.","мај","јун","јул","авг.","�еп.","окт.","нов.","дец."],weekdays:["недеља","понедељак","уторак","�реда","четвртак","петак","�убота"],weekdaysShort:["нед.","пон.","уто.","�ре.","чет.","пет.","�уб."],weekdaysMin:["не","по","ут","�р","че","пе","�у"],longDateFormat:{LT:"H:mm",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[дана� у] LT",nextDay:"[�утра у] LT",nextWeek:function(){switch(this.day()){case 0:return"[у] [недељу] [у] LT";case 3:return"[у] [�реду] [у] LT";case 6:return"[у] [�уботу] [у] LT";case 1:case 2:case 4:case 5:return"[у] dddd [у] LT"}},lastDay:"[јуче у] LT",lastWeek:function(){var a=["[прошле] [недеље] [у] LT","[прошлог] [понедељка] [у] LT","[прошлог] [уторка] [у] LT","[прошле] [�реде] [у] LT","[прошлог] [четвртка] [у] LT","[прошлог] [петка] [у] LT","[прошле] [�уботе] [у] LT"];return a[this.day()]},sameElse:"L"},relativeTime:{future:"за %s",past:"пре %s",s:"неколико �екунди",m:b.translate,mm:b.translate,h:b.translate,hh:b.translate,d:"дан",dd:b.translate,M:"ме�ец",MM:b.translate,y:"годину",yy:b.translate},ordinal:"%d.",week:{dow:1,doy:7}})}),function(a){a(sb)}(function(a){var b={words:{m:["jedan minut","jedne minute"],mm:["minut","minute","minuta"],h:["jedan sat","jednog sata"],hh:["sat","sata","sati"],dd:["dan","dana","dana"],MM:["mesec","meseca","meseci"],yy:["godina","godine","godina"]},correctGrammaticalCase:function(a,b){return 1===a?b[0]:a>=2&&4>=a?b[1]:b[2]},translate:function(a,c,d){var e=b.words[d];return 1===d.length?c?e[0]:e[1]:a+" "+b.correctGrammaticalCase(a,e)}};return a.defineLocale("sr",{months:["januar","februar","mart","april","maj","jun","jul","avgust","septembar","oktobar","novembar","decembar"],monthsShort:["jan.","feb.","mar.","apr.","maj","jun","jul","avg.","sep.","okt.","nov.","dec."],weekdays:["nedelja","ponedeljak","utorak","sreda","�etvrtak","petak","subota"],weekdaysShort:["ned.","pon.","uto.","sre.","�et.","pet.","sub."],weekdaysMin:["ne","po","ut","sr","�e","pe","su"],longDateFormat:{LT:"H:mm",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY LT",LLLL:"dddd, D. MMMM YYYY LT"},calendar:{sameDay:"[danas u] LT",nextDay:"[sutra u] LT",nextWeek:function(){switch(this.day()){case 0:return"[u] [nedelju] [u] LT";case 3:return"[u] [sredu] [u] LT";case 6:return"[u] [subotu] [u] LT";case 1:case 2:case 4:case 5:return"[u] dddd [u] LT"}},lastDay:"[ju�e u] LT",lastWeek:function(){var a=["[prošle] [nedelje] [u] LT","[prošlog] [ponedeljka] [u] LT","[prošlog] [utorka] [u] LT","[prošle] [srede] [u] LT","[prošlog] [�etvrtka] [u] LT","[prošlog] [petka] [u] LT","[prošle] [subote] [u] LT"];return a[this.day()]},sameElse:"L"},relativeTime:{future:"za %s",past:"pre %s",s:"nekoliko sekundi",m:b.translate,mm:b.translate,h:b.translate,hh:b.translate,d:"dan",dd:b.translate,M:"mesec",MM:b.translate,y:"godinu",yy:b.translate},ordinal:"%d.",week:{dow:1,doy:7}})}),function(a){a(sb)}(function(a){return a.defineLocale("sv",{months:"januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec".split("_"),weekdays:"söndag_måndag_tisdag_onsdag_torsdag_fredag_lördag".split("_"),weekdaysShort:"sön_mån_tis_ons_tor_fre_lör".split("_"),weekdaysMin:"sö_må_ti_on_to_fr_lö".split("_"),longDateFormat:{LT:"HH:mm",L:"YYYY-MM-DD",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[Idag] LT",nextDay:"[Imorgon] LT",lastDay:"[Igår] LT",nextWeek:"dddd LT",lastWeek:"[Förra] dddd[en] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"för %s sedan",s:"några sekunder",m:"en minut",mm:"%d minuter",h:"en timme",hh:"%d timmar",d:"en dag",dd:"%d dagar",M:"en månad",MM:"%d månader",y:"ett år",yy:"%d år"},ordinal:function(a){var b=a%10,c=1===~~(a%100/10)?"e":1===b?"a":2===b?"a":3===b?"e":"e";return a+c},week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){return a.defineLocale("ta",{months:"ஜனவரி_பிப�ரவரி_மார�ச�_�ப�ரல�_மே_ஜூன�_ஜூலை_ஆகஸ�ட�_செப�டெம�பர�_அக�டோபர�_நவம�பர�_டிசம�பர�".split("_"),monthsShort:"ஜனவரி_பிப�ரவரி_மார�ச�_�ப�ரல�_மே_ஜூன�_ஜூலை_ஆகஸ�ட�_செப�டெம�பர�_அக�டோபர�_நவம�பர�_டிசம�பர�".split("_"),weekdays:"ஞாயிற�ற�க�கிழமை_திங�கட�கிழமை_செவ�வாய�கிழமை_ப�தன�கிழமை_வியாழக�கிழமை_வெள�ளிக�கிழமை_சனிக�கிழமை".split("_"),weekdaysShort:"ஞாயிற�_திங�கள�_செவ�வாய�_ப�தன�_வியாழன�_வெள�ளி_சனி".split("_"),weekdaysMin:"ஞா_தி_செ_ப�_வி_வெ_ச".split("_"),longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, LT",LLLL:"dddd, D MMMM YYYY, LT"},calendar:{sameDay:"[இன�ற�] LT",nextDay:"[நாளை] LT",nextWeek:"dddd, LT",lastDay:"[நேற�ற�] LT",lastWeek:"[கடந�த வாரம�] dddd, LT",sameElse:"L"},relativeTime:{future:"%s இல�",past:"%s ம�ன�",s:"ஒர� சில விநாடிகள�",m:"ஒர� நிமிடம�",mm:"%d நிமிடங�கள�",h:"ஒர� மணி நேரம�",hh:"%d மணி நேரம�",d:"ஒர� நாள�",dd:"%d நாட�கள�",M:"ஒர� மாதம�",MM:"%d மாதங�கள�",y:"ஒர� வர�டம�",yy:"%d ஆண�ட�கள�"},ordinal:function(a){return a+"வத�"},meridiem:function(a){return a>=6&&10>=a?" காலை":a>=10&&14>=a?" நண�பகல�":a>=14&&18>=a?" எற�பாட�":a>=18&&20>=a?" மாலை":a>=20&&24>=a?" இரவ�":a>=0&&6>=a?" வைகறை":void 0},week:{dow:0,doy:6}})}),function(a){a(sb)}(function(a){return a.defineLocale("th",{months:"ม�ราคม_�ุมภาพันธ์_มีนาคม_เมษายน_พฤษภาคม_มิถุนายน_�ร�ฎาคม_สิงหาคม_�ันยายน_ตุลาคม_พฤศจิ�ายน_ธันวาคม".split("_"),monthsShort:"ม�รา_�ุมภา_มีนา_เมษา_พฤษภา_มิถุนา_�ร�ฎา_สิงหา_�ันยา_ตุลา_พฤศจิ�า_ธันวา".split("_"),weekdays:"อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัสบดี_ศุ�ร์_เสาร์".split("_"),weekdaysShort:"อาทิตย์_จันทร์_อังคาร_พุธ_พฤหัส_ศุ�ร์_เสาร์".split("_"),weekdaysMin:"อา._จ._อ._พ._พฤ._ศ._ส.".split("_"),longDateFormat:{LT:"H นาฬิ�า m นาที",L:"YYYY/MM/DD",LL:"D MMMM YYYY",LLL:"D MMMM YYYY เวลา LT",LLLL:"วันddddที่ D MMMM YYYY เวลา LT"},meridiem:function(a){return 12>a?"�่อนเที่ยง":"หลังเที่ยง"},calendar:{sameDay:"[วันนี้ เวลา] LT",nextDay:"[พรุ่งนี้ เวลา] LT",nextWeek:"dddd[หน้า เวลา] LT",lastDay:"[เมื่อวานนี้ เวลา] LT",lastWeek:"[วัน]dddd[ที่�ล้ว เวลา] LT",sameElse:"L"},relativeTime:{future:"อี� %s",past:"%sที่�ล้ว",s:"ไม่�ี่วินาที",m:"1 นาที",mm:"%d นาที",h:"1 ชั่วโมง",hh:"%d ชั่วโมง",d:"1 วัน",dd:"%d วัน",M:"1 เดือน",MM:"%d เดือน",y:"1 ปี",yy:"%d ปี"}})}),function(a){a(sb)}(function(a){return a.defineLocale("tl-ph",{months:"Enero_Pebrero_Marso_Abril_Mayo_Hunyo_Hulyo_Agosto_Setyembre_Oktubre_Nobyembre_Disyembre".split("_"),monthsShort:"Ene_Peb_Mar_Abr_May_Hun_Hul_Ago_Set_Okt_Nob_Dis".split("_"),weekdays:"Linggo_Lunes_Martes_Miyerkules_Huwebes_Biyernes_Sabado".split("_"),weekdaysShort:"Lin_Lun_Mar_Miy_Huw_Biy_Sab".split("_"),weekdaysMin:"Li_Lu_Ma_Mi_Hu_Bi_Sab".split("_"),longDateFormat:{LT:"HH:mm",L:"MM/D/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY LT",LLLL:"dddd, MMMM DD, YYYY LT"},calendar:{sameDay:"[Ngayon sa] LT",nextDay:"[Bukas sa] LT",nextWeek:"dddd [sa] LT",lastDay:"[Kahapon sa] LT",lastWeek:"dddd [huling linggo] LT",sameElse:"L"},relativeTime:{future:"sa loob ng %s",past:"%s ang nakalipas",s:"ilang segundo",m:"isang minuto",mm:"%d minuto",h:"isang oras",hh:"%d oras",d:"isang araw",dd:"%d araw",M:"isang buwan",MM:"%d buwan",y:"isang taon",yy:"%d taon"},ordinal:function(a){return a},week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){var b={1:"'inci",5:"'inci",8:"'inci",70:"'inci",80:"'inci",2:"'nci",7:"'nci",20:"'nci",50:"'nci",3:"'üncü",4:"'üncü",100:"'üncü",6:"'ncı",9:"'uncu",10:"'uncu",30:"'uncu",60:"'ıncı",90:"'ıncı"};return a.defineLocale("tr",{months:"Ocak_Şubat_Mart_Nisan_Mayıs_Haziran_Temmuz_Ağustos_Eylül_Ekim_Kasım_Aralık".split("_"),monthsShort:"Oca_Şub_Mar_Nis_May_Haz_Tem_Ağu_Eyl_Eki_Kas_Ara".split("_"),weekdays:"Pazar_Pazartesi_Salı_Çarşamba_Perşembe_Cuma_Cumartesi".split("_"),weekdaysShort:"Paz_Pts_Sal_Çar_Per_Cum_Cts".split("_"),weekdaysMin:"Pz_Pt_Sa_Ça_Pe_Cu_Ct".split("_"),longDateFormat:{LT:"HH:mm",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd, D MMMM YYYY LT"},calendar:{sameDay:"[bugün saat] LT",nextDay:"[yarın saat] LT",nextWeek:"[haftaya] dddd [saat] LT",lastDay:"[dün] LT",lastWeek:"[geçen hafta] dddd [saat] LT",sameElse:"L"},relativeTime:{future:"%s sonra",past:"%s önce",s:"birkaç saniye",m:"bir dakika",mm:"%d dakika",h:"bir saat",hh:"%d saat",d:"bir gün",dd:"%d gün",M:"bir ay",MM:"%d ay",y:"bir yıl",yy:"%d yıl"},ordinal:function(a){if(0===a)return a+"'ıncı";var c=a%10,d=a%100-c,e=a>=100?100:null;return a+(b[c]||b[d]||b[e])},week:{dow:1,doy:7}})}),function(a){a(sb)}(function(a){return a.defineLocale("tzm-latn",{months:"innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir".split("_"),monthsShort:"innayr_brˤayrˤ_marˤsˤ_ibrir_mayyw_ywnyw_ywlywz_ɣwšt_šwtanbir_ktˤwbrˤ_nwwanbir_dwjnbir".split("_"),weekdays:"asamas_aynas_asinas_akras_akwas_asimwas_asi�yas".split("_"),weekdaysShort:"asamas_aynas_asinas_akras_akwas_asimwas_asi�yas".split("_"),weekdaysMin:"asamas_aynas_asinas_akras_akwas_asimwas_asi�yas".split("_"),longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[asdkh g] LT",nextDay:"[aska g] LT",nextWeek:"dddd [g] LT",lastDay:"[assant g] LT",lastWeek:"dddd [g] LT",sameElse:"L"},relativeTime:{future:"dadkh s yan %s",past:"yan %s",s:"imik",m:"minu�",mm:"%d minu�",h:"saɛa",hh:"%d tassaɛin",d:"ass",dd:"%d ossan",M:"ayowr",MM:"%d iyyirn",y:"asgas",yy:"%d isgasn"},week:{dow:6,doy:12}})}),function(a){a(sb)}(function(a){return a.defineLocale("tzm",{months:"ⵉ��ⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓ�ⵢⵓ_ⵢⵓ�ⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰ�ⴱⵉⵔ_ⴽⵟⵓⴱⵕ_�ⵓⵡⴰ�ⴱⵉⵔ_ⴷⵓⵊ�ⴱⵉⵔ".split("_"),monthsShort:"ⵉ��ⴰⵢⵔ_ⴱⵕⴰⵢⵕ_ⵎⴰⵕⵚ_ⵉⴱⵔⵉⵔ_ⵎⴰⵢⵢⵓ_ⵢⵓ�ⵢⵓ_ⵢⵓ�ⵢⵓⵣ_ⵖⵓⵛⵜ_ⵛⵓⵜⴰ�ⴱⵉⵔ_ⴽⵟⵓⴱⵕ_�ⵓⵡⴰ�ⴱⵉⵔ_ⴷⵓⵊ�ⴱⵉⵔ".split("_"),weekdays:"ⴰⵙⴰⵎⴰⵙ_ⴰⵢ�ⴰⵙ_ⴰⵙⵉ�ⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ".split("_"),weekdaysShort:"ⴰⵙⴰⵎⴰⵙ_ⴰⵢ�ⴰⵙ_ⴰⵙⵉ�ⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ".split("_"),weekdaysMin:"ⴰⵙⴰⵎⴰⵙ_ⴰⵢ�ⴰⵙ_ⴰⵙⵉ�ⴰⵙ_ⴰⴽⵔⴰⵙ_ⴰⴽⵡⴰⵙ_ⴰⵙⵉⵎⵡⴰⵙ_ⴰⵙⵉⴹⵢⴰⵙ".split("_"),longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"dddd D MMMM YYYY LT"},calendar:{sameDay:"[ⴰⵙⴷⵅ ⴴ] LT",nextDay:"[ⴰⵙⴽⴰ ⴴ] LT",nextWeek:"dddd [ⴴ] LT",lastDay:"[ⴰⵚⴰ�ⵜ ⴴ] LT",lastWeek:"dddd [ⴴ] LT",sameElse:"L"},relativeTime:{future:"ⴷⴰⴷⵅ ⵙ ⵢⴰ� %s",past:"ⵢⴰ� %s",s:"ⵉⵎⵉⴽ",m:"ⵎⵉ�ⵓⴺ",mm:"%d ⵎⵉ�ⵓⴺ",h:"ⵙⴰⵄⴰ",hh:"%d ⵜⴰⵙⵙⴰⵄⵉ�",d:"ⴰⵙⵙ",dd:"%d oⵙⵙⴰ�",M:"ⴰⵢoⵓⵔ",MM:"%d ⵉⵢⵢⵉⵔ�",y:"ⴰⵙⴳⴰⵙ",yy:"%d ⵉⵙⴳⴰⵙ�"},week:{dow:6,doy:12}})}),function(a){a(sb)}(function(a){function b(a,b){var c=a.split("_");return b%10===1&&b%100!==11?c[0]:b%10>=2&&4>=b%10&&(10>b%100||b%100>=20)?c[1]:c[2]}function c(a,c,d){var e={mm:"хвилина_хвилини_хвилин",hh:"година_години_годин",dd:"день_дні_днів",MM:"мі��ць_мі��ці_мі��ців",yy:"рік_роки_років"};return"m"===d?c?"хвилина":"хвилину":"h"===d?c?"година":"годину":a+" "+b(e[d],+a)}function d(a,b){var c={nominative:"�ічень_лютий_березень_квітень_травень_червень_липень_�ерпень_вере�ень_жовтень_ли�топад_грудень".split("_"),accusative:"�ічн�_лютого_березн�_квітн�_травн�_червн�_липн�_�ерпн�_вере�н�_жовтн�_ли�топада_грудн�".split("_")},d=/D[oD]? *MMMM?/.test(b)?"accusative":"nominative";return c[d][a.month()]}function e(a,b){var c={nominative:"неділ�_понеділок_вівторок_�ереда_четвер_п’�тниц�_�убота".split("_"),accusative:"неділю_понеділок_вівторок_�ереду_четвер_п’�тницю_�уботу".split("_"),genitive:"неділі_понеділка_вівторка_�ереди_четверга_п’�тниці_�уботи".split("_")},d=/(\[[ВвУу]\]) ?dddd/.test(b)?"accusative":/\[?(?:минулої|на�тупної)? ?\] ?dddd/.test(b)?"genitive":"nominative";return c[d][a.day()]}function f(a){return function(){return a+"о"+(11===this.hours()?"б":"")+"] LT"}}return a.defineLocale("uk",{months:d,monthsShort:"�іч_лют_бер_квіт_трав_черв_лип_�ерп_вер_жовт_ли�т_груд".split("_"),weekdays:e,weekdaysShort:"нд_пн_вт_�р_чт_пт_�б".split("_"),weekdaysMin:"нд_пн_вт_�р_чт_пт_�б".split("_"),longDateFormat:{LT:"HH:mm",L:"DD.MM.YYYY",LL:"D MMMM YYYY р.",LLL:"D MMMM YYYY р., LT",LLLL:"dddd, D MMMM YYYY р., LT"},calendar:{sameDay:f("[Сьогодні "),nextDay:f("[Завтра "),lastDay:f("[Вчора "),nextWeek:f("[У] dddd ["),lastWeek:function(){switch(this.day()){case 0:case 3:case 5:case 6:return f("[Минулої] dddd [").call(this);case 1:case 2:case 4:return f("[Минулого] dddd [").call(this)}},sameElse:"L"},relativeTime:{future:"за %s",past:"%s тому",s:"декілька �екунд",m:c,mm:c,h:"годину",hh:c,d:"день",dd:c,M:"мі��ць",MM:c,y:"рік",yy:c},meridiem:function(a){return 4>a?"ночі":12>a?"ранку":17>a?"дн�":"вечора"},ordinal:function(a,b){switch(b){case"M":case"d":case"DDD":case"w":case"W":return a+"-й";case"D":return a+"-го";default:return a}},week:{dow:1,doy:7}})}),function(a){a(sb)}(function(a){return a.defineLocale("uz",{months:"�нварь_февраль_март_апрель_май_июнь_июль_авгу�т_�ент�брь_окт�брь_но�брь_декабрь".split("_"),monthsShort:"�нв_фев_мар_апр_май_июн_июл_авг_�ен_окт_но�_дек".split("_"),weekdays:"Якшанба_Душанба_Сешанба_Чоршанба_Пайшанба_Жума_Шанба".split("_"),weekdaysShort:"Якш_Душ_Сеш_Чор_Пай_Жум_Шан".split("_"),weekdaysMin:"Як_Ду_Се_Чо_Па_Жу_Ша".split("_"),longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY LT",LLLL:"D MMMM YYYY, dddd LT"},calendar:{sameDay:"[Бугун �оат] LT [да]",nextDay:"[Эртага] LT [да]",nextWeek:"dddd [куни �оат] LT [да]",lastDay:"[Кеча �оат] LT [да]",lastWeek:"[Утган] dddd [куни �оат] LT [да]",sameElse:"L"},relativeTime:{future:"Якин %s ичида",past:"Бир неча %s олдин",s:"фур�ат",m:"бир дакика",mm:"%d дакика",h:"бир �оат",hh:"%d �оат",d:"бир кун",dd:"%d кун",M:"бир ой",MM:"%d ой",y:"бир йил",yy:"%d йил"},week:{dow:1,doy:7}})}),function(a){a(sb)}(function(a){return a.defineLocale("vi",{months:"tháng 1_tháng 2_tháng 3_tháng 4_tháng 5_tháng 6_tháng 7_tháng 8_tháng 9_tháng 10_tháng 11_tháng 12".split("_"),monthsShort:"Th01_Th02_Th03_Th04_Th05_Th06_Th07_Th08_Th09_Th10_Th11_Th12".split("_"),weekdays:"chủ nhật_thứ hai_thứ ba_thứ tư_thứ năm_thứ sáu_thứ bảy".split("_"),weekdaysShort:"CN_T2_T3_T4_T5_T6_T7".split("_"),weekdaysMin:"CN_T2_T3_T4_T5_T6_T7".split("_"),longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D MMMM [năm] YYYY",LLL:"D MMMM [năm] YYYY LT",LLLL:"dddd, D MMMM [năm] YYYY LT",l:"DD/M/YYYY",ll:"D MMM YYYY",lll:"D MMM YYYY LT",llll:"ddd, D MMM YYYY LT"},calendar:{sameDay:"[Hôm nay lúc] LT",nextDay:"[Ngày mai lúc] LT",nextWeek:"dddd [tuần tới lúc] LT",lastDay:"[Hôm qua lúc] LT",lastWeek:"dddd [tuần rồi lúc] LT",sameElse:"L"},relativeTime:{future:"%s tới",past:"%s trước",s:"vài giây",m:"một phút",mm:"%d phút",h:"một gi�",hh:"%d gi�",d:"một ngày",dd:"%d ngày",M:"một tháng",MM:"%d tháng",y:"một năm",yy:"%d năm"},ordinal:function(a){return a},week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){return a.defineLocale("zh-cn",{months:"一月_二月_三月_四月_五月_六月_七月_八月_�月_�月_�一月_�二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"周日_周一_周二_周三_周四_周五_周六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),longDateFormat:{LT:"Ah点mm",L:"YYYY-MM-DD",LL:"YYYY年MMMD日",LLL:"YYYY年MMMD日LT",LLLL:"YYYY年MMMD日ddddLT",l:"YYYY-MM-DD",ll:"YYYY年MMMD日",lll:"YYYY年MMMD日LT",llll:"YYYY年MMMD日ddddLT"},meridiem:function(a,b){var c=100*a+b;return 600>c?"凌晨":900>c?"早上":1130>c?"上�":1230>c?"中�":1800>c?"下�":"晚上"},calendar:{sameDay:function(){return 0===this.minutes()?"[今天]Ah[点整]":"[今天]LT"},nextDay:function(){return 0===this.minutes()?"[明天]Ah[点整]":"[明天]LT"},lastDay:function(){return 0===this.minutes()?"[昨天]Ah[点整]":"[昨天]LT"},nextWeek:function(){var b,c;return b=a().startOf("week"),c=this.unix()-b.unix()>=604800?"[下]":"[本]",0===this.minutes()?c+"dddAh点整":c+"dddAh点mm"},lastWeek:function(){var b,c;return b=a().startOf("week"),c=this.unix()<b.unix()?"[上]":"[本]",0===this.minutes()?c+"dddAh点整":c+"dddAh点mm"
+},sameElse:"LL"},ordinal:function(a,b){switch(b){case"d":case"D":case"DDD":return a+"日";case"M":return a+"月";case"w":case"W":return a+"周";default:return a}},relativeTime:{future:"%s内",past:"%s�",s:"几秒",m:"1分钟",mm:"%d分钟",h:"1�时",hh:"%d�时",d:"1天",dd:"%d天",M:"1个月",MM:"%d个月",y:"1年",yy:"%d年"},week:{dow:1,doy:4}})}),function(a){a(sb)}(function(a){return a.defineLocale("zh-tw",{months:"一月_二月_三月_四月_五月_六月_七月_八月_�月_�月_�一月_�二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"週日_週一_週二_週三_週四_週五_週六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),longDateFormat:{LT:"Ah點mm",L:"YYYY年MMMD日",LL:"YYYY年MMMD日",LLL:"YYYY年MMMD日LT",LLLL:"YYYY年MMMD日ddddLT",l:"YYYY年MMMD日",ll:"YYYY年MMMD日",lll:"YYYY年MMMD日LT",llll:"YYYY年MMMD日ddddLT"},meridiem:function(a,b){var c=100*a+b;return 900>c?"早上":1130>c?"上�":1230>c?"中�":1800>c?"下�":"晚上"},calendar:{sameDay:"[今天]LT",nextDay:"[明天]LT",nextWeek:"[下]ddddLT",lastDay:"[昨天]LT",lastWeek:"[上]ddddLT",sameElse:"L"},ordinal:function(a,b){switch(b){case"d":case"D":case"DDD":return a+"日";case"M":return a+"月";case"w":case"W":return a+"週";default:return a}},relativeTime:{future:"%s內",past:"%s�",s:"幾秒",m:"一分�",mm:"%d分�",h:"一�時",hh:"%d�時",d:"一天",dd:"%d天",M:"一個月",MM:"%d個月",y:"一年",yy:"%d年"}})}),sb.locale("en"),Ib?module.exports=sb:"function"==typeof define&&define.amd?(define("moment",function(a,b,c){return c.config&&c.config()&&c.config().noGlobal===!0&&(wb.moment=tb),sb}),rb(!0)):rb()}).call(this);
\ No newline at end of file
diff --git a/data/interfaces/default/js/moment-with-locales.min.js b/data/interfaces/default/js/moment-with-locales.min.js
deleted file mode 100644
index 521bfb63..00000000
--- a/data/interfaces/default/js/moment-with-locales.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-!function(e,a){"object"==typeof exports&&"undefined"!=typeof module?module.exports=a():"function"==typeof define&&define.amd?define(a):e.moment=a()}(this,function(){"use strict";var e,n;function M(){return e.apply(null,arguments)}function _(e){return e instanceof Array||"[object Array]"===Object.prototype.toString.call(e)}function i(e){return null!=e&&"[object Object]"===Object.prototype.toString.call(e)}function h(e,a){return Object.prototype.hasOwnProperty.call(e,a)}function o(e){if(Object.getOwnPropertyNames)return 0===Object.getOwnPropertyNames(e).length;for(var a in e)if(h(e,a))return;return 1}function r(e){return void 0===e}function m(e){return"number"==typeof e||"[object Number]"===Object.prototype.toString.call(e)}function d(e){return e instanceof Date||"[object Date]"===Object.prototype.toString.call(e)}function u(e,a){for(var t=[],s=0;s<e.length;++s)t.push(a(e[s],s));return t}function l(e,a){for(var t in a)h(a,t)&&(e[t]=a[t]);return h(a,"toString")&&(e.toString=a.toString),h(a,"valueOf")&&(e.valueOf=a.valueOf),e}function c(e,a,t,s){return Sa(e,a,t,s,!0).utc()}function L(e){return null==e._pf&&(e._pf={empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidEra:null,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1,parsedDateParts:[],era:null,meridiem:null,rfc2822:!1,weekdayMismatch:!1}),e._pf}function Y(e){if(null==e._isValid){var a=L(e),t=n.call(a.parsedDateParts,function(e){return null!=e}),s=!isNaN(e._d.getTime())&&a.overflow<0&&!a.empty&&!a.invalidEra&&!a.invalidMonth&&!a.invalidWeekday&&!a.weekdayMismatch&&!a.nullInput&&!a.invalidFormat&&!a.userInvalidated&&(!a.meridiem||a.meridiem&&t);if(e._strict&&(s=s&&0===a.charsLeftOver&&0===a.unusedTokens.length&&void 0===a.bigHour),null!=Object.isFrozen&&Object.isFrozen(e))return s;e._isValid=s}return e._isValid}function y(e){var a=c(NaN);return null!=e?l(L(a),e):L(a).userInvalidated=!0,a}n=Array.prototype.some?Array.prototype.some:function(e){for(var a=Object(this),t=a.length>>>0,s=0;s<t;s++)if(s in a&&e.call(this,a[s],s,a))return!0;return!1};var f=M.momentProperties=[],a=!1;function p(e,a){var t,s,n;if(r(a._isAMomentObject)||(e._isAMomentObject=a._isAMomentObject),r(a._i)||(e._i=a._i),r(a._f)||(e._f=a._f),r(a._l)||(e._l=a._l),r(a._strict)||(e._strict=a._strict),r(a._tzm)||(e._tzm=a._tzm),r(a._isUTC)||(e._isUTC=a._isUTC),r(a._offset)||(e._offset=a._offset),r(a._pf)||(e._pf=L(a)),r(a._locale)||(e._locale=a._locale),0<f.length)for(t=0;t<f.length;t++)r(n=a[s=f[t]])||(e[s]=n);return e}function k(e){p(this,e),this._d=new Date(null!=e._d?e._d.getTime():NaN),this.isValid()||(this._d=new Date(NaN)),!1===a&&(a=!0,M.updateOffset(this),a=!1)}function D(e){return e instanceof k||null!=e&&null!=e._isAMomentObject}function T(e){!1===M.suppressDeprecationWarnings&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+e)}function t(n,r){var d=!0;return l(function(){if(null!=M.deprecationHandler&&M.deprecationHandler(null,n),d){for(var e,a,t=[],s=0;s<arguments.length;s++){if(e="","object"==typeof arguments[s]){for(a in e+="\n["+s+"] ",arguments[0])h(arguments[0],a)&&(e+=a+": "+arguments[0][a]+", ");e=e.slice(0,-2)}else e=arguments[s];t.push(e)}T(n+"\nArguments: "+Array.prototype.slice.call(t).join("")+"\n"+(new Error).stack),d=!1}return r.apply(this,arguments)},r)}var s,g={};function w(e,a){null!=M.deprecationHandler&&M.deprecationHandler(e,a),g[e]||(T(a),g[e]=!0)}function v(e){return"undefined"!=typeof Function&&e instanceof Function||"[object Function]"===Object.prototype.toString.call(e)}function b(e,a){var t,s=l({},e);for(t in a)h(a,t)&&(i(e[t])&&i(a[t])?(s[t]={},l(s[t],e[t]),l(s[t],a[t])):null!=a[t]?s[t]=a[t]:delete s[t]);for(t in e)h(e,t)&&!h(a,t)&&i(e[t])&&(s[t]=l({},s[t]));return s}function S(e){null!=e&&this.set(e)}M.suppressDeprecationWarnings=!1,M.deprecationHandler=null,s=Object.keys?Object.keys:function(e){var a,t=[];for(a in e)h(e,a)&&t.push(a);return t};function H(e,a,t){var s=""+Math.abs(e),n=a-s.length;return(0<=e?t?"+":"":"-")+Math.pow(10,Math.max(0,n)).toString().substr(1)+s}var j=/(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|N{1,5}|YYYYYY|YYYYY|YYYY|YY|y{2,4}|yo?|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g,x=/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,P={},O={};function W(e,a,t,s){var n="string"==typeof s?function(){return this[s]()}:s;e&&(O[e]=n),a&&(O[a[0]]=function(){return H(n.apply(this,arguments),a[1],a[2])}),t&&(O[t]=function(){return this.localeData().ordinal(n.apply(this,arguments),e)})}function A(e,a){return e.isValid()?(a=E(a,e.localeData()),P[a]=P[a]||function(s){for(var e,n=s.match(j),a=0,r=n.length;a<r;a++)O[n[a]]?n[a]=O[n[a]]:n[a]=(e=n[a]).match(/\[[\s\S]/)?e.replace(/^\[|\]$/g,""):e.replace(/\\/g,"");return function(e){for(var a="",t=0;t<r;t++)a+=v(n[t])?n[t].call(e,s):n[t];return a}}(a),P[a](e)):e.localeData().invalidDate()}function E(e,a){var t=5;function s(e){return a.longDateFormat(e)||e}for(x.lastIndex=0;0<=t&&x.test(e);)e=e.replace(x,s),x.lastIndex=0,--t;return e}var F={};function z(e,a){var t=e.toLowerCase();F[t]=F[t+"s"]=F[a]=e}function N(e){return"string"==typeof e?F[e]||F[e.toLowerCase()]:void 0}function J(e){var a,t,s={};for(t in e)h(e,t)&&(a=N(t))&&(s[a]=e[t]);return s}var R={};function C(e,a){R[e]=a}function I(e){return e%4==0&&e%100!=0||e%400==0}function U(e){return e<0?Math.ceil(e)||0:Math.floor(e)}function G(e){var a=+e,t=0;return 0!=a&&isFinite(a)&&(t=U(a)),t}function V(a,t){return function(e){return null!=e?(K(this,a,e),M.updateOffset(this,t),this):B(this,a)}}function B(e,a){return e.isValid()?e._d["get"+(e._isUTC?"UTC":"")+a]():NaN}function K(e,a,t){e.isValid()&&!isNaN(t)&&("FullYear"===a&&I(e.year())&&1===e.month()&&29===e.date()?(t=G(t),e._d["set"+(e._isUTC?"UTC":"")+a](t,e.month(),Se(t,e.month()))):e._d["set"+(e._isUTC?"UTC":"")+a](t))}var q,Z=/\d/,$=/\d\d/,Q=/\d{3}/,X=/\d{4}/,ee=/[+-]?\d{6}/,ae=/\d\d?/,te=/\d\d\d\d?/,se=/\d\d\d\d\d\d?/,ne=/\d{1,3}/,re=/\d{1,4}/,de=/[+-]?\d{1,6}/,_e=/\d+/,ie=/[+-]?\d+/,oe=/Z|[+-]\d\d:?\d\d/gi,me=/Z|[+-]\d\d(?::?\d\d)?/gi,ue=/[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i;function le(e,t,s){q[e]=v(t)?t:function(e,a){return e&&s?s:t}}function Me(e,a){return h(q,e)?q[e](a._strict,a._locale):new RegExp(he(e.replace("\\","").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,function(e,a,t,s,n){return a||t||s||n})))}function he(e){return e.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}q={};var ce={};function Le(e,t){var a,s=t;for("string"==typeof e&&(e=[e]),m(t)&&(s=function(e,a){a[t]=G(e)}),a=0;a<e.length;a++)ce[e[a]]=s}function Ye(e,n){Le(e,function(e,a,t,s){t._w=t._w||{},n(e,t._w,t,s)})}var ye,fe=0,pe=1,ke=2,De=3,Te=4,ge=5,we=6,ve=7,be=8;function Se(e,a){if(isNaN(e)||isNaN(a))return NaN;var t,s=(a%(t=12)+t)%t;return e+=(a-s)/12,1==s?I(e)?29:28:31-s%7%2}ye=Array.prototype.indexOf?Array.prototype.indexOf:function(e){for(var a=0;a<this.length;++a)if(this[a]===e)return a;return-1},W("M",["MM",2],"Mo",function(){return this.month()+1}),W("MMM",0,0,function(e){return this.localeData().monthsShort(this,e)}),W("MMMM",0,0,function(e){return this.localeData().months(this,e)}),z("month","M"),C("month",8),le("M",ae),le("MM",ae,$),le("MMM",function(e,a){return a.monthsShortRegex(e)}),le("MMMM",function(e,a){return a.monthsRegex(e)}),Le(["M","MM"],function(e,a){a[pe]=G(e)-1}),Le(["MMM","MMMM"],function(e,a,t,s){var n=t._locale.monthsParse(e,s,t._strict);null!=n?a[pe]=n:L(t).invalidMonth=e});var He="January_February_March_April_May_June_July_August_September_October_November_December".split("_"),je="Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),xe=/D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/,Pe=ue,Oe=ue;function We(e,a){var t;if(!e.isValid())return e;if("string"==typeof a)if(/^\d+$/.test(a))a=G(a);else if(!m(a=e.localeData().monthsParse(a)))return e;return t=Math.min(e.date(),Se(e.year(),a)),e._d["set"+(e._isUTC?"UTC":"")+"Month"](a,t),e}function Ae(e){return null!=e?(We(this,e),M.updateOffset(this,!0),this):B(this,"Month")}function Ee(){function e(e,a){return a.length-e.length}for(var a,t=[],s=[],n=[],r=0;r<12;r++)a=c([2e3,r]),t.push(this.monthsShort(a,"")),s.push(this.months(a,"")),n.push(this.months(a,"")),n.push(this.monthsShort(a,""));for(t.sort(e),s.sort(e),n.sort(e),r=0;r<12;r++)t[r]=he(t[r]),s[r]=he(s[r]);for(r=0;r<24;r++)n[r]=he(n[r]);this._monthsRegex=new RegExp("^("+n.join("|")+")","i"),this._monthsShortRegex=this._monthsRegex,this._monthsStrictRegex=new RegExp("^("+s.join("|")+")","i"),this._monthsShortStrictRegex=new RegExp("^("+t.join("|")+")","i")}function Fe(e){return I(e)?366:365}W("Y",0,0,function(){var e=this.year();return e<=9999?H(e,4):"+"+e}),W(0,["YY",2],0,function(){return this.year()%100}),W(0,["YYYY",4],0,"year"),W(0,["YYYYY",5],0,"year"),W(0,["YYYYYY",6,!0],0,"year"),z("year","y"),C("year",1),le("Y",ie),le("YY",ae,$),le("YYYY",re,X),le("YYYYY",de,ee),le("YYYYYY",de,ee),Le(["YYYYY","YYYYYY"],fe),Le("YYYY",function(e,a){a[fe]=2===e.length?M.parseTwoDigitYear(e):G(e)}),Le("YY",function(e,a){a[fe]=M.parseTwoDigitYear(e)}),Le("Y",function(e,a){a[fe]=parseInt(e,10)}),M.parseTwoDigitYear=function(e){return G(e)+(68<G(e)?1900:2e3)};var ze=V("FullYear",!0);function Ne(e){var a,t;return e<100&&0<=e?((t=Array.prototype.slice.call(arguments))[0]=e+400,a=new Date(Date.UTC.apply(null,t)),isFinite(a.getUTCFullYear())&&a.setUTCFullYear(e)):a=new Date(Date.UTC.apply(null,arguments)),a}function Je(e,a,t){var s=7+a-t;return s-(7+Ne(e,0,s).getUTCDay()-a)%7-1}function Re(e,a,t,s,n){var r,d=1+7*(a-1)+(7+t-s)%7+Je(e,s,n),_=d<=0?Fe(r=e-1)+d:d>Fe(e)?(r=e+1,d-Fe(e)):(r=e,d);return{year:r,dayOfYear:_}}function Ce(e,a,t){var s,n,r=Je(e.year(),a,t),d=Math.floor((e.dayOfYear()-r-1)/7)+1;return d<1?s=d+Ie(n=e.year()-1,a,t):d>Ie(e.year(),a,t)?(s=d-Ie(e.year(),a,t),n=e.year()+1):(n=e.year(),s=d),{week:s,year:n}}function Ie(e,a,t){var s=Je(e,a,t),n=Je(e+1,a,t);return(Fe(e)-s+n)/7}W("w",["ww",2],"wo","week"),W("W",["WW",2],"Wo","isoWeek"),z("week","w"),z("isoWeek","W"),C("week",5),C("isoWeek",5),le("w",ae),le("ww",ae,$),le("W",ae),le("WW",ae,$),Ye(["w","ww","W","WW"],function(e,a,t,s){a[s.substr(0,1)]=G(e)});function Ue(e,a){return e.slice(a,7).concat(e.slice(0,a))}W("d",0,"do","day"),W("dd",0,0,function(e){return this.localeData().weekdaysMin(this,e)}),W("ddd",0,0,function(e){return this.localeData().weekdaysShort(this,e)}),W("dddd",0,0,function(e){return this.localeData().weekdays(this,e)}),W("e",0,0,"weekday"),W("E",0,0,"isoWeekday"),z("day","d"),z("weekday","e"),z("isoWeekday","E"),C("day",11),C("weekday",11),C("isoWeekday",11),le("d",ae),le("e",ae),le("E",ae),le("dd",function(e,a){return a.weekdaysMinRegex(e)}),le("ddd",function(e,a){return a.weekdaysShortRegex(e)}),le("dddd",function(e,a){return a.weekdaysRegex(e)}),Ye(["dd","ddd","dddd"],function(e,a,t,s){var n=t._locale.weekdaysParse(e,s,t._strict);null!=n?a.d=n:L(t).invalidWeekday=e}),Ye(["d","e","E"],function(e,a,t,s){a[s]=G(e)});var Ge="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),Ve="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),Be="Su_Mo_Tu_We_Th_Fr_Sa".split("_"),Ke=ue,qe=ue,Ze=ue;function $e(){function e(e,a){return a.length-e.length}for(var a,t,s,n,r=[],d=[],_=[],i=[],o=0;o<7;o++)a=c([2e3,1]).day(o),t=he(this.weekdaysMin(a,"")),s=he(this.weekdaysShort(a,"")),n=he(this.weekdays(a,"")),r.push(t),d.push(s),_.push(n),i.push(t),i.push(s),i.push(n);r.sort(e),d.sort(e),_.sort(e),i.sort(e),this._weekdaysRegex=new RegExp("^("+i.join("|")+")","i"),this._weekdaysShortRegex=this._weekdaysRegex,this._weekdaysMinRegex=this._weekdaysRegex,this._weekdaysStrictRegex=new RegExp("^("+_.join("|")+")","i"),this._weekdaysShortStrictRegex=new RegExp("^("+d.join("|")+")","i"),this._weekdaysMinStrictRegex=new RegExp("^("+r.join("|")+")","i")}function Qe(){return this.hours()%12||12}function Xe(e,a){W(e,0,0,function(){return this.localeData().meridiem(this.hours(),this.minutes(),a)})}function ea(e,a){return a._meridiemParse}W("H",["HH",2],0,"hour"),W("h",["hh",2],0,Qe),W("k",["kk",2],0,function(){return this.hours()||24}),W("hmm",0,0,function(){return""+Qe.apply(this)+H(this.minutes(),2)}),W("hmmss",0,0,function(){return""+Qe.apply(this)+H(this.minutes(),2)+H(this.seconds(),2)}),W("Hmm",0,0,function(){return""+this.hours()+H(this.minutes(),2)}),W("Hmmss",0,0,function(){return""+this.hours()+H(this.minutes(),2)+H(this.seconds(),2)}),Xe("a",!0),Xe("A",!1),z("hour","h"),C("hour",13),le("a",ea),le("A",ea),le("H",ae),le("h",ae),le("k",ae),le("HH",ae,$),le("hh",ae,$),le("kk",ae,$),le("hmm",te),le("hmmss",se),le("Hmm",te),le("Hmmss",se),Le(["H","HH"],De),Le(["k","kk"],function(e,a,t){var s=G(e);a[De]=24===s?0:s}),Le(["a","A"],function(e,a,t){t._isPm=t._locale.isPM(e),t._meridiem=e}),Le(["h","hh"],function(e,a,t){a[De]=G(e),L(t).bigHour=!0}),Le("hmm",function(e,a,t){var s=e.length-2;a[De]=G(e.substr(0,s)),a[Te]=G(e.substr(s)),L(t).bigHour=!0}),Le("hmmss",function(e,a,t){var s=e.length-4,n=e.length-2;a[De]=G(e.substr(0,s)),a[Te]=G(e.substr(s,2)),a[ge]=G(e.substr(n)),L(t).bigHour=!0}),Le("Hmm",function(e,a,t){var s=e.length-2;a[De]=G(e.substr(0,s)),a[Te]=G(e.substr(s))}),Le("Hmmss",function(e,a,t){var s=e.length-4,n=e.length-2;a[De]=G(e.substr(0,s)),a[Te]=G(e.substr(s,2)),a[ge]=G(e.substr(n))});var aa=V("Hours",!0);var ta,sa={calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},longDateFormat:{LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},invalidDate:"Invalid date",ordinal:"%d",dayOfMonthOrdinalParse:/\d{1,2}/,relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",w:"a week",ww:"%d weeks",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},months:He,monthsShort:je,week:{dow:0,doy:6},weekdays:Ge,weekdaysMin:Be,weekdaysShort:Ve,meridiemParse:/[ap]\.?m?\.?/i},na={},ra={};function da(e){return e?e.toLowerCase().replace("_","-"):e}function _a(e){for(var a,t,s,n,r=0;r<e.length;){for(a=(n=da(e[r]).split("-")).length,t=(t=da(e[r+1]))?t.split("-"):null;0<a;){if(s=ia(n.slice(0,a).join("-")))return s;if(t&&t.length>=a&&function(e,a){for(var t=Math.min(e.length,a.length),s=0;s<t;s+=1)if(e[s]!==a[s])return s;return t}(n,t)>=a-1)break;a--}r++}return ta}function ia(a){var e;if(void 0===na[a]&&"undefined"!=typeof module&&module&&module.exports)try{e=ta._abbr,require("./locale/"+a),oa(e)}catch(e){na[a]=null}return na[a]}function oa(e,a){var t;return e&&((t=r(a)?ua(e):ma(e,a))?ta=t:"undefined"!=typeof console&&console.warn&&console.warn("Locale "+e+" not found. Did you forget to load it?")),ta._abbr}function ma(e,a){if(null===a)return delete na[e],null;var t,s=sa;if(a.abbr=e,null!=na[e])w("defineLocaleOverride","use moment.updateLocale(localeName, config) to change an existing locale. moment.defineLocale(localeName, config) should only be used for creating a new locale See http://momentjs.com/guides/#/warnings/define-locale/ for more info."),s=na[e]._config;else if(null!=a.parentLocale)if(null!=na[a.parentLocale])s=na[a.parentLocale]._config;else{if(null==(t=ia(a.parentLocale)))return ra[a.parentLocale]||(ra[a.parentLocale]=[]),ra[a.parentLocale].push({name:e,config:a}),null;s=t._config}return na[e]=new S(b(s,a)),ra[e]&&ra[e].forEach(function(e){ma(e.name,e.config)}),oa(e),na[e]}function ua(e){var a;if(e&&e._locale&&e._locale._abbr&&(e=e._locale._abbr),!e)return ta;if(!_(e)){if(a=ia(e))return a;e=[e]}return _a(e)}function la(e){var a,t=e._a;return t&&-2===L(e).overflow&&(a=t[pe]<0||11<t[pe]?pe:t[ke]<1||t[ke]>Se(t[fe],t[pe])?ke:t[De]<0||24<t[De]||24===t[De]&&(0!==t[Te]||0!==t[ge]||0!==t[we])?De:t[Te]<0||59<t[Te]?Te:t[ge]<0||59<t[ge]?ge:t[we]<0||999<t[we]?we:-1,L(e)._overflowDayOfYear&&(a<fe||ke<a)&&(a=ke),L(e)._overflowWeeks&&-1===a&&(a=ve),L(e)._overflowWeekday&&-1===a&&(a=be),L(e).overflow=a),e}var Ma=/^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([+-]\d\d(?::?\d\d)?|\s*Z)?)?$/,ha=/^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d|))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([+-]\d\d(?::?\d\d)?|\s*Z)?)?$/,ca=/Z|[+-]\d\d(?::?\d\d)?/,La=[["YYYYYY-MM-DD",/[+-]\d{6}-\d\d-\d\d/],["YYYY-MM-DD",/\d{4}-\d\d-\d\d/],["GGGG-[W]WW-E",/\d{4}-W\d\d-\d/],["GGGG-[W]WW",/\d{4}-W\d\d/,!1],["YYYY-DDD",/\d{4}-\d{3}/],["YYYY-MM",/\d{4}-\d\d/,!1],["YYYYYYMMDD",/[+-]\d{10}/],["YYYYMMDD",/\d{8}/],["GGGG[W]WWE",/\d{4}W\d{3}/],["GGGG[W]WW",/\d{4}W\d{2}/,!1],["YYYYDDD",/\d{7}/],["YYYYMM",/\d{6}/,!1],["YYYY",/\d{4}/,!1]],Ya=[["HH:mm:ss.SSSS",/\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss,SSSS",/\d\d:\d\d:\d\d,\d+/],["HH:mm:ss",/\d\d:\d\d:\d\d/],["HH:mm",/\d\d:\d\d/],["HHmmss.SSSS",/\d\d\d\d\d\d\.\d+/],["HHmmss,SSSS",/\d\d\d\d\d\d,\d+/],["HHmmss",/\d\d\d\d\d\d/],["HHmm",/\d\d\d\d/],["HH",/\d\d/]],ya=/^\/?Date\((-?\d+)/i,fa=/^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/,pa={UT:0,GMT:0,EDT:-240,EST:-300,CDT:-300,CST:-360,MDT:-360,MST:-420,PDT:-420,PST:-480};function ka(e){var a,t,s,n,r,d,_=e._i,i=Ma.exec(_)||ha.exec(_);if(i){for(L(e).iso=!0,a=0,t=La.length;a<t;a++)if(La[a][1].exec(i[1])){n=La[a][0],s=!1!==La[a][2];break}if(null==n)return void(e._isValid=!1);if(i[3]){for(a=0,t=Ya.length;a<t;a++)if(Ya[a][1].exec(i[3])){r=(i[2]||" ")+Ya[a][0];break}if(null==r)return void(e._isValid=!1)}if(!s&&null!=r)return void(e._isValid=!1);if(i[4]){if(!ca.exec(i[4]))return void(e._isValid=!1);d="Z"}e._f=n+(r||"")+(d||""),va(e)}else e._isValid=!1}function Da(e,a,t,s,n,r){var d=[function(e){var a=parseInt(e,10);{if(a<=49)return 2e3+a;if(a<=999)return 1900+a}return a}(e),je.indexOf(a),parseInt(t,10),parseInt(s,10),parseInt(n,10)];return r&&d.push(parseInt(r,10)),d}function Ta(e){var a,t,s,n,r=fa.exec(e._i.replace(/\([^)]*\)|[\n\t]/g," ").replace(/(\s\s+)/g," ").replace(/^\s\s*/,"").replace(/\s\s*$/,""));if(r){if(a=Da(r[4],r[3],r[2],r[5],r[6],r[7]),t=r[1],s=a,n=e,t&&Ve.indexOf(t)!==new Date(s[0],s[1],s[2]).getDay()&&(L(n).weekdayMismatch=!0,!void(n._isValid=!1)))return;e._a=a,e._tzm=function(e,a,t){if(e)return pa[e];if(a)return 0;var s=parseInt(t,10),n=s%100;return 60*((s-n)/100)+n}(r[8],r[9],r[10]),e._d=Ne.apply(null,e._a),e._d.setUTCMinutes(e._d.getUTCMinutes()-e._tzm),L(e).rfc2822=!0}else e._isValid=!1}function ga(e,a,t){return null!=e?e:null!=a?a:t}function wa(e){var a,t,s,n,r,d,_,i=[];if(!e._d){for(d=e,_=new Date(M.now()),s=d._useUTC?[_.getUTCFullYear(),_.getUTCMonth(),_.getUTCDate()]:[_.getFullYear(),_.getMonth(),_.getDate()],e._w&&null==e._a[ke]&&null==e._a[pe]&&function(e){var a,t,s,n,r,d,_,i,o;null!=(a=e._w).GG||null!=a.W||null!=a.E?(r=1,d=4,t=ga(a.GG,e._a[fe],Ce(Ha(),1,4).year),s=ga(a.W,1),((n=ga(a.E,1))<1||7<n)&&(i=!0)):(r=e._locale._week.dow,d=e._locale._week.doy,o=Ce(Ha(),r,d),t=ga(a.gg,e._a[fe],o.year),s=ga(a.w,o.week),null!=a.d?((n=a.d)<0||6<n)&&(i=!0):null!=a.e?(n=a.e+r,(a.e<0||6<a.e)&&(i=!0)):n=r);s<1||s>Ie(t,r,d)?L(e)._overflowWeeks=!0:null!=i?L(e)._overflowWeekday=!0:(_=Re(t,s,n,r,d),e._a[fe]=_.year,e._dayOfYear=_.dayOfYear)}(e),null!=e._dayOfYear&&(r=ga(e._a[fe],s[fe]),(e._dayOfYear>Fe(r)||0===e._dayOfYear)&&(L(e)._overflowDayOfYear=!0),t=Ne(r,0,e._dayOfYear),e._a[pe]=t.getUTCMonth(),e._a[ke]=t.getUTCDate()),a=0;a<3&&null==e._a[a];++a)e._a[a]=i[a]=s[a];for(;a<7;a++)e._a[a]=i[a]=null==e._a[a]?2===a?1:0:e._a[a];24===e._a[De]&&0===e._a[Te]&&0===e._a[ge]&&0===e._a[we]&&(e._nextDay=!0,e._a[De]=0),e._d=(e._useUTC?Ne:function(e,a,t,s,n,r,d){var _;return e<100&&0<=e?(_=new Date(e+400,a,t,s,n,r,d),isFinite(_.getFullYear())&&_.setFullYear(e)):_=new Date(e,a,t,s,n,r,d),_}).apply(null,i),n=e._useUTC?e._d.getUTCDay():e._d.getDay(),null!=e._tzm&&e._d.setUTCMinutes(e._d.getUTCMinutes()-e._tzm),e._nextDay&&(e._a[De]=24),e._w&&void 0!==e._w.d&&e._w.d!==n&&(L(e).weekdayMismatch=!0)}}function va(e){if(e._f!==M.ISO_8601)if(e._f!==M.RFC_2822){e._a=[],L(e).empty=!0;for(var a,t,s,n,r,d,_,i=""+e._i,o=i.length,m=0,u=E(e._f,e._locale).match(j)||[],l=0;l<u.length;l++)t=u[l],(a=(i.match(Me(t,e))||[])[0])&&(0<(s=i.substr(0,i.indexOf(a))).length&&L(e).unusedInput.push(s),i=i.slice(i.indexOf(a)+a.length),m+=a.length),O[t]?(a?L(e).empty=!1:L(e).unusedTokens.push(t),r=t,_=e,null!=(d=a)&&h(ce,r)&&ce[r](d,_._a,_,r)):e._strict&&!a&&L(e).unusedTokens.push(t);L(e).charsLeftOver=o-m,0<i.length&&L(e).unusedInput.push(i),e._a[De]<=12&&!0===L(e).bigHour&&0<e._a[De]&&(L(e).bigHour=void 0),L(e).parsedDateParts=e._a.slice(0),L(e).meridiem=e._meridiem,e._a[De]=function(e,a,t){var s;if(null==t)return a;return null!=e.meridiemHour?e.meridiemHour(a,t):(null!=e.isPM&&((s=e.isPM(t))&&a<12&&(a+=12),s||12!==a||(a=0)),a)}(e._locale,e._a[De],e._meridiem),null!==(n=L(e).era)&&(e._a[fe]=e._locale.erasConvertYear(n,e._a[fe])),wa(e),la(e)}else Ta(e);else ka(e)}function ba(e){var a,t,s=e._i,n=e._f;return e._locale=e._locale||ua(e._l),null===s||void 0===n&&""===s?y({nullInput:!0}):("string"==typeof s&&(e._i=s=e._locale.preparse(s)),D(s)?new k(la(s)):(d(s)?e._d=s:_(n)?function(e){var a,t,s,n,r,d,_=!1;if(0===e._f.length)return L(e).invalidFormat=!0,e._d=new Date(NaN);for(n=0;n<e._f.length;n++)r=0,d=!1,a=p({},e),null!=e._useUTC&&(a._useUTC=e._useUTC),a._f=e._f[n],va(a),Y(a)&&(d=!0),r+=L(a).charsLeftOver,r+=10*L(a).unusedTokens.length,L(a).score=r,_?r<s&&(s=r,t=a):(null==s||r<s||d)&&(s=r,t=a,d&&(_=!0));l(e,t||a)}(e):n?va(e):r(t=(a=e)._i)?a._d=new Date(M.now()):d(t)?a._d=new Date(t.valueOf()):"string"==typeof t?function(e){var a=ya.exec(e._i);null===a?(ka(e),!1===e._isValid&&(delete e._isValid,Ta(e),!1===e._isValid&&(delete e._isValid,e._strict?e._isValid=!1:M.createFromInputFallback(e)))):e._d=new Date(+a[1])}(a):_(t)?(a._a=u(t.slice(0),function(e){return parseInt(e,10)}),wa(a)):i(t)?function(e){var a,t;e._d||(t=void 0===(a=J(e._i)).day?a.date:a.day,e._a=u([a.year,a.month,t,a.hour,a.minute,a.second,a.millisecond],function(e){return e&&parseInt(e,10)}),wa(e))}(a):m(t)?a._d=new Date(t):M.createFromInputFallback(a),Y(e)||(e._d=null),e))}function Sa(e,a,t,s,n){var r,d={};return!0!==a&&!1!==a||(s=a,a=void 0),!0!==t&&!1!==t||(s=t,t=void 0),(i(e)&&o(e)||_(e)&&0===e.length)&&(e=void 0),d._isAMomentObject=!0,d._useUTC=d._isUTC=n,d._l=t,d._i=e,d._f=a,d._strict=s,(r=new k(la(ba(d))))._nextDay&&(r.add(1,"d"),r._nextDay=void 0),r}function Ha(e,a,t,s){return Sa(e,a,t,s,!1)}M.createFromInputFallback=t("value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are discouraged and will be removed in an upcoming major release. Please refer to http://momentjs.com/guides/#/warnings/js-date/ for more info.",function(e){e._d=new Date(e._i+(e._useUTC?" UTC":""))}),M.ISO_8601=function(){},M.RFC_2822=function(){};var ja=t("moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/",function(){var e=Ha.apply(null,arguments);return this.isValid()&&e.isValid()?e<this?this:e:y()}),xa=t("moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/",function(){var e=Ha.apply(null,arguments);return this.isValid()&&e.isValid()?this<e?this:e:y()});function Pa(e,a){var t,s;if(1===a.length&&_(a[0])&&(a=a[0]),!a.length)return Ha();for(t=a[0],s=1;s<a.length;++s)a[s].isValid()&&!a[s][e](t)||(t=a[s]);return t}var Oa=["year","quarter","month","week","day","hour","minute","second","millisecond"];function Wa(e){var a=J(e),t=a.year||0,s=a.quarter||0,n=a.month||0,r=a.week||a.isoWeek||0,d=a.day||0,_=a.hour||0,i=a.minute||0,o=a.second||0,m=a.millisecond||0;this._isValid=function(e){var a,t,s=!1;for(a in e)if(h(e,a)&&(-1===ye.call(Oa,a)||null!=e[a]&&isNaN(e[a])))return!1;for(t=0;t<Oa.length;++t)if(e[Oa[t]]){if(s)return!1;parseFloat(e[Oa[t]])!==G(e[Oa[t]])&&(s=!0)}return!0}(a),this._milliseconds=+m+1e3*o+6e4*i+1e3*_*60*60,this._days=+d+7*r,this._months=+n+3*s+12*t,this._data={},this._locale=ua(),this._bubble()}function Aa(e){return e instanceof Wa}function Ea(e){return e<0?-1*Math.round(-1*e):Math.round(e)}function Fa(e,t){W(e,0,0,function(){var e=this.utcOffset(),a="+";return e<0&&(e=-e,a="-"),a+H(~~(e/60),2)+t+H(~~e%60,2)})}Fa("Z",":"),Fa("ZZ",""),le("Z",me),le("ZZ",me),Le(["Z","ZZ"],function(e,a,t){t._useUTC=!0,t._tzm=Na(me,e)});var za=/([\+\-]|\d\d)/gi;function Na(e,a){var t,s,n=(a||"").match(e);return null===n?null:0===(s=60*(t=((n[n.length-1]||[])+"").match(za)||["-",0,0])[1]+G(t[2]))?0:"+"===t[0]?s:-s}function Ja(e,a){var t,s;return a._isUTC?(t=a.clone(),s=(D(e)||d(e)?e.valueOf():Ha(e).valueOf())-t.valueOf(),t._d.setTime(t._d.valueOf()+s),M.updateOffset(t,!1),t):Ha(e).local()}function Ra(e){return-Math.round(e._d.getTimezoneOffset())}function Ca(){return!!this.isValid()&&(this._isUTC&&0===this._offset)}M.updateOffset=function(){};var Ia=/^(-|\+)?(?:(\d*)[. ])?(\d+):(\d+)(?::(\d+)(\.\d*)?)?$/,Ua=/^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;function Ga(e,a){var t,s,n,r=e,d=null;return Aa(e)?r={ms:e._milliseconds,d:e._days,M:e._months}:m(e)||!isNaN(+e)?(r={},a?r[a]=+e:r.milliseconds=+e):(d=Ia.exec(e))?(t="-"===d[1]?-1:1,r={y:0,d:G(d[ke])*t,h:G(d[De])*t,m:G(d[Te])*t,s:G(d[ge])*t,ms:G(Ea(1e3*d[we]))*t}):(d=Ua.exec(e))?(t="-"===d[1]?-1:1,r={y:Va(d[2],t),M:Va(d[3],t),w:Va(d[4],t),d:Va(d[5],t),h:Va(d[6],t),m:Va(d[7],t),s:Va(d[8],t)}):null==r?r={}:"object"==typeof r&&("from"in r||"to"in r)&&(n=function(e,a){var t;if(!e.isValid()||!a.isValid())return{milliseconds:0,months:0};a=Ja(a,e),e.isBefore(a)?t=Ba(e,a):((t=Ba(a,e)).milliseconds=-t.milliseconds,t.months=-t.months);return t}(Ha(r.from),Ha(r.to)),(r={}).ms=n.milliseconds,r.M=n.months),s=new Wa(r),Aa(e)&&h(e,"_locale")&&(s._locale=e._locale),Aa(e)&&h(e,"_isValid")&&(s._isValid=e._isValid),s}function Va(e,a){var t=e&&parseFloat(e.replace(",","."));return(isNaN(t)?0:t)*a}function Ba(e,a){var t={};return t.months=a.month()-e.month()+12*(a.year()-e.year()),e.clone().add(t.months,"M").isAfter(a)&&--t.months,t.milliseconds=a-e.clone().add(t.months,"M"),t}function Ka(s,n){return function(e,a){var t;return null===a||isNaN(+a)||(w(n,"moment()."+n+"(period, number) is deprecated. Please use moment()."+n+"(number, period). See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info."),t=e,e=a,a=t),qa(this,Ga(e,a),s),this}}function qa(e,a,t,s){var n=a._milliseconds,r=Ea(a._days),d=Ea(a._months);e.isValid()&&(s=null==s||s,d&&We(e,B(e,"Month")+d*t),r&&K(e,"Date",B(e,"Date")+r*t),n&&e._d.setTime(e._d.valueOf()+n*t),s&&M.updateOffset(e,r||d))}Ga.fn=Wa.prototype,Ga.invalid=function(){return Ga(NaN)};var Za=Ka(1,"add"),$a=Ka(-1,"subtract");function Qa(e){return"string"==typeof e||e instanceof String}function Xa(e){return D(e)||d(e)||Qa(e)||m(e)||function(a){var e=_(a),t=!1;e&&(t=0===a.filter(function(e){return!m(e)&&Qa(a)}).length);return e&&t}(e)||function(e){var a,t,s=i(e)&&!o(e),n=!1,r=["years","year","y","months","month","M","days","day","d","dates","date","D","hours","hour","h","minutes","minute","m","seconds","second","s","milliseconds","millisecond","ms"];for(a=0;a<r.length;a+=1)t=r[a],n=n||h(e,t);return s&&n}(e)||null==e}function et(e,a){if(e.date()<a.date())return-et(a,e);var t=12*(a.year()-e.year())+(a.month()-e.month()),s=e.clone().add(t,"months"),n=a-s<0?(a-s)/(s-e.clone().add(t-1,"months")):(a-s)/(e.clone().add(1+t,"months")-s);return-(t+n)||0}function at(e){var a;return void 0===e?this._locale._abbr:(null!=(a=ua(e))&&(this._locale=a),this)}M.defaultFormat="YYYY-MM-DDTHH:mm:ssZ",M.defaultFormatUtc="YYYY-MM-DDTHH:mm:ss[Z]";var tt=t("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",function(e){return void 0===e?this.localeData():this.locale(e)});function st(){return this._locale}var nt=126227808e5;function rt(e,a){return(e%a+a)%a}function dt(e,a,t){return e<100&&0<=e?new Date(e+400,a,t)-nt:new Date(e,a,t).valueOf()}function _t(e,a,t){return e<100&&0<=e?Date.UTC(e+400,a,t)-nt:Date.UTC(e,a,t)}function it(e,a){return a.erasAbbrRegex(e)}function ot(){for(var e=[],a=[],t=[],s=[],n=this.eras(),r=0,d=n.length;r<d;++r)a.push(he(n[r].name)),e.push(he(n[r].abbr)),t.push(he(n[r].narrow)),s.push(he(n[r].name)),s.push(he(n[r].abbr)),s.push(he(n[r].narrow));this._erasRegex=new RegExp("^("+s.join("|")+")","i"),this._erasNameRegex=new RegExp("^("+a.join("|")+")","i"),this._erasAbbrRegex=new RegExp("^("+e.join("|")+")","i"),this._erasNarrowRegex=new RegExp("^("+t.join("|")+")","i")}function mt(e,a){W(0,[e,e.length],0,a)}function ut(e,a,t,s,n){var r;return null==e?Ce(this,s,n).year:((r=Ie(e,s,n))<a&&(a=r),function(e,a,t,s,n){var r=Re(e,a,t,s,n),d=Ne(r.year,0,r.dayOfYear);return this.year(d.getUTCFullYear()),this.month(d.getUTCMonth()),this.date(d.getUTCDate()),this}.call(this,e,a,t,s,n))}W("N",0,0,"eraAbbr"),W("NN",0,0,"eraAbbr"),W("NNN",0,0,"eraAbbr"),W("NNNN",0,0,"eraName"),W("NNNNN",0,0,"eraNarrow"),W("y",["y",1],"yo","eraYear"),W("y",["yy",2],0,"eraYear"),W("y",["yyy",3],0,"eraYear"),W("y",["yyyy",4],0,"eraYear"),le("N",it),le("NN",it),le("NNN",it),le("NNNN",function(e,a){return a.erasNameRegex(e)}),le("NNNNN",function(e,a){return a.erasNarrowRegex(e)}),Le(["N","NN","NNN","NNNN","NNNNN"],function(e,a,t,s){var n=t._locale.erasParse(e,s,t._strict);n?L(t).era=n:L(t).invalidEra=e}),le("y",_e),le("yy",_e),le("yyy",_e),le("yyyy",_e),le("yo",function(e,a){return a._eraYearOrdinalRegex||_e}),Le(["y","yy","yyy","yyyy"],fe),Le(["yo"],function(e,a,t,s){var n;t._locale._eraYearOrdinalRegex&&(n=e.match(t._locale._eraYearOrdinalRegex)),t._locale.eraYearOrdinalParse?a[fe]=t._locale.eraYearOrdinalParse(e,n):a[fe]=parseInt(e,10)}),W(0,["gg",2],0,function(){return this.weekYear()%100}),W(0,["GG",2],0,function(){return this.isoWeekYear()%100}),mt("gggg","weekYear"),mt("ggggg","weekYear"),mt("GGGG","isoWeekYear"),mt("GGGGG","isoWeekYear"),z("weekYear","gg"),z("isoWeekYear","GG"),C("weekYear",1),C("isoWeekYear",1),le("G",ie),le("g",ie),le("GG",ae,$),le("gg",ae,$),le("GGGG",re,X),le("gggg",re,X),le("GGGGG",de,ee),le("ggggg",de,ee),Ye(["gggg","ggggg","GGGG","GGGGG"],function(e,a,t,s){a[s.substr(0,2)]=G(e)}),Ye(["gg","GG"],function(e,a,t,s){a[s]=M.parseTwoDigitYear(e)}),W("Q",0,"Qo","quarter"),z("quarter","Q"),C("quarter",7),le("Q",Z),Le("Q",function(e,a){a[pe]=3*(G(e)-1)}),W("D",["DD",2],"Do","date"),z("date","D"),C("date",9),le("D",ae),le("DD",ae,$),le("Do",function(e,a){return e?a._dayOfMonthOrdinalParse||a._ordinalParse:a._dayOfMonthOrdinalParseLenient}),Le(["D","DD"],ke),Le("Do",function(e,a){a[ke]=G(e.match(ae)[0])});var lt=V("Date",!0);W("DDD",["DDDD",3],"DDDo","dayOfYear"),z("dayOfYear","DDD"),C("dayOfYear",4),le("DDD",ne),le("DDDD",Q),Le(["DDD","DDDD"],function(e,a,t){t._dayOfYear=G(e)}),W("m",["mm",2],0,"minute"),z("minute","m"),C("minute",14),le("m",ae),le("mm",ae,$),Le(["m","mm"],Te);var Mt=V("Minutes",!1);W("s",["ss",2],0,"second"),z("second","s"),C("second",15),le("s",ae),le("ss",ae,$),Le(["s","ss"],ge);var ht,ct,Lt=V("Seconds",!1);for(W("S",0,0,function(){return~~(this.millisecond()/100)}),W(0,["SS",2],0,function(){return~~(this.millisecond()/10)}),W(0,["SSS",3],0,"millisecond"),W(0,["SSSS",4],0,function(){return 10*this.millisecond()}),W(0,["SSSSS",5],0,function(){return 100*this.millisecond()}),W(0,["SSSSSS",6],0,function(){return 1e3*this.millisecond()}),W(0,["SSSSSSS",7],0,function(){return 1e4*this.millisecond()}),W(0,["SSSSSSSS",8],0,function(){return 1e5*this.millisecond()}),W(0,["SSSSSSSSS",9],0,function(){return 1e6*this.millisecond()}),z("millisecond","ms"),C("millisecond",16),le("S",ne,Z),le("SS",ne,$),le("SSS",ne,Q),ht="SSSS";ht.length<=9;ht+="S")le(ht,_e);function Yt(e,a){a[we]=G(1e3*("0."+e))}for(ht="S";ht.length<=9;ht+="S")Le(ht,Yt);ct=V("Milliseconds",!1),W("z",0,0,"zoneAbbr"),W("zz",0,0,"zoneName");var yt=k.prototype;function ft(e){return e}yt.add=Za,yt.calendar=function(e,a){1===arguments.length&&(arguments[0]?Xa(arguments[0])?(e=arguments[0],a=void 0):function(e){for(var a=i(e)&&!o(e),t=!1,s=["sameDay","nextDay","lastDay","nextWeek","lastWeek","sameElse"],n=0;n<s.length;n+=1)t=t||h(e,s[n]);return a&&t}(arguments[0])&&(a=arguments[0],e=void 0):a=e=void 0);var t=e||Ha(),s=Ja(t,this).startOf("day"),n=M.calendarFormat(this,s)||"sameElse",r=a&&(v(a[n])?a[n].call(this,t):a[n]);return this.format(r||this.localeData().calendar(n,this,Ha(t)))},yt.clone=function(){return new k(this)},yt.diff=function(e,a,t){var s,n,r;if(!this.isValid())return NaN;if(!(s=Ja(e,this)).isValid())return NaN;switch(n=6e4*(s.utcOffset()-this.utcOffset()),a=N(a)){case"year":r=et(this,s)/12;break;case"month":r=et(this,s);break;case"quarter":r=et(this,s)/3;break;case"second":r=(this-s)/1e3;break;case"minute":r=(this-s)/6e4;break;case"hour":r=(this-s)/36e5;break;case"day":r=(this-s-n)/864e5;break;case"week":r=(this-s-n)/6048e5;break;default:r=this-s}return t?r:U(r)},yt.endOf=function(e){var a,t;if(void 0===(e=N(e))||"millisecond"===e||!this.isValid())return this;switch(t=this._isUTC?_t:dt,e){case"year":a=t(this.year()+1,0,1)-1;break;case"quarter":a=t(this.year(),this.month()-this.month()%3+3,1)-1;break;case"month":a=t(this.year(),this.month()+1,1)-1;break;case"week":a=t(this.year(),this.month(),this.date()-this.weekday()+7)-1;break;case"isoWeek":a=t(this.year(),this.month(),this.date()-(this.isoWeekday()-1)+7)-1;break;case"day":case"date":a=t(this.year(),this.month(),this.date()+1)-1;break;case"hour":a=this._d.valueOf(),a+=36e5-rt(a+(this._isUTC?0:6e4*this.utcOffset()),36e5)-1;break;case"minute":a=this._d.valueOf(),a+=6e4-rt(a,6e4)-1;break;case"second":a=this._d.valueOf(),a+=1e3-rt(a,1e3)-1;break}return this._d.setTime(a),M.updateOffset(this,!0),this},yt.format=function(e){e=e||(this.isUtc()?M.defaultFormatUtc:M.defaultFormat);var a=A(this,e);return this.localeData().postformat(a)},yt.from=function(e,a){return this.isValid()&&(D(e)&&e.isValid()||Ha(e).isValid())?Ga({to:this,from:e}).locale(this.locale()).humanize(!a):this.localeData().invalidDate()},yt.fromNow=function(e){return this.from(Ha(),e)},yt.to=function(e,a){return this.isValid()&&(D(e)&&e.isValid()||Ha(e).isValid())?Ga({from:this,to:e}).locale(this.locale()).humanize(!a):this.localeData().invalidDate()},yt.toNow=function(e){return this.to(Ha(),e)},yt.get=function(e){return v(this[e=N(e)])?this[e]():this},yt.invalidAt=function(){return L(this).overflow},yt.isAfter=function(e,a){var t=D(e)?e:Ha(e);return!(!this.isValid()||!t.isValid())&&("millisecond"===(a=N(a)||"millisecond")?this.valueOf()>t.valueOf():t.valueOf()<this.clone().startOf(a).valueOf())},yt.isBefore=function(e,a){var t=D(e)?e:Ha(e);return!(!this.isValid()||!t.isValid())&&("millisecond"===(a=N(a)||"millisecond")?this.valueOf()<t.valueOf():this.clone().endOf(a).valueOf()<t.valueOf())},yt.isBetween=function(e,a,t,s){var n=D(e)?e:Ha(e),r=D(a)?a:Ha(a);return!!(this.isValid()&&n.isValid()&&r.isValid())&&(("("===(s=s||"()")[0]?this.isAfter(n,t):!this.isBefore(n,t))&&(")"===s[1]?this.isBefore(r,t):!this.isAfter(r,t)))},yt.isSame=function(e,a){var t,s=D(e)?e:Ha(e);return!(!this.isValid()||!s.isValid())&&("millisecond"===(a=N(a)||"millisecond")?this.valueOf()===s.valueOf():(t=s.valueOf(),this.clone().startOf(a).valueOf()<=t&&t<=this.clone().endOf(a).valueOf()))},yt.isSameOrAfter=function(e,a){return this.isSame(e,a)||this.isAfter(e,a)},yt.isSameOrBefore=function(e,a){return this.isSame(e,a)||this.isBefore(e,a)},yt.isValid=function(){return Y(this)},yt.lang=tt,yt.locale=at,yt.localeData=st,yt.max=xa,yt.min=ja,yt.parsingFlags=function(){return l({},L(this))},yt.set=function(e,a){if("object"==typeof e)for(var t=function(e){var a,t=[];for(a in e)h(e,a)&&t.push({unit:a,priority:R[a]});return t.sort(function(e,a){return e.priority-a.priority}),t}(e=J(e)),s=0;s<t.length;s++)this[t[s].unit](e[t[s].unit]);else if(v(this[e=N(e)]))return this[e](a);return this},yt.startOf=function(e){var a,t;if(void 0===(e=N(e))||"millisecond"===e||!this.isValid())return this;switch(t=this._isUTC?_t:dt,e){case"year":a=t(this.year(),0,1);break;case"quarter":a=t(this.year(),this.month()-this.month()%3,1);break;case"month":a=t(this.year(),this.month(),1);break;case"week":a=t(this.year(),this.month(),this.date()-this.weekday());break;case"isoWeek":a=t(this.year(),this.month(),this.date()-(this.isoWeekday()-1));break;case"day":case"date":a=t(this.year(),this.month(),this.date());break;case"hour":a=this._d.valueOf(),a-=rt(a+(this._isUTC?0:6e4*this.utcOffset()),36e5);break;case"minute":a=this._d.valueOf(),a-=rt(a,6e4);break;case"second":a=this._d.valueOf(),a-=rt(a,1e3);break}return this._d.setTime(a),M.updateOffset(this,!0),this},yt.subtract=$a,yt.toArray=function(){var e=this;return[e.year(),e.month(),e.date(),e.hour(),e.minute(),e.second(),e.millisecond()]},yt.toObject=function(){var e=this;return{years:e.year(),months:e.month(),date:e.date(),hours:e.hours(),minutes:e.minutes(),seconds:e.seconds(),milliseconds:e.milliseconds()}},yt.toDate=function(){return new Date(this.valueOf())},yt.toISOString=function(e){if(!this.isValid())return null;var a=!0!==e,t=a?this.clone().utc():this;return t.year()<0||9999<t.year()?A(t,a?"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYYYY-MM-DD[T]HH:mm:ss.SSSZ"):v(Date.prototype.toISOString)?a?this.toDate().toISOString():new Date(this.valueOf()+60*this.utcOffset()*1e3).toISOString().replace("Z",A(t,"Z")):A(t,a?"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYY-MM-DD[T]HH:mm:ss.SSSZ")},yt.inspect=function(){if(!this.isValid())return"moment.invalid(/* "+this._i+" */)";var e,a,t,s="moment",n="";return this.isLocal()||(s=0===this.utcOffset()?"moment.utc":"moment.parseZone",n="Z"),e="["+s+'("]',a=0<=this.year()&&this.year()<=9999?"YYYY":"YYYYYY",t=n+'[")]',this.format(e+a+"-MM-DD[T]HH:mm:ss.SSS"+t)},"undefined"!=typeof Symbol&&null!=Symbol.for&&(yt[Symbol.for("nodejs.util.inspect.custom")]=function(){return"Moment<"+this.format()+">"}),yt.toJSON=function(){return this.isValid()?this.toISOString():null},yt.toString=function(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},yt.unix=function(){return Math.floor(this.valueOf()/1e3)},yt.valueOf=function(){return this._d.valueOf()-6e4*(this._offset||0)},yt.creationData=function(){return{input:this._i,format:this._f,locale:this._locale,isUTC:this._isUTC,strict:this._strict}},yt.eraName=function(){for(var e,a=this.localeData().eras(),t=0,s=a.length;t<s;++t){if(e=this.clone().startOf("day").valueOf(),a[t].since<=e&&e<=a[t].until)return a[t].name;if(a[t].until<=e&&e<=a[t].since)return a[t].name}return""},yt.eraNarrow=function(){for(var e,a=this.localeData().eras(),t=0,s=a.length;t<s;++t){if(e=this.clone().startOf("day").valueOf(),a[t].since<=e&&e<=a[t].until)return a[t].narrow;if(a[t].until<=e&&e<=a[t].since)return a[t].narrow}return""},yt.eraAbbr=function(){for(var e,a=this.localeData().eras(),t=0,s=a.length;t<s;++t){if(e=this.clone().startOf("day").valueOf(),a[t].since<=e&&e<=a[t].until)return a[t].abbr;if(a[t].until<=e&&e<=a[t].since)return a[t].abbr}return""},yt.eraYear=function(){for(var e,a,t=this.localeData().eras(),s=0,n=t.length;s<n;++s)if(e=t[s].since<=t[s].until?1:-1,a=this.clone().startOf("day").valueOf(),t[s].since<=a&&a<=t[s].until||t[s].until<=a&&a<=t[s].since)return(this.year()-M(t[s].since).year())*e+t[s].offset;return this.year()},yt.year=ze,yt.isLeapYear=function(){return I(this.year())},yt.weekYear=function(e){return ut.call(this,e,this.week(),this.weekday(),this.localeData()._week.dow,this.localeData()._week.doy)},yt.isoWeekYear=function(e){return ut.call(this,e,this.isoWeek(),this.isoWeekday(),1,4)},yt.quarter=yt.quarters=function(e){return null==e?Math.ceil((this.month()+1)/3):this.month(3*(e-1)+this.month()%3)},yt.month=Ae,yt.daysInMonth=function(){return Se(this.year(),this.month())},yt.week=yt.weeks=function(e){var a=this.localeData().week(this);return null==e?a:this.add(7*(e-a),"d")},yt.isoWeek=yt.isoWeeks=function(e){var a=Ce(this,1,4).week;return null==e?a:this.add(7*(e-a),"d")},yt.weeksInYear=function(){var e=this.localeData()._week;return Ie(this.year(),e.dow,e.doy)},yt.weeksInWeekYear=function(){var e=this.localeData()._week;return Ie(this.weekYear(),e.dow,e.doy)},yt.isoWeeksInYear=function(){return Ie(this.year(),1,4)},yt.isoWeeksInISOWeekYear=function(){return Ie(this.isoWeekYear(),1,4)},yt.date=lt,yt.day=yt.days=function(e){if(!this.isValid())return null!=e?this:NaN;var a,t,s=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=e?(a=e,t=this.localeData(),e="string"!=typeof a?a:isNaN(a)?"number"==typeof(a=t.weekdaysParse(a))?a:null:parseInt(a,10),this.add(e-s,"d")):s},yt.weekday=function(e){if(!this.isValid())return null!=e?this:NaN;var a=(this.day()+7-this.localeData()._week.dow)%7;return null==e?a:this.add(e-a,"d")},yt.isoWeekday=function(e){if(!this.isValid())return null!=e?this:NaN;if(null==e)return this.day()||7;var a,t,s=(a=e,t=this.localeData(),"string"==typeof a?t.weekdaysParse(a)%7||7:isNaN(a)?null:a);return this.day(this.day()%7?s:s-7)},yt.dayOfYear=function(e){var a=Math.round((this.clone().startOf("day")-this.clone().startOf("year"))/864e5)+1;return null==e?a:this.add(e-a,"d")},yt.hour=yt.hours=aa,yt.minute=yt.minutes=Mt,yt.second=yt.seconds=Lt,yt.millisecond=yt.milliseconds=ct,yt.utcOffset=function(e,a,t){var s,n=this._offset||0;if(!this.isValid())return null!=e?this:NaN;if(null==e)return this._isUTC?n:Ra(this);if("string"==typeof e){if(null===(e=Na(me,e)))return this}else Math.abs(e)<16&&!t&&(e*=60);return!this._isUTC&&a&&(s=Ra(this)),this._offset=e,this._isUTC=!0,null!=s&&this.add(s,"m"),n!==e&&(!a||this._changeInProgress?qa(this,Ga(e-n,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,M.updateOffset(this,!0),this._changeInProgress=null)),this},yt.utc=function(e){return this.utcOffset(0,e)},yt.local=function(e){return this._isUTC&&(this.utcOffset(0,e),this._isUTC=!1,e&&this.subtract(Ra(this),"m")),this},yt.parseZone=function(){var e;return null!=this._tzm?this.utcOffset(this._tzm,!1,!0):"string"==typeof this._i&&(null!=(e=Na(oe,this._i))?this.utcOffset(e):this.utcOffset(0,!0)),this},yt.hasAlignedHourOffset=function(e){return!!this.isValid()&&(e=e?Ha(e).utcOffset():0,(this.utcOffset()-e)%60==0)},yt.isDST=function(){return this.utcOffset()>this.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()},yt.isLocal=function(){return!!this.isValid()&&!this._isUTC},yt.isUtcOffset=function(){return!!this.isValid()&&this._isUTC},yt.isUtc=Ca,yt.isUTC=Ca,yt.zoneAbbr=function(){return this._isUTC?"UTC":""},yt.zoneName=function(){return this._isUTC?"Coordinated Universal Time":""},yt.dates=t("dates accessor is deprecated. Use date instead.",lt),yt.months=t("months accessor is deprecated. Use month instead",Ae),yt.years=t("years accessor is deprecated. Use year instead",ze),yt.zone=t("moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/",function(e,a){return null!=e?("string"!=typeof e&&(e=-e),this.utcOffset(e,a),this):-this.utcOffset()}),yt.isDSTShifted=t("isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information",function(){if(!r(this._isDSTShifted))return this._isDSTShifted;var e,a={};return p(a,this),(a=ba(a))._a?(e=(a._isUTC?c:Ha)(a._a),this._isDSTShifted=this.isValid()&&0<function(e,a,t){for(var s=Math.min(e.length,a.length),n=Math.abs(e.length-a.length),r=0,d=0;d<s;d++)(t&&e[d]!==a[d]||!t&&G(e[d])!==G(a[d]))&&r++;return r+n}(a._a,e.toArray())):this._isDSTShifted=!1,this._isDSTShifted});var pt=S.prototype;function kt(e,a,t,s){var n=ua(),r=c().set(s,a);return n[t](r,e)}function Dt(e,a,t){if(m(e)&&(a=e,e=void 0),e=e||"",null!=a)return kt(e,a,t,"month");for(var s=[],n=0;n<12;n++)s[n]=kt(e,n,t,"month");return s}function Tt(e,a,t,s){a=("boolean"==typeof e?m(a)&&(t=a,a=void 0):(a=e,e=!1,m(t=a)&&(t=a,a=void 0)),a||"");var n,r=ua(),d=e?r._week.dow:0,_=[];if(null!=t)return kt(a,(t+d)%7,s,"day");for(n=0;n<7;n++)_[n]=kt(a,(n+d)%7,s,"day");return _}pt.calendar=function(e,a,t){var s=this._calendar[e]||this._calendar.sameElse;return v(s)?s.call(a,t):s},pt.longDateFormat=function(e){var a=this._longDateFormat[e],t=this._longDateFormat[e.toUpperCase()];return a||!t?a:(this._longDateFormat[e]=t.match(j).map(function(e){return"MMMM"===e||"MM"===e||"DD"===e||"dddd"===e?e.slice(1):e}).join(""),this._longDateFormat[e])},pt.invalidDate=function(){return this._invalidDate},pt.ordinal=function(e){return this._ordinal.replace("%d",e)},pt.preparse=ft,pt.postformat=ft,pt.relativeTime=function(e,a,t,s){var n=this._relativeTime[t];return v(n)?n(e,a,t,s):n.replace(/%d/i,e)},pt.pastFuture=function(e,a){var t=this._relativeTime[0<e?"future":"past"];return v(t)?t(a):t.replace(/%s/i,a)},pt.set=function(e){var a,t;for(t in e)h(e,t)&&(v(a=e[t])?this[t]=a:this["_"+t]=a);this._config=e,this._dayOfMonthOrdinalParseLenient=new RegExp((this._dayOfMonthOrdinalParse.source||this._ordinalParse.source)+"|"+/\d{1,2}/.source)},pt.eras=function(e,a){for(var t,s=this._eras||ua("en")._eras,n=0,r=s.length;n<r;++n){switch(typeof s[n].since){case"string":t=M(s[n].since).startOf("day"),s[n].since=t.valueOf();break}switch(typeof s[n].until){case"undefined":s[n].until=1/0;break;case"string":t=M(s[n].until).startOf("day").valueOf(),s[n].until=t.valueOf();break}}return s},pt.erasParse=function(e,a,t){var s,n,r,d,_,i=this.eras();for(e=e.toUpperCase(),s=0,n=i.length;s<n;++s)if(r=i[s].name.toUpperCase(),d=i[s].abbr.toUpperCase(),_=i[s].narrow.toUpperCase(),t)switch(a){case"N":case"NN":case"NNN":if(d===e)return i[s];break;case"NNNN":if(r===e)return i[s];break;case"NNNNN":if(_===e)return i[s];break}else if(0<=[r,d,_].indexOf(e))return i[s]},pt.erasConvertYear=function(e,a){var t=e.since<=e.until?1:-1;return void 0===a?M(e.since).year():M(e.since).year()+(a-e.offset)*t},pt.erasAbbrRegex=function(e){return h(this,"_erasAbbrRegex")||ot.call(this),e?this._erasAbbrRegex:this._erasRegex},pt.erasNameRegex=function(e){return h(this,"_erasNameRegex")||ot.call(this),e?this._erasNameRegex:this._erasRegex},pt.erasNarrowRegex=function(e){return h(this,"_erasNarrowRegex")||ot.call(this),e?this._erasNarrowRegex:this._erasRegex},pt.months=function(e,a){return e?_(this._months)?this._months[e.month()]:this._months[(this._months.isFormat||xe).test(a)?"format":"standalone"][e.month()]:_(this._months)?this._months:this._months.standalone},pt.monthsShort=function(e,a){return e?_(this._monthsShort)?this._monthsShort[e.month()]:this._monthsShort[xe.test(a)?"format":"standalone"][e.month()]:_(this._monthsShort)?this._monthsShort:this._monthsShort.standalone},pt.monthsParse=function(e,a,t){var s,n,r;if(this._monthsParseExact)return function(e,a,t){var s,n,r,d=e.toLocaleLowerCase();if(!this._monthsParse)for(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[],s=0;s<12;++s)r=c([2e3,s]),this._shortMonthsParse[s]=this.monthsShort(r,"").toLocaleLowerCase(),this._longMonthsParse[s]=this.months(r,"").toLocaleLowerCase();return t?"MMM"===a?-1!==(n=ye.call(this._shortMonthsParse,d))?n:null:-1!==(n=ye.call(this._longMonthsParse,d))?n:null:"MMM"===a?-1!==(n=ye.call(this._shortMonthsParse,d))||-1!==(n=ye.call(this._longMonthsParse,d))?n:null:-1!==(n=ye.call(this._longMonthsParse,d))||-1!==(n=ye.call(this._shortMonthsParse,d))?n:null}.call(this,e,a,t);for(this._monthsParse||(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[]),s=0;s<12;s++){if(n=c([2e3,s]),t&&!this._longMonthsParse[s]&&(this._longMonthsParse[s]=new RegExp("^"+this.months(n,"").replace(".","")+"$","i"),this._shortMonthsParse[s]=new RegExp("^"+this.monthsShort(n,"").replace(".","")+"$","i")),t||this._monthsParse[s]||(r="^"+this.months(n,"")+"|^"+this.monthsShort(n,""),this._monthsParse[s]=new RegExp(r.replace(".",""),"i")),t&&"MMMM"===a&&this._longMonthsParse[s].test(e))return s;if(t&&"MMM"===a&&this._shortMonthsParse[s].test(e))return s;if(!t&&this._monthsParse[s].test(e))return s}},pt.monthsRegex=function(e){return this._monthsParseExact?(h(this,"_monthsRegex")||Ee.call(this),e?this._monthsStrictRegex:this._monthsRegex):(h(this,"_monthsRegex")||(this._monthsRegex=Oe),this._monthsStrictRegex&&e?this._monthsStrictRegex:this._monthsRegex)},pt.monthsShortRegex=function(e){return this._monthsParseExact?(h(this,"_monthsRegex")||Ee.call(this),e?this._monthsShortStrictRegex:this._monthsShortRegex):(h(this,"_monthsShortRegex")||(this._monthsShortRegex=Pe),this._monthsShortStrictRegex&&e?this._monthsShortStrictRegex:this._monthsShortRegex)},pt.week=function(e){return Ce(e,this._week.dow,this._week.doy).week},pt.firstDayOfYear=function(){return this._week.doy},pt.firstDayOfWeek=function(){return this._week.dow},pt.weekdays=function(e,a){var t=_(this._weekdays)?this._weekdays:this._weekdays[e&&!0!==e&&this._weekdays.isFormat.test(a)?"format":"standalone"];return!0===e?Ue(t,this._week.dow):e?t[e.day()]:t},pt.weekdaysMin=function(e){return!0===e?Ue(this._weekdaysMin,this._week.dow):e?this._weekdaysMin[e.day()]:this._weekdaysMin},pt.weekdaysShort=function(e){return!0===e?Ue(this._weekdaysShort,this._week.dow):e?this._weekdaysShort[e.day()]:this._weekdaysShort},pt.weekdaysParse=function(e,a,t){var s,n,r;if(this._weekdaysParseExact)return function(e,a,t){var s,n,r,d=e.toLocaleLowerCase();if(!this._weekdaysParse)for(this._weekdaysParse=[],this._shortWeekdaysParse=[],this._minWeekdaysParse=[],s=0;s<7;++s)r=c([2e3,1]).day(s),this._minWeekdaysParse[s]=this.weekdaysMin(r,"").toLocaleLowerCase(),this._shortWeekdaysParse[s]=this.weekdaysShort(r,"").toLocaleLowerCase(),this._weekdaysParse[s]=this.weekdays(r,"").toLocaleLowerCase();return t?"dddd"===a?-1!==(n=ye.call(this._weekdaysParse,d))?n:null:"ddd"===a?-1!==(n=ye.call(this._shortWeekdaysParse,d))?n:null:-1!==(n=ye.call(this._minWeekdaysParse,d))?n:null:"dddd"===a?-1!==(n=ye.call(this._weekdaysParse,d))||-1!==(n=ye.call(this._shortWeekdaysParse,d))||-1!==(n=ye.call(this._minWeekdaysParse,d))?n:null:"ddd"===a?-1!==(n=ye.call(this._shortWeekdaysParse,d))||-1!==(n=ye.call(this._weekdaysParse,d))||-1!==(n=ye.call(this._minWeekdaysParse,d))?n:null:-1!==(n=ye.call(this._minWeekdaysParse,d))||-1!==(n=ye.call(this._weekdaysParse,d))||-1!==(n=ye.call(this._shortWeekdaysParse,d))?n:null}.call(this,e,a,t);for(this._weekdaysParse||(this._weekdaysParse=[],this._minWeekdaysParse=[],this._shortWeekdaysParse=[],this._fullWeekdaysParse=[]),s=0;s<7;s++){if(n=c([2e3,1]).day(s),t&&!this._fullWeekdaysParse[s]&&(this._fullWeekdaysParse[s]=new RegExp("^"+this.weekdays(n,"").replace(".","\\.?")+"$","i"),this._shortWeekdaysParse[s]=new RegExp("^"+this.weekdaysShort(n,"").replace(".","\\.?")+"$","i"),this._minWeekdaysParse[s]=new RegExp("^"+this.weekdaysMin(n,"").replace(".","\\.?")+"$","i")),this._weekdaysParse[s]||(r="^"+this.weekdays(n,"")+"|^"+this.weekdaysShort(n,"")+"|^"+this.weekdaysMin(n,""),this._weekdaysParse[s]=new RegExp(r.replace(".",""),"i")),t&&"dddd"===a&&this._fullWeekdaysParse[s].test(e))return s;if(t&&"ddd"===a&&this._shortWeekdaysParse[s].test(e))return s;if(t&&"dd"===a&&this._minWeekdaysParse[s].test(e))return s;if(!t&&this._weekdaysParse[s].test(e))return s}},pt.weekdaysRegex=function(e){return this._weekdaysParseExact?(h(this,"_weekdaysRegex")||$e.call(this),e?this._weekdaysStrictRegex:this._weekdaysRegex):(h(this,"_weekdaysRegex")||(this._weekdaysRegex=Ke),this._weekdaysStrictRegex&&e?this._weekdaysStrictRegex:this._weekdaysRegex)},pt.weekdaysShortRegex=function(e){return this._weekdaysParseExact?(h(this,"_weekdaysRegex")||$e.call(this),e?this._weekdaysShortStrictRegex:this._weekdaysShortRegex):(h(this,"_weekdaysShortRegex")||(this._weekdaysShortRegex=qe),this._weekdaysShortStrictRegex&&e?this._weekdaysShortStrictRegex:this._weekdaysShortRegex)},pt.weekdaysMinRegex=function(e){return this._weekdaysParseExact?(h(this,"_weekdaysRegex")||$e.call(this),e?this._weekdaysMinStrictRegex:this._weekdaysMinRegex):(h(this,"_weekdaysMinRegex")||(this._weekdaysMinRegex=Ze),this._weekdaysMinStrictRegex&&e?this._weekdaysMinStrictRegex:this._weekdaysMinRegex)},pt.isPM=function(e){return"p"===(e+"").toLowerCase().charAt(0)},pt.meridiem=function(e,a,t){return 11<e?t?"pm":"PM":t?"am":"AM"},oa("en",{eras:[{since:"0001-01-01",until:1/0,offset:1,name:"Anno Domini",narrow:"AD",abbr:"AD"},{since:"0000-12-31",until:-1/0,offset:1,name:"Before Christ",narrow:"BC",abbr:"BC"}],dayOfMonthOrdinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(e){var a=e%10;return e+(1===G(e%100/10)?"th":1==a?"st":2==a?"nd":3==a?"rd":"th")}}),M.lang=t("moment.lang is deprecated. Use moment.locale instead.",oa),M.langData=t("moment.langData is deprecated. Use moment.localeData instead.",ua);var gt=Math.abs;function wt(e,a,t,s){var n=Ga(a,t);return e._milliseconds+=s*n._milliseconds,e._days+=s*n._days,e._months+=s*n._months,e._bubble()}function vt(e){return e<0?Math.floor(e):Math.ceil(e)}function bt(e){return 4800*e/146097}function St(e){return 146097*e/4800}function Ht(e){return function(){return this.as(e)}}var jt=Ht("ms"),xt=Ht("s"),Pt=Ht("m"),Ot=Ht("h"),Wt=Ht("d"),At=Ht("w"),Et=Ht("M"),Ft=Ht("Q"),zt=Ht("y");function Nt(e){return function(){return this.isValid()?this._data[e]:NaN}}var Jt=Nt("milliseconds"),Rt=Nt("seconds"),Ct=Nt("minutes"),It=Nt("hours"),Ut=Nt("days"),Gt=Nt("months"),Vt=Nt("years");var Bt=Math.round,Kt={ss:44,s:45,m:45,h:22,d:26,w:null,M:11};function qt(e,a,t,s){var n=Ga(e).abs(),r=Bt(n.as("s")),d=Bt(n.as("m")),_=Bt(n.as("h")),i=Bt(n.as("d")),o=Bt(n.as("M")),m=Bt(n.as("w")),u=Bt(n.as("y")),l=(r<=t.ss?["s",r]:r<t.s&&["ss",r])||d<=1&&["m"]||d<t.m&&["mm",d]||_<=1&&["h"]||_<t.h&&["hh",_]||i<=1&&["d"]||i<t.d&&["dd",i];return null!=t.w&&(l=l||m<=1&&["w"]||m<t.w&&["ww",m]),(l=l||o<=1&&["M"]||o<t.M&&["MM",o]||u<=1&&["y"]||["yy",u])[2]=a,l[3]=0<+e,l[4]=s,function(e,a,t,s,n){return n.relativeTime(a||1,!!t,e,s)}.apply(null,l)}var Zt=Math.abs;function $t(e){return(0<e)-(e<0)||+e}function Qt(){if(!this.isValid())return this.localeData().invalidDate();var e,a,t,s,n,r,d,_,i=Zt(this._milliseconds)/1e3,o=Zt(this._days),m=Zt(this._months),u=this.asSeconds();return u?(e=U(i/60),a=U(e/60),i%=60,e%=60,t=U(m/12),m%=12,s=i?i.toFixed(3).replace(/\.?0+$/,""):"",n=u<0?"-":"",r=$t(this._months)!==$t(u)?"-":"",d=$t(this._days)!==$t(u)?"-":"",_=$t(this._milliseconds)!==$t(u)?"-":"",n+"P"+(t?r+t+"Y":"")+(m?r+m+"M":"")+(o?d+o+"D":"")+(a||e||i?"T":"")+(a?_+a+"H":"")+(e?_+e+"M":"")+(i?_+s+"S":"")):"P0D"}var Xt=Wa.prototype;Xt.isValid=function(){return this._isValid},Xt.abs=function(){var e=this._data;return this._milliseconds=gt(this._milliseconds),this._days=gt(this._days),this._months=gt(this._months),e.milliseconds=gt(e.milliseconds),e.seconds=gt(e.seconds),e.minutes=gt(e.minutes),e.hours=gt(e.hours),e.months=gt(e.months),e.years=gt(e.years),this},Xt.add=function(e,a){return wt(this,e,a,1)},Xt.subtract=function(e,a){return wt(this,e,a,-1)},Xt.as=function(e){if(!this.isValid())return NaN;var a,t,s=this._milliseconds;if("month"===(e=N(e))||"quarter"===e||"year"===e)switch(a=this._days+s/864e5,t=this._months+bt(a),e){case"month":return t;case"quarter":return t/3;case"year":return t/12}else switch(a=this._days+Math.round(St(this._months)),e){case"week":return a/7+s/6048e5;case"day":return a+s/864e5;case"hour":return 24*a+s/36e5;case"minute":return 1440*a+s/6e4;case"second":return 86400*a+s/1e3;case"millisecond":return Math.floor(864e5*a)+s;default:throw new Error("Unknown unit "+e)}},Xt.asMilliseconds=jt,Xt.asSeconds=xt,Xt.asMinutes=Pt,Xt.asHours=Ot,Xt.asDays=Wt,Xt.asWeeks=At,Xt.asMonths=Et,Xt.asQuarters=Ft,Xt.asYears=zt,Xt.valueOf=function(){return this.isValid()?this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*G(this._months/12):NaN},Xt._bubble=function(){var e,a,t,s,n,r=this._milliseconds,d=this._days,_=this._months,i=this._data;return 0<=r&&0<=d&&0<=_||r<=0&&d<=0&&_<=0||(r+=864e5*vt(St(_)+d),_=d=0),i.milliseconds=r%1e3,e=U(r/1e3),i.seconds=e%60,a=U(e/60),i.minutes=a%60,t=U(a/60),i.hours=t%24,d+=U(t/24),_+=n=U(bt(d)),d-=vt(St(n)),s=U(_/12),_%=12,i.days=d,i.months=_,i.years=s,this},Xt.clone=function(){return Ga(this)},Xt.get=function(e){return e=N(e),this.isValid()?this[e+"s"]():NaN},Xt.milliseconds=Jt,Xt.seconds=Rt,Xt.minutes=Ct,Xt.hours=It,Xt.days=Ut,Xt.weeks=function(){return U(this.days()/7)},Xt.months=Gt,Xt.years=Vt,Xt.humanize=function(e,a){if(!this.isValid())return this.localeData().invalidDate();var t,s,n=!1,r=Kt;return"object"==typeof e&&(a=e,e=!1),"boolean"==typeof e&&(n=e),"object"==typeof a&&(r=Object.assign({},Kt,a),null!=a.s&&null==a.ss&&(r.ss=a.s-1)),t=this.localeData(),s=qt(this,!n,r,t),n&&(s=t.pastFuture(+this,s)),t.postformat(s)},Xt.toISOString=Qt,Xt.toString=Qt,Xt.toJSON=Qt,Xt.locale=at,Xt.localeData=st,Xt.toIsoString=t("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",Qt),Xt.lang=tt,W("X",0,0,"unix"),W("x",0,0,"valueOf"),le("x",ie),le("X",/[+-]?\d+(\.\d{1,3})?/),Le("X",function(e,a,t){t._d=new Date(1e3*parseFloat(e))}),Le("x",function(e,a,t){t._d=new Date(G(e))}),M.version="2.29.0",e=Ha,M.fn=yt,M.min=function(){return Pa("isBefore",[].slice.call(arguments,0))},M.max=function(){return Pa("isAfter",[].slice.call(arguments,0))},M.now=function(){return Date.now?Date.now():+new Date},M.utc=c,M.unix=function(e){return Ha(1e3*e)},M.months=function(e,a){return Dt(e,a,"months")},M.isDate=d,M.locale=oa,M.invalid=y,M.duration=Ga,M.isMoment=D,M.weekdays=function(e,a,t){return Tt(e,a,t,"weekdays")},M.parseZone=function(){return Ha.apply(null,arguments).parseZone()},M.localeData=ua,M.isDuration=Aa,M.monthsShort=function(e,a){return Dt(e,a,"monthsShort")},M.weekdaysMin=function(e,a,t){return Tt(e,a,t,"weekdaysMin")},M.defineLocale=ma,M.updateLocale=function(e,a){var t,s,n;return null!=a?(n=sa,null!=na[e]&&null!=na[e].parentLocale?na[e].set(b(na[e]._config,a)):(null!=(s=ia(e))&&(n=s._config),a=b(n,a),null==s&&(a.abbr=e),(t=new S(a)).parentLocale=na[e],na[e]=t),oa(e)):null!=na[e]&&(null!=na[e].parentLocale?(na[e]=na[e].parentLocale,e===oa()&&oa(e)):null!=na[e]&&delete na[e]),na[e]},M.locales=function(){return s(na)},M.weekdaysShort=function(e,a,t){return Tt(e,a,t,"weekdaysShort")},M.normalizeUnits=N,M.relativeTimeRounding=function(e){return void 0===e?Bt:"function"==typeof e&&(Bt=e,!0)},M.relativeTimeThreshold=function(e,a){return void 0!==Kt[e]&&(void 0===a?Kt[e]:(Kt[e]=a,"s"===e&&(Kt.ss=a-1),!0))},M.calendarFormat=function(e,a){var t=e.diff(a,"days",!0);return t<-6?"sameElse":t<-1?"lastWeek":t<0?"lastDay":t<1?"sameDay":t<2?"nextDay":t<7?"nextWeek":"sameElse"},M.prototype=yt,M.HTML5_FMT={DATETIME_LOCAL:"YYYY-MM-DDTHH:mm",DATETIME_LOCAL_SECONDS:"YYYY-MM-DDTHH:mm:ss",DATETIME_LOCAL_MS:"YYYY-MM-DDTHH:mm:ss.SSS",DATE:"YYYY-MM-DD",TIME:"HH:mm",TIME_SECONDS:"HH:mm:ss",TIME_MS:"HH:mm:ss.SSS",WEEK:"GGGG-[W]WW",MONTH:"YYYY-MM"},M.defineLocale("af",{months:"Januarie_Februarie_Maart_April_Mei_Junie_Julie_Augustus_September_Oktober_November_Desember".split("_"),monthsShort:"Jan_Feb_Mrt_Apr_Mei_Jun_Jul_Aug_Sep_Okt_Nov_Des".split("_"),weekdays:"Sondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrydag_Saterdag".split("_"),weekdaysShort:"Son_Maa_Din_Woe_Don_Vry_Sat".split("_"),weekdaysMin:"So_Ma_Di_Wo_Do_Vr_Sa".split("_"),meridiemParse:/vm|nm/i,isPM:function(e){return/^nm$/i.test(e)},meridiem:function(e,a,t){return e<12?t?"vm":"VM":t?"nm":"NM"},longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Vandag om] LT",nextDay:"[M\xf4re om] LT",nextWeek:"dddd [om] LT",lastDay:"[Gister om] LT",lastWeek:"[Laas] dddd [om] LT",sameElse:"L"},relativeTime:{future:"oor %s",past:"%s gelede",s:"'n paar sekondes",ss:"%d sekondes",m:"'n minuut",mm:"%d minute",h:"'n uur",hh:"%d ure",d:"'n dag",dd:"%d dae",M:"'n maand",MM:"%d maande",y:"'n jaar",yy:"%d jaar"},dayOfMonthOrdinalParse:/\d{1,2}(ste|de)/,ordinal:function(e){return e+(1===e||8===e||20<=e?"ste":"de")},week:{dow:1,doy:4}});function es(e){return 0===e?0:1===e?1:2===e?2:3<=e%100&&e%100<=10?3:11<=e%100?4:5}function as(d){return function(e,a,t,s){var n=es(e),r=ts[d][es(e)];return 2===n&&(r=r[a?0:1]),r.replace(/%d/i,e)}}var ts={s:["\u0623\u0642\u0644 \u0645\u0646 \u062b\u0627\u0646\u064a\u0629","\u062b\u0627\u0646\u064a\u0629 \u0648\u0627\u062d\u062f\u0629",["\u062b\u0627\u0646\u064a\u062a\u0627\u0646","\u062b\u0627\u0646\u064a\u062a\u064a\u0646"],"%d \u062b\u0648\u0627\u0646","%d \u062b\u0627\u0646\u064a\u0629","%d \u062b\u0627\u0646\u064a\u0629"],m:["\u0623\u0642\u0644 \u0645\u0646 \u062f\u0642\u064a\u0642\u0629","\u062f\u0642\u064a\u0642\u0629 \u0648\u0627\u062d\u062f\u0629",["\u062f\u0642\u064a\u0642\u062a\u0627\u0646","\u062f\u0642\u064a\u0642\u062a\u064a\u0646"],"%d \u062f\u0642\u0627\u0626\u0642","%d \u062f\u0642\u064a\u0642\u0629","%d \u062f\u0642\u064a\u0642\u0629"],h:["\u0623\u0642\u0644 \u0645\u0646 \u0633\u0627\u0639\u0629","\u0633\u0627\u0639\u0629 \u0648\u0627\u062d\u062f\u0629",["\u0633\u0627\u0639\u062a\u0627\u0646","\u0633\u0627\u0639\u062a\u064a\u0646"],"%d \u0633\u0627\u0639\u0627\u062a","%d \u0633\u0627\u0639\u0629","%d \u0633\u0627\u0639\u0629"],d:["\u0623\u0642\u0644 \u0645\u0646 \u064a\u0648\u0645","\u064a\u0648\u0645 \u0648\u0627\u062d\u062f",["\u064a\u0648\u0645\u0627\u0646","\u064a\u0648\u0645\u064a\u0646"],"%d \u0623\u064a\u0627\u0645","%d \u064a\u0648\u0645\u064b\u0627","%d \u064a\u0648\u0645"],M:["\u0623\u0642\u0644 \u0645\u0646 \u0634\u0647\u0631","\u0634\u0647\u0631 \u0648\u0627\u062d\u062f",["\u0634\u0647\u0631\u0627\u0646","\u0634\u0647\u0631\u064a\u0646"],"%d \u0623\u0634\u0647\u0631","%d \u0634\u0647\u0631\u0627","%d \u0634\u0647\u0631"],y:["\u0623\u0642\u0644 \u0645\u0646 \u0639\u0627\u0645","\u0639\u0627\u0645 \u0648\u0627\u062d\u062f",["\u0639\u0627\u0645\u0627\u0646","\u0639\u0627\u0645\u064a\u0646"],"%d \u0623\u0639\u0648\u0627\u0645","%d \u0639\u0627\u0645\u064b\u0627","%d \u0639\u0627\u0645"]},ss=["\u062c\u0627\u0646\u0641\u064a","\u0641\u064a\u0641\u0631\u064a","\u0645\u0627\u0631\u0633","\u0623\u0641\u0631\u064a\u0644","\u0645\u0627\u064a","\u062c\u0648\u0627\u0646","\u062c\u0648\u064a\u0644\u064a\u0629","\u0623\u0648\u062a","\u0633\u0628\u062a\u0645\u0628\u0631","\u0623\u0643\u062a\u0648\u0628\u0631","\u0646\u0648\u0641\u0645\u0628\u0631","\u062f\u064a\u0633\u0645\u0628\u0631"];M.defineLocale("ar-dz",{months:ss,monthsShort:ss,weekdays:"\u0627\u0644\u0623\u062d\u062f_\u0627\u0644\u0625\u062b\u0646\u064a\u0646_\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621_\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621_\u0627\u0644\u062e\u0645\u064a\u0633_\u0627\u0644\u062c\u0645\u0639\u0629_\u0627\u0644\u0633\u0628\u062a".split("_"),weekdaysShort:"\u0623\u062d\u062f_\u0625\u062b\u0646\u064a\u0646_\u062b\u0644\u0627\u062b\u0627\u0621_\u0623\u0631\u0628\u0639\u0627\u0621_\u062e\u0645\u064a\u0633_\u062c\u0645\u0639\u0629_\u0633\u0628\u062a".split("_"),weekdaysMin:"\u062d_\u0646_\u062b_\u0631_\u062e_\u062c_\u0633".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"D/\u200fM/\u200fYYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},meridiemParse:/\u0635|\u0645/,isPM:function(e){return"\u0645"===e},meridiem:function(e,a,t){return e<12?"\u0635":"\u0645"},calendar:{sameDay:"[\u0627\u0644\u064a\u0648\u0645 \u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextDay:"[\u063a\u062f\u064b\u0627 \u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextWeek:"dddd [\u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastDay:"[\u0623\u0645\u0633 \u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastWeek:"dddd [\u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",sameElse:"L"},relativeTime:{future:"\u0628\u0639\u062f %s",past:"\u0645\u0646\u0630 %s",s:as("s"),ss:as("s"),m:as("m"),mm:as("m"),h:as("h"),hh:as("h"),d:as("d"),dd:as("d"),M:as("M"),MM:as("M"),y:as("y"),yy:as("y")},postformat:function(e){return e.replace(/,/g,"\u060c")},week:{dow:0,doy:4}}),M.defineLocale("ar-kw",{months:"\u064a\u0646\u0627\u064a\u0631_\u0641\u0628\u0631\u0627\u064a\u0631_\u0645\u0627\u0631\u0633_\u0623\u0628\u0631\u064a\u0644_\u0645\u0627\u064a_\u064a\u0648\u0646\u064a\u0648_\u064a\u0648\u0644\u064a\u0648\u0632_\u063a\u0634\u062a_\u0634\u062a\u0646\u0628\u0631_\u0623\u0643\u062a\u0648\u0628\u0631_\u0646\u0648\u0646\u0628\u0631_\u062f\u062c\u0646\u0628\u0631".split("_"),monthsShort:"\u064a\u0646\u0627\u064a\u0631_\u0641\u0628\u0631\u0627\u064a\u0631_\u0645\u0627\u0631\u0633_\u0623\u0628\u0631\u064a\u0644_\u0645\u0627\u064a_\u064a\u0648\u0646\u064a\u0648_\u064a\u0648\u0644\u064a\u0648\u0632_\u063a\u0634\u062a_\u0634\u062a\u0646\u0628\u0631_\u0623\u0643\u062a\u0648\u0628\u0631_\u0646\u0648\u0646\u0628\u0631_\u062f\u062c\u0646\u0628\u0631".split("_"),weekdays:"\u0627\u0644\u0623\u062d\u062f_\u0627\u0644\u0625\u062a\u0646\u064a\u0646_\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621_\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621_\u0627\u0644\u062e\u0645\u064a\u0633_\u0627\u0644\u062c\u0645\u0639\u0629_\u0627\u0644\u0633\u0628\u062a".split("_"),weekdaysShort:"\u0627\u062d\u062f_\u0627\u062a\u0646\u064a\u0646_\u062b\u0644\u0627\u062b\u0627\u0621_\u0627\u0631\u0628\u0639\u0627\u0621_\u062e\u0645\u064a\u0633_\u062c\u0645\u0639\u0629_\u0633\u0628\u062a".split("_"),weekdaysMin:"\u062d_\u0646_\u062b_\u0631_\u062e_\u062c_\u0633".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[\u0627\u0644\u064a\u0648\u0645 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextDay:"[\u063a\u062f\u0627 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextWeek:"dddd [\u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastDay:"[\u0623\u0645\u0633 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastWeek:"dddd [\u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",sameElse:"L"},relativeTime:{future:"\u0641\u064a %s",past:"\u0645\u0646\u0630 %s",s:"\u062b\u0648\u0627\u0646",ss:"%d \u062b\u0627\u0646\u064a\u0629",m:"\u062f\u0642\u064a\u0642\u0629",mm:"%d \u062f\u0642\u0627\u0626\u0642",h:"\u0633\u0627\u0639\u0629",hh:"%d \u0633\u0627\u0639\u0627\u062a",d:"\u064a\u0648\u0645",dd:"%d \u0623\u064a\u0627\u0645",M:"\u0634\u0647\u0631",MM:"%d \u0623\u0634\u0647\u0631",y:"\u0633\u0646\u0629",yy:"%d \u0633\u0646\u0648\u0627\u062a"},week:{dow:0,doy:12}});function ns(e){return 0===e?0:1===e?1:2===e?2:3<=e%100&&e%100<=10?3:11<=e%100?4:5}function rs(d){return function(e,a,t,s){var n=ns(e),r=_s[d][ns(e)];return 2===n&&(r=r[a?0:1]),r.replace(/%d/i,e)}}var ds={1:"1",2:"2",3:"3",4:"4",5:"5",6:"6",7:"7",8:"8",9:"9",0:"0"},_s={s:["\u0623\u0642\u0644 \u0645\u0646 \u062b\u0627\u0646\u064a\u0629","\u062b\u0627\u0646\u064a\u0629 \u0648\u0627\u062d\u062f\u0629",["\u062b\u0627\u0646\u064a\u062a\u0627\u0646","\u062b\u0627\u0646\u064a\u062a\u064a\u0646"],"%d \u062b\u0648\u0627\u0646","%d \u062b\u0627\u0646\u064a\u0629","%d \u062b\u0627\u0646\u064a\u0629"],m:["\u0623\u0642\u0644 \u0645\u0646 \u062f\u0642\u064a\u0642\u0629","\u062f\u0642\u064a\u0642\u0629 \u0648\u0627\u062d\u062f\u0629",["\u062f\u0642\u064a\u0642\u062a\u0627\u0646","\u062f\u0642\u064a\u0642\u062a\u064a\u0646"],"%d \u062f\u0642\u0627\u0626\u0642","%d \u062f\u0642\u064a\u0642\u0629","%d \u062f\u0642\u064a\u0642\u0629"],h:["\u0623\u0642\u0644 \u0645\u0646 \u0633\u0627\u0639\u0629","\u0633\u0627\u0639\u0629 \u0648\u0627\u062d\u062f\u0629",["\u0633\u0627\u0639\u062a\u0627\u0646","\u0633\u0627\u0639\u062a\u064a\u0646"],"%d \u0633\u0627\u0639\u0627\u062a","%d \u0633\u0627\u0639\u0629","%d \u0633\u0627\u0639\u0629"],d:["\u0623\u0642\u0644 \u0645\u0646 \u064a\u0648\u0645","\u064a\u0648\u0645 \u0648\u0627\u062d\u062f",["\u064a\u0648\u0645\u0627\u0646","\u064a\u0648\u0645\u064a\u0646"],"%d \u0623\u064a\u0627\u0645","%d \u064a\u0648\u0645\u064b\u0627","%d \u064a\u0648\u0645"],M:["\u0623\u0642\u0644 \u0645\u0646 \u0634\u0647\u0631","\u0634\u0647\u0631 \u0648\u0627\u062d\u062f",["\u0634\u0647\u0631\u0627\u0646","\u0634\u0647\u0631\u064a\u0646"],"%d \u0623\u0634\u0647\u0631","%d \u0634\u0647\u0631\u0627","%d \u0634\u0647\u0631"],y:["\u0623\u0642\u0644 \u0645\u0646 \u0639\u0627\u0645","\u0639\u0627\u0645 \u0648\u0627\u062d\u062f",["\u0639\u0627\u0645\u0627\u0646","\u0639\u0627\u0645\u064a\u0646"],"%d \u0623\u0639\u0648\u0627\u0645","%d \u0639\u0627\u0645\u064b\u0627","%d \u0639\u0627\u0645"]},is=["\u064a\u0646\u0627\u064a\u0631","\u0641\u0628\u0631\u0627\u064a\u0631","\u0645\u0627\u0631\u0633","\u0623\u0628\u0631\u064a\u0644","\u0645\u0627\u064a\u0648","\u064a\u0648\u0646\u064a\u0648","\u064a\u0648\u0644\u064a\u0648","\u0623\u063a\u0633\u0637\u0633","\u0633\u0628\u062a\u0645\u0628\u0631","\u0623\u0643\u062a\u0648\u0628\u0631","\u0646\u0648\u0641\u0645\u0628\u0631","\u062f\u064a\u0633\u0645\u0628\u0631"];M.defineLocale("ar-ly",{months:is,monthsShort:is,weekdays:"\u0627\u0644\u0623\u062d\u062f_\u0627\u0644\u0625\u062b\u0646\u064a\u0646_\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621_\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621_\u0627\u0644\u062e\u0645\u064a\u0633_\u0627\u0644\u062c\u0645\u0639\u0629_\u0627\u0644\u0633\u0628\u062a".split("_"),weekdaysShort:"\u0623\u062d\u062f_\u0625\u062b\u0646\u064a\u0646_\u062b\u0644\u0627\u062b\u0627\u0621_\u0623\u0631\u0628\u0639\u0627\u0621_\u062e\u0645\u064a\u0633_\u062c\u0645\u0639\u0629_\u0633\u0628\u062a".split("_"),weekdaysMin:"\u062d_\u0646_\u062b_\u0631_\u062e_\u062c_\u0633".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"D/\u200fM/\u200fYYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},meridiemParse:/\u0635|\u0645/,isPM:function(e){return"\u0645"===e},meridiem:function(e,a,t){return e<12?"\u0635":"\u0645"},calendar:{sameDay:"[\u0627\u0644\u064a\u0648\u0645 \u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextDay:"[\u063a\u062f\u064b\u0627 \u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextWeek:"dddd [\u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastDay:"[\u0623\u0645\u0633 \u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastWeek:"dddd [\u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",sameElse:"L"},relativeTime:{future:"\u0628\u0639\u062f %s",past:"\u0645\u0646\u0630 %s",s:rs("s"),ss:rs("s"),m:rs("m"),mm:rs("m"),h:rs("h"),hh:rs("h"),d:rs("d"),dd:rs("d"),M:rs("M"),MM:rs("M"),y:rs("y"),yy:rs("y")},preparse:function(e){return e.replace(/\u060c/g,",")},postformat:function(e){return e.replace(/\d/g,function(e){return ds[e]}).replace(/,/g,"\u060c")},week:{dow:6,doy:12}}),M.defineLocale("ar-ma",{months:"\u064a\u0646\u0627\u064a\u0631_\u0641\u0628\u0631\u0627\u064a\u0631_\u0645\u0627\u0631\u0633_\u0623\u0628\u0631\u064a\u0644_\u0645\u0627\u064a_\u064a\u0648\u0646\u064a\u0648_\u064a\u0648\u0644\u064a\u0648\u0632_\u063a\u0634\u062a_\u0634\u062a\u0646\u0628\u0631_\u0623\u0643\u062a\u0648\u0628\u0631_\u0646\u0648\u0646\u0628\u0631_\u062f\u062c\u0646\u0628\u0631".split("_"),monthsShort:"\u064a\u0646\u0627\u064a\u0631_\u0641\u0628\u0631\u0627\u064a\u0631_\u0645\u0627\u0631\u0633_\u0623\u0628\u0631\u064a\u0644_\u0645\u0627\u064a_\u064a\u0648\u0646\u064a\u0648_\u064a\u0648\u0644\u064a\u0648\u0632_\u063a\u0634\u062a_\u0634\u062a\u0646\u0628\u0631_\u0623\u0643\u062a\u0648\u0628\u0631_\u0646\u0648\u0646\u0628\u0631_\u062f\u062c\u0646\u0628\u0631".split("_"),weekdays:"\u0627\u0644\u0623\u062d\u062f_\u0627\u0644\u0625\u062b\u0646\u064a\u0646_\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621_\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621_\u0627\u0644\u062e\u0645\u064a\u0633_\u0627\u0644\u062c\u0645\u0639\u0629_\u0627\u0644\u0633\u0628\u062a".split("_"),weekdaysShort:"\u0627\u062d\u062f_\u0627\u062b\u0646\u064a\u0646_\u062b\u0644\u0627\u062b\u0627\u0621_\u0627\u0631\u0628\u0639\u0627\u0621_\u062e\u0645\u064a\u0633_\u062c\u0645\u0639\u0629_\u0633\u0628\u062a".split("_"),weekdaysMin:"\u062d_\u0646_\u062b_\u0631_\u062e_\u062c_\u0633".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[\u0627\u0644\u064a\u0648\u0645 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextDay:"[\u063a\u062f\u0627 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextWeek:"dddd [\u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastDay:"[\u0623\u0645\u0633 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastWeek:"dddd [\u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",sameElse:"L"},relativeTime:{future:"\u0641\u064a %s",past:"\u0645\u0646\u0630 %s",s:"\u062b\u0648\u0627\u0646",ss:"%d \u062b\u0627\u0646\u064a\u0629",m:"\u062f\u0642\u064a\u0642\u0629",mm:"%d \u062f\u0642\u0627\u0626\u0642",h:"\u0633\u0627\u0639\u0629",hh:"%d \u0633\u0627\u0639\u0627\u062a",d:"\u064a\u0648\u0645",dd:"%d \u0623\u064a\u0627\u0645",M:"\u0634\u0647\u0631",MM:"%d \u0623\u0634\u0647\u0631",y:"\u0633\u0646\u0629",yy:"%d \u0633\u0646\u0648\u0627\u062a"},week:{dow:1,doy:4}});var os={1:"\u0661",2:"\u0662",3:"\u0663",4:"\u0664",5:"\u0665",6:"\u0666",7:"\u0667",8:"\u0668",9:"\u0669",0:"\u0660"},ms={"\u0661":"1","\u0662":"2","\u0663":"3","\u0664":"4","\u0665":"5","\u0666":"6","\u0667":"7","\u0668":"8","\u0669":"9","\u0660":"0"};M.defineLocale("ar-sa",{months:"\u064a\u0646\u0627\u064a\u0631_\u0641\u0628\u0631\u0627\u064a\u0631_\u0645\u0627\u0631\u0633_\u0623\u0628\u0631\u064a\u0644_\u0645\u0627\u064a\u0648_\u064a\u0648\u0646\u064a\u0648_\u064a\u0648\u0644\u064a\u0648_\u0623\u063a\u0633\u0637\u0633_\u0633\u0628\u062a\u0645\u0628\u0631_\u0623\u0643\u062a\u0648\u0628\u0631_\u0646\u0648\u0641\u0645\u0628\u0631_\u062f\u064a\u0633\u0645\u0628\u0631".split("_"),monthsShort:"\u064a\u0646\u0627\u064a\u0631_\u0641\u0628\u0631\u0627\u064a\u0631_\u0645\u0627\u0631\u0633_\u0623\u0628\u0631\u064a\u0644_\u0645\u0627\u064a\u0648_\u064a\u0648\u0646\u064a\u0648_\u064a\u0648\u0644\u064a\u0648_\u0623\u063a\u0633\u0637\u0633_\u0633\u0628\u062a\u0645\u0628\u0631_\u0623\u0643\u062a\u0648\u0628\u0631_\u0646\u0648\u0641\u0645\u0628\u0631_\u062f\u064a\u0633\u0645\u0628\u0631".split("_"),weekdays:"\u0627\u0644\u0623\u062d\u062f_\u0627\u0644\u0625\u062b\u0646\u064a\u0646_\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621_\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621_\u0627\u0644\u062e\u0645\u064a\u0633_\u0627\u0644\u062c\u0645\u0639\u0629_\u0627\u0644\u0633\u0628\u062a".split("_"),weekdaysShort:"\u0623\u062d\u062f_\u0625\u062b\u0646\u064a\u0646_\u062b\u0644\u0627\u062b\u0627\u0621_\u0623\u0631\u0628\u0639\u0627\u0621_\u062e\u0645\u064a\u0633_\u062c\u0645\u0639\u0629_\u0633\u0628\u062a".split("_"),weekdaysMin:"\u062d_\u0646_\u062b_\u0631_\u062e_\u062c_\u0633".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},meridiemParse:/\u0635|\u0645/,isPM:function(e){return"\u0645"===e},meridiem:function(e,a,t){return e<12?"\u0635":"\u0645"},calendar:{sameDay:"[\u0627\u0644\u064a\u0648\u0645 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextDay:"[\u063a\u062f\u0627 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextWeek:"dddd [\u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastDay:"[\u0623\u0645\u0633 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastWeek:"dddd [\u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",sameElse:"L"},relativeTime:{future:"\u0641\u064a %s",past:"\u0645\u0646\u0630 %s",s:"\u062b\u0648\u0627\u0646",ss:"%d \u062b\u0627\u0646\u064a\u0629",m:"\u062f\u0642\u064a\u0642\u0629",mm:"%d \u062f\u0642\u0627\u0626\u0642",h:"\u0633\u0627\u0639\u0629",hh:"%d \u0633\u0627\u0639\u0627\u062a",d:"\u064a\u0648\u0645",dd:"%d \u0623\u064a\u0627\u0645",M:"\u0634\u0647\u0631",MM:"%d \u0623\u0634\u0647\u0631",y:"\u0633\u0646\u0629",yy:"%d \u0633\u0646\u0648\u0627\u062a"},preparse:function(e){return e.replace(/[\u0661\u0662\u0663\u0664\u0665\u0666\u0667\u0668\u0669\u0660]/g,function(e){return ms[e]}).replace(/\u060c/g,",")},postformat:function(e){return e.replace(/\d/g,function(e){return os[e]}).replace(/,/g,"\u060c")},week:{dow:0,doy:6}}),M.defineLocale("ar-tn",{months:"\u062c\u0627\u0646\u0641\u064a_\u0641\u064a\u0641\u0631\u064a_\u0645\u0627\u0631\u0633_\u0623\u0641\u0631\u064a\u0644_\u0645\u0627\u064a_\u062c\u0648\u0627\u0646_\u062c\u0648\u064a\u0644\u064a\u0629_\u0623\u0648\u062a_\u0633\u0628\u062a\u0645\u0628\u0631_\u0623\u0643\u062a\u0648\u0628\u0631_\u0646\u0648\u0641\u0645\u0628\u0631_\u062f\u064a\u0633\u0645\u0628\u0631".split("_"),monthsShort:"\u062c\u0627\u0646\u0641\u064a_\u0641\u064a\u0641\u0631\u064a_\u0645\u0627\u0631\u0633_\u0623\u0641\u0631\u064a\u0644_\u0645\u0627\u064a_\u062c\u0648\u0627\u0646_\u062c\u0648\u064a\u0644\u064a\u0629_\u0623\u0648\u062a_\u0633\u0628\u062a\u0645\u0628\u0631_\u0623\u0643\u062a\u0648\u0628\u0631_\u0646\u0648\u0641\u0645\u0628\u0631_\u062f\u064a\u0633\u0645\u0628\u0631".split("_"),weekdays:"\u0627\u0644\u0623\u062d\u062f_\u0627\u0644\u0625\u062b\u0646\u064a\u0646_\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621_\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621_\u0627\u0644\u062e\u0645\u064a\u0633_\u0627\u0644\u062c\u0645\u0639\u0629_\u0627\u0644\u0633\u0628\u062a".split("_"),weekdaysShort:"\u0623\u062d\u062f_\u0625\u062b\u0646\u064a\u0646_\u062b\u0644\u0627\u062b\u0627\u0621_\u0623\u0631\u0628\u0639\u0627\u0621_\u062e\u0645\u064a\u0633_\u062c\u0645\u0639\u0629_\u0633\u0628\u062a".split("_"),weekdaysMin:"\u062d_\u0646_\u062b_\u0631_\u062e_\u062c_\u0633".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[\u0627\u0644\u064a\u0648\u0645 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextDay:"[\u063a\u062f\u0627 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextWeek:"dddd [\u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastDay:"[\u0623\u0645\u0633 \u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastWeek:"dddd [\u0639\u0644\u0649 \u0627\u0644\u0633\u0627\u0639\u0629] LT",sameElse:"L"},relativeTime:{future:"\u0641\u064a %s",past:"\u0645\u0646\u0630 %s",s:"\u062b\u0648\u0627\u0646",ss:"%d \u062b\u0627\u0646\u064a\u0629",m:"\u062f\u0642\u064a\u0642\u0629",mm:"%d \u062f\u0642\u0627\u0626\u0642",h:"\u0633\u0627\u0639\u0629",hh:"%d \u0633\u0627\u0639\u0627\u062a",d:"\u064a\u0648\u0645",dd:"%d \u0623\u064a\u0627\u0645",M:"\u0634\u0647\u0631",MM:"%d \u0623\u0634\u0647\u0631",y:"\u0633\u0646\u0629",yy:"%d \u0633\u0646\u0648\u0627\u062a"},week:{dow:1,doy:4}});function us(e){return 0===e?0:1===e?1:2===e?2:3<=e%100&&e%100<=10?3:11<=e%100?4:5}function ls(d){return function(e,a,t,s){var n=us(e),r=cs[d][us(e)];return 2===n&&(r=r[a?0:1]),r.replace(/%d/i,e)}}var Ms={1:"\u0661",2:"\u0662",3:"\u0663",4:"\u0664",5:"\u0665",6:"\u0666",7:"\u0667",8:"\u0668",9:"\u0669",0:"\u0660"},hs={"\u0661":"1","\u0662":"2","\u0663":"3","\u0664":"4","\u0665":"5","\u0666":"6","\u0667":"7","\u0668":"8","\u0669":"9","\u0660":"0"},cs={s:["\u0623\u0642\u0644 \u0645\u0646 \u062b\u0627\u0646\u064a\u0629","\u062b\u0627\u0646\u064a\u0629 \u0648\u0627\u062d\u062f\u0629",["\u062b\u0627\u0646\u064a\u062a\u0627\u0646","\u062b\u0627\u0646\u064a\u062a\u064a\u0646"],"%d \u062b\u0648\u0627\u0646","%d \u062b\u0627\u0646\u064a\u0629","%d \u062b\u0627\u0646\u064a\u0629"],m:["\u0623\u0642\u0644 \u0645\u0646 \u062f\u0642\u064a\u0642\u0629","\u062f\u0642\u064a\u0642\u0629 \u0648\u0627\u062d\u062f\u0629",["\u062f\u0642\u064a\u0642\u062a\u0627\u0646","\u062f\u0642\u064a\u0642\u062a\u064a\u0646"],"%d \u062f\u0642\u0627\u0626\u0642","%d \u062f\u0642\u064a\u0642\u0629","%d \u062f\u0642\u064a\u0642\u0629"],h:["\u0623\u0642\u0644 \u0645\u0646 \u0633\u0627\u0639\u0629","\u0633\u0627\u0639\u0629 \u0648\u0627\u062d\u062f\u0629",["\u0633\u0627\u0639\u062a\u0627\u0646","\u0633\u0627\u0639\u062a\u064a\u0646"],"%d \u0633\u0627\u0639\u0627\u062a","%d \u0633\u0627\u0639\u0629","%d \u0633\u0627\u0639\u0629"],d:["\u0623\u0642\u0644 \u0645\u0646 \u064a\u0648\u0645","\u064a\u0648\u0645 \u0648\u0627\u062d\u062f",["\u064a\u0648\u0645\u0627\u0646","\u064a\u0648\u0645\u064a\u0646"],"%d \u0623\u064a\u0627\u0645","%d \u064a\u0648\u0645\u064b\u0627","%d \u064a\u0648\u0645"],M:["\u0623\u0642\u0644 \u0645\u0646 \u0634\u0647\u0631","\u0634\u0647\u0631 \u0648\u0627\u062d\u062f",["\u0634\u0647\u0631\u0627\u0646","\u0634\u0647\u0631\u064a\u0646"],"%d \u0623\u0634\u0647\u0631","%d \u0634\u0647\u0631\u0627","%d \u0634\u0647\u0631"],y:["\u0623\u0642\u0644 \u0645\u0646 \u0639\u0627\u0645","\u0639\u0627\u0645 \u0648\u0627\u062d\u062f",["\u0639\u0627\u0645\u0627\u0646","\u0639\u0627\u0645\u064a\u0646"],"%d \u0623\u0639\u0648\u0627\u0645","%d \u0639\u0627\u0645\u064b\u0627","%d \u0639\u0627\u0645"]},Ls=["\u064a\u0646\u0627\u064a\u0631","\u0641\u0628\u0631\u0627\u064a\u0631","\u0645\u0627\u0631\u0633","\u0623\u0628\u0631\u064a\u0644","\u0645\u0627\u064a\u0648","\u064a\u0648\u0646\u064a\u0648","\u064a\u0648\u0644\u064a\u0648","\u0623\u063a\u0633\u0637\u0633","\u0633\u0628\u062a\u0645\u0628\u0631","\u0623\u0643\u062a\u0648\u0628\u0631","\u0646\u0648\u0641\u0645\u0628\u0631","\u062f\u064a\u0633\u0645\u0628\u0631"];M.defineLocale("ar",{months:Ls,monthsShort:Ls,weekdays:"\u0627\u0644\u0623\u062d\u062f_\u0627\u0644\u0625\u062b\u0646\u064a\u0646_\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621_\u0627\u0644\u0623\u0631\u0628\u0639\u0627\u0621_\u0627\u0644\u062e\u0645\u064a\u0633_\u0627\u0644\u062c\u0645\u0639\u0629_\u0627\u0644\u0633\u0628\u062a".split("_"),weekdaysShort:"\u0623\u062d\u062f_\u0625\u062b\u0646\u064a\u0646_\u062b\u0644\u0627\u062b\u0627\u0621_\u0623\u0631\u0628\u0639\u0627\u0621_\u062e\u0645\u064a\u0633_\u062c\u0645\u0639\u0629_\u0633\u0628\u062a".split("_"),weekdaysMin:"\u062d_\u0646_\u062b_\u0631_\u062e_\u062c_\u0633".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"D/\u200fM/\u200fYYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},meridiemParse:/\u0635|\u0645/,isPM:function(e){return"\u0645"===e},meridiem:function(e,a,t){return e<12?"\u0635":"\u0645"},calendar:{sameDay:"[\u0627\u0644\u064a\u0648\u0645 \u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextDay:"[\u063a\u062f\u064b\u0627 \u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",nextWeek:"dddd [\u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastDay:"[\u0623\u0645\u0633 \u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",lastWeek:"dddd [\u0639\u0646\u062f \u0627\u0644\u0633\u0627\u0639\u0629] LT",sameElse:"L"},relativeTime:{future:"\u0628\u0639\u062f %s",past:"\u0645\u0646\u0630 %s",s:ls("s"),ss:ls("s"),m:ls("m"),mm:ls("m"),h:ls("h"),hh:ls("h"),d:ls("d"),dd:ls("d"),M:ls("M"),MM:ls("M"),y:ls("y"),yy:ls("y")},preparse:function(e){return e.replace(/[\u0661\u0662\u0663\u0664\u0665\u0666\u0667\u0668\u0669\u0660]/g,function(e){return hs[e]}).replace(/\u060c/g,",")},postformat:function(e){return e.replace(/\d/g,function(e){return Ms[e]}).replace(/,/g,"\u060c")},week:{dow:6,doy:12}});var Ys={1:"-inci",5:"-inci",8:"-inci",70:"-inci",80:"-inci",2:"-nci",7:"-nci",20:"-nci",50:"-nci",3:"-\xfcnc\xfc",4:"-\xfcnc\xfc",100:"-\xfcnc\xfc",6:"-nc\u0131",9:"-uncu",10:"-uncu",30:"-uncu",60:"-\u0131nc\u0131",90:"-\u0131nc\u0131"};function ys(e,a,t){var s,n;return"m"===t?a?"\u0445\u0432\u0456\u043b\u0456\u043d\u0430":"\u0445\u0432\u0456\u043b\u0456\u043d\u0443":"h"===t?a?"\u0433\u0430\u0434\u0437\u0456\u043d\u0430":"\u0433\u0430\u0434\u0437\u0456\u043d\u0443":e+" "+(s=+e,n={ss:a?"\u0441\u0435\u043a\u0443\u043d\u0434\u0430_\u0441\u0435\u043a\u0443\u043d\u0434\u044b_\u0441\u0435\u043a\u0443\u043d\u0434":"\u0441\u0435\u043a\u0443\u043d\u0434\u0443_\u0441\u0435\u043a\u0443\u043d\u0434\u044b_\u0441\u0435\u043a\u0443\u043d\u0434",mm:a?"\u0445\u0432\u0456\u043b\u0456\u043d\u0430_\u0445\u0432\u0456\u043b\u0456\u043d\u044b_\u0445\u0432\u0456\u043b\u0456\u043d":"\u0445\u0432\u0456\u043b\u0456\u043d\u0443_\u0445\u0432\u0456\u043b\u0456\u043d\u044b_\u0445\u0432\u0456\u043b\u0456\u043d",hh:a?"\u0433\u0430\u0434\u0437\u0456\u043d\u0430_\u0433\u0430\u0434\u0437\u0456\u043d\u044b_\u0433\u0430\u0434\u0437\u0456\u043d":"\u0433\u0430\u0434\u0437\u0456\u043d\u0443_\u0433\u0430\u0434\u0437\u0456\u043d\u044b_\u0433\u0430\u0434\u0437\u0456\u043d",dd:"\u0434\u0437\u0435\u043d\u044c_\u0434\u043d\u0456_\u0434\u0437\u0451\u043d",MM:"\u043c\u0435\u0441\u044f\u0446_\u043c\u0435\u0441\u044f\u0446\u044b_\u043c\u0435\u0441\u044f\u0446\u0430\u045e",yy:"\u0433\u043e\u0434_\u0433\u0430\u0434\u044b_\u0433\u0430\u0434\u043e\u045e"}[t].split("_"),s%10==1&&s%100!=11?n[0]:2<=s%10&&s%10<=4&&(s%100<10||20<=s%100)?n[1]:n[2])}M.defineLocale("az",{months:"yanvar_fevral_mart_aprel_may_iyun_iyul_avqust_sentyabr_oktyabr_noyabr_dekabr".split("_"),monthsShort:"yan_fev_mar_apr_may_iyn_iyl_avq_sen_okt_noy_dek".split("_"),weekdays:"Bazar_Bazar ert\u0259si_\xc7\u0259r\u015f\u0259nb\u0259 ax\u015fam\u0131_\xc7\u0259r\u015f\u0259nb\u0259_C\xfcm\u0259 ax\u015fam\u0131_C\xfcm\u0259_\u015e\u0259nb\u0259".split("_"),weekdaysShort:"Baz_BzE_\xc7Ax_\xc7\u0259r_CAx_C\xfcm_\u015e\u0259n".split("_"),weekdaysMin:"Bz_BE_\xc7A_\xc7\u0259_CA_C\xfc_\u015e\u0259".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[bug\xfcn saat] LT",nextDay:"[sabah saat] LT",nextWeek:"[g\u0259l\u0259n h\u0259ft\u0259] dddd [saat] LT",lastDay:"[d\xfcn\u0259n] LT",lastWeek:"[ke\xe7\u0259n h\u0259ft\u0259] dddd [saat] LT",sameElse:"L"},relativeTime:{future:"%s sonra",past:"%s \u0259vv\u0259l",s:"bir ne\xe7\u0259 saniy\u0259",ss:"%d saniy\u0259",m:"bir d\u0259qiq\u0259",mm:"%d d\u0259qiq\u0259",h:"bir saat",hh:"%d saat",d:"bir g\xfcn",dd:"%d g\xfcn",M:"bir ay",MM:"%d ay",y:"bir il",yy:"%d il"},meridiemParse:/gec\u0259|s\u0259h\u0259r|g\xfcnd\xfcz|ax\u015fam/,isPM:function(e){return/^(g\xfcnd\xfcz|ax\u015fam)$/.test(e)},meridiem:function(e,a,t){return e<4?"gec\u0259":e<12?"s\u0259h\u0259r":e<17?"g\xfcnd\xfcz":"ax\u015fam"},dayOfMonthOrdinalParse:/\d{1,2}-(\u0131nc\u0131|inci|nci|\xfcnc\xfc|nc\u0131|uncu)/,ordinal:function(e){if(0===e)return e+"-\u0131nc\u0131";var a=e%10;return e+(Ys[a]||Ys[e%100-a]||Ys[100<=e?100:null])},week:{dow:1,doy:7}}),M.defineLocale("be",{months:{format:"\u0441\u0442\u0443\u0434\u0437\u0435\u043d\u044f_\u043b\u044e\u0442\u0430\u0433\u0430_\u0441\u0430\u043a\u0430\u0432\u0456\u043a\u0430_\u043a\u0440\u0430\u0441\u0430\u0432\u0456\u043a\u0430_\u0442\u0440\u0430\u045e\u043d\u044f_\u0447\u044d\u0440\u0432\u0435\u043d\u044f_\u043b\u0456\u043f\u0435\u043d\u044f_\u0436\u043d\u0456\u045e\u043d\u044f_\u0432\u0435\u0440\u0430\u0441\u043d\u044f_\u043a\u0430\u0441\u0442\u0440\u044b\u0447\u043d\u0456\u043a\u0430_\u043b\u0456\u0441\u0442\u0430\u043f\u0430\u0434\u0430_\u0441\u043d\u0435\u0436\u043d\u044f".split("_"),standalone:"\u0441\u0442\u0443\u0434\u0437\u0435\u043d\u044c_\u043b\u044e\u0442\u044b_\u0441\u0430\u043a\u0430\u0432\u0456\u043a_\u043a\u0440\u0430\u0441\u0430\u0432\u0456\u043a_\u0442\u0440\u0430\u0432\u0435\u043d\u044c_\u0447\u044d\u0440\u0432\u0435\u043d\u044c_\u043b\u0456\u043f\u0435\u043d\u044c_\u0436\u043d\u0456\u0432\u0435\u043d\u044c_\u0432\u0435\u0440\u0430\u0441\u0435\u043d\u044c_\u043a\u0430\u0441\u0442\u0440\u044b\u0447\u043d\u0456\u043a_\u043b\u0456\u0441\u0442\u0430\u043f\u0430\u0434_\u0441\u043d\u0435\u0436\u0430\u043d\u044c".split("_")},monthsShort:"\u0441\u0442\u0443\u0434_\u043b\u044e\u0442_\u0441\u0430\u043a_\u043a\u0440\u0430\u0441_\u0442\u0440\u0430\u0432_\u0447\u044d\u0440\u0432_\u043b\u0456\u043f_\u0436\u043d\u0456\u0432_\u0432\u0435\u0440_\u043a\u0430\u0441\u0442_\u043b\u0456\u0441\u0442_\u0441\u043d\u0435\u0436".split("_"),weekdays:{format:"\u043d\u044f\u0434\u0437\u0435\u043b\u044e_\u043f\u0430\u043d\u044f\u0434\u0437\u0435\u043b\u0430\u043a_\u0430\u045e\u0442\u043e\u0440\u0430\u043a_\u0441\u0435\u0440\u0430\u0434\u0443_\u0447\u0430\u0446\u0432\u0435\u0440_\u043f\u044f\u0442\u043d\u0456\u0446\u0443_\u0441\u0443\u0431\u043e\u0442\u0443".split("_"),standalone:"\u043d\u044f\u0434\u0437\u0435\u043b\u044f_\u043f\u0430\u043d\u044f\u0434\u0437\u0435\u043b\u0430\u043a_\u0430\u045e\u0442\u043e\u0440\u0430\u043a_\u0441\u0435\u0440\u0430\u0434\u0430_\u0447\u0430\u0446\u0432\u0435\u0440_\u043f\u044f\u0442\u043d\u0456\u0446\u0430_\u0441\u0443\u0431\u043e\u0442\u0430".split("_"),isFormat:/\[ ?[\u0423\u0443\u045e] ?(?:\u043c\u0456\u043d\u0443\u043b\u0443\u044e|\u043d\u0430\u0441\u0442\u0443\u043f\u043d\u0443\u044e)? ?\] ?dddd/},weekdaysShort:"\u043d\u0434_\u043f\u043d_\u0430\u0442_\u0441\u0440_\u0447\u0446_\u043f\u0442_\u0441\u0431".split("_"),weekdaysMin:"\u043d\u0434_\u043f\u043d_\u0430\u0442_\u0441\u0440_\u0447\u0446_\u043f\u0442_\u0441\u0431".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY \u0433.",LLL:"D MMMM YYYY \u0433., HH:mm",LLLL:"dddd, D MMMM YYYY \u0433., HH:mm"},calendar:{sameDay:"[\u0421\u0451\u043d\u043d\u044f \u045e] LT",nextDay:"[\u0417\u0430\u045e\u0442\u0440\u0430 \u045e] LT",lastDay:"[\u0423\u0447\u043e\u0440\u0430 \u045e] LT",nextWeek:function(){return"[\u0423] dddd [\u045e] LT"},lastWeek:function(){switch(this.day()){case 0:case 3:case 5:case 6:return"[\u0423 \u043c\u0456\u043d\u0443\u043b\u0443\u044e] dddd [\u045e] LT";case 1:case 2:case 4:return"[\u0423 \u043c\u0456\u043d\u0443\u043b\u044b] dddd [\u045e] LT"}},sameElse:"L"},relativeTime:{future:"\u043f\u0440\u0430\u0437 %s",past:"%s \u0442\u0430\u043c\u0443",s:"\u043d\u0435\u043a\u0430\u043b\u044c\u043a\u0456 \u0441\u0435\u043a\u0443\u043d\u0434",m:ys,mm:ys,h:ys,hh:ys,d:"\u0434\u0437\u0435\u043d\u044c",dd:ys,M:"\u043c\u0435\u0441\u044f\u0446",MM:ys,y:"\u0433\u043e\u0434",yy:ys},meridiemParse:/\u043d\u043e\u0447\u044b|\u0440\u0430\u043d\u0456\u0446\u044b|\u0434\u043d\u044f|\u0432\u0435\u0447\u0430\u0440\u0430/,isPM:function(e){return/^(\u0434\u043d\u044f|\u0432\u0435\u0447\u0430\u0440\u0430)$/.test(e)},meridiem:function(e,a,t){return e<4?"\u043d\u043e\u0447\u044b":e<12?"\u0440\u0430\u043d\u0456\u0446\u044b":e<17?"\u0434\u043d\u044f":"\u0432\u0435\u0447\u0430\u0440\u0430"},dayOfMonthOrdinalParse:/\d{1,2}-(\u0456|\u044b|\u0433\u0430)/,ordinal:function(e,a){switch(a){case"M":case"d":case"DDD":case"w":case"W":return e%10!=2&&e%10!=3||e%100==12||e%100==13?e+"-\u044b":e+"-\u0456";case"D":return e+"-\u0433\u0430";default:return e}},week:{dow:1,doy:7}}),M.defineLocale("bg",{months:"\u044f\u043d\u0443\u0430\u0440\u0438_\u0444\u0435\u0432\u0440\u0443\u0430\u0440\u0438_\u043c\u0430\u0440\u0442_\u0430\u043f\u0440\u0438\u043b_\u043c\u0430\u0439_\u044e\u043d\u0438_\u044e\u043b\u0438_\u0430\u0432\u0433\u0443\u0441\u0442_\u0441\u0435\u043f\u0442\u0435\u043c\u0432\u0440\u0438_\u043e\u043a\u0442\u043e\u043c\u0432\u0440\u0438_\u043d\u043e\u0435\u043c\u0432\u0440\u0438_\u0434\u0435\u043a\u0435\u043c\u0432\u0440\u0438".split("_"),monthsShort:"\u044f\u043d\u0443_\u0444\u0435\u0432_\u043c\u0430\u0440_\u0430\u043f\u0440_\u043c\u0430\u0439_\u044e\u043d\u0438_\u044e\u043b\u0438_\u0430\u0432\u0433_\u0441\u0435\u043f_\u043e\u043a\u0442_\u043d\u043e\u0435_\u0434\u0435\u043a".split("_"),weekdays:"\u043d\u0435\u0434\u0435\u043b\u044f_\u043f\u043e\u043d\u0435\u0434\u0435\u043b\u043d\u0438\u043a_\u0432\u0442\u043e\u0440\u043d\u0438\u043a_\u0441\u0440\u044f\u0434\u0430_\u0447\u0435\u0442\u0432\u044a\u0440\u0442\u044a\u043a_\u043f\u0435\u0442\u044a\u043a_\u0441\u044a\u0431\u043e\u0442\u0430".split("_"),weekdaysShort:"\u043d\u0435\u0434_\u043f\u043e\u043d_\u0432\u0442\u043e_\u0441\u0440\u044f_\u0447\u0435\u0442_\u043f\u0435\u0442_\u0441\u044a\u0431".split("_"),weekdaysMin:"\u043d\u0434_\u043f\u043d_\u0432\u0442_\u0441\u0440_\u0447\u0442_\u043f\u0442_\u0441\u0431".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"D.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY H:mm",LLLL:"dddd, D MMMM YYYY H:mm"},calendar:{sameDay:"[\u0414\u043d\u0435\u0441 \u0432] LT",nextDay:"[\u0423\u0442\u0440\u0435 \u0432] LT",nextWeek:"dddd [\u0432] LT",lastDay:"[\u0412\u0447\u0435\u0440\u0430 \u0432] LT",lastWeek:function(){switch(this.day()){case 0:case 3:case 6:return"[\u041c\u0438\u043d\u0430\u043b\u0430\u0442\u0430] dddd [\u0432] LT";case 1:case 2:case 4:case 5:return"[\u041c\u0438\u043d\u0430\u043b\u0438\u044f] dddd [\u0432] LT"}},sameElse:"L"},relativeTime:{future:"\u0441\u043b\u0435\u0434 %s",past:"\u043f\u0440\u0435\u0434\u0438 %s",s:"\u043d\u044f\u043a\u043e\u043b\u043a\u043e \u0441\u0435\u043a\u0443\u043d\u0434\u0438",ss:"%d \u0441\u0435\u043a\u0443\u043d\u0434\u0438",m:"\u043c\u0438\u043d\u0443\u0442\u0430",mm:"%d \u043c\u0438\u043d\u0443\u0442\u0438",h:"\u0447\u0430\u0441",hh:"%d \u0447\u0430\u0441\u0430",d:"\u0434\u0435\u043d",dd:"%d \u0434\u0435\u043d\u0430",w:"\u0441\u0435\u0434\u043c\u0438\u0446\u0430",ww:"%d \u0441\u0435\u0434\u043c\u0438\u0446\u0438",M:"\u043c\u0435\u0441\u0435\u0446",MM:"%d \u043c\u0435\u0441\u0435\u0446\u0430",y:"\u0433\u043e\u0434\u0438\u043d\u0430",yy:"%d \u0433\u043e\u0434\u0438\u043d\u0438"},dayOfMonthOrdinalParse:/\d{1,2}-(\u0435\u0432|\u0435\u043d|\u0442\u0438|\u0432\u0438|\u0440\u0438|\u043c\u0438)/,ordinal:function(e){var a=e%10,t=e%100;return 0===e?e+"-\u0435\u0432":0==t?e+"-\u0435\u043d":10<t&&t<20?e+"-\u0442\u0438":1==a?e+"-\u0432\u0438":2==a?e+"-\u0440\u0438":7==a||8==a?e+"-\u043c\u0438":e+"-\u0442\u0438"},week:{dow:1,doy:7}}),M.defineLocale("bm",{months:"Zanwuyekalo_Fewuruyekalo_Marisikalo_Awirilikalo_M\u025bkalo_Zuw\u025bnkalo_Zuluyekalo_Utikalo_S\u025btanburukalo_\u0254kut\u0254burukalo_Nowanburukalo_Desanburukalo".split("_"),monthsShort:"Zan_Few_Mar_Awi_M\u025b_Zuw_Zul_Uti_S\u025bt_\u0254ku_Now_Des".split("_"),weekdays:"Kari_Nt\u025bn\u025bn_Tarata_Araba_Alamisa_Juma_Sibiri".split("_"),weekdaysShort:"Kar_Nt\u025b_Tar_Ara_Ala_Jum_Sib".split("_"),weekdaysMin:"Ka_Nt_Ta_Ar_Al_Ju_Si".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"MMMM [tile] D [san] YYYY",LLL:"MMMM [tile] D [san] YYYY [l\u025br\u025b] HH:mm",LLLL:"dddd MMMM [tile] D [san] YYYY [l\u025br\u025b] HH:mm"},calendar:{sameDay:"[Bi l\u025br\u025b] LT",nextDay:"[Sini l\u025br\u025b] LT",nextWeek:"dddd [don l\u025br\u025b] LT",lastDay:"[Kunu l\u025br\u025b] LT",lastWeek:"dddd [t\u025bm\u025bnen l\u025br\u025b] LT",sameElse:"L"},relativeTime:{future:"%s k\u0254n\u0254",past:"a b\u025b %s b\u0254",s:"sanga dama dama",ss:"sekondi %d",m:"miniti kelen",mm:"miniti %d",h:"l\u025br\u025b kelen",hh:"l\u025br\u025b %d",d:"tile kelen",dd:"tile %d",M:"kalo kelen",MM:"kalo %d",y:"san kelen",yy:"san %d"},week:{dow:1,doy:4}});var fs={1:"\u09e7",2:"\u09e8",3:"\u09e9",4:"\u09ea",5:"\u09eb",6:"\u09ec",7:"\u09ed",8:"\u09ee",9:"\u09ef",0:"\u09e6"},ps={"\u09e7":"1","\u09e8":"2","\u09e9":"3","\u09ea":"4","\u09eb":"5","\u09ec":"6","\u09ed":"7","\u09ee":"8","\u09ef":"9","\u09e6":"0"};M.defineLocale("bn-bd",{months:"\u099c\u09be\u09a8\u09c1\u09df\u09be\u09b0\u09bf_\u09ab\u09c7\u09ac\u09cd\u09b0\u09c1\u09df\u09be\u09b0\u09bf_\u09ae\u09be\u09b0\u09cd\u099a_\u098f\u09aa\u09cd\u09b0\u09bf\u09b2_\u09ae\u09c7_\u099c\u09c1\u09a8_\u099c\u09c1\u09b2\u09be\u0987_\u0986\u0997\u09b8\u09cd\u099f_\u09b8\u09c7\u09aa\u09cd\u099f\u09c7\u09ae\u09cd\u09ac\u09b0_\u0985\u0995\u09cd\u099f\u09cb\u09ac\u09b0_\u09a8\u09ad\u09c7\u09ae\u09cd\u09ac\u09b0_\u09a1\u09bf\u09b8\u09c7\u09ae\u09cd\u09ac\u09b0".split("_"),monthsShort:"\u099c\u09be\u09a8\u09c1_\u09ab\u09c7\u09ac\u09cd\u09b0\u09c1_\u09ae\u09be\u09b0\u09cd\u099a_\u098f\u09aa\u09cd\u09b0\u09bf\u09b2_\u09ae\u09c7_\u099c\u09c1\u09a8_\u099c\u09c1\u09b2\u09be\u0987_\u0986\u0997\u09b8\u09cd\u099f_\u09b8\u09c7\u09aa\u09cd\u099f_\u0985\u0995\u09cd\u099f\u09cb_\u09a8\u09ad\u09c7_\u09a1\u09bf\u09b8\u09c7".split("_"),weekdays:"\u09b0\u09ac\u09bf\u09ac\u09be\u09b0_\u09b8\u09cb\u09ae\u09ac\u09be\u09b0_\u09ae\u0999\u09cd\u0997\u09b2\u09ac\u09be\u09b0_\u09ac\u09c1\u09a7\u09ac\u09be\u09b0_\u09ac\u09c3\u09b9\u09b8\u09cd\u09aa\u09a4\u09bf\u09ac\u09be\u09b0_\u09b6\u09c1\u0995\u09cd\u09b0\u09ac\u09be\u09b0_\u09b6\u09a8\u09bf\u09ac\u09be\u09b0".split("_"),weekdaysShort:"\u09b0\u09ac\u09bf_\u09b8\u09cb\u09ae_\u09ae\u0999\u09cd\u0997\u09b2_\u09ac\u09c1\u09a7_\u09ac\u09c3\u09b9\u09b8\u09cd\u09aa\u09a4\u09bf_\u09b6\u09c1\u0995\u09cd\u09b0_\u09b6\u09a8\u09bf".split("_"),weekdaysMin:"\u09b0\u09ac\u09bf_\u09b8\u09cb\u09ae_\u09ae\u0999\u09cd\u0997\u09b2_\u09ac\u09c1\u09a7_\u09ac\u09c3\u09b9_\u09b6\u09c1\u0995\u09cd\u09b0_\u09b6\u09a8\u09bf".split("_"),longDateFormat:{LT:"A h:mm \u09b8\u09ae\u09df",LTS:"A h:mm:ss \u09b8\u09ae\u09df",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm \u09b8\u09ae\u09df",LLLL:"dddd, D MMMM YYYY, A h:mm \u09b8\u09ae\u09df"},calendar:{sameDay:"[\u0986\u099c] LT",nextDay:"[\u0986\u0997\u09be\u09ae\u09c0\u0995\u09be\u09b2] LT",nextWeek:"dddd, LT",lastDay:"[\u0997\u09a4\u0995\u09be\u09b2] LT",lastWeek:"[\u0997\u09a4] dddd, LT",sameElse:"L"},relativeTime:{future:"%s \u09aa\u09b0\u09c7",past:"%s \u0986\u0997\u09c7",s:"\u0995\u09df\u09c7\u0995 \u09b8\u09c7\u0995\u09c7\u09a8\u09cd\u09a1",ss:"%d \u09b8\u09c7\u0995\u09c7\u09a8\u09cd\u09a1",m:"\u098f\u0995 \u09ae\u09bf\u09a8\u09bf\u099f",mm:"%d \u09ae\u09bf\u09a8\u09bf\u099f",h:"\u098f\u0995 \u0998\u09a8\u09cd\u099f\u09be",hh:"%d \u0998\u09a8\u09cd\u099f\u09be",d:"\u098f\u0995 \u09a6\u09bf\u09a8",dd:"%d \u09a6\u09bf\u09a8",M:"\u098f\u0995 \u09ae\u09be\u09b8",MM:"%d \u09ae\u09be\u09b8",y:"\u098f\u0995 \u09ac\u099b\u09b0",yy:"%d \u09ac\u099b\u09b0"},preparse:function(e){return e.replace(/[\u09e7\u09e8\u09e9\u09ea\u09eb\u09ec\u09ed\u09ee\u09ef\u09e6]/g,function(e){return ps[e]})},postformat:function(e){return e.replace(/\d/g,function(e){return fs[e]})},meridiemParse:/\u09b0\u09be\u09a4|\u09ad\u09cb\u09b0|\u09b8\u0995\u09be\u09b2|\u09a6\u09c1\u09aa\u09c1\u09b0|\u09ac\u09bf\u0995\u09be\u09b2|\u09b8\u09a8\u09cd\u09a7\u09cd\u09af\u09be|\u09b0\u09be\u09a4/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u09b0\u09be\u09a4"===a?e<4?e:e+12:"\u09ad\u09cb\u09b0"===a||"\u09b8\u0995\u09be\u09b2"===a?e:"\u09a6\u09c1\u09aa\u09c1\u09b0"===a?3<=e?e:e+12:"\u09ac\u09bf\u0995\u09be\u09b2"===a||"\u09b8\u09a8\u09cd\u09a7\u09cd\u09af\u09be"===a?e+12:void 0},meridiem:function(e,a,t){return e<4?"\u09b0\u09be\u09a4":e<6?"\u09ad\u09cb\u09b0":e<12?"\u09b8\u0995\u09be\u09b2":e<15?"\u09a6\u09c1\u09aa\u09c1\u09b0":e<18?"\u09ac\u09bf\u0995\u09be\u09b2":e<20?"\u09b8\u09a8\u09cd\u09a7\u09cd\u09af\u09be":"\u09b0\u09be\u09a4"},week:{dow:0,doy:6}});var ks={1:"\u09e7",2:"\u09e8",3:"\u09e9",4:"\u09ea",5:"\u09eb",6:"\u09ec",7:"\u09ed",8:"\u09ee",9:"\u09ef",0:"\u09e6"},Ds={"\u09e7":"1","\u09e8":"2","\u09e9":"3","\u09ea":"4","\u09eb":"5","\u09ec":"6","\u09ed":"7","\u09ee":"8","\u09ef":"9","\u09e6":"0"};M.defineLocale("bn",{months:"\u099c\u09be\u09a8\u09c1\u09df\u09be\u09b0\u09bf_\u09ab\u09c7\u09ac\u09cd\u09b0\u09c1\u09df\u09be\u09b0\u09bf_\u09ae\u09be\u09b0\u09cd\u099a_\u098f\u09aa\u09cd\u09b0\u09bf\u09b2_\u09ae\u09c7_\u099c\u09c1\u09a8_\u099c\u09c1\u09b2\u09be\u0987_\u0986\u0997\u09b8\u09cd\u099f_\u09b8\u09c7\u09aa\u09cd\u099f\u09c7\u09ae\u09cd\u09ac\u09b0_\u0985\u0995\u09cd\u099f\u09cb\u09ac\u09b0_\u09a8\u09ad\u09c7\u09ae\u09cd\u09ac\u09b0_\u09a1\u09bf\u09b8\u09c7\u09ae\u09cd\u09ac\u09b0".split("_"),monthsShort:"\u099c\u09be\u09a8\u09c1_\u09ab\u09c7\u09ac\u09cd\u09b0\u09c1_\u09ae\u09be\u09b0\u09cd\u099a_\u098f\u09aa\u09cd\u09b0\u09bf\u09b2_\u09ae\u09c7_\u099c\u09c1\u09a8_\u099c\u09c1\u09b2\u09be\u0987_\u0986\u0997\u09b8\u09cd\u099f_\u09b8\u09c7\u09aa\u09cd\u099f_\u0985\u0995\u09cd\u099f\u09cb_\u09a8\u09ad\u09c7_\u09a1\u09bf\u09b8\u09c7".split("_"),weekdays:"\u09b0\u09ac\u09bf\u09ac\u09be\u09b0_\u09b8\u09cb\u09ae\u09ac\u09be\u09b0_\u09ae\u0999\u09cd\u0997\u09b2\u09ac\u09be\u09b0_\u09ac\u09c1\u09a7\u09ac\u09be\u09b0_\u09ac\u09c3\u09b9\u09b8\u09cd\u09aa\u09a4\u09bf\u09ac\u09be\u09b0_\u09b6\u09c1\u0995\u09cd\u09b0\u09ac\u09be\u09b0_\u09b6\u09a8\u09bf\u09ac\u09be\u09b0".split("_"),weekdaysShort:"\u09b0\u09ac\u09bf_\u09b8\u09cb\u09ae_\u09ae\u0999\u09cd\u0997\u09b2_\u09ac\u09c1\u09a7_\u09ac\u09c3\u09b9\u09b8\u09cd\u09aa\u09a4\u09bf_\u09b6\u09c1\u0995\u09cd\u09b0_\u09b6\u09a8\u09bf".split("_"),weekdaysMin:"\u09b0\u09ac\u09bf_\u09b8\u09cb\u09ae_\u09ae\u0999\u09cd\u0997\u09b2_\u09ac\u09c1\u09a7_\u09ac\u09c3\u09b9_\u09b6\u09c1\u0995\u09cd\u09b0_\u09b6\u09a8\u09bf".split("_"),longDateFormat:{LT:"A h:mm \u09b8\u09ae\u09df",LTS:"A h:mm:ss \u09b8\u09ae\u09df",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm \u09b8\u09ae\u09df",LLLL:"dddd, D MMMM YYYY, A h:mm \u09b8\u09ae\u09df"},calendar:{sameDay:"[\u0986\u099c] LT",nextDay:"[\u0986\u0997\u09be\u09ae\u09c0\u0995\u09be\u09b2] LT",nextWeek:"dddd, LT",lastDay:"[\u0997\u09a4\u0995\u09be\u09b2] LT",lastWeek:"[\u0997\u09a4] dddd, LT",sameElse:"L"},relativeTime:{future:"%s \u09aa\u09b0\u09c7",past:"%s \u0986\u0997\u09c7",s:"\u0995\u09df\u09c7\u0995 \u09b8\u09c7\u0995\u09c7\u09a8\u09cd\u09a1",ss:"%d \u09b8\u09c7\u0995\u09c7\u09a8\u09cd\u09a1",m:"\u098f\u0995 \u09ae\u09bf\u09a8\u09bf\u099f",mm:"%d \u09ae\u09bf\u09a8\u09bf\u099f",h:"\u098f\u0995 \u0998\u09a8\u09cd\u099f\u09be",hh:"%d \u0998\u09a8\u09cd\u099f\u09be",d:"\u098f\u0995 \u09a6\u09bf\u09a8",dd:"%d \u09a6\u09bf\u09a8",M:"\u098f\u0995 \u09ae\u09be\u09b8",MM:"%d \u09ae\u09be\u09b8",y:"\u098f\u0995 \u09ac\u099b\u09b0",yy:"%d \u09ac\u099b\u09b0"},preparse:function(e){return e.replace(/[\u09e7\u09e8\u09e9\u09ea\u09eb\u09ec\u09ed\u09ee\u09ef\u09e6]/g,function(e){return Ds[e]})},postformat:function(e){return e.replace(/\d/g,function(e){return ks[e]})},meridiemParse:/\u09b0\u09be\u09a4|\u09b8\u0995\u09be\u09b2|\u09a6\u09c1\u09aa\u09c1\u09b0|\u09ac\u09bf\u0995\u09be\u09b2|\u09b0\u09be\u09a4/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u09b0\u09be\u09a4"===a&&4<=e||"\u09a6\u09c1\u09aa\u09c1\u09b0"===a&&e<5||"\u09ac\u09bf\u0995\u09be\u09b2"===a?e+12:e},meridiem:function(e,a,t){return e<4?"\u09b0\u09be\u09a4":e<10?"\u09b8\u0995\u09be\u09b2":e<17?"\u09a6\u09c1\u09aa\u09c1\u09b0":e<20?"\u09ac\u09bf\u0995\u09be\u09b2":"\u09b0\u09be\u09a4"},week:{dow:0,doy:6}});var Ts={1:"\u0f21",2:"\u0f22",3:"\u0f23",4:"\u0f24",5:"\u0f25",6:"\u0f26",7:"\u0f27",8:"\u0f28",9:"\u0f29",0:"\u0f20"},gs={"\u0f21":"1","\u0f22":"2","\u0f23":"3","\u0f24":"4","\u0f25":"5","\u0f26":"6","\u0f27":"7","\u0f28":"8","\u0f29":"9","\u0f20":"0"};function ws(e,a,t){var s;return e+" "+(s={mm:"munutenn",MM:"miz",dd:"devezh"}[t],2!==e?s:function(e){var a={m:"v",b:"v",d:"z"};return void 0!==a[e.charAt(0)]?a[e.charAt(0)]+e.substring(1):e}(s))}M.defineLocale("bo",{months:"\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f51\u0f44\u0f0b\u0f54\u0f7c_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f42\u0f49\u0f72\u0f66\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f42\u0f66\u0f74\u0f58\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f56\u0f5e\u0f72\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f63\u0f94\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f51\u0fb2\u0f74\u0f42\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f56\u0f51\u0f74\u0f53\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f56\u0f62\u0f92\u0fb1\u0f51\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f51\u0f42\u0f74\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f56\u0f45\u0f74\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f56\u0f45\u0f74\u0f0b\u0f42\u0f45\u0f72\u0f42\u0f0b\u0f54_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f56\u0f45\u0f74\u0f0b\u0f42\u0f49\u0f72\u0f66\u0f0b\u0f54".split("_"),monthsShort:"\u0f5f\u0fb3\u0f0b1_\u0f5f\u0fb3\u0f0b2_\u0f5f\u0fb3\u0f0b3_\u0f5f\u0fb3\u0f0b4_\u0f5f\u0fb3\u0f0b5_\u0f5f\u0fb3\u0f0b6_\u0f5f\u0fb3\u0f0b7_\u0f5f\u0fb3\u0f0b8_\u0f5f\u0fb3\u0f0b9_\u0f5f\u0fb3\u0f0b10_\u0f5f\u0fb3\u0f0b11_\u0f5f\u0fb3\u0f0b12".split("_"),monthsShortRegex:/^(\u0f5f\u0fb3\u0f0b\d{1,2})/,monthsParseExact:!0,weekdays:"\u0f42\u0f5f\u0f60\u0f0b\u0f49\u0f72\u0f0b\u0f58\u0f0b_\u0f42\u0f5f\u0f60\u0f0b\u0f5f\u0fb3\u0f0b\u0f56\u0f0b_\u0f42\u0f5f\u0f60\u0f0b\u0f58\u0f72\u0f42\u0f0b\u0f51\u0f58\u0f62\u0f0b_\u0f42\u0f5f\u0f60\u0f0b\u0f63\u0fb7\u0f42\u0f0b\u0f54\u0f0b_\u0f42\u0f5f\u0f60\u0f0b\u0f55\u0f74\u0f62\u0f0b\u0f56\u0f74_\u0f42\u0f5f\u0f60\u0f0b\u0f54\u0f0b\u0f66\u0f44\u0f66\u0f0b_\u0f42\u0f5f\u0f60\u0f0b\u0f66\u0fa4\u0f7a\u0f53\u0f0b\u0f54\u0f0b".split("_"),weekdaysShort:"\u0f49\u0f72\u0f0b\u0f58\u0f0b_\u0f5f\u0fb3\u0f0b\u0f56\u0f0b_\u0f58\u0f72\u0f42\u0f0b\u0f51\u0f58\u0f62\u0f0b_\u0f63\u0fb7\u0f42\u0f0b\u0f54\u0f0b_\u0f55\u0f74\u0f62\u0f0b\u0f56\u0f74_\u0f54\u0f0b\u0f66\u0f44\u0f66\u0f0b_\u0f66\u0fa4\u0f7a\u0f53\u0f0b\u0f54\u0f0b".split("_"),weekdaysMin:"\u0f49\u0f72_\u0f5f\u0fb3_\u0f58\u0f72\u0f42_\u0f63\u0fb7\u0f42_\u0f55\u0f74\u0f62_\u0f66\u0f44\u0f66_\u0f66\u0fa4\u0f7a\u0f53".split("_"),longDateFormat:{LT:"A h:mm",LTS:"A h:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm",LLLL:"dddd, D MMMM YYYY, A h:mm"},calendar:{sameDay:"[\u0f51\u0f72\u0f0b\u0f62\u0f72\u0f44] LT",nextDay:"[\u0f66\u0f44\u0f0b\u0f49\u0f72\u0f53] LT",nextWeek:"[\u0f56\u0f51\u0f74\u0f53\u0f0b\u0f55\u0fb2\u0f42\u0f0b\u0f62\u0f97\u0f7a\u0f66\u0f0b\u0f58], LT",lastDay:"[\u0f41\u0f0b\u0f66\u0f44] LT",lastWeek:"[\u0f56\u0f51\u0f74\u0f53\u0f0b\u0f55\u0fb2\u0f42\u0f0b\u0f58\u0f50\u0f60\u0f0b\u0f58] dddd, LT",sameElse:"L"},relativeTime:{future:"%s \u0f63\u0f0b",past:"%s \u0f66\u0f94\u0f53\u0f0b\u0f63",s:"\u0f63\u0f58\u0f0b\u0f66\u0f44",ss:"%d \u0f66\u0f90\u0f62\u0f0b\u0f46\u0f0d",m:"\u0f66\u0f90\u0f62\u0f0b\u0f58\u0f0b\u0f42\u0f45\u0f72\u0f42",mm:"%d \u0f66\u0f90\u0f62\u0f0b\u0f58",h:"\u0f46\u0f74\u0f0b\u0f5a\u0f7c\u0f51\u0f0b\u0f42\u0f45\u0f72\u0f42",hh:"%d \u0f46\u0f74\u0f0b\u0f5a\u0f7c\u0f51",d:"\u0f49\u0f72\u0f53\u0f0b\u0f42\u0f45\u0f72\u0f42",dd:"%d \u0f49\u0f72\u0f53\u0f0b",M:"\u0f5f\u0fb3\u0f0b\u0f56\u0f0b\u0f42\u0f45\u0f72\u0f42",MM:"%d \u0f5f\u0fb3\u0f0b\u0f56",y:"\u0f63\u0f7c\u0f0b\u0f42\u0f45\u0f72\u0f42",yy:"%d \u0f63\u0f7c"},preparse:function(e){return e.replace(/[\u0f21\u0f22\u0f23\u0f24\u0f25\u0f26\u0f27\u0f28\u0f29\u0f20]/g,function(e){return gs[e]})},postformat:function(e){return e.replace(/\d/g,function(e){return Ts[e]})},meridiemParse:/\u0f58\u0f5a\u0f53\u0f0b\u0f58\u0f7c|\u0f5e\u0f7c\u0f42\u0f66\u0f0b\u0f40\u0f66|\u0f49\u0f72\u0f53\u0f0b\u0f42\u0f74\u0f44|\u0f51\u0f42\u0f7c\u0f44\u0f0b\u0f51\u0f42|\u0f58\u0f5a\u0f53\u0f0b\u0f58\u0f7c/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u0f58\u0f5a\u0f53\u0f0b\u0f58\u0f7c"===a&&4<=e||"\u0f49\u0f72\u0f53\u0f0b\u0f42\u0f74\u0f44"===a&&e<5||"\u0f51\u0f42\u0f7c\u0f44\u0f0b\u0f51\u0f42"===a?e+12:e},meridiem:function(e,a,t){return e<4?"\u0f58\u0f5a\u0f53\u0f0b\u0f58\u0f7c":e<10?"\u0f5e\u0f7c\u0f42\u0f66\u0f0b\u0f40\u0f66":e<17?"\u0f49\u0f72\u0f53\u0f0b\u0f42\u0f74\u0f44":e<20?"\u0f51\u0f42\u0f7c\u0f44\u0f0b\u0f51\u0f42":"\u0f58\u0f5a\u0f53\u0f0b\u0f58\u0f7c"},week:{dow:0,doy:6}});var vs=[/^gen/i,/^c[\u02bc\']hwe/i,/^meu/i,/^ebr/i,/^mae/i,/^(mez|eve)/i,/^gou/i,/^eos/i,/^gwe/i,/^her/i,/^du/i,/^ker/i],bs=/^(genver|c[\u02bc\']hwevrer|meurzh|ebrel|mae|mezheven|gouere|eost|gwengolo|here|du|kerzu|gen|c[\u02bc\']hwe|meu|ebr|mae|eve|gou|eos|gwe|her|du|ker)/i,Ss=[/^Su/i,/^Lu/i,/^Me([^r]|$)/i,/^Mer/i,/^Ya/i,/^Gw/i,/^Sa/i];function Hs(e,a,t){var s=e+" ";switch(t){case"ss":return s+=1===e?"sekunda":2===e||3===e||4===e?"sekunde":"sekundi";case"m":return a?"jedna minuta":"jedne minute";case"mm":return s+=1!==e&&(2===e||3===e||4===e)?"minute":"minuta";case"h":return a?"jedan sat":"jednog sata";case"hh":return s+=1===e?"sat":2===e||3===e||4===e?"sata":"sati";case"dd":return s+=1===e?"dan":"dana";case"MM":return s+=1===e?"mjesec":2===e||3===e||4===e?"mjeseca":"mjeseci";case"yy":return s+=1!==e&&(2===e||3===e||4===e)?"godine":"godina"}}M.defineLocale("br",{months:"Genver_C\u02bchwevrer_Meurzh_Ebrel_Mae_Mezheven_Gouere_Eost_Gwengolo_Here_Du_Kerzu".split("_"),monthsShort:"Gen_C\u02bchwe_Meu_Ebr_Mae_Eve_Gou_Eos_Gwe_Her_Du_Ker".split("_"),weekdays:"Sul_Lun_Meurzh_Merc\u02bcher_Yaou_Gwener_Sadorn".split("_"),weekdaysShort:"Sul_Lun_Meu_Mer_Yao_Gwe_Sad".split("_"),weekdaysMin:"Su_Lu_Me_Mer_Ya_Gw_Sa".split("_"),weekdaysParse:Ss,fullWeekdaysParse:[/^sul/i,/^lun/i,/^meurzh/i,/^merc[\u02bc\']her/i,/^yaou/i,/^gwener/i,/^sadorn/i],shortWeekdaysParse:[/^Sul/i,/^Lun/i,/^Meu/i,/^Mer/i,/^Yao/i,/^Gwe/i,/^Sad/i],minWeekdaysParse:Ss,monthsRegex:bs,monthsShortRegex:bs,monthsStrictRegex:/^(genver|c[\u02bc\']hwevrer|meurzh|ebrel|mae|mezheven|gouere|eost|gwengolo|here|du|kerzu)/i,monthsShortStrictRegex:/^(gen|c[\u02bc\']hwe|meu|ebr|mae|eve|gou|eos|gwe|her|du|ker)/i,monthsParse:vs,longMonthsParse:vs,shortMonthsParse:vs,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D [a viz] MMMM YYYY",LLL:"D [a viz] MMMM YYYY HH:mm",LLLL:"dddd, D [a viz] MMMM YYYY HH:mm"},calendar:{sameDay:"[Hiziv da] LT",nextDay:"[Warc\u02bchoazh da] LT",nextWeek:"dddd [da] LT",lastDay:"[Dec\u02bch da] LT",lastWeek:"dddd [paset da] LT",sameElse:"L"},relativeTime:{future:"a-benn %s",past:"%s \u02bczo",s:"un nebeud segondenno\xf9",ss:"%d eilenn",m:"ur vunutenn",mm:ws,h:"un eur",hh:"%d eur",d:"un devezh",dd:ws,M:"ur miz",MM:ws,y:"ur bloaz",yy:function(e){switch(function e(a){if(9<a)return e(a%10);return a}(e)){case 1:case 3:case 4:case 5:case 9:return e+" bloaz";default:return e+" vloaz"}}},dayOfMonthOrdinalParse:/\d{1,2}(a\xf1|vet)/,ordinal:function(e){return e+(1===e?"a\xf1":"vet")},week:{dow:1,doy:4},meridiemParse:/a.m.|g.m./,isPM:function(e){return"g.m."===e},meridiem:function(e,a,t){return e<12?"a.m.":"g.m."}}),M.defineLocale("bs",{months:"januar_februar_mart_april_maj_juni_juli_august_septembar_oktobar_novembar_decembar".split("_"),monthsShort:"jan._feb._mar._apr._maj._jun._jul._aug._sep._okt._nov._dec.".split("_"),monthsParseExact:!0,weekdays:"nedjelja_ponedjeljak_utorak_srijeda_\u010detvrtak_petak_subota".split("_"),weekdaysShort:"ned._pon._uto._sri._\u010det._pet._sub.".split("_"),weekdaysMin:"ne_po_ut_sr_\u010de_pe_su".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm"},calendar:{sameDay:"[danas u] LT",nextDay:"[sutra u] LT",nextWeek:function(){switch(this.day()){case 0:return"[u] [nedjelju] [u] LT";case 3:return"[u] [srijedu] [u] LT";case 6:return"[u] [subotu] [u] LT";case 1:case 2:case 4:case 5:return"[u] dddd [u] LT"}},lastDay:"[ju\u010der u] LT",lastWeek:function(){switch(this.day()){case 0:case 3:return"[pro\u0161lu] dddd [u] LT";case 6:return"[pro\u0161le] [subote] [u] LT";case 1:case 2:case 4:case 5:return"[pro\u0161li] dddd [u] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"prije %s",s:"par sekundi",ss:Hs,m:Hs,mm:Hs,h:Hs,hh:Hs,d:"dan",dd:Hs,M:"mjesec",MM:Hs,y:"godinu",yy:Hs},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),M.defineLocale("ca",{months:{standalone:"gener_febrer_mar\xe7_abril_maig_juny_juliol_agost_setembre_octubre_novembre_desembre".split("_"),format:"de gener_de febrer_de mar\xe7_d'abril_de maig_de juny_de juliol_d'agost_de setembre_d'octubre_de novembre_de desembre".split("_"),isFormat:/D[oD]?(\s)+MMMM/},monthsShort:"gen._febr._mar\xe7_abr._maig_juny_jul._ag._set._oct._nov._des.".split("_"),monthsParseExact:!0,weekdays:"diumenge_dilluns_dimarts_dimecres_dijous_divendres_dissabte".split("_"),weekdaysShort:"dg._dl._dt._dc._dj._dv._ds.".split("_"),weekdaysMin:"dg_dl_dt_dc_dj_dv_ds".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM [de] YYYY",ll:"D MMM YYYY",LLL:"D MMMM [de] YYYY [a les] H:mm",lll:"D MMM YYYY, H:mm",LLLL:"dddd D MMMM [de] YYYY [a les] H:mm",llll:"ddd D MMM YYYY, H:mm"},calendar:{sameDay:function(){return"[avui a "+(1!==this.hours()?"les":"la")+"] LT"},nextDay:function(){return"[dem\xe0 a "+(1!==this.hours()?"les":"la")+"] LT"},nextWeek:function(){return"dddd [a "+(1!==this.hours()?"les":"la")+"] LT"},lastDay:function(){return"[ahir a "+(1!==this.hours()?"les":"la")+"] LT"},lastWeek:function(){return"[el] dddd [passat a "+(1!==this.hours()?"les":"la")+"] LT"},sameElse:"L"},relativeTime:{future:"d'aqu\xed %s",past:"fa %s",s:"uns segons",ss:"%d segons",m:"un minut",mm:"%d minuts",h:"una hora",hh:"%d hores",d:"un dia",dd:"%d dies",M:"un mes",MM:"%d mesos",y:"un any",yy:"%d anys"},dayOfMonthOrdinalParse:/\d{1,2}(r|n|t|\xe8|a)/,ordinal:function(e,a){return e+("w"!==a&&"W"!==a?1===e?"r":2===e?"n":3===e?"r":4===e?"t":"\xe8":"a")},week:{dow:1,doy:4}});var js="leden_\xfanor_b\u0159ezen_duben_kv\u011bten_\u010derven_\u010dervenec_srpen_z\xe1\u0159\xed_\u0159\xedjen_listopad_prosinec".split("_"),xs="led_\xfano_b\u0159e_dub_kv\u011b_\u010dvn_\u010dvc_srp_z\xe1\u0159_\u0159\xedj_lis_pro".split("_"),Ps=[/^led/i,/^\xfano/i,/^b\u0159e/i,/^dub/i,/^kv\u011b/i,/^(\u010dvn|\u010derven$|\u010dervna)/i,/^(\u010dvc|\u010dervenec|\u010dervence)/i,/^srp/i,/^z\xe1\u0159/i,/^\u0159\xedj/i,/^lis/i,/^pro/i],Os=/^(leden|\xfanor|b\u0159ezen|duben|kv\u011bten|\u010dervenec|\u010dervence|\u010derven|\u010dervna|srpen|z\xe1\u0159\xed|\u0159\xedjen|listopad|prosinec|led|\xfano|b\u0159e|dub|kv\u011b|\u010dvn|\u010dvc|srp|z\xe1\u0159|\u0159\xedj|lis|pro)/i;function Ws(e){return 1<e&&e<5&&1!=~~(e/10)}function As(e,a,t,s){var n=e+" ";switch(t){case"s":return a||s?"p\xe1r sekund":"p\xe1r sekundami";case"ss":return a||s?n+(Ws(e)?"sekundy":"sekund"):n+"sekundami";case"m":return a?"minuta":s?"minutu":"minutou";case"mm":return a||s?n+(Ws(e)?"minuty":"minut"):n+"minutami";case"h":return a?"hodina":s?"hodinu":"hodinou";case"hh":return a||s?n+(Ws(e)?"hodiny":"hodin"):n+"hodinami";case"d":return a||s?"den":"dnem";case"dd":return a||s?n+(Ws(e)?"dny":"dn\xed"):n+"dny";case"M":return a||s?"m\u011bs\xedc":"m\u011bs\xedcem";case"MM":return a||s?n+(Ws(e)?"m\u011bs\xedce":"m\u011bs\xedc\u016f"):n+"m\u011bs\xedci";case"y":return a||s?"rok":"rokem";case"yy":return a||s?n+(Ws(e)?"roky":"let"):n+"lety"}}function Es(e,a,t,s){var n={m:["eine Minute","einer Minute"],h:["eine Stunde","einer Stunde"],d:["ein Tag","einem Tag"],dd:[e+" Tage",e+" Tagen"],w:["eine Woche","einer Woche"],M:["ein Monat","einem Monat"],MM:[e+" Monate",e+" Monaten"],y:["ein Jahr","einem Jahr"],yy:[e+" Jahre",e+" Jahren"]};return a?n[t][0]:n[t][1]}function Fs(e,a,t,s){var n={m:["eine Minute","einer Minute"],h:["eine Stunde","einer Stunde"],d:["ein Tag","einem Tag"],dd:[e+" Tage",e+" Tagen"],w:["eine Woche","einer Woche"],M:["ein Monat","einem Monat"],MM:[e+" Monate",e+" Monaten"],y:["ein Jahr","einem Jahr"],yy:[e+" Jahre",e+" Jahren"]};return a?n[t][0]:n[t][1]}function zs(e,a,t,s){var n={m:["eine Minute","einer Minute"],h:["eine Stunde","einer Stunde"],d:["ein Tag","einem Tag"],dd:[e+" Tage",e+" Tagen"],w:["eine Woche","einer Woche"],M:["ein Monat","einem Monat"],MM:[e+" Monate",e+" Monaten"],y:["ein Jahr","einem Jahr"],yy:[e+" Jahre",e+" Jahren"]};return a?n[t][0]:n[t][1]}M.defineLocale("cs",{months:js,monthsShort:xs,monthsRegex:Os,monthsShortRegex:Os,monthsStrictRegex:/^(leden|ledna|\xfanora|\xfanor|b\u0159ezen|b\u0159ezna|duben|dubna|kv\u011bten|kv\u011btna|\u010dervenec|\u010dervence|\u010derven|\u010dervna|srpen|srpna|z\xe1\u0159\xed|\u0159\xedjen|\u0159\xedjna|listopadu|listopad|prosinec|prosince)/i,monthsShortStrictRegex:/^(led|\xfano|b\u0159e|dub|kv\u011b|\u010dvn|\u010dvc|srp|z\xe1\u0159|\u0159\xedj|lis|pro)/i,monthsParse:Ps,longMonthsParse:Ps,shortMonthsParse:Ps,weekdays:"ned\u011ble_pond\u011bl\xed_\xfater\xfd_st\u0159eda_\u010dtvrtek_p\xe1tek_sobota".split("_"),weekdaysShort:"ne_po_\xfat_st_\u010dt_p\xe1_so".split("_"),weekdaysMin:"ne_po_\xfat_st_\u010dt_p\xe1_so".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd D. MMMM YYYY H:mm",l:"D. M. YYYY"},calendar:{sameDay:"[dnes v] LT",nextDay:"[z\xedtra v] LT",nextWeek:function(){switch(this.day()){case 0:return"[v ned\u011bli v] LT";case 1:case 2:return"[v] dddd [v] LT";case 3:return"[ve st\u0159edu v] LT";case 4:return"[ve \u010dtvrtek v] LT";case 5:return"[v p\xe1tek v] LT";case 6:return"[v sobotu v] LT"}},lastDay:"[v\u010dera v] LT",lastWeek:function(){switch(this.day()){case 0:return"[minulou ned\u011bli v] LT";case 1:case 2:return"[minul\xe9] dddd [v] LT";case 3:return"[minulou st\u0159edu v] LT";case 4:case 5:return"[minul\xfd] dddd [v] LT";case 6:return"[minulou sobotu v] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"p\u0159ed %s",s:As,ss:As,m:As,mm:As,h:As,hh:As,d:As,dd:As,M:As,MM:As,y:As,yy:As},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),M.defineLocale("cv",{months:"\u043a\u04d1\u0440\u043b\u0430\u0447_\u043d\u0430\u0440\u04d1\u0441_\u043f\u0443\u0448_\u0430\u043a\u0430_\u043c\u0430\u0439_\u04ab\u04d7\u0440\u0442\u043c\u0435_\u0443\u0442\u04d1_\u04ab\u0443\u0440\u043b\u0430_\u0430\u0432\u04d1\u043d_\u044e\u043f\u0430_\u0447\u04f3\u043a_\u0440\u0430\u0448\u0442\u0430\u0432".split("_"),monthsShort:"\u043a\u04d1\u0440_\u043d\u0430\u0440_\u043f\u0443\u0448_\u0430\u043a\u0430_\u043c\u0430\u0439_\u04ab\u04d7\u0440_\u0443\u0442\u04d1_\u04ab\u0443\u0440_\u0430\u0432\u043d_\u044e\u043f\u0430_\u0447\u04f3\u043a_\u0440\u0430\u0448".split("_"),weekdays:"\u0432\u044b\u0440\u0441\u0430\u0440\u043d\u0438\u043a\u0443\u043d_\u0442\u0443\u043d\u0442\u0438\u043a\u0443\u043d_\u044b\u0442\u043b\u0430\u0440\u0438\u043a\u0443\u043d_\u044e\u043d\u043a\u0443\u043d_\u043a\u04d7\u04ab\u043d\u0435\u0440\u043d\u0438\u043a\u0443\u043d_\u044d\u0440\u043d\u0435\u043a\u0443\u043d_\u0448\u04d1\u043c\u0430\u0442\u043a\u0443\u043d".split("_"),weekdaysShort:"\u0432\u044b\u0440_\u0442\u0443\u043d_\u044b\u0442\u043b_\u044e\u043d_\u043a\u04d7\u04ab_\u044d\u0440\u043d_\u0448\u04d1\u043c".split("_"),weekdaysMin:"\u0432\u0440_\u0442\u043d_\u044b\u0442_\u044e\u043d_\u043a\u04ab_\u044d\u0440_\u0448\u043c".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD-MM-YYYY",LL:"YYYY [\u04ab\u0443\u043b\u0445\u0438] MMMM [\u0443\u0439\u04d1\u0445\u04d7\u043d] D[-\u043c\u04d7\u0448\u04d7]",LLL:"YYYY [\u04ab\u0443\u043b\u0445\u0438] MMMM [\u0443\u0439\u04d1\u0445\u04d7\u043d] D[-\u043c\u04d7\u0448\u04d7], HH:mm",LLLL:"dddd, YYYY [\u04ab\u0443\u043b\u0445\u0438] MMMM [\u0443\u0439\u04d1\u0445\u04d7\u043d] D[-\u043c\u04d7\u0448\u04d7], HH:mm"},calendar:{sameDay:"[\u041f\u0430\u044f\u043d] LT [\u0441\u0435\u0445\u0435\u0442\u0440\u0435]",nextDay:"[\u042b\u0440\u0430\u043d] LT [\u0441\u0435\u0445\u0435\u0442\u0440\u0435]",lastDay:"[\u04d6\u043d\u0435\u0440] LT [\u0441\u0435\u0445\u0435\u0442\u0440\u0435]",nextWeek:"[\u04aa\u0438\u0442\u0435\u0441] dddd LT [\u0441\u0435\u0445\u0435\u0442\u0440\u0435]",lastWeek:"[\u0418\u0440\u0442\u043d\u04d7] dddd LT [\u0441\u0435\u0445\u0435\u0442\u0440\u0435]",sameElse:"L"},relativeTime:{future:function(e){return e+(/\u0441\u0435\u0445\u0435\u0442$/i.exec(e)?"\u0440\u0435\u043d":/\u04ab\u0443\u043b$/i.exec(e)?"\u0442\u0430\u043d":"\u0440\u0430\u043d")},past:"%s \u043a\u0430\u044f\u043b\u043b\u0430",s:"\u043f\u04d7\u0440-\u0438\u043a \u04ab\u0435\u043a\u043a\u0443\u043d\u0442",ss:"%d \u04ab\u0435\u043a\u043a\u0443\u043d\u0442",m:"\u043f\u04d7\u0440 \u043c\u0438\u043d\u0443\u0442",mm:"%d \u043c\u0438\u043d\u0443\u0442",h:"\u043f\u04d7\u0440 \u0441\u0435\u0445\u0435\u0442",hh:"%d \u0441\u0435\u0445\u0435\u0442",d:"\u043f\u04d7\u0440 \u043a\u0443\u043d",dd:"%d \u043a\u0443\u043d",M:"\u043f\u04d7\u0440 \u0443\u0439\u04d1\u0445",MM:"%d \u0443\u0439\u04d1\u0445",y:"\u043f\u04d7\u0440 \u04ab\u0443\u043b",yy:"%d \u04ab\u0443\u043b"},dayOfMonthOrdinalParse:/\d{1,2}-\u043c\u04d7\u0448/,ordinal:"%d-\u043c\u04d7\u0448",week:{dow:1,doy:7}}),M.defineLocale("cy",{months:"Ionawr_Chwefror_Mawrth_Ebrill_Mai_Mehefin_Gorffennaf_Awst_Medi_Hydref_Tachwedd_Rhagfyr".split("_"),monthsShort:"Ion_Chwe_Maw_Ebr_Mai_Meh_Gor_Aws_Med_Hyd_Tach_Rhag".split("_"),weekdays:"Dydd Sul_Dydd Llun_Dydd Mawrth_Dydd Mercher_Dydd Iau_Dydd Gwener_Dydd Sadwrn".split("_"),weekdaysShort:"Sul_Llun_Maw_Mer_Iau_Gwe_Sad".split("_"),weekdaysMin:"Su_Ll_Ma_Me_Ia_Gw_Sa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Heddiw am] LT",nextDay:"[Yfory am] LT",nextWeek:"dddd [am] LT",lastDay:"[Ddoe am] LT",lastWeek:"dddd [diwethaf am] LT",sameElse:"L"},relativeTime:{future:"mewn %s",past:"%s yn \xf4l",s:"ychydig eiliadau",ss:"%d eiliad",m:"munud",mm:"%d munud",h:"awr",hh:"%d awr",d:"diwrnod",dd:"%d diwrnod",M:"mis",MM:"%d mis",y:"blwyddyn",yy:"%d flynedd"},dayOfMonthOrdinalParse:/\d{1,2}(fed|ain|af|il|ydd|ed|eg)/,ordinal:function(e){var a="";return 20<e?a=40===e||50===e||60===e||80===e||100===e?"fed":"ain":0<e&&(a=["","af","il","ydd","ydd","ed","ed","ed","fed","fed","fed","eg","fed","eg","eg","fed","eg","eg","fed","eg","fed"][e]),e+a},week:{dow:1,doy:4}}),M.defineLocale("da",{months:"januar_februar_marts_april_maj_juni_juli_august_september_oktober_november_december".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec".split("_"),weekdays:"s\xf8ndag_mandag_tirsdag_onsdag_torsdag_fredag_l\xf8rdag".split("_"),weekdaysShort:"s\xf8n_man_tir_ons_tor_fre_l\xf8r".split("_"),weekdaysMin:"s\xf8_ma_ti_on_to_fr_l\xf8".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY HH:mm",LLLL:"dddd [d.] D. MMMM YYYY [kl.] HH:mm"},calendar:{sameDay:"[i dag kl.] LT",nextDay:"[i morgen kl.] LT",nextWeek:"p\xe5 dddd [kl.] LT",lastDay:"[i g\xe5r kl.] LT",lastWeek:"[i] dddd[s kl.] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"%s siden",s:"f\xe5 sekunder",ss:"%d sekunder",m:"et minut",mm:"%d minutter",h:"en time",hh:"%d timer",d:"en dag",dd:"%d dage",M:"en m\xe5ned",MM:"%d m\xe5neder",y:"et \xe5r",yy:"%d \xe5r"},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),M.defineLocale("de-at",{months:"J\xe4nner_Februar_M\xe4rz_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"J\xe4n._Feb._M\xe4rz_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.".split("_"),monthsParseExact:!0,weekdays:"Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"),weekdaysShort:"So._Mo._Di._Mi._Do._Fr._Sa.".split("_"),weekdaysMin:"So_Mo_Di_Mi_Do_Fr_Sa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY HH:mm",LLLL:"dddd, D. MMMM YYYY HH:mm"},calendar:{sameDay:"[heute um] LT [Uhr]",sameElse:"L",nextDay:"[morgen um] LT [Uhr]",nextWeek:"dddd [um] LT [Uhr]",lastDay:"[gestern um] LT [Uhr]",lastWeek:"[letzten] dddd [um] LT [Uhr]"},relativeTime:{future:"in %s",past:"vor %s",s:"ein paar Sekunden",ss:"%d Sekunden",m:Es,mm:"%d Minuten",h:Es,hh:"%d Stunden",d:Es,dd:Es,w:Es,ww:"%d Wochen",M:Es,MM:Es,y:Es,yy:Es},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),M.defineLocale("de-ch",{months:"Januar_Februar_M\xe4rz_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jan._Feb._M\xe4rz_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.".split("_"),monthsParseExact:!0,weekdays:"Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"),weekdaysShort:"So_Mo_Di_Mi_Do_Fr_Sa".split("_"),weekdaysMin:"So_Mo_Di_Mi_Do_Fr_Sa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY HH:mm",LLLL:"dddd, D. MMMM YYYY HH:mm"},calendar:{sameDay:"[heute um] LT [Uhr]",sameElse:"L",nextDay:"[morgen um] LT [Uhr]",nextWeek:"dddd [um] LT [Uhr]",lastDay:"[gestern um] LT [Uhr]",lastWeek:"[letzten] dddd [um] LT [Uhr]"},relativeTime:{future:"in %s",past:"vor %s",s:"ein paar Sekunden",ss:"%d Sekunden",m:Fs,mm:"%d Minuten",h:Fs,hh:"%d Stunden",d:Fs,dd:Fs,w:Fs,ww:"%d Wochen",M:Fs,MM:Fs,y:Fs,yy:Fs},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),M.defineLocale("de",{months:"Januar_Februar_M\xe4rz_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jan._Feb._M\xe4rz_Apr._Mai_Juni_Juli_Aug._Sep._Okt._Nov._Dez.".split("_"),monthsParseExact:!0,weekdays:"Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"),weekdaysShort:"So._Mo._Di._Mi._Do._Fr._Sa.".split("_"),weekdaysMin:"So_Mo_Di_Mi_Do_Fr_Sa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY HH:mm",LLLL:"dddd, D. MMMM YYYY HH:mm"},calendar:{sameDay:"[heute um] LT [Uhr]",sameElse:"L",nextDay:"[morgen um] LT [Uhr]",nextWeek:"dddd [um] LT [Uhr]",lastDay:"[gestern um] LT [Uhr]",lastWeek:"[letzten] dddd [um] LT [Uhr]"},relativeTime:{future:"in %s",past:"vor %s",s:"ein paar Sekunden",ss:"%d Sekunden",m:zs,mm:"%d Minuten",h:zs,hh:"%d Stunden",d:zs,dd:zs,w:zs,ww:"%d Wochen",M:zs,MM:zs,y:zs,yy:zs},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});var Ns=["\u0796\u07ac\u0782\u07aa\u0787\u07a6\u0783\u07a9","\u078a\u07ac\u0784\u07b0\u0783\u07aa\u0787\u07a6\u0783\u07a9","\u0789\u07a7\u0783\u07a8\u0797\u07aa","\u0787\u07ad\u0795\u07b0\u0783\u07a9\u078d\u07aa","\u0789\u07ad","\u0796\u07ab\u0782\u07b0","\u0796\u07aa\u078d\u07a6\u0787\u07a8","\u0787\u07af\u078e\u07a6\u0790\u07b0\u0793\u07aa","\u0790\u07ac\u0795\u07b0\u0793\u07ac\u0789\u07b0\u0784\u07a6\u0783\u07aa","\u0787\u07ae\u0786\u07b0\u0793\u07af\u0784\u07a6\u0783\u07aa","\u0782\u07ae\u0788\u07ac\u0789\u07b0\u0784\u07a6\u0783\u07aa","\u0791\u07a8\u0790\u07ac\u0789\u07b0\u0784\u07a6\u0783\u07aa"],Js=["\u0787\u07a7\u078b\u07a8\u0787\u07b0\u078c\u07a6","\u0780\u07af\u0789\u07a6","\u0787\u07a6\u0782\u07b0\u078e\u07a7\u0783\u07a6","\u0784\u07aa\u078b\u07a6","\u0784\u07aa\u0783\u07a7\u0790\u07b0\u078a\u07a6\u078c\u07a8","\u0780\u07aa\u0786\u07aa\u0783\u07aa","\u0780\u07ae\u0782\u07a8\u0780\u07a8\u0783\u07aa"];M.defineLocale("dv",{months:Ns,monthsShort:Ns,weekdays:Js,weekdaysShort:Js,weekdaysMin:"\u0787\u07a7\u078b\u07a8_\u0780\u07af\u0789\u07a6_\u0787\u07a6\u0782\u07b0_\u0784\u07aa\u078b\u07a6_\u0784\u07aa\u0783\u07a7_\u0780\u07aa\u0786\u07aa_\u0780\u07ae\u0782\u07a8".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"D/M/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},meridiemParse:/\u0789\u0786|\u0789\u078a/,isPM:function(e){return"\u0789\u078a"===e},meridiem:function(e,a,t){return e<12?"\u0789\u0786":"\u0789\u078a"},calendar:{sameDay:"[\u0789\u07a8\u0787\u07a6\u078b\u07aa] LT",nextDay:"[\u0789\u07a7\u078b\u07a6\u0789\u07a7] LT",nextWeek:"dddd LT",lastDay:"[\u0787\u07a8\u0787\u07b0\u0794\u07ac] LT",lastWeek:"[\u078a\u07a7\u0787\u07a8\u078c\u07aa\u0788\u07a8] dddd LT",sameElse:"L"},relativeTime:{future:"\u078c\u07ac\u0783\u07ad\u078e\u07a6\u0787\u07a8 %s",past:"\u0786\u07aa\u0783\u07a8\u0782\u07b0 %s",s:"\u0790\u07a8\u0786\u07aa\u0782\u07b0\u078c\u07aa\u0786\u07ae\u0785\u07ac\u0787\u07b0",ss:"d% \u0790\u07a8\u0786\u07aa\u0782\u07b0\u078c\u07aa",m:"\u0789\u07a8\u0782\u07a8\u0793\u07ac\u0787\u07b0",mm:"\u0789\u07a8\u0782\u07a8\u0793\u07aa %d",h:"\u078e\u07a6\u0791\u07a8\u0787\u07a8\u0783\u07ac\u0787\u07b0",hh:"\u078e\u07a6\u0791\u07a8\u0787\u07a8\u0783\u07aa %d",d:"\u078b\u07aa\u0788\u07a6\u0780\u07ac\u0787\u07b0",dd:"\u078b\u07aa\u0788\u07a6\u0790\u07b0 %d",M:"\u0789\u07a6\u0780\u07ac\u0787\u07b0",MM:"\u0789\u07a6\u0790\u07b0 %d",y:"\u0787\u07a6\u0780\u07a6\u0783\u07ac\u0787\u07b0",yy:"\u0787\u07a6\u0780\u07a6\u0783\u07aa %d"},preparse:function(e){return e.replace(/\u060c/g,",")},postformat:function(e){return e.replace(/,/g,"\u060c")},week:{dow:7,doy:12}}),M.defineLocale("el",{monthsNominativeEl:"\u0399\u03b1\u03bd\u03bf\u03c5\u03ac\u03c1\u03b9\u03bf\u03c2_\u03a6\u03b5\u03b2\u03c1\u03bf\u03c5\u03ac\u03c1\u03b9\u03bf\u03c2_\u039c\u03ac\u03c1\u03c4\u03b9\u03bf\u03c2_\u0391\u03c0\u03c1\u03af\u03bb\u03b9\u03bf\u03c2_\u039c\u03ac\u03b9\u03bf\u03c2_\u0399\u03bf\u03cd\u03bd\u03b9\u03bf\u03c2_\u0399\u03bf\u03cd\u03bb\u03b9\u03bf\u03c2_\u0391\u03cd\u03b3\u03bf\u03c5\u03c3\u03c4\u03bf\u03c2_\u03a3\u03b5\u03c0\u03c4\u03ad\u03bc\u03b2\u03c1\u03b9\u03bf\u03c2_\u039f\u03ba\u03c4\u03ce\u03b2\u03c1\u03b9\u03bf\u03c2_\u039d\u03bf\u03ad\u03bc\u03b2\u03c1\u03b9\u03bf\u03c2_\u0394\u03b5\u03ba\u03ad\u03bc\u03b2\u03c1\u03b9\u03bf\u03c2".split("_"),monthsGenitiveEl:"\u0399\u03b1\u03bd\u03bf\u03c5\u03b1\u03c1\u03af\u03bf\u03c5_\u03a6\u03b5\u03b2\u03c1\u03bf\u03c5\u03b1\u03c1\u03af\u03bf\u03c5_\u039c\u03b1\u03c1\u03c4\u03af\u03bf\u03c5_\u0391\u03c0\u03c1\u03b9\u03bb\u03af\u03bf\u03c5_\u039c\u03b1\u0390\u03bf\u03c5_\u0399\u03bf\u03c5\u03bd\u03af\u03bf\u03c5_\u0399\u03bf\u03c5\u03bb\u03af\u03bf\u03c5_\u0391\u03c5\u03b3\u03bf\u03cd\u03c3\u03c4\u03bf\u03c5_\u03a3\u03b5\u03c0\u03c4\u03b5\u03bc\u03b2\u03c1\u03af\u03bf\u03c5_\u039f\u03ba\u03c4\u03c9\u03b2\u03c1\u03af\u03bf\u03c5_\u039d\u03bf\u03b5\u03bc\u03b2\u03c1\u03af\u03bf\u03c5_\u0394\u03b5\u03ba\u03b5\u03bc\u03b2\u03c1\u03af\u03bf\u03c5".split("_"),months:function(e,a){return e?"string"==typeof a&&/D/.test(a.substring(0,a.indexOf("MMMM")))?this._monthsGenitiveEl[e.month()]:this._monthsNominativeEl[e.month()]:this._monthsNominativeEl},monthsShort:"\u0399\u03b1\u03bd_\u03a6\u03b5\u03b2_\u039c\u03b1\u03c1_\u0391\u03c0\u03c1_\u039c\u03b1\u03ca_\u0399\u03bf\u03c5\u03bd_\u0399\u03bf\u03c5\u03bb_\u0391\u03c5\u03b3_\u03a3\u03b5\u03c0_\u039f\u03ba\u03c4_\u039d\u03bf\u03b5_\u0394\u03b5\u03ba".split("_"),weekdays:"\u039a\u03c5\u03c1\u03b9\u03b1\u03ba\u03ae_\u0394\u03b5\u03c5\u03c4\u03ad\u03c1\u03b1_\u03a4\u03c1\u03af\u03c4\u03b7_\u03a4\u03b5\u03c4\u03ac\u03c1\u03c4\u03b7_\u03a0\u03ad\u03bc\u03c0\u03c4\u03b7_\u03a0\u03b1\u03c1\u03b1\u03c3\u03ba\u03b5\u03c5\u03ae_\u03a3\u03ac\u03b2\u03b2\u03b1\u03c4\u03bf".split("_"),weekdaysShort:"\u039a\u03c5\u03c1_\u0394\u03b5\u03c5_\u03a4\u03c1\u03b9_\u03a4\u03b5\u03c4_\u03a0\u03b5\u03bc_\u03a0\u03b1\u03c1_\u03a3\u03b1\u03b2".split("_"),weekdaysMin:"\u039a\u03c5_\u0394\u03b5_\u03a4\u03c1_\u03a4\u03b5_\u03a0\u03b5_\u03a0\u03b1_\u03a3\u03b1".split("_"),meridiem:function(e,a,t){return 11<e?t?"\u03bc\u03bc":"\u039c\u039c":t?"\u03c0\u03bc":"\u03a0\u039c"},isPM:function(e){return"\u03bc"===(e+"").toLowerCase()[0]},meridiemParse:/[\u03a0\u039c]\.?\u039c?\.?/i,longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},calendarEl:{sameDay:"[\u03a3\u03ae\u03bc\u03b5\u03c1\u03b1 {}] LT",nextDay:"[\u0391\u03cd\u03c1\u03b9\u03bf {}] LT",nextWeek:"dddd [{}] LT",lastDay:"[\u03a7\u03b8\u03b5\u03c2 {}] LT",lastWeek:function(){switch(this.day()){case 6:return"[\u03c4\u03bf \u03c0\u03c1\u03bf\u03b7\u03b3\u03bf\u03cd\u03bc\u03b5\u03bd\u03bf] dddd [{}] LT";default:return"[\u03c4\u03b7\u03bd \u03c0\u03c1\u03bf\u03b7\u03b3\u03bf\u03cd\u03bc\u03b5\u03bd\u03b7] dddd [{}] LT"}},sameElse:"L"},calendar:function(e,a){var t,s=this._calendarEl[e],n=a&&a.hours();return t=s,("undefined"!=typeof Function&&t instanceof Function||"[object Function]"===Object.prototype.toString.call(t))&&(s=s.apply(a)),s.replace("{}",n%12==1?"\u03c3\u03c4\u03b7":"\u03c3\u03c4\u03b9\u03c2")},relativeTime:{future:"\u03c3\u03b5 %s",past:"%s \u03c0\u03c1\u03b9\u03bd",s:"\u03bb\u03af\u03b3\u03b1 \u03b4\u03b5\u03c5\u03c4\u03b5\u03c1\u03cc\u03bb\u03b5\u03c0\u03c4\u03b1",ss:"%d \u03b4\u03b5\u03c5\u03c4\u03b5\u03c1\u03cc\u03bb\u03b5\u03c0\u03c4\u03b1",m:"\u03ad\u03bd\u03b1 \u03bb\u03b5\u03c0\u03c4\u03cc",mm:"%d \u03bb\u03b5\u03c0\u03c4\u03ac",h:"\u03bc\u03af\u03b1 \u03ce\u03c1\u03b1",hh:"%d \u03ce\u03c1\u03b5\u03c2",d:"\u03bc\u03af\u03b1 \u03bc\u03ad\u03c1\u03b1",dd:"%d \u03bc\u03ad\u03c1\u03b5\u03c2",M:"\u03ad\u03bd\u03b1\u03c2 \u03bc\u03ae\u03bd\u03b1\u03c2",MM:"%d \u03bc\u03ae\u03bd\u03b5\u03c2",y:"\u03ad\u03bd\u03b1\u03c2 \u03c7\u03c1\u03cc\u03bd\u03bf\u03c2",yy:"%d \u03c7\u03c1\u03cc\u03bd\u03b9\u03b1"},dayOfMonthOrdinalParse:/\d{1,2}\u03b7/,ordinal:"%d\u03b7",week:{dow:1,doy:4}}),M.defineLocale("en-au",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},dayOfMonthOrdinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(e){var a=e%10;return e+(1==~~(e%100/10)?"th":1==a?"st":2==a?"nd":3==a?"rd":"th")},week:{dow:0,doy:4}}),M.defineLocale("en-ca",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"YYYY-MM-DD",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},dayOfMonthOrdinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(e){var a=e%10;return e+(1==~~(e%100/10)?"th":1==a?"st":2==a?"nd":3==a?"rd":"th")}}),M.defineLocale("en-gb",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},dayOfMonthOrdinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(e){var a=e%10;return e+(1==~~(e%100/10)?"th":1==a?"st":2==a?"nd":3==a?"rd":"th")},week:{dow:1,doy:4}}),M.defineLocale("en-ie",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},dayOfMonthOrdinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(e){var a=e%10;return e+(1==~~(e%100/10)?"th":1==a?"st":2==a?"nd":3==a?"rd":"th")},week:{dow:1,doy:4}}),M.defineLocale("en-il",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},dayOfMonthOrdinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(e){var a=e%10;return e+(1==~~(e%100/10)?"th":1==a?"st":2==a?"nd":3==a?"rd":"th")}}),M.defineLocale("en-in",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},dayOfMonthOrdinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(e){var a=e%10;return e+(1==~~(e%100/10)?"th":1==a?"st":2==a?"nd":3==a?"rd":"th")},week:{dow:0,doy:6}}),M.defineLocale("en-nz",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},dayOfMonthOrdinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(e){var a=e%10;return e+(1==~~(e%100/10)?"th":1==a?"st":2==a?"nd":3==a?"rd":"th")},week:{dow:1,doy:4}}),M.defineLocale("en-sg",{months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},dayOfMonthOrdinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(e){var a=e%10;return e+(1==~~(e%100/10)?"th":1==a?"st":2==a?"nd":3==a?"rd":"th")},week:{dow:1,doy:4}}),M.defineLocale("eo",{months:"januaro_februaro_marto_aprilo_majo_junio_julio_a\u016dgusto_septembro_oktobro_novembro_decembro".split("_"),monthsShort:"jan_feb_mart_apr_maj_jun_jul_a\u016dg_sept_okt_nov_dec".split("_"),weekdays:"diman\u0109o_lundo_mardo_merkredo_\u0135a\u016ddo_vendredo_sabato".split("_"),weekdaysShort:"dim_lun_mard_merk_\u0135a\u016d_ven_sab".split("_"),weekdaysMin:"di_lu_ma_me_\u0135a_ve_sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"[la] D[-an de] MMMM, YYYY",LLL:"[la] D[-an de] MMMM, YYYY HH:mm",LLLL:"dddd[n], [la] D[-an de] MMMM, YYYY HH:mm",llll:"ddd, [la] D[-an de] MMM, YYYY HH:mm"},meridiemParse:/[ap]\.t\.m/i,isPM:function(e){return"p"===e.charAt(0).toLowerCase()},meridiem:function(e,a,t){return 11<e?t?"p.t.m.":"P.T.M.":t?"a.t.m.":"A.T.M."},calendar:{sameDay:"[Hodia\u016d je] LT",nextDay:"[Morga\u016d je] LT",nextWeek:"dddd[n je] LT",lastDay:"[Hiera\u016d je] LT",lastWeek:"[pasintan] dddd[n je] LT",sameElse:"L"},relativeTime:{future:"post %s",past:"anta\u016d %s",s:"kelkaj sekundoj",ss:"%d sekundoj",m:"unu minuto",mm:"%d minutoj",h:"unu horo",hh:"%d horoj",d:"unu tago",dd:"%d tagoj",M:"unu monato",MM:"%d monatoj",y:"unu jaro",yy:"%d jaroj"},dayOfMonthOrdinalParse:/\d{1,2}a/,ordinal:"%da",week:{dow:1,doy:7}});var Rs="ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.".split("_"),Cs="ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic".split("_"),Is=[/^ene/i,/^feb/i,/^mar/i,/^abr/i,/^may/i,/^jun/i,/^jul/i,/^ago/i,/^sep/i,/^oct/i,/^nov/i,/^dic/i],Us=/^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i;M.defineLocale("es-do",{months:"enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"),monthsShort:function(e,a){return e?/-MMM-/.test(a)?Cs[e.month()]:Rs[e.month()]:Rs},monthsRegex:Us,monthsShortRegex:Us,monthsStrictRegex:/^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i,monthsShortStrictRegex:/^(ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,monthsParse:Is,longMonthsParse:Is,shortMonthsParse:Is,weekdays:"domingo_lunes_martes_mi\xe9rcoles_jueves_viernes_s\xe1bado".split("_"),weekdaysShort:"dom._lun._mar._mi\xe9._jue._vie._s\xe1b.".split("_"),weekdaysMin:"do_lu_ma_mi_ju_vi_s\xe1".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY h:mm A",LLLL:"dddd, D [de] MMMM [de] YYYY h:mm A"},calendar:{sameDay:function(){return"[hoy a la"+(1!==this.hours()?"s":"")+"] LT"},nextDay:function(){return"[ma\xf1ana a la"+(1!==this.hours()?"s":"")+"] LT"},nextWeek:function(){return"dddd [a la"+(1!==this.hours()?"s":"")+"] LT"},lastDay:function(){return"[ayer a la"+(1!==this.hours()?"s":"")+"] LT"},lastWeek:function(){return"[el] dddd [pasado a la"+(1!==this.hours()?"s":"")+"] LT"},sameElse:"L"},relativeTime:{future:"en %s",past:"hace %s",s:"unos segundos",ss:"%d segundos",m:"un minuto",mm:"%d minutos",h:"una hora",hh:"%d horas",d:"un d\xeda",dd:"%d d\xedas",w:"una semana",ww:"%d semanas",M:"un mes",MM:"%d meses",y:"un a\xf1o",yy:"%d a\xf1os"},dayOfMonthOrdinalParse:/\d{1,2}\xba/,ordinal:"%d\xba",week:{dow:1,doy:4}});var Gs="ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.".split("_"),Vs="ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic".split("_"),Bs=[/^ene/i,/^feb/i,/^mar/i,/^abr/i,/^may/i,/^jun/i,/^jul/i,/^ago/i,/^sep/i,/^oct/i,/^nov/i,/^dic/i],Ks=/^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i;M.defineLocale("es-mx",{months:"enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"),monthsShort:function(e,a){return e?/-MMM-/.test(a)?Vs[e.month()]:Gs[e.month()]:Gs},monthsRegex:Ks,monthsShortRegex:Ks,monthsStrictRegex:/^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i,monthsShortStrictRegex:/^(ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,monthsParse:Bs,longMonthsParse:Bs,shortMonthsParse:Bs,weekdays:"domingo_lunes_martes_mi\xe9rcoles_jueves_viernes_s\xe1bado".split("_"),weekdaysShort:"dom._lun._mar._mi\xe9._jue._vie._s\xe1b.".split("_"),weekdaysMin:"do_lu_ma_mi_ju_vi_s\xe1".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY H:mm",LLLL:"dddd, D [de] MMMM [de] YYYY H:mm"},calendar:{sameDay:function(){return"[hoy a la"+(1!==this.hours()?"s":"")+"] LT"},nextDay:function(){return"[ma\xf1ana a la"+(1!==this.hours()?"s":"")+"] LT"},nextWeek:function(){return"dddd [a la"+(1!==this.hours()?"s":"")+"] LT"},lastDay:function(){return"[ayer a la"+(1!==this.hours()?"s":"")+"] LT"},lastWeek:function(){return"[el] dddd [pasado a la"+(1!==this.hours()?"s":"")+"] LT"},sameElse:"L"},relativeTime:{future:"en %s",past:"hace %s",s:"unos segundos",ss:"%d segundos",m:"un minuto",mm:"%d minutos",h:"una hora",hh:"%d horas",d:"un d\xeda",dd:"%d d\xedas",w:"una semana",ww:"%d semanas",M:"un mes",MM:"%d meses",y:"un a\xf1o",yy:"%d a\xf1os"},dayOfMonthOrdinalParse:/\d{1,2}\xba/,ordinal:"%d\xba",week:{dow:0,doy:4},invalidDate:"Fecha inv\xe1lida"});var qs="ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.".split("_"),Zs="ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic".split("_"),$s=[/^ene/i,/^feb/i,/^mar/i,/^abr/i,/^may/i,/^jun/i,/^jul/i,/^ago/i,/^sep/i,/^oct/i,/^nov/i,/^dic/i],Qs=/^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i;M.defineLocale("es-us",{months:"enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"),monthsShort:function(e,a){return e?/-MMM-/.test(a)?Zs[e.month()]:qs[e.month()]:qs},monthsRegex:Qs,monthsShortRegex:Qs,monthsStrictRegex:/^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i,monthsShortStrictRegex:/^(ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,monthsParse:$s,longMonthsParse:$s,shortMonthsParse:$s,weekdays:"domingo_lunes_martes_mi\xe9rcoles_jueves_viernes_s\xe1bado".split("_"),weekdaysShort:"dom._lun._mar._mi\xe9._jue._vie._s\xe1b.".split("_"),weekdaysMin:"do_lu_ma_mi_ju_vi_s\xe1".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"MM/DD/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY h:mm A",LLLL:"dddd, D [de] MMMM [de] YYYY h:mm A"},calendar:{sameDay:function(){return"[hoy a la"+(1!==this.hours()?"s":"")+"] LT"},nextDay:function(){return"[ma\xf1ana a la"+(1!==this.hours()?"s":"")+"] LT"},nextWeek:function(){return"dddd [a la"+(1!==this.hours()?"s":"")+"] LT"},lastDay:function(){return"[ayer a la"+(1!==this.hours()?"s":"")+"] LT"},lastWeek:function(){return"[el] dddd [pasado a la"+(1!==this.hours()?"s":"")+"] LT"},sameElse:"L"},relativeTime:{future:"en %s",past:"hace %s",s:"unos segundos",ss:"%d segundos",m:"un minuto",mm:"%d minutos",h:"una hora",hh:"%d horas",d:"un d\xeda",dd:"%d d\xedas",w:"una semana",ww:"%d semanas",M:"un mes",MM:"%d meses",y:"un a\xf1o",yy:"%d a\xf1os"},dayOfMonthOrdinalParse:/\d{1,2}\xba/,ordinal:"%d\xba",week:{dow:0,doy:6}});var Xs="ene._feb._mar._abr._may._jun._jul._ago._sep._oct._nov._dic.".split("_"),en="ene_feb_mar_abr_may_jun_jul_ago_sep_oct_nov_dic".split("_"),an=[/^ene/i,/^feb/i,/^mar/i,/^abr/i,/^may/i,/^jun/i,/^jul/i,/^ago/i,/^sep/i,/^oct/i,/^nov/i,/^dic/i],tn=/^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre|ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i;function sn(e,a,t,s){var n={s:["m\xf5ne sekundi","m\xf5ni sekund","paar sekundit"],ss:[e+"sekundi",e+"sekundit"],m:["\xfche minuti","\xfcks minut"],mm:[e+" minuti",e+" minutit"],h:["\xfche tunni","tund aega","\xfcks tund"],hh:[e+" tunni",e+" tundi"],d:["\xfche p\xe4eva","\xfcks p\xe4ev"],M:["kuu aja","kuu aega","\xfcks kuu"],MM:[e+" kuu",e+" kuud"],y:["\xfche aasta","aasta","\xfcks aasta"],yy:[e+" aasta",e+" aastat"]};return a?n[t][2]?n[t][2]:n[t][1]:s?n[t][0]:n[t][1]}M.defineLocale("es",{months:"enero_febrero_marzo_abril_mayo_junio_julio_agosto_septiembre_octubre_noviembre_diciembre".split("_"),monthsShort:function(e,a){return e?/-MMM-/.test(a)?en[e.month()]:Xs[e.month()]:Xs},monthsRegex:tn,monthsShortRegex:tn,monthsStrictRegex:/^(enero|febrero|marzo|abril|mayo|junio|julio|agosto|septiembre|octubre|noviembre|diciembre)/i,monthsShortStrictRegex:/^(ene\.?|feb\.?|mar\.?|abr\.?|may\.?|jun\.?|jul\.?|ago\.?|sep\.?|oct\.?|nov\.?|dic\.?)/i,monthsParse:an,longMonthsParse:an,shortMonthsParse:an,weekdays:"domingo_lunes_martes_mi\xe9rcoles_jueves_viernes_s\xe1bado".split("_"),weekdaysShort:"dom._lun._mar._mi\xe9._jue._vie._s\xe1b.".split("_"),weekdaysMin:"do_lu_ma_mi_ju_vi_s\xe1".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY H:mm",LLLL:"dddd, D [de] MMMM [de] YYYY H:mm"},calendar:{sameDay:function(){return"[hoy a la"+(1!==this.hours()?"s":"")+"] LT"},nextDay:function(){return"[ma\xf1ana a la"+(1!==this.hours()?"s":"")+"] LT"},nextWeek:function(){return"dddd [a la"+(1!==this.hours()?"s":"")+"] LT"},lastDay:function(){return"[ayer a la"+(1!==this.hours()?"s":"")+"] LT"},lastWeek:function(){return"[el] dddd [pasado a la"+(1!==this.hours()?"s":"")+"] LT"},sameElse:"L"},relativeTime:{future:"en %s",past:"hace %s",s:"unos segundos",ss:"%d segundos",m:"un minuto",mm:"%d minutos",h:"una hora",hh:"%d horas",d:"un d\xeda",dd:"%d d\xedas",w:"una semana",ww:"%d semanas",M:"un mes",MM:"%d meses",y:"un a\xf1o",yy:"%d a\xf1os"},dayOfMonthOrdinalParse:/\d{1,2}\xba/,ordinal:"%d\xba",week:{dow:1,doy:4},invalidDate:"Fecha inv\xe1lida"}),M.defineLocale("et",{months:"jaanuar_veebruar_m\xe4rts_aprill_mai_juuni_juuli_august_september_oktoober_november_detsember".split("_"),monthsShort:"jaan_veebr_m\xe4rts_apr_mai_juuni_juuli_aug_sept_okt_nov_dets".split("_"),weekdays:"p\xfchap\xe4ev_esmasp\xe4ev_teisip\xe4ev_kolmap\xe4ev_neljap\xe4ev_reede_laup\xe4ev".split("_"),weekdaysShort:"P_E_T_K_N_R_L".split("_"),weekdaysMin:"P_E_T_K_N_R_L".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm"},calendar:{sameDay:"[T\xe4na,] LT",nextDay:"[Homme,] LT",nextWeek:"[J\xe4rgmine] dddd LT",lastDay:"[Eile,] LT",lastWeek:"[Eelmine] dddd LT",sameElse:"L"},relativeTime:{future:"%s p\xe4rast",past:"%s tagasi",s:sn,ss:sn,m:sn,mm:sn,h:sn,hh:sn,d:sn,dd:"%d p\xe4eva",M:sn,MM:sn,y:sn,yy:sn},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),M.defineLocale("eu",{months:"urtarrila_otsaila_martxoa_apirila_maiatza_ekaina_uztaila_abuztua_iraila_urria_azaroa_abendua".split("_"),monthsShort:"urt._ots._mar._api._mai._eka._uzt._abu._ira._urr._aza._abe.".split("_"),monthsParseExact:!0,weekdays:"igandea_astelehena_asteartea_asteazkena_osteguna_ostirala_larunbata".split("_"),weekdaysShort:"ig._al._ar._az._og._ol._lr.".split("_"),weekdaysMin:"ig_al_ar_az_og_ol_lr".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"YYYY[ko] MMMM[ren] D[a]",LLL:"YYYY[ko] MMMM[ren] D[a] HH:mm",LLLL:"dddd, YYYY[ko] MMMM[ren] D[a] HH:mm",l:"YYYY-M-D",ll:"YYYY[ko] MMM D[a]",lll:"YYYY[ko] MMM D[a] HH:mm",llll:"ddd, YYYY[ko] MMM D[a] HH:mm"},calendar:{sameDay:"[gaur] LT[etan]",nextDay:"[bihar] LT[etan]",nextWeek:"dddd LT[etan]",lastDay:"[atzo] LT[etan]",lastWeek:"[aurreko] dddd LT[etan]",sameElse:"L"},relativeTime:{future:"%s barru",past:"duela %s",s:"segundo batzuk",ss:"%d segundo",m:"minutu bat",mm:"%d minutu",h:"ordu bat",hh:"%d ordu",d:"egun bat",dd:"%d egun",M:"hilabete bat",MM:"%d hilabete",y:"urte bat",yy:"%d urte"},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}});var nn={1:"\u06f1",2:"\u06f2",3:"\u06f3",4:"\u06f4",5:"\u06f5",6:"\u06f6",7:"\u06f7",8:"\u06f8",9:"\u06f9",0:"\u06f0"},rn={"\u06f1":"1","\u06f2":"2","\u06f3":"3","\u06f4":"4","\u06f5":"5","\u06f6":"6","\u06f7":"7","\u06f8":"8","\u06f9":"9","\u06f0":"0"};M.defineLocale("fa",{months:"\u0698\u0627\u0646\u0648\u06cc\u0647_\u0641\u0648\u0631\u06cc\u0647_\u0645\u0627\u0631\u0633_\u0622\u0648\u0631\u06cc\u0644_\u0645\u0647_\u0698\u0648\u0626\u0646_\u0698\u0648\u0626\u06cc\u0647_\u0627\u0648\u062a_\u0633\u067e\u062a\u0627\u0645\u0628\u0631_\u0627\u06a9\u062a\u0628\u0631_\u0646\u0648\u0627\u0645\u0628\u0631_\u062f\u0633\u0627\u0645\u0628\u0631".split("_"),monthsShort:"\u0698\u0627\u0646\u0648\u06cc\u0647_\u0641\u0648\u0631\u06cc\u0647_\u0645\u0627\u0631\u0633_\u0622\u0648\u0631\u06cc\u0644_\u0645\u0647_\u0698\u0648\u0626\u0646_\u0698\u0648\u0626\u06cc\u0647_\u0627\u0648\u062a_\u0633\u067e\u062a\u0627\u0645\u0628\u0631_\u0627\u06a9\u062a\u0628\u0631_\u0646\u0648\u0627\u0645\u0628\u0631_\u062f\u0633\u0627\u0645\u0628\u0631".split("_"),weekdays:"\u06cc\u06a9\u200c\u0634\u0646\u0628\u0647_\u062f\u0648\u0634\u0646\u0628\u0647_\u0633\u0647\u200c\u0634\u0646\u0628\u0647_\u0686\u0647\u0627\u0631\u0634\u0646\u0628\u0647_\u067e\u0646\u062c\u200c\u0634\u0646\u0628\u0647_\u062c\u0645\u0639\u0647_\u0634\u0646\u0628\u0647".split("_"),weekdaysShort:"\u06cc\u06a9\u200c\u0634\u0646\u0628\u0647_\u062f\u0648\u0634\u0646\u0628\u0647_\u0633\u0647\u200c\u0634\u0646\u0628\u0647_\u0686\u0647\u0627\u0631\u0634\u0646\u0628\u0647_\u067e\u0646\u062c\u200c\u0634\u0646\u0628\u0647_\u062c\u0645\u0639\u0647_\u0634\u0646\u0628\u0647".split("_"),weekdaysMin:"\u06cc_\u062f_\u0633_\u0686_\u067e_\u062c_\u0634".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},meridiemParse:/\u0642\u0628\u0644 \u0627\u0632 \u0638\u0647\u0631|\u0628\u0639\u062f \u0627\u0632 \u0638\u0647\u0631/,isPM:function(e){return/\u0628\u0639\u062f \u0627\u0632 \u0638\u0647\u0631/.test(e)},meridiem:function(e,a,t){return e<12?"\u0642\u0628\u0644 \u0627\u0632 \u0638\u0647\u0631":"\u0628\u0639\u062f \u0627\u0632 \u0638\u0647\u0631"},calendar:{sameDay:"[\u0627\u0645\u0631\u0648\u0632 \u0633\u0627\u0639\u062a] LT",nextDay:"[\u0641\u0631\u062f\u0627 \u0633\u0627\u0639\u062a] LT",nextWeek:"dddd [\u0633\u0627\u0639\u062a] LT",lastDay:"[\u062f\u06cc\u0631\u0648\u0632 \u0633\u0627\u0639\u062a] LT",lastWeek:"dddd [\u067e\u06cc\u0634] [\u0633\u0627\u0639\u062a] LT",sameElse:"L"},relativeTime:{future:"\u062f\u0631 %s",past:"%s \u067e\u06cc\u0634",s:"\u0686\u0646\u062f \u062b\u0627\u0646\u06cc\u0647",ss:"%d \u062b\u0627\u0646\u06cc\u0647",m:"\u06cc\u06a9 \u062f\u0642\u06cc\u0642\u0647",mm:"%d \u062f\u0642\u06cc\u0642\u0647",h:"\u06cc\u06a9 \u0633\u0627\u0639\u062a",hh:"%d \u0633\u0627\u0639\u062a",d:"\u06cc\u06a9 \u0631\u0648\u0632",dd:"%d \u0631\u0648\u0632",M:"\u06cc\u06a9 \u0645\u0627\u0647",MM:"%d \u0645\u0627\u0647",y:"\u06cc\u06a9 \u0633\u0627\u0644",yy:"%d \u0633\u0627\u0644"},preparse:function(e){return e.replace(/[\u06f0-\u06f9]/g,function(e){return rn[e]}).replace(/\u060c/g,",")},postformat:function(e){return e.replace(/\d/g,function(e){return nn[e]}).replace(/,/g,"\u060c")},dayOfMonthOrdinalParse:/\d{1,2}\u0645/,ordinal:"%d\u0645",week:{dow:6,doy:12}});var dn="nolla yksi kaksi kolme nelj\xe4 viisi kuusi seitsem\xe4n kahdeksan yhdeks\xe4n".split(" "),_n=["nolla","yhden","kahden","kolmen","nelj\xe4n","viiden","kuuden",dn[7],dn[8],dn[9]];function on(e,a,t,s){var n,r,d="";switch(t){case"s":return s?"muutaman sekunnin":"muutama sekunti";case"ss":d=s?"sekunnin":"sekuntia";break;case"m":return s?"minuutin":"minuutti";case"mm":d=s?"minuutin":"minuuttia";break;case"h":return s?"tunnin":"tunti";case"hh":d=s?"tunnin":"tuntia";break;case"d":return s?"p\xe4iv\xe4n":"p\xe4iv\xe4";case"dd":d=s?"p\xe4iv\xe4n":"p\xe4iv\xe4\xe4";break;case"M":return s?"kuukauden":"kuukausi";case"MM":d=s?"kuukauden":"kuukautta";break;case"y":return s?"vuoden":"vuosi";case"yy":d=s?"vuoden":"vuotta";break}return r=s,d=((n=e)<10?r?_n[n]:dn[n]:n)+" "+d}M.defineLocale("fi",{months:"tammikuu_helmikuu_maaliskuu_huhtikuu_toukokuu_kes\xe4kuu_hein\xe4kuu_elokuu_syyskuu_lokakuu_marraskuu_joulukuu".split("_"),monthsShort:"tammi_helmi_maalis_huhti_touko_kes\xe4_hein\xe4_elo_syys_loka_marras_joulu".split("_"),weekdays:"sunnuntai_maanantai_tiistai_keskiviikko_torstai_perjantai_lauantai".split("_"),weekdaysShort:"su_ma_ti_ke_to_pe_la".split("_"),weekdaysMin:"su_ma_ti_ke_to_pe_la".split("_"),longDateFormat:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD.MM.YYYY",LL:"Do MMMM[ta] YYYY",LLL:"Do MMMM[ta] YYYY, [klo] HH.mm",LLLL:"dddd, Do MMMM[ta] YYYY, [klo] HH.mm",l:"D.M.YYYY",ll:"Do MMM YYYY",lll:"Do MMM YYYY, [klo] HH.mm",llll:"ddd, Do MMM YYYY, [klo] HH.mm"},calendar:{sameDay:"[t\xe4n\xe4\xe4n] [klo] LT",nextDay:"[huomenna] [klo] LT",nextWeek:"dddd [klo] LT",lastDay:"[eilen] [klo] LT",lastWeek:"[viime] dddd[na] [klo] LT",sameElse:"L"},relativeTime:{future:"%s p\xe4\xe4st\xe4",past:"%s sitten",s:on,ss:on,m:on,mm:on,h:on,hh:on,d:on,dd:on,M:on,MM:on,y:on,yy:on},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),M.defineLocale("fil",{months:"Enero_Pebrero_Marso_Abril_Mayo_Hunyo_Hulyo_Agosto_Setyembre_Oktubre_Nobyembre_Disyembre".split("_"),monthsShort:"Ene_Peb_Mar_Abr_May_Hun_Hul_Ago_Set_Okt_Nob_Dis".split("_"),weekdays:"Linggo_Lunes_Martes_Miyerkules_Huwebes_Biyernes_Sabado".split("_"),weekdaysShort:"Lin_Lun_Mar_Miy_Huw_Biy_Sab".split("_"),weekdaysMin:"Li_Lu_Ma_Mi_Hu_Bi_Sab".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"MM/D/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY HH:mm",LLLL:"dddd, MMMM DD, YYYY HH:mm"},calendar:{sameDay:"LT [ngayong araw]",nextDay:"[Bukas ng] LT",nextWeek:"LT [sa susunod na] dddd",lastDay:"LT [kahapon]",lastWeek:"LT [noong nakaraang] dddd",sameElse:"L"},relativeTime:{future:"sa loob ng %s",past:"%s ang nakalipas",s:"ilang segundo",ss:"%d segundo",m:"isang minuto",mm:"%d minuto",h:"isang oras",hh:"%d oras",d:"isang araw",dd:"%d araw",M:"isang buwan",MM:"%d buwan",y:"isang taon",yy:"%d taon"},dayOfMonthOrdinalParse:/\d{1,2}/,ordinal:function(e){return e},week:{dow:1,doy:4}}),M.defineLocale("fo",{months:"januar_februar_mars_apr\xedl_mai_juni_juli_august_september_oktober_november_desember".split("_"),monthsShort:"jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_"),weekdays:"sunnudagur_m\xe1nadagur_t\xfdsdagur_mikudagur_h\xf3sdagur_fr\xedggjadagur_leygardagur".split("_"),weekdaysShort:"sun_m\xe1n_t\xfds_mik_h\xf3s_fr\xed_ley".split("_"),weekdaysMin:"su_m\xe1_t\xfd_mi_h\xf3_fr_le".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D. MMMM, YYYY HH:mm"},calendar:{sameDay:"[\xcd dag kl.] LT",nextDay:"[\xcd morgin kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[\xcd gj\xe1r kl.] LT",lastWeek:"[s\xed\xf0stu] dddd [kl] LT",sameElse:"L"},relativeTime:{future:"um %s",past:"%s s\xed\xf0ani",s:"f\xe1 sekund",ss:"%d sekundir",m:"ein minuttur",mm:"%d minuttir",h:"ein t\xedmi",hh:"%d t\xedmar",d:"ein dagur",dd:"%d dagar",M:"ein m\xe1na\xf0ur",MM:"%d m\xe1na\xf0ir",y:"eitt \xe1r",yy:"%d \xe1r"},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),M.defineLocale("fr-ca",{months:"janvier_f\xe9vrier_mars_avril_mai_juin_juillet_ao\xfbt_septembre_octobre_novembre_d\xe9cembre".split("_"),monthsShort:"janv._f\xe9vr._mars_avr._mai_juin_juil._ao\xfbt_sept._oct._nov._d\xe9c.".split("_"),monthsParseExact:!0,weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),weekdaysMin:"di_lu_ma_me_je_ve_sa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[Aujourd\u2019hui \xe0] LT",nextDay:"[Demain \xe0] LT",nextWeek:"dddd [\xe0] LT",lastDay:"[Hier \xe0] LT",lastWeek:"dddd [dernier \xe0] LT",sameElse:"L"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",ss:"%d secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"},dayOfMonthOrdinalParse:/\d{1,2}(er|e)/,ordinal:function(e,a){switch(a){default:case"M":case"Q":case"D":case"DDD":case"d":return e+(1===e?"er":"e");case"w":case"W":return e+(1===e?"re":"e")}}}),M.defineLocale("fr-ch",{months:"janvier_f\xe9vrier_mars_avril_mai_juin_juillet_ao\xfbt_septembre_octobre_novembre_d\xe9cembre".split("_"),monthsShort:"janv._f\xe9vr._mars_avr._mai_juin_juil._ao\xfbt_sept._oct._nov._d\xe9c.".split("_"),monthsParseExact:!0,weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),weekdaysMin:"di_lu_ma_me_je_ve_sa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[Aujourd\u2019hui \xe0] LT",nextDay:"[Demain \xe0] LT",nextWeek:"dddd [\xe0] LT",lastDay:"[Hier \xe0] LT",lastWeek:"dddd [dernier \xe0] LT",sameElse:"L"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",ss:"%d secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"},dayOfMonthOrdinalParse:/\d{1,2}(er|e)/,ordinal:function(e,a){switch(a){default:case"M":case"Q":case"D":case"DDD":case"d":return e+(1===e?"er":"e");case"w":case"W":return e+(1===e?"re":"e")}},week:{dow:1,doy:4}});var mn=/(janv\.?|f\xe9vr\.?|mars|avr\.?|mai|juin|juil\.?|ao\xfbt|sept\.?|oct\.?|nov\.?|d\xe9c\.?|janvier|f\xe9vrier|mars|avril|mai|juin|juillet|ao\xfbt|septembre|octobre|novembre|d\xe9cembre)/i,un=[/^janv/i,/^f\xe9vr/i,/^mars/i,/^avr/i,/^mai/i,/^juin/i,/^juil/i,/^ao\xfbt/i,/^sept/i,/^oct/i,/^nov/i,/^d\xe9c/i];M.defineLocale("fr",{months:"janvier_f\xe9vrier_mars_avril_mai_juin_juillet_ao\xfbt_septembre_octobre_novembre_d\xe9cembre".split("_"),monthsShort:"janv._f\xe9vr._mars_avr._mai_juin_juil._ao\xfbt_sept._oct._nov._d\xe9c.".split("_"),monthsRegex:mn,monthsShortRegex:mn,monthsStrictRegex:/^(janvier|f\xe9vrier|mars|avril|mai|juin|juillet|ao\xfbt|septembre|octobre|novembre|d\xe9cembre)/i,monthsShortStrictRegex:/(janv\.?|f\xe9vr\.?|mars|avr\.?|mai|juin|juil\.?|ao\xfbt|sept\.?|oct\.?|nov\.?|d\xe9c\.?)/i,monthsParse:un,longMonthsParse:un,shortMonthsParse:un,weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),weekdaysMin:"di_lu_ma_me_je_ve_sa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[Aujourd\u2019hui \xe0] LT",nextDay:"[Demain \xe0] LT",nextWeek:"dddd [\xe0] LT",lastDay:"[Hier \xe0] LT",lastWeek:"dddd [dernier \xe0] LT",sameElse:"L"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",ss:"%d secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",w:"une semaine",ww:"%d semaines",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"},dayOfMonthOrdinalParse:/\d{1,2}(er|)/,ordinal:function(e,a){switch(a){case"D":return e+(1===e?"er":"");default:case"M":case"Q":case"DDD":case"d":return e+(1===e?"er":"e");case"w":case"W":return e+(1===e?"re":"e")}},week:{dow:1,doy:4}});var ln="jan._feb._mrt._apr._mai_jun._jul._aug._sep._okt._nov._des.".split("_"),Mn="jan_feb_mrt_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_");M.defineLocale("fy",{months:"jannewaris_febrewaris_maart_april_maaie_juny_july_augustus_septimber_oktober_novimber_desimber".split("_"),monthsShort:function(e,a){return e?/-MMM-/.test(a)?Mn[e.month()]:ln[e.month()]:ln},monthsParseExact:!0,weekdays:"snein_moandei_tiisdei_woansdei_tongersdei_freed_sneon".split("_"),weekdaysShort:"si._mo._ti._wo._to._fr._so.".split("_"),weekdaysMin:"Si_Mo_Ti_Wo_To_Fr_So".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD-MM-YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[hjoed om] LT",nextDay:"[moarn om] LT",nextWeek:"dddd [om] LT",lastDay:"[juster om] LT",lastWeek:"[\xf4fr\xfbne] dddd [om] LT",sameElse:"L"},relativeTime:{future:"oer %s",past:"%s lyn",s:"in pear sekonden",ss:"%d sekonden",m:"ien min\xfat",mm:"%d minuten",h:"ien oere",hh:"%d oeren",d:"ien dei",dd:"%d dagen",M:"ien moanne",MM:"%d moannen",y:"ien jier",yy:"%d jierren"},dayOfMonthOrdinalParse:/\d{1,2}(ste|de)/,ordinal:function(e){return e+(1===e||8===e||20<=e?"ste":"de")},week:{dow:1,doy:4}});M.defineLocale("ga",{months:["Ean\xe1ir","Feabhra","M\xe1rta","Aibre\xe1n","Bealtaine","Meitheamh","I\xfail","L\xfanasa","Me\xe1n F\xf3mhair","Deireadh F\xf3mhair","Samhain","Nollaig"],monthsShort:["Ean","Feabh","M\xe1rt","Aib","Beal","Meith","I\xfail","L\xfan","M.F.","D.F.","Samh","Noll"],monthsParseExact:!0,weekdays:["D\xe9 Domhnaigh","D\xe9 Luain","D\xe9 M\xe1irt","D\xe9 C\xe9adaoin","D\xe9ardaoin","D\xe9 hAoine","D\xe9 Sathairn"],weekdaysShort:["Domh","Luan","M\xe1irt","C\xe9ad","D\xe9ar","Aoine","Sath"],weekdaysMin:["Do","Lu","M\xe1","C\xe9","D\xe9","A","Sa"],longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Inniu ag] LT",nextDay:"[Am\xe1rach ag] LT",nextWeek:"dddd [ag] LT",lastDay:"[Inn\xe9 ag] LT",lastWeek:"dddd [seo caite] [ag] LT",sameElse:"L"},relativeTime:{future:"i %s",past:"%s \xf3 shin",s:"c\xfapla soicind",ss:"%d soicind",m:"n\xf3im\xe9ad",mm:"%d n\xf3im\xe9ad",h:"uair an chloig",hh:"%d uair an chloig",d:"l\xe1",dd:"%d l\xe1",M:"m\xed",MM:"%d m\xedonna",y:"bliain",yy:"%d bliain"},dayOfMonthOrdinalParse:/\d{1,2}(d|na|mh)/,ordinal:function(e){return e+(1===e?"d":e%10==2?"na":"mh")},week:{dow:1,doy:4}});function hn(e,a,t,s){var n={s:["\u0925\u094b\u0921\u092f\u093e \u0938\u0945\u0915\u0902\u0921\u093e\u0902\u0928\u0940","\u0925\u094b\u0921\u0947 \u0938\u0945\u0915\u0902\u0921"],ss:[e+" \u0938\u0945\u0915\u0902\u0921\u093e\u0902\u0928\u0940",e+" \u0938\u0945\u0915\u0902\u0921"],m:["\u090f\u0915\u093e \u092e\u093f\u0923\u091f\u093e\u0928","\u090f\u0915 \u092e\u093f\u0928\u0942\u091f"],mm:[e+" \u092e\u093f\u0923\u091f\u093e\u0902\u0928\u0940",e+" \u092e\u093f\u0923\u091f\u093e\u0902"],h:["\u090f\u0915\u093e \u0935\u0930\u093e\u0928","\u090f\u0915 \u0935\u0930"],hh:[e+" \u0935\u0930\u093e\u0902\u0928\u0940",e+" \u0935\u0930\u093e\u0902"],d:["\u090f\u0915\u093e \u0926\u093f\u0938\u093e\u0928","\u090f\u0915 \u0926\u0940\u0938"],dd:[e+" \u0926\u093f\u0938\u093e\u0902\u0928\u0940",e+" \u0926\u0940\u0938"],M:["\u090f\u0915\u093e \u092e\u094d\u0939\u092f\u0928\u094d\u092f\u093e\u0928","\u090f\u0915 \u092e\u094d\u0939\u092f\u0928\u094b"],MM:[e+" \u092e\u094d\u0939\u092f\u0928\u094d\u092f\u093e\u0928\u0940",e+" \u092e\u094d\u0939\u092f\u0928\u0947"],y:["\u090f\u0915\u093e \u0935\u0930\u094d\u0938\u093e\u0928","\u090f\u0915 \u0935\u0930\u094d\u0938"],yy:[e+" \u0935\u0930\u094d\u0938\u093e\u0902\u0928\u0940",e+" \u0935\u0930\u094d\u0938\u093e\u0902"]};return s?n[t][0]:n[t][1]}function cn(e,a,t,s){var n={s:["thoddea sekondamni","thodde sekond"],ss:[e+" sekondamni",e+" sekond"],m:["eka mintan","ek minut"],mm:[e+" mintamni",e+" mintam"],h:["eka voran","ek vor"],hh:[e+" voramni",e+" voram"],d:["eka disan","ek dis"],dd:[e+" disamni",e+" dis"],M:["eka mhoinean","ek mhoino"],MM:[e+" mhoineamni",e+" mhoine"],y:["eka vorsan","ek voros"],yy:[e+" vorsamni",e+" vorsam"]};return s?n[t][0]:n[t][1]}M.defineLocale("gd",{months:["Am Faoilleach","An Gearran","Am M\xe0rt","An Giblean","An C\xe8itean","An t-\xd2gmhios","An t-Iuchar","An L\xf9nastal","An t-Sultain","An D\xe0mhair","An t-Samhain","An D\xf9bhlachd"],monthsShort:["Faoi","Gear","M\xe0rt","Gibl","C\xe8it","\xd2gmh","Iuch","L\xf9n","Sult","D\xe0mh","Samh","D\xf9bh"],monthsParseExact:!0,weekdays:["Did\xf2mhnaich","Diluain","Dim\xe0irt","Diciadain","Diardaoin","Dihaoine","Disathairne"],weekdaysShort:["Did","Dil","Dim","Dic","Dia","Dih","Dis"],weekdaysMin:["D\xf2","Lu","M\xe0","Ci","Ar","Ha","Sa"],longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[An-diugh aig] LT",nextDay:"[A-m\xe0ireach aig] LT",nextWeek:"dddd [aig] LT",lastDay:"[An-d\xe8 aig] LT",lastWeek:"dddd [seo chaidh] [aig] LT",sameElse:"L"},relativeTime:{future:"ann an %s",past:"bho chionn %s",s:"beagan diogan",ss:"%d diogan",m:"mionaid",mm:"%d mionaidean",h:"uair",hh:"%d uairean",d:"latha",dd:"%d latha",M:"m\xecos",MM:"%d m\xecosan",y:"bliadhna",yy:"%d bliadhna"},dayOfMonthOrdinalParse:/\d{1,2}(d|na|mh)/,ordinal:function(e){return e+(1===e?"d":e%10==2?"na":"mh")},week:{dow:1,doy:4}}),M.defineLocale("gl",{months:"xaneiro_febreiro_marzo_abril_maio_xu\xf1o_xullo_agosto_setembro_outubro_novembro_decembro".split("_"),monthsShort:"xan._feb._mar._abr._mai._xu\xf1._xul._ago._set._out._nov._dec.".split("_"),monthsParseExact:!0,weekdays:"domingo_luns_martes_m\xe9rcores_xoves_venres_s\xe1bado".split("_"),weekdaysShort:"dom._lun._mar._m\xe9r._xov._ven._s\xe1b.".split("_"),weekdaysMin:"do_lu_ma_m\xe9_xo_ve_s\xe1".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY H:mm",LLLL:"dddd, D [de] MMMM [de] YYYY H:mm"},calendar:{sameDay:function(){return"[hoxe "+(1!==this.hours()?"\xe1s":"\xe1")+"] LT"},nextDay:function(){return"[ma\xf1\xe1 "+(1!==this.hours()?"\xe1s":"\xe1")+"] LT"},nextWeek:function(){return"dddd ["+(1!==this.hours()?"\xe1s":"a")+"] LT"},lastDay:function(){return"[onte "+(1!==this.hours()?"\xe1":"a")+"] LT"},lastWeek:function(){return"[o] dddd [pasado "+(1!==this.hours()?"\xe1s":"a")+"] LT"},sameElse:"L"},relativeTime:{future:function(e){return 0===e.indexOf("un")?"n"+e:"en "+e},past:"hai %s",s:"uns segundos",ss:"%d segundos",m:"un minuto",mm:"%d minutos",h:"unha hora",hh:"%d horas",d:"un d\xeda",dd:"%d d\xedas",M:"un mes",MM:"%d meses",y:"un ano",yy:"%d anos"},dayOfMonthOrdinalParse:/\d{1,2}\xba/,ordinal:"%d\xba",week:{dow:1,doy:4}}),M.defineLocale("gom-deva",{months:{standalone:"\u091c\u093e\u0928\u0947\u0935\u093e\u0930\u0940_\u092b\u0947\u092c\u094d\u0930\u0941\u0935\u093e\u0930\u0940_\u092e\u093e\u0930\u094d\u091a_\u090f\u092a\u094d\u0930\u0940\u0932_\u092e\u0947_\u091c\u0942\u0928_\u091c\u0941\u0932\u092f_\u0911\u0917\u0938\u094d\u091f_\u0938\u092a\u094d\u091f\u0947\u0902\u092c\u0930_\u0911\u0915\u094d\u091f\u094b\u092c\u0930_\u0928\u094b\u0935\u094d\u0939\u0947\u0902\u092c\u0930_\u0921\u093f\u0938\u0947\u0902\u092c\u0930".split("_"),format:"\u091c\u093e\u0928\u0947\u0935\u093e\u0930\u0940\u091a\u094d\u092f\u093e_\u092b\u0947\u092c\u094d\u0930\u0941\u0935\u093e\u0930\u0940\u091a\u094d\u092f\u093e_\u092e\u093e\u0930\u094d\u091a\u093e\u091a\u094d\u092f\u093e_\u090f\u092a\u094d\u0930\u0940\u0932\u093e\u091a\u094d\u092f\u093e_\u092e\u0947\u092f\u093e\u091a\u094d\u092f\u093e_\u091c\u0942\u0928\u093e\u091a\u094d\u092f\u093e_\u091c\u0941\u0932\u092f\u093e\u091a\u094d\u092f\u093e_\u0911\u0917\u0938\u094d\u091f\u093e\u091a\u094d\u092f\u093e_\u0938\u092a\u094d\u091f\u0947\u0902\u092c\u0930\u093e\u091a\u094d\u092f\u093e_\u0911\u0915\u094d\u091f\u094b\u092c\u0930\u093e\u091a\u094d\u092f\u093e_\u0928\u094b\u0935\u094d\u0939\u0947\u0902\u092c\u0930\u093e\u091a\u094d\u092f\u093e_\u0921\u093f\u0938\u0947\u0902\u092c\u0930\u093e\u091a\u094d\u092f\u093e".split("_"),isFormat:/MMMM(\s)+D[oD]?/},monthsShort:"\u091c\u093e\u0928\u0947._\u092b\u0947\u092c\u094d\u0930\u0941._\u092e\u093e\u0930\u094d\u091a_\u090f\u092a\u094d\u0930\u0940._\u092e\u0947_\u091c\u0942\u0928_\u091c\u0941\u0932._\u0911\u0917._\u0938\u092a\u094d\u091f\u0947\u0902._\u0911\u0915\u094d\u091f\u094b._\u0928\u094b\u0935\u094d\u0939\u0947\u0902._\u0921\u093f\u0938\u0947\u0902.".split("_"),monthsParseExact:!0,weekdays:"\u0906\u092f\u0924\u093e\u0930_\u0938\u094b\u092e\u093e\u0930_\u092e\u0902\u0917\u0933\u093e\u0930_\u092c\u0941\u0927\u0935\u093e\u0930_\u092c\u093f\u0930\u0947\u0938\u094d\u0924\u093e\u0930_\u0938\u0941\u0915\u094d\u0930\u093e\u0930_\u0936\u0947\u0928\u0935\u093e\u0930".split("_"),weekdaysShort:"\u0906\u092f\u0924._\u0938\u094b\u092e._\u092e\u0902\u0917\u0933._\u092c\u0941\u0927._\u092c\u094d\u0930\u0947\u0938\u094d\u0924._\u0938\u0941\u0915\u094d\u0930._\u0936\u0947\u0928.".split("_"),weekdaysMin:"\u0906_\u0938\u094b_\u092e\u0902_\u092c\u0941_\u092c\u094d\u0930\u0947_\u0938\u0941_\u0936\u0947".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"A h:mm [\u0935\u093e\u091c\u0924\u093e\u0902]",LTS:"A h:mm:ss [\u0935\u093e\u091c\u0924\u093e\u0902]",L:"DD-MM-YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY A h:mm [\u0935\u093e\u091c\u0924\u093e\u0902]",LLLL:"dddd, MMMM Do, YYYY, A h:mm [\u0935\u093e\u091c\u0924\u093e\u0902]",llll:"ddd, D MMM YYYY, A h:mm [\u0935\u093e\u091c\u0924\u093e\u0902]"},calendar:{sameDay:"[\u0906\u092f\u091c] LT",nextDay:"[\u092b\u093e\u0932\u094d\u092f\u093e\u0902] LT",nextWeek:"[\u092b\u0941\u0921\u0932\u094b] dddd[,] LT",lastDay:"[\u0915\u093e\u0932] LT",lastWeek:"[\u092b\u093e\u091f\u0932\u094b] dddd[,] LT",sameElse:"L"},relativeTime:{future:"%s",past:"%s \u0906\u0926\u0940\u0902",s:hn,ss:hn,m:hn,mm:hn,h:hn,hh:hn,d:hn,dd:hn,M:hn,MM:hn,y:hn,yy:hn},dayOfMonthOrdinalParse:/\d{1,2}(\u0935\u0947\u0930)/,ordinal:function(e,a){switch(a){case"D":return e+"\u0935\u0947\u0930";default:case"M":case"Q":case"DDD":case"d":case"w":case"W":return e}},week:{dow:0,doy:3},meridiemParse:/\u0930\u093e\u0924\u0940|\u0938\u0915\u093e\u0933\u0940\u0902|\u0926\u0928\u092a\u093e\u0930\u093e\u0902|\u0938\u093e\u0902\u091c\u0947/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u0930\u093e\u0924\u0940"===a?e<4?e:e+12:"\u0938\u0915\u093e\u0933\u0940\u0902"===a?e:"\u0926\u0928\u092a\u093e\u0930\u093e\u0902"===a?12<e?e:e+12:"\u0938\u093e\u0902\u091c\u0947"===a?e+12:void 0},meridiem:function(e,a,t){return e<4?"\u0930\u093e\u0924\u0940":e<12?"\u0938\u0915\u093e\u0933\u0940\u0902":e<16?"\u0926\u0928\u092a\u093e\u0930\u093e\u0902":e<20?"\u0938\u093e\u0902\u091c\u0947":"\u0930\u093e\u0924\u0940"}}),M.defineLocale("gom-latn",{months:{standalone:"Janer_Febrer_Mars_Abril_Mai_Jun_Julai_Agost_Setembr_Otubr_Novembr_Dezembr".split("_"),format:"Janerachea_Febrerachea_Marsachea_Abrilachea_Maiachea_Junachea_Julaiachea_Agostachea_Setembrachea_Otubrachea_Novembrachea_Dezembrachea".split("_"),isFormat:/MMMM(\s)+D[oD]?/},monthsShort:"Jan._Feb._Mars_Abr._Mai_Jun_Jul._Ago._Set._Otu._Nov._Dez.".split("_"),monthsParseExact:!0,weekdays:"Aitar_Somar_Mongllar_Budhvar_Birestar_Sukrar_Son'var".split("_"),weekdaysShort:"Ait._Som._Mon._Bud._Bre._Suk._Son.".split("_"),weekdaysMin:"Ai_Sm_Mo_Bu_Br_Su_Sn".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"A h:mm [vazta]",LTS:"A h:mm:ss [vazta]",L:"DD-MM-YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY A h:mm [vazta]",LLLL:"dddd, MMMM Do, YYYY, A h:mm [vazta]",llll:"ddd, D MMM YYYY, A h:mm [vazta]"},calendar:{sameDay:"[Aiz] LT",nextDay:"[Faleam] LT",nextWeek:"[Fuddlo] dddd[,] LT",lastDay:"[Kal] LT",lastWeek:"[Fattlo] dddd[,] LT",sameElse:"L"},relativeTime:{future:"%s",past:"%s adim",s:cn,ss:cn,m:cn,mm:cn,h:cn,hh:cn,d:cn,dd:cn,M:cn,MM:cn,y:cn,yy:cn},dayOfMonthOrdinalParse:/\d{1,2}(er)/,ordinal:function(e,a){switch(a){case"D":return e+"er";default:case"M":case"Q":case"DDD":case"d":case"w":case"W":return e}},week:{dow:0,doy:3},meridiemParse:/rati|sokallim|donparam|sanje/,meridiemHour:function(e,a){return 12===e&&(e=0),"rati"===a?e<4?e:e+12:"sokallim"===a?e:"donparam"===a?12<e?e:e+12:"sanje"===a?e+12:void 0},meridiem:function(e,a,t){return e<4?"rati":e<12?"sokallim":e<16?"donparam":e<20?"sanje":"rati"}});var Ln={1:"\u0ae7",2:"\u0ae8",3:"\u0ae9",4:"\u0aea",5:"\u0aeb",6:"\u0aec",7:"\u0aed",8:"\u0aee",9:"\u0aef",0:"\u0ae6"},Yn={"\u0ae7":"1","\u0ae8":"2","\u0ae9":"3","\u0aea":"4","\u0aeb":"5","\u0aec":"6","\u0aed":"7","\u0aee":"8","\u0aef":"9","\u0ae6":"0"};M.defineLocale("gu",{months:"\u0a9c\u0abe\u0aa8\u0acd\u0aaf\u0ac1\u0a86\u0ab0\u0ac0_\u0aab\u0ac7\u0aac\u0acd\u0ab0\u0ac1\u0a86\u0ab0\u0ac0_\u0aae\u0abe\u0ab0\u0acd\u0a9a_\u0a8f\u0aaa\u0acd\u0ab0\u0abf\u0ab2_\u0aae\u0ac7_\u0a9c\u0ac2\u0aa8_\u0a9c\u0ac1\u0ab2\u0abe\u0a88_\u0a91\u0a97\u0ab8\u0acd\u0a9f_\u0ab8\u0aaa\u0acd\u0a9f\u0ac7\u0aae\u0acd\u0aac\u0ab0_\u0a91\u0a95\u0acd\u0a9f\u0acd\u0aac\u0ab0_\u0aa8\u0ab5\u0ac7\u0aae\u0acd\u0aac\u0ab0_\u0aa1\u0abf\u0ab8\u0ac7\u0aae\u0acd\u0aac\u0ab0".split("_"),monthsShort:"\u0a9c\u0abe\u0aa8\u0acd\u0aaf\u0ac1._\u0aab\u0ac7\u0aac\u0acd\u0ab0\u0ac1._\u0aae\u0abe\u0ab0\u0acd\u0a9a_\u0a8f\u0aaa\u0acd\u0ab0\u0abf._\u0aae\u0ac7_\u0a9c\u0ac2\u0aa8_\u0a9c\u0ac1\u0ab2\u0abe._\u0a91\u0a97._\u0ab8\u0aaa\u0acd\u0a9f\u0ac7._\u0a91\u0a95\u0acd\u0a9f\u0acd._\u0aa8\u0ab5\u0ac7._\u0aa1\u0abf\u0ab8\u0ac7.".split("_"),monthsParseExact:!0,weekdays:"\u0ab0\u0ab5\u0abf\u0ab5\u0abe\u0ab0_\u0ab8\u0acb\u0aae\u0ab5\u0abe\u0ab0_\u0aae\u0a82\u0a97\u0ab3\u0ab5\u0abe\u0ab0_\u0aac\u0ac1\u0aa7\u0acd\u0ab5\u0abe\u0ab0_\u0a97\u0ac1\u0ab0\u0ac1\u0ab5\u0abe\u0ab0_\u0ab6\u0ac1\u0a95\u0acd\u0ab0\u0ab5\u0abe\u0ab0_\u0ab6\u0aa8\u0abf\u0ab5\u0abe\u0ab0".split("_"),weekdaysShort:"\u0ab0\u0ab5\u0abf_\u0ab8\u0acb\u0aae_\u0aae\u0a82\u0a97\u0ab3_\u0aac\u0ac1\u0aa7\u0acd_\u0a97\u0ac1\u0ab0\u0ac1_\u0ab6\u0ac1\u0a95\u0acd\u0ab0_\u0ab6\u0aa8\u0abf".split("_"),weekdaysMin:"\u0ab0_\u0ab8\u0acb_\u0aae\u0a82_\u0aac\u0ac1_\u0a97\u0ac1_\u0ab6\u0ac1_\u0ab6".split("_"),longDateFormat:{LT:"A h:mm \u0ab5\u0abe\u0a97\u0acd\u0aaf\u0ac7",LTS:"A h:mm:ss \u0ab5\u0abe\u0a97\u0acd\u0aaf\u0ac7",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm \u0ab5\u0abe\u0a97\u0acd\u0aaf\u0ac7",LLLL:"dddd, D MMMM YYYY, A h:mm \u0ab5\u0abe\u0a97\u0acd\u0aaf\u0ac7"},calendar:{sameDay:"[\u0a86\u0a9c] LT",nextDay:"[\u0a95\u0abe\u0ab2\u0ac7] LT",nextWeek:"dddd, LT",lastDay:"[\u0a97\u0a87\u0a95\u0abe\u0ab2\u0ac7] LT",lastWeek:"[\u0aaa\u0abe\u0a9b\u0ab2\u0abe] dddd, LT",sameElse:"L"},relativeTime:{future:"%s \u0aae\u0abe",past:"%s \u0aaa\u0ab9\u0ac7\u0ab2\u0abe",s:"\u0a85\u0aae\u0ac1\u0a95 \u0aaa\u0ab3\u0acb",ss:"%d \u0ab8\u0ac7\u0a95\u0a82\u0aa1",m:"\u0a8f\u0a95 \u0aae\u0abf\u0aa8\u0abf\u0a9f",mm:"%d \u0aae\u0abf\u0aa8\u0abf\u0a9f",h:"\u0a8f\u0a95 \u0a95\u0ab2\u0abe\u0a95",hh:"%d \u0a95\u0ab2\u0abe\u0a95",d:"\u0a8f\u0a95 \u0aa6\u0abf\u0ab5\u0ab8",dd:"%d \u0aa6\u0abf\u0ab5\u0ab8",M:"\u0a8f\u0a95 \u0aae\u0ab9\u0abf\u0aa8\u0acb",MM:"%d \u0aae\u0ab9\u0abf\u0aa8\u0acb",y:"\u0a8f\u0a95 \u0ab5\u0ab0\u0acd\u0ab7",yy:"%d \u0ab5\u0ab0\u0acd\u0ab7"},preparse:function(e){return e.replace(/[\u0ae7\u0ae8\u0ae9\u0aea\u0aeb\u0aec\u0aed\u0aee\u0aef\u0ae6]/g,function(e){return Yn[e]})},postformat:function(e){return e.replace(/\d/g,function(e){return Ln[e]})},meridiemParse:/\u0ab0\u0abe\u0aa4|\u0aac\u0aaa\u0acb\u0ab0|\u0ab8\u0ab5\u0abe\u0ab0|\u0ab8\u0abe\u0a82\u0a9c/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u0ab0\u0abe\u0aa4"===a?e<4?e:e+12:"\u0ab8\u0ab5\u0abe\u0ab0"===a?e:"\u0aac\u0aaa\u0acb\u0ab0"===a?10<=e?e:e+12:"\u0ab8\u0abe\u0a82\u0a9c"===a?e+12:void 0},meridiem:function(e,a,t){return e<4?"\u0ab0\u0abe\u0aa4":e<10?"\u0ab8\u0ab5\u0abe\u0ab0":e<17?"\u0aac\u0aaa\u0acb\u0ab0":e<20?"\u0ab8\u0abe\u0a82\u0a9c":"\u0ab0\u0abe\u0aa4"},week:{dow:0,doy:6}}),M.defineLocale("he",{months:"\u05d9\u05e0\u05d5\u05d0\u05e8_\u05e4\u05d1\u05e8\u05d5\u05d0\u05e8_\u05de\u05e8\u05e5_\u05d0\u05e4\u05e8\u05d9\u05dc_\u05de\u05d0\u05d9_\u05d9\u05d5\u05e0\u05d9_\u05d9\u05d5\u05dc\u05d9_\u05d0\u05d5\u05d2\u05d5\u05e1\u05d8_\u05e1\u05e4\u05d8\u05de\u05d1\u05e8_\u05d0\u05d5\u05e7\u05d8\u05d5\u05d1\u05e8_\u05e0\u05d5\u05d1\u05de\u05d1\u05e8_\u05d3\u05e6\u05de\u05d1\u05e8".split("_"),monthsShort:"\u05d9\u05e0\u05d5\u05f3_\u05e4\u05d1\u05e8\u05f3_\u05de\u05e8\u05e5_\u05d0\u05e4\u05e8\u05f3_\u05de\u05d0\u05d9_\u05d9\u05d5\u05e0\u05d9_\u05d9\u05d5\u05dc\u05d9_\u05d0\u05d5\u05d2\u05f3_\u05e1\u05e4\u05d8\u05f3_\u05d0\u05d5\u05e7\u05f3_\u05e0\u05d5\u05d1\u05f3_\u05d3\u05e6\u05de\u05f3".split("_"),weekdays:"\u05e8\u05d0\u05e9\u05d5\u05df_\u05e9\u05e0\u05d9_\u05e9\u05dc\u05d9\u05e9\u05d9_\u05e8\u05d1\u05d9\u05e2\u05d9_\u05d7\u05de\u05d9\u05e9\u05d9_\u05e9\u05d9\u05e9\u05d9_\u05e9\u05d1\u05ea".split("_"),weekdaysShort:"\u05d0\u05f3_\u05d1\u05f3_\u05d2\u05f3_\u05d3\u05f3_\u05d4\u05f3_\u05d5\u05f3_\u05e9\u05f3".split("_"),weekdaysMin:"\u05d0_\u05d1_\u05d2_\u05d3_\u05d4_\u05d5_\u05e9".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D [\u05d1]MMMM YYYY",LLL:"D [\u05d1]MMMM YYYY HH:mm",LLLL:"dddd, D [\u05d1]MMMM YYYY HH:mm",l:"D/M/YYYY",ll:"D MMM YYYY",lll:"D MMM YYYY HH:mm",llll:"ddd, D MMM YYYY HH:mm"},calendar:{sameDay:"[\u05d4\u05d9\u05d5\u05dd \u05d1\u05be]LT",nextDay:"[\u05de\u05d7\u05e8 \u05d1\u05be]LT",nextWeek:"dddd [\u05d1\u05e9\u05e2\u05d4] LT",lastDay:"[\u05d0\u05ea\u05de\u05d5\u05dc \u05d1\u05be]LT",lastWeek:"[\u05d1\u05d9\u05d5\u05dd] dddd [\u05d4\u05d0\u05d7\u05e8\u05d5\u05df \u05d1\u05e9\u05e2\u05d4] LT",sameElse:"L"},relativeTime:{future:"\u05d1\u05e2\u05d5\u05d3 %s",past:"\u05dc\u05e4\u05e0\u05d9 %s",s:"\u05de\u05e1\u05e4\u05e8 \u05e9\u05e0\u05d9\u05d5\u05ea",ss:"%d \u05e9\u05e0\u05d9\u05d5\u05ea",m:"\u05d3\u05e7\u05d4",mm:"%d \u05d3\u05e7\u05d5\u05ea",h:"\u05e9\u05e2\u05d4",hh:function(e){return 2===e?"\u05e9\u05e2\u05ea\u05d9\u05d9\u05dd":e+" \u05e9\u05e2\u05d5\u05ea"},d:"\u05d9\u05d5\u05dd",dd:function(e){return 2===e?"\u05d9\u05d5\u05de\u05d9\u05d9\u05dd":e+" \u05d9\u05de\u05d9\u05dd"},M:"\u05d7\u05d5\u05d3\u05e9",MM:function(e){return 2===e?"\u05d7\u05d5\u05d3\u05e9\u05d9\u05d9\u05dd":e+" \u05d7\u05d5\u05d3\u05e9\u05d9\u05dd"},y:"\u05e9\u05e0\u05d4",yy:function(e){return 2===e?"\u05e9\u05e0\u05ea\u05d9\u05d9\u05dd":e%10==0&&10!==e?e+" \u05e9\u05e0\u05d4":e+" \u05e9\u05e0\u05d9\u05dd"}},meridiemParse:/\u05d0\u05d7\u05d4"\u05e6|\u05dc\u05e4\u05e0\u05d4"\u05e6|\u05d0\u05d7\u05e8\u05d9 \u05d4\u05e6\u05d4\u05e8\u05d9\u05d9\u05dd|\u05dc\u05e4\u05e0\u05d9 \u05d4\u05e6\u05d4\u05e8\u05d9\u05d9\u05dd|\u05dc\u05e4\u05e0\u05d5\u05ea \u05d1\u05d5\u05e7\u05e8|\u05d1\u05d1\u05d5\u05e7\u05e8|\u05d1\u05e2\u05e8\u05d1/i,isPM:function(e){return/^(\u05d0\u05d7\u05d4"\u05e6|\u05d0\u05d7\u05e8\u05d9 \u05d4\u05e6\u05d4\u05e8\u05d9\u05d9\u05dd|\u05d1\u05e2\u05e8\u05d1)$/.test(e)},meridiem:function(e,a,t){return e<5?"\u05dc\u05e4\u05e0\u05d5\u05ea \u05d1\u05d5\u05e7\u05e8":e<10?"\u05d1\u05d1\u05d5\u05e7\u05e8":e<12?t?'\u05dc\u05e4\u05e0\u05d4"\u05e6':"\u05dc\u05e4\u05e0\u05d9 \u05d4\u05e6\u05d4\u05e8\u05d9\u05d9\u05dd":e<18?t?'\u05d0\u05d7\u05d4"\u05e6':"\u05d0\u05d7\u05e8\u05d9 \u05d4\u05e6\u05d4\u05e8\u05d9\u05d9\u05dd":"\u05d1\u05e2\u05e8\u05d1"}});var yn={1:"\u0967",2:"\u0968",3:"\u0969",4:"\u096a",5:"\u096b",6:"\u096c",7:"\u096d",8:"\u096e",9:"\u096f",0:"\u0966"},fn={"\u0967":"1","\u0968":"2","\u0969":"3","\u096a":"4","\u096b":"5","\u096c":"6","\u096d":"7","\u096e":"8","\u096f":"9","\u0966":"0"};function pn(e,a,t){var s=e+" ";switch(t){case"ss":return s+=1===e?"sekunda":2===e||3===e||4===e?"sekunde":"sekundi";case"m":return a?"jedna minuta":"jedne minute";case"mm":return s+=1!==e&&(2===e||3===e||4===e)?"minute":"minuta";case"h":return a?"jedan sat":"jednog sata";case"hh":return s+=1===e?"sat":2===e||3===e||4===e?"sata":"sati";case"dd":return s+=1===e?"dan":"dana";case"MM":return s+=1===e?"mjesec":2===e||3===e||4===e?"mjeseca":"mjeseci";case"yy":return s+=1!==e&&(2===e||3===e||4===e)?"godine":"godina"}}M.defineLocale("hi",{months:"\u091c\u0928\u0935\u0930\u0940_\u092b\u093c\u0930\u0935\u0930\u0940_\u092e\u093e\u0930\u094d\u091a_\u0905\u092a\u094d\u0930\u0948\u0932_\u092e\u0908_\u091c\u0942\u0928_\u091c\u0941\u0932\u093e\u0908_\u0905\u0917\u0938\u094d\u0924_\u0938\u093f\u0924\u092e\u094d\u092c\u0930_\u0905\u0915\u094d\u091f\u0942\u092c\u0930_\u0928\u0935\u092e\u094d\u092c\u0930_\u0926\u093f\u0938\u092e\u094d\u092c\u0930".split("_"),monthsShort:"\u091c\u0928._\u092b\u093c\u0930._\u092e\u093e\u0930\u094d\u091a_\u0905\u092a\u094d\u0930\u0948._\u092e\u0908_\u091c\u0942\u0928_\u091c\u0941\u0932._\u0905\u0917._\u0938\u093f\u0924._\u0905\u0915\u094d\u091f\u0942._\u0928\u0935._\u0926\u093f\u0938.".split("_"),monthsParseExact:!0,weekdays:"\u0930\u0935\u093f\u0935\u093e\u0930_\u0938\u094b\u092e\u0935\u093e\u0930_\u092e\u0902\u0917\u0932\u0935\u093e\u0930_\u092c\u0941\u0927\u0935\u093e\u0930_\u0917\u0941\u0930\u0942\u0935\u093e\u0930_\u0936\u0941\u0915\u094d\u0930\u0935\u093e\u0930_\u0936\u0928\u093f\u0935\u093e\u0930".split("_"),weekdaysShort:"\u0930\u0935\u093f_\u0938\u094b\u092e_\u092e\u0902\u0917\u0932_\u092c\u0941\u0927_\u0917\u0941\u0930\u0942_\u0936\u0941\u0915\u094d\u0930_\u0936\u0928\u093f".split("_"),weekdaysMin:"\u0930_\u0938\u094b_\u092e\u0902_\u092c\u0941_\u0917\u0941_\u0936\u0941_\u0936".split("_"),longDateFormat:{LT:"A h:mm \u092c\u091c\u0947",LTS:"A h:mm:ss \u092c\u091c\u0947",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm \u092c\u091c\u0947",LLLL:"dddd, D MMMM YYYY, A h:mm \u092c\u091c\u0947"},calendar:{sameDay:"[\u0906\u091c] LT",nextDay:"[\u0915\u0932] LT",nextWeek:"dddd, LT",lastDay:"[\u0915\u0932] LT",lastWeek:"[\u092a\u093f\u091b\u0932\u0947] dddd, LT",sameElse:"L"},relativeTime:{future:"%s \u092e\u0947\u0902",past:"%s \u092a\u0939\u0932\u0947",s:"\u0915\u0941\u091b \u0939\u0940 \u0915\u094d\u0937\u0923",ss:"%d \u0938\u0947\u0915\u0902\u0921",m:"\u090f\u0915 \u092e\u093f\u0928\u091f",mm:"%d \u092e\u093f\u0928\u091f",h:"\u090f\u0915 \u0918\u0902\u091f\u093e",hh:"%d \u0918\u0902\u091f\u0947",d:"\u090f\u0915 \u0926\u093f\u0928",dd:"%d \u0926\u093f\u0928",M:"\u090f\u0915 \u092e\u0939\u0940\u0928\u0947",MM:"%d \u092e\u0939\u0940\u0928\u0947",y:"\u090f\u0915 \u0935\u0930\u094d\u0937",yy:"%d \u0935\u0930\u094d\u0937"},preparse:function(e){return e.replace(/[\u0967\u0968\u0969\u096a\u096b\u096c\u096d\u096e\u096f\u0966]/g,function(e){return fn[e]})},postformat:function(e){return e.replace(/\d/g,function(e){return yn[e]})},meridiemParse:/\u0930\u093e\u0924|\u0938\u0941\u092c\u0939|\u0926\u094b\u092a\u0939\u0930|\u0936\u093e\u092e/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u0930\u093e\u0924"===a?e<4?e:e+12:"\u0938\u0941\u092c\u0939"===a?e:"\u0926\u094b\u092a\u0939\u0930"===a?10<=e?e:e+12:"\u0936\u093e\u092e"===a?e+12:void 0},meridiem:function(e,a,t){return e<4?"\u0930\u093e\u0924":e<10?"\u0938\u0941\u092c\u0939":e<17?"\u0926\u094b\u092a\u0939\u0930":e<20?"\u0936\u093e\u092e":"\u0930\u093e\u0924"},week:{dow:0,doy:6}}),M.defineLocale("hr",{months:{format:"sije\u010dnja_velja\u010de_o\u017eujka_travnja_svibnja_lipnja_srpnja_kolovoza_rujna_listopada_studenoga_prosinca".split("_"),standalone:"sije\u010danj_velja\u010da_o\u017eujak_travanj_svibanj_lipanj_srpanj_kolovoz_rujan_listopad_studeni_prosinac".split("_")},monthsShort:"sij._velj._o\u017eu._tra._svi._lip._srp._kol._ruj._lis._stu._pro.".split("_"),monthsParseExact:!0,weekdays:"nedjelja_ponedjeljak_utorak_srijeda_\u010detvrtak_petak_subota".split("_"),weekdaysShort:"ned._pon._uto._sri._\u010det._pet._sub.".split("_"),weekdaysMin:"ne_po_ut_sr_\u010de_pe_su".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"Do MMMM YYYY",LLL:"Do MMMM YYYY H:mm",LLLL:"dddd, Do MMMM YYYY H:mm"},calendar:{sameDay:"[danas u] LT",nextDay:"[sutra u] LT",nextWeek:function(){switch(this.day()){case 0:return"[u] [nedjelju] [u] LT";case 3:return"[u] [srijedu] [u] LT";case 6:return"[u] [subotu] [u] LT";case 1:case 2:case 4:case 5:return"[u] dddd [u] LT"}},lastDay:"[ju\u010der u] LT",lastWeek:function(){switch(this.day()){case 0:return"[pro\u0161lu] [nedjelju] [u] LT";case 3:return"[pro\u0161lu] [srijedu] [u] LT";case 6:return"[pro\u0161le] [subote] [u] LT";case 1:case 2:case 4:case 5:return"[pro\u0161li] dddd [u] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"prije %s",s:"par sekundi",ss:pn,m:pn,mm:pn,h:pn,hh:pn,d:"dan",dd:pn,M:"mjesec",MM:pn,y:"godinu",yy:pn},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}});var kn="vas\xe1rnap h\xe9tf\u0151n kedden szerd\xe1n cs\xfct\xf6rt\xf6k\xf6n p\xe9nteken szombaton".split(" ");function Dn(e,a,t,s){var n=e;switch(t){case"s":return s||a?"n\xe9h\xe1ny m\xe1sodperc":"n\xe9h\xe1ny m\xe1sodperce";case"ss":return n+(s||a)?" m\xe1sodperc":" m\xe1sodperce";case"m":return"egy"+(s||a?" perc":" perce");case"mm":return n+(s||a?" perc":" perce");case"h":return"egy"+(s||a?" \xf3ra":" \xf3r\xe1ja");case"hh":return n+(s||a?" \xf3ra":" \xf3r\xe1ja");case"d":return"egy"+(s||a?" nap":" napja");case"dd":return n+(s||a?" nap":" napja");case"M":return"egy"+(s||a?" h\xf3nap":" h\xf3napja");case"MM":return n+(s||a?" h\xf3nap":" h\xf3napja");case"y":return"egy"+(s||a?" \xe9v":" \xe9ve");case"yy":return n+(s||a?" \xe9v":" \xe9ve")}return""}function Tn(e){return(e?"":"[m\xfalt] ")+"["+kn[this.day()]+"] LT[-kor]"}function gn(e){return e%100==11||e%10!=1}function wn(e,a,t,s){var n=e+" ";switch(t){case"s":return a||s?"nokkrar sek\xfandur":"nokkrum sek\xfandum";case"ss":return gn(e)?n+(a||s?"sek\xfandur":"sek\xfandum"):n+"sek\xfanda";case"m":return a?"m\xedn\xfata":"m\xedn\xfatu";case"mm":return gn(e)?n+(a||s?"m\xedn\xfatur":"m\xedn\xfatum"):a?n+"m\xedn\xfata":n+"m\xedn\xfatu";case"hh":return gn(e)?n+(a||s?"klukkustundir":"klukkustundum"):n+"klukkustund";case"d":return a?"dagur":s?"dag":"degi";case"dd":return gn(e)?a?n+"dagar":n+(s?"daga":"d\xf6gum"):a?n+"dagur":n+(s?"dag":"degi");case"M":return a?"m\xe1nu\xf0ur":s?"m\xe1nu\xf0":"m\xe1nu\xf0i";case"MM":return gn(e)?a?n+"m\xe1nu\xf0ir":n+(s?"m\xe1nu\xf0i":"m\xe1nu\xf0um"):a?n+"m\xe1nu\xf0ur":n+(s?"m\xe1nu\xf0":"m\xe1nu\xf0i");case"y":return a||s?"\xe1r":"\xe1ri";case"yy":return gn(e)?n+(a||s?"\xe1r":"\xe1rum"):n+(a||s?"\xe1r":"\xe1ri")}}M.defineLocale("hu",{months:"janu\xe1r_febru\xe1r_m\xe1rcius_\xe1prilis_m\xe1jus_j\xfanius_j\xfalius_augusztus_szeptember_okt\xf3ber_november_december".split("_"),monthsShort:"jan._feb._m\xe1rc._\xe1pr._m\xe1j._j\xfan._j\xfal._aug._szept._okt._nov._dec.".split("_"),monthsParseExact:!0,weekdays:"vas\xe1rnap_h\xe9tf\u0151_kedd_szerda_cs\xfct\xf6rt\xf6k_p\xe9ntek_szombat".split("_"),weekdaysShort:"vas_h\xe9t_kedd_sze_cs\xfct_p\xe9n_szo".split("_"),weekdaysMin:"v_h_k_sze_cs_p_szo".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"YYYY.MM.DD.",LL:"YYYY. MMMM D.",LLL:"YYYY. MMMM D. H:mm",LLLL:"YYYY. MMMM D., dddd H:mm"},meridiemParse:/de|du/i,isPM:function(e){return"u"===e.charAt(1).toLowerCase()},meridiem:function(e,a,t){return e<12?!0===t?"de":"DE":!0===t?"du":"DU"},calendar:{sameDay:"[ma] LT[-kor]",nextDay:"[holnap] LT[-kor]",nextWeek:function(){return Tn.call(this,!0)},lastDay:"[tegnap] LT[-kor]",lastWeek:function(){return Tn.call(this,!1)},sameElse:"L"},relativeTime:{future:"%s m\xfalva",past:"%s",s:Dn,ss:Dn,m:Dn,mm:Dn,h:Dn,hh:Dn,d:Dn,dd:Dn,M:Dn,MM:Dn,y:Dn,yy:Dn},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),M.defineLocale("hy-am",{months:{format:"\u0570\u0578\u0582\u0576\u057e\u0561\u0580\u056b_\u0583\u0565\u057f\u0580\u057e\u0561\u0580\u056b_\u0574\u0561\u0580\u057f\u056b_\u0561\u057a\u0580\u056b\u056c\u056b_\u0574\u0561\u0575\u056b\u057d\u056b_\u0570\u0578\u0582\u0576\u056b\u057d\u056b_\u0570\u0578\u0582\u056c\u056b\u057d\u056b_\u0585\u0563\u0578\u057d\u057f\u0578\u057d\u056b_\u057d\u0565\u057a\u057f\u0565\u0574\u0562\u0565\u0580\u056b_\u0570\u0578\u056f\u057f\u0565\u0574\u0562\u0565\u0580\u056b_\u0576\u0578\u0575\u0565\u0574\u0562\u0565\u0580\u056b_\u0564\u0565\u056f\u057f\u0565\u0574\u0562\u0565\u0580\u056b".split("_"),standalone:"\u0570\u0578\u0582\u0576\u057e\u0561\u0580_\u0583\u0565\u057f\u0580\u057e\u0561\u0580_\u0574\u0561\u0580\u057f_\u0561\u057a\u0580\u056b\u056c_\u0574\u0561\u0575\u056b\u057d_\u0570\u0578\u0582\u0576\u056b\u057d_\u0570\u0578\u0582\u056c\u056b\u057d_\u0585\u0563\u0578\u057d\u057f\u0578\u057d_\u057d\u0565\u057a\u057f\u0565\u0574\u0562\u0565\u0580_\u0570\u0578\u056f\u057f\u0565\u0574\u0562\u0565\u0580_\u0576\u0578\u0575\u0565\u0574\u0562\u0565\u0580_\u0564\u0565\u056f\u057f\u0565\u0574\u0562\u0565\u0580".split("_")},monthsShort:"\u0570\u0576\u057e_\u0583\u057f\u0580_\u0574\u0580\u057f_\u0561\u057a\u0580_\u0574\u0575\u057d_\u0570\u0576\u057d_\u0570\u056c\u057d_\u0585\u0563\u057d_\u057d\u057a\u057f_\u0570\u056f\u057f_\u0576\u0574\u0562_\u0564\u056f\u057f".split("_"),weekdays:"\u056f\u056b\u0580\u0561\u056f\u056b_\u0565\u0580\u056f\u0578\u0582\u0577\u0561\u0562\u0569\u056b_\u0565\u0580\u0565\u0584\u0577\u0561\u0562\u0569\u056b_\u0579\u0578\u0580\u0565\u0584\u0577\u0561\u0562\u0569\u056b_\u0570\u056b\u0576\u0563\u0577\u0561\u0562\u0569\u056b_\u0578\u0582\u0580\u0562\u0561\u0569_\u0577\u0561\u0562\u0561\u0569".split("_"),weekdaysShort:"\u056f\u0580\u056f_\u0565\u0580\u056f_\u0565\u0580\u0584_\u0579\u0580\u0584_\u0570\u0576\u0563_\u0578\u0582\u0580\u0562_\u0577\u0562\u0569".split("_"),weekdaysMin:"\u056f\u0580\u056f_\u0565\u0580\u056f_\u0565\u0580\u0584_\u0579\u0580\u0584_\u0570\u0576\u0563_\u0578\u0582\u0580\u0562_\u0577\u0562\u0569".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY \u0569.",LLL:"D MMMM YYYY \u0569., HH:mm",LLLL:"dddd, D MMMM YYYY \u0569., HH:mm"},calendar:{sameDay:"[\u0561\u0575\u057d\u0585\u0580] LT",nextDay:"[\u057e\u0561\u0572\u0568] LT",lastDay:"[\u0565\u0580\u0565\u056f] LT",nextWeek:function(){return"dddd [\u0585\u0580\u0568 \u056a\u0561\u0574\u0568] LT"},lastWeek:function(){return"[\u0561\u0576\u0581\u0561\u056e] dddd [\u0585\u0580\u0568 \u056a\u0561\u0574\u0568] LT"},sameElse:"L"},relativeTime:{future:"%s \u0570\u0565\u057f\u0578",past:"%s \u0561\u057c\u0561\u057b",s:"\u0574\u056b \u0584\u0561\u0576\u056b \u057e\u0561\u0575\u0580\u056f\u0575\u0561\u0576",ss:"%d \u057e\u0561\u0575\u0580\u056f\u0575\u0561\u0576",m:"\u0580\u0578\u057a\u0565",mm:"%d \u0580\u0578\u057a\u0565",h:"\u056a\u0561\u0574",hh:"%d \u056a\u0561\u0574",d:"\u0585\u0580",dd:"%d \u0585\u0580",M:"\u0561\u0574\u056b\u057d",MM:"%d \u0561\u0574\u056b\u057d",y:"\u057f\u0561\u0580\u056b",yy:"%d \u057f\u0561\u0580\u056b"},meridiemParse:/\u0563\u056b\u0577\u0565\u0580\u057e\u0561|\u0561\u057c\u0561\u057e\u0578\u057f\u057e\u0561|\u0581\u0565\u0580\u0565\u056f\u057e\u0561|\u0565\u0580\u0565\u056f\u0578\u0575\u0561\u0576/,isPM:function(e){return/^(\u0581\u0565\u0580\u0565\u056f\u057e\u0561|\u0565\u0580\u0565\u056f\u0578\u0575\u0561\u0576)$/.test(e)},meridiem:function(e){return e<4?"\u0563\u056b\u0577\u0565\u0580\u057e\u0561":e<12?"\u0561\u057c\u0561\u057e\u0578\u057f\u057e\u0561":e<17?"\u0581\u0565\u0580\u0565\u056f\u057e\u0561":"\u0565\u0580\u0565\u056f\u0578\u0575\u0561\u0576"},dayOfMonthOrdinalParse:/\d{1,2}|\d{1,2}-(\u056b\u0576|\u0580\u0564)/,ordinal:function(e,a){switch(a){case"DDD":case"w":case"W":case"DDDo":return 1===e?e+"-\u056b\u0576":e+"-\u0580\u0564";default:return e}},week:{dow:1,doy:7}}),M.defineLocale("id",{months:"Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_November_Desember".split("_"),monthsShort:"Jan_Feb_Mar_Apr_Mei_Jun_Jul_Agt_Sep_Okt_Nov_Des".split("_"),weekdays:"Minggu_Senin_Selasa_Rabu_Kamis_Jumat_Sabtu".split("_"),weekdaysShort:"Min_Sen_Sel_Rab_Kam_Jum_Sab".split("_"),weekdaysMin:"Mg_Sn_Sl_Rb_Km_Jm_Sb".split("_"),longDateFormat:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [pukul] HH.mm",LLLL:"dddd, D MMMM YYYY [pukul] HH.mm"},meridiemParse:/pagi|siang|sore|malam/,meridiemHour:function(e,a){return 12===e&&(e=0),"pagi"===a?e:"siang"===a?11<=e?e:e+12:"sore"===a||"malam"===a?e+12:void 0},meridiem:function(e,a,t){return e<11?"pagi":e<15?"siang":e<19?"sore":"malam"},calendar:{sameDay:"[Hari ini pukul] LT",nextDay:"[Besok pukul] LT",nextWeek:"dddd [pukul] LT",lastDay:"[Kemarin pukul] LT",lastWeek:"dddd [lalu pukul] LT",sameElse:"L"},relativeTime:{future:"dalam %s",past:"%s yang lalu",s:"beberapa detik",ss:"%d detik",m:"semenit",mm:"%d menit",h:"sejam",hh:"%d jam",d:"sehari",dd:"%d hari",M:"sebulan",MM:"%d bulan",y:"setahun",yy:"%d tahun"},week:{dow:0,doy:6}}),M.defineLocale("is",{months:"jan\xfaar_febr\xfaar_mars_apr\xedl_ma\xed_j\xfan\xed_j\xfal\xed_\xe1g\xfast_september_okt\xf3ber_n\xf3vember_desember".split("_"),monthsShort:"jan_feb_mar_apr_ma\xed_j\xfan_j\xfal_\xe1g\xfa_sep_okt_n\xf3v_des".split("_"),weekdays:"sunnudagur_m\xe1nudagur_\xferi\xf0judagur_mi\xf0vikudagur_fimmtudagur_f\xf6studagur_laugardagur".split("_"),weekdaysShort:"sun_m\xe1n_\xferi_mi\xf0_fim_f\xf6s_lau".split("_"),weekdaysMin:"Su_M\xe1_\xder_Mi_Fi_F\xf6_La".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY [kl.] H:mm",LLLL:"dddd, D. MMMM YYYY [kl.] H:mm"},calendar:{sameDay:"[\xed dag kl.] LT",nextDay:"[\xe1 morgun kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[\xed g\xe6r kl.] LT",lastWeek:"[s\xed\xf0asta] dddd [kl.] LT",sameElse:"L"},relativeTime:{future:"eftir %s",past:"fyrir %s s\xed\xf0an",s:wn,ss:wn,m:wn,mm:wn,h:"klukkustund",hh:wn,d:wn,dd:wn,M:wn,MM:wn,y:wn,yy:wn},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),M.defineLocale("it-ch",{months:"gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre".split("_"),monthsShort:"gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic".split("_"),weekdays:"domenica_luned\xec_marted\xec_mercoled\xec_gioved\xec_venerd\xec_sabato".split("_"),weekdaysShort:"dom_lun_mar_mer_gio_ven_sab".split("_"),weekdaysMin:"do_lu_ma_me_gi_ve_sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[Oggi alle] LT",nextDay:"[Domani alle] LT",nextWeek:"dddd [alle] LT",lastDay:"[Ieri alle] LT",lastWeek:function(){switch(this.day()){case 0:return"[la scorsa] dddd [alle] LT";default:return"[lo scorso] dddd [alle] LT"}},sameElse:"L"},relativeTime:{future:function(e){return(/^[0-9].+$/.test(e)?"tra":"in")+" "+e},past:"%s fa",s:"alcuni secondi",ss:"%d secondi",m:"un minuto",mm:"%d minuti",h:"un'ora",hh:"%d ore",d:"un giorno",dd:"%d giorni",M:"un mese",MM:"%d mesi",y:"un anno",yy:"%d anni"},dayOfMonthOrdinalParse:/\d{1,2}\xba/,ordinal:"%d\xba",week:{dow:1,doy:4}}),M.defineLocale("it",{months:"gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre".split("_"),monthsShort:"gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic".split("_"),weekdays:"domenica_luned\xec_marted\xec_mercoled\xec_gioved\xec_venerd\xec_sabato".split("_"),weekdaysShort:"dom_lun_mar_mer_gio_ven_sab".split("_"),weekdaysMin:"do_lu_ma_me_gi_ve_sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:function(){return"[Oggi a"+(1<this.hours()?"lle ":0===this.hours()?" ":"ll'")+"]LT"},nextDay:function(){return"[Domani a"+(1<this.hours()?"lle ":0===this.hours()?" ":"ll'")+"]LT"},nextWeek:function(){return"dddd [a"+(1<this.hours()?"lle ":0===this.hours()?" ":"ll'")+"]LT"},lastDay:function(){return"[Ieri a"+(1<this.hours()?"lle ":0===this.hours()?" ":"ll'")+"]LT"},lastWeek:function(){switch(this.day()){case 0:return"[La scorsa] dddd [a"+(1<this.hours()?"lle ":0===this.hours()?" ":"ll'")+"]LT";default:return"[Lo scorso] dddd [a"+(1<this.hours()?"lle ":0===this.hours()?" ":"ll'")+"]LT"}},sameElse:"L"},relativeTime:{future:"tra %s",past:"%s fa",s:"alcuni secondi",ss:"%d secondi",m:"un minuto",mm:"%d minuti",h:"un'ora",hh:"%d ore",d:"un giorno",dd:"%d giorni",w:"una settimana",ww:"%d settimane",M:"un mese",MM:"%d mesi",y:"un anno",yy:"%d anni"},dayOfMonthOrdinalParse:/\d{1,2}\xba/,ordinal:"%d\xba",week:{dow:1,doy:4}}),M.defineLocale("ja",{eras:[{since:"2019-05-01",offset:1,name:"\u4ee4\u548c",narrow:"\u32ff",abbr:"R"},{since:"1989-01-08",until:"2019-04-30",offset:1,name:"\u5e73\u6210",narrow:"\u337b",abbr:"H"},{since:"1926-12-25",until:"1989-01-07",offset:1,name:"\u662d\u548c",narrow:"\u337c",abbr:"S"},{since:"1912-07-30",until:"1926-12-24",offset:1,name:"\u5927\u6b63",narrow:"\u337d",abbr:"T"},{since:"1873-01-01",until:"1912-07-29",offset:6,name:"\u660e\u6cbb",narrow:"\u337e",abbr:"M"},{since:"0001-01-01",until:"1873-12-31",offset:1,name:"\u897f\u66a6",narrow:"AD",abbr:"AD"},{since:"0000-12-31",until:-1/0,offset:1,name:"\u7d00\u5143\u524d",narrow:"BC",abbr:"BC"}],eraYearOrdinalRegex:/(\u5143|\d+)\u5e74/,eraYearOrdinalParse:function(e,a){return"\u5143"===a[1]?1:parseInt(a[1]||e,10)},months:"1\u6708_2\u6708_3\u6708_4\u6708_5\u6708_6\u6708_7\u6708_8\u6708_9\u6708_10\u6708_11\u6708_12\u6708".split("_"),monthsShort:"1\u6708_2\u6708_3\u6708_4\u6708_5\u6708_6\u6708_7\u6708_8\u6708_9\u6708_10\u6708_11\u6708_12\u6708".split("_"),weekdays:"\u65e5\u66dc\u65e5_\u6708\u66dc\u65e5_\u706b\u66dc\u65e5_\u6c34\u66dc\u65e5_\u6728\u66dc\u65e5_\u91d1\u66dc\u65e5_\u571f\u66dc\u65e5".split("_"),weekdaysShort:"\u65e5_\u6708_\u706b_\u6c34_\u6728_\u91d1_\u571f".split("_"),weekdaysMin:"\u65e5_\u6708_\u706b_\u6c34_\u6728_\u91d1_\u571f".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY/MM/DD",LL:"YYYY\u5e74M\u6708D\u65e5",LLL:"YYYY\u5e74M\u6708D\u65e5 HH:mm",LLLL:"YYYY\u5e74M\u6708D\u65e5 dddd HH:mm",l:"YYYY/MM/DD",ll:"YYYY\u5e74M\u6708D\u65e5",lll:"YYYY\u5e74M\u6708D\u65e5 HH:mm",llll:"YYYY\u5e74M\u6708D\u65e5(ddd) HH:mm"},meridiemParse:/\u5348\u524d|\u5348\u5f8c/i,isPM:function(e){return"\u5348\u5f8c"===e},meridiem:function(e,a,t){return e<12?"\u5348\u524d":"\u5348\u5f8c"},calendar:{sameDay:"[\u4eca\u65e5] LT",nextDay:"[\u660e\u65e5] LT",nextWeek:function(e){return e.week()!==this.week()?"[\u6765\u9031]dddd LT":"dddd LT"},lastDay:"[\u6628\u65e5] LT",lastWeek:function(e){return this.week()!==e.week()?"[\u5148\u9031]dddd LT":"dddd LT"},sameElse:"L"},dayOfMonthOrdinalParse:/\d{1,2}\u65e5/,ordinal:function(e,a){switch(a){case"y":return 1===e?"\u5143\u5e74":e+"\u5e74";case"d":case"D":case"DDD":return e+"\u65e5";default:return e}},relativeTime:{future:"%s\u5f8c",past:"%s\u524d",s:"\u6570\u79d2",ss:"%d\u79d2",m:"1\u5206",mm:"%d\u5206",h:"1\u6642\u9593",hh:"%d\u6642\u9593",d:"1\u65e5",dd:"%d\u65e5",M:"1\u30f6\u6708",MM:"%d\u30f6\u6708",y:"1\u5e74",yy:"%d\u5e74"}}),M.defineLocale("jv",{months:"Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_Nopember_Desember".split("_"),monthsShort:"Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nop_Des".split("_"),weekdays:"Minggu_Senen_Seloso_Rebu_Kemis_Jemuwah_Septu".split("_"),weekdaysShort:"Min_Sen_Sel_Reb_Kem_Jem_Sep".split("_"),weekdaysMin:"Mg_Sn_Sl_Rb_Km_Jm_Sp".split("_"),longDateFormat:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [pukul] HH.mm",LLLL:"dddd, D MMMM YYYY [pukul] HH.mm"},meridiemParse:/enjing|siyang|sonten|ndalu/,meridiemHour:function(e,a){return 12===e&&(e=0),"enjing"===a?e:"siyang"===a?11<=e?e:e+12:"sonten"===a||"ndalu"===a?e+12:void 0},meridiem:function(e,a,t){return e<11?"enjing":e<15?"siyang":e<19?"sonten":"ndalu"},calendar:{sameDay:"[Dinten puniko pukul] LT",nextDay:"[Mbenjang pukul] LT",nextWeek:"dddd [pukul] LT",lastDay:"[Kala wingi pukul] LT",lastWeek:"dddd [kepengker pukul] LT",sameElse:"L"},relativeTime:{future:"wonten ing %s",past:"%s ingkang kepengker",s:"sawetawis detik",ss:"%d detik",m:"setunggal menit",mm:"%d menit",h:"setunggal jam",hh:"%d jam",d:"sedinten",dd:"%d dinten",M:"sewulan",MM:"%d wulan",y:"setaun",yy:"%d taun"},week:{dow:1,doy:7}}),M.defineLocale("ka",{months:"\u10d8\u10d0\u10dc\u10d5\u10d0\u10e0\u10d8_\u10d7\u10d4\u10d1\u10d4\u10e0\u10d5\u10d0\u10da\u10d8_\u10db\u10d0\u10e0\u10e2\u10d8_\u10d0\u10de\u10e0\u10d8\u10da\u10d8_\u10db\u10d0\u10d8\u10e1\u10d8_\u10d8\u10d5\u10dc\u10d8\u10e1\u10d8_\u10d8\u10d5\u10da\u10d8\u10e1\u10d8_\u10d0\u10d2\u10d5\u10d8\u10e1\u10e2\u10dd_\u10e1\u10d4\u10e5\u10e2\u10d4\u10db\u10d1\u10d4\u10e0\u10d8_\u10dd\u10e5\u10e2\u10dd\u10db\u10d1\u10d4\u10e0\u10d8_\u10dc\u10dd\u10d4\u10db\u10d1\u10d4\u10e0\u10d8_\u10d3\u10d4\u10d9\u10d4\u10db\u10d1\u10d4\u10e0\u10d8".split("_"),monthsShort:"\u10d8\u10d0\u10dc_\u10d7\u10d4\u10d1_\u10db\u10d0\u10e0_\u10d0\u10de\u10e0_\u10db\u10d0\u10d8_\u10d8\u10d5\u10dc_\u10d8\u10d5\u10da_\u10d0\u10d2\u10d5_\u10e1\u10d4\u10e5_\u10dd\u10e5\u10e2_\u10dc\u10dd\u10d4_\u10d3\u10d4\u10d9".split("_"),weekdays:{standalone:"\u10d9\u10d5\u10d8\u10e0\u10d0_\u10dd\u10e0\u10e8\u10d0\u10d1\u10d0\u10d7\u10d8_\u10e1\u10d0\u10db\u10e8\u10d0\u10d1\u10d0\u10d7\u10d8_\u10dd\u10d7\u10ee\u10e8\u10d0\u10d1\u10d0\u10d7\u10d8_\u10ee\u10e3\u10d7\u10e8\u10d0\u10d1\u10d0\u10d7\u10d8_\u10de\u10d0\u10e0\u10d0\u10e1\u10d9\u10d4\u10d5\u10d8_\u10e8\u10d0\u10d1\u10d0\u10d7\u10d8".split("_"),format:"\u10d9\u10d5\u10d8\u10e0\u10d0\u10e1_\u10dd\u10e0\u10e8\u10d0\u10d1\u10d0\u10d7\u10e1_\u10e1\u10d0\u10db\u10e8\u10d0\u10d1\u10d0\u10d7\u10e1_\u10dd\u10d7\u10ee\u10e8\u10d0\u10d1\u10d0\u10d7\u10e1_\u10ee\u10e3\u10d7\u10e8\u10d0\u10d1\u10d0\u10d7\u10e1_\u10de\u10d0\u10e0\u10d0\u10e1\u10d9\u10d4\u10d5\u10e1_\u10e8\u10d0\u10d1\u10d0\u10d7\u10e1".split("_"),isFormat:/(\u10ec\u10d8\u10dc\u10d0|\u10e8\u10d4\u10db\u10d3\u10d4\u10d2)/},weekdaysShort:"\u10d9\u10d5\u10d8_\u10dd\u10e0\u10e8_\u10e1\u10d0\u10db_\u10dd\u10d7\u10ee_\u10ee\u10e3\u10d7_\u10de\u10d0\u10e0_\u10e8\u10d0\u10d1".split("_"),weekdaysMin:"\u10d9\u10d5_\u10dd\u10e0_\u10e1\u10d0_\u10dd\u10d7_\u10ee\u10e3_\u10de\u10d0_\u10e8\u10d0".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[\u10d3\u10e6\u10d4\u10e1] LT[-\u10d6\u10d4]",nextDay:"[\u10ee\u10d5\u10d0\u10da] LT[-\u10d6\u10d4]",lastDay:"[\u10d2\u10e3\u10e8\u10d8\u10dc] LT[-\u10d6\u10d4]",nextWeek:"[\u10e8\u10d4\u10db\u10d3\u10d4\u10d2] dddd LT[-\u10d6\u10d4]",lastWeek:"[\u10ec\u10d8\u10dc\u10d0] dddd LT-\u10d6\u10d4",sameElse:"L"},relativeTime:{future:function(e){return e.replace(/(\u10ec\u10d0\u10db|\u10ec\u10e3\u10d7|\u10e1\u10d0\u10d0\u10d7|\u10ec\u10d4\u10da|\u10d3\u10e6|\u10d7\u10d5)(\u10d8|\u10d4)/,function(e,a,t){return"\u10d8"===t?a+"\u10e8\u10d8":a+t+"\u10e8\u10d8"})},past:function(e){return/(\u10ec\u10d0\u10db\u10d8|\u10ec\u10e3\u10d7\u10d8|\u10e1\u10d0\u10d0\u10d7\u10d8|\u10d3\u10e6\u10d4|\u10d7\u10d5\u10d4)/.test(e)?e.replace(/(\u10d8|\u10d4)$/,"\u10d8\u10e1 \u10ec\u10d8\u10dc"):/\u10ec\u10d4\u10da\u10d8/.test(e)?e.replace(/\u10ec\u10d4\u10da\u10d8$/,"\u10ec\u10da\u10d8\u10e1 \u10ec\u10d8\u10dc"):e},s:"\u10e0\u10d0\u10db\u10d3\u10d4\u10dc\u10d8\u10db\u10d4 \u10ec\u10d0\u10db\u10d8",ss:"%d \u10ec\u10d0\u10db\u10d8",m:"\u10ec\u10e3\u10d7\u10d8",mm:"%d \u10ec\u10e3\u10d7\u10d8",h:"\u10e1\u10d0\u10d0\u10d7\u10d8",hh:"%d \u10e1\u10d0\u10d0\u10d7\u10d8",d:"\u10d3\u10e6\u10d4",dd:"%d \u10d3\u10e6\u10d4",M:"\u10d7\u10d5\u10d4",MM:"%d \u10d7\u10d5\u10d4",y:"\u10ec\u10d4\u10da\u10d8",yy:"%d \u10ec\u10d4\u10da\u10d8"},dayOfMonthOrdinalParse:/0|1-\u10da\u10d8|\u10db\u10d4-\d{1,2}|\d{1,2}-\u10d4/,ordinal:function(e){return 0===e?e:1===e?e+"-\u10da\u10d8":e<20||e<=100&&e%20==0||e%100==0?"\u10db\u10d4-"+e:e+"-\u10d4"},week:{dow:1,doy:7}});var vn={0:"-\u0448\u0456",1:"-\u0448\u0456",2:"-\u0448\u0456",3:"-\u0448\u0456",4:"-\u0448\u0456",5:"-\u0448\u0456",6:"-\u0448\u044b",7:"-\u0448\u0456",8:"-\u0448\u0456",9:"-\u0448\u044b",10:"-\u0448\u044b",20:"-\u0448\u044b",30:"-\u0448\u044b",40:"-\u0448\u044b",50:"-\u0448\u0456",60:"-\u0448\u044b",70:"-\u0448\u0456",80:"-\u0448\u0456",90:"-\u0448\u044b",100:"-\u0448\u0456"};M.defineLocale("kk",{months:"\u049b\u0430\u04a3\u0442\u0430\u0440_\u0430\u049b\u043f\u0430\u043d_\u043d\u0430\u0443\u0440\u044b\u0437_\u0441\u04d9\u0443\u0456\u0440_\u043c\u0430\u043c\u044b\u0440_\u043c\u0430\u0443\u0441\u044b\u043c_\u0448\u0456\u043b\u0434\u0435_\u0442\u0430\u043c\u044b\u0437_\u049b\u044b\u0440\u043a\u04af\u0439\u0435\u043a_\u049b\u0430\u0437\u0430\u043d_\u049b\u0430\u0440\u0430\u0448\u0430_\u0436\u0435\u043b\u0442\u043e\u049b\u0441\u0430\u043d".split("_"),monthsShort:"\u049b\u0430\u04a3_\u0430\u049b\u043f_\u043d\u0430\u0443_\u0441\u04d9\u0443_\u043c\u0430\u043c_\u043c\u0430\u0443_\u0448\u0456\u043b_\u0442\u0430\u043c_\u049b\u044b\u0440_\u049b\u0430\u0437_\u049b\u0430\u0440_\u0436\u0435\u043b".split("_"),weekdays:"\u0436\u0435\u043a\u0441\u0435\u043d\u0431\u0456_\u0434\u04af\u0439\u0441\u0435\u043d\u0431\u0456_\u0441\u0435\u0439\u0441\u0435\u043d\u0431\u0456_\u0441\u04d9\u0440\u0441\u0435\u043d\u0431\u0456_\u0431\u0435\u0439\u0441\u0435\u043d\u0431\u0456_\u0436\u04b1\u043c\u0430_\u0441\u0435\u043d\u0431\u0456".split("_"),weekdaysShort:"\u0436\u0435\u043a_\u0434\u04af\u0439_\u0441\u0435\u0439_\u0441\u04d9\u0440_\u0431\u0435\u0439_\u0436\u04b1\u043c_\u0441\u0435\u043d".split("_"),weekdaysMin:"\u0436\u043a_\u0434\u0439_\u0441\u0439_\u0441\u0440_\u0431\u0439_\u0436\u043c_\u0441\u043d".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[\u0411\u04af\u0433\u0456\u043d \u0441\u0430\u0493\u0430\u0442] LT",nextDay:"[\u0415\u0440\u0442\u0435\u04a3 \u0441\u0430\u0493\u0430\u0442] LT",nextWeek:"dddd [\u0441\u0430\u0493\u0430\u0442] LT",lastDay:"[\u041a\u0435\u0448\u0435 \u0441\u0430\u0493\u0430\u0442] LT",lastWeek:"[\u04e8\u0442\u043a\u0435\u043d \u0430\u043f\u0442\u0430\u043d\u044b\u04a3] dddd [\u0441\u0430\u0493\u0430\u0442] LT",sameElse:"L"},relativeTime:{future:"%s \u0456\u0448\u0456\u043d\u0434\u0435",past:"%s \u0431\u04b1\u0440\u044b\u043d",s:"\u0431\u0456\u0440\u043d\u0435\u0448\u0435 \u0441\u0435\u043a\u0443\u043d\u0434",ss:"%d \u0441\u0435\u043a\u0443\u043d\u0434",m:"\u0431\u0456\u0440 \u043c\u0438\u043d\u0443\u0442",mm:"%d \u043c\u0438\u043d\u0443\u0442",h:"\u0431\u0456\u0440 \u0441\u0430\u0493\u0430\u0442",hh:"%d \u0441\u0430\u0493\u0430\u0442",d:"\u0431\u0456\u0440 \u043a\u04af\u043d",dd:"%d \u043a\u04af\u043d",M:"\u0431\u0456\u0440 \u0430\u0439",MM:"%d \u0430\u0439",y:"\u0431\u0456\u0440 \u0436\u044b\u043b",yy:"%d \u0436\u044b\u043b"},dayOfMonthOrdinalParse:/\d{1,2}-(\u0448\u0456|\u0448\u044b)/,ordinal:function(e){return e+(vn[e]||vn[e%10]||vn[100<=e?100:null])},week:{dow:1,doy:7}});var bn={1:"\u17e1",2:"\u17e2",3:"\u17e3",4:"\u17e4",5:"\u17e5",6:"\u17e6",7:"\u17e7",8:"\u17e8",9:"\u17e9",0:"\u17e0"},Sn={"\u17e1":"1","\u17e2":"2","\u17e3":"3","\u17e4":"4","\u17e5":"5","\u17e6":"6","\u17e7":"7","\u17e8":"8","\u17e9":"9","\u17e0":"0"};M.defineLocale("km",{months:"\u1798\u1780\u179a\u17b6_\u1780\u17bb\u1798\u17d2\u1797\u17c8_\u1798\u17b8\u1793\u17b6_\u1798\u17c1\u179f\u17b6_\u17a7\u179f\u1797\u17b6_\u1798\u17b7\u1790\u17bb\u1793\u17b6_\u1780\u1780\u17d2\u1780\u178a\u17b6_\u179f\u17b8\u17a0\u17b6_\u1780\u1789\u17d2\u1789\u17b6_\u178f\u17bb\u179b\u17b6_\u179c\u17b7\u1785\u17d2\u1786\u17b7\u1780\u17b6_\u1792\u17d2\u1793\u17bc".split("_"),monthsShort:"\u1798\u1780\u179a\u17b6_\u1780\u17bb\u1798\u17d2\u1797\u17c8_\u1798\u17b8\u1793\u17b6_\u1798\u17c1\u179f\u17b6_\u17a7\u179f\u1797\u17b6_\u1798\u17b7\u1790\u17bb\u1793\u17b6_\u1780\u1780\u17d2\u1780\u178a\u17b6_\u179f\u17b8\u17a0\u17b6_\u1780\u1789\u17d2\u1789\u17b6_\u178f\u17bb\u179b\u17b6_\u179c\u17b7\u1785\u17d2\u1786\u17b7\u1780\u17b6_\u1792\u17d2\u1793\u17bc".split("_"),weekdays:"\u17a2\u17b6\u1791\u17b7\u178f\u17d2\u1799_\u1785\u17d0\u1793\u17d2\u1791_\u17a2\u1784\u17d2\u1782\u17b6\u179a_\u1796\u17bb\u1792_\u1796\u17d2\u179a\u17a0\u179f\u17d2\u1794\u178f\u17b7\u17cd_\u179f\u17bb\u1780\u17d2\u179a_\u179f\u17c5\u179a\u17cd".split("_"),weekdaysShort:"\u17a2\u17b6_\u1785_\u17a2_\u1796_\u1796\u17d2\u179a_\u179f\u17bb_\u179f".split("_"),weekdaysMin:"\u17a2\u17b6_\u1785_\u17a2_\u1796_\u1796\u17d2\u179a_\u179f\u17bb_\u179f".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},meridiemParse:/\u1796\u17d2\u179a\u17b9\u1780|\u179b\u17d2\u1784\u17b6\u1785/,isPM:function(e){return"\u179b\u17d2\u1784\u17b6\u1785"===e},meridiem:function(e,a,t){return e<12?"\u1796\u17d2\u179a\u17b9\u1780":"\u179b\u17d2\u1784\u17b6\u1785"},calendar:{sameDay:"[\u1790\u17d2\u1784\u17c3\u1793\u17c1\u17c7 \u1798\u17c9\u17c4\u1784] LT",nextDay:"[\u179f\u17d2\u17a2\u17c2\u1780 \u1798\u17c9\u17c4\u1784] LT",nextWeek:"dddd [\u1798\u17c9\u17c4\u1784] LT",lastDay:"[\u1798\u17d2\u179f\u17b7\u179b\u1798\u17b7\u1789 \u1798\u17c9\u17c4\u1784] LT",lastWeek:"dddd [\u179f\u1794\u17d2\u178f\u17b6\u17a0\u17cd\u1798\u17bb\u1793] [\u1798\u17c9\u17c4\u1784] LT",sameElse:"L"},relativeTime:{future:"%s\u1791\u17c0\u178f",past:"%s\u1798\u17bb\u1793",s:"\u1794\u17c9\u17bb\u1793\u17d2\u1798\u17b6\u1793\u179c\u17b7\u1793\u17b6\u1791\u17b8",ss:"%d \u179c\u17b7\u1793\u17b6\u1791\u17b8",m:"\u1798\u17bd\u1799\u1793\u17b6\u1791\u17b8",mm:"%d \u1793\u17b6\u1791\u17b8",h:"\u1798\u17bd\u1799\u1798\u17c9\u17c4\u1784",hh:"%d \u1798\u17c9\u17c4\u1784",d:"\u1798\u17bd\u1799\u1790\u17d2\u1784\u17c3",dd:"%d \u1790\u17d2\u1784\u17c3",M:"\u1798\u17bd\u1799\u1781\u17c2",MM:"%d \u1781\u17c2",y:"\u1798\u17bd\u1799\u1786\u17d2\u1793\u17b6\u17c6",yy:"%d \u1786\u17d2\u1793\u17b6\u17c6"},dayOfMonthOrdinalParse:/\u1791\u17b8\d{1,2}/,ordinal:"\u1791\u17b8%d",preparse:function(e){return e.replace(/[\u17e1\u17e2\u17e3\u17e4\u17e5\u17e6\u17e7\u17e8\u17e9\u17e0]/g,function(e){return Sn[e]})},postformat:function(e){return e.replace(/\d/g,function(e){return bn[e]})},week:{dow:1,doy:4}});var Hn={1:"\u0ce7",2:"\u0ce8",3:"\u0ce9",4:"\u0cea",5:"\u0ceb",6:"\u0cec",7:"\u0ced",8:"\u0cee",9:"\u0cef",0:"\u0ce6"},jn={"\u0ce7":"1","\u0ce8":"2","\u0ce9":"3","\u0cea":"4","\u0ceb":"5","\u0cec":"6","\u0ced":"7","\u0cee":"8","\u0cef":"9","\u0ce6":"0"};M.defineLocale("kn",{months:"\u0c9c\u0ca8\u0cb5\u0cb0\u0cbf_\u0cab\u0cc6\u0cac\u0ccd\u0cb0\u0cb5\u0cb0\u0cbf_\u0cae\u0cbe\u0cb0\u0ccd\u0c9a\u0ccd_\u0c8f\u0caa\u0ccd\u0cb0\u0cbf\u0cb2\u0ccd_\u0cae\u0cc6\u0cd5_\u0c9c\u0cc2\u0ca8\u0ccd_\u0c9c\u0cc1\u0cb2\u0cc6\u0cd6_\u0c86\u0c97\u0cb8\u0ccd\u0c9f\u0ccd_\u0cb8\u0cc6\u0caa\u0ccd\u0c9f\u0cc6\u0c82\u0cac\u0cb0\u0ccd_\u0c85\u0c95\u0ccd\u0c9f\u0cc6\u0cc2\u0cd5\u0cac\u0cb0\u0ccd_\u0ca8\u0cb5\u0cc6\u0c82\u0cac\u0cb0\u0ccd_\u0ca1\u0cbf\u0cb8\u0cc6\u0c82\u0cac\u0cb0\u0ccd".split("_"),monthsShort:"\u0c9c\u0ca8_\u0cab\u0cc6\u0cac\u0ccd\u0cb0_\u0cae\u0cbe\u0cb0\u0ccd\u0c9a\u0ccd_\u0c8f\u0caa\u0ccd\u0cb0\u0cbf\u0cb2\u0ccd_\u0cae\u0cc6\u0cd5_\u0c9c\u0cc2\u0ca8\u0ccd_\u0c9c\u0cc1\u0cb2\u0cc6\u0cd6_\u0c86\u0c97\u0cb8\u0ccd\u0c9f\u0ccd_\u0cb8\u0cc6\u0caa\u0ccd\u0c9f\u0cc6\u0c82_\u0c85\u0c95\u0ccd\u0c9f\u0cc6\u0cc2\u0cd5_\u0ca8\u0cb5\u0cc6\u0c82_\u0ca1\u0cbf\u0cb8\u0cc6\u0c82".split("_"),monthsParseExact:!0,weekdays:"\u0cad\u0cbe\u0ca8\u0cc1\u0cb5\u0cbe\u0cb0_\u0cb8\u0cc6\u0cc2\u0cd5\u0cae\u0cb5\u0cbe\u0cb0_\u0cae\u0c82\u0c97\u0cb3\u0cb5\u0cbe\u0cb0_\u0cac\u0cc1\u0ca7\u0cb5\u0cbe\u0cb0_\u0c97\u0cc1\u0cb0\u0cc1\u0cb5\u0cbe\u0cb0_\u0cb6\u0cc1\u0c95\u0ccd\u0cb0\u0cb5\u0cbe\u0cb0_\u0cb6\u0ca8\u0cbf\u0cb5\u0cbe\u0cb0".split("_"),weekdaysShort:"\u0cad\u0cbe\u0ca8\u0cc1_\u0cb8\u0cc6\u0cc2\u0cd5\u0cae_\u0cae\u0c82\u0c97\u0cb3_\u0cac\u0cc1\u0ca7_\u0c97\u0cc1\u0cb0\u0cc1_\u0cb6\u0cc1\u0c95\u0ccd\u0cb0_\u0cb6\u0ca8\u0cbf".split("_"),weekdaysMin:"\u0cad\u0cbe_\u0cb8\u0cc6\u0cc2\u0cd5_\u0cae\u0c82_\u0cac\u0cc1_\u0c97\u0cc1_\u0cb6\u0cc1_\u0cb6".split("_"),longDateFormat:{LT:"A h:mm",LTS:"A h:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm",LLLL:"dddd, D MMMM YYYY, A h:mm"},calendar:{sameDay:"[\u0c87\u0c82\u0ca6\u0cc1] LT",nextDay:"[\u0ca8\u0cbe\u0cb3\u0cc6] LT",nextWeek:"dddd, LT",lastDay:"[\u0ca8\u0cbf\u0ca8\u0ccd\u0ca8\u0cc6] LT",lastWeek:"[\u0c95\u0cc6\u0cc2\u0ca8\u0cc6\u0caf] dddd, LT",sameElse:"L"},relativeTime:{future:"%s \u0ca8\u0c82\u0ca4\u0cb0",past:"%s \u0cb9\u0cbf\u0c82\u0ca6\u0cc6",s:"\u0c95\u0cc6\u0cb2\u0cb5\u0cc1 \u0c95\u0ccd\u0cb7\u0ca3\u0c97\u0cb3\u0cc1",ss:"%d \u0cb8\u0cc6\u0c95\u0cc6\u0c82\u0ca1\u0cc1\u0c97\u0cb3\u0cc1",m:"\u0c92\u0c82\u0ca6\u0cc1 \u0ca8\u0cbf\u0cae\u0cbf\u0cb7",mm:"%d \u0ca8\u0cbf\u0cae\u0cbf\u0cb7",h:"\u0c92\u0c82\u0ca6\u0cc1 \u0c97\u0c82\u0c9f\u0cc6",hh:"%d \u0c97\u0c82\u0c9f\u0cc6",d:"\u0c92\u0c82\u0ca6\u0cc1 \u0ca6\u0cbf\u0ca8",dd:"%d \u0ca6\u0cbf\u0ca8",M:"\u0c92\u0c82\u0ca6\u0cc1 \u0ca4\u0cbf\u0c82\u0c97\u0cb3\u0cc1",MM:"%d \u0ca4\u0cbf\u0c82\u0c97\u0cb3\u0cc1",y:"\u0c92\u0c82\u0ca6\u0cc1 \u0cb5\u0cb0\u0ccd\u0cb7",yy:"%d \u0cb5\u0cb0\u0ccd\u0cb7"},preparse:function(e){return e.replace(/[\u0ce7\u0ce8\u0ce9\u0cea\u0ceb\u0cec\u0ced\u0cee\u0cef\u0ce6]/g,function(e){return jn[e]})},postformat:function(e){return e.replace(/\d/g,function(e){return Hn[e]})},meridiemParse:/\u0cb0\u0cbe\u0ca4\u0ccd\u0cb0\u0cbf|\u0cac\u0cc6\u0cb3\u0cbf\u0c97\u0ccd\u0c97\u0cc6|\u0cae\u0ca7\u0ccd\u0caf\u0cbe\u0cb9\u0ccd\u0ca8|\u0cb8\u0c82\u0c9c\u0cc6/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u0cb0\u0cbe\u0ca4\u0ccd\u0cb0\u0cbf"===a?e<4?e:e+12:"\u0cac\u0cc6\u0cb3\u0cbf\u0c97\u0ccd\u0c97\u0cc6"===a?e:"\u0cae\u0ca7\u0ccd\u0caf\u0cbe\u0cb9\u0ccd\u0ca8"===a?10<=e?e:e+12:"\u0cb8\u0c82\u0c9c\u0cc6"===a?e+12:void 0},meridiem:function(e,a,t){return e<4?"\u0cb0\u0cbe\u0ca4\u0ccd\u0cb0\u0cbf":e<10?"\u0cac\u0cc6\u0cb3\u0cbf\u0c97\u0ccd\u0c97\u0cc6":e<17?"\u0cae\u0ca7\u0ccd\u0caf\u0cbe\u0cb9\u0ccd\u0ca8":e<20?"\u0cb8\u0c82\u0c9c\u0cc6":"\u0cb0\u0cbe\u0ca4\u0ccd\u0cb0\u0cbf"},dayOfMonthOrdinalParse:/\d{1,2}(\u0ca8\u0cc6\u0cd5)/,ordinal:function(e){return e+"\u0ca8\u0cc6\u0cd5"},week:{dow:0,doy:6}}),M.defineLocale("ko",{months:"1\uc6d4_2\uc6d4_3\uc6d4_4\uc6d4_5\uc6d4_6\uc6d4_7\uc6d4_8\uc6d4_9\uc6d4_10\uc6d4_11\uc6d4_12\uc6d4".split("_"),monthsShort:"1\uc6d4_2\uc6d4_3\uc6d4_4\uc6d4_5\uc6d4_6\uc6d4_7\uc6d4_8\uc6d4_9\uc6d4_10\uc6d4_11\uc6d4_12\uc6d4".split("_"),weekdays:"\uc77c\uc694\uc77c_\uc6d4\uc694\uc77c_\ud654\uc694\uc77c_\uc218\uc694\uc77c_\ubaa9\uc694\uc77c_\uae08\uc694\uc77c_\ud1a0\uc694\uc77c".split("_"),weekdaysShort:"\uc77c_\uc6d4_\ud654_\uc218_\ubaa9_\uae08_\ud1a0".split("_"),weekdaysMin:"\uc77c_\uc6d4_\ud654_\uc218_\ubaa9_\uae08_\ud1a0".split("_"),longDateFormat:{LT:"A h:mm",LTS:"A h:mm:ss",L:"YYYY.MM.DD.",LL:"YYYY\ub144 MMMM D\uc77c",LLL:"YYYY\ub144 MMMM D\uc77c A h:mm",LLLL:"YYYY\ub144 MMMM D\uc77c dddd A h:mm",l:"YYYY.MM.DD.",ll:"YYYY\ub144 MMMM D\uc77c",lll:"YYYY\ub144 MMMM D\uc77c A h:mm",llll:"YYYY\ub144 MMMM D\uc77c dddd A h:mm"},calendar:{sameDay:"\uc624\ub298 LT",nextDay:"\ub0b4\uc77c LT",nextWeek:"dddd LT",lastDay:"\uc5b4\uc81c LT",lastWeek:"\uc9c0\ub09c\uc8fc dddd LT",sameElse:"L"},relativeTime:{future:"%s \ud6c4",past:"%s \uc804",s:"\uba87 \ucd08",ss:"%d\ucd08",m:"1\ubd84",mm:"%d\ubd84",h:"\ud55c \uc2dc\uac04",hh:"%d\uc2dc\uac04",d:"\ud558\ub8e8",dd:"%d\uc77c",M:"\ud55c \ub2ec",MM:"%d\ub2ec",y:"\uc77c \ub144",yy:"%d\ub144"},dayOfMonthOrdinalParse:/\d{1,2}(\uc77c|\uc6d4|\uc8fc)/,ordinal:function(e,a){switch(a){case"d":case"D":case"DDD":return e+"\uc77c";case"M":return e+"\uc6d4";case"w":case"W":return e+"\uc8fc";default:return e}},meridiemParse:/\uc624\uc804|\uc624\ud6c4/,isPM:function(e){return"\uc624\ud6c4"===e},meridiem:function(e,a,t){return e<12?"\uc624\uc804":"\uc624\ud6c4"}});var xn={1:"\u0661",2:"\u0662",3:"\u0663",4:"\u0664",5:"\u0665",6:"\u0666",7:"\u0667",8:"\u0668",9:"\u0669",0:"\u0660"},Pn={"\u0661":"1","\u0662":"2","\u0663":"3","\u0664":"4","\u0665":"5","\u0666":"6","\u0667":"7","\u0668":"8","\u0669":"9","\u0660":"0"},On=["\u06a9\u0627\u0646\u0648\u0646\u06cc \u062f\u0648\u0648\u06d5\u0645","\u0634\u0648\u0628\u0627\u062a","\u0626\u0627\u0632\u0627\u0631","\u0646\u06cc\u0633\u0627\u0646","\u0626\u0627\u06cc\u0627\u0631","\u062d\u0648\u0632\u06d5\u06cc\u0631\u0627\u0646","\u062a\u06d5\u0645\u0645\u0648\u0632","\u0626\u0627\u0628","\u0626\u06d5\u06cc\u0644\u0648\u0648\u0644","\u062a\u0634\u0631\u06cc\u0646\u06cc \u06cc\u06d5\u0643\u06d5\u0645","\u062a\u0634\u0631\u06cc\u0646\u06cc \u062f\u0648\u0648\u06d5\u0645","\u0643\u0627\u0646\u0648\u0646\u06cc \u06cc\u06d5\u06a9\u06d5\u0645"];M.defineLocale("ku",{months:On,monthsShort:On,weekdays:"\u06cc\u0647\u200c\u0643\u0634\u0647\u200c\u0645\u0645\u0647\u200c_\u062f\u0648\u0648\u0634\u0647\u200c\u0645\u0645\u0647\u200c_\u0633\u06ce\u0634\u0647\u200c\u0645\u0645\u0647\u200c_\u0686\u0648\u0627\u0631\u0634\u0647\u200c\u0645\u0645\u0647\u200c_\u067e\u06ce\u0646\u062c\u0634\u0647\u200c\u0645\u0645\u0647\u200c_\u0647\u0647\u200c\u06cc\u0646\u06cc_\u0634\u0647\u200c\u0645\u0645\u0647\u200c".split("_"),weekdaysShort:"\u06cc\u0647\u200c\u0643\u0634\u0647\u200c\u0645_\u062f\u0648\u0648\u0634\u0647\u200c\u0645_\u0633\u06ce\u0634\u0647\u200c\u0645_\u0686\u0648\u0627\u0631\u0634\u0647\u200c\u0645_\u067e\u06ce\u0646\u062c\u0634\u0647\u200c\u0645_\u0647\u0647\u200c\u06cc\u0646\u06cc_\u0634\u0647\u200c\u0645\u0645\u0647\u200c".split("_"),weekdaysMin:"\u06cc_\u062f_\u0633_\u0686_\u067e_\u0647_\u0634".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},meridiemParse:/\u0626\u06ce\u0648\u0627\u0631\u0647\u200c|\u0628\u0647\u200c\u06cc\u0627\u0646\u06cc/,isPM:function(e){return/\u0626\u06ce\u0648\u0627\u0631\u0647\u200c/.test(e)},meridiem:function(e,a,t){return e<12?"\u0628\u0647\u200c\u06cc\u0627\u0646\u06cc":"\u0626\u06ce\u0648\u0627\u0631\u0647\u200c"},calendar:{sameDay:"[\u0626\u0647\u200c\u0645\u0631\u06c6 \u0643\u0627\u062a\u0698\u0645\u06ce\u0631] LT",nextDay:"[\u0628\u0647\u200c\u06cc\u0627\u0646\u06cc \u0643\u0627\u062a\u0698\u0645\u06ce\u0631] LT",nextWeek:"dddd [\u0643\u0627\u062a\u0698\u0645\u06ce\u0631] LT",lastDay:"[\u062f\u0648\u06ce\u0646\u06ce \u0643\u0627\u062a\u0698\u0645\u06ce\u0631] LT",lastWeek:"dddd [\u0643\u0627\u062a\u0698\u0645\u06ce\u0631] LT",sameElse:"L"},relativeTime:{future:"\u0644\u0647\u200c %s",past:"%s",s:"\u0686\u0647\u200c\u0646\u062f \u0686\u0631\u0643\u0647\u200c\u06cc\u0647\u200c\u0643",ss:"\u0686\u0631\u0643\u0647\u200c %d",m:"\u06cc\u0647\u200c\u0643 \u062e\u0648\u0644\u0647\u200c\u0643",mm:"%d \u062e\u0648\u0644\u0647\u200c\u0643",h:"\u06cc\u0647\u200c\u0643 \u0643\u0627\u062a\u0698\u0645\u06ce\u0631",hh:"%d \u0643\u0627\u062a\u0698\u0645\u06ce\u0631",d:"\u06cc\u0647\u200c\u0643 \u0695\u06c6\u0698",dd:"%d \u0695\u06c6\u0698",M:"\u06cc\u0647\u200c\u0643 \u0645\u0627\u0646\u06af",MM:"%d \u0645\u0627\u0646\u06af",y:"\u06cc\u0647\u200c\u0643 \u0633\u0627\u06b5",yy:"%d \u0633\u0627\u06b5"},preparse:function(e){return e.replace(/[\u0661\u0662\u0663\u0664\u0665\u0666\u0667\u0668\u0669\u0660]/g,function(e){return Pn[e]}).replace(/\u060c/g,",")},postformat:function(e){return e.replace(/\d/g,function(e){return xn[e]}).replace(/,/g,"\u060c")},week:{dow:6,doy:12}});var Wn={0:"-\u0447\u04af",1:"-\u0447\u0438",2:"-\u0447\u0438",3:"-\u0447\u04af",4:"-\u0447\u04af",5:"-\u0447\u0438",6:"-\u0447\u044b",7:"-\u0447\u0438",8:"-\u0447\u0438",9:"-\u0447\u0443",10:"-\u0447\u0443",20:"-\u0447\u044b",30:"-\u0447\u0443",40:"-\u0447\u044b",50:"-\u0447\u04af",60:"-\u0447\u044b",70:"-\u0447\u0438",80:"-\u0447\u0438",90:"-\u0447\u0443",100:"-\u0447\u04af"};function An(e,a,t,s){var n={m:["eng Minutt","enger Minutt"],h:["eng Stonn","enger Stonn"],d:["een Dag","engem Dag"],M:["ee Mount","engem Mount"],y:["ee Joer","engem Joer"]};return a?n[t][0]:n[t][1]}function En(e){if(e=parseInt(e,10),isNaN(e))return!1;if(e<0)return!0;if(e<10)return 4<=e&&e<=7;if(e<100){var a=e%10;return 0==a?En(e/10):En(a)}if(e<1e4){for(;10<=e;)e/=10;return En(e)}return En(e/=1e3)}M.defineLocale("ky",{months:"\u044f\u043d\u0432\u0430\u0440\u044c_\u0444\u0435\u0432\u0440\u0430\u043b\u044c_\u043c\u0430\u0440\u0442_\u0430\u043f\u0440\u0435\u043b\u044c_\u043c\u0430\u0439_\u0438\u044e\u043d\u044c_\u0438\u044e\u043b\u044c_\u0430\u0432\u0433\u0443\u0441\u0442_\u0441\u0435\u043d\u0442\u044f\u0431\u0440\u044c_\u043e\u043a\u0442\u044f\u0431\u0440\u044c_\u043d\u043e\u044f\u0431\u0440\u044c_\u0434\u0435\u043a\u0430\u0431\u0440\u044c".split("_"),monthsShort:"\u044f\u043d\u0432_\u0444\u0435\u0432_\u043c\u0430\u0440\u0442_\u0430\u043f\u0440_\u043c\u0430\u0439_\u0438\u044e\u043d\u044c_\u0438\u044e\u043b\u044c_\u0430\u0432\u0433_\u0441\u0435\u043d_\u043e\u043a\u0442_\u043d\u043e\u044f_\u0434\u0435\u043a".split("_"),weekdays:"\u0416\u0435\u043a\u0448\u0435\u043c\u0431\u0438_\u0414\u04af\u0439\u0448\u04e9\u043c\u0431\u04af_\u0428\u0435\u0439\u0448\u0435\u043c\u0431\u0438_\u0428\u0430\u0440\u0448\u0435\u043c\u0431\u0438_\u0411\u0435\u0439\u0448\u0435\u043c\u0431\u0438_\u0416\u0443\u043c\u0430_\u0418\u0448\u0435\u043c\u0431\u0438".split("_"),weekdaysShort:"\u0416\u0435\u043a_\u0414\u04af\u0439_\u0428\u0435\u0439_\u0428\u0430\u0440_\u0411\u0435\u0439_\u0416\u0443\u043c_\u0418\u0448\u0435".split("_"),weekdaysMin:"\u0416\u043a_\u0414\u0439_\u0428\u0439_\u0428\u0440_\u0411\u0439_\u0416\u043c_\u0418\u0448".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[\u0411\u04af\u0433\u04af\u043d \u0441\u0430\u0430\u0442] LT",nextDay:"[\u042d\u0440\u0442\u0435\u04a3 \u0441\u0430\u0430\u0442] LT",nextWeek:"dddd [\u0441\u0430\u0430\u0442] LT",lastDay:"[\u041a\u0435\u0447\u044d\u044d \u0441\u0430\u0430\u0442] LT",lastWeek:"[\u04e8\u0442\u043a\u04e9\u043d \u0430\u043f\u0442\u0430\u043d\u044b\u043d] dddd [\u043a\u04af\u043d\u04af] [\u0441\u0430\u0430\u0442] LT",sameElse:"L"},relativeTime:{future:"%s \u0438\u0447\u0438\u043d\u0434\u0435",past:"%s \u043c\u0443\u0440\u0443\u043d",s:"\u0431\u0438\u0440\u043d\u0435\u0447\u0435 \u0441\u0435\u043a\u0443\u043d\u0434",ss:"%d \u0441\u0435\u043a\u0443\u043d\u0434",m:"\u0431\u0438\u0440 \u043c\u04af\u043d\u04e9\u0442",mm:"%d \u043c\u04af\u043d\u04e9\u0442",h:"\u0431\u0438\u0440 \u0441\u0430\u0430\u0442",hh:"%d \u0441\u0430\u0430\u0442",d:"\u0431\u0438\u0440 \u043a\u04af\u043d",dd:"%d \u043a\u04af\u043d",M:"\u0431\u0438\u0440 \u0430\u0439",MM:"%d \u0430\u0439",y:"\u0431\u0438\u0440 \u0436\u044b\u043b",yy:"%d \u0436\u044b\u043b"},dayOfMonthOrdinalParse:/\d{1,2}-(\u0447\u0438|\u0447\u044b|\u0447\u04af|\u0447\u0443)/,ordinal:function(e){return e+(Wn[e]||Wn[e%10]||Wn[100<=e?100:null])},week:{dow:1,doy:7}}),M.defineLocale("lb",{months:"Januar_Februar_M\xe4erz_Abr\xebll_Mee_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jan._Febr._Mrz._Abr._Mee_Jun._Jul._Aug._Sept._Okt._Nov._Dez.".split("_"),monthsParseExact:!0,weekdays:"Sonndeg_M\xe9indeg_D\xebnschdeg_M\xebttwoch_Donneschdeg_Freideg_Samschdeg".split("_"),weekdaysShort:"So._M\xe9._D\xeb._M\xeb._Do._Fr._Sa.".split("_"),weekdaysMin:"So_M\xe9_D\xeb_M\xeb_Do_Fr_Sa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm [Auer]",LTS:"H:mm:ss [Auer]",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm [Auer]",LLLL:"dddd, D. MMMM YYYY H:mm [Auer]"},calendar:{sameDay:"[Haut um] LT",sameElse:"L",nextDay:"[Muer um] LT",nextWeek:"dddd [um] LT",lastDay:"[G\xebschter um] LT",lastWeek:function(){switch(this.day()){case 2:case 4:return"[Leschten] dddd [um] LT";default:return"[Leschte] dddd [um] LT"}}},relativeTime:{future:function(e){return En(e.substr(0,e.indexOf(" ")))?"a "+e:"an "+e},past:function(e){return En(e.substr(0,e.indexOf(" ")))?"viru "+e:"virun "+e},s:"e puer Sekonnen",ss:"%d Sekonnen",m:An,mm:"%d Minutten",h:An,hh:"%d Stonnen",d:An,dd:"%d Deeg",M:An,MM:"%d M\xe9int",y:An,yy:"%d Joer"},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),M.defineLocale("lo",{months:"\u0ea1\u0eb1\u0e87\u0e81\u0ead\u0e99_\u0e81\u0eb8\u0ea1\u0e9e\u0eb2_\u0ea1\u0eb5\u0e99\u0eb2_\u0ec0\u0ea1\u0eaa\u0eb2_\u0e9e\u0eb6\u0e94\u0eaa\u0eb0\u0e9e\u0eb2_\u0ea1\u0eb4\u0e96\u0eb8\u0e99\u0eb2_\u0e81\u0ecd\u0ea5\u0eb0\u0e81\u0ebb\u0e94_\u0eaa\u0eb4\u0e87\u0eab\u0eb2_\u0e81\u0eb1\u0e99\u0e8d\u0eb2_\u0e95\u0eb8\u0ea5\u0eb2_\u0e9e\u0eb0\u0e88\u0eb4\u0e81_\u0e97\u0eb1\u0e99\u0ea7\u0eb2".split("_"),monthsShort:"\u0ea1\u0eb1\u0e87\u0e81\u0ead\u0e99_\u0e81\u0eb8\u0ea1\u0e9e\u0eb2_\u0ea1\u0eb5\u0e99\u0eb2_\u0ec0\u0ea1\u0eaa\u0eb2_\u0e9e\u0eb6\u0e94\u0eaa\u0eb0\u0e9e\u0eb2_\u0ea1\u0eb4\u0e96\u0eb8\u0e99\u0eb2_\u0e81\u0ecd\u0ea5\u0eb0\u0e81\u0ebb\u0e94_\u0eaa\u0eb4\u0e87\u0eab\u0eb2_\u0e81\u0eb1\u0e99\u0e8d\u0eb2_\u0e95\u0eb8\u0ea5\u0eb2_\u0e9e\u0eb0\u0e88\u0eb4\u0e81_\u0e97\u0eb1\u0e99\u0ea7\u0eb2".split("_"),weekdays:"\u0ead\u0eb2\u0e97\u0eb4\u0e94_\u0e88\u0eb1\u0e99_\u0ead\u0eb1\u0e87\u0e84\u0eb2\u0e99_\u0e9e\u0eb8\u0e94_\u0e9e\u0eb0\u0eab\u0eb1\u0e94_\u0eaa\u0eb8\u0e81_\u0ec0\u0eaa\u0ebb\u0eb2".split("_"),weekdaysShort:"\u0e97\u0eb4\u0e94_\u0e88\u0eb1\u0e99_\u0ead\u0eb1\u0e87\u0e84\u0eb2\u0e99_\u0e9e\u0eb8\u0e94_\u0e9e\u0eb0\u0eab\u0eb1\u0e94_\u0eaa\u0eb8\u0e81_\u0ec0\u0eaa\u0ebb\u0eb2".split("_"),weekdaysMin:"\u0e97_\u0e88_\u0ead\u0e84_\u0e9e_\u0e9e\u0eab_\u0eaa\u0e81_\u0eaa".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"\u0ea7\u0eb1\u0e99dddd D MMMM YYYY HH:mm"},meridiemParse:/\u0e95\u0ead\u0e99\u0ec0\u0e8a\u0ebb\u0ec9\u0eb2|\u0e95\u0ead\u0e99\u0ec1\u0ea5\u0e87/,isPM:function(e){return"\u0e95\u0ead\u0e99\u0ec1\u0ea5\u0e87"===e},meridiem:function(e,a,t){return e<12?"\u0e95\u0ead\u0e99\u0ec0\u0e8a\u0ebb\u0ec9\u0eb2":"\u0e95\u0ead\u0e99\u0ec1\u0ea5\u0e87"},calendar:{sameDay:"[\u0ea1\u0eb7\u0ec9\u0e99\u0eb5\u0ec9\u0ec0\u0ea7\u0ea5\u0eb2] LT",nextDay:"[\u0ea1\u0eb7\u0ec9\u0ead\u0eb7\u0ec8\u0e99\u0ec0\u0ea7\u0ea5\u0eb2] LT",nextWeek:"[\u0ea7\u0eb1\u0e99]dddd[\u0edc\u0ec9\u0eb2\u0ec0\u0ea7\u0ea5\u0eb2] LT",lastDay:"[\u0ea1\u0eb7\u0ec9\u0ea7\u0eb2\u0e99\u0e99\u0eb5\u0ec9\u0ec0\u0ea7\u0ea5\u0eb2] LT",lastWeek:"[\u0ea7\u0eb1\u0e99]dddd[\u0ec1\u0ea5\u0ec9\u0ea7\u0e99\u0eb5\u0ec9\u0ec0\u0ea7\u0ea5\u0eb2] LT",sameElse:"L"},relativeTime:{future:"\u0ead\u0eb5\u0e81 %s",past:"%s\u0e9c\u0ec8\u0eb2\u0e99\u0ea1\u0eb2",s:"\u0e9a\u0ecd\u0ec8\u0ec0\u0e97\u0ebb\u0ec8\u0eb2\u0ec3\u0e94\u0ea7\u0eb4\u0e99\u0eb2\u0e97\u0eb5",ss:"%d \u0ea7\u0eb4\u0e99\u0eb2\u0e97\u0eb5",m:"1 \u0e99\u0eb2\u0e97\u0eb5",mm:"%d \u0e99\u0eb2\u0e97\u0eb5",h:"1 \u0e8a\u0ebb\u0ec8\u0ea7\u0ec2\u0ea1\u0e87",hh:"%d \u0e8a\u0ebb\u0ec8\u0ea7\u0ec2\u0ea1\u0e87",d:"1 \u0ea1\u0eb7\u0ec9",dd:"%d \u0ea1\u0eb7\u0ec9",M:"1 \u0ec0\u0e94\u0eb7\u0ead\u0e99",MM:"%d \u0ec0\u0e94\u0eb7\u0ead\u0e99",y:"1 \u0e9b\u0eb5",yy:"%d \u0e9b\u0eb5"},dayOfMonthOrdinalParse:/(\u0e97\u0eb5\u0ec8)\d{1,2}/,ordinal:function(e){return"\u0e97\u0eb5\u0ec8"+e}});var Fn={ss:"sekund\u0117_sekund\u017ei\u0173_sekundes",m:"minut\u0117_minut\u0117s_minut\u0119",mm:"minut\u0117s_minu\u010di\u0173_minutes",h:"valanda_valandos_valand\u0105",hh:"valandos_valand\u0173_valandas",d:"diena_dienos_dien\u0105",dd:"dienos_dien\u0173_dienas",M:"m\u0117nuo_m\u0117nesio_m\u0117nes\u012f",MM:"m\u0117nesiai_m\u0117nesi\u0173_m\u0117nesius",y:"metai_met\u0173_metus",yy:"metai_met\u0173_metus"};function zn(e,a,t,s){return a?Jn(t)[0]:s?Jn(t)[1]:Jn(t)[2]}function Nn(e){return e%10==0||10<e&&e<20}function Jn(e){return Fn[e].split("_")}function Rn(e,a,t,s){var n=e+" ";return 1===e?n+zn(0,a,t[0],s):a?n+(Nn(e)?Jn(t)[1]:Jn(t)[0]):s?n+Jn(t)[1]:n+(Nn(e)?Jn(t)[1]:Jn(t)[2])}M.defineLocale("lt",{months:{format:"sausio_vasario_kovo_baland\u017eio_gegu\u017e\u0117s_bir\u017eelio_liepos_rugpj\u016b\u010dio_rugs\u0117jo_spalio_lapkri\u010dio_gruod\u017eio".split("_"),standalone:"sausis_vasaris_kovas_balandis_gegu\u017e\u0117_bir\u017eelis_liepa_rugpj\u016btis_rugs\u0117jis_spalis_lapkritis_gruodis".split("_"),isFormat:/D[oD]?(\[[^\[\]]*\]|\s)+MMMM?|MMMM?(\[[^\[\]]*\]|\s)+D[oD]?/},monthsShort:"sau_vas_kov_bal_geg_bir_lie_rgp_rgs_spa_lap_grd".split("_"),weekdays:{format:"sekmadien\u012f_pirmadien\u012f_antradien\u012f_tre\u010diadien\u012f_ketvirtadien\u012f_penktadien\u012f_\u0161e\u0161tadien\u012f".split("_"),standalone:"sekmadienis_pirmadienis_antradienis_tre\u010diadienis_ketvirtadienis_penktadienis_\u0161e\u0161tadienis".split("_"),isFormat:/dddd HH:mm/},weekdaysShort:"Sek_Pir_Ant_Tre_Ket_Pen_\u0160e\u0161".split("_"),weekdaysMin:"S_P_A_T_K_Pn_\u0160".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"YYYY [m.] MMMM D [d.]",LLL:"YYYY [m.] MMMM D [d.], HH:mm [val.]",LLLL:"YYYY [m.] MMMM D [d.], dddd, HH:mm [val.]",l:"YYYY-MM-DD",ll:"YYYY [m.] MMMM D [d.]",lll:"YYYY [m.] MMMM D [d.], HH:mm [val.]",llll:"YYYY [m.] MMMM D [d.], ddd, HH:mm [val.]"},calendar:{sameDay:"[\u0160iandien] LT",nextDay:"[Rytoj] LT",nextWeek:"dddd LT",lastDay:"[Vakar] LT",lastWeek:"[Pra\u0117jus\u012f] dddd LT",sameElse:"L"},relativeTime:{future:"po %s",past:"prie\u0161 %s",s:function(e,a,t,s){return a?"kelios sekund\u0117s":s?"keli\u0173 sekund\u017ei\u0173":"kelias sekundes"},ss:Rn,m:zn,mm:Rn,h:zn,hh:Rn,d:zn,dd:Rn,M:zn,MM:Rn,y:zn,yy:Rn},dayOfMonthOrdinalParse:/\d{1,2}-oji/,ordinal:function(e){return e+"-oji"},week:{dow:1,doy:4}});var Cn={ss:"sekundes_sekund\u0113m_sekunde_sekundes".split("_"),m:"min\u016btes_min\u016bt\u0113m_min\u016bte_min\u016btes".split("_"),mm:"min\u016btes_min\u016bt\u0113m_min\u016bte_min\u016btes".split("_"),h:"stundas_stund\u0101m_stunda_stundas".split("_"),hh:"stundas_stund\u0101m_stunda_stundas".split("_"),d:"dienas_dien\u0101m_diena_dienas".split("_"),dd:"dienas_dien\u0101m_diena_dienas".split("_"),M:"m\u0113ne\u0161a_m\u0113ne\u0161iem_m\u0113nesis_m\u0113ne\u0161i".split("_"),MM:"m\u0113ne\u0161a_m\u0113ne\u0161iem_m\u0113nesis_m\u0113ne\u0161i".split("_"),y:"gada_gadiem_gads_gadi".split("_"),yy:"gada_gadiem_gads_gadi".split("_")};function In(e,a,t){return t?a%10==1&&a%100!=11?e[2]:e[3]:a%10==1&&a%100!=11?e[0]:e[1]}function Un(e,a,t){return e+" "+In(Cn[t],e,a)}function Gn(e,a,t){return In(Cn[t],e,a)}M.defineLocale("lv",{months:"janv\u0101ris_febru\u0101ris_marts_apr\u012blis_maijs_j\u016bnijs_j\u016blijs_augusts_septembris_oktobris_novembris_decembris".split("_"),monthsShort:"jan_feb_mar_apr_mai_j\u016bn_j\u016bl_aug_sep_okt_nov_dec".split("_"),weekdays:"sv\u0113tdiena_pirmdiena_otrdiena_tre\u0161diena_ceturtdiena_piektdiena_sestdiena".split("_"),weekdaysShort:"Sv_P_O_T_C_Pk_S".split("_"),weekdaysMin:"Sv_P_O_T_C_Pk_S".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY.",LL:"YYYY. [gada] D. MMMM",LLL:"YYYY. [gada] D. MMMM, HH:mm",LLLL:"YYYY. [gada] D. MMMM, dddd, HH:mm"},calendar:{sameDay:"[\u0160odien pulksten] LT",nextDay:"[R\u012bt pulksten] LT",nextWeek:"dddd [pulksten] LT",lastDay:"[Vakar pulksten] LT",lastWeek:"[Pag\u0101ju\u0161\u0101] dddd [pulksten] LT",sameElse:"L"},relativeTime:{future:"p\u0113c %s",past:"pirms %s",s:function(e,a){return a?"da\u017eas sekundes":"da\u017e\u0101m sekund\u0113m"},ss:Un,m:Gn,mm:Un,h:Gn,hh:Un,d:Gn,dd:Un,M:Gn,MM:Un,y:Gn,yy:Un},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});var Vn={words:{ss:["sekund","sekunda","sekundi"],m:["jedan minut","jednog minuta"],mm:["minut","minuta","minuta"],h:["jedan sat","jednog sata"],hh:["sat","sata","sati"],dd:["dan","dana","dana"],MM:["mjesec","mjeseca","mjeseci"],yy:["godina","godine","godina"]},correctGrammaticalCase:function(e,a){return 1===e?a[0]:2<=e&&e<=4?a[1]:a[2]},translate:function(e,a,t){var s=Vn.words[t];return 1===t.length?a?s[0]:s[1]:e+" "+Vn.correctGrammaticalCase(e,s)}};function Bn(e,a,t,s){switch(t){case"s":return a?"\u0445\u044d\u0434\u0445\u044d\u043d \u0441\u0435\u043a\u0443\u043d\u0434":"\u0445\u044d\u0434\u0445\u044d\u043d \u0441\u0435\u043a\u0443\u043d\u0434\u044b\u043d";case"ss":return e+(a?" \u0441\u0435\u043a\u0443\u043d\u0434":" \u0441\u0435\u043a\u0443\u043d\u0434\u044b\u043d");case"m":case"mm":return e+(a?" \u043c\u0438\u043d\u0443\u0442":" \u043c\u0438\u043d\u0443\u0442\u044b\u043d");case"h":case"hh":return e+(a?" \u0446\u0430\u0433":" \u0446\u0430\u0433\u0438\u0439\u043d");case"d":case"dd":return e+(a?" \u04e9\u0434\u04e9\u0440":" \u04e9\u0434\u0440\u0438\u0439\u043d");case"M":case"MM":return e+(a?" \u0441\u0430\u0440":" \u0441\u0430\u0440\u044b\u043d");case"y":case"yy":return e+(a?" \u0436\u0438\u043b":" \u0436\u0438\u043b\u0438\u0439\u043d");default:return e}}M.defineLocale("me",{months:"januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar".split("_"),monthsShort:"jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.".split("_"),monthsParseExact:!0,weekdays:"nedjelja_ponedjeljak_utorak_srijeda_\u010detvrtak_petak_subota".split("_"),weekdaysShort:"ned._pon._uto._sri._\u010det._pet._sub.".split("_"),weekdaysMin:"ne_po_ut_sr_\u010de_pe_su".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm"},calendar:{sameDay:"[danas u] LT",nextDay:"[sjutra u] LT",nextWeek:function(){switch(this.day()){case 0:return"[u] [nedjelju] [u] LT";case 3:return"[u] [srijedu] [u] LT";case 6:return"[u] [subotu] [u] LT";case 1:case 2:case 4:case 5:return"[u] dddd [u] LT"}},lastDay:"[ju\u010de u] LT",lastWeek:function(){return["[pro\u0161le] [nedjelje] [u] LT","[pro\u0161log] [ponedjeljka] [u] LT","[pro\u0161log] [utorka] [u] LT","[pro\u0161le] [srijede] [u] LT","[pro\u0161log] [\u010detvrtka] [u] LT","[pro\u0161log] [petka] [u] LT","[pro\u0161le] [subote] [u] LT"][this.day()]},sameElse:"L"},relativeTime:{future:"za %s",past:"prije %s",s:"nekoliko sekundi",ss:Vn.translate,m:Vn.translate,mm:Vn.translate,h:Vn.translate,hh:Vn.translate,d:"dan",dd:Vn.translate,M:"mjesec",MM:Vn.translate,y:"godinu",yy:Vn.translate},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),M.defineLocale("mi",{months:"Kohi-t\u0101te_Hui-tanguru_Pout\u016b-te-rangi_Paenga-wh\u0101wh\u0101_Haratua_Pipiri_H\u014dngoingoi_Here-turi-k\u014dk\u0101_Mahuru_Whiringa-\u0101-nuku_Whiringa-\u0101-rangi_Hakihea".split("_"),monthsShort:"Kohi_Hui_Pou_Pae_Hara_Pipi_H\u014dngoi_Here_Mahu_Whi-nu_Whi-ra_Haki".split("_"),monthsRegex:/(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,monthsStrictRegex:/(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,monthsShortRegex:/(?:['a-z\u0101\u014D\u016B]+\-?){1,3}/i,monthsShortStrictRegex:/(?:['a-z\u0101\u014D\u016B]+\-?){1,2}/i,weekdays:"R\u0101tapu_Mane_T\u016brei_Wenerei_T\u0101ite_Paraire_H\u0101tarei".split("_"),weekdaysShort:"Ta_Ma_T\u016b_We_T\u0101i_Pa_H\u0101".split("_"),weekdaysMin:"Ta_Ma_T\u016b_We_T\u0101i_Pa_H\u0101".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [i] HH:mm",LLLL:"dddd, D MMMM YYYY [i] HH:mm"},calendar:{sameDay:"[i teie mahana, i] LT",nextDay:"[apopo i] LT",nextWeek:"dddd [i] LT",lastDay:"[inanahi i] LT",lastWeek:"dddd [whakamutunga i] LT",sameElse:"L"},relativeTime:{future:"i roto i %s",past:"%s i mua",s:"te h\u0113kona ruarua",ss:"%d h\u0113kona",m:"he meneti",mm:"%d meneti",h:"te haora",hh:"%d haora",d:"he ra",dd:"%d ra",M:"he marama",MM:"%d marama",y:"he tau",yy:"%d tau"},dayOfMonthOrdinalParse:/\d{1,2}\xba/,ordinal:"%d\xba",week:{dow:1,doy:4}}),M.defineLocale("mk",{months:"\u0458\u0430\u043d\u0443\u0430\u0440\u0438_\u0444\u0435\u0432\u0440\u0443\u0430\u0440\u0438_\u043c\u0430\u0440\u0442_\u0430\u043f\u0440\u0438\u043b_\u043c\u0430\u0458_\u0458\u0443\u043d\u0438_\u0458\u0443\u043b\u0438_\u0430\u0432\u0433\u0443\u0441\u0442_\u0441\u0435\u043f\u0442\u0435\u043c\u0432\u0440\u0438_\u043e\u043a\u0442\u043e\u043c\u0432\u0440\u0438_\u043d\u043e\u0435\u043c\u0432\u0440\u0438_\u0434\u0435\u043a\u0435\u043c\u0432\u0440\u0438".split("_"),monthsShort:"\u0458\u0430\u043d_\u0444\u0435\u0432_\u043c\u0430\u0440_\u0430\u043f\u0440_\u043c\u0430\u0458_\u0458\u0443\u043d_\u0458\u0443\u043b_\u0430\u0432\u0433_\u0441\u0435\u043f_\u043e\u043a\u0442_\u043d\u043e\u0435_\u0434\u0435\u043a".split("_"),weekdays:"\u043d\u0435\u0434\u0435\u043b\u0430_\u043f\u043e\u043d\u0435\u0434\u0435\u043b\u043d\u0438\u043a_\u0432\u0442\u043e\u0440\u043d\u0438\u043a_\u0441\u0440\u0435\u0434\u0430_\u0447\u0435\u0442\u0432\u0440\u0442\u043e\u043a_\u043f\u0435\u0442\u043e\u043a_\u0441\u0430\u0431\u043e\u0442\u0430".split("_"),weekdaysShort:"\u043d\u0435\u0434_\u043f\u043e\u043d_\u0432\u0442\u043e_\u0441\u0440\u0435_\u0447\u0435\u0442_\u043f\u0435\u0442_\u0441\u0430\u0431".split("_"),weekdaysMin:"\u043de_\u043fo_\u0432\u0442_\u0441\u0440_\u0447\u0435_\u043f\u0435_\u0441a".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"D.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY H:mm",LLLL:"dddd, D MMMM YYYY H:mm"},calendar:{sameDay:"[\u0414\u0435\u043d\u0435\u0441 \u0432\u043e] LT",nextDay:"[\u0423\u0442\u0440\u0435 \u0432\u043e] LT",nextWeek:"[\u0412\u043e] dddd [\u0432\u043e] LT",lastDay:"[\u0412\u0447\u0435\u0440\u0430 \u0432\u043e] LT",lastWeek:function(){switch(this.day()){case 0:case 3:case 6:return"[\u0418\u0437\u043c\u0438\u043d\u0430\u0442\u0430\u0442\u0430] dddd [\u0432\u043e] LT";case 1:case 2:case 4:case 5:return"[\u0418\u0437\u043c\u0438\u043d\u0430\u0442\u0438\u043e\u0442] dddd [\u0432\u043e] LT"}},sameElse:"L"},relativeTime:{future:"\u0437\u0430 %s",past:"\u043f\u0440\u0435\u0434 %s",s:"\u043d\u0435\u043a\u043e\u043b\u043a\u0443 \u0441\u0435\u043a\u0443\u043d\u0434\u0438",ss:"%d \u0441\u0435\u043a\u0443\u043d\u0434\u0438",m:"\u0435\u0434\u043d\u0430 \u043c\u0438\u043d\u0443\u0442\u0430",mm:"%d \u043c\u0438\u043d\u0443\u0442\u0438",h:"\u0435\u0434\u0435\u043d \u0447\u0430\u0441",hh:"%d \u0447\u0430\u0441\u0430",d:"\u0435\u0434\u0435\u043d \u0434\u0435\u043d",dd:"%d \u0434\u0435\u043d\u0430",M:"\u0435\u0434\u0435\u043d \u043c\u0435\u0441\u0435\u0446",MM:"%d \u043c\u0435\u0441\u0435\u0446\u0438",y:"\u0435\u0434\u043d\u0430 \u0433\u043e\u0434\u0438\u043d\u0430",yy:"%d \u0433\u043e\u0434\u0438\u043d\u0438"},dayOfMonthOrdinalParse:/\d{1,2}-(\u0435\u0432|\u0435\u043d|\u0442\u0438|\u0432\u0438|\u0440\u0438|\u043c\u0438)/,ordinal:function(e){var a=e%10,t=e%100;return 0===e?e+"-\u0435\u0432":0==t?e+"-\u0435\u043d":10<t&&t<20?e+"-\u0442\u0438":1==a?e+"-\u0432\u0438":2==a?e+"-\u0440\u0438":7==a||8==a?e+"-\u043c\u0438":e+"-\u0442\u0438"},week:{dow:1,doy:7}}),M.defineLocale("ml",{months:"\u0d1c\u0d28\u0d41\u0d35\u0d30\u0d3f_\u0d2b\u0d46\u0d2c\u0d4d\u0d30\u0d41\u0d35\u0d30\u0d3f_\u0d2e\u0d3e\u0d7c\u0d1a\u0d4d\u0d1a\u0d4d_\u0d0f\u0d2a\u0d4d\u0d30\u0d3f\u0d7d_\u0d2e\u0d47\u0d2f\u0d4d_\u0d1c\u0d42\u0d7a_\u0d1c\u0d42\u0d32\u0d48_\u0d13\u0d17\u0d38\u0d4d\u0d31\u0d4d\u0d31\u0d4d_\u0d38\u0d46\u0d2a\u0d4d\u0d31\u0d4d\u0d31\u0d02\u0d2c\u0d7c_\u0d12\u0d15\u0d4d\u0d1f\u0d4b\u0d2c\u0d7c_\u0d28\u0d35\u0d02\u0d2c\u0d7c_\u0d21\u0d3f\u0d38\u0d02\u0d2c\u0d7c".split("_"),monthsShort:"\u0d1c\u0d28\u0d41._\u0d2b\u0d46\u0d2c\u0d4d\u0d30\u0d41._\u0d2e\u0d3e\u0d7c._\u0d0f\u0d2a\u0d4d\u0d30\u0d3f._\u0d2e\u0d47\u0d2f\u0d4d_\u0d1c\u0d42\u0d7a_\u0d1c\u0d42\u0d32\u0d48._\u0d13\u0d17._\u0d38\u0d46\u0d2a\u0d4d\u0d31\u0d4d\u0d31._\u0d12\u0d15\u0d4d\u0d1f\u0d4b._\u0d28\u0d35\u0d02._\u0d21\u0d3f\u0d38\u0d02.".split("_"),monthsParseExact:!0,weekdays:"\u0d1e\u0d3e\u0d2f\u0d31\u0d3e\u0d34\u0d4d\u0d1a_\u0d24\u0d3f\u0d19\u0d4d\u0d15\u0d33\u0d3e\u0d34\u0d4d\u0d1a_\u0d1a\u0d4a\u0d35\u0d4d\u0d35\u0d3e\u0d34\u0d4d\u0d1a_\u0d2c\u0d41\u0d27\u0d28\u0d3e\u0d34\u0d4d\u0d1a_\u0d35\u0d4d\u0d2f\u0d3e\u0d34\u0d3e\u0d34\u0d4d\u0d1a_\u0d35\u0d46\u0d33\u0d4d\u0d33\u0d3f\u0d2f\u0d3e\u0d34\u0d4d\u0d1a_\u0d36\u0d28\u0d3f\u0d2f\u0d3e\u0d34\u0d4d\u0d1a".split("_"),weekdaysShort:"\u0d1e\u0d3e\u0d2f\u0d7c_\u0d24\u0d3f\u0d19\u0d4d\u0d15\u0d7e_\u0d1a\u0d4a\u0d35\u0d4d\u0d35_\u0d2c\u0d41\u0d27\u0d7b_\u0d35\u0d4d\u0d2f\u0d3e\u0d34\u0d02_\u0d35\u0d46\u0d33\u0d4d\u0d33\u0d3f_\u0d36\u0d28\u0d3f".split("_"),weekdaysMin:"\u0d1e\u0d3e_\u0d24\u0d3f_\u0d1a\u0d4a_\u0d2c\u0d41_\u0d35\u0d4d\u0d2f\u0d3e_\u0d35\u0d46_\u0d36".split("_"),longDateFormat:{LT:"A h:mm -\u0d28\u0d41",LTS:"A h:mm:ss -\u0d28\u0d41",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm -\u0d28\u0d41",LLLL:"dddd, D MMMM YYYY, A h:mm -\u0d28\u0d41"},calendar:{sameDay:"[\u0d07\u0d28\u0d4d\u0d28\u0d4d] LT",nextDay:"[\u0d28\u0d3e\u0d33\u0d46] LT",nextWeek:"dddd, LT",lastDay:"[\u0d07\u0d28\u0d4d\u0d28\u0d32\u0d46] LT",lastWeek:"[\u0d15\u0d34\u0d3f\u0d1e\u0d4d\u0d1e] dddd, LT",sameElse:"L"},relativeTime:{future:"%s \u0d15\u0d34\u0d3f\u0d1e\u0d4d\u0d1e\u0d4d",past:"%s \u0d2e\u0d41\u0d7b\u0d2a\u0d4d",s:"\u0d05\u0d7d\u0d2a \u0d28\u0d3f\u0d2e\u0d3f\u0d37\u0d19\u0d4d\u0d19\u0d7e",ss:"%d \u0d38\u0d46\u0d15\u0d4d\u0d15\u0d7b\u0d21\u0d4d",m:"\u0d12\u0d30\u0d41 \u0d2e\u0d3f\u0d28\u0d3f\u0d31\u0d4d\u0d31\u0d4d",mm:"%d \u0d2e\u0d3f\u0d28\u0d3f\u0d31\u0d4d\u0d31\u0d4d",h:"\u0d12\u0d30\u0d41 \u0d2e\u0d23\u0d3f\u0d15\u0d4d\u0d15\u0d42\u0d7c",hh:"%d \u0d2e\u0d23\u0d3f\u0d15\u0d4d\u0d15\u0d42\u0d7c",d:"\u0d12\u0d30\u0d41 \u0d26\u0d3f\u0d35\u0d38\u0d02",dd:"%d \u0d26\u0d3f\u0d35\u0d38\u0d02",M:"\u0d12\u0d30\u0d41 \u0d2e\u0d3e\u0d38\u0d02",MM:"%d \u0d2e\u0d3e\u0d38\u0d02",y:"\u0d12\u0d30\u0d41 \u0d35\u0d7c\u0d37\u0d02",yy:"%d \u0d35\u0d7c\u0d37\u0d02"},meridiemParse:/\u0d30\u0d3e\u0d24\u0d4d\u0d30\u0d3f|\u0d30\u0d3e\u0d35\u0d3f\u0d32\u0d46|\u0d09\u0d1a\u0d4d\u0d1a \u0d15\u0d34\u0d3f\u0d1e\u0d4d\u0d1e\u0d4d|\u0d35\u0d48\u0d15\u0d41\u0d28\u0d4d\u0d28\u0d47\u0d30\u0d02|\u0d30\u0d3e\u0d24\u0d4d\u0d30\u0d3f/i,meridiemHour:function(e,a){return 12===e&&(e=0),"\u0d30\u0d3e\u0d24\u0d4d\u0d30\u0d3f"===a&&4<=e||"\u0d09\u0d1a\u0d4d\u0d1a \u0d15\u0d34\u0d3f\u0d1e\u0d4d\u0d1e\u0d4d"===a||"\u0d35\u0d48\u0d15\u0d41\u0d28\u0d4d\u0d28\u0d47\u0d30\u0d02"===a?e+12:e},meridiem:function(e,a,t){return e<4?"\u0d30\u0d3e\u0d24\u0d4d\u0d30\u0d3f":e<12?"\u0d30\u0d3e\u0d35\u0d3f\u0d32\u0d46":e<17?"\u0d09\u0d1a\u0d4d\u0d1a \u0d15\u0d34\u0d3f\u0d1e\u0d4d\u0d1e\u0d4d":e<20?"\u0d35\u0d48\u0d15\u0d41\u0d28\u0d4d\u0d28\u0d47\u0d30\u0d02":"\u0d30\u0d3e\u0d24\u0d4d\u0d30\u0d3f"}}),M.defineLocale("mn",{months:"\u041d\u044d\u0433\u0434\u04af\u0433\u044d\u044d\u0440 \u0441\u0430\u0440_\u0425\u043e\u0451\u0440\u0434\u0443\u0433\u0430\u0430\u0440 \u0441\u0430\u0440_\u0413\u0443\u0440\u0430\u0432\u0434\u0443\u0433\u0430\u0430\u0440 \u0441\u0430\u0440_\u0414\u04e9\u0440\u04e9\u0432\u0434\u04af\u0433\u044d\u044d\u0440 \u0441\u0430\u0440_\u0422\u0430\u0432\u0434\u0443\u0433\u0430\u0430\u0440 \u0441\u0430\u0440_\u0417\u0443\u0440\u0433\u0430\u0434\u0443\u0433\u0430\u0430\u0440 \u0441\u0430\u0440_\u0414\u043e\u043b\u0434\u0443\u0433\u0430\u0430\u0440 \u0441\u0430\u0440_\u041d\u0430\u0439\u043c\u0434\u0443\u0433\u0430\u0430\u0440 \u0441\u0430\u0440_\u0415\u0441\u0434\u04af\u0433\u044d\u044d\u0440 \u0441\u0430\u0440_\u0410\u0440\u0430\u0432\u0434\u0443\u0433\u0430\u0430\u0440 \u0441\u0430\u0440_\u0410\u0440\u0432\u0430\u043d \u043d\u044d\u0433\u0434\u04af\u0433\u044d\u044d\u0440 \u0441\u0430\u0440_\u0410\u0440\u0432\u0430\u043d \u0445\u043e\u0451\u0440\u0434\u0443\u0433\u0430\u0430\u0440 \u0441\u0430\u0440".split("_"),monthsShort:"1 \u0441\u0430\u0440_2 \u0441\u0430\u0440_3 \u0441\u0430\u0440_4 \u0441\u0430\u0440_5 \u0441\u0430\u0440_6 \u0441\u0430\u0440_7 \u0441\u0430\u0440_8 \u0441\u0430\u0440_9 \u0441\u0430\u0440_10 \u0441\u0430\u0440_11 \u0441\u0430\u0440_12 \u0441\u0430\u0440".split("_"),monthsParseExact:!0,weekdays:"\u041d\u044f\u043c_\u0414\u0430\u0432\u0430\u0430_\u041c\u044f\u0433\u043c\u0430\u0440_\u041b\u0445\u0430\u0433\u0432\u0430_\u041f\u04af\u0440\u044d\u0432_\u0411\u0430\u0430\u0441\u0430\u043d_\u0411\u044f\u043c\u0431\u0430".split("_"),weekdaysShort:"\u041d\u044f\u043c_\u0414\u0430\u0432_\u041c\u044f\u0433_\u041b\u0445\u0430_\u041f\u04af\u0440_\u0411\u0430\u0430_\u0411\u044f\u043c".split("_"),weekdaysMin:"\u041d\u044f_\u0414\u0430_\u041c\u044f_\u041b\u0445_\u041f\u04af_\u0411\u0430_\u0411\u044f".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"YYYY \u043e\u043d\u044b MMMM\u044b\u043d D",LLL:"YYYY \u043e\u043d\u044b MMMM\u044b\u043d D HH:mm",LLLL:"dddd, YYYY \u043e\u043d\u044b MMMM\u044b\u043d D HH:mm"},meridiemParse:/\u04ae\u04e8|\u04ae\u0425/i,isPM:function(e){return"\u04ae\u0425"===e},meridiem:function(e,a,t){return e<12?"\u04ae\u04e8":"\u04ae\u0425"},calendar:{sameDay:"[\u04e8\u043d\u04e9\u04e9\u0434\u04e9\u0440] LT",nextDay:"[\u041c\u0430\u0440\u0433\u0430\u0430\u0448] LT",nextWeek:"[\u0418\u0440\u044d\u0445] dddd LT",lastDay:"[\u04e8\u0447\u0438\u0433\u0434\u04e9\u0440] LT",lastWeek:"[\u04e8\u043d\u0433\u04e9\u0440\u0441\u04e9\u043d] dddd LT",sameElse:"L"},relativeTime:{future:"%s \u0434\u0430\u0440\u0430\u0430",past:"%s \u04e9\u043c\u043d\u04e9",s:Bn,ss:Bn,m:Bn,mm:Bn,h:Bn,hh:Bn,d:Bn,dd:Bn,M:Bn,MM:Bn,y:Bn,yy:Bn},dayOfMonthOrdinalParse:/\d{1,2} \u04e9\u0434\u04e9\u0440/,ordinal:function(e,a){switch(a){case"d":case"D":case"DDD":return e+" \u04e9\u0434\u04e9\u0440";default:return e}}});var Kn={1:"\u0967",2:"\u0968",3:"\u0969",4:"\u096a",5:"\u096b",6:"\u096c",7:"\u096d",8:"\u096e",9:"\u096f",0:"\u0966"},qn={"\u0967":"1","\u0968":"2","\u0969":"3","\u096a":"4","\u096b":"5","\u096c":"6","\u096d":"7","\u096e":"8","\u096f":"9","\u0966":"0"};function Zn(e,a,t,s){var n="";if(a)switch(t){case"s":n="\u0915\u093e\u0939\u0940 \u0938\u0947\u0915\u0902\u0926";break;case"ss":n="%d \u0938\u0947\u0915\u0902\u0926";break;case"m":n="\u090f\u0915 \u092e\u093f\u0928\u093f\u091f";break;case"mm":n="%d \u092e\u093f\u0928\u093f\u091f\u0947";break;case"h":n="\u090f\u0915 \u0924\u093e\u0938";break;case"hh":n="%d \u0924\u093e\u0938";break;case"d":n="\u090f\u0915 \u0926\u093f\u0935\u0938";break;case"dd":n="%d \u0926\u093f\u0935\u0938";break;case"M":n="\u090f\u0915 \u092e\u0939\u093f\u0928\u093e";break;case"MM":n="%d \u092e\u0939\u093f\u0928\u0947";break;case"y":n="\u090f\u0915 \u0935\u0930\u094d\u0937";break;case"yy":n="%d \u0935\u0930\u094d\u0937\u0947";break}else switch(t){case"s":n="\u0915\u093e\u0939\u0940 \u0938\u0947\u0915\u0902\u0926\u093e\u0902";break;case"ss":n="%d \u0938\u0947\u0915\u0902\u0926\u093e\u0902";break;case"m":n="\u090f\u0915\u093e \u092e\u093f\u0928\u093f\u091f\u093e";break;case"mm":n="%d \u092e\u093f\u0928\u093f\u091f\u093e\u0902";break;case"h":n="\u090f\u0915\u093e \u0924\u093e\u0938\u093e";break;case"hh":n="%d \u0924\u093e\u0938\u093e\u0902";break;case"d":n="\u090f\u0915\u093e \u0926\u093f\u0935\u0938\u093e";break;case"dd":n="%d \u0926\u093f\u0935\u0938\u093e\u0902";break;case"M":n="\u090f\u0915\u093e \u092e\u0939\u093f\u0928\u094d\u092f\u093e";break;case"MM":n="%d \u092e\u0939\u093f\u0928\u094d\u092f\u093e\u0902";break;case"y":n="\u090f\u0915\u093e \u0935\u0930\u094d\u0937\u093e";break;case"yy":n="%d \u0935\u0930\u094d\u0937\u093e\u0902";break}return n.replace(/%d/i,e)}M.defineLocale("mr",{months:"\u091c\u093e\u0928\u0947\u0935\u093e\u0930\u0940_\u092b\u0947\u092c\u094d\u0930\u0941\u0935\u093e\u0930\u0940_\u092e\u093e\u0930\u094d\u091a_\u090f\u092a\u094d\u0930\u093f\u0932_\u092e\u0947_\u091c\u0942\u0928_\u091c\u0941\u0932\u0948_\u0911\u0917\u0938\u094d\u091f_\u0938\u092a\u094d\u091f\u0947\u0902\u092c\u0930_\u0911\u0915\u094d\u091f\u094b\u092c\u0930_\u0928\u094b\u0935\u094d\u0939\u0947\u0902\u092c\u0930_\u0921\u093f\u0938\u0947\u0902\u092c\u0930".split("_"),monthsShort:"\u091c\u093e\u0928\u0947._\u092b\u0947\u092c\u094d\u0930\u0941._\u092e\u093e\u0930\u094d\u091a._\u090f\u092a\u094d\u0930\u093f._\u092e\u0947._\u091c\u0942\u0928._\u091c\u0941\u0932\u0948._\u0911\u0917._\u0938\u092a\u094d\u091f\u0947\u0902._\u0911\u0915\u094d\u091f\u094b._\u0928\u094b\u0935\u094d\u0939\u0947\u0902._\u0921\u093f\u0938\u0947\u0902.".split("_"),monthsParseExact:!0,weekdays:"\u0930\u0935\u093f\u0935\u093e\u0930_\u0938\u094b\u092e\u0935\u093e\u0930_\u092e\u0902\u0917\u0933\u0935\u093e\u0930_\u092c\u0941\u0927\u0935\u093e\u0930_\u0917\u0941\u0930\u0942\u0935\u093e\u0930_\u0936\u0941\u0915\u094d\u0930\u0935\u093e\u0930_\u0936\u0928\u093f\u0935\u093e\u0930".split("_"),weekdaysShort:"\u0930\u0935\u093f_\u0938\u094b\u092e_\u092e\u0902\u0917\u0933_\u092c\u0941\u0927_\u0917\u0941\u0930\u0942_\u0936\u0941\u0915\u094d\u0930_\u0936\u0928\u093f".split("_"),weekdaysMin:"\u0930_\u0938\u094b_\u092e\u0902_\u092c\u0941_\u0917\u0941_\u0936\u0941_\u0936".split("_"),longDateFormat:{LT:"A h:mm \u0935\u093e\u091c\u0924\u093e",LTS:"A h:mm:ss \u0935\u093e\u091c\u0924\u093e",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm \u0935\u093e\u091c\u0924\u093e",LLLL:"dddd, D MMMM YYYY, A h:mm \u0935\u093e\u091c\u0924\u093e"},calendar:{sameDay:"[\u0906\u091c] LT",nextDay:"[\u0909\u0926\u094d\u092f\u093e] LT",nextWeek:"dddd, LT",lastDay:"[\u0915\u093e\u0932] LT",lastWeek:"[\u092e\u093e\u0917\u0940\u0932] dddd, LT",sameElse:"L"},relativeTime:{future:"%s\u092e\u0927\u094d\u092f\u0947",past:"%s\u092a\u0942\u0930\u094d\u0935\u0940",s:Zn,ss:Zn,m:Zn,mm:Zn,h:Zn,hh:Zn,d:Zn,dd:Zn,M:Zn,MM:Zn,y:Zn,yy:Zn},preparse:function(e){return e.replace(/[\u0967\u0968\u0969\u096a\u096b\u096c\u096d\u096e\u096f\u0966]/g,function(e){return qn[e]})},postformat:function(e){return e.replace(/\d/g,function(e){return Kn[e]})},meridiemParse:/\u092a\u0939\u093e\u091f\u0947|\u0938\u0915\u093e\u0933\u0940|\u0926\u0941\u092a\u093e\u0930\u0940|\u0938\u093e\u092f\u0902\u0915\u093e\u0933\u0940|\u0930\u093e\u0924\u094d\u0930\u0940/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u092a\u0939\u093e\u091f\u0947"===a||"\u0938\u0915\u093e\u0933\u0940"===a?e:"\u0926\u0941\u092a\u093e\u0930\u0940"===a||"\u0938\u093e\u092f\u0902\u0915\u093e\u0933\u0940"===a||"\u0930\u093e\u0924\u094d\u0930\u0940"===a?12<=e?e:e+12:void 0},meridiem:function(e,a,t){return 0<=e&&e<6?"\u092a\u0939\u093e\u091f\u0947":e<12?"\u0938\u0915\u093e\u0933\u0940":e<17?"\u0926\u0941\u092a\u093e\u0930\u0940":e<20?"\u0938\u093e\u092f\u0902\u0915\u093e\u0933\u0940":"\u0930\u093e\u0924\u094d\u0930\u0940"},week:{dow:0,doy:6}}),M.defineLocale("ms-my",{months:"Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember".split("_"),monthsShort:"Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis".split("_"),weekdays:"Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu".split("_"),weekdaysShort:"Ahd_Isn_Sel_Rab_Kha_Jum_Sab".split("_"),weekdaysMin:"Ah_Is_Sl_Rb_Km_Jm_Sb".split("_"),longDateFormat:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [pukul] HH.mm",LLLL:"dddd, D MMMM YYYY [pukul] HH.mm"},meridiemParse:/pagi|tengahari|petang|malam/,meridiemHour:function(e,a){return 12===e&&(e=0),"pagi"===a?e:"tengahari"===a?11<=e?e:e+12:"petang"===a||"malam"===a?e+12:void 0},meridiem:function(e,a,t){return e<11?"pagi":e<15?"tengahari":e<19?"petang":"malam"},calendar:{sameDay:"[Hari ini pukul] LT",nextDay:"[Esok pukul] LT",nextWeek:"dddd [pukul] LT",lastDay:"[Kelmarin pukul] LT",lastWeek:"dddd [lepas pukul] LT",sameElse:"L"},relativeTime:{future:"dalam %s",past:"%s yang lepas",s:"beberapa saat",ss:"%d saat",m:"seminit",mm:"%d minit",h:"sejam",hh:"%d jam",d:"sehari",dd:"%d hari",M:"sebulan",MM:"%d bulan",y:"setahun",yy:"%d tahun"},week:{dow:1,doy:7}}),M.defineLocale("ms",{months:"Januari_Februari_Mac_April_Mei_Jun_Julai_Ogos_September_Oktober_November_Disember".split("_"),monthsShort:"Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ogs_Sep_Okt_Nov_Dis".split("_"),weekdays:"Ahad_Isnin_Selasa_Rabu_Khamis_Jumaat_Sabtu".split("_"),weekdaysShort:"Ahd_Isn_Sel_Rab_Kha_Jum_Sab".split("_"),weekdaysMin:"Ah_Is_Sl_Rb_Km_Jm_Sb".split("_"),longDateFormat:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [pukul] HH.mm",LLLL:"dddd, D MMMM YYYY [pukul] HH.mm"},meridiemParse:/pagi|tengahari|petang|malam/,meridiemHour:function(e,a){return 12===e&&(e=0),"pagi"===a?e:"tengahari"===a?11<=e?e:e+12:"petang"===a||"malam"===a?e+12:void 0},meridiem:function(e,a,t){return e<11?"pagi":e<15?"tengahari":e<19?"petang":"malam"},calendar:{sameDay:"[Hari ini pukul] LT",nextDay:"[Esok pukul] LT",nextWeek:"dddd [pukul] LT",lastDay:"[Kelmarin pukul] LT",lastWeek:"dddd [lepas pukul] LT",sameElse:"L"},relativeTime:{future:"dalam %s",past:"%s yang lepas",s:"beberapa saat",ss:"%d saat",m:"seminit",mm:"%d minit",h:"sejam",hh:"%d jam",d:"sehari",dd:"%d hari",M:"sebulan",MM:"%d bulan",y:"setahun",yy:"%d tahun"},week:{dow:1,doy:7}}),M.defineLocale("mt",{months:"Jannar_Frar_Marzu_April_Mejju_\u0120unju_Lulju_Awwissu_Settembru_Ottubru_Novembru_Di\u010bembru".split("_"),monthsShort:"Jan_Fra_Mar_Apr_Mej_\u0120un_Lul_Aww_Set_Ott_Nov_Di\u010b".split("_"),weekdays:"Il-\u0126add_It-Tnejn_It-Tlieta_L-Erbg\u0127a_Il-\u0126amis_Il-\u0120img\u0127a_Is-Sibt".split("_"),weekdaysShort:"\u0126ad_Tne_Tli_Erb_\u0126am_\u0120im_Sib".split("_"),weekdaysMin:"\u0126a_Tn_Tl_Er_\u0126a_\u0120i_Si".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Illum fil-]LT",nextDay:"[G\u0127ada fil-]LT",nextWeek:"dddd [fil-]LT",lastDay:"[Il-biera\u0127 fil-]LT",lastWeek:"dddd [li g\u0127adda] [fil-]LT",sameElse:"L"},relativeTime:{future:"f\u2019 %s",past:"%s ilu",s:"ftit sekondi",ss:"%d sekondi",m:"minuta",mm:"%d minuti",h:"sieg\u0127a",hh:"%d sieg\u0127at",d:"\u0121urnata",dd:"%d \u0121ranet",M:"xahar",MM:"%d xhur",y:"sena",yy:"%d sni"},dayOfMonthOrdinalParse:/\d{1,2}\xba/,ordinal:"%d\xba",week:{dow:1,doy:4}});var $n={1:"\u1041",2:"\u1042",3:"\u1043",4:"\u1044",5:"\u1045",6:"\u1046",7:"\u1047",8:"\u1048",9:"\u1049",0:"\u1040"},Qn={"\u1041":"1","\u1042":"2","\u1043":"3","\u1044":"4","\u1045":"5","\u1046":"6","\u1047":"7","\u1048":"8","\u1049":"9","\u1040":"0"};M.defineLocale("my",{months:"\u1007\u1014\u103a\u1014\u101d\u102b\u101b\u102e_\u1016\u1031\u1016\u1031\u102c\u103a\u101d\u102b\u101b\u102e_\u1019\u1010\u103a_\u1027\u1015\u103c\u102e_\u1019\u1031_\u1007\u103d\u1014\u103a_\u1007\u1030\u101c\u102d\u102f\u1004\u103a_\u101e\u103c\u1002\u102f\u1010\u103a_\u1005\u1000\u103a\u1010\u1004\u103a\u1018\u102c_\u1021\u1031\u102c\u1000\u103a\u1010\u102d\u102f\u1018\u102c_\u1014\u102d\u102f\u101d\u1004\u103a\u1018\u102c_\u1012\u102e\u1007\u1004\u103a\u1018\u102c".split("_"),monthsShort:"\u1007\u1014\u103a_\u1016\u1031_\u1019\u1010\u103a_\u1015\u103c\u102e_\u1019\u1031_\u1007\u103d\u1014\u103a_\u101c\u102d\u102f\u1004\u103a_\u101e\u103c_\u1005\u1000\u103a_\u1021\u1031\u102c\u1000\u103a_\u1014\u102d\u102f_\u1012\u102e".split("_"),weekdays:"\u1010\u1014\u1004\u103a\u1039\u1002\u1014\u103d\u1031_\u1010\u1014\u1004\u103a\u1039\u101c\u102c_\u1021\u1004\u103a\u1039\u1002\u102b_\u1017\u102f\u1012\u1039\u1013\u101f\u1030\u1038_\u1000\u103c\u102c\u101e\u1015\u1010\u1031\u1038_\u101e\u1031\u102c\u1000\u103c\u102c_\u1005\u1014\u1031".split("_"),weekdaysShort:"\u1014\u103d\u1031_\u101c\u102c_\u1002\u102b_\u101f\u1030\u1038_\u1000\u103c\u102c_\u101e\u1031\u102c_\u1014\u1031".split("_"),weekdaysMin:"\u1014\u103d\u1031_\u101c\u102c_\u1002\u102b_\u101f\u1030\u1038_\u1000\u103c\u102c_\u101e\u1031\u102c_\u1014\u1031".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[\u101a\u1014\u1031.] LT [\u1019\u103e\u102c]",nextDay:"[\u1019\u1014\u1000\u103a\u1016\u103c\u1014\u103a] LT [\u1019\u103e\u102c]",nextWeek:"dddd LT [\u1019\u103e\u102c]",lastDay:"[\u1019\u1014\u1031.\u1000] LT [\u1019\u103e\u102c]",lastWeek:"[\u1015\u103c\u102e\u1038\u1001\u1032\u1037\u101e\u1031\u102c] dddd LT [\u1019\u103e\u102c]",sameElse:"L"},relativeTime:{future:"\u101c\u102c\u1019\u100a\u103a\u1037 %s \u1019\u103e\u102c",past:"\u101c\u103d\u1014\u103a\u1001\u1032\u1037\u101e\u1031\u102c %s \u1000",s:"\u1005\u1000\u1039\u1000\u1014\u103a.\u1021\u1014\u100a\u103a\u1038\u1004\u101a\u103a",ss:"%d \u1005\u1000\u1039\u1000\u1014\u1037\u103a",m:"\u1010\u1005\u103a\u1019\u102d\u1014\u1005\u103a",mm:"%d \u1019\u102d\u1014\u1005\u103a",h:"\u1010\u1005\u103a\u1014\u102c\u101b\u102e",hh:"%d \u1014\u102c\u101b\u102e",d:"\u1010\u1005\u103a\u101b\u1000\u103a",dd:"%d \u101b\u1000\u103a",M:"\u1010\u1005\u103a\u101c",MM:"%d \u101c",y:"\u1010\u1005\u103a\u1014\u103e\u1005\u103a",yy:"%d \u1014\u103e\u1005\u103a"},preparse:function(e){return e.replace(/[\u1041\u1042\u1043\u1044\u1045\u1046\u1047\u1048\u1049\u1040]/g,function(e){return Qn[e]})},postformat:function(e){return e.replace(/\d/g,function(e){return $n[e]})},week:{dow:1,doy:4}}),M.defineLocale("nb",{months:"januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember".split("_"),monthsShort:"jan._feb._mars_apr._mai_juni_juli_aug._sep._okt._nov._des.".split("_"),monthsParseExact:!0,weekdays:"s\xf8ndag_mandag_tirsdag_onsdag_torsdag_fredag_l\xf8rdag".split("_"),weekdaysShort:"s\xf8._ma._ti._on._to._fr._l\xf8.".split("_"),weekdaysMin:"s\xf8_ma_ti_on_to_fr_l\xf8".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY [kl.] HH:mm",LLLL:"dddd D. MMMM YYYY [kl.] HH:mm"},calendar:{sameDay:"[i dag kl.] LT",nextDay:"[i morgen kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[i g\xe5r kl.] LT",lastWeek:"[forrige] dddd [kl.] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"%s siden",s:"noen sekunder",ss:"%d sekunder",m:"ett minutt",mm:"%d minutter",h:"en time",hh:"%d timer",d:"en dag",dd:"%d dager",w:"en uke",ww:"%d uker",M:"en m\xe5ned",MM:"%d m\xe5neder",y:"ett \xe5r",yy:"%d \xe5r"},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});var Xn={1:"\u0967",2:"\u0968",3:"\u0969",4:"\u096a",5:"\u096b",6:"\u096c",7:"\u096d",8:"\u096e",9:"\u096f",0:"\u0966"},er={"\u0967":"1","\u0968":"2","\u0969":"3","\u096a":"4","\u096b":"5","\u096c":"6","\u096d":"7","\u096e":"8","\u096f":"9","\u0966":"0"};M.defineLocale("ne",{months:"\u091c\u0928\u0935\u0930\u0940_\u092b\u0947\u092c\u094d\u0930\u0941\u0935\u0930\u0940_\u092e\u093e\u0930\u094d\u091a_\u0905\u092a\u094d\u0930\u093f\u0932_\u092e\u0908_\u091c\u0941\u0928_\u091c\u0941\u0932\u093e\u0908_\u0905\u0917\u0937\u094d\u091f_\u0938\u0947\u092a\u094d\u091f\u0947\u092e\u094d\u092c\u0930_\u0905\u0915\u094d\u091f\u094b\u092c\u0930_\u0928\u094b\u092d\u0947\u092e\u094d\u092c\u0930_\u0921\u093f\u0938\u0947\u092e\u094d\u092c\u0930".split("_"),monthsShort:"\u091c\u0928._\u092b\u0947\u092c\u094d\u0930\u0941._\u092e\u093e\u0930\u094d\u091a_\u0905\u092a\u094d\u0930\u093f._\u092e\u0908_\u091c\u0941\u0928_\u091c\u0941\u0932\u093e\u0908._\u0905\u0917._\u0938\u0947\u092a\u094d\u091f._\u0905\u0915\u094d\u091f\u094b._\u0928\u094b\u092d\u0947._\u0921\u093f\u0938\u0947.".split("_"),monthsParseExact:!0,weekdays:"\u0906\u0907\u0924\u092c\u093e\u0930_\u0938\u094b\u092e\u092c\u093e\u0930_\u092e\u0919\u094d\u0917\u0932\u092c\u093e\u0930_\u092c\u0941\u0927\u092c\u093e\u0930_\u092c\u093f\u0939\u093f\u092c\u093e\u0930_\u0936\u0941\u0915\u094d\u0930\u092c\u093e\u0930_\u0936\u0928\u093f\u092c\u093e\u0930".split("_"),weekdaysShort:"\u0906\u0907\u0924._\u0938\u094b\u092e._\u092e\u0919\u094d\u0917\u0932._\u092c\u0941\u0927._\u092c\u093f\u0939\u093f._\u0936\u0941\u0915\u094d\u0930._\u0936\u0928\u093f.".split("_"),weekdaysMin:"\u0906._\u0938\u094b._\u092e\u0902._\u092c\u0941._\u092c\u093f._\u0936\u0941._\u0936.".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"A\u0915\u094b h:mm \u092c\u091c\u0947",LTS:"A\u0915\u094b h:mm:ss \u092c\u091c\u0947",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A\u0915\u094b h:mm \u092c\u091c\u0947",LLLL:"dddd, D MMMM YYYY, A\u0915\u094b h:mm \u092c\u091c\u0947"},preparse:function(e){return e.replace(/[\u0967\u0968\u0969\u096a\u096b\u096c\u096d\u096e\u096f\u0966]/g,function(e){return er[e]})},postformat:function(e){return e.replace(/\d/g,function(e){return Xn[e]})},meridiemParse:/\u0930\u093e\u0924\u093f|\u092c\u093f\u0939\u093e\u0928|\u0926\u093f\u0909\u0901\u0938\u094b|\u0938\u093e\u0901\u091d/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u0930\u093e\u0924\u093f"===a?e<4?e:e+12:"\u092c\u093f\u0939\u093e\u0928"===a?e:"\u0926\u093f\u0909\u0901\u0938\u094b"===a?10<=e?e:e+12:"\u0938\u093e\u0901\u091d"===a?e+12:void 0},meridiem:function(e,a,t){return e<3?"\u0930\u093e\u0924\u093f":e<12?"\u092c\u093f\u0939\u093e\u0928":e<16?"\u0926\u093f\u0909\u0901\u0938\u094b":e<20?"\u0938\u093e\u0901\u091d":"\u0930\u093e\u0924\u093f"},calendar:{sameDay:"[\u0906\u091c] LT",nextDay:"[\u092d\u094b\u0932\u093f] LT",nextWeek:"[\u0906\u0909\u0901\u0926\u094b] dddd[,] LT",lastDay:"[\u0939\u093f\u091c\u094b] LT",lastWeek:"[\u0917\u090f\u0915\u094b] dddd[,] LT",sameElse:"L"},relativeTime:{future:"%s\u092e\u093e",past:"%s \u0905\u0917\u093e\u0921\u093f",s:"\u0915\u0947\u0939\u0940 \u0915\u094d\u0937\u0923",ss:"%d \u0938\u0947\u0915\u0947\u0923\u094d\u0921",m:"\u090f\u0915 \u092e\u093f\u0928\u0947\u091f",mm:"%d \u092e\u093f\u0928\u0947\u091f",h:"\u090f\u0915 \u0918\u0923\u094d\u091f\u093e",hh:"%d \u0918\u0923\u094d\u091f\u093e",d:"\u090f\u0915 \u0926\u093f\u0928",dd:"%d \u0926\u093f\u0928",M:"\u090f\u0915 \u092e\u0939\u093f\u0928\u093e",MM:"%d \u092e\u0939\u093f\u0928\u093e",y:"\u090f\u0915 \u092c\u0930\u094d\u0937",yy:"%d \u092c\u0930\u094d\u0937"},week:{dow:0,doy:6}});var ar="jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.".split("_"),tr="jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec".split("_"),sr=[/^jan/i,/^feb/i,/^maart|mrt.?$/i,/^apr/i,/^mei$/i,/^jun[i.]?$/i,/^jul[i.]?$/i,/^aug/i,/^sep/i,/^okt/i,/^nov/i,/^dec/i],nr=/^(januari|februari|maart|april|mei|ju[nl]i|augustus|september|oktober|november|december|jan\.?|feb\.?|mrt\.?|apr\.?|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i;M.defineLocale("nl-be",{months:"januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december".split("_"),monthsShort:function(e,a){return e?/-MMM-/.test(a)?tr[e.month()]:ar[e.month()]:ar},monthsRegex:nr,monthsShortRegex:nr,monthsStrictRegex:/^(januari|februari|maart|april|mei|ju[nl]i|augustus|september|oktober|november|december)/i,monthsShortStrictRegex:/^(jan\.?|feb\.?|mrt\.?|apr\.?|mei|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i,monthsParse:sr,longMonthsParse:sr,shortMonthsParse:sr,weekdays:"zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag".split("_"),weekdaysShort:"zo._ma._di._wo._do._vr._za.".split("_"),weekdaysMin:"zo_ma_di_wo_do_vr_za".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[vandaag om] LT",nextDay:"[morgen om] LT",nextWeek:"dddd [om] LT",lastDay:"[gisteren om] LT",lastWeek:"[afgelopen] dddd [om] LT",sameElse:"L"},relativeTime:{future:"over %s",past:"%s geleden",s:"een paar seconden",ss:"%d seconden",m:"\xe9\xe9n minuut",mm:"%d minuten",h:"\xe9\xe9n uur",hh:"%d uur",d:"\xe9\xe9n dag",dd:"%d dagen",M:"\xe9\xe9n maand",MM:"%d maanden",y:"\xe9\xe9n jaar",yy:"%d jaar"},dayOfMonthOrdinalParse:/\d{1,2}(ste|de)/,ordinal:function(e){return e+(1===e||8===e||20<=e?"ste":"de")},week:{dow:1,doy:4}});var rr="jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.".split("_"),dr="jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec".split("_"),_r=[/^jan/i,/^feb/i,/^maart|mrt.?$/i,/^apr/i,/^mei$/i,/^jun[i.]?$/i,/^jul[i.]?$/i,/^aug/i,/^sep/i,/^okt/i,/^nov/i,/^dec/i],ir=/^(januari|februari|maart|april|mei|ju[nl]i|augustus|september|oktober|november|december|jan\.?|feb\.?|mrt\.?|apr\.?|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i;M.defineLocale("nl",{months:"januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december".split("_"),monthsShort:function(e,a){return e?/-MMM-/.test(a)?dr[e.month()]:rr[e.month()]:rr},monthsRegex:ir,monthsShortRegex:ir,monthsStrictRegex:/^(januari|februari|maart|april|mei|ju[nl]i|augustus|september|oktober|november|december)/i,monthsShortStrictRegex:/^(jan\.?|feb\.?|mrt\.?|apr\.?|mei|ju[nl]\.?|aug\.?|sep\.?|okt\.?|nov\.?|dec\.?)/i,monthsParse:_r,longMonthsParse:_r,shortMonthsParse:_r,weekdays:"zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag".split("_"),weekdaysShort:"zo._ma._di._wo._do._vr._za.".split("_"),weekdaysMin:"zo_ma_di_wo_do_vr_za".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD-MM-YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[vandaag om] LT",nextDay:"[morgen om] LT",nextWeek:"dddd [om] LT",lastDay:"[gisteren om] LT",lastWeek:"[afgelopen] dddd [om] LT",sameElse:"L"},relativeTime:{future:"over %s",past:"%s geleden",s:"een paar seconden",ss:"%d seconden",m:"\xe9\xe9n minuut",mm:"%d minuten",h:"\xe9\xe9n uur",hh:"%d uur",d:"\xe9\xe9n dag",dd:"%d dagen",w:"\xe9\xe9n week",ww:"%d weken",M:"\xe9\xe9n maand",MM:"%d maanden",y:"\xe9\xe9n jaar",yy:"%d jaar"},dayOfMonthOrdinalParse:/\d{1,2}(ste|de)/,ordinal:function(e){return e+(1===e||8===e||20<=e?"ste":"de")},week:{dow:1,doy:4}}),M.defineLocale("nn",{months:"januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember".split("_"),monthsShort:"jan._feb._mars_apr._mai_juni_juli_aug._sep._okt._nov._des.".split("_"),monthsParseExact:!0,weekdays:"sundag_m\xe5ndag_tysdag_onsdag_torsdag_fredag_laurdag".split("_"),weekdaysShort:"su._m\xe5._ty._on._to._fr._lau.".split("_"),weekdaysMin:"su_m\xe5_ty_on_to_fr_la".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY [kl.] H:mm",LLLL:"dddd D. MMMM YYYY [kl.] HH:mm"},calendar:{sameDay:"[I dag klokka] LT",nextDay:"[I morgon klokka] LT",nextWeek:"dddd [klokka] LT",lastDay:"[I g\xe5r klokka] LT",lastWeek:"[F\xf8reg\xe5ande] dddd [klokka] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"%s sidan",s:"nokre sekund",ss:"%d sekund",m:"eit minutt",mm:"%d minutt",h:"ein time",hh:"%d timar",d:"ein dag",dd:"%d dagar",w:"ei veke",ww:"%d veker",M:"ein m\xe5nad",MM:"%d m\xe5nader",y:"eit \xe5r",yy:"%d \xe5r"},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),M.defineLocale("oc-lnc",{months:{standalone:"geni\xe8r_febri\xe8r_mar\xe7_abril_mai_junh_julhet_agost_setembre_oct\xf2bre_novembre_decembre".split("_"),format:"de geni\xe8r_de febri\xe8r_de mar\xe7_d'abril_de mai_de junh_de julhet_d'agost_de setembre_d'oct\xf2bre_de novembre_de decembre".split("_"),isFormat:/D[oD]?(\s)+MMMM/},monthsShort:"gen._febr._mar\xe7_abr._mai_junh_julh._ago._set._oct._nov._dec.".split("_"),monthsParseExact:!0,weekdays:"dimenge_diluns_dimars_dim\xe8cres_dij\xf2us_divendres_dissabte".split("_"),weekdaysShort:"dg._dl._dm._dc._dj._dv._ds.".split("_"),weekdaysMin:"dg_dl_dm_dc_dj_dv_ds".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM [de] YYYY",ll:"D MMM YYYY",LLL:"D MMMM [de] YYYY [a] H:mm",lll:"D MMM YYYY, H:mm",LLLL:"dddd D MMMM [de] YYYY [a] H:mm",llll:"ddd D MMM YYYY, H:mm"},calendar:{sameDay:"[u\xe8i a] LT",nextDay:"[deman a] LT",nextWeek:"dddd [a] LT",lastDay:"[i\xe8r a] LT",lastWeek:"dddd [passat a] LT",sameElse:"L"},relativeTime:{future:"d'aqu\xed %s",past:"fa %s",s:"unas segondas",ss:"%d segondas",m:"una minuta",mm:"%d minutas",h:"una ora",hh:"%d oras",d:"un jorn",dd:"%d jorns",M:"un mes",MM:"%d meses",y:"un an",yy:"%d ans"},dayOfMonthOrdinalParse:/\d{1,2}(r|n|t|\xe8|a)/,ordinal:function(e,a){return e+("w"!==a&&"W"!==a?1===e?"r":2===e?"n":3===e?"r":4===e?"t":"\xe8":"a")},week:{dow:1,doy:4}});var or={1:"\u0a67",2:"\u0a68",3:"\u0a69",4:"\u0a6a",5:"\u0a6b",6:"\u0a6c",7:"\u0a6d",8:"\u0a6e",9:"\u0a6f",0:"\u0a66"},mr={"\u0a67":"1","\u0a68":"2","\u0a69":"3","\u0a6a":"4","\u0a6b":"5","\u0a6c":"6","\u0a6d":"7","\u0a6e":"8","\u0a6f":"9","\u0a66":"0"};M.defineLocale("pa-in",{months:"\u0a1c\u0a28\u0a35\u0a30\u0a40_\u0a2b\u0a3c\u0a30\u0a35\u0a30\u0a40_\u0a2e\u0a3e\u0a30\u0a1a_\u0a05\u0a2a\u0a4d\u0a30\u0a48\u0a32_\u0a2e\u0a08_\u0a1c\u0a42\u0a28_\u0a1c\u0a41\u0a32\u0a3e\u0a08_\u0a05\u0a17\u0a38\u0a24_\u0a38\u0a24\u0a70\u0a2c\u0a30_\u0a05\u0a15\u0a24\u0a42\u0a2c\u0a30_\u0a28\u0a35\u0a70\u0a2c\u0a30_\u0a26\u0a38\u0a70\u0a2c\u0a30".split("_"),monthsShort:"\u0a1c\u0a28\u0a35\u0a30\u0a40_\u0a2b\u0a3c\u0a30\u0a35\u0a30\u0a40_\u0a2e\u0a3e\u0a30\u0a1a_\u0a05\u0a2a\u0a4d\u0a30\u0a48\u0a32_\u0a2e\u0a08_\u0a1c\u0a42\u0a28_\u0a1c\u0a41\u0a32\u0a3e\u0a08_\u0a05\u0a17\u0a38\u0a24_\u0a38\u0a24\u0a70\u0a2c\u0a30_\u0a05\u0a15\u0a24\u0a42\u0a2c\u0a30_\u0a28\u0a35\u0a70\u0a2c\u0a30_\u0a26\u0a38\u0a70\u0a2c\u0a30".split("_"),weekdays:"\u0a10\u0a24\u0a35\u0a3e\u0a30_\u0a38\u0a4b\u0a2e\u0a35\u0a3e\u0a30_\u0a2e\u0a70\u0a17\u0a32\u0a35\u0a3e\u0a30_\u0a2c\u0a41\u0a27\u0a35\u0a3e\u0a30_\u0a35\u0a40\u0a30\u0a35\u0a3e\u0a30_\u0a38\u0a3c\u0a41\u0a71\u0a15\u0a30\u0a35\u0a3e\u0a30_\u0a38\u0a3c\u0a28\u0a40\u0a1a\u0a30\u0a35\u0a3e\u0a30".split("_"),weekdaysShort:"\u0a10\u0a24_\u0a38\u0a4b\u0a2e_\u0a2e\u0a70\u0a17\u0a32_\u0a2c\u0a41\u0a27_\u0a35\u0a40\u0a30_\u0a38\u0a3c\u0a41\u0a15\u0a30_\u0a38\u0a3c\u0a28\u0a40".split("_"),weekdaysMin:"\u0a10\u0a24_\u0a38\u0a4b\u0a2e_\u0a2e\u0a70\u0a17\u0a32_\u0a2c\u0a41\u0a27_\u0a35\u0a40\u0a30_\u0a38\u0a3c\u0a41\u0a15\u0a30_\u0a38\u0a3c\u0a28\u0a40".split("_"),longDateFormat:{LT:"A h:mm \u0a35\u0a1c\u0a47",LTS:"A h:mm:ss \u0a35\u0a1c\u0a47",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm \u0a35\u0a1c\u0a47",LLLL:"dddd, D MMMM YYYY, A h:mm \u0a35\u0a1c\u0a47"},calendar:{sameDay:"[\u0a05\u0a1c] LT",nextDay:"[\u0a15\u0a32] LT",nextWeek:"[\u0a05\u0a17\u0a32\u0a3e] dddd, LT",lastDay:"[\u0a15\u0a32] LT",lastWeek:"[\u0a2a\u0a3f\u0a1b\u0a32\u0a47] dddd, LT",sameElse:"L"},relativeTime:{future:"%s \u0a35\u0a3f\u0a71\u0a1a",past:"%s \u0a2a\u0a3f\u0a1b\u0a32\u0a47",s:"\u0a15\u0a41\u0a1d \u0a38\u0a15\u0a3f\u0a70\u0a1f",ss:"%d \u0a38\u0a15\u0a3f\u0a70\u0a1f",m:"\u0a07\u0a15 \u0a2e\u0a3f\u0a70\u0a1f",mm:"%d \u0a2e\u0a3f\u0a70\u0a1f",h:"\u0a07\u0a71\u0a15 \u0a18\u0a70\u0a1f\u0a3e",hh:"%d \u0a18\u0a70\u0a1f\u0a47",d:"\u0a07\u0a71\u0a15 \u0a26\u0a3f\u0a28",dd:"%d \u0a26\u0a3f\u0a28",M:"\u0a07\u0a71\u0a15 \u0a2e\u0a39\u0a40\u0a28\u0a3e",MM:"%d \u0a2e\u0a39\u0a40\u0a28\u0a47",y:"\u0a07\u0a71\u0a15 \u0a38\u0a3e\u0a32",yy:"%d \u0a38\u0a3e\u0a32"},preparse:function(e){return e.replace(/[\u0a67\u0a68\u0a69\u0a6a\u0a6b\u0a6c\u0a6d\u0a6e\u0a6f\u0a66]/g,function(e){return mr[e]})},postformat:function(e){return e.replace(/\d/g,function(e){return or[e]})},meridiemParse:/\u0a30\u0a3e\u0a24|\u0a38\u0a35\u0a47\u0a30|\u0a26\u0a41\u0a2a\u0a39\u0a3f\u0a30|\u0a38\u0a3c\u0a3e\u0a2e/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u0a30\u0a3e\u0a24"===a?e<4?e:e+12:"\u0a38\u0a35\u0a47\u0a30"===a?e:"\u0a26\u0a41\u0a2a\u0a39\u0a3f\u0a30"===a?10<=e?e:e+12:"\u0a38\u0a3c\u0a3e\u0a2e"===a?e+12:void 0},meridiem:function(e,a,t){return e<4?"\u0a30\u0a3e\u0a24":e<10?"\u0a38\u0a35\u0a47\u0a30":e<17?"\u0a26\u0a41\u0a2a\u0a39\u0a3f\u0a30":e<20?"\u0a38\u0a3c\u0a3e\u0a2e":"\u0a30\u0a3e\u0a24"},week:{dow:0,doy:6}});var ur="stycze\u0144_luty_marzec_kwiecie\u0144_maj_czerwiec_lipiec_sierpie\u0144_wrzesie\u0144_pa\u017adziernik_listopad_grudzie\u0144".split("_"),lr="stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_wrze\u015bnia_pa\u017adziernika_listopada_grudnia".split("_"),Mr=[/^sty/i,/^lut/i,/^mar/i,/^kwi/i,/^maj/i,/^cze/i,/^lip/i,/^sie/i,/^wrz/i,/^pa\u017a/i,/^lis/i,/^gru/i];function hr(e){return e%10<5&&1<e%10&&~~(e/10)%10!=1}function cr(e,a,t){var s=e+" ";switch(t){case"ss":return s+(hr(e)?"sekundy":"sekund");case"m":return a?"minuta":"minut\u0119";case"mm":return s+(hr(e)?"minuty":"minut");case"h":return a?"godzina":"godzin\u0119";case"hh":return s+(hr(e)?"godziny":"godzin");case"ww":return s+(hr(e)?"tygodnie":"tygodni");case"MM":return s+(hr(e)?"miesi\u0105ce":"miesi\u0119cy");case"yy":return s+(hr(e)?"lata":"lat")}}function Lr(e,a,t){return e+(20<=e%100||100<=e&&e%100==0?" de ":" ")+{ss:"secunde",mm:"minute",hh:"ore",dd:"zile",ww:"s\u0103pt\u0103m\xe2ni",MM:"luni",yy:"ani"}[t]}function Yr(e,a,t){var s,n;return"m"===t?a?"\u043c\u0438\u043d\u0443\u0442\u0430":"\u043c\u0438\u043d\u0443\u0442\u0443":e+" "+(s=+e,n={ss:a?"\u0441\u0435\u043a\u0443\u043d\u0434\u0430_\u0441\u0435\u043a\u0443\u043d\u0434\u044b_\u0441\u0435\u043a\u0443\u043d\u0434":"\u0441\u0435\u043a\u0443\u043d\u0434\u0443_\u0441\u0435\u043a\u0443\u043d\u0434\u044b_\u0441\u0435\u043a\u0443\u043d\u0434",mm:a?"\u043c\u0438\u043d\u0443\u0442\u0430_\u043c\u0438\u043d\u0443\u0442\u044b_\u043c\u0438\u043d\u0443\u0442":"\u043c\u0438\u043d\u0443\u0442\u0443_\u043c\u0438\u043d\u0443\u0442\u044b_\u043c\u0438\u043d\u0443\u0442",hh:"\u0447\u0430\u0441_\u0447\u0430\u0441\u0430_\u0447\u0430\u0441\u043e\u0432",dd:"\u0434\u0435\u043d\u044c_\u0434\u043d\u044f_\u0434\u043d\u0435\u0439",ww:"\u043d\u0435\u0434\u0435\u043b\u044f_\u043d\u0435\u0434\u0435\u043b\u0438_\u043d\u0435\u0434\u0435\u043b\u044c",MM:"\u043c\u0435\u0441\u044f\u0446_\u043c\u0435\u0441\u044f\u0446\u0430_\u043c\u0435\u0441\u044f\u0446\u0435\u0432",yy:"\u0433\u043e\u0434_\u0433\u043e\u0434\u0430_\u043b\u0435\u0442"}[t].split("_"),s%10==1&&s%100!=11?n[0]:2<=s%10&&s%10<=4&&(s%100<10||20<=s%100)?n[1]:n[2])}M.defineLocale("pl",{months:function(e,a){return e?/D MMMM/.test(a)?lr[e.month()]:ur[e.month()]:ur},monthsShort:"sty_lut_mar_kwi_maj_cze_lip_sie_wrz_pa\u017a_lis_gru".split("_"),monthsParse:Mr,longMonthsParse:Mr,shortMonthsParse:Mr,weekdays:"niedziela_poniedzia\u0142ek_wtorek_\u015broda_czwartek_pi\u0105tek_sobota".split("_"),weekdaysShort:"ndz_pon_wt_\u015br_czw_pt_sob".split("_"),weekdaysMin:"Nd_Pn_Wt_\u015ar_Cz_Pt_So".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Dzi\u015b o] LT",nextDay:"[Jutro o] LT",nextWeek:function(){switch(this.day()){case 0:return"[W niedziel\u0119 o] LT";case 2:return"[We wtorek o] LT";case 3:return"[W \u015brod\u0119 o] LT";case 6:return"[W sobot\u0119 o] LT";default:return"[W] dddd [o] LT"}},lastDay:"[Wczoraj o] LT",lastWeek:function(){switch(this.day()){case 0:return"[W zesz\u0142\u0105 niedziel\u0119 o] LT";case 3:return"[W zesz\u0142\u0105 \u015brod\u0119 o] LT";case 6:return"[W zesz\u0142\u0105 sobot\u0119 o] LT";default:return"[W zesz\u0142y] dddd [o] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"%s temu",s:"kilka sekund",ss:cr,m:cr,mm:cr,h:cr,hh:cr,d:"1 dzie\u0144",dd:"%d dni",w:"tydzie\u0144",ww:cr,M:"miesi\u0105c",MM:cr,y:"rok",yy:cr},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),M.defineLocale("pt-br",{months:"janeiro_fevereiro_mar\xe7o_abril_maio_junho_julho_agosto_setembro_outubro_novembro_dezembro".split("_"),monthsShort:"jan_fev_mar_abr_mai_jun_jul_ago_set_out_nov_dez".split("_"),weekdays:"domingo_segunda-feira_ter\xe7a-feira_quarta-feira_quinta-feira_sexta-feira_s\xe1bado".split("_"),weekdaysShort:"dom_seg_ter_qua_qui_sex_s\xe1b".split("_"),weekdaysMin:"do_2\xaa_3\xaa_4\xaa_5\xaa_6\xaa_s\xe1".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY [\xe0s] HH:mm",LLLL:"dddd, D [de] MMMM [de] YYYY [\xe0s] HH:mm"},calendar:{sameDay:"[Hoje \xe0s] LT",nextDay:"[Amanh\xe3 \xe0s] LT",nextWeek:"dddd [\xe0s] LT",lastDay:"[Ontem \xe0s] LT",lastWeek:function(){return 0===this.day()||6===this.day()?"[\xdaltimo] dddd [\xe0s] LT":"[\xdaltima] dddd [\xe0s] LT"},sameElse:"L"},relativeTime:{future:"em %s",past:"h\xe1 %s",s:"poucos segundos",ss:"%d segundos",m:"um minuto",mm:"%d minutos",h:"uma hora",hh:"%d horas",d:"um dia",dd:"%d dias",M:"um m\xeas",MM:"%d meses",y:"um ano",yy:"%d anos"},dayOfMonthOrdinalParse:/\d{1,2}\xba/,ordinal:"%d\xba",invalidDate:"Data inv\xe1lida"}),M.defineLocale("pt",{months:"janeiro_fevereiro_mar\xe7o_abril_maio_junho_julho_agosto_setembro_outubro_novembro_dezembro".split("_"),monthsShort:"jan_fev_mar_abr_mai_jun_jul_ago_set_out_nov_dez".split("_"),weekdays:"Domingo_Segunda-feira_Ter\xe7a-feira_Quarta-feira_Quinta-feira_Sexta-feira_S\xe1bado".split("_"),weekdaysShort:"Dom_Seg_Ter_Qua_Qui_Sex_S\xe1b".split("_"),weekdaysMin:"Do_2\xaa_3\xaa_4\xaa_5\xaa_6\xaa_S\xe1".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY HH:mm",LLLL:"dddd, D [de] MMMM [de] YYYY HH:mm"},calendar:{sameDay:"[Hoje \xe0s] LT",nextDay:"[Amanh\xe3 \xe0s] LT",nextWeek:"dddd [\xe0s] LT",lastDay:"[Ontem \xe0s] LT",lastWeek:function(){return 0===this.day()||6===this.day()?"[\xdaltimo] dddd [\xe0s] LT":"[\xdaltima] dddd [\xe0s] LT"},sameElse:"L"},relativeTime:{future:"em %s",past:"h\xe1 %s",s:"segundos",ss:"%d segundos",m:"um minuto",mm:"%d minutos",h:"uma hora",hh:"%d horas",d:"um dia",dd:"%d dias",w:"uma semana",ww:"%d semanas",M:"um m\xeas",MM:"%d meses",y:"um ano",yy:"%d anos"},dayOfMonthOrdinalParse:/\d{1,2}\xba/,ordinal:"%d\xba",week:{dow:1,doy:4}}),M.defineLocale("ro",{months:"ianuarie_februarie_martie_aprilie_mai_iunie_iulie_august_septembrie_octombrie_noiembrie_decembrie".split("_"),monthsShort:"ian._feb._mart._apr._mai_iun._iul._aug._sept._oct._nov._dec.".split("_"),monthsParseExact:!0,weekdays:"duminic\u0103_luni_mar\u021bi_miercuri_joi_vineri_s\xe2mb\u0103t\u0103".split("_"),weekdaysShort:"Dum_Lun_Mar_Mie_Joi_Vin_S\xe2m".split("_"),weekdaysMin:"Du_Lu_Ma_Mi_Jo_Vi_S\xe2".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY H:mm",LLLL:"dddd, D MMMM YYYY H:mm"},calendar:{sameDay:"[azi la] LT",nextDay:"[m\xe2ine la] LT",nextWeek:"dddd [la] LT",lastDay:"[ieri la] LT",lastWeek:"[fosta] dddd [la] LT",sameElse:"L"},relativeTime:{future:"peste %s",past:"%s \xeen urm\u0103",s:"c\xe2teva secunde",ss:Lr,m:"un minut",mm:Lr,h:"o or\u0103",hh:Lr,d:"o zi",dd:Lr,w:"o s\u0103pt\u0103m\xe2n\u0103",ww:Lr,M:"o lun\u0103",MM:Lr,y:"un an",yy:Lr},week:{dow:1,doy:7}});var yr=[/^\u044f\u043d\u0432/i,/^\u0444\u0435\u0432/i,/^\u043c\u0430\u0440/i,/^\u0430\u043f\u0440/i,/^\u043c\u0430[\u0439\u044f]/i,/^\u0438\u044e\u043d/i,/^\u0438\u044e\u043b/i,/^\u0430\u0432\u0433/i,/^\u0441\u0435\u043d/i,/^\u043e\u043a\u0442/i,/^\u043d\u043e\u044f/i,/^\u0434\u0435\u043a/i];M.defineLocale("ru",{months:{format:"\u044f\u043d\u0432\u0430\u0440\u044f_\u0444\u0435\u0432\u0440\u0430\u043b\u044f_\u043c\u0430\u0440\u0442\u0430_\u0430\u043f\u0440\u0435\u043b\u044f_\u043c\u0430\u044f_\u0438\u044e\u043d\u044f_\u0438\u044e\u043b\u044f_\u0430\u0432\u0433\u0443\u0441\u0442\u0430_\u0441\u0435\u043d\u0442\u044f\u0431\u0440\u044f_\u043e\u043a\u0442\u044f\u0431\u0440\u044f_\u043d\u043e\u044f\u0431\u0440\u044f_\u0434\u0435\u043a\u0430\u0431\u0440\u044f".split("_"),standalone:"\u044f\u043d\u0432\u0430\u0440\u044c_\u0444\u0435\u0432\u0440\u0430\u043b\u044c_\u043c\u0430\u0440\u0442_\u0430\u043f\u0440\u0435\u043b\u044c_\u043c\u0430\u0439_\u0438\u044e\u043d\u044c_\u0438\u044e\u043b\u044c_\u0430\u0432\u0433\u0443\u0441\u0442_\u0441\u0435\u043d\u0442\u044f\u0431\u0440\u044c_\u043e\u043a\u0442\u044f\u0431\u0440\u044c_\u043d\u043e\u044f\u0431\u0440\u044c_\u0434\u0435\u043a\u0430\u0431\u0440\u044c".split("_")},monthsShort:{format:"\u044f\u043d\u0432._\u0444\u0435\u0432\u0440._\u043c\u0430\u0440._\u0430\u043f\u0440._\u043c\u0430\u044f_\u0438\u044e\u043d\u044f_\u0438\u044e\u043b\u044f_\u0430\u0432\u0433._\u0441\u0435\u043d\u0442._\u043e\u043a\u0442._\u043d\u043e\u044f\u0431._\u0434\u0435\u043a.".split("_"),standalone:"\u044f\u043d\u0432._\u0444\u0435\u0432\u0440._\u043c\u0430\u0440\u0442_\u0430\u043f\u0440._\u043c\u0430\u0439_\u0438\u044e\u043d\u044c_\u0438\u044e\u043b\u044c_\u0430\u0432\u0433._\u0441\u0435\u043d\u0442._\u043e\u043a\u0442._\u043d\u043e\u044f\u0431._\u0434\u0435\u043a.".split("_")},weekdays:{standalone:"\u0432\u043e\u0441\u043a\u0440\u0435\u0441\u0435\u043d\u044c\u0435_\u043f\u043e\u043d\u0435\u0434\u0435\u043b\u044c\u043d\u0438\u043a_\u0432\u0442\u043e\u0440\u043d\u0438\u043a_\u0441\u0440\u0435\u0434\u0430_\u0447\u0435\u0442\u0432\u0435\u0440\u0433_\u043f\u044f\u0442\u043d\u0438\u0446\u0430_\u0441\u0443\u0431\u0431\u043e\u0442\u0430".split("_"),format:"\u0432\u043e\u0441\u043a\u0440\u0435\u0441\u0435\u043d\u044c\u0435_\u043f\u043e\u043d\u0435\u0434\u0435\u043b\u044c\u043d\u0438\u043a_\u0432\u0442\u043e\u0440\u043d\u0438\u043a_\u0441\u0440\u0435\u0434\u0443_\u0447\u0435\u0442\u0432\u0435\u0440\u0433_\u043f\u044f\u0442\u043d\u0438\u0446\u0443_\u0441\u0443\u0431\u0431\u043e\u0442\u0443".split("_"),isFormat:/\[ ?[\u0412\u0432] ?(?:\u043f\u0440\u043e\u0448\u043b\u0443\u044e|\u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0443\u044e|\u044d\u0442\u0443)? ?] ?dddd/},weekdaysShort:"\u0432\u0441_\u043f\u043d_\u0432\u0442_\u0441\u0440_\u0447\u0442_\u043f\u0442_\u0441\u0431".split("_"),weekdaysMin:"\u0432\u0441_\u043f\u043d_\u0432\u0442_\u0441\u0440_\u0447\u0442_\u043f\u0442_\u0441\u0431".split("_"),monthsParse:yr,longMonthsParse:yr,shortMonthsParse:yr,monthsRegex:/^(\u044f\u043d\u0432\u0430\u0440[\u044c\u044f]|\u044f\u043d\u0432\.?|\u0444\u0435\u0432\u0440\u0430\u043b[\u044c\u044f]|\u0444\u0435\u0432\u0440?\.?|\u043c\u0430\u0440\u0442\u0430?|\u043c\u0430\u0440\.?|\u0430\u043f\u0440\u0435\u043b[\u044c\u044f]|\u0430\u043f\u0440\.?|\u043c\u0430[\u0439\u044f]|\u0438\u044e\u043d[\u044c\u044f]|\u0438\u044e\u043d\.?|\u0438\u044e\u043b[\u044c\u044f]|\u0438\u044e\u043b\.?|\u0430\u0432\u0433\u0443\u0441\u0442\u0430?|\u0430\u0432\u0433\.?|\u0441\u0435\u043d\u0442\u044f\u0431\u0440[\u044c\u044f]|\u0441\u0435\u043d\u0442?\.?|\u043e\u043a\u0442\u044f\u0431\u0440[\u044c\u044f]|\u043e\u043a\u0442\.?|\u043d\u043e\u044f\u0431\u0440[\u044c\u044f]|\u043d\u043e\u044f\u0431?\.?|\u0434\u0435\u043a\u0430\u0431\u0440[\u044c\u044f]|\u0434\u0435\u043a\.?)/i,monthsShortRegex:/^(\u044f\u043d\u0432\u0430\u0440[\u044c\u044f]|\u044f\u043d\u0432\.?|\u0444\u0435\u0432\u0440\u0430\u043b[\u044c\u044f]|\u0444\u0435\u0432\u0440?\.?|\u043c\u0430\u0440\u0442\u0430?|\u043c\u0430\u0440\.?|\u0430\u043f\u0440\u0435\u043b[\u044c\u044f]|\u0430\u043f\u0440\.?|\u043c\u0430[\u0439\u044f]|\u0438\u044e\u043d[\u044c\u044f]|\u0438\u044e\u043d\.?|\u0438\u044e\u043b[\u044c\u044f]|\u0438\u044e\u043b\.?|\u0430\u0432\u0433\u0443\u0441\u0442\u0430?|\u0430\u0432\u0433\.?|\u0441\u0435\u043d\u0442\u044f\u0431\u0440[\u044c\u044f]|\u0441\u0435\u043d\u0442?\.?|\u043e\u043a\u0442\u044f\u0431\u0440[\u044c\u044f]|\u043e\u043a\u0442\.?|\u043d\u043e\u044f\u0431\u0440[\u044c\u044f]|\u043d\u043e\u044f\u0431?\.?|\u0434\u0435\u043a\u0430\u0431\u0440[\u044c\u044f]|\u0434\u0435\u043a\.?)/i,monthsStrictRegex:/^(\u044f\u043d\u0432\u0430\u0440[\u044f\u044c]|\u0444\u0435\u0432\u0440\u0430\u043b[\u044f\u044c]|\u043c\u0430\u0440\u0442\u0430?|\u0430\u043f\u0440\u0435\u043b[\u044f\u044c]|\u043c\u0430[\u044f\u0439]|\u0438\u044e\u043d[\u044f\u044c]|\u0438\u044e\u043b[\u044f\u044c]|\u0430\u0432\u0433\u0443\u0441\u0442\u0430?|\u0441\u0435\u043d\u0442\u044f\u0431\u0440[\u044f\u044c]|\u043e\u043a\u0442\u044f\u0431\u0440[\u044f\u044c]|\u043d\u043e\u044f\u0431\u0440[\u044f\u044c]|\u0434\u0435\u043a\u0430\u0431\u0440[\u044f\u044c])/i,monthsShortStrictRegex:/^(\u044f\u043d\u0432\.|\u0444\u0435\u0432\u0440?\.|\u043c\u0430\u0440[\u0442.]|\u0430\u043f\u0440\.|\u043c\u0430[\u044f\u0439]|\u0438\u044e\u043d[\u044c\u044f.]|\u0438\u044e\u043b[\u044c\u044f.]|\u0430\u0432\u0433\.|\u0441\u0435\u043d\u0442?\.|\u043e\u043a\u0442\.|\u043d\u043e\u044f\u0431?\.|\u0434\u0435\u043a\.)/i,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY \u0433.",LLL:"D MMMM YYYY \u0433., H:mm",LLLL:"dddd, D MMMM YYYY \u0433., H:mm"},calendar:{sameDay:"[\u0421\u0435\u0433\u043e\u0434\u043d\u044f, \u0432] LT",nextDay:"[\u0417\u0430\u0432\u0442\u0440\u0430, \u0432] LT",lastDay:"[\u0412\u0447\u0435\u0440\u0430, \u0432] LT",nextWeek:function(e){if(e.week()===this.week())return 2===this.day()?"[\u0412\u043e] dddd, [\u0432] LT":"[\u0412] dddd, [\u0432] LT";switch(this.day()){case 0:return"[\u0412 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u0435] dddd, [\u0432] LT";case 1:case 2:case 4:return"[\u0412 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0439] dddd, [\u0432] LT";case 3:case 5:case 6:return"[\u0412 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0443\u044e] dddd, [\u0432] LT"}},lastWeek:function(e){if(e.week()===this.week())return 2===this.day()?"[\u0412\u043e] dddd, [\u0432] LT":"[\u0412] dddd, [\u0432] LT";switch(this.day()){case 0:return"[\u0412 \u043f\u0440\u043e\u0448\u043b\u043e\u0435] dddd, [\u0432] LT";case 1:case 2:case 4:return"[\u0412 \u043f\u0440\u043e\u0448\u043b\u044b\u0439] dddd, [\u0432] LT";case 3:case 5:case 6:return"[\u0412 \u043f\u0440\u043e\u0448\u043b\u0443\u044e] dddd, [\u0432] LT"}},sameElse:"L"},relativeTime:{future:"\u0447\u0435\u0440\u0435\u0437 %s",past:"%s \u043d\u0430\u0437\u0430\u0434",s:"\u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u0441\u0435\u043a\u0443\u043d\u0434",ss:Yr,m:Yr,mm:Yr,h:"\u0447\u0430\u0441",hh:Yr,d:"\u0434\u0435\u043d\u044c",dd:Yr,w:"\u043d\u0435\u0434\u0435\u043b\u044f",ww:Yr,M:"\u043c\u0435\u0441\u044f\u0446",MM:Yr,y:"\u0433\u043e\u0434",yy:Yr},meridiemParse:/\u043d\u043e\u0447\u0438|\u0443\u0442\u0440\u0430|\u0434\u043d\u044f|\u0432\u0435\u0447\u0435\u0440\u0430/i,isPM:function(e){return/^(\u0434\u043d\u044f|\u0432\u0435\u0447\u0435\u0440\u0430)$/.test(e)},meridiem:function(e,a,t){return e<4?"\u043d\u043e\u0447\u0438":e<12?"\u0443\u0442\u0440\u0430":e<17?"\u0434\u043d\u044f":"\u0432\u0435\u0447\u0435\u0440\u0430"},dayOfMonthOrdinalParse:/\d{1,2}-(\u0439|\u0433\u043e|\u044f)/,ordinal:function(e,a){switch(a){case"M":case"d":case"DDD":return e+"-\u0439";case"D":return e+"-\u0433\u043e";case"w":case"W":return e+"-\u044f";default:return e}},week:{dow:1,doy:4}});var fr=["\u062c\u0646\u0648\u0631\u064a","\u0641\u064a\u0628\u0631\u0648\u0631\u064a","\u0645\u0627\u0631\u0686","\u0627\u067e\u0631\u064a\u0644","\u0645\u0626\u064a","\u062c\u0648\u0646","\u062c\u0648\u0644\u0627\u0621\u0650","\u0622\u06af\u0633\u067d","\u0633\u064a\u067e\u067d\u0645\u0628\u0631","\u0622\u06aa\u067d\u0648\u0628\u0631","\u0646\u0648\u0645\u0628\u0631","\u068a\u0633\u0645\u0628\u0631"],pr=["\u0622\u0686\u0631","\u0633\u0648\u0645\u0631","\u0627\u06b1\u0627\u0631\u0648","\u0627\u0631\u0628\u0639","\u062e\u0645\u064a\u0633","\u062c\u0645\u0639","\u0687\u0646\u0687\u0631"];M.defineLocale("sd",{months:fr,monthsShort:fr,weekdays:pr,weekdaysShort:pr,weekdaysMin:pr,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd\u060c D MMMM YYYY HH:mm"},meridiemParse:/\u0635\u0628\u062d|\u0634\u0627\u0645/,isPM:function(e){return"\u0634\u0627\u0645"===e},meridiem:function(e,a,t){return e<12?"\u0635\u0628\u062d":"\u0634\u0627\u0645"},calendar:{sameDay:"[\u0627\u0684] LT",nextDay:"[\u0633\u0680\u0627\u06bb\u064a] LT",nextWeek:"dddd [\u0627\u06b3\u064a\u0646 \u0647\u0641\u062a\u064a \u062a\u064a] LT",lastDay:"[\u06aa\u0627\u0644\u0647\u0647] LT",lastWeek:"[\u06af\u0632\u0631\u064a\u0644 \u0647\u0641\u062a\u064a] dddd [\u062a\u064a] LT",sameElse:"L"},relativeTime:{future:"%s \u067e\u0648\u0621",past:"%s \u0627\u06b3",s:"\u0686\u0646\u062f \u0633\u064a\u06aa\u0646\u068a",ss:"%d \u0633\u064a\u06aa\u0646\u068a",m:"\u0647\u06aa \u0645\u0646\u067d",mm:"%d \u0645\u0646\u067d",h:"\u0647\u06aa \u06aa\u0644\u0627\u06aa",hh:"%d \u06aa\u0644\u0627\u06aa",d:"\u0647\u06aa \u068f\u064a\u0646\u0647\u0646",dd:"%d \u068f\u064a\u0646\u0647\u0646",M:"\u0647\u06aa \u0645\u0647\u064a\u0646\u0648",MM:"%d \u0645\u0647\u064a\u0646\u0627",y:"\u0647\u06aa \u0633\u0627\u0644",yy:"%d \u0633\u0627\u0644"},preparse:function(e){return e.replace(/\u060c/g,",")},postformat:function(e){return e.replace(/,/g,"\u060c")},week:{dow:1,doy:4}}),M.defineLocale("se",{months:"o\u0111\u0111ajagem\xe1nnu_guovvam\xe1nnu_njuk\u010dam\xe1nnu_cuo\u014bom\xe1nnu_miessem\xe1nnu_geassem\xe1nnu_suoidnem\xe1nnu_borgem\xe1nnu_\u010dak\u010dam\xe1nnu_golggotm\xe1nnu_sk\xe1bmam\xe1nnu_juovlam\xe1nnu".split("_"),monthsShort:"o\u0111\u0111j_guov_njuk_cuo_mies_geas_suoi_borg_\u010dak\u010d_golg_sk\xe1b_juov".split("_"),weekdays:"sotnabeaivi_vuoss\xe1rga_ma\u014b\u014beb\xe1rga_gaskavahkku_duorastat_bearjadat_l\xe1vvardat".split("_"),weekdaysShort:"sotn_vuos_ma\u014b_gask_duor_bear_l\xe1v".split("_"),weekdaysMin:"s_v_m_g_d_b_L".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"MMMM D. [b.] YYYY",LLL:"MMMM D. [b.] YYYY [ti.] HH:mm",LLLL:"dddd, MMMM D. [b.] YYYY [ti.] HH:mm"},calendar:{sameDay:"[otne ti] LT",nextDay:"[ihttin ti] LT",nextWeek:"dddd [ti] LT",lastDay:"[ikte ti] LT",lastWeek:"[ovddit] dddd [ti] LT",sameElse:"L"},relativeTime:{future:"%s gea\u017ees",past:"ma\u014bit %s",s:"moadde sekunddat",ss:"%d sekunddat",m:"okta minuhta",mm:"%d minuhtat",h:"okta diimmu",hh:"%d diimmut",d:"okta beaivi",dd:"%d beaivvit",M:"okta m\xe1nnu",MM:"%d m\xe1nut",y:"okta jahki",yy:"%d jagit"},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),M.defineLocale("si",{months:"\u0da2\u0db1\u0dc0\u0dcf\u0dbb\u0dd2_\u0db4\u0dd9\u0db6\u0dbb\u0dc0\u0dcf\u0dbb\u0dd2_\u0db8\u0dcf\u0dbb\u0dca\u0dad\u0dd4_\u0d85\u0db4\u0dca\u200d\u0dbb\u0dda\u0dbd\u0dca_\u0db8\u0dd0\u0dba\u0dd2_\u0da2\u0dd6\u0db1\u0dd2_\u0da2\u0dd6\u0dbd\u0dd2_\u0d85\u0d9c\u0ddd\u0dc3\u0dca\u0dad\u0dd4_\u0dc3\u0dd0\u0db4\u0dca\u0dad\u0dd0\u0db8\u0dca\u0db6\u0dbb\u0dca_\u0d94\u0d9a\u0dca\u0dad\u0ddd\u0db6\u0dbb\u0dca_\u0db1\u0ddc\u0dc0\u0dd0\u0db8\u0dca\u0db6\u0dbb\u0dca_\u0daf\u0dd9\u0dc3\u0dd0\u0db8\u0dca\u0db6\u0dbb\u0dca".split("_"),monthsShort:"\u0da2\u0db1_\u0db4\u0dd9\u0db6_\u0db8\u0dcf\u0dbb\u0dca_\u0d85\u0db4\u0dca_\u0db8\u0dd0\u0dba\u0dd2_\u0da2\u0dd6\u0db1\u0dd2_\u0da2\u0dd6\u0dbd\u0dd2_\u0d85\u0d9c\u0ddd_\u0dc3\u0dd0\u0db4\u0dca_\u0d94\u0d9a\u0dca_\u0db1\u0ddc\u0dc0\u0dd0_\u0daf\u0dd9\u0dc3\u0dd0".split("_"),weekdays:"\u0d89\u0dbb\u0dd2\u0daf\u0dcf_\u0dc3\u0db3\u0dd4\u0daf\u0dcf_\u0d85\u0d9f\u0dc4\u0dbb\u0dd4\u0dc0\u0dcf\u0daf\u0dcf_\u0db6\u0daf\u0dcf\u0daf\u0dcf_\u0db6\u0dca\u200d\u0dbb\u0dc4\u0dc3\u0dca\u0db4\u0dad\u0dd2\u0db1\u0dca\u0daf\u0dcf_\u0dc3\u0dd2\u0d9a\u0dd4\u0dbb\u0dcf\u0daf\u0dcf_\u0dc3\u0dd9\u0db1\u0dc3\u0dd4\u0dbb\u0dcf\u0daf\u0dcf".split("_"),weekdaysShort:"\u0d89\u0dbb\u0dd2_\u0dc3\u0db3\u0dd4_\u0d85\u0d9f_\u0db6\u0daf\u0dcf_\u0db6\u0dca\u200d\u0dbb\u0dc4_\u0dc3\u0dd2\u0d9a\u0dd4_\u0dc3\u0dd9\u0db1".split("_"),weekdaysMin:"\u0d89_\u0dc3_\u0d85_\u0db6_\u0db6\u0dca\u200d\u0dbb_\u0dc3\u0dd2_\u0dc3\u0dd9".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"a h:mm",LTS:"a h:mm:ss",L:"YYYY/MM/DD",LL:"YYYY MMMM D",LLL:"YYYY MMMM D, a h:mm",LLLL:"YYYY MMMM D [\u0dc0\u0dd0\u0db1\u0dd2] dddd, a h:mm:ss"},calendar:{sameDay:"[\u0d85\u0daf] LT[\u0da7]",nextDay:"[\u0dc4\u0dd9\u0da7] LT[\u0da7]",nextWeek:"dddd LT[\u0da7]",lastDay:"[\u0d8a\u0dba\u0dda] LT[\u0da7]",lastWeek:"[\u0db4\u0dc3\u0dd4\u0d9c\u0dd2\u0dba] dddd LT[\u0da7]",sameElse:"L"},relativeTime:{future:"%s\u0d9a\u0dd2\u0db1\u0dca",past:"%s\u0d9a\u0da7 \u0db4\u0dd9\u0dbb",s:"\u0dad\u0dad\u0dca\u0db4\u0dbb \u0d9a\u0dd2\u0dc4\u0dd2\u0db4\u0dba",ss:"\u0dad\u0dad\u0dca\u0db4\u0dbb %d",m:"\u0db8\u0dd2\u0db1\u0dd2\u0dad\u0dca\u0dad\u0dd4\u0dc0",mm:"\u0db8\u0dd2\u0db1\u0dd2\u0dad\u0dca\u0dad\u0dd4 %d",h:"\u0db4\u0dd0\u0dba",hh:"\u0db4\u0dd0\u0dba %d",d:"\u0daf\u0dd2\u0db1\u0dba",dd:"\u0daf\u0dd2\u0db1 %d",M:"\u0db8\u0dcf\u0dc3\u0dba",MM:"\u0db8\u0dcf\u0dc3 %d",y:"\u0dc0\u0dc3\u0dbb",yy:"\u0dc0\u0dc3\u0dbb %d"},dayOfMonthOrdinalParse:/\d{1,2} \u0dc0\u0dd0\u0db1\u0dd2/,ordinal:function(e){return e+" \u0dc0\u0dd0\u0db1\u0dd2"},meridiemParse:/\u0db4\u0dd9\u0dbb \u0dc0\u0dbb\u0dd4|\u0db4\u0dc3\u0dca \u0dc0\u0dbb\u0dd4|\u0db4\u0dd9.\u0dc0|\u0db4.\u0dc0./,isPM:function(e){return"\u0db4.\u0dc0."===e||"\u0db4\u0dc3\u0dca \u0dc0\u0dbb\u0dd4"===e},meridiem:function(e,a,t){return 11<e?t?"\u0db4.\u0dc0.":"\u0db4\u0dc3\u0dca \u0dc0\u0dbb\u0dd4":t?"\u0db4\u0dd9.\u0dc0.":"\u0db4\u0dd9\u0dbb \u0dc0\u0dbb\u0dd4"}});var kr="janu\xe1r_febru\xe1r_marec_apr\xedl_m\xe1j_j\xfan_j\xfal_august_september_okt\xf3ber_november_december".split("_"),Dr="jan_feb_mar_apr_m\xe1j_j\xfan_j\xfal_aug_sep_okt_nov_dec".split("_");function Tr(e){return 1<e&&e<5}function gr(e,a,t,s){var n=e+" ";switch(t){case"s":return a||s?"p\xe1r sek\xfand":"p\xe1r sekundami";case"ss":return a||s?n+(Tr(e)?"sekundy":"sek\xfand"):n+"sekundami";case"m":return a?"min\xfata":s?"min\xfatu":"min\xfatou";case"mm":return a||s?n+(Tr(e)?"min\xfaty":"min\xfat"):n+"min\xfatami";case"h":return a?"hodina":s?"hodinu":"hodinou";case"hh":return a||s?n+(Tr(e)?"hodiny":"hod\xedn"):n+"hodinami";case"d":return a||s?"de\u0148":"d\u0148om";case"dd":return a||s?n+(Tr(e)?"dni":"dn\xed"):n+"d\u0148ami";case"M":return a||s?"mesiac":"mesiacom";case"MM":return a||s?n+(Tr(e)?"mesiace":"mesiacov"):n+"mesiacmi";case"y":return a||s?"rok":"rokom";case"yy":return a||s?n+(Tr(e)?"roky":"rokov"):n+"rokmi"}}function wr(e,a,t,s){var n=e+" ";switch(t){case"s":return a||s?"nekaj sekund":"nekaj sekundami";case"ss":return n+=1===e?a?"sekundo":"sekundi":2===e?a||s?"sekundi":"sekundah":e<5?a||s?"sekunde":"sekundah":"sekund";case"m":return a?"ena minuta":"eno minuto";case"mm":return n+=1===e?a?"minuta":"minuto":2===e?a||s?"minuti":"minutama":e<5?a||s?"minute":"minutami":a||s?"minut":"minutami";case"h":return a?"ena ura":"eno uro";case"hh":return n+=1===e?a?"ura":"uro":2===e?a||s?"uri":"urama":e<5?a||s?"ure":"urami":a||s?"ur":"urami";case"d":return a||s?"en dan":"enim dnem";case"dd":return n+=1===e?a||s?"dan":"dnem":2===e?a||s?"dni":"dnevoma":a||s?"dni":"dnevi";case"M":return a||s?"en mesec":"enim mesecem";case"MM":return n+=1===e?a||s?"mesec":"mesecem":2===e?a||s?"meseca":"mesecema":e<5?a||s?"mesece":"meseci":a||s?"mesecev":"meseci";case"y":return a||s?"eno leto":"enim letom";case"yy":return n+=1===e?a||s?"leto":"letom":2===e?a||s?"leti":"letoma":e<5?a||s?"leta":"leti":a||s?"let":"leti"}}M.defineLocale("sk",{months:kr,monthsShort:Dr,weekdays:"nede\u013ea_pondelok_utorok_streda_\u0161tvrtok_piatok_sobota".split("_"),weekdaysShort:"ne_po_ut_st_\u0161t_pi_so".split("_"),weekdaysMin:"ne_po_ut_st_\u0161t_pi_so".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd D. MMMM YYYY H:mm"},calendar:{sameDay:"[dnes o] LT",nextDay:"[zajtra o] LT",nextWeek:function(){switch(this.day()){case 0:return"[v nede\u013eu o] LT";case 1:case 2:return"[v] dddd [o] LT";case 3:return"[v stredu o] LT";case 4:return"[vo \u0161tvrtok o] LT";case 5:return"[v piatok o] LT";case 6:return"[v sobotu o] LT"}},lastDay:"[v\u010dera o] LT",lastWeek:function(){switch(this.day()){case 0:return"[minul\xfa nede\u013eu o] LT";case 1:case 2:return"[minul\xfd] dddd [o] LT";case 3:return"[minul\xfa stredu o] LT";case 4:case 5:return"[minul\xfd] dddd [o] LT";case 6:return"[minul\xfa sobotu o] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"pred %s",s:gr,ss:gr,m:gr,mm:gr,h:gr,hh:gr,d:gr,dd:gr,M:gr,MM:gr,y:gr,yy:gr},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),M.defineLocale("sl",{months:"januar_februar_marec_april_maj_junij_julij_avgust_september_oktober_november_december".split("_"),monthsShort:"jan._feb._mar._apr._maj._jun._jul._avg._sep._okt._nov._dec.".split("_"),monthsParseExact:!0,weekdays:"nedelja_ponedeljek_torek_sreda_\u010detrtek_petek_sobota".split("_"),weekdaysShort:"ned._pon._tor._sre._\u010det._pet._sob.".split("_"),weekdaysMin:"ne_po_to_sr_\u010de_pe_so".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD. MM. YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY H:mm",LLLL:"dddd, D. MMMM YYYY H:mm"},calendar:{sameDay:"[danes ob] LT",nextDay:"[jutri ob] LT",nextWeek:function(){switch(this.day()){case 0:return"[v] [nedeljo] [ob] LT";case 3:return"[v] [sredo] [ob] LT";case 6:return"[v] [soboto] [ob] LT";case 1:case 2:case 4:case 5:return"[v] dddd [ob] LT"}},lastDay:"[v\u010deraj ob] LT",lastWeek:function(){switch(this.day()){case 0:return"[prej\u0161njo] [nedeljo] [ob] LT";case 3:return"[prej\u0161njo] [sredo] [ob] LT";case 6:return"[prej\u0161njo] [soboto] [ob] LT";case 1:case 2:case 4:case 5:return"[prej\u0161nji] dddd [ob] LT"}},sameElse:"L"},relativeTime:{future:"\u010dez %s",past:"pred %s",s:wr,ss:wr,m:wr,mm:wr,h:wr,hh:wr,d:wr,dd:wr,M:wr,MM:wr,y:wr,yy:wr},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),M.defineLocale("sq",{months:"Janar_Shkurt_Mars_Prill_Maj_Qershor_Korrik_Gusht_Shtator_Tetor_N\xebntor_Dhjetor".split("_"),monthsShort:"Jan_Shk_Mar_Pri_Maj_Qer_Kor_Gus_Sht_Tet_N\xebn_Dhj".split("_"),weekdays:"E Diel_E H\xebn\xeb_E Mart\xeb_E M\xebrkur\xeb_E Enjte_E Premte_E Shtun\xeb".split("_"),weekdaysShort:"Die_H\xebn_Mar_M\xebr_Enj_Pre_Sht".split("_"),weekdaysMin:"D_H_Ma_M\xeb_E_P_Sh".split("_"),weekdaysParseExact:!0,meridiemParse:/PD|MD/,isPM:function(e){return"M"===e.charAt(0)},meridiem:function(e,a,t){return e<12?"PD":"MD"},longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Sot n\xeb] LT",nextDay:"[Nes\xebr n\xeb] LT",nextWeek:"dddd [n\xeb] LT",lastDay:"[Dje n\xeb] LT",lastWeek:"dddd [e kaluar n\xeb] LT",sameElse:"L"},relativeTime:{future:"n\xeb %s",past:"%s m\xeb par\xeb",s:"disa sekonda",ss:"%d sekonda",m:"nj\xeb minut\xeb",mm:"%d minuta",h:"nj\xeb or\xeb",hh:"%d or\xeb",d:"nj\xeb dit\xeb",dd:"%d dit\xeb",M:"nj\xeb muaj",MM:"%d muaj",y:"nj\xeb vit",yy:"%d vite"},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});var vr={words:{ss:["\u0441\u0435\u043a\u0443\u043d\u0434\u0430","\u0441\u0435\u043a\u0443\u043d\u0434\u0435","\u0441\u0435\u043a\u0443\u043d\u0434\u0438"],m:["\u0458\u0435\u0434\u0430\u043d \u043c\u0438\u043d\u0443\u0442","\u0458\u0435\u0434\u043d\u0435 \u043c\u0438\u043d\u0443\u0442\u0435"],mm:["\u043c\u0438\u043d\u0443\u0442","\u043c\u0438\u043d\u0443\u0442\u0435","\u043c\u0438\u043d\u0443\u0442\u0430"],h:["\u0458\u0435\u0434\u0430\u043d \u0441\u0430\u0442","\u0458\u0435\u0434\u043d\u043e\u0433 \u0441\u0430\u0442\u0430"],hh:["\u0441\u0430\u0442","\u0441\u0430\u0442\u0430","\u0441\u0430\u0442\u0438"],dd:["\u0434\u0430\u043d","\u0434\u0430\u043d\u0430","\u0434\u0430\u043d\u0430"],MM:["\u043c\u0435\u0441\u0435\u0446","\u043c\u0435\u0441\u0435\u0446\u0430","\u043c\u0435\u0441\u0435\u0446\u0438"],yy:["\u0433\u043e\u0434\u0438\u043d\u0430","\u0433\u043e\u0434\u0438\u043d\u0435","\u0433\u043e\u0434\u0438\u043d\u0430"]},correctGrammaticalCase:function(e,a){return 1===e?a[0]:2<=e&&e<=4?a[1]:a[2]},translate:function(e,a,t){var s=vr.words[t];return 1===t.length?a?s[0]:s[1]:e+" "+vr.correctGrammaticalCase(e,s)}};M.defineLocale("sr-cyrl",{months:"\u0458\u0430\u043d\u0443\u0430\u0440_\u0444\u0435\u0431\u0440\u0443\u0430\u0440_\u043c\u0430\u0440\u0442_\u0430\u043f\u0440\u0438\u043b_\u043c\u0430\u0458_\u0458\u0443\u043d_\u0458\u0443\u043b_\u0430\u0432\u0433\u0443\u0441\u0442_\u0441\u0435\u043f\u0442\u0435\u043c\u0431\u0430\u0440_\u043e\u043a\u0442\u043e\u0431\u0430\u0440_\u043d\u043e\u0432\u0435\u043c\u0431\u0430\u0440_\u0434\u0435\u0446\u0435\u043c\u0431\u0430\u0440".split("_"),monthsShort:"\u0458\u0430\u043d._\u0444\u0435\u0431._\u043c\u0430\u0440._\u0430\u043f\u0440._\u043c\u0430\u0458_\u0458\u0443\u043d_\u0458\u0443\u043b_\u0430\u0432\u0433._\u0441\u0435\u043f._\u043e\u043a\u0442._\u043d\u043e\u0432._\u0434\u0435\u0446.".split("_"),monthsParseExact:!0,weekdays:"\u043d\u0435\u0434\u0435\u0459\u0430_\u043f\u043e\u043d\u0435\u0434\u0435\u0459\u0430\u043a_\u0443\u0442\u043e\u0440\u0430\u043a_\u0441\u0440\u0435\u0434\u0430_\u0447\u0435\u0442\u0432\u0440\u0442\u0430\u043a_\u043f\u0435\u0442\u0430\u043a_\u0441\u0443\u0431\u043e\u0442\u0430".split("_"),weekdaysShort:"\u043d\u0435\u0434._\u043f\u043e\u043d._\u0443\u0442\u043e._\u0441\u0440\u0435._\u0447\u0435\u0442._\u043f\u0435\u0442._\u0441\u0443\u0431.".split("_"),weekdaysMin:"\u043d\u0435_\u043f\u043e_\u0443\u0442_\u0441\u0440_\u0447\u0435_\u043f\u0435_\u0441\u0443".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"D. M. YYYY.",LL:"D. MMMM YYYY.",LLL:"D. MMMM YYYY. H:mm",LLLL:"dddd, D. MMMM YYYY. H:mm"},calendar:{sameDay:"[\u0434\u0430\u043d\u0430\u0441 \u0443] LT",nextDay:"[\u0441\u0443\u0442\u0440\u0430 \u0443] LT",nextWeek:function(){switch(this.day()){case 0:return"[\u0443] [\u043d\u0435\u0434\u0435\u0459\u0443] [\u0443] LT";case 3:return"[\u0443] [\u0441\u0440\u0435\u0434\u0443] [\u0443] LT";case 6:return"[\u0443] [\u0441\u0443\u0431\u043e\u0442\u0443] [\u0443] LT";case 1:case 2:case 4:case 5:return"[\u0443] dddd [\u0443] LT"}},lastDay:"[\u0458\u0443\u0447\u0435 \u0443] LT",lastWeek:function(){return["[\u043f\u0440\u043e\u0448\u043b\u0435] [\u043d\u0435\u0434\u0435\u0459\u0435] [\u0443] LT","[\u043f\u0440\u043e\u0448\u043b\u043e\u0433] [\u043f\u043e\u043d\u0435\u0434\u0435\u0459\u043a\u0430] [\u0443] LT","[\u043f\u0440\u043e\u0448\u043b\u043e\u0433] [\u0443\u0442\u043e\u0440\u043a\u0430] [\u0443] LT","[\u043f\u0440\u043e\u0448\u043b\u0435] [\u0441\u0440\u0435\u0434\u0435] [\u0443] LT","[\u043f\u0440\u043e\u0448\u043b\u043e\u0433] [\u0447\u0435\u0442\u0432\u0440\u0442\u043a\u0430] [\u0443] LT","[\u043f\u0440\u043e\u0448\u043b\u043e\u0433] [\u043f\u0435\u0442\u043a\u0430] [\u0443] LT","[\u043f\u0440\u043e\u0448\u043b\u0435] [\u0441\u0443\u0431\u043e\u0442\u0435] [\u0443] LT"][this.day()]},sameElse:"L"},relativeTime:{future:"\u0437\u0430 %s",past:"\u043f\u0440\u0435 %s",s:"\u043d\u0435\u043a\u043e\u043b\u0438\u043a\u043e \u0441\u0435\u043a\u0443\u043d\u0434\u0438",ss:vr.translate,m:vr.translate,mm:vr.translate,h:vr.translate,hh:vr.translate,d:"\u0434\u0430\u043d",dd:vr.translate,M:"\u043c\u0435\u0441\u0435\u0446",MM:vr.translate,y:"\u0433\u043e\u0434\u0438\u043d\u0443",yy:vr.translate},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}});var br={words:{ss:["sekunda","sekunde","sekundi"],m:["jedan minut","jedne minute"],mm:["minut","minute","minuta"],h:["jedan sat","jednog sata"],hh:["sat","sata","sati"],dd:["dan","dana","dana"],MM:["mesec","meseca","meseci"],yy:["godina","godine","godina"]},correctGrammaticalCase:function(e,a){return 1===e?a[0]:2<=e&&e<=4?a[1]:a[2]},translate:function(e,a,t){var s=br.words[t];return 1===t.length?a?s[0]:s[1]:e+" "+br.correctGrammaticalCase(e,s)}};M.defineLocale("sr",{months:"januar_februar_mart_april_maj_jun_jul_avgust_septembar_oktobar_novembar_decembar".split("_"),monthsShort:"jan._feb._mar._apr._maj_jun_jul_avg._sep._okt._nov._dec.".split("_"),monthsParseExact:!0,weekdays:"nedelja_ponedeljak_utorak_sreda_\u010detvrtak_petak_subota".split("_"),weekdaysShort:"ned._pon._uto._sre._\u010det._pet._sub.".split("_"),weekdaysMin:"ne_po_ut_sr_\u010de_pe_su".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"D. M. YYYY.",LL:"D. MMMM YYYY.",LLL:"D. MMMM YYYY. H:mm",LLLL:"dddd, D. MMMM YYYY. H:mm"},calendar:{sameDay:"[danas u] LT",nextDay:"[sutra u] LT",nextWeek:function(){switch(this.day()){case 0:return"[u] [nedelju] [u] LT";case 3:return"[u] [sredu] [u] LT";case 6:return"[u] [subotu] [u] LT";case 1:case 2:case 4:case 5:return"[u] dddd [u] LT"}},lastDay:"[ju\u010de u] LT",lastWeek:function(){return["[pro\u0161le] [nedelje] [u] LT","[pro\u0161log] [ponedeljka] [u] LT","[pro\u0161log] [utorka] [u] LT","[pro\u0161le] [srede] [u] LT","[pro\u0161log] [\u010detvrtka] [u] LT","[pro\u0161log] [petka] [u] LT","[pro\u0161le] [subote] [u] LT"][this.day()]},sameElse:"L"},relativeTime:{future:"za %s",past:"pre %s",s:"nekoliko sekundi",ss:br.translate,m:br.translate,mm:br.translate,h:br.translate,hh:br.translate,d:"dan",dd:br.translate,M:"mesec",MM:br.translate,y:"godinu",yy:br.translate},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}}),M.defineLocale("ss",{months:"Bhimbidvwane_Indlovana_Indlov'lenkhulu_Mabasa_Inkhwekhweti_Inhlaba_Kholwane_Ingci_Inyoni_Imphala_Lweti_Ingongoni".split("_"),monthsShort:"Bhi_Ina_Inu_Mab_Ink_Inh_Kho_Igc_Iny_Imp_Lwe_Igo".split("_"),weekdays:"Lisontfo_Umsombuluko_Lesibili_Lesitsatfu_Lesine_Lesihlanu_Umgcibelo".split("_"),weekdaysShort:"Lis_Umb_Lsb_Les_Lsi_Lsh_Umg".split("_"),weekdaysMin:"Li_Us_Lb_Lt_Ls_Lh_Ug".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},calendar:{sameDay:"[Namuhla nga] LT",nextDay:"[Kusasa nga] LT",nextWeek:"dddd [nga] LT",lastDay:"[Itolo nga] LT",lastWeek:"dddd [leliphelile] [nga] LT",sameElse:"L"},relativeTime:{future:"nga %s",past:"wenteka nga %s",s:"emizuzwana lomcane",ss:"%d mzuzwana",m:"umzuzu",mm:"%d emizuzu",h:"lihora",hh:"%d emahora",d:"lilanga",dd:"%d emalanga",M:"inyanga",MM:"%d tinyanga",y:"umnyaka",yy:"%d iminyaka"},meridiemParse:/ekuseni|emini|entsambama|ebusuku/,meridiem:function(e,a,t){return e<11?"ekuseni":e<15?"emini":e<19?"entsambama":"ebusuku"},meridiemHour:function(e,a){return 12===e&&(e=0),"ekuseni"===a?e:"emini"===a?11<=e?e:e+12:"entsambama"===a||"ebusuku"===a?0===e?0:e+12:void 0},dayOfMonthOrdinalParse:/\d{1,2}/,ordinal:"%d",week:{dow:1,doy:4}}),M.defineLocale("sv",{months:"januari_februari_mars_april_maj_juni_juli_augusti_september_oktober_november_december".split("_"),monthsShort:"jan_feb_mar_apr_maj_jun_jul_aug_sep_okt_nov_dec".split("_"),weekdays:"s\xf6ndag_m\xe5ndag_tisdag_onsdag_torsdag_fredag_l\xf6rdag".split("_"),weekdaysShort:"s\xf6n_m\xe5n_tis_ons_tor_fre_l\xf6r".split("_"),weekdaysMin:"s\xf6_m\xe5_ti_on_to_fr_l\xf6".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [kl.] HH:mm",LLLL:"dddd D MMMM YYYY [kl.] HH:mm",lll:"D MMM YYYY HH:mm",llll:"ddd D MMM YYYY HH:mm"},calendar:{sameDay:"[Idag] LT",nextDay:"[Imorgon] LT",lastDay:"[Ig\xe5r] LT",nextWeek:"[P\xe5] dddd LT",lastWeek:"[I] dddd[s] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"f\xf6r %s sedan",s:"n\xe5gra sekunder",ss:"%d sekunder",m:"en minut",mm:"%d minuter",h:"en timme",hh:"%d timmar",d:"en dag",dd:"%d dagar",M:"en m\xe5nad",MM:"%d m\xe5nader",y:"ett \xe5r",yy:"%d \xe5r"},dayOfMonthOrdinalParse:/\d{1,2}(\:e|\:a)/,ordinal:function(e){var a=e%10;return e+(1!=~~(e%100/10)&&(1==a||2==a)?":a":":e")},week:{dow:1,doy:4}}),M.defineLocale("sw",{months:"Januari_Februari_Machi_Aprili_Mei_Juni_Julai_Agosti_Septemba_Oktoba_Novemba_Desemba".split("_"),monthsShort:"Jan_Feb_Mac_Apr_Mei_Jun_Jul_Ago_Sep_Okt_Nov_Des".split("_"),weekdays:"Jumapili_Jumatatu_Jumanne_Jumatano_Alhamisi_Ijumaa_Jumamosi".split("_"),weekdaysShort:"Jpl_Jtat_Jnne_Jtan_Alh_Ijm_Jmos".split("_"),weekdaysMin:"J2_J3_J4_J5_Al_Ij_J1".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"hh:mm A",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[leo saa] LT",nextDay:"[kesho saa] LT",nextWeek:"[wiki ijayo] dddd [saat] LT",lastDay:"[jana] LT",lastWeek:"[wiki iliyopita] dddd [saat] LT",sameElse:"L"},relativeTime:{future:"%s baadaye",past:"tokea %s",s:"hivi punde",ss:"sekunde %d",m:"dakika moja",mm:"dakika %d",h:"saa limoja",hh:"masaa %d",d:"siku moja",dd:"siku %d",M:"mwezi mmoja",MM:"miezi %d",y:"mwaka mmoja",yy:"miaka %d"},week:{dow:1,doy:7}});var Sr={1:"\u0be7",2:"\u0be8",3:"\u0be9",4:"\u0bea",5:"\u0beb",6:"\u0bec",7:"\u0bed",8:"\u0bee",9:"\u0bef",0:"\u0be6"},Hr={"\u0be7":"1","\u0be8":"2","\u0be9":"3","\u0bea":"4","\u0beb":"5","\u0bec":"6","\u0bed":"7","\u0bee":"8","\u0bef":"9","\u0be6":"0"};M.defineLocale("ta",{months:"\u0b9c\u0ba9\u0bb5\u0bb0\u0bbf_\u0baa\u0bbf\u0baa\u0bcd\u0bb0\u0bb5\u0bb0\u0bbf_\u0bae\u0bbe\u0bb0\u0bcd\u0b9a\u0bcd_\u0b8f\u0baa\u0bcd\u0bb0\u0bb2\u0bcd_\u0bae\u0bc7_\u0b9c\u0bc2\u0ba9\u0bcd_\u0b9c\u0bc2\u0bb2\u0bc8_\u0b86\u0b95\u0bb8\u0bcd\u0b9f\u0bcd_\u0b9a\u0bc6\u0baa\u0bcd\u0b9f\u0bc6\u0bae\u0bcd\u0baa\u0bb0\u0bcd_\u0b85\u0b95\u0bcd\u0b9f\u0bc7\u0bbe\u0baa\u0bb0\u0bcd_\u0ba8\u0bb5\u0bae\u0bcd\u0baa\u0bb0\u0bcd_\u0b9f\u0bbf\u0b9a\u0bae\u0bcd\u0baa\u0bb0\u0bcd".split("_"),monthsShort:"\u0b9c\u0ba9\u0bb5\u0bb0\u0bbf_\u0baa\u0bbf\u0baa\u0bcd\u0bb0\u0bb5\u0bb0\u0bbf_\u0bae\u0bbe\u0bb0\u0bcd\u0b9a\u0bcd_\u0b8f\u0baa\u0bcd\u0bb0\u0bb2\u0bcd_\u0bae\u0bc7_\u0b9c\u0bc2\u0ba9\u0bcd_\u0b9c\u0bc2\u0bb2\u0bc8_\u0b86\u0b95\u0bb8\u0bcd\u0b9f\u0bcd_\u0b9a\u0bc6\u0baa\u0bcd\u0b9f\u0bc6\u0bae\u0bcd\u0baa\u0bb0\u0bcd_\u0b85\u0b95\u0bcd\u0b9f\u0bc7\u0bbe\u0baa\u0bb0\u0bcd_\u0ba8\u0bb5\u0bae\u0bcd\u0baa\u0bb0\u0bcd_\u0b9f\u0bbf\u0b9a\u0bae\u0bcd\u0baa\u0bb0\u0bcd".split("_"),weekdays:"\u0b9e\u0bbe\u0baf\u0bbf\u0bb1\u0bcd\u0bb1\u0bc1\u0b95\u0bcd\u0b95\u0bbf\u0bb4\u0bae\u0bc8_\u0ba4\u0bbf\u0b99\u0bcd\u0b95\u0b9f\u0bcd\u0b95\u0bbf\u0bb4\u0bae\u0bc8_\u0b9a\u0bc6\u0bb5\u0bcd\u0bb5\u0bbe\u0baf\u0bcd\u0b95\u0bbf\u0bb4\u0bae\u0bc8_\u0baa\u0bc1\u0ba4\u0ba9\u0bcd\u0b95\u0bbf\u0bb4\u0bae\u0bc8_\u0bb5\u0bbf\u0baf\u0bbe\u0bb4\u0b95\u0bcd\u0b95\u0bbf\u0bb4\u0bae\u0bc8_\u0bb5\u0bc6\u0bb3\u0bcd\u0bb3\u0bbf\u0b95\u0bcd\u0b95\u0bbf\u0bb4\u0bae\u0bc8_\u0b9a\u0ba9\u0bbf\u0b95\u0bcd\u0b95\u0bbf\u0bb4\u0bae\u0bc8".split("_"),weekdaysShort:"\u0b9e\u0bbe\u0baf\u0bbf\u0bb1\u0bc1_\u0ba4\u0bbf\u0b99\u0bcd\u0b95\u0bb3\u0bcd_\u0b9a\u0bc6\u0bb5\u0bcd\u0bb5\u0bbe\u0baf\u0bcd_\u0baa\u0bc1\u0ba4\u0ba9\u0bcd_\u0bb5\u0bbf\u0baf\u0bbe\u0bb4\u0ba9\u0bcd_\u0bb5\u0bc6\u0bb3\u0bcd\u0bb3\u0bbf_\u0b9a\u0ba9\u0bbf".split("_"),weekdaysMin:"\u0b9e\u0bbe_\u0ba4\u0bbf_\u0b9a\u0bc6_\u0baa\u0bc1_\u0bb5\u0bbf_\u0bb5\u0bc6_\u0b9a".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, HH:mm",LLLL:"dddd, D MMMM YYYY, HH:mm"},calendar:{sameDay:"[\u0b87\u0ba9\u0bcd\u0bb1\u0bc1] LT",nextDay:"[\u0ba8\u0bbe\u0bb3\u0bc8] LT",nextWeek:"dddd, LT",lastDay:"[\u0ba8\u0bc7\u0bb1\u0bcd\u0bb1\u0bc1] LT",lastWeek:"[\u0b95\u0b9f\u0ba8\u0bcd\u0ba4 \u0bb5\u0bbe\u0bb0\u0bae\u0bcd] dddd, LT",sameElse:"L"},relativeTime:{future:"%s \u0b87\u0bb2\u0bcd",past:"%s \u0bae\u0bc1\u0ba9\u0bcd",s:"\u0b92\u0bb0\u0bc1 \u0b9a\u0bbf\u0bb2 \u0bb5\u0bbf\u0ba8\u0bbe\u0b9f\u0bbf\u0b95\u0bb3\u0bcd",ss:"%d \u0bb5\u0bbf\u0ba8\u0bbe\u0b9f\u0bbf\u0b95\u0bb3\u0bcd",m:"\u0b92\u0bb0\u0bc1 \u0ba8\u0bbf\u0bae\u0bbf\u0b9f\u0bae\u0bcd",mm:"%d \u0ba8\u0bbf\u0bae\u0bbf\u0b9f\u0b99\u0bcd\u0b95\u0bb3\u0bcd",h:"\u0b92\u0bb0\u0bc1 \u0bae\u0ba3\u0bbf \u0ba8\u0bc7\u0bb0\u0bae\u0bcd",hh:"%d \u0bae\u0ba3\u0bbf \u0ba8\u0bc7\u0bb0\u0bae\u0bcd",d:"\u0b92\u0bb0\u0bc1 \u0ba8\u0bbe\u0bb3\u0bcd",dd:"%d \u0ba8\u0bbe\u0b9f\u0bcd\u0b95\u0bb3\u0bcd",M:"\u0b92\u0bb0\u0bc1 \u0bae\u0bbe\u0ba4\u0bae\u0bcd",MM:"%d \u0bae\u0bbe\u0ba4\u0b99\u0bcd\u0b95\u0bb3\u0bcd",y:"\u0b92\u0bb0\u0bc1 \u0bb5\u0bb0\u0bc1\u0b9f\u0bae\u0bcd",yy:"%d \u0b86\u0ba3\u0bcd\u0b9f\u0bc1\u0b95\u0bb3\u0bcd"},dayOfMonthOrdinalParse:/\d{1,2}\u0bb5\u0ba4\u0bc1/,ordinal:function(e){return e+"\u0bb5\u0ba4\u0bc1"},preparse:function(e){return e.replace(/[\u0be7\u0be8\u0be9\u0bea\u0beb\u0bec\u0bed\u0bee\u0bef\u0be6]/g,function(e){return Hr[e]})},postformat:function(e){return e.replace(/\d/g,function(e){return Sr[e]})},meridiemParse:/\u0baf\u0bbe\u0bae\u0bae\u0bcd|\u0bb5\u0bc8\u0b95\u0bb1\u0bc8|\u0b95\u0bbe\u0bb2\u0bc8|\u0ba8\u0ba3\u0bcd\u0baa\u0b95\u0bb2\u0bcd|\u0b8e\u0bb1\u0bcd\u0baa\u0bbe\u0b9f\u0bc1|\u0bae\u0bbe\u0bb2\u0bc8/,meridiem:function(e,a,t){return e<2?" \u0baf\u0bbe\u0bae\u0bae\u0bcd":e<6?" \u0bb5\u0bc8\u0b95\u0bb1\u0bc8":e<10?" \u0b95\u0bbe\u0bb2\u0bc8":e<14?" \u0ba8\u0ba3\u0bcd\u0baa\u0b95\u0bb2\u0bcd":e<18?" \u0b8e\u0bb1\u0bcd\u0baa\u0bbe\u0b9f\u0bc1":e<22?" \u0bae\u0bbe\u0bb2\u0bc8":" \u0baf\u0bbe\u0bae\u0bae\u0bcd"},meridiemHour:function(e,a){return 12===e&&(e=0),"\u0baf\u0bbe\u0bae\u0bae\u0bcd"===a?e<2?e:e+12:"\u0bb5\u0bc8\u0b95\u0bb1\u0bc8"===a||"\u0b95\u0bbe\u0bb2\u0bc8"===a||"\u0ba8\u0ba3\u0bcd\u0baa\u0b95\u0bb2\u0bcd"===a&&10<=e?e:e+12},week:{dow:0,doy:6}}),M.defineLocale("te",{months:"\u0c1c\u0c28\u0c35\u0c30\u0c3f_\u0c2b\u0c3f\u0c2c\u0c4d\u0c30\u0c35\u0c30\u0c3f_\u0c2e\u0c3e\u0c30\u0c4d\u0c1a\u0c3f_\u0c0f\u0c2a\u0c4d\u0c30\u0c3f\u0c32\u0c4d_\u0c2e\u0c47_\u0c1c\u0c42\u0c28\u0c4d_\u0c1c\u0c41\u0c32\u0c48_\u0c06\u0c17\u0c38\u0c4d\u0c1f\u0c41_\u0c38\u0c46\u0c2a\u0c4d\u0c1f\u0c46\u0c02\u0c2c\u0c30\u0c4d_\u0c05\u0c15\u0c4d\u0c1f\u0c4b\u0c2c\u0c30\u0c4d_\u0c28\u0c35\u0c02\u0c2c\u0c30\u0c4d_\u0c21\u0c3f\u0c38\u0c46\u0c02\u0c2c\u0c30\u0c4d".split("_"),monthsShort:"\u0c1c\u0c28._\u0c2b\u0c3f\u0c2c\u0c4d\u0c30._\u0c2e\u0c3e\u0c30\u0c4d\u0c1a\u0c3f_\u0c0f\u0c2a\u0c4d\u0c30\u0c3f._\u0c2e\u0c47_\u0c1c\u0c42\u0c28\u0c4d_\u0c1c\u0c41\u0c32\u0c48_\u0c06\u0c17._\u0c38\u0c46\u0c2a\u0c4d._\u0c05\u0c15\u0c4d\u0c1f\u0c4b._\u0c28\u0c35._\u0c21\u0c3f\u0c38\u0c46.".split("_"),monthsParseExact:!0,weekdays:"\u0c06\u0c26\u0c3f\u0c35\u0c3e\u0c30\u0c02_\u0c38\u0c4b\u0c2e\u0c35\u0c3e\u0c30\u0c02_\u0c2e\u0c02\u0c17\u0c33\u0c35\u0c3e\u0c30\u0c02_\u0c2c\u0c41\u0c27\u0c35\u0c3e\u0c30\u0c02_\u0c17\u0c41\u0c30\u0c41\u0c35\u0c3e\u0c30\u0c02_\u0c36\u0c41\u0c15\u0c4d\u0c30\u0c35\u0c3e\u0c30\u0c02_\u0c36\u0c28\u0c3f\u0c35\u0c3e\u0c30\u0c02".split("_"),weekdaysShort:"\u0c06\u0c26\u0c3f_\u0c38\u0c4b\u0c2e_\u0c2e\u0c02\u0c17\u0c33_\u0c2c\u0c41\u0c27_\u0c17\u0c41\u0c30\u0c41_\u0c36\u0c41\u0c15\u0c4d\u0c30_\u0c36\u0c28\u0c3f".split("_"),weekdaysMin:"\u0c06_\u0c38\u0c4b_\u0c2e\u0c02_\u0c2c\u0c41_\u0c17\u0c41_\u0c36\u0c41_\u0c36".split("_"),longDateFormat:{LT:"A h:mm",LTS:"A h:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY, A h:mm",LLLL:"dddd, D MMMM YYYY, A h:mm"},calendar:{sameDay:"[\u0c28\u0c47\u0c21\u0c41] LT",nextDay:"[\u0c30\u0c47\u0c2a\u0c41] LT",nextWeek:"dddd, LT",lastDay:"[\u0c28\u0c3f\u0c28\u0c4d\u0c28] LT",lastWeek:"[\u0c17\u0c24] dddd, LT",sameElse:"L"},relativeTime:{future:"%s \u0c32\u0c4b",past:"%s \u0c15\u0c4d\u0c30\u0c3f\u0c24\u0c02",s:"\u0c15\u0c4a\u0c28\u0c4d\u0c28\u0c3f \u0c15\u0c4d\u0c37\u0c23\u0c3e\u0c32\u0c41",ss:"%d \u0c38\u0c46\u0c15\u0c28\u0c4d\u0c32\u0c41",m:"\u0c12\u0c15 \u0c28\u0c3f\u0c2e\u0c3f\u0c37\u0c02",mm:"%d \u0c28\u0c3f\u0c2e\u0c3f\u0c37\u0c3e\u0c32\u0c41",h:"\u0c12\u0c15 \u0c17\u0c02\u0c1f",hh:"%d \u0c17\u0c02\u0c1f\u0c32\u0c41",d:"\u0c12\u0c15 \u0c30\u0c4b\u0c1c\u0c41",dd:"%d \u0c30\u0c4b\u0c1c\u0c41\u0c32\u0c41",M:"\u0c12\u0c15 \u0c28\u0c46\u0c32",MM:"%d \u0c28\u0c46\u0c32\u0c32\u0c41",y:"\u0c12\u0c15 \u0c38\u0c02\u0c35\u0c24\u0c4d\u0c38\u0c30\u0c02",yy:"%d \u0c38\u0c02\u0c35\u0c24\u0c4d\u0c38\u0c30\u0c3e\u0c32\u0c41"},dayOfMonthOrdinalParse:/\d{1,2}\u0c35/,ordinal:"%d\u0c35",meridiemParse:/\u0c30\u0c3e\u0c24\u0c4d\u0c30\u0c3f|\u0c09\u0c26\u0c2f\u0c02|\u0c2e\u0c27\u0c4d\u0c2f\u0c3e\u0c39\u0c4d\u0c28\u0c02|\u0c38\u0c3e\u0c2f\u0c02\u0c24\u0c4d\u0c30\u0c02/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u0c30\u0c3e\u0c24\u0c4d\u0c30\u0c3f"===a?e<4?e:e+12:"\u0c09\u0c26\u0c2f\u0c02"===a?e:"\u0c2e\u0c27\u0c4d\u0c2f\u0c3e\u0c39\u0c4d\u0c28\u0c02"===a?10<=e?e:e+12:"\u0c38\u0c3e\u0c2f\u0c02\u0c24\u0c4d\u0c30\u0c02"===a?e+12:void 0},meridiem:function(e,a,t){return e<4?"\u0c30\u0c3e\u0c24\u0c4d\u0c30\u0c3f":e<10?"\u0c09\u0c26\u0c2f\u0c02":e<17?"\u0c2e\u0c27\u0c4d\u0c2f\u0c3e\u0c39\u0c4d\u0c28\u0c02":e<20?"\u0c38\u0c3e\u0c2f\u0c02\u0c24\u0c4d\u0c30\u0c02":"\u0c30\u0c3e\u0c24\u0c4d\u0c30\u0c3f"},week:{dow:0,doy:6}}),M.defineLocale("tet",{months:"Janeiru_Fevereiru_Marsu_Abril_Maiu_Ju\xf1u_Jullu_Agustu_Setembru_Outubru_Novembru_Dezembru".split("_"),monthsShort:"Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez".split("_"),weekdays:"Domingu_Segunda_Tersa_Kuarta_Kinta_Sesta_Sabadu".split("_"),weekdaysShort:"Dom_Seg_Ters_Kua_Kint_Sest_Sab".split("_"),weekdaysMin:"Do_Seg_Te_Ku_Ki_Ses_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Ohin iha] LT",nextDay:"[Aban iha] LT",nextWeek:"dddd [iha] LT",lastDay:"[Horiseik iha] LT",lastWeek:"dddd [semana kotuk] [iha] LT",sameElse:"L"},relativeTime:{future:"iha %s",past:"%s liuba",s:"segundu balun",ss:"segundu %d",m:"minutu ida",mm:"minutu %d",h:"oras ida",hh:"oras %d",d:"loron ida",dd:"loron %d",M:"fulan ida",MM:"fulan %d",y:"tinan ida",yy:"tinan %d"},dayOfMonthOrdinalParse:/\d{1,2}(st|nd|rd|th)/,ordinal:function(e){var a=e%10;return e+(1==~~(e%100/10)?"th":1==a?"st":2==a?"nd":3==a?"rd":"th")},week:{dow:1,doy:4}});var jr={0:"-\u0443\u043c",1:"-\u0443\u043c",2:"-\u044e\u043c",3:"-\u044e\u043c",4:"-\u0443\u043c",5:"-\u0443\u043c",6:"-\u0443\u043c",7:"-\u0443\u043c",8:"-\u0443\u043c",9:"-\u0443\u043c",10:"-\u0443\u043c",12:"-\u0443\u043c",13:"-\u0443\u043c",20:"-\u0443\u043c",30:"-\u044e\u043c",40:"-\u0443\u043c",50:"-\u0443\u043c",60:"-\u0443\u043c",70:"-\u0443\u043c",80:"-\u0443\u043c",90:"-\u0443\u043c",100:"-\u0443\u043c"};M.defineLocale("tg",{months:{format:"\u044f\u043d\u0432\u0430\u0440\u0438_\u0444\u0435\u0432\u0440\u0430\u043b\u0438_\u043c\u0430\u0440\u0442\u0438_\u0430\u043f\u0440\u0435\u043b\u0438_\u043c\u0430\u0439\u0438_\u0438\u044e\u043d\u0438_\u0438\u044e\u043b\u0438_\u0430\u0432\u0433\u0443\u0441\u0442\u0438_\u0441\u0435\u043d\u0442\u044f\u0431\u0440\u0438_\u043e\u043a\u0442\u044f\u0431\u0440\u0438_\u043d\u043e\u044f\u0431\u0440\u0438_\u0434\u0435\u043a\u0430\u0431\u0440\u0438".split("_"),standalone:"\u044f\u043d\u0432\u0430\u0440_\u0444\u0435\u0432\u0440\u0430\u043b_\u043c\u0430\u0440\u0442_\u0430\u043f\u0440\u0435\u043b_\u043c\u0430\u0439_\u0438\u044e\u043d_\u0438\u044e\u043b_\u0430\u0432\u0433\u0443\u0441\u0442_\u0441\u0435\u043d\u0442\u044f\u0431\u0440_\u043e\u043a\u0442\u044f\u0431\u0440_\u043d\u043e\u044f\u0431\u0440_\u0434\u0435\u043a\u0430\u0431\u0440".split("_")},monthsShort:"\u044f\u043d\u0432_\u0444\u0435\u0432_\u043c\u0430\u0440_\u0430\u043f\u0440_\u043c\u0430\u0439_\u0438\u044e\u043d_\u0438\u044e\u043b_\u0430\u0432\u0433_\u0441\u0435\u043d_\u043e\u043a\u0442_\u043d\u043e\u044f_\u0434\u0435\u043a".split("_"),weekdays:"\u044f\u043a\u0448\u0430\u043d\u0431\u0435_\u0434\u0443\u0448\u0430\u043d\u0431\u0435_\u0441\u0435\u0448\u0430\u043d\u0431\u0435_\u0447\u043e\u0440\u0448\u0430\u043d\u0431\u0435_\u043f\u0430\u043d\u04b7\u0448\u0430\u043d\u0431\u0435_\u04b7\u0443\u043c\u044a\u0430_\u0448\u0430\u043d\u0431\u0435".split("_"),weekdaysShort:"\u044f\u0448\u0431_\u0434\u0448\u0431_\u0441\u0448\u0431_\u0447\u0448\u0431_\u043f\u0448\u0431_\u04b7\u0443\u043c_\u0448\u043d\u0431".split("_"),weekdaysMin:"\u044f\u0448_\u0434\u0448_\u0441\u0448_\u0447\u0448_\u043f\u0448_\u04b7\u043c_\u0448\u0431".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[\u0418\u043c\u0440\u04ef\u0437 \u0441\u043e\u0430\u0442\u0438] LT",nextDay:"[\u0424\u0430\u0440\u0434\u043e \u0441\u043e\u0430\u0442\u0438] LT",lastDay:"[\u0414\u0438\u0440\u04ef\u0437 \u0441\u043e\u0430\u0442\u0438] LT",nextWeek:"dddd[\u0438] [\u04b3\u0430\u0444\u0442\u0430\u0438 \u043e\u044f\u043d\u0434\u0430 \u0441\u043e\u0430\u0442\u0438] LT",lastWeek:"dddd[\u0438] [\u04b3\u0430\u0444\u0442\u0430\u0438 \u0433\u0443\u0437\u0430\u0448\u0442\u0430 \u0441\u043e\u0430\u0442\u0438] LT",sameElse:"L"},relativeTime:{future:"\u0431\u0430\u044a\u0434\u0438 %s",past:"%s \u043f\u0435\u0448",s:"\u044f\u043a\u0447\u0430\u043d\u0434 \u0441\u043e\u043d\u0438\u044f",m:"\u044f\u043a \u0434\u0430\u049b\u0438\u049b\u0430",mm:"%d \u0434\u0430\u049b\u0438\u049b\u0430",h:"\u044f\u043a \u0441\u043e\u0430\u0442",hh:"%d \u0441\u043e\u0430\u0442",d:"\u044f\u043a \u0440\u04ef\u0437",dd:"%d \u0440\u04ef\u0437",M:"\u044f\u043a \u043c\u043e\u04b3",MM:"%d \u043c\u043e\u04b3",y:"\u044f\u043a \u0441\u043e\u043b",yy:"%d \u0441\u043e\u043b"},meridiemParse:/\u0448\u0430\u0431|\u0441\u0443\u0431\u04b3|\u0440\u04ef\u0437|\u0431\u0435\u0433\u043e\u04b3/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u0448\u0430\u0431"===a?e<4?e:e+12:"\u0441\u0443\u0431\u04b3"===a?e:"\u0440\u04ef\u0437"===a?11<=e?e:e+12:"\u0431\u0435\u0433\u043e\u04b3"===a?e+12:void 0},meridiem:function(e,a,t){return e<4?"\u0448\u0430\u0431":e<11?"\u0441\u0443\u0431\u04b3":e<16?"\u0440\u04ef\u0437":e<19?"\u0431\u0435\u0433\u043e\u04b3":"\u0448\u0430\u0431"},dayOfMonthOrdinalParse:/\d{1,2}-(\u0443\u043c|\u044e\u043c)/,ordinal:function(e){return e+(jr[e]||jr[e%10]||jr[100<=e?100:null])},week:{dow:1,doy:7}}),M.defineLocale("th",{months:"\u0e21\u0e01\u0e23\u0e32\u0e04\u0e21_\u0e01\u0e38\u0e21\u0e20\u0e32\u0e1e\u0e31\u0e19\u0e18\u0e4c_\u0e21\u0e35\u0e19\u0e32\u0e04\u0e21_\u0e40\u0e21\u0e29\u0e32\u0e22\u0e19_\u0e1e\u0e24\u0e29\u0e20\u0e32\u0e04\u0e21_\u0e21\u0e34\u0e16\u0e38\u0e19\u0e32\u0e22\u0e19_\u0e01\u0e23\u0e01\u0e0e\u0e32\u0e04\u0e21_\u0e2a\u0e34\u0e07\u0e2b\u0e32\u0e04\u0e21_\u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19_\u0e15\u0e38\u0e25\u0e32\u0e04\u0e21_\u0e1e\u0e24\u0e28\u0e08\u0e34\u0e01\u0e32\u0e22\u0e19_\u0e18\u0e31\u0e19\u0e27\u0e32\u0e04\u0e21".split("_"),monthsShort:"\u0e21.\u0e04._\u0e01.\u0e1e._\u0e21\u0e35.\u0e04._\u0e40\u0e21.\u0e22._\u0e1e.\u0e04._\u0e21\u0e34.\u0e22._\u0e01.\u0e04._\u0e2a.\u0e04._\u0e01.\u0e22._\u0e15.\u0e04._\u0e1e.\u0e22._\u0e18.\u0e04.".split("_"),monthsParseExact:!0,weekdays:"\u0e2d\u0e32\u0e17\u0e34\u0e15\u0e22\u0e4c_\u0e08\u0e31\u0e19\u0e17\u0e23\u0e4c_\u0e2d\u0e31\u0e07\u0e04\u0e32\u0e23_\u0e1e\u0e38\u0e18_\u0e1e\u0e24\u0e2b\u0e31\u0e2a\u0e1a\u0e14\u0e35_\u0e28\u0e38\u0e01\u0e23\u0e4c_\u0e40\u0e2a\u0e32\u0e23\u0e4c".split("_"),weekdaysShort:"\u0e2d\u0e32\u0e17\u0e34\u0e15\u0e22\u0e4c_\u0e08\u0e31\u0e19\u0e17\u0e23\u0e4c_\u0e2d\u0e31\u0e07\u0e04\u0e32\u0e23_\u0e1e\u0e38\u0e18_\u0e1e\u0e24\u0e2b\u0e31\u0e2a_\u0e28\u0e38\u0e01\u0e23\u0e4c_\u0e40\u0e2a\u0e32\u0e23\u0e4c".split("_"),weekdaysMin:"\u0e2d\u0e32._\u0e08._\u0e2d._\u0e1e._\u0e1e\u0e24._\u0e28._\u0e2a.".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY \u0e40\u0e27\u0e25\u0e32 H:mm",LLLL:"\u0e27\u0e31\u0e19dddd\u0e17\u0e35\u0e48 D MMMM YYYY \u0e40\u0e27\u0e25\u0e32 H:mm"},meridiemParse:/\u0e01\u0e48\u0e2d\u0e19\u0e40\u0e17\u0e35\u0e48\u0e22\u0e07|\u0e2b\u0e25\u0e31\u0e07\u0e40\u0e17\u0e35\u0e48\u0e22\u0e07/,isPM:function(e){return"\u0e2b\u0e25\u0e31\u0e07\u0e40\u0e17\u0e35\u0e48\u0e22\u0e07"===e},meridiem:function(e,a,t){return e<12?"\u0e01\u0e48\u0e2d\u0e19\u0e40\u0e17\u0e35\u0e48\u0e22\u0e07":"\u0e2b\u0e25\u0e31\u0e07\u0e40\u0e17\u0e35\u0e48\u0e22\u0e07"},calendar:{sameDay:"[\u0e27\u0e31\u0e19\u0e19\u0e35\u0e49 \u0e40\u0e27\u0e25\u0e32] LT",nextDay:"[\u0e1e\u0e23\u0e38\u0e48\u0e07\u0e19\u0e35\u0e49 \u0e40\u0e27\u0e25\u0e32] LT",nextWeek:"dddd[\u0e2b\u0e19\u0e49\u0e32 \u0e40\u0e27\u0e25\u0e32] LT",lastDay:"[\u0e40\u0e21\u0e37\u0e48\u0e2d\u0e27\u0e32\u0e19\u0e19\u0e35\u0e49 \u0e40\u0e27\u0e25\u0e32] LT",lastWeek:"[\u0e27\u0e31\u0e19]dddd[\u0e17\u0e35\u0e48\u0e41\u0e25\u0e49\u0e27 \u0e40\u0e27\u0e25\u0e32] LT",sameElse:"L"},relativeTime:{future:"\u0e2d\u0e35\u0e01 %s",past:"%s\u0e17\u0e35\u0e48\u0e41\u0e25\u0e49\u0e27",s:"\u0e44\u0e21\u0e48\u0e01\u0e35\u0e48\u0e27\u0e34\u0e19\u0e32\u0e17\u0e35",ss:"%d \u0e27\u0e34\u0e19\u0e32\u0e17\u0e35",m:"1 \u0e19\u0e32\u0e17\u0e35",mm:"%d \u0e19\u0e32\u0e17\u0e35",h:"1 \u0e0a\u0e31\u0e48\u0e27\u0e42\u0e21\u0e07",hh:"%d \u0e0a\u0e31\u0e48\u0e27\u0e42\u0e21\u0e07",d:"1 \u0e27\u0e31\u0e19",dd:"%d \u0e27\u0e31\u0e19",w:"1 \u0e2a\u0e31\u0e1b\u0e14\u0e32\u0e2b\u0e4c",ww:"%d \u0e2a\u0e31\u0e1b\u0e14\u0e32\u0e2b\u0e4c",M:"1 \u0e40\u0e14\u0e37\u0e2d\u0e19",MM:"%d \u0e40\u0e14\u0e37\u0e2d\u0e19",y:"1 \u0e1b\u0e35",yy:"%d \u0e1b\u0e35"}});var xr={1:"'inji",5:"'inji",8:"'inji",70:"'inji",80:"'inji",2:"'nji",7:"'nji",20:"'nji",50:"'nji",3:"'\xfcnji",4:"'\xfcnji",100:"'\xfcnji",6:"'njy",9:"'unjy",10:"'unjy",30:"'unjy",60:"'ynjy",90:"'ynjy"};M.defineLocale("tk",{months:"\xddanwar_Fewral_Mart_Aprel_Ma\xfd_I\xfdun_I\xfdul_Awgust_Sent\xfdabr_Okt\xfdabr_No\xfdabr_Dekabr".split("_"),monthsShort:"\xddan_Few_Mar_Apr_Ma\xfd_I\xfdn_I\xfdl_Awg_Sen_Okt_No\xfd_Dek".split("_"),weekdays:"\xddek\u015fenbe_Du\u015fenbe_Si\u015fenbe_\xc7ar\u015fenbe_Pen\u015fenbe_Anna_\u015eenbe".split("_"),weekdaysShort:"\xddek_Du\u015f_Si\u015f_\xc7ar_Pen_Ann_\u015een".split("_"),weekdaysMin:"\xddk_D\u015f_S\u015f_\xc7r_Pn_An_\u015en".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[bug\xfcn sagat] LT",nextDay:"[ertir sagat] LT",nextWeek:"[indiki] dddd [sagat] LT",lastDay:"[d\xfc\xfdn] LT",lastWeek:"[ge\xe7en] dddd [sagat] LT",sameElse:"L"},relativeTime:{future:"%s so\u0148",past:"%s \xf6\u0148",s:"birn\xe4\xe7e sekunt",m:"bir minut",mm:"%d minut",h:"bir sagat",hh:"%d sagat",d:"bir g\xfcn",dd:"%d g\xfcn",M:"bir a\xfd",MM:"%d a\xfd",y:"bir \xfdyl",yy:"%d \xfdyl"},ordinal:function(e,a){switch(a){case"d":case"D":case"Do":case"DD":return e;default:if(0===e)return e+"'unjy";var t=e%10;return e+(xr[t]||xr[e%100-t]||xr[100<=e?100:null])}},week:{dow:1,doy:7}}),M.defineLocale("tl-ph",{months:"Enero_Pebrero_Marso_Abril_Mayo_Hunyo_Hulyo_Agosto_Setyembre_Oktubre_Nobyembre_Disyembre".split("_"),monthsShort:"Ene_Peb_Mar_Abr_May_Hun_Hul_Ago_Set_Okt_Nob_Dis".split("_"),weekdays:"Linggo_Lunes_Martes_Miyerkules_Huwebes_Biyernes_Sabado".split("_"),weekdaysShort:"Lin_Lun_Mar_Miy_Huw_Biy_Sab".split("_"),weekdaysMin:"Li_Lu_Ma_Mi_Hu_Bi_Sab".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"MM/D/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY HH:mm",LLLL:"dddd, MMMM DD, YYYY HH:mm"},calendar:{sameDay:"LT [ngayong araw]",nextDay:"[Bukas ng] LT",nextWeek:"LT [sa susunod na] dddd",lastDay:"LT [kahapon]",lastWeek:"LT [noong nakaraang] dddd",sameElse:"L"},relativeTime:{future:"sa loob ng %s",past:"%s ang nakalipas",s:"ilang segundo",ss:"%d segundo",m:"isang minuto",mm:"%d minuto",h:"isang oras",hh:"%d oras",d:"isang araw",dd:"%d araw",M:"isang buwan",MM:"%d buwan",y:"isang taon",yy:"%d taon"},dayOfMonthOrdinalParse:/\d{1,2}/,ordinal:function(e){return e},week:{dow:1,doy:4}});var Pr="pagh_wa\u2019_cha\u2019_wej_loS_vagh_jav_Soch_chorgh_Hut".split("_");function Or(e,a,t,s){var n=function(e){var a=Math.floor(e%1e3/100),t=Math.floor(e%100/10),s=e%10,n="";0<a&&(n+=Pr[a]+"vatlh");0<t&&(n+=(""!==n?" ":"")+Pr[t]+"maH");0<s&&(n+=(""!==n?" ":"")+Pr[s]);return""===n?"pagh":n}(e);switch(t){case"ss":return n+" lup";case"mm":return n+" tup";case"hh":return n+" rep";case"dd":return n+" jaj";case"MM":return n+" jar";case"yy":return n+" DIS"}}M.defineLocale("tlh",{months:"tera\u2019 jar wa\u2019_tera\u2019 jar cha\u2019_tera\u2019 jar wej_tera\u2019 jar loS_tera\u2019 jar vagh_tera\u2019 jar jav_tera\u2019 jar Soch_tera\u2019 jar chorgh_tera\u2019 jar Hut_tera\u2019 jar wa\u2019maH_tera\u2019 jar wa\u2019maH wa\u2019_tera\u2019 jar wa\u2019maH cha\u2019".split("_"),monthsShort:"jar wa\u2019_jar cha\u2019_jar wej_jar loS_jar vagh_jar jav_jar Soch_jar chorgh_jar Hut_jar wa\u2019maH_jar wa\u2019maH wa\u2019_jar wa\u2019maH cha\u2019".split("_"),monthsParseExact:!0,weekdays:"lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj".split("_"),weekdaysShort:"lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj".split("_"),weekdaysMin:"lojmItjaj_DaSjaj_povjaj_ghItlhjaj_loghjaj_buqjaj_ghInjaj".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[DaHjaj] LT",nextDay:"[wa\u2019leS] LT",nextWeek:"LLL",lastDay:"[wa\u2019Hu\u2019] LT",lastWeek:"LLL",sameElse:"L"},relativeTime:{future:function(e){var a=e;return a=-1!==e.indexOf("jaj")?a.slice(0,-3)+"leS":-1!==e.indexOf("jar")?a.slice(0,-3)+"waQ":-1!==e.indexOf("DIS")?a.slice(0,-3)+"nem":a+" pIq"},past:function(e){var a=e;return a=-1!==e.indexOf("jaj")?a.slice(0,-3)+"Hu\u2019":-1!==e.indexOf("jar")?a.slice(0,-3)+"wen":-1!==e.indexOf("DIS")?a.slice(0,-3)+"ben":a+" ret"},s:"puS lup",ss:Or,m:"wa\u2019 tup",mm:Or,h:"wa\u2019 rep",hh:Or,d:"wa\u2019 jaj",dd:Or,M:"wa\u2019 jar",MM:Or,y:"wa\u2019 DIS",yy:Or},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});var Wr={1:"'inci",5:"'inci",8:"'inci",70:"'inci",80:"'inci",2:"'nci",7:"'nci",20:"'nci",50:"'nci",3:"'\xfcnc\xfc",4:"'\xfcnc\xfc",100:"'\xfcnc\xfc",6:"'nc\u0131",9:"'uncu",10:"'uncu",30:"'uncu",60:"'\u0131nc\u0131",90:"'\u0131nc\u0131"};function Ar(e,a,t,s){var n={s:["viensas secunds","'iensas secunds"],ss:[e+" secunds",e+" secunds"],m:["'n m\xedut","'iens m\xedut"],mm:[e+" m\xeduts",e+" m\xeduts"],h:["'n \xfeora","'iensa \xfeora"],hh:[e+" \xfeoras",e+" \xfeoras"],d:["'n ziua","'iensa ziua"],dd:[e+" ziuas",e+" ziuas"],M:["'n mes","'iens mes"],MM:[e+" mesen",e+" mesen"],y:["'n ar","'iens ar"],yy:[e+" ars",e+" ars"]};return s||a?n[t][0]:n[t][1]}function Er(e,a,t){var s,n;return"m"===t?a?"\u0445\u0432\u0438\u043b\u0438\u043d\u0430":"\u0445\u0432\u0438\u043b\u0438\u043d\u0443":"h"===t?a?"\u0433\u043e\u0434\u0438\u043d\u0430":"\u0433\u043e\u0434\u0438\u043d\u0443":e+" "+(s=+e,n={ss:a?"\u0441\u0435\u043a\u0443\u043d\u0434\u0430_\u0441\u0435\u043a\u0443\u043d\u0434\u0438_\u0441\u0435\u043a\u0443\u043d\u0434":"\u0441\u0435\u043a\u0443\u043d\u0434\u0443_\u0441\u0435\u043a\u0443\u043d\u0434\u0438_\u0441\u0435\u043a\u0443\u043d\u0434",mm:a?"\u0445\u0432\u0438\u043b\u0438\u043d\u0430_\u0445\u0432\u0438\u043b\u0438\u043d\u0438_\u0445\u0432\u0438\u043b\u0438\u043d":"\u0445\u0432\u0438\u043b\u0438\u043d\u0443_\u0445\u0432\u0438\u043b\u0438\u043d\u0438_\u0445\u0432\u0438\u043b\u0438\u043d",hh:a?"\u0433\u043e\u0434\u0438\u043d\u0430_\u0433\u043e\u0434\u0438\u043d\u0438_\u0433\u043e\u0434\u0438\u043d":"\u0433\u043e\u0434\u0438\u043d\u0443_\u0433\u043e\u0434\u0438\u043d\u0438_\u0433\u043e\u0434\u0438\u043d",dd:"\u0434\u0435\u043d\u044c_\u0434\u043d\u0456_\u0434\u043d\u0456\u0432",MM:"\u043c\u0456\u0441\u044f\u0446\u044c_\u043c\u0456\u0441\u044f\u0446\u0456_\u043c\u0456\u0441\u044f\u0446\u0456\u0432",yy:"\u0440\u0456\u043a_\u0440\u043e\u043a\u0438_\u0440\u043e\u043a\u0456\u0432"}[t].split("_"),s%10==1&&s%100!=11?n[0]:2<=s%10&&s%10<=4&&(s%100<10||20<=s%100)?n[1]:n[2])}function Fr(e){return function(){return e+"\u043e"+(11===this.hours()?"\u0431":"")+"] LT"}}M.defineLocale("tr",{months:"Ocak_\u015eubat_Mart_Nisan_May\u0131s_Haziran_Temmuz_A\u011fustos_Eyl\xfcl_Ekim_Kas\u0131m_Aral\u0131k".split("_"),monthsShort:"Oca_\u015eub_Mar_Nis_May_Haz_Tem_A\u011fu_Eyl_Eki_Kas_Ara".split("_"),weekdays:"Pazar_Pazartesi_Sal\u0131_\xc7ar\u015famba_Per\u015fembe_Cuma_Cumartesi".split("_"),weekdaysShort:"Paz_Pts_Sal_\xc7ar_Per_Cum_Cts".split("_"),weekdaysMin:"Pz_Pt_Sa_\xc7a_Pe_Cu_Ct".split("_"),meridiem:function(e,a,t){return e<12?t?"\xf6\xf6":"\xd6\xd6":t?"\xf6s":"\xd6S"},meridiemParse:/\xf6\xf6|\xd6\xd6|\xf6s|\xd6S/,isPM:function(e){return"\xf6s"===e||"\xd6S"===e},longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[bug\xfcn saat] LT",nextDay:"[yar\u0131n saat] LT",nextWeek:"[gelecek] dddd [saat] LT",lastDay:"[d\xfcn] LT",lastWeek:"[ge\xe7en] dddd [saat] LT",sameElse:"L"},relativeTime:{future:"%s sonra",past:"%s \xf6nce",s:"birka\xe7 saniye",ss:"%d saniye",m:"bir dakika",mm:"%d dakika",h:"bir saat",hh:"%d saat",d:"bir g\xfcn",dd:"%d g\xfcn",w:"bir hafta",ww:"%d hafta",M:"bir ay",MM:"%d ay",y:"bir y\u0131l",yy:"%d y\u0131l"},ordinal:function(e,a){switch(a){case"d":case"D":case"Do":case"DD":return e;default:if(0===e)return e+"'\u0131nc\u0131";var t=e%10;return e+(Wr[t]||Wr[e%100-t]||Wr[100<=e?100:null])}},week:{dow:1,doy:7}}),M.defineLocale("tzl",{months:"Januar_Fevraglh_Mar\xe7_Avr\xefu_Mai_G\xfcn_Julia_Guscht_Setemvar_Listop\xe4ts_Noemvar_Zecemvar".split("_"),monthsShort:"Jan_Fev_Mar_Avr_Mai_G\xfcn_Jul_Gus_Set_Lis_Noe_Zec".split("_"),weekdays:"S\xfaladi_L\xfane\xe7i_Maitzi_M\xe1rcuri_Xh\xfaadi_Vi\xe9ner\xe7i_S\xe1turi".split("_"),weekdaysShort:"S\xfal_L\xfan_Mai_M\xe1r_Xh\xfa_Vi\xe9_S\xe1t".split("_"),weekdaysMin:"S\xfa_L\xfa_Ma_M\xe1_Xh_Vi_S\xe1".split("_"),longDateFormat:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD.MM.YYYY",LL:"D. MMMM [dallas] YYYY",LLL:"D. MMMM [dallas] YYYY HH.mm",LLLL:"dddd, [li] D. MMMM [dallas] YYYY HH.mm"},meridiemParse:/d\'o|d\'a/i,isPM:function(e){return"d'o"===e.toLowerCase()},meridiem:function(e,a,t){return 11<e?t?"d'o":"D'O":t?"d'a":"D'A"},calendar:{sameDay:"[oxhi \xe0] LT",nextDay:"[dem\xe0 \xe0] LT",nextWeek:"dddd [\xe0] LT",lastDay:"[ieiri \xe0] LT",lastWeek:"[s\xfcr el] dddd [lasteu \xe0] LT",sameElse:"L"},relativeTime:{future:"osprei %s",past:"ja%s",s:Ar,ss:Ar,m:Ar,mm:Ar,h:Ar,hh:Ar,d:Ar,dd:Ar,M:Ar,MM:Ar,y:Ar,yy:Ar},dayOfMonthOrdinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}}),M.defineLocale("tzm-latn",{months:"innayr_br\u02e4ayr\u02e4_mar\u02e4s\u02e4_ibrir_mayyw_ywnyw_ywlywz_\u0263w\u0161t_\u0161wtanbir_kt\u02e4wbr\u02e4_nwwanbir_dwjnbir".split("_"),monthsShort:"innayr_br\u02e4ayr\u02e4_mar\u02e4s\u02e4_ibrir_mayyw_ywnyw_ywlywz_\u0263w\u0161t_\u0161wtanbir_kt\u02e4wbr\u02e4_nwwanbir_dwjnbir".split("_"),weekdays:"asamas_aynas_asinas_akras_akwas_asimwas_asi\u1e0dyas".split("_"),weekdaysShort:"asamas_aynas_asinas_akras_akwas_asimwas_asi\u1e0dyas".split("_"),weekdaysMin:"asamas_aynas_asinas_akras_akwas_asimwas_asi\u1e0dyas".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[asdkh g] LT",nextDay:"[aska g] LT",nextWeek:"dddd [g] LT",lastDay:"[assant g] LT",lastWeek:"dddd [g] LT",sameElse:"L"},relativeTime:{future:"dadkh s yan %s",past:"yan %s",s:"imik",ss:"%d imik",m:"minu\u1e0d",mm:"%d minu\u1e0d",h:"sa\u025ba",hh:"%d tassa\u025bin",d:"ass",dd:"%d ossan",M:"ayowr",MM:"%d iyyirn",y:"asgas",yy:"%d isgasn"},week:{dow:6,doy:12}}),M.defineLocale("tzm",{months:"\u2d49\u2d4f\u2d4f\u2d30\u2d62\u2d54_\u2d31\u2d55\u2d30\u2d62\u2d55_\u2d4e\u2d30\u2d55\u2d5a_\u2d49\u2d31\u2d54\u2d49\u2d54_\u2d4e\u2d30\u2d62\u2d62\u2d53_\u2d62\u2d53\u2d4f\u2d62\u2d53_\u2d62\u2d53\u2d4d\u2d62\u2d53\u2d63_\u2d56\u2d53\u2d5b\u2d5c_\u2d5b\u2d53\u2d5c\u2d30\u2d4f\u2d31\u2d49\u2d54_\u2d3d\u2d5f\u2d53\u2d31\u2d55_\u2d4f\u2d53\u2d61\u2d30\u2d4f\u2d31\u2d49\u2d54_\u2d37\u2d53\u2d4a\u2d4f\u2d31\u2d49\u2d54".split("_"),monthsShort:"\u2d49\u2d4f\u2d4f\u2d30\u2d62\u2d54_\u2d31\u2d55\u2d30\u2d62\u2d55_\u2d4e\u2d30\u2d55\u2d5a_\u2d49\u2d31\u2d54\u2d49\u2d54_\u2d4e\u2d30\u2d62\u2d62\u2d53_\u2d62\u2d53\u2d4f\u2d62\u2d53_\u2d62\u2d53\u2d4d\u2d62\u2d53\u2d63_\u2d56\u2d53\u2d5b\u2d5c_\u2d5b\u2d53\u2d5c\u2d30\u2d4f\u2d31\u2d49\u2d54_\u2d3d\u2d5f\u2d53\u2d31\u2d55_\u2d4f\u2d53\u2d61\u2d30\u2d4f\u2d31\u2d49\u2d54_\u2d37\u2d53\u2d4a\u2d4f\u2d31\u2d49\u2d54".split("_"),weekdays:"\u2d30\u2d59\u2d30\u2d4e\u2d30\u2d59_\u2d30\u2d62\u2d4f\u2d30\u2d59_\u2d30\u2d59\u2d49\u2d4f\u2d30\u2d59_\u2d30\u2d3d\u2d54\u2d30\u2d59_\u2d30\u2d3d\u2d61\u2d30\u2d59_\u2d30\u2d59\u2d49\u2d4e\u2d61\u2d30\u2d59_\u2d30\u2d59\u2d49\u2d39\u2d62\u2d30\u2d59".split("_"),weekdaysShort:"\u2d30\u2d59\u2d30\u2d4e\u2d30\u2d59_\u2d30\u2d62\u2d4f\u2d30\u2d59_\u2d30\u2d59\u2d49\u2d4f\u2d30\u2d59_\u2d30\u2d3d\u2d54\u2d30\u2d59_\u2d30\u2d3d\u2d61\u2d30\u2d59_\u2d30\u2d59\u2d49\u2d4e\u2d61\u2d30\u2d59_\u2d30\u2d59\u2d49\u2d39\u2d62\u2d30\u2d59".split("_"),weekdaysMin:"\u2d30\u2d59\u2d30\u2d4e\u2d30\u2d59_\u2d30\u2d62\u2d4f\u2d30\u2d59_\u2d30\u2d59\u2d49\u2d4f\u2d30\u2d59_\u2d30\u2d3d\u2d54\u2d30\u2d59_\u2d30\u2d3d\u2d61\u2d30\u2d59_\u2d30\u2d59\u2d49\u2d4e\u2d61\u2d30\u2d59_\u2d30\u2d59\u2d49\u2d39\u2d62\u2d30\u2d59".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[\u2d30\u2d59\u2d37\u2d45 \u2d34] LT",nextDay:"[\u2d30\u2d59\u2d3d\u2d30 \u2d34] LT",nextWeek:"dddd [\u2d34] LT",lastDay:"[\u2d30\u2d5a\u2d30\u2d4f\u2d5c \u2d34] LT",lastWeek:"dddd [\u2d34] LT",sameElse:"L"},relativeTime:{future:"\u2d37\u2d30\u2d37\u2d45 \u2d59 \u2d62\u2d30\u2d4f %s",past:"\u2d62\u2d30\u2d4f %s",s:"\u2d49\u2d4e\u2d49\u2d3d",ss:"%d \u2d49\u2d4e\u2d49\u2d3d",m:"\u2d4e\u2d49\u2d4f\u2d53\u2d3a",mm:"%d \u2d4e\u2d49\u2d4f\u2d53\u2d3a",h:"\u2d59\u2d30\u2d44\u2d30",hh:"%d \u2d5c\u2d30\u2d59\u2d59\u2d30\u2d44\u2d49\u2d4f",d:"\u2d30\u2d59\u2d59",dd:"%d o\u2d59\u2d59\u2d30\u2d4f",M:"\u2d30\u2d62o\u2d53\u2d54",MM:"%d \u2d49\u2d62\u2d62\u2d49\u2d54\u2d4f",y:"\u2d30\u2d59\u2d33\u2d30\u2d59",yy:"%d \u2d49\u2d59\u2d33\u2d30\u2d59\u2d4f"},week:{dow:6,doy:12}}),M.defineLocale("ug-cn",{months:"\u064a\u0627\u0646\u06cb\u0627\u0631_\u0641\u06d0\u06cb\u0631\u0627\u0644_\u0645\u0627\u0631\u062a_\u0626\u0627\u067e\u0631\u06d0\u0644_\u0645\u0627\u064a_\u0626\u0649\u064a\u06c7\u0646_\u0626\u0649\u064a\u06c7\u0644_\u0626\u0627\u06cb\u063a\u06c7\u0633\u062a_\u0633\u06d0\u0646\u062a\u06d5\u0628\u0649\u0631_\u0626\u06c6\u0643\u062a\u06d5\u0628\u0649\u0631_\u0646\u0648\u064a\u0627\u0628\u0649\u0631_\u062f\u06d0\u0643\u0627\u0628\u0649\u0631".split("_"),monthsShort:"\u064a\u0627\u0646\u06cb\u0627\u0631_\u0641\u06d0\u06cb\u0631\u0627\u0644_\u0645\u0627\u0631\u062a_\u0626\u0627\u067e\u0631\u06d0\u0644_\u0645\u0627\u064a_\u0626\u0649\u064a\u06c7\u0646_\u0626\u0649\u064a\u06c7\u0644_\u0626\u0627\u06cb\u063a\u06c7\u0633\u062a_\u0633\u06d0\u0646\u062a\u06d5\u0628\u0649\u0631_\u0626\u06c6\u0643\u062a\u06d5\u0628\u0649\u0631_\u0646\u0648\u064a\u0627\u0628\u0649\u0631_\u062f\u06d0\u0643\u0627\u0628\u0649\u0631".split("_"),weekdays:"\u064a\u06d5\u0643\u0634\u06d5\u0646\u0628\u06d5_\u062f\u06c8\u0634\u06d5\u0646\u0628\u06d5_\u0633\u06d5\u064a\u0634\u06d5\u0646\u0628\u06d5_\u0686\u0627\u0631\u0634\u06d5\u0646\u0628\u06d5_\u067e\u06d5\u064a\u0634\u06d5\u0646\u0628\u06d5_\u062c\u06c8\u0645\u06d5_\u0634\u06d5\u0646\u0628\u06d5".split("_"),weekdaysShort:"\u064a\u06d5_\u062f\u06c8_\u0633\u06d5_\u0686\u0627_\u067e\u06d5_\u062c\u06c8_\u0634\u06d5".split("_"),weekdaysMin:"\u064a\u06d5_\u062f\u06c8_\u0633\u06d5_\u0686\u0627_\u067e\u06d5_\u062c\u06c8_\u0634\u06d5".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY-MM-DD",LL:"YYYY-\u064a\u0649\u0644\u0649M-\u0626\u0627\u064a\u0646\u0649\u06adD-\u0643\u06c8\u0646\u0649",LLL:"YYYY-\u064a\u0649\u0644\u0649M-\u0626\u0627\u064a\u0646\u0649\u06adD-\u0643\u06c8\u0646\u0649\u060c HH:mm",LLLL:"dddd\u060c YYYY-\u064a\u0649\u0644\u0649M-\u0626\u0627\u064a\u0646\u0649\u06adD-\u0643\u06c8\u0646\u0649\u060c HH:mm"},meridiemParse:/\u064a\u06d0\u0631\u0649\u0645 \u0643\u06d0\u0686\u06d5|\u0633\u06d5\u06be\u06d5\u0631|\u0686\u06c8\u0634\u062a\u0649\u0646 \u0628\u06c7\u0631\u06c7\u0646|\u0686\u06c8\u0634|\u0686\u06c8\u0634\u062a\u0649\u0646 \u0643\u06d0\u064a\u0649\u0646|\u0643\u06d5\u0686/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u064a\u06d0\u0631\u0649\u0645 \u0643\u06d0\u0686\u06d5"===a||"\u0633\u06d5\u06be\u06d5\u0631"===a||"\u0686\u06c8\u0634\u062a\u0649\u0646 \u0628\u06c7\u0631\u06c7\u0646"===a||"\u0686\u06c8\u0634\u062a\u0649\u0646 \u0643\u06d0\u064a\u0649\u0646"!==a&&"\u0643\u06d5\u0686"!==a&&11<=e?e:e+12},meridiem:function(e,a,t){var s=100*e+a;return s<600?"\u064a\u06d0\u0631\u0649\u0645 \u0643\u06d0\u0686\u06d5":s<900?"\u0633\u06d5\u06be\u06d5\u0631":s<1130?"\u0686\u06c8\u0634\u062a\u0649\u0646 \u0628\u06c7\u0631\u06c7\u0646":s<1230?"\u0686\u06c8\u0634":s<1800?"\u0686\u06c8\u0634\u062a\u0649\u0646 \u0643\u06d0\u064a\u0649\u0646":"\u0643\u06d5\u0686"},calendar:{sameDay:"[\u0628\u06c8\u06af\u06c8\u0646 \u0633\u0627\u0626\u06d5\u062a] LT",nextDay:"[\u0626\u06d5\u062a\u06d5 \u0633\u0627\u0626\u06d5\u062a] LT",nextWeek:"[\u0643\u06d0\u0644\u06d5\u0631\u0643\u0649] dddd [\u0633\u0627\u0626\u06d5\u062a] LT",lastDay:"[\u062a\u06c6\u0646\u06c8\u06af\u06c8\u0646] LT",lastWeek:"[\u0626\u0627\u0644\u062f\u0649\u0646\u0642\u0649] dddd [\u0633\u0627\u0626\u06d5\u062a] LT",sameElse:"L"},relativeTime:{future:"%s \u0643\u06d0\u064a\u0649\u0646",past:"%s \u0628\u06c7\u0631\u06c7\u0646",s:"\u0646\u06d5\u0686\u0686\u06d5 \u0633\u06d0\u0643\u0648\u0646\u062a",ss:"%d \u0633\u06d0\u0643\u0648\u0646\u062a",m:"\u0628\u0649\u0631 \u0645\u0649\u0646\u06c7\u062a",mm:"%d \u0645\u0649\u0646\u06c7\u062a",h:"\u0628\u0649\u0631 \u0633\u0627\u0626\u06d5\u062a",hh:"%d \u0633\u0627\u0626\u06d5\u062a",d:"\u0628\u0649\u0631 \u0643\u06c8\u0646",dd:"%d \u0643\u06c8\u0646",M:"\u0628\u0649\u0631 \u0626\u0627\u064a",MM:"%d \u0626\u0627\u064a",y:"\u0628\u0649\u0631 \u064a\u0649\u0644",yy:"%d \u064a\u0649\u0644"},dayOfMonthOrdinalParse:/\d{1,2}(-\u0643\u06c8\u0646\u0649|-\u0626\u0627\u064a|-\u06be\u06d5\u067e\u062a\u06d5)/,ordinal:function(e,a){switch(a){case"d":case"D":case"DDD":return e+"-\u0643\u06c8\u0646\u0649";case"w":case"W":return e+"-\u06be\u06d5\u067e\u062a\u06d5";default:return e}},preparse:function(e){return e.replace(/\u060c/g,",")},postformat:function(e){return e.replace(/,/g,"\u060c")},week:{dow:1,doy:7}}),M.defineLocale("uk",{months:{format:"\u0441\u0456\u0447\u043d\u044f_\u043b\u044e\u0442\u043e\u0433\u043e_\u0431\u0435\u0440\u0435\u0437\u043d\u044f_\u043a\u0432\u0456\u0442\u043d\u044f_\u0442\u0440\u0430\u0432\u043d\u044f_\u0447\u0435\u0440\u0432\u043d\u044f_\u043b\u0438\u043f\u043d\u044f_\u0441\u0435\u0440\u043f\u043d\u044f_\u0432\u0435\u0440\u0435\u0441\u043d\u044f_\u0436\u043e\u0432\u0442\u043d\u044f_\u043b\u0438\u0441\u0442\u043e\u043f\u0430\u0434\u0430_\u0433\u0440\u0443\u0434\u043d\u044f".split("_"),standalone:"\u0441\u0456\u0447\u0435\u043d\u044c_\u043b\u044e\u0442\u0438\u0439_\u0431\u0435\u0440\u0435\u0437\u0435\u043d\u044c_\u043a\u0432\u0456\u0442\u0435\u043d\u044c_\u0442\u0440\u0430\u0432\u0435\u043d\u044c_\u0447\u0435\u0440\u0432\u0435\u043d\u044c_\u043b\u0438\u043f\u0435\u043d\u044c_\u0441\u0435\u0440\u043f\u0435\u043d\u044c_\u0432\u0435\u0440\u0435\u0441\u0435\u043d\u044c_\u0436\u043e\u0432\u0442\u0435\u043d\u044c_\u043b\u0438\u0441\u0442\u043e\u043f\u0430\u0434_\u0433\u0440\u0443\u0434\u0435\u043d\u044c".split("_")},monthsShort:"\u0441\u0456\u0447_\u043b\u044e\u0442_\u0431\u0435\u0440_\u043a\u0432\u0456\u0442_\u0442\u0440\u0430\u0432_\u0447\u0435\u0440\u0432_\u043b\u0438\u043f_\u0441\u0435\u0440\u043f_\u0432\u0435\u0440_\u0436\u043e\u0432\u0442_\u043b\u0438\u0441\u0442_\u0433\u0440\u0443\u0434".split("_"),weekdays:function(e,a){var t={nominative:"\u043d\u0435\u0434\u0456\u043b\u044f_\u043f\u043e\u043d\u0435\u0434\u0456\u043b\u043e\u043a_\u0432\u0456\u0432\u0442\u043e\u0440\u043e\u043a_\u0441\u0435\u0440\u0435\u0434\u0430_\u0447\u0435\u0442\u0432\u0435\u0440_\u043f\u2019\u044f\u0442\u043d\u0438\u0446\u044f_\u0441\u0443\u0431\u043e\u0442\u0430".split("_"),accusative:"\u043d\u0435\u0434\u0456\u043b\u044e_\u043f\u043e\u043d\u0435\u0434\u0456\u043b\u043e\u043a_\u0432\u0456\u0432\u0442\u043e\u0440\u043e\u043a_\u0441\u0435\u0440\u0435\u0434\u0443_\u0447\u0435\u0442\u0432\u0435\u0440_\u043f\u2019\u044f\u0442\u043d\u0438\u0446\u044e_\u0441\u0443\u0431\u043e\u0442\u0443".split("_"),genitive:"\u043d\u0435\u0434\u0456\u043b\u0456_\u043f\u043e\u043d\u0435\u0434\u0456\u043b\u043a\u0430_\u0432\u0456\u0432\u0442\u043e\u0440\u043a\u0430_\u0441\u0435\u0440\u0435\u0434\u0438_\u0447\u0435\u0442\u0432\u0435\u0440\u0433\u0430_\u043f\u2019\u044f\u0442\u043d\u0438\u0446\u0456_\u0441\u0443\u0431\u043e\u0442\u0438".split("_")};return!0===e?t.nominative.slice(1,7).concat(t.nominative.slice(0,1)):e?t[/(\[[\u0412\u0432\u0423\u0443]\]) ?dddd/.test(a)?"accusative":/\[?(?:\u043c\u0438\u043d\u0443\u043b\u043e\u0457|\u043d\u0430\u0441\u0442\u0443\u043f\u043d\u043e\u0457)? ?\] ?dddd/.test(a)?"genitive":"nominative"][e.day()]:t.nominative},weekdaysShort:"\u043d\u0434_\u043f\u043d_\u0432\u0442_\u0441\u0440_\u0447\u0442_\u043f\u0442_\u0441\u0431".split("_"),weekdaysMin:"\u043d\u0434_\u043f\u043d_\u0432\u0442_\u0441\u0440_\u0447\u0442_\u043f\u0442_\u0441\u0431".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY \u0440.",LLL:"D MMMM YYYY \u0440., HH:mm",LLLL:"dddd, D MMMM YYYY \u0440., HH:mm"},calendar:{sameDay:Fr("[\u0421\u044c\u043e\u0433\u043e\u0434\u043d\u0456 "),nextDay:Fr("[\u0417\u0430\u0432\u0442\u0440\u0430 "),lastDay:Fr("[\u0412\u0447\u043e\u0440\u0430 "),nextWeek:Fr("[\u0423] dddd ["),lastWeek:function(){switch(this.day()){case 0:case 3:case 5:case 6:return Fr("[\u041c\u0438\u043d\u0443\u043b\u043e\u0457] dddd [").call(this);case 1:case 2:case 4:return Fr("[\u041c\u0438\u043d\u0443\u043b\u043e\u0433\u043e] dddd [").call(this)}},sameElse:"L"},relativeTime:{future:"\u0437\u0430 %s",past:"%s \u0442\u043e\u043c\u0443",s:"\u0434\u0435\u043a\u0456\u043b\u044c\u043a\u0430 \u0441\u0435\u043a\u0443\u043d\u0434",ss:Er,m:Er,mm:Er,h:"\u0433\u043e\u0434\u0438\u043d\u0443",hh:Er,d:"\u0434\u0435\u043d\u044c",dd:Er,M:"\u043c\u0456\u0441\u044f\u0446\u044c",MM:Er,y:"\u0440\u0456\u043a",yy:Er},meridiemParse:/\u043d\u043e\u0447\u0456|\u0440\u0430\u043d\u043a\u0443|\u0434\u043d\u044f|\u0432\u0435\u0447\u043e\u0440\u0430/,isPM:function(e){return/^(\u0434\u043d\u044f|\u0432\u0435\u0447\u043e\u0440\u0430)$/.test(e)},meridiem:function(e,a,t){return e<4?"\u043d\u043e\u0447\u0456":e<12?"\u0440\u0430\u043d\u043a\u0443":e<17?"\u0434\u043d\u044f":"\u0432\u0435\u0447\u043e\u0440\u0430"},dayOfMonthOrdinalParse:/\d{1,2}-(\u0439|\u0433\u043e)/,ordinal:function(e,a){switch(a){case"M":case"d":case"DDD":case"w":case"W":return e+"-\u0439";case"D":return e+"-\u0433\u043e";default:return e}},week:{dow:1,doy:7}});var zr=["\u062c\u0646\u0648\u0631\u06cc","\u0641\u0631\u0648\u0631\u06cc","\u0645\u0627\u0631\u0686","\u0627\u067e\u0631\u06cc\u0644","\u0645\u0626\u06cc","\u062c\u0648\u0646","\u062c\u0648\u0644\u0627\u0626\u06cc","\u0627\u06af\u0633\u062a","\u0633\u062a\u0645\u0628\u0631","\u0627\u06a9\u062a\u0648\u0628\u0631","\u0646\u0648\u0645\u0628\u0631","\u062f\u0633\u0645\u0628\u0631"],Nr=["\u0627\u062a\u0648\u0627\u0631","\u067e\u06cc\u0631","\u0645\u0646\u06af\u0644","\u0628\u062f\u06be","\u062c\u0645\u0639\u0631\u0627\u062a","\u062c\u0645\u0639\u06c1","\u06c1\u0641\u062a\u06c1"];return M.defineLocale("ur",{months:zr,monthsShort:zr,weekdays:Nr,weekdaysShort:Nr,weekdaysMin:Nr,longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd\u060c D MMMM YYYY HH:mm"},meridiemParse:/\u0635\u0628\u062d|\u0634\u0627\u0645/,isPM:function(e){return"\u0634\u0627\u0645"===e},meridiem:function(e,a,t){return e<12?"\u0635\u0628\u062d":"\u0634\u0627\u0645"},calendar:{sameDay:"[\u0622\u062c \u0628\u0648\u0642\u062a] LT",nextDay:"[\u06a9\u0644 \u0628\u0648\u0642\u062a] LT",nextWeek:"dddd [\u0628\u0648\u0642\u062a] LT",lastDay:"[\u06af\u0630\u0634\u062a\u06c1 \u0631\u0648\u0632 \u0628\u0648\u0642\u062a] LT",lastWeek:"[\u06af\u0630\u0634\u062a\u06c1] dddd [\u0628\u0648\u0642\u062a] LT",sameElse:"L"},relativeTime:{future:"%s \u0628\u0639\u062f",past:"%s \u0642\u0628\u0644",s:"\u0686\u0646\u062f \u0633\u06cc\u06a9\u0646\u0688",ss:"%d \u0633\u06cc\u06a9\u0646\u0688",m:"\u0627\u06cc\u06a9 \u0645\u0646\u0679",mm:"%d \u0645\u0646\u0679",h:"\u0627\u06cc\u06a9 \u06af\u06be\u0646\u0679\u06c1",hh:"%d \u06af\u06be\u0646\u0679\u06d2",d:"\u0627\u06cc\u06a9 \u062f\u0646",dd:"%d \u062f\u0646",M:"\u0627\u06cc\u06a9 \u0645\u0627\u06c1",MM:"%d \u0645\u0627\u06c1",y:"\u0627\u06cc\u06a9 \u0633\u0627\u0644",yy:"%d \u0633\u0627\u0644"},preparse:function(e){return e.replace(/\u060c/g,",")},postformat:function(e){return e.replace(/,/g,"\u060c")},week:{dow:1,doy:4}}),M.defineLocale("uz-latn",{months:"Yanvar_Fevral_Mart_Aprel_May_Iyun_Iyul_Avgust_Sentabr_Oktabr_Noyabr_Dekabr".split("_"),monthsShort:"Yan_Fev_Mar_Apr_May_Iyun_Iyul_Avg_Sen_Okt_Noy_Dek".split("_"),weekdays:"Yakshanba_Dushanba_Seshanba_Chorshanba_Payshanba_Juma_Shanba".split("_"),weekdaysShort:"Yak_Dush_Sesh_Chor_Pay_Jum_Shan".split("_"),weekdaysMin:"Ya_Du_Se_Cho_Pa_Ju_Sha".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"D MMMM YYYY, dddd HH:mm"},calendar:{sameDay:"[Bugun soat] LT [da]",nextDay:"[Ertaga] LT [da]",nextWeek:"dddd [kuni soat] LT [da]",lastDay:"[Kecha soat] LT [da]",lastWeek:"[O'tgan] dddd [kuni soat] LT [da]",sameElse:"L"},relativeTime:{future:"Yaqin %s ichida",past:"Bir necha %s oldin",s:"soniya",ss:"%d soniya",m:"bir daqiqa",mm:"%d daqiqa",h:"bir soat",hh:"%d soat",d:"bir kun",dd:"%d kun",M:"bir oy",MM:"%d oy",y:"bir yil",yy:"%d yil"},week:{dow:1,doy:7}}),M.defineLocale("uz",{months:"\u044f\u043d\u0432\u0430\u0440_\u0444\u0435\u0432\u0440\u0430\u043b_\u043c\u0430\u0440\u0442_\u0430\u043f\u0440\u0435\u043b_\u043c\u0430\u0439_\u0438\u044e\u043d_\u0438\u044e\u043b_\u0430\u0432\u0433\u0443\u0441\u0442_\u0441\u0435\u043d\u0442\u044f\u0431\u0440_\u043e\u043a\u0442\u044f\u0431\u0440_\u043d\u043e\u044f\u0431\u0440_\u0434\u0435\u043a\u0430\u0431\u0440".split("_"),monthsShort:"\u044f\u043d\u0432_\u0444\u0435\u0432_\u043c\u0430\u0440_\u0430\u043f\u0440_\u043c\u0430\u0439_\u0438\u044e\u043d_\u0438\u044e\u043b_\u0430\u0432\u0433_\u0441\u0435\u043d_\u043e\u043a\u0442_\u043d\u043e\u044f_\u0434\u0435\u043a".split("_"),weekdays:"\u042f\u043a\u0448\u0430\u043d\u0431\u0430_\u0414\u0443\u0448\u0430\u043d\u0431\u0430_\u0421\u0435\u0448\u0430\u043d\u0431\u0430_\u0427\u043e\u0440\u0448\u0430\u043d\u0431\u0430_\u041f\u0430\u0439\u0448\u0430\u043d\u0431\u0430_\u0416\u0443\u043c\u0430_\u0428\u0430\u043d\u0431\u0430".split("_"),weekdaysShort:"\u042f\u043a\u0448_\u0414\u0443\u0448_\u0421\u0435\u0448_\u0427\u043e\u0440_\u041f\u0430\u0439_\u0416\u0443\u043c_\u0428\u0430\u043d".split("_"),weekdaysMin:"\u042f\u043a_\u0414\u0443_\u0421\u0435_\u0427\u043e_\u041f\u0430_\u0416\u0443_\u0428\u0430".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"D MMMM YYYY, dddd HH:mm"},calendar:{sameDay:"[\u0411\u0443\u0433\u0443\u043d \u0441\u043e\u0430\u0442] LT [\u0434\u0430]",nextDay:"[\u042d\u0440\u0442\u0430\u0433\u0430] LT [\u0434\u0430]",nextWeek:"dddd [\u043a\u0443\u043d\u0438 \u0441\u043e\u0430\u0442] LT [\u0434\u0430]",lastDay:"[\u041a\u0435\u0447\u0430 \u0441\u043e\u0430\u0442] LT [\u0434\u0430]",lastWeek:"[\u0423\u0442\u0433\u0430\u043d] dddd [\u043a\u0443\u043d\u0438 \u0441\u043e\u0430\u0442] LT [\u0434\u0430]",sameElse:"L"},relativeTime:{future:"\u042f\u043a\u0438\u043d %s \u0438\u0447\u0438\u0434\u0430",past:"\u0411\u0438\u0440 \u043d\u0435\u0447\u0430 %s \u043e\u043b\u0434\u0438\u043d",s:"\u0444\u0443\u0440\u0441\u0430\u0442",ss:"%d \u0444\u0443\u0440\u0441\u0430\u0442",m:"\u0431\u0438\u0440 \u0434\u0430\u043a\u0438\u043a\u0430",mm:"%d \u0434\u0430\u043a\u0438\u043a\u0430",h:"\u0431\u0438\u0440 \u0441\u043e\u0430\u0442",hh:"%d \u0441\u043e\u0430\u0442",d:"\u0431\u0438\u0440 \u043a\u0443\u043d",dd:"%d \u043a\u0443\u043d",M:"\u0431\u0438\u0440 \u043e\u0439",MM:"%d \u043e\u0439",y:"\u0431\u0438\u0440 \u0439\u0438\u043b",yy:"%d \u0439\u0438\u043b"},week:{dow:1,doy:7}}),M.defineLocale("vi",{months:"th\xe1ng 1_th\xe1ng 2_th\xe1ng 3_th\xe1ng 4_th\xe1ng 5_th\xe1ng 6_th\xe1ng 7_th\xe1ng 8_th\xe1ng 9_th\xe1ng 10_th\xe1ng 11_th\xe1ng 12".split("_"),monthsShort:"Thg 01_Thg 02_Thg 03_Thg 04_Thg 05_Thg 06_Thg 07_Thg 08_Thg 09_Thg 10_Thg 11_Thg 12".split("_"),monthsParseExact:!0,weekdays:"ch\u1ee7 nh\u1eadt_th\u1ee9 hai_th\u1ee9 ba_th\u1ee9 t\u01b0_th\u1ee9 n\u0103m_th\u1ee9 s\xe1u_th\u1ee9 b\u1ea3y".split("_"),weekdaysShort:"CN_T2_T3_T4_T5_T6_T7".split("_"),weekdaysMin:"CN_T2_T3_T4_T5_T6_T7".split("_"),weekdaysParseExact:!0,meridiemParse:/sa|ch/i,isPM:function(e){return/^ch$/i.test(e)},meridiem:function(e,a,t){return e<12?t?"sa":"SA":t?"ch":"CH"},longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM [n\u0103m] YYYY",LLL:"D MMMM [n\u0103m] YYYY HH:mm",LLLL:"dddd, D MMMM [n\u0103m] YYYY HH:mm",l:"DD/M/YYYY",ll:"D MMM YYYY",lll:"D MMM YYYY HH:mm",llll:"ddd, D MMM YYYY HH:mm"},calendar:{sameDay:"[H\xf4m nay l\xfac] LT",nextDay:"[Ng\xe0y mai l\xfac] LT",nextWeek:"dddd [tu\u1ea7n t\u1edbi l\xfac] LT",lastDay:"[H\xf4m qua l\xfac] LT",lastWeek:"dddd [tu\u1ea7n tr\u01b0\u1edbc l\xfac] LT",sameElse:"L"},relativeTime:{future:"%s t\u1edbi",past:"%s tr\u01b0\u1edbc",s:"v\xe0i gi\xe2y",ss:"%d gi\xe2y",m:"m\u1ed9t ph\xfat",mm:"%d ph\xfat",h:"m\u1ed9t gi\u1edd",hh:"%d gi\u1edd",d:"m\u1ed9t ng\xe0y",dd:"%d ng\xe0y",w:"m\u1ed9t tu\u1ea7n",ww:"%d tu\u1ea7n",M:"m\u1ed9t th\xe1ng",MM:"%d th\xe1ng",y:"m\u1ed9t n\u0103m",yy:"%d n\u0103m"},dayOfMonthOrdinalParse:/\d{1,2}/,ordinal:function(e){return e},week:{dow:1,doy:4}}),M.defineLocale("x-pseudo",{months:"J~\xe1\xf1\xfa\xe1~r\xfd_F~\xe9br\xfa~\xe1r\xfd_~M\xe1rc~h_\xc1p~r\xedl_~M\xe1\xfd_~J\xfa\xf1\xe9~_J\xfal~\xfd_\xc1\xfa~g\xfast~_S\xe9p~t\xe9mb~\xe9r_\xd3~ct\xf3b~\xe9r_\xd1~\xf3v\xe9m~b\xe9r_~D\xe9c\xe9~mb\xe9r".split("_"),monthsShort:"J~\xe1\xf1_~F\xe9b_~M\xe1r_~\xc1pr_~M\xe1\xfd_~J\xfa\xf1_~J\xfal_~\xc1\xfag_~S\xe9p_~\xd3ct_~\xd1\xf3v_~D\xe9c".split("_"),monthsParseExact:!0,weekdays:"S~\xfa\xf1d\xe1~\xfd_M\xf3~\xf1d\xe1\xfd~_T\xfa\xe9~sd\xe1\xfd~_W\xe9d~\xf1\xe9sd~\xe1\xfd_T~h\xfars~d\xe1\xfd_~Fr\xedd~\xe1\xfd_S~\xe1t\xfar~d\xe1\xfd".split("_"),weekdaysShort:"S~\xfa\xf1_~M\xf3\xf1_~T\xfa\xe9_~W\xe9d_~Th\xfa_~Fr\xed_~S\xe1t".split("_"),weekdaysMin:"S~\xfa_M\xf3~_T\xfa_~W\xe9_T~h_Fr~_S\xe1".split("_"),weekdaysParseExact:!0,longDateFormat:{LT:"HH:mm",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[T~\xf3d\xe1~\xfd \xe1t] LT",nextDay:"[T~\xf3m\xf3~rr\xf3~w \xe1t] LT",nextWeek:"dddd [\xe1t] LT",lastDay:"[\xdd~\xe9st~\xe9rd\xe1~\xfd \xe1t] LT",lastWeek:"[L~\xe1st] dddd [\xe1t] LT",sameElse:"L"},relativeTime:{future:"\xed~\xf1 %s",past:"%s \xe1~g\xf3",s:"\xe1 ~f\xe9w ~s\xe9c\xf3~\xf1ds",ss:"%d s~\xe9c\xf3\xf1~ds",m:"\xe1 ~m\xed\xf1~\xfat\xe9",mm:"%d m~\xed\xf1\xfa~t\xe9s",h:"\xe1~\xf1 h\xf3~\xfar",hh:"%d h~\xf3\xfars",d:"\xe1 ~d\xe1\xfd",dd:"%d d~\xe1\xfds",M:"\xe1 ~m\xf3\xf1~th",MM:"%d m~\xf3\xf1t~hs",y:"\xe1 ~\xfd\xe9\xe1r",yy:"%d \xfd~\xe9\xe1rs"},dayOfMonthOrdinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(e){var a=e%10;return e+(1==~~(e%100/10)?"th":1==a?"st":2==a?"nd":3==a?"rd":"th")},week:{dow:1,doy:4}}),M.defineLocale("yo",{months:"S\u1eb9\u0301r\u1eb9\u0301_E\u0300re\u0300le\u0300_\u1eb8r\u1eb9\u0300na\u0300_I\u0300gbe\u0301_E\u0300bibi_O\u0300ku\u0300du_Ag\u1eb9mo_O\u0300gu\u0301n_Owewe_\u1ecc\u0300wa\u0300ra\u0300_Be\u0301lu\u0301_\u1ecc\u0300p\u1eb9\u0300\u0300".split("_"),monthsShort:"S\u1eb9\u0301r_E\u0300rl_\u1eb8rn_I\u0300gb_E\u0300bi_O\u0300ku\u0300_Ag\u1eb9_O\u0300gu\u0301_Owe_\u1ecc\u0300wa\u0300_Be\u0301l_\u1ecc\u0300p\u1eb9\u0300\u0300".split("_"),weekdays:"A\u0300i\u0300ku\u0301_Aje\u0301_I\u0300s\u1eb9\u0301gun_\u1eccj\u1ecd\u0301ru\u0301_\u1eccj\u1ecd\u0301b\u1ecd_\u1eb8ti\u0300_A\u0300ba\u0301m\u1eb9\u0301ta".split("_"),weekdaysShort:"A\u0300i\u0300k_Aje\u0301_I\u0300s\u1eb9\u0301_\u1eccjr_\u1eccjb_\u1eb8ti\u0300_A\u0300ba\u0301".split("_"),weekdaysMin:"A\u0300i\u0300_Aj_I\u0300s_\u1eccr_\u1eccb_\u1eb8t_A\u0300b".split("_"),longDateFormat:{LT:"h:mm A",LTS:"h:mm:ss A",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY h:mm A",LLLL:"dddd, D MMMM YYYY h:mm A"},calendar:{sameDay:"[O\u0300ni\u0300 ni] LT",nextDay:"[\u1ecc\u0300la ni] LT",nextWeek:"dddd [\u1eccs\u1eb9\u0300 to\u0301n'b\u1ecd] [ni] LT",lastDay:"[A\u0300na ni] LT",lastWeek:"dddd [\u1eccs\u1eb9\u0300 to\u0301l\u1ecd\u0301] [ni] LT",sameElse:"L"},relativeTime:{future:"ni\u0301 %s",past:"%s k\u1ecdja\u0301",s:"i\u0300s\u1eb9ju\u0301 aaya\u0301 die",ss:"aaya\u0301 %d",m:"i\u0300s\u1eb9ju\u0301 kan",mm:"i\u0300s\u1eb9ju\u0301 %d",h:"wa\u0301kati kan",hh:"wa\u0301kati %d",d:"\u1ecdj\u1ecd\u0301 kan",dd:"\u1ecdj\u1ecd\u0301 %d",M:"osu\u0300 kan",MM:"osu\u0300 %d",y:"\u1ecddu\u0301n kan",yy:"\u1ecddu\u0301n %d"},dayOfMonthOrdinalParse:/\u1ecdj\u1ecd\u0301\s\d{1,2}/,ordinal:"\u1ecdj\u1ecd\u0301 %d",week:{dow:1,doy:4}}),M.defineLocale("zh-cn",{months:"\u4e00\u6708_\u4e8c\u6708_\u4e09\u6708_\u56db\u6708_\u4e94\u6708_\u516d\u6708_\u4e03\u6708_\u516b\u6708_\u4e5d\u6708_\u5341\u6708_\u5341\u4e00\u6708_\u5341\u4e8c\u6708".split("_"),monthsShort:"1\u6708_2\u6708_3\u6708_4\u6708_5\u6708_6\u6708_7\u6708_8\u6708_9\u6708_10\u6708_11\u6708_12\u6708".split("_"),weekdays:"\u661f\u671f\u65e5_\u661f\u671f\u4e00_\u661f\u671f\u4e8c_\u661f\u671f\u4e09_\u661f\u671f\u56db_\u661f\u671f\u4e94_\u661f\u671f\u516d".split("_"),weekdaysShort:"\u5468\u65e5_\u5468\u4e00_\u5468\u4e8c_\u5468\u4e09_\u5468\u56db_\u5468\u4e94_\u5468\u516d".split("_"),weekdaysMin:"\u65e5_\u4e00_\u4e8c_\u4e09_\u56db_\u4e94_\u516d".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY/MM/DD",LL:"YYYY\u5e74M\u6708D\u65e5",LLL:"YYYY\u5e74M\u6708D\u65e5Ah\u70b9mm\u5206",LLLL:"YYYY\u5e74M\u6708D\u65e5ddddAh\u70b9mm\u5206",l:"YYYY/M/D",ll:"YYYY\u5e74M\u6708D\u65e5",lll:"YYYY\u5e74M\u6708D\u65e5 HH:mm",llll:"YYYY\u5e74M\u6708D\u65e5dddd HH:mm"},meridiemParse:/\u51cc\u6668|\u65e9\u4e0a|\u4e0a\u5348|\u4e2d\u5348|\u4e0b\u5348|\u665a\u4e0a/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u51cc\u6668"===a||"\u65e9\u4e0a"===a||"\u4e0a\u5348"===a||"\u4e0b\u5348"!==a&&"\u665a\u4e0a"!==a&&11<=e?e:e+12},meridiem:function(e,a,t){var s=100*e+a;return s<600?"\u51cc\u6668":s<900?"\u65e9\u4e0a":s<1130?"\u4e0a\u5348":s<1230?"\u4e2d\u5348":s<1800?"\u4e0b\u5348":"\u665a\u4e0a"},calendar:{sameDay:"[\u4eca\u5929]LT",nextDay:"[\u660e\u5929]LT",nextWeek:function(e){return e.week()!==this.week()?"[\u4e0b]dddLT":"[\u672c]dddLT"},lastDay:"[\u6628\u5929]LT",lastWeek:function(e){return this.week()!==e.week()?"[\u4e0a]dddLT":"[\u672c]dddLT"},sameElse:"L"},dayOfMonthOrdinalParse:/\d{1,2}(\u65e5|\u6708|\u5468)/,ordinal:function(e,a){switch(a){case"d":case"D":case"DDD":return e+"\u65e5";case"M":return e+"\u6708";case"w":case"W":return e+"\u5468";default:return e}},relativeTime:{future:"%s\u540e",past:"%s\u524d",s:"\u51e0\u79d2",ss:"%d \u79d2",m:"1 \u5206\u949f",mm:"%d \u5206\u949f",h:"1 \u5c0f\u65f6",hh:"%d \u5c0f\u65f6",d:"1 \u5929",dd:"%d \u5929",w:"1 \u5468",ww:"%d \u5468",M:"1 \u4e2a\u6708",MM:"%d \u4e2a\u6708",y:"1 \u5e74",yy:"%d \u5e74"},week:{dow:1,doy:4}}),M.defineLocale("zh-hk",{months:"\u4e00\u6708_\u4e8c\u6708_\u4e09\u6708_\u56db\u6708_\u4e94\u6708_\u516d\u6708_\u4e03\u6708_\u516b\u6708_\u4e5d\u6708_\u5341\u6708_\u5341\u4e00\u6708_\u5341\u4e8c\u6708".split("_"),monthsShort:"1\u6708_2\u6708_3\u6708_4\u6708_5\u6708_6\u6708_7\u6708_8\u6708_9\u6708_10\u6708_11\u6708_12\u6708".split("_"),weekdays:"\u661f\u671f\u65e5_\u661f\u671f\u4e00_\u661f\u671f\u4e8c_\u661f\u671f\u4e09_\u661f\u671f\u56db_\u661f\u671f\u4e94_\u661f\u671f\u516d".split("_"),weekdaysShort:"\u9031\u65e5_\u9031\u4e00_\u9031\u4e8c_\u9031\u4e09_\u9031\u56db_\u9031\u4e94_\u9031\u516d".split("_"),weekdaysMin:"\u65e5_\u4e00_\u4e8c_\u4e09_\u56db_\u4e94_\u516d".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY/MM/DD",LL:"YYYY\u5e74M\u6708D\u65e5",LLL:"YYYY\u5e74M\u6708D\u65e5 HH:mm",LLLL:"YYYY\u5e74M\u6708D\u65e5dddd HH:mm",l:"YYYY/M/D",ll:"YYYY\u5e74M\u6708D\u65e5",lll:"YYYY\u5e74M\u6708D\u65e5 HH:mm",llll:"YYYY\u5e74M\u6708D\u65e5dddd HH:mm"},meridiemParse:/\u51cc\u6668|\u65e9\u4e0a|\u4e0a\u5348|\u4e2d\u5348|\u4e0b\u5348|\u665a\u4e0a/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u51cc\u6668"===a||"\u65e9\u4e0a"===a||"\u4e0a\u5348"===a?e:"\u4e2d\u5348"===a?11<=e?e:e+12:"\u4e0b\u5348"===a||"\u665a\u4e0a"===a?e+12:void 0},meridiem:function(e,a,t){var s=100*e+a;return s<600?"\u51cc\u6668":s<900?"\u65e9\u4e0a":s<1200?"\u4e0a\u5348":1200===s?"\u4e2d\u5348":s<1800?"\u4e0b\u5348":"\u665a\u4e0a"},calendar:{sameDay:"[\u4eca\u5929]LT",nextDay:"[\u660e\u5929]LT",nextWeek:"[\u4e0b]ddddLT",lastDay:"[\u6628\u5929]LT",lastWeek:"[\u4e0a]ddddLT",sameElse:"L"},dayOfMonthOrdinalParse:/\d{1,2}(\u65e5|\u6708|\u9031)/,ordinal:function(e,a){switch(a){case"d":case"D":case"DDD":return e+"\u65e5";case"M":return e+"\u6708";case"w":case"W":return e+"\u9031";default:return e}},relativeTime:{future:"%s\u5f8c",past:"%s\u524d",s:"\u5e7e\u79d2",ss:"%d \u79d2",m:"1 \u5206\u9418",mm:"%d \u5206\u9418",h:"1 \u5c0f\u6642",hh:"%d \u5c0f\u6642",d:"1 \u5929",dd:"%d \u5929",M:"1 \u500b\u6708",MM:"%d \u500b\u6708",y:"1 \u5e74",yy:"%d \u5e74"}}),M.defineLocale("zh-mo",{months:"\u4e00\u6708_\u4e8c\u6708_\u4e09\u6708_\u56db\u6708_\u4e94\u6708_\u516d\u6708_\u4e03\u6708_\u516b\u6708_\u4e5d\u6708_\u5341\u6708_\u5341\u4e00\u6708_\u5341\u4e8c\u6708".split("_"),monthsShort:"1\u6708_2\u6708_3\u6708_4\u6708_5\u6708_6\u6708_7\u6708_8\u6708_9\u6708_10\u6708_11\u6708_12\u6708".split("_"),weekdays:"\u661f\u671f\u65e5_\u661f\u671f\u4e00_\u661f\u671f\u4e8c_\u661f\u671f\u4e09_\u661f\u671f\u56db_\u661f\u671f\u4e94_\u661f\u671f\u516d".split("_"),weekdaysShort:"\u9031\u65e5_\u9031\u4e00_\u9031\u4e8c_\u9031\u4e09_\u9031\u56db_\u9031\u4e94_\u9031\u516d".split("_"),weekdaysMin:"\u65e5_\u4e00_\u4e8c_\u4e09_\u56db_\u4e94_\u516d".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"YYYY\u5e74M\u6708D\u65e5",LLL:"YYYY\u5e74M\u6708D\u65e5 HH:mm",LLLL:"YYYY\u5e74M\u6708D\u65e5dddd HH:mm",l:"D/M/YYYY",ll:"YYYY\u5e74M\u6708D\u65e5",lll:"YYYY\u5e74M\u6708D\u65e5 HH:mm",llll:"YYYY\u5e74M\u6708D\u65e5dddd HH:mm"},meridiemParse:/\u51cc\u6668|\u65e9\u4e0a|\u4e0a\u5348|\u4e2d\u5348|\u4e0b\u5348|\u665a\u4e0a/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u51cc\u6668"===a||"\u65e9\u4e0a"===a||"\u4e0a\u5348"===a?e:"\u4e2d\u5348"===a?11<=e?e:e+12:"\u4e0b\u5348"===a||"\u665a\u4e0a"===a?e+12:void 0},meridiem:function(e,a,t){var s=100*e+a;return s<600?"\u51cc\u6668":s<900?"\u65e9\u4e0a":s<1130?"\u4e0a\u5348":s<1230?"\u4e2d\u5348":s<1800?"\u4e0b\u5348":"\u665a\u4e0a"},calendar:{sameDay:"[\u4eca\u5929] LT",nextDay:"[\u660e\u5929] LT",nextWeek:"[\u4e0b]dddd LT",lastDay:"[\u6628\u5929] LT",lastWeek:"[\u4e0a]dddd LT",sameElse:"L"},dayOfMonthOrdinalParse:/\d{1,2}(\u65e5|\u6708|\u9031)/,ordinal:function(e,a){switch(a){case"d":case"D":case"DDD":return e+"\u65e5";case"M":return e+"\u6708";case"w":case"W":return e+"\u9031";default:return e}},relativeTime:{future:"%s\u5167",past:"%s\u524d",s:"\u5e7e\u79d2",ss:"%d \u79d2",m:"1 \u5206\u9418",mm:"%d \u5206\u9418",h:"1 \u5c0f\u6642",hh:"%d \u5c0f\u6642",d:"1 \u5929",dd:"%d \u5929",M:"1 \u500b\u6708",MM:"%d \u500b\u6708",y:"1 \u5e74",yy:"%d \u5e74"}}),M.defineLocale("zh-tw",{months:"\u4e00\u6708_\u4e8c\u6708_\u4e09\u6708_\u56db\u6708_\u4e94\u6708_\u516d\u6708_\u4e03\u6708_\u516b\u6708_\u4e5d\u6708_\u5341\u6708_\u5341\u4e00\u6708_\u5341\u4e8c\u6708".split("_"),monthsShort:"1\u6708_2\u6708_3\u6708_4\u6708_5\u6708_6\u6708_7\u6708_8\u6708_9\u6708_10\u6708_11\u6708_12\u6708".split("_"),weekdays:"\u661f\u671f\u65e5_\u661f\u671f\u4e00_\u661f\u671f\u4e8c_\u661f\u671f\u4e09_\u661f\u671f\u56db_\u661f\u671f\u4e94_\u661f\u671f\u516d".split("_"),weekdaysShort:"\u9031\u65e5_\u9031\u4e00_\u9031\u4e8c_\u9031\u4e09_\u9031\u56db_\u9031\u4e94_\u9031\u516d".split("_"),weekdaysMin:"\u65e5_\u4e00_\u4e8c_\u4e09_\u56db_\u4e94_\u516d".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY/MM/DD",LL:"YYYY\u5e74M\u6708D\u65e5",LLL:"YYYY\u5e74M\u6708D\u65e5 HH:mm",LLLL:"YYYY\u5e74M\u6708D\u65e5dddd HH:mm",l:"YYYY/M/D",ll:"YYYY\u5e74M\u6708D\u65e5",lll:"YYYY\u5e74M\u6708D\u65e5 HH:mm",llll:"YYYY\u5e74M\u6708D\u65e5dddd HH:mm"},meridiemParse:/\u51cc\u6668|\u65e9\u4e0a|\u4e0a\u5348|\u4e2d\u5348|\u4e0b\u5348|\u665a\u4e0a/,meridiemHour:function(e,a){return 12===e&&(e=0),"\u51cc\u6668"===a||"\u65e9\u4e0a"===a||"\u4e0a\u5348"===a?e:"\u4e2d\u5348"===a?11<=e?e:e+12:"\u4e0b\u5348"===a||"\u665a\u4e0a"===a?e+12:void 0},meridiem:function(e,a,t){var s=100*e+a;return s<600?"\u51cc\u6668":s<900?"\u65e9\u4e0a":s<1130?"\u4e0a\u5348":s<1230?"\u4e2d\u5348":s<1800?"\u4e0b\u5348":"\u665a\u4e0a"},calendar:{sameDay:"[\u4eca\u5929] LT",nextDay:"[\u660e\u5929] LT",nextWeek:"[\u4e0b]dddd LT",lastDay:"[\u6628\u5929] LT",lastWeek:"[\u4e0a]dddd LT",sameElse:"L"},dayOfMonthOrdinalParse:/\d{1,2}(\u65e5|\u6708|\u9031)/,ordinal:function(e,a){switch(a){case"d":case"D":case"DDD":return e+"\u65e5";case"M":return e+"\u6708";case"w":case"W":return e+"\u9031";default:return e}},relativeTime:{future:"%s\u5f8c",past:"%s\u524d",s:"\u5e7e\u79d2",ss:"%d \u79d2",m:"1 \u5206\u9418",mm:"%d \u5206\u9418",h:"1 \u5c0f\u6642",hh:"%d \u5c0f\u6642",d:"1 \u5929",dd:"%d \u5929",M:"1 \u500b\u6708",MM:"%d \u500b\u6708",y:"1 \u5e74",yy:"%d \u5e74"}}),M.locale("en"),M});
-//# sourceMappingURL=moment-with-locales.min.js.map
\ No newline at end of file
diff --git a/data/interfaces/default/js/platform.min.js b/data/interfaces/default/js/platform.min.js
deleted file mode 100644
index cbb60d0e..00000000
--- a/data/interfaces/default/js/platform.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * Platform.js <https://mths.be/platform>
- * Copyright 2014-2018 Benjamin Tan <https://bnjmnt4n.now.sh/>
- * Copyright 2011-2013 John-David Dalton
- * Available under MIT license <https://mths.be/mit>
- */
-(function(){"use strict";var e={function:!0,object:!0},t=e[typeof window]&&window||this,i=e[typeof exports]&&exports,n=e[typeof module]&&module&&!module.nodeType&&module,r=i&&n&&"object"==typeof global&&global;!r||r.global!==r&&r.window!==r&&r.self!==r||(t=r);var o=Math.pow(2,53)-1,a=/\bOpera/,l=Object.prototype,s=l.hasOwnProperty,b=l.toString;function p(e){return(e=String(e)).charAt(0).toUpperCase()+e.slice(1)}function c(e){return e=x(e),/^(?:webOS|i(?:OS|P))/.test(e)?e:p(e)}function u(e,t){for(var i in e)s.call(e,i)&&t(e[i],i,e)}function d(e){return null==e?p(e):b.call(e).slice(8,-1)}function f(e){return String(e).replace(/([ -])(?!$)/g,"$1?")}function S(e,t){var i=null;return function(e,t){var i=-1,n=e?e.length:0;if("number"==typeof n&&n>-1&&n<=o)for(;++i<n;)t(e[i],i,e);else u(e,t)}(e,function(n,r){i=t(i,n,r,e)}),i}function x(e){return String(e).replace(/^ +| +$/g,"")}var h=function e(i){var n=t,r=i&&"object"==typeof i&&"String"!=d(i);r&&(n=i,i=null);var o=n.navigator||{},l=o.userAgent||"";i||(i=l);var s,p,h,m,g,O=r?!!o.likeChrome:/\bChrome\b/.test(i)&&!/internal|\n/i.test(b.toString()),y="Object",M=r?y:"ScriptBridgingProxyObject",v=r?y:"Environment",P=r&&n.java?"JavaPackage":d(n.java),w=r?y:"RuntimeObject",E=/\bJava/.test(P)&&n.java,k=E&&d(n.environment)==v,C=E?"a":"α",W=E?"b":"β",B=n.document||{},I=n.operamini||n.opera,A=a.test(A=r&&I?I["[[Class]]"]:d(I))?A:I=null,R=i,T=[],F=null,G=i==l,$=G&&I&&"function"==typeof I.version&&I.version(),X=S([{label:"EdgeHTML",pattern:"Edge"},"Trident",{label:"WebKit",pattern:"AppleWebKit"},"iCab","Presto","NetFront","Tasman","KHTML","Gecko"],function(e,t){return e||RegExp("\\b"+(t.pattern||f(t))+"\\b","i").exec(i)&&(t.label||t)}),j=S(["Adobe AIR","Arora","Avant Browser","Breach","Camino","Electron","Epiphany","Fennec","Flock","Galeon","GreenBrowser","iCab","Iceweasel","K-Meleon","Konqueror","Lunascape","Maxthon",{label:"Microsoft Edge",pattern:"Edge"},"Midori","Nook Browser","PaleMoon","PhantomJS","Raven","Rekonq","RockMelt",{label:"Samsung Internet",pattern:"SamsungBrowser"},"SeaMonkey",{label:"Silk",pattern:"(?:Cloud9|Silk-Accelerated)"},"Sleipnir","SlimBrowser",{label:"SRWare Iron",pattern:"Iron"},"Sunrise","Swiftfox","Waterfox","WebPositive","Opera Mini",{label:"Opera Mini",pattern:"OPiOS"},"Opera",{label:"Opera",pattern:"OPR"},"Chrome",{label:"Chrome Mobile",pattern:"(?:CriOS|CrMo)"},{label:"Firefox",pattern:"(?:Firefox|Minefield)"},{label:"Firefox for iOS",pattern:"FxiOS"},{label:"IE",pattern:"IEMobile"},{label:"IE",pattern:"MSIE"},"Safari"],function(e,t){return e||RegExp("\\b"+(t.pattern||f(t))+"\\b","i").exec(i)&&(t.label||t)}),N=z([{label:"BlackBerry",pattern:"BB10"},"BlackBerry",{label:"Galaxy S",pattern:"GT-I9000"},{label:"Galaxy S2",pattern:"GT-I9100"},{label:"Galaxy S3",pattern:"GT-I9300"},{label:"Galaxy S4",pattern:"GT-I9500"},{label:"Galaxy S5",pattern:"SM-G900"},{label:"Galaxy S6",pattern:"SM-G920"},{label:"Galaxy S6 Edge",pattern:"SM-G925"},{label:"Galaxy S7",pattern:"SM-G930"},{label:"Galaxy S7 Edge",pattern:"SM-G935"},"Google TV","Lumia","iPad","iPod","iPhone","Kindle",{label:"Kindle Fire",pattern:"(?:Cloud9|Silk-Accelerated)"},"Nexus","Nook","PlayBook","PlayStation Vita","PlayStation","TouchPad","Transformer",{label:"Wii U",pattern:"WiiU"},"Wii","Xbox One",{label:"Xbox 360",pattern:"Xbox"},"Xoom"]),K=S({Apple:{iPad:1,iPhone:1,iPod:1},Archos:{},Amazon:{Kindle:1,"Kindle Fire":1},Asus:{Transformer:1},"Barnes & Noble":{Nook:1},BlackBerry:{PlayBook:1},Google:{"Google TV":1,Nexus:1},HP:{TouchPad:1},HTC:{},LG:{},Microsoft:{Xbox:1,"Xbox One":1},Motorola:{Xoom:1},Nintendo:{"Wii U":1,Wii:1},Nokia:{Lumia:1},Samsung:{"Galaxy S":1,"Galaxy S2":1,"Galaxy S3":1,"Galaxy S4":1},Sony:{PlayStation:1,"PlayStation Vita":1}},function(e,t,n){return e||(t[N]||t[/^[a-z]+(?: +[a-z]+\b)*/i.exec(N)]||RegExp("\\b"+f(n)+"(?:\\b|\\w*\\d)","i").exec(i))&&n}),V=S(["Windows Phone","Android","CentOS",{label:"Chrome OS",pattern:"CrOS"},"Debian","Fedora","FreeBSD","Gentoo","Haiku","Kubuntu","Linux Mint","OpenBSD","Red Hat","SuSE","Ubuntu","Xubuntu","Cygwin","Symbian OS","hpwOS","webOS ","webOS","Tablet OS","Tizen","Linux","Mac OS X","Macintosh","Mac","Windows 98;","Windows "],function(e,t){var n,r,o,a,l=t.pattern||f(t);return!e&&(e=RegExp("\\b"+l+"(?:/[\\d.]+|[ \\w.]*)","i").exec(i))&&(n=e,r=l,o=t.label||t,a={"10.0":"10",6.4:"10 Technical Preview",6.3:"8.1",6.2:"8",6.1:"Server 2008 R2 / 7","6.0":"Server 2008 / Vista",5.2:"Server 2003 / XP 64-bit",5.1:"XP",5.01:"2000 SP1","5.0":"2000","4.0":"NT","4.90":"ME"},r&&o&&/^Win/i.test(n)&&!/^Windows Phone /i.test(n)&&(a=a[/[\d.]+$/.exec(n)])&&(n="Windows "+a),n=String(n),r&&o&&(n=n.replace(RegExp(r,"i"),o)),e=n=c(n.replace(/ ce$/i," CE").replace(/\bhpw/i,"web").replace(/\bMacintosh\b/,"Mac OS").replace(/_PowerPC\b/i," OS").replace(/\b(OS X) [^ \d]+/i,"$1").replace(/\bMac (OS X)\b/,"$1").replace(/\/(\d)/," $1").replace(/_/g,".").replace(/(?: BePC|[ .]*fc[ \d.]+)$/i,"").replace(/\bx86\.64\b/gi,"x86_64").replace(/\b(Windows Phone) OS\b/,"$1").replace(/\b(Chrome OS \w+) [\d.]+\b/,"$1").split(" on ")[0])),e});function z(e){return S(e,function(e,t){var n=t.pattern||f(t);return!e&&(e=RegExp("\\b"+n+" *\\d+[.\\w_]*","i").exec(i)||RegExp("\\b"+n+" *\\w+-[\\w]*","i").exec(i)||RegExp("\\b"+n+"(?:; *(?:[a-z]+[_-])?[a-z]+\\d+|[^ ();-]*)","i").exec(i))&&((e=String(t.label&&!RegExp(n,"i").test(t.label)?t.label:e).split("/"))[1]&&!/[\d.]+/.test(e[0])&&(e[0]+=" "+e[1]),t=t.label||t,e=c(e[0].replace(RegExp(n,"i"),t).replace(RegExp("; *(?:"+t+"[_-])?","i")," ").replace(RegExp("("+t+")[-_.]?(\\w)","i"),"$1 $2"))),e})}if(X&&(X=[X]),K&&!N&&(N=z([K])),(s=/\bGoogle TV\b/.exec(N))&&(N=s[0]),/\bSimulator\b/i.test(i)&&(N=(N?N+" ":"")+"Simulator"),"Opera Mini"==j&&/\bOPiOS\b/.test(i)&&T.push("running in Turbo/Uncompressed mode"),"IE"==j&&/\blike iPhone OS\b/.test(i)?(K=(s=e(i.replace(/like iPhone OS/,""))).manufacturer,N=s.product):/^iP/.test(N)?(j||(j="Safari"),V="iOS"+((s=/ OS ([\d_]+)/i.exec(i))?" "+s[1].replace(/_/g,"."):"")):"Konqueror"!=j||/buntu/i.test(V)?K&&"Google"!=K&&(/Chrome/.test(j)&&!/\bMobile Safari\b/i.test(i)||/\bVita\b/.test(N))||/\bAndroid\b/.test(V)&&/^Chrome/.test(j)&&/\bVersion\//i.test(i)?(j="Android Browser",V=/\bAndroid\b/.test(V)?V:"Android"):"Silk"==j?(/\bMobi/i.test(i)||(V="Android",T.unshift("desktop mode")),/Accelerated *= *true/i.test(i)&&T.unshift("accelerated")):"PaleMoon"==j&&(s=/\bFirefox\/([\d.]+)\b/.exec(i))?T.push("identifying as Firefox "+s[1]):"Firefox"==j&&(s=/\b(Mobile|Tablet|TV)\b/i.exec(i))?(V||(V="Firefox OS"),N||(N=s[1])):!j||(s=!/\bMinefield\b/i.test(i)&&/\b(?:Firefox|Safari)\b/.exec(j))?(j&&!N&&/[\/,]|^[^(]+?\)/.test(i.slice(i.indexOf(s+"/")+8))&&(j=null),(s=N||K||V)&&(N||K||/\b(?:Android|Symbian OS|Tablet OS|webOS)\b/.test(V))&&(j=/[a-z]+(?: Hat)?/i.exec(/\bAndroid\b/.test(V)?V:s)+" Browser")):"Electron"==j&&(s=(/\bChrome\/([\d.]+)\b/.exec(i)||0)[1])&&T.push("Chromium "+s):V="Kubuntu",$||($=S(["(?:Cloud9|CriOS|CrMo|Edge|FxiOS|IEMobile|Iron|Opera ?Mini|OPiOS|OPR|Raven|SamsungBrowser|Silk(?!/[\\d.]+$))","Version",f(j),"(?:Firefox|Minefield|NetFront)"],function(e,t){return e||(RegExp(t+"(?:-[\\d.]+/|(?: for [\\w-]+)?[ /-])([\\d.]+[^ ();/_-]*)","i").exec(i)||0)[1]||null})),(s=("iCab"==X&&parseFloat($)>3?"WebKit":/\bOpera\b/.test(j)&&(/\bOPR\b/.test(i)?"Blink":"Presto"))||/\b(?:Midori|Nook|Safari)\b/i.test(i)&&!/^(?:Trident|EdgeHTML)$/.test(X)&&"WebKit"||!X&&/\bMSIE\b/i.test(i)&&("Mac OS"==V?"Tasman":"Trident")||"WebKit"==X&&/\bPlayStation\b(?! Vita\b)/i.test(j)&&"NetFront")&&(X=[s]),"IE"==j&&(s=(/; *(?:XBLWP|ZuneWP)(\d+)/i.exec(i)||0)[1])?(j+=" Mobile",V="Windows Phone "+(/\+$/.test(s)?s:s+".x"),T.unshift("desktop mode")):/\bWPDesktop\b/i.test(i)?(j="IE Mobile",V="Windows Phone 8.x",T.unshift("desktop mode"),$||($=(/\brv:([\d.]+)/.exec(i)||0)[1])):"IE"!=j&&"Trident"==X&&(s=/\brv:([\d.]+)/.exec(i))&&(j&&T.push("identifying as "+j+($?" "+$:"")),j="IE",$=s[1]),G){if(m="global",g=null!=(h=n)?typeof h[m]:"number",/^(?:boolean|number|string|undefined)$/.test(g)||"object"==g&&!h[m])d(s=n.runtime)==M?(j="Adobe AIR",V=s.flash.system.Capabilities.os):d(s=n.phantom)==w?(j="PhantomJS",$=(s=s.version||null)&&s.major+"."+s.minor+"."+s.patch):"number"==typeof B.documentMode&&(s=/\bTrident\/(\d+)/i.exec(i))?($=[$,B.documentMode],(s=+s[1]+4)!=$[1]&&(T.push("IE "+$[1]+" mode"),X&&(X[1]=""),$[1]=s),$="IE"==j?String($[1].toFixed(1)):$[0]):"number"==typeof B.documentMode&&/^(?:Chrome|Firefox)\b/.test(j)&&(T.push("masking as "+j+" "+$),j="IE",$="11.0",X=["Trident"],V="Windows");else if(E&&(R=(s=E.lang.System).getProperty("os.arch"),V=V||s.getProperty("os.name")+" "+s.getProperty("os.version")),k){try{$=n.require("ringo/engine").version.join("."),j="RingoJS"}catch(e){(s=n.system)&&s.global.system==n.system&&(j="Narwhal",V||(V=s[0].os||null))}j||(j="Rhino")}else"object"==typeof n.process&&!n.process.browser&&(s=n.process)&&("object"==typeof s.versions&&("string"==typeof s.versions.electron?(T.push("Node "+s.versions.node),j="Electron",$=s.versions.electron):"string"==typeof s.versions.nw&&(T.push("Chromium "+$,"Node "+s.versions.node),j="NW.js",$=s.versions.nw)),j||(j="Node.js",R=s.arch,V=s.platform,$=($=/[\d.]+/.exec(s.version))?$[0]:null));V=V&&c(V)}if($&&(s=/(?:[ab]|dp|pre|[ab]\d+pre)(?:\d+\+?)?$/i.exec($)||/(?:alpha|beta)(?: ?\d)?/i.exec(i+";"+(G&&o.appMinorVersion))||/\bMinefield\b/i.test(i)&&"a")&&(F=/b/i.test(s)?"beta":"alpha",$=$.replace(RegExp(s+"\\+?$"),"")+("beta"==F?W:C)+(/\d+\+?/.exec(s)||"")),"Fennec"==j||"Firefox"==j&&/\b(?:Android|Firefox OS)\b/.test(V))j="Firefox Mobile";else if("Maxthon"==j&&$)$=$.replace(/\.[\d.]+/,".x");else if(/\bXbox\b/i.test(N))"Xbox 360"==N&&(V=null),"Xbox 360"==N&&/\bIEMobile\b/.test(i)&&T.unshift("mobile mode");else if(!/^(?:Chrome|IE|Opera)$/.test(j)&&(!j||N||/Browser|Mobi/.test(j))||"Windows CE"!=V&&!/Mobi/i.test(i))if("IE"==j&&G)try{null===n.external&&T.unshift("platform preview")}catch(e){T.unshift("embedded")}else(/\bBlackBerry\b/.test(N)||/\bBB10\b/.test(i))&&(s=(RegExp(N.replace(/ +/g," *")+"/([.\\d]+)","i").exec(i)||0)[1]||$)?(s=[s,/BB10/.test(i)],V=(s[1]?(N=null,K="BlackBerry"):"Device Software")+" "+s[0],$=null):this!=u&&"Wii"!=N&&(G&&I||/Opera/.test(j)&&/\b(?:MSIE|Firefox)\b/i.test(i)||"Firefox"==j&&/\bOS X (?:\d+\.){2,}/.test(V)||"IE"==j&&(V&&!/^Win/.test(V)&&$>5.5||/\bWindows XP\b/.test(V)&&$>8||8==$&&!/\bTrident\b/.test(i)))&&!a.test(s=e.call(u,i.replace(a,"")+";"))&&s.name&&(s="ing as "+s.name+((s=s.version)?" "+s:""),a.test(j)?(/\bIE\b/.test(s)&&"Mac OS"==V&&(V=null),s="identify"+s):(s="mask"+s,j=A?c(A.replace(/([a-z])([A-Z])/g,"$1 $2")):"Opera",/\bIE\b/.test(s)&&(V=null),G||($=null)),X=["Presto"],T.push(s));else j+=" Mobile";(s=(/\bAppleWebKit\/([\d.]+\+?)/i.exec(i)||0)[1])&&(s=[parseFloat(s.replace(/\.(\d)$/,".0$1")),s],"Safari"==j&&"+"==s[1].slice(-1)?(j="WebKit Nightly",F="alpha",$=s[1].slice(0,-1)):$!=s[1]&&$!=(s[2]=(/\bSafari\/([\d.]+\+?)/i.exec(i)||0)[1])||($=null),s[1]=(/\bChrome\/([\d.]+)/i.exec(i)||0)[1],537.36==s[0]&&537.36==s[2]&&parseFloat(s[1])>=28&&"WebKit"==X&&(X=["Blink"]),G&&(O||s[1])?(X&&(X[1]="like Chrome"),s=s[1]||((s=s[0])<530?1:s<532?2:s<532.05?3:s<533?4:s<534.03?5:s<534.07?6:s<534.1?7:s<534.13?8:s<534.16?9:s<534.24?10:s<534.3?11:s<535.01?12:s<535.02?"13+":s<535.07?15:s<535.11?16:s<535.19?17:s<536.05?18:s<536.1?19:s<537.01?20:s<537.11?"21+":s<537.13?23:s<537.18?24:s<537.24?25:s<537.36?26:"Blink"!=X?"27":"28")):(X&&(X[1]="like Safari"),s=(s=s[0])<400?1:s<500?2:s<526?3:s<533?4:s<534?"4+":s<535?5:s<537?6:s<538?7:s<601?8:"8"),X&&(X[1]+=" "+(s+="number"==typeof s?".x":/[.+]/.test(s)?"":"+")),"Safari"==j&&(!$||parseInt($)>45)&&($=s)),"Opera"==j&&(s=/\bzbov|zvav$/.exec(V))?(j+=" ",T.unshift("desktop mode"),"zvav"==s?(j+="Mini",$=null):j+="Mobile",V=V.replace(RegExp(" *"+s+"$"),"")):"Safari"==j&&/\bChrome\b/.exec(X&&X[1])&&(T.unshift("desktop mode"),j="Chrome Mobile",$=null,/\bOS X\b/.test(V)?(K="Apple",V="iOS 4.3+"):V=null),$&&0==$.indexOf(s=/[\d.]+$/.exec(V))&&i.indexOf("/"+s+"-")>-1&&(V=x(V.replace(s,""))),X&&!/\b(?:Avant|Nook)\b/.test(j)&&(/Browser|Lunascape|Maxthon/.test(j)||"Safari"!=j&&/^iOS/.test(V)&&/\bSafari\b/.test(X[1])||/^(?:Adobe|Arora|Breach|Midori|Opera|Phantom|Rekonq|Rock|Samsung Internet|Sleipnir|Web)/.test(j)&&X[1])&&(s=X[X.length-1])&&T.push(s),T.length&&(T=["("+T.join("; ")+")"]),K&&N&&N.indexOf(K)<0&&T.push("on "+K),N&&T.push((/^on /.test(T[T.length-1])?"":"on ")+N),V&&(s=/ ([\d.+]+)$/.exec(V),p=s&&"/"==V.charAt(V.length-s[0].length-1),V={architecture:32,family:s&&!p?V.replace(s[0],""):V,version:s?s[1]:null,toString:function(){var e=this.version;return this.family+(e&&!p?" "+e:"")+(64==this.architecture?" 64-bit":"")}}),(s=/\b(?:AMD|IA|Win|WOW|x86_|x)64\b/i.exec(R))&&!/\bi686\b/i.test(R)?(V&&(V.architecture=64,V.family=V.family.replace(RegExp(" *"+s),"")),j&&(/\bWOW64\b/i.test(i)||G&&/\w(?:86|32)$/.test(o.cpuClass||o.platform)&&!/\bWin64; x64\b/i.test(i))&&T.unshift("32-bit")):V&&/^OS X/.test(V.family)&&"Chrome"==j&&parseFloat($)>=39&&(V.architecture=64),i||(i=null);var L={};return L.description=i,L.layout=X&&X[0],L.manufacturer=K,L.name=j,L.prerelease=F,L.product=N,L.ua=i,L.version=j&&$,L.os=V||{architecture:null,family:null,version:null,toString:function(){return"null"}},L.parse=e,L.toString=function(){return this.description||""},L.version&&T.unshift($),L.name&&T.unshift(j),V&&j&&(V!=String(V).split(" ")[0]||V!=j.split(" ")[0]&&!N)&&T.push(N?"("+V+")":"on "+V),T.length&&(L.description=T.join(" ")),L}();"function"==typeof define&&"object"==typeof define.amd&&define.amd?(t.platform=h,define(function(){return h})):i&&n?u(h,function(e,t){i[t]=e}):t.platform=h}).call(this);
\ No newline at end of file
diff --git a/data/interfaces/default/js/pnotify.custom.min.js b/data/interfaces/default/js/pnotify.custom.min.js
deleted file mode 100644
index c5375eb2..00000000
--- a/data/interfaces/default/js/pnotify.custom.min.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-PNotify 3.0.0 sciactive.com/pnotify/
-(C) 2015 Hunter Perrin; Google, Inc.
-license Apache-2.0
-*/
-(function(b,k){"function"===typeof define&&define.amd?define("pnotify",["jquery"],function(q){return k(q,b)}):"object"===typeof exports&&"undefined"!==typeof module?module.exports=k(require("jquery"),global||b):b.PNotify=k(b.jQuery,b)})(this,function(b,k){var q=function(l){var k={dir1:"down",dir2:"left",push:"bottom",spacing1:36,spacing2:36,context:b("body"),modal:!1},g,h,n=b(l),r=function(){h=b("body");d.prototype.options.stack.context=h;n=b(l);n.bind("resize",function(){g&&clearTimeout(g);g=setTimeout(function(){d.positionAll(!0)},
-10)})},s=function(c){var a=b("<div />",{"class":"ui-pnotify-modal-overlay"});a.prependTo(c.context);c.overlay_close&&a.click(function(){d.removeStack(c)});return a},d=function(c){this.parseOptions(c);this.init()};b.extend(d.prototype,{version:"3.0.0",options:{title:!1,title_escape:!1,text:!1,text_escape:!1,styling:"brighttheme",addclass:"",cornerclass:"",auto_display:!0,width:"300px",min_height:"16px",type:"notice",icon:!0,animation:"fade",animate_speed:"normal",shadow:!0,hide:!0,delay:8E3,mouse_reset:!0,
-remove:!0,insert_brs:!0,destroy:!0,stack:k},modules:{},runModules:function(c,a){var p,b;for(b in this.modules)p="object"===typeof a&&b in a?a[b]:a,"function"===typeof this.modules[b][c]&&(this.modules[b].notice=this,this.modules[b].options="object"===typeof this.options[b]?this.options[b]:{},this.modules[b][c](this,"object"===typeof this.options[b]?this.options[b]:{},p))},state:"initializing",timer:null,animTimer:null,styles:null,elem:null,container:null,title_container:null,text_container:null,animating:!1,
-timerHide:!1,init:function(){var c=this;this.modules={};b.extend(!0,this.modules,d.prototype.modules);this.styles="object"===typeof this.options.styling?this.options.styling:d.styling[this.options.styling];this.elem=b("<div />",{"class":"ui-pnotify "+this.options.addclass,css:{display:"none"},"aria-live":"assertive","aria-role":"alertdialog",mouseenter:function(a){if(c.options.mouse_reset&&"out"===c.animating){if(!c.timerHide)return;c.cancelRemove()}c.options.hide&&c.options.mouse_reset&&c.cancelRemove()},
-mouseleave:function(a){c.options.hide&&c.options.mouse_reset&&"out"!==c.animating&&c.queueRemove();d.positionAll()}});"fade"===this.options.animation&&this.elem.addClass("ui-pnotify-fade-"+this.options.animate_speed);this.container=b("<div />",{"class":this.styles.container+" ui-pnotify-container "+("error"===this.options.type?this.styles.error:"info"===this.options.type?this.styles.info:"success"===this.options.type?this.styles.success:this.styles.notice),role:"alert"}).appendTo(this.elem);""!==
-this.options.cornerclass&&this.container.removeClass("ui-corner-all").addClass(this.options.cornerclass);this.options.shadow&&this.container.addClass("ui-pnotify-shadow");!1!==this.options.icon&&b("<div />",{"class":"ui-pnotify-icon"}).append(b("<span />",{"class":!0===this.options.icon?"error"===this.options.type?this.styles.error_icon:"info"===this.options.type?this.styles.info_icon:"success"===this.options.type?this.styles.success_icon:this.styles.notice_icon:this.options.icon})).prependTo(this.container);
-this.title_container=b("<h4 />",{"class":"ui-pnotify-title"}).appendTo(this.container);!1===this.options.title?this.title_container.hide():this.options.title_escape?this.title_container.text(this.options.title):this.title_container.html(this.options.title);this.text_container=b("<div />",{"class":"ui-pnotify-text","aria-role":"alert"}).appendTo(this.container);!1===this.options.text?this.text_container.hide():this.options.text_escape?this.text_container.text(this.options.text):this.text_container.html(this.options.insert_brs?
-String(this.options.text).replace(/\n/g,"<br />"):this.options.text);"string"===typeof this.options.width&&this.elem.css("width",this.options.width);"string"===typeof this.options.min_height&&this.container.css("min-height",this.options.min_height);d.notices="top"===this.options.stack.push?b.merge([this],d.notices):b.merge(d.notices,[this]);"top"===this.options.stack.push&&this.queuePosition(!1,1);this.options.stack.animation=!1;this.runModules("init");this.options.auto_display&&this.open();return this},
-update:function(c){var a=this.options;this.parseOptions(a,c);this.elem.removeClass("ui-pnotify-fade-slow ui-pnotify-fade-normal ui-pnotify-fade-fast");"fade"===this.options.animation&&this.elem.addClass("ui-pnotify-fade-"+this.options.animate_speed);this.options.cornerclass!==a.cornerclass&&this.container.removeClass("ui-corner-all "+a.cornerclass).addClass(this.options.cornerclass);this.options.shadow!==a.shadow&&(this.options.shadow?this.container.addClass("ui-pnotify-shadow"):this.container.removeClass("ui-pnotify-shadow"));
-!1===this.options.addclass?this.elem.removeClass(a.addclass):this.options.addclass!==a.addclass&&this.elem.removeClass(a.addclass).addClass(this.options.addclass);!1===this.options.title?this.title_container.slideUp("fast"):this.options.title!==a.title&&(this.options.title_escape?this.title_container.text(this.options.title):this.title_container.html(this.options.title),!1===a.title&&this.title_container.slideDown(200));!1===this.options.text?this.text_container.slideUp("fast"):this.options.text!==
-a.text&&(this.options.text_escape?this.text_container.text(this.options.text):this.text_container.html(this.options.insert_brs?String(this.options.text).replace(/\n/g,"<br />"):this.options.text),!1===a.text&&this.text_container.slideDown(200));this.options.type!==a.type&&this.container.removeClass(this.styles.error+" "+this.styles.notice+" "+this.styles.success+" "+this.styles.info).addClass("error"===this.options.type?this.styles.error:"info"===this.options.type?this.styles.info:"success"===this.options.type?
-this.styles.success:this.styles.notice);if(this.options.icon!==a.icon||!0===this.options.icon&&this.options.type!==a.type)this.container.find("div.ui-pnotify-icon").remove(),!1!==this.options.icon&&b("<div />",{"class":"ui-pnotify-icon"}).append(b("<span />",{"class":!0===this.options.icon?"error"===this.options.type?this.styles.error_icon:"info"===this.options.type?this.styles.info_icon:"success"===this.options.type?this.styles.success_icon:this.styles.notice_icon:this.options.icon})).prependTo(this.container);
-this.options.width!==a.width&&this.elem.animate({width:this.options.width});this.options.min_height!==a.min_height&&this.container.animate({minHeight:this.options.min_height});this.options.hide?a.hide||this.queueRemove():this.cancelRemove();this.queuePosition(!0);this.runModules("update",a);return this},open:function(){this.state="opening";this.runModules("beforeOpen");var c=this;this.elem.parent().length||this.elem.appendTo(this.options.stack.context?this.options.stack.context:h);"top"!==this.options.stack.push&&
-this.position(!0);this.animateIn(function(){c.queuePosition(!0);c.options.hide&&c.queueRemove();c.state="open";c.runModules("afterOpen")});return this},remove:function(c){this.state="closing";this.timerHide=!!c;this.runModules("beforeClose");var a=this;this.timer&&(l.clearTimeout(this.timer),this.timer=null);this.animateOut(function(){a.state="closed";a.runModules("afterClose");a.queuePosition(!0);a.options.remove&&a.elem.detach();a.runModules("beforeDestroy");if(a.options.destroy&&null!==d.notices){var c=
-b.inArray(a,d.notices);-1!==c&&d.notices.splice(c,1)}a.runModules("afterDestroy")});return this},get:function(){return this.elem},parseOptions:function(c,a){this.options=b.extend(!0,{},d.prototype.options);this.options.stack=d.prototype.options.stack;for(var p=[c,a],m,f=0;f<p.length;f++){m=p[f];if("undefined"===typeof m)break;if("object"!==typeof m)this.options.text=m;else for(var e in m)this.modules[e]?b.extend(!0,this.options[e],m[e]):this.options[e]=m[e]}},animateIn:function(c){this.animating=
-"in";var a=this;c=function(){a.animTimer&&clearTimeout(a.animTimer);"in"===a.animating&&(a.elem.is(":visible")?(this&&this.call(),a.animating=!1):a.animTimer=setTimeout(c,40))}.bind(c);"fade"===this.options.animation?(this.elem.one("webkitTransitionEnd mozTransitionEnd MSTransitionEnd oTransitionEnd transitionend",c).addClass("ui-pnotify-in"),this.elem.css("opacity"),this.elem.addClass("ui-pnotify-fade-in"),this.animTimer=setTimeout(c,650)):(this.elem.addClass("ui-pnotify-in"),c())},animateOut:function(c){this.animating=
-"out";var a=this;c=function(){a.animTimer&&clearTimeout(a.animTimer);"out"===a.animating&&("0"!=a.elem.css("opacity")&&a.elem.is(":visible")?a.animTimer=setTimeout(c,40):(a.elem.removeClass("ui-pnotify-in"),this&&this.call(),a.animating=!1))}.bind(c);"fade"===this.options.animation?(this.elem.one("webkitTransitionEnd mozTransitionEnd MSTransitionEnd oTransitionEnd transitionend",c).removeClass("ui-pnotify-fade-in"),this.animTimer=setTimeout(c,650)):(this.elem.removeClass("ui-pnotify-in"),c())},position:function(c){var a=
-this.options.stack,b=this.elem;"undefined"===typeof a.context&&(a.context=h);if(a){"number"!==typeof a.nextpos1&&(a.nextpos1=a.firstpos1);"number"!==typeof a.nextpos2&&(a.nextpos2=a.firstpos2);"number"!==typeof a.addpos2&&(a.addpos2=0);var d=!b.hasClass("ui-pnotify-in");if(!d||c){a.modal&&(a.overlay?a.overlay.show():a.overlay=s(a));b.addClass("ui-pnotify-move");var f;switch(a.dir1){case "down":f="top";break;case "up":f="bottom";break;case "left":f="right";break;case "right":f="left"}c=parseInt(b.css(f).replace(/(?:\..*|[^0-9.])/g,
-""));isNaN(c)&&(c=0);"undefined"!==typeof a.firstpos1||d||(a.firstpos1=c,a.nextpos1=a.firstpos1);var e;switch(a.dir2){case "down":e="top";break;case "up":e="bottom";break;case "left":e="right";break;case "right":e="left"}c=parseInt(b.css(e).replace(/(?:\..*|[^0-9.])/g,""));isNaN(c)&&(c=0);"undefined"!==typeof a.firstpos2||d||(a.firstpos2=c,a.nextpos2=a.firstpos2);if("down"===a.dir1&&a.nextpos1+b.height()>(a.context.is(h)?n.height():a.context.prop("scrollHeight"))||"up"===a.dir1&&a.nextpos1+b.height()>
-(a.context.is(h)?n.height():a.context.prop("scrollHeight"))||"left"===a.dir1&&a.nextpos1+b.width()>(a.context.is(h)?n.width():a.context.prop("scrollWidth"))||"right"===a.dir1&&a.nextpos1+b.width()>(a.context.is(h)?n.width():a.context.prop("scrollWidth")))a.nextpos1=a.firstpos1,a.nextpos2+=a.addpos2+("undefined"===typeof a.spacing2?25:a.spacing2),a.addpos2=0;"number"===typeof a.nextpos2&&(a.animation?b.css(e,a.nextpos2+"px"):(b.removeClass("ui-pnotify-move"),b.css(e,a.nextpos2+"px"),b.css(e),b.addClass("ui-pnotify-move")));
-switch(a.dir2){case "down":case "up":b.outerHeight(!0)>a.addpos2&&(a.addpos2=b.height());break;case "left":case "right":b.outerWidth(!0)>a.addpos2&&(a.addpos2=b.width())}"number"===typeof a.nextpos1&&(a.animation?b.css(f,a.nextpos1+"px"):(b.removeClass("ui-pnotify-move"),b.css(f,a.nextpos1+"px"),b.css(f),b.addClass("ui-pnotify-move")));switch(a.dir1){case "down":case "up":a.nextpos1+=b.height()+("undefined"===typeof a.spacing1?25:a.spacing1);break;case "left":case "right":a.nextpos1+=b.width()+("undefined"===
-typeof a.spacing1?25:a.spacing1)}}return this}},queuePosition:function(b,a){g&&clearTimeout(g);a||(a=10);g=setTimeout(function(){d.positionAll(b)},a);return this},cancelRemove:function(){this.timer&&l.clearTimeout(this.timer);this.animTimer&&l.clearTimeout(this.animTimer);"closing"===this.state&&(this.state="open",this.animating=!1,this.elem.addClass("ui-pnotify-in"),"fade"===this.options.animation&&this.elem.addClass("ui-pnotify-fade-in"));return this},queueRemove:function(){var b=this;this.cancelRemove();
-this.timer=l.setTimeout(function(){b.remove(!0)},isNaN(this.options.delay)?0:this.options.delay);return this}});b.extend(d,{notices:[],reload:q,removeAll:function(){b.each(d.notices,function(){this.remove&&this.remove(!1)})},removeStack:function(c){b.each(d.notices,function(){this.remove&&this.options.stack===c&&this.remove(!1)})},positionAll:function(c){g&&clearTimeout(g);g=null;if(d.notices&&d.notices.length)b.each(d.notices,function(){var a=this.options.stack;a&&(a.overlay&&a.overlay.hide(),a.nextpos1=
-a.firstpos1,a.nextpos2=a.firstpos2,a.addpos2=0,a.animation=c)}),b.each(d.notices,function(){this.position()});else{var a=d.prototype.options.stack;a&&(delete a.nextpos1,delete a.nextpos2)}},styling:{brighttheme:{container:"brighttheme",notice:"brighttheme-notice",notice_icon:"brighttheme-icon-notice",info:"brighttheme-info",info_icon:"brighttheme-icon-info",success:"brighttheme-success",success_icon:"brighttheme-icon-success",error:"brighttheme-error",error_icon:"brighttheme-icon-error"},jqueryui:{container:"ui-widget ui-widget-content ui-corner-all",
-notice:"ui-state-highlight",notice_icon:"ui-icon ui-icon-info",info:"",info_icon:"ui-icon ui-icon-info",success:"ui-state-default",success_icon:"ui-icon ui-icon-circle-check",error:"ui-state-error",error_icon:"ui-icon ui-icon-alert"},bootstrap3:{container:"alert",notice:"alert-warning",notice_icon:"glyphicon glyphicon-exclamation-sign",info:"alert-info",info_icon:"glyphicon glyphicon-info-sign",success:"alert-success",success_icon:"glyphicon glyphicon-ok-sign",error:"alert-danger",error_icon:"glyphicon glyphicon-warning-sign"}}});
-d.styling.fontawesome=b.extend({},d.styling.bootstrap3);b.extend(d.styling.fontawesome,{notice_icon:"fa fa-exclamation-circle",info_icon:"fa fa-info",success_icon:"fa fa-check",error_icon:"fa fa-warning"});l.document.body?r():b(r);return d};return q(k)});
-(function(d,e){"function"===typeof define&&define.amd?define("pnotify.buttons",["jquery","pnotify"],e):"object"===typeof exports&&"undefined"!==typeof module?module.exports=e(require("jquery"),require("./pnotify")):e(d.jQuery,d.PNotify)})(this,function(d,e){e.prototype.options.buttons={closer:!0,closer_hover:!0,sticker:!0,sticker_hover:!0,show_on_nonblock:!1,labels:{close:"Close",stick:"Stick",unstick:"Unstick"},classes:{closer:null,pin_up:null,pin_down:null}};e.prototype.modules.buttons={closer:null,
-sticker:null,init:function(a,b){var c=this;a.elem.on({mouseenter:function(b){!c.options.sticker||a.options.nonblock&&a.options.nonblock.nonblock&&!c.options.show_on_nonblock||c.sticker.trigger("pnotify:buttons:toggleStick").css("visibility","visible");!c.options.closer||a.options.nonblock&&a.options.nonblock.nonblock&&!c.options.show_on_nonblock||c.closer.css("visibility","visible")},mouseleave:function(a){c.options.sticker_hover&&c.sticker.css("visibility","hidden");c.options.closer_hover&&c.closer.css("visibility",
-"hidden")}});this.sticker=d("<div />",{"class":"ui-pnotify-sticker","aria-role":"button","aria-pressed":a.options.hide?"false":"true",tabindex:"0",title:a.options.hide?b.labels.stick:b.labels.unstick,css:{cursor:"pointer",visibility:b.sticker_hover?"hidden":"visible"},click:function(){a.options.hide=!a.options.hide;a.options.hide?a.queueRemove():a.cancelRemove();d(this).trigger("pnotify:buttons:toggleStick")}}).bind("pnotify:buttons:toggleStick",function(){var b=null===c.options.classes.pin_up?a.styles.pin_up:
-c.options.classes.pin_up,e=null===c.options.classes.pin_down?a.styles.pin_down:c.options.classes.pin_down;d(this).attr("title",a.options.hide?c.options.labels.stick:c.options.labels.unstick).children().attr("class","").addClass(a.options.hide?b:e).attr("aria-pressed",a.options.hide?"false":"true")}).append("<span />").trigger("pnotify:buttons:toggleStick").prependTo(a.container);(!b.sticker||a.options.nonblock&&a.options.nonblock.nonblock&&!b.show_on_nonblock)&&this.sticker.css("display","none");
-this.closer=d("<div />",{"class":"ui-pnotify-closer","aria-role":"button",tabindex:"0",title:b.labels.close,css:{cursor:"pointer",visibility:b.closer_hover?"hidden":"visible"},click:function(){a.remove(!1);c.sticker.css("visibility","hidden");c.closer.css("visibility","hidden")}}).append(d("<span />",{"class":null===b.classes.closer?a.styles.closer:b.classes.closer})).prependTo(a.container);(!b.closer||a.options.nonblock&&a.options.nonblock.nonblock&&!b.show_on_nonblock)&&this.closer.css("display",
-"none")},update:function(a,b){!b.closer||a.options.nonblock&&a.options.nonblock.nonblock&&!b.show_on_nonblock?this.closer.css("display","none"):b.closer&&this.closer.css("display","block");!b.sticker||a.options.nonblock&&a.options.nonblock.nonblock&&!b.show_on_nonblock?this.sticker.css("display","none"):b.sticker&&this.sticker.css("display","block");this.sticker.trigger("pnotify:buttons:toggleStick");this.closer.find("span").attr("class","").addClass(null===b.classes.closer?a.styles.closer:b.classes.closer);
-b.sticker_hover?this.sticker.css("visibility","hidden"):a.options.nonblock&&a.options.nonblock.nonblock&&!b.show_on_nonblock||this.sticker.css("visibility","visible");b.closer_hover?this.closer.css("visibility","hidden"):a.options.nonblock&&a.options.nonblock.nonblock&&!b.show_on_nonblock||this.closer.css("visibility","visible")}};d.extend(e.styling.brighttheme,{closer:"brighttheme-icon-closer",pin_up:"brighttheme-icon-sticker",pin_down:"brighttheme-icon-sticker brighttheme-icon-stuck"});d.extend(e.styling.jqueryui,
-{closer:"ui-icon ui-icon-close",pin_up:"ui-icon ui-icon-pin-w",pin_down:"ui-icon ui-icon-pin-s"});d.extend(e.styling.bootstrap2,{closer:"icon-remove",pin_up:"icon-pause",pin_down:"icon-play"});d.extend(e.styling.bootstrap3,{closer:"glyphicon glyphicon-remove",pin_up:"glyphicon glyphicon-pause",pin_down:"glyphicon glyphicon-play"});d.extend(e.styling.fontawesome,{closer:"fa fa-times",pin_up:"fa fa-pause",pin_down:"fa fa-play"})});
-(function(e,c){"function"===typeof define&&define.amd?define("pnotify.desktop",["jquery","pnotify"],c):"object"===typeof exports&&"undefined"!==typeof module?module.exports=c(require("jquery"),require("./pnotify")):c(e.jQuery,e.PNotify)})(this,function(e,c){var d,f=function(a,b){f="Notification"in window?function(a,b){return new Notification(a,b)}:"mozNotification"in navigator?function(a,b){return navigator.mozNotification.createNotification(a,b.body,b.icon).show()}:"webkitNotifications"in window?
-function(a,b){return window.webkitNotifications.createNotification(b.icon,a,b.body)}:function(a,b){return null};return f(a,b)};c.prototype.options.desktop={desktop:!1,fallback:!0,icon:null,tag:null};c.prototype.modules.desktop={tag:null,icon:null,genNotice:function(a,b){this.icon=null===b.icon?"http://sciactive.com/pnotify/includes/desktop/"+a.options.type+".png":!1===b.icon?null:b.icon;if(null===this.tag||null!==b.tag)this.tag=null===b.tag?"PNotify-"+Math.round(1E6*Math.random()):b.tag;a.desktop=
-f(a.options.title,{icon:this.icon,body:b.text||a.options.text,tag:this.tag});!("close"in a.desktop)&&"cancel"in a.desktop&&(a.desktop.close=function(){a.desktop.cancel()});a.desktop.onclick=function(){a.elem.trigger("click")};a.desktop.onclose=function(){"closing"!==a.state&&"closed"!==a.state&&a.remove()}},init:function(a,b){b.desktop&&(d=c.desktop.checkPermission(),0!==d?b.fallback||(a.options.auto_display=!1):this.genNotice(a,b))},update:function(a,b,c){0!==d&&b.fallback||!b.desktop||this.genNotice(a,
-b)},beforeOpen:function(a,b){0!==d&&b.fallback||!b.desktop||a.elem.css({left:"-10000px"}).removeClass("ui-pnotify-in")},afterOpen:function(a,b){0!==d&&b.fallback||!b.desktop||(a.elem.css({left:"-10000px"}).removeClass("ui-pnotify-in"),"show"in a.desktop&&a.desktop.show())},beforeClose:function(a,b){0!==d&&b.fallback||!b.desktop||a.elem.css({left:"-10000px"}).removeClass("ui-pnotify-in")},afterClose:function(a,b){0!==d&&b.fallback||!b.desktop||(a.elem.css({left:"-10000px"}).removeClass("ui-pnotify-in"),
-"close"in a.desktop&&a.desktop.close())}};c.desktop={permission:function(){"undefined"!==typeof Notification&&"requestPermission"in Notification?Notification.requestPermission():"webkitNotifications"in window&&window.webkitNotifications.requestPermission()},checkPermission:function(){return"undefined"!==typeof Notification&&"permission"in Notification?"granted"===Notification.permission?0:1:"webkitNotifications"in window?0==window.webkitNotifications.checkPermission()?0:1:1}};d=c.desktop.checkPermission()});
-(function(g,c){"function"===typeof define&&define.amd?define("pnotify.mobile",["jquery","pnotify"],c):"object"===typeof exports&&"undefined"!==typeof module?module.exports=c(require("jquery"),require("./pnotify")):c(g.jQuery,g.PNotify)})(this,function(g,c){c.prototype.options.mobile={swipe_dismiss:!0,styling:!0};c.prototype.modules.mobile={swipe_dismiss:!0,init:function(a,b){var c=this,d=null,e=null,f=null;this.swipe_dismiss=b.swipe_dismiss;this.doMobileStyling(a,b);a.elem.on({touchstart:function(b){c.swipe_dismiss&&
-(d=b.originalEvent.touches[0].screenX,f=a.elem.width(),a.container.css("left","0"))},touchmove:function(b){d&&c.swipe_dismiss&&(e=b.originalEvent.touches[0].screenX-d,b=(1-Math.abs(e)/f)*a.options.opacity,a.elem.css("opacity",b),a.container.css("left",e))},touchend:function(){if(d&&c.swipe_dismiss){if(40<Math.abs(e)){var b=0>e?-2*f:2*f;a.elem.animate({opacity:0},100);a.container.animate({left:b},100);a.remove()}else a.elem.animate({opacity:a.options.opacity},100),a.container.animate({left:0},100);
-f=e=d=null}},touchcancel:function(){d&&c.swipe_dismiss&&(a.elem.animate({opacity:a.options.opacity},100),a.container.animate({left:0},100),f=e=d=null)}})},update:function(a,b){this.swipe_dismiss=b.swipe_dismiss;this.doMobileStyling(a,b)},doMobileStyling:function(a,b){if(b.styling)if(a.elem.addClass("ui-pnotify-mobile-able"),480>=g(window).width())a.options.stack.mobileOrigSpacing1||(a.options.stack.mobileOrigSpacing1=a.options.stack.spacing1,a.options.stack.mobileOrigSpacing2=a.options.stack.spacing2),
-a.options.stack.spacing1=0,a.options.stack.spacing2=0;else{if(a.options.stack.mobileOrigSpacing1||a.options.stack.mobileOrigSpacing2)a.options.stack.spacing1=a.options.stack.mobileOrigSpacing1,delete a.options.stack.mobileOrigSpacing1,a.options.stack.spacing2=a.options.stack.mobileOrigSpacing2,delete a.options.stack.mobileOrigSpacing2}else a.elem.removeClass("ui-pnotify-mobile-able"),a.options.stack.mobileOrigSpacing1&&(a.options.stack.spacing1=a.options.stack.mobileOrigSpacing1,delete a.options.stack.mobileOrigSpacing1),
-a.options.stack.mobileOrigSpacing2&&(a.options.stack.spacing2=a.options.stack.mobileOrigSpacing2,delete a.options.stack.mobileOrigSpacing2)}}});
diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js
index 9f2a92eb..34b7be20 100644
--- a/data/interfaces/default/js/script.js
+++ b/data/interfaces/default/js/script.js
@@ -1,388 +1,294 @@
-var p = {
-    name: 'Unknown',
-    version: 'Unknown',
-    os: 'Unknown'
-};
-if (typeof platform !== 'undefined') {
-    p.name = platform.name;
-    p.version = platform.version;
-    p.os = platform.os.toString();
-}
-
-if (['IE', 'Microsoft Edge', 'IE Mobile'].indexOf(p.name) > -1) {
-    if (!getCookie('browserDismiss')) {
-        var $browser_warning = $('<div id="browser-warning">' +
-            '<i class="fa fa-exclamation-circle"></i>&nbsp;' +
-            'Tautulli does not support Internet Explorer or Microsoft Edge! ' +
-            'Please use a different browser such as Chrome or Firefox.' +
-            '<button type="button" class="close"><i class="fa fa-remove"></i></button>' +
-            '</div>');
-        $('body').prepend($browser_warning);
-        var offset = $browser_warning.height();
-        warningOffset(offset);
-
-        $browser_warning.one('click', 'button.close', function () {
-            $browser_warning.remove();
-            warningOffset(-offset);
-            setCookie('browserDismiss', 'true', 7);
-        });
-
-        function warningOffset(offset) {
-            var navbar = $('.navbar-fixed-top');
-            if (navbar.length) {
-                navbar.offset({top: navbar.offset().top + offset});
-            }
-            var container = $('.body-container');
-            if (container.length) {
-                container.offset({top: container.offset().top + offset});
-            }
-        }
-    }
-}
-
-function initConfigCheckbox(elem, toggleElem, reverse) {
-    toggleElem = (toggleElem === undefined) ? null : toggleElem;
-    reverse = (reverse === undefined) ? false : reverse;
-    var config = toggleElem ? $(toggleElem) : $(elem).closest('div').next();
-    config.addClass('hidden-settings');
-    if ($(elem).is(":checked")) {
-        config.toggle(!reverse);
-    } else {
-        config.toggle(reverse);
-    }
-    $(elem).click(function () {
-        var config = toggleElem ? $(toggleElem) : $(this).closest('div').next();
-        if ($(this).is(":checked")) {
-            config.slideToggleBool(!reverse);
-        } else {
-            config.slideToggleBool(reverse);
-        }
-    });
-}
+function initConfigCheckbox(elem) {
+	var config = $(elem).parent().next();	
+	if ( $(elem).is(":checked") ) {
+		config.show();
+	} else {
+		config.hide();
+	}
+	$(elem).click(function(){
+		var config = $(this).parent().next();	
+		if ( $(this).is(":checked") ) {
+			config.slideDown();
+		} else {
+			config.slideUp();
+		}
+	});
+}     
 
 function refreshTab() {
-    var url = $(location).attr('href');
-    var tabId = $('.ui-tabs-panel:visible').attr("id");
-    $('.ui-tabs-panel:visible').load(url + " #" + tabId, function () {
-        initThisPage();
-    });
+	var url =  $(location).attr('href');
+	var tabId = $('.ui-tabs-panel:visible').attr("id");
+	$('.ui-tabs-panel:visible').load(url + " #"+ tabId, function() {
+		initThisPage();
+	});
 }
 
-function showMsg(msg, loader, timeout, ms, error) {
-    var feedback = $("#ajaxMsg");
-    var update = $("#updatebar");
-    var token_error = $("#token_error_bar");
-    if (update.is(":visible") || token_error.is(":visible")) {
-        var height = (update.is(":visible") ? update.height() : 0) + (token_error.is(":visible") ? token_error.height() : 0) + 35;
-        feedback.css("bottom", height + "px");
-    } else {
-        feedback.removeAttr("style");
-    }
-    var message = $("<div class='msg'>" + msg + "</div>");
-    if (loader) {
-        message = $("<div class='msg'><i class='fa fa-refresh fa-spin'></i>&nbsp; " + msg + "</div>");
-        feedback.css("padding", "14px 10px");
-    }
-    if (error) {
-        feedback.css("background-color", "rgba(255,0,0,0.5)");
-    }
-    $(feedback).html(message);
-    feedback.fadeIn();
-    if (timeout) {
-        setTimeout(function () {
-            message.fadeOut(function () {
-                $(this).remove();
-                feedback.fadeOut();
-                feedback.css("background-color", "");
-            });
-        }, ms);
-    }
+function showMsg(msg,loader,timeout,ms,error) {
+	var feedback = $("#ajaxMsg");
+	update = $("#updatebar");
+	if ( update.is(":visible") ) {
+		var height = update.height() + 35;
+		feedback.css("bottom",height + "px");
+	} else {
+		feedback.removeAttr("style");
+	}
+	var message = $("<div class='msg'>" + msg + "</div>");
+	if (loader) {
+		var message = $("<i class='fa fa-refresh fa-spin'></i> " + msg + "</div>");
+		feedback.css("padding","14px 10px")
+	}
+	if (error) {
+		feedback.css("background-color", "rgba(255,0,0,0.5)");
+		console.log('is error');
+	}
+	$(feedback).html(message);
+	feedback.fadeIn();
+
+	if (timeout) {
+		setTimeout(function(){
+			message.fadeOut(function(){
+				$(this).remove();
+				feedback.fadeOut();					
+			});
+		},ms);
+	} 
 }
 
-function confirmAjaxCall(url, msg, data, loader_msg, callback) {
-    $("#confirm-message").html(msg);
-    $('#confirm-modal').modal();
-    $('#confirm-modal').off('click', '#confirm-button').one('click', '#confirm-button', function () {
-        if (loader_msg) {
-            showMsg(loader_msg, true, false);
-        }
-        $.ajax({
-            url: url,
-            type: 'POST',
-            cache: false,
-            async: true,
-            data: data,
-            complete: function (xhr, status) {
-                var result = $.parseJSON(xhr.responseText);
-                var msg = result.message;
-                if (result.result == 'success') {
-                    showMsg('<i class="fa fa-check"></i>&nbsp; ' + msg, false, true, 5000);
-                } else {
-                    showMsg('<i class="fa fa-times"></i>&nbsp; ' + msg, false, true, 5000, true);
-                }
-                if (typeof callback === "function") {
-                    callback(result);
-                }
-            }
-        });
-    });
+function doAjaxCall(url,elem,reload,form) {
+	// Set Message
+	feedback = $("#ajaxMsg");
+	update = $("#updatebar");
+	if ( update.is(":visible") ) {
+		var height = update.height() + 35;
+		feedback.css("bottom",height + "px");
+	} else {
+		feedback.removeAttr("style");
+	}
+	
+	feedback.fadeIn();
+	// Get Form data
+	var formID = "#"+url;
+	if ( form == true ) {
+		var dataString = $(formID).serialize();
+	}
+	// Loader Image
+	var loader = $("<i class='fa fa-refresh fa-spin'></i>");
+	// Data Success Message
+	var dataSucces = $(elem).data('success');
+	if (typeof dataSucces === "undefined") {
+		// Standard Message when variable is not set
+		var dataSucces = "Success!";
+	} 
+	// Data Errror Message
+	var dataError = $(elem).data('error');
+	if (typeof dataError === "undefined") {
+		// Standard Message when variable is not set
+		var dataError = "There was an error";
+	} 	
+	// Get Success & Error message from inline data, else use standard message
+	var succesMsg = $("<div class='msg'><i class='fa fa-check'></i> " + dataSucces + "</div>");
+	var errorMsg = $("<div class='msg'><i class='fa fa-exclamation-triangle'></i> " + dataError + "</div>");
+	
+	// Check if checkbox is selected
+	if ( form ) {
+		if ( $('td#select input[type=checkbox]').length > 0 && !$('td#select input[type=checkbox]').is(':checked') || $('#importLastFM #username:visible').length > 0 && $("#importLastFM #username" ).val().length === 0 ) {
+			feedback.addClass('error')
+			$(feedback).prepend(errorMsg);
+			setTimeout(function(){
+				errorMsg.fadeOut(function(){
+					$(this).remove();
+					feedback.fadeOut(function(){
+						feedback.removeClass('error');
+					});					
+				})
+				$(formID + " select").children('option[disabled=disabled]').attr('selected','selected');
+			},2000);
+			return false;
+		} 
+	} 
+	
+	// Ajax Call
+	$.ajax({
+	  url: url,
+	  data: dataString,
+	  type: 'post',
+	  beforeSend: function(jqXHR, settings) {
+	  	// Start loader etc.
+	  	feedback.prepend(loader);
+	  },
+	  error: function(jqXHR, textStatus, errorThrown)  {
+	  	feedback.addClass('error')
+	  	feedback.prepend(errorMsg);
+	  	setTimeout(function(){
+	  		errorMsg.fadeOut(function(){
+	  			$(this).remove();
+	  			feedback.fadeOut(function(){
+	  				feedback.removeClass('error')
+	  			});	  			
+	  		})
+	  	},2000);
+	  },
+	  success: function(data,jqXHR) {
+	  	feedback.prepend(succesMsg);
+	  	feedback.addClass('success')
+	  	setTimeout(function(e){
+	  		succesMsg.fadeOut(function(){
+	  			$(this).remove();
+	  			feedback.fadeOut(function(){
+	  				feedback.removeClass('success');
+	  			});
+	  			if ( reload == true ) 	refreshSubmenu();
+	  			if ( reload == "table") {
+	  				console.log('refresh'); refreshTable();
+	  			}
+	  			if ( reload == "tabs") 	refreshTab();
+	  			if ( reload == "page") 	location.reload();
+	  			if ( reload == "submenu&table") {
+	  				refreshSubmenu();
+	  				refreshTable();
+	  			}
+	  			if ( form ) {
+	  				// Change the option to 'choose...'
+	  				$(formID + " select").children('option[disabled=disabled]').attr('selected','selected');
+	  			}
+	  		})
+	  	},2000);
+	  },
+	  complete: function(jqXHR, textStatus) {
+	  	// Remove loaders and stuff, ajax request is complete!
+	  	loader.remove();
+	  }
+	});
 }
 
-function doAjaxCall(url, elem, reload, form, showMsg, callback) {
-    // Set Message
-    var feedback = (showMsg) ? $("#ajaxMsg") : $();
-    var update = $("#updatebar");
-    var token_error = $("#token_error_bar");
-    if (update.is(":visible") || token_error.is(":visible")) {
-        var height = (update.is(":visible") ? update.height() : 0) + (token_error.is(":visible") ? token_error.height() : 0) + 35;
-        feedback.css("bottom", height + "px");
-    } else {
-        feedback.removeAttr("style");
-    }
-    feedback.fadeIn();
-    // Get Form data
-    var formID = "#" + url;
-    var dataString;
-    if (form === true) {
-        dataString = $(formID).serialize();
-    }
-    // Loader Image
-    var loader = $("<div class='msg ajaxLoader-" + url +"'><i class='fa fa-refresh fa-spin'></i>&nbsp; Saving...</div>");
-    // Data Success Message
-    var dataSucces = $(elem).data('success');
-    if (typeof dataSucces === "undefined") {
-        // Standard Message when variable is not set
-        dataSucces = "Success!";
-    }
-    // Data Error Message
-    var dataError = $(elem).data('error');
-    if (typeof dataError === "undefined") {
-        // Standard Message when variable is not set
-        dataError = "There was an error";
-    }
-    // Get Success & Error message from inline data, else use standard message
-    var succesMsg = $("<div class='msg'><i class='fa fa-check'></i>&nbsp; " + dataSucces + "</div>");
-    var errorMsg = $("<div class='msg'><i class='fa fa-exclamation-triangle'></i>&nbsp; " + dataError + "</div>");
-    // Check if checkbox is selected
-    if (form) {
-        if ($('td#select input[type=checkbox]').length > 0 && !$('td#select input[type=checkbox]').is(':checked') ||
-            $('#importLastFM #username:visible').length > 0 && $("#importLastFM #username").val().length === 0) {
-            feedback.addClass('error');
-            $(feedback).prepend(errorMsg);
-            setTimeout(function () {
-                errorMsg.fadeOut(function () {
-                    $(this).remove();
-                    feedback.fadeOut(function () {
-                        feedback.removeClass('error');
-                    });
-                });
-                $(formID + " select").children('option[disabled=disabled]').attr('selected', 'selected');
-            }, 2000);
-            return false;
-        }
-    }
-    // Ajax Call
-    $.ajax({
-        url: url,
-        data: dataString,
-        type: 'POST',
-        beforeSend: function (jqXHR, settings) {
-            // Start loader etc.
-            feedback.prepend(loader);
-        },
-        error: function (jqXHR, textStatus, errorThrown) {
-            feedback.addClass('error');
-            feedback.prepend(errorMsg);
-            setTimeout(function () {
-                errorMsg.fadeOut(function () {
-                    $(this).remove();
-                    feedback.fadeOut(function () {
-                        feedback.removeClass('error');
-                    });
-                });
-            }, 2000);
-        },
-        success: function (data, jqXHR) {
-            feedback.prepend(succesMsg);
-            feedback.addClass('success');
-            setTimeout(function (e) {
-                succesMsg.fadeOut(function () {
-                    $(this).remove();
-                    feedback.fadeOut(function () {
-                        feedback.removeClass('success');
-                    });
-                    if (reload === true) refreshSubmenu();
-                    if (reload === "table") {
-                        refreshTable();
-                    }
-                    if (reload === "tabs") refreshTab();
-                    if (reload === "page") location.reload();
-                    if (reload === "submenu&table") {
-                        refreshSubmenu();
-                        refreshTable();
-                    }
-                    if (form) {
-                        // Change the option to 'choose...'
-                        $(formID + " select").children('option[disabled=disabled]').attr(
-                            'selected', 'selected');
-                    }
-                });
-            }, 2000);
-        },
-        complete: function (jqXHR, textStatus) {
-            // Remove loaders and stuff, ajax request is complete!
-            $('.ajaxLoader-' + url).remove();
-            if (typeof callback === "function") {
-                callback(jqXHR);
-            }
-        }
-    });
-}
-
-getBrowsePath = function (key, path, filter_ext) {
-    var deferred = $.Deferred();
-
-    $.ajax({
-        url: 'browse_path',
-        type: 'GET',
-        data: {
-            key: key,
-            path: path,
-            filter_ext: filter_ext
-        },
-        success: function(data) {
-            deferred.resolve(data);
-        },
-        error: function() {
-            deferred.reject();
-        }
-    });
-    return deferred;
-};
-
 function doSimpleAjaxCall(url) {
-    $.ajax(url);
+	$.ajax(url);
 }
 
-function resetFilters(text) {
-    if ($(".dataTables_filter").length > 0) {
-        $(".dataTables_filter input").attr("placeholder", "filter " + text + "");
+function resetFilters(text){
+	if ( $(".dataTables_filter").length > 0 ) {
+		$(".dataTables_filter input").attr("placeholder","filter " + text + "");
+	}
+}
+
+function getPlatformImagePath(platformName) {
+
+    if (platformName.indexOf("Roku") > -1) {
+        return 'interfaces/default/images/platforms/roku.png';
+    } else if (platformName.indexOf("Apple TV") > -1) {
+        return 'interfaces/default/images/platforms/appletv.png';
+    } else if (platformName.indexOf("Firefox") > -1) {
+        return 'interfaces/default/images/platforms/firefox.png';
+    } else if (platformName.indexOf("Chromecast") > -1) {
+        return 'interfaces/default/images/platforms/chromecast.png';
+    } else if (platformName.indexOf("Chrome") > -1) {
+        return 'interfaces/default/images/platforms/chrome.png';
+    } else if (platformName.indexOf("Android") > -1) {
+        return 'interfaces/default/images/platforms/android.png';
+    } else if (platformName.indexOf("Nexus") > -1) {
+        return 'interfaces/default/images/platforms/android.png';
+    } else if (platformName.indexOf("iPad") > -1) {
+        return 'interfaces/default/images/platforms/ios.png';
+    } else if (platformName.indexOf("iPhone") > -1) {
+        return 'interfaces/default/images/platforms/ios.png';
+    } else if (platformName.indexOf("iOS") > -1) {
+        return 'interfaces/default/images/platforms/ios.png';
+    } else if (platformName.indexOf("Plex Home Theater") > -1) {
+        return 'interfaces/default/images/platforms/pht.png';
+    } else if (platformName.indexOf("Linux/RPi-XMBC") > -1) {
+        return 'interfaces/default/images/platforms/xbmc.png';
+    } else if (platformName.indexOf("Safari") > -1) {
+        return 'interfaces/default/images/platforms/safari.png';
+    } else if (platformName.indexOf("Internet Explorer") > -1) {
+        return 'interfaces/default/images/platforms/ie.png';
+    } else if (platformName.indexOf("Unknown Browser") > -1) {
+        return 'interfaces/default/images/platforms/dafault.png';
+    } else if (platformName.indexOf("Windows-XBMC") > -1) {
+        return 'interfaces/default/images/platforms/xbmc.png';
+    } else if (platformName.indexOf("Xbox") > -1) {
+        return 'interfaces/default/images/platforms/xbox.png';
+    } else if (platformName.indexOf("Samsung") > -1) {
+        return 'interfaces/default/images/platforms/samsung.png';
+    } else if (platformName.indexOf("Opera") > -1) {
+        return 'interfaces/default/images/platforms/opera.png';
+    } else if (platformName.indexOf("KODI") > -1) {
+        return 'interfaces/default/images/platforms/kodi.png';
+    } else if (platformName.indexOf("Playstation 3") > -1) {
+        return 'interfaces/default/images/platforms/playstation.png';
+    } else if (platformName.indexOf("Playstation 4") > -1) {
+        return 'interfaces/default/images/platforms/playstation.png';
+    } else if (platformName.indexOf("Xbox 360") > -1) {
+        return 'interfaces/default/images/platforms/xbox.png';
+    } else if (platformName.indexOf("Windows") > -1) {
+        return 'interfaces/default/images/platforms/win8.png';
+    } else if (platformName.indexOf("Windows phone") > -1) {
+        return 'interfaces/default/images/platforms/wp.png';
+    } else {
+        return 'interfaces/default/images/platforms/default.png';
     }
 }
 
 function isPrivateIP(ip_address) {
-    var defer = $.Deferred();
-
-    if (ipaddr.isValid(ip_address)) {
-        var addr = ipaddr.process(ip_address);
-        if (addr.range() === 'loopback' || addr.range() === 'private' || addr.range() === 'linkLocal') {
-            defer.resolve();
-        } else {
-            defer.reject();
+    if (ip_address.indexOf(".") > -1) {
+        var parts = ip_address.split('.');
+        if (parts[0] === '10' ||
+            (parts[0] === '172' && (parseInt(parts[1], 10) >= 16 && parseInt(parts[1], 10) <= 31)) ||
+            (parts[0] === '192' && parts[1] === '168')) {
+            return true;
         }
+        return false;
     } else {
-        defer.resolve('n/a');
+        return true;
     }
-
-    return defer.promise();
 }
 
 function humanTime(seconds) {
-    if (seconds > 0) {
-        return humanDuration(seconds * 1000).replaceAll(/(\d+) (\w+)/g, '<h3>$1</h3><p>$2</p>')
+    if (seconds >= 86400) {
+        text = '<h3>' + Math.floor(moment.duration(seconds, 'seconds').asDays()) +
+                '</h3><p> days </p><h3>' +  Math.floor(moment.duration((seconds % 86400), 'seconds').asHours()) +
+                '</h3><p> hrs</p><h3>'  +  Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + '</h3><p> mins</p>';
+        return text;
+    } else if (seconds >= 3600) {
+        text = '<h3>' + Math.floor(moment.duration((seconds % 86400), 'seconds').asHours()) +
+                '</h3><p>hrs</p><h3>' +  Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + '</h3><p> mins</p>';
+        return text;
+    } else if (seconds >= 60) {
+        text = '<h3>' + Math.floor(moment.duration(((seconds % 86400) % 3600), 'seconds').asMinutes()) + '</h3><p> mins</p>';
+        return text;
+    } else {
+        text = '<h3>0</h3><p> mins</p>';
+        return text;
     }
-    return "<h3>0</h3><p>mins</p>";
 }
 
 String.prototype.toProperCase = function () {
-    return this.replace(/\w\S*/g, function (txt) {
-        return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
-    });
+    return this.replace(/\w\S*/g, function(txt){return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();});
 };
 
-function getPercent(value1, value2) {
-    value1 = parseFloat(value1) | 0
-    value2 = parseFloat(value2) | 0
-
-    var percent = 0;
-    if (value1 !== 0 && value2 !== 0) {
-        percent = (value1 / value2) * 100
-    }
-
-    return Math.round(percent)
-}
-
 function millisecondsToMinutes(ms, roundToMinute) {
-    if (ms > 0) {
-      var minutes = Math.floor(ms / 60000);
-      var seconds = ((ms % 60000) / 1000).toFixed(0);
-      if (roundToMinute) {
-          return (seconds >= 30 ? (minutes + 1) : minutes);
-      } else {
-          return (seconds == 60 ? (minutes + 1) + ":00" : minutes + ":" + (seconds < 10 ? "0" : "") + seconds);
-      }
-    } else {
-        if (roundToMinute) {
-            return '0';
-        } else {
-            return '0:00';
-        }
-    }
-}
 
-function humanDuration(ms, sig='dhm', units='ms', return_seconds=300000) {
-    var factors = {
-        d: 86400000,
-        h: 3600000,
-        m: 60000,
-        s: 1000,
-        ms: 1
-    }
+	if (ms > 0) {
+		seconds = ms / 1000;
+		minutes = seconds / 60;
 
-    ms = parseInt(ms);
-    var d, h, m, s;
-
-    if (ms > 0) {
-        if (return_seconds && ms < return_seconds) {
-            sig = 'dhms'
-        }
-
-        r = factors[sig.slice(-1)];
-        ms = Math.round(ms * factors[units] / r) * r;
-
-        h =  ms % factors['d'];
-        d = Math.trunc(ms / factors['d']);
-
-        m = h % factors['h'];
-        h = Math.trunc(h / factors['h']);
-
-        s = m % factors['m'];
-        m = Math.trunc(m / factors['m']);
-
-        ms = s % factors['s'];
-        s = Math.trunc(s / factors['s']);
-
-        var hd_list = [];
-        if (sig >= 'd' && d > 0) {
-            d = (sig === 'd' && h >= 12) ? d + 1 : d;
-            hd_list.push(d.toString() + ' day' + ((d > 1) ? 's' : ''));
-        }
-        if (sig >= 'dh' && h > 0) {
-            h = (sig === 'dh' && m >= 30) ? h + 1 : h;
-            hd_list.push(h.toString() + ' hr' + ((h > 1) ? 's' : ''));
-        }
-        if (sig >= 'dhm' && m > 0) {
-            m = (sig === 'dhm' && s >= 30) ? m + 1 : m;
-            hd_list.push(m.toString() + ' min' + ((m > 1) ? 's' : ''));
-        }
-        if (sig >= 'dhms' && s > 0) {
-            hd_list.push(s.toString() + ' sec' + ((s > 1) ? 's' : ''));
-        }
-
-        return hd_list.join(' ')
-    } else {
-        return '0'
-    }
+		if (roundToMinute) {
+			output = Math.round(minutes, 0)
+		} else {
+			minutesFloor = Math.floor(minutes);
+			secondsReal = Math.round((seconds - (minutesFloor * 60)),0);
+			if (secondsReal < 10) {
+				secondsReal = '0' + secondsReal;
+			}
+			output = minutesFloor + ':' + secondsReal;
+		}
+		return output;
+	} else {
+		if (roundToMinute) {
+			return '0';
+		} else {
+			return '0:00';
+		}
+	}
 }
 
 // Our countdown plugin takes a callback, a duration, and an optional message
@@ -397,570 +303,64 @@ $.fn.countdown = function (callback, duration, message) {
         if (--duration) {
             // Update our container's message
             container.html(duration + message);
-            // Otherwise
+        // Otherwise
         } else {
             // Clear the countdown interval
             clearInterval(countdown);
             // And fire the callback passing our container as `this`
             callback.call(container);
         }
-        // Run interval every 1000ms (1 second)
+    // Run interval every 1000ms (1 second)
     }, 1000);
+
 };
 
 function setCookie(cname, cvalue, exdays) {
     var d = new Date();
-    d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
-    var expires = "expires=" + d.toUTCString();
+    d.setTime(d.getTime() + (exdays*24*60*60*1000));
+    var expires = "expires="+d.toUTCString();
     document.cookie = cname + "=" + cvalue + "; " + expires;
 }
 
 function getCookie(cname) {
     var name = cname + "=";
     var ca = document.cookie.split(';');
-    for (var i = 0; i < ca.length; i++) {
+    for(var i=0; i<ca.length; i++) {
         var c = ca[i];
-        while (c.charAt(0) == ' ') c = c.substring(1);
-        if (c.indexOf(name) === 0) return c.substring(name.length, c.length);
+        while (c.charAt(0)==' ') c = c.substring(1);
+        if (c.indexOf(name) == 0) return c.substring(name.length,c.length);
     }
     return "";
 }
-var Accordion = function (el, multiple, close) {
-    this.el = el || {};
-    this.multiple = multiple || false;
-    this.close = (close === undefined) ? true : close;
-    // Variables privadas
-    var links = this.el.find('.link');
-    // Evento
-    links.on('click', {
-        el: this.el,
-        multiple: this.multiple,
-        close: this.close
-    }, this.dropdown);
-};
-Accordion.prototype.dropdown = function (e) {
-    var $el = e.data.el;
-    $this = $(this);
-    $next = $this.next();
-    if (!e.data.close && $this.parent().hasClass('open')) {
-        return
-    }
-    $next.slideToggle();
-    $this.parent().toggleClass('open');
-    if (!e.data.multiple) {
-        $el.find('.submenu').not($next).slideUp().parent().removeClass('open');
-    }
-};
+
+var Accordion = function(el, multiple) {
+	this.el = el || {};
+	this.multiple = multiple || false;
+
+	// Variables privadas
+	var links = this.el.find('.link');
+	// Evento
+	links.on('click', {el: this.el, multiple: this.multiple}, this.dropdown)
+}
+
+Accordion.prototype.dropdown = function(e) {
+	var $el = e.data.el;
+		$this = $(this),
+		$next = $this.next();
+
+	$next.slideToggle();
+	$this.parent().toggleClass('open');
+
+	if (!e.data.multiple) {
+		$el.find('.submenu').not($next).slideUp().parent().removeClass('open');
+	};
+}
 
 function clearSearchButton(tableName, table) {
-    $('#' + tableName + '_filter').find('input[type=search]').wrap(
-        '<div class="input-group" role="group" aria-label="Search"></div>').after(
-        '<span class="input-group-btn"><button class="btn btn-form" data-toggle="button" aria-pressed="false" autocomplete="off" id="clear-search-' +
-        tableName + '"><i class="fa fa-remove"></i></button></span>');
-    $('#clear-search-' + tableName).click(function () {
+    $('#' + tableName + '_filter').find('input[type=search]')
+     .wrap('<div class="input-group" role="group" aria-label="Search"></div>')
+     .after('<span class="input-group-btn"><button class="btn btn-form" data-toggle="button" aria-pressed="false" autocomplete="off" id="clear-search-' + tableName + '"><i class="fa fa-remove"></i></button></span>')
+    $('#clear-search-' + tableName).click(function() {
         table.search('').draw();
     });
 }
-// Taken from https://github.com/Hellowlol/HTPC-Manager
-window.onerror = function (message, file, line) {
-    var e = {
-        'page': window.location.href,
-        'message': message,
-        'file': file,
-        'line': line
-    };
-    $.post("log_js_errors", e, function (data) { });
-};
-
-$('*').on('click', '.refresh_pms_image', function (e) {
-    e.preventDefault();
-    e.stopPropagation();
-
-    var background_div = $(this).parent().siblings(['style*=pms_image_proxy']).first();
-    var pms_proxy_url = background_div.css('background-image');
-    pms_proxy_url = /^url\((['"]?)(.*)\1\)$/.exec(pms_proxy_url);
-    pms_proxy_url = pms_proxy_url ? pms_proxy_url[2] : ""; // If matched, retrieve url, otherwise ""
-
-    if (pms_proxy_url.indexOf('pms_image_proxy') === -1) {
-        console.log('PMS image proxy url not found.');
-    } else {
-        background_div.css('background-image', 'none')
-        $.ajax({
-            url: pms_proxy_url,
-            headers: {
-                'Cache-Control': 'no-cache'
-            },
-            success: function () {
-                background_div.css('background-image', 'url(' + pms_proxy_url + ')');
-            }
-        });
-    }
-});
-
-// Taken from http://stackoverflow.com/questions/10420352/converting-file-size-in-bytes-to-human-readable#answer-14919494
-function humanFileSize(bytes, si = true) {
-    //var thresh = si ? 1000 : 1024;
-    var thresh = 1024;  // Always divide by 2^10 but display SI units
-    if (Math.abs(bytes) < thresh) {
-        return bytes + ' B';
-    }
-    var units = si ? ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']
-        : ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
-    var u = -1;
-    do {
-        bytes /= thresh;
-        ++u;
-    } while (Math.abs(bytes) >= thresh && u < units.length - 1);
-    return bytes.toFixed(1) + '&nbsp;' + units[u];
-}
-
-// Force max/min in number inputs
-function forceMinMax(elem) {
-    var min = parseInt(elem.attr('min'));
-    var max = parseInt(elem.attr('max'));
-    var val = parseInt(elem.val());
-    var default_val = parseInt(elem.data('default'));
-    if (isNaN(val)) {
-        elem.val(default_val);
-    }
-    else if (min !== undefined && val < min) {
-        elem.val(min);
-    }
-    else if (max !== undefined && val > max) {
-        elem.val(max);
-    }
-    else {
-        elem.val(val);
-    }
-}
-
-function capitalizeFirstLetter(string) {
-    return string.charAt(0).toUpperCase() + string.slice(1);
-}
-
-$.fn.slideToggleBool = function(bool, options) {
-  return bool ? $(this).slideDown(options) : $(this).slideUp(options);
-};
-
-function openPlexXML(endpoint, plextv, params) {
-    var data = $.extend({endpoint: endpoint, plextv: plextv || false}, params);
-    var query = new URLSearchParams(data)
-    window.open('open_plex_xml?' + query.toString(), '_blank');
-}
-
-function PopupCenter(url, title, w, h) {
-    // Fixes dual-screen position                         Most browsers      Firefox
-    var dualScreenLeft = window.screenLeft != undefined ? window.screenLeft : window.screenX;
-    var dualScreenTop = window.screenTop != undefined ? window.screenTop : window.screenY;
-
-    var width = window.innerWidth ? window.innerWidth : document.documentElement.clientWidth ? document.documentElement.clientWidth : screen.width;
-    var height = window.innerHeight ? window.innerHeight : document.documentElement.clientHeight ? document.documentElement.clientHeight : screen.height;
-
-    var left = ((width / 2) - (w / 2)) + dualScreenLeft;
-    var top = ((height / 2) - (h / 2)) + dualScreenTop;
-    var newWindow = window.open(url, title, 'scrollbars=yes, width=' + w + ', height=' + h + ', top=' + top + ', left=' + left);
-
-    // Puts focus on the newWindow
-    if (window.focus) {
-        newWindow.focus();
-    }
-
-    return newWindow;
-}
-
-
-function setLocalStorage(key, value, path) {
-    var key_path = key;
-    if (path !== false) {
-        key_path = key_path + '_' + window.location.pathname;
-    }
-    localStorage.setItem(key_path, value);
-}
-function getLocalStorage(key, default_value, path) {
-    var key_path = key;
-    if (path !== false) {
-        key_path = key_path + '_' + window.location.pathname;
-    }
-    var value = localStorage.getItem(key_path);
-    if (value !== null) {
-        return value
-    } else if (default_value !== undefined) {
-        setLocalStorage(key, default_value, path);
-        return default_value
-    }
-}
-
-function uuidv4() {
-    return ([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g, function(c) {
-        var cryptoObj = window.crypto || window.msCrypto; // for IE 11
-        return (c ^ cryptoObj.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
-    });
-}
-
-function getPlexHeaders(clientID) {
-    return {
-        'Accept': 'application/json',
-        'X-Plex-Product': 'Tautulli',
-        'X-Plex-Version': 'Plex OAuth',
-        'X-Plex-Client-Identifier': clientID ? clientID : getLocalStorage('Tautulli_ClientID', uuidv4(), false),
-        'X-Plex-Platform': p.name,
-        'X-Plex-Platform-Version': p.version,
-        'X-Plex-Model': 'Plex OAuth',
-        'X-Plex-Device': p.os,
-        'X-Plex-Device-Name': p.name + ' (Tautulli)',
-        'X-Plex-Device-Screen-Resolution': window.screen.width + 'x' + window.screen.height,
-        'X-Plex-Language': 'en'
-    };
-}
-
-var plex_oauth_window = null;
-const plex_oauth_loader = '<style>' +
-        '.login-loader-container {' +
-            'font-family: "Open Sans", Arial, sans-serif;' +
-            'position: absolute;' +
-            'top: 0;' +
-            'right: 0;' +
-            'bottom: 0;' +
-            'left: 0;' +
-        '}' +
-        '.login-loader-message {' +
-            'color: #282A2D;' +
-            'text-align: center;' +
-            'position: absolute;' +
-            'left: 50%;' +
-            'top: 25%;' +
-            'transform: translate(-50%, -50%);' +
-        '}' +
-        '.login-loader {' +
-            'border: 5px solid #ccc;' +
-            '-webkit-animation: spin 1s linear infinite;' +
-            'animation: spin 1s linear infinite;' +
-            'border-top: 5px solid #282A2D;' +
-            'border-radius: 50%;' +
-            'width: 50px;' +
-            'height: 50px;' +
-            'position: relative;' +
-            'left: calc(50% - 25px);' +
-        '}' +
-        '@keyframes spin {' +
-            '0% { transform: rotate(0deg); }' +
-            '100% { transform: rotate(360deg); }' +
-        '}' +
-    '</style>' +
-    '<div class="login-loader-container">' +
-        '<div class="login-loader-message">' +
-            '<div class="login-loader"></div>' +
-            '<br>' +
-            'Redirecting to the Plex login page...' +
-        '</div>' +
-    '</div>';
-
-function closePlexOAuthWindow() {
-    if (plex_oauth_window) {
-        plex_oauth_window.close();
-    }
-}
-
-getPlexOAuthPin = function (clientID) {
-    var x_plex_headers = getPlexHeaders(clientID);
-    var deferred = $.Deferred();
-
-    $.ajax({
-        url: 'https://plex.tv/api/v2/pins?strong=true',
-        type: 'POST',
-        headers: x_plex_headers,
-        success: function(data) {
-            deferred.resolve({pin: data.id, code: data.code});
-        },
-        error: function() {
-            closePlexOAuthWindow();
-            deferred.reject();
-        }
-    });
-    return deferred;
-};
-
-var polling = null;
-
-function PlexOAuth(success, error, pre, clientID) {
-    if (typeof pre === "function") {
-        pre()
-    }
-    closePlexOAuthWindow();
-    plex_oauth_window = PopupCenter('', 'Plex-OAuth', 600, 700);
-    $(plex_oauth_window.document.body).html(plex_oauth_loader);
-
-    getPlexOAuthPin(clientID).then(function (data) {
-        var x_plex_headers = getPlexHeaders(clientID);
-        const pin = data.pin;
-        const code = data.code;
-
-        var oauth_params = {
-            'clientID': x_plex_headers['X-Plex-Client-Identifier'],
-            'context[device][product]': x_plex_headers['X-Plex-Product'],
-            'context[device][version]': x_plex_headers['X-Plex-Version'],
-            'context[device][platform]': x_plex_headers['X-Plex-Platform'],
-            'context[device][platformVersion]': x_plex_headers['X-Plex-Platform-Version'],
-            'context[device][device]': x_plex_headers['X-Plex-Device'],
-            'context[device][deviceName]': x_plex_headers['X-Plex-Device-Name'],
-            'context[device][model]': x_plex_headers['X-Plex-Model'],
-            'context[device][screenResolution]': x_plex_headers['X-Plex-Device-Screen-Resolution'],
-            'context[device][layout]': 'desktop',
-            'code': code
-        }
-
-        plex_oauth_window.location = 'https://app.plex.tv/auth/#!?' + encodeData(oauth_params);
-        polling = pin;
-
-        (function poll() {
-            $.ajax({
-                url: 'https://plex.tv/api/v2/pins/' + pin,
-                type: 'GET',
-                headers: x_plex_headers,
-                success: function (data) {
-                    if (data.authToken){
-                        closePlexOAuthWindow();
-                        if (typeof success === "function") {
-                            success(data.authToken)
-                        }
-                    }
-                },
-                error: function (jqXHR, textStatus, errorThrown) {
-                    if (textStatus !== "timeout") {
-                        closePlexOAuthWindow();
-                        if (typeof error === "function") {
-                            error()
-                        }
-                    }
-                },
-                complete: function () {
-                    if (!plex_oauth_window.closed && polling === pin){
-                        setTimeout(function() {poll()}, 1000);
-                    }
-                },
-                timeout: 10000
-            });
-        })();
-    }, function () {
-        closePlexOAuthWindow();
-        if (typeof error === "function") {
-            error()
-        }
-    });
-}
-
-function encodeData(data) {
-    return Object.keys(data).map(function(key) {
-        return [key, data[key]].map(encodeURIComponent).join("=");
-    }).join("&");
-}
-
-function page(endpoint, ...args) {
-    let endpoints = {
-        'pms_image_proxy': pms_image_proxy,
-        'info': info_page,
-        'library': library_page,
-        'user': user_page
-    };
-
-    var params = {};
-
-    if (endpoint in endpoints) {
-        params = endpoints[endpoint](...args);
-    }
-
-    return endpoint + '?' + $.param(params).replace(/'/g, '%27');
-}
-
-function pms_image_proxy(img, rating_key, width, height, opacity, background, blur, fallback, refresh, clip, img_format) {
-    var params = {};
-
-    if (img != null) { params.img = img; }
-    if (rating_key != null) { params.rating_key = rating_key; }
-    if (width != null) { params.width = width; }
-    if (height != null) { params.height = height; }
-    if (opacity != null) { params.opacity = opacity; }
-    if (background != null) { params.background = background; }
-    if (blur != null) { params.blur = blur; }
-    if (fallback != null) { params.fallback = fallback; }
-    if (refresh != null) { params.refresh = true; }
-    if (clip != null) { params.clip = true; }
-    if (img_format != null) { params.img_format = img_format; }
-
-    return params;
-}
-
-function info_page(rating_key, guid, history, live) {
-    var params = {};
-
-    if (live && history) {
-        params.guid = guid;
-    } else {
-        params.rating_key = rating_key;
-    }
-
-    if (history) { params.source = 'history'; }
-
-    return params;
-}
-
-function library_page(section_id) {
-    var params = {};
-
-    if (section_id != null) { params.section_id = section_id; }
-
-    return params;
-}
-
-function user_page(user_id, user) {
-    var params = {};
-
-    if (user_id != null) { params.user_id = user_id; }
-    if (user != null) { params.user = user; }
-
-    return params;
-}
-
-MEDIA_TYPE_HEADERS = {
-    'movie': 'Movies',
-    'show': 'TV Shows',
-    'season': 'Seasons',
-    'episode': 'Episodes',
-    'artist': 'Artists',
-    'album': 'Albums',
-    'track': 'Tracks',
-    'video': 'Videos',
-    'audio': 'Tracks',
-    'photo': 'Photos'
-}
-
-function short_season(title) {
-    if (title.startsWith('Season ') && /^\d+$/.test(title.substring(7))) {
-        return 'S' + title.substring(7)
-    }
-    return title
-}
-
-function loadAllBlurHash() {
-    $('[data-blurhash]').each(function() {
-        const elem = $(this);
-        const src = elem.data('blurhash');
-        loadBlurHash(elem, src);
-    });
-}
-
-function loadBlurHash(elem, src) {
-    const img = new Image();
-    img.src = src;
-    img.onload = () => {
-        const imgData = blurhash.getImageData(img);
-
-        blurhash
-            .encodePromise(imgData, img.width, img.height, 4, 4)
-            .then(hash => {
-                return blurhash.decodePromise(
-                    hash,
-                    img.width,
-                    img.height
-                );
-            })
-            .then(blurhashImgData => {
-                const imgObject = blurhash.getImageDataAsImage(
-                    blurhashImgData,
-                    img.width,
-                    img.height,
-                    (event, imgObject) => {
-                        elem.css('background-image', 'url(' + imgObject.src + ')')
-                    }
-                );
-            });
-    }
-}
-
-function _toggleRevealToken(elem, click) {
-    var input = elem.parent().siblings('input');
-    if ((input.prop('type') === 'password' && click) || !input.val()) {
-        input.prop('type', 'text');
-        elem.children('.fa').removeClass('fa-eye-slash').addClass('fa-eye');
-    } else {
-        input.prop('type', 'password');
-        elem.children('.fa').removeClass('fa-eye').addClass('fa-eye-slash');
-    }
-}
-function toggleRevealTokens() {
-    $('.reveal-token').each(function () {
-        _toggleRevealToken($(this));
-    });
-}
-
-$('body').on('click', '.reveal-token', function() {
-    _toggleRevealToken($(this), true);
-});
-
-// https://stackoverflow.com/a/57414592
-// prevent modal close when click starts in modal and ends on backdrop
-$(document).on('mousedown', '.modal', function(e){
-    window.clickStartedInModal = $(e.target).is('.modal-dialog *');
-});
-$(document).on('mouseup', '.modal', function(e){
-    if(!$(e.target).is('.modal-dialog *') && window.clickStartedInModal) {
-        window.preventModalClose = true;
-    }
-});
-$('.modal').on('hide.bs.modal', function (e) {
-    if(window.preventModalClose){
-        window.preventModalClose = false;
-        return false;
-    }
-});
-
-$.fn.hasScrollBar = function() {
-    return this.get(0).scrollHeight > this.get(0).clientHeight;
-}
-
-function paginateScroller(scrollerId, buttonClass) {
-    $(buttonClass).click(function (e) {
-        e.preventDefault();
-        var scroller = $(scrollerId + "-row-scroller");
-        var scrollerParent = scroller.parent();
-        var containerWidth = scrollerParent.width();
-        var scrollCurrent = scrollerParent.scrollLeft();
-        var scrollAmount = $(this).data("id") * parseInt(containerWidth / 175) * 175;
-        var scrollMax = scroller.width() - Math.abs(scrollAmount);
-        var scrollTotal = Math.min(parseInt(scrollCurrent / 175) * 175 + scrollAmount, scrollMax);
-        scrollerParent.animate({ scrollLeft: scrollTotal }, 250);
-    });    
-}
-
-function highlightScrollerButton(scrollerId) {
-    var scroller = $(scrollerId + "-row-scroller");
-    var scrollerParent = scroller.parent();
-    var buttonLeft = $(scrollerId + "-page-left");
-    var buttonRight = $(scrollerId + "-page-right");
-
-    var numElems = scroller.find("li").length;
-    scroller.width(numElems * 175);
-    $(buttonLeft).addClass("disabled").blur();
-    if (scroller.width() > scrollerParent.width()) {
-        $(buttonRight).removeClass("disabled");
-    } else {
-        $(buttonRight).addClass("disabled");
-    }
-
-    scrollerParent.scroll(function () {
-        var scrollCurrent = $(this).scrollLeft();
-        var scrollMax = scroller.width() - $(this).width();
-
-        if (scrollCurrent == 0) {
-            $(buttonLeft).addClass("disabled").blur();
-        } else {
-            $(buttonLeft).removeClass("disabled");
-        }
-
-        if (scrollCurrent >= scrollMax) {
-            $(buttonRight).addClass("disabled").blur();
-        } else {
-            $(buttonRight).removeClass("disabled");
-        }
-    });
-}
diff --git a/data/interfaces/default/js/selectize.plugin.disable-options.js b/data/interfaces/default/js/selectize.plugin.disable-options.js
deleted file mode 100644
index 0a5ed8fc..00000000
--- a/data/interfaces/default/js/selectize.plugin.disable-options.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * Plugin: "disable_options" (selectize.js)
- * Copyright (c) 2013 Mondo Robot & contributors
- *
- * 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.
- *
- * @authors Jake Myers <jmyers0022@gmail.com>, Vaughn Draughon <vaughn@rocksolidwebdesign.com>
- */
-
- Selectize.define('disable_options', function(options) {
-  var self = this;
-
-  options = $.extend({
-	'disableField': '',
-    'disableOptions': []
-  }, options);
-
-  self.refreshOptions = (function() {
-    var original = self.refreshOptions;
-
-    return function() {
-      original.apply(this, arguments);
-
-      $.each(options.disableOptions, function(index, option) {
-        self.$dropdown_content.find('[data-' + options.disableField + '="' + String(option) + '"]').addClass('option-disabled');
-      });
-    };
-  })();
-
-  self.onOptionSelect = (function() {
-    var original = self.onOptionSelect;
-
-    return function(e) {
-      var value, $target, $option;
-
-      if (e.preventDefault) {
-        e.preventDefault();
-        e.stopPropagation();
-      }
-
-      $target = $(e.currentTarget);
-
-      if ($target.hasClass('option-disabled')) {
-        return;
-      }
-      return original.apply(this, arguments);
-    };
-  })();
-
-  self.disabledOptions = function() {
-    return options.disableOptions;
-  }
-
-  self.setDisabledOptions = function( values ) {
-    options.disableOptions = values
-  }
-
-  self.disableOptions = function( values ) {
-    if ( ! ( values instanceof Array ) ) {
-      values = [ values ]
-    }
-    values.forEach( function( val ) {
-      if ( options.disableOptions.indexOf( val ) == -1 ) {
-        options.disableOptions.push( val )
-      }
-    } );
-  }
-
-  self.enableOptions = function( values ) {
-    if ( ! ( values instanceof Array ) ) {
-      values = [ values ]
-    }
-    values.forEach( function( val ) {
-      var remove = options.disableOptions.indexOf( val );
-      if ( remove + 1 ) {
-        options.disableOptions.splice( remove, 1 );
-      }
-    } );
-  }
-});
\ No newline at end of file
diff --git a/data/interfaces/default/js/tables/collections_table.js b/data/interfaces/default/js/tables/collections_table.js
deleted file mode 100644
index 91eb68ab..00000000
--- a/data/interfaces/default/js/tables/collections_table.js
+++ /dev/null
@@ -1,130 +0,0 @@
-collections_table_options = {
-    "destroy": true,
-    "language": {
-        "search": "Search: ",
-        "lengthMenu": "Show _MENU_ entries per page",
-        "info": "Showing _START_ to _END_ of _TOTAL_ collections",
-        "infoEmpty": "Showing 0 to 0 of 0 entries",
-        "infoFiltered": "<span class='hidden-md hidden-sm hidden-xs'>(filtered from _MAX_ total entries)</span>",
-        "emptyTable": "No data in table",
-        "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
-    },
-    "pagingType": "full_numbers",
-    "stateSave": true,
-    "stateSaveParams": function (settings, data) {
-        data.search.search = "";
-        data.start = 0;
-    },
-    "stateDuration": 0,
-    "processing": false,
-    "serverSide": true,
-    "pageLength": 25,
-    "order": [0, 'asc'],
-    "autoWidth": false,
-    "scrollX": true,
-    "columnDefs": [
-        {
-            "targets": [0],
-            "data": "titleSort",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    var smart = '<i class="fa fa-blank fa-fw"></i>';
-                    if (rowData['smart']) {
-                        smart = '<span class="media-type-tooltip" data-toggle="tooltip" title="Smart Collection"><i class="fa fa-cog fa-fw"></i></span>&nbsp;'
-                    }
-                    console.log(rowData['subtype'])
-                    if (rowData['subtype'] === 'artist' || rowData['subtype'] === 'album' || rowData['subtype'] === 'track') {
-                        var thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['ratingKey'], 300, 300, null, null, null, 'cover') + '" data-height="80" data-width="80">' + rowData['title'] + '</span>';
-                    } else {
-                        var thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['ratingKey'], 300, 450, null, null, null, 'poster') + '" data-height="120" data-width="80">' + rowData['title'] + '</span>';
-                    }
-                    $(td).html(smart + '<a href="' + page('info', rowData['ratingKey']) + '">' + thumb_popover + '</a>');
-                }
-            },
-            "width": "50%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [1],
-            "data": "collectionMode",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    var mode = '';
-                    if (cellData === -1) {
-                        mode = 'Library default';
-                    } else if (cellData === 0) {
-                        mode = 'Hide collection';
-                    } else if (cellData === 1) {
-                        mode = 'Hide items in this collection';
-                    } else if (cellData === 2) {
-                        mode = 'Show this collection and its items';
-                    }
-                    $(td).html(mode);
-                }
-            },
-            "width": "20%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [2],
-            "data": "collectionSort",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    var sort = '';
-                    if (cellData === 0) {
-                        sort = 'Release date';
-                    } else if (cellData === 1) {
-                        sort = 'Alphabetical';
-                    }
-                    $(td).html(sort);
-                }
-            },
-            "width": "20%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [3],
-            "data": "childCount",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    var type = MEDIA_TYPE_HEADERS[rowData['subtype']] || '';
-                    if (rowData['childCount'] == 1) {
-                        type = type.slice(0, -1);
-                    }
-                    $(td).html(cellData + ' ' + type);
-                }
-            },
-            "width": "10%",
-            "className": "no-wrap"
-        }
-    ],
-    "drawCallback": function (settings) {
-        // Jump to top of page
-        //$('html,body').scrollTop(0);
-        $('#ajaxMsg').fadeOut();
-
-        // Create the tooltips.
-        $('body').tooltip({
-            selector: '[data-toggle="tooltip"]',
-            container: 'body'
-        });
-        $('body').popover({
-            selector: '[data-toggle="popover"]',
-            html: true,
-            sanitize: false,
-            container: 'body',
-            trigger: 'hover',
-            placement: 'right',
-            template: '<div class="popover history-thumbnail-popover" role="tooltip"><div class="arrow" style="top: 50%;"></div><div class="popover-content"></div></div>',
-            content: function () {
-                return '<div class="history-thumbnail" style="background-image: url(' + $(this).data('img') + '); height: ' + $(this).data('height') + 'px; width: ' + $(this).data('width') + 'px;" />';
-            }
-        });
-    },
-    "preDrawCallback": function(settings) {
-        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbsp; Fetching rows...";
-        showMsg(msg, false, false, 0);
-    },
-    "rowCallback": function (row, rowData, rowIndex) {
-    }
-};
\ No newline at end of file
diff --git a/data/interfaces/default/js/tables/export_table.js b/data/interfaces/default/js/tables/export_table.js
deleted file mode 100644
index c0f6cf2f..00000000
--- a/data/interfaces/default/js/tables/export_table.js
+++ /dev/null
@@ -1,255 +0,0 @@
-var date_format = 'YYYY-MM-DD';
-var time_format = 'hh:mm a';
-
-$.ajax({
-    url: 'get_date_formats',
-    type: 'GET',
-    success: function (data) {
-        date_format = data.date_format;
-        time_format = data.time_format;
-    }
-});
-
-export_table_options = {
-    "destroy": true,
-    "language": {
-        "search": "Search: ",
-        "lengthMenu": "Show _MENU_ entries per page",
-        "info": "Showing _START_ to _END_ of _TOTAL_ export items",
-        "infoEmpty": "Showing 0 to 0 of 0 entries",
-        "infoFiltered": "<span class='hidden-md hidden-sm hidden-xs'>(filtered from _MAX_ total entries)</span>",
-        "emptyTable": "No data in table",
-        "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
-    },
-    "pagingType": "full_numbers",
-    "stateSave": true,
-    "stateSaveParams": function (settings, data) {
-        data.search.search = "";
-        data.start = 0;
-    },
-    "stateDuration": 0,
-    "processing": false,
-    "serverSide": true,
-    "pageLength": 25,
-    "order": [0, 'desc'],
-    "autoWidth": false,
-    "scrollX": true,
-    "columnDefs": [
-        {
-            "targets": [0],
-            "data": "timestamp",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    $(td).html(moment(cellData, "X").format(date_format + ' ' + time_format));
-                }
-            },
-            "width": "8%",
-            "className": "no-wrap",
-            "searchable": false
-        },
-        {
-            "targets": [1],
-            "data": "media_type_title",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "width": "7%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [2],
-            "data": "rating_key",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null) {
-                    $(td).html('<a href="' + page('info', rowData['rating_key']) + '">' + cellData + '</a>');
-                }
-            },
-            "width": "6%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [3],
-            "data": "title",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    var tooltip;
-                    var filename;
-                    if (!rowData['individual_files']) {
-                        tooltip = '<span data-toggle="tooltip" title="Single File"><i class="fa fa-file-alt fa-fw"></i></span>';
-                        filename = cellData + '.' + rowData['file_format']
-                    } else {
-                        tooltip = '<span data-toggle="tooltip" title="Multiple Files"><i class="fa fa-folder fa-fw"></i></span>';
-                        filename = cellData
-                    }
-
-                    if (rowData['complete'] === 1 && rowData['exists'] && !rowData['individual_files']) {
-                        $(td).html('<a href="view_export?export_id=' + rowData['export_id'] + '" target="_blank">' + tooltip + '&nbsp;' + filename + '</a>');
-                    } else {
-                        $(td).html(tooltip + '&nbsp;' + filename);
-                    }
-                }
-            },
-            "width": "40%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [4],
-            "data": "file_format",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    var images = '';
-                    if (rowData['thumb_level'] || rowData['art_level'] || rowData['logo_level']) {
-                        images = ' + images';
-                    }
-                    $(td).html(cellData + images);
-                }
-            },
-            "width": "7%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [5],
-            "data": "metadata_level",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null) {
-                    $(td).html(cellData);
-                }
-            },
-            "width": "6%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [6],
-            "data": "media_info_level",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null) {
-                    $(td).html(cellData);
-                }
-            },
-            "width": "6%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [7],
-            "data": "custom_fields",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    $(td).html(cellData.replace(/,/g, ', '));
-                }
-            },
-            "width": "6%",
-            "className": "datatable-wrap"
-        },
-        {
-            "targets": [8],
-            "data": "file_size",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '' && cellData !== null) {
-                    $(td).html(humanFileSize(cellData));
-                }
-            },
-            "width": "6%",
-            "className": "no-wrap",
-            "searchable": false
-        },
-        {
-            "targets": [9],
-            "data": "complete",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData === 1 && rowData['exists']) {
-                    var tooltip_title = '';
-                    var icon = '';
-                    if (rowData['thumb_level'] || rowData['art_level'] || rowData['logo_level'] || rowData['individual_files']) {
-                        tooltip_title = 'ZIP Archive';
-                        icon = 'fa-file-archive';
-                    } else {
-                        tooltip_title = rowData['file_format'].toUpperCase() + ' File';
-                        icon = 'fa-file-download';
-                    }
-                    var icon = (rowData['thumb_level'] || rowData['art_level'] || rowData['logo_level'] || rowData['individual_files']) ? 'fa-file-archive' : 'fa-file-download';
-                    $(td).html('<button class="btn btn-xs btn-success pull-left" data-id="' + rowData['export_id'] + '"><span data-toggle="tooltip" data-placement="left"  title="' + tooltip_title + '"><i class="fa ' + icon + ' fa-fw"></i> Download</span></button>');
-                } else if (cellData === 0) {
-                    var percent = Math.min(getPercent(rowData['exported_items'], rowData['total_items']), 99)
-                    $(td).html('<span class="btn btn-xs btn-dark pull-left export-processing" data-id="' + rowData['export_id'] + '" disabled><i class="fa fa-spinner fa-spin fa-fw"></i> ' + percent + '%</span>');
-                } else if (cellData === -1) {
-                    $(td).html('<span class="btn btn-xs btn-dark pull-left" data-id="' + rowData['export_id'] + '" disabled><i class="fa fa-exclamation-circle fa-fw"></i> Failed</span>');
-                } else {
-                    $(td).html('<span class="btn btn-xs btn-dark pull-left" data-id="' + rowData['export_id'] + '" disabled><i class="fa fa-question-circle fa-fw"></i> Not Found</span>');
-                }
-            },
-            "width": "7%",
-            "className": "export_download",
-            "searchable": false
-        },
-        {
-            "targets": [10],
-            "data": null,
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (rowData['complete'] !== 0) {
-                    $(td).html('<button class="btn btn-xs btn-danger pull-left" data-id="' + rowData['export_id'] + '"><i class="fa fa-trash-o fa-fw"></i> Delete</button>');
-                } else {
-                    $(td).html('<span class="btn btn-xs btn-danger pull-left" data-id="' + rowData['export_id'] + '" disabled><i class="fa fa-trash-o fa-fw"></i> Delete</span>');
-                }
-            },
-            "width": "7%",
-            "className": "export_delete",
-            "searchable": false
-        }
-    ],
-    "drawCallback": function (settings) {
-        // Jump to top of page
-        //$('html,body').scrollTop(0);
-        $('#ajaxMsg').fadeOut();
-
-        // Create the tooltips.
-        $('body').tooltip({
-            selector: '[data-toggle="tooltip"]',
-            container: 'body'
-        });
-
-        if (export_processing_timer) {
-            clearTimeout(export_processing_timer);
-        }
-        if ($('.export-processing').length) {
-            export_processing_timer = setTimeout(redrawExportTable.bind(null, false), 2000);
-        }
-    },
-    "preDrawCallback": function(settings) {
-        if (!export_processing_timer) {
-            var msg = "<i class='fa fa-refresh fa-spin'></i>&nbsp; Fetching rows...";
-            showMsg(msg, false, false, 0)
-        }
-    },
-    "rowCallback": function (row, rowData, rowIndex) {
-        if (rowData['complete'] === 0) {
-            $(row).addClass('current-activity-row');
-        }
-    }
-};
-
-$('.export_table').on('click', '> tbody > tr > td.export_download > button', function (e) {
-    var tr = $(this).closest('tr');
-    var row = export_table.row(tr);
-    var rowData = row.data();
-
-    e.preventDefault();
-    window.location.href = 'download_export?export_id=' + rowData['export_id'];
-});
-
-$('.export_table').on('click', '> tbody > tr > td.export_delete > button', function (e) {
-    var tr = $(this).closest('tr');
-    var row = export_table.row(tr);
-    var rowData = row.data();
-
-    var msg = 'Are you sure you want to delete the following export?<br /><br /><strong>' + rowData['title'] + '</strong>';
-    var url = 'delete_export?export_id=' + rowData['export_id'];
-    confirmAjaxCall(url, msg, null, null, redrawExportTable);
-});
-
-function redrawExportTable(paging) {
-    export_table.draw(paging);
-}
-
-var export_processing_timer;
\ No newline at end of file
diff --git a/data/interfaces/default/js/tables/history_table.js b/data/interfaces/default/js/tables/history_table.js
index 7f9d578f..1cafd218 100644
--- a/data/interfaces/default/js/tables/history_table.js
+++ b/data/interfaces/default/js/tables/history_table.js
@@ -15,36 +15,25 @@ history_table_options = {
     "destroy": true,
     "language": {
         "search": "Search: ",
-        "lengthMenu": "Show _MENU_ entries per page",
-        "info": "Showing _START_ to _END_ of _TOTAL_ history items",
-        "infoEmpty": "Showing 0 to 0 of 0 entries",
-        "infoFiltered": "<span class='hidden-md hidden-sm hidden-xs'>(filtered from _MAX_ total entries)</span>",
-        "emptyTable": "No data in table",
-        "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
+        "lengthMenu":"Show _MENU_ entries per page",
+        "info":"Showing _START_ to _END_ of _TOTAL_ history items",
+        "infoEmpty":"Showing 0 to 0 of 0 entries",
+        "infoFiltered":"(filtered from _MAX_ total entries)",
+        "emptyTable": "No data in table"
     },
-    "pagingType": "full_numbers",
+    "pagingType": "bootstrap",
     "stateSave": true,
-    "stateSaveParams": function (settings, data) {
-        data.search.search = "";
-        data.start = 0;
-    },
-    "stateDuration": 0,
     "processing": false,
     "serverSide": true,
     "pageLength": 25,
     "order": [ 1, 'desc'],
     "autoWidth": false,
-    "scrollX": true,
     "columnDefs": [
         {
             "targets": [0],
             "data": null,
             "createdCell": function (td, cellData, rowData, row, col) {
-                if (rowData['row_id'] === null) {
-                    $(td).html('');
-                } else {
-                    $(td).html('<button class="btn btn-xs btn-warning" data-id="' + rowData['row_id'] + '"><i class="fa fa-trash-o fa-fw"></i> Delete</button>');
-                }
+                $(td).html('<button class="btn btn-xs btn-warning" data-id="' + rowData['id'] + '"><i class="fa fa-trash-o fa-fw"></i> Delete</button>');
             },
             "width": "5%",
             "className": "delete-control no-wrap hidden",
@@ -53,159 +42,122 @@ history_table_options = {
         },
         {
             "targets": [1],
-            "data": "date",
+            "data":"date",
             "createdCell": function (td, cellData, rowData, row, col) {
-                var date = moment(cellData, "X").format(date_format);
-                if (rowData['state'] !== null) {
-                    var state = '';
-                    if (rowData['state'] === 'playing') {
-                        state = '<span class="current-activity-tooltip" data-toggle="tooltip" title="Currently Playing"><i class="fa fa-fw fa-play"></i></span>';
-                    } else if (rowData['state'] === 'paused') {
-                        state = '<span class="current-activity-tooltip" data-toggle="tooltip" title="Currently Paused"><i class="fa fa-fw fa-pause"></i></span>';
-                    } else if (rowData['state'] === 'buffering') {
-                        state = '<span class="current-activity-tooltip" data-toggle="tooltip" title="Currently Buffering"><i class="fa fa-fw fa-spinner"></i></span>';
-                    } else if (rowData['state'] === 'error') {
-                        state = '<span class="current-activity-tooltip" data-toggle="tooltip" title="Playback Error"><i class="fa fa-fw fa-exclamation-triangle"></i></span>';
-                    } else if (rowData['state'] === 'stopped') {
-                        state = '<span class="current-activity-tooltip" data-toggle="tooltip" title="Currently Stopped"><i class="fa fa-fw fa-stop"></i></span>';
-                    } else {
-                        state = '<span class="current-activity-tooltip" data-toggle="tooltip" title="Unknown"><i class="fa fa-fw fa-question-circle"></i></span>';
-                    }
-                    $(td).html('<div><div style="float: left;">' + state + '&nbsp;' + date + '</div></div>');
+                if (rowData['stopped'] === null) {
+                    $(td).html('Currently watching...');
                 } else if (rowData['group_count'] > 1) {
+                    date = moment(cellData, "X").format(date_format);
                     expand_history = '<span class="expand-history-tooltip" data-toggle="tooltip" title="Show Detailed History"><i class="fa fa-plus-circle fa-fw"></i></span>';
                     $(td).html('<div><a href="#"><div style="float: left;">' + expand_history + '&nbsp;' + date + '</div></a></div>');
                 } else {
-                    $(td).html('<div style="float: left;"><i class="fa fa-plus-circle fa-fw fa-blank">&nbsp;</i>&nbsp;' + date + '</div>');
+                    date = moment(cellData, "X").format(date_format);
+                    $(td).html('<div style="float: left;"><i class="fa fa-fw"></i>&nbsp;' + date + '</div>');
                 }
             },
             "searchable": false,
-            "width": "7%",
+            "width": "8%",
             "className": "no-wrap expand-history"
         },
         {
             "targets": [2],
-            "data": "friendly_name",
+            "data":"friendly_name",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== '') {
                     if (rowData['user_id']) {
-                        $(td).html('<a href="' + page('user', rowData['user_id']) + '" title="' + rowData['user'] + '">' + cellData + '</a>');
+                        $(td).html('<a href="user?user_id=' + rowData['user_id'] + '">' + cellData + '</a>');
                     } else {
-                        $(td).html('<a href="' + page('user', null, rowData['user']) + '" title="' + rowData['user'] + '">' + cellData + '</a>');
+                        $(td).html('<a href="user?user=' + rowData['user'] + '">' + cellData + '</a>');
                     }
                 } else {
                     $(td).html(cellData);
                 }
             },
-            "width": "9%",
-            "className": "no-wrap"
+            "width": "8%",
+            "className": "no-wrap hidden-xs"
         },
         {
             "targets": [3],
             "data": "ip_address",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData) {
-                    isPrivateIP(cellData).then(function () {
-                        $(td).html('<a href="javascript:void(0)" data-toggle="modal" data-target="#ip-info-modal">'+ cellData + '</a>');
-                    }, function () {
+                    if (isPrivateIP(cellData)) {
+                        if (cellData != '') {
+                            $(td).html(cellData);
+                        } else {
+                            $(td).html('n/a');
+                        }
+                    } else {
                         external_ip = '<span class="external-ip-tooltip" data-toggle="tooltip" title="External IP"><i class="fa fa-map-marker fa-fw"></i></span>';
                         $(td).html('<a href="javascript:void(0)" data-toggle="modal" data-target="#ip-info-modal">'+ external_ip + cellData + '</a>');
-                    });
+                    }
                 } else {
                     $(td).html('n/a');
                 }
             },
             "width": "8%",
-            "className": "no-wrap modal-control-ip"
+            "className": "no-wrap hidden-md hidden-sm hidden-xs modal-control-ip"
         },
         {
             "targets": [4],
-            "data": "platform",
+            "data":"platform",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== '') {
                     $(td).html(cellData);
                 }
             },
-            "width": "10%",
-            "className": "no-wrap"
+            "width": "8%",
+            "className": "no-wrap hidden-md hidden-sm hidden-xs modal-control"
         },
         {
             "targets": [5],
-            "data": "product",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "width": "10%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [6],
             "data": "player",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== '') {
                     var transcode_dec = '';
-                    if (rowData['transcode_decision'] === 'transcode') {
+                    if (rowData['video_decision'] === 'transcode' || rowData['audio_decision'] === 'transcode') {
                         transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Transcode"><i class="fa fa-server fa-fw"></i></span>';
-                    } else if (rowData['transcode_decision'] === 'copy') {
-                        transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Stream"><i class="fa fa-stream fa-fw"></i></span>';
-                    } else if (rowData['transcode_decision'] === 'direct play') {
+                    } else if (rowData['video_decision'] === 'copy' || rowData['audio_decision'] === 'copy') {
+                        transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Stream"><i class="fa fa-video-camera fa-fw"></i></span>';
+                    } else if (rowData['video_decision'] === 'direct play' || rowData['audio_decision'] === 'direct play') {
                         transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Play"><i class="fa fa-play-circle fa-fw"></i></span>';
                     }
                     $(td).html('<div><a href="#" data-target="#info-modal" data-toggle="modal"><div style="float: left;">' + transcode_dec + '&nbsp;' + cellData + '</div></a></div>');
                 }
             },
-            "width": "10%",
-            "className": "no-wrap modal-control"
+            "width": "12%",
+            "className": "no-wrap hidden-md hidden-sm hidden-xs modal-control"
         },
         {
-            "targets": [7],
-            "data": "full_title",
+            "targets": [6],
+            "data":"full_title",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== '') {
-                    var icon = '';
-                    var icon_title = '';
-                    var parent_info = '';
                     var media_type = '';
                     var thumb_popover = '';
-                    var fallback = (rowData['live']) ? 'poster-live' : 'poster';
-                    var history = (rowData['state'] === null);
                     if (rowData['media_type'] === 'movie') {
-                        icon = (rowData['live']) ? 'fa-broadcast-tower' : 'fa-film';
-                        icon_title = (rowData['live']) ? 'Live TV' : 'Movie';
-                        if (rowData['year']) { parent_info = ' (' + rowData['year'] + ')'; }
-                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="' + icon_title + '"><i class="fa ' + icon + ' fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 450, null, null, null, fallback) + '" data-height="120" data-width="80">' + cellData + parent_info + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key'], rowData['guid'], history, rowData['live']) + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
+                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Movie"><i class="fa fa-film fa-fw"></i></span>';
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=poster" data-height="120">' + cellData + ' (' + rowData['year'] + ')</span>'
+                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type'] === 'episode') {
-                        icon = (rowData['live']) ? 'fa-broadcast-tower' : 'fa-television';
-                        icon_title = (rowData['live']) ? 'Live TV' : 'Episode';
-                        if (!isNaN(parseInt(rowData['parent_media_index'])) && !isNaN(parseInt(rowData['media_index']))) { parent_info = ' (' + short_season(rowData['parent_title']) + ' &middot; E' + rowData['media_index'] + ')'; }
-                        else if (rowData['live'] && rowData['originally_available_at']) { parent_info = ' (' + rowData['originally_available_at'] + ')'; }
-                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="' + icon_title + '"><i class="fa ' + icon + ' fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 450, null, null, null, fallback) + '" data-height="120" data-width="80">' + cellData + parent_info + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key'], rowData['guid'], history, rowData['live']) + '"><div style="float: left;" >' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
+                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Episode"><i class="fa fa-television fa-fw"></i></span>';
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=poster" data-height="120">' + cellData + ' \
+                            (S' + rowData['parent_media_index'] + '&middot; E' + rowData['media_index'] + ')</span>'
+                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;" >' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type'] === 'track') {
-                        if (rowData['parent_title']) { parent_info = ' (' + rowData['parent_title'] + ')'; }
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Track"><i class="fa fa-music fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 300, null, null, null, 'cover') + '" data-height="80" data-width="80">' + cellData + parent_info + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key'], rowData['guid'], history, rowData['live']) + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
-                    } else if (rowData['media_type'] === 'clip') {
-                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Clip"><i class="fa fa-video-camera fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 450, null, null, null, fallback) + '" data-height="120" data-width="80">' + cellData + parent_info + '</span>';
-                        $(td).html('<div class="history-title"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></div>');
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=300&fallback=poster" data-height="80">' + cellData + ' (' + rowData['parent_title'] + ')</span>'
+                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
                     } else {
-                        $(td).html('<a href="' + page('info', rowData['rating_key']) + '">' + cellData + '</a>');
+                        $(td).html('<a href="info?item_id=' + rowData['id'] + '">' + cellData + '</a>');
                     }
                 }
             },
-            "width": "25%",
-            "className": "datatable-wrap"
+            "width": "35%"
         },
         {
-            "targets": [8],
-            "data": "started",
+            "targets": [7],
+            "data":"started",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData === null) {
                     $(td).html('n/a');
@@ -215,11 +167,11 @@ history_table_options = {
             },
             "searchable": false,
             "width": "5%",
-            "className": "no-wrap"
+            "className": "no-wrap hidden-sm hidden-xs"
         },
         {
-            "targets": [9],
-            "data": "paused_counter",
+            "targets": [8],
+            "data":"paused_counter",
             "render": function (data, type, full) {
                 if (data !== null) {
                     return Math.round(moment.duration(data, 'seconds').as('minutes')) + ' mins';
@@ -229,13 +181,13 @@ history_table_options = {
             },
             "searchable": false,
             "width": "5%",
-            "className": "no-wrap"
+            "className": "no-wrap hidden-md hidden-sm hidden-xs"
         },
         {
-            "targets": [10],
-            "data": "stopped",
+            "targets": [9],
+            "data":"stopped",
             "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData === null || (rowData['state'] != null && rowData['state'] != "stopped")) {
+                if (cellData === null) {
                     $(td).html('n/a');
                 } else {
                     $(td).html(moment(cellData,"X").format(time_format));
@@ -243,11 +195,11 @@ history_table_options = {
             },
             "searchable": false,
             "width": "5%",
-            "className": "no-wrap"
+            "className": "no-wrap hidden-sm hidden-xs"
         },
         {
-            "targets": [11],
-            "data": "play_duration",
+            "targets": [10],
+            "data":"duration",
             "render": function (data, type, full) {
                 if (data !== null) {
                     return Math.round(moment.duration(data, 'seconds').as('minutes')) + ' mins';
@@ -257,28 +209,24 @@ history_table_options = {
             },
             "searchable": false,
             "width": "5%",
-            "className": "no-wrap"
+            "className": "no-wrap hidden-xs"
         },
         {
-            "targets": [12],
+            "targets": [11],
             "data": "watched_status",
             "createdCell": function (td, cellData, rowData, row, col) {
-                var circleValue = "";
                 if (cellData == 1) {
-                    circleValue = " circle-full";
-                } else if (cellData == 0.75) {
-                    circleValue = " circle-three-quarter";
+                    $(td).html('<span class="watched-tooltip" data-toggle="tooltip" title="' + rowData['percent_complete'] + '%"><i class="fa fa-lg fa-circle"></i></span>');
                 } else if (cellData == 0.5) {
-                    circleValue = " circle-half";
-                } else if (cellData == 0.25) {
-                    circleValue = " circle-quarter";
+                    $(td).html('<span class="watched-tooltip" data-toggle="tooltip" title="' + rowData['percent_complete'] + '%"><i class="fa fa-lg fa-adjust fa-rotate-180"></i></span>');
+                } else {
+                    $(td).html('<span class="watched-tooltip" data-toggle="tooltip" title="' + rowData['percent_complete'] + '%"><i class="fa fa-lg fa-circle-o"></i></span>');
                 }
-                $(td).html('<span class="watched-tooltip" data-toggle="tooltip" title="' + rowData['percent_complete'] + '%"><div class="circle' + circleValue + '" /></span>');
             },
             "searchable": false,
             "orderable": false,
-            "className": "no-wrap",
-            "width": "2%"
+            "className": "no-wrap hidden-md hidden-sm hidden-xs",
+            "width": "1%"
         },
     ],
     "drawCallback": function (settings) {
@@ -287,25 +235,23 @@ history_table_options = {
         $('#ajaxMsg').fadeOut();
 
         // Create the tooltips.
-        $('body').tooltip({
-            selector: '[data-toggle="tooltip"]',
-            container: 'body'
-        });
-        $('body').popover({
-            selector: '[data-toggle="popover"]',
+        $('.expand-history-tooltip').tooltip({ container: 'body' });
+        $('.external-ip-tooltip').tooltip({ container: 'body' });
+        $('.transcode-tooltip').tooltip({ container: 'body' });
+        $('.media-type-tooltip').tooltip({ container: 'body' });
+        $('.watched-tooltip').tooltip({ container: 'body' });
+        $('.thumb-tooltip').popover({
             html: true,
-            sanitize: false,
             container: 'body',
             trigger: 'hover',
             placement: 'right',
-            template: '<div class="popover history-thumbnail-popover" role="tooltip"><div class="arrow" style="top: 50%;"></div><div class="popover-content"></div></div>',
             content: function () {
-                return '<div class="history-thumbnail" style="background-image: url(' + $(this).data('img') + '); height: ' + $(this).data('height') + 'px; width: ' + $(this).data('width') + 'px;" />';
+                return '<div class="history-thumbnail" style="background-image: url(' + $(this).data('img') + '); height: ' + $(this).data('height') + 'px;" />';
             }
         });
 
         if ($('#row-edit-mode').hasClass('active')) {
-            $('.history_table .delete-control').each(function () {
+            $('.delete-control').each(function () {
                 $(this).removeClass('hidden');
             });
         }
@@ -314,37 +260,32 @@ history_table_options = {
             var rowData = this.data();
             if (rowData['group_count'] != 1 && rowData['reference_id'] in history_child_table) {
                 // if grouped row and a child table was already created
-                $(this.node()).find('i.fa.fa-plus-circle').toggleClass('fa-plus-circle').toggleClass('fa-minus-circle');
+                $(this.node()).find('i.fa').toggleClass('fa-plus-circle').toggleClass('fa-minus-circle');
                 this.child(childTableFormat(rowData)).show();
                 createChildTable(this, rowData)
             }
         });
-
-        $("#history_table_info").append('<span class="hidden-md hidden-sm hidden-xs"> with a duration of ' + settings.json.filter_duration +
-            ' (filtered from ' + settings.json.total_duration + ' total)</span>');
     },
     "preDrawCallback": function(settings) {
-        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbsp; Fetching rows...";
-        showMsg(msg, false, false, 0);
-        $('[data-toggle="tooltip"]').tooltip('destroy');
-        $('[data-toggle="popover"]').popover('destroy');
+        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...";
+        showMsg(msg, false, false, 0)
     },
     "rowCallback": function (row, rowData, rowIndex) {
         if (rowData['group_count'] == 1) {
             // if no grouped rows simply toggle the delete button
-            if ($.inArray(rowData['row_id'], history_to_delete) !== -1) {
-                $(row).find('button[data-id="' + rowData['row_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
+            if ($.inArray(rowData['id'], history_to_delete) !== -1) {
+                $(row).find('button[data-id="' + rowData['id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
             }
-        } else if (rowData['row_id'] !== null) {
+        } else {
             // if grouped rows
             // toggle the parent button to danger
-            $(row).find('button[data-id="' + rowData['row_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
+            $(row).find('button[data-id="' + rowData['id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
             // check if any child rows are not selected
             var group_ids = rowData['group_ids'].split(',').map(Number);
             group_ids.forEach(function (id) {
                 var index = $.inArray(id, history_to_delete);
                 if (index == -1) {
-                    $(row).find('button[data-id="' + rowData['row_id'] + '"]').addClass('btn-warning').removeClass('btn-danger');
+                    $(row).find('button[data-id="' + rowData['id'] + '"]').addClass('btn-warning').removeClass('btn-danger');
                 }
             });
         }
@@ -355,54 +296,63 @@ history_table_options = {
             history_table.row(row).child(childTableFormat(rowData)).show();
         }
 
-        if (rowData['state'] !== null) {
-            $(row).addClass('current-activity-row');
-        }
     }
-};
+}
 
 // Parent table platform modal
-$('.history_table').on('click', '> tbody > tr > td.modal-control', function () {
+$('#history_table').on('click', '> tbody > tr > td.modal-control', function () {
     var tr = $(this).closest('tr');
     var row = history_table.row( tr );
     var rowData = row.data();
 
-    $.get('get_stream_data', {
-        row_id: rowData['row_id'],
-        session_key: rowData['session_key'],
-        user: rowData['friendly_name']
-    }).then(function (jqXHR) {
-        $("#info-modal").html(jqXHR);
-    });
+    function showStreamDetails() {
+        $.ajax({
+            url: 'get_stream_data',
+            data: {row_id: rowData['id'], user: rowData['friendly_name']},
+            cache: false,
+            async: true,
+            complete: function(xhr, status) {
+                $("#info-modal").html(xhr.responseText);
+            }
+        });
+    }
+    showStreamDetails();
 });
 
 // Parent table ip address modal
-$('.history_table').on('click', '> tbody > tr > td.modal-control-ip', function () {
+$('#history_table').on('click', '> tbody > tr > td.modal-control-ip', function () {
     var tr = $(this).closest('tr');
     var row = history_table.row( tr );
     var rowData = row.data();
 
-    $.get('get_ip_address_details', {
-        ip_address: rowData['ip_address'],
-        location: rowData['location'],
-        secure: rowData['secure'],
-        relayed: rowData['relayed']
-    }).then(function (jqXHR) {
-        $("#ip-info-modal").html(jqXHR);
-    });
+    function getUserLocation(ip_address) {
+        if (isPrivateIP(ip_address)) {
+            return "n/a"
+        } else {
+            $.ajax({
+                url: 'get_ip_address_details',
+                data: {ip_address: ip_address},
+                async: true,
+                complete: function(xhr, status) {
+                    $("#ip-info-modal").html(xhr.responseText);
+                }
+            });
+        }
+    }
+    getUserLocation(rowData['ip_address']);
 });
 
 // Parent table delete mode
-$('.history_table').on('click', '> tbody > tr > td.delete-control > button', function () {
+$('#history_table').on('click', '> tbody > tr > td.delete-control > button', function () {
     var tr = $(this).closest('tr');
     var row = history_table.row( tr );
     var rowData = row.data();
 
     if (rowData['group_count'] == 1) {
         // if no grouped rows simply add or remove row from history_to_delete
-        var index = $.inArray(rowData['row_id'], history_to_delete);
+        var index = $.inArray(rowData['id'], history_to_delete);
         if (index === -1) {
-            history_to_delete.push(rowData['row_id']);
+            history_to_delete.push(rowData['id']);
         } else {
             history_to_delete.splice(index, 1);
         }
@@ -442,7 +392,7 @@ $('.history_table').on('click', '> tbody > tr > td.delete-control > button', fun
 });
 
 // Parent table expand detailed history
-$('.history_table').on('click', '> tbody > tr > td.expand-history a', function () {
+$('#history_table').on('click', '> tbody > tr > td.expand-history a', function () {
     var tr = $(this).closest('tr');
     var row = history_table.row(tr);
     var rowData = row.data();
@@ -471,41 +421,38 @@ function childTableOptions(rowData) {
     history_child_options.lengthChange = false;
     history_child_options.info = false;
     history_child_options.pageLength = 10;
-    history_child_options.saveState = false;
+    history_child_options.bStateSave = false;
     history_child_options.ajax = {
-        url: 'get_history',
-        type: 'post',
+        "url": "get_history",
+        type: "post",
         data: function (d) {
             return {
-                json_data: JSON.stringify(d),
-                grouping: false,
-                reference_id: rowData['reference_id']
+                'json_data': JSON.stringify(d),
+                'grouping': false,
+                'reference_id': rowData['reference_id']
             };
         }
     }
-    history_child_options.drawCallback = function (settings) {
+    history_child_options.fnDrawCallback = function (settings) {
         $('#ajaxMsg').fadeOut();
 
         // Create the tooltips.
         $('.expand-history-tooltip').tooltip({ container: 'body' });
-        $('.external-ip-tooltip').tooltip({ container: 'body' });
-        $('.transcode-tooltip').tooltip({ container: 'body' });
-        $('.media-type-tooltip').tooltip({ container: 'body' });
-        $('.watched-tooltip').tooltip({ container: 'body' });
+        $('.external-ip-tooltip').tooltip();
+        $('.transcode-tooltip').tooltip();
+        $('.media-type-tooltip').tooltip();
+        $('.watched-tooltip').tooltip();
         $('.thumb-tooltip').popover({
             html: true,
-            sanitize: false,
-            container: 'body',
             trigger: 'hover',
             placement: 'right',
-            template: '<div class="popover history-thumbnail-popover" role="tooltip"><div class="arrow" style="top: 50%;"></div><div class="popover-content"></div></div>',
             content: function () {
                 return '<div class="history-thumbnail" style="background-image: url(' + $(this).data('img') + '); height: ' + $(this).data('height') + 'px;" />';
             }
         });
 
         if ($('#row-edit-mode').hasClass('active')) {
-            $('.history_table .delete-control').each(function () {
+            $('.delete-control').each(function () {
                 $(this).removeClass('hidden');
             });
         }
@@ -519,21 +466,20 @@ function childTableOptions(rowData) {
 // Format the detailed history child table
 function childTableFormat(rowData) {
     return '<div class="slider">' +
-            '<table id="history_child-' + rowData['reference_id'] + '" width="100%">' +
+            '<table id="history_child-' + rowData['reference_id'] + '">' +
             '<thead>' +
             '<tr>' +
                 '<th align="left" id="delete_row">Delete</th>' +
-                '<th align="left" id="date">Date</th>' +
+                '<th align="left" id="time">Time</th>' +
                 '<th align="left" id="friendly_name">User</th>' +
                 '<th align="left" id="ip_address">IP Address</th>' +
                 '<th align="left" id="platform">Platform</th>' +
-                '<th align="left" id="product">Product</th>' +
-                '<th align="left" id="player">Player</th>' +
+                '<th align="left" id="platform">Player</th>' +
                 '<th align="left" id="title">Title</th>' +
                 '<th align="left" id="started">Started</th>' +
                 '<th align="left" id="paused_counter">Paused</th>' +
                 '<th align="left" id="stopped">Stopped</th>' +
-                '<th align="left" id="play_duration">Duration</th>' +
+                '<th align="left" id="duration">Duration</th>' +
                 '<th align="left" id="percent_complete"></th>' +
             '</tr>' +
             '</thead>' +
@@ -567,12 +513,18 @@ function createChildTable(row, rowData) {
         var childRow = history_child_table[rowData['reference_id']].row(tr);
         var childRowData = childRow.data();
 
-        $.get('get_stream_data', {
-            row_id: childRowData['row_id'],
-            user: childRowData['friendly_name']
-        }).then(function (jqXHR) {
-            $("#info-modal").html(jqXHR);
-        });
+        function showStreamDetails() {
+            $.ajax({
+                url: 'get_stream_data',
+                data: { row_id: childRowData['id'], user: childRowData['friendly_name'] },
+                cache: false,
+                async: true,
+                complete: function (xhr, status) {
+                    $("#info-modal").html(xhr.responseText);
+                }
+            });
+        }
+        showStreamDetails();
     });
 
     // Child table ip address modal
@@ -581,14 +533,21 @@ function createChildTable(row, rowData) {
         var childRow = history_child_table[rowData['reference_id']].row(tr);
         var childRowData = childRow.data();
 
-        $.get('get_ip_address_details', {
-            ip_address: childRowData['ip_address'],
-            location: rowData['location'],
-            secure: rowData['secure'],
-            relayed: rowData['relayed']
-        }).then(function (jqXHR) {
-            $("#ip-info-modal").html(jqXHR);
-        });
+        function getUserLocation(ip_address) {
+            if (isPrivateIP(ip_address)) {
+                return "n/a"
+            } else {
+                $.ajax({
+                    url: 'get_ip_address_details',
+                    data: { ip_address: ip_address },
+                    async: true,
+                    complete: function (xhr, status) {
+                        $("#ip-info-modal").html(xhr.responseText);
+                    }
+                });
+            }
+        }
+        getUserLocation(childRowData['ip_address']);
     });
 
     // Child table delete mode
@@ -598,9 +557,9 @@ function createChildTable(row, rowData) {
         var childRowData = childRow.data();
 
         // add or remove row from history_to_delete
-        var index = $.inArray(childRowData['row_id'], history_to_delete);
+        var index = $.inArray(childRowData['id'], history_to_delete);
         if (index === -1) {
-            history_to_delete.push(childRowData['row_id']);
+            history_to_delete.push(childRowData['id']);
         } else {
             history_to_delete.splice(index, 1);
         }
diff --git a/data/interfaces/default/js/tables/history_table_modal.js b/data/interfaces/default/js/tables/history_table_modal.js
index 87ac4715..1080bdc3 100644
--- a/data/interfaces/default/js/tables/history_table_modal.js
+++ b/data/interfaces/default/js/tables/history_table_modal.js
@@ -14,20 +14,18 @@ history_table_modal_options = {
     "destroy": true,
     "language": {
         "search": "Search: ",
-        "info": "Showing _START_ to _END_ of _TOTAL_ history items",
-        "infoEmpty": "Showing 0 to 0 of 0 entries",
-        "infoFiltered": "",
+        "info":"Showing _START_ to _END_ of _TOTAL_ history items",
+        "infoEmpty":"Showing 0 to 0 of 0 entries",
+        "infoFiltered":"",
         "emptyTable": "No data in table",
-        "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
     },
-    "pagingType": "simple_numbers",
+    "pagingType": "bootstrap",
     "stateSave": false,
     "processing": false,
     "serverSide": true,
     "pageLength": 10,
     "lengthChange": false,
-    "autoWidth": false,
-    "order": [0, 'desc'],
+    "order": [ 0, 'desc'],
     "columnDefs": [
         {
             "targets": [0],
@@ -39,9 +37,9 @@ history_table_modal_options = {
                     $(td).html(moment(cellData,"X").format(time_format));
                 }
             },
-            "width": "10%",
+            "searchable": false,
             "className": "no-wrap",
-            "searchable": false
+            "width": "5%"
         },
         {
             "targets": [1],
@@ -53,9 +51,9 @@ history_table_modal_options = {
                     $(td).html(moment(cellData,"X").format(time_format));
                 }
             },
-            "width": "10%",
+            "searchable": false,
             "className": "no-wrap",
-            "searchable": false
+            "width": "5%"
         },
         {
             "targets": [2],
@@ -63,16 +61,15 @@ history_table_modal_options = {
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== '') {
                     if (rowData['user_id']) {
-                        $(td).html('<a href="' + page('user', rowData['user_id']) + '">' + cellData + '</a>');
+                        $(td).html('<a href="user?user_id=' + rowData['user_id'] + '">' + cellData + '</a>');
                     } else {
-                        $(td).html('<a href="' + page('user', null, rowData['user']) + '">' + cellData + '</a>');
+                        $(td).html('<a href="user?user=' + rowData['user'] + '">' + cellData + '</a>');
                     }
                 } else {
                     $(td).html(cellData);
                 }
             },
-            "width": "15%",
-            "className": "no-wrap"
+            "className": "no-wrap hidden-xs"
         },
         {
             "targets": [3],
@@ -80,57 +77,43 @@ history_table_modal_options = {
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== '') {
                     var transcode_dec = '';
-                    if (rowData['transcode_decision'] === 'transcode') {
+                    if (rowData['video_decision'] === 'transcode' || rowData['audio_decision'] === 'transcode') {
                         transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Transcode"><i class="fa fa-server fa-fw"></i></span>';
-                    } else if (rowData['transcode_decision'] === 'copy') {
-                        transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Stream"><i class="fa fa-stream fa-fw"></i></span>';
-                    } else if (rowData['transcode_decision'] === 'direct play') {
+                    } else if (rowData['video_decision'] === 'copy' || rowData['audio_decision'] === 'copy') {
+                        transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Stream"><i class="fa fa-video-camera fa-fw"></i></span>';
+                    } else if (rowData['video_decision'] === 'direct play' || rowData['audio_decision'] === 'direct play') {
                         transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Play"><i class="fa fa-play-circle fa-fw"></i></span>';
                     }
                     $(td).html('<div><a href="#" data-target="#info-modal" data-toggle="modal"><div style="float: left;">' + transcode_dec + '&nbsp' + cellData + '</div></a></div>');
                 }
             },
-            "width": "25%",
-            "className": "no-wrap modal-control"
+            "className": "no-wrap hidden-sm hidden-xs modal-control"
         },
         {
             "targets": [4],
             "data":"full_title",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== '') {
-                    var icon = '';
-                    var icon_title = '';
-                    var parent_info = '';
                     var media_type = '';
                     var thumb_popover = '';
-                    var fallback = (rowData['live']) ? 'poster-live' : 'poster';
                     if (rowData['media_type'] === 'movie') {
-                        icon = (rowData['live']) ? 'fa-broadcast-tower' : 'fa-film';
-                        icon_title = (rowData['live']) ? 'Live TV' : 'Movie';
-                        if (rowData['year']) { parent_info = ' (' + rowData['year'] + ')'; }
-                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="' + icon_title + '"><i class="fa ' + icon + ' fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 450, null, null, null, fallback) + '" data-height="120" data-width="80">' + cellData + parent_info + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key'], rowData['guid'], true, rowData['live']) + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
+                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Movie"><i class="fa fa-film fa-fw"></i></span>';
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=poster" data-height="120">' + cellData + ' (' + rowData['year'] + ')</span>'
+                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;">' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type'] === 'episode') {
-                        icon = (rowData['live']) ? 'fa-broadcast-tower' : 'fa-television';
-                        icon_title = (rowData['live']) ? 'Live TV' : 'Episode';
-                        if (!isNaN(parseInt(rowData['parent_media_index'])) && !isNaN(parseInt(rowData['media_index']))) { parent_info = ' (' + short_season(rowData['parent_title']) + ' &middot; E' + rowData['media_index'] + ')'; }
-                        else if (rowData['live'] && rowData['originally_available_at']) { parent_info = ' (' + rowData['originally_available_at'] + ')'; }
-                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="' + icon_title + '"><i class="fa ' + icon + ' fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 450, null, null, null, fallback) + '" data-height="120" data-width="80">' + cellData + parent_info + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key'], rowData['guid'], true, rowData['live']) + '"><div style="float: left;" >' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
+                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Episode"><i class="fa fa-television fa-fw"></i></span>';
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=poster" data-height="120">' + cellData + ' \
+                            (S' + rowData['parent_media_index'] + '&middot; E' + rowData['media_index'] + ')</span>'
+                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;" >' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type'] === 'track') {
-                        if (rowData['parent_title']) { parent_info = ' (' + rowData['parent_title'] + ')'; }
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Track"><i class="fa fa-music fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 300, null, null, null, 'cover') + '" data-height="80" data-width="80">' + cellData + parent_info + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key'], rowData['guid'], true, rowData['live']) + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=300&fallback=poster" data-height="80">' + cellData + ' (' + rowData['parent_title'] + ')</span>'
+                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;">' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
                     } else {
-                        $(td).html('<a href="' + page('info', rowData['rating_key']) + '">' + cellData + '</a>');
+                        $(td).html('<a href="info?item_id=' + rowData['id'] + '">' + cellData + '</a>');
                     }
                 }
-            },
-            "width": "40%",
-            "className": "datatable-wrap"
+            }
         }
     ],
     "drawCallback": function (settings) {
@@ -139,30 +122,25 @@ history_table_modal_options = {
         $('#ajaxMsg').fadeOut();
 
         // Create the tooltips.
-        $('body').tooltip({
-            selector: '[data-toggle="tooltip"]',
-            container: 'body'
-        });
-        $('body').popover({
-            selector: '[data-toggle="popover"]',
+        $('.transcode-tooltip').tooltip();
+        $('.media-type-tooltip').tooltip();
+        $('.thumb-tooltip').popover({
             html: true,
-            sanitize: false,
             container: '#history-modal',
             trigger: 'hover',
             placement: 'right',
-            template: '<div class="popover history-thumbnail-popover" role="tooltip"><div class="arrow" style="top: 50%;"></div><div class="popover-content"></div></div>',
             content: function () {
-                return '<div class="history-thumbnail" style="background-image: url(' + $(this).data('img') + '); height: ' + $(this).data('height') + 'px; width: ' + $(this).data('width') + 'px;" />';
+                return '<div class="history-thumbnail" style="background-image: url(' + $(this).data('img') + '); height: ' + $(this).data('height') + 'px;" />';
             }
         });
     },
     "preDrawCallback": function(settings) {
-        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbsp; Fetching rows...";
+        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...";
         showMsg(msg, false, false, 0)
     }
 }
 
-$('.history_table').on('click', 'td.modal-control', function () {
+$('#history_table').on('click', 'td.modal-control', function () {
     var tr = $(this).parents('tr');
     var row = history_table.row(tr);
     var rowData = row.data();
@@ -170,7 +148,7 @@ $('.history_table').on('click', 'td.modal-control', function () {
     function showStreamDetails() {
         $.ajax({
             url: 'get_stream_data',
-            data: { row_id: rowData['row_id'], user: rowData['friendly_name'] },
+            data: { row_id: rowData['id'], user: rowData['friendly_name'] },
             cache: false,
             async: true,
             complete: function (xhr, status) {
diff --git a/data/interfaces/default/js/tables/libraries.js b/data/interfaces/default/js/tables/libraries.js
deleted file mode 100644
index b3e702a0..00000000
--- a/data/interfaces/default/js/tables/libraries.js
+++ /dev/null
@@ -1,322 +0,0 @@
-var libraries_to_delete = [];
-var libraries_to_purge = [];
-
-libraries_list_table_options = {
-    "language": {
-        "search": "Search: ",
-        "lengthMenu": "Show _MENU_ entries per page",
-        "info": "Showing _START_ to _END_ of _TOTAL_ active libraries",
-        "infoEmpty": "Showing 0 to 0 of 0 entries",
-        "infoFiltered": "",
-        "emptyTable": "No data in table",
-        "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
-    },
-    "destroy": true,
-    "processing": false,
-    "serverSide": true,
-    "pageLength": 25,
-    "order": [ 2, 'asc'],
-    "stateSave": true,
-    "stateSaveParams": function (settings, data) {
-        data.search.search = "";
-        data.start = 0;
-    },
-    "stateDuration": 0,
-    "pagingType": "full_numbers",
-    "autoWidth": false,
-    "scrollX": true,
-    "columnDefs": [
-        {
-            "targets": [0],
-            "data": null,
-            "createdCell": function (td, cellData, rowData, row, col) {
-                $(td).html('<div class="edit-library-toggles">' +
-                    '<button class="btn btn-xs btn-warning delete-library" data-id="' + rowData['row_id'] + '" data-toggle="button"><i class="fa fa-trash-o fa-fw"></i> Delete</button>&nbsp' +
-                    '<button class="btn btn-xs btn-warning purge-library" data-id="' + rowData['row_id'] + '" data-toggle="button"><i class="fa fa-eraser fa-fw"></i> Purge</button>&nbsp&nbsp&nbsp' +
-                    '<input type="checkbox" id="keep_history-' + rowData['section_id'] + '" name="keep_history" value="1" ' + (rowData['keep_history'] ? 'checked' : '') + '><label class="edit-tooltip" for="keep_history-' + rowData['section_id'] + '" data-toggle="tooltip" title="Toggle History"><i class="fa fa-history fa-lg fa-fw"></i></label>&nbsp' +
-                    '</div>');
-            },
-            "width": "7%",
-            "className": "edit-control no-wrap hidden",
-            "searchable": false,
-            "orderable": false
-        },
-        {
-            "targets": [1],
-            "data": "library_thumb",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                var inactive = '';
-                if (!rowData['is_active']) { inactive = '<span class="inactive-library-tooltip" data-toggle="tooltip" title="Library not on Plex server"><i class="fa fa-exclamation-triangle"></i></span>'; }
-                if (cellData !== null && cellData !== '') {
-                    if (rowData['library_thumb'].substring(0, 4) == "http") {
-                        $(td).html('<a href="' + page('library', rowData['section_id']) + '"><div class="libraries-poster-face" style="background-image: url(' + rowData['library_thumb'] + ');">' + inactive + '</div></a>');
-                    } else {
-                        $(td).html('<a href="' + page('library', rowData['section_id']) + '"><div class="libraries-poster-face svg-icon library-' + rowData['section_type'] + '">' + inactive + '</div></a>');
-                    }
-                } else {
-                    $(td).html('<a href="' + page('library', rowData['section_id']) + '"><div class="libraries-poster-face" style="background-image: url(../../images/cover.png);">' + inactive + '</div></a>');
-                }
-            },
-            "orderable": false,
-            "searchable": false,
-            "width": "5%",
-            "className": "libraries-thumbs"
-        },
-        {
-            "targets": [2],
-            "data": "section_name",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html('<div data-id="' + rowData['row_id'] + '">' +
-                        '<a href="' + page('library', rowData['section_id']) + '">' + cellData + '</a>' +
-                        '</div>');
-                } else {
-                    $(td).html('n/a');
-                }
-            },
-            "width": "10%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [3],
-            "data": "section_type",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html(capitalizeFirstLetter(cellData));
-                }
-            },
-            "width": "10%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [4],
-            "data": "count",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html(cellData);
-                }
-
-            },
-            "width": "10%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [5],
-            "data": "parent_count",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html(cellData);
-                }
-
-            },
-            "width": "10%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [6],
-            "data": "child_count",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html(cellData);
-                }
-
-            },
-            "width": "10%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [7],
-            "data": "last_accessed",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html(moment(cellData, "X").fromNow());
-                } else {
-                    $(td).html("never");
-                }
-            },
-            "searchable": false,
-            "width": "10%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [8],
-            "data":"last_played",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    var icon = '';
-                    var icon_title = '';
-                    var parent_info = '';
-                    var media_type = '';
-                    var thumb_popover = '';
-                    var fallback = (rowData['live']) ? 'poster-live' : 'poster';
-                    if (rowData['media_type'] === 'movie') {
-                        icon = (rowData['live']) ? 'fa-broadcast-tower' : 'fa-film';
-                        icon_title = (rowData['live']) ? 'Live TV' : 'Movie';
-                        if (rowData['year']) { parent_info = ' (' + rowData['year'] + ')'; }
-                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="' + icon_title + '"><i class="fa ' + icon + ' fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 450, null, null, null, fallback) + '" data-height="120" data-width="80">' + cellData + parent_info + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key'], rowData['guid'], true, rowData['live']) + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
-                    } else if (rowData['media_type'] === 'episode') {
-                        icon = (rowData['live']) ? 'fa-broadcast-tower' : 'fa-television';
-                        icon_title = (rowData['live']) ? 'Live TV' : 'Episode';
-                        if (!isNaN(parseInt(rowData['parent_media_index'])) && !isNaN(parseInt(rowData['media_index']))) { parent_info = ' (' + short_season(rowData['parent_title']) + ' &middot; E' + rowData['media_index'] + ')'; }
-                        else if (rowData['live'] && rowData['originally_available_at']) { parent_info = ' (' + rowData['originally_available_at'] + ')'; }
-                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="' + icon_title + '"><i class="fa ' + icon + ' fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 450, null, null, null, fallback) + '" data-height="120" data-width="80">' + cellData + parent_info + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key'], rowData['guid'], true, rowData['live']) + '"><div style="float: left;" >' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
-                    } else if (rowData['media_type'] === 'track') {
-                        if (rowData['parent_title']) { parent_info = ' (' + rowData['parent_title'] + ')'; }
-                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Track"><i class="fa fa-music fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 300, null, null, null, 'cover') + '" data-height="80" data-width="80">' + cellData + parent_info + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key'], rowData['guid'], true, rowData['live']) + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
-                    } else if (rowData['media_type']) {
-                        $(td).html('<a href="' + page('info', rowData['rating_key']) + '">' + cellData + '</a>');
-                    }
-                } else {
-                    $(td).html('n/a');
-                }
-            },
-            "width": "18%",
-            "className": "datatable-wrap"
-        },
-        {
-            "targets": [9],
-            "data": "plays",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "searchable": false,
-            "width": "7%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [10],
-            "data": "duration",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html(humanDuration(cellData, 'dhm', 's', false));
-                }
-            },
-            "searchable": false,
-            "width": "10%",
-            "className": "no-wrap"
-        }
-
-    ],
-    "drawCallback": function (settings) {
-        // Jump to top of page
-        //$('html,body').scrollTop(0);
-        $('#ajaxMsg').fadeOut();
-
-        // Create the tooltips.
-        $('body').tooltip({
-            selector: '[data-toggle="tooltip"]',
-            container: 'body'
-        });
-        $('body').popover({
-            selector: '[data-toggle="popover"]',
-            html: true,
-            sanitize: false,
-            container: 'body',
-            trigger: 'hover',
-            placement: 'right',
-            template: '<div class="popover history-thumbnail-popover" role="tooltip"><div class="arrow" style="top: 50%;"></div><div class="popover-content"></div></div>',
-            content: function () {
-                return '<div class="history-thumbnail" style="background-image: url(' + $(this).data('img') + '); height: ' + $(this).data('height') + 'px; width: ' + $(this).data('width') + 'px;" />';
-            }
-        });
-
-        if ($('#row-edit-mode').hasClass('active')) {
-            $('.edit-control').each(function () {
-                $(this).removeClass('hidden');
-            });
-        }
-    },
-    "preDrawCallback": function(settings) {
-        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbsp; Fetching rows...";
-        showMsg(msg, false, false, 0)
-    },
-    "rowCallback": function (row, rowData) {
-        if ($.inArray(rowData['row_id'], libraries_to_delete) !== -1) {
-            $(row).find('button.delete-library[data-id="' + rowData['row_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
-        }
-        if ($.inArray(rowData['row_id'], libraries_to_purge) !== -1) {
-            $(row).find('button.purge-library[data-id="' + rowData['row_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
-        }
-    }
-}
-
-$('#libraries_list_table').on('change', 'td.edit-control > .edit-library-toggles > input', function () {
-    var tr = $(this).parents('tr');
-    var row = libraries_list_table.row(tr);
-    var rowData = row.data();
-
-    var keep_history = 0;
-    if ($('#keep_history-' + rowData['section_id']).is(':checked')) {
-        keep_history = 1;
-    }
-    if (rowData['custom_thumb']) {
-        custom_thumb = rowData['custom_thumb']
-    } else {
-        custom_thumb = rowData['library_thumb']
-    }
-    
-    $.ajax({
-        url: 'edit_library',
-        data: {
-            section_id: rowData['section_id'],
-            keep_history: keep_history,
-            custom_thumb: custom_thumb
-        },
-        cache: false,
-        async: true,
-        success: function (data) {
-            var msg = "Library updated";
-            showMsg(msg, false, true, 2000);
-        }
-    });
-});
-
-$('#libraries_list_table').on('click', 'td.edit-control > .edit-library-toggles > button.delete-library', function () {
-    var tr = $(this).parents('tr');
-    var row = libraries_list_table.row(tr);
-    var rowData = row.data();
-
-    var index_delete = $.inArray(rowData['row_id'], libraries_to_delete);
-    var index_purge = $.inArray(rowData['row_id'], libraries_to_purge);
-
-    if (index_delete === -1) {
-        libraries_to_delete.push(rowData['row_id']);
-        if (index_purge === -1) {
-            tr.find('button.purge-library').click();
-        }
-    } else {
-        libraries_to_delete.splice(index_delete, 1);
-        if (index_purge != -1) {
-            tr.find('button.purge-library').click();
-        }
-    }
-    $(this).toggleClass('btn-warning').toggleClass('btn-danger');
-
-});
-
-$('#libraries_list_table').on('click', 'td.edit-control > .edit-library-toggles > button.purge-library', function () {
-    var tr = $(this).parents('tr');
-    var row = libraries_list_table.row(tr);
-    var rowData = row.data();
-
-    var index_delete = $.inArray(rowData['row_id'], libraries_to_delete);
-    var index_purge = $.inArray(rowData['row_id'], libraries_to_purge);
-
-    if (index_purge === -1) {
-        libraries_to_purge.push(rowData['row_id']);
-    } else {
-        libraries_to_purge.splice(index_purge, 1);
-        if (index_delete != -1) {
-            tr.find('button.delete-library').click();
-        }
-    }
-    $(this).toggleClass('btn-warning').toggleClass('btn-danger');
-});
\ No newline at end of file
diff --git a/data/interfaces/default/js/tables/login_logs.js b/data/interfaces/default/js/tables/login_logs.js
deleted file mode 100644
index 8927e7d8..00000000
--- a/data/interfaces/default/js/tables/login_logs.js
+++ /dev/null
@@ -1,170 +0,0 @@
-login_log_table_options = {
-    "destroy": true,
-    "language": {
-        "search": "Search: ",
-        "lengthMenu": "Show _MENU_ entries per page",
-        "info": "Showing _START_ to _END_ of _TOTAL_ results",
-        "infoEmpty": "Showing 0 to 0 of 0 entries",
-        "infoFiltered": "(filtered from _MAX_ total entries)",
-        "emptyTable": "No data in table",
-        "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
-    },
-    "stateSave": true,
-    "stateSaveParams": function (settings, data) {
-        data.search.search = "";
-        data.start = 0;
-    },
-    "stateDuration": 0,
-    "pagingType": "full_numbers",
-    "processing": false,
-    "serverSide": true,
-    "pageLength": 25,
-    "order": [0, 'desc'],
-    "autoWidth": false,
-    "scrollX": true,
-    "columnDefs": [
-        {
-            "targets": [0],
-            "data": "timestamp",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    $(td).html(moment(cellData, "X").format('YYYY-MM-DD HH:mm:ss'));
-                } else {
-                    $(td).html(cellData);
-                }
-            },
-            "searchable": false,
-            "width": "10%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [1],
-            "data": "friendly_name",
-            "width": "10%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [2],
-            "data": "user_group",
-            "width": "7%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [3],
-            "data": "ip_address",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData) {
-                    isPrivateIP(cellData).then(function () {
-                        $(td).html(cellData || 'n/a');
-                    }, function () {
-                        external_ip = '<span class="external-ip-tooltip" data-toggle="tooltip" title="External IP"><i class="fa fa-map-marker fa-fw"></i></span>';
-                        $(td).html('<a href="javascript:void(0)" data-toggle="modal" data-target="#ip-info-modal">' + external_ip + cellData + '</a>');
-                    });
-                } else {
-                    $(td).html('n/a');
-                }
-            },
-            "width": "10%",
-            "className": "no-wrap modal-control-ip"
-        },
-        {
-            "targets": [4],
-            "data": "host",
-            "width": "18%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [5],
-            "data": "os",
-            "width": "15%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [6],
-            "data": "browser",
-            "width": "15%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [7],
-            "data": "expiry",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                var active = '';
-                if (rowData['current']) {
-                    active = '<span class="current-tooltip" data-toggle="tooltip" title="Current Session"><i class="fa fa-lg fa-fw fa-check-circle"></i></span>&nbsp;';
-                }
-                if (cellData) {
-                    var signout = '&nbsp;<span class="sign-out-tooltip" data-toggle="tooltip" title="Sign Out"><i class="fa fa-lg fa-fw fa-sign-out-alt"></i></span>';
-                    $(td).html(active + cellData + signout);
-                } else if (rowData['success']) {
-                    $(td).html('expired');
-                }
-            },
-            "searchable": false,
-            "className": "no-wrap",
-            "width": "13%"
-        },
-        {
-            "targets": [8],
-            "data": "success",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData == 1) {
-                    $(td).html('<span class="success-tooltip" data-toggle="tooltip" title="Login Successful"><i class="fa fa-lg fa-fw fa-check"></i></span>');
-                } else {
-                    $(td).html('<span class="success-tooltip" data-toggle="tooltip" title="Login Failed"><i class="fa fa-lg fa-fw fa-times"></i></span>');
-                }
-            },
-            "searchable": false,
-            "orderable": false,
-            "className": "no-wrap",
-            "width": "2%"
-        },
-    ],
-    "drawCallback": function (settings) {
-        // Jump to top of page
-        // $('html,body').scrollTop(0);
-
-        $('#ajaxMsg').fadeOut();
-
-        // Create the tooltips.
-        $('body').tooltip({
-            selector: '[data-toggle="tooltip"]',
-            container: 'body'
-        });
-
-    },
-    "preDrawCallback": function (settings) {
-        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbsp; Fetching rows...";
-        showMsg(msg, false, false, 0)
-        $('[data-toggle="tooltip"]').tooltip('destroy');
-    }
-};
-
-$('.login_log_table').on('click', '> tbody > tr > td.modal-control-ip', function () {
-    var tr = $(this).closest('tr');
-    var row = login_log_table.row(tr);
-    var rowData = row.data();
-
-    $.get('get_ip_address_details', {
-        ip_address: rowData['ip_address']
-    }).then(function (jqXHR) {
-        $("#ip-info-modal").html(jqXHR);
-    });
-});
-
-$('.login_log_table').on('click', '> tbody > tr > td> .sign-out-tooltip', function () {
-    var tr = $(this).closest('tr');
-    var row = login_log_table.row(tr);
-    var rowData = row.data();
-
-    $.get('logout_user_session', {
-        row_ids: rowData['row_id'],
-        current: rowData['current']
-    }).then(function () {
-        if (rowData['current']) {
-            window.location = 'auth/logout';
-        } else {
-            login_log_table.draw();
-        }
-    });
-});
diff --git a/data/interfaces/default/js/tables/logs.js b/data/interfaces/default/js/tables/logs.js
index 9dceba99..50cf2cef 100644
--- a/data/interfaces/default/js/tables/logs.js
+++ b/data/interfaces/default/js/tables/logs.js
@@ -2,36 +2,27 @@ var log_table_options = {
     "destroy": true,
     "serverSide": true,
     "processing": false,
-    "pagingType": "full_numbers",
+    "pagingType": "bootstrap",
     "order": [ 0, 'desc'],
-    "pageLength": 50,
+    "pageLength": 10,
     "stateSave": true,
-    "stateSaveParams": function (settings, data) {
-        data.search.search = "";
-        data.start = 0;
-    },
-    "stateDuration": 0,
     "language": {
-                "search": "Search: ",
-                "lengthMenu": "Show _MENU_ lines per page",
+                "search":"Search: ",
+                "lengthMenu":"Show _MENU_ lines per page",
                 "emptyTable": "No log information available",
-                "info": "Showing _START_ to _END_ of _TOTAL_ lines",
-                "infoEmpty": "Showing 0 to 0 of 0 lines",
-                "infoFiltered": "(filtered from _MAX_ total lines)",
-                "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
-    },
-    "autoWidth": false,
-    "scrollX": true,
+                "info":"Showing _START_ to _END_ of _TOTAL_ lines",
+                "infoEmpty":"Showing 0 to 0 of 0 lines",
+                "infoFiltered":"(filtered from _MAX_ total lines)"},
     "columnDefs": [
         {
             "targets": [0],
             "width": "15%",
-            "className": "no-wrap"
+            "className": "no-wrap hidden-xs"
         },
         {
             "targets": [1],
             "width": "10%",
-            "className": "no-wrap"
+            "className": "no-wrap hidden-sm hidden-xs"
         },
         {
             "targets": [2],
@@ -44,7 +35,7 @@ var log_table_options = {
         $('#ajaxMsg').fadeOut();
     },
     "preDrawCallback": function(settings) {
-        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbsp; Fetching rows...";
+        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...";
         showMsg(msg, false, false, 0)
     }
 }
diff --git a/data/interfaces/default/js/tables/media_info_table.js b/data/interfaces/default/js/tables/media_info_table.js
deleted file mode 100644
index f4d80d53..00000000
--- a/data/interfaces/default/js/tables/media_info_table.js
+++ /dev/null
@@ -1,509 +0,0 @@
-var date_format = 'YYYY-MM-DD';
-var time_format = 'hh:mm a';
-
-$.ajax({
-    url: 'get_date_formats',
-    type: 'GET',
-    success: function (data) {
-        date_format = data.date_format;
-        time_format = data.time_format;
-    }
-});
-
-var refresh_child_tables = false;
-
-media_info_table_options = {
-    "destroy": true,
-    "language": {
-        "search": "Search: ",
-        "lengthMenu": "Show _MENU_ entries per page",
-        "info": "Showing _START_ to _END_ of _TOTAL_ library items",
-        "infoEmpty": "Showing 0 to 0 of 0 entries",
-        "infoFiltered": "<span class='hidden-md hidden-sm hidden-xs'>(filtered from _MAX_ total entries)</span>",
-        "emptyTable": "No data in table",
-        "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
-    },
-    "pagingType": "full_numbers",
-    "stateSave": true,
-    "stateSaveParams": function (settings, data) {
-        data.search.search = "";
-        data.start = 0;
-    },
-    "stateDuration": 0,
-    "processing": false,
-    "serverSide": true,
-    "pageLength": 25,
-    "order": [1, 'asc'],
-    "autoWidth": false,
-    "scrollX": true,
-    "columnDefs": [
-        {
-            "targets": [0],
-            "data": "added_at",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (rowData) {
-                    var expand_details = '';
-                    var date = '';
-                    if (cellData !== null && cellData !== '') {
-                        date = moment(cellData, "X").format(date_format);
-                    }
-                    if (rowData['media_type'] === 'show') {
-                        expand_details = '<span class="expand-media-info-tooltip" data-toggle="tooltip" title="Show Seasons"><i class="fa fa-plus-circle fa-fw"></i></span>';
-                        $(td).html('<div><a href="#"><div style="float: left;">' + expand_details + '&nbsp;' + date + '</div></a></div>');
-                    } else if (rowData['media_type'] === 'season') {
-                        expand_details = '<span class="expand-media-info-tooltip" data-toggle="tooltip" title="Show Episodes"><i class="fa fa-plus-circle fa-fw"></i></span>';
-                        $(td).html('<div><a href="#"><div style="float: left;">' + expand_details + '&nbsp;' + date + '</div></a></div>');
-                    } else if (rowData['media_type'] === 'artist') {
-                        expand_details = '<span class="expand-media-info-tooltip" data-toggle="tooltip" title="Show Albums"><i class="fa fa-plus-circle fa-fw"></i></span>';
-                        $(td).html('<div><a href="#"><div style="float: left;">' + expand_details + '&nbsp;' + date + '</div></a></div>');
-                    } else if (rowData['media_type'] === 'album') {
-                        expand_details = '<span class="expand-media-info-tooltip" data-toggle="tooltip" title="Show Tracks"><i class="fa fa-plus-circle fa-fw"></i></span>';
-                        $(td).html('<div><a href="#"><div style="float: left;">' + expand_details + '&nbsp;' + date + '</div></a></div>');
-                    } else if (rowData['media_type'] === 'photo_album') {
-                        expand_details = '<span class="expand-media-info-tooltip" data-toggle="tooltip" title="Show Photos"><i class="fa fa-plus-circle fa-fw"></i></span>';
-                        $(td).html('<div><a href="#"><div style="float: left;">' + expand_details + '&nbsp;' + date + '</div></a></div>');
-                    } else {
-                        $(td).html('<div style="float: left;"><i class="fa fa-plus-circle fa-fw fa-blank"></i>&nbsp;' + date + '</div>');
-                    }
-                }
-            },
-            "width": "7%",
-            "className": "no-wrap expand-media-info",
-            "searchable": false
-        },
-        {
-            "targets": [1],
-            "data": "sort_title",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    var parent_info = '';
-                    var media_type = '';
-                    var thumb_popover = '';
-                    if (rowData['media_type'] === 'movie') {
-                        if (rowData['year']) { parent_info = ' (' + rowData['year'] + ')'; }
-                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Movie"><i class="fa fa-film fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 450, null, null, null, 'poster') + '" data-height="120" data-width="80">' + rowData['title'] + parent_info + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key']) + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
-                    } else if (rowData['media_type'] === 'show') {
-                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="TV Show"><i class="fa fa-television fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 450, null, null, null, 'poster') + '" data-height="120" data-width="80">' + rowData['title'] + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key']) + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
-                    } else if (rowData['media_type'] === 'season') {
-                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Season"><i class="fa fa-television fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 450, null, null, null, 'poster') + '" data-height="120" data-width="80">' + rowData['title'] + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key']) + '"><div style="float: left; padding-left: 15px;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
-                    } else if (rowData['media_type'] === 'episode') {
-                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Episode"><i class="fa fa-television fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 500, 280, null, null, null, 'art') + '" data-height="80" data-width="140">E' + rowData['media_index'] + ' - ' + rowData['title'] + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key']) + '"><div style="float: left; padding-left: 30px;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
-                    } else if (rowData['media_type'] === 'artist') {
-                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Artist"><i class="fa fa-music fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 300, null, null, null, 'cover') + '" data-height="80" data-width="80">' + rowData['title'] + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key']) + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
-                    } else if (rowData['media_type'] === 'album') {
-                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Album"><i class="fa fa-music fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 300, null, null, null, 'cover') + '" data-height="80" data-width="80">' + rowData['title'] + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key']) + '"><div style="float: left; padding-left: 15px;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
-                    } else if (rowData['media_type'] === 'track') {
-                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Track"><i class="fa fa-music fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 300, null, null, null, 'cover') + '" data-height="80" data-width="80">T' + rowData['media_index'] + ' - ' + rowData['title'] + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key']) + '"><div style="float: left; padding-left: 30px;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
-                    } else if (rowData['media_type'] === 'photo_album') {
-                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Photo Album"><i class="fa fa-camera fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 450, null, null, null, 'poster') + '" data-height="120" data-width="80">' + rowData['title'] + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key']) + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
-                    } else if (rowData['media_type'] === 'photo') {
-                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Photo"><i class="fa fa-picture-o fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 450, null, null, null, 'poster') + '" data-height="120" data-width="80">' + rowData['title'] + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key']) + '"><div style="float: left; padding-left: 15px;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
-                    } else if (rowData['media_type'] === 'clip') {
-                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Video"><i class="fa fa-video-camera fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 500, 280, null, null, null, 'art') + '" data-height="80" data-width="140">' + rowData['title'] + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key']) + '"><div style="float: left; padding-left: 15px;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
-                    } else {
-                        $(td).html(cellData);
-                    }
-                }
-            },
-            "width": "20%",
-            "className": "no-wrap",
-        },
-        {
-            "targets": [2],
-            "data": "container",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "width": "6%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [3],
-            "data": "bitrate",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html(cellData + ' kbps');
-                }
-            },
-            "width": "6%",
-            "className": "no-wrap",
-            "searchable": false
-        },
-        {
-            "targets": [4],
-            "data": "video_codec",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "width": "8%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [5],
-            "data": "video_resolution",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "width": "8%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [6],
-            "data": "video_framerate",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "width": "8%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [7],
-            "data": "audio_codec",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "width": "8%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [8],
-            "data": "audio_channels",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html(cellData + ' ch');
-                }
-            },
-            "width": "8%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [9],
-            "data": "file_size",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html(humanFileSize(cellData));
-                } else {
-                    if (rowData['section_type'] != 'photo' && get_file_sizes != null) {
-                        get_file_sizes = true;
-                    }
-                }
-            },
-            "width": "7%",
-            "className": "no-wrap",
-            "searchable": false
-        },
-        {
-            "targets": [10],
-            "data": "last_played",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    date = moment(cellData, "X").format(date_format);
-                    $(td).html(date);
-                }
-            },
-            "width": "7%",
-            "className": "no-wrap",
-            "searchable": false
-        },
-        {
-            "targets": [11],
-            "data": "play_count",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "width": "5%",
-            "className": "no-wrap",
-            "searchable": false
-        }
-    ],
-    "drawCallback": function (settings) {
-        // Jump to top of page
-        // $('html,body').scrollTop(0);
-        $('#ajaxMsg').fadeOut();
-
-        // Create the tooltips.
-        $('body').tooltip({
-            selector: '[data-toggle="tooltip"]',
-            container: 'body'
-        });
-        $('body').popover({
-            selector: '[data-toggle="popover"]',
-            html: true,
-            sanitize: false,
-            container: 'body',
-            trigger: 'hover',
-            placement: 'right',
-            template: '<div class="popover history-thumbnail-popover" role="tooltip"><div class="arrow" style="top: 50%;"></div><div class="popover-content"></div></div>',
-            content: function () {
-                return '<div class="history-thumbnail" style="background-image: url(' + $(this).data('img') + '); height: ' + $(this).data('height') + 'px; width: ' + $(this).data('width') + 'px;" />';
-            }
-        });
-
-        media_info_table.rows().every(function () {
-            var rowData = this.data();
-            if (rowData['rating_key'] in media_info_child_table) {
-                // if a child table was already created
-                $(this.node()).find('i.fa.fa-plus-circle').toggleClass('fa-plus-circle').toggleClass('fa-minus-circle');
-                this.child(childTableFormatMedia(rowData)).show();
-                createChildTableMedia(this, rowData)
-            }
-        });
-
-        if (get_file_sizes) {
-            $('#get_file_sizes_message').show();
-            $('#refresh-media-info-table').prop('disabled', true);
-            $.ajax({
-                url: 'get_media_info_file_sizes',
-                async: true,
-                data: { section_id: section_id },
-                complete: function (xhr, status) {
-                    response = JSON.parse(xhr.responseText)
-                    if (response.success == true) {
-                        $('#get_file_sizes_message').hide();
-                        $('#refresh-media-info-table').prop('disabled', false);
-                        media_info_table.draw();
-                    }
-                }
-            });
-            get_file_sizes = false;
-        }
-
-        $("#media_info_table-SID-" + section_id + "_info").append('<span class="hidden-md hidden-sm hidden-xs"> with a total file size of ' +
-            humanFileSize(settings.json.filtered_file_size) +
-            ' (filtered from ' + humanFileSize(settings.json.total_file_size) + ')</span>');
-    },
-    "preDrawCallback": function (settings) {
-        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbsp; Fetching rows...";
-        showMsg(msg, false, false, 0)
-    },
-    "rowCallback": function (row, rowData, rowIndex) {
-        if (rowData['rating_key'] in media_info_child_table) {
-            // if a child table was already created
-            $(row).addClass('shown')
-            media_info_table.row(row).child(childTableFormatMedia(rowData)).show();
-        }
-    }
-}
-
-// Parent table expand detailed media info
-$('.media_info_table').on('click', '> tbody > tr > td.expand-media-info a', function () {
-    var tr = $(this).closest('tr');
-    var row = media_info_table.row(tr);
-    var rowData = row.data();
-
-    $(this).find('i.fa').toggleClass('fa-plus-circle').toggleClass('fa-minus-circle');
-
-    if (row.child.isShown()) {
-        $('div.slider', row.child()).slideUp(function () {
-            row.child.hide();
-            tr.removeClass('shown');
-            delete media_info_child_table[rowData['rating_key']];
-        });
-    } else {
-        tr.addClass('shown');
-        row.child(childTableFormatMedia(rowData)).show();
-        createChildTableMedia(row, rowData);
-    }
-});
-
-// Initialize the detailed media info child table options using the parent table options
-function childTableOptionsMedia(rowData) {
-    switch (rowData['media_type']) {
-        case 'show':
-            section_type = 'season';
-            break;
-        case 'season':
-            section_type = 'episode';
-            break;
-        case 'artist':
-            section_type = 'album';
-            break;
-        case 'album':
-            section_type = 'track';
-            break;
-        case 'photo_album':
-            section_type = 'picture';
-            break;
-    }
-
-    media_info_table_options = media_info_table_options;
-    // Remove settings that are not necessary
-    media_info_table_options.searching = false;
-    media_info_table_options.lengthChange = false;
-    media_info_table_options.info = false;
-    media_info_table_options.pageLength = 10;
-    media_info_table_options.stateSave = false;
-    media_info_table_options.ajax = {
-        url: 'get_library_media_info',
-        type: 'post',
-        data: function (d) {
-            return {
-                json_data: JSON.stringify(d),
-                section_id: rowData['section_id'],
-                section_type: section_type,
-                rating_key: rowData['rating_key'],
-                refresh: refresh_child_tables
-            };
-        }
-    }
-    media_info_table_options.drawCallback = function (settings) {
-        $('#ajaxMsg').fadeOut();
-
-        // Create the tooltips.
-        $('.expand-media-info-tooltip').tooltip({ container: 'body' });
-        $('.media-type-tooltip').tooltip();
-        $('.thumb-tooltip').popover({
-            html: true,
-            sanitize: false,
-            container: 'body',
-            trigger: 'hover',
-            placement: 'right',
-            template: '<div class="popover history-thumbnail-popover" role="tooltip"><div class="arrow" style="top: 50%;"></div><div class="popover-content"></div></div>',
-            content: function () {
-                return '<div class="history-thumbnail" style="background-image: url(' + $(this).data('img') + '); height: ' + $(this).data('height') + 'px; width: ' + $(this).data('width') + 'px;" />';
-            }
-        });
-
-        if (rowData['rating_key'] in media_info_child_table) {
-            media_info_child_table[rowData['rating_key']].rows().every(function () {
-                var childrowData = this.data();
-                if (childrowData['rating_key'] in media_info_child_table) {
-                    // if a child table was already created
-                    $(this.node()).find('i.fa.fa-plus-circle').toggleClass('fa-plus-circle').toggleClass('fa-minus-circle');
-                    this.child(childTableFormatMedia(childrowData)).show();
-                    createChildTableMedia(this, childrowData)
-                }
-            });
-        }
-
-        if (get_file_sizes) {
-            $('#refresh-media-info-table').prop('disabled', true);
-            $.ajax({
-                url: 'get_media_info_file_sizes',
-                async: true,
-                data: {
-                    section_id: section_id,
-                    rating_key: rowData['rating_key']
-                },
-                complete: function (xhr, status) {
-                    response = JSON.parse(xhr.responseText)
-                    if (response.success == true) {
-                        $('#refresh-media-info-table').prop('disabled', false);
-                        media_info_child_table[rowData['rating_key']].draw();
-                    }
-                }
-            });
-            get_file_sizes = false;
-        }
-
-        $(this).closest('div.slider').slideDown();
-    }
-    media_info_table_options.rowCallback = function (row, rowData, rowIndex) {
-        if (rowData['rating_key'] in media_info_child_table) {
-            // if a child table was already created
-            $(row).addClass('shown')
-            media_info_table.row(row).child(childTableFormatMedia(rowData)).show();
-        }
-    }
-
-    return media_info_table_options;
-}
-
-// Format the detailed media info child table
-function childTableFormatMedia(rowData) {
-    return '<div class="slider">' +
-            '<table id="media_info_child-' + rowData['rating_key'] + '" data-id="' + rowData['rating_key'] + '" width="100%">' +
-            '<thead>' +
-            '<tr>' +
-                '<th align="left" id="added_at">Added At</th>' +
-                '<th align="left" id="title">Title</th>' +
-                '<th align="left" id="container">Container</th>' +
-                '<th align="left" id="bitrate">Bitrate</th>' +
-                '<th align="left" id="video_codec">Video Codec</th>' +
-                '<th align="left" id="video_resolution">Video Resolution</th>' +
-                '<th align="left" id="video_resolution">Video Framerate</th>' +
-                '<th align="left" id="audio_codec">Audio Codec</th>' +
-                '<th align="left" id="audio_channels">Audio Channels</th>' +
-                '<th align="left" id="file_size">File Size</th>' +
-                '<th align="left" id="last_played">Last Played</th>' +
-                '<th align="left" id="total_plays">Total Plays</th>' +
-            '</tr>' +
-            '</thead>' +
-            '<tbody>' +
-            '</tbody>' +
-            '</table>' +
-            '</div>';
-}
-
-// Create the detailed media info child table
-media_info_child_table = {};
-function createChildTableMedia(row, rowData) {
-    media_info_table_options = childTableOptionsMedia(rowData);
-    // initialize the child table
-    media_info_child_table[rowData['rating_key']] = $('#media_info_child-' + rowData['rating_key']).DataTable(media_info_table_options);
-
-    // Set child table column visibility to match parent table
-    var visibility = media_info_table.columns().visible();
-    for (var i = 0; i < visibility.length; i++) {
-        if (!(visibility[i])) { media_info_child_table[rowData['rating_key']].column(i).visible(visibility[i]); }
-    }
-    media_info_table.on('column-visibility', function (e, settings, colIdx, visibility) {
-        if (row.child.isShown()) {
-            media_info_child_table[rowData['rating_key']].column(colIdx).visible(visibility);
-        }
-    });
-
-    // Child table expand detailed media info
-    $('table[id^=media_info_child-' + rowData['rating_key'] + ']').on('click', '> tbody > tr > td.expand-media-info a', function () {
-        var table_id = $(this).closest('table').data('id');
-        var tr = $(this).closest('tr');
-        var row = media_info_child_table[table_id].row(tr);
-        var rowData = row.data();
-
-        $(this).find('i.fa').toggleClass('fa-plus-circle').toggleClass('fa-minus-circle');
-
-        if (row.child.isShown()) {
-            $('div.slider', row.child()).slideUp(function () {
-                row.child.hide();
-                tr.removeClass('shown');
-                delete media_info_child_table[rowData['rating_key']];
-            });
-        } else {
-            tr.addClass('shown');
-            row.child(childTableFormatMedia(rowData)).show();
-            createChildTableMedia(row, rowData);
-        }
-    });
-}
\ No newline at end of file
diff --git a/data/interfaces/default/js/tables/newsletter_logs.js b/data/interfaces/default/js/tables/newsletter_logs.js
deleted file mode 100644
index bf09ea1a..00000000
--- a/data/interfaces/default/js/tables/newsletter_logs.js
+++ /dev/null
@@ -1,151 +0,0 @@
-newsletter_log_table_options = {
-    "destroy": true,
-    "serverSide": true,
-    "processing": false,
-    "pagingType": "full_numbers",
-    "order": [ 0, 'desc'],
-    "pageLength": 50,
-    "stateSave": true,
-    "stateSaveParams": function (settings, data) {
-        data.search.search = "";
-        data.start = 0;
-    },
-    "stateDuration": 0,
-    "language": {
-                "search":"Search: ",
-                "lengthMenu": "Show _MENU_ lines per page",
-                "emptyTable": "No log information available",
-                "info" :"Showing _START_ to _END_ of _TOTAL_ lines",
-                "infoEmpty": "Showing 0 to 0 of 0 lines",
-                "infoFiltered": "(filtered from _MAX_ total lines)",
-                "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
-    },
-    "autoWidth": false,
-    "scrollX": true,
-    "columnDefs": [
-        {
-            "targets": [0],
-            "data": "timestamp",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    $(td).html(moment(cellData, "X").format('YYYY-MM-DD HH:mm:ss'));
-                }
-            },
-            "width": "10%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [1],
-            "data": "newsletter_id",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "width": "5%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [2],
-            "data": "agent_name",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "width": "5%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [3],
-            "data": "notify_action",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "width": "5%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [4],
-            "data": "subject_text",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "width": "23%"
-        },
-        {
-            "targets": [5],
-            "data": "body_text",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "width": "35%"
-        },
-        {
-            "targets": [6],
-            "data": "start_date",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "width": "5%"
-        },
-        {
-            "targets": [7],
-            "data": "end_date",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "width": "5%"
-        },
-        {
-            "targets": [8],
-            "data": "uuid",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    $(td).html('<a href="newsletter/' + rowData['uuid'] + '" target="_blank">' + cellData + '</a>');
-                }
-            },
-            "width": "5%"
-        },
-        {
-            "targets": [9],
-            "data": "success",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData === 1) {
-                    $(td).html('<span class="success-tooltip" data-toggle="tooltip" title="Newsletter Sent"><i class="fa fa-lg fa-fw fa-check"></i></span>');
-                } else {
-                    $(td).html('<span class="success-tooltip" data-toggle="tooltip" title="Newsletter Failed"><i class="fa fa-lg fa-fw fa-times"></i></span>');
-                }
-            },
-            "searchable": false,
-            "orderable": false,
-            "className": "no-wrap",
-            "width": "2%"
-        },
-    ],
-    "drawCallback": function (settings) {
-        // Jump to top of page
-        //$('html,body').scrollTop(0);
-        $('#ajaxMsg').fadeOut();
-
-        // Create the tooltips.
-        $('body').tooltip({
-            selector: '[data-toggle="tooltip"]',
-            container: 'body'
-        });
-    },
-    "preDrawCallback": function(settings) {
-        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbsp; Fetching rows...";
-        showMsg(msg, false, false, 0)
-    }
-};
diff --git a/data/interfaces/default/js/tables/notification_logs.js b/data/interfaces/default/js/tables/notification_logs.js
deleted file mode 100644
index ae90ae58..00000000
--- a/data/interfaces/default/js/tables/notification_logs.js
+++ /dev/null
@@ -1,121 +0,0 @@
-notification_log_table_options = {
-    "destroy": true,
-    "serverSide": true,
-    "processing": false,
-    "pagingType": "full_numbers",
-    "order": [ 0, 'desc'],
-    "pageLength": 50,
-    "stateSave": true,
-    "stateSaveParams": function (settings, data) {
-        data.search.search = "";
-        data.start = 0;
-    },
-    "stateDuration": 0,
-    "language": {
-                "search":"Search: ",
-                "lengthMenu": "Show _MENU_ lines per page",
-                "emptyTable": "No log information available",
-                "info" :"Showing _START_ to _END_ of _TOTAL_ lines",
-                "infoEmpty": "Showing 0 to 0 of 0 lines",
-                "infoFiltered": "(filtered from _MAX_ total lines)",
-                "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
-    },
-    "autoWidth": false,
-    "scrollX": true,
-    "columnDefs": [
-        {
-            "targets": [0],
-            "data": "timestamp",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    $(td).html(moment(cellData, "X").format('YYYY-MM-DD HH:mm:ss'));
-                }
-            },
-            "width": "10%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [1],
-            "data": "notifier_id",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "width": "5%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [2],
-            "data": "agent_name",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "width": "5%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [3],
-            "data": "notify_action",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "width": "5%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [4],
-            "data": "subject_text",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "width": "25%"
-        },
-        {
-            "targets": [5],
-            "data": "body_text",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "width": "48%"
-        },
-        {
-            "targets": [6],
-            "data": "success",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData === 1) {
-                    $(td).html('<span class="success-tooltip" data-toggle="tooltip" title="Notification Sent"><i class="fa fa-lg fa-fw fa-check"></i></span>');
-                } else {
-                    $(td).html('<span class="success-tooltip" data-toggle="tooltip" title="Notification Failed"><i class="fa fa-lg fa-fw fa-times"></i></span>');
-                }
-            },
-            "searchable": false,
-            "orderable": false,
-            "className": "no-wrap",
-            "width": "2%"
-        },
-    ],
-    "drawCallback": function (settings) {
-        // Jump to top of page
-        //$('html,body').scrollTop(0);
-        $('#ajaxMsg').fadeOut();
-
-        // Create the tooltips.
-        $('body').tooltip({
-            selector: '[data-toggle="tooltip"]',
-            container: 'body'
-        });
-    },
-    "preDrawCallback": function(settings) {
-        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbsp; Fetching rows...";
-        showMsg(msg, false, false, 0)
-    }
-};
diff --git a/data/interfaces/default/js/tables/playlists_table.js b/data/interfaces/default/js/tables/playlists_table.js
deleted file mode 100644
index db5e4ec8..00000000
--- a/data/interfaces/default/js/tables/playlists_table.js
+++ /dev/null
@@ -1,105 +0,0 @@
-playlists_table_options = {
-    "destroy": true,
-    "language": {
-        "search": "Search: ",
-        "lengthMenu": "Show _MENU_ entries per page",
-        "info": "Showing _START_ to _END_ of _TOTAL_ playlists",
-        "infoEmpty": "Showing 0 to 0 of 0 entries",
-        "infoFiltered": "<span class='hidden-md hidden-sm hidden-xs'>(filtered from _MAX_ total entries)</span>",
-        "emptyTable": "No data in table",
-        "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
-    },
-    "pagingType": "full_numbers",
-    "stateSave": true,
-    "stateSaveParams": function (settings, data) {
-        data.search.search = "";
-        data.start = 0;
-    },
-    "stateDuration": 0,
-    "processing": false,
-    "serverSide": true,
-    "pageLength": 25,
-    "order": [0, 'asc'],
-    "autoWidth": false,
-    "scrollX": true,
-    "columnDefs": [
-        {
-            "targets": [0],
-            "data": "title",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    var smart = '<i class="fa fa-blank fa-fw"></i>';
-                    if (rowData['smart']) {
-                        smart = '<span class="media-type-tooltip" data-toggle="tooltip" title="Smart Playlist"><i class="fa fa-cog fa-fw"></i></span>&nbsp;'
-                    }
-                    var breadcrumb = '';
-                    if (rowData['userID']) {
-                        breadcrumb = '&user_id=' + rowData['userID'];
-                    } else if (rowData['librarySectionID']) {
-                        breadcrumb = '&section_id=' + rowData['librarySectionID'];
-                    }
-                    var thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['composite'], rowData['ratingKey'], 300, 300, null, null, null, 'cover') + '" data-height="80" data-width="80">' + cellData + '</span>';
-                    $(td).html(smart + '<a href="' + page('info', rowData['ratingKey']) + breadcrumb +'">' + thumb_popover + '</a>');
-                }
-            },
-            "width": "60%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [1],
-            "data": "leafCount",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    var type = MEDIA_TYPE_HEADERS[rowData['playlistType']] || '';
-                    if (rowData['leafCount'] === 1) {
-                        type = type.slice(0, -1);
-                    }
-                    $(td).html(cellData + ' ' + type);
-                }
-            },
-            "width": "20%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [2],
-            "data": "duration",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    $(td).html(humanDuration(cellData, 'dhm'));
-                }
-            },
-            "width": "20%",
-            "className": "no-wrap"
-        }
-    ],
-    "drawCallback": function (settings) {
-        // Jump to top of page
-        //$('html,body').scrollTop(0);
-        $('#ajaxMsg').fadeOut();
-
-        // Create the tooltips.
-        $('body').tooltip({
-            selector: '[data-toggle="tooltip"]',
-            container: 'body'
-        });
-        $('body').popover({
-            selector: '[data-toggle="popover"]',
-            html: true,
-            sanitize: false,
-            container: 'body',
-            trigger: 'hover',
-            placement: 'right',
-            template: '<div class="popover history-thumbnail-popover" role="tooltip"><div class="arrow" style="top: 50%;"></div><div class="popover-content"></div></div>',
-            content: function () {
-                return '<div class="history-thumbnail" style="background-image: url(' + $(this).data('img') + '); height: ' + $(this).data('height') + 'px; width: ' + $(this).data('width') + 'px;" />';
-            }
-        });
-    },
-    "preDrawCallback": function(settings) {
-        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbsp; Fetching rows...";
-        showMsg(msg, false, false, 0);
-        $('[data-toggle="tooltip"]').tooltip('destroy');
-    },
-    "rowCallback": function (row, rowData, rowIndex) {
-    }
-};
\ No newline at end of file
diff --git a/data/interfaces/default/js/tables/plex_logs.js b/data/interfaces/default/js/tables/plex_logs.js
index 4da3dd36..50b76199 100644
--- a/data/interfaces/default/js/tables/plex_logs.js
+++ b/data/interfaces/default/js/tables/plex_logs.js
@@ -1,50 +1,32 @@
 var plex_log_table_options = {
     "destroy": true,
-    "serverSide": false,
     "processing": false,
-    "pagingType": "full_numbers",
+    "serverSide": false,
+    "pagingType": "bootstrap",
     "order": [ 0, 'desc'],
-    "pageLength": 50,
+    "pageLength": 10,
     "stateSave": true,
-    "stateSaveParams": function (settings, data) {
-        data.search.search = "";
-        data.start = 0;
-    },
-    "stateDuration": 0,
     "language": {
-                "search": "Search: ",
-                "lengthMenu": "Show _MENU_ lines per page",
+                "search":"Search: ",
+                "lengthMenu":"Show _MENU_ lines per page",
                 "emptyTable": "No log information available. Have you set your logs folder in the <a href='settings'>settings</a>?",
-                "info": "Showing _START_ to _END_ of _TOTAL_ lines",
-                "infoEmpty": "Showing 0 to 0 of 0 lines",
-                "infoFiltered": "(filtered from _MAX_ total lines)",
-                "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
-    },
-    "autoWidth": false,
-    "scrollX": true,
+                "info":"Showing _START_ to _END_ of _TOTAL_ lines",
+                "infoEmpty":"Showing 0 to 0 of 0 lines",
+                "infoFiltered":"(filtered from _MAX_ total lines)"},
     "columnDefs": [
         {
             "targets": [0],
             "width": "15%",
-            "className": "no-wrap"
+            "className": "no-wrap hidden-xs"
         },
         {
             "targets": [1],
             "width": "10%",
-            "className": "no-wrap"
+            "className": "no-wrap hidden-sm hidden-xs"
         },
         {
             "targets": [2],
             "width": "75%"
         }
-    ],
-    "drawCallback": function (settings) {
-        // Jump to top of page
-        //$('html,body').scrollTop(0);
-        $('#ajaxMsg').fadeOut();
-    },
-    "preDrawCallback": function(settings) {
-        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbsp; Fetching rows...";
-        showMsg(msg, false, false, 0)
-    }
+    ]
 }
diff --git a/data/interfaces/default/js/tables/sync_table.js b/data/interfaces/default/js/tables/sync_table.js
index fa9721a5..f4b85407 100644
--- a/data/interfaces/default/js/tables/sync_table.js
+++ b/data/interfaces/default/js/tables/sync_table.js
@@ -1,63 +1,42 @@
-var syncs_to_delete = [];
-
 sync_table_options = {
     "processing": false,
     "serverSide": false,
-    "pagingType": "full_numbers",
+    "pagingType": "bootstrap",
     "order": [ [ 0, 'desc'], [ 1, 'asc'], [2, 'asc'] ],
     "pageLength": 25,
     "stateSave": true,
-    "stateSaveParams": function (settings, data) {
-        data.search.search = "";
-        data.start = 0;
-    },
-    "stateDuration": 0,
     "language": {
-        "search": "Search: ",
-        "lengthMenu": "Show _MENU_ lines per page",
+        "search":"Search: ",
+        "lengthMenu":"Show _MENU_ lines per page",
         "emptyTable": "No synced items",
-        "info": "Showing _START_ to _END_ of _TOTAL_ lines",
-        "infoEmpty": "Showing 0 to 0 of 0 lines",
-        "infoFiltered": "(filtered from _MAX_ total lines)",
-        "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
+        "info":"Showing _START_ to _END_ of _TOTAL_ lines",
+        "infoEmpty":"Showing 0 to 0 of 0 lines",
+        "infoFiltered":"(filtered from _MAX_ total lines)",
+        "loadingRecords":'<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
     },
-    "autoWidth": false,
-    "scrollX": true,
     "columnDefs": [
         {
             "targets": [0],
-            "data": null,
-            "createdCell": function (td, cellData, rowData, row, col) {
-                $(td).html('<div class="edit-sync-toggles">' +
-                    '<button class="btn btn-xs btn-warning delete-sync" data-id="' + rowData['sync_id'] + '" data-toggle="button"><i class="fa fa-trash-o fa-fw"></i> Delete</button>&nbsp' +
-                    '</div>');
-            },
-            "width": "7%",
-            "className": "delete-control no-wrap hidden",
-            "searchable": false,
-            "orderable": false
-        },
-        {
-            "targets": [1],
             "data": "state",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData === 'pending') {
+                    $(td).addClass('currentlyWatching');
                     $(td).html('Pending...');
                 } else {
                     $(td).html(cellData.toProperCase());
                 }
             },
-            "className": "no-wrap"
+            "className": "no-wrap hidden-xs"
         },
         {
-            "targets": [2],
-            "data": "user",
+            "targets": [1],
+            "data": "friendly_name",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== '') {
                     if (rowData['user_id']) {
-                        $(td).html('<a href="' + page('user', rowData['user_id']) + '" title="' + rowData['username'] + '">' + cellData + '</a>');
+                        $(td).html('<a href="user?user_id=' + rowData['user_id'] + '">' + cellData + '</a>');
                     } else {
-                        $(td).html('<a href="' + page('user', null, rowData['user']) + '" title="' + rowData['username'] + '">' + cellData + '</a>');
+                        $(td).html('<a href="user?user=' + rowData['user'] + '">' + cellData + '</a>');
                     }
                 } else {
                     $(td).html(cellData);
@@ -66,67 +45,66 @@ sync_table_options = {
             "className": "no-wrap"
         },
         {
-            "targets": [3],
-            "data": "sync_title",
+            "targets": [2],
+            "data": "title",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== '') {
-                    if (rowData['rating_key'] && !rowData['rating_key'].includes(',')) {
-                        $(td).html('<a href="' + page('info', rowData['rating_key']) + '">' + cellData + '</a>');
+                    if (rowData['metadata_type'] !== '') {
+                        $(td).html('<a href="info?item_id=' + rowData['rating_key'] + '">' + cellData + '</a>');
                     } else {
                         $(td).html(cellData);
                     }
                 }
-            },
-            "className": "datatable-wrap"
+            }
         },
         {
-            "targets": [4],
+            "targets": [3],
             "data": "metadata_type",
             "render": function ( data, type, full ) {
                 return data.toProperCase();
             },
-            "className": "no-wrap"
+            "className": "no-wrap hidden-sm hidden-xs"
+        },
+        {
+            "targets": [4],
+            "data": "platform",
+            "className": "no-wrap hidden-sm hidden-xs"
         },
         {
             "targets": [5],
-            "data": "platform",
-            "className": "no-wrap"
+            "data": "device_name",
+            "className": "no-wrap hidden-xs"
         },
         {
             "targets": [6],
-            "data": "device_name",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [7],
             "data": "total_size",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData > 0 ) {
-                    megabytes = Math.round((cellData/1024)/1024, 0);
+                    megabytes = Math.round((cellData/1024)/1024, 0)
                     $(td).html(megabytes + 'MB');
                 } else {
                     $(td).html('0MB');
                 }
             },
-            "className": "no-wrap"
+            "className": "no-wrap hidden-sm hidden-xs"
+        },
+        {
+            "targets": [7],
+            "data": "item_count",
+            "className": "no-wrap hidden-xs"
         },
         {
             "targets": [8],
-            "data": "item_count",
-            "className": "no-wrap"
+            "data": "item_complete_count",
+            "className": "no-wrap hidden-sm hidden-xs"
         },
         {
             "targets": [9],
-            "data": "item_complete_count",
-            "className": "no-wrap"
+            "data": "item_downloaded_count",
+            "className": "no-wrap hidden-sm hidden-xs"
         },
         {
             "targets": [10],
-            "data": "item_downloaded_count",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [11],
             "data": "item_downloaded_percent_complete",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (rowData['item_count'] > 0 ) {
@@ -135,47 +113,11 @@ sync_table_options = {
                     $(td).html('<span class="badge">0%</span>');
                 }
             },
-            "className": "no-wrap"
+            "className": "no-wrap hidden-sm hidden-xs"
         }
     ],
     "drawCallback": function (settings) {
         // Jump to top of page
-        // $('html,body').scrollTop(0);
-
-        $('#ajaxMsg').fadeOut();
-
-        if ($('#sync-row-edit-mode').hasClass('active')) {
-            $('.sync_table .delete-control').each(function () {
-                $(this).removeClass('hidden');
-            });
-        }
-
-    },
-    "preDrawCallback": function (settings) {
-        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbsp; Fetching rows...";
-        showMsg(msg, false, false, 0)
-    },
-    "rowCallback": function (row, rowData, rowIndex) {
-        if (rowData['state'] === 'pending') {
-            $(row).addClass('current-activity-row');
-        }
+        $('html,body').scrollTop(0);
     }
-};
-
-$('.sync_table').on('click', 'td.delete-control > .edit-sync-toggles > button.delete-sync', function () {
-    var tr = $(this).parents('tr');
-    var row = sync_table.row(tr);
-    var rowData = row.data();
-
-    var index_delete = syncs_to_delete.findIndex(function (x) {
-        return x.client_id === rowData['client_id'] && x.sync_id === rowData['sync_id'];
-    });
-
-    if (index_delete === -1) {
-        syncs_to_delete.push({ client_id: rowData['client_id'], sync_id: rowData['sync_id'] });
-    } else {
-        syncs_to_delete.splice(index_delete, 1);
-    }
-
-    $(this).toggleClass('btn-warning').toggleClass('btn-danger');
-});
+}
diff --git a/data/interfaces/default/js/tables/user_ips.js b/data/interfaces/default/js/tables/user_ips.js
index 6dc3b005..506fe43a 100644
--- a/data/interfaces/default/js/tables/user_ips.js
+++ b/data/interfaces/default/js/tables/user_ips.js
@@ -1,163 +1,118 @@
-var date_format = 'YYYY-MM-DD';
-var time_format = 'hh:mm a';
-
-$.ajax({
-  url: 'get_date_formats',
-  type: 'GET',
-  success: function(data) {
-      date_format = data.date_format;
-      time_format = data.time_format;
-  }
-});
-
-var seenRender = function (data, type, full) {
-  return moment(data, "X").fromNow();
-};
-
-var seenCreatedCell = function (td, cellData, rowData, row, col) {
-  if (cellData !== null) {
-    $(td).attr('title', moment(cellData, "X").format(date_format + ' ' + time_format));
-  }
-};
-
 user_ip_table_options = {
     "destroy": true,
     "language": {
         "search": "Search: ",
-        "lengthMenu": "Show _MENU_ entries per page",
-        "info": "Showing _START_ to _END_ of _TOTAL_ results",
-        "infoEmpty": "Showing 0 to 0 of 0 entries",
-        "infoFiltered": "(filtered from _MAX_ total entries)",
+        "lengthMenu":"Show _MENU_ entries per page",
+        "info":"Showing _START_ to _END_ of _TOTAL_ results",
+        "infoEmpty":"Showing 0 to 0 of 0 entries",
+        "infoFiltered":"(filtered from _MAX_ total entries)",
         "emptyTable": "No data in table",
-        "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
     },
     "stateSave": true,
-    "stateSaveParams": function (settings, data) {
-        data.search.search = "";
-        data.start = 0;
-    },
-    "stateDuration": 0,
-    "pagingType": "full_numbers",
+    "pagingType": "bootstrap",
     "processing": false,
     "serverSide": true,
-    "pageLength": 25,
+    "pageLength": 10,
     "order": [ 0, 'desc'],
     "autoWidth": false,
-    "scrollX": true,
     "columnDefs": [
         {
             "targets": [0],
-            "data": "last_seen",
-            "render": seenRender,
-            "createdCell": seenCreatedCell,
+            "data":"last_seen",
+            "render": function ( data, type, full ) {
+                return moment(data, "X").fromNow();
+            },
             "searchable": false,
-            "width": "12%",
-            "className": "no-wrap"
+            "width": "15%",
+            "className": "no-wrap hidden-xs"
         },
         {
             "targets": [1],
-            "data": "first_seen",
-            "render": seenRender,
-            "createdCell": seenCreatedCell,
-            "searchable": false,
-            "width": "12%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [2],
             "data": "ip_address",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData) {
-                    isPrivateIP(cellData).then(function () {
-                        $(td).html(cellData || 'n/a');
-                    }, function () {
-                        external_ip = '<span class="external-ip-tooltip" data-toggle="tooltip" title="External IP"><i class="fa fa-map-marker fa-fw"></i></span>';
-                        $(td).html('<a href="javascript:void(0)" data-toggle="modal" data-target="#ip-info-modal">' + external_ip + cellData + '</a>');
-                    });
+                    if (isPrivateIP(cellData)) {
+                        if (cellData != '') {
+                            $(td).html(cellData);
+                        } else {
+                            $(td).html('n/a');
+                        }
+                    } else {
+                        $(td).html('<a href="javascript:void(0)" data-toggle="modal" data-target="#ip-info-modal"><span data-toggle="ip-tooltip" data-placement="left" title="IP Address Info" id="ip-info"><i class="fa fa-map-marker"></i></span>&nbsp' + cellData +'</a>');
+                    }
                 } else {
                     $(td).html('n/a');
                 }
             },
-            "width": "12%",
+            "width": "15%",
             "className": "no-wrap modal-control-ip"
         },
         {
-            "targets": [3],
+            "targets": [2],
             "data": "platform",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData !== '') {
                     $(td).html(cellData);
                 }
             },
-            "width": "12%",
-            "className": "no-wrap"
+            "width": "15%",
+            "className": "no-wrap hidden-md hidden-sm hidden-xs modal-control"
         },
         {
-            "targets": [4],
-            "data": "player",
+            "targets": [3],
+            "data":"player",
             "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
+                if (cellData) {
                     var transcode_dec = '';
-                    if (rowData['transcode_decision'] === 'transcode') {
-                        transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Transcode"><i class="fa fa-server fa-fw"></i></span>';
-                    } else if (rowData['transcode_decision'] === 'copy') {
-                        transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Stream"><i class="fa fa-stream fa-fw"></i></span>';
-                    } else if (rowData['transcode_decision'] === 'direct play') {
-                        transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Play"><i class="fa fa-play-circle fa-fw"></i></span>';
-                    }
-                    $(td).html('<div><a href="#" data-target="#info-modal" data-toggle="modal"><div style="float: left;">' + transcode_dec + '&nbsp;' + cellData + '</div></a></div>');
-                }
-            },
-            "width": "12%",
-            "className": "no-wrap modal-control"
-        },
-        {
-            "targets": [5],
-            "data": "last_played",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== '') {
-                    var icon = '';
-                    var icon_title = '';
-                    var parent_info = '';
-                    var media_type = '';
-                    var thumb_popover = '';
-                    var fallback = (rowData['live']) ? 'poster-live' : 'poster';
-                    if (rowData['media_type'] === 'movie') {
-                        icon = (rowData['live']) ? 'fa-broadcast-tower' : 'fa-film';
-                        icon_title = (rowData['live']) ? 'Live TV' : 'Movie';
-                        if (rowData['year']) { parent_info = ' (' + rowData['year'] + ')'; }
-                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="' + icon_title + '"><i class="fa ' + icon + ' fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 450, null, null, null, fallback) + '" data-height="120" data-width="80">' + cellData + parent_info + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key'], rowData['guid'], true, rowData['live']) + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
-                    } else if (rowData['media_type'] === 'episode') {
-                        icon = (rowData['live']) ? 'fa-broadcast-tower' : 'fa-television';
-                        icon_title = (rowData['live']) ? 'Live TV' : 'Episode';
-                        if (!isNaN(parseInt(rowData['parent_media_index'])) && !isNaN(parseInt(rowData['media_index']))) { parent_info = ' (' + short_season(rowData['parent_title']) + ' &middot; E' + rowData['media_index'] + ')'; }
-                        else if (rowData['live'] && rowData['originally_available_at']) { parent_info = ' (' + rowData['originally_available_at'] + ')'; }
-                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="' + icon_title + '"><i class="fa ' + icon + ' fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 450, null, null, null, fallback) + '" data-height="120" data-width="80">' + cellData + parent_info + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key'], rowData['guid'], true, rowData['live']) + '"><div style="float: left;" >' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
-                    } else if (rowData['media_type'] === 'track') {
-                        if (rowData['parent_title']) { parent_info = ' (' + rowData['parent_title'] + ')'; }
-                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Track"><i class="fa fa-music fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 300, null, null, null, 'cover') + '" data-height="80" data-width="80">' + cellData + parent_info + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key'], rowData['guid'], true, rowData['live']) + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
-                    } else if (rowData['media_type']) {
-                        $(td).html('<a href="' + page('info', rowData['rating_key']) + '">' + cellData + '</a>');
+                    if (rowData['video_decision'] === 'transcode') {
+                        transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Transcode"><i class="fa fa-server fa-fw"></i></span>&nbsp';
+                    } else if (rowData['video_decision'] === 'copy') {
+                        transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Stream"><i class="fa fa-video-camera fa-fw"></i></span>&nbsp';
+                    } else if (rowData['video_decision'] === 'direct play' || rowData['video_decision'] === '') {
+                        transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Play"><i class="fa fa-play-circle fa-fw"></i></span>&nbsp';
                     }
+                    $(td).html('<div><a href="#" data-target="#info-modal" data-toggle="modal"><div style="float: left;">' + transcode_dec + '&nbsp' + cellData + '</div></a></div>');
                 } else {
                     $(td).html('n/a');
                 }
             },
-            "width": "30%",
-            "className": "datatable-wrap"
+            "width": "15%",
+            "className": "no-wrap hidden-md hidden-sm hidden-xs modal-control"
         },
         {
-            "targets": [6],
-            "data": "play_count",
+            "targets": [4],
+            "data":"last_watched",
+            "createdCell": function (td, cellData, rowData, row, col) {
+                if (cellData !== '') {
+                    var media_type = '';
+                    var thumb_popover = ''
+                    if (rowData['media_type'] === 'movie') {
+                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Movie"><i class="fa fa-film fa-fw"></i></span>';
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=80&height=120&fallback=poster" data-height="120">' + cellData + '</span>'
+                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;">' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
+                    } else if (rowData['media_type'] === 'episode') {
+                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Episode"><i class="fa fa-television fa-fw"></i></span>';
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=80&height=120&fallback=poster" data-height="120">' + cellData + '</span>'
+                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;" >' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
+                    } else if (rowData['media_type'] === 'track') {
+                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Track"><i class="fa fa-music fa-fw"></i></span>';
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=80&height=80&fallback=poster" data-height="80">' + cellData + '</span>'
+                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;">' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
+                    } else if (rowData['media_type']) {
+                        $(td).html('<a href="info?item_id=' + rowData['id'] + '">' + cellData + '</a>');
+                    } else {
+                        $(td).html('n/a');
+                    }
+                }
+            },
+            "width": "30%",
+            "className": "hidden-sm hidden-xs"
+        },
+        {
+            "targets": [5],
+            "data":"play_count",
             "searchable": false,
-            "width": "10%",
-            "className": "no-wrap"
+            "width": "10%"
             }
     ],
     "drawCallback": function (settings) {
@@ -166,35 +121,30 @@ user_ip_table_options = {
         $('#ajaxMsg').fadeOut();
 
         // Create the tooltips.
-        $('body').tooltip({
-            selector: '[data-toggle="tooltip"]',
-            container: 'body'
-        });
-        $('body').popover({
-            selector: '[data-toggle="popover"]',
+        $('.transcode-tooltip').tooltip();
+        $('.media-type-tooltip').tooltip();
+        $('.watched-tooltip').tooltip();
+        $('.thumb-tooltip').popover({
             html: true,
-            sanitize: false,
-            container: 'body',
             trigger: 'hover',
             placement: 'right',
-            template: '<div class="popover history-thumbnail-popover" role="tooltip"><div class="arrow" style="top: 50%;"></div><div class="popover-content"></div></div>',
             content: function () {
-                return '<div class="history-thumbnail" style="background-image: url(' + $(this).data('img') + '); height: ' + $(this).data('height') + 'px;" />';
+                return '<div style="background-image: url(' + $(this).data('img') + '); width: 80px; height: ' + $(this).data('height') + 'px;" />';
             }
         });
 
     },
     "preDrawCallback": function(settings) {
-        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbsp; Fetching rows...";
+        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...";
         showMsg(msg, false, false, 0)
     }
 }
 
-$('.user_ip_table').on('mouseenter', 'td.modal-control span', function () {
+$('#user_ip_table').on('mouseenter', 'td.modal-control span', function () {
     $(this).tooltip();
 });
 
-$('.user_ip_table').on('click', 'td.modal-control', function () {
+$('#user_ip_table').on('click', 'td.modal-control', function () {
     var tr = $(this).parents('tr');
     var row = user_ip_table.row(tr);
     var rowData = row.data();
@@ -202,7 +152,7 @@ $('.user_ip_table').on('click', 'td.modal-control', function () {
     function showStreamDetails() {
         $.ajax({
             url: 'get_stream_data',
-            data: { row_id: rowData['history_row_id'], user: rowData['friendly_name'] },
+            data: { row_id: rowData['id'], user: rowData['friendly_name'] },
             cache: false,
             async: true,
             complete: function (xhr, status) {
@@ -213,14 +163,25 @@ $('.user_ip_table').on('click', 'td.modal-control', function () {
     showStreamDetails();
 });
 
-$('.user_ip_table').on('click', 'td.modal-control-ip', function () {
+$('#user_ip_table').on('click', 'td.modal-control-ip', function () {
     var tr = $(this).parents('tr');
     var row = user_ip_table.row( tr );
     var rowData = row.data();
 
-    $.get('get_ip_address_details', {
-        ip_address: rowData['ip_address']
-    }).then(function (jqXHR) {
-        $("#ip-info-modal").html(jqXHR);
-    });
+    function getUserLocation(ip_address) {
+        if (isPrivateIP(ip_address)) {
+            return "n/a"
+        } else {
+            $.ajax({
+                url: 'get_ip_address_details',
+                data: {ip_address: ip_address},
+                async: true,
+                complete: function(xhr, status) {
+                    $("#ip-info-modal").html(xhr.responseText);
+                }
+            });
+        }
+    }
+
+    getUserLocation(rowData['ip_address']);
 });
\ No newline at end of file
diff --git a/data/interfaces/default/js/tables/users.js b/data/interfaces/default/js/tables/users.js
index 524ee09a..78240a3e 100644
--- a/data/interfaces/default/js/tables/users.js
+++ b/data/interfaces/default/js/tables/users.js
@@ -1,58 +1,32 @@
-var users_to_delete = [];
 var users_to_purge = [];
 
-function toggleEditNames() {
-    if ($('.edit-control').hasClass('hidden')) {
-        $('.edit-user-control > .edit-user-name').each(function () {
-            a = $(this).children('a');
-            input = $(this).children('input');
-            a.text(input.val());
-            a.removeClass('hidden');
-            input.addClass('hidden');
-        });
-    } else {
-        $('.edit-user-control > .edit-user-name').each(function () {
-            $(this).children('a').addClass('hidden');
-            $(this).children('input').removeClass('hidden');
-        });
-    }
-}
-
 users_list_table_options = {
     "language": {
         "search": "Search: ",
-        "lengthMenu": "Show _MENU_ entries per page",
-        "info": "Showing _START_ to _END_ of _TOTAL_ active users",
-        "infoEmpty": "Showing 0 to 0 of 0 entries",
-        "infoFiltered": "",
+        "lengthMenu":"Show _MENU_ entries per page",
+        "info":"Showing _START_ to _END_ of _TOTAL_ active users",
+        "infoEmpty":"Showing 0 to 0 of 0 entries",
+        "infoFiltered":"",
         "emptyTable": "No data in table",
-        "loadingRecords": '<i class="fa fa-refresh fa-spin"></i> Loading items...</div>'
     },
     "destroy": true,
     "processing": false,
     "serverSide": true,
-    "pageLength": 25,
+    "pageLength": 10,
     "order": [ 2, 'asc'],
+    "autoWidth": true,
     "stateSave": true,
-    "stateSaveParams": function (settings, data) {
-        data.search.search = "";
-        data.start = 0;
-    },
-    "stateDuration": 0,
-    "pagingType": "full_numbers",
-    "autoWidth": false,
-    "scrollX": true,
+    "pagingType": "bootstrap",
     "columnDefs": [
         {
             "targets": [0],
             "data": null,
             "createdCell": function (td, cellData, rowData, row, col) {
-                $(td).html('<div class="edit-user-toggles">' + 
-                    '<button class="btn btn-xs btn-warning delete-user" data-id="' + rowData['row_id'] + '" data-toggle="button"><i class="fa fa-trash-o fa-fw"></i> Delete</button>&nbsp' +
-                    '<button class="btn btn-xs btn-warning purge-user" data-id="' + rowData['row_id'] + '" data-toggle="button"><i class="fa fa-eraser fa-fw"></i> Purge</button>&nbsp&nbsp&nbsp' +
-                    '<input type="checkbox" id="keep_history-' + rowData['user_id'] + '" name="keep_history" value="1" ' + (rowData['keep_history'] ? 'checked' : '') + '><label class="edit-tooltip" for="keep_history-' + rowData['user_id'] + '" data-toggle="tooltip" title="Toggle History"><i class="fa fa-history fa-lg fa-fw"></i></label>&nbsp' +
-                    '<input type="checkbox" id="allow_guest-' + rowData['user_id'] + '" name="allow_guest" value="1" ' + (rowData['allow_guest'] ? 'checked' : '') + '><label class="edit-tooltip" for="allow_guest-' + rowData['user_id'] + '" data-toggle="tooltip" title="Toggle Guest Access"><i class="fa fa-unlock-alt fa-lg fa-fw"></i></label>&nbsp' +
-                    '</div>');
+                $(td).html('<div class="edit-user-toggles"><button class="btn btn-xs btn-warning" data-id="' + rowData['user_id'] + '" data-toggle="button"><i class="fa fa-eraser fa-fw"></i> Purge</button>&nbsp&nbsp&nbsp' +
+                    '<input type="checkbox" id="do_notify-' + rowData['user_id'] + '" name="do_notify" value="1" ' + rowData['do_notify'] + '><label class="edit-tooltip" for="do_notify-' + rowData['user_id'] + '" data-toggle="tooltip" title="Toggle Notifications"><i class="fa fa-bell fa-lg fa-fw"></i></label>&nbsp' +
+                    '<input type="checkbox" id="keep_history-' + rowData['user_id'] + '" name="keep_history" value="1" ' + rowData['keep_history'] + '><label class="edit-tooltip" for="keep_history-' + rowData['user_id'] + '" data-toggle="tooltip" title="Toggle History"><i class="fa fa-history fa-lg fa-fw"></i></label>&nbsp');
+                    // Show/hide user currently doesn't work
+                    //'<input type="checkbox" id="show_hide-' + rowData['user_id'] + '" name="show_hide" value="1" checked><label class="edit-tooltip" for="show_hide-' + rowData['user_id'] + '" data-toggle="tooltip" title="Show/Hide User"><i class="fa fa-eye fa-lg fa-fw"></i></label>');
             },
             "width": "7%",
             "className": "edit-control no-wrap hidden",
@@ -63,9 +37,11 @@ users_list_table_options = {
             "targets": [1],
             "data": "user_thumb",
             "createdCell": function (td, cellData, rowData, row, col) {
-                var inactive = '';
-                if (!rowData['is_active']) { inactive = '<span class="inactive-user-tooltip" data-toggle="tooltip" title="User not on Plex server"><i class="fa fa-exclamation-triangle"></i></span>'; }
-                $(td).html('<a href="' + page('user', rowData['user_id']) + '"" title="' + rowData['username'] + '"><div class="users-poster-face" style="background-image: url(' + page('pms_image_proxy', cellData, null, 80, 80, null, null, null, 'user') + ');">' + inactive + '</div></a>');
+                if (cellData === '') {
+                    $(td).html('<a href="user?user_id=' + rowData['user_id'] + '"><div class="users-poster-face" style="background-image: url(interfaces/default/images/gravatar-default-80x80.png);"></div></a>');
+                } else {
+                    $(td).html('<a href="user?user_id=' + rowData['user_id'] + '"><div class="users-poster-face" style="background-image: url(' + cellData + ');"></div></a>');
+                }
             },
             "orderable": false,
             "searchable": false,
@@ -76,13 +52,16 @@ users_list_table_options = {
             "targets": [2],
             "data": "friendly_name",
             "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html('<div class="edit-user-name" data-id="' + rowData['row_id'] + '">' +
-                        '<a href="' + page('user', rowData['user_id']) + '" title="' + rowData['username'] + '">' + cellData + '</a>' +
-                        '<input type="text" class="hidden" value="' + cellData + '">' +
-                        '</div>');
+                if (cellData !== '') {
+                    if (rowData['user_id'] > 0) {
+                        $(td).html('<div class="edit-user-name" data-id="' + rowData['user_id'] + '"><a href="user?user_id=' + rowData['user_id'] + '">' + cellData + '</a>' +
+                            '<input type="text" class="hidden" value="' + cellData + '"></div>');
+                    } else {
+                        $(td).html('<div class="edit-user-name" data-id="' + rowData['user_id'] + '"><a href="user?user=' + rowData['user'] + '">' + cellData + '</a>' +
+                            '<input type="text" class="hidden" value="' + cellData + '"></div>');
+                    }
                 } else {
-                    $(td).html('n/a');
+                    $(td).html(cellData);
                 }
             },
             "width": "10%",
@@ -90,170 +69,107 @@ users_list_table_options = {
         },
         {
             "targets": [3],
-            "data": "username",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "visible": false,
-            "width": "10%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [4],
-            "data": "title",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "visible": false,
-            "width": "10%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [5],
-            "data": "email",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
-            "visible": false,
-            "width": "10%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [6],
             "data": "last_seen",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html(moment(cellData, "X").fromNow());
+            "render": function ( data, type, full ) {
+                if (data) {
+                    return moment(data, "X").fromNow();
                 } else {
-                    $(td).html("never");
+                    return "never";
                 }
             },
             "searchable": false,
             "width": "10%",
-            "className": "no-wrap"
+            "className": "no-wrap hidden-xs"
         },
         {
-            "targets": [7],
+            "targets": [4],
             "data": "ip_address",
             "createdCell": function (td, cellData, rowData, row, col) {
                 if (cellData) {
-                    isPrivateIP(cellData).then(function () {
-                        $(td).html(cellData || 'n/a');
-                    }, function () {
-                        external_ip = '<span class="external-ip-tooltip" data-toggle="tooltip" title="External IP"><i class="fa fa-map-marker fa-fw"></i></span>';
-                        $(td).html('<a href="javascript:void(0)" data-toggle="modal" data-target="#ip-info-modal">' + external_ip + cellData + '</a>');
-                    });
+                    if (isPrivateIP(cellData)) {
+                        if (cellData != '') {
+                            $(td).html(cellData);
+                        } else {
+                            $(td).html('n/a');
+                        }
+                    } else {
+                        $(td).html('<a href="javascript:void(0)" data-toggle="modal" data-target="#ip-info-modal"><span data-toggle="ip-tooltip" data-placement="left" title="IP Address Info" id="ip-info"><i class="fa fa-map-marker"></i></span>&nbsp' + cellData + '</a>');
+                    }
                 } else {
                     $(td).html('n/a');
                 }
             },
             "width": "10%",
-            "className": "no-wrap modal-control-ip"
+            "className": "no-wrap hidden-md hidden-sm hidden-xs modal-control-ip"
         },
         {
-            "targets": [8],
+            "targets": [5],
             "data": "platform",
             "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
+                if (cellData !== '') {
                     $(td).html(cellData);
                 } else {
                     $(td).html('n/a');
                 }
             },
             "width": "10%",
-            "className": "no-wrap modal-control"
+            "className": "no-wrap hidden-md hidden-sm hidden-xs modal-control"
         },
         {
-            "targets": [9],
+            "targets": [6],
             "data":"player",
             "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
+                if (cellData) {
                     var transcode_dec = '';
-                    if (rowData['transcode_decision'] === 'transcode') {
+                    if (rowData['video_decision'] === 'transcode') {
                         transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Transcode"><i class="fa fa-server fa-fw"></i></span>';
-                    } else if (rowData['transcode_decision'] === 'copy') {
-                        transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Stream"><i class="fa fa-stream fa-fw"></i></span>';
-                    } else if (rowData['transcode_decision'] === 'direct play') {
+                    } else if (rowData['video_decision'] === 'copy') {
+                        transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Stream"><i class="fa fa-video-camera fa-fw"></i></span>';
+                    } else if (rowData['video_decision'] === 'direct play' || rowData['video_decision'] === '') {
                         transcode_dec = '<span class="transcode-tooltip" data-toggle="tooltip" title="Direct Play"><i class="fa fa-play-circle fa-fw"></i></span>';
                     }
-                    $(td).html('<div><a href="#" data-target="#info-modal" data-toggle="modal"><div style="float: left;">' + transcode_dec + '&nbsp;' + cellData + '</div></a></div>');
+                    $(td).html('<div><a href="#" data-target="#info-modal" data-toggle="modal"><div style="float: left;">' + transcode_dec + '&nbsp' + cellData + '</div></a></div>');
                 } else {
                     $(td).html('n/a');
                 }
             },
             "width": "15%",
-            "className": "no-wrap modal-control"
+            "className": "no-wrap hidden-md hidden-sm hidden-xs modal-control"
         },
         {
-            "targets": [10],
-            "data":"last_played",
+            "targets": [7],
+            "data":"last_watched",
             "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    var icon = '';
-                    var icon_title = '';
-                    var parent_info = '';
+                if (cellData !== '') {
                     var media_type = '';
-                    var thumb_popover = '';
-                    var fallback = (rowData['live']) ? 'poster-live' : 'poster';
+                    var thumb_popover = ''
                     if (rowData['media_type'] === 'movie') {
-                        icon = (rowData['live']) ? 'fa-broadcast-tower' : 'fa-film';
-                        icon_title = (rowData['live']) ? 'Live TV' : 'Movie';
-                        if (rowData['year']) { parent_info = ' (' + rowData['year'] + ')'; }
-                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="' + icon_title + '"><i class="fa ' + icon + ' fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 450, null, null, null, fallback) + '" data-height="120" data-width="80">' + cellData + parent_info + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key'], rowData['guid'], true, rowData['live']) + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
+                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Movie"><i class="fa fa-film fa-fw"></i></span>';
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=80&height=120&fallback=poster" data-height="120">' + cellData + '</span>'
+                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;">' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type'] === 'episode') {
-                        icon = (rowData['live']) ? 'fa-broadcast-tower' : 'fa-television';
-                        icon_title = (rowData['live']) ? 'Live TV' : 'Episode';
-                        if (!isNaN(parseInt(rowData['parent_media_index'])) && !isNaN(parseInt(rowData['media_index']))) { parent_info = ' (' + short_season(rowData['parent_title']) + ' &middot; E' + rowData['media_index'] + ')'; }
-                        else if (rowData['live'] && rowData['originally_available_at']) { parent_info = ' (' + rowData['originally_available_at'] + ')'; }
-                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="' + icon_title + '"><i class="fa ' + icon + ' fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 450, null, null, null, fallback) + '" data-height="120" data-width="80">' + cellData + parent_info + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key'], rowData['guid'], true, rowData['live']) + '"><div style="float: left;" >' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
+                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Episode"><i class="fa fa-television fa-fw"></i></span>';
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=80&height=120&fallback=poster" data-height="120">' + cellData + '</span>'
+                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;" >' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type'] === 'track') {
-                        if (rowData['parent_title']) { parent_info = ' (' + rowData['parent_title'] + ')'; }
                         media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Track"><i class="fa fa-music fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="' + page('pms_image_proxy', rowData['thumb'], rowData['rating_key'], 300, 300, null, null, null, 'cover') + '" data-height="80" data-width="80">' + cellData + parent_info + '</span>';
-                        $(td).html('<div class="history-title"><a href="' + page('info', rowData['rating_key'], rowData['guid'], true, rowData['live']) + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=80&height=80&fallback=poster" data-height="80">' + cellData + '</span>'
+                        $(td).html('<div class="history-title"><a href="info?source=history&item_id=' + rowData['id'] + '"><div style="float: left;">' + media_type + '&nbsp' + thumb_popover + '</div></a></div>');
                     } else if (rowData['media_type']) {
-                        $(td).html('<a href="' + page('info', rowData['rating_key']) + '">' + cellData + '</a>');
+                        $(td).html('<a href="info?item_id=' + rowData['id'] + '">' + cellData + '</a>');
+                    } else {
+                        $(td).html('n/a');
                     }
-                } else {
-                    $(td).html('n/a');
                 }
             },
-            "width": "23%",
-            "className": "datatable-wrap"
+            "width": "30%",
+            "className": "hidden-sm hidden-xs"
         },
         {
-            "targets": [11],
+            "targets": [8],
             "data": "plays",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html(cellData);
-                }
-            },
             "searchable": false,
-            "width": "7%",
-            "className": "no-wrap"
-        },
-        {
-            "targets": [12],
-            "data": "duration",
-            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData !== null && cellData !== '') {
-                    $(td).html(humanDuration(cellData, 'dhm', 's', false));
-                }
-            },
-            "searchable": false,
-            "width": "10%",
-            "className": "no-wrap"
+            "width": "10%"
         }
 
     ],
@@ -263,20 +179,17 @@ users_list_table_options = {
         $('#ajaxMsg').fadeOut();
 
         // Create the tooltips.
-        $('body').tooltip({
-            selector: '[data-toggle="tooltip"]',
-            container: 'body'
-        });
-        $('body').popover({
-            selector: '[data-toggle="popover"]',
+        $('.purge-tooltip').tooltip();
+        $('.edit-tooltip').tooltip();
+        $('.transcode-tooltip').tooltip();
+        $('.media-type-tooltip').tooltip();
+        $('.watched-tooltip').tooltip();
+        $('.thumb-tooltip').popover({
             html: true,
-            sanitize: false,
-            container: 'body',
             trigger: 'hover',
             placement: 'right',
-            template: '<div class="popover history-thumbnail-popover" role="tooltip"><div class="arrow" style="top: 50%;"></div><div class="popover-content"></div></div>',
             content: function () {
-                return '<div class="history-thumbnail" style="background-image: url(' + $(this).data('img') + '); height: ' + $(this).data('height') + 'px; width: ' + $(this).data('width') + 'px;" />';
+                return '<div style="background-image: url(' + $(this).data('img') + '); width: 80px; height: ' + $(this).data('height') + 'px;" />';
             }
         });
 
@@ -284,19 +197,15 @@ users_list_table_options = {
             $('.edit-control').each(function () {
                 $(this).removeClass('hidden');
             });
-            toggleEditNames();
         }
     },
     "preDrawCallback": function(settings) {
-        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbsp; Fetching rows...";
+        var msg = "<i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...";
         showMsg(msg, false, false, 0)
     },
     "rowCallback": function (row, rowData) {
-        if ($.inArray(rowData['user_id'], users_to_delete) !== -1) {
-            $(row).find('button.delete-user[data-id="' + rowData['row_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
-        }
         if ($.inArray(rowData['user_id'], users_to_purge) !== -1) {
-            $(row).find('button.purge-user[data-id="' + rowData['row_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
+            $(row).find('button[data-id="' + rowData['user_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
         }
     }
 }
@@ -306,12 +215,18 @@ $('#users_list_table').on('click', 'td.modal-control', function () {
     var row = users_list_table.row(tr);
     var rowData = row.data();
 
-    $.get('get_stream_data', {
-        row_id: rowData['history_row_id'],
-        user: rowData['friendly_name']
-    }).then(function (jqXHR) {
-        $("#info-modal").html(jqXHR);
-    });
+    function showStreamDetails() {
+        $.ajax({
+            url: 'get_stream_data',
+            data: { row_id: rowData['id'], user: rowData['friendly_name'] },
+            cache: false,
+            async: true,
+            complete: function (xhr, status) {
+                $("#info-modal").html(xhr.responseText);
+            }
+        });
+    }
+    showStreamDetails();
 });
 
 $('#users_list_table').on('click', 'td.modal-control-ip', function () {
@@ -319,11 +234,22 @@ $('#users_list_table').on('click', 'td.modal-control-ip', function () {
     var row = users_list_table.row(tr);
     var rowData = row.data();
 
-    $.get('get_ip_address_details', {
-        ip_address: rowData['ip_address']
-    }).then(function (jqXHR) {
-        $("#ip-info-modal").html(jqXHR);
-    });
+    function getUserLocation(ip_address) {
+        if (isPrivateIP(ip_address)) {
+            return "n/a"
+        } else {
+            $.ajax({
+                url: 'get_ip_address_details',
+                data: { ip_address: ip_address },
+                async: true,
+                complete: function (xhr, status) {
+                    $("#ip-info-modal").html(xhr.responseText);
+                }
+            });
+        }
+    }
+
+    getUserLocation(rowData['ip_address']);
 });
 
 $('#users_list_table').on('change', 'td.edit-control > .edit-user-toggles > input, td.edit-user-control > .edit-user-name > input', function () {
@@ -331,14 +257,14 @@ $('#users_list_table').on('change', 'td.edit-control > .edit-user-toggles > inpu
     var row = users_list_table.row(tr);
     var rowData = row.data();
 
+    var do_notify = 0;
     var keep_history = 0;
-    var allow_guest = 0;
+    if ($('#do_notify-' + rowData['user_id']).is(':checked')) {
+        do_notify = 1;
+    }
     if ($('#keep_history-' + rowData['user_id']).is(':checked')) {
         keep_history = 1;
     }
-    if ($('#allow_guest-' + rowData['user_id']).is(':checked')) {
-        allow_guest = 1;
-    }
 
     friendly_name = tr.find('td.edit-user-control > .edit-user-name > input').val();
 
@@ -347,8 +273,8 @@ $('#users_list_table').on('change', 'td.edit-control > .edit-user-toggles > inpu
         data: {
             user_id: rowData['user_id'],
             friendly_name: friendly_name,
+            do_notify: do_notify,
             keep_history: keep_history,
-            allow_guest: allow_guest,
             thumb: rowData['user_thumb']
         },
         cache: false,
@@ -360,44 +286,16 @@ $('#users_list_table').on('change', 'td.edit-control > .edit-user-toggles > inpu
     });
 });
 
-$('#users_list_table').on('click', 'td.edit-control > .edit-user-toggles > button.delete-user', function () {
+$('#users_list_table').on('click', 'td.edit-control > .edit-user-toggles > button', function () {
     var tr = $(this).parents('tr');
     var row = users_list_table.row(tr);
     var rowData = row.data();
 
-    var index_delete = $.inArray(rowData['row_id'], users_to_delete);
-    var index_purge = $.inArray(rowData['row_id'], users_to_purge);
-
-    if (index_delete === -1) {
-        users_to_delete.push(rowData['row_id']);
-        if (index_purge === -1) {
-            tr.find('button.purge-user').click();
-        }
+    var index = $.inArray(rowData['user_id'], users_to_purge);
+    if (index === -1) {
+        users_to_purge.push(rowData['user_id']);
     } else {
-        users_to_delete.splice(index_delete, 1);
-        if (index_purge != -1) {
-            tr.find('button.purge-user').click();
-        }
-    }
-    $(this).toggleClass('btn-warning').toggleClass('btn-danger');
-
-});
-
-$('#users_list_table').on('click', 'td.edit-control > .edit-user-toggles > button.purge-user', function () {
-    var tr = $(this).parents('tr');
-    var row = users_list_table.row(tr);
-    var rowData = row.data();
-
-    var index_delete = $.inArray(rowData['row_id'], users_to_delete);
-    var index_purge = $.inArray(rowData['row_id'], users_to_purge);
-
-    if (index_purge === -1) {
-        users_to_purge.push(rowData['row_id']);
-    } else {
-        users_to_purge.splice(index_purge, 1);
-        if (index_delete != -1) {
-            tr.find('button.delete-user').click();
-        }
+        users_to_purge.splice(index, 1);
     }
     $(this).toggleClass('btn-warning').toggleClass('btn-danger');
 });
\ No newline at end of file
diff --git a/data/interfaces/default/libraries.html b/data/interfaces/default/libraries.html
deleted file mode 100644
index 70468ff3..00000000
--- a/data/interfaces/default/libraries.html
+++ /dev/null
@@ -1,209 +0,0 @@
-<%inherit file="base.html"/>
-
-<%def name="headIncludes()">
-<link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.min.css">
-<link rel="stylesheet" href="${http_root}css/dataTables.colVis.css">
-<link rel="stylesheet" href="${http_root}css/tautulli-dataTables.css">
-</%def>
-
-<%def name="body()">
-<div class='container-fluid'>
-    <div class='table-card-header'>
-        <div class="header-bar">
-            <span id="libraries-xml"><i class="fa fa-book"></i> All Libraries</span>
-        </div>
-        <div class="button-bar">
-            % if _session['user_group'] == 'admin':
-            <div class="btn-group">
-                <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
-                    <i class="fa fa-pencil"></i> Edit mode
-                </button>
-            </div>
-            <div class="btn-group">
-                <button class="btn btn-dark refresh-libraries-button" id="refresh-libraries-list"><i class="fa fa-refresh"></i> Refresh libraries</button>
-            </div>
-            % endif
-            <div class="btn-group colvis-button-bar"></div>
-        </div>
-    </div>
-    <div class='table-card-back'>
-        <table id="libraries_list_table" class="display" width="100%">
-            <thead>
-            <tr>
-                <th align="left" id="edit_row">Edit</th>
-                <th align="right" id="library_thumb"></th>
-                <th align="left" id="section_name">Library Name</th>
-                <th align="left" id="section_type">Library Type</th>
-                <th align="left" id="count">Total Movies / TV Shows / Artists</th>
-                <th align="left" id="parent_count">Total Seasons / Albums</th>
-                <th align="left" id="child_count">Total Episodes / Tracks</th>
-                <th align="left" id="last_accessed">Last Streamed</th>
-                <th align="left" id="last_played">Last Played</th>
-                <th align="left" id="total_plays">Total Plays</th>
-                <th align="left" id="total_duration">Total Played Duration</th>
-            </tr>
-            </thead>
-            <tbody>
-            </tbody>
-        </table>
-    </div>
-</div>
-
-</%def>
-
-<%def name="modalIncludes()">
-<div class="modal fade" id="confirm-modal-delete" tabindex="-1" role="dialog" aria-labelledby="confirm-modal-delete">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title" id="myModalLabel">Confirm Delete/Purge</h4>
-            </div>
-            <div class="modal-body" style="text-align: center;">
-                <ul id="libraries-to-delete" class="list-unstyled"></ul>
-                <ul id="libraries-to-purge" class="list-unstyled"></ul>
-                <p>This is permanent and cannot be undone!</p>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-dark" data-dismiss="modal">Cancel</button>
-                <button type="button" class="btn btn-danger btn-ok" data-dismiss="modal" id="confirm-delete">Confirm</button>
-            </div>
-        </div>
-    </div>
-</div>
-</%def>
-
-<%def name="javascriptIncludes()">
-<script src="${http_root}js/jquery.dataTables.min.js"></script>
-<script src="${http_root}js/dataTables.colVis.js"></script>
-<script src="${http_root}js/dataTables.bootstrap.min.js"></script>
-<script src="${http_root}js/dataTables.bootstrap.pagination.js"></script>
-<script src="${http_root}js/tables/libraries.js${cache_param}"></script>
-<script>
-    $(document).ready(function () {
-        libraries_list_table_options.ajax = {
-            url: 'get_library_list',
-            type: 'POST',
-            data: function ( d ) {
-                return { 
-                    json_data: JSON.stringify(d)
-                };
-            }
-        };
-
-        libraries_list_table = $('#libraries_list_table').DataTable(libraries_list_table_options);
-        var colvis = new $.fn.dataTable.ColVis(libraries_list_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark', exclude: [0, 1] });
-        $(colvis.button()).appendTo('div.colvis-button-bar');
-
-        clearSearchButton('libraries_list_table', libraries_list_table);
-
-        % if _session['user_group'] == 'admin':
-        $('#row-edit-mode').on('click', function () {
-            $('#libraries-to-delete').html('');
-            $('#libraries-to-purge').html('');
-
-            if ($(this).hasClass('active')) {
-                $(this).tooltip('destroy');
-
-                if (libraries_to_purge.length > 0) {
-                    $('.edit-control').each(function () {
-                        $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
-                    });
-
-                    libraries_to_purge = $.grep(libraries_to_purge, function (value) {
-                        return $.inArray(value, libraries_to_delete) < 0;
-                    });
-
-                    if (libraries_to_delete.length > 0) {
-                        $('#libraries-to-delete').prepend('<p>Are you REALLY sure you want to delete the following libraries:</p>');
-                        for (var i = 0; i < libraries_to_delete.length; i++) {
-                            $('#libraries-to-delete').append('<li>' + $('div[data-id=' + libraries_to_delete[i] + ']').text() + '</li>');
-                        }
-                    }
-
-                    if (libraries_to_purge.length > 0) {
-                        $('#libraries-to-purge').prepend('<p>Are you REALLY sure you want to purge all history for the following libraries:</p>');
-                        for (var i = 0; i < libraries_to_purge.length; i++) {
-                            $('#libraries-to-purge').append('<li>' + $('div[data-id=' + libraries_to_purge[i] + ']').text() + '</li>');
-                        }
-                    }
-
-                    $('#confirm-modal-delete').modal();
-                    $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
-                        $.ajax({
-                            url: 'delete_all_library_history',
-                            type: 'POST',
-                            data: { row_ids: libraries_to_purge.join(',') },
-                            cache: false,
-                            async: true,
-                            success: function (data) {
-                                var msg = "Library history purged";
-                                showMsg(msg, false, true, 2000);
-                                libraries_list_table.draw();
-                            }
-                        });
-                        $.ajax({
-                            url: 'delete_library',
-                            type: 'POST',
-                            data: { row_ids: libraries_to_delete.join(',') },
-                            cache: false,
-                            async: true,
-                            success: function (data) {
-                                var msg = "Library deleted";
-                                showMsg(msg, false, true, 2000);
-                                libraries_list_table.draw();
-                            }
-                        });
-                    });
-                }
-
-                $('.edit-control').each(function () {
-                    $(this).addClass('hidden');
-                    $('#row-edit-mode-alert').fadeOut(200);
-                });
-
-            } else {
-                $(this).tooltip({
-                    container: '.body-container',
-                    placement: 'bottom',
-                    title: 'Select libraries to delete/purge. Data is deleted/purged upon exiting edit mode.',
-                    trigger: 'manual'
-                }).tooltip('show');
-
-                libraries_to_delete = [];
-                libraries_to_purge = [];
-                $('.edit-control').each(function () {
-                    $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
-                    $(this).removeClass('hidden');
-                });
-            }
-        });
-        % endif
-    });
-
-    % if _session['user_group'] == 'admin':
-    $("#refresh-libraries-list").click(function () {
-        showMsg('Refreshing libraries list...', true, false);
-        $.ajax({
-            url: 'refresh_libraries_list',
-            cache: false,
-            async: true,
-            complete: function (xhr, status) {
-                var result = $.parseJSON(xhr.responseText);
-                var msg = result.message;
-                if (result.result === 'success') {
-                    showMsg('<i class="fa fa-check"></i> ' + msg, false, true, 2000, false);
-                    libraries_list_table.draw();
-                } else {
-                    showMsg('<i class="fa fa-times"></i> ' + msg, false, true, 2000, true);
-                }
-            }
-        });
-    });
-    % endif
-
-    $('#libraries-xml').on('tripleclick', function () {
-        openPlexXML('/library/sections/all');
-    });
-</script>
-</%def>
diff --git a/data/interfaces/default/library.html b/data/interfaces/default/library.html
deleted file mode 100644
index ba61153d..00000000
--- a/data/interfaces/default/library.html
+++ /dev/null
@@ -1,905 +0,0 @@
-<%doc>
-USAGE DOCUMENTATION :: PLEASE LEAVE THIS AT THE TOP OF THIS FILE
-
-For Mako templating syntax documentation please visit: http://docs.makotemplates.org/en/latest/
-
-Filename:           library.html
-Version:            0.1
-Variable names:     data [list]
-
-data :: Usable parameters
-
-section_id          Returns the library id of the library.
-section_name        Returns the name of the library.
-section_type        Returns the type of the library.
-library_thumb       Returns the thumbnail for the library.
-custom_thumb        Returns the custom thumbnail for the library.
-library_art         Returns the artwork for the library.
-count               Returns the item count for the library.
-parent_count        Returns the parent item count for the library.
-child_count         Returns the child item count for the library.
-do_notify           Returns bool value for whether to send notifications for the library.
-keep_history        Returns bool value for whether to keep history for the library.
-
-DOCUMENTATION :: END
-
-</%doc>
-
-<%inherit file="base.html"/>
-
-<%def name="headIncludes()">
-<link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.min.css">
-<link rel="stylesheet" href="${http_root}css/dataTables.colVis.css">
-<link rel="stylesheet" href="${http_root}css/tautulli-dataTables.css">
-</%def>
-
-<%def name="body()">
-% if data:
-<%
-    from plexpy.common import LIVE_TV_SECTION_ID
-    from plexpy.helpers import page
-%>
-<div class="container-fluid">
-    <div class="row">
-        % if data['library_art']:
-        <div class="art-face" style="background-image:url(${page('pms_image_proxy', data['library_art'], None, 1920, 1080)})"></div>
-        % if _session['user_group'] == 'admin':
-        <span class="overlay-refresh-image info-art" title="Refresh background image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-        % endif
-        % endif
-        <div class="summary-container">
-            <div class="summary-navbar">
-                <div class="col-md-12">
-                    <div class="summary-navbar-list">
-                        <ul class="list-unstyled breadcrumb">
-                            <li class="active">${data['section_name']}</li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-            <div class="summary-content-wrapper" style="min-height: calc(100% - 50px);">
-                <div class="col-md-12">
-                    <div class="table-card-back">
-                        <div class="user-info-wrapper">
-                            % if data['library_thumb'].startswith('http'):
-                            <div class="library-info-poster-face" style="background-image: url(${page('pms_image_proxy', data['library_thumb'], None, 80, 80)});">
-                                % if not data['is_active']:
-                                <span class="inactive-library-tooltip" data-toggle="tooltip" title="Library not on Plex server">
-                                    <i class="fa fa-2x fa-exclamation-triangle"></i>
-                                </span>
-                                % endif
-                            </div>
-                            % else:
-                            <div class="library-info-poster-face svg-icon library-${data['section_type']}">
-                                % if not data['is_active']:
-                                <span class="inactive-library-tooltip" data-toggle="tooltip" title="Library not on Plex server">
-                                    <i class="fa fa-2x fa-exclamation-triangle"></i>
-                                </span>
-                                % endif
-                            </div>
-                            % endif
-                            <div class="user-info-username">
-                                <span class="set-username">${data['section_name']}</span>
-                                % if _session['user_group'] == 'admin':
-                                <span id="edit-library-tooltip" data-target="tooltip" title="Edit library details">
-                                    <a href="#" data-toggle="modal" data-target="#edit-library-modal" id="toggle-edit-library-modal"><i class="fa fa-pencil"></i></a>
-                                </span>
-                                % endif
-                            </div>
-                            <div class="user-info-nav">
-                                <ul class="nav nav-list nav-pills" role="tablist">
-                                    <li class="active"><a id="nav-tabs-profile" href="#tabs-profile" role="tab" data-toggle="tab">Profile</a></li>
-                                    <li><a id="nav-tabs-history" href="#tabs-history" role="tab" data-toggle="tab">History</a></li>
-                                    % if data['section_id'] != LIVE_TV_SECTION_ID:
-                                    % if _session['user_group'] == 'admin':
-                                    <li><a id="nav-tabs-mediainfo" href="#tabs-mediainfo" role="tab" data-toggle="tab">Media Info</a></li>
-                                    % endif
-                                    % if data['section_type'] != 'photo':
-                                    <li><a id="nav-tabs-collections" href="#tabs-collections" role="tab" data-toggle="tab">Collections</a></li>
-                                    % endif
-                                    <li><a id="nav-tabs-playlists" href="#tabs-playlists" role="tab" data-toggle="tab">Playlists</a></li>
-                                    % if _session['user_group'] == 'admin':
-                                    <li><a id="nav-tabs-export" href="#tabs-export" role="tab" data-toggle="tab">Export</a></li>
-                                    % endif
-                                    % endif
-                                </ul>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="tab-content">
-                    <div role="tabpanel" class="tab-pane active" id="tabs-profile">
-                        <div class="container-fluid">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <div class="table-card-header">
-                                        <div class="header-bar">
-                                            <span><i class="fa fa-line-chart"></i> Global Stats</span>
-                                        </div>
-                                    </div>
-                                    <div class="table-card-back">
-                                        <div id="library-time-stats" class="user-overview-stats-wrapper">
-                                            <div class='muted'><i class="fa fa-refresh fa-spin"></i> Loading data...</div>
-                                            <br>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="container-fluid">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <div class="table-card-header">
-                                        <div class="header-bar">
-                                            <span><i class="fa fa-group"></i> User Stats</span>
-                                        </div>
-                                    </div>
-                                    <div class="table-card-back">
-                                        <div id="library-user-stats" class="user-player">
-                                            <div class='muted'><i class="fa fa-refresh fa-spin"></i> Loading data...</div>
-                                            <br>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="container-fluid">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <div class="table-card-header">
-                                        <ul class="nav nav-header nav-dashboard pull-right">
-                                            <li>
-                                                <a href="#" id="recently-watched-page-left" class="paginate-watched btn-gray disabled" data-id="-1"><i class="fa fa-lg fa-chevron-left"></i></a>
-                                            </li>
-                                            <li>
-                                                <a href="#" id="recently-watched-page-right" class="paginate-watched btn-gray disabled" data-id="+1"><i class="fa fa-lg fa-chevron-right"></i></a>
-                                            </li>
-                                        </ul>
-                                        <div class="header-bar">
-                                            <span><i class="fa fa-history"></i> Recently Played</span>
-                                        </div>
-                                    </div>
-                                    <div class="table-card-back">
-                                        <div id="library-recently-watched">
-                                            <div class='muted'><i class="fa fa-refresh fa-spin"></i> Loading data...</div>
-                                            <br>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        % if data['section_id'] != LIVE_TV_SECTION_ID:
-                        <div class="container-fluid">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <div class="table-card-header">
-                                        <ul class="nav nav-header nav-dashboard pull-right">
-                                            <li>
-                                                <a href="#" id="recently-added-page-left" class="paginate-added btn-gray disabled" data-id="-1"><i class="fa fa-lg fa-chevron-left"></i></a>
-                                            </li>
-                                            <li>
-                                                <a href="#" id="recently-added-page-right" class="paginate-added btn-gray disabled" data-id="+1"><i class="fa fa-lg fa-chevron-right"></i></a>
-                                            </li>
-                                        </ul>
-                                        <div class="header-bar">
-                                            <span><i class="fa fa-history"></i> Recently Added</span>
-                                        </div>
-                                    </div>
-                                    <div class="table-card-back">
-                                        <div id="library-recently-added">
-                                            <div class='muted'><i class="fa fa-refresh fa-spin"></i> Loading data...</div>
-                                            <br>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        % endif
-                    </div>
-                    <div role="tabpanel" class="tab-pane" id="tabs-history">
-                        <div class="container-fluid">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <div class='table-card-header'>
-                                        <div class="header-bar">
-                                            <span>
-                                                <i class="fa fa-history"></i> History for <strong>
-                                                    <span class="set-username">${data['section_name']}</span>
-                                                </strong>
-                                            </span>
-                                        </div>
-                                        <div class="button-bar">
-                                            % if _session['user_group'] == 'admin':
-                                            <div class="btn-group">
-                                                <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
-                                                    <i class="fa fa-trash-o"></i> Delete mode
-                                                </button>
-                                            </div>
-                                            % endif
-                                            <div class="btn-group" data-toggle="buttons" id="transcode_decision-selection">
-                                                <label class="btn btn-dark btn-filter">
-                                                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-direct_play" value="direct play" autocomplete="off"><i class="fa fa-play-circle"></i> Direct Play
-                                                </label>
-                                                <label class="btn btn-dark btn-filter">
-                                                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-direct_stream" value="copy" autocomplete="off"><i class="fa fa-stream"></i> Direct Stream
-                                                </label>
-                                                <label class="btn btn-dark btn-filter">
-                                                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-transcode" value="transcode" autocomplete="off"><i class="fa fa-server"></i> Transcode
-                                                </label>
-                                            </div>
-                                            <div class="btn-group">
-                                                <button class="btn btn-dark refresh-history-button" id="refresh-history-list"><i class="fa fa-refresh"></i> Refresh history</button>
-                                            </div>
-                                            <div class="btn-group colvis-button-bar" id="button-bar-history"></div>
-                                        </div>
-                                    </div>
-                                    <div class="table-card-back">
-                                        <table class="display history_table" id="history_table-SID-${data['section_id']}" width="100%">
-                                            <thead>
-                                                <tr>
-                                                    <th align="left" id="delete">Delete</th>
-                                                    <th align="left" id="date">Date</th>
-                                                    <th align="left" id="friendly_name">User</th>
-                                                    <th align="left" id="ip_address">IP Address</th>
-                                                    <th align="left" id="platform">Platform</th>
-                                                    <th align="left" id="product">Product</th>
-                                                    <th align="left" id="player">Player</th>
-                                                    <th align="left" id="title">Title</th>
-                                                    <th align="left" id="started">Started</th>
-                                                    <th align="left" id="paused_counter">Paused</th>
-                                                    <th align="left" id="stopped">Stopped</th>
-                                                    <th align="left" id="play_duration">Duration</th>
-                                                    <th align="left" id="percent_complete"></th>
-                                                </tr>
-                                            </thead>
-                                            <tbody></tbody>
-                                        </table>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    % if _session['user_group'] == 'admin':
-                    <div role="tabpanel" class="tab-pane" id="tabs-mediainfo">
-                        <div class="container-fluid">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    % if config['get_file_sizes'] and data['section_id'] in config['get_file_sizes_hold']['section_ids']:
-                                    <div id="get_file_sizes_message" style="text-align: center; margin-top: 20px;">
-                                        <i class="fa fa-refresh fa-spin"></i>&nbsp; Tautulli is calculating the file sizes for the library's media info. This could take a few minutes depending on the size of your library.
-                                        <br />
-                                        You may leave this page and check back later.
-                                    </div>
-                                    % endif
-                                    <div class='table-card-header'>
-                                        <div class="header-bar">
-                                            <span>
-                                                <i class="fa fa-info-circle"></i> Media Info for <strong>
-                                                    <span class="set-username">${data['section_name']}</span>
-                                                </strong>
-                                            </span>
-                                        </div>
-                                        <div class="button-bar">
-                                            % if _session['user_group'] == 'admin':
-                                            <div class="btn-group">
-                                                % if config['get_file_sizes'] and data['section_id'] in config['get_file_sizes_hold']['section_ids']:
-                                                <button class="btn btn-dark refresh-media-info-table-button" id="refresh-media-info-table" disabled>
-                                                    <i class="fa fa-refresh"></i> Refresh media info
-                                                </button>
-                                                % else:
-                                                <button class="btn btn-dark refresh-media-info-table-button" id="refresh-media-info-table">
-                                                    <i class="fa fa-refresh"></i> Refresh media info
-                                                </button>
-                                                % endif
-                                            </div>
-                                            % endif
-                                            <div class="btn-group colvis-button-bar" id="button-bar-media-info"></div>
-                                        </div>
-                                    </div>
-                                    <div class="table-card-back">
-                                        <table class="display media_info_table" id="media_info_table-SID-${data['section_id']}" width="100%">
-                                            <thead>
-                                                <tr>
-                                                    <th align="left" id="added_at">Added At</th>
-                                                    <th align="left" id="title">Title</th>
-                                                    <th align="left" id="container">Container</th>
-                                                    <th align="left" id="bitrate">Bitrate</th>
-                                                    <th align="left" id="video_codec">Video Codec</th>
-                                                    <th align="left" id="video_resolution">Video Resolution</th>
-                                                    <th align="left" id="video_resolution">Video Framerate</th>
-                                                    <th align="left" id="audio_codec">Audio Codec</th>
-                                                    <th align="left" id="audio_channels">Audio Channels</th>
-                                                    <th align="left" id="file_size">File Size</th>
-                                                    <th align="left" id="last_played">Last Played</th>
-                                                    <th align="left" id="total_plays">Total Plays</th>
-                                                </tr>
-                                            </thead>
-                                            <tbody></tbody>
-                                        </table>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    % endif
-                    % if data['section_type'] != 'photo':
-                    <div role="tabpanel" class="tab-pane" id="tabs-collections">
-                        <div class="container-fluid">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <div class='table-card-header'>
-                                        <div class="header-bar">
-                                            <span>
-                                                <i class="fa fa-folder-open"></i> Collections for <strong>
-                                                    <span class="set-username">${data['section_name']}</span>
-                                                </strong>
-                                            </span>
-                                        </div>
-                                        <div class="button-bar">
-                                            % if _session['user_group'] == 'admin':
-                                            <div class="btn-group">
-                                                <button class="btn btn-dark export-button" id="toggle-export-modal" data-toggle="modal" data-target="#export-modal"
-                                                        data-section_id="${data['section_id']}" data-media_type="collection" data-sub_media_type="${data['section_type']}"
-                                                        data-export_type="collection">
-                                                    <i class="fa fa-file-export"></i> Export collections
-                                                </button>
-                                            </div>
-                                            % endif
-                                            <div class="btn-group">
-                                                <button class="btn btn-dark refresh-collections-table-button" id="refresh-collections-table">
-                                                    <i class="fa fa-refresh"></i> Refresh collections
-                                                </button>
-                                            </div>
-                                            <div class="btn-group colvis-button-bar" id="button-bar-collections"></div>
-                                        </div>
-                                    </div>
-                                    <div class="table-card-back">
-                                        <table class="display collections_table" id="collections_table-SID-${data['section_id']}" width="100%">
-                                            <thead>
-                                                <tr>
-                                                    <th align="left" id="collectionTitle">Collection Title</th>
-                                                    <th align="left" id="collectionMode">Collection Mode</th>
-                                                    <th align="left" id="collectionSort">Collection Sort</th>
-                                                    <th align="left" id="collectionItems">Collection Items</th>
-                                                </tr>
-                                            </thead>
-                                            <tbody></tbody>
-                                        </table>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    % endif
-                    <div role="tabpanel" class="tab-pane" id="tabs-playlists">
-                        <div class="container-fluid">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <div class='table-card-header'>
-                                        <div class="header-bar">
-                                            <span>
-                                                <i class="fa fa-list-alt"></i> Playlists for <strong>
-                                                    <span class="set-username">${data['section_name']}</span>
-                                                </strong>
-                                            </span>
-                                        </div>
-                                        <div class="button-bar">
-                                            % if _session['user_group'] == 'admin':
-                                            <% playlist_sub_media_type = {'movie': 'video', 'show': 'video', 'artist': 'audio', 'photo': 'photo'} %>
-                                            <div class="btn-group">
-                                                <button class="btn btn-dark export-button" id="toggle-export-modal" data-toggle="modal" data-target="#export-modal"
-                                                        data-section_id="${data['section_id']}" data-media_type="playlist" data-sub_media_type="${playlist_sub_media_type.get(data['section_type'])}"
-                                                        data-export_type="playlist">
-                                                    <i class="fa fa-file-export"></i> Export playlists
-                                                </button>
-                                            </div>
-                                            % endif
-                                            <div class="btn-group">
-                                                <button class="btn btn-dark refresh-playlists-table-button" id="refresh-playlists-table">
-                                                    <i class="fa fa-refresh"></i> Refresh playlists
-                                                </button>
-                                            </div>
-                                            <div class="btn-group colvis-button-bar" id="button-bar-playlists"></div>
-                                        </div>
-                                    </div>
-                                    <div class="table-card-back">
-                                        <table class="display playlists_table" id="playlists_table-SID-${data['section_id']}" width="100%">
-                                            <thead>
-                                                <tr>
-                                                    <th align="left" id="playlistTitle">Playlist Title</th>
-                                                    <th align="left" id="playlistLeafCount">Playlist Items</th>
-                                                    <th align="left" id="playlistDuration">Playlist Duration</th>
-                                                </tr>
-                                            </thead>
-                                            <tbody></tbody>
-                                        </table>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    % if _session['user_group'] == 'admin':
-                    <div role="tabpanel" class="tab-pane" id="tabs-export">
-                        <div class="container-fluid">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <div class='table-card-header'>
-                                        <div class="header-bar">
-                                            <span>
-                                                <i class="fa fa-file-export"></i> Metadata Exports for <strong>
-                                                    <span class="set-username">${data['section_name']}</span>
-                                                </strong>
-                                            </span>
-                                        </div>
-                                        <div class="button-bar">
-                                            <div class="btn-group">
-                                                <button class="btn btn-dark export-button" id="toggle-export-modal" data-toggle="modal" data-target="#export-modal"
-                                                        data-section_id="${data['section_id']}" data-media_type="${'photoalbum' if data['section_type'] == 'photo' else data['section_type']}"
-                                                        data-export_type="all">
-                                                    <i class="fa fa-file-export"></i> Export metadata
-                                                </button>
-                                            </div>
-                                            <div class="btn-group">
-                                                <button class="btn btn-dark refresh-export-table-button" id="refresh-export-table">
-                                                    <i class="fa fa-refresh"></i> Refresh exports
-                                                </button>
-                                            </div>
-                                            <div class="btn-group colvis-button-bar" id="button-bar-export"></div>
-                                        </div>
-                                    </div>
-                                    <div class="table-card-back">
-                                        <table class="display export_table" id="export_table-SID-${data['section_id']}" width="100%">
-                                            <thead>
-                                                <tr>
-                                                    <th align="left" id="timestamp">Exported At</th>
-                                                    <th align="left" id="media_type_title">Media Type</th>
-                                                    <th align="left" id="rating_key">Rating Key</th>
-                                                    <th align="left" id="filename">Filename</th>
-                                                    <th align="left" id="file_format">File Format</th>
-                                                    <th align="left" id="metadata_level">Metadata Level</th>
-                                                    <th align="left" id="media_info_level">Media Info Level</th>
-                                                    <th align="left" id="media_info_level">Custom Fields</th>
-                                                    <th align="left" id="file_size">File Size</th>
-                                                    <th align="left" id="complete">Download</th>
-                                                    <th align="left" id="delete">Delete</th>
-                                                </tr>
-                                            </thead>
-                                            <tbody></tbody>
-                                        </table>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    % endif
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<footer></footer>
-% else:
-<div class="container-fluid">
-    <div class="row">
-        <div class="summary-container">
-            <div class="summary-navbar">
-                <div class="col-md-12">
-                    <div class="summary-navbar-list">
-                    </div>
-                </div>
-            </div>
-            <div class="summary-content-wrapper">
-                <div class='col-md-12'>
-                    <div style="text-align: center; margin-top: 20px;">
-                        <i class="fa fa-exclamation-triangle"></i> Error retrieving library information. Please see the logs for more details.
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-% endif
-</%def>
-
-<%def name="modalIncludes()">
-<div id="edit-library-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="edit-library-modal">
-</div>
-<div class="modal fade" id="info-modal" tabindex="-1" role="dialog" aria-labelledby="info-modal">
-</div>
-<div class="modal fade" id="ip-info-modal" tabindex="-1" role="dialog" aria-labelledby="ip-info-modal">
-</div>
-<div class="modal fade" id="confirm-modal-delete" tabindex="-1" role="dialog" aria-labelledby="confirm-modal-delete">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title" id="myModalLabel">Confirm Delete</h4>
-            </div>
-            <div class="modal-body" style="text-align: center;">
-                <p>Are you REALLY sure you want to delete <strong><span id="deleteCount"></span></strong> history item(s)?</p>
-                <p>This is permanent and cannot be undone!</p>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-dark" data-dismiss="modal">Cancel</button>
-                <button type="button" class="btn btn-danger btn-ok" data-dismiss="modal" id="confirm-delete">Delete</button>
-            </div>
-        </div>
-    </div>
-</div>
-<div id="export-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="export-modal">
-</div>
-</%def>
-
-<%def name="javascriptIncludes()">
-<script src="${http_root}js/jquery.dataTables.min.js"></script>
-<script src="${http_root}js/dataTables.colVis.js"></script>
-<script src="${http_root}js/dataTables.bootstrap.min.js"></script>
-<script src="${http_root}js/dataTables.bootstrap.pagination.js"></script>
-% if data:
-<% from plexpy.common import LIVE_TV_SECTION_ID %>
-<%
-    history_user_id = '' if _session['user_group'] == 'admin' else _session['user_id']
-%>
-<script>
-    % if str(data['section_id']).isdigit():
-    var section_id = ${data['section_id']};
-    % else:
-    var section_id = null;
-    % endif
-    var section_name = '${data['section_name'].replace("'", "\\'")}';
-    var refresh_table = false;
-
-    % if config['get_file_sizes']:
-    var get_file_sizes = false;
-    % else:
-    var get_file_sizes = null;
-    % endif
-</script>
-<script src="${http_root}js/tables/history_table.js${cache_param}"></script>
-<script src="${http_root}js/tables/media_info_table.js${cache_param}"></script>
-<script src="${http_root}js/tables/collections_table.js${cache_param}"></script>
-<script src="${http_root}js/tables/playlists_table.js${cache_param}"></script>
-<script src="${http_root}js/tables/export_table.js${cache_param}"></script>
-<script>
-    $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
-        $.fn.dataTable.tables({ visible: true, api: true }).columns.adjust();
-    });
-
-    $(".inactive-library-tooltip").tooltip();
-
-    function loadHistoryTable(transcode_decision) {
-        // Build watch history table
-        history_table_options.ajax = {
-            url: 'get_history',
-            type: 'POST',
-            data: function ( d ) {
-                return {
-                    json_data: JSON.stringify( d ),
-                    section_id: section_id,
-                    user_id: "${history_user_id}",
-                    transcode_decision: transcode_decision
-                };
-            }
-        };
-        history_table = $('#history_table-SID-${data["section_id"]}').DataTable(history_table_options);
-
-        var colvis = new $.fn.dataTable.ColVis(history_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark', exclude: [0, 12] });
-        $(colvis.button()).appendTo('#button-bar-history');
-
-        clearSearchButton('history_table-SID-${data["section_id"]}', history_table);
-
-        $('#transcode_decision-selection').on('change', function () {
-            $('#transcode_decision-selection > label').removeClass('active');
-            var selected_filter = $('input[name=transcode_decision-filter]:checked', '#transcode_decision-selection');
-            $(selected_filter).closest('label').addClass('active');
-            transcode_decision = $(selected_filter).map(function () { return $(this).val(); }).get().join(',');
-            setLocalStorage('library_' + section_id + 'history_transcode_decision', transcode_decision);
-            history_table.draw();
-        });
-    }
-
-    $('#nav-tabs-history').on('shown.bs.tab', function() {
-        if (typeof(history_table) === 'undefined') {
-            var transcode_decision = getLocalStorage('library_' + section_id + 'history_transcode_decision', 'all');
-            $.each(transcode_decision.split(','), function (i, item) {
-                var history_transcode_decision = $('#history-transcode_decision-' + item.replace(' ', '_'));
-                history_transcode_decision.prop('checked', true);
-                history_transcode_decision.closest('label').addClass('active');
-            });
-
-            loadHistoryTable(transcode_decision);
-        }
-    });
-
-    $("#refresh-history-list").click(function () {
-        history_table.draw();
-    });
-</script>
-% if data['section_type'] != 'photo':
-<script>
-    function loadCollectionsTable() {
-        // Build collections table
-        collections_table_options.ajax = {
-            url: 'get_collections_list',
-            type: 'POST',
-            data: function ( d ) {
-                return {
-                    json_data: JSON.stringify( d ),
-                    section_id: section_id
-                };
-            }
-        };
-        collections_table = $('#collections_table-SID-${data["section_id"]}').DataTable(collections_table_options);
-
-        var colvis = new $.fn.dataTable.ColVis(collections_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' });
-        $(colvis.button()).appendTo('#button-bar-collections');
-
-        clearSearchButton('collections_table-SID-${data["section_id"]}', collections_table);
-    }
-
-    $('#nav-tabs-collections').on('shown.bs.tab', function() {
-        if (typeof(collections_table) === 'undefined') {
-            loadCollectionsTable();
-        }
-    });
-
-    $("#refresh-collections-table").click(function () {
-        collections_table.draw();
-    });
-</script>
-% endif
-<script>
-    function loadPlaylistsTable() {
-        // Build playlists table
-        playlists_table_options.ajax = {
-            url: 'get_playlists_list',
-            type: 'POST',
-            data: function ( d ) {
-                return {
-                    json_data: JSON.stringify( d ),
-                    section_id: section_id
-                };
-            }
-        };
-        playlists_table = $('#playlists_table-SID-${data["section_id"]}').DataTable(playlists_table_options);
-
-        var colvis = new $.fn.dataTable.ColVis(playlists_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' });
-        $(colvis.button()).appendTo('#button-bar-playlists');
-
-        clearSearchButton('playlists_table-SID-${data["section_id"]}', playlists_table);
-    }
-
-    $('#nav-tabs-playlists').on('shown.bs.tab', function() {
-        if (typeof(playlists_table) === 'undefined') {
-            loadPlaylistsTable();
-        }
-    });
-
-    $("#refresh-playlists-table").click(function () {
-        playlists_table.draw();
-    });
-
-    function recentlyWatched() {
-        // Populate recently watched
-        $.ajax({
-            url: 'library_recently_watched',
-            async: true,
-            data: {
-                section_id: section_id,
-                limit: 50
-            },
-            complete: function(xhr, status) {
-                $("#library-recently-watched").html(xhr.responseText);
-                highlightScrollerButton("#recently-watched");
-                paginateScroller("#recently-watched", ".paginate-watched");
-            }
-        });
-    }
-
-    function recentlyAdded() {
-        // Populate recently added
-        $.ajax({
-            url: 'library_recently_added',
-            async: true,
-            data: {
-                section_id: section_id,
-                limit: 50
-            },
-            complete: function(xhr, status) {
-                $("#library-recently-added").html(xhr.responseText);
-                highlightScrollerButton("#recently-added");
-                paginateScroller("#recently-added", ".paginate-added");
-            }
-        });
-    }
-
-    recentlyWatched();
-    % if data['section_id'] != LIVE_TV_SECTION_ID:
-    recentlyAdded();
-    % endif
-
-    $('div.art-face').animate({ opacity: 0.2 }, { duration: 1000 });
-
-    $(document).ready(function () {
-
-        // Javascript to enable link to tab
-        var hash = document.location.hash;
-        var prefix = "tab_";
-        if (hash) {
-            $('.nav-list #nav-' + hash.replace('#' + prefix, "")).tab('show').trigger('show.bs.tab');
-        }
-
-        // Change hash for page-reload
-        $('.nav-list a').on('shown.bs.tab', function (e) {
-            window.location.hash = e.target.hash.replace("#", "#" + prefix);
-        });
-
-        // Populate watch time stats
-        $.ajax({
-            url: 'library_watch_time_stats',
-            async: true,
-            data: { section_id: section_id },
-            complete: function(xhr, status) {
-                $("#library-time-stats").html(xhr.responseText);
-            }
-        });
-
-        // Populate user stats
-        $.ajax({
-            url: 'library_user_stats',
-            async: true,
-            data: { section_id: section_id },
-            complete: function(xhr, status) {
-                $("#library-user-stats").html(xhr.responseText);
-            }
-        });
-
-    });
-</script>
-% if _session['user_group'] == 'admin':
-<script>
-    function loadMediaInfoTable() {
-        // Build media info table
-        media_info_table_options.ajax = {
-            url: 'get_library_media_info',
-            type: 'POST',
-            data: function ( d ) {
-                return {
-                    json_data: JSON.stringify( d ),
-                    section_id: section_id,
-                    refresh: refresh_table
-                };
-            }
-        };
-        media_info_table = $('#media_info_table-SID-${data["section_id"]}').DataTable(media_info_table_options);
-
-        var colvis = new $.fn.dataTable.ColVis(media_info_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' });
-        $(colvis.button()).appendTo('#button-bar-media-info');
-
-        clearSearchButton('media_info_table-SID-${data["section_id"]}', media_info_table);
-    }
-
-    $('#nav-tabs-mediainfo').on('shown.bs.tab', function() {
-        if (typeof(media_info_table) === 'undefined') {
-            loadMediaInfoTable();
-        }
-    });
-
-    $("#refresh-media-info-table").click(function () {
-        media_info_child_table = {};
-        refresh_table = true;
-        refresh_child_tables = true;
-        media_info_table.draw();
-        refresh_table = false;
-    });
-
-    function loadExportTable() {
-        // Build export table
-        export_table_options.ajax = {
-            url: 'get_export_list',
-            type: 'POST',
-            data: function ( d ) {
-                return {
-                    json_data: JSON.stringify( d ),
-                    section_id: section_id
-                };
-            }
-        };
-        export_table = $('#export_table-SID-${data["section_id"]}').DataTable(export_table_options);
-        export_table.columns([7]).visible(false);
-
-        var colvis = new $.fn.dataTable.ColVis(export_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' });
-        $(colvis.button()).appendTo('#button-bar-export');
-
-        clearSearchButton('export_table-SID-${data["section_id"]}', export_table);
-    }
-
-    $('#nav-tabs-export').on('shown.bs.tab', function() {
-        if (typeof(export_table) === 'undefined') {
-            loadExportTable();
-        }
-    });
-
-    $("#refresh-export-table").click(function () {
-        export_table.draw();
-    });
-
-    $("#edit-library-tooltip").tooltip();
-
-    // Load edit library modal
-    $("#toggle-edit-library-modal").click(function() {
-        $("#edit-library-tooltip").tooltip('hide');
-        $.ajax({
-            url: 'edit_library_dialog',
-            data: { section_id: section_id },
-            cache: false,
-            async: true,
-            complete: function(xhr, status) {
-                $("#edit-library-modal").html(xhr.responseText);
-            }
-        });
-    });
-
-    $(".export-button").click(function() {
-        $.ajax({
-            url: 'export_metadata_modal',
-            data: {
-                section_id: $(this).data('section_id'),
-                media_type: $(this).data('media_type'),
-                sub_media_type: $(this).data('sub_media_type'),
-                export_type: $(this).data('export_type')
-            },
-            cache: false,
-            async: true,
-            complete: function(xhr, status) {
-                $("#export-modal").html(xhr.responseText);
-            }
-        });
-    });
-
-    $('#row-edit-mode').on('click', function() {
-        if ($(this).hasClass('active')) {
-            $(this).tooltip('destroy');
-
-            if (history_to_delete.length > 0) {
-                $('#deleteCount').text(history_to_delete.length);
-                $('#confirm-modal-delete').modal();
-                $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
-                    $.ajax({
-                        url: 'delete_history_rows',
-                        type: 'POST',
-                        data: { row_ids: history_to_delete.join(',') },
-                        async: true,
-                        success: function (data) {
-                            var msg = "History deleted";
-                            showMsg(msg, false, true, 2000);
-                            history_table.draw();
-                        }
-                    });
-                });
-            }
-
-            $('.delete-control').each(function () {
-                $(this).addClass('hidden');
-                $('#row-edit-mode-alert').fadeOut(200);
-            });
-
-        } else {
-            $(this).tooltip({
-                container: '.body-container',
-                placement: 'bottom',
-                title: 'Select rows to delete. Data is deleted upon exiting delete mode.',
-                trigger: 'manual'
-            }).tooltip('show');
-
-            history_to_delete = [];
-            $('.delete-control').each(function() {
-                $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
-                $(this).removeClass('hidden');
-            });
-        }
-    });
-</script>
-% endif
-% endif
-</%def>
\ No newline at end of file
diff --git a/data/interfaces/default/library_recently_added.html b/data/interfaces/default/library_recently_added.html
deleted file mode 100644
index 4cf56d8e..00000000
--- a/data/interfaces/default/library_recently_added.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<%doc>
-USAGE DOCUMENTATION :: PLEASE LEAVE THIS AT THE TOP OF THIS FILE
-
-For Mako templating syntax documentation please visit: http://docs.makotemplates.org/en/latest/
-
-Filename:           library_recently_added.html
-Version:            0.1
-Variable names:     data [array]
-
-data[array_index] :: Usable parameters
-
-== Global keys ==
-media_type              Returns the type of media. Either 'movie' or 'episode' or 'album'.
-rating_key              Returns the unique identifier for the media item.
-parent_rating_key       Returns the unique identifier for the season or artist.
-grandparent_rating_key  Returns the unique identifier for the show.
-title                   Returns the name of the movie, episode, album.
-parent_title            Returns the name of the artist.
-grandparent_title       Returns the name of the show.
-media_index             Returns the index number of the episode.
-parent_media_index      Returns the index number of the season.
-section_id              Returns the library section number of the media item.
-library_name            Returns the library section name of the media item.
-year                    Returns the release year of the movie, episode, or album.
-thumb                   Returns the location of the item's thumbnail. Use with pms_image_proxy.
-parent_thumb            Returns the location of the artist's thumbnail. Use with pms_image_proxy.
-grandparent_thumb       Returns the location of the show's thumbnail. Use with pms_image_proxy.
-added_at                Returns the time when the media was added to the library.
-
-DOCUMENTATION :: END
-</%doc>
-
-% if data:
-<%
-    from plexpy.helpers import page, short_season
-
-%>
-<div class="dashboard-recent-media-row">
-    <div id="recently-added-row-scroller">
-        <ul class="dashboard-recent-media list-unstyled">
-            % for item in data:
-            <li>
-                % if item['media_type'] == 'episode' or item['media_type'] == 'movie':
-                % if item['media_type'] == 'movie':
-                <a href="${page('info', item['rating_key'])}" title="${item['title']}">
-                % elif item['media_type'] == 'episode':
-                <a href="${page('info', item['rating_key'])}" title="${item['grandparent_title']}">
-                % endif
-                    <div class="dashboard-recent-media-poster">
-                        % if item['media_type'] == 'episode':
-                        % if item['parent_thumb']:
-                        <div class="dashboard-recent-media-poster-face" style="background-image: url(${page('pms_image_proxy', item['parent_thumb'], item['parent_rating_key'], 300, 450, fallback='poster')});">
-                        % else:
-                        <div class="dashboard-recent-media-poster-face" style="background-image: url(${page('pms_image_proxy', item['grandparent_thumb'], item['grandparent_rating_key'], 300, 450, fallback='poster')});">
-                        % endif
-                        % elif item['media_type'] == 'movie':
-                        <div class="dashboard-recent-media-poster-face" style="background-image: url(${page('pms_image_proxy', item['thumb'], item['rating_key'], 300, 450, fallback='poster')});">
-                            % endif
-                            <div class="dashboard-recent-media-overlay">
-                                <div class="dashboard-recent-media-overlay-text" id="added_at-${item['rating_key']}">
-                                    <script>
-                                        $('#added_at-${item['rating_key']}').text('Added ' + moment(${item['added_at']}, "X").fromNow())
-                                    </script>
-                                </div>
-                            </div>
-                        </div>
-                        % if _session['user_group'] == 'admin':
-                        <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                        % endif
-                    </div>
-                </a>
-                <div class="dashboard-recent-media-metacontainer">
-                    % if item['media_type'] == 'episode':
-                    <h3>
-                        <a href="${page('info', item['grandparent_rating_key'])}" title="${item['grandparent_title']}">${item['grandparent_title']}</a>
-                    </h3>
-                    <h3 class="text-muted">
-                        <a href="${page('info', item['rating_key'])}" title="${item['title']}">${item['title']}</a>
-                    </h3>
-                    <h3 class="text-muted">
-                        <a href="${page('info', item['parent_rating_key'])}" title="${item['parent_title']}">${short_season(item['parent_title'])}</a>
-                         &middot; <a href="${page('info', item['rating_key'])}" title="Episode ${item['media_index']}">E${item['media_index']}</a>
-                    </h3>
-                    % elif item['media_type'] == 'movie':
-                    <h3>
-                        <a href="${page('info', item['rating_key'])}" title="${item['title']}">${item['title']}</a>
-                    </h3>
-                    <h3 class="text-muted">${item['year']}</h3>
-                    <h3 class="text-muted">&nbsp;</h3>
-                    % endif
-                </div>
-                % elif item['media_type'] == 'album':
-                <a href="${page('info', item['rating_key'])}" title="${item['title']}">
-                    <div class="dashboard-recent-media-cover">
-                        <div class="dashboard-recent-media-cover-face" style="background-image: url(${page('pms_image_proxy', item['thumb'], item['rating_key'], 300, 300, fallback='cover')});">
-                            <div class="dashboard-recent-media-overlay">
-                                <div class="dashboard-recent-media-overlay-text" id="added_at-${item['rating_key']}">
-                                    <script>
-                                        $('#added_at-${item['rating_key']}').text('Added ' + moment(${item['added_at']}, "X").fromNow())
-                                    </script>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="dashboard-recent-media-metacontainer">
-                        <h3>
-                            <a href="${page('info', item['parent_rating_key'])}" title="${item['parent_title']}">${item['parent_title']}</a>
-                        </h3>
-                        <h3 class="text-muted">
-                            <a class="text-muted" href="${page('info', item['rating_key'])}" title="${item['title']}">${item['title']}</a>
-                        </h3>
-                        <h3 class="text-muted">&nbsp;</h3>
-                    </div>
-                </a>
-                % endif
-            </li>
-            % endfor
-        </ul>
-    </div>
-</div>
-% else:
-<div class="text-muted">No stats to show.
-</div><br>
-% endif
\ No newline at end of file
diff --git a/data/interfaces/default/library_stats.html b/data/interfaces/default/library_stats.html
index 0690fd4e..f310ab5c 100644
--- a/data/interfaces/default/library_stats.html
+++ b/data/interfaces/default/library_stats.html
@@ -9,88 +9,76 @@ Variable names:     data [array]
 
 data[array_index] :: Usable parameters
 
-data            Returns an array containing stat data
+data['type']            Returns the type of the library. Either 'movie', 'show', 'photo', or 'artist'.
+data['rows']            Returns an array containing stat data
 
-data[array_index] :: Usable parameters
+data[array_index]['rows'] :: Usable parameters
 
-section_name            Returns the title of the library.
-section_type            Returns the type of the library.
+title                   Returns the title of the library.
 thumb                   Returns the thumb of the library.
-count                   Returns the number of top level items in the library.
-parent_count            Returns the number of parent items in the library.
-child_count             Returns the number of child items in the library.
+count                   Returns the number of items in the library.
+count_type              Returns the sorting type for the library
+
+== Only if 'type' is 'show'
+episode_count           Return the number of episodes in the library.
+episode_count_type      Return the sorting type for the episodes.
+
+== Only if 'type' is 'artist'
+album_count             Return the number of episodes in the library.
+album_count_type        Return the sorting type for the episodes.
 
 DOCUMENTATION :: END
 </%doc>
 
 % if data:
-<%
-    from plexpy.helpers import page
-
-    types = ('movie', 'show', 'artist', 'photo')
-    headers = {'movie': ('Movie Libraries', ('Movies', '', '')),
-               'show': ('TV Show Libraries', ('Shows', 'Seasons', 'Episodes')),
-               'artist': ('Music Libraries', ('Artists', 'Albums', 'Tracks')),
-               'photo': ('Photo Libraries', ('Albums', 'Photos', 'Videos'))}
-%>
-% for section_type in types:
-% if section_type in data:
-<%
-    row0 = data[section_type][0]
-%>
-<div class="dashboard-stats-instance" id="library-stats-instance-${section_type}" data-section_type="${section_type}">
-    <div class="dashboard-stats-container">
-        <div id="library-stats-background-${section_type}" class="dashboard-stats-background" style="background-image: url(${page('pms_image_proxy', row0['art'] or row0['library_art'], None, 500, 280, 40, '282828', 3, fallback=row0['library_art'])});" data-library_art="${row0['library_art']}">
-            % if row0['thumb'].startswith('http'):
-            <div id="library-stats-thumb-${section_type}" class="dashboard-stats-flat hidden-xs" style="background-image: url(${page('pms_image_proxy', row0['thumb'], None, 80, 80)});"></div>
-            % else:
-            <div id="library-stats-thumb-${section_type}" class="dashboard-stats-flat svg-icon library-${section_type} hidden-xs"></div>
-            % endif
-            <div class="dashboard-stats-info-container">
-                <div id="library-stats-title-${section_type}" class="dashboard-stats-info-title">
-                    <h4>${headers[section_type][0]}</h4>
-                    <span class="dashboard-stats-stats-units">${' / '.join(u for u in headers[section_type][1] if u)}</span>
+<ul class="list-unstyled">
+    % for library in data:
+    <div class="home-platforms-instance">
+        <li>
+            <div class="home-platforms-instance-info">
+                <div class="home-platforms-instance-name">
+                    % if library['type'] != 'photo':
+                    <h4>
+                        <a href="info?item_id=${library['type']}" title="${library['rows']['title']}">${library['rows']['title']}</a>
+                    </h4>
+                    % else:
+                    <h4>${library['rows']['title']}</h4>
+                    % endif
                 </div>
-                <div class="dashboard-stats-info-scroller scrollbar-macosx">
-                    <div class="dashboard-stats-info scoller-content">
-                        <ul class="list-unstyled dashboard-stats-info-list">
-                            % for section in data[section_type]:
-                            <li class="dashboard-stats-info-item ${'expanded' if loop.index == 0 else ''}" data-stat_id="${section_type}"
-                                data-art="${section.get('art')}" data-thumb="${section.get('thumb')}" data-library_art="${section.get('library_art')}">
-                                <div class="sub-list">${loop.index + 1}</div>
-                                <div class="sub-value">
-                                    <a href="${page('library', section['section_id'])}" title="${section['section_name']}">
-                                        ${section['section_name']}
-                                    </a>
-                                </div>
-                                % if headers[section_type][1][0]:
-                                <div class="sub-count">
-                                    ${section['count']}
-                                </div>
-                                % endif
-                                % if headers[section_type][1][1]:
-                                <div class="sub-divider"> / </div>
-                                <div class="sub-count">
-                                    ${section['child_count']}
-                                </div>
-                                % endif
-                                % if headers[section_type][1][2]:
-                                <div class="sub-divider"> / </div>
-                                <div class="sub-count">
-                                    ${section['grandchild_count']}
-                                </div>
-                                % endif
-                            </li>
-                            % endfor
-                        </ul>
-                    </div>
+                <div class="home-platforms-instance-playcount">
+                    <h5>${library['rows']['count_type']}</h5>
+                    <h3>${library['rows']['count']}</h3>
+                    <p> items</p>
                 </div>
+                % if library['type'] == 'show':
+                <div class="home-platforms-instance-playcount" style="padding-left: 10px;">
+                    <h5>${library['rows']['episode_count_type']}</h5>
+                    <h3>${library['rows']['episode_count']}</h3>
+                    <p> items</p>
+                </div>
+                % endif
+                % if library['type'] == 'artist':
+                <div class="home-platforms-instance-playcount" style="padding-left: 10px;">
+                    <h5>${library['rows']['album_count_type']}</h5>
+                    <h3>${library['rows']['album_count']}</h3>
+                    <p> items</p>
+                </div>
+                % endif
             </div>
-        </div>
+            % if library['rows']['thumb']:
+            <div class="home-platforms-instance-poster">
+                <div class="home-platforms-library-thumb" style="background-image: url(pms_image_proxy?img=${library['rows']['thumb']}&width=300&height=300&fallback=poster);"></div>
+            </div>
+            % else:
+            <div class="home-platforms-instance-poster">
+                <div class="home-platforms-library-thumb" style="background-image: url(interfaces/default/images/poster.png);"></div>
+            </div>
+            % endif
+        </li>
     </div>
-</div>
-% endif
-% endfor
+    % endfor
+</ul>
 % else:
-<div class="text-muted">No stats to show.</div><br>
+<div class="text-muted">Unable to retrieve data from server. Please check your <a href="settings">settings</a>.
+</div><br>
 % endif
\ No newline at end of file
diff --git a/data/interfaces/default/library_user_stats.html b/data/interfaces/default/library_user_stats.html
deleted file mode 100644
index c38cffae..00000000
--- a/data/interfaces/default/library_user_stats.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<%doc>
-USAGE DOCUMENTATION :: PLEASE LEAVE THIS AT THE TOP OF THIS FILE
-
-For Mako templating syntax documentation please visit: http://docs.makotemplates.org/en/latest/
-
-Filename:           library_user_stats.html
-Version:            0.1
-Variable names:     data [array]
-
-data[array_index] :: Usable parameters
-
-== Global keys ==
-friendly_name           Returns the friendly name of the user.
-user_id                 Returns the user id of the user.
-user_thumb              Returns the avatar of the user.
-total_plays             Returns the play count for the user.
-
-DOCUMENTATION :: END
-</%doc>
-
-% if data:
-<% from plexpy.helpers import page %>
-% for a in data:
-<ul class="list-unstyled">
-    <div class="user-player-instance">
-        <li>
-            % if a['user_id']:
-            <a href="${page('user', a['user_id'])}" title="${a['username']}">
-                <div class="library-user-instance-box" style="background-image: url(${page('pms_image_proxy', a['user_thumb'], None, 80, 80, fallback='user')});"></div>
-            </a>
-            <div class=" user-player-instance-name">
-                <a href="${page('user', a['user_id'])}" title="${a['username']}">${a['friendly_name']}</a>
-            </div>
-            % else:
-            <div class="library-user-instance-box" style="background-image: url(${page('pms_image_proxy', a['user_thumb'], None, 80, 80, fallback='user')});"></div>
-            <div class=" user-player-instance-name">
-                ${a['friendly_name']}
-            </div>
-            % endif
-            <div class="user-player-instance-playcount">
-                <h3>${a['total_plays']}</h3>
-                <p> plays</p>
-            </div>
-        </li>
-    </div>
-</ul>
-% endfor
-% else:
-<div class="text-muted">No stats to show.</div><br>
-% endif
\ No newline at end of file
diff --git a/data/interfaces/default/login.html b/data/interfaces/default/login.html
deleted file mode 100644
index f8179fd1..00000000
--- a/data/interfaces/default/login.html
+++ /dev/null
@@ -1,191 +0,0 @@
-<%
-    import plexpy
-    plex_login = plexpy.CONFIG.HTTP_PLEX_ADMIN or plexpy.CONFIG.ALLOW_GUEST_ACCESS
-%>
-<!doctype html>
-
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>Tautulli - ${title}</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <meta name="referrer" content="no-referrer">
-    <link href="${http_root}css/bootstrap3/bootstrap.min.css" rel="stylesheet">
-    <link href="${http_root}css/tautulli.css${cache_param}" rel="stylesheet">
-    <link href="${http_root}css/opensans.min.css" rel="stylesheet">
-    <link href="${http_root}css/font-awesome.all.min.css" rel="stylesheet">
-    <link href="${http_root}css/font-awesome.v4-shims.min.css" rel="stylesheet">
-
-    <!-- Favicons -->
-    <link rel="icon" type="image/png" sizes="32x32" href="${http_root}images/favicon/favicon-32x32.png?v=2.6.0">
-    <link rel="icon" type="image/png" sizes="16x16" href="${http_root}images/favicon/favicon-16x16.png?v=2.6.0">
-    <link rel="shortcut icon" href="${http_root}images/favicon/favicon.ico?v=2.6.0">
-
-    <!-- ICONS -->
-    <!-- Android -->
-    <link rel="manifest" href="${http_root}images/favicon/manifest.json?v=2.9.0" crossorigin="use-credentials">
-    <meta name="theme-color" content="#282a2d">
-    <!-- Apple -->
-    <link rel="apple-touch-icon" sizes="180x180" href="${http_root}images/favicon/apple-touch-icon.png?v=2.6.0">
-    <link rel="mask-icon" href="${http_root}images/favicon/safari-pinned-tab.svg?v=2.6.0" color="#282a2d">
-    <meta name="apple-mobile-web-app-title" content="Tautulli">
-    <!-- Microsoft -->
-    <meta name="application-name" content="Tautulli">
-    <meta name="msapplication-config" content="${http_root}images/favicon/browserconfig.xml?v=2.6.0">
-</head>
-
-<body style="margin: 0; overflow: auto;">
-<div class="login-body-container">
-    <div class="container-fluid">
-        <div class="row">
-            <div class="login-container">
-                <div class="login-logo">
-                    <img src="${http_root}images/logo-tautulli-100.png" height="100" alt="Tautulli">
-                </div>
-                <div class="row">
-                    <div class="col-sm-6 col-sm-offset-3">
-                        <div id="sign-in-alert" class="alert alert-danger login-alert"></div>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="col-sm-6 col-sm-offset-3">
-                        <ul id="login-methods" class="accordion list-unstyled">
-                            % if plex_login:
-                            <li class="open">
-                                <div class="link login-method-header">
-                                    Sign In with Plex
-                                </div>
-                                <ul class="submenu login-button-plex" style="display: block;">
-                                    <li>
-                                        <div>
-                                            <button id="sign-in-plex" class="btn btn-bright login-button"><i class="fa fa-sign-in"></i>&nbsp; Sign In</button>
-                                        </div>
-                                        <div class="remember-group">
-                                            <label class="control-label">
-                                                <input type="checkbox" id="remember_me_plex" name="remember_me_plex" title="for 30 days" value="1" checked="checked" /> Remember me
-                                            </label>
-                                        </div>
-                                    </li>
-                                </ul>
-                            </li>
-                            % endif
-                            <li class="${'open' if not plex_login else ''}">
-                                <div class="link login-method-header">
-                                    Sign In with Tautulli
-                                </div>
-                                <ul class="submenu" style="${'display: block;' if not plex_login else ''}">
-                                    <li>
-                                        <form id="login-form">
-                                            <div class="form-group">
-                                                <label for="username" class="control-label">
-                                                    Username
-                                                </label>
-                                                <input type="text" id="username" name="username" class="form-control" autocorrect="off" autocapitalize="off" autofocus>
-                                            </div>
-                                            <div class="form-group">
-                                                <label for="password" class="control-label">
-                                                    Password
-                                                </label>
-                                                <input type="password" id="password" name="password" class="form-control">
-                                            </div>
-                                            <div class="form-group">
-                                                <span class="remember-group">
-                                                    <label class="control-label">
-                                                        <input type="checkbox" id="remember_me" name="remember_me" title="for 30 days" value="1" checked="checked" /> Remember me
-                                                    </label>
-                                                </span>
-                                                <button id="sign-in" type="submit" class="btn btn-bright login-button"><i class="fa fa-sign-in"></i>&nbsp; Sign In</button>
-                                            </div>
-                                        </form>
-                                    </li>
-                                </ul>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script src="${http_root}js/jquery-3.6.0.min.js"></script>
-<script src="${http_root}js/platform.min.js"></script>
-<script src="${http_root}js/script.js${cache_param}"></script>
-<script>
-    var login_accordion = new Accordion($('#login-methods'), false, false);
-
-    function OAuthSuccessCallback(authToken) {
-        signIn(true, authToken);
-    }
-    function OAuthErrorCallback() {
-        $('#sign-in-alert').text('Error communicating with Plex.tv.').show();
-    }
-
-    $('#sign-in-plex').click(function() {
-        PlexOAuth(OAuthSuccessCallback, OAuthErrorCallback);
-    });
-
-    $('#login-form').submit(function(event) {
-        event.preventDefault();
-        signIn(false);
-    });
-
-    function signIn(plex, token) {
-        $('.login-container button').prop('disabled', true);
-        if (plex) {
-            $('#sign-in-plex').html('<i class="fa fa-refresh fa-spin"></i>&nbsp; Sign In');
-        } else {
-            $('#sign-in').html('<i class="fa fa-refresh fa-spin"></i>&nbsp; Sign In');
-        }
-
-        const username = plex ? null : $('#username').val();
-        const password = plex ? null : $('#password').val();
-        const remember_me = plex ? ($('#remember_me_plex').is(':checked') ? '1' : '0')
-                : ($('#remember_me').is(':checked') ? '1' : '0');
-
-        var data = {
-            username: username,
-            password: password,
-            token: token,
-            remember_me: remember_me
-        };
-        var x_plex_headers = getPlexHeaders();
-        data = $.extend(data, x_plex_headers);
-
-        $.ajax({
-            url: '${http_root}auth/signin',
-            type: 'POST',
-            data: data,
-            dataType: 'json',
-            statusCode: {
-                200: function(xhr, status) {
-                   window.location = "redirect?redirect_uri=${redirect_uri}";
-                },
-                401: function(xhr, status) {
-                    if (plex) {
-                        $('#sign-in-alert').text('Invalid Plex Login.').show();
-                    } else {
-                        $('#sign-in-alert').text('Incorrect username or password.').show();
-                        $('#username').focus();
-                    }
-                },
-                429: function(xhr, status) {
-                    var retry = Math.ceil(xhr.getResponseHeader('Retry-After') / 60)
-                    $('#sign-in-alert').text('Too many login attempts. Try again in ' + retry + ' minute(s).').show();
-                }
-            },
-            complete: function() {
-                $('.login-container button').prop('disabled', false);
-                if (plex) {
-                    $('#sign-in-plex').html('<i class="fa fa-sign-in"></i>&nbsp; Sign In');
-                } else {
-                    $('#sign-in').html('<i class="fa fa-sign-in"></i>&nbsp; Sign In');
-                }
-            }
-        });
-    }
-</script>
-</body>
-</html>
diff --git a/data/interfaces/default/logs.html b/data/interfaces/default/logs.html
index f8262fb6..bb992c17 100644
--- a/data/interfaces/default/logs.html
+++ b/data/interfaces/default/logs.html
@@ -1,11 +1,11 @@
 <%inherit file="base.html"/>
 <%!
-    from plexpy import helpers
+from plexpy import helpers
 %>
 
 <%def name="headIncludes()">
-<link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.min.css">
-<link rel="stylesheet" href="${http_root}css/tautulli-dataTables.css">
+<link rel="stylesheet" href="interfaces/default/css/dataTables.bootstrap.css">
+<link rel="stylesheet" href="interfaces/default/css/plexpy-dataTables.css">
 <style>
     td {word-break: break-all;}
 </style>
@@ -18,164 +18,43 @@
 <div class='container-fluid'>
     <div class='table-card-header'>
         <div class="header-bar">
-            <span><i class="fa fa-list-alt"></i> Logs</span>
+            <span><i class="fa fa-book"></i> Logs</span>
         </div>
         <div class="button-bar">
-            <div class="btn-group" id="tautulli-log-levels">
-                <label>
-                    <select name="tautulli-log-level-filter" id="tautulli-log-level-filter" class="btn" style="color: inherit;">
-                        <option value="">All log levels</option>
-                        <option disabled>&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;</option>
-                        <option value="DEBUG">Debug</option>
-                        <option value="INFO">Info</option>
-                        <option value="WARNING">Warning</option>
-                        <option value="ERROR">Error</option>
-                    </select>
-                </label>
-            </div>
-            % if plex_log_files:
-            <div class="btn-group" id="plex-log-files" style="display: none;">
-                <label>
-                    <select name="plex-log-files-filter" id="plex-log-files-filter" class="btn" style="color: inherit;">
-                        <option value="">Select Plex Media Server log file</option>
-                        <option disabled>&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;</option>
-                        % for file in plex_log_files:
-                        <option value="${file}">${file}</option>
-                        % endfor
-                    </select>
-                </label>
-            </div>
-            % endif
-            <div class="btn-group" id="plex-log-levels" style="display: none;">
-                <label>
-                    <select name="plex-log-level-filter" id="plex-log-level-filter" class="btn" style="color: inherit;">
-                        <option value="">All log levels</option>
-                        <option disabled>&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;</option>
-                        <option value="DEBUG">Debug</option>
-                        <option value="INFO">Info</option>
-                        <option value="WARN">Warning</option>
-                        <option value="ERROR">Error</option>
-                    </select>
-                </label>
-            </div>
-            <button class="btn btn-dark" id="download-tautullilog"><i class="fa fa-download"></i> Download logs</button>
-            <button class="btn btn-dark" id="download-plexserverlog" style="display: none;"><i class="fa fa-download"></i> Download logs</button>
-            <button class="btn btn-dark" id="clear-notify-logs" style="display: none;"><i class="fa fa-trash-o"></i> Clear logs</button>
-            <button class="btn btn-dark" id="clear-newsletter-logs" style="display: none;"><i class="fa fa-trash-o"></i> Clear logs</button>
-            <button class="btn btn-dark" id="clear-login-logs" style="display: none;"><i class="fa fa-trash-o"></i> Clear logs</button>
+            <button class="btn btn-dark" id="clear-logs"><i class="fa fa-trash-o"></i> Clear log</button>
         </div>
     </div>
     <div class='table-card-back'>
         <div>
-            <ul id="log_tabs" class="nav nav-pills" role="tablist">
-                <li role="presentation" class="active"><a id="tautulli-logs-btn" href="#tabs-tautulli_log" aria-controls="tabs-tautulli_log" role="tab" data-toggle="tab">Tautulli Logs</a></li>
-                <li role="presentation"><a id="tautulli-api-logs-btn" href="#tabs-tautulli_api_log" aria-controls="tabs-tautulli_api_log" role="tab" data-toggle="tab">Tautulli API Logs</a></li>
-                <li role="presentation"><a id="plex-logs-btn" href="#tabs-plex_log" aria-controls="tabs-plex_log" role="tab" data-toggle="tab">Plex Media Server Logs</a></li>
-                <li role="presentation"><a id="plex-websocket-logs-btn" href="#tabs-plex_websocket_log" aria-controls="tabs-plex_websocket_log" role="tab" data-toggle="tab">Plex Websocket Logs</a></li>
-                <li role="presentation"><a id="notification-logs-btn" href="#tabs-notification_log" aria-controls="tabs-notification_log" role="tab" data-toggle="tab">Notification Logs</a></li>
-                <li role="presentation"><a id="newsletter-logs-btn" href="#tabs-newsletter_log" aria-controls="tabs-newsletter_log" role="tab" data-toggle="tab">Newsletter Logs</a></li>
-                <li role="presentation"><a id="login-logs-btn" href="#tabs-login_log" aria-controls="tabs-login_log" role="tab" data-toggle="tab">Login Logs</a></li>
+            <ul class="nav nav-pills" role="tablist">
+                <li role="presentation" class="active"><a id="plexpy-logs-btn" href="#tabs-1" aria-controls="tabs-1" role="tab" data-toggle="tab">PlexPy Logs</a></li>
+                <li role="presentation"><a id="plex-logs-btn" href="#tabs-2" aria-controls="tabs-2" role="tab" data-toggle="tab">Plex Media Server Logs</a></li>
             </ul>
             <div class="tab-content">
-                <div role="tabpanel" class="tab-pane active" id="tabs-tautulli_log" data-logfile="tautulli">
-                    <table class="display" id="tautulli_log_table" width="100%">
+                <div role="tabpanel" class="tab-pane active" id="tabs-1">
+                    <table class="display" id="log_table" width="100%">
                         <thead>
-                            <tr>
-                                <th class="min-tablet" align="left" id="timestamp">Timestamp</th>
-                                <th class="desktop" align="left" id="level">Level</th>
-                                <th class="all" align="left" id="message">Message</th>
-                            </tr>
+                        <tr>
+                            <th class="min-tablet" align='left' id="timestamp">Timestamp</th>
+                            <th class="desktop" align='left' id="level">Level</th>
+                            <th class="all" align='left' id="message">Message</th>
+                        </tr>
                         </thead>
-                        <tbody></tbody>
+                        <tbody>
+                        </tbody>
                     </table>
                 </div>
-                <div role="tabpanel" class="tab-pane" id="tabs-tautulli_api_log" data-logfile="tautulli_api">
-                    <table class="display" id="tautulli_api_log_table" width="100%">
-                        <thead>
-                            <tr>
-                                <th class="min-tablet" align="left" id="timestamp">Timestamp</th>
-                                <th class="desktop" align="left" id="level">Level</th>
-                                <th class="all" align="left" id="message">Message</th>
-                            </tr>
-                        </thead>
-                        <tbody></tbody>
-                    </table>
-                </div>
-                <div role="tabpanel" class="tab-pane" id="tabs-plex_websocket_log" data-logfile="plex_websocket">
-                    <table class="display" id="plex_websocket_log_table" width="100%">
-                        <thead>
-                            <tr>
-                                <th class="min-tablet" align="left" id="timestamp">Timestamp</th>
-                                <th class="desktop" align="left" id="level">Level</th>
-                                <th class="all" align="left" id="message">Message</th>
-                            </tr>
-                        </thead>
-                        <tbody></tbody>
-                    </table>
-                </div>
-                <div role="tabpanel" class="tab-pane" id="tabs-plex_log">
+                <div role="tabpanel" class="tab-pane" id="tabs-2">
                     <table class="display" id="plex_log_table" width="100%">
                         <thead>
-                            <tr>
-                                <th align="left" id="plex_timestamp">Timestamp</th>
-                                <th align="left" id="plex_level">Level</th>
-                                <th align="left" id="plex_message">Message</th>
-                            </tr>
+                        <tr>
+                            <th align='left' id="plex_timestamp">Timestamp</th>
+                            <th align='left' id="plex_level">Level</th>
+                            <th align='left' id="plex_message">Message</th>
+                        </tr>
                         </thead>
-                        <tbody></tbody>
-                    </table>
-                </div>
-                <div role="tabpanel" class="tab-pane" id="tabs-notification_log">
-                    <table class="display" id="notification_log_table" width="100%">
-                        <thead>
-                            <tr>
-                                <th align="left" id="notification_timestamp">Timestamp</th>
-                                <th align="left" id="notification_notifier_id">Notifier ID</th>
-                                <th align="left" id="notification_agent_name">Agent</th>
-                                <th align="left" id="notification_notify_action">Action</th>
-                                <th align="left" id="notification_subject_text">Subject Text</th>
-                                <th align="left" id="notification_body_text">Body Text</th>
-                                <th align="left" id="notification_success"></th>
-                            </tr>
-                        </thead>
-                        <tbody></tbody>
-                    </table>
-                </div>
-                <div role="tabpanel" class="tab-pane" id="tabs-newsletter_log">
-                    <table class="display" id="newsletter_log_table" width="100%">
-                        <thead>
-                            <tr>
-                                <th align="left" id="newsletter_timestamp">Timestamp</th>
-                                <th align="left" id="newsletter_newsletter_id">Newsletter ID</th>
-                                <th align="left" id="newsletter_agent_name">Agent</th>
-                                <th align="left" id="newsletter_notify_action">Action</th>
-                                <th align="left" id="newsletter_subject_text">Subject Text</th>
-                                <th align="left" id="newsletter_body_text">Body Text</th>
-                                <th align="left" id="newsletter_start_date">Start Date</th>
-                                <th align="left" id="newsletter_end_date">End Date</th>
-                                <th align="left" id="newsletter_uuid">UUID</th>
-                                <th align="left" id="newsletter_success"></th>
-                            </tr>
-                        </thead>
-                        <tbody></tbody>
-                    </table>
-                </div>
-                <div role="tabpanel" class="tab-pane" id="tabs-login_log">
-                    <table class="display login_log_table" id="login_log_table" width="100%">
-                        <thead>
-                            <tr>
-                                <th align="left" id="login_timestamp">Timestamp</th>
-                                <th align="left" id="login_friendly_name">User</th>
-                                <th align="left" id="login_user_group">User Group</th>
-                                <th align="left" id="login_ip_address">IP Address</th>
-                                <th align="left" id="login_host">Host</th>
-                                <th align="left" id="login_os">Operating System</th>
-                                <th align="left" id="login_browser">Browser</th>
-                                <th align="left" id="login_expiry">Expiry</th>
-                                <th align="left" id="login_success"></th>
-                            </tr>
-                        </thead>
-                        <tbody></tbody>
+                        <tbody>
+                        </tbody>
                     </table>
                 </div>
             </div>
@@ -184,8 +63,7 @@
 </div>
 
 <br>
-<div align="center">
-    Refresh rate:
+<div align="center">Refresh rate:
     <select id="refreshrate" onchange="setRefresh()">
         <option value="0" selected="selected">No Refresh</option>
         <option value="5">5 Seconds</option>
@@ -198,330 +76,50 @@
 </div>
 </%def>
 
-<%def name="modalIncludes()">
-<div class="modal fade" id="ip-info-modal" tabindex="-1" role="dialog" aria-labelledby="ip-info-modal">
-</div>
-</%def>
-
 <%def name="javascriptIncludes()">
-<script src="${http_root}js/jquery.dataTables.min.js"></script>
-<script src="${http_root}js/dataTables.bootstrap.min.js"></script>
-<script src="${http_root}js/dataTables.bootstrap.pagination.js"></script>
-<script src="${http_root}js/tables/logs.js${cache_param}"></script>
-<script src="${http_root}js/tables/plex_logs.js${cache_param}"></script>
-<script src="${http_root}js/tables/notification_logs.js${cache_param}"></script>
-<script src="${http_root}js/tables/newsletter_logs.js${cache_param}"></script>
-<script src="${http_root}js/tables/login_logs.js${cache_param}"></script>
+<script src="interfaces/default/js/jquery.dataTables.min.js"></script>
+<script src="interfaces/default/js/dataTables.bootstrap.min.js"></script>
+<script src="interfaces/default/js/dataTables.bootstrap.pagination.js"></script>
+<script src="interfaces/default/js/tables/logs.js"></script>
+<script src="interfaces/default/js/tables/plex_logs.js"></script>
 <script>
 
         $(document).ready(function() {
-            loadtautullilogs('tautulli', selected_log_level);
-            clearSearchButton('tautulli_log_table', log_table);
+            LoadPlexPyLogs();
+            clearSearchButton('log_table', log_table);
         });
-
-        var log_levels = ['DEBUG', 'INFO', 'WARN', 'ERROR'];
-
-        function bindLogLevelFilter() {
-            clearLogLevelFilter();
-            var log_level_column = this.api().column(1);
-            var select = $('#plex-log-level-filter');
-            select.on('change', function () {
-                var val = $.fn.dataTable.util.escapeRegex(
-                    $(this).val()
-                );
-                var search_string = '';
-                var levelIndex = log_levels.indexOf(val);
-                if (levelIndex >= 0) {
-                    search_string = '^' + log_levels
-                      .slice(levelIndex)
-                      .join('|') + '$';
-                }
-                log_level_column
-                    .search(search_string, true, false)
-                    .draw();
-            }).change();
-        }
-
-        function clearLogLevelFilter() {
-            $('#plex-log-level-filter').off('change');
-        }
-
-        var selected_log_level = null;
-        function loadtautullilogs(logfile, selected_log_level) {
+        
+        function LoadPlexPyLogs() {
             log_table_options.ajax = {
-                url: 'get_log',
-                type: 'POST',
-                data: function (d) {
-                    return {
-                        logfile: logfile,
-                        json_data: JSON.stringify(d),
-                        log_level: selected_log_level
-                    };
-                }
-            };
-            log_table = $('#' + logfile + '_log_table').DataTable(log_table_options);
-
-            $('#tautulli-log-level-filter').on('change', function () {
-                selected_log_level = $(this).val() || null;
-                log_table.draw();
-            });
+                "url": "getLog"
+            }
+            log_table = $('#log_table').DataTable(log_table_options);
         }
 
-        function loadPlexLogs(logfile) {
+        function LoadPlexLogs() {
             plex_log_table_options.ajax = {
-                url: 'get_plex_log',
-                type: 'POST',
-                data: {
-                    logfile: logfile
-                }
-            };
-            plex_log_table_options.initComplete = bindLogLevelFilter;
+                "url": "get_plex_log"
+            }
             plex_log_table = $('#plex_log_table').DataTable(plex_log_table_options);
         }
 
-        function loadNotificationLogs() {
-            notification_log_table_options.ajax = {
-                url: 'get_notification_log',
-                type: 'POST',
-                data: function (d) {
-                    return {
-                        json_data: JSON.stringify(d)
-                    };
-                }
-            };
-            notification_log_table = $('#notification_log_table').DataTable(notification_log_table_options);
-        }
-
-        function loadNewsletterLogs() {
-            newsletter_log_table_options.ajax = {
-                url: "get_newsletter_log",
-                data: function (d) {
-                    return {
-                        json_data: JSON.stringify(d)
-                    };
-                }
-            };
-            newsletter_log_table = $('#newsletter_log_table').DataTable(newsletter_log_table_options);
-        }
-
-        function loadLoginLogs() {
-            login_log_table_options.pageLength = 50;
-            login_log_table_options.ajax = {
-                url: 'get_user_logins',
-                type: 'POST',
-                data: function (d) {
-                    return {
-                        json_data: JSON.stringify(d)
-                    };
-                }
-            };
-            login_log_table = $('#login_log_table').DataTable(login_log_table_options);
-        }
-
-        $("#tautulli-logs-btn").click(function () {
-            $("#tautulli-log-levels").show();
-            $("#plex-log-files").hide();
-            $("#plex-log-levels").hide();
+        $("#plexpy-logs-btn").click(function() {
             $("#clear-logs").show();
-            $("#download-tautullilog").show();
-            $("#download-plexserverlog").hide();
-            $("#clear-notify-logs").hide();
-            $("#clear-newsletter-logs").hide();
-            $("#clear-login-logs").hide();
-            loadtautullilogs('tautulli', selected_log_level);
-            clearSearchButton('tautulli_log_table', log_table);
+            LoadPlexPyLogs();
+            clearSearchButton('log_table', log_table);
         });
 
-        $("#tautulli-api-logs-btn").click(function () {
-            $("#tautulli-log-levels").show();
-            $("#plex-log-files").hide();
-            $("#plex-log-levels").hide();
-            $("#clear-logs").show();
-            $("#download-tautullilog").show();
-            $("#download-plexserverlog").hide();
-            $("#clear-notify-logs").hide();
-             $("#clear-newsletter-logs").hide();
-           $("#clear-login-logs").hide();
-            loadtautullilogs('tautulli_api', selected_log_level);
-            clearSearchButton('tautulli_api_log_table', log_table);
-        });
-
-        $("#plex-websocket-logs-btn").click(function () {
-            $("#tautulli-log-levels").show();
-            $("#plex-log-files").hide();
-            $("#plex-log-levels").hide();
-            $("#clear-logs").show();
-            $("#download-tautullilog").show();
-            $("#download-plexserverlog").hide();
-            $("#clear-notify-logs").hide();
-            $("#clear-newsletter-logs").hide();
-            $("#clear-login-logs").hide();
-            loadtautullilogs('plex_websocket', selected_log_level);
-            clearSearchButton('plex_websocket_log_table', log_table);
-        });
-
-        $("#plex-logs-btn").click(function () {
-            $("#tautulli-log-levels").hide();
-            $("#plex-log-files").show();
-            $("#plex-log-levels").show();
+        $("#plex-logs-btn").click(function() {
             $("#clear-logs").hide();
-            $("#download-tautullilog").hide();
-            $("#download-plexserverlog").show();
-            $("#clear-notify-logs").hide();
-            $("#clear-newsletter-logs").hide();
-            $("#clear-login-logs").hide();
-            loadPlexLogs();
+            LoadPlexLogs();
             clearSearchButton('plex_log_table', plex_log_table);
         });
 
-        $("#notification-logs-btn").click(function () {
-            $("#tautulli-log-levels").hide();
-            $("#plex-log-files").hide();
-            $("#plex-log-levels").hide();
-            $("#clear-logs").hide();
-            $("#download-tautullilog").hide();
-            $("#download-plexserverlog").hide();
-            $("#clear-notify-logs").show();
-            $("#clear-newsletter-logs").hide();
-            $("#clear-login-logs").hide();
-            loadNotificationLogs();
-            clearSearchButton('notification_log_table', notification_log_table);
-        });
-
-        $("#newsletter-logs-btn").click(function () {
-            $("#tautulli-log-levels").hide();
-            $("#plex-log-files").hide();
-            $("#plex-log-levels").hide();
-            $("#clear-logs").hide();
-            $("#download-tautullilog").hide();
-            $("#download-plexserverlog").hide();
-            $("#clear-notify-logs").hide();
-            $("#clear-newsletter-logs").show();
-            $("#clear-login-logs").hide();
-            loadNewsletterLogs();
-            clearSearchButton('newsletter_log_table', newsletter_log_table);
-        });
-
-        $("#login-logs-btn").click(function () {
-            $("#tautulli-log-levels").hide();
-            $("#plex-log-files").hide();
-            $("#plex-log-levels").hide();
-            $("#clear-logs").hide();
-            $("#download-tautullilog").hide();
-            $("#download-plexserverlog").hide();
-            $("#clear-notify-logs").hide();
-            $("#clear-newsletter-logs").hide();
-            $("#clear-login-logs").show();
-            loadLoginLogs();
-            clearSearchButton('login_log_table', notification_log_table);
-        });
-
-        $("#plex-log-files").on('change', function () {
-            var logfile = $("option:selected", this).val();
-            loadPlexLogs(logfile);
-            clearSearchButton('plex_log_table', plex_log_table);
-        });
-
-        $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
-            $.fn.dataTable.tables({ visible: true, api: true }).columns.adjust();
-        });
-
-        $("#clear-logs").click(function () {
-            var logfile = $(".tab-pane.active").data('logfile');
-            var title = $("#log_tabs li.active a").text();
-
-            $("#confirm-message").text("Are you sure you want to clear the " + title + "?");
-            $('#confirm-modal').modal();
-            $('#confirm-modal').one('click', '#confirm-button', function () {
-                $.ajax({
-                    url: 'delete_logs',
-                    type: 'POST',
-                    data: { logfile: logfile },
-                    complete: function (xhr, status) {
-                        result = $.parseJSON(xhr.responseText);
-                        msg = result.message;
-                        if (result.result === 'success') {
-                            showMsg('<i class="fa fa-check"></i> ' + msg, false, true, 5000)
-                        } else {
-                            showMsg('<i class="fa fa-times"></i> ' + msg, false, true, 5000, true)
-                        }
-                        log_table.draw();
-                    }
-                });
-            });
-        });
-
-        $("#download-tautullilog").click(function () {
-            var logfile = $(".tab-pane.active").data('logfile');
-            window.location.href = "download_log?logfile=" + window.encodeURIComponent(logfile);
-        });
-
-        $("#download-plexserverlog").click(function () {
-            var logfile = $("option:selected", "#plex-log-files").val();
-            window.location.href = "download_plex_log?logfile=" + window.encodeURIComponent(logfile);
-        });
-
-        $("#clear-notify-logs").click(function () {
-            $("#confirm-message").text("Are you sure you want to clear the Tautulli Notification Logs?");
-            $('#confirm-modal').modal();
-            $('#confirm-modal').one('click', '#confirm-button', function () {
-                $.ajax({
-                    url: 'delete_notification_log',
-                    type: 'POST',
-                    complete: function (xhr, status) {
-                        result = $.parseJSON(xhr.responseText);
-                        msg = result.message;
-                        if (result.result === 'success') {
-                            showMsg('<i class="fa fa-check"></i> ' + msg, false, true, 5000)
-                        } else {
-                            showMsg('<i class="fa fa-times"></i> ' + msg, false, true, 5000, true)
-                        }
-                        notification_log_table.draw();
-                    }
-                });
-            });
-        });
-
-        $("#clear-newsletter-logs").click(function () {
-            $("#confirm-message").text("Are you sure you want to clear the Tautulli Newsletter Logs?");
-            $('#confirm-modal').modal();
-            $('#confirm-modal').one('click', '#confirm-button', function () {
-                $.ajax({
-                    url: 'delete_newsletter_log',
-                    type: 'POST',
-                    complete: function (xhr, status) {
-                        result = $.parseJSON(xhr.responseText);
-                        msg = result.message;
-                        if (result.result === 'success') {
-                            showMsg('<i class="fa fa-check"></i> ' + msg, false, true, 5000)
-                        } else {
-                            showMsg('<i class="fa fa-times"></i> ' + msg, false, true, 5000, true)
-                        }
-                        newsletter_log_table.draw();
-                    }
-                });
-            });
-        });
-
-        $("#clear-login-logs").click(function () {
-            $("#confirm-message").text("Are you sure you want to clear the Tautulli Login Logs?");
-            $('#confirm-modal').modal();
-            $('#confirm-modal').one('click', '#confirm-button', function () {
-                $.ajax({
-                    url: 'delete_login_log',
-                    type: 'POST',
-                    complete: function (xhr, status) {
-                        result = $.parseJSON(xhr.responseText);
-                        msg = result.message;
-                        if (result.result === 'success') {
-                            showMsg('<i class="fa fa-check"></i> ' + msg, false, true, 5000)
-                        } else {
-                            showMsg('<i class="fa fa-times"></i> ' + msg, false, true, 5000, true)
-                        }
-                        window.location = 'auth/logout';
-                    }
-                });
-            });
+        $("#clear-logs").click(function() {
+            var r = confirm("Are you sure you want to clear the PlexPy log?");
+            if (r == true) {
+                window.location.href = "clearLogs";
+            }
         });
 
         var timer;
@@ -534,17 +132,13 @@
                 {
                     clearInterval(timer);
                 }
-                if(refreshrate.value !== 0)
+                if(refreshrate.value != 0)
                 {
                     timer = setInterval(function() {
-                        if ($("#tabs-tautulli_log").hasClass("active") || $("#tabs-tautulli_api_log").hasClass("active") || $("#tabs-plex_websocket_log").hasClass("active")) {
+                        if ($("#tabs-1").hasClass("active")) {
                             log_table.ajax.reload();
-                        } else if ($("#tabs-plex_log").hasClass("active")) {
+                        } else {
                             plex_log_table.ajax.reload();
-                        } else if ($("#tabs-notificaiton_log").hasClass("active")) {
-                            notification_log_table.ajax.reload();
-                        } else if ($("#tabs-login_log").hasClass("active")) {
-                            login_log_table.ajax.reload();
                         }
                     }, 1000*refreshrate.value);
                 }
diff --git a/data/interfaces/default/mobile_device_config.html b/data/interfaces/default/mobile_device_config.html
deleted file mode 100644
index 78080603..00000000
--- a/data/interfaces/default/mobile_device_config.html
+++ /dev/null
@@ -1,154 +0,0 @@
-% if device:
-<div class="modal-dialog" role="document">
-    <div class="modal-content">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-            <h4 class="modal-title" id="mobile-device-config-modal-header">${device['device_name']} Settings &nbsp;<small><span class="device_id">(Device ID: ${device['id']}${' - ' + device['friendly_name'] if device['friendly_name'] else ''})</span></small></h4>
-        </div>
-        <div class="modal-body">
-            <div class="container-fluid">
-                <form action="set_mobile_device_config" method="post" class="form" id="set_mobile_device_config" data-parsley-validate>
-                    <div class="row">
-                        <div class="col-md-12">
-                            <input type="hidden" id="mobile_device_id" name="mobile_device_id" value="${device['id']}" />
-                            <div class="form-group">
-                                <label for="friendly_name">Friendly Name</label>
-                                <div class="row">
-                                    <div class="col-md-8">
-                                        <input type="text" class="form-control" id="friendly_name" name="friendly_name" value="${device['friendly_name'] or ''}" size="30">
-                                    </div>
-                                </div>
-                                <p class="help-block">Optional: Enter a friendly name for this device. Leave blank for default.</p>
-                            </div>
-                            <div class="form-group">
-                                <label for="friendly_name">App Version</label>
-                                <div class="row">
-                                    <div class="col-md-3">
-                                        <input type="text" class="form-control" id="app_version" name="app_version" value="${device['version'] or ''}" size="30" readonly>
-                                    </div>
-                                </div>
-                                <p class="help-block">The version of the mobile app.</p>
-                          </div>
-                            <div class="form-group">
-                                <label for="friendly_name">Device Token</label>
-                                <div class="row">
-                                    <div class="col-md-12">
-                                        <div class="input-group">
-                                            <span class="input-group-btn">
-                                                <button class="btn btn-form reveal-token" type="button"><i class="fa fa-eye-slash"></i></button>
-                                            </span>
-                                            <input type="password" class="form-control" id="device_token" value="${device['device_token']}" size="30" readonly>
-                                        </div>
-                                    </div>
-                                </div>
-                                <p class="help-block">Your app device token.</p>
-                            </div>
-                            <div class="form-group">
-                                <label for="friendly_name">OneSignal Device ID</label>
-                                <div class="row">
-                                    <div class="col-md-12">
-                                        <div class="input-group">
-                                            <span class="input-group-btn">
-                                                <button class="btn btn-form reveal-token" type="button"><i class="fa fa-eye-slash"></i></button>
-                                            </span>
-                                            <input type="password" class="form-control" id="onesignal_id" value="${device['onesignal_id'] or ''}" size="30" readonly>
-                                        </div>
-                                    </div>
-                                </div>
-                                <p class="help-block">Your OneSignal device ID for notifications.</p>
-                            </div>
-                        </div>
-                    </div>
-                </form>
-            </div>
-        </div>
-        <div class="modal-footer">
-            <input type="button" id="delete-mobile-device" class="btn btn-danger btn-edit" style="float:left;" value="Delete">
-            <input type="button" id="save-mobile-device" class="btn btn-bright" value="Save">
-        </div>
-    </div>
-</div>
-
-<script>
-    $('#mobile-device-config-modal').unbind('hidden.bs.modal');
-
-    function reloadModal() {
-        $.ajax({
-            url: 'get_mobile_device_config_modal',
-            data: { mobile_device_id: '${device["id"]}' },
-            cache: false,
-            async: true,
-            complete: function (xhr, status) {
-                $('#mobile-device-config-modal').html(xhr.responseText);
-            }
-        });
-    }
-
-    function saveCallback(jqXHR) {
-        if (jqXHR) {
-            var result = $.parseJSON(jqXHR.responseText);
-            var msg = result.message;
-            if (result.result == 'success') {
-                showMsg('<i class="fa fa-check"></i> ' + msg, false, true, 5000)
-            } else {
-                showMsg('<i class="fa fa-times"></i> ' + msg, false, true, 5000, true)
-            }
-        }
-
-        getMobileDevicesTable();
-        toggleRevealTokens();
-    }
-
-    function deleteCallback() {
-        $('#mobile-device-config-modal').modal('hide');
-        getMobileDevicesTable();
-    }
-
-    function saveMobileDevice() {
-        // Trim all text inputs before saving
-        $('input[type=text]').val(function(_, value) {
-            return $.trim(value);
-        });
-        // Reload modal to update certain fields
-        doAjaxCall('set_mobile_device_config', $(this), false, true, true, saveCallback);
-    }
-
-    $('#delete-mobile-device').click(function () {
-        var msg = 'Are you sure you want to unregister the device <strong>${device["device_name"]}</strong> from Tautulli?';
-        var url = 'delete_mobile_device';
-        confirmAjaxCall(url, msg, { mobile_device_id: '${device["id"]}' }, null, deleteCallback);
-    });
-
-    $('#save-mobile-device').click(function () {
-        saveMobileDevice();
-    });
-
-    // Never send checkbox values directly, always substitute value in hidden input.
-    $('.checkboxes').click(function () {
-        var configToggle = $(this).data('id');
-        if ($(this).is(':checked')) {
-            $('#'+configToggle).val(1);
-        } else {
-            $('#'+configToggle).val(0);
-        }
-    });
-
-    toggleRevealTokens();
-</script>
-% else:
-<div class="modal-dialog" role="document">
-    <div class="modal-content">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-            <h4 class="modal-title" id="mobile-device-config-modal-header">Error</h4>
-        </div>
-        <div class="modal-body">
-            <center><strong>
-                <i class="fa fa-exclamation-circle"></i> Failed to retrieve mobile device configuration. Check the <a href="logs">logs</a> for more info.
-            </strong></center>
-        </div>
-        <div class="modal-footer">
-        </div>
-    </div>
-</div>
-% endif
diff --git a/data/interfaces/default/mobile_devices_table.html b/data/interfaces/default/mobile_devices_table.html
deleted file mode 100644
index 852fb2dd..00000000
--- a/data/interfaces/default/mobile_devices_table.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<%doc>
-USAGE DOCUMENTATION :: PLEASE LEAVE THIS AT THE TOP OF THIS FILE
-
-For Mako templating syntax documentation please visit: http://docs.makotemplates.org/en/latest/
-
-Filename:           mobile_devices_table.html
-Version:            0.1
-
-DOCUMENTATION :: END
-</%doc>
-
-<ul class="stacked-configs list-unstyled">
-    % for device in sorted(devices_list, key=lambda k: ((k['friendly_name'] or k['device_name']).lower(), k['id'])):
-    <li class="mobile-device pointer" data-id="${device['id']}" data-name="${device['device_name']}">
-        <span>
-            % if device['official'] == -1:
-                <span class="toggle-left official-tooltip" data-toggle="tooltip" data-placement="top" title="OneSignal Validation Failed"><i class="fa fa-lg fa-fw fa-exclamation-triangle"></i></span>
-            % elif device['official'] > 0:
-                <%
-                    icon = 'mobile'
-                    if device['platform'] == 'android':
-                        icon = 'android'
-                    elif device['platform'] == 'ios':
-                        icon = 'apple'
-                %>
-                <span class="toggle-left"><i class="fa fa-lg fa-fw fa-${icon}"></i></span>
-            % else:
-                <span class="toggle-left official-tooltip" data-toggle="tooltip" data-placement="top" title="Unofficial or Unknown App"><i class="fa fa-lg fa-fw fa-exclamation-triangle"></i></span>
-            % endif
-            ${device['friendly_name'] or device['device_name']} &nbsp;<span class="friendly_name">(${device['id']})</span>
-            <span class="toggle-right friendly_name">
-                % if device['last_seen']:
-                <span id="device-last_seen-${device['id']}">
-                    <script>
-                        $("#device-last_seen-${device['id']}").text(moment("${device['last_seen']}", "X").fromNow())
-                    </script>
-                </span>
-                % else:
-                never
-                % endif
-                <i class="fa fa-lg fa-fw fa-cog"></i></span>
-            </span>
-        </span>
-    </li>
-    % endfor
-    <li class="add-mobile-device pointer" id="register-mobile-device" data-target="#api-qr-modal" data-toggle="modal">
-        <span>
-            <span class="toggle-left"><i class="fa fa-lg fa-fw fa-mobile"></i></span> Register a new device
-            <span class="toggle-right"><i class="fa fa-lg fa-fw fa-plus"></i></span>
-        </span>
-    </li>
-</ul>
-
-<script>
-    // Load notification agent config modal
-    $(".mobile-device").click(function () {
-        var mobile_device_id = $(this).data('id');
-        loadMobileDeviceConfig(mobile_device_id);
-    });
-
-    getPlexPyURL = function () {
-        var deferred = $.Deferred();
-        if (location.hostname !== "localhost" && location.hostname !== "127.0.0.1" && location.hostname !== "[::1]") {
-            deferred.resolve(location.href.split('/settings')[0]);
-        } else {
-            $.get('get_plexpy_url').then(function (url) {
-                deferred.resolve(url);
-            })
-        }
-        return deferred;
-    };
-
-    function checkQRAddress(url) {
-        var parser = document.createElement('a');
-        parser.setAttribute('href', url);
-        var hostname = parser.hostname;
-        var protocol = parser.protocol;
-
-        if (hostname === 'localhost' || hostname === '127.0.0.1' || hostname === '[::1]') {
-            $('#api_qr_localhost').toggle(true);
-            $('#api_qr_private').toggle(false);
-        } else {
-            $('#api_qr_localhost').toggle(false);
-            isPrivateIP(hostname).then(function (valid) {
-                $('#api_qr_private').toggle((valid !== 'n/a'));
-            }, function () {
-                $('#api_qr_private').toggle(false);
-            });
-        }
-        $('#api_qr_https').toggle((protocol === 'http:'));
-    }
-
-    function generateQRCode(url) {
-        $('#api_qr_code').empty().kjua({
-            text: url + '|' + $('#api_qr_token').val(),
-            render: 'canvas',
-            ecLevel: 'H',
-            size: 256,
-            fill: '#000',
-            back: '#eee'
-        });
-    }
-
-    var verifiedDevice = false;
-    $('#register-mobile-device').click(function () {
-        verifiedDevice = false;
-
-        getPlexPyURL().then(function (url) {
-            checkQRAddress(url);
-
-            $.get('generate_api_key', { device: true }).then(function (token) {
-                $('#api_qr_address').val(url);
-                $('#api_qr_token').val(token);
-                generateQRCode(url);
-
-                (function poll() {
-                    setTimeout(function () {
-                        $.ajax({
-                            url: 'verify_mobile_device',
-                            type: 'GET',
-                            data: {
-                                device_token: token
-                            },
-                            success: function (data) {
-                                if (data.result === 'success') {
-                                    verifiedDevice = true;
-                                    getMobileDevicesTable();
-                                    $('#api-qr-modal').modal('hide');
-                                    showMsg('<i class="fa fa-check"></i> ' + data.message, false, true, 5000, false);
-                                }
-                            },
-                            complete: function () {
-                                if (!(verifiedDevice)) {
-                                    poll();
-                                }
-                            },
-                            timeout: 1000
-                        });
-                    }, 1000);
-                })();
-            });
-        });
-    });
-
-    $('#api_qr_address').change(function () {
-        this.value = $.trim(this.value);
-        var url = $(this).val();
-        checkQRAddress(url);
-        generateQRCode(url);
-    });
-
-    $('#api-qr-modal').on('hide.bs.modal', function () {
-        if (!(verifiedDevice)) {
-            $.ajax({
-                url: 'verify_mobile_device',
-                type: 'GET',
-                data: {
-                    device_token: $('#api_qr_token').val(),
-                    cancel: true
-                },
-                success: function (data) {
-                    showMsg('<i class="fa fa-times"></i> ' + data.message, false, true, 5000, false);
-                }
-            });
-        }
-        verifiedDevice = true;
-    })
-
-    $('.official-tooltip').tooltip();
-</script>
\ No newline at end of file
diff --git a/data/interfaces/default/newsletter_auth.html b/data/interfaces/default/newsletter_auth.html
deleted file mode 100644
index 74b49986..00000000
--- a/data/interfaces/default/newsletter_auth.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<%
-    import urllib
-%>
-<!doctype html>
-
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>Tautulli - ${title}</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="${http_root}css/bootstrap3/bootstrap.min.css" rel="stylesheet">
-    <link href="${http_root}css/tautulli.css${cache_param}" rel="stylesheet">
-    <link href="${http_root}css/opensans.min.css" rel="stylesheet">
-    <link href="${http_root}css/font-awesome.all.min.css" rel="stylesheet">
-    <link href="${http_root}css/font-awesome.v4-shims.min.css" rel="stylesheet">
-
-    <!-- Favicons -->
-    <link rel="icon" type="image/png" sizes="32x32" href="${http_root}images/favicon/favicon-32x32.png?v=2.6.0">
-    <link rel="icon" type="image/png" sizes="16x16" href="${http_root}images/favicon/favicon-16x16.png?v=2.6.0">
-    <link rel="shortcut icon" href="${http_root}images/favicon/favicon.ico?v=2.6.0">
-</head>
-
-<body>
-<div class="body-container">
-    <div class="container-fluid">
-        <div class="row">
-            <div class="login-container">
-                <div class="newsletter-logo">
-                    <img src="${http_root}images/newsletter/newsletter-header.png" height="100" alt="Tautulli">
-                </div>
-                <div class="row">
-                    <div class="col-sm-6 col-sm-offset-3">
-                        <form action="${uri}" method="post" id="newsletter-form">
-                            <div class="form-group">
-                                <label for="password" class="control-label">
-                                    Password
-                                </label>
-                                <input type="password" id="key" name="key" class="form-control" autofocus>
-                            </div>
-                            <button id="enter" type="submit" class="btn btn-bright login-button"><i class="fa fa-sign-in"></i>&nbsp; Enter</button>
-                        </form>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-</body>
-</html>
diff --git a/data/interfaces/default/newsletter_config.html b/data/interfaces/default/newsletter_config.html
deleted file mode 100644
index f6ae70c3..00000000
--- a/data/interfaces/default/newsletter_config.html
+++ /dev/null
@@ -1,825 +0,0 @@
-% if newsletter:
-<%!
-    import json
-    from plexpy import notifiers
-    from plexpy.helpers import anon_url, checked
-
-    all_notifiers = sorted(notifiers.get_notifiers(), key=lambda k: (k['agent_label'].lower(), k['friendly_name'], k['id']))
-    email_notifiers = [n for n in all_notifiers if n['agent_name'] == 'email']
-    email_notifiers = [{'id': 0, 'agent_label': 'New Email Configuration', 'friendly_name': ''}] + email_notifiers
-    other_notifiers = [{'id': 0, 'agent_label': 'Select a Notification Agent', 'friendly_name': ''}] + all_notifiers
-%>
-<div class="modal-dialog" role="document">
-    <div class="modal-content">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-            <h4 class="modal-title" id="newsletter-config-modal-header">${newsletter['agent_label']} Newsletter Settings &nbsp;<small><span class="newsletter_id">(Newsletter ID: ${newsletter['id']}${' - ' + newsletter['friendly_name'] if newsletter['friendly_name'] else ''})</span></small></h4>
-        </div>
-        <div class="modal-body">
-            <div class="container-fluid">
-                <div class="row">
-                    <ul class="nav nav-tabs list-unstyled" role="tablist">
-                        <li role="presentation" class="active"><a href="#tabs-newsletter_config" aria-controls="tabs-newsletter_config" role="tab" data-toggle="tab">Configuration</a></li>
-                        <li role="presentation"><a href="#tabs-newsletter_saving_sending" aria-controls="tabs-newsletter_saving_sending" role="tab" data-toggle="tab">Saving & Sending</a></li>
-                        <li role="presentation"><a href="#tabs-newsletter_text" aria-controls="tabs-newsletter_text" role="tab" data-toggle="tab">Newsletter Text</a></li>
-                        <li role="presentation"><a href="#tabs-test_newsletter" aria-controls="tabs-test_newsletter" role="tab" data-toggle="tab">Test Newsletter</a></li>
-                    </ul>
-                </div>
-                <form action="set_newsletter_config" method="post" class="form" id="set_newsletter_config" data-parsley-validate>
-                    <div class="tab-content">
-                        <div role="tabpanel" class="tab-pane active" id="tabs-newsletter_config">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <div class="checkbox" style="margin-bottom: 20px;">
-                                        <label>
-                                            <input type="checkbox" data-id="active_value" class="checkboxes" value="1" autocomplete="off" ${checked(newsletter['active'])}> Enable the Newsletter
-                                        </label>
-                                        <input type="hidden" id="active_value" name="active" value="${newsletter['active']}">
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="custom_cron">Schedule</label>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                <select class="form-control" id="custom_cron" name="newsletter_config_custom_cron" autocomplete="off">
-                                                    <option value="0" ${'selected' if newsletter['config']['custom_cron'] == 0 else ''}>Simple</option>
-                                                    <option value="1" ${'selected' if newsletter['config']['custom_cron'] == 1 else ''}>Custom</option>
-                                                </select>
-                                                <input type="text" id="cron_value" name="cron" value="${newsletter['cron']}" autocomplete="off" />
-                                                <div id="cron-widget"></div>
-                                            </div>
-                                        </div>
-                                        <p class="help-block">
-                                            <span id="simple_cron_message">Set the schedule for the newsletter.</span>
-                                            <span id="custom_cron_message">
-                                                Set the schedule for the newsletter using a <a href="${anon_url('https://crontab.guru')}" target="_blank" rel="noreferrer">custom crontab</a>.
-                                                <a href="${anon_url('https://apscheduler.readthedocs.io/en/3.x/modules/triggers/cron.html#expression-types')}" target="_blank" rel="noreferrer">Click here</a> for a list of supported expressions.
-                                            </span>
-                                        </p>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="time_frame">Time Frame</label>
-                                        <div class="row">
-                                            <div class="col-md-5">
-                                                <div class="input-group newsletter-time_frame">
-                                                    <span class="input-group-addon form-control btn-dark inactive">Last</span>
-                                                    <input type="number" class="form-control" id="newsletter_config_time_frame" name="newsletter_config_time_frame" value="${newsletter['config']['time_frame']}" autocomplete="off">
-                                                    <select class="form-control" id="newsletter_config_time_frame_units" name="newsletter_config_time_frame_units" autocomplete="off">
-                                                        <option value="months" ${'selected' if newsletter['config']['time_frame_units'] == 'months' else ''}>months</option>
-                                                        <option value="days" ${'selected' if newsletter['config']['time_frame_units'] == 'days' else ''}>days</option>
-                                                        <option value="hours" ${'selected' if newsletter['config']['time_frame_units'] == 'hours' else ''}>hours</option>
-                                                    </select>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <p class="help-block">Set the time frame to include in the newsletter.</p>
-                                    </div>
-                                </div>
-                                <div class="col-md-12 modal-config-section">
-                                    <input type="hidden" id="newsletter_id" name="newsletter_id" value="${newsletter['id']}" />
-                                    <input type="hidden" id="agent_id" name="agent_id" value="${newsletter['agent_id']}" />
-                                    % for item in newsletter['config_options']:
-                                    % if item['input_type'] == 'help':
-                                    <div class="form-group">
-                                        <label>${item['label']}</label>
-                                        <p class="help-block">${item['description'] | n}</p>
-                                    </div>
-                                    % elif item['input_type'] == 'text' or item['input_type'] == 'password':
-                                    <div class="form-group">
-                                        <label for="${item['name']}">${item['label']}</label>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                <input type="${item['input_type']}" class="form-control" id="${item['name']}" name="${item['name']}" value="${item['value']}" size="30" autocomplete="off" ${'readonly' if item.get('readonly') else ''}>
-                                            </div>
-                                        </div>
-                                        <p class="help-block">${item['description'] | n}</p>
-                                    </div>
-                                    % elif item['input_type'] == 'number':
-                                    <div class="form-group">
-                                        <label for="${item['name']}">${item['label']}</label>
-                                        <div class="row">
-                                            <div class="col-md-3">
-                                                <input type="${item['input_type']}" class="form-control" id="${item['name']}" name="${item['name']}" value="${item['value']}" size="30" autocomplete="off">
-                                            </div>
-                                        </div>
-                                        <p class="help-block">${item['description'] | n}</p>
-                                    </div>
-                                    % elif item['input_type'] == 'button':
-                                    <div class="form-group">
-                                        <label for="${item['name']}">${item['label']}</label>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                <input type="button" class="btn btn-bright" id="${item['name']}" name="${item['name']}" value="${item['value']}">
-                                            </div>
-                                        </div>
-                                        <p class="help-block">${item['description'] | n}</p>
-                                    </div>
-                                    % elif item['input_type'] == 'checkbox':
-                                    <div class="checkbox">
-                                        <label>
-                                            <input type="checkbox" data-id="${item['name']}" class="checkboxes" value="1" autocomplete="off" ${checked(item['value'])}> ${item['label']}
-                                        </label>
-                                        <p class="help-block">${item['description'] | n}</p>
-                                        <input type="hidden" id="${item['name']}" name="${item['name']}" value="${item['value']}">
-                                    </div>
-                                    % elif item['input_type'] == 'select':
-                                    <div class="form-group">
-                                        <label for="${item['name']}">${item['label']}</label>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                <select class="form-control" id="${item['name']}" name="${item['name']}" autocomplete="off">
-                                                    % for key, value in sorted(item['select_options'].items()):
-                                                    % if key == item['value']:
-                                                    <option value="${key}" selected>${value}</option>
-                                                    % else:
-                                                    <option value="${key}">${value}</option>
-                                                    % endif
-                                                    % endfor
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <p class="help-block">${item['description'] | n}</p>
-                                    </div>
-                                    % elif item['input_type'] == 'selectize':
-                                    <div class="form-group">
-                                        <label for="${item['name']}">${item['label']}</label>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                <select class="form-control" id="${item['name']}" name="${item['name']}" autocomplete="off">
-                                                    % if item['select_all']:
-                                                    <option value="select-all">Select All</option>
-                                                    <option value="remove-all">Remove All</option>
-                                                    % endif
-                                                    % if isinstance(item['select_options'], dict):
-                                                    % for section, options in item['select_options'].items():
-                                                    <optgroup label="${section}">
-                                                        % for option in sorted(options, key=lambda x: x['text'].lower()):
-                                                            <option value="${option['value']}">${option['text']}</option>
-                                                        % endfor
-                                                    </optgroup>
-                                                    % endfor
-                                                    % else:
-                                                    % if item['select_all']:
-                                                    <option value="border-all"></option>
-                                                    % endif
-                                                    % for option in sorted(item['select_options'], key=lambda x: x['text'].lower()):
-                                                        <option value="${option['value']}">${option['text']}</option>
-                                                    % endfor
-                                                    % endif
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <p class="help-block">${item['description'] | n}</p>
-                                    </div>
-                                    % endif
-                                    % endfor
-                                </div>
-                                <div class="col-md-12 modal-config-section">
-                                    <div class="form-group">
-                                        <label for="id_name">Unique ID Name</label>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                <input type="text" class="form-control" id="id_name" name="id_name" value="${newsletter['id_name']}" size="30" autocomplete="off">
-                                            </div>
-                                        </div>
-                                        <p class="help-block">
-                                            Optional: Enter a unique ID name to create a static URL to the <em>last sent scheduled newsletter</em> at <span class="inline-pre">${http_root}newsletter/id/&lt;id_name&gt;</span>.
-                                            Only letters (a-z), numbers (0-9), underscores (_) and hyphens (-) are allowed. Leave blank to disable.<br>
-                                            Note: Test newsletters are not considered scheduled newsletters.
-                                        </p>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="friendly_name">Description</label>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                <input type="text" class="form-control" id="friendly_name" name="friendly_name" value="${newsletter['friendly_name']}" size="30" autocomplete="off">
-                                            </div>
-                                        </div>
-                                        <p class="help-block">Optional: Enter a description to help identify this newsletter in the newsletters list.</p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div role="tabpanel" class="tab-pane" id="tabs-newsletter_saving_sending">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <label>Saving</label>
-                                    <div class="checkbox">
-                                        <label>
-                                            <input type="checkbox" id="newsletter_config_save_only_checkbox" data-id="newsletter_config_save_only" class="checkboxes" value="1" autocomplete="off" ${checked(newsletter['config']['save_only'])}> Save HTML File Only
-                                        </label>
-                                        <p class="help-block">Enable to save the newsletter HTML file without sending it to any notification agent.</p>
-                                        <input type="hidden" id="newsletter_config_save_only" name="newsletter_config_save_only" value="${newsletter['config']['save_only']}">
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="newsletter_config_filename">HTML File Name</label>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                <input type="text" class="form-control" id="newsletter_config_filename" name="newsletter_config_filename" value="${newsletter['config']['filename']}" size="30" autocomplete="off">
-                                            </div>
-                                        </div>
-                                        <p class="help-block">Optional: Enter the file name to use when saving the newsletter (ending with <span class="inline-pre">.html</span>). You may use any of the <a href="#newsletter-text-sub-modal" data-toggle="modal">newsletter text parameters</a>. Leave blank for default.</p>
-                                    </div>
-                                </div>
-                                <div class="col-md-12 modal-config-section" id="newsletter_agent_options">
-                                    <label>Sending</label>
-                                    <div class="checkbox">
-                                        <label>
-                                            <input type="checkbox" id="newsletter_config_formatted_checkbox" data-id="newsletter_config_formatted" class="checkboxes" value="1" autocomplete="off" ${checked(newsletter['config']['formatted'])}> Send Newsletter as an HTML Formatted Email
-                                        </label>
-                                        <p class="help-block">Enable to send the newsletter as an HTML formatted Email. Disable to only send a subject and body message to a different notification agent.</p>
-                                        <input type="hidden" id="newsletter_config_formatted" name="newsletter_config_formatted" value="${newsletter['config']['formatted']}">
-                                    </div>
-                                    <div class="form-group" id="email_notifier_select">
-                                        <div class="checkbox">
-                                            <label>
-                                                <input type="checkbox" id="newsletter_config_threaded_checkbox" data-id="newsletter_config_threaded" class="checkboxes" value="1" autocomplete="off" ${checked(newsletter['config']['threaded'])}> Enable Grouped Email Thread
-                                            </label>
-                                            <p class="help-block">Enable to group this newsletter together in a single Email thread. Disable to send a new Email for each newsletter.</p>
-                                            <input type="hidden" id="newsletter_config_threaded" name="newsletter_config_threaded" value="${newsletter['config']['threaded']}">
-                                        </div>
-                                        <label for="newsletter_email_notifier_id">Email Notification Agent</label>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                <select class="form-control" id="newsletter_email_notifier_id" name="newsletter_email_notifier_id" autocomplete="off">
-                                                    % for notifier in email_notifiers:
-                                                    <% selected = 'selected' if notifier['id'] == newsletter['email_config']['notifier_id'] else '' %>
-                                                    % if notifier['friendly_name']:
-                                                    <option value="${notifier['id']}" ${selected}>${notifier['agent_label']} (${notifier['id']} - ${notifier['friendly_name']})</option>
-                                                    % elif notifier['id']:
-                                                    <option value="${notifier['id']}" ${selected}>${notifier['agent_label']} (${notifier['id']})</option>
-                                                    % else:
-                                                    <option value="${notifier['id']}" ${selected}>${notifier['agent_label']}</option>
-                                                    % endif
-                                                    % endfor
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <p class="help-block">
-                                            Select an existing Email notification agent or enter a new configuration below.<br>
-                                            Note: Make sure HTML support is enabled for the Email notification agent.
-                                        </p>
-                                    </div>
-                                    <div class="form-group" id="other_notifier_select">
-                                        <label for="newsletter_config_notifier_id">Notification Agent</label>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                <select class="form-control" id="newsletter_config_notifier_id" name="newsletter_config_notifier_id" autocomplete="off">
-                                                    % for notifier in other_notifiers:
-                                                    <% selected = 'selected' if notifier['id'] == newsletter['config']['notifier_id'] else '' %>
-                                                    % if notifier['friendly_name']:
-                                                    <option value="${notifier['id']}" ${selected}>${notifier['agent_label']} (${notifier['id']} - ${notifier['friendly_name']})</option>
-                                                    % elif notifier['id']:
-                                                    <option value="${notifier['id']}" ${selected}>${notifier['agent_label']} (${notifier['id']})</option>
-                                                    % else:
-                                                    <option value="${notifier['id']}" ${selected}>${notifier['agent_label']}</option>
-                                                    % endif
-                                                    % endfor
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <p class="help-block">
-                                            Select an existing notification agent where the subject and body text will be sent.<br>
-                                            Note: Self-hosted newsletters must be enabled under <a data-tab-destination="notifications" data-dismiss="modal" data-target="newsletter_self_hosted">Newsletters</a> to include a link to the newsletter.
-                                        </p>
-                                    </div>
-                                    <div id="newsletter-email-config">
-                                        % for item in newsletter['email_config_options']:
-                                        % if item['input_type'] == 'help':
-                                        <div class="form-group">
-                                            <label>${item['label']}</label>
-                                            <p class="help-block">${item['description'] | n}</p>
-                                        </div>
-                                        % elif item['input_type'] == 'text' or item['input_type'] == 'password':
-                                        <div class="form-group">
-                                            <label for="${item['name']}">${item['label']}</label>
-                                            <div class="row">
-                                                <div class="col-md-12">
-                                                    <input type="${item['input_type']}" class="form-control" id="${item['name']}" name="${item['name']}" value="${item['value']}" size="30" autocomplete="off" ${'readonly' if item.get('readonly') else ''}>
-                                                </div>
-                                            </div>
-                                            <p class="help-block">${item['description'] | n}</p>
-                                        </div>
-                                        % elif item['input_type'] == 'number':
-                                        <div class="form-group">
-                                            <label for="${item['name']}">${item['label']}</label>
-                                            <div class="row">
-                                                <div class="col-md-3">
-                                                    <input type="${item['input_type']}" class="form-control" id="${item['name']}" name="${item['name']}" value="${item['value']}" size="30" autocomplete="off">
-                                                </div>
-                                            </div>
-                                            <p class="help-block">${item['description'] | n}</p>
-                                        </div>
-                                        % elif item['input_type'] == 'button':
-                                        <div class="form-group">
-                                            <label for="${item['name']}">${item['label']}</label>
-                                            <div class="row">
-                                                <div class="col-md-12">
-                                                    <input type="button" class="btn btn-bright" id="${item['name']}" name="${item['name']}" value="${item['value']}">
-                                                </div>
-                                            </div>
-                                            <p class="help-block">${item['description'] | n}</p>
-                                        </div>
-                                        % elif item['input_type'] == 'checkbox' and item['name'] != 'newsletter_email_html_support':
-                                        <div class="checkbox">
-                                            <label>
-                                                <input type="checkbox" data-id="${item['name']}" class="checkboxes" value="1" autocomplete="off" ${checked(item['value'])}> ${item['label']}
-                                            </label>
-                                            <p class="help-block">${item['description'] | n}</p>
-                                            <input type="hidden" id="${item['name']}" name="${item['name']}" value="${item['value']}">
-                                        </div>
-                                        % elif item['input_type'] == 'select':
-                                        <div class="form-group">
-                                            <label for="${item['name']}">${item['label']}</label>
-                                            <div class="row">
-                                                <div class="col-md-12">
-                                                    <select class="form-control" id="${item['name']}" name="${item['name']}" autocomplete="off">
-                                                        % for key, value in sorted(item['select_options'].items()):
-                                                        % if isinstance(value, list):
-                                                        <optgroup label="${key}">
-                                                            % for option in sorted(value, key=lambda x: x['text'].lower()):
-                                                                <option value="${option['value']}" ${'selected' if option['value'] == item['value'] else ''}>${option['text']}</option>
-                                                            % endfor
-                                                        </optgroup>
-                                                        % else:
-                                                        <option value="${key}" ${'selected' if key == item['value'] else ''}>${value}</option>
-                                                        % endif
-                                                        % endfor
-                                                    </select>
-                                                </div>
-                                            </div>
-                                            <p class="help-block">${item['description'] | n}</p>
-                                        </div>
-                                        % elif item['input_type'] == 'selectize':
-                                        <div class="form-group">
-                                            <label for="${item['name']}">${item['label']}</label>
-                                            <div class="row">
-                                                <div class="col-md-12">
-                                                    <select class="form-control" id="${item['name']}" name="${item['name']}" autocomplete="off">
-                                                        <option value="select-all">Select All</option>
-                                                        <option value="remove-all">Remove All</option>
-                                                        % if isinstance(item['select_options'], dict):
-                                                        % for section, options in item['select_options'].items():
-                                                        <optgroup label="${section}">
-                                                            % for option in sorted(options, key=lambda x: x['text'].lower()):
-                                                                <option value="${option['value']}">${option['text']}</option>
-                                                            % endfor
-                                                        </optgroup>
-                                                        % endfor
-                                                        % else:
-                                                        <option value="border-all"></option>
-                                                        % for option in sorted(item['select_options'], key=lambda x: x['text'].lower()):
-                                                            <option value="${option['value']}">${option['text']}</option>
-                                                        % endfor
-                                                        % endif
-                                                    </select>
-                                                </div>
-                                            </div>
-                                            <p class="help-block">${item['description'] | n}</p>
-                                        </div>
-                                        % endif
-                                        % endfor
-                                        <input type="hidden" id="newsletter_email_html_support" name="newsletter_email_html_support" value="1">
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div role="tabpanel" class="tab-pane" id="tabs-newsletter_text">
-                            <label>Newsletter Text</label>
-                            <p class="help-block">
-                                Set the custom formatted text for each type of notification.
-                                <a href="#newsletter-text-sub-modal" data-toggle="modal">Click here</a> for a list of available parameters which can be used.
-                            </p>
-                            <p class="help-block">
-                                You can also add text modifiers to change the case or slice parameters with a list of items.
-                                <a href="#notify-text-modifiers-modal" data-toggle="modal">Click here</a> to view usage information.
-                            </p>
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <div class="form-group">
-                                        <label for="subject">Subject</label>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                <input type="text" class="form-control" id="subject" name="subject" value="${newsletter['subject']}" size="30" autocomplete="off">
-                                            </div>
-                                        </div>
-                                        <p class="help-block">
-                                            Enter a custom subject line for the newsletter. Leave blank for default.
-                                        </p>
-                                    </div>
-                                    <div class="form-group" id="newsletter_body">
-                                        <label for="body">Body</label>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                <textarea class="form-control"  id="body" name="body" autocomplete="off" data-autoresize>${newsletter['body']}</textarea>
-                                            </div>
-                                        </div>
-                                        <p class="help-block">
-                                            Enter a custom body line for the newsletter notification. Leave blank for default.
-                                        </p>
-                                    </div>
-                                    <div class="form-group">
-                                        <label for="message">Message</label>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                <textarea class="form-control"  id="message" name="message" autocomplete="off" data-autoresize>${newsletter['message']}</textarea>
-                                            </div>
-                                        </div>
-                                        <p class="help-block">
-                                            Enter a custom message to include on the newsletter.
-                                        </p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div role="tabpanel" class="tab-pane" id="tabs-test_newsletter">
-                            <label>Preview Newsletter</label>
-                            <p class="help-block">
-                                Preview the ${newsletter['agent_label']} newsletter.
-                            </p>
-                            <div class="form-group">
-                                <div class="row">
-                                    <div class="col-md-12">
-                                        <input type="button" class="btn btn-bright" id="preview_newsletter" name="preview_newsletter" value="Preview ${newsletter['agent_label']} Newsletter">
-                                    </div>
-                                </div>
-                            </div>
-                            <label>Test Newsletter</label>
-                            <p class="help-block">
-                                Test if the ${newsletter['agent_label']} newsletter is working. Check the <a href="logs">logs</a> for troubleshooting.
-                            </p>
-                            <p class="help-block">
-                                Warning: This will send an actual newsletter to your notification agent!
-                            </p>
-                            <div class="form-group">
-                                <div class="row">
-                                    <div class="col-md-12">
-                                        <input type="button" class="btn btn-bright" id="test_newsletter" name="test_newsletter" value="Test ${newsletter['agent_label']} Newsletter">
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </form>
-            </div>
-        </div>
-        <div class="modal-footer">
-            <input type="button" id="delete-newsletter-item" class="btn btn-danger btn-edit" style="float:left;" value="Delete">
-            <input type="button" id="duplicate-newsletter-item" class="btn btn-dark btn-edit" style="float:left;" value="Duplicate">
-            <input type="button" id="save-newsletter-item" class="btn btn-bright" value="Save">
-        </div>
-    </div>
-</div>
-
-<script src="${http_root}js/jquery-cron-min.js"></script>
-<script>
-
-    $('#newsletter-config-modal').unbind('hidden.bs.modal');
-
-    var cron_widget = $('#cron-widget').cron({
-        initial: '0 0 * * 0',
-        classes: 'form-control cron-select',
-        onChange: function() {
-            $("#cron_value").val($(this).cron('value'));
-        }
-    });
-
-    if (${newsletter['config']['custom_cron']}) {
-        $('#cron_value').val('${newsletter['cron'] | n}');
-    } else {
-        try {
-            cron_widget.cron('value', '${newsletter['cron']}');
-        } catch (e) {}
-    }
-
-    function toggleCustomCron() {
-       if ($('#custom_cron').val() === '1'){
-           $('#cron-widget').hide();
-           $('#cron_value').show();
-           $('#simple_cron_message').hide();
-           $('#custom_cron_message').show();
-       } else {
-           $('#cron-widget').show();
-           $('#cron_value').hide();
-           $('#simple_cron_message').show();
-           $('#custom_cron_message').hide();
-       }
-    }
-    toggleCustomCron();
-
-    $('#custom_cron').change(function () {
-        toggleCustomCron();
-    });
-
-    function validateFilename() {
-        var filename = $('#newsletter_config_filename').val();
-        if (filename !== '' && !(filename.endsWith('.html'))) {
-            showMsg('<i class="fa fa-times"></i> Failed to save newsletter. Invalid file name.', false, true, 5000, true);
-            return false;
-        } else {
-            return true;
-        }
-    }
-
-    function validateIDName() {
-        var id_name = $('#id_name').val();
-        if (/^[a-zA-Z0-9_-]*$/.test(id_name)) {
-            return true;
-        } else {
-            showMsg('<i class="fa fa-times"></i> Failed to save newsletter. Invalid unique ID name.', false, true, 5000, true);
-            return false;
-        }
-    }
-
-    var $incl_libraries = $('#newsletter_config_incl_libraries').selectize({
-        plugins: ['remove_button'],
-        maxItems: null,
-        render: {
-            option: function(item) {
-                if (item.value.endsWith('-all')) {
-                    return '<div class="' + item.value + '">' + item.text + '</div>'
-                }
-                return '<div>' + item.text + '</div>';
-            }
-        },
-        onItemAdd: function(value) {
-            if (value === 'select-all') {
-                var all_keys = $.map(this.options, function(option){
-                    return option.value.endsWith('-all') ? null : option.value;
-                });
-                this.setValue(all_keys);
-            } else if (value === 'remove-all') {
-                this.clear();
-                this.refreshOptions();
-                this.positionDropdown();
-            }
-        }
-    });
-    var incl_libraries = $incl_libraries[0].selectize;
-    incl_libraries.setValue(${json.dumps(next((c['value'] for c in newsletter['config_options'] if c['name'] == 'newsletter_config_incl_libraries'), [])) | n});
-
-    initConfigCheckbox('#newsletter_config_save_only_checkbox', '#newsletter_agent_options', true);
-
-    function toggleEmailSelect () {
-        if ($('#newsletter_config_formatted_checkbox').is(':checked')) {
-            $('#newsletter_body').hide();
-            $('#email_notifier_select').show();
-            $('#other_notifier_select').hide();
-            toggleNewEmailConfig();
-        } else {
-            $('#newsletter_body').show();
-            $('#email_notifier_select').hide();
-            $('#other_notifier_select').show();
-            $('#newsletter-email-config').hide();
-        }
-    }
-    toggleEmailSelect();
-
-    $('#newsletter_config_formatted_checkbox').change(function () {
-        toggleEmailSelect();
-    });
-
-    function toggleNewEmailConfig () {
-        if ($('#newsletter_config_formatted_checkbox').is(':checked') && $('#newsletter_email_notifier_id').val() === '0') {
-            $('#newsletter-email-config').show();
-        } else {
-            $('#newsletter-email-config').hide();
-        }
-    }
-    toggleNewEmailConfig();
-
-    $('#newsletter_email_notifier_id').change(function () {
-        toggleNewEmailConfig();
-    });
-
-    var REGEX_EMAIL = '([a-z0-9!#$%&\'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+/=?^_`{|}~-]+)*@' +
-                      '(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)';
-    var $email_selectors = $('#newsletter_email_to, #newsletter_email_cc, #newsletter_email_bcc').selectize({
-        plugins: ['remove_button'],
-        maxItems: null,
-        searchField: ['text', 'value'],
-        render: {
-            item: function(item, escape) {
-                return '<div>' +
-                    (item.text ? '<span class="item-text">' + escape(item.text) + '</span>' : '') +
-                    (item.value ? '<span class="item-value">' + escape(item.value) + '</span>' : '') +
-                '</div>';
-            },
-            option: function(item, escape) {
-                var label = item.text || item.value;
-                var caption = item.text ? item.value : null;
-                if (item.value.endsWith('-all')) {
-                    return '<div class="' + item.value + '">' + escape(label) + '</div>'
-                }
-                return '<div>' +
-                    escape(label) +
-                    (caption ? '<span class="caption">' + escape(caption) + '</span>' : '') +
-                '</div>';
-            }
-        },
-        onItemAdd: function(value) {
-            if (value === 'select-all') {
-                var all_keys = $.map(this.options, function(option){
-                    return option.value.endsWith('-all') ? null : option.value;
-                });
-                this.setValue(all_keys);
-            } else if (value === 'remove-all') {
-                this.clear();
-                this.refreshOptions();
-                this.positionDropdown();
-            }
-        },
-        createFilter: function(input) {
-            var match, regex;
-
-            // email@address.com
-            regex = new RegExp('^' + REGEX_EMAIL + '$', 'i');
-            match = input.match(regex);
-            if (match) return !this.options.hasOwnProperty(match[0]);
-
-            // user <email@address.com>
-            regex = new RegExp('^([^<]*)\<' + REGEX_EMAIL + '\>$', 'i');
-            match = input.match(regex);
-            if (match) return !this.options.hasOwnProperty(match[2]);
-
-            return false;
-        },
-        create: function(input) {
-            if ((new RegExp('^' + REGEX_EMAIL + '$', 'i')).test(input)) {
-                return {value: input};
-            }
-            var match = input.match(new RegExp('^([^<]*)\<' + REGEX_EMAIL + '\>$', 'i'));
-            if (match) {
-                return {
-                    value : match[2],
-                    text  : $.trim(match[1])
-                };
-            }
-            return false;
-        }
-    });
-    var email_to = $email_selectors[0].selectize;
-    var email_cc = $email_selectors[1].selectize;
-    var email_bcc = $email_selectors[2].selectize;
-    email_to.setValue(${json.dumps(next((c['value'] for c in newsletter['email_config_options'] if c['name'] == 'newsletter_email_to'), [])) | n});
-    email_cc.setValue(${json.dumps(next((c['value'] for c in newsletter['email_config_options'] if c['name'] == 'newsletter_email_cc'), [])) | n});
-    email_bcc.setValue(${json.dumps(next((c['value'] for c in newsletter['email_config_options'] if c['name'] == 'newsletter_email_bcc'), [])) | n});
-
-    function reloadModal() {
-        $.ajax({
-            url: 'get_newsletter_config_modal',
-            data: { newsletter_id: '${newsletter["id"]}' },
-            cache: false,
-            async: true,
-            complete: function (xhr, status) {
-                $('#newsletter-config-modal').html(xhr.responseText);
-            }
-        });
-    }
-
-    function saveCallback(jqXHR) {
-        if (jqXHR) {
-            var result = $.parseJSON(jqXHR.responseText);
-            var msg = result.message;
-            if (result.result == 'success') {
-                showMsg('<i class="fa fa-check"></i> ' + msg, false, true, 5000)
-            } else {
-                showMsg('<i class="fa fa-times"></i> ' + msg, false, true, 5000, true)
-            }
-        }
-
-        getNewslettersTable();
-        toggleRevealTokens();
-    }
-
-    function deleteCallback() {
-        $('#newsletter-config-modal').modal('hide');
-        getNewslettersTable();
-    }
-
-    function duplicateCallback(result) {
-        // Set new newsletter id
-        $('#newsletter_id').val(result.newsletter_id);
-        // Clear friendly name
-        $('#friendly_name').val("");
-
-        saveNewsletter();
-
-        $('#newsletter-config-modal').on('hidden.bs.modal', function () {
-            loadNewsletterConfig(result.newsletter_id);
-        });
-        $('#newsletter-config-modal').modal('hide');
-    }
-
-    function saveNewsletter() {
-        // Trim all text inputs before saving
-        $('input[type=text]').val(function(_, value) {
-            return $.trim(value);
-        });
-        // Make sure simple cron value is set
-        if ($('#custom_cron').val() === '0'){
-            $("#cron_value").val(cron_widget.cron('value'));
-        }
-        if (validateFilename() && validateIDName()){
-            doAjaxCall('set_newsletter_config', $(this), 'tabs', true, true, saveCallback);
-        }
-    }
-
-    $('#delete-newsletter-item').click(function () {
-        var msg = 'Are you sure you want to delete this <strong>${newsletter["agent_label"]}</strong> newsletter?';
-        var url = 'delete_newsletter';
-        confirmAjaxCall(url, msg, { newsletter_id: '${newsletter["id"]}' }, null, deleteCallback);
-    });
-
-    $('#duplicate-newsletter-item').click(function() {
-        var msg = 'Are you sure you want to duplicate this <strong>${newsletter["agent_label"]}</strong> newsletter?';
-        if ($('#set_newsletter_config .form-control[id$=_password]').val()) {
-            msg += '<br><br>Note: Saved passwords will not be copied over and must be re-entered.';
-        }
-        var url = 'add_newsletter_config';
-        confirmAjaxCall(url, msg, { agent_id: '${newsletter["agent_id"]}' }, null, duplicateCallback);
-    });
-
-    $('#save-newsletter-item').click(function () {
-        saveNewsletter();
-    });
-
-    $('#preview_newsletter').click(function () {
-        doAjaxCall('set_newsletter_config', $(this), 'tabs', true, false, previewNewsletter);
-    });
-
-    $('#test_newsletter').click(function () {
-        doAjaxCall('set_newsletter_config', $(this), 'tabs', true, false, sendTestNewsletter);
-    });
-
-    function previewNewsletter() {
-        showMsg('<i class="fa fa-check"></i>&nbsp; Check pop-up blocker if no response.', false, true, 2000);
-        window.open('newsletter_preview?newsletter_id=' + $('#newsletter_id').val());
-    }
-
-    function sendTestNewsletter() {
-        showMsg('<i class="fa fa-refresh fa-spin"></i>&nbsp; Sending Newsletter', false);
-        $.ajax({
-            url: 'send_newsletter',
-            data: {
-                newsletter_id: $('#newsletter_id').val(),
-                notify_action: 'test'
-            },
-            cache: false,
-            async: true,
-            success: function (data) {
-                if (data.result === 'success') {
-                    showMsg('<i class="fa fa-check"></i> ' + data.message, false, true, 5000);
-                } else {
-                    showMsg('<i class="fa fa-exclamation-circle"></i> ' + data.message, false, true, 5000, true);
-                }
-            }
-        });
-    }
-
-    $("${', '.join(['#' + c['name'] for c in newsletter['config_options'] if c.get('refresh')])}").on('change', function () {
-        // Reload modal to update certain fields
-        doAjaxCall('set_newsletter_config', $(this), 'tabs', true, false, reloadModal);
-        return false;
-    });
-
-    // Never send checkbox values directly, always substitute value in hidden input.
-    $('.checkboxes').click(function () {
-        var configToggle = $(this).data('id');
-        if ($(this).is(':checked')) {
-            $('#'+configToggle).val(1);
-        } else {
-            $('#'+configToggle).val(0);
-        }
-    });
-
-    // auto resizing textarea for custom notification message body
-    $('textarea[data-autoresize]').each(function () {
-        var modal_body = $(this).closest('.modal-body');
-        var offset = this.offsetHeight - this.clientHeight;
-        var resizeTextarea = function (el) {
-            var modal_offset = modal_body.scrollTop();
-            $(el).css('height', 'auto').css('height', el.scrollHeight + offset);
-            modal_body.scrollTop(modal_offset);
-        };
-        $(this).on('focus keyup input', function () { resizeTextarea(this); }).removeAttr('data-autoresize');
-    });
-
-    toggleRevealTokens();
-</script>
-% else:
-<div class="modal-dialog" role="document">
-    <div class="modal-content">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-            <h4 class="modal-title" id="newsletter-config-modal-header">Error</h4>
-        </div>
-        <div class="modal-body" style="text-align: center">
-            <strong>
-                <i class="fa fa-exclamation-circle"></i> Failed to retrieve newsletter configuration. Check the <a href="logs">logs</a> for more info.
-            </strong>
-        </div>
-        <div class="modal-footer">
-        </div>
-    </div>
-</div>
-% endif
diff --git a/data/interfaces/default/newsletter_preview.html b/data/interfaces/default/newsletter_preview.html
deleted file mode 100644
index 41534d3f..00000000
--- a/data/interfaces/default/newsletter_preview.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<%
-    from urllib.parse import urlencode
-%>
-<!doctype html>
-
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>Tautulli - ${title} | ${server_name}</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link rel="icon" type="image/png" sizes="32x32" href="${http_root}images/favicon/favicon-32x32.png?v=2.6.0">
-    <link rel="icon" type="image/png" sizes="16x16" href="${http_root}images/favicon/favicon-16x16.png?v=2.6.0">
-    <link rel="shortcut icon" href="${http_root}images/favicon/favicon.ico?v=2.6.0">
-    <link href="${http_root}css/tautulli.css${cache_param}" rel="stylesheet">
-    <style>
-        * {
-            padding: 0 !important;
-            margin: 0 !important;
-        }
-    </style>
-</head>
-
-<body>
-<div id="loader" class="newsletter-loader-container">
-    <div class="newsletter-loader-message">
-        <div class="newsletter-loader"></div>
-        <br>
-        Generating Newsletter
-        <br>
-        Please wait, this may take a few minutes...
-    </div>
-</div>
-
-<script src="${http_root}js/jquery-3.6.0.min.js"></script>
-<script>
-$(document).ready(function () {
-    var frame = $('<iframe></iframe>', {
-        src: 'real_newsletter?${urlencode(kwargs) | n}',
-        frameborder: '0',
-        style: 'display: none; height: 100vh; width: 100vw;'
-    });
-    frame.on('load', function (e) {
-        $(e.target).fadeIn();
-        $('#loader').fadeOut();
-    });
-    $('body').append(frame);
-});
-</script>
-
-</body>
-</html>
diff --git a/data/interfaces/default/newsletters_table.html b/data/interfaces/default/newsletters_table.html
deleted file mode 100644
index b2c4cb04..00000000
--- a/data/interfaces/default/newsletters_table.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<%doc>
-USAGE DOCUMENTATION :: PLEASE LEAVE THIS AT THE TOP OF THIS FILE
-
-For Mako templating syntax documentation please visit: http://docs.makotemplates.org/en/latest/
-
-Filename:           newsletters_table.html
-Version:            0.1
-
-DOCUMENTATION :: END
-</%doc>
-
-<% from plexpy import newsletter_handler %>
-<ul class="stacked-configs list-unstyled">
-    % for newsletter in sorted(newsletters_list, key=lambda k: (k['agent_label'], k['friendly_name'], k['id'])):
-    <li class="newsletter-agent pointer" data-id="${newsletter['id']}">
-        <span>
-            <span class="toggle-left trigger-tooltip ${'active' if newsletter['active'] else ''}" data-toggle="tooltip" data-placement="top" title="Newsletter ${'active' if newsletter['active'] else 'inactive'}"><i class="fa fa-lg fa-fw fa-newspaper-o"></i></span>
-            % if newsletter['friendly_name']:
-            ${newsletter['agent_label']} &nbsp;<span class="friendly_name">(${newsletter['id']} - ${newsletter['friendly_name']})</span>
-            % else:
-            ${newsletter['agent_label']} &nbsp;<span class="friendly_name">(${newsletter['id']})</span>
-            % endif
-            <span class="toggle-right friendly_name">
-                % if newsletter_handler.NEWSLETTER_SCHED.get_job('newsletter-{}'.format(newsletter['id'])):
-                <% job = newsletter_handler.NEWSLETTER_SCHED.get_job('newsletter-{}'.format(newsletter['id'])) %>
-                <span id="newsletter-next_run-${newsletter['id']}">
-                    <script>
-                        $("#newsletter-next_run-${newsletter['id']}").text(
-                            "Next: " + moment("${job.next_run_time}", "YYYY-MM-DD HH:mm:ssZ").fromNow() + " | ")
-                    </script>
-                </span>
-                % endif
-                % if newsletter['last_triggered']:
-                <% icon, icon_tooltip = ('fa-check', 'Success') if newsletter['last_success'] else ('fa-times', 'Failed') %>
-                <span id="newsletter-last_triggered-${newsletter['id']}">
-                    <script>
-                        $("#newsletter-last_triggered-${newsletter['id']}").html(
-                            "Last: " + moment("${newsletter['last_triggered']}", "X").fromNow() + ' <i class="fa fa-lg fa-fw ${icon}" data-toggle="tooltip" data-placement="top" title="${icon_tooltip}"></i>'
-                        )
-                    </script>
-                </span>
-                % else:
-                Last: never
-                <i class="fa fa-lg fa-fw fa-minus"></i>
-                % endif
-            </span>
-        </span>
-    </li>
-    % endfor
-    <li class="add-newsletter-agent pointer" id="add-newsletter-agent" data-target="#add-newsletter-modal" data-toggle="modal">
-        <span>
-            <span class="toggle-left"><i class="fa fa-lg fa-fw fa-newspaper-o"></i></span> Add a new newsletter agent
-            <span class="toggle-right"><i class="fa fa-lg fa-fw fa-plus"></i></span>
-        </span>
-    </li>
-</ul>
-
-<script>
-    // Load newsletter config modal
-    $(".newsletter-agent").click(function () {
-        var newsletter_id = $(this).data('id');
-        loadNewsletterConfig(newsletter_id);
-    });
-
-    $('.trigger-tooltip').tooltip();
-</script>
\ No newline at end of file
diff --git a/data/interfaces/default/notification_config.html b/data/interfaces/default/notification_config.html
new file mode 100644
index 00000000..41fcfa93
--- /dev/null
+++ b/data/interfaces/default/notification_config.html
@@ -0,0 +1,133 @@
+<%!
+from plexpy import helpers
+%>
+% if data:
+<div class="modal-dialog" role="document">
+    <div class="modal-content">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
+            <h4 class="modal-title" id="notification-config-modal-header">Set Config</h4>
+        </div>
+        <div class="modal-body">
+            <div class="container-fluid">
+                <div class="row">
+                    <form action="set_notification_config" method="post" class="form" id="set_notification_config" data-parsley-validate>
+                    <div class="col-md-12">
+                    % for item in data:
+                        % if item['input_type'] == 'text' or item['input_type'] == 'number' or item['input_type'] == 'password':
+                        <div class="form-group">
+                            <label for="${item['name']}">${item['label']}</label>
+                            <div class="row">
+                                <div class="col-md-8">
+                                    <input type="${item['input_type']}" class="form-control" id="${item['name']}" name="${item['name']}" value="${item['value']}" size="30">
+                                    % if item['name'] == 'osx_notify_app':
+                                    <a href="javascript:void(0)" id="osxnotifyregister">Register</a>
+                                    % endif
+                                </div>
+                            </div>
+                            <p class="help-block">${item['description']}</p>
+                        </div>
+                        % elif item['input_type'] == 'button':
+                        <div class="form-group">
+                            <div class="row">
+                                <div class="col-md-8">
+                                    <input type="${item['input_type']}" class="btn btn-bright" id="${item['name']}" name="${item['name']}" value="${item['value']}">
+                                </div>
+                            </div>
+                            <p class="help-block">${item['description']}</p>
+                        </div>
+                        % elif item['input_type'] == 'checkbox':
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" data-id="${item['name']}" class="checkboxes" value="1" ${helpers.checked(item['value'])}> ${item['label']}
+                            </label>
+                            <p class="help-block">${item['description']}</p>
+                            <input type="hidden" id="${item['name']}" name="${item['name']}" value="${item['value']}">
+                        </div>
+                        % elif item['input_type'] == 'select':
+                        <div class="form-group">
+                            <label for="${item['name']}">${item['label']}</label>
+                            <div class="row">
+                                <div class="col-md-5">
+                                    <select class="form-control" id="${item['name']}" name="${item['name']}" >
+                                        % for key, value in sorted(item['select_options'].iteritems()):
+                                        % if key == item['value']:
+                                        <option value="${key}" selected>${value}</option>
+                                        % else:
+                                        <option value="${key}">${value}</option>
+                                        % endif
+                                        % endfor
+                                    </select>
+                                </div>
+                            </div>
+                            <p class="help-block">${item['description']}</p>
+                        </div>
+                        % endif
+                    % endfor
+                    </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+        <div class="modal-footer">
+            <%
+                nosave = any(d['input_type'] == 'nosave' for d in data)
+            %>
+            % if not nosave:
+                <input type="button" id="save-notification-item" class="btn btn-bright" value="Save">
+            % else:
+                <input type="button" class="btn btn-bright" data-dismiss="modal" value="Close">
+            % endif
+        </div>
+    </div>
+</div>
+% endif
+
+<script>
+    $('#osxnotifyregister').click(function () {
+        var osx_notify_app = $("#osx_notify_app").val();
+        $.get("/osxnotifyregister", { 'app': osx_notify_app }, function (data) { $('#ajaxMsg').html("<i class='fa fa-check'></i> " + data); });
+        $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut();
+    })
+
+    $('#save-notification-item').click(function() {
+        doAjaxCall('set_notification_config', $(this), 'tabs', true);
+        // Reload modal to update certain fields
+        $.ajax({
+            url: 'get_notification_agent_config',
+            data: { config_id: '${config_id}' },
+            cache: false,
+            async: true,
+            complete: function (xhr, status) {
+                $("#notification-config-modal").html(xhr.responseText);
+            }
+        });
+        return false;
+    });
+
+    $('#twitterStep1').click(function () {
+        $.get("/twitterStep1", function (data) {window.open(data); })
+        .done(function () { $('#ajaxMsg').html("<i class='fa fa-check'></i> Confirm Authorization. Check pop-up blocker if no response."); });
+        $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut();
+    });
+    $('#twitterStep2').click(function () {
+        var twitter_key = $("#twitter_key").val();
+        $.get("/twitterStep2", { 'key': twitter_key }, function (data) { $('#ajaxMsg').html("<i class='fa fa-check'></i> " + data); });
+        $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut();
+    });
+    $('#testTwitter').click(function () {
+        $.get("/testTwitter",
+            function (data) { $('#ajaxMsg').html("<i class='fa fa-check'></i> " + data); });
+        $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut();
+    });
+
+    // Never send checkbox values directly, always substitute value in hidden input.
+    $('.checkboxes').click(function() {
+        var configToggle = $(this).data('id');
+        if ($(this).is(":checked")) {
+            $("#"+configToggle).val(1);
+        } else {
+            $("#"+configToggle).val(0);
+        }
+    });
+</script>
diff --git a/data/interfaces/default/notification_triggers_modal.html b/data/interfaces/default/notification_triggers_modal.html
new file mode 100644
index 00000000..666f008d
--- /dev/null
+++ b/data/interfaces/default/notification_triggers_modal.html
@@ -0,0 +1,98 @@
+<%!
+from plexpy import helpers
+%>
+% if data:
+<div class="modal-dialog" role="document">
+    <div class="modal-content">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
+            <h4 class="modal-title" id="notification-triggers-modal-header">${data['name']} Notification Triggers</h4>
+        </div>
+        <div class="modal-body">
+            <div class="container-fluid">
+                <div class="row">
+                    <div class="col-md-12">
+                        <p class="help-block">
+                            Watched notifications are only applicable for video items.
+                        </p>
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" data-size="small" data-id="${data['id']}" data-config-name="${data['config_prefix']}_on_play" ${helpers.checked(data['on_play'])} class="toggle-switches">
+                                Notify on playback start
+                            </label>
+                            <p class="help-block">Trigger notification when a new media item is started.</p>
+                        </div>
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" data-size="small" data-id="${data['id']}" data-config-name="${data['config_prefix']}_on_stop" ${helpers.checked(data['on_stop'])} class="toggle-switches">
+                                Notify on playback stop
+                            </label>
+                            <p class="help-block">Trigger notification when a media item is stopped.</p>
+                        </div>
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" data-size="small" data-id="${data['id']}" data-config-name="${data['config_prefix']}_on_pause" ${helpers.checked(data['on_pause'])} class="toggle-switches">
+                                Notify on playback pause
+                            </label>
+                            <p class="help-block">Trigger notification when a media item is paused.</p>
+                        </div>
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" data-size="small" data-id="${data['id']}" data-config-name="${data['config_prefix']}_on_resume" ${helpers.checked(data['on_resume'])} class="toggle-switches">
+                                Notify on playback resume
+                            </label>
+                            <p class="help-block">Trigger notification when a media item is resumed from a paused state.</p>
+                        </div>
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" data-size="small" data-id="${data['id']}" data-config-name="${data['config_prefix']}_on_watched" ${helpers.checked(data['on_watched'])} class="toggle-switches">
+                                Notify on watched
+                            </label>
+                            <p class="help-block">Trigger notification when a video item reaches the defined watch percentage.</p>
+                        </div>
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" data-size="small" data-id="${data['id']}" data-config-name="${data['config_prefix']}_on_buffer" ${helpers.checked(data['on_buffer'])} class="toggle-switches">
+                                Notify on buffer warning
+                            </label>
+                            <p class="help-block">Trigger notification when a media item triggers the defined buffer threshold.</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="modal-footer">
+            <input type="button" class="btn btn-bright" data-dismiss="modal" value="Close">
+        </div>
+    </div>
+</div>
+<script>
+    $('.toggle-switches').click(function() {
+        var configToggle = $(this).data('id');
+        var toggle = $(this);
+        if ($(this).is(":checked")) {
+            var data = {};
+            data[$(this).data('config-name')] = 1;
+            $.ajax({
+                url: 'set_notification_config',
+                data: data,
+                async: true,
+                success: function(data) {
+                    console.log('success');
+                }
+            });
+        } else {
+            var data = {};
+            data[$(this).data('config-name')] = 0;
+            $.ajax({
+                url: 'set_notification_config',
+                data: data,
+                async: true,
+                success: function(data) {
+                    console.log('success');
+                }
+            });
+        }
+    });
+</script>
+% endif
diff --git a/data/interfaces/default/notifier_config.html b/data/interfaces/default/notifier_config.html
deleted file mode 100644
index febace9a..00000000
--- a/data/interfaces/default/notifier_config.html
+++ /dev/null
@@ -1,954 +0,0 @@
-% if notifier:
-<%
-    import json
-    from plexpy import notifiers, users
-    from plexpy.helpers import checked
-    available_notification_actions = notifiers.available_notification_actions(agent_id=notifier['agent_id'])
-
-    user_emails = [{'user': u['friendly_name'] or u['username'], 'email': u['email']} for u in users.Users().get_users() if u['email']]
-    sorted(user_emails, key=lambda u: u['user'])
-%>
-<div class="modal-dialog" role="document">
-    <div class="modal-content">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-            <h4 class="modal-title" id="notifier-config-modal-header">${notifier['agent_label']} Settings &nbsp;<small><span class="notifier_id">(Notifier ID: ${notifier['id']}${' - ' + notifier['friendly_name'] if notifier['friendly_name'] else ''})</span></small></h4>
-        </div>
-        <div class="modal-body">
-            <div class="container-fluid">
-                <div class="row">
-                    <ul class="nav nav-tabs list-unstyled" role="tablist">
-                        <li role="presentation" class="active"><a href="#tabs-notifier_config" aria-controls="tabs-notifier_config" role="tab" data-toggle="tab">Configuration</a></li>
-                        <li role="presentation"><a href="#tabs-notify_triggers" aria-controls="tabs-notify_triggers" role="tab" data-toggle="tab">Triggers</a></li>
-                        <li role="presentation"><a href="#tabs-notify_conditions" aria-controls="tabs-notify_conditions" role="tab" data-toggle="tab">Conditions</a></li>
-                        % if notifier['agent_name'] == 'scripts':
-                        <li role="presentation"><a href="#tabs-notify_text" aria-controls="tabs-notify_text" role="tab" data-toggle="tab">Arguments</a></li>
-                        % elif notifier['agent_name'] == 'webhook':
-                        <li role="presentation"><a href="#tabs-notify_text" aria-controls="tabs-notify_text" role="tab" data-toggle="tab">Data</a></li>
-                        % elif notifier['agent_name'] != 'plexmobileapp':
-                        <li role="presentation"><a href="#tabs-notify_text" aria-controls="tabs-notify_text" role="tab" data-toggle="tab">Text</a></li>
-                        % endif
-                        <li role="presentation"><a href="#tabs-test_notifications" aria-controls="tabs-test_notifications" role="tab" data-toggle="tab">Test Notifications</a></li>
-                    </ul>
-                </div>
-                <form action="set_notifier_config" method="post" class="form" id="set_notifier_config" data-parsley-validate>
-                    <div class="tab-content">
-                        <div role="tabpanel" class="tab-pane active" id="tabs-notifier_config">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <input type="hidden" id="notifier_id" name="notifier_id" value="${notifier['id']}" />
-                                    <input type="hidden" id="agent_id" name="agent_id" value="${notifier['agent_id']}" />
-                                    % for item in notifier['config_options']:
-                                    % if item['input_type'] == 'help':
-                                    <div class="form-group">
-                                        <label>${item['label']}</label>
-                                        <p class="help-block">${item['description'] | n}</p>
-                                    </div>
-                                    % elif item['input_type'] == 'text' or item['input_type'] == 'password':
-                                    <div class="form-group">
-                                        <label for="${item['name']}">${item['label']}</label>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                % if notifier['agent_name'] == 'scripts' and item['name'] == 'scripts_script_folder':
-                                                <div class="input-group">
-                                                    <input type="${item['input_type']}" class="form-control" id="${item['name']}" name="${item['name']}" value="${item['value']}" size="30" autocomplete="off" ${'readonly' if item.get('readonly') else ''}>
-                                                    <span class="input-group-btn">
-                                                        <button class="btn btn-form" type="button" id="${item['name']}_browse" data-toggle="browse" data-filter=".folderonly" data-target="#${item['name']}">Browse</button>
-                                                    </span>
-                                                </div>
-                                                % else:
-                                                <input type="${item['input_type']}" class="form-control" id="${item['name']}" name="${item['name']}" value="${item['value']}" size="30" autocomplete="off" ${'readonly' if item.get('readonly') else ''}>
-                                                % endif
-                                            </div>
-                                        </div>
-                                        <p class="help-block">${item['description'] | n}</p>
-                                    </div>
-                                    % elif item['input_type'] == 'token':
-                                    <div class="form-group">
-                                        <label for="${item['name']}">${item['label']}</label>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                <div class="input-group">
-                                                    <span class="input-group-btn">
-                                                        <button class="btn btn-form reveal-token" type="button"><i class="fa fa-eye-slash"></i></button>
-                                                    </span>
-                                                    <input type="password" class="form-control" id="${item['name']}" name="${item['name']}" value="${item['value']}" size="30" autocomplete="off" ${'readonly' if item.get('readonly') else ''}>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <p class="help-block">${item['description'] | n}</p>
-                                    </div>
-                                    % elif item['input_type'] == 'number':
-                                    <div class="form-group">
-                                        <label for="${item['name']}">${item['label']}</label>
-                                        <div class="row">
-                                            <div class="col-md-3">
-                                                <input type="${item['input_type']}" class="form-control" id="${item['name']}" name="${item['name']}" value="${item['value']}" size="30" autocomplete="off">
-                                            </div>
-                                        </div>
-                                        <p class="help-block">${item['description'] | n}</p>
-                                    </div>
-                                    % elif item['input_type'] == 'button':
-                                    <div class="form-group">
-                                        <label for="${item['name']}">${item['label']}</label>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                <input type="button" class="btn btn-bright" id="${item['name']}" name="${item['name']}" value="${item['value']}">
-                                            </div>
-                                        </div>
-                                        <p class="help-block">${item['description'] | n}</p>
-                                    </div>
-                                    % elif item['input_type'] == 'checkbox':
-                                    <div class="checkbox">
-                                        <label>
-                                            <input type="checkbox" data-id="${item['name']}" class="checkboxes" value="1" autocomplete="off" ${checked(item['value'])}> ${item['label']}
-                                        </label>
-                                        <p class="help-block">${item['description'] | n}</p>
-                                        <input type="hidden" id="${item['name']}" name="${item['name']}" value="${item['value']}">
-                                    </div>
-                                    % elif item['input_type'] == 'select':
-                                    <div class="form-group">
-                                        <label for="${item['name']}">${item['label']}</label>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                <select class="form-control" id="${item['name']}" name="${item['name']}" autocomplete="off">
-                                                    % for key, value in sorted(item['select_options'].items()):
-                                                    % if isinstance(value, list):
-                                                    <optgroup label="${key}">
-                                                        % for option in sorted(value, key=lambda x: x['text'].lower()):
-                                                            <option value="${option['value']}" ${'selected' if option['value'] == item['value'] else ''}>${option['text']}</option>
-                                                        % endfor
-                                                    </optgroup>
-                                                    % else:
-                                                    <option value="${key}" ${'selected' if key == item['value'] else ''}>${value}</option>
-                                                    % endif
-                                                    % endfor
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <p class="help-block">${item['description'] | n}</p>
-                                    </div>
-                                    % elif item['input_type'] == 'selectize':
-                                    <div class="form-group">
-                                        <label for="${item['name']}">${item['label']}</label>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                <select class="form-control" id="${item['name']}" name="${item['name']}" autocomplete="off">
-                                                    % if item['select_all']:
-                                                    <option value="select-all">Select All</option>
-                                                    <option value="remove-all">Remove All</option>
-                                                    % endif
-                                                    % if isinstance(item['select_options'], dict):
-                                                    % for section, options in item['select_options'].items():
-                                                    <optgroup label="${section}">
-                                                        % for option in sorted(options, key=lambda x: x['text'].lower()):
-                                                            <option value="${option['value']}">${option['text']}</option>
-                                                        % endfor
-                                                    </optgroup>
-                                                    % endfor
-                                                    % else:
-                                                    % if item['select_all']:
-                                                    <option value="border-all"></option>
-                                                    % endif
-                                                    % for option in sorted(item['select_options'], key=lambda x: x['text'].lower()):
-                                                        <option value="${option['value']}">${option['text']}</option>
-                                                    % endfor
-                                                    % endif
-                                                </select>
-                                            </div>
-                                        </div>
-                                        <p class="help-block">${item['description'] | n}</p>
-                                    </div>
-                                    % endif
-                                    % endfor
-                                </div>
-                                <div class="col-md-12 modal-config-section">
-                                    <div class="form-group">
-                                        <label for="friendly_name">Description</label>
-                                        <div class="row">
-                                            <div class="col-md-12">
-                                                <input type="text" class="form-control" id="friendly_name" name="friendly_name" value="${notifier['friendly_name']}" size="30" autocomplete="off">
-                                            </div>
-                                        </div>
-                                        <p class="help-block">Optional: Enter a description to help identify this agent in the notification agents list.</p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div role="tabpanel" class="tab-pane" id="tabs-notify_triggers">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <label>Notification Triggers</label>
-                                    <p class="help-block">
-                                        Select items that will trigger a notification for this ${notifier['agent_label']} notification agent.
-                                    </p>
-                                    % for action in available_notification_actions:
-                                    <div class="checkbox">
-                                        <label>
-                                            <input type="checkbox" data-id="${action['name']}" class="checkboxes" value="1" autocomplete="off" ${checked(notifier['actions'][action['name']])}> ${action['label']}
-                                        </label>
-                                        <p class="help-block">${action['description'] | n}</p>
-                                        <input type="hidden" id="${action['name']}" name="${action['name']}" value="${notifier['actions'][action['name']]}">
-                                    </div>
-                                    % endfor
-                                </div>
-                            </div>
-                        </div>
-                        <div role="tabpanel" class="tab-pane" id="tabs-notify_conditions">
-                            <label>Notification Conditions</label>
-                            <p class="help-block">
-                                Add custom conditions to only <em>allow certain notifications</em>. By default, all notifications will be sent if there are no conditions.
-                                <a href="#notify-text-sub-modal" data-toggle="modal">Click here</a> for a description of all the parameters.
-                            </p>
-                            <p class="help-block">
-                                A tilde (<span class="inline-pre">~</span>) can be entered as a value to indicate an empty string.
-                            </p>
-                            <div id="condition-widget"></div>
-                            <input type="hidden" id="custom_conditions" name="custom_conditions" />
-
-                            <div class="form-group">
-                                <label for="custom_conditions_logic">Condition Logic</label>
-                                <input type="text" class="form-control" name="custom_conditions_logic" id="custom_conditions_logic" value="${notifier['custom_conditions_logic']}" autocomplete="off" />
-                                <div id="custom_conditions_logic_error" class="alert alert-danger" role="alert" style="padding-top: 5px; padding-bottom: 5px; margin: 0; display: none;"><i class="fa fa-exclamation-triangle" style="color: #a94442;"></i> <span></span></div>
-                                <p class="help-block">
-                                    Optional: Enter custom logic to use when evaluating the conditions (e.g. <span class="inline-pre">{1} and ({2} or {3})</span>).
-                                    Leave blank for implicit <span class="inline-pre">and</span> between all conditions.
-                                </p>
-                                <p class="help-block">
-                                    Note: Only the keywords <span class="inline-pre">and</span>/<span class="inline-pre">or</span> and brackets <span class="inline-pre">()</span> are supported.
-                                    For order of operations, <span class="inline-pre">and</span> is evaluated before <span class="inline-pre">or</span>.
-                                </p>
-                            </div>
-                        </div>
-                        <div role="tabpanel" class="tab-pane" id="tabs-notify_text">
-                            <label>Notification Text</label>
-                            <p class="help-block">
-                                % if notifier['agent_name'] == 'scripts':
-                                Set the custom arguments passed to the script for each type of notification.
-                                % elif notifier['agent_name'] == 'webhook':
-                                Set the custom JSON data sent to the webhook for each type of notification.
-                                % else:
-                                Set the custom formatted text for each type of notification.
-                                % endif
-                                <a href="#notify-text-sub-modal" data-toggle="modal">Click here</a> for a list of available parameters which can be used.
-                            </p>
-                            <p class="help-block">
-                                You can also add text modifiers to change the case or slice parameters with a list of items.
-                                <a href="#notify-text-modifiers-modal" data-toggle="modal">Click here</a> to view usage information.
-                            </p>
-                            <p class="help-block">
-                                You can also add tags to exclude certain text depending on the media type.
-                                <a href="#notify-text-tags-modal" data-toggle="modal">Click here</a> to view usage information.
-                            </p>
-                            <br />
-                            <ul id="accordion-notify_text" class="accordion list-unstyled">
-                                % if notifier['agent_name'] == 'scripts':
-                                % for action in available_notification_actions:
-                                <li>
-                                    <div class="link">
-                                        <span class="toggle-left"><i class="fa ${action['icon']} fa-fw"></i></span>
-                                        ${action['label']}
-                                        <span class="toggle-right"><i class="fa fa-chevron-down"></i></span>
-                                    </div>
-                                    <ul class="submenu">
-                                        <li>
-                                            <div class="form-group">
-                                                <label for="${action['name']}_subject">Script Arguments</label>
-                                                <input class="form-control" type="text" id="${action['name']}_subject" name="${action['name']}_subject" value="${notifier['notify_text'][action['name']]['subject']}" autocomplete="off" data-parsley-trigger="change" required>
-                                                <p class="help-block">Set custom arguments passed to the script.</p>
-                                            </div>
-                                            <div class="form-group">
-                                                <div class="row">
-                                                    <div class="col-md-12">
-                                                        <input type="button" class="btn btn-bright notifier-text-preview" data-action="${action['name']}" value="Preview Arguments">
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </li>
-                                    </ul>
-                                </li>
-                                % endfor
-                                % elif notifier['agent_name'] == 'webhook':
-                                % for action in available_notification_actions:
-                                <li>
-                                    <div class="link">
-                                        <span class="toggle-left"><i class="fa ${action['icon']} fa-fw"></i></span>
-                                        ${action['label']}
-                                        <span class="toggle-right"><i class="fa fa-chevron-down"></i></span>
-                                    </div>
-                                    <ul class="submenu">
-                                        <li>
-                                            <div class="form-group">
-                                                <label for="${action['name']}_subject">JSON Headers</label>
-                                                <textarea class="form-control" id="${action['name']}_subject" name="${action['name']}_subject" data-parsley-trigger="change" autocomplete="off" data-autoresize required>${notifier['notify_text'][action['name']]['subject']}</textarea>
-                                                <p class="help-block">Set custom JSON headers.</p>
-                                            </div>
-                                            <div class="form-group">
-                                                <label for="${action['name']}_body">JSON Data</label>
-                                                <textarea class="form-control" id="${action['name']}_body" name="${action['name']}_body" data-parsley-trigger="change" autocomplete="off" data-autoresize required>${notifier['notify_text'][action['name']]['body']}</textarea>
-                                                <p class="help-block">Set custom JSON data.</p>
-                                            </div>
-                                            <div class="form-group">
-                                                <div class="row">
-                                                    <div class="col-md-12">
-                                                        <input type="button" class="btn btn-bright notifier-text-preview" data-action="${action['name']}" value="Preview JSON Data">
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </li>
-                                    </ul>
-                                </li>
-                                % endfor
-                                % else:
-                                % for action in available_notification_actions:
-                                <li>
-                                    <div class="link">
-                                        <span class="toggle-left"><i class="fa ${action['icon']} fa-fw"></i></span>
-                                        ${action['label']}
-                                        <span class="toggle-right"><i class="fa fa-chevron-down"></i></span>
-                                    </div>
-                                    <ul class="submenu">
-                                        <li>
-                                            <div class="form-group">
-                                                <label for="${action['name']}_subject">Subject Line</label>
-                                                <input class="form-control" type="text" id="${action['name']}_subject" name="${action['name']}_subject" value="${notifier['notify_text'][action['name']]['subject']}" autocomplete="off" data-parsley-trigger="change" required>
-                                                <p class="help-block">Set a custom subject line.</p>
-                                            </div>
-                                            <div class="form-group">
-                                                <label for="${action['name']}_body">Message Body</label>
-                                                <textarea class="form-control" id="${action['name']}_body" name="${action['name']}_body" data-parsley-trigger="change" autocomplete="off" data-autoresize required>${notifier['notify_text'][action['name']]['body']}</textarea>
-                                                <p class="help-block">Set a custom body.</p>
-                                            </div>
-                                            <div class="form-group">
-                                                <div class="row">
-                                                    <div class="col-md-12">
-                                                        <input type="button" class="btn btn-bright notifier-text-preview" data-action="${action['name']}" value="Preview Text">
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </li>
-                                    </ul>
-                                </li>
-                                % endfor
-                                % endif
-                            </ul>
-                        </div>
-                        <div role="tabpanel" class="tab-pane" id="tabs-test_notifications">
-                            <label>Test Notifications</label>
-                            <p class="help-block">
-                                Test if ${notifier['agent_label']} notifications are working. Check the <a href="logs">logs</a> for troubleshooting.
-                            </p>
-                            <p class="help-block">
-                                Note: Test with the real values since parameters will not be substituted. 
-                                (i.e. Use <span class="inline-pre">"Game of Thrones"</span> not <span class="inline-pre">{title}</span>)
-                            </p>
-                            % if notifier['agent_name'] == 'scripts':
-                            <div class="form-group">
-                                <label for="test_script">Script</label>
-                                <div class="row">
-                                    <div class="col-md-12">
-                                        <select class="form-control" id="test_script" name="test_script" autocomplete="off">
-                                            % for key, value in sorted(notifier['config_options'][2]['select_options'].items()):
-                                            <option value="${key}">${value}</option>
-                                            % endfor
-                                        </select>
-                                    </div>
-                                </div>
-                                <p class="help-block">Choose the script to test.</p>
-                            </div>
-                            <div class="form-group">
-                                <label for="test_script_args">Script Arguments</label>
-                                <div class="row">
-                                    <div class="col-md-12">
-                                        <input class="form-control" type="text" id="test_script_args" name="test_script_args" value="" autocomplete="off">
-                                    </div>
-                                </div>
-                                <p class="help-block">Set custom arguments passed to the script.</p>
-                            </div>
-                            % elif notifier['agent_name'] == 'webhook':
-                            <div class="form-group">
-                                <label for="test_subject">JSON Headers</label>
-                                <div class="row">
-                                    <div class="col-md-12">
-                                        <textarea class="form-control" id="test_subject" name="test_subject" autocomplete="off" data-autoresize></textarea>
-                                    </div>
-                                </div>
-                                <p class="help-block">Set custom JSON headers sent to the webhook.</p>
-                            </div>
-                            <div class="form-group">
-                                <label for="test_body">JSON Data</label>
-                                <div class="row">
-                                    <div class="col-md-12">
-                                        <textarea class="form-control" id="test_body" name="test_body" autocomplete="off" data-autoresize></textarea>
-                                    </div>
-                                </div>
-                                <p class="help-block">Set custom JSON data sent to the webhook.</p>
-                            </div>
-                            % else:
-                            <div class="form-group">
-                                <label for="test_subject">Subject Line</label>
-                                <div class="row">
-                                    <div class="col-md-12">
-                                        <input class="form-control" type="text" id="test_subject" name="test_subject" value="Tautulli" autocomplete="off">
-                                    </div>
-                                </div>
-                                <p class="help-block">Set a custom subject line.</p>
-                            </div>
-                            <div class="form-group">
-                                <label for="test_body">Message Body</label>
-                                <div class="row">
-                                    <div class="col-md-12">
-                                        <textarea class="form-control" id="test_body" name="test_body" autocomplete="off" data-autoresize>Test Notification</textarea>
-                                    </div>
-                                </div>
-                                <p class="help-block">Set a custom body.</p>
-                            </div>
-                            % endif
-                            <div class="form-group">
-                                <div class="row">
-                                    <div class="col-md-12">
-                                        <input type="button" class="btn btn-bright" id="test_notifier" name="test_notifier" value="Test ${notifier['agent_label']}">
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </form>
-            </div>
-        </div>
-        <div class="modal-footer">
-            <input type="button" id="delete-notifier-item" class="btn btn-danger btn-edit" style="float:left;" value="Delete">
-            <input type="button" id="duplicate-notifier-item" class="btn btn-dark btn-edit" style="float:left;" value="Duplicate">
-            <input type="button" id="save-notifier-item" class="btn btn-bright" value="Save">
-        </div>
-    </div>
-</div>
-
-<script src="${http_root}js/filterer.jquery.js"></script>
-<script>
-
-    $('#notifier-config-modal').unbind('hidden.bs.modal');
-
-    // Need this for setting conditions since conditions contain the character "
-    $('#custom_conditions').val(JSON.stringify(${json.dumps(notifier["custom_conditions"]) | n}));
-
-    $('#condition-widget').filterer({
-        parameters: ${json.dumps(parameters) | n},
-        conditions: ${json.dumps(notifier["custom_conditions"]) | n},
-        updateConditions: function(newConditions){
-            $('#custom_conditions').val(JSON.stringify(newConditions));
-        }
-    });
-
-    function reloadModal() {
-        $.ajax({
-            url: 'get_notifier_config_modal',
-            data: { notifier_id: '${notifier["id"]}' },
-            cache: false,
-            async: true,
-            complete: function (xhr, status) {
-                $('#notifier-config-modal').html(xhr.responseText);
-            }
-        });
-    }
-
-    function saveCallback(jqXHR) {
-        if (jqXHR) {
-            var result = $.parseJSON(jqXHR.responseText);
-            var msg = result.message;
-            if (result.result === 'success') {
-                showMsg('<i class="fa fa-check"></i> ' + msg, false, true, 5000)
-            } else {
-                showMsg('<i class="fa fa-times"></i> ' + msg, false, true, 5000, true)
-            }
-        }
-
-        getNotifiersTable();
-        toggleRevealTokens();
-    }
-
-    function deleteCallback() {
-        $('#notifier-config-modal').modal('hide');
-        getNotifiersTable();
-    }
-
-    function duplicateCallback(result) {
-        // Set new notifier id
-        $('#notifier_id').val(result.notifier_id);
-        // Clear friendly name
-        $('#friendly_name').val("");
-        // Uncheck all triggers
-        $('#tabs-notify_triggers input[id^=on_]').val(0);
-
-        saveNotifier();
-
-        $('#notifier-config-modal').on('hidden.bs.modal', function () {
-            loadNotifierConfig(result.notifier_id);
-        });
-        $('#notifier-config-modal').modal('hide');
-    }
-
-    function saveNotifier() {
-        // Trim all text inputs before saving
-        $('input[type=text]').val(function(_, value) {
-            return $.trim(value);
-        });
-        if (validateLogic()) {
-            // Reload modal to update certain fields
-            doAjaxCall('set_notifier_config', $(this), 'tabs', true, true, saveCallback);
-        }
-    }
-
-    $('#delete-notifier-item').click(function () {
-        var msg = 'Are you sure you want to delete this <strong>${notifier["agent_label"]}</strong> notification agent?';
-        var url = 'delete_notifier';
-        confirmAjaxCall(url, msg, { notifier_id: '${notifier["id"]}' }, null, deleteCallback);
-    });
-
-    $('#duplicate-notifier-item').click(function() {
-        var msg = 'Are you sure you want to duplicate this <strong>${notifier["agent_label"]}</strong> notification agent?';
-        if ($('#set_notifier_config .form-control[id$=_password]').val()) {
-            msg += '<br><br>Note: Saved passwords will not be copied over and must be re-entered.';
-        }
-        var url = 'add_notifier_config';
-        confirmAjaxCall(url, msg, { agent_id: '${notifier["agent_id"]}' }, null, duplicateCallback);
-    });
-
-    $('#save-notifier-item').click(function () {
-        saveNotifier();
-    });
-
-    % if notifier['agent_name'] == 'facebook':
-    if (location.protocol !== 'https:') {
-        $('#tabs-config .form-group:first').prepend(
-            '<div class="form-group">' +
-            '<label>Warning</label>' +
-            '<p class="help-block" style="color: #eb8600;">Facebook requires HTTPS for authorization. ' +
-            'Please enable HTTPS for Tautulli under <a data-tab-destination="web_interface" data-dismiss="modal" data-target="enable_https">Web Interface</a>.</p>' +
-            '</div>'
-        );
-        $('#facebook_redirect_uri').val('HTTPS not enabled');
-
-    } else {
-        $('#facebook_redirect_uri').val(location.href.split('/settings')[0] + '/facebook_redirect');
-    }
-
-    function disableFacebookRequest() {
-        if ($('#facebook_app_id').val() !== '' && $('#facebook_app_secret').val() !== '') { $('#facebook_facebook_auth').prop('disabled', false); }
-        else { $('#facebook_facebook_auth').prop('disabled', true); }
-    }
-    disableFacebookRequest();
-    $('#facebook_app_id, #facebook_app_secret').on('change', function () {
-        disableFacebookRequest();
-    });
-
-    $('#facebook_facebook_auth').click(function () {
-        // Remove trailing '/' from Facebook redirect URI
-        if ($('#facebook_redirect_uri') && $('#facebook_redirect_uri').val().endsWith('/')) {
-            $('#facebook_redirect_uri').val($('#facebook_redirect_uri').val().slice(0, -1));
-        }
-
-        var facebook_token;
-        $.ajax({
-            url: 'facebook_auth',
-            data: {
-                app_id: $('#facebook_app_id').val(),
-                app_secret: $('#facebook_app_secret').val(),
-                redirect_uri: $('#facebook_redirect_uri').val()
-            },
-            cache: false,
-            async: true,
-            complete: function (xhr, status) {
-                var result = $.parseJSON(xhr.responseText);
-                var msg = result.msg;
-                if (result.result === 'success') {
-                    showMsg('<i class="fa fa-check"></i> ' + msg, false, true, 5000);
-                    window.open(result.url);
-
-                    (function retrieve_token(){
-                        facebook_token = null;
-                        setTimeout(function() {
-                            $.ajax({
-                                url: 'facebook_retrieve_token',
-                                type: 'GET',
-                                success: function(data) {
-                                    if (data.result === 'success') {
-                                        facebook_token = true;
-                                        showMsg('<i class="fa fa-check"></i> ' + msg, false, true, 5000);
-                                        $('#facebook_access_token').val(data.access_token);
-                                    } else if (data.result === 'error') {
-                                        facebook_token = false;
-                                        showMsg('<i class="fa fa-times"></i> ' + msg, false, true, 5000, true);
-                                    }
-                                },
-                                complete: function() {
-                                    if (facebook_token === null) {
-                                        retrieve_token();
-                                    }
-                                },
-                                timeout: 1000
-                            });
-                        }, 1000);
-                    })();
-
-                } else {
-                    showMsg('<i class="fa fa-times"></i> ' + msg, false, true, 5000, true);
-                }
-            }
-        });
-    });
-
-    $('#notifier-config-modal').on('hidden.bs.modal', function () {
-        facebook_token = false;
-    });
-
-    % elif notifier['agent_name'] == 'browser':
-    $('#browser_allow_browser').click(function () {
-        PNotify.desktop.permission();
-    });
-
-    % elif notifier['agent_name'] == 'osx':
-    $('#osx_notify_register').click(function () {
-        var osx_notify_app = $('#osx_notify_app').val();
-        $.get('osxnotifyregister', { 'app': osx_notify_app }, function (data) { showMsg('<i class="fa fa-check"></i> ' + data, false, true, 3000); });
-    });
-
-    % elif notifier['agent_name'] == 'email':
-    var REGEX_EMAIL = '([a-z0-9!#$%&\'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+/=?^_`{|}~-]+)*@' +
-                      '(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)';
-    var $email_selectors = $('#email_to, #email_cc, #email_bcc').selectize({
-        plugins: ['remove_button'],
-        maxItems: null,
-        searchField: ['text', 'value'],
-        render: {
-            item: function(item, escape) {
-                return '<div>' +
-                    (item.text ? '<span class="item-text">' + escape(item.text) + '</span>' : '') +
-                    (item.value ? '<span class="item-value">' + escape(item.value) + '</span>' : '') +
-                '</div>';
-            },
-            option: function(item, escape) {
-                var label = item.text || item.value;
-                var caption = item.text ? item.value : null;
-                if (item.value.endsWith('-all')) {
-                    return '<div class="' + item.value + '">' + escape(label) + '</div>'
-                }
-                return '<div>' +
-                    escape(label) +
-                    (caption ? '<span class="caption">' + escape(caption) + '</span>' : '') +
-                '</div>';
-            }
-        },
-        onItemAdd: function(value) {
-            if (value === 'select-all') {
-                var all_keys = $.map(this.options, function(option){
-                    return option.value.endsWith('-all') ? null : option.value;
-                });
-                this.setValue(all_keys);
-            } else if (value === 'remove-all') {
-                this.clear();
-                this.refreshOptions();
-                this.positionDropdown();
-            }
-        },
-        createFilter: function(input) {
-            var match, regex;
-
-            // email@address.com
-            regex = new RegExp('^' + REGEX_EMAIL + '$', 'i');
-            match = input.match(regex);
-            if (match) return !this.options.hasOwnProperty(match[0]);
-
-            // user <email@address.com>
-            regex = new RegExp('^([^<]*)\<' + REGEX_EMAIL + '\>$', 'i');
-            match = input.match(regex);
-            if (match) return !this.options.hasOwnProperty(match[2]);
-
-            return false;
-        },
-        create: function(input) {
-            if ((new RegExp('^' + REGEX_EMAIL + '$', 'i')).test(input)) {
-                return {value: input};
-            }
-            var match = input.match(new RegExp('^([^<]*)\<' + REGEX_EMAIL + '\>$', 'i'));
-            if (match) {
-                return {
-                    value : match[2],
-                    text  : $.trim(match[1])
-                };
-            }
-            return false;
-        }
-    });
-    var email_to = $email_selectors[0].selectize;
-    var email_cc = $email_selectors[1].selectize;
-    var email_bcc = $email_selectors[2].selectize;
-    email_to.setValue(${json.dumps(next((c['value'] for c in notifier['config_options'] if c['name'] == 'email_to'), [])) | n});
-    email_cc.setValue(${json.dumps(next((c['value'] for c in notifier['config_options'] if c['name'] == 'email_cc'), [])) | n});
-    email_bcc.setValue(${json.dumps(next((c['value'] for c in notifier['config_options'] if c['name'] == 'email_bcc'), [])) | n});
-
-    % elif notifier['agent_name'] == 'join':
-    var $join_device_names = $('#join_device_names').selectize({
-        plugins: ['remove_button'],
-        maxItems: null,
-        create: true
-    });
-    var join_device_names = $join_device_names[0].selectize;
-    join_device_names.setValue(${json.dumps(next((c['value'] for c in notifier['config_options'] if c['name'] == 'join_device_names'), [])) | n});
-
-    % elif notifier['agent_name'] == 'zapier':
-    $('#zapier_test_hook').click(function () {
-        $.get('zapier_test_hook', { 'zapier_hook': $('#zapier_hook').val() }, function (data) {
-            if (data.result === 'success') {
-                showMsg('<i class="fa fa-check"></i> ' + data.msg, false, true, 5000);
-            } else {
-                showMsg('<i class="fa fa-times"></i> ' + data.msg, false, true, 5000, true);
-            }
-        });
-    });
-
-    % elif notifier['agent_name'] == 'pushover':
-    function pushoverPriority() {
-         if ($('#pushover_priority').val() == '2') {
-             $('#pushover_retry').closest('.form-group').show();
-             $('#pushover_expire').closest('.form-group').show();
-         } else {
-             $('#pushover_retry').closest('.form-group').hide();
-             $('#pushover_expire').closest('.form-group').hide();
-         }
-    }
-
-    pushoverPriority();
-    $('#pushover_priority').change( function () {
-        pushoverPriority();
-    });
-    
-    var $pushover_sound = $('#pushover_sound').selectize({
-        create: true
-    });
-    var pushover_sound = $pushover_sound[0].selectize;
-    pushover_sound.setValue(${json.dumps(next((c['value'] for c in notifier['config_options'] if c['name'] == 'pushover_sound'), [])) | n});
-
-    % elif notifier['agent_name'] == 'plexmobileapp':
-    var $plexmobileapp_user_ids = $('#plexmobileapp_user_ids').selectize({
-        plugins: ['remove_button'],
-        maxItems: null,
-        create: true
-    });
-    var plexmobileapp_user_ids = $plexmobileapp_user_ids[0].selectize;
-    plexmobileapp_user_ids.setValue(${json.dumps(next((c['value'] for c in notifier['config_options'] if c['name'] == 'plexmobileapp_user_ids'), [])) | n});
-
-    % endif
-
-    function validateLogic() {
-        const valid_tokens = /(\(|\)|and|or)/g;
-        const conditions_pattern = /{\d+}/g;
-
-        var custom_conditions = $.parseJSON($('#custom_conditions').val());
-        var custom_conditions_logic = $('#custom_conditions_logic').val();
-        var num_cond = custom_conditions.length;
-
-        var tokens = $.map(custom_conditions_logic.toLowerCase().split(valid_tokens), $.trim).filter(String);
-
-        var stack = [[]];
-        var temp;
-
-        var cond_next = true;
-        var bool_next = false;
-        var open_bracket_next = true;
-        var close_bracket_next = false;
-        var nest_and = 0;
-        var nest_nest_and = 0;
-
-        try {
-            $.each(tokens, function(i, x) {
-                if (open_bracket_next && x === '(') {
-                    stack[stack.length-1].push([]);
-                    temp = stack[stack.length-1];
-                    stack.push(temp[temp.length-1]);
-                    cond_next = true;
-                    bool_next = false;
-                    open_bracket_next = true;
-                    close_bracket_next = false;
-                    if (nest_and) {
-                        nest_nest_and += 1
-                    }
-                } else if (close_bracket_next && x === ')') {
-                    stack.pop();
-                    if (stack.length === 0) {
-                        throw 'opening bracket is missing';
-                    }
-                    cond_next = false;
-                    bool_next = true;
-                    open_bracket_next = false;
-                    close_bracket_next = true;
-                    if (nest_and > 0 && nest_nest_and > 0 && nest_and === nest_nest_and) {
-                        stack.pop();
-                        nest_and -= 1;
-                        nest_nest_and -= 1;
-                    }
-                } else if (cond_next && x.match(conditions_pattern)) {
-                    if (isNaN(x.slice(1, -1))) {
-                        throw 'invalid condition logic'
-                    } else {
-                        var num = parseInt(x.slice(1, -1));
-                    }
-                    if (!(0 < num && num <= num_cond)) {
-                        throw 'invalid condition number in condition logic'
-                    }
-                    stack[stack.length-1].push(num);
-                    cond_next = false;
-                    bool_next = true;
-                    open_bracket_next = false;
-                    close_bracket_next = true;
-                    if (nest_and > nest_nest_and) {
-                        stack.pop();
-                        nest_and -= 1;
-                    }
-                } else if (bool_next && x === 'and' && i < tokens.length-1) {
-                    stack[stack.length-1].push([]);
-                    temp = stack[stack.length-1];
-                    stack.push(temp[temp.length-1]);
-                    temp = stack[stack.length-2];
-                    stack[stack.length-1].push(temp.splice(0, temp.length-2) + temp.splice(temp.length-2, temp.length-1));
-                    stack[stack.length-1].push(x);
-                    cond_next = true;
-                    bool_next = false;
-                    open_bracket_next = true;
-                    close_bracket_next = false;
-                    nest_and += 1;
-                } else if (bool_next && x === 'or' && i < tokens.length-1) {
-                    stack[stack.length-1].push(x);
-                    cond_next = true;
-                    bool_next = false;
-                    open_bracket_next = true;
-                    close_bracket_next = false;
-                } else {
-                    throw 'invalid condition logic';
-                }
-            });
-
-            if (stack.length > 1) {
-                throw 'closing bracket is missing';
-            }
-
-            $('#custom_conditions_logic_error').hide();
-            return true;
-        } catch (e) {
-            $('#custom_conditions_logic_error span').text(e);
-            $('#custom_conditions_logic_error').show();
-            showMsg('<i class="fa fa-times"></i> Failed to save notifier. Invalid condition logic.', false, true, 5000, true);
-        }
-    }
-
-    $('.notifier-text-preview').click(function () {
-        var action = $(this).data('action');
-        var subject = $('#' + action + '_subject').val();
-        var body = $('#' + action + '_body').val();
-
-        $.ajax({
-            url: 'get_notify_text_preview',
-            type: 'POST',
-            data: {
-                notify_action: action,
-                subject: subject,
-                body: body,
-                agent_id: "${notifier['agent_id']}",
-                agent_name: "${notifier['agent_name']}"
-            },
-            cache: false,
-            async: true,
-            complete: function (xhr, status) {
-                $("#notifier-text-preview-modal").html(xhr.responseText).modal('show');
-            }
-        });
-    });
-
-    $('#test_notifier').click(function () {
-        doAjaxCall('set_notifier_config', $(this), 'tabs', true, false, sendTestNotification);
-    });
-
-    function sendTestNotification() {
-        showMsg('<i class="fa fa-refresh fa-spin"></i>&nbsp; Sending Notification', false);
-        if ('${notifier["agent_name"]}' !== 'browser') {
-            $.ajax({
-                url: 'send_notification',
-                data: {
-                    notifier_id: $('#notifier_id').val(),
-                    subject: $('#test_subject').val(),
-                    body: $('#test_body').val(),
-                    script: $('#test_script').val(),
-                    script_args: $('#test_script_args').val(),
-                    notify_action: 'test'
-                },
-                cache: false,
-                async: true,
-                success: function (data) {
-                    if (data.result === 'success') {
-                        showMsg('<i class="fa fa-check"></i> ' + data.message, false, true, 5000);
-                    } else {
-                        showMsg('<i class="fa fa-exclamation-circle"></i> ' + data.message, false, true, 5000, true);
-                    }
-                }
-            });
-        } else {
-            if ($('#browser_auto_hide_delay').val() === "0") {
-                PNotify.prototype.options.hide = false;
-            } else {
-                PNotify.prototype.options.hide = true;
-                PNotify.prototype.options.delay = $('#browser_auto_hide_delay').val() * 1000;
-            }
-            displayPNotify($('#test_subject').val(), $('#test_body').val());
-            showMsg('<i class="fa fa-check"></i> Notification sent.', false, true, 5000);
-        }
-    }
-
-    $("${', '.join(['#' + c['name'] for c in notifier['config_options'] if c.get('refresh')])}").on('change', function () {
-        // Reload modal to update certain fields
-        doAjaxCall('set_notifier_config', $(this), 'tabs', true, false, reloadModal);
-        return false;
-    });
-
-    // Never send checkbox values directly, always substitute value in hidden input.
-    $('.checkboxes').click(function () {
-        var configToggle = $(this).data('id');
-        if ($(this).is(':checked')) {
-            $('#'+configToggle).val(1);
-        } else {
-            $('#'+configToggle).val(0);
-        }
-    });
-
-    var accordion_session = new Accordion($('#accordion-notify_text'), false);
-
-    // auto resizing textarea for custom notification message body
-    $('textarea[data-autoresize]').each(function () {
-        var modal_body = $(this).closest('.modal-body');
-        var offset = this.offsetHeight - this.clientHeight;
-        var resizeTextarea = function (el) {
-            var modal_offset = modal_body.scrollTop();
-            $(el).css('height', 'auto').css('height', el.scrollHeight + offset);
-            modal_body.scrollTop(modal_offset);
-        };
-        $(this).on('focus keyup input', function () { resizeTextarea(this); }).removeAttr('data-autoresize');
-    });
-
-    toggleRevealTokens();
-</script>
-% else:
-<div class="modal-dialog" role="document">
-    <div class="modal-content">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-            <h4 class="modal-title" id="notifier-config-modal-header">Error</h4>
-        </div>
-        <div class="modal-body" style="text-align: center">
-            <strong>
-                <i class="fa fa-exclamation-circle"></i> Failed to retrieve notifier configuration. Check the <a href="logs">logs</a> for more info.
-            </strong>
-        </div>
-        <div class="modal-footer">
-        </div>
-    </div>
-</div>
-% endif
diff --git a/data/interfaces/default/notifier_text_preview.html b/data/interfaces/default/notifier_text_preview.html
deleted file mode 100644
index f933ec2c..00000000
--- a/data/interfaces/default/notifier_text_preview.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<div class="modal-dialog" role="document">
-    <div class="modal-content">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-            <h4 class="modal-title">Notification Text Preview</h4>
-        </div>
-        <div class="modal-body">
-            % if text:
-            % for item in text:
-            <div style="padding-bottom: 10px;">
-                <h4>
-                    ${item['media_type'].capitalize()}
-                    % if item['media_type'] != 'server':
-                    <span class="inline-pre">&lt;${item['media_type']}&gt;&lt;/${item['media_type']}&gt;</span> tags
-                    % endif
-                </h4>
-                % if agent != 'webhook':
-                <pre>${item['subject']}</pre>
-                % endif
-                % if agent != 'scripts':
-                <pre>${item['body']}</pre>
-                % endif
-            </div>
-            % endfor
-            % else:
-            <div style="text-align: center;"><i class="fa fa-exclamation-circle"></i> Failed to generate preview.</div>
-            % endif
-        </div>
-        <div class="modal-footer">
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/data/interfaces/default/notifiers_table.html b/data/interfaces/default/notifiers_table.html
deleted file mode 100644
index 1017f7f4..00000000
--- a/data/interfaces/default/notifiers_table.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<%doc>
-USAGE DOCUMENTATION :: PLEASE LEAVE THIS AT THE TOP OF THIS FILE
-
-For Mako templating syntax documentation please visit: http://docs.makotemplates.org/en/latest/
-
-Filename:           notifiers_table.html
-Version:            0.1
-
-DOCUMENTATION :: END
-</%doc>
-
-<ul class="stacked-configs list-unstyled">
-    % for notifier in sorted(notifiers_list, key=lambda k: (k['agent_label'].lower(), k['friendly_name'], k['id'])):
-    <li class="notification-agent pointer" data-id="${notifier['id']}">
-        <span>
-            <span class="toggle-left trigger-tooltip ${'active' if notifier['active'] else ''}" data-toggle="tooltip" data-placement="top" title="Triggers ${'active' if notifier['active'] else 'inactive'}"><i class="fa fa-lg fa-fw fa-bell"></i></span>
-            % if notifier['friendly_name']:
-            ${notifier['agent_label']} &nbsp;<span class="friendly_name">(${notifier['id']} - ${notifier['friendly_name']})</span>
-            % else:
-            ${notifier['agent_label']} &nbsp;<span class="friendly_name">(${notifier['id']})</span>
-            % endif
-            <span class="toggle-right friendly_name">
-                % if notifier['last_triggered']:
-                <% icon, icon_tooltip = ('fa-check', 'Success') if notifier['last_success'] else ('fa-times', 'Failed') %>
-                <span id="notifier-last_triggered-${notifier['id']}">
-                    <script>
-                        $("#notifier-last_triggered-${notifier['id']}").html(
-                            moment("${notifier['last_triggered']}", "X").fromNow() + ' <i class="fa fa-lg fa-fw ${icon}" data-toggle="tooltip" data-placement="top" title="${icon_tooltip}"></i>'
-                        )
-                    </script>
-                </span>
-            % else:
-            never
-            <i class="fa fa-lg fa-fw fa-minus"></i>
-            % endif
-        </span>
-    </li>
-    % endfor
-    <li class="add-notification-agent pointer" id="add-notification-agent" data-target="#add-notifier-modal" data-toggle="modal">
-        <span>
-            <span class="toggle-left"><i class="fa fa-lg fa-fw fa-bell"></i></span> Add a new notification agent
-            <span class="toggle-right"><i class="fa fa-lg fa-fw fa-plus"></i></span>
-        </span>
-    </li>
-</ul>
-
-<script>
-    // Load notification agent config modal
-    $(".notification-agent").click(function () {
-        var notifier_id = $(this).data('id');
-        loadNotifierConfig(notifier_id);
-    });
-
-    $('.trigger-tooltip').tooltip();
-</script>
\ No newline at end of file
diff --git a/data/interfaces/default/plexwatch_import.html b/data/interfaces/default/plexwatch_import.html
new file mode 100644
index 00000000..1330b2b5
--- /dev/null
+++ b/data/interfaces/default/plexwatch_import.html
@@ -0,0 +1,67 @@
+<div class="modal-dialog" role="document">
+    <div class="modal-content">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
+            <h4 class="modal-title">Import PlexWatch Database</h4>
+        </div>
+        <div class="modal-body" id="modal-text">
+            <p class="help-block">
+                Please ensure your PlexWatch database is at version 0.3.2 or higher.
+            </p>
+            <div class="form-group">
+                <label for="db_location">Database Location</label>
+                <div class="row">
+                    <div class="col-xs-8">
+                        <input type="text" class="form-control" id="db_location" name="db_location" value="" required>
+                    </div>
+                </div>
+                <p class="help-block">Enter the path and file name for the PlexWatch database you wish to import.</p>
+            </div>
+            <div class="form-group">
+                <label for="table_name">Table Name</label>
+                <div class="row">
+                    <div class="col-xs-4">
+                        <select id="table_name" class="form-control" name="table_name">
+                            <option value="processed">processed</option>
+                            <option value="processed">grouped</option>
+                        </select>
+                    </div>
+                </div>
+                <p class="help-block">The table name from which you wish to import. Only import one of these, importing both will result in duplicated data.</p>
+            </div>
+            <div class="form-group">
+                <label for="import_ignore_interval">Ignore Interval</label>
+                <div class="row">
+                    <div class="col-xs-2">
+                        <input type="text" class="form-control" id="import_ignore_interval" name="import_ignore_interval" value="120" required>
+                    </div>
+                </div>
+                <p class="help-block">Enter the minimum duration (in seconds) an item must have been active for. Set to 0 to import all.</p>
+            </div>
+        </div>
+        <div class="modal-footer">
+            <div>
+                <span id="status-message"></span>
+                <input type="button" id="import_db" class="btn btn-bright" value="Import">
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    // Send database path to import script
+    $("#import_db").click(function() {
+        var database_path = $("#db_location").val();
+        var table_name = $("#table_name").val();
+        var import_ignore_interval = $("#import_ignore_interval").val();
+        $.ajax({
+            url: 'get_plexwatch_export_data',
+            data: {database_path: database_path, table_name:table_name, import_ignore_interval:import_ignore_interval},
+            cache: false,
+            async: true,
+            success: function(data) {
+                $("#status-message").html(data);
+                $("#db_location").val('')
+            }
+        });
+    });
+</script>
\ No newline at end of file
diff --git a/data/interfaces/default/queue_modal.html b/data/interfaces/default/queue_modal.html
deleted file mode 100644
index 91bead00..00000000
--- a/data/interfaces/default/queue_modal.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<%
-    import datetime
-    import plexpy
-    from plexpy import activity_handler, helpers
-
-    if queue == 'active sessions':
-        filter_key = 'session_key-'
-        title_format = '{2} / {1} ({0})'
-        title_key = title_format.format('Session Key', 'Title', 'User')
-        description = 'Queue to flush stuck active sessions to the database.'
-    else:
-        filter_key = 'rating_key-'
-        title_format = '{1} ({0})'
-        title_key = title_format.format('Rating Key', 'Title')
-        description  = 'Queue to flush recently added items to the database and send notifications if enabled.'
-
-    scheduled_jobs = [j.id for j in activity_handler.ACTIVITY_SCHED.get_jobs() if j.id.startswith(filter_key)]
-%>
-<div class="modal-dialog" role="document">
-    <div class="modal-content">
-        <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-            <h4 class="modal-title">${queue.title()} Queue</h4>
-        </div>
-        <div class="modal-body">
-            <p class="help-block">
-                ${description}
-            </p>
-            <table class="activity-queue">
-                <thead>
-                    <tr>
-                        <th>
-                            ${title_key}
-                        </th>
-                        <th>
-                            Next Flush In
-                        </th>
-                        <th>
-                            Next Flush Time
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                    % if scheduled_jobs:
-                    % for job in scheduled_jobs:
-                    <%
-                        sched_job = activity_handler.ACTIVITY_SCHED.get_job(job)
-                        now = datetime.datetime.now(sched_job.next_run_time.tzinfo)
-                    %>
-                    <tr>
-                        <td><strong>${title_format.format(*sched_job.args)}</strong></td>
-                        <td>${helpers.format_timedelta_Hms(sched_job.next_run_time - now)}</td>
-                        <td>${sched_job.next_run_time.astimezone(plexpy.SYS_TIMEZONE).strftime('%Y-%m-%d %H:%M:%S')}</td>
-                    </tr>
-                    % endfor
-                    % else:
-                    <tr>
-                        <td colspan="3" style="text-align: center;"><i class="fa fa-check"></i>&nbsp; Nothing in the ${queue} queue</td>
-                    </tr>
-                    % endif
-                </tbody>
-            </table>
-        </div>
-        <div class="modal-footer">
-        </div>
-    </div>
-</div>
diff --git a/data/interfaces/default/recently_added.html b/data/interfaces/default/recently_added.html
index 74d5e561..4f11db4b 100644
--- a/data/interfaces/default/recently_added.html
+++ b/data/interfaces/default/recently_added.html
@@ -10,183 +10,73 @@ Variable names:     data [array]
 data[array_index] :: Usable parameters
 
 == Global keys ==
-media_type              Returns the type of media. Either 'movie' or 'episode' or 'album'.
 rating_key              Returns the unique identifier for the media item.
-parent_rating_key       Returns the unique identifier for the season or artist.
-grandparent_rating_key  Returns the unique identifier for the show.
-title                   Returns the name of the movie, episode, album.
-parent_title            Returns the name of the artist.
-grandparent_title       Returns the name of the show.
-media_index             Returns the index number of the episode.
-parent_media_index      Returns the index number of the season.
-section_id              Returns the library section number of the media item.
-library_name            Returns the library section name of the media item.
-year                    Returns the release year of the movie, episode, or album.
+type                    Returns the type of media. Either 'movie' or 'season'.
 thumb                   Returns the location of the item's thumbnail. Use with pms_image_proxy.
-parent_thumb            Returns the location of the artist's thumbnail. Use with pms_image_proxy.
-grandparent_thumb       Returns the location of the show's thumbnail. Use with pms_image_proxy.
 added_at                Returns the time when the media was added to the library.
+title                   Returns the name of the movie or season.
+parent_title            Returns the name of the TV Show a season belongs too.
+
+== Only if 'type' is 'movie' ==
+year                    Returns the movie release year.
 
 DOCUMENTATION :: END
 </%doc>
 
 % if data != None:
-<%
-    from plexpy.helpers import cast_to_int, page, short_season
-%>
-% if data:
 <div class="dashboard-recent-media-row">
-    <div id="recently-added-row-scroller">
-        <ul class="dashboard-recent-media list-unstyled">
-            % for item in data:
-            <div class="dashboard-recent-media-instance">
-                <li data-type="${item['media_type']}">
-                    % if item['media_type'] == 'movie':
-                    <a href="${page('info', item['rating_key'])}" title="${item['title']}">
-                        <div class="dashboard-recent-media-poster">
-                            <div class="dashboard-recent-media-poster-face" style="background-image: url(${page('pms_image_proxy', item['thumb'], item['rating_key'], 300, 450, fallback='poster')});">
-                                <div class="dashboard-recent-media-overlay">
-                                    <div class="dashboard-recent-media-overlay-text" id="added_at-${item['rating_key']}">
-                                        <script>
-                                            $('#added_at-${item['rating_key']}').text('Added ' + moment(${item['added_at']}, "X").fromNow())
-                                        </script>
-                                    </div>
+    <ul class="dashboard-recent-media list-unstyled">
+        % for item in data:
+        <div class="dashboard-recent-media-instance">
+            <li>
+                % if item['type'] == 'season' or item['type'] == 'movie':
+				<a href="info?item_id=${item['rating_key']}">
+					<div class="dashboard-recent-media-poster">
+						<div class="dashboard-recent-media-poster-face" style="background-image: url(pms_image_proxy?img=${item['thumb']}&width=300&height=450&fallback=poster);">
+                            <div class="dashboard-recent-media-overlay">
+                                <div class="dashboard-recent-media-overlay-text" id="added_at-${item['rating_key']}">
+                                    <script>
+                                        $('#added_at-${item['rating_key']}').text('Added ' + moment(${item['added_at']}, "X").fromNow())
+                                    </script>
                                 </div>
                             </div>
-                            % if _session['user_group'] == 'admin':
-                            <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                            % endif
                         </div>
-                    </a>
-                    <div class="dashboard-recent-media-metacontainer">
-                        <h3>
-                            <a href="${page('info', item['rating_key'])}" title="${item['title']}">${item['title']}</a>
-                        </h3>
-                        <h3 class="text-muted">${item['year']}</h3>
-                        <h3 class="text-muted">&nbsp;</h3>
                     </div>
-                    % elif item['media_type'] == 'show':
-                    <a href="${page('info', item['rating_key'])}" title="${item['title']}">
-                        <div class="dashboard-recent-media-poster">
-                            <div class="dashboard-recent-media-poster-face" style="background-image: url(${page('pms_image_proxy', item['thumb'], item['rating_key'], 300, 450, fallback='poster')});">
-                                <div class="dashboard-recent-media-overlay">
-                                    <div class="dashboard-recent-media-overlay-text" id="added_at-${item['rating_key']}">
-                                        <script>
-                                            $('#added_at-${item['rating_key']}').text('Added ' + moment(${item['added_at']}, "X").fromNow())
-                                        </script>
-                                    </div>
+					<div class="dashboard-recent-media-metacontainer">
+						% if item['type'] == 'season':
+						<h3 title="${item['parent_title']}">${item['parent_title']}</h3>
+						<h3 class="text-muted">${item['title']}</h3>
+						% elif item['type'] == 'movie':
+						<h3 title="${item['title']}">${item['title']}</h3>
+						<h3 class="text-muted">${item['year']}</h3>
+						% endif
+					</div>
+				</a>
+				% elif item['type'] == 'album':
+                <a href="info?item_id=${item['rating_key']}">
+                    <div class="dashboard-recent-media-cover">
+                        <div class="dashboard-recent-media-cover-face" style="background-image: url(pms_image_proxy?img=${item['thumb']}&width=300&height=300&fallback=cover);">
+                            <div class="dashboard-recent-media-overlay">
+                                <div class="dashboard-recent-media-overlay-text" id="added_at-${item['rating_key']}">
+                                    <script>
+                                        $('#added_at-${item['rating_key']}').text('Added ' + moment(${item['added_at']}, "X").fromNow())
+                                    </script>
                                 </div>
                             </div>
-                            % if _session['user_group'] == 'admin':
-                            <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                            % endif
                         </div>
-                    </a>
-                    <div class="dashboard-recent-media-metacontainer">
-                        <h3>
-                            <a href="${page('info', item['rating_key'])}" title="${item['title']}">${item['title']}</a>
-                        </h3>
-                        <h3 class="text-muted">
-                            ${item['child_count']} Season${'s' if cast_to_int(item['child_count']) > 1 else ''}
-                        </h3>
-                        <h3 class="text-muted">&nbsp;</h3>
                     </div>
-                    % elif item['media_type'] == 'season':
-                    <a href="${page('info', item['rating_key'])}" title="${item['parent_title']}">
-                        <div class="dashboard-recent-media-poster">
-                            % if item['thumb']:
-                            <div class="dashboard-recent-media-poster-face" style="background-image: url(${page('pms_image_proxy', item['thumb'], item['rating_key'], 300, 450, fallback='poster')});">
-                            % else:
-                            <div class="dashboard-recent-media-poster-face" style="background-image: url(${page('pms_image_proxy', item['parent_thumb'], item['parent_rating_key'], 300, 450, fallback='poster')});">
-                            % endif
-                                <div class="dashboard-recent-media-overlay">
-                                    <div class="dashboard-recent-media-overlay-text" id="added_at-${item['rating_key']}">
-                                        <script>
-                                            $('#added_at-${item['rating_key']}').text('Added ' + moment(${item['added_at']}, "X").fromNow())
-                                        </script>
-                                    </div>
-                                </div>
-                            </div>
-                            % if _session['user_group'] == 'admin':
-                            <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                            % endif
-                        </div>
-                    </a>
                     <div class="dashboard-recent-media-metacontainer">
-                        <h3>
-                            <a href="${page('info', item['parent_rating_key'])}" title="${item['parent_title']}">${item['parent_title']}</a>
-                        </h3>
-                        <h3 class="text-muted">
-                            <a class="text-muted" href="${page('info', item['rating_key'])}" title="${item['title']}">${item['title']}</a>
-                        </h3>
-                        <h3 class="text-muted">&nbsp;</h3>
+                        <h3 title="${item['parent_title']}">${item['parent_title']}</h3>
+                        <h3 class="text-muted">${item['title']}</h3>
                     </div>
-                    % elif item['media_type'] == 'episode':
-                    <a href="${page('info', item['rating_key'])}" title="${item['title']}">
-                        <div class="dashboard-recent-media-poster">
-                            <div class="dashboard-recent-media-poster-face" style="background-image: url(${page('pms_image_proxy', item['grandparent_thumb'], item['grandparent_rating_key'], 300, 450, fallback='poster')});">
-                                <div class="dashboard-recent-media-overlay">
-                                    <div class="dashboard-recent-media-overlay-text" id="added_at-${item['rating_key']}">
-                                        <script>
-                                            $('#added_at-${item['rating_key']}').text('Added ' + moment(${item['added_at']}, "X").fromNow())
-                                        </script>
-                                    </div>
-                                </div>
-                            </div>
-                            % if _session['user_group'] == 'admin':
-                            <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                            % endif
-                        </div>
-                    </a>
-                    <div class="dashboard-recent-media-metacontainer">
-                        <h3>
-                            <a href="${page('info', item['grandparent_rating_key'])}" title="${item['grandparent_title']}">${item['grandparent_title']}</a>
-                        </h3>
-                        <h3 class="text-muted">
-                            <a href="${page('info', item['rating_key'])}" title="${item['title']}">${item['title']}</a>
-                        </h3>
-                        <h3 class="text-muted">
-                            <a href="${page('info', item['parent_rating_key'])}" title="${item['parent_title']}">${short_season(item['parent_title'])}</a>
-                            &middot;
-                            <a href="${page('info', item['rating_key'])}" title="Episode ${item['media_index']}">E${item['media_index']}</a>
-                        </h3>
-                    </div>
-                    % elif item['media_type'] == 'album':
-                    <a href="${page('info', item['rating_key'])}" title="${item['parent_title']}">
-                        <div class="dashboard-recent-media-cover">
-                            <div class="dashboard-recent-media-cover-face" style="background-image: url(${page('pms_image_proxy', item['thumb'], item['rating_key'], 300, 300, fallback='cover')});">
-                                <div class="dashboard-recent-media-overlay">
-                                    <div class="dashboard-recent-media-overlay-text" id="added_at-${item['rating_key']}">
-                                        <script>
-                                            $('#added_at-${item['rating_key']}').text('Added ' + moment(${item['added_at']}, "X").fromNow())
-                                        </script>
-                                    </div>
-                                </div>
-                            </div>
-                            % if _session['user_group'] == 'admin':
-                            <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                            % endif
-                        </div>
-                    </a>
-                    <div class="dashboard-recent-media-metacontainer">
-                        <h3>
-                            <a href="${page('info', item['parent_rating_key'])}" title="${item['parent_title']}">${item['parent_title']}</a>
-                        </h3>
-                        <h3 class="text-muted">
-                            <a class="text-muted" href="${page('info', item['rating_key'])}" title="${item['title']}">${item['title']}</a>
-                        </h3>
-                        <h3 class="text-muted">&nbsp;</h3>
-                    </div>
-                    % endif
-                </li>
-            </div>
-            % endfor
-        </ul>
-    </div>
+                </a>
+				% endif
+            </li>
+        </div>
+        % endfor
+    </ul>
 </div>
 % else:
-<div id="dashboard-no-recently-added" class="text-muted" style="height: 288px; margin-bottom: 25px;">No recently added items.</div>
-% endif
-% else:
-<div class="text-muted">There was an error communicating with your Plex Server.</div><br>
+<div class="text-muted">There was an error communicating with your Plex Server. Please check your <a href="settings">settings</a>.
+</div><br>
 % endif
\ No newline at end of file
diff --git a/data/interfaces/default/scheduler_table.html b/data/interfaces/default/scheduler_table.html
deleted file mode 100644
index c4087f17..00000000
--- a/data/interfaces/default/scheduler_table.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<%doc>
-USAGE DOCUMENTATION :: PLEASE LEAVE THIS AT THE TOP OF THIS FILE
-
-For Mako templating syntax documentation please visit: http://docs.makotemplates.org/en/latest/
-
-Filename:           scheduler_table.html
-Version:            0.1
-
-DOCUMENTATION :: END
-</%doc>
-
-<%!
-    import datetime
-    import plexpy
-    from plexpy import common, helpers
-%>
-
-<table class="config-scheduler-table small-muted">
-    <thead>
-        <tr>
-            <th>Scheduled Task</th>
-            <th>State</th>
-            <th>Interval</th>
-            <th>Next Run In</th>
-            <th>Next Run Time</th>
-        </tr>
-    </thead>
-    <tbody>
-        % for job, job_type in common.SCHEDULER_LIST.items():
-        <%
-            sched_job = plexpy.SCHED.get_job(job)
-        %>
-        % if sched_job:
-        <tr>
-            <td>${sched_job.id}</td>
-            <td><i class="fa fa-sm fa-fw fa-check"></i> Active</td>
-            <td>${helpers.format_timedelta_Hms(sched_job.trigger.interval)}</td>
-            <td>${helpers.format_timedelta_Hms(sched_job.next_run_time - datetime.datetime.now(sched_job.next_run_time.tzinfo))}</td>
-            <td>${sched_job.next_run_time.astimezone(plexpy.SYS_TIMEZONE).strftime('%Y-%m-%d %H:%M:%S')}</td>
-        </tr>
-        % elif job_type == 'websocket' and plexpy.WS_CONNECTED:
-        <tr>
-            % if job == 'Check for active sessions':
-            <td><a class="queue-modal-link no-highlight" href="#" data-queue="active sessions">${job}</a></td>
-            % elif job == 'Check for recently added items':
-            <td><a class="queue-modal-link no-highlight" href="#" data-queue="recently added">${job}</a></td>
-            % else:
-            <td>${job}</td>
-            % endif
-            <td><i class="fa fa-sm fa-fw fa-check"></i> Websocket</td>
-            <td>N/A</td>
-            <td>N/A</td>
-            <td>N/A</td>
-        </tr>
-        % else:
-        <tr>
-            <td>${job}</td>
-            <td><i class="fa fa-sm fa-fw fa-times"></i> Inactive</td>
-            <td>N/A</td>
-            <td>N/A</td>
-            <td>N/A</td>
-        </tr>
-        % endif
-        % endfor
-    </tbody>
-</table>
-<script>
-    $('.queue-modal-link').on('click', function (e) {
-        e.preventDefault();
-        $.ajax({
-            url: 'get_queue_modal',
-            data: {
-                queue: $(this).data('queue')
-            },
-            cache: false,
-            async: true,
-            complete: function(xhr, status) {
-                $("#queue-modal").html(xhr.responseText);
-                $('#queue-modal').modal();
-            }
-        });
-    });
-</script>
diff --git a/data/interfaces/default/search.html b/data/interfaces/default/search.html
index 14fff968..957b2878 100644
--- a/data/interfaces/default/search.html
+++ b/data/interfaces/default/search.html
@@ -18,32 +18,21 @@
         </div>
     </div>
     <div class='table-card-back'>
-        <div id="search-results-list" class="search-results-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading search results...</div>
+        <div id="search-results-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading search results...</div>
     </div>
 </div>
 </%def>
 
-<%def name="modalIncludes()">
-</%def>
-
 <%def name="javascriptIncludes()">
 <script>
-    var query_string = "${query.replace('"','\\"').replace('/','\\/') | n}";
-
-    $('#query').val(query_string);
-    if ($(window).width() >= 768) {
-        $('#search_button').removeClass('btn-inactive');
-        $('#query').css({ right: '0', width: '250px' }).addClass('active');
-    }
+    $('#search_button').removeClass('btn-inactive');
+    $('#search_query').val('${query}').css({ right: '0', width: '250px' }).addClass('active');
 
     $.ajax({
         url: 'get_search_results_children',
-        type: "POST",
+        type: "GET",
         async: true,
-        data: {
-            query: query_string,
-            limit: 30
-        },
+        data: {'query': "${query}"},
         complete: function (xhr, status) {
             $("#search-results-list").html(xhr.responseText);
         }
diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index 9a25151e..6e1db8b6 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -1,17 +1,9 @@
 <%inherit file="base.html"/>
 <%!
-    import os
-    import sys
+import plexpy
+from plexpy import notifiers, common, versioncheck
 
-    import plexpy
-    from plexpy import common, notifiers, newsletters
-    from plexpy.helpers import anon_url, checked
-
-    docker_setting = 'disabled' if plexpy.DOCKER else ''
-    docker_msg = '<span class="setting-message small">(Controlled by Docker Container)</span>' if plexpy.DOCKER else ''
-
-    available_notification_agents = sorted(notifiers.available_notification_agents(), key=lambda k: k['label'].lower())
-    available_newsletter_agents = sorted(newsletters.available_newsletter_agents(), key=lambda k: k['label'].lower())
+available_notification_agents = notifiers.available_notification_agents()
 %>
 <%def name="headIncludes()">
 </%def>
@@ -21,33 +13,18 @@
 
 <%def name="body()">
 <div class="container">
-    % if plexpy.CONFIG.CHECK_DOCKER_MOUNT and plexpy.DOCKER and not plexpy.DOCKER_MOUNT:
-    <div class="row">
-        <div class="col-md-12">
-            <div class="alert alert-danger docker-mount" role="alert">
-                The <span class="inline-pre">/config</span> volume mount was not configured properly for the Docker container.
-                All data may be cleared when the container is recreated or updated.
-            </div>
-        </div>
-    </div>
-    % endif
     <div class="row">
         <div class="col-md-12">
             <div class='card-back-full'>
                 <div class="header-bar">
-                    <span><i class="fa fa-cogs"></i> Settings</span>
+                    <span><i class="fa fa-cog"></i> Settings</span>
                 </div>
                 <div class="button-bar">
-                    % if config['show_advanced_settings'] == 1:
-                    <button id="menu_link_show_advanced_settings" class="btn btn-dark active"><i class="fa fa-wrench"></i> Hide Advanced</button>
-                    % else:
-                    <button id="menu_link_show_advanced_settings" class="btn btn-dark"><i class="fa fa-wrench"></i> Show Advanced</button>
-                    % endif
                     % if config['check_github']:
-                    <button id="menu_link_update_check" class="btn btn-dark"><i class="fa fa-arrow-alt-circle-up"></i> Check for Updates</button>
+                    <button id="menu_link_update_check" class="btn btn-dark"><i class="fa fa-arrow-circle-up"></i> Check for Updates</button>
                     % endif
                     <button id="menu_link_restart" class="btn btn-dark"><i class="fa fa-refresh"></i> Restart</button>
-                    <button id="menu_link_shutdown" class="btn btn-dark"><i class="fa fa-power-off"></i> Shutdown</button>
+                    <button id="menu_link_shutdown" class="btn btn-dark"><i class="fa fa-power-off"></i> Shut Down</button>
                 </div>
             </div>
         </div>
@@ -56,58 +33,39 @@
         <!-- Nav tabs -->
         <div class="col-md-3">
             <ul class="nav-settings list-unstyled" role="tablist">
-                <li role="presentation" class="active"><a id="nav-help_info" href="#tabs-help_info" aria-controls="tabs-help_info" role="tab" data-toggle="tab">Help & Info</a></li>
-                <li role="presentation"><a id="nav-tabs-general" href="#tabs-general" aria-controls="tabs-general" role="tab" data-toggle="tab">General</a></li>
-                <li role="presentation"><a id="nav-tabs-homepage" href="#tabs-homepage" aria-controls="tabs-homepage" role="tab" data-toggle="tab">Homepage</a></li>
-                <li role="presentation"><a id="nav-tabs-web_interface" href="#tabs-web_interface" aria-controls="tabs-web_interface" role="tab" data-toggle="tab">Web Interface</a></li>
-                <li role="presentation"><a id="nav-tabs-plex_media_server" href="#tabs-plex_media_server" aria-controls="tabs-plex_media_server" role="tab" data-toggle="tab">Plex Media Server</a></li>
-                <li role="presentation"><a id="nav-tabs-notifications" href="#tabs-notifications" aria-controls="tabs-notifications" role="tab" data-toggle="tab">Notifications & Newsletters</a></li>
-                <li role="presentation"><a id="nav-tabs-notification_agents" href="#tabs-notification_agents" aria-controls="tabs-notification_agents" role="tab" data-toggle="tab">Notification Agents</a></li>
-                <li role="presentation"><a id="nav-tabs-newsletter_agents" href="#tabs-newsletter_agents" aria-controls="tabs-newsletter_agents" role="tab" data-toggle="tab">Newsletter Agents</a></li>
-                <li role="presentation"><a id="nav-tabs-3rd_party_apis" href="#tabs-3rd_party_apis" aria-controls="tabs-3rd_party_apis" role="tab" data-toggle="tab">3rd Party APIs</a></li>
-                <li role="presentation"><a id="nav-tabs-import_backups" href="#tabs-import_backups" aria-controls="tabs-import_backups" role="tab" data-toggle="tab">Import & Backups</a></li>
-                <li role="presentation"><a id="nav-tabs-remote_app" href="#tabs-remote_app" aria-controls="tabs-remote_app" role="tab" data-toggle="tab">Tautulli Remote App <span class="pull-right"><i class="fa fa-fw fa-android"></i><i class="fa fa-fw fa-apple"></i></span></a></li>
+                <li role="presentation" class="active"><a href="#tabs-1" aria-controls="tabs-1" role="tab" data-toggle="tab">General</a></li>
+                <li role="presentation"><a href="#tabs-2" aria-controls="tabs-2" role="tab" data-toggle="tab">Homepage Statistics</a></li>
+                <li role="presentation"><a href="#tabs-3" aria-controls="tabs-3" role="tab" data-toggle="tab">Web Interface</a></li>
+                <li role="presentation"><a href="#tabs-4" aria-controls="tabs-4" role="tab" data-toggle="tab">Access Control</a></li>
+                <li role="presentation"><a href="#tabs-5" aria-controls="tabs-5" role="tab" data-toggle="tab">Plex Media Server</a></li>
+                <li role="presentation"><a href="#tabs-6" aria-controls="tabs-6" role="tab" data-toggle="tab">Plex.tv Account</a></li>
+                <li role="presentation"><a href="#tabs-7" aria-controls="tabs-7" role="tab" data-toggle="tab">Extra Settings</a></li>
+                <li role="presentation"><a href="#tabs-8" aria-controls="tabs-8" role="tab" data-toggle="tab">Monitoring</a></li>
+                <li role="presentation"><a href="#tabs-9" aria-controls="tabs-9" role="tab" data-toggle="tab">Notifications</a></li>
+                <li role="presentation"><a href="#tabs-10" aria-controls="tabs-10" role="tab" data-toggle="tab">Notification Agents</a></li>
             </ul>
         </div>
         <div class="col-md-9">
             <form action="configUpdate" method="post" class="form" id="configUpdate" data-parsley-validate>
-                <input type="hidden" id="show_advanced_settings" name="show_advanced_settings" value="${config['show_advanced_settings']}" required>
                 <div class="tab-content">
-                    <div role="tabpanel" class="tab-pane active" id="tabs-help_info">
-                        % if common.RELEASE:
+                    <div role="tabpanel" class="tab-pane active" id="tabs-1">
+                        % if common.VERSION_NUMBER:
                         <div class="padded-header">
-                            <h3>Version ${common.RELEASE} <small><a id="changelog-modal-link" href="#"><i class="fa fa-info-circle"></i> Changelog</a></small></h3>
+                            <h3>Version ${common.VERSION_NUMBER} <small><a href="#changelog-modal" data-toggle="modal"><i class="fa fa-info-circle"></i> Changelog</a></small></h3>
                         </div>
                         % endif
-                        <div class="padded-header">
-                            <h3>Tautulli News</h3>
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" id="check_github" name="check_github" value="1" ${config['check_github']}> Enable Updates
+                            </label>
+                            <p class="help-block">If you have Git installed, allow periodic checks for updates.</p>
                         </div>
-                        <div id="tautulli-news">
-                            <div class='text-muted'><i class="fa fa-refresh fa-spin"></i> Loading news...</div>
-                            <br>
-                        </div>
-                        <div class="padded-header">
-                            <h3>Tautulli Configuration</h3>
-                        </div>
-                        <div id="plexpy-configuration-table">
-                            <div class='text-muted'><i class="fa fa-refresh fa-spin"></i> Loading configuration table...</div>
-                            <br>
-                        </div>
-                        <div class="padded-header">
-                            <h3>Tautulli Scheduled Tasks</h3>
-                        </div>
-                        <div id="plexpy-scheduler-table">
-                            <div class='text-muted'><i class="fa fa-refresh fa-spin"></i> Loading scheduler table...</div>
-                            <br>
-                        </div>
-                    </div>
-
-                    <div role="tabpanel" class="tab-pane" id="tabs-general">
-
+                        % if plexpy.CURRENT_VERSION:
+                        <p class="help-block">Git hash: ${plexpy.CURRENT_VERSION}</p>
+                        % endif
                         <div class="padded-header">
                             <h3>Display Settings</h3>
                         </div>
-
                         <div class="form-group">
                             <label for="date_format">Date Format</label>
                             <div class="row">
@@ -126,383 +84,64 @@
                             </div>
                             <p class="help-block">Set your preferred time format. <a href="javascript:void(0)" data-target="#dateTimeOptionsModal" data-toggle="modal">Click here</a> to see the parameter list.</p>
                         </div>
-                        <div class="checkbox advanced-setting">
-                            <label>
-                                <input type="checkbox" id="week_start_monday" name="week_start_monday" value="1" ${config['week_start_monday']}> Week Starting on Monday
-                            </label>
-                            <p class="help-block">Change the "<em>Play by day of week</em>" graph to start on Monday. Default is start on Sunday.</p>
-                        </div>
-                        <div class="checkbox advanced-setting">
-                            <label>
-                                <input type="checkbox" id="history_table_activity" name="history_table_activity" value="1" ${config['history_table_activity']}> Current Activity in History Tables
-                            </label>
-                            <p class="help-block">Include current activity in the history tables. Statistics will not be counted until the stream has ended.</p>
-                        </div>
-                        <div class="checkbox advanced-setting">
-                            <label>
-                                <input type="checkbox" id="get_file_sizes" name="get_file_sizes" value="1" ${config['get_file_sizes']}> Calculate Total File Sizes
-                            </label>
-                            <p class="help-block">Enable if you want Tautulli to calculate the total file size for TV Shows/Seasons and Artists/Albums on the media info tables.</p>
-                        </div>
-                        <div class="checkbox advanced-setting">
-                            <label>
-                                <input type="checkbox" id="log_blacklist" name="log_blacklist" value="1" ${config['log_blacklist']}> Mask Sensitive Information in Logs
-                            </label>
-                            <p class="help-block">
-                                Enable to mask passwords, access tokens, and public IP addresses, and email addresses with asterisks (*) in the logs.<br />
-                                Note: Only logs from the time this setting is enabled will be masked. Do not post your logs publically without masking sensitive information!
-                            </p>
-                        </div>
-                        <div class="checkbox advanced-setting">
-                            <label>
-                                <input type="checkbox" id="log_blacklist_usernames" name="log_blacklist_usernames" value="1" ${config['log_blacklist_usernames']}> Mask Usernames in Logs
-                            </label>
-                            <p class="help-block">
-                                Enable to mask Plex usernames with asterisks (*) in the logs.<br />
-                                Note: Only logs from the time this setting is enabled will be masked.
-                            </p>
-                        </div>
-
-                        <div class="padded-header">
-                            <h3>History Logging</h3>
-                        </div>
-
-                        <div class="form-group advanced-setting">
-                            <label for="logging_ignore_interval">Ignore Interval</label>
-                            <div class="row">
-                                <div class="col-md-2">
-                                    <input type="text" class="form-control" data-parsley-type="integer" id="logging_ignore_interval" name="logging_ignore_interval" value="${config['logging_ignore_interval']}" size="5" data-parsley-min="0" data-parsley-trigger="change" data-parsley-errors-container="#logging_ignore_interval_error" required>
-                                </div>
-                                <div id="logging_ignore_interval_error" class="alert alert-danger settings-alert" role="alert"></div>
-                            </div>
-                            <p class="help-block">The interval (in seconds) an item must be in a playing state before logging it. 0 to disable.</p>
-                        </div>
-                        <div class="form-group">
-                            <label for="movie_watched_percent">Movie Watched Percent</label>
-                            <div class="row">
-                                <div class="col-md-2">
-                                    <input type="text" class="form-control" data-parsley-type="integer" id="movie_watched_percent" name="movie_watched_percent" value="${config['movie_watched_percent']}" size="5" data-parsley-range="[50,95]" data-parsley-trigger="change" data-parsley-errors-container="#movie_watched_percent_error" required>
-                                </div>
-                                <div id="movie_watched_percent_error" class="alert alert-danger settings-alert" role="alert"></div>
-                            </div>
-                            <p class="help-block">Set the percentage for a movie to be considered as watched. Minimum 50, Maximum 95.</p>
-                        </div>
-                        <div class="form-group">
-                            <label for="tv_watched_percent">TV Episode Watched Percent</label>
-                            <div class="row">
-                                <div class="col-md-2">
-                                    <input type="text" class="form-control" data-parsley-type="integer" id="tv_watched_percent" name="tv_watched_percent" value="${config['tv_watched_percent']}" size="5" data-parsley-range="[50,95]" data-parsley-trigger="change" data-parsley-errors-container="#tv_watched_percent_error" required>
-                                </div>
-                                <div id="tv_watched_percent_error" class="alert alert-danger settings-alert" role="alert"></div>
-                            </div>
-                            <p class="help-block">Set the percentage for a TV episode to be considered as watched. Minimum 50, Maximum 95.</p>
-                        </div>
-                        <div class="form-group">
-                            <label for="music_watched_percent">Music Listened Percent</label>
-                            <div class="row">
-                                <div class="col-md-2">
-                                    <input type="text" class="form-control" data-parsley-type="integer" id="music_watched_percent" name="music_watched_percent" value="${config['music_watched_percent']}" size="5" data-parsley-range="[50,95]" data-parsley-trigger="change" data-parsley-errors-container="#music_watched_percent_error" required>
-                                </div>
-                                <div id="music_watched_percent_error" class="alert alert-danger settings-alert" role="alert"></div>
-                            </div>
-                            <p class="help-block">Set the percentage for a music track to be considered as listened. Minimum 50, Maximum 95.</p>
-                        </div>
-                        <div class="form-group">
-                            <label for="music_watched_percent">Video Watched Completion Behaviour</label>
-                            <div class="row">
-                                <div class="col-md-7">
-                                    <select class="form-control" id="watched_marker" name="watched_marker">
-                                        <option value="0" ${'selected' if config['watched_marker'] == 0 else ''}>At selected threshold percentage</option>
-                                        <option value="1" ${'selected' if config['watched_marker'] == 1 else ''}>At final credits marker position</option>
-                                        <option value="2" ${'selected' if config['watched_marker'] == 2 else ''}>At first credits marker position</option>
-                                        <option value="3" ${'selected' if config['watched_marker'] == 3 else ''}>Earliest between threshold percent and first credits marker</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <p class="help-block">Decide whether to use end credits markers to determine the 'watched' state of video items. When markers are not available the selected threshold percentage will be used.</p>
-                        </div>
-                        <div class="checkbox advanced-setting">
-                            <label>
-                                <input type="checkbox" id="group_history_tables" name="group_history_tables" value="1" ${config['group_history_tables']}> Group Play History
-                            </label>
-                            <p class="help-block">Group play history for the same item and user as a single entry when progress is less than the watched percent.</p>
-                        </div>
-                        <div class="form-group advanced-setting">
-                            <label>Regroup Play History</label>
-                            <p class="help-block">
-                                Fix grouping of play history in the database.<br />
-                            </p>
-                            <div class="row">
-                                <div class="col-md-4">
-                                    <div class="btn-group">
-                                        <button class="btn btn-form" type="button" id="regroup_history">Regroup</button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="form-group advanced-setting">
-                            <label>Flush Temporary Sessions</label>
-                            <p class="help-block">
-                                Attempt to fix history logging by flushing out all of the temporary sessions in the database.<br />
-                                Warning: This will reset all currently active sessions. For emergency use only when history logging is stuck!
-                            </p>
-                            <div class="row">
-                                <div class="col-md-4">
-                                    <div class="btn-group">
-                                        <button class="btn btn-form" type="button" id="delete_temp_sessions">Flush</button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="padded-header">
-                            <h3>Updates</h3>
-                        </div>
-
                         <div class="checkbox">
                             <label>
-                                <input type="checkbox" id="check_github" name="check_github" value="1" ${config['check_github']}> Check for Tautulli Updates
+                                <input type="checkbox" id="group_history_tables" name="group_history_tables" value="1" ${config['group_history_tables']}> Group Table History
                             </label>
-                            <p class="help-block">Enable to check for Tautulli updates.</p>
+                            <p class="help-block">Group successive play history by the same user as a single entry in tables.</p>
                         </div>
-                        <div id="git_update_options">
-                            <div class="form-group">
-                                <label for="check_github_interval">Update Check Interval</label>
-                                <div class="row">
-                                    <div class="col-md-2">
-                                        <input type="text" class="form-control" data-parsley-type="integer" id="check_github_interval" name="check_github_interval" value="${config['check_github_interval']}" size="3" data-parsley-min="1" data-parsley-trigger="change" data-parsley-errors-container="#check_github_interval_error" required>
-                                    </div>
-                                    <div id="check_github_interval_error" class="alert alert-danger settings-alert" role="alert"></div>
-                                </div>
-                                <p class="help-block">
-                                    The interval (in hours) Tautulli will check for a new update. Minimum 1, default 6.
-                                </p>
-                            </div>
-                            % if not plexpy.SNAP and not plexpy.FROZEN:
-                            <div class="checkbox">
-                                <label>
-                                    <input type="checkbox" id="plexpy_auto_update" name="plexpy_auto_update" value="1" ${config['plexpy_auto_update']} ${docker_setting}> Update Automatically ${docker_msg | n}
-                                </label>
-                                <p class="help-block">Update Tautulli automatically if an update is available.</p>
-                            </div>
-                            % endif
-                            <div class="checkbox advanced-setting">
-                                <label>
-                                    <input type="checkbox" name="notify_plexpy_update_repeat" id="notify_plexpy_update_repeat" value="1" ${config['notify_plexpy_update_repeat']}> Repeat Tautulli Update Notifications
-                                </label>
-                                <p class="help-block">
-                                    Enable to allow Tautulli to send repeat update notifications everytime it checks for updates.
-                                    Disable to only send one notifications for each Tautulli version.
-                                </p>
-                            </div>
-                            <div class="form-group advanced-setting">
-                                <label for="git_token">GitHub API Token</label>
-                                <div class="row">
-                                    <div class="col-md-6">
-                                        <div class="input-group">
-                                            <span class="input-group-btn">
-                                                <button class="btn btn-form reveal-token" type="button"><i class="fa fa-eye-slash"></i></button>
-                                            </span>
-                                            <input type="password" class="form-control" id="git_token" name="git_token" value="${config['git_token']}" data-parsley-trigger="change">
-                                        </div>
-                                    </div>
-                                </div>
-                                <p class="help-block">Optional: Use your own GitHub API token when checking for updates.
-                            </div>
-                        </div>
-
-                        % if plexpy.INSTALL_TYPE == 'git':
-                        <div class="form-group advanced-setting">
-                            <label for="git_branch">Git Remote / Branch</label> ${docker_msg | n}
-                            <div class="row">
-                                <div class="col-md-6">
-                                    <div class="input-group git-group">
-                                        <input type="text" class="form-control" id="git_remote" name="git_remote" value="${config['git_remote']}" data-parsley-trigger="change" ${docker_setting}>
-                                        <select class="form-control" id="git_branch" name="git_branch" ${docker_setting}>
-                                            <% branches = ('master', 'beta', 'nightly') %>
-                                            % for branch in branches:
-                                            <option value="${branch}" ${'selected' if config['git_branch'] == branch else ''}>${branch}</option>
-                                            % endfor
-                                            % if config['git_branch'] not in branches:
-                                            <option value="${config['git_branch']}" selected>${config['git_branch']}</option>
-                                            % endif
-                                        </select>
-                                        <span class="input-group-btn">
-                                            <button class="btn btn-form" type="button" id="switch_git_branch" ${docker_setting}>Checkout Branch</button>
-                                        </span>
-                                    </div>
-                                </div>
-                            </div>
-                            <p class="help-block">The git tracking remote and branch (default "origin/master"). Select to switch the git branch (requires restart).</p>
-                        </div>
-                        <div class="form-group advanced-setting">
-                            <label for="git_path">Git Path</label> ${docker_msg | n}
-                            <div class="row">
-                                <div class="col-md-4">
-                                    <input type="text" class="form-control" id="git_path" name="git_path" value="${config['git_path']}" size="30" ${docker_setting}>
-                                </div>
-                            </div>
-                            <p class="help-block">Optional: The path to your git environment variable. Leave blank for default.</p>
-                        </div>
-                        <div class="form-group advanced-setting">
-                            <label>Repair Git Install</label>
-                            <p class="help-block">
-                                Attempt to fix updating by resetting your Tautulli installation back to <strong>${common.RELEASE}</strong>.<br />
-                                Note: This will not affect any saved history or settings.
-                            </p>
-                            <div class="row">
-                                <div class="col-md-4">
-                                    <div class="btn-group">
-                                        <button class="btn btn-form" type="button" id="reset_git_install">Reset</button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        % endif
-
                         <p><input type="button" class="btn btn-bright save-button" value="Save" data-success="Changes saved successfully"></p>
-
                     </div>
-
-                    <div role="tabpanel" class="tab-pane" id="tabs-homepage">
-
-                        <div class="padded-header">
-                            <h3>Activity</h3>
-                        </div>
-
-                        <div class="form-group">
-                            <label for="home_refresh_interval">Activity Refresh Interval</label>
-                            <div class="row">
-                                <div class="col-md-2">
-                                    <input type="text" class="form-control" data-parsley-type="integer" id="home_refresh_interval" name="home_refresh_interval" value="${config['home_refresh_interval']}" size="5" data-parsley-min="2" data-parsley-trigger="change" data-parsley-errors-container="#home_refresh_interval_error" required>
-                                </div>
-                                <div id="home_refresh_interval_error" class="alert alert-danger settings-alert" role="alert"></div>
-                            </div>
-                            <p class="help-block">Set the interval (in seconds) to refresh the current activity on the homepage. Minimum 2, default 10.</p>
-                        </div>
-
-                        <div class="padded-header">
-                            <h3>Sections</h3>
-                        </div>
-
-                        <p class="help-block">
-                            Select the sections to show on the homepage.
-                            Drag the items below to reorder your homepage content.
-                        </p>
-                        <div class="row">
-                            <div class="col-md-6">
-                                <ul class="list-unstyled" id="sortable_home_sections" data-parsley-trigger="change">
-                                    <li class="card card-sortable">
-                                        <div class="card-handle"><i class="fa fa-bars"></i></div>
-                                        <label>
-                                            <input type="checkbox" id="hsec-current_activity" name="hsec-current_activity" value="current_activity"> Current Activity
-                                        </label>
-                                    </li>
-                                    <li class="card card-sortable">
-                                        <div class="card-handle"><i class="fa fa-bars"></i></div>
-                                        <label>
-                                            <input type="checkbox" id="hsec-watch_stats" name="hsec-watch_stats" value="watch_stats"> Watch Statistics
-                                        </label>
-                                    </li>
-                                    <li class="card card-sortable">
-                                        <div class="card-handle"><i class="fa fa-bars"></i></div>
-                                        <label>
-                                            <input type="checkbox" id="hsec-library_stats" name="hsec-library_stats" value="library_stats"> Library Statistics
-                                        </label>
-                                    </li>
-                                    <li class="card card-sortable">
-                                        <div class="card-handle"><i class="fa fa-bars"></i></div>
-                                        <label>
-                                            <input type="checkbox" id="hsec-recently_added" name="hsec-recently_added" value="recently_added"> Recently Added
-                                        </label>
-                                    </li>
-                                </ul>
-                                <input type="text" id="home_sections" name="home_sections" style="display: none;"/>
-                            </div>
-                        </div>
-
+                    <div role="tabpanel" class="tab-pane" id="tabs-2">
                         <div class="padded-header">
                             <h3>Watch Statistics</h3>
                         </div>
 
                         <div class="form-group">
-                            <p class="help-block">
-                                Select the cards to show in the watch statistics on the home page.
-                                Drag the items below to reorder your homepage content.
-                            </p>
+                            <label for="home_stats_cards">Cards</label>
                             <div class="row">
                                 <div class="col-md-6">
-                                    <ul class="list-unstyled" id="sortable_home_stats_cards" data-parsley-trigger="change">
-                                        <li class="card card-sortable">
-                                            <div class="card-handle"><i class="fa fa-bars"></i></div>
-                                            <label>
-                                                <input type="checkbox" id="hscard-top_movies" name="hscard-top_movies" value="top_movies"> Most Watched Movie
-                                            </label>
-                                        </li>
-                                        <li class="card card-sortable">
-                                            <div class="card-handle"><i class="fa fa-bars"></i></div>
-                                            <label>
-                                                <input type="checkbox" id="hscard-popular_movies" name="hscard-popular_movies" value="popular_movies"> Most Popular Movie
-                                            </label>
-                                        </li>
-                                        <li class="card card-sortable">
-                                            <div class="card-handle"><i class="fa fa-bars"></i></div>
-                                            <label>
-                                                <input type="checkbox" id="hscard-top_tv" name="hscard-top_tv" value="top_tv"> Most Watched TV
-                                            </label>
-                                        </li>
-                                        <li class="card card-sortable">
-                                            <div class="card-handle"><i class="fa fa-bars"></i></div>
-                                            <label>
-                                                <input type="checkbox" id="hscard-popular_tv" name="hscard-popular_tv" value="popular_tv"> Most Popular TV
-                                            </label>
-                                        </li>
-                                        <li class="card card-sortable">
-                                            <div class="card-handle"><i class="fa fa-bars"></i></div>
-                                            <label>
-                                                <input type="checkbox" id="hscard-top_music" name="hscard-top_music" value="top_music"> Most Listened to Artist
-                                            </label>
-                                        </li>
-                                        <li class="card card-sortable">
-                                            <div class="card-handle"><i class="fa fa-bars"></i></div>
-                                            <label>
-                                                <input type="checkbox" id="hscard-popular_music" name="hscard-popular_music" value="popular_music"> Most Popular Artist
-                                            </label>
-                                        </li>
-                                        <li class="card card-sortable">
-                                            <div class="card-handle"><i class="fa fa-bars"></i></div>
-                                            <label>
-                                                <input type="checkbox" id="hscard-last_watched" name="hscard-last_watched" value="last_watched"> Last Watched
-                                            </label>
-                                        </li>
-                                        <li class="card card-sortable">
-                                            <div class="card-handle"><i class="fa fa-bars"></i></div>
-                                            <label>
-                                                <input type="checkbox" id="hscard-top_libraries" name="hscard-top_libraries" value="top_libraries"> Most Active Libraries
-                                            </label>
-                                        </li>
-                                        <li class="card card-sortable">
-                                            <div class="card-handle"><i class="fa fa-bars"></i></div>
-                                            <label>
-                                                <input type="checkbox" id="hscard-top_users" name="hscard-top_users" value="top_users"> Most Active User
-                                            </label>
-                                        </li>
-                                        <li class="card card-sortable">
-                                            <div class="card-handle"><i class="fa fa-bars"></i></div>
-                                            <label>
-                                                <input type="checkbox" id="hscard-top_platforms" name="hscard-top_platforms" value="top_platforms"> Most Active Platform
-                                            </label>
-                                        </li>
-                                        <li class="card card-sortable">
-                                            <div class="card-handle"><i class="fa fa-bars"></i></div>
-                                            <label>
-                                                <input type="checkbox" id="hscard-most_concurrent" name="hscard-most_concurrent" value="most_concurrent"> Most Concurrent Streams
-                                            </label>
-                                        </li>
-                                    </ul>
-                                    <input type="text" id="home_stats_cards" name="home_stats_cards" style="display: none;" />
+                                    <select multiple class="form-control" id="home_stats_cards" name="home_stats_cards" data-parsley-trigger="change">
+                                        <option id="card-watch_statistics" value="watch_statistics" class="hidden" selected>Watch Statistics</option>
+                                        <option id="card-top_tv" value="top_tv">Most Watched TV</option>
+                                        <option id="card-popular_tv" value="popular_tv">Most Popular TV</option>
+                                        <option id="card-top_movies" value="top_movies">Most Watched Movie</option>
+                                        <option id="card-popular_movies" value="popular_movies">Most Popular Movie</option>
+                                        <option id="card-top_music" value="top_music">Most Listened Music</option>
+                                        <option id="card-popular_music" value="popular_music">Most Popular Music</option>
+                                        <option id="card-top_users" value="top_users">Most Active User</option>
+                                        <option id="card-top_platforms" value="top_platforms">Most Active Platform</option>
+                                        <option id="card-last_watched" value="last_watched">Last Watched</option>
+                                    </select>
                                 </div>
                             </div>
+                            <p class="help-block">Select the cards to show in the watch statistics on the home page. Select none to disable.</p>
+                        </div>
+                        <div class="form-group">
+                            <label for="home_stats_length">Time Frame</label>
+                            <div class="row">
+                                <div class="col-md-2">
+                                    <input type="text" class="form-control" data-parsley-type="integer" id="home_stats_length" name="home_stats_length" value="${config['home_stats_length']}" size="3" data-parsley-min="0" data-parsley-trigger="change" data-parsley-errors-container="#home_stats_length_error" required>
+                                </div>
+                                <div id="home_stats_length_error" class="alert alert-danger settings-alert" role="alert"></div>
+                            </div>
+                            <p class="help-block">Specify the number of days for the watch statistics on the home page. Default is 30 days.</p>
+                        </div>
+                        <div class="form-group">
+                            <label for="home_stats_count">Top Lists</label>
+                            <div class="row">
+                                <div class="col-md-2">
+                                    <input type="text" class="form-control" data-parsley-type="integer" id="home_stats_count" name="home_stats_count" value="${config['home_stats_count']}" size="3" data-parsley-range="[0,10]" data-parsley-trigger="change" data-parsley-errors-container="#home_stats_count_error" required>
+                                </div>
+                                <div id="home_stats_count_error" class="alert alert-danger settings-alert" role="alert"></div>
+                            </div>
+                            <p class="help-block">Specify the number of items to show in the top lists for the watch statistics on the home page. Max is 10 items, default is 5 items, 0 to disable.</p>
+                        </div>
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" id="home_stats_type" name="home_stats_type" value="1" ${config['home_stats_type']}> Use Play Duration
+                            </label>
+                            <p class="help-block">Use play duration instead of play count to generate statistics.</p>
                         </div>
 
                         <div class="padded-header">
@@ -510,177 +149,74 @@
                         </div>
 
                         <div class="form-group">
-                            <p class="help-block">
-                                Select the cards to show in the library statistics on the home page.
-                                Drag the items below to reorder your homepage content.
-                            </p>
+                            <label for="home_library_cards">Cards</label>
                             <div class="row">
                                 <div class="col-md-6">
-                                    <ul class="list-unstyled" id="sortable_home_library_cards" data-parsley-trigger="change"></ul>
-                                    <input type="text" id="home_library_cards" name="home_library_cards" style="display: none;" />
+                                    <select multiple class="form-control" id="home_library_cards" name="home_library_cards" data-parsley-trigger="change">
+                                        <option id="card-library_statistics" value="library_statistics" class="hidden" selected>Library Statistics</option>
+                                    </select>
                                 </div>
                             </div>
+                            <p class="help-block">Select the cards to show in the library statistics on the home page. Select none to disable.</p>
                         </div>
-
                         <p><input type="button" class="btn btn-bright save-button" value="Save" data-success="Changes saved successfully"></p>
 
                     </div>
-
-                    <div role="tabpanel" class="tab-pane" id="tabs-web_interface">
-
+                    <div role="tabpanel" class="tab-pane" id="tabs-3">
                         <div class="padded-header">
                             <h3>Web Interface</h3>
                         </div>
-
-                        <p class="help-block">Note: Web interface changes require a restart.</p>
-                        % if common.PLATFORM in ('Windows', 'Darwin'):
-                        <%
-                            tray = {'Windows': 'System Tray', 'Darwin': 'Menu Bar'}
-                            tray_disabled = tray_disabled_msg = ''
-                            if common.PLATFORM == 'Darwin':
-                                from plexpy.macos import HAS_PYOBJC
-                                if not HAS_PYOBJC:
-                                    tray_disabled = 'disabled'
-                                    tray_disabled_msg = '<span class="setting-message small">(Missing pyobjc module)</span>'
-                        %>
-                        <div class="checkbox">
-                            <label>
-                                <input type="checkbox" class="http-settings" name="sys_tray_icon" id="sys_tray_icon" value="1" ${config['sys_tray_icon']} ${tray_disabled}> Enable ${tray[common.PLATFORM]} Icon ${tray_disabled_msg | n}
-                            </label>
-                            <p class="help-block">Show Tautulli shortcut in the ${tray[common.PLATFORM].lower()}.</p>
-                        </div>
-                        <div class="checkbox">
-                            <label>
-                                <input type="checkbox" name="launch_startup" id="launch_startup" value="1" ${config['launch_startup']}> Launch at System Startup
-                            </label>
-                            <p class="help-block">Start Tautulli automatically after Login.</p>
-                        </div>
-                        % endif
-                        <div class="checkbox">
-                            <label>
-                                <input type="checkbox" name="launch_browser" id="launch_browser" value="1" ${config['launch_browser']}> Launch Browser on Startup
-                            </label>
-                            <p class="help-block">Launch browser pointed to Tautulli on startup.</p>
+                        <p class="help-block">Web interface changes require a restart.</p>
+                        <div class="form-group">
+                            <label for="http_host">HTTP Host</label>
+                            <div class="row">
+                                <div class="col-md-6">
+                                    <input type="text" class="form-control http-settings" id="http_host" name="http_host" value="${config['http_host']}" data-parsley-trigger="change" required>
+                                </div>
+                            </div>
+                            <p class="help-block">e.g. localhost or an IP, such as 0.0.0.0</p>
                         </div>
                         <div class="form-group">
-                            <label for="http_port">HTTP Port</label> ${docker_msg | n}
+                            <label for="http_port">HTTP Port</label>
                             <div class="row">
                                 <div class="col-md-2">
-                                    <input type="text" class="form-control http-settings" data-parsley-type="integer" id="http_port" name="http_port" value="${config['http_port']}" data-parsley-trigger="change" data-parsley-errors-container="#http_port_error" required ${docker_setting}>
+                                    <input type="text" class="form-control http-settings" data-parsley-type="integer" id="http_port" name="http_port" value="${config['http_port']}" data-parsley-trigger="change" data-parsley-errors-container="#http_port_error" required>
                                 </div>
                                 <div id="http_port_error" class="alert alert-danger settings-alert" role="alert"></div>
                             </div>
                             <p class="help-block">Port to bind web server to. Note that ports below 1024 may require root.</p>
                         </div>
-                        <div class="form-group advanced-setting">
-                            <label for="http_base_url">Public Tautulli Domain</label>
-                            <div class="row">
-                                <div class="col-md-8">
-                                    <input type="text" class="form-control" id="http_base_url" name="http_base_url" value="${config['http_base_url']}" placeholder="http://mydomain.com" data-parsley-trigger="change" data-parsley-pattern="^https?:\/\/\S+$" data-parsley-errors-container="#http_base_url_error"  data-parsley-error-message="Invalid URL">
-                                </div>
-                                <div id="http_base_url_error" class="alert alert-danger settings-alert" role="alert"></div>
-                            </div>
-                            <p class="help-block">
-                                Set your public Tautulli domain for self-hosted notification images and newsletters. (e.g. http://mydomain.com)
-                            </p>
-                        </div>
-                        <div class="form-group advanced-setting">
-                            <label for="http_root">HTTP Root</label>
-                            <div class="row">
-                                <div class="col-md-6">
-                                    <input type="text" class="form-control http-settings" id="http_root" name="http_root" value="${config['http_root']}" data-parsley-trigger="change">
-                                </div>
-                            </div>
-                            <p class="help-block">The base URL of the web server. Used for reverse proxies.</p>
-                        </div>
-                       <div class="checkbox advanced-setting">
+                        <div class="checkbox">
                             <label>
-                                <input type="checkbox" class="http-settings" name="http_proxy" id="http_proxy" value="1" ${config['http_proxy']}> Enable HTTP Proxy
+                                <input type="checkbox" name="launch_browser" value="1" ${config['launch_browser']}> Launch Browser on Startup
                             </label>
-                            <p class="help-block">Respect the X-Forwarded-Proto header. Used for reverse proxies with SSL.</p>
+                            <p class="help-block">Launch browser pointed to PlexPy, on startup.</p>
                         </div>
-                        <div class="checkbox advanced-setting">
+                        <div class="checkbox">
                             <label>
                                 <input type="checkbox" class="http-settings" name="enable_https" id="enable_https" value="1" ${config['enable_https']} /> Enable HTTPS
                             </label>
                             <p class="help-block">Enable HTTPS for web server for encrypted communication.</p>
                         </div>
                         <div id="https_options">
-                            <div class="checkbox advanced-setting">
-                                <label>
-                                    <input type="checkbox" class="http-settings" name="https_create_cert" id="https_create_cert" value="1" ${config['https_create_cert']} /> Create Self-signed Certificate
-                                </label>
-                                <p class="help-block">Check to have Tautulli create a self-signed SSL certificate. Uncheck if you want to use your own certificate.</p>
+                            <div class="form-group">
+                                <label for="https_cert">HTTPS Cert</label>
+                                <input type="text" class="form-control http-settings" id="https_cert" name="https_cert" value="${config['https_cert']}">
                             </div>
-                            <div id="https_options_self-signed">
-                                <div class="form-group advanced-setting">
-                                    <label for="https_domain">HTTPS Domains</label>
-                                    <div class="row">
-                                        <div class="col-md-6">
-                                            <input type="text" class="form-control http-settings" id="https_domain" name="https_domain" value="${config['https_domain']}">
-                                        </div>
-                                    </div>
-                                    <p class="help-block">The domain names used to access Tautulli, separated by commas (,).</p>
-                                </div>
-                                <div class="form-group advanced-setting">
-                                    <label for="https_ip">HTTPS IPs</label>
-                                    <div class="row">
-                                        <div class="col-md-6">
-                                            <input type="text" class="form-control http-settings" id="https_ip" name="https_ip" value="${config['https_ip']}">
-                                        </div>
-                                    </div>
-                                    <p class="help-block">The IP addresses used to access Tautulli, separated by commas (,).</p>
-                                </div>
-                            </div>
-                            <div class="form-group advanced-setting">
-                                <label for="https_cert">HTTPS Certificate</label>
-                                <div class="row">
-                                    <div class="col-md-7">
-                                        <div class="input-group">
-                                            <input type="text" class="form-control http-settings" id="https_cert" name="https_cert" value="${config['https_cert']}">
-                                            <span class="input-group-btn">
-                                                <button class="btn btn-form" type="button" id="https_cert_browse" data-toggle="browse" data-filter=".pem" data-target="#https_cert">Browse</button>
-                                            </span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <p class="help-block">The location of the SSL certificate in PEM format.</p>
-                            </div>
-                            <div class="form-group advanced-setting">
-                                <label for="https_cert_chain">HTTPS Certificate Chain</label>
-                                <div class="row">
-                                    <div class="col-md-7">
-                                        <div class="input-group">
-                                            <input type="text" class="form-control http-settings" id="https_cert_chain" name="https_cert_chain" value="${config['https_cert_chain']}">
-                                            <span class="input-group-btn">
-                                                <button class="btn btn-form" type="button" id="https_cert_chain_browse" data-toggle="browse" data-filter=".pem" data-target="#https_cert_chain">Browse</button>
-                                            </span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <p class="help-block">The location of the SSL certificate chain in PEM format.</p>
-                            </div>
-                            <div class="form-group advanced-setting">
+                            <div class="form-group">
                                 <label for="https_key">HTTPS Key</label>
-                                <div class="row">
-                                    <div class="col-md-7">
-                                        <div class="input-group">
-                                            <input type="text" class="form-control http-settings" id="https_key" name="https_key" value="${config['https_key']}">
-                                            <span class="input-group-btn">
-                                                <button class="btn btn-form" type="button" id="https_key_browse" data-toggle="browse" data-filter=".pem" data-target="#https_key">Browse</button>
-                                            </span>
-                                        </div>
-                                    </div>
-                                </div>
-                                <p class="help-block">The location of the SSL key in PEM format.</p>
+                                <input type="text" class="form-control http-settings" id="https_key" name="https_key" value="${config['https_key']}">
                             </div>
                         </div>
 
+                        <p><input type="button" class="btn btn-bright save-button" value="Save" data-success="Changes saved successfully"></p>
+                    </div>
+                    <div role="tabpanel" class="tab-pane" id="tabs-4">
+
                         <div class="padded-header">
                             <h3>Authentication</h3>
                         </div>
-
-                        <p class="help-block">Note: Authentication changes require a restart.</p>
+                        <p class="help-block">Authentication changes require a restart.</p>
                         <div class="form-group">
                             <label for="http_username">HTTP Username</label>
                             <div class="row">
@@ -694,99 +230,60 @@
                             <label for="http_password">HTTP Password</label>
                             <div class="row">
                                 <div class="col-md-4">
-                                    <input type="password" class="form-control auth-settings" id="http_password" name="http_password" value="${config['http_password']}" size="30" autocomplete="new-password">
+                                    <input type="password" class="form-control auth-settings" id="http_password" name="http_password" value="${config['http_password']}" size="30">
                                 </div>
                             </div>
                             <p class="help-block">Password for web server authentication. Leave empty to disable.</p>
                         </div>
 
-                        <input type="checkbox" name="auth_changed" id="auth_changed" value="1" style="display: none;">
-
-                        <div class="checkbox">
-                            <label>
-                                <input type="checkbox" class="auth-settings" name="http_plex_admin" id="http_plex_admin" value="1" ${config['http_plex_admin']} data-parsley-trigger="change"> Allow Plex Admin
-                            </label>
-                            <span id="allowPlexCheck" class="settings-warning"></span>
-                            <p class="help-block">Allow the Plex server admin to login as a Tautulli admin using their Plex.tv account.</p>
-                        </div>
-                        <div class="checkbox">
-                            <label>
-                                <input type="checkbox" id="allow_guest_access" name="allow_guest_access" value="1" ${config['allow_guest_access']}> Allow Guest Access to Tautulli
-                            </label>
-                            <span id="allowGuestCheck" class="settings-warning"></span>
-                            <p class="help-block">Allow shared users to login to Tautulli using their Plex.tv account. Individual user access needs to be enabled from Users > Edit Mode.</p>
-                        </div>
 
                         <div class="padded-header">
                             <h3>API</h3>
                         </div>
-
                         <div class="checkbox">
                             <label>
                                 <input type="checkbox" id="api_enabled" name="api_enabled" value="1" ${config['api_enabled']}> Enable API
                             </label>
-                            <p class="help-block">Allow external applications to interface with Tautulli.</p>
+                            <p class="help-block">Allow remote applications to interface with PlexPy.</p>
                         </div>
-                        <div id="apioptions">
-                            <div class="form-group">
-                                <label for="api_key">API key</label>
-                                <div class="row">
-                                    <div class="col-md-6">
-                                        <div class="input-group">
-                                            <span class="input-group-btn">
-                                                <button class="btn btn-form reveal-token" type="button"><i class="fa fa-eye-slash"></i></button>
-                                            </span>
-                                            <input type="password" class="form-control" name="api_key" id="api_key" value="${config['api_key']}" size="20" readonly>
-                                            <span class="input-group-btn">
-                                                <button class="btn btn-form" type="button" id="generate_api">Generate</button>
-                                            </span>
-                                        </div>
+                        <div id="apioptions" class="form-group">
+                            <label for="api_key">API key</label>
+                            <div class="row">
+                                <div class="col-md-6">
+                                    <div class="input-group">
+                                        <input class="form-control" type="text" name="api_key" id="api_key" value="${config['api_key']}" size="20">
+                                        <span class="input-group-btn">
+                                            <button class="btn btn-form" type="button" id="generate_api">Generate</button>
+                                        </span>
                                     </div>
                                 </div>
-                                <p class="help-block">API key used to access the Tautulli API.</p>
                             </div>
+                            <p class="help-block">Current API key: <strong><br/>${config['api_key']}</strong></p>
                         </div>
 
                         <p><input type="button" class="btn btn-bright save-button" value="Save" data-success="Changes saved successfully"></p>
-
                     </div>
-
-                    <div role="tabpanel" class="tab-pane" id="tabs-plex_media_server">
+                    <div role="tabpanel" class="tab-pane" id="tabs-5">
 
                         <div class="padded-header">
-                            <h3 id="resources-xml">Plex Media Server <small style="color: #fff;">Version <span id="pms_version">${config['pms_version']}</span></small></h3>
+                            <h3>Plex Media Server</h3>
                         </div>
-
-                        <div class="form-group has-feedback" id="pms_ip_group">
-                            <label for="pms_ip_selectize">Plex IP Address or Hostname</label>
+                        <p class="help-block">If you're using websocket monitoring, any server changes require a restart of PlexPy.</p>
+                        <div class="form-group has-feedback" id="pms-ip-group">
+                            <label for="pms_ip">Plex IP or Hostname</label>
                             <div class="row">
-                                <div class="col-md-9" id="selectize-pms-ip-container">
-                                    <div class="input-group">
-                                        <select class="form-control pms-settings selectize-pms-ip" id="pms_ip_selectize" data-parsley-trigger="change" aria-describedby="server-verified" data-parsley-errors-container="#pms_ip_error" required>
-                                            <option value="${config['pms_ip']}:${config['pms_port']}"
-                                                    data-identifier="${config['pms_identifier']}"
-                                                    data-ip="${config['pms_ip']}"
-                                                    data-port="${config['pms_port']}"
-                                                    data-ssl="${config['pms_ssl']}"
-                                                    data-is_cloud="${config['pms_is_cloud']}"
-                                                    data-label="${config['pms_name'] or 'Local'}"
-                                                    selected>${config['pms_ip']}</option>
-                                        </select>
-                                        <span class="input-group-btn">
-                                            <button class="btn btn-form" type="button" id="verify_server_button">Verify Server</button>
-                                        </span>
-                                    </div>
-                                    <span class="form-control-feedback" id="pms_verify" aria-hidden="true" style="display: none; right: 110px;"></span>
+                                <div class="col-md-6">
+                                    <input type="text" class="pms-settings form-control" id="pms_ip" name="pms_ip" value="${config['pms_ip']}" size="30" data-parsley-trigger="change" aria-describedby="server-verified" required>
+                                    <span class="form-control-feedback" id="pms-verify" aria-hidden="true" style="display: none;"></span>
                                 </div>
-                                <div id="pms_ip_error" class="alert alert-danger settings-alert" role="alert"></div>
                             </div>
-                            <p class="help-block">Select your Plex Media Server from the dropdown menu or enter an IP address or hostname.</p>
+                            <p class="help-block">IP Address or hostname for Plex Media Server.</p>
                         </div>
                         <div class="form-group">
                             <label for="pms_port">Plex Port</label>
                             <div class="row">
                                 <div class="col-md-2">
-                                    <input data-parsley-type="integer" class="form-control pms-settings" type="text" id="pms_port" name="pms_port" value="${config['pms_port']}" size="30" data-parsley-trigger="change" data-parsley-errors-container="#pms_port_error" required>
+                                    <input data-parsley-type="integer" class="pms-settings form-control" type="text" id="pms_port" name="pms_port" value="${config['pms_port']}" size="30" data-parsley-trigger="change" data-parsley-errors-container="#pms_port_error" required>
                                 </div>
                                 <div id="pms_port_error" class="alert alert-danger settings-alert" role="alert"></div>
                             </div>
@@ -794,206 +291,158 @@
                         </div>
                         <div class="checkbox">
                             <label>
-                                <input type="checkbox" id="pms_ssl_checkbox" class="checkbox-toggle pms-settings" data-id="pms_ssl" value="1" ${checked(config['pms_ssl'])}> Use Secure Connection
-                                <input type="hidden" id="pms_ssl" name="pms_ssl" value="${config['pms_ssl']}">
+                                <input type="checkbox" id="pms_is_remote" name="pms_is_remote" value="1" ${config['pms_is_remote']}> Remote Server
                             </label>
-                            <p class="help-block">Connect to your Plex server using HTTPS if you have <a href="${anon_url('https://support.plex.tv/articles/206225077-how-to-use-secure-server-connections')}" target="_blank" rel="noreferrer">secure connections</a> enabled.</p>
+                            <p class="help-block">Check this is your Plex Server is not on the same local network as PlexPy.</p>
                         </div>
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" id="pms_ssl" name="pms_ssl" value="1" ${config['pms_ssl']}> Force SSL
+                            </label>
+                            <p class="help-block">Force PlexPy to connect to your Plex Server via SSL. Your server needs to have remote access enabled.</p>
+                        </div>
+                        <div class="padded-header">
+                            <h3>Plex Logs</h3>
+                        </div>
+
                         <div class="form-group">
-                            <label for="pms_url">Plex Server URL</label>
+                            <label for="pms_logs_folder">Logs Folder</label>
                             <div class="row">
-                                <div class="col-md-9">
-                                    <input type="text" class="form-control" id="pms_url" name="pms_url" value="${config['pms_url']}" size="30" readonly>
+                                <div class="col-md-6">
+                                    <input type="text" class="form-control" id="pms_logs_folder" name="pms_logs_folder" value="${config['pms_logs_folder']}" size="30" data-parsley-trigger="change">
                                 </div>
                             </div>
-                            <p class="help-block">
-                                The server URL that Tautulli will use to connect to your Plex server. Retrieved automatically.
-                            </p>
+                            <p class="help-block">Set the complete folder path where your Plex Server logs are, shortcuts are not recognized.<br /><a href="https://support.plex.tv/hc/en-us/articles/200250417-Plex-Media-Server-Log-Files" target="_blank">Click here</a> for help. This is required if you enable IP logging. </p>
                         </div>
-                        <div class="form-group advanced-setting">
-                            <label for="pms_url">Plex Server Identifier</label>
+
+                        <input type="hidden" id="pms_identifier" name="pms_identifier" value="${config['pms_identifier']}">
+
+                        <input type="button" class="btn btn-bright save-button" value="Save" data-success="Changes saved successfully">
+
+                    </div>
+                    <div role="tabpanel" class="tab-pane" id="tabs-6">
+
+                        <div class="padded-header">
+                            <h3>Plex.tv Authentication</h3>
+                        </div>
+                        <div class="form-group">
+                            <label for="pms_token">PMS Token</label>
                             <div class="row">
                                 <div class="col-md-6">
                                     <div class="input-group">
+                                        <input type="text" class="form-control" id="pms_token" name="pms_token" value="${config['pms_token']}" data-parsley-trigger="change" data-parsley-errors-container="#pms_token_error" required>
                                         <span class="input-group-btn">
-                                            <button class="btn btn-form reveal-token" type="button"><i class="fa fa-eye-slash"></i></button>
-                                        </span>
-                                        <input type="password" class="form-control" id="pms_identifier" name="pms_identifier" value="${config['pms_identifier']}" size="30" readonly>
-                                    </div>
-                                </div>
-                            </div>
-                            <p class="help-block">
-                                The unique identifier for your Plex server. Retrieved automatically.
-                            </p>
-                        </div>
-                        <div class="checkbox advanced-setting">
-                            <label>
-                                <input type="checkbox" class="pms-settings" id="pms_url_manual" name="pms_url_manual" value="1" ${config['pms_url_manual']}> Manual Connection
-                            </label>
-                            <p class="help-block">Use the user defined connection details. Do not retrieve the server connection URL automatically.</p>
-                        </div>
-                        <div class="form-group advanced-setting">
-                            <label for="pms_web_url">Plex Web URL</label>
-                            <div class="row">
-                                <div class="col-md-9">
-                                    <div class="input-group">
-                                        <input type="text" class="form-control" id="pms_web_url" name="pms_web_url" value="${config['pms_web_url']}" size="30" data-parsley-trigger="change" data-parsley-pattern="^https?:\/\/\S+$|^https:\/\/app.plex.tv\/desktop$" data-parsley-errors-container="#pms_web_url_error"  data-parsley-error-message="Invalid Plex Web URL">
-                                        <span class="input-group-btn">
-                                            <button class="btn btn-form" type="button" id="test_pms_web_button">Test URL</button>
+                                            <button class="btn btn-form" type="button" data-toggle="modal" data-target="#pms-auth-modal">Fetch Token</button>
                                         </span>
                                     </div>
                                 </div>
-                                <div id="pms_web_url_error" class="alert alert-danger settings-alert" role="alert"></div>
+                                <div id="pms_token_error" class="alert alert-danger settings-alert" role="alert"></div>
                             </div>
-                            <p class="help-block">
-                                Optional: Manually override the Plex Web URL used for click-through links on the media info pages and notifications. Default <strong>https://app.plex.tv/desktop</strong>.
-                            </p>
-                        </div>
-
-                        <input type="hidden" id="pms_ip" name="pms_ip" value="${config['pms_ip']}">
-                        <input type="hidden" id="pms_is_cloud" name="pms_is_cloud" value="${config['pms_is_cloud']}">
-                        <input type="checkbox" name="server_changed" id="server_changed" value="1" style="display: none;">
-
-                        <div class="form-group advanced-setting">
-                            <label for="pms_logs_folder">Plex Logs Folder</label>
-                            <div class="row">
-                                <div class="col-md-7">
-                                    <div class="input-group">
-                                        <input type="text" class="form-control" id="pms_logs_folder" name="pms_logs_folder" value="${config['pms_logs_folder']}" size="30" data-parsley-trigger="change" data-parsley-pattern="^[^\~\%]" data-parsley-errors-container="#pms_logs_folder_error"  data-parsley-error-message="Shortcuts are not recognized.">
-                                        <span class="input-group-btn">
-                                            <button class="btn btn-form" type="button" id="pms_logs_folder_browse" data-toggle="browse" data-filter=".folderonly" data-target="#pms_logs_folder">Browse</button>
-                                        </span>
-                                    </div>
-                                </div>
-                                <div id="pms_logs_folder_error" class="alert alert-danger settings-alert" role="alert"></div>
-                            </div>
-                            <p class="help-block">
-                                Optional: Set your Plex logs folder to use Tautulli as a log viewer. Plex logs are not needed for Tautulli to function.
-                                A complete folder path is required, shortcuts are not recognized, and the logs must be accessible from the machine where Tautulli is installed.
-                                <a href="${anon_url('https://support.plex.tv/hc/en-us/articles/200250417-Plex-Media-Server-Log-Files')}" target="_blank" rel="noreferrer">Click here</a> for help.
-                            </p>
-                        </div>
-                        <div class="checkbox advanced-setting">
-                            <label>
-                                <input type="checkbox" id="cache_images" name="cache_images" value="1" ${config['cache_images']}> Cache Plex Images
-                            </label>
-                            <p class="help-block">
-                                Enable to cache images from Plex to reduce API calls and improve loading times.<br />
-                                Note: Video preview thumbnails (BIF) are not cached.
-                            </p>
+                            <p class="help-block">Token for Plex.tv authentication.</p>
                         </div>
 
                         <div class="padded-header">
-                            <h3>Server Monitoring</h3>
+                            <h3>Friends List</h3>
                         </div>
-
-                        <div class="checkbox">
-                            <label>
-                                <input type="checkbox" id="monitor_pms_updates" name="monitor_pms_updates" value="1" ${config['monitor_pms_updates']}> Monitor Plex Updates
-                            </label>
-                            <p class="help-block">Enable to have Tautulli check if updates are available for the Plex Media Server.</p>
-                        </div>
-                        <div id="pms_update_options">
-                            <div class="form-group">
-                                <div class="row">
-                                    <div class="col-md-3">
-                                        <label for="pms_update_channel">Update Channel</label>
-                                        <select class="form-control" id="pms_update_channel" name="pms_update_channel">
-                                            <option value="plex">Use Server Setting</option>
-                                            <option value="public">Public</option>
-                                        </select>
-                                    </div>
-                                    <div class="col-md-5">
-                                        <label for="pms_update_distro_build">Release</label>
-                                        <select class="form-control" id="pms_update_distro_build" name="pms_update_distro_build">
-                                        </select>
-                                        <input type="hidden" class="form-control" id="pms_update_distro" name="pms_update_distro">
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="form-group">
-                                <label for="pms_update_check_interval">Plex Update Check Interval</label>
-                                <div class="row">
-                                    <div class="col-md-2">
-                                        <input type="text" class="form-control" data-parsley-type="integer" id="pms_update_check_interval" name="pms_update_check_interval" value="${config['pms_update_check_interval']}" size="3" data-parsley-min="1" data-parsley-trigger="change" data-parsley-errors-container="#pms_update_check_interval_error" required>
-                                    </div>
-                                    <div id="pms_update_check_interval_error" class="alert alert-danger settings-alert" role="alert"></div>
-                                </div>
-                                <p class="help-block">
-                                    The interval (in hours) Tautulli will check for a new Plex Media Server update. Minimum 1, default 24.
-                                </p>
-                            </div>
-                            <div class="checkbox advanced-setting">
-                                <label>
-                                    <input type="checkbox" name="notify_server_update_repeat" id="notify_server_update_repeat" value="1" ${config['notify_server_update_repeat']}> Repeat Plex Server Update Notifications
-                                </label>
-                                <p class="help-block">
-                                    Enable to allow Tautulli to send repeat Plex server update notifications everytime it checks for updates.
-                                    Disable to only send one notifications for each Plex server version.
-                                </p>
-                            </div>
-                        </div>
-
-                        <div class="form-group advanced-setting">
-                            <label for="refresh_users_interval">Users List Refresh Interval</label>
+                        <div class="form-group">
+                            <label for="refresh_users_interval">User List Refresh Interval</label>
                             <div class="row">
                                 <div class="col-md-2">
                                     <input type="text" class="form-control" data-parsley-type="integer" id="refresh_users_interval" name="refresh_users_interval" value="${config['refresh_users_interval']}" size="5" data-parsley-range="[1,24]" data-parsley-trigger="change" data-parsley-errors-container="#refresh_users_interval_error" required>
                                 </div>
                                 <div id="refresh_users_interval_error" class="alert alert-danger settings-alert" role="alert"></div>
                             </div>
-                            <p class="help-block">The interval (in hours) Tautulli will request an updated friends list from Plex.tv. Minimum 1, maximum 24, default 12.</p>
+                            <p class="help-block">The interval (in hours) PlexPy will request an updated friends list from Plex.tv. 1 minimum, 24 maximum.</p>
                         </div>
-                        <div class="checkbox advanced-setting">
+                        <div class="checkbox">
                             <label>
-                                <input type="checkbox" id="refresh_users_on_startup" name="refresh_users_on_startup" value="1" ${config['refresh_users_on_startup']}> Refresh Users List on Startup
+                                <input type="checkbox" id="refresh_users_on_startup" name="refresh_users_on_startup" value="1" ${config['refresh_users_on_startup']}> Refresh User List on Startup
                             </label>
-                            <p class="help-block">Refresh the users list when Tautulli starts.</p>
+                            <p class="help-block">Refresh the user list when PlexPy starts.</p>
                         </div>
 
-                        <div class="form-group advanced-setting">
-                            <label for="refresh_libraries_interval">Libraries List Refresh Interval</label>
-                            <div class="row">
-                                <div class="col-md-2">
-                                    <input type="text" class="form-control" data-parsley-type="integer" id="refresh_libraries_interval" name="refresh_libraries_interval" value="${config['refresh_libraries_interval']}" size="5" data-parsley-range="[1,24]" data-parsley-trigger="change" data-parsley-errors-container="#refresh_libraries_interval_error" required>
-                                </div>
-                                <div id="refresh_libraries_interval_error" class="alert alert-danger settings-alert" role="alert"></div>
-                            </div>
-                            <p class="help-block">The interval (in hours) Tautulli will request an updated libraries list from your Plex Media Server. Minimum 1, maximum 24, default 12.</p>
-                        </div>
-                        <div class="checkbox advanced-setting">
-                            <label>
-                                <input type="checkbox" id="refresh_libraries_on_startup" name="refresh_libraries_on_startup" value="1" ${config['refresh_libraries_on_startup']}> Refresh Libraries List on Startup
-                            </label>
-                            <p class="help-block">Refresh the libraries list when Tautulli starts.</p>
-                        </div>
-
-                        <div class="padded-header">
-                            <h3>Plex.tv Authentication</h3>
-                        </div>
-
-                        <div class="form-group has-feedback">
-                            <label for="pms_token">Plex.tv Account Token</label>
-                            <div class="row">
-                                <div class="col-md-6">
-                                    <button id="sign-in-plex" class="btn btn-form" type="button">Fetch New Token</button>
-                                    <span style="margin-left: 10px; display: none;" id="pms-token-status"></span>
-                                </div>
-                            </div>
-                            <p class="help-block">Fetch a new Plex.tv account authentication token.</p>
-                        </div>
-                        <input type="hidden" id="pms_client_id" name="pms_client_id" value="${config['pms_client_id']}">
-
                         <p><input type="button" class="btn btn-bright save-button" value="Save" data-success="Changes saved successfully"></p>
-
                     </div>
-
-                    <div role="tabpanel" class="tab-pane" id="tabs-notifications">
-
+                    <div role="tabpanel" class="tab-pane" id="tabs-7">
                         <div class="padded-header">
-                            <h3>Current Activity Notifications</h3>
+                            <h3>Extra Settings</h3>
                         </div>
 
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" id="pms_use_bif" name="pms_use_bif" value="1" ${config['pms_use_bif']}> Use Video Preview Thumbnails (BIF)
+                            </label>
+                            <p class="help-block">If you have media indexing enabled on your server, use these on the activity pane.</p>
+                        </div>
+
+                        <div class="padded-header">
+                            <h3>PlexWatch Import Tool</h3>
+                        </div>
+                        <p class="help-block"><a href="javascript:void(0)" id="toggle-plexwatch-import-modal" data-target="#plexwatch-import-modal" data-toggle="modal">Click here to Import an existing Plexwatch database.</a></p>
+
+                        <p><input type="button" class="btn btn-bright save-button" value="Save" data-success="Changes saved successfully"></p>
+                    </div>
+                    <div role="tabpanel" class="tab-pane" id="tabs-8">
+
+                        <div class="padded-header">
+                            <h3>Monitoring Settings</h3>
+                        </div>
+                        <div class="form-group">
+                            <label for="monitoring_interval">Monitoring Interval</label>
+                            <div class="row">
+                                <div class="col-md-2">
+                                    <input type="text" class="form-control" data-parsley-type="integer" id="monitoring_interval" name="monitoring_interval" value="${config['monitoring_interval']}" size="5" data-parsley-min="30" data-parsley-trigger="change" data-parsley-errors-container="#monitoring_interval_error" required>
+                                </div>
+                                <div id="monitoring_interval_error" class="alert alert-danger settings-alert" role="alert"></div>
+                            </div>
+                            <p class="help-block">The interval (in seconds) PlexPy will ping your Plex Server. Min 30 seconds, recommended 60 seconds.</p>
+                        </div>
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" class="monitor-settings" id="monitoring_use_websocket" name="monitoring_use_websocket" value="1" ${config['monitoring_use_websocket']}> Use Websocket (requires restart)
+                            </label>
+                            <p class="help-block">Instead of polling the server at regular intervals let the server tell us when something happens. This is currently experimental. Encrypted websocket is not currently supported.</p>
+                        </div>
+
+                        <div class="padded-header">
+                            <h3>History Logging</h3>
+                        </div>
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" id="video_logging_enable" name="video_logging_enable" value="1" ${config['video_logging_enable']}> Log Movies and TV
+                            </label>
+                            <p class="help-block">Keep records of all video items played from your Plex Media Server.</p>
+                        </div>
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" id="music_logging_enable" name="music_logging_enable" value="1" ${config['music_logging_enable']}> Log Music
+                            </label>
+                            <p class="help-block">Keep records of all audio items played from your Plex Media Server. VERY experimental.</p>
+                        </div>
+                        <div class="form-group">
+                            <label for="logging_ignore_interval">Ignore Interval</label>
+                            <div class="row">
+                                <div class="col-md-2">
+                                    <input type="text" class="form-control" data-parsley-type="integer" id="logging_ignore_interval" name="logging_ignore_interval" value="${config['logging_ignore_interval']}" size="5" data-parsley-min="0" data-parsley-trigger="change" data-parsley-errors-container="#logging_ignore_interval_error" required>
+                                </div>
+                                <div id="logging_ignore_interval_error" class="alert alert-danger settings-alert" role="alert"></div>
+                            </div>
+                            <p class="help-block">The interval (in seconds) an item must be in a playing state before logging it. 0 to disable.</p>
+                        </div>
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" id="ip_logging_enable" name="ip_logging_enable" value="1" ${config['ip_logging_enable']}> Enable IP Logging
+                            </label>
+                            <span id="debugLogCheck" style="color: #eb8600; padding-left: 10px;"></span>
+                            <p class="help-block">
+                                Enable this to attempt to log the IP address of the user.
+                            </p>
+                        </div>
+
+                        <div class="padded-header">
+                            <h3>Buffer Warnings</h3>
+                        </div>
+                        <p class="help-block">Note: Buffer warnings only work on certain Plex clients. Android and PlexWeb do not report buffer events accurately or at all.</p>
                         <div class="form-group">
                             <label for="buffer_threshold">Buffer Threshold</label>
                             <div class="row">
@@ -1002,15 +451,9 @@
                                 </div>
                                 <div id="buffer_threshold_error" class="alert alert-danger settings-alert" role="alert"></div>
                             </div>
-                            <p class="help-block">
-                                The number of buffer events required before triggering the first notification.
-                                Buffer events increment on each incoming websocket message if the play state is buffering.
-                                <br>
-                                Note: Buffer warnings only work on certain Plex clients. Some clients can send excessive buffer messages or no messages at all.
-                                This notification may be unreliable and not indicative of a real problem.
-                            </p>
+                            <p class="help-block">How many buffer events should we wait before triggering the first warning. Buffer events increment on each monitor ping if play state is buffering. 0 to disable buffer warnings.</p>
                         </div>
-                        <div class="form-group advanced-setting">
+                        <div class="form-group">
                             <label for="buffer_wait">Buffer Wait</label>
                             <div class="row">
                                 <div class="col-md-2">
@@ -1018,1133 +461,547 @@
                                 </div>
                                 <div id="buffer_wait_error" class="alert alert-danger settings-alert" role="alert"></div>
                             </div>
-                            <p class="help-block">The value (in seconds) Tautulli should wait before triggering the next buffer warning. Set to 0 to always trigger.</p>
-                        </div>
-                        <div class="checkbox advanced-setting">
-                            <label>
-                                <input type="checkbox" name="notify_consecutive" id="notify_consecutive" value="1" ${config['notify_consecutive']}> Allow Playback Stop Notifications Exceeding Watched Percent
-                            </label>
-                            <p class="help-block">
-                                Enable to allow sending of playback stop notifications after the watched percent is exceeded.
-                                Disable to only send playback stop notifications below the watched percent.
-                            </p>
-                        </div>
-                        <div class="checkbox advanced-setting">
-                            <label>
-                                <input type="checkbox" name="notify_concurrent_by_ip" id="notify_concurrent_by_ip" value="1" ${config['notify_concurrent_by_ip']}> User Concurrent Streams Notifications by IP Address
-                            </label>
-                            <p class="help-block">
-                                Enable to only send a concurrent streams notification by a single user from different IP addresses.
-                                Disable to send a concurrent streams notification anytime the concurrent stream threshold is exceeded regardless of IP address.
-                            </p>
-                        </div>
-                        <div class="form-group">
-                            <label for="notify_concurrent_threshold">User Concurrent Stream Threshold</label>
-                            <div class="row">
-                                <div class="col-md-2">
-                                    <input type="text" class="form-control" data-parsley-type="integer" id="notify_concurrent_threshold" name="notify_concurrent_threshold" value="${config['notify_concurrent_threshold']}" data-parsley-min="2" data-parsley-trigger="change" data-parsley-errors-container="#notify_concurrent_threshold_error" required>
-                                </div>
-                                <div id="notify_concurrent_threshold_error" class="alert alert-danger settings-alert" role="alert"></div>
-                            </div>
-                            <p class="help-block">The number of concurrent streams by a single user for Tautulli to trigger a notification. Minimum 2.</p>
-                        </div>
-                        <div class="checkbox advanced-setting">
-                            <label>
-                                <input type="checkbox" name="notify_new_device_initial_only" id="notify_new_device_initial_only" value="1" ${config['notify_new_device_initial_only']}> User New Device Notification First Time Only
-                            </label>
-                            <p class="help-block">
-                                Enable to only send a new device notification the first time a user streams from a new device.
-                                Disable to send a new device notification everytime a user streams from the device until it is recorded in history (i.e. exceeds the ignore interval).
-                            </p>
-                        </div>
-                        <div class="form-group advanced-setting">
-                            <label for="notify_concurrent_threshold">Continued Session Threshold</label>
-                            <div class="row">
-                                <div class="col-md-2">
-                                    <input type="text" class="form-control" data-parsley-type="integer" id="notify_continued_session_threshold" name="notify_continued_session_threshold" value="${config['notify_continued_session_threshold']}" data-parsley-min="0" data-parsley-trigger="change" data-parsley-errors-container="#notify_continued_session_threshold_error" required>
-                                </div>
-                                <div id="notify_continued_session_threshold_error" class="alert alert-danger settings-alert" role="alert"></div>
-                            </div>
-                            <p class="help-block">
-                                The number of seconds between stopping and starting a new stream to be considered as a continued session. Set to 0 to consider all streams as new sessions.
-                                <br>
-                                Note: The threshold is only used by the "Initial Stream" notification parameter to determine if a stream is the first stream of a continuous streaming session.
-                            </p>
-                        </div>
-
-                        <div class="padded-header">
-                            <h3>Recently Added Notifications</h3>
-                        </div>
-
-                        <div class="checkbox">
-                            <label>
-                                <input type="checkbox" name="notify_group_recently_added_parent" id="notify_group_recently_added_parent" value="1" ${config['notify_group_recently_added_parent']}> Group Notifications by Season or Album
-                            </label>
-                            <p class="help-block">
-                                Enable to only send one season or album notification when multiple episodes or tracks are added. Movies, single episodes, and single tracks are unaffected.<br />
-                                Note: An episode/track range can be shown (e.g. 01-12), but all other episode/track metadata will be unavailable.
-                            </p>
-                        </div>
-                        <div class="checkbox">
-                            <label>
-                                <input type="checkbox" name="notify_group_recently_added_grandparent" id="notify_group_recently_added_grandparent" value="1" ${config['notify_group_recently_added_grandparent']}> Group Notifications by TV Show or Artist
-                            </label>
-                            <p class="help-block">
-                                Enable to only send one TV show or artist notification when multiple seasons or albums are added. Movies, single episodes, and single tracks are unaffected.<br />
-                                Note: A season range can be shown (e.g. 1-3), but all other season/episode/album/track metadata will be unavailable.
-                            </p>
-                        </div>
-                        <div class="form-group">
-                            <label for="notify_recently_added_delay">Recently Added Notification Delay</label>
-                            <div class="row">
-                                <div class="col-md-2">
-                                    <input type="text" class="form-control" data-parsley-type="integer" id="notify_recently_added_delay" name="notify_recently_added_delay" value="${config['notify_recently_added_delay']}" size="5" data-parsley-min="60" data-parsley-trigger="change" data-parsley-errors-container="#notify_recently_added_delay_error" required>
-                                </div>
-                                <div id="notify_recently_added_delay_error" class="alert alert-danger settings-alert" role="alert"></div>
-                            </div>
-                            <p class="help-block">Set the delay (in seconds) to wait for consecutive recently added items to group together and to allow metadata to be processed before sending the recently added notification. Minimum 60 seconds, default 300.</p>
-                        </div>
-                        <div class="form-group advanced-setting">
-                            <label>Flush Recently Added</label>
-                            <p class="help-block">
-                                Attempt to fix recently added notifications by flushing out all of the recently added items in the database.<br />
-                                Warning: This will reset all recently added notifications. For emergency use only when recently added notifications are stuck!
-                            </p>
-                            <div class="row">
-                                <div class="col-md-4">
-                                    <div class="btn-group">
-                                        <button class="btn btn-form" type="button" id="delete_recently_added">Flush</button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <!--<div class="checkbox">
-                            <label>
-                                <input type="checkbox" name="notify_recently_added_upgrade" id="notify_recently_added_upgrade" value="1" ${config['notify_recently_added_upgrade']}> Send a Notification for New Versions <span class="settings-warning">[Not working]</span>
-                            </label>
-                            <p class="help-block">
-                                Enable to send another recently added notification when adding a new version of existing media.<br />
-                                Note: If multiple versions are available, Tautulli will assume the higher quality one is newer.
-                            </p>
-                        </div>-->
-
-                        <div class="padded-header">
-                            <h3>Server Notifications</h3>
-                        </div>
-
-                        <div class="form-group">
-                            <label for="notify_server_connection_threshold">Plex Server Down Threshold</label>
-                            <div class="row">
-                                <div class="col-md-2">
-                                    <input type="text" class="form-control" data-parsley-type="integer" id="notify_server_connection_threshold" name="notify_server_connection_threshold" value="${config['notify_server_connection_threshold']}" size="5" data-parsley-min="60" data-parsley-trigger="change" data-parsley-errors-container="#notify_server_connection_threshold_error" required>
-                                </div>
-                                <div id="notify_server_connection_threshold_error" class="alert alert-danger settings-alert" role="alert"></div>
-                            </div>
-                            <p class="help-block">The duration (in seconds) for the Plex server to be down before sending a notification. Minimum 60, default 60.</p>
-                        </div>
-                        <div class="form-group">
-                            <label for="notify_remote_access_threshold">Remote Access Down Threshold</label>
-                            <div class="row">
-                                <div class="col-md-2">
-                                    <input type="text" class="form-control" data-parsley-type="integer" id="notify_remote_access_threshold" name="notify_remote_access_threshold" value="${config['notify_remote_access_threshold']}" size="5" data-parsley-min="60" data-parsley-trigger="change" data-parsley-errors-container="#notify_remote_access_threshold_error" required>
-                                </div>
-                                <div id="notify_remote_access_threshold_error" class="alert alert-danger settings-alert" role="alert"></div>
-                            </div>
-                            <p class="help-block">The duration (in seconds) for Plex remote access to be down before sending a notification. Minimum 60, default 60.</p>
-                        </div>
-
-                        <div class="padded-header">
-                            <h3>Newsletters</h3>
-                        </div>
-
-                        <div class="checkbox">
-                            <label>
-                                <input type="checkbox" id="newsletter_self_hosted" name="newsletter_self_hosted" value="1" ${config['newsletter_self_hosted']}> Self-Hosted Newsletters
-                            </label>
-                            <p class="help-block">Enable to host newsletters on your own domain. This will generate a link to an HTML page where you can view the newsletter.</p>
-                        </div>
-                        <div id="self_host_newsletter_options" style="overflow: hidden; display: ${'block' if config['newsletter_self_hosted'] == 'checked' else 'none'}">
-                            <div class="form-group">
-                                <p class="help-block" id="self_host_newsletter_message">
-                                    Note: The <span class="inline-pre">${http_root}newsletter</span> endpoint on your domain must be publicly accessible from the internet.
-                                </p>
-                                <p class="help-block settings-warning base-url-warning">Warning: Public Tautulli domain not set under <a data-tab-destination="web_interface" data-target="http_base_url">Web Interface</a>.</p>
-                            </div>
-                            <div class="form-group">
-                                <label for="newsletter_auth">Newsletter Authentication</label>
-                                <div class="row">
-                                    <div class="col-md-6">
-                                        <select class="form-control" id="newsletter_auth" name="newsletter_auth">
-                                            <option value="0" ${'selected' if config['newsletter_auth'] == 0 else ''}>Disabled</option>
-                                            <option value="1" ${'selected' if config['newsletter_auth'] == 1 else ''}>Password</option>
-                                            <option value="2" ${'selected' if config['newsletter_auth'] == 2 else ''}>Tautulli Guest Access</option>
-                                        </select>
-                                    </div>
-                                </div>
-                                <p class="help-block">Select the authentication method to use for self-hosted newsletters.</p>
-                                <p class="help-block settings-warning newsletter-guest-access-warning">Warning: Guest Access is not enabled under <a data-tab-destination="web_interface" data-target="allow_guest_access">Web Interface</a>.</p>
-                            </div>
-                            <div class="form-group" id="newsletter_password_option">
-                                <label for="newsletter_password">Newsletter Password</label>
-                                <div class="row">
-                                    <div class="col-md-6">
-                                        <div class="input-group">
-                                            <span class="input-group-btn">
-                                                <button class="btn btn-form reveal-token" type="button"><i class="fa fa-eye-slash"></i></button>
-                                            </span>
-                                            <input type="password" class="form-control" id="newsletter_password" name="newsletter_password" value="${config['newsletter_password']}">
-                                        </div>
-                                    </div>
-                                </div>
-                                <p class="help-block">Enter the password that will be required to view self-hosted newsletters.</p>
-                            </div>
-                        </div>
-
-                        <div class="checkbox advanced-setting">
-                            <label>
-                                <input type="checkbox" id="newsletter_inline_styles" name="newsletter_inline_styles" value="1" ${config['newsletter_inline_styles']}> Use Inline Styles Template
-                            </label>
-                            <p class="help-block">
-                                Enable to use newsletter templates with inline CSS styles. Inline styles render better in email clients, but are larger in size which may cause long newsletters to be clipped.<br>
-                                Note: This setting does not affect custom templates. CSS styles will depend on your own template.
-                            </p>
-                        </div>
-                        <div class="form-group advanced-setting">
-                            <label for="newsletter_custom_dir">Custom Newsletter Templates Folder</label>
-                            <div class="row">
-                                <div class="col-md-7">
-                                    <div class="input-group">
-                                        <input type="text" class="form-control" id="newsletter_custom_dir" name="newsletter_custom_dir" value="${config['newsletter_custom_dir']}">
-                                        <span class="input-group-btn">
-                                            <button class="btn btn-form" type="button" id="newsletter_custom_dir_browse" data-toggle="browse" data-filter=".folderonly" data-target="#newsletter_custom_dir">Browse</button>
-                                        </span>
-                                    </div>
-                                </div>
-                            </div>
-                            <p class="help-block">Optional: Enter the full path to your custom newsletter templates folder. Leave blank for default.</p>
-                        </div>
-                        <div class="form-group advanced-setting">
-                            <label for="newsletter_dir">Newsletter Output Directory</label> ${docker_msg | n}
-                            <div class="row">
-                                <div class="col-md-7">
-                                    <div class="input-group">
-                                        <input type="text" class="form-control" id="newsletter_dir" name="newsletter_dir" value="${config['newsletter_dir']}" ${docker_setting}>
-                                        <span class="input-group-btn">
-                                            <button class="btn btn-form" type="button" id="newsletter_dir_browse" data-toggle="browse" data-filter=".folderonly" data-target="#newsletter_dir" ${docker_setting}>Browse</button>
-                                        </span>
-                                    </div>
-                                </div>
-                            </div>
-                            <p class="help-block">Enter the full path to where newsletter files will be saved.</p>
+                            <p class="help-block">The value (in seconds) PlexPy should wait before triggering the next buffer warning. 0 to always trigger.</p>
                         </div>
 
                         <p><input type="button" class="btn btn-bright save-button" value="Save" data-success="Changes saved successfully"></p>
-
                     </div>
+                    <div role="tabpanel" class="tab-pane" id="tabs-9">
 
-                    <div role="tabpanel" class="tab-pane" id="tabs-notification_agents">
+                        <div class="padded-header">
+                            <h3>Global Notification Toggles</h3>
+                        </div>
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" name="movie_notify_enable" id="movie_notify_enable" value="1" ${config['movie_notify_enable']}> Enable Movie and TV Notifications
+                            </label>
+                        </div>
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" name="music_notify_enable" id="music_notify_enable" value="1" ${config['music_notify_enable']}> Enable Music Notifications
+                            </label>
+                        </div>
+
+                        <div class="padded-header">
+                            <h3>Notification Tuning</h3>
+                        </div>
+
+                        <div class="form-group">
+                            <label for="notify_watched_percent">Watched Percent</label>
+                            <div class="row">
+                                <div class="col-md-2">
+                                    <input type="text" class="form-control" data-parsley-type="integer" id="notify_watched_percent" name="notify_watched_percent" value="${config['notify_watched_percent']}" size="5" data-parsley-range="[50,95]" data-parsley-trigger="change" data-parsley-errors-container="#notify_watched_percent_error" required>
+                                </div>
+                                <div id="notify_watched_percent_error" class="alert alert-danger settings-alert" role="alert"></div>
+                            </div>
+                            <p class="help-block">Set the progress percentage of when a watched notification should be triggered. Minimum 50, Maximum 95.</p>
+                        </div>
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" name="notify_consecutive" id="notify_consecutive" value="1" ${config['notify_consecutive']}> Allow Consecutive Notifications
+                            </label>
+                            <p class="help-block">Disable to prevent consecutive notifications (i.e. both watched &amp; stopped notifications).</p>
+                        </div>
+
+                        <div class="padded-header">
+                            <h3>Custom Notification Messages</h3>
+                        </div>
+                        <p class="help-block">
+                            You can set custom formatted text for each type of notification.
+                            Click <a href="#notify-text-sub-modal" data-toggle="modal">here</a> for a list of available parameters which can be used.
+                        </p>
+                        <p class="help-block">
+                            You can also add tags to exclude certain text depending on the media type. Click
+                            <a href="#notify-text-tags-modal" data-toggle="modal">here</a> to view usage information.
+                        </p>
+                        <br/>
+                        <ul id="accordion" class="accordion list-unstyled">
+                            <li>
+                                <div class="link"><i class="fa fa-play"></i>Playback Start<i class="fa fa-chevron-down"></i></div>
+                                <ul class="submenu">
+                                    <li>
+                                        <div class="form-group">
+                                            <label for="notify_on_start_subject_text">Subject Line</label>
+                                            <input class="form-control" type="text" id="notify_on_start_subject_text" name="notify_on_start_subject_text" value="${config['notify_on_start_subject_text']}" data-parsley-trigger="change" required>
+                                            <p class="help-block">Set a custom subject line.</p>
+                                        </div>
+                                        <div class="form-group">
+                                            <label for="notify_on_start_body_text">Message Body</label>
+                                            <input class="form-control" type="text" id="notify_on_start_body_text" name="notify_on_start_body_text" value="${config['notify_on_start_body_text']}" data-parsley-trigger="change" required>
+                                            <p class="help-block">Set a custom body.</p>
+                                        </div>
+                                    </li>
+                                </ul>
+                            </li>
+                            <li>
+                                <div class="link"><i class="fa fa-stop"></i>Playback Stop<i class="fa fa-chevron-down"></i></div>
+                                <ul class="submenu">
+                                    <li>
+                                        <div class="form-group">
+                                            <label for="notify_on_stop_subject_text">Subject Line</label>
+                                            <input class="form-control" type="text" id="notify_on_stop_subject_text" name="notify_on_stop_subject_text" value="${config['notify_on_stop_subject_text']}" data-parsley-trigger="change" required>
+                                            <p class="help-block">Set a custom subject line.</p>
+                                        </div>
+                                        <div class="form-group">
+                                            <label for="notify_on_stop_body_text">Message Body</label>
+                                            <input class="form-control" type="text" id="notify_on_stop_body_text" name="notify_on_stop_body_text" value="${config['notify_on_stop_body_text']}" data-parsley-trigger="change" required>
+                                            <p class="help-block">Set a custom body.</p>
+                                        </div>
+                                    </li>
+                                </ul>
+                            </li>
+                            <li>
+                                <div class="link"><i class="fa fa-pause"></i>Playback Pause<i class="fa fa-chevron-down"></i></div>
+                                <ul class="submenu">
+                                    <li>
+                                        <div class="form-group">
+                                            <label for="notify_on_pause_subject_text">Subject Line</label>
+                                            <input class="form-control" type="text" id="notify_on_pause_subject_text" name="notify_on_pause_subject_text" value="${config['notify_on_pause_subject_text']}" data-parsley-trigger="change" required>
+                                            <p class="help-block">Set a custom subject line.</p>
+                                        </div>
+                                        <div class="form-group">
+                                            <label for="notify_on_pause_body_text">Message Body</label>
+                                            <input class="form-control" type="text" id="notify_on_pause_body_text" name="notify_on_pause_body_text" value="${config['notify_on_pause_body_text']}" data-parsley-trigger="change" required>
+                                            <p class="help-block">Set a custom body.</p>
+                                        </div>
+                                    </li>
+                                </ul>
+                            </li>
+                            <li>
+                                <div class="link"><i class="fa fa-play"></i>Playback Resume<i class="fa fa-chevron-down"></i></div>
+                                <ul class="submenu">
+                                    <li>
+                                        <div class="form-group">
+                                            <label for="notify_on_resume_subject_text">Subject Line</label>
+                                            <input class="form-control" type="text" id="notify_on_resume_subject_text" name="notify_on_resume_subject_text" value="${config['notify_on_resume_subject_text']}" data-parsley-trigger="change" required>
+                                            <p class="help-block">Set a custom subject line.</p>
+                                        </div>
+                                        <div class="form-group">
+                                            <label for="notify_on_resume_body_text">Message Body</label>
+                                            <input class="form-control" type="text" id="notify_on_resume_body_text" name="notify_on_resume_body_text" value="${config['notify_on_resume_body_text']}" data-parsley-trigger="change" required>
+                                            <p class="help-block">Set a custom body.</p>
+                                        </div>
+                                    </li>
+                                </ul>
+                            </li>
+                            <li>
+                                <div class="link"><i class="fa fa-eye"></i>Watched<i class="fa fa-chevron-down"></i></div>
+                                <ul class="submenu">
+                                    <li>
+                                        <div class="form-group">
+                                            <label for="notify_on_watched_subject_text">Subject Line</label>
+                                            <input class="form-control" type="text" id="notify_on_watched_subject_text" name="notify_on_watched_subject_text" value="${config['notify_on_watched_subject_text']}" data-parsley-trigger="change" required>
+                                            <p class="help-block">Set a custom subject line.</p>
+                                        </div>
+                                        <div class="form-group">
+                                            <label for="notify_on_watched_body_text">Message Body</label>
+                                            <input class="form-control" type="text" id="notify_on_watched_body_text" name="notify_on_watched_body_text" value="${config['notify_on_watched_body_text']}" data-parsley-trigger="change" required>
+                                            <p class="help-block">Set a custom body.</p>
+                                        </div>
+                                    </li>
+                                </ul>
+                            </li>
+                            <li>
+                                <div class="link"><i class="fa fa-spinner"></i>Buffer Warnings<i class="fa fa-chevron-down"></i></div>
+                                <ul class="submenu">
+                                    <li>
+                                        <div class="form-group">
+                                            <label for="notify_on_buffer_subject_text">Subject Line</label>
+                                            <input class="form-control" type="text" id="notify_on_buffer_subject_text" name="notify_on_buffer_subject_text" value="${config['notify_on_buffer_subject_text']}" data-parsley-trigger="change" required>
+                                            <p class="help-block">Set a custom subject line.</p>
+                                        </div>
+                                        <div class="form-group">
+                                            <label for="notify_on_buffer_body_text">Message Body</label>
+                                            <input class="form-control" type="text" id="notify_on_buffer_body_text" name="notify_on_buffer_body_text" value="${config['notify_on_buffer_body_text']}" data-parsley-trigger="change" required>
+                                            <p class="help-block">Set a custom body.</p>
+                                        </div>
+                                    </li>
+                                </ul>
+                            </li>
+                        </ul>
+
+                        <p><input type="button" class="btn btn-bright save-button" value="Save" data-success="Changes saved successfully"></p>
+                    </div>
+                    <div role="tabpanel" class="tab-pane" id="tabs-10">
 
                         <div class="padded-header">
                             <h3>Notification Agents</h3>
                         </div>
-
                         <p class="help-block">
-                            Add a new notification agent, or configure an existing notification agent by clicking on the item below.
-                        </p>
-                        <p class="help-block">
-                            Please see the <a href="${anon_url('https://github.com/%s/%s/wiki/Notification-Agents-Guide' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank" rel="noreferrer">Notification Agents Guide</a> for instructions on setting up each notification agent.
-                        </p>
-                        <br />
-                        <div id="plexpy-notifiers-table">
-                            <div class='text-muted'><i class="fa fa-refresh fa-spin"></i> Loading notification agents...</div>
-                            <br>
-                        </div>
-
-                    </div>
-
-                    <div role="tabpanel" class="tab-pane" id="tabs-newsletter_agents">
-
-                        <div class="padded-header">
-                            <h3>Newsletter Agents</h3>
-                        </div>
-
-                        <p class="help-block">
-                            Add a new newsletter agent, or configure an existing newsletter agent by clicking on the item below.
-                        </p>
-                        <p class="help-block settings-warning" id="newsletter_upload_warning">
-                            Warning: The <a data-tab-destination="3rd_party_apis" data-target="notify_upload_posters">Image Hosting</a> setting must be enabled for images to display on the newsletter.</span>
+                            Toggle the desired notification options by clicking the bell icon and configure it by clicking the settings icon to the right.
                         </p>
                         <br/>
-                        <div id="plexpy-newsletters-table">
-                            <div class='text-muted'><i class="fa fa-refresh fa-spin"></i> Loading newsletter agents...</div>
-                            <br>
-                        </div>
-
-                    </div>
-
-                    <div role="tabpanel" class="tab-pane" id="tabs-3rd_party_apis">
-
-                        <div class="padded-header">
-                            <h3>Image Hosting</h3>
-                        </div>
-
-                        <p class="help-block">Image hosting is used to provide posters and artwork for some notification agents and newsletters.</p>
-
-                        <div class="form-group">
-                            <label for="notify_upload_posters">Image Host</label>
-                            <div class="row">
-                                <div class="col-md-6">
-                                    <div class="${'input-group' if config['notify_upload_posters'] in (1, 3) else ''}">
-                                        <select class="form-control" id="notify_upload_posters" name="notify_upload_posters">
-                                            <option value="0" ${'selected' if config['notify_upload_posters'] == 0 else ''}>Disabled</option>
-                                            <option value="1" ${'selected' if config['notify_upload_posters'] == 1 else ''}>Imgur</option>
-                                            <option value="3" ${'selected' if config['notify_upload_posters'] == 3 else ''}>Cloudinary</option>
-                                            <option value="2" ${'selected' if config['notify_upload_posters'] == 2 else ''}>Self-hosted on public domain</option>
-                                        </select>
-                                        % if config['notify_upload_posters'] in (1, 3):
-                                        <span class="input-group-btn" id="delete_all_uploads_container">
-                                            <button class="btn btn-form" type="button" id="delete_all_uploads">Delete All Uploads</button>
-                                        </span>
-                                        % endif
-                                    </div>
-                                </div>
-                            </div>
-                            <p class="help-block">Select where to host Plex images for notifications and newsletters.</p>
-                        </div>
-                        <div id="imgur_upload_options" style="overflow: hidden; display: ${'none' if config['notify_upload_posters'] != 1 else 'block'}">
-                            <div class="form-group">
-                                <p class="help-block">
-                                    Please see the <a href="${anon_url('https://github.com/%s/%s/wiki/3rd-Party-APIs-Guide' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank" rel="noreferrer">3rd Party APIs Guide</a> for instructions on setting up Imgur.<br>
-                                    Warning: Imgur uploads are rate-limited and newsletters may exceed the limit. Please use Cloudinary for newsletters instead.
-                                </p>
-                            </div>
-                            <div class="form-group">
-                                <label for="imgur_client_id">Imgur Client ID</label>
-                                <div class="row">
-                                    <div class="col-md-6">
-                                        <div class="input-group">
-                                            <span class="input-group-btn">
-                                                <button class="btn btn-form reveal-token" type="button"><i class="fa fa-eye-slash"></i></button>
-                                            </span>
-                                            <input type="password" class="form-control" id="imgur_client_id" name="imgur_client_id" value="${config['imgur_client_id']}" data-parsley-trigger="change">
-                                        </div>
-                                    </div>
-                                </div>
-                                <p class="help-block">Enter your Imgur API Client ID.</p>
-                            </div>
-                        </div>
-                        <div id="self_host_image_options" style="overflow: hidden; display: ${'none' if config['notify_upload_posters'] != 2 else 'block'}">
-                            <div class="form-group">
-                                <p class="help-block" id="self_host_image_message">Note: The <span class="inline-pre">${http_root}image</span> endpoint on your domain must be publicly accessible from the internet.</p>
-                                <p class="help-block settings-warning base-url-warning">Warning: Public Tautulli domain not set under <a data-tab-destination="web_interface" data-target="http_base_url">Web Interface</a>.</p>
-                            </div>
-                        </div>
-                        <div id="cloudinary_upload_options" style="overflow: hidden; display: ${'none' if config['notify_upload_posters'] != 3 else 'block'}">
-                            <div class="form-group">
-                                <p class="help-block">
-                                    Please see the <a href="${anon_url('https://github.com/%s/%s/wiki/3rd-Party-APIs-Guide' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank" rel="noreferrer">3rd Party APIs Guide</a> for instructions on setting up Cloudinary.
-                                </p>
-                            </div>
-                            <div class="form-group">
-                                <label for="cloudinary_cloud_name">Cloudinary Cloud Name</label>
-                                <div class="row">
-                                    <div class="col-md-6">
-                                        <div class="input-group">
-                                            <span class="input-group-btn">
-                                                <button class="btn btn-form reveal-token" type="button"><i class="fa fa-eye-slash"></i></button>
-                                            </span>
-                                            <input type="password" class="form-control" id="cloudinary_cloud_name" name="cloudinary_cloud_name" value="${config['cloudinary_cloud_name']}" data-parsley-trigger="change">
-                                        </div>
-                                    </div>
-                                </div>
-                                <p class="help-block">
-                                    Enter your Cloudinary Cloud Name.
-                                </p>
-                            </div>
-                            <div class="form-group">
-                                <label for="cloudinary_api_key">Cloudinary API Key</label>
-                                <div class="row">
-                                    <div class="col-md-6">
-                                        <div class="input-group">
-                                            <span class="input-group-btn">
-                                                <button class="btn btn-form reveal-token" type="button"><i class="fa fa-eye-slash"></i></button>
-                                            </span>
-                                            <input type="password" class="form-control" id="cloudinary_api_key" name="cloudinary_api_key" value="${config['cloudinary_api_key']}" data-parsley-trigger="change">
-                                        </div>
-                                    </div>
-                                </div>
-                                <p class="help-block">
-                                    Enter your Cloudinary API Key.
-                                </p>
-                            </div>
-                            <div class="form-group">
-                                <label for="cloudinary_api_secret">Cloudinary API Secret</label>
-                                <div class="row">
-                                    <div class="col-md-6">
-                                        <div class="input-group">
-                                            <span class="input-group-btn">
-                                                <button class="btn btn-form reveal-token" type="button"><i class="fa fa-eye-slash"></i></button>
-                                            </span>
-                                            <input type="password" class="form-control" id="cloudinary_api_secret" name="cloudinary_api_secret" value="${config['cloudinary_api_secret']}" data-parsley-trigger="change">
-                                        </div>
-                                    </div>
-                                </div>
-                                <p class="help-block">
-                                    Enter your Cloudinary API Secret.
-                                </p>
-                            </div>
-                        </div>
-
-                        <div class="padded-header">
-                            <h3>Metadata Lookups</h3>
-                        </div>
-
-                        <p class="help-block">Metadata lookups are used to provide additional links for notifications when available.</p>
-
-                        <div class="checkbox">
-                            <label>
-                                <input type="checkbox" name="themoviedb_lookup" id="themoviedb_lookup" value="1" ${config['themoviedb_lookup']}> Lookup TheMovieDB Links
-                            </label>
-                            <p class="help-block">Enable to lookup links to TheMovieDB (and IMDb if needed) for movies and TV shows when available.</p>
-                        </div>
-                        <div class="checkbox">
-                            <label>
-                                <input type="checkbox" name="tvmaze_lookup" id="tvmaze_lookup" value="1" ${config['tvmaze_lookup']}> Lookup TVmaze Links
-                            </label>
-                            <p class="help-block">Enable to lookup links to TVmaze (and IMDb if needed) for TV shows when available.</p>
-                        </div>
-                        <div class="checkbox">
-                            <label>
-                                <input type="checkbox" name="musicbrainz_lookup" id="musicbrainz_lookup" value="1" ${config['musicbrainz_lookup']}> Lookup MusicBrainz Links
-                            </label>
-                            <p class="help-block">Enable to lookup links to MusicBrainz for music when available.</p>
-                        </div>
-                        <div class="form-group">
-                            <label for="delete_lookup_info">Delete Lookup Info</label>
-                            <p class="help-block">Delete all cached metadata lookup info in Tautulli.</p>
-                            <div class="row">
-                                <div class="col-md-9">
-                                    <div class="btn-group">
-                                        <button class="btn btn-form delete_all_lookups" type="button" data-service="themoviedb">TheMovieDB</button>
-                                        <button class="btn btn-form delete_all_lookups" type="button" data-service="tvmaze">TVmaze</button>
-                                        <button class="btn btn-form delete_all_lookups" type="button" data-service="musicbrainz">MusicBrainz</button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <p><input type="button" class="btn btn-bright save-button" value="Save" data-success="Changes saved successfully"></p>
-
-                    </div>
-
-                    <div role="tabpanel" class="tab-pane" id="tabs-import_backups">
-
-                        <div class="padded-header">
-                            <h3>Import</h3>
-                        </div>
-
-                        <div class="form-group">
-                            <label for="database_import">Database Import</label>
-                            <p class="help-block">Click a button below to import an existing database from the selected app.</p>
-                            <div class="row">
-                                <div class="col-md-9">
-                                    <div class="btn-group">
-                                        <button class="btn btn-form toggle-app-import-modal" type="button" data-target="#app-import-modal" data-toggle="modal" data-app="tautulli">Tautulli</button>
-                                        <button class="btn btn-form toggle-app-import-modal" type="button" data-target="#app-import-modal" data-toggle="modal" data-app="plexwatch">PlexWatch</button>
-                                        <button class="btn btn-form toggle-app-import-modal" type="button" data-target="#app-import-modal" data-toggle="modal" data-app="plexivity">Plexivity</button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="config_import">Configuration Import</label>
-                            <p class="help-block">Click the button below to import a previous Tautulli configuration.</p>
-                            <div class="row">
-                                <div class="col-md-9">
-                                    <div class="btn-group">
-                                        <button class="btn btn-form toggle-config-import-modal" type="button" data-target="#config-import-modal" data-toggle="modal">Tautulli</button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="padded-header">
-                            <h3>Backup</h3>
-                        </div>
-
-                        <div class="form-group">
-                            <label for="backup_interval">Backup Interval</label>
-                            <div class="row">
-                                <div class="col-md-2">
-                                    <input type="text" class="form-control" data-parsley-type="integer" id="backup_interval" name="backup_interval" value="${config['backup_interval']}" size="5" data-parsley-range="[1,24]" data-parsley-trigger="change" data-parsley-errors-container="#backup_interval_error" required>
-                                </div>
-                                <div id="backup_interval_error" class="alert alert-danger settings-alert" role="alert"></div>
-                            </div>
-                            <p class="help-block">The interval (in hours) Tautulli will backup the database and configuration file. Minimum 1, maximum 24, default 6.</p>
-                        </div>
-                        <div class="form-group">
-                            <label for="backup_interval">Backup Days</label>
-                            <div class="row">
-                                <div class="col-md-2">
-                                    <input type="text" class="form-control" data-parsley-type="integer" id="backup_days" name="backup_days" value="${config['backup_days']}" size="5" data-parsley-min="1" data-parsley-trigger="change" data-parsley-errors-container="#backup_days_error" required>
-                                </div>
-                                <div id="backup_days_error" class="alert alert-danger settings-alert" role="alert"></div>
-                            </div>
-                            <p class="help-block">
-                                The number of days to keep scheduled backups. Minimum 1, default 3.<br />
-                                Note: Manual backups are not removed automatically.
-                            </p>
-                        </div>
-
-                        <div class="padded-header">
-                            <h3>Directories</h3>
-                        </div>
-
-                        <div class="form-group">
-                            <label for="log_dir">Log Directory</label> ${docker_msg | n}
-                            <div class="row">
-                                <div class="col-md-7">
-                                    <div class="input-group">
-                                        <input type="text" class="form-control directory-settings" id="log_dir" name="log_dir" value="${config['log_dir']}" ${docker_setting}>
-                                        <span class="input-group-btn">
-                                            <button class="btn btn-form" type="button" id="log_dir_browse" data-toggle="browse" data-filter=".folderonly" data-target="#log_dir" ${docker_setting}>Browse</button>
-                                        </span>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="backup_dir">Backup Directory</label> ${docker_msg | n}
-                            <div class="row">
-                                <div class="col-md-7">
-                                    <div class="input-group">
-                                        <input type="text" class="form-control directory-settings" id="backup_dir" name="backup_dir" value="${config['backup_dir']}" ${docker_setting}>
-                                        <span class="input-group-btn">
-                                            <button class="btn btn-form" type="button" id="backup_dir_browse" data-toggle="browse" data-filter=".folderonly" data-target="#backup_dir" ${docker_setting}>Browse</button>
-                                        </span>
-                                    </div>
-                                    <div class="btn-group">
-                                        <button class="btn btn-form" type="button" id="backup_config">Backup Config</button>
-                                        <button class="btn btn-form" type="button" id="backup_database">Backup Database</button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="cache_dir">Cache Directory</label> ${docker_msg | n}
-                            <div class="row">
-                                <div class="col-md-7">
-                                    <div class="input-group">
-                                        <input type="text" class="form-control directory-settings" id="cache_dir" name="cache_dir" value="${config['cache_dir']}" ${docker_setting}>
-                                        <span class="input-group-btn">
-                                            <button class="btn btn-form" type="button" id="cache_dir_browse" data-toggle="browse" data-filter=".folderonly" data-target="#cache_dir" ${docker_setting}>Browse</button>
-                                        </span>
-                                    </div>
-                                    <div class="btn-group">
-                                        <button class="btn btn-form" type="button" id="clear_cache">Clear All Cache</button>
-                                        <button class="btn btn-form" type="button" id="clear_image_cache">Clear Image Cache</button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <label for="export_dir">Export Directory</label> ${docker_msg | n}
-                            <div class="row">
-                                <div class="col-md-7">
-                                    <div class="input-group">
-                                        <input type="text" class="form-control directory-settings" id="export_dir" name="export_dir" value="${config['export_dir']}" ${docker_setting}>
-                                        <span class="input-group-btn">
-                                            <button class="btn btn-form" type="button" id="export_dir_browse" data-toggle="browse" data-filter=".folderonly" data-target="#export_dir" ${docker_setting}>Browse</button>
-                                        </span>
-                                    </div>
-                                    <div class="btn-group">
-                                        <button class="btn btn-form" type="button" id="clear_exports">Clear All Exports</button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <p><input type="button" class="btn btn-bright save-button" value="Save" data-success="Changes saved successfully"></p>
-
-                    </div>
-
-                    <div role="tabpanel" class="tab-pane" id="tabs-remote_app">
-
-                        <div class="padded-header">
-                            <h3>Tautulli Remote App</h3>
-                        </div>
-
-                        <div class="form-group">
-                            <label>Get the App</label>
-                            <p class="help-block">
-                                Get the Tautulli Remote app on
-                                <a href="${anon_url('https://play.google.com/store/apps/details?id=com.tautulli.tautulli_remote')}" target="_blank" rel="noreferrer">Google Play</a>
-                                or the
-                                <a href="${anon_url('https://apps.apple.com/us/app/tautulli-remote/id1570909086?platform=iphone')}" target="_blank" rel="noreferrer">App Store</a>
-                                to access Tautulli from your mobile device.
-                                <br />
-                            </p>
-                            <p class="help-block">
-                                <span class="app-badge">
-                                    <a href="${anon_url('https://play.google.com/store/apps/details?id=com.tautulli.tautulli_remote')}" target="_blank" rel="noreferrer"><img alt="Get it on Google Play" src="images/google-play-badge.svg" /></a>
+                        <ul class="stacked-configs list-unstyled">
+                            % for agent in available_notification_agents:
+                            <li>
+                                <span>
+                                    % if agent['on_play'] or agent['on_stop'] or agent['on_pause'] or agent['on_resume'] or agent['on_buffer'] or agent['on_watched']:
+                                    <a href="javascript:void(0)" data-target="#notification-triggers-modal" data-id="${agent['id']}" class="toggle-notification-triggers-modal toggle-left active" data-toggle="modal"><i class="fa fa-lg fa-bell"></i></a>
+                                    % else:
+                                    <a href="javascript:void(0)" data-target="#notification-triggers-modal" data-id="${agent['id']}" class="toggle-notification-triggers-modal toggle-left" data-toggle="modal"><i class="fa fa-lg fa-bell"></i></a>
+                                    % endif
+                                    ${agent['name']}
+                                    % if agent['has_config']:
+                                    <a href="javascript:void(0)" rel="tooltip" data-target="#notification-config-modal" data-placement="top" title data-title="Open configuration" data-id="${agent['id']}" class="toggle-notification-config-modal toggle-right" data-toggle="modal"><i class="fa fa-lg fa-cog"></i></a>
+                                    % endif
                                 </span>
-                                <span class="app-badge">
-                                    <a href="${anon_url('https://apps.apple.com/us/app/tautulli-remote/id1570909086?platform=iphone')}" target="_blank" rel="noreferrer"><img alt="Download on the App Store" src="images/app-store-badge.svg" /></a>
-                                </span>
-                                <span class="app-badge">
-                                    <small>Google Play and the Google Play logo are trademarks of Google LLC.</small>
-                                    <br>
-                                    <small>Apple and the Apple Logo are trademarks of Apple Inc.</small>
-                                </span>
-                            </p>
-                            <br style="clear: both">
-                        </div>
-                        <div class="form-group">
-                            <label>Registered Devices</label>
-                            <p class="help-block">Register a new device using a QR code, or configure an existing device by clicking on the item below.</p>
-                            <p id="app_api_msg" style="color: #eb8600;">Warning: The API must be enabled under <a data-tab-destination="web_interface" data-target="api_enabled">Web Interface</a> to use the app.</p>
-                            <br />
-                            <div class="row">
-                                <div id="plexpy-mobile-devices-table" class="col-md-12">
-                                    <div class='text-muted'><i class="fa fa-refresh fa-spin"></i> Loading registered devices...</div>
-                                    <br>
-                                </div>
-                            </div>
-                        </div>
+                            </li>
+                            % endfor
+                        </ul>
 
                     </div>
                 </div>
             </form>
         </div>
     </div>
-</div>
-<div id="token_error_bar" style="display: none;">
-    <i class="fa fa-exclamation-triangle"></i> Your Plex.tv token is no longer valid.<br>
-    Please <a data-tab-destination="plex_media_server" data-target="sign-in-plex">fetch a new token</a>.
-</div>
-</%def>
 
-<%def name="modalIncludes()">
-<div id="queue-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="queue-modal"></div>
-<div id="guidelines-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="guidelines-modal">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title">Guidelines</h4>
-            </div>
-            <div class="modal-body">
-                <div style="text-align: center; margin-top: 20px; margin-bottom: 20px;">
-                    <strong>Please read the <a href="${anon_url('https://github.com/%s/%s/blob/master/README.md' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank" rel="noreferrer">guidelines</a>
-                        in the README document <br />before submitting a new <span id="guidelines-type"></span>!</strong>
-                    <br /><br />
-                    Your post may be removed for failure to follow the guidelines.
+    <div id="dateTimeOptionsModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="dateTimeOptionsModal">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                        <i class="fa fa-remove"></i>
+                    </button>
+                    <h4 class="modal-title">Date &amp; Time Format Options</h4>
                 </div>
-            </div>
-            <div class="modal-footer">
-                <a href="#" target="_blank" rel="noreferrer" id="guidelines-continue" class="btn btn-bright">Continue</a>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div id="support-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="support-modal">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title">Support</h4>
-            </div>
-            <div class="modal-body">
-                <div style="text-align: center; margin-top: 20px; margin-bottom: 20px;">
-                    <strong>Please read the <a href="${anon_url('https://github.com/%s/%s/wiki/Frequently-Asked-Questions' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO))}" target="_blank" rel="noreferrer">FAQ</a>
-                        before asking for help!</strong>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <a href="#" target="_blank" rel="noreferrer" id="support-continue" class="btn btn-bright">Continue</a>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div id="dateTimeOptionsModal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="dateTimeOptionsModal">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-                    <i class="fa fa-remove"></i>
-                </button>
-                <h4 class="modal-title">Date &amp; Time Format Options</h4>
-            </div>
-            <div class="modal-body">
-                % for category in common.DATE_TIME_FORMATS:
-                <table class="notification-params time-options">
-                    <thead>
-                        <tr>
-                            <th colspan="3">
-                                ${category['category']}
-                            </th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        % for parameter in category['parameters']:
-                        <tr>
-                            <td><strong>${parameter['value']}</strong></td>
-                            <td>${parameter['description']}</td>
-                            <td>${parameter['example']}</td>
-                        </tr>
-                        % endfor
-                    </tbody>
-                </table>
-                % endfor
-            </div>
-            <div class="modal-footer"></div>
-        </div>
-    </div>
-</div>
-<div id="app-import-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="app-import-modal"></div>
-<div id="config-import-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="config-import-modal"></div>
-<div id="add-notifier-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="add-notifier-modal">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title">Add a Notification Agent</h4>
-            </div>
-            <div class="modal-body">
-                <div class="container-fluid">
-                    <div class="row">
-                        <div class="col-md-12">
-                            <ul class="stacked-configs list-unstyled">
-                                % for agent in sorted(available_notification_agents, key=lambda k: k['label'].lower()):
-                                <li class="new-notification-agent pointer" data-id="${agent['id']}">
-                                    <span>${agent['label']}</span>
-                                </li>
-                                % endfor
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <input type="button" class="btn btn-bright" data-dismiss="modal" value="Cancel">
-            </div>
-        </div>
-    </div>
-</div>
-<div id="add-newsletter-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="add-newsletter-modal">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title">Add a Newsletter Agent</h4>
-            </div>
-            <div class="modal-body">
-                <div class="container-fluid">
-                    <div class="row">
-                        <div class="col-md-12">
-                            <ul class="stacked-configs list-unstyled">
-                                % for agent in available_newsletter_agents:
-                                <li class="new-newsletter-agent pointer" data-id="${agent['id']}">
-                                    <span>${agent['label']}</span>
-                                </li>
-                                % endfor
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <input type="button" class="btn btn-bright" data-dismiss="modal" value="Cancel">
-            </div>
-        </div>
-    </div>
-</div>
-<div id="notifier-config-modal" class="modal fade wide" tabindex="-1" role="dialog" aria-labelledby="notifier-config-modal"></div>
-<div id="newsletter-config-modal" class="modal fade wide" tabindex="-1" role="dialog" aria-labelledby="newsletter-config-modal"></div>
-<div id="notify-text-sub-modal" class="modal fade wide" tabindex="-1" role="dialog" aria-labelledby="notify-text-sub-modal">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-                    <i class="fa fa-remove"></i>
-                </button>
-                <h4 class="modal-title">Notification Parameters</h4>
-            </div>
-            <div class="modal-body">
-                <div>
-                    <p class="help-block">
-                        If the value for a selected parameter cannot be provided, it will display as blank.
-                    </p>
-                    % for category in common.NOTIFICATION_PARAMETERS:
-                    <table class="notification-params">
-                        <thead>
-                            <tr>
-                                <th colspan="2">
-                                    ${category['category']}
-                                </th>
-                            </tr>
-                        </thead>
+                <div class="modal-body">
+                    <table>
                         <tbody>
-                            % for parameter in category['parameters']:
-                            <tr>
-                                <td><strong>{${parameter['value']}}</strong></td>
-                                <td>
-                                    ${parameter['description']}
-                                    % if parameter.get('example'):
-                                    <span class="small-muted">(${parameter['example']})</span>
-                                    % endif
-                                    % if parameter.get('help_text'):
-                                    <p class="small-muted">(${parameter['help_text']})</p>
-                                    % endif
-                                </td>
-                            </tr>
-                            % endfor
+                        <tr>
+                            <td align="center" colspan="3"><h5>Day</h5></td>
+                        </tr>
+                        <tr>
+                            <td width="100"><strong>DD</strong></td>
+                            <td width="300">Numeric, with leading zeros</td>
+                            <td>01 to 31</td>
+                        </tr>
+                        <tr>
+                            <td><strong>D</strong></td>
+                            <td>Numeric, without leading zeros</td>
+                            <td>1 to 31</td>
+                        </tr>
+                        <tr>
+                            <td><strong>Do</strong></td>
+                            <td>The English suffix for the day of the month</td>
+                            <td>st, nd or th in the 1st, 2nd or 15th.</td>
+                        </tr>
+
+                        <tr>
+                            <td align="center" colspan="3"><h5>Month</h5></td>
+                        </tr>
+                        <tr>
+                            <td><strong>MM</strong></td>
+                            <td>Numeric, with leading zeros</td>
+                            <td>01 to 31</td>
+                        </tr>
+                        <tr>
+                            <td><strong>M</strong></td>
+                            <td>Numeric, without leading zeros</td>
+                            <td>1 to 31</td>
+                        </tr>
+                        <tr>
+                            <td><strong>MMMM</strong></td>
+                            <td>Textual full</td>
+                            <td>January to December</td>
+                        </tr>
+                        <tr>
+                            <td><strong>MMM</strong></td>
+                            <td>Textual three letters</td>
+                            <td>Jan to Dec</td>
+                        </tr>
+
+                        <tr>
+                            <td align="center" colspan="3"><h5>Year</h5></td>
+                        </tr>
+                        <tr>
+                            <td><strong>YYYY</strong></td>
+                            <td>Numeric, 4 digits</td>
+                            <td>Eg., 1999, 2003</td>
+                        </tr>
+                        <tr>
+                            <td><strong>YY</strong></td>
+                            <td>Numeric, 2 digits</td>
+                            <td>Eg., 99, 03</td>
+                        </tr>
+
+                        <tr>
+                            <td align="center" colspan="3"><h5>Time</h5></td>
+                        </tr>
+                        <tr>
+                            <td><strong>a</strong></td>
+                            <td width="300">am/pm Lowercase</td>
+                            <td>am, pm</td>
+                        </tr>
+                        <tr>
+                            <td><strong>A</strong></td>
+                            <td>AM/PM Uppercase</td>
+                            <td>AM, PM</td>
+                        </tr>
+                        <tr>
+                            <td><strong>h</strong></td>
+                            <td>Hour, 12-hour, without leading zeros</td>
+                            <td>1-12</td>
+                        </tr>
+                        <tr>
+                            <td><strong>hh</strong></td>
+                            <td>Hour, 12-hour, with leading zeros</td>
+                            <td>01-12</td>
+                        </tr>
+                        <tr>
+                            <td><strong>H</strong></td>
+                            <td>Hour, 24-hour, without leading zeros</td>
+                            <td>0-23</td>
+                        </tr>
+                        <tr>
+                            <td><strong>HH</strong></td>
+                            <td>Hour, 24-hour, with leading zeros</td>
+                            <td>00-23</td>
+                        </tr>
+                        <tr>
+                            <td><strong>mm</strong></td>
+                            <td>Minutes, with leading zeros</td>
+                            <td>00-59</td>
+                        </tr>
+                        <tr>
+                            <td><strong>ss</strong></td>
+                            <td>Seconds, with leading zeros</td>
+                            <td>00-59</td>
+                        </tr>
+                        <tr>
+                            <td><strong>zz</strong></td>
+                            <td>Timezone abbreviation</td>
+                            <td>Eg., EST, MDT ...</td>
+                        </tr>
                         </tbody>
                     </table>
-                    % endfor
                 </div>
+                <div class="modal-footer"></div>
             </div>
-            <div class="modal-footer"></div>
         </div>
     </div>
-</div>
-<div id="notify-text-tags-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="notify-text-tags-modal">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title">Notification Exclusion Tags</h4>
-            </div>
-            <div class="modal-body">
-                <div>
-                    <div style="padding-bottom: 10px;">
-                        <p class="help-block">
-                            Note: Tags separate the <em>media type</em> that triggered the notifications (i.e. a complete show added to Plex vs. a single episode added to Plex).
-                            They <em>do not</em> separate the notification parameters (i.e. <span class="inline-pre">{show_name}</span> vs. <span class="inline-pre">{episode_name}</span>.
-                        </p>
-                        <p class="help-block">
-                            Note: Nesting tags inside each other is not supported.
-                        </p>
-                    </div>
-                    <div>
-                        <h4>Movie Tag</h4>
-                    </div>
-                    <div style="padding-bottom: 10px;">
-                        <p class="help-block">All text inside <span class="inline-pre">&lt;movie&gt;&lt;/movie&gt;</span> tags will only be sent when the media type is movie.</p>
-                        <p><strong style="color: #fff;">Example:</strong></p>
-                        <pre>{title}&lt;movie&gt;({year})&lt;/movie&gt; was recently added to Plex</pre>
-                    </div>
-                    <div>
-                        <h4>Show / Season / Episode Tags</h4>
-                    </div>
-                    <div style="padding-bottom: 10px;">
-                        <p class="help-block">
-                            All text inside <span class="inline-pre">&lt;show&gt;&lt;/show&gt;</span>/<span class="inline-pre">&lt;season&gt;&lt;/season&gt;</span>/<span class="inline-pre">&lt;episode&gt;&lt;/episode&gt;</span>
-                            tags will only be sent when the media type is show, season, or episode, respectively.
-                        </p>
-                        <p><strong style="color: #fff;">Example:</strong></p>
-                        <pre>{show_name}&lt;season&gt; - Season {season_num}&lt;/season&gt;&lt;episode&gt; - S{season_num}E{episode_num} - {episode_name}&lt;/episode&gt; was recently added to Plex.</pre>
-                    </div>
-                    <div>
-                        <h4>Artist / Album / Track Tag</h4>
-                    </div>
-                    <div>
-                        <p class="help-block">
-                            All text inside <span class="inline-pre">&lt;artist&gt;&lt;/artist&gt;</span>/<span class="inline-pre">&lt;album&gt;&lt;/album&gt;</span>/<span class="inline-pre">&lt;track&gt;&lt;/track&gt;</span>
-                            tags will only be sent when the media type is artist, album, or track, respectively.
-                        </p>
-                        <p><strong style="color: #fff;">Example:</strong></p>
-                        <pre>{artist_name}&lt;album&gt; - {album_name}&lt;/album&gt;&lt;track&gt; - {album_name} - {track_name}&lt;/track&gt; was recently added to Plex.</pre>
-                    </div>
+    <div id="pms-auth-modal" class="modal fade" tabindex="-1" role="dialog"
+         aria-labelledby="ip-info-modal">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i
+                            class="fa fa-remove"></i></button>
+                    <h4 class="modal-title">Fetch Plex.tv Token</h4>
                 </div>
-            </div>
-            <div class="modal-footer">
-            </div>
-        </div>
-    </div>
-</div>
-<div id="notify-text-modifiers-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="notify-text-modifiers-modal">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title">Notification Text Modifiers</h4>
-            </div>
-            <div class="modal-body">
-                <div>
-                    <div>
-                        <h4>Case Modifiers</h4>
-                    </div>
-                    <div>
-                        <p class="help-block">Notification parameters with the <span class="inline-pre">!u</span> modifier will be converted to uppercase.</p>
-                        <p><strong style="color: #fff;">Example:</strong></p>
-                        <pre>{video_codec}   --> hevc
-{video_codec!u} --> HEVC</pre>
-                    </div>
-                    <div>
-                        <p class="help-block">Notification parameters with the <span class="inline-pre">!l</span> modifier will be converted to lowercase.</p>
-                        <p><strong style="color: #fff;">Example:</strong></p>
-                        <pre>{content_rating}   --> TV-PG
-{content_rating!l} --> tv-pg</pre>
-                    </div>
-                    <div style="padding-bottom: 10px;">
-                        <p class="help-block">Notification parameters with the <span class="inline-pre">!c</span> modifier will be converted to title case.</p>
-                        <p><strong style="color: #fff;">Example:</strong></p>
-                        <pre>{media_type}   --> movie
-{media_type!c} --> Movie</pre>
-                    </div>
-                    <div>
-                        <h4>Time Formats</h4>
-                    </div>
-                    <div style="padding-bottom: 10px;">
-                        <p class="help-block">
-                            Notification parameters which are "in date format" or "in time format" can be formatted using the
-                            <a href="javascript:void(0)" data-target="#dateTimeOptionsModal" data-toggle="modal">Date & Time Format Options</a>
-                            by adding a <span class="inline-pre">:format</span> specifier.
-                            If no format is specified, the default Date Format and Time Format under Settings > General will be used.
-                        </p>
-                        <p><strong style="color: #fff;">Example:</strong></p>
-                        <pre>{started_datestamp:ddd, MMMM DD, YYYY}   --> Mon, December 25, 2023
-{stopped_timestamp:h:mm a}               --> 9:56 pm
-{duration_time:HH:mm:ss}                 --> 01:42:20</pre>
-                    </div>
-                    <div>
-                        <h4>List Slicing</h4>
-                    </div>
-                    <div style="padding-bottom: 10px;">
-                        <p class="help-block">
-                            Notification parameters which have a list of items can be sliced with a slice formatter <span class="inline-pre">:[X:Y]</span> to limit the number of items.
-                            Note: the first item in the list is numbered <span class="inline-pre">0</span>.
-                        </p>
-                        <p><strong style="color: #fff;">Example:</strong></p>
-                        <pre>{actors:[0]}   --> Only include the 1st actor (Actors: 0)
-{actors:[:4]}  --> Only the first 4 actors (Actors: 0, 1, 2, 3)
-{actors:[2:]}  --> Only the 3rd to last actors (Actors: 2, 3, 4, ...)
-{actors:[1:5]} --> Only the 2nd to 5th actors (Actors: 1, 2, 3, 4)</pre>
-                    </div>
-                    <div>
-                        <h4>Prefix and Suffix</h4>
-                    </div>
-                    <div style="padding-bottom: 10px;">
-                        <p class="help-block">
-                            A prefix or a suffix can be added to the notification parameters using <span class="inline-pre">Prefix&lt;</span> and <span class="inline-pre">&gt;Suffix</span>.
-                            If the notification parameter is unavailable, the prefix or suffix will not be displayed.
-                        </p>
-                        <p><strong style="color: #fff;">Example:</strong></p>
-                        <pre>{rating}              --> 8.9
-{Rating: &lt;rating}     --> Rating: 8.9
-{rating&gt;/10}          --> 8.9/10
-{Rating: &lt;rating&gt;/10} --> Rating: 8.9/10</pre>
-                        <p><strong style="color: #fff;">Example with unavailable parameter:</strong></p>
-                        <pre>{rating}              -->
-Rating: {rating}/10   --> Rating: /10
-{Rating: &lt;rating&gt;/10} --> </pre>
-                    </div>
-                    <div>
-                        <h4>Expressions</h4>
-                    </div>
-                    <div style="padding-bottom: 10px;">
-                        <p class="help-block">
-                            Note: <span class="inline-pre">notify_text_eval = 1</span> must be manually enabled in the configuration file to enable expressions.
-                            Enabling this setting could pose a security risk. Enable at your own risk. It is recommended to leave this feature disabled if it is not being used.
-                        </p>
-                        <p class="help-block">
-                            Notification parameters can be wrapped with backticks <span class="inline-pre">`expr`</span> to be evaluated as Python expressions.
-                            Only the following functions are supported in expressions:
-                        </p>
-                        <ul class="help-block">
-                            <li><span class="inline-pre">bool(x)</span></li>
-                            <li><span class="inline-pre">divmod(a, b)</span></li>
-                            <li><span class="inline-pre">float(x)</span></li>
-                            <li><span class="inline-pre">int(x)</span></li>
-                            <li><span class="inline-pre">len(s)</span></li>
-                            <li><span class="inline-pre">round(n[, ndigits])</span></li>
-                            <li><span class="inline-pre">str(x)</span></li>
-                        </ul>
-                        <p><strong style="color: #fff;">Example:</strong></p>
-                        <pre>{`float(rating) * 10`>%}                           --> 89%
-{`"%d hr %d min" % divmod(int(duration), 60)`}     --> 1 hr 50 min
-{`round(float(stream_bandwidth) / 1000, 1)`> Mbps} --> 6.9 Mbps</pre>
-                    </div>
-                    <div>
-                        <h4>Combined</h4>
-                    </div>
+                <div class="modal-body" id="modal-text">
                     <div>
                         <p class="help-block">
-                            If combining multiple notification text modifiers, the order of the modifiers must be:
+                            This will attempt to fetch your token for you. This will not work on Internet Explorer 9 or lower.
+                            PlexPy does not store your username and password.
                         </p>
-                        <ol class="help-block">
-                            <li>Prefix</li>
-                            <li>Evaluation</li>
-                            <li>Parameter</li>
-                            <li>Case Modifier</li>
-                            <li>Time Formats / List Slicing</li>
-                            <li>Suffix</li>
-                        </ol>
-                        <p><strong style="color: #fff;">Example:</strong></p>
-                        <pre>{Starring &lt;actors!c:[0]&gt; as the main character.} --> Starring Arnold Schwarzenegger as the main character.</pre>
-                    </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-            </div>
-        </div>
-    </div>
-</div>
-<div id="notifier-text-preview-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="notifier-text-preview-modal">
-</div>
-<div id="newsletter-text-sub-modal" class="modal fade wide" tabindex="-1" role="dialog" aria-labelledby="newsletter-text-sub-modal">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-                    <i class="fa fa-remove"></i>
-                </button>
-                <h4 class="modal-title">Newsletter Parameters</h4>
-            </div>
-            <div class="modal-body">
-                <div>
-                    <p class="help-block">
-                        If the value for a selected parameter is unavailable, it will display as blank.
-                    </p>
-                    % for category in common.NEWSLETTER_PARAMETERS:
-                    <table class="notification-params">
-                        <thead>
-                            <tr>
-                                <th colspan="2">
-                                    ${category['category']}
-                                </th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            % for parameter in category['parameters']:
-                            <tr>
-                                <td><strong>{${parameter['value']}}</strong></td>
-                                <td>
-                                    ${parameter['description']}
-                                    % if parameter.get('example'):
-                                    <span class="small-muted">(${parameter['example']})</span>
-                                    % endif
-                                    % if parameter.get('help_text'):
-                                    <p class="small-muted">(${parameter['help_text']})</p>
-                                    % endif
-                                </td>
-                            </tr>
-                            % endfor
-                        </tbody>
-                    </table>
-                    % endfor
-                </div>
-            </div>
-            <div class="modal-footer"></div>
-        </div>
-    </div>
-</div>
-<div id="changelog-modal" class="modal fade wide" tabindex="-1" role="dialog" aria-labelledby="changelog-modal">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title">Changelog</h4>
-            </div>
-            <div class="modal-body">
-            </div>
-            <div class="modal-footer">
-                <input type="button" class="btn btn-bright" data-dismiss="modal" value="Close">
-            </div>
-        </div>
-    </div>
-</div>
-<div id="restart-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="restart-modal">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title">Restart</h4>
-            </div>
-            <div class="modal-body">
-                <div style="text-align: center; margin-top: 20px; margin-bottom: 20px;">
-                    You have changed settings that require Tautulli to restart.<br />Click the restart button below to restart now.
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button id="modal_link_restart" class="btn btn-bright"><i class="fa fa-refresh"></i> Restart</button>
-            </div>
-        </div>
-    </div>
-</div>
-<div id="api-qr-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="api-qr-modal">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title">Register Tautulli Remote App</h4>
-            </div>
-            <div class="modal-body">
-                <label>Instructions</label>
-                <p class="help-block">
-                    Scan the QR code below with the Tautulli Remote app to automatically register it with the server (make sure the Tautulli Address below is correct)
-                    or manually enter the connection info and device token into the app settings. This window will automatically close once device registration is successful.
-                </p>
-                <p class="help-block">
-                    Note: OneSignal.com must not be blocked (e.g. in Pi-hole) for device registration.
-                </p>
-                <label>QR Code</label>
-                <div id="api_qr_code"></div>
-                <label>Tautulli Address</label>
-                <input type="text" class="form-control" id="api_qr_address">
-                <p class="help-block" id="api_qr_localhost" style="display: none;">
-                    Note: <span class="inline-pre">127.0.0.1</span> and <span class="inline-pre">localhost</span> will not work.
-                    Please enter an internal or external IP address, or hostname or domain instead.
-                </p>
-                <p class="help-block" id="api_qr_private" style="display: none;">
-                    Note: This is a private IP address. Tautulli will not be reachable outside of your home network.
-                    Access Tautulli via an external address or manually enter the address above to generate the QR code for remote access.
-                </p>
-                <p class="help-block" id="api_qr_https" style="display: none;">
-                    Note: This URL is not secure. Requests between the app and the server will not be encrypted.
-                    Enable HTTPS to connect the app securely.
-                </p>
-                <label>Device Token</label>
-                <input type="text" class="form-control" id="api_qr_token" readonly>
-            </div>
-            <div class="modal-footer">
-                <input type="button" class="btn btn-bright" data-dismiss="modal" value="Cancel">
-            </div>
-        </div>
-    </div>
-</div>
-<div id="mobile-device-config-modal" class="modal fade wide" tabindex="-1" role="dialog" aria-labelledby="mobile-device-config-modal"></div>
-<div id="browse-path-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="browse-path-modal">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title">File Browser</h4>
-            </div>
-            <div class="modal-body">
-                <div class="row">
-                    <div class="col-md-12">
                         <div class="form-group">
-                            <label for="browse-path">Select a <span id="browse-path-type"></span> Below</label>
+                            <label for="pms_username">PMS Username</label>
                             <div class="row">
-                                <div class="col-md-12">
-                                    <input type="text" class="form-control" id="browse-path" name="browse-path" value="" size="30" disabled>
+                                <div class="col-md-6">
+                                    <input type="text" class="form-control" id="pms_username" name="pms_username" size="30">
                                 </div>
                             </div>
+                            <p class="help-block">Username for Plex.tv authentication.</p>
+                        </div>
+                        <div class="form-group">
+                            <label for="pms_password">PMS Password</label>
+                            <div class="row">
+                                <div class="col-md-6">
+                                    <input type="password" class="form-control" id="pms_password" name="pms_password" size="30">
+                                </div>
+                            </div>
+                            <p class="help-block">Password for Plex.tv authentication.</p>
                         </div>
                     </div>
-                    <div class="col-md-12" style="height: 400px; overflow: auto;">
-                        <ul id="browse-path-list" class="stacked-configs list-unstyled">
-                        </ul>
+                </div>
+                <div class="modal-footer">
+                    <div style="float: left;">
+                        <strong><span id="pms-token-status"></span></strong>
                     </div>
+                    <input type="button" id="get-pms-auth-token" class="btn btn-bright" value="Fetch Token">
                 </div>
             </div>
-            <div class="modal-footer">
-                <span id="browse-path-status-message" style="padding-right: 25px;"></span>
-                <input type="button" id="select-browse-file" class="btn btn-bright" value="Select">
+        </div>
+    </div>
+    <div id="plexwatch-import-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="plexwatch-import-modal"></div>
+    <div id="notification-config-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="notification-config-modal"></div>
+    <div id="notification-triggers-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="notification-triggers-modal"></div>
+    <div id="notify-text-sub-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="notify-text-sub-modal">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i
+                            class="fa fa-remove"></i></button>
+                    <h4 class="modal-title">Notification string substitutions</h4>
+                </div>
+                <div class="modal-body">
+                    <div>
+                        <p class="help-block">
+                            If a value for a selected parameter cannot be provided nothing will be outputted for it.
+                        </p>
+                        <table>
+                            <tbody>
+                            <tr>
+                                <td width="150"><strong>{user}</strong></td>
+                                <td>The username of the person streaming.</td>
+                            </tr>
+                            <tr>
+                                <td width="150"><strong>{server_name}</strong></td>
+                                <td>The name of your Plex Server.</td>
+                            </tr>
+                            <tr>
+                                <td width="150"><strong>{player}</strong></td>
+                                <td>The name of the device being used for playback.</td>
+                            </tr>
+                            <tr>
+                                <td width="150"><strong>{platform}</strong></td>
+                                <td>The type of client being used for playback.</td>
+                            </tr>
+                            <tr>
+                                <td width="150"><strong>{title}</strong></td>
+                                <td>The title of the item being played back.</td>
+                            </tr>
+                            <tr>
+                                <td width="150"><strong>{show_name}</strong></td>
+                                <td>The title of the TV series being played back.</td>
+                            </tr>
+                            <tr>
+                                <td width="150"><strong>{episode_name}</strong></td>
+                                <td>The title of the episode being played back.</td>
+                            </tr>
+                            <tr>
+                                <td width="150"><strong>{album_name}</strong></td>
+                                <td>The title of the album being played back if item is track.</td>
+                            </tr>
+                            <tr>
+                                <td width="150"><strong>{transcode_decision}</strong></td>
+                                <td>The transcode decisions for the media item.</td>
+                            </tr>
+                            <tr>
+                                <td width="150"><strong>{year}</strong></td>
+                                <td>The release year for the media item.</td>
+                            </tr>
+                            <tr>
+                                <td width="150"><strong>{studio}</strong></td>
+                                <td>The studio for the media item.</td>
+                            </tr>
+                            <tr>
+                                <td width="150"><strong>{content_rating}</strong></td>
+                                <td>The content rating for the media item. E.g. TV-MA, TV-PG, etc.</td>
+                            </tr>
+                            <tr>
+                                <td width="150"><strong>{summary}</strong></td>
+                                <td>A short plot summary for the media item.</td>
+                            </tr>
+                            <tr>
+                                <td width="150"><strong>{season_num}</strong></td>
+                                <td>The season number for the media item if item is episode.</td>
+                            </tr>
+                            <tr>
+                                <td width="150"><strong>{season_num00}</strong></td>
+                                <td>The two digit season number.</td>
+                            </tr>
+                            <tr>
+                                <td width="150"><strong>{episode_num}</strong></td>
+                                <td>The episode number for the media item if item is episode.</td>
+                            </tr>
+                            <tr>
+                                <td width="150"><strong>{episode_num00}</strong></td>
+                                <td>The two digit episode number.</td>
+                            </tr>
+                            <tr>
+                                <td width="150"><strong>{rating}</strong></td>
+                                <td>The rating (out of 10) for the item.</td>
+                            </tr>
+                            <tr>
+                                <td width="150"><strong>{duration}</strong></td>
+                                <td>The duration (in minutes) for the item.</td>
+                            </tr>
+                                <tr>
+                                    <td width="150"><strong>{stream_duration}</strong></td>
+                                    <td>The stream duration (in minutes) for the item.</td>
+                                </tr>
+                            <tr>
+                                <td width="150"><strong>{progress}</strong></td>
+                                <td>The last reported offset (in minutes) for the item.</td>
+                            </tr>
+                            <tr>
+                                <td width="150"><strong>{progress_percent}</strong></td>
+                                <td>The last reported progress percent for the item.</td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+                <div class="modal-footer"></div>
+            </div>
+        </div>
+    </div>
+    <div id="notify-text-tags-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="notify-text-tags-modal">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
+                    <h4 class="modal-title">Notification exclusion tags</h4>
+                </div>
+                <div class="modal-body">
+                    <div>
+                        <div class="wellheader">
+                            <h4>Movie Tag <strong>&lt;movie&gt;&lt;/movie&gt;</strong></h4>
+                        </div>
+                        <div>
+                            <p class="help-block">All text inside a <strong>movie</strong> tag will only be sent when the media item being played back is a movie.</p>
+                            <pre>Example: {user} has started playing {title} &lt;movie&gt;({year})&lt;/movie&gt;</pre>
+                        </div>
+                        <div class="wellheader">
+                            <h4>TV Tag <strong>&lt;tv&gt;&lt;/tv&gt;</strong></h4>
+                        </div>
+                        <div>
+                            <p class="help-block">All text inside a <strong>tv</strong> tag will only be sent when the media item being played back is an episode.</p>
+                            <pre>Example: {user} has started playing {title} &lt;tv&gt;(S{season_num}E{episode_num})&lt;/tv&gt;</pre>
+                        </div>
+                        <div class="wellheader">
+                            <h4>Music Tag <strong>&lt;music&gt;&lt;/music&gt;</strong></h4>
+                        </div>
+                        <div>
+                            <p class="help-block">All text inside a <strong>music</strong> tag will only be sent when the media item being played back is a music track.</p>
+                            <pre>Example: {user} has started playing {title} &lt;music&gt;(Track {episode_num})&lt;/music&gt;</pre>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                </div>
+            </div>
+        </div>
+    </div>
+    <div id="changelog-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="changelog-modal">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
+                    <h4 class="modal-title">Changelog</h4>
+                </div>
+                <div class="modal-body">
+                    ${versioncheck.read_changelog()}
+                </div>
+                <div class="modal-footer">
+                </div>
+            </div>
+        </div>
+    </div>
+    <div id="restart-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="restart-modal">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
+                    <h4 class="modal-title">Restart</h4>
+                </div>
+                <div class="modal-body">
+                    You have changed settings that require PlexPy to restart. Hit the restart button below to restart now.
+                </div>
+                <div class="modal-footer">
+                    <button id="modal_link_restart" class="btn btn-bright"><i class="fa fa-refresh"></i> Restart</button>
+                </div>
             </div>
         </div>
     </div>
@@ -2152,162 +1009,15 @@ Rating: {rating}/10   --> Rating: /10
 </%def>
 
 <%def name="javascriptIncludes()">
-<script src="${http_root}js/parsley.min.js"></script>
-<script src="${http_root}js/Sortable.min.js"></script>
-<script src="${http_root}js/jquery.inputaffix.min.js"></script>
+<script src="interfaces/default/js/parsley.min.js"></script>
 <script>
-    function getConfigurationTable() {
-        $.ajax({
-            url: 'get_configuration_table',
-            cache: false,
-            async: true,
-            complete: function(xhr, status) {
-                $("#plexpy-configuration-table").html(xhr.responseText);
-            }
-        });
-    }
-
-    function getSchedulerTable() {
-        $.ajax({
-            url: 'get_scheduler_table',
-            cache: false,
-            async: true,
-            complete: function(xhr, status) {
-                $("#plexpy-scheduler-table").html(xhr.responseText);
-            }
-        });
-    }
-
-    function getNotifiersTable() {
-        $.ajax({
-            url: 'get_notifiers_table',
-            cache: false,
-            async: true,
-            complete: function(xhr, status) {
-                $("#plexpy-notifiers-table").html(xhr.responseText);
-            }
-        });
-    }
-
-    function loadNotifierConfig(notifier_id) {
-        showMsg('<i class="fa fa-refresh fa-spin"></i>&nbsp; Loading Configuration', false);
-        $.ajax({
-            url: 'get_notifier_config_modal',
-            data: { notifier_id: notifier_id },
-            cache: false,
-            async: true,
-            complete: function (xhr, status) {
-                $("#notifier-config-modal").html(xhr.responseText).modal('show');
-                showMsg('<i class="fa fa-check"></i> Configuration Loaded', false, true, 2000);
-            }
-        });
-    }
-
-    function getNewslettersTable() {
-        $.ajax({
-            url: 'get_newsletters_table',
-            cache: false,
-            async: true,
-            complete: function(xhr, status) {
-                $("#plexpy-newsletters-table").html(xhr.responseText);
-            }
-        });
-    }
-
-    function loadNewsletterConfig(newsletter_id) {
-        showMsg('<i class="fa fa-refresh fa-spin"></i>&nbsp; Loading Configuration', false);
-        $.ajax({
-            url: 'get_newsletter_config_modal',
-            data: { newsletter_id: newsletter_id },
-            cache: false,
-            async: true,
-            complete: function (xhr, status) {
-                $("#newsletter-config-modal").html(xhr.responseText).modal('show');
-                showMsg('<i class="fa fa-check"></i> Configuration Loaded', false, true, 2000);
-            }
-        });
-    }
-
-    function getMobileDevicesTable() {
-        $.ajax({
-            url: 'get_mobile_devices_table',
-            cache: false,
-            async: true,
-            complete: function(xhr, status) {
-                $("#plexpy-mobile-devices-table").html(xhr.responseText);
-            }
-        });
-    }
-
-    function loadMobileDeviceConfig(mobile_device_id) {
-        showMsg('<i class="fa fa-refresh fa-spin"></i>&nbsp; Loading Configuration', false);
-        $.ajax({
-            url: 'get_mobile_device_config_modal',
-            data: { mobile_device_id: mobile_device_id },
-            cache: false,
-            async: true,
-            complete: function (xhr, status) {
-                $("#mobile-device-config-modal").html(xhr.responseText).modal('show');
-                showMsg('<i class="fa fa-check"></i> Configuration Loaded', false, true, 2000);
-            }
-        });
-    }
-
-    $("#browse-path-modal").on('hidden.bs.modal', function() {
-        $("#select-browse-file").unbind('click');
-    });
-
-    function openBrowsePath(key, path, filter_ext, file_description, select_target) {
-        $("#browse-path-type").text(file_description);
-        $("#browse-path-modal").modal('show');
-
-        $("#select-browse-file").click(function () {
-            $("#browse-path-modal").modal('hide');
-            $(select_target).val($("#browse-path").val()).change();
-        });
-
-        browsePath(key, path, filter_ext);
-    }
-
-    function browsePath(key, path, filter_ext) {
-        $("#browse-path-status-message").html('<i class="fa fa-fw fa-spin fa-refresh"></i>');
-        getBrowsePath(key, path, filter_ext).then(function (data) {
-            if (data.result === 'error') {
-                $("#browse-path-status-message").html("<i class='fa fa-exclamation-triangle'></i> " + data.message);
-            } else {
-                $("#browse-path-status-message").html("");
-
-                $('#browse-path').val(data.path);
-                var browse_list = $('#browse-path-list');
-                browse_list.parent().animate({ scrollTop: 0 }, 0);
-                browse_list.empty();
-
-                $.each(data.data, function(i, item) {
-                    var browse_item = $('<li/>')
-                        .html("<span><i class='fa fa-fw fa-" + item.icon + "'></i>&nbsp; " + item.title + "</span>")
-                        .addClass(item.type + ' pointer')
-                        .data('key', item.key)
-                        .data('path', item.path)
-                        .appendTo(browse_list)
-                });
-
-                $('#browse-path-list li').click(function (){
-                    $('#browse-path').val($(this).data('path'));
-                    if ($(this).hasClass('folder')) {
-                        browsePath($(this).data('key'), null, filter_ext)
-                    }
-                });
-            }
-        });
-    }
-
 $(document).ready(function() {
 
     // Javascript to enable link to tab
     var hash = document.location.hash;
-    var prefix = "tabs_";
+    var prefix = "tab_";
     if (hash) {
-        $('.nav-settings #nav-' + hash.replace('#' + prefix, "")).tab('show');
+        $('.nav-settings a[href='+hash.replace(prefix,"")+']').tab('show');
     }
 
     // Change hash for page-reload
@@ -2316,226 +1026,94 @@ $(document).ready(function() {
     });
 
     // Global Variables
-    settingsChanged = false;
     serverChanged = false;
     authChanged = false;
     httpChanged = false;
-    directoryChanged = false;
-
-    // Alert if leaving the page without saving changes to settings
-    window.onbeforeunload = confirmExit;
-    function confirmExit() {
-        if (settingsChanged) {
-            return "Settings were changed without saving!";
-        }
-    }
-
-    function preSaveChecks(_callback) {
-        verifyPMSWebURL();
-        setBaseURLSuffix(true);
-        if (serverChanged) {
-            verifyServer(_callback);
-        } else if (typeof _callback === "function") {
-            _callback();
-        }
-    }
+    monitorChanged = false;
 
     // Alert the user that their changes require a restart.
     function postSaveChecks() {
-        if (authChanged || httpChanged || directoryChanged) {
+        if ((serverChanged && $('#monitoring_use_websocket').is(":checked")) || authChanged || httpChanged || monitorChanged) {
           $('#restart-modal').modal('show');
         }
-        getConfigurationTable();
-        getSchedulerTable();
-        getNotifiersTable();
-        getNewslettersTable();
-        getMobileDevicesTable();
-        loadUpdateDistros();
-        setBaseURLSuffix();
-        toggleRevealTokens();
-        settingsChanged = false;
     }
 
     var configForm = $("#configUpdate");
-    configForm.change(function () {
-        settingsChanged = true;
-    });
-
-    function saveSettings(showMsg, _callback) {
-        if (configForm.parsley().validate()) {
-            doAjaxCall('configUpdate', $(this), 'tabs', true, showMsg, _callback);
-            return true;
-        } else {
-            showMsg('<i class="fa fa-exclamation-circle"></i> Please verify your settings.', false, true, 5000, true);
-            return false;
-        }
-    }
-
-    function advancedSettings() {
-        var advanced_button = $('#menu_link_show_advanced_settings');
-        if (advanced_button.hasClass('active')) {
-            $('.advanced-setting').show();
-        } else {
-            $('.advanced-setting').hide();
-        }
-    }
-
     $('.save-button').click(function() {
-        preSaveChecks(function () { saveSettings(true, postSaveChecks) });
-    });
-
-    initConfigCheckbox('#api_enabled');
-    initConfigCheckbox('#enable_https');
-    initConfigCheckbox('#https_create_cert');
-    initConfigCheckbox('#check_github');
-    initConfigCheckbox('#monitor_pms_updates');
-    initConfigCheckbox('#newsletter_self_hosted');
-
-    $('#menu_link_shutdown').click(function() {
-        $('#confirm-message').text("Are you sure you want to shutdown Tautulli?");
-        $('#confirm-modal').modal();
-        $('#confirm-modal').one('click', '#confirm-button', function () {
-            window.location.href = 'shutdown';
-        });
-    });
-
-    $('#menu_link_restart').click(function() {
-        $("#confirm-message").text("Are you sure you want to restart Tautulli?");
-        $('#confirm-modal').modal();
-        $('#confirm-modal').one('click', '#confirm-button', function () {
-            window.location.href = 'restart';
-        });
-    });
-
-    $('#menu_link_update_check').click(function() {
-        $(this).html('<i class="fa fa-spin fa-refresh"></i> Checking').prop('disabled', true);
-        checkUpdate(function () {
-            $('#menu_link_update_check').html('<i class="fa fa-arrow-alt-circle-up"></i> Check for Updates')
-                    .prop('disabled', false);
-        });
-    });
-
-    $('#modal_link_restart').click(function() {
-        window.location.href = 'restart';
-    });
-
-    $('#menu_link_show_advanced_settings').click(function() {
-        $(this).toggleClass('active');
-        if ($(this).hasClass('active')) {
-            $(this).html('<i class="fa fa-wrench"></i> Hide Advanced');
-            $('#show_advanced_settings').val(1);
+        if ($("#pms_identifier").val() == "") {
+            showMsg('<i class="fa fa-exclamation-circle"></i>&nbspPlease verify your server.',false,true,2000,true)
         } else {
-            $(this).html('<i class="fa fa-wrench"></i> Show Advanced');
-            $('#show_advanced_settings').val(0);
-        }
-        advancedSettings()
-    });
-
-    advancedSettings();
-    getConfigurationTable();
-    getSchedulerTable();
-    getNotifiersTable();
-    getNewslettersTable();
-    getMobileDevicesTable();
-
-    $('#changelog-modal-link').on('click', function (e) {
-        e.preventDefault();
-        $.ajax({
-            url: 'get_changelog',
-            cache: false,
-            async: true,
-            complete: function(xhr, status) {
-                $("#changelog-modal .modal-body").html(xhr.responseText);
-                $('#changelog-modal').modal();
+            if (configForm.parsley().validate()) {
+                doAjaxCall('configUpdate',$(this),'tabs',true);
+                postSaveChecks();
+                return false;
+            } else {
+                showMsg('<i class="fa fa-exclamation-circle"></i>&nbspPlease verify your settings.',false,true,2000,true)
             }
-        });
-    });
-
-    $("#backup_config").click(function () {
-        var msg = 'Are you sure you want to create a backup of the Tautulli config?';
-        var url = 'backup_config';
-        confirmAjaxCall(url, msg);
-    });
-
-    $("#backup_database").click(function () {
-        var msg = 'Are you sure you want to create a backup of the Tautulli database?';
-        var url = 'backup_db';
-        confirmAjaxCall(url, msg);
-    });
-
-    $("#clear_cache").click(function () {
-        var msg = 'Are you sure you want to clear the Tautulli cache?';
-        var url = 'delete_cache';
-        confirmAjaxCall(url, msg);
-    });
-
-    $("#clear_image_cache").click(function () {
-        var msg = 'Are you sure you want to clear the Tautulli image cache?';
-        var url = 'delete_image_cache';
-        confirmAjaxCall(url, msg);
-    });
-
-    $("#clear_exports").click(function () {
-        var msg = 'Are you sure you want to clear the Tautulli metadata exports?';
-        var url = 'delete_export?delete_all=true';
-        confirmAjaxCall(url, msg);
-    });
-
-    $("#regroup_history").click(function () {
-        var msg = 'Are you sure you want to regroup play history in the database?<br /><br /><strong>This make take a long time for large databases.<br />Regrouping will continue in the background.</strong>';
-        var url = 'regroup_history';
-        confirmAjaxCall(url, msg);
-    });
-
-    $("#delete_temp_sessions").click(function () {
-        var msg = 'Are you sure you want to flush the temporary sessions?<br /><br /><strong>This will reset all currently active sessions.</strong>';
-        var url = 'delete_temp_sessions';
-        confirmAjaxCall(url, msg);
-    });
-
-    $("#delete_recently_added").click(function () {
-        var msg = 'Are you sure you want to flush the recently added items?<br /><br /><strong>This will reset all recently added notifications.</strong>';
-        var url = 'delete_recently_added';
-        confirmAjaxCall(url, msg);
-    });
-
-    $("#switch_git_branch").click(function () {
-        var current_remote = "${config['git_remote']}";
-        var current_branch = "${config['git_branch']}";
-        var new_remote = $("#git_remote").val();
-        var new_branch = $("#git_branch option:selected").val();
-
-        if (new_remote === current_remote && new_branch === current_branch) {
-            showMsg('<i class="fa fa-exclamation-circle"></i> Already on the ' + current_remote + ' ' + current_branch + ' branch.', false, true, 5000, true)
-        } else {
-            var msg = 'Are you sure you want to switch to the <strong>' + new_remote + '/' + new_branch + '</strong> branch?' +
-                '<br />Switching branches may cause Tautulli to become unstable.<br /><br />Tautulli will restart.';
-            $('#confirm-message').html(msg);
-            $('#confirm-modal').modal();
-            $('#confirm-modal').one('click', '#confirm-button', function () {
-                settingsChanged = false;
-                window.location.href = 'checkout_git_branch?git_remote=' + new_remote + '&git_branch=' + new_branch;
-            });
         }
     });
 
-    $("#reset_git_install").click(function () {
-        var msg = 'Are you sure you want to reset your Tautulli installtion back to <strong>${common.RELEASE}</strong>?' +
-                '<br /><br />Tautulli will restart.';
-        $('#confirm-message').html(msg);
-        $('#confirm-modal').modal();
-        $('#confirm-modal').one('click', '#confirm-button', function () {
-            settingsChanged = false;
-            window.location.href = 'reset_git_install';
-        });
+    $("#menu_link_shutdown").click(function() {
+        var r = confirm("Are you sure you want to shutdown PlexPy?");
+        if (r == true) {
+            window.location.href = "shutdown";
+        }
+    });
+
+    $("#menu_link_restart").click(function() {
+        window.location.href = "restart";
+    });
+
+    $("#menu_link_update_check").click(function() {
+        // Allow the update bar to show again if previously dismissed.
+        setCookie('updateDismiss', 'true', 0);
+        $(this).html('<i class="fa fa-spin fa-refresh"></i> Checking</button>');
+        $(this).prop('disabled', true);
+        window.location.href = "checkGithub";
+    });
+
+    $("#modal_link_restart").click(function() {
+        window.location.href = "restart";
+    });
+
+    if ($("#api_enabled").is(":checked")) {
+        $("#apioptions").show();
+    } else {
+        $("#apioptions").hide();
+    }
+
+    $("#api_enabled").click(function(){
+        if ($("#api_enabled").is(":checked")) {
+            $("#apioptions").slideDown();
+        } else {
+            $("#apioptions").slideUp();
+        }
     });
 
     $('#api_key').click(function(){ $('#api_key').select() });
-    $("#generate_api").click(function() {
-        $.get('generate_api_key',
-            function (apikey) {
-                $('#api_key').val(apikey);
+        $("#generate_api").click(function() {
+            $.get('generateAPI',
+                function(data){
+                    if (data.error != undefined) {
+                        alert(data.error);
+                        return;
+                    }
+                    $('#api_key').val(data);
+            });
         });
+
+    if ($("#enable_https").is(":checked")) {
+            $("#https_options").show();
+        } else {
+            $("#https_options").hide();
+        }
+
+    $("#enable_https").click(function(){
+        if ($("#enable_https").is(":checked")) {
+            $("#https_options").slideDown();
+        } else {
+            $("#https_options").slideUp();
+        }
     });
 
     $( ".http-settings" ).change(function() {
@@ -2544,707 +1122,206 @@ $(document).ready(function() {
 
     $( ".auth-settings" ).change(function() {
         authChanged = true;
-        $("#auth_changed").prop('checked', true);
     });
 
-    $( ".directory-settings" ).change(function() {
-        directoryChanged = true;
+    $( ".monitor-settings" ).change(function() {
+        monitorChanged = true;
     });
 
     $( ".pms-settings" ).change(function() {
         serverChanged = true;
-        $("#server_changed").prop('checked', true);
-        $("#pms_verify").hide();
-    });
-
-    $('.checkbox-toggle').click(function () {
-        var configToggle = $(this).data('id');
-        if ($(this).is(':checked')) {
-            $('#'+configToggle).val(1);
-        } else {
-            $('#'+configToggle).val(0);
-        }
-    });
-
-    var $select_pms = $('#pms_ip_selectize').selectize({
-        createOnBlur: true,
-        openOnFocus: true,
-        maxItems: 1,
-        closeAfterSelect: true,
-        sortField: 'label',
-        searchField: ['label', 'value'],
-        inputClass: 'form-control selectize-input',
-        dropdownParent: '#selectize-pms-ip-container',
-        render: {
-            item: function (item, escape) {
-                if (!item.label) {
-                    $.extend(item,
-                        $(this.revertSettings.$children)
-                             .filter('[value="' + item.value + '"]').data()
-                    );
-                }
-                var label = item.label || item.value;
-                var caption = item.label ? item.ip : null;
-                return '<div data-identifier="' + item.clientIdentifier +
-                        '" data-ip="' + item.ip +
-                        '" data-port="' + item.port +
-                        '" data-ssl="' + item.httpsRequired +
-                        '" data-is_cloud="' + item.is_cloud +
-                        '" data-label="' + item.label + '">' +
-                        '<span class="item-text">' + escape(label) + '</span>' +
-                        (caption ? '<span class="item-value">' + escape(caption) + '</span>' : '') +
-                        '</div>';
-            },
-            option: function (item, escape) {
-                var label = item.label || item.value;
-                var caption = item.label ? item.value : null;
-                return '<div data-identifier="' + item.clientIdentifier +
-                        '" data-ip="' + item.ip +
-                        '" data-port="' + item.port +
-                        '" data-ssl="' + item.httpsRequired +
-                        '" data-is_cloud="' + item.is_cloud +
-                        '" data-label="' + item.label + '">' +
-                        escape(label) +
-                        (caption ? '<span class="caption">' + escape(caption) + '</span>' : '') +
-                        '</div>';
-            }
-        },
-        create: function(input) {
-            return {label: '', value: input};
-        },
-        onInitialize: function () {
-            var s = this;
-            this.revertSettings.$children.each(function () {
-                $.extend(s.options[this.value], $(this).data());
-            });
-        },
-        onChange: function (item) {
-            var pms_ip_selected = this.getItem(item)[0];
-            var identifier = $(pms_ip_selected).data('identifier');
-            var ip = $(pms_ip_selected).data('ip');
-            var port = $(pms_ip_selected).data('port');
-            var ssl = $(pms_ip_selected).data('ssl');
-            var is_cloud = $(pms_ip_selected).data('is_cloud');
-            var value = $(pms_ip_selected).data('value');
-
-            $("#pms_identifier").val(identifier !== 'undefined' ? identifier : '');
-            $('#pms_ip').val(ip !== 'undefined' ? ip : value);
-            $('#pms_port').val(port !== 'undefined' ? port : 32400);
-            $('#pms_ssl_checkbox').prop('checked', (ssl !== 'undefined' && ssl === 1));
-            $('#pms_ssl').val(ssl !== 'undefined' && ssl === 1 ? 1 : 0);
-            $('#pms_is_cloud').val(is_cloud !== 'undefined' && is_cloud === true ? 1 : 0);
-            $('#pms_url_manual').prop('checked', false);
-            $('#pms_url').val('Please verify your server above to retrieve the URL');
-        },
-        onDropdownOpen: function() {
-            this.clear();
-        }
-    });
-    var select_pms = $select_pms[0].selectize;
-
-    function getServerOptions() {
-        $.ajax({
-            url: 'discover',
-            success: function (result) {
-                if (result) {
-                    var existing_ip = $('#pms_ip').val();
-                    var existing_port = $('#pms_port').val();
-                    result.forEach(function (item) {
-                        if (item.ip === existing_ip && item.port === existing_port) {
-                            select_pms.updateOption(item.value, item);
-                        } else {
-                            select_pms.addOption(item);
-                        }
-                    });
-                }
-            }
-        })
-    }
-    getServerOptions();
-
-    function verifyServer(_callback) {
-        var pms_ip = $("#pms_ip").val();
-        var pms_port = $("#pms_port").val();
-        var pms_identifier = $("#pms_identifier").val();
-        var pms_ssl = $("#pms_ssl").val();
-        var pms_url_manual = $("#pms_url_manual").is(':checked') ? 1 : 0;
-
-        if (($("#pms_ip").val() !== '') || ($("#pms_port").val() !== '')) {
-            $("#pms_verify").html('<i class="fa fa-refresh fa-spin"></i>').fadeIn('fast');
-            showMsg('Verifying Plex server...', true, true, 10000, false);
-            $.ajax({
-                url: 'get_server_id',
-                data: {
-                    hostname: pms_ip,
-                    port: pms_port,
-                    ssl: pms_ssl,
-                    manual: pms_url_manual,
-                    get_url: true,
-                    test_websocket: true
-                },
-                cache: true,
-                async: true,
-                timeout: 30000,
-                error: function (jqXHR, textStatus, errorThrown) {
-                    $("#pms_verify").html('<i class="fa fa-close"></i>').fadeIn('fast');
-                    $("#pms_ip_group").addClass("has-error");
-                    var msg = 'Could not verify your server.'
-                    if (textStatus === 'timeout') {
-                        msg += ' Server took too long to respond.'
-                    } else {
-                        msg += ' Error: ' + jqXHR.status
-                    }
-                    showMsg('<i class="fa fa-exclamation-circle"></i> ' + msg, false, true, 5000, true)
-                },
-                success: function(xhr, status) {
-                    var result = xhr;
-                    var identifier = result.identifier;
-                    var url = result.url;
-                    var ws = result.ws;
-                    if (identifier) {
-                        $("#pms_identifier").val(identifier);
-
-                        if (url) {
-                            $("#pms_url").val(url);
-                        }
-
-                        if (ws === false) {
-                            $("#pms_verify").html('<i class="fa fa-close"></i>').fadeIn('fast');
-                            $("#pms_ip_group").addClass("has-error");
-                            showMsg('<i class="fa fa-exclamation-circle"></i> Server found but unable to connect websocket.<br>Check the <a href="logs">logs</a> for errors.', false, true, 5000, true)
-                        } else {
-                            $("#pms_verify").html('<i class="fa fa-check"></i>').fadeIn('fast');
-                            $("#pms_ip_group").removeClass("has-error");
-                            showMsg('<i class="fa fa-check"></i> Server verified.', false, true, 5000);
-                            serverChanged = false;
-                        }
-
-                        if (typeof _callback === "function") {
-                            _callback();
-                        }
-                    } else {
-                        $("#pms_verify").html('<i class="fa fa-close"></i>').fadeIn('fast');
-                        $("#pms_ip_group").addClass("has-error");
-                        showMsg('<i class="fa fa-exclamation-circle"></i> Could not verify your server.', false, true, 5000, true)
-                    }
-                }
-            });
-        } else {
-            $("#pms_verify").html('<i class="fa fa-close"></i>').fadeIn('fast');
-            $("#pms_ip_group").addClass("has-error");
-            showMsg('<i class="fa fa-exclamation-circle"></i> Plex IP address and port cannot be blank.', false, true, 5000, true)
-        }
-    }
-
-    $('#verify_server_button').on('click', function(){
+        $("#pms_identifier").val("");
+        $("#pms-verify-status").html("");
         verifyServer();
     });
 
-    function verifyPMSWebURL() {
-        var pms_web_url = $.trim($("#pms_web_url").val());
-        $("#pms_web_url").val(pms_web_url || 'https://app.plex.tv/desktop');
+    function verifyServer() {
+        var pms_ip = $("#pms_ip").val()
+        var pms_port = $("#pms_port").val()
+        if (($("#pms_ip").val() !== '') || ($("#pms_port").val() !== '')) {
+            $("#pms-verify").html('<i class="fa fa-refresh fa-spin"></i>');
+            $('#pms-verify').fadeIn('fast');
+            $.ajax({
+                url: 'get_server_id',
+                data : { hostname: pms_ip, port: pms_port },
+                cache: true,
+                async: true,
+                timeout: 5000,
+                error: function(jqXHR, textStatus, errorThrown) {
+                    $("#pms-verify").html('<i class="fa fa-close"></i>');
+                    $('#pms-verify').fadeIn('fast');
+                    $("#pms-ip-group").addClass("has-error");
+                },
+                success: function (xml) {
+                    if ($(xml).find('MediaContainer').attr('machineIdentifier')) {
+                        $("#pms_identifier").val($(xml).find('MediaContainer').attr('machineIdentifier'));
+                        $("#pms-verify").html('<i class="fa fa-check"></i>');
+                        $('#pms-verify').fadeIn('fast');
+                        $("#pms-ip-group").removeClass("has-error");
+                    } else {
+                        $("#pms-verify").html('<i class="fa fa-close"></i>');
+                        $('#pms-verify').fadeIn('fast');
+                        $("#pms-ip-group").addClass("has-error");
+                    }
+                }
+            });
+        } else {
+            $("#pms-verify").html('<i class="fa fa-close"></i>');
+            $('#pms-verify').fadeIn('fast');
+            $("#pms-ip-group").addClass("has-error");
+        }
     }
 
-    $('#test_pms_web_button').on('click', function(){
-        var pms_web_url = $.trim($("#pms_web_url").val());
-        window.open(pms_web_url, '_blank');
-    });
-
-    $.ajax({
-        url: "check_pms_token",
-        type: 'GET',
-        statusCode: {
-            401: function (xhr, status) {
-                $("#updatebar").hide();
-                $("#token_error_bar").show();
-            }
+    // Plex.tv auth token fetch
+    $("#get-pms-auth-token").click(function() {
+        $("#pms-token-status").html('<i class="fa fa-refresh fa-spin"></i> Fetching token...');
+        if (($("#pms_username").val() !== '') || ($("#pms_password").val() !== '')) {
+            $.ajax({
+                type: "post",
+                url: "https://plex.tv/users/sign_in.xml",
+                dataType: 'xml',
+                async: true,
+                headers: {'Content-Type': 'application/xml; charset=utf-8',
+                          'X-Plex-Device-Name': 'PlexPy',
+                          'X-Plex-Product': 'PlexPy',
+                          'X-Plex-Version': '${common.VERSION_NUMBER}',
+                          'X-Plex-Platform': '${common.PLATFORM}',
+                          'X-Plex-Platform-Version': '${common.PLATFORM_VERSION}',
+                          'X-Plex-Client-Identifier': '${config['pms_uuid']}',
+                          'Authorization': 'Basic ' + btoa($("#pms_username").val() + ':' + $("#pms_password").val())
+                },
+                error: function(jqXHR, textStatus, errorThrown) {
+                    $("#pms-token-status").html('<i class="fa fa-exclamation-circle"></i> Authentication failed!');
+                },
+                success: function (xml) {
+                    var authToken = $(xml).find('user').attr('authenticationToken');
+                    $("#pms-token-status").html('<i class="fa fa-check"></i> Authentication successful!');
+                    $("#pms_token").val(authToken);
+                    $('#pms-auth-modal').modal('hide');
+                }
+            });
+        } else {
+            $("#pms-token-status").html("You must enter both fields.");
         }
     });
 
-    function OAuthPreFunction() {
-        $("#pms-token-status").html('<i class="fa fa-refresh fa-spin"></i>&nbsp; Waiting for authentication...').fadeIn('fast');
-    }
-    function OAuthSuccessCallback(authToken) {
-        $.post('save_pms_token', { token: authToken, client_id: $('#pms_client_id').val() }, function() {
-            showMsg('<i class="fa fa-check"></i> Saved new Plex.tv token.', false, true, 5000);
-            getServerOptions();
-        });
-        $("#pms-token-status").html('<i class="fa fa-check"></i>&nbsp; Authentication successful.').fadeIn('fast');
-        $("#token_error_bar").hide();
-    }
-    function OAuthErrorCallback() {
-        $("#pms-token-status").html('<i class="fa fa-exclamation-circle"></i>&nbsp; Error communicating with Plex.tv.').fadeIn('fast');
-    }
-
-    $('#sign-in-plex').click(function() {
-        PlexOAuth(OAuthSuccessCallback, OAuthErrorCallback, OAuthPreFunction, $('#pms_client_id').val(uuidv4()).val());
-    });
-
-    // Load database import modal
-    $(".toggle-app-import-modal").click(function() {
+    // Load PlexWatch import modal
+    $("#toggle-plexwatch-import-modal").click(function() {
         $.ajax({
-            url: 'import_database_tool',
-            data: { app: $(this).data('app') },
+            url: 'plexwatch_import',
             cache: false,
             async: true,
             complete: function(xhr, status) {
-                $("#app-import-modal").html(xhr.responseText);
+                $("#plexwatch-import-modal").html(xhr.responseText);
             }
         });
     });
 
-    // Load config import modal
-    $(".toggle-config-import-modal").click(function() {
+    // Load notification agent config modal
+    $(".toggle-notification-config-modal").click(function() {
+        var configId = $(this).data('id');
         $.ajax({
-            url: 'import_config_tool',
+            url: 'get_notification_agent_config',
+            data: { config_id: configId },
             cache: false,
             async: true,
             complete: function(xhr, status) {
-                $("#config-import-modal").html(xhr.responseText);
+                $("#notification-config-modal").html(xhr.responseText);
             }
         });
     });
 
-    pms_version = false;
-    pms_logs_debug = false;
-    pms_logs = false;
-
-    // Sortable home_sections
-    function set_home_sections() {
-        var home_sections = [];
-        var hsecs = $('[id^=hsec-]').serializeArray();
-        $.each(hsecs, function(i, sec) {
-            home_sections.push(sec.value);
+    // Load notification triggers config modal
+    $(".toggle-notification-triggers-modal").click(function() {
+        var configId = $(this).data('id');
+        $.ajax({
+            url: 'get_notification_agent_triggers',
+            data: { config_id: configId },
+            cache: false,
+            async: true,
+            complete: function(xhr, status) {
+                $("#notification-triggers-modal").html(xhr.responseText);
+            }
         });
-        $('#home_sections').val(home_sections);
-    }
-
-    var sec_cards = ${config['home_sections'] | n};
-    sec_cards.reverse().forEach(function (item) {
-        $('#hsec-' + item).prop('checked', !$(this).prop('checked'));
-        $('#hsec-' + item).closest('li.card').prependTo('#sortable_home_sections');
     });
 
-    Sortable.create(sortable_home_sections, {
-        animation: 250,
-        onSort: function(elem, ui) {
-            set_home_sections();
-        }
-    });
-
-    $('[id^=hsec-]').change(function() { set_home_sections(); });
-    set_home_sections();
-
-    // Sortable home_stats_cards
-    function set_home_stats_cards() {
-        var home_stats_cards = [];
-        var hscards = $('[id^=hscard-]').serializeArray();
-        $.each(hscards, function(i, card) {
-            home_stats_cards.push(card.value);
-        });
-        $('#home_stats_cards').val(home_stats_cards);
-    }
-
-    var config_cards = ${config['home_stats_cards'] | n};
-    config_cards.reverse().forEach(function (item) {
-        $('#hscard-' + item).prop('checked', !$(this).prop('checked'));
-        $('#hscard-' + item).closest('li.card').prependTo('#sortable_home_stats_cards');
-    });
-
-    Sortable.create(sortable_home_stats_cards, {
-        animation: 250,
-        onSort: function(elem, ui) {
-            set_home_stats_cards();
-        }
-    });
-
-    $('[id^=hscard-]').change(function() { set_home_stats_cards(); });
-    set_home_stats_cards();
-
-    // Sortable home_library_cards
-    function set_home_library_cards() {
-        var home_library_cards = [];
-        var hlcards = $('[id^=hlcard-]').serializeArray();
-        $.each(hlcards, function(i, card) {
-            home_library_cards.push(card.value);
-        });
-        $('#home_library_cards').val(home_library_cards);
-    }
+    $('#osxnotifyregister').click(function () {
+        var osx_notify_app = $("#osx_notify_reg").val();
+        $.get("/osxnotifyregister", {'app': osx_notify_app}, function (data) { $('#ajaxMsg').html("<div class='msg'><span class='ui-icon ui-icon-check'></span>"+data+"</div>"); });
+        $('#ajaxMsg').addClass('success').fadeIn().delay(3000).fadeOut()
+    })
 
     $.ajax({
-        url: 'get_library_sections',
+        url: 'get_server_pref',
+        data: { pref: 'logDebug' },
+        async: true,
+        success: function(data) {
+            if (data !== 'true') {
+                $("#debugLogCheck").html("Debug logging must be enabled on your Plex Server. <a target='_blank' href='https://support.plex.tv/hc/en-us/articles/201643703-Reporting-issues-with-Plex-Media-Server'> More..</a>");
+                $("#ip_logging_enable").attr("disabled", true);
+            }
+        }
+    });
+
+    // Check to see if our logs folder is set before allowing IP logging to be enabled.
+    checkLogsPath();
+
+    $("#pms_logs_folder").change(function() {
+        checkLogsPath();
+    });
+
+    function checkLogsPath() {
+        if ($("#pms_logs_folder").val() == '') {
+            $("#debugLogCheck").html("You must first define your Plex Server Logs folder path under the Plex Media Server tab.");
+            $("#ip_logging_enable").attr("disabled", true);
+        } else {
+            $("#ip_logging_enable").attr("disabled", false);
+            $("#debugLogCheck").html("");
+        }
+    }
+
+    var accordion = new Accordion($('#accordion'), false);
+
+    var cards = "${config['home_stats_cards']}".split(/[\s,]+/);
+    cards.forEach(function (item) {
+        $('#card-'+item).prop('selected', !$(this).prop('selected'));
+    });
+    $('#home_stats_cards').on('mousedown', function(e) {
+        e.preventDefault();
+        var scroll = this.scrollTop;
+        e.target.selected = !e.target.selected;
+        this.scrollTop = scroll;
+    }).on('mousemove', function(e) {
+        e.preventDefault()
+    });
+
+    $.ajax({
+        url: 'get_server_children',
         data: { },
         async: true,
-        complete: function (data) {
-            libraries_list = $.parseJSON(data.responseText);
+        complete: function (xhr, status) {
+            server_children_info = $.parseJSON(xhr.responseText);
+            libraries_list = server_children_info.libraries_list;
             for (var i in libraries_list) {
-                var title = libraries_list[i].section_name;
-                var key = libraries_list[i].section_id;
-                if (key === 999999) { continue; }  // Don't show Live TV library
-                $('#sortable_home_library_cards').append(
-                    '<li class="card card-sortable">' + 
-                        '<div class="card-handle"><i class="fa fa-bars"></i></div>' + 
-                        '<label>' + 
-                            '<input type="checkbox" id="hlcard-' + key + '" name="hlcard-' + key + '" value="' + key + '"> ' + title + 
-                        '</label>' + 
-                    '</li>'
-                );
+                title = libraries_list[i].title;
+                key = libraries_list[i].key;
+                $('#home_library_cards').append('<option id="card-' + key + '" value="' + key + '">' + title + '</option>')
             }
-            var config_cards = ${config['home_library_cards'] | n};
-            config_cards.reverse().forEach(function (item) {
-                $('#hlcard-' + item).prop('checked', !$(this).prop('checked'));
-                $('#hlcard-' + item).closest('li.card').prependTo('#sortable_home_library_cards');
+            var cards = "${config['home_library_cards']}".split(/[\s,]+/);
+            cards.forEach(function (item) {
+                $('#card-'+item).prop('selected', !$(this).prop('selected'));
             });
-            $('[id^=hlcard-]').change(function() { set_home_library_cards(); });
-            set_home_library_cards()
         }
     });
-
-    Sortable.create(sortable_home_library_cards, {
-        animation: 250,
-        onSort: function(elem, ui) {
-            set_home_library_cards();
-        }
+    $('#home_library_cards').on('mousedown', function(e) {
+        e.preventDefault();
+        var scroll = this.scrollTop;
+        e.target.selected = !e.target.selected;
+        this.scrollTop = scroll;
+    }).on('mousemove', function(e) {
+        e.preventDefault()
     });
 
-    function allowPlexAdminCheck () {
-        if ($('#http_username').val() == '' || $('#http_password').val() == '') {
-            $("#http_plex_admin").attr("checked", false).attr("disabled", true);
-            $("#allowPlexCheck").html("You must set an admin username and password above to allow Plex admin login.");
-        } else {
-            $("#http_plex_admin").attr("disabled", false);
-            $("#allowPlexCheck").html("");
-        }
-    }
-    allowPlexAdminCheck();
-
-    $('#http_username, #http_password').change(function () {
-        allowPlexAdminCheck();
-    });
-
-    function allowGuestAccessCheck () {
-        if ($('#http_username').val() == '' || $('#http_password').val() == '') {
-            $("#allow_guest_access").attr("checked", false).attr("disabled", true);
-            $("#allowGuestCheck").html("You must set an admin username and password above to allow guest access.");
-        } else {
-            $("#allow_guest_access").attr("disabled", false);
-            $("#allowGuestCheck").html("");
-        }
-        newsletterPasswordEnabled();
-    }
-    allowGuestAccessCheck();
-
-    $('#http_username, #http_password').change(function () {
-        allowGuestAccessCheck();
-    });
-
-    // Load PMS downloads
-    function loadUpdateDistros() {
-        var update_params_ajax = $.getJSON('get_server_update_params', function (data) { return data; });
-
-        $.when(update_params_ajax).done(function() {
-            var update_params = update_params_ajax.responseJSON;
-
-            var plexpass = update_params.plexpass;
-            var platform = update_params.pms_platform;
-            var update_channel = update_params.pms_update_channel;
-            var update_distro = update_params.pms_update_distro;
-            var update_distro_build = update_params.pms_update_distro_build;
-
-            $('#pms_update_channel option[value=beta]').remove();
-            if (plexpass) {
-                $('#pms_update_channel').append($('<option></option>').text('Beta').val('beta'))
-            }
-            $('#pms_update_channel option[value=' + update_channel + ']').prop('selected', true);
-
-            $.ajax({
-                url: 'get_pms_downloads',
-                type: 'GET',
-                data: { update_channel: update_channel },
-                dataType: 'json',
-                success: function (downloads) {
-                    var platform_downloads = downloads.computer[platform] || downloads.nas[platform];
-                    if (platform_downloads) {
-                        $("#pms_update_distro_build option").remove();
-                        $.each(platform_downloads.releases, function (index, item) {
-                            var label = (platform_downloads.releases.length === 1) ? platform_downloads.name : platform_downloads.name + ' - ' + item.label;
-                            var selected = (item.distro === update_distro && item.build === update_distro_build) ? true : false;
-                            $('#pms_update_distro_build')
-                                    .append($('<option></option>')
-                                            .text(label)
-                                            .val(item.build)
-                                            .attr('data-distro', item.distro)
-                                            .prop('selected', selected));
-                        });
-                        $('#pms_update_distro').val($('#pms_update_distro_build option:selected').data('distro'))
-                    }
-                }
-            });
-        });
-    }
-    loadUpdateDistros();
-
-
-    $('#pms_update_distro_build').change(function () {
-        var distro = $("option:selected", this).data('distro')
-        $('#pms_update_distro').val(distro)
-    });
-
-    // Add a new notification agent
-    $('.new-notification-agent').click(function () {
-        $.ajax({
-            url: 'add_notifier_config',
-            data: { agent_id: $(this).data('id') },
-            cache: false,
-            async: true,
-            complete: function (xhr, status) {
-                var result = $.parseJSON(xhr.responseText);
-                var msg = result.message;
-                $('#add-notifier-modal').modal('hide');
-                if (result.result === 'success') {
-                    showMsg('<i class="fa fa-check"></i> ' + msg, false, true, 5000);
-                    loadNotifierConfig(result.notifier_id);
-                } else {
-                    showMsg('<i class="fa fa-times"></i> ' + msg, false, true, 5000, true);
-                }
-                getNotifiersTable();
-            }
-        });
-    });
-
-    // Add a new newsletter agent
-    $('.new-newsletter-agent').click(function () {
-        $.ajax({
-            url: 'add_newsletter_config',
-            data: { agent_id: $(this).data('id') },
-            cache: false,
-            async: true,
-            complete: function (xhr, status) {
-                var result = $.parseJSON(xhr.responseText);
-                var msg = result.message;
-                $('#add-newsletter-modal').modal('hide');
-                if (result.result === 'success') {
-                    showMsg('<i class="fa fa-check"></i> ' + msg, false, true, 5000);
-                    loadNewsletterConfig(result.newsletter_id);
-                } else {
-                    showMsg('<i class="fa fa-times"></i> ' + msg, false, true, 5000, true);
-                }
-                getNewslettersTable();
-            }
-        });
-    });
-
-    $('#http_root').change(function() {
-        setBaseURLSuffix();
-    });
-
-    function setBaseURLSuffix(clear) {
-        if (clear){
-            $('#http_base_url').suffix("");
-        } else {
-            var suffix = $('#http_root').val();
-            if (suffix && !suffix.startsWith('/')) {
-                suffix = '/' + suffix;
-            }
-            $('#http_base_url').suffix(suffix);
-        }
-    }
-    setBaseURLSuffix();
-
-    function apiEnabled() {
-        var api_enabled = $('#api_enabled').prop('checked');
-        $('#app_api_msg').toggle(!(api_enabled));
-    }
-    apiEnabled();
-    $('#api_enabled').click(function () {
-        apiEnabled();
-    });
-
-    function imageUpload() {
-        var upload_val = $('#notify_upload_posters').val();
-        if (upload_val === '1') {
-            $('#imgur_upload_options').slideDown();
-        } else {
-            $('#imgur_upload_options').slideUp();
-        }
-        if (upload_val === '2') {
-            $('#self_host_image_options').slideDown();
-        } else {
-            $('#self_host_image_options').slideUp();
-        }
-        if (upload_val === '3') {
-            $('#cloudinary_upload_options').slideDown();
-        } else {
-            $('#cloudinary_upload_options').slideUp();
-        }
-        var parent;
-        if (upload_val === '1' || upload_val === '3') {
-            parent = $('#notify_upload_posters').parent();
-            if ($('#delete_all_uploads_container').length === 0){
-                parent.addClass('input-group');
-                parent.append(
-                    '<span class="input-group-btn" id="delete_all_uploads_container">' +
-                    '<button class="btn btn-form" type="button" id="delete_all_uploads">Delete All Uploads</button>' +
-                    '</span>');
-            }
-        } else {
-            parent = $('#notify_upload_posters').parent();
-            parent.removeClass('input-group');
-            $('#delete_all_uploads_container').remove();
-        }
-    }
-    $('#notify_upload_posters').change(function () {
-        imageUpload();
-    });
-
-    $('body').on('click', '#delete_all_uploads', function () {
-        var image_hosting_option = $('#notify_upload_posters').find(':selected');
-        var name = image_hosting_option.text();
-
-        var msg = 'Are you sure you want to delete all uploaded images on <strong>' + name + '</strong>?' +
-            '<br /><br />All previous links to the images will no longer work. This cannot be undone!';
-        var url = 'delete_hosted_images';
-        var data = { service: name, delete_all: true };
-        confirmAjaxCall(url, msg, data, false);
-    });
-
-    $('body').on('click', '.delete_all_lookups', function () {
-        var service = $(this).data('service');
-        var name = $(this).text();
-
-        var msg = 'Are you sure you want to delete all the metadata lookup info from <strong>' + name + '</strong>?' +
-            '<br /><br />Tautulli will lookup the metadata info again the next time a notification is sent.';
-        var url = 'delete_lookup_info';
-        var data = { service: service, delete_all: true };
-        confirmAjaxCall(url, msg, data, false);
-    });
-
-    function baseURLSet() {
-        var base_url = $('#http_base_url');
-        base_url.val(base_url.val().replace(/\/+$/g, ''));
-        if ($('#http_base_url').val()) {
-            $('.base-url-warning').hide();
-        } else {
-            $('.base-url-warning').show();
-        }
-    }
-    baseURLSet();
-
-    $('#http_base_url').change(function () {
-        baseURLSet();
-    });
-
-    function newsletterUploadEnabled() {
-        if ($('#notify_upload_posters').val() === '0') {
-            $('#newsletter_upload_warning').show();
-        } else {
-            $('#newsletter_upload_warning').hide();
-        }
-    }
-    newsletterUploadEnabled();
-
-    $('#notify_upload_posters, #newsletter_self_hosted').change(function () {
-        baseURLSet();
-        newsletterUploadEnabled();
-    });
-
-    function newsletterPasswordEnabled() {
-        if ($('#newsletter_auth').val() === '1') {
-            $('#newsletter_password_option').slideDown();
-        } else {
-            $('#newsletter_password_option').slideUp();
-        }
-        if ($('#newsletter_auth').val() === '2' && !($('#allow_guest_access').is(':checked'))) {
-            $('.newsletter-guest-access-warning').show();
-        } else {
-            $('.newsletter-guest-access-warning').hide();
-        }
-    }
-    newsletterPasswordEnabled();
-
-    $('#newsletter_auth').change(function () {
-        newsletterPasswordEnabled();
-    });
-
-    $('#allow_guest_access').click(function () {
-        newsletterPasswordEnabled();
-    });
-
-    function gotoSetting(tab, setting){
-        $("#nav-tabs-" + tab).click();
-        if (setting) {
-            _setting = '#' + setting;
-            if ($(_setting).closest('.advanced-setting').length && !$('#menu_link_show_advanced_settings').hasClass('active')) {
-                $('#menu_link_show_advanced_settings').click()
-            }
-            var body_container = $('.body-container');
-            var scroll_pos = setting ? body_container.scrollTop() + $(_setting).offset().top - 100 : 0;
-            body_container.animate({scrollTop: scroll_pos});
-            $(_setting).closest('.form-group, .checkbox').delay(500).fadeOut().fadeIn('slow').fadeOut().fadeIn('slow');
-        }
-    }
-
-    $('body').on('click', 'a[data-tab-destination]', function () {
-        var tab = $(this).data('tab-destination');
-        var setting = $(this).data('target');
-        gotoSetting(tab, setting)
-    });
-
-    $('#resources-xml').on('tripleclick', function () {
-        openPlexXML('/api/resources', true, {includeHttps: 1});
-    });
-
-    var tautulli_news = $('#tautulli-news')
-    $.ajax({
-        url: 'https://tautulli.com/news/tautulli-news.json',
-        type: 'GET',
-        dataType: 'json',
-        cache: false,
-        async: true,
-        success: function (data) {
-            if (data) {
-                var now = moment().endOf('day');
-                var news = $('<ul/>').addClass('accordion list-unstyled')
-                $.each(data, function (index, news_item) {
-                    var date = moment(news_item.date, "YYYY-MM-DD");
-                    if (index >= 5) { return false; }
-                    var header = $('<div/>').addClass('link').html(
-                        '<span class="toggle-left"><i class="fa fa-newspaper fa-fw"></i></span>' +
-                        '<span class="news-title">' + news_item.title + '</span>' +
-                        '<span class="toggle-right"><i class="fa fa-chevron-down fa-fw"></i></span>' +
-                        '<span class="news-date toggle-right">' + date.format($('#date_format').val()) + '</span>');
-                    var subtitle = $('<span/>').addClass('news-subtitle').html(news_item.subtitle);
-                    var body = $('<span/>').addClass('news-body').html(news_item.body);
-                    var content = $('<div/>').addClass('submenu');
-                    if (news_item.subtitle) { content.append(subtitle); }
-                    content.append(body);
-                    var li = $('<li/>').append(header).append(content)
-                    if (index === 0 && Math.abs(now.diff(date, 'days')) <= 30) {
-                        li.addClass('open');
-                        content.css('display', 'block');
-                    }
-                    news.append(li)
-                });
-                tautulli_news.html(news);
-                var accordion_news = new Accordion(news, false);
-            } else {
-                tautulli_news.html('<p class="help-block"><i class="fa fa-check"></i>&nbsp; No news available.</p>')
-            }
-        },
-        error: function () {
-            tautulli_news.html('<p class="help-block"><i class="fa fa-exclamation-triangle"></i>&nbsp; Failed to retrieve news.</p>')
-        }
-    });
-
-    $('body').on('click', '[data-toggle=browse]', function () {
-        var filter = $(this).data('filter');
-        var target = $(this).data('target');
-        var path = $(target).val();
-        var description = $(this).data('description') || $("label[for='" + target.replace('#', '') + "']").text();
-        openBrowsePath(null, path, filter, description, target);
-    });
-
-    toggleRevealTokens();
 });
 </script>
 </%def>
diff --git a/data/interfaces/default/shutdown.html b/data/interfaces/default/shutdown.html
index 669688e0..afd0c0a0 100644
--- a/data/interfaces/default/shutdown.html
+++ b/data/interfaces/default/shutdown.html
@@ -8,80 +8,46 @@
 <div class="container-fluid">
     <div class="row">
         <div class="col-md-12">
-        </div>
-    </div>
-</%def>
-
-<%def name="modalIncludes()">
-<div id="state-change-modal" class="modal fade">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title">${title}</h4>
-            </div>
-            <div class="modal-body" id="modal-text">
-                <div align="center">
-                    % if message == "Shutting Down":
-                    <h3><i class="fa fa-refresh fa-spin"></i>&nbsp; Tautulli is ${message.lower()}</h3>
-                    <br />
-                    % else:
-                    <h3><i class="fa fa-refresh fa-spin"></i>&nbsp; Tautulli is ${message.lower()}</h3>
-                    <br />
-                    <h4>Restart in <span class="countdown"></span></h4>
-                    % endif
+            <div id="state-change-modal" class="modal fade">
+                <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <h4 class="modal-title">${message}</h4>
+                        </div>
+                        <div class="modal-body" id="modal-text">
+                            <div align="center">
+                                % if message == "Shutting Down":
+                                <h3><i class="fa fa-refresh fa-spin"></i> PlexPy is ${message}.</h3>
+                                <br/>
+                                % else:
+                                <h3><i class="fa fa-refresh fa-spin"></i> PlexPy is ${message}.</h3>
+                                <br/>
+                                <h4>Restart in <span class="countdown"></span></h4>
+                                % endif
+                            </div>
+                        </div>
+                        <div class="modal-footer">
+                            <div style="float: right;"><span class="text-muted" id="rquote">${quote}</span></div>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="modal-footer">
-                <div style="float: right;"><span class="text-muted" id="rquote">${quote}</span></div>
-            </div>
         </div>
     </div>
-</div>
 </%def>
-
 <%def name="javascriptIncludes()">
-<script>
-    // Remove the update bar
-    $('#updatebar').remove();
-
-    // Use p.countdown as container, pass redirect, duration, and optional message
-    $(".countdown").countdown(reloadPage, ${timer}, "");
-    // Make modal visible
-    $('#state-change-modal').modal({
-        backdrop: 'static',
-        keyboard: false
-    }).show();
-
-    // Redirect to home page after countdown.
-    function reloadPage() {
-        window.location.href = "${new_http_root}index";
-    }
-
-    var online = true;
-
-    (function poll() {
-        setTimeout(function () {
-            $.ajax({
-                url: 'index',
-                type: 'HEAD',
-                success: function () {
-                    if (!(online)){
-                        reloadPage();
-                    }
-                },
-                error: function () {
-                    online = false;
-                    % if signal == 'shutdown':
-                    reloadPage();
-                    % endif
-                },
-                complete: function () {
-                    poll();
-                },
-                timeout: 1000
-            });
-        }, 1000);
-    })();
-</script>
+    <script>
+        // Use p.countdown as container, pass redirect, duration, and optional message
+        $(".countdown").countdown(reloadPage, ${timer}, "");
+        $('#state-change-modal').modal({
+            keyboard: false
+        })
+        // Make modal visible
+        $('#state-change-modal').modal('show')
 
+        // Redirect to home page after countdown.
+        function reloadPage() {
+            window.location.href = "index";
+        }
+    </script>
 </%def>
diff --git a/data/interfaces/default/stream_data.html b/data/interfaces/default/stream_data.html
index a40bc54a..c0cf86fd 100644
--- a/data/interfaces/default/stream_data.html
+++ b/data/interfaces/default/stream_data.html
@@ -20,7 +20,6 @@ transcode_width             Returns the value of the video width for any transco
 transcode_audio_dec         Returns the audio transcode decision. Either 'transcode', 'copy' or 'direct play'.
 transcode_audio_codec       Returns the name of the audio codec for any transcode session.
 transcode_audio_channels    Returns the number of audio channels for any transcode session.
-transcode_container         Returns the type of container for any transcode session.
 container                   Returns the type of container for the original media.
 height                      Returns the value of the video height for the original media.
 bitrate                     Returns the value of the video bitrate for the original media.
@@ -37,10 +36,7 @@ grandparent_title       Returns the name of the TV Show.
 DOCUMENTATION :: END
 </%doc>
 
-% if data:
-<%
-    from plexpy.common import VIDEO_RESOLUTION_OVERRIDES, AUDIO_CODEC_OVERRIDES
-%>
+% if data is not None:
 <div class="modal-dialog" role="document">
     <div class="modal-content">
         <div class="modal-header">
@@ -48,248 +44,80 @@ DOCUMENTATION :: END
             <h4 class="modal-title" id="info-modal-title">
                 % if data['media_type'] == 'episode':
                 Stream Info: <strong>${data['grandparent_title']} - ${data['title']} (${user})</strong>
-                % elif data['media_type'] == 'track':
-                Stream Info: <strong>${data['original_title'] or data['grandparent_title']} - ${data['title']} (${user})</strong>
                 % else:
                 Stream Info: <strong>${data['title']} (${user})</strong>
                 % endif
             </h4>
         </div>
         <div class="modal-body">
-            % if data['current_session']:
-            <div class="col-sm-12 text-muted stream-info-current">
-                <i class="fa fa-exclamation-circle"></i> Current session. Updated stream details below may be delayed.
+            <div class="container-fluid">
+                <div class="row">
+                    <div class="col-md-4">
+                        <h4><strong>Stream Details</strong></h4>
+                        % if data['media_type'] != 'track':
+                        <h5>Video</h5>
+                        <ul class="list-unstyled">
+                            % if data['transcode_video_dec'] != 'direct play':
+                            <li>Stream Type: <strong>${data['transcode_video_dec']}</strong></li>
+                            <li>Video Resolution: <strong>${data['transcode_height']}p</strong></li>
+                            <li>Video Codec: <strong>${data['transcode_video_codec']}</strong></li>
+                            <li>Video Width: <strong>${data['transcode_width']}</strong></li>
+                            <li>Video Height: <strong>${data['transcode_height']}</strong></li>
+                            % else:
+                            <li>Stream Type: <strong>${data['transcode_video_dec']}</strong></li>
+                                % if data['video_resolution'] != 'sd':
+                                <li>Video Resolution: <strong>${data['video_resolution']}p</strong></li>
+                                % else:
+                                <li>Video Resolution: <strong>${data['video_resolution']}</strong></li>
+                                % endif
+                            <li>Video Codec: <strong>${data['video_codec']}</strong></li>
+                            <li>Video Width: <strong>${data['width']}</strong></li>
+                            <li>Video Height: <strong>${data['height']}</strong></li>
+                            % endif
+                        </ul>
+                        % endif
+                        <h5>Audio</h5>
+                        <ul class="list-unstyled">
+                            % if data['transcode_audio_dec'] != 'direct play':
+                            <li>Stream Type: <strong>${data['transcode_audio_dec']}</strong></li>
+                            <li>Audio Codec: <strong>${data['transcode_audio_codec']}</strong></li>
+                            <li>Audio Channels: <strong>${data['transcode_audio_channels']}</strong></li>
+                            % else:
+                            <li>Stream Type: <strong>${data['transcode_audio_dec']}</strong></li>
+                            <li>Audio Codec: <strong>${data['audio_codec']}</strong></li>
+                            <li>Audio Channels: <strong>${data['audio_channels']}</strong></li>
+                            % endif
+                        </ul>
+                    </div>
+                    <div class="col-md-4">
+                        <h4><strong>Media Source Details</strong></h4>
+                        <ul class="list-unstyled">
+                            <li>Container: <strong>${data['container']}</strong></li>
+                            % if data['media_type'] != 'track':
+                            <li>Resolution: <strong>${data['height']}p</strong></li>
+                            % endif
+                            <li>Bitrate: <strong>${data['bitrate']} kbps</strong></li>
+                        </ul>
+                    </div>
+                    <div class="col-md-4">
+                        % if data['media_type'] != 'track':
+                        <h4><strong>Video Source Details</strong></h4>
+                        <ul class="list-unstyled">
+                            <li>Width: <strong>${data['width']}</strong></li>
+                            <li>Height: <strong>${data['height']}</strong></li>
+                            <li>Aspect Ratio: <strong>${data['aspect_ratio']}</strong></li>
+                            <li>Video Frame Rate: <strong>${data['video_framerate']}</strong></li>
+                            <li>Video Codec: <strong>${data['video_codec']}</strong></li>
+                        </ul>
+                        % endif
+                        <h4><strong>Audio Source Details</strong></h4>
+                        <ul class="list-unstyled">
+                            <li>Audio Codec: <strong>${data['audio_codec']}</strong></li>
+                            <li>Audio Channels: <strong>${data['audio_channels']}</strong></li>
+                        </ul>
+                    </div>
+                </div>
             </div>
-            % elif data['pre_tautulli']:
-            <div class="col-sm-12 text-muted stream-info-current">
-                <i class="fa fa-exclamation-circle"></i> Pre-Tautulli history. Stream details below may be incorrect.
-            </div>
-            % endif
-            <table class="stream-info" style="margin-top: 0;">
-                <thead>
-                    <tr>
-                        <th></th>
-                        <th class="heading">
-                            Source Details
-                        </th>
-                        <th><i class="fa fa-long-arrow-right"></i></th>
-                        <th class="heading">
-                            Stream Details
-                        </th>
-                    </tr>
-                </thead>
-            </table>
-            <table class="stream-info">
-                <thead>
-                    <tr>
-                        <th>
-                            Media
-                        </th>
-                        <th></th>
-                        <th></th>
-                        <th></th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td>Bitrate</td>
-                        <td>${data['bitrate']} ${'kbps' if data['bitrate'] else ''}</td>
-                        <td><i class="fa fa-long-arrow-right"></i></td>
-                        <td>${data['stream_bitrate']} ${'kbps' if data['stream_bitrate'] else ''}</td>
-                    </tr>
-                    % if data['media_type'] != 'track':
-                    <tr>
-                        <td>Resolution</td>
-                        <td>${data['video_full_resolution']}</td>
-                        <td><i class="fa fa-long-arrow-right"></i></td>
-                        <td>${data['stream_video_full_resolution']}</td>
-                    </tr>
-                    % endif
-                    <tr>
-                        <td>Quality</td>
-                        <td>-</td>
-                        <td></td>
-                        <td>${data['quality_profile']}</td>
-                    </tr>
-                    % if data['optimized_version'] == 1:
-                    <tr>
-                        <td>Optimized Version</td>
-                        <td>${data['optimized_version_profile']}<br>(${data['optimized_version_title']})</td>
-                        <td></td>
-                        <td>-</td>
-                    </tr>
-                    % endif
-                    % if data['synced_version'] == 1:
-                    <tr>
-                        <td>Synced Version</td>
-                        <td>${data['synced_version_profile']}</td>
-                        <td></td>
-                        <td>-</td>
-                    </tr>
-                    % endif
-                </tbody>
-            </table>
-            <table class="stream-info">
-                <thead>
-                    <tr>
-                        <th>
-                            Container
-                        </th>
-                        <th></th>
-                        <th></th>
-                        <th>
-                            ${data['stream_container_decision']}
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td>Container</td>
-                        <td>${data['container'].upper()}</td>
-                        <td><i class="fa fa-long-arrow-right"></i></td>
-                        <td>${data['stream_container'].upper()}</td>
-                    </tr>
-                </tbody>
-            </table>
-            % if data['media_type'] != 'track':
-            <table class="stream-info">
-                <thead>
-                    <tr>
-                        <th>
-                            Video
-                        </th>
-                        <th></th>
-                        <th></th>
-                        <th>
-                            ${data['stream_video_decision']}
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td>Codec</td>
-                        <td>${data['video_codec'].upper()} ${'(HW)' if data['transcode_hw_decoding'] else ''}</td>
-                        <td><i class="fa fa-long-arrow-right"></i></td>
-                        <td>${data['stream_video_codec'].upper()} ${'(HW)' if data['transcode_hw_encoding'] else ''}</td>
-                    </tr>
-                    <tr>
-                        <td>Bitrate</td>
-                        <td>${data['video_bitrate']} ${'kbps' if data['video_bitrate'] else ''}</td>
-                        <td><i class="fa fa-long-arrow-right"></i></td>
-                        <td>${data['stream_video_bitrate']} ${'kbps' if data['stream_video_bitrate'] else ''}</td>
-                    </tr>
-                    <tr>
-                        <td>Width</td>
-                        <td>${data['video_width']}</td>
-                        <td><i class="fa fa-long-arrow-right"></i></td>
-                        <td>${data['stream_video_width']}</td>
-                    </tr>
-                    <tr>
-                        <td>Height</td>
-                        <td>${data['video_height']}</td>
-                        <td><i class="fa fa-long-arrow-right"></i></td>
-                        <td>${data['stream_video_height']}</td>
-                    </tr>
-                    <tr>
-                        <td>Framerate</td>
-                        <td>${data['video_framerate']}</td>
-                        <td><i class="fa fa-long-arrow-right"></i></td>
-                        <td>${data['stream_video_framerate']}</td>
-                    </tr>
-                    <tr>
-                        <td>Dynamic Range</td>
-                        <td>${data['video_dynamic_range']}</td>
-                        <td><i class="fa fa-long-arrow-right"></i></td>
-                        <td>${data['stream_video_dynamic_range']}</td>
-                    </tr>
-                    <tr>
-                        <td>Aspect Ratio</td>
-                        <td>${data['aspect_ratio']}</td>
-                        <td></td>
-                        <td>-</td>
-                    </tr>
-                </tbody>
-            </table>
-            % endif
-            <table class="stream-info">
-                <thead>
-                    <tr>
-                        <th>
-                            Audio
-                        </th>
-                        <th></th>
-                        <th></th>
-                        <th>
-                            ${data['stream_audio_decision']}
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td>Codec</td>
-                        <td>${AUDIO_CODEC_OVERRIDES.get(data['audio_codec'], data['audio_codec'].upper())}</td>
-                        <td><i class="fa fa-long-arrow-right"></i></td>
-                        <td>${AUDIO_CODEC_OVERRIDES.get(data['stream_audio_codec'], data['stream_audio_codec'].upper())}</td>
-                    </tr>
-                    <tr>
-                        <td>Bitrate</td>
-                        <td>${data['audio_bitrate']} ${'kbps' if data['audio_bitrate'] else ''}</td>
-                        <td><i class="fa fa-long-arrow-right"></i></td>
-                        <td>${data['stream_audio_bitrate']} ${'kbps' if data['stream_audio_bitrate'] else ''}</td>
-                    </tr>
-                    <tr>
-                        <td>Channels</td>
-                        <td>${data['audio_channels']}</td>
-                        <td><i class="fa fa-long-arrow-right"></i></td>
-                        <td>${data['stream_audio_channels']}</td>
-                    </tr>
-                    <tr>
-                        <td>Language</td>
-                        <td>${data['audio_language'] or 'Unknown'}</td>
-                        <td></td>
-                        <td>-</td>
-                    </tr>
-
-                </tbody>
-            </table>
-            % if data['subtitles'] == 1:
-            <table class="stream-info">
-                <thead>
-                    <tr>
-                        <th>
-                            Subtitles
-                        </th>
-                        <th></th>
-                        <th></th>
-                        <th>
-                            ${'direct play' if data['stream_subtitle_decision'] not in ('transcode', 'copy', 'burn') else data['stream_subtitle_decision']}
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td>Codec</td>
-                        <td>${data['subtitle_codec'].upper()}</td>
-                        <td><i class="fa fa-long-arrow-right"></i></td>
-                        <td>${data['stream_subtitle_codec'].upper() or '-'}</td>
-                    </tr>
-                    <tr>
-                        <td>Language</td>
-                        <td>${data['subtitle_language'] or 'Unknown'}</td>
-                        <td></td>
-                        <td>-</td>
-                    </tr>
-                    % if data['subtitle_forced']:
-                    <tr>
-                        <td>Forced</td>
-                        <td>${bool(data['subtitle_forced'])}</td>
-                        <td></td>
-                        <td>-</td>
-                    </tr>
-                    % endif
-                </tbody>
-            </table>
-            % endif
         </div>
         <div class="modal-footer">
         </div>
diff --git a/data/interfaces/default/support.html b/data/interfaces/default/support.html
deleted file mode 100644
index 658fcf61..00000000
--- a/data/interfaces/default/support.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<%inherit file="base.html"/>
-<%!
-    from plexpy.helpers import anon_url
-%>
-<%def name="headIncludes()">
-</%def>
-
-<%def name="headerIncludes()">
-</%def>
-
-<%def name="body()">
-<div class='container-fluid'>
-    <div class='table-card-header'>
-        <div class="header-bar">
-            <span><i class="fa fa-comment"></i> Support</span>
-        </div>
-        <div class="button-bar">
-            <div class="btn-group">
-                <a class="btn btn-dark" href="${anon_url('https://tautulli.com/discord')}" target="_blank" rel="noreferrer"><i class="fab fa-discord"></i>&nbsp; Join Discord</a>
-            </div>
-            <div class="btn-group">
-                <a class="btn btn-dark" href="${anon_url('https://www.reddit.com/r/Tautulli')}" target="_blank" rel="noreferrer"><i class="fab fa-reddit"></i>&nbsp; Join Reddit</a>
-            </div>
-            <div class="btn-group">
-                <button class="btn btn-dark" id="popout-iframe-button"><i class="fa fa-external-link"></i> Pop Out Chat</button>
-            </div>
-        </div>
-    </div>
-    <div class='table-card-back'>
-        <div class="iframe-container">
-            <iframe class="iframe" allowfullscreen="true" id="support-iframe" data-name="Tautulli-Support" data-src="https://support.tautulli.com"
-                    sandbox="allow-presentation allow-forms allow-same-origin allow-pointer-lock allow-scripts allow-popups allow-modals allow-top-navigation"
-                    style="display: none;" rel="noreferrer">
-            </iframe>
-            <div class="iframe-overlay">
-                <div class="iframe-button-container">
-                    <a class="iframe-button">Start chatting now</a>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-</%def>
-
-<%def name="modalIncludes()">
-</%def>
-
-<%def name="javascriptIncludes()">
-<script>
-    var popout_chat;
-    $('.iframe-button').click(function () {
-        if (popout_chat) {
-            popout_chat.close();
-        }
-
-        var iframe = $('#support-iframe');
-        iframe.attr('src', iframe.data('src')).fadeIn();
-        $('.iframe-overlay').fadeOut();
-    });
-
-    $('#popout-iframe-button').click(function () {
-        var iframe = $('#support-iframe');
-        popout_chat = PopupCenter(iframe.data('src'), 'Tautulli-Discord-Support', 1280, 720);
-        iframe.attr('src', '').fadeOut();
-        $('.iframe-overlay').fadeIn();
-    });
-</script>
-</%def>
diff --git a/data/interfaces/default/sync.html b/data/interfaces/default/sync.html
index 97c3f96d..3d541219 100644
--- a/data/interfaces/default/sync.html
+++ b/data/interfaces/default/sync.html
@@ -1,9 +1,9 @@
 <%inherit file="base.html"/>
 
 <%def name="headIncludes()">
-<link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.min.css">
-<link rel="stylesheet" href="${http_root}css/tautulli-dataTables.css">
-<link rel="stylesheet" href="${http_root}css/dataTables.colVis.css">
+<link rel="stylesheet" href="interfaces/default/css/dataTables.bootstrap.css">
+<link rel="stylesheet" href="interfaces/default/css/plexpy-dataTables.css">
+<link rel="stylesheet" href="interfaces/default/css/dataTables.colVis.css">
 <style>
     td {word-wrap: break-word}
 </style>
@@ -16,48 +16,26 @@
 <div class='container-fluid'>
     <div class='table-card-header'>
         <div class="header-bar">
-            <span id="sync-xml"><i class="fa fa-cloud-download"></i> Synced Items</span>
+            <span><i class="fa fa-cloud-download"></i> Synced Items</span>
         </div>
-        <div class="button-bar">
-            % if _session['user_group'] == 'admin':
-            <div class="btn-group">
-                <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="sync-row-edit-mode">
-                    <i class="fa fa-trash-o"></i> Delete mode
-                </button>
-            </div>
-            % endif
-            % if _session['user_group'] == 'admin':
-            <div class="btn-group" id="user-selection">
-                <label>
-                    <select name="sync-user" id="sync-user" class="btn" style="color: inherit;">
-                        <option value="">All Users</option>
-                        <option disabled>&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;</option>
-                    </select>
-                </label>
-            </div>
-            % endif
-            <div class="btn-group">
-                <button class="btn btn-dark refresh-syncs-button" id="refresh-syncs-list"><i class="fa fa-refresh"></i> Refresh synced items</button>
-            </div>
-            <div class="btn-group colvis-button-bar"></div>
+        <div class="colvis-button-bar hidden-phone">
         </div>
     </div>
     <div class='table-card-back'>
-        <table class="display sync_table" id="sync_table" width="100%">
+        <table class="display" id="sync_table" width="100%">
             <thead>
             <tr>
-                <th align="left" id="delete_row">Delete</th>
-                <th align="left" id="state">State</th>
-                <th align="left" id="user">User</th>
-                <th align="left" id="sync_title">Title</th>
-                <th align="left" id="type">Type</th>
-                <th align="left" id="platform">Platform</th>
-                <th align="left" id="device">Device</th>
-                <th align="left" id="size">Total Size</th>
-                <th align="left" id="items">Total Items</th>
-                <th align="left" id="converted">Converted</th>
-                <th align="left" id="downloaded">Downloaded</th>
-                <th align="left" id="percent_complete">Complete</th>
+                <th align='left' id="state">State</th>
+                <th align='left' id="user">User</th>
+                <th align='left' id="title">Title</th>
+                <th align='left' id="type">Type</th>
+                <th align='left' id="platform">Platform</th>
+                <th align='left' id="device">Device</th>
+                <th align='left' id="size">Total Size</th>
+                <th align='left' id="items">Total Items</th>
+                <th align='left' id="converted">Converted</th>
+                <th align='left' id="downloaded">Downloaded</th>
+                <th align='left' id="percent_complete">Complete</th>
             </tr>
             </thead>
             <tbody>
@@ -67,133 +45,22 @@
 </div>
 </%def>
 
-<%def name="modalIncludes()">
-<div class="modal fade" id="confirm-modal-delete" tabindex="-1" role="dialog" aria-labelledby="confirm-modal-delete">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title" id="myModalLabel">Confirm Delete</h4>
-            </div>
-            <div class="modal-body" style="text-align: center;">
-                <p>Are you REALLY sure you want to delete <strong><span id="deleteCount"></span></strong> sync item(s)?</p>
-                <p>This is permanent and cannot be undone!</p>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-dark" data-dismiss="modal">Cancel</button>
-                <button type="button" class="btn btn-danger btn-ok" data-dismiss="modal" id="confirm-delete">Delete</button>
-            </div>
-        </div>
-    </div>
-</div>
-</%def>
-
 <%def name="javascriptIncludes()">
-<script src="${http_root}js/jquery.dataTables.min.js"></script>
-<script src="${http_root}js/dataTables.bootstrap.min.js"></script>
-<script src="${http_root}js/dataTables.bootstrap.pagination.js"></script>
-<script src="${http_root}js/dataTables.colVis.js"></script>
-<script src="${http_root}js/tables/sync_table.js${cache_param}"></script>
+<script src="interfaces/default/js/jquery.dataTables.min.js"></script>
+<script src="interfaces/default/js/dataTables.bootstrap.min.js"></script>
+<script src="interfaces/default/js/dataTables.bootstrap.pagination.js"></script>
+<script src="interfaces/default/js/dataTables.colVis.js"></script>
+<script src="interfaces/default/js/tables/sync_table.js"></script>
 <script>
     $(document).ready(function() {
-        // Load user ids and names (for the selector)
-        $.ajax({
-            url: 'get_user_names',
-            type: 'GET',
-            dataType: 'json',
-            success: function (data) {
-                var select = $('#sync-user');
-                data.sort(function (a, b) {
-                    return a.friendly_name.localeCompare(b.friendly_name);
-                });
-                data.forEach(function (item) {
-                    select.append('<option value="' + item.user_id + '">' +
-                        item.friendly_name + '</option>');
-                });
-            }
-        });
-
-        function loadSyncTable(selected_user_id) {
-            sync_table_options.ajax = {
-                url: 'get_sync?user_id=' + selected_user_id,
-                type: 'POST'
-            };
-            sync_table = $('#sync_table').DataTable(sync_table_options);
-            var colvis = new $.fn.dataTable.ColVis(sync_table, {
-                buttonText: '<i class="fa fa-columns"></i> Select columns',
-                buttonClass: 'btn btn-dark',
-                exclude: [0]
-            });
-            $(colvis.button()).appendTo('div.colvis-button-bar');
-
-            clearSearchButton('sync_table', sync_table);
-
-            $('#sync-user').on('change', function () {
-                selected_user_id = $(this).val() || null;
-                sync_table.ajax.url('get_sync?user_id=' + selected_user_id).load();
-            });
+        sync_table_options.ajax = {
+            "url": "get_sync"
         }
+        sync_table = $('#sync_table').DataTable(sync_table_options);
+        var colvis = new $.fn.dataTable.ColVis( sync_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' } );
+        $( colvis.button() ).appendTo('div.colvis-button-bar');
 
-        var selected_user_id = "${_session['user_group']}" == "admin" ? null : "${_session['user_id']}";
-        loadSyncTable(selected_user_id);
-
-        % if _session['user_group'] == 'admin':
-        $('#sync-row-edit-mode').on('click', function() {
-            if ($(this).hasClass('active')) {
-                $(this).tooltip('destroy');
-
-                if (syncs_to_delete.length > 0) {
-                    $('#deleteCount').text(syncs_to_delete.length);
-                    $('#confirm-modal-delete').modal();
-                    $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
-                        syncs_to_delete.forEach(function(row, idx) {
-                            $.ajax({
-                                url: 'delete_sync_rows',
-                                type: 'POST',
-                                data: {
-                                    client_id: row.client_id,
-                                    sync_id: row.sync_id
-                                },
-                                async: true,
-                                success: function (data) {
-                                    var msg = "Sync deleted";
-                                    showMsg(msg, false, true, 2000);
-                                }
-                            });
-                        });
-                        sync_table.ajax.reload();
-                    });
-                }
-
-                $('.delete-control').each(function () {
-                    $(this).addClass('hidden');
-                    $('#sync-row-edit-mode-alert').fadeOut(200);
-                });
-
-            } else {
-                $(this).tooltip({
-                    container: '.body-container',
-                    placement: 'bottom',
-                    title: 'Select syncs to delete. Data is deleted upon exiting delete mode.',
-                    trigger: 'manual'
-                }).tooltip('show');
-
-                syncs_to_delete = [];
-                $('.delete-control').each(function() {
-                    $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
-                    $(this).removeClass('hidden');
-                });
-            }
-        });
-        % endif
-    });
-
-    $("#refresh-syncs-list").click(function() {
-        sync_table.ajax.reload();
-    });
-
-    $('#sync-xml').on('tripleclick', function () {
-        openPlexXML('/servers/{machine_id}/sync_lists', true);
+        clearSearchButton('sync_table', sync_table);
     });
 </script>
 </%def>
diff --git a/data/interfaces/default/update_metadata.html b/data/interfaces/default/update_metadata.html
deleted file mode 100644
index 59b35fd0..00000000
--- a/data/interfaces/default/update_metadata.html
+++ /dev/null
@@ -1,257 +0,0 @@
-<%doc>
-USAGE DOCUMENTATION :: PLEASE LEAVE THIS AT THE TOP OF THIS FILE
-
-For Mako templating syntax documentation please visit: http://docs.makotemplates.org/en/latest/
-
-Filename:           update_metadata.html
-Version:            0.1
-Variable names:     query [list]
-
-query :: Usable parameters
-
-== Global keys ==
-query_string            Returns the string used for the search query.
-title                   Returns the name of the movie, episode, or track.
-parent_title            Returns the name of the album.
-grandparent_title       Returns the name of the show, or artist.
-media_index             Returns the index number of the episode, or track.
-parent_media_index      Returns the index number of the season.
-year                    Returns the release year of the movie, or show.
-media_type              Returns the type of media. Either 'movie', 'show', 'season', 'episode', 'artist', 'album', or 'track'.
-rating_key              Returns the unique identifier for the media item.
-
-DOCUMENTATION :: END
-</%doc>
-
-<%inherit file="base.html"/>
-
-<%def name="headIncludes()">
-</%def>
-
-<%def name="body()">
-% if query:
-<div class="container-fluid">
-    <div class="row">
-        <div class="summary-container">
-            <div class="summary-navbar">
-                <div class="col-md-12">
-                    <div class="summary-navbar-list">
-                        <ul class="list-unstyled breadcrumb">
-                            % if query['media_type'] == 'movie':
-                            <li>Movies</li>
-                            <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                            <li class="active">${query['title']}</li>
-                            % elif query['media_type'] == 'show':
-                            <li>TV Shows</li>
-                            <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                            <li class="active">${query['grandparent_title']}</li>
-                            % elif query['media_type'] == 'season':
-                            <li class="hidden-xs hidden-sm">TV Shows</li>
-                            <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                            <li class="hidden-xs hidden-sm">${query['grandparent_title']}</li>
-                            <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                            <li class="active">${query['parent_title']}</li>
-                            % elif query['media_type'] == 'episode':
-                            <li class="hidden-xs hidden-sm">TV Shows</li>
-                            <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                            <li class="hidden-xs hidden-sm">${query['grandparent_title']}</li>
-                            <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                            <li>${query['parent_title']}</li>
-                            <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                            <li class="active">Episode ${query['media_index']} - ${query['title']}</li>
-                            % elif query['media_type'] == 'artist':
-                            <li>Music</li>
-                            <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                            <li class="active">${query['grandparent_title']}</li>
-                            % elif query['media_type'] == 'album':
-                            <li class="hidden-xs hidden-sm">Music</li>
-                            <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                            <li>${query['grandparent_title']}</li>
-                            <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                            <li class="active">${query['parent_title']}</li>
-                            % elif query['media_type'] == 'track':
-                            <li class="hidden-xs hidden-sm">Music</li>
-                            <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                            <li class="hidden-xs hidden-sm">${query['grandparent_title']}</li>
-                            <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                            <li>${query['parent_title']}</li>
-                            <span class="breadcrumb-arrow"><i class="fa fa-chevron-right"></i></span>
-                            <li class="active">Track ${query['media_index']} - ${query['title']}</li>
-                            % endif
-                        </ul>
-                    </div>
-                </div>
-            </div>
-            <div class="summary-content-wrapper">
-                <div class='col-md-12'>
-                    % if not update:
-                    <div style="text-align: center; margin-top: 20px;">
-                        <i class="fa fa-exclamation-triangle"></i> Tautulli cannot find this item's metadata. Either this media item is not available in the Plex Media Server library or it has been moved.
-                    </div>
-                    % endif
-                    <div style="text-align: center; margin-top: 20px;">
-                        <i class="fa fa-info-circle"></i> Please select the correct match below to update the Tautulli database.
-                    </div>
-                    <div class='table-card-header'>
-                        <div class="header-bar">
-                            <span>Search Results for <strong><span id="update_query_title">${query['query_string']}</span></strong></span>
-                        </div>
-                        <div class="button-bar">
-                            <form class="form" id="update_search_form">
-                                    Incorrect search results? Try a different query:
-                                    <div class="input-group" role="group" aria-label="Update Metadata Query">
-                                        <input type="search" class="form-control" name="update_query" id="update_query" aria-label="Query" placeholder="Query..." value="${query['query_string']}" />
-                                        <span class="input-group-btn">
-                                            <button class="btn btn-form btn-dark btn-inactive" type="submit" id="update_search_button"><i class="fa fa-search"></i></button>
-                                        </span>
-                                    </div>
-                            </form>
-                        </div>
-                    </div>
-                    <div class='table-card-back'>
-                        <div id="search-results-list" class="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading search results...</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-% else:
-<div class="container-fluid">
-    <div class="row">
-        <div class="summary-container">
-            <div class="summary-navbar">
-                <div class="col-md-12">
-                    <div class="summary-navbar-list">
-                    </div>
-                </div>
-            </div>
-            <div class="summary-content-wrapper">
-                <div class='col-md-12'>
-                    <div style="text-align: center; margin-top: 20px;">
-                        <i class="fa fa-exclamation-triangle"></i> Tautulli cannot find this item's metadata. Either this media item is not available in the Plex Media Server library or it has been moved.
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-% endif
-</%def>
-
-<%def name="modalIncludes()">
-% if query:
-<%
-    from plexpy.helpers import short_season
-%>
-<div class="modal fade" id="confirm-modal-update" tabindex="-1" role="dialog" aria-labelledby="confirm-modal-update">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title" id="myModalLabel">Confirm Update</h4>
-            </div>
-            <div class="modal-body" style="text-align: center;">
-                <p>Are you REALLY sure you want to replace
-                <p>
-                    <strong>
-                        % if query['media_type'] == 'movie':
-                        ${query['title']}<br />${query['year']}
-                        % elif query['media_type'] == 'show':
-                        ${query['grandparent_title']}
-                        % elif query['media_type'] == 'season':
-                        ${query['grandparent_title']}<br />${query['parent_title']}
-                        % elif query['media_type'] == 'episode':
-                        ${query['grandparent_title']}<br />${query['title']}<br />${short_season(query['parent_title'])} &middot; E${query['media_index']}
-                        % elif query['media_type'] == 'artist':
-                        ${query['grandparent_title']}
-                        % elif query['media_type'] == 'album':
-                        ${query['grandparent_title']}<br />${query['parent_title']}
-                        % elif query['media_type'] == 'track':
-                        ${query['grandparent_title']}<br />${query['title']}<br />${query['parent_title']}
-                        % endif
-                    </strong>
-                </p>
-                <p> with </p>
-                <p><span id="new_title"></span></p>
-                <p>from the <strong><span id="new_library"></span></strong> library?</p>
-                % if query['media_type'] != 'movie':
-                <p>All items for <strong>${query['grandparent_title']}</strong> will also be updated.</p>
-                % endif
-                <p>This is permanent and cannot be undone!</p>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-dark" data-dismiss="modal">Cancel</button>
-                <button type="button" class="btn btn-danger btn-ok" data-dismiss="modal" id="confirm-update">Update</button>
-            </div>
-        </div>
-    </div>
-</div>
-% endif
-</%def>
-
-<%def name="javascriptIncludes()">
-
-% if query:
-<script>
-    function getSearchResults() {
-        var query_string = $('#update_query').val();
-        $.ajax({
-            url: 'get_search_results_children',
-            type: 'GET',
-            async: true,
-            data: {
-                query: query_string,
-                limit: 30,
-                media_type: '${query["media_type"]}',
-                season_index: '${query["parent_media_index"]}'
-            },
-            complete: function (xhr, status) {
-                $('#search-results-list').html(xhr.responseText);
-                $('#update_query_title').text(query_string)
-            }
-        });
-    }
-
-    $(document).on('click', '#search-results-list a', function (e) {
-        e.preventDefault();
-        var new_rating_key = $(this).data('rating_key');
-        var new_library_section = $(this).data('library_name');
-        var new_href = $(this).attr('href');
-
-        $('#new_title').html($(this).find('.item-children-instance-text-wrapper').html());
-        $('#new_library').text(new_library_section);
-
-        $('#confirm-modal-update').modal();
-        $('#confirm-modal-update').one('click', '#confirm-update', function () {
-            $(this).prop('disabled', true);
-            var msg = '<i class="fa fa-refresh fa-spin"></i>&nbsp; Updating database...';
-            showMsg(msg, false, false, 0);
-
-            $.ajax({
-                url: 'update_metadata_details',
-                data: {
-                    old_rating_key: '${query["rating_key"]}',
-                    new_rating_key: new_rating_key,
-                    media_type: '${query["media_type"]}',
-                    single_update: true
-                },
-                async: true,
-                success: function (data) {
-                    window.location.href = new_href;
-                }
-            });
-        });
-    });
-
-    getSearchResults();
-    $('#update_search_form').submit(function (e) {
-        e.preventDefault();
-        if ($('#update_query').val().trim() != '')
-        {
-            getSearchResults();
-        }
-    })
-</script>
-% endif
-</%def>
\ No newline at end of file
diff --git a/data/interfaces/default/user.html b/data/interfaces/default/user.html
index adfd6c39..46babfaf 100644
--- a/data/interfaces/default/user.html
+++ b/data/interfaces/default/user.html
@@ -13,12 +13,10 @@ user_id             Returns the user id of the user.
 username            Returns the user's username.
 friendly_name       Returns the friendly name of the user.
 email               Returns the user's email address.
-user_thumb          Returns the thumbnail for the user.
+thumb               Returns the thumbnail for the user.
 is_home_user        Returns bool value for whether the user is part of a Plex Home.
 is_allow_sync       Returns bool value for whether the user has sync rights.
 is_restricted       Returns bool value for whether the user account is restricted.
-do_notify           Returns bool value for whether to send notifications for the user.
-keep_history        Returns bool value for whether to keep history for the user.
 
 DOCUMENTATION :: END
 
@@ -26,672 +24,286 @@ DOCUMENTATION :: END
 
 <%inherit file="base.html"/>
 <%!
-    from plexpy.helpers import page
+from plexpy import helpers
 %>
 
 <%def name="headIncludes()">
-<link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.min.css">
-<link rel="stylesheet" href="${http_root}css/dataTables.colVis.css">
-<link rel="stylesheet" href="${http_root}css/tautulli-dataTables.css">
+<link rel="stylesheet" href="interfaces/default/css/dataTables.bootstrap.css">
+<link rel="stylesheet" href="interfaces/default/css/dataTables.colVis.css">
+<link rel="stylesheet" href="interfaces/default/css/plexpy-dataTables.css">
 </%def>
 
+% if user != None:
 <%def name="body()">
-% if data:
 <div class="container-fluid">
     <div class="row">
-        <div class="summary-container">
-            <div class="summary-navbar">
-                <div class="col-md-12">
-                    <div class="summary-navbar-list">
-                        <ul class="list-unstyled breadcrumb">
-                            <li class="active">${data['friendly_name']}</li>
+        <div class="col-md-12">
+            <div class="table-card-back">
+                <div class="user-info-wrapper">
+                    <div class="user-info-poster-face" id="user-gravatar" style="background-image: url(${data['thumb']});">
+                    </div>
+                    <div class="user-info-username">
+                        <span class="set-username">${data['friendly_name']}</span> <span id="edit-user-tooltip" data-target="tooltip" title="Edit user details"><a href="#" data-toggle="modal" data-target="#edit-user-modal" id="toggle-edit-user-modal"><i class="fa fa-pencil"></i></a></span>
+                    </div>
+                    <div class="user-info-nav">
+                        <ul class="user-info-nav">
+                            <li class="active"><a href="#profile" data-toggle="tab">Profile</a></li>
+                            <li><a id="ip-tab-btn" href="#userAddresses" data-toggle="tab">IP Addresses</a></li>
+                            <li><a id="history-tab-btn" href="#userHistory" data-toggle="tab">History</a></li>
+                            <li><a id="sync-tab-btn" href="#userSyncItems" data-toggle="tab">Synced Items</a></li>
                         </ul>
                     </div>
                 </div>
             </div>
-            <div class="summary-content-wrapper" style="min-height: calc(100% - 50px);">
+        </div>
+    </div>
+    <div id="edit-user-modal" class="modal fade" tabindex="-1" role="dialog"
+         aria-labelledby="edit-user-modal">
+    </div>
+</div>
+<div class="tab-content">
+    <div class="tab-pane active" id="profile">
+        <div class="container-fluid">
+            <div class="row">
                 <div class="col-md-12">
+                    <div class="table-card-header">
+                        <div class="header-bar">
+                            <span><i class="fa fa-line-chart"></i> Global Stats</span>
+                        </div>
+                    </div>
                     <div class="table-card-back">
-                        <div class="user-info-wrapper">
-                            <div class="user-info-poster-face" style="background-image: url(${page('pms_image_proxy', data['user_thumb'], None, 80, 80, fallback='user')});">
-                                % if not data['is_active']:
-                                <span class="inactive-user-tooltip" data-toggle="tooltip" title="User not on Plex server">
-                                    <i class="fa fa-2x fa-exclamation-triangle"></i>
-                                </span>
-                                % endif
-                            </div>
-                            <div class="user-info-username">
-                                <span class="set-username">${data['friendly_name']}</span>
-                                % if _session['user_group'] == 'admin':
-                                <span id="edit-user-tooltip" data-target="tooltip" title="Edit user details">
-                                    <a href="#" data-toggle="modal" data-target="#edit-user-modal" id="toggle-edit-user-modal"><i class="fa fa-pencil"></i></a>
-                                </span>
-                                % endif
-                            </div>
-                            <div class="user-info-nav">
-                                <ul class="nav nav-list nav-pills" role="tablist">
-                                    <li class="active"><a id="nav-tabs-profile" href="#tabs-profile" role="tab" data-toggle="tab">Profile</a></li>
-                                    <li><a id="nav-tabs-history" href="#tabs-history" role="tab" data-toggle="tab">History</a></li>
-                                    <li><a id="nav-tabs-playlists" href="#tabs-playlists" role="tab" data-toggle="tab">Playlists</a></li>
-                                    % if _session['user_group'] == 'admin':
-                                    <li><a id="nav-tabs-export" href="#tabs-export" role="tab" data-toggle="tab">Export</a></li>
-                                    % endif
-                                    <li><a id="nav-tabs-ipaddresses" href="#tabs-ipaddresses" role="tab" data-toggle="tab">IP Addresses</a></li>
-                                    <li><a id="nav-tabs-tautullilogins" href="#tabs-tautullilogins" role="tab" data-toggle="tab">Tautulli Logins</a></li>
-                                </ul>
-                            </div>
+                        <div id="user-time-stats" class="user-overview-stats-wrapper">
+                            <div class='muted'><i class="fa fa-refresh fa-spin"></i> Loading data...</div>
+                            <br>
                         </div>
                     </div>
                 </div>
-                <div class="tab-content">
-                    <div role="tabpanel" class="tab-pane active" id="tabs-profile">
-                        <div class="container-fluid">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <div class="table-card-header">
-                                        <div class="header-bar">
-                                            <span><i class="fa fa-line-chart"></i> Global Stats</span>
-                                        </div>
-                                    </div>
-                                    <div class="table-card-back">
-                                        <div id="user-time-stats" class="user-overview-stats-wrapper">
-                                            <div class='muted'><i class="fa fa-refresh fa-spin"></i> Loading data...</div>
-                                            <br>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="container-fluid">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <div class="table-card-header">
-                                        <div class="header-bar">
-                                            <span><i class="fa fa-television"></i> Player Stats</span>
-                                        </div>
-                                    </div>
-                                    <div class="table-card-back">
-                                        <div id="user-player-stats" class="user-player">
-                                            <div class='muted'><i class="fa fa-refresh fa-spin"></i> Loading data...</div>
-                                            <br>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="container-fluid">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <div class="table-card-header">
-                                        <ul class="nav nav-header nav-dashboard pull-right">
-                                            <li>
-                                                <a href="#" id="recently-watched-page-left" class="paginate-watched btn-gray disabled" data-id="-1"><i class="fa fa-lg fa-chevron-left"></i></a>
-                                            </li>
-                                            <li>
-                                                <a href="#" id="recently-watched-page-right" class="paginate-watched btn-gray" data-id="+1"><i class="fa fa-lg fa-chevron-right"></i></a>
-                                            </li>
-                                        </ul>
-                                        <div class="header-bar">
-                                            <span><i class="fa fa-history"></i> Recently Played</span>
-                                        </div>
-                                    </div>
-                                    <div class="table-card-back">
-                                        <div id="user-recently-watched">
-                                            <div class='muted'><i class="fa fa-refresh fa-spin"></i> Loading data...</div>
-                                            <br>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
+            </div>
+        </div>
+        <div class="container-fluid">
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="table-card-header">
+                        <div class="header-bar">
+                            <span><i class="fa fa-television"></i> Player Stats</span>
                         </div>
                     </div>
-                    <div role="tabpanel" class="tab-pane" id="tabs-history">
-                        <div class="container-fluid">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <div class='table-card-header'>
-                                        <div class="header-bar">
-                                            <span>
-                                                <i class="fa fa-history"></i> History for <strong>
-                                                    <span class="set-username">${data['friendly_name']}</span>
-                                                </strong>
-                                            </span>
-                                        </div>
-                                        <div class="button-bar">
-                                            % if _session['user_group'] == 'admin':
-                                            <div class="btn-group">
-                                                <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
-                                                    <i class="fa fa-trash-o"></i> Delete mode
-                                                </button>
-                                            </div>
-                                            % endif
-                                            <div class="btn-group" data-toggle="buttons" id="media_type-selection">
-                                                <label class="btn btn-dark btn-filter">
-                                                    <input type="checkbox" name="media_type-filter" id="history-media_type-movie" value="movie" autocomplete="off"><i class="fa fa-film"></i> Movies
-                                                </label>
-                                                <label class="btn btn-dark btn-filter">
-                                                    <input type="checkbox" name="media_type-filter" id="history-media_type-episode" value="episode" autocomplete="off"><i class="fa fa-television"></i> TV Shows
-                                                </label>
-                                                <label class="btn btn-dark btn-filter">
-                                                    <input type="checkbox" name="media_type-filter" id="history-media_type-track" value="track" autocomplete="off"><i class="fa fa-music"></i> Music
-                                                </label>
-                                                <label class="btn btn-dark btn-filter">
-                                                    <input type="checkbox" name="media_type-filter" id="history-media_type-live" value="live" autocomplete="off"><i class="fa fa-broadcast-tower"></i> Live TV
-                                                </label>
-                                            </div>
-                                            <div class="btn-group" data-toggle="buttons" id="transcode_decision-selection">
-                                                <label class="btn btn-dark btn-filter">
-                                                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-direct_play" value="direct play" autocomplete="off"><i class="fa fa-play-circle"></i> Direct Play
-                                                </label>
-                                                <label class="btn btn-dark btn-filter">
-                                                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-direct_stream" value="copy" autocomplete="off"><i class="fa fa-stream"></i> Direct Stream
-                                                </label>
-                                                <label class="btn btn-dark btn-filter">
-                                                    <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-transcode" value="transcode" autocomplete="off"><i class="fa fa-server"></i> Transcode
-                                                </label>
-                                            </div>
-                                            <div class="btn-group">
-                                                <button class="btn btn-dark refresh-history-button" id="refresh-history-list"><i class="fa fa-refresh"></i> Refresh history</button>
-                                            </div>
-                                            <div class="btn-group colvis-button-bar" id="button-bar-history"></div>
-                                        </div>
-                                    </div>
-                                    <div class="table-card-back">
-                                        <table class="display history_table" id="history_table-UID-${data['user_id']}" width="100%">
-                                            <thead>
-                                                <tr>
-                                                    <th align="left" id="delete">Delete</th>
-                                                    <th align="left" id="date">Date</th>
-                                                    <th align="left" id="friendly_name">User</th>
-                                                    <th align="left" id="ip_address">IP Address</th>
-                                                    <th align="left" id="platform">Platform</th>
-                                                    <th align="left" id="product">Product</th>
-                                                    <th align="left" id="player">Player</th>
-                                                    <th align="left" id="title">Title</th>
-                                                    <th align="left" id="started">Started</th>
-                                                    <th align="left" id="paused_counter">Paused</th>
-                                                    <th align="left" id="stopped">Stopped</th>
-                                                    <th align="left" id="play_duration">Duration</th>
-                                                    <th align="left" id="percent_complete"></th>
-                                                </tr>
-                                            </thead>
-                                            <tbody></tbody>
-                                        </table>
-                                    </div>
-                                </div>
-                            </div>
+                    <div class="table-card-back">
+                        <div id="user-player-stats" class="user-player">
+                            <div class='muted'><i class="fa fa-refresh fa-spin"></i> Loading data...</div>
+                            <br>
                         </div>
                     </div>
-                    <div role="tabpanel" class="tab-pane" id="tabs-playlists">
-                        <div class="container-fluid">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <div class='table-card-header'>
-                                        <div class="header-bar">
-                                            <span>
-                                                <i class="fa fa-list-alt"></i> Playlists for <strong>
-                                                    <span class="set-username">${data['friendly_name']}</span>
-                                                </strong>
-                                            </span>
-                                        </div>
-                                        <div class="button-bar">
-                                            % if _session['user_group'] == 'admin':
-                                            <div class="btn-group">
-                                                <button class="btn btn-dark export-button" id="toggle-export-modal" data-toggle="modal" data-target="#export-modal"
-                                                        data-user_id="${data['user_id']}" data-media_type="playlist" data-sub_media_type="video,audio,photo"
-                                                        data-export_type="playlist">
-                                                    <i class="fa fa-file-export"></i> Export playlists
-                                                </button>
-                                            </div>
-                                            % endif
-                                            <div class="btn-group">
-                                                <button class="btn btn-dark refresh-playlists-table-button" id="refresh-playlists-table">
-                                                    <i class="fa fa-refresh"></i> Refresh playlists
-                                                </button>
-                                            </div>
-                                            <div class="btn-group colvis-button-bar" id="button-bar-playlists"></div>
-                                        </div>
-                                    </div>
-                                    <div class="table-card-back">
-                                        <table class="display playlists_table" id="playlists_table-SID-${data['user_id']}" width="100%">
-                                            <thead>
-                                                <tr>
-                                                    <th align="left" id="playlistTitle">Playlist Title</th>
-                                                    <th align="left" id="playlistLeafCount">Playlist Items</th>
-                                                    <th align="left" id="playlistDuration">Playlist Duration</th>
-                                                </tr>
-                                            </thead>
-                                            <tbody></tbody>
-                                        </table>
-                                    </div>
-                                </div>
-                            </div>
+                </div>
+            </div>
+        </div>
+        <div class="container-fluid">
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="table-card-header">
+                        <div class="header-bar">
+                            <span><i class="fa fa-history"></i> Recently Watched</span>
                         </div>
                     </div>
-                    % if _session['user_group'] == 'admin':
-                    <div role="tabpanel" class="tab-pane" id="tabs-export">
-                        <div class="container-fluid">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <div class='table-card-header'>
-                                        <div class="header-bar">
-                                            <span>
-                                                <i class="fa fa-file-export"></i> Metadata Exports for <strong>
-                                                    <span class="set-username">${data['friendly_name']}</span>
-                                                </strong>
-                                            </span>
-                                        </div>
-                                        <div class="button-bar">
-                                            <div class="btn-group">
-                                                <button class="btn btn-dark refresh-export-table-button" id="refresh-export-table">
-                                                    <i class="fa fa-refresh"></i> Refresh exports
-                                                </button>
-                                            </div>
-                                            <div class="btn-group colvis-button-bar" id="button-bar-export"></div>
-                                        </div>
-                                    </div>
-                                    <div class="table-card-back">
-                                        <table class="display export_table" id="export_table-SID-${data['user_id']}" width="100%">
-                                            <thead>
-                                                <tr>
-                                                    <th align="left" id="timestamp">Exported At</th>
-                                                    <th align="left" id="media_type_title">Media Type</th>
-                                                    <th align="left" id="rating_key">Rating Key</th>
-                                                    <th align="left" id="filename">Filename</th>
-                                                    <th align="left" id="file_format">File Format</th>
-                                                    <th align="left" id="metadata_level">Metadata Level</th>
-                                                    <th align="left" id="media_info_level">Media Info Level</th>
-                                                    <th align="left" id="media_info_level">Custom Fields</th>
-                                                    <th align="left" id="file_size">File Size</th>
-                                                    <th align="left" id="complete">Download</th>
-                                                    <th align="left" id="delete">Delete</th>
-                                                </tr>
-                                            </thead>
-                                            <tbody></tbody>
-                                        </table>
-                                    </div>
-                                </div>
-                            </div>
+                    <div class="table-card-back">
+                        <div id="user-recently-watched">
+                            <div class='muted'><i class="fa fa-refresh fa-spin"></i> Loading data...</div>
+                            <br>
                         </div>
                     </div>
-                    % endif
-                    <div role="tabpanel" class="tab-pane" id="tabs-ipaddresses">
-                        <div class="container-fluid">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <div class="table-card-header">
-                                        <div class="header-bar">
-                                            <span>
-                                                <i class="fa fa-map-marker"></i> IP Addresses for <strong>
-                                                    <span class="set-username">${data['friendly_name']}</span>
-                                                </strong>
-                                            </span>
-                                        </div>
-                                        <div class="button-bar">
-                                            <div class="btn-group">
-                                                <button class="btn btn-dark refresh-ip-address-button" id="refresh-ip-address-list"><i class="fa fa-refresh"></i> Refresh IP addresses</button>
-                                            </div>
-                                            <div class="btn-group colvis-button-bar" id="button-bar-ip-address"></div>
-                                        </div>
-                                    </div>
-                                    <div class="table-card-back">
-                                        <table class="display user_ip_table" id="user_ip_table-UID-${data['user_id']}" width="100%">
-                                            <thead>
-                                                <tr>
-                                                    <th align="left" id="last_seen">Last Streamed</th>
-                                                    <th align="left" id="first_seen">First Streamed</th>
-                                                    <th align="left" id="ip_address">IP Address</th>
-                                                    <th align="left" id="platform">Last Platform</th>
-                                                    <th align="left" id="player">Last Player</th>
-                                                    <th align="left" id="last_played">Last Played</th>
-                                                    <th align="left" id="play_count">Play Count</th>
-                                                </tr>
-                                            </thead>
-                                        </table>
-                                    </div>
-                                </div>
-                            </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="tab-pane" id="userAddresses">
+        <div class="container-fluid">
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="table-card-header">
+                        <div class="header-bar">
+                            <span><i class="fa fa-map-marker"></i> IP Addresses for <strong>
+                                <span class="set-username">${data['friendly_name']}</span>
+                            </strong></span>
                         </div>
                     </div>
-                    <div role="tabpanel" class="tab-pane" id="tabs-tautullilogins">
-                        <div class="container-fluid">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <div class='table-card-header'>
-                                        <div class="header-bar">
-                                            <span>
-                                                <i class="fa fa-sign-in"></i> Tautulli Login for <strong>
-                                                    <span class="set-username">${data['friendly_name']}</span>
-                                                </strong>
-                                            </span>
-                                        </div>
-                                        <div class="button-bar">
-                                            <div class="btn-group">
-                                                <button class="btn btn-dark refresh-login-button" id="refresh-login-list"><i class="fa fa-refresh"></i> Refresh logins</button>
-                                            </div>
-                                            <div class="btn-group colvis-button-bar" id="button-bar-login"></div>
-                                        </div>
-                                    </div>
-                                    <div class="table-card-back">
-                                        <table class="display login_log_table" id="login_log_table-UID-${data['user_id']}" width="100%">
-                                            <thead>
-                                                <tr>
-                                                    <th align="left" id="timestamp">Timestamp</th>
-                                                    <th align="left" id="friendly_name">User</th>
-                                                    <th align="left" id="user_group">User Group</th>
-                                                    <th align="left" id="ip_address">IP Address</th>
-                                                    <th align="left" id="host">Host</th>
-                                                    <th align="left" id="os">Operating System</th>
-                                                    <th align="left" id="browser">Browser</th>
-                                                    <th align="left" id="expiry">Expiry</th>
-                                                    <th align="left" id="login_success"></th>
-                                                </tr>
-                                            </thead>
-                                            <tbody></tbody>
-                                        </table>
-                                    </div>
-                                </div>
-                            </div>
+                    <div class="table-card-back">
+                        <table id="user_ip_table" class="display" width="100%">
+                            <thead>
+                            <tr>
+                                <th align="left">Last Seen</th>
+                                <th align="left">IP Address</th>
+                                <th align="left">Last Platform</th>
+                                <th align="left">Last Player</th>
+                                <th align="left">Last Watched</th>
+                                <th align="left">Play Count</th>
+                            </tr>
+                            </thead>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="tab-pane" id="userHistory">
+        <div class="container-fluid">
+            <div class="row">
+                <div class="col-md-12">
+                    <div class='table-card-header'>
+                        <div class="header-bar">
+                            <span><i class="fa fa-history"></i> Watch History for <strong>
+                                <span class="set-username">${data['friendly_name']}</span>
+                            </strong></span>
+                        </div>
+                        <div class="button-bar">
+                            <div class="colvis-button-bar hidden-xs" id="button-bar-history"></div>
+                            <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
+                                <i class="fa fa-trash-o"></i> Delete mode
+                            </button>
+                            <div class="alert alert-danger alert-edit" role="alert" id="row-edit-mode-alert"><i class="fa fa-exclamation-triangle"></i>&nbspSelect rows to delete. Data is deleted upon exiting delete mode.</div>
                         </div>
                     </div>
+                    <div class="table-card-back">
+                        <table class="display" id="history_table" width="100%">
+                            <thead>
+                            <tr>
+                                <th align='left' id="delete">Delete</th>
+                                <th align='left' id="time">Time</th>
+                                <th align='left' id="friendly_name">User</th>
+                                <th align='left' id="ip_address">IP Address</th>
+                                <th align='left' id="platform">Platform</th>
+                                <th align='left' id="player">Player</th>
+                                <th align='left' id="title">Title</th>
+                                <th align='left' id="started">Started</th>
+                                <th align='left' id="paused_counter">Paused</th>
+                                <th align='left' id="stopped">Stopped</th>
+                                <th align='left' id="duration">Duration</th>
+                                <th align='left' id="percent_complete"></th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="tab-pane" id="userSyncItems">
+        <div class="container-fluid">
+            <div class="row">
+                <div class="col-md-12">
+                    <div class='table-card-header'>
+                        <div class="header-bar">
+                            <span><i class="fa fa-cloud-download"></i> Synced Items for <strong>
+                                <span class="set-username">${data['friendly_name']}</span>
+                            </strong></span>
+                        </div>
+                        <div class="colvis-button-bar hidden-xs" id="button-bar-sync">
+                        </div>
+                    </div>
+                    <div class="table-card-back">
+                        <table class="display" id="sync_table" width="100%">
+                            <thead>
+                            <tr>
+                                <th align='left' id="state">State</th>
+                                <th align='left' id="username">Username</th>
+                                <th align='left' id="sync_title">Title</th>
+                                <th align='left' id="type">Type</th>
+                                <th align='left' id="sync_platform">Platform</th>
+                                <th align='left' id="device">Device</th>
+                                <th align='left' id="size">Total Size</th>
+                                <th align='left' id="items">Total Items</th>
+                                <th align='left' id="converted">Converted</th>
+                                <th align='left' id="downloaded">Downloaded</th>
+                                <th align='left' id="sync_percent_complete">Complete</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="modal fade" id="info-modal" tabindex="-1" role="dialog" aria-labelledby="info-modal">
+    </div>
+    <div class="modal fade" id="ip-info-modal" tabindex="-1" role="dialog" aria-labelledby="ip-info-modal">
+    </div>
+    <div class="modal fade" id="confirm-modal" tabindex="-1" role="dialog" aria-labelledby="confirm-modal">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
+                    <h4 class="modal-title" id="myModalLabel">Confirm Delete</h4>
+                </div>
+                <div class="modal-body" style="text-align: center;">
+                    <p>Are you REALLY sure you want to delete <strong><span id="deleteCount"></span></strong> history item(s)?</p>
+                    <p>This is permanent and cannot be undone!</p>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-dark" data-dismiss="modal">Cancel</button>
+                    <button type="button" class="btn btn-danger btn-ok" data-dismiss="modal" id="confirm-delete">Delete</button>
                 </div>
             </div>
         </div>
     </div>
 </div>
 <footer></footer>
-% else:
-<div class="container-fluid">
-    <div class="row">
-        <div class="summary-container">
-            <div class="summary-navbar">
-                <div class="col-md-12">
-                    <div class="summary-navbar-list">
-                    </div>
-                </div>
-            </div>
-            <div class="summary-content-wrapper">
-                <div class='col-md-12'>
-                    <div style="text-align: center; margin-top: 20px;">
-                        <i class="fa fa-exclamation-triangle"></i> Error retrieving user information. Please see the logs for more details.
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-% endif
-</%def>
-
-<%def name="modalIncludes()">
-<div id="edit-user-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="edit-user-modal">
-</div>
-<div class="modal fade" id="info-modal" tabindex="-1" role="dialog" aria-labelledby="info-modal">
-</div>
-<div class="modal fade" id="ip-info-modal" tabindex="-1" role="dialog" aria-labelledby="ip-info-modal">
-</div>
-<div class="modal fade" id="confirm-modal-delete" tabindex="-1" role="dialog" aria-labelledby="confirm-modal-delete">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title" id="myModalLabel">Confirm Delete</h4>
-            </div>
-            <div class="modal-body" style="text-align: center;">
-                <p>Are you REALLY sure you want to delete <strong><span id="deleteCount"></span></strong> <span id="deleteType"></span> item(s)?</p>
-                <p>This is permanent and cannot be undone!</p>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-dark" data-dismiss="modal">Cancel</button>
-                <button type="button" class="btn btn-danger btn-ok" data-dismiss="modal" id="confirm-delete">Delete</button>
-            </div>
-        </div>
-    </div>
-</div>
-<div id="export-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="export-modal">
-</div>
 </%def>
 
 <%def name="javascriptIncludes()">
-<script src="${http_root}js/jquery.dataTables.min.js"></script>
-<script src="${http_root}js/dataTables.colVis.js"></script>
-<script src="${http_root}js/dataTables.bootstrap.min.js"></script>
-<script src="${http_root}js/dataTables.bootstrap.pagination.js"></script>
-% if data:
+<script src="interfaces/default/js/jquery.dataTables.min.js"></script>
+<script src="interfaces/default/js/dataTables.colVis.js"></script>
+<script src="interfaces/default/js/dataTables.bootstrap.min.js"></script>
+<script src="interfaces/default/js/dataTables.bootstrap.pagination.js"></script>
+<script src="interfaces/default/js/moment-with-locale.js"></script>
+<script src="interfaces/default/js/tables/history_table.js"></script>
+<script src="interfaces/default/js/tables/user_ips.js"></script>
+<script src="interfaces/default/js/tables/sync_table.js"></script>
 <script>
-    % if str(data['user_id']).isdigit():
-    var user_id = ${data['user_id']};
-    % else:
-    var user_id = null;
-    % endif
-
-    var username = '${data['username'].replace("'", "\\'")}';
-</script>
-<script src="${http_root}js/tables/history_table.js${cache_param}"></script>
-<script src="${http_root}js/tables/playlists_table.js${cache_param}"></script>
-<script src="${http_root}js/tables/export_table.js${cache_param}"></script>
-<script src="${http_root}js/tables/user_ips.js${cache_param}"></script>
-<script src="${http_root}js/tables/sync_table.js${cache_param}"></script>
-<script src="${http_root}js/tables/login_logs.js${cache_param}"></script>
-<script>
-    $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
-        $.fn.dataTable.tables({ visible: true, api: true }).columns.adjust();
-    });
-
-    $(".inactive-user-tooltip").tooltip();
-
-    function loadHistoryTable(media_type, transcode_decision) {
-        // Build watch history table
-        history_table_options.ajax = {
-            url: 'get_history',
-            type: 'POST',
-            data: function ( d ) {
-                return {
-                    json_data: JSON.stringify( d ),
-                    user_id: user_id,
-                    media_type: media_type,
-                    transcode_decision: transcode_decision
-                };
-            }
-        };
-        history_table = $('#history_table-UID-${data["user_id"]}').DataTable(history_table_options);
-        history_table.column(2).visible(false);
-
-        var colvis = new $.fn.dataTable.ColVis(history_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark', exclude: [0, 12] });
-        $(colvis.button()).appendTo('#button-bar-history');
-
-        clearSearchButton('history_table-UID-${data["user_id"]}', history_table);
-
-        $('#media_type-selection').on('change', function () {
-            $('#media_type-selection > label').removeClass('active');
-            var selected_filter = $('input[name=media_type-filter]:checked', '#media_type-selection');
-            $(selected_filter).closest('label').addClass('active');
-            media_type = $(selected_filter).map(function () { return $(this).val(); }).get().join(',');
-            setLocalStorage('user_' + user_id + '-history_media_type', media_type);
-            history_table.draw();
-        });
-
-        $('#transcode_decision-selection').on('change', function () {
-            $('#transcode_decision-selection > label').removeClass('active');
-            var selected_filter = $('input[name=transcode_decision-filter]:checked', '#transcode_decision-selection');
-            $(selected_filter).closest('label').addClass('active');
-            transcode_decision = $(selected_filter).map(function () { return $(this).val(); }).get().join(',');
-            setLocalStorage('user_' + user_id + 'history_transcode_decision', transcode_decision);
-            history_table.draw();
-        });
-    }
-
-    $('#nav-tabs-history').on('shown.bs.tab', function() {
-        if (typeof(history_table) === 'undefined') {
-            var media_type = getLocalStorage('user_' + user_id + '-history_media_type', 'all');
-            $.each(media_type.split(','), function (i, item) {
-                var history_media_type = $('#history-media_type-' + item);
-                history_media_type.prop('checked', true);
-                history_media_type.closest('label').addClass('active');
-            });
-
-            var transcode_decision = getLocalStorage('user_' + user_id + 'history_transcode_decision', 'all');
-            $.each(transcode_decision.split(','), function (i, item) {
-                var history_transcode_decision = $('#history-transcode_decision-' + item.replace(' ', '_'));
-                history_transcode_decision.prop('checked', true);
-                history_transcode_decision.closest('label').addClass('active');
-            });
-
-            loadHistoryTable(media_type, transcode_decision);
-        }
-    });
-
-    $("#refresh-history-list").click(function () {
-        history_table.draw();
-    });
-
-    function loadPlaylistsTable() {
-        // Build playlists table
-        playlists_table_options.ajax = {
-            url: 'get_playlists_list',
-            type: 'POST',
-            data: function ( d ) {
-                return {
-                    json_data: JSON.stringify( d ),
-                    user_id: user_id
-                };
-            }
-        };
-        playlists_table = $('#playlists_table-SID-${data["user_id"]}').DataTable(playlists_table_options);
-
-        var colvis = new $.fn.dataTable.ColVis(playlists_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' });
-        $(colvis.button()).appendTo('#button-bar-playlists');
-
-        clearSearchButton('playlists_table-SID-${data["user_id"]}', playlists_table);
-    }
-
-    $('#nav-tabs-playlists').on('shown.bs.tab', function() {
-        if (typeof(playlists_table) === 'undefined') {
-            loadPlaylistsTable();
-        }
-    });
-
-    $("#refresh-playlists-table").click(function () {
-        playlists_table.draw();
-    });
-
-    function loadSyncTable() {
-        // Build user sync table
-        sync_table_options.ajax = {
-             url: 'get_sync?user_id=' + user_id,
-            type: 'POST'
-        };
-        sync_table = $('#sync_table-UID-${data["user_id"]}').DataTable(sync_table_options);
-        sync_table.column(2).visible(false);
-
-        var colvis_sync = new $.fn.dataTable.ColVis( sync_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark', exclude: [0] } );
-        $( colvis_sync.button() ).appendTo('#button-bar-sync');
-
-        clearSearchButton('sync_table-UID-${data["user_id"]}', sync_table);
-    }
-
-    $("#refresh-syncs-list").click(function() {
-        sync_table.ajax.reload();
-    });
-
-    function loadIPAddressTable() {
-        // Build user IP table
-        user_ip_table_options.ajax = {
-            url: 'get_user_ips',
-            type: 'POST',
-            data: function ( d ) {
-                return {
-                    json_data: JSON.stringify( d ),
-                    user_id: user_id
-                };
-            }
-        };
-        user_ip_table = $('#user_ip_table-UID-${data["user_id"]}').DataTable(user_ip_table_options);
-
-        var colvis_user_ip = new $.fn.dataTable.ColVis( user_ip_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark'} );
-        $( colvis_user_ip.button() ).appendTo('#button-bar-ip-address');
-
-        clearSearchButton('user_ip_table-UID-${data["user_id"]}', user_ip_table);
-    }
-
-    $('#nav-tabs-ipaddresses').on('shown.bs.tab', function() {
-        if (typeof(user_ip_table) === 'undefined') {
-            loadIPAddressTable(user_id);
-        }
-    });
-
-    $("#refresh-ip-address-list").click(function () {
-        user_ip_table.draw();
-    });
-
-    function loadLoginTable() {
-        // Build user login table
-        login_log_table_options.ajax = {
-            url: 'get_user_logins',
-            type: 'POST',
-            data: function(d) {
-                return {
-                    json_data: JSON.stringify(d),
-                    user_id: user_id
-                };
-            }
-        };
-        login_log_table = $('#login_log_table-UID-${data["user_id"]}').DataTable(login_log_table_options);
-        login_log_table.columns([1, 2]).visible(false);
-
-        var colvis_login = new $.fn.dataTable.ColVis( login_log_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark', exclude: [7] } );
-        $( colvis_login.button() ).appendTo('#button-bar-login');
-
-        clearSearchButton('login_log_table-UID-${data["user_id"]}', login_log_table);
-    }
-
-    $('#nav-tabs-tautullilogins').on('shown.bs.tab', function() {
-        if (typeof(login_log_table) === 'undefined') {
-            loadLoginTable(user_id);
-        }
-    });
-
-    $("#refresh-login-list").click(function () {
-        login_log_table.draw();
-    });
-
     function recentlyWatched() {
+        var widthVal = $('body').find("#user-recently-watched").width();
+        var tmp = (widthVal-32) / 180;
+
+        if (tmp > 0) {
+            containerSize = parseInt(tmp);
+        } else {
+            containerSize = 1;
+        }
+        
+        % if data['user_id']:
+            var user_id = ${data['user_id']};
+        % else:
+            var user_id = null;
+        % endif
+
         // Populate recently watched
         $.ajax({
             url: 'get_user_recently_watched',
             async: true,
-            data: {
-                user_id: user_id,
-                limit: 50
-            },
+            data: { user_id: user_id, user: '${data['username']}', limit: containerSize },
             complete: function(xhr, status) {
                 $("#user-recently-watched").html(xhr.responseText);
-                highlightScrollerButton("#recently-watched");
-                paginateScroller("#recently-watched", ".paginate-watched");
             }
-        });
+        });        
     }
-
-    recentlyWatched();
-
+    
     $(document).ready(function () {
-        // Javascript to enable link to tab
-        var hash = document.location.hash;
-        var prefix = "tab_";
-        if (hash) {
-            $('.nav-list #nav-' + hash.replace('#' + prefix, "")).tab('show').trigger('show.bs.tab');
-        }
 
-        // Change hash for page-reload
-        $('.nav-list a').on('shown.bs.tab', function (e) {
-            window.location.hash = e.target.hash.replace("#", "#" + prefix);
-        });
+        % if data['user_id']:
+            var user_id = ${data['user_id']};
+        % else:
+            var user_id = null;
+        % endif
+
+        $("#edit-user-tooltip").tooltip();
 
         // Populate watch time stats
         $.ajax({
-            url: 'user_watch_time_stats',
+            url: 'get_user_watch_time_stats',
             async: true,
-            data: { user_id: user_id, user: username },
+            data: { user_id: user_id, user: '${data['username']}' },
             complete: function(xhr, status) {
                 $("#user-time-stats").html(xhr.responseText);
             }
@@ -699,175 +311,135 @@ DOCUMENTATION :: END
 
         // Populate platform stats
         $.ajax({
-            url: 'user_player_stats',
+            url: 'get_user_player_stats',
             async: true,
-            data: { user_id: user_id, user: username },
+            data: { user_id: user_id, user: '${data['username']}' },
             complete: function(xhr, status) {
                 $("#user-player-stats").html(xhr.responseText);
             }
         });
 
-    });
-</script>
-% if _session['user_group'] == 'admin':
-<script>
-    function loadExportTable() {
-        // Build export table
-        export_table_options.ajax = {
-            url: 'get_export_list',
-            type: 'POST',
-            data: function ( d ) {
-                return {
-                    json_data: JSON.stringify( d ),
-                    user_id: user_id
-                };
+        $( "#history-tab-btn" ).one( "click", function() {
+            // Build watch history table
+            history_table_options.ajax = {
+                "url": "get_history",
+                type: 'post',
+                data: function ( d ) {
+                    return { 'json_data': JSON.stringify( d ),
+                             'user_id': user_id,
+                             'user': "${data['username']}"
+                    };
+                }
             }
-        };
-        export_table = $('#export_table-SID-${data["user_id"]}').DataTable(export_table_options);
-        export_table.columns([2, 7]).visible(false);
+            history_table = $('#history_table').DataTable(history_table_options);
+            history_table.column(2).visible(false);
 
-        var colvis = new $.fn.dataTable.ColVis(export_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' });
-        $(colvis.button()).appendTo('#button-bar-export');
-
-        clearSearchButton('export_table-SID-${data["user_id"]}', export_table);
-    }
-
-    $('#nav-tabs-export').on('shown.bs.tab', function() {
-        if (typeof(export_table) === 'undefined') {
-            loadExportTable();
-        }
-    });
-
-    $("#refresh-export-table").click(function () {
-        export_table.draw();
-    });
-
-    $("#edit-user-tooltip").tooltip();
-
-    // Load edit user modal
-    $("#toggle-edit-user-modal").click(function() {
-        $("#edit-user-tooltip").tooltip('hide');
-        $.ajax({
-            url: 'edit_user_dialog',
-            data: { user_id: user_id },
-            cache: false,
-            async: true,
-            complete: function(xhr, status) {
-                $("#edit-user-modal").html(xhr.responseText);
-            }
+            var colvis = new $.fn.dataTable.ColVis(history_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark', exclude: [0, 11] });
+            $(colvis.button()).appendTo('#button-bar-history');
+            
+            clearSearchButton('history_table', history_table);
         });
-    });
 
-    $(".export-button").click(function() {
-        $.ajax({
-            url: 'export_metadata_modal',
-            data: {
-                user_id: $(this).data('user_id'),
-                media_type: $(this).data('media_type'),
-                sub_media_type: $(this).data('sub_media_type'),
-                export_type: $(this).data('export_type')
-            },
-            cache: false,
-            async: true,
-            complete: function(xhr, status) {
-                $("#export-modal").html(xhr.responseText);
+        $( "#ip-tab-btn" ).one( "click", function() {
+            // Build user IP table
+            user_ip_table_options.ajax = {
+                "url": "get_user_ips",
+                type: 'post',
+                data: function ( d ) {
+                    return { 'json_data': JSON.stringify( d ),
+                             'user_id': user_id,
+                             'user': "${data['username']}"
+                    };
+                }
             }
+            user_ip_table = $('#user_ip_table').DataTable(user_ip_table_options);
+            
+            clearSearchButton('user_ip_table', user_ip_table);
         });
-    });
 
-    $('#row-edit-mode').on('click', function() {
-        if ($(this).hasClass('active')) {
-            $(this).tooltip('destroy');
+        $( "#sync-tab-btn" ).one( "click", function() {
+            // Build user sync table
+            sync_table_options.ajax = {
+                "url": "get_sync",
+                "data": function(d) {
+                   d.user_id = user_id;
+                   d.user = "${data['username']}";
+                }
+            }
+            sync_table = $('#sync_table').DataTable(sync_table_options);
+            sync_table.column(1).visible(false);
 
-            if (history_to_delete.length > 0) {
-                $('#deleteCount').text(history_to_delete.length);
-                $('#deleteType').text('history');
-                $('#confirm-modal-delete').modal();
-                $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
-                    $.ajax({
-                        url: 'delete_history_rows',
-                        type: 'POST',
-                        data: { row_ids: history_to_delete.join(',') },
-                        async: true,
-                        success: function (data) {
-                            var msg = "History deleted";
-                            showMsg(msg, false, true, 2000);
-                            history_table.draw();
+            var colvis_sync = new $.fn.dataTable.ColVis( sync_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' } );
+            $( colvis_sync.button() ).appendTo('#button-bar-sync');
+            
+            clearSearchButton('sync_table', sync_table);
+        });
+
+        // Load edit user modal
+        $("#toggle-edit-user-modal").click(function() {
+            $("#edit-user-tooltip").tooltip('hide');
+            $.ajax({
+                url: 'edit_user_dialog',
+                data: { user_id: user_id, user: '${data['username']}' },
+                cache: false,
+                async: true,
+                complete: function(xhr, status) {
+                    $("#edit-user-modal").html(xhr.responseText);
+                }
+            });
+        });
+
+        $('#row-edit-mode').on('click', function() {
+            $('#row-edit-mode-alert').fadeIn(200);
+
+            if ($(this).hasClass('active')) {
+                if (history_to_delete.length > 0) {
+                    $('#deleteCount').text(history_to_delete.length);
+                    $('#confirm-modal').modal();
+                    $('#confirm-modal').one('click', '#confirm-delete', function () {
+                        for (var i = 0; i < history_to_delete.length; i++) {
+                            $.ajax({
+                                url: 'delete_history_rows',
+                                data: { row_id: history_to_delete[i] },
+                                async: true,
+                                success: function (data) {
+                                    var msg = "History deleted";
+                                    showMsg(msg, false, true, 2000);
+                                }
+                            });
                         }
+                        history_table.draw();
                     });
+                }
+
+                $('.delete-control').each(function () {
+                    $(this).addClass('hidden');
+                    $('#row-edit-mode-alert').fadeOut(200);
+                });
+
+            } else {
+                history_to_delete = [];
+                $('.delete-control').each(function() {
+                    $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
+                    $(this).removeClass('hidden');
                 });
             }
-
-            $('.history_table .delete-control').each(function () {
-                $(this).addClass('hidden');
-                $('#row-edit-mode-alert').fadeOut(200);
-            });
-
-        } else {
-            $(this).tooltip({
-                container: '.body-container',
-                placement: 'bottom',
-                title: 'Select rows to delete. Data is deleted upon exiting delete mode.',
-                trigger: 'manual'
-            }).tooltip('show');
-
-            history_to_delete = [];
-            $('.history_table .delete-control').each(function() {
-                $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
-                $(this).removeClass('hidden');
-            });
-        }
-    });
-
-    $('#sync-row-edit-mode').on('click', function() {
-        if ($(this).hasClass('active')) {
-            $(this).tooltip('destroy');
-
-            if (syncs_to_delete.length > 0) {
-                $('#deleteCount').text(syncs_to_delete.length);
-                $('#deleteType').text('sync');
-                $('#confirm-modal-delete').modal();
-                $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
-                    syncs_to_delete.forEach(function(row, idx) {
-                        $.ajax({
-                            url: 'delete_sync_rows',
-                            type: 'POST',
-                            data: {
-                                client_id: row.client_id,
-                                sync_id: row.sync_id
-                            },
-                            async: true,
-                            success: function (data) {
-                                var msg = "Sync deleted";
-                                showMsg(msg, false, true, 2000);
-                            }
-                        });
-                    });
-                    sync_table.ajax.reload();
-                });
-            }
-
-            $('.sync_table .delete-control').each(function () {
-                $(this).addClass('hidden');
-                $('#sync-row-edit-mode-alert').fadeOut(200);
-            });
-
-        } else {
-            $(this).tooltip({
-                container: '.body-container',
-                placement: 'bottom',
-                title: 'Select syncs to delete. Data is deleted upon exiting delete mode.',
-                trigger: 'manual'
-            }).tooltip('show');
-
-            syncs_to_delete = [];
-            $('.sync_table .delete-control').each(function() {
-                $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
-                $(this).removeClass('hidden');
-            });
-        }
+        });
+        
+        recentlyWatched();
+        $(window).resize(function() {
+            recentlyWatched();
+        });
     });
 </script>
-% endif
-% endif
-</%def>
\ No newline at end of file
+</%def>
+% else:
+<div class="clear"></div>
+<div class="container-fluid">
+    <div class="row-fluid">
+        <div class="span10 offset1">
+            <h3>Error retrieving user information. Please see the logs for more details.</h3>
+        </div>
+    </div>
+</div>
+% endif
\ No newline at end of file
diff --git a/data/interfaces/default/user_player_stats.html b/data/interfaces/default/user_player_stats.html
index dab437ea..7aab53b6 100644
--- a/data/interfaces/default/user_player_stats.html
+++ b/data/interfaces/default/user_player_stats.html
@@ -12,22 +12,19 @@ data[array_index] :: Usable parameters
 == Global keys ==
 result_id               Returns a unique identifier for the result.
 player_name             Returns the name of the player.
-platform                Returns the name of the platform
-platform_name           Returns the id name of the platform
+platform_type           Returns the name of the platform
 total_plays             Returns the play count for the player.
 
 DOCUMENTATION :: END
 </%doc>
 
-% if data:
+% if data != None:
 % for a in data:
 <ul class="list-unstyled">
     <div class="user-player-instance">
         <li>
-            <div id="user-player-image-${a['result_id']}">
-                <div class="user-player-instance-box svg-icon platform-${a['platform_name']}"></div>
-            </div>
-            <div class="user-player-instance-name" title="${a['player_name']}">
+            <span id="user-player-image-${a['result_id']}"></span>
+            <div class="user-player-instance-name">
                 ${a['player_name']}
             </div>
             <div class="user-player-instance-playcount">
@@ -37,7 +34,11 @@ DOCUMENTATION :: END
         </li>
     </div>
 </ul>
+<script>
+    $("#user-player-image-${a['result_id']}").html("<div class='user-player-instance-box' style='background-image: url(" + getPlatformImagePath('${a['platform_type']}') + ");'>");
+</script>
 % endfor
 % else:
-<div class="text-muted">No stats to show.</div><br>
+<div class="text-muted">Unable to retrieve data from database. Please check your <a href="settings">settings</a>.
+</div><br>
 % endif
\ No newline at end of file
diff --git a/data/interfaces/default/user_recently_watched.html b/data/interfaces/default/user_recently_watched.html
index b9f8a8a1..2e432203 100644
--- a/data/interfaces/default/user_recently_watched.html
+++ b/data/interfaces/default/user_recently_watched.html
@@ -12,158 +12,78 @@ data[array_index] :: Usable parameters
 == Global keys ==
 rating_key              Returns the unique identifier for the media item.
 row_id                  Returns the unique row id for the media item in the database.
-media_type              Returns the type of media. Either 'movie' or 'episode' or 'album'.
+type                    Returns the type of media. Either 'movie' or 'episode'.
 thumb                   Returns the location of the item's thumbnail. Use with pms_image_proxy.
 time                    Returns the last watched time of the media.
-user                    Returns the name of the user that watched the item.
-title                   Returns the name of the movie, episode, album.
-parent_title            Returns the name of the artist.
-grandparent_title       Returns the name of the show.
-media_index             Returns the index number of the episode.
-parent_media_index      Returns the index number of the season.
-year                    Returns the release year of the movie, episode, or album.
+title                   Returns the name of the movie or episode.
+
+== Only if 'type' is 'episode ==
+parent_title            Returns the name of the TV Show a season belongs too.
+parent_index            Returns the season number.
+index                   Returns the episode number.
+
+== Only if 'type' is 'movie' ==
+year                    Returns the movie release year.
 
 DOCUMENTATION :: END
 </%doc>
 
-% if data:
-<%
-    from plexpy.helpers import page, short_season
-%>
+% if data != None:
 <div class="dashboard-recent-media-row">
-    <div id="recently-watched-row-scroller">
-        <ul class="dashboard-recent-media list-unstyled">
-            % for item in data:
-            <li>
-                % if item['media_type'] == 'episode' or item['media_type'] == 'movie':
-                % if item['rating_key']:
-                % if item['media_type'] == 'movie':
-                <a href="${page('info', item['rating_key'], history=True, live=item['live'])}" title="${item['title']}">
-                % elif item['media_type'] == 'episode':
-                <a href="${page('info', item['rating_key'], history=True, live=item['live'])}" title="${item['grandparent_title']}">
-                % endif
-                    <div class="dashboard-recent-media-poster">
-                        <div class="dashboard-recent-media-poster-face" style="background-image: url(${page('pms_image_proxy', item['thumb'], item['rating_key'], 300, 450, fallback='poster')});">
-                            <div class="dashboard-recent-media-overlay">
-                                <div class="dashboard-recent-media-overlay-text" id="time-${item['time']}">
-                                    <script>
-                                        $('#time-${item['time']}').text('Watched ' + moment(${item['time']}, "X").fromNow())
-                                    </script>
-                                </div>
-                            </div>
-                        </div>
-                        % if _session['user_group'] == 'admin':
-                        <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
-                        % endif
-                    </div>
-                </a>
-                <div class="dashboard-recent-media-metacontainer">
-                    % if item['media_type'] == 'episode':
-                    % if item['live']:
-                    <h3>
-                        <a href="${page('info', item['rating_key'], history=True, live=item['live'])}" title="${item['grandparent_title']}">${item['grandparent_title']}</a>
-                    </h3>
-                    <h3 class="text-muted" title="${item['title']}">
-                        <a href="${page('info', item['rating_key'], history=True, live=item['live'])}" title="${item['title']}">${item['title']}</a>
-                    </h3>
-                    % if item['media_index']:
-                    <h3 class="text-muted">
-                        <a href="${page('info', item['rating_key'], history=True, live=item['live'])}" title="${item['parent_title']}">${short_season(item['parent_title'])}</a>
-                         &middot; <a href="${page('info', item['rating_key'], history=True, live=item['live'])}" title="Episode ${item['media_index']}">E${item['media_index']}</a>
-                    </h3>
-                    % else:
-                    <h3 class="text-muted">
-                        <a href="${page('info', item['rating_key'], history=True, live=item['live'])}" title="${item['originally_available_at']}">${item['originally_available_at']}</a>
-                    </h3>
-                    % endif
-                    % else:
-                    <h3>
-                        <a href="${page('info', item['grandparent_rating_key'])}" title="${item['grandparent_title']}">${item['grandparent_title']}</a>
-                    </h3>
-                    <h3 class="text-muted" title="${item['title']}">
-                        <a href="${page('info', item['rating_key'], history=True, live=item['live'])}" title="${item['title']}">${item['title']}</a>
-                    </h3>
-                    <h3 class="text-muted">
-                        <a href="${page('info', item['parent_rating_key'])}" title="${item['parent_title']}">${short_season(item['parent_title'])}</a>
-                         &middot; <a href="${page('info', item['rating_key'], history=True, live=item['live'])}" title="Episode ${item['media_index']}">E${item['media_index']}</a>
-                    </h3>
-                    % endif
-                    % elif item['media_type'] == 'movie':
-                    <h3 title="${item['title']}">
-                        <a href="${page('info', item['rating_key'], history=True, live=item['live'])}" title="${item['title']}">${item['title']}</a>
-                    </h3>
-                    <h3 class="text-muted">${item['year']}</h3>
-                    <h3 class="text-muted">&nbsp;</h3>
-                    % endif
-                </div>
-                % else:
-                <div class="dashboard-recent-media-poster">
-                    <div class="dashboard-recent-media-poster-face" style="background-image: url(${http_root}images/poster.png);">
+    <ul class="dashboard-recent-media list-unstyled">
+        % for item in data:
+        <li>
+            % if item['type'] == 'episode' or item['type'] == 'movie':
+			<a href="info?source=history&item_id=${item['row_id']}">
+				<div class="dashboard-recent-media-poster">
+					<div class="dashboard-recent-media-poster-face" style="background-image: url(pms_image_proxy?img=${item['thumb']}&width=300&height=450&fallback=poster);">
                         <div class="dashboard-recent-media-overlay">
                             <div class="dashboard-recent-media-overlay-text" id="time-${item['time']}">
                                 <script>
-                                        $('#time-${item['time']}').text('Watched ' + moment(${item['time']}, "X").fromNow())
+                                    $('#time-${item['time']}').text('Watched ' + moment(${item['time']}, "X").fromNow())
                                 </script>
                             </div>
                         </div>
                     </div>
                 </div>
-                <div class="dashboard-recent-media-metacontainer">
-                    <h3 title="${item['title']}">
-                        ${item['title']}
-                    </h3>
-                </div>
-                % endif
-                % elif item['media_type'] == 'track':
-                % if item['rating_key']:
-                <a href="${page('info', item['rating_key'], history=True, live=item['live'])}" title="${item['parent_title']}">
-                    <div class="dashboard-recent-media-cover">
-                        <div class="dashboard-recent-media-cover-face" style="background-image: url(${page('pms_image_proxy', item['thumb'], item['rating_key'], 300, 300, fallback='cover')});">
-                            <div class="dashboard-recent-media-overlay">
-                                <div class="dashboard-recent-media-overlay-text" id="time-${item['time']}">
-                                    <script>
-                                        $('#time-${item['time']}').text('Played ' + moment(${item['time']}, "X").fromNow())
-                                    </script>
-                                </div>
-                            </div>
-                        </div>
+				<div class="dashboard-recent-media-metacontainer">
+					% if item['type'] == 'episode':
+					<h3 title="${item['grandparent_title']}">${item['grandparent_title']}</h3>
+					<h3 title="${item['title']}">${item['title']}</h3>
+					<h3 class="text-muted">S${item['parent_index']} &middot; E${item['index']}</h3>
+					% elif item['type'] == 'movie':
+					<h3 title="${item['title']}">${item['title']}</h3>
+					<h3 class="text-muted">${item['year']}</h3>
+					% endif
+					<div class="text-muted" id="time-${item['time']}">
                     </div>
-                </a>
-                <div class="dashboard-recent-media-metacontainer">
-                    <h3 title="${item['original_title'] or item['grandparent_title']}">
-                        <a href="${page('info', item['grandparent_rating_key'])}" title="${item['original_title'] or item['grandparent_title']}">${item['original_title'] or item['grandparent_title']}</a>
-                    </h3>
-                    <h3 class="text-muted" title="${item['title']}">
-                        <a href="${page('info', item['rating_key'], history=True, live=item['live'])}" title="${item['title']}">${item['title']}</a>
-                    </h3>
-                    <h3 class="text-muted">
-                        <a href="${page('info', item['parent_rating_key'])}" title="${item['parent_title']}">${item['parent_title']}</a>
-                    </h3>
-                </div>
-                % else:
+				</div>
+			</a>
+            % elif item['type'] == 'track':
+            <a href="info?source=history&item_id=${item['row_id']}">
                 <div class="dashboard-recent-media-cover">
-                    <div class="dashboard-recent-media-cover-face" style="background-image: url(${http_root}images/cover.png);">
+                    <div class="dashboard-recent-media-cover-face" style="background-image: url(pms_image_proxy?img=${item['thumb']}&width=300&height=300&fallback=cover);">
                         <div class="dashboard-recent-media-overlay">
                             <div class="dashboard-recent-media-overlay-text" id="time-${item['time']}">
                                 <script>
-                                        $('#time-${item['time']}').text('Played ' + moment(${item['time']}, "X").fromNow())
+                                    $('#time-${item['time']}').text('Watched ' + moment(${item['time']}, "X").fromNow())
                                 </script>
                             </div>
                         </div>
                     </div>
                 </div>
                 <div class="dashboard-recent-media-metacontainer">
-                    <h3 title="${item['title']}">
-                        ${item['title']}
-                    </h3>
+                    <h3 title="${item['grandparent_title']}">${item['grandparent_title']}</h3>
+                    <h3 title="${item['title']}">${item['title']}</h3>
+                    <h3 class="text-muted">${item['parent_title']}</h3>
                 </div>
-                % endif
-                % endif
-            </li>
-            % endfor
-        </ul>
-    </div>
+            </a>
+            % endif
+        </li>
+        % endfor
+    </ul>
 </div>
 % else:
-<div class="text-muted">No stats to show.</div><br>
-% endif
+<div class="text-muted">Unable to retrieve data from database. Please check your <a href="settings">settings</a>.
+</div><br>
+% endif
\ No newline at end of file
diff --git a/data/interfaces/default/user_watch_time_stats.html b/data/interfaces/default/user_watch_time_stats.html
index ba2c86ec..17c626d2 100644
--- a/data/interfaces/default/user_watch_time_stats.html
+++ b/data/interfaces/default/user_watch_time_stats.html
@@ -16,7 +16,7 @@ total_plays             Returns the play count for the watch stat period..
 DOCUMENTATION :: END
 </%doc>
 
-% if data:
+% if data != None:
 <ul class="list-unstyled">
     % for a in data:
     <div class='user-overview-stats-instance'>
@@ -32,17 +32,16 @@ DOCUMENTATION :: END
                 <h3>${a['total_plays']}</h3>
                 <p>plays</p>
                 <h3><strong>/</strong></h3>
-                <span id="total-time-${a['query_days']}">
-                    <script>
-                        $('#total-time-${a['query_days']}').html(humanTime(${a['total_time']}));
-                    </script>
-                </span>
+                <span id="total-time-${a['query_days']}"></span>
             </div>
         </li>
     </div>
+    <script>
+        $('#total-time-${a['query_days']}').html(humanTime(${a['total_time']}));
+    </script>
     % endfor
 </ul>
 % else:
-<div class="text-muted">Unable to retrieve data from database.
+<div class="text-muted">Unable to retrieve data from database. Please check your <a href="settings">settings</a>.
 </div><br>
 % endif
\ No newline at end of file
diff --git a/data/interfaces/default/users.html b/data/interfaces/default/users.html
index d7dd84e8..f4bc65c2 100644
--- a/data/interfaces/default/users.html
+++ b/data/interfaces/default/users.html
@@ -1,29 +1,22 @@
 <%inherit file="base.html"/>
 
 <%def name="headIncludes()">
-<link rel="stylesheet" href="${http_root}css/dataTables.bootstrap.min.css">
-<link rel="stylesheet" href="${http_root}css/dataTables.colVis.css">
-<link rel="stylesheet" href="${http_root}css/tautulli-dataTables.css">
+<link rel="stylesheet" href="interfaces/default/css/dataTables.bootstrap.css">
+<link rel="stylesheet" href="interfaces/default/css/plexpy-dataTables.css">
 </%def>
 
 <%def name="body()">
 <div class='container-fluid'>
     <div class='table-card-header'>
         <div class="header-bar">
-            <span id="users-xml"><i class="fa fa-group"></i> All Users</span>
+            <span><i class="fa fa-group"></i> All Users</span>
         </div>
         <div class="button-bar">
-            % if _session['user_group'] == 'admin':
-            <div class="btn-group">
-                <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
-                    <i class="fa fa-pencil"></i> Edit mode
-                </button>
-            </div>
-            <div class="btn-group">
-                <button class="btn btn-dark refresh-users-button" id="refresh-users-list"><i class="fa fa-refresh"></i> Refresh users</button>
-            </div>
-            % endif
-            <div class="btn-group colvis-button-bar"></div>
+            <button class="btn btn-dark refresh-users-button" id="refresh-users-list"><i class="fa fa-refresh"></i> Refresh users</button>
+            <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
+                <i class="fa fa-pencil"></i> Edit mode
+            </button>&nbsp
+            <div class="alert alert-danger alert-edit" role="alert" id="row-edit-mode-alert"><i class="fa fa-exclamation-triangle"></i>&nbspSelect users to purge. Data is purged upon exiting edit mode.</div>
         </div>
     </div>
     <div class='table-card-back'>
@@ -33,133 +26,93 @@
                 <th align="left" id="edit_row">Edit</th>
                 <th align="right" id="avatar"></th>
                 <th align="left" id="friendly_name">User</th>
-                <th align="left" id="username">Username</th>
-                <th align="left" id="title">Full Name</th>
-                <th align="left" id="email">Email</th>
-                <th align="left" id="last_seen">Last Streamed</th>
+                <th align="left" id="last_seen">Last Seen</th>
                 <th align="left" id="last_known_ip">Last Known IP</th>
                 <th align="left" id="last_platform">Last Platform</th>
                 <th align="left" id="last_player">Last Player</th>
-                <th align="left" id="last_played">Last Played</th>
+                <th align="left" id="last_watched">Last Watched</th>
                 <th align="left" id="total_plays">Total Plays</th>
-                <th align="left" id="total_duration">Total Played Duration</th>
             </tr>
             </thead>
             <tbody>
             </tbody>
         </table>
-    </div>
-</div>
-
-</%def>
-
-<%def name="modalIncludes()">
-<div class="modal fade" id="info-modal" tabindex="-1" role="dialog" aria-labelledby="info-modal">
-</div>
-<div class="modal fade" id="ip-info-modal" tabindex="-1" role="dialog" aria-labelledby="ip-info-modal">
-</div>
-<div class="modal fade" id="confirm-modal-delete" tabindex="-1" role="dialog" aria-labelledby="confirm-modal-delete">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                <h4 class="modal-title" id="myModalLabel">Confirm Delete/Purge</h4>
-            </div>
-            <div class="modal-body" style="text-align: center;">
-                <ul id="users-to-delete" class="list-unstyled"></ul>
-                <ul id="users-to-purge" class="list-unstyled"></ul>
-                <p>This is permanent and cannot be undone!</p>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-dark" data-dismiss="modal">Cancel</button>
-                <button type="button" class="btn btn-danger btn-ok" data-dismiss="modal" id="confirm-delete">Confirm</button>
+        <div class="modal fade" id="info-modal" tabindex="-1" role="dialog" aria-labelledby="info-modal">
+        </div>
+        <div class="modal fade" id="ip-info-modal" tabindex="-1" role="dialog" aria-labelledby="ip-info-modal">
+        </div>
+        <div class="modal fade" id="confirm-modal" tabindex="-1" role="dialog" aria-labelledby="confirm-modal">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
+                        <h4 class="modal-title" id="myModalLabel">Confirm Purge</h4>
+                    </div>
+                    <div class="modal-body" style="text-align: center;">
+                        <p>Are you REALLY sure you want to purge all history for the following users:</p>
+                        <ul id="users-to-delete" class="list-unstyled"></ul>
+                        <p>This is permanent and cannot be undone!</p>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-dark" data-dismiss="modal">Cancel</button>
+                        <button type="button" class="btn btn-danger btn-ok" data-dismiss="modal" id="confirm-purge">Purge</button>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
 </div>
+
 </%def>
 
 <%def name="javascriptIncludes()">
-<script src="${http_root}js/jquery.dataTables.min.js"></script>
-<script src="${http_root}js/dataTables.colVis.js"></script>
-<script src="${http_root}js/dataTables.bootstrap.min.js"></script>
-<script src="${http_root}js/dataTables.bootstrap.pagination.js"></script>
-<script src="${http_root}js/tables/users.js${cache_param}"></script>
+<script src="interfaces/default/js/jquery.dataTables.min.js"></script>
+<script src="interfaces/default/js/dataTables.bootstrap.min.js"></script>
+<script src="interfaces/default/js/dataTables.bootstrap.pagination.js"></script>
+<script src="interfaces/default/js/moment-with-locale.js"></script>
+<script src="interfaces/default/js/tables/users.js"></script>
 <script>
     $(document).ready(function () {
         users_list_table_options.ajax = {
-            url: 'get_user_list',
-            type: 'POST',
+            "url": "get_user_list",
+            type: "post",
             data: function ( d ) {
-                return {
-                    json_data: JSON.stringify(d)
-                };
+                return { 'json_data': JSON.stringify( d ) };
             }
-        };
+        }
 
         users_list_table = $('#users_list_table').DataTable(users_list_table_options);
-        var colvis = new $.fn.dataTable.ColVis(users_list_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark', exclude: [0, 1] });
-        $(colvis.button()).appendTo('div.colvis-button-bar');
 
         clearSearchButton('users_list_table', users_list_table);
 
-        % if _session['user_group'] == 'admin':
         $('#row-edit-mode').on('click', function () {
+            $('#row-edit-mode-alert').fadeIn(200);
             $('#users-to-delete').html('');
-            $('#users-to-purge').html('');
 
             if ($(this).hasClass('active')) {
-                $(this).tooltip('destroy');
-
-                if (users_to_delete.length > 0 || users_to_purge.length > 0) {
+                if (users_to_purge.length > 0) {
                     $('.edit-control').each(function () {
                         $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
                     });
 
-                    users_to_purge = $.grep(users_to_purge, function (value) {
-                        return $.inArray(value, users_to_delete) < 0;
-                    });
-
-                    if (users_to_delete.length > 0) {
-                        $('#users-to-delete').prepend('<p>Are you REALLY sure you want to delete and purge all history for the following users:</p>');
-                        for (var i = 0; i < users_to_delete.length; i++) {
-                            $('#users-to-delete').append('<li>' + $('div[data-id=' + users_to_delete[i] + '] > input').val() + '</li>');
-                        }
+                    for (var i = 0; i < users_to_purge.length; i++) {
+                        $('#users-to-delete').append('<li>' + $('div[data-id=' + users_to_purge[i] + '] > input').val() + '</li>');
                     }
-
-                    if (users_to_purge.length > 0) {
-                        $('#users-to-purge').prepend('<p>Are you REALLY sure you want to purge all history for the following users:</p>');
+                    $('#confirm-modal').modal();
+                    $('#confirm-modal').one('click', '#confirm-purge', function () {
                         for (var i = 0; i < users_to_purge.length; i++) {
-                            $('#users-to-purge').append('<li>' + $('div[data-id=' + users_to_purge[i] + '] > input').val() + '</li>');
+                            $.ajax({
+                                url: 'delete_all_user_history',
+                                data: { user_id: users_to_purge[i] },
+                                cache: false,
+                                async: true,
+                                success: function (data) {
+                                    var msg = "User history purged";
+                                    showMsg(msg, false, true, 2000);
+                                }
+                            });
                         }
-                    }
-
-                    $('#confirm-modal-delete').modal();
-                    $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
-                        $.ajax({
-                            url: 'delete_all_user_history',
-                            type: 'POST',
-                            data: { row_ids: users_to_purge.join(',') },
-                            cache: false,
-                            async: true,
-                            success: function (data) {
-                                var msg = "User history purged";
-                                showMsg(msg, false, true, 2000);
-                                users_list_table.draw();
-                            }
-                        });
-                        $.ajax({
-                            url: 'delete_user',
-                            type: 'POST',
-                            data: { row_ids: users_to_delete.join(',') },
-                            cache: false,
-                            async: true,
-                            success: function (data) {
-                                var msg = "User deleted";
-                                showMsg(msg, false, true, 2000);
-                                users_list_table.draw();
-                            }
-                        });
+                        users_list_table.draw();
                     });
                 }
 
@@ -167,50 +120,40 @@
                     $(this).addClass('hidden');
                     $('#row-edit-mode-alert').fadeOut(200);
                 });
-                toggleEditNames();
-            } else {
-                $(this).tooltip({
-                    container: '.body-container',
-                    placement: 'bottom',
-                    title: 'Select users to delete/purge. Data is deleted/purged upon exiting edit mode.',
-                    trigger: 'manual'
-                }).tooltip('show');
+                $('.edit-user-control > .edit-user-name').each(function () {
+                    a = $(this).children('a');
+                    input = $(this).children('input');
+                    a.text(input.val());
+                    a.removeClass('hidden');
+                    input.addClass('hidden');
+                });
 
-                users_to_delete = [];
+            } else {
                 users_to_purge = [];
                 $('.edit-control').each(function () {
                     $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
                     $(this).removeClass('hidden');
                 });
-                toggleEditNames();
+                $('.edit-user-control > .edit-user-name').each(function () {
+                    $(this).children('a').addClass('hidden');
+                    $(this).children('input').removeClass('hidden');
+                });
             }
         });
-        % endif
     });
 
-    % if _session['user_group'] == 'admin':
     $("#refresh-users-list").click(function() {
-        showMsg('Refreshing users list...', true, false);
         $.ajax({
             url: 'refresh_users_list',
             cache: false,
             async: true,
-            complete: function (xhr, status) {
-                var result = $.parseJSON(xhr.responseText);
-                var msg = result.message;
-                if (result.result === 'success') {
-                    showMsg('<i class="fa fa-check"></i> ' + msg, false, true, 2000, false);
-                    users_list_table.draw();
-                } else {
-                    showMsg('<i class="fa fa-times"></i> ' + msg, false, true, 2000, true);
-                }
-            }
+            success : function(data) {
+                showMsg('<i class="fa fa-check"></i>&nbspUser list refresh started...',false,true,2000,false)
+            },
+            error: function(jqXHR, textStatus, errorThrown) {
+                showMsg('<i class="fa fa-exclamation-circle"></i>&nbspUnable to refresh user list.',false,true,2000,true)
+            },
         });
     });
-    % endif
-
-    $('#users-xml').on('tripleclick', function () {
-        openPlexXML('/api/users', true);
-    });
 </script>
 </%def>
\ No newline at end of file
diff --git a/data/interfaces/default/welcome.html b/data/interfaces/default/welcome.html
index baf1b57e..b244105c 100644
--- a/data/interfaces/default/welcome.html
+++ b/data/interfaces/default/welcome.html
@@ -1,6 +1,6 @@
-<%
-    import plexpy
-    from plexpy import common, helpers
+<%
+import plexpy
+from plexpy import common
 %>
 
 <!doctype html>
@@ -8,222 +8,168 @@
 <html lang="en">
 <head>
     <meta charset="utf-8">
-    <title>Tautulli - ${title} | ${server_name}</title>
+    <title>PlexPy - ${title}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <meta name="referrer" content="no-referrer">
-    <link href="${http_root}css/bootstrap3/bootstrap.min.css" rel="stylesheet">
-    <link href="${http_root}css/bootstrap-wizard.css" rel="stylesheet">
-    <link href="${http_root}css/tautulli.css${cache_param}" rel="stylesheet">
-    <link href="${http_root}css/selectize.bootstrap3.css" rel="stylesheet">
-    <link href="${http_root}css/opensans.min.css" rel="stylesheet">
-    <link href="${http_root}css/font-awesome.all.min.css" rel="stylesheet">
-    <link href="${http_root}css/font-awesome.v4-shims.min.css" rel="stylesheet">
-
-    <!-- Favicons -->
-    <link rel="icon" type="image/png" sizes="32x32" href="${http_root}images/favicon/favicon-32x32.png?v=2.6.0">
-    <link rel="icon" type="image/png" sizes="16x16" href="${http_root}images/favicon/favicon-16x16.png?v=2.6.0">
-    <link rel="shortcut icon" href="${http_root}images/favicon/favicon.ico?v=2.6.0">
-
-    <!-- ICONS -->
-    <!-- Android -->
-    <link rel="manifest" href="${http_root}images/favicon/manifest.json?v=2.9.0" crossorigin="use-credentials">
-    <meta name="theme-color" content="#282a2d">
-    <!-- Apple -->
-    <link rel="apple-touch-icon" sizes="180x180" href="${http_root}images/favicon/apple-touch-icon.png?v=2.6.0">
-    <link rel="mask-icon" href="${http_root}images/favicon/safari-pinned-tab.svg?v=2.6.0" color="#282a2d">
-    <meta name="apple-mobile-web-app-title" content="Tautulli">
-    <!-- Microsoft -->
-    <meta name="application-name" content="Tautulli">
-    <meta name="msapplication-config" content="${http_root}images/favicon/browserconfig.xml?v=2.6.0">
+    <link href="interfaces/default/css/bootstrap3/bootstrap.css" rel="stylesheet">
+    <link href="interfaces/default/css/bootstrap-wizard.css" rel="stylesheet">
+    <link href="interfaces/default/css/plexpy.css" rel="stylesheet">
+    <link href="interfaces/default/css/selectize.bootstrap3.css" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet" type="text/css">
+    <link href="interfaces/default/css/font-awesome.min.css" rel="stylesheet">
+    <link rel="icon" type="image/x-icon" href="interfaces/default/images/favicon.ico"/>
+    <link rel="shortcut icon" href="interfaces/default/images/favicon.ico">
 </head>
 
 <body>
 <div class="container-fluid">
-    % if plexpy.CONFIG.CHECK_DOCKER_MOUNT and plexpy.DOCKER and not plexpy.DOCKER_MOUNT:
     <div class="row">
-        <div class="col-md-12">
-            <div class="alert alert-danger docker-mount" role="alert" style="width: 700px; z-index: 9999">
-                The <span class="inline-pre">/config</span> volume mount was not configured properly for the Docker container.
-                All data may be cleared when the container is recreated or updated.
+        <div class="wizard" id="some-wizard" data-title="PlexPy Setup Wizard">
+            <div class="wizard-card" data-cardname="card1">
+                <div style="float: right;">
+                    <img src="interfaces/default/images/logo-plexpy.png"/>
+                </div>
+                <h3 style="line-height: 50px;">Welcome!</h3>
+                <br/>
+                <div>
+                    Thanks for taking the time to try out PlexPy. Hope you find it useful.
+                    <br/><br/>
+                    PlexPy requires a permanent internet connection to ensure a reliable experience.
+                    <br/><br/>
+                    This wizard will help you get set up, to continue press Next.
+                </div>
             </div>
-        </div>
-    </div>
-    % endif
-    <div class="row">
-        <div class="wizard" id="setup-wizard" data-title="Tautulli Setup Wizard">
-            <form>
-                <div class="wizard-card" data-cardname="card1">
-                    <div style="float: right;">
-                        <img src="${http_root}images/logo-tautulli-45.png" height="45" alt="Tautulli">
-                    </div>
-                    <h3 style="line-height: 50px;">Welcome!</h3>
-                    <div class="wizard-input-section">
-                        <p class="welcome-message">
-                            Thanks for taking the time to try out Tautulli. Hope you find it useful.
-                        </p>
-                        <p class="welcome-message">
-                            Tautulli requires a permanent internet connection to ensure a reliable experience.
-                        </p>
-                        <p class="welcome-message">
-                            This wizard will help you get set up, to continue press Next.
-                        </p>
+            <div class="wizard-card" data-cardname="card2">
+                <h3>Plex Authentication</h3>
+                <p class="help-block">Enter your Plex.tv username and password. PlexPy does not store your username or password.</p>
+                <div class="wizard-input-section">
+                    <label for="pms_username">Plex.tv Username</label>
+                    <div class="row">
+                        <div class="col-xs-8">
+                            <input type="text" class="form-control pms-auth" id="pms_username" placeholder="" required>
+                        </div>
                     </div>
                 </div>
-
-                <div class="wizard-card" data-cardname="card2">
-                    <h3>Authentication</h3>
-                    <div class="wizard-input-section">
-                        <p class="help-block">
-                            Please setup an admin username and password for Tautulli.
-                        </p>
+                <div class="wizard-input-section">
+                    <label for="pms_password">Plex.tv Password</label>
+                    <div class="row">
+                        <div class="col-xs-8">
+                            <input type="password" class="form-control pms-auth" id="pms_password" placeholder="" required>
+                        </div>
                     </div>
-                    <div class="wizard-input-section">
-                        <label for="http_username">HTTP Username</label>
-                        <div class="row">
-                            <div class="col-xs-8">
-                                <input type="text" class="form-control auth-settings" id="http_username" name="http_username" value="" size="30">
+                </div>
+                <input type="hidden" class="form-control pms-auth" name="pms_token" id="pms_token" value="${config['pms_token']}" data-validate="validatePMStoken">
+                <a class="btn btn-dark" id="pms-authenticate" href="#" role="button">Authenticate</a><span style="margin-left: 10px; display: none;" id="pms-token-status"></span>
+            </div>
+            <div class="wizard-card" data-cardname="card3">
+                <h3>Plex Media Server</h3>
+                <form>
+                    <p class="help-block">Enter your Plex Server details and then click the Verify button to make sure PlexPy can reach the server.</p>
+                <div class="wizard-input-section">
+                    <label for="pms_ip">Plex IP or Hostname</label>
+                    <div class="row">
+                        <div class="col-xs-8">
+                            <select id="pms_ip" name="pms_ip"></select>
+                        </div>
+                    </div>
+                </div>
+                <div class="wizard-input-section">
+                    <label for="pms_port">Port Number</label>
+                    <div class="row">
+                        <div class="col-xs-3">
+                            <input type="text" class="form-control pms_settings" name="pms_port" id="pms_port" placeholder="32400" value="${config['pms_port']}" required>
+                        </div>
+                        <div class="col-xs-4">
+                            <div class="checkbox">
+                                <label>
+                                    <input type="checkbox" id="pms_ssl" name="pms_ssl" value="1"> Force SSL
+                                </label>
+                            </div>
+                        </div>
+                        <div class="col-xs-4">
+                            <div class="checkbox">
+                                <label>
+                                    <input type="checkbox" id="pms_is_remote" name="pms_is_remote" value="1"> Remote Server
+                                </label>
                             </div>
                         </div>
                     </div>
-                    <div class="wizard-input-section">
-                        <label for="http_password">HTTP Password</label>
-                        <div class="row">
-                            <div class="col-xs-8">
-                                <div class="input-group">
-                                    <input type="password" class="form-control auth-settings" id="http_password" name="http_password" value="" size="30" autocomplete="new-password">
-                                    <span class="input-group-btn">
-                                        <button class="btn btn-form reveal-token" type="button"><i class="fa fa-eye-slash"></i></button>
-                                    </span>
-                                </div>
-                            </div>
+                </div>
+                <input type="hidden" class="form-control pms-settings" id="pms_valid" data-validate="validatePMSip" value="">
+                <input type="hidden" class="form-control pms-settings" id="pms_identifier" name="pms_identifier" value="${config['pms_identifier']}">
+                <a class="btn btn-dark" id="verify-plex-server" href="#" role="button">Verify</a><span style="margin-left: 10px; display: none;" id="pms-verify-status"></span>
+            </div>
+
+
+            <div class="wizard-card" data-cardname="card4">
+                <h3>Monitoring</h3>
+                <div class="wizard-input-section">
+                    <input type="checkbox" id="video_logging_enable" name="video_logging_enable" value="1" ${config['video_logging_enable']}> Log Movies and TV
+                    <p class="help-block">Keep records of all video items played from your Plex Media Server.</p>
+                </div>
+                <div class="wizard-input-section">
+                    <label for="logging_ignore_interval">Ignore Interval</label>
+                    <div class="row">
+                        <div class="col-xs-4">
+                            <input type="text" class="form-control pms-monitoring" id="logging_ignore_interval" name="logging_ignore_interval" placeholder="120" value="${config['logging_ignore_interval']}" data-validate="validateIgnoreInterval" required>
+                        </div>
+                        <span style="margin-left: 10px; line-height: 35px; display: none;" id="ignore-int-status"></span>
+                    </div>
+                    <p class="help-block">The interval (in seconds) PlexPy will wait for a video item to be active before logging it. 0 to disable.</p>
+                </div>
+                <!-- Music logging is still very experimental -- leave this for now.
+                <div class="wizard-input-section">
+                    <input type="checkbox" id="music_logging_enable" name="music_logging_enable" value="1"> Log Music
+                    <p class="help-block">Keep records of all audio items played from your Plex Media Server. VERY experimental.</p>
+                </div>
+                -->
+            </div>
+            <div class="wizard-card" data-cardname="card5" data-validate="validateNotifications">
+                <h3>Notifications</h3>
+                <p class="help-block">PlexPy supports a wide variety of notification options. To set up a notification agent conifgure this in <strong>Settings -> Notification Agents</strong>
+                after you have completed this setup wizard.</p><br/>
+                <div class="wizard-input-section">
+                    <input type="checkbox" name="movie_notify_enable" id="movie_notify_enable" value="1" ${config['movie_notify_enable']}> Enable notifications on Movie and TV playback
+                </div>
+                <div class="wizard-input-section">
+                    <input type="checkbox" name="music_notify_enable" id="music_notify_enable" value="1" ${config['music_notify_enable']}> Enable notifications on Music playback
+                </div>
+            </div>
+
+            <div class="wizard-card" data-cardname="card6">
+                <h3>PlexWatch Import</h3>
+                <p class="help-block">If you have an existing PlexWatch database, you can import the data into PlexPy.</p>
+                <p class="help-block">
+                    When you complete this wizard navigate to the settings menu and to the Extra Settings tab. You will find an import tool there
+                    which will convert your plexWatch database into a format that PlexPy can read.
+                </p>
+                <!-- Figure out best way to get friends list refreshed before adding this back
+                    You can skip this and do it later if you wish.</p>
+                <p class="help-block">Enter the path and file name where your
+                plexWatch database file is located and hit Import. The import will run in the background so you can safely finish the wizard when the
+                Import status below changes to "Started"</p>
+                <div class="wizard-input-section">
+                    <label for="db_location">Database full Path and Filename</label>
+                    <div class="row">
+                        <div class="col-xs-8">
+                            <input type="text" class="form-control plexwatch-import" id="db_location" value="">
+                        </div>
+                        <div class="col-xs-4">
+                            <a class="btn btn-default btn-sm" id="plexwatch-import" style="margin-top: 4px;" href="#" role="button">Import</a>
                         </div>
                     </div>
-                    <input type="hidden" class="form-control" name="http_plex_admin" id="http_plex_admin" value="1">
-                    <input type="hidden" id="authentication_valid" data-validate="validateAuthentication" value="">
-                    <span style="display: none;" id="authentication-status"></span>
                 </div>
-
-                <div class="wizard-card" data-cardname="card3">
-                    <h3>Plex Account</h3>
-                    <div class="wizard-input-section">
-                        <p class="help-block">
-                            Tautulli requires a Plex.tv account. Click the button below to sign in on Plex.tv. You may need to allow popups in your browser.
-                        </p>
-                    </div>
-                    <input type="hidden" id="pms_token_validated" value="0" data-validate="validatePMStoken">
-                    <input type="hidden" name="pms_client_id" id="pms_client_id" value="">
-                    <button id="sign-in-plex" class="btn btn-form" type="button">Sign In with Plex</button>
-                    <span style="margin-left: 10px; display: none;" id="pms-token-status"></span>
-                </div>
-
-                <div class="wizard-card" data-cardname="card4">
-                    <h3>Plex Media Server</h3>
-                    <div class="wizard-input-section">
-                        <p class="help-block">
-                            Select your Plex Media Server from the dropdown menu or enter an IP address or hostname.
-                        </p>
-                    </div>
-                    <div class="wizard-input-section">
-                        <label for="pms_ip_selectize">Plex IP Address or Hostname</label>
-                        <div class="row">
-                            <div class="col-xs-12">
-                                <select class="form-control pms-settings selectize-pms-ip" id="pms_ip_selectize">
-                                    % if config['pms_identifier']:
-                                    <option value="${config['pms_ip']}:${config['pms_port']}"
-                                            data-identifier="${config['pms_identifier']}"
-                                            data-ip="${config['pms_ip']}"
-                                            data-port="${config['pms_port']}"
-                                            data-ssl="${config['pms_ssl']}"
-                                            data-is_cloud="${config['pms_is_cloud']}"
-                                            data-label="${config['pms_name'] or 'Local'}"
-                                            selected>${config['pms_ip']}</option>
-                                    % endif
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="wizard-input-section">
-                        <label for="pms_port">Plex Port</label>
-                        <div class="row">
-                            <div class="col-xs-3">
-                                <input type="text" class="form-control pms-settings" name="pms_port" id="pms_port" placeholder="32400" value="${config['pms_port']}" required>
-                            </div>
-                            <div class="col-xs-9">
-                                <div class="checkbox">
-                                    <label>
-                                        <input type="checkbox" id="pms_ssl_checkbox" class="checkbox-toggle pms-settings" data-id="pms_ssl" value="1" ${helpers.checked(config['pms_ssl'])}> Use Secure Connection
-                                        <input type="hidden" id="pms_ssl" name="pms_ssl" value="${config['pms_ssl']}">
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <input type="hidden" id="pms_valid" data-validate="validatePMSip" value="">
-                    <input type="hidden" id="pms_ip" name="pms_ip" value="${config['pms_ip']}">
-                    <input type="hidden" id="pms_is_cloud" name="pms_is_cloud" value="${config['pms_is_cloud']}">
-                    <input type="hidden" id="pms_identifier" name="pms_identifier" value="${config['pms_identifier']}">
-                    <a class="btn btn-dark" id="verify-plex-server" href="#" role="button">Verify</a>
-                    <span style="margin-left: 10px; display: none;" id="pms-verify-status"></span>
-                </div>
-
-                <div class="wizard-card" data-cardname="card5">
-                    <h3>Activity Logging</h3>
-                    <div class="wizard-input-section">
-                        <p class="help-block">
-                            Tautulli will keep a history of all streaming activity on your Plex server.
-                        </p>
-                    </div>
-                    <div class="wizard-input-section">
-                        <label for="logging_ignore_interval">Ignore Interval</label>
-                        <div class="row">
-                            <div class="col-xs-4">
-                                <input type="text" class="form-control pms-monitoring" id="logging_ignore_interval" name="logging_ignore_interval" placeholder="120" value="${config['logging_ignore_interval']}" data-validate="validateIgnoreInterval" required>
-                            </div>
-                            <span style="margin-left: 10px; line-height: 35px; display: none;" id="ignore-int-status"></span>
-                        </div>
-                        <p class="help-block">The interval (in seconds) an item must be in a playing state before logging it. 0 to disable.</p>
-                    </div>
-                    <div class="wizard-input-section">
-                        <p class="help-block">
-                            Additional options to disable history logging for certain libraries or users can be found by editing them
-                            on the <strong>Libraries</strong> or <strong>Users</strong> pages.
-                        </p>
-                    </div>
-                </div>
-
-                <div class="wizard-card" data-cardname="card6">
-                    <h3>Notifications</h3>
-                    <div class="wizard-input-section">
-                        <p class="help-block">
-                            Tautulli can send a wide variety of notifications to alert you of activity on your Plex server.
-                        </p>
-                        <p class="help-block">
-                            To set up a notification agent, navigate to the <strong>Settings</strong> page
-                            and to the <strong>Notification Agents</strong> tab after you have completed this setup wizard.
-                        </p>
-                    </div>
-                </div>
-
-                <div class="wizard-card" data-cardname="card7">
-                    <h3>Database Import</h3>
-                    <div class="wizard-input-section">
-                        <p class="help-block">
-                            If you have an existing Tautulli, PlexWatch, or Plexivity database, you can import the data into Tautulli.
-                        </p>
-                        <p class="help-block">
-                            To import a database, navigate to the <strong>Settings</strong> page
-                            and to the <strong>Import & Backups</strong> tab after you have completed this setup wizard.
-                        </p>
-                    </div>
-
-                    <!-- Required fields but hidden -->
-                    <div style="display: none;">
-                        <input type="checkbox" name="first_run" id="first_run" value="1" checked>
-                    </div>
-
+                <span>Import status: </span><strong><span id="plexwatch-import-status">Idle</span></strong>
+                -->
+                <div style="display: none;">
+                    <input type="checkbox" name="launch_browser" id="launch_browser" value="1" ${config['launch_browser']}>
+                    <input type="checkbox" name="refresh_users_on_startup" id="refresh_users_on_startup" value="1" ${config['refresh_users_on_startup']}>
+                    <input type="checkbox" name="first_run_complete" id="first_run_complete" value="1" checked>
+                    <input type="checkbox" name="check_github" id="check_github" value="1" checked>
                 </div>
+            </div>
+            <!-- Required fields but hidden -->
 
             </form>
             <div class="wizard-success">
@@ -231,43 +177,125 @@
                 <br/>
                 <p>Setup is now complete. For more configuration options please visit the Settings menu on the home page.</p>
                 <br/>
-                <i class="fa fa-refresh fa-spin"></i>&nbspWaiting <span class="countdown">5</span> seconds to ensure authentication token is registered...
+                <i class="fa fa-refresh fa-spin"></i>&nbspWaiting 5 seconds to ensure authentication token is registered...
 
             </div>
         </div>
     </div>
 </div>
 
-<script src="${http_root}js/jquery-3.6.0.min.js"></script>
-<script src="${http_root}js/bootstrap.min.js"></script>
-<script src="${http_root}js/selectize.min.js"></script>
-<script src="${http_root}js/platform.min.js"></script>
-<script src="${http_root}js/script.js${cache_param}"></script>
-<script src="${http_root}js/bootstrap-wizard.min.js"></script>
+<script src="interfaces/default/js/jquery-2.1.4.min.js"></script>
+<script src="interfaces/default/js/bootstrap3/bootstrap.min.js"></script>
+<script src="interfaces/default/js/selectize.min.js"></script>
+<script src="interfaces/default/js/script.js"></script>
+<script src="interfaces/default/js/bootstrap-wizard.min.js"></script>
 <script>
-    function validateAuthentication(el) {
-        var http_username = $("#http_username").val();
-        var http_password = $("#http_password").val();
-        var valid_authentication = el.val();
-        var retValue = {};
 
-        if (http_username === "" || http_password === "") {
-            retValue.status = false;
-            retValue.msg = "Please enter a username and password.";
-            $("#authentication-status").html('<i class="fa fa-exclamation-circle"></i> Please enter a username and password.');
-            $('#authentication-status').fadeIn('fast').delay(2000).fadeOut('fast');
-        } else {
-            retValue.status = true;
-        }
+    $(document).ready(function() {
+
+        $.fn.wizard.logging = false;
+        var options = {
+            keyboard : false,
+            contentHeight : 400,
+            contentWidth : 700,
+            backdrop: 'static',
+            buttons: {submitText: 'Finish'},
+            submitUrl: "configUpdate"
+        };
+        var wizard = $("#some-wizard").wizard(options);
+        wizard.show();
+
+        wizard.on("submit", function(wizard) {
+            // Probably should not success before we know, but hopefully validation is good enough.
+            wizard.submitSuccess();
+            $.ajax({
+                url: "configUpdate",
+                type: "POST",
+                url: wizard.args.submitUrl,
+                data: wizard.serialize(),
+                dataType: "json",
+                complete: function (data) {
+                    setTimeout(function(){
+                        location.reload();
+                    }, 5000);
+                }
+            })
+        });
+
+        $select_pms = $('#pms_ip').selectize({
+            create: true,
+            createOnBlur: true,
+            openOnFocus: true,
+            maxItems: 1,
+            closeAfterSelect: true,
+            onInitialize: function () {
+                var s = this;
+                this.revertSettings.$children.each(function () {
+                    $.extend(s.options[this.value], $(this).data());
+                });
+
+            },
+            render: {
+                option: function (item, escape) {
+                    return '<div data-use_ssl="' + item.httpsRequired + '" data-local="' + item.local + '" data-ci="' + item.clientIdentifier + '" data-ip="' + item.ip + '" data-port="' + item.port + '">' + item.value + '</div>';
+                },
+                item: function (item, escape) {
+                    // first item is rendered before initialization bug?
+                    if (!item.ci) {
+                        $.extend(item,
+                        $(this.revertSettings.$children)
+                            .filter('[value="' + item.value + '"]').data());
+
+                    }
+                    return '<div data-use_ssl="' + item.httpsRequired + '" data-local="' + item.local + '" data-ci="' + item.clientIdentifier + '" data-ip="' + item.ip + '" data-port="' + item.port + '">' + item.value + '</div>';
+                }
+            },
+            onChange: function (item) {
+                var ci = $('.selectize-input').find('div').attr('data-ci');
+                var port = $('.selectize-input').find('div').attr('data-port')
+                var local = $('.selectize-input').find('div').attr('data-local')
+                var ssl = $('.selectize-input').find('div').attr('data-use_ssl')
+
+                $("#pms-verify-status").html("");
+                // If a option was added by a user its
+                // data-xxx="undefined"
+                if (ci != "undefined") {
+                    // To allow next step in the guide.
+                    // servers with clientIdentifier is verified
+                    $("#pms_valid").val("valid");
+                    $("#pms-verify-status").html('<i class="fa fa-check"></i> Server found!').show();
+                } else {
+                    // Self made options must be verified
+                    $("#pms_valid").val("");
+                    $("#pms-verify-status").html("").hide();
+                }
+                // If the server is verified set the correct port
+                if (port != "undefined") {
+                    $('#pms_port').val(port);
+                } else {
+                    // set default port
+                    $('#pms_port').val("32400");
+                }
+                if (local != "undefined" && local == '0') {
+                    $('#pms_is_remote').prop('checked', true);
+                } else {
+                    $('#pms_is_remote').prop('checked', false);
+                }
+                if (ssl != "undefined" && ssl == "1") {
+                    $('#pms_ssl').prop('checked', true);
+                } else {
+                    $('#pms_ssl').prop('checked', false);
+                }
+            }
+        });
+    });
 
-        return retValue;
-    }
 
     function validatePMSip(el) {
         var valid_pms_ip = el.val();
         var retValue = {};
 
-        if (valid_pms_ip === "") {
+        if (valid_pms_ip == "") {
             retValue.status = false;
             retValue.msg = "Please verify your server.";
             $("#pms-verify-status").html('<i class="fa fa-exclamation-circle"></i> Please verify your server.');
@@ -283,7 +311,7 @@
         var valid_pms_token = el.val();
         var retValue = {};
 
-        if (valid_pms_token !== "1") {
+        if (valid_pms_token == "") {
             retValue.status = false;
             retValue.msg = "Please authenticate.";
             $("#pms-token-status").html('<i class="fa fa-exclamation-circle"></i> Please authenticate.');
@@ -311,204 +339,64 @@
         return retValue;
     }
 
+    function validateNotifications(el) {
+        var retValue = {};
+        retValue.status = true;
+
+        if ($('#movie_notify_on_start').is(':checked')) {
+            $('#movie_notify_enable').prop('checked', true);
+        }
+
+        if ($('#tv_notify_on_start').is(':checked')) {
+            $('#tv_notify_enable').prop('checked', true);
+        }
+
+        if ($('#music_notify_on_start').is(':checked')) {
+            $('#music_notify_enable').prop('checked', true);
+        }
+
+        return retValue;
+    }
+
     function isPositiveInt(n) {
         return $.isNumeric(n) && (Math.floor(n) == n) && (n >= 0)
     }
 
-$(document).ready(function() {
-
-    $.fn.wizard.logging = false;
-    var options = {
-        keyboard : false,
-        contentHeight : 450,
-        contentWidth : 700,
-        backdrop: 'static',
-        buttons: {submitText: 'Finish'},
-        submitUrl: "configUpdate"
-    };
-    var wizard = $("#setup-wizard").wizard(options);
-    wizard.show();
-
-    // Change button classes
-    wizard.find('.wizard-back').addClass('btn-dark');
-    wizard.on('incrementCard', function(wizard) {
-        wizard.find('.wizard-next.btn-success').removeClass('btn-success').addClass('btn-bright');
-    });
-    wizard.on('decrementCard', function(wizard) {
-        wizard.find('.wizard-next').removeClass('btn-bright').text('Next');
-    });
-
-    wizard.on("submit", function(wizard) {
-        // Probably should not success before we know, but hopefully validation is good enough.
-        wizard.submitSuccess();
-        $.ajax({
-            type: "POST",
-            url: wizard.args.submitUrl,
-            data: wizard.serialize(),
-            dataType: "json",
-            complete: function (data) {
-                $(".countdown").countdown(function () { location.reload(); }, 5, "");
-            }
-        })
-    });
-
-    $('.checkbox-toggle').click(function () {
-        var configToggle = $(this).data('id');
-        if ($(this).is(':checked')) {
-            $('#'+configToggle).val(1);
-        } else {
-            $('#'+configToggle).val(0);
-        }
-    });
-
-    var $select_pms = $('#pms_ip_selectize').selectize({
-        createOnBlur: true,
-        openOnFocus: true,
-        maxItems: 1,
-        closeAfterSelect: true,
-        sortField: 'label',
-        searchField: ['label', 'value'],
-        inputClass: 'form-control selectize-input',
-        render: {
-            item: function (item, escape) {
-                if (!item.label) {
-                    $.extend(item,
-                        $(this.revertSettings.$children)
-                             .filter('[value="' + item.value + '"]').data()
-                    );
-                }
-                var label = item.label || item.value;
-                var caption = item.label ? item.ip : null;
-                return '<div data-identifier="' + item.clientIdentifier +
-                        '" data-ip="' + item.ip +
-                        '" data-port="' + item.port +
-                        '" data-ssl="' + item.httpsRequired +
-                        '" data-is_cloud="' + item.is_cloud +
-                        '" data-label="' + item.label + '">' +
-                        '<span class="item-text">' + escape(label) + '</span>' +
-                        (caption ? '<span class="item-value">' + escape(caption) + '</span>' : '') +
-                        '</div>';
-            },
-            option: function (item, escape) {
-                var label = item.label || item.value;
-                var caption = item.label ? item.value : null;
-                return '<div data-identifier="' + item.clientIdentifier +
-                        '" data-ip="' + item.ip +
-                        '" data-port="' + item.port +
-                        '" data-ssl="' + item.httpsRequired +
-                        '" data-is_cloud="' + item.is_cloud +
-                        '" data-label="' + item.label + '">' +
-                        escape(label) +
-                        (caption ? '<span class="caption">' + escape(caption) + '</span>' : '') +
-                        '</div>';
-            }
-        },
-        create: function(input) {
-            return {label: '', value: input};
-        },
-        onInitialize: function () {
-            var s = this;
-            this.revertSettings.$children.each(function () {
-                $.extend(s.options[this.value], $(this).data());
-            });
-        },
-        onChange: function (item) {
-            var pms_ip_selected = this.getItem(item)[0];
-            var identifier = $(pms_ip_selected).data('identifier');
-            var ip = $(pms_ip_selected).data('ip');
-            var port = $(pms_ip_selected).data('port');
-            var ssl = $(pms_ip_selected).data('ssl');
-            var is_cloud = $(pms_ip_selected).data('is_cloud');
-            var value = $(pms_ip_selected).data('value');
-
-            $("#pms_valid").val(identifier !== 'undefined' ? 'valid' : '');
-            $("#pms-verify-status").html(identifier !== 'undefined' ? '<i class="fa fa-check"></i>&nbsp; Server found!' : '').fadeIn('fast');
-
-            $("#pms_identifier").val(identifier !== 'undefined' ? identifier : '');
-            $('#pms_ip').val(ip !== 'undefined' ? ip : value);
-            $('#pms_port').val(port !== 'undefined' ? port : 32400);
-            $('#pms_ssl_checkbox').prop('checked', (ssl !== 'undefined' && ssl === 1));
-            $('#pms_ssl').val(ssl !== 'undefined' && ssl === 1 ? 1 : 0);
-            $('#pms_is_cloud').val(is_cloud !== 'undefined' && is_cloud === true ? 1 : 0);
-
-            if (is_cloud === true) {
-                $('#pms_port').prop('readonly', true);
-                $('#pms_ssl_checkbox').prop('disabled', true);
-            } else {
-                $('#pms_port').prop('readonly', false);
-                $('#pms_ssl_checkbox').prop('disabled', false);
-            }
-        },
-        onDropdownOpen: function() {
-            this.clear();
-        }
-    });
-    var select_pms = $select_pms[0].selectize;
-
-    function getServerOptions() {
-        $.ajax({
-            url: 'discover',
-            success: function (result) {
-                if (result) {
-                    var existing_ip = $('#pms_ip').val();
-                    var existing_port = $('#pms_port').val();
-                    result.forEach(function (item) {
-                        if (item.ip === existing_ip && item.port === existing_port) {
-                            select_pms.updateOption(item.value, item);
-                        } else {
-                            select_pms.addOption(item);
-                        }
-                    });
-                }
-            }
-        })
-    }
     var pms_verified = false;
     var authenticated = false;
 
-    $("#verify-plex-server").click(function () {
-        if (!(pms_verified)) {
-            var pms_ip = $("#pms_ip").val().trim();
-            var pms_port = $("#pms_port").val().trim();
-            var pms_identifier = $("#pms_identifier").val();
-            var pms_ssl = $("#pms_ssl").val();
-            if ((pms_ip !== '') || (pms_port !== '')) {
-                $("#pms-verify-status").html('<i class="fa fa-refresh fa-spin"></i>&nbsp; Verifying server...');
-                $('#pms-verify-status').fadeIn('fast');
-                $.ajax({
-                    url: 'get_server_id',
-                    data: {
-                        hostname: pms_ip,
-                        port: pms_port,
-                        identifier: pms_identifier,
-                        ssl: pms_ssl
-                    },
-                    cache: true,
-                    async: true,
-                    timeout: 5000,
-                    error: function (jqXHR, textStatus, errorThrown) {
-                        $("#pms-verify-status").html('<i class="fa fa-exclamation-circle"></i>&nbsp; Error verifying server: ' + textStatus);
+    $("#verify-plex-server").click(function() {
+        var pms_ip = $("#pms_ip").val()
+        var pms_port = $("#pms_port").val()
+        if (($("#pms_ip").val() !== '') || ($("#pms_port").val() !== '')) {
+            $("#pms-verify-status").html('<i class="fa fa-refresh fa-spin"></i> Validating server...');
+            $('#pms-verify-status').fadeIn('fast');
+            $.ajax({
+                url: 'get_server_id',
+                data : { hostname: pms_ip, port: pms_port },
+                cache: true,
+                async: true,
+                timeout: 5000,
+                error: function(jqXHR, textStatus, errorThrown) {
+                    $("#pms-verify-status").html('<i class="fa fa-exclamation-circle"></i> This is not a Plex Server!');
+                    $('#pms-verify-status').fadeIn('fast');
+                },
+                success: function (xml) {
+                    if ( $(xml).find('MediaContainer').attr('machineIdentifier') ) {
+                        $("#pms_identifier").val($(xml).find('MediaContainer').attr('machineIdentifier'));
+                        $("#pms-verify-status").html('<i class="fa fa-check"></i> Server found!');
+                        $('#pms-verify-status').fadeIn('fast');
+                        pms_verified = true;
+                        $("#pms_valid").val("valid");
+                    } else {
+                        $("#pms-verify-status").html('<i class="fa fa-exclamation-circle"></i> This is not a Plex Server!');
                         $('#pms-verify-status').fadeIn('fast');
-                    },
-                    success: function(xhr, status) {
-                        var result = xhr;
-                        var identifier = result.identifier;
-                        if (identifier) {
-                            $("#pms_identifier").val(identifier);
-                            $("#pms-verify-status").html('<i class="fa fa-check"></i>&nbsp; Server found!');
-                            $('#pms-verify-status').fadeIn('fast');
-                            pms_verified = true;
-                            $("#pms_valid").val("valid");
-                        } else {
-                            $("#pms-verify-status").html('<i class="fa fa-exclamation-circle"></i>&nbsp; This is not a Plex Server!');
-                            $('#pms-verify-status').fadeIn('fast');
-                        }
                     }
-                });
-            } else {
-                $("#pms-verify-status").html('<i class="fa fa-exclamation-circle"></i>&nbsp; Please enter both fields.');
-                $('#pms-verify-status').fadeIn('fast');
-            }
+                }
+            });
+        } else {
+            $("#pms-verify-status").html('<i class="fa fa-exclamation-circle"></i> Please enter both fields.');
+            $('#pms-verify-status').fadeIn('fast');
         }
     });
 
@@ -518,25 +406,82 @@ $(document).ready(function() {
         $("#pms-verify-status").html("");
     });
 
-    function OAuthPreFunction() {
-        $("#pms-token-status").html('<i class="fa fa-refresh fa-spin"></i>&nbsp; Waiting for authentication...').fadeIn('fast');
-    }
-    function OAuthSuccessCallback(authToken) {
-        $.post('save_pms_token', { token: authToken, client_id: $('#pms_client_id').val() }, function () {
-            $("#pms_token_validated").val(1);
-            getServerOptions();
-        });
-        $("#pms-token-status").html('<i class="fa fa-check"></i>&nbsp; Authentication successful.').fadeIn('fast');
-        authenticated = true;
-    }
-    function OAuthErrorCallback() {
-        $("#pms-token-status").html('<i class="fa fa-exclamation-circle"></i>&nbsp; Error communicating with Plex.tv.').fadeIn('fast');
-    }
-
-    $('#sign-in-plex').click(function() {
-        PlexOAuth(OAuthSuccessCallback, OAuthErrorCallback, OAuthPreFunction, $('#pms_client_id').val(uuidv4()).val());
+    $( ".pms-auth" ).change(function() {
+        authenticated = false;
+        $("#pms_token").val("");
+        $("#pms-token-status").html("");
     });
-});
+
+    // Plex.tv auth token fetch
+    $("#pms-authenticate").click(function() {
+        $("#pms-token-status").html('<i class="fa fa-refresh fa-spin"></i> Fetching token...');
+        $('#pms-token-status').fadeIn('fast');
+        if (($("#pms_username").val() !== '') || ($("#pms_password").val() !== '')) {
+            $.ajax({
+                type: "post",
+                url: "https://plex.tv/users/sign_in.xml",
+                dataType: 'xml',
+                async: true,
+                headers: {'Content-Type': 'application/xml; charset=utf-8',
+                          'X-Plex-Device-Name': 'PlexPy',
+                          'X-Plex-Product': 'PlexPy',
+                          'X-Plex-Version': '${common.VERSION_NUMBER}',
+                          'X-Plex-Platform': '${common.PLATFORM}',
+                          'X-Plex-Platform-Version': '${common.PLATFORM_VERSION}',
+                          'X-Plex-Client-Identifier': '${config['pms_uuid']}',
+                          'Authorization': 'Basic ' + btoa($("#pms_username").val() + ':' + $("#pms_password").val())
+                },
+                error: function(jqXHR, textStatus, errorThrown) {
+                    $("#pms-token-status").html('<i class="fa fa-exclamation-circle"></i> Authentation failed!');
+                    $('#pms-token-status').fadeIn('fast');
+                },
+                success: function (xml) {
+                    var authToken = $(xml).find('user').attr('authenticationToken');
+                    $("#pms-token-status").html('<i class="fa fa-check"></i> Authentation successful!');
+                    $('#pms-token-status').fadeIn('fast');
+                    $("#pms_token").val(authToken);
+                    authenticated = true;
+                    getServerOptions(authToken)
+                }
+            });
+        } else {
+            $("#pms-token-status").html('<i class="fa fa-exclamation-circle"></i> You must enter both fields.');
+            $('#pms-token-status').fadeIn('fast');
+        }
+    });
+
+    // Send database path to import script
+    $("#plexwatch-import").click(function() {
+        var database_path = $("#db_location").val();
+        var table_name = 'processed';
+        var import_ignore_interval = 0;
+        $.ajax({
+            url: 'get_plexwatch_export_data',
+            data: {database_path: database_path, table_name:table_name, import_ignore_interval:import_ignore_interval},
+            cache: false,
+            async: true,
+            success: function(data) {
+                if (data === 'Import has started. Check the PlexPy logs to monitor any problems.') {
+                    $("#plexwatch-import-status").html('Started');
+                } else {
+                    $("#plexwatch-import-status").html(data);
+                }
+                $("#db_location").val('')
+            }
+        });
+    });
+
+    function getServerOptions(token) {
+        /* Set token and returns server options */
+        $.ajax({
+            url: "discover/" + token,
+            success: function (result) {
+                $('#pms_ip').html("")
+                // Add all servers to the "combobox"
+                $select_pms[0].selectize.addOption(result);
+            }
+        })
+    }
 </script>
 
 </body>
diff --git a/data/interfaces/default/xml_shortcut.html b/data/interfaces/default/xml_shortcut.html
deleted file mode 100644
index f1fd46a4..00000000
--- a/data/interfaces/default/xml_shortcut.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!doctype html>
-
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>Tautulli - ${title}</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="${http_root}css/bootstrap3/bootstrap.min.css" rel="stylesheet">
-    <link href="${http_root}css/tautulli.css${cache_param}" rel="stylesheet">
-    <link href="${http_root}css/opensans.min.css" rel="stylesheet">
-    <link href="${http_root}css/font-awesome.all.min.css" rel="stylesheet">
-    <link href="${http_root}css/font-awesome.v4-shims.min.css" rel="stylesheet">
-
-    <!-- Favicons -->
-    <link rel="icon" type="image/png" sizes="32x32" href="${http_root}images/favicon/favicon-32x32.png?v=2.6.0">
-    <link rel="icon" type="image/png" sizes="16x16" href="${http_root}images/favicon/favicon-16x16.png?v=2.6.0">
-    <link rel="shortcut icon" href="${http_root}images/favicon/favicon.ico?v=2.6.0">
-</head>
-
-<body style="margin: 0; overflow: auto;">
-<div class="login-body-container">
-    <div class="container-fluid">
-        <div class="row">
-            <div class="login-container">
-                <div class="row">
-                    <div class="col-sm-6 col-sm-offset-3">
-                        <div id="sign-in-alert" class="alert alert-danger login-alert"></div>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="col-sm-6 col-sm-offset-3">
-                        <div class="form-group">
-                            <label for="xml_url">Plex XML URL</label>
-                            <input id="xml_url" class="form-control" type="text" value="${url}" />
-                        </div>
-                        <span class="remember-group">
-                            Sign in with Plex to view the XML
-                        </span>
-                        <button id="sign-in-plex" class="btn btn-bright login-button"><i class="fa fa-sign-in"></i>&nbsp; Sign In</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script src="${http_root}js/jquery-3.6.0.min.js"></script>
-<script src="${http_root}js/platform.min.js"></script>
-<script src="${http_root}js/script.js${cache_param}"></script>
-<script>
-    function OAuthSuccessCallback(authToken) {
-        var url = new URL($('#xml_url').val());
-        url.searchParams.append('X-Plex-Token', authToken);
-        window.location.href = url.toString();
-    }
-    function OAuthErrorCallback() {
-        $('#sign-in-alert').text('Error communicating with Plex.tv.').show();
-    }
-
-    $('#sign-in-plex').click(function() {
-        PlexOAuth(OAuthSuccessCallback, OAuthErrorCallback);
-    });
-</script>
-</body>
-</html>
diff --git a/data/interfaces/newsletters/recently_added.html b/data/interfaces/newsletters/recently_added.html
deleted file mode 100644
index e74d8463..00000000
--- a/data/interfaces/newsletters/recently_added.html
+++ /dev/null
@@ -1,1091 +0,0 @@
-% if data:
-<%
-    import plexpy
-    from plexpy.helpers import grouper, get_img_service
-
-    recently_added = data['recently_added']
-    if plexpy.CONFIG.NEWSLETTER_SELF_HOSTED and plexpy.CONFIG.HTTP_BASE_URL:
-        base_url = plexpy.CONFIG.HTTP_BASE_URL + plexpy.HTTP_ROOT + 'newsletter/'
-    elif preview:
-        base_url = 'newsletter/'
-    else:
-        base_url = ''
-
-    service = get_img_service(include_self=True)
-    if service == 'self-hosted' and plexpy.CONFIG.HTTP_BASE_URL:
-        base_url_image = plexpy.CONFIG.HTTP_BASE_URL + plexpy.HTTP_ROOT + 'image/'
-    elif preview and service and service != 'self-hosted':
-        base_url_image = 'image/'
-    else:
-        base_url_image = ''
-
-%>
-<!doctype html>
-<html>
-<head>
-    <meta name="viewport" content="width=device-width">
-    <meta name="color-scheme" content="light dark">
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title>Tautulli Newsletter - ${subject}</title>
-    <link rel="shortcut icon" href="${base_url_image + 'images/favicon/favicon.ico' if base_url_image else 'https://tautulli.com/images/favicon.ico'}">
-    <style>
-        /* -------------------------------------
-            GLOBAL RESETS
-        ------------------------------------- */
-        img {
-            border: none;
-            -ms-interpolation-mode: bicubic;
-            max-width: 100%;
-        }
-
-        body {
-            font-family: 'Open Sans', Helvetica, Arial, sans-serif;
-            -webkit-font-smoothing: antialiased;
-            font-size: 14px;
-            line-height: 1.4;
-            margin: 0;
-            padding: 0;
-            -ms-text-size-adjust: 100%;
-            -webkit-text-size-adjust: 100%;
-        }
-
-        table {
-            border-collapse: separate;
-            mso-table-lspace: 0pt;
-            mso-table-rspace: 0pt;
-            width: 100%;
-        }
-
-        table td {
-            font-family: 'Open Sans', Helvetica, Arial, sans-serif;
-            font-size: 14px;
-            vertical-align: top;
-        }
-
-        /* -------------------------------------
-            BODY & CONTAINER
-        ------------------------------------- */
-
-        .body {
-            width: 100%;
-        }
-
-        .container {
-            display: block;
-            margin: 0 auto !important;
-            max-width: 1042px;
-            padding: 10px;
-            width: 1042px;
-        }
-
-        .content {
-            box-sizing: border-box;
-            display: block;
-            margin: 0 auto;
-            max-width: 1037px;
-            padding: 10px;
-        }
-
-        /* -------------------------------------
-            HEADER, FOOTER, MAIN
-        ------------------------------------- */
-        .local-preview-note {
-            text-align: center;
-            padding-top: 10px;
-        }
-        .local-preview-note p {
-            color: #282A2D;
-            font-size: 12px;
-        }
-        .main {
-            background: #282A2D;
-            border-radius: 3px;
-            width: 100%;
-            color: #ffffff;
-        }
-
-        .wrapper {
-            box-sizing: border-box;
-            padding: 5px;
-            overflow: auto;
-        }
-
-        .content-block {
-            padding-bottom: 10px;
-            padding-top: 10px;
-        }
-
-        .footer {
-            clear: both;
-            margin-top: 10px;
-            text-align: center;
-            width: 100%;
-            font-size: 12px;
-        }
-        .footer-bar {
-            margin-left: auto;
-            margin-right: auto;
-            width: 200px;
-            border-top: 1px solid #E5A00D;
-            margin-top: 25px;
-        }
-
-        .footer td,
-        .footer p,
-        .footer span,
-        .footer a {
-            color: #fff;
-            font-size: 12px;
-            text-align: center;
-        }
-
-        /* -------------------------------------
-            TYPOGRAPHY
-        ------------------------------------- */
-        h1,
-        h2,
-        h3,
-        h4 {
-            color: #ffffff;
-            font-family: 'Open Sans', Helvetica, Arial, sans-serif;
-            font-weight: 400;
-            margin: 0;
-        }
-
-        p,
-        ul,
-        ol {
-            font-family: 'Open Sans', Helvetica, Arial, sans-serif;
-            font-weight: 400;
-            margin: 0;
-        }
-
-        p li,
-        ul li,
-        ol li {
-            list-style-position: inside;
-            margin-left: 5px;
-        }
-
-        a {
-            text-decoration: underline;
-        }
-
-        /* -------------------------------------
-            OTHER STYLES THAT MIGHT BE USEFUL
-        ------------------------------------- */
-        .mb5 {
-            margin-bottom: 5px;
-        }
-
-        .nowrap {
-            white-space: nowrap;
-            text-overflow: ellipsis;
-            overflow: hidden;
-        }
-
-        .preheader {
-            color: transparent;
-            display: none;
-            height: 0;
-            max-height: 0;
-            max-width: 0;
-            opacity: 0;
-            overflow: hidden;
-            mso-hide: all;
-            visibility: hidden;
-            width: 0;
-        }
-        .view-full {
-            clear: both;
-            color: #282A2D;
-            font-size: 12px;
-            margin-bottom: 10px;
-            text-align: center;
-            width: 100%;
-        }
-        .view-full a {
-            color: #282A2D;
-        }
-
-        .powered-by a {
-            text-decoration: underline;
-        }
-
-        /* -------------------------------------
-            HEADER
-        ------------------------------------- */
-        .header {
-            width: 100%;
-            height: 90px;
-            text-align: center;
-        }
-        .header-img {
-            width: 492px;
-            height: 90px;
-            margin-left: -35px;
-        }
-        .server-name {
-            font-size: 30px;
-            text-align: center;
-        }
-        .dates {
-            color: #aaaaaa;
-            font-size: 20px;
-            text-align: center;
-        }
-        .body-message {
-            font-size: 20px;
-            text-align: center;
-            width: 80%;
-            margin-left: auto;
-            margin-right: auto;
-        }
-
-        /* -------------------------------------
-            MEDIA SECTIONS
-        ------------------------------------- */
-        h2 {
-            font-size: 30px;
-            font-weight: 300;
-            margin: 20px 10px 0 10px;
-            text-align: center;
-        }
-
-        h3 {
-            font-size: 25px;
-            font-weight: 300;
-            margin: 0 0 10px 0;
-        }
-
-        .sub-header-icon {
-            height: 30px;
-            width: 30px;
-            vertical-align: middle;
-            margin-right: 5px;
-            margin-bottom: 5px;
-        }
-        .sub-header-bar {
-            margin-left: auto;
-            margin-right: auto;
-            font-size: 30px;
-            text-align: center;
-            width: 200px;
-            border-top: 1px solid #E5A00D;
-            margin-top: 15px;
-            margin-bottom: 25px;
-        }
-        .sub-header-title {
-            margin-left: auto;
-            margin-right: auto;
-            font-size: 30px;
-            text-align: center;
-            font-weight: lighter;
-        }
-        .sub-header-count {
-            margin-left: auto;
-            margin-right: auto;
-            font-size: 30px;
-            text-align: center;
-        }
-        .sub-header-count .count {
-            color: #E5A00D;
-        }
-        .sub-header-count .count-units {
-            color: #aaaaaa;
-            font-size: 20px;
-            text-transform: uppercase;
-        }
-
-        /* -------------------------------------
-            MEDIA CARDS
-        ------------------------------------- */
-        .card-instance {
-            font-size: 12px;
-            overflow: hidden;
-            padding: 3px;
-            width: 502px;
-            min-width: 502px;
-            max-width: 502px;
-        }
-        .card-instance.pad {
-            padding: 0 !important;
-            width: 251px !important;
-            min-width: 251px !important;
-            max-width: 251px !important;
-        }
-        .card-instance.movie,
-        .card-instance.show {
-            height: 233px;
-        }
-        .card-instance.album {
-            height: 158px;
-        }
-        .card-background {
-            background-color: #282828;
-            background-position: center;
-            background-size: cover;
-            background-repeat: no-repeat;
-            background-clip: padding-box;
-            border: 1px solid rgba(255,255,255,.1);
-        }
-        .card-poster-container {
-            width: 152px;
-            min-width: 152px;
-        }
-        .card-instance.movie .card-poster-container,
-        .card-instance.show .card-poster-container{
-            height: 227px;
-        }
-        .card-instance.album .card-poster-container {
-            height: 152px;
-        }
-        .card-poster {
-            background-color: #3F4245;
-            background-position: center;
-            background-size: cover;
-            background-repeat: no-repeat;
-            background-clip: padding-box;
-            border: 1px solid rgba(255,255,255,.1);
-        }
-        .card-poster-overlay {
-            display: block;
-        }
-        .card-info-container {
-            padding-left: 4px;
-            text-align: left;
-        }
-        .card-instance.movie .card-info-container,
-        .card-instance.show .card-info-container{
-            height: 227px;
-        }
-        .card-instance.album .card-info-container {
-            height: 152px;
-        }
-        .card-info-container .card-info-container-table {
-            height: 100%;
-        }
-        .card-info-title {
-            border-bottom: 1px solid rgba(255, 255, 255, .1);
-            line-height: 1.2rem;
-            font-size: 0.9rem;
-            padding: 5px;
-            max-width: 320px;
-        }
-        .card-info-title a {
-            text-decoration: none;
-            color: #ffffff;
-        }
-        .card-info-body {
-            font-size: 0.75rem;
-            padding: 5px;
-            height: 100%;
-        }
-        .card-info-body > p {
-            max-width: 325px;
-            color: #ffffff;
-        }
-        .card-instance.movie .card-info-body,
-        .card-instance.show .card-info-body {
-        }
-        .card-instance.album .card-info-body {
-            height: 82px;
-            min-height: 82px;
-        }
-        .card-info-footer {
-            font-size: 0.6rem;
-            padding-top: 0px;
-            padding-right: 5px;
-            padding-bottom: 5px;
-            padding-left: 5px;
-        }
-        .card-info-footer .badge-container {
-            max-width: 260px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
-        .card-info-footer .star-rating-container {
-            width: 65px;
-        }
-        .card-info-footer .star-rating {
-            margin-left: 4px;
-            font-size: 0.8rem;
-            line-height: 1rem;
-            width: 0.5rem;
-            display: inline-block;
-            vertical-align: bottom;
-        }
-        .star-rating.full {
-            color: #E5A00D;
-        }
-        .star-rating.empty {
-            color: #aaaaaa;
-        }
-        .badge {
-            display: inline-block;
-            min-width: 10px;
-            margin-right: 4px;
-            padding: 3px 7px;
-            font-size: 11px;
-            line-height: 1;
-            text-align: center;
-            white-space: nowrap;
-            vertical-align: middle;
-            background-color: rgba(0, 0, 0, .25);
-            border-radius: 2px;
-            text-overflow: ellipsis;
-            overflow: hidden;
-            color: #ffffff;
-        }
-
-        /* -------------------------------------
-            RESPONSIVE AND MOBILE FRIENDLY STYLES
-        ------------------------------------- */
-        @media only screen and (max-width: 1040px) {
-            .card-instance {
-                display: block !important;
-                margin-top: 0 !important;
-                margin-right: auto !important;
-                margin-bottom: 0 !important;
-                margin-left: auto !important;
-            }
-
-            table[class=body] .header {
-                height: 75px !important;
-            }
-            table[class=body] .header-img {
-                width: 410px;
-                height: 75px;
-                margin-left: -30px;
-            }
-
-            table[class=body] h1 {
-                font-size: 28px !important;
-                margin-bottom: 10px !important;
-            }
-
-            table[class=body] .server-name {
-                font-size: 20px !important;
-            }
-            table[class=body] .dates,
-            table[class=body] .body-message {
-                font-size: 14px !important;
-            }
-            table[class=body] .sub-header > div {
-                font-size: 20px !important;
-            }
-            table[class=body] .sub-header-title {
-                font-size: 20px !important;
-            }
-            table[class=body] .sub-header-icon {
-                height: 20px !important;
-                width: 20px !important;
-            }
-            table[class=body] .count {
-                font-size: 20px !important;
-            }
-            table[class=body] .count-units {
-                font-size: 14px !important;
-            }
-
-            table[class=body] .content {
-                padding: 0 !important;
-            }
-
-            table[class=body] .container {
-                padding: 0 !important;
-                width: 100% !important;
-            }
-
-            table[class=body] .main {
-                border-left-width: 0 !important;
-                border-radius: 0 !important;
-                border-right-width: 0 !important;
-            }
-        }
-
-        /* -------------------------------------
-            PRESERVE THESE STYLES IN THE HEAD
-        ------------------------------------- */
-        @media all {
-            .ExternalClass {
-                width: 100%;
-            }
-
-            .ExternalClass,
-            .ExternalClass p,
-            .ExternalClass span,
-            .ExternalClass font,
-            .ExternalClass td,
-            .ExternalClass div {
-                line-height: 100%;
-            }
-
-            a[x-apple-data-detectors] {
-                color: inherit !important;
-                font-family: inherit !important;
-                font-size: inherit !important;
-                font-weight: inherit !important;
-                line-height: inherit !important;
-                text-decoration: none !important;
-            }
-        }
-
-    </style>
-</head>
-<body style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;-webkit-font-smoothing: antialiased;font-size: 14px;line-height: 1.4;margin: 0;padding: 0;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;">
-% if preview and service and service != 'self-hosted':
-<div class="local-preview-note" style="text-align: center;padding-top: 10px;"><p style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;color: #282A2D;font-size: 12px;">Note: Local preview images only - images will be uploaded to ${service.capitalize()} when the newsletter is sent.</p></div>  <!-- IGNORE SAVE -->
-% elif preview and not service:
-<div class="local-preview-note" style="text-align: center;padding-top: 10px;"><p style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;color: #282A2D;font-size: 12px;">Warning: The Image Hosting setting must be enabled for images to display on the newsletter.</p></div>  <!-- IGNORE SAVE -->
-% endif
-<table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-    <tr>
-        <td class="container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;display: block;max-width: 1042px;padding: 10px;width: 1042px;margin: 0 auto !important;">
-            <div class="content" style="box-sizing: border-box;display: block;margin: 0 auto;max-width: 1037px;padding: 10px;">
-                <span class="preheader" style="color: transparent;display: none;height: 0;max-height: 0;max-width: 0;opacity: 0;overflow: hidden;mso-hide: all;visibility: hidden;width: 0;">Tautulli Newsletter  - ${subject}</span>
-                % if base_url and not preview:
-                <div class="view-full" style="clear: both;color: #282A2D;font-size: 12px;margin-bottom: 10px;text-align: center;width: 100%;">  <!-- IGNORE SAVE -->
-                    <a href="${base_url + uuid}" title="View full newsletter" target="_blank" rel="noreferrer" style="text-decoration: underline;color: #282A2D;">Click here to view the full newsletter.</a>  <!-- IGNORE SAVE -->
-                </div>  <!-- IGNORE SAVE -->
-                % endif
-                <table border="0" cellpadding="3" cellspacing="0" class="main" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background: #282A2D;border-radius: 3px;color: #ffffff;">
-                    <tr>
-                        <td class="wrapper" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;box-sizing: border-box;padding: 5px;overflow: auto;">
-                            <div class="header" style="width: 100%;height: 90px;text-align: center;">
-                                <img src="${base_url_image + 'images/newsletter/newsletter-header.png' if base_url_image else 'https://tautulli.com/images/newsletter/newsletter-header.png'}" class="header-img" width="492" height="90" style="border: none;-ms-interpolation-mode: bicubic;max-width: 100%;width: 492px;height: 90px;margin-left: -35px;">
-                            </div>
-                            <div class="server-name" style="font-size: 30px;text-align: center;">${parameters['server_name']}</div>
-                            <div class="dates" style="color: #aaaaaa;font-size: 20px;text-align: center;">${parameters['start_date']} - ${parameters['end_date']}</div>
-                        </td>
-                    </tr>
-                    % if message:
-                    <tr>
-                        <td class="wrapper" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;box-sizing: border-box;padding: 5px;overflow: auto;">
-                            <div class="sub-header-bar" style="margin-left: auto;margin-right: auto;font-size: 30px;text-align: center;width: 200px;border-top: 1px solid #E5A00D;margin-top: 15px;margin-bottom: 25px;"></div>
-                            <div class="body-message" style="font-size: 20px;text-align: center;width: 80%;margin-left: auto;margin-right: auto;">${'<br>'.join(l for l in message.splitlines()) | n}</div>
-                        </td>
-                    </tr>
-                    % endif
-                    % if recently_added.get('movie'):
-                    <tr>
-                        <td class="wrapper" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;box-sizing: border-box;padding: 5px;overflow: auto;">
-                            <div class="sub-header-bar" style="margin-left: auto;margin-right: auto;font-size: 30px;text-align: center;width: 200px;border-top: 1px solid #E5A00D;margin-top: 15px;margin-bottom: 25px;"></div>
-                            <div class="sub-header-title" style="margin-left: auto;margin-right: auto;font-size: 30px;text-align: center;font-weight: lighter;">
-                                <img src="${(base_url_image + 'images/libraries/movie.png') if base_url_image else 'https://tautulli.com/images/libraries/movie.png'}" class="sub-header-icon" width="30" height="30" style="border: none;-ms-interpolation-mode: bicubic;max-width: 100%;height: 30px;width: 30px;vertical-align: middle;margin-right: 5px;margin-bottom: 5px;"> Recently Added Movies
-                            </div>
-                            <div class="sub-header-count" style="margin-left: auto;margin-right: auto;font-size: 30px;text-align: center;">
-                                <span class="count" style="color: #E5A00D;">${len(recently_added['movie'])}</span> <span class="count-units" style="color: #aaaaaa;font-size: 20px;text-transform: uppercase;">movie${'s' if len(recently_added['movie']) > 1 else ''}</span>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
-                            <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                % for movie_a, movie_b in grouper(recently_added['movie'], 2):
-                                <tr>
-                                    <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
-                                        <table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                            <tr>
-                                                % for movie in (movie_a, movie_b):
-                                                % if movie:
-                                                % if not movie_b:
-                                                <td align="center" valign="top" class="card-instance pad" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 0 !important;width: 251px !important;min-width: 251px !important;max-width: 251px !important;"></td>
-                                                % endif
-                                                <td align="center" valign="top" class="card-instance movie" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 3px;width: 502px;min-width: 502px;max-width: 502px;height: 233px;">
-                                                    <table border="0" cellpadding="0" cellspacing="3" width="100%" class="card-background" style="background-image: url(${(base_url_image + movie['art_hash']) if base_url_image else movie['art_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #282828;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
-                                                        <tr>
-                                                            <td class="card-poster-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;width: 152px;min-width: 152px;height: 227px;">
-                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + movie['thumb_hash']) if base_url_image else movie['thumb_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #3F4245;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
-                                                                    <tr>
-                                                                        <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${movie['rating_key']}" title="${movie['title']}" target="_blank" rel="noreferrer" style="text-decoration: underline;">
-                                                                                <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-poster.png' if base_url_image else 'https://tautulli.com/images/newsletter/view-on-plex-poster.png'}" width="150" height="225" style="border: none;-ms-interpolation-mode: bicubic;max-width: 100%;display: block;">
-                                                                            </a>
-                                                                        </td>
-                                                                    </tr>
-                                                                </table>
-                                                            </td>
-                                                            <td class="card-info-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;padding-left: 4px;text-align: left;height: 227px;">
-                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;height: 100%;">
-                                                                    <tr>
-                                                                        <td class="card-info-title nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.9rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;border-bottom: 1px solid rgba(255, 255, 255, .1);line-height: 1.2rem;padding: 5px;max-width: 320px;">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${movie['rating_key']}" title="${movie['title']}" target="_blank" rel="noreferrer" style="text-decoration: none;color: #ffffff;">${movie['title']}</a>
-                                                                        </td>
-                                                                    </tr>
-                                                                    <tr>
-                                                                        <td class="card-info-body" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.75rem;vertical-align: top;padding: 5px;height: 100%;">
-                                                                            % if movie['tagline']:
-                                                                            <p class="nowrap mb5" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;margin-bottom: 5px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;max-width: 325px;color: #ffffff;">
-                                                                                <em>${movie['tagline']}</em>
-                                                                            </p>
-                                                                            % endif
-                                                                            <p style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;max-width: 325px;color: #ffffff;">
-                                                                                ${movie['summary'][:450] + (movie['summary'][450:] and '...')}
-                                                                            </p>
-                                                                        </td>
-                                                                    </tr>
-                                                                    <tr>
-                                                                        <td class="card-info-footer nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.6rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;padding-top: 0px;padding-right: 5px;padding-bottom: 5px;padding-left: 5px;">
-                                                                            <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                                                                <tr>
-                                                                                    <td class="badge-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;max-width: 260px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                                                                                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                                                                            <tr>
-                                                                                                % if movie['year']:
-                                                                                                <td class="badge" title="${movie['year']}" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 11px;vertical-align: middle;display: inline-block;min-width: 10px;margin-right: 4px;padding: 3px 7px;line-height: 1;text-align: center;white-space: nowrap;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${movie['year']}</td>
-                                                                                                % endif
-                                                                                                % if movie['duration']:
-                                                                                                <% duration = int(int(movie['duration'])/60000) %>
-                                                                                                <td class="badge" title="${duration} mins" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 11px;vertical-align: middle;display: inline-block;min-width: 10px;margin-right: 4px;padding: 3px 7px;line-height: 1;text-align: center;white-space: nowrap;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${duration} mins</td>
-                                                                                                % endif
-                                                                                                % if movie['genres']:
-                                                                                                % for genre in movie['genres'][:]:
-                                                                                                <td class="badge" title="${genre}" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 11px;vertical-align: middle;display: inline-block;min-width: 10px;margin-right: 4px;padding: 3px 7px;line-height: 1;text-align: center;white-space: nowrap;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${genre}</td>
-                                                                                                % endfor
-                                                                                                % endif
-                                                                                            </tr>
-                                                                                        </table>
-                                                                                    </td>
-                                                                                    % if movie['rating'] or movie['audience_rating']:
-                                                                                    <% rating = int(round(float(movie['rating'] or movie['audience_rating']) / 2)) %>
-                                                                                    <td class="star-rating-container" title="${int(float(movie['rating'] or movie['audience_rating'])/0.1)}%" align="right" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;width: 65px;">
-                                                                                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                                                                            <tr>
-                                                                                                % for _ in range(rating):
-                                                                                                <td class="star-rating full" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.8rem;vertical-align: bottom;margin-left: 4px;line-height: 1rem;width: 0.5rem;display: inline-block;color: #E5A00D;">&#9733;</td>
-                                                                                                % endfor
-                                                                                                % for _ in range(5-rating):
-                                                                                                <td class="star-rating empty" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.8rem;vertical-align: bottom;margin-left: 4px;line-height: 1rem;width: 0.5rem;display: inline-block;color: #aaaaaa;">&#9734;</td>
-                                                                                                % endfor
-                                                                                            </tr>
-                                                                                        </table>
-                                                                                    </td>
-                                                                                    % endif
-                                                                                </tr>
-                                                                            </table>
-                                                                        </td>
-                                                                    </tr>
-                                                                </table>
-                                                            </td>
-                                                        </tr>
-                                                    </table>
-                                                </td>
-                                                % if not movie_b:
-                                                <td align="center" valign="top" class="card-instance pad" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 0 !important;width: 251px !important;min-width: 251px !important;max-width: 251px !important;"></td>
-                                                % endif
-                                                % endif
-                                                % endfor
-                                            </tr>
-                                        </table>
-                                    </td>
-                                </tr>
-                                % endfor
-                            </table>
-                        </td>
-                    </tr>
-                    % endif
-                    % if recently_added.get('show'):
-                    <tr>
-                        <td class="wrapper" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;box-sizing: border-box;padding: 5px;overflow: auto;">
-                            <div class="sub-header-bar" style="margin-left: auto;margin-right: auto;font-size: 30px;text-align: center;width: 200px;border-top: 1px solid #E5A00D;margin-top: 15px;margin-bottom: 25px;"></div>
-                            <div class="sub-header-title" style="margin-left: auto;margin-right: auto;font-size: 30px;text-align: center;font-weight: lighter;">
-                                <img src="${(base_url_image + 'images/libraries/show.png') if base_url_image else 'https://tautulli.com/images/libraries/show.png'}" class="sub-header-icon" width="30" height="30" style="border: none;-ms-interpolation-mode: bicubic;max-width: 100%;height: 30px;width: 30px;vertical-align: middle;margin-right: 5px;margin-bottom: 5px;"> Recently Added TV Shows
-                            </div>
-                            <div class="sub-header-count" style="margin-left: auto;margin-right: auto;font-size: 30px;text-align: center;">
-                                <span class="count" style="color: #E5A00D;">${len(recently_added['show'])}</span> <span class="count-units" style="color: #aaaaaa;font-size: 20px;text-transform: uppercase;">show${'s' if len(recently_added['show']) > 1 else ''}</span>&nbsp;/&nbsp;
-                                <% total_episodes = sum(season['episode_count'] for show in recently_added['show'] for season in show['season']) %>
-                                <span class="count" style="color: #E5A00D;">${total_episodes}</span> <span class="count-units" style="color: #aaaaaa;font-size: 20px;text-transform: uppercase;">episode${'s' if total_episodes > 1 else ''}</span>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
-                            <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                % for show_a, show_b in grouper(recently_added['show'], 2):
-                                <tr>
-                                    <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
-                                        <table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                            <tr>
-                                                % for show in (show_a, show_b):
-                                                % if show:
-                                                % if not show_b:
-                                                <td align="center" valign="top" class="card-instance pad" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 0 !important;width: 251px !important;min-width: 251px !important;max-width: 251px !important;"></td>
-                                                % endif
-                                                <%
-                                                    if show['season_count'] == 1:
-                                                        if show['season'][0]['episode_count'] == 1:
-                                                            link_rating_key = show['season'][0]['episode'][0]['rating_key']
-                                                        else:
-                                                            link_rating_key = show['season'][0]['episode'][0]['parent_rating_key']
-                                                    else:
-                                                        link_rating_key = show['rating_key']
-                                                %>
-                                                <td align="center" valign="top" class="card-instance show" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 3px;width: 502px;min-width: 502px;max-width: 502px;height: 233px;">
-                                                    <table border="0" cellpadding="0" cellspacing="3" width="100%" class="card-background" style="background-image: url(${(base_url_image + show['art_hash']) if base_url_image else show['art_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #282828;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
-                                                        <tr>
-                                                            <td class="card-poster-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;width: 152px;min-width: 152px;height: 227px;">
-                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + show['thumb_hash']) if base_url_image else show['thumb_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #3F4245;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
-                                                                    <tr>
-                                                                        <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${link_rating_key}" title="${show['title']}" target="_blank" rel="noreferrer" style="text-decoration: underline;">
-                                                                                <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-poster.png' if base_url_image else 'https://tautulli.com/images/newsletter/view-on-plex-poster.png'}" width="150" height="225" style="border: none;-ms-interpolation-mode: bicubic;max-width: 100%;display: block;">
-                                                                            </a>
-                                                                        </td>
-                                                                    </tr>
-                                                                </table>
-                                                            </td>
-                                                            <td class="card-info-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;padding-left: 4px;text-align: left;height: 227px;">
-                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;height: 100%;">
-                                                                    <tr>
-                                                                        <td class="card-info-title nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.9rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;border-bottom: 1px solid rgba(255, 255, 255, .1);line-height: 1.2rem;padding: 5px;max-width: 320px;">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${link_rating_key}" title="${show['title']}" target="_blank" rel="noreferrer" style="text-decoration: none;color: #ffffff;">${show['title']}</a>
-                                                                        </td>
-                                                                    </tr>
-                                                                    <tr>
-                                                                        <td class="card-info-body" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.75rem;vertical-align: top;padding: 5px;height: 100%;">
-                                                                            <p class="nowrap mb5" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;margin-bottom: 5px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;max-width: 325px;color: #ffffff;">
-                                                                                % if show['season_count'] > 1:
-                                                                                    <em>${show['season_count']} seasons&nbsp;/&nbsp;</em>
-                                                                                % endif
-                                                                                <% total_show_episodes = sum(s['episode_count'] for s in show['season']) %>
-                                                                                <em>${total_show_episodes} episode${'s' if total_show_episodes > 1 else ''}</em>
-                                                                            </p>
-                                                                            <p class="nowrap mb5" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;margin-bottom: 5px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;max-width: 325px;color: #ffffff;">
-                                                                                % for i, season in enumerate(show['season'][:8]):
-                                                                                    % if season['episode_count'] == 1:
-                                                                                        ${season['title']} &middot; Episode ${season['episode'][0]['media_index']} - ${season['episode'][0]['title']}
-                                                                                    % else:
-                                                                                        ${season['title']} &middot; Episodes ${season['episode_range']}
-                                                                                    % endif
-                                                                                    % if i < min(show['season_count'], 7):
-                                                                                        <br>
-                                                                                    % elif i == 7 and show['season_count'] > 8:
-                                                                                        <% remaining_seasons = show['season_count'] - 8 %>
-                                                                                        ...plus ${remaining_seasons} more season${'s' if remaining_seasons > 1 else ''}!
-                                                                                    % endif
-                                                                                % endfor
-                                                                            </p>
-                                                                            <p style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;max-width: 325px;color: #ffffff;">
-                                                                                % if show['season_count'] == 1 and show['season'][0]['episode_count'] == 1:
-                                                                                ${show['season'][0]['episode'][0]['summary'][:350] + (show['season'][0]['episode'][0]['summary'][350:] and '...')}
-                                                                                % else:
-                                                                                <% length = max(0, 350 - 50 * (show['season_count'] - 1)) %>
-                                                                                    % if length:
-                                                                                    ${show['summary'][:length] + (show['summary'][length:] and '...')}
-                                                                                    % endif
-                                                                                % endif
-                                                                            </p>
-                                                                        </td>
-                                                                    </tr>
-                                                                    <tr>
-                                                                        <td class="card-info-footer nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.6rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;padding-top: 0px;padding-right: 5px;padding-bottom: 5px;padding-left: 5px;">
-                                                                            <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                                                                <tr>
-                                                                                    <td class="badge-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;max-width: 260px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                                                                                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                                                                            <tr>
-                                                                                                % if show['year']:
-                                                                                                <td class="badge" title="${show['year']}" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 11px;vertical-align: middle;display: inline-block;min-width: 10px;margin-right: 4px;padding: 3px 7px;line-height: 1;text-align: center;white-space: nowrap;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${show['year']}</td>
-                                                                                                % endif
-                                                                                                % if show['duration']:
-                                                                                                <% duration = int(int(show['duration'])/60000) %>
-                                                                                                <td class="badge" title="${duration} mins" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 11px;vertical-align: middle;display: inline-block;min-width: 10px;margin-right: 4px;padding: 3px 7px;line-height: 1;text-align: center;white-space: nowrap;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${duration} mins</td>
-                                                                                                % endif
-                                                                                                % if show['genres']:
-                                                                                                % for genre in show['genres'][:2]:
-                                                                                                <td class="badge" title="${genre}" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 11px;vertical-align: middle;display: inline-block;min-width: 10px;margin-right: 4px;padding: 3px 7px;line-height: 1;text-align: center;white-space: nowrap;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${genre}</td>
-                                                                                                % endfor
-                                                                                                % endif
-                                                                                            </tr>
-                                                                                        </table>
-                                                                                    </td>
-                                                                                    % if show['rating'] or show['audience_rating']:
-                                                                                    <% rating = int(round(float(show['rating'] or show['audience_rating']) / 2)) %>
-                                                                                    <td class="star-rating-container" title="${int(float(show['rating'] or show['audience_rating'])/0.1)}%" align="right" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;width: 65px;">
-                                                                                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                                                                            <tr>
-                                                                                                % for _ in range(rating):
-                                                                                                <td class="star-rating full" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.8rem;vertical-align: bottom;margin-left: 4px;line-height: 1rem;width: 0.5rem;display: inline-block;color: #E5A00D;">&#9733;</td>
-                                                                                                % endfor
-                                                                                                % for _ in range(5-rating):
-                                                                                                <td class="star-rating empty" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.8rem;vertical-align: bottom;margin-left: 4px;line-height: 1rem;width: 0.5rem;display: inline-block;color: #aaaaaa;">&#9734;</td>
-                                                                                                % endfor
-                                                                                            </tr>
-                                                                                        </table>
-                                                                                    </td>
-                                                                                    % endif
-                                                                                </tr>
-                                                                            </table>
-                                                                        </td>
-                                                                    </tr>
-                                                                </table>
-                                                            </td>
-                                                        </tr>
-                                                    </table>
-                                                </td>
-                                                % if not show_b:
-                                                <td align="center" valign="top" class="card-instance pad" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 0 !important;width: 251px !important;min-width: 251px !important;max-width: 251px !important;"></td>
-                                                % endif
-                                                % endif
-                                                % endfor
-                                            </tr>
-                                        </table>
-                                    </td>
-                                </tr>
-                                % endfor
-                            </table>
-                        </td>
-                    </tr>
-                    % endif
-                    % if recently_added.get('artist'):
-                    <tr>
-                        <td class="wrapper" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;box-sizing: border-box;padding: 5px;overflow: auto;">
-                            <div class="sub-header-bar" style="margin-left: auto;margin-right: auto;font-size: 30px;text-align: center;width: 200px;border-top: 1px solid #E5A00D;margin-top: 15px;margin-bottom: 25px;"></div>
-                            <div class="sub-header-title" style="margin-left: auto;margin-right: auto;font-size: 30px;text-align: center;font-weight: lighter;">
-                                <img src="${(base_url_image + 'images/libraries/artist.png') if base_url_image else 'https://tautulli.com/images/libraries/artist.png'}" class="sub-header-icon" width="30" height="30" style="border: none;-ms-interpolation-mode: bicubic;max-width: 100%;height: 30px;width: 30px;vertical-align: middle;margin-right: 5px;margin-bottom: 5px;"> Recently Added Music
-                            </div>
-                            <div class="sub-header-count" style="margin-left: auto;margin-right: auto;font-size: 30px;text-align: center;">
-                                <span class="count" style="color: #E5A00D;">${len(recently_added['artist'])}</span> <span class="count-units" style="color: #aaaaaa;font-size: 20px;text-transform: uppercase;">artist${'s' if len(recently_added['artist']) > 1 else ''}</span> /
-                                <% total_albums = sum(artist['album_count'] for artist in recently_added['artist']) %>
-                                <span class="count" style="color: #E5A00D;">${total_albums}</span> <span class="count-units" style="color: #aaaaaa;font-size: 20px;text-transform: uppercase;">album${'s' if total_albums > 1 else ''}</span>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
-                            <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                % for album_a, album_b in grouper([a for artist in recently_added['artist'] for a in artist['album']], 2):
-                                <tr>
-                                    <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
-                                        <table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                            <tr>
-                                                % for album in (album_a, album_b):
-                                                % if album:
-                                                % if not album_b:
-                                                <td align="center" valign="top" class="card-instance pad" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 0 !important;width: 251px !important;min-width: 251px !important;max-width: 251px !important;"></td>
-                                                % endif
-                                                <td align="center" valign="top" class="card-instance album" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 3px;width: 502px;min-width: 502px;max-width: 502px;height: 158px;">
-                                                    <table border="0" cellpadding="0" cellspacing="3" width="100%" class="card-background" style="background-image: url(${(base_url_image + album['art_hash']) if base_url_image else album['art_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #282828;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
-                                                        <tr>
-                                                            <td class="card-poster-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;width: 152px;min-width: 152px;height: 152px;">
-                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + album['thumb_hash']) if base_url_image else album['thumb_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #3F4245;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
-                                                                    <tr>
-                                                                        <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${album['rating_key']}" title="${album['title']}" target="_blank" rel="noreferrer" style="text-decoration: underline;">
-                                                                                <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-cover.png' if base_url_image else 'https://tautulli.com/images/newsletter/view-on-plex-cover.png'}" width="150" height="150" style="border: none;-ms-interpolation-mode: bicubic;max-width: 100%;display: block;">
-                                                                            </a>
-                                                                        </td>
-                                                                    </tr>
-                                                                </table>
-                                                            </td>
-                                                            <td class="card-info-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;padding-left: 4px;text-align: left;height: 152px;">
-                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;height: 100%;">
-                                                                    <tr>
-                                                                        <td class="card-info-title nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.9rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;border-bottom: 1px solid rgba(255, 255, 255, .1);line-height: 1.2rem;padding: 5px;max-width: 320px;">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${album['rating_key']}" title="${album['title']}" target="_blank" rel="noreferrer" style="text-decoration: none;color: #ffffff;">${album['title']}</a>
-                                                                        </td>
-                                                                    </tr>
-                                                                    <tr>
-                                                                        <td class="card-info-body" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.75rem;vertical-align: top;padding: 5px;height: 82px;min-height: 82px;">
-                                                                            <p class="nowrap mb5" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;margin-bottom: 5px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;max-width: 325px;color: #ffffff;">
-                                                                                <em>${album['parent_title']} &middot; ${album['track_count']} track${'s' if album['track_count'] > 1 else ''}</em>
-                                                                            </p>
-                                                                            % if album['parent_title'].lower() != 'various artists':
-                                                                            <p style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;max-width: 325px;color: #ffffff;">
-                                                                                ${album['summary'][:200] + (album['summary'][200:] and '...')}
-                                                                            </p>
-                                                                            % endif
-                                                                        </td>
-                                                                    </tr>
-                                                                    <tr>
-                                                                        <td class="card-info-footer nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.6rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;padding-top: 0px;padding-right: 5px;padding-bottom: 5px;padding-left: 5px;">
-                                                                            <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                                                                <tr>
-                                                                                    <td class="badge-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;max-width: 260px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                                                                                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                                                                            <tr>
-                                                                                                % if album['year']:
-                                                                                                <td class="badge" title="${album['year']}" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 11px;vertical-align: middle;display: inline-block;min-width: 10px;margin-right: 4px;padding: 3px 7px;line-height: 1;text-align: center;white-space: nowrap;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${album['year']}</td>
-                                                                                                % endif
-                                                                                                % if album['genres']:
-                                                                                                % for genre in album['genres'][:2]:
-                                                                                                <td class="badge" title="${genre}" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 11px;vertical-align: middle;display: inline-block;min-width: 10px;margin-right: 4px;padding: 3px 7px;line-height: 1;text-align: center;white-space: nowrap;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${genre}</td>
-                                                                                                % endfor
-                                                                                                % endif
-                                                                                            </tr>
-                                                                                        </table>
-                                                                                    </td>
-                                                                                    % if album['rating'] or album['audience_rating']:
-                                                                                    <% rating = int(round(float(album['rating'] or album['audience_rating']) / 2)) %>
-                                                                                    <td class="star-rating-container" title="${int(float(album['rating'] or album['audience_rating'])/0.1)}%" align="right" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;width: 65px;">
-                                                                                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                                                                            <tr>
-                                                                                                % for _ in range(rating):
-                                                                                                <td class="star-rating full" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.8rem;vertical-align: bottom;margin-left: 4px;line-height: 1rem;width: 0.5rem;display: inline-block;color: #E5A00D;">&#9733;</td>
-                                                                                                % endfor
-                                                                                                % for _ in range(5-rating):
-                                                                                                <td class="star-rating empty" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.8rem;vertical-align: bottom;margin-left: 4px;line-height: 1rem;width: 0.5rem;display: inline-block;color: #aaaaaa;">&#9734;</td>
-                                                                                                % endfor
-                                                                                            </tr>
-                                                                                        </table>
-                                                                                    </td>
-                                                                                    % endif
-                                                                                </tr>
-                                                                            </table>
-                                                                        </td>
-                                                                    </tr>
-                                                                </table>
-                                                            </td>
-                                                        </tr>
-                                                    </table>
-                                                </td>
-                                                % if not album_b:
-                                                <td align="center" valign="top" class="card-instance pad" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 0 !important;width: 251px !important;min-width: 251px !important;max-width: 251px !important;"></td>
-                                                % endif
-                                                % endif
-                                                % endfor
-                                            </tr>
-                                        </table>
-                                    </td>
-                                </tr>
-                                % endfor
-                            </table>
-                        </td>
-                    </tr>
-                    % endif
-                    % if recently_added.get('other_video'):
-                    <tr>
-                        <td class="wrapper" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;box-sizing: border-box;padding: 5px;overflow: auto;">
-                            <div class="sub-header-bar" style="margin-left: auto;margin-right: auto;font-size: 30px;text-align: center;width: 200px;border-top: 1px solid #E5A00D;margin-top: 15px;margin-bottom: 25px;"></div>
-                            <div class="sub-header-title" style="margin-left: auto;margin-right: auto;font-size: 30px;text-align: center;font-weight: lighter;">
-                                <img src="${(base_url_image + 'images/libraries/video.png') if base_url_image else 'https://tautulli.com/images/libraries/video.png'}" class="sub-header-icon" width="30" height="30" style="border: none;-ms-interpolation-mode: bicubic;max-width: 100%;height: 30px;width: 30px;vertical-align: middle;margin-right: 5px;margin-bottom: 5px;"> Recently Added Videos
-                            </div>
-                            <div class="sub-header-count" style="margin-left: auto;margin-right: auto;font-size: 30px;text-align: center;">
-                                <span class="count" style="color: #E5A00D;">${len(recently_added['other_video'])}</span> <span class="count-units" style="color: #aaaaaa;font-size: 20px;text-transform: uppercase;">video${'s' if len(recently_added['other_video']) > 1 else ''}</span>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
-                            <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                % for video_a, video_b in grouper(recently_added['other_video'], 2):
-                                <tr>
-                                    <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
-                                        <table border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                            <tr>
-                                                % for video in (video_a, video_b):
-                                                % if video:
-                                                % if not video_b:
-                                                <td align="center" valign="top" class="card-instance pad" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 0 !important;width: 251px !important;min-width: 251px !important;max-width: 251px !important;"></td>
-                                                % endif
-                                                <td align="center" valign="top" class="card-instance movie" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 3px;width: 502px;min-width: 502px;max-width: 502px;height: 233px;">
-                                                    <table border="0" cellpadding="0" cellspacing="3" width="100%" class="card-background" style="background-image: url(${(base_url_image + video['art_hash']) if base_url_image else video['art_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #282828;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
-                                                        <tr>
-                                                            <td class="card-poster-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;width: 152px;min-width: 152px;height: 227px;">
-                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + video['thumb_hash']) if base_url_image else video['thumb_url']});border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;background-color: #3F4245;background-position: center;background-size: cover;background-repeat: no-repeat;background-clip: padding-box;border: 1px solid rgba(255,255,255,.1);">
-                                                                    <tr>
-                                                                        <td style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${video['rating_key']}" title="${video['title']}" target="_blank" rel="noreferrer" style="text-decoration: underline;">
-                                                                                <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-poster.png' if base_url_image else 'https://tautulli.com/images/newsletter/view-on-plex-poster.png'}" width="150" height="225" style="border: none;-ms-interpolation-mode: bicubic;max-width: 100%;display: block;">
-                                                                            </a>
-                                                                        </td>
-                                                                    </tr>
-                                                                </table>
-                                                            </td>
-                                                            <td class="card-info-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;padding-left: 4px;text-align: left;height: 227px;">
-                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;height: 100%;">
-                                                                    <tr>
-                                                                        <td class="card-info-title nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.9rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;border-bottom: 1px solid rgba(255, 255, 255, .1);line-height: 1.2rem;padding: 5px;max-width: 320px;">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${video['rating_key']}" title="${video['title']}" target="_blank" rel="noreferrer" style="text-decoration: none;color: #ffffff;">${video['title']}</a>
-                                                                        </td>
-                                                                    </tr>
-                                                                    <tr>
-                                                                        <td class="card-info-body" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.75rem;vertical-align: top;padding: 5px;height: 100%;">
-                                                                            % if video['tagline']:
-                                                                            <p class="nowrap mb5" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;margin-bottom: 5px;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;max-width: 325px;color: #ffffff;">
-                                                                                <em>${video['tagline']}</em>
-                                                                            </p>
-                                                                            % endif
-                                                                            <p style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-weight: 400;margin: 0;max-width: 325px;color: #ffffff;">
-                                                                                ${video['summary'][:450] + (video['summary'][450:] and '...')}
-                                                                            </p>
-                                                                        </td>
-                                                                    </tr>
-                                                                    <tr>
-                                                                        <td class="card-info-footer nowrap" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.6rem;vertical-align: top;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;padding-top: 0px;padding-right: 5px;padding-bottom: 5px;padding-left: 5px;">
-                                                                            <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                                                                <tr>
-                                                                                    <td class="badge-container" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;max-width: 260px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                                                                                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                                                                            <tr>
-                                                                                                % if video['year']:
-                                                                                                <td class="badge" title="${video['year']}" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 11px;vertical-align: middle;display: inline-block;min-width: 10px;margin-right: 4px;padding: 3px 7px;line-height: 1;text-align: center;white-space: nowrap;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${video['year']}</td>
-                                                                                                % endif
-                                                                                                % if video['duration']:
-                                                                                                <% duration = int(int(video['duration'])/60000) %>
-                                                                                                <td class="badge" title="${duration} mins" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 11px;vertical-align: middle;display: inline-block;min-width: 10px;margin-right: 4px;padding: 3px 7px;line-height: 1;text-align: center;white-space: nowrap;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${duration} mins</td>
-                                                                                                % endif
-                                                                                                % if video['genres']:
-                                                                                                % for genre in video['genres'][:]:
-                                                                                                <td class="badge" title="${genre}" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 11px;vertical-align: middle;display: inline-block;min-width: 10px;margin-right: 4px;padding: 3px 7px;line-height: 1;text-align: center;white-space: nowrap;background-color: rgba(0, 0, 0, .25);border-radius: 2px;text-overflow: ellipsis;overflow: hidden;color: #ffffff;">${genre}</td>
-                                                                                                % endfor
-                                                                                                % endif
-                                                                                            </tr>
-                                                                                        </table>
-                                                                                    </td>
-                                                                                    % if video['rating'] or video['audience_rating']:
-                                                                                    <% rating = int(round(float(video['rating'] or video['audience_rating']) / 2)) %>
-                                                                                    <td class="star-rating-container" title="${int(float(video['rating'] or video['audience_rating'])/0.1)}%" align="right" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 14px;vertical-align: top;width: 65px;">
-                                                                                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate;mso-table-lspace: 0pt;mso-table-rspace: 0pt;width: 100%;">
-                                                                                            <tr>
-                                                                                                % for _ in range(rating):
-                                                                                                <td class="star-rating full" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.8rem;vertical-align: bottom;margin-left: 4px;line-height: 1rem;width: 0.5rem;display: inline-block;color: #E5A00D;">&#9733;</td>
-                                                                                                % endfor
-                                                                                                % for _ in range(5-rating):
-                                                                                                <td class="star-rating empty" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 0.8rem;vertical-align: bottom;margin-left: 4px;line-height: 1rem;width: 0.5rem;display: inline-block;color: #aaaaaa;">&#9734;</td>
-                                                                                                % endfor
-                                                                                            </tr>
-                                                                                        </table>
-                                                                                    </td>
-                                                                                    % endif
-                                                                                </tr>
-                                                                            </table>
-                                                                        </td>
-                                                                    </tr>
-                                                                </table>
-                                                            </td>
-                                                        </tr>
-                                                    </table>
-                                                </td>
-                                                % if not video_b:
-                                                <td align="center" valign="top" class="card-instance pad" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;overflow: hidden;padding: 0 !important;width: 251px !important;min-width: 251px !important;max-width: 251px !important;"></td>
-                                                % endif
-                                                % endif
-                                                % endfor
-                                            </tr>
-                                        </table>
-                                    </td>
-                                </tr>
-                                % endfor
-                            </table>
-                        </td>
-                    </tr>
-                    % endif
-                    <tr>
-                        <td class="footer" style="font-family: 'Open Sans', Helvetica, Arial, sans-serif;font-size: 12px;vertical-align: top;clear: both;margin-top: 10px;text-align: center;width: 100%;">
-                            <div class="footer-bar" style="margin-left: auto;margin-right: auto;width: 200px;border-top: 1px solid #E5A00D;margin-top: 25px;"></div>
-                            <div class="content-block powered-by" style="padding-bottom: 10px;padding-top: 10px;">
-                                <!-- FOOTER MESSAGE - DO NOT REMOVE -->
-                            </div>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </td>
-    </tr>
-</table>
-</body>
-</html>
-% endif
diff --git a/data/interfaces/newsletters/recently_added.internal.html b/data/interfaces/newsletters/recently_added.internal.html
deleted file mode 100644
index edf7edc6..00000000
--- a/data/interfaces/newsletters/recently_added.internal.html
+++ /dev/null
@@ -1,1091 +0,0 @@
-% if data:
-<%
-    import plexpy
-    from plexpy.helpers import grouper, get_img_service
-
-    recently_added = data['recently_added']
-    if plexpy.CONFIG.NEWSLETTER_SELF_HOSTED and plexpy.CONFIG.HTTP_BASE_URL:
-        base_url = plexpy.CONFIG.HTTP_BASE_URL + plexpy.HTTP_ROOT + 'newsletter/'
-    elif preview:
-        base_url = 'newsletter/'
-    else:
-        base_url = ''
-
-    service = get_img_service(include_self=True)
-    if service == 'self-hosted' and plexpy.CONFIG.HTTP_BASE_URL:
-        base_url_image = plexpy.CONFIG.HTTP_BASE_URL + plexpy.HTTP_ROOT + 'image/'
-    elif preview and service and service != 'self-hosted':
-        base_url_image = 'image/'
-    else:
-        base_url_image = ''
-
-%>
-<!doctype html>
-<html>
-<head>
-    <meta name="viewport" content="width=device-width"/>
-    <meta name="color-scheme" content="light dark">
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>Tautulli Newsletter - ${subject}</title>
-    <link rel="shortcut icon" href="${base_url_image + 'images/favicon/favicon.ico' if base_url_image else 'https://tautulli.com/images/favicon.ico'}">
-    <style>
-        /* -------------------------------------
-            GLOBAL RESETS
-        ------------------------------------- */
-        img {
-            border: none;
-            -ms-interpolation-mode: bicubic;
-            max-width: 100%;
-        }
-
-        body {
-            font-family: 'Open Sans', Helvetica, Arial, sans-serif;
-            -webkit-font-smoothing: antialiased;
-            font-size: 14px;
-            line-height: 1.4;
-            margin: 0;
-            padding: 0;
-            -ms-text-size-adjust: 100%;
-            -webkit-text-size-adjust: 100%;
-        }
-
-        table {
-            border-collapse: separate;
-            mso-table-lspace: 0pt;
-            mso-table-rspace: 0pt;
-            width: 100%;
-        }
-
-        table td {
-            font-family: 'Open Sans', Helvetica, Arial, sans-serif;
-            font-size: 14px;
-            vertical-align: top;
-        }
-
-        /* -------------------------------------
-            BODY & CONTAINER
-        ------------------------------------- */
-
-        .body {
-            width: 100%;
-        }
-
-        .container {
-            display: block;
-            margin: 0 auto !important;
-            max-width: 1042px;
-            padding: 10px;
-            width: 1042px;
-        }
-
-        .content {
-            box-sizing: border-box;
-            display: block;
-            margin: 0 auto;
-            max-width: 1037px;
-            padding: 10px;
-        }
-
-        /* -------------------------------------
-            HEADER, FOOTER, MAIN
-        ------------------------------------- */
-        .local-preview-note {
-            text-align: center;
-            padding-top: 10px;
-        }
-        .local-preview-note p {
-            color: #282A2D;
-            font-size: 12px;
-        }
-        .main {
-            background: #282A2D;
-            border-radius: 3px;
-            width: 100%;
-            color: #ffffff;
-        }
-
-        .wrapper {
-            box-sizing: border-box;
-            padding: 5px;
-            overflow: auto;
-        }
-
-        .content-block {
-            padding-bottom: 10px;
-            padding-top: 10px;
-        }
-
-        .footer {
-            clear: both;
-            margin-top: 10px;
-            text-align: center;
-            width: 100%;
-            font-size: 12px;
-        }
-        .footer-bar {
-            margin-left: auto;
-            margin-right: auto;
-            width: 200px;
-            border-top: 1px solid #E5A00D;
-            margin-top: 25px;
-        }
-
-        .footer td,
-        .footer p,
-        .footer span,
-        .footer a {
-            color: #fff;
-            font-size: 12px;
-            text-align: center;
-        }
-
-        /* -------------------------------------
-            TYPOGRAPHY
-        ------------------------------------- */
-        h1,
-        h2,
-        h3,
-        h4 {
-            color: #ffffff;
-            font-family: 'Open Sans', Helvetica, Arial, sans-serif;
-            font-weight: 400;
-            margin: 0;
-        }
-
-        p,
-        ul,
-        ol {
-            font-family: 'Open Sans', Helvetica, Arial, sans-serif;
-            font-weight: 400;
-            margin: 0;
-        }
-
-        p li,
-        ul li,
-        ol li {
-            list-style-position: inside;
-            margin-left: 5px;
-        }
-
-        a {
-            text-decoration: underline;
-        }
-
-        /* -------------------------------------
-            OTHER STYLES THAT MIGHT BE USEFUL
-        ------------------------------------- */
-        .mb5 {
-            margin-bottom: 5px;
-        }
-
-        .nowrap {
-            white-space: nowrap;
-            text-overflow: ellipsis;
-            overflow: hidden;
-        }
-
-        .preheader {
-            color: transparent;
-            display: none;
-            height: 0;
-            max-height: 0;
-            max-width: 0;
-            opacity: 0;
-            overflow: hidden;
-            mso-hide: all;
-            visibility: hidden;
-            width: 0;
-        }
-        .view-full {
-            clear: both;
-            color: #282A2D;
-            font-size: 12px;
-            margin-bottom: 10px;
-            text-align: center;
-            width: 100%;
-        }
-        .view-full a {
-            color: #282A2D;
-        }
-
-        .powered-by a {
-            text-decoration: underline;
-        }
-
-        /* -------------------------------------
-            HEADER
-        ------------------------------------- */
-        .header {
-            width: 100%;
-            height: 90px;
-            text-align: center;
-        }
-        .header-img {
-            width: 492px;
-            height: 90px;
-            margin-left: -35px;
-        }
-        .server-name {
-            font-size: 30px;
-            text-align: center;
-        }
-        .dates {
-            color: #aaaaaa;
-            font-size: 20px;
-            text-align: center;
-        }
-        .body-message {
-            font-size: 20px;
-            text-align: center;
-            width: 80%;
-            margin-left: auto;
-            margin-right: auto;
-        }
-
-        /* -------------------------------------
-            MEDIA SECTIONS
-        ------------------------------------- */
-        h2 {
-            font-size: 30px;
-            font-weight: 300;
-            margin: 20px 10px 0 10px;
-            text-align: center;
-        }
-
-        h3 {
-            font-size: 25px;
-            font-weight: 300;
-            margin: 0 0 10px 0;
-        }
-
-        .sub-header-icon {
-            height: 30px;
-            width: 30px;
-            vertical-align: middle;
-            margin-right: 5px;
-            margin-bottom: 5px;
-        }
-        .sub-header-bar {
-            margin-left: auto;
-            margin-right: auto;
-            font-size: 30px;
-            text-align: center;
-            width: 200px;
-            border-top: 1px solid #E5A00D;
-            margin-top: 15px;
-            margin-bottom: 25px;
-        }
-        .sub-header-title {
-            margin-left: auto;
-            margin-right: auto;
-            font-size: 30px;
-            text-align: center;
-            font-weight: lighter;
-        }
-        .sub-header-count {
-            margin-left: auto;
-            margin-right: auto;
-            font-size: 30px;
-            text-align: center;
-        }
-        .sub-header-count .count {
-            color: #E5A00D;
-        }
-        .sub-header-count .count-units {
-            color: #aaaaaa;
-            font-size: 20px;
-            text-transform: uppercase;
-        }
-
-        /* -------------------------------------
-            MEDIA CARDS
-        ------------------------------------- */
-        .card-instance {
-            font-size: 12px;
-            overflow: hidden;
-            padding: 3px;
-            width: 502px;
-            min-width: 502px;
-            max-width: 502px;
-        }
-        .card-instance.pad {
-            padding: 0 !important;
-            width: 251px !important;
-            min-width: 251px !important;
-            max-width: 251px !important;
-        }
-        .card-instance.movie,
-        .card-instance.show {
-            height: 233px;
-        }
-        .card-instance.album {
-            height: 158px;
-        }
-        .card-background {
-            background-color: #282828;
-            background-position: center;
-            background-size: cover;
-            background-repeat: no-repeat;
-            background-clip: padding-box;
-            border: 1px solid rgba(255,255,255,.1);
-        }
-        .card-poster-container {
-            width: 152px;
-            min-width: 152px;
-        }
-        .card-instance.movie .card-poster-container,
-        .card-instance.show .card-poster-container{
-            height: 227px;
-        }
-        .card-instance.album .card-poster-container {
-            height: 152px;
-        }
-        .card-poster {
-            background-color: #3F4245;
-            background-position: center;
-            background-size: cover;
-            background-repeat: no-repeat;
-            background-clip: padding-box;
-            border: 1px solid rgba(255,255,255,.1);
-        }
-        .card-poster-overlay {
-            display: block;
-        }
-        .card-info-container {
-            padding-left: 4px;
-            text-align: left;
-        }
-        .card-instance.movie .card-info-container,
-        .card-instance.show .card-info-container{
-            height: 227px;
-        }
-        .card-instance.album .card-info-container {
-            height: 152px;
-        }
-        .card-info-container .card-info-container-table {
-            height: 100%;
-        }
-        .card-info-title {
-            border-bottom: 1px solid rgba(255, 255, 255, .1);
-            line-height: 1.2rem;
-            font-size: 0.9rem;
-            padding: 5px;
-            max-width: 320px;
-        }
-        .card-info-title a {
-            text-decoration: none;
-            color: #ffffff;
-        }
-        .card-info-body {
-            font-size: 0.75rem;
-            padding: 5px;
-            height: 100%;
-        }
-        .card-info-body > p {
-            max-width: 325px;
-            color: #ffffff;
-        }
-        .card-instance.movie .card-info-body,
-        .card-instance.show .card-info-body {
-        }
-        .card-instance.album .card-info-body {
-            height: 82px;
-            min-height: 82px;
-        }
-        .card-info-footer {
-            font-size: 0.6rem;
-            padding-top: 0px;
-            padding-right: 5px;
-            padding-bottom: 5px;
-            padding-left: 5px;
-        }
-        .card-info-footer .badge-container {
-            max-width: 260px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
-        .card-info-footer .star-rating-container {
-            width: 65px;
-        }
-        .card-info-footer .star-rating {
-            margin-left: 4px;
-            font-size: 0.8rem;
-            line-height: 1rem;
-            width: 0.5rem;
-            display: inline-block;
-            vertical-align: bottom;
-        }
-        .star-rating.full {
-            color: #E5A00D;
-        }
-        .star-rating.empty {
-            color: #aaaaaa;
-        }
-        .badge {
-            display: inline-block;
-            min-width: 10px;
-            margin-right: 4px;
-            padding: 3px 7px;
-            font-size: 11px;
-            line-height: 1;
-            text-align: center;
-            white-space: nowrap;
-            vertical-align: middle;
-            background-color: rgba(0, 0, 0, .25);
-            border-radius: 2px;
-            text-overflow: ellipsis;
-            overflow: hidden;
-            color: #ffffff;
-        }
-
-        /* -------------------------------------
-            RESPONSIVE AND MOBILE FRIENDLY STYLES
-        ------------------------------------- */
-        @media only screen and (max-width: 1040px) {
-            .card-instance {
-                display: block !important;
-                margin-top: 0 !important;
-                margin-right: auto !important;
-                margin-bottom: 0 !important;
-                margin-left: auto !important;
-            }
-
-            table[class=body] .header {
-                height: 75px !important;
-            }
-            table[class=body] .header-img {
-                width: 410px;
-                height: 75px;
-                margin-left: -30px;
-            }
-
-            table[class=body] h1 {
-                font-size: 28px !important;
-                margin-bottom: 10px !important;
-            }
-
-            table[class=body] .server-name {
-                font-size: 20px !important;
-            }
-            table[class=body] .dates,
-            table[class=body] .body-message {
-                font-size: 14px !important;
-            }
-            table[class=body] .sub-header > div {
-                font-size: 20px !important;
-            }
-            table[class=body] .sub-header-title {
-                font-size: 20px !important;
-            }
-            table[class=body] .sub-header-icon {
-                height: 20px !important;
-                width: 20px !important;
-            }
-            table[class=body] .count {
-                font-size: 20px !important;
-            }
-            table[class=body] .count-units {
-                font-size: 14px !important;
-            }
-
-            table[class=body] .content {
-                padding: 0 !important;
-            }
-
-            table[class=body] .container {
-                padding: 0 !important;
-                width: 100% !important;
-            }
-
-            table[class=body] .main {
-                border-left-width: 0 !important;
-                border-radius: 0 !important;
-                border-right-width: 0 !important;
-            }
-        }
-
-        /* -------------------------------------
-            PRESERVE THESE STYLES IN THE HEAD
-        ------------------------------------- */
-        @media all {
-            .ExternalClass {
-                width: 100%;
-            }
-
-            .ExternalClass,
-            .ExternalClass p,
-            .ExternalClass span,
-            .ExternalClass font,
-            .ExternalClass td,
-            .ExternalClass div {
-                line-height: 100%;
-            }
-
-            a[x-apple-data-detectors] {
-                color: inherit !important;
-                font-family: inherit !important;
-                font-size: inherit !important;
-                font-weight: inherit !important;
-                line-height: inherit !important;
-                text-decoration: none !important;
-            }
-        }
-
-    </style>
-</head>
-<body>
-% if preview and service and service != 'self-hosted':
-<div class="local-preview-note"><p>Note: Local preview images only - images will be uploaded to ${service.capitalize()} when the newsletter is sent.</p></div>  <!-- IGNORE SAVE -->
-% elif preview and not service:
-<div class="local-preview-note"><p>Warning: The Image Hosting setting must be enabled for images to display on the newsletter.</p></div>  <!-- IGNORE SAVE -->
-% endif
-<table border="0" cellpadding="0" cellspacing="0" class="body">
-    <tr>
-        <td class="container">
-            <div class="content">
-                <span class="preheader">Tautulli Newsletter  - ${subject}</span>
-                % if base_url and not preview:
-                <div class="view-full">  <!-- IGNORE SAVE -->
-                    <a href="${base_url + uuid}" title="View full newsletter" target="_blank" rel="noreferrer">Click here to view the full newsletter.</a>  <!-- IGNORE SAVE -->
-                </div>  <!-- IGNORE SAVE -->
-                % endif
-                <table border="0" cellpadding="3" cellspacing="0" class="main">
-                    <tr>
-                        <td class="wrapper">
-                            <div class="header">
-                                <img src="${base_url_image + 'images/newsletter/newsletter-header.png' if base_url_image else 'https://tautulli.com/images/newsletter/newsletter-header.png'}" class="header-img" width="492" height="90"/>
-                            </div>
-                            <div class="server-name">${parameters['server_name']}</div>
-                            <div class="dates">${parameters['start_date']} - ${parameters['end_date']}</div>
-                        </td>
-                    </tr>
-                    % if message:
-                    <tr>
-                        <td class="wrapper">
-                            <div class="sub-header-bar"></div>
-                            <div class="body-message">${'<br>'.join(l for l in message.splitlines()) | n}</div>
-                        </td>
-                    </tr>
-                    % endif
-                    % if recently_added.get('movie'):
-                    <tr>
-                        <td class="wrapper">
-                            <div class="sub-header-bar"></div>
-                            <div class="sub-header-title">
-                                <img src="${(base_url_image + 'images/libraries/movie.png') if base_url_image else 'https://tautulli.com/images/libraries/movie.png'}" class="sub-header-icon" width="30" height="30"/> Recently Added Movies
-                            </div>
-                            <div class="sub-header-count">
-                                <span class="count">${len(recently_added['movie'])}</span> <span class="count-units">movie${'s' if len(recently_added['movie']) > 1 else ''}</span>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <table border="0" cellpadding="0" cellspacing="0">
-                                % for movie_a, movie_b in grouper(recently_added['movie'], 2):
-                                <tr>
-                                    <td>
-                                        <table border="0" cellpadding="0" cellspacing="0" width="100%">
-                                            <tr>
-                                                % for movie in (movie_a, movie_b):
-                                                % if movie:
-                                                % if not movie_b:
-                                                <td align="center" valign="top" class="card-instance pad"></td>
-                                                % endif
-                                                <td align="center" valign="top" class="card-instance movie">
-                                                    <table border="0" cellpadding="0" cellspacing="3" width="100%" class="card-background" style="background-image: url(${(base_url_image + movie['art_hash']) if base_url_image else movie['art_url']});">
-                                                        <tr>
-                                                            <td class="card-poster-container">
-                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + movie['thumb_hash']) if base_url_image else movie['thumb_url']})">
-                                                                    <tr>
-                                                                        <td>
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${movie['rating_key']}" title="${movie['title']}" target="_blank" rel="noreferrer">
-                                                                                <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-poster.png' if base_url_image else 'https://tautulli.com/images/newsletter/view-on-plex-poster.png'}" width="150" height="225">
-                                                                            </a>
-                                                                        </td>
-                                                                    </tr>
-                                                                </table>
-                                                            </td>
-                                                            <td class="card-info-container">
-                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table">
-                                                                    <tr>
-                                                                        <td class="card-info-title nowrap">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${movie['rating_key']}" title="${movie['title']}" target="_blank" rel="noreferrer">${movie['title']}</a>
-                                                                        </td>
-                                                                    </tr>
-                                                                    <tr>
-                                                                        <td class="card-info-body">
-                                                                            % if movie['tagline']:
-                                                                            <p class="nowrap mb5">
-                                                                                <em>${movie['tagline']}</em>
-                                                                            </p>
-                                                                            % endif
-                                                                            <p>
-                                                                                ${movie['summary'][:450] + (movie['summary'][450:] and '...')}
-                                                                            </p>
-                                                                        </td>
-                                                                    </tr>
-                                                                    <tr>
-                                                                        <td class="card-info-footer nowrap">
-                                                                            <table border="0" cellpadding="0" cellspacing="0">
-                                                                                <tr>
-                                                                                    <td class="badge-container">
-                                                                                        <table border="0" cellpadding="0" cellspacing="0">
-                                                                                            <tr>
-                                                                                                % if movie['year']:
-                                                                                                <td class="badge" title="${movie['year']}">${movie['year']}</td>
-                                                                                                % endif
-                                                                                                % if movie['duration']:
-                                                                                                <% duration = int(int(movie['duration'])/60000) %>
-                                                                                                <td class="badge" title="${duration} mins">${duration} mins</td>
-                                                                                                % endif
-                                                                                                % if movie['genres']:
-                                                                                                % for genre in movie['genres'][:]:
-                                                                                                <td class="badge" title="${genre}">${genre}</td>
-                                                                                                % endfor
-                                                                                                % endif
-                                                                                            </tr>
-                                                                                        </table>
-                                                                                    </td>
-                                                                                    % if movie['rating'] or movie['audience_rating']:
-                                                                                    <% rating = int(round(float(movie['rating'] or movie['audience_rating']) / 2)) %>
-                                                                                    <td class="star-rating-container" title="${int(float(movie['rating'] or movie['audience_rating'])/0.1)}%" align="right">
-                                                                                        <table border="0" cellpadding="0" cellspacing="0">
-                                                                                            <tr>
-                                                                                                % for _ in range(rating):
-                                                                                                <td class="star-rating full">&#9733;</td>
-                                                                                                % endfor
-                                                                                                % for _ in range(5-rating):
-                                                                                                <td class="star-rating empty">&#9734;</td>
-                                                                                                % endfor
-                                                                                            </tr>
-                                                                                        </table>
-                                                                                    </td>
-                                                                                    % endif
-                                                                                </tr>
-                                                                            </table>
-                                                                        </td>
-                                                                    </tr>
-                                                                </table>
-                                                            </td>
-                                                        </tr>
-                                                    </table>
-                                                </td>
-                                                % if not movie_b:
-                                                <td align="center" valign="top" class="card-instance pad"></td>
-                                                % endif
-                                                % endif
-                                                % endfor
-                                            </tr>
-                                        </table>
-                                    </td>
-                                </tr>
-                                % endfor
-                            </table>
-                        </td>
-                    </tr>
-                    % endif
-                    % if recently_added.get('show'):
-                    <tr>
-                        <td class="wrapper">
-                            <div class="sub-header-bar"></div>
-                            <div class="sub-header-title">
-                                <img src="${(base_url_image + 'images/libraries/show.png') if base_url_image else 'https://tautulli.com/images/libraries/show.png'}" class="sub-header-icon" width="30" height="30"/> Recently Added TV Shows
-                            </div>
-                            <div class="sub-header-count">
-                                <span class="count">${len(recently_added['show'])}</span> <span class="count-units">show${'s' if len(recently_added['show']) > 1 else ''}</span>&nbsp;/&nbsp;
-                                <% total_episodes = sum(season['episode_count'] for show in recently_added['show'] for season in show['season']) %>
-                                <span class="count">${total_episodes}</span> <span class="count-units">episode${'s' if total_episodes > 1 else ''}</span>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <table border="0" cellpadding="0" cellspacing="0">
-                                % for show_a, show_b in grouper(recently_added['show'], 2):
-                                <tr>
-                                    <td>
-                                        <table border="0" cellpadding="0" cellspacing="0" width="100%">
-                                            <tr>
-                                                % for show in (show_a, show_b):
-                                                % if show:
-                                                % if not show_b:
-                                                <td align="center" valign="top" class="card-instance pad"></td>
-                                                % endif
-                                                <%
-                                                    if show['season_count'] == 1:
-                                                        if show['season'][0]['episode_count'] == 1:
-                                                            link_rating_key = show['season'][0]['episode'][0]['rating_key']
-                                                        else:
-                                                            link_rating_key = show['season'][0]['episode'][0]['parent_rating_key']
-                                                    else:
-                                                        link_rating_key = show['rating_key']
-                                                %>
-                                                <td align="center" valign="top" class="card-instance show">
-                                                    <table border="0" cellpadding="0" cellspacing="3" width="100%" class="card-background" style="background-image: url(${(base_url_image + show['art_hash']) if base_url_image else show['art_url']});">
-                                                        <tr>
-                                                            <td class="card-poster-container">
-                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + show['thumb_hash']) if base_url_image else show['thumb_url']})">
-                                                                    <tr>
-                                                                        <td>
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${link_rating_key}" title="${show['title']}" target="_blank" rel="noreferrer">
-                                                                                <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-poster.png' if base_url_image else 'https://tautulli.com/images/newsletter/view-on-plex-poster.png'}" width="150" height="225">
-                                                                            </a>
-                                                                        </td>
-                                                                    </tr>
-                                                                </table>
-                                                            </td>
-                                                            <td class="card-info-container">
-                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table">
-                                                                    <tr>
-                                                                        <td class="card-info-title nowrap">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${link_rating_key}" title="${show['title']}" target="_blank" rel="noreferrer">${show['title']}</a>
-                                                                        </td>
-                                                                    </tr>
-                                                                    <tr>
-                                                                        <td class="card-info-body">
-                                                                            <p class="nowrap mb5">
-                                                                                % if show['season_count'] > 1:
-                                                                                    <em>${show['season_count']} seasons&nbsp;/&nbsp;</em>
-                                                                                % endif
-                                                                                <% total_show_episodes = sum(s['episode_count'] for s in show['season']) %>
-                                                                                <em>${total_show_episodes} episode${'s' if total_show_episodes > 1 else ''}</em>
-                                                                            </p>
-                                                                            <p class="nowrap mb5">
-                                                                                % for i, season in enumerate(show['season'][:8]):
-                                                                                    % if season['episode_count'] == 1:
-                                                                                        ${season['title']} &middot; Episode ${season['episode'][0]['media_index']} - ${season['episode'][0]['title']}
-                                                                                    % else:
-                                                                                        ${season['title']} &middot; Episodes ${season['episode_range']}
-                                                                                    % endif
-                                                                                    % if i < min(show['season_count'], 7):
-                                                                                        <br>
-                                                                                    % elif i == 7 and show['season_count'] > 8:
-                                                                                        <% remaining_seasons = show['season_count'] - 8 %>
-                                                                                        ...plus ${remaining_seasons} more season${'s' if remaining_seasons > 1 else ''}!
-                                                                                    % endif
-                                                                                % endfor
-                                                                            </p>
-                                                                            <p>
-                                                                                % if show['season_count'] == 1 and show['season'][0]['episode_count'] == 1:
-                                                                                ${show['season'][0]['episode'][0]['summary'][:350] + (show['season'][0]['episode'][0]['summary'][350:] and '...')}
-                                                                                % else:
-                                                                                <% length = max(0, 350 - 50 * (show['season_count'] - 1)) %>
-                                                                                    % if length:
-                                                                                    ${show['summary'][:length] + (show['summary'][length:] and '...')}
-                                                                                    % endif
-                                                                                % endif
-                                                                            </p>
-                                                                        </td>
-                                                                    </tr>
-                                                                    <tr>
-                                                                        <td class="card-info-footer nowrap">
-                                                                            <table border="0" cellpadding="0" cellspacing="0">
-                                                                                <tr>
-                                                                                    <td class="badge-container">
-                                                                                        <table border="0" cellpadding="0" cellspacing="0">
-                                                                                            <tr>
-                                                                                                % if show['year']:
-                                                                                                <td class="badge" title="${show['year']}">${show['year']}</td>
-                                                                                                % endif
-                                                                                                % if show['duration']:
-                                                                                                <% duration = int(int(show['duration'])/60000) %>
-                                                                                                <td class="badge" title="${duration} mins">${duration} mins</td>
-                                                                                                % endif
-                                                                                                % if show['genres']:
-                                                                                                % for genre in show['genres'][:2]:
-                                                                                                <td class="badge" title="${genre}">${genre}</td>
-                                                                                                % endfor
-                                                                                                % endif
-                                                                                            </tr>
-                                                                                        </table>
-                                                                                    </td>
-                                                                                    % if show['rating'] or show['audience_rating']:
-                                                                                    <% rating = int(round(float(show['rating'] or show['audience_rating']) / 2)) %>
-                                                                                    <td class="star-rating-container" title="${int(float(show['rating'] or show['audience_rating'])/0.1)}%" align="right">
-                                                                                        <table border="0" cellpadding="0" cellspacing="0">
-                                                                                            <tr>
-                                                                                                % for _ in range(rating):
-                                                                                                <td class="star-rating full">&#9733;</td>
-                                                                                                % endfor
-                                                                                                % for _ in range(5-rating):
-                                                                                                <td class="star-rating empty">&#9734;</td>
-                                                                                                % endfor
-                                                                                            </tr>
-                                                                                        </table>
-                                                                                    </td>
-                                                                                    % endif
-                                                                                </tr>
-                                                                            </table>
-                                                                        </td>
-                                                                    </tr>
-                                                                </table>
-                                                            </td>
-                                                        </tr>
-                                                    </table>
-                                                </td>
-                                                % if not show_b:
-                                                <td align="center" valign="top" class="card-instance pad"></td>
-                                                % endif
-                                                % endif
-                                                % endfor
-                                            </tr>
-                                        </table>
-                                    </td>
-                                </tr>
-                                % endfor
-                            </table>
-                        </td>
-                    </tr>
-                    % endif
-                    % if recently_added.get('artist'):
-                    <tr>
-                        <td class="wrapper">
-                            <div class="sub-header-bar"></div>
-                            <div class="sub-header-title">
-                                <img src="${(base_url_image + 'images/libraries/artist.png') if base_url_image else 'https://tautulli.com/images/libraries/artist.png'}" class="sub-header-icon" width="30" height="30"/> Recently Added Music
-                            </div>
-                            <div class="sub-header-count">
-                                <span class="count">${len(recently_added['artist'])}</span> <span class="count-units">artist${'s' if len(recently_added['artist']) > 1 else ''}</span> /
-                                <% total_albums = sum(artist['album_count'] for artist in recently_added['artist']) %>
-                                <span class="count">${total_albums}</span> <span class="count-units">album${'s' if total_albums > 1 else ''}</span>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <table border="0" cellpadding="0" cellspacing="0">
-                                % for album_a, album_b in grouper([a for artist in recently_added['artist'] for a in artist['album']], 2):
-                                <tr>
-                                    <td>
-                                        <table border="0" cellpadding="0" cellspacing="0" width="100%">
-                                            <tr>
-                                                % for album in (album_a, album_b):
-                                                % if album:
-                                                % if not album_b:
-                                                <td align="center" valign="top" class="card-instance pad"></td>
-                                                % endif
-                                                <td align="center" valign="top" class="card-instance album">
-                                                    <table border="0" cellpadding="0" cellspacing="3" width="100%" class="card-background" style="background-image: url(${(base_url_image + album['art_hash']) if base_url_image else album['art_url']});">
-                                                        <tr>
-                                                            <td class="card-poster-container">
-                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + album['thumb_hash']) if base_url_image else album['thumb_url']})">
-                                                                    <tr>
-                                                                        <td>
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${album['rating_key']}" title="${album['title']}" target="_blank" rel="noreferrer">
-                                                                                <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-cover.png' if base_url_image else 'https://tautulli.com/images/newsletter/view-on-plex-cover.png'}" width="150" height="150">
-                                                                            </a>
-                                                                        </td>
-                                                                    </tr>
-                                                                </table>
-                                                            </td>
-                                                            <td class="card-info-container">
-                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table">
-                                                                    <tr>
-                                                                        <td class="card-info-title nowrap">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${album['rating_key']}" title="${album['title']}" target="_blank" rel="noreferrer">${album['title']}</a>
-                                                                        </td>
-                                                                    </tr>
-                                                                    <tr>
-                                                                        <td class="card-info-body">
-                                                                            <p class="nowrap mb5">
-                                                                                <em>${album['parent_title']} &middot; ${album['track_count']} track${'s' if album['track_count'] > 1 else ''}</em>
-                                                                            </p>
-                                                                            % if album['parent_title'].lower() != 'various artists':
-                                                                            <p>
-                                                                                ${album['summary'][:200] + (album['summary'][200:] and '...')}
-                                                                            </p>
-                                                                            % endif
-                                                                        </td>
-                                                                    </tr>
-                                                                    <tr>
-                                                                        <td class="card-info-footer nowrap">
-                                                                            <table border="0" cellpadding="0" cellspacing="0">
-                                                                                <tr>
-                                                                                    <td class="badge-container">
-                                                                                        <table border="0" cellpadding="0" cellspacing="0">
-                                                                                            <tr>
-                                                                                                % if album['year']:
-                                                                                                <td class="badge" title="${album['year']}">${album['year']}</td>
-                                                                                                % endif
-                                                                                                % if album['genres']:
-                                                                                                % for genre in album['genres'][:2]:
-                                                                                                <td class="badge" title="${genre}">${genre}</td>
-                                                                                                % endfor
-                                                                                                % endif
-                                                                                            </tr>
-                                                                                        </table>
-                                                                                    </td>
-                                                                                    % if album['rating'] or album['audience_rating']:
-                                                                                    <% rating = int(round(float(album['rating'] or album['audience_rating']) / 2)) %>
-                                                                                    <td class="star-rating-container" title="${int(float(album['rating'] or album['audience_rating'])/0.1)}%" align="right">
-                                                                                        <table border="0" cellpadding="0" cellspacing="0">
-                                                                                            <tr>
-                                                                                                % for _ in range(rating):
-                                                                                                <td class="star-rating full">&#9733;</td>
-                                                                                                % endfor
-                                                                                                % for _ in range(5-rating):
-                                                                                                <td class="star-rating empty">&#9734;</td>
-                                                                                                % endfor
-                                                                                            </tr>
-                                                                                        </table>
-                                                                                    </td>
-                                                                                    % endif
-                                                                                </tr>
-                                                                            </table>
-                                                                        </td>
-                                                                    </tr>
-                                                                </table>
-                                                            </td>
-                                                        </tr>
-                                                    </table>
-                                                </td>
-                                                % if not album_b:
-                                                <td align="center" valign="top" class="card-instance pad"></td>
-                                                % endif
-                                                % endif
-                                                % endfor
-                                            </tr>
-                                        </table>
-                                    </td>
-                                </tr>
-                                % endfor
-                            </table>
-                        </td>
-                    </tr>
-                    % endif
-                    % if recently_added.get('other_video'):
-                    <tr>
-                        <td class="wrapper">
-                            <div class="sub-header-bar"></div>
-                            <div class="sub-header-title">
-                                <img src="${(base_url_image + 'images/libraries/video.png') if base_url_image else 'https://tautulli.com/images/libraries/video.png'}" class="sub-header-icon" width="30" height="30"/> Recently Added Videos
-                            </div>
-                            <div class="sub-header-count">
-                                <span class="count">${len(recently_added['other_video'])}</span> <span class="count-units">video${'s' if len(recently_added['other_video']) > 1 else ''}</span>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <table border="0" cellpadding="0" cellspacing="0">
-                                % for video_a, video_b in grouper(recently_added['other_video'], 2):
-                                <tr>
-                                    <td>
-                                        <table border="0" cellpadding="0" cellspacing="0" width="100%">
-                                            <tr>
-                                                % for video in (video_a, video_b):
-                                                % if video:
-                                                % if not video_b:
-                                                <td align="center" valign="top" class="card-instance pad"></td>
-                                                % endif
-                                                <td align="center" valign="top" class="card-instance movie">
-                                                    <table border="0" cellpadding="0" cellspacing="3" width="100%" class="card-background" style="background-image: url(${(base_url_image + video['art_hash']) if base_url_image else video['art_url']});">
-                                                        <tr>
-                                                            <td class="card-poster-container">
-                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-poster" style="background-image: url(${(base_url_image + video['thumb_hash']) if base_url_image else video['thumb_url']})">
-                                                                    <tr>
-                                                                        <td>
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${video['rating_key']}" title="${video['title']}" target="_blank" rel="noreferrer">
-                                                                                <img class="card-poster-overlay" src="${base_url_image + 'images/newsletter/view-on-plex-poster.png' if base_url_image else 'https://tautulli.com/images/newsletter/view-on-plex-poster.png'}" width="150" height="225">
-                                                                            </a>
-                                                                        </td>
-                                                                    </tr>
-                                                                </table>
-                                                            </td>
-                                                            <td class="card-info-container">
-                                                                <table border="0" cellpadding="0" cellspacing="0" class="card-info-container-table">
-                                                                    <tr>
-                                                                        <td class="card-info-title nowrap">
-                                                                            <a href="${parameters['pms_web_url']}#!/server/${parameters['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${video['rating_key']}" title="${video['title']}" target="_blank" rel="noreferrer">${video['title']}</a>
-                                                                        </td>
-                                                                    </tr>
-                                                                    <tr>
-                                                                        <td class="card-info-body">
-                                                                            % if video['tagline']:
-                                                                            <p class="nowrap mb5">
-                                                                                <em>${video['tagline']}</em>
-                                                                            </p>
-                                                                            % endif
-                                                                            <p>
-                                                                                ${video['summary'][:450] + (video['summary'][450:] and '...')}
-                                                                            </p>
-                                                                        </td>
-                                                                    </tr>
-                                                                    <tr>
-                                                                        <td class="card-info-footer nowrap">
-                                                                            <table border="0" cellpadding="0" cellspacing="0">
-                                                                                <tr>
-                                                                                    <td class="badge-container">
-                                                                                        <table border="0" cellpadding="0" cellspacing="0">
-                                                                                            <tr>
-                                                                                                % if video['year']:
-                                                                                                <td class="badge" title="${video['year']}">${video['year']}</td>
-                                                                                                % endif
-                                                                                                % if video['duration']:
-                                                                                                <% duration = int(int(video['duration'])/60000) %>
-                                                                                                <td class="badge" title="${duration} mins">${duration} mins</td>
-                                                                                                % endif
-                                                                                                % if video['genres']:
-                                                                                                % for genre in video['genres'][:]:
-                                                                                                <td class="badge" title="${genre}">${genre}</td>
-                                                                                                % endfor
-                                                                                                % endif
-                                                                                            </tr>
-                                                                                        </table>
-                                                                                    </td>
-                                                                                    % if video['rating'] or video['audience_rating']:
-                                                                                    <% rating = int(round(float(video['rating'] or video['audience_rating']) / 2)) %>
-                                                                                    <td class="star-rating-container" title="${int(float(video['rating'] or video['audience_rating'])/0.1)}%" align="right">
-                                                                                        <table border="0" cellpadding="0" cellspacing="0">
-                                                                                            <tr>
-                                                                                                % for _ in range(rating):
-                                                                                                <td class="star-rating full">&#9733;</td>
-                                                                                                % endfor
-                                                                                                % for _ in range(5-rating):
-                                                                                                <td class="star-rating empty">&#9734;</td>
-                                                                                                % endfor
-                                                                                            </tr>
-                                                                                        </table>
-                                                                                    </td>
-                                                                                    % endif
-                                                                                </tr>
-                                                                            </table>
-                                                                        </td>
-                                                                    </tr>
-                                                                </table>
-                                                            </td>
-                                                        </tr>
-                                                    </table>
-                                                </td>
-                                                % if not video_b:
-                                                <td align="center" valign="top" class="card-instance pad"></td>
-                                                % endif
-                                                % endif
-                                                % endfor
-                                            </tr>
-                                        </table>
-                                    </td>
-                                </tr>
-                                % endfor
-                            </table>
-                        </td>
-                    </tr>
-                    % endif
-                    <tr>
-                        <td class="footer">
-                            <div class="footer-bar"></div>
-                            <div class="content-block powered-by">
-                                <!-- FOOTER MESSAGE - DO NOT REMOVE -->
-                            </div>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-        </td>
-    </tr>
-</table>
-</body>
-</html>
-% endif
diff --git a/init-scripts/init-alt.freebsd b/init-scripts/init-alt.freebsd
new file mode 100755
index 00000000..a490eabb
--- /dev/null
+++ b/init-scripts/init-alt.freebsd
@@ -0,0 +1,88 @@
+#!/bin/sh
+#
+# PROVIDE: plexpy
+# REQUIRE: sabnzbd
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# plexpy_enable (bool):     Set to NO by default.
+#                       Set it to YES to enable it.
+# plexpy_user:  The user account PlexPy daemon runs as what
+#                       you want it to be. It uses '_sabnzbd' user by
+#                       default. Do not sets it as empty or it will run
+#                       as root.
+# plexpy_dir:       Directory where PlexPy lives.
+#                       Default: /usr/local/plexpy
+# plexpy_chdir:  Change to this directory before running PlexPy.
+#     Default is same as plexpy_dir.
+# plexpy_pid:  The name of the pidfile to create.
+#     Default is plexpy.pid in plexpy_dir.
+
+. /etc/rc.subr
+
+name="plexpy"
+rcvar=${name}_enable
+
+load_rc_config ${name}
+
+: ${plexpy_enable:="NO"}
+: ${plexpy_user:="_sabnzbd"}
+: ${plexpy_dir:="/usr/local/plexpy"}
+: ${plexpy_chdir:="${plexpy_dir}"}
+: ${plexpy_pid:="${plexpy_dir}/plexpy.pid"}
+: ${plexpy_conf:="${plexpy_dir}/config.ini"}
+
+WGET="/usr/local/bin/wget" # You need wget for this script to safely shutdown PlexPy.
+if [ -e "${plexpy_conf}" ]; then
+        HOST=`grep -A64 "\[General\]" "${plexpy_conf}"|egrep "^http_host"|perl -wple 's/^http_host = (.*)$/$1/'`
+        PORT=`grep -A64 "\[General\]" "${plexpy_conf}"|egrep "^http_port"|perl -wple 's/^http_port = (.*)$/$1/'`
+fi
+
+status_cmd="${name}_status"
+stop_cmd="${name}_stop"
+
+command="${plexpy_dir}/PlexPy.py"
+command_args="--daemon --quiet --nolaunch --port ${PORT} --pidfile ${plexpy_pid} --config ${plexpy_conf}"
+
+# Check for wget and refuse to start without it.
+if [ ! -x "${WGET}" ]; then
+  warn "PlexPy not started: You need wget to safely shut down PlexPy."
+  exit 1
+fi
+
+# Ensure user is root when running this script.
+if [ `id -u` != "0" ]; then
+  echo "Oops, you should be root before running this!"
+  exit 1
+fi
+
+verify_plexpy_pid() {
+    # Make sure the pid corresponds to the PlexPy process.
+    pid=`cat ${plexpy_pid} 2>/dev/null`
+    ps -p ${pid} | grep -q "python ${plexpy_dir}/PlexPy.py"
+    return $?
+}
+
+# Try to stop PlexPy cleanly by calling shutdown over http.
+plexpy_stop() {
+    if [ ! -e "${plexpy_conf}" ]; then
+        echo "PlexPy' settings file does not exist. Try starting PlexPy, as this should create the file."
+        exit 1
+    fi
+    echo "Stopping $name"
+    verify_plexpy_pid
+    ${WGET} -O - -q --user=${SBUSR} --password=${SBPWD} "http://${HOST}:${PORT}/shutdown/" >/dev/null
+    
+    if [ -n "${pid}" ]; then
+      wait_for_pids ${pid}
+      echo "Stopped $name"
+    fi
+}
+
+plexpy_status() {
+    verify_plexpy_pid && echo "$name is running as ${pid}" || echo "$name is not running"
+}
+
+run_rc_command "$1"
diff --git a/init-scripts/init.fedora.centos.systemd b/init-scripts/init.fedora.centos.systemd
new file mode 100755
index 00000000..5cb70ce8
--- /dev/null
+++ b/init-scripts/init.fedora.centos.systemd
@@ -0,0 +1,66 @@
+# PlexPy - Stats for Plex Media Server usage
+#
+# Service Unit file for systemd system manager
+#
+# INSTALLATION NOTES
+#
+#	1. Rename this file as you want, ensuring that it ends in .service
+#		e.g. 'plexpy.service'
+#
+#	2. Adjust configuration settings as required.  More details in the
+#	   "CONFIGURATION NOTES" section shown below.
+#
+#	3. Copy this file into your systemd service unit directory, which is
+#	   often '/lib/systemd/system'.
+#
+#	4. Create any files/directories that you specified back in step #2.
+#		e.g. '/etc/plexpy/plexpy.ini'
+#			 '/home/sabnzbd/.plexpy'
+#
+#	5. Enable boot-time autostart with the following commands:
+#		systemctl daemon-reload
+#		systemctl enable plexpy.service
+#
+#	6. Start now with the following command:
+#		systemctl start plexpy.service
+#
+#   7. If troubleshooting startup-errors, start by checking permissions
+#      and ownership on the files/directories that you created in step #4.
+#
+#
+# CONFIGURATION NOTES
+#
+#	 - The example settings in this file assume that:
+#		1. You will run PlexPy as user/group: sabnzbd.sabnzbd
+#		2. You will either have PlexPy installed as a subdirectory
+#		   under '~sabnzbd', or that you will have a symlink under
+#		   '~/sabnzbd' pointing to your PlexPy install dir.
+#	    3. Your PlexPy data directory and configuration file will be
+#		   in separate locations from your PlexPy install dir, to
+#		   simplify updates.
+#			
+#    - Option names (e.g. ExecStart=, Type=) appear to be case-sensitive)
+#
+#    - Adjust ExecStart= to point to:
+# 		1. Your PlexPy executable,
+# 		2. Your config file (recommended is to put it somewhere in /etc)
+#       3. Your datadir (recommended is to NOT put it in your PlexPy exec dir)
+#
+#    - Adjust User= and Group= to the user/group you want PlexPy to run as.
+#
+#    - WantedBy= specifies which target (i.e. runlevel) to start PlexPy for.
+#        multi-user.target equates to runlevel 3 (multi-user text mode)
+#        graphical.target  equates to runlevel 5 (multi-user X11 graphical mode)
+
+[Unit]
+Description=PlexPy - Stats for Plex Media Server usage
+
+[Service]
+ExecStart=/home/sabnzbd/plexpy/PlexPy.py --daemon --config /etc/plexpy/plexpy.ini --datadir /home/sabnzbd/.plexpy --nolaunch --quiet
+GuessMainPID=no
+Type=forking
+User=sabnzbd
+Group=sabnzbd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/init-scripts/init.freebsd b/init-scripts/init.freebsd
index 66d2f49a..5b84e9d2 100755
--- a/init-scripts/init.freebsd
+++ b/init-scripts/init.freebsd
@@ -1,46 +1,44 @@
 #!/bin/sh
 #
-# PROVIDE: tautulli
-# REQUIRE: DAEMON tautulli
+# PROVIDE: plexpy
+# REQUIRE: DAEMON sabnzbd
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
-# tautulli_enable (bool): Set to NO by default.
+# plexpy_enable (bool): Set to NO by default.
 #           Set it to YES to enable it.
-# tautulli_user:  The user account Tautulli daemon runs as what
-#           you want it to be. It uses 'tautulli' user by
+# plexpy_user:  The user account PlexPy daemon runs as what
+#           you want it to be. It uses '_sabnzbd' user by
 #           default. Do not sets it as empty or it will run
 #           as root.
-# tautulli_dir:   Directory where Tautulli lives.
-#           Default: /usr/local/share/Tautulli
-# tautulli_chdir:  Change to this directory before running Tautulli.
-#     Default is same as tautulli_dir.
-# tautulli_pid:  The name of the pidfile to create.
-#     Default is tautulli.pid in tautulli_dir.
+# plexpy_dir:   Directory where PlexPy lives.
+#           Default: /usr/local/plexpy
+# plexpy_chdir:  Change to this directory before running PlexPy.
+#     Default is same as plexpy_dir.
+# plexpy_pid:  The name of the pidfile to create.
+#     Default is plexpy.pid in plexpy_dir.
 PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
 
 . /etc/rc.subr
 
-name="tautulli"
+name="plexpy"
 rcvar=${name}_enable
 
 load_rc_config ${name}
 
-: ${tautulli_enable:="NO"}
-: ${tautulli_user:="tautulli"}
-: ${tautulli_dir:="/usr/local/share/Tautulli"}
-: ${tautulli_chdir:="${tautulli_dir}"}
-: ${tautulli_pid:="${tautulli_dir}/tautulli.pid"}
-: ${tautulli_flags:=""}
+: ${plexpy_enable:="NO"}
+: ${plexpy_user:="_sabnzbd"}
+: ${plexpy_dir:="/usr/local/plexpy"}
+: ${plexpy_chdir:="${plexpy_dir}"}
+: ${plexpy_pid:="${plexpy_dir}/plexpy.pid"}
 
 status_cmd="${name}_status"
 stop_cmd="${name}_stop"
 
-command_interpreter="python"
-command="${tautulli_dir}/Tautulli.py"
-command_args="--daemon --pidfile ${tautulli_pid} --quiet --nolaunch ${tautulli_flags}"
+command="/usr/sbin/daemon"
+command_args="-f -p ${plexpy_pid} python ${plexpy_dir}/PlexPy.py ${plexpy_flags} --quiet --nolaunch"
 
 # Ensure user is root when running this script.
 if [ `id -u` != "0" ]; then
@@ -48,35 +46,25 @@ if [ `id -u` != "0" ]; then
   exit 1
 fi
 
-verify_tautulli_pid() {
-    # Make sure the pid corresponds to the Tautulli process.
-    if [ -f ${tautulli_pid} ]; then
-      pid=`cat ${tautulli_pid} 2>/dev/null`
-      ps -p ${pid} | grep -q "python ${tautulli_dir}/Tautulli.py"
-      return $?
-    else
-      return 0
-    fi
+verify_plexpy_pid() {
+    # Make sure the pid corresponds to the PlexPy process.
+    pid=`cat ${plexpy_pid} 2>/dev/null`
+    ps -p ${pid} | grep -q "python ${plexpy_dir}/PlexPy.py"
+    return $?
 }
 
-# Try to stop Tautulli cleanly by sending SIGTERM
-tautulli_stop() {
-    echo "Stopping $name."
-    verify_tautulli_pid
+# Try to stop PlexPy cleanly by calling shutdown over http.
+plexpy_stop() {
+    echo "Stopping $name"
+    verify_plexpy_pid
     if [ -n "${pid}" ]; then
-      kill ${pid}
       wait_for_pids ${pid}
-      echo "Stopped."
+      echo "Stopped"
     fi
 }
 
-tautulli_status() {
-    verify_tautulli_pid
-    if [ -n "${pid}" ]; then
-      echo "$name is running as ${pid}."
-    else
-      echo "$name is not running."
-    fi
+plexpy_status() {
+    verify_plexpy_pid && echo "$name is running as ${pid}" || echo "$name is not running"
 }
 
 run_rc_command "$1"
diff --git a/init-scripts/init.freenas b/init-scripts/init.freenas
deleted file mode 120000
index 96fc5bcc..00000000
--- a/init-scripts/init.freenas
+++ /dev/null
@@ -1 +0,0 @@
-init.freebsd
\ No newline at end of file
diff --git a/init-scripts/init.freenas b/init-scripts/init.freenas
new file mode 100644
index 00000000..62f5d3fc
--- /dev/null
+++ b/init-scripts/init.freenas
@@ -0,0 +1,80 @@
+#!/bin/sh
+#
+# PROVIDE: plexpy
+# REQUIRE: DAEMON sabnzbd
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# plexpy_enable (bool): Set to NO by default.
+#           Set it to YES to enable it.
+# plexpy_user:  The user account PlexPy daemon runs as what
+#           you want it to be. It uses '_sabnzbd' user by
+#           default. Do not sets it as empty or it will run
+#           as root.
+# plexpy_dir:   Directory where PlexPy lives.
+#           Default: /usr/local/plexpy
+# plexpy_chdir:  Change to this directory before running PlexPy.
+#     Default is same as plexpy_dir.
+# plexpy_pid:  The name of the pidfile to create.
+#     Default is plexpy.pid in plexpy_dir.
+PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
+
+. /etc/rc.subr
+
+name="plexpy"
+rcvar=${name}_enable
+
+load_rc_config ${name}
+
+: ${plexpy_enable:="NO"}
+: ${plexpy_user:="_sabnzbd"}
+: ${plexpy_dir:="/usr/local/share/plexpy"}
+: ${plexpy_chdir:="${plexpy_dir}"}
+: ${plexpy_pid:="${plexpy_dir}/plexpy.pid"}
+
+status_cmd="${name}_status"
+stop_cmd="${name}_stop"
+
+command="/usr/sbin/daemon"
+command_args="-f -p ${plexpy_pid} python2 ${plexpy_dir}/PlexPy.py ${plexpy_flags} --quiet --nolaunch"
+
+# Ensure user is root when running this script.
+if [ `id -u` != "0" ]; then
+  echo "Oops, you should be root before running this!"
+  exit 1
+fi
+
+verify_plexpy_pid() {
+    # Make sure the pid corresponds to the PlexPy process.
+    if [ -f ${plexpy_pid} ]; then
+      pid=`cat ${plexpy_pid} 2>/dev/null`
+      ps -p ${pid} | grep -q "python2 ${plexpy_dir}/PlexPy.py"
+      return $?
+    else
+      return 0
+    fi
+}
+
+# Try to stop PlexPy cleanly by calling shutdown over http.
+plexpy_stop() {
+    echo "Stopping $name."
+    verify_plexpy_pid
+    if [ -n "${pid}" ]; then
+      kill ${pid}
+      wait_for_pids ${pid}
+      echo "Stopped."
+    fi
+}
+
+plexpy_status() {
+    verify_plexpy_pid
+    if [ -n "${pid}" ]; then
+      echo "$name is running as ${pid}."
+    else
+      echo "$name is not running."
+    fi
+}
+
+run_rc_command "$1"
diff --git a/init-scripts/init.opensuse.systemd b/init-scripts/init.opensuse.systemd
new file mode 100644
index 00000000..7dbdfc3e
--- /dev/null
+++ b/init-scripts/init.opensuse.systemd
@@ -0,0 +1,67 @@
+# PlexPy - Stats for Plex Media Server usage
+#
+# Service Unit file for systemd system manager
+#
+# INSTALLATION NOTES
+#
+#       1. Rename this file as you want, ensuring that it ends in .service
+#               e.g. 'plexpy.service'
+#
+#       2. Adjust configuration settings as required.  More details in the
+#          "CONFIGURATION NOTES" section shown below.
+#
+#       3. Copy this file into your systemd service unit directory, which is
+#          often '/lib/systemd/system'.
+#
+#       4. Create any files/directories that you specified back in step #2.
+#               e.g. '/opt/plexpy.ini'
+#                        '/opt/plexpy'
+#
+#       5. Enable boot-time autostart with the following commands:
+#               systemctl daemon-reload
+#               systemctl enable plexpy.service
+#
+#       6. Start now with the following command:
+#               systemctl start plexpy.service
+#
+#   7. If troubleshooting startup-errors, start by checking permissions
+#      and ownership on the files/directories that you created in step #4.
+#
+#
+# CONFIGURATION NOTES
+#
+#        - The example settings in this file assume that:
+#               1. You will run PlexPy as user/group: plex.users
+#               2. You will either have PlexPy installed as a subdirectory
+#                  under '/opt', or that you will have a symlink under
+#                  '/opt' pointing to your PlexPy install dir.
+#           3. Your PlexPy data directory and configuration file can be
+#                  in separate locations from your PlexPy install dir, to
+#                  simplify updates. However, in the example below they are in the
+#                  PlexPy install dir.
+#
+#    - Option names (e.g. ExecStart=, Type=) appear to be case-sensitive)
+#
+#    - Adjust ExecStart= to point to:
+#       1. Your PlexPy executable,
+#       2. Your config file (recommended is to put it somewhere in /etc)
+#       3. Your datadir (recommended is to NOT put it in your PlexPy exec dir)
+#
+#    - Adjust User= and Group= to the user/group you want PlexPy to run as.
+#
+#    - WantedBy= specifies which target (i.e. runlevel) to start PlexPy for.
+#        multi-user.target equates to runlevel 3 (multi-user text mode)
+#        graphical.target  equates to runlevel 5 (multi-user X11 graphical mode)
+
+[Unit]
+Description=PlexPy - Stats for Plex Media Server usage
+
+[Service]
+ExecStart=/opt/plexpy/PlexPy.py --daemon --config /opt/plexpy/config.ini --datadir /opt/plexpy --nolaunch --quiet
+GuessMainPID=no
+Type=forking
+User=plex
+Group=users
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/init-scripts/init.osx b/init-scripts/init.osx
index 452b87b6..2ff4338f 100755
--- a/init-scripts/init.osx
+++ b/init-scripts/init.osx
@@ -3,12 +3,12 @@
 <plist version="1.0">
 <dict>
   <key>Label</key>
-  <string>tautulli</string>
+  <string>plexpy</string>
   <key>ProgramArguments</key>
   <array>
-       <!-- Modify these two lines if you need to to reflect your python location and Tautulli install location -->
+       <!-- Modify these two lines if you need to to reflect your python location and PlexPy install location -->
        <string>/usr/bin/python</string>
-       <string>/Applications/Tautulli/Tautulli.py</string>
+       <string>/Applications/PlexPy/PlexPy.py</string>
   </array>
   <key>RunAtLoad</key>
   <true/>
diff --git a/init-scripts/init.solaris11 b/init-scripts/init.solaris11
new file mode 100755
index 00000000..8e50267d
--- /dev/null
+++ b/init-scripts/init.solaris11
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<!--
+        Created by Manifold
+--><service_bundle type="manifest" name="plexpy">
+
+    <service name="application/plexpy" type="service" version="1">
+
+        <create_default_instance enabled="true"/>
+
+        <single_instance/>
+
+        <dependency name="network" grouping="require_all" restart_on="error" type="service">
+            <service_fmri value="svc:/milestone/network:default"/>
+        </dependency>
+
+        <dependency name="filesystem" grouping="require_all" restart_on="error" type="service">
+            <service_fmri value="svc:/system/filesystem/local"/>
+        </dependency>
+
+        <method_context>
+            <method_credential user="sabnzbd" group="sabnzbd"/>
+        </method_context>
+
+        <exec_method type="method" name="start" exec="python /opt/plexpy/PlexPy.py --daemon --quiet --nolaunch" timeout_seconds="60"/>
+
+        <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60"/>
+
+        <property_group name="startd" type="framework">
+            <propval name="duration" type="astring" value="contract"/>
+            <propval name="ignore_error" type="astring" value="core,signal"/>
+        </property_group>
+
+
+        <stability value="Evolving"/>
+
+        <template>
+            <common_name>
+                <loctext xml:lang="C">
+                    PlexPy
+                </loctext>
+            </common_name>
+        </template>
+
+    </service>
+
+</service_bundle>
diff --git a/init-scripts/init.systemd b/init-scripts/init.systemd
deleted file mode 100644
index c27b27df..00000000
--- a/init-scripts/init.systemd
+++ /dev/null
@@ -1,64 +0,0 @@
-# Tautulli - Stats for Plex Media Server usage
-#
-# Service Unit file for systemd system manager
-#
-# INSTALLATION NOTES
-#
-#   1. Copy this file into your systemd service unit directory (often '/lib/systemd/system')
-#      and name it 'tautulli.service' with the following command:
-#       cp /opt/Tautulli/init-scripts/init.systemd /lib/systemd/system/tautulli.service
-#
-#   2. Edit the new tautulli.service file with configuration settings as required.
-#      More details in the "CONFIGURATION NOTES" section shown below.
-#
-#   3. Enable boot-time autostart with the following commands:
-#       systemctl daemon-reload
-#       systemctl enable tautulli.service
-#
-#   4. Start now with the following command:
-#       systemctl start tautulli.service
-#
-# CONFIGURATION NOTES
-#
-#    - The example settings in this file assume that you will run Tautulli as user: tautulli
-#    - The example settings in this file assume that Tautulli is installed to: /opt/Tautulli
-#
-#    - To create this user and give it ownership of the Tautulli directory:
-#       1. Create the user:
-#           Ubuntu/Debian: sudo addgroup tautulli && sudo adduser --system --no-create-home tautulli --ingroup tautulli
-#           CentOS/Fedora: sudo adduser --system --no-create-home tautulli
-#       2. Give the user ownership of the Tautulli directory:
-#           sudo chown -R tautulli:tautulli /opt/Tautulli
-#
-#    - Adjust ExecStart= to point to:
-#       1. Your Python interpreter (get the path with "command -v python3")
-#          - Default: /usr/bin/python3
-#       2. Your Tautulli executable
-#          - Default: /opt/Tautulli/Tautulli.py
-#       3. Your config file (recommended is to put it somewhere in /etc)
-#          - Default: --config /opt/Tautulli/config.ini
-#       4. Your datadir (recommended is to NOT put it in your Tautulli exec dir)
-#          - Default: --datadir /opt/Tautulli
-#
-#    - Adjust User= and Group= to the user/group you want Tautulli to run as.
-#
-#    - WantedBy= specifies which target (i.e. runlevel) to start Tautulli for.
-#       multi-user.target equates to runlevel 3 (multi-user text mode)
-#       graphical.target  equates to runlevel 5 (multi-user X11 graphical mode)
-
-[Unit]
-Description=Tautulli - Stats for Plex Media Server usage
-Wants=network-online.target
-After=network-online.target
-
-[Service]
-ExecStart=/usr/bin/python3 /opt/Tautulli/Tautulli.py --config /opt/Tautulli/config.ini --datadir /opt/Tautulli --quiet --nolaunch
-User=tautulli
-Group=tautulli
-Restart=on-abnormal
-RestartSec=5
-StartLimitInterval=90
-StartLimitBurst=3
-
-[Install]
-WantedBy=multi-user.target
diff --git a/init-scripts/init.ubuntu b/init-scripts/init.ubuntu
new file mode 100755
index 00000000..4e27c257
--- /dev/null
+++ b/init-scripts/init.ubuntu
@@ -0,0 +1,209 @@
+#!/bin/sh
+#
+## Don't edit this file
+## Edit user configuation in /etc/default/plexpy to change
+##
+## Make sure init script is executable
+## sudo chmod +x /path/to/init.ubuntu
+##
+## Install the init script
+## sudo ln -s /path/to/init.ubuntu /etc/init.d/plexpy
+##
+## Create the plexpy daemon user:
+## sudo adduser --system --no-create-home plexpy
+##
+## Make sure /opt/plexpy is owned by the plexpy user
+## sudo chown plexpy:nogroup -R /opt/plexpy
+##
+## Touch the default file to stop the warning message when starting
+## sudo touch /etc/default/plexpy
+##
+## To start PlexPy automatically
+## sudo  update-rc.d plexpy defaults
+##
+## To start/stop/restart PlexPy
+## sudo service plexpy start
+## sudo service plexpy stop
+## sudo service plexpy restart
+##
+## HP_USER=         #$RUN_AS, username to run plexpy under, the default is plexpy
+## HP_HOME=         #$APP_PATH, the location of PlexPy.py, the default is /opt/plexpy
+## HP_DATA=         #$DATA_DIR, the location of plexpy.db, cache, logs, the default is /opt/plexpy
+## HP_PIDFILE=      #$PID_FILE, the location of plexpy.pid, the default is /var/run/plexpy/plexpy.pid
+## PYTHON_BIN=      #$DAEMON, the location of the python binary, the default is /usr/bin/python
+## HP_OPTS=         #$EXTRA_DAEMON_OPTS, extra cli option for plexpy, i.e. " --config=/home/plexpy/config.ini"
+## SSD_OPTS=        #$EXTRA_SSD_OPTS, extra start-stop-daemon option like " --group=users"
+## HP_PORT=         #$PORT_OPTS, hardcoded port for the webserver, overrides value in config.ini
+##
+## EXAMPLE if want to run as different user
+## add HP_USER=username to /etc/default/plexpy
+## otherwise default plexpy is used
+#
+### BEGIN INIT INFO
+# Provides:          plexpy
+# Required-Start:    $local_fs $network $remote_fs
+# Required-Stop:     $local_fs $network $remote_fs
+# Should-Start:      $NetworkManager
+# Should-Stop:       $NetworkManager
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: starts instance of PlexPy
+# Description:       starts instance of PlexPy using start-stop-daemon
+### END INIT INFO
+
+# Script name
+NAME=plexpy
+
+# App name
+DESC=PlexPy
+
+SETTINGS_LOADED=FALSE
+
+. /lib/lsb/init-functions
+
+# Source PlexPy configuration
+if [ -f /etc/default/plexpy ]; then
+    SETTINGS=/etc/default/plexpy
+else
+    log_warning_msg "/etc/default/plexpy not found using default settings.";
+fi
+
+check_retval() {
+    if [ $? -eq 0 ]; then
+        log_end_msg 0
+        return 0
+    else
+        log_end_msg 1
+        exit 1
+    fi
+}
+
+load_settings() {
+    if [ $SETTINGS_LOADED != "TRUE" ]; then
+        . $SETTINGS
+
+        ## The defaults
+        # Run as username
+        RUN_AS=${HP_USER-plexpy}
+
+        # Path to app HP_HOME=path_to_app_PlexPy.py
+        APP_PATH=${HP_HOME-/opt/plexpy}
+
+        # Data directory where plexpy.db, cache and logs are stored
+        DATA_DIR=${HP_DATA-/opt/plexpy}
+
+        # Path to store PID file
+        PID_FILE=${HP_PIDFILE-/var/run/plexpy/plexpy.pid}
+
+        # Path to python bin
+        DAEMON=${PYTHON_BIN-/usr/bin/python}
+
+        # Extra daemon option like: HP_OPTS=" --config=/home/plexpy/config.ini"
+        EXTRA_DAEMON_OPTS=${HP_OPTS-}
+
+        # Extra start-stop-daemon option like START_OPTS=" --group=users"
+        EXTRA_SSD_OPTS=${SSD_OPTS-}
+
+        # Hardcoded port to run on, overrides config.ini settings
+        [ -n "$HP_PORT" ] && {
+            PORT_OPTS=" --port=${HP_PORT} "
+        }
+
+        DAEMON_OPTS=" PlexPy.py --quiet --daemon --nolaunch --pidfile=${PID_FILE} --datadir=${DATA_DIR} ${PORT_OPTS}${EXTRA_DAEMON_OPTS}"
+
+        SETTINGS_LOADED=TRUE
+    fi
+
+    [ -x $DAEMON ] || {
+        log_warning_msg "$DESC: Can't execute daemon, aborting. See $DAEMON";
+        return 1;}
+
+    return 0
+}
+
+load_settings || exit 0
+
+is_running () {
+    # returns 1 when running, else 0.
+    if [ -e $PID_FILE ]; then
+      PID=`cat $PID_FILE`
+
+      RET=$?
+      [ $RET -gt 1 ] && exit 1 || return $RET
+    else
+      return 1
+    fi
+}
+
+handle_pid () {
+    PID_PATH=`dirname $PID_FILE`
+    [ -d $PID_PATH ] || mkdir -p $PID_PATH && chown -R $RUN_AS $PID_PATH > /dev/null || {
+        log_warning_msg "$DESC: Could not create $PID_FILE, See $SETTINGS, aborting.";
+        return 1;}
+
+    if [ -e $PID_FILE ]; then
+        PID=`cat $PID_FILE`
+        if ! kill -0 $PID > /dev/null 2>&1; then
+            log_warning_msg "Removing stale $PID_FILE"
+            rm $PID_FILE
+        fi
+    fi
+}
+
+handle_datadir () {
+    [ -d $DATA_DIR ] || mkdir -p $DATA_DIR && chown -R $RUN_AS $DATA_DIR > /dev/null || {
+        log_warning_msg "$DESC: Could not create $DATA_DIR, See $SETTINGS, aborting.";
+        return 1;}
+}
+
+handle_updates () {
+    chown -R $RUN_AS $APP_PATH > /dev/null || {
+        log_warning_msg "$DESC: $APP_PATH not writable by $RUN_AS for web-updates";
+        return 0; }
+}
+
+start_plexpy () {
+    handle_pid
+    handle_datadir
+    handle_updates
+    if ! is_running; then
+        log_daemon_msg "Starting $DESC"
+        start-stop-daemon -o -d $APP_PATH -c $RUN_AS --start $EXTRA_SSD_OPTS --pidfile $PID_FILE --exec $DAEMON -- $DAEMON_OPTS
+        check_retval
+    else
+        log_success_msg "$DESC: already running (pid $PID)"
+    fi
+}
+
+stop_plexpy () {
+    if is_running; then
+        log_daemon_msg "Stopping $DESC"
+        start-stop-daemon -o --stop --pidfile $PID_FILE --retry 15
+        check_retval
+    else
+        log_success_msg "$DESC: not running"
+    fi
+}
+
+case "$1" in
+    start)
+        start_plexpy
+        ;;
+    stop)
+        stop_plexpy
+        ;;
+    restart|force-reload)
+        stop_plexpy
+        start_plexpy
+        ;;
+    status)
+        status_of_proc -p "$PID_FILE" "$DAEMON" "$DESC"
+        ;;
+    *)
+        N=/etc/init.d/$NAME
+        echo "Usage: $N {start|stop|restart|force-reload|status}" >&2
+        exit 1
+        ;;
+esac
+
+exit 0
diff --git a/init-scripts/init.ubuntu.systemd b/init-scripts/init.ubuntu.systemd
new file mode 100644
index 00000000..fd4d54bc
--- /dev/null
+++ b/init-scripts/init.ubuntu.systemd
@@ -0,0 +1,66 @@
+# PlexPy - Stats for Plex Media Server usage
+#
+# Service Unit file for systemd system manager
+#
+# INSTALLATION NOTES
+#
+#   1. Rename this file as you want, ensuring that it ends in .service
+#       e.g. 'plexpy.service'
+#
+#   2. Adjust configuration settings as required.  More details in the
+#      "CONFIGURATION NOTES" section shown below.
+#
+#   3. Copy this file into your systemd service unit directory, which is
+#      often '/lib/systemd/system'.
+#
+#   4. Create any files/directories that you specified back in step #2.
+#       e.g. '/etc/plexpy/plexpy.ini'
+#            '/home/sabnzbd/.plexpy'
+#
+#   5. Enable boot-time autostart with the following commands:
+#       systemctl daemon-reload
+#       systemctl enable plexpy.service
+#
+#   6. Start now with the following command:
+#       systemctl start plexpy.service
+#
+#   7. If troubleshooting startup-errors, start by checking permissions
+#      and ownership on the files/directories that you created in step #4.
+#
+#
+# CONFIGURATION NOTES
+#
+#    - The example settings in this file assume that:
+#       1. You will run PlexPy as user/group: sabnzbd.sabnzbd
+#       2. You will either have PlexPy installed as a subdirectory
+#          under '~sabnzbd', or that you will have a symlink under
+#          '~/sabnzbd' pointing to your PlexPy install dir.
+#       3. Your PlexPy data directory and configuration file will be
+#          in separate locations from your PlexPy install dir, to
+#          simplify updates.
+#
+#    - Option names (e.g. ExecStart=, Type=) appear to be case-sensitive)
+#
+#    - Adjust ExecStart= to point to:
+#       1. Your PlexPy executable,
+#       2. Your config file (recommended is to put it somewhere in /etc)
+#       3. Your datadir (recommended is to NOT put it in your PlexPy exec dir)
+#
+#    - Adjust User= and Group= to the user/group you want PlexPy to run as.
+#
+#    - WantedBy= specifies which target (i.e. runlevel) to start PlexPy for.
+#        multi-user.target equates to runlevel 3 (multi-user text mode)
+#        graphical.target  equates to runlevel 5 (multi-user X11 graphical mode)
+
+[Unit]
+Description=PlexPy - Stats for Plex Media Server usage
+
+[Service]
+ExecStart=/opt/plexpy/PlexPy.py --quiet --daemon --nolaunch --config /opt/plexpy/config.ini --datadir /opt/plexpy
+GuessMainPID=no
+Type=forking
+User=plexpy
+Group=nogroup
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/init-scripts/init.upstart b/init-scripts/init.upstart
new file mode 100755
index 00000000..6e11225a
--- /dev/null
+++ b/init-scripts/init.upstart
@@ -0,0 +1,18 @@
+# plexpy
+#
+# This is a session/user job. Install this file into /usr/share/upstart/sessions
+# if plexpy is installed system wide, and into $XDG_CONFIG_HOME/upstart if
+# plexpy is installed per user. Change the executable path appropiately.
+
+start on desktop-start
+stop on desktop-end
+
+env CONFIG=""$XDG_CONFIG_HOME"/plexpy"
+env DATA=""$XDG_DATA_HOME"/plexpy"
+
+pre-start script
+    [ -d "$CONFIG" ] || mkdir -p "$CONFIG"
+    [ -d "$DATA" ] || mkdir -p "$DATA"
+end script
+
+exec PlexPy.py --nolaunch --config "$CONFIG"/config.ini --datadir "$DATA"
diff --git a/lib/IPy.py b/lib/IPy.py
deleted file mode 100644
index 3cddf291..00000000
--- a/lib/IPy.py
+++ /dev/null
@@ -1,1660 +0,0 @@
-"""
-IPy - class and tools for handling of IPv4 and IPv6 addresses and networks.
-See README file for learn how to use IPy.
-
-Further Information might be available at:
-https://github.com/haypo/python-ipy
-"""
-
-__version__ = '1.01'
-
-import bisect
-import types
-try:
-    import collections.abc as collections_abc
-except ImportError:
-    import collections as collections_abc
-
-# Definition of the Ranges for IPv4 IPs
-# this should include www.iana.org/assignments/ipv4-address-space
-# and www.iana.org/assignments/multicast-addresses
-IPv4ranges = {
-    '0':                'PUBLIC',   # fall back
-    '00000000':         'PRIVATE',  # 0/8
-    '00001010':         'PRIVATE',  # 10/8
-    '0110010001':       'CARRIER_GRADE_NAT', #100.64/10
-    '01111111':         'LOOPBACK', # 127.0/8
-    '1':                'PUBLIC',   # fall back
-    '1010100111111110': 'PRIVATE',  # 169.254/16
-    '101011000001':     'PRIVATE',  # 172.16/12
-    '1100000010101000': 'PRIVATE',  # 192.168/16
-    '111':              'RESERVED', # 224/3
-    }
-
-# Definition of the Ranges for IPv6 IPs
-# http://www.iana.org/assignments/ipv6-address-space/
-# http://www.iana.org/assignments/ipv6-unicast-address-assignments/
-# http://www.iana.org/assignments/ipv6-multicast-addresses/
-IPv6ranges = {
-    '00000000'                                      : 'RESERVED',               # ::/8
-    '0' * 96                                        : 'RESERVED',               # ::/96 Formerly IPV4COMP [RFC4291]
-    '0' * 128                                       : 'UNSPECIFIED',            # ::/128
-    '0' * 127 + '1'                                 : 'LOOPBACK',               # ::1/128
-    '0' * 80 + '1' * 16                             : 'IPV4MAP',                # ::ffff:0:0/96
-    '00000000011001001111111110011011' + '0' * 64   : 'WKP46TRANS',             # 0064:ff9b::/96 Well-Known-Prefix [RFC6052]
-    '00000001'                                      : 'UNASSIGNED',             # 0100::/8
-    '0000001'                                       : 'RESERVED',               # 0200::/7 Formerly NSAP [RFC4048]
-    '0000010'                                       : 'RESERVED',               # 0400::/7 Formerly IPX [RFC3513]
-    '0000011'                                       : 'RESERVED',               # 0600::/7
-    '00001'                                         : 'RESERVED',               # 0800::/5
-    '0001'                                          : 'RESERVED',               # 1000::/4
-    '001'                                           : 'GLOBAL-UNICAST',         # 2000::/3 [RFC4291]
-    '00100000000000010000000'                       : 'SPECIALPURPOSE',         # 2001::/23 [RFC4773]
-    '00100000000000010000000000000000'              : 'TEREDO',                 # 2001::/32 [RFC4380]
-    '00100000000000010000000000000010' + '0' * 16   : 'BMWG',                   # 2001:0002::/48 Benchmarking [RFC5180]
-    '0010000000000001000000000001'                  : 'ORCHID',                 # 2001:0010::/28 (Temp until 2014-03-21) [RFC4843]
-    '00100000000000010000001'                       : 'ALLOCATED APNIC',        # 2001:0200::/23
-    '00100000000000010000010'                       : 'ALLOCATED ARIN',         # 2001:0400::/23
-    '00100000000000010000011'                       : 'ALLOCATED RIPE NCC',     # 2001:0600::/23
-    '00100000000000010000100'                       : 'ALLOCATED RIPE NCC',     # 2001:0800::/23
-    '00100000000000010000101'                       : 'ALLOCATED RIPE NCC',     # 2001:0a00::/23
-    '00100000000000010000110'                       : 'ALLOCATED APNIC',        # 2001:0c00::/23
-    '00100000000000010000110110111000'              : 'DOCUMENTATION',          # 2001:0db8::/32 [RFC3849]
-    '00100000000000010000111'                       : 'ALLOCATED APNIC',        # 2001:0e00::/23
-    '00100000000000010001001'                       : 'ALLOCATED LACNIC',       # 2001:1200::/23
-    '00100000000000010001010'                       : 'ALLOCATED RIPE NCC',     # 2001:1400::/23
-    '00100000000000010001011'                       : 'ALLOCATED RIPE NCC',     # 2001:1600::/23
-    '00100000000000010001100'                       : 'ALLOCATED ARIN',         # 2001:1800::/23
-    '00100000000000010001101'                       : 'ALLOCATED RIPE NCC',     # 2001:1a00::/23
-    '0010000000000001000111'                        : 'ALLOCATED RIPE NCC',     # 2001:1c00::/22
-    '00100000000000010010'                          : 'ALLOCATED RIPE NCC',     # 2001:2000::/20
-    '001000000000000100110'                         : 'ALLOCATED RIPE NCC',     # 2001:3000::/21
-    '0010000000000001001110'                        : 'ALLOCATED RIPE NCC',     # 2001:3800::/22
-    '0010000000000001001111'                        : 'RESERVED',               # 2001:3c00::/22 Possible future allocation to RIPE NCC
-    '00100000000000010100000'                       : 'ALLOCATED RIPE NCC',     # 2001:4000::/23
-    '00100000000000010100001'                       : 'ALLOCATED AFRINIC',      # 2001:4200::/23
-    '00100000000000010100010'                       : 'ALLOCATED APNIC',        # 2001:4400::/23
-    '00100000000000010100011'                       : 'ALLOCATED RIPE NCC',     # 2001:4600::/23
-    '00100000000000010100100'                       : 'ALLOCATED ARIN',         # 2001:4800::/23
-    '00100000000000010100101'                       : 'ALLOCATED RIPE NCC',     # 2001:4a00::/23
-    '00100000000000010100110'                       : 'ALLOCATED RIPE NCC',     # 2001:4c00::/23
-    '00100000000000010101'                          : 'ALLOCATED RIPE NCC',     # 2001:5000::/20
-    '0010000000000001100'                           : 'ALLOCATED APNIC',        # 2001:8000::/19
-    '00100000000000011010'                          : 'ALLOCATED APNIC',        # 2001:a000::/20
-    '00100000000000011011'                          : 'ALLOCATED APNIC',        # 2001:b000::/20
-    '0010000000000010'                              : '6TO4',                   # 2002::/16 "6to4" [RFC3056]
-    '001000000000001100'                            : 'ALLOCATED RIPE NCC',     # 2003::/18
-    '001001000000'                                  : 'ALLOCATED APNIC',        # 2400::/12
-    '001001100000'                                  : 'ALLOCATED ARIN',         # 2600::/12
-    '00100110000100000000000'                       : 'ALLOCATED ARIN',         # 2610::/23
-    '00100110001000000000000'                       : 'ALLOCATED ARIN',         # 2620::/23
-    '001010000000'                                  : 'ALLOCATED LACNIC',       # 2800::/12
-    '001010100000'                                  : 'ALLOCATED RIPE NCC',     # 2a00::/12
-    '001011000000'                                  : 'ALLOCATED AFRINIC',      # 2c00::/12
-    '00101101'                                      : 'RESERVED',               # 2d00::/8
-    '0010111'                                       : 'RESERVED',               # 2e00::/7
-    '0011'                                          : 'RESERVED',               # 3000::/4
-    '010'                                           : 'RESERVED',               # 4000::/3
-    '011'                                           : 'RESERVED',               # 6000::/3
-    '100'                                           : 'RESERVED',               # 8000::/3
-    '101'                                           : 'RESERVED',               # a000::/3
-    '110'                                           : 'RESERVED',               # c000::/3
-    '1110'                                          : 'RESERVED',               # e000::/4
-    '11110'                                         : 'RESERVED',               # f000::/5
-    '111110'                                        : 'RESERVED',               # f800::/6
-    '1111110'                                       : 'ULA',                    # fc00::/7 [RFC4193]
-    '111111100'                                     : 'RESERVED',               # fe00::/9
-    '1111111010'                                    : 'LINKLOCAL',              # fe80::/10
-    '1111111011'                                    : 'RESERVED',               # fec0::/10 Formerly SITELOCAL [RFC4291]
-    '11111111'                                      : 'MULTICAST',              # ff00::/8
-    '1111111100000001'                              : 'NODE-LOCAL MULTICAST',   # ff01::/16
-    '1111111100000010'                              : 'LINK-LOCAL MULTICAST',   # ff02::/16
-    '1111111100000100'                              : 'ADMIN-LOCAL MULTICAST',  # ff04::/16
-    '1111111100000101'                              : 'SITE-LOCAL MULTICAST',   # ff05::/16
-    '1111111100001000'                              : 'ORG-LOCAL MULTICAST',    # ff08::/16
-    '1111111100001110'                              : 'GLOBAL MULTICAST',       # ff0e::/16
-    '1111111100001111'                              : 'RESERVED MULTICAST',     # ff0f::/16
-    '111111110011'                                  : 'PREFIX-BASED MULTICAST', # ff30::/12 [RFC3306]
-    '111111110111'                                  : 'RP-EMBEDDED MULTICAST',  # ff70::/12 [RFC3956]
-    }
-
-MAX_IPV4_ADDRESS = 0xffffffff
-MAX_IPV6_ADDRESS = 0xffffffffffffffffffffffffffffffff
-IPV6_TEST_MAP    = 0xffffffffffffffffffffffff00000000
-IPV6_MAP_MASK    = 0x00000000000000000000ffff00000000
-
-try:
-    INT_TYPES = (int, long)
-    STR_TYPES = (str, unicode)
-    xrange
-except NameError:
-    INT_TYPES = (int,)
-    STR_TYPES = (str,)
-    xrange = range
-
-
-class IPint(object):
-    """Handling of IP addresses returning integers.
-
-    Use class IP instead because some features are not implemented for
-    IPint."""
-
-    def __init__(self, data, ipversion=0, make_net=0):
-        """Create an instance of an IP object.
-
-        Data can be a network specification or a single IP. IP
-        addresses can be specified in all forms understood by
-        parseAddress(). The size of a network can be specified as
-
-        /prefixlen        a.b.c.0/24               2001:658:22a:cafe::/64
-        -lastIP           a.b.c.0-a.b.c.255        2001:658:22a:cafe::-2001:658:22a:cafe:ffff:ffff:ffff:ffff
-        /decimal netmask  a.b.c.d/255.255.255.0    not supported for IPv6
-
-        If no size specification is given a size of 1 address (/32 for
-        IPv4 and /128 for IPv6) is assumed.
-
-        If make_net is True, an IP address will be transformed into the network
-        address by applying the specified netmask.
-
-        >>> print(IP('127.0.0.0/8'))
-        127.0.0.0/8
-        >>> print(IP('127.0.0.0/255.0.0.0'))
-        127.0.0.0/8
-        >>> print(IP('127.0.0.0-127.255.255.255'))
-        127.0.0.0/8
-        >>> print(IP('127.0.0.1/255.0.0.0', make_net=True))
-        127.0.0.0/8
-
-        See module documentation for more examples.
-        """
-
-        # Print no Prefixlen for /32 and /128
-        self.NoPrefixForSingleIp = 1
-
-        # Do we want prefix printed by default? see _printPrefix()
-        self.WantPrefixLen = None
-
-        netbits = 0
-        prefixlen = -1
-
-        # handling of non string values in constructor
-        if isinstance(data, INT_TYPES):
-            self.ip = int(data)
-            if ipversion == 0:
-                if self.ip <= MAX_IPV4_ADDRESS:
-                    ipversion = 4
-                else:
-                    ipversion = 6
-            if ipversion == 4:
-                if self.ip > MAX_IPV4_ADDRESS:
-                    raise ValueError("IPv4 Address can't be larger than %x: %x" % (MAX_IPV4_ADDRESS, self.ip))
-                prefixlen = 32
-            elif ipversion == 6:
-                if self.ip > MAX_IPV6_ADDRESS:
-                    raise ValueError("IPv6 Address can't be larger than %x: %x" % (MAX_IPV6_ADDRESS, self.ip))
-                prefixlen = 128
-            else:
-                raise ValueError("only IPv4 and IPv6 supported")
-            self._ipversion = ipversion
-            self._prefixlen = prefixlen
-        # handle IP instance as an parameter
-        elif isinstance(data, IPint):
-            self._ipversion = data._ipversion
-            self._prefixlen = data._prefixlen
-            self.ip = data.ip
-        elif isinstance(data, STR_TYPES):
-            # TODO: refactor me!
-            # splitting of a string into IP and prefixlen et. al.
-            x = data.split('-')
-            if len(x) == 2:
-                # a.b.c.0-a.b.c.255 specification ?
-                (ip, last) = x
-                (self.ip, parsedVersion) = parseAddress(ip)
-                if parsedVersion != 4:
-                    raise ValueError("first-last notation only allowed for IPv4")
-                (last, lastversion) = parseAddress(last)
-                if lastversion != 4:
-                    raise ValueError("last address should be IPv4, too")
-                if last < self.ip:
-                    raise ValueError("last address should be larger than first")
-                size = last - self.ip
-                netbits = _count1Bits(size)
-                # make sure the broadcast is the same as the last ip
-                # otherwise it will return /16 for something like:
-                # 192.168.0.0-192.168.191.255
-                if IP('%s/%s' % (ip, 32-netbits)).broadcast().int() != last:
-                    raise ValueError("the range %s is not on a network boundary." % data)
-            elif len(x) == 1:
-                x = data.split('/')
-                # if no prefix is given use defaults
-                if len(x) == 1:
-                    ip = x[0]
-                    prefixlen = -1
-                elif len(x) > 2:
-                    raise ValueError("only one '/' allowed in IP Address")
-                else:
-                    (ip, prefixlen) = x
-                    if prefixlen.find('.') != -1:
-                        # check if the user might have used a netmask like
-                        # a.b.c.d/255.255.255.0
-                        (netmask, vers) = parseAddress(prefixlen)
-                        if vers != 4:
-                            raise ValueError("netmask must be IPv4")
-                        prefixlen = _netmaskToPrefixlen(netmask)
-            elif len(x) > 2:
-                raise ValueError("only one '-' allowed in IP Address")
-            else:
-                raise ValueError("can't parse")
-
-            (self.ip, parsedVersion) = parseAddress(ip, ipversion)
-            if ipversion == 0:
-                ipversion = parsedVersion
-            if prefixlen == -1:
-                bits = _ipVersionToLen(ipversion)
-                prefixlen = bits - netbits
-            self._ipversion = ipversion
-            self._prefixlen = int(prefixlen)
-
-            if make_net:
-                self.ip = self.ip & _prefixlenToNetmask(self._prefixlen, self._ipversion)
-
-            if not _checkNetaddrWorksWithPrefixlen(self.ip,
-            self._prefixlen, self._ipversion):
-                raise ValueError("%s has invalid prefix length (%s)" % (repr(self), self._prefixlen))
-        else:
-            raise TypeError("Unsupported data type: %s" % type(data))
-
-    def int(self):
-        """Return the first / base / network addess as an (long) integer.
-
-        The same as IP[0].
-
-        >>> "%X" % IP('10.0.0.0/8').int()
-        'A000000'
-        """
-        return self.ip
-
-    def version(self):
-        """Return the IP version of this Object.
-
-        >>> IP('10.0.0.0/8').version()
-        4
-        >>> IP('::1').version()
-        6
-        """
-        return self._ipversion
-
-    def prefixlen(self):
-        """Returns Network Prefixlen.
-
-        >>> IP('10.0.0.0/8').prefixlen()
-        8
-        """
-        return self._prefixlen
-
-    def net(self):
-        """
-        Return the base (first) address of a network as an (long) integer.
-        """
-        return self.int()
-
-    def broadcast(self):
-        """
-        Return the broadcast (last) address of a network as an (long) integer.
-
-        The same as IP[-1]."""
-        return self.int() + self.len() - 1
-
-    def _printPrefix(self, want):
-        """Prints Prefixlen/Netmask.
-
-        Not really. In fact it is our universal Netmask/Prefixlen printer.
-        This is considered an internal function.
-
-        want == 0 / None        don't return anything    1.2.3.0
-        want == 1               /prefix                  1.2.3.0/24
-        want == 2               /netmask                 1.2.3.0/255.255.255.0
-        want == 3               -lastip                  1.2.3.0-1.2.3.255
-        """
-
-        if (self._ipversion == 4 and self._prefixlen == 32) or \
-           (self._ipversion == 6 and self._prefixlen == 128):
-            if self.NoPrefixForSingleIp:
-                want = 0
-        if want == None:
-            want = self.WantPrefixLen
-            if want == None:
-                want = 1
-        if want:
-            if want == 2:
-                # this should work with IP and IPint
-                netmask = self.netmask()
-                if not isinstance(netmask, INT_TYPES):
-                    netmask = netmask.int()
-                return "/%s" % (intToIp(netmask, self._ipversion))
-            elif want == 3:
-                return "-%s" % (intToIp(self.ip + self.len() - 1, self._ipversion))
-            else:
-                # default
-                return "/%d" % (self._prefixlen)
-        else:
-            return ''
-
-        # We have different flavours to convert to:
-        # strFullsize   127.0.0.1    2001:0658:022a:cafe:0200:c0ff:fe8d:08fa
-        # strNormal     127.0.0.1    2001:658:22a:cafe:200:c0ff:fe8d:08fa
-        # strCompressed 127.0.0.1    2001:658:22a:cafe::1
-        # strHex        0x7F000001   0x20010658022ACAFE0200C0FFFE8D08FA
-        # strDec        2130706433   42540616829182469433547974687817795834
-
-    def strBin(self, wantprefixlen = None):
-        """Return a string representation as a binary value.
-
-        >>> print(IP('127.0.0.1').strBin())
-        01111111000000000000000000000001
-        >>> print(IP('2001:0658:022a:cafe:0200::1').strBin())
-        00100000000000010000011001011000000000100010101011001010111111100000001000000000000000000000000000000000000000000000000000000001
-        """
-
-        bits = _ipVersionToLen(self._ipversion)
-        if self.WantPrefixLen == None and wantprefixlen == None:
-            wantprefixlen = 0
-        ret = _intToBin(self.ip)
-        return  '0' * (bits - len(ret)) + ret + self._printPrefix(wantprefixlen)
-
-    def strCompressed(self, wantprefixlen = None):
-        """Return a string representation in compressed format using '::' Notation.
-
-        >>> IP('127.0.0.1').strCompressed()
-        '127.0.0.1'
-        >>> IP('2001:0658:022a:cafe:0200::1').strCompressed()
-        '2001:658:22a:cafe:200::1'
-        >>> IP('ffff:ffff:ffff:ffff:ffff:f:f:fffc/127').strCompressed()
-        'ffff:ffff:ffff:ffff:ffff:f:f:fffc/127'
-        """
-
-        if self.WantPrefixLen == None and wantprefixlen == None:
-            wantprefixlen = 1
-
-        if self._ipversion == 4:
-            return self.strFullsize(wantprefixlen)
-        else:
-            if self.ip >> 32 == 0xffff:
-                ipv4 = intToIp(self.ip & MAX_IPV4_ADDRESS, 4)
-                text = "::ffff:" + ipv4 + self._printPrefix(wantprefixlen)
-                return text
-            # find the longest sequence of '0'
-            hextets = [int(x, 16) for x in self.strFullsize(0).split(':')]
-            # every element of followingzeros will contain the number of zeros
-            # following the corresponding element of hextets
-            followingzeros = [0] * 8
-            for i in xrange(len(hextets)):
-                followingzeros[i] = _countFollowingZeros(hextets[i:])
-            # compressionpos is the position where we can start removing zeros
-            compressionpos = followingzeros.index(max(followingzeros))
-            if max(followingzeros) > 1:
-                # genererate string with the longest number of zeros cut out
-                # now we need hextets as strings
-                hextets = [x for x in self.strNormal(0).split(':')]
-                while compressionpos < len(hextets) and hextets[compressionpos] == '0':
-                    del(hextets[compressionpos])
-                hextets.insert(compressionpos, '')
-                if compressionpos + 1 >= len(hextets):
-                    hextets.append('')
-                if compressionpos == 0:
-                    hextets = [''] + hextets
-                return ':'.join(hextets) + self._printPrefix(wantprefixlen)
-            else:
-                return self.strNormal(0) + self._printPrefix(wantprefixlen)
-
-    def strNormal(self, wantprefixlen = None):
-        """Return a string representation in the usual format.
-
-        >>> print(IP('127.0.0.1').strNormal())
-        127.0.0.1
-        >>> print(IP('2001:0658:022a:cafe:0200::1').strNormal())
-        2001:658:22a:cafe:200:0:0:1
-        """
-
-        if self.WantPrefixLen == None and wantprefixlen == None:
-            wantprefixlen = 1
-
-        if self._ipversion == 4:
-            ret = self.strFullsize(0)
-        elif self._ipversion == 6:
-            ret = ':'.join(["%x" % x for x in [int(x, 16) for x in self.strFullsize(0).split(':')]])
-        else:
-            raise ValueError("only IPv4 and IPv6 supported")
-
-
-
-        return ret + self._printPrefix(wantprefixlen)
-
-    def strFullsize(self, wantprefixlen = None):
-        """Return a string representation in the non-mangled format.
-
-        >>> print(IP('127.0.0.1').strFullsize())
-        127.0.0.1
-        >>> print(IP('2001:0658:022a:cafe:0200::1').strFullsize())
-        2001:0658:022a:cafe:0200:0000:0000:0001
-        """
-
-        if self.WantPrefixLen == None and wantprefixlen == None:
-            wantprefixlen = 1
-
-        return intToIp(self.ip, self._ipversion) + self._printPrefix(wantprefixlen)
-
-    def strHex(self, wantprefixlen = None):
-        """Return a string representation in hex format in lower case.
-
-        >>> print(IP('127.0.0.1').strHex())
-        0x7f000001
-        >>> print(IP('2001:0658:022a:cafe:0200::1').strHex())
-        0x20010658022acafe0200000000000001
-        """
-
-        if self.WantPrefixLen == None and wantprefixlen == None:
-            wantprefixlen = 0
-
-        x = '0x%x' % self.ip
-        return x + self._printPrefix(wantprefixlen)
-
-    def strDec(self, wantprefixlen = None):
-        """Return a string representation in decimal format.
-
-        >>> print(IP('127.0.0.1').strDec())
-        2130706433
-        >>> print(IP('2001:0658:022a:cafe:0200::1').strDec())
-        42540616829182469433547762482097946625
-        """
-
-        if self.WantPrefixLen == None and wantprefixlen == None:
-            wantprefixlen = 0
-
-        x = '%d' % self.ip
-        return x + self._printPrefix(wantprefixlen)
-
-    def iptype(self):
-        """Return a description of the IP type ('PRIVATE', 'RESERVED', etc).
-
-        >>> print(IP('127.0.0.1').iptype())
-        LOOPBACK
-        >>> print(IP('192.168.1.1').iptype())
-        PRIVATE
-        >>> print(IP('195.185.1.2').iptype())
-        PUBLIC
-        >>> print(IP('::1').iptype())
-        LOOPBACK
-        >>> print(IP('2001:0658:022a:cafe:0200::1').iptype())
-        ALLOCATED RIPE NCC
-
-        The type information for IPv6 is out of sync with reality.
-        """
-
-        # this could be greatly improved
-
-        if self._ipversion == 4:
-            iprange = IPv4ranges
-        elif self._ipversion == 6:
-            iprange = IPv6ranges
-        else:
-            raise ValueError("only IPv4 and IPv6 supported")
-
-        bits = self.strBin()
-        for i in xrange(len(bits), 0, -1):
-            if bits[:i] in iprange:
-                return iprange[bits[:i]]
-        return "unknown"
-
-
-    def netmask(self):
-        """Return netmask as an integer.
-
-        >>> "%X" % IP('195.185.0.0/16').netmask().int()
-        'FFFF0000'
-        """
-
-        # TODO: unify with prefixlenToNetmask?
-        bits = _ipVersionToLen(self._ipversion)
-        locallen = bits - self._prefixlen
-
-        return ((2 ** self._prefixlen) - 1) << locallen
-
-
-    def strNetmask(self):
-        """Return netmask as an string. Mostly useful for IPv6.
-
-        >>> print(IP('195.185.0.0/16').strNetmask())
-        255.255.0.0
-        >>> print(IP('2001:0658:022a:cafe::0/64').strNetmask())
-        /64
-        """
-
-        # TODO: unify with prefixlenToNetmask?
-        # Note: call to _ipVersionToLen() also validates version is 4 or 6
-        bits = _ipVersionToLen(self._ipversion)
-        if self._ipversion == 4:
-            locallen = bits - self._prefixlen
-            return intToIp(((2 ** self._prefixlen) - 1) << locallen, 4)
-        elif self._ipversion == 6:
-            return "/%d" % self._prefixlen
-
-    def len(self):
-        """Return the length of a subnet.
-
-        >>> print(IP('195.185.1.0/28').len())
-        16
-        >>> print(IP('195.185.1.0/24').len())
-        256
-        """
-
-        bits = _ipVersionToLen(self._ipversion)
-        locallen = bits - self._prefixlen
-        return 2 ** locallen
-
-
-    def __nonzero__(self):
-        """All IPy objects should evaluate to true in boolean context.
-        Ordinarily they do, but if handling a default route expressed as
-        0.0.0.0/0, the __len__() of the object becomes 0, which is used
-        as the boolean value of the object.
-        """
-        return True
-
-    def __bool__(self):
-        return self.__nonzero__()
-
-    def __len__(self):
-        """
-        Return the length of a subnet.
-
-        Called to implement the built-in function len().
-        It will break with large IPv6 Networks.
-        Use the object's len() instead.
-        """
-        return self.len()
-
-    def __add__(self, other):
-        """Emulate numeric objects through network aggregation"""
-        if self._ipversion != other._ipversion:
-            raise ValueError("Only networks with the same IP version can be added.")
-        if self._prefixlen != other._prefixlen:
-            raise ValueError("Only networks with the same prefixlen can be added.")
-        if self._prefixlen < 1:
-            raise ValueError("Networks with a prefixlen longer than /1 can't be added.")
-        if self > other:
-            # fixed by Skinny Puppy <skin_pup-IPy@happypoo.com>
-            return other.__add__(self)
-        if other.int() - self[-1].int() != 1:
-            raise ValueError("Only adjacent networks can be added together.")
-        ret = IP(self.int(), ipversion=self._ipversion)
-        ret._prefixlen = self.prefixlen() - 1
-        if not _checkNetaddrWorksWithPrefixlen(ret.ip, ret._prefixlen,
-                                               ret._ipversion):
-            raise ValueError("The resulting %s has invalid prefix length (%s)"
-                             % (repr(ret), ret._prefixlen))
-        return ret
-
-    def __sub__(self, other):
-        """Return the prefixes that are in this IP but not in the other"""
-        return _remove_subprefix(self, other)                
-        
-    def __getitem__(self, key):
-        """Called to implement evaluation of self[key].
-
-        >>> ip=IP('127.0.0.0/30')
-        >>> for x in ip:
-        ...  print(repr(x))
-        ...
-        IP('127.0.0.0')
-        IP('127.0.0.1')
-        IP('127.0.0.2')
-        IP('127.0.0.3')
-        >>> ip[2]
-        IP('127.0.0.2')
-        >>> ip[-1]
-        IP('127.0.0.3')
-        """
-
-        if isinstance(key, slice):
-            return [self.ip + int(x) for x in xrange(*key.indices(len(self)))]
-        if not isinstance(key, INT_TYPES):
-            raise TypeError
-        if key < 0:
-            if abs(key) <= self.len():
-                key = self.len() - abs(key)
-            else:
-                raise IndexError
-        else:
-            if key >= self.len():
-                raise IndexError
-
-        return self.ip + int(key)
-
-
-
-    def __contains__(self, item):
-        """Called to implement membership test operators.
-
-        Should return true if item is in self, false otherwise. Item
-        can be other IP-objects, strings or ints.
-
-        >>> IP('195.185.1.1').strHex()
-        '0xc3b90101'
-        >>> 0xC3B90101 in IP('195.185.1.0/24')
-        True
-        >>> '127.0.0.1' in IP('127.0.0.0/24')
-        True
-        >>> IP('127.0.0.0/24') in IP('127.0.0.0/25')
-        False
-        """
-
-        if isinstance(item, IP):
-            if item._ipversion != self._ipversion:
-                return False
-        else:
-            item = IP(item)
-        if item.ip >= self.ip and item.ip < self.ip + self.len() - item.len() + 1:
-            return True
-        else:
-            return False
-
-
-    def overlaps(self, item):
-        """Check if two IP address ranges overlap.
-
-        Returns 0 if the two ranges don't overlap, 1 if the given
-        range overlaps at the end and -1 if it does at the beginning.
-
-        >>> IP('192.168.0.0/23').overlaps('192.168.1.0/24')
-        1
-        >>> IP('192.168.0.0/23').overlaps('192.168.1.255')
-        1
-        >>> IP('192.168.0.0/23').overlaps('192.168.2.0')
-        0
-        >>> IP('192.168.1.0/24').overlaps('192.168.0.0/23')
-        -1
-        """
-
-        if not isinstance(item, IP):
-            item = IP(item)
-        if item.ip >= self.ip and item.ip < self.ip + self.len():
-            return 1
-        elif self.ip >= item.ip and self.ip < item.ip + item.len():
-            return -1
-        else:
-            return 0
-
-
-    def __str__(self):
-        """Dispatch to the prefered String Representation.
-
-        Used to implement str(IP)."""
-
-        return self.strCompressed()
-
-
-    def __repr__(self):
-        """Print a representation of the Object.
-
-        Used to implement repr(IP). Returns a string which evaluates
-        to an identical Object (without the wantprefixlen stuff - see
-        module docstring.
-
-        >>> print(repr(IP('10.0.0.0/24')))
-        IP('10.0.0.0/24')
-        """
-
-        return("IPint('%s')" % (self.strCompressed(1)))
-
-
-    def __cmp__(self, other):
-        """Called by comparison operations.
-
-        Should return a negative integer if self < other, zero if self
-        == other, a positive integer if self > other.
-        
-        Order is first determined by the address family. IPv4 addresses
-        are always smaller than IPv6 addresses:
-        
-        >>> IP('10.0.0.0') < IP('2001:db8::')
-        1
-        
-        Then the first address is compared. Lower addresses are
-        always smaller:
-        
-        >>> IP('10.0.0.0') > IP('10.0.0.1')
-        0
-        >>> IP('10.0.0.0/24') > IP('10.0.0.1')
-        0
-        >>> IP('10.0.1.0') > IP('10.0.0.0/24')
-        1
-        >>> IP('10.0.1.0/24') > IP('10.0.0.0/24')
-        1
-        >>> IP('10.0.1.0/24') > IP('10.0.0.0')
-        1
-        
-        Then the prefix length is compared. Shorter prefixes are
-        considered smaller than longer prefixes:
-        
-        >>> IP('10.0.0.0/24') > IP('10.0.0.0')
-        0
-        >>> IP('10.0.0.0/24') > IP('10.0.0.0/25')
-        0
-        >>> IP('10.0.0.0/24') > IP('10.0.0.0/23')
-        1
-
-        """
-        if not isinstance(other, IPint):
-            raise TypeError
-        
-        # Lower version -> lower result
-        if self._ipversion != other._ipversion:
-            return self._ipversion < other._ipversion and -1 or 1
-        
-        # Lower start address -> lower result
-        if self.ip != other.ip:
-            return self.ip < other.ip and -1 or 1
-        
-        # Shorter prefix length -> lower result
-        if self._prefixlen != other._prefixlen:
-            return self._prefixlen < other._prefixlen and -1 or 1
-            
-        # No differences found
-        return 0
-
-    def __eq__(self, other):
-        if not isinstance(other, IPint):
-            return False
-        return self.__cmp__(other) == 0
-
-    def __ne__(self, other):
-        return not self.__eq__(other)
-
-    def __lt__(self, other):
-        return self.__cmp__(other) < 0
-
-    def __le__(self, other):
-        return self.__cmp__(other) <= 0
-
-    def __hash__(self):
-        """Called for the key object for dictionary operations, and by
-        the built-in function hash(). Should return a 32-bit integer
-        usable as a hash value for dictionary operations. The only
-        required property is that objects which compare equal have the
-        same hash value
-
-        >>> IP('10.0.0.0/24').__hash__()
-        -167772185
-        """
-
-        thehash = int(-1)
-        ip = self.ip
-        while ip > 0:
-            thehash = thehash ^ (ip & 0x7fffffff)
-            ip = ip >> 32
-        thehash = thehash ^ self._prefixlen
-        return int(thehash)
-
-
-class IP(IPint):
-    """Class for handling IP addresses and networks."""
-
-    def net(self):
-        """Return the base (first) address of a network as an IP object.
-
-        The same as IP[0].
-
-        >>> IP('10.0.0.0/8').net()
-        IP('10.0.0.0')
-        """
-        return IP(IPint.net(self), ipversion=self._ipversion)
-
-    def broadcast(self):
-        """Return the broadcast (last) address of a network as an IP object.
-
-        The same as IP[-1].
-
-        >>> IP('10.0.0.0/8').broadcast()
-        IP('10.255.255.255')
-        """
-        return IP(IPint.broadcast(self))
-
-    def netmask(self):
-        """Return netmask as an IP object.
-
-        >>> IP('10.0.0.0/8').netmask()
-        IP('255.0.0.0')
-         """
-        return IP(IPint.netmask(self), ipversion=self._ipversion)
-
-    def _getIPv4Map(self):
-        if self._ipversion != 6:
-            return None
-        if (self.ip >> 32) != 0xffff:
-            return None
-        ipv4 = self.ip & MAX_IPV4_ADDRESS
-        if self._prefixlen != 128:
-            ipv4 = '%s/%s' % (ipv4, 32-(128-self._prefixlen))
-        return IP(ipv4, ipversion=4)
-
-    def reverseNames(self):
-        """Return a list with values forming the reverse lookup.
-
-        >>> IP('213.221.113.87/32').reverseNames()
-        ['87.113.221.213.in-addr.arpa.']
-        >>> IP('213.221.112.224/30').reverseNames()
-        ['224.112.221.213.in-addr.arpa.', '225.112.221.213.in-addr.arpa.', '226.112.221.213.in-addr.arpa.', '227.112.221.213.in-addr.arpa.']
-        >>> IP('127.0.0.0/24').reverseNames()
-        ['0.0.127.in-addr.arpa.']
-        >>> IP('127.0.0.0/23').reverseNames()
-        ['0.0.127.in-addr.arpa.', '1.0.127.in-addr.arpa.']
-        >>> IP('127.0.0.0/16').reverseNames()
-        ['0.127.in-addr.arpa.']
-        >>> IP('127.0.0.0/15').reverseNames()
-        ['0.127.in-addr.arpa.', '1.127.in-addr.arpa.']
-        >>> IP('128.0.0.0/8').reverseNames()
-        ['128.in-addr.arpa.']
-        >>> IP('128.0.0.0/7').reverseNames()
-        ['128.in-addr.arpa.', '129.in-addr.arpa.']
-        >>> IP('::1:2').reverseNames()
-        ['2.0.0.0.1.ip6.arpa.']
-        """
-
-        if self._ipversion == 4:
-            ret = []
-            # TODO: Refactor. Add support for IPint objects
-            if self.len() < 2**8:
-                for x in self:
-                    ret.append(x.reverseName())
-            elif self.len() < 2**16:
-                for i in xrange(0, self.len(), 2**8):
-                    ret.append(self[i].reverseName()[2:])
-            elif self.len() < 2**24:
-                for i in xrange(0, self.len(), 2**16):
-                    ret.append(self[i].reverseName()[4:])
-            else:
-                for i in xrange(0, self.len(), 2**24):
-                    ret.append(self[i].reverseName()[6:])
-            return ret
-        elif self._ipversion == 6:
-            ipv4 = self._getIPv4Map()
-            if ipv4 is not None:
-                return ipv4.reverseNames()
-            s = "%x" % self.ip
-            if self._prefixlen % 4 != 0:
-                raise NotImplementedError("can't create IPv6 reverse names at sub nibble level")
-            s = list(s)
-            s.reverse()
-            s = '.'.join(s)
-            first_nibble_index = int(32 - (self._prefixlen // 4)) * 2
-            return ["%s.ip6.arpa." % s[first_nibble_index:]]
-        else:
-            raise ValueError("only IPv4 and IPv6 supported")
-
-    def reverseName(self):
-        """Return the value for reverse lookup/PTR records as RFC 2317 look alike.
-
-        RFC 2317 is an ugly hack which only works for sub-/24 e.g. not
-        for /23. Do not use it. Better set up a zone for every
-        address. See reverseName for a way to achieve that.
-
-        >>> print(IP('195.185.1.1').reverseName())
-        1.1.185.195.in-addr.arpa.
-        >>> print(IP('195.185.1.0/28').reverseName())
-        0-15.1.185.195.in-addr.arpa.
-        >>> IP('::1:2').reverseName()
-        '2.0.0.0.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa.'
-        >>> IP('ff02::/64').reverseName()
-        '0.0.0.0.0.0.0.0.0.0.0.0.2.0.f.f.ip6.arpa.'
-        """
-
-        if self._ipversion == 4:
-            s = self.strFullsize(0)
-            s = s.split('.')
-            s.reverse()
-            first_byte_index = int(4 - (self._prefixlen // 8))
-            if self._prefixlen % 8 != 0:
-                nibblepart = "%s-%s" % (s[3-(self._prefixlen // 8)], intToIp(self.ip + self.len() - 1, 4).split('.')[-1])
-                nibblepart += '.'
-            else:
-                nibblepart = ""
-
-            s = '.'.join(s[first_byte_index:])
-            return "%s%s.in-addr.arpa." % (nibblepart, s)
-
-        elif self._ipversion == 6:
-            ipv4 = self._getIPv4Map()
-            if ipv4 is not None:
-                return ipv4.reverseName()
-            s = '%032x' % self.ip
-            if self._prefixlen % 4 != 0:
-                nibblepart = "%s-%x" % (s[self._prefixlen:], self.ip + self.len() - 1)
-                nibblepart += '.'
-            else:
-                nibblepart = ""
-            s = list(s)
-            s.reverse()
-            s = '.'.join(s)
-            first_nibble_index = int(32 - (self._prefixlen // 4)) * 2
-            return "%s%s.ip6.arpa." % (nibblepart, s[first_nibble_index:])
-        else:
-            raise ValueError("only IPv4 and IPv6 supported")
-
-    def make_net(self, netmask):
-        """Transform a single IP address into a network specification by
-        applying the given netmask.
-
-        Returns a new IP instance.
-
-        >>> print(IP('127.0.0.1').make_net('255.0.0.0'))
-        127.0.0.0/8
-        """
-        if '/' in str(netmask):
-            raise ValueError("invalid netmask (%s)" % netmask)
-        return IP('%s/%s' % (self, netmask), make_net=True)
-
-    def __getitem__(self, key):
-        """Called to implement evaluation of self[key].
-
-        >>> ip=IP('127.0.0.0/30')
-        >>> for x in ip:
-        ...  print(str(x))
-        ...
-        127.0.0.0
-        127.0.0.1
-        127.0.0.2
-        127.0.0.3
-        >>> print(str(ip[2]))
-        127.0.0.2
-        >>> print(str(ip[-1]))
-        127.0.0.3
-        """
-        if isinstance(key, slice):
-            return [IP(IPint.__getitem__(self, x), ipversion=self._ipversion) for x in xrange(*key.indices(len(self)))]
-        return IP(IPint.__getitem__(self, key), ipversion=self._ipversion)
-
-    def __repr__(self):
-        """Print a representation of the Object.
-
-        >>> IP('10.0.0.0/8')
-        IP('10.0.0.0/8')
-        """
-
-        return("IP('%s')" % (self.strCompressed(1)))
-
-    def get_mac(self):
-        """
-        Get the 802.3 MAC address from IPv6 RFC 2464 address, in lower case.
-        Return None if the address is an IPv4 or not a IPv6 RFC 2464 address.
-
-        >>> IP('fe80::f66d:04ff:fe47:2fae').get_mac()
-        'f4:6d:04:47:2f:ae'
-        """
-        if self._ipversion != 6:
-            return None
-        if (self.ip & 0x20000ffff000000) != 0x20000fffe000000:
-            return None
-        return '%02x:%02x:%02x:%02x:%02x:%02x' % (
-            (((self.ip >> 56) & 0xff) & 0xfd),
-            (self.ip >> 48) & 0xff,
-            (self.ip >> 40) & 0xff,
-            (self.ip >> 16) & 0xff,
-            (self.ip >> 8) & 0xff,
-            self.ip & 0xff,
-        )
-
-    def v46map(self):
-        """
-        Returns the IPv6 mapped address of an IPv4 address, or the corresponding
-        IPv4 address if the IPv6 address is in the appropriate range.
-        Raises a ValueError if the IPv6 address is not translatable. See RFC 4291.
-
-        >>> IP('192.168.1.1').v46map()
-        IP('::ffff:192.168.1.1')
-        >>> IP('::ffff:192.168.1.1').v46map()
-        IP('192.168.1.1')
-        """
-        if self._ipversion == 4:
-            return IP(str(IPV6_MAP_MASK + self.ip) + 
-                          "/%s" % (self._prefixlen + 96))
-        else:
-            if self.ip & IPV6_TEST_MAP == IPV6_MAP_MASK:
-                return IP(str(self.ip - IPV6_MAP_MASK) +
-                          "/%s" % (self._prefixlen - 96))
-        raise ValueError("%s cannot be converted to an IPv4 address."
-                         % repr(self))
-
-class IPSet(collections_abc.MutableSet):
-    def __init__(self, iterable=[]):
-        # Make sure it's iterable, otherwise wrap
-        if not isinstance(iterable, collections_abc.Iterable):
-            raise TypeError("'%s' object is not iterable" % type(iterable).__name__)
-        
-        # Make sure we only accept IP objects
-        for prefix in iterable:
-            if not isinstance(prefix, IP):
-                raise ValueError('Only IP objects can be added to an IPSet')
-            
-        # Store and optimize
-        self.prefixes = iterable[:]
-        self.optimize()
-            
-    def __contains__(self, ip):
-        valid_masks = self.prefixtable.keys()
-        if isinstance(ip, IP):
-            #Don't dig through more-specific ranges
-            ip_mask = ip._prefixlen
-            valid_masks = [x for x in valid_masks if x <= ip_mask]
-        for mask in sorted(valid_masks):
-            i = bisect.bisect(self.prefixtable[mask], ip)
-            # Because of sorting order, a match can only occur in the prefix
-            # that comes before the result of the search.
-            if i and ip in self.prefixtable[mask][i - 1]:
-                return True
-
-    def __iter__(self):
-        for prefix in self.prefixes:
-            yield prefix
-    
-    def __len__(self):
-        return self.len()
-    
-    def __add__(self, other):
-        return IPSet(self.prefixes + other.prefixes)
-    
-    def __sub__(self, other):
-        new = IPSet(self.prefixes)
-        for prefix in other:
-            new.discard(prefix)
-        return new
-    
-    def __and__(self, other):
-        left = iter(self.prefixes)
-        right = iter(other.prefixes)
-        result = []
-        try:
-            l = next(left)
-            r = next(right)
-            while True:
-                # iterate over prefixes in order, keeping the smaller of the
-                # two if they overlap
-                if l in r:
-                    result.append(l)
-                    l = next(left)
-                    continue
-                elif r in l:
-                    result.append(r)
-                    r = next(right)
-                    continue
-                if l < r:
-                    l = next(left)
-                else:
-                    r = next(right)
-        except StopIteration:
-            return IPSet(result)
-
-    def __repr__(self):
-        return '%s([' % self.__class__.__name__ + ', '.join(map(repr, self.prefixes)) + '])'
-    
-    def len(self):
-        return sum(prefix.len() for prefix in self.prefixes)
-
-    def add(self, value):
-        # Make sure it's iterable, otherwise wrap
-        if not isinstance(value, collections_abc.Iterable):
-            value = [value]
-        
-        # Check type
-        for prefix in value:
-            if not isinstance(prefix, IP):
-                raise ValueError('Only IP objects can be added to an IPSet')
-        
-        # Append and optimize
-        self.prefixes.extend(value)
-        self.optimize()
-    
-    def discard(self, value):
-        # Make sure it's iterable, otherwise wrap
-        if not isinstance(value, collections_abc.Iterable):
-            value = [value]
-            
-        # This is much faster than iterating over the addresses
-        if isinstance(value, IPSet):
-            value = value.prefixes
-
-        # Remove
-        for del_prefix in value:
-            if not isinstance(del_prefix, IP):
-                raise ValueError('Only IP objects can be removed from an IPSet')
-            
-            # First check if this prefix contains anything in our list
-            found = False
-            d = 0
-            for i in range(len(self.prefixes)):
-                if self.prefixes[i - d] in del_prefix:
-                    self.prefixes.pop(i - d)
-                    d = d + 1
-                    found = True
-                
-            if found:
-                # If the prefix was bigger than an existing prefix, then it's
-                # certainly not a subset of one, so skip the rest
-                continue
-            
-            # Maybe one of our prefixes contains this prefix
-            found = False
-            for i in range(len(self.prefixes)):
-                if del_prefix in self.prefixes[i]:
-                    self.prefixes[i:i+1] = self.prefixes[i] - del_prefix
-                    break
-                
-        self.optimize()
-
-    def isdisjoint(self, other):
-        left = iter(self.prefixes)
-        right = iter(other.prefixes)
-        try:
-            l = next(left)
-            r = next(right)
-            while True:
-                if l in r or r in l:
-                    return False
-                if l < r:
-                    l = next(left)
-                else:
-                    r = next(right)
-        except StopIteration:
-            return True
-
-    def optimize(self):
-        # The algorithm below *depends* on the sort order
-        self.prefixes.sort()
-
-        # First eliminate all values that are a subset of other values
-        addrlen = len(self.prefixes)
-        i = 0
-        while i < addrlen:
-            # Everything that might be inside this prefix follows
-            # directly behind it
-            j = i+1
-            while j < addrlen and self.prefixes[j] in self.prefixes[i]:
-                # Mark for deletion by overwriting with None
-                self.prefixes[j] = None
-                j += 1
-            
-            # Continue where we left off
-            i = j
-            
-        # Try to merge as many prefixes as possible
-        run_again = True
-        while run_again:
-            # Filter None values. This happens when a subset is eliminated
-            # above, or when two prefixes are merged below
-            self.prefixes = [a for a in self.prefixes if a is not None]
-        
-            # We'll set run_again to True when we make changes that require
-            # re-evaluation of the whole list
-            run_again = False
-
-            # We can merge two prefixes that have the same version, same
-            # prefix length and differ only on the last bit of the prefix
-            addrlen = len(self.prefixes)
-            i = 0
-            while i < addrlen-1:
-                j = i + 1
-                
-                try:
-                    # The next line will throw an exception when merging
-                    # is not possible
-                    self.prefixes[i] += self.prefixes[j]
-                    self.prefixes[j] = None
-                    i = j + 1
-                    run_again = True
-                except ValueError:
-                    # Can't be merged, see if position j can be merged
-                    i = j
-
-        # O(n) insertion now by prefix means faster searching on __contains__
-        # when lots of ranges with the same length exist
-        self.prefixtable = {}
-        for address in self.prefixes:
-            try:
-                self.prefixtable[address._prefixlen].append(address)
-            except KeyError:
-                self.prefixtable[address._prefixlen] = [address]
-
-def _parseAddressIPv6(ipstr):
-    """
-    Internal function used by parseAddress() to parse IPv6 address with ':'.
-
-    >>> print(_parseAddressIPv6('::'))
-    0
-    >>> print(_parseAddressIPv6('::1'))
-    1
-    >>> print(_parseAddressIPv6('0:0:0:0:0:0:0:1'))
-    1
-    >>> print(_parseAddressIPv6('0:0:0::0:0:1'))
-    1
-    >>> print(_parseAddressIPv6('0:0:0:0:0:0:0:0'))
-    0
-    >>> print(_parseAddressIPv6('0:0:0::0:0:0'))
-    0
-
-    >>> print(_parseAddressIPv6('FEDC:BA98:7654:3210:FEDC:BA98:7654:3210'))
-    338770000845734292534325025077361652240
-    >>> print(_parseAddressIPv6('1080:0000:0000:0000:0008:0800:200C:417A'))
-    21932261930451111902915077091070067066
-    >>> print(_parseAddressIPv6('1080:0:0:0:8:800:200C:417A'))
-    21932261930451111902915077091070067066
-    >>> print(_parseAddressIPv6('1080:0::8:800:200C:417A'))
-    21932261930451111902915077091070067066
-    >>> print(_parseAddressIPv6('1080::8:800:200C:417A'))
-    21932261930451111902915077091070067066
-    >>> print(_parseAddressIPv6('FF01:0:0:0:0:0:0:43'))
-    338958331222012082418099330867817087043
-    >>> print(_parseAddressIPv6('FF01:0:0::0:0:43'))
-    338958331222012082418099330867817087043
-    >>> print(_parseAddressIPv6('FF01::43'))
-    338958331222012082418099330867817087043
-    >>> print(_parseAddressIPv6('0:0:0:0:0:0:13.1.68.3'))
-    218186755
-    >>> print(_parseAddressIPv6('::13.1.68.3'))
-    218186755
-    >>> print(_parseAddressIPv6('0:0:0:0:0:FFFF:129.144.52.38'))
-    281472855454758
-    >>> print(_parseAddressIPv6('::FFFF:129.144.52.38'))
-    281472855454758
-    >>> print(_parseAddressIPv6('1080:0:0:0:8:800:200C:417A'))
-    21932261930451111902915077091070067066
-    >>> print(_parseAddressIPv6('1080::8:800:200C:417A'))
-    21932261930451111902915077091070067066
-    >>> print(_parseAddressIPv6('::1:2:3:4:5:6'))
-    1208962713947218704138246
-    >>> print(_parseAddressIPv6('1:2:3:4:5:6::'))
-    5192455318486707404433266432802816
-    """
-
-    # Split string into a list, example:
-    #   '1080:200C::417A' => ['1080', '200C', '417A'] and fill_pos=2
-    # and fill_pos is the position of '::' in the list
-    items = []
-    index = 0
-    fill_pos = None
-    while index < len(ipstr):
-        text = ipstr[index:]
-        if text.startswith("::"):
-            if fill_pos is not None:
-                # Invalid IPv6, eg. '1::2::'
-                raise ValueError("%r: Invalid IPv6 address: more than one '::'" % ipstr)
-            fill_pos = len(items)
-            index += 2
-            continue
-        pos = text.find(':')
-        if pos == 0:
-            # Invalid IPv6, eg. '1::2:'
-            raise ValueError("%r: Invalid IPv6 address" % ipstr)
-        if pos != -1:
-            items.append(text[:pos])
-            if text[pos:pos+2] == "::":
-                index += pos
-            else:
-                index += pos+1
-
-            if index == len(ipstr):
-                # Invalid IPv6, eg. '1::2:'
-                raise ValueError("%r: Invalid IPv6 address" % ipstr)
-        else:
-            items.append(text)
-            break
-
-    if items and '.' in items[-1]:
-        # IPv6 ending with IPv4 like '::ffff:192.168.0.1'
-        if (fill_pos is not None) and not (fill_pos <= len(items)-1):
-            # Invalid IPv6: 'ffff:192.168.0.1::'
-            raise ValueError("%r: Invalid IPv6 address: '::' after IPv4" % ipstr)
-        value = parseAddress(items[-1])[0]
-        items = items[:-1] + ["%04x" % (value >> 16), "%04x" % (value & 0xffff)]
-
-    # Expand fill_pos to fill with '0'
-    # ['1','2'] with fill_pos=1 => ['1', '0', '0', '0', '0', '0', '0', '2']
-    if fill_pos is not None:
-        diff = 8 - len(items)
-        if diff <= 0:
-            raise ValueError("%r: Invalid IPv6 address: '::' is not needed" % ipstr)
-        items = items[:fill_pos] + ['0']*diff + items[fill_pos:]
-
-    # Here we have a list of 8 strings
-    if len(items) != 8:
-        # Invalid IPv6, eg. '1:2:3'
-        raise ValueError("%r: Invalid IPv6 address: should have 8 hextets" % ipstr)
-
-    # Convert strings to long integer
-    value = 0
-    index = 0
-    for item in items:
-        try:
-            item = int(item, 16)
-            error = not(0 <= item <= 0xffff)
-        except ValueError:
-            error = True
-        if error:
-            raise ValueError("%r: Invalid IPv6 address: invalid hexlet %r" % (ipstr, item))
-        value = (value << 16) + item
-        index += 1
-    return value
-
-def parseAddress(ipstr, ipversion=0):
-    """
-    Parse a string and return the corresponding IP address (as integer)
-    and a guess of the IP version.
-
-    Following address formats are recognized:
-
-    >>> def testParseAddress(address):
-    ...     ip, version = parseAddress(address)
-    ...     print(("%s (IPv%s)" % (ip, version)))
-    ...
-    >>> testParseAddress('0x0123456789abcdef')           # IPv4 if <= 0xffffffff else IPv6
-    81985529216486895 (IPv6)
-    >>> testParseAddress('123.123.123.123')              # IPv4
-    2071690107 (IPv4)
-    >>> testParseAddress('123.123')                      # 0-padded IPv4
-    2071658496 (IPv4)
-    >>> testParseAddress('127')
-    2130706432 (IPv4)
-    >>> testParseAddress('255')
-    4278190080 (IPv4)
-    >>> testParseAddress('256')
-    256 (IPv4)
-    >>> testParseAddress('108000000000000000080800200C417A')
-    21932261930451111902915077091070067066 (IPv6)
-    >>> testParseAddress('0x108000000000000000080800200C417A')
-    21932261930451111902915077091070067066 (IPv6)
-    >>> testParseAddress('1080:0000:0000:0000:0008:0800:200C:417A')
-    21932261930451111902915077091070067066 (IPv6)
-    >>> testParseAddress('1080:0:0:0:8:800:200C:417A')
-    21932261930451111902915077091070067066 (IPv6)
-    >>> testParseAddress('1080:0::8:800:200C:417A')
-    21932261930451111902915077091070067066 (IPv6)
-    >>> testParseAddress('::1')
-    1 (IPv6)
-    >>> testParseAddress('::')
-    0 (IPv6)
-    >>> testParseAddress('0:0:0:0:0:FFFF:129.144.52.38')
-    281472855454758 (IPv6)
-    >>> testParseAddress('::13.1.68.3')
-    218186755 (IPv6)
-    >>> testParseAddress('::FFFF:129.144.52.38')
-    281472855454758 (IPv6)
-    """
-
-    try:
-        hexval = int(ipstr, 16)
-    except ValueError:
-        hexval = None
-    try:
-        intval = int(ipstr, 10)
-    except ValueError:
-        intval = None
-
-    if ipstr.startswith('0x') and hexval is not None:
-        if hexval > MAX_IPV6_ADDRESS:
-            raise ValueError("IP Address can't be larger than %x: %x" % (MAX_IPV6_ADDRESS, hexval))
-        if hexval <= MAX_IPV4_ADDRESS:
-            return (hexval, 4)
-        else:
-            return (hexval, 6)
-
-    if ipstr.find(':') != -1:
-        return (_parseAddressIPv6(ipstr), 6)
-
-    elif len(ipstr) == 32 and hexval is not None:
-        # assume IPv6 in pure hexadecimal notation
-        return (hexval, 6)
-
-    elif ipstr.find('.') != -1 or (intval is not None and intval < 256 and ipversion != 6):
-        # assume IPv4  ('127' gets interpreted as '127.0.0.0')
-        bytes = ipstr.split('.')
-        if len(bytes) > 4:
-            raise ValueError("IPv4 Address with more than 4 bytes")
-        bytes += ['0'] * (4 - len(bytes))
-        bytes = [int(x) for x in bytes]
-        for x in bytes:
-            if x > 255 or x < 0:
-                raise ValueError("%r: single byte must be 0 <= byte < 256" % (ipstr))
-        return ((bytes[0] << 24) + (bytes[1] << 16) + (bytes[2] << 8) + bytes[3], 4)
-
-    elif intval is not None:
-        # we try to interprete it as a decimal digit -
-        # this ony works for numbers > 255 ... others
-        # will be interpreted as IPv4 first byte
-        if intval > MAX_IPV6_ADDRESS:
-            raise ValueError("IP Address can't be larger than %x: %x" % (MAX_IPV6_ADDRESS, intval))
-        if intval <= MAX_IPV4_ADDRESS and ipversion != 6:
-            return (intval, 4)
-        else:
-            return (intval, 6)
-
-    raise ValueError("IP Address format was invalid: %s" % ipstr)
-
-
-def intToIp(ip, version):
-    """Transform an integer string into an IP address."""
-
-    # just to be sure and hoping for Python 2.2
-    ip = int(ip)
-
-    if ip < 0:
-        raise ValueError("IPs can't be negative: %d" % (ip))
-
-    ret = ''
-    if version == 4:
-        if ip > MAX_IPV4_ADDRESS:
-            raise ValueError("IPv4 Address can't be larger than %x: %x" % (MAX_IPV4_ADDRESS, ip))
-        for l in xrange(4):
-            ret = str(ip & 0xff) + '.' + ret
-            ip = ip >> 8
-        ret = ret[:-1]
-    elif version == 6:
-        if ip > MAX_IPV6_ADDRESS:
-            raise ValueError("IPv6 Address can't be larger than %x: %x" % (MAX_IPV6_ADDRESS, ip))
-        l = "%032x" % ip
-        for x in xrange(1, 33):
-            ret = l[-x] + ret
-            if x % 4 == 0:
-                ret = ':' + ret
-        ret = ret[1:]
-    else:
-        raise ValueError("only IPv4 and IPv6 supported")
-
-    return ret
-
-def _ipVersionToLen(version):
-    """Return number of bits in address for a certain IP version.
-
-    >>> _ipVersionToLen(4)
-    32
-    >>> _ipVersionToLen(6)
-    128
-    >>> _ipVersionToLen(5)
-    Traceback (most recent call last):
-      File "<stdin>", line 1, in ?
-      File "IPy.py", line 1076, in _ipVersionToLen
-        raise ValueError("only IPv4 and IPv6 supported")
-    ValueError: only IPv4 and IPv6 supported
-    """
-
-    if version == 4:
-        return 32
-    elif version == 6:
-        return 128
-    else:
-        raise ValueError("only IPv4 and IPv6 supported")
-
-
-def _countFollowingZeros(l):
-    """Return number of elements containing 0 at the beginning of the list."""
-    if len(l) == 0:
-        return 0
-    elif l[0] != 0:
-        return 0
-    else:
-        return 1 + _countFollowingZeros(l[1:])
-
-
-_BitTable = {'0': '0000', '1': '0001', '2': '0010', '3': '0011',
-            '4': '0100', '5': '0101', '6': '0110', '7': '0111',
-            '8': '1000', '9': '1001', 'a': '1010', 'b': '1011',
-            'c': '1100', 'd': '1101', 'e': '1110', 'f': '1111'}
-
-def _intToBin(val):
-    """Return the binary representation of an integer as string."""
-
-    if val < 0:
-        raise ValueError("Only positive values allowed")
-    s = "%x" % val
-    ret = ''
-    for x in s:
-        ret += _BitTable[x]
-    # remove leading zeros
-    while ret[0] == '0' and len(ret) > 1:
-        ret = ret[1:]
-    return ret
-
-def _count1Bits(num):
-    """Find the highest bit set to 1 in an integer."""
-    ret = 0
-    while num > 0:
-        num = num >> 1
-        ret += 1
-    return ret
-
-def _count0Bits(num):
-    """Find the highest bit set to 0 in an integer."""
-
-    # this could be so easy if _count1Bits(~int(num)) would work as excepted
-    num = int(num)
-    if num < 0:
-        raise ValueError("Only positive Numbers please: %s" % (num))
-    ret = 0
-    while num > 0:
-        if num & 1 == 1:
-            break
-        num = num >> 1
-        ret += 1
-    return ret
-
-
-def _checkPrefix(ip, prefixlen, version):
-    """Check the validity of a prefix
-
-    Checks if the variant part of a prefix only has 0s, and the length is
-    correct.
-
-    >>> _checkPrefix(0x7f000000, 24, 4)
-    1
-    >>> _checkPrefix(0x7f000001, 24, 4)
-    0
-    >>> repr(_checkPrefix(0x7f000001, -1, 4))
-    'None'
-    >>> repr(_checkPrefix(0x7f000001, 33, 4))
-    'None'
-    """
-
-    # TODO: unify this v4/v6/invalid code in a function
-    bits = _ipVersionToLen(version)
-
-    if prefixlen < 0 or prefixlen > bits:
-        return None
-
-    if ip == 0:
-        zbits = bits + 1
-    else:
-        zbits = _count0Bits(ip)
-    if zbits <  bits - prefixlen:
-        return 0
-    else:
-        return 1
-
-
-def _checkNetmask(netmask, masklen):
-    """Checks if a netmask is expressable as a prefixlen."""
-
-    num = int(netmask)
-    bits = masklen
-
-    # remove zero bits at the end
-    while (num & 1) == 0 and bits != 0:
-        num = num >> 1
-        bits -= 1
-        if bits == 0:
-            break
-    # now check if the rest consists only of ones
-    while bits > 0:
-        if (num & 1) == 0:
-            raise ValueError("Netmask 0x%x can't be expressed as an prefix." % netmask)
-        num = num >> 1
-        bits -= 1
-
-
-def _checkNetaddrWorksWithPrefixlen(net, prefixlen, version):
-    """Check if a base addess of a network is compatible with a prefixlen"""
-    try:
-        return (net & _prefixlenToNetmask(prefixlen, version) == net)
-    except ValueError:
-        return False
-
-
-def _netmaskToPrefixlen(netmask):
-    """Convert an Integer representing a netmask to a prefixlen.
-
-    E.g. 0xffffff00 (255.255.255.0) returns 24
-    """
-
-    netlen = _count0Bits(netmask)
-    masklen = _count1Bits(netmask)
-    _checkNetmask(netmask, masklen)
-    return masklen - netlen
-
-
-def _prefixlenToNetmask(prefixlen, version):
-    """Return a mask of n bits as a long integer.
-
-    From 'IP address conversion functions with the builtin socket module'
-    by Alex Martelli
-    http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/66517
-    """
-    if prefixlen == 0:
-        return 0
-    elif prefixlen < 0:
-        raise ValueError("Prefixlen must be > 0")
-    return ((2<<prefixlen-1)-1) << (_ipVersionToLen(version) - prefixlen)
-
-
-def _remove_subprefix(prefix, subprefix):
-    if prefix in subprefix:
-        # Nothing left
-        return IPSet()
-    
-    if subprefix not in prefix:
-        # That prefix isn't even in here
-        return IPSet([IP(prefix)])
-    
-    # Start cutting in half, recursively
-    prefixes = [
-        IP('%s/%d' % (prefix[0], prefix._prefixlen + 1)),
-        IP('%s/%d' % (prefix[int(prefix.len() / 2)], prefix._prefixlen + 1)),
-    ]
-    if subprefix in prefixes[0]:
-        return _remove_subprefix(prefixes[0], subprefix) + IPSet([prefixes[1]])
-    else:
-        return IPSet([prefixes[0]]) + _remove_subprefix(prefixes[1], subprefix)
-
-
-if __name__ == "__main__":
-    import doctest
-    failure, nbtest = doctest.testmod()
-    if failure:
-        import sys
-        sys.exit(1)
diff --git a/lib/MultipartPostHandler.py b/lib/MultipartPostHandler.py
new file mode 100644
index 00000000..ef63afa2
--- /dev/null
+++ b/lib/MultipartPostHandler.py
@@ -0,0 +1,88 @@
+#!/usr/bin/python
+
+####
+# 06/2010 Nic Wolfe <nic@wolfeden.ca>
+# 02/2006 Will Holcomb <wholcomb@gmail.com>
+# 
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# 
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+
+import urllib
+import urllib2
+import mimetools, mimetypes
+import os, sys
+
+# Controls how sequences are uncoded. If true, elements may be given multiple values by
+#  assigning a sequence.
+doseq = 1
+
+class MultipartPostHandler(urllib2.BaseHandler):
+    handler_order = urllib2.HTTPHandler.handler_order - 10 # needs to run first
+
+    def http_request(self, request):
+        data = request.get_data()
+        if data is not None and type(data) != str:
+            v_files = []
+            v_vars = []
+            try:
+                for(key, value) in data.items():
+                    if type(value) in (file, list, tuple):
+                        v_files.append((key, value))
+                    else:
+                        v_vars.append((key, value))
+            except TypeError:
+                systype, value, traceback = sys.exc_info()
+                raise TypeError, "not a valid non-string sequence or mapping object", traceback
+
+            if len(v_files) == 0:
+                data = urllib.urlencode(v_vars, doseq)
+            else:
+                boundary, data = MultipartPostHandler.multipart_encode(v_vars, v_files)
+                contenttype = 'multipart/form-data; boundary=%s' % boundary
+                if(request.has_header('Content-Type')
+                   and request.get_header('Content-Type').find('multipart/form-data') != 0):
+                    print "Replacing %s with %s" % (request.get_header('content-type'), 'multipart/form-data')
+                request.add_unredirected_header('Content-Type', contenttype)
+
+            request.add_data(data)
+        return request
+
+    @staticmethod
+    def multipart_encode(vars, files, boundary = None, buffer = None):
+        if boundary is None:
+            boundary = mimetools.choose_boundary()
+        if buffer is None:
+            buffer = ''
+        for(key, value) in vars:
+            buffer += '--%s\r\n' % boundary
+            buffer += 'Content-Disposition: form-data; name="%s"' % key
+            buffer += '\r\n\r\n' + value + '\r\n'
+        for(key, fd) in files:
+            
+            # allow them to pass in a file or a tuple with name & data
+            if type(fd) == file:
+                name_in = fd.name
+                fd.seek(0)
+                data_in = fd.read()
+            elif type(fd) in (tuple, list):
+                name_in, data_in = fd
+                
+            filename = os.path.basename(name_in)
+            contenttype = mimetypes.guess_type(filename)[0] or 'application/octet-stream'
+            buffer += '--%s\r\n' % boundary
+            buffer += 'Content-Disposition: form-data; name="%s"; filename="%s"\r\n' % (key, filename)
+            buffer += 'Content-Type: %s\r\n' % contenttype
+            # buffer += 'Content-Length: %s\r\n' % file_size
+            buffer += '\r\n' + data_in + '\r\n'
+        buffer += '--%s--\r\n\r\n' % boundary
+        return boundary, buffer
+
+    https_request = http_request
\ No newline at end of file
diff --git a/lib/annotated_types/__init__.py b/lib/annotated_types/__init__.py
deleted file mode 100644
index 2f989504..00000000
--- a/lib/annotated_types/__init__.py
+++ /dev/null
@@ -1,396 +0,0 @@
-import math
-import sys
-from dataclasses import dataclass
-from datetime import timezone
-from typing import TYPE_CHECKING, Any, Callable, Iterator, Optional, SupportsFloat, SupportsIndex, TypeVar, Union
-
-if sys.version_info < (3, 8):
-    from typing_extensions import Protocol, runtime_checkable
-else:
-    from typing import Protocol, runtime_checkable
-
-if sys.version_info < (3, 9):
-    from typing_extensions import Annotated, Literal
-else:
-    from typing import Annotated, Literal
-
-if sys.version_info < (3, 10):
-    EllipsisType = type(Ellipsis)
-    KW_ONLY = {}
-    SLOTS = {}
-else:
-    from types import EllipsisType
-
-    KW_ONLY = {"kw_only": True}
-    SLOTS = {"slots": True}
-
-
-__all__ = (
-    'BaseMetadata',
-    'GroupedMetadata',
-    'Gt',
-    'Ge',
-    'Lt',
-    'Le',
-    'Interval',
-    'MultipleOf',
-    'MinLen',
-    'MaxLen',
-    'Len',
-    'Timezone',
-    'Predicate',
-    'LowerCase',
-    'UpperCase',
-    'IsDigits',
-    'IsFinite',
-    'IsNotFinite',
-    'IsNan',
-    'IsNotNan',
-    'IsInfinite',
-    'IsNotInfinite',
-    'doc',
-    'DocInfo',
-    '__version__',
-)
-
-__version__ = '0.6.0'
-
-
-T = TypeVar('T')
-
-
-# arguments that start with __ are considered
-# positional only
-# see https://peps.python.org/pep-0484/#positional-only-arguments
-
-
-class SupportsGt(Protocol):
-    def __gt__(self: T, __other: T) -> bool:
-        ...
-
-
-class SupportsGe(Protocol):
-    def __ge__(self: T, __other: T) -> bool:
-        ...
-
-
-class SupportsLt(Protocol):
-    def __lt__(self: T, __other: T) -> bool:
-        ...
-
-
-class SupportsLe(Protocol):
-    def __le__(self: T, __other: T) -> bool:
-        ...
-
-
-class SupportsMod(Protocol):
-    def __mod__(self: T, __other: T) -> T:
-        ...
-
-
-class SupportsDiv(Protocol):
-    def __div__(self: T, __other: T) -> T:
-        ...
-
-
-class BaseMetadata:
-    """Base class for all metadata.
-
-    This exists mainly so that implementers
-    can do `isinstance(..., BaseMetadata)` while traversing field annotations.
-    """
-
-    __slots__ = ()
-
-
-@dataclass(frozen=True, **SLOTS)
-class Gt(BaseMetadata):
-    """Gt(gt=x) implies that the value must be greater than x.
-
-    It can be used with any type that supports the ``>`` operator,
-    including numbers, dates and times, strings, sets, and so on.
-    """
-
-    gt: SupportsGt
-
-
-@dataclass(frozen=True, **SLOTS)
-class Ge(BaseMetadata):
-    """Ge(ge=x) implies that the value must be greater than or equal to x.
-
-    It can be used with any type that supports the ``>=`` operator,
-    including numbers, dates and times, strings, sets, and so on.
-    """
-
-    ge: SupportsGe
-
-
-@dataclass(frozen=True, **SLOTS)
-class Lt(BaseMetadata):
-    """Lt(lt=x) implies that the value must be less than x.
-
-    It can be used with any type that supports the ``<`` operator,
-    including numbers, dates and times, strings, sets, and so on.
-    """
-
-    lt: SupportsLt
-
-
-@dataclass(frozen=True, **SLOTS)
-class Le(BaseMetadata):
-    """Le(le=x) implies that the value must be less than or equal to x.
-
-    It can be used with any type that supports the ``<=`` operator,
-    including numbers, dates and times, strings, sets, and so on.
-    """
-
-    le: SupportsLe
-
-
-@runtime_checkable
-class GroupedMetadata(Protocol):
-    """A grouping of multiple BaseMetadata objects.
-
-    `GroupedMetadata` on its own is not metadata and has no meaning.
-    All it the the constraint and metadata should be fully expressable
-    in terms of the `BaseMetadata`'s returned by `GroupedMetadata.__iter__()`.
-
-    Concrete implementations should override `GroupedMetadata.__iter__()`
-    to add their own metadata.
-    For example:
-
-    >>> @dataclass
-    >>> class Field(GroupedMetadata):
-    >>>     gt: float | None = None
-    >>>     description: str | None = None
-    ...
-    >>>     def __iter__(self) -> Iterable[BaseMetadata]:
-    >>>         if self.gt is not None:
-    >>>             yield Gt(self.gt)
-    >>>         if self.description is not None:
-    >>>             yield Description(self.gt)
-
-    Also see the implementation of `Interval` below for an example.
-
-    Parsers should recognize this and unpack it so that it can be used
-    both with and without unpacking:
-
-    - `Annotated[int, Field(...)]` (parser must unpack Field)
-    - `Annotated[int, *Field(...)]` (PEP-646)
-    """  # noqa: trailing-whitespace
-
-    @property
-    def __is_annotated_types_grouped_metadata__(self) -> Literal[True]:
-        return True
-
-    def __iter__(self) -> Iterator[BaseMetadata]:
-        ...
-
-    if not TYPE_CHECKING:
-        __slots__ = ()  # allow subclasses to use slots
-
-        def __init_subclass__(cls, *args: Any, **kwargs: Any) -> None:
-            # Basic ABC like functionality without the complexity of an ABC
-            super().__init_subclass__(*args, **kwargs)
-            if cls.__iter__ is GroupedMetadata.__iter__:
-                raise TypeError("Can't subclass GroupedMetadata without implementing __iter__")
-
-        def __iter__(self) -> Iterator[BaseMetadata]:  # noqa: F811
-            raise NotImplementedError  # more helpful than "None has no attribute..." type errors
-
-
-@dataclass(frozen=True, **KW_ONLY, **SLOTS)
-class Interval(GroupedMetadata):
-    """Interval can express inclusive or exclusive bounds with a single object.
-
-    It accepts keyword arguments ``gt``, ``ge``, ``lt``, and/or ``le``, which
-    are interpreted the same way as the single-bound constraints.
-    """
-
-    gt: Union[SupportsGt, None] = None
-    ge: Union[SupportsGe, None] = None
-    lt: Union[SupportsLt, None] = None
-    le: Union[SupportsLe, None] = None
-
-    def __iter__(self) -> Iterator[BaseMetadata]:
-        """Unpack an Interval into zero or more single-bounds."""
-        if self.gt is not None:
-            yield Gt(self.gt)
-        if self.ge is not None:
-            yield Ge(self.ge)
-        if self.lt is not None:
-            yield Lt(self.lt)
-        if self.le is not None:
-            yield Le(self.le)
-
-
-@dataclass(frozen=True, **SLOTS)
-class MultipleOf(BaseMetadata):
-    """MultipleOf(multiple_of=x) might be interpreted in two ways:
-
-    1. Python semantics, implying ``value % multiple_of == 0``, or
-    2. JSONschema semantics, where ``int(value / multiple_of) == value / multiple_of``
-
-    We encourage users to be aware of these two common interpretations,
-    and libraries to carefully document which they implement.
-    """
-
-    multiple_of: Union[SupportsDiv, SupportsMod]
-
-
-@dataclass(frozen=True, **SLOTS)
-class MinLen(BaseMetadata):
-    """
-    MinLen() implies minimum inclusive length,
-    e.g. ``len(value) >= min_length``.
-    """
-
-    min_length: Annotated[int, Ge(0)]
-
-
-@dataclass(frozen=True, **SLOTS)
-class MaxLen(BaseMetadata):
-    """
-    MaxLen() implies maximum inclusive length,
-    e.g. ``len(value) <= max_length``.
-    """
-
-    max_length: Annotated[int, Ge(0)]
-
-
-@dataclass(frozen=True, **SLOTS)
-class Len(GroupedMetadata):
-    """
-    Len() implies that ``min_length <= len(value) <= max_length``.
-
-    Upper bound may be omitted or ``None`` to indicate no upper length bound.
-    """
-
-    min_length: Annotated[int, Ge(0)] = 0
-    max_length: Optional[Annotated[int, Ge(0)]] = None
-
-    def __iter__(self) -> Iterator[BaseMetadata]:
-        """Unpack a Len into zone or more single-bounds."""
-        if self.min_length > 0:
-            yield MinLen(self.min_length)
-        if self.max_length is not None:
-            yield MaxLen(self.max_length)
-
-
-@dataclass(frozen=True, **SLOTS)
-class Timezone(BaseMetadata):
-    """Timezone(tz=...) requires a datetime to be aware (or ``tz=None``, naive).
-
-    ``Annotated[datetime, Timezone(None)]`` must be a naive datetime.
-    ``Timezone[...]`` (the ellipsis literal) expresses that the datetime must be
-    tz-aware but any timezone is allowed.
-
-    You may also pass a specific timezone string or timezone object such as
-    ``Timezone(timezone.utc)`` or ``Timezone("Africa/Abidjan")`` to express that
-    you only allow a specific timezone, though we note that this is often
-    a symptom of poor design.
-    """
-
-    tz: Union[str, timezone, EllipsisType, None]
-
-
-@dataclass(frozen=True, **SLOTS)
-class Predicate(BaseMetadata):
-    """``Predicate(func: Callable)`` implies `func(value)` is truthy for valid values.
-
-    Users should prefer statically inspectable metadata, but if you need the full
-    power and flexibility of arbitrary runtime predicates... here it is.
-
-    We provide a few predefined predicates for common string constraints:
-    ``IsLower = Predicate(str.islower)``, ``IsUpper = Predicate(str.isupper)``, and
-    ``IsDigit = Predicate(str.isdigit)``. Users are encouraged to use methods which
-    can be given special handling, and avoid indirection like ``lambda s: s.lower()``.
-
-    Some libraries might have special logic to handle certain predicates, e.g. by
-    checking for `str.isdigit` and using its presence to both call custom logic to
-    enforce digit-only strings, and customise some generated external schema.
-
-    We do not specify what behaviour should be expected for predicates that raise
-    an exception.  For example `Annotated[int, Predicate(str.isdigit)]` might silently
-    skip invalid constraints, or statically raise an error; or it might try calling it
-    and then propogate or discard the resulting exception.
-    """
-
-    func: Callable[[Any], bool]
-
-
-@dataclass
-class Not:
-    func: Callable[[Any], bool]
-
-    def __call__(self, __v: Any) -> bool:
-        return not self.func(__v)
-
-
-_StrType = TypeVar("_StrType", bound=str)
-
-LowerCase = Annotated[_StrType, Predicate(str.islower)]
-"""
-Return True if the string is a lowercase string, False otherwise.
-
-A string is lowercase if all cased characters in the string are lowercase and there is at least one cased character in the string.
-"""  # noqa: E501
-UpperCase = Annotated[_StrType, Predicate(str.isupper)]
-"""
-Return True if the string is an uppercase string, False otherwise.
-
-A string is uppercase if all cased characters in the string are uppercase and there is at least one cased character in the string.
-"""  # noqa: E501
-IsDigits = Annotated[_StrType, Predicate(str.isdigit)]
-"""
-Return True if the string is a digit string, False otherwise.
-
-A string is a digit string if all characters in the string are digits and there is at least one character in the string.
-"""  # noqa: E501
-IsAscii = Annotated[_StrType, Predicate(str.isascii)]
-"""
-Return True if all characters in the string are ASCII, False otherwise.
-
-ASCII characters have code points in the range U+0000-U+007F. Empty string is ASCII too.
-"""
-
-_NumericType = TypeVar('_NumericType', bound=Union[SupportsFloat, SupportsIndex])
-IsFinite = Annotated[_NumericType, Predicate(math.isfinite)]
-"""Return True if x is neither an infinity nor a NaN, and False otherwise."""
-IsNotFinite = Annotated[_NumericType, Predicate(Not(math.isfinite))]
-"""Return True if x is one of infinity or NaN, and False otherwise"""
-IsNan = Annotated[_NumericType, Predicate(math.isnan)]
-"""Return True if x is a NaN (not a number), and False otherwise."""
-IsNotNan = Annotated[_NumericType, Predicate(Not(math.isnan))]
-"""Return True if x is anything but NaN (not a number), and False otherwise."""
-IsInfinite = Annotated[_NumericType, Predicate(math.isinf)]
-"""Return True if x is a positive or negative infinity, and False otherwise."""
-IsNotInfinite = Annotated[_NumericType, Predicate(Not(math.isinf))]
-"""Return True if x is neither a positive or negative infinity, and False otherwise."""
-
-try:
-    from typing_extensions import DocInfo, doc  # type: ignore [attr-defined]
-except ImportError:
-
-    @dataclass(frozen=True, **SLOTS)
-    class DocInfo:  # type: ignore [no-redef]
-        """ "
-        The return value of doc(), mainly to be used by tools that want to extract the
-        Annotated documentation at runtime.
-        """
-
-        documentation: str
-        """The documentation string passed to doc()."""
-
-    def doc(
-        documentation: str,
-    ) -> DocInfo:
-        """
-        Add documentation to a type annotation inside of Annotated.
-
-        For example:
-
-        >>> def hi(name: Annotated[int, doc("The name of the user")]) -> None: ...
-        """
-        return DocInfo(documentation)
diff --git a/lib/annotated_types/py.typed b/lib/annotated_types/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/annotated_types/test_cases.py b/lib/annotated_types/test_cases.py
deleted file mode 100644
index f54df700..00000000
--- a/lib/annotated_types/test_cases.py
+++ /dev/null
@@ -1,147 +0,0 @@
-import math
-import sys
-from datetime import date, datetime, timedelta, timezone
-from decimal import Decimal
-from typing import Any, Dict, Iterable, Iterator, List, NamedTuple, Set, Tuple
-
-if sys.version_info < (3, 9):
-    from typing_extensions import Annotated
-else:
-    from typing import Annotated
-
-import annotated_types as at
-
-
-class Case(NamedTuple):
-    """
-    A test case for `annotated_types`.
-    """
-
-    annotation: Any
-    valid_cases: Iterable[Any]
-    invalid_cases: Iterable[Any]
-
-
-def cases() -> Iterable[Case]:
-    # Gt, Ge, Lt, Le
-    yield Case(Annotated[int, at.Gt(4)], (5, 6, 1000), (4, 0, -1))
-    yield Case(Annotated[float, at.Gt(0.5)], (0.6, 0.7, 0.8, 0.9), (0.5, 0.0, -0.1))
-    yield Case(
-        Annotated[datetime, at.Gt(datetime(2000, 1, 1))],
-        [datetime(2000, 1, 2), datetime(2000, 1, 3)],
-        [datetime(2000, 1, 1), datetime(1999, 12, 31)],
-    )
-    yield Case(
-        Annotated[datetime, at.Gt(date(2000, 1, 1))],
-        [date(2000, 1, 2), date(2000, 1, 3)],
-        [date(2000, 1, 1), date(1999, 12, 31)],
-    )
-    yield Case(
-        Annotated[datetime, at.Gt(Decimal('1.123'))],
-        [Decimal('1.1231'), Decimal('123')],
-        [Decimal('1.123'), Decimal('0')],
-    )
-
-    yield Case(Annotated[int, at.Ge(4)], (4, 5, 6, 1000, 4), (0, -1))
-    yield Case(Annotated[float, at.Ge(0.5)], (0.5, 0.6, 0.7, 0.8, 0.9), (0.4, 0.0, -0.1))
-    yield Case(
-        Annotated[datetime, at.Ge(datetime(2000, 1, 1))],
-        [datetime(2000, 1, 2), datetime(2000, 1, 3)],
-        [datetime(1998, 1, 1), datetime(1999, 12, 31)],
-    )
-
-    yield Case(Annotated[int, at.Lt(4)], (0, -1), (4, 5, 6, 1000, 4))
-    yield Case(Annotated[float, at.Lt(0.5)], (0.4, 0.0, -0.1), (0.5, 0.6, 0.7, 0.8, 0.9))
-    yield Case(
-        Annotated[datetime, at.Lt(datetime(2000, 1, 1))],
-        [datetime(1999, 12, 31), datetime(1999, 12, 31)],
-        [datetime(2000, 1, 2), datetime(2000, 1, 3)],
-    )
-
-    yield Case(Annotated[int, at.Le(4)], (4, 0, -1), (5, 6, 1000))
-    yield Case(Annotated[float, at.Le(0.5)], (0.5, 0.0, -0.1), (0.6, 0.7, 0.8, 0.9))
-    yield Case(
-        Annotated[datetime, at.Le(datetime(2000, 1, 1))],
-        [datetime(2000, 1, 1), datetime(1999, 12, 31)],
-        [datetime(2000, 1, 2), datetime(2000, 1, 3)],
-    )
-
-    # Interval
-    yield Case(Annotated[int, at.Interval(gt=4)], (5, 6, 1000), (4, 0, -1))
-    yield Case(Annotated[int, at.Interval(gt=4, lt=10)], (5, 6), (4, 10, 1000, 0, -1))
-    yield Case(Annotated[float, at.Interval(ge=0.5, le=1)], (0.5, 0.9, 1), (0.49, 1.1))
-    yield Case(
-        Annotated[datetime, at.Interval(gt=datetime(2000, 1, 1), le=datetime(2000, 1, 3))],
-        [datetime(2000, 1, 2), datetime(2000, 1, 3)],
-        [datetime(2000, 1, 1), datetime(2000, 1, 4)],
-    )
-
-    yield Case(Annotated[int, at.MultipleOf(multiple_of=3)], (0, 3, 9), (1, 2, 4))
-    yield Case(Annotated[float, at.MultipleOf(multiple_of=0.5)], (0, 0.5, 1, 1.5), (0.4, 1.1))
-
-    # lengths
-
-    yield Case(Annotated[str, at.MinLen(3)], ('123', '1234', 'x' * 10), ('', '1', '12'))
-    yield Case(Annotated[str, at.Len(3)], ('123', '1234', 'x' * 10), ('', '1', '12'))
-    yield Case(Annotated[List[int], at.MinLen(3)], ([1, 2, 3], [1, 2, 3, 4], [1] * 10), ([], [1], [1, 2]))
-    yield Case(Annotated[List[int], at.Len(3)], ([1, 2, 3], [1, 2, 3, 4], [1] * 10), ([], [1], [1, 2]))
-
-    yield Case(Annotated[str, at.MaxLen(4)], ('', '1234'), ('12345', 'x' * 10))
-    yield Case(Annotated[str, at.Len(0, 4)], ('', '1234'), ('12345', 'x' * 10))
-    yield Case(Annotated[List[str], at.MaxLen(4)], ([], ['a', 'bcdef'], ['a', 'b', 'c']), (['a'] * 5, ['b'] * 10))
-    yield Case(Annotated[List[str], at.Len(0, 4)], ([], ['a', 'bcdef'], ['a', 'b', 'c']), (['a'] * 5, ['b'] * 10))
-
-    yield Case(Annotated[str, at.Len(3, 5)], ('123', '12345'), ('', '1', '12', '123456', 'x' * 10))
-    yield Case(Annotated[str, at.Len(3, 3)], ('123',), ('12', '1234'))
-
-    yield Case(Annotated[Dict[int, int], at.Len(2, 3)], [{1: 1, 2: 2}], [{}, {1: 1}, {1: 1, 2: 2, 3: 3, 4: 4}])
-    yield Case(Annotated[Set[int], at.Len(2, 3)], ({1, 2}, {1, 2, 3}), (set(), {1}, {1, 2, 3, 4}))
-    yield Case(Annotated[Tuple[int, ...], at.Len(2, 3)], ((1, 2), (1, 2, 3)), ((), (1,), (1, 2, 3, 4)))
-
-    # Timezone
-
-    yield Case(
-        Annotated[datetime, at.Timezone(None)], [datetime(2000, 1, 1)], [datetime(2000, 1, 1, tzinfo=timezone.utc)]
-    )
-    yield Case(
-        Annotated[datetime, at.Timezone(...)], [datetime(2000, 1, 1, tzinfo=timezone.utc)], [datetime(2000, 1, 1)]
-    )
-    yield Case(
-        Annotated[datetime, at.Timezone(timezone.utc)],
-        [datetime(2000, 1, 1, tzinfo=timezone.utc)],
-        [datetime(2000, 1, 1), datetime(2000, 1, 1, tzinfo=timezone(timedelta(hours=6)))],
-    )
-    yield Case(
-        Annotated[datetime, at.Timezone('Europe/London')],
-        [datetime(2000, 1, 1, tzinfo=timezone(timedelta(0), name='Europe/London'))],
-        [datetime(2000, 1, 1), datetime(2000, 1, 1, tzinfo=timezone(timedelta(hours=6)))],
-    )
-
-    # predicate types
-
-    yield Case(at.LowerCase[str], ['abc', 'foobar'], ['', 'A', 'Boom'])
-    yield Case(at.UpperCase[str], ['ABC', 'DEFO'], ['', 'a', 'abc', 'AbC'])
-    yield Case(at.IsDigits[str], ['123'], ['', 'ab', 'a1b2'])
-    yield Case(at.IsAscii[str], ['123', 'foo bar'], ['£100', '😊', 'whatever 👀'])
-
-    yield Case(Annotated[int, at.Predicate(lambda x: x % 2 == 0)], [0, 2, 4], [1, 3, 5])
-
-    yield Case(at.IsFinite[float], [1.23], [math.nan, math.inf, -math.inf])
-    yield Case(at.IsNotFinite[float], [math.nan, math.inf], [1.23])
-    yield Case(at.IsNan[float], [math.nan], [1.23, math.inf])
-    yield Case(at.IsNotNan[float], [1.23, math.inf], [math.nan])
-    yield Case(at.IsInfinite[float], [math.inf], [math.nan, 1.23])
-    yield Case(at.IsNotInfinite[float], [math.nan, 1.23], [math.inf])
-
-    # check stacked predicates
-    yield Case(at.IsInfinite[Annotated[float, at.Predicate(lambda x: x > 0)]], [math.inf], [-math.inf, 1.23, math.nan])
-
-    # doc
-    yield Case(Annotated[int, at.doc("A number")], [1, 2], [])
-
-    # custom GroupedMetadata
-    class MyCustomGroupedMetadata(at.GroupedMetadata):
-        def __iter__(self) -> Iterator[at.Predicate]:
-            yield at.Predicate(lambda x: float(x).is_integer())
-
-    yield Case(Annotated[float, MyCustomGroupedMetadata()], [0, 2.0], [0.01, 1.5])
diff --git a/lib/apscheduler/__init__.py b/lib/apscheduler/__init__.py
index 968169a9..283002b7 100644
--- a/lib/apscheduler/__init__.py
+++ b/lib/apscheduler/__init__.py
@@ -1,10 +1,5 @@
-from pkg_resources import get_distribution, DistributionNotFound
+version_info = (3, 0, 1)
+version = '3.0.1'
+release = '3.0.1'
 
-try:
-    release = get_distribution('APScheduler').version.split('-')[0]
-except DistributionNotFound:
-    release = '3.5.0'
-
-version_info = tuple(int(x) if x.isdigit() else x for x in release.split('.'))
-version = __version__ = '.'.join(str(x) for x in version_info[:3])
-del get_distribution, DistributionNotFound
+__version__ = release  # PEP 396
diff --git a/lib/apscheduler/events.py b/lib/apscheduler/events.py
index 016da03c..9418263d 100644
--- a/lib/apscheduler/events.py
+++ b/lib/apscheduler/events.py
@@ -1,33 +1,25 @@
-__all__ = ('EVENT_SCHEDULER_STARTED', 'EVENT_SCHEDULER_SHUTDOWN', 'EVENT_SCHEDULER_PAUSED',
-           'EVENT_SCHEDULER_RESUMED', 'EVENT_EXECUTOR_ADDED', 'EVENT_EXECUTOR_REMOVED',
-           'EVENT_JOBSTORE_ADDED', 'EVENT_JOBSTORE_REMOVED', 'EVENT_ALL_JOBS_REMOVED',
-           'EVENT_JOB_ADDED', 'EVENT_JOB_REMOVED', 'EVENT_JOB_MODIFIED', 'EVENT_JOB_EXECUTED',
-           'EVENT_JOB_ERROR', 'EVENT_JOB_MISSED', 'EVENT_JOB_SUBMITTED', 'EVENT_JOB_MAX_INSTANCES',
-           'SchedulerEvent', 'JobEvent', 'JobExecutionEvent', 'JobSubmissionEvent')
+__all__ = ('EVENT_SCHEDULER_START', 'EVENT_SCHEDULER_SHUTDOWN', 'EVENT_EXECUTOR_ADDED', 'EVENT_EXECUTOR_REMOVED',
+           'EVENT_JOBSTORE_ADDED', 'EVENT_JOBSTORE_REMOVED', 'EVENT_ALL_JOBS_REMOVED', 'EVENT_JOB_ADDED',
+           'EVENT_JOB_REMOVED', 'EVENT_JOB_MODIFIED', 'EVENT_JOB_EXECUTED', 'EVENT_JOB_ERROR', 'EVENT_JOB_MISSED',
+           'SchedulerEvent', 'JobEvent', 'JobExecutionEvent')
 
 
-EVENT_SCHEDULER_STARTED = EVENT_SCHEDULER_START = 2 ** 0
-EVENT_SCHEDULER_SHUTDOWN = 2 ** 1
-EVENT_SCHEDULER_PAUSED = 2 ** 2
-EVENT_SCHEDULER_RESUMED = 2 ** 3
-EVENT_EXECUTOR_ADDED = 2 ** 4
-EVENT_EXECUTOR_REMOVED = 2 ** 5
-EVENT_JOBSTORE_ADDED = 2 ** 6
-EVENT_JOBSTORE_REMOVED = 2 ** 7
-EVENT_ALL_JOBS_REMOVED = 2 ** 8
-EVENT_JOB_ADDED = 2 ** 9
-EVENT_JOB_REMOVED = 2 ** 10
-EVENT_JOB_MODIFIED = 2 ** 11
-EVENT_JOB_EXECUTED = 2 ** 12
-EVENT_JOB_ERROR = 2 ** 13
-EVENT_JOB_MISSED = 2 ** 14
-EVENT_JOB_SUBMITTED = 2 ** 15
-EVENT_JOB_MAX_INSTANCES = 2 ** 16
-EVENT_ALL = (EVENT_SCHEDULER_STARTED | EVENT_SCHEDULER_SHUTDOWN | EVENT_SCHEDULER_PAUSED |
-             EVENT_SCHEDULER_RESUMED | EVENT_EXECUTOR_ADDED | EVENT_EXECUTOR_REMOVED |
-             EVENT_JOBSTORE_ADDED | EVENT_JOBSTORE_REMOVED | EVENT_ALL_JOBS_REMOVED |
+EVENT_SCHEDULER_START = 1
+EVENT_SCHEDULER_SHUTDOWN = 2
+EVENT_EXECUTOR_ADDED = 4
+EVENT_EXECUTOR_REMOVED = 8
+EVENT_JOBSTORE_ADDED = 16
+EVENT_JOBSTORE_REMOVED = 32
+EVENT_ALL_JOBS_REMOVED = 64
+EVENT_JOB_ADDED = 128
+EVENT_JOB_REMOVED = 256
+EVENT_JOB_MODIFIED = 512
+EVENT_JOB_EXECUTED = 1024
+EVENT_JOB_ERROR = 2048
+EVENT_JOB_MISSED = 4096
+EVENT_ALL = (EVENT_SCHEDULER_START | EVENT_SCHEDULER_SHUTDOWN | EVENT_JOBSTORE_ADDED | EVENT_JOBSTORE_REMOVED |
              EVENT_JOB_ADDED | EVENT_JOB_REMOVED | EVENT_JOB_MODIFIED | EVENT_JOB_EXECUTED |
-             EVENT_JOB_ERROR | EVENT_JOB_MISSED | EVENT_JOB_SUBMITTED | EVENT_JOB_MAX_INSTANCES)
+             EVENT_JOB_ERROR | EVENT_JOB_MISSED)
 
 
 class SchedulerEvent(object):
@@ -63,21 +55,9 @@ class JobEvent(SchedulerEvent):
         self.jobstore = jobstore
 
 
-class JobSubmissionEvent(JobEvent):
-    """
-    An event that concerns the submission of a job to its executor.
-
-    :ivar scheduled_run_times: a list of datetimes when the job was intended to run
-    """
-
-    def __init__(self, code, job_id, jobstore, scheduled_run_times):
-        super(JobSubmissionEvent, self).__init__(code, job_id, jobstore)
-        self.scheduled_run_times = scheduled_run_times
-
-
 class JobExecutionEvent(JobEvent):
     """
-    An event that concerns the running of a job within its executor.
+    An event that concerns the execution of individual jobs.
 
     :ivar scheduled_run_time: the time when the job was scheduled to be run
     :ivar retval: the return value of the successfully executed job
@@ -85,8 +65,7 @@ class JobExecutionEvent(JobEvent):
     :ivar traceback: a formatted traceback for the exception
     """
 
-    def __init__(self, code, job_id, jobstore, scheduled_run_time, retval=None, exception=None,
-                 traceback=None):
+    def __init__(self, code, job_id, jobstore, scheduled_run_time, retval=None, exception=None, traceback=None):
         super(JobExecutionEvent, self).__init__(code, job_id, jobstore)
         self.scheduled_run_time = scheduled_run_time
         self.retval = retval
diff --git a/lib/apscheduler/executors/asyncio.py b/lib/apscheduler/executors/asyncio.py
index 7d45d6c1..fade99f8 100644
--- a/lib/apscheduler/executors/asyncio.py
+++ b/lib/apscheduler/executors/asyncio.py
@@ -1,52 +1,28 @@
 from __future__ import absolute_import
-
 import sys
 
 from apscheduler.executors.base import BaseExecutor, run_job
-from apscheduler.executors.base_py3 import run_coroutine_job
-from apscheduler.util import iscoroutinefunction_partial
 
 
 class AsyncIOExecutor(BaseExecutor):
     """
     Runs jobs in the default executor of the event loop.
 
-    If the job function is a native coroutine function, it is scheduled to be run directly in the
-    event loop as soon as possible. All other functions are run in the event loop's default
-    executor which is usually a thread pool.
-
     Plugin alias: ``asyncio``
     """
 
     def start(self, scheduler, alias):
         super(AsyncIOExecutor, self).start(scheduler, alias)
         self._eventloop = scheduler._eventloop
-        self._pending_futures = set()
-
-    def shutdown(self, wait=True):
-        # There is no way to honor wait=True without converting this method into a coroutine method
-        for f in self._pending_futures:
-            if not f.done():
-                f.cancel()
-
-        self._pending_futures.clear()
 
     def _do_submit_job(self, job, run_times):
         def callback(f):
-            self._pending_futures.discard(f)
             try:
                 events = f.result()
-            except BaseException:
+            except:
                 self._run_job_error(job.id, *sys.exc_info()[1:])
             else:
                 self._run_job_success(job.id, events)
 
-        if iscoroutinefunction_partial(job.func):
-            coro = run_coroutine_job(job, job._jobstore_alias, run_times, self._logger.name)
-            f = self._eventloop.create_task(coro)
-        else:
-            f = self._eventloop.run_in_executor(None, run_job, job, job._jobstore_alias, run_times,
-                                                self._logger.name)
-
+        f = self._eventloop.run_in_executor(None, run_job, job, job._jobstore_alias, run_times, self._logger.name)
         f.add_done_callback(callback)
-        self._pending_futures.add(f)
diff --git a/lib/apscheduler/executors/base.py b/lib/apscheduler/executors/base.py
index 4c09fc11..5a0a19eb 100644
--- a/lib/apscheduler/executors/base.py
+++ b/lib/apscheduler/executors/base.py
@@ -8,15 +8,13 @@ import sys
 from pytz import utc
 import six
 
-from apscheduler.events import (
-    JobExecutionEvent, EVENT_JOB_MISSED, EVENT_JOB_ERROR, EVENT_JOB_EXECUTED)
+from apscheduler.events import JobExecutionEvent, EVENT_JOB_MISSED, EVENT_JOB_ERROR, EVENT_JOB_EXECUTED
 
 
 class MaxInstancesReachedError(Exception):
     def __init__(self, job):
         super(MaxInstancesReachedError, self).__init__(
-            'Job "%s" has already reached its maximum number of instances (%d)' %
-            (job.id, job.max_instances))
+            'Job "%s" has already reached its maximum number of instances (%d)' % (job.id, job.max_instances))
 
 
 class BaseExecutor(six.with_metaclass(ABCMeta, object)):
@@ -32,14 +30,13 @@ class BaseExecutor(six.with_metaclass(ABCMeta, object)):
 
     def start(self, scheduler, alias):
         """
-        Called by the scheduler when the scheduler is being started or when the executor is being
-        added to an already running scheduler.
+        Called by the scheduler when the scheduler is being started or when the executor is being added to an already
+        running scheduler.
 
-        :param apscheduler.schedulers.base.BaseScheduler scheduler: the scheduler that is starting
-            this executor
+        :param apscheduler.schedulers.base.BaseScheduler scheduler: the scheduler that is starting this executor
         :param str|unicode alias: alias of this executor as it was assigned to the scheduler
-
         """
+
         self._scheduler = scheduler
         self._lock = scheduler._create_lock()
         self._logger = logging.getLogger('apscheduler.executors.%s' % alias)
@@ -48,8 +45,7 @@ class BaseExecutor(six.with_metaclass(ABCMeta, object)):
         """
         Shuts down this executor.
 
-        :param bool wait: ``True`` to wait until all submitted jobs
-            have been executed
+        :param bool wait: ``True`` to wait until all submitted jobs have been executed
         """
 
     def submit_job(self, job, run_times):
@@ -57,12 +53,10 @@ class BaseExecutor(six.with_metaclass(ABCMeta, object)):
         Submits job for execution.
 
         :param Job job: job to execute
-        :param list[datetime] run_times: list of datetimes specifying
-            when the job should have been run
-        :raises MaxInstancesReachedError: if the maximum number of
-            allowed instances for this job has been reached
-
+        :param list[datetime] run_times: list of datetimes specifying when the job should have been run
+        :raises MaxInstancesReachedError: if the maximum number of allowed instances for this job has been reached
         """
+
         assert self._lock is not None, 'This executor has not been started yet'
         with self._lock:
             if self._instances[job.id] >= job.max_instances:
@@ -76,71 +70,50 @@ class BaseExecutor(six.with_metaclass(ABCMeta, object)):
         """Performs the actual task of scheduling `run_job` to be called."""
 
     def _run_job_success(self, job_id, events):
-        """
-        Called by the executor with the list of generated events when :func:`run_job` has been
-        successfully called.
+        """Called by the executor with the list of generated events when `run_job` has been successfully called."""
 
-        """
         with self._lock:
             self._instances[job_id] -= 1
-            if self._instances[job_id] == 0:
-                del self._instances[job_id]
 
         for event in events:
             self._scheduler._dispatch_event(event)
 
     def _run_job_error(self, job_id, exc, traceback=None):
-        """Called by the executor with the exception if there is an error  calling `run_job`."""
+        """Called by the executor with the exception if there is an error calling `run_job`."""
+
         with self._lock:
             self._instances[job_id] -= 1
-            if self._instances[job_id] == 0:
-                del self._instances[job_id]
 
         exc_info = (exc.__class__, exc, traceback)
         self._logger.error('Error running job %s', job_id, exc_info=exc_info)
 
 
 def run_job(job, jobstore_alias, run_times, logger_name):
-    """
-    Called by executors to run the job. Returns a list of scheduler events to be dispatched by the
-    scheduler.
+    """Called by executors to run the job. Returns a list of scheduler events to be dispatched by the scheduler."""
 
-    """
     events = []
     logger = logging.getLogger(logger_name)
     for run_time in run_times:
-        # See if the job missed its run time window, and handle
-        # possible misfires accordingly
+        # See if the job missed its run time window, and handle possible misfires accordingly
         if job.misfire_grace_time is not None:
             difference = datetime.now(utc) - run_time
             grace_time = timedelta(seconds=job.misfire_grace_time)
             if difference > grace_time:
-                events.append(JobExecutionEvent(EVENT_JOB_MISSED, job.id, jobstore_alias,
-                                                run_time))
+                events.append(JobExecutionEvent(EVENT_JOB_MISSED, job.id, jobstore_alias, run_time))
                 logger.warning('Run time of job "%s" was missed by %s', job, difference)
                 continue
 
         logger.info('Running job "%s" (scheduled at %s)', job, run_time)
         try:
             retval = job.func(*job.args, **job.kwargs)
-        except BaseException:
+        except:
             exc, tb = sys.exc_info()[1:]
             formatted_tb = ''.join(format_tb(tb))
-            events.append(JobExecutionEvent(EVENT_JOB_ERROR, job.id, jobstore_alias, run_time,
-                                            exception=exc, traceback=formatted_tb))
+            events.append(JobExecutionEvent(EVENT_JOB_ERROR, job.id, jobstore_alias, run_time, exception=exc,
+                                            traceback=formatted_tb))
             logger.exception('Job "%s" raised an exception', job)
-
-            # This is to prevent cyclic references that would lead to memory leaks
-            if six.PY2:
-                sys.exc_clear()
-                del tb
-            else:
-                import traceback
-                traceback.clear_frames(tb)
-                del tb
         else:
-            events.append(JobExecutionEvent(EVENT_JOB_EXECUTED, job.id, jobstore_alias, run_time,
-                                            retval=retval))
+            events.append(JobExecutionEvent(EVENT_JOB_EXECUTED, job.id, jobstore_alias, run_time, retval=retval))
             logger.info('Job "%s" executed successfully', job)
 
     return events
diff --git a/lib/apscheduler/executors/base_py3.py b/lib/apscheduler/executors/base_py3.py
deleted file mode 100644
index 7111d2ae..00000000
--- a/lib/apscheduler/executors/base_py3.py
+++ /dev/null
@@ -1,43 +0,0 @@
-import logging
-import sys
-import traceback
-from datetime import datetime, timedelta
-from traceback import format_tb
-
-from pytz import utc
-
-from apscheduler.events import (
-    JobExecutionEvent, EVENT_JOB_MISSED, EVENT_JOB_ERROR, EVENT_JOB_EXECUTED)
-
-
-async def run_coroutine_job(job, jobstore_alias, run_times, logger_name):
-    """Coroutine version of run_job()."""
-    events = []
-    logger = logging.getLogger(logger_name)
-    for run_time in run_times:
-        # See if the job missed its run time window, and handle possible misfires accordingly
-        if job.misfire_grace_time is not None:
-            difference = datetime.now(utc) - run_time
-            grace_time = timedelta(seconds=job.misfire_grace_time)
-            if difference > grace_time:
-                events.append(JobExecutionEvent(EVENT_JOB_MISSED, job.id, jobstore_alias,
-                                                run_time))
-                logger.warning('Run time of job "%s" was missed by %s', job, difference)
-                continue
-
-        logger.info('Running job "%s" (scheduled at %s)', job, run_time)
-        try:
-            retval = await job.func(*job.args, **job.kwargs)
-        except BaseException:
-            exc, tb = sys.exc_info()[1:]
-            formatted_tb = ''.join(format_tb(tb))
-            events.append(JobExecutionEvent(EVENT_JOB_ERROR, job.id, jobstore_alias, run_time,
-                                            exception=exc, traceback=formatted_tb))
-            logger.exception('Job "%s" raised an exception', job)
-            traceback.clear_frames(tb)
-        else:
-            events.append(JobExecutionEvent(EVENT_JOB_EXECUTED, job.id, jobstore_alias, run_time,
-                                            retval=retval))
-            logger.info('Job "%s" executed successfully', job)
-
-    return events
diff --git a/lib/apscheduler/executors/debug.py b/lib/apscheduler/executors/debug.py
index ac739aeb..1f6f6b1a 100644
--- a/lib/apscheduler/executors/debug.py
+++ b/lib/apscheduler/executors/debug.py
@@ -5,8 +5,7 @@ from apscheduler.executors.base import BaseExecutor, run_job
 
 class DebugExecutor(BaseExecutor):
     """
-    A special executor that executes the target callable directly instead of deferring it to a
-    thread or process.
+    A special executor that executes the target callable directly instead of deferring it to a thread or process.
 
     Plugin alias: ``debug``
     """
@@ -14,7 +13,7 @@ class DebugExecutor(BaseExecutor):
     def _do_submit_job(self, job, run_times):
         try:
             events = run_job(job, job._jobstore_alias, run_times, self._logger.name)
-        except BaseException:
+        except:
             self._run_job_error(job.id, *sys.exc_info()[1:])
         else:
             self._run_job_success(job.id, events)
diff --git a/lib/apscheduler/executors/gevent.py b/lib/apscheduler/executors/gevent.py
index 1235bb6e..9f4db2fc 100644
--- a/lib/apscheduler/executors/gevent.py
+++ b/lib/apscheduler/executors/gevent.py
@@ -21,10 +21,9 @@ class GeventExecutor(BaseExecutor):
         def callback(greenlet):
             try:
                 events = greenlet.get()
-            except BaseException:
+            except:
                 self._run_job_error(job.id, *sys.exc_info()[1:])
             else:
                 self._run_job_success(job.id, events)
 
-        gevent.spawn(run_job, job, job._jobstore_alias, run_times, self._logger.name).\
-            link(callback)
+        gevent.spawn(run_job, job, job._jobstore_alias, run_times, self._logger.name).link(callback)
diff --git a/lib/apscheduler/executors/pool.py b/lib/apscheduler/executors/pool.py
index c85896ec..2f4ef455 100644
--- a/lib/apscheduler/executors/pool.py
+++ b/lib/apscheduler/executors/pool.py
@@ -3,11 +3,6 @@ import concurrent.futures
 
 from apscheduler.executors.base import BaseExecutor, run_job
 
-try:
-    from concurrent.futures.process import BrokenProcessPool
-except ImportError:
-    BrokenProcessPool = None
-
 
 class BasePoolExecutor(BaseExecutor):
     @abstractmethod
@@ -24,13 +19,7 @@ class BasePoolExecutor(BaseExecutor):
             else:
                 self._run_job_success(job.id, f.result())
 
-        try:
-            f = self._pool.submit(run_job, job, job._jobstore_alias, run_times, self._logger.name)
-        except BrokenProcessPool:
-            self._logger.warning('Process pool is broken; replacing pool with a fresh instance')
-            self._pool = self._pool.__class__(self._pool._max_workers)
-            f = self._pool.submit(run_job, job, job._jobstore_alias, run_times, self._logger.name)
-
+        f = self._pool.submit(run_job, job, job._jobstore_alias, run_times, self._logger.name)
         f.add_done_callback(callback)
 
     def shutdown(self, wait=True):
@@ -44,13 +33,10 @@ class ThreadPoolExecutor(BasePoolExecutor):
     Plugin alias: ``threadpool``
 
     :param max_workers: the maximum number of spawned threads.
-    :param pool_kwargs: dict of keyword arguments to pass to the underlying
-        ThreadPoolExecutor constructor
     """
 
-    def __init__(self, max_workers=10, pool_kwargs=None):
-        pool_kwargs = pool_kwargs or {}
-        pool = concurrent.futures.ThreadPoolExecutor(int(max_workers), **pool_kwargs)
+    def __init__(self, max_workers=10):
+        pool = concurrent.futures.ThreadPoolExecutor(int(max_workers))
         super(ThreadPoolExecutor, self).__init__(pool)
 
 
@@ -61,11 +47,8 @@ class ProcessPoolExecutor(BasePoolExecutor):
     Plugin alias: ``processpool``
 
     :param max_workers: the maximum number of spawned processes.
-    :param pool_kwargs: dict of keyword arguments to pass to the underlying
-        ProcessPoolExecutor constructor
     """
 
-    def __init__(self, max_workers=10, pool_kwargs=None):
-        pool_kwargs = pool_kwargs or {}
-        pool = concurrent.futures.ProcessPoolExecutor(int(max_workers), **pool_kwargs)
+    def __init__(self, max_workers=10):
+        pool = concurrent.futures.ProcessPoolExecutor(int(max_workers))
         super(ProcessPoolExecutor, self).__init__(pool)
diff --git a/lib/apscheduler/executors/tornado.py b/lib/apscheduler/executors/tornado.py
deleted file mode 100644
index 3b97eec9..00000000
--- a/lib/apscheduler/executors/tornado.py
+++ /dev/null
@@ -1,54 +0,0 @@
-from __future__ import absolute_import
-
-import sys
-from concurrent.futures import ThreadPoolExecutor
-
-from tornado.gen import convert_yielded
-
-from apscheduler.executors.base import BaseExecutor, run_job
-
-try:
-    from apscheduler.executors.base_py3 import run_coroutine_job
-    from apscheduler.util import iscoroutinefunction_partial
-except ImportError:
-    def iscoroutinefunction_partial(func):
-        return False
-
-
-class TornadoExecutor(BaseExecutor):
-    """
-    Runs jobs either in a thread pool or directly on the I/O loop.
-
-    If the job function is a native coroutine function, it is scheduled to be run directly in the
-    I/O loop as soon as possible. All other functions are run in a thread pool.
-
-    Plugin alias: ``tornado``
-
-    :param int max_workers: maximum number of worker threads in the thread pool
-    """
-
-    def __init__(self, max_workers=10):
-        super(TornadoExecutor, self).__init__()
-        self.executor = ThreadPoolExecutor(max_workers)
-
-    def start(self, scheduler, alias):
-        super(TornadoExecutor, self).start(scheduler, alias)
-        self._ioloop = scheduler._ioloop
-
-    def _do_submit_job(self, job, run_times):
-        def callback(f):
-            try:
-                events = f.result()
-            except BaseException:
-                self._run_job_error(job.id, *sys.exc_info()[1:])
-            else:
-                self._run_job_success(job.id, events)
-
-        if iscoroutinefunction_partial(job.func):
-            f = run_coroutine_job(job, job._jobstore_alias, run_times, self._logger.name)
-        else:
-            f = self.executor.submit(run_job, job, job._jobstore_alias, run_times,
-                                     self._logger.name)
-
-        f = convert_yielded(f)
-        f.add_done_callback(callback)
diff --git a/lib/apscheduler/executors/twisted.py b/lib/apscheduler/executors/twisted.py
index c7bcf647..29217221 100644
--- a/lib/apscheduler/executors/twisted.py
+++ b/lib/apscheduler/executors/twisted.py
@@ -21,5 +21,5 @@ class TwistedExecutor(BaseExecutor):
             else:
                 self._run_job_error(job.id, result.value, result.tb)
 
-        self._reactor.getThreadPool().callInThreadWithCallback(
-            callback, run_job, job, job._jobstore_alias, run_times, self._logger.name)
+        self._reactor.getThreadPool().callInThreadWithCallback(callback, run_job, job, job._jobstore_alias, run_times,
+                                                               self._logger.name)
diff --git a/lib/apscheduler/job.py b/lib/apscheduler/job.py
index 445d9a86..f5639dae 100644
--- a/lib/apscheduler/job.py
+++ b/lib/apscheduler/job.py
@@ -1,17 +1,11 @@
-from inspect import ismethod, isclass
+from collections import Iterable, Mapping
 from uuid import uuid4
 
 import six
 
 from apscheduler.triggers.base import BaseTrigger
-from apscheduler.util import (
-    ref_to_obj, obj_to_ref, datetime_repr, repr_escape, get_callable_name, check_callable_args,
-    convert_to_datetime)
-
-try:
-    from collections.abc import Iterable, Mapping
-except ImportError:
-    from collections import Iterable, Mapping
+from apscheduler.util import ref_to_obj, obj_to_ref, datetime_repr, repr_escape, get_callable_name, check_callable_args, \
+    convert_to_datetime
 
 
 class Job(object):
@@ -27,20 +21,13 @@ class Job(object):
     :var bool coalesce: whether to only run the job once when several run times are due
     :var trigger: the trigger object that controls the schedule of this job
     :var str executor: the name of the executor that will run this job
-    :var int misfire_grace_time: the time (in seconds) how much this job's execution is allowed to
-        be late (``None`` means "allow the job to run no matter how late it is")
-    :var int max_instances: the maximum number of concurrently executing instances allowed for this
-        job
+    :var int misfire_grace_time: the time (in seconds) how much this job's execution is allowed to be late
+    :var int max_instances: the maximum number of concurrently executing instances allowed for this job
     :var datetime.datetime next_run_time: the next scheduled run time of this job
-
-    .. note::
-        The ``misfire_grace_time`` has some non-obvious effects on job execution. See the
-        :ref:`missed-job-executions` section in the documentation for an in-depth explanation.
     """
 
-    __slots__ = ('_scheduler', '_jobstore_alias', 'id', 'trigger', 'executor', 'func', 'func_ref',
-                 'args', 'kwargs', 'name', 'misfire_grace_time', 'coalesce', 'max_instances',
-                 'next_run_time', '__weakref__')
+    __slots__ = ('_scheduler', '_jobstore_alias', 'id', 'trigger', 'executor', 'func', 'func_ref', 'args', 'kwargs',
+                 'name', 'misfire_grace_time', 'coalesce', 'max_instances', 'next_run_time')
 
     def __init__(self, scheduler, id=None, **kwargs):
         super(Job, self).__init__()
@@ -51,69 +38,53 @@ class Job(object):
     def modify(self, **changes):
         """
         Makes the given changes to this job and saves it in the associated job store.
-
         Accepted keyword arguments are the same as the variables on this class.
 
         .. seealso:: :meth:`~apscheduler.schedulers.base.BaseScheduler.modify_job`
-
-        :return Job: this job instance
-
         """
+
         self._scheduler.modify_job(self.id, self._jobstore_alias, **changes)
-        return self
 
     def reschedule(self, trigger, **trigger_args):
         """
         Shortcut for switching the trigger on this job.
 
         .. seealso:: :meth:`~apscheduler.schedulers.base.BaseScheduler.reschedule_job`
-
-        :return Job: this job instance
-
         """
+
         self._scheduler.reschedule_job(self.id, self._jobstore_alias, trigger, **trigger_args)
-        return self
 
     def pause(self):
         """
         Temporarily suspend the execution of this job.
 
         .. seealso:: :meth:`~apscheduler.schedulers.base.BaseScheduler.pause_job`
-
-        :return Job: this job instance
-
         """
+
         self._scheduler.pause_job(self.id, self._jobstore_alias)
-        return self
 
     def resume(self):
         """
         Resume the schedule of this job if previously paused.
 
         .. seealso:: :meth:`~apscheduler.schedulers.base.BaseScheduler.resume_job`
-
-        :return Job: this job instance
-
         """
+
         self._scheduler.resume_job(self.id, self._jobstore_alias)
-        return self
 
     def remove(self):
         """
         Unschedules this job and removes it from its associated job store.
 
         .. seealso:: :meth:`~apscheduler.schedulers.base.BaseScheduler.remove_job`
-
         """
+
         self._scheduler.remove_job(self.id, self._jobstore_alias)
 
     @property
     def pending(self):
-        """
-        Returns ``True`` if the referenced job is still waiting to be added to its designated job
-        store.
+        """Returns ``True`` if the referenced job is still waiting to be added to its designated job store."""
 
-        """
         return self._jobstore_alias is None
 
     #
@@ -126,8 +97,8 @@ class Job(object):
 
         :type now: datetime.datetime
         :rtype: list[datetime.datetime]
-
         """
+
         run_times = []
         next_run_time = self.next_run_time
         while next_run_time and next_run_time <= now:
@@ -137,11 +108,8 @@ class Job(object):
         return run_times
 
     def _modify(self, **changes):
-        """
-        Validates the changes to the Job and makes the modifications if and only if all of them
-        validate.
+        """Validates the changes to the Job and makes the modifications if and only if all of them validate."""
 
-        """
         approved = {}
 
         if 'id' in changes:
@@ -157,7 +125,7 @@ class Job(object):
             args = changes.pop('args') if 'args' in changes else self.args
             kwargs = changes.pop('kwargs') if 'kwargs' in changes else self.kwargs
 
-            if isinstance(func, six.string_types):
+            if isinstance(func, str):
                 func_ref = func
                 func = ref_to_obj(func)
             elif callable(func):
@@ -209,8 +177,7 @@ class Job(object):
         if 'trigger' in changes:
             trigger = changes.pop('trigger')
             if not isinstance(trigger, BaseTrigger):
-                raise TypeError('Expected a trigger instance, got %s instead' %
-                                trigger.__class__.__name__)
+                raise TypeError('Expected a trigger instance, got %s instead' % trigger.__class__.__name__)
 
             approved['trigger'] = trigger
 
@@ -222,12 +189,10 @@ class Job(object):
 
         if 'next_run_time' in changes:
             value = changes.pop('next_run_time')
-            approved['next_run_time'] = convert_to_datetime(value, self._scheduler.timezone,
-                                                            'next_run_time')
+            approved['next_run_time'] = convert_to_datetime(value, self._scheduler.timezone, 'next_run_time')
 
         if changes:
-            raise AttributeError('The following are not modifiable attributes of Job: %s' %
-                                 ', '.join(changes))
+            raise AttributeError('The following are not modifiable attributes of Job: %s' % ', '.join(changes))
 
         for key, value in six.iteritems(approved):
             setattr(self, key, value)
@@ -235,18 +200,9 @@ class Job(object):
     def __getstate__(self):
         # Don't allow this Job to be serialized if the function reference could not be determined
         if not self.func_ref:
-            raise ValueError(
-                'This Job cannot be serialized since the reference to its callable (%r) could not '
-                'be determined. Consider giving a textual reference (module:function name) '
-                'instead.' % (self.func,))
-
-        # Instance methods cannot survive serialization as-is, so store the "self" argument
-        # explicitly
-        func = self.func
-        if ismethod(func) and not isclass(func.__self__) and obj_to_ref(func) == self.func_ref:
-            args = (func.__self__,) + tuple(self.args)
-        else:
-            args = self.args
+            raise ValueError('This Job cannot be serialized since the reference to its callable (%r) could not be '
+                             'determined. Consider giving a textual reference (module:function name) instead.' %
+                             (self.func,))
 
         return {
             'version': 1,
@@ -254,7 +210,7 @@ class Job(object):
             'func': self.func_ref,
             'trigger': self.trigger,
             'executor': self.executor,
-            'args': args,
+            'args': self.args,
             'kwargs': self.kwargs,
             'name': self.name,
             'misfire_grace_time': self.misfire_grace_time,
@@ -265,8 +221,7 @@ class Job(object):
 
     def __setstate__(self, state):
         if state.get('version', 1) > 1:
-            raise ValueError('Job has version %s, but only version 1 can be handled' %
-                             state['version'])
+            raise ValueError('Job has version %s, but only version 1 can be handled' % state['version'])
 
         self.id = state['id']
         self.func_ref = state['func']
@@ -290,13 +245,8 @@ class Job(object):
         return '<Job (id=%s name=%s)>' % (repr_escape(self.id), repr_escape(self.name))
 
     def __str__(self):
-        return repr_escape(self.__unicode__())
+        return '%s (trigger: %s, next run at: %s)' % (repr_escape(self.name), repr_escape(str(self.trigger)),
+                                                      datetime_repr(self.next_run_time))
 
     def __unicode__(self):
-        if hasattr(self, 'next_run_time'):
-            status = ('next run at: ' + datetime_repr(self.next_run_time) if
-                      self.next_run_time else 'paused')
-        else:
-            status = 'pending'
-
-        return u'%s (trigger: %s, %s)' % (self.name, self.trigger, status)
+        return six.u('%s (trigger: %s, next run at: %s)') % (self.name, self.trigger, datetime_repr(self.next_run_time))
diff --git a/lib/apscheduler/jobstores/base.py b/lib/apscheduler/jobstores/base.py
index 9cff66c4..d9f7147b 100644
--- a/lib/apscheduler/jobstores/base.py
+++ b/lib/apscheduler/jobstores/base.py
@@ -8,27 +8,23 @@ class JobLookupError(KeyError):
     """Raised when the job store cannot find a job for update or removal."""
 
     def __init__(self, job_id):
-        super(JobLookupError, self).__init__(u'No job by the id of %s was found' % job_id)
+        super(JobLookupError, self).__init__(six.u('No job by the id of %s was found') % job_id)
 
 
 class ConflictingIdError(KeyError):
     """Raised when the uniqueness of job IDs is being violated."""
 
     def __init__(self, job_id):
-        super(ConflictingIdError, self).__init__(
-            u'Job identifier (%s) conflicts with an existing job' % job_id)
+        super(ConflictingIdError, self).__init__(six.u('Job identifier (%s) conflicts with an existing job') % job_id)
 
 
 class TransientJobError(ValueError):
-    """
-    Raised when an attempt to add transient (with no func_ref) job to a persistent job store is
-    detected.
-    """
+    """Raised when an attempt to add transient (with no func_ref) job to a persistent job store is detected."""
 
     def __init__(self, job_id):
         super(TransientJobError, self).__init__(
-            u'Job (%s) cannot be added to this job store because a reference to the callable '
-            u'could not be determined.' % job_id)
+            six.u('Job (%s) cannot be added to this job store because a reference to the callable could not be '
+                  'determined.') % job_id)
 
 
 class BaseJobStore(six.with_metaclass(ABCMeta)):
@@ -40,11 +36,10 @@ class BaseJobStore(six.with_metaclass(ABCMeta)):
 
     def start(self, scheduler, alias):
         """
-        Called by the scheduler when the scheduler is being started or when the job store is being
-        added to an already running scheduler.
+        Called by the scheduler when the scheduler is being started or when the job store is being added to an already
+        running scheduler.
 
-        :param apscheduler.schedulers.base.BaseScheduler scheduler: the scheduler that is starting
-            this job store
+        :param apscheduler.schedulers.base.BaseScheduler scheduler: the scheduler that is starting this job store
         :param str|unicode alias: alias of this job store as it was assigned to the scheduler
         """
 
@@ -55,22 +50,13 @@ class BaseJobStore(six.with_metaclass(ABCMeta)):
     def shutdown(self):
         """Frees any resources still bound to this job store."""
 
-    def _fix_paused_jobs_sorting(self, jobs):
-        for i, job in enumerate(jobs):
-            if job.next_run_time is not None:
-                if i > 0:
-                    paused_jobs = jobs[:i]
-                    del jobs[:i]
-                    jobs.extend(paused_jobs)
-                break
-
     @abstractmethod
     def lookup_job(self, job_id):
         """
         Returns a specific job, or ``None`` if it isn't found..
 
-        The job store is responsible for setting the ``scheduler`` and ``jobstore`` attributes of
-        the returned job to point to the scheduler and itself, respectively.
+        The job store is responsible for setting the ``scheduler`` and ``jobstore`` attributes of the returned job to
+        point to the scheduler and itself, respectively.
 
         :param str|unicode job_id: identifier of the job
         :rtype: Job
@@ -89,8 +75,7 @@ class BaseJobStore(six.with_metaclass(ABCMeta)):
     @abstractmethod
     def get_next_run_time(self):
         """
-        Returns the earliest run time of all the jobs stored in this job store, or ``None`` if
-        there are no active jobs.
+        Returns the earliest run time of all the jobs stored in this job store, or ``None`` if there are no active jobs.
 
         :rtype: datetime.datetime
         """
@@ -98,12 +83,11 @@ class BaseJobStore(six.with_metaclass(ABCMeta)):
     @abstractmethod
     def get_all_jobs(self):
         """
-        Returns a list of all jobs in this job store.
-        The returned jobs should be sorted by next run time (ascending).
-        Paused jobs (next_run_time == None) should be sorted last.
+        Returns a list of all jobs in this job store. The returned jobs should be sorted by next run time (ascending).
+        Paused jobs (next_run_time is None) should be sorted last.
 
-        The job store is responsible for setting the ``scheduler`` and ``jobstore`` attributes of
-        the returned jobs to point to the scheduler and itself, respectively.
+        The job store is responsible for setting the ``scheduler`` and ``jobstore`` attributes of the returned jobs to
+        point to the scheduler and itself, respectively.
 
         :rtype: list[Job]
         """
diff --git a/lib/apscheduler/jobstores/memory.py b/lib/apscheduler/jobstores/memory.py
index abfe7c6c..645391f3 100644
--- a/lib/apscheduler/jobstores/memory.py
+++ b/lib/apscheduler/jobstores/memory.py
@@ -13,8 +13,7 @@ class MemoryJobStore(BaseJobStore):
 
     def __init__(self):
         super(MemoryJobStore, self).__init__()
-        # list of (job, timestamp), sorted by next_run_time and job id (ascending)
-        self._jobs = []
+        self._jobs = []  # list of (job, timestamp), sorted by next_run_time and job id (ascending)
         self._jobs_index = {}  # id -> (job, timestamp) lookup table
 
     def lookup_job(self, job_id):
@@ -81,13 +80,13 @@ class MemoryJobStore(BaseJobStore):
 
     def _get_job_index(self, timestamp, job_id):
         """
-        Returns the index of the given job, or if it's not found, the index where the job should be
-        inserted based on the given timestamp.
+        Returns the index of the given job, or if it's not found, the index where the job should be inserted based on
+        the given timestamp.
 
         :type timestamp: int
         :type job_id: str
-
         """
+
         lo, hi = 0, len(self._jobs)
         timestamp = float('inf') if timestamp is None else timestamp
         while lo < hi:
diff --git a/lib/apscheduler/jobstores/mongodb.py b/lib/apscheduler/jobstores/mongodb.py
index 5a00f941..ff762f7e 100644
--- a/lib/apscheduler/jobstores/mongodb.py
+++ b/lib/apscheduler/jobstores/mongodb.py
@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-import warnings
 
 from apscheduler.jobstores.base import BaseJobStore, JobLookupError, ConflictingIdError
 from apscheduler.util import maybe_ref, datetime_to_utc_timestamp, utc_timestamp_to_datetime
@@ -20,18 +19,16 @@ except ImportError:  # pragma: nocover
 
 class MongoDBJobStore(BaseJobStore):
     """
-    Stores jobs in a MongoDB database. Any leftover keyword arguments are directly passed to
-    pymongo's `MongoClient
+    Stores jobs in a MongoDB database. Any leftover keyword arguments are directly passed to pymongo's `MongoClient
     <http://api.mongodb.org/python/current/api/pymongo/mongo_client.html#pymongo.mongo_client.MongoClient>`_.
 
     Plugin alias: ``mongodb``
 
     :param str database: database to store jobs in
     :param str collection: collection to store jobs in
-    :param client: a :class:`~pymongo.mongo_client.MongoClient` instance to use instead of
-        providing connection arguments
-    :param int pickle_protocol: pickle protocol level to use (for serialization), defaults to the
-        highest available
+    :param client: a :class:`~pymongo.mongo_client.MongoClient` instance to use instead of providing connection
+                   arguments
+    :param int pickle_protocol: pickle protocol level to use (for serialization), defaults to the highest available
     """
 
     def __init__(self, database='apscheduler', collection='jobs', client=None,
@@ -45,22 +42,13 @@ class MongoDBJobStore(BaseJobStore):
             raise ValueError('The "collection" parameter must not be empty')
 
         if client:
-            self.client = maybe_ref(client)
+            self.connection = maybe_ref(client)
         else:
             connect_args.setdefault('w', 1)
-            self.client = MongoClient(**connect_args)
+            self.connection = MongoClient(**connect_args)
 
-        self.collection = self.client[database][collection]
-
-    def start(self, scheduler, alias):
-        super(MongoDBJobStore, self).start(scheduler, alias)
-        self.collection.create_index('next_run_time', sparse=True)
-
-    @property
-    def connection(self):
-        warnings.warn('The "connection" member is deprecated -- use "client" instead',
-                      DeprecationWarning)
-        return self.client
+        self.collection = self.connection[database][collection]
+        self.collection.ensure_index('next_run_time', sparse=True)
 
     def lookup_job(self, job_id):
         document = self.collection.find_one(job_id, ['job_state'])
@@ -71,19 +59,16 @@ class MongoDBJobStore(BaseJobStore):
         return self._get_jobs({'next_run_time': {'$lte': timestamp}})
 
     def get_next_run_time(self):
-        document = self.collection.find_one({'next_run_time': {'$ne': None}},
-                                            projection=['next_run_time'],
+        document = self.collection.find_one({'next_run_time': {'$ne': None}}, fields=['next_run_time'],
                                             sort=[('next_run_time', ASCENDING)])
         return utc_timestamp_to_datetime(document['next_run_time']) if document else None
 
     def get_all_jobs(self):
-        jobs = self._get_jobs({})
-        self._fix_paused_jobs_sorting(jobs)
-        return jobs
+        return self._get_jobs({})
 
     def add_job(self, job):
         try:
-            self.collection.insert_one({
+            self.collection.insert({
                 '_id': job.id,
                 'next_run_time': datetime_to_utc_timestamp(job.next_run_time),
                 'job_state': Binary(pickle.dumps(job.__getstate__(), self.pickle_protocol))
@@ -96,20 +81,20 @@ class MongoDBJobStore(BaseJobStore):
             'next_run_time': datetime_to_utc_timestamp(job.next_run_time),
             'job_state': Binary(pickle.dumps(job.__getstate__(), self.pickle_protocol))
         }
-        result = self.collection.update_one({'_id': job.id}, {'$set': changes})
-        if result and result.matched_count == 0:
-            raise JobLookupError(job.id)
+        result = self.collection.update({'_id': job.id}, {'$set': changes})
+        if result and result['n'] == 0:
+            raise JobLookupError(id)
 
     def remove_job(self, job_id):
-        result = self.collection.delete_one({'_id': job_id})
-        if result and result.deleted_count == 0:
+        result = self.collection.remove(job_id)
+        if result and result['n'] == 0:
             raise JobLookupError(job_id)
 
     def remove_all_jobs(self):
-        self.collection.delete_many({})
+        self.collection.remove()
 
     def shutdown(self):
-        self.client.close()
+        self.connection.disconnect()
 
     def _reconstitute_job(self, job_state):
         job_state = pickle.loads(job_state)
@@ -122,20 +107,18 @@ class MongoDBJobStore(BaseJobStore):
     def _get_jobs(self, conditions):
         jobs = []
         failed_job_ids = []
-        for document in self.collection.find(conditions, ['_id', 'job_state'],
-                                             sort=[('next_run_time', ASCENDING)]):
+        for document in self.collection.find(conditions, ['_id', 'job_state'], sort=[('next_run_time', ASCENDING)]):
             try:
                 jobs.append(self._reconstitute_job(document['job_state']))
-            except BaseException:
-                self._logger.exception('Unable to restore job "%s" -- removing it',
-                                       document['_id'])
+            except:
+                self._logger.exception('Unable to restore job "%s" -- removing it', document['_id'])
                 failed_job_ids.append(document['_id'])
 
         # Remove all the jobs we failed to restore
         if failed_job_ids:
-            self.collection.delete_many({'_id': {'$in': failed_job_ids}})
+            self.collection.remove({'_id': {'$in': failed_job_ids}})
 
         return jobs
 
     def __repr__(self):
-        return '<%s (client=%s)>' % (self.__class__.__name__, self.client)
+        return '<%s (client=%s)>' % (self.__class__.__name__, self.connection)
diff --git a/lib/apscheduler/jobstores/redis.py b/lib/apscheduler/jobstores/redis.py
index 5bb69d63..2b4ffd52 100644
--- a/lib/apscheduler/jobstores/redis.py
+++ b/lib/apscheduler/jobstores/redis.py
@@ -1,7 +1,5 @@
 from __future__ import absolute_import
-from datetime import datetime
 
-from pytz import utc
 import six
 
 from apscheduler.jobstores.base import BaseJobStore, JobLookupError, ConflictingIdError
@@ -14,23 +12,21 @@ except ImportError:  # pragma: nocover
     import pickle
 
 try:
-    from redis import Redis
+    from redis import StrictRedis
 except ImportError:  # pragma: nocover
     raise ImportError('RedisJobStore requires redis installed')
 
 
 class RedisJobStore(BaseJobStore):
     """
-    Stores jobs in a Redis database. Any leftover keyword arguments are directly passed to redis's
-    :class:`~redis.StrictRedis`.
+    Stores jobs in a Redis database. Any leftover keyword arguments are directly passed to redis's StrictRedis.
 
     Plugin alias: ``redis``
 
     :param int db: the database number to store jobs in
     :param str jobs_key: key to store jobs in
     :param str run_times_key: key to store the jobs' run times in
-    :param int pickle_protocol: pickle protocol level to use (for serialization), defaults to the
-        highest available
+    :param int pickle_protocol: pickle protocol level to use (for serialization), defaults to the highest available
     """
 
     def __init__(self, db=0, jobs_key='apscheduler.jobs', run_times_key='apscheduler.run_times',
@@ -47,7 +43,7 @@ class RedisJobStore(BaseJobStore):
         self.pickle_protocol = pickle_protocol
         self.jobs_key = jobs_key
         self.run_times_key = run_times_key
-        self.redis = Redis(db=int(db), **connect_args)
+        self.redis = StrictRedis(db=int(db), **connect_args)
 
     def lookup_job(self, job_id):
         job_state = self.redis.hget(self.jobs_key, job_id)
@@ -69,8 +65,7 @@ class RedisJobStore(BaseJobStore):
     def get_all_jobs(self):
         job_states = self.redis.hgetall(self.jobs_key)
         jobs = self._reconstitute_jobs(six.iteritems(job_states))
-        paused_sort_key = datetime(9999, 12, 31, tzinfo=utc)
-        return sorted(jobs, key=lambda job: job.next_run_time or paused_sort_key)
+        return sorted(jobs, key=lambda job: job.next_run_time)
 
     def add_job(self, job):
         if self.redis.hexists(self.jobs_key, job.id):
@@ -78,12 +73,8 @@ class RedisJobStore(BaseJobStore):
 
         with self.redis.pipeline() as pipe:
             pipe.multi()
-            pipe.hset(self.jobs_key, job.id, pickle.dumps(job.__getstate__(),
-                                                          self.pickle_protocol))
-            if job.next_run_time:
-                pipe.zadd(self.run_times_key,
-                          {job.id: datetime_to_utc_timestamp(job.next_run_time)})
-
+            pipe.hset(self.jobs_key, job.id, pickle.dumps(job.__getstate__(), self.pickle_protocol))
+            pipe.zadd(self.run_times_key, datetime_to_utc_timestamp(job.next_run_time), job.id)
             pipe.execute()
 
     def update_job(self, job):
@@ -91,14 +82,11 @@ class RedisJobStore(BaseJobStore):
             raise JobLookupError(job.id)
 
         with self.redis.pipeline() as pipe:
-            pipe.hset(self.jobs_key, job.id, pickle.dumps(job.__getstate__(),
-                                                          self.pickle_protocol))
+            pipe.hset(self.jobs_key, job.id, pickle.dumps(job.__getstate__(), self.pickle_protocol))
             if job.next_run_time:
-                pipe.zadd(self.run_times_key,
-                          {job.id: datetime_to_utc_timestamp(job.next_run_time)})
+                pipe.zadd(self.run_times_key, datetime_to_utc_timestamp(job.next_run_time), job.id)
             else:
                 pipe.zrem(self.run_times_key, job.id)
-
             pipe.execute()
 
     def remove_job(self, job_id):
@@ -133,7 +121,7 @@ class RedisJobStore(BaseJobStore):
         for job_id, job_state in job_states:
             try:
                 jobs.append(self._reconstitute_job(job_state))
-            except BaseException:
+            except:
                 self._logger.exception('Unable to restore job "%s" -- removing it', job_id)
                 failed_job_ids.append(job_id)
 
diff --git a/lib/apscheduler/jobstores/rethinkdb.py b/lib/apscheduler/jobstores/rethinkdb.py
deleted file mode 100644
index d8a78cde..00000000
--- a/lib/apscheduler/jobstores/rethinkdb.py
+++ /dev/null
@@ -1,155 +0,0 @@
-from __future__ import absolute_import
-
-from apscheduler.jobstores.base import BaseJobStore, JobLookupError, ConflictingIdError
-from apscheduler.util import maybe_ref, datetime_to_utc_timestamp, utc_timestamp_to_datetime
-from apscheduler.job import Job
-
-try:
-    import cPickle as pickle
-except ImportError:  # pragma: nocover
-    import pickle
-
-try:
-    from rethinkdb import RethinkDB
-except ImportError:  # pragma: nocover
-    raise ImportError('RethinkDBJobStore requires rethinkdb installed')
-
-
-class RethinkDBJobStore(BaseJobStore):
-    """
-    Stores jobs in a RethinkDB database. Any leftover keyword arguments are directly passed to
-    rethinkdb's `RethinkdbClient <http://www.rethinkdb.com/api/#connect>`_.
-
-    Plugin alias: ``rethinkdb``
-
-    :param str database: database to store jobs in
-    :param str collection: collection to store jobs in
-    :param client: a :class:`rethinkdb.net.Connection` instance to use instead of providing
-        connection arguments
-    :param int pickle_protocol: pickle protocol level to use (for serialization), defaults to the
-        highest available
-    """
-
-    def __init__(self, database='apscheduler', table='jobs', client=None,
-                 pickle_protocol=pickle.HIGHEST_PROTOCOL, **connect_args):
-        super(RethinkDBJobStore, self).__init__()
-
-        if not database:
-            raise ValueError('The "database" parameter must not be empty')
-        if not table:
-            raise ValueError('The "table" parameter must not be empty')
-
-        self.database = database
-        self.table_name = table
-        self.table = None
-        self.client = client
-        self.pickle_protocol = pickle_protocol
-        self.connect_args = connect_args
-        self.r = RethinkDB()
-        self.conn = None
-
-    def start(self, scheduler, alias):
-        super(RethinkDBJobStore, self).start(scheduler, alias)
-
-        if self.client:
-            self.conn = maybe_ref(self.client)
-        else:
-            self.conn = self.r.connect(db=self.database, **self.connect_args)
-
-        if self.database not in self.r.db_list().run(self.conn):
-            self.r.db_create(self.database).run(self.conn)
-
-        if self.table_name not in self.r.table_list().run(self.conn):
-            self.r.table_create(self.table_name).run(self.conn)
-
-        if 'next_run_time' not in self.r.table(self.table_name).index_list().run(self.conn):
-            self.r.table(self.table_name).index_create('next_run_time').run(self.conn)
-
-        self.table = self.r.db(self.database).table(self.table_name)
-
-    def lookup_job(self, job_id):
-        results = list(self.table.get_all(job_id).pluck('job_state').run(self.conn))
-        return self._reconstitute_job(results[0]['job_state']) if results else None
-
-    def get_due_jobs(self, now):
-        return self._get_jobs(self.r.row['next_run_time'] <= datetime_to_utc_timestamp(now))
-
-    def get_next_run_time(self):
-        results = list(
-            self.table
-            .filter(self.r.row['next_run_time'] != None)  # noqa
-            .order_by(self.r.asc('next_run_time'))
-            .map(lambda x: x['next_run_time'])
-            .limit(1)
-            .run(self.conn)
-        )
-        return utc_timestamp_to_datetime(results[0]) if results else None
-
-    def get_all_jobs(self):
-        jobs = self._get_jobs()
-        self._fix_paused_jobs_sorting(jobs)
-        return jobs
-
-    def add_job(self, job):
-        job_dict = {
-            'id': job.id,
-            'next_run_time': datetime_to_utc_timestamp(job.next_run_time),
-            'job_state': self.r.binary(pickle.dumps(job.__getstate__(), self.pickle_protocol))
-        }
-        results = self.table.insert(job_dict).run(self.conn)
-        if results['errors'] > 0:
-            raise ConflictingIdError(job.id)
-
-    def update_job(self, job):
-        changes = {
-            'next_run_time': datetime_to_utc_timestamp(job.next_run_time),
-            'job_state': self.r.binary(pickle.dumps(job.__getstate__(), self.pickle_protocol))
-        }
-        results = self.table.get_all(job.id).update(changes).run(self.conn)
-        skipped = False in map(lambda x: results[x] == 0, results.keys())
-        if results['skipped'] > 0 or results['errors'] > 0 or not skipped:
-            raise JobLookupError(job.id)
-
-    def remove_job(self, job_id):
-        results = self.table.get_all(job_id).delete().run(self.conn)
-        if results['deleted'] + results['skipped'] != 1:
-            raise JobLookupError(job_id)
-
-    def remove_all_jobs(self):
-        self.table.delete().run(self.conn)
-
-    def shutdown(self):
-        self.conn.close()
-
-    def _reconstitute_job(self, job_state):
-        job_state = pickle.loads(job_state)
-        job = Job.__new__(Job)
-        job.__setstate__(job_state)
-        job._scheduler = self._scheduler
-        job._jobstore_alias = self._alias
-        return job
-
-    def _get_jobs(self, predicate=None):
-        jobs = []
-        failed_job_ids = []
-        query = (self.table.filter(self.r.row['next_run_time'] != None).filter(predicate)  # noqa
-                 if predicate else self.table)
-        query = query.order_by('next_run_time', 'id').pluck('id', 'job_state')
-
-        for document in query.run(self.conn):
-            try:
-                jobs.append(self._reconstitute_job(document['job_state']))
-            except Exception:
-                self._logger.exception('Unable to restore job "%s" -- removing it', document['id'])
-                failed_job_ids.append(document['id'])
-
-        # Remove all the jobs we failed to restore
-        if failed_job_ids:
-            self.r.expr(failed_job_ids).for_each(
-                lambda job_id: self.table.get_all(job_id).delete()).run(self.conn)
-
-        return jobs
-
-    def __repr__(self):
-        connection = self.conn
-        return '<%s (connection=%s)>' % (self.__class__.__name__, connection)
diff --git a/lib/apscheduler/jobstores/sqlalchemy.py b/lib/apscheduler/jobstores/sqlalchemy.py
index 716549bc..f8a3c151 100644
--- a/lib/apscheduler/jobstores/sqlalchemy.py
+++ b/lib/apscheduler/jobstores/sqlalchemy.py
@@ -10,38 +10,29 @@ except ImportError:  # pragma: nocover
     import pickle
 
 try:
-    from sqlalchemy import (
-        create_engine, Table, Column, MetaData, Unicode, Float, LargeBinary, select, and_)
+    from sqlalchemy import create_engine, Table, Column, MetaData, Unicode, Float, LargeBinary, select
     from sqlalchemy.exc import IntegrityError
-    from sqlalchemy.sql.expression import null
 except ImportError:  # pragma: nocover
     raise ImportError('SQLAlchemyJobStore requires SQLAlchemy installed')
 
 
 class SQLAlchemyJobStore(BaseJobStore):
     """
-    Stores jobs in a database table using SQLAlchemy.
-    The table will be created if it doesn't exist in the database.
+    Stores jobs in a database table using SQLAlchemy. The table will be created if it doesn't exist in the database.
 
     Plugin alias: ``sqlalchemy``
 
-    :param str url: connection string (see
-        :ref:`SQLAlchemy documentation <sqlalchemy:database_urls>` on this)
-    :param engine: an SQLAlchemy :class:`~sqlalchemy.engine.Engine` to use instead of creating a
-        new one based on ``url``
+    :param str url: connection string (see `SQLAlchemy documentation
+                    <http://docs.sqlalchemy.org/en/latest/core/engines.html?highlight=create_engine#database-urls>`_
+                    on this)
+    :param engine: an SQLAlchemy Engine to use instead of creating a new one based on ``url``
     :param str tablename: name of the table to store jobs in
-    :param metadata: a :class:`~sqlalchemy.schema.MetaData` instance to use instead of creating a
-        new one
-    :param int pickle_protocol: pickle protocol level to use (for serialization), defaults to the
-        highest available
-    :param str tableschema: name of the (existing) schema in the target database where the table
-        should be
-    :param dict engine_options: keyword arguments to :func:`~sqlalchemy.create_engine`
-        (ignored if ``engine`` is given)
+    :param metadata: a :class:`~sqlalchemy.MetaData` instance to use instead of creating a new one
+    :param int pickle_protocol: pickle protocol level to use (for serialization), defaults to the highest available
     """
 
     def __init__(self, url=None, engine=None, tablename='apscheduler_jobs', metadata=None,
-                 pickle_protocol=pickle.HIGHEST_PROTOCOL, tableschema=None, engine_options=None):
+                 pickle_protocol=pickle.HIGHEST_PROTOCOL):
         super(SQLAlchemyJobStore, self).__init__()
         self.pickle_protocol = pickle_protocol
         metadata = maybe_ref(metadata) or MetaData()
@@ -49,46 +40,37 @@ class SQLAlchemyJobStore(BaseJobStore):
         if engine:
             self.engine = maybe_ref(engine)
         elif url:
-            self.engine = create_engine(url, **(engine_options or {}))
+            self.engine = create_engine(url)
         else:
             raise ValueError('Need either "engine" or "url" defined')
 
-        # 191 = max key length in MySQL for InnoDB/utf8mb4 tables,
-        # 25 = precision that translates to an 8-byte float
+        # 191 = max key length in MySQL for InnoDB/utf8mb4 tables, 25 = precision that translates to an 8-byte float
         self.jobs_t = Table(
             tablename, metadata,
-            Column('id', Unicode(191), primary_key=True),
+            Column('id', Unicode(191, _warn_on_bytestring=False), primary_key=True),
             Column('next_run_time', Float(25), index=True),
-            Column('job_state', LargeBinary, nullable=False),
-            schema=tableschema
+            Column('job_state', LargeBinary, nullable=False)
         )
 
-    def start(self, scheduler, alias):
-        super(SQLAlchemyJobStore, self).start(scheduler, alias)
         self.jobs_t.create(self.engine, True)
 
     def lookup_job(self, job_id):
-        selectable = select(self.jobs_t.c.job_state).where(self.jobs_t.c.id == job_id)
-        with self.engine.begin() as connection:
-            job_state = connection.execute(selectable).scalar()
-            return self._reconstitute_job(job_state) if job_state else None
+        selectable = select([self.jobs_t.c.job_state]).where(self.jobs_t.c.id == job_id)
+        job_state = self.engine.execute(selectable).scalar()
+        return self._reconstitute_job(job_state) if job_state else None
 
     def get_due_jobs(self, now):
         timestamp = datetime_to_utc_timestamp(now)
         return self._get_jobs(self.jobs_t.c.next_run_time <= timestamp)
 
     def get_next_run_time(self):
-        selectable = select(self.jobs_t.c.next_run_time).\
-            where(self.jobs_t.c.next_run_time != null()).\
+        selectable = select([self.jobs_t.c.next_run_time]).where(self.jobs_t.c.next_run_time != None).\
             order_by(self.jobs_t.c.next_run_time).limit(1)
-        with self.engine.begin() as connection:
-            next_run_time = connection.execute(selectable).scalar()
-            return utc_timestamp_to_datetime(next_run_time)
+        next_run_time = self.engine.execute(selectable).scalar()
+        return utc_timestamp_to_datetime(next_run_time)
 
     def get_all_jobs(self):
-        jobs = self._get_jobs()
-        self._fix_paused_jobs_sorting(jobs)
-        return jobs
+        return self._get_jobs()
 
     def add_job(self, job):
         insert = self.jobs_t.insert().values(**{
@@ -96,33 +78,29 @@ class SQLAlchemyJobStore(BaseJobStore):
             'next_run_time': datetime_to_utc_timestamp(job.next_run_time),
             'job_state': pickle.dumps(job.__getstate__(), self.pickle_protocol)
         })
-        with self.engine.begin() as connection:
-            try:
-                connection.execute(insert)
-            except IntegrityError:
-                raise ConflictingIdError(job.id)
+        try:
+            self.engine.execute(insert)
+        except IntegrityError:
+            raise ConflictingIdError(job.id)
 
     def update_job(self, job):
         update = self.jobs_t.update().values(**{
             'next_run_time': datetime_to_utc_timestamp(job.next_run_time),
             'job_state': pickle.dumps(job.__getstate__(), self.pickle_protocol)
         }).where(self.jobs_t.c.id == job.id)
-        with self.engine.begin() as connection:
-            result = connection.execute(update)
-            if result.rowcount == 0:
-                raise JobLookupError(job.id)
+        result = self.engine.execute(update)
+        if result.rowcount == 0:
+            raise JobLookupError(id)
 
     def remove_job(self, job_id):
         delete = self.jobs_t.delete().where(self.jobs_t.c.id == job_id)
-        with self.engine.begin() as connection:
-            result = connection.execute(delete)
-            if result.rowcount == 0:
-                raise JobLookupError(job_id)
+        result = self.engine.execute(delete)
+        if result.rowcount == 0:
+            raise JobLookupError(job_id)
 
     def remove_all_jobs(self):
         delete = self.jobs_t.delete()
-        with self.engine.begin() as connection:
-            connection.execute(delete)
+        self.engine.execute(delete)
 
     def shutdown(self):
         self.engine.dispose()
@@ -138,22 +116,20 @@ class SQLAlchemyJobStore(BaseJobStore):
 
     def _get_jobs(self, *conditions):
         jobs = []
-        selectable = select(self.jobs_t.c.id, self.jobs_t.c.job_state).\
-            order_by(self.jobs_t.c.next_run_time)
-        selectable = selectable.where(and_(*conditions)) if conditions else selectable
+        selectable = select([self.jobs_t.c.id, self.jobs_t.c.job_state]).order_by(self.jobs_t.c.next_run_time)
+        selectable = selectable.where(*conditions) if conditions else selectable
         failed_job_ids = set()
-        with self.engine.begin() as connection:
-            for row in connection.execute(selectable):
-                try:
-                    jobs.append(self._reconstitute_job(row.job_state))
-                except BaseException:
-                    self._logger.exception('Unable to restore job "%s" -- removing it', row.id)
-                    failed_job_ids.add(row.id)
+        for row in self.engine.execute(selectable):
+            try:
+                jobs.append(self._reconstitute_job(row.job_state))
+            except:
+                self._logger.exception('Unable to restore job "%s" -- removing it', row.id)
+                failed_job_ids.add(row.id)
 
-            # Remove all the jobs we failed to restore
-            if failed_job_ids:
-                delete = self.jobs_t.delete().where(self.jobs_t.c.id.in_(failed_job_ids))
-                connection.execute(delete)
+        # Remove all the jobs we failed to restore
+        if failed_job_ids:
+            delete = self.jobs_t.delete().where(self.jobs_t.c.id.in_(failed_job_ids))
+            self.engine.execute(delete)
 
         return jobs
 
diff --git a/lib/apscheduler/jobstores/zookeeper.py b/lib/apscheduler/jobstores/zookeeper.py
deleted file mode 100644
index 52530693..00000000
--- a/lib/apscheduler/jobstores/zookeeper.py
+++ /dev/null
@@ -1,178 +0,0 @@
-from __future__ import absolute_import
-
-from datetime import datetime
-
-from pytz import utc
-from kazoo.exceptions import NoNodeError, NodeExistsError
-
-from apscheduler.jobstores.base import BaseJobStore, JobLookupError, ConflictingIdError
-from apscheduler.util import maybe_ref, datetime_to_utc_timestamp, utc_timestamp_to_datetime
-from apscheduler.job import Job
-
-try:
-    import cPickle as pickle
-except ImportError:  # pragma: nocover
-    import pickle
-
-try:
-    from kazoo.client import KazooClient
-except ImportError:  # pragma: nocover
-    raise ImportError('ZooKeeperJobStore requires Kazoo installed')
-
-
-class ZooKeeperJobStore(BaseJobStore):
-    """
-    Stores jobs in a ZooKeeper tree. Any leftover keyword arguments are directly passed to
-    kazoo's `KazooClient
-    <http://kazoo.readthedocs.io/en/latest/api/client.html>`_.
-
-    Plugin alias: ``zookeeper``
-
-    :param str path: path to store jobs in
-    :param client: a :class:`~kazoo.client.KazooClient` instance to use instead of
-        providing connection arguments
-    :param int pickle_protocol: pickle protocol level to use (for serialization), defaults to the
-        highest available
-    """
-
-    def __init__(self, path='/apscheduler', client=None, close_connection_on_exit=False,
-                 pickle_protocol=pickle.HIGHEST_PROTOCOL, **connect_args):
-        super(ZooKeeperJobStore, self).__init__()
-        self.pickle_protocol = pickle_protocol
-        self.close_connection_on_exit = close_connection_on_exit
-
-        if not path:
-            raise ValueError('The "path" parameter must not be empty')
-
-        self.path = path
-
-        if client:
-            self.client = maybe_ref(client)
-        else:
-            self.client = KazooClient(**connect_args)
-        self._ensured_path = False
-
-    def _ensure_paths(self):
-        if not self._ensured_path:
-            self.client.ensure_path(self.path)
-        self._ensured_path = True
-
-    def start(self, scheduler, alias):
-        super(ZooKeeperJobStore, self).start(scheduler, alias)
-        if not self.client.connected:
-            self.client.start()
-
-    def lookup_job(self, job_id):
-        self._ensure_paths()
-        node_path = self.path + "/" + str(job_id)
-        try:
-            content, _ = self.client.get(node_path)
-            doc = pickle.loads(content)
-            job = self._reconstitute_job(doc['job_state'])
-            return job
-        except BaseException:
-            return None
-
-    def get_due_jobs(self, now):
-        timestamp = datetime_to_utc_timestamp(now)
-        jobs = [job_def['job'] for job_def in self._get_jobs()
-                if job_def['next_run_time'] is not None and job_def['next_run_time'] <= timestamp]
-        return jobs
-
-    def get_next_run_time(self):
-        next_runs = [job_def['next_run_time'] for job_def in self._get_jobs()
-                     if job_def['next_run_time'] is not None]
-        return utc_timestamp_to_datetime(min(next_runs)) if len(next_runs) > 0 else None
-
-    def get_all_jobs(self):
-        jobs = [job_def['job'] for job_def in self._get_jobs()]
-        self._fix_paused_jobs_sorting(jobs)
-        return jobs
-
-    def add_job(self, job):
-        self._ensure_paths()
-        node_path = self.path + "/" + str(job.id)
-        value = {
-            'next_run_time': datetime_to_utc_timestamp(job.next_run_time),
-            'job_state': job.__getstate__()
-        }
-        data = pickle.dumps(value, self.pickle_protocol)
-        try:
-            self.client.create(node_path, value=data)
-        except NodeExistsError:
-            raise ConflictingIdError(job.id)
-
-    def update_job(self, job):
-        self._ensure_paths()
-        node_path = self.path + "/" + str(job.id)
-        changes = {
-            'next_run_time': datetime_to_utc_timestamp(job.next_run_time),
-            'job_state': job.__getstate__()
-        }
-        data = pickle.dumps(changes, self.pickle_protocol)
-        try:
-            self.client.set(node_path, value=data)
-        except NoNodeError:
-            raise JobLookupError(job.id)
-
-    def remove_job(self, job_id):
-        self._ensure_paths()
-        node_path = self.path + "/" + str(job_id)
-        try:
-            self.client.delete(node_path)
-        except NoNodeError:
-            raise JobLookupError(job_id)
-
-    def remove_all_jobs(self):
-        try:
-            self.client.delete(self.path, recursive=True)
-        except NoNodeError:
-            pass
-        self._ensured_path = False
-
-    def shutdown(self):
-        if self.close_connection_on_exit:
-            self.client.stop()
-            self.client.close()
-
-    def _reconstitute_job(self, job_state):
-        job_state = job_state
-        job = Job.__new__(Job)
-        job.__setstate__(job_state)
-        job._scheduler = self._scheduler
-        job._jobstore_alias = self._alias
-        return job
-
-    def _get_jobs(self):
-        self._ensure_paths()
-        jobs = []
-        failed_job_ids = []
-        all_ids = self.client.get_children(self.path)
-        for node_name in all_ids:
-            try:
-                node_path = self.path + "/" + node_name
-                content, _ = self.client.get(node_path)
-                doc = pickle.loads(content)
-                job_def = {
-                    'job_id': node_name,
-                    'next_run_time': doc['next_run_time'] if doc['next_run_time'] else None,
-                    'job_state': doc['job_state'],
-                    'job': self._reconstitute_job(doc['job_state']),
-                    'creation_time': _.ctime
-                }
-                jobs.append(job_def)
-            except BaseException:
-                self._logger.exception('Unable to restore job "%s" -- removing it' % node_name)
-                failed_job_ids.append(node_name)
-
-        # Remove all the jobs we failed to restore
-        if failed_job_ids:
-            for failed_id in failed_job_ids:
-                self.remove_job(failed_id)
-        paused_sort_key = datetime(9999, 12, 31, tzinfo=utc)
-        return sorted(jobs, key=lambda job_def: (job_def['job'].next_run_time or paused_sort_key,
-                                                 job_def['creation_time']))
-
-    def __repr__(self):
-        self._logger.exception('<%s (client=%s)>' % (self.__class__.__name__, self.client))
-        return '<%s (client=%s)>' % (self.__class__.__name__, self.client)
diff --git a/lib/apscheduler/schedulers/asyncio.py b/lib/apscheduler/schedulers/asyncio.py
index 8bcdfdaf..b91ee97a 100644
--- a/lib/apscheduler/schedulers/asyncio.py
+++ b/lib/apscheduler/schedulers/asyncio.py
@@ -1,16 +1,22 @@
 from __future__ import absolute_import
-import asyncio
-from functools import wraps, partial
+from functools import wraps
 
 from apscheduler.schedulers.base import BaseScheduler
 from apscheduler.util import maybe_ref
 
+try:
+    import asyncio
+except ImportError:  # pragma: nocover
+    try:
+        import trollius as asyncio
+    except ImportError:
+        raise ImportError('AsyncIOScheduler requires either Python 3.4 or the asyncio package installed')
+
 
 def run_in_event_loop(func):
     @wraps(func)
     def wrapper(self, *args, **kwargs):
-        wrapped = partial(func, self, *args, **kwargs)
-        self._eventloop.call_soon_threadsafe(wrapped)
+        self._eventloop.call_soon_threadsafe(func, self, *args, **kwargs)
     return wrapper
 
 
@@ -18,8 +24,6 @@ class AsyncIOScheduler(BaseScheduler):
     """
     A scheduler that runs on an asyncio (:pep:`3156`) event loop.
 
-    The default executor can run jobs based on native coroutines (``async def``).
-
     Extra options:
 
     ============== =============================================================
@@ -30,11 +34,9 @@ class AsyncIOScheduler(BaseScheduler):
     _eventloop = None
     _timeout = None
 
-    def start(self, paused=False):
-        if not self._eventloop:
-            self._eventloop = asyncio.get_event_loop()
-
-        super(AsyncIOScheduler, self).start(paused)
+    def start(self):
+        super(AsyncIOScheduler, self).start()
+        self.wakeup()
 
     @run_in_event_loop
     def shutdown(self, wait=True):
@@ -42,7 +44,7 @@ class AsyncIOScheduler(BaseScheduler):
         self._stop_timer()
 
     def _configure(self, config):
-        self._eventloop = maybe_ref(config.pop('event_loop', None))
+        self._eventloop = maybe_ref(config.pop('event_loop', None)) or asyncio.get_event_loop()
         super(AsyncIOScheduler, self)._configure(config)
 
     def _start_timer(self, wait_seconds):
diff --git a/lib/apscheduler/schedulers/background.py b/lib/apscheduler/schedulers/background.py
index bb8f77da..86ff2ba3 100644
--- a/lib/apscheduler/schedulers/background.py
+++ b/lib/apscheduler/schedulers/background.py
@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-
 from threading import Thread, Event
 
 from apscheduler.schedulers.base import BaseScheduler
@@ -14,12 +13,11 @@ class BackgroundScheduler(BlockingScheduler):
 
     Extra options:
 
-    ========== =============================================================================
-    ``daemon`` Set the ``daemon`` option in the background thread (defaults to ``True``, see
-               `the documentation
-               <https://docs.python.org/3.4/library/threading.html#thread-objects>`_
+    ========== ============================================================================================
+    ``daemon`` Set the ``daemon`` option in the background thread (defaults to ``True``,
+               see `the documentation <https://docs.python.org/3.4/library/threading.html#thread-objects>`_
                for further details)
-    ========== =============================================================================
+    ========== ============================================================================================
     """
 
     _thread = None
@@ -28,16 +26,14 @@ class BackgroundScheduler(BlockingScheduler):
         self._daemon = asbool(config.pop('daemon', True))
         super(BackgroundScheduler, self)._configure(config)
 
-    def start(self, *args, **kwargs):
-        if self._event is None or self._event.is_set():
-            self._event = Event()
-
-        BaseScheduler.start(self, *args, **kwargs)
+    def start(self):
+        BaseScheduler.start(self)
+        self._event = Event()
         self._thread = Thread(target=self._main_loop, name='APScheduler')
         self._thread.daemon = self._daemon
         self._thread.start()
 
-    def shutdown(self, *args, **kwargs):
-        super(BackgroundScheduler, self).shutdown(*args, **kwargs)
+    def shutdown(self, wait=True):
+        super(BackgroundScheduler, self).shutdown(wait)
         self._thread.join()
         del self._thread
diff --git a/lib/apscheduler/schedulers/base.py b/lib/apscheduler/schedulers/base.py
index 444de8ef..cdc0bf06 100644
--- a/lib/apscheduler/schedulers/base.py
+++ b/lib/apscheduler/schedulers/base.py
@@ -1,10 +1,9 @@
 from __future__ import print_function
-
 from abc import ABCMeta, abstractmethod
+from collections import MutableMapping
 from threading import RLock
-from datetime import datetime, timedelta
+from datetime import datetime
 from logging import getLogger
-import warnings
 import sys
 
 from pkg_resources import iter_entry_points
@@ -18,47 +17,22 @@ from apscheduler.jobstores.base import ConflictingIdError, JobLookupError, BaseJ
 from apscheduler.jobstores.memory import MemoryJobStore
 from apscheduler.job import Job
 from apscheduler.triggers.base import BaseTrigger
-from apscheduler.util import (
-    asbool, asint, astimezone, maybe_ref, timedelta_seconds, undefined, TIMEOUT_MAX)
+from apscheduler.util import asbool, asint, astimezone, maybe_ref, timedelta_seconds, undefined
 from apscheduler.events import (
-    SchedulerEvent, JobEvent, JobSubmissionEvent, EVENT_SCHEDULER_START, EVENT_SCHEDULER_SHUTDOWN,
-    EVENT_JOBSTORE_ADDED, EVENT_JOBSTORE_REMOVED, EVENT_ALL, EVENT_JOB_MODIFIED, EVENT_JOB_REMOVED,
-    EVENT_JOB_ADDED, EVENT_EXECUTOR_ADDED, EVENT_EXECUTOR_REMOVED, EVENT_ALL_JOBS_REMOVED,
-    EVENT_JOB_SUBMITTED, EVENT_JOB_MAX_INSTANCES, EVENT_SCHEDULER_RESUMED, EVENT_SCHEDULER_PAUSED)
-
-try:
-    from collections.abc import MutableMapping
-except ImportError:
-    from collections import MutableMapping
-
-#: constant indicating a scheduler's stopped state
-STATE_STOPPED = 0
-#: constant indicating a scheduler's running state (started and processing jobs)
-STATE_RUNNING = 1
-#: constant indicating a scheduler's paused state (started but not processing jobs)
-STATE_PAUSED = 2
+    SchedulerEvent, JobEvent, EVENT_SCHEDULER_START, EVENT_SCHEDULER_SHUTDOWN, EVENT_JOBSTORE_ADDED,
+    EVENT_JOBSTORE_REMOVED, EVENT_ALL, EVENT_JOB_MODIFIED, EVENT_JOB_REMOVED, EVENT_JOB_ADDED, EVENT_EXECUTOR_ADDED,
+    EVENT_EXECUTOR_REMOVED, EVENT_ALL_JOBS_REMOVED)
 
 
 class BaseScheduler(six.with_metaclass(ABCMeta)):
     """
-    Abstract base class for all schedulers.
+    Abstract base class for all schedulers. Takes the following keyword arguments:
 
-    Takes the following keyword arguments:
-
-    :param str|logging.Logger logger: logger to use for the scheduler's logging (defaults to
-        apscheduler.scheduler)
+    :param str|logging.Logger logger: logger to use for the scheduler's logging (defaults to apscheduler.scheduler)
     :param str|datetime.tzinfo timezone: the default time zone (defaults to the local timezone)
-    :param int|float jobstore_retry_interval: the minimum number of seconds to wait between
-        retries in the scheduler's main loop if the job store raises an exception when getting
-        the list of due jobs
     :param dict job_defaults: default values for newly added jobs
-    :param dict jobstores: a dictionary of job store alias -> job store instance or configuration
-        dict
-    :param dict executors: a dictionary of executor alias -> executor instance or configuration
-        dict
-
-    :ivar int state: current running state of the scheduler (one of the following constants from
-        ``apscheduler.schedulers.base``: ``STATE_STOPPED``, ``STATE_RUNNING``, ``STATE_PAUSED``)
+    :param dict jobstores: a dictionary of job store alias -> job store instance or configuration dict
+    :param dict executors: a dictionary of executor alias -> executor instance or configuration dict
 
     .. seealso:: :ref:`scheduler-config`
     """
@@ -69,6 +43,7 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
     _executor_classes = {}
     _jobstore_plugins = dict((ep.name, ep) for ep in iter_entry_points('apscheduler.jobstores'))
     _jobstore_classes = {}
+    _stopped = True
 
     #
     # Public API
@@ -83,39 +58,28 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
         self._listeners = []
         self._listeners_lock = self._create_lock()
         self._pending_jobs = []
-        self.state = STATE_STOPPED
         self.configure(gconfig, **options)
 
-    def __getstate__(self):
-        raise TypeError("Schedulers cannot be serialized. Ensure that you are not passing a "
-                        "scheduler instance as an argument to a job, or scheduling an instance "
-                        "method where the instance contains a scheduler as an attribute.")
-
     def configure(self, gconfig={}, prefix='apscheduler.', **options):
         """
-        Reconfigures the scheduler with the given options.
+        Reconfigures the scheduler with the given options. Can only be done when the scheduler isn't running.
 
-        Can only be done when the scheduler isn't running.
-
-        :param dict gconfig: a "global" configuration dictionary whose values can be overridden by
-            keyword arguments to this method
-        :param str|unicode prefix: pick only those keys from ``gconfig`` that are prefixed with
-            this string (pass an empty string or ``None`` to use all keys)
+        :param dict gconfig: a "global" configuration dictionary whose values can be overridden by keyword arguments to
+                             this method
+        :param str|unicode prefix: pick only those keys from ``gconfig`` that are prefixed with this string
+                                   (pass an empty string or ``None`` to use all keys)
         :raises SchedulerAlreadyRunningError: if the scheduler is already running
-
         """
-        if self.state != STATE_STOPPED:
+
+        if self.running:
             raise SchedulerAlreadyRunningError
 
-        # If a non-empty prefix was given, strip it from the keys in the
-        # global configuration dict
+        # If a non-empty prefix was given, strip it from the keys in the global configuration dict
         if prefix:
             prefixlen = len(prefix)
-            gconfig = dict((key[prefixlen:], value) for key, value in six.iteritems(gconfig)
-                           if key.startswith(prefix))
+            gconfig = dict((key[prefixlen:], value) for key, value in six.iteritems(gconfig) if key.startswith(prefix))
 
-        # Create a structure from the dotted options
-        # (e.g. "a.b.c = d" -> {'a': {'b': {'c': 'd'}}})
+        # Create a structure from the dotted options (e.g. "a.b.c = d" -> {'a': {'b': {'c': 'd'}}})
         config = {}
         for key, value in six.iteritems(gconfig):
             parts = key.split('.')
@@ -130,19 +94,16 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
         config.update(options)
         self._configure(config)
 
-    def start(self, paused=False):
+    @abstractmethod
+    def start(self):
         """
-        Start the configured executors and job stores and begin processing scheduled jobs.
+        Starts the scheduler. The details of this process depend on the implementation.
 
-        :param bool paused: if ``True``, don't start job processing until :meth:`resume` is called
         :raises SchedulerAlreadyRunningError: if the scheduler is already running
-        :raises RuntimeError: if running under uWSGI with threads disabled
-
         """
-        if self.state != STATE_STOPPED:
-            raise SchedulerAlreadyRunningError
 
-        self._check_uwsgi()
+        if self.running:
+            raise SchedulerAlreadyRunningError
 
         with self._executors_lock:
             # Create a default executor if nothing else is configured
@@ -164,109 +125,70 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
 
             # Schedule all pending jobs
             for job, jobstore_alias, replace_existing in self._pending_jobs:
-                self._real_add_job(job, jobstore_alias, replace_existing)
+                self._real_add_job(job, jobstore_alias, replace_existing, False)
             del self._pending_jobs[:]
 
-        self.state = STATE_PAUSED if paused else STATE_RUNNING
+        self._stopped = False
         self._logger.info('Scheduler started')
-        self._dispatch_event(SchedulerEvent(EVENT_SCHEDULER_START))
 
-        if not paused:
-            self.wakeup()
+        # Notify listeners that the scheduler has been started
+        self._dispatch_event(SchedulerEvent(EVENT_SCHEDULER_START))
 
     @abstractmethod
     def shutdown(self, wait=True):
         """
-        Shuts down the scheduler, along with its executors and job stores.
-
-        Does not interrupt any currently running jobs.
+        Shuts down the scheduler. Does not interrupt any currently running jobs.
 
         :param bool wait: ``True`` to wait until all currently executing jobs have finished
         :raises SchedulerNotRunningError: if the scheduler has not been started yet
-
         """
-        if self.state == STATE_STOPPED:
+
+        if not self.running:
             raise SchedulerNotRunningError
 
-        self.state = STATE_STOPPED
+        self._stopped = True
 
         # Shut down all executors
-        with self._executors_lock, self._jobstores_lock:
-            for executor in six.itervalues(self._executors):
-                executor.shutdown(wait)
+        for executor in six.itervalues(self._executors):
+            executor.shutdown(wait)
 
-            # Shut down all job stores
-            for jobstore in six.itervalues(self._jobstores):
-                jobstore.shutdown()
+        # Shut down all job stores
+        for jobstore in six.itervalues(self._jobstores):
+            jobstore.shutdown()
 
         self._logger.info('Scheduler has been shut down')
         self._dispatch_event(SchedulerEvent(EVENT_SCHEDULER_SHUTDOWN))
 
-    def pause(self):
-        """
-        Pause job processing in the scheduler.
-
-        This will prevent the scheduler from waking up to do job processing until :meth:`resume`
-        is called. It will not however stop any already running job processing.
-
-        """
-        if self.state == STATE_STOPPED:
-            raise SchedulerNotRunningError
-        elif self.state == STATE_RUNNING:
-            self.state = STATE_PAUSED
-            self._logger.info('Paused scheduler job processing')
-            self._dispatch_event(SchedulerEvent(EVENT_SCHEDULER_PAUSED))
-
-    def resume(self):
-        """Resume job processing in the scheduler."""
-        if self.state == STATE_STOPPED:
-            raise SchedulerNotRunningError
-        elif self.state == STATE_PAUSED:
-            self.state = STATE_RUNNING
-            self._logger.info('Resumed scheduler job processing')
-            self._dispatch_event(SchedulerEvent(EVENT_SCHEDULER_RESUMED))
-            self.wakeup()
-
     @property
     def running(self):
-        """
-        Return ``True`` if the scheduler has been started.
-
-        This is a shortcut for ``scheduler.state != STATE_STOPPED``.
-
-        """
-        return self.state != STATE_STOPPED
+        return not self._stopped
 
     def add_executor(self, executor, alias='default', **executor_opts):
         """
-        Adds an executor to this scheduler.
+        Adds an executor to this scheduler. Any extra keyword arguments will be passed to the executor plugin's
+        constructor, assuming that the first argument is the name of an executor plugin.
 
-        Any extra keyword arguments will be passed to the executor plugin's constructor, assuming
-        that the first argument is the name of an executor plugin.
-
-        :param str|unicode|apscheduler.executors.base.BaseExecutor executor: either an executor
-            instance or the name of an executor plugin
+        :param str|unicode|apscheduler.executors.base.BaseExecutor executor: either an executor instance or the name of
+            an executor plugin
         :param str|unicode alias: alias for the scheduler
         :raises ValueError: if there is already an executor by the given alias
-
         """
+
         with self._executors_lock:
             if alias in self._executors:
-                raise ValueError('This scheduler already has an executor by the alias of "%s"' %
-                                 alias)
+                raise ValueError('This scheduler already has an executor by the alias of "%s"' % alias)
 
             if isinstance(executor, BaseExecutor):
                 self._executors[alias] = executor
             elif isinstance(executor, six.string_types):
-                self._executors[alias] = executor = self._create_plugin_instance(
-                    'executor', executor, executor_opts)
+                self._executors[alias] = executor = self._create_plugin_instance('executor', executor, executor_opts)
             else:
                 raise TypeError('Expected an executor instance or a string, got %s instead' %
                                 executor.__class__.__name__)
 
             # Start the executor right away if the scheduler is running
-            if self.state != STATE_STOPPED:
-                executor.start(self, alias)
+            if self.running:
+                executor.start(self)
 
         self._dispatch_event(SchedulerEvent(EVENT_EXECUTOR_ADDED, alias))
 
@@ -275,11 +197,10 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
         Removes the executor by the given alias from this scheduler.
 
         :param str|unicode alias: alias of the executor
-        :param bool shutdown: ``True`` to shut down the executor after
-            removing it
-
+        :param bool shutdown: ``True`` to shut down the executor after removing it
         """
-        with self._executors_lock:
+
+        with self._jobstores_lock:
             executor = self._lookup_executor(alias)
             del self._executors[alias]
 
@@ -290,39 +211,35 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
 
     def add_jobstore(self, jobstore, alias='default', **jobstore_opts):
         """
-        Adds a job store to this scheduler.
-
-        Any extra keyword arguments will be passed to the job store plugin's constructor, assuming
-        that the first argument is the name of a job store plugin.
+        Adds a job store to this scheduler. Any extra keyword arguments will be passed to the job store plugin's
+        constructor, assuming that the first argument is the name of a job store plugin.
 
         :param str|unicode|apscheduler.jobstores.base.BaseJobStore jobstore: job store to be added
         :param str|unicode alias: alias for the job store
         :raises ValueError: if there is already a job store by the given alias
-
         """
+
         with self._jobstores_lock:
             if alias in self._jobstores:
-                raise ValueError('This scheduler already has a job store by the alias of "%s"' %
-                                 alias)
+                raise ValueError('This scheduler already has a job store by the alias of "%s"' % alias)
 
             if isinstance(jobstore, BaseJobStore):
                 self._jobstores[alias] = jobstore
             elif isinstance(jobstore, six.string_types):
-                self._jobstores[alias] = jobstore = self._create_plugin_instance(
-                    'jobstore', jobstore, jobstore_opts)
+                self._jobstores[alias] = jobstore = self._create_plugin_instance('jobstore', jobstore, jobstore_opts)
             else:
                 raise TypeError('Expected a job store instance or a string, got %s instead' %
                                 jobstore.__class__.__name__)
 
-            # Start the job store right away if the scheduler isn't stopped
-            if self.state != STATE_STOPPED:
+            # Start the job store right away if the scheduler is running
+            if self.running:
                 jobstore.start(self, alias)
 
         # Notify listeners that a new job store has been added
         self._dispatch_event(SchedulerEvent(EVENT_JOBSTORE_ADDED, alias))
 
         # Notify the scheduler so it can scan the new job store for jobs
-        if self.state != STATE_STOPPED:
+        if self.running:
             self.wakeup()
 
     def remove_jobstore(self, alias, shutdown=True):
@@ -331,8 +248,8 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
 
         :param str|unicode alias: alias of the job store
         :param bool shutdown: ``True`` to shut down the job store after removing it
-
         """
+
         with self._jobstores_lock:
             jobstore = self._lookup_jobstore(alias)
             del self._jobstores[alias]
@@ -346,20 +263,17 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
         """
         add_listener(callback, mask=EVENT_ALL)
 
-        Adds a listener for scheduler events.
-
-        When a matching event  occurs, ``callback`` is executed with the event object as its
-        sole argument. If the ``mask`` parameter is not provided, the callback will receive events
-        of all types.
+        Adds a listener for scheduler events. When a matching event occurs, ``callback`` is executed with the event
+        object as its sole argument. If the ``mask`` parameter is not provided, the callback will receive events of all
+        types.
 
         :param callback: any callable that takes one argument
-        :param int mask: bitmask that indicates which events should be
-            listened to
+        :param int mask: bitmask that indicates which events should be listened to
 
         .. seealso:: :mod:`apscheduler.events`
         .. seealso:: :ref:`scheduler-events`
-
         """
+
         with self._listeners_lock:
             self._listeners.append((callback, mask))
 
@@ -371,55 +285,47 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
                 if callback == cb:
                     del self._listeners[i]
 
-    def add_job(self, func, trigger=None, args=None, kwargs=None, id=None, name=None,
-                misfire_grace_time=undefined, coalesce=undefined, max_instances=undefined,
-                next_run_time=undefined, jobstore='default', executor='default',
-                replace_existing=False, **trigger_args):
+    def add_job(self, func, trigger=None, args=None, kwargs=None, id=None, name=None, misfire_grace_time=undefined,
+                coalesce=undefined, max_instances=undefined, next_run_time=undefined, jobstore='default',
+                executor='default', replace_existing=False, **trigger_args):
         """
-        add_job(func, trigger=None, args=None, kwargs=None, id=None, \
-            name=None, misfire_grace_time=undefined, coalesce=undefined, \
-            max_instances=undefined, next_run_time=undefined, \
-            jobstore='default', executor='default', \
-            replace_existing=False, **trigger_args)
+        add_job(func, trigger=None, args=None, kwargs=None, id=None, name=None, misfire_grace_time=undefined, \
+            coalesce=undefined, max_instances=undefined, next_run_time=undefined, jobstore='default', \
+            executor='default', replace_existing=False, **trigger_args)
 
         Adds the given job to the job list and wakes up the scheduler if it's already running.
 
-        Any option that defaults to ``undefined`` will be replaced with the corresponding default
-        value when the job is scheduled (which happens when the scheduler is started, or
-        immediately if the scheduler is already running).
+        Any option that defaults to ``undefined`` will be replaced with the corresponding default value when the job is
+        scheduled (which happens when the scheduler is started, or immediately if the scheduler is already running).
 
-        The ``func`` argument can be given either as a callable object or a textual reference in
-        the ``package.module:some.object`` format, where the first half (separated by ``:``) is an
-        importable module and the second half is a reference to the callable object, relative to
-        the module.
+        The ``func`` argument can be given either as a callable object or a textual reference in the
+        ``package.module:some.object`` format, where the first half (separated by ``:``) is an importable module and the
+        second half is a reference to the callable object, relative to the module.
 
         The ``trigger`` argument can either be:
-          #. the alias name of the trigger (e.g. ``date``, ``interval`` or ``cron``), in which case
-            any extra keyword arguments to this method are passed on to the trigger's constructor
+          #. the alias name of the trigger (e.g. ``date``, ``interval`` or ``cron``), in which case any extra keyword
+             arguments to this method are passed on to the trigger's constructor
           #. an instance of a trigger class
 
         :param func: callable (or a textual reference to one) to run at the given time
-        :param str|apscheduler.triggers.base.BaseTrigger trigger: trigger that determines when
-            ``func`` is called
+        :param str|apscheduler.triggers.base.BaseTrigger trigger: trigger that determines when ``func`` is called
         :param list|tuple args: list of positional arguments to call func with
         :param dict kwargs: dict of keyword arguments to call func with
         :param str|unicode id: explicit identifier for the job (for modifying it later)
         :param str|unicode name: textual description of the job
-        :param int misfire_grace_time: seconds after the designated runtime that the job is still
-            allowed to be run (or ``None`` to allow the job to run no matter how late it is)
-        :param bool coalesce: run once instead of many times if the scheduler determines that the
-            job should be run more than once in succession
-        :param int max_instances: maximum number of concurrently running instances allowed for this
-            job
-        :param datetime next_run_time: when to first run the job, regardless of the trigger (pass
-            ``None`` to add the job as paused)
+        :param int misfire_grace_time: seconds after the designated run time that the job is still allowed to be run
+        :param bool coalesce: run once instead of many times if the scheduler determines that the job should be run more
+                              than once in succession
+        :param int max_instances: maximum number of concurrently running instances allowed for this job
+        :param datetime next_run_time: when to first run the job, regardless of the trigger (pass ``None`` to add the
+                                       job as paused)
         :param str|unicode jobstore: alias of the job store to store the job in
         :param str|unicode executor: alias of the executor to run the job with
-        :param bool replace_existing: ``True`` to replace an existing job with the same ``id``
-            (but retain the number of runs from the existing one)
+        :param bool replace_existing: ``True`` to replace an existing job with the same ``id`` (but retain the
+                                      number of runs from the existing one)
         :rtype: Job
-
         """
+
         job_kwargs = {
             'trigger': self._create_trigger(trigger, trigger_args),
             'executor': executor,
@@ -433,55 +339,45 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
             'max_instances': max_instances,
             'next_run_time': next_run_time
         }
-        job_kwargs = dict((key, value) for key, value in six.iteritems(job_kwargs) if
-                          value is not undefined)
+        job_kwargs = dict((key, value) for key, value in six.iteritems(job_kwargs) if value is not undefined)
         job = Job(self, **job_kwargs)
 
         # Don't really add jobs to job stores before the scheduler is up and running
         with self._jobstores_lock:
-            if self.state == STATE_STOPPED:
+            if not self.running:
                 self._pending_jobs.append((job, jobstore, replace_existing))
-                self._logger.info('Adding job tentatively -- it will be properly scheduled when '
-                                  'the scheduler starts')
+                self._logger.info('Adding job tentatively -- it will be properly scheduled when the scheduler starts')
             else:
-                self._real_add_job(job, jobstore, replace_existing)
+                self._real_add_job(job, jobstore, replace_existing, True)
 
         return job
 
-    def scheduled_job(self, trigger, args=None, kwargs=None, id=None, name=None,
-                      misfire_grace_time=undefined, coalesce=undefined, max_instances=undefined,
-                      next_run_time=undefined, jobstore='default', executor='default',
-                      **trigger_args):
+    def scheduled_job(self, trigger, args=None, kwargs=None, id=None, name=None, misfire_grace_time=undefined,
+                      coalesce=undefined, max_instances=undefined, next_run_time=undefined, jobstore='default',
+                      executor='default', **trigger_args):
         """
-        scheduled_job(trigger, args=None, kwargs=None, id=None, \
-            name=None, misfire_grace_time=undefined, \
-            coalesce=undefined, max_instances=undefined, \
-            next_run_time=undefined, jobstore='default', \
+        scheduled_job(trigger, args=None, kwargs=None, id=None, name=None, misfire_grace_time=undefined, \
+            coalesce=undefined, max_instances=undefined, next_run_time=undefined, jobstore='default', \
             executor='default',**trigger_args)
 
-        A decorator version of :meth:`add_job`, except that ``replace_existing`` is always
-        ``True``.
-
-        .. important:: The ``id`` argument must be given if scheduling a job in a persistent job
-        store. The scheduler cannot, however, enforce this requirement.
+        A decorator version of :meth:`add_job`, except that ``replace_existing`` is always ``True``.
 
+        .. important:: The ``id`` argument must be given if scheduling a job in a persistent job store. The scheduler
+           cannot, however, enforce this requirement.
         """
+
         def inner(func):
-            self.add_job(func, trigger, args, kwargs, id, name, misfire_grace_time, coalesce,
-                         max_instances, next_run_time, jobstore, executor, True, **trigger_args)
+            self.add_job(func, trigger, args, kwargs, id, name, misfire_grace_time, coalesce, max_instances,
+                         next_run_time, jobstore, executor, True, **trigger_args)
             return func
         return inner
 
     def modify_job(self, job_id, jobstore=None, **changes):
         """
-        Modifies the properties of a single job.
-
-        Modifications are passed to this method as extra keyword arguments.
+        Modifies the properties of a single job. Modifications are passed to this method as extra keyword arguments.
 
         :param str|unicode job_id: the identifier of the job
         :param str|unicode jobstore: alias of the job store that contains the job
-        :return Job: the relevant job instance
-
         """
         with self._jobstores_lock:
             job, jobstore = self._lookup_job(job_id, jobstore)
@@ -492,27 +388,22 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
         self._dispatch_event(JobEvent(EVENT_JOB_MODIFIED, job_id, jobstore))
 
         # Wake up the scheduler since the job's next run time may have been changed
-        if self.state == STATE_RUNNING:
-            self.wakeup()
-
-        return job
+        self.wakeup()
 
     def reschedule_job(self, job_id, jobstore=None, trigger=None, **trigger_args):
         """
         Constructs a new trigger for a job and updates its next run time.
-
         Extra keyword arguments are passed directly to the trigger's constructor.
 
         :param str|unicode job_id: the identifier of the job
         :param str|unicode jobstore: alias of the job store that contains the job
         :param trigger: alias of the trigger type or a trigger instance
-        :return Job: the relevant job instance
-
         """
+
         trigger = self._create_trigger(trigger, trigger_args)
         now = datetime.now(self.timezone)
         next_run_time = trigger.get_next_fire_time(None, now)
-        return self.modify_job(job_id, jobstore, trigger=trigger, next_run_time=next_run_time)
+        self.modify_job(job_id, jobstore, trigger=trigger, next_run_time=next_run_time)
 
     def pause_job(self, job_id, jobstore=None):
         """
@@ -520,10 +411,9 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
 
         :param str|unicode job_id: the identifier of the job
         :param str|unicode jobstore: alias of the job store that contains the job
-        :return Job: the relevant job instance
-
         """
-        return self.modify_job(job_id, jobstore, next_run_time=None)
+
+        self.modify_job(job_id, jobstore, next_run_time=None)
 
     def resume_job(self, job_id, jobstore=None):
         """
@@ -531,44 +421,38 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
 
         :param str|unicode job_id: the identifier of the job
         :param str|unicode jobstore: alias of the job store that contains the job
-        :return Job|None: the relevant job instance if the job was rescheduled, or ``None`` if no
-            next run time could be calculated and the job was removed
-
         """
+
         with self._jobstores_lock:
             job, jobstore = self._lookup_job(job_id, jobstore)
             now = datetime.now(self.timezone)
             next_run_time = job.trigger.get_next_fire_time(None, now)
             if next_run_time:
-                return self.modify_job(job_id, jobstore, next_run_time=next_run_time)
+                self.modify_job(job_id, jobstore, next_run_time=next_run_time)
             else:
                 self.remove_job(job.id, jobstore)
 
     def get_jobs(self, jobstore=None, pending=None):
         """
-        Returns a list of pending jobs (if the scheduler hasn't been started yet) and scheduled
-        jobs, either from a specific job store or from all of them.
-
-        If the scheduler has not been started yet, only pending jobs can be returned because the
-        job stores haven't been started yet either.
+        Returns a list of pending jobs (if the scheduler hasn't been started yet) and scheduled jobs, either from a
+        specific job store or from all of them.
 
         :param str|unicode jobstore: alias of the job store
-        :param bool pending: **DEPRECATED**
+        :param bool pending: ``False`` to leave out pending jobs (jobs that are waiting for the scheduler start to be
+                             added to their respective job stores), ``True`` to only include pending jobs, anything else
+                             to return both
         :rtype: list[Job]
-
         """
-        if pending is not None:
-            warnings.warn('The "pending" option is deprecated -- get_jobs() always returns '
-                          'scheduled jobs if the scheduler has been started and pending jobs '
-                          'otherwise', DeprecationWarning)
 
         with self._jobstores_lock:
             jobs = []
-            if self.state == STATE_STOPPED:
+
+            if pending is not False:
                 for job, alias, replace_existing in self._pending_jobs:
                     if jobstore is None or alias == jobstore:
                         jobs.append(job)
-            else:
+
+            if pending is not True:
                 for alias, store in six.iteritems(self._jobstores):
                     if jobstore is None or alias == jobstore:
                         jobs.extend(store.get_all_jobs())
@@ -583,8 +467,8 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
         :param str|unicode jobstore: alias of the job store that most likely contains the job
         :return: the Job by the given ID, or ``None`` if it wasn't found
         :rtype: Job
-
         """
+
         with self._jobstores_lock:
             try:
                 return self._lookup_job(job_id, jobstore)[0]
@@ -598,34 +482,32 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
         :param str|unicode job_id: the identifier of the job
         :param str|unicode jobstore: alias of the job store that contains the job
         :raises JobLookupError: if the job was not found
-
         """
-        jobstore_alias = None
+
         with self._jobstores_lock:
             # Check if the job is among the pending jobs
-            if self.state == STATE_STOPPED:
-                for i, (job, alias, replace_existing) in enumerate(self._pending_jobs):
-                    if job.id == job_id and jobstore in (None, alias):
-                        del self._pending_jobs[i]
-                        jobstore_alias = alias
-                        break
+            for i, (job, jobstore_alias, replace_existing) in enumerate(self._pending_jobs):
+                if job.id == job_id:
+                    del self._pending_jobs[i]
+                    jobstore = jobstore_alias
+                    break
             else:
-                # Otherwise, try to remove it from each store until it succeeds or we run out of
-                # stores to check
+                # Otherwise, try to remove it from each store until it succeeds or we run out of stores to check
                 for alias, store in six.iteritems(self._jobstores):
                     if jobstore in (None, alias):
                         try:
                             store.remove_job(job_id)
-                            jobstore_alias = alias
-                            break
                         except JobLookupError:
                             continue
 
-        if jobstore_alias is None:
+                        jobstore = alias
+                        break
+
+        if jobstore is None:
             raise JobLookupError(job_id)
 
         # Notify listeners that a job has been removed
-        event = JobEvent(EVENT_JOB_REMOVED, job_id, jobstore_alias)
+        event = JobEvent(EVENT_JOB_REMOVED, job_id, jobstore)
         self._dispatch_event(event)
 
         self._logger.info('Removed job %s', job_id)
@@ -635,19 +517,17 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
         Removes all jobs from the specified job store, or all job stores if none is given.
 
         :param str|unicode jobstore: alias of the job store
-
         """
+
         with self._jobstores_lock:
-            if self.state == STATE_STOPPED:
-                if jobstore:
-                    self._pending_jobs = [pending for pending in self._pending_jobs if
-                                          pending[1] != jobstore]
-                else:
-                    self._pending_jobs = []
+            if jobstore:
+                self._pending_jobs = [pending for pending in self._pending_jobs if pending[1] != jobstore]
             else:
-                for alias, store in six.iteritems(self._jobstores):
-                    if jobstore in (None, alias):
-                        store.remove_all_jobs()
+                self._pending_jobs = []
+
+            for alias, store in six.iteritems(self._jobstores):
+                if jobstore in (None, alias):
+                    store.remove_all_jobs()
 
         self._dispatch_event(SchedulerEvent(EVENT_ALL_JOBS_REMOVED, jobstore))
 
@@ -655,34 +535,29 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
         """
         print_jobs(jobstore=None, out=sys.stdout)
 
-        Prints out a textual listing of all jobs currently scheduled on either all job stores or
-        just a specific one.
+        Prints out a textual listing of all jobs currently scheduled on either all job stores or just a specific one.
 
         :param str|unicode jobstore: alias of the job store, ``None`` to list jobs from all stores
-        :param file out: a file-like object to print to (defaults to  **sys.stdout** if nothing is
-            given)
-
+        :param file out: a file-like object to print to (defaults to **sys.stdout** if nothing is given)
         """
+
         out = out or sys.stdout
         with self._jobstores_lock:
-            if self.state == STATE_STOPPED:
-                print(u'Pending jobs:', file=out)
-                if self._pending_jobs:
-                    for job, jobstore_alias, replace_existing in self._pending_jobs:
-                        if jobstore in (None, jobstore_alias):
-                            print(u'    %s' % job, file=out)
-                else:
-                    print(u'    No pending jobs', file=out)
-            else:
-                for alias, store in sorted(six.iteritems(self._jobstores)):
-                    if jobstore in (None, alias):
-                        print(u'Jobstore %s:' % alias, file=out)
-                        jobs = store.get_all_jobs()
-                        if jobs:
-                            for job in jobs:
-                                print(u'    %s' % job, file=out)
-                        else:
-                            print(u'    No scheduled jobs', file=out)
+            if self._pending_jobs:
+                print(six.u('Pending jobs:'), file=out)
+                for job, jobstore_alias, replace_existing in self._pending_jobs:
+                    if jobstore in (None, jobstore_alias):
+                        print(six.u('    %s') % job, file=out)
+
+            for alias, store in six.iteritems(self._jobstores):
+                if jobstore in (None, alias):
+                    print(six.u('Jobstore %s:') % alias, file=out)
+                    jobs = store.get_all_jobs()
+                    if jobs:
+                        for job in jobs:
+                            print(six.u('    %s') % job, file=out)
+                    else:
+                        print(six.u('    No scheduled jobs'), file=out)
 
     @abstractmethod
     def wakeup(self):
@@ -699,7 +574,6 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
         # Set general options
         self._logger = maybe_ref(config.pop('logger', None)) or getLogger('apscheduler.scheduler')
         self.timezone = astimezone(config.pop('timezone', None)) or get_localzone()
-        self.jobstore_retry_interval = float(config.pop('jobstore_retry_interval', 10))
 
         # Set the job defaults
         job_defaults = config.get('job_defaults', {})
@@ -723,15 +597,12 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
                     cls = maybe_ref(executor_class)
                     executor = cls(**value)
                 else:
-                    raise ValueError(
-                        'Cannot create executor "%s" -- either "type" or "class" must be defined' %
-                        alias)
+                    raise ValueError('Cannot create executor "%s" -- either "type" or "class" must be defined' % alias)
 
                 self.add_executor(executor, alias)
             else:
-                raise TypeError(
-                    "Expected executor instance or dict for executors['%s'], got %s instead" %
-                    (alias, value.__class__.__name__))
+                raise TypeError("Expected executor instance or dict for executors['%s'], got %s instead" % (
+                    alias, value.__class__.__name__))
 
         # Configure job stores
         self._jobstores.clear()
@@ -747,33 +618,31 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
                     cls = maybe_ref(jobstore_class)
                     jobstore = cls(**value)
                 else:
-                    raise ValueError(
-                        'Cannot create job store "%s" -- either "type" or "class" must be '
-                        'defined' % alias)
+                    raise ValueError('Cannot create job store "%s" -- either "type" or "class" must be defined' % alias)
 
                 self.add_jobstore(jobstore, alias)
             else:
-                raise TypeError(
-                    "Expected job store instance or dict for jobstores['%s'], got %s instead" %
-                    (alias, value.__class__.__name__))
+                raise TypeError("Expected job store instance or dict for jobstores['%s'], got %s instead" % (
+                    alias, value.__class__.__name__))
 
     def _create_default_executor(self):
         """Creates a default executor store, specific to the particular scheduler type."""
+
         return ThreadPoolExecutor()
 
     def _create_default_jobstore(self):
         """Creates a default job store, specific to the particular scheduler type."""
+
         return MemoryJobStore()
 
     def _lookup_executor(self, alias):
         """
-        Returns the executor instance by the given name from the list of executors that were added
-        to this scheduler.
+        Returns the executor instance by the given name from the list of executors that were added to this scheduler.
 
         :type alias: str
         :raises KeyError: if no executor by the given alias is not found
-
         """
+
         try:
             return self._executors[alias]
         except KeyError:
@@ -781,13 +650,12 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
 
     def _lookup_jobstore(self, alias):
         """
-        Returns the job store instance by the given name from the list of job stores that were
-        added to this scheduler.
+        Returns the job store instance by the given name from the list of job stores that were added to this scheduler.
 
         :type alias: str
         :raises KeyError: if no job store by the given alias is not found
-
         """
+
         try:
             return self._jobstores[alias]
         except KeyError:
@@ -799,23 +667,21 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
 
         :type job_id: str
         :param str jobstore_alias: alias of a job store to look in
-        :return tuple[Job, str]: a tuple of job, jobstore alias (jobstore alias is None in case of
-            a pending job)
+        :return tuple[Job, str]: a tuple of job, jobstore alias (jobstore alias is None in case of a pending job)
         :raises JobLookupError: if no job by the given ID is found.
-
         """
-        if self.state == STATE_STOPPED:
-            # Check if the job is among the pending jobs
-            for job, alias, replace_existing in self._pending_jobs:
-                if job.id == job_id:
-                    return job, None
-        else:
-            # Look in all job stores
-            for alias, store in six.iteritems(self._jobstores):
-                if jobstore_alias in (None, alias):
-                    job = store.lookup_job(job_id)
-                    if job is not None:
-                        return job, alias
+
+        # Check if the job is among the pending jobs
+        for job, alias, replace_existing in self._pending_jobs:
+            if job.id == job_id:
+                return job, None
+
+        # Look in all job stores
+        for alias, store in six.iteritems(self._jobstores):
+            if jobstore_alias in (None, alias):
+                job = store.lookup_job(job_id)
+                if job is not None:
+                    return job, alias
 
         raise JobLookupError(job_id)
 
@@ -824,8 +690,8 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
         Dispatches the given event to interested listeners.
 
         :param SchedulerEvent event: the event to send
-
         """
+
         with self._listeners_lock:
             listeners = tuple(self._listeners)
 
@@ -833,24 +699,16 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
             if event.code & mask:
                 try:
                     cb(event)
-                except BaseException:
+                except:
                     self._logger.exception('Error notifying listener')
 
-    def _check_uwsgi(self):
-        """Check if we're running under uWSGI with threads disabled."""
-        uwsgi_module = sys.modules.get('uwsgi')
-        if not getattr(uwsgi_module, 'has_threads', True):
-            raise RuntimeError('The scheduler seems to be running under uWSGI, but threads have '
-                               'been disabled. You must run uWSGI with the --enable-threads '
-                               'option for the scheduler to work.')
-
-    def _real_add_job(self, job, jobstore_alias, replace_existing):
+    def _real_add_job(self, job, jobstore_alias, replace_existing, wakeup):
         """
         :param Job job: the job to add
-        :param bool replace_existing: ``True`` to use update_job() in case the job already exists
-            in the store
-
+        :param bool replace_existing: ``True`` to use update_job() in case the job already exists in the store
+        :param bool wakeup: ``True`` to wake up the scheduler after adding the job
         """
+
         # Fill in undefined values with defaults
         replacements = {}
         for key, value in six.iteritems(self._job_defaults):
@@ -885,11 +743,12 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
         self._logger.info('Added job "%s" to job store "%s"', job.name, jobstore_alias)
 
         # Notify the scheduler about the new job
-        if self.state == STATE_RUNNING:
+        if wakeup:
             self.wakeup()
 
     def _create_plugin_instance(self, type_, alias, constructor_kwargs):
         """Creates an instance of the given plugin type, loading the plugin first if necessary."""
+
         plugin_container, class_container, base_class = {
             'trigger': (self._trigger_plugins, self._trigger_classes, BaseTrigger),
             'jobstore': (self._jobstore_plugins, self._jobstore_classes, BaseJobStore),
@@ -902,8 +761,7 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
             if alias in plugin_container:
                 plugin_cls = class_container[alias] = plugin_container[alias].load()
                 if not issubclass(plugin_cls, base_class):
-                    raise TypeError('The {0} entry point does not point to a {0} class'.
-                                    format(type_))
+                    raise TypeError('The {0} entry point does not point to a {0} class'.format(type_))
             else:
                 raise LookupError('No {0} by the name "{1}" was found'.format(type_, alias))
 
@@ -915,8 +773,7 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
         elif trigger is None:
             trigger = 'date'
         elif not isinstance(trigger, six.string_types):
-            raise TypeError('Expected a trigger instance or string, got %s instead' %
-                            trigger.__class__.__name__)
+            raise TypeError('Expected a trigger instance or string, got %s instead' % trigger.__class__.__name__)
 
         # Use the scheduler's time zone if nothing else is specified
         trigger_args.setdefault('timezone', self.timezone)
@@ -926,48 +783,29 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
 
     def _create_lock(self):
         """Creates a reentrant lock object."""
+
         return RLock()
 
     def _process_jobs(self):
         """
-        Iterates through jobs in every jobstore, starts jobs that are due and figures out how long
-        to wait for the next round.
-
-        If the ``get_due_jobs()`` call raises an exception, a new wakeup is scheduled in at least
-        ``jobstore_retry_interval`` seconds.
-
+        Iterates through jobs in every jobstore, starts jobs that are due and figures out how long to wait for the next
+        round.
         """
-        if self.state == STATE_PAUSED:
-            self._logger.debug('Scheduler is paused -- not processing jobs')
-            return None
 
         self._logger.debug('Looking for jobs to run')
         now = datetime.now(self.timezone)
         next_wakeup_time = None
-        events = []
 
         with self._jobstores_lock:
             for jobstore_alias, jobstore in six.iteritems(self._jobstores):
-                try:
-                    due_jobs = jobstore.get_due_jobs(now)
-                except Exception as e:
-                    # Schedule a wakeup at least in jobstore_retry_interval seconds
-                    self._logger.warning('Error getting due jobs from job store %r: %s',
-                                         jobstore_alias, e)
-                    retry_wakeup_time = now + timedelta(seconds=self.jobstore_retry_interval)
-                    if not next_wakeup_time or next_wakeup_time > retry_wakeup_time:
-                        next_wakeup_time = retry_wakeup_time
-
-                    continue
-
-                for job in due_jobs:
+                for job in jobstore.get_due_jobs(now):
                     # Look up the job's executor
                     try:
                         executor = self._lookup_executor(job.executor)
-                    except BaseException:
+                    except:
                         self._logger.error(
-                            'Executor lookup ("%s") failed for job "%s" -- removing it from the '
-                            'job store', job.executor, job)
+                            'Executor lookup ("%s") failed for job "%s" -- removing it from the job store',
+                            job.executor, job)
                         self.remove_job(job.id, jobstore_alias)
                         continue
 
@@ -978,21 +816,12 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
                             executor.submit_job(job, run_times)
                         except MaxInstancesReachedError:
                             self._logger.warning(
-                                'Execution of job "%s" skipped: maximum number of running '
-                                'instances reached (%d)', job, job.max_instances)
-                            event = JobSubmissionEvent(EVENT_JOB_MAX_INSTANCES, job.id,
-                                                       jobstore_alias, run_times)
-                            events.append(event)
-                        except BaseException:
-                            self._logger.exception('Error submitting job "%s" to executor "%s"',
-                                                   job, job.executor)
-                        else:
-                            event = JobSubmissionEvent(EVENT_JOB_SUBMITTED, job.id, jobstore_alias,
-                                                       run_times)
-                            events.append(event)
+                                'Execution of job "%s" skipped: maximum number of running instances reached (%d)',
+                                job, job.max_instances)
+                        except:
+                            self._logger.exception('Error submitting job "%s" to executor "%s"', job, job.executor)
 
-                        # Update the job if it has a next execution time.
-                        # Otherwise remove it from the job store.
+                        # Update the job if it has a next execution time. Otherwise remove it from the job store.
                         job_next_run = job.trigger.get_next_fire_time(run_times[-1], now)
                         if job_next_run:
                             job._modify(next_run_time=job_next_run)
@@ -1000,27 +829,17 @@ class BaseScheduler(six.with_metaclass(ABCMeta)):
                         else:
                             self.remove_job(job.id, jobstore_alias)
 
-                # Set a new next wakeup time if there isn't one yet or
-                # the jobstore has an even earlier one
+                # Set a new next wakeup time if there isn't one yet or the jobstore has an even earlier one
                 jobstore_next_run_time = jobstore.get_next_run_time()
-                if jobstore_next_run_time and (next_wakeup_time is None or
-                                               jobstore_next_run_time < next_wakeup_time):
-                    next_wakeup_time = jobstore_next_run_time.astimezone(self.timezone)
-
-        # Dispatch collected events
-        for event in events:
-            self._dispatch_event(event)
+                if jobstore_next_run_time and (next_wakeup_time is None or jobstore_next_run_time < next_wakeup_time):
+                    next_wakeup_time = jobstore_next_run_time
 
         # Determine the delay until this method should be called again
-        if self.state == STATE_PAUSED:
-            wait_seconds = None
-            self._logger.debug('Scheduler is paused; waiting until resume() is called')
-        elif next_wakeup_time is None:
+        if next_wakeup_time is not None:
+            wait_seconds = max(timedelta_seconds(next_wakeup_time - now), 0)
+            self._logger.debug('Next wakeup is due at %s (in %f seconds)', next_wakeup_time, wait_seconds)
+        else:
             wait_seconds = None
             self._logger.debug('No jobs; waiting until a job is added')
-        else:
-            wait_seconds = min(max(timedelta_seconds(next_wakeup_time - now), 0), TIMEOUT_MAX)
-            self._logger.debug('Next wakeup is due at %s (in %f seconds)', next_wakeup_time,
-                               wait_seconds)
 
         return wait_seconds
diff --git a/lib/apscheduler/schedulers/blocking.py b/lib/apscheduler/schedulers/blocking.py
index 4ecc9f6f..2720822c 100644
--- a/lib/apscheduler/schedulers/blocking.py
+++ b/lib/apscheduler/schedulers/blocking.py
@@ -1,23 +1,21 @@
 from __future__ import absolute_import
-
 from threading import Event
 
-from apscheduler.schedulers.base import BaseScheduler, STATE_STOPPED
-from apscheduler.util import TIMEOUT_MAX
+from apscheduler.schedulers.base import BaseScheduler
 
 
 class BlockingScheduler(BaseScheduler):
     """
-    A scheduler that runs in the foreground
-    (:meth:`~apscheduler.schedulers.base.BaseScheduler.start` will block).
+    A scheduler that runs in the foreground (:meth:`~apscheduler.schedulers.base.BaseScheduler.start` will block).
     """
+
+    MAX_WAIT_TIME = 4294967  # Maximum value accepted by Event.wait() on Windows
+
     _event = None
 
-    def start(self, *args, **kwargs):
-        if self._event is None or self._event.is_set():
-            self._event = Event()
-
-        super(BlockingScheduler, self).start(*args, **kwargs)
+    def start(self):
+        super(BlockingScheduler, self).start()
+        self._event = Event()
         self._main_loop()
 
     def shutdown(self, wait=True):
@@ -25,11 +23,10 @@ class BlockingScheduler(BaseScheduler):
         self._event.set()
 
     def _main_loop(self):
-        wait_seconds = TIMEOUT_MAX
-        while self.state != STATE_STOPPED:
-            self._event.wait(wait_seconds)
-            self._event.clear()
+        while self.running:
             wait_seconds = self._process_jobs()
+            self._event.wait(wait_seconds if wait_seconds is not None else self.MAX_WAIT_TIME)
+            self._event.clear()
 
     def wakeup(self):
         self._event.set()
diff --git a/lib/apscheduler/schedulers/gevent.py b/lib/apscheduler/schedulers/gevent.py
index d48ed74a..9cce6589 100644
--- a/lib/apscheduler/schedulers/gevent.py
+++ b/lib/apscheduler/schedulers/gevent.py
@@ -16,14 +16,14 @@ class GeventScheduler(BlockingScheduler):
 
     _greenlet = None
 
-    def start(self, *args, **kwargs):
+    def start(self):
+        BaseScheduler.start(self)
         self._event = Event()
-        BaseScheduler.start(self, *args, **kwargs)
         self._greenlet = gevent.spawn(self._main_loop)
         return self._greenlet
 
-    def shutdown(self, *args, **kwargs):
-        super(GeventScheduler, self).shutdown(*args, **kwargs)
+    def shutdown(self, wait=True):
+        super(GeventScheduler, self).shutdown(wait)
         self._greenlet.join()
         del self._greenlet
 
diff --git a/lib/apscheduler/schedulers/qt.py b/lib/apscheduler/schedulers/qt.py
index 890a44a8..dde5afaa 100644
--- a/lib/apscheduler/schedulers/qt.py
+++ b/lib/apscheduler/schedulers/qt.py
@@ -4,21 +4,14 @@ from apscheduler.schedulers.base import BaseScheduler
 
 try:
     from PyQt5.QtCore import QObject, QTimer
-except (ImportError, RuntimeError):  # pragma: nocover
+except ImportError:  # pragma: nocover
     try:
         from PyQt4.QtCore import QObject, QTimer
     except ImportError:
         try:
-            from PySide6.QtCore import QObject, QTimer  # noqa
+            from PySide.QtCore import QObject, QTimer  # flake8: noqa
         except ImportError:
-            try:
-                from PySide2.QtCore import QObject, QTimer  # noqa
-            except ImportError:
-                try:
-                    from PySide.QtCore import QObject, QTimer  # noqa
-                except ImportError:
-                    raise ImportError('QtScheduler requires either PyQt5, PyQt4, PySide6, PySide2 '
-                                      'or PySide installed')
+            raise ImportError('QtScheduler requires either PyQt5, PyQt4 or PySide installed')
 
 
 class QtScheduler(BaseScheduler):
@@ -26,15 +19,18 @@ class QtScheduler(BaseScheduler):
 
     _timer = None
 
-    def shutdown(self, *args, **kwargs):
-        super(QtScheduler, self).shutdown(*args, **kwargs)
+    def start(self):
+        super(QtScheduler, self).start()
+        self.wakeup()
+
+    def shutdown(self, wait=True):
+        super(QtScheduler, self).shutdown(wait)
         self._stop_timer()
 
     def _start_timer(self, wait_seconds):
         self._stop_timer()
         if wait_seconds is not None:
-            wait_time = min(int(wait_seconds * 1000), 2147483647)
-            self._timer = QTimer.singleShot(wait_time, self._process_jobs)
+            self._timer = QTimer.singleShot(wait_seconds * 1000, self._process_jobs)
 
     def _stop_timer(self):
         if self._timer:
diff --git a/lib/apscheduler/schedulers/tornado.py b/lib/apscheduler/schedulers/tornado.py
index 0a9171f2..78093308 100644
--- a/lib/apscheduler/schedulers/tornado.py
+++ b/lib/apscheduler/schedulers/tornado.py
@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-
 from datetime import timedelta
 from functools import wraps
 
@@ -23,8 +22,6 @@ class TornadoScheduler(BaseScheduler):
     """
     A scheduler that runs on a Tornado IOLoop.
 
-    The default executor can run jobs based on native coroutines (``async def``).
-
     =========== ===============================================================
     ``io_loop`` Tornado IOLoop instance to use (defaults to the global IO loop)
     =========== ===============================================================
@@ -33,6 +30,10 @@ class TornadoScheduler(BaseScheduler):
     _ioloop = None
     _timeout = None
 
+    def start(self):
+        super(TornadoScheduler, self).start()
+        self.wakeup()
+
     @run_in_ioloop
     def shutdown(self, wait=True):
         super(TornadoScheduler, self).shutdown(wait)
@@ -52,10 +53,6 @@ class TornadoScheduler(BaseScheduler):
             self._ioloop.remove_timeout(self._timeout)
             del self._timeout
 
-    def _create_default_executor(self):
-        from apscheduler.executors.tornado import TornadoExecutor
-        return TornadoExecutor()
-
     @run_in_ioloop
     def wakeup(self):
         self._stop_timer()
diff --git a/lib/apscheduler/schedulers/twisted.py b/lib/apscheduler/schedulers/twisted.py
index 6b43a84b..166b6130 100644
--- a/lib/apscheduler/schedulers/twisted.py
+++ b/lib/apscheduler/schedulers/twisted.py
@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-
 from functools import wraps
 
 from apscheduler.schedulers.base import BaseScheduler
@@ -36,6 +35,10 @@ class TwistedScheduler(BaseScheduler):
         self._reactor = maybe_ref(config.pop('reactor', default_reactor))
         super(TwistedScheduler, self)._configure(config)
 
+    def start(self):
+        super(TwistedScheduler, self).start()
+        self.wakeup()
+
     @run_in_reactor
     def shutdown(self, wait=True):
         super(TwistedScheduler, self).shutdown(wait)
diff --git a/lib/apscheduler/triggers/base.py b/lib/apscheduler/triggers/base.py
index 55d010db..3520d316 100644
--- a/lib/apscheduler/triggers/base.py
+++ b/lib/apscheduler/triggers/base.py
@@ -1,6 +1,4 @@
 from abc import ABCMeta, abstractmethod
-from datetime import timedelta
-import random
 
 import six
 
@@ -8,30 +6,11 @@ import six
 class BaseTrigger(six.with_metaclass(ABCMeta)):
     """Abstract base class that defines the interface that every trigger must implement."""
 
-    __slots__ = ()
-
     @abstractmethod
     def get_next_fire_time(self, previous_fire_time, now):
         """
-        Returns the next datetime to fire on, If no such datetime can be calculated, returns
-        ``None``.
+        Returns the next datetime to fire on, If no such datetime can be calculated, returns ``None``.
 
         :param datetime.datetime previous_fire_time: the previous time the trigger was fired
         :param datetime.datetime now: current datetime
         """
-
-    def _apply_jitter(self, next_fire_time, jitter, now):
-        """
-        Randomize ``next_fire_time`` by adding a random value (the jitter).
-
-        :param datetime.datetime|None next_fire_time: next fire time without jitter applied. If
-            ``None``, returns ``None``.
-        :param int|None jitter: maximum number of seconds to add to ``next_fire_time``
-            (if ``None`` or ``0``, returns ``next_fire_time``)
-        :param datetime.datetime now: current datetime
-        :return datetime.datetime|None: next fire time with a jitter.
-        """
-        if next_fire_time is None or not jitter:
-            return next_fire_time
-
-        return next_fire_time + timedelta(seconds=random.uniform(0, jitter))
diff --git a/lib/apscheduler/triggers/combining.py b/lib/apscheduler/triggers/combining.py
deleted file mode 100644
index bb900061..00000000
--- a/lib/apscheduler/triggers/combining.py
+++ /dev/null
@@ -1,95 +0,0 @@
-from apscheduler.triggers.base import BaseTrigger
-from apscheduler.util import obj_to_ref, ref_to_obj
-
-
-class BaseCombiningTrigger(BaseTrigger):
-    __slots__ = ('triggers', 'jitter')
-
-    def __init__(self, triggers, jitter=None):
-        self.triggers = triggers
-        self.jitter = jitter
-
-    def __getstate__(self):
-        return {
-            'version': 1,
-            'triggers': [(obj_to_ref(trigger.__class__), trigger.__getstate__())
-                         for trigger in self.triggers],
-            'jitter': self.jitter
-        }
-
-    def __setstate__(self, state):
-        if state.get('version', 1) > 1:
-            raise ValueError(
-                'Got serialized data for version %s of %s, but only versions up to 1 can be '
-                'handled' % (state['version'], self.__class__.__name__))
-
-        self.jitter = state['jitter']
-        self.triggers = []
-        for clsref, state in state['triggers']:
-            cls = ref_to_obj(clsref)
-            trigger = cls.__new__(cls)
-            trigger.__setstate__(state)
-            self.triggers.append(trigger)
-
-    def __repr__(self):
-        return '<{}({}{})>'.format(self.__class__.__name__, self.triggers,
-                                   ', jitter={}'.format(self.jitter) if self.jitter else '')
-
-
-class AndTrigger(BaseCombiningTrigger):
-    """
-    Always returns the earliest next fire time that all the given triggers can agree on.
-    The trigger is considered to be finished when any of the given triggers has finished its
-    schedule.
-
-    Trigger alias: ``and``
-
-    :param list triggers: triggers to combine
-    :param int|None jitter: delay the job execution by ``jitter`` seconds at most
-    """
-
-    __slots__ = ()
-
-    def get_next_fire_time(self, previous_fire_time, now):
-        while True:
-            fire_times = [trigger.get_next_fire_time(previous_fire_time, now)
-                          for trigger in self.triggers]
-            if None in fire_times:
-                return None
-            elif min(fire_times) == max(fire_times):
-                return self._apply_jitter(fire_times[0], self.jitter, now)
-            else:
-                now = max(fire_times)
-
-    def __str__(self):
-        return 'and[{}]'.format(', '.join(str(trigger) for trigger in self.triggers))
-
-
-class OrTrigger(BaseCombiningTrigger):
-    """
-    Always returns the earliest next fire time produced by any of the given triggers.
-    The trigger is considered finished when all the given triggers have finished their schedules.
-
-    Trigger alias: ``or``
-
-    :param list triggers: triggers to combine
-    :param int|None jitter: delay the job execution by ``jitter`` seconds at most
-
-    .. note:: Triggers that depends on the previous fire time, such as the interval trigger, may
-        seem to behave strangely since they are always passed the previous fire time produced by
-        any of the given triggers.
-    """
-
-    __slots__ = ()
-
-    def get_next_fire_time(self, previous_fire_time, now):
-        fire_times = [trigger.get_next_fire_time(previous_fire_time, now)
-                      for trigger in self.triggers]
-        fire_times = [fire_time for fire_time in fire_times if fire_time is not None]
-        if fire_times:
-            return self._apply_jitter(min(fire_times), self.jitter, now)
-        else:
-            return None
-
-    def __str__(self):
-        return 'or[{}]'.format(', '.join(str(trigger) for trigger in self.triggers))
diff --git a/lib/apscheduler/triggers/cron/__init__.py b/lib/apscheduler/triggers/cron/__init__.py
index b5389dd2..8df901ea 100644
--- a/lib/apscheduler/triggers/cron/__init__.py
+++ b/lib/apscheduler/triggers/cron/__init__.py
@@ -4,20 +4,17 @@ from tzlocal import get_localzone
 import six
 
 from apscheduler.triggers.base import BaseTrigger
-from apscheduler.triggers.cron.fields import (
-    BaseField, MonthField, WeekField, DayOfMonthField, DayOfWeekField, DEFAULT_VALUES)
-from apscheduler.util import (
-    datetime_ceil, convert_to_datetime, datetime_repr, astimezone, localize, normalize)
+from apscheduler.triggers.cron.fields import BaseField, WeekField, DayOfMonthField, DayOfWeekField, DEFAULT_VALUES
+from apscheduler.util import datetime_ceil, convert_to_datetime, datetime_repr, astimezone
 
 
 class CronTrigger(BaseTrigger):
     """
-    Triggers when current time matches all specified time constraints,
-    similarly to how the UNIX cron scheduler works.
+    Triggers when current time matches all specified time constraints, similarly to how the UNIX cron scheduler works.
 
     :param int|str year: 4-digit year
     :param int|str month: month (1-12)
-    :param int|str day: day of month (1-31)
+    :param int|str day: day of the (1-31)
     :param int|str week: ISO week (1-53)
     :param int|str day_of_week: number or name of weekday (0-6 or mon,tue,wed,thu,fri,sat,sun)
     :param int|str hour: hour (0-23)
@@ -25,9 +22,8 @@ class CronTrigger(BaseTrigger):
     :param int|str second: second (0-59)
     :param datetime|str start_date: earliest possible date/time to trigger on (inclusive)
     :param datetime|str end_date: latest possible date/time to trigger on (inclusive)
-    :param datetime.tzinfo|str timezone: time zone to use for the date/time calculations (defaults
-        to scheduler timezone)
-    :param int|None jitter: delay the job execution by ``jitter`` seconds at most
+    :param datetime.tzinfo|str timezone: time zone to use for the date/time calculations
+                                         (defaults to scheduler timezone)
 
     .. note:: The first weekday is always **monday**.
     """
@@ -35,7 +31,7 @@ class CronTrigger(BaseTrigger):
     FIELD_NAMES = ('year', 'month', 'day', 'week', 'day_of_week', 'hour', 'minute', 'second')
     FIELDS_MAP = {
         'year': BaseField,
-        'month': MonthField,
+        'month': BaseField,
         'week': WeekField,
         'day': DayOfMonthField,
         'day_of_week': DayOfWeekField,
@@ -44,16 +40,15 @@ class CronTrigger(BaseTrigger):
         'second': BaseField
     }
 
-    __slots__ = 'timezone', 'start_date', 'end_date', 'fields', 'jitter'
+    __slots__ = 'timezone', 'start_date', 'end_date', 'fields'
 
-    def __init__(self, year=None, month=None, day=None, week=None, day_of_week=None, hour=None,
-                 minute=None, second=None, start_date=None, end_date=None, timezone=None,
-                 jitter=None):
+    def __init__(self, year=None, month=None, day=None, week=None, day_of_week=None, hour=None, minute=None,
+                 second=None, start_date=None, end_date=None, timezone=None):
         if timezone:
             self.timezone = astimezone(timezone)
-        elif isinstance(start_date, datetime) and start_date.tzinfo:
+        elif start_date and start_date.tzinfo:
             self.timezone = start_date.tzinfo
-        elif isinstance(end_date, datetime) and end_date.tzinfo:
+        elif end_date and end_date.tzinfo:
             self.timezone = end_date.tzinfo
         else:
             self.timezone = get_localzone()
@@ -61,8 +56,6 @@ class CronTrigger(BaseTrigger):
         self.start_date = convert_to_datetime(start_date, self.timezone, 'start_date')
         self.end_date = convert_to_datetime(end_date, self.timezone, 'end_date')
 
-        self.jitter = jitter
-
         values = dict((key, value) for (key, value) in six.iteritems(locals())
                       if key in self.FIELD_NAMES and value is not None)
         self.fields = []
@@ -83,35 +76,13 @@ class CronTrigger(BaseTrigger):
             field = field_class(field_name, exprs, is_default)
             self.fields.append(field)
 
-    @classmethod
-    def from_crontab(cls, expr, timezone=None):
-        """
-        Create a :class:`~CronTrigger` from a standard crontab expression.
-
-        See https://en.wikipedia.org/wiki/Cron for more information on the format accepted here.
-
-        :param expr: minute, hour, day of month, month, day of week
-        :param datetime.tzinfo|str timezone: time zone to use for the date/time calculations (
-            defaults to scheduler timezone)
-        :return: a :class:`~CronTrigger` instance
-
-        """
-        values = expr.split()
-        if len(values) != 5:
-            raise ValueError('Wrong number of fields; got {}, expected 5'.format(len(values)))
-
-        return cls(minute=values[0], hour=values[1], day=values[2], month=values[3],
-                   day_of_week=values[4], timezone=timezone)
-
     def _increment_field_value(self, dateval, fieldnum):
         """
-        Increments the designated field and resets all less significant fields to their minimum
-        values.
+        Increments the designated field and resets all less significant fields to their minimum values.
 
         :type dateval: datetime
         :type fieldnum: int
-        :return: a tuple containing the new date, and the number of the field that was actually
-            incremented
+        :return: a tuple containing the new date, and the number of the field that was actually incremented
         :rtype: tuple
         """
 
@@ -144,7 +115,7 @@ class CronTrigger(BaseTrigger):
                     i += 1
 
         difference = datetime(**values) - dateval.replace(tzinfo=None)
-        return normalize(dateval + difference), fieldnum
+        return self.timezone.normalize(dateval + difference), fieldnum
 
     def _set_field_value(self, dateval, fieldnum, new_value):
         values = {}
@@ -157,13 +128,12 @@ class CronTrigger(BaseTrigger):
                 else:
                     values[field.name] = new_value
 
-        return localize(datetime(**values), self.timezone)
+        difference = datetime(**values) - dateval.replace(tzinfo=None)
+        return self.timezone.normalize(dateval + difference)
 
     def get_next_fire_time(self, previous_fire_time, now):
         if previous_fire_time:
-            start_date = min(now, previous_fire_time + timedelta(microseconds=1))
-            if start_date == previous_fire_time:
-                start_date += timedelta(microseconds=1)
+            start_date = max(now, previous_fire_time + timedelta(microseconds=1))
         else:
             start_date = max(now, self.start_date) if self.start_date else now
 
@@ -193,34 +163,7 @@ class CronTrigger(BaseTrigger):
                 return None
 
         if fieldnum >= 0:
-            next_date = self._apply_jitter(next_date, self.jitter, now)
-            return min(next_date, self.end_date) if self.end_date else next_date
-
-    def __getstate__(self):
-        return {
-            'version': 2,
-            'timezone': self.timezone,
-            'start_date': self.start_date,
-            'end_date': self.end_date,
-            'fields': self.fields,
-            'jitter': self.jitter,
-        }
-
-    def __setstate__(self, state):
-        # This is for compatibility with APScheduler 3.0.x
-        if isinstance(state, tuple):
-            state = state[1]
-
-        if state.get('version', 1) > 2:
-            raise ValueError(
-                'Got serialized data for version %s of %s, but only versions up to 2 can be '
-                'handled' % (state['version'], self.__class__.__name__))
-
-        self.timezone = state['timezone']
-        self.start_date = state['start_date']
-        self.end_date = state['end_date']
-        self.fields = state['fields']
-        self.jitter = state.get('jitter')
+            return next_date
 
     def __str__(self):
         options = ["%s='%s'" % (f.name, f) for f in self.fields if not f.is_default]
@@ -229,11 +172,5 @@ class CronTrigger(BaseTrigger):
     def __repr__(self):
         options = ["%s='%s'" % (f.name, f) for f in self.fields if not f.is_default]
         if self.start_date:
-            options.append("start_date=%r" % datetime_repr(self.start_date))
-        if self.end_date:
-            options.append("end_date=%r" % datetime_repr(self.end_date))
-        if self.jitter:
-            options.append('jitter=%s' % self.jitter)
-
-        return "<%s (%s, timezone='%s')>" % (
-            self.__class__.__name__, ', '.join(options), self.timezone)
+            options.append("start_date='%s'" % datetime_repr(self.start_date))
+        return '<%s (%s)>' % (self.__class__.__name__, ', '.join(options))
diff --git a/lib/apscheduler/triggers/cron/expressions.py b/lib/apscheduler/triggers/cron/expressions.py
index 55a37167..55272db4 100644
--- a/lib/apscheduler/triggers/cron/expressions.py
+++ b/lib/apscheduler/triggers/cron/expressions.py
@@ -1,16 +1,17 @@
-"""This module contains the expressions applicable for CronTrigger's fields."""
+"""
+This module contains the expressions applicable for CronTrigger's fields.
+"""
 
 from calendar import monthrange
 import re
 
 from apscheduler.util import asint
 
-__all__ = ('AllExpression', 'RangeExpression', 'WeekdayRangeExpression',
-           'WeekdayPositionExpression', 'LastDayOfMonthExpression')
+__all__ = ('AllExpression', 'RangeExpression', 'WeekdayRangeExpression', 'WeekdayPositionExpression',
+           'LastDayOfMonthExpression')
 
 
 WEEKDAYS = ['mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun']
-MONTHS = ['jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul', 'aug', 'sep', 'oct', 'nov', 'dec']
 
 
 class AllExpression(object):
@@ -21,14 +22,6 @@ class AllExpression(object):
         if self.step == 0:
             raise ValueError('Increment must be higher than 0')
 
-    def validate_range(self, field_name):
-        from apscheduler.triggers.cron.fields import MIN_VALUES, MAX_VALUES
-
-        value_range = MAX_VALUES[field_name] - MIN_VALUES[field_name]
-        if self.step and self.step > value_range:
-            raise ValueError('the step value ({}) is higher than the total range of the '
-                             'expression ({})'.format(self.step, value_range))
-
     def get_next_value(self, date, field):
         start = field.get_value(date)
         minval = field.get_min(date)
@@ -44,9 +37,6 @@ class AllExpression(object):
         if next <= maxval:
             return next
 
-    def __eq__(self, other):
-        return isinstance(other, self.__class__) and self.step == other.step
-
     def __str__(self):
         if self.step:
             return '*/%d' % self.step
@@ -61,7 +51,7 @@ class RangeExpression(AllExpression):
         r'(?P<first>\d+)(?:-(?P<last>\d+))?(?:/(?P<step>\d+))?$')
 
     def __init__(self, first, last=None, step=None):
-        super(RangeExpression, self).__init__(step)
+        AllExpression.__init__(self, step)
         first = asint(first)
         last = asint(last)
         if last is None and step is None:
@@ -71,41 +61,25 @@ class RangeExpression(AllExpression):
         self.first = first
         self.last = last
 
-    def validate_range(self, field_name):
-        from apscheduler.triggers.cron.fields import MIN_VALUES, MAX_VALUES
-
-        super(RangeExpression, self).validate_range(field_name)
-        if self.first < MIN_VALUES[field_name]:
-            raise ValueError('the first value ({}) is lower than the minimum value ({})'
-                             .format(self.first, MIN_VALUES[field_name]))
-        if self.last is not None and self.last > MAX_VALUES[field_name]:
-            raise ValueError('the last value ({}) is higher than the maximum value ({})'
-                             .format(self.last, MAX_VALUES[field_name]))
-        value_range = (self.last or MAX_VALUES[field_name]) - self.first
-        if self.step and self.step > value_range:
-            raise ValueError('the step value ({}) is higher than the total range of the '
-                             'expression ({})'.format(self.step, value_range))
-
     def get_next_value(self, date, field):
-        startval = field.get_value(date)
+        start = field.get_value(date)
         minval = field.get_min(date)
         maxval = field.get_max(date)
 
         # Apply range limits
         minval = max(minval, self.first)
-        maxval = min(maxval, self.last) if self.last is not None else maxval
-        nextval = max(minval, startval)
+        if self.last is not None:
+            maxval = min(maxval, self.last)
+        start = max(start, minval)
 
-        # Apply the step if defined
-        if self.step:
-            distance_to_next = (self.step - (nextval - minval)) % self.step
-            nextval += distance_to_next
+        if not self.step:
+            next = start
+        else:
+            distance_to_next = (self.step - (start - minval)) % self.step
+            next = start + distance_to_next
 
-        return nextval if nextval <= maxval else None
-
-    def __eq__(self, other):
-        return (isinstance(other, self.__class__) and self.first == other.first and
-                self.last == other.last)
+        if next <= maxval:
+            return next
 
     def __str__(self):
         if self.last != self.first and self.last is not None:
@@ -126,37 +100,6 @@ class RangeExpression(AllExpression):
         return "%s(%s)" % (self.__class__.__name__, ', '.join(args))
 
 
-class MonthRangeExpression(RangeExpression):
-    value_re = re.compile(r'(?P<first>[a-z]+)(?:-(?P<last>[a-z]+))?', re.IGNORECASE)
-
-    def __init__(self, first, last=None):
-        try:
-            first_num = MONTHS.index(first.lower()) + 1
-        except ValueError:
-            raise ValueError('Invalid month name "%s"' % first)
-
-        if last:
-            try:
-                last_num = MONTHS.index(last.lower()) + 1
-            except ValueError:
-                raise ValueError('Invalid month name "%s"' % last)
-        else:
-            last_num = None
-
-        super(MonthRangeExpression, self).__init__(first_num, last_num)
-
-    def __str__(self):
-        if self.last != self.first and self.last is not None:
-            return '%s-%s' % (MONTHS[self.first - 1], MONTHS[self.last - 1])
-        return MONTHS[self.first - 1]
-
-    def __repr__(self):
-        args = ["'%s'" % MONTHS[self.first]]
-        if self.last != self.first and self.last is not None:
-            args.append("'%s'" % MONTHS[self.last - 1])
-        return "%s(%s)" % (self.__class__.__name__, ', '.join(args))
-
-
 class WeekdayRangeExpression(RangeExpression):
     value_re = re.compile(r'(?P<first>[a-z]+)(?:-(?P<last>[a-z]+))?', re.IGNORECASE)
 
@@ -174,7 +117,7 @@ class WeekdayRangeExpression(RangeExpression):
         else:
             last_num = None
 
-        super(WeekdayRangeExpression, self).__init__(first_num, last_num)
+        RangeExpression.__init__(self, first_num, last_num)
 
     def __str__(self):
         if self.last != self.first and self.last is not None:
@@ -190,11 +133,9 @@ class WeekdayRangeExpression(RangeExpression):
 
 class WeekdayPositionExpression(AllExpression):
     options = ['1st', '2nd', '3rd', '4th', '5th', 'last']
-    value_re = re.compile(r'(?P<option_name>%s) +(?P<weekday_name>(?:\d+|\w+))' %
-                          '|'.join(options), re.IGNORECASE)
+    value_re = re.compile(r'(?P<option_name>%s) +(?P<weekday_name>(?:\d+|\w+))' % '|'.join(options), re.IGNORECASE)
 
     def __init__(self, option_name, weekday_name):
-        super(WeekdayPositionExpression, self).__init__(None)
         try:
             self.option_num = self.options.index(option_name.lower())
         except ValueError:
@@ -206,7 +147,8 @@ class WeekdayPositionExpression(AllExpression):
             raise ValueError('Invalid weekday name "%s"' % weekday_name)
 
     def get_next_value(self, date, field):
-        # Figure out the weekday of the month's first day and the number of days in that month
+        # Figure out the weekday of the month's first day and the number
+        # of days in that month
         first_day_wday, last_day = monthrange(date.year, date.month)
 
         # Calculate which day of the month is the first of the target weekdays
@@ -218,28 +160,23 @@ class WeekdayPositionExpression(AllExpression):
         if self.option_num < 5:
             target_day = first_hit_day + self.option_num * 7
         else:
-            target_day = first_hit_day + ((last_day - first_hit_day) // 7) * 7
+            target_day = first_hit_day + ((last_day - first_hit_day) / 7) * 7
 
         if target_day <= last_day and target_day >= date.day:
             return target_day
 
-    def __eq__(self, other):
-        return (super(WeekdayPositionExpression, self).__eq__(other) and
-                self.option_num == other.option_num and self.weekday == other.weekday)
-
     def __str__(self):
         return '%s %s' % (self.options[self.option_num], WEEKDAYS[self.weekday])
 
     def __repr__(self):
-        return "%s('%s', '%s')" % (self.__class__.__name__, self.options[self.option_num],
-                                   WEEKDAYS[self.weekday])
+        return "%s('%s', '%s')" % (self.__class__.__name__, self.options[self.option_num], WEEKDAYS[self.weekday])
 
 
 class LastDayOfMonthExpression(AllExpression):
     value_re = re.compile(r'last', re.IGNORECASE)
 
     def __init__(self):
-        super(LastDayOfMonthExpression, self).__init__(None)
+        pass
 
     def get_next_value(self, date, field):
         return monthrange(date.year, date.month)[1]
diff --git a/lib/apscheduler/triggers/cron/fields.py b/lib/apscheduler/triggers/cron/fields.py
index 86d620c4..e220599f 100644
--- a/lib/apscheduler/triggers/cron/fields.py
+++ b/lib/apscheduler/triggers/cron/fields.py
@@ -1,26 +1,22 @@
-"""Fields represent CronTrigger options which map to :class:`~datetime.datetime` fields."""
+"""
+Fields represent CronTrigger options which map to :class:`~datetime.datetime`
+fields.
+"""
 
 from calendar import monthrange
-import re
-
-import six
 
 from apscheduler.triggers.cron.expressions import (
-    AllExpression, RangeExpression, WeekdayPositionExpression, LastDayOfMonthExpression,
-    WeekdayRangeExpression, MonthRangeExpression)
+    AllExpression, RangeExpression, WeekdayPositionExpression, LastDayOfMonthExpression, WeekdayRangeExpression)
 
 
-__all__ = ('MIN_VALUES', 'MAX_VALUES', 'DEFAULT_VALUES', 'BaseField', 'WeekField',
-           'DayOfMonthField', 'DayOfWeekField')
+__all__ = ('MIN_VALUES', 'MAX_VALUES', 'DEFAULT_VALUES', 'BaseField', 'WeekField', 'DayOfMonthField', 'DayOfWeekField')
 
 
-MIN_VALUES = {'year': 1970, 'month': 1, 'day': 1, 'week': 1, 'day_of_week': 0, 'hour': 0,
-              'minute': 0, 'second': 0}
-MAX_VALUES = {'year': 9999, 'month': 12, 'day': 31, 'week': 53, 'day_of_week': 6, 'hour': 23,
-              'minute': 59, 'second': 59}
-DEFAULT_VALUES = {'year': '*', 'month': 1, 'day': 1, 'week': '*', 'day_of_week': '*', 'hour': 0,
-                  'minute': 0, 'second': 0}
-SEPARATOR = re.compile(' *, *')
+MIN_VALUES = {'year': 1970, 'month': 1, 'day': 1, 'week': 1, 'day_of_week': 0, 'hour': 0, 'minute': 0, 'second': 0}
+MAX_VALUES = {'year': 2 ** 63, 'month': 12, 'day:': 31, 'week': 53, 'day_of_week': 6, 'hour': 23, 'minute': 59,
+              'second': 59}
+DEFAULT_VALUES = {'year': '*', 'month': 1, 'day': 1, 'week': '*', 'day_of_week': '*', 'hour': 0, 'minute': 0,
+                  'second': 0}
 
 
 class BaseField(object):
@@ -54,29 +50,23 @@ class BaseField(object):
         self.expressions = []
 
         # Split a comma-separated expression list, if any
-        for expr in SEPARATOR.split(str(exprs).strip()):
-            self.compile_expression(expr)
+        exprs = str(exprs).strip()
+        if ',' in exprs:
+            for expr in exprs.split(','):
+                self.compile_expression(expr)
+        else:
+            self.compile_expression(exprs)
 
     def compile_expression(self, expr):
         for compiler in self.COMPILERS:
             match = compiler.value_re.match(expr)
             if match:
                 compiled_expr = compiler(**match.groupdict())
-
-                try:
-                    compiled_expr.validate_range(self.name)
-                except ValueError as e:
-                    exc = ValueError('Error validating expression {!r}: {}'.format(expr, e))
-                    six.raise_from(exc, None)
-
                 self.expressions.append(compiled_expr)
                 return
 
         raise ValueError('Unrecognized expression "%s" for field "%s"' % (expr, self.name))
 
-    def __eq__(self, other):
-        return isinstance(self, self.__class__) and self.expressions == other.expressions
-
     def __str__(self):
         expr_strings = (str(e) for e in self.expressions)
         return ','.join(expr_strings)
@@ -105,7 +95,3 @@ class DayOfWeekField(BaseField):
 
     def get_value(self, dateval):
         return dateval.weekday()
-
-
-class MonthField(BaseField):
-    COMPILERS = BaseField.COMPILERS + [MonthRangeExpression]
diff --git a/lib/apscheduler/triggers/date.py b/lib/apscheduler/triggers/date.py
index 07681008..237e6b4e 100644
--- a/lib/apscheduler/triggers/date.py
+++ b/lib/apscheduler/triggers/date.py
@@ -14,36 +14,15 @@ class DateTrigger(BaseTrigger):
     :param datetime.tzinfo|str timezone: time zone for ``run_date`` if it doesn't have one already
     """
 
-    __slots__ = 'run_date'
+    __slots__ = 'timezone', 'run_date'
 
     def __init__(self, run_date=None, timezone=None):
         timezone = astimezone(timezone) or get_localzone()
-        if run_date is not None:
-            self.run_date = convert_to_datetime(run_date, timezone, 'run_date')
-        else:
-            self.run_date = datetime.now(timezone)
+        self.run_date = convert_to_datetime(run_date or datetime.now(), timezone, 'run_date')
 
     def get_next_fire_time(self, previous_fire_time, now):
         return self.run_date if previous_fire_time is None else None
 
-    def __getstate__(self):
-        return {
-            'version': 1,
-            'run_date': self.run_date
-        }
-
-    def __setstate__(self, state):
-        # This is for compatibility with APScheduler 3.0.x
-        if isinstance(state, tuple):
-            state = state[1]
-
-        if state.get('version', 1) > 1:
-            raise ValueError(
-                'Got serialized data for version %s of %s, but only version 1 can be handled' %
-                (state['version'], self.__class__.__name__))
-
-        self.run_date = state['run_date']
-
     def __str__(self):
         return 'date[%s]' % datetime_repr(self.run_date)
 
diff --git a/lib/apscheduler/triggers/interval.py b/lib/apscheduler/triggers/interval.py
index b0e2dbdd..df9e6fe7 100644
--- a/lib/apscheduler/triggers/interval.py
+++ b/lib/apscheduler/triggers/interval.py
@@ -4,15 +4,13 @@ from math import ceil
 from tzlocal import get_localzone
 
 from apscheduler.triggers.base import BaseTrigger
-from apscheduler.util import (
-    convert_to_datetime, normalize, timedelta_seconds, datetime_repr,
-    astimezone)
+from apscheduler.util import convert_to_datetime, timedelta_seconds, datetime_repr, astimezone
 
 
 class IntervalTrigger(BaseTrigger):
     """
-    Triggers on specified intervals, starting on ``start_date`` if specified, ``datetime.now()`` +
-    interval otherwise.
+    Triggers on specified intervals, starting on ``start_date`` if specified, ``datetime.now()`` + interval
+    otherwise.
 
     :param int weeks: number of weeks to wait
     :param int days: number of days to wait
@@ -22,15 +20,12 @@ class IntervalTrigger(BaseTrigger):
     :param datetime|str start_date: starting point for the interval calculation
     :param datetime|str end_date: latest possible date/time to trigger on
     :param datetime.tzinfo|str timezone: time zone to use for the date/time calculations
-    :param int|None jitter: delay the job execution by ``jitter`` seconds at most
     """
 
-    __slots__ = 'timezone', 'start_date', 'end_date', 'interval', 'interval_length', 'jitter'
+    __slots__ = 'timezone', 'start_date', 'end_date', 'interval'
 
-    def __init__(self, weeks=0, days=0, hours=0, minutes=0, seconds=0, start_date=None,
-                 end_date=None, timezone=None, jitter=None):
-        self.interval = timedelta(weeks=weeks, days=days, hours=hours, minutes=minutes,
-                                  seconds=seconds)
+    def __init__(self, weeks=0, days=0, hours=0, minutes=0, seconds=0, start_date=None, end_date=None, timezone=None):
+        self.interval = timedelta(weeks=weeks, days=days, hours=hours, minutes=minutes, seconds=seconds)
         self.interval_length = timedelta_seconds(self.interval)
         if self.interval_length == 0:
             self.interval = timedelta(seconds=1)
@@ -38,9 +33,9 @@ class IntervalTrigger(BaseTrigger):
 
         if timezone:
             self.timezone = astimezone(timezone)
-        elif isinstance(start_date, datetime) and start_date.tzinfo:
+        elif start_date and start_date.tzinfo:
             self.timezone = start_date.tzinfo
-        elif isinstance(end_date, datetime) and end_date.tzinfo:
+        elif end_date and end_date.tzinfo:
             self.timezone = end_date.tzinfo
         else:
             self.timezone = get_localzone()
@@ -49,8 +44,6 @@ class IntervalTrigger(BaseTrigger):
         self.start_date = convert_to_datetime(start_date, self.timezone, 'start_date')
         self.end_date = convert_to_datetime(end_date, self.timezone, 'end_date')
 
-        self.jitter = jitter
-
     def get_next_fire_time(self, previous_fire_time, now):
         if previous_fire_time:
             next_fire_time = previous_fire_time + self.interval
@@ -61,48 +54,12 @@ class IntervalTrigger(BaseTrigger):
             next_interval_num = int(ceil(timediff_seconds / self.interval_length))
             next_fire_time = self.start_date + self.interval * next_interval_num
 
-        if self.jitter is not None:
-            next_fire_time = self._apply_jitter(next_fire_time, self.jitter, now)
-
         if not self.end_date or next_fire_time <= self.end_date:
-            return normalize(next_fire_time)
-
-    def __getstate__(self):
-        return {
-            'version': 2,
-            'timezone': self.timezone,
-            'start_date': self.start_date,
-            'end_date': self.end_date,
-            'interval': self.interval,
-            'jitter': self.jitter,
-        }
-
-    def __setstate__(self, state):
-        # This is for compatibility with APScheduler 3.0.x
-        if isinstance(state, tuple):
-            state = state[1]
-
-        if state.get('version', 1) > 2:
-            raise ValueError(
-                'Got serialized data for version %s of %s, but only versions up to 2 can be '
-                'handled' % (state['version'], self.__class__.__name__))
-
-        self.timezone = state['timezone']
-        self.start_date = state['start_date']
-        self.end_date = state['end_date']
-        self.interval = state['interval']
-        self.interval_length = timedelta_seconds(self.interval)
-        self.jitter = state.get('jitter')
+            return self.timezone.normalize(next_fire_time)
 
     def __str__(self):
         return 'interval[%s]' % str(self.interval)
 
     def __repr__(self):
-        options = ['interval=%r' % self.interval, 'start_date=%r' % datetime_repr(self.start_date)]
-        if self.end_date:
-            options.append("end_date=%r" % datetime_repr(self.end_date))
-        if self.jitter:
-            options.append('jitter=%s' % self.jitter)
-
-        return "<%s (%s, timezone='%s')>" % (
-            self.__class__.__name__, ', '.join(options), self.timezone)
+        return "<%s (interval=%r, start_date='%s')>" % (self.__class__.__name__, self.interval,
+                                                        datetime_repr(self.start_date))
diff --git a/lib/apscheduler/util.py b/lib/apscheduler/util.py
index 64b27d7b..988f9427 100644
--- a/lib/apscheduler/util.py
+++ b/lib/apscheduler/util.py
@@ -1,32 +1,25 @@
 """This module contains several handy functions primarily meant for internal use."""
 
 from __future__ import division
-
-from asyncio import iscoroutinefunction
 from datetime import date, datetime, time, timedelta, tzinfo
+from inspect import isfunction, ismethod, getargspec
 from calendar import timegm
-from functools import partial
-from inspect import isclass, ismethod
 import re
-import sys
 
-from pytz import timezone, utc, FixedOffset
+from pytz import timezone, utc
 import six
 
 try:
     from inspect import signature
 except ImportError:  # pragma: nocover
-    from funcsigs import signature
-
-try:
-    from threading import TIMEOUT_MAX
-except ImportError:
-    TIMEOUT_MAX = 4294967  # Maximum value accepted by Event.wait() on Windows
+    try:
+        from funcsigs import signature
+    except ImportError:
+        signature = None
 
 __all__ = ('asint', 'asbool', 'astimezone', 'convert_to_datetime', 'datetime_to_utc_timestamp',
-           'utc_timestamp_to_datetime', 'timedelta_seconds', 'datetime_ceil', 'get_callable_name',
-           'obj_to_ref', 'ref_to_obj', 'maybe_ref', 'repr_escape', 'check_callable_args',
-           'normalize', 'localize', 'TIMEOUT_MAX')
+           'utc_timestamp_to_datetime', 'timedelta_seconds', 'datetime_ceil', 'get_callable_name', 'obj_to_ref',
+           'ref_to_obj', 'maybe_ref', 'repr_escape', 'check_callable_args')
 
 
 class _Undefined(object):
@@ -39,18 +32,17 @@ class _Undefined(object):
     def __repr__(self):
         return '<undefined>'
 
-
 undefined = _Undefined()  #: a unique object that only signifies that no value is defined
 
 
 def asint(text):
     """
-    Safely converts a string to an integer, returning ``None`` if the string is ``None``.
+    Safely converts a string to an integer, returning None if the string is None.
 
     :type text: str
     :rtype: int
-
     """
+
     if text is not None:
         return int(text)
 
@@ -60,8 +52,8 @@ def asbool(obj):
     Interprets an object as a boolean value.
 
     :rtype: bool
-
     """
+
     if isinstance(obj, str):
         obj = obj.strip().lower()
         if obj in ('true', 'yes', 'on', 'y', 't', '1'):
@@ -77,17 +69,15 @@ def astimezone(obj):
     Interprets an object as a timezone.
 
     :rtype: tzinfo
-
     """
+
     if isinstance(obj, six.string_types):
         return timezone(obj)
     if isinstance(obj, tzinfo):
-        if obj.tzname(None) == 'local':
-            raise ValueError(
-                'Unable to determine the name of the local timezone -- you must explicitly '
-                'specify the name of the local timezone. Please refrain from using timezones like '
-                'EST to prevent problems with daylight saving time. Instead, use a locale based '
-                'timezone name (such as Europe/Helsinki).')
+        if not hasattr(obj, 'localize') or not hasattr(obj, 'normalize'):
+            raise TypeError('Only timezones from the pytz library are supported')
+        if obj.zone == 'local':
+            raise ValueError('Unable to determine the name of the local timezone -- use an explicit timezone instead')
         return obj
     if obj is not None:
         raise TypeError('Expected tzinfo, got %s instead' % obj.__class__.__name__)
@@ -95,30 +85,27 @@ def astimezone(obj):
 
 _DATE_REGEX = re.compile(
     r'(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})'
-    r'(?:[ T](?P<hour>\d{1,2}):(?P<minute>\d{1,2}):(?P<second>\d{1,2})'
-    r'(?:\.(?P<microsecond>\d{1,6}))?'
-    r'(?P<timezone>Z|[+-]\d\d:\d\d)?)?$')
+    r'(?: (?P<hour>\d{1,2}):(?P<minute>\d{1,2}):(?P<second>\d{1,2})'
+    r'(?:\.(?P<microsecond>\d{1,6}))?)?')
 
 
 def convert_to_datetime(input, tz, arg_name):
     """
     Converts the given object to a timezone aware datetime object.
-
     If a timezone aware datetime object is passed, it is returned unmodified.
     If a native datetime object is passed, it is given the specified timezone.
     If the input is a string, it is parsed as a datetime with the given timezone.
 
-    Date strings are accepted in three different forms: date only (Y-m-d), date with time
-    (Y-m-d H:M:S) or with date+time with microseconds (Y-m-d H:M:S.micro). Additionally you can
-    override the time zone by giving a specific offset in the format specified by ISO 8601:
-    Z (UTC), +HH:MM or -HH:MM.
+    Date strings are accepted in three different forms: date only (Y-m-d),
+    date with time (Y-m-d H:M:S) or with date+time with microseconds
+    (Y-m-d H:M:S.micro).
 
     :param str|datetime input: the datetime or string to convert to a timezone aware datetime
     :param datetime.tzinfo tz: timezone to interpret ``input`` in
     :param str arg_name: the name of the argument (used in an error message)
     :rtype: datetime
-
     """
+
     if input is None:
         return
     elif isinstance(input, datetime):
@@ -129,17 +116,8 @@ def convert_to_datetime(input, tz, arg_name):
         m = _DATE_REGEX.match(input)
         if not m:
             raise ValueError('Invalid date string')
-
-        values = m.groupdict()
-        tzname = values.pop('timezone')
-        if tzname == 'Z':
-            tz = utc
-        elif tzname:
-            hours, minutes = (int(x) for x in tzname[1:].split(':'))
-            sign = 1 if tzname[0] == '+' else -1
-            tz = FixedOffset(sign * (hours * 60 + minutes))
-
-        values = {k: int(v or 0) for k, v in values.items()}
+        values = [(k, int(v or 0)) for k, v in m.groupdict().items()]
+        values = dict(values)
         datetime_ = datetime(**values)
     else:
         raise TypeError('Unsupported type for %s: %s' % (arg_name, input.__class__.__name__))
@@ -147,12 +125,14 @@ def convert_to_datetime(input, tz, arg_name):
     if datetime_.tzinfo is not None:
         return datetime_
     if tz is None:
-        raise ValueError(
-            'The "tz" argument must be specified if %s has no timezone information' % arg_name)
+        raise ValueError('The "tz" argument must be specified if %s has no timezone information' % arg_name)
     if isinstance(tz, six.string_types):
         tz = timezone(tz)
 
-    return localize(datetime_, tz)
+    try:
+        return tz.localize(datetime_, is_dst=None)
+    except AttributeError:
+        raise TypeError('Only pytz timezones are supported (need the localize() and normalize() methods)')
 
 
 def datetime_to_utc_timestamp(timeval):
@@ -161,8 +141,8 @@ def datetime_to_utc_timestamp(timeval):
 
     :type timeval: datetime
     :rtype: float
-
     """
+
     if timeval is not None:
         return timegm(timeval.utctimetuple()) + timeval.microsecond / 1000000
 
@@ -173,8 +153,8 @@ def utc_timestamp_to_datetime(timestamp):
 
     :type timestamp: float
     :rtype: datetime
-
     """
+
     if timestamp is not None:
         return datetime.fromtimestamp(timestamp, utc)
 
@@ -185,8 +165,8 @@ def timedelta_seconds(delta):
 
     :type delta: timedelta
     :rtype: float
-
     """
+
     return delta.days * 24 * 60 * 60 + delta.seconds + \
         delta.microseconds / 1000000.0
 
@@ -196,8 +176,8 @@ def datetime_ceil(dateval):
     Rounds the given datetime object upwards.
 
     :type dateval: datetime
-
     """
+
     if dateval.microsecond > 0:
         return dateval + timedelta(seconds=1, microseconds=-dateval.microsecond)
     return dateval
@@ -212,8 +192,8 @@ def get_callable_name(func):
     Returns the best available display name for the given function/callable.
 
     :rtype: str
-
     """
+
     # the easy case (on Python 3.3+)
     if hasattr(func, '__qualname__'):
         return func.__qualname__
@@ -221,7 +201,7 @@ def get_callable_name(func):
     # class methods, bound and unbound methods
     f_self = getattr(func, '__self__', None) or getattr(func, 'im_self', None)
     if f_self and hasattr(func, '__name__'):
-        f_class = f_self if isclass(f_self) else f_self.__class__
+        f_class = f_self if isinstance(f_self, type) else f_self.__class__
     else:
         f_class = getattr(func, 'im_class', None)
 
@@ -242,35 +222,20 @@ def get_callable_name(func):
 
 def obj_to_ref(obj):
     """
-    Returns the path to the given callable.
+    Returns the path to the given object.
 
     :rtype: str
-    :raises TypeError: if the given object is not callable
-    :raises ValueError: if the given object is a :class:`~functools.partial`, lambda or a nested
-        function
-
     """
-    if isinstance(obj, partial):
-        raise ValueError('Cannot create a reference to a partial()')
 
-    name = get_callable_name(obj)
-    if '<lambda>' in name:
-        raise ValueError('Cannot create a reference to a lambda')
-    if '<locals>' in name:
-        raise ValueError('Cannot create a reference to a nested function')
+    try:
+        ref = '%s:%s' % (obj.__module__, get_callable_name(obj))
+        obj2 = ref_to_obj(ref)
+        if obj != obj2:
+            raise ValueError
+    except Exception:
+        raise ValueError('Cannot determine the reference to %r' % obj)
 
-    if ismethod(obj):
-        if hasattr(obj, 'im_self') and obj.im_self:
-            # bound method
-            module = obj.im_self.__module__
-        elif hasattr(obj, 'im_class') and obj.im_class:
-            # unbound method
-            module = obj.im_class.__module__
-        else:
-            module = obj.__module__
-    else:
-        module = obj.__module__
-    return '%s:%s' % (module, name)
+    return ref
 
 
 def ref_to_obj(ref):
@@ -278,8 +243,8 @@ def ref_to_obj(ref):
     Returns the object pointed to by ``ref``.
 
     :type ref: str
-
     """
+
     if not isinstance(ref, six.string_types):
         raise TypeError('References must be strings')
     if ':' not in ref:
@@ -287,12 +252,12 @@ def ref_to_obj(ref):
 
     modulename, rest = ref.split(':', 1)
     try:
-        obj = __import__(modulename, fromlist=[rest])
+        obj = __import__(modulename)
     except ImportError:
         raise LookupError('Error resolving reference %s: could not import module' % ref)
 
     try:
-        for name in rest.split('.'):
+        for name in modulename.split('.')[1:] + rest.split('.'):
             obj = getattr(obj, name)
         return obj
     except Exception:
@@ -303,8 +268,8 @@ def maybe_ref(ref):
     """
     Returns the object that the given reference points to, if it is indeed a reference.
     If it is not a reference, the object is returned as-is.
-
     """
+
     if not isinstance(ref, str):
         return ref
     return ref_to_obj(ref)
@@ -316,8 +281,7 @@ if six.PY2:
             return string.encode('ascii', 'backslashreplace')
         return string
 else:
-    def repr_escape(string):
-        return string
+    repr_escape = lambda string: string
 
 
 def check_callable_args(func, args, kwargs):
@@ -326,54 +290,70 @@ def check_callable_args(func, args, kwargs):
 
     :type args: tuple
     :type kwargs: dict
-
     """
+
     pos_kwargs_conflicts = []  # parameters that have a match in both args and kwargs
     positional_only_kwargs = []  # positional-only parameters that have a match in kwargs
     unsatisfied_args = []  # parameters in signature that don't have a match in args or kwargs
     unsatisfied_kwargs = []  # keyword-only arguments that don't have a match in kwargs
     unmatched_args = list(args)  # args that didn't match any of the parameters in the signature
-    # kwargs that didn't match any of the parameters in the signature
-    unmatched_kwargs = list(kwargs)
-    # indicates if the signature defines *args and **kwargs respectively
-    has_varargs = has_var_kwargs = False
+    unmatched_kwargs = list(kwargs)  # kwargs that didn't match any of the parameters in the signature
+    has_varargs = has_var_kwargs = False  # indicates if the signature defines *args and **kwargs respectively
 
-    try:
-        if sys.version_info >= (3, 5):
-            sig = signature(func, follow_wrapped=False)
-        else:
+    if signature:
+        try:
             sig = signature(func)
-    except ValueError:
-        # signature() doesn't work against every kind of callable
-        return
+        except ValueError:
+            return  # signature() doesn't work against every kind of callable
 
-    for param in six.itervalues(sig.parameters):
-        if param.kind == param.POSITIONAL_OR_KEYWORD:
-            if param.name in unmatched_kwargs and unmatched_args:
-                pos_kwargs_conflicts.append(param.name)
+        for param in six.itervalues(sig.parameters):
+            if param.kind == param.POSITIONAL_OR_KEYWORD:
+                if param.name in unmatched_kwargs and unmatched_args:
+                    pos_kwargs_conflicts.append(param.name)
+                elif unmatched_args:
+                    del unmatched_args[0]
+                elif param.name in unmatched_kwargs:
+                    unmatched_kwargs.remove(param.name)
+                elif param.default is param.empty:
+                    unsatisfied_args.append(param.name)
+            elif param.kind == param.POSITIONAL_ONLY:
+                if unmatched_args:
+                    del unmatched_args[0]
+                elif param.name in unmatched_kwargs:
+                    unmatched_kwargs.remove(param.name)
+                    positional_only_kwargs.append(param.name)
+                elif param.default is param.empty:
+                    unsatisfied_args.append(param.name)
+            elif param.kind == param.KEYWORD_ONLY:
+                if param.name in unmatched_kwargs:
+                    unmatched_kwargs.remove(param.name)
+                elif param.default is param.empty:
+                    unsatisfied_kwargs.append(param.name)
+            elif param.kind == param.VAR_POSITIONAL:
+                has_varargs = True
+            elif param.kind == param.VAR_KEYWORD:
+                has_var_kwargs = True
+    else:
+        if not isfunction(func) and not ismethod(func) and hasattr(func, '__call__'):
+            func = func.__call__
+
+        try:
+            argspec = getargspec(func)
+        except TypeError:
+            return  # getargspec() doesn't work certain callables
+
+        argspec_args = argspec.args if not ismethod(func) else argspec.args[1:]
+        has_varargs = bool(argspec.varargs)
+        has_var_kwargs = bool(argspec.keywords)
+        for arg, default in six.moves.zip_longest(argspec_args, argspec.defaults or (), fillvalue=undefined):
+            if arg in unmatched_kwargs and unmatched_args:
+                pos_kwargs_conflicts.append(arg)
             elif unmatched_args:
                 del unmatched_args[0]
-            elif param.name in unmatched_kwargs:
-                unmatched_kwargs.remove(param.name)
-            elif param.default is param.empty:
-                unsatisfied_args.append(param.name)
-        elif param.kind == param.POSITIONAL_ONLY:
-            if unmatched_args:
-                del unmatched_args[0]
-            elif param.name in unmatched_kwargs:
-                unmatched_kwargs.remove(param.name)
-                positional_only_kwargs.append(param.name)
-            elif param.default is param.empty:
-                unsatisfied_args.append(param.name)
-        elif param.kind == param.KEYWORD_ONLY:
-            if param.name in unmatched_kwargs:
-                unmatched_kwargs.remove(param.name)
-            elif param.default is param.empty:
-                unsatisfied_kwargs.append(param.name)
-        elif param.kind == param.VAR_POSITIONAL:
-            has_varargs = True
-        elif param.kind == param.VAR_KEYWORD:
-            has_var_kwargs = True
+            elif arg in unmatched_kwargs:
+                unmatched_kwargs.remove(arg)
+            elif default is undefined:
+                unsatisfied_args.append(arg)
 
     # Make sure there are no conflicts between args and kwargs
     if pos_kwargs_conflicts:
@@ -385,46 +365,21 @@ def check_callable_args(func, args, kwargs):
         raise ValueError('The following arguments cannot be given as keyword arguments: %s' %
                          ', '.join(positional_only_kwargs))
 
-    # Check that the number of positional arguments minus the number of matched kwargs matches the
-    # argspec
+    # Check that the number of positional arguments minus the number of matched kwargs matches the argspec
     if unsatisfied_args:
-        raise ValueError('The following arguments have not been supplied: %s' %
-                         ', '.join(unsatisfied_args))
+        raise ValueError('The following arguments have not been supplied: %s' % ', '.join(unsatisfied_args))
 
     # Check that all keyword-only arguments have been supplied
     if unsatisfied_kwargs:
-        raise ValueError(
-            'The following keyword-only arguments have not been supplied in kwargs: %s' %
-            ', '.join(unsatisfied_kwargs))
+        raise ValueError('The following keyword-only arguments have not been supplied in kwargs: %s' %
+                         ', '.join(unsatisfied_kwargs))
 
     # Check that the callable can accept the given number of positional arguments
     if not has_varargs and unmatched_args:
-        raise ValueError(
-            'The list of positional arguments is longer than the target callable can handle '
-            '(allowed: %d, given in args: %d)' % (len(args) - len(unmatched_args), len(args)))
+        raise ValueError('The list of positional arguments is longer than the target callable can handle '
+                         '(allowed: %d, given in args: %d)' % (len(args) - len(unmatched_args), len(args)))
 
     # Check that the callable can accept the given keyword arguments
     if not has_var_kwargs and unmatched_kwargs:
-        raise ValueError(
-            'The target callable does not accept the following keyword arguments: %s' %
-            ', '.join(unmatched_kwargs))
-
-
-def iscoroutinefunction_partial(f):
-    while isinstance(f, partial):
-        f = f.func
-
-    # The asyncio version of iscoroutinefunction includes testing for @coroutine
-    # decorations vs. the inspect version which does not.
-    return iscoroutinefunction(f)
-
-
-def normalize(dt):
-    return datetime.fromtimestamp(dt.timestamp(), dt.tzinfo)
-
-
-def localize(dt, tzinfo):
-    if hasattr(tzinfo, 'localize'):
-        return tzinfo.localize(dt)
-
-    return normalize(dt.replace(tzinfo=tzinfo))
+        raise ValueError('The target callable does not accept the following keyword arguments: %s' %
+                         ', '.join(unmatched_kwargs))
diff --git a/lib/argparse.py b/lib/argparse.py
new file mode 100644
index 00000000..f0cfe27e
--- /dev/null
+++ b/lib/argparse.py
@@ -0,0 +1,2386 @@
+# Author: Steven J. Bethard <steven.bethard@gmail.com>.
+
+"""Command-line parsing library
+
+This module is an optparse-inspired command-line parsing library that:
+
+    - handles both optional and positional arguments
+    - produces highly informative usage messages
+    - supports parsers that dispatch to sub-parsers
+
+The following is a simple usage example that sums integers from the
+command-line and writes the result to a file::
+
+    parser = argparse.ArgumentParser(
+        description='sum the integers at the command line')
+    parser.add_argument(
+        'integers', metavar='int', nargs='+', type=int,
+        help='an integer to be summed')
+    parser.add_argument(
+        '--log', default=sys.stdout, type=argparse.FileType('w'),
+        help='the file where the sum should be written')
+    args = parser.parse_args()
+    args.log.write('%s' % sum(args.integers))
+    args.log.close()
+
+The module contains the following public classes:
+
+    - ArgumentParser -- The main entry point for command-line parsing. As the
+        example above shows, the add_argument() method is used to populate
+        the parser with actions for optional and positional arguments. Then
+        the parse_args() method is invoked to convert the args at the
+        command-line into an object with attributes.
+
+    - ArgumentError -- The exception raised by ArgumentParser objects when
+        there are errors with the parser's actions. Errors raised while
+        parsing the command-line are caught by ArgumentParser and emitted
+        as command-line messages.
+
+    - FileType -- A factory for defining types of files to be created. As the
+        example above shows, instances of FileType are typically passed as
+        the type= argument of add_argument() calls.
+
+    - Action -- The base class for parser actions. Typically actions are
+        selected by passing strings like 'store_true' or 'append_const' to
+        the action= argument of add_argument(). However, for greater
+        customization of ArgumentParser actions, subclasses of Action may
+        be defined and passed as the action= argument.
+
+    - HelpFormatter, RawDescriptionHelpFormatter, RawTextHelpFormatter,
+        ArgumentDefaultsHelpFormatter -- Formatter classes which
+        may be passed as the formatter_class= argument to the
+        ArgumentParser constructor. HelpFormatter is the default,
+        RawDescriptionHelpFormatter and RawTextHelpFormatter tell the parser
+        not to change the formatting for help text, and
+        ArgumentDefaultsHelpFormatter adds information about argument defaults
+        to the help.
+
+All other classes in this module are considered implementation details.
+(Also note that HelpFormatter and RawDescriptionHelpFormatter are only
+considered public as object names -- the API of the formatter objects is
+still considered an implementation detail.)
+"""
+
+__version__ = '1.1'
+__all__ = [
+    'ArgumentParser',
+    'ArgumentError',
+    'ArgumentTypeError',
+    'FileType',
+    'HelpFormatter',
+    'ArgumentDefaultsHelpFormatter',
+    'RawDescriptionHelpFormatter',
+    'RawTextHelpFormatter',
+    'MetavarTypeHelpFormatter',
+    'Namespace',
+    'Action',
+    'ONE_OR_MORE',
+    'OPTIONAL',
+    'PARSER',
+    'REMAINDER',
+    'SUPPRESS',
+    'ZERO_OR_MORE',
+]
+
+
+import collections as _collections
+import copy as _copy
+import os as _os
+import re as _re
+import sys as _sys
+import textwrap as _textwrap
+
+from gettext import gettext as _, ngettext
+
+
+def _callable(obj):
+    return hasattr(obj, '__call__') or hasattr(obj, '__bases__')
+
+
+SUPPRESS = '==SUPPRESS=='
+
+OPTIONAL = '?'
+ZERO_OR_MORE = '*'
+ONE_OR_MORE = '+'
+PARSER = 'A...'
+REMAINDER = '...'
+_UNRECOGNIZED_ARGS_ATTR = '_unrecognized_args'
+
+# =============================
+# Utility functions and classes
+# =============================
+
+class _AttributeHolder(object):
+    """Abstract base class that provides __repr__.
+
+    The __repr__ method returns a string in the format::
+        ClassName(attr=name, attr=name, ...)
+    The attributes are determined either by a class-level attribute,
+    '_kwarg_names', or by inspecting the instance __dict__.
+    """
+
+    def __repr__(self):
+        type_name = type(self).__name__
+        arg_strings = []
+        for arg in self._get_args():
+            arg_strings.append(repr(arg))
+        for name, value in self._get_kwargs():
+            arg_strings.append('%s=%r' % (name, value))
+        return '%s(%s)' % (type_name, ', '.join(arg_strings))
+
+    def _get_kwargs(self):
+        return sorted(self.__dict__.items())
+
+    def _get_args(self):
+        return []
+
+
+def _ensure_value(namespace, name, value):
+    if getattr(namespace, name, None) is None:
+        setattr(namespace, name, value)
+    return getattr(namespace, name)
+
+
+# ===============
+# Formatting Help
+# ===============
+
+class HelpFormatter(object):
+    """Formatter for generating usage messages and argument help strings.
+
+    Only the name of this class is considered a public API. All the methods
+    provided by the class are considered an implementation detail.
+    """
+
+    def __init__(self,
+                 prog,
+                 indent_increment=2,
+                 max_help_position=24,
+                 width=None):
+
+        # default setting for width
+        if width is None:
+            try:
+                width = int(_os.environ['COLUMNS'])
+            except (KeyError, ValueError):
+                width = 80
+            width -= 2
+
+        self._prog = prog
+        self._indent_increment = indent_increment
+        self._max_help_position = max_help_position
+        self._width = width
+
+        self._current_indent = 0
+        self._level = 0
+        self._action_max_length = 0
+
+        self._root_section = self._Section(self, None)
+        self._current_section = self._root_section
+
+        self._whitespace_matcher = _re.compile(r'\s+')
+        self._long_break_matcher = _re.compile(r'\n\n\n+')
+
+    # ===============================
+    # Section and indentation methods
+    # ===============================
+    def _indent(self):
+        self._current_indent += self._indent_increment
+        self._level += 1
+
+    def _dedent(self):
+        self._current_indent -= self._indent_increment
+        assert self._current_indent >= 0, 'Indent decreased below 0.'
+        self._level -= 1
+
+    class _Section(object):
+
+        def __init__(self, formatter, parent, heading=None):
+            self.formatter = formatter
+            self.parent = parent
+            self.heading = heading
+            self.items = []
+
+        def format_help(self):
+            # format the indented section
+            if self.parent is not None:
+                self.formatter._indent()
+            join = self.formatter._join_parts
+            for func, args in self.items:
+                func(*args)
+            item_help = join([func(*args) for func, args in self.items])
+            if self.parent is not None:
+                self.formatter._dedent()
+
+            # return nothing if the section was empty
+            if not item_help:
+                return ''
+
+            # add the heading if the section was non-empty
+            if self.heading is not SUPPRESS and self.heading is not None:
+                current_indent = self.formatter._current_indent
+                heading = '%*s%s:\n' % (current_indent, '', self.heading)
+            else:
+                heading = ''
+
+            # join the section-initial newline, the heading and the help
+            return join(['\n', heading, item_help, '\n'])
+
+    def _add_item(self, func, args):
+        self._current_section.items.append((func, args))
+
+    # ========================
+    # Message building methods
+    # ========================
+    def start_section(self, heading):
+        self._indent()
+        section = self._Section(self, self._current_section, heading)
+        self._add_item(section.format_help, [])
+        self._current_section = section
+
+    def end_section(self):
+        self._current_section = self._current_section.parent
+        self._dedent()
+
+    def add_text(self, text):
+        if text is not SUPPRESS and text is not None:
+            self._add_item(self._format_text, [text])
+
+    def add_usage(self, usage, actions, groups, prefix=None):
+        if usage is not SUPPRESS:
+            args = usage, actions, groups, prefix
+            self._add_item(self._format_usage, args)
+
+    def add_argument(self, action):
+        if action.help is not SUPPRESS:
+
+            # find all invocations
+            get_invocation = self._format_action_invocation
+            invocations = [get_invocation(action)]
+            for subaction in self._iter_indented_subactions(action):
+                invocations.append(get_invocation(subaction))
+
+            # update the maximum item length
+            invocation_length = max([len(s) for s in invocations])
+            action_length = invocation_length + self._current_indent
+            self._action_max_length = max(self._action_max_length,
+                                          action_length)
+
+            # add the item to the list
+            self._add_item(self._format_action, [action])
+
+    def add_arguments(self, actions):
+        for action in actions:
+            self.add_argument(action)
+
+    # =======================
+    # Help-formatting methods
+    # =======================
+    def format_help(self):
+        help = self._root_section.format_help()
+        if help:
+            help = self._long_break_matcher.sub('\n\n', help)
+            help = help.strip('\n') + '\n'
+        return help
+
+    def _join_parts(self, part_strings):
+        return ''.join([part
+                        for part in part_strings
+                        if part and part is not SUPPRESS])
+
+    def _format_usage(self, usage, actions, groups, prefix):
+        if prefix is None:
+            prefix = _('usage: ')
+
+        # if usage is specified, use that
+        if usage is not None:
+            usage = usage % dict(prog=self._prog)
+
+        # if no optionals or positionals are available, usage is just prog
+        elif usage is None and not actions:
+            usage = '%(prog)s' % dict(prog=self._prog)
+
+        # if optionals and positionals are available, calculate usage
+        elif usage is None:
+            prog = '%(prog)s' % dict(prog=self._prog)
+
+            # split optionals from positionals
+            optionals = []
+            positionals = []
+            for action in actions:
+                if action.option_strings:
+                    optionals.append(action)
+                else:
+                    positionals.append(action)
+
+            # build full usage string
+            format = self._format_actions_usage
+            action_usage = format(optionals + positionals, groups)
+            usage = ' '.join([s for s in [prog, action_usage] if s])
+
+            # wrap the usage parts if it's too long
+            text_width = self._width - self._current_indent
+            if len(prefix) + len(usage) > text_width:
+
+                # break usage into wrappable parts
+                part_regexp = r'\(.*?\)+|\[.*?\]+|\S+'
+                opt_usage = format(optionals, groups)
+                pos_usage = format(positionals, groups)
+                opt_parts = _re.findall(part_regexp, opt_usage)
+                pos_parts = _re.findall(part_regexp, pos_usage)
+                assert ' '.join(opt_parts) == opt_usage
+                assert ' '.join(pos_parts) == pos_usage
+
+                # helper for wrapping lines
+                def get_lines(parts, indent, prefix=None):
+                    lines = []
+                    line = []
+                    if prefix is not None:
+                        line_len = len(prefix) - 1
+                    else:
+                        line_len = len(indent) - 1
+                    for part in parts:
+                        if line_len + 1 + len(part) > text_width:
+                            lines.append(indent + ' '.join(line))
+                            line = []
+                            line_len = len(indent) - 1
+                        line.append(part)
+                        line_len += len(part) + 1
+                    if line:
+                        lines.append(indent + ' '.join(line))
+                    if prefix is not None:
+                        lines[0] = lines[0][len(indent):]
+                    return lines
+
+                # if prog is short, follow it with optionals or positionals
+                if len(prefix) + len(prog) <= 0.75 * text_width:
+                    indent = ' ' * (len(prefix) + len(prog) + 1)
+                    if opt_parts:
+                        lines = get_lines([prog] + opt_parts, indent, prefix)
+                        lines.extend(get_lines(pos_parts, indent))
+                    elif pos_parts:
+                        lines = get_lines([prog] + pos_parts, indent, prefix)
+                    else:
+                        lines = [prog]
+
+                # if prog is long, put it on its own line
+                else:
+                    indent = ' ' * len(prefix)
+                    parts = opt_parts + pos_parts
+                    lines = get_lines(parts, indent)
+                    if len(lines) > 1:
+                        lines = []
+                        lines.extend(get_lines(opt_parts, indent))
+                        lines.extend(get_lines(pos_parts, indent))
+                    lines = [prog] + lines
+
+                # join lines into usage
+                usage = '\n'.join(lines)
+
+        # prefix with 'usage:'
+        return '%s%s\n\n' % (prefix, usage)
+
+    def _format_actions_usage(self, actions, groups):
+        # find group indices and identify actions in groups
+        group_actions = set()
+        inserts = {}
+        for group in groups:
+            try:
+                start = actions.index(group._group_actions[0])
+            except ValueError:
+                continue
+            else:
+                end = start + len(group._group_actions)
+                if actions[start:end] == group._group_actions:
+                    for action in group._group_actions:
+                        group_actions.add(action)
+                    if not group.required:
+                        if start in inserts:
+                            inserts[start] += ' ['
+                        else:
+                            inserts[start] = '['
+                        inserts[end] = ']'
+                    else:
+                        if start in inserts:
+                            inserts[start] += ' ('
+                        else:
+                            inserts[start] = '('
+                        inserts[end] = ')'
+                    for i in range(start + 1, end):
+                        inserts[i] = '|'
+
+        # collect all actions format strings
+        parts = []
+        for i, action in enumerate(actions):
+
+            # suppressed arguments are marked with None
+            # remove | separators for suppressed arguments
+            if action.help is SUPPRESS:
+                parts.append(None)
+                if inserts.get(i) == '|':
+                    inserts.pop(i)
+                elif inserts.get(i + 1) == '|':
+                    inserts.pop(i + 1)
+
+            # produce all arg strings
+            elif not action.option_strings:
+                default = self._get_default_metavar_for_positional(action)
+                part = self._format_args(action, default)
+
+                # if it's in a group, strip the outer []
+                if action in group_actions:
+                    if part[0] == '[' and part[-1] == ']':
+                        part = part[1:-1]
+
+                # add the action string to the list
+                parts.append(part)
+
+            # produce the first way to invoke the option in brackets
+            else:
+                option_string = action.option_strings[0]
+
+                # if the Optional doesn't take a value, format is:
+                #    -s or --long
+                if action.nargs == 0:
+                    part = '%s' % option_string
+
+                # if the Optional takes a value, format is:
+                #    -s ARGS or --long ARGS
+                else:
+                    default = self._get_default_metavar_for_optional(action)
+                    args_string = self._format_args(action, default)
+                    part = '%s %s' % (option_string, args_string)
+
+                # make it look optional if it's not required or in a group
+                if not action.required and action not in group_actions:
+                    part = '[%s]' % part
+
+                # add the action string to the list
+                parts.append(part)
+
+        # insert things at the necessary indices
+        for i in sorted(inserts, reverse=True):
+            parts[i:i] = [inserts[i]]
+
+        # join all the action items with spaces
+        text = ' '.join([item for item in parts if item is not None])
+
+        # clean up separators for mutually exclusive groups
+        open = r'[\[(]'
+        close = r'[\])]'
+        text = _re.sub(r'(%s) ' % open, r'\1', text)
+        text = _re.sub(r' (%s)' % close, r'\1', text)
+        text = _re.sub(r'%s *%s' % (open, close), r'', text)
+        text = _re.sub(r'\(([^|]*)\)', r'\1', text)
+        text = text.strip()
+
+        # return the text
+        return text
+
+    def _format_text(self, text):
+        if '%(prog)' in text:
+            text = text % dict(prog=self._prog)
+        text_width = self._width - self._current_indent
+        indent = ' ' * self._current_indent
+        return self._fill_text(text, text_width, indent) + '\n\n'
+
+    def _format_action(self, action):
+        # determine the required width and the entry label
+        help_position = min(self._action_max_length + 2,
+                            self._max_help_position)
+        help_width = self._width - help_position
+        action_width = help_position - self._current_indent - 2
+        action_header = self._format_action_invocation(action)
+
+        # ho nelp; start on same line and add a final newline
+        if not action.help:
+            tup = self._current_indent, '', action_header
+            action_header = '%*s%s\n' % tup
+
+        # short action name; start on the same line and pad two spaces
+        elif len(action_header) <= action_width:
+            tup = self._current_indent, '', action_width, action_header
+            action_header = '%*s%-*s  ' % tup
+            indent_first = 0
+
+        # long action name; start on the next line
+        else:
+            tup = self._current_indent, '', action_header
+            action_header = '%*s%s\n' % tup
+            indent_first = help_position
+
+        # collect the pieces of the action help
+        parts = [action_header]
+
+        # if there was help for the action, add lines of help text
+        if action.help:
+            help_text = self._expand_help(action)
+            help_lines = self._split_lines(help_text, help_width)
+            parts.append('%*s%s\n' % (indent_first, '', help_lines[0]))
+            for line in help_lines[1:]:
+                parts.append('%*s%s\n' % (help_position, '', line))
+
+        # or add a newline if the description doesn't end with one
+        elif not action_header.endswith('\n'):
+            parts.append('\n')
+
+        # if there are any sub-actions, add their help as well
+        for subaction in self._iter_indented_subactions(action):
+            parts.append(self._format_action(subaction))
+
+        # return a single string
+        return self._join_parts(parts)
+
+    def _format_action_invocation(self, action):
+        if not action.option_strings:
+            default = self._get_default_metavar_for_positional(action)
+            metavar, = self._metavar_formatter(action, default)(1)
+            return metavar
+
+        else:
+            parts = []
+
+            # if the Optional doesn't take a value, format is:
+            #    -s, --long
+            if action.nargs == 0:
+                parts.extend(action.option_strings)
+
+            # if the Optional takes a value, format is:
+            #    -s ARGS, --long ARGS
+            else:
+                default = self._get_default_metavar_for_optional(action)
+                args_string = self._format_args(action, default)
+                for option_string in action.option_strings:
+                    parts.append('%s %s' % (option_string, args_string))
+
+            return ', '.join(parts)
+
+    def _metavar_formatter(self, action, default_metavar):
+        if action.metavar is not None:
+            result = action.metavar
+        elif action.choices is not None:
+            choice_strs = [str(choice) for choice in action.choices]
+            result = '{%s}' % ','.join(choice_strs)
+        else:
+            result = default_metavar
+
+        def format(tuple_size):
+            if isinstance(result, tuple):
+                return result
+            else:
+                return (result, ) * tuple_size
+        return format
+
+    def _format_args(self, action, default_metavar):
+        get_metavar = self._metavar_formatter(action, default_metavar)
+        if action.nargs is None:
+            result = '%s' % get_metavar(1)
+        elif action.nargs == OPTIONAL:
+            result = '[%s]' % get_metavar(1)
+        elif action.nargs == ZERO_OR_MORE:
+            result = '[%s [%s ...]]' % get_metavar(2)
+        elif action.nargs == ONE_OR_MORE:
+            result = '%s [%s ...]' % get_metavar(2)
+        elif action.nargs == REMAINDER:
+            result = '...'
+        elif action.nargs == PARSER:
+            result = '%s ...' % get_metavar(1)
+        else:
+            formats = ['%s' for _ in range(action.nargs)]
+            result = ' '.join(formats) % get_metavar(action.nargs)
+        return result
+
+    def _expand_help(self, action):
+        params = dict(vars(action), prog=self._prog)
+        for name in list(params):
+            if params[name] is SUPPRESS:
+                del params[name]
+        for name in list(params):
+            if hasattr(params[name], '__name__'):
+                params[name] = params[name].__name__
+        if params.get('choices') is not None:
+            choices_str = ', '.join([str(c) for c in params['choices']])
+            params['choices'] = choices_str
+        return self._get_help_string(action) % params
+
+    def _iter_indented_subactions(self, action):
+        try:
+            get_subactions = action._get_subactions
+        except AttributeError:
+            pass
+        else:
+            self._indent()
+            for subaction in get_subactions():
+                yield subaction
+            self._dedent()
+
+    def _split_lines(self, text, width):
+        text = self._whitespace_matcher.sub(' ', text).strip()
+        return _textwrap.wrap(text, width)
+
+    def _fill_text(self, text, width, indent):
+        text = self._whitespace_matcher.sub(' ', text).strip()
+        return _textwrap.fill(text, width, initial_indent=indent,
+                                           subsequent_indent=indent)
+
+    def _get_help_string(self, action):
+        return action.help
+
+    def _get_default_metavar_for_optional(self, action):
+        return action.dest.upper()
+
+    def _get_default_metavar_for_positional(self, action):
+        return action.dest
+
+
+class RawDescriptionHelpFormatter(HelpFormatter):
+    """Help message formatter which retains any formatting in descriptions.
+
+    Only the name of this class is considered a public API. All the methods
+    provided by the class are considered an implementation detail.
+    """
+
+    def _fill_text(self, text, width, indent):
+        return ''.join([indent + line for line in text.splitlines(True)])
+
+
+class RawTextHelpFormatter(RawDescriptionHelpFormatter):
+    """Help message formatter which retains formatting of all help text.
+
+    Only the name of this class is considered a public API. All the methods
+    provided by the class are considered an implementation detail.
+    """
+
+    def _split_lines(self, text, width):
+        return text.splitlines()
+
+
+class ArgumentDefaultsHelpFormatter(HelpFormatter):
+    """Help message formatter which adds default values to argument help.
+
+    Only the name of this class is considered a public API. All the methods
+    provided by the class are considered an implementation detail.
+    """
+
+    def _get_help_string(self, action):
+        help = action.help
+        if '%(default)' not in action.help:
+            if action.default is not SUPPRESS:
+                defaulting_nargs = [OPTIONAL, ZERO_OR_MORE]
+                if action.option_strings or action.nargs in defaulting_nargs:
+                    help += ' (default: %(default)s)'
+        return help
+
+
+class MetavarTypeHelpFormatter(HelpFormatter):
+    """Help message formatter which uses the argument 'type' as the default
+    metavar value (instead of the argument 'dest')
+
+    Only the name of this class is considered a public API. All the methods
+    provided by the class are considered an implementation detail.
+    """
+
+    def _get_default_metavar_for_optional(self, action):
+        return action.type.__name__
+
+    def _get_default_metavar_for_positional(self, action):
+        return action.type.__name__
+
+
+
+# =====================
+# Options and Arguments
+# =====================
+
+def _get_action_name(argument):
+    if argument is None:
+        return None
+    elif argument.option_strings:
+        return  '/'.join(argument.option_strings)
+    elif argument.metavar not in (None, SUPPRESS):
+        return argument.metavar
+    elif argument.dest not in (None, SUPPRESS):
+        return argument.dest
+    else:
+        return None
+
+
+class ArgumentError(Exception):
+    """An error from creating or using an argument (optional or positional).
+
+    The string value of this exception is the message, augmented with
+    information about the argument that caused it.
+    """
+
+    def __init__(self, argument, message):
+        self.argument_name = _get_action_name(argument)
+        self.message = message
+
+    def __str__(self):
+        if self.argument_name is None:
+            format = '%(message)s'
+        else:
+            format = 'argument %(argument_name)s: %(message)s'
+        return format % dict(message=self.message,
+                             argument_name=self.argument_name)
+
+
+class ArgumentTypeError(Exception):
+    """An error from trying to convert a command line string to a type."""
+    pass
+
+
+# ==============
+# Action classes
+# ==============
+
+class Action(_AttributeHolder):
+    """Information about how to convert command line strings to Python objects.
+
+    Action objects are used by an ArgumentParser to represent the information
+    needed to parse a single argument from one or more strings from the
+    command line. The keyword arguments to the Action constructor are also
+    all attributes of Action instances.
+
+    Keyword Arguments:
+
+        - option_strings -- A list of command-line option strings which
+            should be associated with this action.
+
+        - dest -- The name of the attribute to hold the created object(s)
+
+        - nargs -- The number of command-line arguments that should be
+            consumed. By default, one argument will be consumed and a single
+            value will be produced.  Other values include:
+                - N (an integer) consumes N arguments (and produces a list)
+                - '?' consumes zero or one arguments
+                - '*' consumes zero or more arguments (and produces a list)
+                - '+' consumes one or more arguments (and produces a list)
+            Note that the difference between the default and nargs=1 is that
+            with the default, a single value will be produced, while with
+            nargs=1, a list containing a single value will be produced.
+
+        - const -- The value to be produced if the option is specified and the
+            option uses an action that takes no values.
+
+        - default -- The value to be produced if the option is not specified.
+
+        - type -- The type which the command-line arguments should be converted
+            to, should be one of 'string', 'int', 'float', 'complex' or a
+            callable object that accepts a single string argument. If None,
+            'string' is assumed.
+
+        - choices -- A container of values that should be allowed. If not None,
+            after a command-line argument has been converted to the appropriate
+            type, an exception will be raised if it is not a member of this
+            collection.
+
+        - required -- True if the action must always be specified at the
+            command line. This is only meaningful for optional command-line
+            arguments.
+
+        - help -- The help string describing the argument.
+
+        - metavar -- The name to be used for the option's argument with the
+            help string. If None, the 'dest' value will be used as the name.
+    """
+
+    def __init__(self,
+                 option_strings,
+                 dest,
+                 nargs=None,
+                 const=None,
+                 default=None,
+                 type=None,
+                 choices=None,
+                 required=False,
+                 help=None,
+                 metavar=None):
+        self.option_strings = option_strings
+        self.dest = dest
+        self.nargs = nargs
+        self.const = const
+        self.default = default
+        self.type = type
+        self.choices = choices
+        self.required = required
+        self.help = help
+        self.metavar = metavar
+
+    def _get_kwargs(self):
+        names = [
+            'option_strings',
+            'dest',
+            'nargs',
+            'const',
+            'default',
+            'type',
+            'choices',
+            'help',
+            'metavar',
+        ]
+        return [(name, getattr(self, name)) for name in names]
+
+    def __call__(self, parser, namespace, values, option_string=None):
+        raise NotImplementedError(_('.__call__() not defined'))
+
+
+class _StoreAction(Action):
+
+    def __init__(self,
+                 option_strings,
+                 dest,
+                 nargs=None,
+                 const=None,
+                 default=None,
+                 type=None,
+                 choices=None,
+                 required=False,
+                 help=None,
+                 metavar=None):
+        if nargs == 0:
+            raise ValueError('nargs for store actions must be > 0; if you '
+                             'have nothing to store, actions such as store '
+                             'true or store const may be more appropriate')
+        if const is not None and nargs != OPTIONAL:
+            raise ValueError('nargs must be %r to supply const' % OPTIONAL)
+        super(_StoreAction, self).__init__(
+            option_strings=option_strings,
+            dest=dest,
+            nargs=nargs,
+            const=const,
+            default=default,
+            type=type,
+            choices=choices,
+            required=required,
+            help=help,
+            metavar=metavar)
+
+    def __call__(self, parser, namespace, values, option_string=None):
+        setattr(namespace, self.dest, values)
+
+
+class _StoreConstAction(Action):
+
+    def __init__(self,
+                 option_strings,
+                 dest,
+                 const,
+                 default=None,
+                 required=False,
+                 help=None,
+                 metavar=None):
+        super(_StoreConstAction, self).__init__(
+            option_strings=option_strings,
+            dest=dest,
+            nargs=0,
+            const=const,
+            default=default,
+            required=required,
+            help=help)
+
+    def __call__(self, parser, namespace, values, option_string=None):
+        setattr(namespace, self.dest, self.const)
+
+
+class _StoreTrueAction(_StoreConstAction):
+
+    def __init__(self,
+                 option_strings,
+                 dest,
+                 default=False,
+                 required=False,
+                 help=None):
+        super(_StoreTrueAction, self).__init__(
+            option_strings=option_strings,
+            dest=dest,
+            const=True,
+            default=default,
+            required=required,
+            help=help)
+
+
+class _StoreFalseAction(_StoreConstAction):
+
+    def __init__(self,
+                 option_strings,
+                 dest,
+                 default=True,
+                 required=False,
+                 help=None):
+        super(_StoreFalseAction, self).__init__(
+            option_strings=option_strings,
+            dest=dest,
+            const=False,
+            default=default,
+            required=required,
+            help=help)
+
+
+class _AppendAction(Action):
+
+    def __init__(self,
+                 option_strings,
+                 dest,
+                 nargs=None,
+                 const=None,
+                 default=None,
+                 type=None,
+                 choices=None,
+                 required=False,
+                 help=None,
+                 metavar=None):
+        if nargs == 0:
+            raise ValueError('nargs for append actions must be > 0; if arg '
+                             'strings are not supplying the value to append, '
+                             'the append const action may be more appropriate')
+        if const is not None and nargs != OPTIONAL:
+            raise ValueError('nargs must be %r to supply const' % OPTIONAL)
+        super(_AppendAction, self).__init__(
+            option_strings=option_strings,
+            dest=dest,
+            nargs=nargs,
+            const=const,
+            default=default,
+            type=type,
+            choices=choices,
+            required=required,
+            help=help,
+            metavar=metavar)
+
+    def __call__(self, parser, namespace, values, option_string=None):
+        items = _copy.copy(_ensure_value(namespace, self.dest, []))
+        items.append(values)
+        setattr(namespace, self.dest, items)
+
+
+class _AppendConstAction(Action):
+
+    def __init__(self,
+                 option_strings,
+                 dest,
+                 const,
+                 default=None,
+                 required=False,
+                 help=None,
+                 metavar=None):
+        super(_AppendConstAction, self).__init__(
+            option_strings=option_strings,
+            dest=dest,
+            nargs=0,
+            const=const,
+            default=default,
+            required=required,
+            help=help,
+            metavar=metavar)
+
+    def __call__(self, parser, namespace, values, option_string=None):
+        items = _copy.copy(_ensure_value(namespace, self.dest, []))
+        items.append(self.const)
+        setattr(namespace, self.dest, items)
+
+
+class _CountAction(Action):
+
+    def __init__(self,
+                 option_strings,
+                 dest,
+                 default=None,
+                 required=False,
+                 help=None):
+        super(_CountAction, self).__init__(
+            option_strings=option_strings,
+            dest=dest,
+            nargs=0,
+            default=default,
+            required=required,
+            help=help)
+
+    def __call__(self, parser, namespace, values, option_string=None):
+        new_count = _ensure_value(namespace, self.dest, 0) + 1
+        setattr(namespace, self.dest, new_count)
+
+
+class _HelpAction(Action):
+
+    def __init__(self,
+                 option_strings,
+                 dest=SUPPRESS,
+                 default=SUPPRESS,
+                 help=None):
+        super(_HelpAction, self).__init__(
+            option_strings=option_strings,
+            dest=dest,
+            default=default,
+            nargs=0,
+            help=help)
+
+    def __call__(self, parser, namespace, values, option_string=None):
+        parser.print_help()
+        parser.exit()
+
+
+class _VersionAction(Action):
+
+    def __init__(self,
+                 option_strings,
+                 version=None,
+                 dest=SUPPRESS,
+                 default=SUPPRESS,
+                 help="show program's version number and exit"):
+        super(_VersionAction, self).__init__(
+            option_strings=option_strings,
+            dest=dest,
+            default=default,
+            nargs=0,
+            help=help)
+        self.version = version
+
+    def __call__(self, parser, namespace, values, option_string=None):
+        version = self.version
+        if version is None:
+            version = parser.version
+        formatter = parser._get_formatter()
+        formatter.add_text(version)
+        parser.exit(message=formatter.format_help())
+
+
+class _SubParsersAction(Action):
+
+    class _ChoicesPseudoAction(Action):
+
+        def __init__(self, name, aliases, help):
+            metavar = dest = name
+            if aliases:
+                metavar += ' (%s)' % ', '.join(aliases)
+            sup = super(_SubParsersAction._ChoicesPseudoAction, self)
+            sup.__init__(option_strings=[], dest=dest, help=help,
+                         metavar=metavar)
+
+    def __init__(self,
+                 option_strings,
+                 prog,
+                 parser_class,
+                 dest=SUPPRESS,
+                 help=None,
+                 metavar=None):
+
+        self._prog_prefix = prog
+        self._parser_class = parser_class
+        self._name_parser_map = _collections.OrderedDict()
+        self._choices_actions = []
+
+        super(_SubParsersAction, self).__init__(
+            option_strings=option_strings,
+            dest=dest,
+            nargs=PARSER,
+            choices=self._name_parser_map,
+            help=help,
+            metavar=metavar)
+
+    def add_parser(self, name, **kwargs):
+        # set prog from the existing prefix
+        if kwargs.get('prog') is None:
+            kwargs['prog'] = '%s %s' % (self._prog_prefix, name)
+
+        aliases = kwargs.pop('aliases', ())
+
+        # create a pseudo-action to hold the choice help
+        if 'help' in kwargs:
+            help = kwargs.pop('help')
+            choice_action = self._ChoicesPseudoAction(name, aliases, help)
+            self._choices_actions.append(choice_action)
+
+        # create the parser and add it to the map
+        parser = self._parser_class(**kwargs)
+        self._name_parser_map[name] = parser
+
+        # make parser available under aliases also
+        for alias in aliases:
+            self._name_parser_map[alias] = parser
+
+        return parser
+
+    def _get_subactions(self):
+        return self._choices_actions
+
+    def __call__(self, parser, namespace, values, option_string=None):
+        parser_name = values[0]
+        arg_strings = values[1:]
+
+        # set the parser name if requested
+        if self.dest is not SUPPRESS:
+            setattr(namespace, self.dest, parser_name)
+
+        # select the parser
+        try:
+            parser = self._name_parser_map[parser_name]
+        except KeyError:
+            args = {'parser_name': parser_name,
+                    'choices': ', '.join(self._name_parser_map)}
+            msg = _('unknown parser %(parser_name)r (choices: %(choices)s)') % args
+            raise ArgumentError(self, msg)
+
+        # parse all the remaining options into the namespace
+        # store any unrecognized options on the object, so that the top
+        # level parser can decide what to do with them
+        namespace, arg_strings = parser.parse_known_args(arg_strings, namespace)
+        if arg_strings:
+            vars(namespace).setdefault(_UNRECOGNIZED_ARGS_ATTR, [])
+            getattr(namespace, _UNRECOGNIZED_ARGS_ATTR).extend(arg_strings)
+
+
+# ==============
+# Type classes
+# ==============
+
+class FileType(object):
+    """Factory for creating file object types
+
+    Instances of FileType are typically passed as type= arguments to the
+    ArgumentParser add_argument() method.
+
+    Keyword Arguments:
+        - mode -- A string indicating how the file is to be opened. Accepts the
+            same values as the builtin open() function.
+        - bufsize -- The file's desired buffer size. Accepts the same values as
+            the builtin open() function.
+    """
+
+    def __init__(self, mode='r', bufsize=-1):
+        self._mode = mode
+        self._bufsize = bufsize
+
+    def __call__(self, string):
+        # the special argument "-" means sys.std{in,out}
+        if string == '-':
+            if 'r' in self._mode:
+                return _sys.stdin
+            elif 'w' in self._mode:
+                return _sys.stdout
+            else:
+                msg = _('argument "-" with mode %r') % self._mode
+                raise ValueError(msg)
+
+        # all other arguments are used as file names
+        try:
+            return open(string, self._mode, self._bufsize)
+        except IOError as e:
+            message = _("can't open '%s': %s")
+            raise ArgumentTypeError(message % (string, e))
+
+    def __repr__(self):
+        args = self._mode, self._bufsize
+        args_str = ', '.join(repr(arg) for arg in args if arg != -1)
+        return '%s(%s)' % (type(self).__name__, args_str)
+
+# ===========================
+# Optional and Positional Parsing
+# ===========================
+
+class Namespace(_AttributeHolder):
+    """Simple object for storing attributes.
+
+    Implements equality by attribute names and values, and provides a simple
+    string representation.
+    """
+
+    def __init__(self, **kwargs):
+        for name in kwargs:
+            setattr(self, name, kwargs[name])
+
+    def __eq__(self, other):
+        return vars(self) == vars(other)
+
+    def __ne__(self, other):
+        return not (self == other)
+
+    def __contains__(self, key):
+        return key in self.__dict__
+
+
+class _ActionsContainer(object):
+
+    def __init__(self,
+                 description,
+                 prefix_chars,
+                 argument_default,
+                 conflict_handler):
+        super(_ActionsContainer, self).__init__()
+
+        self.description = description
+        self.argument_default = argument_default
+        self.prefix_chars = prefix_chars
+        self.conflict_handler = conflict_handler
+
+        # set up registries
+        self._registries = {}
+
+        # register actions
+        self.register('action', None, _StoreAction)
+        self.register('action', 'store', _StoreAction)
+        self.register('action', 'store_const', _StoreConstAction)
+        self.register('action', 'store_true', _StoreTrueAction)
+        self.register('action', 'store_false', _StoreFalseAction)
+        self.register('action', 'append', _AppendAction)
+        self.register('action', 'append_const', _AppendConstAction)
+        self.register('action', 'count', _CountAction)
+        self.register('action', 'help', _HelpAction)
+        self.register('action', 'version', _VersionAction)
+        self.register('action', 'parsers', _SubParsersAction)
+
+        # raise an exception if the conflict handler is invalid
+        self._get_handler()
+
+        # action storage
+        self._actions = []
+        self._option_string_actions = {}
+
+        # groups
+        self._action_groups = []
+        self._mutually_exclusive_groups = []
+
+        # defaults storage
+        self._defaults = {}
+
+        # determines whether an "option" looks like a negative number
+        self._negative_number_matcher = _re.compile(r'^-\d+$|^-\d*\.\d+$')
+
+        # whether or not there are any optionals that look like negative
+        # numbers -- uses a list so it can be shared and edited
+        self._has_negative_number_optionals = []
+
+    # ====================
+    # Registration methods
+    # ====================
+    def register(self, registry_name, value, object):
+        registry = self._registries.setdefault(registry_name, {})
+        registry[value] = object
+
+    def _registry_get(self, registry_name, value, default=None):
+        return self._registries[registry_name].get(value, default)
+
+    # ==================================
+    # Namespace default accessor methods
+    # ==================================
+    def set_defaults(self, **kwargs):
+        self._defaults.update(kwargs)
+
+        # if these defaults match any existing arguments, replace
+        # the previous default on the object with the new one
+        for action in self._actions:
+            if action.dest in kwargs:
+                action.default = kwargs[action.dest]
+
+    def get_default(self, dest):
+        for action in self._actions:
+            if action.dest == dest and action.default is not None:
+                return action.default
+        return self._defaults.get(dest, None)
+
+
+    # =======================
+    # Adding argument actions
+    # =======================
+    def add_argument(self, *args, **kwargs):
+        """
+        add_argument(dest, ..., name=value, ...)
+        add_argument(option_string, option_string, ..., name=value, ...)
+        """
+
+        # if no positional args are supplied or only one is supplied and
+        # it doesn't look like an option string, parse a positional
+        # argument
+        chars = self.prefix_chars
+        if not args or len(args) == 1 and args[0][0] not in chars:
+            if args and 'dest' in kwargs:
+                raise ValueError('dest supplied twice for positional argument')
+            kwargs = self._get_positional_kwargs(*args, **kwargs)
+
+        # otherwise, we're adding an optional argument
+        else:
+            kwargs = self._get_optional_kwargs(*args, **kwargs)
+
+        # if no default was supplied, use the parser-level default
+        if 'default' not in kwargs:
+            dest = kwargs['dest']
+            if dest in self._defaults:
+                kwargs['default'] = self._defaults[dest]
+            elif self.argument_default is not None:
+                kwargs['default'] = self.argument_default
+
+        # create the action object, and add it to the parser
+        action_class = self._pop_action_class(kwargs)
+        if not _callable(action_class):
+            raise ValueError('unknown action "%s"' % (action_class,))
+        action = action_class(**kwargs)
+
+        # raise an error if the action type is not callable
+        type_func = self._registry_get('type', action.type, action.type)
+        if not _callable(type_func):
+            raise ValueError('%r is not callable' % (type_func,))
+
+        # raise an error if the metavar does not match the type
+        if hasattr(self, "_get_formatter"):
+            try:
+                self._get_formatter()._format_args(action, None)
+            except TypeError:
+                raise ValueError("length of metavar tuple does not match nargs")
+
+        return self._add_action(action)
+
+    def add_argument_group(self, *args, **kwargs):
+        group = _ArgumentGroup(self, *args, **kwargs)
+        self._action_groups.append(group)
+        return group
+
+    def add_mutually_exclusive_group(self, **kwargs):
+        group = _MutuallyExclusiveGroup(self, **kwargs)
+        self._mutually_exclusive_groups.append(group)
+        return group
+
+    def _add_action(self, action):
+        # resolve any conflicts
+        self._check_conflict(action)
+
+        # add to actions list
+        self._actions.append(action)
+        action.container = self
+
+        # index the action by any option strings it has
+        for option_string in action.option_strings:
+            self._option_string_actions[option_string] = action
+
+        # set the flag if any option strings look like negative numbers
+        for option_string in action.option_strings:
+            if self._negative_number_matcher.match(option_string):
+                if not self._has_negative_number_optionals:
+                    self._has_negative_number_optionals.append(True)
+
+        # return the created action
+        return action
+
+    def _remove_action(self, action):
+        self._actions.remove(action)
+
+    def _add_container_actions(self, container):
+        # collect groups by titles
+        title_group_map = {}
+        for group in self._action_groups:
+            if group.title in title_group_map:
+                msg = _('cannot merge actions - two groups are named %r')
+                raise ValueError(msg % (group.title))
+            title_group_map[group.title] = group
+
+        # map each action to its group
+        group_map = {}
+        for group in container._action_groups:
+
+            # if a group with the title exists, use that, otherwise
+            # create a new group matching the container's group
+            if group.title not in title_group_map:
+                title_group_map[group.title] = self.add_argument_group(
+                    title=group.title,
+                    description=group.description,
+                    conflict_handler=group.conflict_handler)
+
+            # map the actions to their new group
+            for action in group._group_actions:
+                group_map[action] = title_group_map[group.title]
+
+        # add container's mutually exclusive groups
+        # NOTE: if add_mutually_exclusive_group ever gains title= and
+        # description= then this code will need to be expanded as above
+        for group in container._mutually_exclusive_groups:
+            mutex_group = self.add_mutually_exclusive_group(
+                required=group.required)
+
+            # map the actions to their new mutex group
+            for action in group._group_actions:
+                group_map[action] = mutex_group
+
+        # add all actions to this container or their group
+        for action in container._actions:
+            group_map.get(action, self)._add_action(action)
+
+    def _get_positional_kwargs(self, dest, **kwargs):
+        # make sure required is not specified
+        if 'required' in kwargs:
+            msg = _("'required' is an invalid argument for positionals")
+            raise TypeError(msg)
+
+        # mark positional arguments as required if at least one is
+        # always required
+        if kwargs.get('nargs') not in [OPTIONAL, ZERO_OR_MORE]:
+            kwargs['required'] = True
+        if kwargs.get('nargs') == ZERO_OR_MORE and 'default' not in kwargs:
+            kwargs['required'] = True
+
+        # return the keyword arguments with no option strings
+        return dict(kwargs, dest=dest, option_strings=[])
+
+    def _get_optional_kwargs(self, *args, **kwargs):
+        # determine short and long option strings
+        option_strings = []
+        long_option_strings = []
+        for option_string in args:
+            # error on strings that don't start with an appropriate prefix
+            if not option_string[0] in self.prefix_chars:
+                args = {'option': option_string,
+                        'prefix_chars': self.prefix_chars}
+                msg = _('invalid option string %(option)r: '
+                        'must start with a character %(prefix_chars)r')
+                raise ValueError(msg % args)
+
+            # strings starting with two prefix characters are long options
+            option_strings.append(option_string)
+            if option_string[0] in self.prefix_chars:
+                if len(option_string) > 1:
+                    if option_string[1] in self.prefix_chars:
+                        long_option_strings.append(option_string)
+
+        # infer destination, '--foo-bar' -> 'foo_bar' and '-x' -> 'x'
+        dest = kwargs.pop('dest', None)
+        if dest is None:
+            if long_option_strings:
+                dest_option_string = long_option_strings[0]
+            else:
+                dest_option_string = option_strings[0]
+            dest = dest_option_string.lstrip(self.prefix_chars)
+            if not dest:
+                msg = _('dest= is required for options like %r')
+                raise ValueError(msg % option_string)
+            dest = dest.replace('-', '_')
+
+        # return the updated keyword arguments
+        return dict(kwargs, dest=dest, option_strings=option_strings)
+
+    def _pop_action_class(self, kwargs, default=None):
+        action = kwargs.pop('action', default)
+        return self._registry_get('action', action, action)
+
+    def _get_handler(self):
+        # determine function from conflict handler string
+        handler_func_name = '_handle_conflict_%s' % self.conflict_handler
+        try:
+            return getattr(self, handler_func_name)
+        except AttributeError:
+            msg = _('invalid conflict_resolution value: %r')
+            raise ValueError(msg % self.conflict_handler)
+
+    def _check_conflict(self, action):
+
+        # find all options that conflict with this option
+        confl_optionals = []
+        for option_string in action.option_strings:
+            if option_string in self._option_string_actions:
+                confl_optional = self._option_string_actions[option_string]
+                confl_optionals.append((option_string, confl_optional))
+
+        # resolve any conflicts
+        if confl_optionals:
+            conflict_handler = self._get_handler()
+            conflict_handler(action, confl_optionals)
+
+    def _handle_conflict_error(self, action, conflicting_actions):
+        message = ngettext('conflicting option string: %s',
+                           'conflicting option strings: %s',
+                           len(conflicting_actions))
+        conflict_string = ', '.join([option_string
+                                     for option_string, action
+                                     in conflicting_actions])
+        raise ArgumentError(action, message % conflict_string)
+
+    def _handle_conflict_resolve(self, action, conflicting_actions):
+
+        # remove all conflicting options
+        for option_string, action in conflicting_actions:
+
+            # remove the conflicting option
+            action.option_strings.remove(option_string)
+            self._option_string_actions.pop(option_string, None)
+
+            # if the option now has no option string, remove it from the
+            # container holding it
+            if not action.option_strings:
+                action.container._remove_action(action)
+
+
+class _ArgumentGroup(_ActionsContainer):
+
+    def __init__(self, container, title=None, description=None, **kwargs):
+        # add any missing keyword arguments by checking the container
+        update = kwargs.setdefault
+        update('conflict_handler', container.conflict_handler)
+        update('prefix_chars', container.prefix_chars)
+        update('argument_default', container.argument_default)
+        super_init = super(_ArgumentGroup, self).__init__
+        super_init(description=description, **kwargs)
+
+        # group attributes
+        self.title = title
+        self._group_actions = []
+
+        # share most attributes with the container
+        self._registries = container._registries
+        self._actions = container._actions
+        self._option_string_actions = container._option_string_actions
+        self._defaults = container._defaults
+        self._has_negative_number_optionals = \
+            container._has_negative_number_optionals
+        self._mutually_exclusive_groups = container._mutually_exclusive_groups
+
+    def _add_action(self, action):
+        action = super(_ArgumentGroup, self)._add_action(action)
+        self._group_actions.append(action)
+        return action
+
+    def _remove_action(self, action):
+        super(_ArgumentGroup, self)._remove_action(action)
+        self._group_actions.remove(action)
+
+
+class _MutuallyExclusiveGroup(_ArgumentGroup):
+
+    def __init__(self, container, required=False):
+        super(_MutuallyExclusiveGroup, self).__init__(container)
+        self.required = required
+        self._container = container
+
+    def _add_action(self, action):
+        if action.required:
+            msg = _('mutually exclusive arguments must be optional')
+            raise ValueError(msg)
+        action = self._container._add_action(action)
+        self._group_actions.append(action)
+        return action
+
+    def _remove_action(self, action):
+        self._container._remove_action(action)
+        self._group_actions.remove(action)
+
+
+class ArgumentParser(_AttributeHolder, _ActionsContainer):
+    """Object for parsing command line strings into Python objects.
+
+    Keyword Arguments:
+        - prog -- The name of the program (default: sys.argv[0])
+        - usage -- A usage message (default: auto-generated from arguments)
+        - description -- A description of what the program does
+        - epilog -- Text following the argument descriptions
+        - parents -- Parsers whose arguments should be copied into this one
+        - formatter_class -- HelpFormatter class for printing help messages
+        - prefix_chars -- Characters that prefix optional arguments
+        - fromfile_prefix_chars -- Characters that prefix files containing
+            additional arguments
+        - argument_default -- The default value for all arguments
+        - conflict_handler -- String indicating how to handle conflicts
+        - add_help -- Add a -h/-help option
+    """
+
+    def __init__(self,
+                 prog=None,
+                 usage=None,
+                 description=None,
+                 epilog=None,
+                 version=None,
+                 parents=[],
+                 formatter_class=HelpFormatter,
+                 prefix_chars='-',
+                 fromfile_prefix_chars=None,
+                 argument_default=None,
+                 conflict_handler='error',
+                 add_help=True):
+
+        if version is not None:
+            import warnings
+            warnings.warn(
+                """The "version" argument to ArgumentParser is deprecated. """
+                """Please use """
+                """"add_argument(..., action='version', version="N", ...)" """
+                """instead""", DeprecationWarning)
+
+        superinit = super(ArgumentParser, self).__init__
+        superinit(description=description,
+                  prefix_chars=prefix_chars,
+                  argument_default=argument_default,
+                  conflict_handler=conflict_handler)
+
+        # default setting for prog
+        if prog is None:
+            prog = _os.path.basename(_sys.argv[0])
+
+        self.prog = prog
+        self.usage = usage
+        self.epilog = epilog
+        self.version = version
+        self.formatter_class = formatter_class
+        self.fromfile_prefix_chars = fromfile_prefix_chars
+        self.add_help = add_help
+
+        add_group = self.add_argument_group
+        self._positionals = add_group(_('positional arguments'))
+        self._optionals = add_group(_('optional arguments'))
+        self._subparsers = None
+
+        # register types
+        def identity(string):
+            return string
+        self.register('type', None, identity)
+
+        # add help and version arguments if necessary
+        # (using explicit default to override global argument_default)
+        default_prefix = '-' if '-' in prefix_chars else prefix_chars[0]
+        if self.add_help:
+            self.add_argument(
+                default_prefix+'h', default_prefix*2+'help',
+                action='help', default=SUPPRESS,
+                help=_('show this help message and exit'))
+        if self.version:
+            self.add_argument(
+                default_prefix+'v', default_prefix*2+'version',
+                action='version', default=SUPPRESS,
+                version=self.version,
+                help=_("show program's version number and exit"))
+
+        # add parent arguments and defaults
+        for parent in parents:
+            self._add_container_actions(parent)
+            try:
+                defaults = parent._defaults
+            except AttributeError:
+                pass
+            else:
+                self._defaults.update(defaults)
+
+    # =======================
+    # Pretty __repr__ methods
+    # =======================
+    def _get_kwargs(self):
+        names = [
+            'prog',
+            'usage',
+            'description',
+            'version',
+            'formatter_class',
+            'conflict_handler',
+            'add_help',
+        ]
+        return [(name, getattr(self, name)) for name in names]
+
+    # ==================================
+    # Optional/Positional adding methods
+    # ==================================
+    def add_subparsers(self, **kwargs):
+        if self._subparsers is not None:
+            self.error(_('cannot have multiple subparser arguments'))
+
+        # add the parser class to the arguments if it's not present
+        kwargs.setdefault('parser_class', type(self))
+
+        if 'title' in kwargs or 'description' in kwargs:
+            title = _(kwargs.pop('title', 'subcommands'))
+            description = _(kwargs.pop('description', None))
+            self._subparsers = self.add_argument_group(title, description)
+        else:
+            self._subparsers = self._positionals
+
+        # prog defaults to the usage message of this parser, skipping
+        # optional arguments and with no "usage:" prefix
+        if kwargs.get('prog') is None:
+            formatter = self._get_formatter()
+            positionals = self._get_positional_actions()
+            groups = self._mutually_exclusive_groups
+            formatter.add_usage(self.usage, positionals, groups, '')
+            kwargs['prog'] = formatter.format_help().strip()
+
+        # create the parsers action and add it to the positionals list
+        parsers_class = self._pop_action_class(kwargs, 'parsers')
+        action = parsers_class(option_strings=[], **kwargs)
+        self._subparsers._add_action(action)
+
+        # return the created parsers action
+        return action
+
+    def _add_action(self, action):
+        if action.option_strings:
+            self._optionals._add_action(action)
+        else:
+            self._positionals._add_action(action)
+        return action
+
+    def _get_optional_actions(self):
+        return [action
+                for action in self._actions
+                if action.option_strings]
+
+    def _get_positional_actions(self):
+        return [action
+                for action in self._actions
+                if not action.option_strings]
+
+    # =====================================
+    # Command line argument parsing methods
+    # =====================================
+    def parse_args(self, args=None, namespace=None):
+        args, argv = self.parse_known_args(args, namespace)
+        if argv:
+            msg = _('unrecognized arguments: %s')
+            self.error(msg % ' '.join(argv))
+        return args
+
+    def parse_known_args(self, args=None, namespace=None):
+        # args default to the system args
+        if args is None:
+            args = _sys.argv[1:]
+
+        # default Namespace built from parser defaults
+        if namespace is None:
+            namespace = Namespace()
+
+        # add any action defaults that aren't present
+        for action in self._actions:
+            if action.dest is not SUPPRESS:
+                if not hasattr(namespace, action.dest):
+                    if action.default is not SUPPRESS:
+                        default = action.default
+                        if isinstance(action.default, str):
+                            default = self._get_value(action, default)
+                        setattr(namespace, action.dest, default)
+
+        # add any parser defaults that aren't present
+        for dest in self._defaults:
+            if not hasattr(namespace, dest):
+                setattr(namespace, dest, self._defaults[dest])
+
+        # parse the arguments and exit if there are any errors
+        try:
+            namespace, args = self._parse_known_args(args, namespace)
+            if hasattr(namespace, _UNRECOGNIZED_ARGS_ATTR):
+                args.extend(getattr(namespace, _UNRECOGNIZED_ARGS_ATTR))
+                delattr(namespace, _UNRECOGNIZED_ARGS_ATTR)
+            return namespace, args
+        except ArgumentError:
+            err = _sys.exc_info()[1]
+            self.error(str(err))
+
+    def _parse_known_args(self, arg_strings, namespace):
+        # replace arg strings that are file references
+        if self.fromfile_prefix_chars is not None:
+            arg_strings = self._read_args_from_files(arg_strings)
+
+        # map all mutually exclusive arguments to the other arguments
+        # they can't occur with
+        action_conflicts = {}
+        for mutex_group in self._mutually_exclusive_groups:
+            group_actions = mutex_group._group_actions
+            for i, mutex_action in enumerate(mutex_group._group_actions):
+                conflicts = action_conflicts.setdefault(mutex_action, [])
+                conflicts.extend(group_actions[:i])
+                conflicts.extend(group_actions[i + 1:])
+
+        # find all option indices, and determine the arg_string_pattern
+        # which has an 'O' if there is an option at an index,
+        # an 'A' if there is an argument, or a '-' if there is a '--'
+        option_string_indices = {}
+        arg_string_pattern_parts = []
+        arg_strings_iter = iter(arg_strings)
+        for i, arg_string in enumerate(arg_strings_iter):
+
+            # all args after -- are non-options
+            if arg_string == '--':
+                arg_string_pattern_parts.append('-')
+                for arg_string in arg_strings_iter:
+                    arg_string_pattern_parts.append('A')
+
+            # otherwise, add the arg to the arg strings
+            # and note the index if it was an option
+            else:
+                option_tuple = self._parse_optional(arg_string)
+                if option_tuple is None:
+                    pattern = 'A'
+                else:
+                    option_string_indices[i] = option_tuple
+                    pattern = 'O'
+                arg_string_pattern_parts.append(pattern)
+
+        # join the pieces together to form the pattern
+        arg_strings_pattern = ''.join(arg_string_pattern_parts)
+
+        # converts arg strings to the appropriate and then takes the action
+        seen_actions = set()
+        seen_non_default_actions = set()
+
+        def take_action(action, argument_strings, option_string=None):
+            seen_actions.add(action)
+            argument_values = self._get_values(action, argument_strings)
+
+            # error if this argument is not allowed with other previously
+            # seen arguments, assuming that actions that use the default
+            # value don't really count as "present"
+            if argument_values is not action.default:
+                seen_non_default_actions.add(action)
+                for conflict_action in action_conflicts.get(action, []):
+                    if conflict_action in seen_non_default_actions:
+                        msg = _('not allowed with argument %s')
+                        action_name = _get_action_name(conflict_action)
+                        raise ArgumentError(action, msg % action_name)
+
+            # take the action if we didn't receive a SUPPRESS value
+            # (e.g. from a default)
+            if argument_values is not SUPPRESS:
+                action(self, namespace, argument_values, option_string)
+
+        # function to convert arg_strings into an optional action
+        def consume_optional(start_index):
+
+            # get the optional identified at this index
+            option_tuple = option_string_indices[start_index]
+            action, option_string, explicit_arg = option_tuple
+
+            # identify additional optionals in the same arg string
+            # (e.g. -xyz is the same as -x -y -z if no args are required)
+            match_argument = self._match_argument
+            action_tuples = []
+            while True:
+
+                # if we found no optional action, skip it
+                if action is None:
+                    extras.append(arg_strings[start_index])
+                    return start_index + 1
+
+                # if there is an explicit argument, try to match the
+                # optional's string arguments to only this
+                if explicit_arg is not None:
+                    arg_count = match_argument(action, 'A')
+
+                    # if the action is a single-dash option and takes no
+                    # arguments, try to parse more single-dash options out
+                    # of the tail of the option string
+                    chars = self.prefix_chars
+                    if arg_count == 0 and option_string[1] not in chars:
+                        action_tuples.append((action, [], option_string))
+                        char = option_string[0]
+                        option_string = char + explicit_arg[0]
+                        new_explicit_arg = explicit_arg[1:] or None
+                        optionals_map = self._option_string_actions
+                        if option_string in optionals_map:
+                            action = optionals_map[option_string]
+                            explicit_arg = new_explicit_arg
+                        else:
+                            msg = _('ignored explicit argument %r')
+                            raise ArgumentError(action, msg % explicit_arg)
+
+                    # if the action expect exactly one argument, we've
+                    # successfully matched the option; exit the loop
+                    elif arg_count == 1:
+                        stop = start_index + 1
+                        args = [explicit_arg]
+                        action_tuples.append((action, args, option_string))
+                        break
+
+                    # error if a double-dash option did not use the
+                    # explicit argument
+                    else:
+                        msg = _('ignored explicit argument %r')
+                        raise ArgumentError(action, msg % explicit_arg)
+
+                # if there is no explicit argument, try to match the
+                # optional's string arguments with the following strings
+                # if successful, exit the loop
+                else:
+                    start = start_index + 1
+                    selected_patterns = arg_strings_pattern[start:]
+                    arg_count = match_argument(action, selected_patterns)
+                    stop = start + arg_count
+                    args = arg_strings[start:stop]
+                    action_tuples.append((action, args, option_string))
+                    break
+
+            # add the Optional to the list and return the index at which
+            # the Optional's string args stopped
+            assert action_tuples
+            for action, args, option_string in action_tuples:
+                take_action(action, args, option_string)
+            return stop
+
+        # the list of Positionals left to be parsed; this is modified
+        # by consume_positionals()
+        positionals = self._get_positional_actions()
+
+        # function to convert arg_strings into positional actions
+        def consume_positionals(start_index):
+            # match as many Positionals as possible
+            match_partial = self._match_arguments_partial
+            selected_pattern = arg_strings_pattern[start_index:]
+            arg_counts = match_partial(positionals, selected_pattern)
+
+            # slice off the appropriate arg strings for each Positional
+            # and add the Positional and its args to the list
+            for action, arg_count in zip(positionals, arg_counts):
+                args = arg_strings[start_index: start_index + arg_count]
+                start_index += arg_count
+                take_action(action, args)
+
+            # slice off the Positionals that we just parsed and return the
+            # index at which the Positionals' string args stopped
+            positionals[:] = positionals[len(arg_counts):]
+            return start_index
+
+        # consume Positionals and Optionals alternately, until we have
+        # passed the last option string
+        extras = []
+        start_index = 0
+        if option_string_indices:
+            max_option_string_index = max(option_string_indices)
+        else:
+            max_option_string_index = -1
+        while start_index <= max_option_string_index:
+
+            # consume any Positionals preceding the next option
+            next_option_string_index = min([
+                index
+                for index in option_string_indices
+                if index >= start_index])
+            if start_index != next_option_string_index:
+                positionals_end_index = consume_positionals(start_index)
+
+                # only try to parse the next optional if we didn't consume
+                # the option string during the positionals parsing
+                if positionals_end_index > start_index:
+                    start_index = positionals_end_index
+                    continue
+                else:
+                    start_index = positionals_end_index
+
+            # if we consumed all the positionals we could and we're not
+            # at the index of an option string, there were extra arguments
+            if start_index not in option_string_indices:
+                strings = arg_strings[start_index:next_option_string_index]
+                extras.extend(strings)
+                start_index = next_option_string_index
+
+            # consume the next optional and any arguments for it
+            start_index = consume_optional(start_index)
+
+        # consume any positionals following the last Optional
+        stop_index = consume_positionals(start_index)
+
+        # if we didn't consume all the argument strings, there were extras
+        extras.extend(arg_strings[stop_index:])
+
+        # make sure all required actions were present
+        required_actions = [_get_action_name(action) for action in self._actions
+                            if action.required and action not in seen_actions]
+        if required_actions:
+            self.error(_('the following arguments are required: %s') %
+                       ', '.join(required_actions))
+
+        # make sure all required groups had one option present
+        for group in self._mutually_exclusive_groups:
+            if group.required:
+                for action in group._group_actions:
+                    if action in seen_non_default_actions:
+                        break
+
+                # if no actions were used, report the error
+                else:
+                    names = [_get_action_name(action)
+                             for action in group._group_actions
+                             if action.help is not SUPPRESS]
+                    msg = _('one of the arguments %s is required')
+                    self.error(msg % ' '.join(names))
+
+        # return the updated namespace and the extra arguments
+        return namespace, extras
+
+    def _read_args_from_files(self, arg_strings):
+        # expand arguments referencing files
+        new_arg_strings = []
+        for arg_string in arg_strings:
+
+            # for regular arguments, just add them back into the list
+            if arg_string[0] not in self.fromfile_prefix_chars:
+                new_arg_strings.append(arg_string)
+
+            # replace arguments referencing files with the file content
+            else:
+                try:
+                    args_file = open(arg_string[1:])
+                    try:
+                        arg_strings = []
+                        for arg_line in args_file.read().splitlines():
+                            for arg in self.convert_arg_line_to_args(arg_line):
+                                arg_strings.append(arg)
+                        arg_strings = self._read_args_from_files(arg_strings)
+                        new_arg_strings.extend(arg_strings)
+                    finally:
+                        args_file.close()
+                except IOError:
+                    err = _sys.exc_info()[1]
+                    self.error(str(err))
+
+        # return the modified argument list
+        return new_arg_strings
+
+    def convert_arg_line_to_args(self, arg_line):
+        return [arg_line]
+
+    def _match_argument(self, action, arg_strings_pattern):
+        # match the pattern for this action to the arg strings
+        nargs_pattern = self._get_nargs_pattern(action)
+        match = _re.match(nargs_pattern, arg_strings_pattern)
+
+        # raise an exception if we weren't able to find a match
+        if match is None:
+            nargs_errors = {
+                None: _('expected one argument'),
+                OPTIONAL: _('expected at most one argument'),
+                ONE_OR_MORE: _('expected at least one argument'),
+            }
+            default = ngettext('expected %s argument',
+                               'expected %s arguments',
+                               action.nargs) % action.nargs
+            msg = nargs_errors.get(action.nargs, default)
+            raise ArgumentError(action, msg)
+
+        # return the number of arguments matched
+        return len(match.group(1))
+
+    def _match_arguments_partial(self, actions, arg_strings_pattern):
+        # progressively shorten the actions list by slicing off the
+        # final actions until we find a match
+        result = []
+        for i in range(len(actions), 0, -1):
+            actions_slice = actions[:i]
+            pattern = ''.join([self._get_nargs_pattern(action)
+                               for action in actions_slice])
+            match = _re.match(pattern, arg_strings_pattern)
+            if match is not None:
+                result.extend([len(string) for string in match.groups()])
+                break
+
+        # return the list of arg string counts
+        return result
+
+    def _parse_optional(self, arg_string):
+        # if it's an empty string, it was meant to be a positional
+        if not arg_string:
+            return None
+
+        # if it doesn't start with a prefix, it was meant to be positional
+        if not arg_string[0] in self.prefix_chars:
+            return None
+
+        # if the option string is present in the parser, return the action
+        if arg_string in self._option_string_actions:
+            action = self._option_string_actions[arg_string]
+            return action, arg_string, None
+
+        # if it's just a single character, it was meant to be positional
+        if len(arg_string) == 1:
+            return None
+
+        # if the option string before the "=" is present, return the action
+        if '=' in arg_string:
+            option_string, explicit_arg = arg_string.split('=', 1)
+            if option_string in self._option_string_actions:
+                action = self._option_string_actions[option_string]
+                return action, option_string, explicit_arg
+
+        # search through all possible prefixes of the option string
+        # and all actions in the parser for possible interpretations
+        option_tuples = self._get_option_tuples(arg_string)
+
+        # if multiple actions match, the option string was ambiguous
+        if len(option_tuples) > 1:
+            options = ', '.join([option_string
+                for action, option_string, explicit_arg in option_tuples])
+            args = {'option': arg_string, 'matches': options}
+            msg = _('ambiguous option: %(option)s could match %(matches)s')
+            self.error(msg % args)
+
+        # if exactly one action matched, this segmentation is good,
+        # so return the parsed action
+        elif len(option_tuples) == 1:
+            option_tuple, = option_tuples
+            return option_tuple
+
+        # if it was not found as an option, but it looks like a negative
+        # number, it was meant to be positional
+        # unless there are negative-number-like options
+        if self._negative_number_matcher.match(arg_string):
+            if not self._has_negative_number_optionals:
+                return None
+
+        # if it contains a space, it was meant to be a positional
+        if ' ' in arg_string:
+            return None
+
+        # it was meant to be an optional but there is no such option
+        # in this parser (though it might be a valid option in a subparser)
+        return None, arg_string, None
+
+    def _get_option_tuples(self, option_string):
+        result = []
+
+        # option strings starting with two prefix characters are only
+        # split at the '='
+        chars = self.prefix_chars
+        if option_string[0] in chars and option_string[1] in chars:
+            if '=' in option_string:
+                option_prefix, explicit_arg = option_string.split('=', 1)
+            else:
+                option_prefix = option_string
+                explicit_arg = None
+            for option_string in self._option_string_actions:
+                if option_string.startswith(option_prefix):
+                    action = self._option_string_actions[option_string]
+                    tup = action, option_string, explicit_arg
+                    result.append(tup)
+
+        # single character options can be concatenated with their arguments
+        # but multiple character options always have to have their argument
+        # separate
+        elif option_string[0] in chars and option_string[1] not in chars:
+            option_prefix = option_string
+            explicit_arg = None
+            short_option_prefix = option_string[:2]
+            short_explicit_arg = option_string[2:]
+
+            for option_string in self._option_string_actions:
+                if option_string == short_option_prefix:
+                    action = self._option_string_actions[option_string]
+                    tup = action, option_string, short_explicit_arg
+                    result.append(tup)
+                elif option_string.startswith(option_prefix):
+                    action = self._option_string_actions[option_string]
+                    tup = action, option_string, explicit_arg
+                    result.append(tup)
+
+        # shouldn't ever get here
+        else:
+            self.error(_('unexpected option string: %s') % option_string)
+
+        # return the collected option tuples
+        return result
+
+    def _get_nargs_pattern(self, action):
+        # in all examples below, we have to allow for '--' args
+        # which are represented as '-' in the pattern
+        nargs = action.nargs
+
+        # the default (None) is assumed to be a single argument
+        if nargs is None:
+            nargs_pattern = '(-*A-*)'
+
+        # allow zero or one arguments
+        elif nargs == OPTIONAL:
+            nargs_pattern = '(-*A?-*)'
+
+        # allow zero or more arguments
+        elif nargs == ZERO_OR_MORE:
+            nargs_pattern = '(-*[A-]*)'
+
+        # allow one or more arguments
+        elif nargs == ONE_OR_MORE:
+            nargs_pattern = '(-*A[A-]*)'
+
+        # allow any number of options or arguments
+        elif nargs == REMAINDER:
+            nargs_pattern = '([-AO]*)'
+
+        # allow one argument followed by any number of options or arguments
+        elif nargs == PARSER:
+            nargs_pattern = '(-*A[-AO]*)'
+
+        # all others should be integers
+        else:
+            nargs_pattern = '(-*%s-*)' % '-*'.join('A' * nargs)
+
+        # if this is an optional action, -- is not allowed
+        if action.option_strings:
+            nargs_pattern = nargs_pattern.replace('-*', '')
+            nargs_pattern = nargs_pattern.replace('-', '')
+
+        # return the pattern
+        return nargs_pattern
+
+    # ========================
+    # Value conversion methods
+    # ========================
+    def _get_values(self, action, arg_strings):
+        # for everything but PARSER args, strip out '--'
+        if action.nargs not in [PARSER, REMAINDER]:
+            arg_strings = [s for s in arg_strings if s != '--']
+
+        # optional argument produces a default when not present
+        if not arg_strings and action.nargs == OPTIONAL:
+            if action.option_strings:
+                value = action.const
+            else:
+                value = action.default
+            if isinstance(value, str):
+                value = self._get_value(action, value)
+                self._check_value(action, value)
+
+        # when nargs='*' on a positional, if there were no command-line
+        # args, use the default if it is anything other than None
+        elif (not arg_strings and action.nargs == ZERO_OR_MORE and
+              not action.option_strings):
+            if action.default is not None:
+                value = action.default
+            else:
+                value = arg_strings
+            self._check_value(action, value)
+
+        # single argument or optional argument produces a single value
+        elif len(arg_strings) == 1 and action.nargs in [None, OPTIONAL]:
+            arg_string, = arg_strings
+            value = self._get_value(action, arg_string)
+            self._check_value(action, value)
+
+        # REMAINDER arguments convert all values, checking none
+        elif action.nargs == REMAINDER:
+            value = [self._get_value(action, v) for v in arg_strings]
+
+        # PARSER arguments convert all values, but check only the first
+        elif action.nargs == PARSER:
+            value = [self._get_value(action, v) for v in arg_strings]
+            self._check_value(action, value[0])
+
+        # all other types of nargs produce a list
+        else:
+            value = [self._get_value(action, v) for v in arg_strings]
+            for v in value:
+                self._check_value(action, v)
+
+        # return the converted value
+        return value
+
+    def _get_value(self, action, arg_string):
+        type_func = self._registry_get('type', action.type, action.type)
+        if not _callable(type_func):
+            msg = _('%r is not callable')
+            raise ArgumentError(action, msg % type_func)
+
+        # convert the value to the appropriate type
+        try:
+            result = type_func(arg_string)
+
+        # ArgumentTypeErrors indicate errors
+        except ArgumentTypeError:
+            name = getattr(action.type, '__name__', repr(action.type))
+            msg = str(_sys.exc_info()[1])
+            raise ArgumentError(action, msg)
+
+        # TypeErrors or ValueErrors also indicate errors
+        except (TypeError, ValueError):
+            name = getattr(action.type, '__name__', repr(action.type))
+            args = {'type': name, 'value': arg_string}
+            msg = _('invalid %(type)s value: %(value)r')
+            raise ArgumentError(action, msg % args)
+
+        # return the converted value
+        return result
+
+    def _check_value(self, action, value):
+        # converted value must be one of the choices (if specified)
+        if action.choices is not None and value not in action.choices:
+            args = {'value': value,
+                    'choices': ', '.join(map(repr, action.choices))}
+            msg = _('invalid choice: %(value)r (choose from %(choices)s)')
+            raise ArgumentError(action, msg % args)
+
+    # =======================
+    # Help-formatting methods
+    # =======================
+    def format_usage(self):
+        formatter = self._get_formatter()
+        formatter.add_usage(self.usage, self._actions,
+                            self._mutually_exclusive_groups)
+        return formatter.format_help()
+
+    def format_help(self):
+        formatter = self._get_formatter()
+
+        # usage
+        formatter.add_usage(self.usage, self._actions,
+                            self._mutually_exclusive_groups)
+
+        # description
+        formatter.add_text(self.description)
+
+        # positionals, optionals and user-defined groups
+        for action_group in self._action_groups:
+            formatter.start_section(action_group.title)
+            formatter.add_text(action_group.description)
+            formatter.add_arguments(action_group._group_actions)
+            formatter.end_section()
+
+        # epilog
+        formatter.add_text(self.epilog)
+
+        # determine help from format above
+        return formatter.format_help()
+
+    def format_version(self):
+        import warnings
+        warnings.warn(
+            'The format_version method is deprecated -- the "version" '
+            'argument to ArgumentParser is no longer supported.',
+            DeprecationWarning)
+        formatter = self._get_formatter()
+        formatter.add_text(self.version)
+        return formatter.format_help()
+
+    def _get_formatter(self):
+        return self.formatter_class(prog=self.prog)
+
+    # =====================
+    # Help-printing methods
+    # =====================
+    def print_usage(self, file=None):
+        if file is None:
+            file = _sys.stdout
+        self._print_message(self.format_usage(), file)
+
+    def print_help(self, file=None):
+        if file is None:
+            file = _sys.stdout
+        self._print_message(self.format_help(), file)
+
+    def print_version(self, file=None):
+        import warnings
+        warnings.warn(
+            'The print_version method is deprecated -- the "version" '
+            'argument to ArgumentParser is no longer supported.',
+            DeprecationWarning)
+        self._print_message(self.format_version(), file)
+
+    def _print_message(self, message, file=None):
+        if message:
+            if file is None:
+                file = _sys.stderr
+            file.write(message)
+
+    # ===============
+    # Exiting methods
+    # ===============
+    def exit(self, status=0, message=None):
+        if message:
+            self._print_message(message, _sys.stderr)
+        _sys.exit(status)
+
+    def error(self, message):
+        """error(message: string)
+
+        Prints a usage message incorporating the message to stderr and
+        exits.
+
+        If you override this in a subclass, it should not return -- it
+        should either exit or raise an exception.
+        """
+        self.print_usage(_sys.stderr)
+        args = {'prog': self.prog, 'message': message}
+        self.exit(2, _('%(prog)s: error: %(message)s\n') % args)
diff --git a/lib/arrow/__init__.py b/lib/arrow/__init__.py
deleted file mode 100644
index bc597097..00000000
--- a/lib/arrow/__init__.py
+++ /dev/null
@@ -1,39 +0,0 @@
-from ._version import __version__
-from .api import get, now, utcnow
-from .arrow import Arrow
-from .factory import ArrowFactory
-from .formatter import (
-    FORMAT_ATOM,
-    FORMAT_COOKIE,
-    FORMAT_RFC822,
-    FORMAT_RFC850,
-    FORMAT_RFC1036,
-    FORMAT_RFC1123,
-    FORMAT_RFC2822,
-    FORMAT_RFC3339,
-    FORMAT_RSS,
-    FORMAT_W3C,
-)
-from .parser import ParserError
-
-# https://mypy.readthedocs.io/en/stable/command_line.html#cmdoption-mypy-no-implicit-reexport
-# Mypy with --strict or --no-implicit-reexport requires an explicit reexport.
-__all__ = [
-    "__version__",
-    "get",
-    "now",
-    "utcnow",
-    "Arrow",
-    "ArrowFactory",
-    "FORMAT_ATOM",
-    "FORMAT_COOKIE",
-    "FORMAT_RFC822",
-    "FORMAT_RFC850",
-    "FORMAT_RFC1036",
-    "FORMAT_RFC1123",
-    "FORMAT_RFC2822",
-    "FORMAT_RFC3339",
-    "FORMAT_RSS",
-    "FORMAT_W3C",
-    "ParserError",
-]
diff --git a/lib/arrow/_version.py b/lib/arrow/_version.py
deleted file mode 100644
index 67bc602a..00000000
--- a/lib/arrow/_version.py
+++ /dev/null
@@ -1 +0,0 @@
-__version__ = "1.3.0"
diff --git a/lib/arrow/api.py b/lib/arrow/api.py
deleted file mode 100644
index d8ed24b9..00000000
--- a/lib/arrow/api.py
+++ /dev/null
@@ -1,126 +0,0 @@
-"""
-Provides the default implementation of :class:`ArrowFactory <arrow.factory.ArrowFactory>`
-methods for use as a module API.
-
-"""
-
-from datetime import date, datetime
-from datetime import tzinfo as dt_tzinfo
-from time import struct_time
-from typing import Any, List, Optional, Tuple, Type, Union, overload
-
-from arrow.arrow import TZ_EXPR, Arrow
-from arrow.constants import DEFAULT_LOCALE
-from arrow.factory import ArrowFactory
-
-# internal default factory.
-_factory = ArrowFactory()
-
-# TODO: Use Positional Only Argument (https://www.python.org/dev/peps/pep-0570/)
-#  after Python 3.7 deprecation
-
-
-@overload
-def get(
-    *,
-    locale: str = DEFAULT_LOCALE,
-    tzinfo: Optional[TZ_EXPR] = None,
-    normalize_whitespace: bool = False,
-) -> Arrow:
-    ...  # pragma: no cover
-
-
-@overload
-def get(
-    *args: int,
-    locale: str = DEFAULT_LOCALE,
-    tzinfo: Optional[TZ_EXPR] = None,
-    normalize_whitespace: bool = False,
-) -> Arrow:
-    ...  # pragma: no cover
-
-
-@overload
-def get(
-    __obj: Union[
-        Arrow,
-        datetime,
-        date,
-        struct_time,
-        dt_tzinfo,
-        int,
-        float,
-        str,
-        Tuple[int, int, int],
-    ],
-    *,
-    locale: str = DEFAULT_LOCALE,
-    tzinfo: Optional[TZ_EXPR] = None,
-    normalize_whitespace: bool = False,
-) -> Arrow:
-    ...  # pragma: no cover
-
-
-@overload
-def get(
-    __arg1: Union[datetime, date],
-    __arg2: TZ_EXPR,
-    *,
-    locale: str = DEFAULT_LOCALE,
-    tzinfo: Optional[TZ_EXPR] = None,
-    normalize_whitespace: bool = False,
-) -> Arrow:
-    ...  # pragma: no cover
-
-
-@overload
-def get(
-    __arg1: str,
-    __arg2: Union[str, List[str]],
-    *,
-    locale: str = DEFAULT_LOCALE,
-    tzinfo: Optional[TZ_EXPR] = None,
-    normalize_whitespace: bool = False,
-) -> Arrow:
-    ...  # pragma: no cover
-
-
-def get(*args: Any, **kwargs: Any) -> Arrow:
-    """Calls the default :class:`ArrowFactory <arrow.factory.ArrowFactory>` ``get`` method."""
-
-    return _factory.get(*args, **kwargs)
-
-
-get.__doc__ = _factory.get.__doc__
-
-
-def utcnow() -> Arrow:
-    """Calls the default :class:`ArrowFactory <arrow.factory.ArrowFactory>` ``utcnow`` method."""
-
-    return _factory.utcnow()
-
-
-utcnow.__doc__ = _factory.utcnow.__doc__
-
-
-def now(tz: Optional[TZ_EXPR] = None) -> Arrow:
-    """Calls the default :class:`ArrowFactory <arrow.factory.ArrowFactory>` ``now`` method."""
-
-    return _factory.now(tz)
-
-
-now.__doc__ = _factory.now.__doc__
-
-
-def factory(type: Type[Arrow]) -> ArrowFactory:
-    """Returns an :class:`.ArrowFactory` for the specified :class:`Arrow <arrow.arrow.Arrow>`
-    or derived type.
-
-    :param type: the type, :class:`Arrow <arrow.arrow.Arrow>` or derived.
-
-    """
-
-    return ArrowFactory(type)
-
-
-__all__ = ["get", "utcnow", "now", "factory"]
diff --git a/lib/arrow/arrow.py b/lib/arrow/arrow.py
deleted file mode 100644
index 8d329efd..00000000
--- a/lib/arrow/arrow.py
+++ /dev/null
@@ -1,1869 +0,0 @@
-"""
-Provides the :class:`Arrow <arrow.arrow.Arrow>` class, an enhanced ``datetime``
-replacement.
-
-"""
-
-
-import calendar
-import re
-import sys
-from datetime import date
-from datetime import datetime as dt_datetime
-from datetime import time as dt_time
-from datetime import timedelta
-from datetime import tzinfo as dt_tzinfo
-from math import trunc
-from time import struct_time
-from typing import (
-    Any,
-    ClassVar,
-    Generator,
-    Iterable,
-    List,
-    Mapping,
-    Optional,
-    Tuple,
-    Union,
-    cast,
-    overload,
-)
-
-from dateutil import tz as dateutil_tz
-from dateutil.relativedelta import relativedelta
-
-from arrow import formatter, locales, parser, util
-from arrow.constants import DEFAULT_LOCALE, DEHUMANIZE_LOCALES
-from arrow.locales import TimeFrameLiteral
-
-if sys.version_info < (3, 8):  # pragma: no cover
-    from typing_extensions import Final, Literal
-else:
-    from typing import Final, Literal  # pragma: no cover
-
-
-TZ_EXPR = Union[dt_tzinfo, str]
-
-_T_FRAMES = Literal[
-    "year",
-    "years",
-    "month",
-    "months",
-    "day",
-    "days",
-    "hour",
-    "hours",
-    "minute",
-    "minutes",
-    "second",
-    "seconds",
-    "microsecond",
-    "microseconds",
-    "week",
-    "weeks",
-    "quarter",
-    "quarters",
-]
-
-_BOUNDS = Literal["[)", "()", "(]", "[]"]
-
-_GRANULARITY = Literal[
-    "auto",
-    "second",
-    "minute",
-    "hour",
-    "day",
-    "week",
-    "month",
-    "quarter",
-    "year",
-]
-
-
-class Arrow:
-    """An :class:`Arrow <arrow.arrow.Arrow>` object.
-
-    Implements the ``datetime`` interface, behaving as an aware ``datetime`` while implementing
-    additional functionality.
-
-    :param year: the calendar year.
-    :param month: the calendar month.
-    :param day: the calendar day.
-    :param hour: (optional) the hour. Defaults to 0.
-    :param minute: (optional) the minute, Defaults to 0.
-    :param second: (optional) the second, Defaults to 0.
-    :param microsecond: (optional) the microsecond. Defaults to 0.
-    :param tzinfo: (optional) A timezone expression.  Defaults to UTC.
-    :param fold: (optional) 0 or 1, used to disambiguate repeated wall times. Defaults to 0.
-
-    .. _tz-expr:
-
-    Recognized timezone expressions:
-
-        - A ``tzinfo`` object.
-        - A ``str`` describing a timezone, similar to 'US/Pacific', or 'Europe/Berlin'.
-        - A ``str`` in ISO 8601 style, as in '+07:00'.
-        - A ``str``, one of the following:  'local', 'utc', 'UTC'.
-
-    Usage::
-
-        >>> import arrow
-        >>> arrow.Arrow(2013, 5, 5, 12, 30, 45)
-        <Arrow [2013-05-05T12:30:45+00:00]>
-
-    """
-
-    resolution: ClassVar[timedelta] = dt_datetime.resolution
-    min: ClassVar["Arrow"]
-    max: ClassVar["Arrow"]
-
-    _ATTRS: Final[List[str]] = [
-        "year",
-        "month",
-        "day",
-        "hour",
-        "minute",
-        "second",
-        "microsecond",
-    ]
-    _ATTRS_PLURAL: Final[List[str]] = [f"{a}s" for a in _ATTRS]
-    _MONTHS_PER_QUARTER: Final[int] = 3
-    _SECS_PER_MINUTE: Final[int] = 60
-    _SECS_PER_HOUR: Final[int] = 60 * 60
-    _SECS_PER_DAY: Final[int] = 60 * 60 * 24
-    _SECS_PER_WEEK: Final[int] = 60 * 60 * 24 * 7
-    _SECS_PER_MONTH: Final[float] = 60 * 60 * 24 * 30.5
-    _SECS_PER_QUARTER: Final[float] = 60 * 60 * 24 * 30.5 * 3
-    _SECS_PER_YEAR: Final[int] = 60 * 60 * 24 * 365
-
-    _SECS_MAP: Final[Mapping[TimeFrameLiteral, float]] = {
-        "second": 1.0,
-        "minute": _SECS_PER_MINUTE,
-        "hour": _SECS_PER_HOUR,
-        "day": _SECS_PER_DAY,
-        "week": _SECS_PER_WEEK,
-        "month": _SECS_PER_MONTH,
-        "quarter": _SECS_PER_QUARTER,
-        "year": _SECS_PER_YEAR,
-    }
-
-    _datetime: dt_datetime
-
-    def __init__(
-        self,
-        year: int,
-        month: int,
-        day: int,
-        hour: int = 0,
-        minute: int = 0,
-        second: int = 0,
-        microsecond: int = 0,
-        tzinfo: Optional[TZ_EXPR] = None,
-        **kwargs: Any,
-    ) -> None:
-        if tzinfo is None:
-            tzinfo = dateutil_tz.tzutc()
-        # detect that tzinfo is a pytz object (issue #626)
-        elif (
-            isinstance(tzinfo, dt_tzinfo)
-            and hasattr(tzinfo, "localize")
-            and hasattr(tzinfo, "zone")
-            and tzinfo.zone
-        ):
-            tzinfo = parser.TzinfoParser.parse(tzinfo.zone)
-        elif isinstance(tzinfo, str):
-            tzinfo = parser.TzinfoParser.parse(tzinfo)
-
-        fold = kwargs.get("fold", 0)
-
-        self._datetime = dt_datetime(
-            year, month, day, hour, minute, second, microsecond, tzinfo, fold=fold
-        )
-
-    # factories: single object, both original and from datetime.
-
-    @classmethod
-    def now(cls, tzinfo: Optional[dt_tzinfo] = None) -> "Arrow":
-        """Constructs an :class:`Arrow <arrow.arrow.Arrow>` object, representing "now" in the given
-        timezone.
-
-        :param tzinfo: (optional) a ``tzinfo`` object. Defaults to local time.
-
-        Usage::
-
-            >>> arrow.now('Asia/Baku')
-            <Arrow [2019-01-24T20:26:31.146412+04:00]>
-
-        """
-
-        if tzinfo is None:
-            tzinfo = dateutil_tz.tzlocal()
-
-        dt = dt_datetime.now(tzinfo)
-
-        return cls(
-            dt.year,
-            dt.month,
-            dt.day,
-            dt.hour,
-            dt.minute,
-            dt.second,
-            dt.microsecond,
-            dt.tzinfo,
-            fold=getattr(dt, "fold", 0),
-        )
-
-    @classmethod
-    def utcnow(cls) -> "Arrow":
-        """Constructs an :class:`Arrow <arrow.arrow.Arrow>` object, representing "now" in UTC
-        time.
-
-        Usage::
-
-            >>> arrow.utcnow()
-            <Arrow [2019-01-24T16:31:40.651108+00:00]>
-
-        """
-
-        dt = dt_datetime.now(dateutil_tz.tzutc())
-
-        return cls(
-            dt.year,
-            dt.month,
-            dt.day,
-            dt.hour,
-            dt.minute,
-            dt.second,
-            dt.microsecond,
-            dt.tzinfo,
-            fold=getattr(dt, "fold", 0),
-        )
-
-    @classmethod
-    def fromtimestamp(
-        cls,
-        timestamp: Union[int, float, str],
-        tzinfo: Optional[TZ_EXPR] = None,
-    ) -> "Arrow":
-        """Constructs an :class:`Arrow <arrow.arrow.Arrow>` object from a timestamp, converted to
-        the given timezone.
-
-        :param timestamp: an ``int`` or ``float`` timestamp, or a ``str`` that converts to either.
-        :param tzinfo: (optional) a ``tzinfo`` object.  Defaults to local time.
-
-        """
-
-        if tzinfo is None:
-            tzinfo = dateutil_tz.tzlocal()
-        elif isinstance(tzinfo, str):
-            tzinfo = parser.TzinfoParser.parse(tzinfo)
-
-        if not util.is_timestamp(timestamp):
-            raise ValueError(f"The provided timestamp {timestamp!r} is invalid.")
-
-        timestamp = util.normalize_timestamp(float(timestamp))
-        dt = dt_datetime.fromtimestamp(timestamp, tzinfo)
-
-        return cls(
-            dt.year,
-            dt.month,
-            dt.day,
-            dt.hour,
-            dt.minute,
-            dt.second,
-            dt.microsecond,
-            dt.tzinfo,
-            fold=getattr(dt, "fold", 0),
-        )
-
-    @classmethod
-    def utcfromtimestamp(cls, timestamp: Union[int, float, str]) -> "Arrow":
-        """Constructs an :class:`Arrow <arrow.arrow.Arrow>` object from a timestamp, in UTC time.
-
-        :param timestamp: an ``int`` or ``float`` timestamp, or a ``str`` that converts to either.
-
-        """
-
-        if not util.is_timestamp(timestamp):
-            raise ValueError(f"The provided timestamp {timestamp!r} is invalid.")
-
-        timestamp = util.normalize_timestamp(float(timestamp))
-        dt = dt_datetime.utcfromtimestamp(timestamp)
-
-        return cls(
-            dt.year,
-            dt.month,
-            dt.day,
-            dt.hour,
-            dt.minute,
-            dt.second,
-            dt.microsecond,
-            dateutil_tz.tzutc(),
-            fold=getattr(dt, "fold", 0),
-        )
-
-    @classmethod
-    def fromdatetime(cls, dt: dt_datetime, tzinfo: Optional[TZ_EXPR] = None) -> "Arrow":
-        """Constructs an :class:`Arrow <arrow.arrow.Arrow>` object from a ``datetime`` and
-        optional replacement timezone.
-
-        :param dt: the ``datetime``
-        :param tzinfo: (optional) A :ref:`timezone expression <tz-expr>`.  Defaults to ``dt``'s
-            timezone, or UTC if naive.
-
-        Usage::
-
-            >>> dt
-            datetime.datetime(2021, 4, 7, 13, 48, tzinfo=tzfile('/usr/share/zoneinfo/US/Pacific'))
-            >>> arrow.Arrow.fromdatetime(dt)
-            <Arrow [2021-04-07T13:48:00-07:00]>
-
-        """
-
-        if tzinfo is None:
-            if dt.tzinfo is None:
-                tzinfo = dateutil_tz.tzutc()
-            else:
-                tzinfo = dt.tzinfo
-
-        return cls(
-            dt.year,
-            dt.month,
-            dt.day,
-            dt.hour,
-            dt.minute,
-            dt.second,
-            dt.microsecond,
-            tzinfo,
-            fold=getattr(dt, "fold", 0),
-        )
-
-    @classmethod
-    def fromdate(cls, date: date, tzinfo: Optional[TZ_EXPR] = None) -> "Arrow":
-        """Constructs an :class:`Arrow <arrow.arrow.Arrow>` object from a ``date`` and optional
-        replacement timezone.  All time values are set to 0.
-
-        :param date: the ``date``
-        :param tzinfo: (optional) A :ref:`timezone expression <tz-expr>`.  Defaults to UTC.
-
-        """
-
-        if tzinfo is None:
-            tzinfo = dateutil_tz.tzutc()
-
-        return cls(date.year, date.month, date.day, tzinfo=tzinfo)
-
-    @classmethod
-    def strptime(
-        cls, date_str: str, fmt: str, tzinfo: Optional[TZ_EXPR] = None
-    ) -> "Arrow":
-        """Constructs an :class:`Arrow <arrow.arrow.Arrow>` object from a date string and format,
-        in the style of ``datetime.strptime``.  Optionally replaces the parsed timezone.
-
-        :param date_str: the date string.
-        :param fmt: the format string using datetime format codes.
-        :param tzinfo: (optional) A :ref:`timezone expression <tz-expr>`.  Defaults to the parsed
-            timezone if ``fmt`` contains a timezone directive, otherwise UTC.
-
-        Usage::
-
-            >>> arrow.Arrow.strptime('20-01-2019 15:49:10', '%d-%m-%Y %H:%M:%S')
-            <Arrow [2019-01-20T15:49:10+00:00]>
-
-        """
-
-        dt = dt_datetime.strptime(date_str, fmt)
-        if tzinfo is None:
-            tzinfo = dt.tzinfo
-
-        return cls(
-            dt.year,
-            dt.month,
-            dt.day,
-            dt.hour,
-            dt.minute,
-            dt.second,
-            dt.microsecond,
-            tzinfo,
-            fold=getattr(dt, "fold", 0),
-        )
-
-    @classmethod
-    def fromordinal(cls, ordinal: int) -> "Arrow":
-        """Constructs an :class:`Arrow <arrow.arrow.Arrow>` object corresponding
-            to the Gregorian Ordinal.
-
-        :param ordinal: an ``int`` corresponding to a Gregorian Ordinal.
-
-        Usage::
-
-            >>> arrow.fromordinal(737741)
-            <Arrow [2020-11-12T00:00:00+00:00]>
-
-        """
-
-        util.validate_ordinal(ordinal)
-        dt = dt_datetime.fromordinal(ordinal)
-        return cls(
-            dt.year,
-            dt.month,
-            dt.day,
-            dt.hour,
-            dt.minute,
-            dt.second,
-            dt.microsecond,
-            dt.tzinfo,
-            fold=getattr(dt, "fold", 0),
-        )
-
-    # factories: ranges and spans
-
-    @classmethod
-    def range(
-        cls,
-        frame: _T_FRAMES,
-        start: Union["Arrow", dt_datetime],
-        end: Union["Arrow", dt_datetime, None] = None,
-        tz: Optional[TZ_EXPR] = None,
-        limit: Optional[int] = None,
-    ) -> Generator["Arrow", None, None]:
-        """Returns an iterator of :class:`Arrow <arrow.arrow.Arrow>` objects, representing
-        points in time between two inputs.
-
-        :param frame: The timeframe.  Can be any ``datetime`` property (day, hour, minute...).
-        :param start: A datetime expression, the start of the range.
-        :param end: (optional) A datetime expression, the end of the range.
-        :param tz: (optional) A :ref:`timezone expression <tz-expr>`.  Defaults to
-            ``start``'s timezone, or UTC if ``start`` is naive.
-        :param limit: (optional) A maximum number of tuples to return.
-
-        **NOTE**: The ``end`` or ``limit`` must be provided.  Call with ``end`` alone to
-        return the entire range.  Call with ``limit`` alone to return a maximum # of results from
-        the start.  Call with both to cap a range at a maximum # of results.
-
-        **NOTE**: ``tz`` internally **replaces** the timezones of both ``start`` and ``end`` before
-        iterating.  As such, either call with naive objects and ``tz``, or aware objects from the
-        same timezone and no ``tz``.
-
-        Supported frame values: year, quarter, month, week, day, hour, minute, second, microsecond.
-
-        Recognized datetime expressions:
-
-            - An :class:`Arrow <arrow.arrow.Arrow>` object.
-            - A ``datetime`` object.
-
-        Usage::
-
-            >>> start = datetime(2013, 5, 5, 12, 30)
-            >>> end = datetime(2013, 5, 5, 17, 15)
-            >>> for r in arrow.Arrow.range('hour', start, end):
-            ...     print(repr(r))
-            ...
-            <Arrow [2013-05-05T12:30:00+00:00]>
-            <Arrow [2013-05-05T13:30:00+00:00]>
-            <Arrow [2013-05-05T14:30:00+00:00]>
-            <Arrow [2013-05-05T15:30:00+00:00]>
-            <Arrow [2013-05-05T16:30:00+00:00]>
-
-        **NOTE**: Unlike Python's ``range``, ``end`` *may* be included in the returned iterator::
-
-            >>> start = datetime(2013, 5, 5, 12, 30)
-            >>> end = datetime(2013, 5, 5, 13, 30)
-            >>> for r in arrow.Arrow.range('hour', start, end):
-            ...     print(repr(r))
-            ...
-            <Arrow [2013-05-05T12:30:00+00:00]>
-            <Arrow [2013-05-05T13:30:00+00:00]>
-
-        """
-
-        _, frame_relative, relative_steps = cls._get_frames(frame)
-
-        tzinfo = cls._get_tzinfo(start.tzinfo if tz is None else tz)
-
-        start = cls._get_datetime(start).replace(tzinfo=tzinfo)
-        end, limit = cls._get_iteration_params(end, limit)
-        end = cls._get_datetime(end).replace(tzinfo=tzinfo)
-
-        current = cls.fromdatetime(start)
-        original_day = start.day
-        day_is_clipped = False
-        i = 0
-
-        while current <= end and i < limit:
-            i += 1
-            yield current
-
-            values = [getattr(current, f) for f in cls._ATTRS]
-            current = cls(*values, tzinfo=tzinfo).shift(  # type: ignore[misc]
-                **{frame_relative: relative_steps}
-            )
-
-            if frame in ["month", "quarter", "year"] and current.day < original_day:
-                day_is_clipped = True
-
-            if day_is_clipped and not cls._is_last_day_of_month(current):
-                current = current.replace(day=original_day)
-
-    def span(
-        self,
-        frame: _T_FRAMES,
-        count: int = 1,
-        bounds: _BOUNDS = "[)",
-        exact: bool = False,
-        week_start: int = 1,
-    ) -> Tuple["Arrow", "Arrow"]:
-        """Returns a tuple of two new :class:`Arrow <arrow.arrow.Arrow>` objects, representing the timespan
-        of the :class:`Arrow <arrow.arrow.Arrow>` object in a given timeframe.
-
-        :param frame: the timeframe.  Can be any ``datetime`` property (day, hour, minute...).
-        :param count: (optional) the number of frames to span.
-        :param bounds: (optional) a ``str`` of either '()', '(]', '[)', or '[]' that specifies
-            whether to include or exclude the start and end values in the span. '(' excludes
-            the start, '[' includes the start, ')' excludes the end, and ']' includes the end.
-            If the bounds are not specified, the default bound '[)' is used.
-        :param exact: (optional) whether to have the start of the timespan begin exactly
-            at the time specified by ``start`` and the end of the timespan truncated
-            so as not to extend beyond ``end``.
-        :param week_start: (optional) only used in combination with the week timeframe. Follows isoweekday() where
-            Monday is 1 and Sunday is 7.
-
-        Supported frame values: year, quarter, month, week, day, hour, minute, second.
-
-        Usage::
-
-            >>> arrow.utcnow()
-            <Arrow [2013-05-09T03:32:36.186203+00:00]>
-
-            >>> arrow.utcnow().span('hour')
-            (<Arrow [2013-05-09T03:00:00+00:00]>, <Arrow [2013-05-09T03:59:59.999999+00:00]>)
-
-            >>> arrow.utcnow().span('day')
-            (<Arrow [2013-05-09T00:00:00+00:00]>, <Arrow [2013-05-09T23:59:59.999999+00:00]>)
-
-            >>> arrow.utcnow().span('day', count=2)
-            (<Arrow [2013-05-09T00:00:00+00:00]>, <Arrow [2013-05-10T23:59:59.999999+00:00]>)
-
-            >>> arrow.utcnow().span('day', bounds='[]')
-            (<Arrow [2013-05-09T00:00:00+00:00]>, <Arrow [2013-05-10T00:00:00+00:00]>)
-
-            >>> arrow.utcnow().span('week')
-            (<Arrow [2021-02-22T00:00:00+00:00]>, <Arrow [2021-02-28T23:59:59.999999+00:00]>)
-
-            >>> arrow.utcnow().span('week', week_start=6)
-            (<Arrow [2021-02-20T00:00:00+00:00]>, <Arrow [2021-02-26T23:59:59.999999+00:00]>)
-
-        """
-        if not 1 <= week_start <= 7:
-            raise ValueError("week_start argument must be between 1 and 7.")
-
-        util.validate_bounds(bounds)
-
-        frame_absolute, frame_relative, relative_steps = self._get_frames(frame)
-
-        if frame_absolute == "week":
-            attr = "day"
-        elif frame_absolute == "quarter":
-            attr = "month"
-        else:
-            attr = frame_absolute
-
-        floor = self
-        if not exact:
-            index = self._ATTRS.index(attr)
-            frames = self._ATTRS[: index + 1]
-
-            values = [getattr(self, f) for f in frames]
-
-            for _ in range(3 - len(values)):
-                values.append(1)
-
-            floor = self.__class__(*values, tzinfo=self.tzinfo)  # type: ignore[misc]
-
-            if frame_absolute == "week":
-                # if week_start is greater than self.isoweekday() go back one week by setting delta = 7
-                delta = 7 if week_start > self.isoweekday() else 0
-                floor = floor.shift(days=-(self.isoweekday() - week_start) - delta)
-            elif frame_absolute == "quarter":
-                floor = floor.shift(months=-((self.month - 1) % 3))
-
-        ceil = floor.shift(**{frame_relative: count * relative_steps})
-
-        if bounds[0] == "(":
-            floor = floor.shift(microseconds=+1)
-
-        if bounds[1] == ")":
-            ceil = ceil.shift(microseconds=-1)
-
-        return floor, ceil
-
-    def floor(self, frame: _T_FRAMES) -> "Arrow":
-        """Returns a new :class:`Arrow <arrow.arrow.Arrow>` object, representing the "floor"
-        of the timespan of the :class:`Arrow <arrow.arrow.Arrow>` object in a given timeframe.
-        Equivalent to the first element in the 2-tuple returned by
-        :func:`span <arrow.arrow.Arrow.span>`.
-
-        :param frame: the timeframe.  Can be any ``datetime`` property (day, hour, minute...).
-
-        Usage::
-
-            >>> arrow.utcnow().floor('hour')
-            <Arrow [2013-05-09T03:00:00+00:00]>
-
-        """
-
-        return self.span(frame)[0]
-
-    def ceil(self, frame: _T_FRAMES) -> "Arrow":
-        """Returns a new :class:`Arrow <arrow.arrow.Arrow>` object, representing the "ceiling"
-        of the timespan of the :class:`Arrow <arrow.arrow.Arrow>` object in a given timeframe.
-        Equivalent to the second element in the 2-tuple returned by
-        :func:`span <arrow.arrow.Arrow.span>`.
-
-        :param frame: the timeframe.  Can be any ``datetime`` property (day, hour, minute...).
-
-        Usage::
-
-            >>> arrow.utcnow().ceil('hour')
-            <Arrow [2013-05-09T03:59:59.999999+00:00]>
-
-        """
-
-        return self.span(frame)[1]
-
-    @classmethod
-    def span_range(
-        cls,
-        frame: _T_FRAMES,
-        start: dt_datetime,
-        end: dt_datetime,
-        tz: Optional[TZ_EXPR] = None,
-        limit: Optional[int] = None,
-        bounds: _BOUNDS = "[)",
-        exact: bool = False,
-    ) -> Iterable[Tuple["Arrow", "Arrow"]]:
-        """Returns an iterator of tuples, each :class:`Arrow <arrow.arrow.Arrow>` objects,
-        representing a series of timespans between two inputs.
-
-        :param frame: The timeframe.  Can be any ``datetime`` property (day, hour, minute...).
-        :param start: A datetime expression, the start of the range.
-        :param end: (optional) A datetime expression, the end of the range.
-        :param tz: (optional) A :ref:`timezone expression <tz-expr>`.  Defaults to
-            ``start``'s timezone, or UTC if ``start`` is naive.
-        :param limit: (optional) A maximum number of tuples to return.
-        :param bounds: (optional) a ``str`` of either '()', '(]', '[)', or '[]' that specifies
-            whether to include or exclude the start and end values in each span in the range. '(' excludes
-            the start, '[' includes the start, ')' excludes the end, and ']' includes the end.
-            If the bounds are not specified, the default bound '[)' is used.
-        :param exact: (optional) whether to have the first timespan start exactly
-            at the time specified by ``start`` and the final span truncated
-            so as not to extend beyond ``end``.
-
-        **NOTE**: The ``end`` or ``limit`` must be provided.  Call with ``end`` alone to
-        return the entire range.  Call with ``limit`` alone to return a maximum # of results from
-        the start.  Call with both to cap a range at a maximum # of results.
-
-        **NOTE**: ``tz`` internally **replaces** the timezones of both ``start`` and ``end`` before
-        iterating.  As such, either call with naive objects and ``tz``, or aware objects from the
-        same timezone and no ``tz``.
-
-        Supported frame values: year, quarter, month, week, day, hour, minute, second, microsecond.
-
-        Recognized datetime expressions:
-
-            - An :class:`Arrow <arrow.arrow.Arrow>` object.
-            - A ``datetime`` object.
-
-        **NOTE**: Unlike Python's ``range``, ``end`` will *always* be included in the returned
-        iterator of timespans.
-
-        Usage:
-
-            >>> start = datetime(2013, 5, 5, 12, 30)
-            >>> end = datetime(2013, 5, 5, 17, 15)
-            >>> for r in arrow.Arrow.span_range('hour', start, end):
-            ...     print(r)
-            ...
-            (<Arrow [2013-05-05T12:00:00+00:00]>, <Arrow [2013-05-05T12:59:59.999999+00:00]>)
-            (<Arrow [2013-05-05T13:00:00+00:00]>, <Arrow [2013-05-05T13:59:59.999999+00:00]>)
-            (<Arrow [2013-05-05T14:00:00+00:00]>, <Arrow [2013-05-05T14:59:59.999999+00:00]>)
-            (<Arrow [2013-05-05T15:00:00+00:00]>, <Arrow [2013-05-05T15:59:59.999999+00:00]>)
-            (<Arrow [2013-05-05T16:00:00+00:00]>, <Arrow [2013-05-05T16:59:59.999999+00:00]>)
-            (<Arrow [2013-05-05T17:00:00+00:00]>, <Arrow [2013-05-05T17:59:59.999999+00:00]>)
-
-        """
-
-        tzinfo = cls._get_tzinfo(start.tzinfo if tz is None else tz)
-        start = cls.fromdatetime(start, tzinfo).span(frame, exact=exact)[0]
-        end = cls.fromdatetime(end, tzinfo)
-        _range = cls.range(frame, start, end, tz, limit)
-        if not exact:
-            for r in _range:
-                yield r.span(frame, bounds=bounds, exact=exact)
-
-        for r in _range:
-            floor, ceil = r.span(frame, bounds=bounds, exact=exact)
-            if ceil > end:
-                ceil = end
-                if bounds[1] == ")":
-                    ceil += relativedelta(microseconds=-1)
-            if floor == end:
-                break
-            elif floor + relativedelta(microseconds=-1) == end:
-                break
-            yield floor, ceil
-
-    @classmethod
-    def interval(
-        cls,
-        frame: _T_FRAMES,
-        start: dt_datetime,
-        end: dt_datetime,
-        interval: int = 1,
-        tz: Optional[TZ_EXPR] = None,
-        bounds: _BOUNDS = "[)",
-        exact: bool = False,
-    ) -> Iterable[Tuple["Arrow", "Arrow"]]:
-        """Returns an iterator of tuples, each :class:`Arrow <arrow.arrow.Arrow>` objects,
-        representing a series of intervals between two inputs.
-
-        :param frame: The timeframe.  Can be any ``datetime`` property (day, hour, minute...).
-        :param start: A datetime expression, the start of the range.
-        :param end: (optional) A datetime expression, the end of the range.
-        :param interval: (optional) Time interval for the given time frame.
-        :param tz: (optional) A timezone expression.  Defaults to UTC.
-        :param bounds: (optional) a ``str`` of either '()', '(]', '[)', or '[]' that specifies
-            whether to include or exclude the start and end values in the intervals. '(' excludes
-            the start, '[' includes the start, ')' excludes the end, and ']' includes the end.
-            If the bounds are not specified, the default bound '[)' is used.
-        :param exact: (optional) whether to have the first timespan start exactly
-            at the time specified by ``start`` and the final interval truncated
-            so as not to extend beyond ``end``.
-
-        Supported frame values: year, quarter, month, week, day, hour, minute, second
-
-        Recognized datetime expressions:
-
-            - An :class:`Arrow <arrow.arrow.Arrow>` object.
-            - A ``datetime`` object.
-
-        Recognized timezone expressions:
-
-            - A ``tzinfo`` object.
-            - A ``str`` describing a timezone, similar to 'US/Pacific', or 'Europe/Berlin'.
-            - A ``str`` in ISO 8601 style, as in '+07:00'.
-            - A ``str``, one of the following:  'local', 'utc', 'UTC'.
-
-        Usage:
-
-            >>> start = datetime(2013, 5, 5, 12, 30)
-            >>> end = datetime(2013, 5, 5, 17, 15)
-            >>> for r in arrow.Arrow.interval('hour', start, end, 2):
-            ...     print(r)
-            ...
-            (<Arrow [2013-05-05T12:00:00+00:00]>, <Arrow [2013-05-05T13:59:59.999999+00:00]>)
-            (<Arrow [2013-05-05T14:00:00+00:00]>, <Arrow [2013-05-05T15:59:59.999999+00:00]>)
-            (<Arrow [2013-05-05T16:00:00+00:00]>, <Arrow [2013-05-05T17:59:59.999999+00:0]>)
-        """
-        if interval < 1:
-            raise ValueError("interval has to be a positive integer")
-
-        spanRange = iter(
-            cls.span_range(frame, start, end, tz, bounds=bounds, exact=exact)
-        )
-        while True:
-            try:
-                intvlStart, intvlEnd = next(spanRange)
-                for _ in range(interval - 1):
-                    try:
-                        _, intvlEnd = next(spanRange)
-                    except StopIteration:
-                        continue
-                yield intvlStart, intvlEnd
-            except StopIteration:
-                return
-
-    # representations
-
-    def __repr__(self) -> str:
-        return f"<{self.__class__.__name__} [{self.__str__()}]>"
-
-    def __str__(self) -> str:
-        return self._datetime.isoformat()
-
-    def __format__(self, formatstr: str) -> str:
-        if len(formatstr) > 0:
-            return self.format(formatstr)
-
-        return str(self)
-
-    def __hash__(self) -> int:
-        return self._datetime.__hash__()
-
-    # attributes and properties
-
-    def __getattr__(self, name: str) -> int:
-        if name == "week":
-            return self.isocalendar()[1]
-
-        if name == "quarter":
-            return int((self.month - 1) / self._MONTHS_PER_QUARTER) + 1
-
-        if not name.startswith("_"):
-            value: Optional[int] = getattr(self._datetime, name, None)
-
-            if value is not None:
-                return value
-
-        return cast(int, object.__getattribute__(self, name))
-
-    @property
-    def tzinfo(self) -> dt_tzinfo:
-        """Gets the ``tzinfo`` of the :class:`Arrow <arrow.arrow.Arrow>` object.
-
-        Usage::
-
-            >>> arw=arrow.utcnow()
-            >>> arw.tzinfo
-            tzutc()
-
-        """
-
-        # In Arrow, `_datetime` cannot be naive.
-        return cast(dt_tzinfo, self._datetime.tzinfo)
-
-    @property
-    def datetime(self) -> dt_datetime:
-        """Returns a datetime representation of the :class:`Arrow <arrow.arrow.Arrow>` object.
-
-        Usage::
-
-            >>> arw=arrow.utcnow()
-            >>> arw.datetime
-            datetime.datetime(2019, 1, 24, 16, 35, 27, 276649, tzinfo=tzutc())
-
-        """
-
-        return self._datetime
-
-    @property
-    def naive(self) -> dt_datetime:
-        """Returns a naive datetime representation of the :class:`Arrow <arrow.arrow.Arrow>`
-        object.
-
-        Usage::
-
-            >>> nairobi = arrow.now('Africa/Nairobi')
-            >>> nairobi
-            <Arrow [2019-01-23T19:27:12.297999+03:00]>
-            >>> nairobi.naive
-            datetime.datetime(2019, 1, 23, 19, 27, 12, 297999)
-
-        """
-
-        return self._datetime.replace(tzinfo=None)
-
-    def timestamp(self) -> float:
-        """Returns a timestamp representation of the :class:`Arrow <arrow.arrow.Arrow>` object, in
-        UTC time.
-
-        Usage::
-
-            >>> arrow.utcnow().timestamp()
-            1616882340.256501
-
-        """
-
-        return self._datetime.timestamp()
-
-    @property
-    def int_timestamp(self) -> int:
-        """Returns an integer timestamp representation of the :class:`Arrow <arrow.arrow.Arrow>` object, in
-        UTC time.
-
-        Usage::
-
-            >>> arrow.utcnow().int_timestamp
-            1548260567
-
-        """
-
-        return int(self.timestamp())
-
-    @property
-    def float_timestamp(self) -> float:
-        """Returns a floating-point timestamp representation of the :class:`Arrow <arrow.arrow.Arrow>`
-        object, in UTC time.
-
-        Usage::
-
-            >>> arrow.utcnow().float_timestamp
-            1548260516.830896
-
-        """
-
-        return self.timestamp()
-
-    @property
-    def fold(self) -> int:
-        """Returns the ``fold`` value of the :class:`Arrow <arrow.arrow.Arrow>` object."""
-
-        return self._datetime.fold
-
-    @property
-    def ambiguous(self) -> bool:
-        """Indicates whether the :class:`Arrow <arrow.arrow.Arrow>` object is a repeated wall time in the current
-        timezone.
-
-        """
-
-        return dateutil_tz.datetime_ambiguous(self._datetime)
-
-    @property
-    def imaginary(self) -> bool:
-        """Indicates whether the :class: `Arrow <arrow.arrow.Arrow>` object exists in the current timezone."""
-
-        return not dateutil_tz.datetime_exists(self._datetime)
-
-    # mutation and duplication.
-
-    def clone(self) -> "Arrow":
-        """Returns a new :class:`Arrow <arrow.arrow.Arrow>` object, cloned from the current one.
-
-        Usage:
-
-            >>> arw = arrow.utcnow()
-            >>> cloned = arw.clone()
-
-        """
-
-        return self.fromdatetime(self._datetime)
-
-    def replace(self, **kwargs: Any) -> "Arrow":
-        """Returns a new :class:`Arrow <arrow.arrow.Arrow>` object with attributes updated
-        according to inputs.
-
-        Use property names to set their value absolutely::
-
-            >>> import arrow
-            >>> arw = arrow.utcnow()
-            >>> arw
-            <Arrow [2013-05-11T22:27:34.787885+00:00]>
-            >>> arw.replace(year=2014, month=6)
-            <Arrow [2014-06-11T22:27:34.787885+00:00]>
-
-        You can also replace the timezone without conversion, using a
-        :ref:`timezone expression <tz-expr>`::
-
-            >>> arw.replace(tzinfo=tz.tzlocal())
-            <Arrow [2013-05-11T22:27:34.787885-07:00]>
-
-        """
-
-        absolute_kwargs = {}
-
-        for key, value in kwargs.items():
-            if key in self._ATTRS:
-                absolute_kwargs[key] = value
-            elif key in ["week", "quarter"]:
-                raise ValueError(f"Setting absolute {key} is not supported.")
-            elif key not in ["tzinfo", "fold"]:
-                raise ValueError(f"Unknown attribute: {key!r}.")
-
-        current = self._datetime.replace(**absolute_kwargs)
-
-        tzinfo = kwargs.get("tzinfo")
-
-        if tzinfo is not None:
-            tzinfo = self._get_tzinfo(tzinfo)
-            current = current.replace(tzinfo=tzinfo)
-
-        fold = kwargs.get("fold")
-
-        if fold is not None:
-            current = current.replace(fold=fold)
-
-        return self.fromdatetime(current)
-
-    def shift(self, **kwargs: Any) -> "Arrow":
-        """Returns a new :class:`Arrow <arrow.arrow.Arrow>` object with attributes updated
-        according to inputs.
-
-        Use pluralized property names to relatively shift their current value:
-
-        >>> import arrow
-        >>> arw = arrow.utcnow()
-        >>> arw
-        <Arrow [2013-05-11T22:27:34.787885+00:00]>
-        >>> arw.shift(years=1, months=-1)
-        <Arrow [2014-04-11T22:27:34.787885+00:00]>
-
-        Day-of-the-week relative shifting can use either Python's weekday numbers
-        (Monday = 0, Tuesday = 1 .. Sunday = 6) or using dateutil.relativedelta's
-        day instances (MO, TU .. SU).  When using weekday numbers, the returned
-        date will always be greater than or equal to the starting date.
-
-        Using the above code (which is a Saturday) and asking it to shift to Saturday:
-
-        >>> arw.shift(weekday=5)
-        <Arrow [2013-05-11T22:27:34.787885+00:00]>
-
-        While asking for a Monday:
-
-        >>> arw.shift(weekday=0)
-        <Arrow [2013-05-13T22:27:34.787885+00:00]>
-
-        """
-
-        relative_kwargs = {}
-        additional_attrs = ["weeks", "quarters", "weekday"]
-
-        for key, value in kwargs.items():
-            if key in self._ATTRS_PLURAL or key in additional_attrs:
-                relative_kwargs[key] = value
-            else:
-                supported_attr = ", ".join(self._ATTRS_PLURAL + additional_attrs)
-                raise ValueError(
-                    f"Invalid shift time frame. Please select one of the following: {supported_attr}."
-                )
-
-        # core datetime does not support quarters, translate to months.
-        relative_kwargs.setdefault("months", 0)
-        relative_kwargs["months"] += (
-            relative_kwargs.pop("quarters", 0) * self._MONTHS_PER_QUARTER
-        )
-
-        current = self._datetime + relativedelta(**relative_kwargs)
-
-        if not dateutil_tz.datetime_exists(current):
-            current = dateutil_tz.resolve_imaginary(current)
-
-        return self.fromdatetime(current)
-
-    def to(self, tz: TZ_EXPR) -> "Arrow":
-        """Returns a new :class:`Arrow <arrow.arrow.Arrow>` object, converted
-        to the target timezone.
-
-        :param tz: A :ref:`timezone expression <tz-expr>`.
-
-        Usage::
-
-            >>> utc = arrow.utcnow()
-            >>> utc
-            <Arrow [2013-05-09T03:49:12.311072+00:00]>
-
-            >>> utc.to('US/Pacific')
-            <Arrow [2013-05-08T20:49:12.311072-07:00]>
-
-            >>> utc.to(tz.tzlocal())
-            <Arrow [2013-05-08T20:49:12.311072-07:00]>
-
-            >>> utc.to('-07:00')
-            <Arrow [2013-05-08T20:49:12.311072-07:00]>
-
-            >>> utc.to('local')
-            <Arrow [2013-05-08T20:49:12.311072-07:00]>
-
-            >>> utc.to('local').to('utc')
-            <Arrow [2013-05-09T03:49:12.311072+00:00]>
-
-        """
-
-        if not isinstance(tz, dt_tzinfo):
-            tz = parser.TzinfoParser.parse(tz)
-
-        dt = self._datetime.astimezone(tz)
-
-        return self.__class__(
-            dt.year,
-            dt.month,
-            dt.day,
-            dt.hour,
-            dt.minute,
-            dt.second,
-            dt.microsecond,
-            dt.tzinfo,
-            fold=getattr(dt, "fold", 0),
-        )
-
-    # string output and formatting
-
-    def format(
-        self, fmt: str = "YYYY-MM-DD HH:mm:ssZZ", locale: str = DEFAULT_LOCALE
-    ) -> str:
-        """Returns a string representation of the :class:`Arrow <arrow.arrow.Arrow>` object,
-        formatted according to the provided format string.
-
-        :param fmt: the format string.
-        :param locale: the locale to format.
-
-        Usage::
-
-            >>> arrow.utcnow().format('YYYY-MM-DD HH:mm:ss ZZ')
-            '2013-05-09 03:56:47 -00:00'
-
-            >>> arrow.utcnow().format('X')
-            '1368071882'
-
-            >>> arrow.utcnow().format('MMMM DD, YYYY')
-            'May 09, 2013'
-
-            >>> arrow.utcnow().format()
-            '2013-05-09 03:56:47 -00:00'
-
-        """
-
-        return formatter.DateTimeFormatter(locale).format(self._datetime, fmt)
-
-    def humanize(
-        self,
-        other: Union["Arrow", dt_datetime, None] = None,
-        locale: str = DEFAULT_LOCALE,
-        only_distance: bool = False,
-        granularity: Union[_GRANULARITY, List[_GRANULARITY]] = "auto",
-    ) -> str:
-        """Returns a localized, humanized representation of a relative difference in time.
-
-        :param other: (optional) an :class:`Arrow <arrow.arrow.Arrow>` or ``datetime`` object.
-            Defaults to now in the current :class:`Arrow <arrow.arrow.Arrow>` object's timezone.
-        :param locale: (optional) a ``str`` specifying a locale.  Defaults to 'en-us'.
-        :param only_distance: (optional) returns only time difference eg: "11 seconds" without "in" or "ago" part.
-        :param granularity: (optional) defines the precision of the output. Set it to strings 'second', 'minute',
-                           'hour', 'day', 'week', 'month' or 'year' or a list of any combination of these strings
-
-        Usage::
-
-            >>> earlier = arrow.utcnow().shift(hours=-2)
-            >>> earlier.humanize()
-            '2 hours ago'
-
-            >>> later = earlier.shift(hours=4)
-            >>> later.humanize(earlier)
-            'in 4 hours'
-
-        """
-
-        locale_name = locale
-        locale = locales.get_locale(locale)
-
-        if other is None:
-            utc = dt_datetime.utcnow().replace(tzinfo=dateutil_tz.tzutc())
-            dt = utc.astimezone(self._datetime.tzinfo)
-
-        elif isinstance(other, Arrow):
-            dt = other._datetime
-
-        elif isinstance(other, dt_datetime):
-            if other.tzinfo is None:
-                dt = other.replace(tzinfo=self._datetime.tzinfo)
-            else:
-                dt = other.astimezone(self._datetime.tzinfo)
-
-        else:
-            raise TypeError(
-                f"Invalid 'other' argument of type {type(other).__name__!r}. "
-                "Argument must be of type None, Arrow, or datetime."
-            )
-
-        if isinstance(granularity, list) and len(granularity) == 1:
-            granularity = granularity[0]
-
-        _delta = int(round((self._datetime - dt).total_seconds()))
-        sign = -1 if _delta < 0 else 1
-        delta_second = diff = abs(_delta)
-
-        try:
-            if granularity == "auto":
-                if diff < 10:
-                    return locale.describe("now", only_distance=only_distance)
-
-                if diff < self._SECS_PER_MINUTE:
-                    seconds = sign * delta_second
-                    return locale.describe(
-                        "seconds", seconds, only_distance=only_distance
-                    )
-
-                elif diff < self._SECS_PER_MINUTE * 2:
-                    return locale.describe("minute", sign, only_distance=only_distance)
-                elif diff < self._SECS_PER_HOUR:
-                    minutes = sign * max(delta_second // self._SECS_PER_MINUTE, 2)
-                    return locale.describe(
-                        "minutes", minutes, only_distance=only_distance
-                    )
-
-                elif diff < self._SECS_PER_HOUR * 2:
-                    return locale.describe("hour", sign, only_distance=only_distance)
-                elif diff < self._SECS_PER_DAY:
-                    hours = sign * max(delta_second // self._SECS_PER_HOUR, 2)
-                    return locale.describe("hours", hours, only_distance=only_distance)
-                elif diff < self._SECS_PER_DAY * 2:
-                    return locale.describe("day", sign, only_distance=only_distance)
-                elif diff < self._SECS_PER_WEEK:
-                    days = sign * max(delta_second // self._SECS_PER_DAY, 2)
-                    return locale.describe("days", days, only_distance=only_distance)
-
-                elif diff < self._SECS_PER_WEEK * 2:
-                    return locale.describe("week", sign, only_distance=only_distance)
-                elif diff < self._SECS_PER_MONTH:
-                    weeks = sign * max(delta_second // self._SECS_PER_WEEK, 2)
-                    return locale.describe("weeks", weeks, only_distance=only_distance)
-
-                elif diff < self._SECS_PER_MONTH * 2:
-                    return locale.describe("month", sign, only_distance=only_distance)
-                elif diff < self._SECS_PER_YEAR:
-                    # TODO revisit for humanization during leap years
-                    self_months = self._datetime.year * 12 + self._datetime.month
-                    other_months = dt.year * 12 + dt.month
-
-                    months = sign * max(abs(other_months - self_months), 2)
-
-                    return locale.describe(
-                        "months", months, only_distance=only_distance
-                    )
-
-                elif diff < self._SECS_PER_YEAR * 2:
-                    return locale.describe("year", sign, only_distance=only_distance)
-                else:
-                    years = sign * max(delta_second // self._SECS_PER_YEAR, 2)
-                    return locale.describe("years", years, only_distance=only_distance)
-
-            elif isinstance(granularity, str):
-                granularity = cast(TimeFrameLiteral, granularity)  # type: ignore[assignment]
-
-                if granularity == "second":
-                    delta = sign * float(delta_second)
-                    if abs(delta) < 2:
-                        return locale.describe("now", only_distance=only_distance)
-                elif granularity == "minute":
-                    delta = sign * delta_second / self._SECS_PER_MINUTE
-                elif granularity == "hour":
-                    delta = sign * delta_second / self._SECS_PER_HOUR
-                elif granularity == "day":
-                    delta = sign * delta_second / self._SECS_PER_DAY
-                elif granularity == "week":
-                    delta = sign * delta_second / self._SECS_PER_WEEK
-                elif granularity == "month":
-                    delta = sign * delta_second / self._SECS_PER_MONTH
-                elif granularity == "quarter":
-                    delta = sign * delta_second / self._SECS_PER_QUARTER
-                elif granularity == "year":
-                    delta = sign * delta_second / self._SECS_PER_YEAR
-                else:
-                    raise ValueError(
-                        "Invalid level of granularity. "
-                        "Please select between 'second', 'minute', 'hour', 'day', 'week', 'month', 'quarter' or 'year'."
-                    )
-
-                if trunc(abs(delta)) != 1:
-                    granularity += "s"  # type: ignore[assignment]
-                return locale.describe(granularity, delta, only_distance=only_distance)
-
-            else:
-                if not granularity:
-                    raise ValueError(
-                        "Empty granularity list provided. "
-                        "Please select one or more from 'second', 'minute', 'hour', 'day', 'week', 'month', 'quarter', 'year'."
-                    )
-
-                timeframes: List[Tuple[TimeFrameLiteral, float]] = []
-
-                def gather_timeframes(_delta: float, _frame: TimeFrameLiteral) -> float:
-                    if _frame in granularity:
-                        value = sign * _delta / self._SECS_MAP[_frame]
-                        _delta %= self._SECS_MAP[_frame]
-                        if trunc(abs(value)) != 1:
-                            timeframes.append(
-                                (cast(TimeFrameLiteral, _frame + "s"), value)
-                            )
-                        else:
-                            timeframes.append((_frame, value))
-                    return _delta
-
-                delta = float(delta_second)
-                frames: Tuple[TimeFrameLiteral, ...] = (
-                    "year",
-                    "quarter",
-                    "month",
-                    "week",
-                    "day",
-                    "hour",
-                    "minute",
-                    "second",
-                )
-                for frame in frames:
-                    delta = gather_timeframes(delta, frame)
-
-                if len(timeframes) < len(granularity):
-                    raise ValueError(
-                        "Invalid level of granularity. "
-                        "Please select between 'second', 'minute', 'hour', 'day', 'week', 'month', 'quarter' or 'year'."
-                    )
-
-                return locale.describe_multi(timeframes, only_distance=only_distance)
-
-        except KeyError as e:
-            raise ValueError(
-                f"Humanization of the {e} granularity is not currently translated in the {locale_name!r} locale. "
-                "Please consider making a contribution to this locale."
-            )
-
-    def dehumanize(self, input_string: str, locale: str = "en_us") -> "Arrow":
-        """Returns a new :class:`Arrow <arrow.arrow.Arrow>` object, that represents
-        the time difference relative to the attributes of the
-        :class:`Arrow <arrow.arrow.Arrow>` object.
-
-        :param timestring: a ``str`` representing a humanized relative time.
-        :param locale: (optional) a ``str`` specifying a locale.  Defaults to 'en-us'.
-
-        Usage::
-
-                >>> arw = arrow.utcnow()
-                >>> arw
-                <Arrow [2021-04-20T22:27:34.787885+00:00]>
-                >>> earlier = arw.dehumanize("2 days ago")
-                >>> earlier
-                <Arrow [2021-04-18T22:27:34.787885+00:00]>
-
-                >>> arw = arrow.utcnow()
-                >>> arw
-                <Arrow [2021-04-20T22:27:34.787885+00:00]>
-                >>> later = arw.dehumanize("in a month")
-                >>> later
-                <Arrow [2021-05-18T22:27:34.787885+00:00]>
-
-        """
-
-        # Create a locale object based off given local
-        locale_obj = locales.get_locale(locale)
-
-        # Check to see if locale is supported
-        normalized_locale_name = locale.lower().replace("_", "-")
-
-        if normalized_locale_name not in DEHUMANIZE_LOCALES:
-            raise ValueError(
-                f"Dehumanize does not currently support the {locale} locale, please consider making a contribution to add support for this locale."
-            )
-
-        current_time = self.fromdatetime(self._datetime)
-
-        # Create an object containing the relative time info
-        time_object_info = dict.fromkeys(
-            ["seconds", "minutes", "hours", "days", "weeks", "months", "years"], 0
-        )
-
-        # Create an object representing if unit has been seen
-        unit_visited = dict.fromkeys(
-            ["now", "seconds", "minutes", "hours", "days", "weeks", "months", "years"],
-            False,
-        )
-
-        # Create a regex pattern object for numbers
-        num_pattern = re.compile(r"\d+")
-
-        # Search input string for each time unit within locale
-        for unit, unit_object in locale_obj.timeframes.items():
-            # Need to check the type of unit_object to create the correct dictionary
-            if isinstance(unit_object, Mapping):
-                strings_to_search = unit_object
-            else:
-                strings_to_search = {unit: str(unit_object)}
-
-            # Search for any matches that exist for that locale's unit.
-            # Needs to cycle all through strings as some locales have strings that
-            # could overlap in a regex match, since input validation isn't being performed.
-            for time_delta, time_string in strings_to_search.items():
-                # Replace {0} with regex \d representing digits
-                search_string = str(time_string)
-                search_string = search_string.format(r"\d+")
-
-                # Create search pattern and find within string
-                pattern = re.compile(rf"(^|\b|\d){search_string}")
-                match = pattern.search(input_string)
-
-                # If there is no match continue to next iteration
-                if not match:
-                    continue
-
-                match_string = match.group()
-                num_match = num_pattern.search(match_string)
-
-                # If no number matches
-                # Need for absolute value as some locales have signs included in their objects
-                if not num_match:
-                    change_value = (
-                        1 if not time_delta.isnumeric() else abs(int(time_delta))
-                    )
-                else:
-                    change_value = int(num_match.group())
-
-                # No time to update if now is the unit
-                if unit == "now":
-                    unit_visited[unit] = True
-                    continue
-
-                # Add change value to the correct unit (incorporates the plurality that exists within timeframe i.e second v.s seconds)
-                time_unit_to_change = str(unit)
-                time_unit_to_change += (
-                    "s" if (str(time_unit_to_change)[-1] != "s") else ""
-                )
-                time_object_info[time_unit_to_change] = change_value
-                unit_visited[time_unit_to_change] = True
-
-        # Assert error if string does not modify any units
-        if not any([True for k, v in unit_visited.items() if v]):
-            raise ValueError(
-                "Input string not valid. Note: Some locales do not support the week granularity in Arrow. "
-                "If you are attempting to use the week granularity on an unsupported locale, this could be the cause of this error."
-            )
-
-        # Sign logic
-        future_string = locale_obj.future
-        future_string = future_string.format(".*")
-        future_pattern = re.compile(rf"^{future_string}$")
-        future_pattern_match = future_pattern.findall(input_string)
-
-        past_string = locale_obj.past
-        past_string = past_string.format(".*")
-        past_pattern = re.compile(rf"^{past_string}$")
-        past_pattern_match = past_pattern.findall(input_string)
-
-        # If a string contains the now unit, there will be no relative units, hence the need to check if the now unit
-        # was visited before raising a ValueError
-        if past_pattern_match:
-            sign_val = -1
-        elif future_pattern_match:
-            sign_val = 1
-        elif unit_visited["now"]:
-            sign_val = 0
-        else:
-            raise ValueError(
-                "Invalid input String. String does not contain any relative time information. "
-                "String should either represent a time in the future or a time in the past. "
-                "Ex: 'in 5 seconds' or '5 seconds ago'."
-            )
-
-        time_changes = {k: sign_val * v for k, v in time_object_info.items()}
-
-        return current_time.shift(**time_changes)
-
-    # query functions
-
-    def is_between(
-        self,
-        start: "Arrow",
-        end: "Arrow",
-        bounds: _BOUNDS = "()",
-    ) -> bool:
-        """Returns a boolean denoting whether the :class:`Arrow <arrow.arrow.Arrow>` object is between
-        the start and end limits.
-
-        :param start: an :class:`Arrow <arrow.arrow.Arrow>` object.
-        :param end: an :class:`Arrow <arrow.arrow.Arrow>` object.
-        :param bounds: (optional) a ``str`` of either '()', '(]', '[)', or '[]' that specifies
-            whether to include or exclude the start and end values in the range. '(' excludes
-            the start, '[' includes the start, ')' excludes the end, and ']' includes the end.
-            If the bounds are not specified, the default bound '()' is used.
-
-        Usage::
-
-            >>> start = arrow.get(datetime(2013, 5, 5, 12, 30, 10))
-            >>> end = arrow.get(datetime(2013, 5, 5, 12, 30, 36))
-            >>> arrow.get(datetime(2013, 5, 5, 12, 30, 27)).is_between(start, end)
-            True
-
-            >>> start = arrow.get(datetime(2013, 5, 5))
-            >>> end = arrow.get(datetime(2013, 5, 8))
-            >>> arrow.get(datetime(2013, 5, 8)).is_between(start, end, '[]')
-            True
-
-            >>> start = arrow.get(datetime(2013, 5, 5))
-            >>> end = arrow.get(datetime(2013, 5, 8))
-            >>> arrow.get(datetime(2013, 5, 8)).is_between(start, end, '[)')
-            False
-
-        """
-
-        util.validate_bounds(bounds)
-
-        if not isinstance(start, Arrow):
-            raise TypeError(
-                f"Cannot parse start date argument type of {type(start)!r}."
-            )
-
-        if not isinstance(end, Arrow):
-            raise TypeError(f"Cannot parse end date argument type of {type(start)!r}.")
-
-        include_start = bounds[0] == "["
-        include_end = bounds[1] == "]"
-
-        target_ts = self.float_timestamp
-        start_ts = start.float_timestamp
-        end_ts = end.float_timestamp
-
-        return (
-            (start_ts <= target_ts <= end_ts)
-            and (include_start or start_ts < target_ts)
-            and (include_end or target_ts < end_ts)
-        )
-
-    # datetime methods
-
-    def date(self) -> date:
-        """Returns a ``date`` object with the same year, month and day.
-
-        Usage::
-
-            >>> arrow.utcnow().date()
-            datetime.date(2019, 1, 23)
-
-        """
-
-        return self._datetime.date()
-
-    def time(self) -> dt_time:
-        """Returns a ``time`` object with the same hour, minute, second, microsecond.
-
-        Usage::
-
-            >>> arrow.utcnow().time()
-            datetime.time(12, 15, 34, 68352)
-
-        """
-
-        return self._datetime.time()
-
-    def timetz(self) -> dt_time:
-        """Returns a ``time`` object with the same hour, minute, second, microsecond and
-        tzinfo.
-
-        Usage::
-
-            >>> arrow.utcnow().timetz()
-            datetime.time(12, 5, 18, 298893, tzinfo=tzutc())
-
-        """
-
-        return self._datetime.timetz()
-
-    def astimezone(self, tz: Optional[dt_tzinfo]) -> dt_datetime:
-        """Returns a ``datetime`` object, converted to the specified timezone.
-
-        :param tz: a ``tzinfo`` object.
-
-        Usage::
-
-            >>> pacific=arrow.now('US/Pacific')
-            >>> nyc=arrow.now('America/New_York').tzinfo
-            >>> pacific.astimezone(nyc)
-            datetime.datetime(2019, 1, 20, 10, 24, 22, 328172, tzinfo=tzfile('/usr/share/zoneinfo/America/New_York'))
-
-        """
-
-        return self._datetime.astimezone(tz)
-
-    def utcoffset(self) -> Optional[timedelta]:
-        """Returns a ``timedelta`` object representing the whole number of minutes difference from
-        UTC time.
-
-        Usage::
-
-            >>> arrow.now('US/Pacific').utcoffset()
-            datetime.timedelta(-1, 57600)
-
-        """
-
-        return self._datetime.utcoffset()
-
-    def dst(self) -> Optional[timedelta]:
-        """Returns the daylight savings time adjustment.
-
-        Usage::
-
-            >>> arrow.utcnow().dst()
-            datetime.timedelta(0)
-
-        """
-
-        return self._datetime.dst()
-
-    def timetuple(self) -> struct_time:
-        """Returns a ``time.struct_time``, in the current timezone.
-
-        Usage::
-
-            >>> arrow.utcnow().timetuple()
-            time.struct_time(tm_year=2019, tm_mon=1, tm_mday=20, tm_hour=15, tm_min=17, tm_sec=8, tm_wday=6, tm_yday=20, tm_isdst=0)
-
-        """
-
-        return self._datetime.timetuple()
-
-    def utctimetuple(self) -> struct_time:
-        """Returns a ``time.struct_time``, in UTC time.
-
-        Usage::
-
-            >>> arrow.utcnow().utctimetuple()
-            time.struct_time(tm_year=2019, tm_mon=1, tm_mday=19, tm_hour=21, tm_min=41, tm_sec=7, tm_wday=5, tm_yday=19, tm_isdst=0)
-
-        """
-
-        return self._datetime.utctimetuple()
-
-    def toordinal(self) -> int:
-        """Returns the proleptic Gregorian ordinal of the date.
-
-        Usage::
-
-            >>> arrow.utcnow().toordinal()
-            737078
-
-        """
-
-        return self._datetime.toordinal()
-
-    def weekday(self) -> int:
-        """Returns the day of the week as an integer (0-6).
-
-        Usage::
-
-            >>> arrow.utcnow().weekday()
-            5
-
-        """
-
-        return self._datetime.weekday()
-
-    def isoweekday(self) -> int:
-        """Returns the ISO day of the week as an integer (1-7).
-
-        Usage::
-
-            >>> arrow.utcnow().isoweekday()
-            6
-
-        """
-
-        return self._datetime.isoweekday()
-
-    def isocalendar(self) -> Tuple[int, int, int]:
-        """Returns a 3-tuple, (ISO year, ISO week number, ISO weekday).
-
-        Usage::
-
-            >>> arrow.utcnow().isocalendar()
-            (2019, 3, 6)
-
-        """
-
-        return self._datetime.isocalendar()
-
-    def isoformat(self, sep: str = "T", timespec: str = "auto") -> str:
-        """Returns an ISO 8601 formatted representation of the date and time.
-
-        Usage::
-
-            >>> arrow.utcnow().isoformat()
-            '2019-01-19T18:30:52.442118+00:00'
-
-        """
-
-        return self._datetime.isoformat(sep, timespec)
-
-    def ctime(self) -> str:
-        """Returns a ctime formatted representation of the date and time.
-
-        Usage::
-
-            >>> arrow.utcnow().ctime()
-            'Sat Jan 19 18:26:50 2019'
-
-        """
-
-        return self._datetime.ctime()
-
-    def strftime(self, format: str) -> str:
-        """Formats in the style of ``datetime.strftime``.
-
-        :param format: the format string.
-
-        Usage::
-
-            >>> arrow.utcnow().strftime('%d-%m-%Y %H:%M:%S')
-            '23-01-2019 12:28:17'
-
-        """
-
-        return self._datetime.strftime(format)
-
-    def for_json(self) -> str:
-        """Serializes for the ``for_json`` protocol of simplejson.
-
-        Usage::
-
-            >>> arrow.utcnow().for_json()
-            '2019-01-19T18:25:36.760079+00:00'
-
-        """
-
-        return self.isoformat()
-
-    # math
-
-    def __add__(self, other: Any) -> "Arrow":
-        if isinstance(other, (timedelta, relativedelta)):
-            return self.fromdatetime(self._datetime + other, self._datetime.tzinfo)
-
-        return NotImplemented
-
-    def __radd__(self, other: Union[timedelta, relativedelta]) -> "Arrow":
-        return self.__add__(other)
-
-    @overload
-    def __sub__(self, other: Union[timedelta, relativedelta]) -> "Arrow":
-        pass  # pragma: no cover
-
-    @overload
-    def __sub__(self, other: Union[dt_datetime, "Arrow"]) -> timedelta:
-        pass  # pragma: no cover
-
-    def __sub__(self, other: Any) -> Union[timedelta, "Arrow"]:
-        if isinstance(other, (timedelta, relativedelta)):
-            return self.fromdatetime(self._datetime - other, self._datetime.tzinfo)
-
-        elif isinstance(other, dt_datetime):
-            return self._datetime - other
-
-        elif isinstance(other, Arrow):
-            return self._datetime - other._datetime
-
-        return NotImplemented
-
-    def __rsub__(self, other: Any) -> timedelta:
-        if isinstance(other, dt_datetime):
-            return other - self._datetime
-
-        return NotImplemented
-
-    # comparisons
-
-    def __eq__(self, other: Any) -> bool:
-        if not isinstance(other, (Arrow, dt_datetime)):
-            return False
-
-        return self._datetime == self._get_datetime(other)
-
-    def __ne__(self, other: Any) -> bool:
-        if not isinstance(other, (Arrow, dt_datetime)):
-            return True
-
-        return not self.__eq__(other)
-
-    def __gt__(self, other: Any) -> bool:
-        if not isinstance(other, (Arrow, dt_datetime)):
-            return NotImplemented
-
-        return self._datetime > self._get_datetime(other)
-
-    def __ge__(self, other: Any) -> bool:
-        if not isinstance(other, (Arrow, dt_datetime)):
-            return NotImplemented
-
-        return self._datetime >= self._get_datetime(other)
-
-    def __lt__(self, other: Any) -> bool:
-        if not isinstance(other, (Arrow, dt_datetime)):
-            return NotImplemented
-
-        return self._datetime < self._get_datetime(other)
-
-    def __le__(self, other: Any) -> bool:
-        if not isinstance(other, (Arrow, dt_datetime)):
-            return NotImplemented
-
-        return self._datetime <= self._get_datetime(other)
-
-    # internal methods
-    @staticmethod
-    def _get_tzinfo(tz_expr: Optional[TZ_EXPR]) -> dt_tzinfo:
-        """Get normalized tzinfo object from various inputs."""
-        if tz_expr is None:
-            return dateutil_tz.tzutc()
-        if isinstance(tz_expr, dt_tzinfo):
-            return tz_expr
-        else:
-            try:
-                return parser.TzinfoParser.parse(tz_expr)
-            except parser.ParserError:
-                raise ValueError(f"{tz_expr!r} not recognized as a timezone.")
-
-    @classmethod
-    def _get_datetime(
-        cls, expr: Union["Arrow", dt_datetime, int, float, str]
-    ) -> dt_datetime:
-        """Get datetime object from a specified expression."""
-        if isinstance(expr, Arrow):
-            return expr.datetime
-        elif isinstance(expr, dt_datetime):
-            return expr
-        elif util.is_timestamp(expr):
-            timestamp = float(expr)
-            return cls.utcfromtimestamp(timestamp).datetime
-        else:
-            raise ValueError(f"{expr!r} not recognized as a datetime or timestamp.")
-
-    @classmethod
-    def _get_frames(cls, name: _T_FRAMES) -> Tuple[str, str, int]:
-        """Finds relevant timeframe and steps for use in range and span methods.
-
-        Returns a 3 element tuple in the form (frame, plural frame, step), for example ("day", "days", 1)
-
-        """
-        if name in cls._ATTRS:
-            return name, f"{name}s", 1
-        elif name[-1] == "s" and name[:-1] in cls._ATTRS:
-            return name[:-1], name, 1
-        elif name in ["week", "weeks"]:
-            return "week", "weeks", 1
-        elif name in ["quarter", "quarters"]:
-            return "quarter", "months", 3
-        else:
-            supported = ", ".join(
-                [
-                    "year(s)",
-                    "month(s)",
-                    "day(s)",
-                    "hour(s)",
-                    "minute(s)",
-                    "second(s)",
-                    "microsecond(s)",
-                    "week(s)",
-                    "quarter(s)",
-                ]
-            )
-            raise ValueError(
-                f"Range or span over frame {name} not supported. Supported frames: {supported}."
-            )
-
-    @classmethod
-    def _get_iteration_params(cls, end: Any, limit: Optional[int]) -> Tuple[Any, int]:
-        """Sets default end and limit values for range method."""
-        if end is None:
-            if limit is None:
-                raise ValueError("One of 'end' or 'limit' is required.")
-
-            return cls.max, limit
-
-        else:
-            if limit is None:
-                return end, sys.maxsize
-            return end, limit
-
-    @staticmethod
-    def _is_last_day_of_month(date: "Arrow") -> bool:
-        """Returns a boolean indicating whether the datetime is the last day of the month."""
-        return date.day == calendar.monthrange(date.year, date.month)[1]
-
-
-Arrow.min = Arrow.fromdatetime(dt_datetime.min)
-Arrow.max = Arrow.fromdatetime(dt_datetime.max)
diff --git a/lib/arrow/constants.py b/lib/arrow/constants.py
deleted file mode 100644
index 53d163b9..00000000
--- a/lib/arrow/constants.py
+++ /dev/null
@@ -1,177 +0,0 @@
-"""Constants used internally in arrow."""
-
-import sys
-from datetime import datetime
-
-if sys.version_info < (3, 8):  # pragma: no cover
-    from typing_extensions import Final
-else:
-    from typing import Final  # pragma: no cover
-
-# datetime.max.timestamp() errors on Windows, so we must hardcode
-# the highest possible datetime value that can output a timestamp.
-# tl;dr platform-independent max timestamps are hard to form
-# See: https://stackoverflow.com/q/46133223
-try:
-    # Get max timestamp. Works on POSIX-based systems like Linux and macOS,
-    # but will trigger an OverflowError, ValueError, or OSError on Windows
-    _MAX_TIMESTAMP = datetime.max.timestamp()
-except (OverflowError, ValueError, OSError):  # pragma: no cover
-    # Fallback for Windows and 32-bit systems if initial max timestamp call fails
-    # Must get max value of ctime on Windows based on architecture (x32 vs x64)
-    # https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/ctime-ctime32-ctime64-wctime-wctime32-wctime64
-    # Note: this may occur on both 32-bit Linux systems (issue #930) along with Windows systems
-    is_64bits = sys.maxsize > 2**32
-    _MAX_TIMESTAMP = (
-        datetime(3000, 1, 1, 23, 59, 59, 999999).timestamp()
-        if is_64bits
-        else datetime(2038, 1, 1, 23, 59, 59, 999999).timestamp()
-    )
-
-MAX_TIMESTAMP: Final[float] = _MAX_TIMESTAMP
-MAX_TIMESTAMP_MS: Final[float] = MAX_TIMESTAMP * 1000
-MAX_TIMESTAMP_US: Final[float] = MAX_TIMESTAMP * 1_000_000
-
-MAX_ORDINAL: Final[int] = datetime.max.toordinal()
-MIN_ORDINAL: Final[int] = 1
-
-DEFAULT_LOCALE: Final[str] = "en-us"
-
-# Supported dehumanize locales
-DEHUMANIZE_LOCALES = {
-    "en",
-    "en-us",
-    "en-gb",
-    "en-au",
-    "en-be",
-    "en-jp",
-    "en-za",
-    "en-ca",
-    "en-ph",
-    "fr",
-    "fr-fr",
-    "fr-ca",
-    "it",
-    "it-it",
-    "es",
-    "es-es",
-    "el",
-    "el-gr",
-    "ja",
-    "ja-jp",
-    "se",
-    "se-fi",
-    "se-no",
-    "se-se",
-    "sv",
-    "sv-se",
-    "fi",
-    "fi-fi",
-    "zh",
-    "zh-cn",
-    "zh-tw",
-    "zh-hk",
-    "nl",
-    "nl-nl",
-    "be",
-    "be-by",
-    "pl",
-    "pl-pl",
-    "ru",
-    "ru-ru",
-    "af",
-    "bg",
-    "bg-bg",
-    "ua",
-    "uk",
-    "uk-ua",
-    "mk",
-    "mk-mk",
-    "de",
-    "de-de",
-    "de-ch",
-    "de-at",
-    "nb",
-    "nb-no",
-    "nn",
-    "nn-no",
-    "pt",
-    "pt-pt",
-    "pt-br",
-    "tl",
-    "tl-ph",
-    "vi",
-    "vi-vn",
-    "tr",
-    "tr-tr",
-    "az",
-    "az-az",
-    "da",
-    "da-dk",
-    "ml",
-    "hi",
-    "cs",
-    "cs-cz",
-    "sk",
-    "sk-sk",
-    "fa",
-    "fa-ir",
-    "mr",
-    "ca",
-    "ca-es",
-    "ca-ad",
-    "ca-fr",
-    "ca-it",
-    "eo",
-    "eo-xx",
-    "bn",
-    "bn-bd",
-    "bn-in",
-    "rm",
-    "rm-ch",
-    "ro",
-    "ro-ro",
-    "sl",
-    "sl-si",
-    "id",
-    "id-id",
-    "ne",
-    "ne-np",
-    "ee",
-    "et",
-    "sw",
-    "sw-ke",
-    "sw-tz",
-    "la",
-    "la-va",
-    "lt",
-    "lt-lt",
-    "ms",
-    "ms-my",
-    "ms-bn",
-    "or",
-    "or-in",
-    "lb",
-    "lb-lu",
-    "zu",
-    "zu-za",
-    "sq",
-    "sq-al",
-    "ta",
-    "ta-in",
-    "ta-lk",
-    "ur",
-    "ur-pk",
-    "ka",
-    "ka-ge",
-    "kk",
-    "kk-kz",
-    # "lo",
-    # "lo-la",
-    "am",
-    "am-et",
-    "hy-am",
-    "hy",
-    "uz",
-    "uz-uz",
-}
diff --git a/lib/arrow/factory.py b/lib/arrow/factory.py
deleted file mode 100644
index f35085f1..00000000
--- a/lib/arrow/factory.py
+++ /dev/null
@@ -1,345 +0,0 @@
-"""
-Implements the :class:`ArrowFactory <arrow.factory.ArrowFactory>` class,
-providing factory methods for common :class:`Arrow <arrow.arrow.Arrow>`
-construction scenarios.
-
-"""
-
-
-import calendar
-from datetime import date, datetime
-from datetime import tzinfo as dt_tzinfo
-from decimal import Decimal
-from time import struct_time
-from typing import Any, List, Optional, Tuple, Type, Union, overload
-
-from dateutil import tz as dateutil_tz
-
-from arrow import parser
-from arrow.arrow import TZ_EXPR, Arrow
-from arrow.constants import DEFAULT_LOCALE
-from arrow.util import is_timestamp, iso_to_gregorian
-
-
-class ArrowFactory:
-    """A factory for generating :class:`Arrow <arrow.arrow.Arrow>` objects.
-
-    :param type: (optional) the :class:`Arrow <arrow.arrow.Arrow>`-based class to construct from.
-        Defaults to :class:`Arrow <arrow.arrow.Arrow>`.
-
-    """
-
-    type: Type[Arrow]
-
-    def __init__(self, type: Type[Arrow] = Arrow) -> None:
-        self.type = type
-
-    @overload
-    def get(
-        self,
-        *,
-        locale: str = DEFAULT_LOCALE,
-        tzinfo: Optional[TZ_EXPR] = None,
-        normalize_whitespace: bool = False,
-    ) -> Arrow:
-        ...  # pragma: no cover
-
-    @overload
-    def get(
-        self,
-        __obj: Union[
-            Arrow,
-            datetime,
-            date,
-            struct_time,
-            dt_tzinfo,
-            int,
-            float,
-            str,
-            Tuple[int, int, int],
-        ],
-        *,
-        locale: str = DEFAULT_LOCALE,
-        tzinfo: Optional[TZ_EXPR] = None,
-        normalize_whitespace: bool = False,
-    ) -> Arrow:
-        ...  # pragma: no cover
-
-    @overload
-    def get(
-        self,
-        __arg1: Union[datetime, date],
-        __arg2: TZ_EXPR,
-        *,
-        locale: str = DEFAULT_LOCALE,
-        tzinfo: Optional[TZ_EXPR] = None,
-        normalize_whitespace: bool = False,
-    ) -> Arrow:
-        ...  # pragma: no cover
-
-    @overload
-    def get(
-        self,
-        __arg1: str,
-        __arg2: Union[str, List[str]],
-        *,
-        locale: str = DEFAULT_LOCALE,
-        tzinfo: Optional[TZ_EXPR] = None,
-        normalize_whitespace: bool = False,
-    ) -> Arrow:
-        ...  # pragma: no cover
-
-    def get(self, *args: Any, **kwargs: Any) -> Arrow:
-        """Returns an :class:`Arrow <arrow.arrow.Arrow>` object based on flexible inputs.
-
-        :param locale: (optional) a ``str`` specifying a locale for the parser. Defaults to 'en-us'.
-        :param tzinfo: (optional) a :ref:`timezone expression <tz-expr>` or tzinfo object.
-            Replaces the timezone unless using an input form that is explicitly UTC or specifies
-            the timezone in a positional argument. Defaults to UTC.
-        :param normalize_whitespace: (optional) a ``bool`` specifying whether or not to normalize
-            redundant whitespace (spaces, tabs, and newlines) in a datetime string before parsing.
-            Defaults to false.
-
-        Usage::
-
-            >>> import arrow
-
-        **No inputs** to get current UTC time::
-
-            >>> arrow.get()
-            <Arrow [2013-05-08T05:51:43.316458+00:00]>
-
-        **One** :class:`Arrow <arrow.arrow.Arrow>` object, to get a copy.
-
-            >>> arw = arrow.utcnow()
-            >>> arrow.get(arw)
-            <Arrow [2013-10-23T15:21:54.354846+00:00]>
-
-        **One** ``float`` or ``int``, convertible to a floating-point timestamp, to get
-        that timestamp in UTC::
-
-            >>> arrow.get(1367992474.293378)
-            <Arrow [2013-05-08T05:54:34.293378+00:00]>
-
-            >>> arrow.get(1367992474)
-            <Arrow [2013-05-08T05:54:34+00:00]>
-
-        **One** ISO 8601-formatted ``str``, to parse it::
-
-            >>> arrow.get('2013-09-29T01:26:43.830580')
-            <Arrow [2013-09-29T01:26:43.830580+00:00]>
-
-        **One** ISO 8601-formatted ``str``, in basic format, to parse it::
-
-            >>> arrow.get('20160413T133656.456289')
-            <Arrow [2016-04-13T13:36:56.456289+00:00]>
-
-        **One** ``tzinfo``, to get the current time **converted** to that timezone::
-
-            >>> arrow.get(tz.tzlocal())
-            <Arrow [2013-05-07T22:57:28.484717-07:00]>
-
-        **One** naive ``datetime``, to get that datetime in UTC::
-
-            >>> arrow.get(datetime(2013, 5, 5))
-            <Arrow [2013-05-05T00:00:00+00:00]>
-
-        **One** aware ``datetime``, to get that datetime::
-
-            >>> arrow.get(datetime(2013, 5, 5, tzinfo=tz.tzlocal()))
-            <Arrow [2013-05-05T00:00:00-07:00]>
-
-        **One** naive ``date``, to get that date in UTC::
-
-            >>> arrow.get(date(2013, 5, 5))
-            <Arrow [2013-05-05T00:00:00+00:00]>
-
-        **One** time.struct time::
-
-            >>> arrow.get(gmtime(0))
-            <Arrow [1970-01-01T00:00:00+00:00]>
-
-        **One** iso calendar ``tuple``, to get that week date in UTC::
-
-            >>> arrow.get((2013, 18, 7))
-            <Arrow [2013-05-05T00:00:00+00:00]>
-
-        **Two** arguments, a naive or aware ``datetime``, and a replacement
-        :ref:`timezone expression <tz-expr>`::
-
-            >>> arrow.get(datetime(2013, 5, 5), 'US/Pacific')
-            <Arrow [2013-05-05T00:00:00-07:00]>
-
-        **Two** arguments, a naive ``date``, and a replacement
-        :ref:`timezone expression <tz-expr>`::
-
-            >>> arrow.get(date(2013, 5, 5), 'US/Pacific')
-            <Arrow [2013-05-05T00:00:00-07:00]>
-
-        **Two** arguments, both ``str``, to parse the first according to the format of the second::
-
-            >>> arrow.get('2013-05-05 12:30:45 America/Chicago', 'YYYY-MM-DD HH:mm:ss ZZZ')
-            <Arrow [2013-05-05T12:30:45-05:00]>
-
-        **Two** arguments, first a ``str`` to parse and second a ``list`` of formats to try::
-
-            >>> arrow.get('2013-05-05 12:30:45', ['MM/DD/YYYY', 'YYYY-MM-DD HH:mm:ss'])
-            <Arrow [2013-05-05T12:30:45+00:00]>
-
-        **Three or more** arguments, as for the direct constructor of an ``Arrow`` object::
-
-            >>> arrow.get(2013, 5, 5, 12, 30, 45)
-            <Arrow [2013-05-05T12:30:45+00:00]>
-
-        """
-
-        arg_count = len(args)
-        locale = kwargs.pop("locale", DEFAULT_LOCALE)
-        tz = kwargs.get("tzinfo", None)
-        normalize_whitespace = kwargs.pop("normalize_whitespace", False)
-
-        # if kwargs given, send to constructor unless only tzinfo provided
-        if len(kwargs) > 1:
-            arg_count = 3
-
-        # tzinfo kwarg is not provided
-        if len(kwargs) == 1 and tz is None:
-            arg_count = 3
-
-        # () -> now, @ tzinfo or utc
-        if arg_count == 0:
-            if isinstance(tz, str):
-                tz = parser.TzinfoParser.parse(tz)
-                return self.type.now(tzinfo=tz)
-
-            if isinstance(tz, dt_tzinfo):
-                return self.type.now(tzinfo=tz)
-
-            return self.type.utcnow()
-
-        if arg_count == 1:
-            arg = args[0]
-            if isinstance(arg, Decimal):
-                arg = float(arg)
-
-            # (None) -> raises an exception
-            if arg is None:
-                raise TypeError("Cannot parse argument of type None.")
-
-            # try (int, float) -> from timestamp @ tzinfo
-            elif not isinstance(arg, str) and is_timestamp(arg):
-                if tz is None:
-                    # set to UTC by default
-                    tz = dateutil_tz.tzutc()
-                return self.type.fromtimestamp(arg, tzinfo=tz)
-
-            # (Arrow) -> from the object's datetime @ tzinfo
-            elif isinstance(arg, Arrow):
-                return self.type.fromdatetime(arg.datetime, tzinfo=tz)
-
-            # (datetime) -> from datetime @ tzinfo
-            elif isinstance(arg, datetime):
-                return self.type.fromdatetime(arg, tzinfo=tz)
-
-            # (date) -> from date @ tzinfo
-            elif isinstance(arg, date):
-                return self.type.fromdate(arg, tzinfo=tz)
-
-            # (tzinfo) -> now @ tzinfo
-            elif isinstance(arg, dt_tzinfo):
-                return self.type.now(tzinfo=arg)
-
-            # (str) -> parse @ tzinfo
-            elif isinstance(arg, str):
-                dt = parser.DateTimeParser(locale).parse_iso(arg, normalize_whitespace)
-                return self.type.fromdatetime(dt, tzinfo=tz)
-
-            # (struct_time) -> from struct_time
-            elif isinstance(arg, struct_time):
-                return self.type.utcfromtimestamp(calendar.timegm(arg))
-
-            # (iso calendar) -> convert then from date @ tzinfo
-            elif isinstance(arg, tuple) and len(arg) == 3:
-                d = iso_to_gregorian(*arg)
-                return self.type.fromdate(d, tzinfo=tz)
-
-            else:
-                raise TypeError(f"Cannot parse single argument of type {type(arg)!r}.")
-
-        elif arg_count == 2:
-            arg_1, arg_2 = args[0], args[1]
-
-            if isinstance(arg_1, datetime):
-                # (datetime, tzinfo/str) -> fromdatetime @ tzinfo
-                if isinstance(arg_2, (dt_tzinfo, str)):
-                    return self.type.fromdatetime(arg_1, tzinfo=arg_2)
-                else:
-                    raise TypeError(
-                        f"Cannot parse two arguments of types 'datetime', {type(arg_2)!r}."
-                    )
-
-            elif isinstance(arg_1, date):
-                # (date, tzinfo/str) -> fromdate @ tzinfo
-                if isinstance(arg_2, (dt_tzinfo, str)):
-                    return self.type.fromdate(arg_1, tzinfo=arg_2)
-                else:
-                    raise TypeError(
-                        f"Cannot parse two arguments of types 'date', {type(arg_2)!r}."
-                    )
-
-            # (str, format) -> parse @ tzinfo
-            elif isinstance(arg_1, str) and isinstance(arg_2, (str, list)):
-                dt = parser.DateTimeParser(locale).parse(
-                    args[0], args[1], normalize_whitespace
-                )
-                return self.type.fromdatetime(dt, tzinfo=tz)
-
-            else:
-                raise TypeError(
-                    f"Cannot parse two arguments of types {type(arg_1)!r} and {type(arg_2)!r}."
-                )
-
-        # 3+ args -> datetime-like via constructor
-        else:
-            return self.type(*args, **kwargs)
-
-    def utcnow(self) -> Arrow:
-        """Returns an :class:`Arrow <arrow.arrow.Arrow>` object, representing "now" in UTC time.
-
-        Usage::
-
-            >>> import arrow
-            >>> arrow.utcnow()
-            <Arrow [2013-05-08T05:19:07.018993+00:00]>
-        """
-
-        return self.type.utcnow()
-
-    def now(self, tz: Optional[TZ_EXPR] = None) -> Arrow:
-        """Returns an :class:`Arrow <arrow.arrow.Arrow>` object, representing "now" in the given
-        timezone.
-
-        :param tz: (optional) A :ref:`timezone expression <tz-expr>`.  Defaults to local time.
-
-        Usage::
-
-            >>> import arrow
-            >>> arrow.now()
-            <Arrow [2013-05-07T22:19:11.363410-07:00]>
-
-            >>> arrow.now('US/Pacific')
-            <Arrow [2013-05-07T22:19:15.251821-07:00]>
-
-            >>> arrow.now('+02:00')
-            <Arrow [2013-05-08T07:19:25.618646+02:00]>
-
-            >>> arrow.now('local')
-            <Arrow [2013-05-07T22:19:39.130059-07:00]>
-        """
-
-        if tz is None:
-            tz = dateutil_tz.tzlocal()
-        elif not isinstance(tz, dt_tzinfo):
-            tz = parser.TzinfoParser.parse(tz)
-
-        return self.type.now(tz)
diff --git a/lib/arrow/formatter.py b/lib/arrow/formatter.py
deleted file mode 100644
index d45f7153..00000000
--- a/lib/arrow/formatter.py
+++ /dev/null
@@ -1,148 +0,0 @@
-"""Provides the :class:`Arrow <arrow.formatter.DateTimeFormatter>` class, an improved formatter for datetimes."""
-
-import re
-import sys
-from datetime import datetime, timedelta
-from typing import Optional, Pattern, cast
-
-from dateutil import tz as dateutil_tz
-
-from arrow import locales
-from arrow.constants import DEFAULT_LOCALE
-
-if sys.version_info < (3, 8):  # pragma: no cover
-    from typing_extensions import Final
-else:
-    from typing import Final  # pragma: no cover
-
-
-FORMAT_ATOM: Final[str] = "YYYY-MM-DD HH:mm:ssZZ"
-FORMAT_COOKIE: Final[str] = "dddd, DD-MMM-YYYY HH:mm:ss ZZZ"
-FORMAT_RFC822: Final[str] = "ddd, DD MMM YY HH:mm:ss Z"
-FORMAT_RFC850: Final[str] = "dddd, DD-MMM-YY HH:mm:ss ZZZ"
-FORMAT_RFC1036: Final[str] = "ddd, DD MMM YY HH:mm:ss Z"
-FORMAT_RFC1123: Final[str] = "ddd, DD MMM YYYY HH:mm:ss Z"
-FORMAT_RFC2822: Final[str] = "ddd, DD MMM YYYY HH:mm:ss Z"
-FORMAT_RFC3339: Final[str] = "YYYY-MM-DD HH:mm:ssZZ"
-FORMAT_RSS: Final[str] = "ddd, DD MMM YYYY HH:mm:ss Z"
-FORMAT_W3C: Final[str] = "YYYY-MM-DD HH:mm:ssZZ"
-
-
-class DateTimeFormatter:
-    # This pattern matches characters enclosed in square brackets are matched as
-    # an atomic group. For more info on atomic groups and how to they are
-    # emulated in Python's re library, see https://stackoverflow.com/a/13577411/2701578
-
-    _FORMAT_RE: Final[Pattern[str]] = re.compile(
-        r"(\[(?:(?=(?P<literal>[^]]))(?P=literal))*\]|YYY?Y?|MM?M?M?|Do|DD?D?D?|d?dd?d?|HH?|hh?|mm?|ss?|SS?S?S?S?S?|ZZ?Z?|a|A|X|x|W)"
-    )
-
-    locale: locales.Locale
-
-    def __init__(self, locale: str = DEFAULT_LOCALE) -> None:
-        self.locale = locales.get_locale(locale)
-
-    def format(cls, dt: datetime, fmt: str) -> str:
-        # FIXME: _format_token() is nullable
-        return cls._FORMAT_RE.sub(
-            lambda m: cast(str, cls._format_token(dt, m.group(0))), fmt
-        )
-
-    def _format_token(self, dt: datetime, token: Optional[str]) -> Optional[str]:
-        if token and token.startswith("[") and token.endswith("]"):
-            return token[1:-1]
-
-        if token == "YYYY":
-            return self.locale.year_full(dt.year)
-        if token == "YY":
-            return self.locale.year_abbreviation(dt.year)
-
-        if token == "MMMM":
-            return self.locale.month_name(dt.month)
-        if token == "MMM":
-            return self.locale.month_abbreviation(dt.month)
-        if token == "MM":
-            return f"{dt.month:02d}"
-        if token == "M":
-            return f"{dt.month}"
-
-        if token == "DDDD":
-            return f"{dt.timetuple().tm_yday:03d}"
-        if token == "DDD":
-            return f"{dt.timetuple().tm_yday}"
-        if token == "DD":
-            return f"{dt.day:02d}"
-        if token == "D":
-            return f"{dt.day}"
-
-        if token == "Do":
-            return self.locale.ordinal_number(dt.day)
-
-        if token == "dddd":
-            return self.locale.day_name(dt.isoweekday())
-        if token == "ddd":
-            return self.locale.day_abbreviation(dt.isoweekday())
-        if token == "d":
-            return f"{dt.isoweekday()}"
-
-        if token == "HH":
-            return f"{dt.hour:02d}"
-        if token == "H":
-            return f"{dt.hour}"
-        if token == "hh":
-            return f"{dt.hour if 0 < dt.hour < 13 else abs(dt.hour - 12):02d}"
-        if token == "h":
-            return f"{dt.hour if 0 < dt.hour < 13 else abs(dt.hour - 12)}"
-
-        if token == "mm":
-            return f"{dt.minute:02d}"
-        if token == "m":
-            return f"{dt.minute}"
-
-        if token == "ss":
-            return f"{dt.second:02d}"
-        if token == "s":
-            return f"{dt.second}"
-
-        if token == "SSSSSS":
-            return f"{dt.microsecond:06d}"
-        if token == "SSSSS":
-            return f"{dt.microsecond // 10:05d}"
-        if token == "SSSS":
-            return f"{dt.microsecond // 100:04d}"
-        if token == "SSS":
-            return f"{dt.microsecond // 1000:03d}"
-        if token == "SS":
-            return f"{dt.microsecond // 10000:02d}"
-        if token == "S":
-            return f"{dt.microsecond // 100000}"
-
-        if token == "X":
-            return f"{dt.timestamp()}"
-
-        if token == "x":
-            return f"{dt.timestamp() * 1_000_000:.0f}"
-
-        if token == "ZZZ":
-            return dt.tzname()
-
-        if token in ["ZZ", "Z"]:
-            separator = ":" if token == "ZZ" else ""
-            tz = dateutil_tz.tzutc() if dt.tzinfo is None else dt.tzinfo
-            # `dt` must be aware object. Otherwise, this line will raise AttributeError
-            # https://github.com/arrow-py/arrow/pull/883#discussion_r529866834
-            # datetime awareness: https://docs.python.org/3/library/datetime.html#aware-and-naive-objects
-            total_minutes = int(cast(timedelta, tz.utcoffset(dt)).total_seconds() / 60)
-
-            sign = "+" if total_minutes >= 0 else "-"
-            total_minutes = abs(total_minutes)
-            hour, minute = divmod(total_minutes, 60)
-
-            return f"{sign}{hour:02d}{separator}{minute:02d}"
-
-        if token in ("a", "A"):
-            return self.locale.meridian(dt.hour, token)
-
-        if token == "W":
-            year, week, day = dt.isocalendar()
-            return f"{year}-W{week:02d}-{day}"
diff --git a/lib/arrow/locales.py b/lib/arrow/locales.py
deleted file mode 100644
index 34b2a098..00000000
--- a/lib/arrow/locales.py
+++ /dev/null
@@ -1,6485 +0,0 @@
-"""Provides internationalization for arrow in over 60 languages and dialects."""
-
-import sys
-from math import trunc
-from typing import (
-    Any,
-    ClassVar,
-    Dict,
-    List,
-    Mapping,
-    Optional,
-    Sequence,
-    Tuple,
-    Type,
-    Union,
-    cast,
-)
-
-if sys.version_info < (3, 8):  # pragma: no cover
-    from typing_extensions import Literal
-else:
-    from typing import Literal  # pragma: no cover
-
-TimeFrameLiteral = Literal[
-    "now",
-    "second",
-    "seconds",
-    "minute",
-    "minutes",
-    "hour",
-    "hours",
-    "day",
-    "days",
-    "week",
-    "weeks",
-    "month",
-    "months",
-    "quarter",
-    "quarters",
-    "year",
-    "years",
-]
-
-_TimeFrameElements = Union[
-    str, Sequence[str], Mapping[str, str], Mapping[str, Sequence[str]]
-]
-
-_locale_map: Dict[str, Type["Locale"]] = {}
-
-
-def get_locale(name: str) -> "Locale":
-    """Returns an appropriate :class:`Locale <arrow.locales.Locale>`
-    corresponding to an input locale name.
-
-    :param name: the name of the locale.
-
-    """
-
-    normalized_locale_name = name.lower().replace("_", "-")
-    locale_cls = _locale_map.get(normalized_locale_name)
-
-    if locale_cls is None:
-        raise ValueError(f"Unsupported locale {normalized_locale_name!r}.")
-
-    return locale_cls()
-
-
-def get_locale_by_class_name(name: str) -> "Locale":
-    """Returns an appropriate :class:`Locale <arrow.locales.Locale>`
-    corresponding to an locale class name.
-
-    :param name: the name of the locale class.
-
-    """
-    locale_cls: Optional[Type[Locale]] = globals().get(name)
-
-    if locale_cls is None:
-        raise ValueError(f"Unsupported locale {name!r}.")
-
-    return locale_cls()
-
-
-class Locale:
-    """Represents locale-specific data and functionality."""
-
-    names: ClassVar[List[str]] = []
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, _TimeFrameElements]] = {
-        "now": "",
-        "second": "",
-        "seconds": "",
-        "minute": "",
-        "minutes": "",
-        "hour": "",
-        "hours": "",
-        "day": "",
-        "days": "",
-        "week": "",
-        "weeks": "",
-        "month": "",
-        "months": "",
-        "quarter": "",
-        "quarters": "",
-        "year": "",
-        "years": "",
-    }
-
-    meridians: ClassVar[Dict[str, str]] = {"am": "", "pm": "", "AM": "", "PM": ""}
-
-    past: ClassVar[str]
-    future: ClassVar[str]
-    and_word: ClassVar[Optional[str]] = None
-
-    month_names: ClassVar[List[str]] = []
-    month_abbreviations: ClassVar[List[str]] = []
-
-    day_names: ClassVar[List[str]] = []
-    day_abbreviations: ClassVar[List[str]] = []
-
-    ordinal_day_re: ClassVar[str] = r"(\d+)"
-
-    _month_name_to_ordinal: Optional[Dict[str, int]]
-
-    def __init_subclass__(cls, **kwargs: Any) -> None:
-        for locale_name in cls.names:
-            if locale_name in _locale_map:
-                raise LookupError(f"Duplicated locale name: {locale_name}")
-
-            _locale_map[locale_name.lower().replace("_", "-")] = cls
-
-    def __init__(self) -> None:
-        self._month_name_to_ordinal = None
-
-    def describe(
-        self,
-        timeframe: TimeFrameLiteral,
-        delta: Union[float, int] = 0,
-        only_distance: bool = False,
-    ) -> str:
-        """Describes a delta within a timeframe in plain language.
-
-        :param timeframe: a string representing a timeframe.
-        :param delta: a quantity representing a delta in a timeframe.
-        :param only_distance: return only distance eg: "11 seconds" without "in" or "ago" keywords
-        """
-
-        humanized = self._format_timeframe(timeframe, trunc(delta))
-        if not only_distance:
-            humanized = self._format_relative(humanized, timeframe, delta)
-
-        return humanized
-
-    def describe_multi(
-        self,
-        timeframes: Sequence[Tuple[TimeFrameLiteral, Union[int, float]]],
-        only_distance: bool = False,
-    ) -> str:
-        """Describes a delta within multiple timeframes in plain language.
-
-        :param timeframes: a list of string, quantity pairs each representing a timeframe and delta.
-        :param only_distance: return only distance eg: "2 hours and 11 seconds" without "in" or "ago" keywords
-        """
-
-        parts = [
-            self._format_timeframe(timeframe, trunc(delta))
-            for timeframe, delta in timeframes
-        ]
-        if self.and_word:
-            parts.insert(-1, self.and_word)
-        humanized = " ".join(parts)
-
-        if not only_distance:
-            # Needed to determine the correct relative string to use
-            timeframe_value = 0
-
-            for _, unit_value in timeframes:
-                if trunc(unit_value) != 0:
-                    timeframe_value = trunc(unit_value)
-                    break
-
-            # Note it doesn't matter the timeframe unit we use on the call, only the value
-            humanized = self._format_relative(humanized, "seconds", timeframe_value)
-
-        return humanized
-
-    def day_name(self, day: int) -> str:
-        """Returns the day name for a specified day of the week.
-
-        :param day: the ``int`` day of the week (1-7).
-
-        """
-
-        return self.day_names[day]
-
-    def day_abbreviation(self, day: int) -> str:
-        """Returns the day abbreviation for a specified day of the week.
-
-        :param day: the ``int`` day of the week (1-7).
-
-        """
-
-        return self.day_abbreviations[day]
-
-    def month_name(self, month: int) -> str:
-        """Returns the month name for a specified month of the year.
-
-        :param month: the ``int`` month of the year (1-12).
-
-        """
-
-        return self.month_names[month]
-
-    def month_abbreviation(self, month: int) -> str:
-        """Returns the month abbreviation for a specified month of the year.
-
-        :param month: the ``int`` month of the year (1-12).
-
-        """
-
-        return self.month_abbreviations[month]
-
-    def month_number(self, name: str) -> Optional[int]:
-        """Returns the month number for a month specified by name or abbreviation.
-
-        :param name: the month name or abbreviation.
-
-        """
-
-        if self._month_name_to_ordinal is None:
-            self._month_name_to_ordinal = self._name_to_ordinal(self.month_names)
-            self._month_name_to_ordinal.update(
-                self._name_to_ordinal(self.month_abbreviations)
-            )
-
-        return self._month_name_to_ordinal.get(name)
-
-    def year_full(self, year: int) -> str:
-        """Returns the year for specific locale if available
-
-        :param year: the ``int`` year (4-digit)
-        """
-        return f"{year:04d}"
-
-    def year_abbreviation(self, year: int) -> str:
-        """Returns the year for specific locale if available
-
-        :param year: the ``int`` year (4-digit)
-        """
-        return f"{year:04d}"[2:]
-
-    def meridian(self, hour: int, token: Any) -> Optional[str]:
-        """Returns the meridian indicator for a specified hour and format token.
-
-        :param hour: the ``int`` hour of the day.
-        :param token: the format token.
-        """
-
-        if token == "a":
-            return self.meridians["am"] if hour < 12 else self.meridians["pm"]
-        if token == "A":
-            return self.meridians["AM"] if hour < 12 else self.meridians["PM"]
-        return None
-
-    def ordinal_number(self, n: int) -> str:
-        """Returns the ordinal format of a given integer
-
-        :param n: an integer
-        """
-        return self._ordinal_number(n)
-
-    def _ordinal_number(self, n: int) -> str:
-        return f"{n}"
-
-    def _name_to_ordinal(self, lst: Sequence[str]) -> Dict[str, int]:
-        return {elem.lower(): i for i, elem in enumerate(lst[1:], 1)}
-
-    def _format_timeframe(self, timeframe: TimeFrameLiteral, delta: int) -> str:
-        # TODO: remove cast
-        return cast(str, self.timeframes[timeframe]).format(trunc(abs(delta)))
-
-    def _format_relative(
-        self,
-        humanized: str,
-        timeframe: TimeFrameLiteral,
-        delta: Union[float, int],
-    ) -> str:
-        if timeframe == "now":
-            return humanized
-
-        direction = self.past if delta < 0 else self.future
-
-        return direction.format(humanized)
-
-
-class EnglishLocale(Locale):
-    names = [
-        "en",
-        "en-us",
-        "en-gb",
-        "en-au",
-        "en-be",
-        "en-jp",
-        "en-za",
-        "en-ca",
-        "en-ph",
-    ]
-
-    past = "{0} ago"
-    future = "in {0}"
-    and_word = "and"
-
-    timeframes = {
-        "now": "just now",
-        "second": "a second",
-        "seconds": "{0} seconds",
-        "minute": "a minute",
-        "minutes": "{0} minutes",
-        "hour": "an hour",
-        "hours": "{0} hours",
-        "day": "a day",
-        "days": "{0} days",
-        "week": "a week",
-        "weeks": "{0} weeks",
-        "month": "a month",
-        "months": "{0} months",
-        "quarter": "a quarter",
-        "quarters": "{0} quarters",
-        "year": "a year",
-        "years": "{0} years",
-    }
-
-    meridians = {"am": "am", "pm": "pm", "AM": "AM", "PM": "PM"}
-
-    month_names = [
-        "",
-        "January",
-        "February",
-        "March",
-        "April",
-        "May",
-        "June",
-        "July",
-        "August",
-        "September",
-        "October",
-        "November",
-        "December",
-    ]
-    month_abbreviations = [
-        "",
-        "Jan",
-        "Feb",
-        "Mar",
-        "Apr",
-        "May",
-        "Jun",
-        "Jul",
-        "Aug",
-        "Sep",
-        "Oct",
-        "Nov",
-        "Dec",
-    ]
-
-    day_names = [
-        "",
-        "Monday",
-        "Tuesday",
-        "Wednesday",
-        "Thursday",
-        "Friday",
-        "Saturday",
-        "Sunday",
-    ]
-    day_abbreviations = ["", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]
-
-    ordinal_day_re = r"((?P<value>[2-3]?1(?=st)|[2-3]?2(?=nd)|[2-3]?3(?=rd)|[1-3]?[04-9](?=th)|1[1-3](?=th))(st|nd|rd|th))"
-
-    def _ordinal_number(self, n: int) -> str:
-        if n % 100 not in (11, 12, 13):
-            remainder = abs(n) % 10
-            if remainder == 1:
-                return f"{n}st"
-            elif remainder == 2:
-                return f"{n}nd"
-            elif remainder == 3:
-                return f"{n}rd"
-        return f"{n}th"
-
-    def describe(
-        self,
-        timeframe: TimeFrameLiteral,
-        delta: Union[int, float] = 0,
-        only_distance: bool = False,
-    ) -> str:
-        """Describes a delta within a timeframe in plain language.
-
-        :param timeframe: a string representing a timeframe.
-        :param delta: a quantity representing a delta in a timeframe.
-        :param only_distance: return only distance eg: "11 seconds" without "in" or "ago" keywords
-        """
-
-        humanized = super().describe(timeframe, delta, only_distance)
-        if only_distance and timeframe == "now":
-            humanized = "instantly"
-
-        return humanized
-
-
-class ItalianLocale(Locale):
-    names = ["it", "it-it"]
-    past = "{0} fa"
-    future = "tra {0}"
-    and_word = "e"
-
-    timeframes = {
-        "now": "adesso",
-        "second": "un secondo",
-        "seconds": "{0} qualche secondo",
-        "minute": "un minuto",
-        "minutes": "{0} minuti",
-        "hour": "un'ora",
-        "hours": "{0} ore",
-        "day": "un giorno",
-        "days": "{0} giorni",
-        "week": "una settimana",
-        "weeks": "{0} settimane",
-        "month": "un mese",
-        "months": "{0} mesi",
-        "year": "un anno",
-        "years": "{0} anni",
-    }
-
-    month_names = [
-        "",
-        "gennaio",
-        "febbraio",
-        "marzo",
-        "aprile",
-        "maggio",
-        "giugno",
-        "luglio",
-        "agosto",
-        "settembre",
-        "ottobre",
-        "novembre",
-        "dicembre",
-    ]
-    month_abbreviations = [
-        "",
-        "gen",
-        "feb",
-        "mar",
-        "apr",
-        "mag",
-        "giu",
-        "lug",
-        "ago",
-        "set",
-        "ott",
-        "nov",
-        "dic",
-    ]
-
-    day_names = [
-        "",
-        "lunedì",
-        "martedì",
-        "mercoledì",
-        "giovedì",
-        "venerdì",
-        "sabato",
-        "domenica",
-    ]
-    day_abbreviations = ["", "lun", "mar", "mer", "gio", "ven", "sab", "dom"]
-
-    ordinal_day_re = r"((?P<value>[1-3]?[0-9](?=[ºª]))[ºª])"
-
-    def _ordinal_number(self, n: int) -> str:
-        return f"{n}º"
-
-
-class SpanishLocale(Locale):
-    names = ["es", "es-es"]
-    past = "hace {0}"
-    future = "en {0}"
-    and_word = "y"
-
-    timeframes = {
-        "now": "ahora",
-        "second": "un segundo",
-        "seconds": "{0} segundos",
-        "minute": "un minuto",
-        "minutes": "{0} minutos",
-        "hour": "una hora",
-        "hours": "{0} horas",
-        "day": "un día",
-        "days": "{0} días",
-        "week": "una semana",
-        "weeks": "{0} semanas",
-        "month": "un mes",
-        "months": "{0} meses",
-        "year": "un año",
-        "years": "{0} años",
-    }
-
-    meridians = {"am": "am", "pm": "pm", "AM": "AM", "PM": "PM"}
-
-    month_names = [
-        "",
-        "enero",
-        "febrero",
-        "marzo",
-        "abril",
-        "mayo",
-        "junio",
-        "julio",
-        "agosto",
-        "septiembre",
-        "octubre",
-        "noviembre",
-        "diciembre",
-    ]
-    month_abbreviations = [
-        "",
-        "ene",
-        "feb",
-        "mar",
-        "abr",
-        "may",
-        "jun",
-        "jul",
-        "ago",
-        "sep",
-        "oct",
-        "nov",
-        "dic",
-    ]
-
-    day_names = [
-        "",
-        "lunes",
-        "martes",
-        "miércoles",
-        "jueves",
-        "viernes",
-        "sábado",
-        "domingo",
-    ]
-    day_abbreviations = ["", "lun", "mar", "mie", "jue", "vie", "sab", "dom"]
-
-    ordinal_day_re = r"((?P<value>[1-3]?[0-9](?=[ºª]))[ºª])"
-
-    def _ordinal_number(self, n: int) -> str:
-        return f"{n}º"
-
-
-class FrenchBaseLocale(Locale):
-    past = "il y a {0}"
-    future = "dans {0}"
-    and_word = "et"
-
-    timeframes = {
-        "now": "maintenant",
-        "second": "une seconde",
-        "seconds": "{0} secondes",
-        "minute": "une minute",
-        "minutes": "{0} minutes",
-        "hour": "une heure",
-        "hours": "{0} heures",
-        "day": "un jour",
-        "days": "{0} jours",
-        "week": "une semaine",
-        "weeks": "{0} semaines",
-        "month": "un mois",
-        "months": "{0} mois",
-        "year": "un an",
-        "years": "{0} ans",
-    }
-
-    month_names = [
-        "",
-        "janvier",
-        "février",
-        "mars",
-        "avril",
-        "mai",
-        "juin",
-        "juillet",
-        "août",
-        "septembre",
-        "octobre",
-        "novembre",
-        "décembre",
-    ]
-
-    day_names = [
-        "",
-        "lundi",
-        "mardi",
-        "mercredi",
-        "jeudi",
-        "vendredi",
-        "samedi",
-        "dimanche",
-    ]
-    day_abbreviations = ["", "lun", "mar", "mer", "jeu", "ven", "sam", "dim"]
-
-    ordinal_day_re = (
-        r"((?P<value>\b1(?=er\b)|[1-3]?[02-9](?=e\b)|[1-3]1(?=e\b))(er|e)\b)"
-    )
-
-    def _ordinal_number(self, n: int) -> str:
-        if abs(n) == 1:
-            return f"{n}er"
-        return f"{n}e"
-
-
-class FrenchLocale(FrenchBaseLocale, Locale):
-    names = ["fr", "fr-fr"]
-
-    month_abbreviations = [
-        "",
-        "janv",
-        "févr",
-        "mars",
-        "avr",
-        "mai",
-        "juin",
-        "juil",
-        "août",
-        "sept",
-        "oct",
-        "nov",
-        "déc",
-    ]
-
-
-class FrenchCanadianLocale(FrenchBaseLocale, Locale):
-    names = ["fr-ca"]
-
-    month_abbreviations = [
-        "",
-        "janv",
-        "févr",
-        "mars",
-        "avr",
-        "mai",
-        "juin",
-        "juill",
-        "août",
-        "sept",
-        "oct",
-        "nov",
-        "déc",
-    ]
-
-
-class GreekLocale(Locale):
-    names = ["el", "el-gr"]
-
-    past = "{0} π�ιν"
-    future = "σε {0}"
-    and_word = "και"
-
-    timeframes = {
-        "now": "τώ�α",
-        "second": "ένα δε�τε�ο",
-        "seconds": "{0} δευτε�όλεπτα",
-        "minute": "ένα λεπτό",
-        "minutes": "{0} λεπτά",
-        "hour": "μία ώ�α",
-        "hours": "{0} ώ�ες",
-        "day": "μία μέ�α",
-        "days": "{0} μέ�ες",
-        "week": "μία εβδομάδα",
-        "weeks": "{0} εβδομάδες",
-        "month": "ένα μήνα",
-        "months": "{0} μήνες",
-        "year": "ένα χ�όνο",
-        "years": "{0} χ�όνια",
-    }
-
-    month_names = [
-        "",
-        "Ιανουα�ίου",
-        "Φεβ�ουα�ίου",
-        "Μα�τίου",
-        "Απ�ιλίου",
-        "Μα�ου",
-        "Ιουνίου",
-        "Ιουλίου",
-        "Αυγο�στου",
-        "Σεπτεμβ�ίου",
-        "Οκτωβ�ίου",
-        "�οεμβ�ίου",
-        "Δεκεμβ�ίου",
-    ]
-    month_abbreviations = [
-        "",
-        "Ιαν",
-        "Φεβ",
-        "Μα�",
-        "Απ�",
-        "Μαϊ",
-        "Ιον",
-        "Ιολ",
-        "Αυγ",
-        "Σεπ",
-        "Οκτ",
-        "�οε",
-        "Δεκ",
-    ]
-
-    day_names = [
-        "",
-        "Δευτέ�α",
-        "Τ�ίτη",
-        "Τετά�τη",
-        "Πέμπτη",
-        "Πα�ασκευή",
-        "Σάββατο",
-        "Κυ�ιακή",
-    ]
-    day_abbreviations = ["", "Δευ", "Τ�ι", "Τετ", "Πεμ", "Πα�", "Σαβ", "Κυ�"]
-
-
-class JapaneseLocale(Locale):
-    names = ["ja", "ja-jp"]
-
-    past = "{0}�"
-    future = "{0}後"
-    and_word = ""
-
-    timeframes = {
-        "now": "�在",
-        "second": "1秒",
-        "seconds": "{0}秒",
-        "minute": "1分",
-        "minutes": "{0}分",
-        "hour": "1時間",
-        "hours": "{0}時間",
-        "day": "1æ—¥",
-        "days": "{0}æ—¥",
-        "week": "1週間",
-        "weeks": "{0}週間",
-        "month": "1ヶ月",
-        "months": "{0}ヶ月",
-        "year": "1å¹´",
-        "years": "{0}å¹´",
-    }
-
-    month_names = [
-        "",
-        "1月",
-        "2月",
-        "3月",
-        "4月",
-        "5月",
-        "6月",
-        "7月",
-        "8月",
-        "9月",
-        "10月",
-        "11月",
-        "12月",
-    ]
-    month_abbreviations = [
-        "",
-        " 1",
-        " 2",
-        " 3",
-        " 4",
-        " 5",
-        " 6",
-        " 7",
-        " 8",
-        " 9",
-        "10",
-        "11",
-        "12",
-    ]
-
-    day_names = ["", "月曜日", "�曜日", "水曜日", "木曜日", "金曜日", "土曜日", "日曜日"]
-    day_abbreviations = ["", "月", "�", "水", "木", "金", "土", "日"]
-
-
-class SwedishLocale(Locale):
-    names = ["sv", "sv-se"]
-
-    past = "för {0} sen"
-    future = "om {0}"
-    and_word = "och"
-
-    timeframes = {
-        "now": "just nu",
-        "second": "en sekund",
-        "seconds": "{0} sekunder",
-        "minute": "en minut",
-        "minutes": "{0} minuter",
-        "hour": "en timme",
-        "hours": "{0} timmar",
-        "day": "en dag",
-        "days": "{0} dagar",
-        "week": "en vecka",
-        "weeks": "{0} veckor",
-        "month": "en månad",
-        "months": "{0} månader",
-        "year": "ett år",
-        "years": "{0} år",
-    }
-
-    month_names = [
-        "",
-        "januari",
-        "februari",
-        "mars",
-        "april",
-        "maj",
-        "juni",
-        "juli",
-        "augusti",
-        "september",
-        "oktober",
-        "november",
-        "december",
-    ]
-    month_abbreviations = [
-        "",
-        "jan",
-        "feb",
-        "mar",
-        "apr",
-        "maj",
-        "jun",
-        "jul",
-        "aug",
-        "sep",
-        "okt",
-        "nov",
-        "dec",
-    ]
-
-    day_names = [
-        "",
-        "måndag",
-        "tisdag",
-        "onsdag",
-        "torsdag",
-        "fredag",
-        "lördag",
-        "söndag",
-    ]
-    day_abbreviations = ["", "mån", "tis", "ons", "tor", "fre", "lör", "sön"]
-
-
-class FinnishLocale(Locale):
-    names = ["fi", "fi-fi"]
-
-    # The finnish grammar is very complex, and its hard to convert
-    # 1-to-1 to something like English.
-
-    past = "{0} sitten"
-    future = "{0} kuluttua"
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[str, Mapping[str, str]]]] = {
-        "now": "juuri nyt",
-        "second": {"past": "sekunti", "future": "sekunnin"},
-        "seconds": {"past": "{0} sekuntia", "future": "{0} sekunnin"},
-        "minute": {"past": "minuutti", "future": "minuutin"},
-        "minutes": {"past": "{0} minuuttia", "future": "{0} minuutin"},
-        "hour": {"past": "tunti", "future": "tunnin"},
-        "hours": {"past": "{0} tuntia", "future": "{0} tunnin"},
-        "day": {"past": "päivä", "future": "päivän"},
-        "days": {"past": "{0} päivää", "future": "{0} päivän"},
-        "week": {"past": "viikko", "future": "viikon"},
-        "weeks": {"past": "{0} viikkoa", "future": "{0} viikon"},
-        "month": {"past": "kuukausi", "future": "kuukauden"},
-        "months": {"past": "{0} kuukautta", "future": "{0} kuukauden"},
-        "year": {"past": "vuosi", "future": "vuoden"},
-        "years": {"past": "{0} vuotta", "future": "{0} vuoden"},
-    }
-
-    # Months and days are lowercase in Finnish
-    month_names = [
-        "",
-        "tammikuu",
-        "helmikuu",
-        "maaliskuu",
-        "huhtikuu",
-        "toukokuu",
-        "kesäkuu",
-        "heinäkuu",
-        "elokuu",
-        "syyskuu",
-        "lokakuu",
-        "marraskuu",
-        "joulukuu",
-    ]
-
-    month_abbreviations = [
-        "",
-        "tammi",
-        "helmi",
-        "maalis",
-        "huhti",
-        "touko",
-        "kesä",
-        "heinä",
-        "elo",
-        "syys",
-        "loka",
-        "marras",
-        "joulu",
-    ]
-
-    day_names = [
-        "",
-        "maanantai",
-        "tiistai",
-        "keskiviikko",
-        "torstai",
-        "perjantai",
-        "lauantai",
-        "sunnuntai",
-    ]
-
-    day_abbreviations = ["", "ma", "ti", "ke", "to", "pe", "la", "su"]
-
-    def _format_timeframe(self, timeframe: TimeFrameLiteral, delta: int) -> str:
-        form = self.timeframes[timeframe]
-
-        if isinstance(form, Mapping):
-            if delta < 0:
-                form = form["past"]
-            else:
-                form = form["future"]
-
-        return form.format(abs(delta))
-
-    def _ordinal_number(self, n: int) -> str:
-        return f"{n}."
-
-
-class ChineseCNLocale(Locale):
-    names = ["zh", "zh-cn"]
-
-    past = "{0}�"
-    future = "{0}�"
-
-    timeframes = {
-        "now": "刚�",
-        "second": "1秒",
-        "seconds": "{0}秒",
-        "minute": "1分钟",
-        "minutes": "{0}分钟",
-        "hour": "1�时",
-        "hours": "{0}�时",
-        "day": "1天",
-        "days": "{0}天",
-        "week": "1周",
-        "weeks": "{0}周",
-        "month": "1个月",
-        "months": "{0}个月",
-        "year": "1å¹´",
-        "years": "{0}å¹´",
-    }
-
-    month_names = [
-        "",
-        "一月",
-        "二月",
-        "三月",
-        "四月",
-        "五月",
-        "六月",
-        "七月",
-        "八月",
-        "�月",
-        "�月",
-        "�一月",
-        "�二月",
-    ]
-    month_abbreviations = [
-        "",
-        " 1",
-        " 2",
-        " 3",
-        " 4",
-        " 5",
-        " 6",
-        " 7",
-        " 8",
-        " 9",
-        "10",
-        "11",
-        "12",
-    ]
-
-    day_names = ["", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期日"]
-    day_abbreviations = ["", "一", "二", "三", "四", "五", "六", "日"]
-
-
-class ChineseTWLocale(Locale):
-    names = ["zh-tw"]
-
-    past = "{0}�"
-    future = "{0}後"
-    and_word = "和"
-
-    timeframes = {
-        "now": "剛�",
-        "second": "1秒",
-        "seconds": "{0}秒",
-        "minute": "1分�",
-        "minutes": "{0}分�",
-        "hour": "1�時",
-        "hours": "{0}�時",
-        "day": "1天",
-        "days": "{0}天",
-        "week": "1週",
-        "weeks": "{0}週",
-        "month": "1個月",
-        "months": "{0}個月",
-        "year": "1å¹´",
-        "years": "{0}å¹´",
-    }
-
-    month_names = [
-        "",
-        "1月",
-        "2月",
-        "3月",
-        "4月",
-        "5月",
-        "6月",
-        "7月",
-        "8月",
-        "9月",
-        "10月",
-        "11月",
-        "12月",
-    ]
-    month_abbreviations = [
-        "",
-        " 1",
-        " 2",
-        " 3",
-        " 4",
-        " 5",
-        " 6",
-        " 7",
-        " 8",
-        " 9",
-        "10",
-        "11",
-        "12",
-    ]
-
-    day_names = ["", "週一", "週二", "週三", "週四", "週五", "週六", "週日"]
-    day_abbreviations = ["", "一", "二", "三", "四", "五", "六", "日"]
-
-
-class HongKongLocale(Locale):
-    names = ["zh-hk"]
-
-    past = "{0}�"
-    future = "{0}後"
-
-    timeframes = {
-        "now": "剛�",
-        "second": "1秒",
-        "seconds": "{0}秒",
-        "minute": "1分�",
-        "minutes": "{0}分�",
-        "hour": "1�時",
-        "hours": "{0}�時",
-        "day": "1天",
-        "days": "{0}天",
-        "week": "1星期",
-        "weeks": "{0}星期",
-        "month": "1個月",
-        "months": "{0}個月",
-        "year": "1å¹´",
-        "years": "{0}å¹´",
-    }
-
-    month_names = [
-        "",
-        "1月",
-        "2月",
-        "3月",
-        "4月",
-        "5月",
-        "6月",
-        "7月",
-        "8月",
-        "9月",
-        "10月",
-        "11月",
-        "12月",
-    ]
-    month_abbreviations = [
-        "",
-        " 1",
-        " 2",
-        " 3",
-        " 4",
-        " 5",
-        " 6",
-        " 7",
-        " 8",
-        " 9",
-        "10",
-        "11",
-        "12",
-    ]
-
-    day_names = ["", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期日"]
-    day_abbreviations = ["", "一", "二", "三", "四", "五", "六", "日"]
-
-
-class KoreanLocale(Locale):
-    names = ["ko", "ko-kr"]
-
-    past = "{0} ì „"
-    future = "{0} 후"
-
-    timeframes = {
-        "now": "지금",
-        "second": "1ì´ˆ",
-        "seconds": "{0}ì´ˆ",
-        "minute": "1분",
-        "minutes": "{0}분",
-        "hour": "한시간",
-        "hours": "{0}시간",
-        "day": "하루",
-        "days": "{0}�",
-        "week": "1주",
-        "weeks": "{0}주",
-        "month": "한달",
-        "months": "{0}개월",
-        "year": "1ë…„",
-        "years": "{0}ë…„",
-    }
-
-    special_dayframes = {
-        -3: "그�제",
-        -2: "그제",
-        -1: "어제",
-        1: "내�",
-        2: "모레",
-        3: "글피",
-        4: "그글피",
-    }
-
-    special_yearframes = {-2: "제작년", -1: "작년", 1: "내년", 2: "내후년"}
-
-    month_names = [
-        "",
-        "1ì›”",
-        "2ì›”",
-        "3ì›”",
-        "4ì›”",
-        "5ì›”",
-        "6ì›”",
-        "7ì›”",
-        "8ì›”",
-        "9ì›”",
-        "10ì›”",
-        "11ì›”",
-        "12ì›”",
-    ]
-    month_abbreviations = [
-        "",
-        " 1",
-        " 2",
-        " 3",
-        " 4",
-        " 5",
-        " 6",
-        " 7",
-        " 8",
-        " 9",
-        "10",
-        "11",
-        "12",
-    ]
-
-    day_names = ["", "월요�", "화요�", "수요�", "목요�", "금요�", "토요�", "�요�"]
-    day_abbreviations = ["", "월", "화", "수", "목", "금", "토", "�"]
-
-    def _ordinal_number(self, n: int) -> str:
-        ordinals = ["0", "첫", "�", "세", "네", "다섯", "여섯", "�곱", "여�", "아홉", "열"]
-        if n < len(ordinals):
-            return f"{ordinals[n]}번째"
-        return f"{n}번째"
-
-    def _format_relative(
-        self,
-        humanized: str,
-        timeframe: TimeFrameLiteral,
-        delta: Union[float, int],
-    ) -> str:
-        if timeframe in ("day", "days"):
-            special = self.special_dayframes.get(int(delta))
-            if special:
-                return special
-        elif timeframe in ("year", "years"):
-            special = self.special_yearframes.get(int(delta))
-            if special:
-                return special
-
-        return super()._format_relative(humanized, timeframe, delta)
-
-
-# derived locale types & implementations.
-class DutchLocale(Locale):
-    names = ["nl", "nl-nl"]
-
-    past = "{0} geleden"
-    future = "over {0}"
-
-    timeframes = {
-        "now": "nu",
-        "second": "een seconde",
-        "seconds": "{0} seconden",
-        "minute": "een minuut",
-        "minutes": "{0} minuten",
-        "hour": "een uur",
-        "hours": "{0} uur",
-        "day": "een dag",
-        "days": "{0} dagen",
-        "week": "een week",
-        "weeks": "{0} weken",
-        "month": "een maand",
-        "months": "{0} maanden",
-        "year": "een jaar",
-        "years": "{0} jaar",
-    }
-
-    # In Dutch names of months and days are not starting with a capital letter
-    # like in the English language.
-    month_names = [
-        "",
-        "januari",
-        "februari",
-        "maart",
-        "april",
-        "mei",
-        "juni",
-        "juli",
-        "augustus",
-        "september",
-        "oktober",
-        "november",
-        "december",
-    ]
-    month_abbreviations = [
-        "",
-        "jan",
-        "feb",
-        "mrt",
-        "apr",
-        "mei",
-        "jun",
-        "jul",
-        "aug",
-        "sep",
-        "okt",
-        "nov",
-        "dec",
-    ]
-
-    day_names = [
-        "",
-        "maandag",
-        "dinsdag",
-        "woensdag",
-        "donderdag",
-        "vrijdag",
-        "zaterdag",
-        "zondag",
-    ]
-    day_abbreviations = ["", "ma", "di", "wo", "do", "vr", "za", "zo"]
-
-
-class SlavicBaseLocale(Locale):
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[str, Mapping[str, str]]]]
-
-    def _format_timeframe(self, timeframe: TimeFrameLiteral, delta: int) -> str:
-        form = self.timeframes[timeframe]
-        delta = abs(delta)
-
-        if isinstance(form, Mapping):
-            if delta % 10 == 1 and delta % 100 != 11:
-                form = form["singular"]
-            elif 2 <= delta % 10 <= 4 and (delta % 100 < 10 or delta % 100 >= 20):
-                form = form["dual"]
-            else:
-                form = form["plural"]
-
-        return form.format(delta)
-
-
-class BelarusianLocale(SlavicBaseLocale):
-    names = ["be", "be-by"]
-
-    past = "{0} таму"
-    future = "праз {0}"
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[str, Mapping[str, str]]]] = {
-        "now": "зараз",
-        "second": "�екунду",
-        "seconds": "{0} некалькі �екунд",
-        "minute": "хвіліну",
-        "minutes": {
-            "singular": "{0} хвіліну",
-            "dual": "{0} хвіліны",
-            "plural": "{0} хвілін",
-        },
-        "hour": "гадзіну",
-        "hours": {
-            "singular": "{0} гадзіну",
-            "dual": "{0} гадзіны",
-            "plural": "{0} гадзін",
-        },
-        "day": "дзень",
-        "days": {"singular": "{0} дзень", "dual": "{0} дні", "plural": "{0} дзён"},
-        "month": "ме��ц",
-        "months": {
-            "singular": "{0} ме��ц",
-            "dual": "{0} ме��цы",
-            "plural": "{0} ме��цаў",
-        },
-        "year": "год",
-        "years": {"singular": "{0} год", "dual": "{0} гады", "plural": "{0} гадоў"},
-    }
-
-    month_names = [
-        "",
-        "�тудзен�",
-        "лютага",
-        "�акавіка",
-        "кра�авіка",
-        "траўн�",
-        "ч�рвен�",
-        "ліпен�",
-        "жніўн�",
-        "вера�н�",
-        "ка�трычніка",
-        "лі�тапада",
-        "�нежн�",
-    ]
-    month_abbreviations = [
-        "",
-        "�туд",
-        "лют",
-        "�ак",
-        "кра�",
-        "трав",
-        "ч�рв",
-        "ліп",
-        "жнів",
-        "вер",
-        "ка�т",
-        "лі�т",
-        "�неж",
-    ]
-
-    day_names = [
-        "",
-        "пан�дзелак",
-        "аўторак",
-        "�ерада",
-        "чацвер",
-        "п�тніца",
-        "�убота",
-        "н�дзел�",
-    ]
-    day_abbreviations = ["", "пн", "ат", "�р", "чц", "пт", "�б", "нд"]
-
-
-class PolishLocale(SlavicBaseLocale):
-    names = ["pl", "pl-pl"]
-
-    past = "{0} temu"
-    future = "za {0}"
-
-    # The nouns should be in genitive case (Polish: "dopełniacz")
-    # in order to correctly form `past` & `future` expressions.
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[str, Mapping[str, str]]]] = {
-        "now": "teraz",
-        "second": "sekundÄ™",
-        "seconds": {
-            "singular": "{0} sekund",
-            "dual": "{0} sekundy",
-            "plural": "{0} sekund",
-        },
-        "minute": "minutÄ™",
-        "minutes": {
-            "singular": "{0} minut",
-            "dual": "{0} minuty",
-            "plural": "{0} minut",
-        },
-        "hour": "godzinÄ™",
-        "hours": {
-            "singular": "{0} godzin",
-            "dual": "{0} godziny",
-            "plural": "{0} godzin",
-        },
-        "day": "dzień",
-        "days": "{0} dni",
-        "week": "tydzień",
-        "weeks": {
-            "singular": "{0} tygodni",
-            "dual": "{0} tygodnie",
-            "plural": "{0} tygodni",
-        },
-        "month": "miesiÄ…c",
-        "months": {
-            "singular": "{0} miesięcy",
-            "dual": "{0} miesiÄ…ce",
-            "plural": "{0} miesięcy",
-        },
-        "year": "rok",
-        "years": {"singular": "{0} lat", "dual": "{0} lata", "plural": "{0} lat"},
-    }
-
-    month_names = [
-        "",
-        "styczeń",
-        "luty",
-        "marzec",
-        "kwiecień",
-        "maj",
-        "czerwiec",
-        "lipiec",
-        "sierpień",
-        "wrzesień",
-        "październik",
-        "listopad",
-        "grudzień",
-    ]
-    month_abbreviations = [
-        "",
-        "sty",
-        "lut",
-        "mar",
-        "kwi",
-        "maj",
-        "cze",
-        "lip",
-        "sie",
-        "wrz",
-        "paź",
-        "lis",
-        "gru",
-    ]
-
-    day_names = [
-        "",
-        "poniedziałek",
-        "wtorek",
-        "środa",
-        "czwartek",
-        "piÄ…tek",
-        "sobota",
-        "niedziela",
-    ]
-    day_abbreviations = ["", "Pn", "Wt", "Åšr", "Czw", "Pt", "So", "Nd"]
-
-
-class RussianLocale(SlavicBaseLocale):
-    names = ["ru", "ru-ru"]
-
-    past = "{0} назад"
-    future = "через {0}"
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[str, Mapping[str, str]]]] = {
-        "now": "�ейча�",
-        "second": "�екунда",
-        "seconds": {
-            "singular": "{0} �екунду",
-            "dual": "{0} �екунды",
-            "plural": "{0} �екунд",
-        },
-        "minute": "минуту",
-        "minutes": {
-            "singular": "{0} минуту",
-            "dual": "{0} минуты",
-            "plural": "{0} минут",
-        },
-        "hour": "ча�",
-        "hours": {"singular": "{0} ча�", "dual": "{0} ча�а", "plural": "{0} ча�ов"},
-        "day": "день",
-        "days": {"singular": "{0} день", "dual": "{0} дн�", "plural": "{0} дней"},
-        "week": "неделю",
-        "weeks": {
-            "singular": "{0} неделю",
-            "dual": "{0} недели",
-            "plural": "{0} недель",
-        },
-        "month": "ме��ц",
-        "months": {
-            "singular": "{0} ме��ц",
-            "dual": "{0} ме��ца",
-            "plural": "{0} ме��цев",
-        },
-        "quarter": "квартал",
-        "quarters": {
-            "singular": "{0} квартал",
-            "dual": "{0} квартала",
-            "plural": "{0} кварталов",
-        },
-        "year": "год",
-        "years": {"singular": "{0} год", "dual": "{0} года", "plural": "{0} лет"},
-    }
-
-    month_names = [
-        "",
-        "�нвар�",
-        "феврал�",
-        "марта",
-        "апрел�",
-        "ма�",
-        "июн�",
-        "июл�",
-        "авгу�та",
-        "�ент�бр�",
-        "окт�бр�",
-        "но�бр�",
-        "декабр�",
-    ]
-    month_abbreviations = [
-        "",
-        "�нв",
-        "фев",
-        "мар",
-        "апр",
-        "май",
-        "июн",
-        "июл",
-        "авг",
-        "�ен",
-        "окт",
-        "но�",
-        "дек",
-    ]
-
-    day_names = [
-        "",
-        "понедельник",
-        "вторник",
-        "�реда",
-        "четверг",
-        "п�тница",
-        "�уббота",
-        "во�кре�енье",
-    ]
-    day_abbreviations = ["", "пн", "вт", "�р", "чт", "пт", "�б", "в�"]
-
-
-class AfrikaansLocale(Locale):
-    names = ["af", "af-nl"]
-
-    past = "{0} gelede"
-    future = "in {0}"
-
-    timeframes = {
-        "now": "nou",
-        "second": "n sekonde",
-        "seconds": "{0} sekondes",
-        "minute": "minuut",
-        "minutes": "{0} minute",
-        "hour": "uur",
-        "hours": "{0} ure",
-        "day": "een dag",
-        "days": "{0} dae",
-        "month": "een maand",
-        "months": "{0} maande",
-        "year": "een jaar",
-        "years": "{0} jaar",
-    }
-
-    month_names = [
-        "",
-        "Januarie",
-        "Februarie",
-        "Maart",
-        "April",
-        "Mei",
-        "Junie",
-        "Julie",
-        "Augustus",
-        "September",
-        "Oktober",
-        "November",
-        "Desember",
-    ]
-    month_abbreviations = [
-        "",
-        "Jan",
-        "Feb",
-        "Mrt",
-        "Apr",
-        "Mei",
-        "Jun",
-        "Jul",
-        "Aug",
-        "Sep",
-        "Okt",
-        "Nov",
-        "Des",
-    ]
-
-    day_names = [
-        "",
-        "Maandag",
-        "Dinsdag",
-        "Woensdag",
-        "Donderdag",
-        "Vrydag",
-        "Saterdag",
-        "Sondag",
-    ]
-    day_abbreviations = ["", "Ma", "Di", "Wo", "Do", "Vr", "Za", "So"]
-
-
-class BulgarianLocale(SlavicBaseLocale):
-    names = ["bg", "bg-bg"]
-
-    past = "{0} назад"
-    future = "напред {0}"
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[str, Mapping[str, str]]]] = {
-        "now": "�ега",
-        "second": "�екунда",
-        "seconds": "{0} н�колко �екунди",
-        "minute": "минута",
-        "minutes": {
-            "singular": "{0} минута",
-            "dual": "{0} минути",
-            "plural": "{0} минути",
-        },
-        "hour": "ча�",
-        "hours": {"singular": "{0} ча�", "dual": "{0} ча�а", "plural": "{0} ча�а"},
-        "day": "ден",
-        "days": {"singular": "{0} ден", "dual": "{0} дни", "plural": "{0} дни"},
-        "month": "ме�ец",
-        "months": {
-            "singular": "{0} ме�ец",
-            "dual": "{0} ме�еца",
-            "plural": "{0} ме�еца",
-        },
-        "year": "година",
-        "years": {
-            "singular": "{0} година",
-            "dual": "{0} години",
-            "plural": "{0} години",
-        },
-    }
-
-    month_names = [
-        "",
-        "�нуари",
-        "февруари",
-        "март",
-        "април",
-        "май",
-        "юни",
-        "юли",
-        "авгу�т",
-        "�ептември",
-        "октомври",
-        "ноември",
-        "декември",
-    ]
-    month_abbreviations = [
-        "",
-        "�н",
-        "февр",
-        "март",
-        "апр",
-        "май",
-        "юни",
-        "юли",
-        "авг",
-        "�епт",
-        "окт",
-        "ноем",
-        "дек",
-    ]
-
-    day_names = [
-        "",
-        "понеделник",
-        "вторник",
-        "�р�да",
-        "четвъртък",
-        "петък",
-        "�ъбота",
-        "недел�",
-    ]
-    day_abbreviations = ["", "пон", "вт", "�р", "четв", "пет", "�ъб", "нед"]
-
-
-class UkrainianLocale(SlavicBaseLocale):
-    names = ["ua", "uk", "uk-ua"]
-
-    past = "{0} тому"
-    future = "за {0}"
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[str, Mapping[str, str]]]] = {
-        "now": "зараз",
-        "second": "�екунда",
-        "seconds": "{0} кілька �екунд",
-        "minute": "хвилину",
-        "minutes": {
-            "singular": "{0} хвилину",
-            "dual": "{0} хвилини",
-            "plural": "{0} хвилин",
-        },
-        "hour": "годину",
-        "hours": {
-            "singular": "{0} годину",
-            "dual": "{0} години",
-            "plural": "{0} годин",
-        },
-        "day": "день",
-        "days": {"singular": "{0} день", "dual": "{0} дні", "plural": "{0} днів"},
-        "month": "мі��ць",
-        "months": {
-            "singular": "{0} мі��ць",
-            "dual": "{0} мі��ці",
-            "plural": "{0} мі��ців",
-        },
-        "year": "рік",
-        "years": {"singular": "{0} рік", "dual": "{0} роки", "plural": "{0} років"},
-    }
-
-    month_names = [
-        "",
-        "�ічн�",
-        "лютого",
-        "березн�",
-        "квітн�",
-        "травн�",
-        "червн�",
-        "липн�",
-        "�ерпн�",
-        "вере�н�",
-        "жовтн�",
-        "ли�топада",
-        "грудн�",
-    ]
-    month_abbreviations = [
-        "",
-        "�іч",
-        "лют",
-        "бер",
-        "квіт",
-        "трав",
-        "черв",
-        "лип",
-        "�ерп",
-        "вер",
-        "жовт",
-        "ли�т",
-        "груд",
-    ]
-
-    day_names = [
-        "",
-        "понеділок",
-        "вівторок",
-        "�ереда",
-        "четвер",
-        "п’�тниц�",
-        "�убота",
-        "неділ�",
-    ]
-    day_abbreviations = ["", "пн", "вт", "�р", "чт", "пт", "�б", "нд"]
-
-
-class MacedonianLocale(SlavicBaseLocale):
-    names = ["mk", "mk-mk"]
-
-    past = "пред {0}"
-    future = "за {0}"
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[str, Mapping[str, str]]]] = {
-        "now": "�ега",
-        "second": "една �екунда",
-        "seconds": {
-            "singular": "{0} �екунда",
-            "dual": "{0} �екунди",
-            "plural": "{0} �екунди",
-        },
-        "minute": "една минута",
-        "minutes": {
-            "singular": "{0} минута",
-            "dual": "{0} минути",
-            "plural": "{0} минути",
-        },
-        "hour": "еден �аат",
-        "hours": {"singular": "{0} �аат", "dual": "{0} �аати", "plural": "{0} �аати"},
-        "day": "еден ден",
-        "days": {"singular": "{0} ден", "dual": "{0} дена", "plural": "{0} дена"},
-        "week": "една недела",
-        "weeks": {
-            "singular": "{0} недела",
-            "dual": "{0} недели",
-            "plural": "{0} недели",
-        },
-        "month": "еден ме�ец",
-        "months": {
-            "singular": "{0} ме�ец",
-            "dual": "{0} ме�еци",
-            "plural": "{0} ме�еци",
-        },
-        "year": "една година",
-        "years": {
-            "singular": "{0} година",
-            "dual": "{0} години",
-            "plural": "{0} години",
-        },
-    }
-
-    meridians = {"am": "дп", "pm": "пп", "AM": "претпладне", "PM": "попладне"}
-
-    month_names = [
-        "",
-        "Јануари",
-        "Февруари",
-        "Март",
-        "�прил",
-        "Мај",
-        "Јуни",
-        "Јули",
-        "�вгу�т",
-        "Септември",
-        "Октомври",
-        "�оември",
-        "Декември",
-    ]
-    month_abbreviations = [
-        "",
-        "Јан",
-        "Фев",
-        "Мар",
-        "�пр",
-        "Мај",
-        "Јун",
-        "Јул",
-        "�вг",
-        "Септ",
-        "Окт",
-        "�оем",
-        "Декем",
-    ]
-
-    day_names = [
-        "",
-        "Понеделник",
-        "Вторник",
-        "Среда",
-        "Четврток",
-        "Петок",
-        "Сабота",
-        "�едела",
-    ]
-    day_abbreviations = [
-        "",
-        "Пон",
-        "Ð’Ñ‚",
-        "Сре",
-        "Чет",
-        "Пет",
-        "Саб",
-        "�ед",
-    ]
-
-
-class GermanBaseLocale(Locale):
-    past = "vor {0}"
-    future = "in {0}"
-    and_word = "und"
-
-    timeframes: ClassVar[Dict[TimeFrameLiteral, str]] = {
-        "now": "gerade eben",
-        "second": "einer Sekunde",
-        "seconds": "{0} Sekunden",
-        "minute": "einer Minute",
-        "minutes": "{0} Minuten",
-        "hour": "einer Stunde",
-        "hours": "{0} Stunden",
-        "day": "einem Tag",
-        "days": "{0} Tagen",
-        "week": "einer Woche",
-        "weeks": "{0} Wochen",
-        "month": "einem Monat",
-        "months": "{0} Monaten",
-        "year": "einem Jahr",
-        "years": "{0} Jahren",
-    }
-
-    timeframes_only_distance = timeframes.copy()
-    timeframes_only_distance["second"] = "eine Sekunde"
-    timeframes_only_distance["minute"] = "eine Minute"
-    timeframes_only_distance["hour"] = "eine Stunde"
-    timeframes_only_distance["day"] = "ein Tag"
-    timeframes_only_distance["days"] = "{0} Tage"
-    timeframes_only_distance["week"] = "eine Woche"
-    timeframes_only_distance["month"] = "ein Monat"
-    timeframes_only_distance["months"] = "{0} Monate"
-    timeframes_only_distance["year"] = "ein Jahr"
-    timeframes_only_distance["years"] = "{0} Jahre"
-
-    month_names = [
-        "",
-        "Januar",
-        "Februar",
-        "März",
-        "April",
-        "Mai",
-        "Juni",
-        "Juli",
-        "August",
-        "September",
-        "Oktober",
-        "November",
-        "Dezember",
-    ]
-
-    month_abbreviations = [
-        "",
-        "Jan",
-        "Feb",
-        "Mär",
-        "Apr",
-        "Mai",
-        "Jun",
-        "Jul",
-        "Aug",
-        "Sep",
-        "Okt",
-        "Nov",
-        "Dez",
-    ]
-
-    day_names = [
-        "",
-        "Montag",
-        "Dienstag",
-        "Mittwoch",
-        "Donnerstag",
-        "Freitag",
-        "Samstag",
-        "Sonntag",
-    ]
-
-    day_abbreviations = ["", "Mo", "Di", "Mi", "Do", "Fr", "Sa", "So"]
-
-    def _ordinal_number(self, n: int) -> str:
-        return f"{n}."
-
-    def describe(
-        self,
-        timeframe: TimeFrameLiteral,
-        delta: Union[int, float] = 0,
-        only_distance: bool = False,
-    ) -> str:
-        """Describes a delta within a timeframe in plain language.
-
-        :param timeframe: a string representing a timeframe.
-        :param delta: a quantity representing a delta in a timeframe.
-        :param only_distance: return only distance eg: "11 seconds" without "in" or "ago" keywords
-        """
-
-        if not only_distance:
-            return super().describe(timeframe, delta, only_distance)
-
-        # German uses a different case without 'in' or 'ago'
-        humanized: str = self.timeframes_only_distance[timeframe].format(
-            trunc(abs(delta))
-        )
-
-        return humanized
-
-
-class GermanLocale(GermanBaseLocale, Locale):
-    names = ["de", "de-de"]
-
-
-class SwissLocale(GermanBaseLocale, Locale):
-    names = ["de-ch"]
-
-
-class AustrianLocale(GermanBaseLocale, Locale):
-    names = ["de-at"]
-
-    month_names = [
-        "",
-        "Jänner",
-        "Februar",
-        "März",
-        "April",
-        "Mai",
-        "Juni",
-        "Juli",
-        "August",
-        "September",
-        "Oktober",
-        "November",
-        "Dezember",
-    ]
-
-
-class NorwegianLocale(Locale):
-    names = ["nb", "nb-no"]
-
-    past = "for {0} siden"
-    future = "om {0}"
-
-    timeframes = {
-        "now": "nå nettopp",
-        "second": "ett sekund",
-        "seconds": "{0} sekunder",
-        "minute": "ett minutt",
-        "minutes": "{0} minutter",
-        "hour": "en time",
-        "hours": "{0} timer",
-        "day": "en dag",
-        "days": "{0} dager",
-        "week": "en uke",
-        "weeks": "{0} uker",
-        "month": "en måned",
-        "months": "{0} måneder",
-        "year": "ett år",
-        "years": "{0} år",
-    }
-
-    month_names = [
-        "",
-        "januar",
-        "februar",
-        "mars",
-        "april",
-        "mai",
-        "juni",
-        "juli",
-        "august",
-        "september",
-        "oktober",
-        "november",
-        "desember",
-    ]
-    month_abbreviations = [
-        "",
-        "jan",
-        "feb",
-        "mar",
-        "apr",
-        "mai",
-        "jun",
-        "jul",
-        "aug",
-        "sep",
-        "okt",
-        "nov",
-        "des",
-    ]
-
-    day_names = [
-        "",
-        "mandag",
-        "tirsdag",
-        "onsdag",
-        "torsdag",
-        "fredag",
-        "lørdag",
-        "søndag",
-    ]
-    day_abbreviations = ["", "ma", "ti", "on", "to", "fr", "lø", "sø"]
-
-    def _ordinal_number(self, n: int) -> str:
-        return f"{n}."
-
-
-class NewNorwegianLocale(Locale):
-    names = ["nn", "nn-no"]
-
-    past = "for {0} sidan"
-    future = "om {0}"
-
-    timeframes = {
-        "now": "no nettopp",
-        "second": "eitt sekund",
-        "seconds": "{0} sekund",
-        "minute": "eitt minutt",
-        "minutes": "{0} minutt",
-        "hour": "ein time",
-        "hours": "{0} timar",
-        "day": "ein dag",
-        "days": "{0} dagar",
-        "week": "ei veke",
-        "weeks": "{0} veker",
-        "month": "ein månad",
-        "months": "{0} månader",
-        "year": "eitt år",
-        "years": "{0} år",
-    }
-
-    month_names = [
-        "",
-        "januar",
-        "februar",
-        "mars",
-        "april",
-        "mai",
-        "juni",
-        "juli",
-        "august",
-        "september",
-        "oktober",
-        "november",
-        "desember",
-    ]
-    month_abbreviations = [
-        "",
-        "jan",
-        "feb",
-        "mar",
-        "apr",
-        "mai",
-        "jun",
-        "jul",
-        "aug",
-        "sep",
-        "okt",
-        "nov",
-        "des",
-    ]
-
-    day_names = [
-        "",
-        "måndag",
-        "tysdag",
-        "onsdag",
-        "torsdag",
-        "fredag",
-        "laurdag",
-        "sundag",
-    ]
-    day_abbreviations = ["", "må", "ty", "on", "to", "fr", "la", "su"]
-
-    def _ordinal_number(self, n: int) -> str:
-        return f"{n}."
-
-
-class PortugueseLocale(Locale):
-    names = ["pt", "pt-pt"]
-
-    past = "há {0}"
-    future = "em {0}"
-    and_word = "e"
-
-    timeframes = {
-        "now": "agora",
-        "second": "um segundo",
-        "seconds": "{0} segundos",
-        "minute": "um minuto",
-        "minutes": "{0} minutos",
-        "hour": "uma hora",
-        "hours": "{0} horas",
-        "day": "um dia",
-        "days": "{0} dias",
-        "week": "uma semana",
-        "weeks": "{0} semanas",
-        "month": "um mês",
-        "months": "{0} meses",
-        "year": "um ano",
-        "years": "{0} anos",
-    }
-
-    month_names = [
-        "",
-        "Janeiro",
-        "Fevereiro",
-        "Março",
-        "Abril",
-        "Maio",
-        "Junho",
-        "Julho",
-        "Agosto",
-        "Setembro",
-        "Outubro",
-        "Novembro",
-        "Dezembro",
-    ]
-    month_abbreviations = [
-        "",
-        "Jan",
-        "Fev",
-        "Mar",
-        "Abr",
-        "Mai",
-        "Jun",
-        "Jul",
-        "Ago",
-        "Set",
-        "Out",
-        "Nov",
-        "Dez",
-    ]
-
-    day_names = [
-        "",
-        "Segunda-feira",
-        "Terça-feira",
-        "Quarta-feira",
-        "Quinta-feira",
-        "Sexta-feira",
-        "Sábado",
-        "Domingo",
-    ]
-    day_abbreviations = ["", "Seg", "Ter", "Qua", "Qui", "Sex", "Sab", "Dom"]
-
-
-class BrazilianPortugueseLocale(PortugueseLocale):
-    names = ["pt-br"]
-
-    past = "faz {0}"
-
-
-class TagalogLocale(Locale):
-    names = ["tl", "tl-ph"]
-
-    past = "nakaraang {0}"
-    future = "{0} mula ngayon"
-
-    timeframes = {
-        "now": "ngayon lang",
-        "second": "isang segundo",
-        "seconds": "{0} segundo",
-        "minute": "isang minuto",
-        "minutes": "{0} minuto",
-        "hour": "isang oras",
-        "hours": "{0} oras",
-        "day": "isang araw",
-        "days": "{0} araw",
-        "week": "isang linggo",
-        "weeks": "{0} linggo",
-        "month": "isang buwan",
-        "months": "{0} buwan",
-        "year": "isang taon",
-        "years": "{0} taon",
-    }
-
-    month_names = [
-        "",
-        "Enero",
-        "Pebrero",
-        "Marso",
-        "Abril",
-        "Mayo",
-        "Hunyo",
-        "Hulyo",
-        "Agosto",
-        "Setyembre",
-        "Oktubre",
-        "Nobyembre",
-        "Disyembre",
-    ]
-    month_abbreviations = [
-        "",
-        "Ene",
-        "Peb",
-        "Mar",
-        "Abr",
-        "May",
-        "Hun",
-        "Hul",
-        "Ago",
-        "Set",
-        "Okt",
-        "Nob",
-        "Dis",
-    ]
-
-    day_names = [
-        "",
-        "Lunes",
-        "Martes",
-        "Miyerkules",
-        "Huwebes",
-        "Biyernes",
-        "Sabado",
-        "Linggo",
-    ]
-    day_abbreviations = ["", "Lun", "Mar", "Miy", "Huw", "Biy", "Sab", "Lin"]
-
-    meridians = {"am": "nu", "pm": "nh", "AM": "ng umaga", "PM": "ng hapon"}
-
-    def _ordinal_number(self, n: int) -> str:
-        return f"ika-{n}"
-
-
-class VietnameseLocale(Locale):
-    names = ["vi", "vi-vn"]
-
-    past = "{0} trÆ°á»›c"
-    future = "{0} nữa"
-
-    timeframes = {
-        "now": "hiện tại",
-        "second": "một giây",
-        "seconds": "{0} giây",
-        "minute": "một phút",
-        "minutes": "{0} phút",
-        "hour": "một gi�",
-        "hours": "{0} gi�",
-        "day": "một ngày",
-        "days": "{0} ngày",
-        "week": "một tuần",
-        "weeks": "{0} tuần",
-        "month": "một tháng",
-        "months": "{0} tháng",
-        "year": "một năm",
-        "years": "{0} năm",
-    }
-
-    month_names = [
-        "",
-        "Tháng Một",
-        "Tháng Hai",
-        "Tháng Ba",
-        "Tháng Tư",
-        "Tháng Năm",
-        "Tháng Sáu",
-        "Tháng Bảy",
-        "Tháng Tám",
-        "Tháng Chín",
-        "Tháng Mư�i",
-        "Tháng Mư�i Một",
-        "Tháng Mư�i Hai",
-    ]
-    month_abbreviations = [
-        "",
-        "Tháng 1",
-        "Tháng 2",
-        "Tháng 3",
-        "Tháng 4",
-        "Tháng 5",
-        "Tháng 6",
-        "Tháng 7",
-        "Tháng 8",
-        "Tháng 9",
-        "Tháng 10",
-        "Tháng 11",
-        "Tháng 12",
-    ]
-
-    day_names = [
-        "",
-        "Thứ Hai",
-        "Thứ Ba",
-        "Thứ Tư",
-        "Thứ Năm",
-        "Thứ Sáu",
-        "Thứ Bảy",
-        "Chủ Nhật",
-    ]
-    day_abbreviations = ["", "Thứ 2", "Thứ 3", "Thứ 4", "Thứ 5", "Thứ 6", "Thứ 7", "CN"]
-
-
-class TurkishLocale(Locale):
-    names = ["tr", "tr-tr"]
-
-    past = "{0} önce"
-    future = "{0} sonra"
-    and_word = "ve"
-
-    timeframes = {
-        "now": "ÅŸimdi",
-        "second": "bir saniye",
-        "seconds": "{0} saniye",
-        "minute": "bir dakika",
-        "minutes": "{0} dakika",
-        "hour": "bir saat",
-        "hours": "{0} saat",
-        "day": "bir gün",
-        "days": "{0} gün",
-        "week": "bir hafta",
-        "weeks": "{0} hafta",
-        "month": "bir ay",
-        "months": "{0} ay",
-        "year": "bir yıl",
-        "years": "{0} yıl",
-    }
-
-    meridians = {"am": "öö", "pm": "ös", "AM": "ÖÖ", "PM": "ÖS"}
-
-    month_names = [
-        "",
-        "Ocak",
-        "Åžubat",
-        "Mart",
-        "Nisan",
-        "Mayıs",
-        "Haziran",
-        "Temmuz",
-        "AÄŸustos",
-        "Eylül",
-        "Ekim",
-        "Kasım",
-        "Aralık",
-    ]
-    month_abbreviations = [
-        "",
-        "Oca",
-        "Åžub",
-        "Mar",
-        "Nis",
-        "May",
-        "Haz",
-        "Tem",
-        "AÄŸu",
-        "Eyl",
-        "Eki",
-        "Kas",
-        "Ara",
-    ]
-
-    day_names = [
-        "",
-        "Pazartesi",
-        "Salı",
-        "Çarşamba",
-        "PerÅŸembe",
-        "Cuma",
-        "Cumartesi",
-        "Pazar",
-    ]
-    day_abbreviations = ["", "Pzt", "Sal", "Çar", "Per", "Cum", "Cmt", "Paz"]
-
-
-class AzerbaijaniLocale(Locale):
-    names = ["az", "az-az"]
-
-    past = "{0} əvvəl"
-    future = "{0} sonra"
-
-    timeframes = {
-        "now": "indi",
-        "second": "bir saniyÉ™",
-        "seconds": "{0} saniyÉ™",
-        "minute": "bir dəqiqə",
-        "minutes": "{0} dəqiqə",
-        "hour": "bir saat",
-        "hours": "{0} saat",
-        "day": "bir gün",
-        "days": "{0} gün",
-        "week": "bir həftə",
-        "weeks": "{0} həftə",
-        "month": "bir ay",
-        "months": "{0} ay",
-        "year": "bir il",
-        "years": "{0} il",
-    }
-
-    month_names = [
-        "",
-        "Yanvar",
-        "Fevral",
-        "Mart",
-        "Aprel",
-        "May",
-        "Ä°yun",
-        "Ä°yul",
-        "Avqust",
-        "Sentyabr",
-        "Oktyabr",
-        "Noyabr",
-        "Dekabr",
-    ]
-    month_abbreviations = [
-        "",
-        "Yan",
-        "Fev",
-        "Mar",
-        "Apr",
-        "May",
-        "Ä°yn",
-        "Ä°yl",
-        "Avq",
-        "Sen",
-        "Okt",
-        "Noy",
-        "Dek",
-    ]
-
-    day_names = [
-        "",
-        "Bazar ertəsi",
-        "Çərşənbə axşamı",
-        "Çərşənbə",
-        "Cümə axşamı",
-        "Cümə",
-        "Şənbə",
-        "Bazar",
-    ]
-    day_abbreviations = ["", "Ber", "Çax", "Çər", "Cax", "Cüm", "Şnb", "Bzr"]
-
-
-class ArabicLocale(Locale):
-    names = [
-        "ar",
-        "ar-ae",
-        "ar-bh",
-        "ar-dj",
-        "ar-eg",
-        "ar-eh",
-        "ar-er",
-        "ar-km",
-        "ar-kw",
-        "ar-ly",
-        "ar-om",
-        "ar-qa",
-        "ar-sa",
-        "ar-sd",
-        "ar-so",
-        "ar-ss",
-        "ar-td",
-        "ar-ye",
-    ]
-
-    past = "منذ {0}"
-    future = "خلال {0}"
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[str, Mapping[str, str]]]] = {
-        "now": "الآن",
-        "second": "ثانية",
-        "seconds": {"2": "ثانيتين", "ten": "{0} ثوان", "higher": "{0} ثانية"},
-        "minute": "دقيقة",
-        "minutes": {"2": "دقيقتين", "ten": "{0} دقائق", "higher": "{0} دقيقة"},
-        "hour": "ساعة",
-        "hours": {"2": "ساعتين", "ten": "{0} ساعات", "higher": "{0} ساعة"},
-        "day": "يوم",
-        "days": {"2": "يومين", "ten": "{0} أيام", "higher": "{0} يوم"},
-        "week": "اسبوع",
-        "weeks": {"2": "اسبوعين", "ten": "{0} أسابيع", "higher": "{0} اسبوع"},
-        "month": "شهر",
-        "months": {"2": "شهرين", "ten": "{0} أشهر", "higher": "{0} شهر"},
-        "year": "سنة",
-        "years": {"2": "سنتين", "ten": "{0} سنوات", "higher": "{0} سنة"},
-    }
-
-    month_names = [
-        "",
-        "يناير",
-        "�براير",
-        "مارس",
-        "أبريل",
-        "مايو",
-        "يونيو",
-        "يوليو",
-        "أغسطس",
-        "سبتمبر",
-        "أكتوبر",
-        "نو�مبر",
-        "ديسمبر",
-    ]
-    month_abbreviations = [
-        "",
-        "يناير",
-        "�براير",
-        "مارس",
-        "أبريل",
-        "مايو",
-        "يونيو",
-        "يوليو",
-        "أغسطس",
-        "سبتمبر",
-        "أكتوبر",
-        "نو�مبر",
-        "ديسمبر",
-    ]
-
-    day_names = [
-        "",
-        "الإثنين",
-        "الثلاثاء",
-        "الأربعاء",
-        "الخميس",
-        "الجمعة",
-        "السبت",
-        "الأحد",
-    ]
-    day_abbreviations = ["", "إثنين", "ثلاثاء", "أربعاء", "خميس", "جمعة", "سبت", "أحد"]
-
-    def _format_timeframe(self, timeframe: TimeFrameLiteral, delta: int) -> str:
-        form = self.timeframes[timeframe]
-        delta = abs(delta)
-        if isinstance(form, Mapping):
-            if delta == 2:
-                form = form["2"]
-            elif 2 < delta <= 10:
-                form = form["ten"]
-            else:
-                form = form["higher"]
-
-        return form.format(delta)
-
-
-class LevantArabicLocale(ArabicLocale):
-    names = ["ar-iq", "ar-jo", "ar-lb", "ar-ps", "ar-sy"]
-    month_names = [
-        "",
-        "كانون الثاني",
-        "شباط",
-        "آذار",
-        "نيسان",
-        "أيار",
-        "حزيران",
-        "تموز",
-        "آب",
-        "أيلول",
-        "تشرين الأول",
-        "تشرين الثاني",
-        "كانون الأول",
-    ]
-    month_abbreviations = [
-        "",
-        "كانون الثاني",
-        "شباط",
-        "آذار",
-        "نيسان",
-        "أيار",
-        "حزيران",
-        "تموز",
-        "آب",
-        "أيلول",
-        "تشرين الأول",
-        "تشرين الثاني",
-        "كانون الأول",
-    ]
-
-
-class AlgeriaTunisiaArabicLocale(ArabicLocale):
-    names = ["ar-tn", "ar-dz"]
-    month_names = [
-        "",
-        "جان�ي",
-        "�ي�ري",
-        "مارس",
-        "أ�ريل",
-        "ماي",
-        "جوان",
-        "جويلية",
-        "أوت",
-        "سبتمبر",
-        "أكتوبر",
-        "نو�مبر",
-        "ديسمبر",
-    ]
-    month_abbreviations = [
-        "",
-        "جان�ي",
-        "�ي�ري",
-        "مارس",
-        "أ�ريل",
-        "ماي",
-        "جوان",
-        "جويلية",
-        "أوت",
-        "سبتمبر",
-        "أكتوبر",
-        "نو�مبر",
-        "ديسمبر",
-    ]
-
-
-class MauritaniaArabicLocale(ArabicLocale):
-    names = ["ar-mr"]
-    month_names = [
-        "",
-        "يناير",
-        "�براير",
-        "مارس",
-        "إبريل",
-        "مايو",
-        "يونيو",
-        "يوليو",
-        "أغشت",
-        "شتمبر",
-        "أكتوبر",
-        "نو�مبر",
-        "دجمبر",
-    ]
-    month_abbreviations = [
-        "",
-        "يناير",
-        "�براير",
-        "مارس",
-        "إبريل",
-        "مايو",
-        "يونيو",
-        "يوليو",
-        "أغشت",
-        "شتمبر",
-        "أكتوبر",
-        "نو�مبر",
-        "دجمبر",
-    ]
-
-
-class MoroccoArabicLocale(ArabicLocale):
-    names = ["ar-ma"]
-    month_names = [
-        "",
-        "يناير",
-        "�براير",
-        "مارس",
-        "أبريل",
-        "ماي",
-        "يونيو",
-        "يوليوز",
-        "غشت",
-        "شتنبر",
-        "أكتوبر",
-        "نونبر",
-        "دجنبر",
-    ]
-    month_abbreviations = [
-        "",
-        "يناير",
-        "�براير",
-        "مارس",
-        "أبريل",
-        "ماي",
-        "يونيو",
-        "يوليوز",
-        "غشت",
-        "شتنبر",
-        "أكتوبر",
-        "نونبر",
-        "دجنبر",
-    ]
-
-
-class IcelandicLocale(Locale):
-    def _format_timeframe(self, timeframe: TimeFrameLiteral, delta: int) -> str:
-        form = self.timeframes[timeframe]
-
-        if isinstance(form, Mapping):
-            if delta < 0:
-                form = form["past"]
-            elif delta > 0:
-                form = form["future"]
-            else:
-                raise ValueError(
-                    "Icelandic Locale does not support units with a delta of zero. "
-                    "Please consider making a contribution to fix this issue."
-                )
-                # FIXME: handle when delta is 0
-
-        return form.format(abs(delta))
-
-    names = ["is", "is-is"]
-
-    past = "fyrir {0} síðan"
-    future = "eftir {0}"
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[str, Mapping[str, str]]]] = {
-        "now": "rétt í þessu",
-        "second": {"past": "sekúndu", "future": "sekúndu"},
-        "seconds": {"past": "{0} nokkrum sekúndum", "future": "nokkrar sekúndur"},
-        "minute": {"past": "einni mínútu", "future": "eina mínútu"},
-        "minutes": {"past": "{0} mínútum", "future": "{0} mínútur"},
-        "hour": {"past": "einum tíma", "future": "einn tíma"},
-        "hours": {"past": "{0} tímum", "future": "{0} tíma"},
-        "day": {"past": "einum degi", "future": "einn dag"},
-        "days": {"past": "{0} dögum", "future": "{0} daga"},
-        "month": {"past": "einum mánuði", "future": "einn mánuð"},
-        "months": {"past": "{0} mánuðum", "future": "{0} mánuði"},
-        "year": {"past": "einu ári", "future": "eitt ár"},
-        "years": {"past": "{0} árum", "future": "{0} ár"},
-    }
-
-    meridians = {"am": "f.h.", "pm": "e.h.", "AM": "f.h.", "PM": "e.h."}
-
-    month_names = [
-        "",
-        "janúar",
-        "febrúar",
-        "mars",
-        "apríl",
-        "maí",
-        "júní",
-        "júlí",
-        "ágúst",
-        "september",
-        "október",
-        "nóvember",
-        "desember",
-    ]
-    month_abbreviations = [
-        "",
-        "jan",
-        "feb",
-        "mar",
-        "apr",
-        "maí",
-        "jún",
-        "júl",
-        "ágú",
-        "sep",
-        "okt",
-        "nóv",
-        "des",
-    ]
-
-    day_names = [
-        "",
-        "mánudagur",
-        "þriðjudagur",
-        "miðvikudagur",
-        "fimmtudagur",
-        "föstudagur",
-        "laugardagur",
-        "sunnudagur",
-    ]
-    day_abbreviations = ["", "mán", "þri", "mið", "fim", "fös", "lau", "sun"]
-
-
-class DanishLocale(Locale):
-    names = ["da", "da-dk"]
-
-    past = "for {0} siden"
-    future = "om {0}"
-    and_word = "og"
-
-    timeframes = {
-        "now": "lige nu",
-        "second": "et sekund",
-        "seconds": "{0} sekunder",
-        "minute": "et minut",
-        "minutes": "{0} minutter",
-        "hour": "en time",
-        "hours": "{0} timer",
-        "day": "en dag",
-        "days": "{0} dage",
-        "week": "en uge",
-        "weeks": "{0} uger",
-        "month": "en måned",
-        "months": "{0} måneder",
-        "year": "et år",
-        "years": "{0} år",
-    }
-
-    month_names = [
-        "",
-        "januar",
-        "februar",
-        "marts",
-        "april",
-        "maj",
-        "juni",
-        "juli",
-        "august",
-        "september",
-        "oktober",
-        "november",
-        "december",
-    ]
-    month_abbreviations = [
-        "",
-        "jan",
-        "feb",
-        "mar",
-        "apr",
-        "maj",
-        "jun",
-        "jul",
-        "aug",
-        "sep",
-        "okt",
-        "nov",
-        "dec",
-    ]
-
-    day_names = [
-        "",
-        "mandag",
-        "tirsdag",
-        "onsdag",
-        "torsdag",
-        "fredag",
-        "lørdag",
-        "søndag",
-    ]
-    day_abbreviations = ["", "man", "tir", "ons", "tor", "fre", "lør", "søn"]
-
-    def _ordinal_number(self, n: int) -> str:
-        return f"{n}."
-
-
-class MalayalamLocale(Locale):
-    names = ["ml"]
-
-    past = "{0} മ�മ�പ�"
-    future = "{0} ശേഷം"
-
-    timeframes = {
-        "now": "ഇപ�പോൾ",
-        "second": "ഒര� നിമിഷം",
-        "seconds": "{0} സെക�കന�റ�‌",
-        "minute": "ഒര� മിനിറ�റ�",
-        "minutes": "{0} മിനിറ�റ�",
-        "hour": "ഒര� മണിക�കൂർ",
-        "hours": "{0} മണിക�കൂർ",
-        "day": "ഒര� ദിവസം ",
-        "days": "{0} ദിവസം ",
-        "month": "ഒര� മാസം ",
-        "months": "{0} മാസം ",
-        "year": "ഒര� വർഷം ",
-        "years": "{0} വർഷം ",
-    }
-
-    meridians = {
-        "am": "രാവിലെ",
-        "pm": "ഉച�ചക�ക� ശേഷം",
-        "AM": "രാവിലെ",
-        "PM": "ഉച�ചക�ക� ശേഷം",
-    }
-
-    month_names = [
-        "",
-        "ജന�വരി",
-        "ഫെബ�ര�വരി",
-        "മാർച�ച�‌",
-        "�പ�രിൽ ",
-        "മെയ�‌ ",
-        "ജൂണ��",
-        "ജൂലൈ",
-        "ഓഗസ�റ�റ�‌",
-        "സെപ�റ�റംബർ",
-        "ഒക�ടോബർ",
-        "നവംബർ",
-        "ഡിസംബർ",
-    ]
-    month_abbreviations = [
-        "",
-        "ജന�",
-        "ഫെബ� ",
-        "മാർ",
-        "�പ�രിൽ",
-        "മേയ�",
-        "ജൂണ��",
-        "ജൂലൈ",
-        "ഓഗസ�റ",
-        "സെപ�റ�റ",
-        "ഒക�ടോ",
-        "നവം",
-        "ഡിസം",
-    ]
-
-    day_names = ["", "തിങ�കള��", "ചൊവ�വ", "ബ�ധന��", "വ�യാഴം", "വെള�ളി", "ശനി", "ഞായര��"]
-    day_abbreviations = [
-        "",
-        "തിങ�കള��",
-        "ചൊവ�വ",
-        "ബ�ധന��",
-        "വ�യാഴം",
-        "വെള�ളി",
-        "ശനി",
-        "ഞായര��",
-    ]
-
-
-class HindiLocale(Locale):
-    names = ["hi", "hi-in"]
-
-    past = "{0} पहले"
-    future = "{0} बाद"
-
-    timeframes = {
-        "now": "अभी",
-        "second": "�क पल",
-        "seconds": "{0} सेकंड�",
-        "minute": "�क मिनट ",
-        "minutes": "{0} मिनट ",
-        "hour": "�क घंटा",
-        "hours": "{0} घंटे",
-        "day": "�क दिन",
-        "days": "{0} दिन",
-        "month": "�क माह ",
-        "months": "{0} महीने ",
-        "year": "�क वर�ष ",
-        "years": "{0} साल ",
-    }
-
-    meridians = {"am": "स�बह", "pm": "शाम", "AM": "स�बह", "PM": "शाम"}
-
-    month_names = [
-        "",
-        "जनवरी",
-        "फरवरी",
-        "मार�च",
-        "अप�रैल ",
-        "मई",
-        "जून",
-        "ज�लाई",
-        "अगस�त",
-        "सितंबर",
-        "अक�टूबर",
-        "नवंबर",
-        "दिसंबर",
-    ]
-    month_abbreviations = [
-        "",
-        "जन",
-        "फ़र",
-        "मार�च",
-        "अप�रै",
-        "मई",
-        "जून",
-        "ज�लाई",
-        "आग",
-        "सित",
-        "अकत",
-        "नवे",
-        "दिस",
-    ]
-
-    day_names = [
-        "",
-        "सोमवार",
-        "मंगलवार",
-        "ब�धवार",
-        "ग�र�वार",
-        "श�क�रवार",
-        "शनिवार",
-        "रविवार",
-    ]
-    day_abbreviations = ["", "सोम", "मंगल", "ब�ध", "ग�र�वार", "श�क�र", "शनि", "रवि"]
-
-
-class CzechLocale(Locale):
-    names = ["cs", "cs-cz"]
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[str, Mapping[str, str]]]] = {
-        "now": "Te�",
-        "second": {"past": "vteřina", "future": "vteřina"},
-        "seconds": {
-            "zero": "vteřina",
-            "past": "{0} sekundami",
-            "future-singular": "{0} sekundy",
-            "future-paucal": "{0} sekund",
-        },
-        "minute": {"past": "minutou", "future": "minutu"},
-        "minutes": {
-            "zero": "{0} minut",
-            "past": "{0} minutami",
-            "future-singular": "{0} minuty",
-            "future-paucal": "{0} minut",
-        },
-        "hour": {"past": "hodinou", "future": "hodinu"},
-        "hours": {
-            "zero": "{0} hodin",
-            "past": "{0} hodinami",
-            "future-singular": "{0} hodiny",
-            "future-paucal": "{0} hodin",
-        },
-        "day": {"past": "dnem", "future": "den"},
-        "days": {
-            "zero": "{0} dnů",
-            "past": "{0} dny",
-            "future-singular": "{0} dny",
-            "future-paucal": "{0} dnů",
-        },
-        "week": {"past": "týdnem", "future": "týden"},
-        "weeks": {
-            "zero": "{0} týdnů",
-            "past": "{0} týdny",
-            "future-singular": "{0} týdny",
-            "future-paucal": "{0} týdnů",
-        },
-        "month": {"past": "měsícem", "future": "měsíc"},
-        "months": {
-            "zero": "{0} měsíců",
-            "past": "{0} měsíci",
-            "future-singular": "{0} měsíce",
-            "future-paucal": "{0} měsíců",
-        },
-        "year": {"past": "rokem", "future": "rok"},
-        "years": {
-            "zero": "{0} let",
-            "past": "{0} lety",
-            "future-singular": "{0} roky",
-            "future-paucal": "{0} let",
-        },
-    }
-
-    past = "Před {0}"
-    future = "Za {0}"
-
-    month_names = [
-        "",
-        "leden",
-        "únor",
-        "březen",
-        "duben",
-        "květen",
-        "�erven",
-        "�ervenec",
-        "srpen",
-        "září",
-        "říjen",
-        "listopad",
-        "prosinec",
-    ]
-    month_abbreviations = [
-        "",
-        "led",
-        "úno",
-        "bře",
-        "dub",
-        "kvÄ›",
-        "�vn",
-        "�vc",
-        "srp",
-        "zář",
-        "říj",
-        "lis",
-        "pro",
-    ]
-
-    day_names = [
-        "",
-        "pondělí",
-        "úterý",
-        "středa",
-        "�tvrtek",
-        "pátek",
-        "sobota",
-        "neděle",
-    ]
-    day_abbreviations = ["", "po", "út", "st", "�t", "pá", "so", "ne"]
-
-    def _format_timeframe(self, timeframe: TimeFrameLiteral, delta: int) -> str:
-        """Czech aware time frame format function, takes into account
-        the differences between past and future forms."""
-        abs_delta = abs(delta)
-        form = self.timeframes[timeframe]
-
-        if isinstance(form, str):
-            return form.format(abs_delta)
-
-        if delta == 0:
-            key = "zero"  # And *never* use 0 in the singular!
-        elif delta < 0:
-            key = "past"
-        else:
-            # Needed since both regular future and future-singular and future-paucal cases
-            if "future-singular" not in form:
-                key = "future"
-            elif 2 <= abs_delta % 10 <= 4 and (
-                abs_delta % 100 < 10 or abs_delta % 100 >= 20
-            ):
-                key = "future-singular"
-            else:
-                key = "future-paucal"
-
-        form: str = form[key]
-        return form.format(abs_delta)
-
-
-class SlovakLocale(Locale):
-    names = ["sk", "sk-sk"]
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[str, Mapping[str, str]]]] = {
-        "now": "Teraz",
-        "second": {"past": "sekundou", "future": "sekundu"},
-        "seconds": {
-            "zero": "{0} sekúnd",
-            "past": "{0} sekundami",
-            "future-singular": "{0} sekundy",
-            "future-paucal": "{0} sekúnd",
-        },
-        "minute": {"past": "minútou", "future": "minútu"},
-        "minutes": {
-            "zero": "{0} minút",
-            "past": "{0} minútami",
-            "future-singular": "{0} minúty",
-            "future-paucal": "{0} minút",
-        },
-        "hour": {"past": "hodinou", "future": "hodinu"},
-        "hours": {
-            "zero": "{0} hodín",
-            "past": "{0} hodinami",
-            "future-singular": "{0} hodiny",
-            "future-paucal": "{0} hodín",
-        },
-        "day": {"past": "dňom", "future": "deň"},
-        "days": {
-            "zero": "{0} dní",
-            "past": "{0} dňami",
-            "future-singular": "{0} dni",
-            "future-paucal": "{0} dní",
-        },
-        "week": {"past": "týždňom", "future": "týždeň"},
-        "weeks": {
-            "zero": "{0} týždňov",
-            "past": "{0} týždňami",
-            "future-singular": "{0} týždne",
-            "future-paucal": "{0} týždňov",
-        },
-        "month": {"past": "mesiacom", "future": "mesiac"},
-        "months": {
-            "zero": "{0} mesiacov",
-            "past": "{0} mesiacmi",
-            "future-singular": "{0} mesiace",
-            "future-paucal": "{0} mesiacov",
-        },
-        "year": {"past": "rokom", "future": "rok"},
-        "years": {
-            "zero": "{0} rokov",
-            "past": "{0} rokmi",
-            "future-singular": "{0} roky",
-            "future-paucal": "{0} rokov",
-        },
-    }
-
-    past = "Pred {0}"
-    future = "O {0}"
-    and_word = "a"
-
-    month_names = [
-        "",
-        "január",
-        "február",
-        "marec",
-        "apríl",
-        "máj",
-        "jún",
-        "júl",
-        "august",
-        "september",
-        "október",
-        "november",
-        "december",
-    ]
-    month_abbreviations = [
-        "",
-        "jan",
-        "feb",
-        "mar",
-        "apr",
-        "máj",
-        "jún",
-        "júl",
-        "aug",
-        "sep",
-        "okt",
-        "nov",
-        "dec",
-    ]
-
-    day_names = [
-        "",
-        "pondelok",
-        "utorok",
-        "streda",
-        "Å¡tvrtok",
-        "piatok",
-        "sobota",
-        "nedeľa",
-    ]
-    day_abbreviations = ["", "po", "ut", "st", "Å¡t", "pi", "so", "ne"]
-
-    def _format_timeframe(self, timeframe: TimeFrameLiteral, delta: int) -> str:
-        """Slovak aware time frame format function, takes into account
-        the differences between past and future forms."""
-        abs_delta = abs(delta)
-        form = self.timeframes[timeframe]
-
-        if isinstance(form, str):
-            return form.format(abs_delta)
-
-        if delta == 0:
-            key = "zero"  # And *never* use 0 in the singular!
-        elif delta < 0:
-            key = "past"
-        else:
-            if "future-singular" not in form:
-                key = "future"
-            elif 2 <= abs_delta % 10 <= 4 and (
-                abs_delta % 100 < 10 or abs_delta % 100 >= 20
-            ):
-                key = "future-singular"
-            else:
-                key = "future-paucal"
-
-        form: str = form[key]
-        return form.format(abs_delta)
-
-
-class FarsiLocale(Locale):
-    names = ["fa", "fa-ir"]
-
-    past = "{0} قبل"
-    future = "در {0}"
-
-    timeframes = {
-        "now": "اکنون",
-        "second": "یک لحظه",
-        "seconds": "{0} ثانیه",
-        "minute": "یک دقیقه",
-        "minutes": "{0} دقیقه",
-        "hour": "یک ساعت",
-        "hours": "{0} ساعت",
-        "day": "یک روز",
-        "days": "{0} روز",
-        "month": "یک ماه",
-        "months": "{0} ماه",
-        "year": "یک سال",
-        "years": "{0} سال",
-    }
-
-    meridians = {
-        "am": "قبل از ظهر",
-        "pm": "بعد از ظهر",
-        "AM": "قبل از ظهر",
-        "PM": "بعد از ظهر",
-    }
-
-    month_names = [
-        "",
-        "January",
-        "February",
-        "March",
-        "April",
-        "May",
-        "June",
-        "July",
-        "August",
-        "September",
-        "October",
-        "November",
-        "December",
-    ]
-    month_abbreviations = [
-        "",
-        "Jan",
-        "Feb",
-        "Mar",
-        "Apr",
-        "May",
-        "Jun",
-        "Jul",
-        "Aug",
-        "Sep",
-        "Oct",
-        "Nov",
-        "Dec",
-    ]
-
-    day_names = [
-        "",
-        "دو شنبه",
-        "سه شنبه",
-        "چهارشنبه",
-        "پنجشنبه",
-        "جمعه",
-        "شنبه",
-        "یکشنبه",
-    ]
-    day_abbreviations = ["", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]
-
-
-class HebrewLocale(Locale):
-    names = ["he", "he-il"]
-
-    past = "לפני {0}"
-    future = "בעוד {0}"
-    and_word = "ו"
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[str, Mapping[str, str]]]] = {
-        "now": "הרגע",
-        "second": "שנייה",
-        "seconds": "{0} שניות",
-        "minute": "דקה",
-        "minutes": "{0} דקות",
-        "hour": "שעה",
-        "hours": {"2": "שעתיי�", "ten": "{0} שעות", "higher": "{0} שעות"},
-        "day": "יו�",
-        "days": {"2": "יומיי�", "ten": "{0} ימי�", "higher": "{0} יו�"},
-        "week": "שבוע",
-        "weeks": {"2": "שבועיי�", "ten": "{0} שבועות", "higher": "{0} שבועות"},
-        "month": "חודש",
-        "months": {"2": "חודשיי�", "ten": "{0} חודשי�", "higher": "{0} חודשי�"},
-        "year": "שנה",
-        "years": {"2": "שנתיי�", "ten": "{0} שני�", "higher": "{0} שנה"},
-    }
-
-    meridians = {
-        "am": 'לפנ"צ',
-        "pm": '�חר"צ',
-        "AM": "לפני הצהריי�",
-        "PM": "�חרי הצהריי�",
-    }
-
-    month_names = [
-        "",
-        "ינו�ר",
-        "פברו�ר",
-        "מרץ",
-        "�פריל",
-        "מ�י",
-        "יוני",
-        "יולי",
-        "�וגוסט",
-        "ספטמבר",
-        "�וקטובר",
-        "נובמבר",
-        "דצמבר",
-    ]
-    month_abbreviations = [
-        "",
-        "ינו׳",
-        "פבר׳",
-        "מרץ",
-        "�פר׳",
-        "מ�י",
-        "יוני",
-        "יולי",
-        "�וג׳",
-        "ספט׳",
-        "�וק׳",
-        "נוב׳",
-        "דצמ׳",
-    ]
-
-    day_names = ["", "שני", "שלישי", "רביעי", "חמישי", "שישי", "שבת", "ר�שון"]
-    day_abbreviations = ["", "ב׳", "ג׳", "ד׳", "ה׳", "ו׳", "ש׳", "�׳"]
-
-    def _format_timeframe(self, timeframe: TimeFrameLiteral, delta: int) -> str:
-        form = self.timeframes[timeframe]
-        delta = abs(delta)
-        if isinstance(form, Mapping):
-            if delta == 2:
-                form = form["2"]
-            elif delta == 0 or 2 < delta <= 10:
-                form = form["ten"]
-            else:
-                form = form["higher"]
-
-        return form.format(delta)
-
-    def describe_multi(
-        self,
-        timeframes: Sequence[Tuple[TimeFrameLiteral, Union[int, float]]],
-        only_distance: bool = False,
-    ) -> str:
-        """Describes a delta within multiple timeframes in plain language.
-        In Hebrew, the and word behaves a bit differently.
-
-        :param timeframes: a list of string, quantity pairs each representing a timeframe and delta.
-        :param only_distance: return only distance eg: "2 hours and 11 seconds" without "in" or "ago" keywords
-        """
-
-        humanized = ""
-        for index, (timeframe, delta) in enumerate(timeframes):
-            last_humanized = self._format_timeframe(timeframe, trunc(delta))
-            if index == 0:
-                humanized = last_humanized
-            elif index == len(timeframes) - 1:  # Must have at least 2 items
-                humanized += " " + self.and_word
-                if last_humanized[0].isdecimal():
-                    humanized += "Ö¾"
-                humanized += last_humanized
-            else:  # Don't add for the last one
-                humanized += ", " + last_humanized
-
-        if not only_distance:
-            humanized = self._format_relative(humanized, timeframe, trunc(delta))
-
-        return humanized
-
-
-class MarathiLocale(Locale):
-    names = ["mr"]
-
-    past = "{0} आधी"
-    future = "{0} नंतर"
-
-    timeframes = {
-        "now": "सद�य",
-        "second": "�क सेकंद",
-        "seconds": "{0} सेकंद",
-        "minute": "�क मिनिट ",
-        "minutes": "{0} मिनिट ",
-        "hour": "�क तास",
-        "hours": "{0} तास",
-        "day": "�क दिवस",
-        "days": "{0} दिवस",
-        "month": "�क महिना ",
-        "months": "{0} महिने ",
-        "year": "�क वर�ष ",
-        "years": "{0} वर�ष ",
-    }
-
-    meridians = {"am": "सकाळ", "pm": "संध�याकाळ", "AM": "सकाळ", "PM": "संध�याकाळ"}
-
-    month_names = [
-        "",
-        "जानेवारी",
-        "फेब�र�वारी",
-        "मार�च",
-        "�प�रिल",
-        "मे",
-        "जून",
-        "ज�लै",
-        "अॉगस�ट",
-        "सप�टेंबर",
-        "अॉक�टोबर",
-        "नोव�हेंबर",
-        "डिसेंबर",
-    ]
-    month_abbreviations = [
-        "",
-        "जान",
-        "फेब�र�",
-        "मार�च",
-        "�प�रि",
-        "मे",
-        "जून",
-        "ज�लै",
-        "अॉग",
-        "सप�टें",
-        "अॉक�टो",
-        "नोव�हें",
-        "डिसें",
-    ]
-
-    day_names = [
-        "",
-        "सोमवार",
-        "मंगळवार",
-        "ब�धवार",
-        "ग�र�वार",
-        "श�क�रवार",
-        "शनिवार",
-        "रविवार",
-    ]
-    day_abbreviations = ["", "सोम", "मंगळ", "ब�ध", "ग�र�", "श�क�र", "शनि", "रवि"]
-
-
-class CatalanLocale(Locale):
-    names = ["ca", "ca-es", "ca-ad", "ca-fr", "ca-it"]
-    past = "Fa {0}"
-    future = "En {0}"
-    and_word = "i"
-
-    timeframes = {
-        "now": "Ara mateix",
-        "second": "un segon",
-        "seconds": "{0} segons",
-        "minute": "un minut",
-        "minutes": "{0} minuts",
-        "hour": "una hora",
-        "hours": "{0} hores",
-        "day": "un dia",
-        "days": "{0} dies",
-        "month": "un mes",
-        "months": "{0} mesos",
-        "year": "un any",
-        "years": "{0} anys",
-    }
-
-    month_names = [
-        "",
-        "gener",
-        "febrer",
-        "març",
-        "abril",
-        "maig",
-        "juny",
-        "juliol",
-        "agost",
-        "setembre",
-        "octubre",
-        "novembre",
-        "desembre",
-    ]
-    month_abbreviations = [
-        "",
-        "gen.",
-        "febr.",
-        "març",
-        "abr.",
-        "maig",
-        "juny",
-        "jul.",
-        "ag.",
-        "set.",
-        "oct.",
-        "nov.",
-        "des.",
-    ]
-    day_names = [
-        "",
-        "dilluns",
-        "dimarts",
-        "dimecres",
-        "dijous",
-        "divendres",
-        "dissabte",
-        "diumenge",
-    ]
-    day_abbreviations = [
-        "",
-        "dl.",
-        "dt.",
-        "dc.",
-        "dj.",
-        "dv.",
-        "ds.",
-        "dg.",
-    ]
-
-
-class BasqueLocale(Locale):
-    names = ["eu", "eu-eu"]
-    past = "duela {0}"
-    future = "{0}"  # I don't know what's the right phrase in Basque for the future.
-
-    timeframes = {
-        "now": "Orain",
-        "second": "segundo bat",
-        "seconds": "{0} segundu",
-        "minute": "minutu bat",
-        "minutes": "{0} minutu",
-        "hour": "ordu bat",
-        "hours": "{0} ordu",
-        "day": "egun bat",
-        "days": "{0} egun",
-        "month": "hilabete bat",
-        "months": "{0} hilabet",
-        "year": "urte bat",
-        "years": "{0} urte",
-    }
-
-    month_names = [
-        "",
-        "urtarrilak",
-        "otsailak",
-        "martxoak",
-        "apirilak",
-        "maiatzak",
-        "ekainak",
-        "uztailak",
-        "abuztuak",
-        "irailak",
-        "urriak",
-        "azaroak",
-        "abenduak",
-    ]
-    month_abbreviations = [
-        "",
-        "urt",
-        "ots",
-        "mar",
-        "api",
-        "mai",
-        "eka",
-        "uzt",
-        "abu",
-        "ira",
-        "urr",
-        "aza",
-        "abe",
-    ]
-    day_names = [
-        "",
-        "astelehena",
-        "asteartea",
-        "asteazkena",
-        "osteguna",
-        "ostirala",
-        "larunbata",
-        "igandea",
-    ]
-    day_abbreviations = ["", "al", "ar", "az", "og", "ol", "lr", "ig"]
-
-
-class HungarianLocale(Locale):
-    names = ["hu", "hu-hu"]
-
-    past = "{0} ezelőtt"
-    future = "{0} múlva"
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[str, Mapping[str, str]]]] = {
-        "now": "éppen most",
-        "second": {"past": "egy második", "future": "egy második"},
-        "seconds": {"past": "{0} másodpercekkel", "future": "{0} pár másodperc"},
-        "minute": {"past": "egy perccel", "future": "egy perc"},
-        "minutes": {"past": "{0} perccel", "future": "{0} perc"},
-        "hour": {"past": "egy órával", "future": "egy óra"},
-        "hours": {"past": "{0} órával", "future": "{0} óra"},
-        "day": {"past": "egy nappal", "future": "egy nap"},
-        "days": {"past": "{0} nappal", "future": "{0} nap"},
-        "week": {"past": "egy héttel", "future": "egy hét"},
-        "weeks": {"past": "{0} héttel", "future": "{0} hét"},
-        "month": {"past": "egy hónappal", "future": "egy hónap"},
-        "months": {"past": "{0} hónappal", "future": "{0} hónap"},
-        "year": {"past": "egy évvel", "future": "egy év"},
-        "years": {"past": "{0} évvel", "future": "{0} év"},
-    }
-
-    month_names = [
-        "",
-        "január",
-        "február",
-        "március",
-        "április",
-        "május",
-        "június",
-        "július",
-        "augusztus",
-        "szeptember",
-        "október",
-        "november",
-        "december",
-    ]
-    month_abbreviations = [
-        "",
-        "jan",
-        "febr",
-        "márc",
-        "ápr",
-        "máj",
-        "jún",
-        "júl",
-        "aug",
-        "szept",
-        "okt",
-        "nov",
-        "dec",
-    ]
-
-    day_names = [
-        "",
-        "hétfő",
-        "kedd",
-        "szerda",
-        "csütörtök",
-        "péntek",
-        "szombat",
-        "vasárnap",
-    ]
-    day_abbreviations = ["", "hét", "kedd", "szer", "csüt", "pént", "szom", "vas"]
-
-    meridians = {"am": "de", "pm": "du", "AM": "DE", "PM": "DU"}
-
-    def _format_timeframe(self, timeframe: TimeFrameLiteral, delta: int) -> str:
-        form = self.timeframes[timeframe]
-
-        if isinstance(form, Mapping):
-            if delta > 0:
-                form = form["future"]
-            else:
-                form = form["past"]
-
-        return form.format(abs(delta))
-
-
-class EsperantoLocale(Locale):
-    names = ["eo", "eo-xx"]
-    past = "antaÅ­ {0}"
-    future = "post {0}"
-
-    timeframes = {
-        "now": "nun",
-        "second": "sekundo",
-        "seconds": "{0} kelkaj sekundoj",
-        "minute": "unu minuto",
-        "minutes": "{0} minutoj",
-        "hour": "un horo",
-        "hours": "{0} horoj",
-        "day": "unu tago",
-        "days": "{0} tagoj",
-        "month": "unu monato",
-        "months": "{0} monatoj",
-        "year": "unu jaro",
-        "years": "{0} jaroj",
-    }
-
-    month_names = [
-        "",
-        "januaro",
-        "februaro",
-        "marto",
-        "aprilo",
-        "majo",
-        "junio",
-        "julio",
-        "aÅ­gusto",
-        "septembro",
-        "oktobro",
-        "novembro",
-        "decembro",
-    ]
-    month_abbreviations = [
-        "",
-        "jan",
-        "feb",
-        "mar",
-        "apr",
-        "maj",
-        "jun",
-        "jul",
-        "aÅ­g",
-        "sep",
-        "okt",
-        "nov",
-        "dec",
-    ]
-
-    day_names = [
-        "",
-        "lundo",
-        "mardo",
-        "merkredo",
-        "ĵaŭdo",
-        "vendredo",
-        "sabato",
-        "dimanĉo",
-    ]
-    day_abbreviations = ["", "lun", "mar", "mer", "ĵaŭ", "ven", "sab", "dim"]
-
-    meridians = {"am": "atm", "pm": "ptm", "AM": "ATM", "PM": "PTM"}
-
-    ordinal_day_re = r"((?P<value>[1-3]?[0-9](?=a))a)"
-
-    def _ordinal_number(self, n: int) -> str:
-        return f"{n}a"
-
-
-class ThaiLocale(Locale):
-    names = ["th", "th-th"]
-
-    past = "{0} ที่ผ่านมา"
-    future = "ในอี� {0}"
-
-    timeframes = {
-        "now": "ขณะนี้",
-        "second": "วินาที",
-        "seconds": "{0} ไม่�ี่วินาที",
-        "minute": "1 นาที",
-        "minutes": "{0} นาที",
-        "hour": "1 ชั่วโมง",
-        "hours": "{0} ชั่วโมง",
-        "day": "1 วัน",
-        "days": "{0} วัน",
-        "month": "1 เดือน",
-        "months": "{0} เดือน",
-        "year": "1 ปี",
-        "years": "{0} ปี",
-    }
-
-    month_names = [
-        "",
-        "ม�ราคม",
-        "�ุมภาพันธ์",
-        "มีนาคม",
-        "เมษายน",
-        "พฤษภาคม",
-        "มิถุนายน",
-        "�ร�ฎาคม",
-        "สิงหาคม",
-        "�ันยายน",
-        "ตุลาคม",
-        "พฤศจิ�ายน",
-        "ธันวาคม",
-    ]
-    month_abbreviations = [
-        "",
-        "ม.ค.",
-        "�.พ.",
-        "มี.ค.",
-        "เม.ย.",
-        "พ.ค.",
-        "มิ.ย.",
-        "�.ค.",
-        "ส.ค.",
-        "�.ย.",
-        "ต.ค.",
-        "พ.ย.",
-        "ธ.ค.",
-    ]
-
-    day_names = ["", "จันทร์", "อังคาร", "พุธ", "พฤหัสบดี", "ศุ�ร์", "เสาร์", "อาทิตย์"]
-    day_abbreviations = ["", "จ", "อ", "พ", "พฤ", "ศ", "ส", "อา"]
-
-    meridians = {"am": "am", "pm": "pm", "AM": "AM", "PM": "PM"}
-
-    BE_OFFSET = 543
-
-    def year_full(self, year: int) -> str:
-        """Thai always use Buddhist Era (BE) which is CE + 543"""
-        year += self.BE_OFFSET
-        return f"{year:04d}"
-
-    def year_abbreviation(self, year: int) -> str:
-        """Thai always use Buddhist Era (BE) which is CE + 543"""
-        year += self.BE_OFFSET
-        return f"{year:04d}"[2:]
-
-    def _format_relative(
-        self,
-        humanized: str,
-        timeframe: TimeFrameLiteral,
-        delta: Union[float, int],
-    ) -> str:
-        """Thai normally doesn't have any space between words"""
-        if timeframe == "now":
-            return humanized
-
-        direction = self.past if delta < 0 else self.future
-        relative_string = direction.format(humanized)
-
-        if timeframe == "seconds":
-            relative_string = relative_string.replace(" ", "")
-
-        return relative_string
-
-
-class LaotianLocale(Locale):
-    names = ["lo", "lo-la"]
-
-    past = "{0} �່ອນຫນ້ານີ້"
-    future = "ໃນ {0}"
-
-    timeframes = {
-        "now": "ດຽວນີ້",
-        "second": "ວິນາທີ",
-        "seconds": "{0} ວິນາທີ",
-        "minute": "ນາທີ",
-        "minutes": "{0} ນາທີ",
-        "hour": "ຊົ່ວໂມງ",
-        "hours": "{0} ຊົ່ວໂມງ",
-        "day": "ມື້",
-        "days": "{0} ມື້",
-        "week": "ອາທິດ",
-        "weeks": "{0} ອາທິດ",
-        "month": "ເດືອນ",
-        "months": "{0} ເດືອນ",
-        "year": "ປີ",
-        "years": "{0} ປີ",
-    }
-
-    month_names = [
-        "",
-        "ມັງ�ອນ",  # mangkon
-        "�ຸມພາ",  # kumpha
-        "ມີນາ",  # mina
-        "ເມສາ",  # mesa
-        "ພຶດສະພາ",  # phudsapha
-        "ມິຖຸນາ",  # mithuna
-        "��ລະ�ົດ",  # kolakod
-        "ສິງຫາ",  # singha
-        "�ັນ�າ",  # knaia
-        "ຕຸລາ",  # tula
-        "ພະຈິ�",  # phachik
-        "ທັນວາ",  # thanuaa
-    ]
-    month_abbreviations = [
-        "",
-        "ມັງ�ອນ",
-        "�ຸມພາ",
-        "ມີນາ",
-        "ເມສາ",
-        "ພຶດສະພາ",
-        "ມິຖຸນາ",
-        "��ລະ�ົດ",
-        "ສິງຫາ",
-        "�ັນ�າ",
-        "ຕຸລາ",
-        "ພະຈິ�",
-        "ທັນວາ",
-    ]
-
-    day_names = [
-        "",
-        "ວັນຈັນ",  # vanchan
-        "ວັນອັງຄານ",  # vnoangkhan
-        "ວັນພຸດ",  # vanphud
-        "ວັນພະຫັດ",  # vanphahad
-        "ວັນ​ສຸ�",  # vansuk
-        "ວັນເສົາ",  # vansao
-        "ວັນອາທິດ",  # vnoathid
-    ]
-    day_abbreviations = [
-        "",
-        "ວັນຈັນ",
-        "ວັນອັງຄານ",
-        "ວັນພຸດ",
-        "ວັນພະຫັດ",
-        "ວັນ​ສຸ�",
-        "ວັນເສົາ",
-        "ວັນອາທິດ",
-    ]
-
-    BE_OFFSET = 543
-
-    def year_full(self, year: int) -> str:
-        """Lao always use Buddhist Era (BE) which is CE + 543"""
-        year += self.BE_OFFSET
-        return f"{year:04d}"
-
-    def year_abbreviation(self, year: int) -> str:
-        """Lao always use Buddhist Era (BE) which is CE + 543"""
-        year += self.BE_OFFSET
-        return f"{year:04d}"[2:]
-
-    def _format_relative(
-        self,
-        humanized: str,
-        timeframe: TimeFrameLiteral,
-        delta: Union[float, int],
-    ) -> str:
-        """Lao normally doesn't have any space between words"""
-        if timeframe == "now":
-            return humanized
-
-        direction = self.past if delta < 0 else self.future
-        relative_string = direction.format(humanized)
-
-        if timeframe == "seconds":
-            relative_string = relative_string.replace(" ", "")
-
-        return relative_string
-
-
-class BengaliLocale(Locale):
-    names = ["bn", "bn-bd", "bn-in"]
-
-    past = "{0} আগে"
-    future = "{0} পরে"
-
-    timeframes = {
-        "now": "�খন",
-        "second": "�কটি দ�বিতীয়",
-        "seconds": "{0} সেকেন�ড",
-        "minute": "�ক মিনিট",
-        "minutes": "{0} মিনিট",
-        "hour": "�ক ঘণ�টা",
-        "hours": "{0} ঘণ�টা",
-        "day": "�ক দিন",
-        "days": "{0} দিন",
-        "month": "�ক মাস",
-        "months": "{0} মাস ",
-        "year": "�ক বছর",
-        "years": "{0} বছর",
-    }
-
-    meridians = {"am": "সকাল", "pm": "বিকাল", "AM": "সকাল", "PM": "বিকাল"}
-
-    month_names = [
-        "",
-        "জান�য়ারি",
-        "ফেব�র�য়ারি",
-        "মার�চ",
-        "�প�রিল",
-        "মে",
-        "জ�ন",
-        "জ�লাই",
-        "আগস�ট",
-        "সেপ�টেম�বর",
-        "অক�টোবর",
-        "নভেম�বর",
-        "ডিসেম�বর",
-    ]
-    month_abbreviations = [
-        "",
-        "জান�",
-        "ফেব",
-        "মার�চ",
-        "�প�রি",
-        "মে",
-        "জ�ন",
-        "জ�ল",
-        "অগা",
-        "সেপ�ট",
-        "অক�টো",
-        "নভে",
-        "ডিসে",
-    ]
-
-    day_names = [
-        "",
-        "সোমবার",
-        "মঙ�গলবার",
-        "ব�ধবার",
-        "বৃহস�পতিবার",
-        "শ�ক�রবার",
-        "শনিবার",
-        "রবিবার",
-    ]
-    day_abbreviations = ["", "সোম", "মঙ�গল", "ব�ধ", "বৃহঃ", "শ�ক�র", "শনি", "রবি"]
-
-    def _ordinal_number(self, n: int) -> str:
-        if n > 10 or n == 0:
-            return f"{n}তম"
-        if n in [1, 5, 7, 8, 9, 10]:
-            return f"{n}ম"
-        if n in [2, 3]:
-            return f"{n}য়"
-        if n == 4:
-            return f"{n}র�থ"
-        if n == 6:
-            return f"{n}ষ�ঠ"
-        return ""
-
-
-class RomanshLocale(Locale):
-    names = ["rm", "rm-ch"]
-
-    past = "avant {0}"
-    future = "en {0}"
-
-    timeframes = {
-        "now": "en quest mument",
-        "second": "in secunda",
-        "seconds": "{0} secundas",
-        "minute": "ina minuta",
-        "minutes": "{0} minutas",
-        "hour": "in'ura",
-        "hours": "{0} ura",
-        "day": "in di",
-        "days": "{0} dis",
-        "week": "in'emna",
-        "weeks": "{0} emnas",
-        "month": "in mais",
-        "months": "{0} mais",
-        "year": "in onn",
-        "years": "{0} onns",
-    }
-
-    month_names = [
-        "",
-        "schaner",
-        "favrer",
-        "mars",
-        "avrigl",
-        "matg",
-        "zercladur",
-        "fanadur",
-        "avust",
-        "settember",
-        "october",
-        "november",
-        "december",
-    ]
-
-    month_abbreviations = [
-        "",
-        "schan",
-        "fav",
-        "mars",
-        "avr",
-        "matg",
-        "zer",
-        "fan",
-        "avu",
-        "set",
-        "oct",
-        "nov",
-        "dec",
-    ]
-
-    day_names = [
-        "",
-        "glindesdi",
-        "mardi",
-        "mesemna",
-        "gievgia",
-        "venderdi",
-        "sonda",
-        "dumengia",
-    ]
-
-    day_abbreviations = ["", "gli", "ma", "me", "gie", "ve", "so", "du"]
-
-
-class RomanianLocale(Locale):
-    names = ["ro", "ro-ro"]
-
-    past = "{0} în urmă"
-    future = "peste {0}"
-    and_word = "și"
-
-    timeframes = {
-        "now": "acum",
-        "second": "o secunda",
-        "seconds": "{0} câteva secunde",
-        "minute": "un minut",
-        "minutes": "{0} minute",
-        "hour": "o oră",
-        "hours": "{0} ore",
-        "day": "o zi",
-        "days": "{0} zile",
-        "month": "o lună",
-        "months": "{0} luni",
-        "year": "un an",
-        "years": "{0} ani",
-    }
-
-    month_names = [
-        "",
-        "ianuarie",
-        "februarie",
-        "martie",
-        "aprilie",
-        "mai",
-        "iunie",
-        "iulie",
-        "august",
-        "septembrie",
-        "octombrie",
-        "noiembrie",
-        "decembrie",
-    ]
-    month_abbreviations = [
-        "",
-        "ian",
-        "febr",
-        "mart",
-        "apr",
-        "mai",
-        "iun",
-        "iul",
-        "aug",
-        "sept",
-        "oct",
-        "nov",
-        "dec",
-    ]
-
-    day_names = [
-        "",
-        "luni",
-        "marți",
-        "miercuri",
-        "joi",
-        "vineri",
-        "sâmbătă",
-        "duminică",
-    ]
-    day_abbreviations = ["", "Lun", "Mar", "Mie", "Joi", "Vin", "Sâm", "Dum"]
-
-
-class SlovenianLocale(Locale):
-    names = ["sl", "sl-si"]
-
-    past = "pred {0}"
-    future = "�ez {0}"
-    and_word = "in"
-
-    timeframes = {
-        "now": "zdaj",
-        "second": "sekundo",
-        "seconds": "{0} sekund",
-        "minute": "minuta",
-        "minutes": "{0} minutami",
-        "hour": "uro",
-        "hours": "{0} ur",
-        "day": "dan",
-        "days": "{0} dni",
-        "month": "mesec",
-        "months": "{0} mesecev",
-        "year": "leto",
-        "years": "{0} let",
-    }
-
-    meridians = {"am": "", "pm": "", "AM": "", "PM": ""}
-
-    month_names = [
-        "",
-        "Januar",
-        "Februar",
-        "Marec",
-        "April",
-        "Maj",
-        "Junij",
-        "Julij",
-        "Avgust",
-        "September",
-        "Oktober",
-        "November",
-        "December",
-    ]
-
-    month_abbreviations = [
-        "",
-        "Jan",
-        "Feb",
-        "Mar",
-        "Apr",
-        "Maj",
-        "Jun",
-        "Jul",
-        "Avg",
-        "Sep",
-        "Okt",
-        "Nov",
-        "Dec",
-    ]
-
-    day_names = [
-        "",
-        "Ponedeljek",
-        "Torek",
-        "Sreda",
-        "ÄŒetrtek",
-        "Petek",
-        "Sobota",
-        "Nedelja",
-    ]
-
-    day_abbreviations = ["", "Pon", "Tor", "Sre", "ÄŒet", "Pet", "Sob", "Ned"]
-
-
-class IndonesianLocale(Locale):
-    names = ["id", "id-id"]
-
-    past = "{0} yang lalu"
-    future = "dalam {0}"
-    and_word = "dan"
-
-    timeframes = {
-        "now": "baru saja",
-        "second": "1 sebentar",
-        "seconds": "{0} detik",
-        "minute": "1 menit",
-        "minutes": "{0} menit",
-        "hour": "1 jam",
-        "hours": "{0} jam",
-        "day": "1 hari",
-        "days": "{0} hari",
-        "week": "1 minggu",
-        "weeks": "{0} minggu",
-        "month": "1 bulan",
-        "months": "{0} bulan",
-        "quarter": "1 kuartal",
-        "quarters": "{0} kuartal",
-        "year": "1 tahun",
-        "years": "{0} tahun",
-    }
-
-    meridians = {"am": "", "pm": "", "AM": "", "PM": ""}
-
-    month_names = [
-        "",
-        "Januari",
-        "Februari",
-        "Maret",
-        "April",
-        "Mei",
-        "Juni",
-        "Juli",
-        "Agustus",
-        "September",
-        "Oktober",
-        "November",
-        "Desember",
-    ]
-
-    month_abbreviations = [
-        "",
-        "Jan",
-        "Feb",
-        "Mar",
-        "Apr",
-        "Mei",
-        "Jun",
-        "Jul",
-        "Ags",
-        "Sept",
-        "Okt",
-        "Nov",
-        "Des",
-    ]
-
-    day_names = ["", "Senin", "Selasa", "Rabu", "Kamis", "Jumat", "Sabtu", "Minggu"]
-
-    day_abbreviations = [
-        "",
-        "Senin",
-        "Selasa",
-        "Rabu",
-        "Kamis",
-        "Jumat",
-        "Sabtu",
-        "Minggu",
-    ]
-
-
-class NepaliLocale(Locale):
-    names = ["ne", "ne-np"]
-
-    past = "{0} पहिले"
-    future = "{0} पछी"
-
-    timeframes = {
-        "now": "अहिले",
-        "second": "�क सेकेन�ड",
-        "seconds": "{0} सेकण�ड",
-        "minute": "मिनेट",
-        "minutes": "{0} मिनेट",
-        "hour": "�क घण�टा",
-        "hours": "{0} घण�टा",
-        "day": "�क दिन",
-        "days": "{0} दिन",
-        "month": "�क महिना",
-        "months": "{0} महिना",
-        "year": "�क बर�ष",
-        "years": "{0} बर�ष",
-    }
-
-    meridians = {"am": "पूर�वाह�न", "pm": "अपरान�ह", "AM": "पूर�वाह�न", "PM": "अपरान�ह"}
-
-    month_names = [
-        "",
-        "जनवरी",
-        "फेब�र�अरी",
-        "मार�च",
-        "�प�रील",
-        "मे",
-        "ज�न",
-        "ज�लाई",
-        "अगष�ट",
-        "सेप�टेम�बर",
-        "अक�टोबर",
-        "नोवेम�बर",
-        "डिसेम�बर",
-    ]
-    month_abbreviations = [
-        "",
-        "जन",
-        "फेब",
-        "मार�च",
-        "�प�रील",
-        "मे",
-        "ज�न",
-        "ज�लाई",
-        "अग",
-        "सेप",
-        "अक�ट",
-        "नोव",
-        "डिस",
-    ]
-
-    day_names = [
-        "",
-        "सोमवार",
-        "मंगलवार",
-        "ब�धवार",
-        "बिहिवार",
-        "श�क�रवार",
-        "शनिवार",
-        "आइतवार",
-    ]
-
-    day_abbreviations = ["", "सोम", "मंगल", "ब�ध", "बिहि", "श�क�र", "शनि", "आइत"]
-
-
-class EstonianLocale(Locale):
-    names = ["ee", "et"]
-
-    past = "{0} tagasi"
-    future = "{0} pärast"
-    and_word = "ja"
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Mapping[str, str]]] = {
-        "now": {"past": "just nüüd", "future": "just nüüd"},
-        "second": {"past": "üks sekund", "future": "ühe sekundi"},
-        "seconds": {"past": "{0} sekundit", "future": "{0} sekundi"},
-        "minute": {"past": "üks minut", "future": "ühe minuti"},
-        "minutes": {"past": "{0} minutit", "future": "{0} minuti"},
-        "hour": {"past": "tund aega", "future": "tunni aja"},
-        "hours": {"past": "{0} tundi", "future": "{0} tunni"},
-        "day": {"past": "üks päev", "future": "ühe päeva"},
-        "days": {"past": "{0} päeva", "future": "{0} päeva"},
-        "month": {"past": "üks kuu", "future": "ühe kuu"},
-        "months": {"past": "{0} kuud", "future": "{0} kuu"},
-        "year": {"past": "üks aasta", "future": "ühe aasta"},
-        "years": {"past": "{0} aastat", "future": "{0} aasta"},
-    }
-
-    month_names = [
-        "",
-        "Jaanuar",
-        "Veebruar",
-        "Märts",
-        "Aprill",
-        "Mai",
-        "Juuni",
-        "Juuli",
-        "August",
-        "September",
-        "Oktoober",
-        "November",
-        "Detsember",
-    ]
-    month_abbreviations = [
-        "",
-        "Jan",
-        "Veb",
-        "Mär",
-        "Apr",
-        "Mai",
-        "Jun",
-        "Jul",
-        "Aug",
-        "Sep",
-        "Okt",
-        "Nov",
-        "Dets",
-    ]
-
-    day_names = [
-        "",
-        "Esmaspäev",
-        "Teisipäev",
-        "Kolmapäev",
-        "Neljapäev",
-        "Reede",
-        "Laupäev",
-        "Pühapäev",
-    ]
-    day_abbreviations = ["", "Esm", "Teis", "Kolm", "Nelj", "Re", "Lau", "Püh"]
-
-    def _format_timeframe(self, timeframe: TimeFrameLiteral, delta: int) -> str:
-        form = self.timeframes[timeframe]
-        if delta > 0:
-            _form = form["future"]
-        else:
-            _form = form["past"]
-        return _form.format(abs(delta))
-
-
-class LatvianLocale(Locale):
-    names = ["lv", "lv-lv"]
-
-    past = "pirms {0}"
-    future = "pēc {0}"
-    and_word = "un"
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[str, Mapping[str, str]]]] = {
-        "now": "tagad",
-        "second": "sekundes",
-        "seconds": "{0} sekundēm",
-        "minute": "minūtes",
-        "minutes": "{0} minūtēm",
-        "hour": "stundas",
-        "hours": "{0} stund�m",
-        "day": "dienas",
-        "days": "{0} dien�m",
-        "week": "nedēļas",
-        "weeks": "{0} nedēļ�m",
-        "month": "mēneša",
-        "months": "{0} mēnešiem",
-        "year": "gada",
-        "years": "{0} gadiem",
-    }
-
-    month_names = [
-        "",
-        "janv�ris",
-        "febru�ris",
-        "marts",
-        "aprīlis",
-        "maijs",
-        "jūnijs",
-        "jūlijs",
-        "augusts",
-        "septembris",
-        "oktobris",
-        "novembris",
-        "decembris",
-    ]
-
-    month_abbreviations = [
-        "",
-        "jan",
-        "feb",
-        "marts",
-        "apr",
-        "maijs",
-        "jūnijs",
-        "jūlijs",
-        "aug",
-        "sept",
-        "okt",
-        "nov",
-        "dec",
-    ]
-
-    day_names = [
-        "",
-        "pirmdiena",
-        "otrdiena",
-        "trešdiena",
-        "ceturtdiena",
-        "piektdiena",
-        "sestdiena",
-        "svētdiena",
-    ]
-
-    day_abbreviations = [
-        "",
-        "pi",
-        "ot",
-        "tr",
-        "ce",
-        "pi",
-        "se",
-        "sv",
-    ]
-
-
-class SwahiliLocale(Locale):
-    names = [
-        "sw",
-        "sw-ke",
-        "sw-tz",
-    ]
-
-    past = "{0} iliyopita"
-    future = "muda wa {0}"
-    and_word = "na"
-
-    timeframes = {
-        "now": "sasa hivi",
-        "second": "sekunde",
-        "seconds": "sekunde {0}",
-        "minute": "dakika moja",
-        "minutes": "dakika {0}",
-        "hour": "saa moja",
-        "hours": "saa {0}",
-        "day": "siku moja",
-        "days": "siku {0}",
-        "week": "wiki moja",
-        "weeks": "wiki {0}",
-        "month": "mwezi moja",
-        "months": "miezi {0}",
-        "year": "mwaka moja",
-        "years": "miaka {0}",
-    }
-
-    meridians = {"am": "asu", "pm": "mch", "AM": "ASU", "PM": "MCH"}
-
-    month_names = [
-        "",
-        "Januari",
-        "Februari",
-        "Machi",
-        "Aprili",
-        "Mei",
-        "Juni",
-        "Julai",
-        "Agosti",
-        "Septemba",
-        "Oktoba",
-        "Novemba",
-        "Desemba",
-    ]
-    month_abbreviations = [
-        "",
-        "Jan",
-        "Feb",
-        "Mac",
-        "Apr",
-        "Mei",
-        "Jun",
-        "Jul",
-        "Ago",
-        "Sep",
-        "Okt",
-        "Nov",
-        "Des",
-    ]
-
-    day_names = [
-        "",
-        "Jumatatu",
-        "Jumanne",
-        "Jumatano",
-        "Alhamisi",
-        "Ijumaa",
-        "Jumamosi",
-        "Jumapili",
-    ]
-    day_abbreviations = [
-        "",
-        "Jumatatu",
-        "Jumanne",
-        "Jumatano",
-        "Alhamisi",
-        "Ijumaa",
-        "Jumamosi",
-        "Jumapili",
-    ]
-
-
-class CroatianLocale(Locale):
-    names = ["hr", "hr-hr"]
-
-    past = "prije {0}"
-    future = "za {0}"
-    and_word = "i"
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[str, Mapping[str, str]]]] = {
-        "now": "upravo sad",
-        "second": "sekundu",
-        "seconds": {"double": "{0} sekunde", "higher": "{0} sekundi"},
-        "minute": "minutu",
-        "minutes": {"double": "{0} minute", "higher": "{0} minuta"},
-        "hour": "sat",
-        "hours": {"double": "{0} sata", "higher": "{0} sati"},
-        "day": "jedan dan",
-        "days": {"double": "{0} dana", "higher": "{0} dana"},
-        "week": "tjedan",
-        "weeks": {"double": "{0} tjedna", "higher": "{0} tjedana"},
-        "month": "mjesec",
-        "months": {"double": "{0} mjeseca", "higher": "{0} mjeseci"},
-        "year": "godinu",
-        "years": {"double": "{0} godine", "higher": "{0} godina"},
-    }
-
-    month_names = [
-        "",
-        "sije�anj",
-        "velja�a",
-        "ožujak",
-        "travanj",
-        "svibanj",
-        "lipanj",
-        "srpanj",
-        "kolovoz",
-        "rujan",
-        "listopad",
-        "studeni",
-        "prosinac",
-    ]
-
-    month_abbreviations = [
-        "",
-        "sije�",
-        "velj",
-        "ožuj",
-        "trav",
-        "svib",
-        "lip",
-        "srp",
-        "kol",
-        "ruj",
-        "list",
-        "stud",
-        "pros",
-    ]
-
-    day_names = [
-        "",
-        "ponedjeljak",
-        "utorak",
-        "srijeda",
-        "�etvrtak",
-        "petak",
-        "subota",
-        "nedjelja",
-    ]
-
-    day_abbreviations = [
-        "",
-        "po",
-        "ut",
-        "sr",
-        "�e",
-        "pe",
-        "su",
-        "ne",
-    ]
-
-    def _format_timeframe(self, timeframe: TimeFrameLiteral, delta: int) -> str:
-        form = self.timeframes[timeframe]
-        delta = abs(delta)
-        if isinstance(form, Mapping):
-            if 1 < delta <= 4:
-                form = form["double"]
-            else:
-                form = form["higher"]
-
-        return form.format(delta)
-
-
-class LatinLocale(Locale):
-    names = ["la", "la-va"]
-
-    past = "ante {0}"
-    future = "in {0}"
-    and_word = "et"
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[str, Mapping[str, str]]]] = {
-        "now": "nunc",
-        "second": "secundum",
-        "seconds": "{0} secundis",
-        "minute": "minutam",
-        "minutes": "{0} minutis",
-        "hour": "horam",
-        "hours": "{0} horas",
-        "day": "diem",
-        "days": "{0} dies",
-        "week": "hebdomadem",
-        "weeks": "{0} hebdomades",
-        "month": "mensem",
-        "months": "{0} mensis",
-        "year": "annum",
-        "years": "{0} annos",
-    }
-
-    month_names = [
-        "",
-        "Ianuarius",
-        "Februarius",
-        "Martius",
-        "Aprilis",
-        "Maius",
-        "Iunius",
-        "Iulius",
-        "Augustus",
-        "September",
-        "October",
-        "November",
-        "December",
-    ]
-
-    month_abbreviations = [
-        "",
-        "Ian",
-        "Febr",
-        "Mart",
-        "Apr",
-        "Mai",
-        "Iun",
-        "Iul",
-        "Aug",
-        "Sept",
-        "Oct",
-        "Nov",
-        "Dec",
-    ]
-
-    day_names = [
-        "",
-        "dies Lunae",
-        "dies Martis",
-        "dies Mercurii",
-        "dies Iovis",
-        "dies Veneris",
-        "dies Saturni",
-        "dies Solis",
-    ]
-
-    day_abbreviations = [
-        "",
-        "dies Lunae",
-        "dies Martis",
-        "dies Mercurii",
-        "dies Iovis",
-        "dies Veneris",
-        "dies Saturni",
-        "dies Solis",
-    ]
-
-
-class LithuanianLocale(Locale):
-    names = ["lt", "lt-lt"]
-
-    past = "prieš {0}"
-    future = "po {0}"
-    and_word = "ir"
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[str, Mapping[str, str]]]] = {
-        "now": "dabar",
-        "second": "sekundÄ—s",
-        "seconds": "{0} sekundžių",
-        "minute": "minutÄ—s",
-        "minutes": "{0} minu�ių",
-        "hour": "valandos",
-        "hours": "{0} valandų",
-        "day": "dienÄ…",
-        "days": "{0} dienų",
-        "week": "savaitÄ—s",
-        "weeks": "{0} savai�ių",
-        "month": "mÄ—nesio",
-        "months": "{0} mėnesių",
-        "year": "metų",
-        "years": "{0} metų",
-    }
-
-    month_names = [
-        "",
-        "sausis",
-        "vasaris",
-        "kovas",
-        "balandis",
-        "gegužė",
-        "birželis",
-        "liepa",
-        "rugpjūtis",
-        "rugsÄ—jis",
-        "spalis",
-        "lapkritis",
-        "gruodis",
-    ]
-
-    month_abbreviations = [
-        "",
-        "saus",
-        "vas",
-        "kovas",
-        "bal",
-        "geg",
-        "birž",
-        "liepa",
-        "rugp",
-        "rugs",
-        "spalis",
-        "lapkr",
-        "gr",
-    ]
-
-    day_names = [
-        "",
-        "pirmadienis",
-        "antradienis",
-        "tre�iadienis",
-        "ketvirtadienis",
-        "penktadienis",
-        "šeštadienis",
-        "sekmadienis",
-    ]
-
-    day_abbreviations = [
-        "",
-        "pi",
-        "an",
-        "tr",
-        "ke",
-        "pe",
-        "Å¡e",
-        "se",
-    ]
-
-
-class MalayLocale(Locale):
-    names = ["ms", "ms-my", "ms-bn"]
-
-    past = "{0} yang lalu"
-    future = "dalam {0}"
-    and_word = "dan"
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[str, Mapping[str, str]]]] = {
-        "now": "sekarang",
-        "second": "saat",
-        "seconds": "{0} saat",
-        "minute": "minit",
-        "minutes": "{0} minit",
-        "hour": "jam",
-        "hours": "{0} jam",
-        "day": "hari",
-        "days": "{0} hari",
-        "week": "minggu",
-        "weeks": "{0} minggu",
-        "month": "bulan",
-        "months": "{0} bulan",
-        "year": "tahun",
-        "years": "{0} tahun",
-    }
-
-    month_names = [
-        "",
-        "Januari",
-        "Februari",
-        "Mac",
-        "April",
-        "Mei",
-        "Jun",
-        "Julai",
-        "Ogos",
-        "September",
-        "Oktober",
-        "November",
-        "Disember",
-    ]
-
-    month_abbreviations = [
-        "",
-        "Jan.",
-        "Feb.",
-        "Mac",
-        "Apr.",
-        "Mei",
-        "Jun",
-        "Julai",
-        "Og.",
-        "Sept.",
-        "Okt.",
-        "Nov.",
-        "Dis.",
-    ]
-
-    day_names = [
-        "",
-        "Isnin",
-        "Selasa",
-        "Rabu",
-        "Khamis",
-        "Jumaat",
-        "Sabtu",
-        "Ahad",
-    ]
-
-    day_abbreviations = [
-        "",
-        "Isnin",
-        "Selasa",
-        "Rabu",
-        "Khamis",
-        "Jumaat",
-        "Sabtu",
-        "Ahad",
-    ]
-
-
-class MalteseLocale(Locale):
-    names = ["mt", "mt-mt"]
-
-    past = "{0} ilu"
-    future = "fi {0}"
-    and_word = "u"
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[str, Mapping[str, str]]]] = {
-        "now": "issa",
-        "second": "sekonda",
-        "seconds": "{0} sekondi",
-        "minute": "minuta",
-        "minutes": "{0} minuti",
-        "hour": "siegħa",
-        "hours": {"dual": "{0} sagħtejn", "plural": "{0} sigħat"},
-        "day": "jum",
-        "days": {"dual": "{0} jumejn", "plural": "{0} ijiem"},
-        "week": "ġimgħa",
-        "weeks": {"dual": "{0} ġimagħtejn", "plural": "{0} ġimgħat"},
-        "month": "xahar",
-        "months": {"dual": "{0} xahrejn", "plural": "{0} xhur"},
-        "year": "sena",
-        "years": {"dual": "{0} sentejn", "plural": "{0} snin"},
-    }
-
-    month_names = [
-        "",
-        "Jannar",
-        "Frar",
-        "Marzu",
-        "April",
-        "Mejju",
-        "Ä unju",
-        "Lulju",
-        "Awwissu",
-        "Settembru",
-        "Ottubru",
-        "Novembru",
-        "Diċembru",
-    ]
-
-    month_abbreviations = [
-        "",
-        "Jan",
-        "Fr",
-        "Mar",
-        "Apr",
-        "Mejju",
-        "Ä un",
-        "Lul",
-        "Aw",
-        "Sett",
-        "Ott",
-        "Nov",
-        "Diċ",
-    ]
-
-    day_names = [
-        "",
-        "It-Tnejn",
-        "It-Tlieta",
-        "L-Erbgħa",
-        "Il-Ħamis",
-        "Il-Ġimgħa",
-        "Is-Sibt",
-        "Il-Ħadd",
-    ]
-
-    day_abbreviations = [
-        "",
-        "T",
-        "TL",
-        "E",
-        "Ħ",
-        "Ä ",
-        "S",
-        "Ħ",
-    ]
-
-    def _format_timeframe(self, timeframe: TimeFrameLiteral, delta: int) -> str:
-        form = self.timeframes[timeframe]
-        delta = abs(delta)
-        if isinstance(form, Mapping):
-            if delta == 2:
-                form = form["dual"]
-            else:
-                form = form["plural"]
-
-        return form.format(delta)
-
-
-class SamiLocale(Locale):
-    names = ["se", "se-fi", "se-no", "se-se"]
-
-    past = "{0} dassái"
-    future = "{0} "  # NOTE: couldn't find preposition for Sami here, none needed?
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[str, Mapping[str, str]]]] = {
-        "now": "dál",
-        "second": "sekunda",
-        "seconds": "{0} sekundda",
-        "minute": "minuhta",
-        "minutes": "{0} minuhta",
-        "hour": "diimmu",
-        "hours": "{0} diimmu",
-        "day": "beaivvi",
-        "days": "{0} beaivvi",
-        "week": "vahku",
-        "weeks": "{0} vahku",
-        "month": "mánu",
-        "months": "{0} mánu",
-        "year": "jagi",
-        "years": "{0} jagi",
-    }
-
-    month_names = [
-        "",
-        "Ođđajagimánnu",
-        "Guovvamánnu",
-        "Njuk�amánnu",
-        "Cuoŋománnu",
-        "Miessemánnu",
-        "Geassemánnu",
-        "Suoidnemánnu",
-        "Borgemánnu",
-        "Čak�amánnu",
-        "Golggotmánnu",
-        "Skábmamánnu",
-        "Juovlamánnu",
-    ]
-
-    month_abbreviations = [
-        "",
-        "Ođđajagimánnu",
-        "Guovvamánnu",
-        "Njuk�amánnu",
-        "Cuoŋománnu",
-        "Miessemánnu",
-        "Geassemánnu",
-        "Suoidnemánnu",
-        "Borgemánnu",
-        "Čak�amánnu",
-        "Golggotmánnu",
-        "Skábmamánnu",
-        "Juovlamánnu",
-    ]
-
-    day_names = [
-        "",
-        "Mánnodat",
-        "Disdat",
-        "Gaskavahkku",
-        "Duorastat",
-        "Bearjadat",
-        "Lávvordat",
-        "Sotnabeaivi",
-    ]
-
-    day_abbreviations = [
-        "",
-        "Mánnodat",
-        "Disdat",
-        "Gaskavahkku",
-        "Duorastat",
-        "Bearjadat",
-        "Lávvordat",
-        "Sotnabeaivi",
-    ]
-
-
-class OdiaLocale(Locale):
-    names = ["or", "or-in"]
-
-    past = "{0} ପୂର�ବେ"
-    future = "{0} ପରେ"
-
-    timeframes = {
-        "now": "ବର�ତ�ତମାନ",
-        "second": "�କ ସେକେଣ�ଡ",
-        "seconds": "{0} ସେକେଣ�ଡ",
-        "minute": "�କ ମିନଟ",
-        "minutes": "{0} ମିନଟ",
-        "hour": "�କ ଘଣ�ଟା",
-        "hours": "{0} ଘଣ�ଟା",
-        "day": "�କ ଦିନ",
-        "days": "{0} ଦିନ",
-        "month": "�କ ମାସ",
-        "months": "{0} ମାସ ",
-        "year": "�କ ବର�ଷ",
-        "years": "{0} ବର�ଷ",
-    }
-
-    meridians = {"am": "ପୂର�ବାହ�ନ", "pm": "ଅପରାହ�ନ", "AM": "ପୂର�ବାହ�ନ", "PM": "ଅପରାହ�ନ"}
-
-    month_names = [
-        "",
-        "ଜାନ�ଆରୀ",
-        "ଫେବୃଆରୀ",
-        "ମାର�ଚ�ଚ�",
-        "ଅପ�ରେଲ",
-        "ମଇ",
-        "ଜ�ନ�",
-        "ଜ�ଲାଇ",
-        "ଅଗଷ�ଟ",
-        "ସେପ�ଟେମ�ବର",
-        "ଅକ�ଟୋବର�",
-        "ନଭେମ�ବର�",
-        "ଡିସେମ�ବର�",
-    ]
-    month_abbreviations = [
-        "",
-        "ଜାନ�",
-        "ଫେବୃ",
-        "ମାର�ଚ�ଚ�",
-        "ଅପ�ରେ",
-        "ମଇ",
-        "ଜ�ନ�",
-        "ଜ�ଲା",
-        "ଅଗ",
-        "ସେପ�ଟେ",
-        "ଅକ�ଟୋ",
-        "ନଭେ",
-        "ଡିସେ",
-    ]
-
-    day_names = [
-        "",
-        "ସୋମବାର",
-        "ମଙ�ଗଳବାର",
-        "ବ�ଧବାର",
-        "ଗ�ର�ବାର",
-        "ଶ�କ�ରବାର",
-        "ଶନିବାର",
-        "ରବିବାର",
-    ]
-    day_abbreviations = [
-        "",
-        "ସୋମ",
-        "ମଙ�ଗଳ",
-        "ବ�ଧ",
-        "ଗ�ର�",
-        "ଶ�କ�ର",
-        "ଶନି",
-        "ରବି",
-    ]
-
-    def _ordinal_number(self, n: int) -> str:
-        if n > 10 or n == 0:
-            return f"{n}ତମ"
-        if n in [1, 5, 7, 8, 9, 10]:
-            return f"{n}ମ"
-        if n in [2, 3]:
-            return f"{n}à­Ÿ"
-        if n == 4:
-            return f"{n}ର�ଥ"
-        if n == 6:
-            return f"{n}ଷ�ଠ"
-        return ""
-
-
-class SerbianLocale(Locale):
-    names = ["sr", "sr-rs", "sr-sp"]
-
-    past = "pre {0}"
-    future = "za {0}"
-    and_word = "i"
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[str, Mapping[str, str]]]] = {
-        "now": "sada",
-        "second": "sekundu",
-        "seconds": {"double": "{0} sekunde", "higher": "{0} sekundi"},
-        "minute": "minutu",
-        "minutes": {"double": "{0} minute", "higher": "{0} minuta"},
-        "hour": "sat",
-        "hours": {"double": "{0} sata", "higher": "{0} sati"},
-        "day": "dan",
-        "days": {"double": "{0} dana", "higher": "{0} dana"},
-        "week": "nedelju",
-        "weeks": {"double": "{0} nedelje", "higher": "{0} nedelja"},
-        "month": "mesec",
-        "months": {"double": "{0} meseca", "higher": "{0} meseci"},
-        "year": "godinu",
-        "years": {"double": "{0} godine", "higher": "{0} godina"},
-    }
-
-    month_names = [
-        "",
-        "januar",  # јануар
-        "februar",  # фебруар
-        "mart",  # март
-        "april",  # април
-        "maj",  # мај
-        "jun",  # јун
-        "jul",  # јул
-        "avgust",  # авгу�т
-        "septembar",  # �ептембар
-        "oktobar",  # октобар
-        "novembar",  # новембар
-        "decembar",  # децембар
-    ]
-
-    month_abbreviations = [
-        "",
-        "jan",
-        "feb",
-        "mar",
-        "apr",
-        "maj",
-        "jun",
-        "jul",
-        "avg",
-        "sep",
-        "okt",
-        "nov",
-        "dec",
-    ]
-
-    day_names = [
-        "",
-        "ponedeljak",  # понедељак
-        "utorak",  # уторак
-        "sreda",  # �реда
-        "�etvrtak",  # четвртак
-        "petak",  # петак
-        "subota",  # �убота
-        "nedelja",  # недеља
-    ]
-
-    day_abbreviations = [
-        "",
-        "po",  # по
-        "ut",  # ут
-        "sr",  # �р
-        "�e",  # че
-        "pe",  # пе
-        "su",  # �у
-        "ne",  # не
-    ]
-
-    def _format_timeframe(self, timeframe: TimeFrameLiteral, delta: int) -> str:
-        form = self.timeframes[timeframe]
-        delta = abs(delta)
-        if isinstance(form, Mapping):
-            if 1 < delta <= 4:
-                form = form["double"]
-            else:
-                form = form["higher"]
-
-        return form.format(delta)
-
-
-class LuxembourgishLocale(Locale):
-    names = ["lb", "lb-lu"]
-
-    past = "virun {0}"
-    future = "an {0}"
-    and_word = "an"
-
-    timeframes: ClassVar[Dict[TimeFrameLiteral, str]] = {
-        "now": "just elo",
-        "second": "enger Sekonn",
-        "seconds": "{0} Sekonnen",
-        "minute": "enger Minutt",
-        "minutes": "{0} Minutten",
-        "hour": "enger Stonn",
-        "hours": "{0} Stonnen",
-        "day": "engem Dag",
-        "days": "{0} Deeg",
-        "week": "enger Woch",
-        "weeks": "{0} Wochen",
-        "month": "engem Mount",
-        "months": "{0} Méint",
-        "year": "engem Joer",
-        "years": "{0} Jahren",
-    }
-
-    timeframes_only_distance = timeframes.copy()
-    timeframes_only_distance["second"] = "eng Sekonn"
-    timeframes_only_distance["minute"] = "eng Minutt"
-    timeframes_only_distance["hour"] = "eng Stonn"
-    timeframes_only_distance["day"] = "een Dag"
-    timeframes_only_distance["days"] = "{0} Deeg"
-    timeframes_only_distance["week"] = "eng Woch"
-    timeframes_only_distance["month"] = "ee Mount"
-    timeframes_only_distance["months"] = "{0} Méint"
-    timeframes_only_distance["year"] = "ee Joer"
-    timeframes_only_distance["years"] = "{0} Joer"
-
-    month_names = [
-        "",
-        "Januar",
-        "Februar",
-        "Mäerz",
-        "Abrëll",
-        "Mee",
-        "Juni",
-        "Juli",
-        "August",
-        "September",
-        "Oktouber",
-        "November",
-        "Dezember",
-    ]
-
-    month_abbreviations = [
-        "",
-        "Jan",
-        "Feb",
-        "Mäe",
-        "Abr",
-        "Mee",
-        "Jun",
-        "Jul",
-        "Aug",
-        "Sep",
-        "Okt",
-        "Nov",
-        "Dez",
-    ]
-
-    day_names = [
-        "",
-        "Méindeg",
-        "Dënschdeg",
-        "Mëttwoch",
-        "Donneschdeg",
-        "Freideg",
-        "Samschdeg",
-        "Sonndeg",
-    ]
-
-    day_abbreviations = ["", "Méi", "Dën", "Mët", "Don", "Fre", "Sam", "Son"]
-
-    def _ordinal_number(self, n: int) -> str:
-        return f"{n}."
-
-    def describe(
-        self,
-        timeframe: TimeFrameLiteral,
-        delta: Union[int, float] = 0,
-        only_distance: bool = False,
-    ) -> str:
-        if not only_distance:
-            return super().describe(timeframe, delta, only_distance)
-
-        # Luxembourgish uses a different case without 'in' or 'ago'
-        humanized: str = self.timeframes_only_distance[timeframe].format(
-            trunc(abs(delta))
-        )
-
-        return humanized
-
-
-class ZuluLocale(Locale):
-    names = ["zu", "zu-za"]
-
-    past = "{0} edlule"
-    future = "{0} "
-    and_word = "futhi"
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[Mapping[str, str], str]]] = {
-        "now": "manje",
-        "second": {"past": "umzuzwana", "future": "ngomzuzwana"},
-        "seconds": {"past": "{0} imizuzwana", "future": "{0} ngemizuzwana"},
-        "minute": {"past": "umzuzu", "future": "ngomzuzu"},
-        "minutes": {"past": "{0} imizuzu", "future": "{0} ngemizuzu"},
-        "hour": {"past": "ihora", "future": "ngehora"},
-        "hours": {"past": "{0} amahora", "future": "{0} emahoreni"},
-        "day": {"past": "usuku", "future": "ngosuku"},
-        "days": {"past": "{0} izinsuku", "future": "{0} ezinsukwini"},
-        "week": {"past": "isonto", "future": "ngesonto"},
-        "weeks": {"past": "{0} amasonto", "future": "{0} emasontweni"},
-        "month": {"past": "inyanga", "future": "ngenyanga"},
-        "months": {"past": "{0} izinyanga", "future": "{0} ezinyangeni"},
-        "year": {"past": "unyaka", "future": "ngonyak"},
-        "years": {"past": "{0} iminyaka", "future": "{0} eminyakeni"},
-    }
-
-    def _format_timeframe(self, timeframe: TimeFrameLiteral, delta: int) -> str:
-        """Zulu aware time frame format function, takes into account
-        the differences between past and future forms."""
-        abs_delta = abs(delta)
-        form = self.timeframes[timeframe]
-
-        if isinstance(form, str):
-            return form.format(abs_delta)
-
-        if delta > 0:
-            key = "future"
-        else:
-            key = "past"
-        form = form[key]
-
-        return form.format(abs_delta)
-
-    month_names = [
-        "",
-        "uMasingane",
-        "uNhlolanja",
-        "uNdasa",
-        "UMbasa",
-        "UNhlaba",
-        "UNhlangulana",
-        "uNtulikazi",
-        "UNcwaba",
-        "uMandulo",
-        "uMfumfu",
-        "uLwezi",
-        "uZibandlela",
-    ]
-
-    month_abbreviations = [
-        "",
-        "uMasingane",
-        "uNhlolanja",
-        "uNdasa",
-        "UMbasa",
-        "UNhlaba",
-        "UNhlangulana",
-        "uNtulikazi",
-        "UNcwaba",
-        "uMandulo",
-        "uMfumfu",
-        "uLwezi",
-        "uZibandlela",
-    ]
-
-    day_names = [
-        "",
-        "uMsombuluko",
-        "uLwesibili",
-        "uLwesithathu",
-        "uLwesine",
-        "uLwesihlanu",
-        "uMgqibelo",
-        "iSonto",
-    ]
-
-    day_abbreviations = [
-        "",
-        "uMsombuluko",
-        "uLwesibili",
-        "uLwesithathu",
-        "uLwesine",
-        "uLwesihlanu",
-        "uMgqibelo",
-        "iSonto",
-    ]
-
-
-class TamilLocale(Locale):
-    names = ["ta", "ta-in", "ta-lk"]
-
-    past = "{0} நேரத�திற�க� ம�ன�ப�"
-    future = "இல� {0}"
-
-    timeframes = {
-        "now": "இப�போத�",
-        "second": "ஒர� இரண�டாவத�",
-        "seconds": "{0} விநாடிகள�",
-        "minute": "ஒர� நிமிடம�",
-        "minutes": "{0} நிமிடங�கள�",
-        "hour": "ஒர� மணி",
-        "hours": "{0} மணிநேரம�",
-        "day": "ஒர� நாள�",
-        "days": "{0} நாட�கள�",
-        "week": "ஒர� வாரம�",
-        "weeks": "{0} வாரங�கள�",
-        "month": "ஒர� மாதம�",
-        "months": "{0} மாதங�கள�",
-        "year": "ஒர� ஆண�ட�",
-        "years": "{0} ஆண�ட�கள�",
-    }
-
-    month_names = [
-        "",
-        "சித�திரை",
-        "வைகாசி",
-        "ஆனி",
-        "ஆடி",
-        "ஆவணி",
-        "ப�ரட�டாசி",
-        "�ப�பசி",
-        "கார�த�திகை",
-        "மார�கழி",
-        "தை",
-        "மாசி",
-        "பங�க�னி",
-    ]
-
-    month_abbreviations = [
-        "",
-        "ஜன",
-        "பிப�",
-        "மார�",
-        "�ப�",
-        "மே",
-        "ஜூன�",
-        "ஜூலை",
-        "ஆக",
-        "செப�",
-        "அக�",
-        "நவ",
-        "டிச",
-    ]
-
-    day_names = [
-        "",
-        "திங�கட�கிழமை",
-        "செவ�வாய�க�கிழமை",
-        "ப�தன�கிழமை",
-        "வியாழக�கிழமை",
-        "வெள�ளிக�கிழமை",
-        "சனிக�கிழமை",
-        "ஞாயிற�ற�க�கிழமை",
-    ]
-
-    day_abbreviations = [
-        "",
-        "திங�கட�",
-        "செவ�வாய�",
-        "ப�தன�",
-        "வியாழன�",
-        "வெள�ளி",
-        "சனி",
-        "ஞாயிற�",
-    ]
-
-    def _ordinal_number(self, n: int) -> str:
-        if n == 1:
-            return f"{n}வத�"
-        elif n >= 0:
-            return f"{n}ஆம�"
-        else:
-            return ""
-
-
-class AlbanianLocale(Locale):
-    names = ["sq", "sq-al"]
-
-    past = "{0} më parë"
-    future = "në {0}"
-    and_word = "dhe"
-
-    timeframes = {
-        "now": "tani",
-        "second": "sekondë",
-        "seconds": "{0} sekonda",
-        "minute": "minutë",
-        "minutes": "{0} minuta",
-        "hour": "orë",
-        "hours": "{0} orë",
-        "day": "ditë",
-        "days": "{0} ditë",
-        "week": "javë",
-        "weeks": "{0} javë",
-        "month": "muaj",
-        "months": "{0} muaj",
-        "year": "vit",
-        "years": "{0} vjet",
-    }
-
-    month_names = [
-        "",
-        "janar",
-        "shkurt",
-        "mars",
-        "prill",
-        "maj",
-        "qershor",
-        "korrik",
-        "gusht",
-        "shtator",
-        "tetor",
-        "nëntor",
-        "dhjetor",
-    ]
-
-    month_abbreviations = [
-        "",
-        "jan",
-        "shk",
-        "mar",
-        "pri",
-        "maj",
-        "qer",
-        "korr",
-        "gush",
-        "sht",
-        "tet",
-        "nën",
-        "dhj",
-    ]
-
-    day_names = [
-        "",
-        "e hënë",
-        "e martë",
-        "e mërkurë",
-        "e enjte",
-        "e premte",
-        "e shtunë",
-        "e diel",
-    ]
-
-    day_abbreviations = [
-        "",
-        "hën",
-        "mar",
-        "mër",
-        "enj",
-        "pre",
-        "sht",
-        "die",
-    ]
-
-
-class GeorgianLocale(Locale):
-    names = ["ka", "ka-ge"]
-
-    past = "{0} წინ"  # ts’in
-    future = "{0} შემდეგ"  # shemdeg
-    and_word = "დ�"  # da
-
-    timeframes = {
-        "now": "�ხლ�",  # akhla
-        # When a cardinal qualifies a noun, it stands in the singular
-        "second": "წ�მის",  # ts’amis
-        "seconds": "{0} წ�მის",
-        "minute": "წუთის",  # ts’utis
-        "minutes": "{0} წუთის",
-        "hour": "ს��თის",  # saatis
-        "hours": "{0} ს��თის",
-        "day": "დღის",  # dghis
-        "days": "{0} დღის",
-        "week": "კვირის",  # k’viris
-        "weeks": "{0} კვირის",
-        "month": "თვის",  # tvis
-        "months": "{0} თვის",
-        "year": "წლის",  # ts’lis
-        "years": "{0} წლის",
-    }
-
-    month_names = [
-        # modern month names
-        "",
-        "ი�ნვ�რი",  # Ianvari
-        "თებერვ�ლი",  # Tebervali
-        "მ�რტი",  # Mart'i
-        "�პრილი",  # Ap'rili
-        "მ�ისი",  # Maisi
-        "ივნისი",  # Ivnisi
-        "ივლისი",  # Ivlisi
-        "�გვისტ�",  # Agvist'o
-        "სექტემბერი",  # Sekt'emberi
-        "�ქტ�მბერი",  # Okt'omberi
-        "ნ�ემბერი",  # Noemberi
-        "დეკემბერი",  # Dek'emberi
-    ]
-
-    month_abbreviations = [
-        # no abbr. found yet
-        "",
-        "ი�ნვ�რი",  # Ianvari
-        "თებერვ�ლი",  # Tebervali
-        "მ�რტი",  # Mart'i
-        "�პრილი",  # Ap'rili
-        "მ�ისი",  # Maisi
-        "ივნისი",  # Ivnisi
-        "ივლისი",  # Ivlisi
-        "�გვისტ�",  # Agvist'o
-        "სექტემბერი",  # Sekt'emberi
-        "�ქტ�მბერი",  # Okt'omberi
-        "ნ�ემბერი",  # Noemberi
-        "დეკემბერი",  # Dek'emberi
-    ]
-
-    day_names = [
-        "",
-        "�რშ�ბ�თი",  # orshabati
-        "ს�მშ�ბ�თი",  # samshabati
-        "�თხშ�ბ�თი",  # otkhshabati
-        "ხუთშ�ბ�თი",  # khutshabati
-        "პ�რ�სკევი",  # p’arask’evi
-        "შ�ბ�თი",  # shabati
-        # "k’vira" also serves as week; to avoid confusion "k’vira-dge" can be used for Sunday
-        "კვირ�",  # k’vira
-    ]
-
-    day_abbreviations = [
-        "",
-        "�რშ�ბ�თი",  # orshabati
-        "ს�მშ�ბ�თი",  # samshabati
-        "�თხშ�ბ�თი",  # otkhshabati
-        "ხუთშ�ბ�თი",  # khutshabati
-        "პ�რ�სკევი",  # p’arask’evi
-        "შ�ბ�თი",  # shabati
-        "კვირ�",  # k’vira
-    ]
-
-
-class SinhalaLocale(Locale):
-    names = ["si", "si-lk"]
-
-    past = "{0}ට පෙර"
-    future = "{0}"
-    and_word = "සහ"
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[Mapping[str, str], str]]] = {
-        "now": "ද�න්",
-        "second": {
-            "past": "තත්පරයක",
-            "future": "තත්පරයකින්",
-        },  # ක් is the article
-        "seconds": {
-            "past": "තත්පර {0} ක",
-            "future": "තත්පර {0} කින්",
-        },
-        "minute": {
-            "past": "වින�ඩියක",
-            "future": "වින�ඩියකින්",
-        },
-        "minutes": {
-            "past": "වින�ඩි {0} ක",
-            "future": "මිනිත්තු {0} කින්",
-        },
-        "hour": {"past": "ප�යක", "future": "ප�යකින්"},
-        "hours": {
-            "past": "ප�ය {0} ක",
-            "future": "ප�ය {0} කින්",
-        },
-        "day": {"past": "දිනක", "future": "දිනකට"},
-        "days": {
-            "past": "දින {0} ක",
-            "future": "දින {0} කින්",
-        },
-        "week": {"past": "සතියක", "future": "සතියකින්"},
-        "weeks": {
-            "past": "සති {0} ක",
-            "future": "සති {0} කින්",
-        },
-        "month": {"past": "ම�සයක", "future": "එය ම�සය තුළ"},
-        "months": {
-            "past": "ම�ස {0} ක",
-            "future": "ම�ස {0} කින්",
-        },
-        "year": {"past": "වසරක", "future": "වසරක් තුළ"},
-        "years": {
-            "past": "අවුරුදු {0} ක",
-            "future": "අවුරුදු {0} තුළ",
-        },
-    }
-    # Sinhala: the general format to describe timeframe is different from past and future,
-    # so we do not copy the original timeframes dictionary
-    timeframes_only_distance = {}
-    timeframes_only_distance["second"] = "තත්පරයක්"
-    timeframes_only_distance["seconds"] = "තත්පර {0}"
-    timeframes_only_distance["minute"] = "මිනිත්තුවක්"
-    timeframes_only_distance["minutes"] = "වින�ඩි {0}"
-    timeframes_only_distance["hour"] = "ප�යක්"
-    timeframes_only_distance["hours"] = "ප�ය {0}"
-    timeframes_only_distance["day"] = "දවසක්"
-    timeframes_only_distance["days"] = "දවස් {0}"
-    timeframes_only_distance["week"] = "සතියක්"
-    timeframes_only_distance["weeks"] = "සති {0}"
-    timeframes_only_distance["month"] = "ම�සයක්"
-    timeframes_only_distance["months"] = "ම�ස {0}"
-    timeframes_only_distance["year"] = "අවුරුද්දක්"
-    timeframes_only_distance["years"] = "අවුරුදු {0}"
-
-    def _format_timeframe(self, timeframe: TimeFrameLiteral, delta: int) -> str:
-        """
-        Sinhala awares time frame format function, takes into account
-        the differences between general, past, and future forms (three different suffixes).
-        """
-        abs_delta = abs(delta)
-        form = self.timeframes[timeframe]
-
-        if isinstance(form, str):
-            return form.format(abs_delta)
-
-        if delta > 0:
-            key = "future"
-        else:
-            key = "past"
-        form = form[key]
-
-        return form.format(abs_delta)
-
-    def describe(
-        self,
-        timeframe: TimeFrameLiteral,
-        delta: Union[float, int] = 1,  # key is always future when only_distance=False
-        only_distance: bool = False,
-    ) -> str:
-        """Describes a delta within a timeframe in plain language.
-
-        :param timeframe: a string representing a timeframe.
-        :param delta: a quantity representing a delta in a timeframe.
-        :param only_distance: return only distance eg: "11 seconds" without "in" or "ago" keywords
-        """
-
-        if not only_distance:
-            return super().describe(timeframe, delta, only_distance)
-        # Sinhala uses a different case without 'in' or 'ago'
-        humanized = self.timeframes_only_distance[timeframe].format(trunc(abs(delta)))
-
-        return humanized
-
-    month_names = [
-        "",
-        "ජනව�රි",
-        "පෙබරව�රි",
-        "ම�ර්තු",
-        "අප්�රේල්",
-        "ම�යි",
-        "ජූනි",
-        "ජූලි",
-        "අග�ස්තු",
-        "ස�ප්ත�ම්බර්",
-        "ඔක්ත�බර්",
-        "නොව�ම්බර්",
-        "දෙස�ම්බර්",
-    ]
-
-    month_abbreviations = [
-        "",
-        "ජන",
-        "පෙබ",
-        "ම�ර්",
-        "අප්�රේ",
-        "ම�යි",
-        "ජුනි",
-        "ජූලි",
-        "අග�",
-        "ස�ප්",
-        "ඔක්",
-        "නොව�",
-        "දෙස�",
-    ]
-
-    day_names = [
-        "",
-        "සදුද�",
-        "අඟහර�වද�",
-        "බද�ද�",
-        "බ්�රහස්�පතින්�ද�",
-        "සිකුර�ද�",
-        "සෙනසුර�ද�",
-        "ඉරිද�",
-    ]
-
-    day_abbreviations = [
-        "",
-        "සදුද",
-        "බද�",
-        "බද�",
-        "සිකු",
-        "සෙන",
-        "අ",
-        "ඉරිද�",
-    ]
-
-
-class UrduLocale(Locale):
-    names = ["ur", "ur-pk"]
-
-    past = "Ù¾Û�Ù„Û’ {0}"
-    future = "میں {0}"
-    and_word = "اور"
-
-    timeframes = {
-        "now": "ابھی",
-        "second": "ایک سیکنڈ",
-        "seconds": "{0} سیکنڈ",
-        "minute": "ایک منٹ",
-        "minutes": "{0} منٹ",
-        "hour": "ایک گھنٹے",
-        "hours": "{0} گھنٹے",
-        "day": "ایک دن",
-        "days": "{0} دن",
-        "week": "ایک ��تے",
-        "weeks": "{0} ��تے",
-        "month": "ایک م�ین�",
-        "months": "{0} ما�",
-        "year": "ایک سال",
-        "years": "{0} سال",
-    }
-
-    month_names = [
-        "",
-        "جنوری",
-        "�روری",
-        "مارچ",
-        "اپریل",
-        "مئی",
-        "جون",
-        "جولائی",
-        "اگست",
-        "ستمبر",
-        "اکتوبر",
-        "نومبر",
-        "دسمبر",
-    ]
-
-    month_abbreviations = [
-        "",
-        "جنوری",
-        "�روری",
-        "مارچ",
-        "اپریل",
-        "مئی",
-        "جون",
-        "جولائی",
-        "اگست",
-        "ستمبر",
-        "اکتوبر",
-        "نومبر",
-        "دسمبر",
-    ]
-
-    day_names = [
-        "",
-        "سوموار",
-        "منگل",
-        "بدھ",
-        "جمعرات",
-        "جمع�",
-        "��ت�",
-        "اتوار",
-    ]
-
-    day_abbreviations = [
-        "",
-        "سوموار",
-        "منگل",
-        "بدھ",
-        "جمعرات",
-        "جمع�",
-        "��ت�",
-        "اتوار",
-    ]
-
-
-class KazakhLocale(Locale):
-    names = ["kk", "kk-kz"]
-
-    past = "{0} бұрын"
-    future = "{0} кейін"
-    timeframes = {
-        "now": "қазір",
-        "second": "бір �екунд",
-        "seconds": "{0} �екунд",
-        "minute": "бір минут",
-        "minutes": "{0} минут",
-        "hour": "бір �ағат",
-        "hours": "{0} �ағат",
-        "day": "бір күн",
-        "days": "{0} күн",
-        "week": "бір апта",
-        "weeks": "{0} апта",
-        "month": "бір ай",
-        "months": "{0} ай",
-        "year": "бір жыл",
-        "years": "{0} жыл",
-    }
-
-    month_names = [
-        "",
-        "Қаңтар",
-        "�қпан",
-        "�аурыз",
-        "Сәуір",
-        "Мамыр",
-        "Мау�ым",
-        "Шілде",
-        "Тамыз",
-        "Қыркүйек",
-        "Қазан",
-        "Қараша",
-        "Желтоқ�ан",
-    ]
-    month_abbreviations = [
-        "",
-        "Қан",
-        "�қп",
-        "�ау",
-        "Сәу",
-        "Мам",
-        "Мау",
-        "Шіл",
-        "Там",
-        "Қыр",
-        "Қаз",
-        "Қар",
-        "Жел",
-    ]
-
-    day_names = [
-        "",
-        "Дүй�ембі",
-        "Сей�енбі",
-        "Сәр�енбі",
-        "Бей�енбі",
-        "Жұма",
-        "Сенбі",
-        "Жек�енбі",
-    ]
-    day_abbreviations = ["", "Д�", "С�", "Ср", "Б�", "Жм", "Сб", "Ж�"]
-
-
-class AmharicLocale(Locale):
-    names = ["am", "am-et"]
-
-    past = "{0} በ�ት"
-    future = "{0} �ስጥ"
-    and_word = "እና"
-
-    timeframes: ClassVar[Mapping[TimeFrameLiteral, Union[Mapping[str, str], str]]] = {
-        "now": "አ�ን",
-        "second": {
-            "past": "ከአንድ ሰከንድ",
-            "future": "በአንድ ሰከንድ",
-        },
-        "seconds": {
-            "past": "ከ {0} ሰከንድ",
-            "future": "በ {0} ሰከንድ",
-        },
-        "minute": {
-            "past": "ከአንድ ደቂቃ",
-            "future": "በአንድ ደቂቃ",
-        },
-        "minutes": {
-            "past": "ከ {0} ደቂቃዎች",
-            "future": "በ {0} ደቂቃዎች",
-        },
-        "hour": {
-            "past": "ከአንድ ሰዓት",
-            "future": "በአንድ ሰዓት",
-        },
-        "hours": {
-            "past": "ከ {0} ሰዓታት",
-            "future": "በ {0} ሰከንድ",
-        },
-        "day": {
-            "past": "ከአንድ ቀን",
-            "future": "በአንድ ቀን",
-        },
-        "days": {
-            "past": "ከ {0} ቀናት",
-            "future": "በ {0} ቀናት",
-        },
-        "week": {
-            "past": "ከአንድ ሳ�ንት",
-            "future": "በአንድ ሳ�ንት",
-        },
-        "weeks": {
-            "past": "ከ {0} ሳ�ንታት",
-            "future": "በ {0} ሳ�ንታት",
-        },
-        "month": {
-            "past": "ከአንድ ወር",
-            "future": "በአንድ ወር",
-        },
-        "months": {
-            "past": "ከ {0} ወር",
-            "future": "በ {0} ወራት",
-        },
-        "year": {
-            "past": "ከአንድ አመት",
-            "future": "በአንድ አመት",
-        },
-        "years": {
-            "past": "ከ {0} ዓመታት",
-            "future": "በ {0} ዓመታት",
-        },
-    }
-    # Amharic: the general format to describe timeframe is different from past and future,
-    # so we do not copy the original timeframes dictionary
-    timeframes_only_distance = {
-        "second": "አንድ ሰከንድ",
-        "seconds": "{0} ሰከንድ",
-        "minute": "አንድ ደቂቃ",
-        "minutes": "{0} ደቂቃዎች",
-        "hour": "አንድ ሰዓት",
-        "hours": "{0} ሰዓት",
-        "day": "አንድ ቀን",
-        "days": "{0} ቀናት",
-        "week": "አንድ ሳ�ንት",
-        "weeks": "{0} ሳ�ንት",
-        "month": "አንድ ወር",
-        "months": "{0} ወራት",
-        "year": "አንድ አመት",
-        "years": "{0} ዓመታት",
-    }
-
-    month_names = [
-        "",
-        "ጃንዩወሪ",
-        "�ብሩወሪ",
-        "ማርች",
-        "ኤ�ሪ�",
-        "ሜይ",
-        "�ን",
-        "�ላይ",
-        "ኦገስት",
-        "ሴ�ቴ�በር",
-        "ኦክቶበር",
-        "ኖቬ�በር",
-        "ዲሴ�በር",
-    ]
-
-    month_abbreviations = [
-        "",
-        "ጃንዩ",
-        "�ብሩ",
-        "ማርች",
-        "ኤ�ሪ",
-        "ሜይ",
-        "�ን",
-        "�ላይ",
-        "ኦገስ",
-        "ሴ�ቴ",
-        "ኦክቶ",
-        "ኖቬ�",
-        "ዲሴ�",
-    ]
-
-    day_names = [
-        "",
-        "ሰኞ",
-        "ማክሰኞ",
-        "ረቡዕ",
-        "�ሙስ",
-        "ዓርብ",
-        "ቅዳሜ",
-        "እሑድ",
-    ]
-    day_abbreviations = ["", "እ", "ሰ", "ማ", "ረ", "�", "ዓ", "ቅ"]
-
-    def _ordinal_number(self, n: int) -> str:
-        return f"{n}ኛ"
-
-    def _format_timeframe(self, timeframe: TimeFrameLiteral, delta: int) -> str:
-        """
-        Amharic awares time frame format function, takes into account
-        the differences between general, past, and future forms (three different suffixes).
-        """
-        abs_delta = abs(delta)
-        form = self.timeframes[timeframe]
-
-        if isinstance(form, str):
-            return form.format(abs_delta)
-
-        if delta > 0:
-            key = "future"
-        else:
-            key = "past"
-        form = form[key]
-
-        return form.format(abs_delta)
-
-    def describe(
-        self,
-        timeframe: TimeFrameLiteral,
-        delta: Union[float, int] = 1,  # key is always future when only_distance=False
-        only_distance: bool = False,
-    ) -> str:
-        """Describes a delta within a timeframe in plain language.
-
-        :param timeframe: a string representing a timeframe.
-        :param delta: a quantity representing a delta in a timeframe.
-        :param only_distance: return only distance eg: "11 seconds" without "in" or "ago" keywords
-        """
-
-        if not only_distance:
-            return super().describe(timeframe, delta, only_distance)
-        humanized = self.timeframes_only_distance[timeframe].format(trunc(abs(delta)))
-
-        return humanized
-
-
-class ArmenianLocale(Locale):
-    names = ["hy", "hy-am"]
-    past = "{0} Õ¡Õ¼Õ¡Õ»"
-    future = "{0}Õ«Ö�"
-    and_word = "ÔµÕ¾"  # Yev
-
-    timeframes = {
-        "now": "Õ°Õ«Õ´Õ¡",
-        "second": "Õ¾Õ¡ÕµÖ€Õ¯ÕµÕ¡Õ¶",
-        "seconds": "{0} Õ¾Õ¡ÕµÖ€Õ¯ÕµÕ¡Õ¶",
-        "minute": "Ö€Õ¸ÕºÕ¥",
-        "minutes": "{0} Ö€Õ¸ÕºÕ¥",
-        "hour": "ÕªÕ¡Õ´",
-        "hours": "{0} ÕªÕ¡Õ´",
-        "day": "Ö…Ö€",
-        "days": "{0} Ö…Ö€",
-        "month": "Õ¡Õ´Õ«Õ½",
-        "months": "{0} Õ¡Õ´Õ«Õ½",
-        "year": "Õ¿Õ¡Ö€Õ«Õ¶",
-        "years": "{0} Õ¿Õ¡Ö€Õ«Õ¶",
-        "week": "Õ·Õ¡Õ¢Õ¡Õ©",
-        "weeks": "{0} Õ·Õ¡Õ¢Õ¡Õ©",
-    }
-
-    meridians = {
-        "am": "Ô±Õ´",
-        "pm": "Õº.Õ´.",
-        "AM": "Ô±Õ´",
-        "PM": "Õº.Õ´.",
-    }
-
-    month_names = [
-        "",
-        "Õ°Õ¸Ö‚Õ¶Õ¾Õ¡Ö€",
-        "ÖƒÕ¥Õ¿Ö€Õ¾Õ¡Ö€",
-        "Õ´Õ¡Ö€Õ¿",
-        "Õ¡ÕºÖ€Õ«Õ¬",
-        "Õ´Õ¡ÕµÕ«Õ½",
-        "Õ°Õ¸Ö‚Õ¶Õ«Õ½",
-        "Õ°Õ¸Ö‚Õ¬Õ«Õ½",
-        "Ö…Õ£Õ¸Õ½Õ¿Õ¸Õ½",
-        "Õ½Õ¥ÕºÕ¿Õ¥Õ´Õ¢Õ¥Ö€",
-        "Õ°Õ¸Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€",
-        "Õ¶Õ¸ÕµÕ¥Õ´Õ¢Õ¥Ö€",
-        "Õ¤Õ¥Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€",
-    ]
-
-    month_abbreviations = [
-        "",
-        "Õ°Õ¸Ö‚Õ¶Õ¾Õ¡Ö€",
-        "ÖƒÕ¥Õ¿Ö€Õ¾Õ¡Ö€",
-        "Õ´Õ¡Ö€Õ¿",
-        "Õ¡ÕºÖ€Õ«Õ¬",
-        "Õ´Õ¡ÕµÕ«Õ½",
-        "Õ°Õ¸Ö‚Õ¶Õ«Õ½",
-        "Õ°Õ¸Ö‚Õ¬Õ«Õ½",
-        "Ö…Õ£Õ¸Õ½Õ¿Õ¸Õ½",
-        "Õ½Õ¥ÕºÕ¿Õ¥Õ´Õ¢Õ¥Ö€",
-        "Õ°Õ¸Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€",
-        "Õ¶Õ¸ÕµÕ¥Õ´Õ¢Õ¥Ö€",
-        "Õ¤Õ¥Õ¯Õ¿Õ¥Õ´Õ¢Õ¥Ö€",
-    ]
-
-    day_names = [
-        "",
-        "Õ¥Ö€Õ¯Õ¸Ö‚Õ·Õ¡Õ¢Õ©Õ«",
-        "Õ¥Ö€Õ¥Ö„Õ·Õ¡Õ¢Õ©Õ«",
-        "Õ¹Õ¸Ö€Õ¥Ö„Õ·Õ¡Õ¢Õ©Õ«",
-        "Õ°Õ«Õ¶Õ£Õ·Õ¡Õ¢Õ©Õ«",
-        "Õ¸Ö‚Ö€Õ¢Õ¡Õ©",
-        "Õ·Õ¡Õ¢Õ¡Õ©",
-        "Õ¯Õ«Ö€Õ¡Õ¯Õ«",
-    ]
-
-    day_abbreviations = [
-        "",
-        "Õ¥Ö€Õ¯.",
-        "Õ¥Ö€Õ¥Ö„.",
-        "Õ¹Õ¸Ö€Õ¥Ö„.",
-        "Õ°Õ«Õ¶Õ£.",
-        "Õ¸Ö‚Ö€Õ¢.",
-        "Õ·Õ¡Õ¢.",
-        "Õ¯Õ«Ö€.",
-    ]
-
-
-class UzbekLocale(Locale):
-    names = ["uz", "uz-uz"]
-    past = "{0}dan avval"
-    future = "{0}dan keyin"
-    timeframes = {
-        "now": "hozir",
-        "second": "bir soniya",
-        "seconds": "{0} soniya",
-        "minute": "bir daqiqa",
-        "minutes": "{0} daqiqa",
-        "hour": "bir soat",
-        "hours": "{0} soat",
-        "day": "bir kun",
-        "days": "{0} kun",
-        "week": "bir hafta",
-        "weeks": "{0} hafta",
-        "month": "bir oy",
-        "months": "{0} oy",
-        "year": "bir yil",
-        "years": "{0} yil",
-    }
-
-    month_names = [
-        "",
-        "Yanvar",
-        "Fevral",
-        "Mart",
-        "Aprel",
-        "May",
-        "Iyun",
-        "Iyul",
-        "Avgust",
-        "Sentyabr",
-        "Oktyabr",
-        "Noyabr",
-        "Dekabr",
-    ]
-
-    month_abbreviations = [
-        "",
-        "Yan",
-        "Fev",
-        "Mar",
-        "Apr",
-        "May",
-        "Iyn",
-        "Iyl",
-        "Avg",
-        "Sen",
-        "Okt",
-        "Noy",
-        "Dek",
-    ]
-
-    day_names = [
-        "",
-        "Dushanba",
-        "Seshanba",
-        "Chorshanba",
-        "Payshanba",
-        "Juma",
-        "Shanba",
-        "Yakshanba",
-    ]
-
-    day_abbreviations = ["", "Dush", "Sesh", "Chor", "Pay", "Jum", "Shan", "Yak"]
diff --git a/lib/arrow/parser.py b/lib/arrow/parser.py
deleted file mode 100644
index 645e3da7..00000000
--- a/lib/arrow/parser.py
+++ /dev/null
@@ -1,771 +0,0 @@
-"""Provides the :class:`Arrow <arrow.parser.DateTimeParser>` class, a better way to parse datetime strings."""
-
-import re
-import sys
-from datetime import datetime, timedelta
-from datetime import tzinfo as dt_tzinfo
-from functools import lru_cache
-from typing import (
-    Any,
-    ClassVar,
-    Dict,
-    Iterable,
-    List,
-    Match,
-    Optional,
-    Pattern,
-    SupportsFloat,
-    SupportsInt,
-    Tuple,
-    Union,
-    cast,
-    overload,
-)
-
-from dateutil import tz
-
-from arrow import locales
-from arrow.constants import DEFAULT_LOCALE
-from arrow.util import next_weekday, normalize_timestamp
-
-if sys.version_info < (3, 8):  # pragma: no cover
-    from typing_extensions import Literal, TypedDict
-else:
-    from typing import Literal, TypedDict  # pragma: no cover
-
-
-class ParserError(ValueError):
-    pass
-
-
-# Allows for ParserErrors to be propagated from _build_datetime()
-# when day_of_year errors occur.
-# Before this, the ParserErrors were caught by the try/except in
-# _parse_multiformat() and the appropriate error message was not
-# transmitted to the user.
-class ParserMatchError(ParserError):
-    pass
-
-
-_WEEKDATE_ELEMENT = Union[str, bytes, SupportsInt, bytearray]
-
-_FORMAT_TYPE = Literal[
-    "YYYY",
-    "YY",
-    "MM",
-    "M",
-    "DDDD",
-    "DDD",
-    "DD",
-    "D",
-    "HH",
-    "H",
-    "hh",
-    "h",
-    "mm",
-    "m",
-    "ss",
-    "s",
-    "X",
-    "x",
-    "ZZZ",
-    "ZZ",
-    "Z",
-    "S",
-    "W",
-    "MMMM",
-    "MMM",
-    "Do",
-    "dddd",
-    "ddd",
-    "d",
-    "a",
-    "A",
-]
-
-
-class _Parts(TypedDict, total=False):
-    year: int
-    month: int
-    day_of_year: int
-    day: int
-    hour: int
-    minute: int
-    second: int
-    microsecond: int
-    timestamp: float
-    expanded_timestamp: int
-    tzinfo: dt_tzinfo
-    am_pm: Literal["am", "pm"]
-    day_of_week: int
-    weekdate: Tuple[_WEEKDATE_ELEMENT, _WEEKDATE_ELEMENT, Optional[_WEEKDATE_ELEMENT]]
-
-
-class DateTimeParser:
-    _FORMAT_RE: ClassVar[Pattern[str]] = re.compile(
-        r"(YYY?Y?|MM?M?M?|Do|DD?D?D?|d?d?d?d|HH?|hh?|mm?|ss?|S+|ZZ?Z?|a|A|x|X|W)"
-    )
-    _ESCAPE_RE: ClassVar[Pattern[str]] = re.compile(r"\[[^\[\]]*\]")
-
-    _ONE_OR_TWO_DIGIT_RE: ClassVar[Pattern[str]] = re.compile(r"\d{1,2}")
-    _ONE_OR_TWO_OR_THREE_DIGIT_RE: ClassVar[Pattern[str]] = re.compile(r"\d{1,3}")
-    _ONE_OR_MORE_DIGIT_RE: ClassVar[Pattern[str]] = re.compile(r"\d+")
-    _TWO_DIGIT_RE: ClassVar[Pattern[str]] = re.compile(r"\d{2}")
-    _THREE_DIGIT_RE: ClassVar[Pattern[str]] = re.compile(r"\d{3}")
-    _FOUR_DIGIT_RE: ClassVar[Pattern[str]] = re.compile(r"\d{4}")
-    _TZ_Z_RE: ClassVar[Pattern[str]] = re.compile(r"([\+\-])(\d{2})(?:(\d{2}))?|Z")
-    _TZ_ZZ_RE: ClassVar[Pattern[str]] = re.compile(r"([\+\-])(\d{2})(?:\:(\d{2}))?|Z")
-    _TZ_NAME_RE: ClassVar[Pattern[str]] = re.compile(r"\w[\w+\-/]+")
-    # NOTE: timestamps cannot be parsed from natural language strings (by removing the ^...$) because it will
-    # break cases like "15 Jul 2000" and a format list (see issue #447)
-    _TIMESTAMP_RE: ClassVar[Pattern[str]] = re.compile(r"^\-?\d+\.?\d+$")
-    _TIMESTAMP_EXPANDED_RE: ClassVar[Pattern[str]] = re.compile(r"^\-?\d+$")
-    _TIME_RE: ClassVar[Pattern[str]] = re.compile(
-        r"^(\d{2})(?:\:?(\d{2}))?(?:\:?(\d{2}))?(?:([\.\,])(\d+))?$"
-    )
-    _WEEK_DATE_RE: ClassVar[Pattern[str]] = re.compile(
-        r"(?P<year>\d{4})[\-]?W(?P<week>\d{2})[\-]?(?P<day>\d)?"
-    )
-
-    _BASE_INPUT_RE_MAP: ClassVar[Dict[_FORMAT_TYPE, Pattern[str]]] = {
-        "YYYY": _FOUR_DIGIT_RE,
-        "YY": _TWO_DIGIT_RE,
-        "MM": _TWO_DIGIT_RE,
-        "M": _ONE_OR_TWO_DIGIT_RE,
-        "DDDD": _THREE_DIGIT_RE,
-        "DDD": _ONE_OR_TWO_OR_THREE_DIGIT_RE,
-        "DD": _TWO_DIGIT_RE,
-        "D": _ONE_OR_TWO_DIGIT_RE,
-        "HH": _TWO_DIGIT_RE,
-        "H": _ONE_OR_TWO_DIGIT_RE,
-        "hh": _TWO_DIGIT_RE,
-        "h": _ONE_OR_TWO_DIGIT_RE,
-        "mm": _TWO_DIGIT_RE,
-        "m": _ONE_OR_TWO_DIGIT_RE,
-        "ss": _TWO_DIGIT_RE,
-        "s": _ONE_OR_TWO_DIGIT_RE,
-        "X": _TIMESTAMP_RE,
-        "x": _TIMESTAMP_EXPANDED_RE,
-        "ZZZ": _TZ_NAME_RE,
-        "ZZ": _TZ_ZZ_RE,
-        "Z": _TZ_Z_RE,
-        "S": _ONE_OR_MORE_DIGIT_RE,
-        "W": _WEEK_DATE_RE,
-    }
-
-    SEPARATORS: ClassVar[List[str]] = ["-", "/", "."]
-
-    locale: locales.Locale
-    _input_re_map: Dict[_FORMAT_TYPE, Pattern[str]]
-
-    def __init__(self, locale: str = DEFAULT_LOCALE, cache_size: int = 0) -> None:
-        self.locale = locales.get_locale(locale)
-        self._input_re_map = self._BASE_INPUT_RE_MAP.copy()
-        self._input_re_map.update(
-            {
-                "MMMM": self._generate_choice_re(
-                    self.locale.month_names[1:], re.IGNORECASE
-                ),
-                "MMM": self._generate_choice_re(
-                    self.locale.month_abbreviations[1:], re.IGNORECASE
-                ),
-                "Do": re.compile(self.locale.ordinal_day_re),
-                "dddd": self._generate_choice_re(
-                    self.locale.day_names[1:], re.IGNORECASE
-                ),
-                "ddd": self._generate_choice_re(
-                    self.locale.day_abbreviations[1:], re.IGNORECASE
-                ),
-                "d": re.compile(r"[1-7]"),
-                "a": self._generate_choice_re(
-                    (self.locale.meridians["am"], self.locale.meridians["pm"])
-                ),
-                # note: 'A' token accepts both 'am/pm' and 'AM/PM' formats to
-                # ensure backwards compatibility of this token
-                "A": self._generate_choice_re(self.locale.meridians.values()),
-            }
-        )
-        if cache_size > 0:
-            self._generate_pattern_re = lru_cache(maxsize=cache_size)(  # type: ignore
-                self._generate_pattern_re
-            )
-
-    # TODO: since we support more than ISO 8601, we should rename this function
-    # IDEA: break into multiple functions
-    def parse_iso(
-        self, datetime_string: str, normalize_whitespace: bool = False
-    ) -> datetime:
-        if normalize_whitespace:
-            datetime_string = re.sub(r"\s+", " ", datetime_string.strip())
-
-        has_space_divider = " " in datetime_string
-        has_t_divider = "T" in datetime_string
-
-        num_spaces = datetime_string.count(" ")
-        if has_space_divider and num_spaces != 1 or has_t_divider and num_spaces > 0:
-            raise ParserError(
-                f"Expected an ISO 8601-like string, but was given {datetime_string!r}. "
-                "Try passing in a format string to resolve this."
-            )
-
-        has_time = has_space_divider or has_t_divider
-        has_tz = False
-
-        # date formats (ISO 8601 and others) to test against
-        # NOTE: YYYYMM is omitted to avoid confusion with YYMMDD (no longer part of ISO 8601, but is still often used)
-        formats = [
-            "YYYY-MM-DD",
-            "YYYY-M-DD",
-            "YYYY-M-D",
-            "YYYY/MM/DD",
-            "YYYY/M/DD",
-            "YYYY/M/D",
-            "YYYY.MM.DD",
-            "YYYY.M.DD",
-            "YYYY.M.D",
-            "YYYYMMDD",
-            "YYYY-DDDD",
-            "YYYYDDDD",
-            "YYYY-MM",
-            "YYYY/MM",
-            "YYYY.MM",
-            "YYYY",
-            "W",
-        ]
-
-        if has_time:
-            if has_space_divider:
-                date_string, time_string = datetime_string.split(" ", 1)
-            else:
-                date_string, time_string = datetime_string.split("T", 1)
-
-            time_parts = re.split(
-                r"[\+\-Z]", time_string, maxsplit=1, flags=re.IGNORECASE
-            )
-
-            time_components: Optional[Match[str]] = self._TIME_RE.match(time_parts[0])
-
-            if time_components is None:
-                raise ParserError(
-                    "Invalid time component provided. "
-                    "Please specify a format or provide a valid time component in the basic or extended ISO 8601 time format."
-                )
-
-            (
-                hours,
-                minutes,
-                seconds,
-                subseconds_sep,
-                subseconds,
-            ) = time_components.groups()
-
-            has_tz = len(time_parts) == 2
-            has_minutes = minutes is not None
-            has_seconds = seconds is not None
-            has_subseconds = subseconds is not None
-
-            is_basic_time_format = ":" not in time_parts[0]
-            tz_format = "Z"
-
-            # use 'ZZ' token instead since tz offset is present in non-basic format
-            if has_tz and ":" in time_parts[1]:
-                tz_format = "ZZ"
-
-            time_sep = "" if is_basic_time_format else ":"
-
-            if has_subseconds:
-                time_string = "HH{time_sep}mm{time_sep}ss{subseconds_sep}S".format(
-                    time_sep=time_sep, subseconds_sep=subseconds_sep
-                )
-            elif has_seconds:
-                time_string = "HH{time_sep}mm{time_sep}ss".format(time_sep=time_sep)
-            elif has_minutes:
-                time_string = f"HH{time_sep}mm"
-            else:
-                time_string = "HH"
-
-            if has_space_divider:
-                formats = [f"{f} {time_string}" for f in formats]
-            else:
-                formats = [f"{f}T{time_string}" for f in formats]
-
-        if has_time and has_tz:
-            # Add "Z" or "ZZ" to the format strings to indicate to
-            # _parse_token() that a timezone needs to be parsed
-            formats = [f"{f}{tz_format}" for f in formats]
-
-        return self._parse_multiformat(datetime_string, formats)
-
-    def parse(
-        self,
-        datetime_string: str,
-        fmt: Union[List[str], str],
-        normalize_whitespace: bool = False,
-    ) -> datetime:
-        if normalize_whitespace:
-            datetime_string = re.sub(r"\s+", " ", datetime_string)
-
-        if isinstance(fmt, list):
-            return self._parse_multiformat(datetime_string, fmt)
-
-        try:
-            fmt_tokens: List[_FORMAT_TYPE]
-            fmt_pattern_re: Pattern[str]
-            fmt_tokens, fmt_pattern_re = self._generate_pattern_re(fmt)
-        except re.error as e:
-            raise ParserMatchError(
-                f"Failed to generate regular expression pattern: {e}."
-            )
-
-        match = fmt_pattern_re.search(datetime_string)
-
-        if match is None:
-            raise ParserMatchError(
-                f"Failed to match {fmt!r} when parsing {datetime_string!r}."
-            )
-
-        parts: _Parts = {}
-        for token in fmt_tokens:
-            value: Union[Tuple[str, str, str], str]
-            if token == "Do":
-                value = match.group("value")
-            elif token == "W":
-                value = (match.group("year"), match.group("week"), match.group("day"))
-            else:
-                value = match.group(token)
-
-            if value is None:
-                raise ParserMatchError(
-                    f"Unable to find a match group for the specified token {token!r}."
-                )
-
-            self._parse_token(token, value, parts)  # type: ignore[arg-type]
-
-        return self._build_datetime(parts)
-
-    def _generate_pattern_re(self, fmt: str) -> Tuple[List[_FORMAT_TYPE], Pattern[str]]:
-        # fmt is a string of tokens like 'YYYY-MM-DD'
-        # we construct a new string by replacing each
-        # token by its pattern:
-        # 'YYYY-MM-DD' -> '(?P<YYYY>\d{4})-(?P<MM>\d{2})-(?P<DD>\d{2})'
-        tokens: List[_FORMAT_TYPE] = []
-        offset = 0
-
-        # Escape all special RegEx chars
-        escaped_fmt = re.escape(fmt)
-
-        # Extract the bracketed expressions to be reinserted later.
-        escaped_fmt = re.sub(self._ESCAPE_RE, "#", escaped_fmt)
-
-        # Any number of S is the same as one.
-        # TODO: allow users to specify the number of digits to parse
-        escaped_fmt = re.sub(r"S+", "S", escaped_fmt)
-
-        escaped_data = re.findall(self._ESCAPE_RE, fmt)
-
-        fmt_pattern = escaped_fmt
-
-        for m in self._FORMAT_RE.finditer(escaped_fmt):
-            token: _FORMAT_TYPE = cast(_FORMAT_TYPE, m.group(0))
-            try:
-                input_re = self._input_re_map[token]
-            except KeyError:
-                raise ParserError(f"Unrecognized token {token!r}.")
-            input_pattern = f"(?P<{token}>{input_re.pattern})"
-            tokens.append(token)
-            # a pattern doesn't have the same length as the token
-            # it replaces! We keep the difference in the offset variable.
-            # This works because the string is scanned left-to-right and matches
-            # are returned in the order found by finditer.
-            fmt_pattern = (
-                fmt_pattern[: m.start() + offset]
-                + input_pattern
-                + fmt_pattern[m.end() + offset :]
-            )
-            offset += len(input_pattern) - (m.end() - m.start())
-
-        final_fmt_pattern = ""
-        split_fmt = fmt_pattern.split(r"\#")
-
-        # Due to the way Python splits, 'split_fmt' will always be longer
-        for i in range(len(split_fmt)):
-            final_fmt_pattern += split_fmt[i]
-            if i < len(escaped_data):
-                final_fmt_pattern += escaped_data[i][1:-1]
-
-        # Wrap final_fmt_pattern in a custom word boundary to strictly
-        # match the formatting pattern and filter out date and time formats
-        # that include junk such as: blah1998-09-12 blah, blah 1998-09-12blah,
-        # blah1998-09-12blah. The custom word boundary matches every character
-        # that is not a whitespace character to allow for searching for a date
-        # and time string in a natural language sentence. Therefore, searching
-        # for a string of the form YYYY-MM-DD in "blah 1998-09-12 blah" will
-        # work properly.
-        # Certain punctuation before or after the target pattern such as
-        # "1998-09-12," is permitted. For the full list of valid punctuation,
-        # see the documentation.
-
-        starting_word_boundary = (
-            r"(?<!\S\S)"  # Don't have two consecutive non-whitespace characters. This ensures that we allow cases
-            # like .11.25.2019 but not 1.11.25.2019 (for pattern MM.DD.YYYY)
-            r"(?<![^\,\.\;\:\?\!\"\'\`\[\]\{\}\(\)<>\s])"  # This is the list of punctuation that is ok before the
-            # pattern (i.e. "It can't not be these characters before the pattern")
-            r"(\b|^)"
-            # The \b is to block cases like 1201912 but allow 201912 for pattern YYYYMM. The ^ was necessary to allow a
-            # negative number through i.e. before epoch numbers
-        )
-        ending_word_boundary = (
-            r"(?=[\,\.\;\:\?\!\"\'\`\[\]\{\}\(\)\<\>]?"  # Positive lookahead stating that these punctuation marks
-            # can appear after the pattern at most 1 time
-            r"(?!\S))"  # Don't allow any non-whitespace character after the punctuation
-        )
-        bounded_fmt_pattern = r"{}{}{}".format(
-            starting_word_boundary, final_fmt_pattern, ending_word_boundary
-        )
-
-        return tokens, re.compile(bounded_fmt_pattern, flags=re.IGNORECASE)
-
-    @overload
-    def _parse_token(
-        self,
-        token: Literal[
-            "YYYY",
-            "YY",
-            "MM",
-            "M",
-            "DDDD",
-            "DDD",
-            "DD",
-            "D",
-            "Do",
-            "HH",
-            "hh",
-            "h",
-            "H",
-            "mm",
-            "m",
-            "ss",
-            "s",
-            "x",
-        ],
-        value: Union[str, bytes, SupportsInt, bytearray],
-        parts: _Parts,
-    ) -> None:
-        ...  # pragma: no cover
-
-    @overload
-    def _parse_token(
-        self,
-        token: Literal["X"],
-        value: Union[str, bytes, SupportsFloat, bytearray],
-        parts: _Parts,
-    ) -> None:
-        ...  # pragma: no cover
-
-    @overload
-    def _parse_token(
-        self,
-        token: Literal["MMMM", "MMM", "dddd", "ddd", "S"],
-        value: Union[str, bytes, bytearray],
-        parts: _Parts,
-    ) -> None:
-        ...  # pragma: no cover
-
-    @overload
-    def _parse_token(
-        self,
-        token: Literal["a", "A", "ZZZ", "ZZ", "Z"],
-        value: Union[str, bytes],
-        parts: _Parts,
-    ) -> None:
-        ...  # pragma: no cover
-
-    @overload
-    def _parse_token(
-        self,
-        token: Literal["W"],
-        value: Tuple[_WEEKDATE_ELEMENT, _WEEKDATE_ELEMENT, Optional[_WEEKDATE_ELEMENT]],
-        parts: _Parts,
-    ) -> None:
-        ...  # pragma: no cover
-
-    def _parse_token(
-        self,
-        token: Any,
-        value: Any,
-        parts: _Parts,
-    ) -> None:
-        if token == "YYYY":
-            parts["year"] = int(value)
-
-        elif token == "YY":
-            value = int(value)
-            parts["year"] = 1900 + value if value > 68 else 2000 + value
-
-        elif token in ["MMMM", "MMM"]:
-            # FIXME: month_number() is nullable
-            parts["month"] = self.locale.month_number(value.lower())  # type: ignore[typeddict-item]
-
-        elif token in ["MM", "M"]:
-            parts["month"] = int(value)
-
-        elif token in ["DDDD", "DDD"]:
-            parts["day_of_year"] = int(value)
-
-        elif token in ["DD", "D"]:
-            parts["day"] = int(value)
-
-        elif token == "Do":
-            parts["day"] = int(value)
-
-        elif token == "dddd":
-            # locale day names are 1-indexed
-            day_of_week = [x.lower() for x in self.locale.day_names].index(
-                value.lower()
-            )
-            parts["day_of_week"] = day_of_week - 1
-
-        elif token == "ddd":
-            # locale day abbreviations are 1-indexed
-            day_of_week = [x.lower() for x in self.locale.day_abbreviations].index(
-                value.lower()
-            )
-            parts["day_of_week"] = day_of_week - 1
-
-        elif token.upper() in ["HH", "H"]:
-            parts["hour"] = int(value)
-
-        elif token in ["mm", "m"]:
-            parts["minute"] = int(value)
-
-        elif token in ["ss", "s"]:
-            parts["second"] = int(value)
-
-        elif token == "S":
-            # We have the *most significant* digits of an arbitrary-precision integer.
-            # We want the six most significant digits as an integer, rounded.
-            # IDEA: add nanosecond support somehow? Need datetime support for it first.
-            value = value.ljust(7, "0")
-
-            # floating-point (IEEE-754) defaults to half-to-even rounding
-            seventh_digit = int(value[6])
-            if seventh_digit == 5:
-                rounding = int(value[5]) % 2
-            elif seventh_digit > 5:
-                rounding = 1
-            else:
-                rounding = 0
-
-            parts["microsecond"] = int(value[:6]) + rounding
-
-        elif token == "X":
-            parts["timestamp"] = float(value)
-
-        elif token == "x":
-            parts["expanded_timestamp"] = int(value)
-
-        elif token in ["ZZZ", "ZZ", "Z"]:
-            parts["tzinfo"] = TzinfoParser.parse(value)
-
-        elif token in ["a", "A"]:
-            if value in (self.locale.meridians["am"], self.locale.meridians["AM"]):
-                parts["am_pm"] = "am"
-                if "hour" in parts and not 0 <= parts["hour"] <= 12:
-                    raise ParserMatchError(
-                        f"Hour token value must be between 0 and 12 inclusive for token {token!r}."
-                    )
-            elif value in (self.locale.meridians["pm"], self.locale.meridians["PM"]):
-                parts["am_pm"] = "pm"
-        elif token == "W":
-            parts["weekdate"] = value
-
-    @staticmethod
-    def _build_datetime(parts: _Parts) -> datetime:
-        weekdate = parts.get("weekdate")
-
-        if weekdate is not None:
-            year, week = int(weekdate[0]), int(weekdate[1])
-
-            if weekdate[2] is not None:
-                _day = int(weekdate[2])
-            else:
-                # day not given, default to 1
-                _day = 1
-
-            date_string = f"{year}-{week}-{_day}"
-
-            #  tokens for ISO 8601 weekdates
-            dt = datetime.strptime(date_string, "%G-%V-%u")
-
-            parts["year"] = dt.year
-            parts["month"] = dt.month
-            parts["day"] = dt.day
-
-        timestamp = parts.get("timestamp")
-
-        if timestamp is not None:
-            return datetime.fromtimestamp(timestamp, tz=tz.tzutc())
-
-        expanded_timestamp = parts.get("expanded_timestamp")
-
-        if expanded_timestamp is not None:
-            return datetime.fromtimestamp(
-                normalize_timestamp(expanded_timestamp),
-                tz=tz.tzutc(),
-            )
-
-        day_of_year = parts.get("day_of_year")
-
-        if day_of_year is not None:
-            _year = parts.get("year")
-            month = parts.get("month")
-            if _year is None:
-                raise ParserError(
-                    "Year component is required with the DDD and DDDD tokens."
-                )
-
-            if month is not None:
-                raise ParserError(
-                    "Month component is not allowed with the DDD and DDDD tokens."
-                )
-
-            date_string = f"{_year}-{day_of_year}"
-            try:
-                dt = datetime.strptime(date_string, "%Y-%j")
-            except ValueError:
-                raise ParserError(
-                    f"The provided day of year {day_of_year!r} is invalid."
-                )
-
-            parts["year"] = dt.year
-            parts["month"] = dt.month
-            parts["day"] = dt.day
-
-        day_of_week: Optional[int] = parts.get("day_of_week")
-        day = parts.get("day")
-
-        # If day is passed, ignore day of week
-        if day_of_week is not None and day is None:
-            year = parts.get("year", 1970)
-            month = parts.get("month", 1)
-            day = 1
-
-            # dddd => first day of week after epoch
-            # dddd YYYY => first day of week in specified year
-            # dddd MM YYYY => first day of week in specified year and month
-            # dddd MM => first day after epoch in specified month
-            next_weekday_dt = next_weekday(datetime(year, month, day), day_of_week)
-            parts["year"] = next_weekday_dt.year
-            parts["month"] = next_weekday_dt.month
-            parts["day"] = next_weekday_dt.day
-
-        am_pm = parts.get("am_pm")
-        hour = parts.get("hour", 0)
-
-        if am_pm == "pm" and hour < 12:
-            hour += 12
-        elif am_pm == "am" and hour == 12:
-            hour = 0
-
-        # Support for midnight at the end of day
-        if hour == 24:
-            if parts.get("minute", 0) != 0:
-                raise ParserError("Midnight at the end of day must not contain minutes")
-            if parts.get("second", 0) != 0:
-                raise ParserError("Midnight at the end of day must not contain seconds")
-            if parts.get("microsecond", 0) != 0:
-                raise ParserError(
-                    "Midnight at the end of day must not contain microseconds"
-                )
-            hour = 0
-            day_increment = 1
-        else:
-            day_increment = 0
-
-        # account for rounding up to 1000000
-        microsecond = parts.get("microsecond", 0)
-        if microsecond == 1000000:
-            microsecond = 0
-            second_increment = 1
-        else:
-            second_increment = 0
-
-        increment = timedelta(days=day_increment, seconds=second_increment)
-
-        return (
-            datetime(
-                year=parts.get("year", 1),
-                month=parts.get("month", 1),
-                day=parts.get("day", 1),
-                hour=hour,
-                minute=parts.get("minute", 0),
-                second=parts.get("second", 0),
-                microsecond=microsecond,
-                tzinfo=parts.get("tzinfo"),
-            )
-            + increment
-        )
-
-    def _parse_multiformat(self, string: str, formats: Iterable[str]) -> datetime:
-        _datetime: Optional[datetime] = None
-
-        for fmt in formats:
-            try:
-                _datetime = self.parse(string, fmt)
-                break
-            except ParserMatchError:
-                pass
-
-        if _datetime is None:
-            supported_formats = ", ".join(formats)
-            raise ParserError(
-                f"Could not match input {string!r} to any of the following formats: {supported_formats}."
-            )
-
-        return _datetime
-
-    # generates a capture group of choices separated by an OR operator
-    @staticmethod
-    def _generate_choice_re(
-        choices: Iterable[str], flags: Union[int, re.RegexFlag] = 0
-    ) -> Pattern[str]:
-        return re.compile(r"({})".format("|".join(choices)), flags=flags)
-
-
-class TzinfoParser:
-    _TZINFO_RE: ClassVar[Pattern[str]] = re.compile(
-        r"^(?:\(UTC)*([\+\-])?(\d{2})(?:\:?(\d{2}))?"
-    )
-
-    @classmethod
-    def parse(cls, tzinfo_string: str) -> dt_tzinfo:
-        tzinfo: Optional[dt_tzinfo] = None
-
-        if tzinfo_string == "local":
-            tzinfo = tz.tzlocal()
-
-        elif tzinfo_string in ["utc", "UTC", "Z"]:
-            tzinfo = tz.tzutc()
-
-        else:
-            iso_match = cls._TZINFO_RE.match(tzinfo_string)
-
-            if iso_match:
-                sign: Optional[str]
-                hours: str
-                minutes: Union[str, int, None]
-                sign, hours, minutes = iso_match.groups()
-                seconds = int(hours) * 3600 + int(minutes or 0) * 60
-
-                if sign == "-":
-                    seconds *= -1
-
-                tzinfo = tz.tzoffset(None, seconds)
-
-            else:
-                tzinfo = tz.gettz(tzinfo_string)
-
-        if tzinfo is None:
-            raise ParserError(f"Could not parse timezone expression {tzinfo_string!r}.")
-
-        return tzinfo
diff --git a/lib/arrow/py.typed b/lib/arrow/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/arrow/util.py b/lib/arrow/util.py
deleted file mode 100644
index f3eaa21c..00000000
--- a/lib/arrow/util.py
+++ /dev/null
@@ -1,117 +0,0 @@
-"""Helpful functions used internally within arrow."""
-
-import datetime
-from typing import Any, Optional, cast
-
-from dateutil.rrule import WEEKLY, rrule
-
-from arrow.constants import (
-    MAX_ORDINAL,
-    MAX_TIMESTAMP,
-    MAX_TIMESTAMP_MS,
-    MAX_TIMESTAMP_US,
-    MIN_ORDINAL,
-)
-
-
-def next_weekday(
-    start_date: Optional[datetime.date], weekday: int
-) -> datetime.datetime:
-    """Get next weekday from the specified start date.
-
-    :param start_date: Datetime object representing the start date.
-    :param weekday: Next weekday to obtain. Can be a value between 0 (Monday) and 6 (Sunday).
-    :return: Datetime object corresponding to the next weekday after start_date.
-
-    Usage::
-
-        # Get first Monday after epoch
-        >>> next_weekday(datetime(1970, 1, 1), 0)
-        1970-01-05 00:00:00
-
-        # Get first Thursday after epoch
-        >>> next_weekday(datetime(1970, 1, 1), 3)
-        1970-01-01 00:00:00
-
-        # Get first Sunday after epoch
-        >>> next_weekday(datetime(1970, 1, 1), 6)
-        1970-01-04 00:00:00
-    """
-    if weekday < 0 or weekday > 6:
-        raise ValueError("Weekday must be between 0 (Monday) and 6 (Sunday).")
-    return cast(
-        datetime.datetime,
-        rrule(freq=WEEKLY, dtstart=start_date, byweekday=weekday, count=1)[0],
-    )
-
-
-def is_timestamp(value: Any) -> bool:
-    """Check if value is a valid timestamp."""
-    if isinstance(value, bool):
-        return False
-    if not isinstance(value, (int, float, str)):
-        return False
-    try:
-        float(value)
-        return True
-    except ValueError:
-        return False
-
-
-def validate_ordinal(value: Any) -> None:
-    """Raise an exception if value is an invalid Gregorian ordinal.
-
-    :param value: the input to be checked
-
-    """
-    if isinstance(value, bool) or not isinstance(value, int):
-        raise TypeError(f"Ordinal must be an integer (got type {type(value)}).")
-    if not (MIN_ORDINAL <= value <= MAX_ORDINAL):
-        raise ValueError(f"Ordinal {value} is out of range.")
-
-
-def normalize_timestamp(timestamp: float) -> float:
-    """Normalize millisecond and microsecond timestamps into normal timestamps."""
-    if timestamp > MAX_TIMESTAMP:
-        if timestamp < MAX_TIMESTAMP_MS:
-            timestamp /= 1000
-        elif timestamp < MAX_TIMESTAMP_US:
-            timestamp /= 1_000_000
-        else:
-            raise ValueError(f"The specified timestamp {timestamp!r} is too large.")
-    return timestamp
-
-
-# Credit to https://stackoverflow.com/a/1700069
-def iso_to_gregorian(iso_year: int, iso_week: int, iso_day: int) -> datetime.date:
-    """Converts an ISO week date into a datetime object.
-
-    :param iso_year: the year
-    :param iso_week: the week number, each year has either 52 or 53 weeks
-    :param iso_day: the day numbered 1 through 7, beginning with Monday
-
-    """
-
-    if not 1 <= iso_week <= 53:
-        raise ValueError("ISO Calendar week value must be between 1-53.")
-
-    if not 1 <= iso_day <= 7:
-        raise ValueError("ISO Calendar day value must be between 1-7")
-
-    # The first week of the year always contains 4 Jan.
-    fourth_jan = datetime.date(iso_year, 1, 4)
-    delta = datetime.timedelta(fourth_jan.isoweekday() - 1)
-    year_start = fourth_jan - delta
-    gregorian = year_start + datetime.timedelta(days=iso_day - 1, weeks=iso_week - 1)
-
-    return gregorian
-
-
-def validate_bounds(bounds: str) -> None:
-    if bounds != "()" and bounds != "(]" and bounds != "[)" and bounds != "[]":
-        raise ValueError(
-            "Invalid bounds. Please select between '()', '(]', '[)', or '[]'."
-        )
-
-
-__all__ = ["next_weekday", "is_timestamp", "validate_ordinal", "iso_to_gregorian"]
diff --git a/lib/autocommand/__init__.py b/lib/autocommand/__init__.py
deleted file mode 100644
index 73fbfca6..00000000
--- a/lib/autocommand/__init__.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2014-2016 Nathan West
-#
-# This file is part of autocommand.
-#
-# autocommand 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 3 of the License, or
-# (at your option) any later version.
-#
-# autocommand 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 autocommand.  If not, see <http://www.gnu.org/licenses/>.
-
-# flake8 flags all these imports as unused, hence the NOQAs everywhere.
-
-from .automain import automain  # NOQA
-from .autoparse import autoparse, smart_open  # NOQA
-from .autocommand import autocommand  # NOQA
-
-try:
-    from .autoasync import autoasync  # NOQA
-except ImportError:  # pragma: no cover
-    pass
diff --git a/lib/autocommand/autoasync.py b/lib/autocommand/autoasync.py
deleted file mode 100644
index 688f7e05..00000000
--- a/lib/autocommand/autoasync.py
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 2014-2015 Nathan West
-#
-# This file is part of autocommand.
-#
-# autocommand 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 3 of the License, or
-# (at your option) any later version.
-#
-# autocommand 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 autocommand.  If not, see <http://www.gnu.org/licenses/>.
-
-from asyncio import get_event_loop, iscoroutine
-from functools import wraps
-from inspect import signature
-
-
-async def _run_forever_coro(coro, args, kwargs, loop):
-    '''
-    This helper function launches an async main function that was tagged with
-    forever=True. There are two possibilities:
-
-    - The function is a normal function, which handles initializing the event
-      loop, which is then run forever
-    - The function is a coroutine, which needs to be scheduled in the event
-      loop, which is then run forever
-      - There is also the possibility that the function is a normal function
-        wrapping a coroutine function
-
-    The function is therefore called unconditionally and scheduled in the event
-    loop if the return value is a coroutine object.
-
-    The reason this is a separate function is to make absolutely sure that all
-    the objects created are garbage collected after all is said and done; we
-    do this to ensure that any exceptions raised in the tasks are collected
-    ASAP.
-    '''
-
-    # Personal note: I consider this an antipattern, as it relies on the use of
-    # unowned resources. The setup function dumps some stuff into the event
-    # loop where it just whirls in the ether without a well defined owner or
-    # lifetime. For this reason, there's a good chance I'll remove the
-    # forever=True feature from autoasync at some point in the future.
-    thing = coro(*args, **kwargs)
-    if iscoroutine(thing):
-        await thing
-
-
-def autoasync(coro=None, *, loop=None, forever=False, pass_loop=False):
-    '''
-    Convert an asyncio coroutine into a function which, when called, is
-    evaluted in an event loop, and the return value returned. This is intented
-    to make it easy to write entry points into asyncio coroutines, which
-    otherwise need to be explictly evaluted with an event loop's
-    run_until_complete.
-
-    If `loop` is given, it is used as the event loop to run the coro in. If it
-    is None (the default), the loop is retreived using asyncio.get_event_loop.
-    This call is defered until the decorated function is called, so that
-    callers can install custom event loops or event loop policies after
-    @autoasync is applied.
-
-    If `forever` is True, the loop is run forever after the decorated coroutine
-    is finished. Use this for servers created with asyncio.start_server and the
-    like.
-
-    If `pass_loop` is True, the event loop object is passed into the coroutine
-    as the `loop` kwarg when the wrapper function is called. In this case, the
-    wrapper function's __signature__ is updated to remove this parameter, so
-    that autoparse can still be used on it without generating a parameter for
-    `loop`.
-
-    This coroutine can be called with ( @autoasync(...) ) or without
-    ( @autoasync ) arguments.
-
-    Examples:
-
-    @autoasync
-    def get_file(host, port):
-        reader, writer = yield from asyncio.open_connection(host, port)
-        data = reader.read()
-        sys.stdout.write(data.decode())
-
-    get_file(host, port)
-
-    @autoasync(forever=True, pass_loop=True)
-    def server(host, port, loop):
-        yield_from loop.create_server(Proto, host, port)
-
-    server('localhost', 8899)
-
-    '''
-    if coro is None:
-        return lambda c: autoasync(
-            c, loop=loop,
-            forever=forever,
-            pass_loop=pass_loop)
-
-    # The old and new signatures are required to correctly bind the loop
-    # parameter in 100% of cases, even if it's a positional parameter.
-    # NOTE: A future release will probably require the loop parameter to be
-    # a kwonly parameter.
-    if pass_loop:
-        old_sig = signature(coro)
-        new_sig = old_sig.replace(parameters=(
-            param for name, param in old_sig.parameters.items()
-            if name != "loop"))
-
-    @wraps(coro)
-    def autoasync_wrapper(*args, **kwargs):
-        # Defer the call to get_event_loop so that, if a custom policy is
-        # installed after the autoasync decorator, it is respected at call time
-        local_loop = get_event_loop() if loop is None else loop
-
-        # Inject the 'loop' argument. We have to use this signature binding to
-        # ensure it's injected in the correct place (positional, keyword, etc)
-        if pass_loop:
-            bound_args = old_sig.bind_partial()
-            bound_args.arguments.update(
-                loop=local_loop,
-                **new_sig.bind(*args, **kwargs).arguments)
-            args, kwargs = bound_args.args, bound_args.kwargs
-
-        if forever:
-            local_loop.create_task(_run_forever_coro(
-                coro, args, kwargs, local_loop
-            ))
-            local_loop.run_forever()
-        else:
-            return local_loop.run_until_complete(coro(*args, **kwargs))
-
-    # Attach the updated signature. This allows 'pass_loop' to be used with
-    # autoparse
-    if pass_loop:
-        autoasync_wrapper.__signature__ = new_sig
-
-    return autoasync_wrapper
diff --git a/lib/autocommand/autocommand.py b/lib/autocommand/autocommand.py
deleted file mode 100644
index 097e86de..00000000
--- a/lib/autocommand/autocommand.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2014-2015 Nathan West
-#
-# This file is part of autocommand.
-#
-# autocommand 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 3 of the License, or
-# (at your option) any later version.
-#
-# autocommand 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 autocommand.  If not, see <http://www.gnu.org/licenses/>.
-
-from .autoparse import autoparse
-from .automain import automain
-try:
-    from .autoasync import autoasync
-except ImportError:  # pragma: no cover
-    pass
-
-
-def autocommand(
-        module, *,
-        description=None,
-        epilog=None,
-        add_nos=False,
-        parser=None,
-        loop=None,
-        forever=False,
-        pass_loop=False):
-
-    if callable(module):
-        raise TypeError('autocommand requires a module name argument')
-
-    def autocommand_decorator(func):
-        # Step 1: if requested, run it all in an asyncio event loop. autoasync
-        # patches the __signature__ of the decorated function, so that in the
-        # event that pass_loop is True, the `loop` parameter of the original
-        # function will *not* be interpreted as a command-line argument by
-        # autoparse
-        if loop is not None or forever or pass_loop:
-            func = autoasync(
-                func,
-                loop=None if loop is True else loop,
-                pass_loop=pass_loop,
-                forever=forever)
-
-        # Step 2: create parser. We do this second so that the arguments are
-        # parsed and passed *before* entering the asyncio event loop, if it
-        # exists. This simplifies the stack trace and ensures errors are
-        # reported earlier. It also ensures that errors raised during parsing &
-        # passing are still raised if `forever` is True.
-        func = autoparse(
-            func,
-            description=description,
-            epilog=epilog,
-            add_nos=add_nos,
-            parser=parser)
-
-        # Step 3: call the function automatically if __name__ == '__main__' (or
-        # if True was provided)
-        func = automain(module)(func)
-
-        return func
-
-    return autocommand_decorator
diff --git a/lib/autocommand/automain.py b/lib/autocommand/automain.py
deleted file mode 100644
index 6cc45db6..00000000
--- a/lib/autocommand/automain.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2014-2015 Nathan West
-#
-# This file is part of autocommand.
-#
-# autocommand 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 3 of the License, or
-# (at your option) any later version.
-#
-# autocommand 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 autocommand.  If not, see <http://www.gnu.org/licenses/>.
-
-import sys
-from .errors import AutocommandError
-
-
-class AutomainRequiresModuleError(AutocommandError, TypeError):
-    pass
-
-
-def automain(module, *, args=(), kwargs=None):
-    '''
-    This decorator automatically invokes a function if the module is being run
-    as the "__main__" module. Optionally, provide args or kwargs with which to
-    call the function. If `module` is "__main__", the function is called, and
-    the program is `sys.exit`ed with the return value. You can also pass `True`
-    to cause the function to be called unconditionally. If the function is not
-    called, it is returned unchanged by the decorator.
-
-    Usage:
-
-    @automain(__name__)  # Pass __name__ to check __name__=="__main__"
-    def main():
-        ...
-
-    If __name__ is "__main__" here, the main function is called, and then
-    sys.exit called with the return value.
-    '''
-
-    # Check that @automain(...) was called, rather than @automain
-    if callable(module):
-        raise AutomainRequiresModuleError(module)
-
-    if module == '__main__' or module is True:
-        if kwargs is None:
-            kwargs = {}
-
-        # Use a function definition instead of a lambda for a neater traceback
-        def automain_decorator(main):
-            sys.exit(main(*args, **kwargs))
-
-        return automain_decorator
-    else:
-        return lambda main: main
diff --git a/lib/autocommand/autoparse.py b/lib/autocommand/autoparse.py
deleted file mode 100644
index 0276a3fa..00000000
--- a/lib/autocommand/autoparse.py
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 2014-2015 Nathan West
-#
-# This file is part of autocommand.
-#
-# autocommand 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 3 of the License, or
-# (at your option) any later version.
-#
-# autocommand 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 autocommand.  If not, see <http://www.gnu.org/licenses/>.
-
-import sys
-from re import compile as compile_regex
-from inspect import signature, getdoc, Parameter
-from argparse import ArgumentParser
-from contextlib import contextmanager
-from functools import wraps
-from io import IOBase
-from autocommand.errors import AutocommandError
-
-
-_empty = Parameter.empty
-
-
-class AnnotationError(AutocommandError):
-    '''Annotation error: annotation must be a string, type, or tuple of both'''
-
-
-class PositionalArgError(AutocommandError):
-    '''
-    Postional Arg Error: autocommand can't handle postional-only parameters
-    '''
-
-
-class KWArgError(AutocommandError):
-    '''kwarg Error: autocommand can't handle a **kwargs parameter'''
-
-
-class DocstringError(AutocommandError):
-    '''Docstring error'''
-
-
-class TooManySplitsError(DocstringError):
-    '''
-    The docstring had too many ---- section splits. Currently we only support
-    using up to a single split, to split the docstring into description and
-    epilog parts.
-    '''
-
-
-def _get_type_description(annotation):
-    '''
-    Given an annotation, return the (type, description) for the parameter.
-    If you provide an annotation that is somehow both a string and a callable,
-    the behavior is undefined.
-    '''
-    if annotation is _empty:
-        return None, None
-    elif callable(annotation):
-        return annotation, None
-    elif isinstance(annotation, str):
-        return None, annotation
-    elif isinstance(annotation, tuple):
-        try:
-            arg1, arg2 = annotation
-        except ValueError as e:
-            raise AnnotationError(annotation) from e
-        else:
-            if callable(arg1) and isinstance(arg2, str):
-                return arg1, arg2
-            elif isinstance(arg1, str) and callable(arg2):
-                return arg2, arg1
-
-    raise AnnotationError(annotation)
-
-
-def _add_arguments(param, parser, used_char_args, add_nos):
-    '''
-    Add the argument(s) to an ArgumentParser (using add_argument) for a given
-    parameter. used_char_args is the set of -short options currently already in
-    use, and is updated (if necessary) by this function. If add_nos is True,
-    this will also add an inverse switch for all boolean options. For
-    instance, for the boolean parameter "verbose", this will create --verbose
-    and --no-verbose.
-    '''
-
-    # Impl note: This function is kept separate from make_parser because it's
-    # already very long and I wanted to separate out as much as possible into
-    # its own call scope, to prevent even the possibility of suble mutation
-    # bugs.
-    if param.kind is param.POSITIONAL_ONLY:
-        raise PositionalArgError(param)
-    elif param.kind is param.VAR_KEYWORD:
-        raise KWArgError(param)
-
-    # These are the kwargs for the add_argument function.
-    arg_spec = {}
-    is_option = False
-
-    # Get the type and default from the annotation.
-    arg_type, description = _get_type_description(param.annotation)
-
-    # Get the default value
-    default = param.default
-
-    # If there is no explicit type, and the default is present and not None,
-    # infer the type from the default.
-    if arg_type is None and default not in {_empty, None}:
-        arg_type = type(default)
-
-    # Add default. The presence of a default means this is an option, not an
-    # argument.
-    if default is not _empty:
-        arg_spec['default'] = default
-        is_option = True
-
-    # Add the type
-    if arg_type is not None:
-        # Special case for bool: make it just a --switch
-        if arg_type is bool:
-            if not default or default is _empty:
-                arg_spec['action'] = 'store_true'
-            else:
-                arg_spec['action'] = 'store_false'
-
-            # Switches are always options
-            is_option = True
-
-        # Special case for file types: make it a string type, for filename
-        elif isinstance(default, IOBase):
-            arg_spec['type'] = str
-
-        # TODO: special case for list type.
-        #   - How to specificy type of list members?
-        #       - param: [int]
-        #       - param: int =[]
-        #   - action='append' vs nargs='*'
-
-        else:
-            arg_spec['type'] = arg_type
-
-    # nargs: if the signature includes *args, collect them as trailing CLI
-    # arguments in a list. *args can't have a default value, so it can never be
-    # an option.
-    if param.kind is param.VAR_POSITIONAL:
-        # TODO: consider depluralizing metavar/name here.
-        arg_spec['nargs'] = '*'
-
-    # Add description.
-    if description is not None:
-        arg_spec['help'] = description
-
-    # Get the --flags
-    flags = []
-    name = param.name
-
-    if is_option:
-        # Add the first letter as a -short option.
-        for letter in name[0], name[0].swapcase():
-            if letter not in used_char_args:
-                used_char_args.add(letter)
-                flags.append('-{}'.format(letter))
-                break
-
-        # If the parameter is a --long option, or is a -short option that
-        # somehow failed to get a flag, add it.
-        if len(name) > 1 or not flags:
-            flags.append('--{}'.format(name))
-
-        arg_spec['dest'] = name
-    else:
-        flags.append(name)
-
-    parser.add_argument(*flags, **arg_spec)
-
-    # Create the --no- version for boolean switches
-    if add_nos and arg_type is bool:
-        parser.add_argument(
-            '--no-{}'.format(name),
-            action='store_const',
-            dest=name,
-            const=default if default is not _empty else False)
-
-
-def make_parser(func_sig, description, epilog, add_nos):
-    '''
-    Given the signature of a function, create an ArgumentParser
-    '''
-    parser = ArgumentParser(description=description, epilog=epilog)
-
-    used_char_args = {'h'}
-
-    # Arange the params so that single-character arguments are first. This
-    # esnures they don't have to get --long versions. sorted is stable, so the
-    # parameters will otherwise still be in relative order.
-    params = sorted(
-        func_sig.parameters.values(),
-        key=lambda param: len(param.name) > 1)
-
-    for param in params:
-        _add_arguments(param, parser, used_char_args, add_nos)
-
-    return parser
-
-
-_DOCSTRING_SPLIT = compile_regex(r'\n\s*-{4,}\s*\n')
-
-
-def parse_docstring(docstring):
-    '''
-    Given a docstring, parse it into a description and epilog part
-    '''
-    if docstring is None:
-        return '', ''
-
-    parts = _DOCSTRING_SPLIT.split(docstring)
-
-    if len(parts) == 1:
-        return docstring, ''
-    elif len(parts) == 2:
-        return parts[0], parts[1]
-    else:
-        raise TooManySplitsError()
-
-
-def autoparse(
-        func=None, *,
-        description=None,
-        epilog=None,
-        add_nos=False,
-        parser=None):
-    '''
-    This decorator converts a function that takes normal arguments into a
-    function which takes a single optional argument, argv, parses it using an
-    argparse.ArgumentParser, and calls the underlying function with the parsed
-    arguments. If it is not given, sys.argv[1:] is used. This is so that the
-    function can be used as a setuptools entry point, as well as a normal main
-    function. sys.argv[1:] is not evaluated until the function is called, to
-    allow injecting different arguments for testing.
-
-    It uses the argument signature of the function to create an
-    ArgumentParser. Parameters without defaults become positional parameters,
-    while parameters *with* defaults become --options. Use annotations to set
-    the type of the parameter.
-
-    The `desctiption` and `epilog` parameters corrospond to the same respective
-    argparse parameters. If no description is given, it defaults to the
-    decorated functions's docstring, if present.
-
-    If add_nos is True, every boolean option (that is, every parameter with a
-    default of True/False or a type of bool) will have a --no- version created
-    as well, which inverts the option. For instance, the --verbose option will
-    have a --no-verbose counterpart. These are not mutually exclusive-
-    whichever one appears last in the argument list will have precedence.
-
-    If a parser is given, it is used instead of one generated from the function
-    signature. In this case, no parser is created; instead, the given parser is
-    used to parse the argv argument. The parser's results' argument names must
-    match up with the parameter names of the decorated function.
-
-    The decorated function is attached to the result as the `func` attribute,
-    and the parser is attached as the `parser` attribute.
-    '''
-
-    # If @autoparse(...) is used instead of @autoparse
-    if func is None:
-        return lambda f: autoparse(
-            f, description=description,
-            epilog=epilog,
-            add_nos=add_nos,
-            parser=parser)
-
-    func_sig = signature(func)
-
-    docstr_description, docstr_epilog = parse_docstring(getdoc(func))
-
-    if parser is None:
-        parser = make_parser(
-            func_sig,
-            description or docstr_description,
-            epilog or docstr_epilog,
-            add_nos)
-
-    @wraps(func)
-    def autoparse_wrapper(argv=None):
-        if argv is None:
-            argv = sys.argv[1:]
-
-        # Get empty argument binding, to fill with parsed arguments. This
-        # object does all the heavy lifting of turning named arguments into
-        # into correctly bound *args and **kwargs.
-        parsed_args = func_sig.bind_partial()
-        parsed_args.arguments.update(vars(parser.parse_args(argv)))
-
-        return func(*parsed_args.args, **parsed_args.kwargs)
-
-    # TODO: attach an updated __signature__ to autoparse_wrapper, just in case.
-
-    # Attach the wrapped function and parser, and return the wrapper.
-    autoparse_wrapper.func = func
-    autoparse_wrapper.parser = parser
-    return autoparse_wrapper
-
-
-@contextmanager
-def smart_open(filename_or_file, *args, **kwargs):
-    '''
-    This context manager allows you to open a filename, if you want to default
-    some already-existing file object, like sys.stdout, which shouldn't be
-    closed at the end of the context. If the filename argument is a str, bytes,
-    or int, the file object is created via a call to open with the given *args
-    and **kwargs, sent to the context, and closed at the end of the context,
-    just like "with open(filename) as f:". If it isn't one of the openable
-    types, the object simply sent to the context unchanged, and left unclosed
-    at the end of the context. Example:
-
-        def work_with_file(name=sys.stdout):
-            with smart_open(name) as f:
-                # Works correctly if name is a str filename or sys.stdout
-                print("Some stuff", file=f)
-                # If it was a filename, f is closed at the end here.
-    '''
-    if isinstance(filename_or_file, (str, bytes, int)):
-        with open(filename_or_file, *args, **kwargs) as file:
-            yield file
-    else:
-        yield filename_or_file
diff --git a/lib/autocommand/errors.py b/lib/autocommand/errors.py
deleted file mode 100644
index 25706073..00000000
--- a/lib/autocommand/errors.py
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2014-2016 Nathan West
-#
-# This file is part of autocommand.
-#
-# autocommand 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 3 of the License, or
-# (at your option) any later version.
-#
-# autocommand 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 autocommand.  If not, see <http://www.gnu.org/licenses/>.
-
-
-class AutocommandError(Exception):
-    '''Base class for autocommand exceptions'''
-    pass
-
-# Individual modules will define errors specific to that module.
diff --git a/lib/backport_abcoll.py b/lib/backport_abcoll.py
new file mode 100644
index 00000000..92fd2f1e
--- /dev/null
+++ b/lib/backport_abcoll.py
@@ -0,0 +1,690 @@
+# Copyright 2007 Google, Inc. All Rights Reserved.
+# Licensed to PSF under a Contributor Agreement.
+
+"""Abstract Base Classes (ABCs) for collections, according to PEP 3119.
+
+DON'T USE THIS MODULE DIRECTLY!  The classes here should be imported
+via collections; they are defined here only to alleviate certain
+bootstrapping issues.  Unit tests are in test_collections.
+"""
+
+from abc import ABCMeta, abstractmethod
+import sys
+
+__all__ = ["Hashable", "Iterable", "Iterator",
+           "Sized", "Container", "Callable",
+           "Set", "MutableSet",
+           "Mapping", "MutableMapping",
+           "MappingView", "KeysView", "ItemsView", "ValuesView",
+           "Sequence", "MutableSequence",
+           ]
+
+### ONE-TRICK PONIES ###
+
+def _hasattr(C, attr):
+    try:
+        return any(attr in B.__dict__ for B in C.__mro__)
+    except AttributeError:
+        # Old-style class
+        return hasattr(C, attr)
+
+
+class Hashable:
+    __metaclass__ = ABCMeta
+
+    @abstractmethod
+    def __hash__(self):
+        return 0
+
+    @classmethod
+    def __subclasshook__(cls, C):
+        if cls is Hashable:
+            try:
+                for B in C.__mro__:
+                    if "__hash__" in B.__dict__:
+                        if B.__dict__["__hash__"]:
+                            return True
+                        break
+            except AttributeError:
+                # Old-style class
+                if getattr(C, "__hash__", None):
+                    return True
+        return NotImplemented
+
+
+class Iterable:
+    __metaclass__ = ABCMeta
+
+    @abstractmethod
+    def __iter__(self):
+        while False:
+            yield None
+
+    @classmethod
+    def __subclasshook__(cls, C):
+        if cls is Iterable:
+            if _hasattr(C, "__iter__"):
+                return True
+        return NotImplemented
+
+Iterable.register(str)
+
+
+class Iterator(Iterable):
+
+    @abstractmethod
+    def next(self):
+        'Return the next item from the iterator. When exhausted, raise StopIteration'
+        raise StopIteration
+
+    def __iter__(self):
+        return self
+
+    @classmethod
+    def __subclasshook__(cls, C):
+        if cls is Iterator:
+            if _hasattr(C, "next") and _hasattr(C, "__iter__"):
+                return True
+        return NotImplemented
+
+
+class Sized:
+    __metaclass__ = ABCMeta
+
+    @abstractmethod
+    def __len__(self):
+        return 0
+
+    @classmethod
+    def __subclasshook__(cls, C):
+        if cls is Sized:
+            if _hasattr(C, "__len__"):
+                return True
+        return NotImplemented
+
+
+class Container:
+    __metaclass__ = ABCMeta
+
+    @abstractmethod
+    def __contains__(self, x):
+        return False
+
+    @classmethod
+    def __subclasshook__(cls, C):
+        if cls is Container:
+            if _hasattr(C, "__contains__"):
+                return True
+        return NotImplemented
+
+
+class Callable:
+    __metaclass__ = ABCMeta
+
+    @abstractmethod
+    def __call__(self, *args, **kwds):
+        return False
+
+    @classmethod
+    def __subclasshook__(cls, C):
+        if cls is Callable:
+            if _hasattr(C, "__call__"):
+                return True
+        return NotImplemented
+
+
+### SETS ###
+
+
+class Set(Sized, Iterable, Container):
+    """A set is a finite, iterable container.
+
+    This class provides concrete generic implementations of all
+    methods except for __contains__, __iter__ and __len__.
+
+    To override the comparisons (presumably for speed, as the
+    semantics are fixed), redefine __le__ and __ge__,
+    then the other operations will automatically follow suit.
+    """
+
+    def __le__(self, other):
+        if not isinstance(other, Set):
+            return NotImplemented
+        if len(self) > len(other):
+            return False
+        for elem in self:
+            if elem not in other:
+                return False
+        return True
+
+    def __lt__(self, other):
+        if not isinstance(other, Set):
+            return NotImplemented
+        return len(self) < len(other) and self.__le__(other)
+
+    def __gt__(self, other):
+        if not isinstance(other, Set):
+            return NotImplemented
+        return len(self) > len(other) and self.__ge__(other)
+
+    def __ge__(self, other):
+        if not isinstance(other, Set):
+            return NotImplemented
+        if len(self) < len(other):
+            return False
+        for elem in other:
+            if elem not in self:
+                return False
+        return True
+
+    def __eq__(self, other):
+        if not isinstance(other, Set):
+            return NotImplemented
+        return len(self) == len(other) and self.__le__(other)
+
+    def __ne__(self, other):
+        return not (self == other)
+
+    @classmethod
+    def _from_iterable(cls, it):
+        '''Construct an instance of the class from any iterable input.
+
+        Must override this method if the class constructor signature
+        does not accept an iterable for an input.
+        '''
+        return cls(it)
+
+    def __and__(self, other):
+        if not isinstance(other, Iterable):
+            return NotImplemented
+        return self._from_iterable(value for value in other if value in self)
+
+    __rand__ = __and__
+
+    def isdisjoint(self, other):
+        'Return True if two sets have a null intersection.'
+        for value in other:
+            if value in self:
+                return False
+        return True
+
+    def __or__(self, other):
+        if not isinstance(other, Iterable):
+            return NotImplemented
+        chain = (e for s in (self, other) for e in s)
+        return self._from_iterable(chain)
+
+    __ror__ = __or__
+
+    def __sub__(self, other):
+        if not isinstance(other, Set):
+            if not isinstance(other, Iterable):
+                return NotImplemented
+            other = self._from_iterable(other)
+        return self._from_iterable(value for value in self
+                                   if value not in other)
+
+    def __rsub__(self, other):
+        if not isinstance(other, Set):
+            if not isinstance(other, Iterable):
+                return NotImplemented
+            other = self._from_iterable(other)
+        return self._from_iterable(value for value in other
+                                   if value not in self)
+
+    def __xor__(self, other):
+        if not isinstance(other, Set):
+            if not isinstance(other, Iterable):
+                return NotImplemented
+            other = self._from_iterable(other)
+        return (self - other) | (other - self)
+
+    __rxor__ = __xor__
+
+    # Sets are not hashable by default, but subclasses can change this
+    __hash__ = None
+
+    def _hash(self):
+        """Compute the hash value of a set.
+
+        Note that we don't define __hash__: not all sets are hashable.
+        But if you define a hashable set type, its __hash__ should
+        call this function.
+
+        This must be compatible __eq__.
+
+        All sets ought to compare equal if they contain the same
+        elements, regardless of how they are implemented, and
+        regardless of the order of the elements; so there's not much
+        freedom for __eq__ or __hash__.  We match the algorithm used
+        by the built-in frozenset type.
+        """
+        MAX = sys.maxint
+        MASK = 2 * MAX + 1
+        n = len(self)
+        h = 1927868237 * (n + 1)
+        h &= MASK
+        for x in self:
+            hx = hash(x)
+            h ^= (hx ^ (hx << 16) ^ 89869747)  * 3644798167
+            h &= MASK
+        h = h * 69069 + 907133923
+        h &= MASK
+        if h > MAX:
+            h -= MASK + 1
+        if h == -1:
+            h = 590923713
+        return h
+
+Set.register(frozenset)
+
+
+class MutableSet(Set):
+    """A mutable set is a finite, iterable container.
+
+    This class provides concrete generic implementations of all
+    methods except for __contains__, __iter__, __len__,
+    add(), and discard().
+
+    To override the comparisons (presumably for speed, as the
+    semantics are fixed), all you have to do is redefine __le__ and
+    then the other operations will automatically follow suit.
+    """
+
+    @abstractmethod
+    def add(self, value):
+        """Add an element."""
+        raise NotImplementedError
+
+    @abstractmethod
+    def discard(self, value):
+        """Remove an element.  Do not raise an exception if absent."""
+        raise NotImplementedError
+
+    def remove(self, value):
+        """Remove an element. If not a member, raise a KeyError."""
+        if value not in self:
+            raise KeyError(value)
+        self.discard(value)
+
+    def pop(self):
+        """Return the popped value.  Raise KeyError if empty."""
+        it = iter(self)
+        try:
+            value = next(it)
+        except StopIteration:
+            raise KeyError
+        self.discard(value)
+        return value
+
+    def clear(self):
+        """This is slow (creates N new iterators!) but effective."""
+        try:
+            while True:
+                self.pop()
+        except KeyError:
+            pass
+
+    def __ior__(self, it):
+        for value in it:
+            self.add(value)
+        return self
+
+    def __iand__(self, it):
+        for value in (self - it):
+            self.discard(value)
+        return self
+
+    def __ixor__(self, it):
+        if it is self:
+            self.clear()
+        else:
+            if not isinstance(it, Set):
+                it = self._from_iterable(it)
+            for value in it:
+                if value in self:
+                    self.discard(value)
+                else:
+                    self.add(value)
+        return self
+
+    def __isub__(self, it):
+        if it is self:
+            self.clear()
+        else:
+            for value in it:
+                self.discard(value)
+        return self
+
+MutableSet.register(set)
+
+
+### MAPPINGS ###
+
+
+class Mapping(Sized, Iterable, Container):
+
+    """A Mapping is a generic container for associating key/value
+    pairs.
+
+    This class provides concrete generic implementations of all
+    methods except for __getitem__, __iter__, and __len__.
+
+    """
+
+    @abstractmethod
+    def __getitem__(self, key):
+        raise KeyError
+
+    def get(self, key, default=None):
+        'D.get(k[,d]) -> D[k] if k in D, else d.  d defaults to None.'
+        try:
+            return self[key]
+        except KeyError:
+            return default
+
+    def __contains__(self, key):
+        try:
+            self[key]
+        except KeyError:
+            return False
+        else:
+            return True
+
+    def iterkeys(self):
+        'D.iterkeys() -> an iterator over the keys of D'
+        return iter(self)
+
+    def itervalues(self):
+        'D.itervalues() -> an iterator over the values of D'
+        for key in self:
+            yield self[key]
+
+    def iteritems(self):
+        'D.iteritems() -> an iterator over the (key, value) items of D'
+        for key in self:
+            yield (key, self[key])
+
+    def keys(self):
+        "D.keys() -> list of D's keys"
+        return list(self)
+
+    def items(self):
+        "D.items() -> list of D's (key, value) pairs, as 2-tuples"
+        return [(key, self[key]) for key in self]
+
+    def values(self):
+        "D.values() -> list of D's values"
+        return [self[key] for key in self]
+
+    # Mappings are not hashable by default, but subclasses can change this
+    __hash__ = None
+
+    def __eq__(self, other):
+        if not isinstance(other, Mapping):
+            return NotImplemented
+        return dict(self.items()) == dict(other.items())
+
+    def __ne__(self, other):
+        return not (self == other)
+
+class MappingView(Sized):
+
+    def __init__(self, mapping):
+        self._mapping = mapping
+
+    def __len__(self):
+        return len(self._mapping)
+
+    def __repr__(self):
+        return '{0.__class__.__name__}({0._mapping!r})'.format(self)
+
+
+class KeysView(MappingView, Set):
+
+    @classmethod
+    def _from_iterable(self, it):
+        return set(it)
+
+    def __contains__(self, key):
+        return key in self._mapping
+
+    def __iter__(self):
+        for key in self._mapping:
+            yield key
+
+
+class ItemsView(MappingView, Set):
+
+    @classmethod
+    def _from_iterable(self, it):
+        return set(it)
+
+    def __contains__(self, item):
+        key, value = item
+        try:
+            v = self._mapping[key]
+        except KeyError:
+            return False
+        else:
+            return v == value
+
+    def __iter__(self):
+        for key in self._mapping:
+            yield (key, self._mapping[key])
+
+
+class ValuesView(MappingView):
+
+    def __contains__(self, value):
+        for key in self._mapping:
+            if value == self._mapping[key]:
+                return True
+        return False
+
+    def __iter__(self):
+        for key in self._mapping:
+            yield self._mapping[key]
+
+
+class MutableMapping(Mapping):
+
+    """A MutableMapping is a generic container for associating
+    key/value pairs.
+
+    This class provides concrete generic implementations of all
+    methods except for __getitem__, __setitem__, __delitem__,
+    __iter__, and __len__.
+
+    """
+
+    @abstractmethod
+    def __setitem__(self, key, value):
+        raise KeyError
+
+    @abstractmethod
+    def __delitem__(self, key):
+        raise KeyError
+
+    __marker = object()
+
+    def pop(self, key, default=__marker):
+        '''D.pop(k[,d]) -> v, remove specified key and return the corresponding value.
+          If key is not found, d is returned if given, otherwise KeyError is raised.
+        '''
+        try:
+            value = self[key]
+        except KeyError:
+            if default is self.__marker:
+                raise
+            return default
+        else:
+            del self[key]
+            return value
+
+    def popitem(self):
+        '''D.popitem() -> (k, v), remove and return some (key, value) pair
+           as a 2-tuple; but raise KeyError if D is empty.
+        '''
+        try:
+            key = next(iter(self))
+        except StopIteration:
+            raise KeyError
+        value = self[key]
+        del self[key]
+        return key, value
+
+    def clear(self):
+        'D.clear() -> None.  Remove all items from D.'
+        try:
+            while True:
+                self.popitem()
+        except KeyError:
+            pass
+
+    def update(*args, **kwds):
+        ''' D.update([E, ]**F) -> None.  Update D from mapping/iterable E and F.
+            If E present and has a .keys() method, does:     for k in E: D[k] = E[k]
+            If E present and lacks .keys() method, does:     for (k, v) in E: D[k] = v
+            In either case, this is followed by: for k, v in F.items(): D[k] = v
+        '''
+        if len(args) > 2:
+            raise TypeError("update() takes at most 2 positional "
+                            "arguments ({args} given)".format(args=len(args)))
+        elif not args:
+            raise TypeError("update() takes at least 1 argument (0 given)")
+        self = args[0]
+        other = args[1] if len(args) >= 2 else ()
+
+        if isinstance(other, Mapping):
+            for key in other:
+                self[key] = other[key]
+        elif hasattr(other, "keys"):
+            for key in other.keys():
+                self[key] = other[key]
+        else:
+            for key, value in other:
+                self[key] = value
+        for key, value in kwds.items():
+            self[key] = value
+
+    def setdefault(self, key, default=None):
+        'D.setdefault(k[,d]) -> D.get(k,d), also set D[k]=d if k not in D'
+        try:
+            return self[key]
+        except KeyError:
+            self[key] = default
+        return default
+
+MutableMapping.register(dict)
+
+
+### SEQUENCES ###
+
+
+class Sequence(Sized, Iterable, Container):
+    """All the operations on a read-only sequence.
+
+    Concrete subclasses must override __new__ or __init__,
+    __getitem__, and __len__.
+    """
+
+    @abstractmethod
+    def __getitem__(self, index):
+        raise IndexError
+
+    def __iter__(self):
+        i = 0
+        try:
+            while True:
+                v = self[i]
+                yield v
+                i += 1
+        except IndexError:
+            return
+
+    def __contains__(self, value):
+        for v in self:
+            if v == value:
+                return True
+        return False
+
+    def __reversed__(self):
+        for i in reversed(range(len(self))):
+            yield self[i]
+
+    def index(self, value):
+        '''S.index(value) -> integer -- return first index of value.
+           Raises ValueError if the value is not present.
+        '''
+        for i, v in enumerate(self):
+            if v == value:
+                return i
+        raise ValueError
+
+    def count(self, value):
+        'S.count(value) -> integer -- return number of occurrences of value'
+        return sum(1 for v in self if v == value)
+
+Sequence.register(tuple)
+Sequence.register(basestring)
+Sequence.register(buffer)
+Sequence.register(xrange)
+
+
+class MutableSequence(Sequence):
+
+    """All the operations on a read-only sequence.
+
+    Concrete subclasses must provide __new__ or __init__,
+    __getitem__, __setitem__, __delitem__, __len__, and insert().
+
+    """
+
+    @abstractmethod
+    def __setitem__(self, index, value):
+        raise IndexError
+
+    @abstractmethod
+    def __delitem__(self, index):
+        raise IndexError
+
+    @abstractmethod
+    def insert(self, index, value):
+        'S.insert(index, object) -- insert object before index'
+        raise IndexError
+
+    def append(self, value):
+        'S.append(object) -- append object to the end of the sequence'
+        self.insert(len(self), value)
+
+    def reverse(self):
+        'S.reverse() -- reverse *IN PLACE*'
+        n = len(self)
+        for i in range(n//2):
+            self[i], self[n-i-1] = self[n-i-1], self[i]
+
+    def extend(self, values):
+        'S.extend(iterable) -- extend sequence by appending elements from the iterable'
+        for v in values:
+            self.append(v)
+
+    def pop(self, index=-1):
+        '''S.pop([index]) -> item -- remove and return item at index (default last).
+           Raise IndexError if list is empty or index is out of range.
+        '''
+        v = self[index]
+        del self[index]
+        return v
+
+    def remove(self, value):
+        '''S.remove(value) -- remove first occurrence of value.
+           Raise ValueError if the value is not present.
+        '''
+        del self[self.index(value)]
+
+    def __iadd__(self, values):
+        self.extend(values)
+        return self
+
+MutableSequence.register(list)
diff --git a/lib/backport_collections.py b/lib/backport_collections.py
new file mode 100644
index 00000000..3073dee3
--- /dev/null
+++ b/lib/backport_collections.py
@@ -0,0 +1,732 @@
+__all__ = ['Counter', 'deque', 'defaultdict', 'namedtuple', 'OrderedDict']
+# For bootstrapping reasons, the collection ABCs are defined in _abcoll.py.
+# They should however be considered an integral part of collections.py.
+from backport_abcoll import *
+import backport_abcoll
+__all__ += backport_abcoll.__all__
+
+from _collections import defaultdict
+from collections import deque as _deque
+from operator import itemgetter as _itemgetter, eq as _eq
+from keyword import iskeyword as _iskeyword
+import sys as _sys
+import heapq as _heapq
+from itertools import repeat as _repeat, chain as _chain, starmap as _starmap
+from itertools import imap as _imap
+
+try:
+    from thread import get_ident as _get_ident
+except ImportError:
+    from dummy_thread import get_ident as _get_ident
+
+
+if _sys.version_info >= (2, 7):
+    import warnings as _warnings
+    _warnings.warn('Use the stock collections modules instead.', DeprecationWarning)
+
+
+################################################################################
+### OrderedDict
+################################################################################
+
+class OrderedDict(dict):
+    'Dictionary that remembers insertion order'
+    # An inherited dict maps keys to values.
+    # The inherited dict provides __getitem__, __len__, __contains__, and get.
+    # The remaining methods are order-aware.
+    # Big-O running times for all methods are the same as regular dictionaries.
+
+    # The internal self.__map dict maps keys to links in a doubly linked list.
+    # The circular doubly linked list starts and ends with a sentinel element.
+    # The sentinel element never gets deleted (this simplifies the algorithm).
+    # Each link is stored as a list of length three:  [PREV, NEXT, KEY].
+
+    def __init__(self, *args, **kwds):
+        '''Initialize an ordered dictionary.  The signature is the same as
+        regular dictionaries, but keyword arguments are not recommended because
+        their insertion order is arbitrary.
+
+        '''
+        if len(args) > 1:
+            raise TypeError('expected at most 1 arguments, got %d' % len(args))
+        try:
+            self.__root
+        except AttributeError:
+            self.__root = root = []                     # sentinel node
+            root[:] = [root, root, None]
+            self.__map = {}
+        self.__update(*args, **kwds)
+
+    def __setitem__(self, key, value, dict_setitem=dict.__setitem__):
+        'od.__setitem__(i, y) <==> od[i]=y'
+        # Setting a new item creates a new link at the end of the linked list,
+        # and the inherited dictionary is updated with the new key/value pair.
+        if key not in self:
+            root = self.__root
+            last = root[0]
+            last[1] = root[0] = self.__map[key] = [last, root, key]
+        return dict_setitem(self, key, value)
+
+    def __delitem__(self, key, dict_delitem=dict.__delitem__):
+        'od.__delitem__(y) <==> del od[y]'
+        # Deleting an existing item uses self.__map to find the link which gets
+        # removed by updating the links in the predecessor and successor nodes.
+        dict_delitem(self, key)
+        link_prev, link_next, _ = self.__map.pop(key)
+        link_prev[1] = link_next                        # update link_prev[NEXT]
+        link_next[0] = link_prev                        # update link_next[PREV]
+
+    def __iter__(self):
+        'od.__iter__() <==> iter(od)'
+        # Traverse the linked list in order.
+        root = self.__root
+        curr = root[1]                                  # start at the first node
+        while curr is not root:
+            yield curr[2]                               # yield the curr[KEY]
+            curr = curr[1]                              # move to next node
+
+    def __reversed__(self):
+        'od.__reversed__() <==> reversed(od)'
+        # Traverse the linked list in reverse order.
+        root = self.__root
+        curr = root[0]                                  # start at the last node
+        while curr is not root:
+            yield curr[2]                               # yield the curr[KEY]
+            curr = curr[0]                              # move to previous node
+
+    def clear(self):
+        'od.clear() -> None.  Remove all items from od.'
+        root = self.__root
+        root[:] = [root, root, None]
+        self.__map.clear()
+        dict.clear(self)
+
+    # -- the following methods do not depend on the internal structure --
+
+    def keys(self):
+        'od.keys() -> list of keys in od'
+        return list(self)
+
+    def values(self):
+        'od.values() -> list of values in od'
+        return [self[key] for key in self]
+
+    def items(self):
+        'od.items() -> list of (key, value) pairs in od'
+        return [(key, self[key]) for key in self]
+
+    def iterkeys(self):
+        'od.iterkeys() -> an iterator over the keys in od'
+        return iter(self)
+
+    def itervalues(self):
+        'od.itervalues -> an iterator over the values in od'
+        for k in self:
+            yield self[k]
+
+    def iteritems(self):
+        'od.iteritems -> an iterator over the (key, value) pairs in od'
+        for k in self:
+            yield (k, self[k])
+
+    update = MutableMapping.update
+
+    __update = update # let subclasses override update without breaking __init__
+
+    __marker = object()
+
+    def pop(self, key, default=__marker):
+        '''od.pop(k[,d]) -> v, remove specified key and return the corresponding
+        value.  If key is not found, d is returned if given, otherwise KeyError
+        is raised.
+
+        '''
+        if key in self:
+            result = self[key]
+            del self[key]
+            return result
+        if default is self.__marker:
+            raise KeyError(key)
+        return default
+
+    def setdefault(self, key, default=None):
+        'od.setdefault(k[,d]) -> od.get(k,d), also set od[k]=d if k not in od'
+        if key in self:
+            return self[key]
+        self[key] = default
+        return default
+
+    def popitem(self, last=True):
+        '''od.popitem() -> (k, v), return and remove a (key, value) pair.
+        Pairs are returned in LIFO order if last is true or FIFO order if false.
+
+        '''
+        if not self:
+            raise KeyError('dictionary is empty')
+        key = next(reversed(self) if last else iter(self))
+        value = self.pop(key)
+        return key, value
+
+    def __repr__(self, _repr_running={}):
+        'od.__repr__() <==> repr(od)'
+        call_key = id(self), _get_ident()
+        if call_key in _repr_running:
+            return '...'
+        _repr_running[call_key] = 1
+        try:
+            if not self:
+                return '%s()' % (self.__class__.__name__,)
+            return '%s(%r)' % (self.__class__.__name__, self.items())
+        finally:
+            del _repr_running[call_key]
+
+    def __reduce__(self):
+        'Return state information for pickling'
+        items = [[k, self[k]] for k in self]
+        inst_dict = vars(self).copy()
+        for k in vars(OrderedDict()):
+            inst_dict.pop(k, None)
+        if inst_dict:
+            return (self.__class__, (items,), inst_dict)
+        return self.__class__, (items,)
+
+    def copy(self):
+        'od.copy() -> a shallow copy of od'
+        return self.__class__(self)
+
+    @classmethod
+    def fromkeys(cls, iterable, value=None):
+        '''OD.fromkeys(S[, v]) -> New ordered dictionary with keys from S.
+        If not specified, the value defaults to None.
+
+        '''
+        self = cls()
+        for key in iterable:
+            self[key] = value
+        return self
+
+    def __eq__(self, other):
+        '''od.__eq__(y) <==> od==y.  Comparison to another OD is order-sensitive
+        while comparison to a regular mapping is order-insensitive.
+
+        '''
+        if isinstance(other, OrderedDict):
+            return dict.__eq__(self, other) and all(_imap(_eq, self, other))
+        return dict.__eq__(self, other)
+
+    def __ne__(self, other):
+        'od.__ne__(y) <==> od!=y'
+        return not self == other
+
+    # -- the following methods support python 3.x style dictionary views --
+
+    def viewkeys(self):
+        "od.viewkeys() -> a set-like object providing a view on od's keys"
+        return KeysView(self)
+
+    def viewvalues(self):
+        "od.viewvalues() -> an object providing a view on od's values"
+        return ValuesView(self)
+
+    def viewitems(self):
+        "od.viewitems() -> a set-like object providing a view on od's items"
+        return ItemsView(self)
+
+
+################################################################################
+### namedtuple
+################################################################################
+
+_class_template = '''\
+class {typename}(tuple):
+    '{typename}({arg_list})'
+
+    __slots__ = ()
+
+    _fields = {field_names!r}
+
+    def __new__(_cls, {arg_list}):
+        'Create new instance of {typename}({arg_list})'
+        return _tuple.__new__(_cls, ({arg_list}))
+
+    @classmethod
+    def _make(cls, iterable, new=tuple.__new__, len=len):
+        'Make a new {typename} object from a sequence or iterable'
+        result = new(cls, iterable)
+        if len(result) != {num_fields:d}:
+            raise TypeError('Expected {num_fields:d} arguments, got %d' % len(result))
+        return result
+
+    def __repr__(self):
+        'Return a nicely formatted representation string'
+        return '{typename}({repr_fmt})' % self
+
+    def _asdict(self):
+        'Return a new OrderedDict which maps field names to their values'
+        return OrderedDict(zip(self._fields, self))
+
+    def _replace(_self, **kwds):
+        'Return a new {typename} object replacing specified fields with new values'
+        result = _self._make(map(kwds.pop, {field_names!r}, _self))
+        if kwds:
+            raise ValueError('Got unexpected field names: %r' % kwds.keys())
+        return result
+
+    def __getnewargs__(self):
+        'Return self as a plain tuple.  Used by copy and pickle.'
+        return tuple(self)
+
+    __dict__ = _property(_asdict)
+
+    def __getstate__(self):
+        'Exclude the OrderedDict from pickling'
+        pass
+
+{field_defs}
+'''
+
+_repr_template = '{name}=%r'
+
+_field_template = '''\
+    {name} = _property(_itemgetter({index:d}), doc='Alias for field number {index:d}')
+'''
+
+def namedtuple(typename, field_names, verbose=False, rename=False):
+    """Returns a new subclass of tuple with named fields.
+
+    >>> Point = namedtuple('Point', ['x', 'y'])
+    >>> Point.__doc__                   # docstring for the new class
+    'Point(x, y)'
+    >>> p = Point(11, y=22)             # instantiate with positional args or keywords
+    >>> p[0] + p[1]                     # indexable like a plain tuple
+    33
+    >>> x, y = p                        # unpack like a regular tuple
+    >>> x, y
+    (11, 22)
+    >>> p.x + p.y                       # fields also accessable by name
+    33
+    >>> d = p._asdict()                 # convert to a dictionary
+    >>> d['x']
+    11
+    >>> Point(**d)                      # convert from a dictionary
+    Point(x=11, y=22)
+    >>> p._replace(x=100)               # _replace() is like str.replace() but targets named fields
+    Point(x=100, y=22)
+
+    """
+
+    # Validate the field names.  At the user's option, either generate an error
+    # message or automatically replace the field name with a valid name.
+    if isinstance(field_names, basestring):
+        field_names = field_names.replace(',', ' ').split()
+    field_names = map(str, field_names)
+    typename = str(typename)
+    if rename:
+        seen = set()
+        for index, name in enumerate(field_names):
+            if (not all(c.isalnum() or c=='_' for c in name)
+                or _iskeyword(name)
+                or not name
+                or name[0].isdigit()
+                or name.startswith('_')
+                or name in seen):
+                field_names[index] = '_%d' % index
+            seen.add(name)
+    for name in [typename] + field_names:
+        if type(name) != str:
+            raise TypeError('Type names and field names must be strings')
+        if not all(c.isalnum() or c=='_' for c in name):
+            raise ValueError('Type names and field names can only contain '
+                             'alphanumeric characters and underscores: %r' % name)
+        if _iskeyword(name):
+            raise ValueError('Type names and field names cannot be a '
+                             'keyword: %r' % name)
+        if name[0].isdigit():
+            raise ValueError('Type names and field names cannot start with '
+                             'a number: %r' % name)
+    seen = set()
+    for name in field_names:
+        if name.startswith('_') and not rename:
+            raise ValueError('Field names cannot start with an underscore: '
+                             '%r' % name)
+        if name in seen:
+            raise ValueError('Encountered duplicate field name: %r' % name)
+        seen.add(name)
+
+    # Fill-in the class template
+    class_definition = _class_template.format(
+        typename = typename,
+        field_names = tuple(field_names),
+        num_fields = len(field_names),
+        arg_list = repr(tuple(field_names)).replace("'", "")[1:-1],
+        repr_fmt = ', '.join(_repr_template.format(name=name)
+                             for name in field_names),
+        field_defs = '\n'.join(_field_template.format(index=index, name=name)
+                               for index, name in enumerate(field_names))
+    )
+    if verbose:
+        print class_definition
+
+    # Execute the template string in a temporary namespace and support
+    # tracing utilities by setting a value for frame.f_globals['__name__']
+    namespace = dict(_itemgetter=_itemgetter, __name__='namedtuple_%s' % typename,
+                     OrderedDict=OrderedDict, _property=property, _tuple=tuple)
+    try:
+        exec class_definition in namespace
+    except SyntaxError as e:
+        raise SyntaxError(e.message + ':\n' + class_definition)
+    result = namespace[typename]
+
+    # For pickling to work, the __module__ variable needs to be set to the frame
+    # where the named tuple is created.  Bypass this step in environments where
+    # sys._getframe is not defined (Jython for example) or sys._getframe is not
+    # defined for arguments greater than 0 (IronPython).
+    try:
+        result.__module__ = _sys._getframe(1).f_globals.get('__name__', '__main__')
+    except (AttributeError, ValueError):
+        pass
+
+    return result
+
+
+########################################################################
+###  Counter
+########################################################################
+
+class Counter(dict):
+    '''Dict subclass for counting hashable items.  Sometimes called a bag
+    or multiset.  Elements are stored as dictionary keys and their counts
+    are stored as dictionary values.
+
+    >>> c = Counter('abcdeabcdabcaba')  # count elements from a string
+
+    >>> c.most_common(3)                # three most common elements
+    [('a', 5), ('b', 4), ('c', 3)]
+    >>> sorted(c)                       # list all unique elements
+    ['a', 'b', 'c', 'd', 'e']
+    >>> ''.join(sorted(c.elements()))   # list elements with repetitions
+    'aaaaabbbbcccdde'
+    >>> sum(c.values())                 # total of all counts
+    15
+
+    >>> c['a']                          # count of letter 'a'
+    5
+    >>> for elem in 'shazam':           # update counts from an iterable
+    ...     c[elem] += 1                # by adding 1 to each element's count
+    >>> c['a']                          # now there are seven 'a'
+    7
+    >>> del c['b']                      # remove all 'b'
+    >>> c['b']                          # now there are zero 'b'
+    0
+
+    >>> d = Counter('simsalabim')       # make another counter
+    >>> c.update(d)                     # add in the second counter
+    >>> c['a']                          # now there are nine 'a'
+    9
+
+    >>> c.clear()                       # empty the counter
+    >>> c
+    Counter()
+
+    Note:  If a count is set to zero or reduced to zero, it will remain
+    in the counter until the entry is deleted or the counter is cleared:
+
+    >>> c = Counter('aaabbc')
+    >>> c['b'] -= 2                     # reduce the count of 'b' by two
+    >>> c.most_common()                 # 'b' is still in, but its count is zero
+    [('a', 3), ('c', 1), ('b', 0)]
+
+    '''
+    # References:
+    #   http://en.wikipedia.org/wiki/Multiset
+    #   http://www.gnu.org/software/smalltalk/manual-base/html_node/Bag.html
+    #   http://www.demo2s.com/Tutorial/Cpp/0380__set-multiset/Catalog0380__set-multiset.htm
+    #   http://code.activestate.com/recipes/259174/
+    #   Knuth, TAOCP Vol. II section 4.6.3
+
+    def __init__(self, iterable=None, **kwds):
+        '''Create a new, empty Counter object.  And if given, count elements
+        from an input iterable.  Or, initialize the count from another mapping
+        of elements to their counts.
+
+        >>> c = Counter()                           # a new, empty counter
+        >>> c = Counter('gallahad')                 # a new counter from an iterable
+        >>> c = Counter({'a': 4, 'b': 2})           # a new counter from a mapping
+        >>> c = Counter(a=4, b=2)                   # a new counter from keyword args
+
+        '''
+        super(Counter, self).__init__()
+        self.update(iterable, **kwds)
+
+    def __missing__(self, key):
+        'The count of elements not in the Counter is zero.'
+        # Needed so that self[missing_item] does not raise KeyError
+        return 0
+
+    def most_common(self, n=None):
+        '''List the n most common elements and their counts from the most
+        common to the least.  If n is None, then list all element counts.
+
+        >>> Counter('abcdeabcdabcaba').most_common(3)
+        [('a', 5), ('b', 4), ('c', 3)]
+
+        '''
+        # Emulate Bag.sortedByCount from Smalltalk
+        if n is None:
+            return sorted(self.iteritems(), key=_itemgetter(1), reverse=True)
+        return _heapq.nlargest(n, self.iteritems(), key=_itemgetter(1))
+
+    def elements(self):
+        '''Iterator over elements repeating each as many times as its count.
+
+        >>> c = Counter('ABCABC')
+        >>> sorted(c.elements())
+        ['A', 'A', 'B', 'B', 'C', 'C']
+
+        # Knuth's example for prime factors of 1836:  2**2 * 3**3 * 17**1
+        >>> prime_factors = Counter({2: 2, 3: 3, 17: 1})
+        >>> product = 1
+        >>> for factor in prime_factors.elements():     # loop over factors
+        ...     product *= factor                       # and multiply them
+        >>> product
+        1836
+
+        Note, if an element's count has been set to zero or is a negative
+        number, elements() will ignore it.
+
+        '''
+        # Emulate Bag.do from Smalltalk and Multiset.begin from C++.
+        return _chain.from_iterable(_starmap(_repeat, self.iteritems()))
+
+    # Override dict methods where necessary
+
+    @classmethod
+    def fromkeys(cls, iterable, v=None):
+        # There is no equivalent method for counters because setting v=1
+        # means that no element can have a count greater than one.
+        raise NotImplementedError(
+            'Counter.fromkeys() is undefined.  Use Counter(iterable) instead.')
+
+    def update(self, iterable=None, **kwds):
+        '''Like dict.update() but add counts instead of replacing them.
+
+        Source can be an iterable, a dictionary, or another Counter instance.
+
+        >>> c = Counter('which')
+        >>> c.update('witch')           # add elements from another iterable
+        >>> d = Counter('watch')
+        >>> c.update(d)                 # add elements from another counter
+        >>> c['h']                      # four 'h' in which, witch, and watch
+        4
+
+        '''
+        # The regular dict.update() operation makes no sense here because the
+        # replace behavior results in the some of original untouched counts
+        # being mixed-in with all of the other counts for a mismash that
+        # doesn't have a straight-forward interpretation in most counting
+        # contexts.  Instead, we implement straight-addition.  Both the inputs
+        # and outputs are allowed to contain zero and negative counts.
+
+        if iterable is not None:
+            if isinstance(iterable, Mapping):
+                if self:
+                    self_get = self.get
+                    for elem, count in iterable.iteritems():
+                        self[elem] = self_get(elem, 0) + count
+                else:
+                    super(Counter, self).update(iterable) # fast path when counter is empty
+            else:
+                self_get = self.get
+                for elem in iterable:
+                    self[elem] = self_get(elem, 0) + 1
+        if kwds:
+            self.update(kwds)
+
+    def subtract(self, iterable=None, **kwds):
+        '''Like dict.update() but subtracts counts instead of replacing them.
+        Counts can be reduced below zero.  Both the inputs and outputs are
+        allowed to contain zero and negative counts.
+
+        Source can be an iterable, a dictionary, or another Counter instance.
+
+        >>> c = Counter('which')
+        >>> c.subtract('witch')             # subtract elements from another iterable
+        >>> c.subtract(Counter('watch'))    # subtract elements from another counter
+        >>> c['h']                          # 2 in which, minus 1 in witch, minus 1 in watch
+        0
+        >>> c['w']                          # 1 in which, minus 1 in witch, minus 1 in watch
+        -1
+
+        '''
+        if iterable is not None:
+            self_get = self.get
+            if isinstance(iterable, Mapping):
+                for elem, count in iterable.items():
+                    self[elem] = self_get(elem, 0) - count
+            else:
+                for elem in iterable:
+                    self[elem] = self_get(elem, 0) - 1
+        if kwds:
+            self.subtract(kwds)
+
+    def copy(self):
+        'Return a shallow copy.'
+        return self.__class__(self)
+
+    def __reduce__(self):
+        return self.__class__, (dict(self),)
+
+    def __delitem__(self, elem):
+        'Like dict.__delitem__() but does not raise KeyError for missing values.'
+        if elem in self:
+            super(Counter, self).__delitem__(elem)
+
+    def __repr__(self):
+        if not self:
+            return '%s()' % self.__class__.__name__
+        items = ', '.join(map('%r: %r'.__mod__, self.most_common()))
+        return '%s({%s})' % (self.__class__.__name__, items)
+
+    # Multiset-style mathematical operations discussed in:
+    #       Knuth TAOCP Volume II section 4.6.3 exercise 19
+    #       and at http://en.wikipedia.org/wiki/Multiset
+    #
+    # Outputs guaranteed to only include positive counts.
+    #
+    # To strip negative and zero counts, add-in an empty counter:
+    #       c += Counter()
+
+    def __add__(self, other):
+        '''Add counts from two counters.
+
+        >>> Counter('abbb') + Counter('bcc')
+        Counter({'b': 4, 'c': 2, 'a': 1})
+
+        '''
+        if not isinstance(other, Counter):
+            return NotImplemented
+        result = Counter()
+        for elem, count in self.items():
+            newcount = count + other[elem]
+            if newcount > 0:
+                result[elem] = newcount
+        for elem, count in other.items():
+            if elem not in self and count > 0:
+                result[elem] = count
+        return result
+
+    def __sub__(self, other):
+        ''' Subtract count, but keep only results with positive counts.
+
+        >>> Counter('abbbc') - Counter('bccd')
+        Counter({'b': 2, 'a': 1})
+
+        '''
+        if not isinstance(other, Counter):
+            return NotImplemented
+        result = Counter()
+        for elem, count in self.items():
+            newcount = count - other[elem]
+            if newcount > 0:
+                result[elem] = newcount
+        for elem, count in other.items():
+            if elem not in self and count < 0:
+                result[elem] = 0 - count
+        return result
+
+    def __or__(self, other):
+        '''Union is the maximum of value in either of the input counters.
+
+        >>> Counter('abbb') | Counter('bcc')
+        Counter({'b': 3, 'c': 2, 'a': 1})
+
+        '''
+        if not isinstance(other, Counter):
+            return NotImplemented
+        result = Counter()
+        for elem, count in self.items():
+            other_count = other[elem]
+            newcount = other_count if count < other_count else count
+            if newcount > 0:
+                result[elem] = newcount
+        for elem, count in other.items():
+            if elem not in self and count > 0:
+                result[elem] = count
+        return result
+
+    def __and__(self, other):
+        ''' Intersection is the minimum of corresponding counts.
+
+        >>> Counter('abbb') & Counter('bcc')
+        Counter({'b': 1})
+
+        '''
+        if not isinstance(other, Counter):
+            return NotImplemented
+        result = Counter()
+        for elem, count in self.items():
+            other_count = other[elem]
+            newcount = count if count < other_count else other_count
+            if newcount > 0:
+                result[elem] = newcount
+        return result
+
+
+if __name__ == '__main__':
+    # verify that instances can be pickled
+    from cPickle import loads, dumps
+    Point = namedtuple('Point', 'x, y', True)
+    p = Point(x=10, y=20)
+    assert p == loads(dumps(p))
+
+    # test and demonstrate ability to override methods
+    class Point(namedtuple('Point', 'x y')):
+        __slots__ = ()
+        @property
+        def hypot(self):
+            return (self.x ** 2 + self.y ** 2) ** 0.5
+        def __str__(self):
+            return 'Point: x=%6.3f  y=%6.3f  hypot=%6.3f' % (self.x, self.y, self.hypot)
+
+    for p in Point(3, 4), Point(14, 5/7.):
+        print p
+
+    class Point(namedtuple('Point', 'x y')):
+        'Point class with optimized _make() and _replace() without error-checking'
+        __slots__ = ()
+        _make = classmethod(tuple.__new__)
+        def _replace(self, _map=map, **kwds):
+            return self._make(_map(kwds.get, ('x', 'y'), self))
+
+    print Point(11, 22)._replace(x=100)
+
+    Point3D = namedtuple('Point3D', Point._fields + ('z',))
+    print Point3D.__doc__
+
+    import doctest
+    TestResults = namedtuple('TestResults', 'failed attempted')
+    print TestResults(*doctest.testmod())
+
+
+########################################################################
+###  deque
+########################################################################
+
+class deque(_deque):
+    """Extension of deque to support Python 2.7's operations."""
+    def __init__(self, iterable=[], maxlen=None):
+        _deque.__init__(self, iterable, maxlen)
+        self._maxlen = maxlen
+
+    @property
+    def maxlen(self):
+        return self._maxlen
+
+    def reverse(self):
+        data = []
+        while self:
+            data.append(self.pop())
+        self.extend(data)
+
+    def count(self, value):
+        return sum(1 for element in self if element == value)
diff --git a/lib/backports/__init__.py b/lib/backports/__init__.py
deleted file mode 100644
index 0d1f7edf..00000000
--- a/lib/backports/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__path__ = __import__('pkgutil').extend_path(__path__, __name__)  # type: ignore
diff --git a/lib/backports/cached_property/__init__.py b/lib/backports/cached_property/__init__.py
deleted file mode 100644
index 80f1f0b7..00000000
--- a/lib/backports/cached_property/__init__.py
+++ /dev/null
@@ -1,94 +0,0 @@
-"""Backport of python 3.8 functools.cached_property.
-
-cached_property() - computed once per instance, cached as attribute
-"""
-
-__all__ = ("cached_property",)
-
-# Standard Library
-from sys import version_info
-try:
-    # Local Implementation
-    from ._version import version as __version__
-except ImportError:
-    pass
-
-if version_info >= (3, 8):
-    # Standard Library
-    from functools import cached_property  # pylint: disable=no-name-in-module
-else:
-    # Standard Library
-    from threading import RLock
-    from typing import Any
-    from typing import Callable
-    from typing import Optional
-    from typing import Type
-    from typing import TypeVar
-
-    _NOT_FOUND = object()
-    _T = TypeVar("_T")
-    _S = TypeVar("_S")
-
-    # noinspection PyPep8Naming
-    class cached_property:  # NOSONAR  # pylint: disable=invalid-name  # noqa: N801
-        """Cached property implementation.
-
-        Transform a method of a class into a property whose value is computed once
-        and then cached as a normal attribute for the life of the instance.
-        Similar to property(), with the addition of caching.
-        Useful for expensive computed properties of instances
-        that are otherwise effectively immutable.
-        """
-
-        def __init__(self, func: Callable[[Any], _T]) -> None:
-            """Cached property implementation."""
-            self.func = func
-            self.attrname: Optional[str] = None
-            self.__doc__ = func.__doc__
-            self.lock = RLock()
-
-        def __set_name__(self, owner: Type[Any], name: str) -> None:
-            """Assign attribute name and owner."""
-            if self.attrname is None:
-                self.attrname = name
-            elif name != self.attrname:
-                raise TypeError(
-                    "Cannot assign the same cached_property to two different names "
-                    f"({self.attrname!r} and {name!r})."
-                )
-
-        def __get__(self, instance: Optional[_S], owner: Optional[Type[Any]] = None) -> Any:
-            """Property-like getter implementation.
-
-            :return: property instance if requested on class or value/cached value if requested on instance.
-            :rtype: Union[cached_property[_T], _T]
-            :raises TypeError: call without calling __set_name__ or no '__dict__' attribute
-            """
-            if instance is None:
-                return self
-            if self.attrname is None:
-                raise TypeError("Cannot use cached_property instance without calling __set_name__ on it.")
-            try:
-                cache = instance.__dict__
-            except AttributeError:  # not all objects have __dict__ (e.g. class defines slots)
-                msg = (
-                    f"No '__dict__' attribute on {type(instance).__name__!r} "
-                    f"instance to cache {self.attrname!r} property."
-                )
-                raise TypeError(msg) from None
-            val = cache.get(self.attrname, _NOT_FOUND)
-            if val is _NOT_FOUND:
-                with self.lock:
-                    # check if another thread filled cache while we awaited lock
-                    val = cache.get(self.attrname, _NOT_FOUND)
-                    if val is _NOT_FOUND:
-                        val = self.func(instance)
-                        try:
-                            cache[self.attrname] = val
-                        except TypeError:
-                            msg = (
-                                f"The '__dict__' attribute on {type(instance).__name__!r} instance "
-                                f"does not support item assignment for caching {self.attrname!r} property."
-                            )
-                            raise TypeError(msg) from None
-            return val
diff --git a/lib/backports/cached_property/__init__.pyi b/lib/backports/cached_property/__init__.pyi
deleted file mode 100644
index 13e619ba..00000000
--- a/lib/backports/cached_property/__init__.pyi
+++ /dev/null
@@ -1,24 +0,0 @@
-# Standard Library
-from threading import RLock
-from typing import Any
-from typing import Callable
-from typing import Generic
-from typing import Optional
-from typing import Type
-from typing import TypeVar
-from typing import overload
-
-_T = TypeVar("_T")
-_S = TypeVar("_S")
-
-# noinspection PyPep8Naming
-class cached_property(Generic[_T]):
-    func: Callable[[Any], _T]
-    attrname: Optional[str]
-    lock: RLock
-    def __init__(self, func: Callable[[Any], _T]) -> None: ...
-    @overload
-    def __get__(self, instance: None, owner: Optional[Type[Any]] = ...) -> cached_property[_T]: ...
-    @overload
-    def __get__(self, instance: _S, owner: Optional[Type[Any]] = ...) -> _T: ...
-    def __set_name__(self, owner: Type[Any], name: str) -> None: ...
diff --git a/lib/backports/cached_property/_version.py b/lib/backports/cached_property/_version.py
deleted file mode 100644
index 87c708f5..00000000
--- a/lib/backports/cached_property/_version.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# coding: utf-8
-# file generated by setuptools_scm
-# don't change, don't track in version control
-version = '1.0.2'
-version_tuple = (1, 0, 2)
diff --git a/lib/backports/cached_property/py.typed b/lib/backports/cached_property/py.typed
deleted file mode 100644
index 8b137891..00000000
--- a/lib/backports/cached_property/py.typed
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/lib/backports/tarfile/__init__.py b/lib/backports/tarfile/__init__.py
deleted file mode 100644
index 8c16881c..00000000
--- a/lib/backports/tarfile/__init__.py
+++ /dev/null
@@ -1,2937 +0,0 @@
-#-------------------------------------------------------------------
-# tarfile.py
-#-------------------------------------------------------------------
-# Copyright (C) 2002 Lars Gustaebel <lars@gustaebel.de>
-# All rights reserved.
-#
-# 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.
-#
-"""Read from and write to tar format archives.
-"""
-
-version     = "0.9.0"
-__author__  = "Lars Gust\u00e4bel (lars@gustaebel.de)"
-__credits__ = "Gustavo Niemeyer, Niels Gust\u00e4bel, Richard Townsend."
-
-#---------
-# Imports
-#---------
-from builtins import open as bltn_open
-import sys
-import os
-import io
-import shutil
-import stat
-import time
-import struct
-import copy
-import re
-
-from .compat.py38 import removesuffix
-
-try:
-    import pwd
-except ImportError:
-    pwd = None
-try:
-    import grp
-except ImportError:
-    grp = None
-
-# os.symlink on Windows prior to 6.0 raises NotImplementedError
-# OSError (winerror=1314) will be raised if the caller does not hold the
-# SeCreateSymbolicLinkPrivilege privilege
-symlink_exception = (AttributeError, NotImplementedError, OSError)
-
-# from tarfile import *
-__all__ = ["TarFile", "TarInfo", "is_tarfile", "TarError", "ReadError",
-           "CompressionError", "StreamError", "ExtractError", "HeaderError",
-           "ENCODING", "USTAR_FORMAT", "GNU_FORMAT", "PAX_FORMAT",
-           "DEFAULT_FORMAT", "open","fully_trusted_filter", "data_filter",
-           "tar_filter", "FilterError", "AbsoluteLinkError",
-           "OutsideDestinationError", "SpecialFileError", "AbsolutePathError",
-           "LinkOutsideDestinationError"]
-
-
-#---------------------------------------------------------
-# tar constants
-#---------------------------------------------------------
-NUL = b"\0"                     # the null character
-BLOCKSIZE = 512                 # length of processing blocks
-RECORDSIZE = BLOCKSIZE * 20     # length of records
-GNU_MAGIC = b"ustar  \0"        # magic gnu tar string
-POSIX_MAGIC = b"ustar\x0000"    # magic posix tar string
-
-LENGTH_NAME = 100               # maximum length of a filename
-LENGTH_LINK = 100               # maximum length of a linkname
-LENGTH_PREFIX = 155             # maximum length of the prefix field
-
-REGTYPE = b"0"                  # regular file
-AREGTYPE = b"\0"                # regular file
-LNKTYPE = b"1"                  # link (inside tarfile)
-SYMTYPE = b"2"                  # symbolic link
-CHRTYPE = b"3"                  # character special device
-BLKTYPE = b"4"                  # block special device
-DIRTYPE = b"5"                  # directory
-FIFOTYPE = b"6"                 # fifo special device
-CONTTYPE = b"7"                 # contiguous file
-
-GNUTYPE_LONGNAME = b"L"         # GNU tar longname
-GNUTYPE_LONGLINK = b"K"         # GNU tar longlink
-GNUTYPE_SPARSE = b"S"           # GNU tar sparse file
-
-XHDTYPE = b"x"                  # POSIX.1-2001 extended header
-XGLTYPE = b"g"                  # POSIX.1-2001 global header
-SOLARIS_XHDTYPE = b"X"          # Solaris extended header
-
-USTAR_FORMAT = 0                # POSIX.1-1988 (ustar) format
-GNU_FORMAT = 1                  # GNU tar format
-PAX_FORMAT = 2                  # POSIX.1-2001 (pax) format
-DEFAULT_FORMAT = PAX_FORMAT
-
-#---------------------------------------------------------
-# tarfile constants
-#---------------------------------------------------------
-# File types that tarfile supports:
-SUPPORTED_TYPES = (REGTYPE, AREGTYPE, LNKTYPE,
-                   SYMTYPE, DIRTYPE, FIFOTYPE,
-                   CONTTYPE, CHRTYPE, BLKTYPE,
-                   GNUTYPE_LONGNAME, GNUTYPE_LONGLINK,
-                   GNUTYPE_SPARSE)
-
-# File types that will be treated as a regular file.
-REGULAR_TYPES = (REGTYPE, AREGTYPE,
-                 CONTTYPE, GNUTYPE_SPARSE)
-
-# File types that are part of the GNU tar format.
-GNU_TYPES = (GNUTYPE_LONGNAME, GNUTYPE_LONGLINK,
-             GNUTYPE_SPARSE)
-
-# Fields from a pax header that override a TarInfo attribute.
-PAX_FIELDS = ("path", "linkpath", "size", "mtime",
-              "uid", "gid", "uname", "gname")
-
-# Fields from a pax header that are affected by hdrcharset.
-PAX_NAME_FIELDS = {"path", "linkpath", "uname", "gname"}
-
-# Fields in a pax header that are numbers, all other fields
-# are treated as strings.
-PAX_NUMBER_FIELDS = {
-    "atime": float,
-    "ctime": float,
-    "mtime": float,
-    "uid": int,
-    "gid": int,
-    "size": int
-}
-
-#---------------------------------------------------------
-# initialization
-#---------------------------------------------------------
-if os.name == "nt":
-    ENCODING = "utf-8"
-else:
-    ENCODING = sys.getfilesystemencoding()
-
-#---------------------------------------------------------
-# Some useful functions
-#---------------------------------------------------------
-
-def stn(s, length, encoding, errors):
-    """Convert a string to a null-terminated bytes object.
-    """
-    if s is None:
-        raise ValueError("metadata cannot contain None")
-    s = s.encode(encoding, errors)
-    return s[:length] + (length - len(s)) * NUL
-
-def nts(s, encoding, errors):
-    """Convert a null-terminated bytes object to a string.
-    """
-    p = s.find(b"\0")
-    if p != -1:
-        s = s[:p]
-    return s.decode(encoding, errors)
-
-def nti(s):
-    """Convert a number field to a python number.
-    """
-    # There are two possible encodings for a number field, see
-    # itn() below.
-    if s[0] in (0o200, 0o377):
-        n = 0
-        for i in range(len(s) - 1):
-            n <<= 8
-            n += s[i + 1]
-        if s[0] == 0o377:
-            n = -(256 ** (len(s) - 1) - n)
-    else:
-        try:
-            s = nts(s, "ascii", "strict")
-            n = int(s.strip() or "0", 8)
-        except ValueError:
-            raise InvalidHeaderError("invalid header")
-    return n
-
-def itn(n, digits=8, format=DEFAULT_FORMAT):
-    """Convert a python number to a number field.
-    """
-    # POSIX 1003.1-1988 requires numbers to be encoded as a string of
-    # octal digits followed by a null-byte, this allows values up to
-    # (8**(digits-1))-1. GNU tar allows storing numbers greater than
-    # that if necessary. A leading 0o200 or 0o377 byte indicate this
-    # particular encoding, the following digits-1 bytes are a big-endian
-    # base-256 representation. This allows values up to (256**(digits-1))-1.
-    # A 0o200 byte indicates a positive number, a 0o377 byte a negative
-    # number.
-    original_n = n
-    n = int(n)
-    if 0 <= n < 8 ** (digits - 1):
-        s = bytes("%0*o" % (digits - 1, n), "ascii") + NUL
-    elif format == GNU_FORMAT and -256 ** (digits - 1) <= n < 256 ** (digits - 1):
-        if n >= 0:
-            s = bytearray([0o200])
-        else:
-            s = bytearray([0o377])
-            n = 256 ** digits + n
-
-        for i in range(digits - 1):
-            s.insert(1, n & 0o377)
-            n >>= 8
-    else:
-        raise ValueError("overflow in number field")
-
-    return s
-
-def calc_chksums(buf):
-    """Calculate the checksum for a member's header by summing up all
-       characters except for the chksum field which is treated as if
-       it was filled with spaces. According to the GNU tar sources,
-       some tars (Sun and NeXT) calculate chksum with signed char,
-       which will be different if there are chars in the buffer with
-       the high bit set. So we calculate two checksums, unsigned and
-       signed.
-    """
-    unsigned_chksum = 256 + sum(struct.unpack_from("148B8x356B", buf))
-    signed_chksum = 256 + sum(struct.unpack_from("148b8x356b", buf))
-    return unsigned_chksum, signed_chksum
-
-def copyfileobj(src, dst, length=None, exception=OSError, bufsize=None):
-    """Copy length bytes from fileobj src to fileobj dst.
-       If length is None, copy the entire content.
-    """
-    bufsize = bufsize or 16 * 1024
-    if length == 0:
-        return
-    if length is None:
-        shutil.copyfileobj(src, dst, bufsize)
-        return
-
-    blocks, remainder = divmod(length, bufsize)
-    for b in range(blocks):
-        buf = src.read(bufsize)
-        if len(buf) < bufsize:
-            raise exception("unexpected end of data")
-        dst.write(buf)
-
-    if remainder != 0:
-        buf = src.read(remainder)
-        if len(buf) < remainder:
-            raise exception("unexpected end of data")
-        dst.write(buf)
-    return
-
-def _safe_print(s):
-    encoding = getattr(sys.stdout, 'encoding', None)
-    if encoding is not None:
-        s = s.encode(encoding, 'backslashreplace').decode(encoding)
-    print(s, end=' ')
-
-
-class TarError(Exception):
-    """Base exception."""
-    pass
-class ExtractError(TarError):
-    """General exception for extract errors."""
-    pass
-class ReadError(TarError):
-    """Exception for unreadable tar archives."""
-    pass
-class CompressionError(TarError):
-    """Exception for unavailable compression methods."""
-    pass
-class StreamError(TarError):
-    """Exception for unsupported operations on stream-like TarFiles."""
-    pass
-class HeaderError(TarError):
-    """Base exception for header errors."""
-    pass
-class EmptyHeaderError(HeaderError):
-    """Exception for empty headers."""
-    pass
-class TruncatedHeaderError(HeaderError):
-    """Exception for truncated headers."""
-    pass
-class EOFHeaderError(HeaderError):
-    """Exception for end of file headers."""
-    pass
-class InvalidHeaderError(HeaderError):
-    """Exception for invalid headers."""
-    pass
-class SubsequentHeaderError(HeaderError):
-    """Exception for missing and invalid extended headers."""
-    pass
-
-#---------------------------
-# internal stream interface
-#---------------------------
-class _LowLevelFile:
-    """Low-level file object. Supports reading and writing.
-       It is used instead of a regular file object for streaming
-       access.
-    """
-
-    def __init__(self, name, mode):
-        mode = {
-            "r": os.O_RDONLY,
-            "w": os.O_WRONLY | os.O_CREAT | os.O_TRUNC,
-        }[mode]
-        if hasattr(os, "O_BINARY"):
-            mode |= os.O_BINARY
-        self.fd = os.open(name, mode, 0o666)
-
-    def close(self):
-        os.close(self.fd)
-
-    def read(self, size):
-        return os.read(self.fd, size)
-
-    def write(self, s):
-        os.write(self.fd, s)
-
-class _Stream:
-    """Class that serves as an adapter between TarFile and
-       a stream-like object.  The stream-like object only
-       needs to have a read() or write() method that works with bytes,
-       and the method is accessed blockwise.
-       Use of gzip or bzip2 compression is possible.
-       A stream-like object could be for example: sys.stdin.buffer,
-       sys.stdout.buffer, a socket, a tape device etc.
-
-       _Stream is intended to be used only internally.
-    """
-
-    def __init__(self, name, mode, comptype, fileobj, bufsize,
-                 compresslevel):
-        """Construct a _Stream object.
-        """
-        self._extfileobj = True
-        if fileobj is None:
-            fileobj = _LowLevelFile(name, mode)
-            self._extfileobj = False
-
-        if comptype == '*':
-            # Enable transparent compression detection for the
-            # stream interface
-            fileobj = _StreamProxy(fileobj)
-            comptype = fileobj.getcomptype()
-
-        self.name     = name or ""
-        self.mode     = mode
-        self.comptype = comptype
-        self.fileobj  = fileobj
-        self.bufsize  = bufsize
-        self.buf      = b""
-        self.pos      = 0
-        self.closed   = False
-
-        try:
-            if comptype == "gz":
-                try:
-                    import zlib
-                except ImportError:
-                    raise CompressionError("zlib module is not available") from None
-                self.zlib = zlib
-                self.crc = zlib.crc32(b"")
-                if mode == "r":
-                    self.exception = zlib.error
-                    self._init_read_gz()
-                else:
-                    self._init_write_gz(compresslevel)
-
-            elif comptype == "bz2":
-                try:
-                    import bz2
-                except ImportError:
-                    raise CompressionError("bz2 module is not available") from None
-                if mode == "r":
-                    self.dbuf = b""
-                    self.cmp = bz2.BZ2Decompressor()
-                    self.exception = OSError
-                else:
-                    self.cmp = bz2.BZ2Compressor(compresslevel)
-
-            elif comptype == "xz":
-                try:
-                    import lzma
-                except ImportError:
-                    raise CompressionError("lzma module is not available") from None
-                if mode == "r":
-                    self.dbuf = b""
-                    self.cmp = lzma.LZMADecompressor()
-                    self.exception = lzma.LZMAError
-                else:
-                    self.cmp = lzma.LZMACompressor()
-
-            elif comptype != "tar":
-                raise CompressionError("unknown compression type %r" % comptype)
-
-        except:
-            if not self._extfileobj:
-                self.fileobj.close()
-            self.closed = True
-            raise
-
-    def __del__(self):
-        if hasattr(self, "closed") and not self.closed:
-            self.close()
-
-    def _init_write_gz(self, compresslevel):
-        """Initialize for writing with gzip compression.
-        """
-        self.cmp = self.zlib.compressobj(compresslevel,
-                                         self.zlib.DEFLATED,
-                                         -self.zlib.MAX_WBITS,
-                                         self.zlib.DEF_MEM_LEVEL,
-                                         0)
-        timestamp = struct.pack("<L", int(time.time()))
-        self.__write(b"\037\213\010\010" + timestamp + b"\002\377")
-        if self.name.endswith(".gz"):
-            self.name = self.name[:-3]
-        # Honor "directory components removed" from RFC1952
-        self.name = os.path.basename(self.name)
-        # RFC1952 says we must use ISO-8859-1 for the FNAME field.
-        self.__write(self.name.encode("iso-8859-1", "replace") + NUL)
-
-    def write(self, s):
-        """Write string s to the stream.
-        """
-        if self.comptype == "gz":
-            self.crc = self.zlib.crc32(s, self.crc)
-        self.pos += len(s)
-        if self.comptype != "tar":
-            s = self.cmp.compress(s)
-        self.__write(s)
-
-    def __write(self, s):
-        """Write string s to the stream if a whole new block
-           is ready to be written.
-        """
-        self.buf += s
-        while len(self.buf) > self.bufsize:
-            self.fileobj.write(self.buf[:self.bufsize])
-            self.buf = self.buf[self.bufsize:]
-
-    def close(self):
-        """Close the _Stream object. No operation should be
-           done on it afterwards.
-        """
-        if self.closed:
-            return
-
-        self.closed = True
-        try:
-            if self.mode == "w" and self.comptype != "tar":
-                self.buf += self.cmp.flush()
-
-            if self.mode == "w" and self.buf:
-                self.fileobj.write(self.buf)
-                self.buf = b""
-                if self.comptype == "gz":
-                    self.fileobj.write(struct.pack("<L", self.crc))
-                    self.fileobj.write(struct.pack("<L", self.pos & 0xffffFFFF))
-        finally:
-            if not self._extfileobj:
-                self.fileobj.close()
-
-    def _init_read_gz(self):
-        """Initialize for reading a gzip compressed fileobj.
-        """
-        self.cmp = self.zlib.decompressobj(-self.zlib.MAX_WBITS)
-        self.dbuf = b""
-
-        # taken from gzip.GzipFile with some alterations
-        if self.__read(2) != b"\037\213":
-            raise ReadError("not a gzip file")
-        if self.__read(1) != b"\010":
-            raise CompressionError("unsupported compression method")
-
-        flag = ord(self.__read(1))
-        self.__read(6)
-
-        if flag & 4:
-            xlen = ord(self.__read(1)) + 256 * ord(self.__read(1))
-            self.read(xlen)
-        if flag & 8:
-            while True:
-                s = self.__read(1)
-                if not s or s == NUL:
-                    break
-        if flag & 16:
-            while True:
-                s = self.__read(1)
-                if not s or s == NUL:
-                    break
-        if flag & 2:
-            self.__read(2)
-
-    def tell(self):
-        """Return the stream's file pointer position.
-        """
-        return self.pos
-
-    def seek(self, pos=0):
-        """Set the stream's file pointer to pos. Negative seeking
-           is forbidden.
-        """
-        if pos - self.pos >= 0:
-            blocks, remainder = divmod(pos - self.pos, self.bufsize)
-            for i in range(blocks):
-                self.read(self.bufsize)
-            self.read(remainder)
-        else:
-            raise StreamError("seeking backwards is not allowed")
-        return self.pos
-
-    def read(self, size):
-        """Return the next size number of bytes from the stream."""
-        assert size is not None
-        buf = self._read(size)
-        self.pos += len(buf)
-        return buf
-
-    def _read(self, size):
-        """Return size bytes from the stream.
-        """
-        if self.comptype == "tar":
-            return self.__read(size)
-
-        c = len(self.dbuf)
-        t = [self.dbuf]
-        while c < size:
-            # Skip underlying buffer to avoid unaligned double buffering.
-            if self.buf:
-                buf = self.buf
-                self.buf = b""
-            else:
-                buf = self.fileobj.read(self.bufsize)
-                if not buf:
-                    break
-            try:
-                buf = self.cmp.decompress(buf)
-            except self.exception as e:
-                raise ReadError("invalid compressed data") from e
-            t.append(buf)
-            c += len(buf)
-        t = b"".join(t)
-        self.dbuf = t[size:]
-        return t[:size]
-
-    def __read(self, size):
-        """Return size bytes from stream. If internal buffer is empty,
-           read another block from the stream.
-        """
-        c = len(self.buf)
-        t = [self.buf]
-        while c < size:
-            buf = self.fileobj.read(self.bufsize)
-            if not buf:
-                break
-            t.append(buf)
-            c += len(buf)
-        t = b"".join(t)
-        self.buf = t[size:]
-        return t[:size]
-# class _Stream
-
-class _StreamProxy(object):
-    """Small proxy class that enables transparent compression
-       detection for the Stream interface (mode 'r|*').
-    """
-
-    def __init__(self, fileobj):
-        self.fileobj = fileobj
-        self.buf = self.fileobj.read(BLOCKSIZE)
-
-    def read(self, size):
-        self.read = self.fileobj.read
-        return self.buf
-
-    def getcomptype(self):
-        if self.buf.startswith(b"\x1f\x8b\x08"):
-            return "gz"
-        elif self.buf[0:3] == b"BZh" and self.buf[4:10] == b"1AY&SY":
-            return "bz2"
-        elif self.buf.startswith((b"\x5d\x00\x00\x80", b"\xfd7zXZ")):
-            return "xz"
-        else:
-            return "tar"
-
-    def close(self):
-        self.fileobj.close()
-# class StreamProxy
-
-#------------------------
-# Extraction file object
-#------------------------
-class _FileInFile(object):
-    """A thin wrapper around an existing file object that
-       provides a part of its data as an individual file
-       object.
-    """
-
-    def __init__(self, fileobj, offset, size, name, blockinfo=None):
-        self.fileobj = fileobj
-        self.offset = offset
-        self.size = size
-        self.position = 0
-        self.name = name
-        self.closed = False
-
-        if blockinfo is None:
-            blockinfo = [(0, size)]
-
-        # Construct a map with data and zero blocks.
-        self.map_index = 0
-        self.map = []
-        lastpos = 0
-        realpos = self.offset
-        for offset, size in blockinfo:
-            if offset > lastpos:
-                self.map.append((False, lastpos, offset, None))
-            self.map.append((True, offset, offset + size, realpos))
-            realpos += size
-            lastpos = offset + size
-        if lastpos < self.size:
-            self.map.append((False, lastpos, self.size, None))
-
-    def flush(self):
-        pass
-
-    @property
-    def mode(self):
-        return 'rb'
-
-    def readable(self):
-        return True
-
-    def writable(self):
-        return False
-
-    def seekable(self):
-        return self.fileobj.seekable()
-
-    def tell(self):
-        """Return the current file position.
-        """
-        return self.position
-
-    def seek(self, position, whence=io.SEEK_SET):
-        """Seek to a position in the file.
-        """
-        if whence == io.SEEK_SET:
-            self.position = min(max(position, 0), self.size)
-        elif whence == io.SEEK_CUR:
-            if position < 0:
-                self.position = max(self.position + position, 0)
-            else:
-                self.position = min(self.position + position, self.size)
-        elif whence == io.SEEK_END:
-            self.position = max(min(self.size + position, self.size), 0)
-        else:
-            raise ValueError("Invalid argument")
-        return self.position
-
-    def read(self, size=None):
-        """Read data from the file.
-        """
-        if size is None:
-            size = self.size - self.position
-        else:
-            size = min(size, self.size - self.position)
-
-        buf = b""
-        while size > 0:
-            while True:
-                data, start, stop, offset = self.map[self.map_index]
-                if start <= self.position < stop:
-                    break
-                else:
-                    self.map_index += 1
-                    if self.map_index == len(self.map):
-                        self.map_index = 0
-            length = min(size, stop - self.position)
-            if data:
-                self.fileobj.seek(offset + (self.position - start))
-                b = self.fileobj.read(length)
-                if len(b) != length:
-                    raise ReadError("unexpected end of data")
-                buf += b
-            else:
-                buf += NUL * length
-            size -= length
-            self.position += length
-        return buf
-
-    def readinto(self, b):
-        buf = self.read(len(b))
-        b[:len(buf)] = buf
-        return len(buf)
-
-    def close(self):
-        self.closed = True
-#class _FileInFile
-
-class ExFileObject(io.BufferedReader):
-
-    def __init__(self, tarfile, tarinfo):
-        fileobj = _FileInFile(tarfile.fileobj, tarinfo.offset_data,
-                tarinfo.size, tarinfo.name, tarinfo.sparse)
-        super().__init__(fileobj)
-#class ExFileObject
-
-
-#-----------------------------
-# extraction filters (PEP 706)
-#-----------------------------
-
-class FilterError(TarError):
-    pass
-
-class AbsolutePathError(FilterError):
-    def __init__(self, tarinfo):
-        self.tarinfo = tarinfo
-        super().__init__(f'member {tarinfo.name!r} has an absolute path')
-
-class OutsideDestinationError(FilterError):
-    def __init__(self, tarinfo, path):
-        self.tarinfo = tarinfo
-        self._path = path
-        super().__init__(f'{tarinfo.name!r} would be extracted to {path!r}, '
-                         + 'which is outside the destination')
-
-class SpecialFileError(FilterError):
-    def __init__(self, tarinfo):
-        self.tarinfo = tarinfo
-        super().__init__(f'{tarinfo.name!r} is a special file')
-
-class AbsoluteLinkError(FilterError):
-    def __init__(self, tarinfo):
-        self.tarinfo = tarinfo
-        super().__init__(f'{tarinfo.name!r} is a link to an absolute path')
-
-class LinkOutsideDestinationError(FilterError):
-    def __init__(self, tarinfo, path):
-        self.tarinfo = tarinfo
-        self._path = path
-        super().__init__(f'{tarinfo.name!r} would link to {path!r}, '
-                         + 'which is outside the destination')
-
-def _get_filtered_attrs(member, dest_path, for_data=True):
-    new_attrs = {}
-    name = member.name
-    dest_path = os.path.realpath(dest_path)
-    # Strip leading / (tar's directory separator) from filenames.
-    # Include os.sep (target OS directory separator) as well.
-    if name.startswith(('/', os.sep)):
-        name = new_attrs['name'] = member.path.lstrip('/' + os.sep)
-    if os.path.isabs(name):
-        # Path is absolute even after stripping.
-        # For example, 'C:/foo' on Windows.
-        raise AbsolutePathError(member)
-    # Ensure we stay in the destination
-    target_path = os.path.realpath(os.path.join(dest_path, name))
-    if os.path.commonpath([target_path, dest_path]) != dest_path:
-        raise OutsideDestinationError(member, target_path)
-    # Limit permissions (no high bits, and go-w)
-    mode = member.mode
-    if mode is not None:
-        # Strip high bits & group/other write bits
-        mode = mode & 0o755
-        if for_data:
-            # For data, handle permissions & file types
-            if member.isreg() or member.islnk():
-                if not mode & 0o100:
-                    # Clear executable bits if not executable by user
-                    mode &= ~0o111
-                # Ensure owner can read & write
-                mode |= 0o600
-            elif member.isdir() or member.issym():
-                # Ignore mode for directories & symlinks
-                mode = None
-            else:
-                # Reject special files
-                raise SpecialFileError(member)
-        if mode != member.mode:
-            new_attrs['mode'] = mode
-    if for_data:
-        # Ignore ownership for 'data'
-        if member.uid is not None:
-            new_attrs['uid'] = None
-        if member.gid is not None:
-            new_attrs['gid'] = None
-        if member.uname is not None:
-            new_attrs['uname'] = None
-        if member.gname is not None:
-            new_attrs['gname'] = None
-        # Check link destination for 'data'
-        if member.islnk() or member.issym():
-            if os.path.isabs(member.linkname):
-                raise AbsoluteLinkError(member)
-            if member.issym():
-                target_path = os.path.join(dest_path,
-                                           os.path.dirname(name),
-                                           member.linkname)
-            else:
-                target_path = os.path.join(dest_path,
-                                           member.linkname)
-            target_path = os.path.realpath(target_path)
-            if os.path.commonpath([target_path, dest_path]) != dest_path:
-                raise LinkOutsideDestinationError(member, target_path)
-    return new_attrs
-
-def fully_trusted_filter(member, dest_path):
-    return member
-
-def tar_filter(member, dest_path):
-    new_attrs = _get_filtered_attrs(member, dest_path, False)
-    if new_attrs:
-        return member.replace(**new_attrs, deep=False)
-    return member
-
-def data_filter(member, dest_path):
-    new_attrs = _get_filtered_attrs(member, dest_path, True)
-    if new_attrs:
-        return member.replace(**new_attrs, deep=False)
-    return member
-
-_NAMED_FILTERS = {
-    "fully_trusted": fully_trusted_filter,
-    "tar": tar_filter,
-    "data": data_filter,
-}
-
-#------------------
-# Exported Classes
-#------------------
-
-# Sentinel for replace() defaults, meaning "don't change the attribute"
-_KEEP = object()
-
-class TarInfo(object):
-    """Informational class which holds the details about an
-       archive member given by a tar header block.
-       TarInfo objects are returned by TarFile.getmember(),
-       TarFile.getmembers() and TarFile.gettarinfo() and are
-       usually created internally.
-    """
-
-    __slots__ = dict(
-        name = 'Name of the archive member.',
-        mode = 'Permission bits.',
-        uid = 'User ID of the user who originally stored this member.',
-        gid = 'Group ID of the user who originally stored this member.',
-        size = 'Size in bytes.',
-        mtime = 'Time of last modification.',
-        chksum = 'Header checksum.',
-        type = ('File type. type is usually one of these constants: '
-                'REGTYPE, AREGTYPE, LNKTYPE, SYMTYPE, DIRTYPE, FIFOTYPE, '
-                'CONTTYPE, CHRTYPE, BLKTYPE, GNUTYPE_SPARSE.'),
-        linkname = ('Name of the target file name, which is only present '
-                    'in TarInfo objects of type LNKTYPE and SYMTYPE.'),
-        uname = 'User name.',
-        gname = 'Group name.',
-        devmajor = 'Device major number.',
-        devminor = 'Device minor number.',
-        offset = 'The tar header starts here.',
-        offset_data = "The file's data starts here.",
-        pax_headers = ('A dictionary containing key-value pairs of an '
-                       'associated pax extended header.'),
-        sparse = 'Sparse member information.',
-        _tarfile = None,
-        _sparse_structs = None,
-        _link_target = None,
-        )
-
-    def __init__(self, name=""):
-        """Construct a TarInfo object. name is the optional name
-           of the member.
-        """
-        self.name = name        # member name
-        self.mode = 0o644       # file permissions
-        self.uid = 0            # user id
-        self.gid = 0            # group id
-        self.size = 0           # file size
-        self.mtime = 0          # modification time
-        self.chksum = 0         # header checksum
-        self.type = REGTYPE     # member type
-        self.linkname = ""      # link name
-        self.uname = ""         # user name
-        self.gname = ""         # group name
-        self.devmajor = 0       # device major number
-        self.devminor = 0       # device minor number
-
-        self.offset = 0         # the tar header starts here
-        self.offset_data = 0    # the file's data starts here
-
-        self.sparse = None      # sparse member information
-        self.pax_headers = {}   # pax header information
-
-    @property
-    def tarfile(self):
-        import warnings
-        warnings.warn(
-            'The undocumented "tarfile" attribute of TarInfo objects '
-            + 'is deprecated and will be removed in Python 3.16',
-            DeprecationWarning, stacklevel=2)
-        return self._tarfile
-
-    @tarfile.setter
-    def tarfile(self, tarfile):
-        import warnings
-        warnings.warn(
-            'The undocumented "tarfile" attribute of TarInfo objects '
-            + 'is deprecated and will be removed in Python 3.16',
-            DeprecationWarning, stacklevel=2)
-        self._tarfile = tarfile
-
-    @property
-    def path(self):
-        'In pax headers, "name" is called "path".'
-        return self.name
-
-    @path.setter
-    def path(self, name):
-        self.name = name
-
-    @property
-    def linkpath(self):
-        'In pax headers, "linkname" is called "linkpath".'
-        return self.linkname
-
-    @linkpath.setter
-    def linkpath(self, linkname):
-        self.linkname = linkname
-
-    def __repr__(self):
-        return "<%s %r at %#x>" % (self.__class__.__name__,self.name,id(self))
-
-    def replace(self, *,
-                name=_KEEP, mtime=_KEEP, mode=_KEEP, linkname=_KEEP,
-                uid=_KEEP, gid=_KEEP, uname=_KEEP, gname=_KEEP,
-                deep=True, _KEEP=_KEEP):
-        """Return a deep copy of self with the given attributes replaced.
-        """
-        if deep:
-            result = copy.deepcopy(self)
-        else:
-            result = copy.copy(self)
-        if name is not _KEEP:
-            result.name = name
-        if mtime is not _KEEP:
-            result.mtime = mtime
-        if mode is not _KEEP:
-            result.mode = mode
-        if linkname is not _KEEP:
-            result.linkname = linkname
-        if uid is not _KEEP:
-            result.uid = uid
-        if gid is not _KEEP:
-            result.gid = gid
-        if uname is not _KEEP:
-            result.uname = uname
-        if gname is not _KEEP:
-            result.gname = gname
-        return result
-
-    def get_info(self):
-        """Return the TarInfo's attributes as a dictionary.
-        """
-        if self.mode is None:
-            mode = None
-        else:
-            mode = self.mode & 0o7777
-        info = {
-            "name":     self.name,
-            "mode":     mode,
-            "uid":      self.uid,
-            "gid":      self.gid,
-            "size":     self.size,
-            "mtime":    self.mtime,
-            "chksum":   self.chksum,
-            "type":     self.type,
-            "linkname": self.linkname,
-            "uname":    self.uname,
-            "gname":    self.gname,
-            "devmajor": self.devmajor,
-            "devminor": self.devminor
-        }
-
-        if info["type"] == DIRTYPE and not info["name"].endswith("/"):
-            info["name"] += "/"
-
-        return info
-
-    def tobuf(self, format=DEFAULT_FORMAT, encoding=ENCODING, errors="surrogateescape"):
-        """Return a tar header as a string of 512 byte blocks.
-        """
-        info = self.get_info()
-        for name, value in info.items():
-            if value is None:
-                raise ValueError("%s may not be None" % name)
-
-        if format == USTAR_FORMAT:
-            return self.create_ustar_header(info, encoding, errors)
-        elif format == GNU_FORMAT:
-            return self.create_gnu_header(info, encoding, errors)
-        elif format == PAX_FORMAT:
-            return self.create_pax_header(info, encoding)
-        else:
-            raise ValueError("invalid format")
-
-    def create_ustar_header(self, info, encoding, errors):
-        """Return the object as a ustar header block.
-        """
-        info["magic"] = POSIX_MAGIC
-
-        if len(info["linkname"].encode(encoding, errors)) > LENGTH_LINK:
-            raise ValueError("linkname is too long")
-
-        if len(info["name"].encode(encoding, errors)) > LENGTH_NAME:
-            info["prefix"], info["name"] = self._posix_split_name(info["name"], encoding, errors)
-
-        return self._create_header(info, USTAR_FORMAT, encoding, errors)
-
-    def create_gnu_header(self, info, encoding, errors):
-        """Return the object as a GNU header block sequence.
-        """
-        info["magic"] = GNU_MAGIC
-
-        buf = b""
-        if len(info["linkname"].encode(encoding, errors)) > LENGTH_LINK:
-            buf += self._create_gnu_long_header(info["linkname"], GNUTYPE_LONGLINK, encoding, errors)
-
-        if len(info["name"].encode(encoding, errors)) > LENGTH_NAME:
-            buf += self._create_gnu_long_header(info["name"], GNUTYPE_LONGNAME, encoding, errors)
-
-        return buf + self._create_header(info, GNU_FORMAT, encoding, errors)
-
-    def create_pax_header(self, info, encoding):
-        """Return the object as a ustar header block. If it cannot be
-           represented this way, prepend a pax extended header sequence
-           with supplement information.
-        """
-        info["magic"] = POSIX_MAGIC
-        pax_headers = self.pax_headers.copy()
-
-        # Test string fields for values that exceed the field length or cannot
-        # be represented in ASCII encoding.
-        for name, hname, length in (
-                ("name", "path", LENGTH_NAME), ("linkname", "linkpath", LENGTH_LINK),
-                ("uname", "uname", 32), ("gname", "gname", 32)):
-
-            if hname in pax_headers:
-                # The pax header has priority.
-                continue
-
-            # Try to encode the string as ASCII.
-            try:
-                info[name].encode("ascii", "strict")
-            except UnicodeEncodeError:
-                pax_headers[hname] = info[name]
-                continue
-
-            if len(info[name]) > length:
-                pax_headers[hname] = info[name]
-
-        # Test number fields for values that exceed the field limit or values
-        # that like to be stored as float.
-        for name, digits in (("uid", 8), ("gid", 8), ("size", 12), ("mtime", 12)):
-            needs_pax = False
-
-            val = info[name]
-            val_is_float = isinstance(val, float)
-            val_int = round(val) if val_is_float else val
-            if not 0 <= val_int < 8 ** (digits - 1):
-                # Avoid overflow.
-                info[name] = 0
-                needs_pax = True
-            elif val_is_float:
-                # Put rounded value in ustar header, and full
-                # precision value in pax header.
-                info[name] = val_int
-                needs_pax = True
-
-            # The existing pax header has priority.
-            if needs_pax and name not in pax_headers:
-                pax_headers[name] = str(val)
-
-        # Create a pax extended header if necessary.
-        if pax_headers:
-            buf = self._create_pax_generic_header(pax_headers, XHDTYPE, encoding)
-        else:
-            buf = b""
-
-        return buf + self._create_header(info, USTAR_FORMAT, "ascii", "replace")
-
-    @classmethod
-    def create_pax_global_header(cls, pax_headers):
-        """Return the object as a pax global header block sequence.
-        """
-        return cls._create_pax_generic_header(pax_headers, XGLTYPE, "utf-8")
-
-    def _posix_split_name(self, name, encoding, errors):
-        """Split a name longer than 100 chars into a prefix
-           and a name part.
-        """
-        components = name.split("/")
-        for i in range(1, len(components)):
-            prefix = "/".join(components[:i])
-            name = "/".join(components[i:])
-            if len(prefix.encode(encoding, errors)) <= LENGTH_PREFIX and \
-                    len(name.encode(encoding, errors)) <= LENGTH_NAME:
-                break
-        else:
-            raise ValueError("name is too long")
-
-        return prefix, name
-
-    @staticmethod
-    def _create_header(info, format, encoding, errors):
-        """Return a header block. info is a dictionary with file
-           information, format must be one of the *_FORMAT constants.
-        """
-        has_device_fields = info.get("type") in (CHRTYPE, BLKTYPE)
-        if has_device_fields:
-            devmajor = itn(info.get("devmajor", 0), 8, format)
-            devminor = itn(info.get("devminor", 0), 8, format)
-        else:
-            devmajor = stn("", 8, encoding, errors)
-            devminor = stn("", 8, encoding, errors)
-
-        # None values in metadata should cause ValueError.
-        # itn()/stn() do this for all fields except type.
-        filetype = info.get("type", REGTYPE)
-        if filetype is None:
-            raise ValueError("TarInfo.type must not be None")
-
-        parts = [
-            stn(info.get("name", ""), 100, encoding, errors),
-            itn(info.get("mode", 0) & 0o7777, 8, format),
-            itn(info.get("uid", 0), 8, format),
-            itn(info.get("gid", 0), 8, format),
-            itn(info.get("size", 0), 12, format),
-            itn(info.get("mtime", 0), 12, format),
-            b"        ", # checksum field
-            filetype,
-            stn(info.get("linkname", ""), 100, encoding, errors),
-            info.get("magic", POSIX_MAGIC),
-            stn(info.get("uname", ""), 32, encoding, errors),
-            stn(info.get("gname", ""), 32, encoding, errors),
-            devmajor,
-            devminor,
-            stn(info.get("prefix", ""), 155, encoding, errors)
-        ]
-
-        buf = struct.pack("%ds" % BLOCKSIZE, b"".join(parts))
-        chksum = calc_chksums(buf[-BLOCKSIZE:])[0]
-        buf = buf[:-364] + bytes("%06o\0" % chksum, "ascii") + buf[-357:]
-        return buf
-
-    @staticmethod
-    def _create_payload(payload):
-        """Return the string payload filled with zero bytes
-           up to the next 512 byte border.
-        """
-        blocks, remainder = divmod(len(payload), BLOCKSIZE)
-        if remainder > 0:
-            payload += (BLOCKSIZE - remainder) * NUL
-        return payload
-
-    @classmethod
-    def _create_gnu_long_header(cls, name, type, encoding, errors):
-        """Return a GNUTYPE_LONGNAME or GNUTYPE_LONGLINK sequence
-           for name.
-        """
-        name = name.encode(encoding, errors) + NUL
-
-        info = {}
-        info["name"] = "././@LongLink"
-        info["type"] = type
-        info["size"] = len(name)
-        info["magic"] = GNU_MAGIC
-
-        # create extended header + name blocks.
-        return cls._create_header(info, USTAR_FORMAT, encoding, errors) + \
-                cls._create_payload(name)
-
-    @classmethod
-    def _create_pax_generic_header(cls, pax_headers, type, encoding):
-        """Return a POSIX.1-2008 extended or global header sequence
-           that contains a list of keyword, value pairs. The values
-           must be strings.
-        """
-        # Check if one of the fields contains surrogate characters and thereby
-        # forces hdrcharset=BINARY, see _proc_pax() for more information.
-        binary = False
-        for keyword, value in pax_headers.items():
-            try:
-                value.encode("utf-8", "strict")
-            except UnicodeEncodeError:
-                binary = True
-                break
-
-        records = b""
-        if binary:
-            # Put the hdrcharset field at the beginning of the header.
-            records += b"21 hdrcharset=BINARY\n"
-
-        for keyword, value in pax_headers.items():
-            keyword = keyword.encode("utf-8")
-            if binary:
-                # Try to restore the original byte representation of 'value'.
-                # Needless to say, that the encoding must match the string.
-                value = value.encode(encoding, "surrogateescape")
-            else:
-                value = value.encode("utf-8")
-
-            l = len(keyword) + len(value) + 3   # ' ' + '=' + '\n'
-            n = p = 0
-            while True:
-                n = l + len(str(p))
-                if n == p:
-                    break
-                p = n
-            records += bytes(str(p), "ascii") + b" " + keyword + b"=" + value + b"\n"
-
-        # We use a hardcoded "././@PaxHeader" name like star does
-        # instead of the one that POSIX recommends.
-        info = {}
-        info["name"] = "././@PaxHeader"
-        info["type"] = type
-        info["size"] = len(records)
-        info["magic"] = POSIX_MAGIC
-
-        # Create pax header + record blocks.
-        return cls._create_header(info, USTAR_FORMAT, "ascii", "replace") + \
-                cls._create_payload(records)
-
-    @classmethod
-    def frombuf(cls, buf, encoding, errors):
-        """Construct a TarInfo object from a 512 byte bytes object.
-        """
-        if len(buf) == 0:
-            raise EmptyHeaderError("empty header")
-        if len(buf) != BLOCKSIZE:
-            raise TruncatedHeaderError("truncated header")
-        if buf.count(NUL) == BLOCKSIZE:
-            raise EOFHeaderError("end of file header")
-
-        chksum = nti(buf[148:156])
-        if chksum not in calc_chksums(buf):
-            raise InvalidHeaderError("bad checksum")
-
-        obj = cls()
-        obj.name = nts(buf[0:100], encoding, errors)
-        obj.mode = nti(buf[100:108])
-        obj.uid = nti(buf[108:116])
-        obj.gid = nti(buf[116:124])
-        obj.size = nti(buf[124:136])
-        obj.mtime = nti(buf[136:148])
-        obj.chksum = chksum
-        obj.type = buf[156:157]
-        obj.linkname = nts(buf[157:257], encoding, errors)
-        obj.uname = nts(buf[265:297], encoding, errors)
-        obj.gname = nts(buf[297:329], encoding, errors)
-        obj.devmajor = nti(buf[329:337])
-        obj.devminor = nti(buf[337:345])
-        prefix = nts(buf[345:500], encoding, errors)
-
-        # Old V7 tar format represents a directory as a regular
-        # file with a trailing slash.
-        if obj.type == AREGTYPE and obj.name.endswith("/"):
-            obj.type = DIRTYPE
-
-        # The old GNU sparse format occupies some of the unused
-        # space in the buffer for up to 4 sparse structures.
-        # Save them for later processing in _proc_sparse().
-        if obj.type == GNUTYPE_SPARSE:
-            pos = 386
-            structs = []
-            for i in range(4):
-                try:
-                    offset = nti(buf[pos:pos + 12])
-                    numbytes = nti(buf[pos + 12:pos + 24])
-                except ValueError:
-                    break
-                structs.append((offset, numbytes))
-                pos += 24
-            isextended = bool(buf[482])
-            origsize = nti(buf[483:495])
-            obj._sparse_structs = (structs, isextended, origsize)
-
-        # Remove redundant slashes from directories.
-        if obj.isdir():
-            obj.name = obj.name.rstrip("/")
-
-        # Reconstruct a ustar longname.
-        if prefix and obj.type not in GNU_TYPES:
-            obj.name = prefix + "/" + obj.name
-        return obj
-
-    @classmethod
-    def fromtarfile(cls, tarfile):
-        """Return the next TarInfo object from TarFile object
-           tarfile.
-        """
-        buf = tarfile.fileobj.read(BLOCKSIZE)
-        obj = cls.frombuf(buf, tarfile.encoding, tarfile.errors)
-        obj.offset = tarfile.fileobj.tell() - BLOCKSIZE
-        return obj._proc_member(tarfile)
-
-    #--------------------------------------------------------------------------
-    # The following are methods that are called depending on the type of a
-    # member. The entry point is _proc_member() which can be overridden in a
-    # subclass to add custom _proc_*() methods. A _proc_*() method MUST
-    # implement the following
-    # operations:
-    # 1. Set self.offset_data to the position where the data blocks begin,
-    #    if there is data that follows.
-    # 2. Set tarfile.offset to the position where the next member's header will
-    #    begin.
-    # 3. Return self or another valid TarInfo object.
-    def _proc_member(self, tarfile):
-        """Choose the right processing method depending on
-           the type and call it.
-        """
-        if self.type in (GNUTYPE_LONGNAME, GNUTYPE_LONGLINK):
-            return self._proc_gnulong(tarfile)
-        elif self.type == GNUTYPE_SPARSE:
-            return self._proc_sparse(tarfile)
-        elif self.type in (XHDTYPE, XGLTYPE, SOLARIS_XHDTYPE):
-            return self._proc_pax(tarfile)
-        else:
-            return self._proc_builtin(tarfile)
-
-    def _proc_builtin(self, tarfile):
-        """Process a builtin type or an unknown type which
-           will be treated as a regular file.
-        """
-        self.offset_data = tarfile.fileobj.tell()
-        offset = self.offset_data
-        if self.isreg() or self.type not in SUPPORTED_TYPES:
-            # Skip the following data blocks.
-            offset += self._block(self.size)
-        tarfile.offset = offset
-
-        # Patch the TarInfo object with saved global
-        # header information.
-        self._apply_pax_info(tarfile.pax_headers, tarfile.encoding, tarfile.errors)
-
-        # Remove redundant slashes from directories. This is to be consistent
-        # with frombuf().
-        if self.isdir():
-            self.name = self.name.rstrip("/")
-
-        return self
-
-    def _proc_gnulong(self, tarfile):
-        """Process the blocks that hold a GNU longname
-           or longlink member.
-        """
-        buf = tarfile.fileobj.read(self._block(self.size))
-
-        # Fetch the next header and process it.
-        try:
-            next = self.fromtarfile(tarfile)
-        except HeaderError as e:
-            raise SubsequentHeaderError(str(e)) from None
-
-        # Patch the TarInfo object from the next header with
-        # the longname information.
-        next.offset = self.offset
-        if self.type == GNUTYPE_LONGNAME:
-            next.name = nts(buf, tarfile.encoding, tarfile.errors)
-        elif self.type == GNUTYPE_LONGLINK:
-            next.linkname = nts(buf, tarfile.encoding, tarfile.errors)
-
-        # Remove redundant slashes from directories. This is to be consistent
-        # with frombuf().
-        if next.isdir():
-            next.name = removesuffix(next.name, "/")
-
-        return next
-
-    def _proc_sparse(self, tarfile):
-        """Process a GNU sparse header plus extra headers.
-        """
-        # We already collected some sparse structures in frombuf().
-        structs, isextended, origsize = self._sparse_structs
-        del self._sparse_structs
-
-        # Collect sparse structures from extended header blocks.
-        while isextended:
-            buf = tarfile.fileobj.read(BLOCKSIZE)
-            pos = 0
-            for i in range(21):
-                try:
-                    offset = nti(buf[pos:pos + 12])
-                    numbytes = nti(buf[pos + 12:pos + 24])
-                except ValueError:
-                    break
-                if offset and numbytes:
-                    structs.append((offset, numbytes))
-                pos += 24
-            isextended = bool(buf[504])
-        self.sparse = structs
-
-        self.offset_data = tarfile.fileobj.tell()
-        tarfile.offset = self.offset_data + self._block(self.size)
-        self.size = origsize
-        return self
-
-    def _proc_pax(self, tarfile):
-        """Process an extended or global header as described in
-           POSIX.1-2008.
-        """
-        # Read the header information.
-        buf = tarfile.fileobj.read(self._block(self.size))
-
-        # A pax header stores supplemental information for either
-        # the following file (extended) or all following files
-        # (global).
-        if self.type == XGLTYPE:
-            pax_headers = tarfile.pax_headers
-        else:
-            pax_headers = tarfile.pax_headers.copy()
-
-        # Check if the pax header contains a hdrcharset field. This tells us
-        # the encoding of the path, linkpath, uname and gname fields. Normally,
-        # these fields are UTF-8 encoded but since POSIX.1-2008 tar
-        # implementations are allowed to store them as raw binary strings if
-        # the translation to UTF-8 fails.
-        match = re.search(br"\d+ hdrcharset=([^\n]+)\n", buf)
-        if match is not None:
-            pax_headers["hdrcharset"] = match.group(1).decode("utf-8")
-
-        # For the time being, we don't care about anything other than "BINARY".
-        # The only other value that is currently allowed by the standard is
-        # "ISO-IR 10646 2000 UTF-8" in other words UTF-8.
-        hdrcharset = pax_headers.get("hdrcharset")
-        if hdrcharset == "BINARY":
-            encoding = tarfile.encoding
-        else:
-            encoding = "utf-8"
-
-        # Parse pax header information. A record looks like that:
-        # "%d %s=%s\n" % (length, keyword, value). length is the size
-        # of the complete record including the length field itself and
-        # the newline. keyword and value are both UTF-8 encoded strings.
-        regex = re.compile(br"(\d+) ([^=]+)=")
-        pos = 0
-        while match := regex.match(buf, pos):
-            length, keyword = match.groups()
-            length = int(length)
-            if length == 0:
-                raise InvalidHeaderError("invalid header")
-            value = buf[match.end(2) + 1:match.start(1) + length - 1]
-
-            # Normally, we could just use "utf-8" as the encoding and "strict"
-            # as the error handler, but we better not take the risk. For
-            # example, GNU tar <= 1.23 is known to store filenames it cannot
-            # translate to UTF-8 as raw strings (unfortunately without a
-            # hdrcharset=BINARY header).
-            # We first try the strict standard encoding, and if that fails we
-            # fall back on the user's encoding and error handler.
-            keyword = self._decode_pax_field(keyword, "utf-8", "utf-8",
-                    tarfile.errors)
-            if keyword in PAX_NAME_FIELDS:
-                value = self._decode_pax_field(value, encoding, tarfile.encoding,
-                        tarfile.errors)
-            else:
-                value = self._decode_pax_field(value, "utf-8", "utf-8",
-                        tarfile.errors)
-
-            pax_headers[keyword] = value
-            pos += length
-
-        # Fetch the next header.
-        try:
-            next = self.fromtarfile(tarfile)
-        except HeaderError as e:
-            raise SubsequentHeaderError(str(e)) from None
-
-        # Process GNU sparse information.
-        if "GNU.sparse.map" in pax_headers:
-            # GNU extended sparse format version 0.1.
-            self._proc_gnusparse_01(next, pax_headers)
-
-        elif "GNU.sparse.size" in pax_headers:
-            # GNU extended sparse format version 0.0.
-            self._proc_gnusparse_00(next, pax_headers, buf)
-
-        elif pax_headers.get("GNU.sparse.major") == "1" and pax_headers.get("GNU.sparse.minor") == "0":
-            # GNU extended sparse format version 1.0.
-            self._proc_gnusparse_10(next, pax_headers, tarfile)
-
-        if self.type in (XHDTYPE, SOLARIS_XHDTYPE):
-            # Patch the TarInfo object with the extended header info.
-            next._apply_pax_info(pax_headers, tarfile.encoding, tarfile.errors)
-            next.offset = self.offset
-
-            if "size" in pax_headers:
-                # If the extended header replaces the size field,
-                # we need to recalculate the offset where the next
-                # header starts.
-                offset = next.offset_data
-                if next.isreg() or next.type not in SUPPORTED_TYPES:
-                    offset += next._block(next.size)
-                tarfile.offset = offset
-
-        return next
-
-    def _proc_gnusparse_00(self, next, pax_headers, buf):
-        """Process a GNU tar extended sparse header, version 0.0.
-        """
-        offsets = []
-        for match in re.finditer(br"\d+ GNU.sparse.offset=(\d+)\n", buf):
-            offsets.append(int(match.group(1)))
-        numbytes = []
-        for match in re.finditer(br"\d+ GNU.sparse.numbytes=(\d+)\n", buf):
-            numbytes.append(int(match.group(1)))
-        next.sparse = list(zip(offsets, numbytes))
-
-    def _proc_gnusparse_01(self, next, pax_headers):
-        """Process a GNU tar extended sparse header, version 0.1.
-        """
-        sparse = [int(x) for x in pax_headers["GNU.sparse.map"].split(",")]
-        next.sparse = list(zip(sparse[::2], sparse[1::2]))
-
-    def _proc_gnusparse_10(self, next, pax_headers, tarfile):
-        """Process a GNU tar extended sparse header, version 1.0.
-        """
-        fields = None
-        sparse = []
-        buf = tarfile.fileobj.read(BLOCKSIZE)
-        fields, buf = buf.split(b"\n", 1)
-        fields = int(fields)
-        while len(sparse) < fields * 2:
-            if b"\n" not in buf:
-                buf += tarfile.fileobj.read(BLOCKSIZE)
-            number, buf = buf.split(b"\n", 1)
-            sparse.append(int(number))
-        next.offset_data = tarfile.fileobj.tell()
-        next.sparse = list(zip(sparse[::2], sparse[1::2]))
-
-    def _apply_pax_info(self, pax_headers, encoding, errors):
-        """Replace fields with supplemental information from a previous
-           pax extended or global header.
-        """
-        for keyword, value in pax_headers.items():
-            if keyword == "GNU.sparse.name":
-                setattr(self, "path", value)
-            elif keyword == "GNU.sparse.size":
-                setattr(self, "size", int(value))
-            elif keyword == "GNU.sparse.realsize":
-                setattr(self, "size", int(value))
-            elif keyword in PAX_FIELDS:
-                if keyword in PAX_NUMBER_FIELDS:
-                    try:
-                        value = PAX_NUMBER_FIELDS[keyword](value)
-                    except ValueError:
-                        value = 0
-                if keyword == "path":
-                    value = value.rstrip("/")
-                setattr(self, keyword, value)
-
-        self.pax_headers = pax_headers.copy()
-
-    def _decode_pax_field(self, value, encoding, fallback_encoding, fallback_errors):
-        """Decode a single field from a pax record.
-        """
-        try:
-            return value.decode(encoding, "strict")
-        except UnicodeDecodeError:
-            return value.decode(fallback_encoding, fallback_errors)
-
-    def _block(self, count):
-        """Round up a byte count by BLOCKSIZE and return it,
-           e.g. _block(834) => 1024.
-        """
-        blocks, remainder = divmod(count, BLOCKSIZE)
-        if remainder:
-            blocks += 1
-        return blocks * BLOCKSIZE
-
-    def isreg(self):
-        'Return True if the Tarinfo object is a regular file.'
-        return self.type in REGULAR_TYPES
-
-    def isfile(self):
-        'Return True if the Tarinfo object is a regular file.'
-        return self.isreg()
-
-    def isdir(self):
-        'Return True if it is a directory.'
-        return self.type == DIRTYPE
-
-    def issym(self):
-        'Return True if it is a symbolic link.'
-        return self.type == SYMTYPE
-
-    def islnk(self):
-        'Return True if it is a hard link.'
-        return self.type == LNKTYPE
-
-    def ischr(self):
-        'Return True if it is a character device.'
-        return self.type == CHRTYPE
-
-    def isblk(self):
-        'Return True if it is a block device.'
-        return self.type == BLKTYPE
-
-    def isfifo(self):
-        'Return True if it is a FIFO.'
-        return self.type == FIFOTYPE
-
-    def issparse(self):
-        return self.sparse is not None
-
-    def isdev(self):
-        'Return True if it is one of character device, block device or FIFO.'
-        return self.type in (CHRTYPE, BLKTYPE, FIFOTYPE)
-# class TarInfo
-
-class TarFile(object):
-    """The TarFile Class provides an interface to tar archives.
-    """
-
-    debug = 0                   # May be set from 0 (no msgs) to 3 (all msgs)
-
-    dereference = False         # If true, add content of linked file to the
-                                # tar file, else the link.
-
-    ignore_zeros = False        # If true, skips empty or invalid blocks and
-                                # continues processing.
-
-    errorlevel = 1              # If 0, fatal errors only appear in debug
-                                # messages (if debug >= 0). If > 0, errors
-                                # are passed to the caller as exceptions.
-
-    format = DEFAULT_FORMAT     # The format to use when creating an archive.
-
-    encoding = ENCODING         # Encoding for 8-bit character strings.
-
-    errors = None               # Error handler for unicode conversion.
-
-    tarinfo = TarInfo           # The default TarInfo class to use.
-
-    fileobject = ExFileObject   # The file-object for extractfile().
-
-    extraction_filter = None    # The default filter for extraction.
-
-    def __init__(self, name=None, mode="r", fileobj=None, format=None,
-            tarinfo=None, dereference=None, ignore_zeros=None, encoding=None,
-            errors="surrogateescape", pax_headers=None, debug=None,
-            errorlevel=None, copybufsize=None, stream=False):
-        """Open an (uncompressed) tar archive 'name'. 'mode' is either 'r' to
-           read from an existing archive, 'a' to append data to an existing
-           file or 'w' to create a new file overwriting an existing one. 'mode'
-           defaults to 'r'.
-           If 'fileobj' is given, it is used for reading or writing data. If it
-           can be determined, 'mode' is overridden by 'fileobj's mode.
-           'fileobj' is not closed, when TarFile is closed.
-        """
-        modes = {"r": "rb", "a": "r+b", "w": "wb", "x": "xb"}
-        if mode not in modes:
-            raise ValueError("mode must be 'r', 'a', 'w' or 'x'")
-        self.mode = mode
-        self._mode = modes[mode]
-
-        if not fileobj:
-            if self.mode == "a" and not os.path.exists(name):
-                # Create nonexistent files in append mode.
-                self.mode = "w"
-                self._mode = "wb"
-            fileobj = bltn_open(name, self._mode)
-            self._extfileobj = False
-        else:
-            if (name is None and hasattr(fileobj, "name") and
-                isinstance(fileobj.name, (str, bytes))):
-                name = fileobj.name
-            if hasattr(fileobj, "mode"):
-                self._mode = fileobj.mode
-            self._extfileobj = True
-        self.name = os.path.abspath(name) if name else None
-        self.fileobj = fileobj
-
-        self.stream = stream
-
-        # Init attributes.
-        if format is not None:
-            self.format = format
-        if tarinfo is not None:
-            self.tarinfo = tarinfo
-        if dereference is not None:
-            self.dereference = dereference
-        if ignore_zeros is not None:
-            self.ignore_zeros = ignore_zeros
-        if encoding is not None:
-            self.encoding = encoding
-        self.errors = errors
-
-        if pax_headers is not None and self.format == PAX_FORMAT:
-            self.pax_headers = pax_headers
-        else:
-            self.pax_headers = {}
-
-        if debug is not None:
-            self.debug = debug
-        if errorlevel is not None:
-            self.errorlevel = errorlevel
-
-        # Init datastructures.
-        self.copybufsize = copybufsize
-        self.closed = False
-        self.members = []       # list of members as TarInfo objects
-        self._loaded = False    # flag if all members have been read
-        self.offset = self.fileobj.tell()
-                                # current position in the archive file
-        self.inodes = {}        # dictionary caching the inodes of
-                                # archive members already added
-
-        try:
-            if self.mode == "r":
-                self.firstmember = None
-                self.firstmember = self.next()
-
-            if self.mode == "a":
-                # Move to the end of the archive,
-                # before the first empty block.
-                while True:
-                    self.fileobj.seek(self.offset)
-                    try:
-                        tarinfo = self.tarinfo.fromtarfile(self)
-                        self.members.append(tarinfo)
-                    except EOFHeaderError:
-                        self.fileobj.seek(self.offset)
-                        break
-                    except HeaderError as e:
-                        raise ReadError(str(e)) from None
-
-            if self.mode in ("a", "w", "x"):
-                self._loaded = True
-
-                if self.pax_headers:
-                    buf = self.tarinfo.create_pax_global_header(self.pax_headers.copy())
-                    self.fileobj.write(buf)
-                    self.offset += len(buf)
-        except:
-            if not self._extfileobj:
-                self.fileobj.close()
-            self.closed = True
-            raise
-
-    #--------------------------------------------------------------------------
-    # Below are the classmethods which act as alternate constructors to the
-    # TarFile class. The open() method is the only one that is needed for
-    # public use; it is the "super"-constructor and is able to select an
-    # adequate "sub"-constructor for a particular compression using the mapping
-    # from OPEN_METH.
-    #
-    # This concept allows one to subclass TarFile without losing the comfort of
-    # the super-constructor. A sub-constructor is registered and made available
-    # by adding it to the mapping in OPEN_METH.
-
-    @classmethod
-    def open(cls, name=None, mode="r", fileobj=None, bufsize=RECORDSIZE, **kwargs):
-        r"""Open a tar archive for reading, writing or appending. Return
-           an appropriate TarFile class.
-
-           mode:
-           'r' or 'r:\*' open for reading with transparent compression
-           'r:'         open for reading exclusively uncompressed
-           'r:gz'       open for reading with gzip compression
-           'r:bz2'      open for reading with bzip2 compression
-           'r:xz'       open for reading with lzma compression
-           'a' or 'a:'  open for appending, creating the file if necessary
-           'w' or 'w:'  open for writing without compression
-           'w:gz'       open for writing with gzip compression
-           'w:bz2'      open for writing with bzip2 compression
-           'w:xz'       open for writing with lzma compression
-
-           'x' or 'x:'  create a tarfile exclusively without compression, raise
-                        an exception if the file is already created
-           'x:gz'       create a gzip compressed tarfile, raise an exception
-                        if the file is already created
-           'x:bz2'      create a bzip2 compressed tarfile, raise an exception
-                        if the file is already created
-           'x:xz'       create an lzma compressed tarfile, raise an exception
-                        if the file is already created
-
-           'r|\*'        open a stream of tar blocks with transparent compression
-           'r|'         open an uncompressed stream of tar blocks for reading
-           'r|gz'       open a gzip compressed stream of tar blocks
-           'r|bz2'      open a bzip2 compressed stream of tar blocks
-           'r|xz'       open an lzma compressed stream of tar blocks
-           'w|'         open an uncompressed stream for writing
-           'w|gz'       open a gzip compressed stream for writing
-           'w|bz2'      open a bzip2 compressed stream for writing
-           'w|xz'       open an lzma compressed stream for writing
-        """
-
-        if not name and not fileobj:
-            raise ValueError("nothing to open")
-
-        if mode in ("r", "r:*"):
-            # Find out which *open() is appropriate for opening the file.
-            def not_compressed(comptype):
-                return cls.OPEN_METH[comptype] == 'taropen'
-            error_msgs = []
-            for comptype in sorted(cls.OPEN_METH, key=not_compressed):
-                func = getattr(cls, cls.OPEN_METH[comptype])
-                if fileobj is not None:
-                    saved_pos = fileobj.tell()
-                try:
-                    return func(name, "r", fileobj, **kwargs)
-                except (ReadError, CompressionError) as e:
-                    error_msgs.append(f'- method {comptype}: {e!r}')
-                    if fileobj is not None:
-                        fileobj.seek(saved_pos)
-                    continue
-            error_msgs_summary = '\n'.join(error_msgs)
-            raise ReadError(f"file could not be opened successfully:\n{error_msgs_summary}")
-
-        elif ":" in mode:
-            filemode, comptype = mode.split(":", 1)
-            filemode = filemode or "r"
-            comptype = comptype or "tar"
-
-            # Select the *open() function according to
-            # given compression.
-            if comptype in cls.OPEN_METH:
-                func = getattr(cls, cls.OPEN_METH[comptype])
-            else:
-                raise CompressionError("unknown compression type %r" % comptype)
-            return func(name, filemode, fileobj, **kwargs)
-
-        elif "|" in mode:
-            filemode, comptype = mode.split("|", 1)
-            filemode = filemode or "r"
-            comptype = comptype or "tar"
-
-            if filemode not in ("r", "w"):
-                raise ValueError("mode must be 'r' or 'w'")
-
-            compresslevel = kwargs.pop("compresslevel", 9)
-            stream = _Stream(name, filemode, comptype, fileobj, bufsize,
-                             compresslevel)
-            try:
-                t = cls(name, filemode, stream, **kwargs)
-            except:
-                stream.close()
-                raise
-            t._extfileobj = False
-            return t
-
-        elif mode in ("a", "w", "x"):
-            return cls.taropen(name, mode, fileobj, **kwargs)
-
-        raise ValueError("undiscernible mode")
-
-    @classmethod
-    def taropen(cls, name, mode="r", fileobj=None, **kwargs):
-        """Open uncompressed tar archive name for reading or writing.
-        """
-        if mode not in ("r", "a", "w", "x"):
-            raise ValueError("mode must be 'r', 'a', 'w' or 'x'")
-        return cls(name, mode, fileobj, **kwargs)
-
-    @classmethod
-    def gzopen(cls, name, mode="r", fileobj=None, compresslevel=9, **kwargs):
-        """Open gzip compressed tar archive name for reading or writing.
-           Appending is not allowed.
-        """
-        if mode not in ("r", "w", "x"):
-            raise ValueError("mode must be 'r', 'w' or 'x'")
-
-        try:
-            from gzip import GzipFile
-        except ImportError:
-            raise CompressionError("gzip module is not available") from None
-
-        try:
-            fileobj = GzipFile(name, mode + "b", compresslevel, fileobj)
-        except OSError as e:
-            if fileobj is not None and mode == 'r':
-                raise ReadError("not a gzip file") from e
-            raise
-
-        try:
-            t = cls.taropen(name, mode, fileobj, **kwargs)
-        except OSError as e:
-            fileobj.close()
-            if mode == 'r':
-                raise ReadError("not a gzip file") from e
-            raise
-        except:
-            fileobj.close()
-            raise
-        t._extfileobj = False
-        return t
-
-    @classmethod
-    def bz2open(cls, name, mode="r", fileobj=None, compresslevel=9, **kwargs):
-        """Open bzip2 compressed tar archive name for reading or writing.
-           Appending is not allowed.
-        """
-        if mode not in ("r", "w", "x"):
-            raise ValueError("mode must be 'r', 'w' or 'x'")
-
-        try:
-            from bz2 import BZ2File
-        except ImportError:
-            raise CompressionError("bz2 module is not available") from None
-
-        fileobj = BZ2File(fileobj or name, mode, compresslevel=compresslevel)
-
-        try:
-            t = cls.taropen(name, mode, fileobj, **kwargs)
-        except (OSError, EOFError) as e:
-            fileobj.close()
-            if mode == 'r':
-                raise ReadError("not a bzip2 file") from e
-            raise
-        except:
-            fileobj.close()
-            raise
-        t._extfileobj = False
-        return t
-
-    @classmethod
-    def xzopen(cls, name, mode="r", fileobj=None, preset=None, **kwargs):
-        """Open lzma compressed tar archive name for reading or writing.
-           Appending is not allowed.
-        """
-        if mode not in ("r", "w", "x"):
-            raise ValueError("mode must be 'r', 'w' or 'x'")
-
-        try:
-            from lzma import LZMAFile, LZMAError
-        except ImportError:
-            raise CompressionError("lzma module is not available") from None
-
-        fileobj = LZMAFile(fileobj or name, mode, preset=preset)
-
-        try:
-            t = cls.taropen(name, mode, fileobj, **kwargs)
-        except (LZMAError, EOFError) as e:
-            fileobj.close()
-            if mode == 'r':
-                raise ReadError("not an lzma file") from e
-            raise
-        except:
-            fileobj.close()
-            raise
-        t._extfileobj = False
-        return t
-
-    # All *open() methods are registered here.
-    OPEN_METH = {
-        "tar": "taropen",   # uncompressed tar
-        "gz":  "gzopen",    # gzip compressed tar
-        "bz2": "bz2open",   # bzip2 compressed tar
-        "xz":  "xzopen"     # lzma compressed tar
-    }
-
-    #--------------------------------------------------------------------------
-    # The public methods which TarFile provides:
-
-    def close(self):
-        """Close the TarFile. In write-mode, two finishing zero blocks are
-           appended to the archive.
-        """
-        if self.closed:
-            return
-
-        self.closed = True
-        try:
-            if self.mode in ("a", "w", "x"):
-                self.fileobj.write(NUL * (BLOCKSIZE * 2))
-                self.offset += (BLOCKSIZE * 2)
-                # fill up the end with zero-blocks
-                # (like option -b20 for tar does)
-                blocks, remainder = divmod(self.offset, RECORDSIZE)
-                if remainder > 0:
-                    self.fileobj.write(NUL * (RECORDSIZE - remainder))
-        finally:
-            if not self._extfileobj:
-                self.fileobj.close()
-
-    def getmember(self, name):
-        """Return a TarInfo object for member 'name'. If 'name' can not be
-           found in the archive, KeyError is raised. If a member occurs more
-           than once in the archive, its last occurrence is assumed to be the
-           most up-to-date version.
-        """
-        tarinfo = self._getmember(name.rstrip('/'))
-        if tarinfo is None:
-            raise KeyError("filename %r not found" % name)
-        return tarinfo
-
-    def getmembers(self):
-        """Return the members of the archive as a list of TarInfo objects. The
-           list has the same order as the members in the archive.
-        """
-        self._check()
-        if not self._loaded:    # if we want to obtain a list of
-            self._load()        # all members, we first have to
-                                # scan the whole archive.
-        return self.members
-
-    def getnames(self):
-        """Return the members of the archive as a list of their names. It has
-           the same order as the list returned by getmembers().
-        """
-        return [tarinfo.name for tarinfo in self.getmembers()]
-
-    def gettarinfo(self, name=None, arcname=None, fileobj=None):
-        """Create a TarInfo object from the result of os.stat or equivalent
-           on an existing file. The file is either named by 'name', or
-           specified as a file object 'fileobj' with a file descriptor. If
-           given, 'arcname' specifies an alternative name for the file in the
-           archive, otherwise, the name is taken from the 'name' attribute of
-           'fileobj', or the 'name' argument. The name should be a text
-           string.
-        """
-        self._check("awx")
-
-        # When fileobj is given, replace name by
-        # fileobj's real name.
-        if fileobj is not None:
-            name = fileobj.name
-
-        # Building the name of the member in the archive.
-        # Backward slashes are converted to forward slashes,
-        # Absolute paths are turned to relative paths.
-        if arcname is None:
-            arcname = name
-        drv, arcname = os.path.splitdrive(arcname)
-        arcname = arcname.replace(os.sep, "/")
-        arcname = arcname.lstrip("/")
-
-        # Now, fill the TarInfo object with
-        # information specific for the file.
-        tarinfo = self.tarinfo()
-        tarinfo._tarfile = self  # To be removed in 3.16.
-
-        # Use os.stat or os.lstat, depending on if symlinks shall be resolved.
-        if fileobj is None:
-            if not self.dereference:
-                statres = os.lstat(name)
-            else:
-                statres = os.stat(name)
-        else:
-            statres = os.fstat(fileobj.fileno())
-        linkname = ""
-
-        stmd = statres.st_mode
-        if stat.S_ISREG(stmd):
-            inode = (statres.st_ino, statres.st_dev)
-            if not self.dereference and statres.st_nlink > 1 and \
-                    inode in self.inodes and arcname != self.inodes[inode]:
-                # Is it a hardlink to an already
-                # archived file?
-                type = LNKTYPE
-                linkname = self.inodes[inode]
-            else:
-                # The inode is added only if its valid.
-                # For win32 it is always 0.
-                type = REGTYPE
-                if inode[0]:
-                    self.inodes[inode] = arcname
-        elif stat.S_ISDIR(stmd):
-            type = DIRTYPE
-        elif stat.S_ISFIFO(stmd):
-            type = FIFOTYPE
-        elif stat.S_ISLNK(stmd):
-            type = SYMTYPE
-            linkname = os.readlink(name)
-        elif stat.S_ISCHR(stmd):
-            type = CHRTYPE
-        elif stat.S_ISBLK(stmd):
-            type = BLKTYPE
-        else:
-            return None
-
-        # Fill the TarInfo object with all
-        # information we can get.
-        tarinfo.name = arcname
-        tarinfo.mode = stmd
-        tarinfo.uid = statres.st_uid
-        tarinfo.gid = statres.st_gid
-        if type == REGTYPE:
-            tarinfo.size = statres.st_size
-        else:
-            tarinfo.size = 0
-        tarinfo.mtime = statres.st_mtime
-        tarinfo.type = type
-        tarinfo.linkname = linkname
-        if pwd:
-            try:
-                tarinfo.uname = pwd.getpwuid(tarinfo.uid)[0]
-            except KeyError:
-                pass
-        if grp:
-            try:
-                tarinfo.gname = grp.getgrgid(tarinfo.gid)[0]
-            except KeyError:
-                pass
-
-        if type in (CHRTYPE, BLKTYPE):
-            if hasattr(os, "major") and hasattr(os, "minor"):
-                tarinfo.devmajor = os.major(statres.st_rdev)
-                tarinfo.devminor = os.minor(statres.st_rdev)
-        return tarinfo
-
-    def list(self, verbose=True, *, members=None):
-        """Print a table of contents to sys.stdout. If 'verbose' is False, only
-           the names of the members are printed. If it is True, an 'ls -l'-like
-           output is produced. 'members' is optional and must be a subset of the
-           list returned by getmembers().
-        """
-        # Convert tarinfo type to stat type.
-        type2mode = {REGTYPE: stat.S_IFREG, SYMTYPE: stat.S_IFLNK,
-                     FIFOTYPE: stat.S_IFIFO, CHRTYPE: stat.S_IFCHR,
-                     DIRTYPE: stat.S_IFDIR, BLKTYPE: stat.S_IFBLK}
-        self._check()
-
-        if members is None:
-            members = self
-        for tarinfo in members:
-            if verbose:
-                if tarinfo.mode is None:
-                    _safe_print("??????????")
-                else:
-                    modetype = type2mode.get(tarinfo.type, 0)
-                    _safe_print(stat.filemode(modetype | tarinfo.mode))
-                _safe_print("%s/%s" % (tarinfo.uname or tarinfo.uid,
-                                       tarinfo.gname or tarinfo.gid))
-                if tarinfo.ischr() or tarinfo.isblk():
-                    _safe_print("%10s" %
-                            ("%d,%d" % (tarinfo.devmajor, tarinfo.devminor)))
-                else:
-                    _safe_print("%10d" % tarinfo.size)
-                if tarinfo.mtime is None:
-                    _safe_print("????-??-?? ??:??:??")
-                else:
-                    _safe_print("%d-%02d-%02d %02d:%02d:%02d" \
-                                % time.localtime(tarinfo.mtime)[:6])
-
-            _safe_print(tarinfo.name + ("/" if tarinfo.isdir() else ""))
-
-            if verbose:
-                if tarinfo.issym():
-                    _safe_print("-> " + tarinfo.linkname)
-                if tarinfo.islnk():
-                    _safe_print("link to " + tarinfo.linkname)
-            print()
-
-    def add(self, name, arcname=None, recursive=True, *, filter=None):
-        """Add the file 'name' to the archive. 'name' may be any type of file
-           (directory, fifo, symbolic link, etc.). If given, 'arcname'
-           specifies an alternative name for the file in the archive.
-           Directories are added recursively by default. This can be avoided by
-           setting 'recursive' to False. 'filter' is a function
-           that expects a TarInfo object argument and returns the changed
-           TarInfo object, if it returns None the TarInfo object will be
-           excluded from the archive.
-        """
-        self._check("awx")
-
-        if arcname is None:
-            arcname = name
-
-        # Skip if somebody tries to archive the archive...
-        if self.name is not None and os.path.abspath(name) == self.name:
-            self._dbg(2, "tarfile: Skipped %r" % name)
-            return
-
-        self._dbg(1, name)
-
-        # Create a TarInfo object from the file.
-        tarinfo = self.gettarinfo(name, arcname)
-
-        if tarinfo is None:
-            self._dbg(1, "tarfile: Unsupported type %r" % name)
-            return
-
-        # Change or exclude the TarInfo object.
-        if filter is not None:
-            tarinfo = filter(tarinfo)
-            if tarinfo is None:
-                self._dbg(2, "tarfile: Excluded %r" % name)
-                return
-
-        # Append the tar header and data to the archive.
-        if tarinfo.isreg():
-            with bltn_open(name, "rb") as f:
-                self.addfile(tarinfo, f)
-
-        elif tarinfo.isdir():
-            self.addfile(tarinfo)
-            if recursive:
-                for f in sorted(os.listdir(name)):
-                    self.add(os.path.join(name, f), os.path.join(arcname, f),
-                            recursive, filter=filter)
-
-        else:
-            self.addfile(tarinfo)
-
-    def addfile(self, tarinfo, fileobj=None):
-        """Add the TarInfo object 'tarinfo' to the archive. If 'tarinfo' represents
-           a non zero-size regular file, the 'fileobj' argument should be a binary file,
-           and tarinfo.size bytes are read from it and added to the archive.
-           You can create TarInfo objects directly, or by using gettarinfo().
-        """
-        self._check("awx")
-
-        if fileobj is None and tarinfo.isreg() and tarinfo.size != 0:
-            raise ValueError("fileobj not provided for non zero-size regular file")
-
-        tarinfo = copy.copy(tarinfo)
-
-        buf = tarinfo.tobuf(self.format, self.encoding, self.errors)
-        self.fileobj.write(buf)
-        self.offset += len(buf)
-        bufsize=self.copybufsize
-        # If there's data to follow, append it.
-        if fileobj is not None:
-            copyfileobj(fileobj, self.fileobj, tarinfo.size, bufsize=bufsize)
-            blocks, remainder = divmod(tarinfo.size, BLOCKSIZE)
-            if remainder > 0:
-                self.fileobj.write(NUL * (BLOCKSIZE - remainder))
-                blocks += 1
-            self.offset += blocks * BLOCKSIZE
-
-        self.members.append(tarinfo)
-
-    def _get_filter_function(self, filter):
-        if filter is None:
-            filter = self.extraction_filter
-            if filter is None:
-                import warnings
-                warnings.warn(
-                    'Python 3.14 will, by default, filter extracted tar '
-                    + 'archives and reject files or modify their metadata. '
-                    + 'Use the filter argument to control this behavior.',
-                    DeprecationWarning, stacklevel=3)
-                return fully_trusted_filter
-            if isinstance(filter, str):
-                raise TypeError(
-                    'String names are not supported for '
-                    + 'TarFile.extraction_filter. Use a function such as '
-                    + 'tarfile.data_filter directly.')
-            return filter
-        if callable(filter):
-            return filter
-        try:
-            return _NAMED_FILTERS[filter]
-        except KeyError:
-            raise ValueError(f"filter {filter!r} not found") from None
-
-    def extractall(self, path=".", members=None, *, numeric_owner=False,
-                   filter=None):
-        """Extract all members from the archive to the current working
-           directory and set owner, modification time and permissions on
-           directories afterwards. 'path' specifies a different directory
-           to extract to. 'members' is optional and must be a subset of the
-           list returned by getmembers(). If 'numeric_owner' is True, only
-           the numbers for user/group names are used and not the names.
-
-           The 'filter' function will be called on each member just
-           before extraction.
-           It can return a changed TarInfo or None to skip the member.
-           String names of common filters are accepted.
-        """
-        directories = []
-
-        filter_function = self._get_filter_function(filter)
-        if members is None:
-            members = self
-
-        for member in members:
-            tarinfo = self._get_extract_tarinfo(member, filter_function, path)
-            if tarinfo is None:
-                continue
-            if tarinfo.isdir():
-                # For directories, delay setting attributes until later,
-                # since permissions can interfere with extraction and
-                # extracting contents can reset mtime.
-                directories.append(tarinfo)
-            self._extract_one(tarinfo, path, set_attrs=not tarinfo.isdir(),
-                              numeric_owner=numeric_owner)
-
-        # Reverse sort directories.
-        directories.sort(key=lambda a: a.name, reverse=True)
-
-        # Set correct owner, mtime and filemode on directories.
-        for tarinfo in directories:
-            dirpath = os.path.join(path, tarinfo.name)
-            try:
-                self.chown(tarinfo, dirpath, numeric_owner=numeric_owner)
-                self.utime(tarinfo, dirpath)
-                self.chmod(tarinfo, dirpath)
-            except ExtractError as e:
-                self._handle_nonfatal_error(e)
-
-    def extract(self, member, path="", set_attrs=True, *, numeric_owner=False,
-                filter=None):
-        """Extract a member from the archive to the current working directory,
-           using its full name. Its file information is extracted as accurately
-           as possible. 'member' may be a filename or a TarInfo object. You can
-           specify a different directory using 'path'. File attributes (owner,
-           mtime, mode) are set unless 'set_attrs' is False. If 'numeric_owner'
-           is True, only the numbers for user/group names are used and not
-           the names.
-
-           The 'filter' function will be called before extraction.
-           It can return a changed TarInfo or None to skip the member.
-           String names of common filters are accepted.
-        """
-        filter_function = self._get_filter_function(filter)
-        tarinfo = self._get_extract_tarinfo(member, filter_function, path)
-        if tarinfo is not None:
-            self._extract_one(tarinfo, path, set_attrs, numeric_owner)
-
-    def _get_extract_tarinfo(self, member, filter_function, path):
-        """Get filtered TarInfo (or None) from member, which might be a str"""
-        if isinstance(member, str):
-            tarinfo = self.getmember(member)
-        else:
-            tarinfo = member
-
-        unfiltered = tarinfo
-        try:
-            tarinfo = filter_function(tarinfo, path)
-        except (OSError, FilterError) as e:
-            self._handle_fatal_error(e)
-        except ExtractError as e:
-            self._handle_nonfatal_error(e)
-        if tarinfo is None:
-            self._dbg(2, "tarfile: Excluded %r" % unfiltered.name)
-            return None
-        # Prepare the link target for makelink().
-        if tarinfo.islnk():
-            tarinfo = copy.copy(tarinfo)
-            tarinfo._link_target = os.path.join(path, tarinfo.linkname)
-        return tarinfo
-
-    def _extract_one(self, tarinfo, path, set_attrs, numeric_owner):
-        """Extract from filtered tarinfo to disk"""
-        self._check("r")
-
-        try:
-            self._extract_member(tarinfo, os.path.join(path, tarinfo.name),
-                                 set_attrs=set_attrs,
-                                 numeric_owner=numeric_owner)
-        except OSError as e:
-            self._handle_fatal_error(e)
-        except ExtractError as e:
-            self._handle_nonfatal_error(e)
-
-    def _handle_nonfatal_error(self, e):
-        """Handle non-fatal error (ExtractError) according to errorlevel"""
-        if self.errorlevel > 1:
-            raise
-        else:
-            self._dbg(1, "tarfile: %s" % e)
-
-    def _handle_fatal_error(self, e):
-        """Handle "fatal" error according to self.errorlevel"""
-        if self.errorlevel > 0:
-            raise
-        elif isinstance(e, OSError):
-            if e.filename is None:
-                self._dbg(1, "tarfile: %s" % e.strerror)
-            else:
-                self._dbg(1, "tarfile: %s %r" % (e.strerror, e.filename))
-        else:
-            self._dbg(1, "tarfile: %s %s" % (type(e).__name__, e))
-
-    def extractfile(self, member):
-        """Extract a member from the archive as a file object. 'member' may be
-           a filename or a TarInfo object. If 'member' is a regular file or
-           a link, an io.BufferedReader object is returned. For all other
-           existing members, None is returned. If 'member' does not appear
-           in the archive, KeyError is raised.
-        """
-        self._check("r")
-
-        if isinstance(member, str):
-            tarinfo = self.getmember(member)
-        else:
-            tarinfo = member
-
-        if tarinfo.isreg() or tarinfo.type not in SUPPORTED_TYPES:
-            # Members with unknown types are treated as regular files.
-            return self.fileobject(self, tarinfo)
-
-        elif tarinfo.islnk() or tarinfo.issym():
-            if isinstance(self.fileobj, _Stream):
-                # A small but ugly workaround for the case that someone tries
-                # to extract a (sym)link as a file-object from a non-seekable
-                # stream of tar blocks.
-                raise StreamError("cannot extract (sym)link as file object")
-            else:
-                # A (sym)link's file object is its target's file object.
-                return self.extractfile(self._find_link_target(tarinfo))
-        else:
-            # If there's no data associated with the member (directory, chrdev,
-            # blkdev, etc.), return None instead of a file object.
-            return None
-
-    def _extract_member(self, tarinfo, targetpath, set_attrs=True,
-                        numeric_owner=False):
-        """Extract the TarInfo object tarinfo to a physical
-           file called targetpath.
-        """
-        # Fetch the TarInfo object for the given name
-        # and build the destination pathname, replacing
-        # forward slashes to platform specific separators.
-        targetpath = targetpath.rstrip("/")
-        targetpath = targetpath.replace("/", os.sep)
-
-        # Create all upper directories.
-        upperdirs = os.path.dirname(targetpath)
-        if upperdirs and not os.path.exists(upperdirs):
-            # Create directories that are not part of the archive with
-            # default permissions.
-            os.makedirs(upperdirs, exist_ok=True)
-
-        if tarinfo.islnk() or tarinfo.issym():
-            self._dbg(1, "%s -> %s" % (tarinfo.name, tarinfo.linkname))
-        else:
-            self._dbg(1, tarinfo.name)
-
-        if tarinfo.isreg():
-            self.makefile(tarinfo, targetpath)
-        elif tarinfo.isdir():
-            self.makedir(tarinfo, targetpath)
-        elif tarinfo.isfifo():
-            self.makefifo(tarinfo, targetpath)
-        elif tarinfo.ischr() or tarinfo.isblk():
-            self.makedev(tarinfo, targetpath)
-        elif tarinfo.islnk() or tarinfo.issym():
-            self.makelink(tarinfo, targetpath)
-        elif tarinfo.type not in SUPPORTED_TYPES:
-            self.makeunknown(tarinfo, targetpath)
-        else:
-            self.makefile(tarinfo, targetpath)
-
-        if set_attrs:
-            self.chown(tarinfo, targetpath, numeric_owner)
-            if not tarinfo.issym():
-                self.chmod(tarinfo, targetpath)
-                self.utime(tarinfo, targetpath)
-
-    #--------------------------------------------------------------------------
-    # Below are the different file methods. They are called via
-    # _extract_member() when extract() is called. They can be replaced in a
-    # subclass to implement other functionality.
-
-    def makedir(self, tarinfo, targetpath):
-        """Make a directory called targetpath.
-        """
-        try:
-            if tarinfo.mode is None:
-                # Use the system's default mode
-                os.mkdir(targetpath)
-            else:
-                # Use a safe mode for the directory, the real mode is set
-                # later in _extract_member().
-                os.mkdir(targetpath, 0o700)
-        except FileExistsError:
-            if not os.path.isdir(targetpath):
-                raise
-
-    def makefile(self, tarinfo, targetpath):
-        """Make a file called targetpath.
-        """
-        source = self.fileobj
-        source.seek(tarinfo.offset_data)
-        bufsize = self.copybufsize
-        with bltn_open(targetpath, "wb") as target:
-            if tarinfo.sparse is not None:
-                for offset, size in tarinfo.sparse:
-                    target.seek(offset)
-                    copyfileobj(source, target, size, ReadError, bufsize)
-                target.seek(tarinfo.size)
-                target.truncate()
-            else:
-                copyfileobj(source, target, tarinfo.size, ReadError, bufsize)
-
-    def makeunknown(self, tarinfo, targetpath):
-        """Make a file from a TarInfo object with an unknown type
-           at targetpath.
-        """
-        self.makefile(tarinfo, targetpath)
-        self._dbg(1, "tarfile: Unknown file type %r, " \
-                     "extracted as regular file." % tarinfo.type)
-
-    def makefifo(self, tarinfo, targetpath):
-        """Make a fifo called targetpath.
-        """
-        if hasattr(os, "mkfifo"):
-            os.mkfifo(targetpath)
-        else:
-            raise ExtractError("fifo not supported by system")
-
-    def makedev(self, tarinfo, targetpath):
-        """Make a character or block device called targetpath.
-        """
-        if not hasattr(os, "mknod") or not hasattr(os, "makedev"):
-            raise ExtractError("special devices not supported by system")
-
-        mode = tarinfo.mode
-        if mode is None:
-            # Use mknod's default
-            mode = 0o600
-        if tarinfo.isblk():
-            mode |= stat.S_IFBLK
-        else:
-            mode |= stat.S_IFCHR
-
-        os.mknod(targetpath, mode,
-                 os.makedev(tarinfo.devmajor, tarinfo.devminor))
-
-    def makelink(self, tarinfo, targetpath):
-        """Make a (symbolic) link called targetpath. If it cannot be created
-          (platform limitation), we try to make a copy of the referenced file
-          instead of a link.
-        """
-        try:
-            # For systems that support symbolic and hard links.
-            if tarinfo.issym():
-                if os.path.lexists(targetpath):
-                    # Avoid FileExistsError on following os.symlink.
-                    os.unlink(targetpath)
-                os.symlink(tarinfo.linkname, targetpath)
-            else:
-                if os.path.exists(tarinfo._link_target):
-                    os.link(tarinfo._link_target, targetpath)
-                else:
-                    self._extract_member(self._find_link_target(tarinfo),
-                                         targetpath)
-        except symlink_exception:
-            try:
-                self._extract_member(self._find_link_target(tarinfo),
-                                     targetpath)
-            except KeyError:
-                raise ExtractError("unable to resolve link inside archive") from None
-
-    def chown(self, tarinfo, targetpath, numeric_owner):
-        """Set owner of targetpath according to tarinfo. If numeric_owner
-           is True, use .gid/.uid instead of .gname/.uname. If numeric_owner
-           is False, fall back to .gid/.uid when the search based on name
-           fails.
-        """
-        if hasattr(os, "geteuid") and os.geteuid() == 0:
-            # We have to be root to do so.
-            g = tarinfo.gid
-            u = tarinfo.uid
-            if not numeric_owner:
-                try:
-                    if grp and tarinfo.gname:
-                        g = grp.getgrnam(tarinfo.gname)[2]
-                except KeyError:
-                    pass
-                try:
-                    if pwd and tarinfo.uname:
-                        u = pwd.getpwnam(tarinfo.uname)[2]
-                except KeyError:
-                    pass
-            if g is None:
-                g = -1
-            if u is None:
-                u = -1
-            try:
-                if tarinfo.issym() and hasattr(os, "lchown"):
-                    os.lchown(targetpath, u, g)
-                else:
-                    os.chown(targetpath, u, g)
-            except (OSError, OverflowError) as e:
-                # OverflowError can be raised if an ID doesn't fit in 'id_t'
-                raise ExtractError("could not change owner") from e
-
-    def chmod(self, tarinfo, targetpath):
-        """Set file permissions of targetpath according to tarinfo.
-        """
-        if tarinfo.mode is None:
-            return
-        try:
-            os.chmod(targetpath, tarinfo.mode)
-        except OSError as e:
-            raise ExtractError("could not change mode") from e
-
-    def utime(self, tarinfo, targetpath):
-        """Set modification time of targetpath according to tarinfo.
-        """
-        mtime = tarinfo.mtime
-        if mtime is None:
-            return
-        if not hasattr(os, 'utime'):
-            return
-        try:
-            os.utime(targetpath, (mtime, mtime))
-        except OSError as e:
-            raise ExtractError("could not change modification time") from e
-
-    #--------------------------------------------------------------------------
-    def next(self):
-        """Return the next member of the archive as a TarInfo object, when
-           TarFile is opened for reading. Return None if there is no more
-           available.
-        """
-        self._check("ra")
-        if self.firstmember is not None:
-            m = self.firstmember
-            self.firstmember = None
-            return m
-
-        # Advance the file pointer.
-        if self.offset != self.fileobj.tell():
-            if self.offset == 0:
-                return None
-            self.fileobj.seek(self.offset - 1)
-            if not self.fileobj.read(1):
-                raise ReadError("unexpected end of data")
-
-        # Read the next block.
-        tarinfo = None
-        while True:
-            try:
-                tarinfo = self.tarinfo.fromtarfile(self)
-            except EOFHeaderError as e:
-                if self.ignore_zeros:
-                    self._dbg(2, "0x%X: %s" % (self.offset, e))
-                    self.offset += BLOCKSIZE
-                    continue
-            except InvalidHeaderError as e:
-                if self.ignore_zeros:
-                    self._dbg(2, "0x%X: %s" % (self.offset, e))
-                    self.offset += BLOCKSIZE
-                    continue
-                elif self.offset == 0:
-                    raise ReadError(str(e)) from None
-            except EmptyHeaderError:
-                if self.offset == 0:
-                    raise ReadError("empty file") from None
-            except TruncatedHeaderError as e:
-                if self.offset == 0:
-                    raise ReadError(str(e)) from None
-            except SubsequentHeaderError as e:
-                raise ReadError(str(e)) from None
-            except Exception as e:
-                try:
-                    import zlib
-                    if isinstance(e, zlib.error):
-                        raise ReadError(f'zlib error: {e}') from None
-                    else:
-                        raise e
-                except ImportError:
-                    raise e
-            break
-
-        if tarinfo is not None:
-            # if streaming the file we do not want to cache the tarinfo
-            if not self.stream:
-                self.members.append(tarinfo)
-        else:
-            self._loaded = True
-
-        return tarinfo
-
-    #--------------------------------------------------------------------------
-    # Little helper methods:
-
-    def _getmember(self, name, tarinfo=None, normalize=False):
-        """Find an archive member by name from bottom to top.
-           If tarinfo is given, it is used as the starting point.
-        """
-        # Ensure that all members have been loaded.
-        members = self.getmembers()
-
-        # Limit the member search list up to tarinfo.
-        skipping = False
-        if tarinfo is not None:
-            try:
-                index = members.index(tarinfo)
-            except ValueError:
-                # The given starting point might be a (modified) copy.
-                # We'll later skip members until we find an equivalent.
-                skipping = True
-            else:
-                # Happy fast path
-                members = members[:index]
-
-        if normalize:
-            name = os.path.normpath(name)
-
-        for member in reversed(members):
-            if skipping:
-                if tarinfo.offset == member.offset:
-                    skipping = False
-                continue
-            if normalize:
-                member_name = os.path.normpath(member.name)
-            else:
-                member_name = member.name
-
-            if name == member_name:
-                return member
-
-        if skipping:
-            # Starting point was not found
-            raise ValueError(tarinfo)
-
-    def _load(self):
-        """Read through the entire archive file and look for readable
-           members. This should not run if the file is set to stream.
-        """
-        if not self.stream:
-            while self.next() is not None:
-                pass
-            self._loaded = True
-
-    def _check(self, mode=None):
-        """Check if TarFile is still open, and if the operation's mode
-           corresponds to TarFile's mode.
-        """
-        if self.closed:
-            raise OSError("%s is closed" % self.__class__.__name__)
-        if mode is not None and self.mode not in mode:
-            raise OSError("bad operation for mode %r" % self.mode)
-
-    def _find_link_target(self, tarinfo):
-        """Find the target member of a symlink or hardlink member in the
-           archive.
-        """
-        if tarinfo.issym():
-            # Always search the entire archive.
-            linkname = "/".join(filter(None, (os.path.dirname(tarinfo.name), tarinfo.linkname)))
-            limit = None
-        else:
-            # Search the archive before the link, because a hard link is
-            # just a reference to an already archived file.
-            linkname = tarinfo.linkname
-            limit = tarinfo
-
-        member = self._getmember(linkname, tarinfo=limit, normalize=True)
-        if member is None:
-            raise KeyError("linkname %r not found" % linkname)
-        return member
-
-    def __iter__(self):
-        """Provide an iterator object.
-        """
-        if self._loaded:
-            yield from self.members
-            return
-
-        # Yield items using TarFile's next() method.
-        # When all members have been read, set TarFile as _loaded.
-        index = 0
-        # Fix for SF #1100429: Under rare circumstances it can
-        # happen that getmembers() is called during iteration,
-        # which will have already exhausted the next() method.
-        if self.firstmember is not None:
-            tarinfo = self.next()
-            index += 1
-            yield tarinfo
-
-        while True:
-            if index < len(self.members):
-                tarinfo = self.members[index]
-            elif not self._loaded:
-                tarinfo = self.next()
-                if not tarinfo:
-                    self._loaded = True
-                    return
-            else:
-                return
-            index += 1
-            yield tarinfo
-
-    def _dbg(self, level, msg):
-        """Write debugging output to sys.stderr.
-        """
-        if level <= self.debug:
-            print(msg, file=sys.stderr)
-
-    def __enter__(self):
-        self._check()
-        return self
-
-    def __exit__(self, type, value, traceback):
-        if type is None:
-            self.close()
-        else:
-            # An exception occurred. We must not call close() because
-            # it would try to write end-of-archive blocks and padding.
-            if not self._extfileobj:
-                self.fileobj.close()
-            self.closed = True
-
-#--------------------
-# exported functions
-#--------------------
-
-def is_tarfile(name):
-    """Return True if name points to a tar archive that we
-       are able to handle, else return False.
-
-       'name' should be a string, file, or file-like object.
-    """
-    try:
-        if hasattr(name, "read"):
-            pos = name.tell()
-            t = open(fileobj=name)
-            name.seek(pos)
-        else:
-            t = open(name)
-        t.close()
-        return True
-    except TarError:
-        return False
-
-open = TarFile.open
-
-
-def main():
-    import argparse
-
-    description = 'A simple command-line interface for tarfile module.'
-    parser = argparse.ArgumentParser(description=description)
-    parser.add_argument('-v', '--verbose', action='store_true', default=False,
-                        help='Verbose output')
-    parser.add_argument('--filter', metavar='<filtername>',
-                        choices=_NAMED_FILTERS,
-                        help='Filter for extraction')
-
-    group = parser.add_mutually_exclusive_group(required=True)
-    group.add_argument('-l', '--list', metavar='<tarfile>',
-                       help='Show listing of a tarfile')
-    group.add_argument('-e', '--extract', nargs='+',
-                       metavar=('<tarfile>', '<output_dir>'),
-                       help='Extract tarfile into target dir')
-    group.add_argument('-c', '--create', nargs='+',
-                       metavar=('<name>', '<file>'),
-                       help='Create tarfile from sources')
-    group.add_argument('-t', '--test', metavar='<tarfile>',
-                       help='Test if a tarfile is valid')
-
-    args = parser.parse_args()
-
-    if args.filter and args.extract is None:
-        parser.exit(1, '--filter is only valid for extraction\n')
-
-    if args.test is not None:
-        src = args.test
-        if is_tarfile(src):
-            with open(src, 'r') as tar:
-                tar.getmembers()
-                print(tar.getmembers(), file=sys.stderr)
-            if args.verbose:
-                print('{!r} is a tar archive.'.format(src))
-        else:
-            parser.exit(1, '{!r} is not a tar archive.\n'.format(src))
-
-    elif args.list is not None:
-        src = args.list
-        if is_tarfile(src):
-            with TarFile.open(src, 'r:*') as tf:
-                tf.list(verbose=args.verbose)
-        else:
-            parser.exit(1, '{!r} is not a tar archive.\n'.format(src))
-
-    elif args.extract is not None:
-        if len(args.extract) == 1:
-            src = args.extract[0]
-            curdir = os.curdir
-        elif len(args.extract) == 2:
-            src, curdir = args.extract
-        else:
-            parser.exit(1, parser.format_help())
-
-        if is_tarfile(src):
-            with TarFile.open(src, 'r:*') as tf:
-                tf.extractall(path=curdir, filter=args.filter)
-            if args.verbose:
-                if curdir == '.':
-                    msg = '{!r} file is extracted.'.format(src)
-                else:
-                    msg = ('{!r} file is extracted '
-                           'into {!r} directory.').format(src, curdir)
-                print(msg)
-        else:
-            parser.exit(1, '{!r} is not a tar archive.\n'.format(src))
-
-    elif args.create is not None:
-        tar_name = args.create.pop(0)
-        _, ext = os.path.splitext(tar_name)
-        compressions = {
-            # gz
-            '.gz': 'gz',
-            '.tgz': 'gz',
-            # xz
-            '.xz': 'xz',
-            '.txz': 'xz',
-            # bz2
-            '.bz2': 'bz2',
-            '.tbz': 'bz2',
-            '.tbz2': 'bz2',
-            '.tb2': 'bz2',
-        }
-        tar_mode = 'w:' + compressions[ext] if ext in compressions else 'w'
-        tar_files = args.create
-
-        with TarFile.open(tar_name, tar_mode) as tf:
-            for file_name in tar_files:
-                tf.add(file_name)
-
-        if args.verbose:
-            print('{!r} file created.'.format(tar_name))
-
-if __name__ == '__main__':
-    main()
diff --git a/lib/backports/tarfile/__main__.py b/lib/backports/tarfile/__main__.py
deleted file mode 100644
index daf55090..00000000
--- a/lib/backports/tarfile/__main__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from . import main
-
-
-if __name__ == '__main__':
-    main()
diff --git a/lib/backports/tarfile/compat/py38.py b/lib/backports/tarfile/compat/py38.py
deleted file mode 100644
index 20fbbfc1..00000000
--- a/lib/backports/tarfile/compat/py38.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-
-if sys.version_info < (3, 9):
-
-    def removesuffix(self, suffix):
-        # suffix='' should not call self[:-0].
-        if suffix and self.endswith(suffix):
-            return self[: -len(suffix)]
-        else:
-            return self[:]
-
-    def removeprefix(self, prefix):
-        if self.startswith(prefix):
-            return self[len(prefix) :]
-        else:
-            return self[:]
-else:
-
-    def removesuffix(self, suffix):
-        return self.removesuffix(suffix)
-
-    def removeprefix(self, prefix):
-        return self.removeprefix(prefix)
diff --git a/lib/bencode.py b/lib/bencode.py
new file mode 100644
index 00000000..3181ee1c
--- /dev/null
+++ b/lib/bencode.py
@@ -0,0 +1,131 @@
+# Got this from here: https://gist.github.com/1126793
+
+# The contents of this file are subject to the Python Software Foundation
+# License Version 2.3 (the License).  You may not copy or use this file, in
+# either source code or executable form, except in compliance with the License.
+# You may obtain a copy of the License at http://www.python.org/license.
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied.  See the License
+# for the specific language governing rights and limitations under the
+# License.
+
+# Written by Petru Paler
+
+# Minor modifications made by Andrew Resch to replace the BTFailure errors with Exceptions
+
+def decode_int(x, f):
+    f += 1
+    newf = x.index('e', f)
+    n = int(x[f:newf])
+    if x[f] == '-':
+        if x[f + 1] == '0':
+            raise ValueError
+    elif x[f] == '0' and newf != f+1:
+        raise ValueError
+    return (n, newf+1)
+
+def decode_string(x, f):
+    colon = x.index(':', f)
+    n = int(x[f:colon])
+    if x[f] == '0' and colon != f+1:
+        raise ValueError
+    colon += 1
+    return (x[colon:colon+n], colon+n)
+
+def decode_list(x, f):
+    r, f = [], f+1
+    while x[f] != 'e':
+        v, f = decode_func[x[f]](x, f)
+        r.append(v)
+    return (r, f + 1)
+
+def decode_dict(x, f):
+    r, f = {}, f+1
+    while x[f] != 'e':
+        k, f = decode_string(x, f)
+        r[k], f = decode_func[x[f]](x, f)
+    return (r, f + 1)
+
+decode_func = {}
+decode_func['l'] = decode_list
+decode_func['d'] = decode_dict
+decode_func['i'] = decode_int
+decode_func['0'] = decode_string
+decode_func['1'] = decode_string
+decode_func['2'] = decode_string
+decode_func['3'] = decode_string
+decode_func['4'] = decode_string
+decode_func['5'] = decode_string
+decode_func['6'] = decode_string
+decode_func['7'] = decode_string
+decode_func['8'] = decode_string
+decode_func['9'] = decode_string
+
+def bdecode(x):
+    try:
+        r, l = decode_func[x[0]](x, 0)
+    except (IndexError, KeyError, ValueError):
+        raise Exception("not a valid bencoded string")
+
+    return r
+
+from types import StringType, IntType, LongType, DictType, ListType, TupleType
+
+
+class Bencached(object):
+
+    __slots__ = ['bencoded']
+
+    def __init__(self, s):
+        self.bencoded = s
+
+def encode_bencached(x,r):
+    r.append(x.bencoded)
+
+def encode_int(x, r):
+    r.extend(('i', str(x), 'e'))
+
+def encode_bool(x, r):
+    if x:
+        encode_int(1, r)
+    else:
+        encode_int(0, r)
+
+def encode_string(x, r):
+    r.extend((str(len(x)), ':', x))
+
+def encode_list(x, r):
+    r.append('l')
+    for i in x:
+        encode_func[type(i)](i, r)
+    r.append('e')
+
+def encode_dict(x,r):
+    r.append('d')
+    ilist = x.items()
+    ilist.sort()
+    for k, v in ilist:
+        r.extend((str(len(k)), ':', k))
+        encode_func[type(v)](v, r)
+    r.append('e')
+
+encode_func = {}
+encode_func[Bencached] = encode_bencached
+encode_func[IntType] = encode_int
+encode_func[LongType] = encode_int
+encode_func[StringType] = encode_string
+encode_func[ListType] = encode_list
+encode_func[TupleType] = encode_list
+encode_func[DictType] = encode_dict
+
+try:
+    from types import BooleanType
+    encode_func[BooleanType] = encode_bool
+except ImportError:
+    pass
+
+def bencode(x):
+    r = []
+    encode_func[type(x)](x, r)
+    return ''.join(r)
diff --git a/lib/biplist/__init__.py b/lib/biplist/__init__.py
new file mode 100755
index 00000000..fe5b711b
--- /dev/null
+++ b/lib/biplist/__init__.py
@@ -0,0 +1,803 @@
+"""biplist -- a library for reading and writing binary property list files.
+
+Binary Property List (plist) files provide a faster and smaller serialization
+format for property lists on OS X. This is a library for generating binary
+plists which can be read by OS X, iOS, or other clients.
+
+The API models the plistlib API, and will call through to plistlib when
+XML serialization or deserialization is required.
+
+To generate plists with UID values, wrap the values with the Uid object. The
+value must be an int.
+
+To generate plists with NSData/CFData values, wrap the values with the
+Data object. The value must be a string.
+
+Date values can only be datetime.datetime objects.
+
+The exceptions InvalidPlistException and NotBinaryPlistException may be 
+thrown to indicate that the data cannot be serialized or deserialized as
+a binary plist.
+
+Plist generation example:
+    
+    from biplist import *
+    from datetime import datetime
+    plist = {'aKey':'aValue',
+             '0':1.322,
+             'now':datetime.now(),
+             'list':[1,2,3],
+             'tuple':('a','b','c')
+             }
+    try:
+        writePlist(plist, "example.plist")
+    except (InvalidPlistException, NotBinaryPlistException), e:
+        print "Something bad happened:", e
+
+Plist parsing example:
+
+    from biplist import *
+    try:
+        plist = readPlist("example.plist")
+        print plist
+    except (InvalidPlistException, NotBinaryPlistException), e:
+        print "Not a plist:", e
+"""
+
+import sys
+from collections import namedtuple
+import datetime
+import io
+import math
+import plistlib
+from struct import pack, unpack
+from struct import error as struct_error
+import sys
+import time
+
+try:
+    unicode
+    unicodeEmpty = r''
+except NameError:
+    unicode = str
+    unicodeEmpty = ''
+try:
+    long
+except NameError:
+    long = int
+try:
+    {}.iteritems
+    iteritems = lambda x: x.iteritems()
+except AttributeError:
+    iteritems = lambda x: x.items()
+
+__all__ = [
+    'Uid', 'Data', 'readPlist', 'writePlist', 'readPlistFromString',
+    'writePlistToString', 'InvalidPlistException', 'NotBinaryPlistException'
+]
+
+# Apple uses Jan 1, 2001 as a base for all plist date/times.
+apple_reference_date = datetime.datetime.utcfromtimestamp(978307200)
+
+class Uid(int):
+    """Wrapper around integers for representing UID values. This
+       is used in keyed archiving."""
+    def __repr__(self):
+        return "Uid(%d)" % self
+
+class Data(bytes):
+    """Wrapper around str types for representing Data values."""
+    pass
+
+class InvalidPlistException(Exception):
+    """Raised when the plist is incorrectly formatted."""
+    pass
+
+class NotBinaryPlistException(Exception):
+    """Raised when a binary plist was expected but not encountered."""
+    pass
+
+def readPlist(pathOrFile):
+    """Raises NotBinaryPlistException, InvalidPlistException"""
+    didOpen = False
+    result = None
+    if isinstance(pathOrFile, (bytes, unicode)):
+        pathOrFile = open(pathOrFile, 'rb')
+        didOpen = True
+    try:
+        reader = PlistReader(pathOrFile)
+        result = reader.parse()
+    except NotBinaryPlistException as e:
+        try:
+            pathOrFile.seek(0)
+            result = None
+            if hasattr(plistlib, 'loads'):
+                contents = None
+                if isinstance(pathOrFile, (bytes, unicode)):
+                    with open(pathOrFile, 'rb') as f:
+                        contents = f.read()
+                else:
+                    contents = pathOrFile.read()
+                result = plistlib.loads(contents)
+            else:
+                result = plistlib.readPlist(pathOrFile)
+            result = wrapDataObject(result, for_binary=True)
+        except Exception as e:
+            raise InvalidPlistException(e)
+    finally:
+        if didOpen:
+            pathOrFile.close()
+    return result
+
+def wrapDataObject(o, for_binary=False):
+    if isinstance(o, Data) and not for_binary:
+        v = sys.version_info
+        if not (v[0] >= 3 and v[1] >= 4):
+            o = plistlib.Data(o)
+    elif isinstance(o, (bytes, plistlib.Data)) and for_binary:
+        if hasattr(o, 'data'):
+            o = Data(o.data)
+    elif isinstance(o, tuple):
+        o = wrapDataObject(list(o), for_binary)
+        o = tuple(o)
+    elif isinstance(o, list):
+        for i in range(len(o)):
+            o[i] = wrapDataObject(o[i], for_binary)
+    elif isinstance(o, dict):
+        for k in o:
+            o[k] = wrapDataObject(o[k], for_binary)
+    return o
+
+def writePlist(rootObject, pathOrFile, binary=True):
+    if not binary:
+        rootObject = wrapDataObject(rootObject, binary)
+        if hasattr(plistlib, "dump"):
+            if isinstance(pathOrFile, (bytes, unicode)):
+                with open(pathOrFile, 'wb') as f:
+                    return plistlib.dump(rootObject, f)
+            else:
+                return plistlib.dump(rootObject, pathOrFile)
+        else:
+            return plistlib.writePlist(rootObject, pathOrFile)
+    else:
+        didOpen = False
+        if isinstance(pathOrFile, (bytes, unicode)):
+            pathOrFile = open(pathOrFile, 'wb')
+            didOpen = True
+        writer = PlistWriter(pathOrFile)
+        result = writer.writeRoot(rootObject)
+        if didOpen:
+            pathOrFile.close()
+        return result
+
+def readPlistFromString(data):
+    return readPlist(io.BytesIO(data))
+
+def writePlistToString(rootObject, binary=True):
+    if not binary:
+        rootObject = wrapDataObject(rootObject, binary)
+        if hasattr(plistlib, "dumps"):
+            return plistlib.dumps(rootObject)
+        elif hasattr(plistlib, "writePlistToBytes"):
+            return plistlib.writePlistToBytes(rootObject)
+        else:
+            return plistlib.writePlistToString(rootObject)
+    else:
+        ioObject = io.BytesIO()
+        writer = PlistWriter(ioObject)
+        writer.writeRoot(rootObject)
+        return ioObject.getvalue()
+
+def is_stream_binary_plist(stream):
+    stream.seek(0)
+    header = stream.read(7)
+    if header == b'bplist0':
+        return True
+    else:
+        return False
+
+PlistTrailer = namedtuple('PlistTrailer', 'offsetSize, objectRefSize, offsetCount, topLevelObjectNumber, offsetTableOffset')
+PlistByteCounts = namedtuple('PlistByteCounts', 'nullBytes, boolBytes, intBytes, realBytes, dateBytes, dataBytes, stringBytes, uidBytes, arrayBytes, setBytes, dictBytes')
+
+class PlistReader(object):
+    file = None
+    contents = ''
+    offsets = None
+    trailer = None
+    currentOffset = 0
+    
+    def __init__(self, fileOrStream):
+        """Raises NotBinaryPlistException."""
+        self.reset()
+        self.file = fileOrStream
+    
+    def parse(self):
+        return self.readRoot()
+    
+    def reset(self):
+        self.trailer = None
+        self.contents = ''
+        self.offsets = []
+        self.currentOffset = 0
+    
+    def readRoot(self):
+        result = None
+        self.reset()
+        # Get the header, make sure it's a valid file.
+        if not is_stream_binary_plist(self.file):
+            raise NotBinaryPlistException()
+        self.file.seek(0)
+        self.contents = self.file.read()
+        if len(self.contents) < 32:
+            raise InvalidPlistException("File is too short.")
+        trailerContents = self.contents[-32:]
+        try:
+            self.trailer = PlistTrailer._make(unpack("!xxxxxxBBQQQ", trailerContents))
+            offset_size = self.trailer.offsetSize * self.trailer.offsetCount
+            offset = self.trailer.offsetTableOffset
+            offset_contents = self.contents[offset:offset+offset_size]
+            offset_i = 0
+            while offset_i < self.trailer.offsetCount:
+                begin = self.trailer.offsetSize*offset_i
+                tmp_contents = offset_contents[begin:begin+self.trailer.offsetSize]
+                tmp_sized = self.getSizedInteger(tmp_contents, self.trailer.offsetSize)
+                self.offsets.append(tmp_sized)
+                offset_i += 1
+            self.setCurrentOffsetToObjectNumber(self.trailer.topLevelObjectNumber)
+            result = self.readObject()
+        except TypeError as e:
+            raise InvalidPlistException(e)
+        return result
+    
+    def setCurrentOffsetToObjectNumber(self, objectNumber):
+        self.currentOffset = self.offsets[objectNumber]
+    
+    def readObject(self):
+        result = None
+        tmp_byte = self.contents[self.currentOffset:self.currentOffset+1]
+        marker_byte = unpack("!B", tmp_byte)[0]
+        format = (marker_byte >> 4) & 0x0f
+        extra = marker_byte & 0x0f
+        self.currentOffset += 1
+        
+        def proc_extra(extra):
+            if extra == 0b1111:
+                #self.currentOffset += 1
+                extra = self.readObject()
+            return extra
+        
+        # bool, null, or fill byte
+        if format == 0b0000:
+            if extra == 0b0000:
+                result = None
+            elif extra == 0b1000:
+                result = False
+            elif extra == 0b1001:
+                result = True
+            elif extra == 0b1111:
+                pass # fill byte
+            else:
+                raise InvalidPlistException("Invalid object found at offset: %d" % (self.currentOffset - 1))
+        # int
+        elif format == 0b0001:
+            extra = proc_extra(extra)
+            result = self.readInteger(pow(2, extra))
+        # real
+        elif format == 0b0010:
+            extra = proc_extra(extra)
+            result = self.readReal(extra)
+        # date
+        elif format == 0b0011 and extra == 0b0011:
+            result = self.readDate()
+        # data
+        elif format == 0b0100:
+            extra = proc_extra(extra)
+            result = self.readData(extra)
+        # ascii string
+        elif format == 0b0101:
+            extra = proc_extra(extra)
+            result = self.readAsciiString(extra)
+        # Unicode string
+        elif format == 0b0110:
+            extra = proc_extra(extra)
+            result = self.readUnicode(extra)
+        # uid
+        elif format == 0b1000:
+            result = self.readUid(extra)
+        # array
+        elif format == 0b1010:
+            extra = proc_extra(extra)
+            result = self.readArray(extra)
+        # set
+        elif format == 0b1100:
+            extra = proc_extra(extra)
+            result = set(self.readArray(extra))
+        # dict
+        elif format == 0b1101:
+            extra = proc_extra(extra)
+            result = self.readDict(extra)
+        else:    
+            raise InvalidPlistException("Invalid object found: {format: %s, extra: %s}" % (bin(format), bin(extra)))
+        return result
+    
+    def readInteger(self, byteSize):
+        result = 0
+        original_offset = self.currentOffset
+        data = self.contents[self.currentOffset:self.currentOffset + byteSize]
+        result = self.getSizedInteger(data, byteSize, as_number=True)
+        self.currentOffset = original_offset + byteSize
+        return result
+    
+    def readReal(self, length):
+        result = 0.0
+        to_read = pow(2, length)
+        data = self.contents[self.currentOffset:self.currentOffset+to_read]
+        if length == 2: # 4 bytes
+            result = unpack('>f', data)[0]
+        elif length == 3: # 8 bytes
+            result = unpack('>d', data)[0]
+        else:
+            raise InvalidPlistException("Unknown real of length %d bytes" % to_read)
+        return result
+    
+    def readRefs(self, count):    
+        refs = []
+        i = 0
+        while i < count:
+            fragment = self.contents[self.currentOffset:self.currentOffset+self.trailer.objectRefSize]
+            ref = self.getSizedInteger(fragment, len(fragment))
+            refs.append(ref)
+            self.currentOffset += self.trailer.objectRefSize
+            i += 1
+        return refs
+    
+    def readArray(self, count):
+        result = []
+        values = self.readRefs(count)
+        i = 0
+        while i < len(values):
+            self.setCurrentOffsetToObjectNumber(values[i])
+            value = self.readObject()
+            result.append(value)
+            i += 1
+        return result
+    
+    def readDict(self, count):
+        result = {}
+        keys = self.readRefs(count)
+        values = self.readRefs(count)
+        i = 0
+        while i < len(keys):
+            self.setCurrentOffsetToObjectNumber(keys[i])
+            key = self.readObject()
+            self.setCurrentOffsetToObjectNumber(values[i])
+            value = self.readObject()
+            result[key] = value
+            i += 1
+        return result
+    
+    def readAsciiString(self, length):
+        result = unpack("!%ds" % length, self.contents[self.currentOffset:self.currentOffset+length])[0]
+        self.currentOffset += length
+        return result
+    
+    def readUnicode(self, length):
+        actual_length = length*2
+        data = self.contents[self.currentOffset:self.currentOffset+actual_length]
+        # unpack not needed?!! data = unpack(">%ds" % (actual_length), data)[0]
+        self.currentOffset += actual_length
+        return data.decode('utf_16_be')
+    
+    def readDate(self):
+        result = unpack(">d", self.contents[self.currentOffset:self.currentOffset+8])[0]
+        # Use timedelta to workaround time_t size limitation on 32-bit python.
+        result = datetime.timedelta(seconds=result) + apple_reference_date
+        self.currentOffset += 8
+        return result
+    
+    def readData(self, length):
+        result = self.contents[self.currentOffset:self.currentOffset+length]
+        self.currentOffset += length
+        return Data(result)
+    
+    def readUid(self, length):
+        return Uid(self.readInteger(length+1))
+    
+    def getSizedInteger(self, data, byteSize, as_number=False):
+        """Numbers of 8 bytes are signed integers when they refer to numbers, but unsigned otherwise."""
+        result = 0
+        # 1, 2, and 4 byte integers are unsigned
+        if byteSize == 1:
+            result = unpack('>B', data)[0]
+        elif byteSize == 2:
+            result = unpack('>H', data)[0]
+        elif byteSize == 4:
+            result = unpack('>L', data)[0]
+        elif byteSize == 8:
+            if as_number:
+                result = unpack('>q', data)[0]
+            else:
+                result = unpack('>Q', data)[0]
+        elif byteSize <= 16:
+            # Handle odd-sized or integers larger than 8 bytes
+            # Don't naively go over 16 bytes, in order to prevent infinite loops.
+            result = 0
+            if hasattr(int, 'from_bytes'):
+                result = int.from_bytes(data, 'big')
+            else:
+                for byte in data:
+                    result = (result << 8) | unpack('>B', byte)[0]
+        else:
+            raise InvalidPlistException("Encountered integer longer than 16 bytes.")
+        return result
+
+class HashableWrapper(object):
+    def __init__(self, value):
+        self.value = value
+    def __repr__(self):
+        return "<HashableWrapper: %s>" % [self.value]
+
+class BoolWrapper(object):
+    def __init__(self, value):
+        self.value = value
+    def __repr__(self):
+        return "<BoolWrapper: %s>" % self.value
+
+class FloatWrapper(object):
+    _instances = {}
+    def __new__(klass, value):
+        # Ensure FloatWrapper(x) for a given float x is always the same object
+        wrapper = klass._instances.get(value)
+        if wrapper is None:
+            wrapper = object.__new__(klass)
+            wrapper.value = value
+            klass._instances[value] = wrapper
+        return wrapper
+    def __repr__(self):
+        return "<FloatWrapper: %s>" % self.value
+
+class PlistWriter(object):
+    header = b'bplist00bybiplist1.0'
+    file = None
+    byteCounts = None
+    trailer = None
+    computedUniques = None
+    writtenReferences = None
+    referencePositions = None
+    wrappedTrue = None
+    wrappedFalse = None
+    
+    def __init__(self, file):
+        self.reset()
+        self.file = file
+        self.wrappedTrue = BoolWrapper(True)
+        self.wrappedFalse = BoolWrapper(False)
+
+    def reset(self):
+        self.byteCounts = PlistByteCounts(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+        self.trailer = PlistTrailer(0, 0, 0, 0, 0)
+        
+        # A set of all the uniques which have been computed.
+        self.computedUniques = set()
+        # A list of all the uniques which have been written.
+        self.writtenReferences = {}
+        # A dict of the positions of the written uniques.
+        self.referencePositions = {}
+        
+    def positionOfObjectReference(self, obj):
+        """If the given object has been written already, return its
+           position in the offset table. Otherwise, return None."""
+        return self.writtenReferences.get(obj)
+        
+    def writeRoot(self, root):
+        """
+        Strategy is:
+        - write header
+        - wrap root object so everything is hashable
+        - compute size of objects which will be written
+          - need to do this in order to know how large the object refs
+            will be in the list/dict/set reference lists
+        - write objects
+          - keep objects in writtenReferences
+          - keep positions of object references in referencePositions
+          - write object references with the length computed previously
+        - computer object reference length
+        - write object reference positions
+        - write trailer
+        """
+        output = self.header
+        wrapped_root = self.wrapRoot(root)
+        should_reference_root = True#not isinstance(wrapped_root, HashableWrapper)
+        self.computeOffsets(wrapped_root, asReference=should_reference_root, isRoot=True)
+        self.trailer = self.trailer._replace(**{'objectRefSize':self.intSize(len(self.computedUniques))})
+        (_, output) = self.writeObjectReference(wrapped_root, output)
+        output = self.writeObject(wrapped_root, output, setReferencePosition=True)
+        
+        # output size at this point is an upper bound on how big the
+        # object reference offsets need to be.
+        self.trailer = self.trailer._replace(**{
+            'offsetSize':self.intSize(len(output)),
+            'offsetCount':len(self.computedUniques),
+            'offsetTableOffset':len(output),
+            'topLevelObjectNumber':0
+            })
+        
+        output = self.writeOffsetTable(output)
+        output += pack('!xxxxxxBBQQQ', *self.trailer)
+        self.file.write(output)
+
+    def wrapRoot(self, root):
+        if isinstance(root, bool):
+            if root is True:
+                return self.wrappedTrue
+            else:
+                return self.wrappedFalse
+        elif isinstance(root, float):
+            return FloatWrapper(root)
+        elif isinstance(root, set):
+            n = set()
+            for value in root:
+                n.add(self.wrapRoot(value))
+            return HashableWrapper(n)
+        elif isinstance(root, dict):
+            n = {}
+            for key, value in iteritems(root):
+                n[self.wrapRoot(key)] = self.wrapRoot(value)
+            return HashableWrapper(n)
+        elif isinstance(root, list):
+            n = []
+            for value in root:
+                n.append(self.wrapRoot(value))
+            return HashableWrapper(n)
+        elif isinstance(root, tuple):
+            n = tuple([self.wrapRoot(value) for value in root])
+            return HashableWrapper(n)
+        else:
+            return root
+
+    def incrementByteCount(self, field, incr=1):
+        self.byteCounts = self.byteCounts._replace(**{field:self.byteCounts.__getattribute__(field) + incr})
+
+    def computeOffsets(self, obj, asReference=False, isRoot=False):
+        def check_key(key):
+            if key is None:
+                raise InvalidPlistException('Dictionary keys cannot be null in plists.')
+            elif isinstance(key, Data):
+                raise InvalidPlistException('Data cannot be dictionary keys in plists.')
+            elif not isinstance(key, (bytes, unicode)):
+                raise InvalidPlistException('Keys must be strings.')
+        
+        def proc_size(size):
+            if size > 0b1110:
+                size += self.intSize(size)
+            return size
+        # If this should be a reference, then we keep a record of it in the
+        # uniques table.
+        if asReference:
+            if obj in self.computedUniques:
+                return
+            else:
+                self.computedUniques.add(obj)
+        
+        if obj is None:
+            self.incrementByteCount('nullBytes')
+        elif isinstance(obj, BoolWrapper):
+            self.incrementByteCount('boolBytes')
+        elif isinstance(obj, Uid):
+            size = self.intSize(obj)
+            self.incrementByteCount('uidBytes', incr=1+size)
+        elif isinstance(obj, (int, long)):
+            size = self.intSize(obj)
+            self.incrementByteCount('intBytes', incr=1+size)
+        elif isinstance(obj, FloatWrapper):
+            size = self.realSize(obj)
+            self.incrementByteCount('realBytes', incr=1+size)
+        elif isinstance(obj, datetime.datetime):    
+            self.incrementByteCount('dateBytes', incr=2)
+        elif isinstance(obj, Data):
+            size = proc_size(len(obj))
+            self.incrementByteCount('dataBytes', incr=1+size)
+        elif isinstance(obj, (unicode, bytes)):
+            size = proc_size(len(obj))
+            self.incrementByteCount('stringBytes', incr=1+size)
+        elif isinstance(obj, HashableWrapper):
+            obj = obj.value
+            if isinstance(obj, set):
+                size = proc_size(len(obj))
+                self.incrementByteCount('setBytes', incr=1+size)
+                for value in obj:
+                    self.computeOffsets(value, asReference=True)
+            elif isinstance(obj, (list, tuple)):
+                size = proc_size(len(obj))
+                self.incrementByteCount('arrayBytes', incr=1+size)
+                for value in obj:
+                    asRef = True
+                    self.computeOffsets(value, asReference=True)
+            elif isinstance(obj, dict):
+                size = proc_size(len(obj))
+                self.incrementByteCount('dictBytes', incr=1+size)
+                for key, value in iteritems(obj):
+                    check_key(key)
+                    self.computeOffsets(key, asReference=True)
+                    self.computeOffsets(value, asReference=True)
+        else:
+            raise InvalidPlistException("Unknown object type.")
+
+    def writeObjectReference(self, obj, output):
+        """Tries to write an object reference, adding it to the references
+           table. Does not write the actual object bytes or set the reference
+           position. Returns a tuple of whether the object was a new reference
+           (True if it was, False if it already was in the reference table)
+           and the new output.
+        """
+        position = self.positionOfObjectReference(obj)
+        if position is None:
+            self.writtenReferences[obj] = len(self.writtenReferences)
+            output += self.binaryInt(len(self.writtenReferences) - 1, byteSize=self.trailer.objectRefSize)
+            return (True, output)
+        else:
+            output += self.binaryInt(position, byteSize=self.trailer.objectRefSize)
+            return (False, output)
+
+    def writeObject(self, obj, output, setReferencePosition=False):
+        """Serializes the given object to the output. Returns output.
+           If setReferencePosition is True, will set the position the
+           object was written.
+        """
+        def proc_variable_length(format, length):
+            result = b''
+            if length > 0b1110:
+                result += pack('!B', (format << 4) | 0b1111)
+                result = self.writeObject(length, result)
+            else:
+                result += pack('!B', (format << 4) | length)
+            return result
+        
+        if isinstance(obj, (str, unicode)) and obj == unicodeEmpty:
+            # The Apple Plist decoder can't decode a zero length Unicode string.
+            obj = b''
+       
+        if setReferencePosition:
+            self.referencePositions[obj] = len(output)
+        
+        if obj is None:
+            output += pack('!B', 0b00000000)
+        elif isinstance(obj, BoolWrapper):
+            if obj.value is False:
+                output += pack('!B', 0b00001000)
+            else:
+                output += pack('!B', 0b00001001)
+        elif isinstance(obj, Uid):
+            size = self.intSize(obj)
+            output += pack('!B', (0b1000 << 4) | size - 1)
+            output += self.binaryInt(obj)
+        elif isinstance(obj, (int, long)):
+            byteSize = self.intSize(obj)
+            root = math.log(byteSize, 2)
+            output += pack('!B', (0b0001 << 4) | int(root))
+            output += self.binaryInt(obj, as_number=True)
+        elif isinstance(obj, FloatWrapper):
+            # just use doubles
+            output += pack('!B', (0b0010 << 4) | 3)
+            output += self.binaryReal(obj)
+        elif isinstance(obj, datetime.datetime):
+            timestamp = (obj - apple_reference_date).total_seconds()
+            output += pack('!B', 0b00110011)
+            output += pack('!d', float(timestamp))
+        elif isinstance(obj, Data):
+            output += proc_variable_length(0b0100, len(obj))
+            output += obj
+        elif isinstance(obj, unicode):
+            byteData = obj.encode('utf_16_be')
+            output += proc_variable_length(0b0110, len(byteData)//2)
+            output += byteData
+        elif isinstance(obj, bytes):
+            output += proc_variable_length(0b0101, len(obj))
+            output += obj
+        elif isinstance(obj, HashableWrapper):
+            obj = obj.value
+            if isinstance(obj, (set, list, tuple)):
+                if isinstance(obj, set):
+                    output += proc_variable_length(0b1100, len(obj))
+                else:
+                    output += proc_variable_length(0b1010, len(obj))
+            
+                objectsToWrite = []
+                for objRef in obj:
+                    (isNew, output) = self.writeObjectReference(objRef, output)
+                    if isNew:
+                        objectsToWrite.append(objRef)
+                for objRef in objectsToWrite:
+                    output = self.writeObject(objRef, output, setReferencePosition=True)
+            elif isinstance(obj, dict):
+                output += proc_variable_length(0b1101, len(obj))
+                keys = []
+                values = []
+                objectsToWrite = []
+                for key, value in iteritems(obj):
+                    keys.append(key)
+                    values.append(value)
+                for key in keys:
+                    (isNew, output) = self.writeObjectReference(key, output)
+                    if isNew:
+                        objectsToWrite.append(key)
+                for value in values:
+                    (isNew, output) = self.writeObjectReference(value, output)
+                    if isNew:
+                        objectsToWrite.append(value)
+                for objRef in objectsToWrite:
+                    output = self.writeObject(objRef, output, setReferencePosition=True)
+        return output
+    
+    def writeOffsetTable(self, output):
+        """Writes all of the object reference offsets."""
+        all_positions = []
+        writtenReferences = list(self.writtenReferences.items())
+        writtenReferences.sort(key=lambda x: x[1])
+        for obj,order in writtenReferences:
+            # Porting note: Elsewhere we deliberately replace empty unicdoe strings
+            # with empty binary strings, but the empty unicode string
+            # goes into writtenReferences.  This isn't an issue in Py2
+            # because u'' and b'' have the same hash; but it is in
+            # Py3, where they don't.
+            if bytes != str and obj == unicodeEmpty:
+                obj = b''
+            position = self.referencePositions.get(obj)
+            if position is None:
+                raise InvalidPlistException("Error while writing offsets table. Object not found. %s" % obj)
+            output += self.binaryInt(position, self.trailer.offsetSize)
+            all_positions.append(position)
+        return output
+    
+    def binaryReal(self, obj):
+        # just use doubles
+        result = pack('>d', obj.value)
+        return result
+    
+    def binaryInt(self, obj, byteSize=None, as_number=False):
+        result = b''
+        if byteSize is None:
+            byteSize = self.intSize(obj)
+        if byteSize == 1:
+            result += pack('>B', obj)
+        elif byteSize == 2:
+            result += pack('>H', obj)
+        elif byteSize == 4:
+            result += pack('>L', obj)
+        elif byteSize == 8:
+            if as_number:
+                result += pack('>q', obj)
+            else:
+                result += pack('>Q', obj)
+        elif byteSize <= 16:
+            try:
+                result = pack('>Q', 0) + pack('>Q', obj)
+            except struct_error as e:
+                raise InvalidPlistException("Unable to pack integer %d: %s" % (obj, e))
+        else:
+            raise InvalidPlistException("Core Foundation can't handle integers with size greater than 16 bytes.")
+        return result
+    
+    def intSize(self, obj):
+        """Returns the number of bytes necessary to store the given integer."""
+        # SIGNED
+        if obj < 0: # Signed integer, always 8 bytes
+            return 8
+        # UNSIGNED
+        elif obj <= 0xFF: # 1 byte
+            return 1
+        elif obj <= 0xFFFF: # 2 bytes
+            return 2
+        elif obj <= 0xFFFFFFFF: # 4 bytes
+            return 4
+        # SIGNED
+        # 0x7FFFFFFFFFFFFFFF is the max.
+        elif obj <= 0x7FFFFFFFFFFFFFFF: # 8 bytes signed
+            return 8
+        elif obj <= 0xffffffffffffffff: # 8 bytes unsigned
+            return 16
+        else:
+            raise InvalidPlistException("Core Foundation can't handle integers with size greater than 8 bytes.")
+    
+    def realSize(self, obj):
+        return 8
diff --git a/lib/bleach/__init__.py b/lib/bleach/__init__.py
deleted file mode 100644
index 942987d9..00000000
--- a/lib/bleach/__init__.py
+++ /dev/null
@@ -1,125 +0,0 @@
-from bleach.linkifier import (
-    DEFAULT_CALLBACKS,
-    Linker,
-)
-from bleach.sanitizer import (
-    ALLOWED_ATTRIBUTES,
-    ALLOWED_PROTOCOLS,
-    ALLOWED_TAGS,
-    Cleaner,
-)
-
-
-# yyyymmdd
-__releasedate__ = "20241029"
-# x.y.z or x.y.z.dev0 -- semver
-__version__ = "6.2.0"
-
-
-__all__ = ["clean", "linkify"]
-
-
-def clean(
-    text,
-    tags=ALLOWED_TAGS,
-    attributes=ALLOWED_ATTRIBUTES,
-    protocols=ALLOWED_PROTOCOLS,
-    strip=False,
-    strip_comments=True,
-    css_sanitizer=None,
-):
-    """Clean an HTML fragment of malicious content and return it
-
-    This function is a security-focused function whose sole purpose is to
-    remove malicious content from a string such that it can be displayed as
-    content in a web page.
-
-    This function is not designed to use to transform content to be used in
-    non-web-page contexts.
-
-    Example::
-
-        import bleach
-
-        better_text = bleach.clean(yucky_text)
-
-
-    .. Note::
-
-       If you're cleaning a lot of text and passing the same argument values or
-       you want more configurability, consider using a
-       :py:class:`bleach.sanitizer.Cleaner` instance.
-
-    :arg str text: the text to clean
-
-    :arg set tags: set of allowed tags; defaults to
-        ``bleach.sanitizer.ALLOWED_TAGS``
-
-    :arg dict attributes: allowed attributes; can be a callable, list or dict;
-        defaults to ``bleach.sanitizer.ALLOWED_ATTRIBUTES``
-
-    :arg list protocols: allowed list of protocols for links; defaults
-        to ``bleach.sanitizer.ALLOWED_PROTOCOLS``
-
-    :arg bool strip: whether or not to strip disallowed elements
-
-    :arg bool strip_comments: whether or not to strip HTML comments
-
-    :arg CSSSanitizer css_sanitizer: instance with a "sanitize_css" method for
-        sanitizing style attribute values and style text; defaults to None
-
-    :returns: cleaned text as unicode
-
-    """
-    cleaner = Cleaner(
-        tags=tags,
-        attributes=attributes,
-        protocols=protocols,
-        strip=strip,
-        strip_comments=strip_comments,
-        css_sanitizer=css_sanitizer,
-    )
-    return cleaner.clean(text)
-
-
-def linkify(text, callbacks=DEFAULT_CALLBACKS, skip_tags=None, parse_email=False):
-    """Convert URL-like strings in an HTML fragment to links
-
-    This function converts strings that look like URLs, domain names and email
-    addresses in text that may be an HTML fragment to links, while preserving:
-
-    1. links already in the string
-    2. urls found in attributes
-    3. email addresses
-
-    linkify does a best-effort approach and tries to recover from bad
-    situations due to crazy text.
-
-    .. Note::
-
-       If you're linking a lot of text and passing the same argument values or
-       you want more configurability, consider using a
-       :py:class:`bleach.linkifier.Linker` instance.
-
-    .. Note::
-
-       If you have text that you want to clean and then linkify, consider using
-       the :py:class:`bleach.linkifier.LinkifyFilter` as a filter in the clean
-       pass. That way you're not parsing the HTML twice.
-
-    :arg str text: the text to linkify
-
-    :arg list callbacks: list of callbacks to run when adjusting tag attributes;
-        defaults to ``bleach.linkifier.DEFAULT_CALLBACKS``
-
-    :arg list skip_tags: list of tags that you don't want to linkify the
-        contents of; for example, you could set this to ``['pre']`` to skip
-        linkifying contents of ``pre`` tags
-
-    :arg bool parse_email: whether or not to linkify email addresses
-
-    :returns: linkified text as unicode
-
-    """
-    linker = Linker(callbacks=callbacks, skip_tags=skip_tags, parse_email=parse_email)
-    return linker.linkify(text)
diff --git a/lib/bleach/_vendor/README.rst b/lib/bleach/_vendor/README.rst
deleted file mode 100644
index e53aede0..00000000
--- a/lib/bleach/_vendor/README.rst
+++ /dev/null
@@ -1,61 +0,0 @@
-=======================
-Vendored library policy
-=======================
-
-To simplify Bleach development, we're now vendoring certain libraries that
-we use.
-
-Vendored libraries must follow these rules:
-
-1. Vendored libraries must be pure Python--no compiling.
-2. Source code for the libary is included in this directory.
-3. License must be included in this repo and in the Bleach distribution.
-4. Requirements of the library become requirements of Bleach.
-5. No modifications to the library may be made.
-
-
-Adding/Updating a vendored library
-==================================
-
-Way to vendor a library or update a version:
-
-1. Update ``vendor.txt`` with the library, version, and hash. You can use
-   `hashin <https://pypi.org/project/hashin/>`_.
-2. Remove all old files and directories of the old version.
-3. Run ``pip_install_vendor.sh`` and check everything it produced in including
-   the ``.dist-info`` directory and contents.
-4. Update the bleach minor version in the next release.
-
-
-Reviewing a change involving a vendored library
-===============================================
-
-Way to verify a vendored library addition/update:
-
-1. Pull down the branch.
-2. Delete all the old files and directories of the old version.
-3. Run ``pip_install_vendor.sh``.
-4. Run ``git diff`` and verify there are no changes.
-
-
-NB: the current ``vendor.txt`` was generated with pip 20.2.3, which might be necessary to reproduce the dist-info
-
-
-Removing/Unvendoring a vendored library
-=======================================
-
-A vendored library might be removed for any of the following reasons:
-
-* it violates the vendoring policy (e.g. an incompatible license
-  change)
-* a suitable replacement is found
-* bleach has the resources to test and QA new bleach releases against
-  multiple versions of the previously vendored library
-
-To unvendor a library:
-
-1. Remove the library and its hashes from ``vendor.txt``.
-2. Remove library files and directories from this directory.
-3. Run ``install_vendor.sh`` and check the previously vendored library including
-   the ``.dist-info`` directory and contents is not installed.
-4. Update the bleach minor version in the next release.
diff --git a/lib/bleach/_vendor/html5lib-1.1.dist-info/AUTHORS.rst b/lib/bleach/_vendor/html5lib-1.1.dist-info/AUTHORS.rst
deleted file mode 100644
index 90401390..00000000
--- a/lib/bleach/_vendor/html5lib-1.1.dist-info/AUTHORS.rst
+++ /dev/null
@@ -1,66 +0,0 @@
-Credits
-=======
-
-``html5lib`` is written and maintained by:
-
-- James Graham
-- Sam Sneddon
-- �ukasz Langa
-- Will Kahn-Greene
-
-
-Patches and suggestions
------------------------
-(In chronological order, by first commit:)
-
-- Anne van Kesteren
-- Lachlan Hunt
-- lantis63
-- Sam Ruby
-- Thomas Broyer
-- Tim Fletcher
-- Mark Pilgrim
-- Ryan King
-- Philip Taylor
-- Edward Z. Yang
-- fantasai
-- Philip Jägenstedt
-- Ms2ger
-- Mohammad Taha Jahangir
-- Andy Wingo
-- Andreas Madsack
-- Karim Valiev
-- Juan Carlos Garcia Segovia
-- Mike West
-- Marc DM
-- Simon Sapin
-- Michael[tm] Smith
-- Ritwik Gupta
-- Marc Abramowitz
-- Tony Lopes
-- lilbludevil
-- Kevin
-- Drew Hubl
-- Austin Kumbera
-- Jim Baker
-- Jon Dufresne
-- Donald Stufft
-- Alex Gaynor
-- Nik Nyby
-- Jakub Wilk
-- Sigmund Cherem
-- Gabi Davar
-- Florian Mounier
-- neumond
-- Vitalik Verhovodov
-- Kovid Goyal
-- Adam Chainz
-- John Vandenberg
-- Eric Amorde
-- Benedikt Morbach
-- Jonathan Vanasco
-- Tom Most
-- Ville Skyttä
-- Hugo van Kemenade
-- Mark Vasilkov
-
diff --git a/lib/bleach/_vendor/html5lib-1.1.dist-info/INSTALLER b/lib/bleach/_vendor/html5lib-1.1.dist-info/INSTALLER
deleted file mode 100644
index a1b589e3..00000000
--- a/lib/bleach/_vendor/html5lib-1.1.dist-info/INSTALLER
+++ /dev/null
@@ -1 +0,0 @@
-pip
diff --git a/lib/bleach/_vendor/html5lib-1.1.dist-info/LICENSE b/lib/bleach/_vendor/html5lib-1.1.dist-info/LICENSE
deleted file mode 100644
index c87fa7a0..00000000
--- a/lib/bleach/_vendor/html5lib-1.1.dist-info/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2006-2013 James Graham and other contributors
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lib/bleach/_vendor/html5lib-1.1.dist-info/METADATA b/lib/bleach/_vendor/html5lib-1.1.dist-info/METADATA
deleted file mode 100644
index ee83c1f8..00000000
--- a/lib/bleach/_vendor/html5lib-1.1.dist-info/METADATA
+++ /dev/null
@@ -1,552 +0,0 @@
-Metadata-Version: 2.1
-Name: html5lib
-Version: 1.1
-Summary: HTML parser based on the WHATWG HTML specification
-Home-page: https://github.com/html5lib/html5lib-python
-Maintainer: James Graham
-Maintainer-email: james@hoppipolla.co.uk
-License: MIT License
-Platform: UNKNOWN
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.5
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: Implementation :: CPython
-Classifier: Programming Language :: Python :: Implementation :: PyPy
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Topic :: Text Processing :: Markup :: HTML
-Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
-Requires-Dist: six (>=1.9)
-Requires-Dist: webencodings
-Provides-Extra: all
-Requires-Dist: genshi ; extra == 'all'
-Requires-Dist: chardet (>=2.2) ; extra == 'all'
-Requires-Dist: lxml ; (platform_python_implementation == 'CPython') and extra == 'all'
-Provides-Extra: chardet
-Requires-Dist: chardet (>=2.2) ; extra == 'chardet'
-Provides-Extra: genshi
-Requires-Dist: genshi ; extra == 'genshi'
-Provides-Extra: lxml
-Requires-Dist: lxml ; (platform_python_implementation == 'CPython') and extra == 'lxml'
-
-html5lib
-========
-
-.. image:: https://travis-ci.org/html5lib/html5lib-python.svg?branch=master
-    :target: https://travis-ci.org/html5lib/html5lib-python
-
-
-html5lib is a pure-python library for parsing HTML. It is designed to
-conform to the WHATWG HTML specification, as is implemented by all major
-web browsers.
-
-
-Usage
------
-
-Simple usage follows this pattern:
-
-.. code-block:: python
-
-  import html5lib
-  with open("mydocument.html", "rb") as f:
-      document = html5lib.parse(f)
-
-or:
-
-.. code-block:: python
-
-  import html5lib
-  document = html5lib.parse("<p>Hello World!")
-
-By default, the ``document`` will be an ``xml.etree`` element instance.
-Whenever possible, html5lib chooses the accelerated ``ElementTree``
-implementation (i.e. ``xml.etree.cElementTree`` on Python 2.x).
-
-Two other tree types are supported: ``xml.dom.minidom`` and
-``lxml.etree``. To use an alternative format, specify the name of
-a treebuilder:
-
-.. code-block:: python
-
-  import html5lib
-  with open("mydocument.html", "rb") as f:
-      lxml_etree_document = html5lib.parse(f, treebuilder="lxml")
-
-When using with ``urllib2`` (Python 2), the charset from HTTP should be
-pass into html5lib as follows:
-
-.. code-block:: python
-
-  from contextlib import closing
-  from urllib2 import urlopen
-  import html5lib
-
-  with closing(urlopen("http://example.com/")) as f:
-      document = html5lib.parse(f, transport_encoding=f.info().getparam("charset"))
-
-When using with ``urllib.request`` (Python 3), the charset from HTTP
-should be pass into html5lib as follows:
-
-.. code-block:: python
-
-  from urllib.request import urlopen
-  import html5lib
-
-  with urlopen("http://example.com/") as f:
-      document = html5lib.parse(f, transport_encoding=f.info().get_content_charset())
-
-To have more control over the parser, create a parser object explicitly.
-For instance, to make the parser raise exceptions on parse errors, use:
-
-.. code-block:: python
-
-  import html5lib
-  with open("mydocument.html", "rb") as f:
-      parser = html5lib.HTMLParser(strict=True)
-      document = parser.parse(f)
-
-When you're instantiating parser objects explicitly, pass a treebuilder
-class as the ``tree`` keyword argument to use an alternative document
-format:
-
-.. code-block:: python
-
-  import html5lib
-  parser = html5lib.HTMLParser(tree=html5lib.getTreeBuilder("dom"))
-  minidom_document = parser.parse("<p>Hello World!")
-
-More documentation is available at https://html5lib.readthedocs.io/.
-
-
-Installation
-------------
-
-html5lib works on CPython 2.7+, CPython 3.5+ and PyPy. To install:
-
-.. code-block:: bash
-
-    $ pip install html5lib
-
-The goal is to support a (non-strict) superset of the versions that `pip
-supports
-<https://pip.pypa.io/en/stable/installing/#python-and-os-compatibility>`_.
-
-Optional Dependencies
----------------------
-
-The following third-party libraries may be used for additional
-functionality:
-
-- ``lxml`` is supported as a tree format (for both building and
-  walking) under CPython (but *not* PyPy where it is known to cause
-  segfaults);
-
-- ``genshi`` has a treewalker (but not builder); and
-
-- ``chardet`` can be used as a fallback when character encoding cannot
-  be determined.
-
-
-Bugs
-----
-
-Please report any bugs on the `issue tracker
-<https://github.com/html5lib/html5lib-python/issues>`_.
-
-
-Tests
------
-
-Unit tests require the ``pytest`` and ``mock`` libraries and can be
-run using the ``py.test`` command in the root directory.
-
-Test data are contained in a separate `html5lib-tests
-<https://github.com/html5lib/html5lib-tests>`_ repository and included
-as a submodule, thus for git checkouts they must be initialized::
-
-  $ git submodule init
-  $ git submodule update
-
-If you have all compatible Python implementations available on your
-system, you can run tests on all of them using the ``tox`` utility,
-which can be found on PyPI.
-
-
-Questions?
-----------
-
-There's a mailing list available for support on Google Groups,
-`html5lib-discuss <http://groups.google.com/group/html5lib-discuss>`_,
-though you may get a quicker response asking on IRC in `#whatwg on
-irc.freenode.net <http://wiki.whatwg.org/wiki/IRC>`_.
-
-Change Log
-----------
-
-1.1
-~~~
-
-UNRELEASED
-
-Breaking changes:
-
-* Drop support for Python 3.3. (#358)
-* Drop support for Python 3.4. (#421)
-
-Deprecations:
-
-* Deprecate the ``html5lib`` sanitizer (``html5lib.serialize(sanitize=True)`` and
-  ``html5lib.filters.sanitizer``). We recommend users migrate to `Bleach
-  <https://github.com/mozilla/bleach>`. Please let us know if Bleach doesn't suffice for your
-  use. (#443)
-
-Other changes:
-
-* Try to import from ``collections.abc`` to remove DeprecationWarning and ensure
-  ``html5lib`` keeps working in future Python versions. (#403)
-* Drop optional ``datrie`` dependency. (#442)
-
-
-1.0.1
-~~~~~
-
-Released on December 7, 2017
-
-Breaking changes:
-
-* Drop support for Python 2.6. (#330) (Thank you, Hugo, Will Kahn-Greene!)
-* Remove ``utils/spider.py`` (#353) (Thank you, Jon Dufresne!)
-
-Features:
-
-* Improve documentation. (#300, #307) (Thank you, Jon Dufresne, Tom Most,
-  Will Kahn-Greene!)
-* Add iframe seamless boolean attribute. (Thank you, Ritwik Gupta!)
-* Add itemscope as a boolean attribute. (#194) (Thank you, Jonathan Vanasco!)
-* Support Python 3.6. (#333) (Thank you, Jon Dufresne!)
-* Add CI support for Windows using AppVeyor. (Thank you, John Vandenberg!)
-* Improve testing and CI and add code coverage (#323, #334), (Thank you, Jon
-  Dufresne, John Vandenberg, Sam Sneddon, Will Kahn-Greene!)
-* Semver-compliant version number.
-
-Bug fixes:
-
-* Add support for setuptools < 18.5 to support environment markers. (Thank you,
-  John Vandenberg!)
-* Add explicit dependency for six >= 1.9. (Thank you, Eric Amorde!)
-* Fix regexes to work with Python 3.7 regex adjustments. (#318, #379) (Thank
-  you, Benedikt Morbach, Ville Skyttä, Mark Vasilkov!)
-* Fix alphabeticalattributes filter namespace bug. (#324) (Thank you, Will
-  Kahn-Greene!)
-* Include license file in generated wheel package. (#350) (Thank you, Jon
-  Dufresne!)
-* Fix annotation-xml typo. (#339) (Thank you, Will Kahn-Greene!)
-* Allow uppercase hex chararcters in CSS colour check. (#377) (Thank you,
-  Komal Dembla, Hugo!)
-
-
-1.0
-~~~
-
-Released and unreleased on December 7, 2017. Badly packaged release.
-
-
-0.999999999/1.0b10
-~~~~~~~~~~~~~~~~~~
-
-Released on July 15, 2016
-
-* Fix attribute order going to the tree builder to be document order
-  instead of reverse document order(!).
-
-
-0.99999999/1.0b9
-~~~~~~~~~~~~~~~~
-
-Released on July 14, 2016
-
-* **Added ordereddict as a mandatory dependency on Python 2.6.**
-
-* Added ``lxml``, ``genshi``, ``datrie``, ``charade``, and ``all``
-  extras that will do the right thing based on the specific
-  interpreter implementation.
-
-* Now requires the ``mock`` package for the testsuite.
-
-* Cease supporting DATrie under PyPy.
-
-* **Remove PullDOM support, as this hasn't ever been properly
-  tested, doesn't entirely work, and as far as I can tell is
-  completely unused by anyone.**
-
-* Move testsuite to ``py.test``.
-
-* **Fix #124: move to webencodings for decoding the input byte stream;
-  this makes html5lib compliant with the Encoding Standard, and
-  introduces a required dependency on webencodings.**
-
-* **Cease supporting Python 3.2 (in both CPython and PyPy forms).**
-
-* **Fix comments containing double-dash with lxml 3.5 and above.**
-
-* **Use scripting disabled by default (as we don't implement
-  scripting).**
-
-* **Fix #11, avoiding the XSS bug potentially caused by serializer
-  allowing attribute values to be escaped out of in old browser versions,
-  changing the quote_attr_values option on serializer to take one of
-  three values, "always" (the old True value), "legacy" (the new option,
-  and the new default), and "spec" (the old False value, and the old
-  default).**
-
-* **Fix #72 by rewriting the sanitizer to apply only to treewalkers
-  (instead of the tokenizer); as such, this will require amending all
-  callers of it to use it via the treewalker API.**
-
-* **Drop support of charade, now that chardet is supported once more.**
-
-* **Replace the charset keyword argument on parse and related methods
-  with a set of keyword arguments: override_encoding, transport_encoding,
-  same_origin_parent_encoding, likely_encoding, and default_encoding.**
-
-* **Move filters._base, treebuilder._base, and treewalkers._base to .base
-  to clarify their status as public.**
-
-* **Get rid of the sanitizer package. Merge sanitizer.sanitize into the
-  sanitizer.htmlsanitizer module and move that to sanitizer. This means
-  anyone who used sanitizer.sanitize or sanitizer.HTMLSanitizer needs no
-  code changes.**
-
-* **Rename treewalkers.lxmletree to .etree_lxml and
-  treewalkers.genshistream to .genshi to have a consistent API.**
-
-* Move a whole load of stuff (inputstream, ihatexml, trie, tokenizer,
-  utils) to be underscore prefixed to clarify their status as private.
-
-
-0.9999999/1.0b8
-~~~~~~~~~~~~~~~
-
-Released on September 10, 2015
-
-* Fix #195: fix the sanitizer to drop broken URLs (it threw an
-  exception between 0.9999 and 0.999999).
-
-
-0.999999/1.0b7
-~~~~~~~~~~~~~~
-
-Released on July 7, 2015
-
-* Fix #189: fix the sanitizer to allow relative URLs again (as it did
-  prior to 0.9999/1.0b5).
-
-
-0.99999/1.0b6
-~~~~~~~~~~~~~
-
-Released on April 30, 2015
-
-* Fix #188: fix the sanitizer to not throw an exception when sanitizing
-  bogus data URLs.
-
-
-0.9999/1.0b5
-~~~~~~~~~~~~
-
-Released on April 29, 2015
-
-* Fix #153: Sanitizer fails to treat some attributes as URLs. Despite how
-  this sounds, this has no known security implications.  No known version
-  of IE (5.5 to current), Firefox (3 to current), Safari (6 to current),
-  Chrome (1 to current), or Opera (12 to current) will run any script
-  provided in these attributes.
-
-* Pass error message to the ParseError exception in strict parsing mode.
-
-* Allow data URIs in the sanitizer, with a whitelist of content-types.
-
-* Add support for Python implementations that don't support lone
-  surrogates (read: Jython). Fixes #2.
-
-* Remove localization of error messages. This functionality was totally
-  unused (and untested that everything was localizable), so we may as
-  well follow numerous browsers in not supporting translating technical
-  strings.
-
-* Expose treewalkers.pprint as a public API.
-
-* Add a documentEncoding property to HTML5Parser, fix #121.
-
-
-0.999
-~~~~~
-
-Released on December 23, 2013
-
-* Fix #127: add work-around for CPython issue #20007: .read(0) on
-  http.client.HTTPResponse drops the rest of the content.
-
-* Fix #115: lxml treewalker can now deal with fragments containing, at
-  their root level, text nodes with non-ASCII characters on Python 2.
-
-
-0.99
-~~~~
-
-Released on September 10, 2013
-
-* No library changes from 1.0b3; released as 0.99 as pip has changed
-  behaviour from 1.4 to avoid installing pre-release versions per
-  PEP 440.
-
-
-1.0b3
-~~~~~
-
-Released on July 24, 2013
-
-* Removed ``RecursiveTreeWalker`` from ``treewalkers._base``. Any
-  implementation using it should be moved to
-  ``NonRecursiveTreeWalker``, as everything bundled with html5lib has
-  for years.
-
-* Fix #67 so that ``BufferedStream`` to correctly returns a bytes
-  object, thereby fixing any case where html5lib is passed a
-  non-seekable RawIOBase-like object.
-
-
-1.0b2
-~~~~~
-
-Released on June 27, 2013
-
-* Removed reordering of attributes within the serializer. There is now
-  an ``alphabetical_attributes`` option which preserves the previous
-  behaviour through a new filter. This allows attribute order to be
-  preserved through html5lib if the tree builder preserves order.
-
-* Removed ``dom2sax`` from DOM treebuilders. It has been replaced by
-  ``treeadapters.sax.to_sax`` which is generic and supports any
-  treewalker; it also resolves all known bugs with ``dom2sax``.
-
-* Fix treewalker assertions on hitting bytes strings on
-  Python 2. Previous to 1.0b1, treewalkers coped with mixed
-  bytes/unicode data on Python 2; this reintroduces this prior
-  behaviour on Python 2. Behaviour is unchanged on Python 3.
-
-
-1.0b1
-~~~~~
-
-Released on May 17, 2013
-
-* Implementation updated to implement the `HTML specification
-  <http://www.whatwg.org/specs/web-apps/current-work/>`_ as of 5th May
-  2013 (`SVN <http://svn.whatwg.org/webapps/>`_ revision r7867).
-
-* Python 3.2+ supported in a single codebase using the ``six`` library.
-
-* Removed support for Python 2.5 and older.
-
-* Removed the deprecated Beautiful Soup 3 treebuilder.
-  ``beautifulsoup4`` can use ``html5lib`` as a parser instead. Note that
-  since it doesn't support namespaces, foreign content like SVG and
-  MathML is parsed incorrectly.
-
-* Removed ``simpletree`` from the package. The default tree builder is
-  now ``etree`` (using the ``xml.etree.cElementTree`` implementation if
-  available, and ``xml.etree.ElementTree`` otherwise).
-
-* Removed the ``XHTMLSerializer`` as it never actually guaranteed its
-  output was well-formed XML, and hence provided little of use.
-
-* Removed default DOM treebuilder, so ``html5lib.treebuilders.dom`` is no
-  longer supported. ``html5lib.treebuilders.getTreeBuilder("dom")`` will
-  return the default DOM treebuilder, which uses ``xml.dom.minidom``.
-
-* Optional heuristic character encoding detection now based on
-  ``charade`` for Python 2.6 - 3.3 compatibility.
-
-* Optional ``Genshi`` treewalker support fixed.
-
-* Many bugfixes, including:
-
-  * #33: null in attribute value breaks XML AttValue;
-
-  * #4: nested, indirect descendant, <button> causes infinite loop;
-
-  * `Google Code 215
-    <http://code.google.com/p/html5lib/issues/detail?id=215>`_: Properly
-    detect seekable streams;
-
-  * `Google Code 206
-    <http://code.google.com/p/html5lib/issues/detail?id=206>`_: add
-    support for <video preload=...>, <audio preload=...>;
-
-  * `Google Code 205
-    <http://code.google.com/p/html5lib/issues/detail?id=205>`_: add
-    support for <video poster=...>;
-
-  * `Google Code 202
-    <http://code.google.com/p/html5lib/issues/detail?id=202>`_: Unicode
-    file breaks InputStream.
-
-* Source code is now mostly PEP 8 compliant.
-
-* Test harness has been improved and now depends on ``nose``.
-
-* Documentation updated and moved to https://html5lib.readthedocs.io/.
-
-
-0.95
-~~~~
-
-Released on February 11, 2012
-
-
-0.90
-~~~~
-
-Released on January 17, 2010
-
-
-0.11.1
-~~~~~~
-
-Released on June 12, 2008
-
-
-0.11
-~~~~
-
-Released on June 10, 2008
-
-
-0.10
-~~~~
-
-Released on October 7, 2007
-
-
-0.9
-~~~
-
-Released on March 11, 2007
-
-
-0.2
-~~~
-
-Released on January 8, 2007
-
-
diff --git a/lib/bleach/_vendor/html5lib-1.1.dist-info/RECORD b/lib/bleach/_vendor/html5lib-1.1.dist-info/RECORD
deleted file mode 100644
index cabdc1de..00000000
--- a/lib/bleach/_vendor/html5lib-1.1.dist-info/RECORD
+++ /dev/null
@@ -1,41 +0,0 @@
-html5lib-1.1.dist-info/AUTHORS.rst,sha256=DrNAMifoDpuQyJn-KW-H6K8Tt2a5rKnV2UF4-DRrGUI,983
-html5lib-1.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-html5lib-1.1.dist-info/LICENSE,sha256=FqOZkWGekvGGgJMtoqkZn999ld8-yu3FLqBiGKq6_W8,1084
-html5lib-1.1.dist-info/METADATA,sha256=Y3w-nd_22HQnQRy3yypVsV_ke2FF94uUD4-vGpc2DnI,16076
-html5lib-1.1.dist-info/RECORD,,
-html5lib-1.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-html5lib-1.1.dist-info/WHEEL,sha256=kGT74LWyRUZrL4VgLh6_g12IeVl_9u9ZVhadrgXZUEY,110
-html5lib-1.1.dist-info/top_level.txt,sha256=XEX6CHpskSmvjJB4tP6m4Q5NYXhIf_0ceMc0PNbzJPQ,9
-html5lib/__init__.py,sha256=pWnYcfZ69wNLrdQL7bpr49FUi8O8w0KhKCOHsyRgYGQ,1143
-html5lib/_ihatexml.py,sha256=ifOwF7pXqmyThIXc3boWc96s4MDezqRrRVp7FwDYUFs,16728
-html5lib/_inputstream.py,sha256=IKuMiY8rzb7pqIGCpbvTqsxysLEpgEHWYvYEFu4LUAI,32300
-html5lib/_tokenizer.py,sha256=WvJQa2Mli4NtTmhLXkX8Jy5FcWttqCaiDTiKyaw8D-k,77028
-html5lib/_trie/__init__.py,sha256=nqfgO910329BEVJ5T4psVwQtjd2iJyEXQ2-X8c1YxwU,109
-html5lib/_trie/_base.py,sha256=CaybYyMro8uERQYjby2tTeSUatnWDfWroUN9N7ety5w,1013
-html5lib/_trie/py.py,sha256=zg7RZSHxJ8mLmuI_7VEIV8AomISrgkvqCP477AgXaG0,1763
-html5lib/_utils.py,sha256=AxAJSG15eyarCgKMnlUwzs1X6jFHXqEvhlYEOxAFmis,4919
-html5lib/constants.py,sha256=Ll-yzLU_jcjyAI_h57zkqZ7aQWE5t5xA4y_jQgoUUhw,83464
-html5lib/filters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-html5lib/filters/alphabeticalattributes.py,sha256=lViZc2JMCclXi_5gduvmdzrRxtO5Xo9ONnbHBVCsykU,919
-html5lib/filters/base.py,sha256=z-IU9ZAYjpsVsqmVt7kuWC63jR11hDMr6CVrvuao8W0,286
-html5lib/filters/inject_meta_charset.py,sha256=egDXUEHXmAG9504xz0K6ALDgYkvUrC2q15YUVeNlVQg,2945
-html5lib/filters/lint.py,sha256=upXATs6By7cot7o0bnNqR15sPq2Fn6Vnjvoy3gyO_rY,3631
-html5lib/filters/optionaltags.py,sha256=8lWT75J0aBOHmPgfmqTHSfPpPMp01T84NKu0CRedxcE,10588
-html5lib/filters/sanitizer.py,sha256=XGNSdzIqDTaHot1V-rRj1V_XOolApJ7n95tHP9JcgNU,26885
-html5lib/filters/whitespace.py,sha256=8eWqZxd4UC4zlFGW6iyY6f-2uuT8pOCSALc3IZt7_t4,1214
-html5lib/html5parser.py,sha256=w5hZJh0cvD3g4CS196DiTmuGpSKCMYe1GS46-yf_WZQ,117174
-html5lib/serializer.py,sha256=K2kfoLyMPMFPfdusfR30SrxNkf0mJB92-P5_RntyaaI,15747
-html5lib/treeadapters/__init__.py,sha256=18hyI-at2aBsdKzpwRwa5lGF1ipgctaTYXoU9En2ZQg,650
-html5lib/treeadapters/genshi.py,sha256=CH27pAsDKmu4ZGkAUrwty7u0KauGLCZRLPMzaO3M5vo,1715
-html5lib/treeadapters/sax.py,sha256=BKS8woQTnKiqeffHsxChUqL4q2ZR_wb5fc9MJ3zQC8s,1776
-html5lib/treebuilders/__init__.py,sha256=AysSJyvPfikCMMsTVvaxwkgDieELD5dfR8FJIAuq7hY,3592
-html5lib/treebuilders/base.py,sha256=oeZNGEB-kt90YJGVH05gb5a8E7ids2AbYwGRsVCieWk,14553
-html5lib/treebuilders/dom.py,sha256=22whb0C71zXIsai5mamg6qzBEiigcBIvaDy4Asw3at0,8925
-html5lib/treebuilders/etree.py,sha256=EbmHx-wQ-11MVucTPtF7Ul92-mQGN3Udu_KfDn-Ifhk,12824
-html5lib/treebuilders/etree_lxml.py,sha256=OazDHZGO_q4FnVs4Dhs4hzzn2JwGAOs-rfV8LAlUGW4,14754
-html5lib/treewalkers/__init__.py,sha256=OBPtc1TU5mGyy18QDMxKEyYEz0wxFUUNj5v0-XgmYhY,5719
-html5lib/treewalkers/base.py,sha256=ouiOsuSzvI0KgzdWP8PlxIaSNs9falhbiinAEc_UIJY,7476
-html5lib/treewalkers/dom.py,sha256=EHyFR8D8lYNnyDU9lx_IKigVJRyecUGua0mOi7HBukc,1413
-html5lib/treewalkers/etree.py,sha256=gkD4tfEfRWPsEGvgHHJxZmKZXUvBzVVGz3v5C_MIiOE,4539
-html5lib/treewalkers/etree_lxml.py,sha256=eLedbn6nPjlpebibsWVijey7WEpzDwxU3ubwUoudBuA,6345
-html5lib/treewalkers/genshi.py,sha256=4D2PECZ5n3ZN3qu3jMl9yY7B81jnQApBQSVlfaIuYbA,2309
diff --git a/lib/bleach/_vendor/html5lib-1.1.dist-info/REQUESTED b/lib/bleach/_vendor/html5lib-1.1.dist-info/REQUESTED
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/bleach/_vendor/html5lib-1.1.dist-info/WHEEL b/lib/bleach/_vendor/html5lib-1.1.dist-info/WHEEL
deleted file mode 100644
index ef99c6cf..00000000
--- a/lib/bleach/_vendor/html5lib-1.1.dist-info/WHEEL
+++ /dev/null
@@ -1,6 +0,0 @@
-Wheel-Version: 1.0
-Generator: bdist_wheel (0.34.2)
-Root-Is-Purelib: true
-Tag: py2-none-any
-Tag: py3-none-any
-
diff --git a/lib/bleach/_vendor/html5lib-1.1.dist-info/top_level.txt b/lib/bleach/_vendor/html5lib-1.1.dist-info/top_level.txt
deleted file mode 100644
index 6bcef8ab..00000000
--- a/lib/bleach/_vendor/html5lib-1.1.dist-info/top_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-html5lib
diff --git a/lib/bleach/_vendor/html5lib/__init__.py b/lib/bleach/_vendor/html5lib/__init__.py
deleted file mode 100644
index 320e0c3b..00000000
--- a/lib/bleach/_vendor/html5lib/__init__.py
+++ /dev/null
@@ -1,35 +0,0 @@
-"""
-HTML parsing library based on the `WHATWG HTML specification
-<https://whatwg.org/html>`_. The parser is designed to be compatible with
-existing HTML found in the wild and implements well-defined error recovery that
-is largely compatible with modern desktop web browsers.
-
-Example usage::
-
-    import html5lib
-    with open("my_document.html", "rb") as f:
-        tree = html5lib.parse(f)
-
-For convenience, this module re-exports the following names:
-
-* :func:`~.html5parser.parse`
-* :func:`~.html5parser.parseFragment`
-* :class:`~.html5parser.HTMLParser`
-* :func:`~.treebuilders.getTreeBuilder`
-* :func:`~.treewalkers.getTreeWalker`
-* :func:`~.serializer.serialize`
-"""
-
-from __future__ import absolute_import, division, unicode_literals
-
-from .html5parser import HTMLParser, parse, parseFragment
-from .treebuilders import getTreeBuilder
-from .treewalkers import getTreeWalker
-from .serializer import serialize
-
-__all__ = ["HTMLParser", "parse", "parseFragment", "getTreeBuilder",
-           "getTreeWalker", "serialize"]
-
-# this has to be at the top level, see how setup.py parses this
-#: Distribution version number.
-__version__ = "1.1"
diff --git a/lib/bleach/_vendor/html5lib/_ihatexml.py b/lib/bleach/_vendor/html5lib/_ihatexml.py
deleted file mode 100644
index 3ff803c1..00000000
--- a/lib/bleach/_vendor/html5lib/_ihatexml.py
+++ /dev/null
@@ -1,289 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-import re
-import warnings
-
-from .constants import DataLossWarning
-
-baseChar = """
-[#x0041-#x005A] | [#x0061-#x007A] | [#x00C0-#x00D6] | [#x00D8-#x00F6] |
-[#x00F8-#x00FF] | [#x0100-#x0131] | [#x0134-#x013E] | [#x0141-#x0148] |
-[#x014A-#x017E] | [#x0180-#x01C3] | [#x01CD-#x01F0] | [#x01F4-#x01F5] |
-[#x01FA-#x0217] | [#x0250-#x02A8] | [#x02BB-#x02C1] | #x0386 |
-[#x0388-#x038A] | #x038C | [#x038E-#x03A1] | [#x03A3-#x03CE] |
-[#x03D0-#x03D6] | #x03DA | #x03DC | #x03DE | #x03E0 | [#x03E2-#x03F3] |
-[#x0401-#x040C] | [#x040E-#x044F] | [#x0451-#x045C] | [#x045E-#x0481] |
-[#x0490-#x04C4] | [#x04C7-#x04C8] | [#x04CB-#x04CC] | [#x04D0-#x04EB] |
-[#x04EE-#x04F5] | [#x04F8-#x04F9] | [#x0531-#x0556] | #x0559 |
-[#x0561-#x0586] | [#x05D0-#x05EA] | [#x05F0-#x05F2] | [#x0621-#x063A] |
-[#x0641-#x064A] | [#x0671-#x06B7] | [#x06BA-#x06BE] | [#x06C0-#x06CE] |
-[#x06D0-#x06D3] | #x06D5 | [#x06E5-#x06E6] | [#x0905-#x0939] | #x093D |
-[#x0958-#x0961] | [#x0985-#x098C] | [#x098F-#x0990] | [#x0993-#x09A8] |
-[#x09AA-#x09B0] | #x09B2 | [#x09B6-#x09B9] | [#x09DC-#x09DD] |
-[#x09DF-#x09E1] | [#x09F0-#x09F1] | [#x0A05-#x0A0A] | [#x0A0F-#x0A10] |
-[#x0A13-#x0A28] | [#x0A2A-#x0A30] | [#x0A32-#x0A33] | [#x0A35-#x0A36] |
-[#x0A38-#x0A39] | [#x0A59-#x0A5C] | #x0A5E | [#x0A72-#x0A74] |
-[#x0A85-#x0A8B] | #x0A8D | [#x0A8F-#x0A91] | [#x0A93-#x0AA8] |
-[#x0AAA-#x0AB0] | [#x0AB2-#x0AB3] | [#x0AB5-#x0AB9] | #x0ABD | #x0AE0 |
-[#x0B05-#x0B0C] | [#x0B0F-#x0B10] | [#x0B13-#x0B28] | [#x0B2A-#x0B30] |
-[#x0B32-#x0B33] | [#x0B36-#x0B39] | #x0B3D | [#x0B5C-#x0B5D] |
-[#x0B5F-#x0B61] | [#x0B85-#x0B8A] | [#x0B8E-#x0B90] | [#x0B92-#x0B95] |
-[#x0B99-#x0B9A] | #x0B9C | [#x0B9E-#x0B9F] | [#x0BA3-#x0BA4] |
-[#x0BA8-#x0BAA] | [#x0BAE-#x0BB5] | [#x0BB7-#x0BB9] | [#x0C05-#x0C0C] |
-[#x0C0E-#x0C10] | [#x0C12-#x0C28] | [#x0C2A-#x0C33] | [#x0C35-#x0C39] |
-[#x0C60-#x0C61] | [#x0C85-#x0C8C] | [#x0C8E-#x0C90] | [#x0C92-#x0CA8] |
-[#x0CAA-#x0CB3] | [#x0CB5-#x0CB9] | #x0CDE | [#x0CE0-#x0CE1] |
-[#x0D05-#x0D0C] | [#x0D0E-#x0D10] | [#x0D12-#x0D28] | [#x0D2A-#x0D39] |
-[#x0D60-#x0D61] | [#x0E01-#x0E2E] | #x0E30 | [#x0E32-#x0E33] |
-[#x0E40-#x0E45] | [#x0E81-#x0E82] | #x0E84 | [#x0E87-#x0E88] | #x0E8A |
-#x0E8D | [#x0E94-#x0E97] | [#x0E99-#x0E9F] | [#x0EA1-#x0EA3] | #x0EA5 |
-#x0EA7 | [#x0EAA-#x0EAB] | [#x0EAD-#x0EAE] | #x0EB0 | [#x0EB2-#x0EB3] |
-#x0EBD | [#x0EC0-#x0EC4] | [#x0F40-#x0F47] | [#x0F49-#x0F69] |
-[#x10A0-#x10C5] | [#x10D0-#x10F6] | #x1100 | [#x1102-#x1103] |
-[#x1105-#x1107] | #x1109 | [#x110B-#x110C] | [#x110E-#x1112] | #x113C |
-#x113E | #x1140 | #x114C | #x114E | #x1150 | [#x1154-#x1155] | #x1159 |
-[#x115F-#x1161] | #x1163 | #x1165 | #x1167 | #x1169 | [#x116D-#x116E] |
-[#x1172-#x1173] | #x1175 | #x119E | #x11A8 | #x11AB | [#x11AE-#x11AF] |
-[#x11B7-#x11B8] | #x11BA | [#x11BC-#x11C2] | #x11EB | #x11F0 | #x11F9 |
-[#x1E00-#x1E9B] | [#x1EA0-#x1EF9] | [#x1F00-#x1F15] | [#x1F18-#x1F1D] |
-[#x1F20-#x1F45] | [#x1F48-#x1F4D] | [#x1F50-#x1F57] | #x1F59 | #x1F5B |
-#x1F5D | [#x1F5F-#x1F7D] | [#x1F80-#x1FB4] | [#x1FB6-#x1FBC] | #x1FBE |
-[#x1FC2-#x1FC4] | [#x1FC6-#x1FCC] | [#x1FD0-#x1FD3] | [#x1FD6-#x1FDB] |
-[#x1FE0-#x1FEC] | [#x1FF2-#x1FF4] | [#x1FF6-#x1FFC] | #x2126 |
-[#x212A-#x212B] | #x212E | [#x2180-#x2182] | [#x3041-#x3094] |
-[#x30A1-#x30FA] | [#x3105-#x312C] | [#xAC00-#xD7A3]"""
-
-ideographic = """[#x4E00-#x9FA5] | #x3007 | [#x3021-#x3029]"""
-
-combiningCharacter = """
-[#x0300-#x0345] | [#x0360-#x0361] | [#x0483-#x0486] | [#x0591-#x05A1] |
-[#x05A3-#x05B9] | [#x05BB-#x05BD] | #x05BF | [#x05C1-#x05C2] | #x05C4 |
-[#x064B-#x0652] | #x0670 | [#x06D6-#x06DC] | [#x06DD-#x06DF] |
-[#x06E0-#x06E4] | [#x06E7-#x06E8] | [#x06EA-#x06ED] | [#x0901-#x0903] |
-#x093C | [#x093E-#x094C] | #x094D | [#x0951-#x0954] | [#x0962-#x0963] |
-[#x0981-#x0983] | #x09BC | #x09BE | #x09BF | [#x09C0-#x09C4] |
-[#x09C7-#x09C8] | [#x09CB-#x09CD] | #x09D7 | [#x09E2-#x09E3] | #x0A02 |
-#x0A3C | #x0A3E | #x0A3F | [#x0A40-#x0A42] | [#x0A47-#x0A48] |
-[#x0A4B-#x0A4D] | [#x0A70-#x0A71] | [#x0A81-#x0A83] | #x0ABC |
-[#x0ABE-#x0AC5] | [#x0AC7-#x0AC9] | [#x0ACB-#x0ACD] | [#x0B01-#x0B03] |
-#x0B3C | [#x0B3E-#x0B43] | [#x0B47-#x0B48] | [#x0B4B-#x0B4D] |
-[#x0B56-#x0B57] | [#x0B82-#x0B83] | [#x0BBE-#x0BC2] | [#x0BC6-#x0BC8] |
-[#x0BCA-#x0BCD] | #x0BD7 | [#x0C01-#x0C03] | [#x0C3E-#x0C44] |
-[#x0C46-#x0C48] | [#x0C4A-#x0C4D] | [#x0C55-#x0C56] | [#x0C82-#x0C83] |
-[#x0CBE-#x0CC4] | [#x0CC6-#x0CC8] | [#x0CCA-#x0CCD] | [#x0CD5-#x0CD6] |
-[#x0D02-#x0D03] | [#x0D3E-#x0D43] | [#x0D46-#x0D48] | [#x0D4A-#x0D4D] |
-#x0D57 | #x0E31 | [#x0E34-#x0E3A] | [#x0E47-#x0E4E] | #x0EB1 |
-[#x0EB4-#x0EB9] | [#x0EBB-#x0EBC] | [#x0EC8-#x0ECD] | [#x0F18-#x0F19] |
-#x0F35 | #x0F37 | #x0F39 | #x0F3E | #x0F3F | [#x0F71-#x0F84] |
-[#x0F86-#x0F8B] | [#x0F90-#x0F95] | #x0F97 | [#x0F99-#x0FAD] |
-[#x0FB1-#x0FB7] | #x0FB9 | [#x20D0-#x20DC] | #x20E1 | [#x302A-#x302F] |
-#x3099 | #x309A"""
-
-digit = """
-[#x0030-#x0039] | [#x0660-#x0669] | [#x06F0-#x06F9] | [#x0966-#x096F] |
-[#x09E6-#x09EF] | [#x0A66-#x0A6F] | [#x0AE6-#x0AEF] | [#x0B66-#x0B6F] |
-[#x0BE7-#x0BEF] | [#x0C66-#x0C6F] | [#x0CE6-#x0CEF] | [#x0D66-#x0D6F] |
-[#x0E50-#x0E59] | [#x0ED0-#x0ED9] | [#x0F20-#x0F29]"""
-
-extender = """
-#x00B7 | #x02D0 | #x02D1 | #x0387 | #x0640 | #x0E46 | #x0EC6 | #x3005 |
-#[#x3031-#x3035] | [#x309D-#x309E] | [#x30FC-#x30FE]"""
-
-letter = " | ".join([baseChar, ideographic])
-
-# Without the
-name = " | ".join([letter, digit, ".", "-", "_", combiningCharacter,
-                   extender])
-nameFirst = " | ".join([letter, "_"])
-
-reChar = re.compile(r"#x([\d|A-F]{4,4})")
-reCharRange = re.compile(r"\[#x([\d|A-F]{4,4})-#x([\d|A-F]{4,4})\]")
-
-
-def charStringToList(chars):
-    charRanges = [item.strip() for item in chars.split(" | ")]
-    rv = []
-    for item in charRanges:
-        foundMatch = False
-        for regexp in (reChar, reCharRange):
-            match = regexp.match(item)
-            if match is not None:
-                rv.append([hexToInt(item) for item in match.groups()])
-                if len(rv[-1]) == 1:
-                    rv[-1] = rv[-1] * 2
-                foundMatch = True
-                break
-        if not foundMatch:
-            assert len(item) == 1
-
-            rv.append([ord(item)] * 2)
-    rv = normaliseCharList(rv)
-    return rv
-
-
-def normaliseCharList(charList):
-    charList = sorted(charList)
-    for item in charList:
-        assert item[1] >= item[0]
-    rv = []
-    i = 0
-    while i < len(charList):
-        j = 1
-        rv.append(charList[i])
-        while i + j < len(charList) and charList[i + j][0] <= rv[-1][1] + 1:
-            rv[-1][1] = charList[i + j][1]
-            j += 1
-        i += j
-    return rv
-
-
-# We don't really support characters above the BMP :(
-max_unicode = int("FFFF", 16)
-
-
-def missingRanges(charList):
-    rv = []
-    if charList[0] != 0:
-        rv.append([0, charList[0][0] - 1])
-    for i, item in enumerate(charList[:-1]):
-        rv.append([item[1] + 1, charList[i + 1][0] - 1])
-    if charList[-1][1] != max_unicode:
-        rv.append([charList[-1][1] + 1, max_unicode])
-    return rv
-
-
-def listToRegexpStr(charList):
-    rv = []
-    for item in charList:
-        if item[0] == item[1]:
-            rv.append(escapeRegexp(chr(item[0])))
-        else:
-            rv.append(escapeRegexp(chr(item[0])) + "-" +
-                      escapeRegexp(chr(item[1])))
-    return "[%s]" % "".join(rv)
-
-
-def hexToInt(hex_str):
-    return int(hex_str, 16)
-
-
-def escapeRegexp(string):
-    specialCharacters = (".", "^", "$", "*", "+", "?", "{", "}",
-                         "[", "]", "|", "(", ")", "-")
-    for char in specialCharacters:
-        string = string.replace(char, "\\" + char)
-
-    return string
-
-# output from the above
-nonXmlNameBMPRegexp = re.compile('[\x00-,/:-@\\[-\\^`\\{-\xb6\xb8-\xbf\xd7\xf7\u0132-\u0133\u013f-\u0140\u0149\u017f\u01c4-\u01cc\u01f1-\u01f3\u01f6-\u01f9\u0218-\u024f\u02a9-\u02ba\u02c2-\u02cf\u02d2-\u02ff\u0346-\u035f\u0362-\u0385\u038b\u038d\u03a2\u03cf\u03d7-\u03d9\u03db\u03dd\u03df\u03e1\u03f4-\u0400\u040d\u0450\u045d\u0482\u0487-\u048f\u04c5-\u04c6\u04c9-\u04ca\u04cd-\u04cf\u04ec-\u04ed\u04f6-\u04f7\u04fa-\u0530\u0557-\u0558\u055a-\u0560\u0587-\u0590\u05a2\u05ba\u05be\u05c0\u05c3\u05c5-\u05cf\u05eb-\u05ef\u05f3-\u0620\u063b-\u063f\u0653-\u065f\u066a-\u066f\u06b8-\u06b9\u06bf\u06cf\u06d4\u06e9\u06ee-\u06ef\u06fa-\u0900\u0904\u093a-\u093b\u094e-\u0950\u0955-\u0957\u0964-\u0965\u0970-\u0980\u0984\u098d-\u098e\u0991-\u0992\u09a9\u09b1\u09b3-\u09b5\u09ba-\u09bb\u09bd\u09c5-\u09c6\u09c9-\u09ca\u09ce-\u09d6\u09d8-\u09db\u09de\u09e4-\u09e5\u09f2-\u0a01\u0a03-\u0a04\u0a0b-\u0a0e\u0a11-\u0a12\u0a29\u0a31\u0a34\u0a37\u0a3a-\u0a3b\u0a3d\u0a43-\u0a46\u0a49-\u0a4a\u0a4e-\u0a58\u0a5d\u0a5f-\u0a65\u0a75-\u0a80\u0a84\u0a8c\u0a8e\u0a92\u0aa9\u0ab1\u0ab4\u0aba-\u0abb\u0ac6\u0aca\u0ace-\u0adf\u0ae1-\u0ae5\u0af0-\u0b00\u0b04\u0b0d-\u0b0e\u0b11-\u0b12\u0b29\u0b31\u0b34-\u0b35\u0b3a-\u0b3b\u0b44-\u0b46\u0b49-\u0b4a\u0b4e-\u0b55\u0b58-\u0b5b\u0b5e\u0b62-\u0b65\u0b70-\u0b81\u0b84\u0b8b-\u0b8d\u0b91\u0b96-\u0b98\u0b9b\u0b9d\u0ba0-\u0ba2\u0ba5-\u0ba7\u0bab-\u0bad\u0bb6\u0bba-\u0bbd\u0bc3-\u0bc5\u0bc9\u0bce-\u0bd6\u0bd8-\u0be6\u0bf0-\u0c00\u0c04\u0c0d\u0c11\u0c29\u0c34\u0c3a-\u0c3d\u0c45\u0c49\u0c4e-\u0c54\u0c57-\u0c5f\u0c62-\u0c65\u0c70-\u0c81\u0c84\u0c8d\u0c91\u0ca9\u0cb4\u0cba-\u0cbd\u0cc5\u0cc9\u0cce-\u0cd4\u0cd7-\u0cdd\u0cdf\u0ce2-\u0ce5\u0cf0-\u0d01\u0d04\u0d0d\u0d11\u0d29\u0d3a-\u0d3d\u0d44-\u0d45\u0d49\u0d4e-\u0d56\u0d58-\u0d5f\u0d62-\u0d65\u0d70-\u0e00\u0e2f\u0e3b-\u0e3f\u0e4f\u0e5a-\u0e80\u0e83\u0e85-\u0e86\u0e89\u0e8b-\u0e8c\u0e8e-\u0e93\u0e98\u0ea0\u0ea4\u0ea6\u0ea8-\u0ea9\u0eac\u0eaf\u0eba\u0ebe-\u0ebf\u0ec5\u0ec7\u0ece-\u0ecf\u0eda-\u0f17\u0f1a-\u0f1f\u0f2a-\u0f34\u0f36\u0f38\u0f3a-\u0f3d\u0f48\u0f6a-\u0f70\u0f85\u0f8c-\u0f8f\u0f96\u0f98\u0fae-\u0fb0\u0fb8\u0fba-\u109f\u10c6-\u10cf\u10f7-\u10ff\u1101\u1104\u1108\u110a\u110d\u1113-\u113b\u113d\u113f\u1141-\u114b\u114d\u114f\u1151-\u1153\u1156-\u1158\u115a-\u115e\u1162\u1164\u1166\u1168\u116a-\u116c\u116f-\u1171\u1174\u1176-\u119d\u119f-\u11a7\u11a9-\u11aa\u11ac-\u11ad\u11b0-\u11b6\u11b9\u11bb\u11c3-\u11ea\u11ec-\u11ef\u11f1-\u11f8\u11fa-\u1dff\u1e9c-\u1e9f\u1efa-\u1eff\u1f16-\u1f17\u1f1e-\u1f1f\u1f46-\u1f47\u1f4e-\u1f4f\u1f58\u1f5a\u1f5c\u1f5e\u1f7e-\u1f7f\u1fb5\u1fbd\u1fbf-\u1fc1\u1fc5\u1fcd-\u1fcf\u1fd4-\u1fd5\u1fdc-\u1fdf\u1fed-\u1ff1\u1ff5\u1ffd-\u20cf\u20dd-\u20e0\u20e2-\u2125\u2127-\u2129\u212c-\u212d\u212f-\u217f\u2183-\u3004\u3006\u3008-\u3020\u3030\u3036-\u3040\u3095-\u3098\u309b-\u309c\u309f-\u30a0\u30fb\u30ff-\u3104\u312d-\u4dff\u9fa6-\uabff\ud7a4-\uffff]')  # noqa
-
-nonXmlNameFirstBMPRegexp = re.compile('[\x00-@\\[-\\^`\\{-\xbf\xd7\xf7\u0132-\u0133\u013f-\u0140\u0149\u017f\u01c4-\u01cc\u01f1-\u01f3\u01f6-\u01f9\u0218-\u024f\u02a9-\u02ba\u02c2-\u0385\u0387\u038b\u038d\u03a2\u03cf\u03d7-\u03d9\u03db\u03dd\u03df\u03e1\u03f4-\u0400\u040d\u0450\u045d\u0482-\u048f\u04c5-\u04c6\u04c9-\u04ca\u04cd-\u04cf\u04ec-\u04ed\u04f6-\u04f7\u04fa-\u0530\u0557-\u0558\u055a-\u0560\u0587-\u05cf\u05eb-\u05ef\u05f3-\u0620\u063b-\u0640\u064b-\u0670\u06b8-\u06b9\u06bf\u06cf\u06d4\u06d6-\u06e4\u06e7-\u0904\u093a-\u093c\u093e-\u0957\u0962-\u0984\u098d-\u098e\u0991-\u0992\u09a9\u09b1\u09b3-\u09b5\u09ba-\u09db\u09de\u09e2-\u09ef\u09f2-\u0a04\u0a0b-\u0a0e\u0a11-\u0a12\u0a29\u0a31\u0a34\u0a37\u0a3a-\u0a58\u0a5d\u0a5f-\u0a71\u0a75-\u0a84\u0a8c\u0a8e\u0a92\u0aa9\u0ab1\u0ab4\u0aba-\u0abc\u0abe-\u0adf\u0ae1-\u0b04\u0b0d-\u0b0e\u0b11-\u0b12\u0b29\u0b31\u0b34-\u0b35\u0b3a-\u0b3c\u0b3e-\u0b5b\u0b5e\u0b62-\u0b84\u0b8b-\u0b8d\u0b91\u0b96-\u0b98\u0b9b\u0b9d\u0ba0-\u0ba2\u0ba5-\u0ba7\u0bab-\u0bad\u0bb6\u0bba-\u0c04\u0c0d\u0c11\u0c29\u0c34\u0c3a-\u0c5f\u0c62-\u0c84\u0c8d\u0c91\u0ca9\u0cb4\u0cba-\u0cdd\u0cdf\u0ce2-\u0d04\u0d0d\u0d11\u0d29\u0d3a-\u0d5f\u0d62-\u0e00\u0e2f\u0e31\u0e34-\u0e3f\u0e46-\u0e80\u0e83\u0e85-\u0e86\u0e89\u0e8b-\u0e8c\u0e8e-\u0e93\u0e98\u0ea0\u0ea4\u0ea6\u0ea8-\u0ea9\u0eac\u0eaf\u0eb1\u0eb4-\u0ebc\u0ebe-\u0ebf\u0ec5-\u0f3f\u0f48\u0f6a-\u109f\u10c6-\u10cf\u10f7-\u10ff\u1101\u1104\u1108\u110a\u110d\u1113-\u113b\u113d\u113f\u1141-\u114b\u114d\u114f\u1151-\u1153\u1156-\u1158\u115a-\u115e\u1162\u1164\u1166\u1168\u116a-\u116c\u116f-\u1171\u1174\u1176-\u119d\u119f-\u11a7\u11a9-\u11aa\u11ac-\u11ad\u11b0-\u11b6\u11b9\u11bb\u11c3-\u11ea\u11ec-\u11ef\u11f1-\u11f8\u11fa-\u1dff\u1e9c-\u1e9f\u1efa-\u1eff\u1f16-\u1f17\u1f1e-\u1f1f\u1f46-\u1f47\u1f4e-\u1f4f\u1f58\u1f5a\u1f5c\u1f5e\u1f7e-\u1f7f\u1fb5\u1fbd\u1fbf-\u1fc1\u1fc5\u1fcd-\u1fcf\u1fd4-\u1fd5\u1fdc-\u1fdf\u1fed-\u1ff1\u1ff5\u1ffd-\u2125\u2127-\u2129\u212c-\u212d\u212f-\u217f\u2183-\u3006\u3008-\u3020\u302a-\u3040\u3095-\u30a0\u30fb-\u3104\u312d-\u4dff\u9fa6-\uabff\ud7a4-\uffff]')  # noqa
-
-# Simpler things
-nonPubidCharRegexp = re.compile("[^\x20\x0D\x0Aa-zA-Z0-9\\-'()+,./:=?;!*#@$_%]")
-
-
-class InfosetFilter(object):
-    replacementRegexp = re.compile(r"U[\dA-F]{5,5}")
-
-    def __init__(self,
-                 dropXmlnsLocalName=False,
-                 dropXmlnsAttrNs=False,
-                 preventDoubleDashComments=False,
-                 preventDashAtCommentEnd=False,
-                 replaceFormFeedCharacters=True,
-                 preventSingleQuotePubid=False):
-
-        self.dropXmlnsLocalName = dropXmlnsLocalName
-        self.dropXmlnsAttrNs = dropXmlnsAttrNs
-
-        self.preventDoubleDashComments = preventDoubleDashComments
-        self.preventDashAtCommentEnd = preventDashAtCommentEnd
-
-        self.replaceFormFeedCharacters = replaceFormFeedCharacters
-
-        self.preventSingleQuotePubid = preventSingleQuotePubid
-
-        self.replaceCache = {}
-
-    def coerceAttribute(self, name, namespace=None):
-        if self.dropXmlnsLocalName and name.startswith("xmlns:"):
-            warnings.warn("Attributes cannot begin with xmlns", DataLossWarning)
-            return None
-        elif (self.dropXmlnsAttrNs and
-              namespace == "http://www.w3.org/2000/xmlns/"):
-            warnings.warn("Attributes cannot be in the xml namespace", DataLossWarning)
-            return None
-        else:
-            return self.toXmlName(name)
-
-    def coerceElement(self, name):
-        return self.toXmlName(name)
-
-    def coerceComment(self, data):
-        if self.preventDoubleDashComments:
-            while "--" in data:
-                warnings.warn("Comments cannot contain adjacent dashes", DataLossWarning)
-                data = data.replace("--", "- -")
-            if data.endswith("-"):
-                warnings.warn("Comments cannot end in a dash", DataLossWarning)
-                data += " "
-        return data
-
-    def coerceCharacters(self, data):
-        if self.replaceFormFeedCharacters:
-            for _ in range(data.count("\x0C")):
-                warnings.warn("Text cannot contain U+000C", DataLossWarning)
-            data = data.replace("\x0C", " ")
-        # Other non-xml characters
-        return data
-
-    def coercePubid(self, data):
-        dataOutput = data
-        for char in nonPubidCharRegexp.findall(data):
-            warnings.warn("Coercing non-XML pubid", DataLossWarning)
-            replacement = self.getReplacementCharacter(char)
-            dataOutput = dataOutput.replace(char, replacement)
-        if self.preventSingleQuotePubid and dataOutput.find("'") >= 0:
-            warnings.warn("Pubid cannot contain single quote", DataLossWarning)
-            dataOutput = dataOutput.replace("'", self.getReplacementCharacter("'"))
-        return dataOutput
-
-    def toXmlName(self, name):
-        nameFirst = name[0]
-        nameRest = name[1:]
-        m = nonXmlNameFirstBMPRegexp.match(nameFirst)
-        if m:
-            warnings.warn("Coercing non-XML name: %s" % name, DataLossWarning)
-            nameFirstOutput = self.getReplacementCharacter(nameFirst)
-        else:
-            nameFirstOutput = nameFirst
-
-        nameRestOutput = nameRest
-        replaceChars = set(nonXmlNameBMPRegexp.findall(nameRest))
-        for char in replaceChars:
-            warnings.warn("Coercing non-XML name: %s" % name, DataLossWarning)
-            replacement = self.getReplacementCharacter(char)
-            nameRestOutput = nameRestOutput.replace(char, replacement)
-        return nameFirstOutput + nameRestOutput
-
-    def getReplacementCharacter(self, char):
-        if char in self.replaceCache:
-            replacement = self.replaceCache[char]
-        else:
-            replacement = self.escapeChar(char)
-        return replacement
-
-    def fromXmlName(self, name):
-        for item in set(self.replacementRegexp.findall(name)):
-            name = name.replace(item, self.unescapeChar(item))
-        return name
-
-    def escapeChar(self, char):
-        replacement = "U%05X" % ord(char)
-        self.replaceCache[char] = replacement
-        return replacement
-
-    def unescapeChar(self, charcode):
-        return chr(int(charcode[1:], 16))
diff --git a/lib/bleach/_vendor/html5lib/_inputstream.py b/lib/bleach/_vendor/html5lib/_inputstream.py
deleted file mode 100644
index 09762517..00000000
--- a/lib/bleach/_vendor/html5lib/_inputstream.py
+++ /dev/null
@@ -1,918 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-from bleach.six_shim import text_type
-from bleach.six_shim import http_client, urllib
-
-import codecs
-import re
-from io import BytesIO, StringIO
-
-import webencodings
-
-from .constants import EOF, spaceCharacters, asciiLetters, asciiUppercase
-from .constants import _ReparseException
-from . import _utils
-
-# Non-unicode versions of constants for use in the pre-parser
-spaceCharactersBytes = frozenset([item.encode("ascii") for item in spaceCharacters])
-asciiLettersBytes = frozenset([item.encode("ascii") for item in asciiLetters])
-asciiUppercaseBytes = frozenset([item.encode("ascii") for item in asciiUppercase])
-spacesAngleBrackets = spaceCharactersBytes | frozenset([b">", b"<"])
-
-
-invalid_unicode_no_surrogate = "[\u0001-\u0008\u000B\u000E-\u001F\u007F-\u009F\uFDD0-\uFDEF\uFFFE\uFFFF\U0001FFFE\U0001FFFF\U0002FFFE\U0002FFFF\U0003FFFE\U0003FFFF\U0004FFFE\U0004FFFF\U0005FFFE\U0005FFFF\U0006FFFE\U0006FFFF\U0007FFFE\U0007FFFF\U0008FFFE\U0008FFFF\U0009FFFE\U0009FFFF\U000AFFFE\U000AFFFF\U000BFFFE\U000BFFFF\U000CFFFE\U000CFFFF\U000DFFFE\U000DFFFF\U000EFFFE\U000EFFFF\U000FFFFE\U000FFFFF\U0010FFFE\U0010FFFF]"  # noqa
-
-if _utils.supports_lone_surrogates:
-    # Use one extra step of indirection and create surrogates with
-    # eval. Not using this indirection would introduce an illegal
-    # unicode literal on platforms not supporting such lone
-    # surrogates.
-    assert invalid_unicode_no_surrogate[-1] == "]" and invalid_unicode_no_surrogate.count("]") == 1
-    invalid_unicode_re = re.compile(invalid_unicode_no_surrogate[:-1] +
-                                    eval('"\\uD800-\\uDFFF"') +  # pylint:disable=eval-used
-                                    "]")
-else:
-    invalid_unicode_re = re.compile(invalid_unicode_no_surrogate)
-
-non_bmp_invalid_codepoints = {0x1FFFE, 0x1FFFF, 0x2FFFE, 0x2FFFF, 0x3FFFE,
-                              0x3FFFF, 0x4FFFE, 0x4FFFF, 0x5FFFE, 0x5FFFF,
-                              0x6FFFE, 0x6FFFF, 0x7FFFE, 0x7FFFF, 0x8FFFE,
-                              0x8FFFF, 0x9FFFE, 0x9FFFF, 0xAFFFE, 0xAFFFF,
-                              0xBFFFE, 0xBFFFF, 0xCFFFE, 0xCFFFF, 0xDFFFE,
-                              0xDFFFF, 0xEFFFE, 0xEFFFF, 0xFFFFE, 0xFFFFF,
-                              0x10FFFE, 0x10FFFF}
-
-ascii_punctuation_re = re.compile("[\u0009-\u000D\u0020-\u002F\u003A-\u0040\u005C\u005B-\u0060\u007B-\u007E]")
-
-# Cache for charsUntil()
-charsUntilRegEx = {}
-
-
-class BufferedStream(object):
-    """Buffering for streams that do not have buffering of their own
-
-    The buffer is implemented as a list of chunks on the assumption that
-    joining many strings will be slow since it is O(n**2)
-    """
-
-    def __init__(self, stream):
-        self.stream = stream
-        self.buffer = []
-        self.position = [-1, 0]  # chunk number, offset
-
-    def tell(self):
-        pos = 0
-        for chunk in self.buffer[:self.position[0]]:
-            pos += len(chunk)
-        pos += self.position[1]
-        return pos
-
-    def seek(self, pos):
-        assert pos <= self._bufferedBytes()
-        offset = pos
-        i = 0
-        while len(self.buffer[i]) < offset:
-            offset -= len(self.buffer[i])
-            i += 1
-        self.position = [i, offset]
-
-    def read(self, bytes):
-        if not self.buffer:
-            return self._readStream(bytes)
-        elif (self.position[0] == len(self.buffer) and
-              self.position[1] == len(self.buffer[-1])):
-            return self._readStream(bytes)
-        else:
-            return self._readFromBuffer(bytes)
-
-    def _bufferedBytes(self):
-        return sum([len(item) for item in self.buffer])
-
-    def _readStream(self, bytes):
-        data = self.stream.read(bytes)
-        self.buffer.append(data)
-        self.position[0] += 1
-        self.position[1] = len(data)
-        return data
-
-    def _readFromBuffer(self, bytes):
-        remainingBytes = bytes
-        rv = []
-        bufferIndex = self.position[0]
-        bufferOffset = self.position[1]
-        while bufferIndex < len(self.buffer) and remainingBytes != 0:
-            assert remainingBytes > 0
-            bufferedData = self.buffer[bufferIndex]
-
-            if remainingBytes <= len(bufferedData) - bufferOffset:
-                bytesToRead = remainingBytes
-                self.position = [bufferIndex, bufferOffset + bytesToRead]
-            else:
-                bytesToRead = len(bufferedData) - bufferOffset
-                self.position = [bufferIndex, len(bufferedData)]
-                bufferIndex += 1
-            rv.append(bufferedData[bufferOffset:bufferOffset + bytesToRead])
-            remainingBytes -= bytesToRead
-
-            bufferOffset = 0
-
-        if remainingBytes:
-            rv.append(self._readStream(remainingBytes))
-
-        return b"".join(rv)
-
-
-def HTMLInputStream(source, **kwargs):
-    # Work around Python bug #20007: read(0) closes the connection.
-    # http://bugs.python.org/issue20007
-    if (isinstance(source, http_client.HTTPResponse) or
-        # Also check for addinfourl wrapping HTTPResponse
-        (isinstance(source, urllib.response.addbase) and
-         isinstance(source.fp, http_client.HTTPResponse))):
-        isUnicode = False
-    elif hasattr(source, "read"):
-        isUnicode = isinstance(source.read(0), text_type)
-    else:
-        isUnicode = isinstance(source, text_type)
-
-    if isUnicode:
-        encodings = [x for x in kwargs if x.endswith("_encoding")]
-        if encodings:
-            raise TypeError("Cannot set an encoding with a unicode input, set %r" % encodings)
-
-        return HTMLUnicodeInputStream(source, **kwargs)
-    else:
-        return HTMLBinaryInputStream(source, **kwargs)
-
-
-class HTMLUnicodeInputStream(object):
-    """Provides a unicode stream of characters to the HTMLTokenizer.
-
-    This class takes care of character encoding and removing or replacing
-    incorrect byte-sequences and also provides column and line tracking.
-
-    """
-
-    _defaultChunkSize = 10240
-
-    def __init__(self, source):
-        """Initialises the HTMLInputStream.
-
-        HTMLInputStream(source, [encoding]) -> Normalized stream from source
-        for use by html5lib.
-
-        source can be either a file-object, local filename or a string.
-
-        The optional encoding parameter must be a string that indicates
-        the encoding.  If specified, that encoding will be used,
-        regardless of any BOM or later declaration (such as in a meta
-        element)
-
-        """
-
-        if not _utils.supports_lone_surrogates:
-            # Such platforms will have already checked for such
-            # surrogate errors, so no need to do this checking.
-            self.reportCharacterErrors = None
-        elif len("\U0010FFFF") == 1:
-            self.reportCharacterErrors = self.characterErrorsUCS4
-        else:
-            self.reportCharacterErrors = self.characterErrorsUCS2
-
-        # List of where new lines occur
-        self.newLines = [0]
-
-        self.charEncoding = (lookupEncoding("utf-8"), "certain")
-        self.dataStream = self.openStream(source)
-
-        self.reset()
-
-    def reset(self):
-        self.chunk = ""
-        self.chunkSize = 0
-        self.chunkOffset = 0
-        self.errors = []
-
-        # number of (complete) lines in previous chunks
-        self.prevNumLines = 0
-        # number of columns in the last line of the previous chunk
-        self.prevNumCols = 0
-
-        # Deal with CR LF and surrogates split over chunk boundaries
-        self._bufferedCharacter = None
-
-    def openStream(self, source):
-        """Produces a file object from source.
-
-        source can be either a file object, local filename or a string.
-
-        """
-        # Already a file object
-        if hasattr(source, 'read'):
-            stream = source
-        else:
-            stream = StringIO(source)
-
-        return stream
-
-    def _position(self, offset):
-        chunk = self.chunk
-        nLines = chunk.count('\n', 0, offset)
-        positionLine = self.prevNumLines + nLines
-        lastLinePos = chunk.rfind('\n', 0, offset)
-        if lastLinePos == -1:
-            positionColumn = self.prevNumCols + offset
-        else:
-            positionColumn = offset - (lastLinePos + 1)
-        return (positionLine, positionColumn)
-
-    def position(self):
-        """Returns (line, col) of the current position in the stream."""
-        line, col = self._position(self.chunkOffset)
-        return (line + 1, col)
-
-    def char(self):
-        """ Read one character from the stream or queue if available. Return
-            EOF when EOF is reached.
-        """
-        # Read a new chunk from the input stream if necessary
-        if self.chunkOffset >= self.chunkSize:
-            if not self.readChunk():
-                return EOF
-
-        chunkOffset = self.chunkOffset
-        char = self.chunk[chunkOffset]
-        self.chunkOffset = chunkOffset + 1
-
-        return char
-
-    def readChunk(self, chunkSize=None):
-        if chunkSize is None:
-            chunkSize = self._defaultChunkSize
-
-        self.prevNumLines, self.prevNumCols = self._position(self.chunkSize)
-
-        self.chunk = ""
-        self.chunkSize = 0
-        self.chunkOffset = 0
-
-        data = self.dataStream.read(chunkSize)
-
-        # Deal with CR LF and surrogates broken across chunks
-        if self._bufferedCharacter:
-            data = self._bufferedCharacter + data
-            self._bufferedCharacter = None
-        elif not data:
-            # We have no more data, bye-bye stream
-            return False
-
-        if len(data) > 1:
-            lastv = ord(data[-1])
-            if lastv == 0x0D or 0xD800 <= lastv <= 0xDBFF:
-                self._bufferedCharacter = data[-1]
-                data = data[:-1]
-
-        if self.reportCharacterErrors:
-            self.reportCharacterErrors(data)
-
-        # Replace invalid characters
-        data = data.replace("\r\n", "\n")
-        data = data.replace("\r", "\n")
-
-        self.chunk = data
-        self.chunkSize = len(data)
-
-        return True
-
-    def characterErrorsUCS4(self, data):
-        for _ in range(len(invalid_unicode_re.findall(data))):
-            self.errors.append("invalid-codepoint")
-
-    def characterErrorsUCS2(self, data):
-        # Someone picked the wrong compile option
-        # You lose
-        skip = False
-        for match in invalid_unicode_re.finditer(data):
-            if skip:
-                continue
-            codepoint = ord(match.group())
-            pos = match.start()
-            # Pretty sure there should be endianness issues here
-            if _utils.isSurrogatePair(data[pos:pos + 2]):
-                # We have a surrogate pair!
-                char_val = _utils.surrogatePairToCodepoint(data[pos:pos + 2])
-                if char_val in non_bmp_invalid_codepoints:
-                    self.errors.append("invalid-codepoint")
-                skip = True
-            elif (codepoint >= 0xD800 and codepoint <= 0xDFFF and
-                  pos == len(data) - 1):
-                self.errors.append("invalid-codepoint")
-            else:
-                skip = False
-                self.errors.append("invalid-codepoint")
-
-    def charsUntil(self, characters, opposite=False):
-        """ Returns a string of characters from the stream up to but not
-        including any character in 'characters' or EOF. 'characters' must be
-        a container that supports the 'in' method and iteration over its
-        characters.
-        """
-
-        # Use a cache of regexps to find the required characters
-        try:
-            chars = charsUntilRegEx[(characters, opposite)]
-        except KeyError:
-            if __debug__:
-                for c in characters:
-                    assert(ord(c) < 128)
-            regex = "".join(["\\x%02x" % ord(c) for c in characters])
-            if not opposite:
-                regex = "^%s" % regex
-            chars = charsUntilRegEx[(characters, opposite)] = re.compile("[%s]+" % regex)
-
-        rv = []
-
-        while True:
-            # Find the longest matching prefix
-            m = chars.match(self.chunk, self.chunkOffset)
-            if m is None:
-                # If nothing matched, and it wasn't because we ran out of chunk,
-                # then stop
-                if self.chunkOffset != self.chunkSize:
-                    break
-            else:
-                end = m.end()
-                # If not the whole chunk matched, return everything
-                # up to the part that didn't match
-                if end != self.chunkSize:
-                    rv.append(self.chunk[self.chunkOffset:end])
-                    self.chunkOffset = end
-                    break
-            # If the whole remainder of the chunk matched,
-            # use it all and read the next chunk
-            rv.append(self.chunk[self.chunkOffset:])
-            if not self.readChunk():
-                # Reached EOF
-                break
-
-        r = "".join(rv)
-        return r
-
-    def unget(self, char):
-        # Only one character is allowed to be ungotten at once - it must
-        # be consumed again before any further call to unget
-        if char is not EOF:
-            if self.chunkOffset == 0:
-                # unget is called quite rarely, so it's a good idea to do
-                # more work here if it saves a bit of work in the frequently
-                # called char and charsUntil.
-                # So, just prepend the ungotten character onto the current
-                # chunk:
-                self.chunk = char + self.chunk
-                self.chunkSize += 1
-            else:
-                self.chunkOffset -= 1
-                assert self.chunk[self.chunkOffset] == char
-
-
-class HTMLBinaryInputStream(HTMLUnicodeInputStream):
-    """Provides a unicode stream of characters to the HTMLTokenizer.
-
-    This class takes care of character encoding and removing or replacing
-    incorrect byte-sequences and also provides column and line tracking.
-
-    """
-
-    def __init__(self, source, override_encoding=None, transport_encoding=None,
-                 same_origin_parent_encoding=None, likely_encoding=None,
-                 default_encoding="windows-1252", useChardet=True):
-        """Initialises the HTMLInputStream.
-
-        HTMLInputStream(source, [encoding]) -> Normalized stream from source
-        for use by html5lib.
-
-        source can be either a file-object, local filename or a string.
-
-        The optional encoding parameter must be a string that indicates
-        the encoding.  If specified, that encoding will be used,
-        regardless of any BOM or later declaration (such as in a meta
-        element)
-
-        """
-        # Raw Stream - for unicode objects this will encode to utf-8 and set
-        #              self.charEncoding as appropriate
-        self.rawStream = self.openStream(source)
-
-        HTMLUnicodeInputStream.__init__(self, self.rawStream)
-
-        # Encoding Information
-        # Number of bytes to use when looking for a meta element with
-        # encoding information
-        self.numBytesMeta = 1024
-        # Number of bytes to use when using detecting encoding using chardet
-        self.numBytesChardet = 100
-        # Things from args
-        self.override_encoding = override_encoding
-        self.transport_encoding = transport_encoding
-        self.same_origin_parent_encoding = same_origin_parent_encoding
-        self.likely_encoding = likely_encoding
-        self.default_encoding = default_encoding
-
-        # Determine encoding
-        self.charEncoding = self.determineEncoding(useChardet)
-        assert self.charEncoding[0] is not None
-
-        # Call superclass
-        self.reset()
-
-    def reset(self):
-        self.dataStream = self.charEncoding[0].codec_info.streamreader(self.rawStream, 'replace')
-        HTMLUnicodeInputStream.reset(self)
-
-    def openStream(self, source):
-        """Produces a file object from source.
-
-        source can be either a file object, local filename or a string.
-
-        """
-        # Already a file object
-        if hasattr(source, 'read'):
-            stream = source
-        else:
-            stream = BytesIO(source)
-
-        try:
-            stream.seek(stream.tell())
-        except Exception:
-            stream = BufferedStream(stream)
-
-        return stream
-
-    def determineEncoding(self, chardet=True):
-        # BOMs take precedence over everything
-        # This will also read past the BOM if present
-        charEncoding = self.detectBOM(), "certain"
-        if charEncoding[0] is not None:
-            return charEncoding
-
-        # If we've been overridden, we've been overridden
-        charEncoding = lookupEncoding(self.override_encoding), "certain"
-        if charEncoding[0] is not None:
-            return charEncoding
-
-        # Now check the transport layer
-        charEncoding = lookupEncoding(self.transport_encoding), "certain"
-        if charEncoding[0] is not None:
-            return charEncoding
-
-        # Look for meta elements with encoding information
-        charEncoding = self.detectEncodingMeta(), "tentative"
-        if charEncoding[0] is not None:
-            return charEncoding
-
-        # Parent document encoding
-        charEncoding = lookupEncoding(self.same_origin_parent_encoding), "tentative"
-        if charEncoding[0] is not None and not charEncoding[0].name.startswith("utf-16"):
-            return charEncoding
-
-        # "likely" encoding
-        charEncoding = lookupEncoding(self.likely_encoding), "tentative"
-        if charEncoding[0] is not None:
-            return charEncoding
-
-        # Guess with chardet, if available
-        if chardet:
-            try:
-                from chardet.universaldetector import UniversalDetector
-            except ImportError:
-                pass
-            else:
-                buffers = []
-                detector = UniversalDetector()
-                while not detector.done:
-                    buffer = self.rawStream.read(self.numBytesChardet)
-                    assert isinstance(buffer, bytes)
-                    if not buffer:
-                        break
-                    buffers.append(buffer)
-                    detector.feed(buffer)
-                detector.close()
-                encoding = lookupEncoding(detector.result['encoding'])
-                self.rawStream.seek(0)
-                if encoding is not None:
-                    return encoding, "tentative"
-
-        # Try the default encoding
-        charEncoding = lookupEncoding(self.default_encoding), "tentative"
-        if charEncoding[0] is not None:
-            return charEncoding
-
-        # Fallback to html5lib's default if even that hasn't worked
-        return lookupEncoding("windows-1252"), "tentative"
-
-    def changeEncoding(self, newEncoding):
-        assert self.charEncoding[1] != "certain"
-        newEncoding = lookupEncoding(newEncoding)
-        if newEncoding is None:
-            return
-        if newEncoding.name in ("utf-16be", "utf-16le"):
-            newEncoding = lookupEncoding("utf-8")
-            assert newEncoding is not None
-        elif newEncoding == self.charEncoding[0]:
-            self.charEncoding = (self.charEncoding[0], "certain")
-        else:
-            self.rawStream.seek(0)
-            self.charEncoding = (newEncoding, "certain")
-            self.reset()
-            raise _ReparseException("Encoding changed from %s to %s" % (self.charEncoding[0], newEncoding))
-
-    def detectBOM(self):
-        """Attempts to detect at BOM at the start of the stream. If
-        an encoding can be determined from the BOM return the name of the
-        encoding otherwise return None"""
-        bomDict = {
-            codecs.BOM_UTF8: 'utf-8',
-            codecs.BOM_UTF16_LE: 'utf-16le', codecs.BOM_UTF16_BE: 'utf-16be',
-            codecs.BOM_UTF32_LE: 'utf-32le', codecs.BOM_UTF32_BE: 'utf-32be'
-        }
-
-        # Go to beginning of file and read in 4 bytes
-        string = self.rawStream.read(4)
-        assert isinstance(string, bytes)
-
-        # Try detecting the BOM using bytes from the string
-        encoding = bomDict.get(string[:3])         # UTF-8
-        seek = 3
-        if not encoding:
-            # Need to detect UTF-32 before UTF-16
-            encoding = bomDict.get(string)         # UTF-32
-            seek = 4
-            if not encoding:
-                encoding = bomDict.get(string[:2])  # UTF-16
-                seek = 2
-
-        # Set the read position past the BOM if one was found, otherwise
-        # set it to the start of the stream
-        if encoding:
-            self.rawStream.seek(seek)
-            return lookupEncoding(encoding)
-        else:
-            self.rawStream.seek(0)
-            return None
-
-    def detectEncodingMeta(self):
-        """Report the encoding declared by the meta element
-        """
-        buffer = self.rawStream.read(self.numBytesMeta)
-        assert isinstance(buffer, bytes)
-        parser = EncodingParser(buffer)
-        self.rawStream.seek(0)
-        encoding = parser.getEncoding()
-
-        if encoding is not None and encoding.name in ("utf-16be", "utf-16le"):
-            encoding = lookupEncoding("utf-8")
-
-        return encoding
-
-
-class EncodingBytes(bytes):
-    """String-like object with an associated position and various extra methods
-    If the position is ever greater than the string length then an exception is
-    raised"""
-    def __new__(self, value):
-        assert isinstance(value, bytes)
-        return bytes.__new__(self, value.lower())
-
-    def __init__(self, value):
-        # pylint:disable=unused-argument
-        self._position = -1
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        p = self._position = self._position + 1
-        if p >= len(self):
-            raise StopIteration
-        elif p < 0:
-            raise TypeError
-        return self[p:p + 1]
-
-    def next(self):
-        # Py2 compat
-        return self.__next__()
-
-    def previous(self):
-        p = self._position
-        if p >= len(self):
-            raise StopIteration
-        elif p < 0:
-            raise TypeError
-        self._position = p = p - 1
-        return self[p:p + 1]
-
-    def setPosition(self, position):
-        if self._position >= len(self):
-            raise StopIteration
-        self._position = position
-
-    def getPosition(self):
-        if self._position >= len(self):
-            raise StopIteration
-        if self._position >= 0:
-            return self._position
-        else:
-            return None
-
-    position = property(getPosition, setPosition)
-
-    def getCurrentByte(self):
-        return self[self.position:self.position + 1]
-
-    currentByte = property(getCurrentByte)
-
-    def skip(self, chars=spaceCharactersBytes):
-        """Skip past a list of characters"""
-        p = self.position               # use property for the error-checking
-        while p < len(self):
-            c = self[p:p + 1]
-            if c not in chars:
-                self._position = p
-                return c
-            p += 1
-        self._position = p
-        return None
-
-    def skipUntil(self, chars):
-        p = self.position
-        while p < len(self):
-            c = self[p:p + 1]
-            if c in chars:
-                self._position = p
-                return c
-            p += 1
-        self._position = p
-        return None
-
-    def matchBytes(self, bytes):
-        """Look for a sequence of bytes at the start of a string. If the bytes
-        are found return True and advance the position to the byte after the
-        match. Otherwise return False and leave the position alone"""
-        rv = self.startswith(bytes, self.position)
-        if rv:
-            self.position += len(bytes)
-        return rv
-
-    def jumpTo(self, bytes):
-        """Look for the next sequence of bytes matching a given sequence. If
-        a match is found advance the position to the last byte of the match"""
-        try:
-            self._position = self.index(bytes, self.position) + len(bytes) - 1
-        except ValueError:
-            raise StopIteration
-        return True
-
-
-class EncodingParser(object):
-    """Mini parser for detecting character encoding from meta elements"""
-
-    def __init__(self, data):
-        """string - the data to work on for encoding detection"""
-        self.data = EncodingBytes(data)
-        self.encoding = None
-
-    def getEncoding(self):
-        if b"<meta" not in self.data:
-            return None
-
-        methodDispatch = (
-            (b"<!--", self.handleComment),
-            (b"<meta", self.handleMeta),
-            (b"</", self.handlePossibleEndTag),
-            (b"<!", self.handleOther),
-            (b"<?", self.handleOther),
-            (b"<", self.handlePossibleStartTag))
-        for _ in self.data:
-            keepParsing = True
-            try:
-                self.data.jumpTo(b"<")
-            except StopIteration:
-                break
-            for key, method in methodDispatch:
-                if self.data.matchBytes(key):
-                    try:
-                        keepParsing = method()
-                        break
-                    except StopIteration:
-                        keepParsing = False
-                        break
-            if not keepParsing:
-                break
-
-        return self.encoding
-
-    def handleComment(self):
-        """Skip over comments"""
-        return self.data.jumpTo(b"-->")
-
-    def handleMeta(self):
-        if self.data.currentByte not in spaceCharactersBytes:
-            # if we have <meta not followed by a space so just keep going
-            return True
-        # We have a valid meta element we want to search for attributes
-        hasPragma = False
-        pendingEncoding = None
-        while True:
-            # Try to find the next attribute after the current position
-            attr = self.getAttribute()
-            if attr is None:
-                return True
-            else:
-                if attr[0] == b"http-equiv":
-                    hasPragma = attr[1] == b"content-type"
-                    if hasPragma and pendingEncoding is not None:
-                        self.encoding = pendingEncoding
-                        return False
-                elif attr[0] == b"charset":
-                    tentativeEncoding = attr[1]
-                    codec = lookupEncoding(tentativeEncoding)
-                    if codec is not None:
-                        self.encoding = codec
-                        return False
-                elif attr[0] == b"content":
-                    contentParser = ContentAttrParser(EncodingBytes(attr[1]))
-                    tentativeEncoding = contentParser.parse()
-                    if tentativeEncoding is not None:
-                        codec = lookupEncoding(tentativeEncoding)
-                        if codec is not None:
-                            if hasPragma:
-                                self.encoding = codec
-                                return False
-                            else:
-                                pendingEncoding = codec
-
-    def handlePossibleStartTag(self):
-        return self.handlePossibleTag(False)
-
-    def handlePossibleEndTag(self):
-        next(self.data)
-        return self.handlePossibleTag(True)
-
-    def handlePossibleTag(self, endTag):
-        data = self.data
-        if data.currentByte not in asciiLettersBytes:
-            # If the next byte is not an ascii letter either ignore this
-            # fragment (possible start tag case) or treat it according to
-            # handleOther
-            if endTag:
-                data.previous()
-                self.handleOther()
-            return True
-
-        c = data.skipUntil(spacesAngleBrackets)
-        if c == b"<":
-            # return to the first step in the overall "two step" algorithm
-            # reprocessing the < byte
-            data.previous()
-        else:
-            # Read all attributes
-            attr = self.getAttribute()
-            while attr is not None:
-                attr = self.getAttribute()
-        return True
-
-    def handleOther(self):
-        return self.data.jumpTo(b">")
-
-    def getAttribute(self):
-        """Return a name,value pair for the next attribute in the stream,
-        if one is found, or None"""
-        data = self.data
-        # Step 1 (skip chars)
-        c = data.skip(spaceCharactersBytes | frozenset([b"/"]))
-        assert c is None or len(c) == 1
-        # Step 2
-        if c in (b">", None):
-            return None
-        # Step 3
-        attrName = []
-        attrValue = []
-        # Step 4 attribute name
-        while True:
-            if c == b"=" and attrName:
-                break
-            elif c in spaceCharactersBytes:
-                # Step 6!
-                c = data.skip()
-                break
-            elif c in (b"/", b">"):
-                return b"".join(attrName), b""
-            elif c in asciiUppercaseBytes:
-                attrName.append(c.lower())
-            elif c is None:
-                return None
-            else:
-                attrName.append(c)
-            # Step 5
-            c = next(data)
-        # Step 7
-        if c != b"=":
-            data.previous()
-            return b"".join(attrName), b""
-        # Step 8
-        next(data)
-        # Step 9
-        c = data.skip()
-        # Step 10
-        if c in (b"'", b'"'):
-            # 10.1
-            quoteChar = c
-            while True:
-                # 10.2
-                c = next(data)
-                # 10.3
-                if c == quoteChar:
-                    next(data)
-                    return b"".join(attrName), b"".join(attrValue)
-                # 10.4
-                elif c in asciiUppercaseBytes:
-                    attrValue.append(c.lower())
-                # 10.5
-                else:
-                    attrValue.append(c)
-        elif c == b">":
-            return b"".join(attrName), b""
-        elif c in asciiUppercaseBytes:
-            attrValue.append(c.lower())
-        elif c is None:
-            return None
-        else:
-            attrValue.append(c)
-        # Step 11
-        while True:
-            c = next(data)
-            if c in spacesAngleBrackets:
-                return b"".join(attrName), b"".join(attrValue)
-            elif c in asciiUppercaseBytes:
-                attrValue.append(c.lower())
-            elif c is None:
-                return None
-            else:
-                attrValue.append(c)
-
-
-class ContentAttrParser(object):
-    def __init__(self, data):
-        assert isinstance(data, bytes)
-        self.data = data
-
-    def parse(self):
-        try:
-            # Check if the attr name is charset
-            # otherwise return
-            self.data.jumpTo(b"charset")
-            self.data.position += 1
-            self.data.skip()
-            if not self.data.currentByte == b"=":
-                # If there is no = sign keep looking for attrs
-                return None
-            self.data.position += 1
-            self.data.skip()
-            # Look for an encoding between matching quote marks
-            if self.data.currentByte in (b'"', b"'"):
-                quoteMark = self.data.currentByte
-                self.data.position += 1
-                oldPosition = self.data.position
-                if self.data.jumpTo(quoteMark):
-                    return self.data[oldPosition:self.data.position]
-                else:
-                    return None
-            else:
-                # Unquoted value
-                oldPosition = self.data.position
-                try:
-                    self.data.skipUntil(spaceCharactersBytes)
-                    return self.data[oldPosition:self.data.position]
-                except StopIteration:
-                    # Return the whole remaining value
-                    return self.data[oldPosition:]
-        except StopIteration:
-            return None
-
-
-def lookupEncoding(encoding):
-    """Return the python codec name corresponding to an encoding or None if the
-    string doesn't correspond to a valid encoding."""
-    if isinstance(encoding, bytes):
-        try:
-            encoding = encoding.decode("ascii")
-        except UnicodeDecodeError:
-            return None
-
-    if encoding is not None:
-        try:
-            return webencodings.lookup(encoding)
-        except AttributeError:
-            return None
-    else:
-        return None
diff --git a/lib/bleach/_vendor/html5lib/_tokenizer.py b/lib/bleach/_vendor/html5lib/_tokenizer.py
deleted file mode 100644
index d8848016..00000000
--- a/lib/bleach/_vendor/html5lib/_tokenizer.py
+++ /dev/null
@@ -1,1735 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-from bleach.six_shim import unichr as chr
-
-from collections import deque, OrderedDict
-from sys import version_info
-
-from .constants import spaceCharacters
-from .constants import entities
-from .constants import asciiLetters, asciiUpper2Lower
-from .constants import digits, hexDigits, EOF
-from .constants import tokenTypes, tagTokenTypes
-from .constants import replacementCharacters
-
-from ._inputstream import HTMLInputStream
-
-from ._trie import Trie
-
-entitiesTrie = Trie(entities)
-
-if version_info >= (3, 7):
-    attributeMap = dict
-else:
-    attributeMap = OrderedDict
-
-
-class HTMLTokenizer(object):
-    """ This class takes care of tokenizing HTML.
-
-    * self.currentToken
-      Holds the token that is currently being processed.
-
-    * self.state
-      Holds a reference to the method to be invoked... XXX
-
-    * self.stream
-      Points to HTMLInputStream object.
-    """
-
-    def __init__(self, stream, parser=None, **kwargs):
-
-        self.stream = HTMLInputStream(stream, **kwargs)
-        self.parser = parser
-
-        # Setup the initial tokenizer state
-        self.escapeFlag = False
-        self.lastFourChars = []
-        self.state = self.dataState
-        self.escape = False
-
-        # The current token being created
-        self.currentToken = None
-        super(HTMLTokenizer, self).__init__()
-
-    def __iter__(self):
-        """ This is where the magic happens.
-
-        We do our usually processing through the states and when we have a token
-        to return we yield the token which pauses processing until the next token
-        is requested.
-        """
-        self.tokenQueue = deque([])
-        # Start processing. When EOF is reached self.state will return False
-        # instead of True and the loop will terminate.
-        while self.state():
-            while self.stream.errors:
-                yield {"type": tokenTypes["ParseError"], "data": self.stream.errors.pop(0)}
-            while self.tokenQueue:
-                yield self.tokenQueue.popleft()
-
-    def consumeNumberEntity(self, isHex):
-        """This function returns either U+FFFD or the character based on the
-        decimal or hexadecimal representation. It also discards ";" if present.
-        If not present self.tokenQueue.append({"type": tokenTypes["ParseError"]}) is invoked.
-        """
-
-        allowed = digits
-        radix = 10
-        if isHex:
-            allowed = hexDigits
-            radix = 16
-
-        charStack = []
-
-        # Consume all the characters that are in range while making sure we
-        # don't hit an EOF.
-        c = self.stream.char()
-        while c in allowed and c is not EOF:
-            charStack.append(c)
-            c = self.stream.char()
-
-        # Convert the set of characters consumed to an int.
-        charAsInt = int("".join(charStack), radix)
-
-        # Certain characters get replaced with others
-        if charAsInt in replacementCharacters:
-            char = replacementCharacters[charAsInt]
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "illegal-codepoint-for-numeric-entity",
-                                    "datavars": {"charAsInt": charAsInt}})
-        elif ((0xD800 <= charAsInt <= 0xDFFF) or
-              (charAsInt > 0x10FFFF)):
-            char = "\uFFFD"
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "illegal-codepoint-for-numeric-entity",
-                                    "datavars": {"charAsInt": charAsInt}})
-        else:
-            # Should speed up this check somehow (e.g. move the set to a constant)
-            if ((0x0001 <= charAsInt <= 0x0008) or
-                (0x000E <= charAsInt <= 0x001F) or
-                (0x007F <= charAsInt <= 0x009F) or
-                (0xFDD0 <= charAsInt <= 0xFDEF) or
-                charAsInt in frozenset([0x000B, 0xFFFE, 0xFFFF, 0x1FFFE,
-                                        0x1FFFF, 0x2FFFE, 0x2FFFF, 0x3FFFE,
-                                        0x3FFFF, 0x4FFFE, 0x4FFFF, 0x5FFFE,
-                                        0x5FFFF, 0x6FFFE, 0x6FFFF, 0x7FFFE,
-                                        0x7FFFF, 0x8FFFE, 0x8FFFF, 0x9FFFE,
-                                        0x9FFFF, 0xAFFFE, 0xAFFFF, 0xBFFFE,
-                                        0xBFFFF, 0xCFFFE, 0xCFFFF, 0xDFFFE,
-                                        0xDFFFF, 0xEFFFE, 0xEFFFF, 0xFFFFE,
-                                        0xFFFFF, 0x10FFFE, 0x10FFFF])):
-                self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                        "data":
-                                        "illegal-codepoint-for-numeric-entity",
-                                        "datavars": {"charAsInt": charAsInt}})
-            try:
-                # Try/except needed as UCS-2 Python builds' unichar only works
-                # within the BMP.
-                char = chr(charAsInt)
-            except ValueError:
-                v = charAsInt - 0x10000
-                char = chr(0xD800 | (v >> 10)) + chr(0xDC00 | (v & 0x3FF))
-
-        # Discard the ; if present. Otherwise, put it back on the queue and
-        # invoke parseError on parser.
-        if c != ";":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "numeric-entity-without-semicolon"})
-            self.stream.unget(c)
-
-        return char
-
-    def consumeEntity(self, allowedChar=None, fromAttribute=False):
-        # Initialise to the default output for when no entity is matched
-        output = "&"
-
-        charStack = [self.stream.char()]
-        if (charStack[0] in spaceCharacters or charStack[0] in (EOF, "<", "&") or
-                (allowedChar is not None and allowedChar == charStack[0])):
-            self.stream.unget(charStack[0])
-
-        elif charStack[0] == "#":
-            # Read the next character to see if it's hex or decimal
-            hex = False
-            charStack.append(self.stream.char())
-            if charStack[-1] in ("x", "X"):
-                hex = True
-                charStack.append(self.stream.char())
-
-            # charStack[-1] should be the first digit
-            if (hex and charStack[-1] in hexDigits) \
-                    or (not hex and charStack[-1] in digits):
-                # At least one digit found, so consume the whole number
-                self.stream.unget(charStack[-1])
-                output = self.consumeNumberEntity(hex)
-            else:
-                # No digits found
-                self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                        "data": "expected-numeric-entity"})
-                self.stream.unget(charStack.pop())
-                output = "&" + "".join(charStack)
-
-        else:
-            # At this point in the process might have named entity. Entities
-            # are stored in the global variable "entities".
-            #
-            # Consume characters and compare to these to a substring of the
-            # entity names in the list until the substring no longer matches.
-            while (charStack[-1] is not EOF):
-                if not entitiesTrie.has_keys_with_prefix("".join(charStack)):
-                    break
-                charStack.append(self.stream.char())
-
-            # At this point we have a string that starts with some characters
-            # that may match an entity
-            # Try to find the longest entity the string will match to take care
-            # of &noti for instance.
-            try:
-                entityName = entitiesTrie.longest_prefix("".join(charStack[:-1]))
-                entityLength = len(entityName)
-            except KeyError:
-                entityName = None
-
-            if entityName is not None:
-                if entityName[-1] != ";":
-                    self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                            "named-entity-without-semicolon"})
-                if (entityName[-1] != ";" and fromAttribute and
-                    (charStack[entityLength] in asciiLetters or
-                     charStack[entityLength] in digits or
-                     charStack[entityLength] == "=")):
-                    self.stream.unget(charStack.pop())
-                    output = "&" + "".join(charStack)
-                else:
-                    output = entities[entityName]
-                    self.stream.unget(charStack.pop())
-                    output += "".join(charStack[entityLength:])
-            else:
-                self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                        "expected-named-entity"})
-                self.stream.unget(charStack.pop())
-                output = "&" + "".join(charStack)
-
-        if fromAttribute:
-            self.currentToken["data"][-1][1] += output
-        else:
-            if output in spaceCharacters:
-                tokenType = "SpaceCharacters"
-            else:
-                tokenType = "Characters"
-            self.tokenQueue.append({"type": tokenTypes[tokenType], "data": output})
-
-    def processEntityInAttribute(self, allowedChar):
-        """This method replaces the need for "entityInAttributeValueState".
-        """
-        self.consumeEntity(allowedChar=allowedChar, fromAttribute=True)
-
-    def emitCurrentToken(self):
-        """This method is a generic handler for emitting the tags. It also sets
-        the state to "data" because that's what's needed after a token has been
-        emitted.
-        """
-        token = self.currentToken
-        # Add token to the queue to be yielded
-        if (token["type"] in tagTokenTypes):
-            token["name"] = token["name"].translate(asciiUpper2Lower)
-            if token["type"] == tokenTypes["StartTag"]:
-                raw = token["data"]
-                data = attributeMap(raw)
-                if len(raw) > len(data):
-                    # we had some duplicated attribute, fix so first wins
-                    data.update(raw[::-1])
-                token["data"] = data
-
-            if token["type"] == tokenTypes["EndTag"]:
-                if token["data"]:
-                    self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                            "data": "attributes-in-end-tag"})
-                if token["selfClosing"]:
-                    self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                            "data": "self-closing-flag-on-end-tag"})
-        self.tokenQueue.append(token)
-        self.state = self.dataState
-
-    # Below are the various tokenizer states worked out.
-    def dataState(self):
-        data = self.stream.char()
-        if data == "&":
-            self.state = self.entityDataState
-        elif data == "<":
-            self.state = self.tagOpenState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "\u0000"})
-        elif data is EOF:
-            # Tokenization ends.
-            return False
-        elif data in spaceCharacters:
-            # Directly after emitting a token you switch back to the "data
-            # state". At that point spaceCharacters are important so they are
-            # emitted separately.
-            self.tokenQueue.append({"type": tokenTypes["SpaceCharacters"], "data":
-                                    data + self.stream.charsUntil(spaceCharacters, True)})
-            # No need to update lastFourChars here, since the first space will
-            # have already been appended to lastFourChars and will have broken
-            # any <!-- or --> sequences
-        else:
-            chars = self.stream.charsUntil(("&", "<", "\u0000"))
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
-                                    data + chars})
-        return True
-
-    def entityDataState(self):
-        self.consumeEntity()
-        self.state = self.dataState
-        return True
-
-    def rcdataState(self):
-        data = self.stream.char()
-        if data == "&":
-            self.state = self.characterReferenceInRcdata
-        elif data == "<":
-            self.state = self.rcdataLessThanSignState
-        elif data == EOF:
-            # Tokenization ends.
-            return False
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "\uFFFD"})
-        elif data in spaceCharacters:
-            # Directly after emitting a token you switch back to the "data
-            # state". At that point spaceCharacters are important so they are
-            # emitted separately.
-            self.tokenQueue.append({"type": tokenTypes["SpaceCharacters"], "data":
-                                    data + self.stream.charsUntil(spaceCharacters, True)})
-            # No need to update lastFourChars here, since the first space will
-            # have already been appended to lastFourChars and will have broken
-            # any <!-- or --> sequences
-        else:
-            chars = self.stream.charsUntil(("&", "<", "\u0000"))
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
-                                    data + chars})
-        return True
-
-    def characterReferenceInRcdata(self):
-        self.consumeEntity()
-        self.state = self.rcdataState
-        return True
-
-    def rawtextState(self):
-        data = self.stream.char()
-        if data == "<":
-            self.state = self.rawtextLessThanSignState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "\uFFFD"})
-        elif data == EOF:
-            # Tokenization ends.
-            return False
-        else:
-            chars = self.stream.charsUntil(("<", "\u0000"))
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
-                                    data + chars})
-        return True
-
-    def scriptDataState(self):
-        data = self.stream.char()
-        if data == "<":
-            self.state = self.scriptDataLessThanSignState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "\uFFFD"})
-        elif data == EOF:
-            # Tokenization ends.
-            return False
-        else:
-            chars = self.stream.charsUntil(("<", "\u0000"))
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
-                                    data + chars})
-        return True
-
-    def plaintextState(self):
-        data = self.stream.char()
-        if data == EOF:
-            # Tokenization ends.
-            return False
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "\uFFFD"})
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
-                                    data + self.stream.charsUntil("\u0000")})
-        return True
-
-    def tagOpenState(self):
-        data = self.stream.char()
-        if data == "!":
-            self.state = self.markupDeclarationOpenState
-        elif data == "/":
-            self.state = self.closeTagOpenState
-        elif data in asciiLetters:
-            self.currentToken = {"type": tokenTypes["StartTag"],
-                                 "name": data, "data": [],
-                                 "selfClosing": False,
-                                 "selfClosingAcknowledged": False}
-            self.state = self.tagNameState
-        elif data == ">":
-            # XXX In theory it could be something besides a tag name. But
-            # do we really care?
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-tag-name-but-got-right-bracket"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<>"})
-            self.state = self.dataState
-        elif data == "?":
-            # XXX In theory it could be something besides a tag name. But
-            # do we really care?
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-tag-name-but-got-question-mark"})
-            self.stream.unget(data)
-            self.state = self.bogusCommentState
-        else:
-            # XXX
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-tag-name"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
-            self.stream.unget(data)
-            self.state = self.dataState
-        return True
-
-    def closeTagOpenState(self):
-        data = self.stream.char()
-        if data in asciiLetters:
-            self.currentToken = {"type": tokenTypes["EndTag"], "name": data,
-                                 "data": [], "selfClosing": False}
-            self.state = self.tagNameState
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-closing-tag-but-got-right-bracket"})
-            self.state = self.dataState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-closing-tag-but-got-eof"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "</"})
-            self.state = self.dataState
-        else:
-            # XXX data can be _'_...
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-closing-tag-but-got-char",
-                                    "datavars": {"data": data}})
-            self.stream.unget(data)
-            self.state = self.bogusCommentState
-        return True
-
-    def tagNameState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.state = self.beforeAttributeNameState
-        elif data == ">":
-            self.emitCurrentToken()
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-tag-name"})
-            self.state = self.dataState
-        elif data == "/":
-            self.state = self.selfClosingStartTagState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["name"] += "\uFFFD"
-        else:
-            self.currentToken["name"] += data
-            # (Don't use charsUntil here, because tag names are
-            # very short and it's faster to not do anything fancy)
-        return True
-
-    def rcdataLessThanSignState(self):
-        data = self.stream.char()
-        if data == "/":
-            self.temporaryBuffer = ""
-            self.state = self.rcdataEndTagOpenState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
-            self.stream.unget(data)
-            self.state = self.rcdataState
-        return True
-
-    def rcdataEndTagOpenState(self):
-        data = self.stream.char()
-        if data in asciiLetters:
-            self.temporaryBuffer += data
-            self.state = self.rcdataEndTagNameState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "</"})
-            self.stream.unget(data)
-            self.state = self.rcdataState
-        return True
-
-    def rcdataEndTagNameState(self):
-        appropriate = self.currentToken and self.currentToken["name"].lower() == self.temporaryBuffer.lower()
-        data = self.stream.char()
-        if data in spaceCharacters and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.state = self.beforeAttributeNameState
-        elif data == "/" and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.state = self.selfClosingStartTagState
-        elif data == ">" and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.emitCurrentToken()
-            self.state = self.dataState
-        elif data in asciiLetters:
-            self.temporaryBuffer += data
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "</" + self.temporaryBuffer})
-            self.stream.unget(data)
-            self.state = self.rcdataState
-        return True
-
-    def rawtextLessThanSignState(self):
-        data = self.stream.char()
-        if data == "/":
-            self.temporaryBuffer = ""
-            self.state = self.rawtextEndTagOpenState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
-            self.stream.unget(data)
-            self.state = self.rawtextState
-        return True
-
-    def rawtextEndTagOpenState(self):
-        data = self.stream.char()
-        if data in asciiLetters:
-            self.temporaryBuffer += data
-            self.state = self.rawtextEndTagNameState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "</"})
-            self.stream.unget(data)
-            self.state = self.rawtextState
-        return True
-
-    def rawtextEndTagNameState(self):
-        appropriate = self.currentToken and self.currentToken["name"].lower() == self.temporaryBuffer.lower()
-        data = self.stream.char()
-        if data in spaceCharacters and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.state = self.beforeAttributeNameState
-        elif data == "/" and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.state = self.selfClosingStartTagState
-        elif data == ">" and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.emitCurrentToken()
-            self.state = self.dataState
-        elif data in asciiLetters:
-            self.temporaryBuffer += data
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "</" + self.temporaryBuffer})
-            self.stream.unget(data)
-            self.state = self.rawtextState
-        return True
-
-    def scriptDataLessThanSignState(self):
-        data = self.stream.char()
-        if data == "/":
-            self.temporaryBuffer = ""
-            self.state = self.scriptDataEndTagOpenState
-        elif data == "!":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<!"})
-            self.state = self.scriptDataEscapeStartState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
-            self.stream.unget(data)
-            self.state = self.scriptDataState
-        return True
-
-    def scriptDataEndTagOpenState(self):
-        data = self.stream.char()
-        if data in asciiLetters:
-            self.temporaryBuffer += data
-            self.state = self.scriptDataEndTagNameState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "</"})
-            self.stream.unget(data)
-            self.state = self.scriptDataState
-        return True
-
-    def scriptDataEndTagNameState(self):
-        appropriate = self.currentToken and self.currentToken["name"].lower() == self.temporaryBuffer.lower()
-        data = self.stream.char()
-        if data in spaceCharacters and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.state = self.beforeAttributeNameState
-        elif data == "/" and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.state = self.selfClosingStartTagState
-        elif data == ">" and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.emitCurrentToken()
-            self.state = self.dataState
-        elif data in asciiLetters:
-            self.temporaryBuffer += data
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "</" + self.temporaryBuffer})
-            self.stream.unget(data)
-            self.state = self.scriptDataState
-        return True
-
-    def scriptDataEscapeStartState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
-            self.state = self.scriptDataEscapeStartDashState
-        else:
-            self.stream.unget(data)
-            self.state = self.scriptDataState
-        return True
-
-    def scriptDataEscapeStartDashState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
-            self.state = self.scriptDataEscapedDashDashState
-        else:
-            self.stream.unget(data)
-            self.state = self.scriptDataState
-        return True
-
-    def scriptDataEscapedState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
-            self.state = self.scriptDataEscapedDashState
-        elif data == "<":
-            self.state = self.scriptDataEscapedLessThanSignState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "\uFFFD"})
-        elif data == EOF:
-            self.state = self.dataState
-        else:
-            chars = self.stream.charsUntil(("<", "-", "\u0000"))
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
-                                    data + chars})
-        return True
-
-    def scriptDataEscapedDashState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
-            self.state = self.scriptDataEscapedDashDashState
-        elif data == "<":
-            self.state = self.scriptDataEscapedLessThanSignState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "\uFFFD"})
-            self.state = self.scriptDataEscapedState
-        elif data == EOF:
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
-            self.state = self.scriptDataEscapedState
-        return True
-
-    def scriptDataEscapedDashDashState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
-        elif data == "<":
-            self.state = self.scriptDataEscapedLessThanSignState
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": ">"})
-            self.state = self.scriptDataState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "\uFFFD"})
-            self.state = self.scriptDataEscapedState
-        elif data == EOF:
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
-            self.state = self.scriptDataEscapedState
-        return True
-
-    def scriptDataEscapedLessThanSignState(self):
-        data = self.stream.char()
-        if data == "/":
-            self.temporaryBuffer = ""
-            self.state = self.scriptDataEscapedEndTagOpenState
-        elif data in asciiLetters:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<" + data})
-            self.temporaryBuffer = data
-            self.state = self.scriptDataDoubleEscapeStartState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
-            self.stream.unget(data)
-            self.state = self.scriptDataEscapedState
-        return True
-
-    def scriptDataEscapedEndTagOpenState(self):
-        data = self.stream.char()
-        if data in asciiLetters:
-            self.temporaryBuffer = data
-            self.state = self.scriptDataEscapedEndTagNameState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "</"})
-            self.stream.unget(data)
-            self.state = self.scriptDataEscapedState
-        return True
-
-    def scriptDataEscapedEndTagNameState(self):
-        appropriate = self.currentToken and self.currentToken["name"].lower() == self.temporaryBuffer.lower()
-        data = self.stream.char()
-        if data in spaceCharacters and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.state = self.beforeAttributeNameState
-        elif data == "/" and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.state = self.selfClosingStartTagState
-        elif data == ">" and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.emitCurrentToken()
-            self.state = self.dataState
-        elif data in asciiLetters:
-            self.temporaryBuffer += data
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "</" + self.temporaryBuffer})
-            self.stream.unget(data)
-            self.state = self.scriptDataEscapedState
-        return True
-
-    def scriptDataDoubleEscapeStartState(self):
-        data = self.stream.char()
-        if data in (spaceCharacters | frozenset(("/", ">"))):
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
-            if self.temporaryBuffer.lower() == "script":
-                self.state = self.scriptDataDoubleEscapedState
-            else:
-                self.state = self.scriptDataEscapedState
-        elif data in asciiLetters:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
-            self.temporaryBuffer += data
-        else:
-            self.stream.unget(data)
-            self.state = self.scriptDataEscapedState
-        return True
-
-    def scriptDataDoubleEscapedState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
-            self.state = self.scriptDataDoubleEscapedDashState
-        elif data == "<":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
-            self.state = self.scriptDataDoubleEscapedLessThanSignState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "\uFFFD"})
-        elif data == EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-script-in-script"})
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
-        return True
-
-    def scriptDataDoubleEscapedDashState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
-            self.state = self.scriptDataDoubleEscapedDashDashState
-        elif data == "<":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
-            self.state = self.scriptDataDoubleEscapedLessThanSignState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "\uFFFD"})
-            self.state = self.scriptDataDoubleEscapedState
-        elif data == EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-script-in-script"})
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
-            self.state = self.scriptDataDoubleEscapedState
-        return True
-
-    def scriptDataDoubleEscapedDashDashState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
-        elif data == "<":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
-            self.state = self.scriptDataDoubleEscapedLessThanSignState
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": ">"})
-            self.state = self.scriptDataState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "\uFFFD"})
-            self.state = self.scriptDataDoubleEscapedState
-        elif data == EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-script-in-script"})
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
-            self.state = self.scriptDataDoubleEscapedState
-        return True
-
-    def scriptDataDoubleEscapedLessThanSignState(self):
-        data = self.stream.char()
-        if data == "/":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "/"})
-            self.temporaryBuffer = ""
-            self.state = self.scriptDataDoubleEscapeEndState
-        else:
-            self.stream.unget(data)
-            self.state = self.scriptDataDoubleEscapedState
-        return True
-
-    def scriptDataDoubleEscapeEndState(self):
-        data = self.stream.char()
-        if data in (spaceCharacters | frozenset(("/", ">"))):
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
-            if self.temporaryBuffer.lower() == "script":
-                self.state = self.scriptDataEscapedState
-            else:
-                self.state = self.scriptDataDoubleEscapedState
-        elif data in asciiLetters:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
-            self.temporaryBuffer += data
-        else:
-            self.stream.unget(data)
-            self.state = self.scriptDataDoubleEscapedState
-        return True
-
-    def beforeAttributeNameState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.stream.charsUntil(spaceCharacters, True)
-        elif data in asciiLetters:
-            self.currentToken["data"].append([data, ""])
-            self.state = self.attributeNameState
-        elif data == ">":
-            self.emitCurrentToken()
-        elif data == "/":
-            self.state = self.selfClosingStartTagState
-        elif data in ("'", '"', "=", "<"):
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "invalid-character-in-attribute-name"})
-            self.currentToken["data"].append([data, ""])
-            self.state = self.attributeNameState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"].append(["\uFFFD", ""])
-            self.state = self.attributeNameState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-attribute-name-but-got-eof"})
-            self.state = self.dataState
-        else:
-            self.currentToken["data"].append([data, ""])
-            self.state = self.attributeNameState
-        return True
-
-    def attributeNameState(self):
-        data = self.stream.char()
-        leavingThisState = True
-        emitToken = False
-        if data == "=":
-            self.state = self.beforeAttributeValueState
-        elif data in asciiLetters:
-            self.currentToken["data"][-1][0] += data +\
-                self.stream.charsUntil(asciiLetters, True)
-            leavingThisState = False
-        elif data == ">":
-            # XXX If we emit here the attributes are converted to a dict
-            # without being checked and when the code below runs we error
-            # because data is a dict not a list
-            emitToken = True
-        elif data in spaceCharacters:
-            self.state = self.afterAttributeNameState
-        elif data == "/":
-            self.state = self.selfClosingStartTagState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"][-1][0] += "\uFFFD"
-            leavingThisState = False
-        elif data in ("'", '"', "<"):
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data":
-                                    "invalid-character-in-attribute-name"})
-            self.currentToken["data"][-1][0] += data
-            leavingThisState = False
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "eof-in-attribute-name"})
-            self.state = self.dataState
-        else:
-            self.currentToken["data"][-1][0] += data
-            leavingThisState = False
-
-        if leavingThisState:
-            # Attributes are not dropped at this stage. That happens when the
-            # start tag token is emitted so values can still be safely appended
-            # to attributes, but we do want to report the parse error in time.
-            self.currentToken["data"][-1][0] = (
-                self.currentToken["data"][-1][0].translate(asciiUpper2Lower))
-            for name, _ in self.currentToken["data"][:-1]:
-                if self.currentToken["data"][-1][0] == name:
-                    self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                            "duplicate-attribute"})
-                    break
-            # XXX Fix for above XXX
-            if emitToken:
-                self.emitCurrentToken()
-        return True
-
-    def afterAttributeNameState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.stream.charsUntil(spaceCharacters, True)
-        elif data == "=":
-            self.state = self.beforeAttributeValueState
-        elif data == ">":
-            self.emitCurrentToken()
-        elif data in asciiLetters:
-            self.currentToken["data"].append([data, ""])
-            self.state = self.attributeNameState
-        elif data == "/":
-            self.state = self.selfClosingStartTagState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"].append(["\uFFFD", ""])
-            self.state = self.attributeNameState
-        elif data in ("'", '"', "<"):
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "invalid-character-after-attribute-name"})
-            self.currentToken["data"].append([data, ""])
-            self.state = self.attributeNameState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-end-of-tag-but-got-eof"})
-            self.state = self.dataState
-        else:
-            self.currentToken["data"].append([data, ""])
-            self.state = self.attributeNameState
-        return True
-
-    def beforeAttributeValueState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.stream.charsUntil(spaceCharacters, True)
-        elif data == "\"":
-            self.state = self.attributeValueDoubleQuotedState
-        elif data == "&":
-            self.state = self.attributeValueUnQuotedState
-            self.stream.unget(data)
-        elif data == "'":
-            self.state = self.attributeValueSingleQuotedState
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-attribute-value-but-got-right-bracket"})
-            self.emitCurrentToken()
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"][-1][1] += "\uFFFD"
-            self.state = self.attributeValueUnQuotedState
-        elif data in ("=", "<", "`"):
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "equals-in-unquoted-attribute-value"})
-            self.currentToken["data"][-1][1] += data
-            self.state = self.attributeValueUnQuotedState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-attribute-value-but-got-eof"})
-            self.state = self.dataState
-        else:
-            self.currentToken["data"][-1][1] += data
-            self.state = self.attributeValueUnQuotedState
-        return True
-
-    def attributeValueDoubleQuotedState(self):
-        data = self.stream.char()
-        if data == "\"":
-            self.state = self.afterAttributeValueState
-        elif data == "&":
-            self.processEntityInAttribute('"')
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"][-1][1] += "\uFFFD"
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-attribute-value-double-quote"})
-            self.state = self.dataState
-        else:
-            self.currentToken["data"][-1][1] += data +\
-                self.stream.charsUntil(("\"", "&", "\u0000"))
-        return True
-
-    def attributeValueSingleQuotedState(self):
-        data = self.stream.char()
-        if data == "'":
-            self.state = self.afterAttributeValueState
-        elif data == "&":
-            self.processEntityInAttribute("'")
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"][-1][1] += "\uFFFD"
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-attribute-value-single-quote"})
-            self.state = self.dataState
-        else:
-            self.currentToken["data"][-1][1] += data +\
-                self.stream.charsUntil(("'", "&", "\u0000"))
-        return True
-
-    def attributeValueUnQuotedState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.state = self.beforeAttributeNameState
-        elif data == "&":
-            self.processEntityInAttribute(">")
-        elif data == ">":
-            self.emitCurrentToken()
-        elif data in ('"', "'", "=", "<", "`"):
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-character-in-unquoted-attribute-value"})
-            self.currentToken["data"][-1][1] += data
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"][-1][1] += "\uFFFD"
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-attribute-value-no-quotes"})
-            self.state = self.dataState
-        else:
-            self.currentToken["data"][-1][1] += data + self.stream.charsUntil(
-                frozenset(("&", ">", '"', "'", "=", "<", "`", "\u0000")) | spaceCharacters)
-        return True
-
-    def afterAttributeValueState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.state = self.beforeAttributeNameState
-        elif data == ">":
-            self.emitCurrentToken()
-        elif data == "/":
-            self.state = self.selfClosingStartTagState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-EOF-after-attribute-value"})
-            self.stream.unget(data)
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-character-after-attribute-value"})
-            self.stream.unget(data)
-            self.state = self.beforeAttributeNameState
-        return True
-
-    def selfClosingStartTagState(self):
-        data = self.stream.char()
-        if data == ">":
-            self.currentToken["selfClosing"] = True
-            self.emitCurrentToken()
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data":
-                                    "unexpected-EOF-after-solidus-in-tag"})
-            self.stream.unget(data)
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-character-after-solidus-in-tag"})
-            self.stream.unget(data)
-            self.state = self.beforeAttributeNameState
-        return True
-
-    def bogusCommentState(self):
-        # Make a new comment token and give it as value all the characters
-        # until the first > or EOF (charsUntil checks for EOF automatically)
-        # and emit it.
-        data = self.stream.charsUntil(">")
-        data = data.replace("\u0000", "\uFFFD")
-        self.tokenQueue.append(
-            {"type": tokenTypes["Comment"], "data": data})
-
-        # Eat the character directly after the bogus comment which is either a
-        # ">" or an EOF.
-        self.stream.char()
-        self.state = self.dataState
-        return True
-
-    def markupDeclarationOpenState(self):
-        charStack = [self.stream.char()]
-        if charStack[-1] == "-":
-            charStack.append(self.stream.char())
-            if charStack[-1] == "-":
-                self.currentToken = {"type": tokenTypes["Comment"], "data": ""}
-                self.state = self.commentStartState
-                return True
-        elif charStack[-1] in ('d', 'D'):
-            matched = True
-            for expected in (('o', 'O'), ('c', 'C'), ('t', 'T'),
-                             ('y', 'Y'), ('p', 'P'), ('e', 'E')):
-                charStack.append(self.stream.char())
-                if charStack[-1] not in expected:
-                    matched = False
-                    break
-            if matched:
-                self.currentToken = {"type": tokenTypes["Doctype"],
-                                     "name": "",
-                                     "publicId": None, "systemId": None,
-                                     "correct": True}
-                self.state = self.doctypeState
-                return True
-        elif (charStack[-1] == "[" and
-              self.parser is not None and
-              self.parser.tree.openElements and
-              self.parser.tree.openElements[-1].namespace != self.parser.tree.defaultNamespace):
-            matched = True
-            for expected in ["C", "D", "A", "T", "A", "["]:
-                charStack.append(self.stream.char())
-                if charStack[-1] != expected:
-                    matched = False
-                    break
-            if matched:
-                self.state = self.cdataSectionState
-                return True
-
-        self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                "expected-dashes-or-doctype"})
-
-        while charStack:
-            self.stream.unget(charStack.pop())
-        self.state = self.bogusCommentState
-        return True
-
-    def commentStartState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.state = self.commentStartDashState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"] += "\uFFFD"
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "incorrect-comment"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-comment"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.currentToken["data"] += data
-            self.state = self.commentState
-        return True
-
-    def commentStartDashState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.state = self.commentEndState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"] += "-\uFFFD"
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "incorrect-comment"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-comment"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.currentToken["data"] += "-" + data
-            self.state = self.commentState
-        return True
-
-    def commentState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.state = self.commentEndDashState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"] += "\uFFFD"
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "eof-in-comment"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.currentToken["data"] += data + \
-                self.stream.charsUntil(("-", "\u0000"))
-        return True
-
-    def commentEndDashState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.state = self.commentEndState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"] += "-\uFFFD"
-            self.state = self.commentState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-comment-end-dash"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.currentToken["data"] += "-" + data
-            self.state = self.commentState
-        return True
-
-    def commentEndState(self):
-        data = self.stream.char()
-        if data == ">":
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"] += "--\uFFFD"
-            self.state = self.commentState
-        elif data == "!":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-bang-after-double-dash-in-comment"})
-            self.state = self.commentEndBangState
-        elif data == "-":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-dash-after-double-dash-in-comment"})
-            self.currentToken["data"] += data
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-comment-double-dash"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            # XXX
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-char-in-comment"})
-            self.currentToken["data"] += "--" + data
-            self.state = self.commentState
-        return True
-
-    def commentEndBangState(self):
-        data = self.stream.char()
-        if data == ">":
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data == "-":
-            self.currentToken["data"] += "--!"
-            self.state = self.commentEndDashState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"] += "--!\uFFFD"
-            self.state = self.commentState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-comment-end-bang-state"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.currentToken["data"] += "--!" + data
-            self.state = self.commentState
-        return True
-
-    def doctypeState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.state = self.beforeDoctypeNameState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-doctype-name-but-got-eof"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "need-space-after-doctype"})
-            self.stream.unget(data)
-            self.state = self.beforeDoctypeNameState
-        return True
-
-    def beforeDoctypeNameState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            pass
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-doctype-name-but-got-right-bracket"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["name"] = "\uFFFD"
-            self.state = self.doctypeNameState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-doctype-name-but-got-eof"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.currentToken["name"] = data
-            self.state = self.doctypeNameState
-        return True
-
-    def doctypeNameState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.currentToken["name"] = self.currentToken["name"].translate(asciiUpper2Lower)
-            self.state = self.afterDoctypeNameState
-        elif data == ">":
-            self.currentToken["name"] = self.currentToken["name"].translate(asciiUpper2Lower)
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["name"] += "\uFFFD"
-            self.state = self.doctypeNameState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype-name"})
-            self.currentToken["correct"] = False
-            self.currentToken["name"] = self.currentToken["name"].translate(asciiUpper2Lower)
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.currentToken["name"] += data
-        return True
-
-    def afterDoctypeNameState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            pass
-        elif data == ">":
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data is EOF:
-            self.currentToken["correct"] = False
-            self.stream.unget(data)
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            if data in ("p", "P"):
-                matched = True
-                for expected in (("u", "U"), ("b", "B"), ("l", "L"),
-                                 ("i", "I"), ("c", "C")):
-                    data = self.stream.char()
-                    if data not in expected:
-                        matched = False
-                        break
-                if matched:
-                    self.state = self.afterDoctypePublicKeywordState
-                    return True
-            elif data in ("s", "S"):
-                matched = True
-                for expected in (("y", "Y"), ("s", "S"), ("t", "T"),
-                                 ("e", "E"), ("m", "M")):
-                    data = self.stream.char()
-                    if data not in expected:
-                        matched = False
-                        break
-                if matched:
-                    self.state = self.afterDoctypeSystemKeywordState
-                    return True
-
-            # All the characters read before the current 'data' will be
-            # [a-zA-Z], so they're garbage in the bogus doctype and can be
-            # discarded; only the latest character might be '>' or EOF
-            # and needs to be ungetted
-            self.stream.unget(data)
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-space-or-right-bracket-in-doctype", "datavars":
-                                    {"data": data}})
-            self.currentToken["correct"] = False
-            self.state = self.bogusDoctypeState
-
-        return True
-
-    def afterDoctypePublicKeywordState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.state = self.beforeDoctypePublicIdentifierState
-        elif data in ("'", '"'):
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-char-in-doctype"})
-            self.stream.unget(data)
-            self.state = self.beforeDoctypePublicIdentifierState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.stream.unget(data)
-            self.state = self.beforeDoctypePublicIdentifierState
-        return True
-
-    def beforeDoctypePublicIdentifierState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            pass
-        elif data == "\"":
-            self.currentToken["publicId"] = ""
-            self.state = self.doctypePublicIdentifierDoubleQuotedState
-        elif data == "'":
-            self.currentToken["publicId"] = ""
-            self.state = self.doctypePublicIdentifierSingleQuotedState
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-end-of-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-char-in-doctype"})
-            self.currentToken["correct"] = False
-            self.state = self.bogusDoctypeState
-        return True
-
-    def doctypePublicIdentifierDoubleQuotedState(self):
-        data = self.stream.char()
-        if data == "\"":
-            self.state = self.afterDoctypePublicIdentifierState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["publicId"] += "\uFFFD"
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-end-of-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.currentToken["publicId"] += data
-        return True
-
-    def doctypePublicIdentifierSingleQuotedState(self):
-        data = self.stream.char()
-        if data == "'":
-            self.state = self.afterDoctypePublicIdentifierState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["publicId"] += "\uFFFD"
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-end-of-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.currentToken["publicId"] += data
-        return True
-
-    def afterDoctypePublicIdentifierState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.state = self.betweenDoctypePublicAndSystemIdentifiersState
-        elif data == ">":
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data == '"':
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-char-in-doctype"})
-            self.currentToken["systemId"] = ""
-            self.state = self.doctypeSystemIdentifierDoubleQuotedState
-        elif data == "'":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-char-in-doctype"})
-            self.currentToken["systemId"] = ""
-            self.state = self.doctypeSystemIdentifierSingleQuotedState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-char-in-doctype"})
-            self.currentToken["correct"] = False
-            self.state = self.bogusDoctypeState
-        return True
-
-    def betweenDoctypePublicAndSystemIdentifiersState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            pass
-        elif data == ">":
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data == '"':
-            self.currentToken["systemId"] = ""
-            self.state = self.doctypeSystemIdentifierDoubleQuotedState
-        elif data == "'":
-            self.currentToken["systemId"] = ""
-            self.state = self.doctypeSystemIdentifierSingleQuotedState
-        elif data == EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-char-in-doctype"})
-            self.currentToken["correct"] = False
-            self.state = self.bogusDoctypeState
-        return True
-
-    def afterDoctypeSystemKeywordState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.state = self.beforeDoctypeSystemIdentifierState
-        elif data in ("'", '"'):
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-char-in-doctype"})
-            self.stream.unget(data)
-            self.state = self.beforeDoctypeSystemIdentifierState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.stream.unget(data)
-            self.state = self.beforeDoctypeSystemIdentifierState
-        return True
-
-    def beforeDoctypeSystemIdentifierState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            pass
-        elif data == "\"":
-            self.currentToken["systemId"] = ""
-            self.state = self.doctypeSystemIdentifierDoubleQuotedState
-        elif data == "'":
-            self.currentToken["systemId"] = ""
-            self.state = self.doctypeSystemIdentifierSingleQuotedState
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-char-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-char-in-doctype"})
-            self.currentToken["correct"] = False
-            self.state = self.bogusDoctypeState
-        return True
-
-    def doctypeSystemIdentifierDoubleQuotedState(self):
-        data = self.stream.char()
-        if data == "\"":
-            self.state = self.afterDoctypeSystemIdentifierState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["systemId"] += "\uFFFD"
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-end-of-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.currentToken["systemId"] += data
-        return True
-
-    def doctypeSystemIdentifierSingleQuotedState(self):
-        data = self.stream.char()
-        if data == "'":
-            self.state = self.afterDoctypeSystemIdentifierState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["systemId"] += "\uFFFD"
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-end-of-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.currentToken["systemId"] += data
-        return True
-
-    def afterDoctypeSystemIdentifierState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            pass
-        elif data == ">":
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-char-in-doctype"})
-            self.state = self.bogusDoctypeState
-        return True
-
-    def bogusDoctypeState(self):
-        data = self.stream.char()
-        if data == ">":
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data is EOF:
-            # XXX EMIT
-            self.stream.unget(data)
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            pass
-        return True
-
-    def cdataSectionState(self):
-        data = []
-        while True:
-            data.append(self.stream.charsUntil("]"))
-            data.append(self.stream.charsUntil(">"))
-            char = self.stream.char()
-            if char == EOF:
-                break
-            else:
-                assert char == ">"
-                if data[-1][-2:] == "]]":
-                    data[-1] = data[-1][:-2]
-                    break
-                else:
-                    data.append(char)
-
-        data = "".join(data)  # pylint:disable=redefined-variable-type
-        # Deal with null here rather than in the parser
-        nullCount = data.count("\u0000")
-        if nullCount > 0:
-            for _ in range(nullCount):
-                self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                        "data": "invalid-codepoint"})
-            data = data.replace("\u0000", "\uFFFD")
-        if data:
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": data})
-        self.state = self.dataState
-        return True
diff --git a/lib/bleach/_vendor/html5lib/_trie/__init__.py b/lib/bleach/_vendor/html5lib/_trie/__init__.py
deleted file mode 100644
index 07bad5d3..00000000
--- a/lib/bleach/_vendor/html5lib/_trie/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-from .py import Trie
-
-__all__ = ["Trie"]
diff --git a/lib/bleach/_vendor/html5lib/_trie/_base.py b/lib/bleach/_vendor/html5lib/_trie/_base.py
deleted file mode 100644
index 6b71975f..00000000
--- a/lib/bleach/_vendor/html5lib/_trie/_base.py
+++ /dev/null
@@ -1,40 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-try:
-    from collections.abc import Mapping
-except ImportError:  # Python 2.7
-    from collections import Mapping
-
-
-class Trie(Mapping):
-    """Abstract base class for tries"""
-
-    def keys(self, prefix=None):
-        # pylint:disable=arguments-differ
-        keys = super(Trie, self).keys()
-
-        if prefix is None:
-            return set(keys)
-
-        return {x for x in keys if x.startswith(prefix)}
-
-    def has_keys_with_prefix(self, prefix):
-        for key in self.keys():
-            if key.startswith(prefix):
-                return True
-
-        return False
-
-    def longest_prefix(self, prefix):
-        if prefix in self:
-            return prefix
-
-        for i in range(1, len(prefix) + 1):
-            if prefix[:-i] in self:
-                return prefix[:-i]
-
-        raise KeyError(prefix)
-
-    def longest_prefix_item(self, prefix):
-        lprefix = self.longest_prefix(prefix)
-        return (lprefix, self[lprefix])
diff --git a/lib/bleach/_vendor/html5lib/_trie/py.py b/lib/bleach/_vendor/html5lib/_trie/py.py
deleted file mode 100644
index 56f66bd5..00000000
--- a/lib/bleach/_vendor/html5lib/_trie/py.py
+++ /dev/null
@@ -1,67 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-from bleach.six_shim import text_type
-
-from bisect import bisect_left
-
-from ._base import Trie as ABCTrie
-
-
-class Trie(ABCTrie):
-    def __init__(self, data):
-        if not all(isinstance(x, text_type) for x in data.keys()):
-            raise TypeError("All keys must be strings")
-
-        self._data = data
-        self._keys = sorted(data.keys())
-        self._cachestr = ""
-        self._cachepoints = (0, len(data))
-
-    def __contains__(self, key):
-        return key in self._data
-
-    def __len__(self):
-        return len(self._data)
-
-    def __iter__(self):
-        return iter(self._data)
-
-    def __getitem__(self, key):
-        return self._data[key]
-
-    def keys(self, prefix=None):
-        if prefix is None or prefix == "" or not self._keys:
-            return set(self._keys)
-
-        if prefix.startswith(self._cachestr):
-            lo, hi = self._cachepoints
-            start = i = bisect_left(self._keys, prefix, lo, hi)
-        else:
-            start = i = bisect_left(self._keys, prefix)
-
-        keys = set()
-        if start == len(self._keys):
-            return keys
-
-        while self._keys[i].startswith(prefix):
-            keys.add(self._keys[i])
-            i += 1
-
-        self._cachestr = prefix
-        self._cachepoints = (start, i)
-
-        return keys
-
-    def has_keys_with_prefix(self, prefix):
-        if prefix in self._data:
-            return True
-
-        if prefix.startswith(self._cachestr):
-            lo, hi = self._cachepoints
-            i = bisect_left(self._keys, prefix, lo, hi)
-        else:
-            i = bisect_left(self._keys, prefix)
-
-        if i == len(self._keys):
-            return False
-
-        return self._keys[i].startswith(prefix)
diff --git a/lib/bleach/_vendor/html5lib/_utils.py b/lib/bleach/_vendor/html5lib/_utils.py
deleted file mode 100644
index 635bb024..00000000
--- a/lib/bleach/_vendor/html5lib/_utils.py
+++ /dev/null
@@ -1,159 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-from types import ModuleType
-
-try:
-    from collections.abc import Mapping
-except ImportError:
-    from collections import Mapping
-
-from bleach.six_shim import text_type, PY3
-
-if PY3:
-    import xml.etree.ElementTree as default_etree
-else:
-    try:
-        import xml.etree.cElementTree as default_etree
-    except ImportError:
-        import xml.etree.ElementTree as default_etree
-
-
-__all__ = ["default_etree", "MethodDispatcher", "isSurrogatePair",
-           "surrogatePairToCodepoint", "moduleFactoryFactory",
-           "supports_lone_surrogates"]
-
-
-# Platforms not supporting lone surrogates (\uD800-\uDFFF) should be
-# caught by the below test. In general this would be any platform
-# using UTF-16 as its encoding of unicode strings, such as
-# Jython. This is because UTF-16 itself is based on the use of such
-# surrogates, and there is no mechanism to further escape such
-# escapes.
-try:
-    _x = eval('"\\uD800"')  # pylint:disable=eval-used
-    if not isinstance(_x, text_type):
-        # We need this with u"" because of http://bugs.jython.org/issue2039
-        _x = eval('u"\\uD800"')  # pylint:disable=eval-used
-        assert isinstance(_x, text_type)
-except Exception:
-    supports_lone_surrogates = False
-else:
-    supports_lone_surrogates = True
-
-
-class MethodDispatcher(dict):
-    """Dict with 2 special properties:
-
-    On initiation, keys that are lists, sets or tuples are converted to
-    multiple keys so accessing any one of the items in the original
-    list-like object returns the matching value
-
-    md = MethodDispatcher({("foo", "bar"):"baz"})
-    md["foo"] == "baz"
-
-    A default value which can be set through the default attribute.
-    """
-
-    def __init__(self, items=()):
-        _dictEntries = []
-        for name, value in items:
-            if isinstance(name, (list, tuple, frozenset, set)):
-                for item in name:
-                    _dictEntries.append((item, value))
-            else:
-                _dictEntries.append((name, value))
-        dict.__init__(self, _dictEntries)
-        assert len(self) == len(_dictEntries)
-        self.default = None
-
-    def __getitem__(self, key):
-        return dict.get(self, key, self.default)
-
-    def __get__(self, instance, owner=None):
-        return BoundMethodDispatcher(instance, self)
-
-
-class BoundMethodDispatcher(Mapping):
-    """Wraps a MethodDispatcher, binding its return values to `instance`"""
-    def __init__(self, instance, dispatcher):
-        self.instance = instance
-        self.dispatcher = dispatcher
-
-    def __getitem__(self, key):
-        # see https://docs.python.org/3/reference/datamodel.html#object.__get__
-        # on a function, __get__ is used to bind a function to an instance as a bound method
-        return self.dispatcher[key].__get__(self.instance)
-
-    def get(self, key, default):
-        if key in self.dispatcher:
-            return self[key]
-        else:
-            return default
-
-    def __iter__(self):
-        return iter(self.dispatcher)
-
-    def __len__(self):
-        return len(self.dispatcher)
-
-    def __contains__(self, key):
-        return key in self.dispatcher
-
-
-# Some utility functions to deal with weirdness around UCS2 vs UCS4
-# python builds
-
-def isSurrogatePair(data):
-    return (len(data) == 2 and
-            ord(data[0]) >= 0xD800 and ord(data[0]) <= 0xDBFF and
-            ord(data[1]) >= 0xDC00 and ord(data[1]) <= 0xDFFF)
-
-
-def surrogatePairToCodepoint(data):
-    char_val = (0x10000 + (ord(data[0]) - 0xD800) * 0x400 +
-                (ord(data[1]) - 0xDC00))
-    return char_val
-
-# Module Factory Factory (no, this isn't Java, I know)
-# Here to stop this being duplicated all over the place.
-
-
-def moduleFactoryFactory(factory):
-    moduleCache = {}
-
-    def moduleFactory(baseModule, *args, **kwargs):
-        if isinstance(ModuleType.__name__, type("")):
-            name = "_%s_factory" % baseModule.__name__
-        else:
-            name = b"_%s_factory" % baseModule.__name__
-
-        kwargs_tuple = tuple(kwargs.items())
-
-        try:
-            return moduleCache[name][args][kwargs_tuple]
-        except KeyError:
-            mod = ModuleType(name)
-            objs = factory(baseModule, *args, **kwargs)
-            mod.__dict__.update(objs)
-            if "name" not in moduleCache:
-                moduleCache[name] = {}
-            if "args" not in moduleCache[name]:
-                moduleCache[name][args] = {}
-            if "kwargs" not in moduleCache[name][args]:
-                moduleCache[name][args][kwargs_tuple] = {}
-            moduleCache[name][args][kwargs_tuple] = mod
-            return mod
-
-    return moduleFactory
-
-
-def memoize(func):
-    cache = {}
-
-    def wrapped(*args, **kwargs):
-        key = (tuple(args), tuple(kwargs.items()))
-        if key not in cache:
-            cache[key] = func(*args, **kwargs)
-        return cache[key]
-
-    return wrapped
diff --git a/lib/bleach/_vendor/html5lib/constants.py b/lib/bleach/_vendor/html5lib/constants.py
deleted file mode 100644
index fe3e237c..00000000
--- a/lib/bleach/_vendor/html5lib/constants.py
+++ /dev/null
@@ -1,2946 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-import string
-
-EOF = None
-
-E = {
-    "null-character":
-        "Null character in input stream, replaced with U+FFFD.",
-    "invalid-codepoint":
-        "Invalid codepoint in stream.",
-    "incorrectly-placed-solidus":
-        "Solidus (/) incorrectly placed in tag.",
-    "incorrect-cr-newline-entity":
-        "Incorrect CR newline entity, replaced with LF.",
-    "illegal-windows-1252-entity":
-        "Entity used with illegal number (windows-1252 reference).",
-    "cant-convert-numeric-entity":
-        "Numeric entity couldn't be converted to character "
-        "(codepoint U+%(charAsInt)08x).",
-    "illegal-codepoint-for-numeric-entity":
-        "Numeric entity represents an illegal codepoint: "
-        "U+%(charAsInt)08x.",
-    "numeric-entity-without-semicolon":
-        "Numeric entity didn't end with ';'.",
-    "expected-numeric-entity-but-got-eof":
-        "Numeric entity expected. Got end of file instead.",
-    "expected-numeric-entity":
-        "Numeric entity expected but none found.",
-    "named-entity-without-semicolon":
-        "Named entity didn't end with ';'.",
-    "expected-named-entity":
-        "Named entity expected. Got none.",
-    "attributes-in-end-tag":
-        "End tag contains unexpected attributes.",
-    'self-closing-flag-on-end-tag':
-        "End tag contains unexpected self-closing flag.",
-    "expected-tag-name-but-got-right-bracket":
-        "Expected tag name. Got '>' instead.",
-    "expected-tag-name-but-got-question-mark":
-        "Expected tag name. Got '?' instead. (HTML doesn't "
-        "support processing instructions.)",
-    "expected-tag-name":
-        "Expected tag name. Got something else instead",
-    "expected-closing-tag-but-got-right-bracket":
-        "Expected closing tag. Got '>' instead. Ignoring '</>'.",
-    "expected-closing-tag-but-got-eof":
-        "Expected closing tag. Unexpected end of file.",
-    "expected-closing-tag-but-got-char":
-        "Expected closing tag. Unexpected character '%(data)s' found.",
-    "eof-in-tag-name":
-        "Unexpected end of file in the tag name.",
-    "expected-attribute-name-but-got-eof":
-        "Unexpected end of file. Expected attribute name instead.",
-    "eof-in-attribute-name":
-        "Unexpected end of file in attribute name.",
-    "invalid-character-in-attribute-name":
-        "Invalid character in attribute name",
-    "duplicate-attribute":
-        "Dropped duplicate attribute on tag.",
-    "expected-end-of-tag-name-but-got-eof":
-        "Unexpected end of file. Expected = or end of tag.",
-    "expected-attribute-value-but-got-eof":
-        "Unexpected end of file. Expected attribute value.",
-    "expected-attribute-value-but-got-right-bracket":
-        "Expected attribute value. Got '>' instead.",
-    'equals-in-unquoted-attribute-value':
-        "Unexpected = in unquoted attribute",
-    'unexpected-character-in-unquoted-attribute-value':
-        "Unexpected character in unquoted attribute",
-    "invalid-character-after-attribute-name":
-        "Unexpected character after attribute name.",
-    "unexpected-character-after-attribute-value":
-        "Unexpected character after attribute value.",
-    "eof-in-attribute-value-double-quote":
-        "Unexpected end of file in attribute value (\").",
-    "eof-in-attribute-value-single-quote":
-        "Unexpected end of file in attribute value (').",
-    "eof-in-attribute-value-no-quotes":
-        "Unexpected end of file in attribute value.",
-    "unexpected-EOF-after-solidus-in-tag":
-        "Unexpected end of file in tag. Expected >",
-    "unexpected-character-after-solidus-in-tag":
-        "Unexpected character after / in tag. Expected >",
-    "expected-dashes-or-doctype":
-        "Expected '--' or 'DOCTYPE'. Not found.",
-    "unexpected-bang-after-double-dash-in-comment":
-        "Unexpected ! after -- in comment",
-    "unexpected-space-after-double-dash-in-comment":
-        "Unexpected space after -- in comment",
-    "incorrect-comment":
-        "Incorrect comment.",
-    "eof-in-comment":
-        "Unexpected end of file in comment.",
-    "eof-in-comment-end-dash":
-        "Unexpected end of file in comment (-)",
-    "unexpected-dash-after-double-dash-in-comment":
-        "Unexpected '-' after '--' found in comment.",
-    "eof-in-comment-double-dash":
-        "Unexpected end of file in comment (--).",
-    "eof-in-comment-end-space-state":
-        "Unexpected end of file in comment.",
-    "eof-in-comment-end-bang-state":
-        "Unexpected end of file in comment.",
-    "unexpected-char-in-comment":
-        "Unexpected character in comment found.",
-    "need-space-after-doctype":
-        "No space after literal string 'DOCTYPE'.",
-    "expected-doctype-name-but-got-right-bracket":
-        "Unexpected > character. Expected DOCTYPE name.",
-    "expected-doctype-name-but-got-eof":
-        "Unexpected end of file. Expected DOCTYPE name.",
-    "eof-in-doctype-name":
-        "Unexpected end of file in DOCTYPE name.",
-    "eof-in-doctype":
-        "Unexpected end of file in DOCTYPE.",
-    "expected-space-or-right-bracket-in-doctype":
-        "Expected space or '>'. Got '%(data)s'",
-    "unexpected-end-of-doctype":
-        "Unexpected end of DOCTYPE.",
-    "unexpected-char-in-doctype":
-        "Unexpected character in DOCTYPE.",
-    "eof-in-innerhtml":
-        "XXX innerHTML EOF",
-    "unexpected-doctype":
-        "Unexpected DOCTYPE. Ignored.",
-    "non-html-root":
-        "html needs to be the first start tag.",
-    "expected-doctype-but-got-eof":
-        "Unexpected End of file. Expected DOCTYPE.",
-    "unknown-doctype":
-        "Erroneous DOCTYPE.",
-    "expected-doctype-but-got-chars":
-        "Unexpected non-space characters. Expected DOCTYPE.",
-    "expected-doctype-but-got-start-tag":
-        "Unexpected start tag (%(name)s). Expected DOCTYPE.",
-    "expected-doctype-but-got-end-tag":
-        "Unexpected end tag (%(name)s). Expected DOCTYPE.",
-    "end-tag-after-implied-root":
-        "Unexpected end tag (%(name)s) after the (implied) root element.",
-    "expected-named-closing-tag-but-got-eof":
-        "Unexpected end of file. Expected end tag (%(name)s).",
-    "two-heads-are-not-better-than-one":
-        "Unexpected start tag head in existing head. Ignored.",
-    "unexpected-end-tag":
-        "Unexpected end tag (%(name)s). Ignored.",
-    "unexpected-start-tag-out-of-my-head":
-        "Unexpected start tag (%(name)s) that can be in head. Moved.",
-    "unexpected-start-tag":
-        "Unexpected start tag (%(name)s).",
-    "missing-end-tag":
-        "Missing end tag (%(name)s).",
-    "missing-end-tags":
-        "Missing end tags (%(name)s).",
-    "unexpected-start-tag-implies-end-tag":
-        "Unexpected start tag (%(startName)s) "
-        "implies end tag (%(endName)s).",
-    "unexpected-start-tag-treated-as":
-        "Unexpected start tag (%(originalName)s). Treated as %(newName)s.",
-    "deprecated-tag":
-        "Unexpected start tag %(name)s. Don't use it!",
-    "unexpected-start-tag-ignored":
-        "Unexpected start tag %(name)s. Ignored.",
-    "expected-one-end-tag-but-got-another":
-        "Unexpected end tag (%(gotName)s). "
-        "Missing end tag (%(expectedName)s).",
-    "end-tag-too-early":
-        "End tag (%(name)s) seen too early. Expected other end tag.",
-    "end-tag-too-early-named":
-        "Unexpected end tag (%(gotName)s). Expected end tag (%(expectedName)s).",
-    "end-tag-too-early-ignored":
-        "End tag (%(name)s) seen too early. Ignored.",
-    "adoption-agency-1.1":
-        "End tag (%(name)s) violates step 1, "
-        "paragraph 1 of the adoption agency algorithm.",
-    "adoption-agency-1.2":
-        "End tag (%(name)s) violates step 1, "
-        "paragraph 2 of the adoption agency algorithm.",
-    "adoption-agency-1.3":
-        "End tag (%(name)s) violates step 1, "
-        "paragraph 3 of the adoption agency algorithm.",
-    "adoption-agency-4.4":
-        "End tag (%(name)s) violates step 4, "
-        "paragraph 4 of the adoption agency algorithm.",
-    "unexpected-end-tag-treated-as":
-        "Unexpected end tag (%(originalName)s). Treated as %(newName)s.",
-    "no-end-tag":
-        "This element (%(name)s) has no end tag.",
-    "unexpected-implied-end-tag-in-table":
-        "Unexpected implied end tag (%(name)s) in the table phase.",
-    "unexpected-implied-end-tag-in-table-body":
-        "Unexpected implied end tag (%(name)s) in the table body phase.",
-    "unexpected-char-implies-table-voodoo":
-        "Unexpected non-space characters in "
-        "table context caused voodoo mode.",
-    "unexpected-hidden-input-in-table":
-        "Unexpected input with type hidden in table context.",
-    "unexpected-form-in-table":
-        "Unexpected form in table context.",
-    "unexpected-start-tag-implies-table-voodoo":
-        "Unexpected start tag (%(name)s) in "
-        "table context caused voodoo mode.",
-    "unexpected-end-tag-implies-table-voodoo":
-        "Unexpected end tag (%(name)s) in "
-        "table context caused voodoo mode.",
-    "unexpected-cell-in-table-body":
-        "Unexpected table cell start tag (%(name)s) "
-        "in the table body phase.",
-    "unexpected-cell-end-tag":
-        "Got table cell end tag (%(name)s) "
-        "while required end tags are missing.",
-    "unexpected-end-tag-in-table-body":
-        "Unexpected end tag (%(name)s) in the table body phase. Ignored.",
-    "unexpected-implied-end-tag-in-table-row":
-        "Unexpected implied end tag (%(name)s) in the table row phase.",
-    "unexpected-end-tag-in-table-row":
-        "Unexpected end tag (%(name)s) in the table row phase. Ignored.",
-    "unexpected-select-in-select":
-        "Unexpected select start tag in the select phase "
-        "treated as select end tag.",
-    "unexpected-input-in-select":
-        "Unexpected input start tag in the select phase.",
-    "unexpected-start-tag-in-select":
-        "Unexpected start tag token (%(name)s in the select phase. "
-        "Ignored.",
-    "unexpected-end-tag-in-select":
-        "Unexpected end tag (%(name)s) in the select phase. Ignored.",
-    "unexpected-table-element-start-tag-in-select-in-table":
-        "Unexpected table element start tag (%(name)s) in the select in table phase.",
-    "unexpected-table-element-end-tag-in-select-in-table":
-        "Unexpected table element end tag (%(name)s) in the select in table phase.",
-    "unexpected-char-after-body":
-        "Unexpected non-space characters in the after body phase.",
-    "unexpected-start-tag-after-body":
-        "Unexpected start tag token (%(name)s)"
-        " in the after body phase.",
-    "unexpected-end-tag-after-body":
-        "Unexpected end tag token (%(name)s)"
-        " in the after body phase.",
-    "unexpected-char-in-frameset":
-        "Unexpected characters in the frameset phase. Characters ignored.",
-    "unexpected-start-tag-in-frameset":
-        "Unexpected start tag token (%(name)s)"
-        " in the frameset phase. Ignored.",
-    "unexpected-frameset-in-frameset-innerhtml":
-        "Unexpected end tag token (frameset) "
-        "in the frameset phase (innerHTML).",
-    "unexpected-end-tag-in-frameset":
-        "Unexpected end tag token (%(name)s)"
-        " in the frameset phase. Ignored.",
-    "unexpected-char-after-frameset":
-        "Unexpected non-space characters in the "
-        "after frameset phase. Ignored.",
-    "unexpected-start-tag-after-frameset":
-        "Unexpected start tag (%(name)s)"
-        " in the after frameset phase. Ignored.",
-    "unexpected-end-tag-after-frameset":
-        "Unexpected end tag (%(name)s)"
-        " in the after frameset phase. Ignored.",
-    "unexpected-end-tag-after-body-innerhtml":
-        "Unexpected end tag after body(innerHtml)",
-    "expected-eof-but-got-char":
-        "Unexpected non-space characters. Expected end of file.",
-    "expected-eof-but-got-start-tag":
-        "Unexpected start tag (%(name)s)"
-        ". Expected end of file.",
-    "expected-eof-but-got-end-tag":
-        "Unexpected end tag (%(name)s)"
-        ". Expected end of file.",
-    "eof-in-table":
-        "Unexpected end of file. Expected table content.",
-    "eof-in-select":
-        "Unexpected end of file. Expected select content.",
-    "eof-in-frameset":
-        "Unexpected end of file. Expected frameset content.",
-    "eof-in-script-in-script":
-        "Unexpected end of file. Expected script content.",
-    "eof-in-foreign-lands":
-        "Unexpected end of file. Expected foreign content",
-    "non-void-element-with-trailing-solidus":
-        "Trailing solidus not allowed on element %(name)s",
-    "unexpected-html-element-in-foreign-content":
-        "Element %(name)s not allowed in a non-html context",
-    "unexpected-end-tag-before-html":
-        "Unexpected end tag (%(name)s) before html.",
-    "unexpected-inhead-noscript-tag":
-        "Element %(name)s not allowed in a inhead-noscript context",
-    "eof-in-head-noscript":
-        "Unexpected end of file. Expected inhead-noscript content",
-    "char-in-head-noscript":
-        "Unexpected non-space character. Expected inhead-noscript content",
-    "XXX-undefined-error":
-        "Undefined error (this sucks and should be fixed)",
-}
-
-namespaces = {
-    "html": "http://www.w3.org/1999/xhtml",
-    "mathml": "http://www.w3.org/1998/Math/MathML",
-    "svg": "http://www.w3.org/2000/svg",
-    "xlink": "http://www.w3.org/1999/xlink",
-    "xml": "http://www.w3.org/XML/1998/namespace",
-    "xmlns": "http://www.w3.org/2000/xmlns/"
-}
-
-scopingElements = frozenset([
-    (namespaces["html"], "applet"),
-    (namespaces["html"], "caption"),
-    (namespaces["html"], "html"),
-    (namespaces["html"], "marquee"),
-    (namespaces["html"], "object"),
-    (namespaces["html"], "table"),
-    (namespaces["html"], "td"),
-    (namespaces["html"], "th"),
-    (namespaces["mathml"], "mi"),
-    (namespaces["mathml"], "mo"),
-    (namespaces["mathml"], "mn"),
-    (namespaces["mathml"], "ms"),
-    (namespaces["mathml"], "mtext"),
-    (namespaces["mathml"], "annotation-xml"),
-    (namespaces["svg"], "foreignObject"),
-    (namespaces["svg"], "desc"),
-    (namespaces["svg"], "title"),
-])
-
-formattingElements = frozenset([
-    (namespaces["html"], "a"),
-    (namespaces["html"], "b"),
-    (namespaces["html"], "big"),
-    (namespaces["html"], "code"),
-    (namespaces["html"], "em"),
-    (namespaces["html"], "font"),
-    (namespaces["html"], "i"),
-    (namespaces["html"], "nobr"),
-    (namespaces["html"], "s"),
-    (namespaces["html"], "small"),
-    (namespaces["html"], "strike"),
-    (namespaces["html"], "strong"),
-    (namespaces["html"], "tt"),
-    (namespaces["html"], "u")
-])
-
-specialElements = frozenset([
-    (namespaces["html"], "address"),
-    (namespaces["html"], "applet"),
-    (namespaces["html"], "area"),
-    (namespaces["html"], "article"),
-    (namespaces["html"], "aside"),
-    (namespaces["html"], "base"),
-    (namespaces["html"], "basefont"),
-    (namespaces["html"], "bgsound"),
-    (namespaces["html"], "blockquote"),
-    (namespaces["html"], "body"),
-    (namespaces["html"], "br"),
-    (namespaces["html"], "button"),
-    (namespaces["html"], "caption"),
-    (namespaces["html"], "center"),
-    (namespaces["html"], "col"),
-    (namespaces["html"], "colgroup"),
-    (namespaces["html"], "command"),
-    (namespaces["html"], "dd"),
-    (namespaces["html"], "details"),
-    (namespaces["html"], "dir"),
-    (namespaces["html"], "div"),
-    (namespaces["html"], "dl"),
-    (namespaces["html"], "dt"),
-    (namespaces["html"], "embed"),
-    (namespaces["html"], "fieldset"),
-    (namespaces["html"], "figure"),
-    (namespaces["html"], "footer"),
-    (namespaces["html"], "form"),
-    (namespaces["html"], "frame"),
-    (namespaces["html"], "frameset"),
-    (namespaces["html"], "h1"),
-    (namespaces["html"], "h2"),
-    (namespaces["html"], "h3"),
-    (namespaces["html"], "h4"),
-    (namespaces["html"], "h5"),
-    (namespaces["html"], "h6"),
-    (namespaces["html"], "head"),
-    (namespaces["html"], "header"),
-    (namespaces["html"], "hr"),
-    (namespaces["html"], "html"),
-    (namespaces["html"], "iframe"),
-    # Note that image is commented out in the spec as "this isn't an
-    # element that can end up on the stack, so it doesn't matter,"
-    (namespaces["html"], "image"),
-    (namespaces["html"], "img"),
-    (namespaces["html"], "input"),
-    (namespaces["html"], "isindex"),
-    (namespaces["html"], "li"),
-    (namespaces["html"], "link"),
-    (namespaces["html"], "listing"),
-    (namespaces["html"], "marquee"),
-    (namespaces["html"], "menu"),
-    (namespaces["html"], "meta"),
-    (namespaces["html"], "nav"),
-    (namespaces["html"], "noembed"),
-    (namespaces["html"], "noframes"),
-    (namespaces["html"], "noscript"),
-    (namespaces["html"], "object"),
-    (namespaces["html"], "ol"),
-    (namespaces["html"], "p"),
-    (namespaces["html"], "param"),
-    (namespaces["html"], "plaintext"),
-    (namespaces["html"], "pre"),
-    (namespaces["html"], "script"),
-    (namespaces["html"], "section"),
-    (namespaces["html"], "select"),
-    (namespaces["html"], "style"),
-    (namespaces["html"], "table"),
-    (namespaces["html"], "tbody"),
-    (namespaces["html"], "td"),
-    (namespaces["html"], "textarea"),
-    (namespaces["html"], "tfoot"),
-    (namespaces["html"], "th"),
-    (namespaces["html"], "thead"),
-    (namespaces["html"], "title"),
-    (namespaces["html"], "tr"),
-    (namespaces["html"], "ul"),
-    (namespaces["html"], "wbr"),
-    (namespaces["html"], "xmp"),
-    (namespaces["svg"], "foreignObject")
-])
-
-htmlIntegrationPointElements = frozenset([
-    (namespaces["mathml"], "annotation-xml"),
-    (namespaces["svg"], "foreignObject"),
-    (namespaces["svg"], "desc"),
-    (namespaces["svg"], "title")
-])
-
-mathmlTextIntegrationPointElements = frozenset([
-    (namespaces["mathml"], "mi"),
-    (namespaces["mathml"], "mo"),
-    (namespaces["mathml"], "mn"),
-    (namespaces["mathml"], "ms"),
-    (namespaces["mathml"], "mtext")
-])
-
-adjustSVGAttributes = {
-    "attributename": "attributeName",
-    "attributetype": "attributeType",
-    "basefrequency": "baseFrequency",
-    "baseprofile": "baseProfile",
-    "calcmode": "calcMode",
-    "clippathunits": "clipPathUnits",
-    "contentscripttype": "contentScriptType",
-    "contentstyletype": "contentStyleType",
-    "diffuseconstant": "diffuseConstant",
-    "edgemode": "edgeMode",
-    "externalresourcesrequired": "externalResourcesRequired",
-    "filterres": "filterRes",
-    "filterunits": "filterUnits",
-    "glyphref": "glyphRef",
-    "gradienttransform": "gradientTransform",
-    "gradientunits": "gradientUnits",
-    "kernelmatrix": "kernelMatrix",
-    "kernelunitlength": "kernelUnitLength",
-    "keypoints": "keyPoints",
-    "keysplines": "keySplines",
-    "keytimes": "keyTimes",
-    "lengthadjust": "lengthAdjust",
-    "limitingconeangle": "limitingConeAngle",
-    "markerheight": "markerHeight",
-    "markerunits": "markerUnits",
-    "markerwidth": "markerWidth",
-    "maskcontentunits": "maskContentUnits",
-    "maskunits": "maskUnits",
-    "numoctaves": "numOctaves",
-    "pathlength": "pathLength",
-    "patterncontentunits": "patternContentUnits",
-    "patterntransform": "patternTransform",
-    "patternunits": "patternUnits",
-    "pointsatx": "pointsAtX",
-    "pointsaty": "pointsAtY",
-    "pointsatz": "pointsAtZ",
-    "preservealpha": "preserveAlpha",
-    "preserveaspectratio": "preserveAspectRatio",
-    "primitiveunits": "primitiveUnits",
-    "refx": "refX",
-    "refy": "refY",
-    "repeatcount": "repeatCount",
-    "repeatdur": "repeatDur",
-    "requiredextensions": "requiredExtensions",
-    "requiredfeatures": "requiredFeatures",
-    "specularconstant": "specularConstant",
-    "specularexponent": "specularExponent",
-    "spreadmethod": "spreadMethod",
-    "startoffset": "startOffset",
-    "stddeviation": "stdDeviation",
-    "stitchtiles": "stitchTiles",
-    "surfacescale": "surfaceScale",
-    "systemlanguage": "systemLanguage",
-    "tablevalues": "tableValues",
-    "targetx": "targetX",
-    "targety": "targetY",
-    "textlength": "textLength",
-    "viewbox": "viewBox",
-    "viewtarget": "viewTarget",
-    "xchannelselector": "xChannelSelector",
-    "ychannelselector": "yChannelSelector",
-    "zoomandpan": "zoomAndPan"
-}
-
-adjustMathMLAttributes = {"definitionurl": "definitionURL"}
-
-adjustForeignAttributes = {
-    "xlink:actuate": ("xlink", "actuate", namespaces["xlink"]),
-    "xlink:arcrole": ("xlink", "arcrole", namespaces["xlink"]),
-    "xlink:href": ("xlink", "href", namespaces["xlink"]),
-    "xlink:role": ("xlink", "role", namespaces["xlink"]),
-    "xlink:show": ("xlink", "show", namespaces["xlink"]),
-    "xlink:title": ("xlink", "title", namespaces["xlink"]),
-    "xlink:type": ("xlink", "type", namespaces["xlink"]),
-    "xml:base": ("xml", "base", namespaces["xml"]),
-    "xml:lang": ("xml", "lang", namespaces["xml"]),
-    "xml:space": ("xml", "space", namespaces["xml"]),
-    "xmlns": (None, "xmlns", namespaces["xmlns"]),
-    "xmlns:xlink": ("xmlns", "xlink", namespaces["xmlns"])
-}
-
-unadjustForeignAttributes = {(ns, local): qname for qname, (prefix, local, ns) in
-                             adjustForeignAttributes.items()}
-
-spaceCharacters = frozenset([
-    "\t",
-    "\n",
-    "\u000C",
-    " ",
-    "\r"
-])
-
-tableInsertModeElements = frozenset([
-    "table",
-    "tbody",
-    "tfoot",
-    "thead",
-    "tr"
-])
-
-asciiLowercase = frozenset(string.ascii_lowercase)
-asciiUppercase = frozenset(string.ascii_uppercase)
-asciiLetters = frozenset(string.ascii_letters)
-digits = frozenset(string.digits)
-hexDigits = frozenset(string.hexdigits)
-
-asciiUpper2Lower = {ord(c): ord(c.lower()) for c in string.ascii_uppercase}
-
-# Heading elements need to be ordered
-headingElements = (
-    "h1",
-    "h2",
-    "h3",
-    "h4",
-    "h5",
-    "h6"
-)
-
-voidElements = frozenset([
-    "base",
-    "command",
-    "event-source",
-    "link",
-    "meta",
-    "hr",
-    "br",
-    "img",
-    "embed",
-    "param",
-    "area",
-    "col",
-    "input",
-    "source",
-    "track"
-])
-
-cdataElements = frozenset(['title', 'textarea'])
-
-rcdataElements = frozenset([
-    'style',
-    'script',
-    'xmp',
-    'iframe',
-    'noembed',
-    'noframes',
-    'noscript'
-])
-
-booleanAttributes = {
-    "": frozenset(["irrelevant", "itemscope"]),
-    "style": frozenset(["scoped"]),
-    "img": frozenset(["ismap"]),
-    "audio": frozenset(["autoplay", "controls"]),
-    "video": frozenset(["autoplay", "controls"]),
-    "script": frozenset(["defer", "async"]),
-    "details": frozenset(["open"]),
-    "datagrid": frozenset(["multiple", "disabled"]),
-    "command": frozenset(["hidden", "disabled", "checked", "default"]),
-    "hr": frozenset(["noshade"]),
-    "menu": frozenset(["autosubmit"]),
-    "fieldset": frozenset(["disabled", "readonly"]),
-    "option": frozenset(["disabled", "readonly", "selected"]),
-    "optgroup": frozenset(["disabled", "readonly"]),
-    "button": frozenset(["disabled", "autofocus"]),
-    "input": frozenset(["disabled", "readonly", "required", "autofocus", "checked", "ismap"]),
-    "select": frozenset(["disabled", "readonly", "autofocus", "multiple"]),
-    "output": frozenset(["disabled", "readonly"]),
-    "iframe": frozenset(["seamless"]),
-}
-
-# entitiesWindows1252 has to be _ordered_ and needs to have an index. It
-# therefore can't be a frozenset.
-entitiesWindows1252 = (
-    8364,   # 0x80  0x20AC  EURO SIGN
-    65533,  # 0x81          UNDEFINED
-    8218,   # 0x82  0x201A  SINGLE LOW-9 QUOTATION MARK
-    402,    # 0x83  0x0192  LATIN SMALL LETTER F WITH HOOK
-    8222,   # 0x84  0x201E  DOUBLE LOW-9 QUOTATION MARK
-    8230,   # 0x85  0x2026  HORIZONTAL ELLIPSIS
-    8224,   # 0x86  0x2020  DAGGER
-    8225,   # 0x87  0x2021  DOUBLE DAGGER
-    710,    # 0x88  0x02C6  MODIFIER LETTER CIRCUMFLEX ACCENT
-    8240,   # 0x89  0x2030  PER MILLE SIGN
-    352,    # 0x8A  0x0160  LATIN CAPITAL LETTER S WITH CARON
-    8249,   # 0x8B  0x2039  SINGLE LEFT-POINTING ANGLE QUOTATION MARK
-    338,    # 0x8C  0x0152  LATIN CAPITAL LIGATURE OE
-    65533,  # 0x8D          UNDEFINED
-    381,    # 0x8E  0x017D  LATIN CAPITAL LETTER Z WITH CARON
-    65533,  # 0x8F          UNDEFINED
-    65533,  # 0x90          UNDEFINED
-    8216,   # 0x91  0x2018  LEFT SINGLE QUOTATION MARK
-    8217,   # 0x92  0x2019  RIGHT SINGLE QUOTATION MARK
-    8220,   # 0x93  0x201C  LEFT DOUBLE QUOTATION MARK
-    8221,   # 0x94  0x201D  RIGHT DOUBLE QUOTATION MARK
-    8226,   # 0x95  0x2022  BULLET
-    8211,   # 0x96  0x2013  EN DASH
-    8212,   # 0x97  0x2014  EM DASH
-    732,    # 0x98  0x02DC  SMALL TILDE
-    8482,   # 0x99  0x2122  TRADE MARK SIGN
-    353,    # 0x9A  0x0161  LATIN SMALL LETTER S WITH CARON
-    8250,   # 0x9B  0x203A  SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
-    339,    # 0x9C  0x0153  LATIN SMALL LIGATURE OE
-    65533,  # 0x9D          UNDEFINED
-    382,    # 0x9E  0x017E  LATIN SMALL LETTER Z WITH CARON
-    376     # 0x9F  0x0178  LATIN CAPITAL LETTER Y WITH DIAERESIS
-)
-
-xmlEntities = frozenset(['lt;', 'gt;', 'amp;', 'apos;', 'quot;'])
-
-entities = {
-    "AElig": "\xc6",
-    "AElig;": "\xc6",
-    "AMP": "&",
-    "AMP;": "&",
-    "Aacute": "\xc1",
-    "Aacute;": "\xc1",
-    "Abreve;": "\u0102",
-    "Acirc": "\xc2",
-    "Acirc;": "\xc2",
-    "Acy;": "\u0410",
-    "Afr;": "\U0001d504",
-    "Agrave": "\xc0",
-    "Agrave;": "\xc0",
-    "Alpha;": "\u0391",
-    "Amacr;": "\u0100",
-    "And;": "\u2a53",
-    "Aogon;": "\u0104",
-    "Aopf;": "\U0001d538",
-    "ApplyFunction;": "\u2061",
-    "Aring": "\xc5",
-    "Aring;": "\xc5",
-    "Ascr;": "\U0001d49c",
-    "Assign;": "\u2254",
-    "Atilde": "\xc3",
-    "Atilde;": "\xc3",
-    "Auml": "\xc4",
-    "Auml;": "\xc4",
-    "Backslash;": "\u2216",
-    "Barv;": "\u2ae7",
-    "Barwed;": "\u2306",
-    "Bcy;": "\u0411",
-    "Because;": "\u2235",
-    "Bernoullis;": "\u212c",
-    "Beta;": "\u0392",
-    "Bfr;": "\U0001d505",
-    "Bopf;": "\U0001d539",
-    "Breve;": "\u02d8",
-    "Bscr;": "\u212c",
-    "Bumpeq;": "\u224e",
-    "CHcy;": "\u0427",
-    "COPY": "\xa9",
-    "COPY;": "\xa9",
-    "Cacute;": "\u0106",
-    "Cap;": "\u22d2",
-    "CapitalDifferentialD;": "\u2145",
-    "Cayleys;": "\u212d",
-    "Ccaron;": "\u010c",
-    "Ccedil": "\xc7",
-    "Ccedil;": "\xc7",
-    "Ccirc;": "\u0108",
-    "Cconint;": "\u2230",
-    "Cdot;": "\u010a",
-    "Cedilla;": "\xb8",
-    "CenterDot;": "\xb7",
-    "Cfr;": "\u212d",
-    "Chi;": "\u03a7",
-    "CircleDot;": "\u2299",
-    "CircleMinus;": "\u2296",
-    "CirclePlus;": "\u2295",
-    "CircleTimes;": "\u2297",
-    "ClockwiseContourIntegral;": "\u2232",
-    "CloseCurlyDoubleQuote;": "\u201d",
-    "CloseCurlyQuote;": "\u2019",
-    "Colon;": "\u2237",
-    "Colone;": "\u2a74",
-    "Congruent;": "\u2261",
-    "Conint;": "\u222f",
-    "ContourIntegral;": "\u222e",
-    "Copf;": "\u2102",
-    "Coproduct;": "\u2210",
-    "CounterClockwiseContourIntegral;": "\u2233",
-    "Cross;": "\u2a2f",
-    "Cscr;": "\U0001d49e",
-    "Cup;": "\u22d3",
-    "CupCap;": "\u224d",
-    "DD;": "\u2145",
-    "DDotrahd;": "\u2911",
-    "DJcy;": "\u0402",
-    "DScy;": "\u0405",
-    "DZcy;": "\u040f",
-    "Dagger;": "\u2021",
-    "Darr;": "\u21a1",
-    "Dashv;": "\u2ae4",
-    "Dcaron;": "\u010e",
-    "Dcy;": "\u0414",
-    "Del;": "\u2207",
-    "Delta;": "\u0394",
-    "Dfr;": "\U0001d507",
-    "DiacriticalAcute;": "\xb4",
-    "DiacriticalDot;": "\u02d9",
-    "DiacriticalDoubleAcute;": "\u02dd",
-    "DiacriticalGrave;": "`",
-    "DiacriticalTilde;": "\u02dc",
-    "Diamond;": "\u22c4",
-    "DifferentialD;": "\u2146",
-    "Dopf;": "\U0001d53b",
-    "Dot;": "\xa8",
-    "DotDot;": "\u20dc",
-    "DotEqual;": "\u2250",
-    "DoubleContourIntegral;": "\u222f",
-    "DoubleDot;": "\xa8",
-    "DoubleDownArrow;": "\u21d3",
-    "DoubleLeftArrow;": "\u21d0",
-    "DoubleLeftRightArrow;": "\u21d4",
-    "DoubleLeftTee;": "\u2ae4",
-    "DoubleLongLeftArrow;": "\u27f8",
-    "DoubleLongLeftRightArrow;": "\u27fa",
-    "DoubleLongRightArrow;": "\u27f9",
-    "DoubleRightArrow;": "\u21d2",
-    "DoubleRightTee;": "\u22a8",
-    "DoubleUpArrow;": "\u21d1",
-    "DoubleUpDownArrow;": "\u21d5",
-    "DoubleVerticalBar;": "\u2225",
-    "DownArrow;": "\u2193",
-    "DownArrowBar;": "\u2913",
-    "DownArrowUpArrow;": "\u21f5",
-    "DownBreve;": "\u0311",
-    "DownLeftRightVector;": "\u2950",
-    "DownLeftTeeVector;": "\u295e",
-    "DownLeftVector;": "\u21bd",
-    "DownLeftVectorBar;": "\u2956",
-    "DownRightTeeVector;": "\u295f",
-    "DownRightVector;": "\u21c1",
-    "DownRightVectorBar;": "\u2957",
-    "DownTee;": "\u22a4",
-    "DownTeeArrow;": "\u21a7",
-    "Downarrow;": "\u21d3",
-    "Dscr;": "\U0001d49f",
-    "Dstrok;": "\u0110",
-    "ENG;": "\u014a",
-    "ETH": "\xd0",
-    "ETH;": "\xd0",
-    "Eacute": "\xc9",
-    "Eacute;": "\xc9",
-    "Ecaron;": "\u011a",
-    "Ecirc": "\xca",
-    "Ecirc;": "\xca",
-    "Ecy;": "\u042d",
-    "Edot;": "\u0116",
-    "Efr;": "\U0001d508",
-    "Egrave": "\xc8",
-    "Egrave;": "\xc8",
-    "Element;": "\u2208",
-    "Emacr;": "\u0112",
-    "EmptySmallSquare;": "\u25fb",
-    "EmptyVerySmallSquare;": "\u25ab",
-    "Eogon;": "\u0118",
-    "Eopf;": "\U0001d53c",
-    "Epsilon;": "\u0395",
-    "Equal;": "\u2a75",
-    "EqualTilde;": "\u2242",
-    "Equilibrium;": "\u21cc",
-    "Escr;": "\u2130",
-    "Esim;": "\u2a73",
-    "Eta;": "\u0397",
-    "Euml": "\xcb",
-    "Euml;": "\xcb",
-    "Exists;": "\u2203",
-    "ExponentialE;": "\u2147",
-    "Fcy;": "\u0424",
-    "Ffr;": "\U0001d509",
-    "FilledSmallSquare;": "\u25fc",
-    "FilledVerySmallSquare;": "\u25aa",
-    "Fopf;": "\U0001d53d",
-    "ForAll;": "\u2200",
-    "Fouriertrf;": "\u2131",
-    "Fscr;": "\u2131",
-    "GJcy;": "\u0403",
-    "GT": ">",
-    "GT;": ">",
-    "Gamma;": "\u0393",
-    "Gammad;": "\u03dc",
-    "Gbreve;": "\u011e",
-    "Gcedil;": "\u0122",
-    "Gcirc;": "\u011c",
-    "Gcy;": "\u0413",
-    "Gdot;": "\u0120",
-    "Gfr;": "\U0001d50a",
-    "Gg;": "\u22d9",
-    "Gopf;": "\U0001d53e",
-    "GreaterEqual;": "\u2265",
-    "GreaterEqualLess;": "\u22db",
-    "GreaterFullEqual;": "\u2267",
-    "GreaterGreater;": "\u2aa2",
-    "GreaterLess;": "\u2277",
-    "GreaterSlantEqual;": "\u2a7e",
-    "GreaterTilde;": "\u2273",
-    "Gscr;": "\U0001d4a2",
-    "Gt;": "\u226b",
-    "HARDcy;": "\u042a",
-    "Hacek;": "\u02c7",
-    "Hat;": "^",
-    "Hcirc;": "\u0124",
-    "Hfr;": "\u210c",
-    "HilbertSpace;": "\u210b",
-    "Hopf;": "\u210d",
-    "HorizontalLine;": "\u2500",
-    "Hscr;": "\u210b",
-    "Hstrok;": "\u0126",
-    "HumpDownHump;": "\u224e",
-    "HumpEqual;": "\u224f",
-    "IEcy;": "\u0415",
-    "IJlig;": "\u0132",
-    "IOcy;": "\u0401",
-    "Iacute": "\xcd",
-    "Iacute;": "\xcd",
-    "Icirc": "\xce",
-    "Icirc;": "\xce",
-    "Icy;": "\u0418",
-    "Idot;": "\u0130",
-    "Ifr;": "\u2111",
-    "Igrave": "\xcc",
-    "Igrave;": "\xcc",
-    "Im;": "\u2111",
-    "Imacr;": "\u012a",
-    "ImaginaryI;": "\u2148",
-    "Implies;": "\u21d2",
-    "Int;": "\u222c",
-    "Integral;": "\u222b",
-    "Intersection;": "\u22c2",
-    "InvisibleComma;": "\u2063",
-    "InvisibleTimes;": "\u2062",
-    "Iogon;": "\u012e",
-    "Iopf;": "\U0001d540",
-    "Iota;": "\u0399",
-    "Iscr;": "\u2110",
-    "Itilde;": "\u0128",
-    "Iukcy;": "\u0406",
-    "Iuml": "\xcf",
-    "Iuml;": "\xcf",
-    "Jcirc;": "\u0134",
-    "Jcy;": "\u0419",
-    "Jfr;": "\U0001d50d",
-    "Jopf;": "\U0001d541",
-    "Jscr;": "\U0001d4a5",
-    "Jsercy;": "\u0408",
-    "Jukcy;": "\u0404",
-    "KHcy;": "\u0425",
-    "KJcy;": "\u040c",
-    "Kappa;": "\u039a",
-    "Kcedil;": "\u0136",
-    "Kcy;": "\u041a",
-    "Kfr;": "\U0001d50e",
-    "Kopf;": "\U0001d542",
-    "Kscr;": "\U0001d4a6",
-    "LJcy;": "\u0409",
-    "LT": "<",
-    "LT;": "<",
-    "Lacute;": "\u0139",
-    "Lambda;": "\u039b",
-    "Lang;": "\u27ea",
-    "Laplacetrf;": "\u2112",
-    "Larr;": "\u219e",
-    "Lcaron;": "\u013d",
-    "Lcedil;": "\u013b",
-    "Lcy;": "\u041b",
-    "LeftAngleBracket;": "\u27e8",
-    "LeftArrow;": "\u2190",
-    "LeftArrowBar;": "\u21e4",
-    "LeftArrowRightArrow;": "\u21c6",
-    "LeftCeiling;": "\u2308",
-    "LeftDoubleBracket;": "\u27e6",
-    "LeftDownTeeVector;": "\u2961",
-    "LeftDownVector;": "\u21c3",
-    "LeftDownVectorBar;": "\u2959",
-    "LeftFloor;": "\u230a",
-    "LeftRightArrow;": "\u2194",
-    "LeftRightVector;": "\u294e",
-    "LeftTee;": "\u22a3",
-    "LeftTeeArrow;": "\u21a4",
-    "LeftTeeVector;": "\u295a",
-    "LeftTriangle;": "\u22b2",
-    "LeftTriangleBar;": "\u29cf",
-    "LeftTriangleEqual;": "\u22b4",
-    "LeftUpDownVector;": "\u2951",
-    "LeftUpTeeVector;": "\u2960",
-    "LeftUpVector;": "\u21bf",
-    "LeftUpVectorBar;": "\u2958",
-    "LeftVector;": "\u21bc",
-    "LeftVectorBar;": "\u2952",
-    "Leftarrow;": "\u21d0",
-    "Leftrightarrow;": "\u21d4",
-    "LessEqualGreater;": "\u22da",
-    "LessFullEqual;": "\u2266",
-    "LessGreater;": "\u2276",
-    "LessLess;": "\u2aa1",
-    "LessSlantEqual;": "\u2a7d",
-    "LessTilde;": "\u2272",
-    "Lfr;": "\U0001d50f",
-    "Ll;": "\u22d8",
-    "Lleftarrow;": "\u21da",
-    "Lmidot;": "\u013f",
-    "LongLeftArrow;": "\u27f5",
-    "LongLeftRightArrow;": "\u27f7",
-    "LongRightArrow;": "\u27f6",
-    "Longleftarrow;": "\u27f8",
-    "Longleftrightarrow;": "\u27fa",
-    "Longrightarrow;": "\u27f9",
-    "Lopf;": "\U0001d543",
-    "LowerLeftArrow;": "\u2199",
-    "LowerRightArrow;": "\u2198",
-    "Lscr;": "\u2112",
-    "Lsh;": "\u21b0",
-    "Lstrok;": "\u0141",
-    "Lt;": "\u226a",
-    "Map;": "\u2905",
-    "Mcy;": "\u041c",
-    "MediumSpace;": "\u205f",
-    "Mellintrf;": "\u2133",
-    "Mfr;": "\U0001d510",
-    "MinusPlus;": "\u2213",
-    "Mopf;": "\U0001d544",
-    "Mscr;": "\u2133",
-    "Mu;": "\u039c",
-    "NJcy;": "\u040a",
-    "Nacute;": "\u0143",
-    "Ncaron;": "\u0147",
-    "Ncedil;": "\u0145",
-    "Ncy;": "\u041d",
-    "NegativeMediumSpace;": "\u200b",
-    "NegativeThickSpace;": "\u200b",
-    "NegativeThinSpace;": "\u200b",
-    "NegativeVeryThinSpace;": "\u200b",
-    "NestedGreaterGreater;": "\u226b",
-    "NestedLessLess;": "\u226a",
-    "NewLine;": "\n",
-    "Nfr;": "\U0001d511",
-    "NoBreak;": "\u2060",
-    "NonBreakingSpace;": "\xa0",
-    "Nopf;": "\u2115",
-    "Not;": "\u2aec",
-    "NotCongruent;": "\u2262",
-    "NotCupCap;": "\u226d",
-    "NotDoubleVerticalBar;": "\u2226",
-    "NotElement;": "\u2209",
-    "NotEqual;": "\u2260",
-    "NotEqualTilde;": "\u2242\u0338",
-    "NotExists;": "\u2204",
-    "NotGreater;": "\u226f",
-    "NotGreaterEqual;": "\u2271",
-    "NotGreaterFullEqual;": "\u2267\u0338",
-    "NotGreaterGreater;": "\u226b\u0338",
-    "NotGreaterLess;": "\u2279",
-    "NotGreaterSlantEqual;": "\u2a7e\u0338",
-    "NotGreaterTilde;": "\u2275",
-    "NotHumpDownHump;": "\u224e\u0338",
-    "NotHumpEqual;": "\u224f\u0338",
-    "NotLeftTriangle;": "\u22ea",
-    "NotLeftTriangleBar;": "\u29cf\u0338",
-    "NotLeftTriangleEqual;": "\u22ec",
-    "NotLess;": "\u226e",
-    "NotLessEqual;": "\u2270",
-    "NotLessGreater;": "\u2278",
-    "NotLessLess;": "\u226a\u0338",
-    "NotLessSlantEqual;": "\u2a7d\u0338",
-    "NotLessTilde;": "\u2274",
-    "NotNestedGreaterGreater;": "\u2aa2\u0338",
-    "NotNestedLessLess;": "\u2aa1\u0338",
-    "NotPrecedes;": "\u2280",
-    "NotPrecedesEqual;": "\u2aaf\u0338",
-    "NotPrecedesSlantEqual;": "\u22e0",
-    "NotReverseElement;": "\u220c",
-    "NotRightTriangle;": "\u22eb",
-    "NotRightTriangleBar;": "\u29d0\u0338",
-    "NotRightTriangleEqual;": "\u22ed",
-    "NotSquareSubset;": "\u228f\u0338",
-    "NotSquareSubsetEqual;": "\u22e2",
-    "NotSquareSuperset;": "\u2290\u0338",
-    "NotSquareSupersetEqual;": "\u22e3",
-    "NotSubset;": "\u2282\u20d2",
-    "NotSubsetEqual;": "\u2288",
-    "NotSucceeds;": "\u2281",
-    "NotSucceedsEqual;": "\u2ab0\u0338",
-    "NotSucceedsSlantEqual;": "\u22e1",
-    "NotSucceedsTilde;": "\u227f\u0338",
-    "NotSuperset;": "\u2283\u20d2",
-    "NotSupersetEqual;": "\u2289",
-    "NotTilde;": "\u2241",
-    "NotTildeEqual;": "\u2244",
-    "NotTildeFullEqual;": "\u2247",
-    "NotTildeTilde;": "\u2249",
-    "NotVerticalBar;": "\u2224",
-    "Nscr;": "\U0001d4a9",
-    "Ntilde": "\xd1",
-    "Ntilde;": "\xd1",
-    "Nu;": "\u039d",
-    "OElig;": "\u0152",
-    "Oacute": "\xd3",
-    "Oacute;": "\xd3",
-    "Ocirc": "\xd4",
-    "Ocirc;": "\xd4",
-    "Ocy;": "\u041e",
-    "Odblac;": "\u0150",
-    "Ofr;": "\U0001d512",
-    "Ograve": "\xd2",
-    "Ograve;": "\xd2",
-    "Omacr;": "\u014c",
-    "Omega;": "\u03a9",
-    "Omicron;": "\u039f",
-    "Oopf;": "\U0001d546",
-    "OpenCurlyDoubleQuote;": "\u201c",
-    "OpenCurlyQuote;": "\u2018",
-    "Or;": "\u2a54",
-    "Oscr;": "\U0001d4aa",
-    "Oslash": "\xd8",
-    "Oslash;": "\xd8",
-    "Otilde": "\xd5",
-    "Otilde;": "\xd5",
-    "Otimes;": "\u2a37",
-    "Ouml": "\xd6",
-    "Ouml;": "\xd6",
-    "OverBar;": "\u203e",
-    "OverBrace;": "\u23de",
-    "OverBracket;": "\u23b4",
-    "OverParenthesis;": "\u23dc",
-    "PartialD;": "\u2202",
-    "Pcy;": "\u041f",
-    "Pfr;": "\U0001d513",
-    "Phi;": "\u03a6",
-    "Pi;": "\u03a0",
-    "PlusMinus;": "\xb1",
-    "Poincareplane;": "\u210c",
-    "Popf;": "\u2119",
-    "Pr;": "\u2abb",
-    "Precedes;": "\u227a",
-    "PrecedesEqual;": "\u2aaf",
-    "PrecedesSlantEqual;": "\u227c",
-    "PrecedesTilde;": "\u227e",
-    "Prime;": "\u2033",
-    "Product;": "\u220f",
-    "Proportion;": "\u2237",
-    "Proportional;": "\u221d",
-    "Pscr;": "\U0001d4ab",
-    "Psi;": "\u03a8",
-    "QUOT": "\"",
-    "QUOT;": "\"",
-    "Qfr;": "\U0001d514",
-    "Qopf;": "\u211a",
-    "Qscr;": "\U0001d4ac",
-    "RBarr;": "\u2910",
-    "REG": "\xae",
-    "REG;": "\xae",
-    "Racute;": "\u0154",
-    "Rang;": "\u27eb",
-    "Rarr;": "\u21a0",
-    "Rarrtl;": "\u2916",
-    "Rcaron;": "\u0158",
-    "Rcedil;": "\u0156",
-    "Rcy;": "\u0420",
-    "Re;": "\u211c",
-    "ReverseElement;": "\u220b",
-    "ReverseEquilibrium;": "\u21cb",
-    "ReverseUpEquilibrium;": "\u296f",
-    "Rfr;": "\u211c",
-    "Rho;": "\u03a1",
-    "RightAngleBracket;": "\u27e9",
-    "RightArrow;": "\u2192",
-    "RightArrowBar;": "\u21e5",
-    "RightArrowLeftArrow;": "\u21c4",
-    "RightCeiling;": "\u2309",
-    "RightDoubleBracket;": "\u27e7",
-    "RightDownTeeVector;": "\u295d",
-    "RightDownVector;": "\u21c2",
-    "RightDownVectorBar;": "\u2955",
-    "RightFloor;": "\u230b",
-    "RightTee;": "\u22a2",
-    "RightTeeArrow;": "\u21a6",
-    "RightTeeVector;": "\u295b",
-    "RightTriangle;": "\u22b3",
-    "RightTriangleBar;": "\u29d0",
-    "RightTriangleEqual;": "\u22b5",
-    "RightUpDownVector;": "\u294f",
-    "RightUpTeeVector;": "\u295c",
-    "RightUpVector;": "\u21be",
-    "RightUpVectorBar;": "\u2954",
-    "RightVector;": "\u21c0",
-    "RightVectorBar;": "\u2953",
-    "Rightarrow;": "\u21d2",
-    "Ropf;": "\u211d",
-    "RoundImplies;": "\u2970",
-    "Rrightarrow;": "\u21db",
-    "Rscr;": "\u211b",
-    "Rsh;": "\u21b1",
-    "RuleDelayed;": "\u29f4",
-    "SHCHcy;": "\u0429",
-    "SHcy;": "\u0428",
-    "SOFTcy;": "\u042c",
-    "Sacute;": "\u015a",
-    "Sc;": "\u2abc",
-    "Scaron;": "\u0160",
-    "Scedil;": "\u015e",
-    "Scirc;": "\u015c",
-    "Scy;": "\u0421",
-    "Sfr;": "\U0001d516",
-    "ShortDownArrow;": "\u2193",
-    "ShortLeftArrow;": "\u2190",
-    "ShortRightArrow;": "\u2192",
-    "ShortUpArrow;": "\u2191",
-    "Sigma;": "\u03a3",
-    "SmallCircle;": "\u2218",
-    "Sopf;": "\U0001d54a",
-    "Sqrt;": "\u221a",
-    "Square;": "\u25a1",
-    "SquareIntersection;": "\u2293",
-    "SquareSubset;": "\u228f",
-    "SquareSubsetEqual;": "\u2291",
-    "SquareSuperset;": "\u2290",
-    "SquareSupersetEqual;": "\u2292",
-    "SquareUnion;": "\u2294",
-    "Sscr;": "\U0001d4ae",
-    "Star;": "\u22c6",
-    "Sub;": "\u22d0",
-    "Subset;": "\u22d0",
-    "SubsetEqual;": "\u2286",
-    "Succeeds;": "\u227b",
-    "SucceedsEqual;": "\u2ab0",
-    "SucceedsSlantEqual;": "\u227d",
-    "SucceedsTilde;": "\u227f",
-    "SuchThat;": "\u220b",
-    "Sum;": "\u2211",
-    "Sup;": "\u22d1",
-    "Superset;": "\u2283",
-    "SupersetEqual;": "\u2287",
-    "Supset;": "\u22d1",
-    "THORN": "\xde",
-    "THORN;": "\xde",
-    "TRADE;": "\u2122",
-    "TSHcy;": "\u040b",
-    "TScy;": "\u0426",
-    "Tab;": "\t",
-    "Tau;": "\u03a4",
-    "Tcaron;": "\u0164",
-    "Tcedil;": "\u0162",
-    "Tcy;": "\u0422",
-    "Tfr;": "\U0001d517",
-    "Therefore;": "\u2234",
-    "Theta;": "\u0398",
-    "ThickSpace;": "\u205f\u200a",
-    "ThinSpace;": "\u2009",
-    "Tilde;": "\u223c",
-    "TildeEqual;": "\u2243",
-    "TildeFullEqual;": "\u2245",
-    "TildeTilde;": "\u2248",
-    "Topf;": "\U0001d54b",
-    "TripleDot;": "\u20db",
-    "Tscr;": "\U0001d4af",
-    "Tstrok;": "\u0166",
-    "Uacute": "\xda",
-    "Uacute;": "\xda",
-    "Uarr;": "\u219f",
-    "Uarrocir;": "\u2949",
-    "Ubrcy;": "\u040e",
-    "Ubreve;": "\u016c",
-    "Ucirc": "\xdb",
-    "Ucirc;": "\xdb",
-    "Ucy;": "\u0423",
-    "Udblac;": "\u0170",
-    "Ufr;": "\U0001d518",
-    "Ugrave": "\xd9",
-    "Ugrave;": "\xd9",
-    "Umacr;": "\u016a",
-    "UnderBar;": "_",
-    "UnderBrace;": "\u23df",
-    "UnderBracket;": "\u23b5",
-    "UnderParenthesis;": "\u23dd",
-    "Union;": "\u22c3",
-    "UnionPlus;": "\u228e",
-    "Uogon;": "\u0172",
-    "Uopf;": "\U0001d54c",
-    "UpArrow;": "\u2191",
-    "UpArrowBar;": "\u2912",
-    "UpArrowDownArrow;": "\u21c5",
-    "UpDownArrow;": "\u2195",
-    "UpEquilibrium;": "\u296e",
-    "UpTee;": "\u22a5",
-    "UpTeeArrow;": "\u21a5",
-    "Uparrow;": "\u21d1",
-    "Updownarrow;": "\u21d5",
-    "UpperLeftArrow;": "\u2196",
-    "UpperRightArrow;": "\u2197",
-    "Upsi;": "\u03d2",
-    "Upsilon;": "\u03a5",
-    "Uring;": "\u016e",
-    "Uscr;": "\U0001d4b0",
-    "Utilde;": "\u0168",
-    "Uuml": "\xdc",
-    "Uuml;": "\xdc",
-    "VDash;": "\u22ab",
-    "Vbar;": "\u2aeb",
-    "Vcy;": "\u0412",
-    "Vdash;": "\u22a9",
-    "Vdashl;": "\u2ae6",
-    "Vee;": "\u22c1",
-    "Verbar;": "\u2016",
-    "Vert;": "\u2016",
-    "VerticalBar;": "\u2223",
-    "VerticalLine;": "|",
-    "VerticalSeparator;": "\u2758",
-    "VerticalTilde;": "\u2240",
-    "VeryThinSpace;": "\u200a",
-    "Vfr;": "\U0001d519",
-    "Vopf;": "\U0001d54d",
-    "Vscr;": "\U0001d4b1",
-    "Vvdash;": "\u22aa",
-    "Wcirc;": "\u0174",
-    "Wedge;": "\u22c0",
-    "Wfr;": "\U0001d51a",
-    "Wopf;": "\U0001d54e",
-    "Wscr;": "\U0001d4b2",
-    "Xfr;": "\U0001d51b",
-    "Xi;": "\u039e",
-    "Xopf;": "\U0001d54f",
-    "Xscr;": "\U0001d4b3",
-    "YAcy;": "\u042f",
-    "YIcy;": "\u0407",
-    "YUcy;": "\u042e",
-    "Yacute": "\xdd",
-    "Yacute;": "\xdd",
-    "Ycirc;": "\u0176",
-    "Ycy;": "\u042b",
-    "Yfr;": "\U0001d51c",
-    "Yopf;": "\U0001d550",
-    "Yscr;": "\U0001d4b4",
-    "Yuml;": "\u0178",
-    "ZHcy;": "\u0416",
-    "Zacute;": "\u0179",
-    "Zcaron;": "\u017d",
-    "Zcy;": "\u0417",
-    "Zdot;": "\u017b",
-    "ZeroWidthSpace;": "\u200b",
-    "Zeta;": "\u0396",
-    "Zfr;": "\u2128",
-    "Zopf;": "\u2124",
-    "Zscr;": "\U0001d4b5",
-    "aacute": "\xe1",
-    "aacute;": "\xe1",
-    "abreve;": "\u0103",
-    "ac;": "\u223e",
-    "acE;": "\u223e\u0333",
-    "acd;": "\u223f",
-    "acirc": "\xe2",
-    "acirc;": "\xe2",
-    "acute": "\xb4",
-    "acute;": "\xb4",
-    "acy;": "\u0430",
-    "aelig": "\xe6",
-    "aelig;": "\xe6",
-    "af;": "\u2061",
-    "afr;": "\U0001d51e",
-    "agrave": "\xe0",
-    "agrave;": "\xe0",
-    "alefsym;": "\u2135",
-    "aleph;": "\u2135",
-    "alpha;": "\u03b1",
-    "amacr;": "\u0101",
-    "amalg;": "\u2a3f",
-    "amp": "&",
-    "amp;": "&",
-    "and;": "\u2227",
-    "andand;": "\u2a55",
-    "andd;": "\u2a5c",
-    "andslope;": "\u2a58",
-    "andv;": "\u2a5a",
-    "ang;": "\u2220",
-    "ange;": "\u29a4",
-    "angle;": "\u2220",
-    "angmsd;": "\u2221",
-    "angmsdaa;": "\u29a8",
-    "angmsdab;": "\u29a9",
-    "angmsdac;": "\u29aa",
-    "angmsdad;": "\u29ab",
-    "angmsdae;": "\u29ac",
-    "angmsdaf;": "\u29ad",
-    "angmsdag;": "\u29ae",
-    "angmsdah;": "\u29af",
-    "angrt;": "\u221f",
-    "angrtvb;": "\u22be",
-    "angrtvbd;": "\u299d",
-    "angsph;": "\u2222",
-    "angst;": "\xc5",
-    "angzarr;": "\u237c",
-    "aogon;": "\u0105",
-    "aopf;": "\U0001d552",
-    "ap;": "\u2248",
-    "apE;": "\u2a70",
-    "apacir;": "\u2a6f",
-    "ape;": "\u224a",
-    "apid;": "\u224b",
-    "apos;": "'",
-    "approx;": "\u2248",
-    "approxeq;": "\u224a",
-    "aring": "\xe5",
-    "aring;": "\xe5",
-    "ascr;": "\U0001d4b6",
-    "ast;": "*",
-    "asymp;": "\u2248",
-    "asympeq;": "\u224d",
-    "atilde": "\xe3",
-    "atilde;": "\xe3",
-    "auml": "\xe4",
-    "auml;": "\xe4",
-    "awconint;": "\u2233",
-    "awint;": "\u2a11",
-    "bNot;": "\u2aed",
-    "backcong;": "\u224c",
-    "backepsilon;": "\u03f6",
-    "backprime;": "\u2035",
-    "backsim;": "\u223d",
-    "backsimeq;": "\u22cd",
-    "barvee;": "\u22bd",
-    "barwed;": "\u2305",
-    "barwedge;": "\u2305",
-    "bbrk;": "\u23b5",
-    "bbrktbrk;": "\u23b6",
-    "bcong;": "\u224c",
-    "bcy;": "\u0431",
-    "bdquo;": "\u201e",
-    "becaus;": "\u2235",
-    "because;": "\u2235",
-    "bemptyv;": "\u29b0",
-    "bepsi;": "\u03f6",
-    "bernou;": "\u212c",
-    "beta;": "\u03b2",
-    "beth;": "\u2136",
-    "between;": "\u226c",
-    "bfr;": "\U0001d51f",
-    "bigcap;": "\u22c2",
-    "bigcirc;": "\u25ef",
-    "bigcup;": "\u22c3",
-    "bigodot;": "\u2a00",
-    "bigoplus;": "\u2a01",
-    "bigotimes;": "\u2a02",
-    "bigsqcup;": "\u2a06",
-    "bigstar;": "\u2605",
-    "bigtriangledown;": "\u25bd",
-    "bigtriangleup;": "\u25b3",
-    "biguplus;": "\u2a04",
-    "bigvee;": "\u22c1",
-    "bigwedge;": "\u22c0",
-    "bkarow;": "\u290d",
-    "blacklozenge;": "\u29eb",
-    "blacksquare;": "\u25aa",
-    "blacktriangle;": "\u25b4",
-    "blacktriangledown;": "\u25be",
-    "blacktriangleleft;": "\u25c2",
-    "blacktriangleright;": "\u25b8",
-    "blank;": "\u2423",
-    "blk12;": "\u2592",
-    "blk14;": "\u2591",
-    "blk34;": "\u2593",
-    "block;": "\u2588",
-    "bne;": "=\u20e5",
-    "bnequiv;": "\u2261\u20e5",
-    "bnot;": "\u2310",
-    "bopf;": "\U0001d553",
-    "bot;": "\u22a5",
-    "bottom;": "\u22a5",
-    "bowtie;": "\u22c8",
-    "boxDL;": "\u2557",
-    "boxDR;": "\u2554",
-    "boxDl;": "\u2556",
-    "boxDr;": "\u2553",
-    "boxH;": "\u2550",
-    "boxHD;": "\u2566",
-    "boxHU;": "\u2569",
-    "boxHd;": "\u2564",
-    "boxHu;": "\u2567",
-    "boxUL;": "\u255d",
-    "boxUR;": "\u255a",
-    "boxUl;": "\u255c",
-    "boxUr;": "\u2559",
-    "boxV;": "\u2551",
-    "boxVH;": "\u256c",
-    "boxVL;": "\u2563",
-    "boxVR;": "\u2560",
-    "boxVh;": "\u256b",
-    "boxVl;": "\u2562",
-    "boxVr;": "\u255f",
-    "boxbox;": "\u29c9",
-    "boxdL;": "\u2555",
-    "boxdR;": "\u2552",
-    "boxdl;": "\u2510",
-    "boxdr;": "\u250c",
-    "boxh;": "\u2500",
-    "boxhD;": "\u2565",
-    "boxhU;": "\u2568",
-    "boxhd;": "\u252c",
-    "boxhu;": "\u2534",
-    "boxminus;": "\u229f",
-    "boxplus;": "\u229e",
-    "boxtimes;": "\u22a0",
-    "boxuL;": "\u255b",
-    "boxuR;": "\u2558",
-    "boxul;": "\u2518",
-    "boxur;": "\u2514",
-    "boxv;": "\u2502",
-    "boxvH;": "\u256a",
-    "boxvL;": "\u2561",
-    "boxvR;": "\u255e",
-    "boxvh;": "\u253c",
-    "boxvl;": "\u2524",
-    "boxvr;": "\u251c",
-    "bprime;": "\u2035",
-    "breve;": "\u02d8",
-    "brvbar": "\xa6",
-    "brvbar;": "\xa6",
-    "bscr;": "\U0001d4b7",
-    "bsemi;": "\u204f",
-    "bsim;": "\u223d",
-    "bsime;": "\u22cd",
-    "bsol;": "\\",
-    "bsolb;": "\u29c5",
-    "bsolhsub;": "\u27c8",
-    "bull;": "\u2022",
-    "bullet;": "\u2022",
-    "bump;": "\u224e",
-    "bumpE;": "\u2aae",
-    "bumpe;": "\u224f",
-    "bumpeq;": "\u224f",
-    "cacute;": "\u0107",
-    "cap;": "\u2229",
-    "capand;": "\u2a44",
-    "capbrcup;": "\u2a49",
-    "capcap;": "\u2a4b",
-    "capcup;": "\u2a47",
-    "capdot;": "\u2a40",
-    "caps;": "\u2229\ufe00",
-    "caret;": "\u2041",
-    "caron;": "\u02c7",
-    "ccaps;": "\u2a4d",
-    "ccaron;": "\u010d",
-    "ccedil": "\xe7",
-    "ccedil;": "\xe7",
-    "ccirc;": "\u0109",
-    "ccups;": "\u2a4c",
-    "ccupssm;": "\u2a50",
-    "cdot;": "\u010b",
-    "cedil": "\xb8",
-    "cedil;": "\xb8",
-    "cemptyv;": "\u29b2",
-    "cent": "\xa2",
-    "cent;": "\xa2",
-    "centerdot;": "\xb7",
-    "cfr;": "\U0001d520",
-    "chcy;": "\u0447",
-    "check;": "\u2713",
-    "checkmark;": "\u2713",
-    "chi;": "\u03c7",
-    "cir;": "\u25cb",
-    "cirE;": "\u29c3",
-    "circ;": "\u02c6",
-    "circeq;": "\u2257",
-    "circlearrowleft;": "\u21ba",
-    "circlearrowright;": "\u21bb",
-    "circledR;": "\xae",
-    "circledS;": "\u24c8",
-    "circledast;": "\u229b",
-    "circledcirc;": "\u229a",
-    "circleddash;": "\u229d",
-    "cire;": "\u2257",
-    "cirfnint;": "\u2a10",
-    "cirmid;": "\u2aef",
-    "cirscir;": "\u29c2",
-    "clubs;": "\u2663",
-    "clubsuit;": "\u2663",
-    "colon;": ":",
-    "colone;": "\u2254",
-    "coloneq;": "\u2254",
-    "comma;": ",",
-    "commat;": "@",
-    "comp;": "\u2201",
-    "compfn;": "\u2218",
-    "complement;": "\u2201",
-    "complexes;": "\u2102",
-    "cong;": "\u2245",
-    "congdot;": "\u2a6d",
-    "conint;": "\u222e",
-    "copf;": "\U0001d554",
-    "coprod;": "\u2210",
-    "copy": "\xa9",
-    "copy;": "\xa9",
-    "copysr;": "\u2117",
-    "crarr;": "\u21b5",
-    "cross;": "\u2717",
-    "cscr;": "\U0001d4b8",
-    "csub;": "\u2acf",
-    "csube;": "\u2ad1",
-    "csup;": "\u2ad0",
-    "csupe;": "\u2ad2",
-    "ctdot;": "\u22ef",
-    "cudarrl;": "\u2938",
-    "cudarrr;": "\u2935",
-    "cuepr;": "\u22de",
-    "cuesc;": "\u22df",
-    "cularr;": "\u21b6",
-    "cularrp;": "\u293d",
-    "cup;": "\u222a",
-    "cupbrcap;": "\u2a48",
-    "cupcap;": "\u2a46",
-    "cupcup;": "\u2a4a",
-    "cupdot;": "\u228d",
-    "cupor;": "\u2a45",
-    "cups;": "\u222a\ufe00",
-    "curarr;": "\u21b7",
-    "curarrm;": "\u293c",
-    "curlyeqprec;": "\u22de",
-    "curlyeqsucc;": "\u22df",
-    "curlyvee;": "\u22ce",
-    "curlywedge;": "\u22cf",
-    "curren": "\xa4",
-    "curren;": "\xa4",
-    "curvearrowleft;": "\u21b6",
-    "curvearrowright;": "\u21b7",
-    "cuvee;": "\u22ce",
-    "cuwed;": "\u22cf",
-    "cwconint;": "\u2232",
-    "cwint;": "\u2231",
-    "cylcty;": "\u232d",
-    "dArr;": "\u21d3",
-    "dHar;": "\u2965",
-    "dagger;": "\u2020",
-    "daleth;": "\u2138",
-    "darr;": "\u2193",
-    "dash;": "\u2010",
-    "dashv;": "\u22a3",
-    "dbkarow;": "\u290f",
-    "dblac;": "\u02dd",
-    "dcaron;": "\u010f",
-    "dcy;": "\u0434",
-    "dd;": "\u2146",
-    "ddagger;": "\u2021",
-    "ddarr;": "\u21ca",
-    "ddotseq;": "\u2a77",
-    "deg": "\xb0",
-    "deg;": "\xb0",
-    "delta;": "\u03b4",
-    "demptyv;": "\u29b1",
-    "dfisht;": "\u297f",
-    "dfr;": "\U0001d521",
-    "dharl;": "\u21c3",
-    "dharr;": "\u21c2",
-    "diam;": "\u22c4",
-    "diamond;": "\u22c4",
-    "diamondsuit;": "\u2666",
-    "diams;": "\u2666",
-    "die;": "\xa8",
-    "digamma;": "\u03dd",
-    "disin;": "\u22f2",
-    "div;": "\xf7",
-    "divide": "\xf7",
-    "divide;": "\xf7",
-    "divideontimes;": "\u22c7",
-    "divonx;": "\u22c7",
-    "djcy;": "\u0452",
-    "dlcorn;": "\u231e",
-    "dlcrop;": "\u230d",
-    "dollar;": "$",
-    "dopf;": "\U0001d555",
-    "dot;": "\u02d9",
-    "doteq;": "\u2250",
-    "doteqdot;": "\u2251",
-    "dotminus;": "\u2238",
-    "dotplus;": "\u2214",
-    "dotsquare;": "\u22a1",
-    "doublebarwedge;": "\u2306",
-    "downarrow;": "\u2193",
-    "downdownarrows;": "\u21ca",
-    "downharpoonleft;": "\u21c3",
-    "downharpoonright;": "\u21c2",
-    "drbkarow;": "\u2910",
-    "drcorn;": "\u231f",
-    "drcrop;": "\u230c",
-    "dscr;": "\U0001d4b9",
-    "dscy;": "\u0455",
-    "dsol;": "\u29f6",
-    "dstrok;": "\u0111",
-    "dtdot;": "\u22f1",
-    "dtri;": "\u25bf",
-    "dtrif;": "\u25be",
-    "duarr;": "\u21f5",
-    "duhar;": "\u296f",
-    "dwangle;": "\u29a6",
-    "dzcy;": "\u045f",
-    "dzigrarr;": "\u27ff",
-    "eDDot;": "\u2a77",
-    "eDot;": "\u2251",
-    "eacute": "\xe9",
-    "eacute;": "\xe9",
-    "easter;": "\u2a6e",
-    "ecaron;": "\u011b",
-    "ecir;": "\u2256",
-    "ecirc": "\xea",
-    "ecirc;": "\xea",
-    "ecolon;": "\u2255",
-    "ecy;": "\u044d",
-    "edot;": "\u0117",
-    "ee;": "\u2147",
-    "efDot;": "\u2252",
-    "efr;": "\U0001d522",
-    "eg;": "\u2a9a",
-    "egrave": "\xe8",
-    "egrave;": "\xe8",
-    "egs;": "\u2a96",
-    "egsdot;": "\u2a98",
-    "el;": "\u2a99",
-    "elinters;": "\u23e7",
-    "ell;": "\u2113",
-    "els;": "\u2a95",
-    "elsdot;": "\u2a97",
-    "emacr;": "\u0113",
-    "empty;": "\u2205",
-    "emptyset;": "\u2205",
-    "emptyv;": "\u2205",
-    "emsp13;": "\u2004",
-    "emsp14;": "\u2005",
-    "emsp;": "\u2003",
-    "eng;": "\u014b",
-    "ensp;": "\u2002",
-    "eogon;": "\u0119",
-    "eopf;": "\U0001d556",
-    "epar;": "\u22d5",
-    "eparsl;": "\u29e3",
-    "eplus;": "\u2a71",
-    "epsi;": "\u03b5",
-    "epsilon;": "\u03b5",
-    "epsiv;": "\u03f5",
-    "eqcirc;": "\u2256",
-    "eqcolon;": "\u2255",
-    "eqsim;": "\u2242",
-    "eqslantgtr;": "\u2a96",
-    "eqslantless;": "\u2a95",
-    "equals;": "=",
-    "equest;": "\u225f",
-    "equiv;": "\u2261",
-    "equivDD;": "\u2a78",
-    "eqvparsl;": "\u29e5",
-    "erDot;": "\u2253",
-    "erarr;": "\u2971",
-    "escr;": "\u212f",
-    "esdot;": "\u2250",
-    "esim;": "\u2242",
-    "eta;": "\u03b7",
-    "eth": "\xf0",
-    "eth;": "\xf0",
-    "euml": "\xeb",
-    "euml;": "\xeb",
-    "euro;": "\u20ac",
-    "excl;": "!",
-    "exist;": "\u2203",
-    "expectation;": "\u2130",
-    "exponentiale;": "\u2147",
-    "fallingdotseq;": "\u2252",
-    "fcy;": "\u0444",
-    "female;": "\u2640",
-    "ffilig;": "\ufb03",
-    "fflig;": "\ufb00",
-    "ffllig;": "\ufb04",
-    "ffr;": "\U0001d523",
-    "filig;": "\ufb01",
-    "fjlig;": "fj",
-    "flat;": "\u266d",
-    "fllig;": "\ufb02",
-    "fltns;": "\u25b1",
-    "fnof;": "\u0192",
-    "fopf;": "\U0001d557",
-    "forall;": "\u2200",
-    "fork;": "\u22d4",
-    "forkv;": "\u2ad9",
-    "fpartint;": "\u2a0d",
-    "frac12": "\xbd",
-    "frac12;": "\xbd",
-    "frac13;": "\u2153",
-    "frac14": "\xbc",
-    "frac14;": "\xbc",
-    "frac15;": "\u2155",
-    "frac16;": "\u2159",
-    "frac18;": "\u215b",
-    "frac23;": "\u2154",
-    "frac25;": "\u2156",
-    "frac34": "\xbe",
-    "frac34;": "\xbe",
-    "frac35;": "\u2157",
-    "frac38;": "\u215c",
-    "frac45;": "\u2158",
-    "frac56;": "\u215a",
-    "frac58;": "\u215d",
-    "frac78;": "\u215e",
-    "frasl;": "\u2044",
-    "frown;": "\u2322",
-    "fscr;": "\U0001d4bb",
-    "gE;": "\u2267",
-    "gEl;": "\u2a8c",
-    "gacute;": "\u01f5",
-    "gamma;": "\u03b3",
-    "gammad;": "\u03dd",
-    "gap;": "\u2a86",
-    "gbreve;": "\u011f",
-    "gcirc;": "\u011d",
-    "gcy;": "\u0433",
-    "gdot;": "\u0121",
-    "ge;": "\u2265",
-    "gel;": "\u22db",
-    "geq;": "\u2265",
-    "geqq;": "\u2267",
-    "geqslant;": "\u2a7e",
-    "ges;": "\u2a7e",
-    "gescc;": "\u2aa9",
-    "gesdot;": "\u2a80",
-    "gesdoto;": "\u2a82",
-    "gesdotol;": "\u2a84",
-    "gesl;": "\u22db\ufe00",
-    "gesles;": "\u2a94",
-    "gfr;": "\U0001d524",
-    "gg;": "\u226b",
-    "ggg;": "\u22d9",
-    "gimel;": "\u2137",
-    "gjcy;": "\u0453",
-    "gl;": "\u2277",
-    "glE;": "\u2a92",
-    "gla;": "\u2aa5",
-    "glj;": "\u2aa4",
-    "gnE;": "\u2269",
-    "gnap;": "\u2a8a",
-    "gnapprox;": "\u2a8a",
-    "gne;": "\u2a88",
-    "gneq;": "\u2a88",
-    "gneqq;": "\u2269",
-    "gnsim;": "\u22e7",
-    "gopf;": "\U0001d558",
-    "grave;": "`",
-    "gscr;": "\u210a",
-    "gsim;": "\u2273",
-    "gsime;": "\u2a8e",
-    "gsiml;": "\u2a90",
-    "gt": ">",
-    "gt;": ">",
-    "gtcc;": "\u2aa7",
-    "gtcir;": "\u2a7a",
-    "gtdot;": "\u22d7",
-    "gtlPar;": "\u2995",
-    "gtquest;": "\u2a7c",
-    "gtrapprox;": "\u2a86",
-    "gtrarr;": "\u2978",
-    "gtrdot;": "\u22d7",
-    "gtreqless;": "\u22db",
-    "gtreqqless;": "\u2a8c",
-    "gtrless;": "\u2277",
-    "gtrsim;": "\u2273",
-    "gvertneqq;": "\u2269\ufe00",
-    "gvnE;": "\u2269\ufe00",
-    "hArr;": "\u21d4",
-    "hairsp;": "\u200a",
-    "half;": "\xbd",
-    "hamilt;": "\u210b",
-    "hardcy;": "\u044a",
-    "harr;": "\u2194",
-    "harrcir;": "\u2948",
-    "harrw;": "\u21ad",
-    "hbar;": "\u210f",
-    "hcirc;": "\u0125",
-    "hearts;": "\u2665",
-    "heartsuit;": "\u2665",
-    "hellip;": "\u2026",
-    "hercon;": "\u22b9",
-    "hfr;": "\U0001d525",
-    "hksearow;": "\u2925",
-    "hkswarow;": "\u2926",
-    "hoarr;": "\u21ff",
-    "homtht;": "\u223b",
-    "hookleftarrow;": "\u21a9",
-    "hookrightarrow;": "\u21aa",
-    "hopf;": "\U0001d559",
-    "horbar;": "\u2015",
-    "hscr;": "\U0001d4bd",
-    "hslash;": "\u210f",
-    "hstrok;": "\u0127",
-    "hybull;": "\u2043",
-    "hyphen;": "\u2010",
-    "iacute": "\xed",
-    "iacute;": "\xed",
-    "ic;": "\u2063",
-    "icirc": "\xee",
-    "icirc;": "\xee",
-    "icy;": "\u0438",
-    "iecy;": "\u0435",
-    "iexcl": "\xa1",
-    "iexcl;": "\xa1",
-    "iff;": "\u21d4",
-    "ifr;": "\U0001d526",
-    "igrave": "\xec",
-    "igrave;": "\xec",
-    "ii;": "\u2148",
-    "iiiint;": "\u2a0c",
-    "iiint;": "\u222d",
-    "iinfin;": "\u29dc",
-    "iiota;": "\u2129",
-    "ijlig;": "\u0133",
-    "imacr;": "\u012b",
-    "image;": "\u2111",
-    "imagline;": "\u2110",
-    "imagpart;": "\u2111",
-    "imath;": "\u0131",
-    "imof;": "\u22b7",
-    "imped;": "\u01b5",
-    "in;": "\u2208",
-    "incare;": "\u2105",
-    "infin;": "\u221e",
-    "infintie;": "\u29dd",
-    "inodot;": "\u0131",
-    "int;": "\u222b",
-    "intcal;": "\u22ba",
-    "integers;": "\u2124",
-    "intercal;": "\u22ba",
-    "intlarhk;": "\u2a17",
-    "intprod;": "\u2a3c",
-    "iocy;": "\u0451",
-    "iogon;": "\u012f",
-    "iopf;": "\U0001d55a",
-    "iota;": "\u03b9",
-    "iprod;": "\u2a3c",
-    "iquest": "\xbf",
-    "iquest;": "\xbf",
-    "iscr;": "\U0001d4be",
-    "isin;": "\u2208",
-    "isinE;": "\u22f9",
-    "isindot;": "\u22f5",
-    "isins;": "\u22f4",
-    "isinsv;": "\u22f3",
-    "isinv;": "\u2208",
-    "it;": "\u2062",
-    "itilde;": "\u0129",
-    "iukcy;": "\u0456",
-    "iuml": "\xef",
-    "iuml;": "\xef",
-    "jcirc;": "\u0135",
-    "jcy;": "\u0439",
-    "jfr;": "\U0001d527",
-    "jmath;": "\u0237",
-    "jopf;": "\U0001d55b",
-    "jscr;": "\U0001d4bf",
-    "jsercy;": "\u0458",
-    "jukcy;": "\u0454",
-    "kappa;": "\u03ba",
-    "kappav;": "\u03f0",
-    "kcedil;": "\u0137",
-    "kcy;": "\u043a",
-    "kfr;": "\U0001d528",
-    "kgreen;": "\u0138",
-    "khcy;": "\u0445",
-    "kjcy;": "\u045c",
-    "kopf;": "\U0001d55c",
-    "kscr;": "\U0001d4c0",
-    "lAarr;": "\u21da",
-    "lArr;": "\u21d0",
-    "lAtail;": "\u291b",
-    "lBarr;": "\u290e",
-    "lE;": "\u2266",
-    "lEg;": "\u2a8b",
-    "lHar;": "\u2962",
-    "lacute;": "\u013a",
-    "laemptyv;": "\u29b4",
-    "lagran;": "\u2112",
-    "lambda;": "\u03bb",
-    "lang;": "\u27e8",
-    "langd;": "\u2991",
-    "langle;": "\u27e8",
-    "lap;": "\u2a85",
-    "laquo": "\xab",
-    "laquo;": "\xab",
-    "larr;": "\u2190",
-    "larrb;": "\u21e4",
-    "larrbfs;": "\u291f",
-    "larrfs;": "\u291d",
-    "larrhk;": "\u21a9",
-    "larrlp;": "\u21ab",
-    "larrpl;": "\u2939",
-    "larrsim;": "\u2973",
-    "larrtl;": "\u21a2",
-    "lat;": "\u2aab",
-    "latail;": "\u2919",
-    "late;": "\u2aad",
-    "lates;": "\u2aad\ufe00",
-    "lbarr;": "\u290c",
-    "lbbrk;": "\u2772",
-    "lbrace;": "{",
-    "lbrack;": "[",
-    "lbrke;": "\u298b",
-    "lbrksld;": "\u298f",
-    "lbrkslu;": "\u298d",
-    "lcaron;": "\u013e",
-    "lcedil;": "\u013c",
-    "lceil;": "\u2308",
-    "lcub;": "{",
-    "lcy;": "\u043b",
-    "ldca;": "\u2936",
-    "ldquo;": "\u201c",
-    "ldquor;": "\u201e",
-    "ldrdhar;": "\u2967",
-    "ldrushar;": "\u294b",
-    "ldsh;": "\u21b2",
-    "le;": "\u2264",
-    "leftarrow;": "\u2190",
-    "leftarrowtail;": "\u21a2",
-    "leftharpoondown;": "\u21bd",
-    "leftharpoonup;": "\u21bc",
-    "leftleftarrows;": "\u21c7",
-    "leftrightarrow;": "\u2194",
-    "leftrightarrows;": "\u21c6",
-    "leftrightharpoons;": "\u21cb",
-    "leftrightsquigarrow;": "\u21ad",
-    "leftthreetimes;": "\u22cb",
-    "leg;": "\u22da",
-    "leq;": "\u2264",
-    "leqq;": "\u2266",
-    "leqslant;": "\u2a7d",
-    "les;": "\u2a7d",
-    "lescc;": "\u2aa8",
-    "lesdot;": "\u2a7f",
-    "lesdoto;": "\u2a81",
-    "lesdotor;": "\u2a83",
-    "lesg;": "\u22da\ufe00",
-    "lesges;": "\u2a93",
-    "lessapprox;": "\u2a85",
-    "lessdot;": "\u22d6",
-    "lesseqgtr;": "\u22da",
-    "lesseqqgtr;": "\u2a8b",
-    "lessgtr;": "\u2276",
-    "lesssim;": "\u2272",
-    "lfisht;": "\u297c",
-    "lfloor;": "\u230a",
-    "lfr;": "\U0001d529",
-    "lg;": "\u2276",
-    "lgE;": "\u2a91",
-    "lhard;": "\u21bd",
-    "lharu;": "\u21bc",
-    "lharul;": "\u296a",
-    "lhblk;": "\u2584",
-    "ljcy;": "\u0459",
-    "ll;": "\u226a",
-    "llarr;": "\u21c7",
-    "llcorner;": "\u231e",
-    "llhard;": "\u296b",
-    "lltri;": "\u25fa",
-    "lmidot;": "\u0140",
-    "lmoust;": "\u23b0",
-    "lmoustache;": "\u23b0",
-    "lnE;": "\u2268",
-    "lnap;": "\u2a89",
-    "lnapprox;": "\u2a89",
-    "lne;": "\u2a87",
-    "lneq;": "\u2a87",
-    "lneqq;": "\u2268",
-    "lnsim;": "\u22e6",
-    "loang;": "\u27ec",
-    "loarr;": "\u21fd",
-    "lobrk;": "\u27e6",
-    "longleftarrow;": "\u27f5",
-    "longleftrightarrow;": "\u27f7",
-    "longmapsto;": "\u27fc",
-    "longrightarrow;": "\u27f6",
-    "looparrowleft;": "\u21ab",
-    "looparrowright;": "\u21ac",
-    "lopar;": "\u2985",
-    "lopf;": "\U0001d55d",
-    "loplus;": "\u2a2d",
-    "lotimes;": "\u2a34",
-    "lowast;": "\u2217",
-    "lowbar;": "_",
-    "loz;": "\u25ca",
-    "lozenge;": "\u25ca",
-    "lozf;": "\u29eb",
-    "lpar;": "(",
-    "lparlt;": "\u2993",
-    "lrarr;": "\u21c6",
-    "lrcorner;": "\u231f",
-    "lrhar;": "\u21cb",
-    "lrhard;": "\u296d",
-    "lrm;": "\u200e",
-    "lrtri;": "\u22bf",
-    "lsaquo;": "\u2039",
-    "lscr;": "\U0001d4c1",
-    "lsh;": "\u21b0",
-    "lsim;": "\u2272",
-    "lsime;": "\u2a8d",
-    "lsimg;": "\u2a8f",
-    "lsqb;": "[",
-    "lsquo;": "\u2018",
-    "lsquor;": "\u201a",
-    "lstrok;": "\u0142",
-    "lt": "<",
-    "lt;": "<",
-    "ltcc;": "\u2aa6",
-    "ltcir;": "\u2a79",
-    "ltdot;": "\u22d6",
-    "lthree;": "\u22cb",
-    "ltimes;": "\u22c9",
-    "ltlarr;": "\u2976",
-    "ltquest;": "\u2a7b",
-    "ltrPar;": "\u2996",
-    "ltri;": "\u25c3",
-    "ltrie;": "\u22b4",
-    "ltrif;": "\u25c2",
-    "lurdshar;": "\u294a",
-    "luruhar;": "\u2966",
-    "lvertneqq;": "\u2268\ufe00",
-    "lvnE;": "\u2268\ufe00",
-    "mDDot;": "\u223a",
-    "macr": "\xaf",
-    "macr;": "\xaf",
-    "male;": "\u2642",
-    "malt;": "\u2720",
-    "maltese;": "\u2720",
-    "map;": "\u21a6",
-    "mapsto;": "\u21a6",
-    "mapstodown;": "\u21a7",
-    "mapstoleft;": "\u21a4",
-    "mapstoup;": "\u21a5",
-    "marker;": "\u25ae",
-    "mcomma;": "\u2a29",
-    "mcy;": "\u043c",
-    "mdash;": "\u2014",
-    "measuredangle;": "\u2221",
-    "mfr;": "\U0001d52a",
-    "mho;": "\u2127",
-    "micro": "\xb5",
-    "micro;": "\xb5",
-    "mid;": "\u2223",
-    "midast;": "*",
-    "midcir;": "\u2af0",
-    "middot": "\xb7",
-    "middot;": "\xb7",
-    "minus;": "\u2212",
-    "minusb;": "\u229f",
-    "minusd;": "\u2238",
-    "minusdu;": "\u2a2a",
-    "mlcp;": "\u2adb",
-    "mldr;": "\u2026",
-    "mnplus;": "\u2213",
-    "models;": "\u22a7",
-    "mopf;": "\U0001d55e",
-    "mp;": "\u2213",
-    "mscr;": "\U0001d4c2",
-    "mstpos;": "\u223e",
-    "mu;": "\u03bc",
-    "multimap;": "\u22b8",
-    "mumap;": "\u22b8",
-    "nGg;": "\u22d9\u0338",
-    "nGt;": "\u226b\u20d2",
-    "nGtv;": "\u226b\u0338",
-    "nLeftarrow;": "\u21cd",
-    "nLeftrightarrow;": "\u21ce",
-    "nLl;": "\u22d8\u0338",
-    "nLt;": "\u226a\u20d2",
-    "nLtv;": "\u226a\u0338",
-    "nRightarrow;": "\u21cf",
-    "nVDash;": "\u22af",
-    "nVdash;": "\u22ae",
-    "nabla;": "\u2207",
-    "nacute;": "\u0144",
-    "nang;": "\u2220\u20d2",
-    "nap;": "\u2249",
-    "napE;": "\u2a70\u0338",
-    "napid;": "\u224b\u0338",
-    "napos;": "\u0149",
-    "napprox;": "\u2249",
-    "natur;": "\u266e",
-    "natural;": "\u266e",
-    "naturals;": "\u2115",
-    "nbsp": "\xa0",
-    "nbsp;": "\xa0",
-    "nbump;": "\u224e\u0338",
-    "nbumpe;": "\u224f\u0338",
-    "ncap;": "\u2a43",
-    "ncaron;": "\u0148",
-    "ncedil;": "\u0146",
-    "ncong;": "\u2247",
-    "ncongdot;": "\u2a6d\u0338",
-    "ncup;": "\u2a42",
-    "ncy;": "\u043d",
-    "ndash;": "\u2013",
-    "ne;": "\u2260",
-    "neArr;": "\u21d7",
-    "nearhk;": "\u2924",
-    "nearr;": "\u2197",
-    "nearrow;": "\u2197",
-    "nedot;": "\u2250\u0338",
-    "nequiv;": "\u2262",
-    "nesear;": "\u2928",
-    "nesim;": "\u2242\u0338",
-    "nexist;": "\u2204",
-    "nexists;": "\u2204",
-    "nfr;": "\U0001d52b",
-    "ngE;": "\u2267\u0338",
-    "nge;": "\u2271",
-    "ngeq;": "\u2271",
-    "ngeqq;": "\u2267\u0338",
-    "ngeqslant;": "\u2a7e\u0338",
-    "nges;": "\u2a7e\u0338",
-    "ngsim;": "\u2275",
-    "ngt;": "\u226f",
-    "ngtr;": "\u226f",
-    "nhArr;": "\u21ce",
-    "nharr;": "\u21ae",
-    "nhpar;": "\u2af2",
-    "ni;": "\u220b",
-    "nis;": "\u22fc",
-    "nisd;": "\u22fa",
-    "niv;": "\u220b",
-    "njcy;": "\u045a",
-    "nlArr;": "\u21cd",
-    "nlE;": "\u2266\u0338",
-    "nlarr;": "\u219a",
-    "nldr;": "\u2025",
-    "nle;": "\u2270",
-    "nleftarrow;": "\u219a",
-    "nleftrightarrow;": "\u21ae",
-    "nleq;": "\u2270",
-    "nleqq;": "\u2266\u0338",
-    "nleqslant;": "\u2a7d\u0338",
-    "nles;": "\u2a7d\u0338",
-    "nless;": "\u226e",
-    "nlsim;": "\u2274",
-    "nlt;": "\u226e",
-    "nltri;": "\u22ea",
-    "nltrie;": "\u22ec",
-    "nmid;": "\u2224",
-    "nopf;": "\U0001d55f",
-    "not": "\xac",
-    "not;": "\xac",
-    "notin;": "\u2209",
-    "notinE;": "\u22f9\u0338",
-    "notindot;": "\u22f5\u0338",
-    "notinva;": "\u2209",
-    "notinvb;": "\u22f7",
-    "notinvc;": "\u22f6",
-    "notni;": "\u220c",
-    "notniva;": "\u220c",
-    "notnivb;": "\u22fe",
-    "notnivc;": "\u22fd",
-    "npar;": "\u2226",
-    "nparallel;": "\u2226",
-    "nparsl;": "\u2afd\u20e5",
-    "npart;": "\u2202\u0338",
-    "npolint;": "\u2a14",
-    "npr;": "\u2280",
-    "nprcue;": "\u22e0",
-    "npre;": "\u2aaf\u0338",
-    "nprec;": "\u2280",
-    "npreceq;": "\u2aaf\u0338",
-    "nrArr;": "\u21cf",
-    "nrarr;": "\u219b",
-    "nrarrc;": "\u2933\u0338",
-    "nrarrw;": "\u219d\u0338",
-    "nrightarrow;": "\u219b",
-    "nrtri;": "\u22eb",
-    "nrtrie;": "\u22ed",
-    "nsc;": "\u2281",
-    "nsccue;": "\u22e1",
-    "nsce;": "\u2ab0\u0338",
-    "nscr;": "\U0001d4c3",
-    "nshortmid;": "\u2224",
-    "nshortparallel;": "\u2226",
-    "nsim;": "\u2241",
-    "nsime;": "\u2244",
-    "nsimeq;": "\u2244",
-    "nsmid;": "\u2224",
-    "nspar;": "\u2226",
-    "nsqsube;": "\u22e2",
-    "nsqsupe;": "\u22e3",
-    "nsub;": "\u2284",
-    "nsubE;": "\u2ac5\u0338",
-    "nsube;": "\u2288",
-    "nsubset;": "\u2282\u20d2",
-    "nsubseteq;": "\u2288",
-    "nsubseteqq;": "\u2ac5\u0338",
-    "nsucc;": "\u2281",
-    "nsucceq;": "\u2ab0\u0338",
-    "nsup;": "\u2285",
-    "nsupE;": "\u2ac6\u0338",
-    "nsupe;": "\u2289",
-    "nsupset;": "\u2283\u20d2",
-    "nsupseteq;": "\u2289",
-    "nsupseteqq;": "\u2ac6\u0338",
-    "ntgl;": "\u2279",
-    "ntilde": "\xf1",
-    "ntilde;": "\xf1",
-    "ntlg;": "\u2278",
-    "ntriangleleft;": "\u22ea",
-    "ntrianglelefteq;": "\u22ec",
-    "ntriangleright;": "\u22eb",
-    "ntrianglerighteq;": "\u22ed",
-    "nu;": "\u03bd",
-    "num;": "#",
-    "numero;": "\u2116",
-    "numsp;": "\u2007",
-    "nvDash;": "\u22ad",
-    "nvHarr;": "\u2904",
-    "nvap;": "\u224d\u20d2",
-    "nvdash;": "\u22ac",
-    "nvge;": "\u2265\u20d2",
-    "nvgt;": ">\u20d2",
-    "nvinfin;": "\u29de",
-    "nvlArr;": "\u2902",
-    "nvle;": "\u2264\u20d2",
-    "nvlt;": "<\u20d2",
-    "nvltrie;": "\u22b4\u20d2",
-    "nvrArr;": "\u2903",
-    "nvrtrie;": "\u22b5\u20d2",
-    "nvsim;": "\u223c\u20d2",
-    "nwArr;": "\u21d6",
-    "nwarhk;": "\u2923",
-    "nwarr;": "\u2196",
-    "nwarrow;": "\u2196",
-    "nwnear;": "\u2927",
-    "oS;": "\u24c8",
-    "oacute": "\xf3",
-    "oacute;": "\xf3",
-    "oast;": "\u229b",
-    "ocir;": "\u229a",
-    "ocirc": "\xf4",
-    "ocirc;": "\xf4",
-    "ocy;": "\u043e",
-    "odash;": "\u229d",
-    "odblac;": "\u0151",
-    "odiv;": "\u2a38",
-    "odot;": "\u2299",
-    "odsold;": "\u29bc",
-    "oelig;": "\u0153",
-    "ofcir;": "\u29bf",
-    "ofr;": "\U0001d52c",
-    "ogon;": "\u02db",
-    "ograve": "\xf2",
-    "ograve;": "\xf2",
-    "ogt;": "\u29c1",
-    "ohbar;": "\u29b5",
-    "ohm;": "\u03a9",
-    "oint;": "\u222e",
-    "olarr;": "\u21ba",
-    "olcir;": "\u29be",
-    "olcross;": "\u29bb",
-    "oline;": "\u203e",
-    "olt;": "\u29c0",
-    "omacr;": "\u014d",
-    "omega;": "\u03c9",
-    "omicron;": "\u03bf",
-    "omid;": "\u29b6",
-    "ominus;": "\u2296",
-    "oopf;": "\U0001d560",
-    "opar;": "\u29b7",
-    "operp;": "\u29b9",
-    "oplus;": "\u2295",
-    "or;": "\u2228",
-    "orarr;": "\u21bb",
-    "ord;": "\u2a5d",
-    "order;": "\u2134",
-    "orderof;": "\u2134",
-    "ordf": "\xaa",
-    "ordf;": "\xaa",
-    "ordm": "\xba",
-    "ordm;": "\xba",
-    "origof;": "\u22b6",
-    "oror;": "\u2a56",
-    "orslope;": "\u2a57",
-    "orv;": "\u2a5b",
-    "oscr;": "\u2134",
-    "oslash": "\xf8",
-    "oslash;": "\xf8",
-    "osol;": "\u2298",
-    "otilde": "\xf5",
-    "otilde;": "\xf5",
-    "otimes;": "\u2297",
-    "otimesas;": "\u2a36",
-    "ouml": "\xf6",
-    "ouml;": "\xf6",
-    "ovbar;": "\u233d",
-    "par;": "\u2225",
-    "para": "\xb6",
-    "para;": "\xb6",
-    "parallel;": "\u2225",
-    "parsim;": "\u2af3",
-    "parsl;": "\u2afd",
-    "part;": "\u2202",
-    "pcy;": "\u043f",
-    "percnt;": "%",
-    "period;": ".",
-    "permil;": "\u2030",
-    "perp;": "\u22a5",
-    "pertenk;": "\u2031",
-    "pfr;": "\U0001d52d",
-    "phi;": "\u03c6",
-    "phiv;": "\u03d5",
-    "phmmat;": "\u2133",
-    "phone;": "\u260e",
-    "pi;": "\u03c0",
-    "pitchfork;": "\u22d4",
-    "piv;": "\u03d6",
-    "planck;": "\u210f",
-    "planckh;": "\u210e",
-    "plankv;": "\u210f",
-    "plus;": "+",
-    "plusacir;": "\u2a23",
-    "plusb;": "\u229e",
-    "pluscir;": "\u2a22",
-    "plusdo;": "\u2214",
-    "plusdu;": "\u2a25",
-    "pluse;": "\u2a72",
-    "plusmn": "\xb1",
-    "plusmn;": "\xb1",
-    "plussim;": "\u2a26",
-    "plustwo;": "\u2a27",
-    "pm;": "\xb1",
-    "pointint;": "\u2a15",
-    "popf;": "\U0001d561",
-    "pound": "\xa3",
-    "pound;": "\xa3",
-    "pr;": "\u227a",
-    "prE;": "\u2ab3",
-    "prap;": "\u2ab7",
-    "prcue;": "\u227c",
-    "pre;": "\u2aaf",
-    "prec;": "\u227a",
-    "precapprox;": "\u2ab7",
-    "preccurlyeq;": "\u227c",
-    "preceq;": "\u2aaf",
-    "precnapprox;": "\u2ab9",
-    "precneqq;": "\u2ab5",
-    "precnsim;": "\u22e8",
-    "precsim;": "\u227e",
-    "prime;": "\u2032",
-    "primes;": "\u2119",
-    "prnE;": "\u2ab5",
-    "prnap;": "\u2ab9",
-    "prnsim;": "\u22e8",
-    "prod;": "\u220f",
-    "profalar;": "\u232e",
-    "profline;": "\u2312",
-    "profsurf;": "\u2313",
-    "prop;": "\u221d",
-    "propto;": "\u221d",
-    "prsim;": "\u227e",
-    "prurel;": "\u22b0",
-    "pscr;": "\U0001d4c5",
-    "psi;": "\u03c8",
-    "puncsp;": "\u2008",
-    "qfr;": "\U0001d52e",
-    "qint;": "\u2a0c",
-    "qopf;": "\U0001d562",
-    "qprime;": "\u2057",
-    "qscr;": "\U0001d4c6",
-    "quaternions;": "\u210d",
-    "quatint;": "\u2a16",
-    "quest;": "?",
-    "questeq;": "\u225f",
-    "quot": "\"",
-    "quot;": "\"",
-    "rAarr;": "\u21db",
-    "rArr;": "\u21d2",
-    "rAtail;": "\u291c",
-    "rBarr;": "\u290f",
-    "rHar;": "\u2964",
-    "race;": "\u223d\u0331",
-    "racute;": "\u0155",
-    "radic;": "\u221a",
-    "raemptyv;": "\u29b3",
-    "rang;": "\u27e9",
-    "rangd;": "\u2992",
-    "range;": "\u29a5",
-    "rangle;": "\u27e9",
-    "raquo": "\xbb",
-    "raquo;": "\xbb",
-    "rarr;": "\u2192",
-    "rarrap;": "\u2975",
-    "rarrb;": "\u21e5",
-    "rarrbfs;": "\u2920",
-    "rarrc;": "\u2933",
-    "rarrfs;": "\u291e",
-    "rarrhk;": "\u21aa",
-    "rarrlp;": "\u21ac",
-    "rarrpl;": "\u2945",
-    "rarrsim;": "\u2974",
-    "rarrtl;": "\u21a3",
-    "rarrw;": "\u219d",
-    "ratail;": "\u291a",
-    "ratio;": "\u2236",
-    "rationals;": "\u211a",
-    "rbarr;": "\u290d",
-    "rbbrk;": "\u2773",
-    "rbrace;": "}",
-    "rbrack;": "]",
-    "rbrke;": "\u298c",
-    "rbrksld;": "\u298e",
-    "rbrkslu;": "\u2990",
-    "rcaron;": "\u0159",
-    "rcedil;": "\u0157",
-    "rceil;": "\u2309",
-    "rcub;": "}",
-    "rcy;": "\u0440",
-    "rdca;": "\u2937",
-    "rdldhar;": "\u2969",
-    "rdquo;": "\u201d",
-    "rdquor;": "\u201d",
-    "rdsh;": "\u21b3",
-    "real;": "\u211c",
-    "realine;": "\u211b",
-    "realpart;": "\u211c",
-    "reals;": "\u211d",
-    "rect;": "\u25ad",
-    "reg": "\xae",
-    "reg;": "\xae",
-    "rfisht;": "\u297d",
-    "rfloor;": "\u230b",
-    "rfr;": "\U0001d52f",
-    "rhard;": "\u21c1",
-    "rharu;": "\u21c0",
-    "rharul;": "\u296c",
-    "rho;": "\u03c1",
-    "rhov;": "\u03f1",
-    "rightarrow;": "\u2192",
-    "rightarrowtail;": "\u21a3",
-    "rightharpoondown;": "\u21c1",
-    "rightharpoonup;": "\u21c0",
-    "rightleftarrows;": "\u21c4",
-    "rightleftharpoons;": "\u21cc",
-    "rightrightarrows;": "\u21c9",
-    "rightsquigarrow;": "\u219d",
-    "rightthreetimes;": "\u22cc",
-    "ring;": "\u02da",
-    "risingdotseq;": "\u2253",
-    "rlarr;": "\u21c4",
-    "rlhar;": "\u21cc",
-    "rlm;": "\u200f",
-    "rmoust;": "\u23b1",
-    "rmoustache;": "\u23b1",
-    "rnmid;": "\u2aee",
-    "roang;": "\u27ed",
-    "roarr;": "\u21fe",
-    "robrk;": "\u27e7",
-    "ropar;": "\u2986",
-    "ropf;": "\U0001d563",
-    "roplus;": "\u2a2e",
-    "rotimes;": "\u2a35",
-    "rpar;": ")",
-    "rpargt;": "\u2994",
-    "rppolint;": "\u2a12",
-    "rrarr;": "\u21c9",
-    "rsaquo;": "\u203a",
-    "rscr;": "\U0001d4c7",
-    "rsh;": "\u21b1",
-    "rsqb;": "]",
-    "rsquo;": "\u2019",
-    "rsquor;": "\u2019",
-    "rthree;": "\u22cc",
-    "rtimes;": "\u22ca",
-    "rtri;": "\u25b9",
-    "rtrie;": "\u22b5",
-    "rtrif;": "\u25b8",
-    "rtriltri;": "\u29ce",
-    "ruluhar;": "\u2968",
-    "rx;": "\u211e",
-    "sacute;": "\u015b",
-    "sbquo;": "\u201a",
-    "sc;": "\u227b",
-    "scE;": "\u2ab4",
-    "scap;": "\u2ab8",
-    "scaron;": "\u0161",
-    "sccue;": "\u227d",
-    "sce;": "\u2ab0",
-    "scedil;": "\u015f",
-    "scirc;": "\u015d",
-    "scnE;": "\u2ab6",
-    "scnap;": "\u2aba",
-    "scnsim;": "\u22e9",
-    "scpolint;": "\u2a13",
-    "scsim;": "\u227f",
-    "scy;": "\u0441",
-    "sdot;": "\u22c5",
-    "sdotb;": "\u22a1",
-    "sdote;": "\u2a66",
-    "seArr;": "\u21d8",
-    "searhk;": "\u2925",
-    "searr;": "\u2198",
-    "searrow;": "\u2198",
-    "sect": "\xa7",
-    "sect;": "\xa7",
-    "semi;": ";",
-    "seswar;": "\u2929",
-    "setminus;": "\u2216",
-    "setmn;": "\u2216",
-    "sext;": "\u2736",
-    "sfr;": "\U0001d530",
-    "sfrown;": "\u2322",
-    "sharp;": "\u266f",
-    "shchcy;": "\u0449",
-    "shcy;": "\u0448",
-    "shortmid;": "\u2223",
-    "shortparallel;": "\u2225",
-    "shy": "\xad",
-    "shy;": "\xad",
-    "sigma;": "\u03c3",
-    "sigmaf;": "\u03c2",
-    "sigmav;": "\u03c2",
-    "sim;": "\u223c",
-    "simdot;": "\u2a6a",
-    "sime;": "\u2243",
-    "simeq;": "\u2243",
-    "simg;": "\u2a9e",
-    "simgE;": "\u2aa0",
-    "siml;": "\u2a9d",
-    "simlE;": "\u2a9f",
-    "simne;": "\u2246",
-    "simplus;": "\u2a24",
-    "simrarr;": "\u2972",
-    "slarr;": "\u2190",
-    "smallsetminus;": "\u2216",
-    "smashp;": "\u2a33",
-    "smeparsl;": "\u29e4",
-    "smid;": "\u2223",
-    "smile;": "\u2323",
-    "smt;": "\u2aaa",
-    "smte;": "\u2aac",
-    "smtes;": "\u2aac\ufe00",
-    "softcy;": "\u044c",
-    "sol;": "/",
-    "solb;": "\u29c4",
-    "solbar;": "\u233f",
-    "sopf;": "\U0001d564",
-    "spades;": "\u2660",
-    "spadesuit;": "\u2660",
-    "spar;": "\u2225",
-    "sqcap;": "\u2293",
-    "sqcaps;": "\u2293\ufe00",
-    "sqcup;": "\u2294",
-    "sqcups;": "\u2294\ufe00",
-    "sqsub;": "\u228f",
-    "sqsube;": "\u2291",
-    "sqsubset;": "\u228f",
-    "sqsubseteq;": "\u2291",
-    "sqsup;": "\u2290",
-    "sqsupe;": "\u2292",
-    "sqsupset;": "\u2290",
-    "sqsupseteq;": "\u2292",
-    "squ;": "\u25a1",
-    "square;": "\u25a1",
-    "squarf;": "\u25aa",
-    "squf;": "\u25aa",
-    "srarr;": "\u2192",
-    "sscr;": "\U0001d4c8",
-    "ssetmn;": "\u2216",
-    "ssmile;": "\u2323",
-    "sstarf;": "\u22c6",
-    "star;": "\u2606",
-    "starf;": "\u2605",
-    "straightepsilon;": "\u03f5",
-    "straightphi;": "\u03d5",
-    "strns;": "\xaf",
-    "sub;": "\u2282",
-    "subE;": "\u2ac5",
-    "subdot;": "\u2abd",
-    "sube;": "\u2286",
-    "subedot;": "\u2ac3",
-    "submult;": "\u2ac1",
-    "subnE;": "\u2acb",
-    "subne;": "\u228a",
-    "subplus;": "\u2abf",
-    "subrarr;": "\u2979",
-    "subset;": "\u2282",
-    "subseteq;": "\u2286",
-    "subseteqq;": "\u2ac5",
-    "subsetneq;": "\u228a",
-    "subsetneqq;": "\u2acb",
-    "subsim;": "\u2ac7",
-    "subsub;": "\u2ad5",
-    "subsup;": "\u2ad3",
-    "succ;": "\u227b",
-    "succapprox;": "\u2ab8",
-    "succcurlyeq;": "\u227d",
-    "succeq;": "\u2ab0",
-    "succnapprox;": "\u2aba",
-    "succneqq;": "\u2ab6",
-    "succnsim;": "\u22e9",
-    "succsim;": "\u227f",
-    "sum;": "\u2211",
-    "sung;": "\u266a",
-    "sup1": "\xb9",
-    "sup1;": "\xb9",
-    "sup2": "\xb2",
-    "sup2;": "\xb2",
-    "sup3": "\xb3",
-    "sup3;": "\xb3",
-    "sup;": "\u2283",
-    "supE;": "\u2ac6",
-    "supdot;": "\u2abe",
-    "supdsub;": "\u2ad8",
-    "supe;": "\u2287",
-    "supedot;": "\u2ac4",
-    "suphsol;": "\u27c9",
-    "suphsub;": "\u2ad7",
-    "suplarr;": "\u297b",
-    "supmult;": "\u2ac2",
-    "supnE;": "\u2acc",
-    "supne;": "\u228b",
-    "supplus;": "\u2ac0",
-    "supset;": "\u2283",
-    "supseteq;": "\u2287",
-    "supseteqq;": "\u2ac6",
-    "supsetneq;": "\u228b",
-    "supsetneqq;": "\u2acc",
-    "supsim;": "\u2ac8",
-    "supsub;": "\u2ad4",
-    "supsup;": "\u2ad6",
-    "swArr;": "\u21d9",
-    "swarhk;": "\u2926",
-    "swarr;": "\u2199",
-    "swarrow;": "\u2199",
-    "swnwar;": "\u292a",
-    "szlig": "\xdf",
-    "szlig;": "\xdf",
-    "target;": "\u2316",
-    "tau;": "\u03c4",
-    "tbrk;": "\u23b4",
-    "tcaron;": "\u0165",
-    "tcedil;": "\u0163",
-    "tcy;": "\u0442",
-    "tdot;": "\u20db",
-    "telrec;": "\u2315",
-    "tfr;": "\U0001d531",
-    "there4;": "\u2234",
-    "therefore;": "\u2234",
-    "theta;": "\u03b8",
-    "thetasym;": "\u03d1",
-    "thetav;": "\u03d1",
-    "thickapprox;": "\u2248",
-    "thicksim;": "\u223c",
-    "thinsp;": "\u2009",
-    "thkap;": "\u2248",
-    "thksim;": "\u223c",
-    "thorn": "\xfe",
-    "thorn;": "\xfe",
-    "tilde;": "\u02dc",
-    "times": "\xd7",
-    "times;": "\xd7",
-    "timesb;": "\u22a0",
-    "timesbar;": "\u2a31",
-    "timesd;": "\u2a30",
-    "tint;": "\u222d",
-    "toea;": "\u2928",
-    "top;": "\u22a4",
-    "topbot;": "\u2336",
-    "topcir;": "\u2af1",
-    "topf;": "\U0001d565",
-    "topfork;": "\u2ada",
-    "tosa;": "\u2929",
-    "tprime;": "\u2034",
-    "trade;": "\u2122",
-    "triangle;": "\u25b5",
-    "triangledown;": "\u25bf",
-    "triangleleft;": "\u25c3",
-    "trianglelefteq;": "\u22b4",
-    "triangleq;": "\u225c",
-    "triangleright;": "\u25b9",
-    "trianglerighteq;": "\u22b5",
-    "tridot;": "\u25ec",
-    "trie;": "\u225c",
-    "triminus;": "\u2a3a",
-    "triplus;": "\u2a39",
-    "trisb;": "\u29cd",
-    "tritime;": "\u2a3b",
-    "trpezium;": "\u23e2",
-    "tscr;": "\U0001d4c9",
-    "tscy;": "\u0446",
-    "tshcy;": "\u045b",
-    "tstrok;": "\u0167",
-    "twixt;": "\u226c",
-    "twoheadleftarrow;": "\u219e",
-    "twoheadrightarrow;": "\u21a0",
-    "uArr;": "\u21d1",
-    "uHar;": "\u2963",
-    "uacute": "\xfa",
-    "uacute;": "\xfa",
-    "uarr;": "\u2191",
-    "ubrcy;": "\u045e",
-    "ubreve;": "\u016d",
-    "ucirc": "\xfb",
-    "ucirc;": "\xfb",
-    "ucy;": "\u0443",
-    "udarr;": "\u21c5",
-    "udblac;": "\u0171",
-    "udhar;": "\u296e",
-    "ufisht;": "\u297e",
-    "ufr;": "\U0001d532",
-    "ugrave": "\xf9",
-    "ugrave;": "\xf9",
-    "uharl;": "\u21bf",
-    "uharr;": "\u21be",
-    "uhblk;": "\u2580",
-    "ulcorn;": "\u231c",
-    "ulcorner;": "\u231c",
-    "ulcrop;": "\u230f",
-    "ultri;": "\u25f8",
-    "umacr;": "\u016b",
-    "uml": "\xa8",
-    "uml;": "\xa8",
-    "uogon;": "\u0173",
-    "uopf;": "\U0001d566",
-    "uparrow;": "\u2191",
-    "updownarrow;": "\u2195",
-    "upharpoonleft;": "\u21bf",
-    "upharpoonright;": "\u21be",
-    "uplus;": "\u228e",
-    "upsi;": "\u03c5",
-    "upsih;": "\u03d2",
-    "upsilon;": "\u03c5",
-    "upuparrows;": "\u21c8",
-    "urcorn;": "\u231d",
-    "urcorner;": "\u231d",
-    "urcrop;": "\u230e",
-    "uring;": "\u016f",
-    "urtri;": "\u25f9",
-    "uscr;": "\U0001d4ca",
-    "utdot;": "\u22f0",
-    "utilde;": "\u0169",
-    "utri;": "\u25b5",
-    "utrif;": "\u25b4",
-    "uuarr;": "\u21c8",
-    "uuml": "\xfc",
-    "uuml;": "\xfc",
-    "uwangle;": "\u29a7",
-    "vArr;": "\u21d5",
-    "vBar;": "\u2ae8",
-    "vBarv;": "\u2ae9",
-    "vDash;": "\u22a8",
-    "vangrt;": "\u299c",
-    "varepsilon;": "\u03f5",
-    "varkappa;": "\u03f0",
-    "varnothing;": "\u2205",
-    "varphi;": "\u03d5",
-    "varpi;": "\u03d6",
-    "varpropto;": "\u221d",
-    "varr;": "\u2195",
-    "varrho;": "\u03f1",
-    "varsigma;": "\u03c2",
-    "varsubsetneq;": "\u228a\ufe00",
-    "varsubsetneqq;": "\u2acb\ufe00",
-    "varsupsetneq;": "\u228b\ufe00",
-    "varsupsetneqq;": "\u2acc\ufe00",
-    "vartheta;": "\u03d1",
-    "vartriangleleft;": "\u22b2",
-    "vartriangleright;": "\u22b3",
-    "vcy;": "\u0432",
-    "vdash;": "\u22a2",
-    "vee;": "\u2228",
-    "veebar;": "\u22bb",
-    "veeeq;": "\u225a",
-    "vellip;": "\u22ee",
-    "verbar;": "|",
-    "vert;": "|",
-    "vfr;": "\U0001d533",
-    "vltri;": "\u22b2",
-    "vnsub;": "\u2282\u20d2",
-    "vnsup;": "\u2283\u20d2",
-    "vopf;": "\U0001d567",
-    "vprop;": "\u221d",
-    "vrtri;": "\u22b3",
-    "vscr;": "\U0001d4cb",
-    "vsubnE;": "\u2acb\ufe00",
-    "vsubne;": "\u228a\ufe00",
-    "vsupnE;": "\u2acc\ufe00",
-    "vsupne;": "\u228b\ufe00",
-    "vzigzag;": "\u299a",
-    "wcirc;": "\u0175",
-    "wedbar;": "\u2a5f",
-    "wedge;": "\u2227",
-    "wedgeq;": "\u2259",
-    "weierp;": "\u2118",
-    "wfr;": "\U0001d534",
-    "wopf;": "\U0001d568",
-    "wp;": "\u2118",
-    "wr;": "\u2240",
-    "wreath;": "\u2240",
-    "wscr;": "\U0001d4cc",
-    "xcap;": "\u22c2",
-    "xcirc;": "\u25ef",
-    "xcup;": "\u22c3",
-    "xdtri;": "\u25bd",
-    "xfr;": "\U0001d535",
-    "xhArr;": "\u27fa",
-    "xharr;": "\u27f7",
-    "xi;": "\u03be",
-    "xlArr;": "\u27f8",
-    "xlarr;": "\u27f5",
-    "xmap;": "\u27fc",
-    "xnis;": "\u22fb",
-    "xodot;": "\u2a00",
-    "xopf;": "\U0001d569",
-    "xoplus;": "\u2a01",
-    "xotime;": "\u2a02",
-    "xrArr;": "\u27f9",
-    "xrarr;": "\u27f6",
-    "xscr;": "\U0001d4cd",
-    "xsqcup;": "\u2a06",
-    "xuplus;": "\u2a04",
-    "xutri;": "\u25b3",
-    "xvee;": "\u22c1",
-    "xwedge;": "\u22c0",
-    "yacute": "\xfd",
-    "yacute;": "\xfd",
-    "yacy;": "\u044f",
-    "ycirc;": "\u0177",
-    "ycy;": "\u044b",
-    "yen": "\xa5",
-    "yen;": "\xa5",
-    "yfr;": "\U0001d536",
-    "yicy;": "\u0457",
-    "yopf;": "\U0001d56a",
-    "yscr;": "\U0001d4ce",
-    "yucy;": "\u044e",
-    "yuml": "\xff",
-    "yuml;": "\xff",
-    "zacute;": "\u017a",
-    "zcaron;": "\u017e",
-    "zcy;": "\u0437",
-    "zdot;": "\u017c",
-    "zeetrf;": "\u2128",
-    "zeta;": "\u03b6",
-    "zfr;": "\U0001d537",
-    "zhcy;": "\u0436",
-    "zigrarr;": "\u21dd",
-    "zopf;": "\U0001d56b",
-    "zscr;": "\U0001d4cf",
-    "zwj;": "\u200d",
-    "zwnj;": "\u200c",
-}
-
-replacementCharacters = {
-    0x0: "\uFFFD",
-    0x0d: "\u000D",
-    0x80: "\u20AC",
-    0x81: "\u0081",
-    0x82: "\u201A",
-    0x83: "\u0192",
-    0x84: "\u201E",
-    0x85: "\u2026",
-    0x86: "\u2020",
-    0x87: "\u2021",
-    0x88: "\u02C6",
-    0x89: "\u2030",
-    0x8A: "\u0160",
-    0x8B: "\u2039",
-    0x8C: "\u0152",
-    0x8D: "\u008D",
-    0x8E: "\u017D",
-    0x8F: "\u008F",
-    0x90: "\u0090",
-    0x91: "\u2018",
-    0x92: "\u2019",
-    0x93: "\u201C",
-    0x94: "\u201D",
-    0x95: "\u2022",
-    0x96: "\u2013",
-    0x97: "\u2014",
-    0x98: "\u02DC",
-    0x99: "\u2122",
-    0x9A: "\u0161",
-    0x9B: "\u203A",
-    0x9C: "\u0153",
-    0x9D: "\u009D",
-    0x9E: "\u017E",
-    0x9F: "\u0178",
-}
-
-tokenTypes = {
-    "Doctype": 0,
-    "Characters": 1,
-    "SpaceCharacters": 2,
-    "StartTag": 3,
-    "EndTag": 4,
-    "EmptyTag": 5,
-    "Comment": 6,
-    "ParseError": 7
-}
-
-tagTokenTypes = frozenset([tokenTypes["StartTag"], tokenTypes["EndTag"],
-                           tokenTypes["EmptyTag"]])
-
-
-prefixes = {v: k for k, v in namespaces.items()}
-prefixes["http://www.w3.org/1998/Math/MathML"] = "math"
-
-
-class DataLossWarning(UserWarning):
-    """Raised when the current tree is unable to represent the input data"""
-    pass
-
-
-class _ReparseException(Exception):
-    pass
diff --git a/lib/bleach/_vendor/html5lib/filters/__init__.py b/lib/bleach/_vendor/html5lib/filters/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/bleach/_vendor/html5lib/filters/alphabeticalattributes.py b/lib/bleach/_vendor/html5lib/filters/alphabeticalattributes.py
deleted file mode 100644
index 5ba926e3..00000000
--- a/lib/bleach/_vendor/html5lib/filters/alphabeticalattributes.py
+++ /dev/null
@@ -1,29 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-from . import base
-
-from collections import OrderedDict
-
-
-def _attr_key(attr):
-    """Return an appropriate key for an attribute for sorting
-
-    Attributes have a namespace that can be either ``None`` or a string. We
-    can't compare the two because they're different types, so we convert
-    ``None`` to an empty string first.
-
-    """
-    return (attr[0][0] or ''), attr[0][1]
-
-
-class Filter(base.Filter):
-    """Alphabetizes attributes for elements"""
-    def __iter__(self):
-        for token in base.Filter.__iter__(self):
-            if token["type"] in ("StartTag", "EmptyTag"):
-                attrs = OrderedDict()
-                for name, value in sorted(token["data"].items(),
-                                          key=_attr_key):
-                    attrs[name] = value
-                token["data"] = attrs
-            yield token
diff --git a/lib/bleach/_vendor/html5lib/filters/inject_meta_charset.py b/lib/bleach/_vendor/html5lib/filters/inject_meta_charset.py
deleted file mode 100644
index aefb5c84..00000000
--- a/lib/bleach/_vendor/html5lib/filters/inject_meta_charset.py
+++ /dev/null
@@ -1,73 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-from . import base
-
-
-class Filter(base.Filter):
-    """Injects ``<meta charset=ENCODING>`` tag into head of document"""
-    def __init__(self, source, encoding):
-        """Creates a Filter
-
-        :arg source: the source token stream
-
-        :arg encoding: the encoding to set
-
-        """
-        base.Filter.__init__(self, source)
-        self.encoding = encoding
-
-    def __iter__(self):
-        state = "pre_head"
-        meta_found = (self.encoding is None)
-        pending = []
-
-        for token in base.Filter.__iter__(self):
-            type = token["type"]
-            if type == "StartTag":
-                if token["name"].lower() == "head":
-                    state = "in_head"
-
-            elif type == "EmptyTag":
-                if token["name"].lower() == "meta":
-                    # replace charset with actual encoding
-                    has_http_equiv_content_type = False
-                    for (namespace, name), value in token["data"].items():
-                        if namespace is not None:
-                            continue
-                        elif name.lower() == 'charset':
-                            token["data"][(namespace, name)] = self.encoding
-                            meta_found = True
-                            break
-                        elif name == 'http-equiv' and value.lower() == 'content-type':
-                            has_http_equiv_content_type = True
-                    else:
-                        if has_http_equiv_content_type and (None, "content") in token["data"]:
-                            token["data"][(None, "content")] = 'text/html; charset=%s' % self.encoding
-                            meta_found = True
-
-                elif token["name"].lower() == "head" and not meta_found:
-                    # insert meta into empty head
-                    yield {"type": "StartTag", "name": "head",
-                           "data": token["data"]}
-                    yield {"type": "EmptyTag", "name": "meta",
-                           "data": {(None, "charset"): self.encoding}}
-                    yield {"type": "EndTag", "name": "head"}
-                    meta_found = True
-                    continue
-
-            elif type == "EndTag":
-                if token["name"].lower() == "head" and pending:
-                    # insert meta into head (if necessary) and flush pending queue
-                    yield pending.pop(0)
-                    if not meta_found:
-                        yield {"type": "EmptyTag", "name": "meta",
-                               "data": {(None, "charset"): self.encoding}}
-                    while pending:
-                        yield pending.pop(0)
-                    meta_found = True
-                    state = "post_head"
-
-            if state == "in_head":
-                pending.append(token)
-            else:
-                yield token
diff --git a/lib/bleach/_vendor/html5lib/filters/lint.py b/lib/bleach/_vendor/html5lib/filters/lint.py
deleted file mode 100644
index 1340d972..00000000
--- a/lib/bleach/_vendor/html5lib/filters/lint.py
+++ /dev/null
@@ -1,93 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-from bleach.six_shim import text_type
-
-from . import base
-from ..constants import namespaces, voidElements
-
-from ..constants import spaceCharacters
-spaceCharacters = "".join(spaceCharacters)
-
-
-class Filter(base.Filter):
-    """Lints the token stream for errors
-
-    If it finds any errors, it'll raise an ``AssertionError``.
-
-    """
-    def __init__(self, source, require_matching_tags=True):
-        """Creates a Filter
-
-        :arg source: the source token stream
-
-        :arg require_matching_tags: whether or not to require matching tags
-
-        """
-        super(Filter, self).__init__(source)
-        self.require_matching_tags = require_matching_tags
-
-    def __iter__(self):
-        open_elements = []
-        for token in base.Filter.__iter__(self):
-            type = token["type"]
-            if type in ("StartTag", "EmptyTag"):
-                namespace = token["namespace"]
-                name = token["name"]
-                assert namespace is None or isinstance(namespace, text_type)
-                assert namespace != ""
-                assert isinstance(name, text_type)
-                assert name != ""
-                assert isinstance(token["data"], dict)
-                if (not namespace or namespace == namespaces["html"]) and name in voidElements:
-                    assert type == "EmptyTag"
-                else:
-                    assert type == "StartTag"
-                if type == "StartTag" and self.require_matching_tags:
-                    open_elements.append((namespace, name))
-                for (namespace, name), value in token["data"].items():
-                    assert namespace is None or isinstance(namespace, text_type)
-                    assert namespace != ""
-                    assert isinstance(name, text_type)
-                    assert name != ""
-                    assert isinstance(value, text_type)
-
-            elif type == "EndTag":
-                namespace = token["namespace"]
-                name = token["name"]
-                assert namespace is None or isinstance(namespace, text_type)
-                assert namespace != ""
-                assert isinstance(name, text_type)
-                assert name != ""
-                if (not namespace or namespace == namespaces["html"]) and name in voidElements:
-                    assert False, "Void element reported as EndTag token: %(tag)s" % {"tag": name}
-                elif self.require_matching_tags:
-                    start = open_elements.pop()
-                    assert start == (namespace, name)
-
-            elif type == "Comment":
-                data = token["data"]
-                assert isinstance(data, text_type)
-
-            elif type in ("Characters", "SpaceCharacters"):
-                data = token["data"]
-                assert isinstance(data, text_type)
-                assert data != ""
-                if type == "SpaceCharacters":
-                    assert data.strip(spaceCharacters) == ""
-
-            elif type == "Doctype":
-                name = token["name"]
-                assert name is None or isinstance(name, text_type)
-                assert token["publicId"] is None or isinstance(name, text_type)
-                assert token["systemId"] is None or isinstance(name, text_type)
-
-            elif type == "Entity":
-                assert isinstance(token["name"], text_type)
-
-            elif type == "SerializerError":
-                assert isinstance(token["data"], text_type)
-
-            else:
-                assert False, "Unknown token type: %(type)s" % {"type": type}
-
-            yield token
diff --git a/lib/bleach/_vendor/html5lib/filters/optionaltags.py b/lib/bleach/_vendor/html5lib/filters/optionaltags.py
deleted file mode 100644
index 4a865012..00000000
--- a/lib/bleach/_vendor/html5lib/filters/optionaltags.py
+++ /dev/null
@@ -1,207 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-from . import base
-
-
-class Filter(base.Filter):
-    """Removes optional tags from the token stream"""
-    def slider(self):
-        previous1 = previous2 = None
-        for token in self.source:
-            if previous1 is not None:
-                yield previous2, previous1, token
-            previous2 = previous1
-            previous1 = token
-        if previous1 is not None:
-            yield previous2, previous1, None
-
-    def __iter__(self):
-        for previous, token, next in self.slider():
-            type = token["type"]
-            if type == "StartTag":
-                if (token["data"] or
-                        not self.is_optional_start(token["name"], previous, next)):
-                    yield token
-            elif type == "EndTag":
-                if not self.is_optional_end(token["name"], next):
-                    yield token
-            else:
-                yield token
-
-    def is_optional_start(self, tagname, previous, next):
-        type = next and next["type"] or None
-        if tagname in 'html':
-            # An html element's start tag may be omitted if the first thing
-            # inside the html element is not a space character or a comment.
-            return type not in ("Comment", "SpaceCharacters")
-        elif tagname == 'head':
-            # A head element's start tag may be omitted if the first thing
-            # inside the head element is an element.
-            # XXX: we also omit the start tag if the head element is empty
-            if type in ("StartTag", "EmptyTag"):
-                return True
-            elif type == "EndTag":
-                return next["name"] == "head"
-        elif tagname == 'body':
-            # A body element's start tag may be omitted if the first thing
-            # inside the body element is not a space character or a comment,
-            # except if the first thing inside the body element is a script
-            # or style element and the node immediately preceding the body
-            # element is a head element whose end tag has been omitted.
-            if type in ("Comment", "SpaceCharacters"):
-                return False
-            elif type == "StartTag":
-                # XXX: we do not look at the preceding event, so we never omit
-                # the body element's start tag if it's followed by a script or
-                # a style element.
-                return next["name"] not in ('script', 'style')
-            else:
-                return True
-        elif tagname == 'colgroup':
-            # A colgroup element's start tag may be omitted if the first thing
-            # inside the colgroup element is a col element, and if the element
-            # is not immediately preceded by another colgroup element whose
-            # end tag has been omitted.
-            if type in ("StartTag", "EmptyTag"):
-                # XXX: we do not look at the preceding event, so instead we never
-                # omit the colgroup element's end tag when it is immediately
-                # followed by another colgroup element. See is_optional_end.
-                return next["name"] == "col"
-            else:
-                return False
-        elif tagname == 'tbody':
-            # A tbody element's start tag may be omitted if the first thing
-            # inside the tbody element is a tr element, and if the element is
-            # not immediately preceded by a tbody, thead, or tfoot element
-            # whose end tag has been omitted.
-            if type == "StartTag":
-                # omit the thead and tfoot elements' end tag when they are
-                # immediately followed by a tbody element. See is_optional_end.
-                if previous and previous['type'] == 'EndTag' and \
-                        previous['name'] in ('tbody', 'thead', 'tfoot'):
-                    return False
-                return next["name"] == 'tr'
-            else:
-                return False
-        return False
-
-    def is_optional_end(self, tagname, next):
-        type = next and next["type"] or None
-        if tagname in ('html', 'head', 'body'):
-            # An html element's end tag may be omitted if the html element
-            # is not immediately followed by a space character or a comment.
-            return type not in ("Comment", "SpaceCharacters")
-        elif tagname in ('li', 'optgroup', 'tr'):
-            # A li element's end tag may be omitted if the li element is
-            # immediately followed by another li element or if there is
-            # no more content in the parent element.
-            # An optgroup element's end tag may be omitted if the optgroup
-            # element is immediately followed by another optgroup element,
-            # or if there is no more content in the parent element.
-            # A tr element's end tag may be omitted if the tr element is
-            # immediately followed by another tr element, or if there is
-            # no more content in the parent element.
-            if type == "StartTag":
-                return next["name"] == tagname
-            else:
-                return type == "EndTag" or type is None
-        elif tagname in ('dt', 'dd'):
-            # A dt element's end tag may be omitted if the dt element is
-            # immediately followed by another dt element or a dd element.
-            # A dd element's end tag may be omitted if the dd element is
-            # immediately followed by another dd element or a dt element,
-            # or if there is no more content in the parent element.
-            if type == "StartTag":
-                return next["name"] in ('dt', 'dd')
-            elif tagname == 'dd':
-                return type == "EndTag" or type is None
-            else:
-                return False
-        elif tagname == 'p':
-            # A p element's end tag may be omitted if the p element is
-            # immediately followed by an address, article, aside,
-            # blockquote, datagrid, dialog, dir, div, dl, fieldset,
-            # footer, form, h1, h2, h3, h4, h5, h6, header, hr, menu,
-            # nav, ol, p, pre, section, table, or ul, element, or if
-            # there is no more content in the parent element.
-            if type in ("StartTag", "EmptyTag"):
-                return next["name"] in ('address', 'article', 'aside',
-                                        'blockquote', 'datagrid', 'dialog',
-                                        'dir', 'div', 'dl', 'fieldset', 'footer',
-                                        'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
-                                        'header', 'hr', 'menu', 'nav', 'ol',
-                                        'p', 'pre', 'section', 'table', 'ul')
-            else:
-                return type == "EndTag" or type is None
-        elif tagname == 'option':
-            # An option element's end tag may be omitted if the option
-            # element is immediately followed by another option element,
-            # or if it is immediately followed by an <code>optgroup</code>
-            # element, or if there is no more content in the parent
-            # element.
-            if type == "StartTag":
-                return next["name"] in ('option', 'optgroup')
-            else:
-                return type == "EndTag" or type is None
-        elif tagname in ('rt', 'rp'):
-            # An rt element's end tag may be omitted if the rt element is
-            # immediately followed by an rt or rp element, or if there is
-            # no more content in the parent element.
-            # An rp element's end tag may be omitted if the rp element is
-            # immediately followed by an rt or rp element, or if there is
-            # no more content in the parent element.
-            if type == "StartTag":
-                return next["name"] in ('rt', 'rp')
-            else:
-                return type == "EndTag" or type is None
-        elif tagname == 'colgroup':
-            # A colgroup element's end tag may be omitted if the colgroup
-            # element is not immediately followed by a space character or
-            # a comment.
-            if type in ("Comment", "SpaceCharacters"):
-                return False
-            elif type == "StartTag":
-                # XXX: we also look for an immediately following colgroup
-                # element. See is_optional_start.
-                return next["name"] != 'colgroup'
-            else:
-                return True
-        elif tagname in ('thead', 'tbody'):
-            # A thead element's end tag may be omitted if the thead element
-            # is immediately followed by a tbody or tfoot element.
-            # A tbody element's end tag may be omitted if the tbody element
-            # is immediately followed by a tbody or tfoot element, or if
-            # there is no more content in the parent element.
-            # A tfoot element's end tag may be omitted if the tfoot element
-            # is immediately followed by a tbody element, or if there is no
-            # more content in the parent element.
-            # XXX: we never omit the end tag when the following element is
-            # a tbody. See is_optional_start.
-            if type == "StartTag":
-                return next["name"] in ['tbody', 'tfoot']
-            elif tagname == 'tbody':
-                return type == "EndTag" or type is None
-            else:
-                return False
-        elif tagname == 'tfoot':
-            # A tfoot element's end tag may be omitted if the tfoot element
-            # is immediately followed by a tbody element, or if there is no
-            # more content in the parent element.
-            # XXX: we never omit the end tag when the following element is
-            # a tbody. See is_optional_start.
-            if type == "StartTag":
-                return next["name"] == 'tbody'
-            else:
-                return type == "EndTag" or type is None
-        elif tagname in ('td', 'th'):
-            # A td element's end tag may be omitted if the td element is
-            # immediately followed by a td or th element, or if there is
-            # no more content in the parent element.
-            # A th element's end tag may be omitted if the th element is
-            # immediately followed by a td or th element, or if there is
-            # no more content in the parent element.
-            if type == "StartTag":
-                return next["name"] in ('td', 'th')
-            else:
-                return type == "EndTag" or type is None
-        return False
diff --git a/lib/bleach/_vendor/html5lib/filters/sanitizer.py b/lib/bleach/_vendor/html5lib/filters/sanitizer.py
deleted file mode 100644
index 5c31e974..00000000
--- a/lib/bleach/_vendor/html5lib/filters/sanitizer.py
+++ /dev/null
@@ -1,916 +0,0 @@
-"""Deprecated from html5lib 1.1.
-
-See `here <https://github.com/html5lib/html5lib-python/issues/443>`_ for
-information about its deprecation; `Bleach <https://github.com/mozilla/bleach>`_
-is recommended as a replacement. Please let us know in the aforementioned issue
-if Bleach is unsuitable for your needs.
-
-"""
-from __future__ import absolute_import, division, unicode_literals
-
-import re
-import warnings
-from xml.sax.saxutils import escape, unescape
-
-from bleach.six_shim import urllib_parse as urlparse
-
-from . import base
-from ..constants import namespaces, prefixes
-
-__all__ = ["Filter"]
-
-
-_deprecation_msg = (
-    "html5lib's sanitizer is deprecated; see " +
-    "https://github.com/html5lib/html5lib-python/issues/443 and please let " +
-    "us know if Bleach is unsuitable for your needs"
-)
-
-warnings.warn(_deprecation_msg, DeprecationWarning)
-
-allowed_elements = frozenset((
-    (namespaces['html'], 'a'),
-    (namespaces['html'], 'abbr'),
-    (namespaces['html'], 'acronym'),
-    (namespaces['html'], 'address'),
-    (namespaces['html'], 'area'),
-    (namespaces['html'], 'article'),
-    (namespaces['html'], 'aside'),
-    (namespaces['html'], 'audio'),
-    (namespaces['html'], 'b'),
-    (namespaces['html'], 'big'),
-    (namespaces['html'], 'blockquote'),
-    (namespaces['html'], 'br'),
-    (namespaces['html'], 'button'),
-    (namespaces['html'], 'canvas'),
-    (namespaces['html'], 'caption'),
-    (namespaces['html'], 'center'),
-    (namespaces['html'], 'cite'),
-    (namespaces['html'], 'code'),
-    (namespaces['html'], 'col'),
-    (namespaces['html'], 'colgroup'),
-    (namespaces['html'], 'command'),
-    (namespaces['html'], 'datagrid'),
-    (namespaces['html'], 'datalist'),
-    (namespaces['html'], 'dd'),
-    (namespaces['html'], 'del'),
-    (namespaces['html'], 'details'),
-    (namespaces['html'], 'dfn'),
-    (namespaces['html'], 'dialog'),
-    (namespaces['html'], 'dir'),
-    (namespaces['html'], 'div'),
-    (namespaces['html'], 'dl'),
-    (namespaces['html'], 'dt'),
-    (namespaces['html'], 'em'),
-    (namespaces['html'], 'event-source'),
-    (namespaces['html'], 'fieldset'),
-    (namespaces['html'], 'figcaption'),
-    (namespaces['html'], 'figure'),
-    (namespaces['html'], 'footer'),
-    (namespaces['html'], 'font'),
-    (namespaces['html'], 'form'),
-    (namespaces['html'], 'header'),
-    (namespaces['html'], 'h1'),
-    (namespaces['html'], 'h2'),
-    (namespaces['html'], 'h3'),
-    (namespaces['html'], 'h4'),
-    (namespaces['html'], 'h5'),
-    (namespaces['html'], 'h6'),
-    (namespaces['html'], 'hr'),
-    (namespaces['html'], 'i'),
-    (namespaces['html'], 'img'),
-    (namespaces['html'], 'input'),
-    (namespaces['html'], 'ins'),
-    (namespaces['html'], 'keygen'),
-    (namespaces['html'], 'kbd'),
-    (namespaces['html'], 'label'),
-    (namespaces['html'], 'legend'),
-    (namespaces['html'], 'li'),
-    (namespaces['html'], 'm'),
-    (namespaces['html'], 'map'),
-    (namespaces['html'], 'menu'),
-    (namespaces['html'], 'meter'),
-    (namespaces['html'], 'multicol'),
-    (namespaces['html'], 'nav'),
-    (namespaces['html'], 'nextid'),
-    (namespaces['html'], 'ol'),
-    (namespaces['html'], 'output'),
-    (namespaces['html'], 'optgroup'),
-    (namespaces['html'], 'option'),
-    (namespaces['html'], 'p'),
-    (namespaces['html'], 'pre'),
-    (namespaces['html'], 'progress'),
-    (namespaces['html'], 'q'),
-    (namespaces['html'], 's'),
-    (namespaces['html'], 'samp'),
-    (namespaces['html'], 'section'),
-    (namespaces['html'], 'select'),
-    (namespaces['html'], 'small'),
-    (namespaces['html'], 'sound'),
-    (namespaces['html'], 'source'),
-    (namespaces['html'], 'spacer'),
-    (namespaces['html'], 'span'),
-    (namespaces['html'], 'strike'),
-    (namespaces['html'], 'strong'),
-    (namespaces['html'], 'sub'),
-    (namespaces['html'], 'sup'),
-    (namespaces['html'], 'table'),
-    (namespaces['html'], 'tbody'),
-    (namespaces['html'], 'td'),
-    (namespaces['html'], 'textarea'),
-    (namespaces['html'], 'time'),
-    (namespaces['html'], 'tfoot'),
-    (namespaces['html'], 'th'),
-    (namespaces['html'], 'thead'),
-    (namespaces['html'], 'tr'),
-    (namespaces['html'], 'tt'),
-    (namespaces['html'], 'u'),
-    (namespaces['html'], 'ul'),
-    (namespaces['html'], 'var'),
-    (namespaces['html'], 'video'),
-    (namespaces['mathml'], 'maction'),
-    (namespaces['mathml'], 'math'),
-    (namespaces['mathml'], 'merror'),
-    (namespaces['mathml'], 'mfrac'),
-    (namespaces['mathml'], 'mi'),
-    (namespaces['mathml'], 'mmultiscripts'),
-    (namespaces['mathml'], 'mn'),
-    (namespaces['mathml'], 'mo'),
-    (namespaces['mathml'], 'mover'),
-    (namespaces['mathml'], 'mpadded'),
-    (namespaces['mathml'], 'mphantom'),
-    (namespaces['mathml'], 'mprescripts'),
-    (namespaces['mathml'], 'mroot'),
-    (namespaces['mathml'], 'mrow'),
-    (namespaces['mathml'], 'mspace'),
-    (namespaces['mathml'], 'msqrt'),
-    (namespaces['mathml'], 'mstyle'),
-    (namespaces['mathml'], 'msub'),
-    (namespaces['mathml'], 'msubsup'),
-    (namespaces['mathml'], 'msup'),
-    (namespaces['mathml'], 'mtable'),
-    (namespaces['mathml'], 'mtd'),
-    (namespaces['mathml'], 'mtext'),
-    (namespaces['mathml'], 'mtr'),
-    (namespaces['mathml'], 'munder'),
-    (namespaces['mathml'], 'munderover'),
-    (namespaces['mathml'], 'none'),
-    (namespaces['svg'], 'a'),
-    (namespaces['svg'], 'animate'),
-    (namespaces['svg'], 'animateColor'),
-    (namespaces['svg'], 'animateMotion'),
-    (namespaces['svg'], 'animateTransform'),
-    (namespaces['svg'], 'clipPath'),
-    (namespaces['svg'], 'circle'),
-    (namespaces['svg'], 'defs'),
-    (namespaces['svg'], 'desc'),
-    (namespaces['svg'], 'ellipse'),
-    (namespaces['svg'], 'font-face'),
-    (namespaces['svg'], 'font-face-name'),
-    (namespaces['svg'], 'font-face-src'),
-    (namespaces['svg'], 'g'),
-    (namespaces['svg'], 'glyph'),
-    (namespaces['svg'], 'hkern'),
-    (namespaces['svg'], 'linearGradient'),
-    (namespaces['svg'], 'line'),
-    (namespaces['svg'], 'marker'),
-    (namespaces['svg'], 'metadata'),
-    (namespaces['svg'], 'missing-glyph'),
-    (namespaces['svg'], 'mpath'),
-    (namespaces['svg'], 'path'),
-    (namespaces['svg'], 'polygon'),
-    (namespaces['svg'], 'polyline'),
-    (namespaces['svg'], 'radialGradient'),
-    (namespaces['svg'], 'rect'),
-    (namespaces['svg'], 'set'),
-    (namespaces['svg'], 'stop'),
-    (namespaces['svg'], 'svg'),
-    (namespaces['svg'], 'switch'),
-    (namespaces['svg'], 'text'),
-    (namespaces['svg'], 'title'),
-    (namespaces['svg'], 'tspan'),
-    (namespaces['svg'], 'use'),
-))
-
-allowed_attributes = frozenset((
-    # HTML attributes
-    (None, 'abbr'),
-    (None, 'accept'),
-    (None, 'accept-charset'),
-    (None, 'accesskey'),
-    (None, 'action'),
-    (None, 'align'),
-    (None, 'alt'),
-    (None, 'autocomplete'),
-    (None, 'autofocus'),
-    (None, 'axis'),
-    (None, 'background'),
-    (None, 'balance'),
-    (None, 'bgcolor'),
-    (None, 'bgproperties'),
-    (None, 'border'),
-    (None, 'bordercolor'),
-    (None, 'bordercolordark'),
-    (None, 'bordercolorlight'),
-    (None, 'bottompadding'),
-    (None, 'cellpadding'),
-    (None, 'cellspacing'),
-    (None, 'ch'),
-    (None, 'challenge'),
-    (None, 'char'),
-    (None, 'charoff'),
-    (None, 'choff'),
-    (None, 'charset'),
-    (None, 'checked'),
-    (None, 'cite'),
-    (None, 'class'),
-    (None, 'clear'),
-    (None, 'color'),
-    (None, 'cols'),
-    (None, 'colspan'),
-    (None, 'compact'),
-    (None, 'contenteditable'),
-    (None, 'controls'),
-    (None, 'coords'),
-    (None, 'data'),
-    (None, 'datafld'),
-    (None, 'datapagesize'),
-    (None, 'datasrc'),
-    (None, 'datetime'),
-    (None, 'default'),
-    (None, 'delay'),
-    (None, 'dir'),
-    (None, 'disabled'),
-    (None, 'draggable'),
-    (None, 'dynsrc'),
-    (None, 'enctype'),
-    (None, 'end'),
-    (None, 'face'),
-    (None, 'for'),
-    (None, 'form'),
-    (None, 'frame'),
-    (None, 'galleryimg'),
-    (None, 'gutter'),
-    (None, 'headers'),
-    (None, 'height'),
-    (None, 'hidefocus'),
-    (None, 'hidden'),
-    (None, 'high'),
-    (None, 'href'),
-    (None, 'hreflang'),
-    (None, 'hspace'),
-    (None, 'icon'),
-    (None, 'id'),
-    (None, 'inputmode'),
-    (None, 'ismap'),
-    (None, 'keytype'),
-    (None, 'label'),
-    (None, 'leftspacing'),
-    (None, 'lang'),
-    (None, 'list'),
-    (None, 'longdesc'),
-    (None, 'loop'),
-    (None, 'loopcount'),
-    (None, 'loopend'),
-    (None, 'loopstart'),
-    (None, 'low'),
-    (None, 'lowsrc'),
-    (None, 'max'),
-    (None, 'maxlength'),
-    (None, 'media'),
-    (None, 'method'),
-    (None, 'min'),
-    (None, 'multiple'),
-    (None, 'name'),
-    (None, 'nohref'),
-    (None, 'noshade'),
-    (None, 'nowrap'),
-    (None, 'open'),
-    (None, 'optimum'),
-    (None, 'pattern'),
-    (None, 'ping'),
-    (None, 'point-size'),
-    (None, 'poster'),
-    (None, 'pqg'),
-    (None, 'preload'),
-    (None, 'prompt'),
-    (None, 'radiogroup'),
-    (None, 'readonly'),
-    (None, 'rel'),
-    (None, 'repeat-max'),
-    (None, 'repeat-min'),
-    (None, 'replace'),
-    (None, 'required'),
-    (None, 'rev'),
-    (None, 'rightspacing'),
-    (None, 'rows'),
-    (None, 'rowspan'),
-    (None, 'rules'),
-    (None, 'scope'),
-    (None, 'selected'),
-    (None, 'shape'),
-    (None, 'size'),
-    (None, 'span'),
-    (None, 'src'),
-    (None, 'start'),
-    (None, 'step'),
-    (None, 'style'),
-    (None, 'summary'),
-    (None, 'suppress'),
-    (None, 'tabindex'),
-    (None, 'target'),
-    (None, 'template'),
-    (None, 'title'),
-    (None, 'toppadding'),
-    (None, 'type'),
-    (None, 'unselectable'),
-    (None, 'usemap'),
-    (None, 'urn'),
-    (None, 'valign'),
-    (None, 'value'),
-    (None, 'variable'),
-    (None, 'volume'),
-    (None, 'vspace'),
-    (None, 'vrml'),
-    (None, 'width'),
-    (None, 'wrap'),
-    (namespaces['xml'], 'lang'),
-    # MathML attributes
-    (None, 'actiontype'),
-    (None, 'align'),
-    (None, 'columnalign'),
-    (None, 'columnalign'),
-    (None, 'columnalign'),
-    (None, 'columnlines'),
-    (None, 'columnspacing'),
-    (None, 'columnspan'),
-    (None, 'depth'),
-    (None, 'display'),
-    (None, 'displaystyle'),
-    (None, 'equalcolumns'),
-    (None, 'equalrows'),
-    (None, 'fence'),
-    (None, 'fontstyle'),
-    (None, 'fontweight'),
-    (None, 'frame'),
-    (None, 'height'),
-    (None, 'linethickness'),
-    (None, 'lspace'),
-    (None, 'mathbackground'),
-    (None, 'mathcolor'),
-    (None, 'mathvariant'),
-    (None, 'mathvariant'),
-    (None, 'maxsize'),
-    (None, 'minsize'),
-    (None, 'other'),
-    (None, 'rowalign'),
-    (None, 'rowalign'),
-    (None, 'rowalign'),
-    (None, 'rowlines'),
-    (None, 'rowspacing'),
-    (None, 'rowspan'),
-    (None, 'rspace'),
-    (None, 'scriptlevel'),
-    (None, 'selection'),
-    (None, 'separator'),
-    (None, 'stretchy'),
-    (None, 'width'),
-    (None, 'width'),
-    (namespaces['xlink'], 'href'),
-    (namespaces['xlink'], 'show'),
-    (namespaces['xlink'], 'type'),
-    # SVG attributes
-    (None, 'accent-height'),
-    (None, 'accumulate'),
-    (None, 'additive'),
-    (None, 'alphabetic'),
-    (None, 'arabic-form'),
-    (None, 'ascent'),
-    (None, 'attributeName'),
-    (None, 'attributeType'),
-    (None, 'baseProfile'),
-    (None, 'bbox'),
-    (None, 'begin'),
-    (None, 'by'),
-    (None, 'calcMode'),
-    (None, 'cap-height'),
-    (None, 'class'),
-    (None, 'clip-path'),
-    (None, 'color'),
-    (None, 'color-rendering'),
-    (None, 'content'),
-    (None, 'cx'),
-    (None, 'cy'),
-    (None, 'd'),
-    (None, 'dx'),
-    (None, 'dy'),
-    (None, 'descent'),
-    (None, 'display'),
-    (None, 'dur'),
-    (None, 'end'),
-    (None, 'fill'),
-    (None, 'fill-opacity'),
-    (None, 'fill-rule'),
-    (None, 'font-family'),
-    (None, 'font-size'),
-    (None, 'font-stretch'),
-    (None, 'font-style'),
-    (None, 'font-variant'),
-    (None, 'font-weight'),
-    (None, 'from'),
-    (None, 'fx'),
-    (None, 'fy'),
-    (None, 'g1'),
-    (None, 'g2'),
-    (None, 'glyph-name'),
-    (None, 'gradientUnits'),
-    (None, 'hanging'),
-    (None, 'height'),
-    (None, 'horiz-adv-x'),
-    (None, 'horiz-origin-x'),
-    (None, 'id'),
-    (None, 'ideographic'),
-    (None, 'k'),
-    (None, 'keyPoints'),
-    (None, 'keySplines'),
-    (None, 'keyTimes'),
-    (None, 'lang'),
-    (None, 'marker-end'),
-    (None, 'marker-mid'),
-    (None, 'marker-start'),
-    (None, 'markerHeight'),
-    (None, 'markerUnits'),
-    (None, 'markerWidth'),
-    (None, 'mathematical'),
-    (None, 'max'),
-    (None, 'min'),
-    (None, 'name'),
-    (None, 'offset'),
-    (None, 'opacity'),
-    (None, 'orient'),
-    (None, 'origin'),
-    (None, 'overline-position'),
-    (None, 'overline-thickness'),
-    (None, 'panose-1'),
-    (None, 'path'),
-    (None, 'pathLength'),
-    (None, 'points'),
-    (None, 'preserveAspectRatio'),
-    (None, 'r'),
-    (None, 'refX'),
-    (None, 'refY'),
-    (None, 'repeatCount'),
-    (None, 'repeatDur'),
-    (None, 'requiredExtensions'),
-    (None, 'requiredFeatures'),
-    (None, 'restart'),
-    (None, 'rotate'),
-    (None, 'rx'),
-    (None, 'ry'),
-    (None, 'slope'),
-    (None, 'stemh'),
-    (None, 'stemv'),
-    (None, 'stop-color'),
-    (None, 'stop-opacity'),
-    (None, 'strikethrough-position'),
-    (None, 'strikethrough-thickness'),
-    (None, 'stroke'),
-    (None, 'stroke-dasharray'),
-    (None, 'stroke-dashoffset'),
-    (None, 'stroke-linecap'),
-    (None, 'stroke-linejoin'),
-    (None, 'stroke-miterlimit'),
-    (None, 'stroke-opacity'),
-    (None, 'stroke-width'),
-    (None, 'systemLanguage'),
-    (None, 'target'),
-    (None, 'text-anchor'),
-    (None, 'to'),
-    (None, 'transform'),
-    (None, 'type'),
-    (None, 'u1'),
-    (None, 'u2'),
-    (None, 'underline-position'),
-    (None, 'underline-thickness'),
-    (None, 'unicode'),
-    (None, 'unicode-range'),
-    (None, 'units-per-em'),
-    (None, 'values'),
-    (None, 'version'),
-    (None, 'viewBox'),
-    (None, 'visibility'),
-    (None, 'width'),
-    (None, 'widths'),
-    (None, 'x'),
-    (None, 'x-height'),
-    (None, 'x1'),
-    (None, 'x2'),
-    (namespaces['xlink'], 'actuate'),
-    (namespaces['xlink'], 'arcrole'),
-    (namespaces['xlink'], 'href'),
-    (namespaces['xlink'], 'role'),
-    (namespaces['xlink'], 'show'),
-    (namespaces['xlink'], 'title'),
-    (namespaces['xlink'], 'type'),
-    (namespaces['xml'], 'base'),
-    (namespaces['xml'], 'lang'),
-    (namespaces['xml'], 'space'),
-    (None, 'y'),
-    (None, 'y1'),
-    (None, 'y2'),
-    (None, 'zoomAndPan'),
-))
-
-attr_val_is_uri = frozenset((
-    (None, 'href'),
-    (None, 'src'),
-    (None, 'cite'),
-    (None, 'action'),
-    (None, 'longdesc'),
-    (None, 'poster'),
-    (None, 'background'),
-    (None, 'datasrc'),
-    (None, 'dynsrc'),
-    (None, 'lowsrc'),
-    (None, 'ping'),
-    (namespaces['xlink'], 'href'),
-    (namespaces['xml'], 'base'),
-))
-
-svg_attr_val_allows_ref = frozenset((
-    (None, 'clip-path'),
-    (None, 'color-profile'),
-    (None, 'cursor'),
-    (None, 'fill'),
-    (None, 'filter'),
-    (None, 'marker'),
-    (None, 'marker-start'),
-    (None, 'marker-mid'),
-    (None, 'marker-end'),
-    (None, 'mask'),
-    (None, 'stroke'),
-))
-
-svg_allow_local_href = frozenset((
-    (None, 'altGlyph'),
-    (None, 'animate'),
-    (None, 'animateColor'),
-    (None, 'animateMotion'),
-    (None, 'animateTransform'),
-    (None, 'cursor'),
-    (None, 'feImage'),
-    (None, 'filter'),
-    (None, 'linearGradient'),
-    (None, 'pattern'),
-    (None, 'radialGradient'),
-    (None, 'textpath'),
-    (None, 'tref'),
-    (None, 'set'),
-    (None, 'use')
-))
-
-allowed_css_properties = frozenset((
-    'azimuth',
-    'background-color',
-    'border-bottom-color',
-    'border-collapse',
-    'border-color',
-    'border-left-color',
-    'border-right-color',
-    'border-top-color',
-    'clear',
-    'color',
-    'cursor',
-    'direction',
-    'display',
-    'elevation',
-    'float',
-    'font',
-    'font-family',
-    'font-size',
-    'font-style',
-    'font-variant',
-    'font-weight',
-    'height',
-    'letter-spacing',
-    'line-height',
-    'overflow',
-    'pause',
-    'pause-after',
-    'pause-before',
-    'pitch',
-    'pitch-range',
-    'richness',
-    'speak',
-    'speak-header',
-    'speak-numeral',
-    'speak-punctuation',
-    'speech-rate',
-    'stress',
-    'text-align',
-    'text-decoration',
-    'text-indent',
-    'unicode-bidi',
-    'vertical-align',
-    'voice-family',
-    'volume',
-    'white-space',
-    'width',
-))
-
-allowed_css_keywords = frozenset((
-    'auto',
-    'aqua',
-    'black',
-    'block',
-    'blue',
-    'bold',
-    'both',
-    'bottom',
-    'brown',
-    'center',
-    'collapse',
-    'dashed',
-    'dotted',
-    'fuchsia',
-    'gray',
-    'green',
-    '!important',
-    'italic',
-    'left',
-    'lime',
-    'maroon',
-    'medium',
-    'none',
-    'navy',
-    'normal',
-    'nowrap',
-    'olive',
-    'pointer',
-    'purple',
-    'red',
-    'right',
-    'solid',
-    'silver',
-    'teal',
-    'top',
-    'transparent',
-    'underline',
-    'white',
-    'yellow',
-))
-
-allowed_svg_properties = frozenset((
-    'fill',
-    'fill-opacity',
-    'fill-rule',
-    'stroke',
-    'stroke-width',
-    'stroke-linecap',
-    'stroke-linejoin',
-    'stroke-opacity',
-))
-
-allowed_protocols = frozenset((
-    'ed2k',
-    'ftp',
-    'http',
-    'https',
-    'irc',
-    'mailto',
-    'news',
-    'gopher',
-    'nntp',
-    'telnet',
-    'webcal',
-    'xmpp',
-    'callto',
-    'feed',
-    'urn',
-    'aim',
-    'rsync',
-    'tag',
-    'ssh',
-    'sftp',
-    'rtsp',
-    'afs',
-    'data',
-))
-
-allowed_content_types = frozenset((
-    'image/png',
-    'image/jpeg',
-    'image/gif',
-    'image/webp',
-    'image/bmp',
-    'text/plain',
-))
-
-
-data_content_type = re.compile(r'''
-                                ^
-                                # Match a content type <application>/<type>
-                                (?P<content_type>[-a-zA-Z0-9.]+/[-a-zA-Z0-9.]+)
-                                # Match any character set and encoding
-                                (?:(?:;charset=(?:[-a-zA-Z0-9]+)(?:;(?:base64))?)
-                                  |(?:;(?:base64))?(?:;charset=(?:[-a-zA-Z0-9]+))?)
-                                # Assume the rest is data
-                                ,.*
-                                $
-                                ''',
-                               re.VERBOSE)
-
-
-class Filter(base.Filter):
-    """Sanitizes token stream of XHTML+MathML+SVG and of inline style attributes"""
-    def __init__(self,
-                 source,
-                 allowed_elements=allowed_elements,
-                 allowed_attributes=allowed_attributes,
-                 allowed_css_properties=allowed_css_properties,
-                 allowed_css_keywords=allowed_css_keywords,
-                 allowed_svg_properties=allowed_svg_properties,
-                 allowed_protocols=allowed_protocols,
-                 allowed_content_types=allowed_content_types,
-                 attr_val_is_uri=attr_val_is_uri,
-                 svg_attr_val_allows_ref=svg_attr_val_allows_ref,
-                 svg_allow_local_href=svg_allow_local_href):
-        """Creates a Filter
-
-        :arg allowed_elements: set of elements to allow--everything else will
-            be escaped
-
-        :arg allowed_attributes: set of attributes to allow in
-            elements--everything else will be stripped
-
-        :arg allowed_css_properties: set of CSS properties to allow--everything
-            else will be stripped
-
-        :arg allowed_css_keywords: set of CSS keywords to allow--everything
-            else will be stripped
-
-        :arg allowed_svg_properties: set of SVG properties to allow--everything
-            else will be removed
-
-        :arg allowed_protocols: set of allowed protocols for URIs
-
-        :arg allowed_content_types: set of allowed content types for ``data`` URIs.
-
-        :arg attr_val_is_uri: set of attributes that have URI values--values
-            that have a scheme not listed in ``allowed_protocols`` are removed
-
-        :arg svg_attr_val_allows_ref: set of SVG attributes that can have
-            references
-
-        :arg svg_allow_local_href: set of SVG elements that can have local
-            hrefs--these are removed
-
-        """
-        super(Filter, self).__init__(source)
-
-        warnings.warn(_deprecation_msg, DeprecationWarning)
-
-        self.allowed_elements = allowed_elements
-        self.allowed_attributes = allowed_attributes
-        self.allowed_css_properties = allowed_css_properties
-        self.allowed_css_keywords = allowed_css_keywords
-        self.allowed_svg_properties = allowed_svg_properties
-        self.allowed_protocols = allowed_protocols
-        self.allowed_content_types = allowed_content_types
-        self.attr_val_is_uri = attr_val_is_uri
-        self.svg_attr_val_allows_ref = svg_attr_val_allows_ref
-        self.svg_allow_local_href = svg_allow_local_href
-
-    def __iter__(self):
-        for token in base.Filter.__iter__(self):
-            token = self.sanitize_token(token)
-            if token:
-                yield token
-
-    # Sanitize the +html+, escaping all elements not in ALLOWED_ELEMENTS, and
-    # stripping out all attributes not in ALLOWED_ATTRIBUTES. Style attributes
-    # are parsed, and a restricted set, specified by ALLOWED_CSS_PROPERTIES and
-    # ALLOWED_CSS_KEYWORDS, are allowed through. attributes in ATTR_VAL_IS_URI
-    # are scanned, and only URI schemes specified in ALLOWED_PROTOCOLS are
-    # allowed.
-    #
-    #   sanitize_html('<script> do_nasty_stuff() </script>')
-    #    => &lt;script> do_nasty_stuff() &lt;/script>
-    #   sanitize_html('<a href="javascript: sucker();">Click here for $100</a>')
-    #    => <a>Click here for $100</a>
-    def sanitize_token(self, token):
-
-        # accommodate filters which use token_type differently
-        token_type = token["type"]
-        if token_type in ("StartTag", "EndTag", "EmptyTag"):
-            name = token["name"]
-            namespace = token["namespace"]
-            if ((namespace, name) in self.allowed_elements or
-                (namespace is None and
-                 (namespaces["html"], name) in self.allowed_elements)):
-                return self.allowed_token(token)
-            else:
-                return self.disallowed_token(token)
-        elif token_type == "Comment":
-            pass
-        else:
-            return token
-
-    def allowed_token(self, token):
-        if "data" in token:
-            attrs = token["data"]
-            attr_names = set(attrs.keys())
-
-            # Remove forbidden attributes
-            for to_remove in (attr_names - self.allowed_attributes):
-                del token["data"][to_remove]
-                attr_names.remove(to_remove)
-
-            # Remove attributes with disallowed URL values
-            for attr in (attr_names & self.attr_val_is_uri):
-                assert attr in attrs
-                # I don't have a clue where this regexp comes from or why it matches those
-                # characters, nor why we call unescape. I just know it's always been here.
-                # Should you be worried by this comment in a sanitizer? Yes. On the other hand, all
-                # this will do is remove *more* than it otherwise would.
-                val_unescaped = re.sub("[`\x00-\x20\x7f-\xa0\\s]+", '',
-                                       unescape(attrs[attr])).lower()
-                # remove replacement characters from unescaped characters
-                val_unescaped = val_unescaped.replace("\ufffd", "")
-                try:
-                    uri = urlparse.urlparse(val_unescaped)
-                except ValueError:
-                    uri = None
-                    del attrs[attr]
-                if uri and uri.scheme:
-                    if uri.scheme not in self.allowed_protocols:
-                        del attrs[attr]
-                    if uri.scheme == 'data':
-                        m = data_content_type.match(uri.path)
-                        if not m:
-                            del attrs[attr]
-                        elif m.group('content_type') not in self.allowed_content_types:
-                            del attrs[attr]
-
-            for attr in self.svg_attr_val_allows_ref:
-                if attr in attrs:
-                    attrs[attr] = re.sub(r'url\s*\(\s*[^#\s][^)]+?\)',
-                                         ' ',
-                                         unescape(attrs[attr]))
-            if (token["name"] in self.svg_allow_local_href and
-                (namespaces['xlink'], 'href') in attrs and re.search(r'^\s*[^#\s].*',
-                                                                     attrs[(namespaces['xlink'], 'href')])):
-                del attrs[(namespaces['xlink'], 'href')]
-            if (None, 'style') in attrs:
-                attrs[(None, 'style')] = self.sanitize_css(attrs[(None, 'style')])
-            token["data"] = attrs
-        return token
-
-    def disallowed_token(self, token):
-        token_type = token["type"]
-        if token_type == "EndTag":
-            token["data"] = "</%s>" % token["name"]
-        elif token["data"]:
-            assert token_type in ("StartTag", "EmptyTag")
-            attrs = []
-            for (ns, name), v in token["data"].items():
-                attrs.append(' %s="%s"' % (name if ns is None else "%s:%s" % (prefixes[ns], name), escape(v)))
-            token["data"] = "<%s%s>" % (token["name"], ''.join(attrs))
-        else:
-            token["data"] = "<%s>" % token["name"]
-        if token.get("selfClosing"):
-            token["data"] = token["data"][:-1] + "/>"
-
-        token["type"] = "Characters"
-
-        del token["name"]
-        return token
-
-    def sanitize_css(self, style):
-        # disallow urls
-        style = re.compile(r'url\s*\(\s*[^\s)]+?\s*\)\s*').sub(' ', style)
-
-        # gauntlet
-        if not re.match(r"""^([:,;#%.\sa-zA-Z0-9!]|\w-\w|'[\s\w]+'|"[\s\w]+"|\([\d,\s]+\))*$""", style):
-            return ''
-        if not re.match(r"^\s*([-\w]+\s*:[^:;]*(;\s*|$))*$", style):
-            return ''
-
-        clean = []
-        for prop, value in re.findall(r"([-\w]+)\s*:\s*([^:;]*)", style):
-            if not value:
-                continue
-            if prop.lower() in self.allowed_css_properties:
-                clean.append(prop + ': ' + value + ';')
-            elif prop.split('-')[0].lower() in ['background', 'border', 'margin',
-                                                'padding']:
-                for keyword in value.split():
-                    if keyword not in self.allowed_css_keywords and \
-                            not re.match(r"^(#[0-9a-fA-F]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|\d{0,2}\.?\d{0,2}(cm|em|ex|in|mm|pc|pt|px|%|,|\))?)$", keyword):  # noqa
-                        break
-                else:
-                    clean.append(prop + ': ' + value + ';')
-            elif prop.lower() in self.allowed_svg_properties:
-                clean.append(prop + ': ' + value + ';')
-
-        return ' '.join(clean)
diff --git a/lib/bleach/_vendor/html5lib/filters/whitespace.py b/lib/bleach/_vendor/html5lib/filters/whitespace.py
deleted file mode 100644
index 0d12584b..00000000
--- a/lib/bleach/_vendor/html5lib/filters/whitespace.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-import re
-
-from . import base
-from ..constants import rcdataElements, spaceCharacters
-spaceCharacters = "".join(spaceCharacters)
-
-SPACES_REGEX = re.compile("[%s]+" % spaceCharacters)
-
-
-class Filter(base.Filter):
-    """Collapses whitespace except in pre, textarea, and script elements"""
-    spacePreserveElements = frozenset(["pre", "textarea"] + list(rcdataElements))
-
-    def __iter__(self):
-        preserve = 0
-        for token in base.Filter.__iter__(self):
-            type = token["type"]
-            if type == "StartTag" \
-                    and (preserve or token["name"] in self.spacePreserveElements):
-                preserve += 1
-
-            elif type == "EndTag" and preserve:
-                preserve -= 1
-
-            elif not preserve and type == "SpaceCharacters" and token["data"]:
-                # Test on token["data"] above to not introduce spaces where there were not
-                token["data"] = " "
-
-            elif not preserve and type == "Characters":
-                token["data"] = collapse_spaces(token["data"])
-
-            yield token
-
-
-def collapse_spaces(text):
-    return SPACES_REGEX.sub(' ', text)
diff --git a/lib/bleach/_vendor/html5lib/html5parser.py b/lib/bleach/_vendor/html5lib/html5parser.py
deleted file mode 100644
index 5427b7dd..00000000
--- a/lib/bleach/_vendor/html5lib/html5parser.py
+++ /dev/null
@@ -1,2795 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-from bleach.six_shim import viewkeys
-
-import types
-
-from . import _inputstream
-from . import _tokenizer
-
-from . import treebuilders
-from .treebuilders.base import Marker
-
-from . import _utils
-from .constants import (
-    spaceCharacters, asciiUpper2Lower,
-    specialElements, headingElements, cdataElements, rcdataElements,
-    tokenTypes, tagTokenTypes,
-    namespaces,
-    htmlIntegrationPointElements, mathmlTextIntegrationPointElements,
-    adjustForeignAttributes as adjustForeignAttributesMap,
-    adjustMathMLAttributes, adjustSVGAttributes,
-    E,
-    _ReparseException
-)
-
-
-def parse(doc, treebuilder="etree", namespaceHTMLElements=True, **kwargs):
-    """Parse an HTML document as a string or file-like object into a tree
-
-    :arg doc: the document to parse as a string or file-like object
-
-    :arg treebuilder: the treebuilder to use when parsing
-
-    :arg namespaceHTMLElements: whether or not to namespace HTML elements
-
-    :returns: parsed tree
-
-    Example:
-
-    >>> from html5lib.html5parser import parse
-    >>> parse('<html><body><p>This is a doc</p></body></html>')
-    <Element u'{http://www.w3.org/1999/xhtml}html' at 0x7feac4909db0>
-
-    """
-    tb = treebuilders.getTreeBuilder(treebuilder)
-    p = HTMLParser(tb, namespaceHTMLElements=namespaceHTMLElements)
-    return p.parse(doc, **kwargs)
-
-
-def parseFragment(doc, container="div", treebuilder="etree", namespaceHTMLElements=True, **kwargs):
-    """Parse an HTML fragment as a string or file-like object into a tree
-
-    :arg doc: the fragment to parse as a string or file-like object
-
-    :arg container: the container context to parse the fragment in
-
-    :arg treebuilder: the treebuilder to use when parsing
-
-    :arg namespaceHTMLElements: whether or not to namespace HTML elements
-
-    :returns: parsed tree
-
-    Example:
-
-    >>> from html5lib.html5libparser import parseFragment
-    >>> parseFragment('<b>this is a fragment</b>')
-    <Element u'DOCUMENT_FRAGMENT' at 0x7feac484b090>
-
-    """
-    tb = treebuilders.getTreeBuilder(treebuilder)
-    p = HTMLParser(tb, namespaceHTMLElements=namespaceHTMLElements)
-    return p.parseFragment(doc, container=container, **kwargs)
-
-
-def method_decorator_metaclass(function):
-    class Decorated(type):
-        def __new__(meta, classname, bases, classDict):
-            for attributeName, attribute in classDict.items():
-                if isinstance(attribute, types.FunctionType):
-                    attribute = function(attribute)
-
-                classDict[attributeName] = attribute
-            return type.__new__(meta, classname, bases, classDict)
-    return Decorated
-
-
-class HTMLParser(object):
-    """HTML parser
-
-    Generates a tree structure from a stream of (possibly malformed) HTML.
-
-    """
-
-    def __init__(self, tree=None, strict=False, namespaceHTMLElements=True, debug=False):
-        """
-        :arg tree: a treebuilder class controlling the type of tree that will be
-            returned. Built in treebuilders can be accessed through
-            html5lib.treebuilders.getTreeBuilder(treeType)
-
-        :arg strict: raise an exception when a parse error is encountered
-
-        :arg namespaceHTMLElements: whether or not to namespace HTML elements
-
-        :arg debug: whether or not to enable debug mode which logs things
-
-        Example:
-
-        >>> from html5lib.html5parser import HTMLParser
-        >>> parser = HTMLParser()                     # generates parser with etree builder
-        >>> parser = HTMLParser('lxml', strict=True)  # generates parser with lxml builder which is strict
-
-        """
-
-        # Raise an exception on the first error encountered
-        self.strict = strict
-
-        if tree is None:
-            tree = treebuilders.getTreeBuilder("etree")
-        self.tree = tree(namespaceHTMLElements)
-        self.errors = []
-
-        self.phases = {name: cls(self, self.tree) for name, cls in
-                       getPhases(debug).items()}
-
-    def _parse(self, stream, innerHTML=False, container="div", scripting=False, **kwargs):
-
-        self.innerHTMLMode = innerHTML
-        self.container = container
-        self.scripting = scripting
-        self.tokenizer = _tokenizer.HTMLTokenizer(stream, parser=self, **kwargs)
-        self.reset()
-
-        try:
-            self.mainLoop()
-        except _ReparseException:
-            self.reset()
-            self.mainLoop()
-
-    def reset(self):
-        self.tree.reset()
-        self.firstStartTag = False
-        self.errors = []
-        self.log = []  # only used with debug mode
-        # "quirks" / "limited quirks" / "no quirks"
-        self.compatMode = "no quirks"
-
-        if self.innerHTMLMode:
-            self.innerHTML = self.container.lower()
-
-            if self.innerHTML in cdataElements:
-                self.tokenizer.state = self.tokenizer.rcdataState
-            elif self.innerHTML in rcdataElements:
-                self.tokenizer.state = self.tokenizer.rawtextState
-            elif self.innerHTML == 'plaintext':
-                self.tokenizer.state = self.tokenizer.plaintextState
-            else:
-                # state already is data state
-                # self.tokenizer.state = self.tokenizer.dataState
-                pass
-            self.phase = self.phases["beforeHtml"]
-            self.phase.insertHtmlElement()
-            self.resetInsertionMode()
-        else:
-            self.innerHTML = False  # pylint:disable=redefined-variable-type
-            self.phase = self.phases["initial"]
-
-        self.lastPhase = None
-
-        self.beforeRCDataPhase = None
-
-        self.framesetOK = True
-
-    @property
-    def documentEncoding(self):
-        """Name of the character encoding that was used to decode the input stream, or
-        :obj:`None` if that is not determined yet
-
-        """
-        if not hasattr(self, 'tokenizer'):
-            return None
-        return self.tokenizer.stream.charEncoding[0].name
-
-    def isHTMLIntegrationPoint(self, element):
-        if (element.name == "annotation-xml" and
-                element.namespace == namespaces["mathml"]):
-            return ("encoding" in element.attributes and
-                    element.attributes["encoding"].translate(
-                        asciiUpper2Lower) in
-                    ("text/html", "application/xhtml+xml"))
-        else:
-            return (element.namespace, element.name) in htmlIntegrationPointElements
-
-    def isMathMLTextIntegrationPoint(self, element):
-        return (element.namespace, element.name) in mathmlTextIntegrationPointElements
-
-    def mainLoop(self):
-        CharactersToken = tokenTypes["Characters"]
-        SpaceCharactersToken = tokenTypes["SpaceCharacters"]
-        StartTagToken = tokenTypes["StartTag"]
-        EndTagToken = tokenTypes["EndTag"]
-        CommentToken = tokenTypes["Comment"]
-        DoctypeToken = tokenTypes["Doctype"]
-        ParseErrorToken = tokenTypes["ParseError"]
-
-        for token in self.tokenizer:
-            prev_token = None
-            new_token = token
-            while new_token is not None:
-                prev_token = new_token
-                currentNode = self.tree.openElements[-1] if self.tree.openElements else None
-                currentNodeNamespace = currentNode.namespace if currentNode else None
-                currentNodeName = currentNode.name if currentNode else None
-
-                type = new_token["type"]
-
-                if type == ParseErrorToken:
-                    self.parseError(new_token["data"], new_token.get("datavars", {}))
-                    new_token = None
-                else:
-                    if (len(self.tree.openElements) == 0 or
-                        currentNodeNamespace == self.tree.defaultNamespace or
-                        (self.isMathMLTextIntegrationPoint(currentNode) and
-                         ((type == StartTagToken and
-                           token["name"] not in frozenset(["mglyph", "malignmark"])) or
-                          type in (CharactersToken, SpaceCharactersToken))) or
-                        (currentNodeNamespace == namespaces["mathml"] and
-                         currentNodeName == "annotation-xml" and
-                         type == StartTagToken and
-                         token["name"] == "svg") or
-                        (self.isHTMLIntegrationPoint(currentNode) and
-                         type in (StartTagToken, CharactersToken, SpaceCharactersToken))):
-                        phase = self.phase
-                    else:
-                        phase = self.phases["inForeignContent"]
-
-                    if type == CharactersToken:
-                        new_token = phase.processCharacters(new_token)
-                    elif type == SpaceCharactersToken:
-                        new_token = phase.processSpaceCharacters(new_token)
-                    elif type == StartTagToken:
-                        new_token = phase.processStartTag(new_token)
-                    elif type == EndTagToken:
-                        new_token = phase.processEndTag(new_token)
-                    elif type == CommentToken:
-                        new_token = phase.processComment(new_token)
-                    elif type == DoctypeToken:
-                        new_token = phase.processDoctype(new_token)
-
-            if (type == StartTagToken and prev_token["selfClosing"] and
-                    not prev_token["selfClosingAcknowledged"]):
-                self.parseError("non-void-element-with-trailing-solidus",
-                                {"name": prev_token["name"]})
-
-        # When the loop finishes it's EOF
-        reprocess = True
-        phases = []
-        while reprocess:
-            phases.append(self.phase)
-            reprocess = self.phase.processEOF()
-            if reprocess:
-                assert self.phase not in phases
-
-    def parse(self, stream, *args, **kwargs):
-        """Parse a HTML document into a well-formed tree
-
-        :arg stream: a file-like object or string containing the HTML to be parsed
-
-            The optional encoding parameter must be a string that indicates
-            the encoding.  If specified, that encoding will be used,
-            regardless of any BOM or later declaration (such as in a meta
-            element).
-
-        :arg scripting: treat noscript elements as if JavaScript was turned on
-
-        :returns: parsed tree
-
-        Example:
-
-        >>> from html5lib.html5parser import HTMLParser
-        >>> parser = HTMLParser()
-        >>> parser.parse('<html><body><p>This is a doc</p></body></html>')
-        <Element u'{http://www.w3.org/1999/xhtml}html' at 0x7feac4909db0>
-
-        """
-        self._parse(stream, False, None, *args, **kwargs)
-        return self.tree.getDocument()
-
-    def parseFragment(self, stream, *args, **kwargs):
-        """Parse a HTML fragment into a well-formed tree fragment
-
-        :arg container: name of the element we're setting the innerHTML
-            property if set to None, default to 'div'
-
-        :arg stream: a file-like object or string containing the HTML to be parsed
-
-            The optional encoding parameter must be a string that indicates
-            the encoding.  If specified, that encoding will be used,
-            regardless of any BOM or later declaration (such as in a meta
-            element)
-
-        :arg scripting: treat noscript elements as if JavaScript was turned on
-
-        :returns: parsed tree
-
-        Example:
-
-        >>> from html5lib.html5libparser import HTMLParser
-        >>> parser = HTMLParser()
-        >>> parser.parseFragment('<b>this is a fragment</b>')
-        <Element u'DOCUMENT_FRAGMENT' at 0x7feac484b090>
-
-        """
-        self._parse(stream, True, *args, **kwargs)
-        return self.tree.getFragment()
-
-    def parseError(self, errorcode="XXX-undefined-error", datavars=None):
-        # XXX The idea is to make errorcode mandatory.
-        if datavars is None:
-            datavars = {}
-        self.errors.append((self.tokenizer.stream.position(), errorcode, datavars))
-        if self.strict:
-            raise ParseError(E[errorcode] % datavars)
-
-    def adjustMathMLAttributes(self, token):
-        adjust_attributes(token, adjustMathMLAttributes)
-
-    def adjustSVGAttributes(self, token):
-        adjust_attributes(token, adjustSVGAttributes)
-
-    def adjustForeignAttributes(self, token):
-        adjust_attributes(token, adjustForeignAttributesMap)
-
-    def reparseTokenNormal(self, token):
-        # pylint:disable=unused-argument
-        self.parser.phase()
-
-    def resetInsertionMode(self):
-        # The name of this method is mostly historical. (It's also used in the
-        # specification.)
-        last = False
-        newModes = {
-            "select": "inSelect",
-            "td": "inCell",
-            "th": "inCell",
-            "tr": "inRow",
-            "tbody": "inTableBody",
-            "thead": "inTableBody",
-            "tfoot": "inTableBody",
-            "caption": "inCaption",
-            "colgroup": "inColumnGroup",
-            "table": "inTable",
-            "head": "inBody",
-            "body": "inBody",
-            "frameset": "inFrameset",
-            "html": "beforeHead"
-        }
-        for node in self.tree.openElements[::-1]:
-            nodeName = node.name
-            new_phase = None
-            if node == self.tree.openElements[0]:
-                assert self.innerHTML
-                last = True
-                nodeName = self.innerHTML
-            # Check for conditions that should only happen in the innerHTML
-            # case
-            if nodeName in ("select", "colgroup", "head", "html"):
-                assert self.innerHTML
-
-            if not last and node.namespace != self.tree.defaultNamespace:
-                continue
-
-            if nodeName in newModes:
-                new_phase = self.phases[newModes[nodeName]]
-                break
-            elif last:
-                new_phase = self.phases["inBody"]
-                break
-
-        self.phase = new_phase
-
-    def parseRCDataRawtext(self, token, contentType):
-        # Generic RCDATA/RAWTEXT Parsing algorithm
-        assert contentType in ("RAWTEXT", "RCDATA")
-
-        self.tree.insertElement(token)
-
-        if contentType == "RAWTEXT":
-            self.tokenizer.state = self.tokenizer.rawtextState
-        else:
-            self.tokenizer.state = self.tokenizer.rcdataState
-
-        self.originalPhase = self.phase
-
-        self.phase = self.phases["text"]
-
-
-@_utils.memoize
-def getPhases(debug):
-    def log(function):
-        """Logger that records which phase processes each token"""
-        type_names = {value: key for key, value in tokenTypes.items()}
-
-        def wrapped(self, *args, **kwargs):
-            if function.__name__.startswith("process") and len(args) > 0:
-                token = args[0]
-                info = {"type": type_names[token['type']]}
-                if token['type'] in tagTokenTypes:
-                    info["name"] = token['name']
-
-                self.parser.log.append((self.parser.tokenizer.state.__name__,
-                                        self.parser.phase.__class__.__name__,
-                                        self.__class__.__name__,
-                                        function.__name__,
-                                        info))
-                return function(self, *args, **kwargs)
-            else:
-                return function(self, *args, **kwargs)
-        return wrapped
-
-    def getMetaclass(use_metaclass, metaclass_func):
-        if use_metaclass:
-            return method_decorator_metaclass(metaclass_func)
-        else:
-            return type
-
-    # pylint:disable=unused-argument
-    class Phase(metaclass=getMetaclass(debug, log)):
-        """Base class for helper object that implements each phase of processing
-        """
-        __slots__ = ("parser", "tree", "__startTagCache", "__endTagCache")
-
-        def __init__(self, parser, tree):
-            self.parser = parser
-            self.tree = tree
-            self.__startTagCache = {}
-            self.__endTagCache = {}
-
-        def processEOF(self):
-            raise NotImplementedError
-
-        def processComment(self, token):
-            # For most phases the following is correct. Where it's not it will be
-            # overridden.
-            self.tree.insertComment(token, self.tree.openElements[-1])
-
-        def processDoctype(self, token):
-            self.parser.parseError("unexpected-doctype")
-
-        def processCharacters(self, token):
-            self.tree.insertText(token["data"])
-
-        def processSpaceCharacters(self, token):
-            self.tree.insertText(token["data"])
-
-        def processStartTag(self, token):
-            # Note the caching is done here rather than BoundMethodDispatcher as doing it there
-            # requires a circular reference to the Phase, and this ends up with a significant
-            # (CPython 2.7, 3.8) GC cost when parsing many short inputs
-            name = token["name"]
-            # In Py2, using `in` is quicker in general than try/except KeyError
-            # In Py3, `in` is quicker when there are few cache hits (typically short inputs)
-            if name in self.__startTagCache:
-                func = self.__startTagCache[name]
-            else:
-                func = self.__startTagCache[name] = self.startTagHandler[name]
-                # bound the cache size in case we get loads of unknown tags
-                while len(self.__startTagCache) > len(self.startTagHandler) * 1.1:
-                    # this makes the eviction policy random on Py < 3.7 and FIFO >= 3.7
-                    self.__startTagCache.pop(next(iter(self.__startTagCache)))
-            return func(token)
-
-        def startTagHtml(self, token):
-            if not self.parser.firstStartTag and token["name"] == "html":
-                self.parser.parseError("non-html-root")
-            # XXX Need a check here to see if the first start tag token emitted is
-            # this token... If it's not, invoke self.parser.parseError().
-            for attr, value in token["data"].items():
-                if attr not in self.tree.openElements[0].attributes:
-                    self.tree.openElements[0].attributes[attr] = value
-            self.parser.firstStartTag = False
-
-        def processEndTag(self, token):
-            # Note the caching is done here rather than BoundMethodDispatcher as doing it there
-            # requires a circular reference to the Phase, and this ends up with a significant
-            # (CPython 2.7, 3.8) GC cost when parsing many short inputs
-            name = token["name"]
-            # In Py2, using `in` is quicker in general than try/except KeyError
-            # In Py3, `in` is quicker when there are few cache hits (typically short inputs)
-            if name in self.__endTagCache:
-                func = self.__endTagCache[name]
-            else:
-                func = self.__endTagCache[name] = self.endTagHandler[name]
-                # bound the cache size in case we get loads of unknown tags
-                while len(self.__endTagCache) > len(self.endTagHandler) * 1.1:
-                    # this makes the eviction policy random on Py < 3.7 and FIFO >= 3.7
-                    self.__endTagCache.pop(next(iter(self.__endTagCache)))
-            return func(token)
-
-    class InitialPhase(Phase):
-        __slots__ = tuple()
-
-        def processSpaceCharacters(self, token):
-            pass
-
-        def processComment(self, token):
-            self.tree.insertComment(token, self.tree.document)
-
-        def processDoctype(self, token):
-            name = token["name"]
-            publicId = token["publicId"]
-            systemId = token["systemId"]
-            correct = token["correct"]
-
-            if (name != "html" or publicId is not None or
-                    systemId is not None and systemId != "about:legacy-compat"):
-                self.parser.parseError("unknown-doctype")
-
-            if publicId is None:
-                publicId = ""
-
-            self.tree.insertDoctype(token)
-
-            if publicId != "":
-                publicId = publicId.translate(asciiUpper2Lower)
-
-            if (not correct or token["name"] != "html" or
-                    publicId.startswith(
-                        ("+//silmaril//dtd html pro v0r11 19970101//",
-                         "-//advasoft ltd//dtd html 3.0 aswedit + extensions//",
-                         "-//as//dtd html 3.0 aswedit + extensions//",
-                         "-//ietf//dtd html 2.0 level 1//",
-                         "-//ietf//dtd html 2.0 level 2//",
-                         "-//ietf//dtd html 2.0 strict level 1//",
-                         "-//ietf//dtd html 2.0 strict level 2//",
-                         "-//ietf//dtd html 2.0 strict//",
-                         "-//ietf//dtd html 2.0//",
-                         "-//ietf//dtd html 2.1e//",
-                         "-//ietf//dtd html 3.0//",
-                         "-//ietf//dtd html 3.2 final//",
-                         "-//ietf//dtd html 3.2//",
-                         "-//ietf//dtd html 3//",
-                         "-//ietf//dtd html level 0//",
-                         "-//ietf//dtd html level 1//",
-                         "-//ietf//dtd html level 2//",
-                         "-//ietf//dtd html level 3//",
-                         "-//ietf//dtd html strict level 0//",
-                         "-//ietf//dtd html strict level 1//",
-                         "-//ietf//dtd html strict level 2//",
-                         "-//ietf//dtd html strict level 3//",
-                         "-//ietf//dtd html strict//",
-                         "-//ietf//dtd html//",
-                         "-//metrius//dtd metrius presentational//",
-                         "-//microsoft//dtd internet explorer 2.0 html strict//",
-                         "-//microsoft//dtd internet explorer 2.0 html//",
-                         "-//microsoft//dtd internet explorer 2.0 tables//",
-                         "-//microsoft//dtd internet explorer 3.0 html strict//",
-                         "-//microsoft//dtd internet explorer 3.0 html//",
-                         "-//microsoft//dtd internet explorer 3.0 tables//",
-                         "-//netscape comm. corp.//dtd html//",
-                         "-//netscape comm. corp.//dtd strict html//",
-                         "-//o'reilly and associates//dtd html 2.0//",
-                         "-//o'reilly and associates//dtd html extended 1.0//",
-                         "-//o'reilly and associates//dtd html extended relaxed 1.0//",
-                         "-//softquad software//dtd hotmetal pro 6.0::19990601::extensions to html 4.0//",
-                         "-//softquad//dtd hotmetal pro 4.0::19971010::extensions to html 4.0//",
-                         "-//spyglass//dtd html 2.0 extended//",
-                         "-//sq//dtd html 2.0 hotmetal + extensions//",
-                         "-//sun microsystems corp.//dtd hotjava html//",
-                         "-//sun microsystems corp.//dtd hotjava strict html//",
-                         "-//w3c//dtd html 3 1995-03-24//",
-                         "-//w3c//dtd html 3.2 draft//",
-                         "-//w3c//dtd html 3.2 final//",
-                         "-//w3c//dtd html 3.2//",
-                         "-//w3c//dtd html 3.2s draft//",
-                         "-//w3c//dtd html 4.0 frameset//",
-                         "-//w3c//dtd html 4.0 transitional//",
-                         "-//w3c//dtd html experimental 19960712//",
-                         "-//w3c//dtd html experimental 970421//",
-                         "-//w3c//dtd w3 html//",
-                         "-//w3o//dtd w3 html 3.0//",
-                         "-//webtechs//dtd mozilla html 2.0//",
-                         "-//webtechs//dtd mozilla html//")) or
-                    publicId in ("-//w3o//dtd w3 html strict 3.0//en//",
-                                 "-/w3c/dtd html 4.0 transitional/en",
-                                 "html") or
-                    publicId.startswith(
-                        ("-//w3c//dtd html 4.01 frameset//",
-                         "-//w3c//dtd html 4.01 transitional//")) and
-                    systemId is None or
-                    systemId and systemId.lower() == "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd"):
-                self.parser.compatMode = "quirks"
-            elif (publicId.startswith(
-                    ("-//w3c//dtd xhtml 1.0 frameset//",
-                     "-//w3c//dtd xhtml 1.0 transitional//")) or
-                  publicId.startswith(
-                      ("-//w3c//dtd html 4.01 frameset//",
-                       "-//w3c//dtd html 4.01 transitional//")) and
-                  systemId is not None):
-                self.parser.compatMode = "limited quirks"
-
-            self.parser.phase = self.parser.phases["beforeHtml"]
-
-        def anythingElse(self):
-            self.parser.compatMode = "quirks"
-            self.parser.phase = self.parser.phases["beforeHtml"]
-
-        def processCharacters(self, token):
-            self.parser.parseError("expected-doctype-but-got-chars")
-            self.anythingElse()
-            return token
-
-        def processStartTag(self, token):
-            self.parser.parseError("expected-doctype-but-got-start-tag",
-                                   {"name": token["name"]})
-            self.anythingElse()
-            return token
-
-        def processEndTag(self, token):
-            self.parser.parseError("expected-doctype-but-got-end-tag",
-                                   {"name": token["name"]})
-            self.anythingElse()
-            return token
-
-        def processEOF(self):
-            self.parser.parseError("expected-doctype-but-got-eof")
-            self.anythingElse()
-            return True
-
-    class BeforeHtmlPhase(Phase):
-        __slots__ = tuple()
-
-        # helper methods
-        def insertHtmlElement(self):
-            self.tree.insertRoot(impliedTagToken("html", "StartTag"))
-            self.parser.phase = self.parser.phases["beforeHead"]
-
-        # other
-        def processEOF(self):
-            self.insertHtmlElement()
-            return True
-
-        def processComment(self, token):
-            self.tree.insertComment(token, self.tree.document)
-
-        def processSpaceCharacters(self, token):
-            pass
-
-        def processCharacters(self, token):
-            self.insertHtmlElement()
-            return token
-
-        def processStartTag(self, token):
-            if token["name"] == "html":
-                self.parser.firstStartTag = True
-            self.insertHtmlElement()
-            return token
-
-        def processEndTag(self, token):
-            if token["name"] not in ("head", "body", "html", "br"):
-                self.parser.parseError("unexpected-end-tag-before-html",
-                                       {"name": token["name"]})
-            else:
-                self.insertHtmlElement()
-                return token
-
-    class BeforeHeadPhase(Phase):
-        __slots__ = tuple()
-
-        def processEOF(self):
-            self.startTagHead(impliedTagToken("head", "StartTag"))
-            return True
-
-        def processSpaceCharacters(self, token):
-            pass
-
-        def processCharacters(self, token):
-            self.startTagHead(impliedTagToken("head", "StartTag"))
-            return token
-
-        def startTagHtml(self, token):
-            return self.parser.phases["inBody"].processStartTag(token)
-
-        def startTagHead(self, token):
-            self.tree.insertElement(token)
-            self.tree.headPointer = self.tree.openElements[-1]
-            self.parser.phase = self.parser.phases["inHead"]
-
-        def startTagOther(self, token):
-            self.startTagHead(impliedTagToken("head", "StartTag"))
-            return token
-
-        def endTagImplyHead(self, token):
-            self.startTagHead(impliedTagToken("head", "StartTag"))
-            return token
-
-        def endTagOther(self, token):
-            self.parser.parseError("end-tag-after-implied-root",
-                                   {"name": token["name"]})
-
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", startTagHtml),
-            ("head", startTagHead)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            (("head", "body", "html", "br"), endTagImplyHead)
-        ])
-        endTagHandler.default = endTagOther
-
-    class InHeadPhase(Phase):
-        __slots__ = tuple()
-
-        # the real thing
-        def processEOF(self):
-            self.anythingElse()
-            return True
-
-        def processCharacters(self, token):
-            self.anythingElse()
-            return token
-
-        def startTagHtml(self, token):
-            return self.parser.phases["inBody"].processStartTag(token)
-
-        def startTagHead(self, token):
-            self.parser.parseError("two-heads-are-not-better-than-one")
-
-        def startTagBaseLinkCommand(self, token):
-            self.tree.insertElement(token)
-            self.tree.openElements.pop()
-            token["selfClosingAcknowledged"] = True
-
-        def startTagMeta(self, token):
-            self.tree.insertElement(token)
-            self.tree.openElements.pop()
-            token["selfClosingAcknowledged"] = True
-
-            attributes = token["data"]
-            if self.parser.tokenizer.stream.charEncoding[1] == "tentative":
-                if "charset" in attributes:
-                    self.parser.tokenizer.stream.changeEncoding(attributes["charset"])
-                elif ("content" in attributes and
-                      "http-equiv" in attributes and
-                      attributes["http-equiv"].lower() == "content-type"):
-                    # Encoding it as UTF-8 here is a hack, as really we should pass
-                    # the abstract Unicode string, and just use the
-                    # ContentAttrParser on that, but using UTF-8 allows all chars
-                    # to be encoded and as a ASCII-superset works.
-                    data = _inputstream.EncodingBytes(attributes["content"].encode("utf-8"))
-                    parser = _inputstream.ContentAttrParser(data)
-                    codec = parser.parse()
-                    self.parser.tokenizer.stream.changeEncoding(codec)
-
-        def startTagTitle(self, token):
-            self.parser.parseRCDataRawtext(token, "RCDATA")
-
-        def startTagNoFramesStyle(self, token):
-            # Need to decide whether to implement the scripting-disabled case
-            self.parser.parseRCDataRawtext(token, "RAWTEXT")
-
-        def startTagNoscript(self, token):
-            if self.parser.scripting:
-                self.parser.parseRCDataRawtext(token, "RAWTEXT")
-            else:
-                self.tree.insertElement(token)
-                self.parser.phase = self.parser.phases["inHeadNoscript"]
-
-        def startTagScript(self, token):
-            self.tree.insertElement(token)
-            self.parser.tokenizer.state = self.parser.tokenizer.scriptDataState
-            self.parser.originalPhase = self.parser.phase
-            self.parser.phase = self.parser.phases["text"]
-
-        def startTagOther(self, token):
-            self.anythingElse()
-            return token
-
-        def endTagHead(self, token):
-            node = self.parser.tree.openElements.pop()
-            assert node.name == "head", "Expected head got %s" % node.name
-            self.parser.phase = self.parser.phases["afterHead"]
-
-        def endTagHtmlBodyBr(self, token):
-            self.anythingElse()
-            return token
-
-        def endTagOther(self, token):
-            self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
-
-        def anythingElse(self):
-            self.endTagHead(impliedTagToken("head"))
-
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", startTagHtml),
-            ("title", startTagTitle),
-            (("noframes", "style"), startTagNoFramesStyle),
-            ("noscript", startTagNoscript),
-            ("script", startTagScript),
-            (("base", "basefont", "bgsound", "command", "link"),
-             startTagBaseLinkCommand),
-            ("meta", startTagMeta),
-            ("head", startTagHead)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            ("head", endTagHead),
-            (("br", "html", "body"), endTagHtmlBodyBr)
-        ])
-        endTagHandler.default = endTagOther
-
-    class InHeadNoscriptPhase(Phase):
-        __slots__ = tuple()
-
-        def processEOF(self):
-            self.parser.parseError("eof-in-head-noscript")
-            self.anythingElse()
-            return True
-
-        def processComment(self, token):
-            return self.parser.phases["inHead"].processComment(token)
-
-        def processCharacters(self, token):
-            self.parser.parseError("char-in-head-noscript")
-            self.anythingElse()
-            return token
-
-        def processSpaceCharacters(self, token):
-            return self.parser.phases["inHead"].processSpaceCharacters(token)
-
-        def startTagHtml(self, token):
-            return self.parser.phases["inBody"].processStartTag(token)
-
-        def startTagBaseLinkCommand(self, token):
-            return self.parser.phases["inHead"].processStartTag(token)
-
-        def startTagHeadNoscript(self, token):
-            self.parser.parseError("unexpected-start-tag", {"name": token["name"]})
-
-        def startTagOther(self, token):
-            self.parser.parseError("unexpected-inhead-noscript-tag", {"name": token["name"]})
-            self.anythingElse()
-            return token
-
-        def endTagNoscript(self, token):
-            node = self.parser.tree.openElements.pop()
-            assert node.name == "noscript", "Expected noscript got %s" % node.name
-            self.parser.phase = self.parser.phases["inHead"]
-
-        def endTagBr(self, token):
-            self.parser.parseError("unexpected-inhead-noscript-tag", {"name": token["name"]})
-            self.anythingElse()
-            return token
-
-        def endTagOther(self, token):
-            self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
-
-        def anythingElse(self):
-            # Caller must raise parse error first!
-            self.endTagNoscript(impliedTagToken("noscript"))
-
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", startTagHtml),
-            (("basefont", "bgsound", "link", "meta", "noframes", "style"), startTagBaseLinkCommand),
-            (("head", "noscript"), startTagHeadNoscript),
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            ("noscript", endTagNoscript),
-            ("br", endTagBr),
-        ])
-        endTagHandler.default = endTagOther
-
-    class AfterHeadPhase(Phase):
-        __slots__ = tuple()
-
-        def processEOF(self):
-            self.anythingElse()
-            return True
-
-        def processCharacters(self, token):
-            self.anythingElse()
-            return token
-
-        def startTagHtml(self, token):
-            return self.parser.phases["inBody"].processStartTag(token)
-
-        def startTagBody(self, token):
-            self.parser.framesetOK = False
-            self.tree.insertElement(token)
-            self.parser.phase = self.parser.phases["inBody"]
-
-        def startTagFrameset(self, token):
-            self.tree.insertElement(token)
-            self.parser.phase = self.parser.phases["inFrameset"]
-
-        def startTagFromHead(self, token):
-            self.parser.parseError("unexpected-start-tag-out-of-my-head",
-                                   {"name": token["name"]})
-            self.tree.openElements.append(self.tree.headPointer)
-            self.parser.phases["inHead"].processStartTag(token)
-            for node in self.tree.openElements[::-1]:
-                if node.name == "head":
-                    self.tree.openElements.remove(node)
-                    break
-
-        def startTagHead(self, token):
-            self.parser.parseError("unexpected-start-tag", {"name": token["name"]})
-
-        def startTagOther(self, token):
-            self.anythingElse()
-            return token
-
-        def endTagHtmlBodyBr(self, token):
-            self.anythingElse()
-            return token
-
-        def endTagOther(self, token):
-            self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
-
-        def anythingElse(self):
-            self.tree.insertElement(impliedTagToken("body", "StartTag"))
-            self.parser.phase = self.parser.phases["inBody"]
-            self.parser.framesetOK = True
-
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", startTagHtml),
-            ("body", startTagBody),
-            ("frameset", startTagFrameset),
-            (("base", "basefont", "bgsound", "link", "meta", "noframes", "script",
-              "style", "title"),
-             startTagFromHead),
-            ("head", startTagHead)
-        ])
-        startTagHandler.default = startTagOther
-        endTagHandler = _utils.MethodDispatcher([(("body", "html", "br"),
-                                                  endTagHtmlBodyBr)])
-        endTagHandler.default = endTagOther
-
-    class InBodyPhase(Phase):
-        # http://www.whatwg.org/specs/web-apps/current-work/#parsing-main-inbody
-        # the really-really-really-very crazy mode
-        __slots__ = ("processSpaceCharacters",)
-
-        def __init__(self, *args, **kwargs):
-            super(InBodyPhase, self).__init__(*args, **kwargs)
-            # Set this to the default handler
-            self.processSpaceCharacters = self.processSpaceCharactersNonPre
-
-        def isMatchingFormattingElement(self, node1, node2):
-            return (node1.name == node2.name and
-                    node1.namespace == node2.namespace and
-                    node1.attributes == node2.attributes)
-
-        # helper
-        def addFormattingElement(self, token):
-            self.tree.insertElement(token)
-            element = self.tree.openElements[-1]
-
-            matchingElements = []
-            for node in self.tree.activeFormattingElements[::-1]:
-                if node is Marker:
-                    break
-                elif self.isMatchingFormattingElement(node, element):
-                    matchingElements.append(node)
-
-            assert len(matchingElements) <= 3
-            if len(matchingElements) == 3:
-                self.tree.activeFormattingElements.remove(matchingElements[-1])
-            self.tree.activeFormattingElements.append(element)
-
-        # the real deal
-        def processEOF(self):
-            allowed_elements = frozenset(("dd", "dt", "li", "p", "tbody", "td",
-                                          "tfoot", "th", "thead", "tr", "body",
-                                          "html"))
-            for node in self.tree.openElements[::-1]:
-                if node.name not in allowed_elements:
-                    self.parser.parseError("expected-closing-tag-but-got-eof")
-                    break
-            # Stop parsing
-
-        def processSpaceCharactersDropNewline(self, token):
-            # Sometimes (start of <pre>, <listing>, and <textarea> blocks) we
-            # want to drop leading newlines
-            data = token["data"]
-            self.processSpaceCharacters = self.processSpaceCharactersNonPre
-            if (data.startswith("\n") and
-                self.tree.openElements[-1].name in ("pre", "listing", "textarea") and
-                    not self.tree.openElements[-1].hasContent()):
-                data = data[1:]
-            if data:
-                self.tree.reconstructActiveFormattingElements()
-                self.tree.insertText(data)
-
-        def processCharacters(self, token):
-            if token["data"] == "\u0000":
-                # The tokenizer should always emit null on its own
-                return
-            self.tree.reconstructActiveFormattingElements()
-            self.tree.insertText(token["data"])
-            # This must be bad for performance
-            if (self.parser.framesetOK and
-                any([char not in spaceCharacters
-                     for char in token["data"]])):
-                self.parser.framesetOK = False
-
-        def processSpaceCharactersNonPre(self, token):
-            self.tree.reconstructActiveFormattingElements()
-            self.tree.insertText(token["data"])
-
-        def startTagProcessInHead(self, token):
-            return self.parser.phases["inHead"].processStartTag(token)
-
-        def startTagBody(self, token):
-            self.parser.parseError("unexpected-start-tag", {"name": "body"})
-            if (len(self.tree.openElements) == 1 or
-                    self.tree.openElements[1].name != "body"):
-                assert self.parser.innerHTML
-            else:
-                self.parser.framesetOK = False
-                for attr, value in token["data"].items():
-                    if attr not in self.tree.openElements[1].attributes:
-                        self.tree.openElements[1].attributes[attr] = value
-
-        def startTagFrameset(self, token):
-            self.parser.parseError("unexpected-start-tag", {"name": "frameset"})
-            if (len(self.tree.openElements) == 1 or self.tree.openElements[1].name != "body"):
-                assert self.parser.innerHTML
-            elif not self.parser.framesetOK:
-                pass
-            else:
-                if self.tree.openElements[1].parent:
-                    self.tree.openElements[1].parent.removeChild(self.tree.openElements[1])
-                while self.tree.openElements[-1].name != "html":
-                    self.tree.openElements.pop()
-                self.tree.insertElement(token)
-                self.parser.phase = self.parser.phases["inFrameset"]
-
-        def startTagCloseP(self, token):
-            if self.tree.elementInScope("p", variant="button"):
-                self.endTagP(impliedTagToken("p"))
-            self.tree.insertElement(token)
-
-        def startTagPreListing(self, token):
-            if self.tree.elementInScope("p", variant="button"):
-                self.endTagP(impliedTagToken("p"))
-            self.tree.insertElement(token)
-            self.parser.framesetOK = False
-            self.processSpaceCharacters = self.processSpaceCharactersDropNewline
-
-        def startTagForm(self, token):
-            if self.tree.formPointer:
-                self.parser.parseError("unexpected-start-tag", {"name": "form"})
-            else:
-                if self.tree.elementInScope("p", variant="button"):
-                    self.endTagP(impliedTagToken("p"))
-                self.tree.insertElement(token)
-                self.tree.formPointer = self.tree.openElements[-1]
-
-        def startTagListItem(self, token):
-            self.parser.framesetOK = False
-
-            stopNamesMap = {"li": ["li"],
-                            "dt": ["dt", "dd"],
-                            "dd": ["dt", "dd"]}
-            stopNames = stopNamesMap[token["name"]]
-            for node in reversed(self.tree.openElements):
-                if node.name in stopNames:
-                    self.parser.phase.processEndTag(
-                        impliedTagToken(node.name, "EndTag"))
-                    break
-                if (node.nameTuple in specialElements and
-                        node.name not in ("address", "div", "p")):
-                    break
-
-            if self.tree.elementInScope("p", variant="button"):
-                self.parser.phase.processEndTag(
-                    impliedTagToken("p", "EndTag"))
-
-            self.tree.insertElement(token)
-
-        def startTagPlaintext(self, token):
-            if self.tree.elementInScope("p", variant="button"):
-                self.endTagP(impliedTagToken("p"))
-            self.tree.insertElement(token)
-            self.parser.tokenizer.state = self.parser.tokenizer.plaintextState
-
-        def startTagHeading(self, token):
-            if self.tree.elementInScope("p", variant="button"):
-                self.endTagP(impliedTagToken("p"))
-            if self.tree.openElements[-1].name in headingElements:
-                self.parser.parseError("unexpected-start-tag", {"name": token["name"]})
-                self.tree.openElements.pop()
-            self.tree.insertElement(token)
-
-        def startTagA(self, token):
-            afeAElement = self.tree.elementInActiveFormattingElements("a")
-            if afeAElement:
-                self.parser.parseError("unexpected-start-tag-implies-end-tag",
-                                       {"startName": "a", "endName": "a"})
-                self.endTagFormatting(impliedTagToken("a"))
-                if afeAElement in self.tree.openElements:
-                    self.tree.openElements.remove(afeAElement)
-                if afeAElement in self.tree.activeFormattingElements:
-                    self.tree.activeFormattingElements.remove(afeAElement)
-            self.tree.reconstructActiveFormattingElements()
-            self.addFormattingElement(token)
-
-        def startTagFormatting(self, token):
-            self.tree.reconstructActiveFormattingElements()
-            self.addFormattingElement(token)
-
-        def startTagNobr(self, token):
-            self.tree.reconstructActiveFormattingElements()
-            if self.tree.elementInScope("nobr"):
-                self.parser.parseError("unexpected-start-tag-implies-end-tag",
-                                       {"startName": "nobr", "endName": "nobr"})
-                self.processEndTag(impliedTagToken("nobr"))
-                # XXX Need tests that trigger the following
-                self.tree.reconstructActiveFormattingElements()
-            self.addFormattingElement(token)
-
-        def startTagButton(self, token):
-            if self.tree.elementInScope("button"):
-                self.parser.parseError("unexpected-start-tag-implies-end-tag",
-                                       {"startName": "button", "endName": "button"})
-                self.processEndTag(impliedTagToken("button"))
-                return token
-            else:
-                self.tree.reconstructActiveFormattingElements()
-                self.tree.insertElement(token)
-                self.parser.framesetOK = False
-
-        def startTagAppletMarqueeObject(self, token):
-            self.tree.reconstructActiveFormattingElements()
-            self.tree.insertElement(token)
-            self.tree.activeFormattingElements.append(Marker)
-            self.parser.framesetOK = False
-
-        def startTagXmp(self, token):
-            if self.tree.elementInScope("p", variant="button"):
-                self.endTagP(impliedTagToken("p"))
-            self.tree.reconstructActiveFormattingElements()
-            self.parser.framesetOK = False
-            self.parser.parseRCDataRawtext(token, "RAWTEXT")
-
-        def startTagTable(self, token):
-            if self.parser.compatMode != "quirks":
-                if self.tree.elementInScope("p", variant="button"):
-                    self.processEndTag(impliedTagToken("p"))
-            self.tree.insertElement(token)
-            self.parser.framesetOK = False
-            self.parser.phase = self.parser.phases["inTable"]
-
-        def startTagVoidFormatting(self, token):
-            self.tree.reconstructActiveFormattingElements()
-            self.tree.insertElement(token)
-            self.tree.openElements.pop()
-            token["selfClosingAcknowledged"] = True
-            self.parser.framesetOK = False
-
-        def startTagInput(self, token):
-            framesetOK = self.parser.framesetOK
-            self.startTagVoidFormatting(token)
-            if ("type" in token["data"] and
-                    token["data"]["type"].translate(asciiUpper2Lower) == "hidden"):
-                # input type=hidden doesn't change framesetOK
-                self.parser.framesetOK = framesetOK
-
-        def startTagParamSource(self, token):
-            self.tree.insertElement(token)
-            self.tree.openElements.pop()
-            token["selfClosingAcknowledged"] = True
-
-        def startTagHr(self, token):
-            if self.tree.elementInScope("p", variant="button"):
-                self.endTagP(impliedTagToken("p"))
-            self.tree.insertElement(token)
-            self.tree.openElements.pop()
-            token["selfClosingAcknowledged"] = True
-            self.parser.framesetOK = False
-
-        def startTagImage(self, token):
-            # No really...
-            self.parser.parseError("unexpected-start-tag-treated-as",
-                                   {"originalName": "image", "newName": "img"})
-            self.processStartTag(impliedTagToken("img", "StartTag",
-                                                 attributes=token["data"],
-                                                 selfClosing=token["selfClosing"]))
-
-        def startTagIsIndex(self, token):
-            self.parser.parseError("deprecated-tag", {"name": "isindex"})
-            if self.tree.formPointer:
-                return
-            form_attrs = {}
-            if "action" in token["data"]:
-                form_attrs["action"] = token["data"]["action"]
-            self.processStartTag(impliedTagToken("form", "StartTag",
-                                                 attributes=form_attrs))
-            self.processStartTag(impliedTagToken("hr", "StartTag"))
-            self.processStartTag(impliedTagToken("label", "StartTag"))
-            # XXX Localization ...
-            if "prompt" in token["data"]:
-                prompt = token["data"]["prompt"]
-            else:
-                prompt = "This is a searchable index. Enter search keywords: "
-            self.processCharacters(
-                {"type": tokenTypes["Characters"], "data": prompt})
-            attributes = token["data"].copy()
-            if "action" in attributes:
-                del attributes["action"]
-            if "prompt" in attributes:
-                del attributes["prompt"]
-            attributes["name"] = "isindex"
-            self.processStartTag(impliedTagToken("input", "StartTag",
-                                                 attributes=attributes,
-                                                 selfClosing=token["selfClosing"]))
-            self.processEndTag(impliedTagToken("label"))
-            self.processStartTag(impliedTagToken("hr", "StartTag"))
-            self.processEndTag(impliedTagToken("form"))
-
-        def startTagTextarea(self, token):
-            self.tree.insertElement(token)
-            self.parser.tokenizer.state = self.parser.tokenizer.rcdataState
-            self.processSpaceCharacters = self.processSpaceCharactersDropNewline
-            self.parser.framesetOK = False
-
-        def startTagIFrame(self, token):
-            self.parser.framesetOK = False
-            self.startTagRawtext(token)
-
-        def startTagNoscript(self, token):
-            if self.parser.scripting:
-                self.startTagRawtext(token)
-            else:
-                self.startTagOther(token)
-
-        def startTagRawtext(self, token):
-            """iframe, noembed noframes, noscript(if scripting enabled)"""
-            self.parser.parseRCDataRawtext(token, "RAWTEXT")
-
-        def startTagOpt(self, token):
-            if self.tree.openElements[-1].name == "option":
-                self.parser.phase.processEndTag(impliedTagToken("option"))
-            self.tree.reconstructActiveFormattingElements()
-            self.parser.tree.insertElement(token)
-
-        def startTagSelect(self, token):
-            self.tree.reconstructActiveFormattingElements()
-            self.tree.insertElement(token)
-            self.parser.framesetOK = False
-            if self.parser.phase in (self.parser.phases["inTable"],
-                                     self.parser.phases["inCaption"],
-                                     self.parser.phases["inColumnGroup"],
-                                     self.parser.phases["inTableBody"],
-                                     self.parser.phases["inRow"],
-                                     self.parser.phases["inCell"]):
-                self.parser.phase = self.parser.phases["inSelectInTable"]
-            else:
-                self.parser.phase = self.parser.phases["inSelect"]
-
-        def startTagRpRt(self, token):
-            if self.tree.elementInScope("ruby"):
-                self.tree.generateImpliedEndTags()
-                if self.tree.openElements[-1].name != "ruby":
-                    self.parser.parseError()
-            self.tree.insertElement(token)
-
-        def startTagMath(self, token):
-            self.tree.reconstructActiveFormattingElements()
-            self.parser.adjustMathMLAttributes(token)
-            self.parser.adjustForeignAttributes(token)
-            token["namespace"] = namespaces["mathml"]
-            self.tree.insertElement(token)
-            # Need to get the parse error right for the case where the token
-            # has a namespace not equal to the xmlns attribute
-            if token["selfClosing"]:
-                self.tree.openElements.pop()
-                token["selfClosingAcknowledged"] = True
-
-        def startTagSvg(self, token):
-            self.tree.reconstructActiveFormattingElements()
-            self.parser.adjustSVGAttributes(token)
-            self.parser.adjustForeignAttributes(token)
-            token["namespace"] = namespaces["svg"]
-            self.tree.insertElement(token)
-            # Need to get the parse error right for the case where the token
-            # has a namespace not equal to the xmlns attribute
-            if token["selfClosing"]:
-                self.tree.openElements.pop()
-                token["selfClosingAcknowledged"] = True
-
-        def startTagMisplaced(self, token):
-            """ Elements that should be children of other elements that have a
-            different insertion mode; here they are ignored
-            "caption", "col", "colgroup", "frame", "frameset", "head",
-            "option", "optgroup", "tbody", "td", "tfoot", "th", "thead",
-            "tr", "noscript"
-            """
-            self.parser.parseError("unexpected-start-tag-ignored", {"name": token["name"]})
-
-        def startTagOther(self, token):
-            self.tree.reconstructActiveFormattingElements()
-            self.tree.insertElement(token)
-
-        def endTagP(self, token):
-            if not self.tree.elementInScope("p", variant="button"):
-                self.startTagCloseP(impliedTagToken("p", "StartTag"))
-                self.parser.parseError("unexpected-end-tag", {"name": "p"})
-                self.endTagP(impliedTagToken("p", "EndTag"))
-            else:
-                self.tree.generateImpliedEndTags("p")
-                if self.tree.openElements[-1].name != "p":
-                    self.parser.parseError("unexpected-end-tag", {"name": "p"})
-                node = self.tree.openElements.pop()
-                while node.name != "p":
-                    node = self.tree.openElements.pop()
-
-        def endTagBody(self, token):
-            if not self.tree.elementInScope("body"):
-                self.parser.parseError()
-                return
-            elif self.tree.openElements[-1].name != "body":
-                for node in self.tree.openElements[2:]:
-                    if node.name not in frozenset(("dd", "dt", "li", "optgroup",
-                                                   "option", "p", "rp", "rt",
-                                                   "tbody", "td", "tfoot",
-                                                   "th", "thead", "tr", "body",
-                                                   "html")):
-                        # Not sure this is the correct name for the parse error
-                        self.parser.parseError(
-                            "expected-one-end-tag-but-got-another",
-                            {"gotName": "body", "expectedName": node.name})
-                        break
-            self.parser.phase = self.parser.phases["afterBody"]
-
-        def endTagHtml(self, token):
-            # We repeat the test for the body end tag token being ignored here
-            if self.tree.elementInScope("body"):
-                self.endTagBody(impliedTagToken("body"))
-                return token
-
-        def endTagBlock(self, token):
-            # Put us back in the right whitespace handling mode
-            if token["name"] == "pre":
-                self.processSpaceCharacters = self.processSpaceCharactersNonPre
-            inScope = self.tree.elementInScope(token["name"])
-            if inScope:
-                self.tree.generateImpliedEndTags()
-            if self.tree.openElements[-1].name != token["name"]:
-                self.parser.parseError("end-tag-too-early", {"name": token["name"]})
-            if inScope:
-                node = self.tree.openElements.pop()
-                while node.name != token["name"]:
-                    node = self.tree.openElements.pop()
-
-        def endTagForm(self, token):
-            node = self.tree.formPointer
-            self.tree.formPointer = None
-            if node is None or not self.tree.elementInScope(node):
-                self.parser.parseError("unexpected-end-tag",
-                                       {"name": "form"})
-            else:
-                self.tree.generateImpliedEndTags()
-                if self.tree.openElements[-1] != node:
-                    self.parser.parseError("end-tag-too-early-ignored",
-                                           {"name": "form"})
-                self.tree.openElements.remove(node)
-
-        def endTagListItem(self, token):
-            if token["name"] == "li":
-                variant = "list"
-            else:
-                variant = None
-            if not self.tree.elementInScope(token["name"], variant=variant):
-                self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
-            else:
-                self.tree.generateImpliedEndTags(exclude=token["name"])
-                if self.tree.openElements[-1].name != token["name"]:
-                    self.parser.parseError(
-                        "end-tag-too-early",
-                        {"name": token["name"]})
-                node = self.tree.openElements.pop()
-                while node.name != token["name"]:
-                    node = self.tree.openElements.pop()
-
-        def endTagHeading(self, token):
-            for item in headingElements:
-                if self.tree.elementInScope(item):
-                    self.tree.generateImpliedEndTags()
-                    break
-            if self.tree.openElements[-1].name != token["name"]:
-                self.parser.parseError("end-tag-too-early", {"name": token["name"]})
-
-            for item in headingElements:
-                if self.tree.elementInScope(item):
-                    item = self.tree.openElements.pop()
-                    while item.name not in headingElements:
-                        item = self.tree.openElements.pop()
-                    break
-
-        def endTagFormatting(self, token):
-            """The much-feared adoption agency algorithm"""
-            # http://svn.whatwg.org/webapps/complete.html#adoptionAgency revision 7867
-            # XXX Better parseError messages appreciated.
-
-            # Step 1
-            outerLoopCounter = 0
-
-            # Step 2
-            while outerLoopCounter < 8:
-
-                # Step 3
-                outerLoopCounter += 1
-
-                # Step 4:
-
-                # Let the formatting element be the last element in
-                # the list of active formatting elements that:
-                # - is between the end of the list and the last scope
-                # marker in the list, if any, or the start of the list
-                # otherwise, and
-                # - has the same tag name as the token.
-                formattingElement = self.tree.elementInActiveFormattingElements(
-                    token["name"])
-                if (not formattingElement or
-                    (formattingElement in self.tree.openElements and
-                     not self.tree.elementInScope(formattingElement.name))):
-                    # If there is no such node, then abort these steps
-                    # and instead act as described in the "any other
-                    # end tag" entry below.
-                    self.endTagOther(token)
-                    return
-
-                # Otherwise, if there is such a node, but that node is
-                # not in the stack of open elements, then this is a
-                # parse error; remove the element from the list, and
-                # abort these steps.
-                elif formattingElement not in self.tree.openElements:
-                    self.parser.parseError("adoption-agency-1.2", {"name": token["name"]})
-                    self.tree.activeFormattingElements.remove(formattingElement)
-                    return
-
-                # Otherwise, if there is such a node, and that node is
-                # also in the stack of open elements, but the element
-                # is not in scope, then this is a parse error; ignore
-                # the token, and abort these steps.
-                elif not self.tree.elementInScope(formattingElement.name):
-                    self.parser.parseError("adoption-agency-4.4", {"name": token["name"]})
-                    return
-
-                # Otherwise, there is a formatting element and that
-                # element is in the stack and is in scope. If the
-                # element is not the current node, this is a parse
-                # error. In any case, proceed with the algorithm as
-                # written in the following steps.
-                else:
-                    if formattingElement != self.tree.openElements[-1]:
-                        self.parser.parseError("adoption-agency-1.3", {"name": token["name"]})
-
-                # Step 5:
-
-                # Let the furthest block be the topmost node in the
-                # stack of open elements that is lower in the stack
-                # than the formatting element, and is an element in
-                # the special category. There might not be one.
-                afeIndex = self.tree.openElements.index(formattingElement)
-                furthestBlock = None
-                for element in self.tree.openElements[afeIndex:]:
-                    if element.nameTuple in specialElements:
-                        furthestBlock = element
-                        break
-
-                # Step 6:
-
-                # If there is no furthest block, then the UA must
-                # first pop all the nodes from the bottom of the stack
-                # of open elements, from the current node up to and
-                # including the formatting element, then remove the
-                # formatting element from the list of active
-                # formatting elements, and finally abort these steps.
-                if furthestBlock is None:
-                    element = self.tree.openElements.pop()
-                    while element != formattingElement:
-                        element = self.tree.openElements.pop()
-                    self.tree.activeFormattingElements.remove(element)
-                    return
-
-                # Step 7
-                commonAncestor = self.tree.openElements[afeIndex - 1]
-
-                # Step 8:
-                # The bookmark is supposed to help us identify where to reinsert
-                # nodes in step 15. We have to ensure that we reinsert nodes after
-                # the node before the active formatting element. Note the bookmark
-                # can move in step 9.7
-                bookmark = self.tree.activeFormattingElements.index(formattingElement)
-
-                # Step 9
-                lastNode = node = furthestBlock
-                innerLoopCounter = 0
-
-                index = self.tree.openElements.index(node)
-                while innerLoopCounter < 3:
-                    innerLoopCounter += 1
-                    # Node is element before node in open elements
-                    index -= 1
-                    node = self.tree.openElements[index]
-                    if node not in self.tree.activeFormattingElements:
-                        self.tree.openElements.remove(node)
-                        continue
-                    # Step 9.6
-                    if node == formattingElement:
-                        break
-                    # Step 9.7
-                    if lastNode == furthestBlock:
-                        bookmark = self.tree.activeFormattingElements.index(node) + 1
-                    # Step 9.8
-                    clone = node.cloneNode()
-                    # Replace node with clone
-                    self.tree.activeFormattingElements[
-                        self.tree.activeFormattingElements.index(node)] = clone
-                    self.tree.openElements[
-                        self.tree.openElements.index(node)] = clone
-                    node = clone
-                    # Step 9.9
-                    # Remove lastNode from its parents, if any
-                    if lastNode.parent:
-                        lastNode.parent.removeChild(lastNode)
-                    node.appendChild(lastNode)
-                    # Step 9.10
-                    lastNode = node
-
-                # Step 10
-                # Foster parent lastNode if commonAncestor is a
-                # table, tbody, tfoot, thead, or tr we need to foster
-                # parent the lastNode
-                if lastNode.parent:
-                    lastNode.parent.removeChild(lastNode)
-
-                if commonAncestor.name in frozenset(("table", "tbody", "tfoot", "thead", "tr")):
-                    parent, insertBefore = self.tree.getTableMisnestedNodePosition()
-                    parent.insertBefore(lastNode, insertBefore)
-                else:
-                    commonAncestor.appendChild(lastNode)
-
-                # Step 11
-                clone = formattingElement.cloneNode()
-
-                # Step 12
-                furthestBlock.reparentChildren(clone)
-
-                # Step 13
-                furthestBlock.appendChild(clone)
-
-                # Step 14
-                self.tree.activeFormattingElements.remove(formattingElement)
-                self.tree.activeFormattingElements.insert(bookmark, clone)
-
-                # Step 15
-                self.tree.openElements.remove(formattingElement)
-                self.tree.openElements.insert(
-                    self.tree.openElements.index(furthestBlock) + 1, clone)
-
-        def endTagAppletMarqueeObject(self, token):
-            if self.tree.elementInScope(token["name"]):
-                self.tree.generateImpliedEndTags()
-            if self.tree.openElements[-1].name != token["name"]:
-                self.parser.parseError("end-tag-too-early", {"name": token["name"]})
-
-            if self.tree.elementInScope(token["name"]):
-                element = self.tree.openElements.pop()
-                while element.name != token["name"]:
-                    element = self.tree.openElements.pop()
-                self.tree.clearActiveFormattingElements()
-
-        def endTagBr(self, token):
-            self.parser.parseError("unexpected-end-tag-treated-as",
-                                   {"originalName": "br", "newName": "br element"})
-            self.tree.reconstructActiveFormattingElements()
-            self.tree.insertElement(impliedTagToken("br", "StartTag"))
-            self.tree.openElements.pop()
-
-        def endTagOther(self, token):
-            for node in self.tree.openElements[::-1]:
-                if node.name == token["name"]:
-                    self.tree.generateImpliedEndTags(exclude=token["name"])
-                    if self.tree.openElements[-1].name != token["name"]:
-                        self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
-                    while self.tree.openElements.pop() != node:
-                        pass
-                    break
-                else:
-                    if node.nameTuple in specialElements:
-                        self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
-                        break
-
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", Phase.startTagHtml),
-            (("base", "basefont", "bgsound", "command", "link", "meta",
-              "script", "style", "title"),
-             startTagProcessInHead),
-            ("body", startTagBody),
-            ("frameset", startTagFrameset),
-            (("address", "article", "aside", "blockquote", "center", "details",
-              "dir", "div", "dl", "fieldset", "figcaption", "figure",
-              "footer", "header", "hgroup", "main", "menu", "nav", "ol", "p",
-              "section", "summary", "ul"),
-             startTagCloseP),
-            (headingElements, startTagHeading),
-            (("pre", "listing"), startTagPreListing),
-            ("form", startTagForm),
-            (("li", "dd", "dt"), startTagListItem),
-            ("plaintext", startTagPlaintext),
-            ("a", startTagA),
-            (("b", "big", "code", "em", "font", "i", "s", "small", "strike",
-              "strong", "tt", "u"), startTagFormatting),
-            ("nobr", startTagNobr),
-            ("button", startTagButton),
-            (("applet", "marquee", "object"), startTagAppletMarqueeObject),
-            ("xmp", startTagXmp),
-            ("table", startTagTable),
-            (("area", "br", "embed", "img", "keygen", "wbr"),
-             startTagVoidFormatting),
-            (("param", "source", "track"), startTagParamSource),
-            ("input", startTagInput),
-            ("hr", startTagHr),
-            ("image", startTagImage),
-            ("isindex", startTagIsIndex),
-            ("textarea", startTagTextarea),
-            ("iframe", startTagIFrame),
-            ("noscript", startTagNoscript),
-            (("noembed", "noframes"), startTagRawtext),
-            ("select", startTagSelect),
-            (("rp", "rt"), startTagRpRt),
-            (("option", "optgroup"), startTagOpt),
-            (("math"), startTagMath),
-            (("svg"), startTagSvg),
-            (("caption", "col", "colgroup", "frame", "head",
-              "tbody", "td", "tfoot", "th", "thead",
-              "tr"), startTagMisplaced)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            ("body", endTagBody),
-            ("html", endTagHtml),
-            (("address", "article", "aside", "blockquote", "button", "center",
-              "details", "dialog", "dir", "div", "dl", "fieldset", "figcaption", "figure",
-              "footer", "header", "hgroup", "listing", "main", "menu", "nav", "ol", "pre",
-              "section", "summary", "ul"), endTagBlock),
-            ("form", endTagForm),
-            ("p", endTagP),
-            (("dd", "dt", "li"), endTagListItem),
-            (headingElements, endTagHeading),
-            (("a", "b", "big", "code", "em", "font", "i", "nobr", "s", "small",
-              "strike", "strong", "tt", "u"), endTagFormatting),
-            (("applet", "marquee", "object"), endTagAppletMarqueeObject),
-            ("br", endTagBr),
-        ])
-        endTagHandler.default = endTagOther
-
-    class TextPhase(Phase):
-        __slots__ = tuple()
-
-        def processCharacters(self, token):
-            self.tree.insertText(token["data"])
-
-        def processEOF(self):
-            self.parser.parseError("expected-named-closing-tag-but-got-eof",
-                                   {"name": self.tree.openElements[-1].name})
-            self.tree.openElements.pop()
-            self.parser.phase = self.parser.originalPhase
-            return True
-
-        def startTagOther(self, token):
-            assert False, "Tried to process start tag %s in RCDATA/RAWTEXT mode" % token['name']
-
-        def endTagScript(self, token):
-            node = self.tree.openElements.pop()
-            assert node.name == "script"
-            self.parser.phase = self.parser.originalPhase
-            # The rest of this method is all stuff that only happens if
-            # document.write works
-
-        def endTagOther(self, token):
-            self.tree.openElements.pop()
-            self.parser.phase = self.parser.originalPhase
-
-        startTagHandler = _utils.MethodDispatcher([])
-        startTagHandler.default = startTagOther
-        endTagHandler = _utils.MethodDispatcher([
-            ("script", endTagScript)])
-        endTagHandler.default = endTagOther
-
-    class InTablePhase(Phase):
-        # http://www.whatwg.org/specs/web-apps/current-work/#in-table
-        __slots__ = tuple()
-
-        # helper methods
-        def clearStackToTableContext(self):
-            # "clear the stack back to a table context"
-            while self.tree.openElements[-1].name not in ("table", "html"):
-                # self.parser.parseError("unexpected-implied-end-tag-in-table",
-                #  {"name":  self.tree.openElements[-1].name})
-                self.tree.openElements.pop()
-            # When the current node is <html> it's an innerHTML case
-
-        # processing methods
-        def processEOF(self):
-            if self.tree.openElements[-1].name != "html":
-                self.parser.parseError("eof-in-table")
-            else:
-                assert self.parser.innerHTML
-            # Stop parsing
-
-        def processSpaceCharacters(self, token):
-            originalPhase = self.parser.phase
-            self.parser.phase = self.parser.phases["inTableText"]
-            self.parser.phase.originalPhase = originalPhase
-            self.parser.phase.processSpaceCharacters(token)
-
-        def processCharacters(self, token):
-            originalPhase = self.parser.phase
-            self.parser.phase = self.parser.phases["inTableText"]
-            self.parser.phase.originalPhase = originalPhase
-            self.parser.phase.processCharacters(token)
-
-        def insertText(self, token):
-            # If we get here there must be at least one non-whitespace character
-            # Do the table magic!
-            self.tree.insertFromTable = True
-            self.parser.phases["inBody"].processCharacters(token)
-            self.tree.insertFromTable = False
-
-        def startTagCaption(self, token):
-            self.clearStackToTableContext()
-            self.tree.activeFormattingElements.append(Marker)
-            self.tree.insertElement(token)
-            self.parser.phase = self.parser.phases["inCaption"]
-
-        def startTagColgroup(self, token):
-            self.clearStackToTableContext()
-            self.tree.insertElement(token)
-            self.parser.phase = self.parser.phases["inColumnGroup"]
-
-        def startTagCol(self, token):
-            self.startTagColgroup(impliedTagToken("colgroup", "StartTag"))
-            return token
-
-        def startTagRowGroup(self, token):
-            self.clearStackToTableContext()
-            self.tree.insertElement(token)
-            self.parser.phase = self.parser.phases["inTableBody"]
-
-        def startTagImplyTbody(self, token):
-            self.startTagRowGroup(impliedTagToken("tbody", "StartTag"))
-            return token
-
-        def startTagTable(self, token):
-            self.parser.parseError("unexpected-start-tag-implies-end-tag",
-                                   {"startName": "table", "endName": "table"})
-            self.parser.phase.processEndTag(impliedTagToken("table"))
-            if not self.parser.innerHTML:
-                return token
-
-        def startTagStyleScript(self, token):
-            return self.parser.phases["inHead"].processStartTag(token)
-
-        def startTagInput(self, token):
-            if ("type" in token["data"] and
-                    token["data"]["type"].translate(asciiUpper2Lower) == "hidden"):
-                self.parser.parseError("unexpected-hidden-input-in-table")
-                self.tree.insertElement(token)
-                # XXX associate with form
-                self.tree.openElements.pop()
-            else:
-                self.startTagOther(token)
-
-        def startTagForm(self, token):
-            self.parser.parseError("unexpected-form-in-table")
-            if self.tree.formPointer is None:
-                self.tree.insertElement(token)
-                self.tree.formPointer = self.tree.openElements[-1]
-                self.tree.openElements.pop()
-
-        def startTagOther(self, token):
-            self.parser.parseError("unexpected-start-tag-implies-table-voodoo", {"name": token["name"]})
-            # Do the table magic!
-            self.tree.insertFromTable = True
-            self.parser.phases["inBody"].processStartTag(token)
-            self.tree.insertFromTable = False
-
-        def endTagTable(self, token):
-            if self.tree.elementInScope("table", variant="table"):
-                self.tree.generateImpliedEndTags()
-                if self.tree.openElements[-1].name != "table":
-                    self.parser.parseError("end-tag-too-early-named",
-                                           {"gotName": "table",
-                                            "expectedName": self.tree.openElements[-1].name})
-                while self.tree.openElements[-1].name != "table":
-                    self.tree.openElements.pop()
-                self.tree.openElements.pop()
-                self.parser.resetInsertionMode()
-            else:
-                # innerHTML case
-                assert self.parser.innerHTML
-                self.parser.parseError()
-
-        def endTagIgnore(self, token):
-            self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
-
-        def endTagOther(self, token):
-            self.parser.parseError("unexpected-end-tag-implies-table-voodoo", {"name": token["name"]})
-            # Do the table magic!
-            self.tree.insertFromTable = True
-            self.parser.phases["inBody"].processEndTag(token)
-            self.tree.insertFromTable = False
-
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", Phase.startTagHtml),
-            ("caption", startTagCaption),
-            ("colgroup", startTagColgroup),
-            ("col", startTagCol),
-            (("tbody", "tfoot", "thead"), startTagRowGroup),
-            (("td", "th", "tr"), startTagImplyTbody),
-            ("table", startTagTable),
-            (("style", "script"), startTagStyleScript),
-            ("input", startTagInput),
-            ("form", startTagForm)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            ("table", endTagTable),
-            (("body", "caption", "col", "colgroup", "html", "tbody", "td",
-              "tfoot", "th", "thead", "tr"), endTagIgnore)
-        ])
-        endTagHandler.default = endTagOther
-
-    class InTableTextPhase(Phase):
-        __slots__ = ("originalPhase", "characterTokens")
-
-        def __init__(self, *args, **kwargs):
-            super(InTableTextPhase, self).__init__(*args, **kwargs)
-            self.originalPhase = None
-            self.characterTokens = []
-
-        def flushCharacters(self):
-            data = "".join([item["data"] for item in self.characterTokens])
-            if any([item not in spaceCharacters for item in data]):
-                token = {"type": tokenTypes["Characters"], "data": data}
-                self.parser.phases["inTable"].insertText(token)
-            elif data:
-                self.tree.insertText(data)
-            self.characterTokens = []
-
-        def processComment(self, token):
-            self.flushCharacters()
-            self.parser.phase = self.originalPhase
-            return token
-
-        def processEOF(self):
-            self.flushCharacters()
-            self.parser.phase = self.originalPhase
-            return True
-
-        def processCharacters(self, token):
-            if token["data"] == "\u0000":
-                return
-            self.characterTokens.append(token)
-
-        def processSpaceCharacters(self, token):
-            # pretty sure we should never reach here
-            self.characterTokens.append(token)
-    #        assert False
-
-        def processStartTag(self, token):
-            self.flushCharacters()
-            self.parser.phase = self.originalPhase
-            return token
-
-        def processEndTag(self, token):
-            self.flushCharacters()
-            self.parser.phase = self.originalPhase
-            return token
-
-    class InCaptionPhase(Phase):
-        # http://www.whatwg.org/specs/web-apps/current-work/#in-caption
-        __slots__ = tuple()
-
-        def ignoreEndTagCaption(self):
-            return not self.tree.elementInScope("caption", variant="table")
-
-        def processEOF(self):
-            self.parser.phases["inBody"].processEOF()
-
-        def processCharacters(self, token):
-            return self.parser.phases["inBody"].processCharacters(token)
-
-        def startTagTableElement(self, token):
-            self.parser.parseError()
-            # XXX Have to duplicate logic here to find out if the tag is ignored
-            ignoreEndTag = self.ignoreEndTagCaption()
-            self.parser.phase.processEndTag(impliedTagToken("caption"))
-            if not ignoreEndTag:
-                return token
-
-        def startTagOther(self, token):
-            return self.parser.phases["inBody"].processStartTag(token)
-
-        def endTagCaption(self, token):
-            if not self.ignoreEndTagCaption():
-                # AT this code is quite similar to endTagTable in "InTable"
-                self.tree.generateImpliedEndTags()
-                if self.tree.openElements[-1].name != "caption":
-                    self.parser.parseError("expected-one-end-tag-but-got-another",
-                                           {"gotName": "caption",
-                                            "expectedName": self.tree.openElements[-1].name})
-                while self.tree.openElements[-1].name != "caption":
-                    self.tree.openElements.pop()
-                self.tree.openElements.pop()
-                self.tree.clearActiveFormattingElements()
-                self.parser.phase = self.parser.phases["inTable"]
-            else:
-                # innerHTML case
-                assert self.parser.innerHTML
-                self.parser.parseError()
-
-        def endTagTable(self, token):
-            self.parser.parseError()
-            ignoreEndTag = self.ignoreEndTagCaption()
-            self.parser.phase.processEndTag(impliedTagToken("caption"))
-            if not ignoreEndTag:
-                return token
-
-        def endTagIgnore(self, token):
-            self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
-
-        def endTagOther(self, token):
-            return self.parser.phases["inBody"].processEndTag(token)
-
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", Phase.startTagHtml),
-            (("caption", "col", "colgroup", "tbody", "td", "tfoot", "th",
-              "thead", "tr"), startTagTableElement)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            ("caption", endTagCaption),
-            ("table", endTagTable),
-            (("body", "col", "colgroup", "html", "tbody", "td", "tfoot", "th",
-              "thead", "tr"), endTagIgnore)
-        ])
-        endTagHandler.default = endTagOther
-
-    class InColumnGroupPhase(Phase):
-        # http://www.whatwg.org/specs/web-apps/current-work/#in-column
-        __slots__ = tuple()
-
-        def ignoreEndTagColgroup(self):
-            return self.tree.openElements[-1].name == "html"
-
-        def processEOF(self):
-            if self.tree.openElements[-1].name == "html":
-                assert self.parser.innerHTML
-                return
-            else:
-                ignoreEndTag = self.ignoreEndTagColgroup()
-                self.endTagColgroup(impliedTagToken("colgroup"))
-                if not ignoreEndTag:
-                    return True
-
-        def processCharacters(self, token):
-            ignoreEndTag = self.ignoreEndTagColgroup()
-            self.endTagColgroup(impliedTagToken("colgroup"))
-            if not ignoreEndTag:
-                return token
-
-        def startTagCol(self, token):
-            self.tree.insertElement(token)
-            self.tree.openElements.pop()
-            token["selfClosingAcknowledged"] = True
-
-        def startTagOther(self, token):
-            ignoreEndTag = self.ignoreEndTagColgroup()
-            self.endTagColgroup(impliedTagToken("colgroup"))
-            if not ignoreEndTag:
-                return token
-
-        def endTagColgroup(self, token):
-            if self.ignoreEndTagColgroup():
-                # innerHTML case
-                assert self.parser.innerHTML
-                self.parser.parseError()
-            else:
-                self.tree.openElements.pop()
-                self.parser.phase = self.parser.phases["inTable"]
-
-        def endTagCol(self, token):
-            self.parser.parseError("no-end-tag", {"name": "col"})
-
-        def endTagOther(self, token):
-            ignoreEndTag = self.ignoreEndTagColgroup()
-            self.endTagColgroup(impliedTagToken("colgroup"))
-            if not ignoreEndTag:
-                return token
-
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", Phase.startTagHtml),
-            ("col", startTagCol)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            ("colgroup", endTagColgroup),
-            ("col", endTagCol)
-        ])
-        endTagHandler.default = endTagOther
-
-    class InTableBodyPhase(Phase):
-        # http://www.whatwg.org/specs/web-apps/current-work/#in-table0
-        __slots__ = tuple()
-
-        # helper methods
-        def clearStackToTableBodyContext(self):
-            while self.tree.openElements[-1].name not in ("tbody", "tfoot",
-                                                          "thead", "html"):
-                # self.parser.parseError("unexpected-implied-end-tag-in-table",
-                #  {"name": self.tree.openElements[-1].name})
-                self.tree.openElements.pop()
-            if self.tree.openElements[-1].name == "html":
-                assert self.parser.innerHTML
-
-        # the rest
-        def processEOF(self):
-            self.parser.phases["inTable"].processEOF()
-
-        def processSpaceCharacters(self, token):
-            return self.parser.phases["inTable"].processSpaceCharacters(token)
-
-        def processCharacters(self, token):
-            return self.parser.phases["inTable"].processCharacters(token)
-
-        def startTagTr(self, token):
-            self.clearStackToTableBodyContext()
-            self.tree.insertElement(token)
-            self.parser.phase = self.parser.phases["inRow"]
-
-        def startTagTableCell(self, token):
-            self.parser.parseError("unexpected-cell-in-table-body",
-                                   {"name": token["name"]})
-            self.startTagTr(impliedTagToken("tr", "StartTag"))
-            return token
-
-        def startTagTableOther(self, token):
-            # XXX AT Any ideas on how to share this with endTagTable?
-            if (self.tree.elementInScope("tbody", variant="table") or
-                self.tree.elementInScope("thead", variant="table") or
-                    self.tree.elementInScope("tfoot", variant="table")):
-                self.clearStackToTableBodyContext()
-                self.endTagTableRowGroup(
-                    impliedTagToken(self.tree.openElements[-1].name))
-                return token
-            else:
-                # innerHTML case
-                assert self.parser.innerHTML
-                self.parser.parseError()
-
-        def startTagOther(self, token):
-            return self.parser.phases["inTable"].processStartTag(token)
-
-        def endTagTableRowGroup(self, token):
-            if self.tree.elementInScope(token["name"], variant="table"):
-                self.clearStackToTableBodyContext()
-                self.tree.openElements.pop()
-                self.parser.phase = self.parser.phases["inTable"]
-            else:
-                self.parser.parseError("unexpected-end-tag-in-table-body",
-                                       {"name": token["name"]})
-
-        def endTagTable(self, token):
-            if (self.tree.elementInScope("tbody", variant="table") or
-                self.tree.elementInScope("thead", variant="table") or
-                    self.tree.elementInScope("tfoot", variant="table")):
-                self.clearStackToTableBodyContext()
-                self.endTagTableRowGroup(
-                    impliedTagToken(self.tree.openElements[-1].name))
-                return token
-            else:
-                # innerHTML case
-                assert self.parser.innerHTML
-                self.parser.parseError()
-
-        def endTagIgnore(self, token):
-            self.parser.parseError("unexpected-end-tag-in-table-body",
-                                   {"name": token["name"]})
-
-        def endTagOther(self, token):
-            return self.parser.phases["inTable"].processEndTag(token)
-
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", Phase.startTagHtml),
-            ("tr", startTagTr),
-            (("td", "th"), startTagTableCell),
-            (("caption", "col", "colgroup", "tbody", "tfoot", "thead"),
-             startTagTableOther)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            (("tbody", "tfoot", "thead"), endTagTableRowGroup),
-            ("table", endTagTable),
-            (("body", "caption", "col", "colgroup", "html", "td", "th",
-              "tr"), endTagIgnore)
-        ])
-        endTagHandler.default = endTagOther
-
-    class InRowPhase(Phase):
-        # http://www.whatwg.org/specs/web-apps/current-work/#in-row
-        __slots__ = tuple()
-
-        # helper methods (XXX unify this with other table helper methods)
-        def clearStackToTableRowContext(self):
-            while self.tree.openElements[-1].name not in ("tr", "html"):
-                self.parser.parseError("unexpected-implied-end-tag-in-table-row",
-                                       {"name": self.tree.openElements[-1].name})
-                self.tree.openElements.pop()
-
-        def ignoreEndTagTr(self):
-            return not self.tree.elementInScope("tr", variant="table")
-
-        # the rest
-        def processEOF(self):
-            self.parser.phases["inTable"].processEOF()
-
-        def processSpaceCharacters(self, token):
-            return self.parser.phases["inTable"].processSpaceCharacters(token)
-
-        def processCharacters(self, token):
-            return self.parser.phases["inTable"].processCharacters(token)
-
-        def startTagTableCell(self, token):
-            self.clearStackToTableRowContext()
-            self.tree.insertElement(token)
-            self.parser.phase = self.parser.phases["inCell"]
-            self.tree.activeFormattingElements.append(Marker)
-
-        def startTagTableOther(self, token):
-            ignoreEndTag = self.ignoreEndTagTr()
-            self.endTagTr(impliedTagToken("tr"))
-            # XXX how are we sure it's always ignored in the innerHTML case?
-            if not ignoreEndTag:
-                return token
-
-        def startTagOther(self, token):
-            return self.parser.phases["inTable"].processStartTag(token)
-
-        def endTagTr(self, token):
-            if not self.ignoreEndTagTr():
-                self.clearStackToTableRowContext()
-                self.tree.openElements.pop()
-                self.parser.phase = self.parser.phases["inTableBody"]
-            else:
-                # innerHTML case
-                assert self.parser.innerHTML
-                self.parser.parseError()
-
-        def endTagTable(self, token):
-            ignoreEndTag = self.ignoreEndTagTr()
-            self.endTagTr(impliedTagToken("tr"))
-            # Reprocess the current tag if the tr end tag was not ignored
-            # XXX how are we sure it's always ignored in the innerHTML case?
-            if not ignoreEndTag:
-                return token
-
-        def endTagTableRowGroup(self, token):
-            if self.tree.elementInScope(token["name"], variant="table"):
-                self.endTagTr(impliedTagToken("tr"))
-                return token
-            else:
-                self.parser.parseError()
-
-        def endTagIgnore(self, token):
-            self.parser.parseError("unexpected-end-tag-in-table-row",
-                                   {"name": token["name"]})
-
-        def endTagOther(self, token):
-            return self.parser.phases["inTable"].processEndTag(token)
-
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", Phase.startTagHtml),
-            (("td", "th"), startTagTableCell),
-            (("caption", "col", "colgroup", "tbody", "tfoot", "thead",
-              "tr"), startTagTableOther)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            ("tr", endTagTr),
-            ("table", endTagTable),
-            (("tbody", "tfoot", "thead"), endTagTableRowGroup),
-            (("body", "caption", "col", "colgroup", "html", "td", "th"),
-             endTagIgnore)
-        ])
-        endTagHandler.default = endTagOther
-
-    class InCellPhase(Phase):
-        # http://www.whatwg.org/specs/web-apps/current-work/#in-cell
-        __slots__ = tuple()
-
-        # helper
-        def closeCell(self):
-            if self.tree.elementInScope("td", variant="table"):
-                self.endTagTableCell(impliedTagToken("td"))
-            elif self.tree.elementInScope("th", variant="table"):
-                self.endTagTableCell(impliedTagToken("th"))
-
-        # the rest
-        def processEOF(self):
-            self.parser.phases["inBody"].processEOF()
-
-        def processCharacters(self, token):
-            return self.parser.phases["inBody"].processCharacters(token)
-
-        def startTagTableOther(self, token):
-            if (self.tree.elementInScope("td", variant="table") or
-                    self.tree.elementInScope("th", variant="table")):
-                self.closeCell()
-                return token
-            else:
-                # innerHTML case
-                assert self.parser.innerHTML
-                self.parser.parseError()
-
-        def startTagOther(self, token):
-            return self.parser.phases["inBody"].processStartTag(token)
-
-        def endTagTableCell(self, token):
-            if self.tree.elementInScope(token["name"], variant="table"):
-                self.tree.generateImpliedEndTags(token["name"])
-                if self.tree.openElements[-1].name != token["name"]:
-                    self.parser.parseError("unexpected-cell-end-tag",
-                                           {"name": token["name"]})
-                    while True:
-                        node = self.tree.openElements.pop()
-                        if node.name == token["name"]:
-                            break
-                else:
-                    self.tree.openElements.pop()
-                self.tree.clearActiveFormattingElements()
-                self.parser.phase = self.parser.phases["inRow"]
-            else:
-                self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
-
-        def endTagIgnore(self, token):
-            self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
-
-        def endTagImply(self, token):
-            if self.tree.elementInScope(token["name"], variant="table"):
-                self.closeCell()
-                return token
-            else:
-                # sometimes innerHTML case
-                self.parser.parseError()
-
-        def endTagOther(self, token):
-            return self.parser.phases["inBody"].processEndTag(token)
-
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", Phase.startTagHtml),
-            (("caption", "col", "colgroup", "tbody", "td", "tfoot", "th",
-              "thead", "tr"), startTagTableOther)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            (("td", "th"), endTagTableCell),
-            (("body", "caption", "col", "colgroup", "html"), endTagIgnore),
-            (("table", "tbody", "tfoot", "thead", "tr"), endTagImply)
-        ])
-        endTagHandler.default = endTagOther
-
-    class InSelectPhase(Phase):
-        __slots__ = tuple()
-
-        # http://www.whatwg.org/specs/web-apps/current-work/#in-select
-        def processEOF(self):
-            if self.tree.openElements[-1].name != "html":
-                self.parser.parseError("eof-in-select")
-            else:
-                assert self.parser.innerHTML
-
-        def processCharacters(self, token):
-            if token["data"] == "\u0000":
-                return
-            self.tree.insertText(token["data"])
-
-        def startTagOption(self, token):
-            # We need to imply </option> if <option> is the current node.
-            if self.tree.openElements[-1].name == "option":
-                self.tree.openElements.pop()
-            self.tree.insertElement(token)
-
-        def startTagOptgroup(self, token):
-            if self.tree.openElements[-1].name == "option":
-                self.tree.openElements.pop()
-            if self.tree.openElements[-1].name == "optgroup":
-                self.tree.openElements.pop()
-            self.tree.insertElement(token)
-
-        def startTagSelect(self, token):
-            self.parser.parseError("unexpected-select-in-select")
-            self.endTagSelect(impliedTagToken("select"))
-
-        def startTagInput(self, token):
-            self.parser.parseError("unexpected-input-in-select")
-            if self.tree.elementInScope("select", variant="select"):
-                self.endTagSelect(impliedTagToken("select"))
-                return token
-            else:
-                assert self.parser.innerHTML
-
-        def startTagScript(self, token):
-            return self.parser.phases["inHead"].processStartTag(token)
-
-        def startTagOther(self, token):
-            self.parser.parseError("unexpected-start-tag-in-select",
-                                   {"name": token["name"]})
-
-        def endTagOption(self, token):
-            if self.tree.openElements[-1].name == "option":
-                self.tree.openElements.pop()
-            else:
-                self.parser.parseError("unexpected-end-tag-in-select",
-                                       {"name": "option"})
-
-        def endTagOptgroup(self, token):
-            # </optgroup> implicitly closes <option>
-            if (self.tree.openElements[-1].name == "option" and
-                    self.tree.openElements[-2].name == "optgroup"):
-                self.tree.openElements.pop()
-            # It also closes </optgroup>
-            if self.tree.openElements[-1].name == "optgroup":
-                self.tree.openElements.pop()
-            # But nothing else
-            else:
-                self.parser.parseError("unexpected-end-tag-in-select",
-                                       {"name": "optgroup"})
-
-        def endTagSelect(self, token):
-            if self.tree.elementInScope("select", variant="select"):
-                node = self.tree.openElements.pop()
-                while node.name != "select":
-                    node = self.tree.openElements.pop()
-                self.parser.resetInsertionMode()
-            else:
-                # innerHTML case
-                assert self.parser.innerHTML
-                self.parser.parseError()
-
-        def endTagOther(self, token):
-            self.parser.parseError("unexpected-end-tag-in-select",
-                                   {"name": token["name"]})
-
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", Phase.startTagHtml),
-            ("option", startTagOption),
-            ("optgroup", startTagOptgroup),
-            ("select", startTagSelect),
-            (("input", "keygen", "textarea"), startTagInput),
-            ("script", startTagScript)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            ("option", endTagOption),
-            ("optgroup", endTagOptgroup),
-            ("select", endTagSelect)
-        ])
-        endTagHandler.default = endTagOther
-
-    class InSelectInTablePhase(Phase):
-        __slots__ = tuple()
-
-        def processEOF(self):
-            self.parser.phases["inSelect"].processEOF()
-
-        def processCharacters(self, token):
-            return self.parser.phases["inSelect"].processCharacters(token)
-
-        def startTagTable(self, token):
-            self.parser.parseError("unexpected-table-element-start-tag-in-select-in-table", {"name": token["name"]})
-            self.endTagOther(impliedTagToken("select"))
-            return token
-
-        def startTagOther(self, token):
-            return self.parser.phases["inSelect"].processStartTag(token)
-
-        def endTagTable(self, token):
-            self.parser.parseError("unexpected-table-element-end-tag-in-select-in-table", {"name": token["name"]})
-            if self.tree.elementInScope(token["name"], variant="table"):
-                self.endTagOther(impliedTagToken("select"))
-                return token
-
-        def endTagOther(self, token):
-            return self.parser.phases["inSelect"].processEndTag(token)
-
-        startTagHandler = _utils.MethodDispatcher([
-            (("caption", "table", "tbody", "tfoot", "thead", "tr", "td", "th"),
-             startTagTable)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            (("caption", "table", "tbody", "tfoot", "thead", "tr", "td", "th"),
-             endTagTable)
-        ])
-        endTagHandler.default = endTagOther
-
-    class InForeignContentPhase(Phase):
-        __slots__ = tuple()
-
-        breakoutElements = frozenset(["b", "big", "blockquote", "body", "br",
-                                      "center", "code", "dd", "div", "dl", "dt",
-                                      "em", "embed", "h1", "h2", "h3",
-                                      "h4", "h5", "h6", "head", "hr", "i", "img",
-                                      "li", "listing", "menu", "meta", "nobr",
-                                      "ol", "p", "pre", "ruby", "s", "small",
-                                      "span", "strong", "strike", "sub", "sup",
-                                      "table", "tt", "u", "ul", "var"])
-
-        def adjustSVGTagNames(self, token):
-            replacements = {"altglyph": "altGlyph",
-                            "altglyphdef": "altGlyphDef",
-                            "altglyphitem": "altGlyphItem",
-                            "animatecolor": "animateColor",
-                            "animatemotion": "animateMotion",
-                            "animatetransform": "animateTransform",
-                            "clippath": "clipPath",
-                            "feblend": "feBlend",
-                            "fecolormatrix": "feColorMatrix",
-                            "fecomponenttransfer": "feComponentTransfer",
-                            "fecomposite": "feComposite",
-                            "feconvolvematrix": "feConvolveMatrix",
-                            "fediffuselighting": "feDiffuseLighting",
-                            "fedisplacementmap": "feDisplacementMap",
-                            "fedistantlight": "feDistantLight",
-                            "feflood": "feFlood",
-                            "fefunca": "feFuncA",
-                            "fefuncb": "feFuncB",
-                            "fefuncg": "feFuncG",
-                            "fefuncr": "feFuncR",
-                            "fegaussianblur": "feGaussianBlur",
-                            "feimage": "feImage",
-                            "femerge": "feMerge",
-                            "femergenode": "feMergeNode",
-                            "femorphology": "feMorphology",
-                            "feoffset": "feOffset",
-                            "fepointlight": "fePointLight",
-                            "fespecularlighting": "feSpecularLighting",
-                            "fespotlight": "feSpotLight",
-                            "fetile": "feTile",
-                            "feturbulence": "feTurbulence",
-                            "foreignobject": "foreignObject",
-                            "glyphref": "glyphRef",
-                            "lineargradient": "linearGradient",
-                            "radialgradient": "radialGradient",
-                            "textpath": "textPath"}
-
-            if token["name"] in replacements:
-                token["name"] = replacements[token["name"]]
-
-        def processCharacters(self, token):
-            if token["data"] == "\u0000":
-                token["data"] = "\uFFFD"
-            elif (self.parser.framesetOK and
-                  any(char not in spaceCharacters for char in token["data"])):
-                self.parser.framesetOK = False
-            Phase.processCharacters(self, token)
-
-        def processStartTag(self, token):
-            currentNode = self.tree.openElements[-1]
-            if (token["name"] in self.breakoutElements or
-                (token["name"] == "font" and
-                 set(token["data"].keys()) & {"color", "face", "size"})):
-                self.parser.parseError("unexpected-html-element-in-foreign-content",
-                                       {"name": token["name"]})
-                while (self.tree.openElements[-1].namespace !=
-                       self.tree.defaultNamespace and
-                       not self.parser.isHTMLIntegrationPoint(self.tree.openElements[-1]) and
-                       not self.parser.isMathMLTextIntegrationPoint(self.tree.openElements[-1])):
-                    self.tree.openElements.pop()
-                return token
-
-            else:
-                if currentNode.namespace == namespaces["mathml"]:
-                    self.parser.adjustMathMLAttributes(token)
-                elif currentNode.namespace == namespaces["svg"]:
-                    self.adjustSVGTagNames(token)
-                    self.parser.adjustSVGAttributes(token)
-                self.parser.adjustForeignAttributes(token)
-                token["namespace"] = currentNode.namespace
-                self.tree.insertElement(token)
-                if token["selfClosing"]:
-                    self.tree.openElements.pop()
-                    token["selfClosingAcknowledged"] = True
-
-        def processEndTag(self, token):
-            nodeIndex = len(self.tree.openElements) - 1
-            node = self.tree.openElements[-1]
-            if node.name.translate(asciiUpper2Lower) != token["name"]:
-                self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
-
-            while True:
-                if node.name.translate(asciiUpper2Lower) == token["name"]:
-                    # XXX this isn't in the spec but it seems necessary
-                    if self.parser.phase == self.parser.phases["inTableText"]:
-                        self.parser.phase.flushCharacters()
-                        self.parser.phase = self.parser.phase.originalPhase
-                    while self.tree.openElements.pop() != node:
-                        assert self.tree.openElements
-                    new_token = None
-                    break
-                nodeIndex -= 1
-
-                node = self.tree.openElements[nodeIndex]
-                if node.namespace != self.tree.defaultNamespace:
-                    continue
-                else:
-                    new_token = self.parser.phase.processEndTag(token)
-                    break
-            return new_token
-
-    class AfterBodyPhase(Phase):
-        __slots__ = tuple()
-
-        def processEOF(self):
-            # Stop parsing
-            pass
-
-        def processComment(self, token):
-            # This is needed because data is to be appended to the <html> element
-            # here and not to whatever is currently open.
-            self.tree.insertComment(token, self.tree.openElements[0])
-
-        def processCharacters(self, token):
-            self.parser.parseError("unexpected-char-after-body")
-            self.parser.phase = self.parser.phases["inBody"]
-            return token
-
-        def startTagHtml(self, token):
-            return self.parser.phases["inBody"].processStartTag(token)
-
-        def startTagOther(self, token):
-            self.parser.parseError("unexpected-start-tag-after-body",
-                                   {"name": token["name"]})
-            self.parser.phase = self.parser.phases["inBody"]
-            return token
-
-        def endTagHtml(self, name):
-            if self.parser.innerHTML:
-                self.parser.parseError("unexpected-end-tag-after-body-innerhtml")
-            else:
-                self.parser.phase = self.parser.phases["afterAfterBody"]
-
-        def endTagOther(self, token):
-            self.parser.parseError("unexpected-end-tag-after-body",
-                                   {"name": token["name"]})
-            self.parser.phase = self.parser.phases["inBody"]
-            return token
-
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", startTagHtml)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([("html", endTagHtml)])
-        endTagHandler.default = endTagOther
-
-    class InFramesetPhase(Phase):
-        # http://www.whatwg.org/specs/web-apps/current-work/#in-frameset
-        __slots__ = tuple()
-
-        def processEOF(self):
-            if self.tree.openElements[-1].name != "html":
-                self.parser.parseError("eof-in-frameset")
-            else:
-                assert self.parser.innerHTML
-
-        def processCharacters(self, token):
-            self.parser.parseError("unexpected-char-in-frameset")
-
-        def startTagFrameset(self, token):
-            self.tree.insertElement(token)
-
-        def startTagFrame(self, token):
-            self.tree.insertElement(token)
-            self.tree.openElements.pop()
-
-        def startTagNoframes(self, token):
-            return self.parser.phases["inBody"].processStartTag(token)
-
-        def startTagOther(self, token):
-            self.parser.parseError("unexpected-start-tag-in-frameset",
-                                   {"name": token["name"]})
-
-        def endTagFrameset(self, token):
-            if self.tree.openElements[-1].name == "html":
-                # innerHTML case
-                self.parser.parseError("unexpected-frameset-in-frameset-innerhtml")
-            else:
-                self.tree.openElements.pop()
-            if (not self.parser.innerHTML and
-                    self.tree.openElements[-1].name != "frameset"):
-                # If we're not in innerHTML mode and the current node is not a
-                # "frameset" element (anymore) then switch.
-                self.parser.phase = self.parser.phases["afterFrameset"]
-
-        def endTagOther(self, token):
-            self.parser.parseError("unexpected-end-tag-in-frameset",
-                                   {"name": token["name"]})
-
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", Phase.startTagHtml),
-            ("frameset", startTagFrameset),
-            ("frame", startTagFrame),
-            ("noframes", startTagNoframes)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            ("frameset", endTagFrameset)
-        ])
-        endTagHandler.default = endTagOther
-
-    class AfterFramesetPhase(Phase):
-        # http://www.whatwg.org/specs/web-apps/current-work/#after3
-        __slots__ = tuple()
-
-        def processEOF(self):
-            # Stop parsing
-            pass
-
-        def processCharacters(self, token):
-            self.parser.parseError("unexpected-char-after-frameset")
-
-        def startTagNoframes(self, token):
-            return self.parser.phases["inHead"].processStartTag(token)
-
-        def startTagOther(self, token):
-            self.parser.parseError("unexpected-start-tag-after-frameset",
-                                   {"name": token["name"]})
-
-        def endTagHtml(self, token):
-            self.parser.phase = self.parser.phases["afterAfterFrameset"]
-
-        def endTagOther(self, token):
-            self.parser.parseError("unexpected-end-tag-after-frameset",
-                                   {"name": token["name"]})
-
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", Phase.startTagHtml),
-            ("noframes", startTagNoframes)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            ("html", endTagHtml)
-        ])
-        endTagHandler.default = endTagOther
-
-    class AfterAfterBodyPhase(Phase):
-        __slots__ = tuple()
-
-        def processEOF(self):
-            pass
-
-        def processComment(self, token):
-            self.tree.insertComment(token, self.tree.document)
-
-        def processSpaceCharacters(self, token):
-            return self.parser.phases["inBody"].processSpaceCharacters(token)
-
-        def processCharacters(self, token):
-            self.parser.parseError("expected-eof-but-got-char")
-            self.parser.phase = self.parser.phases["inBody"]
-            return token
-
-        def startTagHtml(self, token):
-            return self.parser.phases["inBody"].processStartTag(token)
-
-        def startTagOther(self, token):
-            self.parser.parseError("expected-eof-but-got-start-tag",
-                                   {"name": token["name"]})
-            self.parser.phase = self.parser.phases["inBody"]
-            return token
-
-        def processEndTag(self, token):
-            self.parser.parseError("expected-eof-but-got-end-tag",
-                                   {"name": token["name"]})
-            self.parser.phase = self.parser.phases["inBody"]
-            return token
-
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", startTagHtml)
-        ])
-        startTagHandler.default = startTagOther
-
-    class AfterAfterFramesetPhase(Phase):
-        __slots__ = tuple()
-
-        def processEOF(self):
-            pass
-
-        def processComment(self, token):
-            self.tree.insertComment(token, self.tree.document)
-
-        def processSpaceCharacters(self, token):
-            return self.parser.phases["inBody"].processSpaceCharacters(token)
-
-        def processCharacters(self, token):
-            self.parser.parseError("expected-eof-but-got-char")
-
-        def startTagHtml(self, token):
-            return self.parser.phases["inBody"].processStartTag(token)
-
-        def startTagNoFrames(self, token):
-            return self.parser.phases["inHead"].processStartTag(token)
-
-        def startTagOther(self, token):
-            self.parser.parseError("expected-eof-but-got-start-tag",
-                                   {"name": token["name"]})
-
-        def processEndTag(self, token):
-            self.parser.parseError("expected-eof-but-got-end-tag",
-                                   {"name": token["name"]})
-
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", startTagHtml),
-            ("noframes", startTagNoFrames)
-        ])
-        startTagHandler.default = startTagOther
-
-    # pylint:enable=unused-argument
-
-    return {
-        "initial": InitialPhase,
-        "beforeHtml": BeforeHtmlPhase,
-        "beforeHead": BeforeHeadPhase,
-        "inHead": InHeadPhase,
-        "inHeadNoscript": InHeadNoscriptPhase,
-        "afterHead": AfterHeadPhase,
-        "inBody": InBodyPhase,
-        "text": TextPhase,
-        "inTable": InTablePhase,
-        "inTableText": InTableTextPhase,
-        "inCaption": InCaptionPhase,
-        "inColumnGroup": InColumnGroupPhase,
-        "inTableBody": InTableBodyPhase,
-        "inRow": InRowPhase,
-        "inCell": InCellPhase,
-        "inSelect": InSelectPhase,
-        "inSelectInTable": InSelectInTablePhase,
-        "inForeignContent": InForeignContentPhase,
-        "afterBody": AfterBodyPhase,
-        "inFrameset": InFramesetPhase,
-        "afterFrameset": AfterFramesetPhase,
-        "afterAfterBody": AfterAfterBodyPhase,
-        "afterAfterFrameset": AfterAfterFramesetPhase,
-        # XXX after after frameset
-    }
-
-
-def adjust_attributes(token, replacements):
-    needs_adjustment = viewkeys(token['data']) & viewkeys(replacements)
-    if needs_adjustment:
-        token['data'] = type(token['data'])((replacements.get(k, k), v)
-                                            for k, v in token['data'].items())
-
-
-def impliedTagToken(name, type="EndTag", attributes=None,
-                    selfClosing=False):
-    if attributes is None:
-        attributes = {}
-    return {"type": tokenTypes[type], "name": name, "data": attributes,
-            "selfClosing": selfClosing}
-
-
-class ParseError(Exception):
-    """Error in parsed document"""
-    pass
diff --git a/lib/bleach/_vendor/html5lib/serializer.py b/lib/bleach/_vendor/html5lib/serializer.py
deleted file mode 100644
index 5666f49a..00000000
--- a/lib/bleach/_vendor/html5lib/serializer.py
+++ /dev/null
@@ -1,409 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-from bleach.six_shim import text_type
-
-import re
-
-from codecs import register_error, xmlcharrefreplace_errors
-
-from .constants import voidElements, booleanAttributes, spaceCharacters
-from .constants import rcdataElements, entities, xmlEntities
-from . import treewalkers, _utils
-from xml.sax.saxutils import escape
-
-_quoteAttributeSpecChars = "".join(spaceCharacters) + "\"'=<>`"
-_quoteAttributeSpec = re.compile("[" + _quoteAttributeSpecChars + "]")
-_quoteAttributeLegacy = re.compile("[" + _quoteAttributeSpecChars +
-                                   "\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n"
-                                   "\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15"
-                                   "\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
-                                   "\x20\x2f\x60\xa0\u1680\u180e\u180f\u2000"
-                                   "\u2001\u2002\u2003\u2004\u2005\u2006\u2007"
-                                   "\u2008\u2009\u200a\u2028\u2029\u202f\u205f"
-                                   "\u3000]")
-
-
-_encode_entity_map = {}
-_is_ucs4 = len("\U0010FFFF") == 1
-for k, v in list(entities.items()):
-    # skip multi-character entities
-    if ((_is_ucs4 and len(v) > 1) or
-            (not _is_ucs4 and len(v) > 2)):
-        continue
-    if v != "&":
-        if len(v) == 2:
-            v = _utils.surrogatePairToCodepoint(v)
-        else:
-            v = ord(v)
-        if v not in _encode_entity_map or k.islower():
-            # prefer &lt; over &LT; and similarly for &amp;, &gt;, etc.
-            _encode_entity_map[v] = k
-
-
-def htmlentityreplace_errors(exc):
-    if isinstance(exc, (UnicodeEncodeError, UnicodeTranslateError)):
-        res = []
-        codepoints = []
-        skip = False
-        for i, c in enumerate(exc.object[exc.start:exc.end]):
-            if skip:
-                skip = False
-                continue
-            index = i + exc.start
-            if _utils.isSurrogatePair(exc.object[index:min([exc.end, index + 2])]):
-                codepoint = _utils.surrogatePairToCodepoint(exc.object[index:index + 2])
-                skip = True
-            else:
-                codepoint = ord(c)
-            codepoints.append(codepoint)
-        for cp in codepoints:
-            e = _encode_entity_map.get(cp)
-            if e:
-                res.append("&")
-                res.append(e)
-                if not e.endswith(";"):
-                    res.append(";")
-            else:
-                res.append("&#x%s;" % (hex(cp)[2:]))
-        return ("".join(res), exc.end)
-    else:
-        return xmlcharrefreplace_errors(exc)
-
-
-register_error("htmlentityreplace", htmlentityreplace_errors)
-
-
-def serialize(input, tree="etree", encoding=None, **serializer_opts):
-    """Serializes the input token stream using the specified treewalker
-
-    :arg input: the token stream to serialize
-
-    :arg tree: the treewalker to use
-
-    :arg encoding: the encoding to use
-
-    :arg serializer_opts: any options to pass to the
-        :py:class:`html5lib.serializer.HTMLSerializer` that gets created
-
-    :returns: the tree serialized as a string
-
-    Example:
-
-    >>> from html5lib.html5parser import parse
-    >>> from html5lib.serializer import serialize
-    >>> token_stream = parse('<html><body><p>Hi!</p></body></html>')
-    >>> serialize(token_stream, omit_optional_tags=False)
-    '<html><head></head><body><p>Hi!</p></body></html>'
-
-    """
-    # XXX: Should we cache this?
-    walker = treewalkers.getTreeWalker(tree)
-    s = HTMLSerializer(**serializer_opts)
-    return s.render(walker(input), encoding)
-
-
-class HTMLSerializer(object):
-
-    # attribute quoting options
-    quote_attr_values = "legacy"  # be secure by default
-    quote_char = '"'
-    use_best_quote_char = True
-
-    # tag syntax options
-    omit_optional_tags = True
-    minimize_boolean_attributes = True
-    use_trailing_solidus = False
-    space_before_trailing_solidus = True
-
-    # escaping options
-    escape_lt_in_attrs = False
-    escape_rcdata = False
-    resolve_entities = True
-
-    # miscellaneous options
-    alphabetical_attributes = False
-    inject_meta_charset = True
-    strip_whitespace = False
-    sanitize = False
-
-    options = ("quote_attr_values", "quote_char", "use_best_quote_char",
-               "omit_optional_tags", "minimize_boolean_attributes",
-               "use_trailing_solidus", "space_before_trailing_solidus",
-               "escape_lt_in_attrs", "escape_rcdata", "resolve_entities",
-               "alphabetical_attributes", "inject_meta_charset",
-               "strip_whitespace", "sanitize")
-
-    def __init__(self, **kwargs):
-        """Initialize HTMLSerializer
-
-        :arg inject_meta_charset: Whether or not to inject the meta charset.
-
-            Defaults to ``True``.
-
-        :arg quote_attr_values: Whether to quote attribute values that don't
-            require quoting per legacy browser behavior (``"legacy"``), when
-            required by the standard (``"spec"``), or always (``"always"``).
-
-            Defaults to ``"legacy"``.
-
-        :arg quote_char: Use given quote character for attribute quoting.
-
-            Defaults to ``"`` which will use double quotes unless attribute
-            value contains a double quote, in which case single quotes are
-            used.
-
-        :arg escape_lt_in_attrs: Whether or not to escape ``<`` in attribute
-            values.
-
-            Defaults to ``False``.
-
-        :arg escape_rcdata: Whether to escape characters that need to be
-            escaped within normal elements within rcdata elements such as
-            style.
-
-            Defaults to ``False``.
-
-        :arg resolve_entities: Whether to resolve named character entities that
-            appear in the source tree. The XML predefined entities &lt; &gt;
-            &amp; &quot; &apos; are unaffected by this setting.
-
-            Defaults to ``True``.
-
-        :arg strip_whitespace: Whether to remove semantically meaningless
-            whitespace. (This compresses all whitespace to a single space
-            except within ``pre``.)
-
-            Defaults to ``False``.
-
-        :arg minimize_boolean_attributes: Shortens boolean attributes to give
-            just the attribute value, for example::
-
-              <input disabled="disabled">
-
-            becomes::
-
-              <input disabled>
-
-            Defaults to ``True``.
-
-        :arg use_trailing_solidus: Includes a close-tag slash at the end of the
-            start tag of void elements (empty elements whose end tag is
-            forbidden). E.g. ``<hr/>``.
-
-            Defaults to ``False``.
-
-        :arg space_before_trailing_solidus: Places a space immediately before
-            the closing slash in a tag using a trailing solidus. E.g.
-            ``<hr />``. Requires ``use_trailing_solidus=True``.
-
-            Defaults to ``True``.
-
-        :arg sanitize: Strip all unsafe or unknown constructs from output.
-            See :py:class:`html5lib.filters.sanitizer.Filter`.
-
-            Defaults to ``False``.
-
-        :arg omit_optional_tags: Omit start/end tags that are optional.
-
-            Defaults to ``True``.
-
-        :arg alphabetical_attributes: Reorder attributes to be in alphabetical order.
-
-            Defaults to ``False``.
-
-        """
-        unexpected_args = frozenset(kwargs) - frozenset(self.options)
-        if len(unexpected_args) > 0:
-            raise TypeError("__init__() got an unexpected keyword argument '%s'" % next(iter(unexpected_args)))
-        if 'quote_char' in kwargs:
-            self.use_best_quote_char = False
-        for attr in self.options:
-            setattr(self, attr, kwargs.get(attr, getattr(self, attr)))
-        self.errors = []
-        self.strict = False
-
-    def encode(self, string):
-        assert(isinstance(string, text_type))
-        if self.encoding:
-            return string.encode(self.encoding, "htmlentityreplace")
-        else:
-            return string
-
-    def encodeStrict(self, string):
-        assert(isinstance(string, text_type))
-        if self.encoding:
-            return string.encode(self.encoding, "strict")
-        else:
-            return string
-
-    def serialize(self, treewalker, encoding=None):
-        # pylint:disable=too-many-nested-blocks
-        self.encoding = encoding
-        in_cdata = False
-        self.errors = []
-
-        if encoding and self.inject_meta_charset:
-            from .filters.inject_meta_charset import Filter
-            treewalker = Filter(treewalker, encoding)
-        # Alphabetical attributes is here under the assumption that none of
-        # the later filters add or change order of attributes; it needs to be
-        # before the sanitizer so escaped elements come out correctly
-        if self.alphabetical_attributes:
-            from .filters.alphabeticalattributes import Filter
-            treewalker = Filter(treewalker)
-        # WhitespaceFilter should be used before OptionalTagFilter
-        # for maximum efficiently of this latter filter
-        if self.strip_whitespace:
-            from .filters.whitespace import Filter
-            treewalker = Filter(treewalker)
-        if self.sanitize:
-            from .filters.sanitizer import Filter
-            treewalker = Filter(treewalker)
-        if self.omit_optional_tags:
-            from .filters.optionaltags import Filter
-            treewalker = Filter(treewalker)
-
-        for token in treewalker:
-            type = token["type"]
-            if type == "Doctype":
-                doctype = "<!DOCTYPE %s" % token["name"]
-
-                if token["publicId"]:
-                    doctype += ' PUBLIC "%s"' % token["publicId"]
-                elif token["systemId"]:
-                    doctype += " SYSTEM"
-                if token["systemId"]:
-                    if token["systemId"].find('"') >= 0:
-                        if token["systemId"].find("'") >= 0:
-                            self.serializeError("System identifier contains both single and double quote characters")
-                        quote_char = "'"
-                    else:
-                        quote_char = '"'
-                    doctype += " %s%s%s" % (quote_char, token["systemId"], quote_char)
-
-                doctype += ">"
-                yield self.encodeStrict(doctype)
-
-            elif type in ("Characters", "SpaceCharacters"):
-                if type == "SpaceCharacters" or in_cdata:
-                    if in_cdata and token["data"].find("</") >= 0:
-                        self.serializeError("Unexpected </ in CDATA")
-                    yield self.encode(token["data"])
-                else:
-                    yield self.encode(escape(token["data"]))
-
-            elif type in ("StartTag", "EmptyTag"):
-                name = token["name"]
-                yield self.encodeStrict("<%s" % name)
-                if name in rcdataElements and not self.escape_rcdata:
-                    in_cdata = True
-                elif in_cdata:
-                    self.serializeError("Unexpected child element of a CDATA element")
-                for (_, attr_name), attr_value in token["data"].items():
-                    # TODO: Add namespace support here
-                    k = attr_name
-                    v = attr_value
-                    yield self.encodeStrict(' ')
-
-                    yield self.encodeStrict(k)
-                    if not self.minimize_boolean_attributes or \
-                        (k not in booleanAttributes.get(name, tuple()) and
-                         k not in booleanAttributes.get("", tuple())):
-                        yield self.encodeStrict("=")
-                        if self.quote_attr_values == "always" or len(v) == 0:
-                            quote_attr = True
-                        elif self.quote_attr_values == "spec":
-                            quote_attr = _quoteAttributeSpec.search(v) is not None
-                        elif self.quote_attr_values == "legacy":
-                            quote_attr = _quoteAttributeLegacy.search(v) is not None
-                        else:
-                            raise ValueError("quote_attr_values must be one of: "
-                                             "'always', 'spec', or 'legacy'")
-                        v = v.replace("&", "&amp;")
-                        if self.escape_lt_in_attrs:
-                            v = v.replace("<", "&lt;")
-                        if quote_attr:
-                            quote_char = self.quote_char
-                            if self.use_best_quote_char:
-                                if "'" in v and '"' not in v:
-                                    quote_char = '"'
-                                elif '"' in v and "'" not in v:
-                                    quote_char = "'"
-                            if quote_char == "'":
-                                v = v.replace("'", "&#39;")
-                            else:
-                                v = v.replace('"', "&quot;")
-                            yield self.encodeStrict(quote_char)
-                            yield self.encode(v)
-                            yield self.encodeStrict(quote_char)
-                        else:
-                            yield self.encode(v)
-                if name in voidElements and self.use_trailing_solidus:
-                    if self.space_before_trailing_solidus:
-                        yield self.encodeStrict(" /")
-                    else:
-                        yield self.encodeStrict("/")
-                yield self.encode(">")
-
-            elif type == "EndTag":
-                name = token["name"]
-                if name in rcdataElements:
-                    in_cdata = False
-                elif in_cdata:
-                    self.serializeError("Unexpected child element of a CDATA element")
-                yield self.encodeStrict("</%s>" % name)
-
-            elif type == "Comment":
-                data = token["data"]
-                if data.find("--") >= 0:
-                    self.serializeError("Comment contains --")
-                yield self.encodeStrict("<!--%s-->" % token["data"])
-
-            elif type == "Entity":
-                name = token["name"]
-                key = name + ";"
-                if key not in entities:
-                    self.serializeError("Entity %s not recognized" % name)
-                if self.resolve_entities and key not in xmlEntities:
-                    data = entities[key]
-                else:
-                    data = "&%s;" % name
-                yield self.encodeStrict(data)
-
-            else:
-                self.serializeError(token["data"])
-
-    def render(self, treewalker, encoding=None):
-        """Serializes the stream from the treewalker into a string
-
-        :arg treewalker: the treewalker to serialize
-
-        :arg encoding: the string encoding to use
-
-        :returns: the serialized tree
-
-        Example:
-
-        >>> from html5lib import parse, getTreeWalker
-        >>> from html5lib.serializer import HTMLSerializer
-        >>> token_stream = parse('<html><body>Hi!</body></html>')
-        >>> walker = getTreeWalker('etree')
-        >>> serializer = HTMLSerializer(omit_optional_tags=False)
-        >>> serializer.render(walker(token_stream))
-        '<html><head></head><body>Hi!</body></html>'
-
-        """
-        if encoding:
-            return b"".join(list(self.serialize(treewalker, encoding)))
-        else:
-            return "".join(list(self.serialize(treewalker)))
-
-    def serializeError(self, data="XXX ERROR MESSAGE NEEDED"):
-        # XXX The idea is to make data mandatory.
-        self.errors.append(data)
-        if self.strict:
-            raise SerializeError
-
-
-class SerializeError(Exception):
-    """Error in serialized tree"""
-    pass
diff --git a/lib/bleach/_vendor/html5lib/treeadapters/__init__.py b/lib/bleach/_vendor/html5lib/treeadapters/__init__.py
deleted file mode 100644
index dfeb0ba5..00000000
--- a/lib/bleach/_vendor/html5lib/treeadapters/__init__.py
+++ /dev/null
@@ -1,30 +0,0 @@
-"""Tree adapters let you convert from one tree structure to another
-
-Example:
-
-.. code-block:: python
-
-   import html5lib
-   from html5lib.treeadapters import genshi
-
-   doc = '<html><body>Hi!</body></html>'
-   treebuilder = html5lib.getTreeBuilder('etree')
-   parser = html5lib.HTMLParser(tree=treebuilder)
-   tree = parser.parse(doc)
-   TreeWalker = html5lib.getTreeWalker('etree')
-
-   genshi_tree = genshi.to_genshi(TreeWalker(tree))
-
-"""
-from __future__ import absolute_import, division, unicode_literals
-
-from . import sax
-
-__all__ = ["sax"]
-
-try:
-    from . import genshi  # noqa
-except ImportError:
-    pass
-else:
-    __all__.append("genshi")
diff --git a/lib/bleach/_vendor/html5lib/treeadapters/genshi.py b/lib/bleach/_vendor/html5lib/treeadapters/genshi.py
deleted file mode 100644
index 61d5fb6a..00000000
--- a/lib/bleach/_vendor/html5lib/treeadapters/genshi.py
+++ /dev/null
@@ -1,54 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-from genshi.core import QName, Attrs
-from genshi.core import START, END, TEXT, COMMENT, DOCTYPE
-
-
-def to_genshi(walker):
-    """Convert a tree to a genshi tree
-
-    :arg walker: the treewalker to use to walk the tree to convert it
-
-    :returns: generator of genshi nodes
-
-    """
-    text = []
-    for token in walker:
-        type = token["type"]
-        if type in ("Characters", "SpaceCharacters"):
-            text.append(token["data"])
-        elif text:
-            yield TEXT, "".join(text), (None, -1, -1)
-            text = []
-
-        if type in ("StartTag", "EmptyTag"):
-            if token["namespace"]:
-                name = "{%s}%s" % (token["namespace"], token["name"])
-            else:
-                name = token["name"]
-            attrs = Attrs([(QName("{%s}%s" % attr if attr[0] is not None else attr[1]), value)
-                           for attr, value in token["data"].items()])
-            yield (START, (QName(name), attrs), (None, -1, -1))
-            if type == "EmptyTag":
-                type = "EndTag"
-
-        if type == "EndTag":
-            if token["namespace"]:
-                name = "{%s}%s" % (token["namespace"], token["name"])
-            else:
-                name = token["name"]
-
-            yield END, QName(name), (None, -1, -1)
-
-        elif type == "Comment":
-            yield COMMENT, token["data"], (None, -1, -1)
-
-        elif type == "Doctype":
-            yield DOCTYPE, (token["name"], token["publicId"],
-                            token["systemId"]), (None, -1, -1)
-
-        else:
-            pass  # FIXME: What to do?
-
-    if text:
-        yield TEXT, "".join(text), (None, -1, -1)
diff --git a/lib/bleach/_vendor/html5lib/treeadapters/sax.py b/lib/bleach/_vendor/html5lib/treeadapters/sax.py
deleted file mode 100644
index f4ccea5a..00000000
--- a/lib/bleach/_vendor/html5lib/treeadapters/sax.py
+++ /dev/null
@@ -1,50 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-from xml.sax.xmlreader import AttributesNSImpl
-
-from ..constants import adjustForeignAttributes, unadjustForeignAttributes
-
-prefix_mapping = {}
-for prefix, localName, namespace in adjustForeignAttributes.values():
-    if prefix is not None:
-        prefix_mapping[prefix] = namespace
-
-
-def to_sax(walker, handler):
-    """Call SAX-like content handler based on treewalker walker
-
-    :arg walker: the treewalker to use to walk the tree to convert it
-
-    :arg handler: SAX handler to use
-
-    """
-    handler.startDocument()
-    for prefix, namespace in prefix_mapping.items():
-        handler.startPrefixMapping(prefix, namespace)
-
-    for token in walker:
-        type = token["type"]
-        if type == "Doctype":
-            continue
-        elif type in ("StartTag", "EmptyTag"):
-            attrs = AttributesNSImpl(token["data"],
-                                     unadjustForeignAttributes)
-            handler.startElementNS((token["namespace"], token["name"]),
-                                   token["name"],
-                                   attrs)
-            if type == "EmptyTag":
-                handler.endElementNS((token["namespace"], token["name"]),
-                                     token["name"])
-        elif type == "EndTag":
-            handler.endElementNS((token["namespace"], token["name"]),
-                                 token["name"])
-        elif type in ("Characters", "SpaceCharacters"):
-            handler.characters(token["data"])
-        elif type == "Comment":
-            pass
-        else:
-            assert False, "Unknown token type"
-
-    for prefix, namespace in prefix_mapping.items():
-        handler.endPrefixMapping(prefix)
-    handler.endDocument()
diff --git a/lib/bleach/_vendor/html5lib/treebuilders/__init__.py b/lib/bleach/_vendor/html5lib/treebuilders/__init__.py
deleted file mode 100644
index d44447ea..00000000
--- a/lib/bleach/_vendor/html5lib/treebuilders/__init__.py
+++ /dev/null
@@ -1,88 +0,0 @@
-"""A collection of modules for building different kinds of trees from HTML
-documents.
-
-To create a treebuilder for a new type of tree, you need to do
-implement several things:
-
-1. A set of classes for various types of elements: Document, Doctype, Comment,
-   Element. These must implement the interface of ``base.treebuilders.Node``
-   (although comment nodes have a different signature for their constructor,
-   see ``treebuilders.etree.Comment``) Textual content may also be implemented
-   as another node type, or not, as your tree implementation requires.
-
-2. A treebuilder object (called ``TreeBuilder`` by convention) that inherits
-   from ``treebuilders.base.TreeBuilder``. This has 4 required attributes:
-
-   * ``documentClass`` - the class to use for the bottommost node of a document
-   * ``elementClass`` - the class to use for HTML Elements
-   * ``commentClass`` - the class to use for comments
-   * ``doctypeClass`` - the class to use for doctypes
-
-   It also has one required method:
-
-   * ``getDocument`` - Returns the root node of the complete document tree
-
-3. If you wish to run the unit tests, you must also create a ``testSerializer``
-   method on your treebuilder which accepts a node and returns a string
-   containing Node and its children serialized according to the format used in
-   the unittests
-
-"""
-
-from __future__ import absolute_import, division, unicode_literals
-
-from .._utils import default_etree
-
-treeBuilderCache = {}
-
-
-def getTreeBuilder(treeType, implementation=None, **kwargs):
-    """Get a TreeBuilder class for various types of trees with built-in support
-
-    :arg treeType: the name of the tree type required (case-insensitive). Supported
-        values are:
-
-        * "dom" - A generic builder for DOM implementations, defaulting to a
-          xml.dom.minidom based implementation.
-        * "etree" - A generic builder for tree implementations exposing an
-          ElementTree-like interface, defaulting to xml.etree.cElementTree if
-          available and xml.etree.ElementTree if not.
-        * "lxml" - A etree-based builder for lxml.etree, handling limitations
-          of lxml's implementation.
-
-    :arg implementation: (Currently applies to the "etree" and "dom" tree
-        types). A module implementing the tree type e.g. xml.etree.ElementTree
-        or xml.etree.cElementTree.
-
-    :arg kwargs: Any additional options to pass to the TreeBuilder when
-        creating it.
-
-    Example:
-
-    >>> from html5lib.treebuilders import getTreeBuilder
-    >>> builder = getTreeBuilder('etree')
-
-    """
-
-    treeType = treeType.lower()
-    if treeType not in treeBuilderCache:
-        if treeType == "dom":
-            from . import dom
-            # Come up with a sane default (pref. from the stdlib)
-            if implementation is None:
-                from xml.dom import minidom
-                implementation = minidom
-            # NEVER cache here, caching is done in the dom submodule
-            return dom.getDomModule(implementation, **kwargs).TreeBuilder
-        elif treeType == "lxml":
-            from . import etree_lxml
-            treeBuilderCache[treeType] = etree_lxml.TreeBuilder
-        elif treeType == "etree":
-            from . import etree
-            if implementation is None:
-                implementation = default_etree
-            # NEVER cache here, caching is done in the etree submodule
-            return etree.getETreeModule(implementation, **kwargs).TreeBuilder
-        else:
-            raise ValueError("""Unrecognised treebuilder "%s" """ % treeType)
-    return treeBuilderCache.get(treeType)
diff --git a/lib/bleach/_vendor/html5lib/treebuilders/base.py b/lib/bleach/_vendor/html5lib/treebuilders/base.py
deleted file mode 100644
index 2869da00..00000000
--- a/lib/bleach/_vendor/html5lib/treebuilders/base.py
+++ /dev/null
@@ -1,417 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-from bleach.six_shim import text_type
-
-from ..constants import scopingElements, tableInsertModeElements, namespaces
-
-# The scope markers are inserted when entering object elements,
-# marquees, table cells, and table captions, and are used to prevent formatting
-# from "leaking" into tables, object elements, and marquees.
-Marker = None
-
-listElementsMap = {
-    None: (frozenset(scopingElements), False),
-    "button": (frozenset(scopingElements | {(namespaces["html"], "button")}), False),
-    "list": (frozenset(scopingElements | {(namespaces["html"], "ol"),
-                                          (namespaces["html"], "ul")}), False),
-    "table": (frozenset([(namespaces["html"], "html"),
-                         (namespaces["html"], "table")]), False),
-    "select": (frozenset([(namespaces["html"], "optgroup"),
-                          (namespaces["html"], "option")]), True)
-}
-
-
-class Node(object):
-    """Represents an item in the tree"""
-    def __init__(self, name):
-        """Creates a Node
-
-        :arg name: The tag name associated with the node
-
-        """
-        # The tag name associated with the node
-        self.name = name
-        # The parent of the current node (or None for the document node)
-        self.parent = None
-        # The value of the current node (applies to text nodes and comments)
-        self.value = None
-        # A dict holding name -> value pairs for attributes of the node
-        self.attributes = {}
-        # A list of child nodes of the current node. This must include all
-        # elements but not necessarily other node types.
-        self.childNodes = []
-        # A list of miscellaneous flags that can be set on the node.
-        self._flags = []
-
-    def __str__(self):
-        attributesStr = " ".join(["%s=\"%s\"" % (name, value)
-                                  for name, value in
-                                  self.attributes.items()])
-        if attributesStr:
-            return "<%s %s>" % (self.name, attributesStr)
-        else:
-            return "<%s>" % (self.name)
-
-    def __repr__(self):
-        return "<%s>" % (self.name)
-
-    def appendChild(self, node):
-        """Insert node as a child of the current node
-
-        :arg node: the node to insert
-
-        """
-        raise NotImplementedError
-
-    def insertText(self, data, insertBefore=None):
-        """Insert data as text in the current node, positioned before the
-        start of node insertBefore or to the end of the node's text.
-
-        :arg data: the data to insert
-
-        :arg insertBefore: True if you want to insert the text before the node
-            and False if you want to insert it after the node
-
-        """
-        raise NotImplementedError
-
-    def insertBefore(self, node, refNode):
-        """Insert node as a child of the current node, before refNode in the
-        list of child nodes. Raises ValueError if refNode is not a child of
-        the current node
-
-        :arg node: the node to insert
-
-        :arg refNode: the child node to insert the node before
-
-        """
-        raise NotImplementedError
-
-    def removeChild(self, node):
-        """Remove node from the children of the current node
-
-        :arg node: the child node to remove
-
-        """
-        raise NotImplementedError
-
-    def reparentChildren(self, newParent):
-        """Move all the children of the current node to newParent.
-        This is needed so that trees that don't store text as nodes move the
-        text in the correct way
-
-        :arg newParent: the node to move all this node's children to
-
-        """
-        # XXX - should this method be made more general?
-        for child in self.childNodes:
-            newParent.appendChild(child)
-        self.childNodes = []
-
-    def cloneNode(self):
-        """Return a shallow copy of the current node i.e. a node with the same
-        name and attributes but with no parent or child nodes
-        """
-        raise NotImplementedError
-
-    def hasContent(self):
-        """Return true if the node has children or text, false otherwise
-        """
-        raise NotImplementedError
-
-
-class ActiveFormattingElements(list):
-    def append(self, node):
-        equalCount = 0
-        if node != Marker:
-            for element in self[::-1]:
-                if element == Marker:
-                    break
-                if self.nodesEqual(element, node):
-                    equalCount += 1
-                if equalCount == 3:
-                    self.remove(element)
-                    break
-        list.append(self, node)
-
-    def nodesEqual(self, node1, node2):
-        if not node1.nameTuple == node2.nameTuple:
-            return False
-
-        if not node1.attributes == node2.attributes:
-            return False
-
-        return True
-
-
-class TreeBuilder(object):
-    """Base treebuilder implementation
-
-    * documentClass - the class to use for the bottommost node of a document
-    * elementClass - the class to use for HTML Elements
-    * commentClass - the class to use for comments
-    * doctypeClass - the class to use for doctypes
-
-    """
-    # pylint:disable=not-callable
-
-    # Document class
-    documentClass = None
-
-    # The class to use for creating a node
-    elementClass = None
-
-    # The class to use for creating comments
-    commentClass = None
-
-    # The class to use for creating doctypes
-    doctypeClass = None
-
-    # Fragment class
-    fragmentClass = None
-
-    def __init__(self, namespaceHTMLElements):
-        """Create a TreeBuilder
-
-        :arg namespaceHTMLElements: whether or not to namespace HTML elements
-
-        """
-        if namespaceHTMLElements:
-            self.defaultNamespace = "http://www.w3.org/1999/xhtml"
-        else:
-            self.defaultNamespace = None
-        self.reset()
-
-    def reset(self):
-        self.openElements = []
-        self.activeFormattingElements = ActiveFormattingElements()
-
-        # XXX - rename these to headElement, formElement
-        self.headPointer = None
-        self.formPointer = None
-
-        self.insertFromTable = False
-
-        self.document = self.documentClass()
-
-    def elementInScope(self, target, variant=None):
-
-        # If we pass a node in we match that. if we pass a string
-        # match any node with that name
-        exactNode = hasattr(target, "nameTuple")
-        if not exactNode:
-            if isinstance(target, text_type):
-                target = (namespaces["html"], target)
-            assert isinstance(target, tuple)
-
-        listElements, invert = listElementsMap[variant]
-
-        for node in reversed(self.openElements):
-            if exactNode and node == target:
-                return True
-            elif not exactNode and node.nameTuple == target:
-                return True
-            elif (invert ^ (node.nameTuple in listElements)):
-                return False
-
-        assert False  # We should never reach this point
-
-    def reconstructActiveFormattingElements(self):
-        # Within this algorithm the order of steps described in the
-        # specification is not quite the same as the order of steps in the
-        # code. It should still do the same though.
-
-        # Step 1: stop the algorithm when there's nothing to do.
-        if not self.activeFormattingElements:
-            return
-
-        # Step 2 and step 3: we start with the last element. So i is -1.
-        i = len(self.activeFormattingElements) - 1
-        entry = self.activeFormattingElements[i]
-        if entry == Marker or entry in self.openElements:
-            return
-
-        # Step 6
-        while entry != Marker and entry not in self.openElements:
-            if i == 0:
-                # This will be reset to 0 below
-                i = -1
-                break
-            i -= 1
-            # Step 5: let entry be one earlier in the list.
-            entry = self.activeFormattingElements[i]
-
-        while True:
-            # Step 7
-            i += 1
-
-            # Step 8
-            entry = self.activeFormattingElements[i]
-            clone = entry.cloneNode()  # Mainly to get a new copy of the attributes
-
-            # Step 9
-            element = self.insertElement({"type": "StartTag",
-                                          "name": clone.name,
-                                          "namespace": clone.namespace,
-                                          "data": clone.attributes})
-
-            # Step 10
-            self.activeFormattingElements[i] = element
-
-            # Step 11
-            if element == self.activeFormattingElements[-1]:
-                break
-
-    def clearActiveFormattingElements(self):
-        entry = self.activeFormattingElements.pop()
-        while self.activeFormattingElements and entry != Marker:
-            entry = self.activeFormattingElements.pop()
-
-    def elementInActiveFormattingElements(self, name):
-        """Check if an element exists between the end of the active
-        formatting elements and the last marker. If it does, return it, else
-        return false"""
-
-        for item in self.activeFormattingElements[::-1]:
-            # Check for Marker first because if it's a Marker it doesn't have a
-            # name attribute.
-            if item == Marker:
-                break
-            elif item.name == name:
-                return item
-        return False
-
-    def insertRoot(self, token):
-        element = self.createElement(token)
-        self.openElements.append(element)
-        self.document.appendChild(element)
-
-    def insertDoctype(self, token):
-        name = token["name"]
-        publicId = token["publicId"]
-        systemId = token["systemId"]
-
-        doctype = self.doctypeClass(name, publicId, systemId)
-        self.document.appendChild(doctype)
-
-    def insertComment(self, token, parent=None):
-        if parent is None:
-            parent = self.openElements[-1]
-        parent.appendChild(self.commentClass(token["data"]))
-
-    def createElement(self, token):
-        """Create an element but don't insert it anywhere"""
-        name = token["name"]
-        namespace = token.get("namespace", self.defaultNamespace)
-        element = self.elementClass(name, namespace)
-        element.attributes = token["data"]
-        return element
-
-    def _getInsertFromTable(self):
-        return self._insertFromTable
-
-    def _setInsertFromTable(self, value):
-        """Switch the function used to insert an element from the
-        normal one to the misnested table one and back again"""
-        self._insertFromTable = value
-        if value:
-            self.insertElement = self.insertElementTable
-        else:
-            self.insertElement = self.insertElementNormal
-
-    insertFromTable = property(_getInsertFromTable, _setInsertFromTable)
-
-    def insertElementNormal(self, token):
-        name = token["name"]
-        assert isinstance(name, text_type), "Element %s not unicode" % name
-        namespace = token.get("namespace", self.defaultNamespace)
-        element = self.elementClass(name, namespace)
-        element.attributes = token["data"]
-        self.openElements[-1].appendChild(element)
-        self.openElements.append(element)
-        return element
-
-    def insertElementTable(self, token):
-        """Create an element and insert it into the tree"""
-        element = self.createElement(token)
-        if self.openElements[-1].name not in tableInsertModeElements:
-            return self.insertElementNormal(token)
-        else:
-            # We should be in the InTable mode. This means we want to do
-            # special magic element rearranging
-            parent, insertBefore = self.getTableMisnestedNodePosition()
-            if insertBefore is None:
-                parent.appendChild(element)
-            else:
-                parent.insertBefore(element, insertBefore)
-            self.openElements.append(element)
-        return element
-
-    def insertText(self, data, parent=None):
-        """Insert text data."""
-        if parent is None:
-            parent = self.openElements[-1]
-
-        if (not self.insertFromTable or (self.insertFromTable and
-                                         self.openElements[-1].name
-                                         not in tableInsertModeElements)):
-            parent.insertText(data)
-        else:
-            # We should be in the InTable mode. This means we want to do
-            # special magic element rearranging
-            parent, insertBefore = self.getTableMisnestedNodePosition()
-            parent.insertText(data, insertBefore)
-
-    def getTableMisnestedNodePosition(self):
-        """Get the foster parent element, and sibling to insert before
-        (or None) when inserting a misnested table node"""
-        # The foster parent element is the one which comes before the most
-        # recently opened table element
-        # XXX - this is really inelegant
-        lastTable = None
-        fosterParent = None
-        insertBefore = None
-        for elm in self.openElements[::-1]:
-            if elm.name == "table":
-                lastTable = elm
-                break
-        if lastTable:
-            # XXX - we should really check that this parent is actually a
-            # node here
-            if lastTable.parent:
-                fosterParent = lastTable.parent
-                insertBefore = lastTable
-            else:
-                fosterParent = self.openElements[
-                    self.openElements.index(lastTable) - 1]
-        else:
-            fosterParent = self.openElements[0]
-        return fosterParent, insertBefore
-
-    def generateImpliedEndTags(self, exclude=None):
-        name = self.openElements[-1].name
-        # XXX td, th and tr are not actually needed
-        if (name in frozenset(("dd", "dt", "li", "option", "optgroup", "p", "rp", "rt")) and
-                name != exclude):
-            self.openElements.pop()
-            # XXX This is not entirely what the specification says. We should
-            # investigate it more closely.
-            self.generateImpliedEndTags(exclude)
-
-    def getDocument(self):
-        """Return the final tree"""
-        return self.document
-
-    def getFragment(self):
-        """Return the final fragment"""
-        # assert self.innerHTML
-        fragment = self.fragmentClass()
-        self.openElements[0].reparentChildren(fragment)
-        return fragment
-
-    def testSerializer(self, node):
-        """Serialize the subtree of node in the format required by unit tests
-
-        :arg node: the node from which to start serializing
-
-        """
-        raise NotImplementedError
diff --git a/lib/bleach/_vendor/html5lib/treebuilders/dom.py b/lib/bleach/_vendor/html5lib/treebuilders/dom.py
deleted file mode 100644
index d8b53004..00000000
--- a/lib/bleach/_vendor/html5lib/treebuilders/dom.py
+++ /dev/null
@@ -1,239 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-
-try:
-    from collections.abc import MutableMapping
-except ImportError:  # Python 2.7
-    from collections import MutableMapping
-from xml.dom import minidom, Node
-import weakref
-
-from . import base
-from .. import constants
-from ..constants import namespaces
-from .._utils import moduleFactoryFactory
-
-
-def getDomBuilder(DomImplementation):
-    Dom = DomImplementation
-
-    class AttrList(MutableMapping):
-        def __init__(self, element):
-            self.element = element
-
-        def __iter__(self):
-            return iter(self.element.attributes.keys())
-
-        def __setitem__(self, name, value):
-            if isinstance(name, tuple):
-                raise NotImplementedError
-            else:
-                attr = self.element.ownerDocument.createAttribute(name)
-                attr.value = value
-                self.element.attributes[name] = attr
-
-        def __len__(self):
-            return len(self.element.attributes)
-
-        def items(self):
-            return list(self.element.attributes.items())
-
-        def values(self):
-            return list(self.element.attributes.values())
-
-        def __getitem__(self, name):
-            if isinstance(name, tuple):
-                raise NotImplementedError
-            else:
-                return self.element.attributes[name].value
-
-        def __delitem__(self, name):
-            if isinstance(name, tuple):
-                raise NotImplementedError
-            else:
-                del self.element.attributes[name]
-
-    class NodeBuilder(base.Node):
-        def __init__(self, element):
-            base.Node.__init__(self, element.nodeName)
-            self.element = element
-
-        namespace = property(lambda self: hasattr(self.element, "namespaceURI") and
-                             self.element.namespaceURI or None)
-
-        def appendChild(self, node):
-            node.parent = self
-            self.element.appendChild(node.element)
-
-        def insertText(self, data, insertBefore=None):
-            text = self.element.ownerDocument.createTextNode(data)
-            if insertBefore:
-                self.element.insertBefore(text, insertBefore.element)
-            else:
-                self.element.appendChild(text)
-
-        def insertBefore(self, node, refNode):
-            self.element.insertBefore(node.element, refNode.element)
-            node.parent = self
-
-        def removeChild(self, node):
-            if node.element.parentNode == self.element:
-                self.element.removeChild(node.element)
-            node.parent = None
-
-        def reparentChildren(self, newParent):
-            while self.element.hasChildNodes():
-                child = self.element.firstChild
-                self.element.removeChild(child)
-                newParent.element.appendChild(child)
-            self.childNodes = []
-
-        def getAttributes(self):
-            return AttrList(self.element)
-
-        def setAttributes(self, attributes):
-            if attributes:
-                for name, value in list(attributes.items()):
-                    if isinstance(name, tuple):
-                        if name[0] is not None:
-                            qualifiedName = (name[0] + ":" + name[1])
-                        else:
-                            qualifiedName = name[1]
-                        self.element.setAttributeNS(name[2], qualifiedName,
-                                                    value)
-                    else:
-                        self.element.setAttribute(
-                            name, value)
-        attributes = property(getAttributes, setAttributes)
-
-        def cloneNode(self):
-            return NodeBuilder(self.element.cloneNode(False))
-
-        def hasContent(self):
-            return self.element.hasChildNodes()
-
-        def getNameTuple(self):
-            if self.namespace is None:
-                return namespaces["html"], self.name
-            else:
-                return self.namespace, self.name
-
-        nameTuple = property(getNameTuple)
-
-    class TreeBuilder(base.TreeBuilder):  # pylint:disable=unused-variable
-        def documentClass(self):
-            self.dom = Dom.getDOMImplementation().createDocument(None, None, None)
-            return weakref.proxy(self)
-
-        def insertDoctype(self, token):
-            name = token["name"]
-            publicId = token["publicId"]
-            systemId = token["systemId"]
-
-            domimpl = Dom.getDOMImplementation()
-            doctype = domimpl.createDocumentType(name, publicId, systemId)
-            self.document.appendChild(NodeBuilder(doctype))
-            if Dom == minidom:
-                doctype.ownerDocument = self.dom
-
-        def elementClass(self, name, namespace=None):
-            if namespace is None and self.defaultNamespace is None:
-                node = self.dom.createElement(name)
-            else:
-                node = self.dom.createElementNS(namespace, name)
-
-            return NodeBuilder(node)
-
-        def commentClass(self, data):
-            return NodeBuilder(self.dom.createComment(data))
-
-        def fragmentClass(self):
-            return NodeBuilder(self.dom.createDocumentFragment())
-
-        def appendChild(self, node):
-            self.dom.appendChild(node.element)
-
-        def testSerializer(self, element):
-            return testSerializer(element)
-
-        def getDocument(self):
-            return self.dom
-
-        def getFragment(self):
-            return base.TreeBuilder.getFragment(self).element
-
-        def insertText(self, data, parent=None):
-            data = data
-            if parent != self:
-                base.TreeBuilder.insertText(self, data, parent)
-            else:
-                # HACK: allow text nodes as children of the document node
-                if hasattr(self.dom, '_child_node_types'):
-                    # pylint:disable=protected-access
-                    if Node.TEXT_NODE not in self.dom._child_node_types:
-                        self.dom._child_node_types = list(self.dom._child_node_types)
-                        self.dom._child_node_types.append(Node.TEXT_NODE)
-                self.dom.appendChild(self.dom.createTextNode(data))
-
-        implementation = DomImplementation
-        name = None
-
-    def testSerializer(element):
-        element.normalize()
-        rv = []
-
-        def serializeElement(element, indent=0):
-            if element.nodeType == Node.DOCUMENT_TYPE_NODE:
-                if element.name:
-                    if element.publicId or element.systemId:
-                        publicId = element.publicId or ""
-                        systemId = element.systemId or ""
-                        rv.append("""|%s<!DOCTYPE %s "%s" "%s">""" %
-                                  (' ' * indent, element.name, publicId, systemId))
-                    else:
-                        rv.append("|%s<!DOCTYPE %s>" % (' ' * indent, element.name))
-                else:
-                    rv.append("|%s<!DOCTYPE >" % (' ' * indent,))
-            elif element.nodeType == Node.DOCUMENT_NODE:
-                rv.append("#document")
-            elif element.nodeType == Node.DOCUMENT_FRAGMENT_NODE:
-                rv.append("#document-fragment")
-            elif element.nodeType == Node.COMMENT_NODE:
-                rv.append("|%s<!-- %s -->" % (' ' * indent, element.nodeValue))
-            elif element.nodeType == Node.TEXT_NODE:
-                rv.append("|%s\"%s\"" % (' ' * indent, element.nodeValue))
-            else:
-                if (hasattr(element, "namespaceURI") and
-                        element.namespaceURI is not None):
-                    name = "%s %s" % (constants.prefixes[element.namespaceURI],
-                                      element.nodeName)
-                else:
-                    name = element.nodeName
-                rv.append("|%s<%s>" % (' ' * indent, name))
-                if element.hasAttributes():
-                    attributes = []
-                    for i in range(len(element.attributes)):
-                        attr = element.attributes.item(i)
-                        name = attr.nodeName
-                        value = attr.value
-                        ns = attr.namespaceURI
-                        if ns:
-                            name = "%s %s" % (constants.prefixes[ns], attr.localName)
-                        else:
-                            name = attr.nodeName
-                        attributes.append((name, value))
-
-                    for name, value in sorted(attributes):
-                        rv.append('|%s%s="%s"' % (' ' * (indent + 2), name, value))
-            indent += 2
-            for child in element.childNodes:
-                serializeElement(child, indent)
-        serializeElement(element, 0)
-
-        return "\n".join(rv)
-
-    return locals()
-
-
-# The actual means to get a module!
-getDomModule = moduleFactoryFactory(getDomBuilder)
diff --git a/lib/bleach/_vendor/html5lib/treebuilders/etree.py b/lib/bleach/_vendor/html5lib/treebuilders/etree.py
deleted file mode 100644
index 5ccfc4d6..00000000
--- a/lib/bleach/_vendor/html5lib/treebuilders/etree.py
+++ /dev/null
@@ -1,343 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-# pylint:disable=protected-access
-
-from bleach.six_shim import text_type
-
-import re
-
-from copy import copy
-
-from . import base
-from .. import _ihatexml
-from .. import constants
-from ..constants import namespaces
-from .._utils import moduleFactoryFactory
-
-tag_regexp = re.compile("{([^}]*)}(.*)")
-
-
-def getETreeBuilder(ElementTreeImplementation, fullTree=False):
-    ElementTree = ElementTreeImplementation
-    ElementTreeCommentType = ElementTree.Comment("asd").tag
-
-    class Element(base.Node):
-        def __init__(self, name, namespace=None):
-            self._name = name
-            self._namespace = namespace
-            self._element = ElementTree.Element(self._getETreeTag(name,
-                                                                  namespace))
-            if namespace is None:
-                self.nameTuple = namespaces["html"], self._name
-            else:
-                self.nameTuple = self._namespace, self._name
-            self.parent = None
-            self._childNodes = []
-            self._flags = []
-
-        def _getETreeTag(self, name, namespace):
-            if namespace is None:
-                etree_tag = name
-            else:
-                etree_tag = "{%s}%s" % (namespace, name)
-            return etree_tag
-
-        def _setName(self, name):
-            self._name = name
-            self._element.tag = self._getETreeTag(self._name, self._namespace)
-
-        def _getName(self):
-            return self._name
-
-        name = property(_getName, _setName)
-
-        def _setNamespace(self, namespace):
-            self._namespace = namespace
-            self._element.tag = self._getETreeTag(self._name, self._namespace)
-
-        def _getNamespace(self):
-            return self._namespace
-
-        namespace = property(_getNamespace, _setNamespace)
-
-        def _getAttributes(self):
-            return self._element.attrib
-
-        def _setAttributes(self, attributes):
-            el_attrib = self._element.attrib
-            el_attrib.clear()
-            if attributes:
-                # calling .items _always_ allocates, and the above truthy check is cheaper than the
-                # allocation on average
-                for key, value in attributes.items():
-                    if isinstance(key, tuple):
-                        name = "{%s}%s" % (key[2], key[1])
-                    else:
-                        name = key
-                    el_attrib[name] = value
-
-        attributes = property(_getAttributes, _setAttributes)
-
-        def _getChildNodes(self):
-            return self._childNodes
-
-        def _setChildNodes(self, value):
-            del self._element[:]
-            self._childNodes = []
-            for element in value:
-                self.insertChild(element)
-
-        childNodes = property(_getChildNodes, _setChildNodes)
-
-        def hasContent(self):
-            """Return true if the node has children or text"""
-            return bool(self._element.text or len(self._element))
-
-        def appendChild(self, node):
-            self._childNodes.append(node)
-            self._element.append(node._element)
-            node.parent = self
-
-        def insertBefore(self, node, refNode):
-            index = list(self._element).index(refNode._element)
-            self._element.insert(index, node._element)
-            node.parent = self
-
-        def removeChild(self, node):
-            self._childNodes.remove(node)
-            self._element.remove(node._element)
-            node.parent = None
-
-        def insertText(self, data, insertBefore=None):
-            if not(len(self._element)):
-                if not self._element.text:
-                    self._element.text = ""
-                self._element.text += data
-            elif insertBefore is None:
-                # Insert the text as the tail of the last child element
-                if not self._element[-1].tail:
-                    self._element[-1].tail = ""
-                self._element[-1].tail += data
-            else:
-                # Insert the text before the specified node
-                children = list(self._element)
-                index = children.index(insertBefore._element)
-                if index > 0:
-                    if not self._element[index - 1].tail:
-                        self._element[index - 1].tail = ""
-                    self._element[index - 1].tail += data
-                else:
-                    if not self._element.text:
-                        self._element.text = ""
-                    self._element.text += data
-
-        def cloneNode(self):
-            element = type(self)(self.name, self.namespace)
-            if self._element.attrib:
-                element._element.attrib = copy(self._element.attrib)
-            return element
-
-        def reparentChildren(self, newParent):
-            if newParent.childNodes:
-                newParent.childNodes[-1]._element.tail += self._element.text
-            else:
-                if not newParent._element.text:
-                    newParent._element.text = ""
-                if self._element.text is not None:
-                    newParent._element.text += self._element.text
-            self._element.text = ""
-            base.Node.reparentChildren(self, newParent)
-
-    class Comment(Element):
-        def __init__(self, data):
-            # Use the superclass constructor to set all properties on the
-            # wrapper element
-            self._element = ElementTree.Comment(data)
-            self.parent = None
-            self._childNodes = []
-            self._flags = []
-
-        def _getData(self):
-            return self._element.text
-
-        def _setData(self, value):
-            self._element.text = value
-
-        data = property(_getData, _setData)
-
-    class DocumentType(Element):
-        def __init__(self, name, publicId, systemId):
-            Element.__init__(self, "<!DOCTYPE>")
-            self._element.text = name
-            self.publicId = publicId
-            self.systemId = systemId
-
-        def _getPublicId(self):
-            return self._element.get("publicId", "")
-
-        def _setPublicId(self, value):
-            if value is not None:
-                self._element.set("publicId", value)
-
-        publicId = property(_getPublicId, _setPublicId)
-
-        def _getSystemId(self):
-            return self._element.get("systemId", "")
-
-        def _setSystemId(self, value):
-            if value is not None:
-                self._element.set("systemId", value)
-
-        systemId = property(_getSystemId, _setSystemId)
-
-    class Document(Element):
-        def __init__(self):
-            Element.__init__(self, "DOCUMENT_ROOT")
-
-    class DocumentFragment(Element):
-        def __init__(self):
-            Element.__init__(self, "DOCUMENT_FRAGMENT")
-
-    def testSerializer(element):
-        rv = []
-
-        def serializeElement(element, indent=0):
-            if not(hasattr(element, "tag")):
-                element = element.getroot()
-            if element.tag == "<!DOCTYPE>":
-                if element.get("publicId") or element.get("systemId"):
-                    publicId = element.get("publicId") or ""
-                    systemId = element.get("systemId") or ""
-                    rv.append("""<!DOCTYPE %s "%s" "%s">""" %
-                              (element.text, publicId, systemId))
-                else:
-                    rv.append("<!DOCTYPE %s>" % (element.text,))
-            elif element.tag == "DOCUMENT_ROOT":
-                rv.append("#document")
-                if element.text is not None:
-                    rv.append("|%s\"%s\"" % (' ' * (indent + 2), element.text))
-                if element.tail is not None:
-                    raise TypeError("Document node cannot have tail")
-                if hasattr(element, "attrib") and len(element.attrib):
-                    raise TypeError("Document node cannot have attributes")
-            elif element.tag == ElementTreeCommentType:
-                rv.append("|%s<!-- %s -->" % (' ' * indent, element.text))
-            else:
-                assert isinstance(element.tag, text_type), \
-                    "Expected unicode, got %s, %s" % (type(element.tag), element.tag)
-                nsmatch = tag_regexp.match(element.tag)
-
-                if nsmatch is None:
-                    name = element.tag
-                else:
-                    ns, name = nsmatch.groups()
-                    prefix = constants.prefixes[ns]
-                    name = "%s %s" % (prefix, name)
-                rv.append("|%s<%s>" % (' ' * indent, name))
-
-                if hasattr(element, "attrib"):
-                    attributes = []
-                    for name, value in element.attrib.items():
-                        nsmatch = tag_regexp.match(name)
-                        if nsmatch is not None:
-                            ns, name = nsmatch.groups()
-                            prefix = constants.prefixes[ns]
-                            attr_string = "%s %s" % (prefix, name)
-                        else:
-                            attr_string = name
-                        attributes.append((attr_string, value))
-
-                    for name, value in sorted(attributes):
-                        rv.append('|%s%s="%s"' % (' ' * (indent + 2), name, value))
-                if element.text:
-                    rv.append("|%s\"%s\"" % (' ' * (indent + 2), element.text))
-            indent += 2
-            for child in element:
-                serializeElement(child, indent)
-            if element.tail:
-                rv.append("|%s\"%s\"" % (' ' * (indent - 2), element.tail))
-        serializeElement(element, 0)
-
-        return "\n".join(rv)
-
-    def tostring(element):  # pylint:disable=unused-variable
-        """Serialize an element and its child nodes to a string"""
-        rv = []
-        filter = _ihatexml.InfosetFilter()
-
-        def serializeElement(element):
-            if isinstance(element, ElementTree.ElementTree):
-                element = element.getroot()
-
-            if element.tag == "<!DOCTYPE>":
-                if element.get("publicId") or element.get("systemId"):
-                    publicId = element.get("publicId") or ""
-                    systemId = element.get("systemId") or ""
-                    rv.append("""<!DOCTYPE %s PUBLIC "%s" "%s">""" %
-                              (element.text, publicId, systemId))
-                else:
-                    rv.append("<!DOCTYPE %s>" % (element.text,))
-            elif element.tag == "DOCUMENT_ROOT":
-                if element.text is not None:
-                    rv.append(element.text)
-                if element.tail is not None:
-                    raise TypeError("Document node cannot have tail")
-                if hasattr(element, "attrib") and len(element.attrib):
-                    raise TypeError("Document node cannot have attributes")
-
-                for child in element:
-                    serializeElement(child)
-
-            elif element.tag == ElementTreeCommentType:
-                rv.append("<!--%s-->" % (element.text,))
-            else:
-                # This is assumed to be an ordinary element
-                if not element.attrib:
-                    rv.append("<%s>" % (filter.fromXmlName(element.tag),))
-                else:
-                    attr = " ".join(["%s=\"%s\"" % (
-                        filter.fromXmlName(name), value)
-                        for name, value in element.attrib.items()])
-                    rv.append("<%s %s>" % (element.tag, attr))
-                if element.text:
-                    rv.append(element.text)
-
-                for child in element:
-                    serializeElement(child)
-
-                rv.append("</%s>" % (element.tag,))
-
-            if element.tail:
-                rv.append(element.tail)
-
-        serializeElement(element)
-
-        return "".join(rv)
-
-    class TreeBuilder(base.TreeBuilder):  # pylint:disable=unused-variable
-        documentClass = Document
-        doctypeClass = DocumentType
-        elementClass = Element
-        commentClass = Comment
-        fragmentClass = DocumentFragment
-        implementation = ElementTreeImplementation
-
-        def testSerializer(self, element):
-            return testSerializer(element)
-
-        def getDocument(self):
-            if fullTree:
-                return self.document._element
-            else:
-                if self.defaultNamespace is not None:
-                    return self.document._element.find(
-                        "{%s}html" % self.defaultNamespace)
-                else:
-                    return self.document._element.find("html")
-
-        def getFragment(self):
-            return base.TreeBuilder.getFragment(self)._element
-
-    return locals()
-
-
-getETreeModule = moduleFactoryFactory(getETreeBuilder)
diff --git a/lib/bleach/_vendor/html5lib/treebuilders/etree_lxml.py b/lib/bleach/_vendor/html5lib/treebuilders/etree_lxml.py
deleted file mode 100644
index f4622322..00000000
--- a/lib/bleach/_vendor/html5lib/treebuilders/etree_lxml.py
+++ /dev/null
@@ -1,392 +0,0 @@
-"""Module for supporting the lxml.etree library. The idea here is to use as much
-of the native library as possible, without using fragile hacks like custom element
-names that break between releases. The downside of this is that we cannot represent
-all possible trees; specifically the following are known to cause problems:
-
-Text or comments as siblings of the root element
-Docypes with no name
-
-When any of these things occur, we emit a DataLossWarning
-"""
-
-from __future__ import absolute_import, division, unicode_literals
-# pylint:disable=protected-access
-
-import warnings
-import re
-import sys
-
-try:
-    from collections.abc import MutableMapping
-except ImportError:
-    from collections import MutableMapping
-
-from . import base
-from ..constants import DataLossWarning
-from .. import constants
-from . import etree as etree_builders
-from .. import _ihatexml
-
-import lxml.etree as etree
-from bleach.six_shim import PY3, binary_type
-
-
-fullTree = True
-tag_regexp = re.compile("{([^}]*)}(.*)")
-
-comment_type = etree.Comment("asd").tag
-
-
-class DocumentType(object):
-    def __init__(self, name, publicId, systemId):
-        self.name = name
-        self.publicId = publicId
-        self.systemId = systemId
-
-
-class Document(object):
-    def __init__(self):
-        self._elementTree = None
-        self._childNodes = []
-
-    def appendChild(self, element):
-        last = self._elementTree.getroot()
-        for last in self._elementTree.getroot().itersiblings():
-            pass
-
-        last.addnext(element._element)
-
-    def _getChildNodes(self):
-        return self._childNodes
-
-    childNodes = property(_getChildNodes)
-
-
-def testSerializer(element):
-    rv = []
-    infosetFilter = _ihatexml.InfosetFilter(preventDoubleDashComments=True)
-
-    def serializeElement(element, indent=0):
-        if not hasattr(element, "tag"):
-            if hasattr(element, "getroot"):
-                # Full tree case
-                rv.append("#document")
-                if element.docinfo.internalDTD:
-                    if not (element.docinfo.public_id or
-                            element.docinfo.system_url):
-                        dtd_str = "<!DOCTYPE %s>" % element.docinfo.root_name
-                    else:
-                        dtd_str = """<!DOCTYPE %s "%s" "%s">""" % (
-                            element.docinfo.root_name,
-                            element.docinfo.public_id,
-                            element.docinfo.system_url)
-                    rv.append("|%s%s" % (' ' * (indent + 2), dtd_str))
-                next_element = element.getroot()
-                while next_element.getprevious() is not None:
-                    next_element = next_element.getprevious()
-                while next_element is not None:
-                    serializeElement(next_element, indent + 2)
-                    next_element = next_element.getnext()
-            elif isinstance(element, str) or isinstance(element, bytes):
-                # Text in a fragment
-                assert isinstance(element, str) or sys.version_info[0] == 2
-                rv.append("|%s\"%s\"" % (' ' * indent, element))
-            else:
-                # Fragment case
-                rv.append("#document-fragment")
-                for next_element in element:
-                    serializeElement(next_element, indent + 2)
-        elif element.tag == comment_type:
-            rv.append("|%s<!-- %s -->" % (' ' * indent, element.text))
-            if hasattr(element, "tail") and element.tail:
-                rv.append("|%s\"%s\"" % (' ' * indent, element.tail))
-        else:
-            assert isinstance(element, etree._Element)
-            nsmatch = etree_builders.tag_regexp.match(element.tag)
-            if nsmatch is not None:
-                ns = nsmatch.group(1)
-                tag = nsmatch.group(2)
-                prefix = constants.prefixes[ns]
-                rv.append("|%s<%s %s>" % (' ' * indent, prefix,
-                                          infosetFilter.fromXmlName(tag)))
-            else:
-                rv.append("|%s<%s>" % (' ' * indent,
-                                       infosetFilter.fromXmlName(element.tag)))
-
-            if hasattr(element, "attrib"):
-                attributes = []
-                for name, value in element.attrib.items():
-                    nsmatch = tag_regexp.match(name)
-                    if nsmatch is not None:
-                        ns, name = nsmatch.groups()
-                        name = infosetFilter.fromXmlName(name)
-                        prefix = constants.prefixes[ns]
-                        attr_string = "%s %s" % (prefix, name)
-                    else:
-                        attr_string = infosetFilter.fromXmlName(name)
-                    attributes.append((attr_string, value))
-
-                for name, value in sorted(attributes):
-                    rv.append('|%s%s="%s"' % (' ' * (indent + 2), name, value))
-
-            if element.text:
-                rv.append("|%s\"%s\"" % (' ' * (indent + 2), element.text))
-            indent += 2
-            for child in element:
-                serializeElement(child, indent)
-            if hasattr(element, "tail") and element.tail:
-                rv.append("|%s\"%s\"" % (' ' * (indent - 2), element.tail))
-    serializeElement(element, 0)
-
-    return "\n".join(rv)
-
-
-def tostring(element):
-    """Serialize an element and its child nodes to a string"""
-    rv = []
-
-    def serializeElement(element):
-        if not hasattr(element, "tag"):
-            if element.docinfo.internalDTD:
-                if element.docinfo.doctype:
-                    dtd_str = element.docinfo.doctype
-                else:
-                    dtd_str = "<!DOCTYPE %s>" % element.docinfo.root_name
-                rv.append(dtd_str)
-            serializeElement(element.getroot())
-
-        elif element.tag == comment_type:
-            rv.append("<!--%s-->" % (element.text,))
-
-        else:
-            # This is assumed to be an ordinary element
-            if not element.attrib:
-                rv.append("<%s>" % (element.tag,))
-            else:
-                attr = " ".join(["%s=\"%s\"" % (name, value)
-                                 for name, value in element.attrib.items()])
-                rv.append("<%s %s>" % (element.tag, attr))
-            if element.text:
-                rv.append(element.text)
-
-            for child in element:
-                serializeElement(child)
-
-            rv.append("</%s>" % (element.tag,))
-
-        if hasattr(element, "tail") and element.tail:
-            rv.append(element.tail)
-
-    serializeElement(element)
-
-    return "".join(rv)
-
-
-class TreeBuilder(base.TreeBuilder):
-    documentClass = Document
-    doctypeClass = DocumentType
-    elementClass = None
-    commentClass = None
-    fragmentClass = Document
-    implementation = etree
-
-    def __init__(self, namespaceHTMLElements, fullTree=False):
-        builder = etree_builders.getETreeModule(etree, fullTree=fullTree)
-        infosetFilter = self.infosetFilter = _ihatexml.InfosetFilter(preventDoubleDashComments=True)
-        self.namespaceHTMLElements = namespaceHTMLElements
-
-        class Attributes(MutableMapping):
-            def __init__(self, element):
-                self._element = element
-
-            def _coerceKey(self, key):
-                if isinstance(key, tuple):
-                    name = "{%s}%s" % (key[2], infosetFilter.coerceAttribute(key[1]))
-                else:
-                    name = infosetFilter.coerceAttribute(key)
-                return name
-
-            def __getitem__(self, key):
-                value = self._element._element.attrib[self._coerceKey(key)]
-                if not PY3 and isinstance(value, binary_type):
-                    value = value.decode("ascii")
-                return value
-
-            def __setitem__(self, key, value):
-                self._element._element.attrib[self._coerceKey(key)] = value
-
-            def __delitem__(self, key):
-                del self._element._element.attrib[self._coerceKey(key)]
-
-            def __iter__(self):
-                return iter(self._element._element.attrib)
-
-            def __len__(self):
-                return len(self._element._element.attrib)
-
-            def clear(self):
-                return self._element._element.attrib.clear()
-
-        class Element(builder.Element):
-            def __init__(self, name, namespace):
-                name = infosetFilter.coerceElement(name)
-                builder.Element.__init__(self, name, namespace=namespace)
-                self._attributes = Attributes(self)
-
-            def _setName(self, name):
-                self._name = infosetFilter.coerceElement(name)
-                self._element.tag = self._getETreeTag(
-                    self._name, self._namespace)
-
-            def _getName(self):
-                return infosetFilter.fromXmlName(self._name)
-
-            name = property(_getName, _setName)
-
-            def _getAttributes(self):
-                return self._attributes
-
-            def _setAttributes(self, value):
-                attributes = self.attributes
-                attributes.clear()
-                attributes.update(value)
-
-            attributes = property(_getAttributes, _setAttributes)
-
-            def insertText(self, data, insertBefore=None):
-                data = infosetFilter.coerceCharacters(data)
-                builder.Element.insertText(self, data, insertBefore)
-
-            def cloneNode(self):
-                element = type(self)(self.name, self.namespace)
-                if self._element.attrib:
-                    element._element.attrib.update(self._element.attrib)
-                return element
-
-        class Comment(builder.Comment):
-            def __init__(self, data):
-                data = infosetFilter.coerceComment(data)
-                builder.Comment.__init__(self, data)
-
-            def _setData(self, data):
-                data = infosetFilter.coerceComment(data)
-                self._element.text = data
-
-            def _getData(self):
-                return self._element.text
-
-            data = property(_getData, _setData)
-
-        self.elementClass = Element
-        self.commentClass = Comment
-        # self.fragmentClass = builder.DocumentFragment
-        base.TreeBuilder.__init__(self, namespaceHTMLElements)
-
-    def reset(self):
-        base.TreeBuilder.reset(self)
-        self.insertComment = self.insertCommentInitial
-        self.initial_comments = []
-        self.doctype = None
-
-    def testSerializer(self, element):
-        return testSerializer(element)
-
-    def getDocument(self):
-        if fullTree:
-            return self.document._elementTree
-        else:
-            return self.document._elementTree.getroot()
-
-    def getFragment(self):
-        fragment = []
-        element = self.openElements[0]._element
-        if element.text:
-            fragment.append(element.text)
-        fragment.extend(list(element))
-        if element.tail:
-            fragment.append(element.tail)
-        return fragment
-
-    def insertDoctype(self, token):
-        name = token["name"]
-        publicId = token["publicId"]
-        systemId = token["systemId"]
-
-        if not name:
-            warnings.warn("lxml cannot represent empty doctype", DataLossWarning)
-            self.doctype = None
-        else:
-            coercedName = self.infosetFilter.coerceElement(name)
-            if coercedName != name:
-                warnings.warn("lxml cannot represent non-xml doctype", DataLossWarning)
-
-            doctype = self.doctypeClass(coercedName, publicId, systemId)
-            self.doctype = doctype
-
-    def insertCommentInitial(self, data, parent=None):
-        assert parent is None or parent is self.document
-        assert self.document._elementTree is None
-        self.initial_comments.append(data)
-
-    def insertCommentMain(self, data, parent=None):
-        if (parent == self.document and
-                self.document._elementTree.getroot()[-1].tag == comment_type):
-            warnings.warn("lxml cannot represent adjacent comments beyond the root elements", DataLossWarning)
-        super(TreeBuilder, self).insertComment(data, parent)
-
-    def insertRoot(self, token):
-        # Because of the way libxml2 works, it doesn't seem to be possible to
-        # alter information like the doctype after the tree has been parsed.
-        # Therefore we need to use the built-in parser to create our initial
-        # tree, after which we can add elements like normal
-        docStr = ""
-        if self.doctype:
-            assert self.doctype.name
-            docStr += "<!DOCTYPE %s" % self.doctype.name
-            if (self.doctype.publicId is not None or
-                    self.doctype.systemId is not None):
-                docStr += (' PUBLIC "%s" ' %
-                           (self.infosetFilter.coercePubid(self.doctype.publicId or "")))
-                if self.doctype.systemId:
-                    sysid = self.doctype.systemId
-                    if sysid.find("'") >= 0 and sysid.find('"') >= 0:
-                        warnings.warn("DOCTYPE system cannot contain single and double quotes", DataLossWarning)
-                        sysid = sysid.replace("'", 'U00027')
-                    if sysid.find("'") >= 0:
-                        docStr += '"%s"' % sysid
-                    else:
-                        docStr += "'%s'" % sysid
-                else:
-                    docStr += "''"
-            docStr += ">"
-            if self.doctype.name != token["name"]:
-                warnings.warn("lxml cannot represent doctype with a different name to the root element", DataLossWarning)
-        docStr += "<THIS_SHOULD_NEVER_APPEAR_PUBLICLY/>"
-        root = etree.fromstring(docStr)
-
-        # Append the initial comments:
-        for comment_token in self.initial_comments:
-            comment = self.commentClass(comment_token["data"])
-            root.addprevious(comment._element)
-
-        # Create the root document and add the ElementTree to it
-        self.document = self.documentClass()
-        self.document._elementTree = root.getroottree()
-
-        # Give the root element the right name
-        name = token["name"]
-        namespace = token.get("namespace", self.defaultNamespace)
-        if namespace is None:
-            etree_tag = name
-        else:
-            etree_tag = "{%s}%s" % (namespace, name)
-        root.tag = etree_tag
-
-        # Add the root element to the internal child/open data structures
-        root_element = self.elementClass(name, namespace)
-        root_element._element = root
-        self.document._childNodes.append(root_element)
-        self.openElements.append(root_element)
-
-        # Reset to the default insert comment function
-        self.insertComment = self.insertCommentMain
diff --git a/lib/bleach/_vendor/html5lib/treewalkers/__init__.py b/lib/bleach/_vendor/html5lib/treewalkers/__init__.py
deleted file mode 100644
index b2d3aac3..00000000
--- a/lib/bleach/_vendor/html5lib/treewalkers/__init__.py
+++ /dev/null
@@ -1,154 +0,0 @@
-"""A collection of modules for iterating through different kinds of
-tree, generating tokens identical to those produced by the tokenizer
-module.
-
-To create a tree walker for a new type of tree, you need to
-implement a tree walker object (called TreeWalker by convention) that
-implements a 'serialize' method which takes a tree as sole argument and
-returns an iterator which generates tokens.
-"""
-
-from __future__ import absolute_import, division, unicode_literals
-
-from .. import constants
-from .._utils import default_etree
-
-__all__ = ["getTreeWalker", "pprint"]
-
-treeWalkerCache = {}
-
-
-def getTreeWalker(treeType, implementation=None, **kwargs):
-    """Get a TreeWalker class for various types of tree with built-in support
-
-    :arg str treeType: the name of the tree type required (case-insensitive).
-        Supported values are:
-
-        * "dom": The xml.dom.minidom DOM implementation
-        * "etree": A generic walker for tree implementations exposing an
-          elementtree-like interface (known to work with ElementTree,
-          cElementTree and lxml.etree).
-        * "lxml": Optimized walker for lxml.etree
-        * "genshi": a Genshi stream
-
-    :arg implementation: A module implementing the tree type e.g.
-        xml.etree.ElementTree or cElementTree (Currently applies to the "etree"
-        tree type only).
-
-    :arg kwargs: keyword arguments passed to the etree walker--for other
-        walkers, this has no effect
-
-    :returns: a TreeWalker class
-
-    """
-
-    treeType = treeType.lower()
-    if treeType not in treeWalkerCache:
-        if treeType == "dom":
-            from . import dom
-            treeWalkerCache[treeType] = dom.TreeWalker
-        elif treeType == "genshi":
-            from . import genshi
-            treeWalkerCache[treeType] = genshi.TreeWalker
-        elif treeType == "lxml":
-            from . import etree_lxml
-            treeWalkerCache[treeType] = etree_lxml.TreeWalker
-        elif treeType == "etree":
-            from . import etree
-            if implementation is None:
-                implementation = default_etree
-            # XXX: NEVER cache here, caching is done in the etree submodule
-            return etree.getETreeModule(implementation, **kwargs).TreeWalker
-    return treeWalkerCache.get(treeType)
-
-
-def concatenateCharacterTokens(tokens):
-    pendingCharacters = []
-    for token in tokens:
-        type = token["type"]
-        if type in ("Characters", "SpaceCharacters"):
-            pendingCharacters.append(token["data"])
-        else:
-            if pendingCharacters:
-                yield {"type": "Characters", "data": "".join(pendingCharacters)}
-                pendingCharacters = []
-            yield token
-    if pendingCharacters:
-        yield {"type": "Characters", "data": "".join(pendingCharacters)}
-
-
-def pprint(walker):
-    """Pretty printer for tree walkers
-
-    Takes a TreeWalker instance and pretty prints the output of walking the tree.
-
-    :arg walker: a TreeWalker instance
-
-    """
-    output = []
-    indent = 0
-    for token in concatenateCharacterTokens(walker):
-        type = token["type"]
-        if type in ("StartTag", "EmptyTag"):
-            # tag name
-            if token["namespace"] and token["namespace"] != constants.namespaces["html"]:
-                if token["namespace"] in constants.prefixes:
-                    ns = constants.prefixes[token["namespace"]]
-                else:
-                    ns = token["namespace"]
-                name = "%s %s" % (ns, token["name"])
-            else:
-                name = token["name"]
-            output.append("%s<%s>" % (" " * indent, name))
-            indent += 2
-            # attributes (sorted for consistent ordering)
-            attrs = token["data"]
-            for (namespace, localname), value in sorted(attrs.items()):
-                if namespace:
-                    if namespace in constants.prefixes:
-                        ns = constants.prefixes[namespace]
-                    else:
-                        ns = namespace
-                    name = "%s %s" % (ns, localname)
-                else:
-                    name = localname
-                output.append("%s%s=\"%s\"" % (" " * indent, name, value))
-            # self-closing
-            if type == "EmptyTag":
-                indent -= 2
-
-        elif type == "EndTag":
-            indent -= 2
-
-        elif type == "Comment":
-            output.append("%s<!-- %s -->" % (" " * indent, token["data"]))
-
-        elif type == "Doctype":
-            if token["name"]:
-                if token["publicId"]:
-                    output.append("""%s<!DOCTYPE %s "%s" "%s">""" %
-                                  (" " * indent,
-                                   token["name"],
-                                   token["publicId"],
-                                   token["systemId"] if token["systemId"] else ""))
-                elif token["systemId"]:
-                    output.append("""%s<!DOCTYPE %s "" "%s">""" %
-                                  (" " * indent,
-                                   token["name"],
-                                   token["systemId"]))
-                else:
-                    output.append("%s<!DOCTYPE %s>" % (" " * indent,
-                                                       token["name"]))
-            else:
-                output.append("%s<!DOCTYPE >" % (" " * indent,))
-
-        elif type == "Characters":
-            output.append("%s\"%s\"" % (" " * indent, token["data"]))
-
-        elif type == "SpaceCharacters":
-            assert False, "concatenateCharacterTokens should have got rid of all Space tokens"
-
-        else:
-            raise ValueError("Unknown token type, %s" % type)
-
-    return "\n".join(output)
diff --git a/lib/bleach/_vendor/html5lib/treewalkers/base.py b/lib/bleach/_vendor/html5lib/treewalkers/base.py
deleted file mode 100644
index 80c474c4..00000000
--- a/lib/bleach/_vendor/html5lib/treewalkers/base.py
+++ /dev/null
@@ -1,252 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-from xml.dom import Node
-from ..constants import namespaces, voidElements, spaceCharacters
-
-__all__ = ["DOCUMENT", "DOCTYPE", "TEXT", "ELEMENT", "COMMENT", "ENTITY", "UNKNOWN",
-           "TreeWalker", "NonRecursiveTreeWalker"]
-
-DOCUMENT = Node.DOCUMENT_NODE
-DOCTYPE = Node.DOCUMENT_TYPE_NODE
-TEXT = Node.TEXT_NODE
-ELEMENT = Node.ELEMENT_NODE
-COMMENT = Node.COMMENT_NODE
-ENTITY = Node.ENTITY_NODE
-UNKNOWN = "<#UNKNOWN#>"
-
-spaceCharacters = "".join(spaceCharacters)
-
-
-class TreeWalker(object):
-    """Walks a tree yielding tokens
-
-    Tokens are dicts that all have a ``type`` field specifying the type of the
-    token.
-
-    """
-    def __init__(self, tree):
-        """Creates a TreeWalker
-
-        :arg tree: the tree to walk
-
-        """
-        self.tree = tree
-
-    def __iter__(self):
-        raise NotImplementedError
-
-    def error(self, msg):
-        """Generates an error token with the given message
-
-        :arg msg: the error message
-
-        :returns: SerializeError token
-
-        """
-        return {"type": "SerializeError", "data": msg}
-
-    def emptyTag(self, namespace, name, attrs, hasChildren=False):
-        """Generates an EmptyTag token
-
-        :arg namespace: the namespace of the token--can be ``None``
-
-        :arg name: the name of the element
-
-        :arg attrs: the attributes of the element as a dict
-
-        :arg hasChildren: whether or not to yield a SerializationError because
-            this tag shouldn't have children
-
-        :returns: EmptyTag token
-
-        """
-        yield {"type": "EmptyTag", "name": name,
-               "namespace": namespace,
-               "data": attrs}
-        if hasChildren:
-            yield self.error("Void element has children")
-
-    def startTag(self, namespace, name, attrs):
-        """Generates a StartTag token
-
-        :arg namespace: the namespace of the token--can be ``None``
-
-        :arg name: the name of the element
-
-        :arg attrs: the attributes of the element as a dict
-
-        :returns: StartTag token
-
-        """
-        return {"type": "StartTag",
-                "name": name,
-                "namespace": namespace,
-                "data": attrs}
-
-    def endTag(self, namespace, name):
-        """Generates an EndTag token
-
-        :arg namespace: the namespace of the token--can be ``None``
-
-        :arg name: the name of the element
-
-        :returns: EndTag token
-
-        """
-        return {"type": "EndTag",
-                "name": name,
-                "namespace": namespace}
-
-    def text(self, data):
-        """Generates SpaceCharacters and Characters tokens
-
-        Depending on what's in the data, this generates one or more
-        ``SpaceCharacters`` and ``Characters`` tokens.
-
-        For example:
-
-            >>> from html5lib.treewalkers.base import TreeWalker
-            >>> # Give it an empty tree just so it instantiates
-            >>> walker = TreeWalker([])
-            >>> list(walker.text(''))
-            []
-            >>> list(walker.text('  '))
-            [{u'data': '  ', u'type': u'SpaceCharacters'}]
-            >>> list(walker.text(' abc '))  # doctest: +NORMALIZE_WHITESPACE
-            [{u'data': ' ', u'type': u'SpaceCharacters'},
-            {u'data': u'abc', u'type': u'Characters'},
-            {u'data': u' ', u'type': u'SpaceCharacters'}]
-
-        :arg data: the text data
-
-        :returns: one or more ``SpaceCharacters`` and ``Characters`` tokens
-
-        """
-        data = data
-        middle = data.lstrip(spaceCharacters)
-        left = data[:len(data) - len(middle)]
-        if left:
-            yield {"type": "SpaceCharacters", "data": left}
-        data = middle
-        middle = data.rstrip(spaceCharacters)
-        right = data[len(middle):]
-        if middle:
-            yield {"type": "Characters", "data": middle}
-        if right:
-            yield {"type": "SpaceCharacters", "data": right}
-
-    def comment(self, data):
-        """Generates a Comment token
-
-        :arg data: the comment
-
-        :returns: Comment token
-
-        """
-        return {"type": "Comment", "data": data}
-
-    def doctype(self, name, publicId=None, systemId=None):
-        """Generates a Doctype token
-
-        :arg name:
-
-        :arg publicId:
-
-        :arg systemId:
-
-        :returns: the Doctype token
-
-        """
-        return {"type": "Doctype",
-                "name": name,
-                "publicId": publicId,
-                "systemId": systemId}
-
-    def entity(self, name):
-        """Generates an Entity token
-
-        :arg name: the entity name
-
-        :returns: an Entity token
-
-        """
-        return {"type": "Entity", "name": name}
-
-    def unknown(self, nodeType):
-        """Handles unknown node types"""
-        return self.error("Unknown node type: " + nodeType)
-
-
-class NonRecursiveTreeWalker(TreeWalker):
-    def getNodeDetails(self, node):
-        raise NotImplementedError
-
-    def getFirstChild(self, node):
-        raise NotImplementedError
-
-    def getNextSibling(self, node):
-        raise NotImplementedError
-
-    def getParentNode(self, node):
-        raise NotImplementedError
-
-    def __iter__(self):
-        currentNode = self.tree
-        while currentNode is not None:
-            details = self.getNodeDetails(currentNode)
-            type, details = details[0], details[1:]
-            hasChildren = False
-
-            if type == DOCTYPE:
-                yield self.doctype(*details)
-
-            elif type == TEXT:
-                for token in self.text(*details):
-                    yield token
-
-            elif type == ELEMENT:
-                namespace, name, attributes, hasChildren = details
-                if (not namespace or namespace == namespaces["html"]) and name in voidElements:
-                    for token in self.emptyTag(namespace, name, attributes,
-                                               hasChildren):
-                        yield token
-                    hasChildren = False
-                else:
-                    yield self.startTag(namespace, name, attributes)
-
-            elif type == COMMENT:
-                yield self.comment(details[0])
-
-            elif type == ENTITY:
-                yield self.entity(details[0])
-
-            elif type == DOCUMENT:
-                hasChildren = True
-
-            else:
-                yield self.unknown(details[0])
-
-            if hasChildren:
-                firstChild = self.getFirstChild(currentNode)
-            else:
-                firstChild = None
-
-            if firstChild is not None:
-                currentNode = firstChild
-            else:
-                while currentNode is not None:
-                    details = self.getNodeDetails(currentNode)
-                    type, details = details[0], details[1:]
-                    if type == ELEMENT:
-                        namespace, name, attributes, hasChildren = details
-                        if (namespace and namespace != namespaces["html"]) or name not in voidElements:
-                            yield self.endTag(namespace, name)
-                    if self.tree is currentNode:
-                        currentNode = None
-                        break
-                    nextSibling = self.getNextSibling(currentNode)
-                    if nextSibling is not None:
-                        currentNode = nextSibling
-                        break
-                    else:
-                        currentNode = self.getParentNode(currentNode)
diff --git a/lib/bleach/_vendor/html5lib/treewalkers/dom.py b/lib/bleach/_vendor/html5lib/treewalkers/dom.py
deleted file mode 100644
index b0c89b00..00000000
--- a/lib/bleach/_vendor/html5lib/treewalkers/dom.py
+++ /dev/null
@@ -1,43 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-from xml.dom import Node
-
-from . import base
-
-
-class TreeWalker(base.NonRecursiveTreeWalker):
-    def getNodeDetails(self, node):
-        if node.nodeType == Node.DOCUMENT_TYPE_NODE:
-            return base.DOCTYPE, node.name, node.publicId, node.systemId
-
-        elif node.nodeType in (Node.TEXT_NODE, Node.CDATA_SECTION_NODE):
-            return base.TEXT, node.nodeValue
-
-        elif node.nodeType == Node.ELEMENT_NODE:
-            attrs = {}
-            for attr in list(node.attributes.keys()):
-                attr = node.getAttributeNode(attr)
-                if attr.namespaceURI:
-                    attrs[(attr.namespaceURI, attr.localName)] = attr.value
-                else:
-                    attrs[(None, attr.name)] = attr.value
-            return (base.ELEMENT, node.namespaceURI, node.nodeName,
-                    attrs, node.hasChildNodes())
-
-        elif node.nodeType == Node.COMMENT_NODE:
-            return base.COMMENT, node.nodeValue
-
-        elif node.nodeType in (Node.DOCUMENT_NODE, Node.DOCUMENT_FRAGMENT_NODE):
-            return (base.DOCUMENT,)
-
-        else:
-            return base.UNKNOWN, node.nodeType
-
-    def getFirstChild(self, node):
-        return node.firstChild
-
-    def getNextSibling(self, node):
-        return node.nextSibling
-
-    def getParentNode(self, node):
-        return node.parentNode
diff --git a/lib/bleach/_vendor/html5lib/treewalkers/etree.py b/lib/bleach/_vendor/html5lib/treewalkers/etree.py
deleted file mode 100644
index a9d9450c..00000000
--- a/lib/bleach/_vendor/html5lib/treewalkers/etree.py
+++ /dev/null
@@ -1,131 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-from collections import OrderedDict
-import re
-
-from bleach.six_shim import string_types
-
-from . import base
-from .._utils import moduleFactoryFactory
-
-tag_regexp = re.compile("{([^}]*)}(.*)")
-
-
-def getETreeBuilder(ElementTreeImplementation):
-    ElementTree = ElementTreeImplementation
-    ElementTreeCommentType = ElementTree.Comment("asd").tag
-
-    class TreeWalker(base.NonRecursiveTreeWalker):  # pylint:disable=unused-variable
-        """Given the particular ElementTree representation, this implementation,
-        to avoid using recursion, returns "nodes" as tuples with the following
-        content:
-
-        1. The current element
-
-        2. The index of the element relative to its parent
-
-        3. A stack of ancestor elements
-
-        4. A flag "text", "tail" or None to indicate if the current node is a
-           text node; either the text or tail of the current element (1)
-        """
-        def getNodeDetails(self, node):
-            if isinstance(node, tuple):  # It might be the root Element
-                elt, _, _, flag = node
-                if flag in ("text", "tail"):
-                    return base.TEXT, getattr(elt, flag)
-                else:
-                    node = elt
-
-            if not(hasattr(node, "tag")):
-                node = node.getroot()
-
-            if node.tag in ("DOCUMENT_ROOT", "DOCUMENT_FRAGMENT"):
-                return (base.DOCUMENT,)
-
-            elif node.tag == "<!DOCTYPE>":
-                return (base.DOCTYPE, node.text,
-                        node.get("publicId"), node.get("systemId"))
-
-            elif node.tag == ElementTreeCommentType:
-                return base.COMMENT, node.text
-
-            else:
-                assert isinstance(node.tag, string_types), type(node.tag)
-                # This is assumed to be an ordinary element
-                match = tag_regexp.match(node.tag)
-                if match:
-                    namespace, tag = match.groups()
-                else:
-                    namespace = None
-                    tag = node.tag
-                attrs = OrderedDict()
-                for name, value in list(node.attrib.items()):
-                    match = tag_regexp.match(name)
-                    if match:
-                        attrs[(match.group(1), match.group(2))] = value
-                    else:
-                        attrs[(None, name)] = value
-                return (base.ELEMENT, namespace, tag,
-                        attrs, len(node) or node.text)
-
-        def getFirstChild(self, node):
-            if isinstance(node, tuple):
-                element, key, parents, flag = node
-            else:
-                element, key, parents, flag = node, None, [], None
-
-            if flag in ("text", "tail"):
-                return None
-            else:
-                if element.text:
-                    return element, key, parents, "text"
-                elif len(element):
-                    parents.append(element)
-                    return element[0], 0, parents, None
-                else:
-                    return None
-
-        def getNextSibling(self, node):
-            if isinstance(node, tuple):
-                element, key, parents, flag = node
-            else:
-                return None
-
-            if flag == "text":
-                if len(element):
-                    parents.append(element)
-                    return element[0], 0, parents, None
-                else:
-                    return None
-            else:
-                if element.tail and flag != "tail":
-                    return element, key, parents, "tail"
-                elif key < len(parents[-1]) - 1:
-                    return parents[-1][key + 1], key + 1, parents, None
-                else:
-                    return None
-
-        def getParentNode(self, node):
-            if isinstance(node, tuple):
-                element, key, parents, flag = node
-            else:
-                return None
-
-            if flag == "text":
-                if not parents:
-                    return element
-                else:
-                    return element, key, parents, None
-            else:
-                parent = parents.pop()
-                if not parents:
-                    return parent
-                else:
-                    assert list(parents[-1]).count(parent) == 1
-                    return parent, list(parents[-1]).index(parent), parents, None
-
-    return locals()
-
-
-getETreeModule = moduleFactoryFactory(getETreeBuilder)
diff --git a/lib/bleach/_vendor/html5lib/treewalkers/etree_lxml.py b/lib/bleach/_vendor/html5lib/treewalkers/etree_lxml.py
deleted file mode 100644
index ef42163b..00000000
--- a/lib/bleach/_vendor/html5lib/treewalkers/etree_lxml.py
+++ /dev/null
@@ -1,215 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-from bleach.six_shim import text_type
-
-from collections import OrderedDict
-
-from lxml import etree
-from ..treebuilders.etree import tag_regexp
-
-from . import base
-
-from .. import _ihatexml
-
-
-def ensure_str(s):
-    if s is None:
-        return None
-    elif isinstance(s, text_type):
-        return s
-    else:
-        return s.decode("ascii", "strict")
-
-
-class Root(object):
-    def __init__(self, et):
-        self.elementtree = et
-        self.children = []
-
-        try:
-            if et.docinfo.internalDTD:
-                self.children.append(Doctype(self,
-                                             ensure_str(et.docinfo.root_name),
-                                             ensure_str(et.docinfo.public_id),
-                                             ensure_str(et.docinfo.system_url)))
-        except AttributeError:
-            pass
-
-        try:
-            node = et.getroot()
-        except AttributeError:
-            node = et
-
-        while node.getprevious() is not None:
-            node = node.getprevious()
-        while node is not None:
-            self.children.append(node)
-            node = node.getnext()
-
-        self.text = None
-        self.tail = None
-
-    def __getitem__(self, key):
-        return self.children[key]
-
-    def getnext(self):
-        return None
-
-    def __len__(self):
-        return 1
-
-
-class Doctype(object):
-    def __init__(self, root_node, name, public_id, system_id):
-        self.root_node = root_node
-        self.name = name
-        self.public_id = public_id
-        self.system_id = system_id
-
-        self.text = None
-        self.tail = None
-
-    def getnext(self):
-        return self.root_node.children[1]
-
-
-class FragmentRoot(Root):
-    def __init__(self, children):
-        self.children = [FragmentWrapper(self, child) for child in children]
-        self.text = self.tail = None
-
-    def getnext(self):
-        return None
-
-
-class FragmentWrapper(object):
-    def __init__(self, fragment_root, obj):
-        self.root_node = fragment_root
-        self.obj = obj
-        if hasattr(self.obj, 'text'):
-            self.text = ensure_str(self.obj.text)
-        else:
-            self.text = None
-        if hasattr(self.obj, 'tail'):
-            self.tail = ensure_str(self.obj.tail)
-        else:
-            self.tail = None
-
-    def __getattr__(self, name):
-        return getattr(self.obj, name)
-
-    def getnext(self):
-        siblings = self.root_node.children
-        idx = siblings.index(self)
-        if idx < len(siblings) - 1:
-            return siblings[idx + 1]
-        else:
-            return None
-
-    def __getitem__(self, key):
-        return self.obj[key]
-
-    def __bool__(self):
-        return bool(self.obj)
-
-    def getparent(self):
-        return None
-
-    def __str__(self):
-        return str(self.obj)
-
-    def __unicode__(self):
-        return str(self.obj)
-
-    def __len__(self):
-        return len(self.obj)
-
-
-class TreeWalker(base.NonRecursiveTreeWalker):
-    def __init__(self, tree):
-        # pylint:disable=redefined-variable-type
-        if isinstance(tree, list):
-            self.fragmentChildren = set(tree)
-            tree = FragmentRoot(tree)
-        else:
-            self.fragmentChildren = set()
-            tree = Root(tree)
-        base.NonRecursiveTreeWalker.__init__(self, tree)
-        self.filter = _ihatexml.InfosetFilter()
-
-    def getNodeDetails(self, node):
-        if isinstance(node, tuple):  # Text node
-            node, key = node
-            assert key in ("text", "tail"), "Text nodes are text or tail, found %s" % key
-            return base.TEXT, ensure_str(getattr(node, key))
-
-        elif isinstance(node, Root):
-            return (base.DOCUMENT,)
-
-        elif isinstance(node, Doctype):
-            return base.DOCTYPE, node.name, node.public_id, node.system_id
-
-        elif isinstance(node, FragmentWrapper) and not hasattr(node, "tag"):
-            return base.TEXT, ensure_str(node.obj)
-
-        elif node.tag == etree.Comment:
-            return base.COMMENT, ensure_str(node.text)
-
-        elif node.tag == etree.Entity:
-            return base.ENTITY, ensure_str(node.text)[1:-1]  # strip &;
-
-        else:
-            # This is assumed to be an ordinary element
-            match = tag_regexp.match(ensure_str(node.tag))
-            if match:
-                namespace, tag = match.groups()
-            else:
-                namespace = None
-                tag = ensure_str(node.tag)
-            attrs = OrderedDict()
-            for name, value in list(node.attrib.items()):
-                name = ensure_str(name)
-                value = ensure_str(value)
-                match = tag_regexp.match(name)
-                if match:
-                    attrs[(match.group(1), match.group(2))] = value
-                else:
-                    attrs[(None, name)] = value
-            return (base.ELEMENT, namespace, self.filter.fromXmlName(tag),
-                    attrs, len(node) > 0 or node.text)
-
-    def getFirstChild(self, node):
-        assert not isinstance(node, tuple), "Text nodes have no children"
-
-        assert len(node) or node.text, "Node has no children"
-        if node.text:
-            return (node, "text")
-        else:
-            return node[0]
-
-    def getNextSibling(self, node):
-        if isinstance(node, tuple):  # Text node
-            node, key = node
-            assert key in ("text", "tail"), "Text nodes are text or tail, found %s" % key
-            if key == "text":
-                # XXX: we cannot use a "bool(node) and node[0] or None" construct here
-                # because node[0] might evaluate to False if it has no child element
-                if len(node):
-                    return node[0]
-                else:
-                    return None
-            else:  # tail
-                return node.getnext()
-
-        return (node, "tail") if node.tail else node.getnext()
-
-    def getParentNode(self, node):
-        if isinstance(node, tuple):  # Text node
-            node, key = node
-            assert key in ("text", "tail"), "Text nodes are text or tail, found %s" % key
-            if key == "text":
-                return node
-            # else: fallback to "normal" processing
-        elif node in self.fragmentChildren:
-            return None
-
-        return node.getparent()
diff --git a/lib/bleach/_vendor/html5lib/treewalkers/genshi.py b/lib/bleach/_vendor/html5lib/treewalkers/genshi.py
deleted file mode 100644
index 7483be27..00000000
--- a/lib/bleach/_vendor/html5lib/treewalkers/genshi.py
+++ /dev/null
@@ -1,69 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-from genshi.core import QName
-from genshi.core import START, END, XML_NAMESPACE, DOCTYPE, TEXT
-from genshi.core import START_NS, END_NS, START_CDATA, END_CDATA, PI, COMMENT
-
-from . import base
-
-from ..constants import voidElements, namespaces
-
-
-class TreeWalker(base.TreeWalker):
-    def __iter__(self):
-        # Buffer the events so we can pass in the following one
-        previous = None
-        for event in self.tree:
-            if previous is not None:
-                for token in self.tokens(previous, event):
-                    yield token
-            previous = event
-
-        # Don't forget the final event!
-        if previous is not None:
-            for token in self.tokens(previous, None):
-                yield token
-
-    def tokens(self, event, next):
-        kind, data, _ = event
-        if kind == START:
-            tag, attribs = data
-            name = tag.localname
-            namespace = tag.namespace
-            converted_attribs = {}
-            for k, v in attribs:
-                if isinstance(k, QName):
-                    converted_attribs[(k.namespace, k.localname)] = v
-                else:
-                    converted_attribs[(None, k)] = v
-
-            if namespace == namespaces["html"] and name in voidElements:
-                for token in self.emptyTag(namespace, name, converted_attribs,
-                                           not next or next[0] != END or
-                                           next[1] != tag):
-                    yield token
-            else:
-                yield self.startTag(namespace, name, converted_attribs)
-
-        elif kind == END:
-            name = data.localname
-            namespace = data.namespace
-            if namespace != namespaces["html"] or name not in voidElements:
-                yield self.endTag(namespace, name)
-
-        elif kind == COMMENT:
-            yield self.comment(data)
-
-        elif kind == TEXT:
-            for token in self.text(data):
-                yield token
-
-        elif kind == DOCTYPE:
-            yield self.doctype(*data)
-
-        elif kind in (XML_NAMESPACE, DOCTYPE, START_NS, END_NS,
-                      START_CDATA, END_CDATA, PI):
-            pass
-
-        else:
-            yield self.unknown(kind)
diff --git a/lib/bleach/_vendor/parse.py b/lib/bleach/_vendor/parse.py
deleted file mode 100644
index ac6e7a9c..00000000
--- a/lib/bleach/_vendor/parse.py
+++ /dev/null
@@ -1,1078 +0,0 @@
-"""Parse (absolute and relative) URLs.
-
-urlparse module is based upon the following RFC specifications.
-
-RFC 3986 (STD66): "Uniform Resource Identifiers" by T. Berners-Lee, R. Fielding
-and L.  Masinter, January 2005.
-
-RFC 2732 : "Format for Literal IPv6 Addresses in URL's by R.Hinden, B.Carpenter
-and L.Masinter, December 1999.
-
-RFC 2396:  "Uniform Resource Identifiers (URI)": Generic Syntax by T.
-Berners-Lee, R. Fielding, and L. Masinter, August 1998.
-
-RFC 2368: "The mailto URL scheme", by P.Hoffman , L Masinter, J. Zawinski, July 1998.
-
-RFC 1808: "Relative Uniform Resource Locators", by R. Fielding, UC Irvine, June
-1995.
-
-RFC 1738: "Uniform Resource Locators (URL)" by T. Berners-Lee, L. Masinter, M.
-McCahill, December 1994
-
-RFC 3986 is considered the current standard and any future changes to
-urlparse module should conform with it.  The urlparse module is
-currently not entirely compliant with this RFC due to defacto
-scenarios for parsing, and for backward compatibility purposes, some
-parsing quirks from older RFCs are retained. The testcases in
-test_urlparse.py provides a good indicator of parsing behavior.
-"""
-
-import re
-import sys
-import collections
-
-__all__ = ["urlparse", "urlunparse", "urljoin", "urldefrag",
-           "urlsplit", "urlunsplit", "urlencode", "parse_qs",
-           "parse_qsl", "quote", "quote_plus", "quote_from_bytes",
-           "unquote", "unquote_plus", "unquote_to_bytes",
-           "DefragResult", "ParseResult", "SplitResult",
-           "DefragResultBytes", "ParseResultBytes", "SplitResultBytes"]
-
-# A classification of schemes.
-# The empty string classifies URLs with no scheme specified,
-# being the default value returned by “urlsplit� and “urlparse�.
-
-uses_relative = ['', 'ftp', 'http', 'gopher', 'nntp', 'imap',
-                 'wais', 'file', 'https', 'shttp', 'mms',
-                 'prospero', 'rtsp', 'rtspu', 'sftp',
-                 'svn', 'svn+ssh', 'ws', 'wss']
-
-uses_netloc = ['', 'ftp', 'http', 'gopher', 'nntp', 'telnet',
-               'imap', 'wais', 'file', 'mms', 'https', 'shttp',
-               'snews', 'prospero', 'rtsp', 'rtspu', 'rsync',
-               'svn', 'svn+ssh', 'sftp', 'nfs', 'git', 'git+ssh',
-               'ws', 'wss']
-
-uses_params = ['', 'ftp', 'hdl', 'prospero', 'http', 'imap',
-               'https', 'shttp', 'rtsp', 'rtspu', 'sip', 'sips',
-               'mms', 'sftp', 'tel']
-
-# These are not actually used anymore, but should stay for backwards
-# compatibility.  (They are undocumented, but have a public-looking name.)
-
-non_hierarchical = ['gopher', 'hdl', 'mailto', 'news',
-                    'telnet', 'wais', 'imap', 'snews', 'sip', 'sips']
-
-uses_query = ['', 'http', 'wais', 'imap', 'https', 'shttp', 'mms',
-              'gopher', 'rtsp', 'rtspu', 'sip', 'sips']
-
-uses_fragment = ['', 'ftp', 'hdl', 'http', 'gopher', 'news',
-                 'nntp', 'wais', 'https', 'shttp', 'snews',
-                 'file', 'prospero']
-
-# Characters valid in scheme names
-scheme_chars = ('abcdefghijklmnopqrstuvwxyz'
-                'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-                '0123456789'
-                '+-.')
-
-# Unsafe bytes to be removed per WHATWG spec
-_UNSAFE_URL_BYTES_TO_REMOVE = ['\t', '\r', '\n']
-
-# XXX: Consider replacing with functools.lru_cache
-MAX_CACHE_SIZE = 20
-_parse_cache = {}
-
-def clear_cache():
-    """Clear the parse cache and the quoters cache."""
-    _parse_cache.clear()
-    _safe_quoters.clear()
-
-
-# Helpers for bytes handling
-# For 3.2, we deliberately require applications that
-# handle improperly quoted URLs to do their own
-# decoding and encoding. If valid use cases are
-# presented, we may relax this by using latin-1
-# decoding internally for 3.3
-_implicit_encoding = 'ascii'
-_implicit_errors = 'strict'
-
-def _noop(obj):
-    return obj
-
-def _encode_result(obj, encoding=_implicit_encoding,
-                        errors=_implicit_errors):
-    return obj.encode(encoding, errors)
-
-def _decode_args(args, encoding=_implicit_encoding,
-                       errors=_implicit_errors):
-    return tuple(x.decode(encoding, errors) if x else '' for x in args)
-
-def _coerce_args(*args):
-    # Invokes decode if necessary to create str args
-    # and returns the coerced inputs along with
-    # an appropriate result coercion function
-    #   - noop for str inputs
-    #   - encoding function otherwise
-    str_input = isinstance(args[0], str)
-    for arg in args[1:]:
-        # We special-case the empty string to support the
-        # "scheme=''" default argument to some functions
-        if arg and isinstance(arg, str) != str_input:
-            raise TypeError("Cannot mix str and non-str arguments")
-    if str_input:
-        return args + (_noop,)
-    return _decode_args(args) + (_encode_result,)
-
-# Result objects are more helpful than simple tuples
-class _ResultMixinStr(object):
-    """Standard approach to encoding parsed results from str to bytes"""
-    __slots__ = ()
-
-    def encode(self, encoding='ascii', errors='strict'):
-        return self._encoded_counterpart(*(x.encode(encoding, errors) for x in self))
-
-
-class _ResultMixinBytes(object):
-    """Standard approach to decoding parsed results from bytes to str"""
-    __slots__ = ()
-
-    def decode(self, encoding='ascii', errors='strict'):
-        return self._decoded_counterpart(*(x.decode(encoding, errors) for x in self))
-
-
-class _NetlocResultMixinBase(object):
-    """Shared methods for the parsed result objects containing a netloc element"""
-    __slots__ = ()
-
-    @property
-    def username(self):
-        return self._userinfo[0]
-
-    @property
-    def password(self):
-        return self._userinfo[1]
-
-    @property
-    def hostname(self):
-        hostname = self._hostinfo[0]
-        if not hostname:
-            return None
-        # Scoped IPv6 address may have zone info, which must not be lowercased
-        # like http://[fe80::822a:a8ff:fe49:470c%tESt]:1234/keys
-        separator = '%' if isinstance(hostname, str) else b'%'
-        hostname, percent, zone = hostname.partition(separator)
-        return hostname.lower() + percent + zone
-
-    @property
-    def port(self):
-        port = self._hostinfo[1]
-        if port is not None:
-            port = int(port, 10)
-            if not ( 0 <= port <= 65535):
-                raise ValueError("Port out of range 0-65535")
-        return port
-
-
-class _NetlocResultMixinStr(_NetlocResultMixinBase, _ResultMixinStr):
-    __slots__ = ()
-
-    @property
-    def _userinfo(self):
-        netloc = self.netloc
-        userinfo, have_info, hostinfo = netloc.rpartition('@')
-        if have_info:
-            username, have_password, password = userinfo.partition(':')
-            if not have_password:
-                password = None
-        else:
-            username = password = None
-        return username, password
-
-    @property
-    def _hostinfo(self):
-        netloc = self.netloc
-        _, _, hostinfo = netloc.rpartition('@')
-        _, have_open_br, bracketed = hostinfo.partition('[')
-        if have_open_br:
-            hostname, _, port = bracketed.partition(']')
-            _, _, port = port.partition(':')
-        else:
-            hostname, _, port = hostinfo.partition(':')
-        if not port:
-            port = None
-        return hostname, port
-
-
-class _NetlocResultMixinBytes(_NetlocResultMixinBase, _ResultMixinBytes):
-    __slots__ = ()
-
-    @property
-    def _userinfo(self):
-        netloc = self.netloc
-        userinfo, have_info, hostinfo = netloc.rpartition(b'@')
-        if have_info:
-            username, have_password, password = userinfo.partition(b':')
-            if not have_password:
-                password = None
-        else:
-            username = password = None
-        return username, password
-
-    @property
-    def _hostinfo(self):
-        netloc = self.netloc
-        _, _, hostinfo = netloc.rpartition(b'@')
-        _, have_open_br, bracketed = hostinfo.partition(b'[')
-        if have_open_br:
-            hostname, _, port = bracketed.partition(b']')
-            _, _, port = port.partition(b':')
-        else:
-            hostname, _, port = hostinfo.partition(b':')
-        if not port:
-            port = None
-        return hostname, port
-
-
-from collections import namedtuple
-
-_DefragResultBase = namedtuple('DefragResult', 'url fragment')
-_SplitResultBase = namedtuple(
-    'SplitResult', 'scheme netloc path query fragment')
-_ParseResultBase = namedtuple(
-    'ParseResult', 'scheme netloc path params query fragment')
-
-_DefragResultBase.__doc__ = """
-DefragResult(url, fragment)
-
-A 2-tuple that contains the url without fragment identifier and the fragment
-identifier as a separate argument.
-"""
-
-_DefragResultBase.url.__doc__ = """The URL with no fragment identifier."""
-
-_DefragResultBase.fragment.__doc__ = """
-Fragment identifier separated from URL, that allows indirect identification of a
-secondary resource by reference to a primary resource and additional identifying
-information.
-"""
-
-_SplitResultBase.__doc__ = """
-SplitResult(scheme, netloc, path, query, fragment)
-
-A 5-tuple that contains the different components of a URL. Similar to
-ParseResult, but does not split params.
-"""
-
-_SplitResultBase.scheme.__doc__ = """Specifies URL scheme for the request."""
-
-_SplitResultBase.netloc.__doc__ = """
-Network location where the request is made to.
-"""
-
-_SplitResultBase.path.__doc__ = """
-The hierarchical path, such as the path to a file to download.
-"""
-
-_SplitResultBase.query.__doc__ = """
-The query component, that contains non-hierarchical data, that along with data
-in path component, identifies a resource in the scope of URI's scheme and
-network location.
-"""
-
-_SplitResultBase.fragment.__doc__ = """
-Fragment identifier, that allows indirect identification of a secondary resource
-by reference to a primary resource and additional identifying information.
-"""
-
-_ParseResultBase.__doc__ = """
-ParseResult(scheme, netloc, path, params,  query, fragment)
-
-A 6-tuple that contains components of a parsed URL.
-"""
-
-_ParseResultBase.scheme.__doc__ = _SplitResultBase.scheme.__doc__
-_ParseResultBase.netloc.__doc__ = _SplitResultBase.netloc.__doc__
-_ParseResultBase.path.__doc__ = _SplitResultBase.path.__doc__
-_ParseResultBase.params.__doc__ = """
-Parameters for last path element used to dereference the URI in order to provide
-access to perform some operation on the resource.
-"""
-
-_ParseResultBase.query.__doc__ = _SplitResultBase.query.__doc__
-_ParseResultBase.fragment.__doc__ = _SplitResultBase.fragment.__doc__
-
-
-# For backwards compatibility, alias _NetlocResultMixinStr
-# ResultBase is no longer part of the documented API, but it is
-# retained since deprecating it isn't worth the hassle
-ResultBase = _NetlocResultMixinStr
-
-# Structured result objects for string data
-class DefragResult(_DefragResultBase, _ResultMixinStr):
-    __slots__ = ()
-    def geturl(self):
-        if self.fragment:
-            return self.url + '#' + self.fragment
-        else:
-            return self.url
-
-class SplitResult(_SplitResultBase, _NetlocResultMixinStr):
-    __slots__ = ()
-    def geturl(self):
-        return urlunsplit(self)
-
-class ParseResult(_ParseResultBase, _NetlocResultMixinStr):
-    __slots__ = ()
-    def geturl(self):
-        return urlunparse(self)
-
-# Structured result objects for bytes data
-class DefragResultBytes(_DefragResultBase, _ResultMixinBytes):
-    __slots__ = ()
-    def geturl(self):
-        if self.fragment:
-            return self.url + b'#' + self.fragment
-        else:
-            return self.url
-
-class SplitResultBytes(_SplitResultBase, _NetlocResultMixinBytes):
-    __slots__ = ()
-    def geturl(self):
-        return urlunsplit(self)
-
-class ParseResultBytes(_ParseResultBase, _NetlocResultMixinBytes):
-    __slots__ = ()
-    def geturl(self):
-        return urlunparse(self)
-
-# Set up the encode/decode result pairs
-def _fix_result_transcoding():
-    _result_pairs = (
-        (DefragResult, DefragResultBytes),
-        (SplitResult, SplitResultBytes),
-        (ParseResult, ParseResultBytes),
-    )
-    for _decoded, _encoded in _result_pairs:
-        _decoded._encoded_counterpart = _encoded
-        _encoded._decoded_counterpart = _decoded
-
-_fix_result_transcoding()
-del _fix_result_transcoding
-
-def urlparse(url, scheme='', allow_fragments=True):
-    """Parse a URL into 6 components:
-    <scheme>://<netloc>/<path>;<params>?<query>#<fragment>
-    Return a 6-tuple: (scheme, netloc, path, params, query, fragment).
-    Note that we don't break the components up in smaller bits
-    (e.g. netloc is a single string) and we don't expand % escapes."""
-    url, scheme, _coerce_result = _coerce_args(url, scheme)
-    splitresult = urlsplit(url, scheme, allow_fragments)
-    scheme, netloc, url, query, fragment = splitresult
-    if scheme in uses_params and ';' in url:
-        url, params = _splitparams(url)
-    else:
-        params = ''
-    result = ParseResult(scheme, netloc, url, params, query, fragment)
-    return _coerce_result(result)
-
-def _splitparams(url):
-    if '/'  in url:
-        i = url.find(';', url.rfind('/'))
-        if i < 0:
-            return url, ''
-    else:
-        i = url.find(';')
-    return url[:i], url[i+1:]
-
-def _splitnetloc(url, start=0):
-    delim = len(url)   # position of end of domain part of url, default is end
-    for c in '/?#':    # look for delimiters; the order is NOT important
-        wdelim = url.find(c, start)        # find first of this delim
-        if wdelim >= 0:                    # if found
-            delim = min(delim, wdelim)     # use earliest delim position
-    return url[start:delim], url[delim:]   # return (domain, rest)
-
-def _checknetloc(netloc):
-    if not netloc or not any(ord(c) > 127 for c in netloc):
-        return
-    # looking for characters like \u2100 that expand to 'a/c'
-    # IDNA uses NFKC equivalence, so normalize for this check
-    import unicodedata
-    n = netloc.replace('@', '')   # ignore characters already included
-    n = n.replace(':', '')        # but not the surrounding text
-    n = n.replace('#', '')
-    n = n.replace('?', '')
-    netloc2 = unicodedata.normalize('NFKC', n)
-    if n == netloc2:
-        return
-    for c in '/?#@:':
-        if c in netloc2:
-            raise ValueError("netloc '" + netloc + "' contains invalid " +
-                             "characters under NFKC normalization")
-
-def _remove_unsafe_bytes_from_url(url):
-    for b in _UNSAFE_URL_BYTES_TO_REMOVE:
-        url = url.replace(b, "")
-    return url
-
-def urlsplit(url, scheme='', allow_fragments=True):
-    """Parse a URL into 5 components:
-    <scheme>://<netloc>/<path>?<query>#<fragment>
-    Return a 5-tuple: (scheme, netloc, path, query, fragment).
-    Note that we don't break the components up in smaller bits
-    (e.g. netloc is a single string) and we don't expand % escapes."""
-    url, scheme, _coerce_result = _coerce_args(url, scheme)
-    url = _remove_unsafe_bytes_from_url(url)
-    scheme = _remove_unsafe_bytes_from_url(scheme)
-    allow_fragments = bool(allow_fragments)
-    key = url, scheme, allow_fragments, type(url), type(scheme)
-    cached = _parse_cache.get(key, None)
-    if cached:
-        return _coerce_result(cached)
-    if len(_parse_cache) >= MAX_CACHE_SIZE: # avoid runaway growth
-        clear_cache()
-    netloc = query = fragment = ''
-    i = url.find(':')
-    if i > 0:
-        if url[:i] == 'http': # optimize the common case
-            scheme = url[:i].lower()
-            url = url[i+1:]
-            if url[:2] == '//':
-                netloc, url = _splitnetloc(url, 2)
-                if (('[' in netloc and ']' not in netloc) or
-                        (']' in netloc and '[' not in netloc)):
-                    raise ValueError("Invalid IPv6 URL")
-            if allow_fragments and '#' in url:
-                url, fragment = url.split('#', 1)
-            if '?' in url:
-                url, query = url.split('?', 1)
-            _checknetloc(netloc)
-            v = SplitResult(scheme, netloc, url, query, fragment)
-            _parse_cache[key] = v
-            return _coerce_result(v)
-        for c in url[:i]:
-            if c not in scheme_chars:
-                break
-        else:
-            # make sure "url" is not actually a port number (in which case
-            # "scheme" is really part of the path)
-            rest = url[i+1:]
-            if not rest or any(c not in '0123456789' for c in rest):
-                # not a port number
-                scheme, url = url[:i].lower(), rest
-
-    if url[:2] == '//':
-        netloc, url = _splitnetloc(url, 2)
-        if (('[' in netloc and ']' not in netloc) or
-                (']' in netloc and '[' not in netloc)):
-            raise ValueError("Invalid IPv6 URL")
-    if allow_fragments and '#' in url:
-        url, fragment = url.split('#', 1)
-    if '?' in url:
-        url, query = url.split('?', 1)
-    _checknetloc(netloc)
-    v = SplitResult(scheme, netloc, url, query, fragment)
-    _parse_cache[key] = v
-    return _coerce_result(v)
-
-def urlunparse(components):
-    """Put a parsed URL back together again.  This may result in a
-    slightly different, but equivalent URL, if the URL that was parsed
-    originally had redundant delimiters, e.g. a ? with an empty query
-    (the draft states that these are equivalent)."""
-    scheme, netloc, url, params, query, fragment, _coerce_result = (
-                                                  _coerce_args(*components))
-    if params:
-        url = "%s;%s" % (url, params)
-    return _coerce_result(urlunsplit((scheme, netloc, url, query, fragment)))
-
-def urlunsplit(components):
-    """Combine the elements of a tuple as returned by urlsplit() into a
-    complete URL as a string. The data argument can be any five-item iterable.
-    This may result in a slightly different, but equivalent URL, if the URL that
-    was parsed originally had unnecessary delimiters (for example, a ? with an
-    empty query; the RFC states that these are equivalent)."""
-    scheme, netloc, url, query, fragment, _coerce_result = (
-                                          _coerce_args(*components))
-    if netloc or (scheme and scheme in uses_netloc and url[:2] != '//'):
-        if url and url[:1] != '/': url = '/' + url
-        url = '//' + (netloc or '') + url
-    if scheme:
-        url = scheme + ':' + url
-    if query:
-        url = url + '?' + query
-    if fragment:
-        url = url + '#' + fragment
-    return _coerce_result(url)
-
-def urljoin(base, url, allow_fragments=True):
-    """Join a base URL and a possibly relative URL to form an absolute
-    interpretation of the latter."""
-    if not base:
-        return url
-    if not url:
-        return base
-
-    base, url, _coerce_result = _coerce_args(base, url)
-    bscheme, bnetloc, bpath, bparams, bquery, bfragment = \
-            urlparse(base, '', allow_fragments)
-    scheme, netloc, path, params, query, fragment = \
-            urlparse(url, bscheme, allow_fragments)
-
-    if scheme != bscheme or scheme not in uses_relative:
-        return _coerce_result(url)
-    if scheme in uses_netloc:
-        if netloc:
-            return _coerce_result(urlunparse((scheme, netloc, path,
-                                              params, query, fragment)))
-        netloc = bnetloc
-
-    if not path and not params:
-        path = bpath
-        params = bparams
-        if not query:
-            query = bquery
-        return _coerce_result(urlunparse((scheme, netloc, path,
-                                          params, query, fragment)))
-
-    base_parts = bpath.split('/')
-    if base_parts[-1] != '':
-        # the last item is not a directory, so will not be taken into account
-        # in resolving the relative path
-        del base_parts[-1]
-
-    # for rfc3986, ignore all base path should the first character be root.
-    if path[:1] == '/':
-        segments = path.split('/')
-    else:
-        segments = base_parts + path.split('/')
-        # filter out elements that would cause redundant slashes on re-joining
-        # the resolved_path
-        segments[1:-1] = filter(None, segments[1:-1])
-
-    resolved_path = []
-
-    for seg in segments:
-        if seg == '..':
-            try:
-                resolved_path.pop()
-            except IndexError:
-                # ignore any .. segments that would otherwise cause an IndexError
-                # when popped from resolved_path if resolving for rfc3986
-                pass
-        elif seg == '.':
-            continue
-        else:
-            resolved_path.append(seg)
-
-    if segments[-1] in ('.', '..'):
-        # do some post-processing here. if the last segment was a relative dir,
-        # then we need to append the trailing '/'
-        resolved_path.append('')
-
-    return _coerce_result(urlunparse((scheme, netloc, '/'.join(
-        resolved_path) or '/', params, query, fragment)))
-
-
-def urldefrag(url):
-    """Removes any existing fragment from URL.
-
-    Returns a tuple of the defragmented URL and the fragment.  If
-    the URL contained no fragments, the second element is the
-    empty string.
-    """
-    url, _coerce_result = _coerce_args(url)
-    if '#' in url:
-        s, n, p, a, q, frag = urlparse(url)
-        defrag = urlunparse((s, n, p, a, q, ''))
-    else:
-        frag = ''
-        defrag = url
-    return _coerce_result(DefragResult(defrag, frag))
-
-_hexdig = '0123456789ABCDEFabcdef'
-_hextobyte = None
-
-def unquote_to_bytes(string):
-    """unquote_to_bytes('abc%20def') -> b'abc def'."""
-    # Note: strings are encoded as UTF-8. This is only an issue if it contains
-    # unescaped non-ASCII characters, which URIs should not.
-    if not string:
-        # Is it a string-like object?
-        string.split
-        return b''
-    if isinstance(string, str):
-        string = string.encode('utf-8')
-    bits = string.split(b'%')
-    if len(bits) == 1:
-        return string
-    res = [bits[0]]
-    append = res.append
-    # Delay the initialization of the table to not waste memory
-    # if the function is never called
-    global _hextobyte
-    if _hextobyte is None:
-        _hextobyte = {(a + b).encode(): bytes([int(a + b, 16)])
-                      for a in _hexdig for b in _hexdig}
-    for item in bits[1:]:
-        try:
-            append(_hextobyte[item[:2]])
-            append(item[2:])
-        except KeyError:
-            append(b'%')
-            append(item)
-    return b''.join(res)
-
-_asciire = re.compile('([\x00-\x7f]+)')
-
-def unquote(string, encoding='utf-8', errors='replace'):
-    """Replace %xx escapes by their single-character equivalent. The optional
-    encoding and errors parameters specify how to decode percent-encoded
-    sequences into Unicode characters, as accepted by the bytes.decode()
-    method.
-    By default, percent-encoded sequences are decoded with UTF-8, and invalid
-    sequences are replaced by a placeholder character.
-
-    unquote('abc%20def') -> 'abc def'.
-    """
-    if '%' not in string:
-        string.split
-        return string
-    if encoding is None:
-        encoding = 'utf-8'
-    if errors is None:
-        errors = 'replace'
-    bits = _asciire.split(string)
-    res = [bits[0]]
-    append = res.append
-    for i in range(1, len(bits), 2):
-        append(unquote_to_bytes(bits[i]).decode(encoding, errors))
-        append(bits[i + 1])
-    return ''.join(res)
-
-
-def parse_qs(qs, keep_blank_values=False, strict_parsing=False,
-             encoding='utf-8', errors='replace', max_num_fields=None, separator='&'):
-    """Parse a query given as a string argument.
-
-        Arguments:
-
-        qs: percent-encoded query string to be parsed
-
-        keep_blank_values: flag indicating whether blank values in
-            percent-encoded queries should be treated as blank strings.
-            A true value indicates that blanks should be retained as
-            blank strings.  The default false value indicates that
-            blank values are to be ignored and treated as if they were
-            not included.
-
-        strict_parsing: flag indicating what to do with parsing errors.
-            If false (the default), errors are silently ignored.
-            If true, errors raise a ValueError exception.
-
-        encoding and errors: specify how to decode percent-encoded sequences
-            into Unicode characters, as accepted by the bytes.decode() method.
-
-        max_num_fields: int. If set, then throws a ValueError if there
-            are more than n fields read by parse_qsl().
-
-        separator: str. The symbol to use for separating the query arguments.
-            Defaults to &.
-
-        Returns a dictionary.
-    """
-    parsed_result = {}
-    pairs = parse_qsl(qs, keep_blank_values, strict_parsing,
-                      encoding=encoding, errors=errors,
-                      max_num_fields=max_num_fields, separator=separator)
-    for name, value in pairs:
-        if name in parsed_result:
-            parsed_result[name].append(value)
-        else:
-            parsed_result[name] = [value]
-    return parsed_result
-
-
-def parse_qsl(qs, keep_blank_values=False, strict_parsing=False,
-              encoding='utf-8', errors='replace', max_num_fields=None, separator='&'):
-    """Parse a query given as a string argument.
-
-        Arguments:
-
-        qs: percent-encoded query string to be parsed
-
-        keep_blank_values: flag indicating whether blank values in
-            percent-encoded queries should be treated as blank strings.
-            A true value indicates that blanks should be retained as blank
-            strings.  The default false value indicates that blank values
-            are to be ignored and treated as if they were  not included.
-
-        strict_parsing: flag indicating what to do with parsing errors. If
-            false (the default), errors are silently ignored. If true,
-            errors raise a ValueError exception.
-
-        encoding and errors: specify how to decode percent-encoded sequences
-            into Unicode characters, as accepted by the bytes.decode() method.
-
-        max_num_fields: int. If set, then throws a ValueError
-            if there are more than n fields read by parse_qsl().
-
-        separator: str. The symbol to use for separating the query arguments.
-            Defaults to &.
-
-        Returns a list, as G-d intended.
-    """
-    qs, _coerce_result = _coerce_args(qs)
-
-    if not separator or (not isinstance(separator, (str, bytes))):
-        raise ValueError("Separator must be of type string or bytes.")
-
-    # If max_num_fields is defined then check that the number of fields
-    # is less than max_num_fields. This prevents a memory exhaustion DOS
-    # attack via post bodies with many fields.
-    if max_num_fields is not None:
-        num_fields = 1 + qs.count(separator)
-        if max_num_fields < num_fields:
-            raise ValueError('Max number of fields exceeded')
-
-    pairs = [s1 for s1 in qs.split(separator)]
-    r = []
-    for name_value in pairs:
-        if not name_value and not strict_parsing:
-            continue
-        nv = name_value.split('=', 1)
-        if len(nv) != 2:
-            if strict_parsing:
-                raise ValueError("bad query field: %r" % (name_value,))
-            # Handle case of a control-name with no equal sign
-            if keep_blank_values:
-                nv.append('')
-            else:
-                continue
-        if len(nv[1]) or keep_blank_values:
-            name = nv[0].replace('+', ' ')
-            name = unquote(name, encoding=encoding, errors=errors)
-            name = _coerce_result(name)
-            value = nv[1].replace('+', ' ')
-            value = unquote(value, encoding=encoding, errors=errors)
-            value = _coerce_result(value)
-            r.append((name, value))
-    return r
-
-def unquote_plus(string, encoding='utf-8', errors='replace'):
-    """Like unquote(), but also replace plus signs by spaces, as required for
-    unquoting HTML form values.
-
-    unquote_plus('%7e/abc+def') -> '~/abc def'
-    """
-    string = string.replace('+', ' ')
-    return unquote(string, encoding, errors)
-
-_ALWAYS_SAFE = frozenset(b'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-                         b'abcdefghijklmnopqrstuvwxyz'
-                         b'0123456789'
-                         b'_.-')
-_ALWAYS_SAFE_BYTES = bytes(_ALWAYS_SAFE)
-_safe_quoters = {}
-
-class Quoter(collections.defaultdict):
-    """A mapping from bytes (in range(0,256)) to strings.
-
-    String values are percent-encoded byte values, unless the key < 128, and
-    in the "safe" set (either the specified safe set, or default set).
-    """
-    # Keeps a cache internally, using defaultdict, for efficiency (lookups
-    # of cached keys don't call Python code at all).
-    def __init__(self, safe):
-        """safe: bytes object."""
-        self.safe = _ALWAYS_SAFE.union(safe)
-
-    def __repr__(self):
-        # Without this, will just display as a defaultdict
-        return "<%s %r>" % (self.__class__.__name__, dict(self))
-
-    def __missing__(self, b):
-        # Handle a cache miss. Store quoted string in cache and return.
-        res = chr(b) if b in self.safe else '%{:02X}'.format(b)
-        self[b] = res
-        return res
-
-def quote(string, safe='/', encoding=None, errors=None):
-    """quote('abc def') -> 'abc%20def'
-
-    Each part of a URL, e.g. the path info, the query, etc., has a
-    different set of reserved characters that must be quoted.
-
-    RFC 2396 Uniform Resource Identifiers (URI): Generic Syntax lists
-    the following reserved characters.
-
-    reserved    = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
-                  "$" | ","
-
-    Each of these characters is reserved in some component of a URL,
-    but not necessarily in all of them.
-
-    By default, the quote function is intended for quoting the path
-    section of a URL.  Thus, it will not encode '/'.  This character
-    is reserved, but in typical usage the quote function is being
-    called on a path where the existing slash characters are used as
-    reserved characters.
-
-    string and safe may be either str or bytes objects. encoding and errors
-    must not be specified if string is a bytes object.
-
-    The optional encoding and errors parameters specify how to deal with
-    non-ASCII characters, as accepted by the str.encode method.
-    By default, encoding='utf-8' (characters are encoded with UTF-8), and
-    errors='strict' (unsupported characters raise a UnicodeEncodeError).
-    """
-    if isinstance(string, str):
-        if not string:
-            return string
-        if encoding is None:
-            encoding = 'utf-8'
-        if errors is None:
-            errors = 'strict'
-        string = string.encode(encoding, errors)
-    else:
-        if encoding is not None:
-            raise TypeError("quote() doesn't support 'encoding' for bytes")
-        if errors is not None:
-            raise TypeError("quote() doesn't support 'errors' for bytes")
-    return quote_from_bytes(string, safe)
-
-def quote_plus(string, safe='', encoding=None, errors=None):
-    """Like quote(), but also replace ' ' with '+', as required for quoting
-    HTML form values. Plus signs in the original string are escaped unless
-    they are included in safe. It also does not have safe default to '/'.
-    """
-    # Check if ' ' in string, where string may either be a str or bytes.  If
-    # there are no spaces, the regular quote will produce the right answer.
-    if ((isinstance(string, str) and ' ' not in string) or
-        (isinstance(string, bytes) and b' ' not in string)):
-        return quote(string, safe, encoding, errors)
-    if isinstance(safe, str):
-        space = ' '
-    else:
-        space = b' '
-    string = quote(string, safe + space, encoding, errors)
-    return string.replace(' ', '+')
-
-def quote_from_bytes(bs, safe='/'):
-    """Like quote(), but accepts a bytes object rather than a str, and does
-    not perform string-to-bytes encoding.  It always returns an ASCII string.
-    quote_from_bytes(b'abc def\x3f') -> 'abc%20def%3f'
-    """
-    if not isinstance(bs, (bytes, bytearray)):
-        raise TypeError("quote_from_bytes() expected bytes")
-    if not bs:
-        return ''
-    if isinstance(safe, str):
-        # Normalize 'safe' by converting to bytes and removing non-ASCII chars
-        safe = safe.encode('ascii', 'ignore')
-    else:
-        safe = bytes([c for c in safe if c < 128])
-    if not bs.rstrip(_ALWAYS_SAFE_BYTES + safe):
-        return bs.decode()
-    try:
-        quoter = _safe_quoters[safe]
-    except KeyError:
-        _safe_quoters[safe] = quoter = Quoter(safe).__getitem__
-    return ''.join([quoter(char) for char in bs])
-
-def urlencode(query, doseq=False, safe='', encoding=None, errors=None,
-              quote_via=quote_plus):
-    """Encode a dict or sequence of two-element tuples into a URL query string.
-
-    If any values in the query arg are sequences and doseq is true, each
-    sequence element is converted to a separate parameter.
-
-    If the query arg is a sequence of two-element tuples, the order of the
-    parameters in the output will match the order of parameters in the
-    input.
-
-    The components of a query arg may each be either a string or a bytes type.
-
-    The safe, encoding, and errors parameters are passed down to the function
-    specified by quote_via (encoding and errors only if a component is a str).
-    """
-
-    if hasattr(query, "items"):
-        query = query.items()
-    else:
-        # It's a bother at times that strings and string-like objects are
-        # sequences.
-        try:
-            # non-sequence items should not work with len()
-            # non-empty strings will fail this
-            if len(query) and not isinstance(query[0], tuple):
-                raise TypeError
-            # Zero-length sequences of all types will get here and succeed,
-            # but that's a minor nit.  Since the original implementation
-            # allowed empty dicts that type of behavior probably should be
-            # preserved for consistency
-        except TypeError:
-            ty, va, tb = sys.exc_info()
-            raise TypeError("not a valid non-string sequence "
-                            "or mapping object").with_traceback(tb)
-
-    l = []
-    if not doseq:
-        for k, v in query:
-            if isinstance(k, bytes):
-                k = quote_via(k, safe)
-            else:
-                k = quote_via(str(k), safe, encoding, errors)
-
-            if isinstance(v, bytes):
-                v = quote_via(v, safe)
-            else:
-                v = quote_via(str(v), safe, encoding, errors)
-            l.append(k + '=' + v)
-    else:
-        for k, v in query:
-            if isinstance(k, bytes):
-                k = quote_via(k, safe)
-            else:
-                k = quote_via(str(k), safe, encoding, errors)
-
-            if isinstance(v, bytes):
-                v = quote_via(v, safe)
-                l.append(k + '=' + v)
-            elif isinstance(v, str):
-                v = quote_via(v, safe, encoding, errors)
-                l.append(k + '=' + v)
-            else:
-                try:
-                    # Is this a sufficient test for sequence-ness?
-                    x = len(v)
-                except TypeError:
-                    # not a sequence
-                    v = quote_via(str(v), safe, encoding, errors)
-                    l.append(k + '=' + v)
-                else:
-                    # loop over the sequence
-                    for elt in v:
-                        if isinstance(elt, bytes):
-                            elt = quote_via(elt, safe)
-                        else:
-                            elt = quote_via(str(elt), safe, encoding, errors)
-                        l.append(k + '=' + elt)
-    return '&'.join(l)
-
-def to_bytes(url):
-    """to_bytes(u"URL") --> 'URL'."""
-    # Most URL schemes require ASCII. If that changes, the conversion
-    # can be relaxed.
-    # XXX get rid of to_bytes()
-    if isinstance(url, str):
-        try:
-            url = url.encode("ASCII").decode()
-        except UnicodeError:
-            raise UnicodeError("URL " + repr(url) +
-                               " contains non-ASCII characters")
-    return url
-
-def unwrap(url):
-    """unwrap('<URL:type://host/path>') --> 'type://host/path'."""
-    url = str(url).strip()
-    if url[:1] == '<' and url[-1:] == '>':
-        url = url[1:-1].strip()
-    if url[:4] == 'URL:': url = url[4:].strip()
-    return url
-
-_typeprog = None
-def splittype(url):
-    """splittype('type:opaquestring') --> 'type', 'opaquestring'."""
-    global _typeprog
-    if _typeprog is None:
-        _typeprog = re.compile('([^/:]+):(.*)', re.DOTALL)
-
-    match = _typeprog.match(url)
-    if match:
-        scheme, data = match.groups()
-        return scheme.lower(), data
-    return None, url
-
-_hostprog = None
-def splithost(url):
-    """splithost('//host[:port]/path') --> 'host[:port]', '/path'."""
-    global _hostprog
-    if _hostprog is None:
-        _hostprog = re.compile('//([^/#?]*)(.*)', re.DOTALL)
-
-    match = _hostprog.match(url)
-    if match:
-        host_port, path = match.groups()
-        if path and path[0] != '/':
-            path = '/' + path
-        return host_port, path
-    return None, url
-
-def splituser(host):
-    """splituser('user[:passwd]@host[:port]') --> 'user[:passwd]', 'host[:port]'."""
-    user, delim, host = host.rpartition('@')
-    return (user if delim else None), host
-
-def splitpasswd(user):
-    """splitpasswd('user:passwd') -> 'user', 'passwd'."""
-    user, delim, passwd = user.partition(':')
-    return user, (passwd if delim else None)
-
-# splittag('/path#tag') --> '/path', 'tag'
-_portprog = None
-def splitport(host):
-    """splitport('host:port') --> 'host', 'port'."""
-    global _portprog
-    if _portprog is None:
-        _portprog = re.compile('(.*):([0-9]*)$', re.DOTALL)
-
-    match = _portprog.match(host)
-    if match:
-        host, port = match.groups()
-        if port:
-            return host, port
-    return host, None
-
-def splitnport(host, defport=-1):
-    """Split host and port, returning numeric port.
-    Return given default port if no ':' found; defaults to -1.
-    Return numerical port if a valid number are found after ':'.
-    Return None if ':' but not a valid number."""
-    host, delim, port = host.rpartition(':')
-    if not delim:
-        host = port
-    elif port:
-        try:
-            nport = int(port)
-        except ValueError:
-            nport = None
-        return host, nport
-    return host, defport
-
-def splitquery(url):
-    """splitquery('/path?query') --> '/path', 'query'."""
-    path, delim, query = url.rpartition('?')
-    if delim:
-        return path, query
-    return url, None
-
-def splittag(url):
-    """splittag('/path#tag') --> '/path', 'tag'."""
-    path, delim, tag = url.rpartition('#')
-    if delim:
-        return path, tag
-    return url, None
-
-def splitattr(url):
-    """splitattr('/path;attr1=value1;attr2=value2;...') ->
-        '/path', ['attr1=value1', 'attr2=value2', ...]."""
-    words = url.split(';')
-    return words[0], words[1:]
-
-def splitvalue(attr):
-    """splitvalue('attr=value') --> 'attr', 'value'."""
-    attr, delim, value = attr.partition('=')
-    return attr, (value if delim else None)
diff --git a/lib/bleach/_vendor/parse.py.SHA256SUM b/lib/bleach/_vendor/parse.py.SHA256SUM
deleted file mode 100644
index a324b193..00000000
--- a/lib/bleach/_vendor/parse.py.SHA256SUM
+++ /dev/null
@@ -1 +0,0 @@
-46af966e33b6247ae1d57d9459115a3eb46cda9f809c9f14e052abc2fe8dacb2  parse.py
diff --git a/lib/bleach/_vendor/vendor.txt b/lib/bleach/_vendor/vendor.txt
deleted file mode 100644
index f5162ab7..00000000
--- a/lib/bleach/_vendor/vendor.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-html5lib==1.1 \
-    --hash=sha256:0d78f8fde1c230e99fe37986a60526d7049ed4bf8a9fadbad5f00e22e58e041d \
-    --hash=sha256:b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f
diff --git a/lib/bleach/_vendor/vendor_install.sh b/lib/bleach/_vendor/vendor_install.sh
deleted file mode 100644
index 6c896ee4..00000000
--- a/lib/bleach/_vendor/vendor_install.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-set -e
-set -u
-set -o pipefail
-
-BLEACH_VENDOR_DIR=${BLEACH_VENDOR_DIR:-"."}
-DEST=${DEST:-"."}
-
-# Install with no dependencies
-pip install --no-binary all --no-compile --no-deps -r "${BLEACH_VENDOR_DIR}/vendor.txt" --target "${DEST}"
-
-# Apply patches
-(cd "${DEST}" && patch -p2 < 01_html5lib_six.patch)
-
-# install Python 3.6.14 urllib.urlparse for #536
-curl --proto '=https' --tlsv1.2 -o "${DEST}/parse.py" https://raw.githubusercontent.com/python/cpython/v3.6.14/Lib/urllib/parse.py
-(cd "${DEST}" && sha256sum parse.py > parse.py.SHA256SUM)
diff --git a/lib/bleach/callbacks.py b/lib/bleach/callbacks.py
deleted file mode 100644
index c895203d..00000000
--- a/lib/bleach/callbacks.py
+++ /dev/null
@@ -1,32 +0,0 @@
-"""A set of basic callbacks for bleach.linkify."""
-
-
-def nofollow(attrs, new=False):
-    href_key = (None, "href")
-
-    if href_key not in attrs:
-        return attrs
-
-    if attrs[href_key].startswith("mailto:"):
-        return attrs
-
-    rel_key = (None, "rel")
-    rel_values = [val for val in attrs.get(rel_key, "").split(" ") if val]
-    if "nofollow" not in [rel_val.lower() for rel_val in rel_values]:
-        rel_values.append("nofollow")
-    attrs[rel_key] = " ".join(rel_values)
-
-    return attrs
-
-
-def target_blank(attrs, new=False):
-    href_key = (None, "href")
-
-    if href_key not in attrs:
-        return attrs
-
-    if attrs[href_key].startswith("mailto:"):
-        return attrs
-
-    attrs[(None, "target")] = "_blank"
-    return attrs
diff --git a/lib/bleach/css_sanitizer.py b/lib/bleach/css_sanitizer.py
deleted file mode 100644
index 489dd6bc..00000000
--- a/lib/bleach/css_sanitizer.py
+++ /dev/null
@@ -1,104 +0,0 @@
-import tinycss2
-
-
-ALLOWED_CSS_PROPERTIES = frozenset(
-    (
-        "azimuth",
-        "background-color",
-        "border-bottom-color",
-        "border-collapse",
-        "border-color",
-        "border-left-color",
-        "border-right-color",
-        "border-top-color",
-        "clear",
-        "color",
-        "cursor",
-        "direction",
-        "display",
-        "elevation",
-        "float",
-        "font",
-        "font-family",
-        "font-size",
-        "font-style",
-        "font-variant",
-        "font-weight",
-        "height",
-        "letter-spacing",
-        "line-height",
-        "overflow",
-        "pause",
-        "pause-after",
-        "pause-before",
-        "pitch",
-        "pitch-range",
-        "richness",
-        "speak",
-        "speak-header",
-        "speak-numeral",
-        "speak-punctuation",
-        "speech-rate",
-        "stress",
-        "text-align",
-        "text-decoration",
-        "text-indent",
-        "unicode-bidi",
-        "vertical-align",
-        "voice-family",
-        "volume",
-        "white-space",
-        "width",
-    )
-)
-
-
-ALLOWED_SVG_PROPERTIES = frozenset(
-    (
-        "fill",
-        "fill-opacity",
-        "fill-rule",
-        "stroke",
-        "stroke-width",
-        "stroke-linecap",
-        "stroke-linejoin",
-        "stroke-opacity",
-    )
-)
-
-
-class CSSSanitizer:
-    def __init__(
-        self,
-        allowed_css_properties=ALLOWED_CSS_PROPERTIES,
-        allowed_svg_properties=ALLOWED_SVG_PROPERTIES,
-    ):
-        self.allowed_css_properties = allowed_css_properties
-        self.allowed_svg_properties = allowed_svg_properties
-
-    def sanitize_css(self, style):
-        """Sanitizes css in style tags"""
-        parsed = tinycss2.parse_declaration_list(style)
-
-        if not parsed:
-            return ""
-
-        new_tokens = []
-        for token in parsed:
-            if token.type == "declaration":
-                if (
-                    token.lower_name in self.allowed_css_properties
-                    or token.lower_name in self.allowed_svg_properties
-                ):
-                    new_tokens.append(token)
-            elif token.type in ("comment", "whitespace"):
-                if new_tokens and new_tokens[-1].type != token.type:
-                    new_tokens.append(token)
-
-            # NOTE(willkg): We currently don't handle AtRule or ParseError and
-            # so both get silently thrown out
-
-        if not new_tokens:
-            return ""
-
-        return tinycss2.serialize(new_tokens).strip()
diff --git a/lib/bleach/html5lib_shim.py b/lib/bleach/html5lib_shim.py
deleted file mode 100644
index f083db75..00000000
--- a/lib/bleach/html5lib_shim.py
+++ /dev/null
@@ -1,757 +0,0 @@
-# flake8: noqa
-"""
-Shim module between Bleach and html5lib. This makes it easier to upgrade the
-html5lib library without having to change a lot of code.
-"""
-
-import re
-import string
-import warnings
-
-# ignore html5lib deprecation warnings to use bleach; we are bleach
-# apply before we import submodules that import html5lib
-warnings.filterwarnings(
-    "ignore",
-    message="html5lib's sanitizer is deprecated",
-    category=DeprecationWarning,
-    module="bleach._vendor.html5lib",
-)
-
-from bleach._vendor.html5lib import (  # noqa: E402 module level import not at top of file
-    HTMLParser,
-    getTreeWalker,
-)
-from bleach._vendor.html5lib import (
-    constants,
-)  # noqa: E402 module level import not at top of file
-from bleach._vendor.html5lib.constants import (  # noqa: E402 module level import not at top of file
-    namespaces,
-    prefixes,
-)
-from bleach._vendor.html5lib.constants import (
-    _ReparseException as ReparseException,
-)  # noqa: E402 module level import not at top of file
-from bleach._vendor.html5lib.filters.base import (
-    Filter,
-)  # noqa: E402 module level import not at top of file
-from bleach._vendor.html5lib.filters.sanitizer import (
-    allowed_protocols,
-    allowed_css_properties,
-    allowed_svg_properties,
-    attr_val_is_uri,
-    svg_attr_val_allows_ref,
-    svg_allow_local_href,
-)  # noqa: E402 module level import not at top of file
-from bleach._vendor.html5lib.filters.sanitizer import (
-    Filter as SanitizerFilter,
-)  # noqa: E402 module level import not at top of file
-from bleach._vendor.html5lib._inputstream import (
-    HTMLInputStream,
-)  # noqa: E402 module level import not at top of file
-from bleach._vendor.html5lib.serializer import (
-    escape,
-    HTMLSerializer,
-)  # noqa: E402 module level import not at top of file
-from bleach._vendor.html5lib._tokenizer import (
-    attributeMap,
-    HTMLTokenizer,
-)  # noqa: E402 module level import not at top of file
-from bleach._vendor.html5lib._trie import (
-    Trie,
-)  # noqa: E402 module level import not at top of file
-
-
-#: Map of entity name to expanded entity
-ENTITIES = constants.entities
-
-#: Trie of html entity string -> character representation
-ENTITIES_TRIE = Trie(ENTITIES)
-
-#: Token type constants--these never change
-TAG_TOKEN_TYPES = {
-    constants.tokenTypes["StartTag"],
-    constants.tokenTypes["EndTag"],
-    constants.tokenTypes["EmptyTag"],
-}
-TAG_TOKEN_TYPE_START = constants.tokenTypes["StartTag"]
-TAG_TOKEN_TYPE_END = constants.tokenTypes["EndTag"]
-TAG_TOKEN_TYPE_CHARACTERS = constants.tokenTypes["Characters"]
-TAG_TOKEN_TYPE_PARSEERROR = constants.tokenTypes["ParseError"]
-
-
-#: List of valid HTML tags, from WHATWG HTML Living Standard as of 2018-10-17
-#: https://html.spec.whatwg.org/multipage/indices.html#elements-3
-HTML_TAGS = frozenset(
-    (
-        "a",
-        "abbr",
-        "address",
-        "area",
-        "article",
-        "aside",
-        "audio",
-        "b",
-        "base",
-        "bdi",
-        "bdo",
-        "blockquote",
-        "body",
-        "br",
-        "button",
-        "canvas",
-        "caption",
-        "cite",
-        "code",
-        "col",
-        "colgroup",
-        "data",
-        "datalist",
-        "dd",
-        "del",
-        "details",
-        "dfn",
-        "dialog",
-        "div",
-        "dl",
-        "dt",
-        "em",
-        "embed",
-        "fieldset",
-        "figcaption",
-        "figure",
-        "footer",
-        "form",
-        "h1",
-        "h2",
-        "h3",
-        "h4",
-        "h5",
-        "h6",
-        "head",
-        "header",
-        "hgroup",
-        "hr",
-        "html",
-        "i",
-        "iframe",
-        "img",
-        "input",
-        "ins",
-        "kbd",
-        "keygen",
-        "label",
-        "legend",
-        "li",
-        "link",
-        "map",
-        "mark",
-        "menu",
-        "meta",
-        "meter",
-        "nav",
-        "noscript",
-        "object",
-        "ol",
-        "optgroup",
-        "option",
-        "output",
-        "p",
-        "param",
-        "picture",
-        "pre",
-        "progress",
-        "q",
-        "rp",
-        "rt",
-        "ruby",
-        "s",
-        "samp",
-        "script",
-        "section",
-        "select",
-        "slot",
-        "small",
-        "source",
-        "span",
-        "strong",
-        "style",
-        "sub",
-        "summary",
-        "sup",
-        "table",
-        "tbody",
-        "td",
-        "template",
-        "textarea",
-        "tfoot",
-        "th",
-        "thead",
-        "time",
-        "title",
-        "tr",
-        "track",
-        "u",
-        "ul",
-        "var",
-        "video",
-        "wbr",
-    )
-)
-
-
-#: List of block level HTML tags, as per https://github.com/mozilla/bleach/issues/369
-#: from mozilla on 2019.07.11
-#: https://developer.mozilla.org/en-US/docs/Web/HTML/Block-level_elements#Elements
-HTML_TAGS_BLOCK_LEVEL = frozenset(
-    (
-        "address",
-        "article",
-        "aside",
-        "blockquote",
-        "details",
-        "dialog",
-        "dd",
-        "div",
-        "dl",
-        "dt",
-        "fieldset",
-        "figcaption",
-        "figure",
-        "footer",
-        "form",
-        "h1",
-        "h2",
-        "h3",
-        "h4",
-        "h5",
-        "h6",
-        "header",
-        "hgroup",
-        "hr",
-        "li",
-        "main",
-        "nav",
-        "ol",
-        "p",
-        "pre",
-        "section",
-        "table",
-        "ul",
-    )
-)
-
-
-class InputStreamWithMemory:
-    """Wraps an HTMLInputStream to remember characters since last <
-
-    This wraps existing HTMLInputStream classes to keep track of the stream
-    since the last < which marked an open tag state.
-
-    """
-
-    def __init__(self, inner_stream):
-        self._inner_stream = inner_stream
-        self.reset = self._inner_stream.reset
-        self.position = self._inner_stream.position
-        self._buffer = []
-
-    @property
-    def errors(self):
-        return self._inner_stream.errors
-
-    @property
-    def charEncoding(self):
-        return self._inner_stream.charEncoding
-
-    @property
-    def changeEncoding(self):
-        return self._inner_stream.changeEncoding
-
-    def char(self):
-        c = self._inner_stream.char()
-        # char() can return None if EOF, so ignore that
-        if c:
-            self._buffer.append(c)
-        return c
-
-    def charsUntil(self, characters, opposite=False):
-        chars = self._inner_stream.charsUntil(characters, opposite=opposite)
-        self._buffer.extend(list(chars))
-        return chars
-
-    def unget(self, char):
-        if self._buffer:
-            self._buffer.pop(-1)
-        return self._inner_stream.unget(char)
-
-    def get_tag(self):
-        """Returns the stream history since last '<'
-
-        Since the buffer starts at the last '<' as as seen by tagOpenState(),
-        we know that everything from that point to when this method is called
-        is the "tag" that is being tokenized.
-
-        """
-        return "".join(self._buffer)
-
-    def start_tag(self):
-        """Resets stream history to just '<'
-
-        This gets called by tagOpenState() which marks a '<' that denotes an
-        open tag. Any time we see that, we reset the buffer.
-
-        """
-        self._buffer = ["<"]
-
-
-class BleachHTMLTokenizer(HTMLTokenizer):
-    """Tokenizer that doesn't consume character entities"""
-
-    def __init__(self, consume_entities=False, **kwargs):
-        super().__init__(**kwargs)
-
-        self.consume_entities = consume_entities
-
-        # Wrap the stream with one that remembers the history
-        self.stream = InputStreamWithMemory(self.stream)
-
-        # Remember the last token emitted; needed for block element spacing
-        self.emitted_last_token = None
-
-    def __iter__(self):
-        last_error_token = None
-
-        for token in super().__iter__():
-            if last_error_token is not None:
-                if (
-                    last_error_token["data"] == "invalid-character-in-attribute-name"
-                    and token["type"] in TAG_TOKEN_TYPES
-                    and token.get("data")
-                ):
-                    # token["data"] is an html5lib attributeMap
-                    # (OrderedDict 3.7+ and dict otherwise)
-                    # of attr name to attr value
-                    #
-                    # Remove attribute names that have ', " or < in them
-                    # because those characters are invalid for attribute names.
-                    token["data"] = attributeMap(
-                        (attr_name, attr_value)
-                        for attr_name, attr_value in token["data"].items()
-                        if (
-                            '"' not in attr_name
-                            and "'" not in attr_name
-                            and "<" not in attr_name
-                        )
-                    )
-                    last_error_token = None
-                    yield token
-
-                elif (
-                    last_error_token["data"] == "expected-closing-tag-but-got-char"
-                    and self.parser.tags is not None
-                    and token["data"].lower().strip() not in self.parser.tags
-                ):
-                    # We've got either a malformed tag or a pseudo-tag or
-                    # something that html5lib wants to turn into a malformed
-                    # comment which Bleach clean() will drop so we interfere
-                    # with the token stream to handle it more correctly.
-                    #
-                    # If this is an allowed tag, it's malformed and we just let
-                    # the html5lib parser deal with it--we don't enter into this
-                    # block.
-                    #
-                    # If this is not an allowed tag, then we convert it to
-                    # characters and it'll get escaped in the sanitizer.
-                    token["data"] = self.stream.get_tag()
-                    token["type"] = TAG_TOKEN_TYPE_CHARACTERS
-
-                    last_error_token = None
-                    yield token
-
-                elif token["type"] == TAG_TOKEN_TYPE_PARSEERROR:
-                    # If the token is a parse error, then let the last_error_token
-                    # go, and make token the new last_error_token
-                    yield last_error_token
-                    last_error_token = token
-
-                else:
-                    yield last_error_token
-                    yield token
-                    last_error_token = None
-
-                continue
-
-            # If the token is a ParseError, we hold on to it so we can get the
-            # next token and potentially fix it.
-            if token["type"] == TAG_TOKEN_TYPE_PARSEERROR:
-                last_error_token = token
-                continue
-
-            yield token
-
-        if last_error_token:
-            if last_error_token["data"] == "eof-in-tag-name":
-                # Handle the case where the text being parsed ends with <
-                # followed by a series of characters. It's treated as a tag
-                # name that abruptly ends, but we should treat that like
-                # character data
-                yield {"type": TAG_TOKEN_TYPE_CHARACTERS, "data": self.stream.get_tag()}
-
-            elif last_error_token["data"] in (
-                "duplicate-attribute",
-                "eof-in-attribute-name",
-                "eof-in-attribute-value-no-quotes",
-                "expected-end-of-tag-but-got-eof",
-            ):
-                # Handle the case where the text being parsed ends with <
-                # followed by characters and then space and then:
-                #
-                # * more characters
-                # * more characters repeated with a space between (e.g. "abc abc")
-                # * more characters and then a space and then an EOF (e.g. "abc def ")
-                #
-                # These cases are treated as a tag name followed by an
-                # attribute that abruptly ends, but we should treat that like
-                # character data instead.
-                yield {"type": TAG_TOKEN_TYPE_CHARACTERS, "data": self.stream.get_tag()}
-
-            else:
-                yield last_error_token
-
-    def consumeEntity(self, allowedChar=None, fromAttribute=False):
-        # If this tokenizer is set to consume entities, then we can let the
-        # superclass do its thing.
-        if self.consume_entities:
-            return super().consumeEntity(allowedChar, fromAttribute)
-
-        # If this tokenizer is set to not consume entities, then we don't want
-        # to consume and convert them, so this overrides the html5lib tokenizer's
-        # consumeEntity so that it's now a no-op.
-        #
-        # However, when that gets called, it's consumed an &, so we put that back in
-        # the stream.
-        if fromAttribute:
-            self.currentToken["data"][-1][1] += "&"
-
-        else:
-            self.tokenQueue.append({"type": TAG_TOKEN_TYPE_CHARACTERS, "data": "&"})
-
-    def tagOpenState(self):
-        # This state marks a < that is either a StartTag, EndTag, EmptyTag,
-        # or ParseError. In all cases, we want to drop any stream history
-        # we've collected so far and we do that by calling start_tag() on
-        # the input stream wrapper.
-        self.stream.start_tag()
-        return super().tagOpenState()
-
-    def emitCurrentToken(self):
-        token = self.currentToken
-
-        if (
-            self.parser.tags is not None
-            and token["type"] in TAG_TOKEN_TYPES
-            and token["name"].lower() not in self.parser.tags
-        ):
-            # If this is a start/end/empty tag for a tag that's not in our
-            # allowed list, then it gets stripped or escaped. In both of these
-            # cases it gets converted to a Characters token.
-            if self.parser.strip:
-                if (
-                    self.emitted_last_token
-                    and token["type"] == TAG_TOKEN_TYPE_START
-                    and token["name"].lower() in HTML_TAGS_BLOCK_LEVEL
-                ):
-                    # If this is a block level tag we're stripping, we drop it
-                    # for a newline because that's what a browser would parse
-                    # it as
-                    new_data = "\n"
-                else:
-                    # For all other things being stripped, we throw in an empty
-                    # string token
-                    new_data = ""
-
-            else:
-                # If we're escaping the token, we want to escape the exact
-                # original string. Since tokenizing also normalizes data
-                # and this is a tag-like thing, we've lost some information.
-                # So we go back through the stream to get the original
-                # string and use that.
-                new_data = self.stream.get_tag()
-
-            new_token = {"type": TAG_TOKEN_TYPE_CHARACTERS, "data": new_data}
-
-            self.currentToken = self.emitted_last_token = new_token
-            self.tokenQueue.append(new_token)
-            self.state = self.dataState
-            return
-
-        self.emitted_last_token = self.currentToken
-        super().emitCurrentToken()
-
-
-class BleachHTMLParser(HTMLParser):
-    """Parser that uses BleachHTMLTokenizer"""
-
-    def __init__(self, tags, strip, consume_entities, **kwargs):
-        """
-        :arg tags: set of allowed tags--everything else is either stripped or
-            escaped; if None, then this doesn't look at tags at all
-        :arg strip: whether to strip disallowed tags (True) or escape them (False);
-            if tags=None, then this doesn't have any effect
-        :arg consume_entities: whether to consume entities (default behavior) or
-            leave them as is when tokenizing (BleachHTMLTokenizer-added behavior)
-
-        """
-        self.tags = (
-            frozenset((tag.lower() for tag in tags)) if tags is not None else None
-        )
-        self.strip = strip
-        self.consume_entities = consume_entities
-        super().__init__(**kwargs)
-
-    def _parse(
-        self, stream, innerHTML=False, container="div", scripting=True, **kwargs
-    ):
-        # set scripting=True to parse <noscript> as though JS is enabled to
-        # match the expected context in browsers
-        #
-        # https://html.spec.whatwg.org/multipage/scripting.html#the-noscript-element
-        #
-        # Override HTMLParser so we can swap out the tokenizer for our own.
-        self.innerHTMLMode = innerHTML
-        self.container = container
-        self.scripting = scripting
-        self.tokenizer = BleachHTMLTokenizer(
-            stream=stream, consume_entities=self.consume_entities, parser=self, **kwargs
-        )
-        self.reset()
-
-        try:
-            self.mainLoop()
-        except ReparseException:
-            self.reset()
-            self.mainLoop()
-
-
-def convert_entity(value):
-    """Convert an entity (minus the & and ; part) into what it represents
-
-    This handles numeric, hex, and text entities.
-
-    :arg value: the string (minus the ``&`` and ``;`` part) to convert
-
-    :returns: unicode character or None if it's an ambiguous ampersand that
-        doesn't match a character entity
-
-    """
-    if value[0] == "#":
-        if len(value) < 2:
-            return None
-
-        if value[1] in ("x", "X"):
-            # hex-encoded code point
-            int_as_string, base = value[2:], 16
-        else:
-            # decimal code point
-            int_as_string, base = value[1:], 10
-
-        if int_as_string == "":
-            return None
-
-        code_point = int(int_as_string, base)
-        if 0 < code_point < 0x110000:
-            return chr(code_point)
-        else:
-            return None
-
-    return ENTITIES.get(value, None)
-
-
-def convert_entities(text):
-    """Converts all found entities in the text
-
-    :arg text: the text to convert entities in
-
-    :returns: unicode text with converted entities
-
-    """
-    if "&" not in text:
-        return text
-
-    new_text = []
-    for part in next_possible_entity(text):
-        if not part:
-            continue
-
-        if part.startswith("&"):
-            entity = match_entity(part)
-            if entity is not None:
-                converted = convert_entity(entity)
-
-                # If it's not an ambiguous ampersand, then replace with the
-                # unicode character. Otherwise, we leave the entity in.
-                if converted is not None:
-                    new_text.append(converted)
-                    remainder = part[len(entity) + 2 :]
-                    if part:
-                        new_text.append(remainder)
-                    continue
-
-        new_text.append(part)
-
-    return "".join(new_text)
-
-
-def match_entity(stream):
-    """Returns first entity in stream or None if no entity exists
-
-    Note: For Bleach purposes, entities must start with a "&" and end with a
-    ";". This ignores ambiguous character entities that have no ";" at the end.
-
-    :arg stream: the character stream
-
-    :returns: the entity string without "&" or ";" if it's a valid character
-        entity; ``None`` otherwise
-
-    """
-    # Nix the & at the beginning
-    if stream[0] != "&":
-        raise ValueError('Stream should begin with "&"')
-
-    stream = stream[1:]
-
-    stream = list(stream)
-    possible_entity = ""
-    end_characters = "<&=;" + string.whitespace
-
-    # Handle number entities
-    if stream and stream[0] == "#":
-        possible_entity = "#"
-        stream.pop(0)
-
-        if stream and stream[0] in ("x", "X"):
-            allowed = "0123456789abcdefABCDEF"
-            possible_entity += stream.pop(0)
-        else:
-            allowed = "0123456789"
-
-        # FIXME(willkg): Do we want to make sure these are valid number
-        # entities? This doesn't do that currently.
-        while stream and stream[0] not in end_characters:
-            c = stream.pop(0)
-            if c not in allowed:
-                break
-            possible_entity += c
-
-        if possible_entity and stream and stream[0] == ";":
-            return possible_entity
-        return None
-
-    # Handle character entities
-    while stream and stream[0] not in end_characters:
-        c = stream.pop(0)
-        possible_entity += c
-        if not ENTITIES_TRIE.has_keys_with_prefix(possible_entity):
-            # If it's not a prefix, then it's not an entity and we're
-            # out
-            return None
-
-    if possible_entity and stream and stream[0] == ";":
-        return possible_entity
-
-    return None
-
-
-AMP_SPLIT_RE = re.compile("(&)")
-
-
-def next_possible_entity(text):
-    """Takes a text and generates a list of possible entities
-
-    :arg text: the text to look at
-
-    :returns: generator where each part (except the first) starts with an
-        "&"
-
-    """
-    for i, part in enumerate(AMP_SPLIT_RE.split(text)):
-        if i == 0:
-            yield part
-        elif i % 2 == 0:
-            yield "&" + part
-
-
-class BleachHTMLSerializer(HTMLSerializer):
-    """HTMLSerializer that undoes & -> &amp; in attributes and sets
-    escape_rcdata to True
-    """
-
-    # per the HTMLSerializer.__init__ docstring:
-    #
-    # Whether to escape characters that need to be
-    # escaped within normal elements within rcdata elements such as
-    # style.
-    #
-    escape_rcdata = True
-
-    def escape_base_amp(self, stoken):
-        """Escapes just bare & in HTML attribute values"""
-        # First, undo escaping of &. We need to do this because html5lib's
-        # HTMLSerializer expected the tokenizer to consume all the character
-        # entities and convert them to their respective characters, but the
-        # BleachHTMLTokenizer doesn't do that. For example, this fixes
-        # &amp;entity; back to &entity; .
-        stoken = stoken.replace("&amp;", "&")
-
-        # However, we do want all bare & that are not marking character
-        # entities to be changed to &amp;, so let's do that carefully here.
-        for part in next_possible_entity(stoken):
-            if not part:
-                continue
-
-            if part.startswith("&"):
-                entity = match_entity(part)
-                # Only leave entities in that are not ambiguous. If they're
-                # ambiguous, then we escape the ampersand.
-                if entity is not None and convert_entity(entity) is not None:
-                    yield f"&{entity};"
-
-                    # Length of the entity plus 2--one for & at the beginning
-                    # and one for ; at the end
-                    part = part[len(entity) + 2 :]
-                    if part:
-                        yield part
-                    continue
-
-            yield part.replace("&", "&amp;")
-
-    def serialize(self, treewalker, encoding=None):
-        """Wrap HTMLSerializer.serialize and conver & to &amp; in attribute values
-
-        Note that this converts & to &amp; in attribute values where the & isn't
-        already part of an unambiguous character entity.
-
-        """
-        in_tag = False
-        after_equals = False
-
-        for stoken in super().serialize(treewalker, encoding):
-            if in_tag:
-                if stoken == ">":
-                    in_tag = False
-
-                elif after_equals:
-                    if stoken != '"':
-                        yield from self.escape_base_amp(stoken)
-
-                        after_equals = False
-                        continue
-
-                elif stoken == "=":
-                    after_equals = True
-
-                yield stoken
-            else:
-                if stoken.startswith("<"):
-                    in_tag = True
-                yield stoken
diff --git a/lib/bleach/linkifier.py b/lib/bleach/linkifier.py
deleted file mode 100644
index 8fcefb2c..00000000
--- a/lib/bleach/linkifier.py
+++ /dev/null
@@ -1,633 +0,0 @@
-import re
-
-from urllib.parse import quote
-
-from bleach import callbacks as linkify_callbacks
-from bleach import html5lib_shim
-
-
-#: List of default callbacks
-DEFAULT_CALLBACKS = [linkify_callbacks.nofollow]
-
-
-TLDS = """ac ad ae aero af ag ai al am an ao aq ar arpa as asia at au aw ax az
-       ba bb bd be bf bg bh bi biz bj bm bn bo br bs bt bv bw by bz ca cat
-       cc cd cf cg ch ci ck cl cm cn co com coop cr cu cv cx cy cz de dj dk
-       dm do dz ec edu ee eg er es et eu fi fj fk fm fo fr ga gb gd ge gf gg
-       gh gi gl gm gn gov gp gq gr gs gt gu gw gy hk hm hn hr ht hu id ie il
-       im in info int io iq ir is it je jm jo jobs jp ke kg kh ki km kn kp
-       kr kw ky kz la lb lc li lk lr ls lt lu lv ly ma mc md me mg mh mil mk
-       ml mm mn mo mobi mp mq mr ms mt mu museum mv mw mx my mz na name nc ne
-       net nf ng ni nl no np nr nu nz om org pa pe pf pg ph pk pl pm pn post
-       pr pro ps pt pw py qa re ro rs ru rw sa sb sc sd se sg sh si sj sk sl
-       sm sn so sr ss st su sv sx sy sz tc td tel tf tg th tj tk tl tm tn to
-       tp tr travel tt tv tw tz ua ug uk us uy uz va vc ve vg vi vn vu wf ws
-       xn xxx ye yt yu za zm zw""".split()
-
-# Make sure that .com doesn't get matched by .co first
-TLDS.reverse()
-
-
-def build_url_re(tlds=TLDS, protocols=html5lib_shim.allowed_protocols):
-    """Builds the url regex used by linkifier
-
-    If you want a different set of tlds or allowed protocols, pass those in
-    and stomp on the existing ``url_re``::
-
-        from bleach import linkifier
-
-        my_url_re = linkifier.build_url_re(my_tlds_list, my_protocols)
-
-        linker = LinkifyFilter(url_re=my_url_re)
-
-    """
-    return re.compile(
-        r"""\(*  # Match any opening parentheses.
-        \b(?<![@.])(?:(?:{0}):/{{0,3}}(?:(?:\w+:)?\w+@)?)?  # http://
-        ([\w-]+\.)+(?:{1})(?:\:[0-9]+)?(?!\.\w)\b   # xx.yy.tld(:##)?
-        (?:[/?][^\s\{{\}}\|\\\^`<>"]*)?
-            # /path/zz (excluding "unsafe" chars from RFC 3986,
-            # except for # and ~, which happen in practice)
-        """.format(
-            "|".join(sorted(protocols)), "|".join(sorted(tlds))
-        ),
-        re.IGNORECASE | re.VERBOSE | re.UNICODE,
-    )
-
-
-URL_RE = build_url_re()
-
-
-PROTO_RE = re.compile(r"^[\w-]+:/{0,3}", re.IGNORECASE)
-
-
-def build_email_re(tlds=TLDS):
-    """Builds the email regex used by linkifier
-
-    If you want a different set of tlds, pass those in and stomp on the existing ``email_re``::
-
-        from bleach import linkifier
-
-        my_email_re = linkifier.build_email_re(my_tlds_list)
-
-        linker = LinkifyFilter(email_re=my_url_re)
-
-    """
-    # open and closing braces doubled below for format string
-    return re.compile(
-        r"""(?<!//)
-        (([-!#$%&'*+/=?^_`{{}}|~0-9A-Z]+
-            (\.[-!#$%&'*+/=?^_`{{}}|~0-9A-Z]+)*  # dot-atom
-        |^"([\001-\010\013\014\016-\037!#-\[\]-\177]
-            |\\[\001-\011\013\014\016-\177])*"  # quoted-string
-        )@(?:[A-Z0-9](?:[A-Z0-9-]{{0,61}}[A-Z0-9])?\.)+(?:{0}))  # domain
-        """.format(
-            "|".join(tlds)
-        ),
-        re.IGNORECASE | re.MULTILINE | re.VERBOSE,
-    )
-
-
-EMAIL_RE = build_email_re()
-
-
-class Linker:
-    """Convert URL-like strings in an HTML fragment to links
-
-    This function converts strings that look like URLs, domain names and email
-    addresses in text that may be an HTML fragment to links, while preserving:
-
-    1. links already in the string
-    2. urls found in attributes
-    3. email addresses
-
-    linkify does a best-effort approach and tries to recover from bad
-    situations due to crazy text.
-
-    """
-
-    def __init__(
-        self,
-        callbacks=DEFAULT_CALLBACKS,
-        skip_tags=None,
-        parse_email=False,
-        url_re=URL_RE,
-        email_re=EMAIL_RE,
-        recognized_tags=html5lib_shim.HTML_TAGS,
-    ):
-        """Creates a Linker instance
-
-        :arg list callbacks: list of callbacks to run when adjusting tag attributes;
-            defaults to ``bleach.linkifier.DEFAULT_CALLBACKS``
-
-        :arg set skip_tags: set of tags that you don't want to linkify the
-            contents of; for example, you could set this to ``{'pre'}`` to skip
-            linkifying contents of ``pre`` tags; ``None`` means you don't
-            want linkify to skip any tags
-
-        :arg bool parse_email: whether or not to linkify email addresses
-
-        :arg url_re: url matching regex
-
-        :arg email_re: email matching regex
-
-        :arg set recognized_tags: the set of tags that linkify knows about;
-            everything else gets escaped
-
-        :returns: linkified text as unicode
-
-        """
-        self.callbacks = callbacks
-        self.skip_tags = skip_tags
-        self.parse_email = parse_email
-        self.url_re = url_re
-        self.email_re = email_re
-
-        # Create a parser/tokenizer that allows all HTML tags and escapes
-        # anything not in that list.
-        self.parser = html5lib_shim.BleachHTMLParser(
-            tags=frozenset(recognized_tags),
-            strip=False,
-            consume_entities=False,
-            namespaceHTMLElements=False,
-        )
-        self.walker = html5lib_shim.getTreeWalker("etree")
-        self.serializer = html5lib_shim.BleachHTMLSerializer(
-            quote_attr_values="always",
-            omit_optional_tags=False,
-            # We want to leave entities as they are without escaping or
-            # resolving or expanding
-            resolve_entities=False,
-            # linkify does not sanitize
-            sanitize=False,
-            # linkify preserves attr order
-            alphabetical_attributes=False,
-        )
-
-    def linkify(self, text):
-        """Linkify specified text
-
-        :arg str text: the text to add links to
-
-        :returns: linkified text as unicode
-
-        :raises TypeError: if ``text`` is not a text type
-
-        """
-        if not isinstance(text, str):
-            raise TypeError("argument must be of text type")
-
-        if not text:
-            return ""
-
-        dom = self.parser.parseFragment(text)
-        filtered = LinkifyFilter(
-            source=self.walker(dom),
-            callbacks=self.callbacks,
-            skip_tags=self.skip_tags,
-            parse_email=self.parse_email,
-            url_re=self.url_re,
-            email_re=self.email_re,
-        )
-        return self.serializer.render(filtered)
-
-
-class LinkifyFilter(html5lib_shim.Filter):
-    """html5lib filter that linkifies text
-
-    This will do the following:
-
-    * convert email addresses into links
-    * convert urls into links
-    * edit existing links by running them through callbacks--the default is to
-      add a ``rel="nofollow"``
-
-    This filter can be used anywhere html5lib filters can be used.
-
-    """
-
-    def __init__(
-        self,
-        source,
-        callbacks=DEFAULT_CALLBACKS,
-        skip_tags=None,
-        parse_email=False,
-        url_re=URL_RE,
-        email_re=EMAIL_RE,
-    ):
-        """Creates a LinkifyFilter instance
-
-        :arg source: stream as an html5lib TreeWalker
-
-        :arg list callbacks: list of callbacks to run when adjusting tag attributes;
-            defaults to ``bleach.linkifier.DEFAULT_CALLBACKS``
-
-        :arg set skip_tags: set of tags that you don't want to linkify the
-            contents of; for example, you could set this to ``{'pre'}`` to skip
-            linkifying contents of ``pre`` tags
-
-        :arg bool parse_email: whether or not to linkify email addresses
-
-        :arg url_re: url matching regex
-
-        :arg email_re: email matching regex
-
-        """
-        super().__init__(source)
-
-        self.callbacks = callbacks or []
-        self.skip_tags = skip_tags or {}
-        self.parse_email = parse_email
-
-        self.url_re = url_re
-        self.email_re = email_re
-
-    def apply_callbacks(self, attrs, is_new):
-        """Given an attrs dict and an is_new bool, runs through callbacks
-
-        Callbacks can return an adjusted attrs dict or ``None``. In the case of
-        ``None``, we stop going through callbacks and return that and the link
-        gets dropped.
-
-        :arg dict attrs: map of ``(namespace, name)`` -> ``value``
-
-        :arg bool is_new: whether or not this link was added by linkify
-
-        :returns: adjusted attrs dict or ``None``
-
-        """
-        for cb in self.callbacks:
-            attrs = cb(attrs, is_new)
-            if attrs is None:
-                return None
-        return attrs
-
-    def extract_character_data(self, token_list):
-        """Extracts and squashes character sequences in a token stream"""
-        # FIXME(willkg): This is a terrible idea. What it does is drop all the
-        # tags from the token list and merge the Characters and SpaceCharacters
-        # tokens into a single text.
-        #
-        # So something like this::
-        #
-        #     "<span>" "<b>" "some text" "</b>" "</span>"
-        #
-        # gets converted to "some text".
-        #
-        # This gets used to figure out the ``_text`` fauxttribute value for
-        # linkify callables.
-        #
-        # I'm not really sure how else to support that ``_text`` fauxttribute and
-        # maintain some modicum of backwards compatibility with previous versions
-        # of Bleach.
-
-        out = []
-        for token in token_list:
-            token_type = token["type"]
-            if token_type in ["Characters", "SpaceCharacters"]:
-                out.append(token["data"])
-
-        return "".join(out)
-
-    def handle_email_addresses(self, src_iter):
-        """Handle email addresses in character tokens"""
-        for token in src_iter:
-            if token["type"] == "Characters":
-                text = token["data"]
-                new_tokens = []
-                end = 0
-
-                # For each email address we find in the text
-                for match in self.email_re.finditer(text):
-                    if match.start() > end:
-                        new_tokens.append(
-                            {"type": "Characters", "data": text[end : match.start()]}
-                        )
-
-                    # URL-encode the "local-part" according to RFC6068
-                    parts = match.group(0).split("@")
-                    parts[0] = quote(parts[0])
-                    address = "@".join(parts)
-
-                    # Run attributes through the callbacks to see what we
-                    # should do with this match
-                    attrs = {
-                        (None, "href"): "mailto:%s" % address,
-                        "_text": match.group(0),
-                    }
-                    attrs = self.apply_callbacks(attrs, True)
-
-                    if attrs is None:
-                        # Just add the text--but not as a link
-                        new_tokens.append(
-                            {"type": "Characters", "data": match.group(0)}
-                        )
-
-                    else:
-                        # Add an "a" tag for the new link
-                        _text = attrs.pop("_text", "")
-                        new_tokens.extend(
-                            [
-                                {"type": "StartTag", "name": "a", "data": attrs},
-                                {"type": "Characters", "data": str(_text)},
-                                {"type": "EndTag", "name": "a"},
-                            ]
-                        )
-                    end = match.end()
-
-                if new_tokens:
-                    # Yield the adjusted set of tokens and then continue
-                    # through the loop
-                    if end < len(text):
-                        new_tokens.append({"type": "Characters", "data": text[end:]})
-
-                    yield from new_tokens
-
-                    continue
-
-            yield token
-
-    def strip_non_url_bits(self, fragment):
-        """Strips non-url bits from the url
-
-        This accounts for over-eager matching by the regex.
-
-        """
-        prefix = suffix = ""
-
-        while fragment:
-            # Try removing ( from the beginning and, if it's balanced, from the
-            # end, too
-            if fragment.startswith("("):
-                prefix = prefix + "("
-                fragment = fragment[1:]
-
-                if fragment.endswith(")"):
-                    suffix = ")" + suffix
-                    fragment = fragment[:-1]
-                continue
-
-            # Now try extraneous things from the end. For example, sometimes we
-            # pick up ) at the end of a url, but the url is in a parenthesized
-            # phrase like:
-            #
-            #     "i looked at the site (at http://example.com)"
-
-            if fragment.endswith(")") and "(" not in fragment:
-                fragment = fragment[:-1]
-                suffix = ")" + suffix
-                continue
-
-            # Handle commas
-            if fragment.endswith(","):
-                fragment = fragment[:-1]
-                suffix = "," + suffix
-                continue
-
-            # Handle periods
-            if fragment.endswith("."):
-                fragment = fragment[:-1]
-                suffix = "." + suffix
-                continue
-
-            # Nothing matched, so we're done
-            break
-
-        return fragment, prefix, suffix
-
-    def handle_links(self, src_iter):
-        """Handle links in character tokens"""
-        in_a = False  # happens, if parse_email=True and if a mail was found
-        for token in src_iter:
-            if in_a:
-                if token["type"] == "EndTag" and token["name"] == "a":
-                    in_a = False
-                yield token
-                continue
-            elif token["type"] == "StartTag" and token["name"] == "a":
-                in_a = True
-                yield token
-                continue
-            if token["type"] == "Characters":
-                text = token["data"]
-                new_tokens = []
-                end = 0
-
-                for match in self.url_re.finditer(text):
-                    if match.start() > end:
-                        new_tokens.append(
-                            {"type": "Characters", "data": text[end : match.start()]}
-                        )
-
-                    url = match.group(0)
-                    prefix = suffix = ""
-
-                    # Sometimes we pick up too much in the url match, so look for
-                    # bits we should drop and remove them from the match
-                    url, prefix, suffix = self.strip_non_url_bits(url)
-
-                    # If there's no protocol, add one
-                    if PROTO_RE.search(url):
-                        href = url
-                    else:
-                        href = "http://%s" % url
-
-                    attrs = {(None, "href"): href, "_text": url}
-                    attrs = self.apply_callbacks(attrs, True)
-
-                    if attrs is None:
-                        # Just add the text
-                        new_tokens.append(
-                            {"type": "Characters", "data": prefix + url + suffix}
-                        )
-
-                    else:
-                        # Add the "a" tag!
-                        if prefix:
-                            new_tokens.append({"type": "Characters", "data": prefix})
-
-                        _text = attrs.pop("_text", "")
-                        new_tokens.extend(
-                            [
-                                {"type": "StartTag", "name": "a", "data": attrs},
-                                {"type": "Characters", "data": str(_text)},
-                                {"type": "EndTag", "name": "a"},
-                            ]
-                        )
-
-                        if suffix:
-                            new_tokens.append({"type": "Characters", "data": suffix})
-
-                    end = match.end()
-
-                if new_tokens:
-                    # Yield the adjusted set of tokens and then continue
-                    # through the loop
-                    if end < len(text):
-                        new_tokens.append({"type": "Characters", "data": text[end:]})
-
-                    yield from new_tokens
-
-                    continue
-
-            yield token
-
-    def handle_a_tag(self, token_buffer):
-        """Handle the "a" tag
-
-        This could adjust the link or drop it altogether depending on what the
-        callbacks return.
-
-        This yields the new set of tokens.
-
-        """
-        a_token = token_buffer[0]
-        if a_token["data"]:
-            attrs = a_token["data"]
-        else:
-            attrs = {}
-        text = self.extract_character_data(token_buffer)
-        attrs["_text"] = text
-
-        attrs = self.apply_callbacks(attrs, False)
-
-        if attrs is None:
-            # We're dropping the "a" tag and everything else and replacing
-            # it with character data. So emit that token.
-            yield {"type": "Characters", "data": text}
-
-        else:
-            new_text = attrs.pop("_text", "")
-            a_token["data"] = attrs
-
-            if text == new_text:
-                # The callbacks didn't change the text, so we yield the new "a"
-                # token, then whatever else was there, then the end "a" token
-                yield a_token
-                yield from token_buffer[1:]
-
-            else:
-                # If the callbacks changed the text, then we're going to drop
-                # all the tokens between the start and end "a" tags and replace
-                # it with the new text
-                yield a_token
-                yield {"type": "Characters", "data": str(new_text)}
-                yield token_buffer[-1]
-
-    def extract_entities(self, token):
-        """Handles Characters tokens with entities
-
-        Our overridden tokenizer doesn't do anything with entities. However,
-        that means that the serializer will convert all ``&`` in Characters
-        tokens to ``&amp;``.
-
-        Since we don't want that, we extract entities here and convert them to
-        Entity tokens so the serializer will let them be.
-
-        :arg token: the Characters token to work on
-
-        :returns: generator of tokens
-
-        """
-        data = token.get("data", "")
-
-        # If there isn't a & in the data, we can return now
-        if "&" not in data:
-            yield token
-            return
-
-        new_tokens = []
-
-        # For each possible entity that starts with a "&", we try to extract an
-        # actual entity and re-tokenize accordingly
-        for part in html5lib_shim.next_possible_entity(data):
-            if not part:
-                continue
-
-            if part.startswith("&"):
-                entity = html5lib_shim.match_entity(part)
-                if entity is not None:
-                    if entity == "amp":
-                        # LinkifyFilter can't match urls across token boundaries
-                        # which is problematic with &amp; since that shows up in
-                        # querystrings all the time. This special-cases &amp;
-                        # and converts it to a & and sticks it in as a
-                        # Characters token. It'll get merged with surrounding
-                        # tokens in the BleachSanitizerfilter.__iter__ and
-                        # escaped in the serializer.
-                        new_tokens.append({"type": "Characters", "data": "&"})
-                    else:
-                        new_tokens.append({"type": "Entity", "name": entity})
-
-                    # Length of the entity plus 2--one for & at the beginning
-                    # and one for ; at the end
-                    remainder = part[len(entity) + 2 :]
-                    if remainder:
-                        new_tokens.append({"type": "Characters", "data": remainder})
-                    continue
-
-            new_tokens.append({"type": "Characters", "data": part})
-
-        yield from new_tokens
-
-    def __iter__(self):
-        in_a = False
-        in_skip_tag = None
-
-        token_buffer = []
-
-        for token in super().__iter__():
-            if in_a:
-                # Handle the case where we're in an "a" tag--we want to buffer tokens
-                # until we hit an end "a" tag.
-                if token["type"] == "EndTag" and token["name"] == "a":
-                    # Add the end tag to the token buffer and then handle them
-                    # and yield anything returned
-                    token_buffer.append(token)
-                    yield from self.handle_a_tag(token_buffer)
-
-                    # Clear "a" related state and continue since we've yielded all
-                    # the tokens we're going to yield
-                    in_a = False
-                    token_buffer = []
-                else:
-                    token_buffer.extend(list(self.extract_entities(token)))
-                continue
-
-            if token["type"] in ["StartTag", "EmptyTag"]:
-                if token["name"] in self.skip_tags:
-                    # Skip tags start a "special mode" where we don't linkify
-                    # anything until the end tag.
-                    in_skip_tag = token["name"]
-
-                elif token["name"] == "a":
-                    # The "a" tag is special--we switch to a slurp mode and
-                    # slurp all the tokens until the end "a" tag and then
-                    # figure out what to do with them there.
-                    in_a = True
-                    token_buffer.append(token)
-
-                    # We buffer the start tag, so we don't want to yield it,
-                    # yet
-                    continue
-
-            elif in_skip_tag and self.skip_tags:
-                # NOTE(willkg): We put this clause here since in_a and
-                # switching in and out of in_a takes precedence.
-                if token["type"] == "EndTag" and token["name"] == in_skip_tag:
-                    in_skip_tag = None
-
-            elif not in_a and not in_skip_tag and token["type"] == "Characters":
-                new_stream = iter([token])
-                if self.parse_email:
-                    new_stream = self.handle_email_addresses(new_stream)
-
-                new_stream = self.handle_links(new_stream)
-
-                for new_token in new_stream:
-                    yield from self.extract_entities(new_token)
-
-                # We've already yielded this token, so continue
-                continue
-
-            yield token
diff --git a/lib/bleach/parse_shim.py b/lib/bleach/parse_shim.py
deleted file mode 100644
index c7ce2d44..00000000
--- a/lib/bleach/parse_shim.py
+++ /dev/null
@@ -1 +0,0 @@
-from bleach._vendor.parse import urlparse  # noqa
diff --git a/lib/bleach/sanitizer.py b/lib/bleach/sanitizer.py
deleted file mode 100644
index 8662a879..00000000
--- a/lib/bleach/sanitizer.py
+++ /dev/null
@@ -1,638 +0,0 @@
-from itertools import chain
-import re
-import warnings
-
-from xml.sax.saxutils import unescape
-
-from bleach import html5lib_shim
-from bleach import parse_shim
-
-
-#: Set of allowed tags
-ALLOWED_TAGS = frozenset(
-    (
-        "a",
-        "abbr",
-        "acronym",
-        "b",
-        "blockquote",
-        "code",
-        "em",
-        "i",
-        "li",
-        "ol",
-        "strong",
-        "ul",
-    )
-)
-
-
-#: Map of allowed attributes by tag
-ALLOWED_ATTRIBUTES = {
-    "a": ["href", "title"],
-    "abbr": ["title"],
-    "acronym": ["title"],
-}
-
-#: List of allowed protocols
-ALLOWED_PROTOCOLS = frozenset(("http", "https", "mailto"))
-
-#: Invisible characters--0 to and including 31 except 9 (tab), 10 (lf), and 13 (cr)
-INVISIBLE_CHARACTERS = "".join(
-    [chr(c) for c in chain(range(0, 9), range(11, 13), range(14, 32))]
-)
-
-#: Regexp for characters that are invisible
-INVISIBLE_CHARACTERS_RE = re.compile("[" + INVISIBLE_CHARACTERS + "]", re.UNICODE)
-
-#: String to replace invisible characters with. This can be a character, a
-#: string, or even a function that takes a Python re matchobj
-INVISIBLE_REPLACEMENT_CHAR = "?"
-
-
-class NoCssSanitizerWarning(UserWarning):
-    pass
-
-
-class Cleaner:
-    """Cleaner for cleaning HTML fragments of malicious content
-
-    This cleaner is a security-focused function whose sole purpose is to remove
-    malicious content from a string such that it can be displayed as content in
-    a web page.
-
-    To use::
-
-        from bleach.sanitizer import Cleaner
-
-        cleaner = Cleaner()
-
-        for text in all_the_yucky_things:
-            sanitized = cleaner.clean(text)
-
-    .. Note::
-
-       This cleaner is not designed to use to transform content to be used in
-       non-web-page contexts.
-
-    .. Warning::
-
-       This cleaner is not thread-safe--the html parser has internal state.
-       Create a separate cleaner per thread!
-
-
-    """
-
-    def __init__(
-        self,
-        tags=ALLOWED_TAGS,
-        attributes=ALLOWED_ATTRIBUTES,
-        protocols=ALLOWED_PROTOCOLS,
-        strip=False,
-        strip_comments=True,
-        filters=None,
-        css_sanitizer=None,
-    ):
-        """Initializes a Cleaner
-
-        :arg set tags: set of allowed tags; defaults to
-            ``bleach.sanitizer.ALLOWED_TAGS``
-
-        :arg dict attributes: allowed attributes; can be a callable, list or dict;
-            defaults to ``bleach.sanitizer.ALLOWED_ATTRIBUTES``
-
-        :arg list protocols: allowed list of protocols for links; defaults
-            to ``bleach.sanitizer.ALLOWED_PROTOCOLS``
-
-        :arg bool strip: whether or not to strip disallowed elements
-
-        :arg bool strip_comments: whether or not to strip HTML comments
-
-        :arg list filters: list of html5lib Filter classes to pass streamed content through
-
-            .. seealso:: http://html5lib.readthedocs.io/en/latest/movingparts.html#filters
-
-            .. Warning::
-
-               Using filters changes the output of ``bleach.Cleaner.clean``.
-               Make sure the way the filters change the output are secure.
-
-        :arg CSSSanitizer css_sanitizer: instance with a "sanitize_css" method for
-            sanitizing style attribute values and style text; defaults to None
-
-        """
-        self.tags = tags
-        self.attributes = attributes
-        self.protocols = protocols
-        self.strip = strip
-        self.strip_comments = strip_comments
-        self.filters = filters or []
-        self.css_sanitizer = css_sanitizer
-
-        self.parser = html5lib_shim.BleachHTMLParser(
-            tags=self.tags,
-            strip=self.strip,
-            consume_entities=False,
-            namespaceHTMLElements=False,
-        )
-        self.walker = html5lib_shim.getTreeWalker("etree")
-        self.serializer = html5lib_shim.BleachHTMLSerializer(
-            quote_attr_values="always",
-            omit_optional_tags=False,
-            escape_lt_in_attrs=True,
-            # We want to leave entities as they are without escaping or
-            # resolving or expanding
-            resolve_entities=False,
-            # Bleach has its own sanitizer, so don't use the html5lib one
-            sanitize=False,
-            # clean preserves attr order
-            alphabetical_attributes=False,
-        )
-
-        if css_sanitizer is None:
-            # FIXME(willkg): this doesn't handle when attributes or an
-            # attributes value is a callable
-            attributes_values = []
-            if isinstance(attributes, list):
-                attributes_values = attributes
-
-            elif isinstance(attributes, dict):
-                attributes_values = []
-                for values in attributes.values():
-                    if isinstance(values, (list, tuple)):
-                        attributes_values.extend(values)
-
-            if "style" in attributes_values:
-                warnings.warn(
-                    "'style' attribute specified, but css_sanitizer not set.",
-                    category=NoCssSanitizerWarning,
-                )
-
-    def clean(self, text):
-        """Cleans text and returns sanitized result as unicode
-
-        :arg str text: text to be cleaned
-
-        :returns: sanitized text as unicode
-
-        :raises TypeError: if ``text`` is not a text type
-
-        """
-        if not isinstance(text, str):
-            message = (
-                f"argument cannot be of {text.__class__.__name__!r} type, "
-                + "must be of text type"
-            )
-            raise TypeError(message)
-
-        if not text:
-            return ""
-
-        dom = self.parser.parseFragment(text)
-        filtered = BleachSanitizerFilter(
-            source=self.walker(dom),
-            allowed_tags=self.tags,
-            attributes=self.attributes,
-            strip_disallowed_tags=self.strip,
-            strip_html_comments=self.strip_comments,
-            css_sanitizer=self.css_sanitizer,
-            allowed_protocols=self.protocols,
-        )
-
-        # Apply any filters after the BleachSanitizerFilter
-        for filter_class in self.filters:
-            filtered = filter_class(source=filtered)
-
-        return self.serializer.render(filtered)
-
-
-def attribute_filter_factory(attributes):
-    """Generates attribute filter function for the given attributes value
-
-    The attributes value can take one of several shapes. This returns a filter
-    function appropriate to the attributes value. One nice thing about this is
-    that there's less if/then shenanigans in the ``allow_token`` method.
-
-    """
-    if callable(attributes):
-        return attributes
-
-    if isinstance(attributes, dict):
-
-        def _attr_filter(tag, attr, value):
-            if tag in attributes:
-                attr_val = attributes[tag]
-                if callable(attr_val):
-                    return attr_val(tag, attr, value)
-
-                if attr in attr_val:
-                    return True
-
-            if "*" in attributes:
-                attr_val = attributes["*"]
-                if callable(attr_val):
-                    return attr_val(tag, attr, value)
-
-                return attr in attr_val
-
-            return False
-
-        return _attr_filter
-
-    if isinstance(attributes, list):
-
-        def _attr_filter(tag, attr, value):
-            return attr in attributes
-
-        return _attr_filter
-
-    raise ValueError("attributes needs to be a callable, a list or a dict")
-
-
-class BleachSanitizerFilter(html5lib_shim.SanitizerFilter):
-    """html5lib Filter that sanitizes text
-
-    This filter can be used anywhere html5lib filters can be used.
-
-    """
-
-    def __init__(
-        self,
-        source,
-        allowed_tags=ALLOWED_TAGS,
-        attributes=ALLOWED_ATTRIBUTES,
-        allowed_protocols=ALLOWED_PROTOCOLS,
-        attr_val_is_uri=html5lib_shim.attr_val_is_uri,
-        svg_attr_val_allows_ref=html5lib_shim.svg_attr_val_allows_ref,
-        svg_allow_local_href=html5lib_shim.svg_allow_local_href,
-        strip_disallowed_tags=False,
-        strip_html_comments=True,
-        css_sanitizer=None,
-    ):
-        """Creates a BleachSanitizerFilter instance
-
-        :arg source: html5lib TreeWalker stream as an html5lib TreeWalker
-
-        :arg set allowed_tags: set of allowed tags; defaults to
-            ``bleach.sanitizer.ALLOWED_TAGS``
-
-        :arg dict attributes: allowed attributes; can be a callable, list or dict;
-            defaults to ``bleach.sanitizer.ALLOWED_ATTRIBUTES``
-
-        :arg list allowed_protocols: allowed list of protocols for links; defaults
-            to ``bleach.sanitizer.ALLOWED_PROTOCOLS``
-
-        :arg attr_val_is_uri: set of attributes that have URI values
-
-        :arg svg_attr_val_allows_ref: set of SVG attributes that can have
-            references
-
-        :arg svg_allow_local_href: set of SVG elements that can have local
-            hrefs
-
-        :arg bool strip_disallowed_tags: whether or not to strip disallowed
-            tags
-
-        :arg bool strip_html_comments: whether or not to strip HTML comments
-
-        :arg CSSSanitizer css_sanitizer: instance with a "sanitize_css" method for
-            sanitizing style attribute values and style text; defaults to None
-
-        """
-        # NOTE(willkg): This is the superclass of
-        # html5lib.filters.sanitizer.Filter. We call this directly skipping the
-        # __init__ for html5lib.filters.sanitizer.Filter because that does
-        # things we don't need to do and kicks up the deprecation warning for
-        # using Sanitizer.
-        html5lib_shim.Filter.__init__(self, source)
-
-        self.allowed_tags = frozenset(allowed_tags)
-        self.allowed_protocols = frozenset(allowed_protocols)
-
-        self.attr_filter = attribute_filter_factory(attributes)
-        self.strip_disallowed_tags = strip_disallowed_tags
-        self.strip_html_comments = strip_html_comments
-
-        self.attr_val_is_uri = attr_val_is_uri
-        self.svg_attr_val_allows_ref = svg_attr_val_allows_ref
-        self.css_sanitizer = css_sanitizer
-        self.svg_allow_local_href = svg_allow_local_href
-
-    def sanitize_stream(self, token_iterator):
-        for token in token_iterator:
-            ret = self.sanitize_token(token)
-
-            if not ret:
-                continue
-
-            if isinstance(ret, list):
-                yield from ret
-            else:
-                yield ret
-
-    def merge_characters(self, token_iterator):
-        """Merge consecutive Characters tokens in a stream"""
-        characters_buffer = []
-
-        for token in token_iterator:
-            if characters_buffer:
-                if token["type"] == "Characters":
-                    characters_buffer.append(token)
-                    continue
-                else:
-                    # Merge all the characters tokens together into one and then
-                    # operate on it.
-                    new_token = {
-                        "data": "".join(
-                            [char_token["data"] for char_token in characters_buffer]
-                        ),
-                        "type": "Characters",
-                    }
-                    characters_buffer = []
-                    yield new_token
-
-            elif token["type"] == "Characters":
-                characters_buffer.append(token)
-                continue
-
-            yield token
-
-        new_token = {
-            "data": "".join([char_token["data"] for char_token in characters_buffer]),
-            "type": "Characters",
-        }
-        yield new_token
-
-    def __iter__(self):
-        return self.merge_characters(
-            self.sanitize_stream(html5lib_shim.Filter.__iter__(self))
-        )
-
-    def sanitize_token(self, token):
-        """Sanitize a token either by HTML-encoding or dropping.
-
-        Unlike sanitizer.Filter, allowed_attributes can be a dict of {'tag':
-        ['attribute', 'pairs'], 'tag': callable}.
-
-        Here callable is a function with two arguments of attribute name and
-        value. It should return true of false.
-
-        Also gives the option to strip tags instead of encoding.
-
-        :arg dict token: token to sanitize
-
-        :returns: token or list of tokens
-
-        """
-        token_type = token["type"]
-        if token_type in ["StartTag", "EndTag", "EmptyTag"]:
-            if token["name"] in self.allowed_tags:
-                return self.allow_token(token)
-
-            elif self.strip_disallowed_tags:
-                return None
-
-            else:
-                return self.disallowed_token(token)
-
-        elif token_type == "Comment":
-            if not self.strip_html_comments:
-                # call lxml.sax.saxutils to escape &, <, and > in addition to " and '
-                token["data"] = html5lib_shim.escape(
-                    token["data"], entities={'"': "&quot;", "'": "&#x27;"}
-                )
-                return token
-            else:
-                return None
-
-        elif token_type == "Characters":
-            return self.sanitize_characters(token)
-
-        else:
-            return token
-
-    def sanitize_characters(self, token):
-        """Handles Characters tokens
-
-        Our overridden tokenizer doesn't do anything with entities. However,
-        that means that the serializer will convert all ``&`` in Characters
-        tokens to ``&amp;``.
-
-        Since we don't want that, we extract entities here and convert them to
-        Entity tokens so the serializer will let them be.
-
-        :arg token: the Characters token to work on
-
-        :returns: a list of tokens
-
-        """
-        data = token.get("data", "")
-
-        if not data:
-            return token
-
-        data = INVISIBLE_CHARACTERS_RE.sub(INVISIBLE_REPLACEMENT_CHAR, data)
-        token["data"] = data
-
-        # If there isn't a & in the data, we can return now
-        if "&" not in data:
-            return token
-
-        new_tokens = []
-
-        # For each possible entity that starts with a "&", we try to extract an
-        # actual entity and re-tokenize accordingly
-        for part in html5lib_shim.next_possible_entity(data):
-            if not part:
-                continue
-
-            if part.startswith("&"):
-                entity = html5lib_shim.match_entity(part)
-                if entity is not None:
-                    if entity == "amp":
-                        # LinkifyFilter can't match urls across token boundaries
-                        # which is problematic with &amp; since that shows up in
-                        # querystrings all the time. This special-cases &amp;
-                        # and converts it to a & and sticks it in as a
-                        # Characters token. It'll get merged with surrounding
-                        # tokens in the BleachSanitizerfilter.__iter__ and
-                        # escaped in the serializer.
-                        new_tokens.append({"type": "Characters", "data": "&"})
-                    else:
-                        new_tokens.append({"type": "Entity", "name": entity})
-
-                    # Length of the entity plus 2--one for & at the beginning
-                    # and one for ; at the end
-                    remainder = part[len(entity) + 2 :]
-                    if remainder:
-                        new_tokens.append({"type": "Characters", "data": remainder})
-                    continue
-
-            new_tokens.append({"type": "Characters", "data": part})
-
-        return new_tokens
-
-    def sanitize_uri_value(self, value, allowed_protocols):
-        """Checks a uri value to see if it's allowed
-
-        :arg value: the uri value to sanitize
-        :arg allowed_protocols: list of allowed protocols
-
-        :returns: allowed value or None
-
-        """
-        # NOTE(willkg): This transforms the value into a normalized one that's
-        # easier to match and verify, but shouldn't get returned since it's
-        # vastly different than the original value.
-
-        # Convert all character entities in the value
-        normalized_uri = html5lib_shim.convert_entities(value)
-
-        # Nix backtick, space characters, and control characters
-        normalized_uri = re.sub(r"[`\000-\040\177-\240\s]+", "", normalized_uri)
-
-        # Remove REPLACEMENT characters
-        normalized_uri = normalized_uri.replace("\ufffd", "")
-
-        # Lowercase it--this breaks the value, but makes it easier to match
-        # against
-        normalized_uri = normalized_uri.lower()
-
-        try:
-            # Drop attributes with uri values that have protocols that aren't
-            # allowed
-            parsed = parse_shim.urlparse(normalized_uri)
-        except ValueError:
-            # URI is impossible to parse, therefore it's not allowed
-            return None
-
-        if parsed.scheme:
-            # If urlparse found a scheme, check that
-            if parsed.scheme in allowed_protocols:
-                return value
-
-        else:
-            # Allow uris that are just an anchor
-            if normalized_uri.startswith("#"):
-                return value
-
-            # Handle protocols that urlparse doesn't recognize like "myprotocol"
-            if (
-                ":" in normalized_uri
-                and normalized_uri.split(":")[0] in allowed_protocols
-            ):
-                return value
-
-            # If there's no protocol/scheme specified, then assume it's "http" or
-            # "https" and see if that's allowed
-            if "http" in allowed_protocols or "https" in allowed_protocols:
-                return value
-
-        return None
-
-    def allow_token(self, token):
-        """Handles the case where we're allowing the tag"""
-        if "data" in token:
-            # Loop through all the attributes and drop the ones that are not
-            # allowed, are unsafe or break other rules. Additionally, fix
-            # attribute values that need fixing.
-            #
-            # At the end of this loop, we have the final set of attributes
-            # we're keeping.
-            attrs = {}
-            for namespaced_name, val in token["data"].items():
-                namespace, name = namespaced_name
-
-                # Drop attributes that are not explicitly allowed
-                #
-                # NOTE(willkg): We pass in the attribute name--not a namespaced
-                # name.
-                if not self.attr_filter(token["name"], name, val):
-                    continue
-
-                # Drop attributes with uri values that use a disallowed protocol
-                # Sanitize attributes with uri values
-                if namespaced_name in self.attr_val_is_uri:
-                    new_value = self.sanitize_uri_value(val, self.allowed_protocols)
-                    if new_value is None:
-                        continue
-                    val = new_value
-
-                # Drop values in svg attrs with non-local IRIs
-                if namespaced_name in self.svg_attr_val_allows_ref:
-                    new_val = re.sub(r"url\s*\(\s*[^#\s][^)]+?\)", " ", unescape(val))
-                    new_val = new_val.strip()
-                    if not new_val:
-                        continue
-
-                    else:
-                        # Replace the val with the unescaped version because
-                        # it's a iri
-                        val = new_val
-
-                # Drop href and xlink:href attr for svg elements with non-local IRIs
-                if (None, token["name"]) in self.svg_allow_local_href:
-                    if namespaced_name in [
-                        (None, "href"),
-                        (html5lib_shim.namespaces["xlink"], "href"),
-                    ]:
-                        if re.search(r"^\s*[^#\s]", val):
-                            continue
-
-                # If it's a style attribute, sanitize it
-                if namespaced_name == (None, "style"):
-                    if self.css_sanitizer:
-                        val = self.css_sanitizer.sanitize_css(val)
-                    else:
-                        # FIXME(willkg): if style is allowed, but no
-                        # css_sanitizer was set up, then this is probably a
-                        # mistake and we should raise an error here
-                        #
-                        # For now, we're going to set the value to "" because
-                        # there was no sanitizer set
-                        val = ""
-
-                # At this point, we want to keep the attribute, so add it in
-                attrs[namespaced_name] = val
-
-            token["data"] = attrs
-
-        return token
-
-    def disallowed_token(self, token):
-        token_type = token["type"]
-        if token_type == "EndTag":
-            token["data"] = f"</{token['name']}>"
-
-        elif token["data"]:
-            assert token_type in ("StartTag", "EmptyTag")
-            attrs = []
-            for (ns, name), v in token["data"].items():
-                # If we end up with a namespace, but no name, switch them so we
-                # have a valid name to use.
-                if ns and not name:
-                    ns, name = name, ns
-
-                # Figure out namespaced name if the namespace is appropriate
-                # and exists; if the ns isn't in prefixes, then drop it.
-                if ns is None or ns not in html5lib_shim.prefixes:
-                    namespaced_name = name
-                else:
-                    namespaced_name = f"{html5lib_shim.prefixes[ns]}:{name}"
-
-                # NOTE(willkg): HTMLSerializer escapes attribute values
-                # already, so if we do it here (like HTMLSerializer does),
-                # then we end up double-escaping.
-                attrs.append(f' {namespaced_name}="{v}"')
-            token["data"] = f"<{token['name']}{''.join(attrs)}>"
-
-        else:
-            token["data"] = f"<{token['name']}>"
-
-        if token.get("selfClosing"):
-            token["data"] = f"{token['data'][:-1]}/>"
-
-        token["type"] = "Characters"
-
-        del token["name"]
-        return token
diff --git a/lib/bleach/six_shim.py b/lib/bleach/six_shim.py
deleted file mode 100644
index 7db96011..00000000
--- a/lib/bleach/six_shim.py
+++ /dev/null
@@ -1,19 +0,0 @@
-"""
-Replacement module for what html5lib uses six for.
-"""
-
-import http.client
-import operator
-import urllib
-
-
-PY3 = True
-binary_type = bytes
-string_types = (str,)
-text_type = str
-unichr = chr
-viewkeys = operator.methodcaller("keys")
-
-http_client = http.client
-urllib = urllib
-urllib_parse = urllib.parse
diff --git a/lib/bs4/__init__.py b/lib/bs4/__init__.py
index d8ad5e1d..7ba34269 100644
--- a/lib/bs4/__init__.py
+++ b/lib/bs4/__init__.py
@@ -1,99 +1,65 @@
-"""Beautiful Soup Elixir and Tonic - "The Screen-Scraper's Friend".
-
+"""Beautiful Soup
+Elixir and Tonic
+"The Screen-Scraper's Friend"
 http://www.crummy.com/software/BeautifulSoup/
 
 Beautiful Soup uses a pluggable XML or HTML parser to parse a
 (possibly invalid) document into a tree representation. Beautiful Soup
-provides methods and Pythonic idioms that make it easy to navigate,
-search, and modify the parse tree.
+provides provides methods and Pythonic idioms that make it easy to
+navigate, search, and modify the parse tree.
 
-Beautiful Soup works with Python 3.6 and up. It works better if lxml
+Beautiful Soup works with Python 2.6 and up. It works better if lxml
 and/or html5lib is installed.
 
 For more than you ever wanted to know about Beautiful Soup, see the
-documentation: http://www.crummy.com/software/BeautifulSoup/bs4/doc/
+documentation:
+http://www.crummy.com/software/BeautifulSoup/bs4/doc/
 """
 
 __author__ = "Leonard Richardson (leonardr@segfault.org)"
-__version__ = "4.12.3"
-__copyright__ = "Copyright (c) 2004-2024 Leonard Richardson"
-# Use of this source code is governed by the MIT license.
+__version__ = "4.3.2"
+__copyright__ = "Copyright (c) 2004-2013 Leonard Richardson"
 __license__ = "MIT"
 
 __all__ = ['BeautifulSoup']
 
-from collections import Counter
 import os
 import re
-import sys
-import traceback
 import warnings
 
-# The very first thing we do is give a useful error if someone is
-# running this code under Python 2.
-if sys.version_info.major < 3:
-    raise ImportError('You are trying to use a Python 3-specific version of Beautiful Soup under Python 2. This will not work. The final version of Beautiful Soup to support Python 2 was 4.9.3.')
-
-from .builder import (
-    builder_registry,
-    ParserRejectedMarkup,
-    XMLParsedAsHTMLWarning,
-    HTMLParserTreeBuilder
-)
+from .builder import builder_registry, ParserRejectedMarkup
 from .dammit import UnicodeDammit
 from .element import (
     CData,
     Comment,
-    CSS,
     DEFAULT_OUTPUT_ENCODING,
     Declaration,
     Doctype,
     NavigableString,
     PageElement,
     ProcessingInstruction,
-    PYTHON_SPECIFIC_ENCODINGS,
     ResultSet,
-    Script,
-    Stylesheet,
     SoupStrainer,
     Tag,
-    TemplateString,
     )
 
-# Define some custom warnings.
-class GuessedAtParserWarning(UserWarning):
-    """The warning issued when BeautifulSoup has to guess what parser to
-    use -- probably because no parser was specified in the constructor.
-    """
+# The very first thing we do is give a useful error if someone is
+# running this code under Python 3 without converting it.
+syntax_error = u'You are trying to run the Python 2 version of Beautiful Soup under Python 3. This will not work. You need to convert the code, either by installing it (`python setup.py install`) or by running 2to3 (`2to3 -w bs4`).'
 
-class MarkupResemblesLocatorWarning(UserWarning):
-    """The warning issued when BeautifulSoup is given 'markup' that
-    actually looks like a resource locator -- a URL or a path to a file
-    on disk.
-    """
-
-   
 class BeautifulSoup(Tag):
-    """A data structure representing a parsed HTML or XML document.
+    """
+    This class defines the basic interface called by the tree builders.
 
-    Most of the methods you'll call on a BeautifulSoup object are inherited from
-    PageElement or Tag.
-
-    Internally, this class defines the basic interface called by the
-    tree builders when converting an HTML/XML document into a data
-    structure. The interface abstracts away the differences between
-    parsers. To write a new tree builder, you'll need to understand
-    these methods as a whole.
-
-    These methods will be called by the BeautifulSoup constructor:
-      * reset()
-      * feed(markup)
+    These methods will be called by the parser:
+      reset()
+      feed(markup)
 
     The tree builder may call these methods from its feed() implementation:
-      * handle_starttag(name, attrs) # See note about return value
-      * handle_endtag(name)
-      * handle_data(data) # Appends to the current data node
-      * endData(containerClass) # Ends the current data node
+      handle_starttag(name, attrs) # See note about return value
+      handle_endtag(name)
+      handle_data(data) # Appends to the current data node
+      endData(containerClass=NavigableString) # Ends the current data node
 
     No matter how complicated the underlying parser is, you should be
     able to build a tree using 'start tag' events, 'end tag' events,
@@ -103,77 +69,21 @@ class BeautifulSoup(Tag):
     like HTML's <br> tag), call handle_starttag and then
     handle_endtag.
     """
-
-    # Since BeautifulSoup subclasses Tag, it's possible to treat it as
-    # a Tag with a .name. This name makes it clear the BeautifulSoup
-    # object isn't a real markup tag.
-    ROOT_TAG_NAME = '[document]'
+    ROOT_TAG_NAME = u'[document]'
 
     # If the end-user gives no indication which tree builder they
     # want, look for one with these features.
     DEFAULT_BUILDER_FEATURES = ['html', 'fast']
 
-    # A string containing all ASCII whitespace characters, used in
-    # endData() to detect data chunks that seem 'empty'.
     ASCII_SPACES = '\x20\x0a\x09\x0c\x0d'
 
-    NO_PARSER_SPECIFIED_WARNING = "No parser was explicitly specified, so I'm using the best available %(markup_type)s parser for this system (\"%(parser)s\"). This usually isn't a problem, but if you run this code on another system, or in a different virtual environment, it may use a different parser and behave differently.\n\nThe code that caused this warning is on line %(line_number)s of the file %(filename)s. To get rid of this warning, pass the additional argument 'features=\"%(parser)s\"' to the BeautifulSoup constructor.\n"
-   
     def __init__(self, markup="", features=None, builder=None,
-                 parse_only=None, from_encoding=None, exclude_encodings=None,
-                 element_classes=None, **kwargs):
-        """Constructor.
+                 parse_only=None, from_encoding=None, **kwargs):
+        """The Soup object is initialized as the 'root tag', and the
+        provided markup (which can be a string or a file-like object)
+        is fed into the underlying parser."""
 
-        :param markup: A string or a file-like object representing
-         markup to be parsed.
-
-        :param features: Desirable features of the parser to be
-         used. This may be the name of a specific parser ("lxml",
-         "lxml-xml", "html.parser", or "html5lib") or it may be the
-         type of markup to be used ("html", "html5", "xml"). It's
-         recommended that you name a specific parser, so that
-         Beautiful Soup gives you the same results across platforms
-         and virtual environments.
-
-        :param builder: A TreeBuilder subclass to instantiate (or
-         instance to use) instead of looking one up based on
-         `features`. You only need to use this if you've implemented a
-         custom TreeBuilder.
-
-        :param parse_only: A SoupStrainer. Only parts of the document
-         matching the SoupStrainer will be considered. This is useful
-         when parsing part of a document that would otherwise be too
-         large to fit into memory.
-
-        :param from_encoding: A string indicating the encoding of the
-         document to be parsed. Pass this in if Beautiful Soup is
-         guessing wrongly about the document's encoding.
-
-        :param exclude_encodings: A list of strings indicating
-         encodings known to be wrong. Pass this in if you don't know
-         the document's encoding but you know Beautiful Soup's guess is
-         wrong.
-
-        :param element_classes: A dictionary mapping BeautifulSoup
-         classes like Tag and NavigableString, to other classes you'd
-         like to be instantiated instead as the parse tree is
-         built. This is useful for subclassing Tag or NavigableString
-         to modify default behavior.
-
-        :param kwargs: For backwards compatibility purposes, the
-         constructor accepts certain keyword arguments used in
-         Beautiful Soup 3. None of these arguments do anything in
-         Beautiful Soup 4; they will result in a warning and then be
-         ignored.
-         
-         Apart from this, any keyword arguments passed into the
-         BeautifulSoup constructor are propagated to the TreeBuilder
-         constructor. This makes it possible to configure a
-         TreeBuilder by passing in arguments, not just by saying which
-         one to use.
-        """
         if 'convertEntities' in kwargs:
-            del kwargs['convertEntities']
             warnings.warn(
                 "BS4 does not respect the convertEntities argument to the "
                 "BeautifulSoup constructor. Entities are always converted "
@@ -204,18 +114,18 @@ class BeautifulSoup(Tag):
             del kwargs['isHTML']
             warnings.warn(
                 "BS4 does not respect the isHTML argument to the "
-                "BeautifulSoup constructor. Suggest you use "
-                "features='lxml' for HTML and features='lxml-xml' for "
-                "XML.")
+                "BeautifulSoup constructor. You can pass in features='html' "
+                "or features='xml' to get a builder capable of handling "
+                "one or the other.")
 
         def deprecated_argument(old_name, new_name):
             if old_name in kwargs:
                 warnings.warn(
                     'The "%s" argument to the BeautifulSoup constructor '
-                    'has been renamed to "%s."' % (old_name, new_name),
-                    DeprecationWarning, stacklevel=3
-                )
-                return kwargs.pop(old_name)
+                    'has been renamed to "%s."' % (old_name, new_name))
+                value = kwargs[old_name]
+                del kwargs[old_name]
+                return value
             return None
 
         parse_only = parse_only or deprecated_argument(
@@ -224,24 +134,13 @@ class BeautifulSoup(Tag):
         from_encoding = from_encoding or deprecated_argument(
             "fromEncoding", "from_encoding")
 
-        if from_encoding and isinstance(markup, str):
-            warnings.warn("You provided Unicode markup but also provided a value for from_encoding. Your from_encoding will be ignored.")
-            from_encoding = None
+        if len(kwargs) > 0:
+            arg = kwargs.keys().pop()
+            raise TypeError(
+                "__init__() got an unexpected keyword argument '%s'" % arg)
 
-        self.element_classes = element_classes or dict()
-
-        # We need this information to track whether or not the builder
-        # was specified well enough that we can omit the 'you need to
-        # specify a parser' warning.
-        original_builder = builder
-        original_features = features
-            
-        if isinstance(builder, type):
-            # A builder class was passed in; it needs to be instantiated.
-            builder_class = builder
-            builder = None
-        elif builder is None:
-            if isinstance(features, str):
+        if builder is None:
+            if isinstance(features, basestring):
                 features = [features]
             if features is None or len(features) == 0:
                 features = self.DEFAULT_BUILDER_FEATURES
@@ -251,227 +150,60 @@ class BeautifulSoup(Tag):
                     "Couldn't find a tree builder with the features you "
                     "requested: %s. Do you need to install a parser library?"
                     % ",".join(features))
-
-        # At this point either we have a TreeBuilder instance in
-        # builder, or we have a builder_class that we can instantiate
-        # with the remaining **kwargs.
-        if builder is None:
-            builder = builder_class(**kwargs)
-            if not original_builder and not (
-                    original_features == builder.NAME or
-                    original_features in builder.ALTERNATE_NAMES
-            ) and markup:
-                # The user did not tell us which TreeBuilder to use,
-                # and we had to guess. Issue a warning.
-                if builder.is_xml:
-                    markup_type = "XML"
-                else:
-                    markup_type = "HTML"
-
-                # This code adapted from warnings.py so that we get the same line
-                # of code as our warnings.warn() call gets, even if the answer is wrong
-                # (as it may be in a multithreading situation).
-                caller = None
-                try:
-                    caller = sys._getframe(1)
-                except ValueError:
-                    pass
-                if caller:
-                    globals = caller.f_globals
-                    line_number = caller.f_lineno
-                else:
-                    globals = sys.__dict__
-                    line_number= 1                    
-                filename = globals.get('__file__')
-                if filename:
-                    fnl = filename.lower()
-                    if fnl.endswith((".pyc", ".pyo")):
-                        filename = filename[:-1]
-                if filename:
-                    # If there is no filename at all, the user is most likely in a REPL,
-                    # and the warning is not necessary.
-                    values = dict(
-                        filename=filename,
-                        line_number=line_number,
-                        parser=builder.NAME,
-                        markup_type=markup_type
-                    )
-                    warnings.warn(
-                        self.NO_PARSER_SPECIFIED_WARNING % values,
-                        GuessedAtParserWarning, stacklevel=2
-                    )
-        else:
-            if kwargs:
-                warnings.warn("Keyword arguments to the BeautifulSoup constructor will be ignored. These would normally be passed into the TreeBuilder constructor, but a TreeBuilder instance was passed in as `builder`.")
-                    
+            builder = builder_class()
         self.builder = builder
         self.is_xml = builder.is_xml
-        self.known_xml = self.is_xml
-        self._namespaces = dict()
+        self.builder.soup = self
+
         self.parse_only = parse_only
 
         if hasattr(markup, 'read'):        # It's a file-type object.
             markup = markup.read()
-        elif len(markup) <= 256 and (
-                (isinstance(markup, bytes) and not b'<' in markup)
-                or (isinstance(markup, str) and not '<' in markup)
-        ):
-            # Issue warnings for a couple beginner problems
+        elif len(markup) <= 256:
+            # Print out warnings for a couple beginner problems
             # involving passing non-markup to Beautiful Soup.
             # Beautiful Soup will still parse the input as markup,
-            # since that is sometimes the intended behavior.
-            if not self._markup_is_url(markup):
-                self._markup_resembles_filename(markup)                
+            # just in case that's what the user really wants.
+            if (isinstance(markup, unicode)
+                and not os.path.supports_unicode_filenames):
+                possible_filename = markup.encode("utf8")
+            else:
+                possible_filename = markup
+            is_file = False
+            try:
+                is_file = os.path.exists(possible_filename)
+            except Exception, e:
+                # This is almost certainly a problem involving
+                # characters not valid in filenames on this
+                # system. Just let it go.
+                pass
+            if is_file:
+                warnings.warn(
+                    '"%s" looks like a filename, not markup. You should probably open this file and pass the filehandle into Beautiful Soup.' % markup)
+            if markup[:5] == "http:" or markup[:6] == "https:":
+                # TODO: This is ugly but I couldn't get it to work in
+                # Python 3 otherwise.
+                if ((isinstance(markup, bytes) and not b' ' in markup)
+                    or (isinstance(markup, unicode) and not u' ' in markup)):
+                    warnings.warn(
+                        '"%s" looks like a URL. Beautiful Soup is not an HTTP client. You should probably use an HTTP client to get the document behind the URL, and feed that document to Beautiful Soup.' % markup)
 
-        rejections = []
-        success = False
         for (self.markup, self.original_encoding, self.declared_html_encoding,
          self.contains_replacement_characters) in (
-             self.builder.prepare_markup(
-                 markup, from_encoding, exclude_encodings=exclude_encodings)):
+            self.builder.prepare_markup(markup, from_encoding)):
             self.reset()
-            self.builder.initialize_soup(self)
             try:
                 self._feed()
-                success = True
                 break
-            except ParserRejectedMarkup as e:
-                rejections.append(e)
+            except ParserRejectedMarkup:
                 pass
 
-        if not success:
-            other_exceptions = [str(e) for e in rejections]
-            raise ParserRejectedMarkup(
-                "The markup you provided was rejected by the parser. Trying a different parser or a different encoding may help.\n\nOriginal exception(s) from parser:\n " + "\n ".join(other_exceptions)
-            )
-
         # Clear out the markup and remove the builder's circular
         # reference to this object.
         self.markup = None
         self.builder.soup = None
 
-    def _clone(self):
-        """Create a new BeautifulSoup object with the same TreeBuilder,
-        but not associated with any markup.
-
-        This is the first step of the deepcopy process.
-        """
-        clone = type(self)("", None, self.builder)
-
-        # Keep track of the encoding of the original document,
-        # since we won't be parsing it again.
-        clone.original_encoding = self.original_encoding
-        return clone
-        
-    def __getstate__(self):
-        # Frequently a tree builder can't be pickled.
-        d = dict(self.__dict__)
-        if 'builder' in d and d['builder'] is not None and not self.builder.picklable:
-            d['builder'] = type(self.builder)
-        # Store the contents as a Unicode string.
-        d['contents'] = []
-        d['markup'] = self.decode()
-
-        # If _most_recent_element is present, it's a Tag object left
-        # over from initial parse. It might not be picklable and we
-        # don't need it.
-        if '_most_recent_element' in d:
-            del d['_most_recent_element']
-        return d
-
-    def __setstate__(self, state):
-        # If necessary, restore the TreeBuilder by looking it up.
-        self.__dict__ = state
-        if isinstance(self.builder, type):
-            self.builder = self.builder()
-        elif not self.builder:
-            # We don't know which builder was used to build this
-            # parse tree, so use a default we know is always available.
-            self.builder = HTMLParserTreeBuilder()
-        self.builder.soup = self
-        self.reset()
-        self._feed()
-        return state
-
-    
-    @classmethod
-    def _decode_markup(cls, markup):
-        """Ensure `markup` is bytes so it's safe to send into warnings.warn.
-
-        TODO: warnings.warn had this problem back in 2010 but it might not
-        anymore.
-        """
-        if isinstance(markup, bytes):
-            decoded = markup.decode('utf-8', 'replace')
-        else:
-            decoded = markup
-        return decoded
-
-    @classmethod
-    def _markup_is_url(cls, markup):
-        """Error-handling method to raise a warning if incoming markup looks
-        like a URL.
-
-        :param markup: A string.
-        :return: Whether or not the markup resembles a URL
-            closely enough to justify a warning.
-        """
-        if isinstance(markup, bytes):
-            space = b' '
-            cant_start_with = (b"http:", b"https:")
-        elif isinstance(markup, str):
-            space = ' '
-            cant_start_with = ("http:", "https:")
-        else:
-            return False
-
-        if any(markup.startswith(prefix) for prefix in cant_start_with):
-            if not space in markup:
-                warnings.warn(
-                    'The input looks more like a URL than markup. You may want to use'
-                    ' an HTTP client like requests to get the document behind'
-                    ' the URL, and feed that document to Beautiful Soup.',
-                    MarkupResemblesLocatorWarning,
-                    stacklevel=3
-                )
-                return True
-        return False
-
-    @classmethod
-    def _markup_resembles_filename(cls, markup):
-        """Error-handling method to raise a warning if incoming markup
-        resembles a filename.
-
-        :param markup: A bytestring or string.
-        :return: Whether or not the markup resembles a filename
-            closely enough to justify a warning.
-        """
-        path_characters = '/\\'
-        extensions = ['.html', '.htm', '.xml', '.xhtml', '.txt']
-        if isinstance(markup, bytes):
-            path_characters = path_characters.encode("utf8")
-            extensions = [x.encode('utf8') for x in extensions]
-        filelike = False
-        if any(x in markup for x in path_characters):
-            filelike = True
-        else:
-            lower = markup.lower()
-            if any(lower.endswith(ext) for ext in extensions):
-                filelike = True
-        if filelike:
-            warnings.warn(
-                'The input looks more like a filename than markup. You may'
-                ' want to open this file and pass the filehandle into'
-                ' Beautiful Soup.',
-                MarkupResemblesLocatorWarning, stacklevel=3
-            )
-            return True
-        return False
-    
     def _feed(self):
-        """Internal method that parses previously set markup, creating a large
-        number of Tag and NavigableString objects.
-        """
         # Convert the document to Unicode.
         self.builder.reset()
 
@@ -482,113 +214,52 @@ class BeautifulSoup(Tag):
             self.popTag()
 
     def reset(self):
-        """Reset this object to a state as though it had never parsed any
-        markup.
-        """
         Tag.__init__(self, self, self.builder, self.ROOT_TAG_NAME)
         self.hidden = 1
         self.builder.reset()
         self.current_data = []
         self.currentTag = None
         self.tagStack = []
-        self.open_tag_counter = Counter()
         self.preserve_whitespace_tag_stack = []
-        self.string_container_stack = []
-        self._most_recent_element = None
         self.pushTag(self)
 
-    def new_tag(self, name, namespace=None, nsprefix=None, attrs={},
-                sourceline=None, sourcepos=None, **kwattrs):
-        """Create a new Tag associated with this BeautifulSoup object.
+    def new_tag(self, name, namespace=None, nsprefix=None, **attrs):
+        """Create a new tag associated with this soup."""
+        return Tag(None, self.builder, name, namespace, nsprefix, attrs)
 
-        :param name: The name of the new Tag.
-        :param namespace: The URI of the new Tag's XML namespace, if any.
-        :param prefix: The prefix for the new Tag's XML namespace, if any.
-        :param attrs: A dictionary of this Tag's attribute values; can
-            be used instead of `kwattrs` for attributes like 'class'
-            that are reserved words in Python.
-        :param sourceline: The line number where this tag was
-            (purportedly) found in its source document.
-        :param sourcepos: The character position within `sourceline` where this
-            tag was (purportedly) found.
-        :param kwattrs: Keyword arguments for the new Tag's attribute values.
+    def new_string(self, s, subclass=NavigableString):
+        """Create a new NavigableString associated with this soup."""
+        navigable = subclass(s)
+        navigable.setup()
+        return navigable
 
-        """
-        kwattrs.update(attrs)
-        return self.element_classes.get(Tag, Tag)(
-            None, self.builder, name, namespace, nsprefix, kwattrs,
-            sourceline=sourceline, sourcepos=sourcepos
-        )
-
-    def string_container(self, base_class=None):
-        container = base_class or NavigableString
-        
-        # There may be a general override of NavigableString.
-        container = self.element_classes.get(
-            container, container
-        )
-
-        # On top of that, we may be inside a tag that needs a special
-        # container class.
-        if self.string_container_stack and container is NavigableString:
-            container = self.builder.string_containers.get(
-                self.string_container_stack[-1].name, container
-            )
-        return container
-        
-    def new_string(self, s, subclass=None):
-        """Create a new NavigableString associated with this BeautifulSoup
-        object.
-        """
-        container = self.string_container(subclass)
-        return container(s)
-
-    def insert_before(self, *args):
-        """This method is part of the PageElement API, but `BeautifulSoup` doesn't implement
-        it because there is nothing before or after it in the parse tree.
-        """
+    def insert_before(self, successor):
         raise NotImplementedError("BeautifulSoup objects don't support insert_before().")
 
-    def insert_after(self, *args):
-        """This method is part of the PageElement API, but `BeautifulSoup` doesn't implement
-        it because there is nothing before or after it in the parse tree.
-        """
+    def insert_after(self, successor):
         raise NotImplementedError("BeautifulSoup objects don't support insert_after().")
 
     def popTag(self):
-        """Internal method called by _popToTag when a tag is closed."""
         tag = self.tagStack.pop()
-        if tag.name in self.open_tag_counter:
-            self.open_tag_counter[tag.name] -= 1
         if self.preserve_whitespace_tag_stack and tag == self.preserve_whitespace_tag_stack[-1]:
             self.preserve_whitespace_tag_stack.pop()
-        if self.string_container_stack and tag == self.string_container_stack[-1]:
-            self.string_container_stack.pop()
-        #print("Pop", tag.name)
+        #print "Pop", tag.name
         if self.tagStack:
             self.currentTag = self.tagStack[-1]
         return self.currentTag
 
     def pushTag(self, tag):
-        """Internal method called by handle_starttag when a tag is opened."""
-        #print("Push", tag.name)
-        if self.currentTag is not None:
+        #print "Push", tag.name
+        if self.currentTag:
             self.currentTag.contents.append(tag)
         self.tagStack.append(tag)
         self.currentTag = self.tagStack[-1]
-        if tag.name != self.ROOT_TAG_NAME:
-            self.open_tag_counter[tag.name] += 1
         if tag.name in self.builder.preserve_whitespace_tags:
             self.preserve_whitespace_tag_stack.append(tag)
-        if tag.name in self.builder.string_containers:
-            self.string_container_stack.append(tag)
 
-    def endData(self, containerClass=None):
-        """Method called by the TreeBuilder when the end of a data segment
-        occurs.
-        """       
+    def endData(self, containerClass=NavigableString):
         if self.current_data:
-            current_data = ''.join(self.current_data)
+            current_data = u''.join(self.current_data)
             # If whitespace is not preserved, and this string contains
             # nothing but ASCII spaces, replace it with a single space
             # or newline.
@@ -613,93 +284,26 @@ class BeautifulSoup(Tag):
                     not self.parse_only.search(current_data)):
                 return
 
-            containerClass = self.string_container(containerClass)
             o = containerClass(current_data)
             self.object_was_parsed(o)
 
     def object_was_parsed(self, o, parent=None, most_recent_element=None):
-        """Method called by the TreeBuilder to integrate an object into the parse tree."""
-        if parent is None:
-            parent = self.currentTag
+        """Add an object to the parse tree."""
+        parent = parent or self.currentTag
+        most_recent_element = most_recent_element or self._most_recent_element
+        o.setup(parent, most_recent_element)
+
         if most_recent_element is not None:
-            previous_element = most_recent_element
-        else:
-            previous_element = self._most_recent_element
-
-        next_element = previous_sibling = next_sibling = None
-        if isinstance(o, Tag):
-            next_element = o.next_element
-            next_sibling = o.next_sibling
-            previous_sibling = o.previous_sibling
-            if previous_element is None:
-                previous_element = o.previous_element
-
-        fix = parent.next_element is not None
-
-        o.setup(parent, previous_element, next_element, previous_sibling, next_sibling)
-
+            most_recent_element.next_element = o
         self._most_recent_element = o
         parent.contents.append(o)
 
-        # Check if we are inserting into an already parsed node.
-        if fix:
-            self._linkage_fixer(parent)
-
-    def _linkage_fixer(self, el):
-        """Make sure linkage of this fragment is sound."""
-
-        first = el.contents[0]
-        child = el.contents[-1]
-        descendant = child
-
-        if child is first and el.parent is not None:
-            # Parent should be linked to first child
-            el.next_element = child
-            # We are no longer linked to whatever this element is
-            prev_el = child.previous_element
-            if prev_el is not None and prev_el is not el:
-                prev_el.next_element = None
-            # First child should be linked to the parent, and no previous siblings.
-            child.previous_element = el
-            child.previous_sibling = None
-
-        # We have no sibling as we've been appended as the last.
-        child.next_sibling = None
-
-        # This index is a tag, dig deeper for a "last descendant"
-        if isinstance(child, Tag) and child.contents:
-            descendant = child._last_descendant(False)
-
-        # As the final step, link last descendant. It should be linked
-        # to the parent's next sibling (if found), else walk up the chain
-        # and find a parent with a sibling. It should have no next sibling.
-        descendant.next_element = None
-        descendant.next_sibling = None
-        target = el
-        while True:
-            if target is None:
-                break
-            elif target.next_sibling is not None:
-                descendant.next_element = target.next_sibling
-                target.next_sibling.previous_element = child
-                break
-            target = target.parent
-
     def _popToTag(self, name, nsprefix=None, inclusivePop=True):
         """Pops the tag stack up to and including the most recent
-        instance of the given tag.
-
-        If there are no open tags with the given name, nothing will be
-        popped.
-
-        :param name: Pop up to the most recent tag with this name.
-        :param nsprefix: The namespace prefix that goes with `name`.
-        :param inclusivePop: It this is false, pops the tag stack up
-          to but *not* including the most recent instqance of the
-          given tag.
-
-        """
-        #print("Popping to %s" % name)
+        instance of the given tag. If inclusivePop is false, pops the tag
+        stack up to but *not* including the most recent instqance of
+        the given tag."""
+        #print "Popping to %s" % name
         if name == self.ROOT_TAG_NAME:
             # The BeautifulSoup object itself can never be popped.
             return
@@ -708,8 +312,6 @@ class BeautifulSoup(Tag):
 
         stack_size = len(self.tagStack)
         for i in range(stack_size - 1, 0, -1):
-            if not self.open_tag_counter.get(name):
-                break
             t = self.tagStack[i]
             if (name == t.name and nsprefix == t.prefix):
                 if inclusivePop:
@@ -719,26 +321,16 @@ class BeautifulSoup(Tag):
 
         return most_recently_popped
 
-    def handle_starttag(self, name, namespace, nsprefix, attrs, sourceline=None,
-                        sourcepos=None, namespaces=None):
-        """Called by the tree builder when a new tag is encountered.
+    def handle_starttag(self, name, namespace, nsprefix, attrs):
+        """Push a start tag on to the stack.
 
-        :param name: Name of the tag.
-        :param nsprefix: Namespace prefix for the tag.
-        :param attrs: A dictionary of attribute values.
-        :param sourceline: The line number where this tag was found in its
-            source document.
-        :param sourcepos: The character position within `sourceline` where this
-            tag was found.
-        :param namespaces: A dictionary of all namespace prefix mappings 
-            currently in scope in the document.
-
-        If this method returns None, the tag was rejected by an active
-        SoupStrainer. You should proceed as if the tag had not occurred
+        If this method returns None, the tag was rejected by the
+        SoupStrainer. You should proceed as if the tag had not occured
         in the document. For instance, if this was a self-closing tag,
         don't call handle_endtag.
         """
-        # print("Start tag %s: %s" % (name, attrs))
+
+        # print "Start tag %s: %s" % (name, attrs)
         self.endData()
 
         if (self.parse_only and len(self.tagStack) <= 1
@@ -746,66 +338,46 @@ class BeautifulSoup(Tag):
                  or not self.parse_only.search_tag(name, attrs))):
             return None
 
-        tag = self.element_classes.get(Tag, Tag)(
-            self, self.builder, name, namespace, nsprefix, attrs,
-            self.currentTag, self._most_recent_element,
-            sourceline=sourceline, sourcepos=sourcepos,
-            namespaces=namespaces
-        )
+        tag = Tag(self, self.builder, name, namespace, nsprefix, attrs,
+                  self.currentTag, self._most_recent_element)
         if tag is None:
             return tag
-        if self._most_recent_element is not None:
+        if self._most_recent_element:
             self._most_recent_element.next_element = tag
         self._most_recent_element = tag
         self.pushTag(tag)
         return tag
 
     def handle_endtag(self, name, nsprefix=None):
-        """Called by the tree builder when an ending tag is encountered.
-
-        :param name: Name of the tag.
-        :param nsprefix: Namespace prefix for the tag.
-        """
-        #print("End tag: " + name)
+        #print "End tag: " + name
         self.endData()
         self._popToTag(name, nsprefix)
-        
+
     def handle_data(self, data):
-        """Called by the tree builder when a chunk of textual data is encountered."""
         self.current_data.append(data)
-       
+
     def decode(self, pretty_print=False,
                eventual_encoding=DEFAULT_OUTPUT_ENCODING,
-               formatter="minimal", iterator=None):
-        """Returns a string or Unicode representation of the parse tree
-            as an HTML or XML document.
+               formatter="minimal"):
+        """Returns a string or Unicode representation of this document.
+        To get Unicode, pass None for encoding."""
 
-        :param pretty_print: If this is True, indentation will be used to
-            make the document more readable.
-        :param eventual_encoding: The encoding of the final document.
-            If this is None, the document will be a Unicode string.
-        """
         if self.is_xml:
             # Print the XML declaration
             encoding_part = ''
-            if eventual_encoding in PYTHON_SPECIFIC_ENCODINGS:
-                # This is a special Python encoding; it can't actually
-                # go into an XML document because it means nothing
-                # outside of Python.
-                eventual_encoding = None
             if eventual_encoding != None:
                 encoding_part = ' encoding="%s"' % eventual_encoding
-            prefix = '<?xml version="1.0"%s?>\n' % encoding_part
+            prefix = u'<?xml version="1.0"%s?>\n' % encoding_part
         else:
-            prefix = ''
+            prefix = u''
         if not pretty_print:
             indent_level = None
         else:
             indent_level = 0
         return prefix + super(BeautifulSoup, self).decode(
-            indent_level, eventual_encoding, formatter, iterator)
+            indent_level, eventual_encoding, formatter)
 
-# Aliases to make it easier to get started quickly, e.g. 'from bs4 import _soup'
+# Alias to make it easier to type import: 'from bs4 import _soup'
 _s = BeautifulSoup
 _soup = BeautifulSoup
 
@@ -816,25 +388,19 @@ class BeautifulStoneSoup(BeautifulSoup):
         kwargs['features'] = 'xml'
         warnings.warn(
             'The BeautifulStoneSoup class is deprecated. Instead of using '
-            'it, pass features="xml" into the BeautifulSoup constructor.',
-            DeprecationWarning, stacklevel=2
-        )
+            'it, pass features="xml" into the BeautifulSoup constructor.')
         super(BeautifulStoneSoup, self).__init__(*args, **kwargs)
 
 
 class StopParsing(Exception):
-    """Exception raised by a TreeBuilder if it's unable to continue parsing."""
     pass
 
 class FeatureNotFound(ValueError):
-    """Exception raised by the BeautifulSoup constructor if no parser with the
-    requested features is found.
-    """
     pass
 
 
-#If this file is run as a script, act as an HTML pretty-printer.
+#By default, act as an HTML pretty-printer.
 if __name__ == '__main__':
     import sys
     soup = BeautifulSoup(sys.stdin)
-    print((soup.prettify()))
+    print soup.prettify()
diff --git a/lib/bs4/builder/__init__.py b/lib/bs4/builder/__init__.py
index ffb31fc2..740f5f29 100644
--- a/lib/bs4/builder/__init__.py
+++ b/lib/bs4/builder/__init__.py
@@ -1,21 +1,11 @@
-# Use of this source code is governed by the MIT license.
-__license__ = "MIT"
-
 from collections import defaultdict
 import itertools
-import re
-import warnings
 import sys
 from bs4.element import (
     CharsetMetaAttributeValue,
     ContentMetaAttributeValue,
-    RubyParenthesisString,
-    RubyTextString,
-    Stylesheet,
-    Script,
-    TemplateString,
-    nonwhitespace_re
-)
+    whitespace_re
+    )
 
 __all__ = [
     'HTMLTreeBuilder',
@@ -32,41 +22,20 @@ XML = 'xml'
 HTML = 'html'
 HTML_5 = 'html5'
 
-class XMLParsedAsHTMLWarning(UserWarning):
-    """The warning issued when an HTML parser is used to parse
-    XML that is not XHTML.
-    """
-    MESSAGE = """It looks like you're parsing an XML document using an HTML parser. If this really is an HTML document (maybe it's XHTML?), you can ignore or filter this warning. If it's XML, you should know that using an XML parser will be more reliable. To parse this document as XML, make sure you have the lxml package installed, and pass the keyword argument `features="xml"` into the BeautifulSoup constructor."""
-
 
 class TreeBuilderRegistry(object):
-    """A way of looking up TreeBuilder subclasses by their name or by desired
-    features.
-    """
-    
+
     def __init__(self):
         self.builders_for_feature = defaultdict(list)
         self.builders = []
 
     def register(self, treebuilder_class):
-        """Register a treebuilder based on its advertised features.
-
-        :param treebuilder_class: A subclass of Treebuilder. its .features
-           attribute should list its features.
-        """
+        """Register a treebuilder based on its advertised features."""
         for feature in treebuilder_class.features:
             self.builders_for_feature[feature].insert(0, treebuilder_class)
         self.builders.insert(0, treebuilder_class)
 
     def lookup(self, *features):
-        """Look up a TreeBuilder subclass with the desired features.
-
-        :param features: A list of features to look for. If none are
-            provided, the most recently registered TreeBuilder subclass
-            will be used.
-        :return: A TreeBuilder subclass, or None if there's no
-            registered subclass with all the requested features.
-        """
         if len(self.builders) == 0:
             # There are no builders at all.
             return None
@@ -109,97 +78,24 @@ class TreeBuilderRegistry(object):
 builder_registry = TreeBuilderRegistry()
 
 class TreeBuilder(object):
-    """Turn a textual document into a Beautiful Soup object tree."""
+    """Turn a document into a Beautiful Soup object tree."""
 
-    NAME = "[Unknown tree builder]"
-    ALTERNATE_NAMES = []
     features = []
 
     is_xml = False
-    picklable = False
+    preserve_whitespace_tags = set()
     empty_element_tags = None # A tag will be considered an empty-element
                               # tag when and only when it has no contents.
-    
+
     # A value for these tag/attribute combinations is a space- or
     # comma-separated list of CDATA, rather than a single CDATA.
-    DEFAULT_CDATA_LIST_ATTRIBUTES = defaultdict(list)
+    cdata_list_attributes = {}
 
-    # Whitespace should be preserved inside these tags.
-    DEFAULT_PRESERVE_WHITESPACE_TAGS = set()
 
-    # The textual contents of tags with these names should be
-    # instantiated with some class other than NavigableString.
-    DEFAULT_STRING_CONTAINERS = {}
-    
-    USE_DEFAULT = object()
-
-    # Most parsers don't keep track of line numbers.
-    TRACKS_LINE_NUMBERS = False
-    
-    def __init__(self, multi_valued_attributes=USE_DEFAULT,
-                 preserve_whitespace_tags=USE_DEFAULT,
-                 store_line_numbers=USE_DEFAULT,
-                 string_containers=USE_DEFAULT,
-    ):
-        """Constructor.
-
-        :param multi_valued_attributes: If this is set to None, the
-         TreeBuilder will not turn any values for attributes like
-         'class' into lists. Setting this to a dictionary will
-         customize this behavior; look at DEFAULT_CDATA_LIST_ATTRIBUTES
-         for an example.
-
-         Internally, these are called "CDATA list attributes", but that
-         probably doesn't make sense to an end-user, so the argument name
-         is `multi_valued_attributes`.
-
-        :param preserve_whitespace_tags: A list of tags to treat
-         the way <pre> tags are treated in HTML. Tags in this list
-         are immune from pretty-printing; their contents will always be
-         output as-is.
-
-        :param string_containers: A dictionary mapping tag names to
-        the classes that should be instantiated to contain the textual
-        contents of those tags. The default is to use NavigableString
-        for every tag, no matter what the name. You can override the
-        default by changing DEFAULT_STRING_CONTAINERS.
-
-        :param store_line_numbers: If the parser keeps track of the
-         line numbers and positions of the original markup, that
-         information will, by default, be stored in each corresponding
-         `Tag` object. You can turn this off by passing
-         store_line_numbers=False. If the parser you're using doesn't 
-         keep track of this information, then setting store_line_numbers=True
-         will do nothing.
-        """
+    def __init__(self):
         self.soup = None
-        if multi_valued_attributes is self.USE_DEFAULT:
-            multi_valued_attributes = self.DEFAULT_CDATA_LIST_ATTRIBUTES
-        self.cdata_list_attributes = multi_valued_attributes
-        if preserve_whitespace_tags is self.USE_DEFAULT:
-            preserve_whitespace_tags = self.DEFAULT_PRESERVE_WHITESPACE_TAGS
-        self.preserve_whitespace_tags = preserve_whitespace_tags
-        if store_line_numbers == self.USE_DEFAULT:
-            store_line_numbers = self.TRACKS_LINE_NUMBERS
-        self.store_line_numbers = store_line_numbers 
-        if string_containers == self.USE_DEFAULT:
-            string_containers = self.DEFAULT_STRING_CONTAINERS
-        self.string_containers = string_containers
-        
-    def initialize_soup(self, soup):
-        """The BeautifulSoup object has been initialized and is now
-        being associated with the TreeBuilder.
 
-        :param soup: A BeautifulSoup object.
-        """
-        self.soup = soup
-        
     def reset(self):
-        """Do any work necessary to reset the underlying parser
-        for a new document.
-
-        By default, this does nothing.
-        """
         pass
 
     def can_be_empty_element(self, tag_name):
@@ -211,58 +107,24 @@ class TreeBuilder(object):
         For instance: an HTMLBuilder does not consider a <p> tag to be
         an empty-element tag (it's not in
         HTMLBuilder.empty_element_tags). This means an empty <p> tag
-        will be presented as "<p></p>", not "<p/>" or "<p>".
+        will be presented as "<p></p>", not "<p />".
 
         The default implementation has no opinion about which tags are
         empty-element tags, so a tag will be presented as an
-        empty-element tag if and only if it has no children.
-        "<foo></foo>" will become "<foo/>", and "<foo>bar</foo>" will
+        empty-element tag if and only if it has no contents.
+        "<foo></foo>" will become "<foo />", and "<foo>bar</foo>" will
         be left alone.
-
-        :param tag_name: The name of a markup tag.
         """
         if self.empty_element_tags is None:
             return True
         return tag_name in self.empty_element_tags
-    
+
     def feed(self, markup):
-        """Run some incoming markup through some parsing process,
-        populating the `BeautifulSoup` object in self.soup.
-
-        This method is not implemented in TreeBuilder; it must be
-        implemented in subclasses.
-
-        :return: None.
-        """
         raise NotImplementedError()
 
     def prepare_markup(self, markup, user_specified_encoding=None,
-                       document_declared_encoding=None, exclude_encodings=None):
-        """Run any preliminary steps necessary to make incoming markup
-        acceptable to the parser.
-
-        :param markup: Some markup -- probably a bytestring.
-        :param user_specified_encoding: The user asked to try this encoding.
-        :param document_declared_encoding: The markup itself claims to be
-            in this encoding. NOTE: This argument is not used by the
-            calling code and can probably be removed.
-        :param exclude_encodings: The user asked _not_ to try any of
-            these encodings.
-
-        :yield: A series of 4-tuples:
-         (markup, encoding, declared encoding,
-          has undergone character replacement)
-
-         Each 4-tuple represents a strategy for converting the
-         document to Unicode and parsing it. Each strategy will be tried 
-         in turn.
-
-         By default, the only strategy is to parse the markup
-         as-is. See `LXMLTreeBuilderForXML` and
-         `HTMLParserTreeBuilder` for implementations that take into
-         account the quirks of particular parsers.
-        """
-        yield markup, None, None, False
+                       document_declared_encoding=None):
+        return markup, None, None, False
 
     def test_fragment_to_document(self, fragment):
         """Wrap an HTML fragment to make it look like a document.
@@ -274,36 +136,16 @@ class TreeBuilder(object):
         results against other HTML fragments.
 
         This method should not be used outside of tests.
-
-        :param fragment: A string -- fragment of HTML.
-        :return: A string -- a full HTML document.
         """
         return fragment
 
     def set_up_substitutions(self, tag):
-        """Set up any substitutions that will need to be performed on 
-        a `Tag` when it's output as a string.
-
-        By default, this does nothing. See `HTMLTreeBuilder` for a
-        case where this is used.
-
-        :param tag: A `Tag`
-        :return: Whether or not a substitution was performed.
-        """
         return False
 
     def _replace_cdata_list_attribute_values(self, tag_name, attrs):
-        """When an attribute value is associated with a tag that can
-        have multiple values for that attribute, convert the string
-        value to a list of strings.
+        """Replaces class="foo bar" with class=["foo", "bar"]
 
-        Basically, replaces class="foo bar" with class=["foo", "bar"]
-
-        NOTE: This method modifies its input in place.
-
-        :param tag_name: The name of a tag.
-        :param attrs: A dictionary containing the tag's attributes.
-           Any appropriate attribute values will be modified in place.
+        Modifies its input in place.
         """
         if not attrs:
             return attrs
@@ -311,14 +153,14 @@ class TreeBuilder(object):
             universal = self.cdata_list_attributes.get('*', [])
             tag_specific = self.cdata_list_attributes.get(
                 tag_name.lower(), None)
-            for attr in list(attrs.keys()):
+            for attr in attrs.keys():
                 if attr in universal or (tag_specific and attr in tag_specific):
                     # We have a "class"-type attribute whose string
                     # value is a whitespace-separated list of
                     # values. Split it into a list.
                     value = attrs[attr]
-                    if isinstance(value, str):
-                        values = nonwhitespace_re.findall(value)
+                    if isinstance(value, basestring):
+                        values = whitespace_re.split(value)
                     else:
                         # html5lib sometimes calls setAttributes twice
                         # for the same tag when rearranging the parse
@@ -329,13 +171,9 @@ class TreeBuilder(object):
                         values = value
                     attrs[attr] = values
         return attrs
-    
-class SAXTreeBuilder(TreeBuilder):
-    """A Beautiful Soup treebuilder that listens for SAX events.
 
-    This is not currently used for anything, but it demonstrates
-    how a simple TreeBuilder would work.
-    """
+class SAXTreeBuilder(TreeBuilder):
+    """A Beautiful Soup treebuilder that listens for SAX events."""
 
     def feed(self, markup):
         raise NotImplementedError()
@@ -345,11 +183,11 @@ class SAXTreeBuilder(TreeBuilder):
 
     def startElement(self, name, attrs):
         attrs = dict((key[1], value) for key, value in list(attrs.items()))
-        #print("Start %s, %r" % (name, attrs))
+        #print "Start %s, %r" % (name, attrs)
         self.soup.handle_starttag(name, attrs)
 
     def endElement(self, name):
-        #print("End %s" % name)
+        #print "End %s" % name
         self.soup.handle_endtag(name)
 
     def startElementNS(self, nsTuple, nodeName, attrs):
@@ -386,44 +224,10 @@ class HTMLTreeBuilder(TreeBuilder):
     Such as which tags are empty-element tags.
     """
 
-    empty_element_tags = set([
-        # These are from HTML5.
-        'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'keygen', 'link', 'menuitem', 'meta', 'param', 'source', 'track', 'wbr',
-        
-        # These are from earlier versions of HTML and are removed in HTML5.
-        'basefont', 'bgsound', 'command', 'frame', 'image', 'isindex', 'nextid', 'spacer'
-    ])
+    preserve_whitespace_tags = set(['pre', 'textarea'])
+    empty_element_tags = set(['br' , 'hr', 'input', 'img', 'meta',
+                              'spacer', 'link', 'frame', 'base'])
 
-    # The HTML standard defines these as block-level elements. Beautiful
-    # Soup does not treat these elements differently from other elements,
-    # but it may do so eventually, and this information is available if
-    # you need to use it.
-    block_elements = set(["address", "article", "aside", "blockquote", "canvas", "dd", "div", "dl", "dt", "fieldset", "figcaption", "figure", "footer", "form", "h1", "h2", "h3", "h4", "h5", "h6", "header", "hr", "li", "main", "nav", "noscript", "ol", "output", "p", "pre", "section", "table", "tfoot", "ul", "video"])
-
-    # These HTML tags need special treatment so they can be
-    # represented by a string class other than NavigableString.
-    #
-    # For some of these tags, it's because the HTML standard defines
-    # an unusual content model for them. I made this list by going
-    # through the HTML spec
-    # (https://html.spec.whatwg.org/#metadata-content) and looking for
-    # "metadata content" elements that can contain strings.
-    #
-    # The Ruby tags (<rt> and <rp>) are here despite being normal
-    # "phrasing content" tags, because the content they contain is
-    # qualitatively different from other text in the document, and it
-    # can be useful to be able to distinguish it.
-    #
-    # TODO: Arguably <noscript> could go here but it seems
-    # qualitatively different from the other tags.
-    DEFAULT_STRING_CONTAINERS = {
-        'rt' : RubyTextString,
-        'rp' : RubyParenthesisString,
-        'style': Stylesheet,
-        'script': Script,
-        'template': TemplateString,
-    }    
-    
     # The HTML standard defines these attributes as containing a
     # space-separated list of values, not a single value. That is,
     # class="foo bar" means that the 'class' attribute has two values,
@@ -431,7 +235,7 @@ class HTMLTreeBuilder(TreeBuilder):
     # encounter one of these attributes, we will parse its value into
     # a list of values if possible. Upon output, the list will be
     # converted back into a string.
-    DEFAULT_CDATA_LIST_ATTRIBUTES = {
+    cdata_list_attributes = {
         "*" : ['class', 'accesskey', 'dropzone'],
         "a" : ['rel', 'rev'],
         "link" :  ['rel', 'rev'],
@@ -448,19 +252,7 @@ class HTMLTreeBuilder(TreeBuilder):
         "output" : ["for"],
         }
 
-    DEFAULT_PRESERVE_WHITESPACE_TAGS = set(['pre', 'textarea'])
-
     def set_up_substitutions(self, tag):
-        """Replace the declared encoding in a <meta> tag with a placeholder,
-        to be substituted when the tag is output to a string.
-
-        An HTML document may come in to Beautiful Soup as one
-        encoding, but exit in a different encoding, and the <meta> tag
-        needs to be changed to reflect this.
-
-        :param tag: A `Tag`
-        :return: Whether or not a substitution was performed.
-        """
         # We are only interested in <meta> tags
         if tag.name != 'meta':
             return False
@@ -493,107 +285,10 @@ class HTMLTreeBuilder(TreeBuilder):
 
         return (meta_encoding is not None)
 
-class DetectsXMLParsedAsHTML(object):
-    """A mixin class for any class (a TreeBuilder, or some class used by a
-    TreeBuilder) that's in a position to detect whether an XML
-    document is being incorrectly parsed as HTML, and issue an
-    appropriate warning.
-
-    This requires being able to observe an incoming processing
-    instruction that might be an XML declaration, and also able to
-    observe tags as they're opened. If you can't do that for a given
-    TreeBuilder, there's a less reliable implementation based on
-    examining the raw markup.
-    """
-
-    # Regular expression for seeing if markup has an <html> tag.
-    LOOKS_LIKE_HTML = re.compile("<[^ +]html", re.I)
-    LOOKS_LIKE_HTML_B = re.compile(b"<[^ +]html", re.I)
-
-    XML_PREFIX = '<?xml'
-    XML_PREFIX_B = b'<?xml'
-    
-    @classmethod
-    def warn_if_markup_looks_like_xml(cls, markup, stacklevel=3):
-        """Perform a check on some markup to see if it looks like XML
-        that's not XHTML. If so, issue a warning.
-
-        This is much less reliable than doing the check while parsing,
-        but some of the tree builders can't do that.
-
-        :param stacklevel: The stacklevel of the code calling this
-        function.
-
-        :return: True if the markup looks like non-XHTML XML, False
-        otherwise.
-
-        """
-        if isinstance(markup, bytes):
-            prefix = cls.XML_PREFIX_B
-            looks_like_html = cls.LOOKS_LIKE_HTML_B
-        else:
-            prefix = cls.XML_PREFIX
-            looks_like_html = cls.LOOKS_LIKE_HTML
-        
-        if (markup is not None
-            and markup.startswith(prefix)
-            and not looks_like_html.search(markup[:500])
-        ):
-            cls._warn(stacklevel=stacklevel+2)
-            return True
-        return False
-
-    @classmethod
-    def _warn(cls, stacklevel=5):
-        """Issue a warning about XML being parsed as HTML."""
-        warnings.warn(
-            XMLParsedAsHTMLWarning.MESSAGE, XMLParsedAsHTMLWarning,
-            stacklevel=stacklevel
-        )
-        
-    def _initialize_xml_detector(self):
-        """Call this method before parsing a document."""
-        self._first_processing_instruction = None
-        self._root_tag = None
-       
-    def _document_might_be_xml(self, processing_instruction):
-        """Call this method when encountering an XML declaration, or a
-        "processing instruction" that might be an XML declaration.
-        """
-        if (self._first_processing_instruction is not None
-            or self._root_tag is not None):
-            # The document has already started. Don't bother checking
-            # anymore.
-            return
-
-        self._first_processing_instruction = processing_instruction
-
-        # We won't know until we encounter the first tag whether or
-        # not this is actually a problem.
-        
-    def _root_tag_encountered(self, name):
-        """Call this when you encounter the document's root tag.
-
-        This is where we actually check whether an XML document is
-        being incorrectly parsed as HTML, and issue the warning.
-        """
-        if self._root_tag is not None:
-            # This method was incorrectly called multiple times. Do
-            # nothing.
-            return
-
-        self._root_tag = name
-        if (name != 'html' and self._first_processing_instruction is not None
-            and self._first_processing_instruction.lower().startswith('xml ')):
-            # We encountered an XML declaration and then a tag other
-            # than 'html'. This is a reliable indicator that a
-            # non-XHTML document is being parsed as XML.
-            self._warn()
-
-    
 def register_treebuilders_from(module):
     """Copy TreeBuilders from the given module into this module."""
-    this_module = sys.modules[__name__]
+    # I'm fairly sure this is not the best way to do this.
+    this_module = sys.modules['bs4.builder']
     for name in module.__all__:
         obj = getattr(module, name)
 
@@ -604,22 +299,12 @@ def register_treebuilders_from(module):
             this_module.builder_registry.register(obj)
 
 class ParserRejectedMarkup(Exception):
-    """An Exception to be raised when the underlying parser simply
-    refuses to parse the given markup.
-    """
-    def __init__(self, message_or_exception):
-        """Explain why the parser rejected the given markup, either
-        with a textual explanation or another exception.
-        """
-        if isinstance(message_or_exception, Exception):
-            e = message_or_exception
-            message_or_exception = "%s: %s" % (e.__class__.__name__, str(e))
-        super(ParserRejectedMarkup, self).__init__(message_or_exception)
-            
+    pass
+
 # Builders are registered in reverse order of priority, so that custom
 # builder registrations will take precedence. In general, we want lxml
 # to take precedence over html5lib, because it's faster. And we only
-# want to use HTMLParser as a last resort.
+# want to use HTMLParser as a last result.
 from . import _htmlparser
 register_treebuilders_from(_htmlparser)
 try:
diff --git a/lib/bs4/builder/_html5lib.py b/lib/bs4/builder/_html5lib.py
index 7c46a851..d46b695b 100644
--- a/lib/bs4/builder/_html5lib.py
+++ b/lib/bs4/builder/_html5lib.py
@@ -1,28 +1,17 @@
-# Use of this source code is governed by the MIT license.
-__license__ = "MIT"
-
 __all__ = [
     'HTML5TreeBuilder',
     ]
 
 import warnings
-import re
 from bs4.builder import (
-    DetectsXMLParsedAsHTML,
     PERMISSIVE,
     HTML,
     HTML_5,
     HTMLTreeBuilder,
     )
-from bs4.element import (
-    NamespacedAttribute,
-    nonwhitespace_re,
-)
+from bs4.element import NamespacedAttribute
 import html5lib
-from html5lib.constants import (
-    namespaces,
-    prefixes,
-    )
+from html5lib.constants import namespaces
 from bs4.element import (
     Comment,
     Doctype,
@@ -30,127 +19,47 @@ from bs4.element import (
     Tag,
     )
 
-try:
-    # Pre-0.99999999
-    from html5lib.treebuilders import _base as treebuilder_base
-    new_html5lib = False
-except ImportError as e:
-    # 0.99999999 and up
-    from html5lib.treebuilders import base as treebuilder_base
-    new_html5lib = True
-
 class HTML5TreeBuilder(HTMLTreeBuilder):
-    """Use html5lib to build a tree.
+    """Use html5lib to build a tree."""
 
-    Note that this TreeBuilder does not support some features common
-    to HTML TreeBuilders. Some of these features could theoretically
-    be implemented, but at the very least it's quite difficult,
-    because html5lib moves the parse tree around as it's being built.
+    features = ['html5lib', PERMISSIVE, HTML_5, HTML]
 
-    * This TreeBuilder doesn't use different subclasses of NavigableString
-      based on the name of the tag in which the string was found.
-
-    * You can't use a SoupStrainer to parse only part of a document.
-    """
-
-    NAME = "html5lib"
-
-    features = [NAME, PERMISSIVE, HTML_5, HTML]
-
-    # html5lib can tell us which line number and position in the
-    # original file is the source of an element.
-    TRACKS_LINE_NUMBERS = True
-    
-    def prepare_markup(self, markup, user_specified_encoding,
-                       document_declared_encoding=None, exclude_encodings=None):
+    def prepare_markup(self, markup, user_specified_encoding):
         # Store the user-specified encoding for use later on.
         self.user_specified_encoding = user_specified_encoding
-
-        # document_declared_encoding and exclude_encodings aren't used
-        # ATM because the html5lib TreeBuilder doesn't use
-        # UnicodeDammit.
-        if exclude_encodings:
-            warnings.warn(
-                "You provided a value for exclude_encoding, but the html5lib tree builder doesn't support exclude_encoding.",
-                stacklevel=3
-            )
-
-        # html5lib only parses HTML, so if it's given XML that's worth
-        # noting.
-        DetectsXMLParsedAsHTML.warn_if_markup_looks_like_xml(
-            markup, stacklevel=3
-        )
-
         yield (markup, None, None, False)
 
     # These methods are defined by Beautiful Soup.
     def feed(self, markup):
         if self.soup.parse_only is not None:
-            warnings.warn(
-                "You provided a value for parse_only, but the html5lib tree builder doesn't support parse_only. The entire document will be parsed.",
-                stacklevel=4
-            )
+            warnings.warn("You provided a value for parse_only, but the html5lib tree builder doesn't support parse_only. The entire document will be parsed.")
         parser = html5lib.HTMLParser(tree=self.create_treebuilder)
-        self.underlying_builder.parser = parser
-        extra_kwargs = dict()
-        if not isinstance(markup, str):
-            if new_html5lib:
-                extra_kwargs['override_encoding'] = self.user_specified_encoding
-            else:
-                extra_kwargs['encoding'] = self.user_specified_encoding
-        doc = parser.parse(markup, **extra_kwargs)
-        
+        doc = parser.parse(markup, encoding=self.user_specified_encoding)
+
         # Set the character encoding detected by the tokenizer.
-        if isinstance(markup, str):
+        if isinstance(markup, unicode):
             # We need to special-case this because html5lib sets
             # charEncoding to UTF-8 if it gets Unicode input.
             doc.original_encoding = None
         else:
-            original_encoding = parser.tokenizer.stream.charEncoding[0]
-            if not isinstance(original_encoding, str):
-                # In 0.99999999 and up, the encoding is an html5lib
-                # Encoding object. We want to use a string for compatibility
-                # with other tree builders.
-                original_encoding = original_encoding.name
-            doc.original_encoding = original_encoding
-        self.underlying_builder.parser = None
-            
+            doc.original_encoding = parser.tokenizer.stream.charEncoding[0]
+
     def create_treebuilder(self, namespaceHTMLElements):
         self.underlying_builder = TreeBuilderForHtml5lib(
-            namespaceHTMLElements, self.soup,
-            store_line_numbers=self.store_line_numbers
-        )
+            self.soup, namespaceHTMLElements)
         return self.underlying_builder
 
     def test_fragment_to_document(self, fragment):
         """See `TreeBuilder`."""
-        return '<html><head></head><body>%s</body></html>' % fragment
+        return u'<html><head></head><body>%s</body></html>' % fragment
 
 
-class TreeBuilderForHtml5lib(treebuilder_base.TreeBuilder):
-    
-    def __init__(self, namespaceHTMLElements, soup=None,
-                 store_line_numbers=True, **kwargs):
-        if soup:
-            self.soup = soup
-        else:
-            from bs4 import BeautifulSoup
-            # TODO: Why is the parser 'html.parser' here? To avoid an
-            # infinite loop?
-            self.soup = BeautifulSoup(
-                "", "html.parser", store_line_numbers=store_line_numbers,
-                **kwargs
-            )
-        # TODO: What are **kwargs exactly? Should they be passed in
-        # here in addition to/instead of being passed to the BeautifulSoup
-        # constructor?
+class TreeBuilderForHtml5lib(html5lib.treebuilders._base.TreeBuilder):
+
+    def __init__(self, soup, namespaceHTMLElements):
+        self.soup = soup
         super(TreeBuilderForHtml5lib, self).__init__(namespaceHTMLElements)
 
-        # This will be set later to an html5lib.html5parser.HTMLParser
-        # object, which we can use to track the current line number.
-        self.parser = None
-        self.store_line_numbers = store_line_numbers
-        
     def documentClass(self):
         self.soup.reset()
         return Element(self.soup, self.soup, None)
@@ -164,26 +73,14 @@ class TreeBuilderForHtml5lib(treebuilder_base.TreeBuilder):
         self.soup.object_was_parsed(doctype)
 
     def elementClass(self, name, namespace):
-        kwargs = {}
-        if self.parser and self.store_line_numbers:
-            # This represents the point immediately after the end of the
-            # tag. We don't know when the tag started, but we do know
-            # where it ended -- the character just before this one.
-            sourceline, sourcepos = self.parser.tokenizer.stream.position()
-            kwargs['sourceline'] = sourceline
-            kwargs['sourcepos'] = sourcepos-1
-        tag = self.soup.new_tag(name, namespace, **kwargs)
-
+        tag = self.soup.new_tag(name, namespace)
         return Element(tag, self.soup, namespace)
 
     def commentClass(self, data):
         return TextNode(Comment(data), self.soup)
 
     def fragmentClass(self):
-        from bs4 import BeautifulSoup
-        # TODO: Why is the parser 'html.parser' here? To avoid an
-        # infinite loop?
-        self.soup = BeautifulSoup("", "html.parser")
+        self.soup = BeautifulSoup("")
         self.soup.name = "[document_fragment]"
         return Element(self.soup, self.soup, None)
 
@@ -195,57 +92,7 @@ class TreeBuilderForHtml5lib(treebuilder_base.TreeBuilder):
         return self.soup
 
     def getFragment(self):
-        return treebuilder_base.TreeBuilder.getFragment(self).element
-
-    def testSerializer(self, element):
-        from bs4 import BeautifulSoup
-        rv = []
-        doctype_re = re.compile(r'^(.*?)(?: PUBLIC "(.*?)"(?: "(.*?)")?| SYSTEM "(.*?)")?$')
-
-        def serializeElement(element, indent=0):
-            if isinstance(element, BeautifulSoup):
-                pass
-            if isinstance(element, Doctype):
-                m = doctype_re.match(element)
-                if m:
-                    name = m.group(1)
-                    if m.lastindex > 1:
-                        publicId = m.group(2) or ""
-                        systemId = m.group(3) or m.group(4) or ""
-                        rv.append("""|%s<!DOCTYPE %s "%s" "%s">""" %
-                                  (' ' * indent, name, publicId, systemId))
-                    else:
-                        rv.append("|%s<!DOCTYPE %s>" % (' ' * indent, name))
-                else:
-                    rv.append("|%s<!DOCTYPE >" % (' ' * indent,))
-            elif isinstance(element, Comment):
-                rv.append("|%s<!-- %s -->" % (' ' * indent, element))
-            elif isinstance(element, NavigableString):
-                rv.append("|%s\"%s\"" % (' ' * indent, element))
-            else:
-                if element.namespace:
-                    name = "%s %s" % (prefixes[element.namespace],
-                                      element.name)
-                else:
-                    name = element.name
-                rv.append("|%s<%s>" % (' ' * indent, name))
-                if element.attrs:
-                    attributes = []
-                    for name, value in list(element.attrs.items()):
-                        if isinstance(name, NamespacedAttribute):
-                            name = "%s %s" % (prefixes[name.namespace], name.name)
-                        if isinstance(value, list):
-                            value = " ".join(value)
-                        attributes.append((name, value))
-
-                    for name, value in sorted(attributes):
-                        rv.append('|%s%s="%s"' % (' ' * (indent + 2), name, value))
-                indent += 2
-                for child in element.children:
-                    serializeElement(child, indent)
-        serializeElement(element, 0)
-
-        return "\n".join(rv)
+        return html5lib.treebuilders._base.TreeBuilder.getFragment(self).element
 
 class AttrList(object):
     def __init__(self, element):
@@ -254,16 +101,7 @@ class AttrList(object):
     def __iter__(self):
         return list(self.attrs.items()).__iter__()
     def __setitem__(self, name, value):
-        # If this attribute is a multi-valued attribute for this element,
-        # turn its value into a list.
-        list_attr = self.element.cdata_list_attributes or {}
-        if (name in list_attr.get('*', [])
-            or (self.element.name in list_attr
-                and name in list_attr.get(self.element.name, []))):
-            # A node that is being cloned may have already undergone
-            # this procedure.
-            if not isinstance(value, list):
-                value = nonwhitespace_re.findall(value)
+        "set attr", name, value
         self.element[name] = value
     def items(self):
         return list(self.attrs.items())
@@ -277,16 +115,16 @@ class AttrList(object):
         return name in list(self.attrs.keys())
 
 
-class Element(treebuilder_base.Node):
+class Element(html5lib.treebuilders._base.Node):
     def __init__(self, element, soup, namespace):
-        treebuilder_base.Node.__init__(self, element.name)
+        html5lib.treebuilders._base.Node.__init__(self, element.name)
         self.element = element
         self.soup = soup
         self.namespace = namespace
 
     def appendChild(self, node):
         string_child = child = None
-        if isinstance(node, str):
+        if isinstance(node, basestring):
             # Some other piece of code decided to pass in a string
             # instead of creating a TextElement object to contain the
             # string.
@@ -298,15 +136,13 @@ class Element(treebuilder_base.Node):
             child = node
         elif node.element.__class__ == NavigableString:
             string_child = child = node.element
-            node.parent = self
         else:
             child = node.element
-            node.parent = self
 
-        if not isinstance(child, str) and child.parent is not None:
+        if not isinstance(child, basestring) and child.parent is not None:
             node.element.extract()
 
-        if (string_child is not None and self.element.contents
+        if (string_child and self.element.contents
             and self.element.contents[-1].__class__ == NavigableString):
             # We are appending a string onto another string.
             # TODO This has O(n^2) performance, for input like
@@ -316,7 +152,7 @@ class Element(treebuilder_base.Node):
             old_element.replace_with(new_element)
             self.soup._most_recent_element = new_element
         else:
-            if isinstance(node, str):
+            if isinstance(node, basestring):
                 # Create a brand new NavigableString from this string.
                 child = self.soup.new_string(node)
 
@@ -325,12 +161,6 @@ class Element(treebuilder_base.Node):
             # immediately after the parent, if it has no children.)
             if self.element.contents:
                 most_recent_element = self.element._last_descendant(False)
-            elif self.element.next_element is not None:
-                # Something from further ahead in the parse tree is
-                # being inserted into this earlier element. This is
-                # very annoying because it means an expensive search
-                # for the last element in the tree.
-                most_recent_element = self.soup._last_descendant()
             else:
                 most_recent_element = self.element
 
@@ -339,12 +169,11 @@ class Element(treebuilder_base.Node):
                 most_recent_element=most_recent_element)
 
     def getAttributes(self):
-        if isinstance(self.element, Comment):
-            return {}
         return AttrList(self.element)
 
     def setAttributes(self, attributes):
         if attributes is not None and len(attributes) > 0:
+
             converted_attributes = []
             for name, value in list(attributes.items()):
                 if isinstance(name, tuple):
@@ -354,7 +183,7 @@ class Element(treebuilder_base.Node):
 
             self.soup.builder._replace_cdata_list_attribute_values(
                 self.name, attributes)
-            for name, value in list(attributes.items()):
+            for name, value in attributes.items():
                 self.element[name] = value
 
             # The attributes may contain variables that need substitution.
@@ -366,11 +195,11 @@ class Element(treebuilder_base.Node):
     attributes = property(getAttributes, setAttributes)
 
     def insertText(self, data, insertBefore=None):
-        text = TextNode(self.soup.new_string(data), self.soup)
         if insertBefore:
-            self.insertBefore(text, insertBefore)
+            text = TextNode(self.soup.new_string(data), self.soup)
+            self.insertBefore(data, insertBefore)
         else:
-            self.appendChild(text)
+            self.appendChild(data)
 
     def insertBefore(self, node, refNode):
         index = self.element.index(refNode.element)
@@ -389,10 +218,6 @@ class Element(treebuilder_base.Node):
 
     def reparentChildren(self, new_parent):
         """Move all of this tag's children into another tag."""
-        # print("MOVE", self.element.contents)
-        # print("FROM", self.element)
-        # print("TO", new_parent.element)
-
         element = self.element
         new_parent_element = new_parent.element
         # Determine what this tag's next_element will be once all the children
@@ -411,35 +236,18 @@ class Element(treebuilder_base.Node):
             new_parents_last_descendant_next_element = new_parent_element.next_element
 
         to_append = element.contents
+        append_after = new_parent.element.contents
         if len(to_append) > 0:
             # Set the first child's previous_element and previous_sibling
             # to elements within the new parent
             first_child = to_append[0]
-            if new_parents_last_descendant is not None:
-                first_child.previous_element = new_parents_last_descendant
-            else:
-                first_child.previous_element = new_parent_element
+            first_child.previous_element = new_parents_last_descendant
             first_child.previous_sibling = new_parents_last_child
-            if new_parents_last_descendant is not None:
-                new_parents_last_descendant.next_element = first_child
-            else:
-                new_parent_element.next_element = first_child
-            if new_parents_last_child is not None:
-                new_parents_last_child.next_sibling = first_child
 
-            # Find the very last element being moved. It is now the
-            # parent's last descendant. It has no .next_sibling and
-            # its .next_element is whatever the previous last
-            # descendant had.
-            last_childs_last_descendant = to_append[-1]._last_descendant(False, True)
-
-            last_childs_last_descendant.next_element = new_parents_last_descendant_next_element
-            if new_parents_last_descendant_next_element is not None:
-                # TODO: This code has no test coverage and I'm not sure
-                # how to get html5lib to go through this path, but it's
-                # just the other side of the previous line.
-                new_parents_last_descendant_next_element.previous_element = last_childs_last_descendant
-            last_childs_last_descendant.next_sibling = None
+            # Fix the last child's next_element and next_sibling
+            last_child = to_append[-1]
+            last_child.next_element = new_parents_last_descendant_next_element
+            last_child.next_sibling = None
 
         for child in to_append:
             child.parent = new_parent_element
@@ -449,10 +257,6 @@ class Element(treebuilder_base.Node):
         element.contents = []
         element.next_element = final_next_element
 
-        # print("DONE WITH MOVE")
-        # print("FROM", self.element)
-        # print("TO", new_parent_element)
-
     def cloneNode(self):
         tag = self.soup.new_tag(self.element.name, self.namespace)
         node = Element(tag, self.soup, self.namespace)
@@ -464,7 +268,7 @@ class Element(treebuilder_base.Node):
         return self.element.contents
 
     def getNameTuple(self):
-        if self.namespace == None:
+        if self.namespace is None:
             return namespaces["html"], self.name
         else:
             return self.namespace, self.name
@@ -473,7 +277,7 @@ class Element(treebuilder_base.Node):
 
 class TextNode(Element):
     def __init__(self, element, soup):
-        treebuilder_base.Node.__init__(self, None)
+        html5lib.treebuilders._base.Node.__init__(self, None)
         self.element = element
         self.soup = soup
 
diff --git a/lib/bs4/builder/_htmlparser.py b/lib/bs4/builder/_htmlparser.py
index 3cc187f8..ca8d8b89 100644
--- a/lib/bs4/builder/_htmlparser.py
+++ b/lib/bs4/builder/_htmlparser.py
@@ -1,18 +1,29 @@
-# encoding: utf-8
 """Use the HTMLParser library to parse HTML files that aren't too bad."""
 
-# Use of this source code is governed by the MIT license.
-__license__ = "MIT"
-
 __all__ = [
     'HTMLParserTreeBuilder',
     ]
 
-from html.parser import HTMLParser
-
+from HTMLParser import (
+    HTMLParser,
+    HTMLParseError,
+    )
 import sys
 import warnings
 
+# Starting in Python 3.2, the HTMLParser constructor takes a 'strict'
+# argument, which we'd like to set to False. Unfortunately,
+# http://bugs.python.org/issue13273 makes strict=True a better bet
+# before Python 3.2.3.
+#
+# At the end of this file, we monkeypatch HTMLParser so that
+# strict=True works well on Python 3.2.2.
+major, minor, release = sys.version_info[:3]
+CONSTRUCTOR_TAKES_STRICT = (
+    major > 3
+    or (major == 3 and minor > 2)
+    or (major == 3 and minor == 2 and release >= 3))
+
 from bs4.element import (
     CData,
     Comment,
@@ -23,8 +34,6 @@ from bs4.element import (
 from bs4.dammit import EntitySubstitution, UnicodeDammit
 
 from bs4.builder import (
-    DetectsXMLParsedAsHTML,
-    ParserRejectedMarkup,
     HTML,
     HTMLTreeBuilder,
     STRICT,
@@ -33,84 +42,8 @@ from bs4.builder import (
 
 HTMLPARSER = 'html.parser'
 
-class BeautifulSoupHTMLParser(HTMLParser, DetectsXMLParsedAsHTML):
-    """A subclass of the Python standard library's HTMLParser class, which
-    listens for HTMLParser events and translates them into calls
-    to Beautiful Soup's tree construction API.
-    """
-
-    # Strategies for handling duplicate attributes
-    IGNORE = 'ignore'
-    REPLACE = 'replace'
-    
-    def __init__(self, *args, **kwargs):
-        """Constructor.
-
-        :param on_duplicate_attribute: A strategy for what to do if a
-            tag includes the same attribute more than once. Accepted
-            values are: REPLACE (replace earlier values with later
-            ones, the default), IGNORE (keep the earliest value
-            encountered), or a callable. A callable must take three
-            arguments: the dictionary of attributes already processed,
-            the name of the duplicate attribute, and the most recent value
-            encountered.           
-        """
-        self.on_duplicate_attribute = kwargs.pop(
-            'on_duplicate_attribute', self.REPLACE
-        )
-        HTMLParser.__init__(self, *args, **kwargs)
-
-        # Keep a list of empty-element tags that were encountered
-        # without an explicit closing tag. If we encounter a closing tag
-        # of this type, we'll associate it with one of those entries.
-        #
-        # This isn't a stack because we don't care about the
-        # order. It's a list of closing tags we've already handled and
-        # will ignore, assuming they ever show up.
-        self.already_closed_empty_element = []
-
-        self._initialize_xml_detector()
-
-    def error(self, message):
-        # NOTE: This method is required so long as Python 3.9 is
-        # supported. The corresponding code is removed from HTMLParser
-        # in 3.5, but not removed from ParserBase until 3.10.
-        # https://github.com/python/cpython/issues/76025
-        #
-        # The original implementation turned the error into a warning,
-        # but in every case I discovered, this made HTMLParser
-        # immediately crash with an error message that was less
-        # helpful than the warning. The new implementation makes it
-        # more clear that html.parser just can't parse this
-        # markup. The 3.10 implementation does the same, though it
-        # raises AssertionError rather than calling a method. (We
-        # catch this error and wrap it in a ParserRejectedMarkup.)
-        raise ParserRejectedMarkup(message)
-
-    def handle_startendtag(self, name, attrs):
-        """Handle an incoming empty-element tag.
-
-        This is only called when the markup looks like <tag/>.
-
-        :param name: Name of the tag.
-        :param attrs: Dictionary of the tag's attributes.
-        """
-        # is_startend() tells handle_starttag not to close the tag
-        # just because its name matches a known empty-element tag. We
-        # know that this is an empty-element tag and we want to call
-        # handle_endtag ourselves.
-        tag = self.handle_starttag(name, attrs, handle_empty_element=False)
-        self.handle_endtag(name)
-        
-    def handle_starttag(self, name, attrs, handle_empty_element=True):
-        """Handle an opening tag, e.g. '<tag>'
-
-        :param name: Name of the tag.
-        :param attrs: Dictionary of the tag's attributes.
-        :param handle_empty_element: True if this tag is known to be
-            an empty-element tag (i.e. there is not expected to be any
-            closing tag).
-        """
+class BeautifulSoupHTMLParser(HTMLParser):
+    def handle_starttag(self, name, attrs):
         # XXX namespace
         attr_dict = {}
         for key, value in attrs:
@@ -118,78 +51,19 @@ class BeautifulSoupHTMLParser(HTMLParser, DetectsXMLParsedAsHTML):
             # for consistency with the other tree builders.
             if value is None:
                 value = ''
-            if key in attr_dict:
-                # A single attribute shows up multiple times in this
-                # tag. How to handle it depends on the
-                # on_duplicate_attribute setting.
-                on_dupe = self.on_duplicate_attribute
-                if on_dupe == self.IGNORE:
-                    pass
-                elif on_dupe in (None, self.REPLACE):
-                    attr_dict[key] = value
-                else:
-                    on_dupe(attr_dict, key, value)
-            else:
-                attr_dict[key] = value
+            attr_dict[key] = value
             attrvalue = '""'
-        #print("START", name)
-        sourceline, sourcepos = self.getpos()
-        tag = self.soup.handle_starttag(
-            name, None, None, attr_dict, sourceline=sourceline,
-            sourcepos=sourcepos
-        )
-        if tag and tag.is_empty_element and handle_empty_element:
-            # Unlike other parsers, html.parser doesn't send separate end tag
-            # events for empty-element tags. (It's handled in
-            # handle_startendtag, but only if the original markup looked like
-            # <tag/>.)
-            #
-            # So we need to call handle_endtag() ourselves. Since we
-            # know the start event is identical to the end event, we
-            # don't want handle_endtag() to cross off any previous end
-            # events for tags of this name.
-            self.handle_endtag(name, check_already_closed=False)
+        self.soup.handle_starttag(name, None, None, attr_dict)
 
-            # But we might encounter an explicit closing tag for this tag
-            # later on. If so, we want to ignore it.
-            self.already_closed_empty_element.append(name)
+    def handle_endtag(self, name):
+        self.soup.handle_endtag(name)
 
-        if self._root_tag is None:
-            self._root_tag_encountered(name)
-            
-    def handle_endtag(self, name, check_already_closed=True):
-        """Handle a closing tag, e.g. '</tag>'
-        
-        :param name: A tag name.
-        :param check_already_closed: True if this tag is expected to
-           be the closing portion of an empty-element tag,
-           e.g. '<tag></tag>'.
-        """
-        #print("END", name)
-        if check_already_closed and name in self.already_closed_empty_element:
-            # This is a redundant end tag for an empty-element tag.
-            # We've already called handle_endtag() for it, so just
-            # check it off the list.
-            #print("ALREADY CLOSED", name)
-            self.already_closed_empty_element.remove(name)
-        else:
-            self.soup.handle_endtag(name)
-            
     def handle_data(self, data):
-        """Handle some textual data that shows up between tags."""
         self.soup.handle_data(data)
 
     def handle_charref(self, name):
-        """Handle a numeric character reference by converting it to the
-        corresponding Unicode character and treating it as textual
-        data.
-
-        :param name: Character number, possibly in hexadecimal.
-        """
-        # TODO: This was originally a workaround for a bug in
-        # HTMLParser. (http://bugs.python.org/issue13633) The bug has
-        # been fixed, but removing this code still makes some
-        # Beautiful Soup tests fail. This needs investigation.
+        # XXX workaround for a bug in HTMLParser. Remove this once
+        # it's fixed.
         if name.startswith('x'):
             real_name = int(name.lstrip('x'), 16)
         elif name.startswith('X'):
@@ -197,71 +71,37 @@ class BeautifulSoupHTMLParser(HTMLParser, DetectsXMLParsedAsHTML):
         else:
             real_name = int(name)
 
-        data = None
-        if real_name < 256:
-            # HTML numeric entities are supposed to reference Unicode
-            # code points, but sometimes they reference code points in
-            # some other encoding (ahem, Windows-1252). E.g. &#147;
-            # instead of &#201; for LEFT DOUBLE QUOTATION MARK. This
-            # code tries to detect this situation and compensate.
-            for encoding in (self.soup.original_encoding, 'windows-1252'):
-                if not encoding:
-                    continue
-                try:
-                    data = bytearray([real_name]).decode(encoding)
-                except UnicodeDecodeError as e:
-                    pass
-        if not data:
-            try:
-                data = chr(real_name)
-            except (ValueError, OverflowError) as e:
-                pass
-        data = data or "\N{REPLACEMENT CHARACTER}"
+        try:
+            data = unichr(real_name)
+        except (ValueError, OverflowError), e:
+            data = u"\N{REPLACEMENT CHARACTER}"
+
         self.handle_data(data)
 
     def handle_entityref(self, name):
-        """Handle a named entity reference by converting it to the
-        corresponding Unicode character(s) and treating it as textual
-        data.
-
-        :param name: Name of the entity reference.
-        """
         character = EntitySubstitution.HTML_ENTITY_TO_CHARACTER.get(name)
         if character is not None:
             data = character
         else:
-            # If this were XML, it would be ambiguous whether "&foo"
-            # was an character entity reference with a missing
-            # semicolon or the literal string "&foo". Since this is
-            # HTML, we have a complete list of all character entity references,
-            # and this one wasn't found, so assume it's the literal string "&foo".
-            data = "&%s" % name
+            data = "&%s;" % name
         self.handle_data(data)
 
     def handle_comment(self, data):
-        """Handle an HTML comment.
-
-        :param data: The text of the comment.
-        """
         self.soup.endData()
         self.soup.handle_data(data)
         self.soup.endData(Comment)
 
     def handle_decl(self, data):
-        """Handle a DOCTYPE declaration.
-
-        :param data: The text of the declaration.
-        """
         self.soup.endData()
-        data = data[len("DOCTYPE "):]
+        if data.startswith("DOCTYPE "):
+            data = data[len("DOCTYPE "):]
+        elif data == 'DOCTYPE':
+            # i.e. "<!DOCTYPE>"
+            data = ''
         self.soup.handle_data(data)
         self.soup.endData(Doctype)
 
     def unknown_decl(self, data):
-        """Handle a declaration of unknown type -- probably a CDATA block.
-
-        :param data: The text of the declaration.
-        """
         if data.upper().startswith('CDATA['):
             cls = CData
             data = data[len('CDATA['):]
@@ -272,116 +112,147 @@ class BeautifulSoupHTMLParser(HTMLParser, DetectsXMLParsedAsHTML):
         self.soup.endData(cls)
 
     def handle_pi(self, data):
-        """Handle a processing instruction.
-
-        :param data: The text of the instruction.
-        """
         self.soup.endData()
+        if data.endswith("?") and data.lower().startswith("xml"):
+            # "An XHTML processing instruction using the trailing '?'
+            # will cause the '?' to be included in data." - HTMLParser
+            # docs.
+            #
+            # Strip the question mark so we don't end up with two
+            # question marks.
+            data = data[:-1]
         self.soup.handle_data(data)
-        self._document_might_be_xml(data)
         self.soup.endData(ProcessingInstruction)
 
 
 class HTMLParserTreeBuilder(HTMLTreeBuilder):
-    """A Beautiful soup `TreeBuilder` that uses the `HTMLParser` parser,
-    found in the Python standard library.
-    """
+
     is_xml = False
-    picklable = True
-    NAME = HTMLPARSER
-    features = [NAME, HTML, STRICT]
+    features = [HTML, STRICT, HTMLPARSER]
 
-    # The html.parser knows which line number and position in the
-    # original file is the source of an element.
-    TRACKS_LINE_NUMBERS = True
+    def __init__(self, *args, **kwargs):
+        if CONSTRUCTOR_TAKES_STRICT:
+            kwargs['strict'] = False
+        self.parser_args = (args, kwargs)
 
-    def __init__(self, parser_args=None, parser_kwargs=None, **kwargs):
-        """Constructor.
-
-        :param parser_args: Positional arguments to pass into 
-            the BeautifulSoupHTMLParser constructor, once it's
-            invoked.
-        :param parser_kwargs: Keyword arguments to pass into 
-            the BeautifulSoupHTMLParser constructor, once it's
-            invoked.
-        :param kwargs: Keyword arguments for the superclass constructor.
-        """
-        # Some keyword arguments will be pulled out of kwargs and placed
-        # into parser_kwargs.
-        extra_parser_kwargs = dict()
-        for arg in ('on_duplicate_attribute',):
-            if arg in kwargs:
-                value = kwargs.pop(arg)
-                extra_parser_kwargs[arg] = value
-        super(HTMLParserTreeBuilder, self).__init__(**kwargs)
-        parser_args = parser_args or []
-        parser_kwargs = parser_kwargs or {}
-        parser_kwargs.update(extra_parser_kwargs)
-        parser_kwargs['convert_charrefs'] = False
-        self.parser_args = (parser_args, parser_kwargs)
-        
     def prepare_markup(self, markup, user_specified_encoding=None,
-                       document_declared_encoding=None, exclude_encodings=None):
-
-        """Run any preliminary steps necessary to make incoming markup
-        acceptable to the parser.
-
-        :param markup: Some markup -- probably a bytestring.
-        :param user_specified_encoding: The user asked to try this encoding.
-        :param document_declared_encoding: The markup itself claims to be
-            in this encoding.
-        :param exclude_encodings: The user asked _not_ to try any of
-            these encodings.
-
-        :yield: A series of 4-tuples:
-         (markup, encoding, declared encoding,
-          has undergone character replacement)
-
-         Each 4-tuple represents a strategy for converting the
-         document to Unicode and parsing it. Each strategy will be tried 
-         in turn.
+                       document_declared_encoding=None):
         """
-        if isinstance(markup, str):
-            # Parse Unicode as-is.
+        :return: A 4-tuple (markup, original encoding, encoding
+        declared within markup, whether any characters had to be
+        replaced with REPLACEMENT CHARACTER).
+        """
+        if isinstance(markup, unicode):
             yield (markup, None, None, False)
             return
 
-        # Ask UnicodeDammit to sniff the most likely encoding.
-
-        # This was provided by the end-user; treat it as a known
-        # definite encoding per the algorithm laid out in the HTML5
-        # spec.  (See the EncodingDetector class for details.)
-        known_definite_encodings = [user_specified_encoding]
-
-        # This was found in the document; treat it as a slightly lower-priority
-        # user encoding.
-        user_encodings = [document_declared_encoding]
-
         try_encodings = [user_specified_encoding, document_declared_encoding]
-        dammit = UnicodeDammit(
-            markup,
-            known_definite_encodings=known_definite_encodings,
-            user_encodings=user_encodings,
-            is_html=True,
-            exclude_encodings=exclude_encodings
-        )
+        dammit = UnicodeDammit(markup, try_encodings, is_html=True)
         yield (dammit.markup, dammit.original_encoding,
                dammit.declared_html_encoding,
                dammit.contains_replacement_characters)
 
     def feed(self, markup):
-        """Run some incoming markup through some parsing process,
-        populating the `BeautifulSoup` object in self.soup.
-        """
         args, kwargs = self.parser_args
         parser = BeautifulSoupHTMLParser(*args, **kwargs)
         parser.soup = self.soup
         try:
             parser.feed(markup)
-            parser.close()
-        except AssertionError as e:
-            # html.parser raises AssertionError in rare cases to
-            # indicate a fatal problem with the markup, especially
-            # when there's an error in the doctype declaration.
-            raise ParserRejectedMarkup(e)
-        parser.already_closed_empty_element = []
+        except HTMLParseError, e:
+            warnings.warn(RuntimeWarning(
+                "Python's built-in HTMLParser cannot parse the given document. This is not a bug in Beautiful Soup. The best solution is to install an external parser (lxml or html5lib), and use Beautiful Soup with that parser. See http://www.crummy.com/software/BeautifulSoup/bs4/doc/#installing-a-parser for help."))
+            raise e
+
+# Patch 3.2 versions of HTMLParser earlier than 3.2.3 to use some
+# 3.2.3 code. This ensures they don't treat markup like <p></p> as a
+# string.
+#
+# XXX This code can be removed once most Python 3 users are on 3.2.3.
+if major == 3 and minor == 2 and not CONSTRUCTOR_TAKES_STRICT:
+    import re
+    attrfind_tolerant = re.compile(
+        r'\s*((?<=[\'"\s])[^\s/>][^\s/=>]*)(\s*=+\s*'
+        r'(\'[^\']*\'|"[^"]*"|(?![\'"])[^>\s]*))?')
+    HTMLParserTreeBuilder.attrfind_tolerant = attrfind_tolerant
+
+    locatestarttagend = re.compile(r"""
+  <[a-zA-Z][-.a-zA-Z0-9:_]*          # tag name
+  (?:\s+                             # whitespace before attribute name
+    (?:[a-zA-Z_][-.:a-zA-Z0-9_]*     # attribute name
+      (?:\s*=\s*                     # value indicator
+        (?:'[^']*'                   # LITA-enclosed value
+          |\"[^\"]*\"                # LIT-enclosed value
+          |[^'\">\s]+                # bare value
+         )
+       )?
+     )
+   )*
+  \s*                                # trailing whitespace
+""", re.VERBOSE)
+    BeautifulSoupHTMLParser.locatestarttagend = locatestarttagend
+
+    from html.parser import tagfind, attrfind
+
+    def parse_starttag(self, i):
+        self.__starttag_text = None
+        endpos = self.check_for_whole_start_tag(i)
+        if endpos < 0:
+            return endpos
+        rawdata = self.rawdata
+        self.__starttag_text = rawdata[i:endpos]
+
+        # Now parse the data between i+1 and j into a tag and attrs
+        attrs = []
+        match = tagfind.match(rawdata, i+1)
+        assert match, 'unexpected call to parse_starttag()'
+        k = match.end()
+        self.lasttag = tag = rawdata[i+1:k].lower()
+        while k < endpos:
+            if self.strict:
+                m = attrfind.match(rawdata, k)
+            else:
+                m = attrfind_tolerant.match(rawdata, k)
+            if not m:
+                break
+            attrname, rest, attrvalue = m.group(1, 2, 3)
+            if not rest:
+                attrvalue = None
+            elif attrvalue[:1] == '\'' == attrvalue[-1:] or \
+                 attrvalue[:1] == '"' == attrvalue[-1:]:
+                attrvalue = attrvalue[1:-1]
+            if attrvalue:
+                attrvalue = self.unescape(attrvalue)
+            attrs.append((attrname.lower(), attrvalue))
+            k = m.end()
+
+        end = rawdata[k:endpos].strip()
+        if end not in (">", "/>"):
+            lineno, offset = self.getpos()
+            if "\n" in self.__starttag_text:
+                lineno = lineno + self.__starttag_text.count("\n")
+                offset = len(self.__starttag_text) \
+                         - self.__starttag_text.rfind("\n")
+            else:
+                offset = offset + len(self.__starttag_text)
+            if self.strict:
+                self.error("junk characters in start tag: %r"
+                           % (rawdata[k:endpos][:20],))
+            self.handle_data(rawdata[i:endpos])
+            return endpos
+        if end.endswith('/>'):
+            # XHTML-style empty tag: <span attr="value" />
+            self.handle_startendtag(tag, attrs)
+        else:
+            self.handle_starttag(tag, attrs)
+            if tag in self.CDATA_CONTENT_ELEMENTS:
+                self.set_cdata_mode(tag)
+        return endpos
+
+    def set_cdata_mode(self, elem):
+        self.cdata_elem = elem.lower()
+        self.interesting = re.compile(r'</\s*%s\s*>' % self.cdata_elem, re.I)
+
+    BeautifulSoupHTMLParser.parse_starttag = parse_starttag
+    BeautifulSoupHTMLParser.set_cdata_mode = set_cdata_mode
+
+    CONSTRUCTOR_TAKES_STRICT = True
diff --git a/lib/bs4/builder/_lxml.py b/lib/bs4/builder/_lxml.py
index 4f7cf746..fa5d4987 100644
--- a/lib/bs4/builder/_lxml.py
+++ b/lib/bs4/builder/_lxml.py
@@ -1,28 +1,14 @@
-# Use of this source code is governed by the MIT license.
-__license__ = "MIT"
-
 __all__ = [
     'LXMLTreeBuilderForXML',
     'LXMLTreeBuilder',
     ]
 
-try:
-    from collections.abc import Callable # Python 3.6
-except ImportError as e:
-    from collections import Callable
-
 from io import BytesIO
-from io import StringIO
+from StringIO import StringIO
+import collections
 from lxml import etree
-from bs4.element import (
-    Comment,
-    Doctype,
-    NamespacedAttribute,
-    ProcessingInstruction,
-    XMLProcessingInstruction,
-)
+from bs4.element import Comment, Doctype, NamespacedAttribute
 from bs4.builder import (
-    DetectsXMLParsedAsHTML,
     FAST,
     HTML,
     HTMLTreeBuilder,
@@ -34,99 +20,38 @@ from bs4.dammit import EncodingDetector
 
 LXML = 'lxml'
 
-def _invert(d):
-    "Invert a dictionary."
-    return dict((v,k) for k, v in list(d.items()))
-
 class LXMLTreeBuilderForXML(TreeBuilder):
     DEFAULT_PARSER_CLASS = etree.XMLParser
 
     is_xml = True
-    processing_instruction_class = XMLProcessingInstruction
-
-    NAME = "lxml-xml"
-    ALTERNATE_NAMES = ["xml"]
 
     # Well, it's permissive by XML parser standards.
-    features = [NAME, LXML, XML, FAST, PERMISSIVE]
+    features = [LXML, XML, FAST, PERMISSIVE]
 
     CHUNK_SIZE = 512
 
     # This namespace mapping is specified in the XML Namespace
     # standard.
-    DEFAULT_NSMAPS = dict(xml='http://www.w3.org/XML/1998/namespace')
+    DEFAULT_NSMAPS = {'http://www.w3.org/XML/1998/namespace' : "xml"}
 
-    DEFAULT_NSMAPS_INVERTED = _invert(DEFAULT_NSMAPS)
-
-    # NOTE: If we parsed Element objects and looked at .sourceline,
-    # we'd be able to see the line numbers from the original document.
-    # But instead we build an XMLParser or HTMLParser object to serve
-    # as the target of parse messages, and those messages don't include
-    # line numbers.
-    # See: https://bugs.launchpad.net/lxml/+bug/1846906
-    
-    def initialize_soup(self, soup):
-        """Let the BeautifulSoup object know about the standard namespace
-        mapping.
-
-        :param soup: A `BeautifulSoup`.
-        """
-        super(LXMLTreeBuilderForXML, self).initialize_soup(soup)
-        self._register_namespaces(self.DEFAULT_NSMAPS)
-
-    def _register_namespaces(self, mapping):
-        """Let the BeautifulSoup object know about namespaces encountered
-        while parsing the document.
-
-        This might be useful later on when creating CSS selectors.
-
-        This will track (almost) all namespaces, even ones that were
-        only in scope for part of the document. If two namespaces have
-        the same prefix, only the first one encountered will be
-        tracked. Un-prefixed namespaces are not tracked.
-
-        :param mapping: A dictionary mapping namespace prefixes to URIs.
-        """
-        for key, value in list(mapping.items()):
-            # This is 'if key' and not 'if key is not None' because we
-            # don't track un-prefixed namespaces. Soupselect will
-            # treat an un-prefixed namespace as the default, which
-            # causes confusion in some cases.
-            if key and key not in self.soup._namespaces:
-                # Let the BeautifulSoup object know about a new namespace.
-                # If there are multiple namespaces defined with the same
-                # prefix, the first one in the document takes precedence.
-                self.soup._namespaces[key] = value
-                
     def default_parser(self, encoding):
-        """Find the default parser for the given encoding.
-
-        :param encoding: A string.
-        :return: Either a parser object or a class, which
-          will be instantiated with default arguments.
-        """
+        # This can either return a parser object or a class, which
+        # will be instantiated with default arguments.
         if self._default_parser is not None:
             return self._default_parser
         return etree.XMLParser(
             target=self, strip_cdata=False, recover=True, encoding=encoding)
 
     def parser_for(self, encoding):
-        """Instantiate an appropriate parser for the given encoding.
-
-        :param encoding: A string.
-        :return: A parser object such as an `etree.XMLParser`.
-        """
         # Use the default parser.
         parser = self.default_parser(encoding)
 
-        if isinstance(parser, Callable):
+        if isinstance(parser, collections.Callable):
             # Instantiate the parser with default arguments
-            parser = parser(
-                target=self, strip_cdata=False, recover=True, encoding=encoding
-            )
+            parser = parser(target=self, strip_cdata=False, encoding=encoding)
         return parser
 
-    def __init__(self, parser=None, empty_element_tags=None, **kwargs):
+    def __init__(self, parser=None, empty_element_tags=None):
         # TODO: Issue a warning if parser is present but not a
         # callable, since that means there's no way to create new
         # parsers for different encodings.
@@ -134,10 +59,8 @@ class LXMLTreeBuilderForXML(TreeBuilder):
         if empty_element_tags is not None:
             self.empty_element_tags = set(empty_element_tags)
         self.soup = None
-        self.nsmaps = [self.DEFAULT_NSMAPS_INVERTED]
-        self.active_namespace_prefixes = [dict(self.DEFAULT_NSMAPS)]
-        super(LXMLTreeBuilderForXML, self).__init__(**kwargs)
-        
+        self.nsmaps = [self.DEFAULT_NSMAPS]
+
     def _getNsTag(self, tag):
         # Split the namespace URL out of a fully-qualified lxml tag
         # name. Copied from lxml's src/lxml/sax.py.
@@ -147,81 +70,39 @@ class LXMLTreeBuilderForXML(TreeBuilder):
             return (None, tag)
 
     def prepare_markup(self, markup, user_specified_encoding=None,
-                       exclude_encodings=None,
                        document_declared_encoding=None):
-        """Run any preliminary steps necessary to make incoming markup
-        acceptable to the parser.
-
-        lxml really wants to get a bytestring and convert it to
-        Unicode itself. So instead of using UnicodeDammit to convert
-        the bytestring to Unicode using different encodings, this
-        implementation uses EncodingDetector to iterate over the
-        encodings, and tell lxml to try to parse the document as each
-        one in turn.
-
-        :param markup: Some markup -- hopefully a bytestring.
-        :param user_specified_encoding: The user asked to try this encoding.
-        :param document_declared_encoding: The markup itself claims to be
-            in this encoding.
-        :param exclude_encodings: The user asked _not_ to try any of
-            these encodings.
-
-        :yield: A series of 4-tuples:
+        """
+        :yield: A series of 4-tuples.
          (markup, encoding, declared encoding,
           has undergone character replacement)
 
-         Each 4-tuple represents a strategy for converting the
-         document to Unicode and parsing it. Each strategy will be tried 
-         in turn.
+        Each 4-tuple represents a strategy for parsing the document.
         """
-        is_html = not self.is_xml
-        if is_html:
-            self.processing_instruction_class = ProcessingInstruction
-            # We're in HTML mode, so if we're given XML, that's worth
-            # noting.
-            DetectsXMLParsedAsHTML.warn_if_markup_looks_like_xml(
-                markup, stacklevel=3
-            )
-        else:
-            self.processing_instruction_class = XMLProcessingInstruction
-
-        if isinstance(markup, str):
+        if isinstance(markup, unicode):
             # We were given Unicode. Maybe lxml can parse Unicode on
             # this system?
-
-            # TODO: This is a workaround for
-            # https://bugs.launchpad.net/lxml/+bug/1948551.
-            # We can remove it once the upstream issue is fixed.
-            if len(markup) > 0 and markup[0] == u'\N{BYTE ORDER MARK}':
-                markup = markup[1:]
             yield markup, None, document_declared_encoding, False
 
-        if isinstance(markup, str):
+        if isinstance(markup, unicode):
             # No, apparently not. Convert the Unicode to UTF-8 and
             # tell lxml to parse it as UTF-8.
             yield (markup.encode("utf8"), "utf8",
                    document_declared_encoding, False)
 
-        # This was provided by the end-user; treat it as a known
-        # definite encoding per the algorithm laid out in the HTML5
-        # spec.  (See the EncodingDetector class for details.)
-        known_definite_encodings = [user_specified_encoding]
-
-        # This was found in the document; treat it as a slightly lower-priority
-        # user encoding.
-        user_encodings = [document_declared_encoding]
-        detector = EncodingDetector(
-            markup, known_definite_encodings=known_definite_encodings,
-            user_encodings=user_encodings, is_html=is_html,
-            exclude_encodings=exclude_encodings
-        )
+        # Instead of using UnicodeDammit to convert the bytestring to
+        # Unicode using different encodings, use EncodingDetector to
+        # iterate over the encodings, and tell lxml to try to parse
+        # the document as each one in turn.
+        is_html = not self.is_xml
+        try_encodings = [user_specified_encoding, document_declared_encoding]
+        detector = EncodingDetector(markup, try_encodings, is_html)
         for encoding in detector.encodings:
             yield (detector.markup, encoding, document_declared_encoding, False)
 
     def feed(self, markup):
         if isinstance(markup, bytes):
             markup = BytesIO(markup)
-        elif isinstance(markup, str):
+        elif isinstance(markup, unicode):
             markup = StringIO(markup)
 
         # Call feed() at least once, even if the markup is empty,
@@ -236,50 +117,30 @@ class LXMLTreeBuilderForXML(TreeBuilder):
                 if len(data) != 0:
                     self.parser.feed(data)
             self.parser.close()
-        except (UnicodeDecodeError, LookupError, etree.ParserError) as e:
-            raise ParserRejectedMarkup(e)
+        except (UnicodeDecodeError, LookupError, etree.ParserError), e:
+            raise ParserRejectedMarkup(str(e))
 
     def close(self):
-        self.nsmaps = [self.DEFAULT_NSMAPS_INVERTED]
+        self.nsmaps = [self.DEFAULT_NSMAPS]
 
     def start(self, name, attrs, nsmap={}):
         # Make sure attrs is a mutable dict--lxml may send an immutable dictproxy.
         attrs = dict(attrs)
         nsprefix = None
         # Invert each namespace map as it comes in.
-        if len(nsmap) == 0 and len(self.nsmaps) > 1:
-                # There are no new namespaces for this tag, but
-                # non-default namespaces are in play, so we need a
-                # separate tag stack to know when they end.
-                self.nsmaps.append(None)
+        if len(self.nsmaps) > 1:
+            # There are no new namespaces for this tag, but
+            # non-default namespaces are in play, so we need a
+            # separate tag stack to know when they end.
+            self.nsmaps.append(None)
         elif len(nsmap) > 0:
             # A new namespace mapping has come into play.
-
-            # First, Let the BeautifulSoup object know about it.
-            self._register_namespaces(nsmap)
-
-            # Then, add it to our running list of inverted namespace
-            # mappings.
-            self.nsmaps.append(_invert(nsmap))
-
-            # The currently active namespace prefixes have
-            # changed. Calculate the new mapping so it can be stored
-            # with all Tag objects created while these prefixes are in
-            # scope.
-            current_mapping = dict(self.active_namespace_prefixes[-1])
-            current_mapping.update(nsmap)
-
-            # We should not track un-prefixed namespaces as we can only hold one
-            # and it will be recognized as the default namespace by soupsieve,
-            # which may be confusing in some situations.
-            if '' in current_mapping:
-                del current_mapping['']
-            self.active_namespace_prefixes.append(current_mapping)
-            
+            inverted_nsmap = dict((value, key) for key, value in nsmap.items())
+            self.nsmaps.append(inverted_nsmap)
             # Also treat the namespace mapping as a set of attributes on the
             # tag, so we can recreate it later.
             attrs = attrs.copy()
-            for prefix, namespace in list(nsmap.items()):
+            for prefix, namespace in nsmap.items():
                 attribute = NamespacedAttribute(
                     "xmlns", prefix, "http://www.w3.org/2000/xmlns/")
                 attrs[attribute] = namespace
@@ -288,7 +149,7 @@ class LXMLTreeBuilderForXML(TreeBuilder):
         # from lxml with namespaces attached to their names, and
         # turn then into NamespacedAttribute objects.
         new_attrs = {}
-        for attr, value in list(attrs.items()):
+        for attr, value in attrs.items():
             namespace, attr = self._getNsTag(attr)
             if namespace is None:
                 new_attrs[attr] = value
@@ -300,11 +161,8 @@ class LXMLTreeBuilderForXML(TreeBuilder):
 
         namespace, name = self._getNsTag(name)
         nsprefix = self._prefix_for_namespace(namespace)
-        self.soup.handle_starttag(
-            name, namespace, nsprefix, attrs,
-            namespaces=self.active_namespace_prefixes[-1]
-        )
-        
+        self.soup.handle_starttag(name, namespace, nsprefix, attrs)
+
     def _prefix_for_namespace(self, namespace):
         """Find the currently active prefix for the given namespace."""
         if namespace is None:
@@ -328,20 +186,11 @@ class LXMLTreeBuilderForXML(TreeBuilder):
         if len(self.nsmaps) > 1:
             # This tag, or one of its parents, introduced a namespace
             # mapping, so pop it off the stack.
-            out_of_scope_nsmap = self.nsmaps.pop()
+            self.nsmaps.pop()
 
-            if out_of_scope_nsmap is not None:
-                # This tag introduced a namespace mapping which is no
-                # longer in scope. Recalculate the currently active
-                # namespace prefixes.
-                self.active_namespace_prefixes.pop()
-            
     def pi(self, target, data):
-        self.soup.endData()
-        data = target + ' ' + data
-        self.soup.handle_data(data)
-        self.soup.endData(self.processing_instruction_class)
-        
+        pass
+
     def data(self, content):
         self.soup.handle_data(content)
 
@@ -358,17 +207,13 @@ class LXMLTreeBuilderForXML(TreeBuilder):
 
     def test_fragment_to_document(self, fragment):
         """See `TreeBuilder`."""
-        return '<?xml version="1.0" encoding="utf-8"?>\n%s' % fragment
+        return u'<?xml version="1.0" encoding="utf-8"?>\n%s' % fragment
 
 
 class LXMLTreeBuilder(HTMLTreeBuilder, LXMLTreeBuilderForXML):
 
-    NAME = LXML
-    ALTERNATE_NAMES = ["lxml-html"]
-
-    features = ALTERNATE_NAMES + [NAME, HTML, FAST, PERMISSIVE]
+    features = [LXML, HTML, FAST, PERMISSIVE]
     is_xml = False
-    processing_instruction_class = ProcessingInstruction
 
     def default_parser(self, encoding):
         return etree.HTMLParser
@@ -379,10 +224,10 @@ class LXMLTreeBuilder(HTMLTreeBuilder, LXMLTreeBuilderForXML):
             self.parser = self.parser_for(encoding)
             self.parser.feed(markup)
             self.parser.close()
-        except (UnicodeDecodeError, LookupError, etree.ParserError) as e:
-            raise ParserRejectedMarkup(e)
+        except (UnicodeDecodeError, LookupError, etree.ParserError), e:
+            raise ParserRejectedMarkup(str(e))
 
 
     def test_fragment_to_document(self, fragment):
         """See `TreeBuilder`."""
-        return '<html><body>%s</body></html>' % fragment
+        return u'<html><body>%s</body></html>' % fragment
diff --git a/lib/bs4/css.py b/lib/bs4/css.py
deleted file mode 100644
index 245ac601..00000000
--- a/lib/bs4/css.py
+++ /dev/null
@@ -1,280 +0,0 @@
-"""Integration code for CSS selectors using Soup Sieve (pypi: soupsieve)."""
-
-import warnings
-try:
-    import soupsieve
-except ImportError as e:
-    soupsieve = None
-    warnings.warn(
-        'The soupsieve package is not installed. CSS selectors cannot be used.'
-    )
-
-
-class CSS(object):
-    """A proxy object against the soupsieve library, to simplify its
-    CSS selector API.
-
-    Acquire this object through the .css attribute on the
-    BeautifulSoup object, or on the Tag you want to use as the
-    starting point for a CSS selector.
-
-    The main advantage of doing this is that the tag to be selected
-    against doesn't need to be explicitly specified in the function
-    calls, since it's already scoped to a tag.
-    """
-
-    def __init__(self, tag, api=soupsieve):
-        """Constructor.
-
-        You don't need to instantiate this class yourself; instead,
-        access the .css attribute on the BeautifulSoup object, or on
-        the Tag you want to use as the starting point for your CSS
-        selector.
-
-        :param tag: All CSS selectors will use this as their starting
-        point.
-
-        :param api: A plug-in replacement for the soupsieve module,
-        designed mainly for use in tests.
-        """
-        if api is None:
-            raise NotImplementedError(
-                "Cannot execute CSS selectors because the soupsieve package is not installed."
-            )
-        self.api = api
-        self.tag = tag
-
-    def escape(self, ident):
-        """Escape a CSS identifier.
-
-        This is a simple wrapper around soupselect.escape(). See the
-        documentation for that function for more information.
-        """
-        if soupsieve is None:
-            raise NotImplementedError(
-                "Cannot escape CSS identifiers because the soupsieve package is not installed."
-            )
-        return self.api.escape(ident)
-
-    def _ns(self, ns, select):
-        """Normalize a dictionary of namespaces."""
-        if not isinstance(select, self.api.SoupSieve) and ns is None:
-            # If the selector is a precompiled pattern, it already has
-            # a namespace context compiled in, which cannot be
-            # replaced.
-            ns = self.tag._namespaces
-        return ns
-
-    def _rs(self, results):
-        """Normalize a list of results to a Resultset.
-
-        A ResultSet is more consistent with the rest of Beautiful
-        Soup's API, and ResultSet.__getattr__ has a helpful error
-        message if you try to treat a list of results as a single
-        result (a common mistake).
-        """
-        # Import here to avoid circular import
-        from bs4.element import ResultSet
-        return ResultSet(None, results)
-
-    def compile(self, select, namespaces=None, flags=0, **kwargs):
-        """Pre-compile a selector and return the compiled object.
-
-        :param selector: A CSS selector.
-
-        :param namespaces: A dictionary mapping namespace prefixes
-           used in the CSS selector to namespace URIs. By default,
-           Beautiful Soup will use the prefixes it encountered while
-           parsing the document.
-
-        :param flags: Flags to be passed into Soup Sieve's
-            soupsieve.compile() method.
-
-        :param kwargs: Keyword arguments to be passed into SoupSieve's
-           soupsieve.compile() method.
-
-        :return: A precompiled selector object.
-        :rtype: soupsieve.SoupSieve
-        """
-        return self.api.compile(
-            select, self._ns(namespaces, select), flags, **kwargs
-        )
-
-    def select_one(self, select, namespaces=None, flags=0, **kwargs):
-        """Perform a CSS selection operation on the current Tag and return the
-        first result.
-
-        This uses the Soup Sieve library. For more information, see
-        that library's documentation for the soupsieve.select_one()
-        method.
-
-        :param selector: A CSS selector.
-
-        :param namespaces: A dictionary mapping namespace prefixes
-           used in the CSS selector to namespace URIs. By default,
-           Beautiful Soup will use the prefixes it encountered while
-           parsing the document.
-
-        :param flags: Flags to be passed into Soup Sieve's
-            soupsieve.select_one() method.
-
-        :param kwargs: Keyword arguments to be passed into SoupSieve's
-           soupsieve.select_one() method.
-
-        :return: A Tag, or None if the selector has no match.
-        :rtype: bs4.element.Tag
-
-        """
-        return self.api.select_one(
-            select, self.tag, self._ns(namespaces, select), flags, **kwargs
-        )
-
-    def select(self, select, namespaces=None, limit=0, flags=0, **kwargs):
-        """Perform a CSS selection operation on the current Tag.
-
-        This uses the Soup Sieve library. For more information, see
-        that library's documentation for the soupsieve.select()
-        method.
-
-        :param selector: A string containing a CSS selector.
-
-        :param namespaces: A dictionary mapping namespace prefixes
-            used in the CSS selector to namespace URIs. By default,
-            Beautiful Soup will pass in the prefixes it encountered while
-            parsing the document.
-
-        :param limit: After finding this number of results, stop looking.
-
-        :param flags: Flags to be passed into Soup Sieve's
-            soupsieve.select() method.
-
-        :param kwargs: Keyword arguments to be passed into SoupSieve's
-            soupsieve.select() method.
-
-        :return: A ResultSet of Tag objects.
-        :rtype: bs4.element.ResultSet
-
-        """
-        if limit is None:
-            limit = 0
-
-        return self._rs(
-            self.api.select(
-                select, self.tag, self._ns(namespaces, select), limit, flags,
-                **kwargs
-            )
-        )
-
-    def iselect(self, select, namespaces=None, limit=0, flags=0, **kwargs):
-        """Perform a CSS selection operation on the current Tag.
-
-        This uses the Soup Sieve library. For more information, see
-        that library's documentation for the soupsieve.iselect()
-        method. It is the same as select(), but it returns a generator
-        instead of a list.
-
-        :param selector: A string containing a CSS selector.
-
-        :param namespaces: A dictionary mapping namespace prefixes
-            used in the CSS selector to namespace URIs. By default,
-            Beautiful Soup will pass in the prefixes it encountered while
-            parsing the document.
-
-        :param limit: After finding this number of results, stop looking.
-
-        :param flags: Flags to be passed into Soup Sieve's
-            soupsieve.iselect() method.
-
-        :param kwargs: Keyword arguments to be passed into SoupSieve's
-            soupsieve.iselect() method.
-
-        :return: A generator
-        :rtype: types.GeneratorType
-        """
-        return self.api.iselect(
-            select, self.tag, self._ns(namespaces, select), limit, flags, **kwargs
-        )
-
-    def closest(self, select, namespaces=None, flags=0, **kwargs):
-        """Find the Tag closest to this one that matches the given selector.
-
-        This uses the Soup Sieve library. For more information, see
-        that library's documentation for the soupsieve.closest()
-        method.
-
-        :param selector: A string containing a CSS selector.
-
-        :param namespaces: A dictionary mapping namespace prefixes
-            used in the CSS selector to namespace URIs. By default,
-            Beautiful Soup will pass in the prefixes it encountered while
-            parsing the document.
-
-        :param flags: Flags to be passed into Soup Sieve's
-            soupsieve.closest() method.
-
-        :param kwargs: Keyword arguments to be passed into SoupSieve's
-            soupsieve.closest() method.
-
-        :return: A Tag, or None if there is no match.
-        :rtype: bs4.Tag
-
-        """
-        return self.api.closest(
-            select, self.tag, self._ns(namespaces, select), flags, **kwargs
-        )
-
-    def match(self, select, namespaces=None, flags=0, **kwargs):
-        """Check whether this Tag matches the given CSS selector.
-
-        This uses the Soup Sieve library. For more information, see
-        that library's documentation for the soupsieve.match()
-        method.
-
-        :param: a CSS selector.
-
-        :param namespaces: A dictionary mapping namespace prefixes
-            used in the CSS selector to namespace URIs. By default,
-            Beautiful Soup will pass in the prefixes it encountered while
-            parsing the document.
-
-        :param flags: Flags to be passed into Soup Sieve's
-            soupsieve.match() method.
-
-        :param kwargs: Keyword arguments to be passed into SoupSieve's
-            soupsieve.match() method.
-
-        :return: True if this Tag matches the selector; False otherwise.
-        :rtype: bool
-        """
-        return self.api.match(
-            select, self.tag, self._ns(namespaces, select), flags, **kwargs
-        )
-
-    def filter(self, select, namespaces=None, flags=0, **kwargs):
-        """Filter this Tag's direct children based on the given CSS selector.
-
-        This uses the Soup Sieve library. It works the same way as
-        passing this Tag into that library's soupsieve.filter()
-        method. More information, for more information see the
-        documentation for soupsieve.filter().
-
-        :param namespaces: A dictionary mapping namespace prefixes
-            used in the CSS selector to namespace URIs. By default,
-            Beautiful Soup will pass in the prefixes it encountered while
-            parsing the document.
-
-        :param flags: Flags to be passed into Soup Sieve's
-            soupsieve.filter() method.
-
-        :param kwargs: Keyword arguments to be passed into SoupSieve's
-            soupsieve.filter() method.
-
-        :return: A ResultSet of Tag objects.
-        :rtype: bs4.element.ResultSet
-
-        """
-        return self._rs(
-            self.api.filter(
-                select, self.tag, self._ns(namespaces, select), flags, **kwargs
-            )
-        )
diff --git a/lib/bs4/dammit.py b/lib/bs4/dammit.py
index 692433c5..32e211dc 100644
--- a/lib/bs4/dammit.py
+++ b/lib/bs4/dammit.py
@@ -3,188 +3,70 @@
 
 This library converts a bytestream to Unicode through any means
 necessary. It is heavily based on code from Mark Pilgrim's Universal
-Feed Parser. It works best on XML and HTML, but it does not rewrite the
+Feed Parser. It works best on XML and XML, but it does not rewrite the
 XML or HTML to reflect a new encoding; that's the tree builder's job.
 """
-# Use of this source code is governed by the MIT license.
-__license__ = "MIT"
 
-from html.entities import codepoint2name
-from collections import defaultdict
 import codecs
+from htmlentitydefs import codepoint2name
 import re
 import logging
 import string
 
-# Import a library to autodetect character encodings. We'll support
-# any of a number of libraries that all support the same API:
-#
-# * cchardet
-# * chardet
-# * charset-normalizer
-chardet_module = None
+# Import a library to autodetect character encodings.
+chardet_type = None
 try:
+    # First try the fast C implementation.
     #  PyPI package: cchardet
-    import cchardet as chardet_module
+    import cchardet
+    def chardet_dammit(s):
+        return cchardet.detect(s)['encoding']
 except ImportError:
     try:
+        # Fall back to the pure Python implementation
         #  Debian package: python-chardet
         #  PyPI package: chardet
-        import chardet as chardet_module
+        import chardet
+        def chardet_dammit(s):
+            return chardet.detect(s)['encoding']
+        #import chardet.constants
+        #chardet.constants._debug = 1
     except ImportError:
-        try:
-            # PyPI package: charset-normalizer
-            import charset_normalizer as chardet_module
-        except ImportError:
-            # No chardet available.
-            chardet_module = None
-
-if chardet_module:
-    def chardet_dammit(s):
-        if isinstance(s, str):
+        # No chardet available.
+        def chardet_dammit(s):
             return None
-        return chardet_module.detect(s)['encoding']
-else:
-    def chardet_dammit(s):
-        return None
 
-# Build bytestring and Unicode versions of regular expressions for finding
-# a declared encoding inside an XML or HTML document.
-xml_encoding = '^\\s*<\\?.*encoding=[\'"](.*?)[\'"].*\\?>'
-html_meta = '<\\s*meta[^>]+charset\\s*=\\s*["\']?([^>]*?)[ /;\'">]'
-encoding_res = dict()
-encoding_res[bytes] = {
-    'html' : re.compile(html_meta.encode("ascii"), re.I),
-    'xml' : re.compile(xml_encoding.encode("ascii"), re.I),
-}
-encoding_res[str] = {
-    'html' : re.compile(html_meta, re.I),
-    'xml' : re.compile(xml_encoding, re.I)
-}
+# Available from http://cjkpython.i18n.org/.
+try:
+    import iconv_codec
+except ImportError:
+    pass
 
-from html.entities import html5
+xml_encoding_re = re.compile(
+    '^<\?.*encoding=[\'"](.*?)[\'"].*\?>'.encode(), re.I)
+html_meta_re = re.compile(
+    '<\s*meta[^>]+charset\s*=\s*["\']?([^>]*?)[ /;\'">]'.encode(), re.I)
 
 class EntitySubstitution(object):
-    """The ability to substitute XML or HTML entities for certain characters."""
+
+    """Substitute XML or HTML entities for the corresponding characters."""
 
     def _populate_class_variables():
-        """Initialize variables used by this class to manage the plethora of
-        HTML5 named entities.
-
-        This function returns a 3-tuple containing two dictionaries
-        and a regular expression:
-
-        unicode_to_name - A mapping of Unicode strings like "⦨" to
-        entity names like "angmsdaa". When a single Unicode string has
-        multiple entity names, we try to choose the most commonly-used
-        name.
-
-        name_to_unicode: A mapping of entity names like "angmsdaa" to 
-        Unicode strings like "⦨".
-
-        named_entity_re: A regular expression matching (almost) any
-        Unicode string that corresponds to an HTML5 named entity.
-        """
-        unicode_to_name = {}
-        name_to_unicode = {}
-
-        short_entities = set()
-        long_entities_by_first_character = defaultdict(set)
-        
-        for name_with_semicolon, character in sorted(html5.items()):
-            # "It is intentional, for legacy compatibility, that many
-            # code points have multiple character reference names. For
-            # example, some appear both with and without the trailing
-            # semicolon, or with different capitalizations."
-            # - https://html.spec.whatwg.org/multipage/named-characters.html#named-character-references
-            #
-            # The parsers are in charge of handling (or not) character
-            # references with no trailing semicolon, so we remove the
-            # semicolon whenever it appears.
-            if name_with_semicolon.endswith(';'):
-                name = name_with_semicolon[:-1]
-            else:
-                name = name_with_semicolon
-
-            # When parsing HTML, we want to recognize any known named
-            # entity and convert it to a sequence of Unicode
-            # characters.
-            if name not in name_to_unicode:
-                name_to_unicode[name] = character
-
-            # When _generating_ HTML, we want to recognize special
-            # character sequences that _could_ be converted to named
-            # entities.
-            unicode_to_name[character] = name
-
-            # We also need to build a regular expression that lets us
-            # _find_ those characters in output strings so we can
-            # replace them.
-            #
-            # This is tricky, for two reasons.
-
-            if (len(character) == 1 and ord(character) < 128
-                and character not in '<>&'):
-                # First, it would be annoying to turn single ASCII
-                # characters like | into named entities like
-                # &verbar;. The exceptions are <>&, which we _must_
-                # turn into named entities to produce valid HTML.
-                continue
-
-            if len(character) > 1 and all(ord(x) < 128 for x in character):
-                # We also do not want to turn _combinations_ of ASCII
-                # characters like 'fj' into named entities like '&fjlig;',
-                # though that's more debateable.
-                continue
-
-            # Second, some named entities have a Unicode value that's
-            # a subset of the Unicode value for some _other_ named
-            # entity.  As an example, \u2267' is &GreaterFullEqual;,
-            # but '\u2267\u0338' is &NotGreaterFullEqual;. Our regular
-            # expression needs to match the first two characters of
-            # "\u2267\u0338foo", but only the first character of
-            # "\u2267foo".
-            #
-            # In this step, we build two sets of characters that
-            # _eventually_ need to go into the regular expression. But
-            # we won't know exactly what the regular expression needs
-            # to look like until we've gone through the entire list of
-            # named entities.
-            if len(character) == 1:
-                short_entities.add(character)
-            else:
-                long_entities_by_first_character[character[0]].add(character)
-
-        # Now that we've been through the entire list of entities, we
-        # can create a regular expression that matches any of them.
-        particles = set()
-        for short in short_entities:
-            long_versions = long_entities_by_first_character[short]
-            if not long_versions:
-                particles.add(short)
-            else:
-                ignore = "".join([x[1] for x in long_versions])
-                # This finds, e.g. \u2267 but only if it is _not_
-                # followed by \u0338.
-                particles.add("%s(?![%s])" % (short, ignore))
-        
-        for long_entities in list(long_entities_by_first_character.values()):
-            for long_entity in long_entities:
-                particles.add(long_entity)
-
-        re_definition = "(%s)" % "|".join(particles)
-                
-        # If an entity shows up in both html5 and codepoint2name, it's
-        # likely that HTML5 gives it several different names, such as
-        # 'rsquo' and 'rsquor'. When converting Unicode characters to
-        # named entities, the codepoint2name name should take
-        # precedence where possible, since that's the more easily
-        # recognizable one.
+        lookup = {}
+        reverse_lookup = {}
+        characters_for_re = []
         for codepoint, name in list(codepoint2name.items()):
-            character = chr(codepoint)
-            unicode_to_name[character] = name
-
-        return unicode_to_name, name_to_unicode, re.compile(re_definition)
+            character = unichr(codepoint)
+            if codepoint != 34:
+                # There's no point in turning the quotation mark into
+                # &quot;, unless it happens within an attribute value, which
+                # is handled elsewhere.
+                characters_for_re.append(character)
+                lookup[character] = name
+            # But we do want to turn &quot; into the quotation mark.
+            reverse_lookup[name] = character
+        re_definition = "[%s]" % "".join(characters_for_re)
+        return lookup, reverse_lookup, re.compile(re_definition)
     (CHARACTER_TO_HTML_ENTITY, HTML_ENTITY_TO_CHARACTER,
      CHARACTER_TO_HTML_ENTITY_RE) = _populate_class_variables()
 
@@ -197,22 +79,20 @@ class EntitySubstitution(object):
         }
 
     BARE_AMPERSAND_OR_BRACKET = re.compile("([<>]|"
-                                           "&(?!#\\d+;|#x[0-9a-fA-F]+;|\\w+;)"
+                                           "&(?!#\d+;|#x[0-9a-fA-F]+;|\w+;)"
                                            ")")
 
     AMPERSAND_OR_BRACKET = re.compile("([<>&])")
 
     @classmethod
     def _substitute_html_entity(cls, matchobj):
-        """Used with a regular expression to substitute the
-        appropriate HTML entity for a special character string."""
         entity = cls.CHARACTER_TO_HTML_ENTITY.get(matchobj.group(0))
         return "&%s;" % entity
 
     @classmethod
     def _substitute_xml_entity(cls, matchobj):
         """Used with a regular expression to substitute the
-        appropriate XML entity for a special character string."""
+        appropriate XML entity for an XML special character."""
         entity = cls.CHARACTER_TO_XML_ENTITY[matchobj.group(0)]
         return "&%s;" % entity
 
@@ -307,8 +187,6 @@ class EntitySubstitution(object):
         containg a LATIN SMALL LETTER E WITH ACUTE, but replacing that
         character with "&eacute;" will make it more readable to some
         people.
-
-        :param s: A Unicode string.
         """
         return cls.CHARACTER_TO_HTML_ENTITY_RE.sub(
             cls._substitute_html_entity, s)
@@ -320,67 +198,22 @@ class EncodingDetector:
     Order of precedence:
 
     1. Encodings you specifically tell EncodingDetector to try first
-    (the known_definite_encodings argument to the constructor).
+    (the override_encodings argument to the constructor).
 
-    2. An encoding determined by sniffing the document's byte-order mark.
-
-    3. Encodings you specifically tell EncodingDetector to try if
-    byte-order mark sniffing fails (the user_encodings argument to the
-    constructor).
-
-    4. An encoding declared within the bytestring itself, either in an
+    2. An encoding declared within the bytestring itself, either in an
     XML declaration (if the bytestring is to be interpreted as an XML
     document), or in a <meta> tag (if the bytestring is to be
     interpreted as an HTML document.)
 
-    5. An encoding detected through textual analysis by chardet,
+    3. An encoding detected through textual analysis by chardet,
     cchardet, or a similar external library.
 
     4. UTF-8.
 
     5. Windows-1252.
-
     """
-    def __init__(self, markup, known_definite_encodings=None,
-                 is_html=False, exclude_encodings=None,
-                 user_encodings=None, override_encodings=None):
-        """Constructor.
-
-        :param markup: Some markup in an unknown encoding.
-
-        :param known_definite_encodings: When determining the encoding
-            of `markup`, these encodings will be tried first, in
-            order. In HTML terms, this corresponds to the "known
-            definite encoding" step defined here:
-            https://html.spec.whatwg.org/multipage/parsing.html#parsing-with-a-known-character-encoding
-
-        :param user_encodings: These encodings will be tried after the
-            `known_definite_encodings` have been tried and failed, and
-            after an attempt to sniff the encoding by looking at a
-            byte order mark has failed. In HTML terms, this
-            corresponds to the step "user has explicitly instructed
-            the user agent to override the document's character
-            encoding", defined here:
-            https://html.spec.whatwg.org/multipage/parsing.html#determining-the-character-encoding
-
-        :param override_encodings: A deprecated alias for
-            known_definite_encodings. Any encodings here will be tried
-            immediately after the encodings in
-            known_definite_encodings.
-
-        :param is_html: If True, this markup is considered to be
-            HTML. Otherwise it's assumed to be XML.
-
-        :param exclude_encodings: These encodings will not be tried,
-            even if they otherwise would be.
-
-        """
-        self.known_definite_encodings = list(known_definite_encodings or [])
-        if override_encodings:
-            self.known_definite_encodings += override_encodings
-        self.user_encodings = user_encodings or []
-        exclude_encodings = exclude_encodings or []
-        self.exclude_encodings = set([x.lower() for x in exclude_encodings])
+    def __init__(self, markup, override_encodings=None, is_html=False):
+        self.override_encodings = override_encodings or []
         self.chardet_encoding = None
         self.is_html = is_html
         self.declared_encoding = None
@@ -389,16 +222,8 @@ class EncodingDetector:
         self.markup, self.sniffed_encoding = self.strip_byte_order_mark(markup)
 
     def _usable(self, encoding, tried):
-        """Should we even bother to try this encoding?
-
-        :param encoding: Name of an encoding.
-        :param tried: Encodings that have already been tried. This will be modified
-            as a side effect.
-        """
         if encoding is not None:
             encoding = encoding.lower()
-            if encoding in self.exclude_encodings:
-                return False
             if encoding not in tried:
                 tried.add(encoding)
                 return True
@@ -406,14 +231,9 @@ class EncodingDetector:
 
     @property
     def encodings(self):
-        """Yield a number of encodings that might work for this markup.
-
-        :yield: A sequence of strings.
-        """
+        """Yield a number of encodings that might work for this markup."""
         tried = set()
-
-        # First, try the known definite encodings
-        for e in self.known_definite_encodings:
+        for e in self.override_encodings:
             if self._usable(e, tried):
                 yield e
 
@@ -422,12 +242,6 @@ class EncodingDetector:
         if self._usable(self.sniffed_encoding, tried):
             yield self.sniffed_encoding
 
-        # Sniffing the byte-order mark did nothing; try the user
-        # encodings.
-        for e in self.user_encodings:
-            if self._usable(e, tried):
-                yield e
-            
         # Look within the document for an XML or HTML encoding
         # declaration.
         if self.declared_encoding is None:
@@ -450,15 +264,8 @@ class EncodingDetector:
 
     @classmethod
     def strip_byte_order_mark(cls, data):
-        """If a byte-order mark is present, strip it and return the encoding it implies.
-
-        :param data: Some markup.
-        :return: A 2-tuple (modified data, implied encoding)
-        """
+        """If a byte-order mark is present, strip it and return the encoding it implies."""
         encoding = None
-        if isinstance(data, str):
-            # Unicode data cannot have a byte-order mark.
-            return data, encoding
         if (len(data) >= 4) and (data[:2] == b'\xfe\xff') \
                and (data[2:4] != '\x00\x00'):
             encoding = 'utf-16be'
@@ -486,13 +293,6 @@ class EncodingDetector:
 
         An HTML encoding is declared in a <meta> tag, hopefully near the
         beginning of the document.
-
-        :param markup: Some markup.
-        :param is_html: If True, this markup is considered to be HTML. Otherwise
-            it's assumed to be XML.
-        :param search_entire_document: Since an encoding is supposed to declared near the beginning
-            of the document, most of the time it's only necessary to search a few kilobytes of data.
-            Set this to True to force this method to search the entire document.
         """
         if search_entire_document:
             xml_endpos = html_endpos = len(markup)
@@ -500,22 +300,14 @@ class EncodingDetector:
             xml_endpos = 1024
             html_endpos = max(2048, int(len(markup) * 0.05))
 
-        if isinstance(markup, bytes):
-            res = encoding_res[bytes]
-        else:
-            res = encoding_res[str]
-
-        xml_re = res['xml']
-        html_re = res['html']
         declared_encoding = None
-        declared_encoding_match = xml_re.search(markup, endpos=xml_endpos)
+        declared_encoding_match = xml_encoding_re.search(markup, endpos=xml_endpos)
         if not declared_encoding_match and is_html:
-            declared_encoding_match = html_re.search(markup, endpos=html_endpos)
+            declared_encoding_match = html_meta_re.search(markup, endpos=html_endpos)
         if declared_encoding_match is not None:
-            declared_encoding = declared_encoding_match.groups()[0]
+            declared_encoding = declared_encoding_match.groups()[0].decode(
+                'ascii')
         if declared_encoding:
-            if isinstance(declared_encoding, bytes):
-                declared_encoding = declared_encoding.decode('ascii', 'replace')
             return declared_encoding.lower()
         return None
 
@@ -538,58 +330,19 @@ class UnicodeDammit:
         "iso-8859-2",
         ]
 
-    def __init__(self, markup, known_definite_encodings=[],
-                 smart_quotes_to=None, is_html=False, exclude_encodings=[],
-                 user_encodings=None, override_encodings=None
-    ):
-        """Constructor.
-
-        :param markup: A bytestring representing markup in an unknown encoding.
-
-        :param known_definite_encodings: When determining the encoding
-            of `markup`, these encodings will be tried first, in
-            order. In HTML terms, this corresponds to the "known
-            definite encoding" step defined here:
-            https://html.spec.whatwg.org/multipage/parsing.html#parsing-with-a-known-character-encoding
-
-        :param user_encodings: These encodings will be tried after the
-            `known_definite_encodings` have been tried and failed, and
-            after an attempt to sniff the encoding by looking at a
-            byte order mark has failed. In HTML terms, this
-            corresponds to the step "user has explicitly instructed
-            the user agent to override the document's character
-            encoding", defined here:
-            https://html.spec.whatwg.org/multipage/parsing.html#determining-the-character-encoding
-
-        :param override_encodings: A deprecated alias for
-            known_definite_encodings. Any encodings here will be tried
-            immediately after the encodings in
-            known_definite_encodings.
-
-        :param smart_quotes_to: By default, Microsoft smart quotes will, like all other characters, be converted
-           to Unicode characters. Setting this to 'ascii' will convert them to ASCII quotes instead.
-           Setting it to 'xml' will convert them to XML entity references, and setting it to 'html'
-           will convert them to HTML entity references.
-        :param is_html: If True, this markup is considered to be HTML. Otherwise
-            it's assumed to be XML.
-        :param exclude_encodings: These encodings will not be considered, even
-            if the sniffing code thinks they might make sense.
-
-        """
+    def __init__(self, markup, override_encodings=[],
+                 smart_quotes_to=None, is_html=False):
         self.smart_quotes_to = smart_quotes_to
         self.tried_encodings = []
         self.contains_replacement_characters = False
         self.is_html = is_html
-        self.log = logging.getLogger(__name__)
-        self.detector = EncodingDetector(
-            markup, known_definite_encodings, is_html, exclude_encodings,
-            user_encodings, override_encodings
-        )
+
+        self.detector = EncodingDetector(markup, override_encodings, is_html)
 
         # Short-circuit if the data is in Unicode to begin with.
-        if isinstance(markup, str) or markup == '':
+        if isinstance(markup, unicode) or markup == '':
             self.markup = markup
-            self.unicode_markup = str(markup)
+            self.unicode_markup = unicode(markup)
             self.original_encoding = None
             return
 
@@ -612,10 +365,9 @@ class UnicodeDammit:
                 if encoding != "ascii":
                     u = self._convert_from(encoding, "replace")
                 if u is not None:
-                    self.log.warning(
+                    logging.warning(
                             "Some characters could not be decoded, and were "
-                            "replaced with REPLACEMENT CHARACTER."
-                    )
+                            "replaced with REPLACEMENT CHARACTER.")
                     self.contains_replacement_characters = True
                     break
 
@@ -644,10 +396,6 @@ class UnicodeDammit:
         return sub
 
     def _convert_from(self, proposed, errors="strict"):
-        """Attempt to convert the markup to the proposed encoding.
-
-        :param proposed: The name of a character encoding.
-        """
         proposed = self.find_codec(proposed)
         if not proposed or (proposed, errors) in self.tried_encodings:
             return None
@@ -662,40 +410,30 @@ class UnicodeDammit:
             markup = smart_quotes_compiled.sub(self._sub_ms_char, markup)
 
         try:
-            #print("Trying to convert document to %s (errors=%s)" % (
-            #    proposed, errors))
+            #print "Trying to convert document to %s (errors=%s)" % (
+            #    proposed, errors)
             u = self._to_unicode(markup, proposed, errors)
             self.markup = u
             self.original_encoding = proposed
         except Exception as e:
-            #print("That didn't work!")
-            #print(e)
+            #print "That didn't work!"
+            #print e
             return None
-        #print("Correct encoding: %s" % proposed)
+        #print "Correct encoding: %s" % proposed
         return self.markup
 
     def _to_unicode(self, data, encoding, errors="strict"):
-        """Given a string and its encoding, decodes the string into Unicode.
-
-        :param encoding: The name of an encoding.
-        """
-        return str(data, encoding, errors)
+        '''Given a string and its encoding, decodes the string into Unicode.
+        %encoding is a string recognized by encodings.aliases'''
+        return unicode(data, encoding, errors)
 
     @property
     def declared_html_encoding(self):
-        """If the markup is an HTML document, returns the encoding declared _within_
-        the document.
-        """
         if not self.is_html:
             return None
         return self.detector.declared_encoding
 
     def find_codec(self, charset):
-        """Convert the name of a character set to a codec name.
-
-        :param charset: The name of a character set.
-        :return: The name of a codec.
-        """
         value = (self._codec(self.CHARSET_ALIASES.get(charset, charset))
                or (charset and self._codec(charset.replace("-", "")))
                or (charset and self._codec(charset.replace("-", "_")))
@@ -985,7 +723,7 @@ class UnicodeDammit:
         0xde : b'\xc3\x9e',     # Þ
         0xdf : b'\xc3\x9f',     # ß
         0xe0 : b'\xc3\xa0',     # à
-        0xe1 : b'\xa1',         # á
+        0xe1 : b'\xa1',     # á
         0xe2 : b'\xc3\xa2',     # â
         0xe3 : b'\xc3\xa3',     # ã
         0xe4 : b'\xc3\xa4',     # ä
@@ -1034,16 +772,12 @@ class UnicodeDammit:
         Currently the only situation supported is Windows-1252 (or its
         subset ISO-8859-1), embedded in UTF-8.
 
-        :param in_bytes: A bytestring that you suspect contains
-            characters from multiple encodings. Note that this _must_
-            be a bytestring. If you've already converted the document
-            to Unicode, you're too late.
-        :param main_encoding: The primary encoding of `in_bytes`.
-        :param embedded_encoding: The encoding that was used to embed characters
-            in the main document.
-        :return: A bytestring in which `embedded_encoding`
-          characters have been converted to their `main_encoding`
-          equivalents.
+        The input must be a bytestring. If you've already converted
+        the document to Unicode, you're too late.
+
+        The output is a bytestring in which `embedded_encoding`
+        characters have been converted to their `main_encoding`
+        equivalents.
         """
         if embedded_encoding.replace('_', '-').lower() not in (
             'windows-1252', 'windows_1252'):
diff --git a/lib/bs4/diagnose.py b/lib/bs4/diagnose.py
index e079772e..b7c99b1c 100644
--- a/lib/bs4/diagnose.py
+++ b/lib/bs4/diagnose.py
@@ -1,11 +1,7 @@
 """Diagnostic functions, mainly for use when doing tech support."""
-
-# Use of this source code is governed by the MIT license.
-__license__ = "MIT"
-
 import cProfile
-from io import BytesIO
-from html.parser import HTMLParser
+from StringIO import StringIO
+from HTMLParser import HTMLParser
 import bs4
 from bs4 import BeautifulSoup, __version__
 from bs4.builder import builder_registry
@@ -20,13 +16,9 @@ import sys
 import cProfile
 
 def diagnose(data):
-    """Diagnostic suite for isolating common problems.
-
-    :param data: A string containing markup that needs to be explained.
-    :return: None; diagnostics are printed to standard output.
-    """
-    print(("Diagnostic running on Beautiful Soup %s" % __version__))
-    print(("Python version %s" % sys.version))
+    """Diagnostic suite for isolating common problems."""
+    print "Diagnostic running on Beautiful Soup %s" % __version__
+    print "Python version %s" % sys.version
 
     basic_parsers = ["html.parser", "html5lib", "lxml"]
     for name in basic_parsers:
@@ -35,75 +27,57 @@ def diagnose(data):
                 break
         else:
             basic_parsers.remove(name)
-            print((
+            print (
                 "I noticed that %s is not installed. Installing it may help." %
-                name))
+                name)
 
     if 'lxml' in basic_parsers:
-        basic_parsers.append("lxml-xml")
-        try:
-            from lxml import etree
-            print(("Found lxml version %s" % ".".join(map(str,etree.LXML_VERSION))))
-        except ImportError as e:
-            print(
-                "lxml is not installed or couldn't be imported.")
-
+        basic_parsers.append(["lxml", "xml"])
+        from lxml import etree
+        print "Found lxml version %s" % ".".join(map(str,etree.LXML_VERSION))
 
     if 'html5lib' in basic_parsers:
-        try:
-            import html5lib
-            print(("Found html5lib version %s" % html5lib.__version__))
-        except ImportError as e:
-            print(
-                "html5lib is not installed or couldn't be imported.")
+        import html5lib
+        print "Found html5lib version %s" % html5lib.__version__
 
     if hasattr(data, 'read'):
         data = data.read()
+    elif os.path.exists(data):
+        print '"%s" looks like a filename. Reading data from the file.' % data
+        data = open(data).read()
+    elif data.startswith("http:") or data.startswith("https:"):
+        print '"%s" looks like a URL. Beautiful Soup is not an HTTP client.' % data
+        print "You need to use some other library to get the document behind the URL, and feed that document to Beautiful Soup."
+        return
+    print
 
     for parser in basic_parsers:
-        print(("Trying to parse your markup with %s" % parser))
+        print "Trying to parse your markup with %s" % parser
         success = False
         try:
-            soup = BeautifulSoup(data, features=parser)
+            soup = BeautifulSoup(data, parser)
             success = True
-        except Exception as e:
-            print(("%s could not parse the markup." % parser))
+        except Exception, e:
+            print "%s could not parse the markup." % parser
             traceback.print_exc()
         if success:
-            print(("Here's what %s did with the markup:" % parser))
-            print((soup.prettify()))
+            print "Here's what %s did with the markup:" % parser
+            print soup.prettify()
 
-        print(("-" * 80))
+        print "-" * 80
 
 def lxml_trace(data, html=True, **kwargs):
     """Print out the lxml events that occur during parsing.
 
     This lets you see how lxml parses a document when no Beautiful
-    Soup code is running. You can use this to determine whether
-    an lxml-specific problem is in Beautiful Soup's lxml tree builders
-    or in lxml itself.
-
-    :param data: Some markup.
-    :param html: If True, markup will be parsed with lxml's HTML parser.
-       if False, lxml's XML parser will be used.
+    Soup code is running.
     """
     from lxml import etree
-    recover = kwargs.pop('recover', True)
-    if isinstance(data, str):
-        data = data.encode("utf8")
-    reader = BytesIO(data)
-    for event, element in etree.iterparse(
-        reader, html=html, recover=recover, **kwargs
-    ):
-        print(("%s, %4s, %s" % (event, element.tag, element.text)))
+    for event, element in etree.iterparse(StringIO(data), html=html, **kwargs):
+        print("%s, %4s, %s" % (event, element.tag, element.text))
 
 class AnnouncingParser(HTMLParser):
-    """Subclass of HTMLParser that announces parse events, without doing
-    anything else.
-
-    You can use this to get a picture of how html.parser sees a given
-    document. The easiest way to do this is to call `htmlparser_trace`.
-    """
+    """Announces HTMLParser parse events, without doing anything else."""
 
     def _p(self, s):
         print(s)
@@ -140,8 +114,6 @@ def htmlparser_trace(data):
 
     This lets you see how HTMLParser parses a document when no
     Beautiful Soup code is running.
-
-    :param data: Some markup.
     """
     parser = AnnouncingParser()
     parser.feed(data)
@@ -163,7 +135,7 @@ def rword(length=5):
 def rsentence(length=4):
     "Generate a random sentence-like string."
     return " ".join(rword(random.randint(4,9)) for i in range(length))
-        
+
 def rdoc(num_elements=1000):
     """Randomly generate an invalid HTML document."""
     tag_names = ['p', 'div', 'span', 'i', 'b', 'script', 'table']
@@ -184,10 +156,10 @@ def rdoc(num_elements=1000):
 
 def benchmark_parsers(num_elements=100000):
     """Very basic head-to-head performance benchmark."""
-    print(("Comparative parser benchmark on Beautiful Soup %s" % __version__))
+    print "Comparative parser benchmark on Beautiful Soup %s" % __version__
     data = rdoc(num_elements)
-    print(("Generated a large invalid HTML document (%d bytes)." % len(data)))
-    
+    print "Generated a large invalid HTML document (%d bytes)." % len(data)
+
     for parser in ["lxml", ["lxml", "html"], "html5lib", "html.parser"]:
         success = False
         try:
@@ -195,27 +167,27 @@ def benchmark_parsers(num_elements=100000):
             soup = BeautifulSoup(data, parser)
             b = time.time()
             success = True
-        except Exception as e:
-            print(("%s could not parse the markup." % parser))
+        except Exception, e:
+            print "%s could not parse the markup." % parser
             traceback.print_exc()
         if success:
-            print(("BS4+%s parsed the markup in %.2fs." % (parser, b-a)))
+            print "BS4+%s parsed the markup in %.2fs." % (parser, b-a)
 
     from lxml import etree
     a = time.time()
     etree.HTML(data)
     b = time.time()
-    print(("Raw lxml parsed the markup in %.2fs." % (b-a)))
+    print "Raw lxml parsed the markup in %.2fs." % (b-a)
 
     import html5lib
     parser = html5lib.HTMLParser()
     a = time.time()
     parser.parse(data)
     b = time.time()
-    print(("Raw html5lib parsed the markup in %.2fs." % (b-a)))
+    print "Raw html5lib parsed the markup in %.2fs." % (b-a)
 
 def profile(num_elements=100000, parser="lxml"):
-    """Use Python's profiler on a randomly generated document."""
+
     filehandle = tempfile.NamedTemporaryFile()
     filename = filehandle.name
 
@@ -228,6 +200,5 @@ def profile(num_elements=100000, parser="lxml"):
     stats.sort_stats("cumulative")
     stats.print_stats('_html5lib|bs4', 50)
 
-# If this file is run as a script, standard input is diagnosed.
 if __name__ == '__main__':
     diagnose(sys.stdin.read())
diff --git a/lib/bs4/element.py b/lib/bs4/element.py
index 0aefe734..da9afdf4 100644
--- a/lib/bs4/element.py
+++ b/lib/bs4/element.py
@@ -1,28 +1,13 @@
-# Use of this source code is governed by the MIT license.
-__license__ = "MIT"
-
-try:
-    from collections.abc import Callable # Python 3.6
-except ImportError as e:
-    from collections import Callable
+import collections
 import re
 import sys
 import warnings
-
-from bs4.css import CSS
-from bs4.formatter import (
-    Formatter,
-    HTMLFormatter,
-    XMLFormatter,
-)
+from bs4.dammit import EntitySubstitution
 
 DEFAULT_OUTPUT_ENCODING = "utf-8"
+PY3K = (sys.version_info[0] > 2)
 
-nonwhitespace_re = re.compile(r"\S+")
-
-# NOTE: This isn't used as of 4.7.0. I'm leaving it for a little bit on
-# the off chance someone imported it for their own use.
-whitespace_re = re.compile(r"\s+")
+whitespace_re = re.compile("\s+")
 
 def _alias(attr):
     """Alias one attribute name to another for backward compatibility"""
@@ -36,59 +21,22 @@ def _alias(attr):
     return alias
 
 
-# These encodings are recognized by Python (so PageElement.encode
-# could theoretically support them) but XML and HTML don't recognize
-# them (so they should not show up in an XML or HTML document as that
-# document's encoding).
-#
-# If an XML document is encoded in one of these encodings, no encoding
-# will be mentioned in the XML declaration. If an HTML document is
-# encoded in one of these encodings, and the HTML document has a
-# <meta> tag that mentions an encoding, the encoding will be given as
-# the empty string.
-#
-# Source:
-# https://docs.python.org/3/library/codecs.html#python-specific-encodings
-PYTHON_SPECIFIC_ENCODINGS = set([
-    "idna",
-    "mbcs",
-    "oem",
-    "palmos",
-    "punycode",
-    "raw_unicode_escape",
-    "undefined",
-    "unicode_escape",
-    "raw-unicode-escape",
-    "unicode-escape",
-    "string-escape",
-    "string_escape",
-])
+class NamespacedAttribute(unicode):
 
-
-class NamespacedAttribute(str):
-    """A namespaced string (e.g. 'xml:lang') that remembers the namespace
-    ('xml') and the name ('lang') that were used to create it.
-    """
-
-    def __new__(cls, prefix, name=None, namespace=None):
-        if not name:
-            # This is the default namespace. Its name "has no value"
-            # per https://www.w3.org/TR/xml-names/#defaulting
-            name = None
-
-        if not name:
-            obj = str.__new__(cls, prefix)
-        elif not prefix:
+    def __new__(cls, prefix, name, namespace=None):
+        if name is None:
+            obj = unicode.__new__(cls, prefix)
+        elif prefix is None:
             # Not really namespaced.
-            obj = str.__new__(cls, name)
+            obj = unicode.__new__(cls, name)
         else:
-            obj = str.__new__(cls, prefix + ":" + name)
+            obj = unicode.__new__(cls, prefix + ":" + name)
         obj.prefix = prefix
         obj.name = name
         obj.namespace = namespace
         return obj
 
-class AttributeValueWithCharsetSubstitution(str):
+class AttributeValueWithCharsetSubstitution(unicode):
     """A stand-in object for a character encoding specified in HTML."""
 
 class CharsetMetaAttributeValue(AttributeValueWithCharsetSubstitution):
@@ -99,16 +47,11 @@ class CharsetMetaAttributeValue(AttributeValueWithCharsetSubstitution):
     """
 
     def __new__(cls, original_value):
-        obj = str.__new__(cls, original_value)
+        obj = unicode.__new__(cls, original_value)
         obj.original_value = original_value
         return obj
 
     def encode(self, encoding):
-        """When an HTML document is being encoded to a given encoding, the
-        value of a meta tag's 'charset' is the name of the encoding.
-        """
-        if encoding in PYTHON_SPECIFIC_ENCODINGS:
-            return ''
         return encoding
 
 
@@ -121,214 +64,160 @@ class ContentMetaAttributeValue(AttributeValueWithCharsetSubstitution):
     The value of the 'content' attribute will be one of these objects.
     """
 
-    CHARSET_RE = re.compile(r"((^|;)\s*charset=)([^;]*)", re.M)
+    CHARSET_RE = re.compile("((^|;)\s*charset=)([^;]*)", re.M)
 
     def __new__(cls, original_value):
         match = cls.CHARSET_RE.search(original_value)
         if match is None:
             # No substitution necessary.
-            return str.__new__(str, original_value)
+            return unicode.__new__(unicode, original_value)
 
-        obj = str.__new__(cls, original_value)
+        obj = unicode.__new__(cls, original_value)
         obj.original_value = original_value
         return obj
 
     def encode(self, encoding):
-        if encoding in PYTHON_SPECIFIC_ENCODINGS:
-            return ''
         def rewrite(match):
             return match.group(1) + encoding
         return self.CHARSET_RE.sub(rewrite, self.original_value)
 
+class HTMLAwareEntitySubstitution(EntitySubstitution):
 
-class PageElement(object):
-    """Contains the navigational information for some part of the page:
-    that is, its current location in the parse tree.
+    """Entity substitution rules that are aware of some HTML quirks.
 
-    NavigableString, Tag, etc. are all subclasses of PageElement.
+    Specifically, the contents of <script> and <style> tags should not
+    undergo entity substitution.
+
+    Incoming NavigableString objects are checked to see if they're the
+    direct children of a <script> or <style> tag.
     """
 
-    # In general, we can't tell just by looking at an element whether
-    # it's contained in an XML document or an HTML document. But for
-    # Tags (q.v.) we can store this information at parse time.
-    known_xml = None
+    cdata_containing_tags = set(["script", "style"])
 
-    def setup(self, parent=None, previous_element=None, next_element=None,
-              previous_sibling=None, next_sibling=None):
-        """Sets up the initial relations between this element and
-        other elements.
+    preformatted_tags = set(["pre"])
 
-        :param parent: The parent of this element.
+    @classmethod
+    def _substitute_if_appropriate(cls, ns, f):
+        if (isinstance(ns, NavigableString)
+            and ns.parent is not None
+            and ns.parent.name in cls.cdata_containing_tags):
+            # Do nothing.
+            return ns
+        # Substitute.
+        return f(ns)
 
-        :param previous_element: The element parsed immediately before
-            this one.
+    @classmethod
+    def substitute_html(cls, ns):
+        return cls._substitute_if_appropriate(
+            ns, EntitySubstitution.substitute_html)
 
-        :param next_element: The element parsed immediately before
-            this one.
+    @classmethod
+    def substitute_xml(cls, ns):
+        return cls._substitute_if_appropriate(
+            ns, EntitySubstitution.substitute_xml)
 
-        :param previous_sibling: The most recently encountered element
-            on the same level of the parse tree as this one.
+class PageElement(object):
+    """Contains the navigational information for some part of the page
+    (either a tag or a piece of text)"""
 
-        :param previous_sibling: The next element to be encountered
-            on the same level of the parse tree as this one.
-        """
-        self.parent = parent
+    # There are five possible values for the "formatter" argument passed in
+    # to methods like encode() and prettify():
+    #
+    # "html" - All Unicode characters with corresponding HTML entities
+    #   are converted to those entities on output.
+    # "minimal" - Bare ampersands and angle brackets are converted to
+    #   XML entities: &amp; &lt; &gt;
+    # None - The null formatter. Unicode characters are never
+    #   converted to entities.  This is not recommended, but it's
+    #   faster than "minimal".
+    # A function - This function will be called on every string that
+    #  needs to undergo entity substitution.
+    #
 
-        self.previous_element = previous_element
-        if previous_element is not None:
-            self.previous_element.next_element = self
+    # In an HTML document, the default "html" and "minimal" functions
+    # will leave the contents of <script> and <style> tags alone. For
+    # an XML document, all tags will be given the same treatment.
 
-        self.next_element = next_element
-        if self.next_element is not None:
-            self.next_element.previous_element = self
+    HTML_FORMATTERS = {
+        "html" : HTMLAwareEntitySubstitution.substitute_html,
+        "minimal" : HTMLAwareEntitySubstitution.substitute_xml,
+        None : None
+        }
 
-        self.next_sibling = next_sibling
-        if self.next_sibling is not None:
-            self.next_sibling.previous_sibling = self
+    XML_FORMATTERS = {
+        "html" : EntitySubstitution.substitute_html,
+        "minimal" : EntitySubstitution.substitute_xml,
+        None : None
+        }
 
-        if (previous_sibling is None
-            and self.parent is not None and self.parent.contents):
-            previous_sibling = self.parent.contents[-1]
-
-        self.previous_sibling = previous_sibling
-        if previous_sibling is not None:
-            self.previous_sibling.next_sibling = self
-
-    def format_string(self, s, formatter):
-        """Format the given string using the given formatter.
-
-        :param s: A string.
-        :param formatter: A Formatter object, or a string naming one of the standard formatters.
-        """
+    def format_string(self, s, formatter='minimal'):
+        """Format the given string using the given formatter."""
+        if not callable(formatter):
+            formatter = self._formatter_for_name(formatter)
         if formatter is None:
-            return s
-        if not isinstance(formatter, Formatter):
-            formatter = self.formatter_for_name(formatter)
-        output = formatter.substitute(s)
-        return output
-
-    def formatter_for_name(self, formatter):
-        """Look up or create a Formatter for the given identifier,
-        if necessary.
-
-        :param formatter: Can be a Formatter object (used as-is), a
-            function (used as the entity substitution hook for an
-            XMLFormatter or HTMLFormatter), or a string (used to look
-            up an XMLFormatter or HTMLFormatter in the appropriate
-            registry.
-        """
-        if isinstance(formatter, Formatter):
-            return formatter
-        if self._is_xml:
-            c = XMLFormatter
+            output = s
         else:
-            c = HTMLFormatter
-        if isinstance(formatter, Callable):
-            return c(entity_substitution=formatter)
-        return c.REGISTRY[formatter]
+            output = formatter(s)
+        return output
 
     @property
     def _is_xml(self):
         """Is this element part of an XML tree or an HTML tree?
 
-        This is used in formatter_for_name, when deciding whether an
-        XMLFormatter or HTMLFormatter is more appropriate. It can be
+        This is used when mapping a formatter name ("minimal") to an
+        appropriate function (one that performs entity-substitution on
+        the contents of <script> and <style> tags, or not). It's
         inefficient, but it should be called very rarely.
         """
-        if self.known_xml is not None:
-            # Most of the time we will have determined this when the
-            # document is parsed.
-            return self.known_xml
-
-        # Otherwise, it's likely that this element was created by
-        # direct invocation of the constructor from within the user's
-        # Python code.
         if self.parent is None:
-            # This is the top-level object. It should have .known_xml set
+            # This is the top-level object. It should have .is_xml set
             # from tree creation. If not, take a guess--BS is usually
             # used on HTML markup.
             return getattr(self, 'is_xml', False)
         return self.parent._is_xml
 
+    def _formatter_for_name(self, name):
+        "Look up a formatter function based on its name and the tree."
+        if self._is_xml:
+            return self.XML_FORMATTERS.get(
+                name, EntitySubstitution.substitute_xml)
+        else:
+            return self.HTML_FORMATTERS.get(
+                name, HTMLAwareEntitySubstitution.substitute_xml)
+
+    def setup(self, parent=None, previous_element=None):
+        """Sets up the initial relations between this element and
+        other elements."""
+        self.parent = parent
+        self.previous_element = previous_element
+        if previous_element is not None:
+            self.previous_element.next_element = self
+        self.next_element = None
+        self.previous_sibling = None
+        self.next_sibling = None
+        if self.parent is not None and self.parent.contents:
+            self.previous_sibling = self.parent.contents[-1]
+            self.previous_sibling.next_sibling = self
+
     nextSibling = _alias("next_sibling")  # BS3
     previousSibling = _alias("previous_sibling")  # BS3
 
-    default = object()
-    def _all_strings(self, strip=False, types=default):
-        """Yield all strings of certain classes, possibly stripping them.
-
-        This is implemented differently in Tag and NavigableString.
-        """
-        raise NotImplementedError()
-
-    @property
-    def stripped_strings(self):
-        """Yield all strings in this PageElement, stripping them first.
-
-        :yield: A sequence of stripped strings.
-        """
-        for string in self._all_strings(True):
-            yield string
-
-    def get_text(self, separator="", strip=False,
-                 types=default):
-        """Get all child strings of this PageElement, concatenated using the
-        given separator.
-
-        :param separator: Strings will be concatenated using this separator.
-
-        :param strip: If True, strings will be stripped before being
-            concatenated.
-
-        :param types: A tuple of NavigableString subclasses. Any
-            strings of a subclass not found in this list will be
-            ignored. Although there are exceptions, the default
-            behavior in most cases is to consider only NavigableString
-            and CData objects. That means no comments, processing
-            instructions, etc.
-
-        :return: A string.
-        """
-        return separator.join([s for s in self._all_strings(
-                    strip, types=types)])
-    getText = get_text
-    text = property(get_text)
-
-    def replace_with(self, *args):
-        """Replace this PageElement with one or more PageElements, keeping the
-        rest of the tree the same.
-
-        :param args: One or more PageElements.
-        :return: `self`, no longer part of the tree.
-        """
-        if self.parent is None:
-            raise ValueError(
-                "Cannot replace one element with another when the "
-                "element to be replaced is not part of a tree.")
-        if len(args) == 1 and args[0] is self:
+    def replace_with(self, replace_with):
+        if replace_with is self:
             return
-        if any(x is self.parent for x in args):
+        if replace_with is self.parent:
             raise ValueError("Cannot replace a Tag with its parent.")
         old_parent = self.parent
         my_index = self.parent.index(self)
-        self.extract(_self_index=my_index)
-        for idx, replace_with in enumerate(args, start=my_index):
-            old_parent.insert(idx, replace_with)
+        self.extract()
+        old_parent.insert(my_index, replace_with)
         return self
     replaceWith = replace_with  # BS3
 
     def unwrap(self):
-        """Replace this PageElement with its contents.
-
-        :return: `self`, no longer part of the tree.
-        """
         my_parent = self.parent
-        if self.parent is None:
-            raise ValueError(
-                "Cannot replace an element with its contents when that"
-                "element is not part of a tree.")
         my_index = self.parent.index(self)
-        self.extract(_self_index=my_index)
+        self.extract()
         for child in reversed(self.contents[:]):
             my_parent.insert(my_index, child)
         return self
@@ -336,29 +225,14 @@ class PageElement(object):
     replaceWithChildren = unwrap  # BS3
 
     def wrap(self, wrap_inside):
-        """Wrap this PageElement inside another one.
-
-        :param wrap_inside: A PageElement.
-        :return: `wrap_inside`, occupying the position in the tree that used
-           to be occupied by `self`, and with `self` inside it.
-        """
         me = self.replace_with(wrap_inside)
         wrap_inside.append(me)
         return wrap_inside
 
-    def extract(self, _self_index=None):
-        """Destructively rips this element out of the tree.
-
-        :param _self_index: The location of this element in its parent's
-           .contents, if known. Passing this in allows for a performance
-           optimization.
-
-        :return: `self`, no longer part of the tree.
-        """
+    def extract(self):
+        """Destructively rips this element out of the tree."""
         if self.parent is not None:
-            if _self_index is None:
-                _self_index = self.parent.index(self)
-            del self.parent.contents[_self_index]
+            del self.parent.contents[self.parent.index(self)]
 
         #Find the two elements that would be next to each other if
         #this element (and any children) hadn't been parsed. Connect
@@ -366,68 +240,42 @@ class PageElement(object):
         last_child = self._last_descendant()
         next_element = last_child.next_element
 
-        if (self.previous_element is not None and
-            self.previous_element is not next_element):
+        if self.previous_element is not None:
             self.previous_element.next_element = next_element
-        if next_element is not None and next_element is not self.previous_element:
+        if next_element is not None:
             next_element.previous_element = self.previous_element
         self.previous_element = None
         last_child.next_element = None
 
         self.parent = None
-        if (self.previous_sibling is not None
-            and self.previous_sibling is not self.next_sibling):
+        if self.previous_sibling is not None:
             self.previous_sibling.next_sibling = self.next_sibling
-        if (self.next_sibling is not None
-            and self.next_sibling is not self.previous_sibling):
+        if self.next_sibling is not None:
             self.next_sibling.previous_sibling = self.previous_sibling
         self.previous_sibling = self.next_sibling = None
         return self
 
     def _last_descendant(self, is_initialized=True, accept_self=True):
-        """Finds the last element beneath this object to be parsed.
-
-        :param is_initialized: Has `setup` been called on this PageElement
-            yet?
-        :param accept_self: Is `self` an acceptable answer to the question?
-        """
-        if is_initialized and self.next_sibling is not None:
+        "Finds the last element beneath this object to be parsed."
+        if is_initialized and self.next_sibling:
             last_child = self.next_sibling.previous_element
         else:
             last_child = self
             while isinstance(last_child, Tag) and last_child.contents:
                 last_child = last_child.contents[-1]
-        if not accept_self and last_child is self:
+        if not accept_self and last_child == self:
             last_child = None
         return last_child
     # BS3: Not part of the API!
     _lastRecursiveChild = _last_descendant
 
     def insert(self, position, new_child):
-        """Insert a new PageElement in the list of this PageElement's children.
-
-        This works the same way as `list.insert`.
-
-        :param position: The numeric position that should be occupied
-           in `self.children` by the new PageElement.
-        :param new_child: A PageElement.
-        """
-        if new_child is None:
-            raise ValueError("Cannot insert None into a tag.")
         if new_child is self:
             raise ValueError("Cannot insert a tag into itself.")
-        if (isinstance(new_child, str)
+        if (isinstance(new_child, basestring)
             and not isinstance(new_child, NavigableString)):
             new_child = NavigableString(new_child)
 
-        from bs4 import BeautifulSoup
-        if isinstance(new_child, BeautifulSoup):
-            # We don't want to end up with a situation where one BeautifulSoup
-            # object contains another. Insert the children one at a time.
-            for subchild in list(new_child.contents):
-                self.insert(position, subchild)
-                position += 1
-            return
         position = min(position, len(self.contents))
         if hasattr(new_child, 'parent') and new_child.parent is not None:
             # We're 'inserting' an element that's already one
@@ -486,350 +334,166 @@ class PageElement(object):
         self.contents.insert(position, new_child)
 
     def append(self, tag):
-        """Appends the given PageElement to the contents of this one.
-
-        :param tag: A PageElement.
-        """
+        """Appends the given tag to the contents of this tag."""
         self.insert(len(self.contents), tag)
 
-    def extend(self, tags):
-        """Appends the given PageElements to this one's contents.
+    def insert_before(self, predecessor):
+        """Makes the given element the immediate predecessor of this one.
 
-        :param tags: A list of PageElements. If a single Tag is
-            provided instead, this PageElement's contents will be extended
-            with that Tag's contents.
-        """
-        if isinstance(tags, Tag):
-            tags = tags.contents
-        if isinstance(tags, list):
-            # Moving items around the tree may change their position in
-            # the original list. Make a list that won't change.
-            tags = list(tags)
-        for tag in tags:
-            self.append(tag)
-
-    def insert_before(self, *args):
-        """Makes the given element(s) the immediate predecessor of this one.
-
-        All the elements will have the same parent, and the given elements
+        The two elements will have the same parent, and the given element
         will be immediately before this one.
-
-        :param args: One or more PageElements.
         """
+        if self is predecessor:
+            raise ValueError("Can't insert an element before itself.")
         parent = self.parent
         if parent is None:
             raise ValueError(
                 "Element has no parent, so 'before' has no meaning.")
-        if any(x is self for x in args):
-                raise ValueError("Can't insert an element before itself.")
-        for predecessor in args:
-            # Extract first so that the index won't be screwed up if they
-            # are siblings.
-            if isinstance(predecessor, PageElement):
-                predecessor.extract()
-            index = parent.index(self)
-            parent.insert(index, predecessor)
+        # Extract first so that the index won't be screwed up if they
+        # are siblings.
+        if isinstance(predecessor, PageElement):
+            predecessor.extract()
+        index = parent.index(self)
+        parent.insert(index, predecessor)
 
-    def insert_after(self, *args):
-        """Makes the given element(s) the immediate successor of this one.
+    def insert_after(self, successor):
+        """Makes the given element the immediate successor of this one.
 
-        The elements will have the same parent, and the given elements
+        The two elements will have the same parent, and the given element
         will be immediately after this one.
-
-        :param args: One or more PageElements.
         """
-        # Do all error checking before modifying the tree.
+        if self is successor:
+            raise ValueError("Can't insert an element after itself.")
         parent = self.parent
         if parent is None:
             raise ValueError(
                 "Element has no parent, so 'after' has no meaning.")
-        if any(x is self for x in args):
-            raise ValueError("Can't insert an element after itself.")
+        # Extract first so that the index won't be screwed up if they
+        # are siblings.
+        if isinstance(successor, PageElement):
+            successor.extract()
+        index = parent.index(self)
+        parent.insert(index+1, successor)
 
-        offset = 0
-        for successor in args:
-            # Extract first so that the index won't be screwed up if they
-            # are siblings.
-            if isinstance(successor, PageElement):
-                successor.extract()
-            index = parent.index(self)
-            parent.insert(index+1+offset, successor)
-            offset += 1
-
-    def find_next(self, name=None, attrs={}, string=None, **kwargs):
-        """Find the first PageElement that matches the given criteria and
-        appears later in the document than this PageElement.
-
-        All find_* methods take a common set of arguments. See the online
-        documentation for detailed explanations.
-
-        :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
-        :param string: A filter for a NavigableString with specific text.
-        :kwargs: A dictionary of filters on attribute values.
-        :return: A PageElement.
-        :rtype: bs4.element.Tag | bs4.element.NavigableString
-        """
-        return self._find_one(self.find_all_next, name, attrs, string, **kwargs)
+    def find_next(self, name=None, attrs={}, text=None, **kwargs):
+        """Returns the first item that matches the given criteria and
+        appears after this Tag in the document."""
+        return self._find_one(self.find_all_next, name, attrs, text, **kwargs)
     findNext = find_next  # BS3
 
-    def find_all_next(self, name=None, attrs={}, string=None, limit=None,
+    def find_all_next(self, name=None, attrs={}, text=None, limit=None,
                     **kwargs):
-        """Find all PageElements that match the given criteria and appear
-        later in the document than this PageElement.
-
-        All find_* methods take a common set of arguments. See the online
-        documentation for detailed explanations.
-
-        :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
-        :param string: A filter for a NavigableString with specific text.
-        :param limit: Stop looking after finding this many results.
-        :kwargs: A dictionary of filters on attribute values.
-        :return: A ResultSet containing PageElements.
-        """
-        _stacklevel = kwargs.pop('_stacklevel', 2)
-        return self._find_all(name, attrs, string, limit, self.next_elements,
-                              _stacklevel=_stacklevel+1, **kwargs)
+        """Returns all items that match the given criteria and appear
+        after this Tag in the document."""
+        return self._find_all(name, attrs, text, limit, self.next_elements,
+                             **kwargs)
     findAllNext = find_all_next  # BS3
 
-    def find_next_sibling(self, name=None, attrs={}, string=None, **kwargs):
-        """Find the closest sibling to this PageElement that matches the
-        given criteria and appears later in the document.
-
-        All find_* methods take a common set of arguments. See the
-        online documentation for detailed explanations.
-
-        :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
-        :param string: A filter for a NavigableString with specific text.
-        :kwargs: A dictionary of filters on attribute values.
-        :return: A PageElement.
-        :rtype: bs4.element.Tag | bs4.element.NavigableString
-        """
-        return self._find_one(self.find_next_siblings, name, attrs, string,
+    def find_next_sibling(self, name=None, attrs={}, text=None, **kwargs):
+        """Returns the closest sibling to this Tag that matches the
+        given criteria and appears after this Tag in the document."""
+        return self._find_one(self.find_next_siblings, name, attrs, text,
                              **kwargs)
     findNextSibling = find_next_sibling  # BS3
 
-    def find_next_siblings(self, name=None, attrs={}, string=None, limit=None,
+    def find_next_siblings(self, name=None, attrs={}, text=None, limit=None,
                            **kwargs):
-        """Find all siblings of this PageElement that match the given criteria
-        and appear later in the document.
-
-        All find_* methods take a common set of arguments. See the online
-        documentation for detailed explanations.
-
-        :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
-        :param string: A filter for a NavigableString with specific text.
-        :param limit: Stop looking after finding this many results.
-        :kwargs: A dictionary of filters on attribute values.
-        :return: A ResultSet of PageElements.
-        :rtype: bs4.element.ResultSet
-        """
-        _stacklevel = kwargs.pop('_stacklevel', 2)
-        return self._find_all(
-            name, attrs, string, limit,
-            self.next_siblings, _stacklevel=_stacklevel+1, **kwargs
-        )
+        """Returns the siblings of this Tag that match the given
+        criteria and appear after this Tag in the document."""
+        return self._find_all(name, attrs, text, limit,
+                              self.next_siblings, **kwargs)
     findNextSiblings = find_next_siblings   # BS3
     fetchNextSiblings = find_next_siblings  # BS2
 
-    def find_previous(self, name=None, attrs={}, string=None, **kwargs):
-        """Look backwards in the document from this PageElement and find the
-        first PageElement that matches the given criteria.
-
-        All find_* methods take a common set of arguments. See the online
-        documentation for detailed explanations.
-
-        :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
-        :param string: A filter for a NavigableString with specific text.
-        :kwargs: A dictionary of filters on attribute values.
-        :return: A PageElement.
-        :rtype: bs4.element.Tag | bs4.element.NavigableString
-        """
+    def find_previous(self, name=None, attrs={}, text=None, **kwargs):
+        """Returns the first item that matches the given criteria and
+        appears before this Tag in the document."""
         return self._find_one(
-            self.find_all_previous, name, attrs, string, **kwargs)
+            self.find_all_previous, name, attrs, text, **kwargs)
     findPrevious = find_previous  # BS3
 
-    def find_all_previous(self, name=None, attrs={}, string=None, limit=None,
+    def find_all_previous(self, name=None, attrs={}, text=None, limit=None,
                         **kwargs):
-        """Look backwards in the document from this PageElement and find all
-        PageElements that match the given criteria.
-
-        All find_* methods take a common set of arguments. See the online
-        documentation for detailed explanations.
-
-        :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
-        :param string: A filter for a NavigableString with specific text.
-        :param limit: Stop looking after finding this many results.
-        :kwargs: A dictionary of filters on attribute values.
-        :return: A ResultSet of PageElements.
-        :rtype: bs4.element.ResultSet
-        """
-        _stacklevel = kwargs.pop('_stacklevel', 2)
-        return self._find_all(
-            name, attrs, string, limit, self.previous_elements,
-            _stacklevel=_stacklevel+1, **kwargs
-        )
+        """Returns all items that match the given criteria and appear
+        before this Tag in the document."""
+        return self._find_all(name, attrs, text, limit, self.previous_elements,
+                           **kwargs)
     findAllPrevious = find_all_previous  # BS3
     fetchPrevious = find_all_previous    # BS2
 
-    def find_previous_sibling(self, name=None, attrs={}, string=None, **kwargs):
-        """Returns the closest sibling to this PageElement that matches the
-        given criteria and appears earlier in the document.
-
-        All find_* methods take a common set of arguments. See the online
-        documentation for detailed explanations.
-
-        :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
-        :param string: A filter for a NavigableString with specific text.
-        :kwargs: A dictionary of filters on attribute values.
-        :return: A PageElement.
-        :rtype: bs4.element.Tag | bs4.element.NavigableString
-        """
-        return self._find_one(self.find_previous_siblings, name, attrs, string,
+    def find_previous_sibling(self, name=None, attrs={}, text=None, **kwargs):
+        """Returns the closest sibling to this Tag that matches the
+        given criteria and appears before this Tag in the document."""
+        return self._find_one(self.find_previous_siblings, name, attrs, text,
                              **kwargs)
     findPreviousSibling = find_previous_sibling  # BS3
 
-    def find_previous_siblings(self, name=None, attrs={}, string=None,
+    def find_previous_siblings(self, name=None, attrs={}, text=None,
                                limit=None, **kwargs):
-        """Returns all siblings to this PageElement that match the
-        given criteria and appear earlier in the document.
-
-        All find_* methods take a common set of arguments. See the online
-        documentation for detailed explanations.
-
-        :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
-        :param string: A filter for a NavigableString with specific text.
-        :param limit: Stop looking after finding this many results.
-        :kwargs: A dictionary of filters on attribute values.
-        :return: A ResultSet of PageElements.
-        :rtype: bs4.element.ResultSet
-        """
-        _stacklevel = kwargs.pop('_stacklevel', 2)
-        return self._find_all(
-            name, attrs, string, limit,
-            self.previous_siblings, _stacklevel=_stacklevel+1, **kwargs
-        )
+        """Returns the siblings of this Tag that match the given
+        criteria and appear before this Tag in the document."""
+        return self._find_all(name, attrs, text, limit,
+                              self.previous_siblings, **kwargs)
     findPreviousSiblings = find_previous_siblings   # BS3
     fetchPreviousSiblings = find_previous_siblings  # BS2
 
     def find_parent(self, name=None, attrs={}, **kwargs):
-        """Find the closest parent of this PageElement that matches the given
-        criteria.
-
-        All find_* methods take a common set of arguments. See the online
-        documentation for detailed explanations.
-
-        :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
-        :kwargs: A dictionary of filters on attribute values.
-
-        :return: A PageElement.
-        :rtype: bs4.element.Tag | bs4.element.NavigableString
-        """
+        """Returns the closest parent of this Tag that matches the given
+        criteria."""
         # NOTE: We can't use _find_one because findParents takes a different
         # set of arguments.
         r = None
-        l = self.find_parents(name, attrs, 1, _stacklevel=3, **kwargs)
+        l = self.find_parents(name, attrs, 1, **kwargs)
         if l:
             r = l[0]
         return r
     findParent = find_parent  # BS3
 
     def find_parents(self, name=None, attrs={}, limit=None, **kwargs):
-        """Find all parents of this PageElement that match the given criteria.
+        """Returns the parents of this Tag that match the given
+        criteria."""
 
-        All find_* methods take a common set of arguments. See the online
-        documentation for detailed explanations.
-
-        :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
-        :param limit: Stop looking after finding this many results.
-        :kwargs: A dictionary of filters on attribute values.
-
-        :return: A PageElement.
-        :rtype: bs4.element.Tag | bs4.element.NavigableString
-        """
-        _stacklevel = kwargs.pop('_stacklevel', 2)
         return self._find_all(name, attrs, None, limit, self.parents,
-                              _stacklevel=_stacklevel+1, **kwargs)
+                             **kwargs)
     findParents = find_parents   # BS3
     fetchParents = find_parents  # BS2
 
     @property
     def next(self):
-        """The PageElement, if any, that was parsed just after this one.
-
-        :return: A PageElement.
-        :rtype: bs4.element.Tag | bs4.element.NavigableString
-        """
         return self.next_element
 
     @property
     def previous(self):
-        """The PageElement, if any, that was parsed just before this one.
-
-        :return: A PageElement.
-        :rtype: bs4.element.Tag | bs4.element.NavigableString
-        """
         return self.previous_element
 
     #These methods do the real heavy lifting.
 
-    def _find_one(self, method, name, attrs, string, **kwargs):
+    def _find_one(self, method, name, attrs, text, **kwargs):
         r = None
-        l = method(name, attrs, string, 1, _stacklevel=4, **kwargs)
+        l = method(name, attrs, text, 1, **kwargs)
         if l:
             r = l[0]
         return r
 
-    def _find_all(self, name, attrs, string, limit, generator, **kwargs):
+    def _find_all(self, name, attrs, text, limit, generator, **kwargs):
         "Iterates over a generator looking for things that match."
-        _stacklevel = kwargs.pop('_stacklevel', 3)
-
-        if string is None and 'text' in kwargs:
-            string = kwargs.pop('text')
-            warnings.warn(
-                "The 'text' argument to find()-type methods is deprecated. Use 'string' instead.",
-                DeprecationWarning, stacklevel=_stacklevel
-            )
 
         if isinstance(name, SoupStrainer):
             strainer = name
         else:
-            strainer = SoupStrainer(name, attrs, string, **kwargs)
+            strainer = SoupStrainer(name, attrs, text, **kwargs)
 
-        if string is None and not limit and not attrs and not kwargs:
+        if text is None and not limit and not attrs and not kwargs:
             if name is True or name is None:
                 # Optimization to find all tags.
                 result = (element for element in generator
                           if isinstance(element, Tag))
                 return ResultSet(strainer, result)
-            elif isinstance(name, str):
+            elif isinstance(name, basestring):
                 # Optimization to find all tags with a given name.
-                if name.count(':') == 1:
-                    # This is a name with a prefix. If this is a namespace-aware document,
-                    # we need to match the local name against tag.name. If not,
-                    # we need to match the fully-qualified name against tag.name.
-                    prefix, local_name = name.split(':', 1)
-                else:
-                    prefix = None
-                    local_name = name
                 result = (element for element in generator
                           if isinstance(element, Tag)
-                          and (
-                              element.name == name
-                          ) or (
-                              element.name == local_name
-                              and (prefix is None or element.prefix == prefix)
-                          )
-                )
+                            and element.name == name)
                 return ResultSet(strainer, result)
         results = ResultSet(strainer)
         while True:
@@ -849,10 +513,6 @@ class PageElement(object):
     #NavigableStrings and Tags.
     @property
     def next_elements(self):
-        """All PageElements that were parsed after this one.
-
-        :yield: A sequence of PageElements.
-        """
         i = self.next_element
         while i is not None:
             yield i
@@ -860,11 +520,6 @@ class PageElement(object):
 
     @property
     def next_siblings(self):
-        """All PageElements that are siblings of this one but were parsed
-        later.
-
-        :yield: A sequence of PageElements.
-        """
         i = self.next_sibling
         while i is not None:
             yield i
@@ -872,10 +527,6 @@ class PageElement(object):
 
     @property
     def previous_elements(self):
-        """All PageElements that were parsed before this one.
-
-        :yield: A sequence of PageElements.
-        """
         i = self.previous_element
         while i is not None:
             yield i
@@ -883,11 +534,6 @@ class PageElement(object):
 
     @property
     def previous_siblings(self):
-        """All PageElements that are siblings of this one but were parsed
-        earlier.
-
-        :yield: A sequence of PageElements.
-        """
         i = self.previous_sibling
         while i is not None:
             yield i
@@ -895,23 +541,87 @@ class PageElement(object):
 
     @property
     def parents(self):
-        """All PageElements that are parents of this PageElement.
-
-        :yield: A sequence of PageElements.
-        """
         i = self.parent
         while i is not None:
             yield i
             i = i.parent
 
-    @property
-    def decomposed(self):
-        """Check whether a PageElement has been decomposed.
+    # Methods for supporting CSS selectors.
 
-        :rtype: bool
+    tag_name_re = re.compile('^[a-z0-9]+$')
+
+    # /^(\w+)\[(\w+)([=~\|\^\$\*]?)=?"?([^\]"]*)"?\]$/
+    #   \---/  \---/\-------------/    \-------/
+    #     |      |         |               |
+    #     |      |         |           The value
+    #     |      |    ~,|,^,$,* or =
+    #     |   Attribute
+    #    Tag
+    attribselect_re = re.compile(
+        r'^(?P<tag>\w+)?\[(?P<attribute>\w+)(?P<operator>[=~\|\^\$\*]?)' +
+        r'=?"?(?P<value>[^\]"]*)"?\]$'
+        )
+
+    def _attr_value_as_string(self, value, default=None):
+        """Force an attribute value into a string representation.
+
+        A multi-valued attribute will be converted into a
+        space-separated stirng.
         """
-        return getattr(self, '_decomposed', False) or False
-   
+        value = self.get(value, default)
+        if isinstance(value, list) or isinstance(value, tuple):
+            value =" ".join(value)
+        return value
+
+    def _tag_name_matches_and(self, function, tag_name):
+        if not tag_name:
+            return function
+        else:
+            def _match(tag):
+                return tag.name == tag_name and function(tag)
+            return _match
+
+    def _attribute_checker(self, operator, attribute, value=''):
+        """Create a function that performs a CSS selector operation.
+
+        Takes an operator, attribute and optional value. Returns a
+        function that will return True for elements that match that
+        combination.
+        """
+        if operator == '=':
+            # string representation of `attribute` is equal to `value`
+            return lambda el: el._attr_value_as_string(attribute) == value
+        elif operator == '~':
+            # space-separated list representation of `attribute`
+            # contains `value`
+            def _includes_value(element):
+                attribute_value = element.get(attribute, [])
+                if not isinstance(attribute_value, list):
+                    attribute_value = attribute_value.split()
+                return value in attribute_value
+            return _includes_value
+        elif operator == '^':
+            # string representation of `attribute` starts with `value`
+            return lambda el: el._attr_value_as_string(
+                attribute, '').startswith(value)
+        elif operator == '$':
+            # string represenation of `attribute` ends with `value`
+            return lambda el: el._attr_value_as_string(
+                attribute, '').endswith(value)
+        elif operator == '*':
+            # string representation of `attribute` contains `value`
+            return lambda el: value in el._attr_value_as_string(attribute, '')
+        elif operator == '|':
+            # string representation of `attribute` is either exactly
+            # `value` or starts with `value` and then a dash.
+            def _is_or_starts_with_dash(element):
+                attribute_value = element._attr_value_as_string(attribute, '')
+                return (attribute_value == value or attribute_value.startswith(
+                        value + '-'))
+            return _is_or_starts_with_dash
+        else:
+            return lambda el: el.has_attr(attribute)
+
     # Old non-property versions of the generators, for backwards
     # compatibility with BS3.
     def nextGenerator(self):
@@ -930,12 +640,7 @@ class PageElement(object):
         return self.parents
 
 
-class NavigableString(str, PageElement):
-    """A Python Unicode string that is part of a parse tree.
-
-    When Beautiful Soup parses the markup <b>penguin</b>, it will
-    create a NavigableString for the string "penguin".
-    """
+class NavigableString(unicode, PageElement):
 
     PREFIX = ''
     SUFFIX = ''
@@ -948,31 +653,15 @@ class NavigableString(str, PageElement):
         passed in to the superclass's __new__ or the superclass won't know
         how to handle non-ASCII characters.
         """
-        if isinstance(value, str):
-            u = str.__new__(cls, value)
-        else:
-            u = str.__new__(cls, value, DEFAULT_OUTPUT_ENCODING)
-        u.setup()
-        return u
-
-    def __deepcopy__(self, memo, recursive=False):
-        """A copy of a NavigableString has the same contents and class
-        as the original, but it is not connected to the parse tree.
-
-        :param recursive: This parameter is ignored; it's only defined
-           so that NavigableString.__deepcopy__ implements the same
-           signature as Tag.__deepcopy__.
-        """
-        return type(self)(self)
+        if isinstance(value, unicode):
+            return unicode.__new__(cls, value)
+        return unicode.__new__(cls, value, DEFAULT_OUTPUT_ENCODING)
 
     def __copy__(self):
-        """A copy of a NavigableString can only be a deep copy, because
-        only one PageElement can occupy a given place in a parse tree.
-        """
-        return self.__deepcopy__({})
+        return self
 
     def __getnewargs__(self):
-        return (str(self),)
+        return (unicode(self),)
 
     def __getattr__(self, attr):
         """text.string gives you text. This is for backwards
@@ -986,146 +675,55 @@ class NavigableString(str, PageElement):
                     self.__class__.__name__, attr))
 
     def output_ready(self, formatter="minimal"):
-        """Run the string through the provided formatter.
-
-        :param formatter: A Formatter object, or a string naming one of the standard formatters.
-        """
         output = self.format_string(self, formatter)
         return self.PREFIX + output + self.SUFFIX
 
     @property
     def name(self):
-        """Since a NavigableString is not a Tag, it has no .name.
-
-        This property is implemented so that code like this doesn't crash
-        when run on a mixture of Tag and NavigableString objects:
-            [x.name for x in tag.children]
-        """
         return None
 
     @name.setter
     def name(self, name):
-        """Prevent NavigableString.name from ever being set."""
         raise AttributeError("A NavigableString cannot be given a name.")
 
-    def _all_strings(self, strip=False, types=PageElement.default):
-        """Yield all strings of certain classes, possibly stripping them.
-
-        This makes it easy for NavigableString to implement methods
-        like get_text() as conveniences, creating a consistent
-        text-extraction API across all PageElements.
-
-        :param strip: If True, all strings will be stripped before being
-            yielded.
-
-        :param types: A tuple of NavigableString subclasses. If this
-            NavigableString isn't one of those subclasses, the
-            sequence will be empty. By default, the subclasses
-            considered are NavigableString and CData objects. That
-            means no comments, processing instructions, etc.
-
-        :yield: A sequence that either contains this string, or is empty.
-
-        """
-        if types is self.default:
-            # This is kept in Tag because it's full of subclasses of
-            # this class, which aren't defined until later in the file.
-            types = Tag.DEFAULT_INTERESTING_STRING_TYPES
-
-        # Do nothing if the caller is looking for specific types of
-        # string, and we're of a different type.
-        #
-        # We check specific types instead of using isinstance(self,
-        # types) because all of these classes subclass
-        # NavigableString. Anyone who's using this feature probably
-        # wants generic NavigableStrings but not other stuff.
-        my_type = type(self)
-        if types is not None:
-            if isinstance(types, type):
-                # Looking for a single type.
-                if my_type is not types:
-                    return
-            elif my_type not in types:
-                # Looking for one of a list of types.
-                return
-
-        value = self
-        if strip:
-            value = value.strip()
-        if len(value) > 0:
-            yield value
-    strings = property(_all_strings)
-
 class PreformattedString(NavigableString):
     """A NavigableString not subject to the normal formatting rules.
 
-    This is an abstract class used for special kinds of strings such
-    as comments (the Comment class) and CDATA blocks (the CData
-    class).
+    The string will be passed into the formatter (to trigger side effects),
+    but the return value will be ignored.
     """
 
-    PREFIX = ''
-    SUFFIX = ''
-
-    def output_ready(self, formatter=None):
-        """Make this string ready for output by adding any subclass-specific
-            prefix or suffix.
-
-        :param formatter: A Formatter object, or a string naming one
-            of the standard formatters. The string will be passed into the
-            Formatter, but only to trigger any side effects: the return
-            value is ignored.
-
-        :return: The string, with any subclass-specific prefix and
-           suffix added on.
-        """
-        if formatter is not None:
-            ignore = self.format_string(self, formatter)
+    def output_ready(self, formatter="minimal"):
+        """CData strings are passed into the formatter.
+        But the return value is ignored."""
+        self.format_string(self, formatter)
         return self.PREFIX + self + self.SUFFIX
 
 class CData(PreformattedString):
-    """A CDATA block."""
-    PREFIX = '<![CDATA['
-    SUFFIX = ']]>'
+
+    PREFIX = u'<![CDATA['
+    SUFFIX = u']]>'
 
 class ProcessingInstruction(PreformattedString):
-    """A SGML processing instruction."""
 
-    PREFIX = '<?'
-    SUFFIX = '>'
-
-class XMLProcessingInstruction(ProcessingInstruction):
-    """An XML processing instruction."""
-    PREFIX = '<?'
-    SUFFIX = '?>'
+    PREFIX = u'<?'
+    SUFFIX = u'?>'
 
 class Comment(PreformattedString):
-    """An HTML or XML comment."""
-    PREFIX = '<!--'
-    SUFFIX = '-->'
+
+    PREFIX = u'<!--'
+    SUFFIX = u'-->'
 
 
 class Declaration(PreformattedString):
-    """An XML declaration."""
-    PREFIX = '<?'
-    SUFFIX = '?>'
+    PREFIX = u'<!'
+    SUFFIX = u'!>'
 
 
 class Doctype(PreformattedString):
-    """A document type declaration."""
+
     @classmethod
     def for_name_and_ids(cls, name, pub_id, system_id):
-        """Generate an appropriate document type declaration for a given
-        public ID and system ID.
-
-        :param name: The name of the document's root element, e.g. 'html'.
-        :param pub_id: The Formal Public Identifier for this document type,
-            e.g. '-//W3C//DTD XHTML 1.1//EN'
-        :param system_id: The system identifier for this document type,
-            e.g. 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'
-
-        :return: A Doctype.
-        """
         value = name or ''
         if pub_id is not None:
             value += ' PUBLIC "%s"' % pub_id
@@ -1136,109 +734,18 @@ class Doctype(PreformattedString):
 
         return Doctype(value)
 
-    PREFIX = '<!DOCTYPE '
-    SUFFIX = '>\n'
-
-
-class Stylesheet(NavigableString):
-    """A NavigableString representing an stylesheet (probably
-    CSS).
-
-    Used to distinguish embedded stylesheets from textual content.
-    """
-    pass
-
-
-class Script(NavigableString):
-    """A NavigableString representing an executable script (probably
-    Javascript).
-
-    Used to distinguish executable code from textual content.
-    """
-    pass
-
-
-class TemplateString(NavigableString):
-    """A NavigableString representing a string found inside an HTML
-    template embedded in a larger document.
-
-    Used to distinguish such strings from the main body of the document.
-    """
-    pass
-
-
-class RubyTextString(NavigableString):
-    """A NavigableString representing the contents of the <rt> HTML
-    element.
-
-    https://dev.w3.org/html5/spec-LC/text-level-semantics.html#the-rt-element
-
-    Can be used to distinguish such strings from the strings they're
-    annotating.
-    """
-    pass
-
-
-class RubyParenthesisString(NavigableString):
-    """A NavigableString representing the contents of the <rp> HTML
-    element.
-
-    https://dev.w3.org/html5/spec-LC/text-level-semantics.html#the-rp-element
-    """
-    pass
+    PREFIX = u'<!DOCTYPE '
+    SUFFIX = u'>\n'
 
 
 class Tag(PageElement):
-    """Represents an HTML or XML tag that is part of a parse tree, along
-    with its attributes and contents.
 
-    When Beautiful Soup parses the markup <b>penguin</b>, it will
-    create a Tag object representing the <b> tag.
-    """
+    """Represents a found HTML tag with its attributes and contents."""
 
     def __init__(self, parser=None, builder=None, name=None, namespace=None,
-                 prefix=None, attrs=None, parent=None, previous=None,
-                 is_xml=None, sourceline=None, sourcepos=None,
-                 can_be_empty_element=None, cdata_list_attributes=None,
-                 preserve_whitespace_tags=None,
-                 interesting_string_types=None,
-                 namespaces=None
-    ):
-        """Basic constructor.
+                 prefix=None, attrs=None, parent=None, previous=None):
+        "Basic constructor."
 
-        :param parser: A BeautifulSoup object.
-        :param builder: A TreeBuilder.
-        :param name: The name of the tag.
-        :param namespace: The URI of this Tag's XML namespace, if any.
-        :param prefix: The prefix for this Tag's XML namespace, if any.
-        :param attrs: A dictionary of this Tag's attribute values.
-        :param parent: The PageElement to use as this Tag's parent.
-        :param previous: The PageElement that was parsed immediately before
-            this tag.
-        :param is_xml: If True, this is an XML tag. Otherwise, this is an
-            HTML tag.
-        :param sourceline: The line number where this tag was found in its
-            source document.
-        :param sourcepos: The character position within `sourceline` where this
-            tag was found.
-        :param can_be_empty_element: If True, this tag should be
-            represented as <tag/>. If False, this tag should be represented
-            as <tag></tag>.
-        :param cdata_list_attributes: A list of attributes whose values should
-            be treated as CDATA if they ever show up on this tag.
-        :param preserve_whitespace_tags: A list of tag names whose contents
-            should have their whitespace preserved.
-        :param interesting_string_types: This is a NavigableString
-            subclass or a tuple of them. When iterating over this
-            Tag's strings in methods like Tag.strings or Tag.get_text,
-            these are the types of strings that are interesting enough
-            to be considered. The default is to consider
-            NavigableString and CData the only interesting string
-            subtypes.
-        :param namespaces: A dictionary mapping currently active
-            namespace prefixes to URIs. This can be used later to
-            construct CSS selectors.
-        """
         if parser is None:
             self.parser_class = None
         else:
@@ -1249,125 +756,28 @@ class Tag(PageElement):
             raise ValueError("No value provided for new tag's name.")
         self.name = name
         self.namespace = namespace
-        self._namespaces = namespaces or {}
         self.prefix = prefix
-        if ((not builder or builder.store_line_numbers)
-            and (sourceline is not None or sourcepos is not None)):
-            self.sourceline = sourceline
-            self.sourcepos = sourcepos
         if attrs is None:
             attrs = {}
-        elif attrs:
-            if builder is not None and builder.cdata_list_attributes:
-                attrs = builder._replace_cdata_list_attribute_values(
-                    self.name, attrs)
-            else:
-                attrs = dict(attrs)
+        elif attrs and builder.cdata_list_attributes:
+            attrs = builder._replace_cdata_list_attribute_values(
+                self.name, attrs)
         else:
             attrs = dict(attrs)
-
-        # If possible, determine ahead of time whether this tag is an
-        # XML tag.
-        if builder:
-            self.known_xml = builder.is_xml
-        else:
-            self.known_xml = is_xml
         self.attrs = attrs
         self.contents = []
         self.setup(parent, previous)
         self.hidden = False
 
-        if builder is None:
-            # In the absence of a TreeBuilder, use whatever values were
-            # passed in here. They're probably None, unless this is a copy of some
-            # other tag.
-            self.can_be_empty_element = can_be_empty_element
-            self.cdata_list_attributes = cdata_list_attributes
-            self.preserve_whitespace_tags = preserve_whitespace_tags
-            self.interesting_string_types = interesting_string_types
-        else:
-            # Set up any substitutions for this tag, such as the charset in a META tag.
+        # Set up any substitutions, such as the charset in a META tag.
+        if builder is not None:
             builder.set_up_substitutions(self)
-
-            # Ask the TreeBuilder whether this tag might be an empty-element tag.
             self.can_be_empty_element = builder.can_be_empty_element(name)
-
-            # Keep track of the list of attributes of this tag that
-            # might need to be treated as a list.
-            #
-            # For performance reasons, we store the whole data structure
-            # rather than asking the question of every tag. Asking would
-            # require building a new data structure every time, and
-            # (unlike can_be_empty_element), we almost never need
-            # to check this.
-            self.cdata_list_attributes = builder.cdata_list_attributes
-
-            # Keep track of the names that might cause this tag to be treated as a
-            # whitespace-preserved tag.
-            self.preserve_whitespace_tags = builder.preserve_whitespace_tags
-
-            if self.name in builder.string_containers:
-                # This sort of tag uses a special string container
-                # subclass for most of its strings. When we ask the
-                self.interesting_string_types = builder.string_containers[self.name]
-            else:
-                self.interesting_string_types = self.DEFAULT_INTERESTING_STRING_TYPES
+        else:
+            self.can_be_empty_element = False
 
     parserClass = _alias("parser_class")  # BS3
 
-    def __deepcopy__(self, memo, recursive=True):
-        """A deepcopy of a Tag is a new Tag, unconnected to the parse tree.
-        Its contents are a copy of the old Tag's contents.
-        """
-        clone = self._clone()
-
-        if recursive:
-            # Clone this tag's descendants recursively, but without
-            # making any recursive function calls.
-            tag_stack = [clone]
-            for event, element in self._event_stream(self.descendants):
-                if event is Tag.END_ELEMENT_EVENT:
-                    # Stop appending incoming Tags to the Tag that was
-                    # just closed.
-                    tag_stack.pop()
-                else:
-                    descendant_clone = element.__deepcopy__(
-                        memo, recursive=False
-                    )
-                    # Add to its parent's .contents
-                    tag_stack[-1].append(descendant_clone)
-
-                    if event is Tag.START_ELEMENT_EVENT:
-                        # Add the Tag itself to the stack so that its
-                        # children will be .appended to it.
-                        tag_stack.append(descendant_clone)
-        return clone
-
-    def __copy__(self):
-        """A copy of a Tag must always be a deep copy, because a Tag's
-        children can only have one parent at a time.
-        """
-        return self.__deepcopy__({})
-
-    def _clone(self):
-        """Create a new Tag just like this one, but with no
-        contents and unattached to any parse tree.
-
-        This is the first step in the deepcopy process.
-        """
-        clone = type(self)(
-            None, None, self.name, self.namespace,
-            self.prefix, self.attrs, is_xml=self._is_xml,
-            sourceline=self.sourceline, sourcepos=self.sourcepos,
-            can_be_empty_element=self.can_be_empty_element,
-            cdata_list_attributes=self.cdata_list_attributes,
-            preserve_whitespace_tags=self.preserve_whitespace_tags,
-            interesting_string_types=self.interesting_string_types
-        )
-        for attr in ('can_be_empty_element', 'hidden'):
-            setattr(clone, attr, getattr(self, attr))
-        return clone
-    
     @property
     def is_empty_element(self):
         """Is this tag an empty-element tag? (aka a self-closing tag)
@@ -1388,17 +798,13 @@ class Tag(PageElement):
 
     @property
     def string(self):
-        """Convenience property to get the single string within this
-        PageElement.
+        """Convenience property to get the single string within this tag.
 
-        TODO It might make sense to have NavigableString.string return
-        itself.
-
-        :return: If this element has a single string child, return
-         value is that string. If this element has one child tag,
+        :Return: If this tag has a single string child, return value
+         is that string. If this tag has no children, or more than one
+         child, return value is None. If this tag has one child tag,
          return value is the 'string' attribute of the child tag,
-         recursively. If this element is itself a string, has no
-         children, or has more than one child, return value is None.
+         recursively.
         """
         if len(self.contents) != 1:
             return None
@@ -1409,75 +815,57 @@ class Tag(PageElement):
 
     @string.setter
     def string(self, string):
-        """Replace this PageElement's contents with `string`."""
         self.clear()
         self.append(string.__class__(string))
 
-    DEFAULT_INTERESTING_STRING_TYPES = (NavigableString, CData)
-    def _all_strings(self, strip=False, types=PageElement.default):
+    def _all_strings(self, strip=False, types=(NavigableString, CData)):
         """Yield all strings of certain classes, possibly stripping them.
 
-        :param strip: If True, all strings will be stripped before being
-            yielded.
-
-        :param types: A tuple of NavigableString subclasses. Any strings of
-            a subclass not found in this list will be ignored. By
-            default, the subclasses considered are the ones found in
-            self.interesting_string_types. If that's not specified,
-            only NavigableString and CData objects will be
-            considered. That means no comments, processing
-            instructions, etc.
-
-        :yield: A sequence of strings.
-
+        By default, yields only NavigableString and CData objects. So
+        no comments, processing instructions, etc.
         """
-        if types is self.default:
-            types = self.interesting_string_types
-
         for descendant in self.descendants:
-            if (types is None and not isinstance(descendant, NavigableString)):
-                continue
-            descendant_type = type(descendant)
-            if isinstance(types, type):
-                if descendant_type is not types:
-                    # We're not interested in strings of this type.
-                    continue
-            elif types is not None and descendant_type not in types:
-                # We're not interested in strings of this type.
+            if (
+                (types is None and not isinstance(descendant, NavigableString))
+                or
+                (types is not None and type(descendant) not in types)):
                 continue
             if strip:
                 descendant = descendant.strip()
                 if len(descendant) == 0:
                     continue
             yield descendant
+
     strings = property(_all_strings)
 
-    def decompose(self):
-        """Recursively destroys this PageElement and its children.
+    @property
+    def stripped_strings(self):
+        for string in self._all_strings(True):
+            yield string
 
-        This element will be removed from the tree and wiped out; so
-        will everything beneath it.
-
-        The behavior of a decomposed PageElement is undefined and you
-        should never use one for anything, but if you need to _check_
-        whether an element has been decomposed, you can use the
-        `decomposed` property.
+    def get_text(self, separator=u"", strip=False,
+                 types=(NavigableString, CData)):
         """
+        Get all child strings, concatenated using the given separator.
+        """
+        return separator.join([s for s in self._all_strings(
+                    strip, types=types)])
+    getText = get_text
+    text = property(get_text)
+
+    def decompose(self):
+        """Recursively destroys the contents of this tree."""
         self.extract()
         i = self
         while i is not None:
-            n = i.next_element
+            next = i.next_element
             i.__dict__.clear()
             i.contents = []
-            i._decomposed = True
-            i = n
+            i = next
 
     def clear(self, decompose=False):
-        """Wipe out all children of this PageElement by calling extract()
-           on them.
-
-        :param decompose: If this is True, decompose() (a more
-            destructive method) will be called instead of extract().
+        """
+        Extract all children. If decompose is True, decompose instead.
         """
         if decompose:
             for element in self.contents[:]:
@@ -1489,51 +877,10 @@ class Tag(PageElement):
             for element in self.contents[:]:
                 element.extract()
 
-    def smooth(self):
-        """Smooth out this element's children by consolidating consecutive
-        strings.
-
-        This makes pretty-printed output look more natural following a
-        lot of operations that modified the tree.
-        """
-        # Mark the first position of every pair of children that need
-        # to be consolidated.  Do this rather than making a copy of
-        # self.contents, since in most cases very few strings will be
-        # affected.
-        marked = []
-        for i, a in enumerate(self.contents):
-            if isinstance(a, Tag):
-                # Recursively smooth children.
-                a.smooth()
-            if i == len(self.contents)-1:
-                # This is the last item in .contents, and it's not a
-                # tag. There's no chance it needs any work.
-                continue
-            b = self.contents[i+1]
-            if (isinstance(a, NavigableString)
-                and isinstance(b, NavigableString)
-                and not isinstance(a, PreformattedString)
-                and not isinstance(b, PreformattedString)
-            ):
-                marked.append(i)
-
-        # Go over the marked positions in reverse order, so that
-        # removing items from .contents won't affect the remaining
-        # positions.
-        for i in reversed(marked):
-            a = self.contents[i]
-            b = self.contents[i+1]
-            b.extract()
-            n = NavigableString(a+b)
-            a.replace_with(n)
-
     def index(self, element):
-        """Find the index of a child by identity, not value.
-
-        Avoids issues with tag.contents.index(element) getting the
-        index of equal elements.
-
-        :param element: Look for this PageElement in `self.contents`.
+        """
+        Find the index of a child by identity, not value. Avoids issues with
+        tag.contents.index(element) getting the index of equal elements.
         """
         for i, child in enumerate(self.contents):
             if child is element:
@@ -1546,44 +893,29 @@ class Tag(PageElement):
         attribute."""
         return self.attrs.get(key, default)
 
-    def get_attribute_list(self, key, default=None):
-        """The same as get(), but always returns a list.
-
-        :param key: The attribute to look for.
-        :param default: Use this value if the attribute is not present
-            on this PageElement.
-        :return: A list of values, probably containing only a single
-            value.
-        """
-        value = self.get(key, default)
-        if not isinstance(value, list):
-            value = [value]
-        return value
-
     def has_attr(self, key):
-        """Does this PageElement have an attribute with the given name?"""
         return key in self.attrs
 
     def __hash__(self):
         return str(self).__hash__()
 
     def __getitem__(self, key):
-        """tag[key] returns the value of the 'key' attribute for the Tag,
+        """tag[key] returns the value of the 'key' attribute for the tag,
         and throws an exception if it's not there."""
         return self.attrs[key]
 
     def __iter__(self):
-        "Iterating over a Tag iterates over its contents."
+        "Iterating over a tag iterates over its contents."
         return iter(self.contents)
 
     def __len__(self):
-        "The length of a Tag is the length of its list of contents."
+        "The length of a tag is the length of its list of contents."
         return len(self.contents)
 
     def __contains__(self, x):
         return x in self.contents
 
-    def __bool__(self):
+    def __nonzero__(self):
         "A tag is non-None even if it has no contents."
         return True
 
@@ -1597,33 +929,29 @@ class Tag(PageElement):
         self.attrs.pop(key, None)
 
     def __call__(self, *args, **kwargs):
-        """Calling a Tag like a function is the same as calling its
+        """Calling a tag like a function is the same as calling its
         find_all() method. Eg. tag('a') returns a list of all the A tags
         found within this tag."""
         return self.find_all(*args, **kwargs)
 
     def __getattr__(self, tag):
-        """Calling tag.subtag is the same as calling tag.find(name="subtag")"""
-        #print("Getattr %s.%s" % (self.__class__, tag))
+        #print "Getattr %s.%s" % (self.__class__, tag)
         if len(tag) > 3 and tag.endswith('Tag'):
             # BS3: soup.aTag -> "soup.find("a")
             tag_name = tag[:-3]
             warnings.warn(
-                '.%(name)sTag is deprecated, use .find("%(name)s") instead. If you really were looking for a tag called %(name)sTag, use .find("%(name)sTag")' % dict(
-                    name=tag_name
-                ),
-                DeprecationWarning, stacklevel=2
-            )
+                '.%sTag is deprecated, use .find("%s") instead.' % (
+                    tag_name, tag_name))
             return self.find(tag_name)
         # We special case contents to avoid recursion.
-        elif not tag.startswith("__") and not tag == "contents":
+        elif not tag.startswith("__") and not tag=="contents":
             return self.find(tag)
         raise AttributeError(
             "'%s' object has no attribute '%s'" % (self.__class__, tag))
 
     def __eq__(self, other):
-        """Returns true iff this Tag has the same name, the same attributes,
-        and the same contents (recursively) as `other`."""
+        """Returns true iff this tag has the same name, the same attributes,
+        and the same contents (recursively) as the given tag."""
         if self is other:
             return True
         if (not hasattr(other, 'name') or
@@ -1639,289 +967,132 @@ class Tag(PageElement):
         return True
 
     def __ne__(self, other):
-        """Returns true iff this Tag is not identical to `other`,
+        """Returns true iff this tag is not identical to the other tag,
         as defined in __eq__."""
         return not self == other
 
-    def __repr__(self, encoding="unicode-escape"):
-        """Renders this PageElement as a string.
-
-        :param encoding: The encoding to use (Python 2 only).
-            TODO: This is now ignored and a warning should be issued
-            if a value is provided.
-        :return: A (Unicode) string.
-        """
-        # "The return value must be a string object", i.e. Unicode
-        return self.decode()
+    def __repr__(self, encoding=DEFAULT_OUTPUT_ENCODING):
+        """Renders this tag as a string."""
+        return self.encode(encoding)
 
     def __unicode__(self):
-        """Renders this PageElement as a Unicode string."""
         return self.decode()
 
-    __str__ = __repr__ = __unicode__
+    def __str__(self):
+        return self.encode()
+
+    if PY3K:
+        __str__ = __repr__ = __unicode__
 
     def encode(self, encoding=DEFAULT_OUTPUT_ENCODING,
                indent_level=None, formatter="minimal",
                errors="xmlcharrefreplace"):
-        """Render a bytestring representation of this PageElement and its
-        contents.
-
-        :param encoding: The destination encoding.
-        :param indent_level: Each line of the rendering will be
-           indented this many levels. (The formatter decides what a
-           'level' means in terms of spaces or other characters
-           output.) Used internally in recursive calls while
-           pretty-printing.
-        :param formatter: A Formatter object, or a string naming one of
-            the standard formatters.
-        :param errors: An error handling strategy such as
-            'xmlcharrefreplace'. This value is passed along into
-            encode() and its value should be one of the constants
-            defined by Python.
-        :return: A bytestring.
-
-        """
         # Turn the data structure into Unicode, then encode the
         # Unicode.
         u = self.decode(indent_level, encoding, formatter)
         return u.encode(encoding, errors)
 
+    def _should_pretty_print(self, indent_level):
+        """Should this tag be pretty-printed?"""
+        return (
+            indent_level is not None and
+            (self.name not in HTMLAwareEntitySubstitution.preformatted_tags
+             or self._is_xml))
+
     def decode(self, indent_level=None,
                eventual_encoding=DEFAULT_OUTPUT_ENCODING,
-               formatter="minimal",
-               iterator=None):
-        pieces = []
-        # First off, turn a non-Formatter `formatter` into a Formatter
-        # object. This will stop the lookup from happening over and
-        # over again.
-        if not isinstance(formatter, Formatter):
-            formatter = self.formatter_for_name(formatter)
+               formatter="minimal"):
+        """Returns a Unicode representation of this tag and its contents.
 
-        if indent_level is True:
-            indent_level = 0
-
-        # The currently active tag that put us into string literal
-        # mode. Until this element is closed, children will be treated
-        # as string literals and not pretty-printed. String literal
-        # mode is turned on immediately after this tag begins, and
-        # turned off immediately before it's closed. This means there
-        # will be whitespace before and after the tag itself.
-        string_literal_tag = None
-
-        for event, element in self._event_stream(iterator):
-            if event in (Tag.START_ELEMENT_EVENT, Tag.EMPTY_ELEMENT_EVENT):
-                piece = element._format_tag(
-                    eventual_encoding, formatter, opening=True
-                )
-            elif event is Tag.END_ELEMENT_EVENT:
-                piece = element._format_tag(
-                    eventual_encoding, formatter, opening=False
-                )
-                if indent_level is not None:
-                    indent_level -= 1
-            else:
-                piece = element.output_ready(formatter)
-
-            # Now we need to apply the 'prettiness' -- extra
-            # whitespace before and/or after this tag. This can get
-            # complicated because certain tags, like <pre> and
-            # <script>, can't be prettified, since adding whitespace would
-            # change the meaning of the content.
-
-            # The default behavior is to add whitespace before and
-            # after an element when string literal mode is off, and to
-            # leave things as they are when string literal mode is on.
-            if string_literal_tag:
-                indent_before = indent_after = False
-            else:
-                indent_before = indent_after = True
-
-            # The only time the behavior is more complex than that is
-            # when we encounter an opening or closing tag that might
-            # put us into or out of string literal mode.
-            if (event is Tag.START_ELEMENT_EVENT
-                and not string_literal_tag
-                and not element._should_pretty_print()):
-                    # We are about to enter string literal mode. Add
-                    # whitespace before this tag, but not after. We
-                    # will stay in string literal mode until this tag
-                    # is closed.
-                    indent_before = True
-                    indent_after = False
-                    string_literal_tag = element
-            elif (event is Tag.END_ELEMENT_EVENT
-                  and element is string_literal_tag):
-                # We are about to exit string literal mode by closing
-                # the tag that sent us into that mode. Add whitespace
-                # after this tag, but not before.
-                indent_before = False
-                indent_after = True
-                string_literal_tag = None
-
-            # Now we know whether to add whitespace before and/or
-            # after this element.
-            if indent_level is not None:
-                if (indent_before or indent_after):
-                    if isinstance(element, NavigableString):
-                        piece = piece.strip()
-                    if piece:
-                        piece = self._indent_string(
-                            piece, indent_level, formatter,
-                            indent_before, indent_after
-                        )
-                if event == Tag.START_ELEMENT_EVENT:
-                    indent_level += 1
-            pieces.append(piece)
-        return "".join(pieces)
-
-    # Names for the different events yielded by _event_stream
-    START_ELEMENT_EVENT = object()
-    END_ELEMENT_EVENT = object()
-    EMPTY_ELEMENT_EVENT = object()
-    STRING_ELEMENT_EVENT = object()
-
-    def _event_stream(self, iterator=None):
-        """Yield a sequence of events that can be used to reconstruct the DOM
-        for this element.
-
-        This lets us recreate the nested structure of this element
-        (e.g. when formatting it as a string) without using recursive
-        method calls.
-
-        This is similar in concept to the SAX API, but it's a simpler
-        interface designed for internal use. The events are different
-        from SAX and the arguments associated with the events are Tags
-        and other Beautiful Soup objects.
-
-        :param iterator: An alternate iterator to use when traversing
-         the tree.
+        :param eventual_encoding: The tag is destined to be
+           encoded into this encoding. This method is _not_
+           responsible for performing that encoding. This information
+           is passed in so that it can be substituted in if the
+           document contains a <META> tag that mentions the document's
+           encoding.
         """
-        tag_stack = []
 
-        iterator = iterator or self.self_and_descendants
+        # First off, turn a string formatter into a function. This
+        # will stop the lookup from happening over and over again.
+        if not callable(formatter):
+            formatter = self._formatter_for_name(formatter)
 
-        for c in iterator:
-            # If the parent of the element we're about to yield is not
-            # the tag currently on the stack, it means that the tag on
-            # the stack closed before this element appeared.
-            while tag_stack and c.parent != tag_stack[-1]:
-                now_closed_tag = tag_stack.pop()
-                yield Tag.END_ELEMENT_EVENT, now_closed_tag
-
-            if isinstance(c, Tag):
-                if c.is_empty_element:
-                    yield Tag.EMPTY_ELEMENT_EVENT, c
-                else:
-                    yield Tag.START_ELEMENT_EVENT, c
-                    tag_stack.append(c)
-                    continue
-            else:
-                yield Tag.STRING_ELEMENT_EVENT, c
-
-        while tag_stack:
-            now_closed_tag = tag_stack.pop()
-            yield Tag.END_ELEMENT_EVENT, now_closed_tag
-
-    def _indent_string(self, s, indent_level, formatter,
-                       indent_before, indent_after):
-        """Add indentation whitespace before and/or after a string.
-
-        :param s: The string to amend with whitespace.
-        :param indent_level: The indentation level; affects how much
-           whitespace goes before the string.
-        :param indent_before: Whether or not to add whitespace
-           before the string.
-        :param indent_after: Whether or not to add whitespace
-           (a newline) after the string.
-        """
-        space_before = ''
-        if indent_before and indent_level:
-            space_before = (formatter.indent * indent_level)
-
-        space_after = ''
-        if indent_after:
-            space_after = "\n"
-
-        return space_before + s + space_after
-
-    def _format_tag(self, eventual_encoding, formatter, opening):
-        if self.hidden:
-            # A hidden tag is invisible, although its contents
-            # are visible.
-            return ''
-
-        # A tag starts with the < character (see below).
-
-        # Then the / character, if this is a closing tag.
-        closing_slash = ''
-        if not opening:
-            closing_slash = '/'
-
-        # Then an optional namespace prefix.
-        prefix = ''
-        if self.prefix:
-            prefix = self.prefix + ":"
-
-        # Then a list of attribute values, if this is an opening tag.
-        attribute_string = ''
-        if opening:
-            attributes = formatter.attributes(self)
-            attrs = []
-            for key, val in attributes:
+        attrs = []
+        if self.attrs:
+            for key, val in sorted(self.attrs.items()):
                 if val is None:
                     decoded = key
                 else:
                     if isinstance(val, list) or isinstance(val, tuple):
                         val = ' '.join(val)
-                    elif not isinstance(val, str):
-                        val = str(val)
+                    elif not isinstance(val, basestring):
+                        val = unicode(val)
                     elif (
-                            isinstance(val, AttributeValueWithCharsetSubstitution)
-                            and eventual_encoding is not None
-                    ):
+                        isinstance(val, AttributeValueWithCharsetSubstitution)
+                        and eventual_encoding is not None):
                         val = val.encode(eventual_encoding)
 
-                    text = formatter.attribute_value(val)
+                    text = self.format_string(val, formatter)
                     decoded = (
-                        str(key) + '='
-                        + formatter.quoted_attribute_value(text))
+                        unicode(key) + '='
+                        + EntitySubstitution.quoted_attribute_value(text))
                 attrs.append(decoded)
+        close = ''
+        closeTag = ''
+
+        prefix = ''
+        if self.prefix:
+            prefix = self.prefix + ":"
+
+        if self.is_empty_element:
+            close = '/'
+        else:
+            closeTag = '</%s%s>' % (prefix, self.name)
+
+        pretty_print = self._should_pretty_print(indent_level)
+        space = ''
+        indent_space = ''
+        if indent_level is not None:
+            indent_space = (' ' * (indent_level - 1))
+        if pretty_print:
+            space = indent_space
+            indent_contents = indent_level + 1
+        else:
+            indent_contents = None
+        contents = self.decode_contents(
+            indent_contents, eventual_encoding, formatter)
+
+        if self.hidden:
+            # This is the 'document root' object.
+            s = contents
+        else:
+            s = []
+            attribute_string = ''
             if attrs:
                 attribute_string = ' ' + ' '.join(attrs)
-
-        # Then an optional closing slash (for a void element in an
-        # XML document).
-        void_element_closing_slash = ''
-        if self.is_empty_element:
-            void_element_closing_slash = formatter.void_element_close_prefix or ''
-
-        # Put it all together.
-        return '<' + closing_slash + prefix + self.name + attribute_string + void_element_closing_slash + '>'
-
-    def _should_pretty_print(self, indent_level=1):
-        """Should this tag be pretty-printed?
-
-        Most of them should, but some (such as <pre> in HTML
-        documents) should not.
-        """
-        return (
-            indent_level is not None
-            and (
-                not self.preserve_whitespace_tags
-                or self.name not in self.preserve_whitespace_tags
-            )
-        )
+            if indent_level is not None:
+                # Even if this particular tag is not pretty-printed,
+                # we should indent up to the start of the tag.
+                s.append(indent_space)
+            s.append('<%s%s%s%s>' % (
+                    prefix, self.name, attribute_string, close))
+            if pretty_print:
+                s.append("\n")
+            s.append(contents)
+            if pretty_print and contents and contents[-1] != "\n":
+                s.append("\n")
+            if pretty_print and closeTag:
+                s.append(space)
+            s.append(closeTag)
+            if indent_level is not None and closeTag and self.next_sibling:
+                # Even if this particular tag is not pretty-printed,
+                # we're now done with the tag, and we should add a
+                # newline if appropriate.
+                s.append("\n")
+            s = ''.join(s)
+        return s
 
     def prettify(self, encoding=None, formatter="minimal"):
-        """Pretty-print this PageElement as a string.
-
-        :param encoding: The eventual encoding of the string. If this is None,
-            a Unicode string will be returned.
-        :param formatter: A Formatter object, or a string naming one of
-            the standard formatters.
-        :return: A Unicode string (if encoding==None) or a bytestring
-            (otherwise).
-        """
         if encoding is None:
             return self.decode(True, formatter=formatter)
         else:
@@ -1932,51 +1103,47 @@ class Tag(PageElement):
                        formatter="minimal"):
         """Renders the contents of this tag as a Unicode string.
 
-        :param indent_level: Each line of the rendering will be
-           indented this many levels. (The formatter decides what a
-           'level' means in terms of spaces or other characters
-           output.) Used internally in recursive calls while
-           pretty-printing.
-
         :param eventual_encoding: The tag is destined to be
-           encoded into this encoding. decode_contents() is _not_
+           encoded into this encoding. This method is _not_
            responsible for performing that encoding. This information
            is passed in so that it can be substituted in if the
            document contains a <META> tag that mentions the document's
            encoding.
-
-        :param formatter: A Formatter object, or a string naming one of
-            the standard Formatters.
-
         """
-        return self.decode(indent_level, eventual_encoding, formatter,
-                           iterator=self.descendants)
+        # First off, turn a string formatter into a function. This
+        # will stop the lookup from happening over and over again.
+        if not callable(formatter):
+            formatter = self._formatter_for_name(formatter)
+
+        pretty_print = (indent_level is not None)
+        s = []
+        for c in self:
+            text = None
+            if isinstance(c, NavigableString):
+                text = c.output_ready(formatter)
+            elif isinstance(c, Tag):
+                s.append(c.decode(indent_level, eventual_encoding,
+                                  formatter))
+            if text and indent_level and not self.name == 'pre':
+                text = text.strip()
+            if text:
+                if pretty_print and not self.name == 'pre':
+                    s.append(" " * (indent_level - 1))
+                s.append(text)
+                if pretty_print and not self.name == 'pre':
+                    s.append("\n")
+        return ''.join(s)
 
     def encode_contents(
         self, indent_level=None, encoding=DEFAULT_OUTPUT_ENCODING,
         formatter="minimal"):
-        """Renders the contents of this PageElement as a bytestring.
-
-        :param indent_level: Each line of the rendering will be
-           indented this many levels. (The formatter decides what a
-           'level' means in terms of spaces or other characters
-           output.) Used internally in recursive calls while
-           pretty-printing.
-
-        :param eventual_encoding: The bytestring will be in this encoding.
-
-        :param formatter: A Formatter object, or a string naming one of
-            the standard Formatters.
-
-        :return: A bytestring.
-        """
+        """Renders the contents of this tag as a bytestring."""
         contents = self.decode_contents(indent_level, encoding, formatter)
         return contents.encode(encoding)
 
     # Old method for BS3 compatibility
     def renderContents(self, encoding=DEFAULT_OUTPUT_ENCODING,
                        prettyPrint=False, indentLevel=0):
-        """Deprecated method for BS3 compatibility."""
         if not prettyPrint:
             indentLevel = None
         return self.encode_contents(
@@ -1984,88 +1151,44 @@ class Tag(PageElement):
 
     #Soup methods
 
-    def find(self, name=None, attrs={}, recursive=True, string=None,
+    def find(self, name=None, attrs={}, recursive=True, text=None,
              **kwargs):
-        """Look in the children of this PageElement and find the first
-        PageElement that matches the given criteria.
-
-        All find_* methods take a common set of arguments. See the online
-        documentation for detailed explanations.
-
-        :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
-        :param recursive: If this is True, find() will perform a
-            recursive search of this PageElement's children. Otherwise,
-            only the direct children will be considered.
-        :param limit: Stop looking after finding this many results.
-        :kwargs: A dictionary of filters on attribute values.
-        :return: A PageElement.
-        :rtype: bs4.element.Tag | bs4.element.NavigableString
-        """
+        """Return only the first child of this Tag matching the given
+        criteria."""
         r = None
-        l = self.find_all(name, attrs, recursive, string, 1, _stacklevel=3,
-                          **kwargs)
+        l = self.find_all(name, attrs, recursive, text, 1, **kwargs)
         if l:
             r = l[0]
         return r
-    findChild = find #BS2
+    findChild = find
 
-    def find_all(self, name=None, attrs={}, recursive=True, string=None,
+    def find_all(self, name=None, attrs={}, recursive=True, text=None,
                  limit=None, **kwargs):
-        """Look in the children of this PageElement and find all
-        PageElements that match the given criteria.
+        """Extracts a list of Tag objects that match the given
+        criteria.  You can specify the name of the Tag and any
+        attributes you want the Tag to have.
 
-        All find_* methods take a common set of arguments. See the online
-        documentation for detailed explanations.
+        The value of a key-value pair in the 'attrs' map can be a
+        string, a list of strings, a regular expression object, or a
+        callable that takes a string and returns whether or not the
+        string matches for some custom definition of 'matches'. The
+        same is true of the tag name."""
 
-        :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
-        :param recursive: If this is True, find_all() will perform a
-            recursive search of this PageElement's children. Otherwise,
-            only the direct children will be considered.
-        :param limit: Stop looking after finding this many results.
-        :kwargs: A dictionary of filters on attribute values.
-        :return: A ResultSet of PageElements.
-        :rtype: bs4.element.ResultSet
-        """
         generator = self.descendants
         if not recursive:
             generator = self.children
-        _stacklevel = kwargs.pop('_stacklevel', 2)
-        return self._find_all(name, attrs, string, limit, generator,
-                              _stacklevel=_stacklevel+1, **kwargs)
+        return self._find_all(name, attrs, text, limit, generator, **kwargs)
     findAll = find_all       # BS3
     findChildren = find_all  # BS2
 
     #Generator methods
     @property
     def children(self):
-        """Iterate over all direct children of this PageElement.
-
-        :yield: A sequence of PageElements.
-        """
         # return iter() to make the purpose of the method clear
         return iter(self.contents)  # XXX This seems to be untested.
 
-    @property
-    def self_and_descendants(self):
-        """Iterate over this PageElement and its children in a
-        breadth-first sequence.
-
-        :yield: A sequence of PageElements.
-        """
-        if not self.hidden:
-            yield self
-        for i in self.descendants:
-            yield i
-
     @property
     def descendants(self):
-        """Iterate over all children of this PageElement in a
-        breadth-first sequence.
-
-        :yield: A sequence of PageElements.
-        """
         if not len(self.contents):
             return
         stopNode = self._last_descendant().next_element
@@ -2075,102 +1198,227 @@ class Tag(PageElement):
             current = current.next_element
 
     # CSS selector code
-    def select_one(self, selector, namespaces=None, **kwargs):
-        """Perform a CSS selection operation on the current element.
 
-        :param selector: A CSS selector.
+    _selector_combinators = ['>', '+', '~']
+    _select_debug = False
+    def select(self, selector, _candidate_generator=None):
+        """Perform a CSS selection operation on the current element."""
+        tokens = selector.split()
+        current_context = [self]
 
-        :param namespaces: A dictionary mapping namespace prefixes
-           used in the CSS selector to namespace URIs. By default,
-           Beautiful Soup will use the prefixes it encountered while
-           parsing the document.
+        if tokens[-1] in self._selector_combinators:
+            raise ValueError(
+                'Final combinator "%s" is missing an argument.' % tokens[-1])
+        if self._select_debug:
+            print 'Running CSS selector "%s"' % selector
+        for index, token in enumerate(tokens):
+            if self._select_debug:
+                print ' Considering token "%s"' % token
+            recursive_candidate_generator = None
+            tag_name = None
+            if tokens[index-1] in self._selector_combinators:
+                # This token was consumed by the previous combinator. Skip it.
+                if self._select_debug:
+                    print '  Token was consumed by the previous combinator.'
+                continue
+            # Each operation corresponds to a checker function, a rule
+            # for determining whether a candidate matches the
+            # selector. Candidates are generated by the active
+            # iterator.
+            checker = None
 
-        :param kwargs: Keyword arguments to be passed into Soup Sieve's
-           soupsieve.select() method.
+            m = self.attribselect_re.match(token)
+            if m is not None:
+                # Attribute selector
+                tag_name, attribute, operator, value = m.groups()
+                checker = self._attribute_checker(operator, attribute, value)
 
-        :return: A Tag.
-        :rtype: bs4.element.Tag
-        """
-        return self.css.select_one(selector, namespaces, **kwargs)
+            elif '#' in token:
+                # ID selector
+                tag_name, tag_id = token.split('#', 1)
+                def id_matches(tag):
+                    return tag.get('id', None) == tag_id
+                checker = id_matches
 
-    def select(self, selector, namespaces=None, limit=None, **kwargs):
-        """Perform a CSS selection operation on the current element.
+            elif '.' in token:
+                # Class selector
+                tag_name, klass = token.split('.', 1)
+                classes = set(klass.split('.'))
+                def classes_match(candidate):
+                    return classes.issubset(candidate.get('class', []))
+                checker = classes_match
 
-        This uses the SoupSieve library.
+            elif ':' in token:
+                # Pseudo-class
+                tag_name, pseudo = token.split(':', 1)
+                if tag_name == '':
+                    raise ValueError(
+                        "A pseudo-class must be prefixed with a tag name.")
+                pseudo_attributes = re.match('([a-zA-Z\d-]+)\(([a-zA-Z\d]+)\)', pseudo)
+                found = []
+                if pseudo_attributes is not None:
+                    pseudo_type, pseudo_value = pseudo_attributes.groups()
+                    if pseudo_type == 'nth-of-type':
+                        try:
+                            pseudo_value = int(pseudo_value)
+                        except:
+                            raise NotImplementedError(
+                                'Only numeric values are currently supported for the nth-of-type pseudo-class.')
+                        if pseudo_value < 1:
+                            raise ValueError(
+                                'nth-of-type pseudo-class value must be at least 1.')
+                        class Counter(object):
+                            def __init__(self, destination):
+                                self.count = 0
+                                self.destination = destination
 
-        :param selector: A string containing a CSS selector.
+                            def nth_child_of_type(self, tag):
+                                self.count += 1
+                                if self.count == self.destination:
+                                    return True
+                                if self.count > self.destination:
+                                    # Stop the generator that's sending us
+                                    # these things.
+                                    raise StopIteration()
+                                return False
+                        checker = Counter(pseudo_value).nth_child_of_type
+                    else:
+                        raise NotImplementedError(
+                            'Only the following pseudo-classes are implemented: nth-of-type.')
 
-        :param namespaces: A dictionary mapping namespace prefixes
-           used in the CSS selector to namespace URIs. By default,
-           Beautiful Soup will use the prefixes it encountered while
-           parsing the document.
+            elif token == '*':
+                # Star selector -- matches everything
+                pass
+            elif token == '>':
+                # Run the next token as a CSS selector against the
+                # direct children of each tag in the current context.
+                recursive_candidate_generator = lambda tag: tag.children
+            elif token == '~':
+                # Run the next token as a CSS selector against the
+                # siblings of each tag in the current context.
+                recursive_candidate_generator = lambda tag: tag.next_siblings
+            elif token == '+':
+                # For each tag in the current context, run the next
+                # token as a CSS selector against the tag's next
+                # sibling that's a tag.
+                def next_tag_sibling(tag):
+                    yield tag.find_next_sibling(True)
+                recursive_candidate_generator = next_tag_sibling
 
-        :param limit: After finding this number of results, stop looking.
+            elif self.tag_name_re.match(token):
+                # Just a tag name.
+                tag_name = token
+            else:
+                raise ValueError(
+                    'Unsupported or invalid CSS selector: "%s"' % token)
 
-        :param kwargs: Keyword arguments to be passed into SoupSieve's
-           soupsieve.select() method.
+            if recursive_candidate_generator:
+                # This happens when the selector looks like  "> foo".
+                #
+                # The generator calls select() recursively on every
+                # member of the current context, passing in a different
+                # candidate generator and a different selector.
+                #
+                # In the case of "> foo", the candidate generator is
+                # one that yields a tag's direct children (">"), and
+                # the selector is "foo".
+                next_token = tokens[index+1]
+                def recursive_select(tag):
+                    if self._select_debug:
+                        print '    Calling select("%s") recursively on %s %s' % (next_token, tag.name, tag.attrs)
+                        print '-' * 40
+                    for i in tag.select(next_token, recursive_candidate_generator):
+                        if self._select_debug:
+                            print '(Recursive select picked up candidate %s %s)' % (i.name, i.attrs)
+                        yield i
+                    if self._select_debug:
+                        print '-' * 40
+                _use_candidate_generator = recursive_select
+            elif _candidate_generator is None:
+                # By default, a tag's candidates are all of its
+                # children. If tag_name is defined, only yield tags
+                # with that name.
+                if self._select_debug:
+                    if tag_name:
+                        check = "[any]"
+                    else:
+                        check = tag_name
+                    print '   Default candidate generator, tag name="%s"' % check
+                if self._select_debug:
+                    # This is redundant with later code, but it stops
+                    # a bunch of bogus tags from cluttering up the
+                    # debug log.
+                    def default_candidate_generator(tag):
+                        for child in tag.descendants:
+                            if not isinstance(child, Tag):
+                                continue
+                            if tag_name and not child.name == tag_name:
+                                continue
+                            yield child
+                    _use_candidate_generator = default_candidate_generator
+                else:
+                    _use_candidate_generator = lambda tag: tag.descendants
+            else:
+                _use_candidate_generator = _candidate_generator
 
-        :return: A ResultSet of Tags.
-        :rtype: bs4.element.ResultSet
-        """
-        return self.css.select(selector, namespaces, limit, **kwargs)
+            new_context = []
+            new_context_ids = set([])
+            for tag in current_context:
+                if self._select_debug:
+                    print "    Running candidate generator on %s %s" % (
+                        tag.name, repr(tag.attrs))
+                for candidate in _use_candidate_generator(tag):
+                    if not isinstance(candidate, Tag):
+                        continue
+                    if tag_name and candidate.name != tag_name:
+                        continue
+                    if checker is not None:
+                        try:
+                            result = checker(candidate)
+                        except StopIteration:
+                            # The checker has decided we should no longer
+                            # run the generator.
+                            break
+                    if checker is None or result:
+                        if self._select_debug:
+                            print "     SUCCESS %s %s" % (candidate.name, repr(candidate.attrs))
+                        if id(candidate) not in new_context_ids:
+                            # If a tag matches a selector more than once,
+                            # don't include it in the context more than once.
+                            new_context.append(candidate)
+                            new_context_ids.add(id(candidate))
+                    elif self._select_debug:
+                        print "     FAILURE %s %s" % (candidate.name, repr(candidate.attrs))
 
-    @property
-    def css(self):
-        """Return an interface to the CSS selector API."""
-        return CSS(self)
+            current_context = new_context
+
+        if self._select_debug:
+            print "Final verdict:"
+            for i in current_context:
+                print " %s %s" % (i.name, i.attrs)
+        return current_context
 
     # Old names for backwards compatibility
     def childGenerator(self):
-        """Deprecated generator."""
         return self.children
 
     def recursiveChildGenerator(self):
-        """Deprecated generator."""
         return self.descendants
 
     def has_key(self, key):
-        """Deprecated method. This was kind of misleading because has_key()
-        (attributes) was different from __in__ (contents).
-
-        has_key() is gone in Python 3, anyway.
-        """
-        warnings.warn(
-            'has_key is deprecated. Use has_attr(key) instead.',
-            DeprecationWarning, stacklevel=2
-        )
+        """This was kind of misleading because has_key() (attributes)
+        was different from __in__ (contents). has_key() is gone in
+        Python 3, anyway."""
+        warnings.warn('has_key is deprecated. Use has_attr("%s") instead.' % (
+                key))
         return self.has_attr(key)
 
 # Next, a couple classes to represent queries and their results.
 class SoupStrainer(object):
     """Encapsulates a number of ways of matching a markup element (tag or
-    string).
-
-    This is primarily used to underpin the find_* methods, but you can
-    create one yourself and pass it in as `parse_only` to the
-    `BeautifulSoup` constructor, to parse a subset of a large
-    document.
-    """
-
-    def __init__(self, name=None, attrs={}, string=None, **kwargs):
-        """Constructor.
-
-        The SoupStrainer constructor takes the same arguments passed
-        into the find_* methods. See the online documentation for
-        detailed explanations.
-
-        :param name: A filter on tag name.
-        :param attrs: A dictionary of filters on attribute values.
-        :param string: A filter for a NavigableString with specific text.
-        :kwargs: A dictionary of filters on attribute values.
-        """
-        if string is None and 'text' in kwargs:
-            string = kwargs.pop('text')
-            warnings.warn(
-                "The 'text' argument to the SoupStrainer constructor is deprecated. Use 'string' instead.",
-                DeprecationWarning, stacklevel=2
-            )
+    text)."""
 
+    def __init__(self, name=None, attrs={}, text=None, **kwargs):
         self.name = self._normalize_search_value(name)
         if not isinstance(attrs, dict):
             # Treat a non-dict value for attrs as a search for the 'class'
@@ -2191,19 +1439,16 @@ class SoupStrainer(object):
             else:
                 attrs = kwargs
         normalized_attrs = {}
-        for key, value in list(attrs.items()):
+        for key, value in attrs.items():
             normalized_attrs[key] = self._normalize_search_value(value)
 
         self.attrs = normalized_attrs
-        self.string = self._normalize_search_value(string)
-
-        # DEPRECATED but just in case someone is checking this.
-        self.text = self.string
+        self.text = self._normalize_search_value(text)
 
     def _normalize_search_value(self, value):
         # Leave it alone if it's a Unicode string, a callable, a
         # regular expression, a boolean, or None.
-        if (isinstance(value, str) or isinstance(value, Callable) or hasattr(value, 'match')
+        if (isinstance(value, unicode) or callable(value) or hasattr(value, 'match')
             or isinstance(value, bool) or value is None):
             return value
 
@@ -2216,7 +1461,7 @@ class SoupStrainer(object):
             new_value = []
             for v in value:
                 if (hasattr(v, '__iter__') and not isinstance(v, bytes)
-                    and not isinstance(v, str)):
+                    and not isinstance(v, unicode)):
                     # This is almost certainly the user's mistake. In the
                     # interests of avoiding infinite loops, we'll let
                     # it through as-is rather than doing a recursive call.
@@ -2228,43 +1473,22 @@ class SoupStrainer(object):
         # Otherwise, convert it into a Unicode string.
         # The unicode(str()) thing is so this will do the same thing on Python 2
         # and Python 3.
-        return str(str(value))
+        return unicode(str(value))
 
     def __str__(self):
-        """A human-readable representation of this SoupStrainer."""
-        if self.string:
-            return self.string
+        if self.text:
+            return self.text
         else:
             return "%s|%s" % (self.name, self.attrs)
 
     def search_tag(self, markup_name=None, markup_attrs={}):
-        """Check whether a Tag with the given name and attributes would
-        match this SoupStrainer.
-
-        Used prospectively to decide whether to even bother creating a Tag
-        object.
-
-        :param markup_name: A tag name as found in some markup.
-        :param markup_attrs: A dictionary of attributes as found in some markup.
-
-        :return: True if the prospective tag would match this SoupStrainer;
-            False otherwise.
-        """
         found = None
         markup = None
         if isinstance(markup_name, Tag):
             markup = markup_name
             markup_attrs = markup
-
-        if isinstance(self.name, str):
-            # Optimization for a very common case where the user is
-            # searching for a tag with one specific name, and we're
-            # looking at a tag with a different name.
-            if markup and not markup.prefix and self.name != markup.name:
-                 return False
-
         call_function_with_tag_data = (
-            isinstance(self.name, Callable)
+            isinstance(self.name, collections.Callable)
             and not isinstance(markup_name, Tag))
 
         if ((not self.name)
@@ -2293,26 +1517,17 @@ class SoupStrainer(object):
                     found = markup
                 else:
                     found = markup_name
-        if found and self.string and not self._matches(found.string, self.string):
+        if found and self.text and not self._matches(found.string, self.text):
             found = None
         return found
-
-    # For BS3 compatibility.
     searchTag = search_tag
 
     def search(self, markup):
-        """Find all items in `markup` that match this SoupStrainer.
-
-        Used by the core _find_all() method, which is ultimately
-        called by all find_* methods.
-
-        :param markup: A PageElement or a list of them.
-        """
-        # print('looking for %s in %s' % (self, markup))
+        # print 'looking for %s in %s' % (self, markup)
         found = None
         # If given a list of items, scan it for a text element that
         # matches.
-        if hasattr(markup, '__iter__') and not isinstance(markup, (Tag, str)):
+        if hasattr(markup, '__iter__') and not isinstance(markup, (Tag, basestring)):
             for element in markup:
                 if isinstance(element, NavigableString) \
                        and self.search(element):
@@ -2321,44 +1536,49 @@ class SoupStrainer(object):
         # If it's a Tag, make sure its name or attributes match.
         # Don't bother with Tags if we're searching for text.
         elif isinstance(markup, Tag):
-            if not self.string or self.name or self.attrs:
+            if not self.text or self.name or self.attrs:
                 found = self.search_tag(markup)
         # If it's text, make sure the text matches.
         elif isinstance(markup, NavigableString) or \
-                 isinstance(markup, str):
-            if not self.name and not self.attrs and self._matches(markup, self.string):
+                 isinstance(markup, basestring):
+            if not self.name and not self.attrs and self._matches(markup, self.text):
                 found = markup
         else:
             raise Exception(
                 "I don't know how to match against a %s" % markup.__class__)
         return found
 
-    def _matches(self, markup, match_against, already_tried=None):
-        # print(u"Matching %s against %s" % (markup, match_against))
+    def _matches(self, markup, match_against):
+        # print u"Matching %s against %s" % (markup, match_against)
         result = False
         if isinstance(markup, list) or isinstance(markup, tuple):
             # This should only happen when searching a multi-valued attribute
             # like 'class'.
-            for item in markup:
-                if self._matches(item, match_against):
-                    return True
-            # We didn't match any particular value of the multivalue
-            # attribute, but maybe we match the attribute value when
-            # considered as a string.
-            if self._matches(' '.join(markup), match_against):
-                return True
-            return False
+            if (isinstance(match_against, unicode)
+                and ' ' in match_against):
+                # A bit of a special case. If they try to match "foo
+                # bar" on a multivalue attribute's value, only accept
+                # the literal value "foo bar"
+                #
+                # XXX This is going to be pretty slow because we keep
+                # splitting match_against. But it shouldn't come up
+                # too often.
+                return (whitespace_re.split(match_against) == markup)
+            else:
+                for item in markup:
+                    if self._matches(item, match_against):
+                        return True
+                return False
 
         if match_against is True:
             # True matches any non-None value.
             return markup is not None
 
-        if isinstance(match_against, Callable):
+        if isinstance(match_against, collections.Callable):
             return match_against(markup)
 
         # Custom callables take the tag as an argument, but all
         # other ways of matching match the tag name as a string.
-        original_markup = markup
         if isinstance(markup, Tag):
             markup = markup.name
 
@@ -2369,67 +1589,23 @@ class SoupStrainer(object):
             # None matches None, False, an empty string, an empty list, and so on.
             return not match_against
 
-        if (hasattr(match_against, '__iter__')
-            and not isinstance(match_against, str)):
-            # We're asked to match against an iterable of items.
-            # The markup must be match at least one item in the
-            # iterable. We'll try each one in turn.
-            #
-            # To avoid infinite recursion we need to keep track of
-            # items we've already seen.
-            if not already_tried:
-                already_tried = set()
-            for item in match_against:
-                if item.__hash__:
-                    key = item
-                else:
-                    key = id(item)
-                if key in already_tried:
-                    continue
-                else:
-                    already_tried.add(key)
-                    if self._matches(original_markup, item, already_tried):
-                        return True
-            else:
-                return False
-
-        # Beyond this point we might need to run the test twice: once against
-        # the tag's name and once against its prefixed name.
-        match = False
-
-        if not match and isinstance(match_against, str):
+        if isinstance(match_against, unicode):
             # Exact string match
-            match = markup == match_against
+            return markup == match_against
 
-        if not match and hasattr(match_against, 'search'):
+        if hasattr(match_against, 'match'):
             # Regexp match
             return match_against.search(markup)
 
-        if (not match
-            and isinstance(original_markup, Tag)
-            and original_markup.prefix):
-            # Try the whole thing again with the prefixed tag name.
-            return self._matches(
-                original_markup.prefix + ':' + original_markup.name, match_against
-            )
-
-        return match
+        if hasattr(match_against, '__iter__'):
+            # The markup must be an exact match against something
+            # in the iterable.
+            return markup in match_against
 
 
 class ResultSet(list):
     """A ResultSet is just a list that keeps track of the SoupStrainer
     that created it."""
     def __init__(self, source, result=()):
-        """Constructor.
-
-        :param source: A SoupStrainer.
-        :param result: A list of PageElements.
-        """
         super(ResultSet, self).__init__(result)
         self.source = source
-
-    def __getattr__(self, key):
-        """Raise a helpful exception to explain a common code fix."""
-        raise AttributeError(
-            "ResultSet object has no attribute '%s'. You're probably treating a list of elements like a single element. Did you call find_all() when you meant to call find()?" % key
-        )
diff --git a/lib/bs4/formatter.py b/lib/bs4/formatter.py
deleted file mode 100644
index 9fa1b57c..00000000
--- a/lib/bs4/formatter.py
+++ /dev/null
@@ -1,185 +0,0 @@
-from bs4.dammit import EntitySubstitution
-
-class Formatter(EntitySubstitution):
-    """Describes a strategy to use when outputting a parse tree to a string.
-
-    Some parts of this strategy come from the distinction between
-    HTML4, HTML5, and XML. Others are configurable by the user.
-
-    Formatters are passed in as the `formatter` argument to methods
-    like `PageElement.encode`. Most people won't need to think about
-    formatters, and most people who need to think about them can pass
-    in one of these predefined strings as `formatter` rather than
-    making a new Formatter object:
-
-    For HTML documents:
-     * 'html' - HTML entity substitution for generic HTML documents. (default)
-     * 'html5' - HTML entity substitution for HTML5 documents, as
-                 well as some optimizations in the way tags are rendered.
-     * 'minimal' - Only make the substitutions necessary to guarantee
-                   valid HTML.
-     * None - Do not perform any substitution. This will be faster
-              but may result in invalid markup.
-
-    For XML documents:
-     * 'html' - Entity substitution for XHTML documents.
-     * 'minimal' - Only make the substitutions necessary to guarantee
-                   valid XML. (default)
-     * None - Do not perform any substitution. This will be faster
-              but may result in invalid markup.
-    """
-    # Registries of XML and HTML formatters.
-    XML_FORMATTERS = {}
-    HTML_FORMATTERS = {}
-
-    HTML = 'html'
-    XML = 'xml'
-
-    HTML_DEFAULTS = dict(
-        cdata_containing_tags=set(["script", "style"]),
-    )
-
-    def _default(self, language, value, kwarg):
-        if value is not None:
-            return value
-        if language == self.XML:
-            return set()
-        return self.HTML_DEFAULTS[kwarg]
-
-    def __init__(
-            self, language=None, entity_substitution=None,
-            void_element_close_prefix='/', cdata_containing_tags=None,
-            empty_attributes_are_booleans=False, indent=1,
-    ):
-        r"""Constructor.
-
-        :param language: This should be Formatter.XML if you are formatting
-           XML markup and Formatter.HTML if you are formatting HTML markup.
-
-        :param entity_substitution: A function to call to replace special
-           characters with XML/HTML entities. For examples, see 
-           bs4.dammit.EntitySubstitution.substitute_html and substitute_xml.
-        :param void_element_close_prefix: By default, void elements
-           are represented as <tag/> (XML rules) rather than <tag>
-           (HTML rules). To get <tag>, pass in the empty string.
-        :param cdata_containing_tags: The list of tags that are defined
-           as containing CDATA in this dialect. For example, in HTML,
-           <script> and <style> tags are defined as containing CDATA,
-           and their contents should not be formatted.
-        :param blank_attributes_are_booleans: Render attributes whose value
-            is the empty string as HTML-style boolean attributes.
-            (Attributes whose value is None are always rendered this way.)
-
-        :param indent: If indent is a non-negative integer or string,
-            then the contents of elements will be indented
-            appropriately when pretty-printing. An indent level of 0,
-            negative, or "" will only insert newlines. Using a
-            positive integer indent indents that many spaces per
-            level. If indent is a string (such as "\t"), that string
-            is used to indent each level. The default behavior is to
-            indent one space per level.
-        """
-        self.language = language
-        self.entity_substitution = entity_substitution
-        self.void_element_close_prefix = void_element_close_prefix
-        self.cdata_containing_tags = self._default(
-            language, cdata_containing_tags, 'cdata_containing_tags'
-        )
-        self.empty_attributes_are_booleans=empty_attributes_are_booleans
-        if indent is None:
-            indent = 0
-        if isinstance(indent, int):
-            if indent < 0:
-                indent = 0
-            indent = ' ' * indent
-        elif isinstance(indent, str):
-            indent = indent
-        else:
-            indent = ' '
-        self.indent = indent
-
-    def substitute(self, ns):
-        """Process a string that needs to undergo entity substitution.
-        This may be a string encountered in an attribute value or as
-        text.
-
-        :param ns: A string.
-        :return: A string with certain characters replaced by named
-           or numeric entities.
-        """
-        if not self.entity_substitution:
-            return ns
-        from .element import NavigableString
-        if (isinstance(ns, NavigableString)
-            and ns.parent is not None
-            and ns.parent.name in self.cdata_containing_tags):
-            # Do nothing.
-            return ns
-        # Substitute.
-        return self.entity_substitution(ns)
-
-    def attribute_value(self, value):
-        """Process the value of an attribute.
-
-        :param ns: A string.
-        :return: A string with certain characters replaced by named
-           or numeric entities.
-        """
-        return self.substitute(value)
-    
-    def attributes(self, tag):
-        """Reorder a tag's attributes however you want.
-        
-        By default, attributes are sorted alphabetically. This makes
-        behavior consistent between Python 2 and Python 3, and preserves
-        backwards compatibility with older versions of Beautiful Soup.
-
-        If `empty_boolean_attributes` is True, then attributes whose
-        values are set to the empty string will be treated as boolean
-        attributes.
-        """
-        if tag.attrs is None:
-            return []
-        return sorted(
-            (k, (None if self.empty_attributes_are_booleans and v == '' else v))
-            for k, v in list(tag.attrs.items())
-        )
-   
-class HTMLFormatter(Formatter):
-    """A generic Formatter for HTML."""
-    REGISTRY = {}
-    def __init__(self, *args, **kwargs):
-        super(HTMLFormatter, self).__init__(self.HTML, *args, **kwargs)
-
-    
-class XMLFormatter(Formatter):
-    """A generic Formatter for XML."""
-    REGISTRY = {}
-    def __init__(self, *args, **kwargs):
-        super(XMLFormatter, self).__init__(self.XML, *args, **kwargs)
-
-
-# Set up aliases for the default formatters.
-HTMLFormatter.REGISTRY['html'] = HTMLFormatter(
-    entity_substitution=EntitySubstitution.substitute_html
-)
-HTMLFormatter.REGISTRY["html5"] = HTMLFormatter(
-    entity_substitution=EntitySubstitution.substitute_html,
-    void_element_close_prefix=None,
-    empty_attributes_are_booleans=True,
-)
-HTMLFormatter.REGISTRY["minimal"] = HTMLFormatter(
-    entity_substitution=EntitySubstitution.substitute_xml
-)
-HTMLFormatter.REGISTRY[None] = HTMLFormatter(
-    entity_substitution=None
-)
-XMLFormatter.REGISTRY["html"] =  XMLFormatter(
-    entity_substitution=EntitySubstitution.substitute_html
-)
-XMLFormatter.REGISTRY["minimal"] = XMLFormatter(
-    entity_substitution=EntitySubstitution.substitute_xml
-)
-XMLFormatter.REGISTRY[None] = Formatter(
-    Formatter(Formatter.XML, entity_substitution=None)
-)
diff --git a/lib/bs4/testing.py b/lib/bs4/testing.py
new file mode 100644
index 00000000..fd4495ac
--- /dev/null
+++ b/lib/bs4/testing.py
@@ -0,0 +1,592 @@
+"""Helper classes for tests."""
+
+import copy
+import functools
+import unittest
+from unittest import TestCase
+from bs4 import BeautifulSoup
+from bs4.element import (
+    CharsetMetaAttributeValue,
+    Comment,
+    ContentMetaAttributeValue,
+    Doctype,
+    SoupStrainer,
+)
+
+from bs4.builder import HTMLParserTreeBuilder
+default_builder = HTMLParserTreeBuilder
+
+
+class SoupTest(unittest.TestCase):
+
+    @property
+    def default_builder(self):
+        return default_builder()
+
+    def soup(self, markup, **kwargs):
+        """Build a Beautiful Soup object from markup."""
+        builder = kwargs.pop('builder', self.default_builder)
+        return BeautifulSoup(markup, builder=builder, **kwargs)
+
+    def document_for(self, markup):
+        """Turn an HTML fragment into a document.
+
+        The details depend on the builder.
+        """
+        return self.default_builder.test_fragment_to_document(markup)
+
+    def assertSoupEquals(self, to_parse, compare_parsed_to=None):
+        builder = self.default_builder
+        obj = BeautifulSoup(to_parse, builder=builder)
+        if compare_parsed_to is None:
+            compare_parsed_to = to_parse
+
+        self.assertEqual(obj.decode(), self.document_for(compare_parsed_to))
+
+
+class HTMLTreeBuilderSmokeTest(object):
+
+    """A basic test of a treebuilder's competence.
+
+    Any HTML treebuilder, present or future, should be able to pass
+    these tests. With invalid markup, there's room for interpretation,
+    and different parsers can handle it differently. But with the
+    markup in these tests, there's not much room for interpretation.
+    """
+
+    def assertDoctypeHandled(self, doctype_fragment):
+        """Assert that a given doctype string is handled correctly."""
+        doctype_str, soup = self._document_with_doctype(doctype_fragment)
+
+        # Make sure a Doctype object was created.
+        doctype = soup.contents[0]
+        self.assertEqual(doctype.__class__, Doctype)
+        self.assertEqual(doctype, doctype_fragment)
+        self.assertEqual(str(soup)[:len(doctype_str)], doctype_str)
+
+        # Make sure that the doctype was correctly associated with the
+        # parse tree and that the rest of the document parsed.
+        self.assertEqual(soup.p.contents[0], 'foo')
+
+    def _document_with_doctype(self, doctype_fragment):
+        """Generate and parse a document with the given doctype."""
+        doctype = '<!DOCTYPE %s>' % doctype_fragment
+        markup = doctype + '\n<p>foo</p>'
+        soup = self.soup(markup)
+        return doctype, soup
+
+    def test_normal_doctypes(self):
+        """Make sure normal, everyday HTML doctypes are handled correctly."""
+        self.assertDoctypeHandled("html")
+        self.assertDoctypeHandled(
+            'html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"')
+
+    def test_empty_doctype(self):
+        soup = self.soup("<!DOCTYPE>")
+        doctype = soup.contents[0]
+        self.assertEqual("", doctype.strip())
+
+    def test_public_doctype_with_url(self):
+        doctype = 'html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"'
+        self.assertDoctypeHandled(doctype)
+
+    def test_system_doctype(self):
+        self.assertDoctypeHandled('foo SYSTEM "http://www.example.com/"')
+
+    def test_namespaced_system_doctype(self):
+        # We can handle a namespaced doctype with a system ID.
+        self.assertDoctypeHandled('xsl:stylesheet SYSTEM "htmlent.dtd"')
+
+    def test_namespaced_public_doctype(self):
+        # Test a namespaced doctype with a public id.
+        self.assertDoctypeHandled('xsl:stylesheet PUBLIC "htmlent.dtd"')
+
+    def test_real_xhtml_document(self):
+        """A real XHTML document should come out more or less the same as it went in."""
+        markup = b"""<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><title>Hello.</title></head>
+<body>Goodbye.</body>
+</html>"""
+        soup = self.soup(markup)
+        self.assertEqual(
+            soup.encode("utf-8").replace(b"\n", b""),
+            markup.replace(b"\n", b""))
+
+    def test_deepcopy(self):
+        """Make sure you can copy the tree builder.
+
+        This is important because the builder is part of a
+        BeautifulSoup object, and we want to be able to copy that.
+        """
+        copy.deepcopy(self.default_builder)
+
+    def test_p_tag_is_never_empty_element(self):
+        """A <p> tag is never designated as an empty-element tag.
+
+        Even if the markup shows it as an empty-element tag, it
+        shouldn't be presented that way.
+        """
+        soup = self.soup("<p/>")
+        self.assertFalse(soup.p.is_empty_element)
+        self.assertEqual(str(soup.p), "<p></p>")
+
+    def test_unclosed_tags_get_closed(self):
+        """A tag that's not closed by the end of the document should be closed.
+
+        This applies to all tags except empty-element tags.
+        """
+        self.assertSoupEquals("<p>", "<p></p>")
+        self.assertSoupEquals("<b>", "<b></b>")
+
+        self.assertSoupEquals("<br>", "<br/>")
+
+    def test_br_is_always_empty_element_tag(self):
+        """A <br> tag is designated as an empty-element tag.
+
+        Some parsers treat <br></br> as one <br/> tag, some parsers as
+        two tags, but it should always be an empty-element tag.
+        """
+        soup = self.soup("<br></br>")
+        self.assertTrue(soup.br.is_empty_element)
+        self.assertEqual(str(soup.br), "<br/>")
+
+    def test_nested_formatting_elements(self):
+        self.assertSoupEquals("<em><em></em></em>")
+
+    def test_comment(self):
+        # Comments are represented as Comment objects.
+        markup = "<p>foo<!--foobar-->baz</p>"
+        self.assertSoupEquals(markup)
+
+        soup = self.soup(markup)
+        comment = soup.find(text="foobar")
+        self.assertEqual(comment.__class__, Comment)
+
+        # The comment is properly integrated into the tree.
+        foo = soup.find(text="foo")
+        self.assertEqual(comment, foo.next_element)
+        baz = soup.find(text="baz")
+        self.assertEqual(comment, baz.previous_element)
+
+    def test_preserved_whitespace_in_pre_and_textarea(self):
+        """Whitespace must be preserved in <pre> and <textarea> tags."""
+        self.assertSoupEquals("<pre>   </pre>")
+        self.assertSoupEquals("<textarea> woo  </textarea>")
+
+    def test_nested_inline_elements(self):
+        """Inline elements can be nested indefinitely."""
+        b_tag = "<b>Inside a B tag</b>"
+        self.assertSoupEquals(b_tag)
+
+        nested_b_tag = "<p>A <i>nested <b>tag</b></i></p>"
+        self.assertSoupEquals(nested_b_tag)
+
+        double_nested_b_tag = "<p>A <a>doubly <i>nested <b>tag</b></i></a></p>"
+        self.assertSoupEquals(nested_b_tag)
+
+    def test_nested_block_level_elements(self):
+        """Block elements can be nested."""
+        soup = self.soup('<blockquote><p><b>Foo</b></p></blockquote>')
+        blockquote = soup.blockquote
+        self.assertEqual(blockquote.p.b.string, 'Foo')
+        self.assertEqual(blockquote.b.string, 'Foo')
+
+    def test_correctly_nested_tables(self):
+        """One table can go inside another one."""
+        markup = ('<table id="1">'
+                  '<tr>'
+                  "<td>Here's another table:"
+                  '<table id="2">'
+                  '<tr><td>foo</td></tr>'
+                  '</table></td>')
+
+        self.assertSoupEquals(
+            markup,
+            '<table id="1"><tr><td>Here\'s another table:'
+            '<table id="2"><tr><td>foo</td></tr></table>'
+            '</td></tr></table>')
+
+        self.assertSoupEquals(
+            "<table><thead><tr><td>Foo</td></tr></thead>"
+            "<tbody><tr><td>Bar</td></tr></tbody>"
+            "<tfoot><tr><td>Baz</td></tr></tfoot></table>")
+
+    def test_deeply_nested_multivalued_attribute(self):
+        # html5lib can set the attributes of the same tag many times
+        # as it rearranges the tree. This has caused problems with
+        # multivalued attributes.
+        markup = '<table><div><div class="css"></div></div></table>'
+        soup = self.soup(markup)
+        self.assertEqual(["css"], soup.div.div['class'])
+
+    def test_angle_brackets_in_attribute_values_are_escaped(self):
+        self.assertSoupEquals('<a b="<a>"></a>', '<a b="&lt;a&gt;"></a>')
+
+    def test_entities_in_attributes_converted_to_unicode(self):
+        expect = u'<p id="pi\N{LATIN SMALL LETTER N WITH TILDE}ata"></p>'
+        self.assertSoupEquals('<p id="pi&#241;ata"></p>', expect)
+        self.assertSoupEquals('<p id="pi&#xf1;ata"></p>', expect)
+        self.assertSoupEquals('<p id="pi&#Xf1;ata"></p>', expect)
+        self.assertSoupEquals('<p id="pi&ntilde;ata"></p>', expect)
+
+    def test_entities_in_text_converted_to_unicode(self):
+        expect = u'<p>pi\N{LATIN SMALL LETTER N WITH TILDE}ata</p>'
+        self.assertSoupEquals("<p>pi&#241;ata</p>", expect)
+        self.assertSoupEquals("<p>pi&#xf1;ata</p>", expect)
+        self.assertSoupEquals("<p>pi&#Xf1;ata</p>", expect)
+        self.assertSoupEquals("<p>pi&ntilde;ata</p>", expect)
+
+    def test_quot_entity_converted_to_quotation_mark(self):
+        self.assertSoupEquals("<p>I said &quot;good day!&quot;</p>",
+                              '<p>I said "good day!"</p>')
+
+    def test_out_of_range_entity(self):
+        expect = u"\N{REPLACEMENT CHARACTER}"
+        self.assertSoupEquals("&#10000000000000;", expect)
+        self.assertSoupEquals("&#x10000000000000;", expect)
+        self.assertSoupEquals("&#1000000000;", expect)
+
+    def test_multipart_strings(self):
+        "Mostly to prevent a recurrence of a bug in the html5lib treebuilder."
+        soup = self.soup("<html><h2>\nfoo</h2><p></p></html>")
+        self.assertEqual("p", soup.h2.string.next_element.name)
+        self.assertEqual("p", soup.p.name)
+
+    def test_basic_namespaces(self):
+        """Parsers don't need to *understand* namespaces, but at the
+        very least they should not choke on namespaces or lose
+        data."""
+
+        markup = b'<html xmlns="http://www.w3.org/1999/xhtml" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:svg="http://www.w3.org/2000/svg"><head></head><body><mathml:msqrt>4</mathml:msqrt><b svg:fill="red"></b></body></html>'
+        soup = self.soup(markup)
+        self.assertEqual(markup, soup.encode())
+        html = soup.html
+        self.assertEqual('http://www.w3.org/1999/xhtml', soup.html['xmlns'])
+        self.assertEqual(
+            'http://www.w3.org/1998/Math/MathML', soup.html['xmlns:mathml'])
+        self.assertEqual(
+            'http://www.w3.org/2000/svg', soup.html['xmlns:svg'])
+
+    def test_multivalued_attribute_value_becomes_list(self):
+        markup = b'<a class="foo bar">'
+        soup = self.soup(markup)
+        self.assertEqual(['foo', 'bar'], soup.a['class'])
+
+    #
+    # Generally speaking, tests below this point are more tests of
+    # Beautiful Soup than tests of the tree builders. But parsers are
+    # weird, so we run these tests separately for every tree builder
+    # to detect any differences between them.
+    #
+
+    def test_can_parse_unicode_document(self):
+        # A seemingly innocuous document... but it's in Unicode! And
+        # it contains characters that can't be represented in the
+        # encoding found in the  declaration! The horror!
+        markup = u'<html><head><meta encoding="euc-jp"></head><body>Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!</body>'
+        soup = self.soup(markup)
+        self.assertEqual(u'Sacr\xe9 bleu!', soup.body.string)
+
+    def test_soupstrainer(self):
+        """Parsers should be able to work with SoupStrainers."""
+        strainer = SoupStrainer("b")
+        soup = self.soup("A <b>bold</b> <meta/> <i>statement</i>",
+                         parse_only=strainer)
+        self.assertEqual(soup.decode(), "<b>bold</b>")
+
+    def test_single_quote_attribute_values_become_double_quotes(self):
+        self.assertSoupEquals("<foo attr='bar'></foo>",
+                              '<foo attr="bar"></foo>')
+
+    def test_attribute_values_with_nested_quotes_are_left_alone(self):
+        text = """<foo attr='bar "brawls" happen'>a</foo>"""
+        self.assertSoupEquals(text)
+
+    def test_attribute_values_with_double_nested_quotes_get_quoted(self):
+        text = """<foo attr='bar "brawls" happen'>a</foo>"""
+        soup = self.soup(text)
+        soup.foo['attr'] = 'Brawls happen at "Bob\'s Bar"'
+        self.assertSoupEquals(
+            soup.foo.decode(),
+            """<foo attr="Brawls happen at &quot;Bob\'s Bar&quot;">a</foo>""")
+
+    def test_ampersand_in_attribute_value_gets_escaped(self):
+        self.assertSoupEquals('<this is="really messed up & stuff"></this>',
+                              '<this is="really messed up &amp; stuff"></this>')
+
+        self.assertSoupEquals(
+            '<a href="http://example.org?a=1&b=2;3">foo</a>',
+            '<a href="http://example.org?a=1&amp;b=2;3">foo</a>')
+
+    def test_escaped_ampersand_in_attribute_value_is_left_alone(self):
+        self.assertSoupEquals('<a href="http://example.org?a=1&amp;b=2;3"></a>')
+
+    def test_entities_in_strings_converted_during_parsing(self):
+        # Both XML and HTML entities are converted to Unicode characters
+        # during parsing.
+        text = "<p>&lt;&lt;sacr&eacute;&#32;bleu!&gt;&gt;</p>"
+        expected = u"<p>&lt;&lt;sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!&gt;&gt;</p>"
+        self.assertSoupEquals(text, expected)
+
+    def test_smart_quotes_converted_on_the_way_in(self):
+        # Microsoft smart quotes are converted to Unicode characters during
+        # parsing.
+        quote = b"<p>\x91Foo\x92</p>"
+        soup = self.soup(quote)
+        self.assertEqual(
+            soup.p.string,
+            u"\N{LEFT SINGLE QUOTATION MARK}Foo\N{RIGHT SINGLE QUOTATION MARK}")
+
+    def test_non_breaking_spaces_converted_on_the_way_in(self):
+        soup = self.soup("<a>&nbsp;&nbsp;</a>")
+        self.assertEqual(soup.a.string, u"\N{NO-BREAK SPACE}" * 2)
+
+    def test_entities_converted_on_the_way_out(self):
+        text = "<p>&lt;&lt;sacr&eacute;&#32;bleu!&gt;&gt;</p>"
+        expected = u"<p>&lt;&lt;sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!&gt;&gt;</p>".encode("utf-8")
+        soup = self.soup(text)
+        self.assertEqual(soup.p.encode("utf-8"), expected)
+
+    def test_real_iso_latin_document(self):
+        # Smoke test of interrelated functionality, using an
+        # easy-to-understand document.
+
+        # Here it is in Unicode. Note that it claims to be in ISO-Latin-1.
+        unicode_html = u'<html><head><meta content="text/html; charset=ISO-Latin-1" http-equiv="Content-type"/></head><body><p>Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!</p></body></html>'
+
+        # That's because we're going to encode it into ISO-Latin-1, and use
+        # that to test.
+        iso_latin_html = unicode_html.encode("iso-8859-1")
+
+        # Parse the ISO-Latin-1 HTML.
+        soup = self.soup(iso_latin_html)
+        # Encode it to UTF-8.
+        result = soup.encode("utf-8")
+
+        # What do we expect the result to look like? Well, it would
+        # look like unicode_html, except that the META tag would say
+        # UTF-8 instead of ISO-Latin-1.
+        expected = unicode_html.replace("ISO-Latin-1", "utf-8")
+
+        # And, of course, it would be in UTF-8, not Unicode.
+        expected = expected.encode("utf-8")
+
+        # Ta-da!
+        self.assertEqual(result, expected)
+
+    def test_real_shift_jis_document(self):
+        # Smoke test to make sure the parser can handle a document in
+        # Shift-JIS encoding, without choking.
+        shift_jis_html = (
+            b'<html><head></head><body><pre>'
+            b'\x82\xb1\x82\xea\x82\xcdShift-JIS\x82\xc5\x83R\x81[\x83f'
+            b'\x83B\x83\x93\x83O\x82\xb3\x82\xea\x82\xbd\x93\xfa\x96{\x8c'
+            b'\xea\x82\xcc\x83t\x83@\x83C\x83\x8b\x82\xc5\x82\xb7\x81B'
+            b'</pre></body></html>')
+        unicode_html = shift_jis_html.decode("shift-jis")
+        soup = self.soup(unicode_html)
+
+        # Make sure the parse tree is correctly encoded to various
+        # encodings.
+        self.assertEqual(soup.encode("utf-8"), unicode_html.encode("utf-8"))
+        self.assertEqual(soup.encode("euc_jp"), unicode_html.encode("euc_jp"))
+
+    def test_real_hebrew_document(self):
+        # A real-world test to make sure we can convert ISO-8859-9 (a
+        # Hebrew encoding) to UTF-8.
+        hebrew_document = b'<html><head><title>Hebrew (ISO 8859-8) in Visual Directionality</title></head><body><h1>Hebrew (ISO 8859-8) in Visual Directionality</h1>\xed\xe5\xec\xf9</body></html>'
+        soup = self.soup(
+            hebrew_document, from_encoding="iso8859-8")
+        self.assertEqual(soup.original_encoding, 'iso8859-8')
+        self.assertEqual(
+            soup.encode('utf-8'),
+            hebrew_document.decode("iso8859-8").encode("utf-8"))
+
+    def test_meta_tag_reflects_current_encoding(self):
+        # Here's the <meta> tag saying that a document is
+        # encoded in Shift-JIS.
+        meta_tag = ('<meta content="text/html; charset=x-sjis" '
+                    'http-equiv="Content-type"/>')
+
+        # Here's a document incorporating that meta tag.
+        shift_jis_html = (
+            '<html><head>\n%s\n'
+            '<meta http-equiv="Content-language" content="ja"/>'
+            '</head><body>Shift-JIS markup goes here.') % meta_tag
+        soup = self.soup(shift_jis_html)
+
+        # Parse the document, and the charset is seemingly unaffected.
+        parsed_meta = soup.find('meta', {'http-equiv': 'Content-type'})
+        content = parsed_meta['content']
+        self.assertEqual('text/html; charset=x-sjis', content)
+
+        # But that value is actually a ContentMetaAttributeValue object.
+        self.assertTrue(isinstance(content, ContentMetaAttributeValue))
+
+        # And it will take on a value that reflects its current
+        # encoding.
+        self.assertEqual('text/html; charset=utf8', content.encode("utf8"))
+
+        # For the rest of the story, see TestSubstitutions in
+        # test_tree.py.
+
+    def test_html5_style_meta_tag_reflects_current_encoding(self):
+        # Here's the <meta> tag saying that a document is
+        # encoded in Shift-JIS.
+        meta_tag = ('<meta id="encoding" charset="x-sjis" />')
+
+        # Here's a document incorporating that meta tag.
+        shift_jis_html = (
+            '<html><head>\n%s\n'
+            '<meta http-equiv="Content-language" content="ja"/>'
+            '</head><body>Shift-JIS markup goes here.') % meta_tag
+        soup = self.soup(shift_jis_html)
+
+        # Parse the document, and the charset is seemingly unaffected.
+        parsed_meta = soup.find('meta', id="encoding")
+        charset = parsed_meta['charset']
+        self.assertEqual('x-sjis', charset)
+
+        # But that value is actually a CharsetMetaAttributeValue object.
+        self.assertTrue(isinstance(charset, CharsetMetaAttributeValue))
+
+        # And it will take on a value that reflects its current
+        # encoding.
+        self.assertEqual('utf8', charset.encode("utf8"))
+
+    def test_tag_with_no_attributes_can_have_attributes_added(self):
+        data = self.soup("<a>text</a>")
+        data.a['foo'] = 'bar'
+        self.assertEqual('<a foo="bar">text</a>', data.a.decode())
+
+class XMLTreeBuilderSmokeTest(object):
+
+    def test_docstring_generated(self):
+        soup = self.soup("<root/>")
+        self.assertEqual(
+            soup.encode(), b'<?xml version="1.0" encoding="utf-8"?>\n<root/>')
+
+    def test_real_xhtml_document(self):
+        """A real XHTML document should come out *exactly* the same as it went in."""
+        markup = b"""<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head><title>Hello.</title></head>
+<body>Goodbye.</body>
+</html>"""
+        soup = self.soup(markup)
+        self.assertEqual(
+            soup.encode("utf-8"), markup)
+
+    def test_formatter_processes_script_tag_for_xml_documents(self):
+        doc = """
+  <script type="text/javascript">
+  </script>
+"""
+        soup = BeautifulSoup(doc, "xml")
+        # lxml would have stripped this while parsing, but we can add
+        # it later.
+        soup.script.string = 'console.log("< < hey > > ");'
+        encoded = soup.encode()
+        self.assertTrue(b"&lt; &lt; hey &gt; &gt;" in encoded)
+
+    def test_can_parse_unicode_document(self):
+        markup = u'<?xml version="1.0" encoding="euc-jp"><root>Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!</root>'
+        soup = self.soup(markup)
+        self.assertEqual(u'Sacr\xe9 bleu!', soup.root.string)
+
+    def test_popping_namespaced_tag(self):
+        markup = '<rss xmlns:dc="foo"><dc:creator>b</dc:creator><dc:date>2012-07-02T20:33:42Z</dc:date><dc:rights>c</dc:rights><image>d</image></rss>'
+        soup = self.soup(markup)
+        self.assertEqual(
+            unicode(soup.rss), markup)
+
+    def test_docstring_includes_correct_encoding(self):
+        soup = self.soup("<root/>")
+        self.assertEqual(
+            soup.encode("latin1"),
+            b'<?xml version="1.0" encoding="latin1"?>\n<root/>')
+
+    def test_large_xml_document(self):
+        """A large XML document should come out the same as it went in."""
+        markup = (b'<?xml version="1.0" encoding="utf-8"?>\n<root>'
+                  + b'0' * (2**12)
+                  + b'</root>')
+        soup = self.soup(markup)
+        self.assertEqual(soup.encode("utf-8"), markup)
+
+
+    def test_tags_are_empty_element_if_and_only_if_they_are_empty(self):
+        self.assertSoupEquals("<p>", "<p/>")
+        self.assertSoupEquals("<p>foo</p>")
+
+    def test_namespaces_are_preserved(self):
+        markup = '<root xmlns:a="http://example.com/" xmlns:b="http://example.net/"><a:foo>This tag is in the a namespace</a:foo><b:foo>This tag is in the b namespace</b:foo></root>'
+        soup = self.soup(markup)
+        root = soup.root
+        self.assertEqual("http://example.com/", root['xmlns:a'])
+        self.assertEqual("http://example.net/", root['xmlns:b'])
+
+    def test_closing_namespaced_tag(self):
+        markup = '<p xmlns:dc="http://purl.org/dc/elements/1.1/"><dc:date>20010504</dc:date></p>'
+        soup = self.soup(markup)
+        self.assertEqual(unicode(soup.p), markup)
+
+    def test_namespaced_attributes(self):
+        markup = '<foo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><bar xsi:schemaLocation="http://www.example.com"/></foo>'
+        soup = self.soup(markup)
+        self.assertEqual(unicode(soup.foo), markup)
+
+    def test_namespaced_attributes_xml_namespace(self):
+        markup = '<foo xml:lang="fr">bar</foo>'
+        soup = self.soup(markup)
+        self.assertEqual(unicode(soup.foo), markup)
+
+class HTML5TreeBuilderSmokeTest(HTMLTreeBuilderSmokeTest):
+    """Smoke test for a tree builder that supports HTML5."""
+
+    def test_real_xhtml_document(self):
+        # Since XHTML is not HTML5, HTML5 parsers are not tested to handle
+        # XHTML documents in any particular way.
+        pass
+
+    def test_html_tags_have_namespace(self):
+        markup = "<a>"
+        soup = self.soup(markup)
+        self.assertEqual("http://www.w3.org/1999/xhtml", soup.a.namespace)
+
+    def test_svg_tags_have_namespace(self):
+        markup = '<svg><circle/></svg>'
+        soup = self.soup(markup)
+        namespace = "http://www.w3.org/2000/svg"
+        self.assertEqual(namespace, soup.svg.namespace)
+        self.assertEqual(namespace, soup.circle.namespace)
+
+
+    def test_mathml_tags_have_namespace(self):
+        markup = '<math><msqrt>5</msqrt></math>'
+        soup = self.soup(markup)
+        namespace = 'http://www.w3.org/1998/Math/MathML'
+        self.assertEqual(namespace, soup.math.namespace)
+        self.assertEqual(namespace, soup.msqrt.namespace)
+
+    def test_xml_declaration_becomes_comment(self):
+        markup = '<?xml version="1.0" encoding="utf-8"?><html></html>'
+        soup = self.soup(markup)
+        self.assertTrue(isinstance(soup.contents[0], Comment))
+        self.assertEqual(soup.contents[0], '?xml version="1.0" encoding="utf-8"?')
+        self.assertEqual("html", soup.contents[0].next_element.name)
+
+def skipIf(condition, reason):
+   def nothing(test, *args, **kwargs):
+       return None
+
+   def decorator(test_item):
+       if condition:
+           return nothing
+       else:
+           return test_item
+
+   return decorator
diff --git a/lib/bs4/tests/__init__.py b/lib/bs4/tests/__init__.py
deleted file mode 100644
index 325affef..00000000
--- a/lib/bs4/tests/__init__.py
+++ /dev/null
@@ -1,1177 +0,0 @@
-# encoding: utf-8
-"""Helper classes for tests."""
-
-# Use of this source code is governed by the MIT license.
-__license__ = "MIT"
-
-import pickle
-import copy
-import functools
-import warnings
-import pytest
-from bs4 import BeautifulSoup
-from bs4.element import (
-    CharsetMetaAttributeValue,
-    Comment,
-    ContentMetaAttributeValue,
-    Doctype,
-    PYTHON_SPECIFIC_ENCODINGS,
-    SoupStrainer,
-    Script,
-    Stylesheet,
-    Tag
-)
-
-from bs4.builder import (
-    DetectsXMLParsedAsHTML,
-    HTMLParserTreeBuilder,
-    XMLParsedAsHTMLWarning,
-)
-default_builder = HTMLParserTreeBuilder
-
-# Some tests depend on specific third-party libraries. We use
-# @pytest.mark.skipIf on the following conditionals to skip them
-# if the libraries are not installed.
-try:
-    from soupsieve import SelectorSyntaxError
-    SOUP_SIEVE_PRESENT = True
-except ImportError:
-    SOUP_SIEVE_PRESENT = False
-
-try:
-    import html5lib
-    HTML5LIB_PRESENT = True
-except ImportError:
-    HTML5LIB_PRESENT = False
-
-try:
-    import lxml.etree
-    LXML_PRESENT = True
-    LXML_VERSION = lxml.etree.LXML_VERSION
-except ImportError:
-    LXML_PRESENT = False
-    LXML_VERSION = (0,)
-
-BAD_DOCUMENT = """A bare string
-<!DOCTYPE xsl:stylesheet SYSTEM "htmlent.dtd">
-<!DOCTYPE xsl:stylesheet PUBLIC "htmlent.dtd">
-<div><![CDATA[A CDATA section where it doesn't belong]]></div>
-<div><svg><![CDATA[HTML5 does allow CDATA sections in SVG]]></svg></div>
-<div>A <meta> tag</div>
-<div>A <br> tag that supposedly has contents.</br></div>
-<div>AT&T</div>
-<div><textarea>Within a textarea, markup like <b> tags and <&<&amp; should be treated as literal</textarea></div>
-<div><script>if (i < 2) { alert("<b>Markup within script tags should be treated as literal.</b>"); }</script></div>
-<div>This numeric entity is missing the final semicolon: <x t="pi&#241ata"></div>
-<div><a href="http://example.com/</a> that attribute value never got closed</div>
-<div><a href="foo</a>, </a><a href="bar">that attribute value was closed by the subsequent tag</a></div>
-<! This document starts with a bogus declaration ><div>a</div>
-<div>This document contains <!an incomplete declaration <div>(do you see it?)</div>
-<div>This document ends with <!an incomplete declaration
-<div><a style={height:21px;}>That attribute value was bogus</a></div>
-<! DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">The doctype is invalid because it contains extra whitespace
-<div><table><td nowrap>That boolean attribute had no value</td></table></div>
-<div>Here's a nonexistent entity: &#foo; (do you see it?)</div>
-<div>This document ends before the entity finishes: &gt
-<div><p>Paragraphs shouldn't contain block display elements, but this one does: <dl><dt>you see?</dt></p>
-<b b="20" a="1" b="10" a="2" a="3" a="4">Multiple values for the same attribute.</b>
-<div><table><tr><td>Here's a table</td></tr></table></div>
-<div><table id="1"><tr><td>Here's a nested table:<table id="2"><tr><td>foo</td></tr></table></td></div>
-<div>This tag contains nothing but whitespace: <b>    </b></div>
-<div><blockquote><p><b>This p tag is cut off by</blockquote></p>the end of the blockquote tag</div>
-<div><table><div>This table contains bare markup</div></table></div>
-<div><div id="1">\n <a href="link1">This link is never closed.\n</div>\n<div id="2">\n <div id="3">\n   <a href="link2">This link is closed.</a>\n  </div>\n</div></div>
-<div>This document contains a <!DOCTYPE surprise>surprise doctype</div>
-<div><a><B><Cd><EFG>Mixed case tags are folded to lowercase</efg></CD></b></A></div>
-<div><our\u2603>Tag name contains Unicode characters</our\u2603></div>
-<div><a \u2603="snowman">Attribute name contains Unicode characters</a></div>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-"""
-
-
-class SoupTest(object):
-
-    @property
-    def default_builder(self):
-        return default_builder
-
-    def soup(self, markup, **kwargs):
-        """Build a Beautiful Soup object from markup."""
-        builder = kwargs.pop('builder', self.default_builder)
-        return BeautifulSoup(markup, builder=builder, **kwargs)
-
-    def document_for(self, markup, **kwargs):
-        """Turn an HTML fragment into a document.
-
-        The details depend on the builder.
-        """
-        return self.default_builder(**kwargs).test_fragment_to_document(markup)
-   
-    def assert_soup(self, to_parse, compare_parsed_to=None):
-        """Parse some markup using Beautiful Soup and verify that
-        the output markup is as expected.
-        """
-        builder = self.default_builder
-        obj = BeautifulSoup(to_parse, builder=builder)
-        if compare_parsed_to is None:
-            compare_parsed_to = to_parse
-
-        # Verify that the documents come out the same.
-        assert obj.decode() == self.document_for(compare_parsed_to)
-
-        # Also run some checks on the BeautifulSoup object itself:
-
-        # Verify that every tag that was opened was eventually closed.
-
-        # There are no tags in the open tag counter.
-        assert all(v==0 for v in list(obj.open_tag_counter.values()))
-
-        # The only tag in the tag stack is the one for the root
-        # document.
-        assert [obj.ROOT_TAG_NAME] == [x.name for x in obj.tagStack]
-
-    assertSoupEquals = assert_soup
-        
-    def assertConnectedness(self, element):
-        """Ensure that next_element and previous_element are properly
-        set for all descendants of the given element.
-        """
-        earlier = None
-        for e in element.descendants:
-            if earlier:
-                assert e == earlier.next_element
-                assert earlier == e.previous_element
-            earlier = e
-
-    def linkage_validator(self, el, _recursive_call=False):
-        """Ensure proper linkage throughout the document."""
-        descendant = None
-        # Document element should have no previous element or previous sibling.
-        # It also shouldn't have a next sibling.
-        if el.parent is None:
-            assert el.previous_element is None,\
-                "Bad previous_element\nNODE: {}\nPREV: {}\nEXPECTED: {}".format(
-                    el, el.previous_element, None
-                )
-            assert el.previous_sibling is None,\
-                "Bad previous_sibling\nNODE: {}\nPREV: {}\nEXPECTED: {}".format(
-                    el, el.previous_sibling, None
-                )
-            assert el.next_sibling is None,\
-                "Bad next_sibling\nNODE: {}\nNEXT: {}\nEXPECTED: {}".format(
-                    el, el.next_sibling, None
-                )
-
-        idx = 0
-        child = None
-        last_child = None
-        last_idx = len(el.contents) - 1
-        for child in el.contents:
-            descendant = None
-
-            # Parent should link next element to their first child
-            # That child should have no previous sibling
-            if idx == 0:
-                if el.parent is not None:
-                    assert el.next_element is child,\
-                       "Bad next_element\nNODE: {}\nNEXT: {}\nEXPECTED: {}".format(
-                            el, el.next_element, child
-                        )
-                    assert child.previous_element is el,\
-                       "Bad previous_element\nNODE: {}\nPREV: {}\nEXPECTED: {}".format(
-                            child, child.previous_element, el
-                        )
-                    assert child.previous_sibling is None,\
-                       "Bad previous_sibling\nNODE: {}\nPREV {}\nEXPECTED: {}".format(
-                            child, child.previous_sibling, None
-                        )
-
-            # If not the first child, previous index should link as sibling to this index
-            # Previous element should match the last index or the last bubbled up descendant
-            else:
-                assert child.previous_sibling is el.contents[idx - 1],\
-                    "Bad previous_sibling\nNODE: {}\nPREV {}\nEXPECTED {}".format(
-                        child, child.previous_sibling, el.contents[idx - 1]
-                    )
-                assert el.contents[idx - 1].next_sibling is child,\
-                    "Bad next_sibling\nNODE: {}\nNEXT {}\nEXPECTED {}".format(
-                        el.contents[idx - 1], el.contents[idx - 1].next_sibling, child
-                    )
-
-                if last_child is not None:
-                    assert child.previous_element is last_child,\
-                        "Bad previous_element\nNODE: {}\nPREV {}\nEXPECTED {}\nCONTENTS {}".format(
-                            child, child.previous_element, last_child, child.parent.contents
-                        )
-                    assert last_child.next_element is child,\
-                        "Bad next_element\nNODE: {}\nNEXT {}\nEXPECTED {}".format(
-                            last_child, last_child.next_element, child
-                        )
-
-            if isinstance(child, Tag) and child.contents:
-                descendant = self.linkage_validator(child, True)
-                # A bubbled up descendant should have no next siblings
-                assert descendant.next_sibling is None,\
-                    "Bad next_sibling\nNODE: {}\nNEXT {}\nEXPECTED {}".format(
-                        descendant, descendant.next_sibling, None
-                    )
-
-            # Mark last child as either the bubbled up descendant or the current child
-            if descendant is not None:
-                last_child = descendant
-            else:
-                last_child = child
-
-            # If last child, there are non next siblings
-            if idx == last_idx:
-                assert child.next_sibling is None,\
-                    "Bad next_sibling\nNODE: {}\nNEXT {}\nEXPECTED {}".format(
-                        child, child.next_sibling, None
-                    )
-            idx += 1
-
-        child = descendant if descendant is not None else child
-        if child is None:
-            child = el
-
-        if not _recursive_call and child is not None:
-            target = el
-            while True:
-                if target is None:
-                    assert child.next_element is None, \
-                        "Bad next_element\nNODE: {}\nNEXT {}\nEXPECTED {}".format(
-                            child, child.next_element, None
-                        )
-                    break
-                elif target.next_sibling is not None:
-                    assert child.next_element is target.next_sibling, \
-                        "Bad next_element\nNODE: {}\nNEXT {}\nEXPECTED {}".format(
-                            child, child.next_element, target.next_sibling
-                        )
-                    break
-                target = target.parent
-
-            # We are done, so nothing to return
-            return None
-        else:
-            # Return the child to the recursive caller
-            return child
-
-    def assert_selects(self, tags, should_match):
-        """Make sure that the given tags have the correct text.
-
-        This is used in tests that define a bunch of tags, each
-        containing a single string, and then select certain strings by
-        some mechanism.
-        """
-        assert [tag.string for tag in tags] == should_match
-
-    def assert_selects_ids(self, tags, should_match):
-        """Make sure that the given tags have the correct IDs.
-
-        This is used in tests that define a bunch of tags, each
-        containing a single string, and then select certain strings by
-        some mechanism.
-        """
-        assert [tag['id'] for tag in tags] == should_match
-
-
-class TreeBuilderSmokeTest(object):
-    # Tests that are common to HTML and XML tree builders.
-
-    @pytest.mark.parametrize(
-        "multi_valued_attributes",
-        [None, {}, dict(b=['class']), {'*': ['notclass']}]
-    )
-    def test_attribute_not_multi_valued(self, multi_valued_attributes):
-        markup = '<html xmlns="http://www.w3.org/1999/xhtml"><a class="a b c"></html>'
-        soup = self.soup(markup, multi_valued_attributes=multi_valued_attributes)
-        assert soup.a['class'] == 'a b c'
-
-    @pytest.mark.parametrize(
-        "multi_valued_attributes", [dict(a=['class']), {'*': ['class']}]
-    )
-    def test_attribute_multi_valued(self, multi_valued_attributes):
-        markup = '<a class="a b c">'
-        soup = self.soup(
-            markup, multi_valued_attributes=multi_valued_attributes
-        )
-        assert soup.a['class'] == ['a', 'b', 'c']
-
-    def test_invalid_doctype(self):
-        markup = '<![if word]>content<![endif]>'
-        markup = '<!DOCTYPE html]ff>'
-        soup = self.soup(markup)
-
-class HTMLTreeBuilderSmokeTest(TreeBuilderSmokeTest):
-
-    """A basic test of a treebuilder's competence.
-
-    Any HTML treebuilder, present or future, should be able to pass
-    these tests. With invalid markup, there's room for interpretation,
-    and different parsers can handle it differently. But with the
-    markup in these tests, there's not much room for interpretation.
-    """
-
-    def test_empty_element_tags(self):
-        """Verify that all HTML4 and HTML5 empty element (aka void element) tags
-        are handled correctly.
-        """
-        for name in [
-                'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'keygen', 'link', 'menuitem', 'meta', 'param', 'source', 'track', 'wbr',
-                'spacer', 'frame'
-        ]:
-            soup = self.soup("")
-            new_tag = soup.new_tag(name)
-            assert new_tag.is_empty_element == True
-
-    def test_special_string_containers(self):
-        soup = self.soup(
-            "<style>Some CSS</style><script>Some Javascript</script>"
-        )
-        assert isinstance(soup.style.string, Stylesheet)
-        assert isinstance(soup.script.string, Script)
-
-        soup = self.soup(
-            "<style><!--Some CSS--></style>"
-        )
-        assert isinstance(soup.style.string, Stylesheet)
-        # The contents of the style tag resemble an HTML comment, but
-        # it's not treated as a comment.
-        assert soup.style.string == "<!--Some CSS-->"
-        assert isinstance(soup.style.string, Stylesheet)
-        
-    def test_pickle_and_unpickle_identity(self):
-        # Pickling a tree, then unpickling it, yields a tree identical
-        # to the original.
-        tree = self.soup("<a><b>foo</a>")
-        dumped = pickle.dumps(tree, 2)
-        loaded = pickle.loads(dumped)
-        assert loaded.__class__ == BeautifulSoup
-        assert loaded.decode() == tree.decode()
-
-    def assertDoctypeHandled(self, doctype_fragment):
-        """Assert that a given doctype string is handled correctly."""
-        doctype_str, soup = self._document_with_doctype(doctype_fragment)
-
-        # Make sure a Doctype object was created.
-        doctype = soup.contents[0]
-        assert doctype.__class__ == Doctype
-        assert doctype == doctype_fragment
-        assert soup.encode("utf8")[:len(doctype_str)] == doctype_str
-
-        # Make sure that the doctype was correctly associated with the
-        # parse tree and that the rest of the document parsed.
-        assert soup.p.contents[0] == 'foo'
-
-    def _document_with_doctype(self, doctype_fragment, doctype_string="DOCTYPE"):
-        """Generate and parse a document with the given doctype."""
-        doctype = '<!%s %s>' % (doctype_string, doctype_fragment)
-        markup = doctype + '\n<p>foo</p>'
-        soup = self.soup(markup)
-        return doctype.encode("utf8"), soup
-
-    def test_normal_doctypes(self):
-        """Make sure normal, everyday HTML doctypes are handled correctly."""
-        self.assertDoctypeHandled("html")
-        self.assertDoctypeHandled(
-            'html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"')
-
-    def test_empty_doctype(self):
-        soup = self.soup("<!DOCTYPE>")
-        doctype = soup.contents[0]
-        assert "" == doctype.strip()
-
-    def test_mixed_case_doctype(self):
-        # A lowercase or mixed-case doctype becomes a Doctype.
-        for doctype_fragment in ("doctype", "DocType"):
-            doctype_str, soup = self._document_with_doctype(
-                "html", doctype_fragment
-            )
-
-            # Make sure a Doctype object was created and that the DOCTYPE
-            # is uppercase.
-            doctype = soup.contents[0]
-            assert doctype.__class__ == Doctype
-            assert doctype == "html"
-            assert soup.encode("utf8")[:len(doctype_str)] == b"<!DOCTYPE html>"
-
-            # Make sure that the doctype was correctly associated with the
-            # parse tree and that the rest of the document parsed.
-            assert soup.p.contents[0] == 'foo'
-        
-    def test_public_doctype_with_url(self):
-        doctype = 'html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"'
-        self.assertDoctypeHandled(doctype)
-
-    def test_system_doctype(self):
-        self.assertDoctypeHandled('foo SYSTEM "http://www.example.com/"')
-
-    def test_namespaced_system_doctype(self):
-        # We can handle a namespaced doctype with a system ID.
-        self.assertDoctypeHandled('xsl:stylesheet SYSTEM "htmlent.dtd"')
-
-    def test_namespaced_public_doctype(self):
-        # Test a namespaced doctype with a public id.
-        self.assertDoctypeHandled('xsl:stylesheet PUBLIC "htmlent.dtd"')
-
-    def test_real_xhtml_document(self):
-        """A real XHTML document should come out more or less the same as it went in."""
-        markup = b"""<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head><title>Hello.</title></head>
-<body>Goodbye.</body>
-</html>"""
-        with warnings.catch_warnings(record=True) as w:
-            soup = self.soup(markup)
-        assert soup.encode("utf-8").replace(b"\n", b"") == markup.replace(b"\n", b"")
-
-        # No warning was issued about parsing an XML document as HTML,
-        # because XHTML is both.
-        assert w == []
-
-
-    def test_namespaced_html(self):
-        # When a namespaced XML document is parsed as HTML it should
-        # be treated as HTML with weird tag names.
-        markup = b"""<ns1:foo>content</ns1:foo><ns1:foo/><ns2:foo/>"""
-        with warnings.catch_warnings(record=True) as w:
-            soup = self.soup(markup)
-
-        assert 2 == len(soup.find_all("ns1:foo"))
-            
-        # n.b. no "you're parsing XML as HTML" warning was given
-        # because there was no XML declaration.
-        assert [] == w
-
-    def test_detect_xml_parsed_as_html(self):
-        # A warning is issued when parsing an XML document as HTML,
-        # but basic stuff should still work.
-        markup = b"""<?xml version="1.0" encoding="utf-8"?><tag>string</tag>"""
-        with warnings.catch_warnings(record=True) as w:
-            soup = self.soup(markup)
-            assert soup.tag.string == 'string'
-        [warning] = w
-        assert isinstance(warning.message, XMLParsedAsHTMLWarning)
-        assert str(warning.message) == XMLParsedAsHTMLWarning.MESSAGE
-
-        # NOTE: the warning is not issued if the document appears to
-        # be XHTML (tested with test_real_xhtml_document in the
-        # superclass) or if there is no XML declaration (tested with
-        # test_namespaced_html in the superclass).
-        
-    def test_processing_instruction(self):
-        # We test both Unicode and bytestring to verify that
-        # process_markup correctly sets processing_instruction_class
-        # even when the markup is already Unicode and there is no
-        # need to process anything.
-        markup = """<?PITarget PIContent?>"""
-        soup = self.soup(markup)
-        assert markup == soup.decode()
-
-        markup = b"""<?PITarget PIContent?>"""
-        soup = self.soup(markup)
-        assert markup == soup.encode("utf8")
-
-    def test_deepcopy(self):
-        """Make sure you can copy the tree builder.
-
-        This is important because the builder is part of a
-        BeautifulSoup object, and we want to be able to copy that.
-        """
-        copy.deepcopy(self.default_builder)
-
-    def test_p_tag_is_never_empty_element(self):
-        """A <p> tag is never designated as an empty-element tag.
-
-        Even if the markup shows it as an empty-element tag, it
-        shouldn't be presented that way.
-        """
-        soup = self.soup("<p/>")
-        assert not soup.p.is_empty_element
-        assert str(soup.p) == "<p></p>"
-
-    def test_unclosed_tags_get_closed(self):
-        """A tag that's not closed by the end of the document should be closed.
-
-        This applies to all tags except empty-element tags.
-        """
-        self.assert_soup("<p>", "<p></p>")
-        self.assert_soup("<b>", "<b></b>")
-
-        self.assert_soup("<br>", "<br/>")
-
-    def test_br_is_always_empty_element_tag(self):
-        """A <br> tag is designated as an empty-element tag.
-
-        Some parsers treat <br></br> as one <br/> tag, some parsers as
-        two tags, but it should always be an empty-element tag.
-        """
-        soup = self.soup("<br></br>")
-        assert soup.br.is_empty_element
-        assert str(soup.br) == "<br/>"
-
-    def test_nested_formatting_elements(self):
-        self.assert_soup("<em><em></em></em>")
-
-    def test_double_head(self):
-        html = '''<!DOCTYPE html>
-<html>
-<head>
-<title>Ordinary HEAD element test</title>
-</head>
-<script type="text/javascript">
-alert("Help!");
-</script>
-<body>
-Hello, world!
-</body>
-</html>
-'''
-        soup = self.soup(html)
-        assert "text/javascript" == soup.find('script')['type']
-
-    def test_comment(self):
-        # Comments are represented as Comment objects.
-        markup = "<p>foo<!--foobar-->baz</p>"
-        self.assert_soup(markup)
-
-        soup = self.soup(markup)
-        comment = soup.find(string="foobar")
-        assert comment.__class__ == Comment
-
-        # The comment is properly integrated into the tree.
-        foo = soup.find(string="foo")
-        assert comment == foo.next_element
-        baz = soup.find(string="baz")
-        assert comment == baz.previous_element
-
-    def test_preserved_whitespace_in_pre_and_textarea(self):
-        """Whitespace must be preserved in <pre> and <textarea> tags,
-        even if that would mean not prettifying the markup.
-        """
-        pre_markup = "<pre>a   z</pre>\n"
-        textarea_markup = "<textarea> woo\nwoo  </textarea>\n"
-        self.assert_soup(pre_markup)
-        self.assert_soup(textarea_markup)
-
-        soup = self.soup(pre_markup)
-        assert soup.pre.prettify() == pre_markup
-
-        soup = self.soup(textarea_markup)
-        assert soup.textarea.prettify() == textarea_markup
-
-        soup = self.soup("<textarea></textarea>")
-        assert soup.textarea.prettify() == "<textarea></textarea>\n"
-
-    def test_nested_inline_elements(self):
-        """Inline elements can be nested indefinitely."""
-        b_tag = "<b>Inside a B tag</b>"
-        self.assert_soup(b_tag)
-
-        nested_b_tag = "<p>A <i>nested <b>tag</b></i></p>"
-        self.assert_soup(nested_b_tag)
-
-        double_nested_b_tag = "<p>A <a>doubly <i>nested <b>tag</b></i></a></p>"
-        self.assert_soup(nested_b_tag)
-
-    def test_nested_block_level_elements(self):
-        """Block elements can be nested."""
-        soup = self.soup('<blockquote><p><b>Foo</b></p></blockquote>')
-        blockquote = soup.blockquote
-        assert blockquote.p.b.string == 'Foo'
-        assert blockquote.b.string == 'Foo'
-
-    def test_correctly_nested_tables(self):
-        """One table can go inside another one."""
-        markup = ('<table id="1">'
-                  '<tr>'
-                  "<td>Here's another table:"
-                  '<table id="2">'
-                  '<tr><td>foo</td></tr>'
-                  '</table></td>')
-
-        self.assert_soup(
-            markup,
-            '<table id="1"><tr><td>Here\'s another table:'
-            '<table id="2"><tr><td>foo</td></tr></table>'
-            '</td></tr></table>')
-
-        self.assert_soup(
-            "<table><thead><tr><td>Foo</td></tr></thead>"
-            "<tbody><tr><td>Bar</td></tr></tbody>"
-            "<tfoot><tr><td>Baz</td></tr></tfoot></table>")
-
-    def test_multivalued_attribute_with_whitespace(self):
-        # Whitespace separating the values of a multi-valued attribute
-        # should be ignored.
-
-        markup = '<div class=" foo bar	 "></a>'
-        soup = self.soup(markup)
-        assert ['foo', 'bar'] == soup.div['class']
-
-        # If you search by the literal name of the class it's like the whitespace
-        # wasn't there.
-        assert soup.div == soup.find('div', class_="foo bar")
-        
-    def test_deeply_nested_multivalued_attribute(self):
-        # html5lib can set the attributes of the same tag many times
-        # as it rearranges the tree. This has caused problems with
-        # multivalued attributes.
-        markup = '<table><div><div class="css"></div></div></table>'
-        soup = self.soup(markup)
-        assert ["css"] == soup.div.div['class']
-
-    def test_multivalued_attribute_on_html(self):
-        # html5lib uses a different API to set the attributes ot the
-        # <html> tag. This has caused problems with multivalued
-        # attributes.
-        markup = '<html class="a b"></html>'
-        soup = self.soup(markup)
-        assert ["a", "b"] == soup.html['class']
-
-    def test_angle_brackets_in_attribute_values_are_escaped(self):
-        self.assert_soup('<a b="<a>"></a>', '<a b="&lt;a&gt;"></a>')
-
-    def test_strings_resembling_character_entity_references(self):
-        # "&T" and "&p" look like incomplete character entities, but they are
-        # not.
-        self.assert_soup(
-            "<p>&bull; AT&T is in the s&p 500</p>",
-            "<p>\u2022 AT&amp;T is in the s&amp;p 500</p>"
-        )
-
-    def test_apos_entity(self):
-        self.assert_soup(
-            "<p>Bob&apos;s Bar</p>",
-            "<p>Bob's Bar</p>",
-        )
-        
-    def test_entities_in_foreign_document_encoding(self):
-        # &#147; and &#148; are invalid numeric entities referencing
-        # Windows-1252 characters. &#45; references a character common
-        # to Windows-1252 and Unicode, and &#9731; references a
-        # character only found in Unicode.
-        #
-        # All of these entities should be converted to Unicode
-        # characters.
-        markup = "<p>&#147;Hello&#148; &#45;&#9731;</p>"
-        soup = self.soup(markup)
-        assert "“Hello� -☃" == soup.p.string
-        
-    def test_entities_in_attributes_converted_to_unicode(self):
-        expect = '<p id="pi\N{LATIN SMALL LETTER N WITH TILDE}ata"></p>'
-        self.assert_soup('<p id="pi&#241;ata"></p>', expect)
-        self.assert_soup('<p id="pi&#xf1;ata"></p>', expect)
-        self.assert_soup('<p id="pi&#Xf1;ata"></p>', expect)
-        self.assert_soup('<p id="pi&ntilde;ata"></p>', expect)
-
-    def test_entities_in_text_converted_to_unicode(self):
-        expect = '<p>pi\N{LATIN SMALL LETTER N WITH TILDE}ata</p>'
-        self.assert_soup("<p>pi&#241;ata</p>", expect)
-        self.assert_soup("<p>pi&#xf1;ata</p>", expect)
-        self.assert_soup("<p>pi&#Xf1;ata</p>", expect)
-        self.assert_soup("<p>pi&ntilde;ata</p>", expect)
-
-    def test_quot_entity_converted_to_quotation_mark(self):
-        self.assert_soup("<p>I said &quot;good day!&quot;</p>",
-                              '<p>I said "good day!"</p>')
-
-    def test_out_of_range_entity(self):
-        expect = "\N{REPLACEMENT CHARACTER}"
-        self.assert_soup("&#10000000000000;", expect)
-        self.assert_soup("&#x10000000000000;", expect)
-        self.assert_soup("&#1000000000;", expect)
-       
-    def test_multipart_strings(self):
-        "Mostly to prevent a recurrence of a bug in the html5lib treebuilder."
-        soup = self.soup("<html><h2>\nfoo</h2><p></p></html>")
-        assert "p" == soup.h2.string.next_element.name
-        assert "p" == soup.p.name
-        self.assertConnectedness(soup)
-
-    def test_empty_element_tags(self):
-        """Verify consistent handling of empty-element tags,
-        no matter how they come in through the markup.
-        """
-        self.assert_soup('<br/><br/><br/>', "<br/><br/><br/>")
-        self.assert_soup('<br /><br /><br />', "<br/><br/><br/>")
-        
-    def test_head_tag_between_head_and_body(self):
-        "Prevent recurrence of a bug in the html5lib treebuilder."
-        content = """<html><head></head>
-  <link></link>
-  <body>foo</body>
-</html>
-"""
-        soup = self.soup(content)
-        assert soup.html.body is not None
-        self.assertConnectedness(soup)
-
-    def test_multiple_copies_of_a_tag(self):
-        "Prevent recurrence of a bug in the html5lib treebuilder."
-        content = """<!DOCTYPE html>
-<html>
- <body>
-   <article id="a" >
-   <div><a href="1"></div>
-   <footer>
-     <a href="2"></a>
-   </footer>
-  </article>
-  </body>
-</html>
-"""
-        soup = self.soup(content)
-        self.assertConnectedness(soup.article)
-
-    def test_basic_namespaces(self):
-        """Parsers don't need to *understand* namespaces, but at the
-        very least they should not choke on namespaces or lose
-        data."""
-
-        markup = b'<html xmlns="http://www.w3.org/1999/xhtml" xmlns:mathml="http://www.w3.org/1998/Math/MathML" xmlns:svg="http://www.w3.org/2000/svg"><head></head><body><mathml:msqrt>4</mathml:msqrt><b svg:fill="red"></b></body></html>'
-        soup = self.soup(markup)
-        assert markup == soup.encode()
-        html = soup.html
-        assert 'http://www.w3.org/1999/xhtml' == soup.html['xmlns']
-        assert 'http://www.w3.org/1998/Math/MathML' == soup.html['xmlns:mathml']
-        assert 'http://www.w3.org/2000/svg' == soup.html['xmlns:svg']
-
-    def test_multivalued_attribute_value_becomes_list(self):
-        markup = b'<a class="foo bar">'
-        soup = self.soup(markup)
-        assert ['foo', 'bar'] == soup.a['class']
-        
-    #
-    # Generally speaking, tests below this point are more tests of
-    # Beautiful Soup than tests of the tree builders. But parsers are
-    # weird, so we run these tests separately for every tree builder
-    # to detect any differences between them.
-    #
-
-    def test_can_parse_unicode_document(self):
-        # A seemingly innocuous document... but it's in Unicode! And
-        # it contains characters that can't be represented in the
-        # encoding found in the  declaration! The horror!
-        markup = '<html><head><meta encoding="euc-jp"></head><body>Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!</body>'
-        soup = self.soup(markup)
-        assert 'Sacr\xe9 bleu!' == soup.body.string
-
-    def test_soupstrainer(self):
-        """Parsers should be able to work with SoupStrainers."""
-        strainer = SoupStrainer("b")
-        soup = self.soup("A <b>bold</b> <meta/> <i>statement</i>",
-                         parse_only=strainer)
-        assert soup.decode() == "<b>bold</b>"
-
-    def test_single_quote_attribute_values_become_double_quotes(self):
-        self.assert_soup("<foo attr='bar'></foo>",
-                              '<foo attr="bar"></foo>')
-
-    def test_attribute_values_with_nested_quotes_are_left_alone(self):
-        text = """<foo attr='bar "brawls" happen'>a</foo>"""
-        self.assert_soup(text)
-
-    def test_attribute_values_with_double_nested_quotes_get_quoted(self):
-        text = """<foo attr='bar "brawls" happen'>a</foo>"""
-        soup = self.soup(text)
-        soup.foo['attr'] = 'Brawls happen at "Bob\'s Bar"'
-        self.assert_soup(
-            soup.foo.decode(),
-            """<foo attr="Brawls happen at &quot;Bob\'s Bar&quot;">a</foo>""")
-
-    def test_ampersand_in_attribute_value_gets_escaped(self):
-        self.assert_soup('<this is="really messed up & stuff"></this>',
-                              '<this is="really messed up &amp; stuff"></this>')
-
-        self.assert_soup(
-            '<a href="http://example.org?a=1&b=2;3">foo</a>',
-            '<a href="http://example.org?a=1&amp;b=2;3">foo</a>')
-
-    def test_escaped_ampersand_in_attribute_value_is_left_alone(self):
-        self.assert_soup('<a href="http://example.org?a=1&amp;b=2;3"></a>')
-
-    def test_entities_in_strings_converted_during_parsing(self):
-        # Both XML and HTML entities are converted to Unicode characters
-        # during parsing.
-        text = "<p>&lt;&lt;sacr&eacute;&#32;bleu!&gt;&gt;</p>"
-        expected = "<p>&lt;&lt;sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!&gt;&gt;</p>"
-        self.assert_soup(text, expected)
-
-    def test_smart_quotes_converted_on_the_way_in(self):
-        # Microsoft smart quotes are converted to Unicode characters during
-        # parsing.
-        quote = b"<p>\x91Foo\x92</p>"
-        soup = self.soup(quote)
-        assert soup.p.string == "\N{LEFT SINGLE QUOTATION MARK}Foo\N{RIGHT SINGLE QUOTATION MARK}"
-
-    def test_non_breaking_spaces_converted_on_the_way_in(self):
-        soup = self.soup("<a>&nbsp;&nbsp;</a>")
-        assert soup.a.string == "\N{NO-BREAK SPACE}" * 2
-
-    def test_entities_converted_on_the_way_out(self):
-        text = "<p>&lt;&lt;sacr&eacute;&#32;bleu!&gt;&gt;</p>"
-        expected = "<p>&lt;&lt;sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!&gt;&gt;</p>".encode("utf-8")
-        soup = self.soup(text)
-        assert soup.p.encode("utf-8") == expected
-
-    def test_real_iso_8859_document(self):
-        # Smoke test of interrelated functionality, using an
-        # easy-to-understand document.
-
-        # Here it is in Unicode. Note that it claims to be in ISO-8859-1.
-        unicode_html = '<html><head><meta content="text/html; charset=ISO-8859-1" http-equiv="Content-type"/></head><body><p>Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!</p></body></html>'
-
-        # That's because we're going to encode it into ISO-8859-1,
-        # and use that to test.
-        iso_latin_html = unicode_html.encode("iso-8859-1")
-
-        # Parse the ISO-8859-1 HTML.
-        soup = self.soup(iso_latin_html)
-
-        # Encode it to UTF-8.
-        result = soup.encode("utf-8")
-
-        # What do we expect the result to look like? Well, it would
-        # look like unicode_html, except that the META tag would say
-        # UTF-8 instead of ISO-8859-1.
-        expected = unicode_html.replace("ISO-8859-1", "utf-8")
-
-        # And, of course, it would be in UTF-8, not Unicode.
-        expected = expected.encode("utf-8")
-
-        # Ta-da!
-        assert result == expected
-
-    def test_real_shift_jis_document(self):
-        # Smoke test to make sure the parser can handle a document in
-        # Shift-JIS encoding, without choking.
-        shift_jis_html = (
-            b'<html><head></head><body><pre>'
-            b'\x82\xb1\x82\xea\x82\xcdShift-JIS\x82\xc5\x83R\x81[\x83f'
-            b'\x83B\x83\x93\x83O\x82\xb3\x82\xea\x82\xbd\x93\xfa\x96{\x8c'
-            b'\xea\x82\xcc\x83t\x83@\x83C\x83\x8b\x82\xc5\x82\xb7\x81B'
-            b'</pre></body></html>')
-        unicode_html = shift_jis_html.decode("shift-jis")
-        soup = self.soup(unicode_html)
-
-        # Make sure the parse tree is correctly encoded to various
-        # encodings.
-        assert soup.encode("utf-8") == unicode_html.encode("utf-8")
-        assert soup.encode("euc_jp") == unicode_html.encode("euc_jp")
-
-    def test_real_hebrew_document(self):
-        # A real-world test to make sure we can convert ISO-8859-9 (a
-        # Hebrew encoding) to UTF-8.
-        hebrew_document = b'<html><head><title>Hebrew (ISO 8859-8) in Visual Directionality</title></head><body><h1>Hebrew (ISO 8859-8) in Visual Directionality</h1>\xed\xe5\xec\xf9</body></html>'
-        soup = self.soup(
-            hebrew_document, from_encoding="iso8859-8")
-        # Some tree builders call it iso8859-8, others call it iso-8859-9.
-        # That's not a difference we really care about.
-        assert soup.original_encoding in ('iso8859-8', 'iso-8859-8')
-        assert soup.encode('utf-8') == (
-            hebrew_document.decode("iso8859-8").encode("utf-8")
-        )
-
-    def test_meta_tag_reflects_current_encoding(self):
-        # Here's the <meta> tag saying that a document is
-        # encoded in Shift-JIS.
-        meta_tag = ('<meta content="text/html; charset=x-sjis" '
-                    'http-equiv="Content-type"/>')
-
-        # Here's a document incorporating that meta tag.
-        shift_jis_html = (
-            '<html><head>\n%s\n'
-            '<meta http-equiv="Content-language" content="ja"/>'
-            '</head><body>Shift-JIS markup goes here.') % meta_tag
-        soup = self.soup(shift_jis_html)
-
-        # Parse the document, and the charset is seemingly unaffected.
-        parsed_meta = soup.find('meta', {'http-equiv': 'Content-type'})
-        content = parsed_meta['content']
-        assert 'text/html; charset=x-sjis' == content
-
-        # But that value is actually a ContentMetaAttributeValue object.
-        assert isinstance(content, ContentMetaAttributeValue)
-
-        # And it will take on a value that reflects its current
-        # encoding.
-        assert 'text/html; charset=utf8' == content.encode("utf8")
-
-        # For the rest of the story, see TestSubstitutions in
-        # test_tree.py.
-
-    def test_html5_style_meta_tag_reflects_current_encoding(self):
-        # Here's the <meta> tag saying that a document is
-        # encoded in Shift-JIS.
-        meta_tag = ('<meta id="encoding" charset="x-sjis" />')
-
-        # Here's a document incorporating that meta tag.
-        shift_jis_html = (
-            '<html><head>\n%s\n'
-            '<meta http-equiv="Content-language" content="ja"/>'
-            '</head><body>Shift-JIS markup goes here.') % meta_tag
-        soup = self.soup(shift_jis_html)
-
-        # Parse the document, and the charset is seemingly unaffected.
-        parsed_meta = soup.find('meta', id="encoding")
-        charset = parsed_meta['charset']
-        assert 'x-sjis' == charset
-
-        # But that value is actually a CharsetMetaAttributeValue object.
-        assert isinstance(charset, CharsetMetaAttributeValue)
-
-        # And it will take on a value that reflects its current
-        # encoding.
-        assert 'utf8' == charset.encode("utf8")
-
-    def test_python_specific_encodings_not_used_in_charset(self):
-        # You can encode an HTML document using a Python-specific
-        # encoding, but that encoding won't be mentioned _inside_ the
-        # resulting document. Instead, the document will appear to
-        # have no encoding.
-        for markup in [
-            b'<meta charset="utf8"></head>'
-            b'<meta id="encoding" charset="utf-8" />'
-        ]:
-            soup = self.soup(markup)
-            for encoding in PYTHON_SPECIFIC_ENCODINGS:
-                if encoding in (
-                    'idna', 'mbcs', 'oem', 'undefined',
-                    'string_escape', 'string-escape'
-                ):
-                    # For one reason or another, these will raise an
-                    # exception if we actually try to use them, so don't
-                    # bother.
-                    continue
-                encoded = soup.encode(encoding)
-                assert b'meta charset=""' in encoded
-                assert encoding.encode("ascii") not in encoded
-        
-    def test_tag_with_no_attributes_can_have_attributes_added(self):
-        data = self.soup("<a>text</a>")
-        data.a['foo'] = 'bar'
-        assert '<a foo="bar">text</a>' == data.a.decode()
-
-    def test_closing_tag_with_no_opening_tag(self):
-        # Without BeautifulSoup.open_tag_counter, the </span> tag will
-        # cause _popToTag to be called over and over again as we look
-        # for a <span> tag that wasn't there. The result is that 'text2'
-        # will show up outside the body of the document.
-        soup = self.soup("<body><div><p>text1</p></span>text2</div></body>")
-        assert "<body><div><p>text1</p>text2</div></body>" == soup.body.decode()
-        
-    def test_worst_case(self):
-        """Test the worst case (currently) for linking issues."""
-
-        soup = self.soup(BAD_DOCUMENT)
-        self.linkage_validator(soup)
-
-
-class XMLTreeBuilderSmokeTest(TreeBuilderSmokeTest):
-
-    def test_pickle_and_unpickle_identity(self):
-        # Pickling a tree, then unpickling it, yields a tree identical
-        # to the original.
-        tree = self.soup("<a><b>foo</a>")
-        dumped = pickle.dumps(tree, 2)
-        loaded = pickle.loads(dumped)
-        assert loaded.__class__ == BeautifulSoup
-        assert loaded.decode() == tree.decode()
-
-    def test_docstring_generated(self):
-        soup = self.soup("<root/>")
-        assert soup.encode() == b'<?xml version="1.0" encoding="utf-8"?>\n<root/>'
-
-    def test_xml_declaration(self):
-        markup = b"""<?xml version="1.0" encoding="utf8"?>\n<foo/>"""
-        soup = self.soup(markup)
-        assert markup == soup.encode("utf8")
-
-    def test_python_specific_encodings_not_used_in_xml_declaration(self):
-        # You can encode an XML document using a Python-specific
-        # encoding, but that encoding won't be mentioned _inside_ the
-        # resulting document.
-        markup = b"""<?xml version="1.0"?>\n<foo/>"""
-        soup = self.soup(markup)
-        for encoding in PYTHON_SPECIFIC_ENCODINGS:
-            if encoding in (
-                'idna', 'mbcs', 'oem', 'undefined',
-                'string_escape', 'string-escape'
-            ):
-                # For one reason or another, these will raise an
-                # exception if we actually try to use them, so don't
-                # bother.
-                continue
-            encoded = soup.encode(encoding)
-            assert b'<?xml version="1.0"?>' in encoded
-            assert encoding.encode("ascii") not in encoded
-
-    def test_processing_instruction(self):
-        markup = b"""<?xml version="1.0" encoding="utf8"?>\n<?PITarget PIContent?>"""
-        soup = self.soup(markup)
-        assert markup == soup.encode("utf8")
-
-    def test_real_xhtml_document(self):
-        """A real XHTML document should come out *exactly* the same as it went in."""
-        markup = b"""<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head><title>Hello.</title></head>
-<body>Goodbye.</body>
-</html>"""
-        soup = self.soup(markup)
-        assert soup.encode("utf-8") == markup
-       
-    def test_nested_namespaces(self):
-        doc = b"""<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<parent xmlns="http://ns1/">
-<child xmlns="http://ns2/" xmlns:ns3="http://ns3/">
-<grandchild ns3:attr="value" xmlns="http://ns4/"/>
-</child>
-</parent>"""
-        soup = self.soup(doc)
-        assert doc == soup.encode()
-        
-    def test_formatter_processes_script_tag_for_xml_documents(self):
-        doc = """
-  <script type="text/javascript">
-  </script>
-"""
-        soup = BeautifulSoup(doc, "lxml-xml")
-        # lxml would have stripped this while parsing, but we can add
-        # it later.
-        soup.script.string = 'console.log("< < hey > > ");'
-        encoded = soup.encode()
-        assert b"&lt; &lt; hey &gt; &gt;" in encoded
-
-    def test_can_parse_unicode_document(self):
-        markup = '<?xml version="1.0" encoding="euc-jp"><root>Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!</root>'
-        soup = self.soup(markup)
-        assert 'Sacr\xe9 bleu!' == soup.root.string
-
-    def test_can_parse_unicode_document_begining_with_bom(self):
-        markup = '\N{BYTE ORDER MARK}<?xml version="1.0" encoding="euc-jp"><root>Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!</root>'
-        soup = self.soup(markup)
-        assert 'Sacr\xe9 bleu!' == soup.root.string
-        
-    def test_popping_namespaced_tag(self):
-        markup = '<rss xmlns:dc="foo"><dc:creator>b</dc:creator><dc:date>2012-07-02T20:33:42Z</dc:date><dc:rights>c</dc:rights><image>d</image></rss>'
-        soup = self.soup(markup)
-        assert str(soup.rss) == markup
-
-    def test_docstring_includes_correct_encoding(self):
-        soup = self.soup("<root/>")
-        assert soup.encode("latin1") == b'<?xml version="1.0" encoding="latin1"?>\n<root/>'
-
-    def test_large_xml_document(self):
-        """A large XML document should come out the same as it went in."""
-        markup = (b'<?xml version="1.0" encoding="utf-8"?>\n<root>'
-                  + b'0' * (2**12)
-                  + b'</root>')
-        soup = self.soup(markup)
-        assert soup.encode("utf-8") == markup
-
-    def test_tags_are_empty_element_if_and_only_if_they_are_empty(self):
-        self.assert_soup("<p>", "<p/>")
-        self.assert_soup("<p>foo</p>")
-
-    def test_namespaces_are_preserved(self):
-        markup = '<root xmlns:a="http://example.com/" xmlns:b="http://example.net/"><a:foo>This tag is in the a namespace</a:foo><b:foo>This tag is in the b namespace</b:foo></root>'
-        soup = self.soup(markup)
-        root = soup.root
-        assert "http://example.com/" == root['xmlns:a']
-        assert "http://example.net/" == root['xmlns:b']
-
-    def test_closing_namespaced_tag(self):
-        markup = '<p xmlns:dc="http://purl.org/dc/elements/1.1/"><dc:date>20010504</dc:date></p>'
-        soup = self.soup(markup)
-        assert str(soup.p) == markup
-
-    def test_namespaced_attributes(self):
-        markup = '<foo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><bar xsi:schemaLocation="http://www.example.com"/></foo>'
-        soup = self.soup(markup)
-        assert str(soup.foo) == markup
-
-    def test_namespaced_attributes_xml_namespace(self):
-        markup = '<foo xml:lang="fr">bar</foo>'
-        soup = self.soup(markup)
-        assert str(soup.foo) == markup
-
-    def test_find_by_prefixed_name(self):
-        doc = """<?xml version="1.0" encoding="utf-8"?>
-<Document xmlns="http://example.com/ns0"
-    xmlns:ns1="http://example.com/ns1"
-    xmlns:ns2="http://example.com/ns2">
-    <ns1:tag>foo</ns1:tag>
-    <ns1:tag>bar</ns1:tag>
-    <ns2:tag key="value">baz</ns2:tag>
-</Document>
-"""
-        soup = self.soup(doc)
-
-        # There are three <tag> tags.
-        assert 3 == len(soup.find_all('tag'))
-
-        # But two of them are ns1:tag and one of them is ns2:tag.
-        assert 2 == len(soup.find_all('ns1:tag'))
-        assert 1 == len(soup.find_all('ns2:tag'))
-        
-        assert 1, len(soup.find_all('ns2:tag', key='value'))
-        assert 3, len(soup.find_all(['ns1:tag', 'ns2:tag']))
-        
-    def test_copy_tag_preserves_namespace(self):
-        xml = """<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<w:document xmlns:w="http://example.com/ns0"/>"""
-    
-        soup = self.soup(xml)
-        tag = soup.document
-        duplicate = copy.copy(tag)
-
-        # The two tags have the same namespace prefix.
-        assert tag.prefix == duplicate.prefix
-
-    def test_worst_case(self):
-        """Test the worst case (currently) for linking issues."""
-
-        soup = self.soup(BAD_DOCUMENT)
-        self.linkage_validator(soup)
-
-
-class HTML5TreeBuilderSmokeTest(HTMLTreeBuilderSmokeTest):
-    """Smoke test for a tree builder that supports HTML5."""
-
-    def test_real_xhtml_document(self):
-        # Since XHTML is not HTML5, HTML5 parsers are not tested to handle
-        # XHTML documents in any particular way.
-        pass
-
-    def test_html_tags_have_namespace(self):
-        markup = "<a>"
-        soup = self.soup(markup)
-        assert "http://www.w3.org/1999/xhtml" == soup.a.namespace
-
-    def test_svg_tags_have_namespace(self):
-        markup = '<svg><circle/></svg>'
-        soup = self.soup(markup)
-        namespace = "http://www.w3.org/2000/svg"
-        assert namespace == soup.svg.namespace
-        assert namespace == soup.circle.namespace
-
-
-    def test_mathml_tags_have_namespace(self):
-        markup = '<math><msqrt>5</msqrt></math>'
-        soup = self.soup(markup)
-        namespace = 'http://www.w3.org/1998/Math/MathML'
-        assert namespace == soup.math.namespace
-        assert namespace == soup.msqrt.namespace
-
-    def test_xml_declaration_becomes_comment(self):
-        markup = '<?xml version="1.0" encoding="utf-8"?><html></html>'
-        soup = self.soup(markup)
-        assert isinstance(soup.contents[0], Comment)
-        assert soup.contents[0] == '?xml version="1.0" encoding="utf-8"?'
-        assert "html" == soup.contents[0].next_element.name
diff --git a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-4670634698080256.testcase b/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-4670634698080256.testcase
deleted file mode 100644
index 4828f8a4..00000000
--- a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-4670634698080256.testcase
+++ /dev/null
@@ -1 +0,0 @@
- ÿÿ      ÿ <css
\ No newline at end of file
diff --git a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-4818336571064320.testcase b/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-4818336571064320.testcase
deleted file mode 100644
index b34be8b1..00000000
--- a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-4818336571064320.testcase
+++ /dev/null
@@ -1 +0,0 @@
-ÿ<!DOCTyPEV PUBLIC'''Ð'
\ No newline at end of file
diff --git a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-4999465949331456.testcase b/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-4999465949331456.testcase
deleted file mode 100644
index dbeed3f5..00000000
--- a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-4999465949331456.testcase
+++ /dev/null
@@ -1 +0,0 @@
-)<a><math><TR><a><mI><a><p><a>
\ No newline at end of file
diff --git a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5000587759190016.testcase b/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5000587759190016.testcase
deleted file mode 100644
index 8a585ce9..00000000
Binary files a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5000587759190016.testcase and /dev/null differ
diff --git a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5167584867909632.testcase b/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5167584867909632.testcase
deleted file mode 100644
index 0fe66dd2..00000000
Binary files a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5167584867909632.testcase and /dev/null differ
diff --git a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5270998950477824.testcase b/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5270998950477824.testcase
deleted file mode 100644
index fd411427..00000000
Binary files a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5270998950477824.testcase and /dev/null differ
diff --git a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5375146639360000.testcase b/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5375146639360000.testcase
deleted file mode 100644
index 6248b2c5..00000000
--- a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5375146639360000.testcase
+++ /dev/null
@@ -1 +0,0 @@
-ÿ                 ><applet></applet><applet></applet><apple|><applet><applet><appl›„><applet><applet></applet></applet></applet></applet><applet></applet><apple>t<applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet>et><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><azplet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><plet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet><applet></applet></applet></applet></applet></appt></applet></applet></applet></applet></applet></applet></applet></applet></applet></applet></applet></applet></applet></applet></applet></applet></applet></applet><<meta charset=utf-8>
\ No newline at end of file
diff --git a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5492400320282624.testcase b/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5492400320282624.testcase
deleted file mode 100644
index 107da539..00000000
Binary files a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5492400320282624.testcase and /dev/null differ
diff --git a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5703933063462912.testcase b/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5703933063462912.testcase
deleted file mode 100644
index 367106c7..00000000
--- a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5703933063462912.testcase
+++ /dev/null
@@ -1,2 +0,0 @@
-
-<![ 
\ No newline at end of file
diff --git a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5843991618256896.testcase b/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5843991618256896.testcase
deleted file mode 100644
index b8536ef0..00000000
--- a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5843991618256896.testcase
+++ /dev/null
@@ -1 +0,0 @@
--<math><sElect><mi><sElect><sElect>
\ No newline at end of file
diff --git a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5984173902397440.testcase b/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5984173902397440.testcase
deleted file mode 100644
index d8b549c5..00000000
Binary files a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-5984173902397440.testcase and /dev/null differ
diff --git a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6124268085182464.testcase b/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6124268085182464.testcase
deleted file mode 100644
index 123e56d4..00000000
--- a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6124268085182464.testcase
+++ /dev/null
@@ -1 +0,0 @@
-)<math><math><math><math><math><math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&)<math><math><annotation-xul>&
\ No newline at end of file
diff --git a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6241471367348224.testcase b/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6241471367348224.testcase
deleted file mode 100644
index 2831c484..00000000
--- a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6241471367348224.testcase
+++ /dev/null
@@ -1 +0,0 @@
-ñ<table><svg><html>
\ No newline at end of file
diff --git a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6306874195312640.testcase b/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6306874195312640.testcase
deleted file mode 100644
index b60a250c..00000000
--- a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6306874195312640.testcase
+++ /dev/null
@@ -1 +0,0 @@
--      ÿÿ  <math><select><mi><select><select>t
\ No newline at end of file
diff --git a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6450958476902400.testcase b/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6450958476902400.testcase
deleted file mode 100644
index a823d557..00000000
Binary files a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6450958476902400.testcase and /dev/null differ
diff --git a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6600557255327744.testcase b/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6600557255327744.testcase
deleted file mode 100644
index 65af44d8..00000000
Binary files a/lib/bs4/tests/fuzz/clusterfuzz-testcase-minimized-bs4_fuzzer-6600557255327744.testcase and /dev/null differ
diff --git a/lib/bs4/tests/fuzz/crash-0d306a50c8ed8bcd0785b67000fcd5dea1d33f08.testcase b/lib/bs4/tests/fuzz/crash-0d306a50c8ed8bcd0785b67000fcd5dea1d33f08.testcase
deleted file mode 100644
index 5559adbb..00000000
Binary files a/lib/bs4/tests/fuzz/crash-0d306a50c8ed8bcd0785b67000fcd5dea1d33f08.testcase and /dev/null differ
diff --git a/lib/bs4/tests/fuzz/crash-ffbdfa8a2b26f13537b68d3794b0478a4090ee4a.testcase b/lib/bs4/tests/fuzz/crash-ffbdfa8a2b26f13537b68d3794b0478a4090ee4a.testcase
deleted file mode 100644
index 88571155..00000000
Binary files a/lib/bs4/tests/fuzz/crash-ffbdfa8a2b26f13537b68d3794b0478a4090ee4a.testcase and /dev/null differ
diff --git a/lib/bs4/tests/test_builder.py b/lib/bs4/tests/test_builder.py
deleted file mode 100644
index 75370712..00000000
--- a/lib/bs4/tests/test_builder.py
+++ /dev/null
@@ -1,29 +0,0 @@
-import pytest
-from unittest.mock import patch
-from bs4.builder import DetectsXMLParsedAsHTML
-
-class TestDetectsXMLParsedAsHTML(object):
-
-    @pytest.mark.parametrize(
-        "markup,looks_like_xml",
-        [("No xml declaration", False),
-         ("<html>obviously HTML</html", False),
-         ("<?xml ><html>Actually XHTML</html>", False),
-         ("<?xml>            <    html>Tricky XHTML</html>", False),
-         ("<?xml ><no-html-tag>", True),
-        ]
-    )
-    def test_warn_if_markup_looks_like_xml(self, markup, looks_like_xml):
-        # Test of our ability to guess at whether markup looks XML-ish
-        # _and_ not HTML-ish.
-        with patch('bs4.builder.DetectsXMLParsedAsHTML._warn') as mock:
-            for data in markup, markup.encode('utf8'):
-                result = DetectsXMLParsedAsHTML.warn_if_markup_looks_like_xml(
-                    data
-                )
-                assert result == looks_like_xml
-                if looks_like_xml:
-                    assert mock.called
-                else:
-                    assert not mock.called
-                mock.reset_mock()
diff --git a/lib/bs4/tests/test_builder_registry.py b/lib/bs4/tests/test_builder_registry.py
deleted file mode 100644
index 9327174f..00000000
--- a/lib/bs4/tests/test_builder_registry.py
+++ /dev/null
@@ -1,137 +0,0 @@
-"""Tests of the builder registry."""
-
-import pytest
-import warnings
-
-from bs4 import BeautifulSoup
-from bs4.builder import (
-    builder_registry as registry,
-    HTMLParserTreeBuilder,
-    TreeBuilderRegistry,
-)
-
-from . import (
-    HTML5LIB_PRESENT,
-    LXML_PRESENT,
-)
-
-if HTML5LIB_PRESENT:
-    from bs4.builder import HTML5TreeBuilder
-
-if LXML_PRESENT:
-    from bs4.builder import (
-        LXMLTreeBuilderForXML,
-        LXMLTreeBuilder,
-        )
-
-
-# TODO: Split out the lxml and html5lib tests into their own classes
-# and gate with pytest.mark.skipIf.
-class TestBuiltInRegistry(object):
-    """Test the built-in registry with the default builders registered."""
-
-    def test_combination(self):
-        assert registry.lookup('strict', 'html') == HTMLParserTreeBuilder
-        if LXML_PRESENT:
-            assert registry.lookup('fast', 'html') == LXMLTreeBuilder
-            assert registry.lookup('permissive', 'xml') == LXMLTreeBuilderForXML
-        if HTML5LIB_PRESENT:
-            assert registry.lookup('html5lib', 'html') == HTML5TreeBuilder
-
-    def test_lookup_by_markup_type(self):
-        if LXML_PRESENT:
-            assert registry.lookup('html') == LXMLTreeBuilder
-            assert registry.lookup('xml') == LXMLTreeBuilderForXML
-        else:
-            assert registry.lookup('xml') == None
-            if HTML5LIB_PRESENT:
-                assert registry.lookup('html') == HTML5TreeBuilder
-            else:
-                assert registry.lookup('html') == HTMLParserTreeBuilder
-
-    def test_named_library(self):
-        if LXML_PRESENT:
-            assert registry.lookup('lxml', 'xml') == LXMLTreeBuilderForXML
-            assert registry.lookup('lxml', 'html') == LXMLTreeBuilder
-        if HTML5LIB_PRESENT:
-            assert registry.lookup('html5lib') == HTML5TreeBuilder
-
-        assert registry.lookup('html.parser') == HTMLParserTreeBuilder
-
-    def test_beautifulsoup_constructor_does_lookup(self):
-
-        with warnings.catch_warnings(record=True) as w:
-            # This will create a warning about not explicitly
-            # specifying a parser, but we'll ignore it.
-
-            # You can pass in a string.
-            BeautifulSoup("", features="html")
-            # Or a list of strings.
-            BeautifulSoup("", features=["html", "fast"])
-            pass
-            
-        # You'll get an exception if BS can't find an appropriate
-        # builder.
-        with pytest.raises(ValueError):
-            BeautifulSoup("", features="no-such-feature")
-
-class TestRegistry(object):
-    """Test the TreeBuilderRegistry class in general."""
-
-    def setup_method(self):
-        self.registry = TreeBuilderRegistry()
-
-    def builder_for_features(self, *feature_list):
-        cls = type('Builder_' + '_'.join(feature_list),
-                   (object,), {'features' : feature_list})
-
-        self.registry.register(cls)
-        return cls
-
-    def test_register_with_no_features(self):
-        builder = self.builder_for_features()
-
-        # Since the builder advertises no features, you can't find it
-        # by looking up features.
-        assert self.registry.lookup('foo') is None
-
-        # But you can find it by doing a lookup with no features, if
-        # this happens to be the only registered builder.
-        assert self.registry.lookup() == builder
-
-    def test_register_with_features_makes_lookup_succeed(self):
-        builder = self.builder_for_features('foo', 'bar')
-        assert self.registry.lookup('foo') is builder
-        assert self.registry.lookup('bar') is builder
-
-    def test_lookup_fails_when_no_builder_implements_feature(self):
-        builder = self.builder_for_features('foo', 'bar')
-        assert self.registry.lookup('baz') is None
-
-    def test_lookup_gets_most_recent_registration_when_no_feature_specified(self):
-        builder1 = self.builder_for_features('foo')
-        builder2 = self.builder_for_features('bar')
-        assert self.registry.lookup() == builder2
-
-    def test_lookup_fails_when_no_tree_builders_registered(self):
-        assert self.registry.lookup() is None
-
-    def test_lookup_gets_most_recent_builder_supporting_all_features(self):
-        has_one = self.builder_for_features('foo')
-        has_the_other = self.builder_for_features('bar')
-        has_both_early = self.builder_for_features('foo', 'bar', 'baz')
-        has_both_late = self.builder_for_features('foo', 'bar', 'quux')
-        lacks_one = self.builder_for_features('bar')
-        has_the_other = self.builder_for_features('foo')
-
-        # There are two builders featuring 'foo' and 'bar', but
-        # the one that also features 'quux' was registered later.
-        assert self.registry.lookup('foo', 'bar') == has_both_late
-
-        # There is only one builder featuring 'foo', 'bar', and 'baz'.
-        assert self.registry.lookup('foo', 'bar', 'baz') == has_both_early
-
-    def test_lookup_fails_when_cannot_reconcile_requested_features(self):
-        builder1 = self.builder_for_features('foo', 'bar')
-        builder2 = self.builder_for_features('foo', 'baz')
-        assert self.registry.lookup('bar', 'baz') is None
diff --git a/lib/bs4/tests/test_css.py b/lib/bs4/tests/test_css.py
deleted file mode 100644
index 359dbcd2..00000000
--- a/lib/bs4/tests/test_css.py
+++ /dev/null
@@ -1,487 +0,0 @@
-import pytest
-import types
-from unittest.mock import MagicMock
-
-from bs4 import (
-    CSS,
-    BeautifulSoup,
-    ResultSet,
-)
-
-from . import (
-    SoupTest,
-    SOUP_SIEVE_PRESENT,
-)
-
-if SOUP_SIEVE_PRESENT:
-    from soupsieve import SelectorSyntaxError
-
-
-@pytest.mark.skipif(not SOUP_SIEVE_PRESENT, reason="Soup Sieve not installed")
-class TestCSSSelectors(SoupTest):
-    """Test basic CSS selector functionality.
-
-    This functionality is implemented in soupsieve, which has a much
-    more comprehensive test suite, so this is basically an extra check
-    that soupsieve works as expected.
-    """
-
-    HTML = """
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-"http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-<title>The title</title>
-<link rel="stylesheet" href="blah.css" type="text/css" id="l1">
-</head>
-<body>
-<custom-dashed-tag class="dashed" id="dash1">Hello there.</custom-dashed-tag>
-<div id="main" class="fancy">
-<div id="inner">
-<h1 id="header1">An H1</h1>
-<p>Some text</p>
-<p class="onep" id="p1">Some more text</p>
-<h2 id="header2">An H2</h2>
-<p class="class1 class2 class3" id="pmulti">Another</p>
-<a href="http://bob.example.org/" rel="friend met" id="bob">Bob</a>
-<h2 id="header3">Another H2</h2>
-<a id="me" href="http://simonwillison.net/" rel="me">me</a>
-<span class="s1">
-<a href="#" id="s1a1">span1a1</a>
-<a href="#" id="s1a2">span1a2 <span id="s1a2s1">test</span></a>
-<span class="span2">
-<a href="#" id="s2a1">span2a1</a>
-</span>
-<span class="span3"></span>
-<custom-dashed-tag class="dashed" id="dash2"/>
-<div data-tag="dashedvalue" id="data1"/>
-</span>
-</div>
-<x id="xid">
-<z id="zida"/>
-<z id="zidab"/>
-<z id="zidac"/>
-</x>
-<y id="yid">
-<z id="zidb"/>
-</y>
-<p lang="en" id="lang-en">English</p>
-<p lang="en-gb" id="lang-en-gb">English UK</p>
-<p lang="en-us" id="lang-en-us">English US</p>
-<p lang="fr" id="lang-fr">French</p>
-</div>
-
-<div id="footer">
-</div>
-"""
-
-    def setup_method(self):
-        self.soup = BeautifulSoup(self.HTML, 'html.parser')
-
-    def assert_selects(self, selector, expected_ids, **kwargs):
-        results = self.soup.select(selector, **kwargs)
-        assert isinstance(results, ResultSet)
-        el_ids = [el['id'] for el in results]
-        el_ids.sort()
-        expected_ids.sort()
-        assert expected_ids == el_ids, "Selector %s, expected [%s], got [%s]" % (
-                selector, ', '.join(expected_ids), ', '.join(el_ids)
-        )
-
-    assertSelect = assert_selects
-
-    def assert_select_multiple(self, *tests):
-        for selector, expected_ids in tests:
-            self.assert_selects(selector, expected_ids)
-
-    def test_precompiled(self):
-        sel = self.soup.css.compile('div')
-
-        els = self.soup.select(sel)
-        assert len(els) == 4
-        for div in els:
-            assert div.name == 'div'
-
-        el = self.soup.select_one(sel)
-        assert 'main' == el['id']
-
-    def test_one_tag_one(self):
-        els = self.soup.select('title')
-        assert len(els) == 1
-        assert els[0].name == 'title'
-        assert els[0].contents == ['The title']
-
-    def test_one_tag_many(self):
-        els = self.soup.select('div')
-        assert len(els) == 4
-        for div in els:
-            assert div.name == 'div'
-
-        el = self.soup.select_one('div')
-        assert 'main' == el['id']
-
-    def test_select_one_returns_none_if_no_match(self):
-        match = self.soup.select_one('nonexistenttag')
-        assert None == match
-
-
-    def test_tag_in_tag_one(self):
-        els = self.soup.select('div div')
-        self.assert_selects('div div', ['inner', 'data1'])
-
-    def test_tag_in_tag_many(self):
-        for selector in ('html div', 'html body div', 'body div'):
-            self.assert_selects(selector, ['data1', 'main', 'inner', 'footer'])
-
-
-    def test_limit(self):
-        self.assert_selects('html div', ['main'], limit=1)
-        self.assert_selects('html body div', ['inner', 'main'], limit=2)
-        self.assert_selects('body div', ['data1', 'main', 'inner', 'footer'],
-                           limit=10)
-
-    def test_tag_no_match(self):
-        assert len(self.soup.select('del')) == 0
-
-    def test_invalid_tag(self):
-        with pytest.raises(SelectorSyntaxError):
-            self.soup.select('tag%t')
-
-    def test_select_dashed_tag_ids(self):
-        self.assert_selects('custom-dashed-tag', ['dash1', 'dash2'])
-
-    def test_select_dashed_by_id(self):
-        dashed = self.soup.select('custom-dashed-tag[id=\"dash2\"]')
-        assert dashed[0].name == 'custom-dashed-tag'
-        assert dashed[0]['id'] == 'dash2'
-
-    def test_dashed_tag_text(self):
-        assert self.soup.select('body > custom-dashed-tag')[0].text == 'Hello there.'
-
-    def test_select_dashed_matches_find_all(self):
-        assert self.soup.select('custom-dashed-tag') == self.soup.find_all('custom-dashed-tag')
-
-    def test_header_tags(self):
-        self.assert_select_multiple(
-            ('h1', ['header1']),
-            ('h2', ['header2', 'header3']),
-        )
-
-    def test_class_one(self):
-        for selector in ('.onep', 'p.onep', 'html p.onep'):
-            els = self.soup.select(selector)
-            assert len(els) == 1
-            assert els[0].name == 'p'
-            assert els[0]['class'] == ['onep']
-
-    def test_class_mismatched_tag(self):
-        els = self.soup.select('div.onep')
-        assert len(els) == 0
-
-    def test_one_id(self):
-        for selector in ('div#inner', '#inner', 'div div#inner'):
-            self.assert_selects(selector, ['inner'])
-
-    def test_bad_id(self):
-        els = self.soup.select('#doesnotexist')
-        assert len(els) == 0
-
-    def test_items_in_id(self):
-        els = self.soup.select('div#inner p')
-        assert len(els) == 3
-        for el in els:
-            assert el.name == 'p'
-        assert els[1]['class'] == ['onep']
-        assert not els[0].has_attr('class')
-
-    def test_a_bunch_of_emptys(self):
-        for selector in ('div#main del', 'div#main div.oops', 'div div#main'):
-            assert len(self.soup.select(selector)) == 0
-
-    def test_multi_class_support(self):
-        for selector in ('.class1', 'p.class1', '.class2', 'p.class2',
-            '.class3', 'p.class3', 'html p.class2', 'div#inner .class2'):
-            self.assert_selects(selector, ['pmulti'])
-
-    def test_multi_class_selection(self):
-        for selector in ('.class1.class3', '.class3.class2',
-                         '.class1.class2.class3'):
-            self.assert_selects(selector, ['pmulti'])
-
-    def test_child_selector(self):
-        self.assert_selects('.s1 > a', ['s1a1', 's1a2'])
-        self.assert_selects('.s1 > a span', ['s1a2s1'])
-
-    def test_child_selector_id(self):
-        self.assert_selects('.s1 > a#s1a2 span', ['s1a2s1'])
-
-    def test_attribute_equals(self):
-        self.assert_select_multiple(
-            ('p[class="onep"]', ['p1']),
-            ('p[id="p1"]', ['p1']),
-            ('[class="onep"]', ['p1']),
-            ('[id="p1"]', ['p1']),
-            ('link[rel="stylesheet"]', ['l1']),
-            ('link[type="text/css"]', ['l1']),
-            ('link[href="blah.css"]', ['l1']),
-            ('link[href="no-blah.css"]', []),
-            ('[rel="stylesheet"]', ['l1']),
-            ('[type="text/css"]', ['l1']),
-            ('[href="blah.css"]', ['l1']),
-            ('[href="no-blah.css"]', []),
-            ('p[href="no-blah.css"]', []),
-            ('[href="no-blah.css"]', []),
-        )
-
-    def test_attribute_tilde(self):
-        self.assert_select_multiple(
-            ('p[class~="class1"]', ['pmulti']),
-            ('p[class~="class2"]', ['pmulti']),
-            ('p[class~="class3"]', ['pmulti']),
-            ('[class~="class1"]', ['pmulti']),
-            ('[class~="class2"]', ['pmulti']),
-            ('[class~="class3"]', ['pmulti']),
-            ('a[rel~="friend"]', ['bob']),
-            ('a[rel~="met"]', ['bob']),
-            ('[rel~="friend"]', ['bob']),
-            ('[rel~="met"]', ['bob']),
-        )
-
-    def test_attribute_startswith(self):
-        self.assert_select_multiple(
-            ('[rel^="style"]', ['l1']),
-            ('link[rel^="style"]', ['l1']),
-            ('notlink[rel^="notstyle"]', []),
-            ('[rel^="notstyle"]', []),
-            ('link[rel^="notstyle"]', []),
-            ('link[href^="bla"]', ['l1']),
-            ('a[href^="http://"]', ['bob', 'me']),
-            ('[href^="http://"]', ['bob', 'me']),
-            ('[id^="p"]', ['pmulti', 'p1']),
-            ('[id^="m"]', ['me', 'main']),
-            ('div[id^="m"]', ['main']),
-            ('a[id^="m"]', ['me']),
-            ('div[data-tag^="dashed"]', ['data1'])
-        )
-
-    def test_attribute_endswith(self):
-        self.assert_select_multiple(
-            ('[href$=".css"]', ['l1']),
-            ('link[href$=".css"]', ['l1']),
-            ('link[id$="1"]', ['l1']),
-            ('[id$="1"]', ['data1', 'l1', 'p1', 'header1', 's1a1', 's2a1', 's1a2s1', 'dash1']),
-            ('div[id$="1"]', ['data1']),
-            ('[id$="noending"]', []),
-        )
-
-    def test_attribute_contains(self):
-        self.assert_select_multiple(
-            # From test_attribute_startswith
-            ('[rel*="style"]', ['l1']),
-            ('link[rel*="style"]', ['l1']),
-            ('notlink[rel*="notstyle"]', []),
-            ('[rel*="notstyle"]', []),
-            ('link[rel*="notstyle"]', []),
-            ('link[href*="bla"]', ['l1']),
-            ('[href*="http://"]', ['bob', 'me']),
-            ('[id*="p"]', ['pmulti', 'p1']),
-            ('div[id*="m"]', ['main']),
-            ('a[id*="m"]', ['me']),
-            # From test_attribute_endswith
-            ('[href*=".css"]', ['l1']),
-            ('link[href*=".css"]', ['l1']),
-            ('link[id*="1"]', ['l1']),
-            ('[id*="1"]', ['data1', 'l1', 'p1', 'header1', 's1a1', 's1a2', 's2a1', 's1a2s1', 'dash1']),
-            ('div[id*="1"]', ['data1']),
-            ('[id*="noending"]', []),
-            # New for this test
-            ('[href*="."]', ['bob', 'me', 'l1']),
-            ('a[href*="."]', ['bob', 'me']),
-            ('link[href*="."]', ['l1']),
-            ('div[id*="n"]', ['main', 'inner']),
-            ('div[id*="nn"]', ['inner']),
-            ('div[data-tag*="edval"]', ['data1'])
-        )
-
-    def test_attribute_exact_or_hypen(self):
-        self.assert_select_multiple(
-            ('p[lang|="en"]', ['lang-en', 'lang-en-gb', 'lang-en-us']),
-            ('[lang|="en"]', ['lang-en', 'lang-en-gb', 'lang-en-us']),
-            ('p[lang|="fr"]', ['lang-fr']),
-            ('p[lang|="gb"]', []),
-        )
-
-    def test_attribute_exists(self):
-        self.assert_select_multiple(
-            ('[rel]', ['l1', 'bob', 'me']),
-            ('link[rel]', ['l1']),
-            ('a[rel]', ['bob', 'me']),
-            ('[lang]', ['lang-en', 'lang-en-gb', 'lang-en-us', 'lang-fr']),
-            ('p[class]', ['p1', 'pmulti']),
-            ('[blah]', []),
-            ('p[blah]', []),
-            ('div[data-tag]', ['data1'])
-        )
-
-    def test_quoted_space_in_selector_name(self):
-        html = """<div style="display: wrong">nope</div>
-        <div style="display: right">yes</div>
-        """
-        soup = BeautifulSoup(html, 'html.parser')
-        [chosen] = soup.select('div[style="display: right"]')
-        assert "yes" == chosen.string
-
-    def test_unsupported_pseudoclass(self):
-        with pytest.raises(NotImplementedError):
-            self.soup.select("a:no-such-pseudoclass")
-
-        with pytest.raises(SelectorSyntaxError):
-            self.soup.select("a:nth-of-type(a)")
-
-    def test_nth_of_type(self):
-        # Try to select first paragraph
-        els = self.soup.select('div#inner p:nth-of-type(1)')
-        assert len(els) == 1
-        assert els[0].string == 'Some text'
-
-        # Try to select third paragraph
-        els = self.soup.select('div#inner p:nth-of-type(3)')
-        assert len(els) == 1
-        assert els[0].string == 'Another'
-
-        # Try to select (non-existent!) fourth paragraph
-        els = self.soup.select('div#inner p:nth-of-type(4)')
-        assert len(els) == 0
-
-        # Zero will select no tags.
-        els = self.soup.select('div p:nth-of-type(0)')
-        assert len(els) == 0
-
-    def test_nth_of_type_direct_descendant(self):
-        els = self.soup.select('div#inner > p:nth-of-type(1)')
-        assert len(els) == 1
-        assert els[0].string == 'Some text'
-
-    def test_id_child_selector_nth_of_type(self):
-        self.assert_selects('#inner > p:nth-of-type(2)', ['p1'])
-
-    def test_select_on_element(self):
-        # Other tests operate on the tree; this operates on an element
-        # within the tree.
-        inner = self.soup.find("div", id="main")
-        selected = inner.select("div")
-        # The <div id="inner"> tag was selected. The <div id="footer">
-        # tag was not.
-        self.assert_selects_ids(selected, ['inner', 'data1'])
-
-    def test_overspecified_child_id(self):
-        self.assert_selects(".fancy #inner", ['inner'])
-        self.assert_selects(".normal #inner", [])
-
-    def test_adjacent_sibling_selector(self):
-        self.assert_selects('#p1 + h2', ['header2'])
-        self.assert_selects('#p1 + h2 + p', ['pmulti'])
-        self.assert_selects('#p1 + #header2 + .class1', ['pmulti'])
-        assert [] == self.soup.select('#p1 + p')
-
-    def test_general_sibling_selector(self):
-        self.assert_selects('#p1 ~ h2', ['header2', 'header3'])
-        self.assert_selects('#p1 ~ #header2', ['header2'])
-        self.assert_selects('#p1 ~ h2 + a', ['me'])
-        self.assert_selects('#p1 ~ h2 + [rel="me"]', ['me'])
-        assert [] == self.soup.select('#inner ~ h2')
-
-    def test_dangling_combinator(self):
-        with pytest.raises(SelectorSyntaxError):
-            self.soup.select('h1 >')
-
-    def test_sibling_combinator_wont_select_same_tag_twice(self):
-        self.assert_selects('p[lang] ~ p', ['lang-en-gb', 'lang-en-us', 'lang-fr'])
-
-    # Test the selector grouping operator (the comma)
-    def test_multiple_select(self):
-        self.assert_selects('x, y', ['xid', 'yid'])
-
-    def test_multiple_select_with_no_space(self):
-        self.assert_selects('x,y', ['xid', 'yid'])
-
-    def test_multiple_select_with_more_space(self):
-        self.assert_selects('x,    y', ['xid', 'yid'])
-
-    def test_multiple_select_duplicated(self):
-        self.assert_selects('x, x', ['xid'])
-
-    def test_multiple_select_sibling(self):
-        self.assert_selects('x, y ~ p[lang=fr]', ['xid', 'lang-fr'])
-
-    def test_multiple_select_tag_and_direct_descendant(self):
-        self.assert_selects('x, y > z', ['xid', 'zidb'])
-
-    def test_multiple_select_direct_descendant_and_tags(self):
-        self.assert_selects('div > x, y, z', ['xid', 'yid', 'zida', 'zidb', 'zidab', 'zidac'])
-
-    def test_multiple_select_indirect_descendant(self):
-        self.assert_selects('div x,y,  z', ['xid', 'yid', 'zida', 'zidb', 'zidab', 'zidac'])
-
-    def test_invalid_multiple_select(self):
-        with pytest.raises(SelectorSyntaxError):
-            self.soup.select(',x, y')
-        with pytest.raises(SelectorSyntaxError):
-            self.soup.select('x,,y')
-
-    def test_multiple_select_attrs(self):
-        self.assert_selects('p[lang=en], p[lang=en-gb]', ['lang-en', 'lang-en-gb'])
-
-    def test_multiple_select_ids(self):
-        self.assert_selects('x, y > z[id=zida], z[id=zidab], z[id=zidb]', ['xid', 'zidb', 'zidab'])
-
-    def test_multiple_select_nested(self):
-        self.assert_selects('body > div > x, y > z', ['xid', 'zidb'])
-
-    def test_select_duplicate_elements(self):
-        # When markup contains duplicate elements, a multiple select
-        # will find all of them.
-        markup = '<div class="c1"/><div class="c2"/><div class="c1"/>'
-        soup = BeautifulSoup(markup, 'html.parser')
-        selected = soup.select(".c1, .c2")
-        assert 3 == len(selected)
-
-        # Verify that find_all finds the same elements, though because
-        # of an implementation detail it finds them in a different
-        # order.
-        for element in soup.find_all(class_=['c1', 'c2']):
-            assert element in selected
-
-    def test_closest(self):
-        inner = self.soup.find("div", id="inner")
-        closest = inner.css.closest("div[id=main]")
-        assert closest == self.soup.find("div", id="main")
-
-    def test_match(self):
-        inner = self.soup.find("div", id="inner")
-        main = self.soup.find("div", id="main")
-        assert inner.css.match("div[id=main]") == False
-        assert main.css.match("div[id=main]") == True
-
-    def test_iselect(self):
-        gen = self.soup.css.iselect("h2")
-        assert isinstance(gen, types.GeneratorType)
-        [header2, header3] = gen
-        assert header2['id'] == 'header2'
-        assert header3['id'] == 'header3'
-
-    def test_filter(self):
-        inner = self.soup.find("div", id="inner")
-        results = inner.css.filter("h2")
-        assert len(inner.css.filter("h2")) == 2
-
-        results = inner.css.filter("h2[id=header3]")
-        assert isinstance(results, ResultSet)
-        [result] = results
-        assert result['id'] == 'header3'
-
-    def test_escape(self):
-        m = self.soup.css.escape
-        assert m(".foo#bar") == '\\.foo\\#bar'
-        assert m("()[]{}") == '\\(\\)\\[\\]\\{\\}'
-        assert m(".foo") == self.soup.css.escape(".foo")
diff --git a/lib/bs4/tests/test_dammit.py b/lib/bs4/tests/test_dammit.py
deleted file mode 100644
index 9aad0ac6..00000000
--- a/lib/bs4/tests/test_dammit.py
+++ /dev/null
@@ -1,370 +0,0 @@
-# encoding: utf-8
-import pytest
-import logging
-import bs4
-from bs4 import BeautifulSoup
-from bs4.dammit import (
-    EntitySubstitution,
-    EncodingDetector,
-    UnicodeDammit,
-)
-
-class TestUnicodeDammit(object):
-    """Standalone tests of UnicodeDammit."""
-
-    def test_unicode_input(self):
-        markup = "I'm already Unicode! \N{SNOWMAN}"
-        dammit = UnicodeDammit(markup)
-        assert dammit.unicode_markup == markup
-
-    @pytest.mark.parametrize(
-        "smart_quotes_to,expect_converted",
-        [(None, "\u2018\u2019\u201c\u201d"),
-         ("xml", "&#x2018;&#x2019;&#x201C;&#x201D;"),
-         ("html", "&lsquo;&rsquo;&ldquo;&rdquo;"),
-         ("ascii", "''" + '""'),
-        ]
-    )
-    def test_smart_quotes_to(self, smart_quotes_to, expect_converted):
-        """Verify the functionality of the smart_quotes_to argument
-        to the UnicodeDammit constructor."""
-        markup = b"<foo>\x91\x92\x93\x94</foo>"
-        converted = UnicodeDammit(
-            markup, known_definite_encodings=["windows-1252"],
-            smart_quotes_to=smart_quotes_to
-        ).unicode_markup
-        assert converted == "<foo>{}</foo>".format(expect_converted)
-        
-    def test_detect_utf8(self):
-        utf8 = b"Sacr\xc3\xa9 bleu! \xe2\x98\x83"
-        dammit = UnicodeDammit(utf8)
-        assert dammit.original_encoding.lower() == 'utf-8'
-        assert dammit.unicode_markup == 'Sacr\xe9 bleu! \N{SNOWMAN}'
-
-    def test_convert_hebrew(self):
-        hebrew = b"\xed\xe5\xec\xf9"
-        dammit = UnicodeDammit(hebrew, ["iso-8859-8"])
-        assert dammit.original_encoding.lower() == 'iso-8859-8'
-        assert dammit.unicode_markup == '\u05dd\u05d5\u05dc\u05e9'
-
-    def test_dont_see_smart_quotes_where_there_are_none(self):
-        utf_8 = b"\343\202\261\343\203\274\343\202\277\343\202\244 Watch"
-        dammit = UnicodeDammit(utf_8)
-        assert dammit.original_encoding.lower() == 'utf-8'
-        assert dammit.unicode_markup.encode("utf-8") == utf_8
-
-    def test_ignore_inappropriate_codecs(self):
-        utf8_data = "Räksmörgås".encode("utf-8")
-        dammit = UnicodeDammit(utf8_data, ["iso-8859-8"])
-        assert dammit.original_encoding.lower() == 'utf-8'
-
-    def test_ignore_invalid_codecs(self):
-        utf8_data = "Räksmörgås".encode("utf-8")
-        for bad_encoding in ['.utf8', '...', 'utF---16.!']:
-            dammit = UnicodeDammit(utf8_data, [bad_encoding])
-            assert dammit.original_encoding.lower() == 'utf-8'
-
-    def test_exclude_encodings(self):
-        # This is UTF-8.
-        utf8_data = "Räksmörgås".encode("utf-8")
-
-        # But if we exclude UTF-8 from consideration, the guess is
-        # Windows-1252.
-        dammit = UnicodeDammit(utf8_data, exclude_encodings=["utf-8"])
-        assert dammit.original_encoding.lower() == 'windows-1252'
-
-        # And if we exclude that, there is no valid guess at all.
-        dammit = UnicodeDammit(
-            utf8_data, exclude_encodings=["utf-8", "windows-1252"])
-        assert dammit.original_encoding == None
-
-class TestEncodingDetector(object):
-        
-    def test_encoding_detector_replaces_junk_in_encoding_name_with_replacement_character(self):
-        detected = EncodingDetector(
-            b'<?xml version="1.0" encoding="UTF-\xdb" ?>')
-        encodings = list(detected.encodings)
-        assert 'utf-\N{REPLACEMENT CHARACTER}' in encodings
-
-    def test_detect_html5_style_meta_tag(self):
-
-        for data in (
-            b'<html><meta charset="euc-jp" /></html>',
-            b"<html><meta charset='euc-jp' /></html>",
-            b"<html><meta charset=euc-jp /></html>",
-            b"<html><meta charset=euc-jp/></html>"):
-            dammit = UnicodeDammit(data, is_html=True)
-            assert "euc-jp" == dammit.original_encoding
-
-    def test_last_ditch_entity_replacement(self):
-        # This is a UTF-8 document that contains bytestrings
-        # completely incompatible with UTF-8 (ie. encoded with some other
-        # encoding).
-        #
-        # Since there is no consistent encoding for the document,
-        # Unicode, Dammit will eventually encode the document as UTF-8
-        # and encode the incompatible characters as REPLACEMENT
-        # CHARACTER.
-        #
-        # If chardet is installed, it will detect that the document
-        # can be converted into ISO-8859-1 without errors. This happens
-        # to be the wrong encoding, but it is a consistent encoding, so the
-        # code we're testing here won't run.
-        #
-        # So we temporarily disable chardet if it's present.
-        doc = b"""\357\273\277<?xml version="1.0" encoding="UTF-8"?>
-<html><b>\330\250\330\252\330\261</b>
-<i>\310\322\321\220\312\321\355\344</i></html>"""
-        chardet = bs4.dammit.chardet_dammit
-        logging.disable(logging.WARNING)
-        try:
-            def noop(str):
-                return None
-            bs4.dammit.chardet_dammit = noop
-            dammit = UnicodeDammit(doc)
-            assert True == dammit.contains_replacement_characters
-            assert "\ufffd" in dammit.unicode_markup
-
-            soup = BeautifulSoup(doc, "html.parser")
-            assert soup.contains_replacement_characters
-        finally:
-            logging.disable(logging.NOTSET)
-            bs4.dammit.chardet_dammit = chardet
-
-    def test_byte_order_mark_removed(self):
-        # A document written in UTF-16LE will have its byte order marker stripped.
-        data = b'\xff\xfe<\x00a\x00>\x00\xe1\x00\xe9\x00<\x00/\x00a\x00>\x00'
-        dammit = UnicodeDammit(data)
-        assert "<a>áé</a>" == dammit.unicode_markup
-        assert "utf-16le" == dammit.original_encoding
-       
-    def test_known_definite_versus_user_encodings(self):
-        # The known_definite_encodings are used before sniffing the
-        # byte-order mark; the user_encodings are used afterwards.
-
-        # Here's a document in UTF-16LE.
-        data = b'\xff\xfe<\x00a\x00>\x00\xe1\x00\xe9\x00<\x00/\x00a\x00>\x00'
-        dammit = UnicodeDammit(data)
-
-        # We can process it as UTF-16 by passing it in as a known
-        # definite encoding.
-        before = UnicodeDammit(data, known_definite_encodings=["utf-16"])
-        assert "utf-16" == before.original_encoding
-        
-        # If we pass UTF-18 as a user encoding, it's not even
-        # tried--the encoding sniffed from the byte-order mark takes
-        # precedence.
-        after = UnicodeDammit(data, user_encodings=["utf-8"])
-        assert "utf-16le" == after.original_encoding
-        assert ["utf-16le"] == [x[0] for x in dammit.tried_encodings]
-        
-        # Here's a document in ISO-8859-8.
-        hebrew = b"\xed\xe5\xec\xf9"
-        dammit = UnicodeDammit(hebrew, known_definite_encodings=["utf-8"],
-                               user_encodings=["iso-8859-8"])
-        
-        # The known_definite_encodings don't work, BOM sniffing does
-        # nothing (it only works for a few UTF encodings), but one of
-        # the user_encodings does work.
-        assert "iso-8859-8" == dammit.original_encoding
-        assert ["utf-8", "iso-8859-8"] == [x[0] for x in dammit.tried_encodings]
-        
-    def test_deprecated_override_encodings(self):
-        # override_encodings is a deprecated alias for
-        # known_definite_encodings.
-        hebrew = b"\xed\xe5\xec\xf9"
-        dammit = UnicodeDammit(
-            hebrew,
-            known_definite_encodings=["shift-jis"],
-            override_encodings=["utf-8"],
-            user_encodings=["iso-8859-8"],
-        )
-        assert "iso-8859-8" == dammit.original_encoding
-
-        # known_definite_encodings and override_encodings were tried
-        # before user_encodings.
-        assert ["shift-jis", "utf-8", "iso-8859-8"] == (
-            [x[0] for x in dammit.tried_encodings]
-        )
-
-    def test_detwingle(self):
-        # Here's a UTF8 document.
-        utf8 = ("\N{SNOWMAN}" * 3).encode("utf8")
-
-        # Here's a Windows-1252 document.
-        windows_1252 = (
-            "\N{LEFT DOUBLE QUOTATION MARK}Hi, I like Windows!"
-            "\N{RIGHT DOUBLE QUOTATION MARK}").encode("windows_1252")
-
-        # Through some unholy alchemy, they've been stuck together.
-        doc = utf8 + windows_1252 + utf8
-
-        # The document can't be turned into UTF-8:
-        with pytest.raises(UnicodeDecodeError):
-            doc.decode("utf8")
-
-        # Unicode, Dammit thinks the whole document is Windows-1252,
-        # and decodes it into "☃☃☃“Hi, I like Windows!�☃☃☃"
-
-        # But if we run it through fix_embedded_windows_1252, it's fixed:
-        fixed = UnicodeDammit.detwingle(doc)
-        assert "☃☃☃“Hi, I like Windows!�☃☃☃" == fixed.decode("utf8")
-
-    def test_detwingle_ignores_multibyte_characters(self):
-        # Each of these characters has a UTF-8 representation ending
-        # in \x93. \x93 is a smart quote if interpreted as
-        # Windows-1252. But our code knows to skip over multibyte
-        # UTF-8 characters, so they'll survive the process unscathed.
-        for tricky_unicode_char in (
-            "\N{LATIN SMALL LIGATURE OE}", # 2-byte char '\xc5\x93'
-            "\N{LATIN SUBSCRIPT SMALL LETTER X}", # 3-byte char '\xe2\x82\x93'
-            "\xf0\x90\x90\x93", # This is a CJK character, not sure which one.
-            ):
-            input = tricky_unicode_char.encode("utf8")
-            assert input.endswith(b'\x93')
-            output = UnicodeDammit.detwingle(input)
-            assert output == input
-
-    def test_find_declared_encoding(self):
-        # Test our ability to find a declared encoding inside an
-        # XML or HTML document.
-        #
-        # Even if the document comes in as Unicode, it may be
-        # interesting to know what encoding was claimed
-        # originally.
-
-        html_unicode = '<html><head><meta charset="utf-8"></head></html>'
-        html_bytes = html_unicode.encode("ascii")
-
-        xml_unicode= '<?xml version="1.0" encoding="ISO-8859-1" ?>'
-        xml_bytes = xml_unicode.encode("ascii")
-
-        m = EncodingDetector.find_declared_encoding
-        assert m(html_unicode, is_html=False) is None
-        assert "utf-8" == m(html_unicode, is_html=True)
-        assert "utf-8" == m(html_bytes, is_html=True)
-
-        assert "iso-8859-1" == m(xml_unicode)
-        assert "iso-8859-1" == m(xml_bytes)
-
-        # Normally, only the first few kilobytes of a document are checked for
-        # an encoding.
-        spacer = b' ' * 5000
-        assert m(spacer + html_bytes) is None
-        assert m(spacer + xml_bytes) is None
-
-        # But you can tell find_declared_encoding to search an entire
-        # HTML document.
-        assert (
-            m(spacer + html_bytes, is_html=True, search_entire_document=True)
-            == "utf-8"
-        )
-
-        # The XML encoding declaration has to be the very first thing
-        # in the document. We'll allow whitespace before the document
-        # starts, but nothing else.
-        assert m(xml_bytes, search_entire_document=True) == "iso-8859-1"
-        assert m(b' ' + xml_bytes, search_entire_document=True) == "iso-8859-1"
-        assert m(b'a' + xml_bytes, search_entire_document=True) is None
-
-
-class TestEntitySubstitution(object):
-    """Standalone tests of the EntitySubstitution class."""
-    def setup_method(self):
-        self.sub = EntitySubstitution
-
-
-    @pytest.mark.parametrize(
-        "original,substituted",
-        [
-            # Basic case. Unicode characters corresponding to named
-            # HTML entites are substituted; others are not.
-            ("foo\u2200\N{SNOWMAN}\u00f5bar",
-             "foo&forall;\N{SNOWMAN}&otilde;bar"),
-
-            # MS smart quotes are a common source of frustration, so we
-            # give them a special test.
-            ('‘’foo“�', "&lsquo;&rsquo;foo&ldquo;&rdquo;"),           
-        ]
-    )
-    def test_substitute_html(self, original, substituted):
-        assert self.sub.substitute_html(original) == substituted
-        
-    def test_html5_entity(self):
-        for entity, u in (
-            # A few spot checks of our ability to recognize
-            # special character sequences and convert them
-            # to named entities.
-            ('&models;', '\u22a7'),
-            ('&Nfr;', '\U0001d511'),
-            ('&ngeqq;', '\u2267\u0338'),
-            ('&not;', '\xac'),
-            ('&Not;', '\u2aec'),
-                
-            # We _could_ convert | to &verbarr;, but we don't, because
-            # | is an ASCII character.
-            ('|' '|'),
-
-            # Similarly for the fj ligature, which we could convert to
-            # &fjlig;, but we don't.
-            ("fj", "fj"),
-
-            # We do convert _these_ ASCII characters to HTML entities,
-            # because that's required to generate valid HTML.
-            ('&gt;', '>'),
-            ('&lt;', '<'),
-            ('&amp;', '&'),
-        ):
-            template = '3 %s 4'
-            raw = template % u
-            with_entities = template % entity
-            assert self.sub.substitute_html(raw) == with_entities
-            
-    def test_html5_entity_with_variation_selector(self):
-        # Some HTML5 entities correspond either to a single-character
-        # Unicode sequence _or_ to the same character plus U+FE00,
-        # VARIATION SELECTOR 1. We can handle this.
-        data = "fjords \u2294 penguins"
-        markup = "fjords &sqcup; penguins"
-        assert self.sub.substitute_html(data) == markup
-
-        data = "fjords \u2294\ufe00 penguins"
-        markup = "fjords &sqcups; penguins"
-        assert self.sub.substitute_html(data) == markup
-        
-    def test_xml_converstion_includes_no_quotes_if_make_quoted_attribute_is_false(self):
-        s = 'Welcome to "my bar"'
-        assert self.sub.substitute_xml(s, False) == s
-
-    def test_xml_attribute_quoting_normally_uses_double_quotes(self):
-        assert self.sub.substitute_xml("Welcome", True) == '"Welcome"'
-        assert self.sub.substitute_xml("Bob's Bar", True) == '"Bob\'s Bar"'
-
-    def test_xml_attribute_quoting_uses_single_quotes_when_value_contains_double_quotes(self):
-        s = 'Welcome to "my bar"'
-        assert self.sub.substitute_xml(s, True) == "'Welcome to \"my bar\"'"
-
-    def test_xml_attribute_quoting_escapes_single_quotes_when_value_contains_both_single_and_double_quotes(self):
-        s = 'Welcome to "Bob\'s Bar"'
-        assert self.sub.substitute_xml(s, True) == '"Welcome to &quot;Bob\'s Bar&quot;"'
-
-    def test_xml_quotes_arent_escaped_when_value_is_not_being_quoted(self):
-        quoted = 'Welcome to "Bob\'s Bar"'
-        assert self.sub.substitute_xml(quoted) == quoted
-
-    def test_xml_quoting_handles_angle_brackets(self):
-        assert self.sub.substitute_xml("foo<bar>") == "foo&lt;bar&gt;"
-
-    def test_xml_quoting_handles_ampersands(self):
-        assert self.sub.substitute_xml("AT&T") == "AT&amp;T"
-
-    def test_xml_quoting_including_ampersands_when_they_are_part_of_an_entity(self):
-        assert self.sub.substitute_xml("&Aacute;T&T") == "&amp;Aacute;T&amp;T"
-
-    def test_xml_quoting_ignoring_ampersands_when_they_are_part_of_an_entity(self):
-        assert self.sub.substitute_xml_containing_entities("&Aacute;T&T") == "&Aacute;T&amp;T"
-       
-    def test_quotes_not_html_substituted(self):
-        """There's no need to do this except inside attribute values."""
-        text = 'Bob\'s "bar"'
-        assert self.sub.substitute_html(text) == text
diff --git a/lib/bs4/tests/test_docs.py b/lib/bs4/tests/test_docs.py
deleted file mode 100644
index 0194d697..00000000
--- a/lib/bs4/tests/test_docs.py
+++ /dev/null
@@ -1,38 +0,0 @@
-"Test harness for doctests."
-
-# TODO: Pretty sure this isn't used and should be deleted.
-
-# pylint: disable-msg=E0611,W0142
-
-__metaclass__ = type
-__all__ = [
-    'additional_tests',
-    ]
-
-import atexit
-import doctest
-import os
-#from pkg_resources import (
-#    resource_filename, resource_exists, resource_listdir, cleanup_resources)
-import unittest
-
-DOCTEST_FLAGS = (
-    doctest.ELLIPSIS |
-    doctest.NORMALIZE_WHITESPACE |
-    doctest.REPORT_NDIFF)
-
-
-# def additional_tests():
-#     "Run the doc tests (README.txt and docs/*, if any exist)"
-#     doctest_files = [
-#         os.path.abspath(resource_filename('bs4', 'README.txt'))]
-#     if resource_exists('bs4', 'docs'):
-#         for name in resource_listdir('bs4', 'docs'):
-#             if name.endswith('.txt'):
-#                 doctest_files.append(
-#                     os.path.abspath(
-#                         resource_filename('bs4', 'docs/%s' % name)))
-#     kwargs = dict(module_relative=False, optionflags=DOCTEST_FLAGS)
-#     atexit.register(cleanup_resources)
-#     return unittest.TestSuite((
-#         doctest.DocFileSuite(*doctest_files, **kwargs)))
diff --git a/lib/bs4/tests/test_element.py b/lib/bs4/tests/test_element.py
deleted file mode 100644
index 6d08ab5d..00000000
--- a/lib/bs4/tests/test_element.py
+++ /dev/null
@@ -1,74 +0,0 @@
-"""Tests of classes in element.py.
-
-The really big classes -- Tag, PageElement, and NavigableString --
-are tested in separate files.
-"""
-
-from bs4.element import (
-    CharsetMetaAttributeValue,
-    ContentMetaAttributeValue,
-    NamespacedAttribute,
-)
-from . import SoupTest
-
-
-class TestNamedspacedAttribute(object):
-
-    def test_name_may_be_none_or_missing(self):
-        a = NamespacedAttribute("xmlns", None)
-        assert a == "xmlns"
-
-        a = NamespacedAttribute("xmlns", "")
-        assert a == "xmlns"
-
-        a = NamespacedAttribute("xmlns")
-        assert a == "xmlns"
-        
-    def test_namespace_may_be_none_or_missing(self):
-        a = NamespacedAttribute(None, "tag")
-        assert a == "tag"
-        
-        a = NamespacedAttribute("", "tag")
-        assert a == "tag"
-        
-    def test_attribute_is_equivalent_to_colon_separated_string(self):
-        a = NamespacedAttribute("a", "b")
-        assert "a:b" == a
-
-    def test_attributes_are_equivalent_if_prefix_and_name_identical(self):
-        a = NamespacedAttribute("a", "b", "c")
-        b = NamespacedAttribute("a", "b", "c")
-        assert a == b
-
-        # The actual namespace is not considered.
-        c = NamespacedAttribute("a", "b", None)
-        assert a == c
-
-        # But name and prefix are important.
-        d = NamespacedAttribute("a", "z", "c")
-        assert a != d
-
-        e = NamespacedAttribute("z", "b", "c")
-        assert a != e
-
-
-class TestAttributeValueWithCharsetSubstitution(object):
-    """Certain attributes are designed to have the charset of the
-    final document substituted into their value.
-    """
-    
-    def test_content_meta_attribute_value(self):
-        # The value of a CharsetMetaAttributeValue is whatever
-        # encoding the string is in.
-        value = CharsetMetaAttributeValue("euc-jp")
-        assert "euc-jp" == value
-        assert "euc-jp" == value.original_value
-        assert "utf8" == value.encode("utf8")
-        assert "ascii" == value.encode("ascii")
-
-    def test_content_meta_attribute_value(self):
-        value = ContentMetaAttributeValue("text/html; charset=euc-jp")
-        assert "text/html; charset=euc-jp" == value
-        assert "text/html; charset=euc-jp" == value.original_value
-        assert "text/html; charset=utf8" == value.encode("utf8")
-        assert "text/html; charset=ascii" == value.encode("ascii")
diff --git a/lib/bs4/tests/test_formatter.py b/lib/bs4/tests/test_formatter.py
deleted file mode 100644
index 528b16d5..00000000
--- a/lib/bs4/tests/test_formatter.py
+++ /dev/null
@@ -1,113 +0,0 @@
-import pytest
-
-from bs4.element import Tag
-from bs4.formatter import (
-    Formatter,
-    HTMLFormatter,
-    XMLFormatter,
-)
-from . import SoupTest
-
-class TestFormatter(SoupTest):
-
-    def test_default_attributes(self):
-        # Test the default behavior of Formatter.attributes().
-        formatter = Formatter()
-        tag = Tag(name="tag")
-        tag['b'] = 1
-        tag['a'] = 2
-
-        # Attributes come out sorted by name. In Python 3, attributes
-        # normally come out of a dictionary in the order they were
-        # added.
-        assert [('a', 2), ('b', 1)] == formatter.attributes(tag)
-
-        # This works even if Tag.attrs is None, though this shouldn't
-        # normally happen.
-        tag.attrs = None
-        assert [] == formatter.attributes(tag)
-
-        assert ' ' == formatter.indent
-        
-    def test_sort_attributes(self):
-        # Test the ability to override Formatter.attributes() to,
-        # e.g., disable the normal sorting of attributes.
-        class UnsortedFormatter(Formatter):
-            def attributes(self, tag):
-                self.called_with = tag
-                for k, v in sorted(tag.attrs.items()):
-                    if k == 'ignore':
-                        continue
-                    yield k,v
-
-        soup = self.soup('<p cval="1" aval="2" ignore="ignored"></p>')
-        formatter = UnsortedFormatter()
-        decoded = soup.decode(formatter=formatter)
-
-        # attributes() was called on the <p> tag. It filtered out one
-        # attribute and sorted the other two.
-        assert formatter.called_with == soup.p
-        assert '<p aval="2" cval="1"></p>' == decoded
-
-    def test_empty_attributes_are_booleans(self):
-        # Test the behavior of empty_attributes_are_booleans as well
-        # as which Formatters have it enabled.
-        
-        for name in ('html', 'minimal', None):
-            formatter = HTMLFormatter.REGISTRY[name]
-            assert False == formatter.empty_attributes_are_booleans
-
-        formatter = XMLFormatter.REGISTRY[None]
-        assert False == formatter.empty_attributes_are_booleans
-
-        formatter = HTMLFormatter.REGISTRY['html5']
-        assert True == formatter.empty_attributes_are_booleans
-
-        # Verify that the constructor sets the value.
-        formatter = Formatter(empty_attributes_are_booleans=True)
-        assert True == formatter.empty_attributes_are_booleans
-
-        # Now demonstrate what it does to markup.
-        for markup in (
-                "<option selected></option>",
-                '<option selected=""></option>'
-        ):
-            soup = self.soup(markup)
-            for formatter in ('html', 'minimal', 'xml', None):
-                assert b'<option selected=""></option>' == soup.option.encode(formatter='html')
-                assert b'<option selected></option>' == soup.option.encode(formatter='html5')
-
-    @pytest.mark.parametrize(
-        "indent,expect",
-        [
-            (None, '<a>\n<b>\ntext\n</b>\n</a>\n'),
-            (-1, '<a>\n<b>\ntext\n</b>\n</a>\n'),
-            (0, '<a>\n<b>\ntext\n</b>\n</a>\n'),
-            ("", '<a>\n<b>\ntext\n</b>\n</a>\n'),
-
-            (1, '<a>\n <b>\n  text\n </b>\n</a>\n'),
-            (2, '<a>\n  <b>\n    text\n  </b>\n</a>\n'),
-
-            ("\t", '<a>\n\t<b>\n\t\ttext\n\t</b>\n</a>\n'),
-            ('abc', '<a>\nabc<b>\nabcabctext\nabc</b>\n</a>\n'),
-
-            # Some invalid inputs -- the default behavior is used.
-            (object(), '<a>\n <b>\n  text\n </b>\n</a>\n'),
-            (b'bytes', '<a>\n <b>\n  text\n </b>\n</a>\n'),
-        ]
-    )
-    def test_indent(self, indent, expect):
-        # Pretty-print a tree with a Formatter set to
-        # indent in a certain way and verify the results.
-        soup = self.soup("<a><b>text</b></a>")
-        formatter = Formatter(indent=indent)
-        assert soup.prettify(formatter=formatter) == expect
-
-        # Pretty-printing only happens with prettify(), not
-        # encode().
-        assert soup.encode(formatter=formatter) != expect
-        
-    def test_default_indent_value(self):
-        formatter = Formatter()
-        assert formatter.indent == ' '
-
diff --git a/lib/bs4/tests/test_fuzz.py b/lib/bs4/tests/test_fuzz.py
deleted file mode 100644
index f29802d4..00000000
--- a/lib/bs4/tests/test_fuzz.py
+++ /dev/null
@@ -1,176 +0,0 @@
-"""This file contains test cases reported by third parties using
-fuzzing tools, primarily from Google's oss-fuzz project. Some of these
-represent real problems with Beautiful Soup, but many are problems in
-libraries that Beautiful Soup depends on, and many of the test cases
-represent different ways of triggering the same problem.
-
-Grouping these test cases together makes it easy to see which test
-cases represent the same problem, and puts the test cases in close
-proximity to code that can trigger the problems.
-"""
-import os
-import pytest
-from bs4 import (
-    BeautifulSoup,
-    ParserRejectedMarkup,
-)
-try:
-    from soupsieve.util import SelectorSyntaxError
-    import lxml
-    import html5lib
-    fully_fuzzable = True
-except ImportError:
-    fully_fuzzable = False
-    
-
-@pytest.mark.skipif(not fully_fuzzable, reason="Prerequisites for fuzz tests are not installed.")
-class TestFuzz(object):
-
-    # Test case markup files from fuzzers are given this extension so
-    # they can be included in builds.
-    TESTCASE_SUFFIX = ".testcase"
-
-    # Copied 20230512 from
-    # https://github.com/google/oss-fuzz/blob/4ac6a645a197a695fe76532251feb5067076b3f3/projects/bs4/bs4_fuzzer.py
-    #
-    # Copying the code lets us precisely duplicate the behavior of
-    # oss-fuzz.  The downside is that this code changes over time, so
-    # multiple copies of the code must be kept around to run against
-    # older tests. I'm not sure what to do about this, but I may
-    # retire old tests after a time.
-    def fuzz_test_with_css(self, filename):
-        data = self.__markup(filename)
-        parsers = ['lxml-xml', 'html5lib', 'html.parser', 'lxml']
-        try:
-            idx = int(data[0]) % len(parsers)
-        except ValueError:
-            return
-
-        css_selector, data = data[1:10], data[10:]
-
-        try:
-            soup = BeautifulSoup(data[1:], features=parsers[idx])
-        except ParserRejectedMarkup:
-            return
-        except ValueError:
-            return
-
-        list(soup.find_all(True))
-        try:
-            soup.css.select(css_selector.decode('utf-8', 'replace'))
-        except SelectorSyntaxError:
-            return
-        soup.prettify()
-    
-    # This class of error has been fixed by catching a less helpful
-    # exception from html.parser and raising ParserRejectedMarkup
-    # instead.
-    @pytest.mark.parametrize(
-        "filename", [
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-5703933063462912",
-            "crash-ffbdfa8a2b26f13537b68d3794b0478a4090ee4a",
-        ]
-    )
-    def test_rejected_markup(self, filename):
-        markup = self.__markup(filename)
-        with pytest.raises(ParserRejectedMarkup):
-            BeautifulSoup(markup, 'html.parser')
-            
-    # This class of error has to do with very deeply nested documents
-    # which overflow the Python call stack when the tree is converted
-    # to a string. This is an issue with Beautiful Soup which was fixed
-    # as part of [bug=1471755].
-    #
-    # These test cases are in the older format that doesn't specify
-    # which parser to use or give a CSS selector.
-    @pytest.mark.parametrize(
-        "filename", [
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-5984173902397440",
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-5167584867909632",
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-6124268085182464",
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-6450958476902400",
-        ]
-    )
-    def test_deeply_nested_document_without_css(self, filename):
-        # Parsing the document and encoding it back to a string is
-        # sufficient to demonstrate that the overflow problem has
-        # been fixed.
-        markup = self.__markup(filename)
-        BeautifulSoup(markup, 'html.parser').encode()
-
-    # This class of error has to do with very deeply nested documents
-    # which overflow the Python call stack when the tree is converted
-    # to a string. This is an issue with Beautiful Soup which was fixed
-    # as part of [bug=1471755].
-    @pytest.mark.parametrize(
-        "filename", [
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-5000587759190016",
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-5375146639360000",
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-5492400320282624",
-        ]
-    )
-    def test_deeply_nested_document(self, filename): 
-       self.fuzz_test_with_css(filename)
-        
-    @pytest.mark.parametrize(
-        "filename", [
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-4670634698080256",
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-5270998950477824",
-        ]
-    )
-    def test_soupsieve_errors(self, filename):
-        self.fuzz_test_with_css(filename)
-        
-    # This class of error represents problems with html5lib's parser,
-    # not Beautiful Soup. I use
-    # https://github.com/html5lib/html5lib-python/issues/568 to notify
-    # the html5lib developers of these issues.
-    #
-    # These test cases are in the older format that doesn't specify
-    # which parser to use or give a CSS selector.
-    @pytest.mark.skip(reason="html5lib-specific problems")
-    @pytest.mark.parametrize(
-        "filename", [
-            # b"""ÿ<!DOCTyPEV PUBLIC'''�'"""
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-4818336571064320",
-
-            # b')<a><math><TR><a><mI><a><p><a>'
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-4999465949331456",
-
-            # b'-<math><sElect><mi><sElect><sElect>'
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-5843991618256896",
-           
-            # b'ñ<table><svg><html>'
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-6241471367348224",
-
-            # <TABLE>, some ^@ characters, some <math> tags.
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-6600557255327744",
-
-            # Nested table
-            "crash-0d306a50c8ed8bcd0785b67000fcd5dea1d33f08"
-        ]
-    )
-    def test_html5lib_parse_errors_without_css(self, filename):
-        markup = self.__markup(filename)
-        print(BeautifulSoup(markup, 'html5lib').encode())
-
-    # This class of error represents problems with html5lib's parser,
-    # not Beautiful Soup. I use
-    # https://github.com/html5lib/html5lib-python/issues/568 to notify
-    # the html5lib developers of these issues.
-    @pytest.mark.skip(reason="html5lib-specific problems")
-    @pytest.mark.parametrize(
-        "filename", [
-            # b'-      \xff\xff  <math>\x10<select><mi><select><select>t'
-            "clusterfuzz-testcase-minimized-bs4_fuzzer-6306874195312640",
-        ]
-    )
-    def test_html5lib_parse_errors(self, filename):
-        self.fuzz_test_with_css(filename)
-        
-    def __markup(self, filename):
-        if not filename.endswith(self.TESTCASE_SUFFIX):
-            filename += self.TESTCASE_SUFFIX
-        this_dir = os.path.split(__file__)[0]
-        path = os.path.join(this_dir, 'fuzz', filename)
-        return open(path, 'rb').read()
diff --git a/lib/bs4/tests/test_html5lib.py b/lib/bs4/tests/test_html5lib.py
deleted file mode 100644
index 4197720f..00000000
--- a/lib/bs4/tests/test_html5lib.py
+++ /dev/null
@@ -1,224 +0,0 @@
-"""Tests to ensure that the html5lib tree builder generates good trees."""
-
-import pytest
-import warnings
-
-from bs4 import BeautifulSoup
-from bs4.element import SoupStrainer
-from . import (
-    HTML5LIB_PRESENT,
-    HTML5TreeBuilderSmokeTest,
-    SoupTest,
-)
-
-@pytest.mark.skipif(
-    not HTML5LIB_PRESENT,
-    reason="html5lib seems not to be present, not testing its tree builder."
-)
-class TestHTML5LibBuilder(SoupTest, HTML5TreeBuilderSmokeTest):
-    """See ``HTML5TreeBuilderSmokeTest``."""
-
-    @property
-    def default_builder(self):
-        from bs4.builder import HTML5TreeBuilder
-        return HTML5TreeBuilder
-
-    def test_soupstrainer(self):
-        # The html5lib tree builder does not support SoupStrainers.
-        strainer = SoupStrainer("b")
-        markup = "<p>A <b>bold</b> statement.</p>"
-        with warnings.catch_warnings(record=True) as w:
-            soup = BeautifulSoup(markup, "html5lib", parse_only=strainer)
-        assert soup.decode() == self.document_for(markup)
-
-        [warning] = w
-        assert warning.filename == __file__
-        assert "the html5lib tree builder doesn't support parse_only" in str(warning.message)
-
-    def test_correctly_nested_tables(self):
-        """html5lib inserts <tbody> tags where other parsers don't."""
-        markup = ('<table id="1">'
-                  '<tr>'
-                  "<td>Here's another table:"
-                  '<table id="2">'
-                  '<tr><td>foo</td></tr>'
-                  '</table></td>')
-
-        self.assert_soup(
-            markup,
-            '<table id="1"><tbody><tr><td>Here\'s another table:'
-            '<table id="2"><tbody><tr><td>foo</td></tr></tbody></table>'
-            '</td></tr></tbody></table>')
-
-        self.assert_soup(
-            "<table><thead><tr><td>Foo</td></tr></thead>"
-            "<tbody><tr><td>Bar</td></tr></tbody>"
-            "<tfoot><tr><td>Baz</td></tr></tfoot></table>")
-
-    def test_xml_declaration_followed_by_doctype(self):
-        markup = '''<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html>
-<html>
-  <head>
-  </head>
-  <body>
-   <p>foo</p>
-  </body>
-</html>'''
-        soup = self.soup(markup)
-        # Verify that we can reach the <p> tag; this means the tree is connected.
-        assert b"<p>foo</p>" == soup.p.encode()
-
-    def test_reparented_markup(self):
-        markup = '<p><em>foo</p>\n<p>bar<a></a></em></p>'
-        soup = self.soup(markup)
-        assert "<body><p><em>foo</em></p><em>\n</em><p><em>bar<a></a></em></p></body>" == soup.body.decode()
-        assert 2 == len(soup.find_all('p'))
-
-
-    def test_reparented_markup_ends_with_whitespace(self):
-        markup = '<p><em>foo</p>\n<p>bar<a></a></em></p>\n'
-        soup = self.soup(markup)
-        assert "<body><p><em>foo</em></p><em>\n</em><p><em>bar<a></a></em></p>\n</body>" == soup.body.decode()
-        assert 2 == len(soup.find_all('p'))
-
-    def test_reparented_markup_containing_identical_whitespace_nodes(self):
-        """Verify that we keep the two whitespace nodes in this
-        document distinct when reparenting the adjacent <tbody> tags.
-        """
-        markup = '<table> <tbody><tbody><ims></tbody> </table>'
-        soup = self.soup(markup)
-        space1, space2 = soup.find_all(string=' ')
-        tbody1, tbody2 = soup.find_all('tbody')
-        assert space1.next_element is tbody1
-        assert tbody2.next_element is space2
-
-    def test_reparented_markup_containing_children(self):
-        markup = '<div><a>aftermath<p><noscript>target</noscript>aftermath</a></p></div>'
-        soup = self.soup(markup)
-        noscript = soup.noscript
-        assert "target" == noscript.next_element
-        target = soup.find(string='target')
-
-        # The 'aftermath' string was duplicated; we want the second one.
-        final_aftermath = soup.find_all(string='aftermath')[-1]
-
-        # The <noscript> tag was moved beneath a copy of the <a> tag,
-        # but the 'target' string within is still connected to the
-        # (second) 'aftermath' string.
-        assert final_aftermath == target.next_element
-        assert target == final_aftermath.previous_element
-        
-    def test_processing_instruction(self):
-        """Processing instructions become comments."""
-        markup = b"""<?PITarget PIContent?>"""
-        soup = self.soup(markup)
-        assert str(soup).startswith("<!--?PITarget PIContent?-->")
-
-    def test_cloned_multivalue_node(self):
-        markup = b"""<a class="my_class"><p></a>"""
-        soup = self.soup(markup)
-        a1, a2 = soup.find_all('a')
-        assert a1 == a2
-        assert a1 is not a2
-
-    def test_foster_parenting(self):
-        markup = b"""<table><td></tbody>A"""
-        soup = self.soup(markup)
-        assert "<body>A<table><tbody><tr><td></td></tr></tbody></table></body>" == soup.body.decode()
-
-    def test_extraction(self):
-        """
-        Test that extraction does not destroy the tree.
-
-        https://bugs.launchpad.net/beautifulsoup/+bug/1782928
-        """
-
-        markup = """
-<html><head></head>
-<style>
-</style><script></script><body><p>hello</p></body></html>
-"""
-        soup = self.soup(markup)
-        [s.extract() for s in soup('script')]
-        [s.extract() for s in soup('style')]
-
-        assert len(soup.find_all("p")) == 1
-
-    def test_empty_comment(self):
-        """
-        Test that empty comment does not break structure.
-
-        https://bugs.launchpad.net/beautifulsoup/+bug/1806598
-        """
-
-        markup = """
-<html>
-<body>
-<form>
-<!----><input type="text">
-</form>
-</body>
-</html>
-"""
-        soup = self.soup(markup)
-        inputs = []
-        for form in soup.find_all('form'):
-            inputs.extend(form.find_all('input'))
-        assert len(inputs) == 1
-
-    def test_tracking_line_numbers(self):
-        # The html.parser TreeBuilder keeps track of line number and
-        # position of each element.
-        markup = "\n   <p>\n\n<sourceline>\n<b>text</b></sourceline><sourcepos></p>"
-        soup = self.soup(markup)
-        assert 2 == soup.p.sourceline
-        assert 5 == soup.p.sourcepos
-        assert "sourceline" == soup.p.find('sourceline').name
-
-        # You can deactivate this behavior.
-        soup = self.soup(markup, store_line_numbers=False)
-        assert "sourceline" == soup.p.sourceline.name
-        assert "sourcepos" == soup.p.sourcepos.name
-
-    def test_special_string_containers(self):
-        # The html5lib tree builder doesn't support this standard feature,
-        # because there's no way of knowing, when a string is created,
-        # where in the tree it will eventually end up.
-        pass
-
-    def test_html5_attributes(self):
-        # The html5lib TreeBuilder can convert any entity named in
-        # the HTML5 spec to a sequence of Unicode characters, and
-        # convert those Unicode characters to a (potentially
-        # different) named entity on the way out.
-        #
-        # This is a copy of the same test from
-        # HTMLParserTreeBuilderSmokeTest.  It's not in the superclass
-        # because the lxml HTML TreeBuilder _doesn't_ work this way.
-        for input_element, output_unicode, output_element in (
-                ("&RightArrowLeftArrow;", '\u21c4', b'&rlarr;'),
-                ('&models;', '\u22a7', b'&models;'),
-                ('&Nfr;', '\U0001d511', b'&Nfr;'),
-                ('&ngeqq;', '\u2267\u0338', b'&ngeqq;'),
-                ('&not;', '\xac', b'&not;'),
-                ('&Not;', '\u2aec', b'&Not;'),
-                ('&quot;', '"', b'"'),
-                ('&there4;', '\u2234', b'&there4;'),
-                ('&Therefore;', '\u2234', b'&there4;'),
-                ('&therefore;', '\u2234', b'&there4;'),
-                ("&fjlig;", 'fj', b'fj'),                
-                ("&sqcup;", '\u2294', b'&sqcup;'),
-                ("&sqcups;", '\u2294\ufe00', b'&sqcups;'),
-                ("&apos;", "'", b"'"),
-                ("&verbar;", "|", b"|"),
-        ):
-            markup = '<div>%s</div>' % input_element
-            div = self.soup(markup).div
-            without_element = div.encode()
-            expect = b"<div>%s</div>" % output_unicode.encode("utf8")
-            assert without_element == expect
-
-            with_element = div.encode(formatter="html")
-            expect = b"<div>%s</div>" % output_element
-            assert with_element == expect
diff --git a/lib/bs4/tests/test_htmlparser.py b/lib/bs4/tests/test_htmlparser.py
deleted file mode 100644
index a1195d81..00000000
--- a/lib/bs4/tests/test_htmlparser.py
+++ /dev/null
@@ -1,148 +0,0 @@
-"""Tests to ensure that the html.parser tree builder generates good
-trees."""
-
-from pdb import set_trace
-import pickle
-import pytest
-import warnings
-from bs4.builder import (
-    HTMLParserTreeBuilder,
-    ParserRejectedMarkup,
-    XMLParsedAsHTMLWarning,
-)
-from bs4.builder._htmlparser import BeautifulSoupHTMLParser
-from . import SoupTest, HTMLTreeBuilderSmokeTest
-
-class TestHTMLParserTreeBuilder(SoupTest, HTMLTreeBuilderSmokeTest):
-
-    default_builder = HTMLParserTreeBuilder
-
-    def test_rejected_input(self):
-        # Python's html.parser will occasionally reject markup,
-        # especially when there is a problem with the initial DOCTYPE
-        # declaration. Different versions of Python sound the alarm in
-        # different ways, but Beautiful Soup consistently raises
-        # errors as ParserRejectedMarkup exceptions.
-        bad_markup = [
-            # https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=28873
-            # https://github.com/guidovranken/python-library-fuzzers/blob/master/corp-html/519e5b4269a01185a0d5e76295251921da2f0700
-            # https://github.com/python/cpython/issues/81928
-            b'\n<![\xff\xfe\xfe\xcd\x00',
-
-            #https://github.com/guidovranken/python-library-fuzzers/blob/master/corp-html/de32aa55785be29bbc72a1a8e06b00611fb3d9f8
-            # https://github.com/python/cpython/issues/78661
-            #
-            b'<![n\x00',
-            b"<![UNKNOWN[]]>",
-        ]
-        for markup in bad_markup:
-            with pytest.raises(ParserRejectedMarkup):
-                soup = self.soup(markup)
-    
-    def test_namespaced_system_doctype(self):
-        # html.parser can't handle namespaced doctypes, so skip this one.
-        pass
-
-    def test_namespaced_public_doctype(self):
-        # html.parser can't handle namespaced doctypes, so skip this one.
-        pass
-
-    def test_builder_is_pickled(self):
-        """Unlike most tree builders, HTMLParserTreeBuilder and will
-        be restored after pickling.
-        """
-        tree = self.soup("<a><b>foo</a>")
-        dumped = pickle.dumps(tree, 2)
-        loaded = pickle.loads(dumped)
-        assert isinstance(loaded.builder, type(tree.builder))
-
-    def test_redundant_empty_element_closing_tags(self):
-        self.assert_soup('<br></br><br></br><br></br>', "<br/><br/><br/>")
-        self.assert_soup('</br></br></br>', "")
-
-    def test_empty_element(self):
-        # This verifies that any buffered data present when the parser
-        # finishes working is handled.
-        self.assert_soup("foo &# bar", "foo &amp;# bar")
-
-    def test_tracking_line_numbers(self):
-        # The html.parser TreeBuilder keeps track of line number and
-        # position of each element.
-        markup = "\n   <p>\n\n<sourceline>\n<b>text</b></sourceline><sourcepos></p>"
-        soup = self.soup(markup)
-        assert 2 == soup.p.sourceline
-        assert 3 == soup.p.sourcepos
-        assert "sourceline" == soup.p.find('sourceline').name
-
-        # You can deactivate this behavior.
-        soup = self.soup(markup, store_line_numbers=False)
-        assert "sourceline" == soup.p.sourceline.name
-        assert "sourcepos" == soup.p.sourcepos.name
-
-    def test_on_duplicate_attribute(self):
-        # The html.parser tree builder has a variety of ways of
-        # handling a tag that contains the same attribute multiple times.
-
-        markup = '<a class="cls" href="url1" href="url2" href="url3" id="id">'
-
-        # If you don't provide any particular value for
-        # on_duplicate_attribute, later values replace earlier values.
-        soup = self.soup(markup)
-        assert "url3" == soup.a['href']
-        assert ["cls"] == soup.a['class']
-        assert "id" == soup.a['id']
-        
-        # You can also get this behavior explicitly.
-        def assert_attribute(on_duplicate_attribute, expected):
-            soup = self.soup(
-                markup, on_duplicate_attribute=on_duplicate_attribute
-            )
-            assert expected == soup.a['href']
-
-            # Verify that non-duplicate attributes are treated normally.
-            assert ["cls"] == soup.a['class']
-            assert "id" == soup.a['id']
-        assert_attribute(None, "url3")
-        assert_attribute(BeautifulSoupHTMLParser.REPLACE, "url3")
-
-        # You can ignore subsequent values in favor of the first.
-        assert_attribute(BeautifulSoupHTMLParser.IGNORE, "url1")
-
-        # And you can pass in a callable that does whatever you want.
-        def accumulate(attrs, key, value):
-            if not isinstance(attrs[key], list):
-                attrs[key] = [attrs[key]]
-            attrs[key].append(value)
-        assert_attribute(accumulate, ["url1", "url2", "url3"])            
-
-    def test_html5_attributes(self):
-        # The html.parser TreeBuilder can convert any entity named in
-        # the HTML5 spec to a sequence of Unicode characters, and
-        # convert those Unicode characters to a (potentially
-        # different) named entity on the way out.
-        for input_element, output_unicode, output_element in (
-                ("&RightArrowLeftArrow;", '\u21c4', b'&rlarr;'),
-                ('&models;', '\u22a7', b'&models;'),
-                ('&Nfr;', '\U0001d511', b'&Nfr;'),
-                ('&ngeqq;', '\u2267\u0338', b'&ngeqq;'),
-                ('&not;', '\xac', b'&not;'),
-                ('&Not;', '\u2aec', b'&Not;'),
-                ('&quot;', '"', b'"'),
-                ('&there4;', '\u2234', b'&there4;'),
-                ('&Therefore;', '\u2234', b'&there4;'),
-                ('&therefore;', '\u2234', b'&there4;'),
-                ("&fjlig;", 'fj', b'fj'),                
-                ("&sqcup;", '\u2294', b'&sqcup;'),
-                ("&sqcups;", '\u2294\ufe00', b'&sqcups;'),
-                ("&apos;", "'", b"'"),
-                ("&verbar;", "|", b"|"),
-        ):
-            markup = '<div>%s</div>' % input_element
-            div = self.soup(markup).div
-            without_element = div.encode()
-            expect = b"<div>%s</div>" % output_unicode.encode("utf8")
-            assert without_element == expect
-
-            with_element = div.encode(formatter="html")
-            expect = b"<div>%s</div>" % output_element
-            assert with_element == expect
diff --git a/lib/bs4/tests/test_lxml.py b/lib/bs4/tests/test_lxml.py
deleted file mode 100644
index 5065b6fc..00000000
--- a/lib/bs4/tests/test_lxml.py
+++ /dev/null
@@ -1,203 +0,0 @@
-"""Tests to ensure that the lxml tree builder generates good trees."""
-
-import pickle
-import pytest
-import re
-import warnings
-from . import LXML_PRESENT, LXML_VERSION
-
-if LXML_PRESENT:
-    from bs4.builder import LXMLTreeBuilder, LXMLTreeBuilderForXML
-
-from bs4 import (
-    BeautifulSoup,
-    BeautifulStoneSoup,
-    )
-from bs4.element import Comment, Doctype, SoupStrainer
-from . import (
-    HTMLTreeBuilderSmokeTest,
-    XMLTreeBuilderSmokeTest,
-    SOUP_SIEVE_PRESENT,
-    SoupTest,
-)
-
-@pytest.mark.skipif(
-    not LXML_PRESENT,
-    reason="lxml seems not to be present, not testing its tree builder."
-)
-class TestLXMLTreeBuilder(SoupTest, HTMLTreeBuilderSmokeTest):
-    """See ``HTMLTreeBuilderSmokeTest``."""
-
-    @property
-    def default_builder(self):
-        return LXMLTreeBuilder
-
-    def test_out_of_range_entity(self):
-        self.assert_soup(
-            "<p>foo&#10000000000000;bar</p>", "<p>foobar</p>")
-        self.assert_soup(
-            "<p>foo&#x10000000000000;bar</p>", "<p>foobar</p>")
-        self.assert_soup(
-            "<p>foo&#1000000000;bar</p>", "<p>foobar</p>")
-        
-    def test_entities_in_foreign_document_encoding(self):
-        # We can't implement this case correctly because by the time we
-        # hear about markup like "&#147;", it's been (incorrectly) converted into
-        # a string like u'\x93'
-        pass
-        
-    # In lxml < 2.3.5, an empty doctype causes a segfault. Skip this
-    # test if an old version of lxml is installed.
-
-    @pytest.mark.skipif(
-        not LXML_PRESENT or LXML_VERSION < (2,3,5,0),
-        reason="Skipping doctype test for old version of lxml to avoid segfault."
-    )
-    def test_empty_doctype(self):
-        soup = self.soup("<!DOCTYPE>")
-        doctype = soup.contents[0]
-        assert "" == doctype.strip()
-
-    def test_beautifulstonesoup_is_xml_parser(self):
-        # Make sure that the deprecated BSS class uses an xml builder
-        # if one is installed.
-        with warnings.catch_warnings(record=True) as w:
-            soup = BeautifulStoneSoup("<b />")
-        assert "<b/>" == str(soup.b)
-        [warning] = w
-        assert warning.filename == __file__
-        assert "BeautifulStoneSoup class is deprecated" in str(warning.message)
-
-    def test_tracking_line_numbers(self):
-        # The lxml TreeBuilder cannot keep track of line numbers from
-        # the original markup. Even if you ask for line numbers, we
-        # don't have 'em.
-        #
-        # This means that if you have a tag like <sourceline> or
-        # <sourcepos>, attribute access will find it rather than
-        # giving you a numeric answer.
-        soup = self.soup(
-            "\n   <p>\n\n<sourceline>\n<b>text</b></sourceline><sourcepos></p>",
-            store_line_numbers=True
-        )
-        assert "sourceline" == soup.p.sourceline.name
-        assert "sourcepos" == soup.p.sourcepos.name
-        
-@pytest.mark.skipif(
-    not LXML_PRESENT,
-    reason="lxml seems not to be present, not testing its XML tree builder."
-)
-class TestLXMLXMLTreeBuilder(SoupTest, XMLTreeBuilderSmokeTest):
-    """See ``HTMLTreeBuilderSmokeTest``."""
-
-    @property
-    def default_builder(self):
-        return LXMLTreeBuilderForXML
-
-    def test_namespace_indexing(self):
-        soup = self.soup(
-            '<?xml version="1.1"?>\n'
-            '<root>'
-            '<tag xmlns="http://unprefixed-namespace.com">content</tag>'
-            '<prefix:tag2 xmlns:prefix="http://prefixed-namespace.com">content</prefix:tag2>'
-            '<prefix2:tag3 xmlns:prefix2="http://another-namespace.com">'
-            '<subtag xmlns="http://another-unprefixed-namespace.com">'
-            '<subsubtag xmlns="http://yet-another-unprefixed-namespace.com">'
-            '</prefix2:tag3>'
-            '</root>'
-        )
-
-        # The BeautifulSoup object includes every namespace prefix
-        # defined in the entire document. This is the default set of
-        # namespaces used by soupsieve.
-        #
-        # Un-prefixed namespaces are not included, and if a given
-        # prefix is defined twice, only the first prefix encountered
-        # in the document shows up here.
-        assert soup._namespaces == {
-            'xml': 'http://www.w3.org/XML/1998/namespace',
-            'prefix': 'http://prefixed-namespace.com',
-            'prefix2': 'http://another-namespace.com'
-        }
-
-        # A Tag object includes only the namespace prefixes
-        # that were in scope when it was parsed.
-
-        # We do not track un-prefixed namespaces as we can only hold
-        # one (the first one), and it will be recognized as the
-        # default namespace by soupsieve, even when operating from a
-        # tag with a different un-prefixed namespace.
-        assert soup.tag._namespaces == {
-            'xml': 'http://www.w3.org/XML/1998/namespace',
-        }
-
-        assert soup.tag2._namespaces == {
-            'prefix': 'http://prefixed-namespace.com',
-            'xml': 'http://www.w3.org/XML/1998/namespace',
-        }
-
-        assert soup.subtag._namespaces == {
-            'prefix2': 'http://another-namespace.com',
-            'xml': 'http://www.w3.org/XML/1998/namespace',
-        }
-
-        assert soup.subsubtag._namespaces == {
-            'prefix2': 'http://another-namespace.com',
-            'xml': 'http://www.w3.org/XML/1998/namespace',
-        }
-
-
-    @pytest.mark.skipif(
-        not SOUP_SIEVE_PRESENT, reason="Soup Sieve not installed"
-    )
-    def test_namespace_interaction_with_select_and_find(self):
-        # Demonstrate how namespaces interact with select* and
-        # find* methods.
-        
-        soup = self.soup(
-            '<?xml version="1.1"?>\n'
-            '<root>'
-            '<tag xmlns="http://unprefixed-namespace.com">content</tag>'
-            '<prefix:tag2 xmlns:prefix="http://prefixed-namespace.com">content</tag>'
-            '<subtag xmlns:prefix="http://another-namespace-same-prefix.com">'
-             '<prefix:tag3>'
-            '</subtag>'
-            '</root>'
-        )
-
-        # soupselect uses namespace URIs.
-        assert soup.select_one('tag').name == 'tag'
-        assert soup.select_one('prefix|tag2').name == 'tag2'
-
-        # If a prefix is declared more than once, only the first usage
-        # is registered with the BeautifulSoup object.
-        assert soup.select_one('prefix|tag3') is None
-
-        # But you can always explicitly specify a namespace dictionary.
-        assert soup.select_one(
-            'prefix|tag3', namespaces=soup.subtag._namespaces
-        ).name == 'tag3'
-
-        # And a Tag (as opposed to the BeautifulSoup object) will
-        # have a set of default namespaces scoped to that Tag.
-        assert soup.subtag.select_one('prefix|tag3').name=='tag3'
-
-        # the find() methods aren't fully namespace-aware; they just
-        # look at prefixes.
-        assert soup.find('tag').name == 'tag'
-        assert soup.find('prefix:tag2').name == 'tag2'
-        assert soup.find('prefix:tag3').name == 'tag3'
-        assert soup.subtag.find('prefix:tag3').name == 'tag3'
-
-    def test_pickle_restores_builder(self):
-        # The lxml TreeBuilder is not picklable, so when unpickling
-        # a document created with it, a new TreeBuilder of the
-        # appropriate class is created.
-        soup = self.soup("<a>some markup</a>")
-        assert isinstance(soup.builder, self.default_builder)
-        pickled = pickle.dumps(soup)
-        unpickled = pickle.loads(pickled)
-
-        assert "some markup" == unpickled.a.string
-        assert unpickled.builder != soup.builder
-        assert isinstance(unpickled.builder, self.default_builder)
diff --git a/lib/bs4/tests/test_navigablestring.py b/lib/bs4/tests/test_navigablestring.py
deleted file mode 100644
index e4c179e9..00000000
--- a/lib/bs4/tests/test_navigablestring.py
+++ /dev/null
@@ -1,144 +0,0 @@
-import pytest
-
-from bs4.element import (
-    CData,
-    Comment,
-    Declaration,
-    Doctype,
-    NavigableString,
-    RubyParenthesisString,
-    RubyTextString,
-    Script,
-    Stylesheet,
-    TemplateString,
-)
-
-from . import SoupTest
-
-class TestNavigableString(SoupTest):
-
-    def test_text_acquisition_methods(self):
-        # These methods are intended for use against Tag, but they
-        # work on NavigableString as well,
-        
-        s = NavigableString("fee ")
-        cdata = CData("fie ")
-        comment = Comment("foe ")
-
-        assert "fee " == s.get_text()
-        assert "fee" == s.get_text(strip=True)
-        assert ["fee "] == list(s.strings)
-        assert ["fee"] == list(s.stripped_strings)
-        assert ["fee "] == list(s._all_strings())
-
-        assert "fie " == cdata.get_text()
-        assert "fie" == cdata.get_text(strip=True)
-        assert ["fie "] == list(cdata.strings)
-        assert ["fie"] == list(cdata.stripped_strings)
-        assert ["fie "] == list(cdata._all_strings())
-        
-        # Since a Comment isn't normally considered 'text',
-        # these methods generally do nothing.
-        assert "" == comment.get_text()
-        assert [] == list(comment.strings)
-        assert [] == list(comment.stripped_strings)
-        assert [] == list(comment._all_strings())
-
-        # Unless you specifically say that comments are okay.
-        assert "foe" == comment.get_text(strip=True, types=Comment)
-        assert "foe " == comment.get_text(types=(Comment, NavigableString))
-
-    def test_string_has_immutable_name_property(self):
-        # string.name is defined as None and can't be modified
-        string = self.soup("s").string
-        assert None == string.name
-        with pytest.raises(AttributeError):
-            string.name = 'foo'
-
-class TestNavigableStringSubclasses(SoupTest):
-
-    def test_cdata(self):
-        # None of the current builders turn CDATA sections into CData
-        # objects, but you can create them manually.
-        soup = self.soup("")
-        cdata = CData("foo")
-        soup.insert(1, cdata)
-        assert str(soup) == "<![CDATA[foo]]>"
-        assert soup.find(string="foo") == "foo"
-        assert soup.contents[0] == "foo"
-
-    def test_cdata_is_never_formatted(self):
-        """Text inside a CData object is passed into the formatter.
-
-        But the return value is ignored.
-        """
-
-        self.count = 0
-        def increment(*args):
-            self.count += 1
-            return "BITTER FAILURE"
-
-        soup = self.soup("")
-        cdata = CData("<><><>")
-        soup.insert(1, cdata)
-        assert b"<![CDATA[<><><>]]>" == soup.encode(formatter=increment)
-        assert 1 == self.count
-
-    def test_doctype_ends_in_newline(self):
-        # Unlike other NavigableString subclasses, a DOCTYPE always ends
-        # in a newline.
-        doctype = Doctype("foo")
-        soup = self.soup("")
-        soup.insert(1, doctype)
-        assert soup.encode() == b"<!DOCTYPE foo>\n"
-
-    def test_declaration(self):
-        d = Declaration("foo")
-        assert "<?foo?>" == d.output_ready()
-
-    def test_default_string_containers(self):
-        # In some cases, we use different NavigableString subclasses for
-        # the same text in different tags.
-        soup = self.soup(
-            "<div>text</div><script>text</script><style>text</style>"
-        )
-        assert [NavigableString, Script, Stylesheet] == [
-            x.__class__ for x in soup.find_all(string=True)
-        ]
-
-        # The TemplateString is a little unusual because it's generally found
-        # _inside_ children of a <template> element, not a direct child of the
-        # <template> element.
-        soup = self.soup(
-            "<template>Some text<p>In a tag</p></template>Some text outside"
-        )
-        assert all(
-            isinstance(x, TemplateString)
-            for x in soup.template._all_strings(types=None)
-        )
-        
-        # Once the <template> tag closed, we went back to using
-        # NavigableString.
-        outside = soup.template.next_sibling
-        assert isinstance(outside, NavigableString)
-        assert not isinstance(outside, TemplateString)
-
-        # The TemplateString is also unusual because it can contain
-        # NavigableString subclasses of _other_ types, such as
-        # Comment.
-        markup = b"<template>Some text<p>In a tag</p><!--with a comment--></template>"
-        soup = self.soup(markup)
-        assert markup == soup.template.encode("utf8")
-
-    def test_ruby_strings(self):
-        markup = "<ruby>æ¼¢ <rp>(</rp><rt>kan</rt><rp>)</rp> å­— <rp>(</rp><rt>ji</rt><rp>)</rp></ruby>"
-        soup = self.soup(markup)
-        assert isinstance(soup.rp.string, RubyParenthesisString)
-        assert isinstance(soup.rt.string, RubyTextString)
-
-        # Just as a demo, here's what this means for get_text usage.
-        assert "漢字" == soup.get_text(strip=True)
-        assert "æ¼¢(kan)å­—(ji)" == soup.get_text(
-            strip=True,
-            types=(NavigableString, RubyTextString, RubyParenthesisString)
-        )
diff --git a/lib/bs4/tests/test_pageelement.py b/lib/bs4/tests/test_pageelement.py
deleted file mode 100644
index 24f9385d..00000000
--- a/lib/bs4/tests/test_pageelement.py
+++ /dev/null
@@ -1,378 +0,0 @@
-"""Tests of the bs4.element.PageElement class"""
-import copy
-import pickle
-import pytest
-import sys
-
-from bs4 import BeautifulSoup
-from bs4.element import (
-    Comment,
-    ResultSet,
-    SoupStrainer,
-)
-from . import (
-    SoupTest,
-)
-
-class TestEncoding(SoupTest):
-    """Test the ability to encode objects into strings."""
-
-    def test_unicode_string_can_be_encoded(self):
-        html = "<b>\N{SNOWMAN}</b>"
-        soup = self.soup(html)
-        assert soup.b.string.encode("utf-8") == "\N{SNOWMAN}".encode("utf-8")
-
-    def test_tag_containing_unicode_string_can_be_encoded(self):
-        html = "<b>\N{SNOWMAN}</b>"
-        soup = self.soup(html)
-        assert soup.b.encode("utf-8") == html.encode("utf-8")
-
-    def test_encoding_substitutes_unrecognized_characters_by_default(self):
-        html = "<b>\N{SNOWMAN}</b>"
-        soup = self.soup(html)
-        assert soup.b.encode("ascii") == b"<b>&#9731;</b>"
-
-    def test_encoding_can_be_made_strict(self):
-        html = "<b>\N{SNOWMAN}</b>"
-        soup = self.soup(html)
-        with pytest.raises(UnicodeEncodeError):
-            soup.encode("ascii", errors="strict")
-
-    def test_decode_contents(self):
-        html = "<b>\N{SNOWMAN}</b>"
-        soup = self.soup(html)
-        assert "\N{SNOWMAN}" == soup.b.decode_contents()
-
-    def test_encode_contents(self):
-        html = "<b>\N{SNOWMAN}</b>"
-        soup = self.soup(html)
-        assert "\N{SNOWMAN}".encode("utf8") == soup.b.encode_contents(
-            encoding="utf8"
-        )
-        
-    def test_encode_deeply_nested_document(self):
-        # This test verifies that encoding a string doesn't involve
-        # any recursive function calls. If it did, this test would
-        # overflow the Python interpreter stack.
-        limit = sys.getrecursionlimit() + 1
-        markup = "<span>" * limit
-        soup = self.soup(markup)
-        encoded = soup.encode()
-        assert limit == encoded.count(b"<span>")
-
-    def test_deprecated_renderContents(self):
-        html = "<b>\N{SNOWMAN}</b>"
-        soup = self.soup(html)
-        soup.renderContents()
-        assert "\N{SNOWMAN}".encode("utf8") == soup.b.renderContents()
-
-    def test_repr(self):
-        html = "<b>\N{SNOWMAN}</b>"
-        soup = self.soup(html)
-        assert html == repr(soup)
-
-        
-class TestFormatters(SoupTest):
-    """Test the formatting feature, used by methods like decode() and
-    prettify(), and the formatters themselves.
-    """
-    
-    def test_default_formatter_is_minimal(self):
-        markup = "<b>&lt;&lt;Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!&gt;&gt;</b>"
-        soup = self.soup(markup)
-        decoded = soup.decode(formatter="minimal")
-        # The < is converted back into &lt; but the e-with-acute is left alone.
-        assert decoded == self.document_for(
-                "<b>&lt;&lt;Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!&gt;&gt;</b>"
-        )
-
-    def test_formatter_html(self):
-        markup = "<br><b>&lt;&lt;Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!&gt;&gt;</b>"
-        soup = self.soup(markup)
-        decoded = soup.decode(formatter="html")
-        assert decoded == self.document_for(
-            "<br/><b>&lt;&lt;Sacr&eacute; bleu!&gt;&gt;</b>"
-        )
-
-    def test_formatter_html5(self):
-        markup = "<br><b>&lt;&lt;Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!&gt;&gt;</b>"
-        soup = self.soup(markup)
-        decoded = soup.decode(formatter="html5")
-        assert decoded == self.document_for(
-            "<br><b>&lt;&lt;Sacr&eacute; bleu!&gt;&gt;</b>"
-        )
-        
-    def test_formatter_minimal(self):
-        markup = "<b>&lt;&lt;Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!&gt;&gt;</b>"
-        soup = self.soup(markup)
-        decoded = soup.decode(formatter="minimal")
-        # The < is converted back into &lt; but the e-with-acute is left alone.
-        assert decoded == self.document_for(
-                "<b>&lt;&lt;Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!&gt;&gt;</b>"
-        )
-
-    def test_formatter_null(self):
-        markup = "<b>&lt;&lt;Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!&gt;&gt;</b>"
-        soup = self.soup(markup)
-        decoded = soup.decode(formatter=None)
-        # Neither the angle brackets nor the e-with-acute are converted.
-        # This is not valid HTML, but it's what the user wanted.
-        assert decoded == self.document_for(
-            "<b><<Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!>></b>"
-        )
-
-    def test_formatter_custom(self):
-        markup = "<b>&lt;foo&gt;</b><b>bar</b><br/>"
-        soup = self.soup(markup)
-        decoded = soup.decode(formatter = lambda x: x.upper())
-        # Instead of normal entity conversion code, the custom
-        # callable is called on every string.
-        assert decoded == self.document_for("<b><FOO></b><b>BAR</b><br/>")
-
-    def test_formatter_is_run_on_attribute_values(self):
-        markup = '<a href="http://a.com?a=b&c=é">e</a>'
-        soup = self.soup(markup)
-        a = soup.a
-
-        expect_minimal = '<a href="http://a.com?a=b&amp;c=é">e</a>'
-
-        assert expect_minimal == a.decode()
-        assert expect_minimal == a.decode(formatter="minimal")
-
-        expect_html = '<a href="http://a.com?a=b&amp;c=&eacute;">e</a>'
-        assert expect_html == a.decode(formatter="html")
-
-        assert markup == a.decode(formatter=None)
-        expect_upper = '<a href="HTTP://A.COM?A=B&C=É">E</a>'
-        assert expect_upper == a.decode(formatter=lambda x: x.upper())
-
-    def test_formatter_skips_script_tag_for_html_documents(self):
-        doc = """
-  <script type="text/javascript">
-   console.log("< < hey > > ");
-  </script>
-"""
-        encoded = BeautifulSoup(doc, 'html.parser').encode()
-        assert b"< < hey > >" in encoded
-
-    def test_formatter_skips_style_tag_for_html_documents(self):
-        doc = """
-  <style type="text/css">
-   console.log("< < hey > > ");
-  </style>
-"""
-        encoded = BeautifulSoup(doc, 'html.parser').encode()
-        assert b"< < hey > >" in encoded
-
-    def test_prettify_leaves_preformatted_text_alone(self):
-        soup = self.soup("<div>  foo  <pre>  \tbar\n  \n  </pre>  baz  <textarea> eee\nfff\t</textarea></div>")
-        # Everything outside the <pre> tag is reformatted, but everything
-        # inside is left alone.
-        assert '<div>\n foo\n <pre>  \tbar\n  \n  </pre>\n baz\n <textarea> eee\nfff\t</textarea>\n</div>\n' == soup.div.prettify()
-
-    def test_prettify_handles_nested_string_literal_tags(self):
-        # Most of this markup is inside a <pre> tag, so prettify()
-        # only does three things to it:
-        # 1. Add a newline and a space between the <div> and the <pre>
-        # 2. Add a newline after the </pre>
-        # 3. Add a newline at the end.
-        #
-        # The contents of the <pre> tag are left completely alone.  In
-        # particular, we don't start adding whitespace again once we
-        # encounter the first </pre> tag, because we know it's not
-        # the one that put us into string literal mode.
-        markup = """<div><pre><code>some
-<script><pre>code</pre></script> for you 
-</code></pre></div>"""
-
-        expect = """<div>
- <pre><code>some
-<script><pre>code</pre></script> for you 
-</code></pre>
-</div>
-"""
-        soup = self.soup(markup)
-        assert expect == soup.div.prettify()
-
-    def test_prettify_accepts_formatter_function(self):
-        soup = BeautifulSoup("<html><body>foo</body></html>", 'html.parser')
-        pretty = soup.prettify(formatter = lambda x: x.upper())
-        assert "FOO" in pretty
-
-    def test_prettify_outputs_unicode_by_default(self):
-        soup = self.soup("<a></a>")
-        assert str == type(soup.prettify())
-
-    def test_prettify_can_encode_data(self):
-        soup = self.soup("<a></a>")
-        assert bytes == type(soup.prettify("utf-8"))
-
-    def test_html_entity_substitution_off_by_default(self):
-        markup = "<b>Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!</b>"
-        soup = self.soup(markup)
-        encoded = soup.b.encode("utf-8")
-        assert encoded == markup.encode('utf-8')
-
-    def test_encoding_substitution(self):
-        # Here's the <meta> tag saying that a document is
-        # encoded in Shift-JIS.
-        meta_tag = ('<meta content="text/html; charset=x-sjis" '
-                    'http-equiv="Content-type"/>')
-        soup = self.soup(meta_tag)
-
-        # Parse the document, and the charset apprears unchanged.
-        assert soup.meta['content'] == 'text/html; charset=x-sjis'
-
-        # Encode the document into some encoding, and the encoding is
-        # substituted into the meta tag.
-        utf_8 = soup.encode("utf-8")
-        assert b"charset=utf-8" in utf_8
-
-        euc_jp = soup.encode("euc_jp")
-        assert b"charset=euc_jp" in euc_jp
-
-        shift_jis = soup.encode("shift-jis")
-        assert b"charset=shift-jis" in shift_jis
-
-        utf_16_u = soup.encode("utf-16").decode("utf-16")
-        assert "charset=utf-16" in utf_16_u
-
-    def test_encoding_substitution_doesnt_happen_if_tag_is_strained(self):
-        markup = ('<head><meta content="text/html; charset=x-sjis" '
-                    'http-equiv="Content-type"/></head><pre>foo</pre>')
-
-        # Beautiful Soup used to try to rewrite the meta tag even if the
-        # meta tag got filtered out by the strainer. This test makes
-        # sure that doesn't happen.
-        strainer = SoupStrainer('pre')
-        soup = self.soup(markup, parse_only=strainer)
-        assert soup.contents[0].name == 'pre'
-
-
-class TestPersistence(SoupTest):
-    "Testing features like pickle and deepcopy."
-
-    def setup_method(self):
-        self.page = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-"http://www.w3.org/TR/REC-html40/transitional.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Beautiful Soup: We called him Tortoise because he taught us.</title>
-<link rev="made" href="mailto:leonardr@segfault.org">
-<meta name="Description" content="Beautiful Soup: an HTML parser optimized for screen-scraping.">
-<meta name="generator" content="Markov Approximation 1.4 (module: leonardr)">
-<meta name="author" content="Leonard Richardson">
-</head>
-<body>
-<a href="foo">foo</a>
-<a href="foo"><b>bar</b></a>
-</body>
-</html>"""
-        self.tree = self.soup(self.page)
-
-    def test_pickle_and_unpickle_identity(self):
-        # Pickling a tree, then unpickling it, yields a tree identical
-        # to the original.
-        dumped = pickle.dumps(self.tree, 2)
-        loaded = pickle.loads(dumped)
-        assert loaded.__class__ == BeautifulSoup
-        assert loaded.decode() == self.tree.decode()
-        
-    def test_deepcopy_identity(self):
-        # Making a deepcopy of a tree yields an identical tree.
-        copied = copy.deepcopy(self.tree)
-        assert copied.decode() == self.tree.decode()
-
-    def test_copy_deeply_nested_document(self):
-        # This test verifies that copy and deepcopy don't involve any
-        # recursive function calls. If they did, this test would
-        # overflow the Python interpreter stack.
-        limit = sys.getrecursionlimit() + 1
-        markup = "<span>" * limit
-
-        soup = self.soup(markup)
-        
-        copied = copy.copy(soup)
-        copied = copy.deepcopy(soup)
-
-    def test_copy_preserves_encoding(self):
-        soup = BeautifulSoup(b'<p>&nbsp;</p>', 'html.parser')
-        encoding = soup.original_encoding
-        copy = soup.__copy__()
-        assert "<p> </p>" == str(copy)
-        assert encoding == copy.original_encoding
-
-    def test_copy_preserves_builder_information(self):
-
-        tag = self.soup('<p></p>').p
-
-        # Simulate a tag obtained from a source file.
-        tag.sourceline = 10
-        tag.sourcepos = 33
-        
-        copied = tag.__copy__()
-
-        # The TreeBuilder object is no longer availble, but information
-        # obtained from it gets copied over to the new Tag object.
-        assert tag.sourceline == copied.sourceline
-        assert tag.sourcepos == copied.sourcepos
-        assert tag.can_be_empty_element == copied.can_be_empty_element
-        assert tag.cdata_list_attributes == copied.cdata_list_attributes
-        assert tag.preserve_whitespace_tags == copied.preserve_whitespace_tags
-        assert tag.interesting_string_types == copied.interesting_string_types
-        
-    def test_unicode_pickle(self):
-        # A tree containing Unicode characters can be pickled.
-        html = "<b>\N{SNOWMAN}</b>"
-        soup = self.soup(html)
-        dumped = pickle.dumps(soup, pickle.HIGHEST_PROTOCOL)
-        loaded = pickle.loads(dumped)
-        assert loaded.decode() == soup.decode()
-
-    def test_copy_navigablestring_is_not_attached_to_tree(self):
-        html = "<b>Foo<a></a></b><b>Bar</b>"
-        soup = self.soup(html)
-        s1 = soup.find(string="Foo")
-        s2 = copy.copy(s1)
-        assert s1 == s2
-        assert None == s2.parent
-        assert None == s2.next_element
-        assert None != s1.next_sibling
-        assert None == s2.next_sibling
-        assert None == s2.previous_element
-
-    def test_copy_navigablestring_subclass_has_same_type(self):
-        html = "<b><!--Foo--></b>"
-        soup = self.soup(html)
-        s1 = soup.string
-        s2 = copy.copy(s1)
-        assert s1 == s2
-        assert isinstance(s2, Comment)
-
-    def test_copy_entire_soup(self):
-        html = "<div><b>Foo<a></a></b><b>Bar</b></div>end"
-        soup = self.soup(html)
-        soup_copy = copy.copy(soup)
-        assert soup == soup_copy
-
-    def test_copy_tag_copies_contents(self):
-        html = "<div><b>Foo<a></a></b><b>Bar</b></div>end"
-        soup = self.soup(html)
-        div = soup.div
-        div_copy = copy.copy(div)
-
-        # The two tags look the same, and evaluate to equal.
-        assert str(div) == str(div_copy)
-        assert div == div_copy
-
-        # But they're not the same object.
-        assert div is not div_copy
-
-        # And they don't have the same relation to the parse tree. The
-        # copy is not associated with a parse tree at all.
-        assert None == div_copy.parent
-        assert None == div_copy.previous_element
-        assert None == div_copy.find(string='Bar').next_element
-        assert None != div.find(string='Bar').next_element
-
diff --git a/lib/bs4/tests/test_soup.py b/lib/bs4/tests/test_soup.py
deleted file mode 100644
index 28013b87..00000000
--- a/lib/bs4/tests/test_soup.py
+++ /dev/null
@@ -1,504 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Tests of Beautiful Soup as a whole."""
-
-from pdb import set_trace
-import logging
-import os
-import pickle
-import pytest
-import sys
-import tempfile
-
-from bs4 import (
-    BeautifulSoup,
-    BeautifulStoneSoup,
-    GuessedAtParserWarning,
-    MarkupResemblesLocatorWarning,
-    dammit,
-)
-from bs4.builder import (
-    builder_registry,
-    TreeBuilder,
-    ParserRejectedMarkup,
-)
-from bs4.element import (
-    Comment,
-    SoupStrainer,
-    PYTHON_SPECIFIC_ENCODINGS,
-    Tag,
-    NavigableString,
-)
-
-from . import (
-    default_builder,
-    LXML_PRESENT,
-    SoupTest,
-)
-import warnings
-    
-class TestConstructor(SoupTest):
-
-    def test_short_unicode_input(self):
-        data = "<h1>éé</h1>"
-        soup = self.soup(data)
-        assert "éé" == soup.h1.string
-
-    def test_embedded_null(self):
-        data = "<h1>foo\0bar</h1>"
-        soup = self.soup(data)
-        assert "foo\0bar" == soup.h1.string
-
-    def test_exclude_encodings(self):
-        utf8_data = "Räksmörgås".encode("utf-8")
-        soup = self.soup(utf8_data, exclude_encodings=["utf-8"])
-        assert "windows-1252" == soup.original_encoding
-
-    def test_custom_builder_class(self):
-        # Verify that you can pass in a custom Builder class and
-        # it'll be instantiated with the appropriate keyword arguments.
-        class Mock(object):
-            def __init__(self, **kwargs):
-                self.called_with = kwargs
-                self.is_xml = True
-                self.store_line_numbers = False
-                self.cdata_list_attributes = []
-                self.preserve_whitespace_tags = []
-                self.string_containers = {}
-            def initialize_soup(self, soup):
-                pass
-            def feed(self, markup):
-                self.fed = markup
-            def reset(self):
-                pass
-            def ignore(self, ignore):
-                pass
-            set_up_substitutions = can_be_empty_element = ignore
-            def prepare_markup(self, *args, **kwargs):
-                yield "prepared markup", "original encoding", "declared encoding", "contains replacement characters"
-                
-        kwargs = dict(
-            var="value",
-            # This is a deprecated BS3-era keyword argument, which
-            # will be stripped out.
-            convertEntities=True,
-        )
-        with warnings.catch_warnings(record=True):
-            soup = BeautifulSoup('', builder=Mock, **kwargs)
-        assert isinstance(soup.builder, Mock)
-        assert dict(var="value") == soup.builder.called_with
-        assert "prepared markup" == soup.builder.fed
-        
-        # You can also instantiate the TreeBuilder yourself. In this
-        # case, that specific object is used and any keyword arguments
-        # to the BeautifulSoup constructor are ignored.
-        builder = Mock(**kwargs)
-        with warnings.catch_warnings(record=True) as w:
-            soup = BeautifulSoup(
-                '', builder=builder, ignored_value=True,
-            )
-        msg = str(w[0].message)
-        assert msg.startswith("Keyword arguments to the BeautifulSoup constructor will be ignored.")
-        assert builder == soup.builder
-        assert kwargs == builder.called_with
-
-    def test_parser_markup_rejection(self):
-        # If markup is completely rejected by the parser, an
-        # explanatory ParserRejectedMarkup exception is raised.
-        class Mock(TreeBuilder):
-            def feed(self, *args, **kwargs):
-                raise ParserRejectedMarkup("Nope.")
-
-        def prepare_markup(self, *args, **kwargs):
-            # We're going to try two different ways of preparing this markup,
-            # but feed() will reject both of them.
-            yield markup, None, None, False
-            yield markup, None, None, False
-            
-
-        import re
-        with pytest.raises(ParserRejectedMarkup) as exc_info:
-            BeautifulSoup('', builder=Mock)
-        assert "The markup you provided was rejected by the parser. Trying a different parser or a different encoding may help." in str(exc_info.value)
-        
-    def test_cdata_list_attributes(self):
-        # Most attribute values are represented as scalars, but the
-        # HTML standard says that some attributes, like 'class' have
-        # space-separated lists as values.
-        markup = '<a id=" an id " class=" a class "></a>'
-        soup = self.soup(markup)
-
-        # Note that the spaces are stripped for 'class' but not for 'id'.
-        a = soup.a
-        assert " an id " == a['id']
-        assert ["a", "class"] == a['class']
-
-        # TreeBuilder takes an argument called 'multi_valued_attributes'  which lets
-        # you customize or disable this. As always, you can customize the TreeBuilder
-        # by passing in a keyword argument to the BeautifulSoup constructor.
-        soup = self.soup(markup, builder=default_builder, multi_valued_attributes=None)
-        assert " a class " == soup.a['class']
-
-        # Here are two ways of saying that `id` is a multi-valued
-        # attribute in this context, but 'class' is not.
-        for switcheroo in ({'*': 'id'}, {'a': 'id'}):
-            with warnings.catch_warnings(record=True) as w:
-                # This will create a warning about not explicitly
-                # specifying a parser, but we'll ignore it.
-                soup = self.soup(markup, builder=None, multi_valued_attributes=switcheroo)
-            a = soup.a
-            assert ["an", "id"] == a['id']
-            assert " a class " == a['class']
-
-    def test_replacement_classes(self):
-        # Test the ability to pass in replacements for element classes
-        # which will be used when building the tree.
-        class TagPlus(Tag):
-            pass
-
-        class StringPlus(NavigableString):
-            pass
-
-        class CommentPlus(Comment):
-            pass
-        
-        soup = self.soup(
-            "<a><b>foo</b>bar</a><!--whee-->",
-            element_classes = {
-                Tag: TagPlus,
-                NavigableString: StringPlus,
-                Comment: CommentPlus,
-            }
-        )
-
-        # The tree was built with TagPlus, StringPlus, and CommentPlus objects,
-        # rather than Tag, String, and Comment objects.
-        assert all(
-            isinstance(x, (TagPlus, StringPlus, CommentPlus))
-            for x in soup.recursiveChildGenerator()
-        )
-
-    def test_alternate_string_containers(self):
-        # Test the ability to customize the string containers for
-        # different types of tags.
-        class PString(NavigableString):
-            pass
-
-        class BString(NavigableString):
-            pass
-
-        soup = self.soup(
-            "<div>Hello.<p>Here is <b>some <i>bolded</i></b> text",
-            string_containers = {
-                'b': BString,
-                'p': PString,
-            }
-        )
-
-        # The string before the <p> tag is a regular NavigableString.
-        assert isinstance(soup.div.contents[0], NavigableString)
-        
-        # The string inside the <p> tag, but not inside the <i> tag,
-        # is a PString.
-        assert isinstance(soup.p.contents[0], PString)
-
-        # Every string inside the <b> tag is a BString, even the one that
-        # was also inside an <i> tag.
-        for s in soup.b.strings:
-            assert isinstance(s, BString)
-
-        # Now that parsing was complete, the string_container_stack
-        # (where this information was kept) has been cleared out.
-        assert [] == soup.string_container_stack
-
-
-class TestOutput(SoupTest):
-
-    @pytest.mark.parametrize(
-        "eventual_encoding,actual_encoding", [
-            ("utf-8", "utf-8"),
-            ("utf-16", "utf-16"),
-        ]
-    )
-    def test_decode_xml_declaration(self, eventual_encoding, actual_encoding):
-        # Most of the time, calling decode() on an XML document will
-        # give you a document declaration that mentions the encoding
-        # you intend to use when encoding the document as a
-        # bytestring.
-        soup = self.soup("<tag></tag>")
-        soup.is_xml = True
-        assert (f'<?xml version="1.0" encoding="{actual_encoding}"?>\n<tag></tag>'
-                == soup.decode(eventual_encoding=eventual_encoding))
-
-    @pytest.mark.parametrize(
-        "eventual_encoding", [x for x in PYTHON_SPECIFIC_ENCODINGS] + [None]
-    )
-    def test_decode_xml_declaration_with_missing_or_python_internal_eventual_encoding(self, eventual_encoding):
-        # But if you pass a Python internal encoding into decode(), or
-        # omit the eventual_encoding altogether, the document
-        # declaration won't mention any particular encoding.
-        soup = BeautifulSoup("<tag></tag>", "html.parser")
-        soup.is_xml = True
-        assert (f'<?xml version="1.0"?>\n<tag></tag>'
-                == soup.decode(eventual_encoding=eventual_encoding))
-
-    def test(self):
-        # BeautifulSoup subclasses Tag and extends the decode() method.
-        # Make sure the other Tag methods which call decode() call
-        # it correctly.
-        soup = self.soup("<tag></tag>")
-        assert b"<tag></tag>" == soup.encode(encoding="utf-8")
-        assert b"<tag></tag>" == soup.encode_contents(encoding="utf-8")
-        assert "<tag></tag>" == soup.decode_contents()
-        assert "<tag>\n</tag>\n" == soup.prettify()
-
-        
-class TestWarnings(SoupTest):
-    # Note that some of the tests in this class create BeautifulSoup
-    # objects directly rather than using self.soup(). That's
-    # because SoupTest.soup is defined in a different file,
-    # which will throw off the assertion in _assert_warning
-    # that the code that triggered the warning is in the same
-    # file as the test.
-
-    def _assert_warning(self, warnings, cls):
-        for w in warnings:
-            if isinstance(w.message, cls):
-                assert w.filename == __file__
-                return w
-        raise Exception("%s warning not found in %r" % (cls, warnings))
-    
-    def _assert_no_parser_specified(self, w):
-        warning = self._assert_warning(w, GuessedAtParserWarning)
-        message = str(warning.message)
-        assert message.startswith(BeautifulSoup.NO_PARSER_SPECIFIED_WARNING[:60])
-
-    def test_warning_if_no_parser_specified(self):
-        with warnings.catch_warnings(record=True) as w:
-            soup = BeautifulSoup("<a><b></b></a>")
-        self._assert_no_parser_specified(w)
-
-    def test_warning_if_parser_specified_too_vague(self):
-        with warnings.catch_warnings(record=True) as w:
-            soup = BeautifulSoup("<a><b></b></a>", "html")
-        self._assert_no_parser_specified(w)
-
-    def test_no_warning_if_explicit_parser_specified(self):
-        with warnings.catch_warnings(record=True) as w:
-            soup = self.soup("<a><b></b></a>")
-        assert [] == w
-
-    def test_parseOnlyThese_renamed_to_parse_only(self):
-        with warnings.catch_warnings(record=True) as w:
-            soup = BeautifulSoup(
-                "<a><b></b></a>", "html.parser",
-                parseOnlyThese=SoupStrainer("b"),
-            )
-        warning = self._assert_warning(w, DeprecationWarning)
-        msg = str(warning.message)
-        assert "parseOnlyThese" in msg
-        assert "parse_only" in msg
-        assert b"<b></b>" == soup.encode()
-
-    def test_fromEncoding_renamed_to_from_encoding(self):
-        with warnings.catch_warnings(record=True) as w:
-            utf8 = b"\xc3\xa9"
-            soup = BeautifulSoup(
-                utf8, "html.parser", fromEncoding="utf8"
-            )
-        warning = self._assert_warning(w, DeprecationWarning)
-        msg = str(warning.message)
-        assert "fromEncoding" in msg
-        assert "from_encoding" in msg
-        assert "utf8" == soup.original_encoding
-
-    def test_unrecognized_keyword_argument(self):
-        with pytest.raises(TypeError):
-            self.soup("<a>", no_such_argument=True)
-
-    @pytest.mark.parametrize(
-        "extension",
-        ['markup.html', 'markup.htm', 'markup.HTML', 'markup.txt',
-         'markup.xhtml', 'markup.xml', "/home/user/file", "c:\\user\file"]
-    )
-    def test_resembles_filename_warning(self, extension):
-        # A warning is issued if the "markup" looks like the name of
-        # an HTML or text file, or a full path to a file on disk.
-        with warnings.catch_warnings(record=True) as w:
-            soup = BeautifulSoup("markup" + extension, "html.parser")
-            warning = self._assert_warning(w, MarkupResemblesLocatorWarning)
-            assert "looks more like a filename" in str(warning.message)
-
-    @pytest.mark.parametrize(
-        "extension",
-        ['markuphtml', 'markup.com', '', 'markup.js']
-    )
-    def test_resembles_filename_no_warning(self, extension):
-        # The 'looks more like a filename' warning is not issued if
-        # the markup looks like a bare string, a domain name, or a
-        # file that's not an HTML file.
-        with warnings.catch_warnings(record=True) as w:
-            soup = self.soup("markup" + extension)
-        assert [] == w
-
-    def test_url_warning_with_bytes_url(self):
-        url = b"http://www.crummybytes.com/"
-        with warnings.catch_warnings(record=True) as warning_list:
-            soup = BeautifulSoup(url, "html.parser")
-        warning = self._assert_warning(
-            warning_list, MarkupResemblesLocatorWarning
-        )
-        assert "looks more like a URL" in str(warning.message)
-        assert url not in str(warning.message).encode("utf8")
-        
-    def test_url_warning_with_unicode_url(self):
-        url = "http://www.crummyunicode.com/"
-        with warnings.catch_warnings(record=True) as warning_list:
-            # note - this url must differ from the bytes one otherwise
-            # python's warnings system swallows the second warning
-            soup = BeautifulSoup(url, "html.parser")
-        warning = self._assert_warning(
-            warning_list, MarkupResemblesLocatorWarning
-        )
-        assert "looks more like a URL" in str(warning.message)
-        assert url not in str(warning.message)
-
-    def test_url_warning_with_bytes_and_space(self):
-        # Here the markup contains something besides a URL, so no warning
-        # is issued.
-        with warnings.catch_warnings(record=True) as warning_list:
-            soup = self.soup(b"http://www.crummybytes.com/ is great")
-        assert not any("looks more like a URL" in str(w.message) 
-                       for w in warning_list)
-
-    def test_url_warning_with_unicode_and_space(self):
-        with warnings.catch_warnings(record=True) as warning_list:
-            soup = self.soup("http://www.crummyunicode.com/ is great")
-        assert not any("looks more like a URL" in str(w.message) 
-                       for w in warning_list)
-
-
-class TestSelectiveParsing(SoupTest):
-
-    def test_parse_with_soupstrainer(self):
-        markup = "No<b>Yes</b><a>No<b>Yes <c>Yes</c></b>"
-        strainer = SoupStrainer("b")
-        soup = self.soup(markup, parse_only=strainer)
-        assert soup.encode() == b"<b>Yes</b><b>Yes <c>Yes</c></b>"
-
-        
-class TestNewTag(SoupTest):
-    """Test the BeautifulSoup.new_tag() method."""
-    def test_new_tag(self):
-        soup = self.soup("")
-        new_tag = soup.new_tag("foo", bar="baz", attrs={"name": "a name"})
-        assert isinstance(new_tag, Tag)
-        assert "foo" == new_tag.name
-        assert dict(bar="baz", name="a name") == new_tag.attrs
-        assert None == new_tag.parent
-
-    @pytest.mark.skipif(
-        not LXML_PRESENT,
-        reason="lxml not installed, cannot parse XML document"
-    )
-    def test_xml_tag_inherits_self_closing_rules_from_builder(self):
-        xml_soup = BeautifulSoup("", "xml")
-        xml_br = xml_soup.new_tag("br")
-        xml_p = xml_soup.new_tag("p")
-
-        # Both the <br> and <p> tag are empty-element, just because
-        # they have no contents.
-        assert b"<br/>" == xml_br.encode()
-        assert b"<p/>" == xml_p.encode()
-
-    def test_tag_inherits_self_closing_rules_from_builder(self):
-        html_soup = BeautifulSoup("", "html.parser")
-        html_br = html_soup.new_tag("br")
-        html_p = html_soup.new_tag("p")
-
-        # The HTML builder users HTML's rules about which tags are
-        # empty-element tags, and the new tags reflect these rules.
-        assert b"<br/>" == html_br.encode()
-        assert b"<p></p>" == html_p.encode()
-
-class TestNewString(SoupTest):
-    """Test the BeautifulSoup.new_string() method."""
-    def test_new_string_creates_navigablestring(self):
-        soup = self.soup("")
-        s = soup.new_string("foo")
-        assert "foo" == s
-        assert isinstance(s, NavigableString)
-
-    def test_new_string_can_create_navigablestring_subclass(self):
-        soup = self.soup("")
-        s = soup.new_string("foo", Comment)
-        assert "foo" == s
-        assert isinstance(s, Comment)
-
-
-class TestPickle(SoupTest):
-   # Test our ability to pickle the BeautifulSoup object itself.
-
-    def test_normal_pickle(self):
-        soup = self.soup("<a>some markup</a>")
-        pickled = pickle.dumps(soup)
-        unpickled = pickle.loads(pickled)
-        assert "some markup" == unpickled.a.string
-        
-    def test_pickle_with_no_builder(self):
-        # We had a bug that prevented pickling from working if
-        # the builder wasn't set.
-        soup = self.soup("some markup")
-        soup.builder = None
-        pickled = pickle.dumps(soup)
-        unpickled = pickle.loads(pickled)
-        assert "some markup" == unpickled.string
-
-class TestEncodingConversion(SoupTest):
-    # Test Beautiful Soup's ability to decode and encode from various
-    # encodings.
-
-    def setup_method(self):
-        self.unicode_data = '<html><head><meta charset="utf-8"/></head><body><foo>Sacr\N{LATIN SMALL LETTER E WITH ACUTE} bleu!</foo></body></html>'
-        self.utf8_data = self.unicode_data.encode("utf-8")
-        # Just so you know what it looks like.
-        assert self.utf8_data == b'<html><head><meta charset="utf-8"/></head><body><foo>Sacr\xc3\xa9 bleu!</foo></body></html>'
-
-    def test_ascii_in_unicode_out(self):
-        # ASCII input is converted to Unicode. The original_encoding
-        # attribute is set to 'utf-8', a superset of ASCII.
-        chardet = dammit.chardet_dammit
-        logging.disable(logging.WARNING)
-        try:
-            def noop(str):
-                return None
-            # Disable chardet, which will realize that the ASCII is ASCII.
-            dammit.chardet_dammit = noop
-            ascii = b"<foo>a</foo>"
-            soup_from_ascii = self.soup(ascii)
-            unicode_output = soup_from_ascii.decode()
-            assert isinstance(unicode_output, str)
-            assert unicode_output == self.document_for(ascii.decode())
-            assert soup_from_ascii.original_encoding.lower() == "utf-8"
-        finally:
-            logging.disable(logging.NOTSET)
-            dammit.chardet_dammit = chardet
-
-    def test_unicode_in_unicode_out(self):
-        # Unicode input is left alone. The original_encoding attribute
-        # is not set.
-        soup_from_unicode = self.soup(self.unicode_data)
-        assert soup_from_unicode.decode() == self.unicode_data
-        assert soup_from_unicode.foo.string == 'Sacr\xe9 bleu!'
-        assert soup_from_unicode.original_encoding == None
-
-    def test_utf8_in_unicode_out(self):
-        # UTF-8 input is converted to Unicode. The original_encoding
-        # attribute is set.
-        soup_from_utf8 = self.soup(self.utf8_data)
-        assert soup_from_utf8.decode() == self.unicode_data
-        assert soup_from_utf8.foo.string == 'Sacr\xe9 bleu!'
-
-    def test_utf8_out(self):
-        # The internal data structures can be encoded as UTF-8.
-        soup_from_unicode = self.soup(self.unicode_data)
-        assert soup_from_unicode.encode('utf-8') == self.utf8_data
diff --git a/lib/bs4/tests/test_tag.py b/lib/bs4/tests/test_tag.py
deleted file mode 100644
index c48f3345..00000000
--- a/lib/bs4/tests/test_tag.py
+++ /dev/null
@@ -1,234 +0,0 @@
-import warnings
-from bs4.element import (
-    Comment,
-    NavigableString,
-)
-from . import SoupTest
-
-class TestTag(SoupTest):
-    """Test various methods of Tag which aren't so complicated they
-    need their own classes.
-    """
-
-    def test__should_pretty_print(self):
-        # Test the rules about when a tag should be pretty-printed.
-        tag = self.soup("").new_tag("a_tag")
-
-        # No list of whitespace-preserving tags -> pretty-print
-        tag._preserve_whitespace_tags = None
-        assert True == tag._should_pretty_print(0)
-
-        # List exists but tag is not on the list -> pretty-print
-        tag.preserve_whitespace_tags = ["some_other_tag"]
-        assert True == tag._should_pretty_print(1)
-
-        # Indent level is None -> don't pretty-print
-        assert False == tag._should_pretty_print(None)
-        
-        # Tag is on the whitespace-preserving list -> don't pretty-print
-        tag.preserve_whitespace_tags = ["some_other_tag", "a_tag"]
-        assert False == tag._should_pretty_print(1)
-    
-    def test_len(self):
-        """The length of a Tag is its number of children."""
-        soup = self.soup("<top>1<b>2</b>3</top>")
-
-        # The BeautifulSoup object itself contains one element: the
-        # <top> tag.
-        assert len(soup.contents) == 1
-        assert len(soup) == 1
-
-        # The <top> tag contains three elements: the text node "1", the
-        # <b> tag, and the text node "3".
-        assert len(soup.top) == 3
-        assert len(soup.top.contents) == 3
-
-    def test_member_access_invokes_find(self):
-        """Accessing a Python member .foo invokes find('foo')"""
-        soup = self.soup('<b><i></i></b>')
-        assert soup.b == soup.find('b')
-        assert soup.b.i == soup.find('b').find('i')
-        assert soup.a == None
-
-    def test_deprecated_member_access(self):
-        soup = self.soup('<b><i></i></b>')
-        with warnings.catch_warnings(record=True) as w:
-            tag = soup.bTag
-        assert soup.b == tag
-        assert '.bTag is deprecated, use .find("b") instead. If you really were looking for a tag called bTag, use .find("bTag")' == str(w[0].message)
-
-    def test_has_attr(self):
-        """has_attr() checks for the presence of an attribute.
-
-        Please note note: has_attr() is different from
-        __in__. has_attr() checks the tag's attributes and __in__
-        checks the tag's chidlren.
-        """
-        soup = self.soup("<foo attr='bar'>")
-        assert soup.foo.has_attr('attr')
-        assert not soup.foo.has_attr('attr2')
-
-    def test_attributes_come_out_in_alphabetical_order(self):
-        markup = '<b a="1" z="5" m="3" f="2" y="4"></b>'
-        self.assertSoupEquals(markup, '<b a="1" f="2" m="3" y="4" z="5"></b>')
-
-    def test_string(self):
-        # A Tag that contains only a text node makes that node
-        # available as .string.
-        soup = self.soup("<b>foo</b>")
-        assert soup.b.string == 'foo'
-
-    def test_empty_tag_has_no_string(self):
-        # A Tag with no children has no .stirng.
-        soup = self.soup("<b></b>")
-        assert soup.b.string == None
-
-    def test_tag_with_multiple_children_has_no_string(self):
-        # A Tag with no children has no .string.
-        soup = self.soup("<a>foo<b></b><b></b></b>")
-        assert soup.b.string == None
-
-        soup = self.soup("<a>foo<b></b>bar</b>")
-        assert soup.b.string == None
-
-        # Even if all the children are strings, due to trickery,
-        # it won't work--but this would be a good optimization.
-        soup = self.soup("<a>foo</b>")
-        soup.a.insert(1, "bar")
-        assert soup.a.string == None
-
-    def test_tag_with_recursive_string_has_string(self):
-        # A Tag with a single child which has a .string inherits that
-        # .string.
-        soup = self.soup("<a><b>foo</b></a>")
-        assert soup.a.string == "foo"
-        assert soup.string == "foo"
-
-    def test_lack_of_string(self):
-        """Only a Tag containing a single text node has a .string."""
-        soup = self.soup("<b>f<i>e</i>o</b>")
-        assert soup.b.string is None
-
-        soup = self.soup("<b></b>")
-        assert soup.b.string is None
-
-    def test_all_text(self):
-        """Tag.text and Tag.get_text(sep=u"") -> all child text, concatenated"""
-        soup = self.soup("<a>a<b>r</b>   <r> t </r></a>")
-        assert soup.a.text == "ar  t "
-        assert soup.a.get_text(strip=True) == "art"
-        assert soup.a.get_text(",") == "a,r, , t "
-        assert soup.a.get_text(",", strip=True) == "a,r,t"
-
-    def test_get_text_ignores_special_string_containers(self):
-        soup = self.soup("foo<!--IGNORE-->bar")
-        assert soup.get_text() == "foobar"
-
-        assert soup.get_text(types=(NavigableString, Comment)) == "fooIGNOREbar"
-        assert soup.get_text(types=None) == "fooIGNOREbar"
-
-        soup = self.soup("foo<style>CSS</style><script>Javascript</script>bar")
-        assert soup.get_text() == "foobar"
-        
-    def test_all_strings_ignores_special_string_containers(self):
-        soup = self.soup("foo<!--IGNORE-->bar")
-        assert ['foo', 'bar'] == list(soup.strings)
-
-        soup = self.soup("foo<style>CSS</style><script>Javascript</script>bar")
-        assert ['foo', 'bar'] == list(soup.strings)
-
-    def test_string_methods_inside_special_string_container_tags(self):
-        # Strings inside tags like <script> are generally ignored by
-        # methods like get_text, because they're not what humans
-        # consider 'text'. But if you call get_text on the <script>
-        # tag itself, those strings _are_ considered to be 'text',
-        # because there's nothing else you might be looking for.
-        
-        style = self.soup("<div>a<style>Some CSS</style></div>")
-        template = self.soup("<div>a<template><p>Templated <b>text</b>.</p><!--With a comment.--></template></div>")
-        script = self.soup("<div>a<script><!--a comment-->Some text</script></div>")
-        
-        assert style.div.get_text() == "a"
-        assert list(style.div.strings) == ["a"]
-        assert style.div.style.get_text() == "Some CSS"
-        assert list(style.div.style.strings) == ['Some CSS']
-        
-        # The comment is not picked up here. That's because it was
-        # parsed into a Comment object, which is not considered
-        # interesting by template.strings.
-        assert template.div.get_text() == "a"
-        assert list(template.div.strings) == ["a"]
-        assert template.div.template.get_text() == "Templated text."
-        assert list(template.div.template.strings) == ["Templated ", "text", "."]
-
-        # The comment is included here, because it didn't get parsed
-        # into a Comment object--it's part of the Script string.
-        assert script.div.get_text() == "a"
-        assert list(script.div.strings) == ["a"]
-        assert script.div.script.get_text() == "<!--a comment-->Some text"
-        assert list(script.div.script.strings) == ['<!--a comment-->Some text']
-
-
-class TestMultiValuedAttributes(SoupTest):
-    """Test the behavior of multi-valued attributes like 'class'.
-
-    The values of such attributes are always presented as lists.
-    """
-
-    def test_single_value_becomes_list(self):
-        soup = self.soup("<a class='foo'>")
-        assert ["foo"] ==soup.a['class']
-
-    def test_multiple_values_becomes_list(self):
-        soup = self.soup("<a class='foo bar'>")
-        assert ["foo", "bar"] == soup.a['class']
-
-    def test_multiple_values_separated_by_weird_whitespace(self):
-        soup = self.soup("<a class='foo\tbar\nbaz'>")
-        assert ["foo", "bar", "baz"] ==soup.a['class']
-
-    def test_attributes_joined_into_string_on_output(self):
-        soup = self.soup("<a class='foo\tbar'>")
-        assert b'<a class="foo bar"></a>' == soup.a.encode()
-
-    def test_get_attribute_list(self):
-        soup = self.soup("<a id='abc def'>")
-        assert ['abc def'] == soup.a.get_attribute_list('id')
-        
-    def test_accept_charset(self):
-        soup = self.soup('<form accept-charset="ISO-8859-1 UTF-8">')
-        assert ['ISO-8859-1', 'UTF-8'] == soup.form['accept-charset']
-
-    def test_cdata_attribute_applying_only_to_one_tag(self):
-        data = '<a accept-charset="ISO-8859-1 UTF-8"></a>'
-        soup = self.soup(data)
-        # We saw in another test that accept-charset is a cdata-list
-        # attribute for the <form> tag. But it's not a cdata-list
-        # attribute for any other tag.
-        assert 'ISO-8859-1 UTF-8' == soup.a['accept-charset']
-
-    def test_customization(self):
-        # It's possible to change which attributes of which tags
-        # are treated as multi-valued attributes.
-        #
-        # Here, 'id' is a multi-valued attribute and 'class' is not.
-        #
-        # TODO: This code is in the builder and should be tested there.
-        soup = self.soup(
-            '<a class="foo" id="bar">', multi_valued_attributes={ '*' : 'id' }
-        )
-        assert soup.a['class'] == 'foo'
-        assert soup.a['id'] == ['bar']
-
-    def test_hidden_tag_is_invisible(self):
-        # Setting .hidden on a tag makes it invisible in output, but
-        # leaves its contents visible.
-        #
-        # This is not a documented or supported feature of Beautiful
-        # Soup (e.g. NavigableString doesn't support .hidden even
-        # though it could), but some people use it and it's not
-        # hurting anything to verify that it keeps working.
-        #
-        soup = self.soup('<div id="1"><span id="2">a string</span></div>')
-        soup.span.hidden = True
-        assert '<div id="1">a string</div>' == str(soup.div)
diff --git a/lib/bs4/tests/test_tree.py b/lib/bs4/tests/test_tree.py
deleted file mode 100644
index 26995f95..00000000
--- a/lib/bs4/tests/test_tree.py
+++ /dev/null
@@ -1,1304 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Tests for Beautiful Soup's tree traversal methods.
-
-The tree traversal methods are the main advantage of using Beautiful
-Soup over just using a parser.
-
-Different parsers will build different Beautiful Soup trees given the
-same markup, but all Beautiful Soup trees can be traversed with the
-methods tested here.
-"""
-
-from pdb import set_trace
-import pytest
-import re
-import warnings
-from bs4 import BeautifulSoup
-from bs4.builder import (
-    builder_registry,
-    HTMLParserTreeBuilder,
-)
-from bs4.element import (
-    CData,
-    Comment,
-    Declaration,
-    Doctype,
-    Formatter,
-    NavigableString,
-    Script,
-    SoupStrainer,
-    Stylesheet,
-    Tag,
-    TemplateString,
-)
-from . import (
-    SoupTest,
-)
-
-class TestFind(SoupTest):
-    """Basic tests of the find() method.
-
-    find() just calls find_all() with limit=1, so it's not tested all
-    that thouroughly here.
-    """
-
-    def test_find_tag(self):
-        soup = self.soup("<a>1</a><b>2</b><a>3</a><b>4</b>")
-        assert soup.find("b").string == "2"
-
-    def test_unicode_text_find(self):
-        soup = self.soup('<h1>Räksmörgås</h1>')
-        assert soup.find(string='Räksmörgås') == 'Räksmörgås'
-
-    def test_unicode_attribute_find(self):
-        soup = self.soup('<h1 id="Räksmörgås">here it is</h1>')
-        str(soup)
-        assert "here it is" == soup.find(id='Räksmörgås').text
-
-
-    def test_find_everything(self):
-        """Test an optimization that finds all tags."""
-        soup = self.soup("<a>foo</a><b>bar</b>")
-        assert 2 == len(soup.find_all())
-
-    def test_find_everything_with_name(self):
-        """Test an optimization that finds all tags with a given name."""
-        soup = self.soup("<a>foo</a><b>bar</b><a>baz</a>")
-        assert 2 == len(soup.find_all('a'))
-
-class TestFindAll(SoupTest):
-    """Basic tests of the find_all() method."""
-
-    def test_find_all_text_nodes(self):
-        """You can search the tree for text nodes."""
-        soup = self.soup("<html>Foo<b>bar</b>\xbb</html>")
-        # Exact match.
-        assert soup.find_all(string="bar") == ["bar"]
-
-       
-        # Match any of a number of strings.
-        assert soup.find_all(string=["Foo", "bar"]) == ["Foo", "bar"]
-        # Match a regular expression.
-        assert soup.find_all(string=re.compile('.*')) == ["Foo", "bar", '\xbb']
-        # Match anything.
-        assert soup.find_all(string=True) == ["Foo", "bar", '\xbb']
-
-    def test_find_all_limit(self):
-        """You can limit the number of items returned by find_all."""
-        soup = self.soup("<a>1</a><a>2</a><a>3</a><a>4</a><a>5</a>")
-        self.assert_selects(soup.find_all('a', limit=3), ["1", "2", "3"])
-        self.assert_selects(soup.find_all('a', limit=1), ["1"])
-        self.assert_selects(
-            soup.find_all('a', limit=10), ["1", "2", "3", "4", "5"])
-
-        # A limit of 0 means no limit.
-        self.assert_selects(
-            soup.find_all('a', limit=0), ["1", "2", "3", "4", "5"])
-
-    def test_calling_a_tag_is_calling_findall(self):
-        soup = self.soup("<a>1</a><b>2<a id='foo'>3</a></b>")
-        self.assert_selects(soup('a', limit=1), ["1"])
-        self.assert_selects(soup.b(id="foo"), ["3"])
-
-    def test_find_all_with_self_referential_data_structure_does_not_cause_infinite_recursion(self):
-        soup = self.soup("<a></a>")
-        # Create a self-referential list.
-        l = []
-        l.append(l)
-
-        # Without special code in _normalize_search_value, this would cause infinite
-        # recursion.
-        assert [] == soup.find_all(l)
-
-    def test_find_all_resultset(self):
-        """All find_all calls return a ResultSet"""
-        soup = self.soup("<a></a>")
-        result = soup.find_all("a")
-        assert hasattr(result, "source")
-
-        result = soup.find_all(True)
-        assert hasattr(result, "source")
-
-        result = soup.find_all(string="foo")
-        assert hasattr(result, "source")
-
-
-class TestFindAllBasicNamespaces(SoupTest):
-
-    def test_find_by_namespaced_name(self):
-        soup = self.soup('<mathml:msqrt>4</mathml:msqrt><a svg:fill="red">')
-        assert "4" == soup.find("mathml:msqrt").string
-        assert "a" == soup.find(attrs= { "svg:fill" : "red" }).name
-
-
-class TestFindAllByName(SoupTest):
-    """Test ways of finding tags by tag name."""
-
-    def setup_method(self):
-        self.tree =  self.soup("""<a>First tag.</a>
-                                  <b>Second tag.</b>
-                                  <c>Third <a>Nested tag.</a> tag.</c>""")
-
-    def test_find_all_by_tag_name(self):
-        # Find all the <a> tags.
-        self.assert_selects(
-            self.tree.find_all('a'), ['First tag.', 'Nested tag.'])
-
-    def test_find_all_by_name_and_text(self):
-        self.assert_selects(
-            self.tree.find_all('a', string='First tag.'), ['First tag.'])
-
-        self.assert_selects(
-            self.tree.find_all('a', string=True), ['First tag.', 'Nested tag.'])
-
-        self.assert_selects(
-            self.tree.find_all('a', string=re.compile("tag")),
-            ['First tag.', 'Nested tag.'])
-
-
-    def test_find_all_on_non_root_element(self):
-        # You can call find_all on any node, not just the root.
-        self.assert_selects(self.tree.c.find_all('a'), ['Nested tag.'])
-
-    def test_calling_element_invokes_find_all(self):
-        self.assert_selects(self.tree('a'), ['First tag.', 'Nested tag.'])
-
-    def test_find_all_by_tag_strainer(self):
-        self.assert_selects(
-            self.tree.find_all(SoupStrainer('a')),
-            ['First tag.', 'Nested tag.'])
-
-    def test_find_all_by_tag_names(self):
-        self.assert_selects(
-            self.tree.find_all(['a', 'b']),
-            ['First tag.', 'Second tag.', 'Nested tag.'])
-
-    def test_find_all_by_tag_dict(self):
-        self.assert_selects(
-            self.tree.find_all({'a' : True, 'b' : True}),
-            ['First tag.', 'Second tag.', 'Nested tag.'])
-
-    def test_find_all_by_tag_re(self):
-        self.assert_selects(
-            self.tree.find_all(re.compile('^[ab]$')),
-            ['First tag.', 'Second tag.', 'Nested tag.'])
-
-    def test_find_all_with_tags_matching_method(self):
-        # You can define an oracle method that determines whether
-        # a tag matches the search.
-        def id_matches_name(tag):
-            return tag.name == tag.get('id')
-
-        tree = self.soup("""<a id="a">Match 1.</a>
-                            <a id="1">Does not match.</a>
-                            <b id="b">Match 2.</a>""")
-
-        self.assert_selects(
-            tree.find_all(id_matches_name), ["Match 1.", "Match 2."])
-
-    def test_find_with_multi_valued_attribute(self):
-        soup = self.soup(
-            "<div class='a b'>1</div><div class='a c'>2</div><div class='a d'>3</div>"
-        )
-        r1 = soup.find('div', 'a d');
-        r2 = soup.find('div', re.compile(r'a d'));
-        r3, r4 = soup.find_all('div', ['a b', 'a d']);
-        assert '3' == r1.string
-        assert '3' == r2.string
-        assert '1' == r3.string
-        assert '3' == r4.string
-
-        
-class TestFindAllByAttribute(SoupTest):
-
-    def test_find_all_by_attribute_name(self):
-        # You can pass in keyword arguments to find_all to search by
-        # attribute.
-        tree = self.soup("""
-                         <a id="first">Matching a.</a>
-                         <a id="second">
-                          Non-matching <b id="first">Matching b.</b>a.
-                         </a>""")
-        self.assert_selects(tree.find_all(id='first'),
-                           ["Matching a.", "Matching b."])
-
-    def test_find_all_by_utf8_attribute_value(self):
-        peace = "�ולש".encode("utf8")
-        data = '<a title="�ולש"></a>'.encode("utf8")
-        soup = self.soup(data)
-        assert [soup.a] == soup.find_all(title=peace)
-        assert [soup.a] == soup.find_all(title=peace.decode("utf8"))
-        assert [soup.a], soup.find_all(title=[peace, "something else"])
-
-    def test_find_all_by_attribute_dict(self):
-        # You can pass in a dictionary as the argument 'attrs'. This
-        # lets you search for attributes like 'name' (a fixed argument
-        # to find_all) and 'class' (a reserved word in Python.)
-        tree = self.soup("""
-                         <a name="name1" class="class1">Name match.</a>
-                         <a name="name2" class="class2">Class match.</a>
-                         <a name="name3" class="class3">Non-match.</a>
-                         <name1>A tag called 'name1'.</name1>
-                         """)
-
-        # This doesn't do what you want.
-        self.assert_selects(tree.find_all(name='name1'),
-                           ["A tag called 'name1'."])
-        # This does what you want.
-        self.assert_selects(tree.find_all(attrs={'name' : 'name1'}),
-                           ["Name match."])
-
-        self.assert_selects(tree.find_all(attrs={'class' : 'class2'}),
-                           ["Class match."])
-
-    def test_find_all_by_class(self):
-        tree = self.soup("""
-                         <a class="1">Class 1.</a>
-                         <a class="2">Class 2.</a>
-                         <b class="1">Class 1.</b>
-                         <c class="3 4">Class 3 and 4.</c>
-                         """)
-
-        # Passing in the class_ keyword argument will search against
-        # the 'class' attribute.
-        self.assert_selects(tree.find_all('a', class_='1'), ['Class 1.'])
-        self.assert_selects(tree.find_all('c', class_='3'), ['Class 3 and 4.'])
-        self.assert_selects(tree.find_all('c', class_='4'), ['Class 3 and 4.'])
-
-        # Passing in a string to 'attrs' will also search the CSS class.
-        self.assert_selects(tree.find_all('a', '1'), ['Class 1.'])
-        self.assert_selects(tree.find_all(attrs='1'), ['Class 1.', 'Class 1.'])
-        self.assert_selects(tree.find_all('c', '3'), ['Class 3 and 4.'])
-        self.assert_selects(tree.find_all('c', '4'), ['Class 3 and 4.'])
-
-    def test_find_by_class_when_multiple_classes_present(self):
-        tree = self.soup("<gar class='foo bar'>Found it</gar>")
-
-        f = tree.find_all("gar", class_=re.compile("o"))
-        self.assert_selects(f, ["Found it"])
-
-        f = tree.find_all("gar", class_=re.compile("a"))
-        self.assert_selects(f, ["Found it"])
-
-        # If the search fails to match the individual strings "foo" and "bar",
-        # it will be tried against the combined string "foo bar".
-        f = tree.find_all("gar", class_=re.compile("o b"))
-        self.assert_selects(f, ["Found it"])
-
-    def test_find_all_with_non_dictionary_for_attrs_finds_by_class(self):
-        soup = self.soup("<a class='bar'>Found it</a>")
-
-        self.assert_selects(soup.find_all("a", re.compile("ba")), ["Found it"])
-
-        def big_attribute_value(value):
-            return len(value) > 3
-
-        self.assert_selects(soup.find_all("a", big_attribute_value), [])
-
-        def small_attribute_value(value):
-            return len(value) <= 3
-
-        self.assert_selects(
-            soup.find_all("a", small_attribute_value), ["Found it"])
-
-    def test_find_all_with_string_for_attrs_finds_multiple_classes(self):
-        soup = self.soup('<a class="foo bar"></a><a class="foo"></a>')
-        a, a2 = soup.find_all("a")
-        assert [a, a2], soup.find_all("a", "foo")
-        assert [a], soup.find_all("a", "bar")
-
-        # If you specify the class as a string that contains a
-        # space, only that specific value will be found.
-        assert [a] == soup.find_all("a", class_="foo bar")
-        assert [a] == soup.find_all("a", "foo bar")
-        assert [] == soup.find_all("a", "bar foo")
-
-    def test_find_all_by_attribute_soupstrainer(self):
-        tree = self.soup("""
-                         <a id="first">Match.</a>
-                         <a id="second">Non-match.</a>""")
-
-        strainer = SoupStrainer(attrs={'id' : 'first'})
-        self.assert_selects(tree.find_all(strainer), ['Match.'])
-
-    def test_find_all_with_missing_attribute(self):
-        # You can pass in None as the value of an attribute to find_all.
-        # This will match tags that do not have that attribute set.
-        tree = self.soup("""<a id="1">ID present.</a>
-                            <a>No ID present.</a>
-                            <a id="">ID is empty.</a>""")
-        self.assert_selects(tree.find_all('a', id=None), ["No ID present."])
-
-    def test_find_all_with_defined_attribute(self):
-        # You can pass in None as the value of an attribute to find_all.
-        # This will match tags that have that attribute set to any value.
-        tree = self.soup("""<a id="1">ID present.</a>
-                            <a>No ID present.</a>
-                            <a id="">ID is empty.</a>""")
-        self.assert_selects(
-            tree.find_all(id=True), ["ID present.", "ID is empty."])
-
-    def test_find_all_with_numeric_attribute(self):
-        # If you search for a number, it's treated as a string.
-        tree = self.soup("""<a id=1>Unquoted attribute.</a>
-                            <a id="1">Quoted attribute.</a>""")
-
-        expected = ["Unquoted attribute.", "Quoted attribute."]
-        self.assert_selects(tree.find_all(id=1), expected)
-        self.assert_selects(tree.find_all(id="1"), expected)
-
-    def test_find_all_with_list_attribute_values(self):
-        # You can pass a list of attribute values instead of just one,
-        # and you'll get tags that match any of the values.
-        tree = self.soup("""<a id="1">1</a>
-                            <a id="2">2</a>
-                            <a id="3">3</a>
-                            <a>No ID.</a>""")
-        self.assert_selects(tree.find_all(id=["1", "3", "4"]),
-                           ["1", "3"])
-
-    def test_find_all_with_regular_expression_attribute_value(self):
-        # You can pass a regular expression as an attribute value, and
-        # you'll get tags whose values for that attribute match the
-        # regular expression.
-        tree = self.soup("""<a id="a">One a.</a>
-                            <a id="aa">Two as.</a>
-                            <a id="ab">Mixed as and bs.</a>
-                            <a id="b">One b.</a>
-                            <a>No ID.</a>""")
-
-        self.assert_selects(tree.find_all(id=re.compile("^a+$")),
-                           ["One a.", "Two as."])
-
-    def test_find_by_name_and_containing_string(self):
-        soup = self.soup("<b>foo</b><b>bar</b><a>foo</a>")
-        a = soup.a
-
-        assert [a] == soup.find_all("a", string="foo")
-        assert [] == soup.find_all("a", string="bar")
-
-    def test_find_by_name_and_containing_string_when_string_is_buried(self):
-        soup = self.soup("<a>foo</a><a><b><c>foo</c></b></a>")
-        assert soup.find_all("a") == soup.find_all("a", string="foo")
-
-    def test_find_by_attribute_and_containing_string(self):
-        soup = self.soup('<b id="1">foo</b><a id="2">foo</a>')
-        a = soup.a
-
-        assert [a] == soup.find_all(id=2, string="foo")
-        assert [] == soup.find_all(id=1, string="bar")
-
-
-class TestSmooth(SoupTest):
-    """Test Tag.smooth."""
-
-    def test_smooth(self):
-        soup = self.soup("<div>a</div>")
-        div = soup.div
-        div.append("b")
-        div.append("c")
-        div.append(Comment("Comment 1"))
-        div.append(Comment("Comment 2"))
-        div.append("d")
-        builder = self.default_builder()
-        span = Tag(soup, builder, 'span')
-        span.append('1')
-        span.append('2')
-        div.append(span)
-
-        # At this point the tree has a bunch of adjacent
-        # NavigableStrings. This is normal, but it has no meaning in
-        # terms of HTML, so we may want to smooth things out for
-        # output.
-
-        # Since the <span> tag has two children, its .string is None.
-        assert None == div.span.string
-
-        assert 7 == len(div.contents)
-        div.smooth()
-        assert 5 == len(div.contents)
-
-        # The three strings at the beginning of div.contents have been
-        # merged into on string.
-        #
-        assert 'abc' == div.contents[0]
-
-        # The call is recursive -- the <span> tag was also smoothed.
-        assert '12' == div.span.string
-
-        # The two comments have _not_ been merged, even though
-        # comments are strings. Merging comments would change the
-        # meaning of the HTML.
-        assert 'Comment 1' == div.contents[1]
-        assert 'Comment 2' == div.contents[2]
-
-
-class TestIndex(SoupTest):
-    """Test Tag.index"""
-    def test_index(self):
-        tree = self.soup("""<div>
-                            <a>Identical</a>
-                            <b>Not identical</b>
-                            <a>Identical</a>
-
-                            <c><d>Identical with child</d></c>
-                            <b>Also not identical</b>
-                            <c><d>Identical with child</d></c>
-                            </div>""")
-        div = tree.div
-        for i, element in enumerate(div.contents):
-            assert i == div.index(element)
-        with pytest.raises(ValueError):
-            tree.index(1)
-
-
-class TestParentOperations(SoupTest):
-    """Test navigation and searching through an element's parents."""
-
-    def setup_method(self):
-        self.tree = self.soup('''<ul id="empty"></ul>
-                                 <ul id="top">
-                                  <ul id="middle">
-                                   <ul id="bottom">
-                                    <b>Start here</b>
-                                   </ul>
-                                  </ul>''')
-        self.start = self.tree.b
-
-
-    def test_parent(self):
-        assert self.start.parent['id'] == 'bottom'
-        assert self.start.parent.parent['id'] == 'middle'
-        assert self.start.parent.parent.parent['id'] == 'top'
-
-    def test_parent_of_top_tag_is_soup_object(self):
-        top_tag = self.tree.contents[0]
-        assert top_tag.parent == self.tree
-
-    def test_soup_object_has_no_parent(self):
-        assert None == self.tree.parent
-
-    def test_find_parents(self):
-        self.assert_selects_ids(
-            self.start.find_parents('ul'), ['bottom', 'middle', 'top'])
-        self.assert_selects_ids(
-            self.start.find_parents('ul', id="middle"), ['middle'])
-
-    def test_find_parent(self):
-        assert self.start.find_parent('ul')['id'] == 'bottom'
-        assert self.start.find_parent('ul', id='top')['id'] == 'top'
-
-    def test_parent_of_text_element(self):
-        text = self.tree.find(string="Start here")
-        assert text.parent.name == 'b'
-
-    def test_text_element_find_parent(self):
-        text = self.tree.find(string="Start here")
-        assert text.find_parent('ul')['id'] == 'bottom'
-
-    def test_parent_generator(self):
-        parents = [parent['id'] for parent in self.start.parents
-                   if parent is not None and 'id' in parent.attrs]
-        assert parents, ['bottom', 'middle' == 'top']
-
-
-class ProximityTest(SoupTest):
-
-    def setup_method(self):
-        self.tree = self.soup(
-            '<html id="start"><head></head><body><b id="1">One</b><b id="2">Two</b><b id="3">Three</b></body></html>')
-
-
-class TestNextOperations(ProximityTest):
-
-    def setup_method(self):
-        super(TestNextOperations, self).setup_method()
-        self.start = self.tree.b
-
-    def test_next(self):
-        assert self.start.next_element == "One"
-        assert self.start.next_element.next_element['id'] == "2"
-
-    def test_next_of_last_item_is_none(self):
-        last = self.tree.find(string="Three")
-        assert last.next_element == None
-
-    def test_next_of_root_is_none(self):
-        # The document root is outside the next/previous chain.
-        assert self.tree.next_element == None
-
-    def test_find_all_next(self):
-        self.assert_selects(self.start.find_all_next('b'), ["Two", "Three"])
-        self.start.find_all_next(id=3)
-        self.assert_selects(self.start.find_all_next(id=3), ["Three"])
-
-    def test_find_next(self):
-        assert self.start.find_next('b')['id'] == '2'
-        assert self.start.find_next(string="Three") == "Three"
-
-    def test_find_next_for_text_element(self):
-        text = self.tree.find(string="One")
-        assert text.find_next("b").string == "Two"
-        self.assert_selects(text.find_all_next("b"), ["Two", "Three"])
-
-    def test_next_generator(self):
-        start = self.tree.find(string="Two")
-        successors = [node for node in start.next_elements]
-        # There are two successors: the final <b> tag and its text contents.
-        tag, contents = successors
-        assert tag['id'] == '3'
-        assert contents == "Three"
-
-class TestPreviousOperations(ProximityTest):
-
-    def setup_method(self):
-        super(TestPreviousOperations, self).setup_method()
-        self.end = self.tree.find(string="Three")
-
-    def test_previous(self):
-        assert self.end.previous_element['id'] == "3"
-        assert self.end.previous_element.previous_element == "Two"
-
-    def test_previous_of_first_item_is_none(self):
-        first = self.tree.find('html')
-        assert first.previous_element == None
-
-    def test_previous_of_root_is_none(self):
-        # The document root is outside the next/previous chain.
-        assert self.tree.previous_element == None
-
-    def test_find_all_previous(self):
-        # The <b> tag containing the "Three" node is the predecessor
-        # of the "Three" node itself, which is why "Three" shows up
-        # here.
-        self.assert_selects(
-            self.end.find_all_previous('b'), ["Three", "Two", "One"])
-        self.assert_selects(self.end.find_all_previous(id=1), ["One"])
-
-    def test_find_previous(self):
-        assert self.end.find_previous('b')['id'] == '3'
-        assert self.end.find_previous(string="One") == "One"
-
-    def test_find_previous_for_text_element(self):
-        text = self.tree.find(string="Three")
-        assert text.find_previous("b").string == "Three"
-        self.assert_selects(
-            text.find_all_previous("b"), ["Three", "Two", "One"])
-
-    def test_previous_generator(self):
-        start = self.tree.find(string="One")
-        predecessors = [node for node in start.previous_elements]
-
-        # There are four predecessors: the <b> tag containing "One"
-        # the <body> tag, the <head> tag, and the <html> tag.
-        b, body, head, html = predecessors
-        assert b['id'] == '1'
-        assert body.name == "body"
-        assert head.name == "head"
-        assert html.name == "html"
-
-
-class SiblingTest(SoupTest):
-
-    def setup_method(self):
-        markup = '''<html>
-                    <span id="1">
-                     <span id="1.1"></span>
-                    </span>
-                    <span id="2">
-                     <span id="2.1"></span>
-                    </span>
-                    <span id="3">
-                     <span id="3.1"></span>
-                    </span>
-                    <span id="4"></span>
-                    </html>'''
-        # All that whitespace looks good but makes the tests more
-        # difficult. Get rid of it.
-        markup = re.compile(r"\n\s*").sub("", markup)
-        self.tree = self.soup(markup)
-
-
-class TestNextSibling(SiblingTest):
-
-    def setup_method(self):
-        super(TestNextSibling, self).setup_method()
-        self.start = self.tree.find(id="1")
-
-    def test_next_sibling_of_root_is_none(self):
-        assert self.tree.next_sibling == None
-
-    def test_next_sibling(self):
-        assert self.start.next_sibling['id'] == '2'
-        assert self.start.next_sibling.next_sibling['id'] == '3'
-
-        # Note the difference between next_sibling and next_element.
-        assert self.start.next_element['id'] == '1.1'
-
-    def test_next_sibling_may_not_exist(self):
-        assert self.tree.html.next_sibling == None
-
-        nested_span = self.tree.find(id="1.1")
-        assert nested_span.next_sibling == None
-
-        last_span = self.tree.find(id="4")
-        assert last_span.next_sibling == None
-
-    def test_find_next_sibling(self):
-        assert self.start.find_next_sibling('span')['id'] == '2'
-
-    def test_next_siblings(self):
-        self.assert_selects_ids(self.start.find_next_siblings("span"),
-                              ['2', '3', '4'])
-
-        self.assert_selects_ids(self.start.find_next_siblings(id='3'), ['3'])
-
-    def test_next_sibling_for_text_element(self):
-        soup = self.soup("Foo<b>bar</b>baz")
-        start = soup.find(string="Foo")
-        assert start.next_sibling.name == 'b'
-        assert start.next_sibling.next_sibling == 'baz'
-
-        self.assert_selects(start.find_next_siblings('b'), ['bar'])
-        assert start.find_next_sibling(string="baz") == "baz"
-        assert start.find_next_sibling(string="nonesuch") == None
-
-
-class TestPreviousSibling(SiblingTest):
-
-    def setup_method(self):
-        super(TestPreviousSibling, self).setup_method()
-        self.end = self.tree.find(id="4")
-
-    def test_previous_sibling_of_root_is_none(self):
-        assert self.tree.previous_sibling == None
-
-    def test_previous_sibling(self):
-        assert self.end.previous_sibling['id'] == '3'
-        assert self.end.previous_sibling.previous_sibling['id'] == '2'
-
-        # Note the difference between previous_sibling and previous_element.
-        assert self.end.previous_element['id'] == '3.1'
-
-    def test_previous_sibling_may_not_exist(self):
-        assert self.tree.html.previous_sibling == None
-
-        nested_span = self.tree.find(id="1.1")
-        assert nested_span.previous_sibling == None
-
-        first_span = self.tree.find(id="1")
-        assert first_span.previous_sibling == None
-
-    def test_find_previous_sibling(self):
-        assert self.end.find_previous_sibling('span')['id'] == '3'
-
-    def test_previous_siblings(self):
-        self.assert_selects_ids(self.end.find_previous_siblings("span"),
-                              ['3', '2', '1'])
-
-        self.assert_selects_ids(self.end.find_previous_siblings(id='1'), ['1'])
-
-    def test_previous_sibling_for_text_element(self):
-        soup = self.soup("Foo<b>bar</b>baz")
-        start = soup.find(string="baz")
-        assert start.previous_sibling.name == 'b'
-        assert start.previous_sibling.previous_sibling == 'Foo'
-
-        self.assert_selects(start.find_previous_siblings('b'), ['bar'])
-        assert start.find_previous_sibling(string="Foo") == "Foo"
-        assert start.find_previous_sibling(string="nonesuch") == None
-
-
-class TestTreeModification(SoupTest):
-
-    def test_attribute_modification(self):
-        soup = self.soup('<a id="1"></a>')
-        soup.a['id'] = 2
-        assert soup.decode() == self.document_for('<a id="2"></a>')
-        del(soup.a['id'])
-        assert soup.decode() == self.document_for('<a></a>')
-        soup.a['id2'] = 'foo'
-        assert soup.decode() == self.document_for('<a id2="foo"></a>')
-
-    def test_new_tag_creation(self):
-        builder = builder_registry.lookup('html')()
-        soup = self.soup("<body></body>", builder=builder)
-        a = Tag(soup, builder, 'a')
-        ol = Tag(soup, builder, 'ol')
-        a['href'] = 'http://foo.com/'
-        soup.body.insert(0, a)
-        soup.body.insert(1, ol)
-        assert soup.body.encode() == b'<body><a href="http://foo.com/"></a><ol></ol></body>'
-
-    def test_append_to_contents_moves_tag(self):
-        doc = """<p id="1">Don't leave me <b>here</b>.</p>
-                <p id="2">Don\'t leave!</p>"""
-        soup = self.soup(doc)
-        second_para = soup.find(id='2')
-        bold = soup.b
-
-        # Move the <b> tag to the end of the second paragraph.
-        soup.find(id='2').append(soup.b)
-
-        # The <b> tag is now a child of the second paragraph.
-        assert bold.parent == second_para
-
-        assert soup.decode() == self.document_for(
-                '<p id="1">Don\'t leave me .</p>\n'
-                '<p id="2">Don\'t leave!<b>here</b></p>'
-        )
-
-    def test_replace_with_returns_thing_that_was_replaced(self):
-        text = "<a></a><b><c></c></b>"
-        soup = self.soup(text)
-        a = soup.a
-        new_a = a.replace_with(soup.c)
-        assert a == new_a
-
-    def test_unwrap_returns_thing_that_was_replaced(self):
-        text = "<a><b></b><c></c></a>"
-        soup = self.soup(text)
-        a = soup.a
-        new_a = a.unwrap()
-        assert a == new_a
-
-    def test_replace_with_and_unwrap_give_useful_exception_when_tag_has_no_parent(self):
-        soup = self.soup("<a><b>Foo</b></a><c>Bar</c>")
-        a = soup.a
-        a.extract()
-        assert None == a.parent
-        with pytest.raises(ValueError):
-            a.unwrap()
-        with pytest.raises(ValueError):
-            a.replace_with(soup.c)
-
-    def test_replace_tag_with_itself(self):
-        text = "<a><b></b><c>Foo<d></d></c></a><a><e></e></a>"
-        soup = self.soup(text)
-        c = soup.c
-        soup.c.replace_with(c)
-        assert soup.decode() == self.document_for(text)
-
-    def test_replace_tag_with_its_parent_raises_exception(self):
-        text = "<a><b></b></a>"
-        soup = self.soup(text)
-        with pytest.raises(ValueError):
-            soup.b.replace_with(soup.a)
-
-    def test_insert_tag_into_itself_raises_exception(self):
-        text = "<a><b></b></a>"
-        soup = self.soup(text)
-        with pytest.raises(ValueError):
-            soup.a.insert(0, soup.a)
-
-    def test_insert_beautifulsoup_object_inserts_children(self):
-        """Inserting one BeautifulSoup object into another actually inserts all
-        of its children -- you'll never combine BeautifulSoup objects.
-        """
-        soup = self.soup("<p>And now, a word:</p><p>And we're back.</p>")
-        
-        text = "<p>p2</p><p>p3</p>"
-        to_insert = self.soup(text)
-        soup.insert(1, to_insert)
-
-        for i in soup.descendants:
-            assert not isinstance(i, BeautifulSoup)
-        
-        p1, p2, p3, p4 = list(soup.children)
-        assert "And now, a word:" == p1.string
-        assert "p2" == p2.string
-        assert "p3" == p3.string
-        assert "And we're back." == p4.string
-        
-        
-    def test_replace_with_maintains_next_element_throughout(self):
-        soup = self.soup('<p><a>one</a><b>three</b></p>')
-        a = soup.a
-        b = a.contents[0]
-        # Make it so the <a> tag has two text children.
-        a.insert(1, "two")
-
-        # Now replace each one with the empty string.
-        left, right = a.contents
-        left.replaceWith('')
-        right.replaceWith('')
-
-        # The <b> tag is still connected to the tree.
-        assert "three" == soup.b.string
-
-    def test_replace_final_node(self):
-        soup = self.soup("<b>Argh!</b>")
-        soup.find(string="Argh!").replace_with("Hooray!")
-        new_text = soup.find(string="Hooray!")
-        b = soup.b
-        assert new_text.previous_element == b
-        assert new_text.parent == b
-        assert new_text.previous_element.next_element == new_text
-        assert new_text.next_element == None
-
-    def test_consecutive_text_nodes(self):
-        # A builder should never create two consecutive text nodes,
-        # but if you insert one next to another, Beautiful Soup will
-        # handle it correctly.
-        soup = self.soup("<a><b>Argh!</b><c></c></a>")
-        soup.b.insert(1, "Hooray!")
-
-        assert soup.decode() == self.document_for(
-            "<a><b>Argh!Hooray!</b><c></c></a>"
-        )
-
-        new_text = soup.find(string="Hooray!")
-        assert new_text.previous_element == "Argh!"
-        assert new_text.previous_element.next_element == new_text
-
-        assert new_text.previous_sibling == "Argh!"
-        assert new_text.previous_sibling.next_sibling == new_text
-
-        assert new_text.next_sibling == None
-        assert new_text.next_element == soup.c
-
-    def test_insert_string(self):
-        soup = self.soup("<a></a>")
-        soup.a.insert(0, "bar")
-        soup.a.insert(0, "foo")
-        # The string were added to the tag.
-        assert ["foo", "bar"] == soup.a.contents
-        # And they were converted to NavigableStrings.
-        assert soup.a.contents[0].next_element == "bar"
-
-    def test_insert_tag(self):
-        builder = self.default_builder()
-        soup = self.soup(
-            "<a><b>Find</b><c>lady!</c><d></d></a>", builder=builder)
-        magic_tag = Tag(soup, builder, 'magictag')
-        magic_tag.insert(0, "the")
-        soup.a.insert(1, magic_tag)
-
-        assert soup.decode() == self.document_for(
-                "<a><b>Find</b><magictag>the</magictag><c>lady!</c><d></d></a>"
-        )
-
-        # Make sure all the relationships are hooked up correctly.
-        b_tag = soup.b
-        assert b_tag.next_sibling == magic_tag
-        assert magic_tag.previous_sibling == b_tag
-
-        find = b_tag.find(string="Find")
-        assert find.next_element == magic_tag
-        assert magic_tag.previous_element == find
-
-        c_tag = soup.c
-        assert magic_tag.next_sibling == c_tag
-        assert c_tag.previous_sibling == magic_tag
-
-        the = magic_tag.find(string="the")
-        assert the.parent == magic_tag
-        assert the.next_element == c_tag
-        assert c_tag.previous_element == the
-
-    def test_append_child_thats_already_at_the_end(self):
-        data = "<a><b></b></a>"
-        soup = self.soup(data)
-        soup.a.append(soup.b)
-        assert data == soup.decode()
-
-    def test_extend(self):
-        data = "<a><b><c><d><e><f><g></g></f></e></d></c></b></a>"
-        soup = self.soup(data)
-        l = [soup.g, soup.f, soup.e, soup.d, soup.c, soup.b]
-        soup.a.extend(l)
-        assert "<a><g></g><f></f><e></e><d></d><c></c><b></b></a>" == soup.decode()
-
-    @pytest.mark.parametrize(
-        "get_tags", [lambda tag: tag, lambda tag: tag.contents]
-    )
-    def test_extend_with_another_tags_contents(self, get_tags):
-        data = '<body><div id="d1"><a>1</a><a>2</a><a>3</a><a>4</a></div><div id="d2"></div></body>'
-        soup = self.soup(data)
-        d1 = soup.find('div', id='d1')
-        d2 = soup.find('div', id='d2')
-        tags = get_tags(d1)
-        d2.extend(tags)
-        assert '<div id="d1"></div>' == d1.decode()
-        assert '<div id="d2"><a>1</a><a>2</a><a>3</a><a>4</a></div>' == d2.decode()
-        
-    def test_move_tag_to_beginning_of_parent(self):
-        data = "<a><b></b><c></c><d></d></a>"
-        soup = self.soup(data)
-        soup.a.insert(0, soup.d)
-        assert "<a><d></d><b></b><c></c></a>" == soup.decode()
-
-    def test_insert_works_on_empty_element_tag(self):
-        # This is a little strange, since most HTML parsers don't allow
-        # markup like this to come through. But in general, we don't
-        # know what the parser would or wouldn't have allowed, so
-        # I'm letting this succeed for now.
-        soup = self.soup("<br/>")
-        soup.br.insert(1, "Contents")
-        assert str(soup.br) == "<br>Contents</br>"
-
-    def test_insert_before(self):
-        soup = self.soup("<a>foo</a><b>bar</b>")
-        soup.b.insert_before("BAZ")
-        soup.a.insert_before("QUUX")
-        assert soup.decode() == self.document_for(
-            "QUUX<a>foo</a>BAZ<b>bar</b>"
-        )
-
-        soup.a.insert_before(soup.b)
-        assert soup.decode() == self.document_for("QUUX<b>bar</b><a>foo</a>BAZ")
-
-        # Can't insert an element before itself.
-        b = soup.b
-        with pytest.raises(ValueError):
-            b.insert_before(b)
-
-        # Can't insert before if an element has no parent.
-        b.extract()
-        with pytest.raises(ValueError):
-            b.insert_before("nope")
-
-        # Can insert an identical element
-        soup = self.soup("<a>")
-        soup.a.insert_before(soup.new_tag("a"))
-
-        # TODO: OK but what happens?
-        
-    def test_insert_multiple_before(self):
-        soup = self.soup("<a>foo</a><b>bar</b>")
-        soup.b.insert_before("BAZ", " ", "QUUX")
-        soup.a.insert_before("QUUX", " ", "BAZ")
-        assert soup.decode() == self.document_for(
-            "QUUX BAZ<a>foo</a>BAZ QUUX<b>bar</b>"
-        )
-
-        soup.a.insert_before(soup.b, "FOO")
-        assert soup.decode() == self.document_for(
-            "QUUX BAZ<b>bar</b>FOO<a>foo</a>BAZ QUUX"
-        )
-
-    def test_insert_after(self):
-        soup = self.soup("<a>foo</a><b>bar</b>")
-        soup.b.insert_after("BAZ")
-        soup.a.insert_after("QUUX")
-        assert soup.decode() == self.document_for(
-            "<a>foo</a>QUUX<b>bar</b>BAZ"
-        )
-        soup.b.insert_after(soup.a)
-        assert soup.decode() == self.document_for("QUUX<b>bar</b><a>foo</a>BAZ")
-
-        # Can't insert an element after itself.
-        b = soup.b
-        with pytest.raises(ValueError):
-            b.insert_after(b)
-
-        # Can't insert after if an element has no parent.
-        b.extract()
-        with pytest.raises(ValueError):
-            b.insert_after("nope")
-
-        # Can insert an identical element
-        soup = self.soup("<a>")
-        soup.a.insert_before(soup.new_tag("a"))
-
-        # TODO: OK but what does it look like?
-        
-    def test_insert_multiple_after(self):
-        soup = self.soup("<a>foo</a><b>bar</b>")
-        soup.b.insert_after("BAZ", " ", "QUUX")
-        soup.a.insert_after("QUUX", " ", "BAZ")
-        assert soup.decode() == self.document_for(
-            "<a>foo</a>QUUX BAZ<b>bar</b>BAZ QUUX"
-        )
-        soup.b.insert_after(soup.a, "FOO ")
-        assert soup.decode() == self.document_for(
-            "QUUX BAZ<b>bar</b><a>foo</a>FOO BAZ QUUX"
-        )
-
-    def test_insert_after_raises_exception_if_after_has_no_meaning(self):
-        soup = self.soup("")
-        tag = soup.new_tag("a")
-        string = soup.new_string("")
-        with pytest.raises(ValueError):
-            string.insert_after(tag)
-        with pytest.raises(NotImplementedError):
-            soup.insert_after(tag)
-        with pytest.raises(ValueError):
-            tag.insert_after(tag)
-
-    def test_insert_before_raises_notimplementederror_if_before_has_no_meaning(self):
-        soup = self.soup("")
-        tag = soup.new_tag("a")
-        string = soup.new_string("")
-        with pytest.raises(ValueError):
-            string.insert_before(tag)
-        with pytest.raises(NotImplementedError):
-            soup.insert_before(tag)
-        with pytest.raises(ValueError):
-            tag.insert_before(tag)
-
-    def test_replace_with(self):
-        soup = self.soup(
-                "<p>There's <b>no</b> business like <b>show</b> business</p>")
-        no, show = soup.find_all('b')
-        show.replace_with(no)
-        assert soup.decode() == self.document_for(
-            "<p>There's  business like <b>no</b> business</p>"
-        )
-
-        assert show.parent == None
-        assert no.parent == soup.p
-        assert no.next_element == "no"
-        assert no.next_sibling == " business"
-
-    def test_replace_with_errors(self):
-        # Can't replace a tag that's not part of a tree.
-        a_tag = Tag(name="a")
-        with pytest.raises(ValueError):
-            a_tag.replace_with("won't work")
-
-        # Can't replace a tag with its parent.
-        a_tag = self.soup("<a><b></b></a>").a
-        with pytest.raises(ValueError):
-            a_tag.b.replace_with(a_tag)
-
-        # Or with a list that includes its parent.
-        with pytest.raises(ValueError):
-            a_tag.b.replace_with("string1", a_tag, "string2")
-        
-    def test_replace_with_multiple(self):
-        data = "<a><b></b><c></c></a>"
-        soup = self.soup(data)
-        d_tag = soup.new_tag("d")
-        d_tag.string = "Text In D Tag"
-        e_tag = soup.new_tag("e")
-        f_tag = soup.new_tag("f")
-        a_string = "Random Text"
-        soup.c.replace_with(d_tag, e_tag, a_string, f_tag)
-        assert soup.decode() == "<a><b></b><d>Text In D Tag</d><e></e>Random Text<f></f></a>"
-        assert soup.b.next_element == d_tag
-        assert d_tag.string.next_element==e_tag
-        assert e_tag.next_element.string == a_string
-        assert e_tag.next_element.next_element == f_tag
-        
-    def test_replace_first_child(self):
-        data = "<a><b></b><c></c></a>"
-        soup = self.soup(data)
-        soup.b.replace_with(soup.c)
-        assert "<a><c></c></a>" == soup.decode()
-
-    def test_replace_last_child(self):
-        data = "<a><b></b><c></c></a>"
-        soup = self.soup(data)
-        soup.c.replace_with(soup.b)
-        assert "<a><b></b></a>" == soup.decode()
-
-    def test_nested_tag_replace_with(self):
-        soup = self.soup(
-            """<a>We<b>reserve<c>the</c><d>right</d></b></a><e>to<f>refuse</f><g>service</g></e>""")
-
-        # Replace the entire <b> tag and its contents ("reserve the
-        # right") with the <f> tag ("refuse").
-        remove_tag = soup.b
-        move_tag = soup.f
-        remove_tag.replace_with(move_tag)
-
-        assert soup.decode() == self.document_for(
-            "<a>We<f>refuse</f></a><e>to<g>service</g></e>"
-        )
-
-        # The <b> tag is now an orphan.
-        assert remove_tag.parent == None
-        assert remove_tag.find(string="right").next_element == None
-        assert remove_tag.previous_element == None
-        assert remove_tag.next_sibling == None
-        assert remove_tag.previous_sibling == None
-
-        # The <f> tag is now connected to the <a> tag.
-        assert move_tag.parent == soup.a
-        assert move_tag.previous_element == "We"
-        assert move_tag.next_element.next_element == soup.e
-        assert move_tag.next_sibling == None
-
-        # The gap where the <f> tag used to be has been mended, and
-        # the word "to" is now connected to the <g> tag.
-        to_text = soup.find(string="to")
-        g_tag = soup.g
-        assert to_text.next_element == g_tag
-        assert to_text.next_sibling == g_tag
-        assert g_tag.previous_element == to_text
-        assert g_tag.previous_sibling == to_text
-
-    def test_unwrap(self):
-        tree = self.soup("""
-            <p>Unneeded <em>formatting</em> is unneeded</p>
-            """)
-        tree.em.unwrap()
-        assert tree.em == None
-        assert tree.p.text == "Unneeded formatting is unneeded"
-
-    def test_wrap(self):
-        soup = self.soup("I wish I was bold.")
-        value = soup.string.wrap(soup.new_tag("b"))
-        assert value.decode() == "<b>I wish I was bold.</b>"
-        assert soup.decode() == self.document_for("<b>I wish I was bold.</b>")
-
-    def test_wrap_extracts_tag_from_elsewhere(self):
-        soup = self.soup("<b></b>I wish I was bold.")
-        soup.b.next_sibling.wrap(soup.b)
-        assert soup.decode() == self.document_for("<b>I wish I was bold.</b>")
-
-    def test_wrap_puts_new_contents_at_the_end(self):
-        soup = self.soup("<b>I like being bold.</b>I wish I was bold.")
-        soup.b.next_sibling.wrap(soup.b)
-        assert 2 == len(soup.b.contents)
-        assert soup.decode() == self.document_for(
-            "<b>I like being bold.I wish I was bold.</b>"
-        )
-
-    def test_extract(self):
-        soup = self.soup(
-            '<html><body>Some content. <div id="nav">Nav crap</div> More content.</body></html>')
-
-        assert len(soup.body.contents) == 3
-        extracted = soup.find(id="nav").extract()
-
-        assert soup.decode() == "<html><body>Some content.  More content.</body></html>"
-        assert extracted.decode() == '<div id="nav">Nav crap</div>'
-
-        # The extracted tag is now an orphan.
-        assert len(soup.body.contents) == 2
-        assert extracted.parent == None
-        assert extracted.previous_element == None
-        assert extracted.next_element.next_element == None
-
-        # The gap where the extracted tag used to be has been mended.
-        content_1 = soup.find(string="Some content. ")
-        content_2 = soup.find(string=" More content.")
-        assert content_1.next_element == content_2
-        assert content_1.next_sibling == content_2
-        assert content_2.previous_element == content_1
-        assert content_2.previous_sibling == content_1
-
-    def test_extract_distinguishes_between_identical_strings(self):
-        soup = self.soup("<a>foo</a><b>bar</b>")
-        foo_1 = soup.a.string
-        bar_1 = soup.b.string
-        foo_2 = soup.new_string("foo")
-        bar_2 = soup.new_string("bar")
-        soup.a.append(foo_2)
-        soup.b.append(bar_2)
-
-        # Now there are two identical strings in the <a> tag, and two
-        # in the <b> tag. Let's remove the first "foo" and the second
-        # "bar".
-        foo_1.extract()
-        bar_2.extract()
-        assert foo_2 == soup.a.string
-        assert bar_2 == soup.b.string
-
-    def test_extract_multiples_of_same_tag(self):
-        soup = self.soup("""
-<html>
-<head>
-<script>foo</script>
-</head>
-<body>
- <script>bar</script>
- <a></a>
-</body>
-<script>baz</script>
-</html>""")
-        [soup.script.extract() for i in soup.find_all("script")]
-        assert "<body>\n\n<a></a>\n</body>" == str(soup.body)
-
-
-    def test_extract_works_when_element_is_surrounded_by_identical_strings(self):
-        soup = self.soup(
- '<html>\n'
- '<body>hi</body>\n'
- '</html>')
-        soup.find('body').extract()
-        assert None == soup.find('body')
-
-
-    def test_clear(self):
-        """Tag.clear()"""
-        soup = self.soup("<p><a>String <em>Italicized</em></a> and another</p>")
-        # clear using extract()
-        a = soup.a
-        soup.p.clear()
-        assert len(soup.p.contents) == 0
-        assert hasattr(a, "contents")
-
-        # clear using decompose()
-        em = a.em
-        a.clear(decompose=True)
-        assert 0 == len(em.contents)
-
-       
-    def test_decompose(self):
-        # Test PageElement.decompose() and PageElement.decomposed
-        soup = self.soup("<p><a>String <em>Italicized</em></a></p><p>Another para</p>")
-        p1, p2 = soup.find_all('p')
-        a = p1.a
-        text = p1.em.string
-        for i in [p1, p2, a, text]:
-            assert False == i.decomposed
-
-        # This sets p1 and everything beneath it to decomposed.
-        p1.decompose()
-        for i in [p1, a, text]:
-            assert True == i.decomposed
-        # p2 is unaffected.
-        assert False == p2.decomposed
-            
-    def test_string_set(self):
-        """Tag.string = 'string'"""
-        soup = self.soup("<a></a> <b><c></c></b>")
-        soup.a.string = "foo"
-        assert soup.a.contents == ["foo"]
-        soup.b.string = "bar"
-        assert soup.b.contents == ["bar"]
-
-    def test_string_set_does_not_affect_original_string(self):
-        soup = self.soup("<a><b>foo</b><c>bar</c>")
-        soup.b.string = soup.c.string
-        assert soup.a.encode() == b"<a><b>bar</b><c>bar</c></a>"
-
-    def test_set_string_preserves_class_of_string(self):
-        soup = self.soup("<a></a>")
-        cdata = CData("foo")
-        soup.a.string = cdata
-        assert isinstance(soup.a.string, CData)
-
-
-class TestDeprecatedArguments(SoupTest):
-
-    @pytest.mark.parametrize(
-        "method_name", [
-            "find", "find_all", "find_parent", "find_parents",
-            "find_next", "find_all_next", "find_previous",
-            "find_all_previous", "find_next_sibling", "find_next_siblings",
-            "find_previous_sibling", "find_previous_siblings",
-        ]
-    )
-    def test_find_type_method_string(self, method_name):
-        soup = self.soup("<a>some</a><b>markup</b>")
-        method = getattr(soup.b, method_name)
-        with warnings.catch_warnings(record=True) as w:
-            method(text='markup')
-            [warning] = w
-            assert warning.filename == __file__
-            msg = str(warning.message)
-            assert msg == "The 'text' argument to find()-type methods is deprecated. Use 'string' instead."
-
-    def test_soupstrainer_constructor_string(self):
-        with warnings.catch_warnings(record=True) as w:
-            strainer = SoupStrainer(text="text")
-            assert strainer.text == 'text'
-            [warning] = w
-            msg = str(warning.message)
-            assert warning.filename == __file__
-            assert msg == "The 'text' argument to the SoupStrainer constructor is deprecated. Use 'string' instead."
-
diff --git a/lib/certgen.py b/lib/certgen.py
index d5ffab2e..1b941161 100644
--- a/lib/certgen.py
+++ b/lib/certgen.py
@@ -1,21 +1,26 @@
 # -*- coding: latin-1 -*-
 #
-# Copyright (C) AB Strakt
-# Copyright (C) Jean-Paul Calderone
-# See LICENSE for details.
-
+# Copyright (C) Martin Sjögren and AB Strakt 2001, All rights reserved
+# Copyright (C) Jean-Paul Calderone 2008, All rights reserved
+# This file is licenced under the GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 or later (aka LGPL v2.1)
+# Please see LGPL2.1.txt for more information
 """
 Certificate generation module.
 """
 
 from OpenSSL import crypto
+import time
 
 TYPE_RSA = crypto.TYPE_RSA
 TYPE_DSA = crypto.TYPE_DSA
 
+serial = int(time.time())
+
+
 def createKeyPair(type, bits):
     """
     Create a public/private key pair.
+
     Arguments: type - Key type, must be one of TYPE_RSA and TYPE_DSA
                bits - Number of bits to use in the key
     Returns:   The public/private key pair in a PKey object
@@ -24,11 +29,12 @@ def createKeyPair(type, bits):
     pkey.generate_key(type, bits)
     return pkey
 
-def createCertRequest(pkey, digest="sha256", **name):
+def createCertRequest(pkey, digest="md5", **name):
     """
     Create a certificate request.
+
     Arguments: pkey   - The key to associate with the request
-               digest - Digestion method to use for signing, default is sha256
+               digest - Digestion method to use for signing, default is md5
                **name - The name of the subject of the request, possible
                         arguments are:
                           C     - Country name
@@ -43,17 +49,18 @@ def createCertRequest(pkey, digest="sha256", **name):
     req = crypto.X509Req()
     subj = req.get_subject()
 
-    for key, value in name.items():
+    for (key,value) in name.items():
         setattr(subj, key, value)
 
     req.set_pubkey(pkey)
     req.sign(pkey, digest)
     return req
 
-def createCertificate(req, issuerCertKey, serial, validityPeriod, digest="sha256"):
+def createCertificate(req, (issuerCert, issuerKey), serial, (notBefore, notAfter), digest="md5"):
     """
     Generate a certificate given a certificate request.
-    Arguments: req        - Certificate request to use
+
+    Arguments: req        - Certificate reqeust to use
                issuerCert - The certificate of the issuer
                issuerKey  - The private key of the issuer
                serial     - Serial number for the certificate
@@ -61,11 +68,9 @@ def createCertificate(req, issuerCertKey, serial, validityPeriod, digest="sha256
                             starts being valid
                notAfter   - Timestamp (relative to now) when the certificate
                             stops being valid
-               digest     - Digest method to use for signing, default is sha256
+               digest     - Digest method to use for signing, default is md5
     Returns:   The signed certificate in an X509 object
     """
-    issuerCert, issuerKey = issuerCertKey
-    notBefore, notAfter = validityPeriod
     cert = crypto.X509()
     cert.set_serial_number(serial)
     cert.gmtime_adj_notBefore(notBefore)
@@ -75,32 +80,3 @@ def createCertificate(req, issuerCertKey, serial, validityPeriod, digest="sha256
     cert.set_pubkey(req.get_pubkey())
     cert.sign(issuerKey, digest)
     return cert
-
-def createSelfSignedCertificate(issuerName, issuerKey, serial, notBefore, notAfter, altNames, digest="sha256"):
-    """
-    Generate a certificate given a certificate request.
-    Arguments: issuerName - The name of the issuer
-               issuerKey  - The private key of the issuer
-               serial     - Serial number for the certificate
-               notBefore  - Timestamp (relative to now) when the certificate
-                            starts being valid
-               notAfter   - Timestamp (relative to now) when the certificate
-                            stops being valid
-               altNames   - The alternative names
-               digest     - Digest method to use for signing, default is sha256
-    Returns:   The signed certificate in an X509 object
-    """
-    cert = crypto.X509()
-    cert.set_version(2)
-    cert.set_serial_number(serial)
-    cert.get_subject().CN = issuerName
-    cert.gmtime_adj_notBefore(notBefore)
-    cert.gmtime_adj_notAfter(notAfter)
-    cert.set_issuer(cert.get_subject())
-    cert.set_pubkey(issuerKey)
-
-    if altNames:
-        cert.add_extensions([crypto.X509Extension(b"subjectAltName", False, altNames)])
-
-    cert.sign(issuerKey, digest)
-    return cert
diff --git a/lib/certifi/__init__.py b/lib/certifi/__init__.py
deleted file mode 100644
index bf83fa93..00000000
--- a/lib/certifi/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from .core import contents, where
-
-__all__ = ["contents", "where"]
-__version__ = "2025.04.26"
diff --git a/lib/certifi/__main__.py b/lib/certifi/__main__.py
deleted file mode 100644
index 8945b5da..00000000
--- a/lib/certifi/__main__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import argparse
-
-from certifi import contents, where
-
-parser = argparse.ArgumentParser()
-parser.add_argument("-c", "--contents", action="store_true")
-args = parser.parse_args()
-
-if args.contents:
-    print(contents())
-else:
-    print(where())
diff --git a/lib/certifi/cacert.pem b/lib/certifi/cacert.pem
deleted file mode 100644
index b1d0cfd8..00000000
--- a/lib/certifi/cacert.pem
+++ /dev/null
@@ -1,4676 +0,0 @@
-
-# Issuer: CN=Entrust Root Certification Authority O=Entrust, Inc. OU=www.entrust.net/CPS is incorporated by reference/(c) 2006 Entrust, Inc.
-# Subject: CN=Entrust Root Certification Authority O=Entrust, Inc. OU=www.entrust.net/CPS is incorporated by reference/(c) 2006 Entrust, Inc.
-# Label: "Entrust Root Certification Authority"
-# Serial: 1164660820
-# MD5 Fingerprint: d6:a5:c3:ed:5d:dd:3e:00:c1:3d:87:92:1f:1d:3f:e4
-# SHA1 Fingerprint: b3:1e:b1:b7:40:e3:6c:84:02:da:dc:37:d4:4d:f5:d4:67:49:52:f9
-# SHA256 Fingerprint: 73:c1:76:43:4f:1b:c6:d5:ad:f4:5b:0e:76:e7:27:28:7c:8d:e5:76:16:c1:e6:e6:14:1a:2b:2c:bc:7d:8e:4c
------BEGIN CERTIFICATE-----
-MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
-VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0
-Lm5ldC9DUFMgaXMgaW5jb3Jwb3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMW
-KGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsGA1UEAxMkRW50cnVzdCBSb290IENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0MloXDTI2MTEyNzIw
-NTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMTkw
-NwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSBy
-ZWZlcmVuY2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNV
-BAMTJEVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALaVtkNC+sZtKm9I35RMOVcF7sN5EUFo
-Nu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYszA9u3g3s+IIRe7bJWKKf4
-4LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOwwCj0Yzfv9
-KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGI
-rb68j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi
-94DkZfs0Nw4pgHBNrziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOB
-sDCBrTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAi
-gA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1MzQyWjAfBgNVHSMEGDAWgBRo
-kORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DHhmak8fdLQ/uE
-vW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
-A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9t
-O1KzKtvn1ISMY/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6Zua
-AGAT/3B+XxFNSRuzFVJ7yVTav52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP
-9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTSW3iDVuycNsMm4hH2Z0kdkquM++v/
-eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0tHuu2guQOHXvgR1m
-0vdXcDazv/wor3ElhVsT/h5/WrQ8
------END CERTIFICATE-----
-
-# Issuer: CN=QuoVadis Root CA 2 O=QuoVadis Limited
-# Subject: CN=QuoVadis Root CA 2 O=QuoVadis Limited
-# Label: "QuoVadis Root CA 2"
-# Serial: 1289
-# MD5 Fingerprint: 5e:39:7b:dd:f8:ba:ec:82:e9:ac:62:ba:0c:54:00:2b
-# SHA1 Fingerprint: ca:3a:fb:cf:12:40:36:4b:44:b2:16:20:88:80:48:39:19:93:7c:f7
-# SHA256 Fingerprint: 85:a0:dd:7d:d7:20:ad:b7:ff:05:f8:3d:54:2b:20:9d:c7:ff:45:28:f7:d6:77:b1:83:89:fe:a5:e5:c4:9e:86
------BEGIN CERTIFICATE-----
-MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
-GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
-b3QgQ0EgMjAeFw0wNjExMjQxODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNV
-BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
-YWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCa
-GMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6XJxg
-Fyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55J
-WpzmM+Yklvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bB
-rrcCaoF6qUWD4gXmuVbBlDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp
-+ARz8un+XJiM9XOva7R+zdRcAitMOeGylZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1
-ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt66/3FsvbzSUr5R/7mp/i
-Ucw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1JdxnwQ5hYIiz
-PtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og
-/zOhD7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UH
-oycR7hYQe7xFSkyyBNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuI
-yV77zGHcizN300QyNQliBJIWENieJ0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1Ud
-EwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBQahGK8SEwzJQTU7tD2
-A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGUa6FJpEcwRTEL
-MAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
-ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2f
-BluornFdLwUvZ+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzn
-g/iN/Ae42l9NLmeyhP3ZRPx3UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2Bl
-fF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodmVjB3pjd4M1IQWK4/YY7yarHvGH5K
-WWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK+JDSV6IZUaUtl0Ha
-B0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrWIozc
-hLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPR
-TUIZ3Ph1WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWD
-mbA4CD/pXvk1B+TJYm5Xf6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0Z
-ohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y
-4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8VCLAAVBpQ570su9t+Oza
-8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
------END CERTIFICATE-----
-
-# Issuer: CN=QuoVadis Root CA 3 O=QuoVadis Limited
-# Subject: CN=QuoVadis Root CA 3 O=QuoVadis Limited
-# Label: "QuoVadis Root CA 3"
-# Serial: 1478
-# MD5 Fingerprint: 31:85:3c:62:94:97:63:b9:aa:fd:89:4e:af:6f:e0:cf
-# SHA1 Fingerprint: 1f:49:14:f7:d8:74:95:1d:dd:ae:02:c0:be:fd:3a:2d:82:75:51:85
-# SHA256 Fingerprint: 18:f1:fc:7f:20:5d:f8:ad:dd:eb:7f:e0:07:dd:57:e3:af:37:5a:9c:4d:8d:73:54:6b:f4:f1:fe:d1:e1:8d:35
------BEGIN CERTIFICATE-----
-MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
-GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
-b3QgQ0EgMzAeFw0wNjExMjQxOTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNV
-BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
-YWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDM
-V0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNggDhoB
-4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUr
-H556VOijKTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd
-8lyyBTNvijbO0BNO/79KDDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9Cabwv
-vWhDFlaJKjdhkf2mrk7AyxRllDdLkgbvBNDInIjbC3uBr7E9KsRlOni27tyAsdLT
-mZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwpp5ijJUMv7/FfJuGITfhe
-btfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8nT8KKdjc
-T5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDt
-WAEXMJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZ
-c6tsgLjoC2SToJyMGf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A
-4iLItLRkT9a6fUg+qGkM17uGcclzuD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYD
-VR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHTBgkrBgEEAb5YAAMwgcUwgZMG
-CCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmljYXRlIGNvbnN0
-aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
-aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVu
-dC4wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2Nw
-czALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4G
-A1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4ywLQoUmkRzBFMQswCQYDVQQGEwJC
-TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UEAxMSUXVvVmFkaXMg
-Um9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZVqyM0
-7ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSem
-d1o417+shvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd
-+LJ2w/w4E6oM3kJpK27zPOuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B
-4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadN
-t54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp8kokUvd0/bpO5qgdAm6x
-DYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBCbjPsMZ57
-k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6s
-zHXug/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0j
-Wy10QJLZYxkNc91pvGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeT
-mJlglFwjz1onl14LBQaTNx47aTbrqZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK
-4SVhM7JZG+Ju1zdXtg2pEto=
------END CERTIFICATE-----
-
-# Issuer: CN=DigiCert Assured ID Root CA O=DigiCert Inc OU=www.digicert.com
-# Subject: CN=DigiCert Assured ID Root CA O=DigiCert Inc OU=www.digicert.com
-# Label: "DigiCert Assured ID Root CA"
-# Serial: 17154717934120587862167794914071425081
-# MD5 Fingerprint: 87:ce:0b:7b:2a:0e:49:00:e1:58:71:9b:37:a8:93:72
-# SHA1 Fingerprint: 05:63:b8:63:0d:62:d7:5a:bb:c8:ab:1e:4b:df:b5:a8:99:b2:4d:43
-# SHA256 Fingerprint: 3e:90:99:b5:01:5e:8f:48:6c:00:bc:ea:9d:11:1e:e7:21:fa:ba:35:5a:89:bc:f1:df:69:56:1e:3d:c6:32:5c
------BEGIN CERTIFICATE-----
-MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBl
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv
-b3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzExMTEwMDAwMDAwWjBlMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl
-cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7c
-JpSIqvTO9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYP
-mDI2dsze3Tyoou9q+yHyUmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+
-wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4
-VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpyoeb6pNnVFzF1roV9Iq4/
-AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whfGHdPAgMB
-AAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW
-BBRF66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYun
-pyGd823IDzANBgkqhkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRC
-dWKuh+vy1dneVrOfzM4UKLkNl2BcEkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTf
-fwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38FnSbNd67IJKusm7Xi+fT8r87cm
-NW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i8b5QZ7dsvfPx
-H2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
-+o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
------END CERTIFICATE-----
-
-# Issuer: CN=DigiCert Global Root CA O=DigiCert Inc OU=www.digicert.com
-# Subject: CN=DigiCert Global Root CA O=DigiCert Inc OU=www.digicert.com
-# Label: "DigiCert Global Root CA"
-# Serial: 10944719598952040374951832963794454346
-# MD5 Fingerprint: 79:e4:a9:84:0d:7d:3a:96:d7:c0:4f:e2:43:4c:89:2e
-# SHA1 Fingerprint: a8:98:5d:3a:65:e5:e5:c4:b2:d7:d6:6d:40:c6:dd:2f:b1:9c:54:36
-# SHA256 Fingerprint: 43:48:a0:e9:44:4c:78:cb:26:5e:05:8d:5e:89:44:b4:d8:4f:96:62:bd:26:db:25:7f:89:34:a4:43:c7:01:61
------BEGIN CERTIFICATE-----
-MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
-QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT
-MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
-b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB
-CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97
-nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt
-43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P
-T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4
-gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO
-BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR
-TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw
-DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr
-hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg
-06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF
-PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls
-YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
-CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
------END CERTIFICATE-----
-
-# Issuer: CN=DigiCert High Assurance EV Root CA O=DigiCert Inc OU=www.digicert.com
-# Subject: CN=DigiCert High Assurance EV Root CA O=DigiCert Inc OU=www.digicert.com
-# Label: "DigiCert High Assurance EV Root CA"
-# Serial: 3553400076410547919724730734378100087
-# MD5 Fingerprint: d4:74:de:57:5c:39:b2:d3:9c:85:83:c5:c0:65:49:8a
-# SHA1 Fingerprint: 5f:b7:ee:06:33:e2:59:db:ad:0c:4c:9a:e6:d3:8f:1a:61:c7:dc:25
-# SHA256 Fingerprint: 74:31:e5:f4:c3:c1:ce:46:90:77:4f:0b:61:e0:54:40:88:3b:a9:a0:1e:d0:0b:a6:ab:d7:80:6e:d3:b1:18:cf
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
-ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL
-MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3
-LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug
-RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm
-+9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW
-PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM
-xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB
-Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3
-hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg
-EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF
-MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA
-FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec
-nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z
-eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF
-hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2
-Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
-vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep
-+OkuE6N36B9K
------END CERTIFICATE-----
-
-# Issuer: CN=SwissSign Gold CA - G2 O=SwissSign AG
-# Subject: CN=SwissSign Gold CA - G2 O=SwissSign AG
-# Label: "SwissSign Gold CA - G2"
-# Serial: 13492815561806991280
-# MD5 Fingerprint: 24:77:d9:a8:91:d1:3b:fa:88:2d:c2:ff:f8:cd:33:93
-# SHA1 Fingerprint: d8:c5:38:8a:b7:30:1b:1b:6e:d4:7a:e6:45:25:3a:6f:9f:1a:27:61
-# SHA256 Fingerprint: 62:dd:0b:e9:b9:f5:0a:16:3e:a0:f8:e7:5c:05:3b:1e:ca:57:ea:55:c8:68:8f:64:7c:68:81:f2:c8:35:7b:95
------BEGIN CERTIFICATE-----
-MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV
-BAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2ln
-biBHb2xkIENBIC0gRzIwHhcNMDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBF
-MQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMR8wHQYDVQQDExZT
-d2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
-CgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUqt2/8
-76LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+
-bbqBHH5CjCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c
-6bM8K8vzARO/Ws/BtQpgvd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqE
-emA8atufK+ze3gE/bk3lUIbLtK/tREDFylqM2tIrfKjuvqblCqoOpd8FUrdVxyJd
-MmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvRAiTysybUa9oEVeXBCsdt
-MDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuendjIj3o02y
-MszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69y
-FGkOpeUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPi
-aG59je883WX0XaxR7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxM
-gI93e2CaHt+28kgeDrpOVG2Y4OGiGqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCB
-qTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWyV7
-lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64OfPAeGZe6Drn
-8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
-L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe6
-45R88a7A3hfm5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczO
-UYrHUDFu4Up+GC9pWbY9ZIEr44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5
-O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCC
-bwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yv
-GPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a
-77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCC
-hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid3
-92qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEpp
-Ld6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+w
-ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt
-Qc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
------END CERTIFICATE-----
-
-# Issuer: CN=SecureTrust CA O=SecureTrust Corporation
-# Subject: CN=SecureTrust CA O=SecureTrust Corporation
-# Label: "SecureTrust CA"
-# Serial: 17199774589125277788362757014266862032
-# MD5 Fingerprint: dc:32:c3:a7:6d:25:57:c7:68:09:9d:ea:2d:a9:a2:d1
-# SHA1 Fingerprint: 87:82:c6:c3:04:35:3b:cf:d2:96:92:d2:59:3e:7d:44:d9:34:ff:11
-# SHA256 Fingerprint: f1:c1:b5:0a:e5:a2:0d:d8:03:0e:c9:f6:bc:24:82:3d:d3:67:b5:25:57:59:b4:e7:1b:61:fc:e9:f7:37:5d:73
------BEGIN CERTIFICATE-----
-MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBI
-MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
-FzAVBgNVBAMTDlNlY3VyZVRydXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIz
-MTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAeBgNVBAoTF1NlY3VyZVRydXN0IENv
-cnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQXOZEz
-Zum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO
-0gMdA+9tDWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIao
-wW8xQmxSPmjL8xk037uHGFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj
-7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b01k/unK8RCSc43Oz969XL0Imnal0ugBS
-8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmHursCAwEAAaOBnTCBmjAT
-BgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
-/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCeg
-JYYjaHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGC
-NxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt3
-6Z3q059c4EVlew3KW+JwULKUBRSuSceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/
-3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHfmbx8IVQr5Fiiu1cprp6poxkm
-D5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZnMUFdAvnZyPS
-CPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
-3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
------END CERTIFICATE-----
-
-# Issuer: CN=Secure Global CA O=SecureTrust Corporation
-# Subject: CN=Secure Global CA O=SecureTrust Corporation
-# Label: "Secure Global CA"
-# Serial: 9751836167731051554232119481456978597
-# MD5 Fingerprint: cf:f4:27:0d:d4:ed:dc:65:16:49:6d:3d:da:bf:6e:de
-# SHA1 Fingerprint: 3a:44:73:5a:e5:81:90:1f:24:86:61:46:1e:3b:9c:c4:5f:f5:3a:1b
-# SHA256 Fingerprint: 42:00:f5:04:3a:c8:59:0e:bb:52:7d:20:9e:d1:50:30:29:fb:cb:d4:1c:a1:b5:06:ec:27:f1:5a:de:7d:ac:69
------BEGIN CERTIFICATE-----
-MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBK
-MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
-GTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkx
-MjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3Qg
-Q29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jxYDiJ
-iQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa
-/FHtaMbQbqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJ
-jnIFHovdRIWCQtBJwB1g8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnI
-HmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYVHDGA76oYa8J719rO+TMg1fW9ajMtgQT7
-sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi0XPnj3pDAgMBAAGjgZ0w
-gZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1UdEwEB/wQF
-MAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCsw
-KaAnoCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsG
-AQQBgjcVAQQDAgEAMA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0L
-URYD7xh8yOOvaliTFGCRsoTciE6+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXO
-H0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cnCDpOGR86p1hcF895P4vkp9Mm
-I50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/53CYNv6ZHdAbY
-iNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
-f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
------END CERTIFICATE-----
-
-# Issuer: CN=COMODO Certification Authority O=COMODO CA Limited
-# Subject: CN=COMODO Certification Authority O=COMODO CA Limited
-# Label: "COMODO Certification Authority"
-# Serial: 104350513648249232941998508985834464573
-# MD5 Fingerprint: 5c:48:dc:f7:42:72:ec:56:94:6d:1c:cc:71:35:80:75
-# SHA1 Fingerprint: 66:31:bf:9e:f7:4f:9e:b6:c9:d5:a6:0c:ba:6a:be:d1:f7:bd:ef:7b
-# SHA256 Fingerprint: 0c:2c:d6:3d:f7:80:6f:a3:99:ed:e8:09:11:6b:57:5b:f8:79:89:f0:65:18:f9:80:8c:86:05:03:17:8b:af:66
------BEGIN CERTIFICATE-----
-MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCB
-gTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNV
-BAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEyMDEwMDAw
-MDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3Jl
-YXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01P
-RE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3
-UcEbVASY06m/weaKXTuH+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI
-2GqGd0S7WWaXUF601CxwRM/aN5VCaTwwxHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8
-Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV4EajcNxo2f8ESIl33rXp
-+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA1KGzqSX+
-DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5O
-nKVIrLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW
-/zAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6g
-PKA6hjhodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9u
-QXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOCAQEAPpiem/Yb6dc5t3iuHXIY
-SdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CPOGEIqB6BCsAv
-IC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
-RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4
-zJVSk/BwJVmcIGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5dd
-BA6+C4OmF4O5MBKgxTMVBbkN+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IB
-ZQ==
------END CERTIFICATE-----
-
-# Issuer: CN=COMODO ECC Certification Authority O=COMODO CA Limited
-# Subject: CN=COMODO ECC Certification Authority O=COMODO CA Limited
-# Label: "COMODO ECC Certification Authority"
-# Serial: 41578283867086692638256921589707938090
-# MD5 Fingerprint: 7c:62:ff:74:9d:31:53:5e:68:4a:d5:78:aa:1e:bf:23
-# SHA1 Fingerprint: 9f:74:4e:9f:2b:4d:ba:ec:0f:31:2c:50:b6:56:3b:8e:2d:93:c3:11
-# SHA256 Fingerprint: 17:93:92:7a:06:14:54:97:89:ad:ce:2f:8f:34:f7:f0:b6:6d:0f:3a:e3:a3:b8:4d:21:ec:15:db:ba:4f:ad:c7
------BEGIN CERTIFICATE-----
-MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTEL
-MAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
-BxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMT
-IkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwMzA2MDAw
-MDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdy
-ZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09N
-T0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSR
-FtSrYpn1PlILBs5BAH+X4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0J
-cfRK9ChQtP6IHG4/bC8vCVlbpVsLM5niwz2J+Wos77LTBumjQjBAMB0GA1UdDgQW
-BBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
-BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VGFAkK+qDm
-fQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdv
-GDeAU/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
------END CERTIFICATE-----
-
-# Issuer: CN=Certigna O=Dhimyotis
-# Subject: CN=Certigna O=Dhimyotis
-# Label: "Certigna"
-# Serial: 18364802974209362175
-# MD5 Fingerprint: ab:57:a6:5b:7d:42:82:19:b5:d8:58:26:28:5e:fd:ff
-# SHA1 Fingerprint: b1:2e:13:63:45:86:a4:6f:1a:b2:60:68:37:58:2d:c4:ac:fd:94:97
-# SHA256 Fingerprint: e3:b6:a2:db:2e:d7:ce:48:84:2f:7a:c5:32:41:c7:b7:1d:54:14:4b:fb:40:c1:1f:3f:1d:0b:42:f5:ee:a1:2d
------BEGIN CERTIFICATE-----
-MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNV
-BAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4X
-DTA3MDYyOTE1MTMwNVoXDTI3MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQ
-BgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwIQ2VydGlnbmEwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7qXOEm7RFHYeGifBZ4
-QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyHGxny
-gQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbw
-zBfsV1/pogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q
-130yGLMLLGq/jj8UEYkgDncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2
-JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKfIrjxwo1p3Po6WAbfAgMBAAGjgbwwgbkw
-DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQtCRZvgHyUtVF9lo53BEw
-ZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJBgNVBAYT
-AkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzj
-AQ/JSP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG
-9w0BAQUFAAOCAQEAhQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8h
-bV6lUmPOEvjvKtpv6zf+EwLHyzs+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFnc
-fca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1kluPBS1xp81HlDQwY9qcEQCYsuu
-HWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY1gkIl2PlwS6w
-t0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
-WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
------END CERTIFICATE-----
-
-# Issuer: O=Chunghwa Telecom Co., Ltd. OU=ePKI Root Certification Authority
-# Subject: O=Chunghwa Telecom Co., Ltd. OU=ePKI Root Certification Authority
-# Label: "ePKI Root Certification Authority"
-# Serial: 28956088682735189655030529057352760477
-# MD5 Fingerprint: 1b:2e:00:ca:26:06:90:3d:ad:fe:6f:15:68:d3:6b:b3
-# SHA1 Fingerprint: 67:65:0d:f1:7e:8e:7e:5b:82:40:a4:f4:56:4b:cf:e2:3d:69:c6:f0
-# SHA256 Fingerprint: c0:a6:f4:dc:63:a2:4b:fd:cf:54:ef:2a:6a:08:2a:0a:72:de:35:80:3e:2f:f5:ff:52:7a:e5:d8:72:06:df:d5
------BEGIN CERTIFICATE-----
-MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBe
-MQswCQYDVQQGEwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0
-ZC4xKjAoBgNVBAsMIWVQS0kgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
-Fw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMxMjdaMF4xCzAJBgNVBAYTAlRXMSMw
-IQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEqMCgGA1UECwwhZVBL
-SSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEF
-AAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAH
-SyZbCUNsIZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAh
-ijHyl3SJCRImHJ7K2RKilTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3X
-DZoTM1PRYfl61dd4s5oz9wCGzh1NlDivqOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1
-TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX12ruOzjjK9SXDrkb5wdJ
-fzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0OWQqraffA
-sgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uU
-WH1+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLS
-nT0IFaUQAS2zMnaolQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pH
-dmX2Os+PYhcZewoozRrSgx4hxyy/vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJip
-NiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXiZo1jDiVN1Rmy5nk3pyKdVDEC
-AwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/QkqiMAwGA1UdEwQF
-MAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
-ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGB
-uvl2ICO1J2B01GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6Yl
-PwZpVnPDimZI+ymBV3QGypzqKOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkP
-JXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdVxrsStZf0X4OFunHB2WyBEXYKCrC/
-gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEPNXubrjlpC2JgQCA2
-j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+rGNm6
-5ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUB
-o2M3IUxExJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS
-/jQ6fbjpKdx2qcgw+BRxgMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2z
-Gp1iro2C6pSe3VkQw63d4k3jMdXH7OjysP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTE
-W9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmODBCEIZ43ygknQW/2xzQ+D
-hNQ+IIX3Sj0rnP0qCglN6oH4EZw=
------END CERTIFICATE-----
-
-# Issuer: O=certSIGN OU=certSIGN ROOT CA
-# Subject: O=certSIGN OU=certSIGN ROOT CA
-# Label: "certSIGN ROOT CA"
-# Serial: 35210227249154
-# MD5 Fingerprint: 18:98:c0:d6:e9:3a:fc:f9:b0:f5:0c:f7:4b:01:44:17
-# SHA1 Fingerprint: fa:b7:ee:36:97:26:62:fb:2d:b0:2a:f6:bf:03:fd:e8:7c:4b:2f:9b
-# SHA256 Fingerprint: ea:a9:62:c4:fa:4a:6b:af:eb:e4:15:19:6d:35:1c:cd:88:8d:4f:53:f3:fa:8a:e6:d7:c4:66:a9:4e:60:42:bb
------BEGIN CERTIFICATE-----
-MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYT
-AlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBD
-QTAeFw0wNjA3MDQxNzIwMDRaFw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJP
-MREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7IJUqOtdu0KBuqV5Do
-0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHHrfAQ
-UySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5d
-RdY4zTW2ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQ
-OA7+j0xbm0bqQfWwCHTD0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwv
-JoIQ4uNllAoEwF73XVv4EOLQunpL+943AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08C
-AwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAcYwHQYDVR0O
-BBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IBAQA+0hyJ
-LjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecY
-MnQ8SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ
-44gx+FkagQnIl6Z0x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6I
-Jd1hJyMctTEHBDa0GpC9oHRxUIltvBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNw
-i/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7NzTogVZ96edhBiIL5VaZVDADlN
-9u6wWk5JRFRYX0KD
------END CERTIFICATE-----
-
-# Issuer: CN=NetLock Arany (Class Gold) F\u0151tan\xfas\xedtv\xe1ny O=NetLock Kft. OU=Tan\xfas\xedtv\xe1nykiad\xf3k (Certification Services)
-# Subject: CN=NetLock Arany (Class Gold) F\u0151tan\xfas\xedtv\xe1ny O=NetLock Kft. OU=Tan\xfas\xedtv\xe1nykiad\xf3k (Certification Services)
-# Label: "NetLock Arany (Class Gold) F\u0151tan\xfas\xedtv\xe1ny"
-# Serial: 80544274841616
-# MD5 Fingerprint: c5:a1:b7:ff:73:dd:d6:d7:34:32:18:df:fc:3c:ad:88
-# SHA1 Fingerprint: 06:08:3f:59:3f:15:a1:04:a0:69:a4:6b:a9:03:d0:06:b7:97:09:91
-# SHA256 Fingerprint: 6c:61:da:c3:a2:de:f0:31:50:6b:e0:36:d2:a6:fe:40:19:94:fb:d1:3d:f9:c8:d4:66:59:92:74:c4:46:ec:98
------BEGIN CERTIFICATE-----
-MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQG
-EwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3
-MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNl
-cnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBBcmFueSAoQ2xhc3MgR29sZCkgRsWR
-dGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgxMjA2MTUwODIxWjCB
-pzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxOZXRM
-b2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlm
-aWNhdGlvbiBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNz
-IEdvbGQpIEbFkXRhbsO6c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAxCRec75LbRTDofTjl5Bu0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrT
-lF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw/HpYzY6b7cNGbIRwXdrz
-AZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAkH3B5r9s5
-VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRG
-ILdwfzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2
-BJtr+UBdADTHLpl1neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAG
-AQH/AgEEMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2M
-U9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwWqZw8UQCgwBEIBaeZ5m8BiFRh
-bvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTtaYtOUZcTh5m2C
-+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
-bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2F
-uLjbvrW5KfnaNwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2
-XjG4Kvte9nHfRCaexOYNkbQudZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
------END CERTIFICATE-----
-
-# Issuer: CN=Microsec e-Szigno Root CA 2009 O=Microsec Ltd.
-# Subject: CN=Microsec e-Szigno Root CA 2009 O=Microsec Ltd.
-# Label: "Microsec e-Szigno Root CA 2009"
-# Serial: 14014712776195784473
-# MD5 Fingerprint: f8:49:f4:03:bc:44:2d:83:be:48:69:7d:29:64:fc:b1
-# SHA1 Fingerprint: 89:df:74:fe:5c:f4:0f:4a:80:f9:e3:37:7d:54:da:91:e1:01:31:8e
-# SHA256 Fingerprint: 3c:5f:81:fe:a5:fa:b8:2c:64:bf:a2:ea:ec:af:cd:e8:e0:77:fc:86:20:a7:ca:e5:37:16:3d:f3:6e:db:f3:78
------BEGIN CERTIFICATE-----
-MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYD
-VQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0
-ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0G
-CSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTAeFw0wOTA2MTYxMTMwMThaFw0y
-OTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3Qx
-FjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3pp
-Z25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvP
-kd6mJviZpWNwrZuuyjNAfW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tc
-cbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG0IMZfcChEhyVbUr02MelTTMuhTlAdX4U
-fIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKApxn1ntxVUwOXewdI/5n7
-N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm1HxdrtbC
-xkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1
-+rUCAwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
-A1UdDgQWBBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPM
-Pcu1SCOhGnqmKrs0aDAbBgNVHREEFDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqG
-SIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0olZMEyL/azXm4Q5DwpL7v8u8h
-mLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfXI/OMn74dseGk
-ddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
-tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c
-2Pm2G2JwCz02yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5t
-HMN1Rq41Bab2XD0h7lbwyYIiLXpUq3DDfSJlgnCW
------END CERTIFICATE-----
-
-# Issuer: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R3
-# Subject: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R3
-# Label: "GlobalSign Root CA - R3"
-# Serial: 4835703278459759426209954
-# MD5 Fingerprint: c5:df:b8:49:ca:05:13:55:ee:2d:ba:1a:c3:3e:b0:28
-# SHA1 Fingerprint: d6:9b:56:11:48:f0:1c:77:c5:45:78:c1:09:26:df:5b:85:69:76:ad
-# SHA256 Fingerprint: cb:b5:22:d7:b7:f1:27:ad:6a:01:13:86:5b:df:1c:d4:10:2e:7d:07:59:af:63:5a:7c:f4:72:0d:c9:63:c5:3b
------BEGIN CERTIFICATE-----
-MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4G
-A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNp
-Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4
-MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEG
-A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWtiHL8
-RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsT
-gHeMCOFJ0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmm
-KPZpO/bLyCiR5Z2KYVc3rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zd
-QQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjlOCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZ
-XriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2xmmFghcCAwEAAaNCMEAw
-DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI/wS3+o
-LkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZU
-RUm7lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMp
-jjM5RcOO5LlXbKr8EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK
-6fBdRoyV3XpYKBovHd7NADdBj+1EbddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQX
-mcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18YIvDQVETI53O9zJrlAGomecs
-Mx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7rkpeDMdmztcpH
-WD9f
------END CERTIFICATE-----
-
-# Issuer: CN=Izenpe.com O=IZENPE S.A.
-# Subject: CN=Izenpe.com O=IZENPE S.A.
-# Label: "Izenpe.com"
-# Serial: 917563065490389241595536686991402621
-# MD5 Fingerprint: a6:b0:cd:85:80:da:5c:50:34:a3:39:90:2f:55:67:73
-# SHA1 Fingerprint: 2f:78:3d:25:52:18:a7:4a:65:39:71:b5:2c:a2:9c:45:15:6f:e9:19
-# SHA256 Fingerprint: 25:30:cc:8e:98:32:15:02:ba:d9:6f:9b:1f:ba:1b:09:9e:2d:29:9e:0f:45:48:bb:91:4f:36:3b:c0:d4:53:1f
------BEGIN CERTIFICATE-----
-MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4
-MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6
-ZW5wZS5jb20wHhcNMDcxMjEzMTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYD
-VQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5j
-b20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ03rKDx6sp4boFmVq
-scIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAKClaO
-xdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6H
-LmYRY2xU+zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFX
-uaOKmMPsOzTFlUFpfnXCPCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQD
-yCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxTOTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+
-JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbKF7jJeodWLBoBHmy+E60Q
-rLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK0GqfvEyN
-BjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8L
-hij+0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIB
-QFqNeb+Lz0vPqhbBleStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+
-HMh3/1uaD7euBUbl8agW7EekFwIDAQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2lu
-Zm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+SVpFTlBFIFMuQS4gLSBDSUYg
-QTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBGNjIgUzgxQzBB
-BgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
-MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwHQYDVR0OBBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUA
-A4ICAQB4pgwWSp9MiDrAyw6lFn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWb
-laQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbgakEyrkgPH7UIBzg/YsfqikuFgba56
-awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8qhT/AQKM6WfxZSzwo
-JNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Csg1lw
-LDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCT
-VyvehQP5aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGk
-LhObNA5me0mrZJfQRsN5nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJb
-UjWumDqtujWTI6cfSN01RpiyEGjkpTHCClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/
-QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZoQ0iy2+tzJOeRf1SktoA+
-naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1ZWrOZyGls
-QyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
------END CERTIFICATE-----
-
-# Issuer: CN=Go Daddy Root Certificate Authority - G2 O=GoDaddy.com, Inc.
-# Subject: CN=Go Daddy Root Certificate Authority - G2 O=GoDaddy.com, Inc.
-# Label: "Go Daddy Root Certificate Authority - G2"
-# Serial: 0
-# MD5 Fingerprint: 80:3a:bc:22:c1:e6:fb:8d:9b:3b:27:4a:32:1b:9a:01
-# SHA1 Fingerprint: 47:be:ab:c9:22:ea:e8:0e:78:78:34:62:a7:9f:45:c2:54:fd:e6:8b
-# SHA256 Fingerprint: 45:14:0b:32:47:eb:9c:c8:c5:b4:f0:d7:b5:30:91:f7:32:92:08:9e:6e:5a:63:e2:74:9d:d3:ac:a9:19:8e:da
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMx
-EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoT
-EUdvRGFkZHkuY29tLCBJbmMuMTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRp
-ZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIz
-NTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQH
-EwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8GA1UE
-AxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKD
-E6bFIEMBO4Tx5oVJnyfq9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH
-/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD+qK+ihVqf94Lw7YZFAXK6sOoBJQ7Rnwy
-DfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutdfMh8+7ArU6SSYmlRJQVh
-GkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMlNAJWJwGR
-tDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEA
-AaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
-FDqahQcQZyi27/a9BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmX
-WWcDYfF+OwYxdS2hII5PZYe096acvNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu
-9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r5N9ss4UXnT3ZJE95kTXWXwTr
-gIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYVN8Gb5DKj7Tjo
-2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
-LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI
-4uJEvlz36hz1
------END CERTIFICATE-----
-
-# Issuer: CN=Starfield Root Certificate Authority - G2 O=Starfield Technologies, Inc.
-# Subject: CN=Starfield Root Certificate Authority - G2 O=Starfield Technologies, Inc.
-# Label: "Starfield Root Certificate Authority - G2"
-# Serial: 0
-# MD5 Fingerprint: d6:39:81:c6:52:7e:96:69:fc:fc:ca:66:ed:05:f2:96
-# SHA1 Fingerprint: b5:1c:06:7c:ee:2b:0c:3d:f8:55:ab:2d:92:f4:fe:39:d4:e7:0f:0e
-# SHA256 Fingerprint: 2c:e1:cb:0b:f9:d2:f9:e1:02:99:3f:be:21:51:52:c3:b2:dd:0c:ab:de:1c:68:e5:31:9b:83:91:54:db:b7:f5
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMx
-EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
-HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVs
-ZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAw
-MFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
-b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVj
-aG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZp
-Y2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAL3twQP89o/8ArFvW59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMg
-nLRJdzIpVv257IzdIvpy3Cdhl+72WoTsbhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1
-HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNkN3mSwOxGXn/hbVNMYq/N
-Hwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7NfZTD4p7dN
-dloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0
-HZbUJtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
-BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0G
-CSqGSIb3DQEBCwUAA4IBAQARWfolTwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjU
-sHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx4mcujJUDJi5DnUox9g61DLu3
-4jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUwF5okxBDgBPfg
-8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
-pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1
-mMpYjn0q7pBZc2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
------END CERTIFICATE-----
-
-# Issuer: CN=Starfield Services Root Certificate Authority - G2 O=Starfield Technologies, Inc.
-# Subject: CN=Starfield Services Root Certificate Authority - G2 O=Starfield Technologies, Inc.
-# Label: "Starfield Services Root Certificate Authority - G2"
-# Serial: 0
-# MD5 Fingerprint: 17:35:74:af:7b:61:1c:eb:f4:f9:3c:e2:ee:40:f9:a2
-# SHA1 Fingerprint: 92:5a:8f:8d:2c:6d:04:e0:66:5f:59:6a:ff:22:d8:63:e8:25:6f:3f
-# SHA256 Fingerprint: 56:8d:69:05:a2:c8:87:08:a4:b3:02:51:90:ed:cf:ed:b1:97:4a:60:6a:13:c6:e5:29:0f:cb:2a:e6:3e:da:b5
------BEGIN CERTIFICATE-----
-MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMx
-EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
-HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVs
-ZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
-MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNVBAYTAlVTMRAwDgYD
-VQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFy
-ZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2Vy
-dmljZXMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20p
-OsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm2
-8xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4PahHQUw2eeBGg6345AWh1K
-Ts9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLPLJGmpufe
-hRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk
-6mFBrMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAw
-DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+q
-AdcwKziIorhtSpzyEZGDMA0GCSqGSIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMI
-bw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPPE95Dz+I0swSdHynVv/heyNXB
-ve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTyxQGjhdByPq1z
-qwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
-iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn
-0q23KXB56jzaYyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCN
-sSi6
------END CERTIFICATE-----
-
-# Issuer: CN=AffirmTrust Commercial O=AffirmTrust
-# Subject: CN=AffirmTrust Commercial O=AffirmTrust
-# Label: "AffirmTrust Commercial"
-# Serial: 8608355977964138876
-# MD5 Fingerprint: 82:92:ba:5b:ef:cd:8a:6f:a6:3d:55:f9:84:f6:d6:b7
-# SHA1 Fingerprint: f9:b5:b6:32:45:5f:9c:be:ec:57:5f:80:dc:e9:6e:2c:c7:b2:78:b7
-# SHA256 Fingerprint: 03:76:ab:1d:54:c5:f9:80:3c:e4:b2:e2:01:a0:ee:7e:ef:7b:57:b6:36:e8:a9:3c:9b:8d:48:60:c9:6f:5f:a7
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UE
-BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
-dCBDb21tZXJjaWFsMB4XDTEwMDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDEL
-MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
-cm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6EqdbDuKP
-Hx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yr
-ba0F8PrVC8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPAL
-MeIrJmqbTFeurCA+ukV6BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1
-yHp52UKqK39c/s4mT6NmgTWvRLpUHhwwMmWd5jyTXlBOeuM61G7MGvv50jeuJCqr
-VwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNVHQ4EFgQUnZPGU4teyq8/
-nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
-KoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYG
-XUPGhi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNj
-vbz4YYCanrHOQnDiqX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivt
-Z8SOyUOyXGsViQK8YvxO8rUzqrJv0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9g
-N53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0khsUlHRUe072o0EclNmsxZt9YC
-nlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
------END CERTIFICATE-----
-
-# Issuer: CN=AffirmTrust Networking O=AffirmTrust
-# Subject: CN=AffirmTrust Networking O=AffirmTrust
-# Label: "AffirmTrust Networking"
-# Serial: 8957382827206547757
-# MD5 Fingerprint: 42:65:ca:be:01:9a:9a:4c:a9:8c:41:49:cd:c0:d5:7f
-# SHA1 Fingerprint: 29:36:21:02:8b:20:ed:02:f5:66:c5:32:d1:d6:ed:90:9f:45:00:2f
-# SHA256 Fingerprint: 0a:81:ec:5a:92:97:77:f1:45:90:4a:f3:8d:5d:50:9f:66:b5:e2:c5:8f:cd:b5:31:05:8b:0e:17:f3:f0:b4:1b
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UE
-BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
-dCBOZXR3b3JraW5nMB4XDTEwMDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDEL
-MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
-cm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SEHi3y
-YJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbua
-kCNrmreIdIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRL
-QESxG9fhwoXA3hA/Pe24/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp
-6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gbh+0t+nvujArjqWaJGctB+d1ENmHP4ndG
-yH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNVHQ4EFgQUBx/S55zawm6i
-QLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
-KoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfO
-tDIuUFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzu
-QY0x2+c06lkh1QF612S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZ
-Lgo/bNjR9eUJtGxUAArgFU2HdW23WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4u
-olu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9/ZFvgrG+CJPbFEfxojfHRZ48
-x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
------END CERTIFICATE-----
-
-# Issuer: CN=AffirmTrust Premium O=AffirmTrust
-# Subject: CN=AffirmTrust Premium O=AffirmTrust
-# Label: "AffirmTrust Premium"
-# Serial: 7893706540734352110
-# MD5 Fingerprint: c4:5d:0e:48:b6:ac:28:30:4e:0a:bc:f9:38:16:87:57
-# SHA1 Fingerprint: d8:a6:33:2c:e0:03:6f:b1:85:f6:63:4f:7d:6a:06:65:26:32:28:27
-# SHA256 Fingerprint: 70:a7:3f:7f:37:6b:60:07:42:48:90:45:34:b1:14:82:d5:bf:0e:69:8e:cc:49:8d:f5:25:77:eb:f2:e9:3b:9a
------BEGIN CERTIFICATE-----
-MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UE
-BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVz
-dCBQcmVtaXVtMB4XDTEwMDEyOTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkG
-A1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1U
-cnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxBLf
-qV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtnBKAQ
-JG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ
-+jjeRFcV5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrS
-s8PhaJyJ+HoAVt70VZVs+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5
-HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmdGPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d7
-70O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5Rp9EixAqnOEhss/n/fauG
-V+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NIS+LI+H+S
-qHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S
-5u046uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4Ia
-C1nEWTJ3s7xgaVY5/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TX
-OwF0lkLgAOIua+rF7nKsu7/+6qqo+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYE
-FJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
-BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByvMiPIs0laUZx2
-KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
-Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B
-8OWycvpEgjNC6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQ
-MKSOyARiqcTtNd56l+0OOF6SL5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc
-0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK+4w1IX2COPKpVJEZNZOUbWo6xbLQ
-u4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmVBtWVyuEklut89pMF
-u+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFgIxpH
-YoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8
-GKa1qF60g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaO
-RtGdFNrHF+QFlozEJLUbzxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6e
-KeC2uAloGRwYQw==
------END CERTIFICATE-----
-
-# Issuer: CN=AffirmTrust Premium ECC O=AffirmTrust
-# Subject: CN=AffirmTrust Premium ECC O=AffirmTrust
-# Label: "AffirmTrust Premium ECC"
-# Serial: 8401224907861490260
-# MD5 Fingerprint: 64:b0:09:55:cf:b1:d5:99:e2:be:13:ab:a6:5d:ea:4d
-# SHA1 Fingerprint: b8:23:6b:00:2f:1d:16:86:53:01:55:6c:11:a4:37:ca:eb:ff:c3:bb
-# SHA256 Fingerprint: bd:71:fd:f6:da:97:e4:cf:62:d1:64:7a:dd:25:81:b0:7d:79:ad:f8:39:7e:b4:ec:ba:9c:5e:84:88:82:14:23
------BEGIN CERTIFICATE-----
-MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMC
-VVMxFDASBgNVBAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQ
-cmVtaXVtIEVDQzAeFw0xMDAxMjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJ
-BgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEgMB4GA1UEAwwXQWZmaXJt
-VHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNMF4bFZ0D
-0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQN8O9
-ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0G
-A1UdDgQWBBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4G
-A1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/Vs
-aobgxCd05DhT1wV/GzTjxi+zygk8N53X57hG8f2h4nECMEJZh0PUUd+60wkyWs6I
-flc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKMeQ==
------END CERTIFICATE-----
-
-# Issuer: CN=Certum Trusted Network CA O=Unizeto Technologies S.A. OU=Certum Certification Authority
-# Subject: CN=Certum Trusted Network CA O=Unizeto Technologies S.A. OU=Certum Certification Authority
-# Label: "Certum Trusted Network CA"
-# Serial: 279744
-# MD5 Fingerprint: d5:e9:81:40:c5:18:69:fc:46:2c:89:75:62:0f:aa:78
-# SHA1 Fingerprint: 07:e0:32:e0:20:b7:2c:3f:19:2f:06:28:a2:59:3a:19:a7:0f:06:9e
-# SHA256 Fingerprint: 5c:58:46:8d:55:f5:8e:49:7e:74:39:82:d2:b5:00:10:b6:d1:65:37:4a:cf:83:a7:d4:a3:2d:b7:68:c4:40:8e
------BEGIN CERTIFICATE-----
-MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBM
-MSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5D
-ZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBU
-cnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIyMTIwNzM3WhcNMjkxMjMxMTIwNzM3
-WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMg
-Uy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSIw
-IAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rH
-UV+rpDKmYYe2bg+G0jACl/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LM
-TXPb865Px1bVWqeWifrzq2jUI4ZZJ88JJ7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVU
-BBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4fOQtf/WsX+sWn7Et0brM
-kUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0cvW0QM8x
-AcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNV
-HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15y
-sHhE49wcrwn9I0j6vSrEuVUEtRCjjSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfL
-I9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1mS1FhIrlQgnXdAIv94nYmem8
-J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5ajZt3hrvJBW8qY
-VoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
-03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
------END CERTIFICATE-----
-
-# Issuer: CN=TWCA Root Certification Authority O=TAIWAN-CA OU=Root CA
-# Subject: CN=TWCA Root Certification Authority O=TAIWAN-CA OU=Root CA
-# Label: "TWCA Root Certification Authority"
-# Serial: 1
-# MD5 Fingerprint: aa:08:8f:f6:f9:7b:b7:f2:b1:a7:1e:9b:ea:ea:bd:79
-# SHA1 Fingerprint: cf:9e:87:6d:d3:eb:fc:42:26:97:a3:b5:a3:7a:a0:76:a9:06:23:48
-# SHA256 Fingerprint: bf:d8:8f:e1:10:1c:41:ae:3e:80:1b:f8:be:56:35:0e:e9:ba:d1:a6:b9:bd:51:5e:dc:5c:6d:5b:87:11:ac:44
------BEGIN CERTIFICATE-----
-MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzES
-MBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFU
-V0NBIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMz
-WhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJVEFJV0FO
-LUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlm
-aWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFE
-AcK0HMMxQhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HH
-K3XLfJ+utdGdIzdjp9xCoi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeX
-RfwZVzsrb+RH9JlF/h3x+JejiB03HFyP4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/z
-rX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1ry+UPizgN7gr8/g+YnzAx
-3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkq
-hkiG9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeC
-MErJk/9q56YAf4lCmtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdls
-XebQ79NqZp4VKIV66IIArB6nCWlWQtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62D
-lhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVYT0bf+215WfKEIlKuD8z7fDvn
-aspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocnyYh0igzyXxfkZ
-YiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
------END CERTIFICATE-----
-
-# Issuer: O=SECOM Trust Systems CO.,LTD. OU=Security Communication RootCA2
-# Subject: O=SECOM Trust Systems CO.,LTD. OU=Security Communication RootCA2
-# Label: "Security Communication RootCA2"
-# Serial: 0
-# MD5 Fingerprint: 6c:39:7d:a4:0e:55:59:b2:3f:d6:41:b1:12:50:de:43
-# SHA1 Fingerprint: 5f:3b:8c:f2:f8:10:b3:7d:78:b4:ce:ec:19:19:c3:73:34:b9:c7:74
-# SHA256 Fingerprint: 51:3b:2c:ec:b8:10:d4:cd:e5:dd:85:39:1a:df:c6:c2:dd:60:d8:7b:b7:36:d2:b5:21:48:4a:a4:7a:0e:be:f6
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDEl
-MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMe
-U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoX
-DTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRy
-dXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3VyaXR5IENvbW11bmlj
-YXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAV
-OVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGr
-zbl+dp+++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVM
-VAX3NuRFg3sUZdbcDE3R3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQ
-hNBqyjoGADdH5H5XTz+L62e4iKrFvlNVspHEfbmwhRkGeC7bYRr6hfVKkaHnFtWO
-ojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1KEOtOghY6rCcMU/Gt1SSw
-awNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8QIH4D5cs
-OPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
-DQEBCwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpF
-coJxDjrSzG+ntKEju/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXc
-okgfGT+Ok+vx+hfuzU7jBBJV1uXk3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8
-t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6qtnRGEmyR7jTV7JqR50S+kDFy
-1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29mvVXIwAHIRc/
-SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
------END CERTIFICATE-----
-
-# Issuer: CN=Actalis Authentication Root CA O=Actalis S.p.A./03358520967
-# Subject: CN=Actalis Authentication Root CA O=Actalis S.p.A./03358520967
-# Label: "Actalis Authentication Root CA"
-# Serial: 6271844772424770508
-# MD5 Fingerprint: 69:c1:0d:4f:07:a3:1b:c3:fe:56:3d:04:bc:11:f6:a6
-# SHA1 Fingerprint: f3:73:b3:87:06:5a:28:84:8a:f2:f3:4a:ce:19:2b:dd:c7:8e:9c:ac
-# SHA256 Fingerprint: 55:92:60:84:ec:96:3a:64:b9:6e:2a:be:01:ce:0b:a8:6a:64:fb:fe:bc:c7:aa:b5:af:c1:55:b3:7f:d7:60:66
------BEGIN CERTIFICATE-----
-MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UE
-BhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8w
-MzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
-IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDkyMjExMjIwMlowazELMAkGA1UEBhMC
-SVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1
-ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENB
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNv
-UTufClrJwkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX
-4ay8IMKx4INRimlNAJZaby/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9
-KK3giq0itFZljoZUj5NDKd45RnijMCO6zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/
-gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1fYVEiVRvjRuPjPdA1Yprb
-rxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2oxgkg4YQ
-51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2F
-be8lEfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxe
-KF+w6D9Fz8+vm2/7hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4F
-v6MGn8i1zeQf1xcGDXqVdFUNaBr8EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbn
-fpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5jF66CyCU3nuDuP/jVo23Eek7
-jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLYiDrIn3hm7Ynz
-ezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
-ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQAL
-e3KHwGCmSUyIWOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70
-jsNjLiNmsGe+b7bAEzlgqqI0JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDz
-WochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKxK3JCaKygvU5a2hi/a5iB0P2avl4V
-SM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+Xlff1ANATIGk0k9j
-pwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC4yyX
-X04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+Ok
-fcvHlXHo2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7R
-K4X9p2jIugErsWx0Hbhzlefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btU
-ZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXemOR/qnuOf0GZvBeyqdn6/axag67XH/JJU
-LysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9vwGYT7JZVEc+NHt4bVaT
-LnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
------END CERTIFICATE-----
-
-# Issuer: CN=Buypass Class 2 Root CA O=Buypass AS-983163327
-# Subject: CN=Buypass Class 2 Root CA O=Buypass AS-983163327
-# Label: "Buypass Class 2 Root CA"
-# Serial: 2
-# MD5 Fingerprint: 46:a7:d2:fe:45:fb:64:5a:a8:59:90:9b:78:44:9b:29
-# SHA1 Fingerprint: 49:0a:75:74:de:87:0a:47:fe:58:ee:f6:c7:6b:eb:c6:0b:12:40:99
-# SHA256 Fingerprint: 9a:11:40:25:19:7c:5b:b9:5d:94:e6:3d:55:cd:43:79:08:47:b6:46:b2:3c:df:11:ad:a4:a0:0e:ff:15:fb:48
------BEGIN CERTIFICATE-----
-MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
-MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
-Q2xhc3MgMiBSb290IENBMB4XDTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1ow
-TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
-HgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
-BQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1g1Lr
-6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPV
-L4O2fuPn9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC91
-1K2GScuVr1QGbNgGE41b/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHx
-MlAQTn/0hpPshNOOvEu/XAFOBz3cFIqUCqTqc/sLUegTBxj6DvEr0VQVfTzh97QZ
-QmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeffawrbD02TTqigzXsu8lkB
-arcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgIzRFo1clr
-Us3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLi
-FRhnBkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRS
-P/TizPJhk9H9Z2vXUq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN
-9SG9dKpN6nIDSdvHXx1iY8f93ZHsM+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxP
-AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMmAd+BikoL1Rpzz
-uvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAU18h
-9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
-A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3t
-OluwlN5E40EIosHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo
-+fsicdl9sz1Gv7SEr5AcD48Saq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7
-KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYdDnkM/crqJIByw5c/8nerQyIKx+u2
-DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWDLfJ6v9r9jv6ly0Us
-H8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0oyLQ
-I+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK7
-5t98biGCwWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h
-3PFaTWwyI0PurKju7koSCTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPz
-Y11aWOIv4x3kqdbQCtCev9eBCfHJxyYNrJgWVqA=
------END CERTIFICATE-----
-
-# Issuer: CN=Buypass Class 3 Root CA O=Buypass AS-983163327
-# Subject: CN=Buypass Class 3 Root CA O=Buypass AS-983163327
-# Label: "Buypass Class 3 Root CA"
-# Serial: 2
-# MD5 Fingerprint: 3d:3b:18:9e:2c:64:5a:e8:d5:88:ce:0e:f9:37:c2:ec
-# SHA1 Fingerprint: da:fa:f7:fa:66:84:ec:06:8f:14:50:bd:c7:c2:81:a5:bc:a9:64:57
-# SHA256 Fingerprint: ed:f7:eb:bc:a2:7a:2a:38:4d:38:7b:7d:40:10:c6:66:e2:ed:b4:84:3e:4c:29:b4:ae:1d:5b:93:32:e6:b2:4d
------BEGIN CERTIFICATE-----
-MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
-MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
-Q2xhc3MgMyBSb290IENBMB4XDTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFow
-TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
-HgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
-BQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRHsJ8Y
-ZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3E
-N3coTRiR5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9
-tznDDgFHmV0ST9tD+leh7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX
-0DJq1l1sDPGzbjniazEuOQAnFN44wOwZZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c
-/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH2xc519woe2v1n/MuwU8X
-KhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV/afmiSTY
-zIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvS
-O1UQRwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D
-34xFMFbG02SrZvPAXpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgP
-K9Dx2hzLabjKSWJtyNBjYt1gD1iqj6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3
-AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFEe4zf/lb+74suwv
-Tg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAACAj
-QTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
-cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXS
-IGrs/CIBKM+GuIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2
-HJLw5QY33KbmkJs4j1xrG0aGQ0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsa
-O5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8ZORK15FTAaggiG6cX0S5y2CBNOxv
-033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2KSb12tjE8nVhz36u
-dmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz6MkE
-kbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg41
-3OEMXbugUZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvD
-u79leNKGef9JOxqDDPDeeOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq
-4/g7u9xN12TyUb7mqqta6THuBrxzvxNiCp/HuZc=
------END CERTIFICATE-----
-
-# Issuer: CN=T-TeleSec GlobalRoot Class 3 O=T-Systems Enterprise Services GmbH OU=T-Systems Trust Center
-# Subject: CN=T-TeleSec GlobalRoot Class 3 O=T-Systems Enterprise Services GmbH OU=T-Systems Trust Center
-# Label: "T-TeleSec GlobalRoot Class 3"
-# Serial: 1
-# MD5 Fingerprint: ca:fb:40:a8:4e:39:92:8a:1d:fe:8e:2f:c4:27:ea:ef
-# SHA1 Fingerprint: 55:a6:72:3e:cb:f2:ec:cd:c3:23:74:70:19:9d:2a:be:11:e3:81:d1
-# SHA256 Fingerprint: fd:73:da:d3:1c:64:4f:f1:b4:3b:ef:0c:cd:da:96:71:0b:9c:d9:87:5e:ca:7e:31:70:7a:f3:e9:6d:52:2b:bd
------BEGIN CERTIFICATE-----
-MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUx
-KzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAd
-BgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNl
-YyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgxMDAxMTAyOTU2WhcNMzMxMDAxMjM1
-OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnBy
-aXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50
-ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN
-8ELg63iIVl6bmlQdTQyK9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/
-RLyTPWGrTs0NvvAgJ1gORH8EGoel15YUNpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4
-hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZFiP0Zf3WHHx+xGwpzJFu5
-ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W0eDrXltM
-EnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGj
-QjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1
-A/d2O2GCahKqGFPrAyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOy
-WL6ukK2YJ5f+AbGwUgC4TeQbIXQbfsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ
-1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzTucpH9sry9uetuUg/vBa3wW30
-6gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7hP0HHRwA11fXT
-91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
-e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4p
-TpPDpFQUWw==
------END CERTIFICATE-----
-
-# Issuer: CN=D-TRUST Root Class 3 CA 2 2009 O=D-Trust GmbH
-# Subject: CN=D-TRUST Root Class 3 CA 2 2009 O=D-Trust GmbH
-# Label: "D-TRUST Root Class 3 CA 2 2009"
-# Serial: 623603
-# MD5 Fingerprint: cd:e0:25:69:8d:47:ac:9c:89:35:90:f7:fd:51:3d:2f
-# SHA1 Fingerprint: 58:e8:ab:b0:36:15:33:fb:80:f7:9b:1b:6d:29:d3:ff:8d:5f:00:f0
-# SHA256 Fingerprint: 49:e7:a4:42:ac:f0:ea:62:87:05:00:54:b5:25:64:b6:50:e4:f4:9e:42:e3:48:d6:aa:38:e0:39:e9:57:b1:c1
------BEGIN CERTIFICATE-----
-MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRF
-MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBD
-bGFzcyAzIENBIDIgMjAwOTAeFw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NTha
-ME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMM
-HkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOADER03
-UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42
-tSHKXzlABF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9R
-ySPocq60vFYJfxLLHLGvKZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsM
-lFqVlNpQmvH/pStmMaTJOKDfHR+4CS7zp+hnUquVH+BGPtikw8paxTGA6Eian5Rp
-/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUCAwEAAaOCARowggEWMA8G
-A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ4PGEMA4G
-A1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVj
-dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUy
-MENBJTIwMiUyMDIwMDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRl
-cmV2b2NhdGlvbmxpc3QwQ6BBoD+GPWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3Js
-L2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAwOS5jcmwwDQYJKoZIhvcNAQEL
-BQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm2H6NMLVwMeni
-acfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
-o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4K
-zCUqNQT4YJEVdT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8
-PIWmawomDeCTmGCufsYkl4phX5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3Y
-Johw1+qRzT65ysCQblrGXnRl11z+o+I=
------END CERTIFICATE-----
-
-# Issuer: CN=D-TRUST Root Class 3 CA 2 EV 2009 O=D-Trust GmbH
-# Subject: CN=D-TRUST Root Class 3 CA 2 EV 2009 O=D-Trust GmbH
-# Label: "D-TRUST Root Class 3 CA 2 EV 2009"
-# Serial: 623604
-# MD5 Fingerprint: aa:c6:43:2c:5e:2d:cd:c4:34:c0:50:4f:11:02:4f:b6
-# SHA1 Fingerprint: 96:c9:1b:0b:95:b4:10:98:42:fa:d0:d8:22:79:fe:60:fa:b9:16:83
-# SHA256 Fingerprint: ee:c5:49:6b:98:8c:e9:86:25:b9:34:09:2e:ec:29:08:be:d0:b0:f3:16:c2:d4:73:0c:84:ea:f1:f3:d3:48:81
------BEGIN CERTIFICATE-----
-MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRF
-MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBD
-bGFzcyAzIENBIDIgRVYgMjAwOTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUw
-NDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNV
-BAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAwOTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfSegpn
-ljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM0
-3TP1YtHhzRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6Z
-qQTMFexgaDbtCHu39b+T7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lR
-p75mpoo6Kr3HGrHhFPC+Oh25z1uxav60sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8
-HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure3511H3a6UCAwEAAaOCASQw
-ggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyvcop9Ntea
-HNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFw
-Oi8vZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xh
-c3MlMjAzJTIwQ0ElMjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1E
-RT9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0MEagRKBChkBodHRwOi8vd3d3LmQt
-dHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xhc3NfM19jYV8yX2V2XzIwMDku
-Y3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+PPoeUSbrh/Yp
-3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
-nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNF
-CSuGdXzfX2lXANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7na
-xpeG0ILD5EJt/rDiZE4OJudANCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqX
-KVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVvw9y4AyHqnxbxLFS1
------END CERTIFICATE-----
-
-# Issuer: CN=CA Disig Root R2 O=Disig a.s.
-# Subject: CN=CA Disig Root R2 O=Disig a.s.
-# Label: "CA Disig Root R2"
-# Serial: 10572350602393338211
-# MD5 Fingerprint: 26:01:fb:d8:27:a7:17:9a:45:54:38:1a:43:01:3b:03
-# SHA1 Fingerprint: b5:61:eb:ea:a4:de:e4:25:4b:69:1a:98:a5:57:47:c2:34:c7:d9:71
-# SHA256 Fingerprint: e2:3d:4a:03:6d:7b:70:e9:f5:95:b1:42:20:79:d2:b9:1e:df:bb:1f:b6:51:a0:63:3e:aa:8a:9d:c5:f8:07:03
------BEGIN CERTIFICATE-----
-MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNV
-BAYTAlNLMRMwEQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMu
-MRkwFwYDVQQDExBDQSBEaXNpZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQy
-MDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sxEzARBgNVBAcTCkJyYXRpc2xhdmEx
-EzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERpc2lnIFJvb3QgUjIw
-ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbCw3Oe
-NcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNH
-PWSb6WiaxswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3I
-x2ymrdMxp7zo5eFm1tL7A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbe
-QTg06ov80egEFGEtQX6sx3dOy1FU+16SGBsEWmjGycT6txOgmLcRK7fWV8x8nhfR
-yyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqVg8NTEQxzHQuyRpDRQjrO
-QG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa5Beny912
-H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJ
-QfYEkoopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUD
-i/ZnWejBBhG93c+AAk9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORs
-nLMOPReisjQS1n6yqEm70XooQL6iFh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1
-rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
-DwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5uQu0wDQYJKoZI
-hvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
-tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqf
-GopTpti72TVVsRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkb
-lvdhuDvEK7Z4bLQjb/D907JedR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka
-+elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W81k/BfDxujRNt+3vrMNDcTa/F1bal
-TFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjxmHHEt38OFdAlab0i
-nSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01utI3
-gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18Dr
-G5gPcFw0sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3Os
-zMOl6W8KjptlwlCFtaOgUxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8x
-L4ysEr3vQCj8KWefshNPZiTEUxnpHikV7+ZtsH8tZ/3zbBt1RqPlShfppNcL
------END CERTIFICATE-----
-
-# Issuer: CN=ACCVRAIZ1 O=ACCV OU=PKIACCV
-# Subject: CN=ACCVRAIZ1 O=ACCV OU=PKIACCV
-# Label: "ACCVRAIZ1"
-# Serial: 6828503384748696800
-# MD5 Fingerprint: d0:a0:5a:ee:05:b6:09:94:21:a1:7d:f1:b2:29:82:02
-# SHA1 Fingerprint: 93:05:7a:88:15:c6:4f:ce:88:2f:fa:91:16:52:28:78:bc:53:64:17
-# SHA256 Fingerprint: 9a:6e:c0:12:e1:a7:da:9d:be:34:19:4d:47:8a:d7:c0:db:18:22:fb:07:1d:f1:29:81:49:6e:d1:04:38:41:13
------BEGIN CERTIFICATE-----
-MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UE
-AwwJQUNDVlJBSVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQsw
-CQYDVQQGEwJFUzAeFw0xMTA1MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQ
-BgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwHUEtJQUNDVjENMAsGA1UECgwEQUND
-VjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCb
-qau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gMjmoY
-HtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWo
-G2ioPej0RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpA
-lHPrzg5XPAOBOp0KoVdDaaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhr
-IA8wKFSVf+DuzgpmndFALW4ir50awQUZ0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/
-0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDGWuzndN9wrqODJerWx5eH
-k6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs78yM2x/47
-4KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMO
-m3WR5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpa
-cXpkatcnYGMN285J9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPl
-uUsXQA+xtrn13k/c4LOsOxFwYIRKQ26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYI
-KwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRwOi8vd3d3LmFjY3YuZXMvZmls
-ZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEuY3J0MB8GCCsG
-AQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
-VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeT
-VfZW6oHlNsyMHj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIG
-CCsGAQUFBwICMIIBFB6CARAAQQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUA
-cgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBhAO0AegAgAGQAZQAgAGwAYQAgAEEA
-QwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUAYwBuAG8AbABvAGcA
-7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBjAHQA
-cgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAA
-QwBQAFMAIABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUA
-czAwBggrBgEFBQcCARYkaHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2Mu
-aHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRt
-aW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2MV9kZXIuY3JsMA4GA1Ud
-DwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZIhvcNAQEF
-BQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdp
-D70ER9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gU
-JyCpZET/LtZ1qmxNYEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+m
-AM/EKXMRNt6GGT6d7hmKG9Ww7Y49nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepD
-vV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJTS+xJlsndQAJxGJ3KQhfnlms
-tn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3sCPdK6jT2iWH
-7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
-I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szA
-h1xA2syVP1XgNce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xF
-d3+YJ5oyXSrjhO7FmGYvliAd3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2H
-pPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3pEfbRD0tVNEYqi4Y7
------END CERTIFICATE-----
-
-# Issuer: CN=TWCA Global Root CA O=TAIWAN-CA OU=Root CA
-# Subject: CN=TWCA Global Root CA O=TAIWAN-CA OU=Root CA
-# Label: "TWCA Global Root CA"
-# Serial: 3262
-# MD5 Fingerprint: f9:03:7e:cf:e6:9e:3c:73:7a:2a:90:07:69:ff:2b:96
-# SHA1 Fingerprint: 9c:bb:48:53:f6:a4:f6:d3:52:a4:e8:32:52:55:60:13:f5:ad:af:65
-# SHA256 Fingerprint: 59:76:90:07:f7:68:5d:0f:cd:50:87:2f:9f:95:d5:75:5a:5b:2b:45:7d:81:f3:69:2b:61:0a:98:67:2f:0e:1b
------BEGIN CERTIFICATE-----
-MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcx
-EjAQBgNVBAoTCVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMT
-VFdDQSBHbG9iYWwgUm9vdCBDQTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5
-NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQKEwlUQUlXQU4tQ0ExEDAOBgNVBAsT
-B1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3QgQ0EwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2CnJfF
-10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz
-0ALfUPZVr2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfCh
-MBwqoJimFb3u/Rk28OKRQ4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbH
-zIh1HrtsBv+baz4X7GGqcXzGHaL3SekVtTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc
-46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1WKKD+u4ZqyPpcC1jcxkt2
-yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99sy2sbZCi
-laLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYP
-oA/pyJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQA
-BDzfuBSO6N+pjWxnkjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcE
-qYSjMq+u7msXi7Kx/mzhkIyIqJdIzshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm
-4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
-/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6gcFGn90xHNcgL
-1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
-LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WF
-H6vPNOw/KP4M8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNo
-RI2T9GRwoD2dKAXDOXC4Ynsg/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+
-nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlglPx4mI88k1HtQJAH32RjJMtOcQWh
-15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryPA9gK8kxkRr05YuWW
-6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3mi4TW
-nsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5j
-wa19hAM8EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWz
-aGHQRiapIVJpLesux+t3zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmy
-KwbQBM0=
------END CERTIFICATE-----
-
-# Issuer: CN=TeliaSonera Root CA v1 O=TeliaSonera
-# Subject: CN=TeliaSonera Root CA v1 O=TeliaSonera
-# Label: "TeliaSonera Root CA v1"
-# Serial: 199041966741090107964904287217786801558
-# MD5 Fingerprint: 37:41:49:1b:18:56:9a:26:f5:ad:c2:66:fb:40:a5:4c
-# SHA1 Fingerprint: 43:13:bb:96:f1:d5:86:9b:c1:4e:6a:92:f6:cf:f6:34:69:87:82:37
-# SHA256 Fingerprint: dd:69:36:fe:21:f8:f0:77:c1:23:a1:a5:21:c1:22:24:f7:22:55:b7:3e:03:a7:26:06:93:e8:a2:4b:0f:a3:89
------BEGIN CERTIFICATE-----
-MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAw
-NzEUMBIGA1UECgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJv
-b3QgQ0EgdjEwHhcNMDcxMDE4MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYD
-VQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwWVGVsaWFTb25lcmEgUm9vdCBDQSB2
-MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+6yfwIaPzaSZVfp3F
-VRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA3GV1
-7CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+X
-Z75Ljo1kB1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+
-/jXh7VB7qTCNGdMJjmhnXb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs
-81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxHoLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkm
-dtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3F0fUTPHSiXk+TT2YqGHe
-Oh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJoWjiUIMu
-sDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4
-pgd7gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fs
-slESl1MpWtTwEhDcTwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQ
-arMCpgKIv7NHfirZ1fpoeDVNAgMBAAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYD
-VR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qWDNXr+nuqF+gTEjANBgkqhkiG
-9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNmzqjMDfz1mgbl
-dxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx
-0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1Tj
-TQpgcmLNkQfWpb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBed
-Y2gea+zDTYa4EzAvXUYNR0PVG6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7
-Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpcc41teyWRyu5FrgZLAMzTsVlQ2jqI
-OylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOTJsjrDNYmiLbAJM+7
-vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2qReW
-t88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcn
-HL/EVlP6Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVx
-SK236thZiNSQvxaz2emsWWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY=
------END CERTIFICATE-----
-
-# Issuer: CN=T-TeleSec GlobalRoot Class 2 O=T-Systems Enterprise Services GmbH OU=T-Systems Trust Center
-# Subject: CN=T-TeleSec GlobalRoot Class 2 O=T-Systems Enterprise Services GmbH OU=T-Systems Trust Center
-# Label: "T-TeleSec GlobalRoot Class 2"
-# Serial: 1
-# MD5 Fingerprint: 2b:9b:9e:e4:7b:6c:1f:00:72:1a:cc:c1:77:79:df:6a
-# SHA1 Fingerprint: 59:0d:2d:7d:88:4f:40:2e:61:7e:a5:62:32:17:65:cf:17:d8:94:e9
-# SHA256 Fingerprint: 91:e2:f5:78:8d:58:10:eb:a7:ba:58:73:7d:e1:54:8a:8e:ca:cd:01:45:98:bc:0b:14:3e:04:1b:17:05:25:52
------BEGIN CERTIFICATE-----
-MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUx
-KzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAd
-BgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNl
-YyBHbG9iYWxSb290IENsYXNzIDIwHhcNMDgxMDAxMTA0MDE0WhcNMzMxMDAxMjM1
-OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnBy
-aXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50
-ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqX9obX+hzkeXaXPSi5kfl82hVYAUd
-AqSzm1nzHoqvNK38DcLZSBnuaY/JIPwhqgcZ7bBcrGXHX+0CfHt8LRvWurmAwhiC
-FoT6ZrAIxlQjgeTNuUk/9k9uN0goOA/FvudocP05l03Sx5iRUKrERLMjfTlH6VJi
-1hKTXrcxlkIF+3anHqP1wvzpesVsqXFP6st4vGCvx9702cu+fjOlbpSD8DT6Iavq
-jnKgP6TeMFvvhk1qlVtDRKgQFRzlAVfFmPHmBiiRqiDFt1MmUUOyCxGVWOHAD3bZ
-wI18gfNycJ5v/hqO2V81xrJvNHy+SE/iWjnX2J14np+GPgNeGYtEotXHAgMBAAGj
-QjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS/
-WSA2AHmgoCJrjNXyYdK4LMuCSjANBgkqhkiG9w0BAQsFAAOCAQEAMQOiYQsfdOhy
-NsZt+U2e+iKo4YFWz827n+qrkRk4r6p8FU3ztqONpfSO9kSpp+ghla0+AGIWiPAC
-uvxhI+YzmzB6azZie60EI4RYZeLbK4rnJVM3YlNfvNoBYimipidx5joifsFvHZVw
-IEoHNN/q/xWA5brXethbdXwFeilHfkCoMRN3zUA7tFFHei4R40cR3p1m0IvVVGb6
-g1XqfMIpiRvpb7PO4gWEyS8+eIVibslfwXhjdFjASBgMmTnrpMwatXlajRWc2BQN
-9noHV8cigwUtPJslJj0Ys6lDfMjIq2SPDqO/nBudMNva0Bkuqjzx+zOAduTNrRlP
-BSeOE6Fuwg==
------END CERTIFICATE-----
-
-# Issuer: CN=Atos TrustedRoot 2011 O=Atos
-# Subject: CN=Atos TrustedRoot 2011 O=Atos
-# Label: "Atos TrustedRoot 2011"
-# Serial: 6643877497813316402
-# MD5 Fingerprint: ae:b9:c4:32:4b:ac:7f:5d:66:cc:77:94:bb:2a:77:56
-# SHA1 Fingerprint: 2b:b1:f5:3e:55:0c:1d:c5:f1:d4:e6:b7:6a:46:4b:55:06:02:ac:21
-# SHA256 Fingerprint: f3:56:be:a2:44:b7:a9:1e:b3:5d:53:ca:9a:d7:86:4a:ce:01:8e:2d:35:d5:f8:f9:6d:df:68:a6:f4:1a:a4:74
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIIXDPLYixfszIwDQYJKoZIhvcNAQELBQAwPDEeMBwGA1UE
-AwwVQXRvcyBUcnVzdGVkUm9vdCAyMDExMQ0wCwYDVQQKDARBdG9zMQswCQYDVQQG
-EwJERTAeFw0xMTA3MDcxNDU4MzBaFw0zMDEyMzEyMzU5NTlaMDwxHjAcBgNVBAMM
-FUF0b3MgVHJ1c3RlZFJvb3QgMjAxMTENMAsGA1UECgwEQXRvczELMAkGA1UEBhMC
-REUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCVhTuXbyo7LjvPpvMp
-Nb7PGKw+qtn4TaA+Gke5vJrf8v7MPkfoepbCJI419KkM/IL9bcFyYie96mvr54rM
-VD6QUM+A1JX76LWC1BTFtqlVJVfbsVD2sGBkWXppzwO3bw2+yj5vdHLqqjAqc2K+
-SZFhyBH+DgMq92og3AIVDV4VavzjgsG1xZ1kCWyjWZgHJ8cblithdHFsQ/H3NYkQ
-4J7sVaE3IqKHBAUsR320HLliKWYoyrfhk/WklAOZuXCFteZI6o1Q/NnezG8HDt0L
-cp2AMBYHlT8oDv3FdU9T1nSatCQujgKRz3bFmx5VdJx4IbHwLfELn8LVlhgf8FQi
-eowHAgMBAAGjfTB7MB0GA1UdDgQWBBSnpQaxLKYJYO7Rl+lwrrw7GWzbITAPBgNV
-HRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKelBrEspglg7tGX6XCuvDsZbNshMBgG
-A1UdIAQRMA8wDQYLKwYBBAGwLQMEAQEwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3
-DQEBCwUAA4IBAQAmdzTblEiGKkGdLD4GkGDEjKwLVLgfuXvTBznk+j57sj1O7Z8j
-vZfza1zv7v1Apt+hk6EKhqzvINB5Ab149xnYJDE0BAGmuhWawyfc2E8PzBhj/5kP
-DpFrdRbhIfzYJsdHt6bPWHJxfrrhTZVHO8mvbaG0weyJ9rQPOLXiZNwlz6bb65pc
-maHFCN795trV1lpFDMS3wrUU77QR/w4VtfX128a961qn8FYiqTxlVMYVqL2Gns2D
-lmh6cYGJ4Qvh6hEbaAjMaZ7snkGeRDImeuKHCnE96+RapNLbxc3G3mB/ufNPRJLv
-KrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed
------END CERTIFICATE-----
-
-# Issuer: CN=QuoVadis Root CA 1 G3 O=QuoVadis Limited
-# Subject: CN=QuoVadis Root CA 1 G3 O=QuoVadis Limited
-# Label: "QuoVadis Root CA 1 G3"
-# Serial: 687049649626669250736271037606554624078720034195
-# MD5 Fingerprint: a4:bc:5b:3f:fe:37:9a:fa:64:f0:e2:fa:05:3d:0b:ab
-# SHA1 Fingerprint: 1b:8e:ea:57:96:29:1a:c9:39:ea:b8:0a:81:1a:73:73:c0:93:79:67
-# SHA256 Fingerprint: 8a:86:6f:d1:b2:76:b5:7e:57:8e:92:1c:65:82:8a:2b:ed:58:e9:f2:f2:88:05:41:34:b7:f1:f4:bf:c9:cc:74
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQEL
-BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
-BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMSBHMzAeFw0xMjAxMTIxNzI3NDRaFw00
-MjAxMTIxNzI3NDRaMEgxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDEgRzMwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQCgvlAQjunybEC0BJyFuTHK3C3kEakEPBtV
-wedYMB0ktMPvhd6MLOHBPd+C5k+tR4ds7FtJwUrVu4/sh6x/gpqG7D0DmVIB0jWe
-rNrwU8lmPNSsAgHaJNM7qAJGr6Qc4/hzWHa39g6QDbXwz8z6+cZM5cOGMAqNF341
-68Xfuw6cwI2H44g4hWf6Pser4BOcBRiYz5P1sZK0/CPTz9XEJ0ngnjybCKOLXSoh
-4Pw5qlPafX7PGglTvF0FBM+hSo+LdoINofjSxxR3W5A2B4GbPgb6Ul5jxaYA/qXp
-UhtStZI5cgMJYr2wYBZupt0lwgNm3fME0UDiTouG9G/lg6AnhF4EwfWQvTA9xO+o
-abw4m6SkltFi2mnAAZauy8RRNOoMqv8hjlmPSlzkYZqn0ukqeI1RPToV7qJZjqlc
-3sX5kCLliEVx3ZGZbHqfPT2YfF72vhZooF6uCyP8Wg+qInYtyaEQHeTTRCOQiJ/G
-KubX9ZqzWB4vMIkIG1SitZgj7Ah3HJVdYdHLiZxfokqRmu8hqkkWCKi9YSgxyXSt
-hfbZxbGL0eUQMk1fiyA6PEkfM4VZDdvLCXVDaXP7a3F98N/ETH3Goy7IlXnLc6KO
-Tk0k+17kBL5yG6YnLUlamXrXXAkgt3+UuU/xDRxeiEIbEbfnkduebPRq34wGmAOt
-zCjvpUfzUwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
-BjAdBgNVHQ4EFgQUo5fW816iEOGrRZ88F2Q87gFwnMwwDQYJKoZIhvcNAQELBQAD
-ggIBABj6W3X8PnrHX3fHyt/PX8MSxEBd1DKquGrX1RUVRpgjpeaQWxiZTOOtQqOC
-MTaIzen7xASWSIsBx40Bz1szBpZGZnQdT+3Btrm0DWHMY37XLneMlhwqI2hrhVd2
-cDMT/uFPpiN3GPoajOi9ZcnPP/TJF9zrx7zABC4tRi9pZsMbj/7sPtPKlL92CiUN
-qXsCHKnQO18LwIE6PWThv6ctTr1NxNgpxiIY0MWscgKCP6o6ojoilzHdCGPDdRS5
-YCgtW2jgFqlmgiNR9etT2DGbe+m3nUvriBbP+V04ikkwj+3x6xn0dxoxGE1nVGwv
-b2X52z3sIexe9PSLymBlVNFxZPT5pqOBMzYzcfCkeF9OrYMh3jRJjehZrJ3ydlo2
-8hP0r+AJx2EqbPfgna67hkooby7utHnNkDPDs3b69fBsnQGQ+p6Q9pxyz0fawx/k
-NSBT8lTR32GDpgLiJTjehTItXnOQUl1CxM49S+H5GYQd1aJQzEH7QRTDvdbJWqNj
-ZgKAvQU6O0ec7AAmTPWIUb+oI38YB7AL7YsmoWTTYUrrXJ/es69nA7Mf3W1daWhp
-q1467HxpvMc7hU6eFbm0FU/DlXpY18ls6Wy58yljXrQs8C097Vpl4KlbQMJImYFt
-nh8GKjwStIsPm6Ik8KaN1nrgS7ZklmOVhMJKzRwuJIczYOXD
------END CERTIFICATE-----
-
-# Issuer: CN=QuoVadis Root CA 2 G3 O=QuoVadis Limited
-# Subject: CN=QuoVadis Root CA 2 G3 O=QuoVadis Limited
-# Label: "QuoVadis Root CA 2 G3"
-# Serial: 390156079458959257446133169266079962026824725800
-# MD5 Fingerprint: af:0c:86:6e:bf:40:2d:7f:0b:3e:12:50:ba:12:3d:06
-# SHA1 Fingerprint: 09:3c:61:f3:8b:8b:dc:7d:55:df:75:38:02:05:00:e1:25:f5:c8:36
-# SHA256 Fingerprint: 8f:e4:fb:0a:f9:3a:4d:0d:67:db:0b:eb:b2:3e:37:c7:1b:f3:25:dc:bc:dd:24:0e:a0:4d:af:58:b4:7e:18:40
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQEL
-BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
-BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00
-MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIgRzMwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFhZiFf
-qq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMW
-n4rjyduYNM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ym
-c5GQYaYDFCDy54ejiK2toIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+
-O7q414AB+6XrW7PFXmAqMaCvN+ggOp+oMiwMzAkd056OXbxMmO7FGmh77FOm6RQ1
-o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+lV0POKa2Mq1W/xPtbAd0j
-IaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZoL1NesNKq
-IcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz
-8eQQsSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43eh
-vNURG3YBZwjgQQvD6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l
-7ZizlWNof/k19N+IxWA1ksB8aRxhlRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALG
-cC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
-BjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZIhvcNAQELBQAD
-ggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
-AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RC
-roijQ1h5fq7KpVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0Ga
-W/ZZGYjeVYg3UQt4XAoeo0L9x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4n
-lv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgzdWqTHBLmYF5vHX/JHyPLhGGfHoJE
-+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6XU/IyAgkwo1jwDQHV
-csaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+NwmNtd
-dbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNg
-KCLjsZWDzYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeM
-HVOyToV7BjjHLPj4sHKNJeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4
-WSr2Rz0ZiC3oheGe7IUIarFsNMkd7EgrO3jtZsSOeWmD3n+M
------END CERTIFICATE-----
-
-# Issuer: CN=QuoVadis Root CA 3 G3 O=QuoVadis Limited
-# Subject: CN=QuoVadis Root CA 3 G3 O=QuoVadis Limited
-# Label: "QuoVadis Root CA 3 G3"
-# Serial: 268090761170461462463995952157327242137089239581
-# MD5 Fingerprint: df:7d:b9:ad:54:6f:68:a1:df:89:57:03:97:43:b0:d7
-# SHA1 Fingerprint: 48:12:bd:92:3c:a8:c4:39:06:e7:30:6d:27:96:e6:a4:cf:22:2e:7d
-# SHA256 Fingerprint: 88:ef:81:de:20:2e:b0:18:45:2e:43:f8:64:72:5c:ea:5f:bd:1f:c2:d9:d2:05:73:07:09:c5:d8:b8:69:0f:46
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIULvWbAiin23r/1aOp7r0DoM8Sah0wDQYJKoZIhvcNAQEL
-BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
-BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMyBHMzAeFw0xMjAxMTIyMDI2MzJaFw00
-MjAxMTIyMDI2MzJaMEgxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDMgRzMwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQCzyw4QZ47qFJenMioKVjZ/aEzHs286IxSR
-/xl/pcqs7rN2nXrpixurazHb+gtTTK/FpRp5PIpM/6zfJd5O2YIyC0TeytuMrKNu
-FoM7pmRLMon7FhY4futD4tN0SsJiCnMK3UmzV9KwCoWdcTzeo8vAMvMBOSBDGzXR
-U7Ox7sWTaYI+FrUoRqHe6okJ7UO4BUaKhvVZR74bbwEhELn9qdIoyhA5CcoTNs+c
-ra1AdHkrAj80//ogaX3T7mH1urPnMNA3I4ZyYUUpSFlob3emLoG+B01vr87ERROR
-FHAGjx+f+IdpsQ7vw4kZ6+ocYfx6bIrc1gMLnia6Et3UVDmrJqMz6nWB2i3ND0/k
-A9HvFZcba5DFApCTZgIhsUfei5pKgLlVj7WiL8DWM2fafsSntARE60f75li59wzw
-eyuxwHApw0BiLTtIadwjPEjrewl5qW3aqDCYz4ByA4imW0aucnl8CAMhZa634Ryl
-sSqiMd5mBPfAdOhx3v89WcyWJhKLhZVXGqtrdQtEPREoPHtht+KPZ0/l7DxMYIBp
-VzgeAVuNVejH38DMdyM0SXV89pgR6y3e7UEuFAUCf+D+IOs15xGsIs5XPd7JMG0Q
-A4XN8f+MFrXBsj6IbGB/kE+V9/YtrQE5BwT6dYB9v0lQ7e/JxHwc64B+27bQ3RP+
-ydOc17KXqQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
-BjAdBgNVHQ4EFgQUxhfQvKjqAkPyGwaZXSuQILnXnOQwDQYJKoZIhvcNAQELBQAD
-ggIBADRh2Va1EodVTd2jNTFGu6QHcrxfYWLopfsLN7E8trP6KZ1/AvWkyaiTt3px
-KGmPc+FSkNrVvjrlt3ZqVoAh313m6Tqe5T72omnHKgqwGEfcIHB9UqM+WXzBusnI
-FUBhynLWcKzSt/Ac5IYp8M7vaGPQtSCKFWGafoaYtMnCdvvMujAWzKNhxnQT5Wvv
-oxXqA/4Ti2Tk08HS6IT7SdEQTXlm66r99I0xHnAUrdzeZxNMgRVhvLfZkXdxGYFg
-u/BYpbWcC/ePIlUnwEsBbTuZDdQdm2NnL9DuDcpmvJRPpq3t/O5jrFc/ZSXPsoaP
-0Aj/uHYUbt7lJ+yreLVTubY/6CD50qi+YUbKh4yE8/nxoGibIh6BJpsQBJFxwAYf
-3KDTuVan45gtf4Od34wrnDKOMpTwATwiKp9Dwi7DmDkHOHv8XgBCH/MyJnmDhPbl
-8MFREsALHgQjDFSlTC9JxUrRtm5gDWv8a4uFJGS3iQ6rJUdbPM9+Sb3H6QrG2vd+
-DhcI00iX0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HN
-PlopNLk9hM6xZdRZkZFWdSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/
-ywaZWWDYWGWVjUTR939+J399roD1B0y2PpxxVJkES/1Y+Zj0
------END CERTIFICATE-----
-
-# Issuer: CN=DigiCert Assured ID Root G2 O=DigiCert Inc OU=www.digicert.com
-# Subject: CN=DigiCert Assured ID Root G2 O=DigiCert Inc OU=www.digicert.com
-# Label: "DigiCert Assured ID Root G2"
-# Serial: 15385348160840213938643033620894905419
-# MD5 Fingerprint: 92:38:b9:f8:63:24:82:65:2c:57:33:e6:fe:81:8f:9d
-# SHA1 Fingerprint: a1:4b:48:d9:43:ee:0a:0e:40:90:4f:3c:e0:a4:c0:91:93:51:5d:3f
-# SHA256 Fingerprint: 7d:05:eb:b6:82:33:9f:8c:94:51:ee:09:4e:eb:fe:fa:79:53:a1:14:ed:b2:f4:49:49:45:2f:ab:7d:2f:c1:85
------BEGIN CERTIFICATE-----
-MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBl
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv
-b3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1MTIwMDAwWjBlMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl
-cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSA
-n61UQbVH35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4Htecc
-biJVMWWXvdMX0h5i89vqbFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9Hp
-EgjAALAcKxHad3A2m67OeYfcgnDmCXRwVWmvo2ifv922ebPynXApVfSr/5Vh88lA
-bx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OPYLfykqGxvYmJHzDNw6Yu
-YjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+RnlTGNAgMB
-AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQW
-BBTOw0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPI
-QW5pJ6d1Ee88hjZv0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I
-0jJmwYrA8y8678Dj1JGG0VDjA9tzd29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4Gni
-lmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAWhsI6yLETcDbYz+70CjTVW0z9
-B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0MjomZmWzwPDCv
-ON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo
-IhNzbM8m9Yop5w==
------END CERTIFICATE-----
-
-# Issuer: CN=DigiCert Assured ID Root G3 O=DigiCert Inc OU=www.digicert.com
-# Subject: CN=DigiCert Assured ID Root G3 O=DigiCert Inc OU=www.digicert.com
-# Label: "DigiCert Assured ID Root G3"
-# Serial: 15459312981008553731928384953135426796
-# MD5 Fingerprint: 7c:7f:65:31:0c:81:df:8d:ba:3e:99:e2:5c:ad:6e:fb
-# SHA1 Fingerprint: f5:17:a2:4f:9a:48:c6:c9:f8:a2:00:26:9f:dc:0f:48:2c:ab:30:89
-# SHA256 Fingerprint: 7e:37:cb:8b:4c:47:09:0c:ab:36:55:1b:a6:f4:5d:b8:40:68:0f:ba:16:6a:95:2d:b1:00:71:7f:43:05:3f:c2
------BEGIN CERTIFICATE-----
-MIICRjCCAc2gAwIBAgIQC6Fa+h3foLVJRK/NJKBs7DAKBggqhkjOPQQDAzBlMQsw
-CQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cu
-ZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3Qg
-RzMwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1MTIwMDAwWjBlMQswCQYDVQQGEwJV
-UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQu
-Y29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwdjAQBgcq
-hkjOPQIBBgUrgQQAIgNiAAQZ57ysRGXtzbg/WPuNsVepRC0FFfLvC/8QdJ+1YlJf
-Zn4f5dwbRXkLzMZTCp2NXQLZqVneAlr2lSoOjThKiknGvMYDOAdfVdp+CW7if17Q
-RSAPWXYQ1qAk8C3eNvJsKTmjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
-BAQDAgGGMB0GA1UdDgQWBBTL0L2p4ZgFUaFNN6KDec6NHSrkhDAKBggqhkjOPQQD
-AwNnADBkAjAlpIFFAmsSS3V0T8gj43DydXLefInwz5FyYZ5eEJJZVrmDxxDnOOlY
-JjZ91eQ0hjkCMHw2U/Aw5WJjOpnitqM7mzT6HtoQknFekROn3aRukswy1vUhZscv
-6pZjamVFkpUBtA==
------END CERTIFICATE-----
-
-# Issuer: CN=DigiCert Global Root G2 O=DigiCert Inc OU=www.digicert.com
-# Subject: CN=DigiCert Global Root G2 O=DigiCert Inc OU=www.digicert.com
-# Label: "DigiCert Global Root G2"
-# Serial: 4293743540046975378534879503202253541
-# MD5 Fingerprint: e4:a6:8a:c8:54:ac:52:42:46:0a:fd:72:48:1b:2a:44
-# SHA1 Fingerprint: df:3c:24:f9:bf:d6:66:76:1b:26:80:73:fe:06:d1:cc:8d:4f:82:a4
-# SHA256 Fingerprint: cb:3c:cb:b7:60:31:e5:e0:13:8f:8d:d3:9a:23:f9:de:47:ff:c3:5e:43:c1:14:4c:ea:27:d4:6a:5a:b1:cb:5f
------BEGIN CERTIFICATE-----
-MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBh
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBH
-MjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVT
-MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
-b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI
-2/Ou8jqJkTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx
-1x7e/dfgy5SDN67sH0NO3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQ
-q2EGnI/yuum06ZIya7XzV+hdG82MHauVBJVJ8zUtluNJbd134/tJS7SsVQepj5Wz
-tCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyMUNGPHgm+F6HmIcr9g+UQ
-vIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQABo0IwQDAP
-BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV
-5uNu5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY
-1Yl9PMWLSn/pvtsrF9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4
-NeF22d+mQrvHRAiGfzZ0JFrabA0UWTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NG
-Fdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBHQRFXGU7Aj64GxJUTFy8bJZ91
-8rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/iyK5S9kJRaTe
-pLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
-MrY=
------END CERTIFICATE-----
-
-# Issuer: CN=DigiCert Global Root G3 O=DigiCert Inc OU=www.digicert.com
-# Subject: CN=DigiCert Global Root G3 O=DigiCert Inc OU=www.digicert.com
-# Label: "DigiCert Global Root G3"
-# Serial: 7089244469030293291760083333884364146
-# MD5 Fingerprint: f5:5d:a4:50:a5:fb:28:7e:1e:0f:0d:cc:96:57:56:ca
-# SHA1 Fingerprint: 7e:04:de:89:6a:3e:66:6d:00:e6:87:d3:3f:fa:d9:3b:e8:3d:34:9e
-# SHA256 Fingerprint: 31:ad:66:48:f8:10:41:38:c7:38:f3:9e:a4:32:01:33:39:3e:3a:18:cc:02:29:6e:f9:7c:2a:c9:ef:67:31:d0
------BEGIN CERTIFICATE-----
-MIICPzCCAcWgAwIBAgIQBVVWvPJepDU1w6QP1atFcjAKBggqhkjOPQQDAzBhMQsw
-CQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cu
-ZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAe
-Fw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAwMDBaMGExCzAJBgNVBAYTAlVTMRUw
-EwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5jb20x
-IDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEczMHYwEAYHKoZIzj0CAQYF
-K4EEACIDYgAE3afZu4q4C/sLfyHS8L6+c/MzXRq8NOrexpu80JX28MzQC7phW1FG
-fp4tn+6OYwwX7Adw9c+ELkCDnOg/QW07rdOkFFk2eJ0DQ+4QE2xy3q6Ip6FrtUPO
-Z9wj/wMco+I+o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAd
-BgNVHQ4EFgQUs9tIpPmhxdiuNkHMEWNpYim8S8YwCgYIKoZIzj0EAwMDaAAwZQIx
-AK288mw/EkrRLTnDCgmXc/SINoyIJ7vmiI1Qhadj+Z4y3maTD/HMsQmP3Wyr+mt/
-oAIwOWZbwmSNuJ5Q3KjVSaLtx9zRSX8XAbjIho9OjIgrqJqpisXRAL34VOKa5Vt8
-sycX
------END CERTIFICATE-----
-
-# Issuer: CN=DigiCert Trusted Root G4 O=DigiCert Inc OU=www.digicert.com
-# Subject: CN=DigiCert Trusted Root G4 O=DigiCert Inc OU=www.digicert.com
-# Label: "DigiCert Trusted Root G4"
-# Serial: 7451500558977370777930084869016614236
-# MD5 Fingerprint: 78:f2:fc:aa:60:1f:2f:b4:eb:c9:37:ba:53:2e:75:49
-# SHA1 Fingerprint: dd:fb:16:cd:49:31:c9:73:a2:03:7d:3f:c8:3a:4d:7d:77:5d:05:e4
-# SHA256 Fingerprint: 55:2f:7b:dc:f1:a7:af:9e:6c:e6:72:01:7f:4f:12:ab:f7:72:40:c7:8e:76:1a:c2:03:d1:d9:d2:0a:c8:99:88
------BEGIN CERTIFICATE-----
-MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBi
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3Qg
-RzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1MTIwMDAwWjBiMQswCQYDVQQGEwJV
-UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQu
-Y29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3y
-ithZwuEppz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1If
-xp4VpX6+n6lXFllVcq9ok3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDV
-ySAdYyktzuxeTsiT+CFhmzTrBcZe7FsavOvJz82sNEBfsXpm7nfISKhmV1efVFiO
-DCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGYQJB5w3jHtrHEtWoYOAMQ
-jdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6MUSaM0C/
-CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCi
-EhtmmnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADM
-fRyVw4/3IbKyEbe7f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QY
-uKZ3AeEPlAwhHbJUKSWJbOUOUlFHdL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXK
-chYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8oR7FwI+isX4KJpn15GkvmB0t
-9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
-hjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
-ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2
-SV1EY+CtnJYYZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd
-+SeuMIW59mdNOj6PWTkiU0TryF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWc
-fFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy7zBZLq7gcfJW5GqXb5JQbZaNaHqa
-sjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iahixTXTBmyUEFxPT9N
-cCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN5r5N
-0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie
-4u1Ki7wb/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mI
-r/OSmbaz5mEP0oUA51Aa5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1
-/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tKG48BtieVU+i2iW1bvGjUI+iLUaJW+fCm
-gKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP82Z+
------END CERTIFICATE-----
-
-# Issuer: CN=COMODO RSA Certification Authority O=COMODO CA Limited
-# Subject: CN=COMODO RSA Certification Authority O=COMODO CA Limited
-# Label: "COMODO RSA Certification Authority"
-# Serial: 101909084537582093308941363524873193117
-# MD5 Fingerprint: 1b:31:b0:71:40:36:cc:14:36:91:ad:c4:3e:fd:ec:18
-# SHA1 Fingerprint: af:e5:d2:44:a8:d1:19:42:30:ff:47:9f:e2:f8:97:bb:cd:7a:8c:b4
-# SHA256 Fingerprint: 52:f0:e1:c4:e5:8e:c6:29:29:1b:60:31:7f:07:46:71:b8:5d:7e:a8:0d:5b:07:27:34:63:53:4b:32:b4:02:34
------BEGIN CERTIFICATE-----
-MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCB
-hTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNV
-BAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAwMTE5
-MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgT
-EkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
-Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR
-6FSS0gpWsawNJN3Fz0RndJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8X
-pz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZFGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC
-9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+5eNu/Nio5JIk2kNrYrhV
-/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pGx8cgoLEf
-Zd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z
-+pUX2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7w
-qP/0uK3pN/u6uPQLOvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZah
-SL0896+1DSJMwBGB7FY79tOi4lu3sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVIC
-u9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+CGCe01a60y1Dma/RMhnEw6abf
-Fobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5WdYgGq/yapiq
-crxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E
-FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB
-/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvl
-wFTPoCWOAvn9sKIN9SCYPBMtrFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM
-4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+nq6PK7o9mfjYcwlYRm6mnPTXJ9OV
-2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSgtZx8jb8uk2Intzna
-FxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwWsRqZ
-CuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiK
-boHGhfKppC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmcke
-jkk9u+UJueBPSZI9FoJAzMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yL
-S0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHqZJx64SIDqZxubw5lT2yHh17zbqD5daWb
-QOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk527RH89elWsn2/x20Kk4yl
-0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7ILaZRfyHB
-NVOFBkpdn627G190
------END CERTIFICATE-----
-
-# Issuer: CN=USERTrust RSA Certification Authority O=The USERTRUST Network
-# Subject: CN=USERTrust RSA Certification Authority O=The USERTRUST Network
-# Label: "USERTrust RSA Certification Authority"
-# Serial: 2645093764781058787591871645665788717
-# MD5 Fingerprint: 1b:fe:69:d1:91:b7:19:33:a3:72:a8:0f:e1:55:e5:b5
-# SHA1 Fingerprint: 2b:8f:1b:57:33:0d:bb:a2:d0:7a:6c:51:f7:0e:e9:0d:da:b9:ad:8e
-# SHA256 Fingerprint: e7:93:c9:b0:2f:d8:aa:13:e2:1c:31:22:8a:cc:b0:81:19:64:3b:74:9c:89:89:64:b1:74:6d:46:c3:d4:cb:d2
------BEGIN CERTIFICATE-----
-MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCB
-iDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0pl
-cnNleSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNV
-BAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAw
-MjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMCVVMxEzARBgNV
-BAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
-aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2Vy
-dGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK
-AoICAQCAEmUXNg7D2wiz0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B
-3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2jY0K2dvKpOyuR+OJv0OwWIJAJPuLodMkY
-tJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFnRghRy4YUVD+8M/5+bJz/
-Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O+T23LLb2
-VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT
-79uq/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6
-c0Plfg6lZrEpfDKEY1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmT
-Yo61Zs8liM2EuLE/pDkP2QKe6xJMlXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97l
-c6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8yexDJtC/QV9AqURE9JnnV4ee
-UB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+eLf8ZxXhyVeE
-Hg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd
-BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8G
-A1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPF
-Up/L+M+ZBn8b2kMVn54CVVeWFPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KO
-VWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ7l8wXEskEVX/JJpuXior7gtNn3/3
-ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQEg9zKC7F4iRO/Fjs
-8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM8WcR
-iQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYze
-Sf7dNXGiFSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZ
-XHlKYC6SQK5MNyosycdiyA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/
-qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9cJ2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRB
-VXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGwsAvgnEzDHNb842m1R0aB
-L6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gxQ+6IHdfG
-jjxDah2nGN59PRbxYvnKkKj9
------END CERTIFICATE-----
-
-# Issuer: CN=USERTrust ECC Certification Authority O=The USERTRUST Network
-# Subject: CN=USERTrust ECC Certification Authority O=The USERTRUST Network
-# Label: "USERTrust ECC Certification Authority"
-# Serial: 123013823720199481456569720443997572134
-# MD5 Fingerprint: fa:68:bc:d9:b5:7f:ad:fd:c9:1d:06:83:28:cc:24:c1
-# SHA1 Fingerprint: d1:cb:ca:5d:b2:d5:2a:7f:69:3b:67:4d:e5:f0:5a:1d:0c:95:7d:f0
-# SHA256 Fingerprint: 4f:f4:60:d5:4b:9c:86:da:bf:bc:fc:57:12:e0:40:0d:2b:ed:3f:bc:4d:4f:bd:aa:86:e0:6a:dc:d2:a9:ad:7a
------BEGIN CERTIFICATE-----
-MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNl
-eSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMT
-JVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTAwMjAx
-MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgT
-Ck5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVUaGUg
-VVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlm
-aWNhdGlvbiBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQarFRaqflo
-I+d61SRvU8Za2EurxtW20eZzca7dnNYMYf3boIkDuAUU7FfO7l0/4iGzzvfUinng
-o4N+LZfQYcTxmdwlkWOrfzCjtHDix6EznPO/LlxTsV+zfTJ/ijTjeXmjQjBAMB0G
-A1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAOBgNVHQ8BAf8EBAMCAQYwDwYD
-VR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjA2Z6EWCNzklwBBHU6+4WMB
-zzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbW
-RNZu9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
------END CERTIFICATE-----
-
-# Issuer: CN=GlobalSign O=GlobalSign OU=GlobalSign ECC Root CA - R5
-# Subject: CN=GlobalSign O=GlobalSign OU=GlobalSign ECC Root CA - R5
-# Label: "GlobalSign ECC Root CA - R5"
-# Serial: 32785792099990507226680698011560947931244
-# MD5 Fingerprint: 9f:ad:3b:1c:02:1e:8a:ba:17:74:38:81:0c:a2:bc:08
-# SHA1 Fingerprint: 1f:24:c6:30:cd:a4:18:ef:20:69:ff:ad:4f:dd:5f:46:3a:1b:69:aa
-# SHA256 Fingerprint: 17:9f:bc:14:8a:3d:d0:0f:d2:4e:a1:34:58:cc:43:bf:a7:f5:9c:81:82:d7:83:a5:13:f6:eb:ec:10:0c:89:24
------BEGIN CERTIFICATE-----
-MIICHjCCAaSgAwIBAgIRYFlJ4CYuu1X5CneKcflK2GwwCgYIKoZIzj0EAwMwUDEk
-MCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpH
-bG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoX
-DTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMbR2xvYmFsU2lnbiBFQ0MgUm9vdCBD
-QSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQDEwpHbG9iYWxTaWdu
-MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAER0UOlvt9Xb/pOdEh+J8LttV7HpI6SFkc
-8GIxLcB6KP4ap1yztsyX50XUWPrRd21DosCHZTQKH3rd6zwzocWdTaRvQZU4f8ke
-hOvRnkmSh5SHDDqFSmafnVmTTZdhBoZKo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
-VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUPeYpSJvqB8ohREom3m7e0oPQn1kwCgYI
-KoZIzj0EAwMDaAAwZQIxAOVpEslu28YxuglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg
-515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7yFz9SO8NdCKoCOJuxUnO
-xwy8p2Fp8fc74SrL+SvzZpA3
------END CERTIFICATE-----
-
-# Issuer: CN=IdenTrust Commercial Root CA 1 O=IdenTrust
-# Subject: CN=IdenTrust Commercial Root CA 1 O=IdenTrust
-# Label: "IdenTrust Commercial Root CA 1"
-# Serial: 13298821034946342390520003877796839426
-# MD5 Fingerprint: b3:3e:77:73:75:ee:a0:d3:e3:7e:49:63:49:59:bb:c7
-# SHA1 Fingerprint: df:71:7e:aa:4a:d9:4e:c9:55:84:99:60:2d:48:de:5f:bc:f0:3a:25
-# SHA256 Fingerprint: 5d:56:49:9b:e4:d2:e0:8b:cf:ca:d0:8a:3e:38:72:3d:50:50:3b:de:70:69:48:e4:2f:55:60:30:19:e5:28:ae
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBK
-MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVu
-VHJ1c3QgQ29tbWVyY2lhbCBSb290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQw
-MTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0MScw
-JQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENBIDEwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ldhNlT
-3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU
-+ehcCuz/mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gp
-S0l4PJNgiCL8mdo2yMKi1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1
-bVoE/c40yiTcdCMbXTMTEl3EASX2MN0CXZ/g1Ue9tOsbobtJSdifWwLziuQkkORi
-T0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl3ZBWzvurpWCdxJ35UrCL
-vYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzyNeVJSQjK
-Vsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZK
-dHzVWYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHT
-c+XvvqDtMwt0viAgxGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hv
-l7yTmvmcEpB4eoCHFddydJxVdHixuuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5N
-iGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
-/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZIhvcNAQELBQAD
-ggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH
-6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwt
-LRvM7Kqas6pgghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93
-nAbowacYXVKV7cndJZ5t+qntozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3
-+wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmVYjzlVYA211QC//G5Xc7UI2/YRYRK
-W2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUXfeu+h1sXIFRRk0pT
-AwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/rokTLq
-l1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG
-4iZZRHUe2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZ
-mUlO+KWA2yUPHGNiiskzZ2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A
-7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7RcGzM7vRX+Bi6hG6H
------END CERTIFICATE-----
-
-# Issuer: CN=IdenTrust Public Sector Root CA 1 O=IdenTrust
-# Subject: CN=IdenTrust Public Sector Root CA 1 O=IdenTrust
-# Label: "IdenTrust Public Sector Root CA 1"
-# Serial: 13298821034946342390521976156843933698
-# MD5 Fingerprint: 37:06:a5:b0:fc:89:9d:ba:f4:6b:8c:1a:64:cd:d5:ba
-# SHA1 Fingerprint: ba:29:41:60:77:98:3f:f4:f3:ef:f2:31:05:3b:2e:ea:6d:4d:45:fd
-# SHA256 Fingerprint: 30:d0:89:5a:9a:44:8a:26:20:91:63:55:22:d1:f5:20:10:b5:86:7a:ca:e1:2c:78:ef:95:8f:d4:f4:38:9f:2f
------BEGIN CERTIFICATE-----
-MIIFZjCCA06gAwIBAgIQCgFCgAAAAUUjz0Z8AAAAAjANBgkqhkiG9w0BAQsFADBN
-MQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVu
-VHJ1c3QgUHVibGljIFNlY3RvciBSb290IENBIDEwHhcNMTQwMTE2MTc1MzMyWhcN
-MzQwMTE2MTc1MzMyWjBNMQswCQYDVQQGEwJVUzESMBAGA1UEChMJSWRlblRydXN0
-MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBSb290IENBIDEwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2IpT8pEiv6EdrCvsnduTyP4o7
-ekosMSqMjbCpwzFrqHd2hCa2rIFCDQjrVVi7evi8ZX3yoG2LqEfpYnYeEe4IFNGy
-RBb06tD6Hi9e28tzQa68ALBKK0CyrOE7S8ItneShm+waOh7wCLPQ5CQ1B5+ctMlS
-bdsHyo+1W/CD80/HLaXIrcuVIKQxKFdYWuSNG5qrng0M8gozOSI5Cpcu81N3uURF
-/YTLNiCBWS2ab21ISGHKTN9T0a9SvESfqy9rg3LvdYDaBjMbXcjaY8ZNzaxmMc3R
-3j6HEDbhuaR672BQssvKplbgN6+rNBM5Jeg5ZuSYeqoSmJxZZoY+rfGwyj4GD3vw
-EUs3oERte8uojHH01bWRNszwFcYr3lEXsZdMUD2xlVl8BX0tIdUAvwFnol57plzy
-9yLxkA2T26pEUWbMfXYD62qoKjgZl3YNa4ph+bz27nb9cCvdKTz4Ch5bQhyLVi9V
-GxyhLrXHFub4qjySjmm2AcG1hp2JDws4lFTo6tyePSW8Uybt1as5qsVATFSrsrTZ
-2fjXctscvG29ZV/viDUqZi/u9rNl8DONfJhBaUYPQxxp+pu10GFqzcpL2UyQRqsV
-WaFHVCkugyhfHMKiq3IXAAaOReyL4jM9f9oZRORicsPfIsbyVtTdX5Vy7W1f90gD
-W/3FKqD2cyOEEBsB5wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
-BAUwAwEB/zAdBgNVHQ4EFgQU43HgntinQtnbcZFrlJPrw6PRFKMwDQYJKoZIhvcN
-AQELBQADggIBAEf63QqwEZE4rU1d9+UOl1QZgkiHVIyqZJnYWv6IAcVYpZmxI1Qj
-t2odIFflAWJBF9MJ23XLblSQdf4an4EKwt3X9wnQW3IV5B4Jaj0z8yGa5hV+rVHV
-DRDtfULAj+7AmgjVQdZcDiFpboBhDhXAuM/FSRJSzL46zNQuOAXeNf0fb7iAaJg9
-TaDKQGXSc3z1i9kKlT/YPyNtGtEqJBnZhbMX73huqVjRI9PHE+1yJX9dsXNw0H8G
-lwmEKYBhHfpe/3OsoOOJuBxxFcbeMX8S3OFtm6/n6J91eEyrRjuazr8FGF1NFTwW
-mhlQBJqymm9li1JfPFgEKCXAZmExfrngdbkaqIHWchezxQMxNRF4eKLg6TCMf4Df
-WN88uieW4oA0beOY02QnrEh+KHdcxiVhJfiFDGX6xDIvpZgF5PgLZxYWxoK4Mhn5
-+bl53B/N66+rDt0b20XkeucC4pVd/GnwU2lhlXV5C15V5jgclKlZM57IcXR5f1GJ
-tshquDDIajjDbp7hNxbqBWJMWxJH7ae0s1hWx0nzfxJoCTFx8G34Tkf71oXuxVhA
-GaQdp/lLQzfcaFpPz+vCZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv
-8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ3Wl9af0AVqW3rLatt8o+Ae+c
------END CERTIFICATE-----
-
-# Issuer: CN=Entrust Root Certification Authority - G2 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2009 Entrust, Inc. - for authorized use only
-# Subject: CN=Entrust Root Certification Authority - G2 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2009 Entrust, Inc. - for authorized use only
-# Label: "Entrust Root Certification Authority - G2"
-# Serial: 1246989352
-# MD5 Fingerprint: 4b:e2:c9:91:96:65:0c:f4:0e:5a:93:92:a0:0a:fe:b2
-# SHA1 Fingerprint: 8c:f4:27:fd:79:0c:3a:d1:66:06:8d:e8:1e:57:ef:bb:93:22:72:d4
-# SHA256 Fingerprint: 43:df:57:74:b0:3e:7f:ef:5f:e4:0d:93:1a:7b:ed:f1:bb:2e:6b:42:73:8c:4e:6d:38:41:10:3d:3a:a7:f3:39
------BEGIN CERTIFICATE-----
-MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMC
-VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50
-cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3Qs
-IEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVz
-dCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwHhcNMDkwNzA3MTcy
-NTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUVu
-dHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwt
-dGVybXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0
-aG9yaXplZCB1c2Ugb25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5IC0gRzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP/vaCeb9zYQYKpSfYs1/T
-RU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXzHHfV1IWN
-cCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hW
-wcKUs/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1
-U1+cPvQXLOZprE4yTGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0
-jaWvYkxN4FisZDQSA/i2jZRjJKRxAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ60B7vfec7aVHUbI2fkBJmqzAN
-BgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5ZiXMRrEPR9RP/
-jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
-Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v
-1fN2D807iDginWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4R
-nAuknZoh8/CbCzB428Hch0P+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmH
-VHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xOe4pIb4tF9g==
------END CERTIFICATE-----
-
-# Issuer: CN=Entrust Root Certification Authority - EC1 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2012 Entrust, Inc. - for authorized use only
-# Subject: CN=Entrust Root Certification Authority - EC1 O=Entrust, Inc. OU=See www.entrust.net/legal-terms/(c) 2012 Entrust, Inc. - for authorized use only
-# Label: "Entrust Root Certification Authority - EC1"
-# Serial: 51543124481930649114116133369
-# MD5 Fingerprint: b6:7e:1d:f0:58:c5:49:6c:24:3b:3d:ed:98:18:ed:bc
-# SHA1 Fingerprint: 20:d8:06:40:df:9b:25:f5:12:25:3a:11:ea:f7:59:8a:eb:14:b5:47
-# SHA256 Fingerprint: 02:ed:0e:b2:8c:14:da:45:16:5c:56:67:91:70:0d:64:51:d7:fb:56:f0:b2:ab:1d:3b:8e:b0:70:e5:6e:df:f5
------BEGIN CERTIFICATE-----
-MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkG
-A1UEBhMCVVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3
-d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVu
-dHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25seTEzMDEGA1UEAxMq
-RW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRUMxMB4XDTEy
-MTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYwFAYD
-VQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0
-L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0g
-Zm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEVDMTB2MBAGByqGSM49AgEGBSuBBAAi
-A2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHyAsWfoPZb1YsGGYZPUxBt
-ByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef9eNi1KlH
-Bz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
-BBYEFLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVC
-R98crlOZF7ZvHH3hvxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nX
-hTcGtXsI/esni0qU+eH6p44mCOh8kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G
------END CERTIFICATE-----
-
-# Issuer: CN=CFCA EV ROOT O=China Financial Certification Authority
-# Subject: CN=CFCA EV ROOT O=China Financial Certification Authority
-# Label: "CFCA EV ROOT"
-# Serial: 407555286
-# MD5 Fingerprint: 74:e1:b6:ed:26:7a:7a:44:30:33:94:ab:7b:27:81:30
-# SHA1 Fingerprint: e2:b8:29:4b:55:84:ab:6b:58:c2:90:46:6c:ac:3f:b8:39:8f:84:83
-# SHA256 Fingerprint: 5c:c3:d7:8e:4e:1d:5e:45:54:7a:04:e6:87:3e:64:f9:0c:f9:53:6d:1c:cc:2e:f8:00:f3:55:c4:c5:fd:70:fd
------BEGIN CERTIFICATE-----
-MIIFjTCCA3WgAwIBAgIEGErM1jANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJD
-TjEwMC4GA1UECgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9y
-aXR5MRUwEwYDVQQDDAxDRkNBIEVWIFJPT1QwHhcNMTIwODA4MDMwNzAxWhcNMjkx
-MjMxMDMwNzAxWjBWMQswCQYDVQQGEwJDTjEwMC4GA1UECgwnQ2hpbmEgRmluYW5j
-aWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQDDAxDRkNBIEVWIFJP
-T1QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDXXWvNED8fBVnVBU03
-sQ7smCuOFR36k0sXgiFxEFLXUWRwFsJVaU2OFW2fvwwbwuCjZ9YMrM8irq93VCpL
-TIpTUnrD7i7es3ElweldPe6hL6P3KjzJIx1qqx2hp/Hz7KDVRM8Vz3IvHWOX6Jn5
-/ZOkVIBMUtRSqy5J35DNuF++P96hyk0g1CXohClTt7GIH//62pCfCqktQT+x8Rgp
-7hZZLDRJGqgG16iI0gNyejLi6mhNbiyWZXvKWfry4t3uMCz7zEasxGPrb382KzRz
-EpR/38wmnvFyXVBlWY9ps4deMm/DGIq1lY+wejfeWkU7xzbh72fROdOXW3NiGUgt
-hxwG+3SYIElz8AXSG7Ggo7cbcNOIabla1jj0Ytwli3i/+Oh+uFzJlU9fpy25IGvP
-a931DfSCt/SyZi4QKPaXWnuWFo8BGS1sbn85WAZkgwGDg8NNkt0yxoekN+kWzqot
-aK8KgWU6cMGbrU1tVMoqLUuFG7OA5nBFDWteNfB/O7ic5ARwiRIlk9oKmSJgamNg
-TnYGmE69g60dWIolhdLHZR4tjsbftsbhf4oEIRUpdPA+nJCdDC7xij5aqgwJHsfV
-PKPtl8MeNPo4+QgO48BdK4PRVmrJtqhUUy54Mmc9gn900PvhtgVguXDbjgv5E1hv
-cWAQUhC5wUEJ73IfZzF4/5YFjQIDAQABo2MwYTAfBgNVHSMEGDAWgBTj/i39KNAL
-tbq2osS/BqoFjJP7LzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAd
-BgNVHQ4EFgQU4/4t/SjQC7W6tqLEvwaqBYyT+y8wDQYJKoZIhvcNAQELBQADggIB
-ACXGumvrh8vegjmWPfBEp2uEcwPenStPuiB/vHiyz5ewG5zz13ku9Ui20vsXiObT
-ej/tUxPQ4i9qecsAIyjmHjdXNYmEwnZPNDatZ8POQQaIxffu2Bq41gt/UP+TqhdL
-jOztUmCypAbqTuv0axn96/Ua4CUqmtzHQTb3yHQFhDmVOdYLO6Qn+gjYXB74BGBS
-ESgoA//vU2YApUo0FmZ8/Qmkrp5nGm9BC2sGE5uPhnEFtC+NiWYzKXZUmhH4J/qy
-P5Hgzg0b8zAarb8iXRvTvyUFTeGSGn+ZnzxEk8rUQElsgIfXBDrDMlI1Dlb4pd19
-xIsNER9Tyx6yF7Zod1rg1MvIB671Oi6ON7fQAUtDKXeMOZePglr4UeWJoBjnaH9d
-Ci77o0cOPaYjesYBx4/IXr9tgFa+iiS6M+qf4TIRnvHST4D2G0CvOJ4RUHlzEhLN
-5mydLIhyPDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe
-/v5WOaHIz16eGWRGENoXkbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+Z
-AAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3CekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ
-5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
------END CERTIFICATE-----
-
-# Issuer: CN=OISTE WISeKey Global Root GB CA O=WISeKey OU=OISTE Foundation Endorsed
-# Subject: CN=OISTE WISeKey Global Root GB CA O=WISeKey OU=OISTE Foundation Endorsed
-# Label: "OISTE WISeKey Global Root GB CA"
-# Serial: 157768595616588414422159278966750757568
-# MD5 Fingerprint: a4:eb:b9:61:28:2e:b7:2f:98:b0:35:26:90:99:51:1d
-# SHA1 Fingerprint: 0f:f9:40:76:18:d3:d7:6a:4b:98:f0:a8:35:9e:0c:fd:27:ac:cc:ed
-# SHA256 Fingerprint: 6b:9c:08:e8:6e:b0:f7:67:cf:ad:65:cd:98:b6:21:49:e5:49:4a:67:f5:84:5e:7b:d1:ed:01:9f:27:b8:6b:d6
------BEGIN CERTIFICATE-----
-MIIDtTCCAp2gAwIBAgIQdrEgUnTwhYdGs/gjGvbCwDANBgkqhkiG9w0BAQsFADBt
-MQswCQYDVQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUg
-Rm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9i
-YWwgUm9vdCBHQiBDQTAeFw0xNDEyMDExNTAwMzJaFw0zOTEyMDExNTEwMzFaMG0x
-CzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYDVQQLExlPSVNURSBG
-b3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEdsb2Jh
-bCBSb290IEdCIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Be3
-HEokKtaXscriHvt9OO+Y9bI5mE4nuBFde9IllIiCFSZqGzG7qFshISvYD06fWvGx
-WuR51jIjK+FTzJlFXHtPrby/h0oLS5daqPZI7H17Dc0hBt+eFf1Biki3IPShehtX
-1F1Q/7pn2COZH8g/497/b1t3sWtuuMlk9+HKQUYOKXHQuSP8yYFfTvdv37+ErXNk
-u7dCjmn21HYdfp2nuFeKUWdy19SouJVUQHMD9ur06/4oQnc/nSMbsrY9gBQHTC5P
-99UKFg29ZkM3fiNDecNAhvVMKdqOmq0NpQSHiB6F4+lT1ZvIiwNjeOvgGUpuuy9r
-M2RYk61pv48b74JIxwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUNQ/INmNe4qPs+TtmFc5RUuORmj0wEAYJKwYBBAGCNxUB
-BAMCAQAwDQYJKoZIhvcNAQELBQADggEBAEBM+4eymYGQfp3FsLAmzYh7KzKNbrgh
-cViXfa43FK8+5/ea4n32cZiZBKpDdHij40lhPnOMTZTg+XHEthYOU3gf1qKHLwI5
-gSk8rxWYITD+KJAAjNHhy/peyP34EEY7onhCkRd0VQreUGdNZtGn//3ZwLWoo4rO
-ZvUPQ82nK1d7Y0Zqqi5S2PTt4W2tKZB4SLrhI6qjiey1q5bAtEuiHZeeevJuQHHf
-aPFlTc58Bd9TZaml8LGXBHAVRgOY1NK/VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02Ic
-Nc1MaRVUGpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM=
------END CERTIFICATE-----
-
-# Issuer: CN=SZAFIR ROOT CA2 O=Krajowa Izba Rozliczeniowa S.A.
-# Subject: CN=SZAFIR ROOT CA2 O=Krajowa Izba Rozliczeniowa S.A.
-# Label: "SZAFIR ROOT CA2"
-# Serial: 357043034767186914217277344587386743377558296292
-# MD5 Fingerprint: 11:64:c1:89:b0:24:b1:8c:b1:07:7e:89:9e:51:9e:99
-# SHA1 Fingerprint: e2:52:fa:95:3f:ed:db:24:60:bd:6e:28:f3:9c:cc:cf:5e:b3:3f:de
-# SHA256 Fingerprint: a1:33:9d:33:28:1a:0b:56:e5:57:d3:d3:2b:1c:e7:f9:36:7e:b0:94:bd:5f:a7:2a:7e:50:04:c8:de:d7:ca:fe
------BEGIN CERTIFICATE-----
-MIIDcjCCAlqgAwIBAgIUPopdB+xV0jLVt+O2XwHrLdzk1uQwDQYJKoZIhvcNAQEL
-BQAwUTELMAkGA1UEBhMCUEwxKDAmBgNVBAoMH0tyYWpvd2EgSXpiYSBSb3psaWN6
-ZW5pb3dhIFMuQS4xGDAWBgNVBAMMD1NaQUZJUiBST09UIENBMjAeFw0xNTEwMTkw
-NzQzMzBaFw0zNTEwMTkwNzQzMzBaMFExCzAJBgNVBAYTAlBMMSgwJgYDVQQKDB9L
-cmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRgwFgYDVQQDDA9TWkFGSVIg
-Uk9PVCBDQTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3vD5QqEvN
-QLXOYeeWyrSh2gwisPq1e3YAd4wLz32ohswmUeQgPYUM1ljj5/QqGJ3a0a4m7utT
-3PSQ1hNKDJA8w/Ta0o4NkjrcsbH/ON7Dui1fgLkCvUqdGw+0w8LBZwPd3BucPbOw
-3gAeqDRHu5rr/gsUvTaE2g0gv/pby6kWIK05YO4vdbbnl5z5Pv1+TW9NL++IDWr6
-3fE9biCloBK0TXC5ztdyO4mTp4CEHCdJckm1/zuVnsHMyAHs6A6KCpbns6aH5db5
-BSsNl0BwPLqsdVqc1U2dAgrSS5tmS0YHF2Wtn2yIANwiieDhZNRnvDF5YTy7ykHN
-XGoAyDw4jlivAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD
-AgEGMB0GA1UdDgQWBBQuFqlKGLXLzPVvUPMjX/hd56zwyDANBgkqhkiG9w0BAQsF
-AAOCAQEAtXP4A9xZWx126aMqe5Aosk3AM0+qmrHUuOQn/6mWmc5G4G18TKI4pAZw
-8PRBEew/R40/cof5O/2kbytTAOD/OblqBw7rHRz2onKQy4I9EYKL0rufKq8h5mOG
-nXkZ7/e7DDWQw4rtTw/1zBLZpD67oPwglV9PJi8RI4NOdQcPv5vRtB3pEAT+ymCP
-oky4rc/hkA/NrgrHXXu3UNLUYfrVFdvXn4dRVOul4+vJhaAlIDf7js4MNIThPIGy
-d05DpYhfhmehPea0XGG2Ptv+tyjFogeutcrKjSoS75ftwjCkySp6+/NNIxuZMzSg
-LvWpCz/UXeHPhJ/iGcJfitYgHuNztw==
------END CERTIFICATE-----
-
-# Issuer: CN=Certum Trusted Network CA 2 O=Unizeto Technologies S.A. OU=Certum Certification Authority
-# Subject: CN=Certum Trusted Network CA 2 O=Unizeto Technologies S.A. OU=Certum Certification Authority
-# Label: "Certum Trusted Network CA 2"
-# Serial: 44979900017204383099463764357512596969
-# MD5 Fingerprint: 6d:46:9e:d9:25:6d:08:23:5b:5e:74:7d:1e:27:db:f2
-# SHA1 Fingerprint: d3:dd:48:3e:2b:bf:4c:05:e8:af:10:f5:fa:76:26:cf:d3:dc:30:92
-# SHA256 Fingerprint: b6:76:f2:ed:da:e8:77:5c:d3:6c:b0:f6:3c:d1:d4:60:39:61:f4:9e:62:65:ba:01:3a:2f:03:07:b6:d0:b8:04
------BEGIN CERTIFICATE-----
-MIIF0jCCA7qgAwIBAgIQIdbQSk8lD8kyN/yqXhKN6TANBgkqhkiG9w0BAQ0FADCB
-gDELMAkGA1UEBhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMu
-QS4xJzAlBgNVBAsTHkNlcnR1bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEkMCIG
-A1UEAxMbQ2VydHVtIFRydXN0ZWQgTmV0d29yayBDQSAyMCIYDzIwMTExMDA2MDgz
-OTU2WhgPMjA0NjEwMDYwODM5NTZaMIGAMQswCQYDVQQGEwJQTDEiMCAGA1UEChMZ
-VW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5MSQwIgYDVQQDExtDZXJ0dW0gVHJ1c3RlZCBOZXR3
-b3JrIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9+Xj45tWA
-DGSdhhuWZGc/IjoedQF97/tcZ4zJzFxrqZHmuULlIEub2pt7uZld2ZuAS9eEQCsn
-0+i6MLs+CRqnSZXvK0AkwpfHp+6bJe+oCgCXhVqqndwpyeI1B+twTUrWwbNWuKFB
-OJvR+zF/j+Bf4bE/D44WSWDXBo0Y+aomEKsq09DRZ40bRr5HMNUuctHFY9rnY3lE
-fktjJImGLjQ/KUxSiyqnwOKRKIm5wFv5HdnnJ63/mgKXwcZQkpsCLL2puTRZCr+E
-Sv/f/rOf69me4Jgj7KZrdxYq28ytOxykh9xGc14ZYmhFV+SQgkK7QtbwYeDBoz1m
-o130GO6IyY0XRSmZMnUCMe4pJshrAua1YkV/NxVaI2iJ1D7eTiew8EAMvE0Xy02i
-sx7QBlrd9pPPV3WZ9fqGGmd4s7+W/jTcvedSVuWz5XV710GRBdxdaeOVDUO5/IOW
-OZV7bIBaTxNyxtd9KXpEulKkKtVBRgkg/iKgtlswjbyJDNXXcPiHUv3a76xRLgez
-Tv7QCdpw75j6VuZt27VXS9zlLCUVyJ4ueE742pyehizKV/Ma5ciSixqClnrDvFAS
-adgOWkaLOusm+iPJtrCBvkIApPjW/jAux9JG9uWOdf3yzLnQh1vMBhBgu4M1t15n
-3kfsmUjxpKEV/q2MYo45VU85FrmxY53/twIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MB0GA1UdDgQWBBS2oVQ5AsOgP46KvPrU+Bym0ToO/TAOBgNVHQ8BAf8EBAMC
-AQYwDQYJKoZIhvcNAQENBQADggIBAHGlDs7k6b8/ONWJWsQCYftMxRQXLYtPU2sQ
-F/xlhMcQSZDe28cmk4gmb3DWAl45oPePq5a1pRNcgRRtDoGCERuKTsZPpd1iHkTf
-CVn0W3cLN+mLIMb4Ck4uWBzrM9DPhmDJ2vuAL55MYIR4PSFk1vtBHxgP58l1cb29
-XN40hz5BsA72udY/CROWFC/emh1auVbONTqwX3BNXuMp8SMoclm2q8KMZiYcdywm
-djWLKKdpoPk79SPdhRB0yZADVpHnr7pH1BKXESLjokmUbOe3lEu6LaTaM4tMpkT/
-WjzGHWTYtTHkpjx6qFcL2+1hGsvxznN3Y6SHb0xRONbkX8eftoEq5IVIeVheO/jb
-AoJnwTnbw3RLPTYe+SmTiGhbqEQZIfCn6IENLOiTNrQ3ssqwGyZ6miUfmpqAnksq
-P/ujmv5zMnHCnsZy4YpoJ/HkD7TETKVhk/iXEAcqMCWpuchxuO9ozC1+9eB+D4Ko
-b7a6bINDd82Kkhehnlt4Fj1F4jNy3eFmypnTycUm/Q1oBEauttmbjL4ZvrHG8hnj
-XALKLNhvSgfZyTXaQHXyxKcZb55CEJh15pWLYLztxRLXis7VmFxWlgPF7ncGNf/P
-5O4/E2Hu29othfDNrp2yGAlFw5Khchf8R7agCyzxxN5DaAhqXzvwdmP7zAYspsbi
-DrW5viSP
------END CERTIFICATE-----
-
-# Issuer: CN=Hellenic Academic and Research Institutions RootCA 2015 O=Hellenic Academic and Research Institutions Cert. Authority
-# Subject: CN=Hellenic Academic and Research Institutions RootCA 2015 O=Hellenic Academic and Research Institutions Cert. Authority
-# Label: "Hellenic Academic and Research Institutions RootCA 2015"
-# Serial: 0
-# MD5 Fingerprint: ca:ff:e2:db:03:d9:cb:4b:e9:0f:ad:84:fd:7b:18:ce
-# SHA1 Fingerprint: 01:0c:06:95:a6:98:19:14:ff:bf:5f:c6:b0:b6:95:ea:29:e9:12:a6
-# SHA256 Fingerprint: a0:40:92:9a:02:ce:53:b4:ac:f4:f2:ff:c6:98:1c:e4:49:6f:75:5e:6d:45:fe:0b:2a:69:2b:cd:52:52:3f:36
------BEGIN CERTIFICATE-----
-MIIGCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMCR1Ix
-DzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5k
-IFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNVBAMT
-N0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgUm9v
-dENBIDIwMTUwHhcNMTUwNzA3MTAxMTIxWhcNNDAwNjMwMTAxMTIxWjCBpjELMAkG
-A1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNh
-ZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkx
-QDA+BgNVBAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1
-dGlvbnMgUm9vdENBIDIwMTUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
-AQDC+Kk/G4n8PDwEXT2QNrCROnk8ZlrvbTkBSRq0t89/TSNTt5AA4xMqKKYx8ZEA
-4yjsriFBzh/a/X0SWwGDD7mwX5nh8hKDgE0GPt+sr+ehiGsxr/CL0BgzuNtFajT0
-AoAkKAoCFZVedioNmToUW/bLy1O8E00BiDeUJRtCvCLYjqOWXjrZMts+6PAQZe10
-4S+nfK8nNLspfZu2zwnI5dMK/IhlZXQK3HMcXM1AsRzUtoSMTFDPaI6oWa7CJ06C
-ojXdFPQf/7J31Ycvqm59JCfnxssm5uX+Zwdj2EUN3TpZZTlYepKZcj2chF6IIbjV
-9Cz82XBST3i4vTwri5WY9bPRaM8gFH5MXF/ni+X1NYEZN9cRCLdmvtNKzoNXADrD
-gfgXy5I2XdGj2HUb4Ysn6npIQf1FGQatJ5lOwXBH3bWfgVMS5bGMSF0xQxfjjMZ6
-Y5ZLKTBOhE5iGV48zpeQpX8B653g+IuJ3SWYPZK2fu/Z8VFRfS0myGlZYeCsargq
-NhEEelC9MoS+L9xy1dcdFkfkR2YgP/SWxa+OAXqlD3pk9Q0Yh9muiNX6hME6wGko
-LfINaFGq46V3xqSQDqE3izEjR8EJCOtu93ib14L8hCCZSRm2Ekax+0VVFqmjZayc
-Bw/qa9wfLgZy7IaIEuQt218FL+TwA9MmM+eAws1CoRc0CwIDAQABo0IwQDAPBgNV
-HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUcRVnyMjJvXVd
-ctA4GGqd83EkVAswDQYJKoZIhvcNAQELBQADggIBAHW7bVRLqhBYRjTyYtcWNl0I
-XtVsyIe9tC5G8jH4fOpCtZMWVdyhDBKg2mF+D1hYc2Ryx+hFjtyp8iY/xnmMsVMI
-M4GwVhO+5lFc2JsKT0ucVlMC6U/2DWDqTUJV6HwbISHTGzrMd/K4kPFox/la/vot
-9L/J9UUbzjgQKjeKeaO04wlshYaT/4mWJ3iBj2fjRnRUjtkNaeJK9E10A/+yd+2V
-Z5fkscWrv2oj6NSU4kQoYsRL4vDY4ilrGnB+JGGTe08DMiUNRSQrlrRGar9KC/ea
-j8GsGsVn82800vpzY4zvFrCopEYq+OsS7HK07/grfoxSwIuEVPkvPuNVqNxmsdnh
-X9izjFk0WaSrT2y7HxjbdavYy5LNlDhhDgcGH0tGEPEVvo2FXDtKK4F5D7Rpn0lQ
-l033DlZdwJVqwjbDG2jJ9SrcR5q+ss7FJej6A7na+RZukYT1HCjI/CbM1xyQVqdf
-bzoEvM14iQuODy+jqk+iGxI9FghAD/FGTNeqewjBCvVtJ94Cj8rDtSvK6evIIVM4
-pcw72Hc3MKJP2W/R8kCtQXoXxdZKNYm3QdV8hn9VTYNKpXMgwDqvkPGaJI7ZjnHK
-e7iG2rKPmT4dEw0SEe7Uq/DpFXYC5ODfqiAeW2GFZECpkJcNrVPSWh2HagCXZWK0
-vm9qp/UsQu0yrbYhnr68
------END CERTIFICATE-----
-
-# Issuer: CN=Hellenic Academic and Research Institutions ECC RootCA 2015 O=Hellenic Academic and Research Institutions Cert. Authority
-# Subject: CN=Hellenic Academic and Research Institutions ECC RootCA 2015 O=Hellenic Academic and Research Institutions Cert. Authority
-# Label: "Hellenic Academic and Research Institutions ECC RootCA 2015"
-# Serial: 0
-# MD5 Fingerprint: 81:e5:b4:17:eb:c2:f5:e1:4b:0d:41:7b:49:92:fe:ef
-# SHA1 Fingerprint: 9f:f1:71:8d:92:d5:9a:f3:7d:74:97:b4:bc:6f:84:68:0b:ba:b6:66
-# SHA256 Fingerprint: 44:b5:45:aa:8a:25:e6:5a:73:ca:15:dc:27:fc:36:d2:4c:1c:b9:95:3a:06:65:39:b1:15:82:dc:48:7b:48:33
------BEGIN CERTIFICATE-----
-MIICwzCCAkqgAwIBAgIBADAKBggqhkjOPQQDAjCBqjELMAkGA1UEBhMCR1IxDzAN
-BgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJl
-c2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO0hl
-bGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgRUNDIFJv
-b3RDQSAyMDE1MB4XDTE1MDcwNzEwMzcxMloXDTQwMDYzMDEwMzcxMlowgaoxCzAJ
-BgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxRDBCBgNVBAoTO0hlbGxlbmljIEFj
-YWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9yaXR5
-MUQwQgYDVQQDEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0
-dXRpb25zIEVDQyBSb290Q0EgMjAxNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABJKg
-QehLgoRc4vgxEZmGZE4JJS+dQS8KrjVPdJWyUWRrjWvmP3CV8AVER6ZyOFB2lQJa
-jq4onvktTpnvLEhvTCUp6NFxW98dwXU3tNf6e3pCnGoKVlp8aQuqgAkkbH7BRqNC
-MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFLQi
-C4KZJAEOnLvkDv2/+5cgk5kqMAoGCCqGSM49BAMCA2cAMGQCMGfOFmI4oqxiRaep
-lSTAGiecMjvAwNW6qef4BENThe5SId6d9SWDPp5YSy/XZxMOIQIwBeF1Ad5o7Sof
-TUwJCA3sS61kFyjndc5FZXIhF8siQQ6ME5g4mlRtm8rifOoCWCKR
------END CERTIFICATE-----
-
-# Issuer: CN=ISRG Root X1 O=Internet Security Research Group
-# Subject: CN=ISRG Root X1 O=Internet Security Research Group
-# Label: "ISRG Root X1"
-# Serial: 172886928669790476064670243504169061120
-# MD5 Fingerprint: 0c:d2:f9:e0:da:17:73:e9:ed:86:4d:a5:e3:70:e7:4e
-# SHA1 Fingerprint: ca:bd:2a:79:a1:07:6a:31:f2:1d:25:36:35:cb:03:9d:43:29:a5:e8
-# SHA256 Fingerprint: 96:bc:ec:06:26:49:76:f3:74:60:77:9a:cf:28:c5:a7:cf:e8:a3:c0:aa:e1:1a:8f:fc:ee:05:c0:bd:df:08:c6
------BEGIN CERTIFICATE-----
-MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAw
-TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
-cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4
-WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJu
-ZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBY
-MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54rVygc
-h77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+
-0TM8ukj13Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6U
-A5/TR5d8mUgjU+g4rk8Kb4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sW
-T8KOEUt+zwvo/7V3LvSye0rgTBIlDHCNAymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyH
-B5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ4Q7e2RCOFvu396j3x+UC
-B5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf1b0SHzUv
-KBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWn
-OlFuhjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTn
-jh8BCNAw1FtxNrQHusEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbw
-qHyGO0aoSCqI3Haadr8faqU9GY/rOPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CI
-rU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY9umbbjANBgkq
-hkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
-ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ
-3BebYhtF8GaV0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KK
-NFtY2PwByVS5uCbMiogziUwthDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5
-ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJwTdwJx4nLCgdNbOhdjsnvzqvHu7Ur
-TkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nxe5AW0wdeRlN8NwdC
-jNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZAJzVc
-oyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq
-4RgqsahDYVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPA
-mRGunUHBcnWEvgJBQl9nJEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57d
-emyPxgcYxn/eR44/KJ4EBs+lVDR3veyJm+kXQ99b21/+jh5Xos1AnX5iItreGCc=
------END CERTIFICATE-----
-
-# Issuer: O=FNMT-RCM OU=AC RAIZ FNMT-RCM
-# Subject: O=FNMT-RCM OU=AC RAIZ FNMT-RCM
-# Label: "AC RAIZ FNMT-RCM"
-# Serial: 485876308206448804701554682760554759
-# MD5 Fingerprint: e2:09:04:b4:d3:bd:d1:a0:14:fd:1a:d2:47:c4:57:1d
-# SHA1 Fingerprint: ec:50:35:07:b2:15:c4:95:62:19:e2:a8:9a:5b:42:99:2c:4c:2c:20
-# SHA256 Fingerprint: eb:c5:57:0c:29:01:8c:4d:67:b1:aa:12:7b:af:12:f7:03:b4:61:1e:bc:17:b7:da:b5:57:38:94:17:9b:93:fa
------BEGIN CERTIFICATE-----
-MIIFgzCCA2ugAwIBAgIPXZONMGc2yAYdGsdUhGkHMA0GCSqGSIb3DQEBCwUAMDsx
-CzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEZMBcGA1UECwwQQUMgUkFJ
-WiBGTk1ULVJDTTAeFw0wODEwMjkxNTU5NTZaFw0zMDAxMDEwMDAwMDBaMDsxCzAJ
-BgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJDTTEZMBcGA1UECwwQQUMgUkFJWiBG
-Tk1ULVJDTTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALpxgHpMhm5/
-yBNtwMZ9HACXjywMI7sQmkCpGreHiPibVmr75nuOi5KOpyVdWRHbNi63URcfqQgf
-BBckWKo3Shjf5TnUV/3XwSyRAZHiItQDwFj8d0fsjz50Q7qsNI1NOHZnjrDIbzAz
-WHFctPVrbtQBULgTfmxKo0nRIBnuvMApGGWn3v7v3QqQIecaZ5JCEJhfTzC8PhxF
-tBDXaEAUwED653cXeuYLj2VbPNmaUtu1vZ5Gzz3rkQUCwJaydkxNEJY7kvqcfw+Z
-374jNUUeAlz+taibmSXaXvMiwzn15Cou08YfxGyqxRxqAQVKL9LFwag0Jl1mpdIC
-IfkYtwb1TplvqKtMUejPUBjFd8g5CSxJkjKZqLsXF3mwWsXmo8RZZUc1g16p6DUL
-mbvkzSDGm0oGObVo/CK67lWMK07q87Hj/LaZmtVC+nFNCM+HHmpxffnTtOmlcYF7
-wk5HlqX2doWjKI/pgG6BU6VtX7hI+cL5NqYuSf+4lsKMB7ObiFj86xsc3i1w4peS
-MKGJ47xVqCfWS+2QrYv6YyVZLag13cqXM7zlzced0ezvXg5KkAYmY6252TUtB7p2
-ZSysV4999AeU14ECll2jB0nVetBX+RvnU0Z1qrB5QstocQjpYL05ac70r8NWQMet
-UqIJ5G+GR4of6ygnXYMgrwTJbFaai0b1AgMBAAGjgYMwgYAwDwYDVR0TAQH/BAUw
-AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFPd9xf3E6Jobd2Sn9R2gzL+H
-YJptMD4GA1UdIAQ3MDUwMwYEVR0gADArMCkGCCsGAQUFBwIBFh1odHRwOi8vd3d3
-LmNlcnQuZm5tdC5lcy9kcGNzLzANBgkqhkiG9w0BAQsFAAOCAgEAB5BK3/MjTvDD
-nFFlm5wioooMhfNzKWtN/gHiqQxjAb8EZ6WdmF/9ARP67Jpi6Yb+tmLSbkyU+8B1
-RXxlDPiyN8+sD8+Nb/kZ94/sHvJwnvDKuO+3/3Y3dlv2bojzr2IyIpMNOmqOFGYM
-LVN0V2Ue1bLdI4E7pWYjJ2cJj+F3qkPNZVEI7VFY/uY5+ctHhKQV8Xa7pO6kO8Rf
-77IzlhEYt8llvhjho6Tc+hj507wTmzl6NLrTQfv6MooqtyuGC2mDOL7Nii4LcK2N
-JpLuHvUBKwrZ1pebbuCoGRw6IYsMHkCtA+fdZn71uSANA+iW+YJF1DngoABd15jm
-fZ5nc8OaKveri6E6FO80vFIOiZiaBECEHX5FaZNXzuvO+FB8TxxuBEOb+dY7Ixjp
-6o7RTUaN8Tvkasq6+yO3m/qZASlaWFot4/nUbQ4mrcFuNLwy+AwF+mWj2zs3gyLp
-1txyM/1d8iC9djwj2ij3+RvrWWTV3F9yfiD8zYm1kGdNYno/Tq0dwzn+evQoFt9B
-9kiABdcPUXmsEKvU7ANm5mqwujGSQkBqvjrTcuFqN1W8rB2Vt2lh8kORdOag0wok
-RqEIr9baRRmW1FMdW4R58MD3R++Lj8UGrp1MYp3/RgT408m2ECVAdf4WqslKYIYv
-uu8wd+RU4riEmViAqhOLUTpPSPaLtrM=
------END CERTIFICATE-----
-
-# Issuer: CN=Amazon Root CA 1 O=Amazon
-# Subject: CN=Amazon Root CA 1 O=Amazon
-# Label: "Amazon Root CA 1"
-# Serial: 143266978916655856878034712317230054538369994
-# MD5 Fingerprint: 43:c6:bf:ae:ec:fe:ad:2f:18:c6:88:68:30:fc:c8:e6
-# SHA1 Fingerprint: 8d:a7:f9:65:ec:5e:fc:37:91:0f:1c:6e:59:fd:c1:cc:6a:6e:de:16
-# SHA256 Fingerprint: 8e:cd:e6:88:4f:3d:87:b1:12:5b:a3:1a:c3:fc:b1:3d:70:16:de:7f:57:cc:90:4f:e1:cb:97:c6:ae:98:19:6e
------BEGIN CERTIFICATE-----
-MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsF
-ADA5MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6
-b24gUm9vdCBDQSAxMB4XDTE1MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTEL
-MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv
-b3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALJ4gHHKeNXj
-ca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgHFzZM
-9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qw
-IFAGbHrQgLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6
-VOujw5H5SNz/0egwLX0tdHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L
-93FcXmn/6pUCyziKrlA4b9v7LWIbxcceVOF34GfID5yHI9Y/QCB/IIDEgEw+OyQm
-jgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3DQEBCwUA
-A4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDI
-U5PMCCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUs
-N+gDS63pYaACbvXy8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vv
-o/ufQJVtMVT8QtPHRh8jrdkPSHCa2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU
-5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2xJNDd2ZhwLnoQdeXeGADbkpy
-rqXRfboQnoZsG4q5WTP468SQvvG5
------END CERTIFICATE-----
-
-# Issuer: CN=Amazon Root CA 2 O=Amazon
-# Subject: CN=Amazon Root CA 2 O=Amazon
-# Label: "Amazon Root CA 2"
-# Serial: 143266982885963551818349160658925006970653239
-# MD5 Fingerprint: c8:e5:8d:ce:a8:42:e2:7a:c0:2a:5c:7c:9e:26:bf:66
-# SHA1 Fingerprint: 5a:8c:ef:45:d7:a6:98:59:76:7a:8c:8b:44:96:b5:78:cf:47:4b:1a
-# SHA256 Fingerprint: 1b:a5:b2:aa:8c:65:40:1a:82:96:01:18:f8:0b:ec:4f:62:30:4d:83:ce:c4:71:3a:19:c3:9c:01:1e:a4:6d:b4
------BEGIN CERTIFICATE-----
-MIIFQTCCAymgAwIBAgITBmyf0pY1hp8KD+WGePhbJruKNzANBgkqhkiG9w0BAQwF
-ADA5MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6
-b24gUm9vdCBDQSAyMB4XDTE1MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTEL
-MAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJv
-b3QgQ0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK2Wny2cSkxK
-gXlRmeyKy2tgURO8TW0G/LAIjd0ZEGrHJgw12MBvIITplLGbhQPDW9tK6Mj4kHbZ
-W0/jTOgGNk3Mmqw9DJArktQGGWCsN0R5hYGCrVo34A3MnaZMUnbqQ523BNFQ9lXg
-1dKmSYXpN+nKfq5clU1Imj+uIFptiJXZNLhSGkOQsL9sBbm2eLfq0OQ6PBJTYv9K
-8nu+NQWpEjTj82R0Yiw9AElaKP4yRLuH3WUnAnE72kr3H9rN9yFVkE8P7K6C4Z9r
-2UXTu/Bfh+08LDmG2j/e7HJV63mjrdvdfLC6HM783k81ds8P+HgfajZRRidhW+me
-z/CiVX18JYpvL7TFz4QuK/0NURBs+18bvBt+xa47mAExkv8LV/SasrlX6avvDXbR
-8O70zoan4G7ptGmh32n2M8ZpLpcTnqWHsFcQgTfJU7O7f/aS0ZzQGPSSbtqDT6Zj
-mUyl+17vIWR6IF9sZIUVyzfpYgwLKhbcAS4y2j5L9Z469hdAlO+ekQiG+r5jqFoz
-7Mt0Q5X5bGlSNscpb/xVA1wf+5+9R+vnSUeVC06JIglJ4PVhHvG/LopyboBZ/1c6
-+XUyo05f7O0oYtlNc/LMgRdg7c3r3NunysV+Ar3yVAhU/bQtCSwXVEqY0VThUWcI
-0u1ufm8/0i2BWSlmy5A5lREedCf+3euvAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMB
-Af8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSwDPBMMPQFWAJI/TPlUq9LhONm
-UjANBgkqhkiG9w0BAQwFAAOCAgEAqqiAjw54o+Ci1M3m9Zh6O+oAA7CXDpO8Wqj2
-LIxyh6mx/H9z/WNxeKWHWc8w4Q0QshNabYL1auaAn6AFC2jkR2vHat+2/XcycuUY
-+gn0oJMsXdKMdYV2ZZAMA3m3MSNjrXiDCYZohMr/+c8mmpJ5581LxedhpxfL86kS
-k5Nrp+gvU5LEYFiwzAJRGFuFjWJZY7attN6a+yb3ACfAXVU3dJnJUH/jWS5E4ywl
-7uxMMne0nxrpS10gxdr9HIcWxkPo1LsmmkVwXqkLN1PiRnsn/eBG8om3zEK2yygm
-btmlyTrIQRNg91CMFa6ybRoVGld45pIq2WWQgj9sAq+uEjonljYE1x2igGOpm/Hl
-urR8FLBOybEfdF849lHqm/osohHUqS0nGkWxr7JOcQ3AWEbWaQbLU8uz/mtBzUF+
-fUwPfHJ5elnNXkoOrJupmHN5fLT0zLm4BwyydFy4x2+IoZCn9Kr5v2c69BoVYh63
-n749sSmvZ6ES8lgQGVMDMBu4Gon2nL2XA46jCfMdiyHxtN/kHNGfZQIG6lzWE7OE
-76KlXIx3KadowGuuQNKotOrN8I1LOJwZmhsoVLiJkO/KdYE+HvJkJMcYr07/R54H
-9jVlpNMKVv/1F2Rs76giJUmTtt8AF9pYfl3uxRuw0dFfIRDH+fO6AgonB8Xx1sfT
-4PsJYGw=
------END CERTIFICATE-----
-
-# Issuer: CN=Amazon Root CA 3 O=Amazon
-# Subject: CN=Amazon Root CA 3 O=Amazon
-# Label: "Amazon Root CA 3"
-# Serial: 143266986699090766294700635381230934788665930
-# MD5 Fingerprint: a0:d4:ef:0b:f7:b5:d8:49:95:2a:ec:f5:c4:fc:81:87
-# SHA1 Fingerprint: 0d:44:dd:8c:3c:8c:1a:1a:58:75:64:81:e9:0f:2e:2a:ff:b3:d2:6e
-# SHA256 Fingerprint: 18:ce:6c:fe:7b:f1:4e:60:b2:e3:47:b8:df:e8:68:cb:31:d0:2e:bb:3a:da:27:15:69:f5:03:43:b4:6d:b3:a4
------BEGIN CERTIFICATE-----
-MIIBtjCCAVugAwIBAgITBmyf1XSXNmY/Owua2eiedgPySjAKBggqhkjOPQQDAjA5
-MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24g
-Um9vdCBDQSAzMB4XDTE1MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkG
-A1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJvb3Qg
-Q0EgMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCmXp8ZBf8ANm+gBG1bG8lKl
-ui2yEujSLtf6ycXYqm0fc4E7O5hrOXwzpcVOho6AF2hiRVd9RFgdszflZwjrZt6j
-QjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSr
-ttvXBp43rDCGB5Fwx5zEGbF4wDAKBggqhkjOPQQDAgNJADBGAiEA4IWSoxe3jfkr
-BqWTrBqYaGFy+uGh0PsceGCmQ5nFuMQCIQCcAu/xlJyzlvnrxir4tiz+OpAUFteM
-YyRIHN8wfdVoOw==
------END CERTIFICATE-----
-
-# Issuer: CN=Amazon Root CA 4 O=Amazon
-# Subject: CN=Amazon Root CA 4 O=Amazon
-# Label: "Amazon Root CA 4"
-# Serial: 143266989758080763974105200630763877849284878
-# MD5 Fingerprint: 89:bc:27:d5:eb:17:8d:06:6a:69:d5:fd:89:47:b4:cd
-# SHA1 Fingerprint: f6:10:84:07:d6:f8:bb:67:98:0c:c2:e2:44:c2:eb:ae:1c:ef:63:be
-# SHA256 Fingerprint: e3:5d:28:41:9e:d0:20:25:cf:a6:90:38:cd:62:39:62:45:8d:a5:c6:95:fb:de:a3:c2:2b:0b:fb:25:89:70:92
------BEGIN CERTIFICATE-----
-MIIB8jCCAXigAwIBAgITBmyf18G7EEwpQ+Vxe3ssyBrBDjAKBggqhkjOPQQDAzA5
-MQswCQYDVQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24g
-Um9vdCBDQSA0MB4XDTE1MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkG
-A1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZMBcGA1UEAxMQQW1hem9uIFJvb3Qg
-Q0EgNDB2MBAGByqGSM49AgEGBSuBBAAiA2IABNKrijdPo1MN/sGKe0uoe0ZLY7Bi
-9i0b2whxIdIA6GO9mif78DluXeo9pcmBqqNbIJhFXRbb/egQbeOc4OO9X4Ri83Bk
-M6DLJC9wuoihKqB1+IGuYgbEgds5bimwHvouXKNCMEAwDwYDVR0TAQH/BAUwAwEB
-/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNPsxzplbszh2naaVvuc84ZtV+WB
-MAoGCCqGSM49BAMDA2gAMGUCMDqLIfG9fhGt0O9Yli/W651+kI0rz2ZVwyzjKKlw
-CkcO8DdZEv8tmZQoTipPNU0zWgIxAOp1AE47xDqUEpHJWEadIRNyp4iciuRMStuW
-1KyLa2tJElMzrdfkviT8tQp21KW8EA==
------END CERTIFICATE-----
-
-# Issuer: CN=TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1 O=Turkiye Bilimsel ve Teknolojik Arastirma Kurumu - TUBITAK OU=Kamu Sertifikasyon Merkezi - Kamu SM
-# Subject: CN=TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1 O=Turkiye Bilimsel ve Teknolojik Arastirma Kurumu - TUBITAK OU=Kamu Sertifikasyon Merkezi - Kamu SM
-# Label: "TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1"
-# Serial: 1
-# MD5 Fingerprint: dc:00:81:dc:69:2f:3e:2f:b0:3b:f6:3d:5a:91:8e:49
-# SHA1 Fingerprint: 31:43:64:9b:ec:ce:27:ec:ed:3a:3f:0b:8f:0d:e4:e8:91:dd:ee:ca
-# SHA256 Fingerprint: 46:ed:c3:68:90:46:d5:3a:45:3f:b3:10:4a:b8:0d:ca:ec:65:8b:26:60:ea:16:29:dd:7e:86:79:90:64:87:16
------BEGIN CERTIFICATE-----
-MIIEYzCCA0ugAwIBAgIBATANBgkqhkiG9w0BAQsFADCB0jELMAkGA1UEBhMCVFIx
-GDAWBgNVBAcTD0dlYnplIC0gS29jYWVsaTFCMEAGA1UEChM5VHVya2l5ZSBCaWxp
-bXNlbCB2ZSBUZWtub2xvamlrIEFyYXN0aXJtYSBLdXJ1bXUgLSBUVUJJVEFLMS0w
-KwYDVQQLEyRLYW11IFNlcnRpZmlrYXN5b24gTWVya2V6aSAtIEthbXUgU00xNjA0
-BgNVBAMTLVRVQklUQUsgS2FtdSBTTSBTU0wgS29rIFNlcnRpZmlrYXNpIC0gU3Vy
-dW0gMTAeFw0xMzExMjUwODI1NTVaFw00MzEwMjUwODI1NTVaMIHSMQswCQYDVQQG
-EwJUUjEYMBYGA1UEBxMPR2ViemUgLSBLb2NhZWxpMUIwQAYDVQQKEzlUdXJraXll
-IEJpbGltc2VsIHZlIFRla25vbG9qaWsgQXJhc3Rpcm1hIEt1cnVtdSAtIFRVQklU
-QUsxLTArBgNVBAsTJEthbXUgU2VydGlmaWthc3lvbiBNZXJrZXppIC0gS2FtdSBT
-TTE2MDQGA1UEAxMtVFVCSVRBSyBLYW11IFNNIFNTTCBLb2sgU2VydGlmaWthc2kg
-LSBTdXJ1bSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr3UwM6q7
-a9OZLBI3hNmNe5eA027n/5tQlT6QlVZC1xl8JoSNkvoBHToP4mQ4t4y86Ij5iySr
-LqP1N+RAjhgleYN1Hzv/bKjFxlb4tO2KRKOrbEz8HdDc72i9z+SqzvBV96I01INr
-N3wcwv61A+xXzry0tcXtAA9TNypN9E8Mg/uGz8v+jE69h/mniyFXnHrfA2eJLJ2X
-YacQuFWQfw4tJzh03+f92k4S400VIgLI4OD8D62K18lUUMw7D8oWgITQUVbDjlZ/
-iSIzL+aFCr2lqBs23tPcLG07xxO9WSMs5uWk99gL7eqQQESolbuT1dCANLZGeA4f
-AJNG4e7p+exPFwIDAQABo0IwQDAdBgNVHQ4EFgQUZT/HiobGPN08VFw1+DrtUgxH
-V8gwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
-BQADggEBACo/4fEyjq7hmFxLXs9rHmoJ0iKpEsdeV31zVmSAhHqT5Am5EM2fKifh
-AHe+SMg1qIGf5LgsyX8OsNJLN13qudULXjS99HMpw+0mFZx+CFOKWI3QSyjfwbPf
-IPP54+M638yclNhOT8NrF7f3cuitZjO1JVOr4PhMqZ398g26rrnZqsZr+ZO7rqu4
-lzwDGrpDxpa5RXI4s6ehlj2Re37AIVNMh+3yC1SVUZPVIqUNivGTDj5UDrDYyU7c
-8jEyVupk+eq1nRZmQnLzf9OxMUP8pI4X8W0jq5Rm+K37DwhuJi1/FwcJsoz7UMCf
-lo3Ptv0AnVoUmr8CRPXBwp8iXqIPoeM=
------END CERTIFICATE-----
-
-# Issuer: CN=GDCA TrustAUTH R5 ROOT O=GUANG DONG CERTIFICATE AUTHORITY CO.,LTD.
-# Subject: CN=GDCA TrustAUTH R5 ROOT O=GUANG DONG CERTIFICATE AUTHORITY CO.,LTD.
-# Label: "GDCA TrustAUTH R5 ROOT"
-# Serial: 9009899650740120186
-# MD5 Fingerprint: 63:cc:d9:3d:34:35:5c:6f:53:a3:e2:08:70:48:1f:b4
-# SHA1 Fingerprint: 0f:36:38:5b:81:1a:25:c3:9b:31:4e:83:ca:e9:34:66:70:cc:74:b4
-# SHA256 Fingerprint: bf:ff:8f:d0:44:33:48:7d:6a:8a:a6:0c:1a:29:76:7a:9f:c2:bb:b0:5e:42:0f:71:3a:13:b9:92:89:1d:38:93
------BEGIN CERTIFICATE-----
-MIIFiDCCA3CgAwIBAgIIfQmX/vBH6nowDQYJKoZIhvcNAQELBQAwYjELMAkGA1UE
-BhMCQ04xMjAwBgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZ
-IENPLixMVEQuMR8wHQYDVQQDDBZHRENBIFRydXN0QVVUSCBSNSBST09UMB4XDTE0
-MTEyNjA1MTMxNVoXDTQwMTIzMTE1NTk1OVowYjELMAkGA1UEBhMCQ04xMjAwBgNV
-BAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZIENPLixMVEQuMR8w
-HQYDVQQDDBZHRENBIFRydXN0QVVUSCBSNSBST09UMIICIjANBgkqhkiG9w0BAQEF
-AAOCAg8AMIICCgKCAgEA2aMW8Mh0dHeb7zMNOwZ+Vfy1YI92hhJCfVZmPoiC7XJj
-Dp6L3TQsAlFRwxn9WVSEyfFrs0yw6ehGXTjGoqcuEVe6ghWinI9tsJlKCvLriXBj
-TnnEt1u9ol2x8kECK62pOqPseQrsXzrj/e+APK00mxqriCZ7VqKChh/rNYmDf1+u
-KU49tm7srsHwJ5uu4/Ts765/94Y9cnrrpftZTqfrlYwiOXnhLQiPzLyRuEH3FMEj
-qcOtmkVEs7LXLM3GKeJQEK5cy4KOFxg2fZfmiJqwTTQJ9Cy5WmYqsBebnh52nUpm
-MUHfP/vFBu8btn4aRjb3ZGM74zkYI+dndRTVdVeSN72+ahsmUPI2JgaQxXABZG12
-ZuGR224HwGGALrIuL4xwp9E7PLOR5G62xDtw8mySlwnNR30YwPO7ng/Wi64HtloP
-zgsMR6flPri9fcebNaBhlzpBdRfMK5Z3KpIhHtmVdiBnaM8Nvd/WHwlqmuLMc3Gk
-L30SgLdTMEZeS1SZD2fJpcjyIMGC7J0R38IC+xo70e0gmu9lZJIQDSri3nDxGGeC
-jGHeuLzRL5z7D9Ar7Rt2ueQ5Vfj4oR24qoAATILnsn8JuLwwoC8N9VKejveSswoA
-HQBUlwbgsQfZxw9cZX08bVlX5O2ljelAU58VS6Bx9hoh49pwBiFYFIeFd3mqgnkC
-AwEAAaNCMEAwHQYDVR0OBBYEFOLJQJ9NzuiaoXzPDj9lxSmIahlRMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQDRSVfg
-p8xoWLoBDysZzY2wYUWsEe1jUGn4H3++Fo/9nesLqjJHdtJnJO29fDMylyrHBYZm
-DRd9FBUb1Ov9H5r2XpdptxolpAqzkT9fNqyL7FeoPueBihhXOYV0GkLH6VsTX4/5
-COmSdI31R9KrO9b7eGZONn356ZLpBN79SWP8bfsUcZNnL0dKt7n/HipzcEYwv1ry
-L3ml4Y0M2fmyYzeMN2WFcGpcWwlyua1jPLHd+PwyvzeG5LuOmCd+uh8W4XAR8gPf
-JWIyJyYYMoSf/wA6E7qaTfRPuBRwIrHKK5DOKcFw9C+df/KQHtZa37dG/OaG+svg
-IHZ6uqbL9XzeYqWxi+7egmaKTjowHz+Ay60nugxe19CxVsp3cbK1daFQqUBDF8Io
-2c9Si1vIY9RCPqAzekYu9wogRlR+ak8x8YF+QnQ4ZXMn7sZ8uI7XpTrXmKGcjBBV
-09tL7ECQ8s1uV9JiDnxXk7Gnbc2dg7sq5+W2O3FYrf3RRbxake5TFW/TRQl1brqQ
-XR4EzzffHqhmsYzmIGrv/EhOdJhCrylvLmrH+33RZjEizIYAfmaDDEL0vTSSwxrq
-T8p+ck0LcIymSLumoRT2+1hEmRSuqguTaaApJUqlyyvdimYHFngVV3Eb7PVHhPOe
-MTd61X8kreS8/f3MboPoDKi3QWwH3b08hpcv0g==
------END CERTIFICATE-----
-
-# Issuer: CN=SSL.com Root Certification Authority RSA O=SSL Corporation
-# Subject: CN=SSL.com Root Certification Authority RSA O=SSL Corporation
-# Label: "SSL.com Root Certification Authority RSA"
-# Serial: 8875640296558310041
-# MD5 Fingerprint: 86:69:12:c0:70:f1:ec:ac:ac:c2:d5:bc:a5:5b:a1:29
-# SHA1 Fingerprint: b7:ab:33:08:d1:ea:44:77:ba:14:80:12:5a:6f:bd:a9:36:49:0c:bb
-# SHA256 Fingerprint: 85:66:6a:56:2e:e0:be:5c:e9:25:c1:d8:89:0a:6f:76:a8:7e:c1:6d:4d:7d:5f:29:ea:74:19:cf:20:12:3b:69
------BEGIN CERTIFICATE-----
-MIIF3TCCA8WgAwIBAgIIeyyb0xaAMpkwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UE
-BhMCVVMxDjAMBgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQK
-DA9TU0wgQ29ycG9yYXRpb24xMTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eSBSU0EwHhcNMTYwMjEyMTczOTM5WhcNNDEwMjEyMTcz
-OTM5WjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hv
-dXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNv
-bSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFJTQTCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBAPkP3aMrfcvQKv7sZ4Wm5y4bunfh4/WvpOz6Sl2R
-xFdHaxh3a3by/ZPkPQ/CFp4LZsNWlJ4Xg4XOVu/yFv0AYvUiCVToZRdOQbngT0aX
-qhvIuG5iXmmxX9sqAn78bMrzQdjt0Oj8P2FI7bADFB0QDksZ4LtO7IZl/zbzXmcC
-C52GVWH9ejjt/uIZALdvoVBidXQ8oPrIJZK0bnoix/geoeOy3ZExqysdBP+lSgQ3
-6YWkMyv94tZVNHwZpEpox7Ko07fKoZOI68GXvIz5HdkihCR0xwQ9aqkpk8zruFvh
-/l8lqjRYyMEjVJ0bmBHDOJx+PYZspQ9AhnwC9FwCTyjLrnGfDzrIM/4RJTXq/LrF
-YD3ZfBjVsqnTdXgDciLKOsMf7yzlLqn6niy2UUb9rwPW6mBo6oUWNmuF6R7As93E
-JNyAKoFBbZQ+yODJgUEAnl6/f8UImKIYLEJAs/lvOCdLToD0PYFH4Ih86hzOtXVc
-US4cK38acijnALXRdMbX5J+tB5O2UzU1/Dfkw/ZdFr4hc96SCvigY2q8lpJqPvi8
-ZVWb3vUNiSYE/CUapiVpy8JtynziWV+XrOvvLsi81xtZPCvM8hnIk2snYxnP/Okm
-+Mpxm3+T/jRnhE6Z6/yzeAkzcLpmpnbtG3PrGqUNxCITIJRWCk4sbE6x/c+cCbqi
-M+2HAgMBAAGjYzBhMB0GA1UdDgQWBBTdBAkHovV6fVJTEpKV7jiAJQ2mWTAPBgNV
-HRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFN0ECQei9Xp9UlMSkpXuOIAlDaZZMA4G
-A1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAIBgRlCn7Jp0cHh5wYfGV
-cpNxJK1ok1iOMq8bs3AD/CUrdIWQPXhq9LmLpZc7tRiRux6n+UBbkflVma8eEdBc
-Hadm47GUBwwyOabqG7B52B2ccETjit3E+ZUfijhDPwGFpUenPUayvOUiaPd7nNgs
-PgohyC0zrL/FgZkxdMF1ccW+sfAjRfSda/wZY52jvATGGAslu1OJD7OAUN5F7kR/
-q5R4ZJjT9ijdh9hwZXT7DrkT66cPYakylszeu+1jTBi7qUD3oFRuIIhxdRjqerQ0
-cuAjJ3dctpDqhiVAq+8zD8ufgr6iIPv2tS0a5sKFsXQP+8hlAqRSAUfdSSLBv9jr
-a6x+3uxjMxW3IwiPxg+NQVrdjsW5j+VFP3jbutIbQLH+cU0/4IGiul607BXgk90I
-H37hVZkLId6Tngr75qNJvTYw/ud3sqB1l7UtgYgXZSD32pAAn8lSzDLKNXz1PQ/Y
-K9f1JmzJBjSWFupwWRoyeXkLtoh/D1JIPb9s2KJELtFOt3JY04kTlf5Eq/jXixtu
-nLwsoFvVagCvXzfh1foQC5ichucmj87w7G6KVwuA406ywKBjYZC6VWg3dGq2ktuf
-oYYitmUnDuy2n0Jg5GfCtdpBC8TTi2EbvPofkSvXRAdeuims2cXp71NIWuuA8ShY
-Ic2wBlX7Jz9TkHCpBB5XJ7k=
------END CERTIFICATE-----
-
-# Issuer: CN=SSL.com Root Certification Authority ECC O=SSL Corporation
-# Subject: CN=SSL.com Root Certification Authority ECC O=SSL Corporation
-# Label: "SSL.com Root Certification Authority ECC"
-# Serial: 8495723813297216424
-# MD5 Fingerprint: 2e:da:e4:39:7f:9c:8f:37:d1:70:9f:26:17:51:3a:8e
-# SHA1 Fingerprint: c3:19:7c:39:24:e6:54:af:1b:c4:ab:20:95:7a:e2:c3:0e:13:02:6a
-# SHA256 Fingerprint: 34:17:bb:06:cc:60:07:da:1b:96:1c:92:0b:8a:b4:ce:3f:ad:82:0e:4a:a3:0b:9a:cb:c4:a7:4e:bd:ce:bc:65
------BEGIN CERTIFICATE-----
-MIICjTCCAhSgAwIBAgIIdebfy8FoW6gwCgYIKoZIzj0EAwIwfDELMAkGA1UEBhMC
-VVMxDjAMBgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9T
-U0wgQ29ycG9yYXRpb24xMTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0
-aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYwMjEyMTgxNDAzWhcNNDEwMjEyMTgxNDAz
-WjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0
-b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNvbSBS
-b290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuB
-BAAiA2IABEVuqVDEpiM2nl8ojRfLliJkP9x6jh3MCLOicSS6jkm5BBtHllirLZXI
-7Z4INcgn64mMU1jrYor+8FsPazFSY0E7ic3s7LaNGdM0B9y7xgZ/wkWV7Mt/qCPg
-CemB+vNH06NjMGEwHQYDVR0OBBYEFILRhXMw5zUE044CkvvlpNHEIejNMA8GA1Ud
-EwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUgtGFczDnNQTTjgKS++Wk0cQh6M0wDgYD
-VR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2cAMGQCMG/n61kRpGDPYbCWe+0F+S8T
-kdzt5fxQaxFGRrMcIQBiu77D5+jNB5n5DQtdcj7EqgIwH7y6C+IwJPt8bYBVCpk+
-gA0z5Wajs6O7pdWLjwkspl1+4vAHCGht0nxpbl/f5Wpl
------END CERTIFICATE-----
-
-# Issuer: CN=SSL.com EV Root Certification Authority RSA R2 O=SSL Corporation
-# Subject: CN=SSL.com EV Root Certification Authority RSA R2 O=SSL Corporation
-# Label: "SSL.com EV Root Certification Authority RSA R2"
-# Serial: 6248227494352943350
-# MD5 Fingerprint: e1:1e:31:58:1a:ae:54:53:02:f6:17:6a:11:7b:4d:95
-# SHA1 Fingerprint: 74:3a:f0:52:9b:d0:32:a0:f4:4a:83:cd:d4:ba:a9:7b:7c:2e:c4:9a
-# SHA256 Fingerprint: 2e:7b:f1:6c:c2:24:85:a7:bb:e2:aa:86:96:75:07:61:b0:ae:39:be:3b:2f:e9:d0:cc:6d:4e:f7:34:91:42:5c
------BEGIN CERTIFICATE-----
-MIIF6zCCA9OgAwIBAgIIVrYpzTS8ePYwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNV
-BAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UE
-CgwPU1NMIENvcnBvcmF0aW9uMTcwNQYDVQQDDC5TU0wuY29tIEVWIFJvb3QgQ2Vy
-dGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIyMB4XDTE3MDUzMTE4MTQzN1oXDTQy
-MDUzMDE4MTQzN1owgYIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4G
-A1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTcwNQYDVQQD
-DC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIy
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjzZlQOHWTcDXtOlG2mvq
-M0fNTPl9fb69LT3w23jhhqXZuglXaO1XPqDQCEGD5yhBJB/jchXQARr7XnAjssuf
-OePPxU7Gkm0mxnu7s9onnQqG6YE3Bf7wcXHswxzpY6IXFJ3vG2fThVUCAtZJycxa
-4bH3bzKfydQ7iEGonL3Lq9ttewkfokxykNorCPzPPFTOZw+oz12WGQvE43LrrdF9
-HSfvkusQv1vrO6/PgN3B0pYEW3p+pKk8OHakYo6gOV7qd89dAFmPZiw+B6KjBSYR
-aZfqhbcPlgtLyEDhULouisv3D5oi53+aNxPN8k0TayHRwMwi8qFG9kRpnMphNQcA
-b9ZhCBHqurj26bNg5U257J8UZslXWNvNh2n4ioYSA0e/ZhN2rHd9NCSFg83XqpyQ
-Gp8hLH94t2S42Oim9HizVcuE0jLEeK6jj2HdzghTreyI/BXkmg3mnxp3zkyPuBQV
-PWKchjgGAGYS5Fl2WlPAApiiECtoRHuOec4zSnaqW4EWG7WK2NAAe15itAnWhmMO
-pgWVSbooi4iTsjQc2KRVbrcc0N6ZVTsj9CLg+SlmJuwgUHfbSguPvuUCYHBBXtSu
-UDkiFCbLsjtzdFVHB3mBOagwE0TlBIqulhMlQg+5U8Sb/M3kHN48+qvWBkofZ6aY
-MBzdLNvcGJVXZsb/XItW9XcCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNV
-HSMEGDAWgBT5YLvU49U09rj1BoAlp3PbRmmonjAdBgNVHQ4EFgQU+WC71OPVNPa4
-9QaAJadz20ZpqJ4wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBW
-s47LCp1Jjr+kxJG7ZhcFUZh1++VQLHqe8RT6q9OKPv+RKY9ji9i0qVQBDb6Thi/5
-Sm3HXvVX+cpVHBK+Rw82xd9qt9t1wkclf7nxY/hoLVUE0fKNsKTPvDxeH3jnpaAg
-cLAExbf3cqfeIg29MyVGjGSSJuM+LmOW2puMPfgYCdcDzH2GguDKBAdRUNf/ktUM
-79qGn5nX67evaOI5JpS6aLe/g9Pqemc9YmeuJeVy6OLk7K4S9ksrPJ/psEDzOFSz
-/bdoyNrGj1E8svuR3Bznm53htw1yj+KkxKl4+esUrMZDBcJlOSgYAsOCsp0FvmXt
-ll9ldDz7CTUue5wT/RsPXcdtgTpWD8w74a8CLyKsRspGPKAcTNZEtF4uXBVmCeEm
-Kf7GUmG6sXP/wwyc5WxqlD8UykAWlYTzWamsX0xhk23RO8yilQwipmdnRC652dKK
-QbNmC1r7fSOl8hqw/96bg5Qu0T/fkreRrwU7ZcegbLHNYhLDkBvjJc40vG93drEQ
-w/cFGsDWr3RiSBd3kmmQYRzelYB0VI8YHMPzA9C/pEN1hlMYegouCRw2n5H9gooi
-S9EOUCXdywMMF8mDAAhONU2Ki+3wApRmLER/y5UnlhetCTCstnEXbosX9hwJ1C07
-mKVx01QT2WDz9UtmT/rx7iASjbSsV7FFY6GsdqnC+w==
------END CERTIFICATE-----
-
-# Issuer: CN=SSL.com EV Root Certification Authority ECC O=SSL Corporation
-# Subject: CN=SSL.com EV Root Certification Authority ECC O=SSL Corporation
-# Label: "SSL.com EV Root Certification Authority ECC"
-# Serial: 3182246526754555285
-# MD5 Fingerprint: 59:53:22:65:83:42:01:54:c0:ce:42:b9:5a:7c:f2:90
-# SHA1 Fingerprint: 4c:dd:51:a3:d1:f5:20:32:14:b0:c6:c5:32:23:03:91:c7:46:42:6d
-# SHA256 Fingerprint: 22:a2:c1:f7:bd:ed:70:4c:c1:e7:01:b5:f4:08:c3:10:88:0f:e9:56:b5:de:2a:4a:44:f9:9c:87:3a:25:a7:c8
------BEGIN CERTIFICATE-----
-MIIClDCCAhqgAwIBAgIILCmcWxbtBZUwCgYIKoZIzj0EAwIwfzELMAkGA1UEBhMC
-VVMxDjAMBgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9T
-U0wgQ29ycG9yYXRpb24xNDAyBgNVBAMMK1NTTC5jb20gRVYgUm9vdCBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYwMjEyMTgxNTIzWhcNNDEwMjEyMTgx
-NTIzWjB/MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hv
-dXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjE0MDIGA1UEAwwrU1NMLmNv
-bSBFViBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49
-AgEGBSuBBAAiA2IABKoSR5CYG/vvw0AHgyBO8TCCogbR8pKGYfL2IWjKAMTH6kMA
-VIbc/R/fALhBYlzccBYy3h+Z1MzFB8gIH2EWB1E9fVwHU+M1OIzfzZ/ZLg1Kthku
-WnBaBu2+8KGwytAJKaNjMGEwHQYDVR0OBBYEFFvKXuXe0oGqzagtZFG22XKbl+ZP
-MA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUW8pe5d7SgarNqC1kUbbZcpuX
-5k8wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2gAMGUCMQCK5kCJN+vp1RPZ
-ytRrJPOwPYdGWBrssd9v+1a6cGvHOMzosYxPD/fxZ3YOg9AeUY8CMD32IygmTMZg
-h5Mmm7I1HrrW9zzRHM76JTymGoEVW/MSD2zuZYrJh6j5B+BimoxcSg==
------END CERTIFICATE-----
-
-# Issuer: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R6
-# Subject: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R6
-# Label: "GlobalSign Root CA - R6"
-# Serial: 1417766617973444989252670301619537
-# MD5 Fingerprint: 4f:dd:07:e4:d4:22:64:39:1e:0c:37:42:ea:d1:c6:ae
-# SHA1 Fingerprint: 80:94:64:0e:b5:a7:a1:ca:11:9c:1f:dd:d5:9f:81:02:63:a7:fb:d1
-# SHA256 Fingerprint: 2c:ab:ea:fe:37:d0:6c:a2:2a:ba:73:91:c0:03:3d:25:98:29:52:c4:53:64:73:49:76:3a:3a:b5:ad:6c:cf:69
------BEGIN CERTIFICATE-----
-MIIFgzCCA2ugAwIBAgIORea7A4Mzw4VlSOb/RVEwDQYJKoZIhvcNAQEMBQAwTDEg
-MB4GA1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjYxEzARBgNVBAoTCkdsb2Jh
-bFNpZ24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMTQxMjEwMDAwMDAwWhcNMzQx
-MjEwMDAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSNjET
-MBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAJUH6HPKZvnsFMp7PPcNCPG0RQssgrRI
-xutbPK6DuEGSMxSkb3/pKszGsIhrxbaJ0cay/xTOURQh7ErdG1rG1ofuTToVBu1k
-ZguSgMpE3nOUTvOniX9PeGMIyBJQbUJmL025eShNUhqKGoC3GYEOfsSKvGRMIRxD
-aNc9PIrFsmbVkJq3MQbFvuJtMgamHvm566qjuL++gmNQ0PAYid/kD3n16qIfKtJw
-LnvnvJO7bVPiSHyMEAc4/2ayd2F+4OqMPKq0pPbzlUoSB239jLKJz9CgYXfIWHSw
-1CM69106yqLbnQneXUQtkPGBzVeS+n68UARjNN9rkxi+azayOeSsJDa38O+2HBNX
-k7besvjihbdzorg1qkXy4J02oW9UivFyVm4uiMVRQkQVlO6jxTiWm05OWgtH8wY2
-SXcwvHE35absIQh1/OZhFj931dmRl4QKbNQCTXTAFO39OfuD8l4UoQSwC+n+7o/h
-bguyCLNhZglqsQY6ZZZZwPA1/cnaKI0aEYdwgQqomnUdnjqGBQCe24DWJfncBZ4n
-WUx2OVvq+aWh2IMP0f/fMBH5hc8zSPXKbWQULHpYT9NLCEnFlWQaYw55PfWzjMpY
-rZxCRXluDocZXFSxZba/jJvcE+kNb7gu3GduyYsRtYQUigAZcIN5kZeR1Bonvzce
-MgfYFGM8KEyvAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTAD
-AQH/MB0GA1UdDgQWBBSubAWjkxPioufi1xzWx/B/yGdToDAfBgNVHSMEGDAWgBSu
-bAWjkxPioufi1xzWx/B/yGdToDANBgkqhkiG9w0BAQwFAAOCAgEAgyXt6NH9lVLN
-nsAEoJFp5lzQhN7craJP6Ed41mWYqVuoPId8AorRbrcWc+ZfwFSY1XS+wc3iEZGt
-Ixg93eFyRJa0lV7Ae46ZeBZDE1ZXs6KzO7V33EByrKPrmzU+sQghoefEQzd5Mr61
-55wsTLxDKZmOMNOsIeDjHfrYBzN2VAAiKrlNIC5waNrlU/yDXNOd8v9EDERm8tLj
-vUYAGm0CuiVdjaExUd1URhxN25mW7xocBFymFe944Hn+Xds+qkxV/ZoVqW/hpvvf
-cDDpw+5CRu3CkwWJ+n1jez/QcYF8AOiYrg54NMMl+68KnyBr3TsTjxKM4kEaSHpz
-oHdpx7Zcf4LIHv5YGygrqGytXm3ABdJ7t+uA/iU3/gKbaKxCXcPu9czc8FB10jZp
-nOZ7BN9uBmm23goJSFmH63sUYHpkqmlD75HHTOwY3WzvUy2MmeFe8nI+z1TIvWfs
-pA9MRf/TuTAjB0yPEL+GltmZWrSZVxykzLsViVO6LAUP5MSeGbEYNNVMnbrt9x+v
-JJUEeKgDu+6B5dpffItKoZB0JaezPkvILFa9x8jvOOJckvB595yEunQtYQEgfn7R
-8k8HWV+LLUNS60YMlOH1Zkd5d9VUWx+tJDfLRVpOoERIyNiwmcUVhAn21klJwGW4
-5hpxbqCo8YLoRT5s1gLXCmeDBVrJpBA=
------END CERTIFICATE-----
-
-# Issuer: CN=OISTE WISeKey Global Root GC CA O=WISeKey OU=OISTE Foundation Endorsed
-# Subject: CN=OISTE WISeKey Global Root GC CA O=WISeKey OU=OISTE Foundation Endorsed
-# Label: "OISTE WISeKey Global Root GC CA"
-# Serial: 44084345621038548146064804565436152554
-# MD5 Fingerprint: a9:d6:b9:2d:2f:93:64:f8:a5:69:ca:91:e9:68:07:23
-# SHA1 Fingerprint: e0:11:84:5e:34:de:be:88:81:b9:9c:f6:16:26:d1:96:1f:c3:b9:31
-# SHA256 Fingerprint: 85:60:f9:1c:36:24:da:ba:95:70:b5:fe:a0:db:e3:6f:f1:1a:83:23:be:94:86:85:4f:b3:f3:4a:55:71:19:8d
------BEGIN CERTIFICATE-----
-MIICaTCCAe+gAwIBAgIQISpWDK7aDKtARb8roi066jAKBggqhkjOPQQDAzBtMQsw
-CQYDVQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91
-bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwg
-Um9vdCBHQyBDQTAeFw0xNzA1MDkwOTQ4MzRaFw00MjA1MDkwOTU4MzNaMG0xCzAJ
-BgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYDVQQLExlPSVNURSBGb3Vu
-ZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEdsb2JhbCBS
-b290IEdDIENBMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAETOlQwMYPchi82PG6s4ni
-eUqjFqdrVCTbUf/q9Akkwwsin8tqJ4KBDdLArzHkdIJuyiXZjHWd8dvQmqJLIX4W
-p2OQ0jnUsYd4XxiWD1AbNTcPasbc2RNNpI6QN+a9WzGRo1QwUjAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUSIcUrOPDnpBgOtfKie7T
-rYy0UGYwEAYJKwYBBAGCNxUBBAMCAQAwCgYIKoZIzj0EAwMDaAAwZQIwJsdpW9zV
-57LnyAyMjMPdeYwbY9XJUpROTYJKcx6ygISpJcBMWm1JKWB4E+J+SOtkAjEA2zQg
-Mgj/mkkCtojeFK9dbJlxjRo/i9fgojaGHAeCOnZT/cKi7e97sIBPWA9LUzm9
------END CERTIFICATE-----
-
-# Issuer: CN=UCA Global G2 Root O=UniTrust
-# Subject: CN=UCA Global G2 Root O=UniTrust
-# Label: "UCA Global G2 Root"
-# Serial: 124779693093741543919145257850076631279
-# MD5 Fingerprint: 80:fe:f0:c4:4a:f0:5c:62:32:9f:1c:ba:78:a9:50:f8
-# SHA1 Fingerprint: 28:f9:78:16:19:7a:ff:18:25:18:aa:44:fe:c1:a0:ce:5c:b6:4c:8a
-# SHA256 Fingerprint: 9b:ea:11:c9:76:fe:01:47:64:c1:be:56:a6:f9:14:b5:a5:60:31:7a:bd:99:88:39:33:82:e5:16:1a:a0:49:3c
------BEGIN CERTIFICATE-----
-MIIFRjCCAy6gAwIBAgIQXd+x2lqj7V2+WmUgZQOQ7zANBgkqhkiG9w0BAQsFADA9
-MQswCQYDVQQGEwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxGzAZBgNVBAMMElVDQSBH
-bG9iYWwgRzIgUm9vdDAeFw0xNjAzMTEwMDAwMDBaFw00MDEyMzEwMDAwMDBaMD0x
-CzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlUcnVzdDEbMBkGA1UEAwwSVUNBIEds
-b2JhbCBHMiBSb290MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxeYr
-b3zvJgUno4Ek2m/LAfmZmqkywiKHYUGRO8vDaBsGxUypK8FnFyIdK+35KYmToni9
-kmugow2ifsqTs6bRjDXVdfkX9s9FxeV67HeToI8jrg4aA3++1NDtLnurRiNb/yzm
-VHqUwCoV8MmNsHo7JOHXaOIxPAYzRrZUEaalLyJUKlgNAQLx+hVRZ2zA+te2G3/R
-VogvGjqNO7uCEeBHANBSh6v7hn4PJGtAnTRnvI3HLYZveT6OqTwXS3+wmeOwcWDc
-C/Vkw85DvG1xudLeJ1uK6NjGruFZfc8oLTW4lVYa8bJYS7cSN8h8s+1LgOGN+jIj
-tm+3SJUIsUROhYw6AlQgL9+/V087OpAh18EmNVQg7Mc/R+zvWr9LesGtOxdQXGLY
-D0tK3Cv6brxzks3sx1DoQZbXqX5t2Okdj4q1uViSukqSKwxW/YDrCPBeKW4bHAyv
-j5OJrdu9o54hyokZ7N+1wxrrFv54NkzWbtA+FxyQF2smuvt6L78RHBgOLXMDj6Dl
-NaBa4kx1HXHhOThTeEDMg5PXCp6dW4+K5OXgSORIskfNTip1KnvyIvbJvgmRlld6
-iIis7nCs+dwp4wwcOxJORNanTrAmyPPZGpeRaOrvjUYG0lZFWJo8DA+DuAUlwznP
-O6Q0ibd5Ei9Hxeepl2n8pndntd978XplFeRhVmUCAwEAAaNCMEAwDgYDVR0PAQH/
-BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFIHEjMz15DD/pQwIX4wV
-ZyF0Ad/fMA0GCSqGSIb3DQEBCwUAA4ICAQATZSL1jiutROTL/7lo5sOASD0Ee/oj
-L3rtNtqyzm325p7lX1iPyzcyochltq44PTUbPrw7tgTQvPlJ9Zv3hcU2tsu8+Mg5
-1eRfB70VVJd0ysrtT7q6ZHafgbiERUlMjW+i67HM0cOU2kTC5uLqGOiiHycFutfl
-1qnN3e92mI0ADs0b+gO3joBYDic/UvuUospeZcnWhNq5NXHzJsBPd+aBJ9J3O5oU
-b3n09tDh05S60FdRvScFDcH9yBIw7m+NESsIndTUv4BFFJqIRNow6rSn4+7vW4LV
-PtateJLbXDzz2K36uGt/xDYotgIVilQsnLAXc47QN6MUPJiVAAwpBVueSUmxX8fj
-y88nZY41F7dXyDDZQVu5FLbowg+UMaeUmMxq67XhJ/UQqAHojhJi6IjMtX9Gl8Cb
-EGY4GjZGXyJoPd/JxhMnq1MGrKI8hgZlb7F+sSlEmqO6SWkoaY/X5V+tBIZkbxqg
-DMUIYs6Ao9Dz7GjevjPHF1t/gMRMTLGmhIrDO7gJzRSBuhjjVFc2/tsvfEehOjPI
-+Vg7RE+xygKJBJYoaMVLuCaJu9YzL1DV/pqJuhgyklTGW+Cd+V7lDSKb9triyCGy
-YiGqhkCyLmTTX8jjfhFnRR8F/uOi77Oos/N9j/gMHyIfLXC0uAE0djAA5SN4p1bX
-UB+K+wb1whnw0A==
------END CERTIFICATE-----
-
-# Issuer: CN=UCA Extended Validation Root O=UniTrust
-# Subject: CN=UCA Extended Validation Root O=UniTrust
-# Label: "UCA Extended Validation Root"
-# Serial: 106100277556486529736699587978573607008
-# MD5 Fingerprint: a1:f3:5f:43:c6:34:9b:da:bf:8c:7e:05:53:ad:96:e2
-# SHA1 Fingerprint: a3:a1:b0:6f:24:61:23:4a:e3:36:a5:c2:37:fc:a6:ff:dd:f0:d7:3a
-# SHA256 Fingerprint: d4:3a:f9:b3:54:73:75:5c:96:84:fc:06:d7:d8:cb:70:ee:5c:28:e7:73:fb:29:4e:b4:1e:e7:17:22:92:4d:24
------BEGIN CERTIFICATE-----
-MIIFWjCCA0KgAwIBAgIQT9Irj/VkyDOeTzRYZiNwYDANBgkqhkiG9w0BAQsFADBH
-MQswCQYDVQQGEwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxJTAjBgNVBAMMHFVDQSBF
-eHRlbmRlZCBWYWxpZGF0aW9uIFJvb3QwHhcNMTUwMzEzMDAwMDAwWhcNMzgxMjMx
-MDAwMDAwWjBHMQswCQYDVQQGEwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxJTAjBgNV
-BAMMHFVDQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFJvb3QwggIiMA0GCSqGSIb3DQEB
-AQUAA4ICDwAwggIKAoICAQCpCQcoEwKwmeBkqh5DFnpzsZGgdT6o+uM4AHrsiWog
-D4vFsJszA1qGxliG1cGFu0/GnEBNyr7uaZa4rYEwmnySBesFK5pI0Lh2PpbIILvS
-sPGP2KxFRv+qZ2C0d35qHzwaUnoEPQc8hQ2E0B92CvdqFN9y4zR8V05WAT558aop
-O2z6+I9tTcg1367r3CTueUWnhbYFiN6IXSV8l2RnCdm/WhUFhvMJHuxYMjMR83dk
-sHYf5BA1FxvyDrFspCqjc/wJHx4yGVMR59mzLC52LqGj3n5qiAno8geK+LLNEOfi
-c0CTuwjRP+H8C5SzJe98ptfRr5//lpr1kXuYC3fUfugH0mK1lTnj8/FtDw5lhIpj
-VMWAtuCeS31HJqcBCF3RiJ7XwzJE+oJKCmhUfzhTA8ykADNkUVkLo4KRel7sFsLz
-KuZi2irbWWIQJUoqgQtHB0MGcIfS+pMRKXpITeuUx3BNr2fVUbGAIAEBtHoIppB/
-TuDvB0GHr2qlXov7z1CymlSvw4m6WC31MJixNnI5fkkE/SmnTHnkBVfblLkWU41G
-sx2VYVdWf6/wFlthWG82UBEL2KwrlRYaDh8IzTY0ZRBiZtWAXxQgXy0MoHgKaNYs
-1+lvK9JKBZP8nm9rZ/+I8U6laUpSNwXqxhaN0sSZ0YIrO7o1dfdRUVjzyAfd5LQD
-fwIDAQABo0IwQDAdBgNVHQ4EFgQU2XQ65DA9DfcS3H5aBZ8eNJr34RQwDwYDVR0T
-AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQADggIBADaN
-l8xCFWQpN5smLNb7rhVpLGsaGvdftvkHTFnq88nIua7Mui563MD1sC3AO6+fcAUR
-ap8lTwEpcOPlDOHqWnzcSbvBHiqB9RZLcpHIojG5qtr8nR/zXUACE/xOHAbKsxSQ
-VBcZEhrxH9cMaVr2cXj0lH2RC47skFSOvG+hTKv8dGT9cZr4QQehzZHkPJrgmzI5
-c6sq1WnIeJEmMX3ixzDx/BR4dxIOE/TdFpS/S2d7cFOFyrC78zhNLJA5wA3CXWvp
-4uXViI3WLL+rG761KIcSF3Ru/H38j9CHJrAb+7lsq+KePRXBOy5nAliRn+/4Qh8s
-t2j1da3Ptfb/EX3C8CSlrdP6oDyp+l3cpaDvRKS+1ujl5BOWF3sGPjLtx7dCvHaj
-2GU4Kzg1USEODm8uNBNA4StnDG1KQTAYI1oyVZnJF+A83vbsea0rWBmirSwiGpWO
-vpaQXUJXxPkUAzUrHC1RVwinOt4/5Mi0A3PCwSaAuwtCH60NryZy2sy+s6ODWA2C
-xR9GUeOcGMyNm43sSet1UNWMKFnKdDTajAshqx7qG+XH/RU+wBeq+yNuJkbL+vmx
-cmtpzyKEC2IPrNkZAJSidjzULZrtBJ4tBmIQN1IchXIbJ+XMxjHsN+xjWZsLHXbM
-fjKaiJUINlK73nZfdklJrX+9ZSCyycErdhh2n1ax
------END CERTIFICATE-----
-
-# Issuer: CN=Certigna Root CA O=Dhimyotis OU=0002 48146308100036
-# Subject: CN=Certigna Root CA O=Dhimyotis OU=0002 48146308100036
-# Label: "Certigna Root CA"
-# Serial: 269714418870597844693661054334862075617
-# MD5 Fingerprint: 0e:5c:30:62:27:eb:5b:bc:d7:ae:62:ba:e9:d5:df:77
-# SHA1 Fingerprint: 2d:0d:52:14:ff:9e:ad:99:24:01:74:20:47:6e:6c:85:27:27:f5:43
-# SHA256 Fingerprint: d4:8d:3d:23:ee:db:50:a4:59:e5:51:97:60:1c:27:77:4b:9d:7b:18:c9:4d:5a:05:95:11:a1:02:50:b9:31:68
------BEGIN CERTIFICATE-----
-MIIGWzCCBEOgAwIBAgIRAMrpG4nxVQMNo+ZBbcTjpuEwDQYJKoZIhvcNAQELBQAw
-WjELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczEcMBoGA1UECwwTMDAw
-MiA0ODE0NjMwODEwMDAzNjEZMBcGA1UEAwwQQ2VydGlnbmEgUm9vdCBDQTAeFw0x
-MzEwMDEwODMyMjdaFw0zMzEwMDEwODMyMjdaMFoxCzAJBgNVBAYTAkZSMRIwEAYD
-VQQKDAlEaGlteW90aXMxHDAaBgNVBAsMEzAwMDIgNDgxNDYzMDgxMDAwMzYxGTAX
-BgNVBAMMEENlcnRpZ25hIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-ggIKAoICAQDNGDllGlmx6mQWDoyUJJV8g9PFOSbcDO8WV43X2KyjQn+Cyu3NW9sO
-ty3tRQgXstmzy9YXUnIo245Onoq2C/mehJpNdt4iKVzSs9IGPjA5qXSjklYcoW9M
-CiBtnyN6tMbaLOQdLNyzKNAT8kxOAkmhVECe5uUFoC2EyP+YbNDrihqECB63aCPu
-I9Vwzm1RaRDuoXrC0SIxwoKF0vJVdlB8JXrJhFwLrN1CTivngqIkicuQstDuI7pm
-TLtipPlTWmR7fJj6o0ieD5Wupxj0auwuA0Wv8HT4Ks16XdG+RCYyKfHx9WzMfgIh
-C59vpD++nVPiz32pLHxYGpfhPTc3GGYo0kDFUYqMwy3OU4gkWGQwFsWq4NYKpkDf
-ePb1BHxpE4S80dGnBs8B92jAqFe7OmGtBIyT46388NtEbVncSVmurJqZNjBBe3Yz
-IoejwpKGbvlw7q6Hh5UbxHq9MfPU0uWZ/75I7HX1eBYdpnDBfzwboZL7z8g81sWT
-Co/1VTp2lc5ZmIoJlXcymoO6LAQ6l73UL77XbJuiyn1tJslV1c/DeVIICZkHJC1k
-JWumIWmbat10TWuXekG9qxf5kBdIjzb5LdXF2+6qhUVB+s06RbFo5jZMm5BX7CO5
-hwjCxAnxl4YqKE3idMDaxIzb3+KhF1nOJFl0Mdp//TBt2dzhauH8XwIDAQABo4IB
-GjCCARYwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
-FBiHVuBud+4kNTxOc5of1uHieX4rMB8GA1UdIwQYMBaAFBiHVuBud+4kNTxOc5of
-1uHieX4rMEQGA1UdIAQ9MDswOQYEVR0gADAxMC8GCCsGAQUFBwIBFiNodHRwczov
-L3d3d3cuY2VydGlnbmEuZnIvYXV0b3JpdGVzLzBtBgNVHR8EZjBkMC+gLaArhilo
-dHRwOi8vY3JsLmNlcnRpZ25hLmZyL2NlcnRpZ25hcm9vdGNhLmNybDAxoC+gLYYr
-aHR0cDovL2NybC5kaGlteW90aXMuY29tL2NlcnRpZ25hcm9vdGNhLmNybDANBgkq
-hkiG9w0BAQsFAAOCAgEAlLieT/DjlQgi581oQfccVdV8AOItOoldaDgvUSILSo3L
-6btdPrtcPbEo/uRTVRPPoZAbAh1fZkYJMyjhDSSXcNMQH+pkV5a7XdrnxIxPTGRG
-HVyH41neQtGbqH6mid2PHMkwgu07nM3A6RngatgCdTer9zQoKJHyBApPNeNgJgH6
-0BGM+RFq7q89w1DTj18zeTyGqHNFkIwgtnJzFyO+B2XleJINugHA64wcZr+shncB
-lA2c5uk5jR+mUYyZDDl34bSb+hxnV29qao6pK0xXeXpXIs/NX2NGjVxZOob4Mkdi
-o2cNGJHc+6Zr9UhhcyNZjgKnvETq9Emd8VRY+WCv2hikLyhF3HqgiIZd8zvn/yk1
-gPxkQ5Tm4xxvvq0OKmOZK8l+hfZx6AYDlf7ej0gcWtSS6Cvu5zHbugRqh5jnxV/v
-faci9wHYTfmJ0A6aBVmknpjZbyvKcL5kwlWj9Omvw5Ip3IgWJJk8jSaYtlu3zM63
-Nwf9JtmYhST/WSMDmu2dnajkXjjO11INb9I/bbEFa0nOipFGc/T2L/Coc3cOZayh
-jWZSaX5LaAzHHjcng6WMxwLkFM1JAbBzs/3GkDpv0mztO+7skb6iQ12LAEpmJURw
-3kAP+HwV96LOPNdeE4yBFxgX0b3xdxA61GU5wSesVywlVP+i2k+KYTlerj1KjL0=
------END CERTIFICATE-----
-
-# Issuer: CN=emSign Root CA - G1 O=eMudhra Technologies Limited OU=emSign PKI
-# Subject: CN=emSign Root CA - G1 O=eMudhra Technologies Limited OU=emSign PKI
-# Label: "emSign Root CA - G1"
-# Serial: 235931866688319308814040
-# MD5 Fingerprint: 9c:42:84:57:dd:cb:0b:a7:2e:95:ad:b6:f3:da:bc:ac
-# SHA1 Fingerprint: 8a:c7:ad:8f:73:ac:4e:c1:b5:75:4d:a5:40:f4:fc:cf:7c:b5:8e:8c
-# SHA256 Fingerprint: 40:f6:af:03:46:a9:9a:a1:cd:1d:55:5a:4e:9c:ce:62:c7:f9:63:46:03:ee:40:66:15:83:3d:c8:c8:d0:03:67
------BEGIN CERTIFICATE-----
-MIIDlDCCAnygAwIBAgIKMfXkYgxsWO3W2DANBgkqhkiG9w0BAQsFADBnMQswCQYD
-VQQGEwJJTjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBU
-ZWNobm9sb2dpZXMgTGltaXRlZDEcMBoGA1UEAxMTZW1TaWduIFJvb3QgQ0EgLSBH
-MTAeFw0xODAyMTgxODMwMDBaFw00MzAyMTgxODMwMDBaMGcxCzAJBgNVBAYTAklO
-MRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xv
-Z2llcyBMaW1pdGVkMRwwGgYDVQQDExNlbVNpZ24gUm9vdCBDQSAtIEcxMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk0u76WaK7p1b1TST0Bsew+eeuGQz
-f2N4aLTNLnF115sgxk0pvLZoYIr3IZpWNVrzdr3YzZr/k1ZLpVkGoZM0Kd0WNHVO
-8oG0x5ZOrRkVUkr+PHB1cM2vK6sVmjM8qrOLqs1D/fXqcP/tzxE7lM5OMhbTI0Aq
-d7OvPAEsbO2ZLIvZTmmYsvePQbAyeGHWDV/D+qJAkh1cF+ZwPjXnorfCYuKrpDhM
-tTk1b+oDafo6VGiFbdbyL0NVHpENDtjVaqSW0RM8LHhQ6DqS0hdW5TUaQBw+jSzt
-Od9C4INBdN+jzcKGYEho42kLVACL5HZpIQ15TjQIXhTCzLG3rdd8cIrHhQIDAQAB
-o0IwQDAdBgNVHQ4EFgQU++8Nhp6w492pufEhF38+/PB3KxowDgYDVR0PAQH/BAQD
-AgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAFn/8oz1h31x
-PaOfG1vR2vjTnGs2vZupYeveFix0PZ7mddrXuqe8QhfnPZHr5X3dPpzxz5KsbEjM
-wiI/aTvFthUvozXGaCocV685743QNcMYDHsAVhzNixl03r4PEuDQqqE/AjSxcM6d
-GNYIAwlG7mDgfrbESQRRfXBgvKqy/3lyeqYdPV8q+Mri/Tm3R7nrft8EI6/6nAYH
-6ftjk4BAtcZsCjEozgyfz7MjNYBBjWzEN3uBL4ChQEKF6dk4jeihU80Bv2noWgby
-RQuQ+q7hv53yrlc8pa6yVvSLZUDp/TGBLPQ5Cdjua6e0ph0VpZj3AYHYhX3zUVxx
-iN66zB+Afko=
------END CERTIFICATE-----
-
-# Issuer: CN=emSign ECC Root CA - G3 O=eMudhra Technologies Limited OU=emSign PKI
-# Subject: CN=emSign ECC Root CA - G3 O=eMudhra Technologies Limited OU=emSign PKI
-# Label: "emSign ECC Root CA - G3"
-# Serial: 287880440101571086945156
-# MD5 Fingerprint: ce:0b:72:d1:9f:88:8e:d0:50:03:e8:e3:b8:8b:67:40
-# SHA1 Fingerprint: 30:43:fa:4f:f2:57:dc:a0:c3:80:ee:2e:58:ea:78:b2:3f:e6:bb:c1
-# SHA256 Fingerprint: 86:a1:ec:ba:08:9c:4a:8d:3b:be:27:34:c6:12:ba:34:1d:81:3e:04:3c:f9:e8:a8:62:cd:5c:57:a3:6b:be:6b
------BEGIN CERTIFICATE-----
-MIICTjCCAdOgAwIBAgIKPPYHqWhwDtqLhDAKBggqhkjOPQQDAzBrMQswCQYDVQQG
-EwJJTjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNo
-bm9sb2dpZXMgTGltaXRlZDEgMB4GA1UEAxMXZW1TaWduIEVDQyBSb290IENBIC0g
-RzMwHhcNMTgwMjE4MTgzMDAwWhcNNDMwMjE4MTgzMDAwWjBrMQswCQYDVQQGEwJJ
-TjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNobm9s
-b2dpZXMgTGltaXRlZDEgMB4GA1UEAxMXZW1TaWduIEVDQyBSb290IENBIC0gRzMw
-djAQBgcqhkjOPQIBBgUrgQQAIgNiAAQjpQy4LRL1KPOxst3iAhKAnjlfSU2fySU0
-WXTsuwYc58Byr+iuL+FBVIcUqEqy6HyC5ltqtdyzdc6LBtCGI79G1Y4PPwT01xyS
-fvalY8L1X44uT6EYGQIrMgqCZH0Wk9GjQjBAMB0GA1UdDgQWBBR8XQKEE9TMipuB
-zhccLikenEhjQjAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggq
-hkjOPQQDAwNpADBmAjEAvvNhzwIQHWSVB7gYboiFBS+DCBeQyh+KTOgNG3qxrdWB
-CUfvO6wIBHxcmbHtRwfSAjEAnbpV/KlK6O3t5nYBQnvI+GDZjVGLVTv7jHvrZQnD
-+JbNR6iC8hZVdyR+EhCVBCyj
------END CERTIFICATE-----
-
-# Issuer: CN=emSign Root CA - C1 O=eMudhra Inc OU=emSign PKI
-# Subject: CN=emSign Root CA - C1 O=eMudhra Inc OU=emSign PKI
-# Label: "emSign Root CA - C1"
-# Serial: 825510296613316004955058
-# MD5 Fingerprint: d8:e3:5d:01:21:fa:78:5a:b0:df:ba:d2:ee:2a:5f:68
-# SHA1 Fingerprint: e7:2e:f1:df:fc:b2:09:28:cf:5d:d4:d5:67:37:b1:51:cb:86:4f:01
-# SHA256 Fingerprint: 12:56:09:aa:30:1d:a0:a2:49:b9:7a:82:39:cb:6a:34:21:6f:44:dc:ac:9f:39:54:b1:42:92:f2:e8:c8:60:8f
------BEGIN CERTIFICATE-----
-MIIDczCCAlugAwIBAgILAK7PALrEzzL4Q7IwDQYJKoZIhvcNAQELBQAwVjELMAkG
-A1UEBhMCVVMxEzARBgNVBAsTCmVtU2lnbiBQS0kxFDASBgNVBAoTC2VNdWRocmEg
-SW5jMRwwGgYDVQQDExNlbVNpZ24gUm9vdCBDQSAtIEMxMB4XDTE4MDIxODE4MzAw
-MFoXDTQzMDIxODE4MzAwMFowVjELMAkGA1UEBhMCVVMxEzARBgNVBAsTCmVtU2ln
-biBQS0kxFDASBgNVBAoTC2VNdWRocmEgSW5jMRwwGgYDVQQDExNlbVNpZ24gUm9v
-dCBDQSAtIEMxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz+upufGZ
-BczYKCFK83M0UYRWEPWgTywS4/oTmifQz/l5GnRfHXk5/Fv4cI7gklL35CX5VIPZ
-HdPIWoU/Xse2B+4+wM6ar6xWQio5JXDWv7V7Nq2s9nPczdcdioOl+yuQFTdrHCZH
-3DspVpNqs8FqOp099cGXOFgFixwR4+S0uF2FHYP+eF8LRWgYSKVGczQ7/g/IdrvH
-GPMF0Ybzhe3nudkyrVWIzqa2kbBPrH4VI5b2P/AgNBbeCsbEBEV5f6f9vtKppa+c
-xSMq9zwhbL2vj07FOrLzNBL834AaSaTUqZX3noleoomslMuoaJuvimUnzYnu3Yy1
-aylwQ6BpC+S5DwIDAQABo0IwQDAdBgNVHQ4EFgQU/qHgcB4qAzlSWkK+XJGFehiq
-TbUwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
-BQADggEBAMJKVvoVIXsoounlHfv4LcQ5lkFMOycsxGwYFYDGrK9HWS8mC+M2sO87
-/kOXSTKZEhVb3xEp/6tT+LvBeA+snFOvV71ojD1pM/CjoCNjO2RnIkSt1XHLVip4
-kqNPEjE2NuLe/gDEo2APJ62gsIq1NnpSob0n9CAnYuhNlCQT5AoE6TyrLshDCUrG
-YQTlSTR+08TI9Q/Aqum6VF7zYytPT1DU/rl7mYw9wC68AivTxEDkigcxHpvOJpkT
-+xHqmiIMERnHXhuBUDDIlhJu58tBf5E7oke3VIAb3ADMmpDqw8NQBmIMMMAVSKeo
-WXzhriKi4gp6D/piq1JM4fHfyr6DDUI=
------END CERTIFICATE-----
-
-# Issuer: CN=emSign ECC Root CA - C3 O=eMudhra Inc OU=emSign PKI
-# Subject: CN=emSign ECC Root CA - C3 O=eMudhra Inc OU=emSign PKI
-# Label: "emSign ECC Root CA - C3"
-# Serial: 582948710642506000014504
-# MD5 Fingerprint: 3e:53:b3:a3:81:ee:d7:10:f8:d3:b0:1d:17:92:f5:d5
-# SHA1 Fingerprint: b6:af:43:c2:9b:81:53:7d:f6:ef:6b:c3:1f:1f:60:15:0c:ee:48:66
-# SHA256 Fingerprint: bc:4d:80:9b:15:18:9d:78:db:3e:1d:8c:f4:f9:72:6a:79:5d:a1:64:3c:a5:f1:35:8e:1d:db:0e:dc:0d:7e:b3
------BEGIN CERTIFICATE-----
-MIICKzCCAbGgAwIBAgIKe3G2gla4EnycqDAKBggqhkjOPQQDAzBaMQswCQYDVQQG
-EwJVUzETMBEGA1UECxMKZW1TaWduIFBLSTEUMBIGA1UEChMLZU11ZGhyYSBJbmMx
-IDAeBgNVBAMTF2VtU2lnbiBFQ0MgUm9vdCBDQSAtIEMzMB4XDTE4MDIxODE4MzAw
-MFoXDTQzMDIxODE4MzAwMFowWjELMAkGA1UEBhMCVVMxEzARBgNVBAsTCmVtU2ln
-biBQS0kxFDASBgNVBAoTC2VNdWRocmEgSW5jMSAwHgYDVQQDExdlbVNpZ24gRUND
-IFJvb3QgQ0EgLSBDMzB2MBAGByqGSM49AgEGBSuBBAAiA2IABP2lYa57JhAd6bci
-MK4G9IGzsUJxlTm801Ljr6/58pc1kjZGDoeVjbk5Wum739D+yAdBPLtVb4Ojavti
-sIGJAnB9SMVK4+kiVCJNk7tCDK93nCOmfddhEc5lx/h//vXyqaNCMEAwHQYDVR0O
-BBYEFPtaSNCAIEDyqOkAB2kZd6fmw/TPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMB
-Af8EBTADAQH/MAoGCCqGSM49BAMDA2gAMGUCMQC02C8Cif22TGK6Q04ThHK1rt0c
-3ta13FaPWEBaLd4gTCKDypOofu4SQMfWh0/434UCMBwUZOR8loMRnLDRWmFLpg9J
-0wD8ofzkpf9/rdcw0Md3f76BB1UwUCAU9Vc4CqgxUQ==
------END CERTIFICATE-----
-
-# Issuer: CN=Hongkong Post Root CA 3 O=Hongkong Post
-# Subject: CN=Hongkong Post Root CA 3 O=Hongkong Post
-# Label: "Hongkong Post Root CA 3"
-# Serial: 46170865288971385588281144162979347873371282084
-# MD5 Fingerprint: 11:fc:9f:bd:73:30:02:8a:fd:3f:f3:58:b9:cb:20:f0
-# SHA1 Fingerprint: 58:a2:d0:ec:20:52:81:5b:c1:f3:f8:64:02:24:4e:c2:8e:02:4b:02
-# SHA256 Fingerprint: 5a:2f:c0:3f:0c:83:b0:90:bb:fa:40:60:4b:09:88:44:6c:76:36:18:3d:f9:84:6e:17:10:1a:44:7f:b8:ef:d6
------BEGIN CERTIFICATE-----
-MIIFzzCCA7egAwIBAgIUCBZfikyl7ADJk0DfxMauI7gcWqQwDQYJKoZIhvcNAQEL
-BQAwbzELMAkGA1UEBhMCSEsxEjAQBgNVBAgTCUhvbmcgS29uZzESMBAGA1UEBxMJ
-SG9uZyBLb25nMRYwFAYDVQQKEw1Ib25na29uZyBQb3N0MSAwHgYDVQQDExdIb25n
-a29uZyBQb3N0IFJvb3QgQ0EgMzAeFw0xNzA2MDMwMjI5NDZaFw00MjA2MDMwMjI5
-NDZaMG8xCzAJBgNVBAYTAkhLMRIwEAYDVQQIEwlIb25nIEtvbmcxEjAQBgNVBAcT
-CUhvbmcgS29uZzEWMBQGA1UEChMNSG9uZ2tvbmcgUG9zdDEgMB4GA1UEAxMXSG9u
-Z2tvbmcgUG9zdCBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK
-AoICAQCziNfqzg8gTr7m1gNt7ln8wlffKWihgw4+aMdoWJwcYEuJQwy51BWy7sFO
-dem1p+/l6TWZ5Mwc50tfjTMwIDNT2aa71T4Tjukfh0mtUC1Qyhi+AViiE3CWu4mI
-VoBc+L0sPOFMV4i707mV78vH9toxdCim5lSJ9UExyuUmGs2C4HDaOym71QP1mbpV
-9WTRYA6ziUm4ii8F0oRFKHyPaFASePwLtVPLwpgchKOesL4jpNrcyCse2m5FHomY
-2vkALgbpDDtw1VAliJnLzXNg99X/NWfFobxeq81KuEXryGgeDQ0URhLj0mRiikKY
-vLTGCAj4/ahMZJx2Ab0vqWwzD9g/KLg8aQFChn5pwckGyuV6RmXpwtZQQS4/t+Tt
-bNe/JgERohYpSms0BpDsE9K2+2p20jzt8NYt3eEV7KObLyzJPivkaTv/ciWxNoZb
-x39ri1UbSsUgYT2uy1DhCDq+sI9jQVMwCFk8mB13umOResoQUGC/8Ne8lYePl8X+
-l2oBlKN8W4UdKjk60FSh0Tlxnf0h+bV78OLgAo9uliQlLKAeLKjEiafv7ZkGL7YK
-TE/bosw3Gq9HhS2KX8Q0NEwA/RiTZxPRN+ZItIsGxVd7GYYKecsAyVKvQv83j+Gj
-Hno9UKtjBucVtT+2RTeUN7F+8kjDf8V1/peNRY8apxpyKBpADwIDAQABo2MwYTAP
-BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBQXnc0e
-i9Y5K3DTXNSguB+wAPzFYTAdBgNVHQ4EFgQUF53NHovWOStw01zUoLgfsAD8xWEw
-DQYJKoZIhvcNAQELBQADggIBAFbVe27mIgHSQpsY1Q7XZiNc4/6gx5LS6ZStS6LG
-7BJ8dNVI0lkUmcDrudHr9EgwW62nV3OZqdPlt9EuWSRY3GguLmLYauRwCy0gUCCk
-MpXRAJi70/33MvJJrsZ64Ee+bs7Lo3I6LWldy8joRTnU+kLBEUx3XZL7av9YROXr
-gZ6voJmtvqkBZss4HTzfQx/0TW60uhdG/H39h4F5ag0zD/ov+BS5gLNdTaqX4fnk
-GMX41TiMJjz98iji7lpJiCzfeT2OnpA8vUFKOt1b9pq0zj8lMH8yfaIDlNDceqFS
-3m6TjRgm/VWsvY+b0s+v54Ysyx8Jb6NvqYTUc79NoXQbTiNg8swOqn+knEwlqLJm
-Ozj/2ZQw9nKEvmhVEA/GcywWaZMH/rFF7buiVWqw2rVKAiUnhde3t4ZEFolsgCs+
-l6mc1X5VTMbeRRAc6uk7nwNT7u56AQIWeNTowr5GdogTPyK7SBIdUgC0An4hGh6c
-JfTzPV4e0hz5sy229zdcxsshTrD3mUcYhcErulWuBurQB7Lcq9CClnXO0lD+mefP
-L5/ndtFhKvshuzHQqp9HpLIiyhY6UFfEW0NnxWViA0kB60PZ2Pierc+xYw5F9KBa
-LJstxabArahH9CdMOA0uG0k7UvToiIMrVCjU8jVStDKDYmlkDJGcn5fqdBb9HxEG
-mpv0
------END CERTIFICATE-----
-
-# Issuer: CN=Microsoft ECC Root Certificate Authority 2017 O=Microsoft Corporation
-# Subject: CN=Microsoft ECC Root Certificate Authority 2017 O=Microsoft Corporation
-# Label: "Microsoft ECC Root Certificate Authority 2017"
-# Serial: 136839042543790627607696632466672567020
-# MD5 Fingerprint: dd:a1:03:e6:4a:93:10:d1:bf:f0:19:42:cb:fe:ed:67
-# SHA1 Fingerprint: 99:9a:64:c3:7f:f4:7d:9f:ab:95:f1:47:69:89:14:60:ee:c4:c3:c5
-# SHA256 Fingerprint: 35:8d:f3:9d:76:4a:f9:e1:b7:66:e9:c9:72:df:35:2e:e1:5c:fa:c2:27:af:6a:d1:d7:0e:8e:4a:6e:dc:ba:02
------BEGIN CERTIFICATE-----
-MIICWTCCAd+gAwIBAgIQZvI9r4fei7FK6gxXMQHC7DAKBggqhkjOPQQDAzBlMQsw
-CQYDVQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYwNAYD
-VQQDEy1NaWNyb3NvZnQgRUNDIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIw
-MTcwHhcNMTkxMjE4MjMwNjQ1WhcNNDIwNzE4MjMxNjA0WjBlMQswCQYDVQQGEwJV
-UzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYwNAYDVQQDEy1NaWNy
-b3NvZnQgRUNDIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTcwdjAQBgcq
-hkjOPQIBBgUrgQQAIgNiAATUvD0CQnVBEyPNgASGAlEvaqiBYgtlzPbKnR5vSmZR
-ogPZnZH6thaxjG7efM3beaYvzrvOcS/lpaso7GMEZpn4+vKTEAXhgShC48Zo9OYb
-hGBKia/teQ87zvH2RPUBeMCjVDBSMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8E
-BTADAQH/MB0GA1UdDgQWBBTIy5lycFIM+Oa+sgRXKSrPQhDtNTAQBgkrBgEEAYI3
-FQEEAwIBADAKBggqhkjOPQQDAwNoADBlAjBY8k3qDPlfXu5gKcs68tvWMoQZP3zV
-L8KxzJOuULsJMsbG7X7JNpQS5GiFBqIb0C8CMQCZ6Ra0DvpWSNSkMBaReNtUjGUB
-iudQZsIxtzm6uBoiB078a1QWIP8rtedMDE2mT3M=
------END CERTIFICATE-----
-
-# Issuer: CN=Microsoft RSA Root Certificate Authority 2017 O=Microsoft Corporation
-# Subject: CN=Microsoft RSA Root Certificate Authority 2017 O=Microsoft Corporation
-# Label: "Microsoft RSA Root Certificate Authority 2017"
-# Serial: 40975477897264996090493496164228220339
-# MD5 Fingerprint: 10:ff:00:ff:cf:c9:f8:c7:7a:c0:ee:35:8e:c9:0f:47
-# SHA1 Fingerprint: 73:a5:e6:4a:3b:ff:83:16:ff:0e:dc:cc:61:8a:90:6e:4e:ae:4d:74
-# SHA256 Fingerprint: c7:41:f7:0f:4b:2a:8d:88:bf:2e:71:c1:41:22:ef:53:ef:10:eb:a0:cf:a5:e6:4c:fa:20:f4:18:85:30:73:e0
------BEGIN CERTIFICATE-----
-MIIFqDCCA5CgAwIBAgIQHtOXCV/YtLNHcB6qvn9FszANBgkqhkiG9w0BAQwFADBl
-MQswCQYDVQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYw
-NAYDVQQDEy1NaWNyb3NvZnQgUlNBIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5
-IDIwMTcwHhcNMTkxMjE4MjI1MTIyWhcNNDIwNzE4MjMwMDIzWjBlMQswCQYDVQQG
-EwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMTYwNAYDVQQDEy1N
-aWNyb3NvZnQgUlNBIFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTcwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKW76UM4wplZEWCpW9R2LBifOZ
-Nt9GkMml7Xhqb0eRaPgnZ1AzHaGm++DlQ6OEAlcBXZxIQIJTELy/xztokLaCLeX0
-ZdDMbRnMlfl7rEqUrQ7eS0MdhweSE5CAg2Q1OQT85elss7YfUJQ4ZVBcF0a5toW1
-HLUX6NZFndiyJrDKxHBKrmCk3bPZ7Pw71VdyvD/IybLeS2v4I2wDwAW9lcfNcztm
-gGTjGqwu+UcF8ga2m3P1eDNbx6H7JyqhtJqRjJHTOoI+dkC0zVJhUXAoP8XFWvLJ
-jEm7FFtNyP9nTUwSlq31/niol4fX/V4ggNyhSyL71Imtus5Hl0dVe49FyGcohJUc
-aDDv70ngNXtk55iwlNpNhTs+VcQor1fznhPbRiefHqJeRIOkpcrVE7NLP8TjwuaG
-YaRSMLl6IE9vDzhTyzMMEyuP1pq9KsgtsRx9S1HKR9FIJ3Jdh+vVReZIZZ2vUpC6
-W6IYZVcSn2i51BVrlMRpIpj0M+Dt+VGOQVDJNE92kKz8OMHY4Xu54+OU4UZpyw4K
-UGsTuqwPN1q3ErWQgR5WrlcihtnJ0tHXUeOrO8ZV/R4O03QK0dqq6mm4lyiPSMQH
-+FJDOvTKVTUssKZqwJz58oHhEmrARdlns87/I6KJClTUFLkqqNfs+avNJVgyeY+Q
-W5g5xAgGwax/Dj0ApQIDAQABo1QwUjAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/
-BAUwAwEB/zAdBgNVHQ4EFgQUCctZf4aycI8awznjwNnpv7tNsiMwEAYJKwYBBAGC
-NxUBBAMCAQAwDQYJKoZIhvcNAQEMBQADggIBAKyvPl3CEZaJjqPnktaXFbgToqZC
-LgLNFgVZJ8og6Lq46BrsTaiXVq5lQ7GPAJtSzVXNUzltYkyLDVt8LkS/gxCP81OC
-gMNPOsduET/m4xaRhPtthH80dK2Jp86519efhGSSvpWhrQlTM93uCupKUY5vVau6
-tZRGrox/2KJQJWVggEbbMwSubLWYdFQl3JPk+ONVFT24bcMKpBLBaYVu32TxU5nh
-SnUgnZUP5NbcA/FZGOhHibJXWpS2qdgXKxdJ5XbLwVaZOjex/2kskZGT4d9Mozd2
-TaGf+G0eHdP67Pv0RR0Tbc/3WeUiJ3IrhvNXuzDtJE3cfVa7o7P4NHmJweDyAmH3
-pvwPuxwXC65B2Xy9J6P9LjrRk5Sxcx0ki69bIImtt2dmefU6xqaWM/5TkshGsRGR
-xpl/j8nWZjEgQRCHLQzWwa80mMpkg/sTV9HB8Dx6jKXB/ZUhoHHBk2dxEuqPiApp
-GWSZI1b7rCoucL5mxAyE7+WL85MB+GqQk2dLsmijtWKP6T+MejteD+eMuMZ87zf9
-dOLITzNy4ZQ5bb0Sr74MTnB8G2+NszKTc0QWbej09+CVgI+WXTik9KveCjCHk9hN
-AHFiRSdLOkKEW39lt2c0Ui2cFmuqqNh7o0JMcccMyj6D5KbvtwEwXlGjefVwaaZB
-RA+GsCyRxj3qrg+E
------END CERTIFICATE-----
-
-# Issuer: CN=e-Szigno Root CA 2017 O=Microsec Ltd.
-# Subject: CN=e-Szigno Root CA 2017 O=Microsec Ltd.
-# Label: "e-Szigno Root CA 2017"
-# Serial: 411379200276854331539784714
-# MD5 Fingerprint: de:1f:f6:9e:84:ae:a7:b4:21:ce:1e:58:7d:d1:84:98
-# SHA1 Fingerprint: 89:d4:83:03:4f:9e:9a:48:80:5f:72:37:d4:a9:a6:ef:cb:7c:1f:d1
-# SHA256 Fingerprint: be:b0:0b:30:83:9b:9b:c3:2c:32:e4:44:79:05:95:06:41:f2:64:21:b1:5e:d0:89:19:8b:51:8a:e2:ea:1b:99
------BEGIN CERTIFICATE-----
-MIICQDCCAeWgAwIBAgIMAVRI7yH9l1kN9QQKMAoGCCqGSM49BAMCMHExCzAJBgNV
-BAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMgTHRk
-LjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxHjAcBgNVBAMMFWUtU3ppZ25vIFJv
-b3QgQ0EgMjAxNzAeFw0xNzA4MjIxMjA3MDZaFw00MjA4MjIxMjA3MDZaMHExCzAJ
-BgNVBAYTAkhVMREwDwYDVQQHDAhCdWRhcGVzdDEWMBQGA1UECgwNTWljcm9zZWMg
-THRkLjEXMBUGA1UEYQwOVkFUSFUtMjM1ODQ0OTcxHjAcBgNVBAMMFWUtU3ppZ25v
-IFJvb3QgQ0EgMjAxNzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJbcPYrYsHtv
-xie+RJCxs1YVe45DJH0ahFnuY2iyxl6H0BVIHqiQrb1TotreOpCmYF9oMrWGQd+H
-Wyx7xf58etqjYzBhMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
-A1UdDgQWBBSHERUI0arBeAyxr87GyZDvvzAEwDAfBgNVHSMEGDAWgBSHERUI0arB
-eAyxr87GyZDvvzAEwDAKBggqhkjOPQQDAgNJADBGAiEAtVfd14pVCzbhhkT61Nlo
-jbjcI4qKDdQvfepz7L9NbKgCIQDLpbQS+ue16M9+k/zzNY9vTlp8tLxOsvxyqltZ
-+efcMQ==
------END CERTIFICATE-----
-
-# Issuer: O=CERTSIGN SA OU=certSIGN ROOT CA G2
-# Subject: O=CERTSIGN SA OU=certSIGN ROOT CA G2
-# Label: "certSIGN Root CA G2"
-# Serial: 313609486401300475190
-# MD5 Fingerprint: 8c:f1:75:8a:c6:19:cf:94:b7:f7:65:20:87:c3:97:c7
-# SHA1 Fingerprint: 26:f9:93:b4:ed:3d:28:27:b0:b9:4b:a7:e9:15:1d:a3:8d:92:e5:32
-# SHA256 Fingerprint: 65:7c:fe:2f:a7:3f:aa:38:46:25:71:f3:32:a2:36:3a:46:fc:e7:02:09:51:71:07:02:cd:fb:b6:ee:da:33:05
------BEGIN CERTIFICATE-----
-MIIFRzCCAy+gAwIBAgIJEQA0tk7GNi02MA0GCSqGSIb3DQEBCwUAMEExCzAJBgNV
-BAYTAlJPMRQwEgYDVQQKEwtDRVJUU0lHTiBTQTEcMBoGA1UECxMTY2VydFNJR04g
-Uk9PVCBDQSBHMjAeFw0xNzAyMDYwOTI3MzVaFw00MjAyMDYwOTI3MzVaMEExCzAJ
-BgNVBAYTAlJPMRQwEgYDVQQKEwtDRVJUU0lHTiBTQTEcMBoGA1UECxMTY2VydFNJ
-R04gUk9PVCBDQSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDF
-dRmRfUR0dIf+DjuW3NgBFszuY5HnC2/OOwppGnzC46+CjobXXo9X69MhWf05N0Iw
-vlDqtg+piNguLWkh59E3GE59kdUWX2tbAMI5Qw02hVK5U2UPHULlj88F0+7cDBrZ
-uIt4ImfkabBoxTzkbFpG583H+u/E7Eu9aqSs/cwoUe+StCmrqzWaTOTECMYmzPhp
-n+Sc8CnTXPnGFiWeI8MgwT0PPzhAsP6CRDiqWhqKa2NYOLQV07YRaXseVO6MGiKs
-cpc/I1mbySKEwQdPzH/iV8oScLumZfNpdWO9lfsbl83kqK/20U6o2YpxJM02PbyW
-xPFsqa7lzw1uKA2wDrXKUXt4FMMgL3/7FFXhEZn91QqhngLjYl/rNUssuHLoPj1P
-rCy7Lobio3aP5ZMqz6WryFyNSwb/EkaseMsUBzXgqd+L6a8VTxaJW732jcZZroiF
-DsGJ6x9nxUWO/203Nit4ZoORUSs9/1F3dmKh7Gc+PoGD4FapUB8fepmrY7+EF3fx
-DTvf95xhszWYijqy7DwaNz9+j5LP2RIUZNoQAhVB/0/E6xyjyfqZ90bp4RjZsbgy
-LcsUDFDYg2WD7rlcz8sFWkz6GZdr1l0T08JcVLwyc6B49fFtHsufpaafItzRUZ6C
-eWRgKRM+o/1Pcmqr4tTluCRVLERLiohEnMqE0yo7AgMBAAGjQjBAMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSCIS1mxteg4BXrzkwJ
-d8RgnlRuAzANBgkqhkiG9w0BAQsFAAOCAgEAYN4auOfyYILVAzOBywaK8SJJ6ejq
-kX/GM15oGQOGO0MBzwdw5AgeZYWR5hEit/UCI46uuR59H35s5r0l1ZUa8gWmr4UC
-b6741jH/JclKyMeKqdmfS0mbEVeZkkMR3rYzpMzXjWR91M08KCy0mpbqTfXERMQl
-qiCA2ClV9+BB/AYm/7k29UMUA2Z44RGx2iBfRgB4ACGlHgAoYXhvqAEBj500mv/0
-OJD7uNGzcgbJceaBxXntC6Z58hMLnPddDnskk7RI24Zf3lCGeOdA5jGokHZwYa+c
-NywRtYK3qq4kNFtyDGkNzVmf9nGvnAvRCjj5BiKDUyUM/FHE5r7iOZULJK2v0ZXk
-ltd0ZGtxTgI8qoXzIKNDOXZbbFD+mpwUHmUUihW9o4JFWklWatKcsWMy5WHgUyIO
-pwpJ6st+H6jiYoD2EEVSmAYY3qXNL3+q1Ok+CHLsIwMCPKaq2LxndD0UF/tUSxfj
-03k9bWtJySgOLnRQvwzZRjoQhsmnP+mg7H/rpXdYaXHmgwo38oZJar55CJD2AhZk
-PuXaTH4MNMn5X7azKFGnpyuqSfqNZSlO42sTp5SjLVFteAxEy9/eCG/Oo2Sr05WE
-1LlSVHJ7liXMvGnjSG4N0MedJ5qq+BOS3R7fY581qRY27Iy4g/Q9iY/NtBde17MX
-QRBdJ3NghVdJIgc=
------END CERTIFICATE-----
-
-# Issuer: CN=Trustwave Global Certification Authority O=Trustwave Holdings, Inc.
-# Subject: CN=Trustwave Global Certification Authority O=Trustwave Holdings, Inc.
-# Label: "Trustwave Global Certification Authority"
-# Serial: 1846098327275375458322922162
-# MD5 Fingerprint: f8:1c:18:2d:2f:ba:5f:6d:a1:6c:bc:c7:ab:91:c7:0e
-# SHA1 Fingerprint: 2f:8f:36:4f:e1:58:97:44:21:59:87:a5:2a:9a:d0:69:95:26:7f:b5
-# SHA256 Fingerprint: 97:55:20:15:f5:dd:fc:3c:87:88:c0:06:94:45:55:40:88:94:45:00:84:f1:00:86:70:86:bc:1a:2b:b5:8d:c8
------BEGIN CERTIFICATE-----
-MIIF2jCCA8KgAwIBAgIMBfcOhtpJ80Y1LrqyMA0GCSqGSIb3DQEBCwUAMIGIMQsw
-CQYDVQQGEwJVUzERMA8GA1UECAwISWxsaW5vaXMxEDAOBgNVBAcMB0NoaWNhZ28x
-ITAfBgNVBAoMGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjExMC8GA1UEAwwoVHJ1
-c3R3YXZlIEdsb2JhbCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0xNzA4MjMx
-OTM0MTJaFw00MjA4MjMxOTM0MTJaMIGIMQswCQYDVQQGEwJVUzERMA8GA1UECAwI
-SWxsaW5vaXMxEDAOBgNVBAcMB0NoaWNhZ28xITAfBgNVBAoMGFRydXN0d2F2ZSBI
-b2xkaW5ncywgSW5jLjExMC8GA1UEAwwoVHJ1c3R3YXZlIEdsb2JhbCBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
-ALldUShLPDeS0YLOvR29zd24q88KPuFd5dyqCblXAj7mY2Hf8g+CY66j96xz0Xzn
-swuvCAAJWX/NKSqIk4cXGIDtiLK0thAfLdZfVaITXdHG6wZWiYj+rDKd/VzDBcdu
-7oaJuogDnXIhhpCujwOl3J+IKMujkkkP7NAP4m1ET4BqstTnoApTAbqOl5F2brz8
-1Ws25kCI1nsvXwXoLG0R8+eyvpJETNKXpP7ScoFDB5zpET71ixpZfR9oWN0EACyW
-80OzfpgZdNmcc9kYvkHHNHnZ9GLCQ7mzJ7Aiy/k9UscwR7PJPrhq4ufogXBeQotP
-JqX+OsIgbrv4Fo7NDKm0G2x2EOFYeUY+VM6AqFcJNykbmROPDMjWLBz7BegIlT1l
-RtzuzWniTY+HKE40Cz7PFNm73bZQmq131BnW2hqIyE4bJ3XYsgjxroMwuREOzYfw
-hI0Vcnyh78zyiGG69Gm7DIwLdVcEuE4qFC49DxweMqZiNu5m4iK4BUBjECLzMx10
-coos9TkpoNPnG4CELcU9402x/RpvumUHO1jsQkUm+9jaJXLE9gCxInm943xZYkqc
-BW89zubWR2OZxiRvchLIrH+QtAuRcOi35hYQcRfO3gZPSEF9NUqjifLJS3tBEW1n
-twiYTOURGa5CgNz7kAXU+FDKvuStx8KU1xad5hePrzb7AgMBAAGjQjBAMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFJngGWcNYtt2s9o9uFvo/ULSMQ6HMA4GA1Ud
-DwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAmHNw4rDT7TnsTGDZqRKGFx6W
-0OhUKDtkLSGm+J1WE2pIPU/HPinbbViDVD2HfSMF1OQc3Og4ZYbFdada2zUFvXfe
-uyk3QAUHw5RSn8pk3fEbK9xGChACMf1KaA0HZJDmHvUqoai7PF35owgLEQzxPy0Q
-lG/+4jSHg9bP5Rs1bdID4bANqKCqRieCNqcVtgimQlRXtpla4gt5kNdXElE1GYhB
-aCXUNxeEFfsBctyV3lImIJgm4nb1J2/6ADtKYdkNy1GTKv0WBpanI5ojSP5RvbbE
-sLFUzt5sQa0WZ37b/TjNuThOssFgy50X31ieemKyJo90lZvkWx3SD92YHJtZuSPT
-MaCm/zjdzyBP6VhWOmfD0faZmZ26NraAL4hHT4a/RDqA5Dccprrql5gR0IRiR2Qe
-qu5AvzSxnI9O4fKSTx+O856X3vOmeWqJcU9LJxdI/uz0UA9PSX3MReO9ekDFQdxh
-VicGaeVyQYHTtgGJoC86cnn+OjC/QezHYj6RS8fZMXZC+fc8Y+wmjHMMfRod6qh8
-h6jCJ3zhM0EPz8/8AKAigJ5Kp28AsEFFtyLKaEjFQqKu3R3y4G5OBVixwJAWKqQ9
-EEC+j2Jjg6mcgn0tAumDMHzLJ8n9HmYAsC7TIS+OMxZsmO0QqAfWzJPP29FpHOTK
-yeC2nOnOcXHebD8WpHk=
------END CERTIFICATE-----
-
-# Issuer: CN=Trustwave Global ECC P256 Certification Authority O=Trustwave Holdings, Inc.
-# Subject: CN=Trustwave Global ECC P256 Certification Authority O=Trustwave Holdings, Inc.
-# Label: "Trustwave Global ECC P256 Certification Authority"
-# Serial: 4151900041497450638097112925
-# MD5 Fingerprint: 5b:44:e3:8d:5d:36:86:26:e8:0d:05:d2:59:a7:83:54
-# SHA1 Fingerprint: b4:90:82:dd:45:0c:be:8b:5b:b1:66:d3:e2:a4:08:26:cd:ed:42:cf
-# SHA256 Fingerprint: 94:5b:bc:82:5e:a5:54:f4:89:d1:fd:51:a7:3d:df:2e:a6:24:ac:70:19:a0:52:05:22:5c:22:a7:8c:cf:a8:b4
------BEGIN CERTIFICATE-----
-MIICYDCCAgegAwIBAgIMDWpfCD8oXD5Rld9dMAoGCCqGSM49BAMCMIGRMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAf
-BgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjE6MDgGA1UEAxMxVHJ1c3R3
-YXZlIEdsb2JhbCBFQ0MgUDI1NiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0x
-NzA4MjMxOTM1MTBaFw00MjA4MjMxOTM1MTBaMIGRMQswCQYDVQQGEwJVUzERMA8G
-A1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0
-d2F2ZSBIb2xkaW5ncywgSW5jLjE6MDgGA1UEAxMxVHJ1c3R3YXZlIEdsb2JhbCBF
-Q0MgUDI1NiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTBZMBMGByqGSM49AgEGCCqG
-SM49AwEHA0IABH77bOYj43MyCMpg5lOcunSNGLB4kFKA3TjASh3RqMyTpJcGOMoN
-FWLGjgEqZZ2q3zSRLoHB5DOSMcT9CTqmP62jQzBBMA8GA1UdEwEB/wQFMAMBAf8w
-DwYDVR0PAQH/BAUDAwcGADAdBgNVHQ4EFgQUo0EGrJBt0UrrdaVKEJmzsaGLSvcw
-CgYIKoZIzj0EAwIDRwAwRAIgB+ZU2g6gWrKuEZ+Hxbb/ad4lvvigtwjzRM4q3wgh
-DDcCIC0mA6AFvWvR9lz4ZcyGbbOcNEhjhAnFjXca4syc4XR7
------END CERTIFICATE-----
-
-# Issuer: CN=Trustwave Global ECC P384 Certification Authority O=Trustwave Holdings, Inc.
-# Subject: CN=Trustwave Global ECC P384 Certification Authority O=Trustwave Holdings, Inc.
-# Label: "Trustwave Global ECC P384 Certification Authority"
-# Serial: 2704997926503831671788816187
-# MD5 Fingerprint: ea:cf:60:c4:3b:b9:15:29:40:a1:97:ed:78:27:93:d6
-# SHA1 Fingerprint: e7:f3:a3:c8:cf:6f:c3:04:2e:6d:0e:67:32:c5:9e:68:95:0d:5e:d2
-# SHA256 Fingerprint: 55:90:38:59:c8:c0:c3:eb:b8:75:9e:ce:4e:25:57:22:5f:f5:75:8b:bd:38:eb:d4:82:76:60:1e:1b:d5:80:97
------BEGIN CERTIFICATE-----
-MIICnTCCAiSgAwIBAgIMCL2Fl2yZJ6SAaEc7MAoGCCqGSM49BAMDMIGRMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAf
-BgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjE6MDgGA1UEAxMxVHJ1c3R3
-YXZlIEdsb2JhbCBFQ0MgUDM4NCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0x
-NzA4MjMxOTM2NDNaFw00MjA4MjMxOTM2NDNaMIGRMQswCQYDVQQGEwJVUzERMA8G
-A1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0
-d2F2ZSBIb2xkaW5ncywgSW5jLjE6MDgGA1UEAxMxVHJ1c3R3YXZlIEdsb2JhbCBF
-Q0MgUDM4NCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTB2MBAGByqGSM49AgEGBSuB
-BAAiA2IABGvaDXU1CDFHBa5FmVXxERMuSvgQMSOjfoPTfygIOiYaOs+Xgh+AtycJ
-j9GOMMQKmw6sWASr9zZ9lCOkmwqKi6vr/TklZvFe/oyujUF5nQlgziip04pt89ZF
-1PKYhDhloKNDMEEwDwYDVR0TAQH/BAUwAwEB/zAPBgNVHQ8BAf8EBQMDBwYAMB0G
-A1UdDgQWBBRVqYSJ0sEyvRjLbKYHTsjnnb6CkDAKBggqhkjOPQQDAwNnADBkAjA3
-AZKXRRJ+oPM+rRk6ct30UJMDEr5E0k9BpIycnR+j9sKS50gU/k6bpZFXrsY3crsC
-MGclCrEMXu6pY5Jv5ZAL/mYiykf9ijH3g/56vxC+GCsej/YpHpRZ744hN8tRmKVu
-Sw==
------END CERTIFICATE-----
-
-# Issuer: CN=NAVER Global Root Certification Authority O=NAVER BUSINESS PLATFORM Corp.
-# Subject: CN=NAVER Global Root Certification Authority O=NAVER BUSINESS PLATFORM Corp.
-# Label: "NAVER Global Root Certification Authority"
-# Serial: 9013692873798656336226253319739695165984492813
-# MD5 Fingerprint: c8:7e:41:f6:25:3b:f5:09:b3:17:e8:46:3d:bf:d0:9b
-# SHA1 Fingerprint: 8f:6b:f2:a9:27:4a:da:14:a0:c4:f4:8e:61:27:f9:c0:1e:78:5d:d1
-# SHA256 Fingerprint: 88:f4:38:dc:f8:ff:d1:fa:8f:42:91:15:ff:e5:f8:2a:e1:e0:6e:0c:70:c3:75:fa:ad:71:7b:34:a4:9e:72:65
------BEGIN CERTIFICATE-----
-MIIFojCCA4qgAwIBAgIUAZQwHqIL3fXFMyqxQ0Rx+NZQTQ0wDQYJKoZIhvcNAQEM
-BQAwaTELMAkGA1UEBhMCS1IxJjAkBgNVBAoMHU5BVkVSIEJVU0lORVNTIFBMQVRG
-T1JNIENvcnAuMTIwMAYDVQQDDClOQVZFUiBHbG9iYWwgUm9vdCBDZXJ0aWZpY2F0
-aW9uIEF1dGhvcml0eTAeFw0xNzA4MTgwODU4NDJaFw0zNzA4MTgyMzU5NTlaMGkx
-CzAJBgNVBAYTAktSMSYwJAYDVQQKDB1OQVZFUiBCVVNJTkVTUyBQTEFURk9STSBD
-b3JwLjEyMDAGA1UEAwwpTkFWRVIgR2xvYmFsIFJvb3QgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC21PGTXLVA
-iQqrDZBbUGOukJR0F0Vy1ntlWilLp1agS7gvQnXp2XskWjFlqxcX0TM62RHcQDaH
-38dq6SZeWYp34+hInDEW+j6RscrJo+KfziFTowI2MMtSAuXaMl3Dxeb57hHHi8lE
-HoSTGEq0n+USZGnQJoViAbbJAh2+g1G7XNr4rRVqmfeSVPc0W+m/6imBEtRTkZaz
-kVrd/pBzKPswRrXKCAfHcXLJZtM0l/aM9BhK4dA9WkW2aacp+yPOiNgSnABIqKYP
-szuSjXEOdMWLyEz59JuOuDxp7W87UC9Y7cSw0BwbagzivESq2M0UXZR4Yb8Obtoq
-vC8MC3GmsxY/nOb5zJ9TNeIDoKAYv7vxvvTWjIcNQvcGufFt7QSUqP620wbGQGHf
-nZ3zVHbOUzoBppJB7ASjjw2i1QnK1sua8e9DXcCrpUHPXFNwcMmIpi3Ua2FzUCaG
-YQ5fG8Ir4ozVu53BA0K6lNpfqbDKzE0K70dpAy8i+/Eozr9dUGWokG2zdLAIx6yo
-0es+nPxdGoMuK8u180SdOqcXYZaicdNwlhVNt0xz7hlcxVs+Qf6sdWA7G2POAN3a
-CJBitOUt7kinaxeZVL6HSuOpXgRM6xBtVNbv8ejyYhbLgGvtPe31HzClrkvJE+2K
-AQHJuFFYwGY6sWZLxNUxAmLpdIQM201GLQIDAQABo0IwQDAdBgNVHQ4EFgQU0p+I
-36HNLL3s9TsBAZMzJ7LrYEswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMB
-Af8wDQYJKoZIhvcNAQEMBQADggIBADLKgLOdPVQG3dLSLvCkASELZ0jKbY7gyKoN
-qo0hV4/GPnrK21HUUrPUloSlWGB/5QuOH/XcChWB5Tu2tyIvCZwTFrFsDDUIbatj
-cu3cvuzHV+YwIHHW1xDBE1UBjCpD5EHxzzp6U5LOogMFDTjfArsQLtk70pt6wKGm
-+LUx5vR1yblTmXVHIloUFcd4G7ad6Qz4G3bxhYTeodoS76TiEJd6eN4MUZeoIUCL
-hr0N8F5OSza7OyAfikJW4Qsav3vQIkMsRIz75Sq0bBwcupTgE34h5prCy8VCZLQe
-lHsIJchxzIdFV4XTnyliIoNRlwAYl3dqmJLJfGBs32x9SuRwTMKeuB330DTHD8z7
-p/8Dvq1wkNoL3chtl1+afwkyQf3NosxabUzyqkn+Zvjp2DXrDige7kgvOtB5CTh8
-piKCk5XQA76+AqAF3SAi428diDRgxuYKuQl1C/AH6GmWNcf7I4GOODm4RStDeKLR
-LBT/DShycpWbXgnbiUSYqqFJu3FS8r/2/yehNq+4tneI3TqkbZs0kNwUXTC/t+sX
-5Ie3cdCh13cV1ELX8vMxmV2b3RZtP+oGI/hGoiLtk/bdmuYqh7GYVPEi92tF4+KO
-dh2ajcQGjTa3FPOdVGm3jjzVpG2Tgbet9r1ke8LJaDmgkpzNNIaRkPpkUZ3+/uul
-9XXeifdy
------END CERTIFICATE-----
-
-# Issuer: CN=AC RAIZ FNMT-RCM SERVIDORES SEGUROS O=FNMT-RCM OU=Ceres
-# Subject: CN=AC RAIZ FNMT-RCM SERVIDORES SEGUROS O=FNMT-RCM OU=Ceres
-# Label: "AC RAIZ FNMT-RCM SERVIDORES SEGUROS"
-# Serial: 131542671362353147877283741781055151509
-# MD5 Fingerprint: 19:36:9c:52:03:2f:d2:d1:bb:23:cc:dd:1e:12:55:bb
-# SHA1 Fingerprint: 62:ff:d9:9e:c0:65:0d:03:ce:75:93:d2:ed:3f:2d:32:c9:e3:e5:4a
-# SHA256 Fingerprint: 55:41:53:b1:3d:2c:f9:dd:b7:53:bf:be:1a:4e:0a:e0:8d:0a:a4:18:70:58:fe:60:a2:b8:62:b2:e4:b8:7b:cb
------BEGIN CERTIFICATE-----
-MIICbjCCAfOgAwIBAgIQYvYybOXE42hcG2LdnC6dlTAKBggqhkjOPQQDAzB4MQsw
-CQYDVQQGEwJFUzERMA8GA1UECgwIRk5NVC1SQ00xDjAMBgNVBAsMBUNlcmVzMRgw
-FgYDVQRhDA9WQVRFUy1RMjgyNjAwNEoxLDAqBgNVBAMMI0FDIFJBSVogRk5NVC1S
-Q00gU0VSVklET1JFUyBTRUdVUk9TMB4XDTE4MTIyMDA5MzczM1oXDTQzMTIyMDA5
-MzczM1oweDELMAkGA1UEBhMCRVMxETAPBgNVBAoMCEZOTVQtUkNNMQ4wDAYDVQQL
-DAVDZXJlczEYMBYGA1UEYQwPVkFURVMtUTI4MjYwMDRKMSwwKgYDVQQDDCNBQyBS
-QUlaIEZOTVQtUkNNIFNFUlZJRE9SRVMgU0VHVVJPUzB2MBAGByqGSM49AgEGBSuB
-BAAiA2IABPa6V1PIyqvfNkpSIeSX0oNnnvBlUdBeh8dHsVnyV0ebAAKTRBdp20LH
-sbI6GA60XYyzZl2hNPk2LEnb80b8s0RpRBNm/dfF/a82Tc4DTQdxz69qBdKiQ1oK
-Um8BA06Oi6NCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
-VR0OBBYEFAG5L++/EYZg8k/QQW6rcx/n0m5JMAoGCCqGSM49BAMDA2kAMGYCMQCu
-SuMrQMN0EfKVrRYj3k4MGuZdpSRea0R7/DjiT8ucRRcRTBQnJlU5dUoDzBOQn5IC
-MQD6SmxgiHPz7riYYqnOK8LZiqZwMR2vsJRM60/G49HzYqc8/5MuB1xJAWdpEgJy
-v+c=
------END CERTIFICATE-----
-
-# Issuer: CN=GlobalSign Root R46 O=GlobalSign nv-sa
-# Subject: CN=GlobalSign Root R46 O=GlobalSign nv-sa
-# Label: "GlobalSign Root R46"
-# Serial: 1552617688466950547958867513931858518042577
-# MD5 Fingerprint: c4:14:30:e4:fa:66:43:94:2a:6a:1b:24:5f:19:d0:ef
-# SHA1 Fingerprint: 53:a2:b0:4b:ca:6b:d6:45:e6:39:8a:8e:c4:0d:d2:bf:77:c3:a2:90
-# SHA256 Fingerprint: 4f:a3:12:6d:8d:3a:11:d1:c4:85:5a:4f:80:7c:ba:d6:cf:91:9d:3a:5a:88:b0:3b:ea:2c:63:72:d9:3c:40:c9
------BEGIN CERTIFICATE-----
-MIIFWjCCA0KgAwIBAgISEdK7udcjGJ5AXwqdLdDfJWfRMA0GCSqGSIb3DQEBDAUA
-MEYxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYD
-VQQDExNHbG9iYWxTaWduIFJvb3QgUjQ2MB4XDTE5MDMyMDAwMDAwMFoXDTQ2MDMy
-MDAwMDAwMFowRjELMAkGA1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYt
-c2ExHDAaBgNVBAMTE0dsb2JhbFNpZ24gUm9vdCBSNDYwggIiMA0GCSqGSIb3DQEB
-AQUAA4ICDwAwggIKAoICAQCsrHQy6LNl5brtQyYdpokNRbopiLKkHWPd08EsCVeJ
-OaFV6Wc0dwxu5FUdUiXSE2te4R2pt32JMl8Nnp8semNgQB+msLZ4j5lUlghYruQG
-vGIFAha/r6gjA7aUD7xubMLL1aa7DOn2wQL7Id5m3RerdELv8HQvJfTqa1VbkNud
-316HCkD7rRlr+/fKYIje2sGP1q7Vf9Q8g+7XFkyDRTNrJ9CG0Bwta/OrffGFqfUo
-0q3v84RLHIf8E6M6cqJaESvWJ3En7YEtbWaBkoe0G1h6zD8K+kZPTXhc+CtI4wSE
-y132tGqzZfxCnlEmIyDLPRT5ge1lFgBPGmSXZgjPjHvjK8Cd+RTyG/FWaha/LIWF
-zXg4mutCagI0GIMXTpRW+LaCtfOW3T3zvn8gdz57GSNrLNRyc0NXfeD412lPFzYE
-+cCQYDdF3uYM2HSNrpyibXRdQr4G9dlkbgIQrImwTDsHTUB+JMWKmIJ5jqSngiCN
-I/onccnfxkF0oE32kRbcRoxfKWMxWXEM2G/CtjJ9++ZdU6Z+Ffy7dXxd7Pj2Fxzs
-x2sZy/N78CsHpdlseVR2bJ0cpm4O6XkMqCNqo98bMDGfsVR7/mrLZqrcZdCinkqa
-ByFrgY/bxFn63iLABJzjqls2k+g9vXqhnQt2sQvHnf3PmKgGwvgqo6GDoLclcqUC
-4wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
-HQ4EFgQUA1yrc4GHqMywptWU4jaWSf8FmSwwDQYJKoZIhvcNAQEMBQADggIBAHx4
-7PYCLLtbfpIrXTncvtgdokIzTfnvpCo7RGkerNlFo048p9gkUbJUHJNOxO97k4Vg
-JuoJSOD1u8fpaNK7ajFxzHmuEajwmf3lH7wvqMxX63bEIaZHU1VNaL8FpO7XJqti
-2kM3S+LGteWygxk6x9PbTZ4IevPuzz5i+6zoYMzRx6Fcg0XERczzF2sUyQQCPtIk
-pnnpHs6i58FZFZ8d4kuaPp92CC1r2LpXFNqD6v6MVenQTqnMdzGxRBF6XLE+0xRF
-FRhiJBPSy03OXIPBNvIQtQ6IbbjhVp+J3pZmOUdkLG5NrmJ7v2B0GbhWrJKsFjLt
-rWhV/pi60zTe9Mlhww6G9kuEYO4Ne7UyWHmRVSyBQ7N0H3qqJZ4d16GLuc1CLgSk
-ZoNNiTW2bKg2SnkheCLQQrzRQDGQob4Ez8pn7fXwgNNgyYMqIgXQBztSvwyeqiv5
-u+YfjyW6hY0XHgL+XVAEV8/+LbzvXMAaq7afJMbfc2hIkCwU9D9SGuTSyxTDYWnP
-4vkYxboznxSjBF25cfe1lNj2M8FawTSLfJvdkzrnE6JwYZ+vj+vYxXX4M2bUdGc6
-N3ec592kD3ZDZopD8p/7DEJ4Y9HiD2971KE9dJeFt0g5QdYg/NA6s/rob8SKunE3
-vouXsXgxT7PntgMTzlSdriVZzH81Xwj3QEUxeCp6
------END CERTIFICATE-----
-
-# Issuer: CN=GlobalSign Root E46 O=GlobalSign nv-sa
-# Subject: CN=GlobalSign Root E46 O=GlobalSign nv-sa
-# Label: "GlobalSign Root E46"
-# Serial: 1552617690338932563915843282459653771421763
-# MD5 Fingerprint: b5:b8:66:ed:de:08:83:e3:c9:e2:01:34:06:ac:51:6f
-# SHA1 Fingerprint: 39:b4:6c:d5:fe:80:06:eb:e2:2f:4a:bb:08:33:a0:af:db:b9:dd:84
-# SHA256 Fingerprint: cb:b9:c4:4d:84:b8:04:3e:10:50:ea:31:a6:9f:51:49:55:d7:bf:d2:e2:c6:b4:93:01:01:9a:d6:1d:9f:50:58
------BEGIN CERTIFICATE-----
-MIICCzCCAZGgAwIBAgISEdK7ujNu1LzmJGjFDYQdmOhDMAoGCCqGSM49BAMDMEYx
-CzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRwwGgYDVQQD
-ExNHbG9iYWxTaWduIFJvb3QgRTQ2MB4XDTE5MDMyMDAwMDAwMFoXDTQ2MDMyMDAw
-MDAwMFowRjELMAkGA1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2Ex
-HDAaBgNVBAMTE0dsb2JhbFNpZ24gUm9vdCBFNDYwdjAQBgcqhkjOPQIBBgUrgQQA
-IgNiAAScDrHPt+ieUnd1NPqlRqetMhkytAepJ8qUuwzSChDH2omwlwxwEwkBjtjq
-R+q+soArzfwoDdusvKSGN+1wCAB16pMLey5SnCNoIwZD7JIvU4Tb+0cUB+hflGdd
-yXqBPCCjQjBAMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
-DgQWBBQxCpCPtsad0kRLgLWi5h+xEk8blTAKBggqhkjOPQQDAwNoADBlAjEA31SQ
-7Zvvi5QCkxeCmb6zniz2C5GMn0oUsfZkvLtoURMMA/cVi4RguYv/Uo7njLwcAjA8
-+RHUjE7AwWHCFUyqqx0LMV87HOIAl0Qx5v5zli/altP+CAezNIm8BZ/3Hobui3A=
------END CERTIFICATE-----
-
-# Issuer: CN=GLOBALTRUST 2020 O=e-commerce monitoring GmbH
-# Subject: CN=GLOBALTRUST 2020 O=e-commerce monitoring GmbH
-# Label: "GLOBALTRUST 2020"
-# Serial: 109160994242082918454945253
-# MD5 Fingerprint: 8a:c7:6f:cb:6d:e3:cc:a2:f1:7c:83:fa:0e:78:d7:e8
-# SHA1 Fingerprint: d0:67:c1:13:51:01:0c:aa:d0:c7:6a:65:37:31:16:26:4f:53:71:a2
-# SHA256 Fingerprint: 9a:29:6a:51:82:d1:d4:51:a2:e3:7f:43:9b:74:da:af:a2:67:52:33:29:f9:0f:9a:0d:20:07:c3:34:e2:3c:9a
------BEGIN CERTIFICATE-----
-MIIFgjCCA2qgAwIBAgILWku9WvtPilv6ZeUwDQYJKoZIhvcNAQELBQAwTTELMAkG
-A1UEBhMCQVQxIzAhBgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkw
-FwYDVQQDExBHTE9CQUxUUlVTVCAyMDIwMB4XDTIwMDIxMDAwMDAwMFoXDTQwMDYx
-MDAwMDAwMFowTTELMAkGA1UEBhMCQVQxIzAhBgNVBAoTGmUtY29tbWVyY2UgbW9u
-aXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVTVCAyMDIwMIICIjANBgkq
-hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAri5WrRsc7/aVj6B3GyvTY4+ETUWiD59b
-RatZe1E0+eyLinjF3WuvvcTfk0Uev5E4C64OFudBc/jbu9G4UeDLgztzOG53ig9Z
-YybNpyrOVPu44sB8R85gfD+yc/LAGbaKkoc1DZAoouQVBGM+uq/ufF7MpotQsjj3
-QWPKzv9pj2gOlTblzLmMCcpL3TGQlsjMH/1WljTbjhzqLL6FLmPdqqmV0/0plRPw
-yJiT2S0WR5ARg6I6IqIoV6Lr/sCMKKCmfecqQjuCgGOlYx8ZzHyyZqjC0203b+J+
-BlHZRYQfEs4kUmSFC0iAToexIiIwquuuvuAC4EDosEKAA1GqtH6qRNdDYfOiaxaJ
-SaSjpCuKAsR49GiKweR6NrFvG5Ybd0mN1MkGco/PU+PcF4UgStyYJ9ORJitHHmkH
-r96i5OTUawuzXnzUJIBHKWk7buis/UDr2O1xcSvy6Fgd60GXIsUf1DnQJ4+H4xj0
-4KlGDfV0OoIu0G4skaMxXDtG6nsEEFZegB31pWXogvziB4xiRfUg3kZwhqG8k9Me
-dKZssCz3AwyIDMvUclOGvGBG85hqwvG/Q/lwIHfKN0F5VVJjjVsSn8VoxIidrPIw
-q7ejMZdnrY8XD2zHc+0klGvIg5rQmjdJBKuxFshsSUktq6HQjJLyQUp5ISXbY9e2
-nKd+Qmn7OmMCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwHQYDVR0OBBYEFNwuH9FhN3nkq9XVsxJxaD1qaJwiMB8GA1UdIwQYMBaAFNwu
-H9FhN3nkq9XVsxJxaD1qaJwiMA0GCSqGSIb3DQEBCwUAA4ICAQCR8EICaEDuw2jA
-VC/f7GLDw56KoDEoqoOOpFaWEhCGVrqXctJUMHytGdUdaG/7FELYjQ7ztdGl4wJC
-XtzoRlgHNQIw4Lx0SsFDKv/bGtCwr2zD/cuz9X9tAy5ZVp0tLTWMstZDFyySCstd
-6IwPS3BD0IL/qMy/pJTAvoe9iuOTe8aPmxadJ2W8esVCgmxcB9CpwYhgROmYhRZf
-+I/KARDOJcP5YBugxZfD0yyIMaK9MOzQ0MAS8cE54+X1+NZK3TTN+2/BT+MAi1bi
-kvcoskJ3ciNnxz8RFbLEAwW+uxF7Cr+obuf/WEPPm2eggAe2HcqtbepBEX4tdJP7
-wry+UUTF72glJ4DjyKDUEuzZpTcdN3y0kcra1LGWge9oXHYQSa9+pTeAsRxSvTOB
-TI/53WXZFM2KJVj04sWDpQmQ1GwUY7VA3+vA/MRYfg0UFodUJ25W5HCEuGwyEn6C
-MUO+1918oa2u1qsgEu8KwxCMSZY13At1XrFP1U80DhEgB3VDRemjEdqso5nCtnkn
-4rnvyOL2NSl6dPrFf4IFYqYK6miyeUcGbvJXqBUzxvd4Sj1Ce2t+/vdG6tHrju+I
-aFvowdlxfv1k7/9nR4hYJS8+hge9+6jlgqispdNpQ80xiEmEU5LAsTkbOYMBMMTy
-qfrQA71yN2BWHzZ8vTmR9W0Nv3vXkg==
------END CERTIFICATE-----
-
-# Issuer: CN=ANF Secure Server Root CA O=ANF Autoridad de Certificacion OU=ANF CA Raiz
-# Subject: CN=ANF Secure Server Root CA O=ANF Autoridad de Certificacion OU=ANF CA Raiz
-# Label: "ANF Secure Server Root CA"
-# Serial: 996390341000653745
-# MD5 Fingerprint: 26:a6:44:5a:d9:af:4e:2f:b2:1d:b6:65:b0:4e:e8:96
-# SHA1 Fingerprint: 5b:6e:68:d0:cc:15:b6:a0:5f:1e:c1:5f:ae:02:fc:6b:2f:5d:6f:74
-# SHA256 Fingerprint: fb:8f:ec:75:91:69:b9:10:6b:1e:51:16:44:c6:18:c5:13:04:37:3f:6c:06:43:08:8d:8b:ef:fd:1b:99:75:99
------BEGIN CERTIFICATE-----
-MIIF7zCCA9egAwIBAgIIDdPjvGz5a7EwDQYJKoZIhvcNAQELBQAwgYQxEjAQBgNV
-BAUTCUc2MzI4NzUxMDELMAkGA1UEBhMCRVMxJzAlBgNVBAoTHkFORiBBdXRvcmlk
-YWQgZGUgQ2VydGlmaWNhY2lvbjEUMBIGA1UECxMLQU5GIENBIFJhaXoxIjAgBgNV
-BAMTGUFORiBTZWN1cmUgU2VydmVyIFJvb3QgQ0EwHhcNMTkwOTA0MTAwMDM4WhcN
-MzkwODMwMTAwMDM4WjCBhDESMBAGA1UEBRMJRzYzMjg3NTEwMQswCQYDVQQGEwJF
-UzEnMCUGA1UEChMeQU5GIEF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uMRQwEgYD
-VQQLEwtBTkYgQ0EgUmFpejEiMCAGA1UEAxMZQU5GIFNlY3VyZSBTZXJ2ZXIgUm9v
-dCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANvrayvmZFSVgpCj
-cqQZAZ2cC4Ffc0m6p6zzBE57lgvsEeBbphzOG9INgxwruJ4dfkUyYA8H6XdYfp9q
-yGFOtibBTI3/TO80sh9l2Ll49a2pcbnvT1gdpd50IJeh7WhM3pIXS7yr/2WanvtH
-2Vdy8wmhrnZEE26cLUQ5vPnHO6RYPUG9tMJJo8gN0pcvB2VSAKduyK9o7PQUlrZX
-H1bDOZ8rbeTzPvY1ZNoMHKGESy9LS+IsJJ1tk0DrtSOOMspvRdOoiXsezx76W0OL
-zc2oD2rKDF65nkeP8Nm2CgtYZRczuSPkdxl9y0oukntPLxB3sY0vaJxizOBQ+OyR
-p1RMVwnVdmPF6GUe7m1qzwmd+nxPrWAI/VaZDxUse6mAq4xhj0oHdkLePfTdsiQz
-W7i1o0TJrH93PB0j7IKppuLIBkwC/qxcmZkLLxCKpvR/1Yd0DVlJRfbwcVw5Kda/
-SiOL9V8BY9KHcyi1Swr1+KuCLH5zJTIdC2MKF4EA/7Z2Xue0sUDKIbvVgFHlSFJn
-LNJhiQcND85Cd8BEc5xEUKDbEAotlRyBr+Qc5RQe8TZBAQIvfXOn3kLMTOmJDVb3
-n5HUA8ZsyY/b2BzgQJhdZpmYgG4t/wHFzstGH6wCxkPmrqKEPMVOHj1tyRRM4y5B
-u8o5vzY8KhmqQYdOpc5LMnndkEl/AgMBAAGjYzBhMB8GA1UdIwQYMBaAFJxf0Gxj
-o1+TypOYCK2Mh6UsXME3MB0GA1UdDgQWBBScX9BsY6Nfk8qTmAitjIelLFzBNzAO
-BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
-AgEATh65isagmD9uw2nAalxJUqzLK114OMHVVISfk/CHGT0sZonrDUL8zPB1hT+L
-9IBdeeUXZ701guLyPI59WzbLWoAAKfLOKyzxj6ptBZNscsdW699QIyjlRRA96Gej
-rw5VD5AJYu9LWaL2U/HANeQvwSS9eS9OICI7/RogsKQOLHDtdD+4E5UGUcjohybK
-pFtqFiGS3XNgnhAY3jyB6ugYw3yJ8otQPr0R4hUDqDZ9MwFsSBXXiJCZBMXM5gf0
-vPSQ7RPi6ovDj6MzD8EpTBNO2hVWcXNyglD2mjN8orGoGjR0ZVzO0eurU+AagNjq
-OknkJjCb5RyKqKkVMoaZkgoQI1YS4PbOTOK7vtuNknMBZi9iPrJyJ0U27U1W45eZ
-/zo1PqVUSlJZS2Db7v54EX9K3BR5YLZrZAPbFYPhor72I5dQ8AkzNqdxliXzuUJ9
-2zg/LFis6ELhDtjTO0wugumDLmsx2d1Hhk9tl5EuT+IocTUW0fJz/iUrB0ckYyfI
-+PbZa/wSMVYIwFNCr5zQM378BvAxRAMU8Vjq8moNqRGyg77FGr8H6lnco4g175x2
-MjxNBiLOFeXdntiP2t7SxDnlF4HPOEfrf4htWRvfn0IUrn7PqLBmZdo3r5+qPeoo
-tt7VMVgWglvquxl1AnMaykgaIZOQCo6ThKd9OyMYkomgjaw=
------END CERTIFICATE-----
-
-# Issuer: CN=Certum EC-384 CA O=Asseco Data Systems S.A. OU=Certum Certification Authority
-# Subject: CN=Certum EC-384 CA O=Asseco Data Systems S.A. OU=Certum Certification Authority
-# Label: "Certum EC-384 CA"
-# Serial: 160250656287871593594747141429395092468
-# MD5 Fingerprint: b6:65:b3:96:60:97:12:a1:ec:4e:e1:3d:a3:c6:c9:f1
-# SHA1 Fingerprint: f3:3e:78:3c:ac:df:f4:a2:cc:ac:67:55:69:56:d7:e5:16:3c:e1:ed
-# SHA256 Fingerprint: 6b:32:80:85:62:53:18:aa:50:d1:73:c9:8d:8b:da:09:d5:7e:27:41:3d:11:4c:f7:87:a0:f5:d0:6c:03:0c:f6
------BEGIN CERTIFICATE-----
-MIICZTCCAeugAwIBAgIQeI8nXIESUiClBNAt3bpz9DAKBggqhkjOPQQDAzB0MQsw
-CQYDVQQGEwJQTDEhMB8GA1UEChMYQXNzZWNvIERhdGEgU3lzdGVtcyBTLkEuMScw
-JQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxGTAXBgNVBAMT
-EENlcnR1bSBFQy0zODQgQ0EwHhcNMTgwMzI2MDcyNDU0WhcNNDMwMzI2MDcyNDU0
-WjB0MQswCQYDVQQGEwJQTDEhMB8GA1UEChMYQXNzZWNvIERhdGEgU3lzdGVtcyBT
-LkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxGTAX
-BgNVBAMTEENlcnR1bSBFQy0zODQgQ0EwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATE
-KI6rGFtqvm5kN2PkzeyrOvfMobgOgknXhimfoZTy42B4mIF4Bk3y7JoOV2CDn7Tm
-Fy8as10CW4kjPMIRBSqniBMY81CE1700LCeJVf/OTOffph8oxPBUw7l8t1Ot68Kj
-QjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI0GZnQkdjrzife81r1HfS+8
-EF9LMA4GA1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNoADBlAjADVS2m5hjEfO/J
-UG7BJw+ch69u1RsIGL2SKcHvlJF40jocVYli5RsJHrpka/F2tNQCMQC0QoSZ/6vn
-nvuRlydd3LBbMHHOXjgaatkl5+r3YZJW+OraNsKHZZYuciUvf9/DE8k=
------END CERTIFICATE-----
-
-# Issuer: CN=Certum Trusted Root CA O=Asseco Data Systems S.A. OU=Certum Certification Authority
-# Subject: CN=Certum Trusted Root CA O=Asseco Data Systems S.A. OU=Certum Certification Authority
-# Label: "Certum Trusted Root CA"
-# Serial: 40870380103424195783807378461123655149
-# MD5 Fingerprint: 51:e1:c2:e7:fe:4c:84:af:59:0e:2f:f4:54:6f:ea:29
-# SHA1 Fingerprint: c8:83:44:c0:18:ae:9f:cc:f1:87:b7:8f:22:d1:c5:d7:45:84:ba:e5
-# SHA256 Fingerprint: fe:76:96:57:38:55:77:3e:37:a9:5e:7a:d4:d9:cc:96:c3:01:57:c1:5d:31:76:5b:a9:b1:57:04:e1:ae:78:fd
------BEGIN CERTIFICATE-----
-MIIFwDCCA6igAwIBAgIQHr9ZULjJgDdMBvfrVU+17TANBgkqhkiG9w0BAQ0FADB6
-MQswCQYDVQQGEwJQTDEhMB8GA1UEChMYQXNzZWNvIERhdGEgU3lzdGVtcyBTLkEu
-MScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxHzAdBgNV
-BAMTFkNlcnR1bSBUcnVzdGVkIFJvb3QgQ0EwHhcNMTgwMzE2MTIxMDEzWhcNNDMw
-MzE2MTIxMDEzWjB6MQswCQYDVQQGEwJQTDEhMB8GA1UEChMYQXNzZWNvIERhdGEg
-U3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRo
-b3JpdHkxHzAdBgNVBAMTFkNlcnR1bSBUcnVzdGVkIFJvb3QgQ0EwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQDRLY67tzbqbTeRn06TpwXkKQMlzhyC93yZ
-n0EGze2jusDbCSzBfN8pfktlL5On1AFrAygYo9idBcEq2EXxkd7fO9CAAozPOA/q
-p1x4EaTByIVcJdPTsuclzxFUl6s1wB52HO8AU5853BSlLCIls3Jy/I2z5T4IHhQq
-NwuIPMqw9MjCoa68wb4pZ1Xi/K1ZXP69VyywkI3C7Te2fJmItdUDmj0VDT06qKhF
-8JVOJVkdzZhpu9PMMsmN74H+rX2Ju7pgE8pllWeg8xn2A1bUatMn4qGtg/BKEiJ3
-HAVz4hlxQsDsdUaakFjgao4rpUYwBI4Zshfjvqm6f1bxJAPXsiEodg42MEx51UGa
-mqi4NboMOvJEGyCI98Ul1z3G4z5D3Yf+xOr1Uz5MZf87Sst4WmsXXw3Hw09Omiqi
-7VdNIuJGmj8PkTQkfVXjjJU30xrwCSss0smNtA0Aq2cpKNgB9RkEth2+dv5yXMSF
-ytKAQd8FqKPVhJBPC/PgP5sZ0jeJP/J7UhyM9uH3PAeXjA6iWYEMspA90+NZRu0P
-qafegGtaqge2Gcu8V/OXIXoMsSt0Puvap2ctTMSYnjYJdmZm/Bo/6khUHL4wvYBQ
-v3y1zgD2DGHZ5yQD4OMBgQ692IU0iL2yNqh7XAjlRICMb/gv1SHKHRzQ+8S1h9E6
-Tsd2tTVItQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSM+xx1
-vALTn04uSNn5YFSqxLNP+jAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQENBQAD
-ggIBAEii1QALLtA/vBzVtVRJHlpr9OTy4EA34MwUe7nJ+jW1dReTagVphZzNTxl4
-WxmB82M+w85bj/UvXgF2Ez8sALnNllI5SW0ETsXpD4YN4fqzX4IS8TrOZgYkNCvo
-zMrnadyHncI013nR03e4qllY/p0m+jiGPp2Kh2RX5Rc64vmNueMzeMGQ2Ljdt4NR
-5MTMI9UGfOZR0800McD2RrsLrfw9EAUqO0qRJe6M1ISHgCq8CYyqOhNf6DR5UMEQ
-GfnTKB7U0VEwKbOukGfWHwpjscWpxkIxYxeU72nLL/qMFH3EQxiJ2fAyQOaA4kZf
-5ePBAFmo+eggvIksDkc0C+pXwlM2/KfUrzHN/gLldfq5Jwn58/U7yn2fqSLLiMmq
-0Uc9NneoWWRrJ8/vJ8HjJLWG965+Mk2weWjROeiQWMODvA8s1pfrzgzhIMfatz7D
-P78v3DSk+yshzWePS/Tj6tQ/50+6uaWTRRxmHyH6ZF5v4HaUMst19W7l9o/HuKTM
-qJZ9ZPskWkoDbGs4xugDQ5r3V7mzKWmTOPQD8rv7gmsHINFSH5pkAnuYZttcTVoP
-0ISVoDwUQwbKytu4QTbaakRnh6+v40URFWkIsr4WOZckbxJF0WddCajJFdr60qZf
-E2Efv4WstK2tBZQIgx51F9NxO5NQI1mg7TyRVJ12AMXDuDjb
------END CERTIFICATE-----
-
-# Issuer: CN=TunTrust Root CA O=Agence Nationale de Certification Electronique
-# Subject: CN=TunTrust Root CA O=Agence Nationale de Certification Electronique
-# Label: "TunTrust Root CA"
-# Serial: 108534058042236574382096126452369648152337120275
-# MD5 Fingerprint: 85:13:b9:90:5b:36:5c:b6:5e:b8:5a:f8:e0:31:57:b4
-# SHA1 Fingerprint: cf:e9:70:84:0f:e0:73:0f:9d:f6:0c:7f:2c:4b:ee:20:46:34:9c:bb
-# SHA256 Fingerprint: 2e:44:10:2a:b5:8c:b8:54:19:45:1c:8e:19:d9:ac:f3:66:2c:af:bc:61:4b:6a:53:96:0a:30:f7:d0:e2:eb:41
------BEGIN CERTIFICATE-----
-MIIFszCCA5ugAwIBAgIUEwLV4kBMkkaGFmddtLu7sms+/BMwDQYJKoZIhvcNAQEL
-BQAwYTELMAkGA1UEBhMCVE4xNzA1BgNVBAoMLkFnZW5jZSBOYXRpb25hbGUgZGUg
-Q2VydGlmaWNhdGlvbiBFbGVjdHJvbmlxdWUxGTAXBgNVBAMMEFR1blRydXN0IFJv
-b3QgQ0EwHhcNMTkwNDI2MDg1NzU2WhcNNDQwNDI2MDg1NzU2WjBhMQswCQYDVQQG
-EwJUTjE3MDUGA1UECgwuQWdlbmNlIE5hdGlvbmFsZSBkZSBDZXJ0aWZpY2F0aW9u
-IEVsZWN0cm9uaXF1ZTEZMBcGA1UEAwwQVHVuVHJ1c3QgUm9vdCBDQTCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAMPN0/y9BFPdDCA61YguBUtB9YOCfvdZ
-n56eY+hz2vYGqU8ftPkLHzmMmiDQfgbU7DTZhrx1W4eI8NLZ1KMKsmwb60ksPqxd
-2JQDoOw05TDENX37Jk0bbjBU2PWARZw5rZzJJQRNmpA+TkBuimvNKWfGzC3gdOgF
-VwpIUPp6Q9p+7FuaDmJ2/uqdHYVy7BG7NegfJ7/Boce7SBbdVtfMTqDhuazb1YMZ
-GoXRlJfXyqNlC/M4+QKu3fZnz8k/9YosRxqZbwUN/dAdgjH8KcwAWJeRTIAAHDOF
-li/LQcKLEITDCSSJH7UP2dl3RxiSlGBcx5kDPP73lad9UKGAwqmDrViWVSHbhlnU
-r8a83YFuB9tgYv7sEG7aaAH0gxupPqJbI9dkxt/con3YS7qC0lH4Zr8GRuR5KiY2
-eY8fTpkdso8MDhz/yV3A/ZAQprE38806JG60hZC/gLkMjNWb1sjxVj8agIl6qeIb
-MlEsPvLfe/ZdeikZjuXIvTZxi11Mwh0/rViizz1wTaZQmCXcI/m4WEEIcb9PuISg
-jwBUFfyRbVinljvrS5YnzWuioYasDXxU5mZMZl+QviGaAkYt5IPCgLnPSz7ofzwB
-7I9ezX/SKEIBlYrilz0QIX32nRzFNKHsLA4KUiwSVXAkPcvCFDVDXSdOvsC9qnyW
-5/yeYa1E0wCXAgMBAAGjYzBhMB0GA1UdDgQWBBQGmpsfU33x9aTI04Y+oXNZtPdE
-ITAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFAaamx9TffH1pMjThj6hc1m0
-90QhMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAqgVutt0Vyb+z
-xiD2BkewhpMl0425yAA/l/VSJ4hxyXT968pk21vvHl26v9Hr7lxpuhbI87mP0zYu
-QEkHDVneixCwSQXi/5E/S7fdAo74gShczNxtr18UnH1YeA32gAm56Q6XKRm4t+v4
-FstVEuTGfbvE7Pi1HE4+Z7/FXxttbUcoqgRYYdZ2vyJ/0Adqp2RT8JeNnYA/u8EH
-22Wv5psymsNUk8QcCMNE+3tjEUPRahphanltkE8pjkcFwRJpadbGNjHh/PqAulxP
-xOu3Mqz4dWEX1xAZufHSCe96Qp1bWgvUxpVOKs7/B9dPfhgGiPEZtdmYu65xxBzn
-dFlY7wyJz4sfdZMaBBSSSFCp61cpABbjNhzI+L/wM9VBD8TMPN3pM0MBkRArHtG5
-Xc0yGYuPjCB31yLEQtyEFpslbei0VXF/sHyz03FJuc9SpAQ/3D2gu68zngowYI7b
-nV2UqL1g52KAdoGDDIzMMEZJ4gzSqK/rYXHv5yJiqfdcZGyfFoxnNidF9Ql7v/YQ
-CvGwjVRDjAS6oz/v4jXH+XTgbzRB0L9zZVcg+ZtnemZoJE6AZb0QmQZZ8mWvuMZH
-u/2QeItBcy6vVR/cO5JyboTT0GFMDcx2V+IthSIVNg3rAZ3r2OvEhJn7wAzMMujj
-d9qDRIueVSjAi1jTkD5OGwDxFa2DK5o=
------END CERTIFICATE-----
-
-# Issuer: CN=HARICA TLS RSA Root CA 2021 O=Hellenic Academic and Research Institutions CA
-# Subject: CN=HARICA TLS RSA Root CA 2021 O=Hellenic Academic and Research Institutions CA
-# Label: "HARICA TLS RSA Root CA 2021"
-# Serial: 76817823531813593706434026085292783742
-# MD5 Fingerprint: 65:47:9b:58:86:dd:2c:f0:fc:a2:84:1f:1e:96:c4:91
-# SHA1 Fingerprint: 02:2d:05:82:fa:88:ce:14:0c:06:79:de:7f:14:10:e9:45:d7:a5:6d
-# SHA256 Fingerprint: d9:5d:0e:8e:da:79:52:5b:f9:be:b1:1b:14:d2:10:0d:32:94:98:5f:0c:62:d9:fa:bd:9c:d9:99:ec:cb:7b:1d
------BEGIN CERTIFICATE-----
-MIIFpDCCA4ygAwIBAgIQOcqTHO9D88aOk8f0ZIk4fjANBgkqhkiG9w0BAQsFADBs
-MQswCQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJl
-c2VhcmNoIEluc3RpdHV0aW9ucyBDQTEkMCIGA1UEAwwbSEFSSUNBIFRMUyBSU0Eg
-Um9vdCBDQSAyMDIxMB4XDTIxMDIxOTEwNTUzOFoXDTQ1MDIxMzEwNTUzN1owbDEL
-MAkGA1UEBhMCR1IxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNl
-YXJjaCBJbnN0aXR1dGlvbnMgQ0ExJDAiBgNVBAMMG0hBUklDQSBUTFMgUlNBIFJv
-b3QgQ0EgMjAyMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAIvC569l
-mwVnlskNJLnQDmT8zuIkGCyEf3dRywQRNrhe7Wlxp57kJQmXZ8FHws+RFjZiPTgE
-4VGC/6zStGndLuwRo0Xua2s7TL+MjaQenRG56Tj5eg4MmOIjHdFOY9TnuEFE+2uv
-a9of08WRiFukiZLRgeaMOVig1mlDqa2YUlhu2wr7a89o+uOkXjpFc5gH6l8Cct4M
-pbOfrqkdtx2z/IpZ525yZa31MJQjB/OCFks1mJxTuy/K5FrZx40d/JiZ+yykgmvw
-Kh+OC19xXFyuQnspiYHLA6OZyoieC0AJQTPb5lh6/a6ZcMBaD9YThnEvdmn8kN3b
-LW7R8pv1GmuebxWMevBLKKAiOIAkbDakO/IwkfN4E8/BPzWr8R0RI7VDIp4BkrcY
-AuUR0YLbFQDMYTfBKnya4dC6s1BG7oKsnTH4+yPiAwBIcKMJJnkVU2DzOFytOOqB
-AGMUuTNe3QvboEUHGjMJ+E20pwKmafTCWQWIZYVWrkvL4N48fS0ayOn7H6NhStYq
-E613TBoYm5EPWNgGVMWX+Ko/IIqmhaZ39qb8HOLubpQzKoNQhArlT4b4UEV4AIHr
-W2jjJo3Me1xR9BQsQL4aYB16cmEdH2MtiKrOokWQCPxrvrNQKlr9qEgYRtaQQJKQ
-CoReaDH46+0N0x3GfZkYVVYnZS6NRcUk7M7jAgMBAAGjQjBAMA8GA1UdEwEB/wQF
-MAMBAf8wHQYDVR0OBBYEFApII6ZgpJIKM+qTW8VX6iVNvRLuMA4GA1UdDwEB/wQE
-AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAPpBIqm5iFSVmewzVjIuJndftTgfvnNAU
-X15QvWiWkKQUEapobQk1OUAJ2vQJLDSle1mESSmXdMgHHkdt8s4cUCbjnj1AUz/3
-f5Z2EMVGpdAgS1D0NTsY9FVqQRtHBmg8uwkIYtlfVUKqrFOFrJVWNlar5AWMxaja
-H6NpvVMPxP/cyuN+8kyIhkdGGvMA9YCRotxDQpSbIPDRzbLrLFPCU3hKTwSUQZqP
-JzLB5UkZv/HywouoCjkxKLR9YjYsTewfM7Z+d21+UPCfDtcRj88YxeMn/ibvBZ3P
-zzfF0HvaO7AWhAw6k9a+F9sPPg4ZeAnHqQJyIkv3N3a6dcSFA1pj1bF1BcK5vZSt
-jBWZp5N99sXzqnTPBIWUmAD04vnKJGW/4GKvyMX6ssmeVkjaef2WdhW+o45WxLM0
-/L5H9MG0qPzVMIho7suuyWPEdr6sOBjhXlzPrjoiUevRi7PzKzMHVIf6tLITe7pT
-BGIBnfHAT+7hOtSLIBD6Alfm78ELt5BGnBkpjNxvoEppaZS3JGWg/6w/zgH7IS79
-aPib8qXPMThcFarmlwDB31qlpzmq6YR/PFGoOtmUW4y/Twhx5duoXNTSpv4Ao8YW
-xw/ogM4cKGR0GQjTQuPOAF1/sdwTsOEFy9EgqoZ0njnnkf3/W9b3raYvAwtt41dU
-63ZTGI0RmLo=
------END CERTIFICATE-----
-
-# Issuer: CN=HARICA TLS ECC Root CA 2021 O=Hellenic Academic and Research Institutions CA
-# Subject: CN=HARICA TLS ECC Root CA 2021 O=Hellenic Academic and Research Institutions CA
-# Label: "HARICA TLS ECC Root CA 2021"
-# Serial: 137515985548005187474074462014555733966
-# MD5 Fingerprint: ae:f7:4c:e5:66:35:d1:b7:9b:8c:22:93:74:d3:4b:b0
-# SHA1 Fingerprint: bc:b0:c1:9d:e9:98:92:70:19:38:57:e9:8d:a7:b4:5d:6e:ee:01:48
-# SHA256 Fingerprint: 3f:99:cc:47:4a:cf:ce:4d:fe:d5:87:94:66:5e:47:8d:15:47:73:9f:2e:78:0f:1b:b4:ca:9b:13:30:97:d4:01
------BEGIN CERTIFICATE-----
-MIICVDCCAdugAwIBAgIQZ3SdjXfYO2rbIvT/WeK/zjAKBggqhkjOPQQDAzBsMQsw
-CQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2Vh
-cmNoIEluc3RpdHV0aW9ucyBDQTEkMCIGA1UEAwwbSEFSSUNBIFRMUyBFQ0MgUm9v
-dCBDQSAyMDIxMB4XDTIxMDIxOTExMDExMFoXDTQ1MDIxMzExMDEwOVowbDELMAkG
-A1UEBhMCR1IxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJj
-aCBJbnN0aXR1dGlvbnMgQ0ExJDAiBgNVBAMMG0hBUklDQSBUTFMgRUNDIFJvb3Qg
-Q0EgMjAyMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABDgI/rGgltJ6rK9JOtDA4MM7
-KKrxcm1lAEeIhPyaJmuqS7psBAqIXhfyVYf8MLA04jRYVxqEU+kw2anylnTDUR9Y
-STHMmE5gEYd103KUkE+bECUqqHgtvpBBWJAVcqeht6NCMEAwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUyRtTgRL+BNUW0aq8mm+3oJUZbsowDgYDVR0PAQH/BAQD
-AgGGMAoGCCqGSM49BAMDA2cAMGQCMBHervjcToiwqfAircJRQO9gcS3ujwLEXQNw
-SaSS6sUUiHCm0w2wqsosQJz76YJumgIwK0eaB8bRwoF8yguWGEEbo/QwCZ61IygN
-nxS2PFOiTAZpffpskcYqSUXm7LcT4Tps
------END CERTIFICATE-----
-
-# Issuer: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
-# Subject: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
-# Label: "Autoridad de Certificacion Firmaprofesional CIF A62634068"
-# Serial: 1977337328857672817
-# MD5 Fingerprint: 4e:6e:9b:54:4c:ca:b7:fa:48:e4:90:b1:15:4b:1c:a3
-# SHA1 Fingerprint: 0b:be:c2:27:22:49:cb:39:aa:db:35:5c:53:e3:8c:ae:78:ff:b6:fe
-# SHA256 Fingerprint: 57:de:05:83:ef:d2:b2:6e:03:61:da:99:da:9d:f4:64:8d:ef:7e:e8:44:1c:3b:72:8a:fa:9b:cd:e0:f9:b2:6a
------BEGIN CERTIFICATE-----
-MIIGFDCCA/ygAwIBAgIIG3Dp0v+ubHEwDQYJKoZIhvcNAQELBQAwUTELMAkGA1UE
-BhMCRVMxQjBABgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1h
-cHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODAeFw0xNDA5MjMxNTIyMDdaFw0zNjA1
-MDUxNTIyMDdaMFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUg
-Q2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBBNjI2MzQwNjgwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDDUtd9
-thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQM
-cas9UX4PB99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefG
-L9ItWY16Ck6WaVICqjaY7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15i
-NA9wBj4gGFrO93IbJWyTdBSTo3OxDqqHECNZXyAFGUftaI6SEspd/NYrspI8IM/h
-X68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyIplD9amML9ZMWGxmPsu2b
-m8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctXMbScyJCy
-Z/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirja
-EbsXLZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/T
-KI8xWVvTyQKmtFLKbpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF
-6NkBiDkal4ZkQdU7hwxu+g/GvUgUvzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVh
-OSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMB0GA1UdDgQWBBRlzeurNR4APn7VdMAc
-tHNHDhpkLzASBgNVHRMBAf8ECDAGAQH/AgEBMIGmBgNVHSAEgZ4wgZswgZgGBFUd
-IAAwgY8wLwYIKwYBBQUHAgEWI2h0dHA6Ly93d3cuZmlybWFwcm9mZXNpb25hbC5j
-b20vY3BzMFwGCCsGAQUFBwICMFAeTgBQAGEAcwBlAG8AIABkAGUAIABsAGEAIABC
-AG8AbgBhAG4AbwB2AGEAIAA0ADcAIABCAGEAcgBjAGUAbABvAG4AYQAgADAAOAAw
-ADEANzAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQELBQADggIBAHSHKAIrdx9m
-iWTtj3QuRhy7qPj4Cx2Dtjqn6EWKB7fgPiDL4QjbEwj4KKE1soCzC1HA01aajTNF
-Sa9J8OA9B3pFE1r/yJfY0xgsfZb43aJlQ3CTkBW6kN/oGbDbLIpgD7dvlAceHabJ
-hfa9NPhAeGIQcDq+fUs5gakQ1JZBu/hfHAsdCPKxsIl68veg4MSPi3i1O1ilI45P
-Vf42O+AMt8oqMEEgtIDNrvx2ZnOorm7hfNoD6JQg5iKj0B+QXSBTFCZX2lSX3xZE
-EAEeiGaPcjiT3SC3NL7X8e5jjkd5KAb881lFJWAiMxujX6i6KtoaPc1A6ozuBRWV
-1aUsIC+nmCjuRfzxuIgALI9C2lHVnOUTaHFFQ4ueCyE8S1wF3BqfmI7avSKecs2t
-CsvMo2ebKHTEm9caPARYpoKdrcd7b/+Alun4jWq9GJAd/0kakFI3ky88Al2CdgtR
-5xbHV/g4+afNmyJU72OwFW1TZQNKXkqgsqeOSQBZONXH9IBk9W6VULgRfhVwOEqw
-f9DEMnDAGf/JOC0ULGb0QkTmVXYbgBVX/8Cnp6o5qtjTcNAuuuuUavpfNIbnYrX9
-ivAwhZTJryQCL2/W3Wf+47BVTwSYT6RBVuKT0Gro1vP7ZeDOdcQxWQzugsgMYDNK
-GbqEZycPvEJdvSRUDewdcAZfpLz6IHxV
------END CERTIFICATE-----
-
-# Issuer: CN=vTrus ECC Root CA O=iTrusChina Co.,Ltd.
-# Subject: CN=vTrus ECC Root CA O=iTrusChina Co.,Ltd.
-# Label: "vTrus ECC Root CA"
-# Serial: 630369271402956006249506845124680065938238527194
-# MD5 Fingerprint: de:4b:c1:f5:52:8c:9b:43:e1:3e:8f:55:54:17:8d:85
-# SHA1 Fingerprint: f6:9c:db:b0:fc:f6:02:13:b6:52:32:a6:a3:91:3f:16:70:da:c3:e1
-# SHA256 Fingerprint: 30:fb:ba:2c:32:23:8e:2a:98:54:7a:f9:79:31:e5:50:42:8b:9b:3f:1c:8e:eb:66:33:dc:fa:86:c5:b2:7d:d3
------BEGIN CERTIFICATE-----
-MIICDzCCAZWgAwIBAgIUbmq8WapTvpg5Z6LSa6Q75m0c1towCgYIKoZIzj0EAwMw
-RzELMAkGA1UEBhMCQ04xHDAaBgNVBAoTE2lUcnVzQ2hpbmEgQ28uLEx0ZC4xGjAY
-BgNVBAMTEXZUcnVzIEVDQyBSb290IENBMB4XDTE4MDczMTA3MjY0NFoXDTQzMDcz
-MTA3MjY0NFowRzELMAkGA1UEBhMCQ04xHDAaBgNVBAoTE2lUcnVzQ2hpbmEgQ28u
-LEx0ZC4xGjAYBgNVBAMTEXZUcnVzIEVDQyBSb290IENBMHYwEAYHKoZIzj0CAQYF
-K4EEACIDYgAEZVBKrox5lkqqHAjDo6LN/llWQXf9JpRCux3NCNtzslt188+cToL0
-v/hhJoVs1oVbcnDS/dtitN9Ti72xRFhiQgnH+n9bEOf+QP3A2MMrMudwpremIFUd
-e4BdS49nTPEQo0IwQDAdBgNVHQ4EFgQUmDnNvtiyjPeyq+GtJK97fKHbH88wDwYD
-VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwCgYIKoZIzj0EAwMDaAAwZQIw
-V53dVvHH4+m4SVBrm2nDb+zDfSXkV5UTQJtS0zvzQBm8JsctBp61ezaf9SXUY2sA
-AjEA6dPGnlaaKsyh2j/IZivTWJwghfqrkYpwcBE4YGQLYgmRWAD5Tfs0aNoJrSEG
-GJTO
------END CERTIFICATE-----
-
-# Issuer: CN=vTrus Root CA O=iTrusChina Co.,Ltd.
-# Subject: CN=vTrus Root CA O=iTrusChina Co.,Ltd.
-# Label: "vTrus Root CA"
-# Serial: 387574501246983434957692974888460947164905180485
-# MD5 Fingerprint: b8:c9:37:df:fa:6b:31:84:64:c5:ea:11:6a:1b:75:fc
-# SHA1 Fingerprint: 84:1a:69:fb:f5:cd:1a:25:34:13:3d:e3:f8:fc:b8:99:d0:c9:14:b7
-# SHA256 Fingerprint: 8a:71:de:65:59:33:6f:42:6c:26:e5:38:80:d0:0d:88:a1:8d:a4:c6:a9:1f:0d:cb:61:94:e2:06:c5:c9:63:87
------BEGIN CERTIFICATE-----
-MIIFVjCCAz6gAwIBAgIUQ+NxE9izWRRdt86M/TX9b7wFjUUwDQYJKoZIhvcNAQEL
-BQAwQzELMAkGA1UEBhMCQ04xHDAaBgNVBAoTE2lUcnVzQ2hpbmEgQ28uLEx0ZC4x
-FjAUBgNVBAMTDXZUcnVzIFJvb3QgQ0EwHhcNMTgwNzMxMDcyNDA1WhcNNDMwNzMx
-MDcyNDA1WjBDMQswCQYDVQQGEwJDTjEcMBoGA1UEChMTaVRydXNDaGluYSBDby4s
-THRkLjEWMBQGA1UEAxMNdlRydXMgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAL1VfGHTuB0EYgWgrmy3cLRB6ksDXhA/kFocizuwZotsSKYc
-IrrVQJLuM7IjWcmOvFjai57QGfIvWcaMY1q6n6MLsLOaXLoRuBLpDLvPbmyAhykU
-AyyNJJrIZIO1aqwTLDPxn9wsYTwaP3BVm60AUn/PBLn+NvqcwBauYv6WTEN+VRS+
-GrPSbcKvdmaVayqwlHeFXgQPYh1jdfdr58tbmnDsPmcF8P4HCIDPKNsFxhQnL4Z9
-8Cfe/+Z+M0jnCx5Y0ScrUw5XSmXX+6KAYPxMvDVTAWqXcoKv8R1w6Jz1717CbMdH
-flqUhSZNO7rrTOiwCcJlwp2dCZtOtZcFrPUGoPc2BX70kLJrxLT5ZOrpGgrIDajt
-J8nU57O5q4IikCc9Kuh8kO+8T/3iCiSn3mUkpF3qwHYw03dQ+A0Em5Q2AXPKBlim
-0zvc+gRGE1WKyURHuFE5Gi7oNOJ5y1lKCn+8pu8fA2dqWSslYpPZUxlmPCdiKYZN
-pGvu/9ROutW04o5IWgAZCfEF2c6Rsffr6TlP9m8EQ5pV9T4FFL2/s1m02I4zhKOQ
-UqqzApVg+QxMaPnu1RcN+HFXtSXkKe5lXa/R7jwXC1pDxaWG6iSe4gUH3DRCEpHW
-OXSuTEGC2/KmSNGzm/MzqvOmwMVO9fSddmPmAsYiS8GVP1BkLFTltvA8Kc9XAgMB
-AAGjQjBAMB0GA1UdDgQWBBRUYnBj8XWEQ1iO0RYgscasGrz2iTAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAKbqSSaet
-8PFww+SX8J+pJdVrnjT+5hpk9jprUrIQeBqfTNqK2uwcN1LgQkv7bHbKJAs5EhWd
-nxEt/Hlk3ODg9d3gV8mlsnZwUKT+twpw1aA08XXXTUm6EdGz2OyC/+sOxL9kLX1j
-bhd47F18iMjrjld22VkE+rxSH0Ws8HqA7Oxvdq6R2xCOBNyS36D25q5J08FsEhvM
-Kar5CKXiNxTKsbhm7xqC5PD48acWabfbqWE8n/Uxy+QARsIvdLGx14HuqCaVvIiv
-TDUHKgLKeBRtRytAVunLKmChZwOgzoy8sHJnxDHO2zTlJQNgJXtxmOTAGytfdELS
-S8VZCAeHvsXDf+eW2eHcKJfWjwXj9ZtOyh1QRwVTsMo554WgicEFOwE30z9J4nfr
-I8iIZjs9OXYhRvHsXyO466JmdXTBQPfYaJqT4i2pLr0cox7IdMakLXogqzu4sEb9
-b91fUlV1YvCXoHzXOP0l382gmxDPi7g4Xl7FtKYCNqEeXxzP4padKar9mK5S4fNB
-UvupLnKWnyfjqnN9+BojZns7q2WwMgFLFT49ok8MKzWixtlnEjUwzXYuFrOZnk1P
-Ti07NEPhmg4NpGaXutIcSkwsKouLgU9xGqndXHt7CMUADTdA43x7VF8vhV929ven
-sBxXVsFy6K2ir40zSbofitzmdHxghm+Hl3s=
------END CERTIFICATE-----
-
-# Issuer: CN=ISRG Root X2 O=Internet Security Research Group
-# Subject: CN=ISRG Root X2 O=Internet Security Research Group
-# Label: "ISRG Root X2"
-# Serial: 87493402998870891108772069816698636114
-# MD5 Fingerprint: d3:9e:c4:1e:23:3c:a6:df:cf:a3:7e:6d:e0:14:e6:e5
-# SHA1 Fingerprint: bd:b1:b9:3c:d5:97:8d:45:c6:26:14:55:f8:db:95:c7:5a:d1:53:af
-# SHA256 Fingerprint: 69:72:9b:8e:15:a8:6e:fc:17:7a:57:af:b7:17:1d:fc:64:ad:d2:8c:2f:ca:8c:f1:50:7e:34:45:3c:cb:14:70
------BEGIN CERTIFICATE-----
-MIICGzCCAaGgAwIBAgIQQdKd0XLq7qeAwSxs6S+HUjAKBggqhkjOPQQDAzBPMQsw
-CQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2gg
-R3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMjAeFw0yMDA5MDQwMDAwMDBaFw00
-MDA5MTcxNjAwMDBaME8xCzAJBgNVBAYTAlVTMSkwJwYDVQQKEyBJbnRlcm5ldCBT
-ZWN1cml0eSBSZXNlYXJjaCBHcm91cDEVMBMGA1UEAxMMSVNSRyBSb290IFgyMHYw
-EAYHKoZIzj0CAQYFK4EEACIDYgAEzZvVn4CDCuwJSvMWSj5cz3es3mcFDR0HttwW
-+1qLFNvicWDEukWVEYmO6gbf9yoWHKS5xcUy4APgHoIYOIvXRdgKam7mAHf7AlF9
-ItgKbppbd9/w+kHsOdx1ymgHDB/qo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0T
-AQH/BAUwAwEB/zAdBgNVHQ4EFgQUfEKWrt5LSDv6kviejM9ti6lyN5UwCgYIKoZI
-zj0EAwMDaAAwZQIwe3lORlCEwkSHRhtFcP9Ymd70/aTSVaYgLXTWNLxBo1BfASdW
-tL4ndQavEi51mI38AjEAi/V3bNTIZargCyzuFJ0nN6T5U6VR5CmD1/iQMVtCnwr1
-/q4AaOeMSQ+2b1tbFfLn
------END CERTIFICATE-----
-
-# Issuer: CN=HiPKI Root CA - G1 O=Chunghwa Telecom Co., Ltd.
-# Subject: CN=HiPKI Root CA - G1 O=Chunghwa Telecom Co., Ltd.
-# Label: "HiPKI Root CA - G1"
-# Serial: 60966262342023497858655262305426234976
-# MD5 Fingerprint: 69:45:df:16:65:4b:e8:68:9a:8f:76:5f:ff:80:9e:d3
-# SHA1 Fingerprint: 6a:92:e4:a8:ee:1b:ec:96:45:37:e3:29:57:49:cd:96:e3:e5:d2:60
-# SHA256 Fingerprint: f0:15:ce:3c:c2:39:bf:ef:06:4b:e9:f1:d2:c4:17:e1:a0:26:4a:0a:94:be:1f:0c:8d:12:18:64:eb:69:49:cc
------BEGIN CERTIFICATE-----
-MIIFajCCA1KgAwIBAgIQLd2szmKXlKFD6LDNdmpeYDANBgkqhkiG9w0BAQsFADBP
-MQswCQYDVQQGEwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0
-ZC4xGzAZBgNVBAMMEkhpUEtJIFJvb3QgQ0EgLSBHMTAeFw0xOTAyMjIwOTQ2MDRa
-Fw0zNzEyMzExNTU5NTlaME8xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3
-YSBUZWxlY29tIENvLiwgTHRkLjEbMBkGA1UEAwwSSGlQS0kgUm9vdCBDQSAtIEcx
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA9B5/UnMyDHPkvRN0o9Qw
-qNCuS9i233VHZvR85zkEHmpwINJaR3JnVfSl6J3VHiGh8Ge6zCFovkRTv4354twv
-Vcg3Px+kwJyz5HdcoEb+d/oaoDjq7Zpy3iu9lFc6uux55199QmQ5eiY29yTw1S+6
-lZgRZq2XNdZ1AYDgr/SEYYwNHl98h5ZeQa/rh+r4XfEuiAU+TCK72h8q3VJGZDnz
-Qs7ZngyzsHeXZJzA9KMuH5UHsBffMNsAGJZMoYFL3QRtU6M9/Aes1MU3guvklQgZ
-KILSQjqj2FPseYlgSGDIcpJQ3AOPgz+yQlda22rpEZfdhSi8MEyr48KxRURHH+CK
-FgeW0iEPU8DtqX7UTuybCeyvQqww1r/REEXgphaypcXTT3OUM3ECoWqj1jOXTyFj
-HluP2cFeRXF3D4FdXyGarYPM+l7WjSNfGz1BryB1ZlpK9p/7qxj3ccC2HTHsOyDr
-y+K49a6SsvfhhEvyovKTmiKe0xRvNlS9H15ZFblzqMF8b3ti6RZsR1pl8w4Rm0bZ
-/W3c1pzAtH2lsN0/Vm+h+fbkEkj9Bn8SV7apI09bA8PgcSojt/ewsTu8mL3WmKgM
-a/aOEmem8rJY5AIJEzypuxC00jBF8ez3ABHfZfjcK0NVvxaXxA/VLGGEqnKG/uY6
-fsI/fe78LxQ+5oXdUG+3Se0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
-HQ4EFgQU8ncX+l6o/vY9cdVouslGDDjYr7AwDgYDVR0PAQH/BAQDAgGGMA0GCSqG
-SIb3DQEBCwUAA4ICAQBQUfB13HAE4/+qddRxosuej6ip0691x1TPOhwEmSKsxBHi
-7zNKpiMdDg1H2DfHb680f0+BazVP6XKlMeJ45/dOlBhbQH3PayFUhuaVevvGyuqc
-SE5XCV0vrPSltJczWNWseanMX/mF+lLFjfiRFOs6DRfQUsJ748JzjkZ4Bjgs6Fza
-ZsT0pPBWGTMpWmWSBUdGSquEwx4noR8RkpkndZMPvDY7l1ePJlsMu5wP1G4wB9Tc
-XzZoZjmDlicmisjEOf6aIW/Vcobpf2Lll07QJNBAsNB1CI69aO4I1258EHBGG3zg
-iLKecoaZAeO/n0kZtCW+VmWuF2PlHt/o/0elv+EmBYTksMCv5wiZqAxeJoBF1Pho
-L5aPruJKHJwWDBNvOIf2u8g0X5IDUXlwpt/L9ZlNec1OvFefQ05rLisY+GpzjLrF
-Ne85akEez3GoorKGB1s6yeHvP2UEgEcyRHCVTjFnanRbEEV16rCf0OY1/k6fi8wr
-kkVbbiVghUbN0aqwdmaTd5a+g744tiROJgvM7XpWGuDpWsZkrUx6AEhEL7lAuxM+
-vhV4nYWBSipX3tUZQ9rbyltHhoMLP7YNdnhzeSJesYAfz77RP1YQmCuVh6EfnWQU
-YDksswBVLuT1sw5XxJFBAJw/6KXf6vb/yPCtbVKoF6ubYfwSUTXkJf2vqmqGOQ==
------END CERTIFICATE-----
-
-# Issuer: CN=GlobalSign O=GlobalSign OU=GlobalSign ECC Root CA - R4
-# Subject: CN=GlobalSign O=GlobalSign OU=GlobalSign ECC Root CA - R4
-# Label: "GlobalSign ECC Root CA - R4"
-# Serial: 159662223612894884239637590694
-# MD5 Fingerprint: 26:29:f8:6d:e1:88:bf:a2:65:7f:aa:c4:cd:0f:7f:fc
-# SHA1 Fingerprint: 6b:a0:b0:98:e1:71:ef:5a:ad:fe:48:15:80:77:10:f4:bd:6f:0b:28
-# SHA256 Fingerprint: b0:85:d7:0b:96:4f:19:1a:73:e4:af:0d:54:ae:7a:0e:07:aa:fd:af:9b:71:dd:08:62:13:8a:b7:32:5a:24:a2
------BEGIN CERTIFICATE-----
-MIIB3DCCAYOgAwIBAgINAgPlfvU/k/2lCSGypjAKBggqhkjOPQQDAjBQMSQwIgYD
-VQQLExtHbG9iYWxTaWduIEVDQyBSb290IENBIC0gUjQxEzARBgNVBAoTCkdsb2Jh
-bFNpZ24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMTIxMTEzMDAwMDAwWhcNMzgw
-MTE5MDMxNDA3WjBQMSQwIgYDVQQLExtHbG9iYWxTaWduIEVDQyBSb290IENBIC0g
-UjQxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2JhbFNpZ24wWTAT
-BgcqhkjOPQIBBggqhkjOPQMBBwNCAAS4xnnTj2wlDp8uORkcA6SumuU5BwkWymOx
-uYb4ilfBV85C+nOh92VC/x7BALJucw7/xyHlGKSq2XE/qNS5zowdo0IwQDAOBgNV
-HQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUVLB7rUW44kB/
-+wpu+74zyTyjhNUwCgYIKoZIzj0EAwIDRwAwRAIgIk90crlgr/HmnKAWBVBfw147
-bmF0774BxL4YSFlhgjICICadVGNA3jdgUM/I2O2dgq43mLyjj0xMqTQrbO/7lZsm
------END CERTIFICATE-----
-
-# Issuer: CN=GTS Root R1 O=Google Trust Services LLC
-# Subject: CN=GTS Root R1 O=Google Trust Services LLC
-# Label: "GTS Root R1"
-# Serial: 159662320309726417404178440727
-# MD5 Fingerprint: 05:fe:d0:bf:71:a8:a3:76:63:da:01:e0:d8:52:dc:40
-# SHA1 Fingerprint: e5:8c:1c:c4:91:3b:38:63:4b:e9:10:6e:e3:ad:8e:6b:9d:d9:81:4a
-# SHA256 Fingerprint: d9:47:43:2a:bd:e7:b7:fa:90:fc:2e:6b:59:10:1b:12:80:e0:e1:c7:e4:e4:0f:a3:c6:88:7f:ff:57:a7:f4:cf
------BEGIN CERTIFICATE-----
-MIIFVzCCAz+gAwIBAgINAgPlk28xsBNJiGuiFzANBgkqhkiG9w0BAQwFADBHMQsw
-CQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEU
-MBIGA1UEAxMLR1RTIFJvb3QgUjEwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAw
-MDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZp
-Y2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjEwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQC2EQKLHuOhd5s73L+UPreVp0A8of2C+X0yBoJx9vaMf/vo
-27xqLpeXo4xL+Sv2sfnOhB2x+cWX3u+58qPpvBKJXqeqUqv4IyfLpLGcY9vXmX7w
-Cl7raKb0xlpHDU0QM+NOsROjyBhsS+z8CZDfnWQpJSMHobTSPS5g4M/SCYe7zUjw
-TcLCeoiKu7rPWRnWr4+wB7CeMfGCwcDfLqZtbBkOtdh+JhpFAz2weaSUKK0Pfybl
-qAj+lug8aJRT7oM6iCsVlgmy4HqMLnXWnOunVmSPlk9orj2XwoSPwLxAwAtcvfaH
-szVsrBhQf4TgTM2S0yDpM7xSma8ytSmzJSq0SPly4cpk9+aCEI3oncKKiPo4Zor8
-Y/kB+Xj9e1x3+naH+uzfsQ55lVe0vSbv1gHR6xYKu44LtcXFilWr06zqkUspzBmk
-MiVOKvFlRNACzqrOSbTqn3yDsEB750Orp2yjj32JgfpMpf/VjsPOS+C12LOORc92
-wO1AK/1TD7Cn1TsNsYqiA94xrcx36m97PtbfkSIS5r762DL8EGMUUXLeXdYWk70p
-aDPvOmbsB4om3xPXV2V4J95eSRQAogB/mqghtqmxlbCluQ0WEdrHbEg8QOB+DVrN
-VjzRlwW5y0vtOUucxD/SVRNuJLDWcfr0wbrM7Rv1/oFB2ACYPTrIrnqYNxgFlQID
-AQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
-FgQU5K8rJnEaK0gnhS9SZizv8IkTcT4wDQYJKoZIhvcNAQEMBQADggIBAJ+qQibb
-C5u+/x6Wki4+omVKapi6Ist9wTrYggoGxval3sBOh2Z5ofmmWJyq+bXmYOfg6LEe
-QkEzCzc9zolwFcq1JKjPa7XSQCGYzyI0zzvFIoTgxQ6KfF2I5DUkzps+GlQebtuy
-h6f88/qBVRRiClmpIgUxPoLW7ttXNLwzldMXG+gnoot7TiYaelpkttGsN/H9oPM4
-7HLwEXWdyzRSjeZ2axfG34arJ45JK3VmgRAhpuo+9K4l/3wV3s6MJT/KYnAK9y8J
-ZgfIPxz88NtFMN9iiMG1D53Dn0reWVlHxYciNuaCp+0KueIHoI17eko8cdLiA6Ef
-MgfdG+RCzgwARWGAtQsgWSl4vflVy2PFPEz0tv/bal8xa5meLMFrUKTX5hgUvYU/
-Z6tGn6D/Qqc6f1zLXbBwHSs09dR2CQzreExZBfMzQsNhFRAbd03OIozUhfJFfbdT
-6u9AWpQKXCBfTkBdYiJ23//OYb2MI3jSNwLgjt7RETeJ9r/tSQdirpLsQBqvFAnZ
-0E6yove+7u7Y/9waLd64NnHi/Hm3lCXRSHNboTXns5lndcEZOitHTtNCjv0xyBZm
-2tIMPNuzjsmhDYAPexZ3FL//2wmUspO8IFgV6dtxQ/PeEMMA3KgqlbbC1j+Qa3bb
-bP6MvPJwNQzcmRk13NfIRmPVNnGuV/u3gm3c
------END CERTIFICATE-----
-
-# Issuer: CN=GTS Root R2 O=Google Trust Services LLC
-# Subject: CN=GTS Root R2 O=Google Trust Services LLC
-# Label: "GTS Root R2"
-# Serial: 159662449406622349769042896298
-# MD5 Fingerprint: 1e:39:c0:53:e6:1e:29:82:0b:ca:52:55:36:5d:57:dc
-# SHA1 Fingerprint: 9a:44:49:76:32:db:de:fa:d0:bc:fb:5a:7b:17:bd:9e:56:09:24:94
-# SHA256 Fingerprint: 8d:25:cd:97:22:9d:bf:70:35:6b:da:4e:b3:cc:73:40:31:e2:4c:f0:0f:af:cf:d3:2d:c7:6e:b5:84:1c:7e:a8
------BEGIN CERTIFICATE-----
-MIIFVzCCAz+gAwIBAgINAgPlrsWNBCUaqxElqjANBgkqhkiG9w0BAQwFADBHMQsw
-CQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEU
-MBIGA1UEAxMLR1RTIFJvb3QgUjIwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAw
-MDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZp
-Y2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjIwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQDO3v2m++zsFDQ8BwZabFn3GTXd98GdVarTzTukk3LvCvpt
-nfbwhYBboUhSnznFt+4orO/LdmgUud+tAWyZH8QiHZ/+cnfgLFuv5AS/T3KgGjSY
-6Dlo7JUle3ah5mm5hRm9iYz+re026nO8/4Piy33B0s5Ks40FnotJk9/BW9BuXvAu
-MC6C/Pq8tBcKSOWIm8Wba96wyrQD8Nr0kLhlZPdcTK3ofmZemde4wj7I0BOdre7k
-RXuJVfeKH2JShBKzwkCX44ofR5GmdFrS+LFjKBC4swm4VndAoiaYecb+3yXuPuWg
-f9RhD1FLPD+M2uFwdNjCaKH5wQzpoeJ/u1U8dgbuak7MkogwTZq9TwtImoS1mKPV
-+3PBV2HdKFZ1E66HjucMUQkQdYhMvI35ezzUIkgfKtzra7tEscszcTJGr61K8Yzo
-dDqs5xoic4DSMPclQsciOzsSrZYuxsN2B6ogtzVJV+mSSeh2FnIxZyuWfoqjx5RW
-Ir9qS34BIbIjMt/kmkRtWVtd9QCgHJvGeJeNkP+byKq0rxFROV7Z+2et1VsRnTKa
-G73VululycslaVNVJ1zgyjbLiGH7HrfQy+4W+9OmTN6SpdTi3/UGVN4unUu0kzCq
-gc7dGtxRcw1PcOnlthYhGXmy5okLdWTK1au8CcEYof/UVKGFPP0UJAOyh9OktwID
-AQABo0IwQDAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
-FgQUu//KjiOfT5nK2+JopqUVJxce2Q4wDQYJKoZIhvcNAQEMBQADggIBAB/Kzt3H
-vqGf2SdMC9wXmBFqiN495nFWcrKeGk6c1SuYJF2ba3uwM4IJvd8lRuqYnrYb/oM8
-0mJhwQTtzuDFycgTE1XnqGOtjHsB/ncw4c5omwX4Eu55MaBBRTUoCnGkJE+M3DyC
-B19m3H0Q/gxhswWV7uGugQ+o+MePTagjAiZrHYNSVc61LwDKgEDg4XSsYPWHgJ2u
-NmSRXbBoGOqKYcl3qJfEycel/FVL8/B/uWU9J2jQzGv6U53hkRrJXRqWbTKH7QMg
-yALOWr7Z6v2yTcQvG99fevX4i8buMTolUVVnjWQye+mew4K6Ki3pHrTgSAai/Gev
-HyICc/sgCq+dVEuhzf9gR7A/Xe8bVr2XIZYtCtFenTgCR2y59PYjJbigapordwj6
-xLEokCZYCDzifqrXPW+6MYgKBesntaFJ7qBFVHvmJ2WZICGoo7z7GJa7Um8M7YNR
-TOlZ4iBgxcJlkoKM8xAfDoqXvneCbT+PHV28SSe9zE8P4c52hgQjxcCMElv924Sg
-JPFI/2R80L5cFtHvma3AH/vLrrw4IgYmZNralw4/KBVEqE8AyvCazM90arQ+POuV
-7LXTWtiBmelDGDfrs7vRWGJB82bSj6p4lVQgw1oudCvV0b4YacCs1aTPObpRhANl
-6WLAYv7YTVWW4tAR+kg0Eeye7QUd5MjWHYbL
------END CERTIFICATE-----
-
-# Issuer: CN=GTS Root R3 O=Google Trust Services LLC
-# Subject: CN=GTS Root R3 O=Google Trust Services LLC
-# Label: "GTS Root R3"
-# Serial: 159662495401136852707857743206
-# MD5 Fingerprint: 3e:e7:9d:58:02:94:46:51:94:e5:e0:22:4a:8b:e7:73
-# SHA1 Fingerprint: ed:e5:71:80:2b:c8:92:b9:5b:83:3c:d2:32:68:3f:09:cd:a0:1e:46
-# SHA256 Fingerprint: 34:d8:a7:3e:e2:08:d9:bc:db:0d:95:65:20:93:4b:4e:40:e6:94:82:59:6e:8b:6f:73:c8:42:6b:01:0a:6f:48
------BEGIN CERTIFICATE-----
-MIICCTCCAY6gAwIBAgINAgPluILrIPglJ209ZjAKBggqhkjOPQQDAzBHMQswCQYD
-VQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIG
-A1UEAxMLR1RTIFJvb3QgUjMwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAw
-WjBHMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2Vz
-IExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMwdjAQBgcqhkjOPQIBBgUrgQQAIgNi
-AAQfTzOHMymKoYTey8chWEGJ6ladK0uFxh1MJ7x/JlFyb+Kf1qPKzEUURout736G
-jOyxfi//qXGdGIRFBEFVbivqJn+7kAHjSxm65FSWRQmx1WyRRK2EE46ajA2ADDL2
-4CejQjBAMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW
-BBTB8Sa6oC2uhYHP0/EqEr24Cmf9vDAKBggqhkjOPQQDAwNpADBmAjEA9uEglRR7
-VKOQFhG/hMjqb2sXnh5GmCCbn9MN2azTL818+FsuVbu/3ZL3pAzcMeGiAjEA/Jdm
-ZuVDFhOD3cffL74UOO0BzrEXGhF16b0DjyZ+hOXJYKaV11RZt+cRLInUue4X
------END CERTIFICATE-----
-
-# Issuer: CN=GTS Root R4 O=Google Trust Services LLC
-# Subject: CN=GTS Root R4 O=Google Trust Services LLC
-# Label: "GTS Root R4"
-# Serial: 159662532700760215368942768210
-# MD5 Fingerprint: 43:96:83:77:19:4d:76:b3:9d:65:52:e4:1d:22:a5:e8
-# SHA1 Fingerprint: 77:d3:03:67:b5:e0:0c:15:f6:0c:38:61:df:7c:e1:3b:92:46:4d:47
-# SHA256 Fingerprint: 34:9d:fa:40:58:c5:e2:63:12:3b:39:8a:e7:95:57:3c:4e:13:13:c8:3f:e6:8f:93:55:6c:d5:e8:03:1b:3c:7d
------BEGIN CERTIFICATE-----
-MIICCTCCAY6gAwIBAgINAgPlwGjvYxqccpBQUjAKBggqhkjOPQQDAzBHMQswCQYD
-VQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIG
-A1UEAxMLR1RTIFJvb3QgUjQwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAw
-WjBHMQswCQYDVQQGEwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2Vz
-IExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQwdjAQBgcqhkjOPQIBBgUrgQQAIgNi
-AATzdHOnaItgrkO4NcWBMHtLSZ37wWHO5t5GvWvVYRg1rkDdc/eJkTBa6zzuhXyi
-QHY7qca4R9gq55KRanPpsXI5nymfopjTX15YhmUPoYRlBtHci8nHc8iMai/lxKvR
-HYqjQjBAMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW
-BBSATNbrdP9JNqPV2Py1PsVq8JQdjDAKBggqhkjOPQQDAwNpADBmAjEA6ED/g94D
-9J+uHXqnLrmvT/aDHQ4thQEd0dlq7A/Cr8deVl5c1RxYIigL9zC2L7F8AjEA8GE8
-p/SgguMh1YQdc4acLa/KNJvxn7kjNuK8YAOdgLOaVsjh4rsUecrNIdSUtUlD
------END CERTIFICATE-----
-
-# Issuer: CN=Telia Root CA v2 O=Telia Finland Oyj
-# Subject: CN=Telia Root CA v2 O=Telia Finland Oyj
-# Label: "Telia Root CA v2"
-# Serial: 7288924052977061235122729490515358
-# MD5 Fingerprint: 0e:8f:ac:aa:82:df:85:b1:f4:dc:10:1c:fc:99:d9:48
-# SHA1 Fingerprint: b9:99:cd:d1:73:50:8a:c4:47:05:08:9c:8c:88:fb:be:a0:2b:40:cd
-# SHA256 Fingerprint: 24:2b:69:74:2f:cb:1e:5b:2a:bf:98:89:8b:94:57:21:87:54:4e:5b:4d:99:11:78:65:73:62:1f:6a:74:b8:2c
------BEGIN CERTIFICATE-----
-MIIFdDCCA1ygAwIBAgIPAWdfJ9b+euPkrL4JWwWeMA0GCSqGSIb3DQEBCwUAMEQx
-CzAJBgNVBAYTAkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajEZMBcGA1UE
-AwwQVGVsaWEgUm9vdCBDQSB2MjAeFw0xODExMjkxMTU1NTRaFw00MzExMjkxMTU1
-NTRaMEQxCzAJBgNVBAYTAkZJMRowGAYDVQQKDBFUZWxpYSBGaW5sYW5kIE95ajEZ
-MBcGA1UEAwwQVGVsaWEgUm9vdCBDQSB2MjCCAiIwDQYJKoZIhvcNAQEBBQADggIP
-ADCCAgoCggIBALLQPwe84nvQa5n44ndp586dpAO8gm2h/oFlH0wnrI4AuhZ76zBq
-AMCzdGh+sq/H1WKzej9Qyow2RCRj0jbpDIX2Q3bVTKFgcmfiKDOlyzG4OiIjNLh9
-vVYiQJ3q9HsDrWj8soFPmNB06o3lfc1jw6P23pLCWBnglrvFxKk9pXSW/q/5iaq9
-lRdU2HhE8Qx3FZLgmEKnpNaqIJLNwaCzlrI6hEKNfdWV5Nbb6WLEWLN5xYzTNTOD
-n3WhUidhOPFZPY5Q4L15POdslv5e2QJltI5c0BE0312/UqeBAMN/mUWZFdUXyApT
-7GPzmX3MaRKGwhfwAZ6/hLzRUssbkmbOpFPlob/E2wnW5olWK8jjfN7j/4nlNW4o
-6GwLI1GpJQXrSPjdscr6bAhR77cYbETKJuFzxokGgeWKrLDiKca5JLNrRBH0pUPC
-TEPlcDaMtjNXepUugqD0XBCzYYP2AgWGLnwtbNwDRm41k9V6lS/eINhbfpSQBGq6
-WT0EBXWdN6IOLj3rwaRSg/7Qa9RmjtzG6RJOHSpXqhC8fF6CfaamyfItufUXJ63R
-DolUK5X6wK0dmBR4M0KGCqlztft0DbcbMBnEWg4cJ7faGND/isgFuvGqHKI3t+ZI
-pEYslOqodmJHixBTB0hXbOKSTbauBcvcwUpej6w9GU7C7WB1K9vBykLVAgMBAAGj
-YzBhMB8GA1UdIwQYMBaAFHKs5DN5qkWH9v2sHZ7Wxy+G2CQ5MB0GA1UdDgQWBBRy
-rOQzeapFh/b9rB2e1scvhtgkOTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw
-AwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAoDtZpwmUPjaE0n4vOaWWl/oRrfxn83EJ
-8rKJhGdEr7nv7ZbsnGTbMjBvZ5qsfl+yqwE2foH65IRe0qw24GtixX1LDoJt0nZi
-0f6X+J8wfBj5tFJ3gh1229MdqfDBmgC9bXXYfef6xzijnHDoRnkDry5023X4blMM
-A8iZGok1GTzTyVR8qPAs5m4HeW9q4ebqkYJpCh3DflminmtGFZhb069GHWLIzoBS
-SRE/yQQSwxN8PzuKlts8oB4KtItUsiRnDe+Cy748fdHif64W1lZYudogsYMVoe+K
-TTJvQS8TUoKU1xrBeKJR3Stwbbca+few4GeXVtt8YVMJAygCQMez2P2ccGrGKMOF
-6eLtGpOg3kuYooQ+BXcBlj37tCAPnHICehIv1aO6UXivKitEZU61/Qrowc15h2Er
-3oBXRb9n8ZuRXqWk7FlIEA04x7D6w0RtBPV4UBySllva9bguulvP5fBqnUsvWHMt
-Ty3EHD70sz+rFQ47GUGKpMFXEmZxTPpT41frYpUJnlTd0cI8Vzy9OK2YZLe4A5pT
-VmBds9hCG1xLEooc6+t9xnppxyd/pPiL8uSUZodL6ZQHCRJ5irLrdATczvREWeAW
-ysUsWNc8e89ihmpQfTU2Zqf7N+cox9jQraVplI/owd8k+BsHMYeB2F326CjYSlKA
-rBPuUBQemMc=
------END CERTIFICATE-----
-
-# Issuer: CN=D-TRUST BR Root CA 1 2020 O=D-Trust GmbH
-# Subject: CN=D-TRUST BR Root CA 1 2020 O=D-Trust GmbH
-# Label: "D-TRUST BR Root CA 1 2020"
-# Serial: 165870826978392376648679885835942448534
-# MD5 Fingerprint: b5:aa:4b:d5:ed:f7:e3:55:2e:8f:72:0a:f3:75:b8:ed
-# SHA1 Fingerprint: 1f:5b:98:f0:e3:b5:f7:74:3c:ed:e6:b0:36:7d:32:cd:f4:09:41:67
-# SHA256 Fingerprint: e5:9a:aa:81:60:09:c2:2b:ff:5b:25:ba:d3:7d:f3:06:f0:49:79:7c:1f:81:d8:5a:b0:89:e6:57:bd:8f:00:44
------BEGIN CERTIFICATE-----
-MIIC2zCCAmCgAwIBAgIQfMmPK4TX3+oPyWWa00tNljAKBggqhkjOPQQDAzBIMQsw
-CQYDVQQGEwJERTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlELVRS
-VVNUIEJSIFJvb3QgQ0EgMSAyMDIwMB4XDTIwMDIxMTA5NDUwMFoXDTM1MDIxMTA5
-NDQ1OVowSDELMAkGA1UEBhMCREUxFTATBgNVBAoTDEQtVHJ1c3QgR21iSDEiMCAG
-A1UEAxMZRC1UUlVTVCBCUiBSb290IENBIDEgMjAyMDB2MBAGByqGSM49AgEGBSuB
-BAAiA2IABMbLxyjR+4T1mu9CFCDhQ2tuda38KwOE1HaTJddZO0Flax7mNCq7dPYS
-zuht56vkPE4/RAiLzRZxy7+SmfSk1zxQVFKQhYN4lGdnoxwJGT11NIXe7WB9xwy0
-QVK5buXuQqOCAQ0wggEJMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFHOREKv/
-VbNafAkl1bK6CKBrqx9tMA4GA1UdDwEB/wQEAwIBBjCBxgYDVR0fBIG+MIG7MD6g
-PKA6hjhodHRwOi8vY3JsLmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X2JyX3Jvb3Rf
-Y2FfMV8yMDIwLmNybDB5oHegdYZzbGRhcDovL2RpcmVjdG9yeS5kLXRydXN0Lm5l
-dC9DTj1ELVRSVVNUJTIwQlIlMjBSb290JTIwQ0ElMjAxJTIwMjAyMCxPPUQtVHJ1
-c3QlMjBHbWJILEM9REU/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdDAKBggqhkjO
-PQQDAwNpADBmAjEAlJAtE/rhY/hhY+ithXhUkZy4kzg+GkHaQBZTQgjKL47xPoFW
-wKrY7RjEsK70PvomAjEA8yjixtsrmfu3Ubgko6SUeho/5jbiA1czijDLgsfWFBHV
-dWNbFJWcHwHP2NVypw87
------END CERTIFICATE-----
-
-# Issuer: CN=D-TRUST EV Root CA 1 2020 O=D-Trust GmbH
-# Subject: CN=D-TRUST EV Root CA 1 2020 O=D-Trust GmbH
-# Label: "D-TRUST EV Root CA 1 2020"
-# Serial: 126288379621884218666039612629459926992
-# MD5 Fingerprint: 8c:2d:9d:70:9f:48:99:11:06:11:fb:e9:cb:30:c0:6e
-# SHA1 Fingerprint: 61:db:8c:21:59:69:03:90:d8:7c:9c:12:86:54:cf:9d:3d:f4:dd:07
-# SHA256 Fingerprint: 08:17:0d:1a:a3:64:53:90:1a:2f:95:92:45:e3:47:db:0c:8d:37:ab:aa:bc:56:b8:1a:a1:00:dc:95:89:70:db
------BEGIN CERTIFICATE-----
-MIIC2zCCAmCgAwIBAgIQXwJB13qHfEwDo6yWjfv/0DAKBggqhkjOPQQDAzBIMQsw
-CQYDVQQGEwJERTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlELVRS
-VVNUIEVWIFJvb3QgQ0EgMSAyMDIwMB4XDTIwMDIxMTEwMDAwMFoXDTM1MDIxMTA5
-NTk1OVowSDELMAkGA1UEBhMCREUxFTATBgNVBAoTDEQtVHJ1c3QgR21iSDEiMCAG
-A1UEAxMZRC1UUlVTVCBFViBSb290IENBIDEgMjAyMDB2MBAGByqGSM49AgEGBSuB
-BAAiA2IABPEL3YZDIBnfl4XoIkqbz52Yv7QFJsnL46bSj8WeeHsxiamJrSc8ZRCC
-/N/DnU7wMyPE0jL1HLDfMxddxfCxivnvubcUyilKwg+pf3VlSSowZ/Rk99Yad9rD
-wpdhQntJraOCAQ0wggEJMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFH8QARY3
-OqQo5FD4pPfsazK2/umLMA4GA1UdDwEB/wQEAwIBBjCBxgYDVR0fBIG+MIG7MD6g
-PKA6hjhodHRwOi8vY3JsLmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X2V2X3Jvb3Rf
-Y2FfMV8yMDIwLmNybDB5oHegdYZzbGRhcDovL2RpcmVjdG9yeS5kLXRydXN0Lm5l
-dC9DTj1ELVRSVVNUJTIwRVYlMjBSb290JTIwQ0ElMjAxJTIwMjAyMCxPPUQtVHJ1
-c3QlMjBHbWJILEM9REU/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdDAKBggqhkjO
-PQQDAwNpADBmAjEAyjzGKnXCXnViOTYAYFqLwZOZzNnbQTs7h5kXO9XMT8oi96CA
-y/m0sRtW9XLS/BnRAjEAkfcwkz8QRitxpNA7RJvAKQIFskF3UfN5Wp6OFKBOQtJb
-gfM0agPnIjhQW+0ZT0MW
------END CERTIFICATE-----
-
-# Issuer: CN=DigiCert TLS ECC P384 Root G5 O=DigiCert, Inc.
-# Subject: CN=DigiCert TLS ECC P384 Root G5 O=DigiCert, Inc.
-# Label: "DigiCert TLS ECC P384 Root G5"
-# Serial: 13129116028163249804115411775095713523
-# MD5 Fingerprint: d3:71:04:6a:43:1c:db:a6:59:e1:a8:a3:aa:c5:71:ed
-# SHA1 Fingerprint: 17:f3:de:5e:9f:0f:19:e9:8e:f6:1f:32:26:6e:20:c4:07:ae:30:ee
-# SHA256 Fingerprint: 01:8e:13:f0:77:25:32:cf:80:9b:d1:b1:72:81:86:72:83:fc:48:c6:e1:3b:e9:c6:98:12:85:4a:49:0c:1b:05
------BEGIN CERTIFICATE-----
-MIICGTCCAZ+gAwIBAgIQCeCTZaz32ci5PhwLBCou8zAKBggqhkjOPQQDAzBOMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJjAkBgNVBAMTHURp
-Z2lDZXJ0IFRMUyBFQ0MgUDM4NCBSb290IEc1MB4XDTIxMDExNTAwMDAwMFoXDTQ2
-MDExNDIzNTk1OVowTjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDkRpZ2lDZXJ0LCBJ
-bmMuMSYwJAYDVQQDEx1EaWdpQ2VydCBUTFMgRUNDIFAzODQgUm9vdCBHNTB2MBAG
-ByqGSM49AgEGBSuBBAAiA2IABMFEoc8Rl1Ca3iOCNQfN0MsYndLxf3c1TzvdlHJS
-7cI7+Oz6e2tYIOyZrsn8aLN1udsJ7MgT9U7GCh1mMEy7H0cKPGEQQil8pQgO4CLp
-0zVozptjn4S1mU1YoI71VOeVyaNCMEAwHQYDVR0OBBYEFMFRRVBZqz7nLFr6ICIS
-B4CIfBFqMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49
-BAMDA2gAMGUCMQCJao1H5+z8blUD2WdsJk6Dxv3J+ysTvLd6jLRl0mlpYxNjOyZQ
-LgGheQaRnUi/wr4CMEfDFXuxoJGZSZOoPHzoRgaLLPIxAJSdYsiJvRmEFOml+wG4
-DXZDjC5Ty3zfDBeWUA==
------END CERTIFICATE-----
-
-# Issuer: CN=DigiCert TLS RSA4096 Root G5 O=DigiCert, Inc.
-# Subject: CN=DigiCert TLS RSA4096 Root G5 O=DigiCert, Inc.
-# Label: "DigiCert TLS RSA4096 Root G5"
-# Serial: 11930366277458970227240571539258396554
-# MD5 Fingerprint: ac:fe:f7:34:96:a9:f2:b3:b4:12:4b:e4:27:41:6f:e1
-# SHA1 Fingerprint: a7:88:49:dc:5d:7c:75:8c:8c:de:39:98:56:b3:aa:d0:b2:a5:71:35
-# SHA256 Fingerprint: 37:1a:00:dc:05:33:b3:72:1a:7e:eb:40:e8:41:9e:70:79:9d:2b:0a:0f:2c:1d:80:69:31:65:f7:ce:c4:ad:75
------BEGIN CERTIFICATE-----
-MIIFZjCCA06gAwIBAgIQCPm0eKj6ftpqMzeJ3nzPijANBgkqhkiG9w0BAQwFADBN
-MQswCQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJTAjBgNVBAMT
-HERpZ2lDZXJ0IFRMUyBSU0E0MDk2IFJvb3QgRzUwHhcNMjEwMTE1MDAwMDAwWhcN
-NDYwMTE0MjM1OTU5WjBNMQswCQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQs
-IEluYy4xJTAjBgNVBAMTHERpZ2lDZXJ0IFRMUyBSU0E0MDk2IFJvb3QgRzUwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCz0PTJeRGd/fxmgefM1eS87IE+
-ajWOLrfn3q/5B03PMJ3qCQuZvWxX2hhKuHisOjmopkisLnLlvevxGs3npAOpPxG0
-2C+JFvuUAT27L/gTBaF4HI4o4EXgg/RZG5Wzrn4DReW+wkL+7vI8toUTmDKdFqgp
-wgscONyfMXdcvyej/Cestyu9dJsXLfKB2l2w4SMXPohKEiPQ6s+d3gMXsUJKoBZM
-pG2T6T867jp8nVid9E6P/DsjyG244gXazOvswzH016cpVIDPRFtMbzCe88zdH5RD
-nU1/cHAN1DrRN/BsnZvAFJNY781BOHW8EwOVfH/jXOnVDdXifBBiqmvwPXbzP6Po
-sMH976pXTayGpxi0KcEsDr9kvimM2AItzVwv8n/vFfQMFawKsPHTDU9qTXeXAaDx
-Zre3zu/O7Oyldcqs4+Fj97ihBMi8ez9dLRYiVu1ISf6nL3kwJZu6ay0/nTvEF+cd
-Lvvyz6b84xQslpghjLSR6Rlgg/IwKwZzUNWYOwbpx4oMYIwo+FKbbuH2TbsGJJvX
-KyY//SovcfXWJL5/MZ4PbeiPT02jP/816t9JXkGPhvnxd3lLG7SjXi/7RgLQZhNe
-XoVPzthwiHvOAbWWl9fNff2C+MIkwcoBOU+NosEUQB+cZtUMCUbW8tDRSHZWOkPL
-tgoRObqME2wGtZ7P6wIDAQABo0IwQDAdBgNVHQ4EFgQUUTMc7TZArxfTJc1paPKv
-TiM+s0EwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcN
-AQEMBQADggIBAGCmr1tfV9qJ20tQqcQjNSH/0GEwhJG3PxDPJY7Jv0Y02cEhJhxw
-GXIeo8mH/qlDZJY6yFMECrZBu8RHANmfGBg7sg7zNOok992vIGCukihfNudd5N7H
-PNtQOa27PShNlnx2xlv0wdsUpasZYgcYQF+Xkdycx6u1UQ3maVNVzDl92sURVXLF
-O4uJ+DQtpBflF+aZfTCIITfNMBc9uPK8qHWgQ9w+iUuQrm0D4ByjoJYJu32jtyoQ
-REtGBzRj7TG5BO6jm5qu5jF49OokYTurWGT/u4cnYiWB39yhL/btp/96j1EuMPik
-AdKFOV8BmZZvWltwGUb+hmA+rYAQCd05JS9Yf7vSdPD3Rh9GOUrYU9DzLjtxpdRv
-/PNn5AeP3SYZ4Y1b+qOTEZvpyDrDVWiakuFSdjjo4bq9+0/V77PnSIMx8IIh47a+
-p6tv75/fTM8BuGJqIz3nCU2AG3swpMPdB380vqQmsvZB6Akd4yCYqjdP//fx4ilw
-MUc/dNAUFvohigLVigmUdy7yWSiLfFCSCmZ4OIN1xLVaqBHG5cGdZlXPU8Sv13WF
-qUITVuwhd4GTWgzqltlJyqEI8pc7bZsEGCREjnwB8twl2F6GmrE52/WRMmrRpnCK
-ovfepEWFJqgejF0pW8hL2JpqA15w8oVPbEtoL8pU9ozaMv7Da4M/OMZ+
------END CERTIFICATE-----
-
-# Issuer: CN=Certainly Root R1 O=Certainly
-# Subject: CN=Certainly Root R1 O=Certainly
-# Label: "Certainly Root R1"
-# Serial: 188833316161142517227353805653483829216
-# MD5 Fingerprint: 07:70:d4:3e:82:87:a0:fa:33:36:13:f4:fa:33:e7:12
-# SHA1 Fingerprint: a0:50:ee:0f:28:71:f4:27:b2:12:6d:6f:50:96:25:ba:cc:86:42:af
-# SHA256 Fingerprint: 77:b8:2c:d8:64:4c:43:05:f7:ac:c5:cb:15:6b:45:67:50:04:03:3d:51:c6:0c:62:02:a8:e0:c3:34:67:d3:a0
------BEGIN CERTIFICATE-----
-MIIFRzCCAy+gAwIBAgIRAI4P+UuQcWhlM1T01EQ5t+AwDQYJKoZIhvcNAQELBQAw
-PTELMAkGA1UEBhMCVVMxEjAQBgNVBAoTCUNlcnRhaW5seTEaMBgGA1UEAxMRQ2Vy
-dGFpbmx5IFJvb3QgUjEwHhcNMjEwNDAxMDAwMDAwWhcNNDYwNDAxMDAwMDAwWjA9
-MQswCQYDVQQGEwJVUzESMBAGA1UEChMJQ2VydGFpbmx5MRowGAYDVQQDExFDZXJ0
-YWlubHkgUm9vdCBSMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANA2
-1B/q3avk0bbm+yLA3RMNansiExyXPGhjZjKcA7WNpIGD2ngwEc/csiu+kr+O5MQT
-vqRoTNoCaBZ0vrLdBORrKt03H2As2/X3oXyVtwxwhi7xOu9S98zTm/mLvg7fMbed
-aFySpvXl8wo0tf97ouSHocavFwDvA5HtqRxOcT3Si2yJ9HiG5mpJoM610rCrm/b0
-1C7jcvk2xusVtyWMOvwlDbMicyF0yEqWYZL1LwsYpfSt4u5BvQF5+paMjRcCMLT5
-r3gajLQ2EBAHBXDQ9DGQilHFhiZ5shGIXsXwClTNSaa/ApzSRKft43jvRl5tcdF5
-cBxGX1HpyTfcX35pe0HfNEXgO4T0oYoKNp43zGJS4YkNKPl6I7ENPT2a/Z2B7yyQ
-wHtETrtJ4A5KVpK8y7XdeReJkd5hiXSSqOMyhb5OhaRLWcsrxXiOcVTQAjeZjOVJ
-6uBUcqQRBi8LjMFbvrWhsFNunLhgkR9Za/kt9JQKl7XsxXYDVBtlUrpMklZRNaBA
-2CnbrlJ2Oy0wQJuK0EJWtLeIAaSHO1OWzaMWj/Nmqhexx2DgwUMFDO6bW2BvBlyH
-Wyf5QBGenDPBt+U1VwV/J84XIIwc/PH72jEpSe31C4SnT8H2TsIonPru4K8H+zMR
-eiFPCyEQtkA6qyI6BJyLm4SGcprSp6XEtHWRqSsjAgMBAAGjQjBAMA4GA1UdDwEB
-/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTgqj8ljZ9EXME66C6u
-d0yEPmcM9DANBgkqhkiG9w0BAQsFAAOCAgEAuVevuBLaV4OPaAszHQNTVfSVcOQr
-PbA56/qJYv331hgELyE03fFo8NWWWt7CgKPBjcZq91l3rhVkz1t5BXdm6ozTaw3d
-8VkswTOlMIAVRQdFGjEitpIAq5lNOo93r6kiyi9jyhXWx8bwPWz8HA2YEGGeEaIi
-1wrykXprOQ4vMMM2SZ/g6Q8CRFA3lFV96p/2O7qUpUzpvD5RtOjKkjZUbVwlKNrd
-rRT90+7iIgXr0PK3aBLXWopBGsaSpVo7Y0VPv+E6dyIvXL9G+VoDhRNCX8reU9di
-taY1BMJH/5n9hN9czulegChB8n3nHpDYT3Y+gjwN/KUD+nsa2UUeYNrEjvn8K8l7
-lcUq/6qJ34IxD3L/DCfXCh5WAFAeDJDBlrXYFIW7pw0WwfgHJBu6haEaBQmAupVj
-yTrsJZ9/nbqkRxWbRHDxakvWOF5D8xh+UG7pWijmZeZ3Gzr9Hb4DJqPb1OG7fpYn
-Kx3upPvaJVQTA945xsMfTZDsjxtK0hzthZU4UHlG1sGQUDGpXJpuHfUzVounmdLy
-yCwzk5Iwx06MZTMQZBf9JBeW0Y3COmor6xOLRPIh80oat3df1+2IpHLlOR+Vnb5n
-wXARPbv0+Em34yaXOp/SX3z7wJl8OSngex2/DaeP0ik0biQVy96QXr8axGbqwua6
-OV+KmalBWQewLK8=
------END CERTIFICATE-----
-
-# Issuer: CN=Certainly Root E1 O=Certainly
-# Subject: CN=Certainly Root E1 O=Certainly
-# Label: "Certainly Root E1"
-# Serial: 8168531406727139161245376702891150584
-# MD5 Fingerprint: 0a:9e:ca:cd:3e:52:50:c6:36:f3:4b:a3:ed:a7:53:e9
-# SHA1 Fingerprint: f9:e1:6d:dc:01:89:cf:d5:82:45:63:3e:c5:37:7d:c2:eb:93:6f:2b
-# SHA256 Fingerprint: b4:58:5f:22:e4:ac:75:6a:4e:86:12:a1:36:1c:5d:9d:03:1a:93:fd:84:fe:bb:77:8f:a3:06:8b:0f:c4:2d:c2
------BEGIN CERTIFICATE-----
-MIIB9zCCAX2gAwIBAgIQBiUzsUcDMydc+Y2aub/M+DAKBggqhkjOPQQDAzA9MQsw
-CQYDVQQGEwJVUzESMBAGA1UEChMJQ2VydGFpbmx5MRowGAYDVQQDExFDZXJ0YWlu
-bHkgUm9vdCBFMTAeFw0yMTA0MDEwMDAwMDBaFw00NjA0MDEwMDAwMDBaMD0xCzAJ
-BgNVBAYTAlVTMRIwEAYDVQQKEwlDZXJ0YWlubHkxGjAYBgNVBAMTEUNlcnRhaW5s
-eSBSb290IEUxMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE3m/4fxzf7flHh4axpMCK
-+IKXgOqPyEpeKn2IaKcBYhSRJHpcnqMXfYqGITQYUBsQ3tA3SybHGWCA6TS9YBk2
-QNYphwk8kXr2vBMj3VlOBF7PyAIcGFPBMdjaIOlEjeR2o0IwQDAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU8ygYy2R17ikq6+2uI1g4
-hevIIgcwCgYIKoZIzj0EAwMDaAAwZQIxALGOWiDDshliTd6wT99u0nCK8Z9+aozm
-ut6Dacpps6kFtZaSF4fC0urQe87YQVt8rgIwRt7qy12a7DLCZRawTDBcMPPaTnOG
-BtjOiQRINzf43TNRnXCve1XYAS59BWQOhriR
------END CERTIFICATE-----
-
-# Issuer: CN=Security Communication ECC RootCA1 O=SECOM Trust Systems CO.,LTD.
-# Subject: CN=Security Communication ECC RootCA1 O=SECOM Trust Systems CO.,LTD.
-# Label: "Security Communication ECC RootCA1"
-# Serial: 15446673492073852651
-# MD5 Fingerprint: 7e:43:b0:92:68:ec:05:43:4c:98:ab:5d:35:2e:7e:86
-# SHA1 Fingerprint: b8:0e:26:a9:bf:d2:b2:3b:c0:ef:46:c9:ba:c7:bb:f6:1d:0d:41:41
-# SHA256 Fingerprint: e7:4f:bd:a5:5b:d5:64:c4:73:a3:6b:44:1a:a7:99:c8:a6:8e:07:74:40:e8:28:8b:9f:a1:e5:0e:4b:ba:ca:11
------BEGIN CERTIFICATE-----
-MIICODCCAb6gAwIBAgIJANZdm7N4gS7rMAoGCCqGSM49BAMDMGExCzAJBgNVBAYT
-AkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMSswKQYD
-VQQDEyJTZWN1cml0eSBDb21tdW5pY2F0aW9uIEVDQyBSb290Q0ExMB4XDTE2MDYx
-NjA1MTUyOFoXDTM4MDExODA1MTUyOFowYTELMAkGA1UEBhMCSlAxJTAjBgNVBAoT
-HFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xKzApBgNVBAMTIlNlY3VyaXR5
-IENvbW11bmljYXRpb24gRUNDIFJvb3RDQTEwdjAQBgcqhkjOPQIBBgUrgQQAIgNi
-AASkpW9gAwPDvTH00xecK4R1rOX9PVdu12O/5gSJko6BnOPpR27KkBLIE+Cnnfdl
-dB9sELLo5OnvbYUymUSxXv3MdhDYW72ixvnWQuRXdtyQwjWpS4g8EkdtXP9JTxpK
-ULGjQjBAMB0GA1UdDgQWBBSGHOf+LaVKiwj+KBH6vqNm+GBZLzAOBgNVHQ8BAf8E
-BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjAVXUI9/Lbu
-9zuxNuie9sRGKEkz0FhDKmMpzE2xtHqiuQ04pV1IKv3LsnNdo4gIxwwCMQDAqy0O
-be0YottT6SXbVQjgUMzfRGEWgqtJsLKB7HOHeLRMsmIbEvoWTSVLY70eN9k=
------END CERTIFICATE-----
-
-# Issuer: CN=BJCA Global Root CA1 O=BEIJING CERTIFICATE AUTHORITY
-# Subject: CN=BJCA Global Root CA1 O=BEIJING CERTIFICATE AUTHORITY
-# Label: "BJCA Global Root CA1"
-# Serial: 113562791157148395269083148143378328608
-# MD5 Fingerprint: 42:32:99:76:43:33:36:24:35:07:82:9b:28:f9:d0:90
-# SHA1 Fingerprint: d5:ec:8d:7b:4c:ba:79:f4:e7:e8:cb:9d:6b:ae:77:83:10:03:21:6a
-# SHA256 Fingerprint: f3:89:6f:88:fe:7c:0a:88:27:66:a7:fa:6a:d2:74:9f:b5:7a:7f:3e:98:fb:76:9c:1f:a7:b0:9c:2c:44:d5:ae
------BEGIN CERTIFICATE-----
-MIIFdDCCA1ygAwIBAgIQVW9l47TZkGobCdFsPsBsIDANBgkqhkiG9w0BAQsFADBU
-MQswCQYDVQQGEwJDTjEmMCQGA1UECgwdQkVJSklORyBDRVJUSUZJQ0FURSBBVVRI
-T1JJVFkxHTAbBgNVBAMMFEJKQ0EgR2xvYmFsIFJvb3QgQ0ExMB4XDTE5MTIxOTAz
-MTYxN1oXDTQ0MTIxMjAzMTYxN1owVDELMAkGA1UEBhMCQ04xJjAkBgNVBAoMHUJF
-SUpJTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZMR0wGwYDVQQDDBRCSkNBIEdsb2Jh
-bCBSb290IENBMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPFmCL3Z
-xRVhy4QEQaVpN3cdwbB7+sN3SJATcmTRuHyQNZ0YeYjjlwE8R4HyDqKYDZ4/N+AZ
-spDyRhySsTphzvq3Rp4Dhtczbu33RYx2N95ulpH3134rhxfVizXuhJFyV9xgw8O5
-58dnJCNPYwpj9mZ9S1WnP3hkSWkSl+BMDdMJoDIwOvqfwPKcxRIqLhy1BDPapDgR
-at7GGPZHOiJBhyL8xIkoVNiMpTAK+BcWyqw3/XmnkRd4OJmtWO2y3syJfQOcs4ll
-5+M7sSKGjwZteAf9kRJ/sGsciQ35uMt0WwfCyPQ10WRjeulumijWML3mG90Vr4Tq
-nMfK9Q7q8l0ph49pczm+LiRvRSGsxdRpJQaDrXpIhRMsDQa4bHlW/KNnMoH1V6XK
-V0Jp6VwkYe/iMBhORJhVb3rCk9gZtt58R4oRTklH2yiUAguUSiz5EtBP6DF+bHq/
-pj+bOT0CFqMYs2esWz8sgytnOYFcuX6U1WTdno9uruh8W7TXakdI136z1C2OVnZO
-z2nxbkRs1CTqjSShGL+9V/6pmTW12xB3uD1IutbB5/EjPtffhZ0nPNRAvQoMvfXn
-jSXWgXSHRtQpdaJCbPdzied9v3pKH9MiyRVVz99vfFXQpIsHETdfg6YmV6YBW37+
-WGgHqel62bno/1Afq8K0wM7o6v0PvY1NuLxxAgMBAAGjQjBAMB0GA1UdDgQWBBTF
-7+3M2I0hxkjk49cULqcWk+WYATAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
-AwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAUoKsITQfI/Ki2Pm4rzc2IInRNwPWaZ+4
-YRC6ojGYWUfo0Q0lHhVBDOAqVdVXUsv45Mdpox1NcQJeXyFFYEhcCY5JEMEE3Kli
-awLwQ8hOnThJdMkycFRtwUf8jrQ2ntScvd0g1lPJGKm1Vrl2i5VnZu69mP6u775u
-+2D2/VnGKhs/I0qUJDAnyIm860Qkmss9vk/Ves6OF8tiwdneHg56/0OGNFK8YT88
-X7vZdrRTvJez/opMEi4r89fO4aL/3Xtw+zuhTaRjAv04l5U/BXCga99igUOLtFkN
-SoxUnMW7gZ/NfaXvCyUeOiDbHPwfmGcCCtRzRBPbUYQaVQNW4AB+dAb/OMRyHdOo
-P2gxXdMJxy6MW2Pg6Nwe0uxhHvLe5e/2mXZgLR6UcnHGCyoyx5JO1UbXHfmpGQrI
-+pXObSOYqgs4rZpWDW+N8TEAiMEXnM0ZNjX+VVOg4DwzX5Ze4jLp3zO7Bkqp2IRz
-znfSxqxx4VyjHQy7Ct9f4qNx2No3WqB4K/TUfet27fJhcKVlmtOJNBir+3I+17Q9
-eVzYH6Eze9mCUAyTF6ps3MKCuwJXNq+YJyo5UOGwifUll35HaBC07HPKs5fRJNz2
-YqAo07WjuGS3iGJCz51TzZm+ZGiPTx4SSPfSKcOYKMryMguTjClPPGAyzQWWYezy
-r/6zcCwupvI=
------END CERTIFICATE-----
-
-# Issuer: CN=BJCA Global Root CA2 O=BEIJING CERTIFICATE AUTHORITY
-# Subject: CN=BJCA Global Root CA2 O=BEIJING CERTIFICATE AUTHORITY
-# Label: "BJCA Global Root CA2"
-# Serial: 58605626836079930195615843123109055211
-# MD5 Fingerprint: 5e:0a:f6:47:5f:a6:14:e8:11:01:95:3f:4d:01:eb:3c
-# SHA1 Fingerprint: f4:27:86:eb:6e:b8:6d:88:31:67:02:fb:ba:66:a4:53:00:aa:7a:a6
-# SHA256 Fingerprint: 57:4d:f6:93:1e:27:80:39:66:7b:72:0a:fd:c1:60:0f:c2:7e:b6:6d:d3:09:29:79:fb:73:85:64:87:21:28:82
------BEGIN CERTIFICATE-----
-MIICJTCCAaugAwIBAgIQLBcIfWQqwP6FGFkGz7RK6zAKBggqhkjOPQQDAzBUMQsw
-CQYDVQQGEwJDTjEmMCQGA1UECgwdQkVJSklORyBDRVJUSUZJQ0FURSBBVVRIT1JJ
-VFkxHTAbBgNVBAMMFEJKQ0EgR2xvYmFsIFJvb3QgQ0EyMB4XDTE5MTIxOTAzMTgy
-MVoXDTQ0MTIxMjAzMTgyMVowVDELMAkGA1UEBhMCQ04xJjAkBgNVBAoMHUJFSUpJ
-TkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZMR0wGwYDVQQDDBRCSkNBIEdsb2JhbCBS
-b290IENBMjB2MBAGByqGSM49AgEGBSuBBAAiA2IABJ3LgJGNU2e1uVCxA/jlSR9B
-IgmwUVJY1is0j8USRhTFiy8shP8sbqjV8QnjAyEUxEM9fMEsxEtqSs3ph+B99iK+
-+kpRuDCK/eHeGBIK9ke35xe/J4rUQUyWPGCWwf0VHKNCMEAwHQYDVR0OBBYEFNJK
-sVF/BvDRgh9Obl+rg/xI1LCRMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD
-AgEGMAoGCCqGSM49BAMDA2gAMGUCMBq8W9f+qdJUDkpd0m2xQNz0Q9XSSpkZElaA
-94M04TVOSG0ED1cxMDAtsaqdAzjbBgIxAMvMh1PLet8gUXOQwKhbYdDFUDn9hf7B
-43j4ptZLvZuHjw/l1lOWqzzIQNph91Oj9w==
------END CERTIFICATE-----
-
-# Issuer: CN=Sectigo Public Server Authentication Root E46 O=Sectigo Limited
-# Subject: CN=Sectigo Public Server Authentication Root E46 O=Sectigo Limited
-# Label: "Sectigo Public Server Authentication Root E46"
-# Serial: 88989738453351742415770396670917916916
-# MD5 Fingerprint: 28:23:f8:b2:98:5c:37:16:3b:3e:46:13:4e:b0:b3:01
-# SHA1 Fingerprint: ec:8a:39:6c:40:f0:2e:bc:42:75:d4:9f:ab:1c:1a:5b:67:be:d2:9a
-# SHA256 Fingerprint: c9:0f:26:f0:fb:1b:40:18:b2:22:27:51:9b:5c:a2:b5:3e:2c:a5:b3:be:5c:f1:8e:fe:1b:ef:47:38:0c:53:83
------BEGIN CERTIFICATE-----
-MIICOjCCAcGgAwIBAgIQQvLM2htpN0RfFf51KBC49DAKBggqhkjOPQQDAzBfMQsw
-CQYDVQQGEwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQDEy1T
-ZWN0aWdvIFB1YmxpYyBTZXJ2ZXIgQXV0aGVudGljYXRpb24gUm9vdCBFNDYwHhcN
-MjEwMzIyMDAwMDAwWhcNNDYwMzIxMjM1OTU5WjBfMQswCQYDVQQGEwJHQjEYMBYG
-A1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQDEy1TZWN0aWdvIFB1YmxpYyBT
-ZXJ2ZXIgQXV0aGVudGljYXRpb24gUm9vdCBFNDYwdjAQBgcqhkjOPQIBBgUrgQQA
-IgNiAAR2+pmpbiDt+dd34wc7qNs9Xzjoq1WmVk/WSOrsfy2qw7LFeeyZYX8QeccC
-WvkEN/U0NSt3zn8gj1KjAIns1aeibVvjS5KToID1AZTc8GgHHs3u/iVStSBDHBv+
-6xnOQ6OjQjBAMB0GA1UdDgQWBBTRItpMWfFLXyY4qp3W7usNw/upYTAOBgNVHQ8B
-Af8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNnADBkAjAn7qRa
-qCG76UeXlImldCBteU/IvZNeWBj7LRoAasm4PdCkT0RHlAFWovgzJQxC36oCMB3q
-4S6ILuH5px0CMk7yn2xVdOOurvulGu7t0vzCAxHrRVxgED1cf5kDW21USAGKcw==
------END CERTIFICATE-----
-
-# Issuer: CN=Sectigo Public Server Authentication Root R46 O=Sectigo Limited
-# Subject: CN=Sectigo Public Server Authentication Root R46 O=Sectigo Limited
-# Label: "Sectigo Public Server Authentication Root R46"
-# Serial: 156256931880233212765902055439220583700
-# MD5 Fingerprint: 32:10:09:52:00:d5:7e:6c:43:df:15:c0:b1:16:93:e5
-# SHA1 Fingerprint: ad:98:f9:f3:e4:7d:75:3b:65:d4:82:b3:a4:52:17:bb:6e:f5:e4:38
-# SHA256 Fingerprint: 7b:b6:47:a6:2a:ee:ac:88:bf:25:7a:a5:22:d0:1f:fe:a3:95:e0:ab:45:c7:3f:93:f6:56:54:ec:38:f2:5a:06
------BEGIN CERTIFICATE-----
-MIIFijCCA3KgAwIBAgIQdY39i658BwD6qSWn4cetFDANBgkqhkiG9w0BAQwFADBf
-MQswCQYDVQQGEwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQD
-Ey1TZWN0aWdvIFB1YmxpYyBTZXJ2ZXIgQXV0aGVudGljYXRpb24gUm9vdCBSNDYw
-HhcNMjEwMzIyMDAwMDAwWhcNNDYwMzIxMjM1OTU5WjBfMQswCQYDVQQGEwJHQjEY
-MBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQDEy1TZWN0aWdvIFB1Ymxp
-YyBTZXJ2ZXIgQXV0aGVudGljYXRpb24gUm9vdCBSNDYwggIiMA0GCSqGSIb3DQEB
-AQUAA4ICDwAwggIKAoICAQCTvtU2UnXYASOgHEdCSe5jtrch/cSV1UgrJnwUUxDa
-ef0rty2k1Cz66jLdScK5vQ9IPXtamFSvnl0xdE8H/FAh3aTPaE8bEmNtJZlMKpnz
-SDBh+oF8HqcIStw+KxwfGExxqjWMrfhu6DtK2eWUAtaJhBOqbchPM8xQljeSM9xf
-iOefVNlI8JhD1mb9nxc4Q8UBUQvX4yMPFF1bFOdLvt30yNoDN9HWOaEhUTCDsG3X
-ME6WW5HwcCSrv0WBZEMNvSE6Lzzpng3LILVCJ8zab5vuZDCQOc2TZYEhMbUjUDM3
-IuM47fgxMMxF/mL50V0yeUKH32rMVhlATc6qu/m1dkmU8Sf4kaWD5QazYw6A3OAS
-VYCmO2a0OYctyPDQ0RTp5A1NDvZdV3LFOxxHVp3i1fuBYYzMTYCQNFu31xR13NgE
-SJ/AwSiItOkcyqex8Va3e0lMWeUgFaiEAin6OJRpmkkGj80feRQXEgyDet4fsZfu
-+Zd4KKTIRJLpfSYFplhym3kT2BFfrsU4YjRosoYwjviQYZ4ybPUHNs2iTG7sijbt
-8uaZFURww3y8nDnAtOFr94MlI1fZEoDlSfB1D++N6xybVCi0ITz8fAr/73trdf+L
-HaAZBav6+CuBQug4urv7qv094PPK306Xlynt8xhW6aWWrL3DkJiy4Pmi1KZHQ3xt
-zwIDAQABo0IwQDAdBgNVHQ4EFgQUVnNYZJX5khqwEioEYnmhQBWIIUkwDgYDVR0P
-AQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAC9c
-mTz8Bl6MlC5w6tIyMY208FHVvArzZJ8HXtXBc2hkeqK5Duj5XYUtqDdFqij0lgVQ
-YKlJfp/imTYpE0RHap1VIDzYm/EDMrraQKFz6oOht0SmDpkBm+S8f74TlH7Kph52
-gDY9hAaLMyZlbcp+nv4fjFg4exqDsQ+8FxG75gbMY/qB8oFM2gsQa6H61SilzwZA
-Fv97fRheORKkU55+MkIQpiGRqRxOF3yEvJ+M0ejf5lG5Nkc/kLnHvALcWxxPDkjB
-JYOcCj+esQMzEhonrPcibCTRAUH4WAP+JWgiH5paPHxsnnVI84HxZmduTILA7rpX
-DhjvLpr3Etiga+kFpaHpaPi8TD8SHkXoUsCjvxInebnMMTzD9joiFgOgyY9mpFui
-TdaBJQbpdqQACj7LzTWb4OE4y2BThihCQRxEV+ioratF4yUQvNs+ZUH7G6aXD+u5
-dHn5HrwdVw1Hr8Mvn4dGp+smWg9WY7ViYG4A++MnESLn/pmPNPW56MORcr3Ywx65
-LvKRRFHQV80MNNVIIb/bE/FmJUNS0nAiNs2fxBx1IK1jcmMGDw4nztJqDby1ORrp
-0XZ60Vzk50lJLVU3aPAaOpg+VBeHVOmmJ1CJeyAvP/+/oYtKR5j/K3tJPsMpRmAY
-QqszKbrAKbkTidOIijlBO8n9pu0f9GBj39ItVQGL
------END CERTIFICATE-----
-
-# Issuer: CN=SSL.com TLS RSA Root CA 2022 O=SSL Corporation
-# Subject: CN=SSL.com TLS RSA Root CA 2022 O=SSL Corporation
-# Label: "SSL.com TLS RSA Root CA 2022"
-# Serial: 148535279242832292258835760425842727825
-# MD5 Fingerprint: d8:4e:c6:59:30:d8:fe:a0:d6:7a:5a:2c:2c:69:78:da
-# SHA1 Fingerprint: ec:2c:83:40:72:af:26:95:10:ff:0e:f2:03:ee:31:70:f6:78:9d:ca
-# SHA256 Fingerprint: 8f:af:7d:2e:2c:b4:70:9b:b8:e0:b3:36:66:bf:75:a5:dd:45:b5:de:48:0f:8e:a8:d4:bf:e6:be:bc:17:f2:ed
------BEGIN CERTIFICATE-----
-MIIFiTCCA3GgAwIBAgIQb77arXO9CEDii02+1PdbkTANBgkqhkiG9w0BAQsFADBO
-MQswCQYDVQQGEwJVUzEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMSUwIwYDVQQD
-DBxTU0wuY29tIFRMUyBSU0EgUm9vdCBDQSAyMDIyMB4XDTIyMDgyNTE2MzQyMloX
-DTQ2MDgxOTE2MzQyMVowTjELMAkGA1UEBhMCVVMxGDAWBgNVBAoMD1NTTCBDb3Jw
-b3JhdGlvbjElMCMGA1UEAwwcU1NMLmNvbSBUTFMgUlNBIFJvb3QgQ0EgMjAyMjCC
-AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANCkCXJPQIgSYT41I57u9nTP
-L3tYPc48DRAokC+X94xI2KDYJbFMsBFMF3NQ0CJKY7uB0ylu1bUJPiYYf7ISf5OY
-t6/wNr/y7hienDtSxUcZXXTzZGbVXcdotL8bHAajvI9AI7YexoS9UcQbOcGV0ins
-S657Lb85/bRi3pZ7QcacoOAGcvvwB5cJOYF0r/c0WRFXCsJbwST0MXMwgsadugL3
-PnxEX4MN8/HdIGkWCVDi1FW24IBydm5MR7d1VVm0U3TZlMZBrViKMWYPHqIbKUBO
-L9975hYsLfy/7PO0+r4Y9ptJ1O4Fbtk085zx7AGL0SDGD6C1vBdOSHtRwvzpXGk3
-R2azaPgVKPC506QVzFpPulJwoxJF3ca6TvvC0PeoUidtbnm1jPx7jMEWTO6Af77w
-dr5BUxIzrlo4QqvXDz5BjXYHMtWrifZOZ9mxQnUjbvPNQrL8VfVThxc7wDNY8VLS
-+YCk8OjwO4s4zKTGkH8PnP2L0aPP2oOnaclQNtVcBdIKQXTbYxE3waWglksejBYS
-d66UNHsef8JmAOSqg+qKkK3ONkRN0VHpvB/zagX9wHQfJRlAUW7qglFA35u5CCoG
-AtUjHBPW6dvbxrB6y3snm/vg1UYk7RBLY0ulBY+6uB0rpvqR4pJSvezrZ5dtmi2f
-gTIFZzL7SAg/2SW4BCUvAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0j
-BBgwFoAU+y437uOEeicuzRk1sTN8/9REQrkwHQYDVR0OBBYEFPsuN+7jhHonLs0Z
-NbEzfP/UREK5MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAjYlt
-hEUY8U+zoO9opMAdrDC8Z2awms22qyIZZtM7QbUQnRC6cm4pJCAcAZli05bg4vsM
-QtfhWsSWTVTNj8pDU/0quOr4ZcoBwq1gaAafORpR2eCNJvkLTqVTJXojpBzOCBvf
-R4iyrT7gJ4eLSYwfqUdYe5byiB0YrrPRpgqU+tvT5TgKa3kSM/tKWTcWQA673vWJ
-DPFs0/dRa1419dvAJuoSc06pkZCmF8NsLzjUo3KUQyxi4U5cMj29TH0ZR6LDSeeW
-P4+a0zvkEdiLA9z2tmBVGKaBUfPhqBVq6+AL8BQx1rmMRTqoENjwuSfr98t67wVy
-lrXEj5ZzxOhWc5y8aVFjvO9nHEMaX3cZHxj4HCUp+UmZKbaSPaKDN7EgkaibMOlq
-bLQjk2UEqxHzDh1TJElTHaE/nUiSEeJ9DU/1172iWD54nR4fK/4huxoTtrEoZP2w
-AgDHbICivRZQIA9ygV/MlP+7mea6kMvq+cYMwq7FGc4zoWtcu358NFcXrfA/rs3q
-r5nsLFR+jM4uElZI7xc7P0peYNLcdDa8pUNjyw9bowJWCZ4kLOGGgYz+qxcs+sji
-Mho6/4UIyYOf8kpIEFR3N+2ivEC+5BB09+Rbu7nzifmPQdjH5FCQNYA+HLhNkNPU
-98OwoX6EyneSMSy4kLGCenROmxMmtNVQZlR4rmA=
------END CERTIFICATE-----
-
-# Issuer: CN=SSL.com TLS ECC Root CA 2022 O=SSL Corporation
-# Subject: CN=SSL.com TLS ECC Root CA 2022 O=SSL Corporation
-# Label: "SSL.com TLS ECC Root CA 2022"
-# Serial: 26605119622390491762507526719404364228
-# MD5 Fingerprint: 99:d7:5c:f1:51:36:cc:e9:ce:d9:19:2e:77:71:56:c5
-# SHA1 Fingerprint: 9f:5f:d9:1a:54:6d:f5:0c:71:f0:ee:7a:bd:17:49:98:84:73:e2:39
-# SHA256 Fingerprint: c3:2f:fd:9f:46:f9:36:d1:6c:36:73:99:09:59:43:4b:9a:d6:0a:af:bb:9e:7c:f3:36:54:f1:44:cc:1b:a1:43
------BEGIN CERTIFICATE-----
-MIICOjCCAcCgAwIBAgIQFAP1q/s3ixdAW+JDsqXRxDAKBggqhkjOPQQDAzBOMQsw
-CQYDVQQGEwJVUzEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMSUwIwYDVQQDDBxT
-U0wuY29tIFRMUyBFQ0MgUm9vdCBDQSAyMDIyMB4XDTIyMDgyNTE2MzM0OFoXDTQ2
-MDgxOTE2MzM0N1owTjELMAkGA1UEBhMCVVMxGDAWBgNVBAoMD1NTTCBDb3Jwb3Jh
-dGlvbjElMCMGA1UEAwwcU1NMLmNvbSBUTFMgRUNDIFJvb3QgQ0EgMjAyMjB2MBAG
-ByqGSM49AgEGBSuBBAAiA2IABEUpNXP6wrgjzhR9qLFNoFs27iosU8NgCTWyJGYm
-acCzldZdkkAZDsalE3D07xJRKF3nzL35PIXBz5SQySvOkkJYWWf9lCcQZIxPBLFN
-SeR7T5v15wj4A4j3p8OSSxlUgaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSME
-GDAWgBSJjy+j6CugFFR781a4Jl9nOAuc0DAdBgNVHQ4EFgQUiY8vo+groBRUe/NW
-uCZfZzgLnNAwDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMDA2gAMGUCMFXjIlbp
-15IkWE8elDIPDAI2wv2sdDJO4fscgIijzPvX6yv/N33w7deedWo1dlJF4AIxAMeN
-b0Igj762TVntd00pxCAgRWSGOlDGxK0tk/UYfXLtqc/ErFc2KAhl3zx5Zn6g6g==
------END CERTIFICATE-----
-
-# Issuer: CN=Atos TrustedRoot Root CA ECC TLS 2021 O=Atos
-# Subject: CN=Atos TrustedRoot Root CA ECC TLS 2021 O=Atos
-# Label: "Atos TrustedRoot Root CA ECC TLS 2021"
-# Serial: 81873346711060652204712539181482831616
-# MD5 Fingerprint: 16:9f:ad:f1:70:ad:79:d6:ed:29:b4:d1:c5:79:70:a8
-# SHA1 Fingerprint: 9e:bc:75:10:42:b3:02:f3:81:f4:f7:30:62:d4:8f:c3:a7:51:b2:dd
-# SHA256 Fingerprint: b2:fa:e5:3e:14:cc:d7:ab:92:12:06:47:01:ae:27:9c:1d:89:88:fa:cb:77:5f:a8:a0:08:91:4e:66:39:88:a8
------BEGIN CERTIFICATE-----
-MIICFTCCAZugAwIBAgIQPZg7pmY9kGP3fiZXOATvADAKBggqhkjOPQQDAzBMMS4w
-LAYDVQQDDCVBdG9zIFRydXN0ZWRSb290IFJvb3QgQ0EgRUNDIFRMUyAyMDIxMQ0w
-CwYDVQQKDARBdG9zMQswCQYDVQQGEwJERTAeFw0yMTA0MjIwOTI2MjNaFw00MTA0
-MTcwOTI2MjJaMEwxLjAsBgNVBAMMJUF0b3MgVHJ1c3RlZFJvb3QgUm9vdCBDQSBF
-Q0MgVExTIDIwMjExDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRFMHYwEAYHKoZI
-zj0CAQYFK4EEACIDYgAEloZYKDcKZ9Cg3iQZGeHkBQcfl+3oZIK59sRxUM6KDP/X
-tXa7oWyTbIOiaG6l2b4siJVBzV3dscqDY4PMwL502eCdpO5KTlbgmClBk1IQ1SQ4
-AjJn8ZQSb+/Xxd4u/RmAo0IwQDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR2
-KCXWfeBmmnoJsmo7jjPXNtNPojAOBgNVHQ8BAf8EBAMCAYYwCgYIKoZIzj0EAwMD
-aAAwZQIwW5kp85wxtolrbNa9d+F851F+uDrNozZffPc8dz7kUK2o59JZDCaOMDtu
-CCrCp1rIAjEAmeMM56PDr9NJLkaCI2ZdyQAUEv049OGYa3cpetskz2VAv9LcjBHo
-9H1/IISpQuQo
------END CERTIFICATE-----
-
-# Issuer: CN=Atos TrustedRoot Root CA RSA TLS 2021 O=Atos
-# Subject: CN=Atos TrustedRoot Root CA RSA TLS 2021 O=Atos
-# Label: "Atos TrustedRoot Root CA RSA TLS 2021"
-# Serial: 111436099570196163832749341232207667876
-# MD5 Fingerprint: d4:d3:46:b8:9a:c0:9c:76:5d:9e:3a:c3:b9:99:31:d2
-# SHA1 Fingerprint: 18:52:3b:0d:06:37:e4:d6:3a:df:23:e4:98:fb:5b:16:fb:86:74:48
-# SHA256 Fingerprint: 81:a9:08:8e:a5:9f:b3:64:c5:48:a6:f8:55:59:09:9b:6f:04:05:ef:bf:18:e5:32:4e:c9:f4:57:ba:00:11:2f
------BEGIN CERTIFICATE-----
-MIIFZDCCA0ygAwIBAgIQU9XP5hmTC/srBRLYwiqipDANBgkqhkiG9w0BAQwFADBM
-MS4wLAYDVQQDDCVBdG9zIFRydXN0ZWRSb290IFJvb3QgQ0EgUlNBIFRMUyAyMDIx
-MQ0wCwYDVQQKDARBdG9zMQswCQYDVQQGEwJERTAeFw0yMTA0MjIwOTIxMTBaFw00
-MTA0MTcwOTIxMDlaMEwxLjAsBgNVBAMMJUF0b3MgVHJ1c3RlZFJvb3QgUm9vdCBD
-QSBSU0EgVExTIDIwMjExDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRFMIICIjAN
-BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtoAOxHm9BYx9sKOdTSJNy/BBl01Z
-4NH+VoyX8te9j2y3I49f1cTYQcvyAh5x5en2XssIKl4w8i1mx4QbZFc4nXUtVsYv
-Ye+W/CBGvevUez8/fEc4BKkbqlLfEzfTFRVOvV98r61jx3ncCHvVoOX3W3WsgFWZ
-kmGbzSoXfduP9LVq6hdKZChmFSlsAvFr1bqjM9xaZ6cF4r9lthawEO3NUDPJcFDs
-GY6wx/J0W2tExn2WuZgIWWbeKQGb9Cpt0xU6kGpn8bRrZtkh68rZYnxGEFzedUln
-nkL5/nWpo63/dgpnQOPF943HhZpZnmKaau1Fh5hnstVKPNe0OwANwI8f4UDErmwh
-3El+fsqyjW22v5MvoVw+j8rtgI5Y4dtXz4U2OLJxpAmMkokIiEjxQGMYsluMWuPD
-0xeqqxmjLBvk1cbiZnrXghmmOxYsL3GHX0WelXOTwkKBIROW1527k2gV+p2kHYzy
-geBYBr3JtuP2iV2J+axEoctr+hbxx1A9JNr3w+SH1VbxT5Aw+kUJWdo0zuATHAR8
-ANSbhqRAvNncTFd+rrcztl524WWLZt+NyteYr842mIycg5kDcPOvdO3GDjbnvezB
-c6eUWsuSZIKmAMFwoW4sKeFYV+xafJlrJaSQOoD0IJ2azsct+bJLKZWD6TWNp0lI
-pw9MGZHQ9b8Q4HECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU
-dEmZ0f+0emhFdcN+tNzMzjkz2ggwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB
-DAUAA4ICAQAjQ1MkYlxt/T7Cz1UAbMVWiLkO3TriJQ2VSpfKgInuKs1l+NsW4AmS
-4BjHeJi78+xCUvuppILXTdiK/ORO/auQxDh1MoSf/7OwKwIzNsAQkG8dnK/haZPs
-o0UvFJ/1TCplQ3IM98P4lYsU84UgYt1UU90s3BiVaU+DR3BAM1h3Egyi61IxHkzJ
-qM7F78PRreBrAwA0JrRUITWXAdxfG/F851X6LWh3e9NpzNMOa7pNdkTWwhWaJuyw
-xfW70Xp0wmzNxbVe9kzmWy2B27O3Opee7c9GslA9hGCZcbUztVdF5kJHdWoOsAgM
-rr3e97sPWD2PAzHoPYJQyi9eDF20l74gNAf0xBLh7tew2VktafcxBPTy+av5EzH4
-AXcOPUIjJsyacmdRIXrMPIWo6iFqO9taPKU0nprALN+AnCng33eU0aKAQv9qTFsR
-0PXNor6uzFFcw9VUewyu1rkGd4Di7wcaaMxZUa1+XGdrudviB0JbuAEFWDlN5LuY
-o7Ey7Nmj1m+UI/87tyll5gfp77YZ6ufCOB0yiJA8EytuzO+rdwY0d4RPcuSBhPm5
-dDTedk+SKlOxJTnbPP/lPqYO5Wue/9vsL3SD3460s6neFE3/MaNFcyT6lSnMEpcE
-oji2jbDwN/zIIX8/syQbPYtuzE2wFg2WHYMfRsCbvUOZ58SWLs5fyQ==
------END CERTIFICATE-----
-
-# Issuer: CN=TrustAsia Global Root CA G3 O=TrustAsia Technologies, Inc.
-# Subject: CN=TrustAsia Global Root CA G3 O=TrustAsia Technologies, Inc.
-# Label: "TrustAsia Global Root CA G3"
-# Serial: 576386314500428537169965010905813481816650257167
-# MD5 Fingerprint: 30:42:1b:b7:bb:81:75:35:e4:16:4f:53:d2:94:de:04
-# SHA1 Fingerprint: 63:cf:b6:c1:27:2b:56:e4:88:8e:1c:23:9a:b6:2e:81:47:24:c3:c7
-# SHA256 Fingerprint: e0:d3:22:6a:eb:11:63:c2:e4:8f:f9:be:3b:50:b4:c6:43:1b:e7:bb:1e:ac:c5:c3:6b:5d:5e:c5:09:03:9a:08
------BEGIN CERTIFICATE-----
-MIIFpTCCA42gAwIBAgIUZPYOZXdhaqs7tOqFhLuxibhxkw8wDQYJKoZIhvcNAQEM
-BQAwWjELMAkGA1UEBhMCQ04xJTAjBgNVBAoMHFRydXN0QXNpYSBUZWNobm9sb2dp
-ZXMsIEluYy4xJDAiBgNVBAMMG1RydXN0QXNpYSBHbG9iYWwgUm9vdCBDQSBHMzAe
-Fw0yMTA1MjAwMjEwMTlaFw00NjA1MTkwMjEwMTlaMFoxCzAJBgNVBAYTAkNOMSUw
-IwYDVQQKDBxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSQwIgYDVQQDDBtU
-cnVzdEFzaWEgR2xvYmFsIFJvb3QgQ0EgRzMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
-DwAwggIKAoICAQDAMYJhkuSUGwoqZdC+BqmHO1ES6nBBruL7dOoKjbmzTNyPtxNS
-T1QY4SxzlZHFZjtqz6xjbYdT8PfxObegQ2OwxANdV6nnRM7EoYNl9lA+sX4WuDqK
-AtCWHwDNBSHvBm3dIZwZQ0WhxeiAysKtQGIXBsaqvPPW5vxQfmZCHzyLpnl5hkA1
-nyDvP+uLRx+PjsXUjrYsyUQE49RDdT/VP68czH5GX6zfZBCK70bwkPAPLfSIC7Ep
-qq+FqklYqL9joDiR5rPmd2jE+SoZhLsO4fWvieylL1AgdB4SQXMeJNnKziyhWTXA
-yB1GJ2Faj/lN03J5Zh6fFZAhLf3ti1ZwA0pJPn9pMRJpxx5cynoTi+jm9WAPzJMs
-hH/x/Gr8m0ed262IPfN2dTPXS6TIi/n1Q1hPy8gDVI+lhXgEGvNz8teHHUGf59gX
-zhqcD0r83ERoVGjiQTz+LISGNzzNPy+i2+f3VANfWdP3kXjHi3dqFuVJhZBFcnAv
-kV34PmVACxmZySYgWmjBNb9Pp1Hx2BErW+Canig7CjoKH8GB5S7wprlppYiU5msT
-f9FkPz2ccEblooV7WIQn3MSAPmeamseaMQ4w7OYXQJXZRe0Blqq/DPNL0WP3E1jA
-uPP6Z92bfW1K/zJMtSU7/xxnD4UiWQWRkUF3gdCFTIcQcf+eQxuulXUtgQIDAQAB
-o2MwYTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFEDk5PIj7zjKsK5Xf/Ih
-MBY027ySMB0GA1UdDgQWBBRA5OTyI+84yrCuV3/yITAWNNu8kjAOBgNVHQ8BAf8E
-BAMCAQYwDQYJKoZIhvcNAQEMBQADggIBACY7UeFNOPMyGLS0XuFlXsSUT9SnYaP4
-wM8zAQLpw6o1D/GUE3d3NZ4tVlFEbuHGLige/9rsR82XRBf34EzC4Xx8MnpmyFq2
-XFNFV1pF1AWZLy4jVe5jaN/TG3inEpQGAHUNcoTpLrxaatXeL1nHo+zSh2bbt1S1
-JKv0Q3jbSwTEb93mPmY+KfJLaHEih6D4sTNjduMNhXJEIlU/HHzp/LgV6FL6qj6j
-ITk1dImmasI5+njPtqzn59ZW/yOSLlALqbUHM/Q4X6RJpstlcHboCoWASzY9M/eV
-VHUl2qzEc4Jl6VL1XP04lQJqaTDFHApXB64ipCz5xUG3uOyfT0gA+QEEVcys+TIx
-xHWVBqB/0Y0n3bOppHKH/lmLmnp0Ft0WpWIp6zqW3IunaFnT63eROfjXy9mPX1on
-AX1daBli2MjN9LdyR75bl87yraKZk62Uy5P2EgmVtqvXO9A/EcswFi55gORngS1d
-7XB4tmBZrOFdRWOPyN9yaFvqHbgB8X7754qz41SgOAngPN5C8sLtLpvzHzW2Ntjj
-gKGLzZlkD8Kqq7HK9W+eQ42EVJmzbsASZthwEPEGNTNDqJwuuhQxzhB/HIbjj9LV
-+Hfsm6vxL2PZQl/gZ4FkkfGXL/xuJvYz+NO1+MRiqzFRJQJ6+N1rZdVtTTDIZbpo
-FGWsJwt0ivKH
------END CERTIFICATE-----
-
-# Issuer: CN=TrustAsia Global Root CA G4 O=TrustAsia Technologies, Inc.
-# Subject: CN=TrustAsia Global Root CA G4 O=TrustAsia Technologies, Inc.
-# Label: "TrustAsia Global Root CA G4"
-# Serial: 451799571007117016466790293371524403291602933463
-# MD5 Fingerprint: 54:dd:b2:d7:5f:d8:3e:ed:7c:e0:0b:2e:cc:ed:eb:eb
-# SHA1 Fingerprint: 57:73:a5:61:5d:80:b2:e6:ac:38:82:fc:68:07:31:ac:9f:b5:92:5a
-# SHA256 Fingerprint: be:4b:56:cb:50:56:c0:13:6a:52:6d:f4:44:50:8d:aa:36:a0:b5:4f:42:e4:ac:38:f7:2a:f4:70:e4:79:65:4c
------BEGIN CERTIFICATE-----
-MIICVTCCAdygAwIBAgIUTyNkuI6XY57GU4HBdk7LKnQV1tcwCgYIKoZIzj0EAwMw
-WjELMAkGA1UEBhMCQ04xJTAjBgNVBAoMHFRydXN0QXNpYSBUZWNobm9sb2dpZXMs
-IEluYy4xJDAiBgNVBAMMG1RydXN0QXNpYSBHbG9iYWwgUm9vdCBDQSBHNDAeFw0y
-MTA1MjAwMjEwMjJaFw00NjA1MTkwMjEwMjJaMFoxCzAJBgNVBAYTAkNOMSUwIwYD
-VQQKDBxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSQwIgYDVQQDDBtUcnVz
-dEFzaWEgR2xvYmFsIFJvb3QgQ0EgRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATx
-s8045CVD5d4ZCbuBeaIVXxVjAd7Cq92zphtnS4CDr5nLrBfbK5bKfFJV4hrhPVbw
-LxYI+hW8m7tH5j/uqOFMjPXTNvk4XatwmkcN4oFBButJ+bAp3TPsUKV/eSm4IJij
-YzBhMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUpbtKl86zK3+kMd6Xg1mD
-pm9xy94wHQYDVR0OBBYEFKW7SpfOsyt/pDHel4NZg6ZvccveMA4GA1UdDwEB/wQE
-AwIBBjAKBggqhkjOPQQDAwNnADBkAjBe8usGzEkxn0AAbbd+NvBNEU/zy4k6LHiR
-UKNbwMp1JvK/kF0LgoxgKJ/GcJpo5PECMFxYDlZ2z1jD1xCMuo6u47xkdUfFVZDj
-/bpV6wfEU6s3qe4hsiFbYI89MvHVI5TWWA==
------END CERTIFICATE-----
-
-# Issuer: CN=CommScope Public Trust ECC Root-01 O=CommScope
-# Subject: CN=CommScope Public Trust ECC Root-01 O=CommScope
-# Label: "CommScope Public Trust ECC Root-01"
-# Serial: 385011430473757362783587124273108818652468453534
-# MD5 Fingerprint: 3a:40:a7:fc:03:8c:9c:38:79:2f:3a:a2:6c:b6:0a:16
-# SHA1 Fingerprint: 07:86:c0:d8:dd:8e:c0:80:98:06:98:d0:58:7a:ef:de:a6:cc:a2:5d
-# SHA256 Fingerprint: 11:43:7c:da:7b:b4:5e:41:36:5f:45:b3:9a:38:98:6b:0d:e0:0d:ef:34:8e:0c:7b:b0:87:36:33:80:0b:c3:8b
------BEGIN CERTIFICATE-----
-MIICHTCCAaOgAwIBAgIUQ3CCd89NXTTxyq4yLzf39H91oJ4wCgYIKoZIzj0EAwMw
-TjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwiQ29t
-bVNjb3BlIFB1YmxpYyBUcnVzdCBFQ0MgUm9vdC0wMTAeFw0yMTA0MjgxNzM1NDNa
-Fw00NjA0MjgxNzM1NDJaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21tU2Nv
-cGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgRUNDIFJvb3QtMDEw
-djAQBgcqhkjOPQIBBgUrgQQAIgNiAARLNumuV16ocNfQj3Rid8NeeqrltqLxeP0C
-flfdkXmcbLlSiFS8LwS+uM32ENEp7LXQoMPwiXAZu1FlxUOcw5tjnSCDPgYLpkJE
-hRGnSjot6dZoL0hOUysHP029uax3OVejQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSOB2LAUN3GGQYARnQE9/OufXVNMDAKBggq
-hkjOPQQDAwNoADBlAjEAnDPfQeMjqEI2Jpc1XHvr20v4qotzVRVcrHgpD7oh2MSg
-2NED3W3ROT3Ek2DS43KyAjB8xX6I01D1HiXo+k515liWpDVfG2XqYZpwI7UNo5uS
-Um9poIyNStDuiw7LR47QjRE=
------END CERTIFICATE-----
-
-# Issuer: CN=CommScope Public Trust ECC Root-02 O=CommScope
-# Subject: CN=CommScope Public Trust ECC Root-02 O=CommScope
-# Label: "CommScope Public Trust ECC Root-02"
-# Serial: 234015080301808452132356021271193974922492992893
-# MD5 Fingerprint: 59:b0:44:d5:65:4d:b8:5c:55:19:92:02:b6:d1:94:b2
-# SHA1 Fingerprint: 3c:3f:ef:57:0f:fe:65:93:86:9e:a0:fe:b0:f6:ed:8e:d1:13:c7:e5
-# SHA256 Fingerprint: 2f:fb:7f:81:3b:bb:b3:c8:9a:b4:e8:16:2d:0f:16:d7:15:09:a8:30:cc:9d:73:c2:62:e5:14:08:75:d1:ad:4a
------BEGIN CERTIFICATE-----
-MIICHDCCAaOgAwIBAgIUKP2ZYEFHpgE6yhR7H+/5aAiDXX0wCgYIKoZIzj0EAwMw
-TjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwiQ29t
-bVNjb3BlIFB1YmxpYyBUcnVzdCBFQ0MgUm9vdC0wMjAeFw0yMTA0MjgxNzQ0NTRa
-Fw00NjA0MjgxNzQ0NTNaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21tU2Nv
-cGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgRUNDIFJvb3QtMDIw
-djAQBgcqhkjOPQIBBgUrgQQAIgNiAAR4MIHoYx7l63FRD/cHB8o5mXxO1Q/MMDAL
-j2aTPs+9xYa9+bG3tD60B8jzljHz7aRP+KNOjSkVWLjVb3/ubCK1sK9IRQq9qEmU
-v4RDsNuESgMjGWdqb8FuvAY5N9GIIvejQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTmGHX/72DehKT1RsfeSlXjMjZ59TAKBggq
-hkjOPQQDAwNnADBkAjAmc0l6tqvmSfR9Uj/UQQSugEODZXW5hYA4O9Zv5JOGq4/n
-ich/m35rChJVYaoR4HkCMHfoMXGsPHED1oQmHhS48zs73u1Z/GtMMH9ZzkXpc2AV
-mkzw5l4lIhVtwodZ0LKOag==
------END CERTIFICATE-----
-
-# Issuer: CN=CommScope Public Trust RSA Root-01 O=CommScope
-# Subject: CN=CommScope Public Trust RSA Root-01 O=CommScope
-# Label: "CommScope Public Trust RSA Root-01"
-# Serial: 354030733275608256394402989253558293562031411421
-# MD5 Fingerprint: 0e:b4:15:bc:87:63:5d:5d:02:73:d4:26:38:68:73:d8
-# SHA1 Fingerprint: 6d:0a:5f:f7:b4:23:06:b4:85:b3:b7:97:64:fc:ac:75:f5:33:f2:93
-# SHA256 Fingerprint: 02:bd:f9:6e:2a:45:dd:9b:f1:8f:c7:e1:db:df:21:a0:37:9b:a3:c9:c2:61:03:44:cf:d8:d6:06:fe:c1:ed:81
------BEGIN CERTIFICATE-----
-MIIFbDCCA1SgAwIBAgIUPgNJgXUWdDGOTKvVxZAplsU5EN0wDQYJKoZIhvcNAQEL
-BQAwTjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwi
-Q29tbVNjb3BlIFB1YmxpYyBUcnVzdCBSU0EgUm9vdC0wMTAeFw0yMTA0MjgxNjQ1
-NTRaFw00NjA0MjgxNjQ1NTNaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21t
-U2NvcGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgUlNBIFJvb3Qt
-MDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwSGWjDR1C45FtnYSk
-YZYSwu3D2iM0GXb26v1VWvZVAVMP8syMl0+5UMuzAURWlv2bKOx7dAvnQmtVzslh
-suitQDy6uUEKBU8bJoWPQ7VAtYXR1HHcg0Hz9kXHgKKEUJdGzqAMxGBWBB0HW0al
-DrJLpA6lfO741GIDuZNqihS4cPgugkY4Iw50x2tBt9Apo52AsH53k2NC+zSDO3Oj
-WiE260f6GBfZumbCk6SP/F2krfxQapWsvCQz0b2If4b19bJzKo98rwjyGpg/qYFl
-P8GMicWWMJoKz/TUyDTtnS+8jTiGU+6Xn6myY5QXjQ/cZip8UlF1y5mO6D1cv547
-KI2DAg+pn3LiLCuz3GaXAEDQpFSOm117RTYm1nJD68/A6g3czhLmfTifBSeolz7p
-UcZsBSjBAg/pGG3svZwG1KdJ9FQFa2ww8esD1eo9anbCyxooSU1/ZOD6K9pzg4H/
-kQO9lLvkuI6cMmPNn7togbGEW682v3fuHX/3SZtS7NJ3Wn2RnU3COS3kuoL4b/JO
-Hg9O5j9ZpSPcPYeoKFgo0fEbNttPxP/hjFtyjMcmAyejOQoBqsCyMWCDIqFPEgkB
-Ea801M/XrmLTBQe0MXXgDW1XT2mH+VepuhX2yFJtocucH+X8eKg1mp9BFM6ltM6U
-CBwJrVbl2rZJmkrqYxhTnCwuwwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G
-A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUN12mmnQywsL5x6YVEFm45P3luG0wDQYJ
-KoZIhvcNAQELBQADggIBAK+nz97/4L1CjU3lIpbfaOp9TSp90K09FlxD533Ahuh6
-NWPxzIHIxgvoLlI1pKZJkGNRrDSsBTtXAOnTYtPZKdVUvhwQkZyybf5Z/Xn36lbQ
-nmhUQo8mUuJM3y+Xpi/SB5io82BdS5pYV4jvguX6r2yBS5KPQJqTRlnLX3gWsWc+
-QgvfKNmwrZggvkN80V4aCRckjXtdlemrwWCrWxhkgPut4AZ9HcpZuPN4KWfGVh2v
-trV0KnahP/t1MJ+UXjulYPPLXAziDslg+MkfFoom3ecnf+slpoq9uC02EJqxWE2a
-aE9gVOX2RhOOiKy8IUISrcZKiX2bwdgt6ZYD9KJ0DLwAHb/WNyVntHKLr4W96ioD
-j8z7PEQkguIBpQtZtjSNMgsSDesnwv1B10A8ckYpwIzqug/xBpMu95yo9GA+o/E4
-Xo4TwbM6l4c/ksp4qRyv0LAbJh6+cOx69TOY6lz/KwsETkPdY34Op054A5U+1C0w
-lREQKC6/oAI+/15Z0wUOlV9TRe9rh9VIzRamloPh37MG88EU26fsHItdkJANclHn
-YfkUyq+Dj7+vsQpZXdxc1+SWrVtgHdqul7I52Qb1dgAT+GhMIbA1xNxVssnBQVoc
-icCMb3SgazNNtQEo/a2tiRc7ppqEvOuM6sRxJKi6KfkIsidWNTJf6jn7MZrVGczw
------END CERTIFICATE-----
-
-# Issuer: CN=CommScope Public Trust RSA Root-02 O=CommScope
-# Subject: CN=CommScope Public Trust RSA Root-02 O=CommScope
-# Label: "CommScope Public Trust RSA Root-02"
-# Serial: 480062499834624527752716769107743131258796508494
-# MD5 Fingerprint: e1:29:f9:62:7b:76:e2:96:6d:f3:d4:d7:0f:ae:1f:aa
-# SHA1 Fingerprint: ea:b0:e2:52:1b:89:93:4c:11:68:f2:d8:9a:ac:22:4c:a3:8a:57:ae
-# SHA256 Fingerprint: ff:e9:43:d7:93:42:4b:4f:7c:44:0c:1c:3d:64:8d:53:63:f3:4b:82:dc:87:aa:7a:9f:11:8f:c5:de:e1:01:f1
------BEGIN CERTIFICATE-----
-MIIFbDCCA1SgAwIBAgIUVBa/O345lXGN0aoApYYNK496BU4wDQYJKoZIhvcNAQEL
-BQAwTjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwi
-Q29tbVNjb3BlIFB1YmxpYyBUcnVzdCBSU0EgUm9vdC0wMjAeFw0yMTA0MjgxNzE2
-NDNaFw00NjA0MjgxNzE2NDJaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21t
-U2NvcGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgUlNBIFJvb3Qt
-MDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDh+g77aAASyE3VrCLE
-NQE7xVTlWXZjpX/rwcRqmL0yjReA61260WI9JSMZNRTpf4mnG2I81lDnNJUDMrG0
-kyI9p+Kx7eZ7Ti6Hmw0zdQreqjXnfuU2mKKuJZ6VszKWpCtYHu8//mI0SFHRtI1C
-rWDaSWqVcN3SAOLMV2MCe5bdSZdbkk6V0/nLKR8YSvgBKtJjCW4k6YnS5cciTNxz
-hkcAqg2Ijq6FfUrpuzNPDlJwnZXjfG2WWy09X6GDRl224yW4fKcZgBzqZUPckXk2
-LHR88mcGyYnJ27/aaL8j7dxrrSiDeS/sOKUNNwFnJ5rpM9kzXzehxfCrPfp4sOcs
-n/Y+n2Dg70jpkEUeBVF4GiwSLFworA2iI540jwXmojPOEXcT1A6kHkIfhs1w/tku
-FT0du7jyU1fbzMZ0KZwYszZ1OC4PVKH4kh+Jlk+71O6d6Ts2QrUKOyrUZHk2EOH5
-kQMreyBUzQ0ZGshBMjTRsJnhkB4BQDa1t/qp5Xd1pCKBXbCL5CcSD1SIxtuFdOa3
-wNemKfrb3vOTlycEVS8KbzfFPROvCgCpLIscgSjX74Yxqa7ybrjKaixUR9gqiC6v
-wQcQeKwRoi9C8DfF8rhW3Q5iLc4tVn5V8qdE9isy9COoR+jUKgF4z2rDN6ieZdIs
-5fq6M8EGRPbmz6UNp2YINIos8wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G
-A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUR9DnsSL/nSz12Vdgs7GxcJXvYXowDQYJ
-KoZIhvcNAQELBQADggIBAIZpsU0v6Z9PIpNojuQhmaPORVMbc0RTAIFhzTHjCLqB
-KCh6krm2qMhDnscTJk3C2OVVnJJdUNjCK9v+5qiXz1I6JMNlZFxHMaNlNRPDk7n3
-+VGXu6TwYofF1gbTl4MgqX67tiHCpQ2EAOHyJxCDut0DgdXdaMNmEMjRdrSzbyme
-APnCKfWxkxlSaRosTKCL4BWaMS/TiJVZbuXEs1DIFAhKm4sTg7GkcrI7djNB3Nyq
-pgdvHSQSn8h2vS/ZjvQs7rfSOBAkNlEv41xdgSGn2rtO/+YHqP65DSdsu3BaVXoT
-6fEqSWnHX4dXTEN5bTpl6TBcQe7rd6VzEojov32u5cSoHw2OHG1QAk8mGEPej1WF
-sQs3BWDJVTkSBKEqz3EWnzZRSb9wO55nnPt7eck5HHisd5FUmrh1CoFSl+NmYWvt
-PjgelmFV4ZFUjO2MJB+ByRCac5krFk5yAD9UG/iNuovnFNa2RU9g7Jauwy8CTl2d
-lklyALKrdVwPaFsdZcJfMw8eD/A7hvWwTruc9+olBdytoptLFwG+Qt81IR2tq670
-v64fG9PiO/yzcnMcmyiQiRM9HcEARwmWmjgb3bHPDcK0RPOWlc4yOo80nOAXx17O
-rg3bhzjlP1v9mxnhMUF6cKojawHhRUzNlM47ni3niAIi9G7oyOzWPPO5std3eqx7
------END CERTIFICATE-----
-
-# Issuer: CN=Telekom Security TLS ECC Root 2020 O=Deutsche Telekom Security GmbH
-# Subject: CN=Telekom Security TLS ECC Root 2020 O=Deutsche Telekom Security GmbH
-# Label: "Telekom Security TLS ECC Root 2020"
-# Serial: 72082518505882327255703894282316633856
-# MD5 Fingerprint: c1:ab:fe:6a:10:2c:03:8d:bc:1c:22:32:c0:85:a7:fd
-# SHA1 Fingerprint: c0:f8:96:c5:a9:3b:01:06:21:07:da:18:42:48:bc:e9:9d:88:d5:ec
-# SHA256 Fingerprint: 57:8a:f4:de:d0:85:3f:4e:59:98:db:4a:ea:f9:cb:ea:8d:94:5f:60:b6:20:a3:8d:1a:3c:13:b2:bc:7b:a8:e1
------BEGIN CERTIFICATE-----
-MIICQjCCAcmgAwIBAgIQNjqWjMlcsljN0AFdxeVXADAKBggqhkjOPQQDAzBjMQsw
-CQYDVQQGEwJERTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0eSBH
-bWJIMSswKQYDVQQDDCJUZWxla29tIFNlY3VyaXR5IFRMUyBFQ0MgUm9vdCAyMDIw
-MB4XDTIwMDgyNTA3NDgyMFoXDTQ1MDgyNTIzNTk1OVowYzELMAkGA1UEBhMCREUx
-JzAlBgNVBAoMHkRldXRzY2hlIFRlbGVrb20gU2VjdXJpdHkgR21iSDErMCkGA1UE
-AwwiVGVsZWtvbSBTZWN1cml0eSBUTFMgRUNDIFJvb3QgMjAyMDB2MBAGByqGSM49
-AgEGBSuBBAAiA2IABM6//leov9Wq9xCazbzREaK9Z0LMkOsVGJDZos0MKiXrPk/O
-tdKPD/M12kOLAoC+b1EkHQ9rK8qfwm9QMuU3ILYg/4gND21Ju9sGpIeQkpT0CdDP
-f8iAC8GXs7s1J8nCG6NCMEAwHQYDVR0OBBYEFONyzG6VmUex5rNhTNHLq+O6zd6f
-MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMAoGCCqGSM49BAMDA2cA
-MGQCMHVSi7ekEE+uShCLsoRbQuHmKjYC2qBuGT8lv9pZMo7k+5Dck2TOrbRBR2Di
-z6fLHgIwN0GMZt9Ba9aDAEH9L1r3ULRn0SyocddDypwnJJGDSA3PzfdUga/sf+Rn
-27iQ7t0l
------END CERTIFICATE-----
-
-# Issuer: CN=Telekom Security TLS RSA Root 2023 O=Deutsche Telekom Security GmbH
-# Subject: CN=Telekom Security TLS RSA Root 2023 O=Deutsche Telekom Security GmbH
-# Label: "Telekom Security TLS RSA Root 2023"
-# Serial: 44676229530606711399881795178081572759
-# MD5 Fingerprint: bf:5b:eb:54:40:cd:48:71:c4:20:8d:7d:de:0a:42:f2
-# SHA1 Fingerprint: 54:d3:ac:b3:bd:57:56:f6:85:9d:ce:e5:c3:21:e2:d4:ad:83:d0:93
-# SHA256 Fingerprint: ef:c6:5c:ad:bb:59:ad:b6:ef:e8:4d:a2:23:11:b3:56:24:b7:1b:3b:1e:a0:da:8b:66:55:17:4e:c8:97:86:46
------BEGIN CERTIFICATE-----
-MIIFszCCA5ugAwIBAgIQIZxULej27HF3+k7ow3BXlzANBgkqhkiG9w0BAQwFADBj
-MQswCQYDVQQGEwJERTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0
-eSBHbWJIMSswKQYDVQQDDCJUZWxla29tIFNlY3VyaXR5IFRMUyBSU0EgUm9vdCAy
-MDIzMB4XDTIzMDMyODEyMTY0NVoXDTQ4MDMyNzIzNTk1OVowYzELMAkGA1UEBhMC
-REUxJzAlBgNVBAoMHkRldXRzY2hlIFRlbGVrb20gU2VjdXJpdHkgR21iSDErMCkG
-A1UEAwwiVGVsZWtvbSBTZWN1cml0eSBUTFMgUlNBIFJvb3QgMjAyMzCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAO01oYGA88tKaVvC+1GDrib94W7zgRJ9
-cUD/h3VCKSHtgVIs3xLBGYSJwb3FKNXVS2xE1kzbB5ZKVXrKNoIENqil/Cf2SfHV
-cp6R+SPWcHu79ZvB7JPPGeplfohwoHP89v+1VmLhc2o0mD6CuKyVU/QBoCcHcqMA
-U6DksquDOFczJZSfvkgdmOGjup5czQRxUX11eKvzWarE4GC+j4NSuHUaQTXtvPM6
-Y+mpFEXX5lLRbtLevOP1Czvm4MS9Q2QTps70mDdsipWol8hHD/BeEIvnHRz+sTug
-BTNoBUGCwQMrAcjnj02r6LX2zWtEtefdi+zqJbQAIldNsLGyMcEWzv/9FIS3R/qy
-8XDe24tsNlikfLMR0cN3f1+2JeANxdKz+bi4d9s3cXFH42AYTyS2dTd4uaNir73J
-co4vzLuu2+QVUhkHM/tqty1LkCiCc/4YizWN26cEar7qwU02OxY2kTLvtkCJkUPg
-8qKrBC7m8kwOFjQgrIfBLX7JZkcXFBGk8/ehJImr2BrIoVyxo/eMbcgByU/J7MT8
-rFEz0ciD0cmfHdRHNCk+y7AO+oMLKFjlKdw/fKifybYKu6boRhYPluV75Gp6SG12
-mAWl3G0eQh5C2hrgUve1g8Aae3g1LDj1H/1Joy7SWWO/gLCMk3PLNaaZlSJhZQNg
-+y+TS/qanIA7AgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtqeX
-gj10hZv3PJ+TmpV5dVKMbUcwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS2
-p5eCPXSFm/c8n5OalXl1UoxtRzANBgkqhkiG9w0BAQwFAAOCAgEAqMxhpr51nhVQ
-pGv7qHBFfLp+sVr8WyP6Cnf4mHGCDG3gXkaqk/QeoMPhk9tLrbKmXauw1GLLXrtm
-9S3ul0A8Yute1hTWjOKWi0FpkzXmuZlrYrShF2Y0pmtjxrlO8iLpWA1WQdH6DErw
-M807u20hOq6OcrXDSvvpfeWxm4bu4uB9tPcy/SKE8YXJN3nptT+/XOR0so8RYgDd
-GGah2XsjX/GO1WfoVNpbOms2b/mBsTNHM3dA+VKq3dSDz4V4mZqTuXNnQkYRIer+
-CqkbGmVps4+uFrb2S1ayLfmlyOw7YqPta9BO1UAJpB+Y1zqlklkg5LB9zVtzaL1t
-xKITDmcZuI1CfmwMmm6gJC3VRRvcxAIU/oVbZZfKTpBQCHpCNfnqwmbU+AGuHrS+
-w6jv/naaoqYfRvaE7fzbzsQCzndILIyy7MMAo+wsVRjBfhnu4S/yrYObnqsZ38aK
-L4x35bcF7DvB7L6Gs4a8wPfc5+pbrrLMtTWGS9DiP7bY+A4A7l3j941Y/8+LN+lj
-X273CXE2whJdV/LItM3z7gLfEdxquVeEHVlNjM7IDiPCtyaaEBRx/pOyiriA8A4Q
-ntOoUAw3gi/q4Iqd4Sw5/7W0cwDk90imc6y/st53BIe0o82bNSQ3+pCTE4FCxpgm
-dTdmQRCsu/WU48IxK63nI1bMNSWSs1A=
------END CERTIFICATE-----
-
-# Issuer: CN=FIRMAPROFESIONAL CA ROOT-A WEB O=Firmaprofesional SA
-# Subject: CN=FIRMAPROFESIONAL CA ROOT-A WEB O=Firmaprofesional SA
-# Label: "FIRMAPROFESIONAL CA ROOT-A WEB"
-# Serial: 65916896770016886708751106294915943533
-# MD5 Fingerprint: 82:b2:ad:45:00:82:b0:66:63:f8:5f:c3:67:4e:ce:a3
-# SHA1 Fingerprint: a8:31:11:74:a6:14:15:0d:ca:77:dd:0e:e4:0c:5d:58:fc:a0:72:a5
-# SHA256 Fingerprint: be:f2:56:da:f2:6e:9c:69:bd:ec:16:02:35:97:98:f3:ca:f7:18:21:a0:3e:01:82:57:c5:3c:65:61:7f:3d:4a
------BEGIN CERTIFICATE-----
-MIICejCCAgCgAwIBAgIQMZch7a+JQn81QYehZ1ZMbTAKBggqhkjOPQQDAzBuMQsw
-CQYDVQQGEwJFUzEcMBoGA1UECgwTRmlybWFwcm9mZXNpb25hbCBTQTEYMBYGA1UE
-YQwPVkFURVMtQTYyNjM0MDY4MScwJQYDVQQDDB5GSVJNQVBST0ZFU0lPTkFMIENB
-IFJPT1QtQSBXRUIwHhcNMjIwNDA2MDkwMTM2WhcNNDcwMzMxMDkwMTM2WjBuMQsw
-CQYDVQQGEwJFUzEcMBoGA1UECgwTRmlybWFwcm9mZXNpb25hbCBTQTEYMBYGA1UE
-YQwPVkFURVMtQTYyNjM0MDY4MScwJQYDVQQDDB5GSVJNQVBST0ZFU0lPTkFMIENB
-IFJPT1QtQSBXRUIwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARHU+osEaR3xyrq89Zf
-e9MEkVz6iMYiuYMQYneEMy3pA4jU4DP37XcsSmDq5G+tbbT4TIqk5B/K6k84Si6C
-cyvHZpsKjECcfIr28jlgst7L7Ljkb+qbXbdTkBgyVcUgt5SjYzBhMA8GA1UdEwEB
-/wQFMAMBAf8wHwYDVR0jBBgwFoAUk+FDY1w8ndYn81LsF7Kpryz3dvgwHQYDVR0O
-BBYEFJPhQ2NcPJ3WJ/NS7Beyqa8s93b4MA4GA1UdDwEB/wQEAwIBBjAKBggqhkjO
-PQQDAwNoADBlAjAdfKR7w4l1M+E7qUW/Runpod3JIha3RxEL2Jq68cgLcFBTApFw
-hVmpHqTm6iMxoAACMQD94vizrxa5HnPEluPBMBnYfubDl94cT7iJLzPrSA8Z94dG
-XSaQpYXFuXqUPoeovQA=
------END CERTIFICATE-----
-
-# Issuer: CN=TWCA CYBER Root CA O=TAIWAN-CA OU=Root CA
-# Subject: CN=TWCA CYBER Root CA O=TAIWAN-CA OU=Root CA
-# Label: "TWCA CYBER Root CA"
-# Serial: 85076849864375384482682434040119489222
-# MD5 Fingerprint: 0b:33:a0:97:52:95:d4:a9:fd:bb:db:6e:a3:55:5b:51
-# SHA1 Fingerprint: f6:b1:1c:1a:83:38:e9:7b:db:b3:a8:c8:33:24:e0:2d:9c:7f:26:66
-# SHA256 Fingerprint: 3f:63:bb:28:14:be:17:4e:c8:b6:43:9c:f0:8d:6d:56:f0:b7:c4:05:88:3a:56:48:a3:34:42:4d:6b:3e:c5:58
------BEGIN CERTIFICATE-----
-MIIFjTCCA3WgAwIBAgIQQAE0jMIAAAAAAAAAATzyxjANBgkqhkiG9w0BAQwFADBQ
-MQswCQYDVQQGEwJUVzESMBAGA1UEChMJVEFJV0FOLUNBMRAwDgYDVQQLEwdSb290
-IENBMRswGQYDVQQDExJUV0NBIENZQkVSIFJvb3QgQ0EwHhcNMjIxMTIyMDY1NDI5
-WhcNNDcxMTIyMTU1OTU5WjBQMQswCQYDVQQGEwJUVzESMBAGA1UEChMJVEFJV0FO
-LUNBMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJUV0NBIENZQkVSIFJvb3Qg
-Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDG+Moe2Qkgfh1sTs6P
-40czRJzHyWmqOlt47nDSkvgEs1JSHWdyKKHfi12VCv7qze33Kc7wb3+szT3vsxxF
-avcokPFhV8UMxKNQXd7UtcsZyoC5dc4pztKFIuwCY8xEMCDa6pFbVuYdHNWdZsc/
-34bKS1PE2Y2yHer43CdTo0fhYcx9tbD47nORxc5zb87uEB8aBs/pJ2DFTxnk684i
-JkXXYJndzk834H/nY62wuFm40AZoNWDTNq5xQwTxaWV4fPMf88oon1oglWa0zbfu
-j3ikRRjpJi+NmykosaS3Om251Bw4ckVYsV7r8Cibt4LK/c/WMw+f+5eesRycnupf
-Xtuq3VTpMCEobY5583WSjCb+3MX2w7DfRFlDo7YDKPYIMKoNM+HvnKkHIuNZW0CP
-2oi3aQiotyMuRAlZN1vH4xfyIutuOVLF3lSnmMlLIJXcRolftBL5hSmO68gnFSDA
-S9TMfAxsNAwmmyYxpjyn9tnQS6Jk/zuZQXLB4HCX8SS7K8R0IrGsayIyJNN4KsDA
-oS/xUgXJP+92ZuJF2A09rZXIx4kmyA+upwMu+8Ff+iDhcK2wZSA3M2Cw1a/XDBzC
-kHDXShi8fgGwsOsVHkQGzaRP6AzRwyAQ4VRlnrZR0Bp2a0JaWHY06rc3Ga4udfmW
-5cFZ95RXKSWNOkyrTZpB0F8mAwIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwDwYD
-VR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBSdhWEUfMFib5do5E83QOGt4A1WNzAd
-BgNVHQ4EFgQUnYVhFHzBYm+XaORPN0DhreANVjcwDQYJKoZIhvcNAQEMBQADggIB
-AGSPesRiDrWIzLjHhg6hShbNcAu3p4ULs3a2D6f/CIsLJc+o1IN1KriWiLb73y0t
-tGlTITVX1olNc79pj3CjYcya2x6a4CD4bLubIp1dhDGaLIrdaqHXKGnK/nZVekZn
-68xDiBaiA9a5F/gZbG0jAn/xX9AKKSM70aoK7akXJlQKTcKlTfjF/biBzysseKNn
-TKkHmvPfXvt89YnNdJdhEGoHK4Fa0o635yDRIG4kqIQnoVesqlVYL9zZyvpoBJ7t
-RCT5dEA7IzOrg1oYJkK2bVS1FmAwbLGg+LhBoF1JSdJlBTrq/p1hvIbZv97Tujqx
-f36SNI7JAG7cmL3c7IAFrQI932XtCwP39xaEBDG6k5TY8hL4iuO/Qq+n1M0RFxbI
-Qh0UqEL20kCGoE8jypZFVmAGzbdVAaYBlGX+bgUJurSkquLvWL69J1bY73NxW0Qz
-8ppy6rBePm6pUlvscG21h483XjyMnM7k8M4MZ0HMzvaAq07MTFb1wWFZk7Q+ptq4
-NxKfKjLji7gh7MMrZQzvIt6IKTtM1/r+t+FHvpw+PoP7UV31aPcuIYXcv/Fa4nzX
-xeSDwWrruoBa3lwtcHb4yOWHh8qgnaHlIhInD0Q9HWzq1MKLL295q39QpsQZp6F6
-t5b5wR9iWqJDB0BeJsas7a5wFsWqynKKTbDPAYsDP27X
------END CERTIFICATE-----
-
-# Issuer: CN=SecureSign Root CA12 O=Cybertrust Japan Co., Ltd.
-# Subject: CN=SecureSign Root CA12 O=Cybertrust Japan Co., Ltd.
-# Label: "SecureSign Root CA12"
-# Serial: 587887345431707215246142177076162061960426065942
-# MD5 Fingerprint: c6:89:ca:64:42:9b:62:08:49:0b:1e:7f:e9:07:3d:e8
-# SHA1 Fingerprint: 7a:22:1e:3d:de:1b:06:ac:9e:c8:47:70:16:8e:3c:e5:f7:6b:06:f4
-# SHA256 Fingerprint: 3f:03:4b:b5:70:4d:44:b2:d0:85:45:a0:20:57:de:93:eb:f3:90:5f:ce:72:1a:cb:c7:30:c0:6d:da:ee:90:4e
------BEGIN CERTIFICATE-----
-MIIDcjCCAlqgAwIBAgIUZvnHwa/swlG07VOX5uaCwysckBYwDQYJKoZIhvcNAQEL
-BQAwUTELMAkGA1UEBhMCSlAxIzAhBgNVBAoTGkN5YmVydHJ1c3QgSmFwYW4gQ28u
-LCBMdGQuMR0wGwYDVQQDExRTZWN1cmVTaWduIFJvb3QgQ0ExMjAeFw0yMDA0MDgw
-NTM2NDZaFw00MDA0MDgwNTM2NDZaMFExCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpD
-eWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEdMBsGA1UEAxMUU2VjdXJlU2lnbiBS
-b290IENBMTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6OcE3emhF
-KxS06+QT61d1I02PJC0W6K6OyX2kVzsqdiUzg2zqMoqUm048luT9Ub+ZyZN+v/mt
-p7JIKwccJ/VMvHASd6SFVLX9kHrko+RRWAPNEHl57muTH2SOa2SroxPjcf59q5zd
-J1M3s6oYwlkm7Fsf0uZlfO+TvdhYXAvA42VvPMfKWeP+bl+sg779XSVOKik71gur
-FzJ4pOE+lEa+Ym6b3kaosRbnhW70CEBFEaCeVESE99g2zvVQR9wsMJvuwPWW0v4J
-hscGWa5Pro4RmHvzC1KqYiaqId+OJTN5lxZJjfU+1UefNzFJM3IFTQy2VYzxV4+K
-h9GtxRESOaCtAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD
-AgEGMB0GA1UdDgQWBBRXNPN0zwRL1SXm8UC2LEzZLemgrTANBgkqhkiG9w0BAQsF
-AAOCAQEAPrvbFxbS8hQBICw4g0utvsqFepq2m2um4fylOqyttCg6r9cBg0krY6Ld
-mmQOmFxv3Y67ilQiLUoT865AQ9tPkbeGGuwAtEGBpE/6aouIs3YIcipJQMPTw4WJ
-mBClnW8Zt7vPemVV2zfrPIpyMpcemik+rY3moxtt9XUa5rBouVui7mlHJzWhhpmA
-8zNL4WukJsPvdFlseqJkth5Ew1DgDzk9qTPxpfPSvWKErI4cqc1avTc7bgoitPQV
-55FYxTpE05Uo2cBl6XLK0A+9H7MV2anjpEcJnuDLN/v9vZfVvhgaaaI5gdka9at/
-yOPiZwud9AzqVN/Ssq+xIvEg37xEHA==
------END CERTIFICATE-----
-
-# Issuer: CN=SecureSign Root CA14 O=Cybertrust Japan Co., Ltd.
-# Subject: CN=SecureSign Root CA14 O=Cybertrust Japan Co., Ltd.
-# Label: "SecureSign Root CA14"
-# Serial: 575790784512929437950770173562378038616896959179
-# MD5 Fingerprint: 71:0d:72:fa:92:19:65:5e:89:04:ac:16:33:f0:bc:d5
-# SHA1 Fingerprint: dd:50:c0:f7:79:b3:64:2e:74:a2:b8:9d:9f:d3:40:dd:bb:f0:f2:4f
-# SHA256 Fingerprint: 4b:00:9c:10:34:49:4f:9a:b5:6b:ba:3b:a1:d6:27:31:fc:4d:20:d8:95:5a:dc:ec:10:a9:25:60:72:61:e3:38
------BEGIN CERTIFICATE-----
-MIIFcjCCA1qgAwIBAgIUZNtaDCBO6Ncpd8hQJ6JaJ90t8sswDQYJKoZIhvcNAQEM
-BQAwUTELMAkGA1UEBhMCSlAxIzAhBgNVBAoTGkN5YmVydHJ1c3QgSmFwYW4gQ28u
-LCBMdGQuMR0wGwYDVQQDExRTZWN1cmVTaWduIFJvb3QgQ0ExNDAeFw0yMDA0MDgw
-NzA2MTlaFw00NTA0MDgwNzA2MTlaMFExCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpD
-eWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEdMBsGA1UEAxMUU2VjdXJlU2lnbiBS
-b290IENBMTQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDF0nqh1oq/
-FjHQmNE6lPxauG4iwWL3pwon71D2LrGeaBLwbCRjOfHw3xDG3rdSINVSW0KZnvOg
-vlIfX8xnbacuUKLBl422+JX1sLrcneC+y9/3OPJH9aaakpUqYllQC6KxNedlsmGy
-6pJxaeQp8E+BgQQ8sqVb1MWoWWd7VRxJq3qdwudzTe/NCcLEVxLbAQ4jeQkHO6Lo
-/IrPj8BGJJw4J+CDnRugv3gVEOuGTgpa/d/aLIJ+7sr2KeH6caH3iGicnPCNvg9J
-kdjqOvn90Ghx2+m1K06Ckm9mH+Dw3EzsytHqunQG+bOEkJTRX45zGRBdAuVwpcAQ
-0BB8b8VYSbSwbprafZX1zNoCr7gsfXmPvkPx+SgojQlD+Ajda8iLLCSxjVIHvXib
-y8posqTdDEx5YMaZ0ZPxMBoH064iwurO8YQJzOAUbn8/ftKChazcqRZOhaBgy/ac
-18izju3Gm5h1DVXoX+WViwKkrkMpKBGk5hIwAUt1ax5mnXkvpXYvHUC0bcl9eQjs
-0Wq2XSqypWa9a4X0dFbD9ed1Uigspf9mR6XU/v6eVL9lfgHWMI+lNpyiUBzuOIAB
-SMbHdPTGrMNASRZhdCyvjG817XsYAFs2PJxQDcqSMxDxJklt33UkN4Ii1+iW/RVL
-ApY+B3KVfqs9TC7XyvDf4Fg/LS8EmjijAQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
-AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUBpOjCl4oaTeqYR3r6/wtbyPk
-86AwDQYJKoZIhvcNAQEMBQADggIBAJaAcgkGfpzMkwQWu6A6jZJOtxEaCnFxEM0E
-rX+lRVAQZk5KQaID2RFPeje5S+LGjzJmdSX7684/AykmjbgWHfYfM25I5uj4V7Ib
-ed87hwriZLoAymzvftAj63iP/2SbNDefNWWipAA9EiOWWF3KY4fGoweITedpdopT
-zfFP7ELyk+OZpDc8h7hi2/DsHzc/N19DzFGdtfCXwreFamgLRB7lUe6TzktuhsHS
-DCRZNhqfLJGP4xjblJUK7ZGqDpncllPjYYPGFrojutzdfhrGe0K22VoF3Jpf1d+4
-2kd92jjbrDnVHmtsKheMYc2xbXIBw8MgAGJoFjHVdqqGuw6qnsb58Nn4DSEC5MUo
-FlkRudlpcyqSeLiSV5sI8jrlL5WwWLdrIBRtFO8KvH7YVdiI2i/6GaX7i+B/OfVy
-K4XELKzvGUWSTLNhB9xNH27SgRNcmvMSZ4PPmz+Ln52kuaiWA3rF7iDeM9ovnhp6
-dB7h7sxaOgTdsxoEqBRjrLdHEoOabPXm6RUVkRqEGQ6UROcSjiVbgGcZ3GOTEAtl
-Lor6CZpO2oYofaphNdgOpygau1LgePhsumywbrmHXumZNTfxPWQrqaA0k89jL9WB
-365jJ6UeTo3cKXhZ+PmhIIynJkBugnLNeLLIjzwec+fBH7/PzqUqm9tEZDKgu39c
-JRNItX+S
------END CERTIFICATE-----
-
-# Issuer: CN=SecureSign Root CA15 O=Cybertrust Japan Co., Ltd.
-# Subject: CN=SecureSign Root CA15 O=Cybertrust Japan Co., Ltd.
-# Label: "SecureSign Root CA15"
-# Serial: 126083514594751269499665114766174399806381178503
-# MD5 Fingerprint: 13:30:fc:c4:62:a6:a9:de:b5:c1:68:af:b5:d2:31:47
-# SHA1 Fingerprint: cb:ba:83:c8:c1:5a:5d:f1:f9:73:6f:ca:d7:ef:28:13:06:4a:07:7d
-# SHA256 Fingerprint: e7:78:f0:f0:95:fe:84:37:29:cd:1a:00:82:17:9e:53:14:a9:c2:91:44:28:05:e1:fb:1d:8f:b6:b8:88:6c:3a
------BEGIN CERTIFICATE-----
-MIICIzCCAamgAwIBAgIUFhXHw9hJp75pDIqI7fBw+d23PocwCgYIKoZIzj0EAwMw
-UTELMAkGA1UEBhMCSlAxIzAhBgNVBAoTGkN5YmVydHJ1c3QgSmFwYW4gQ28uLCBM
-dGQuMR0wGwYDVQQDExRTZWN1cmVTaWduIFJvb3QgQ0ExNTAeFw0yMDA0MDgwODMy
-NTZaFw00NTA0MDgwODMyNTZaMFExCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJl
-cnRydXN0IEphcGFuIENvLiwgTHRkLjEdMBsGA1UEAxMUU2VjdXJlU2lnbiBSb290
-IENBMTUwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQLUHSNZDKZmbPSYAi4Io5GdCx4
-wCtELW1fHcmuS1Iggz24FG1Th2CeX2yF2wYUleDHKP+dX+Sq8bOLbe1PL0vJSpSR
-ZHX+AezB2Ot6lHhWGENfa4HL9rzatAy2KZMIaY+jQjBAMA8GA1UdEwEB/wQFMAMB
-Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTrQciu/NWeUUj1vYv0hyCTQSvT
-9DAKBggqhkjOPQQDAwNoADBlAjEA2S6Jfl5OpBEHvVnCB96rMjhTKkZEBhd6zlHp
-4P9mLQlO4E/0BdGF9jVg3PVys0Z9AjBEmEYagoUeYWmJSwdLZrWeqrqgHkHZAXQ6
-bkU6iYAZezKYVWOr62Nuk22rGwlgMU4=
------END CERTIFICATE-----
-
-# Issuer: CN=D-TRUST BR Root CA 2 2023 O=D-Trust GmbH
-# Subject: CN=D-TRUST BR Root CA 2 2023 O=D-Trust GmbH
-# Label: "D-TRUST BR Root CA 2 2023"
-# Serial: 153168538924886464690566649552453098598
-# MD5 Fingerprint: e1:09:ed:d3:60:d4:56:1b:47:1f:b7:0c:5f:1b:5f:85
-# SHA1 Fingerprint: 2d:b0:70:ee:71:94:af:69:68:17:db:79:ce:58:9f:a0:6b:96:f7:87
-# SHA256 Fingerprint: 05:52:e6:f8:3f:df:65:e8:fa:96:70:e6:66:df:28:a4:e2:13:40:b5:10:cb:e5:25:66:f9:7c:4f:b9:4b:2b:d1
------BEGIN CERTIFICATE-----
-MIIFqTCCA5GgAwIBAgIQczswBEhb2U14LnNLyaHcZjANBgkqhkiG9w0BAQ0FADBI
-MQswCQYDVQQGEwJERTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlE
-LVRSVVNUIEJSIFJvb3QgQ0EgMiAyMDIzMB4XDTIzMDUwOTA4NTYzMVoXDTM4MDUw
-OTA4NTYzMFowSDELMAkGA1UEBhMCREUxFTATBgNVBAoTDEQtVHJ1c3QgR21iSDEi
-MCAGA1UEAxMZRC1UUlVTVCBCUiBSb290IENBIDIgMjAyMzCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBAK7/CVmRgApKaOYkP7in5Mg6CjoWzckjYaCTcfKr
-i3OPoGdlYNJUa2NRb0kz4HIHE304zQaSBylSa053bATTlfrdTIzZXcFhfUvnKLNE
-gXtRr90zsWh81k5M/itoucpmacTsXld/9w3HnDY25QdgrMBM6ghs7wZ8T1soegj8
-k12b9py0i4a6Ibn08OhZWiihNIQaJZG2tY/vsvmA+vk9PBFy2OMvhnbFeSzBqZCT
-Rphny4NqoFAjpzv2gTng7fC5v2Xx2Mt6++9zA84A9H3X4F07ZrjcjrqDy4d2A/wl
-2ecjbwb9Z/Pg/4S8R7+1FhhGaRTMBffb00msa8yr5LULQyReS2tNZ9/WtT5PeB+U
-cSTq3nD88ZP+npNa5JRal1QMNXtfbO4AHyTsA7oC9Xb0n9Sa7YUsOCIvx9gvdhFP
-/Wxc6PWOJ4d/GUohR5AdeY0cW/jPSoXk7bNbjb7EZChdQcRurDhaTyN0dKkSw/bS
-uREVMweR2Ds3OmMwBtHFIjYoYiMQ4EbMl6zWK11kJNXuHA7e+whadSr2Y23OC0K+
-0bpwHJwh5Q8xaRfX/Aq03u2AnMuStIv13lmiWAmlY0cL4UEyNEHZmrHZqLAbWt4N
-DfTisl01gLmB1IRpkQLLddCNxbU9CZEJjxShFHR5PtbJFR2kWVki3PaKRT08EtY+
-XTIvAgMBAAGjgY4wgYswDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUZ5Dw1t61
-GNVGKX5cq/ieCLxklRAwDgYDVR0PAQH/BAQDAgEGMEkGA1UdHwRCMEAwPqA8oDqG
-OGh0dHA6Ly9jcmwuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3RfYnJfcm9vdF9jYV8y
-XzIwMjMuY3JsMA0GCSqGSIb3DQEBDQUAA4ICAQA097N3U9swFrktpSHxQCF16+tI
-FoE9c+CeJyrrd6kTpGoKWloUMz1oH4Guaf2Mn2VsNELZLdB/eBaxOqwjMa1ef67n
-riv6uvw8l5VAk1/DLQOj7aRvU9f6QA4w9QAgLABMjDu0ox+2v5Eyq6+SmNMW5tTR
-VFxDWy6u71cqqLRvpO8NVhTaIasgdp4D/Ca4nj8+AybmTNudX0KEPUUDAxxZiMrc
-LmEkWqTqJwtzEr5SswrPMhfiHocaFpVIbVrg0M8JkiZmkdijYQ6qgYF/6FKC0ULn
-4B0Y+qSFNueG4A3rvNTJ1jxD8V1Jbn6Bm2m1iWKPiFLY1/4nwSPFyysCu7Ff/vtD
-hQNGvl3GyiEm/9cCnnRK3PgTFbGBVzbLZVzRHTF36SXDw7IyN9XxmAnkbWOACKsG
-koHU6XCPpz+y7YaMgmo1yEJagtFSGkUPFaUA8JR7ZSdXOUPPfH/mvTWze/EZTN46
-ls/pdu4D58JDUjxqgejBWoC9EV2Ta/vH5mQ/u2kc6d0li690yVRAysuTEwrt+2aS
-Ecr1wPrYg1UDfNPFIkZ1cGt5SAYqgpq/5usWDiJFAbzdNpQ0qTUmiteXue4Icr80
-knCDgKs4qllo3UCkGJCy89UDyibK79XH4I9TjvAA46jtn/mtd+ArY0+ew+43u3gJ
-hJ65bvspmZDogNOfJA==
------END CERTIFICATE-----
-
-# Issuer: CN=D-TRUST EV Root CA 2 2023 O=D-Trust GmbH
-# Subject: CN=D-TRUST EV Root CA 2 2023 O=D-Trust GmbH
-# Label: "D-TRUST EV Root CA 2 2023"
-# Serial: 139766439402180512324132425437959641711
-# MD5 Fingerprint: 96:b4:78:09:f0:09:cb:77:eb:bb:1b:4d:6f:36:bc:b6
-# SHA1 Fingerprint: a5:5b:d8:47:6c:8f:19:f7:4c:f4:6d:6b:b6:c2:79:82:22:df:54:8b
-# SHA256 Fingerprint: 8e:82:21:b2:e7:d4:00:78:36:a1:67:2f:0d:cc:29:9c:33:bc:07:d3:16:f1:32:fa:1a:20:6d:58:71:50:f1:ce
------BEGIN CERTIFICATE-----
-MIIFqTCCA5GgAwIBAgIQaSYJfoBLTKCnjHhiU19abzANBgkqhkiG9w0BAQ0FADBI
-MQswCQYDVQQGEwJERTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlE
-LVRSVVNUIEVWIFJvb3QgQ0EgMiAyMDIzMB4XDTIzMDUwOTA5MTAzM1oXDTM4MDUw
-OTA5MTAzMlowSDELMAkGA1UEBhMCREUxFTATBgNVBAoTDEQtVHJ1c3QgR21iSDEi
-MCAGA1UEAxMZRC1UUlVTVCBFViBSb290IENBIDIgMjAyMzCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBANiOo4mAC7JXUtypU0w3uX9jFxPvp1sjW2l1sJkK
-F8GLxNuo4MwxusLyzV3pt/gdr2rElYfXR8mV2IIEUD2BCP/kPbOx1sWy/YgJ25yE
-7CUXFId/MHibaljJtnMoPDT3mfd/06b4HEV8rSyMlD/YZxBTfiLNTiVR8CUkNRFe
-EMbsh2aJgWi6zCudR3Mfvc2RpHJqnKIbGKBv7FD0fUDCqDDPvXPIEysQEx6Lmqg6
-lHPTGGkKSv/BAQP/eX+1SH977ugpbzZMlWGG2Pmic4ruri+W7mjNPU0oQvlFKzIb
-RlUWaqZLKfm7lVa/Rh3sHZMdwGWyH6FDrlaeoLGPaxK3YG14C8qKXO0elg6DpkiV
-jTujIcSuWMYAsoS0I6SWhjW42J7YrDRJmGOVxcttSEfi8i4YHtAxq9107PncjLgc
-jmgjutDzUNzPZY9zOjLHfP7KgiJPvo5iR2blzYfi6NUPGJ/lBHJLRjwQ8kTCZFZx
-TnXonMkmdMV9WdEKWw9t/p51HBjGGjp82A0EzM23RWV6sY+4roRIPrN6TagD4uJ+
-ARZZaBhDM7DS3LAaQzXupdqpRlyuhoFBAUp0JuyfBr/CBTdkdXgpaP3F9ev+R/nk
-hbDhezGdpn9yo7nELC7MmVcOIQxFAZRl62UJxmMiCzNJkkg8/M3OsD6Onov4/knF
-NXJHAgMBAAGjgY4wgYswDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUqvyREBuH
-kV8Wub9PS5FeAByxMoAwDgYDVR0PAQH/BAQDAgEGMEkGA1UdHwRCMEAwPqA8oDqG
-OGh0dHA6Ly9jcmwuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3RfZXZfcm9vdF9jYV8y
-XzIwMjMuY3JsMA0GCSqGSIb3DQEBDQUAA4ICAQCTy6UfmRHsmg1fLBWTxj++EI14
-QvBukEdHjqOSMo1wj/Zbjb6JzkcBahsgIIlbyIIQbODnmaprxiqgYzWRaoUlrRc4
-pZt+UPJ26oUFKidBK7GB0aL2QHWpDsvxVUjY7NHss+jOFKE17MJeNRqrphYBBo7q
-3C+jisosketSjl8MmxfPy3MHGcRqwnNU73xDUmPBEcrCRbH0O1P1aa4846XerOhU
-t7KR/aypH/KH5BfGSah82ApB9PI+53c0BFLd6IHyTS9URZ0V4U/M5d40VxDJI3IX
-cI1QcB9WbMy5/zpaT2N6w25lBx2Eof+pDGOJbbJAiDnXH3dotfyc1dZnaVuodNv8
-ifYbMvekJKZ2t0dT741Jj6m2g1qllpBFYfXeA08mD6iL8AOWsKwV0HFaanuU5nCT
-2vFp4LJiTZ6P/4mdm13NRemUAiKN4DV/6PEEeXFsVIP4M7kFMhtYVRFP0OUnR3Hs
-7dpn1mKmS00PaaLJvOwiS5THaJQXfuKOKD62xur1NGyfN4gHONuGcfrNlUhDbqNP
-gofXNJhuS5N5YHVpD/Aa1VP6IQzCP+k/HxiMkl14p3ZnGbuy6n/pcAlWVqOwDAst
-Nl7F6cTVg8uGF5csbBNvh1qvSaYd2804BC5f4ko1Di1L+KIkBI3Y4WNeApI02phh
-XBxvWHZks/wCuPWdCg==
------END CERTIFICATE-----
diff --git a/lib/certifi/core.py b/lib/certifi/core.py
deleted file mode 100644
index 91f538bb..00000000
--- a/lib/certifi/core.py
+++ /dev/null
@@ -1,114 +0,0 @@
-"""
-certifi.py
-~~~~~~~~~~
-
-This module returns the installation location of cacert.pem or its contents.
-"""
-import sys
-import atexit
-
-def exit_cacert_ctx() -> None:
-    _CACERT_CTX.__exit__(None, None, None)  # type: ignore[union-attr]
-
-
-if sys.version_info >= (3, 11):
-
-    from importlib.resources import as_file, files
-
-    _CACERT_CTX = None
-    _CACERT_PATH = None
-
-    def where() -> str:
-        # This is slightly terrible, but we want to delay extracting the file
-        # in cases where we're inside of a zipimport situation until someone
-        # actually calls where(), but we don't want to re-extract the file
-        # on every call of where(), so we'll do it once then store it in a
-        # global variable.
-        global _CACERT_CTX
-        global _CACERT_PATH
-        if _CACERT_PATH is None:
-            # This is slightly janky, the importlib.resources API wants you to
-            # manage the cleanup of this file, so it doesn't actually return a
-            # path, it returns a context manager that will give you the path
-            # when you enter it and will do any cleanup when you leave it. In
-            # the common case of not needing a temporary file, it will just
-            # return the file system location and the __exit__() is a no-op.
-            #
-            # We also have to hold onto the actual context manager, because
-            # it will do the cleanup whenever it gets garbage collected, so
-            # we will also store that at the global level as well.
-            _CACERT_CTX = as_file(files("certifi").joinpath("cacert.pem"))
-            _CACERT_PATH = str(_CACERT_CTX.__enter__())
-            atexit.register(exit_cacert_ctx)
-
-        return _CACERT_PATH
-
-    def contents() -> str:
-        return files("certifi").joinpath("cacert.pem").read_text(encoding="ascii")
-
-elif sys.version_info >= (3, 7):
-
-    from importlib.resources import path as get_path, read_text
-
-    _CACERT_CTX = None
-    _CACERT_PATH = None
-
-    def where() -> str:
-        # This is slightly terrible, but we want to delay extracting the
-        # file in cases where we're inside of a zipimport situation until
-        # someone actually calls where(), but we don't want to re-extract
-        # the file on every call of where(), so we'll do it once then store
-        # it in a global variable.
-        global _CACERT_CTX
-        global _CACERT_PATH
-        if _CACERT_PATH is None:
-            # This is slightly janky, the importlib.resources API wants you
-            # to manage the cleanup of this file, so it doesn't actually
-            # return a path, it returns a context manager that will give
-            # you the path when you enter it and will do any cleanup when
-            # you leave it. In the common case of not needing a temporary
-            # file, it will just return the file system location and the
-            # __exit__() is a no-op.
-            #
-            # We also have to hold onto the actual context manager, because
-            # it will do the cleanup whenever it gets garbage collected, so
-            # we will also store that at the global level as well.
-            _CACERT_CTX = get_path("certifi", "cacert.pem")
-            _CACERT_PATH = str(_CACERT_CTX.__enter__())
-            atexit.register(exit_cacert_ctx)
-
-        return _CACERT_PATH
-
-    def contents() -> str:
-        return read_text("certifi", "cacert.pem", encoding="ascii")
-
-else:
-    import os
-    import types
-    from typing import Union
-
-    Package = Union[types.ModuleType, str]
-    Resource = Union[str, "os.PathLike"]
-
-    # This fallback will work for Python versions prior to 3.7 that lack the
-    # importlib.resources module but relies on the existing `where` function
-    # so won't address issues with environments like PyOxidizer that don't set
-    # __file__ on modules.
-    def read_text(
-        package: Package,
-        resource: Resource,
-        encoding: str = 'utf-8',
-        errors: str = 'strict'
-    ) -> str:
-        with open(where(), encoding=encoding) as data:
-            return data.read()
-
-    # If we don't have importlib.resources, then we will just do the old logic
-    # of assuming we're on the filesystem and munge the path directly.
-    def where() -> str:
-        f = os.path.dirname(__file__)
-
-        return os.path.join(f, "cacert.pem")
-
-    def contents() -> str:
-        return read_text("certifi", "cacert.pem", encoding="ascii")
diff --git a/lib/certifi/py.typed b/lib/certifi/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/charset_normalizer/__init__.py b/lib/charset_normalizer/__init__.py
deleted file mode 100644
index 0d3a3799..00000000
--- a/lib/charset_normalizer/__init__.py
+++ /dev/null
@@ -1,48 +0,0 @@
-"""
-Charset-Normalizer
-~~~~~~~~~~~~~~
-The Real First Universal Charset Detector.
-A library that helps you read text from an unknown charset encoding.
-Motivated by chardet, This package is trying to resolve the issue by taking a new approach.
-All IANA character set names for which the Python core library provides codecs are supported.
-
-Basic usage:
-   >>> from charset_normalizer import from_bytes
-   >>> results = from_bytes('B�еки човек има право на образование. Oбразованието!'.encode('utf_8'))
-   >>> best_guess = results.best()
-   >>> str(best_guess)
-   'B�еки човек има право на образование. Oбразованието!'
-
-Others methods and usages are available - see the full documentation
-at <https://github.com/Ousret/charset_normalizer>.
-:copyright: (c) 2021 by Ahmed TAHRI
-:license: MIT, see LICENSE for more details.
-"""
-
-from __future__ import annotations
-
-import logging
-
-from .api import from_bytes, from_fp, from_path, is_binary
-from .legacy import detect
-from .models import CharsetMatch, CharsetMatches
-from .utils import set_logging_handler
-from .version import VERSION, __version__
-
-__all__ = (
-    "from_fp",
-    "from_path",
-    "from_bytes",
-    "is_binary",
-    "detect",
-    "CharsetMatch",
-    "CharsetMatches",
-    "__version__",
-    "VERSION",
-    "set_logging_handler",
-)
-
-# Attach a NullHandler to the top level logger by default
-# https://docs.python.org/3.3/howto/logging.html#configuring-logging-for-a-library
-
-logging.getLogger("charset_normalizer").addHandler(logging.NullHandler())
diff --git a/lib/charset_normalizer/__main__.py b/lib/charset_normalizer/__main__.py
deleted file mode 100644
index e0e76f7b..00000000
--- a/lib/charset_normalizer/__main__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from __future__ import annotations
-
-from .cli import cli_detect
-
-if __name__ == "__main__":
-    cli_detect()
diff --git a/lib/charset_normalizer/api.py b/lib/charset_normalizer/api.py
deleted file mode 100644
index 2c8c0618..00000000
--- a/lib/charset_normalizer/api.py
+++ /dev/null
@@ -1,668 +0,0 @@
-from __future__ import annotations
-
-import logging
-from os import PathLike
-from typing import BinaryIO
-
-from .cd import (
-    coherence_ratio,
-    encoding_languages,
-    mb_encoding_languages,
-    merge_coherence_ratios,
-)
-from .constant import IANA_SUPPORTED, TOO_BIG_SEQUENCE, TOO_SMALL_SEQUENCE, TRACE
-from .md import mess_ratio
-from .models import CharsetMatch, CharsetMatches
-from .utils import (
-    any_specified_encoding,
-    cut_sequence_chunks,
-    iana_name,
-    identify_sig_or_bom,
-    is_cp_similar,
-    is_multi_byte_encoding,
-    should_strip_sig_or_bom,
-)
-
-logger = logging.getLogger("charset_normalizer")
-explain_handler = logging.StreamHandler()
-explain_handler.setFormatter(
-    logging.Formatter("%(asctime)s | %(levelname)s | %(message)s")
-)
-
-
-def from_bytes(
-    sequences: bytes | bytearray,
-    steps: int = 5,
-    chunk_size: int = 512,
-    threshold: float = 0.2,
-    cp_isolation: list[str] | None = None,
-    cp_exclusion: list[str] | None = None,
-    preemptive_behaviour: bool = True,
-    explain: bool = False,
-    language_threshold: float = 0.1,
-    enable_fallback: bool = True,
-) -> CharsetMatches:
-    """
-    Given a raw bytes sequence, return the best possibles charset usable to render str objects.
-    If there is no results, it is a strong indicator that the source is binary/not text.
-    By default, the process will extract 5 blocks of 512o each to assess the mess and coherence of a given sequence.
-    And will give up a particular code page after 20% of measured mess. Those criteria are customizable at will.
-
-    The preemptive behavior DOES NOT replace the traditional detection workflow, it prioritize a particular code page
-    but never take it for granted. Can improve the performance.
-
-    You may want to focus your attention to some code page or/and not others, use cp_isolation and cp_exclusion for that
-    purpose.
-
-    This function will strip the SIG in the payload/sequence every time except on UTF-16, UTF-32.
-    By default the library does not setup any handler other than the NullHandler, if you choose to set the 'explain'
-    toggle to True it will alter the logger configuration to add a StreamHandler that is suitable for debugging.
-    Custom logging format and handler can be set manually.
-    """
-
-    if not isinstance(sequences, (bytearray, bytes)):
-        raise TypeError(
-            "Expected object of type bytes or bytearray, got: {}".format(
-                type(sequences)
-            )
-        )
-
-    if explain:
-        previous_logger_level: int = logger.level
-        logger.addHandler(explain_handler)
-        logger.setLevel(TRACE)
-
-    length: int = len(sequences)
-
-    if length == 0:
-        logger.debug("Encoding detection on empty bytes, assuming utf_8 intention.")
-        if explain:  # Defensive: ensure exit path clean handler
-            logger.removeHandler(explain_handler)
-            logger.setLevel(previous_logger_level or logging.WARNING)
-        return CharsetMatches([CharsetMatch(sequences, "utf_8", 0.0, False, [], "")])
-
-    if cp_isolation is not None:
-        logger.log(
-            TRACE,
-            "cp_isolation is set. use this flag for debugging purpose. "
-            "limited list of encoding allowed : %s.",
-            ", ".join(cp_isolation),
-        )
-        cp_isolation = [iana_name(cp, False) for cp in cp_isolation]
-    else:
-        cp_isolation = []
-
-    if cp_exclusion is not None:
-        logger.log(
-            TRACE,
-            "cp_exclusion is set. use this flag for debugging purpose. "
-            "limited list of encoding excluded : %s.",
-            ", ".join(cp_exclusion),
-        )
-        cp_exclusion = [iana_name(cp, False) for cp in cp_exclusion]
-    else:
-        cp_exclusion = []
-
-    if length <= (chunk_size * steps):
-        logger.log(
-            TRACE,
-            "override steps (%i) and chunk_size (%i) as content does not fit (%i byte(s) given) parameters.",
-            steps,
-            chunk_size,
-            length,
-        )
-        steps = 1
-        chunk_size = length
-
-    if steps > 1 and length / steps < chunk_size:
-        chunk_size = int(length / steps)
-
-    is_too_small_sequence: bool = len(sequences) < TOO_SMALL_SEQUENCE
-    is_too_large_sequence: bool = len(sequences) >= TOO_BIG_SEQUENCE
-
-    if is_too_small_sequence:
-        logger.log(
-            TRACE,
-            "Trying to detect encoding from a tiny portion of ({}) byte(s).".format(
-                length
-            ),
-        )
-    elif is_too_large_sequence:
-        logger.log(
-            TRACE,
-            "Using lazy str decoding because the payload is quite large, ({}) byte(s).".format(
-                length
-            ),
-        )
-
-    prioritized_encodings: list[str] = []
-
-    specified_encoding: str | None = (
-        any_specified_encoding(sequences) if preemptive_behaviour else None
-    )
-
-    if specified_encoding is not None:
-        prioritized_encodings.append(specified_encoding)
-        logger.log(
-            TRACE,
-            "Detected declarative mark in sequence. Priority +1 given for %s.",
-            specified_encoding,
-        )
-
-    tested: set[str] = set()
-    tested_but_hard_failure: list[str] = []
-    tested_but_soft_failure: list[str] = []
-
-    fallback_ascii: CharsetMatch | None = None
-    fallback_u8: CharsetMatch | None = None
-    fallback_specified: CharsetMatch | None = None
-
-    results: CharsetMatches = CharsetMatches()
-
-    early_stop_results: CharsetMatches = CharsetMatches()
-
-    sig_encoding, sig_payload = identify_sig_or_bom(sequences)
-
-    if sig_encoding is not None:
-        prioritized_encodings.append(sig_encoding)
-        logger.log(
-            TRACE,
-            "Detected a SIG or BOM mark on first %i byte(s). Priority +1 given for %s.",
-            len(sig_payload),
-            sig_encoding,
-        )
-
-    prioritized_encodings.append("ascii")
-
-    if "utf_8" not in prioritized_encodings:
-        prioritized_encodings.append("utf_8")
-
-    for encoding_iana in prioritized_encodings + IANA_SUPPORTED:
-        if cp_isolation and encoding_iana not in cp_isolation:
-            continue
-
-        if cp_exclusion and encoding_iana in cp_exclusion:
-            continue
-
-        if encoding_iana in tested:
-            continue
-
-        tested.add(encoding_iana)
-
-        decoded_payload: str | None = None
-        bom_or_sig_available: bool = sig_encoding == encoding_iana
-        strip_sig_or_bom: bool = bom_or_sig_available and should_strip_sig_or_bom(
-            encoding_iana
-        )
-
-        if encoding_iana in {"utf_16", "utf_32"} and not bom_or_sig_available:
-            logger.log(
-                TRACE,
-                "Encoding %s won't be tested as-is because it require a BOM. Will try some sub-encoder LE/BE.",
-                encoding_iana,
-            )
-            continue
-        if encoding_iana in {"utf_7"} and not bom_or_sig_available:
-            logger.log(
-                TRACE,
-                "Encoding %s won't be tested as-is because detection is unreliable without BOM/SIG.",
-                encoding_iana,
-            )
-            continue
-
-        try:
-            is_multi_byte_decoder: bool = is_multi_byte_encoding(encoding_iana)
-        except (ModuleNotFoundError, ImportError):
-            logger.log(
-                TRACE,
-                "Encoding %s does not provide an IncrementalDecoder",
-                encoding_iana,
-            )
-            continue
-
-        try:
-            if is_too_large_sequence and is_multi_byte_decoder is False:
-                str(
-                    (
-                        sequences[: int(50e4)]
-                        if strip_sig_or_bom is False
-                        else sequences[len(sig_payload) : int(50e4)]
-                    ),
-                    encoding=encoding_iana,
-                )
-            else:
-                decoded_payload = str(
-                    (
-                        sequences
-                        if strip_sig_or_bom is False
-                        else sequences[len(sig_payload) :]
-                    ),
-                    encoding=encoding_iana,
-                )
-        except (UnicodeDecodeError, LookupError) as e:
-            if not isinstance(e, LookupError):
-                logger.log(
-                    TRACE,
-                    "Code page %s does not fit given bytes sequence at ALL. %s",
-                    encoding_iana,
-                    str(e),
-                )
-            tested_but_hard_failure.append(encoding_iana)
-            continue
-
-        similar_soft_failure_test: bool = False
-
-        for encoding_soft_failed in tested_but_soft_failure:
-            if is_cp_similar(encoding_iana, encoding_soft_failed):
-                similar_soft_failure_test = True
-                break
-
-        if similar_soft_failure_test:
-            logger.log(
-                TRACE,
-                "%s is deemed too similar to code page %s and was consider unsuited already. Continuing!",
-                encoding_iana,
-                encoding_soft_failed,
-            )
-            continue
-
-        r_ = range(
-            0 if not bom_or_sig_available else len(sig_payload),
-            length,
-            int(length / steps),
-        )
-
-        multi_byte_bonus: bool = (
-            is_multi_byte_decoder
-            and decoded_payload is not None
-            and len(decoded_payload) < length
-        )
-
-        if multi_byte_bonus:
-            logger.log(
-                TRACE,
-                "Code page %s is a multi byte encoding table and it appear that at least one character "
-                "was encoded using n-bytes.",
-                encoding_iana,
-            )
-
-        max_chunk_gave_up: int = int(len(r_) / 4)
-
-        max_chunk_gave_up = max(max_chunk_gave_up, 2)
-        early_stop_count: int = 0
-        lazy_str_hard_failure = False
-
-        md_chunks: list[str] = []
-        md_ratios = []
-
-        try:
-            for chunk in cut_sequence_chunks(
-                sequences,
-                encoding_iana,
-                r_,
-                chunk_size,
-                bom_or_sig_available,
-                strip_sig_or_bom,
-                sig_payload,
-                is_multi_byte_decoder,
-                decoded_payload,
-            ):
-                md_chunks.append(chunk)
-
-                md_ratios.append(
-                    mess_ratio(
-                        chunk,
-                        threshold,
-                        explain is True and 1 <= len(cp_isolation) <= 2,
-                    )
-                )
-
-                if md_ratios[-1] >= threshold:
-                    early_stop_count += 1
-
-                if (early_stop_count >= max_chunk_gave_up) or (
-                    bom_or_sig_available and strip_sig_or_bom is False
-                ):
-                    break
-        except (
-            UnicodeDecodeError
-        ) as e:  # Lazy str loading may have missed something there
-            logger.log(
-                TRACE,
-                "LazyStr Loading: After MD chunk decode, code page %s does not fit given bytes sequence at ALL. %s",
-                encoding_iana,
-                str(e),
-            )
-            early_stop_count = max_chunk_gave_up
-            lazy_str_hard_failure = True
-
-        # We might want to check the sequence again with the whole content
-        # Only if initial MD tests passes
-        if (
-            not lazy_str_hard_failure
-            and is_too_large_sequence
-            and not is_multi_byte_decoder
-        ):
-            try:
-                sequences[int(50e3) :].decode(encoding_iana, errors="strict")
-            except UnicodeDecodeError as e:
-                logger.log(
-                    TRACE,
-                    "LazyStr Loading: After final lookup, code page %s does not fit given bytes sequence at ALL. %s",
-                    encoding_iana,
-                    str(e),
-                )
-                tested_but_hard_failure.append(encoding_iana)
-                continue
-
-        mean_mess_ratio: float = sum(md_ratios) / len(md_ratios) if md_ratios else 0.0
-        if mean_mess_ratio >= threshold or early_stop_count >= max_chunk_gave_up:
-            tested_but_soft_failure.append(encoding_iana)
-            logger.log(
-                TRACE,
-                "%s was excluded because of initial chaos probing. Gave up %i time(s). "
-                "Computed mean chaos is %f %%.",
-                encoding_iana,
-                early_stop_count,
-                round(mean_mess_ratio * 100, ndigits=3),
-            )
-            # Preparing those fallbacks in case we got nothing.
-            if (
-                enable_fallback
-                and encoding_iana in ["ascii", "utf_8", specified_encoding]
-                and not lazy_str_hard_failure
-            ):
-                fallback_entry = CharsetMatch(
-                    sequences,
-                    encoding_iana,
-                    threshold,
-                    False,
-                    [],
-                    decoded_payload,
-                    preemptive_declaration=specified_encoding,
-                )
-                if encoding_iana == specified_encoding:
-                    fallback_specified = fallback_entry
-                elif encoding_iana == "ascii":
-                    fallback_ascii = fallback_entry
-                else:
-                    fallback_u8 = fallback_entry
-            continue
-
-        logger.log(
-            TRACE,
-            "%s passed initial chaos probing. Mean measured chaos is %f %%",
-            encoding_iana,
-            round(mean_mess_ratio * 100, ndigits=3),
-        )
-
-        if not is_multi_byte_decoder:
-            target_languages: list[str] = encoding_languages(encoding_iana)
-        else:
-            target_languages = mb_encoding_languages(encoding_iana)
-
-        if target_languages:
-            logger.log(
-                TRACE,
-                "{} should target any language(s) of {}".format(
-                    encoding_iana, str(target_languages)
-                ),
-            )
-
-        cd_ratios = []
-
-        # We shall skip the CD when its about ASCII
-        # Most of the time its not relevant to run "language-detection" on it.
-        if encoding_iana != "ascii":
-            for chunk in md_chunks:
-                chunk_languages = coherence_ratio(
-                    chunk,
-                    language_threshold,
-                    ",".join(target_languages) if target_languages else None,
-                )
-
-                cd_ratios.append(chunk_languages)
-
-        cd_ratios_merged = merge_coherence_ratios(cd_ratios)
-
-        if cd_ratios_merged:
-            logger.log(
-                TRACE,
-                "We detected language {} using {}".format(
-                    cd_ratios_merged, encoding_iana
-                ),
-            )
-
-        current_match = CharsetMatch(
-            sequences,
-            encoding_iana,
-            mean_mess_ratio,
-            bom_or_sig_available,
-            cd_ratios_merged,
-            (
-                decoded_payload
-                if (
-                    is_too_large_sequence is False
-                    or encoding_iana in [specified_encoding, "ascii", "utf_8"]
-                )
-                else None
-            ),
-            preemptive_declaration=specified_encoding,
-        )
-
-        results.append(current_match)
-
-        if (
-            encoding_iana in [specified_encoding, "ascii", "utf_8"]
-            and mean_mess_ratio < 0.1
-        ):
-            # If md says nothing to worry about, then... stop immediately!
-            if mean_mess_ratio == 0.0:
-                logger.debug(
-                    "Encoding detection: %s is most likely the one.",
-                    current_match.encoding,
-                )
-                if explain:  # Defensive: ensure exit path clean handler
-                    logger.removeHandler(explain_handler)
-                    logger.setLevel(previous_logger_level)
-                return CharsetMatches([current_match])
-
-            early_stop_results.append(current_match)
-
-        if (
-            len(early_stop_results)
-            and (specified_encoding is None or specified_encoding in tested)
-            and "ascii" in tested
-            and "utf_8" in tested
-        ):
-            probable_result: CharsetMatch = early_stop_results.best()  # type: ignore[assignment]
-            logger.debug(
-                "Encoding detection: %s is most likely the one.",
-                probable_result.encoding,
-            )
-            if explain:  # Defensive: ensure exit path clean handler
-                logger.removeHandler(explain_handler)
-                logger.setLevel(previous_logger_level)
-
-            return CharsetMatches([probable_result])
-
-        if encoding_iana == sig_encoding:
-            logger.debug(
-                "Encoding detection: %s is most likely the one as we detected a BOM or SIG within "
-                "the beginning of the sequence.",
-                encoding_iana,
-            )
-            if explain:  # Defensive: ensure exit path clean handler
-                logger.removeHandler(explain_handler)
-                logger.setLevel(previous_logger_level)
-            return CharsetMatches([results[encoding_iana]])
-
-    if len(results) == 0:
-        if fallback_u8 or fallback_ascii or fallback_specified:
-            logger.log(
-                TRACE,
-                "Nothing got out of the detection process. Using ASCII/UTF-8/Specified fallback.",
-            )
-
-        if fallback_specified:
-            logger.debug(
-                "Encoding detection: %s will be used as a fallback match",
-                fallback_specified.encoding,
-            )
-            results.append(fallback_specified)
-        elif (
-            (fallback_u8 and fallback_ascii is None)
-            or (
-                fallback_u8
-                and fallback_ascii
-                and fallback_u8.fingerprint != fallback_ascii.fingerprint
-            )
-            or (fallback_u8 is not None)
-        ):
-            logger.debug("Encoding detection: utf_8 will be used as a fallback match")
-            results.append(fallback_u8)
-        elif fallback_ascii:
-            logger.debug("Encoding detection: ascii will be used as a fallback match")
-            results.append(fallback_ascii)
-
-    if results:
-        logger.debug(
-            "Encoding detection: Found %s as plausible (best-candidate) for content. With %i alternatives.",
-            results.best().encoding,  # type: ignore
-            len(results) - 1,
-        )
-    else:
-        logger.debug("Encoding detection: Unable to determine any suitable charset.")
-
-    if explain:
-        logger.removeHandler(explain_handler)
-        logger.setLevel(previous_logger_level)
-
-    return results
-
-
-def from_fp(
-    fp: BinaryIO,
-    steps: int = 5,
-    chunk_size: int = 512,
-    threshold: float = 0.20,
-    cp_isolation: list[str] | None = None,
-    cp_exclusion: list[str] | None = None,
-    preemptive_behaviour: bool = True,
-    explain: bool = False,
-    language_threshold: float = 0.1,
-    enable_fallback: bool = True,
-) -> CharsetMatches:
-    """
-    Same thing than the function from_bytes but using a file pointer that is already ready.
-    Will not close the file pointer.
-    """
-    return from_bytes(
-        fp.read(),
-        steps,
-        chunk_size,
-        threshold,
-        cp_isolation,
-        cp_exclusion,
-        preemptive_behaviour,
-        explain,
-        language_threshold,
-        enable_fallback,
-    )
-
-
-def from_path(
-    path: str | bytes | PathLike,  # type: ignore[type-arg]
-    steps: int = 5,
-    chunk_size: int = 512,
-    threshold: float = 0.20,
-    cp_isolation: list[str] | None = None,
-    cp_exclusion: list[str] | None = None,
-    preemptive_behaviour: bool = True,
-    explain: bool = False,
-    language_threshold: float = 0.1,
-    enable_fallback: bool = True,
-) -> CharsetMatches:
-    """
-    Same thing than the function from_bytes but with one extra step. Opening and reading given file path in binary mode.
-    Can raise IOError.
-    """
-    with open(path, "rb") as fp:
-        return from_fp(
-            fp,
-            steps,
-            chunk_size,
-            threshold,
-            cp_isolation,
-            cp_exclusion,
-            preemptive_behaviour,
-            explain,
-            language_threshold,
-            enable_fallback,
-        )
-
-
-def is_binary(
-    fp_or_path_or_payload: PathLike | str | BinaryIO | bytes,  # type: ignore[type-arg]
-    steps: int = 5,
-    chunk_size: int = 512,
-    threshold: float = 0.20,
-    cp_isolation: list[str] | None = None,
-    cp_exclusion: list[str] | None = None,
-    preemptive_behaviour: bool = True,
-    explain: bool = False,
-    language_threshold: float = 0.1,
-    enable_fallback: bool = False,
-) -> bool:
-    """
-    Detect if the given input (file, bytes, or path) points to a binary file. aka. not a string.
-    Based on the same main heuristic algorithms and default kwargs at the sole exception that fallbacks match
-    are disabled to be stricter around ASCII-compatible but unlikely to be a string.
-    """
-    if isinstance(fp_or_path_or_payload, (str, PathLike)):
-        guesses = from_path(
-            fp_or_path_or_payload,
-            steps=steps,
-            chunk_size=chunk_size,
-            threshold=threshold,
-            cp_isolation=cp_isolation,
-            cp_exclusion=cp_exclusion,
-            preemptive_behaviour=preemptive_behaviour,
-            explain=explain,
-            language_threshold=language_threshold,
-            enable_fallback=enable_fallback,
-        )
-    elif isinstance(
-        fp_or_path_or_payload,
-        (
-            bytes,
-            bytearray,
-        ),
-    ):
-        guesses = from_bytes(
-            fp_or_path_or_payload,
-            steps=steps,
-            chunk_size=chunk_size,
-            threshold=threshold,
-            cp_isolation=cp_isolation,
-            cp_exclusion=cp_exclusion,
-            preemptive_behaviour=preemptive_behaviour,
-            explain=explain,
-            language_threshold=language_threshold,
-            enable_fallback=enable_fallback,
-        )
-    else:
-        guesses = from_fp(
-            fp_or_path_or_payload,
-            steps=steps,
-            chunk_size=chunk_size,
-            threshold=threshold,
-            cp_isolation=cp_isolation,
-            cp_exclusion=cp_exclusion,
-            preemptive_behaviour=preemptive_behaviour,
-            explain=explain,
-            language_threshold=language_threshold,
-            enable_fallback=enable_fallback,
-        )
-
-    return not guesses
diff --git a/lib/charset_normalizer/cd.py b/lib/charset_normalizer/cd.py
deleted file mode 100644
index 71a3ed51..00000000
--- a/lib/charset_normalizer/cd.py
+++ /dev/null
@@ -1,395 +0,0 @@
-from __future__ import annotations
-
-import importlib
-from codecs import IncrementalDecoder
-from collections import Counter
-from functools import lru_cache
-from typing import Counter as TypeCounter
-
-from .constant import (
-    FREQUENCIES,
-    KO_NAMES,
-    LANGUAGE_SUPPORTED_COUNT,
-    TOO_SMALL_SEQUENCE,
-    ZH_NAMES,
-)
-from .md import is_suspiciously_successive_range
-from .models import CoherenceMatches
-from .utils import (
-    is_accentuated,
-    is_latin,
-    is_multi_byte_encoding,
-    is_unicode_range_secondary,
-    unicode_range,
-)
-
-
-def encoding_unicode_range(iana_name: str) -> list[str]:
-    """
-    Return associated unicode ranges in a single byte code page.
-    """
-    if is_multi_byte_encoding(iana_name):
-        raise OSError("Function not supported on multi-byte code page")
-
-    decoder = importlib.import_module(f"encodings.{iana_name}").IncrementalDecoder
-
-    p: IncrementalDecoder = decoder(errors="ignore")
-    seen_ranges: dict[str, int] = {}
-    character_count: int = 0
-
-    for i in range(0x40, 0xFF):
-        chunk: str = p.decode(bytes([i]))
-
-        if chunk:
-            character_range: str | None = unicode_range(chunk)
-
-            if character_range is None:
-                continue
-
-            if is_unicode_range_secondary(character_range) is False:
-                if character_range not in seen_ranges:
-                    seen_ranges[character_range] = 0
-                seen_ranges[character_range] += 1
-                character_count += 1
-
-    return sorted(
-        [
-            character_range
-            for character_range in seen_ranges
-            if seen_ranges[character_range] / character_count >= 0.15
-        ]
-    )
-
-
-def unicode_range_languages(primary_range: str) -> list[str]:
-    """
-    Return inferred languages used with a unicode range.
-    """
-    languages: list[str] = []
-
-    for language, characters in FREQUENCIES.items():
-        for character in characters:
-            if unicode_range(character) == primary_range:
-                languages.append(language)
-                break
-
-    return languages
-
-
-@lru_cache()
-def encoding_languages(iana_name: str) -> list[str]:
-    """
-    Single-byte encoding language association. Some code page are heavily linked to particular language(s).
-    This function does the correspondence.
-    """
-    unicode_ranges: list[str] = encoding_unicode_range(iana_name)
-    primary_range: str | None = None
-
-    for specified_range in unicode_ranges:
-        if "Latin" not in specified_range:
-            primary_range = specified_range
-            break
-
-    if primary_range is None:
-        return ["Latin Based"]
-
-    return unicode_range_languages(primary_range)
-
-
-@lru_cache()
-def mb_encoding_languages(iana_name: str) -> list[str]:
-    """
-    Multi-byte encoding language association. Some code page are heavily linked to particular language(s).
-    This function does the correspondence.
-    """
-    if (
-        iana_name.startswith("shift_")
-        or iana_name.startswith("iso2022_jp")
-        or iana_name.startswith("euc_j")
-        or iana_name == "cp932"
-    ):
-        return ["Japanese"]
-    if iana_name.startswith("gb") or iana_name in ZH_NAMES:
-        return ["Chinese"]
-    if iana_name.startswith("iso2022_kr") or iana_name in KO_NAMES:
-        return ["Korean"]
-
-    return []
-
-
-@lru_cache(maxsize=LANGUAGE_SUPPORTED_COUNT)
-def get_target_features(language: str) -> tuple[bool, bool]:
-    """
-    Determine main aspects from a supported language if it contains accents and if is pure Latin.
-    """
-    target_have_accents: bool = False
-    target_pure_latin: bool = True
-
-    for character in FREQUENCIES[language]:
-        if not target_have_accents and is_accentuated(character):
-            target_have_accents = True
-        if target_pure_latin and is_latin(character) is False:
-            target_pure_latin = False
-
-    return target_have_accents, target_pure_latin
-
-
-def alphabet_languages(
-    characters: list[str], ignore_non_latin: bool = False
-) -> list[str]:
-    """
-    Return associated languages associated to given characters.
-    """
-    languages: list[tuple[str, float]] = []
-
-    source_have_accents = any(is_accentuated(character) for character in characters)
-
-    for language, language_characters in FREQUENCIES.items():
-        target_have_accents, target_pure_latin = get_target_features(language)
-
-        if ignore_non_latin and target_pure_latin is False:
-            continue
-
-        if target_have_accents is False and source_have_accents:
-            continue
-
-        character_count: int = len(language_characters)
-
-        character_match_count: int = len(
-            [c for c in language_characters if c in characters]
-        )
-
-        ratio: float = character_match_count / character_count
-
-        if ratio >= 0.2:
-            languages.append((language, ratio))
-
-    languages = sorted(languages, key=lambda x: x[1], reverse=True)
-
-    return [compatible_language[0] for compatible_language in languages]
-
-
-def characters_popularity_compare(
-    language: str, ordered_characters: list[str]
-) -> float:
-    """
-    Determine if a ordered characters list (by occurrence from most appearance to rarest) match a particular language.
-    The result is a ratio between 0. (absolutely no correspondence) and 1. (near perfect fit).
-    Beware that is function is not strict on the match in order to ease the detection. (Meaning close match is 1.)
-    """
-    if language not in FREQUENCIES:
-        raise ValueError(f"{language} not available")
-
-    character_approved_count: int = 0
-    FREQUENCIES_language_set = set(FREQUENCIES[language])
-
-    ordered_characters_count: int = len(ordered_characters)
-    target_language_characters_count: int = len(FREQUENCIES[language])
-
-    large_alphabet: bool = target_language_characters_count > 26
-
-    for character, character_rank in zip(
-        ordered_characters, range(0, ordered_characters_count)
-    ):
-        if character not in FREQUENCIES_language_set:
-            continue
-
-        character_rank_in_language: int = FREQUENCIES[language].index(character)
-        expected_projection_ratio: float = (
-            target_language_characters_count / ordered_characters_count
-        )
-        character_rank_projection: int = int(character_rank * expected_projection_ratio)
-
-        if (
-            large_alphabet is False
-            and abs(character_rank_projection - character_rank_in_language) > 4
-        ):
-            continue
-
-        if (
-            large_alphabet is True
-            and abs(character_rank_projection - character_rank_in_language)
-            < target_language_characters_count / 3
-        ):
-            character_approved_count += 1
-            continue
-
-        characters_before_source: list[str] = FREQUENCIES[language][
-            0:character_rank_in_language
-        ]
-        characters_after_source: list[str] = FREQUENCIES[language][
-            character_rank_in_language:
-        ]
-        characters_before: list[str] = ordered_characters[0:character_rank]
-        characters_after: list[str] = ordered_characters[character_rank:]
-
-        before_match_count: int = len(
-            set(characters_before) & set(characters_before_source)
-        )
-
-        after_match_count: int = len(
-            set(characters_after) & set(characters_after_source)
-        )
-
-        if len(characters_before_source) == 0 and before_match_count <= 4:
-            character_approved_count += 1
-            continue
-
-        if len(characters_after_source) == 0 and after_match_count <= 4:
-            character_approved_count += 1
-            continue
-
-        if (
-            before_match_count / len(characters_before_source) >= 0.4
-            or after_match_count / len(characters_after_source) >= 0.4
-        ):
-            character_approved_count += 1
-            continue
-
-    return character_approved_count / len(ordered_characters)
-
-
-def alpha_unicode_split(decoded_sequence: str) -> list[str]:
-    """
-    Given a decoded text sequence, return a list of str. Unicode range / alphabet separation.
-    Ex. a text containing English/Latin with a bit a Hebrew will return two items in the resulting list;
-    One containing the latin letters and the other hebrew.
-    """
-    layers: dict[str, str] = {}
-
-    for character in decoded_sequence:
-        if character.isalpha() is False:
-            continue
-
-        character_range: str | None = unicode_range(character)
-
-        if character_range is None:
-            continue
-
-        layer_target_range: str | None = None
-
-        for discovered_range in layers:
-            if (
-                is_suspiciously_successive_range(discovered_range, character_range)
-                is False
-            ):
-                layer_target_range = discovered_range
-                break
-
-        if layer_target_range is None:
-            layer_target_range = character_range
-
-        if layer_target_range not in layers:
-            layers[layer_target_range] = character.lower()
-            continue
-
-        layers[layer_target_range] += character.lower()
-
-    return list(layers.values())
-
-
-def merge_coherence_ratios(results: list[CoherenceMatches]) -> CoherenceMatches:
-    """
-    This function merge results previously given by the function coherence_ratio.
-    The return type is the same as coherence_ratio.
-    """
-    per_language_ratios: dict[str, list[float]] = {}
-    for result in results:
-        for sub_result in result:
-            language, ratio = sub_result
-            if language not in per_language_ratios:
-                per_language_ratios[language] = [ratio]
-                continue
-            per_language_ratios[language].append(ratio)
-
-    merge = [
-        (
-            language,
-            round(
-                sum(per_language_ratios[language]) / len(per_language_ratios[language]),
-                4,
-            ),
-        )
-        for language in per_language_ratios
-    ]
-
-    return sorted(merge, key=lambda x: x[1], reverse=True)
-
-
-def filter_alt_coherence_matches(results: CoherenceMatches) -> CoherenceMatches:
-    """
-    We shall NOT return "English—" in CoherenceMatches because it is an alternative
-    of "English". This function only keeps the best match and remove the em-dash in it.
-    """
-    index_results: dict[str, list[float]] = dict()
-
-    for result in results:
-        language, ratio = result
-        no_em_name: str = language.replace("—", "")
-
-        if no_em_name not in index_results:
-            index_results[no_em_name] = []
-
-        index_results[no_em_name].append(ratio)
-
-    if any(len(index_results[e]) > 1 for e in index_results):
-        filtered_results: CoherenceMatches = []
-
-        for language in index_results:
-            filtered_results.append((language, max(index_results[language])))
-
-        return filtered_results
-
-    return results
-
-
-@lru_cache(maxsize=2048)
-def coherence_ratio(
-    decoded_sequence: str, threshold: float = 0.1, lg_inclusion: str | None = None
-) -> CoherenceMatches:
-    """
-    Detect ANY language that can be identified in given sequence. The sequence will be analysed by layers.
-    A layer = Character extraction by alphabets/ranges.
-    """
-
-    results: list[tuple[str, float]] = []
-    ignore_non_latin: bool = False
-
-    sufficient_match_count: int = 0
-
-    lg_inclusion_list = lg_inclusion.split(",") if lg_inclusion is not None else []
-    if "Latin Based" in lg_inclusion_list:
-        ignore_non_latin = True
-        lg_inclusion_list.remove("Latin Based")
-
-    for layer in alpha_unicode_split(decoded_sequence):
-        sequence_frequencies: TypeCounter[str] = Counter(layer)
-        most_common = sequence_frequencies.most_common()
-
-        character_count: int = sum(o for c, o in most_common)
-
-        if character_count <= TOO_SMALL_SEQUENCE:
-            continue
-
-        popular_character_ordered: list[str] = [c for c, o in most_common]
-
-        for language in lg_inclusion_list or alphabet_languages(
-            popular_character_ordered, ignore_non_latin
-        ):
-            ratio: float = characters_popularity_compare(
-                language, popular_character_ordered
-            )
-
-            if ratio < threshold:
-                continue
-            elif ratio >= 0.8:
-                sufficient_match_count += 1
-
-            results.append((language, round(ratio, 4)))
-
-            if sufficient_match_count >= 3:
-                break
-
-    return sorted(
-        filter_alt_coherence_matches(results), key=lambda x: x[1], reverse=True
-    )
diff --git a/lib/charset_normalizer/cli/__init__.py b/lib/charset_normalizer/cli/__init__.py
deleted file mode 100644
index 543a5a4d..00000000
--- a/lib/charset_normalizer/cli/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import annotations
-
-from .__main__ import cli_detect, query_yes_no
-
-__all__ = (
-    "cli_detect",
-    "query_yes_no",
-)
diff --git a/lib/charset_normalizer/cli/__main__.py b/lib/charset_normalizer/cli/__main__.py
deleted file mode 100644
index cb64156a..00000000
--- a/lib/charset_normalizer/cli/__main__.py
+++ /dev/null
@@ -1,381 +0,0 @@
-from __future__ import annotations
-
-import argparse
-import sys
-import typing
-from json import dumps
-from os.path import abspath, basename, dirname, join, realpath
-from platform import python_version
-from unicodedata import unidata_version
-
-import charset_normalizer.md as md_module
-from charset_normalizer import from_fp
-from charset_normalizer.models import CliDetectionResult
-from charset_normalizer.version import __version__
-
-
-def query_yes_no(question: str, default: str = "yes") -> bool:
-    """Ask a yes/no question via input() and return their answer.
-
-    "question" is a string that is presented to the user.
-    "default" is the presumed answer if the user just hits <Enter>.
-        It must be "yes" (the default), "no" or None (meaning
-        an answer is required of the user).
-
-    The "answer" return value is True for "yes" or False for "no".
-
-    Credit goes to (c) https://stackoverflow.com/questions/3041986/apt-command-line-interface-like-yes-no-input
-    """
-    valid = {"yes": True, "y": True, "ye": True, "no": False, "n": False}
-    if default is None:
-        prompt = " [y/n] "
-    elif default == "yes":
-        prompt = " [Y/n] "
-    elif default == "no":
-        prompt = " [y/N] "
-    else:
-        raise ValueError("invalid default answer: '%s'" % default)
-
-    while True:
-        sys.stdout.write(question + prompt)
-        choice = input().lower()
-        if default is not None and choice == "":
-            return valid[default]
-        elif choice in valid:
-            return valid[choice]
-        else:
-            sys.stdout.write("Please respond with 'yes' or 'no' (or 'y' or 'n').\n")
-
-
-class FileType:
-    """Factory for creating file object types
-
-    Instances of FileType are typically passed as type= arguments to the
-    ArgumentParser add_argument() method.
-
-    Keyword Arguments:
-        - mode -- A string indicating how the file is to be opened. Accepts the
-            same values as the builtin open() function.
-        - bufsize -- The file's desired buffer size. Accepts the same values as
-            the builtin open() function.
-        - encoding -- The file's encoding. Accepts the same values as the
-            builtin open() function.
-        - errors -- A string indicating how encoding and decoding errors are to
-            be handled. Accepts the same value as the builtin open() function.
-
-    Backported from CPython 3.12
-    """
-
-    def __init__(
-        self,
-        mode: str = "r",
-        bufsize: int = -1,
-        encoding: str | None = None,
-        errors: str | None = None,
-    ):
-        self._mode = mode
-        self._bufsize = bufsize
-        self._encoding = encoding
-        self._errors = errors
-
-    def __call__(self, string: str) -> typing.IO:  # type: ignore[type-arg]
-        # the special argument "-" means sys.std{in,out}
-        if string == "-":
-            if "r" in self._mode:
-                return sys.stdin.buffer if "b" in self._mode else sys.stdin
-            elif any(c in self._mode for c in "wax"):
-                return sys.stdout.buffer if "b" in self._mode else sys.stdout
-            else:
-                msg = f'argument "-" with mode {self._mode}'
-                raise ValueError(msg)
-
-        # all other arguments are used as file names
-        try:
-            return open(string, self._mode, self._bufsize, self._encoding, self._errors)
-        except OSError as e:
-            message = f"can't open '{string}': {e}"
-            raise argparse.ArgumentTypeError(message)
-
-    def __repr__(self) -> str:
-        args = self._mode, self._bufsize
-        kwargs = [("encoding", self._encoding), ("errors", self._errors)]
-        args_str = ", ".join(
-            [repr(arg) for arg in args if arg != -1]
-            + [f"{kw}={arg!r}" for kw, arg in kwargs if arg is not None]
-        )
-        return f"{type(self).__name__}({args_str})"
-
-
-def cli_detect(argv: list[str] | None = None) -> int:
-    """
-    CLI assistant using ARGV and ArgumentParser
-    :param argv:
-    :return: 0 if everything is fine, anything else equal trouble
-    """
-    parser = argparse.ArgumentParser(
-        description="The Real First Universal Charset Detector. "
-        "Discover originating encoding used on text file. "
-        "Normalize text to unicode."
-    )
-
-    parser.add_argument(
-        "files", type=FileType("rb"), nargs="+", help="File(s) to be analysed"
-    )
-    parser.add_argument(
-        "-v",
-        "--verbose",
-        action="store_true",
-        default=False,
-        dest="verbose",
-        help="Display complementary information about file if any. "
-        "Stdout will contain logs about the detection process.",
-    )
-    parser.add_argument(
-        "-a",
-        "--with-alternative",
-        action="store_true",
-        default=False,
-        dest="alternatives",
-        help="Output complementary possibilities if any. Top-level JSON WILL be a list.",
-    )
-    parser.add_argument(
-        "-n",
-        "--normalize",
-        action="store_true",
-        default=False,
-        dest="normalize",
-        help="Permit to normalize input file. If not set, program does not write anything.",
-    )
-    parser.add_argument(
-        "-m",
-        "--minimal",
-        action="store_true",
-        default=False,
-        dest="minimal",
-        help="Only output the charset detected to STDOUT. Disabling JSON output.",
-    )
-    parser.add_argument(
-        "-r",
-        "--replace",
-        action="store_true",
-        default=False,
-        dest="replace",
-        help="Replace file when trying to normalize it instead of creating a new one.",
-    )
-    parser.add_argument(
-        "-f",
-        "--force",
-        action="store_true",
-        default=False,
-        dest="force",
-        help="Replace file without asking if you are sure, use this flag with caution.",
-    )
-    parser.add_argument(
-        "-i",
-        "--no-preemptive",
-        action="store_true",
-        default=False,
-        dest="no_preemptive",
-        help="Disable looking at a charset declaration to hint the detector.",
-    )
-    parser.add_argument(
-        "-t",
-        "--threshold",
-        action="store",
-        default=0.2,
-        type=float,
-        dest="threshold",
-        help="Define a custom maximum amount of noise allowed in decoded content. 0. <= noise <= 1.",
-    )
-    parser.add_argument(
-        "--version",
-        action="version",
-        version="Charset-Normalizer {} - Python {} - Unicode {} - SpeedUp {}".format(
-            __version__,
-            python_version(),
-            unidata_version,
-            "OFF" if md_module.__file__.lower().endswith(".py") else "ON",
-        ),
-        help="Show version information and exit.",
-    )
-
-    args = parser.parse_args(argv)
-
-    if args.replace is True and args.normalize is False:
-        if args.files:
-            for my_file in args.files:
-                my_file.close()
-        print("Use --replace in addition of --normalize only.", file=sys.stderr)
-        return 1
-
-    if args.force is True and args.replace is False:
-        if args.files:
-            for my_file in args.files:
-                my_file.close()
-        print("Use --force in addition of --replace only.", file=sys.stderr)
-        return 1
-
-    if args.threshold < 0.0 or args.threshold > 1.0:
-        if args.files:
-            for my_file in args.files:
-                my_file.close()
-        print("--threshold VALUE should be between 0. AND 1.", file=sys.stderr)
-        return 1
-
-    x_ = []
-
-    for my_file in args.files:
-        matches = from_fp(
-            my_file,
-            threshold=args.threshold,
-            explain=args.verbose,
-            preemptive_behaviour=args.no_preemptive is False,
-        )
-
-        best_guess = matches.best()
-
-        if best_guess is None:
-            print(
-                'Unable to identify originating encoding for "{}". {}'.format(
-                    my_file.name,
-                    (
-                        "Maybe try increasing maximum amount of chaos."
-                        if args.threshold < 1.0
-                        else ""
-                    ),
-                ),
-                file=sys.stderr,
-            )
-            x_.append(
-                CliDetectionResult(
-                    abspath(my_file.name),
-                    None,
-                    [],
-                    [],
-                    "Unknown",
-                    [],
-                    False,
-                    1.0,
-                    0.0,
-                    None,
-                    True,
-                )
-            )
-        else:
-            x_.append(
-                CliDetectionResult(
-                    abspath(my_file.name),
-                    best_guess.encoding,
-                    best_guess.encoding_aliases,
-                    [
-                        cp
-                        for cp in best_guess.could_be_from_charset
-                        if cp != best_guess.encoding
-                    ],
-                    best_guess.language,
-                    best_guess.alphabets,
-                    best_guess.bom,
-                    best_guess.percent_chaos,
-                    best_guess.percent_coherence,
-                    None,
-                    True,
-                )
-            )
-
-            if len(matches) > 1 and args.alternatives:
-                for el in matches:
-                    if el != best_guess:
-                        x_.append(
-                            CliDetectionResult(
-                                abspath(my_file.name),
-                                el.encoding,
-                                el.encoding_aliases,
-                                [
-                                    cp
-                                    for cp in el.could_be_from_charset
-                                    if cp != el.encoding
-                                ],
-                                el.language,
-                                el.alphabets,
-                                el.bom,
-                                el.percent_chaos,
-                                el.percent_coherence,
-                                None,
-                                False,
-                            )
-                        )
-
-            if args.normalize is True:
-                if best_guess.encoding.startswith("utf") is True:
-                    print(
-                        '"{}" file does not need to be normalized, as it already came from unicode.'.format(
-                            my_file.name
-                        ),
-                        file=sys.stderr,
-                    )
-                    if my_file.closed is False:
-                        my_file.close()
-                    continue
-
-                dir_path = dirname(realpath(my_file.name))
-                file_name = basename(realpath(my_file.name))
-
-                o_: list[str] = file_name.split(".")
-
-                if args.replace is False:
-                    o_.insert(-1, best_guess.encoding)
-                    if my_file.closed is False:
-                        my_file.close()
-                elif (
-                    args.force is False
-                    and query_yes_no(
-                        'Are you sure to normalize "{}" by replacing it ?'.format(
-                            my_file.name
-                        ),
-                        "no",
-                    )
-                    is False
-                ):
-                    if my_file.closed is False:
-                        my_file.close()
-                    continue
-
-                try:
-                    x_[0].unicode_path = join(dir_path, ".".join(o_))
-
-                    with open(x_[0].unicode_path, "wb") as fp:
-                        fp.write(best_guess.output())
-                except OSError as e:
-                    print(str(e), file=sys.stderr)
-                    if my_file.closed is False:
-                        my_file.close()
-                    return 2
-
-        if my_file.closed is False:
-            my_file.close()
-
-    if args.minimal is False:
-        print(
-            dumps(
-                [el.__dict__ for el in x_] if len(x_) > 1 else x_[0].__dict__,
-                ensure_ascii=True,
-                indent=4,
-            )
-        )
-    else:
-        for my_file in args.files:
-            print(
-                ", ".join(
-                    [
-                        el.encoding or "undefined"
-                        for el in x_
-                        if el.path == abspath(my_file.name)
-                    ]
-                )
-            )
-
-    return 0
-
-
-if __name__ == "__main__":
-    cli_detect()
diff --git a/lib/charset_normalizer/constant.py b/lib/charset_normalizer/constant.py
deleted file mode 100644
index cc71a019..00000000
--- a/lib/charset_normalizer/constant.py
+++ /dev/null
@@ -1,2015 +0,0 @@
-from __future__ import annotations
-
-from codecs import BOM_UTF8, BOM_UTF16_BE, BOM_UTF16_LE, BOM_UTF32_BE, BOM_UTF32_LE
-from encodings.aliases import aliases
-from re import IGNORECASE
-from re import compile as re_compile
-
-# Contain for each eligible encoding a list of/item bytes SIG/BOM
-ENCODING_MARKS: dict[str, bytes | list[bytes]] = {
-    "utf_8": BOM_UTF8,
-    "utf_7": [
-        b"\x2b\x2f\x76\x38",
-        b"\x2b\x2f\x76\x39",
-        b"\x2b\x2f\x76\x2b",
-        b"\x2b\x2f\x76\x2f",
-        b"\x2b\x2f\x76\x38\x2d",
-    ],
-    "gb18030": b"\x84\x31\x95\x33",
-    "utf_32": [BOM_UTF32_BE, BOM_UTF32_LE],
-    "utf_16": [BOM_UTF16_BE, BOM_UTF16_LE],
-}
-
-TOO_SMALL_SEQUENCE: int = 32
-TOO_BIG_SEQUENCE: int = int(10e6)
-
-UTF8_MAXIMAL_ALLOCATION: int = 1_112_064
-
-# Up-to-date Unicode ucd/15.0.0
-UNICODE_RANGES_COMBINED: dict[str, range] = {
-    "Control character": range(32),
-    "Basic Latin": range(32, 128),
-    "Latin-1 Supplement": range(128, 256),
-    "Latin Extended-A": range(256, 384),
-    "Latin Extended-B": range(384, 592),
-    "IPA Extensions": range(592, 688),
-    "Spacing Modifier Letters": range(688, 768),
-    "Combining Diacritical Marks": range(768, 880),
-    "Greek and Coptic": range(880, 1024),
-    "Cyrillic": range(1024, 1280),
-    "Cyrillic Supplement": range(1280, 1328),
-    "Armenian": range(1328, 1424),
-    "Hebrew": range(1424, 1536),
-    "Arabic": range(1536, 1792),
-    "Syriac": range(1792, 1872),
-    "Arabic Supplement": range(1872, 1920),
-    "Thaana": range(1920, 1984),
-    "NKo": range(1984, 2048),
-    "Samaritan": range(2048, 2112),
-    "Mandaic": range(2112, 2144),
-    "Syriac Supplement": range(2144, 2160),
-    "Arabic Extended-B": range(2160, 2208),
-    "Arabic Extended-A": range(2208, 2304),
-    "Devanagari": range(2304, 2432),
-    "Bengali": range(2432, 2560),
-    "Gurmukhi": range(2560, 2688),
-    "Gujarati": range(2688, 2816),
-    "Oriya": range(2816, 2944),
-    "Tamil": range(2944, 3072),
-    "Telugu": range(3072, 3200),
-    "Kannada": range(3200, 3328),
-    "Malayalam": range(3328, 3456),
-    "Sinhala": range(3456, 3584),
-    "Thai": range(3584, 3712),
-    "Lao": range(3712, 3840),
-    "Tibetan": range(3840, 4096),
-    "Myanmar": range(4096, 4256),
-    "Georgian": range(4256, 4352),
-    "Hangul Jamo": range(4352, 4608),
-    "Ethiopic": range(4608, 4992),
-    "Ethiopic Supplement": range(4992, 5024),
-    "Cherokee": range(5024, 5120),
-    "Unified Canadian Aboriginal Syllabics": range(5120, 5760),
-    "Ogham": range(5760, 5792),
-    "Runic": range(5792, 5888),
-    "Tagalog": range(5888, 5920),
-    "Hanunoo": range(5920, 5952),
-    "Buhid": range(5952, 5984),
-    "Tagbanwa": range(5984, 6016),
-    "Khmer": range(6016, 6144),
-    "Mongolian": range(6144, 6320),
-    "Unified Canadian Aboriginal Syllabics Extended": range(6320, 6400),
-    "Limbu": range(6400, 6480),
-    "Tai Le": range(6480, 6528),
-    "New Tai Lue": range(6528, 6624),
-    "Khmer Symbols": range(6624, 6656),
-    "Buginese": range(6656, 6688),
-    "Tai Tham": range(6688, 6832),
-    "Combining Diacritical Marks Extended": range(6832, 6912),
-    "Balinese": range(6912, 7040),
-    "Sundanese": range(7040, 7104),
-    "Batak": range(7104, 7168),
-    "Lepcha": range(7168, 7248),
-    "Ol Chiki": range(7248, 7296),
-    "Cyrillic Extended-C": range(7296, 7312),
-    "Georgian Extended": range(7312, 7360),
-    "Sundanese Supplement": range(7360, 7376),
-    "Vedic Extensions": range(7376, 7424),
-    "Phonetic Extensions": range(7424, 7552),
-    "Phonetic Extensions Supplement": range(7552, 7616),
-    "Combining Diacritical Marks Supplement": range(7616, 7680),
-    "Latin Extended Additional": range(7680, 7936),
-    "Greek Extended": range(7936, 8192),
-    "General Punctuation": range(8192, 8304),
-    "Superscripts and Subscripts": range(8304, 8352),
-    "Currency Symbols": range(8352, 8400),
-    "Combining Diacritical Marks for Symbols": range(8400, 8448),
-    "Letterlike Symbols": range(8448, 8528),
-    "Number Forms": range(8528, 8592),
-    "Arrows": range(8592, 8704),
-    "Mathematical Operators": range(8704, 8960),
-    "Miscellaneous Technical": range(8960, 9216),
-    "Control Pictures": range(9216, 9280),
-    "Optical Character Recognition": range(9280, 9312),
-    "Enclosed Alphanumerics": range(9312, 9472),
-    "Box Drawing": range(9472, 9600),
-    "Block Elements": range(9600, 9632),
-    "Geometric Shapes": range(9632, 9728),
-    "Miscellaneous Symbols": range(9728, 9984),
-    "Dingbats": range(9984, 10176),
-    "Miscellaneous Mathematical Symbols-A": range(10176, 10224),
-    "Supplemental Arrows-A": range(10224, 10240),
-    "Braille Patterns": range(10240, 10496),
-    "Supplemental Arrows-B": range(10496, 10624),
-    "Miscellaneous Mathematical Symbols-B": range(10624, 10752),
-    "Supplemental Mathematical Operators": range(10752, 11008),
-    "Miscellaneous Symbols and Arrows": range(11008, 11264),
-    "Glagolitic": range(11264, 11360),
-    "Latin Extended-C": range(11360, 11392),
-    "Coptic": range(11392, 11520),
-    "Georgian Supplement": range(11520, 11568),
-    "Tifinagh": range(11568, 11648),
-    "Ethiopic Extended": range(11648, 11744),
-    "Cyrillic Extended-A": range(11744, 11776),
-    "Supplemental Punctuation": range(11776, 11904),
-    "CJK Radicals Supplement": range(11904, 12032),
-    "Kangxi Radicals": range(12032, 12256),
-    "Ideographic Description Characters": range(12272, 12288),
-    "CJK Symbols and Punctuation": range(12288, 12352),
-    "Hiragana": range(12352, 12448),
-    "Katakana": range(12448, 12544),
-    "Bopomofo": range(12544, 12592),
-    "Hangul Compatibility Jamo": range(12592, 12688),
-    "Kanbun": range(12688, 12704),
-    "Bopomofo Extended": range(12704, 12736),
-    "CJK Strokes": range(12736, 12784),
-    "Katakana Phonetic Extensions": range(12784, 12800),
-    "Enclosed CJK Letters and Months": range(12800, 13056),
-    "CJK Compatibility": range(13056, 13312),
-    "CJK Unified Ideographs Extension A": range(13312, 19904),
-    "Yijing Hexagram Symbols": range(19904, 19968),
-    "CJK Unified Ideographs": range(19968, 40960),
-    "Yi Syllables": range(40960, 42128),
-    "Yi Radicals": range(42128, 42192),
-    "Lisu": range(42192, 42240),
-    "Vai": range(42240, 42560),
-    "Cyrillic Extended-B": range(42560, 42656),
-    "Bamum": range(42656, 42752),
-    "Modifier Tone Letters": range(42752, 42784),
-    "Latin Extended-D": range(42784, 43008),
-    "Syloti Nagri": range(43008, 43056),
-    "Common Indic Number Forms": range(43056, 43072),
-    "Phags-pa": range(43072, 43136),
-    "Saurashtra": range(43136, 43232),
-    "Devanagari Extended": range(43232, 43264),
-    "Kayah Li": range(43264, 43312),
-    "Rejang": range(43312, 43360),
-    "Hangul Jamo Extended-A": range(43360, 43392),
-    "Javanese": range(43392, 43488),
-    "Myanmar Extended-B": range(43488, 43520),
-    "Cham": range(43520, 43616),
-    "Myanmar Extended-A": range(43616, 43648),
-    "Tai Viet": range(43648, 43744),
-    "Meetei Mayek Extensions": range(43744, 43776),
-    "Ethiopic Extended-A": range(43776, 43824),
-    "Latin Extended-E": range(43824, 43888),
-    "Cherokee Supplement": range(43888, 43968),
-    "Meetei Mayek": range(43968, 44032),
-    "Hangul Syllables": range(44032, 55216),
-    "Hangul Jamo Extended-B": range(55216, 55296),
-    "High Surrogates": range(55296, 56192),
-    "High Private Use Surrogates": range(56192, 56320),
-    "Low Surrogates": range(56320, 57344),
-    "Private Use Area": range(57344, 63744),
-    "CJK Compatibility Ideographs": range(63744, 64256),
-    "Alphabetic Presentation Forms": range(64256, 64336),
-    "Arabic Presentation Forms-A": range(64336, 65024),
-    "Variation Selectors": range(65024, 65040),
-    "Vertical Forms": range(65040, 65056),
-    "Combining Half Marks": range(65056, 65072),
-    "CJK Compatibility Forms": range(65072, 65104),
-    "Small Form Variants": range(65104, 65136),
-    "Arabic Presentation Forms-B": range(65136, 65280),
-    "Halfwidth and Fullwidth Forms": range(65280, 65520),
-    "Specials": range(65520, 65536),
-    "Linear B Syllabary": range(65536, 65664),
-    "Linear B Ideograms": range(65664, 65792),
-    "Aegean Numbers": range(65792, 65856),
-    "Ancient Greek Numbers": range(65856, 65936),
-    "Ancient Symbols": range(65936, 66000),
-    "Phaistos Disc": range(66000, 66048),
-    "Lycian": range(66176, 66208),
-    "Carian": range(66208, 66272),
-    "Coptic Epact Numbers": range(66272, 66304),
-    "Old Italic": range(66304, 66352),
-    "Gothic": range(66352, 66384),
-    "Old Permic": range(66384, 66432),
-    "Ugaritic": range(66432, 66464),
-    "Old Persian": range(66464, 66528),
-    "Deseret": range(66560, 66640),
-    "Shavian": range(66640, 66688),
-    "Osmanya": range(66688, 66736),
-    "Osage": range(66736, 66816),
-    "Elbasan": range(66816, 66864),
-    "Caucasian Albanian": range(66864, 66928),
-    "Vithkuqi": range(66928, 67008),
-    "Linear A": range(67072, 67456),
-    "Latin Extended-F": range(67456, 67520),
-    "Cypriot Syllabary": range(67584, 67648),
-    "Imperial Aramaic": range(67648, 67680),
-    "Palmyrene": range(67680, 67712),
-    "Nabataean": range(67712, 67760),
-    "Hatran": range(67808, 67840),
-    "Phoenician": range(67840, 67872),
-    "Lydian": range(67872, 67904),
-    "Meroitic Hieroglyphs": range(67968, 68000),
-    "Meroitic Cursive": range(68000, 68096),
-    "Kharoshthi": range(68096, 68192),
-    "Old South Arabian": range(68192, 68224),
-    "Old North Arabian": range(68224, 68256),
-    "Manichaean": range(68288, 68352),
-    "Avestan": range(68352, 68416),
-    "Inscriptional Parthian": range(68416, 68448),
-    "Inscriptional Pahlavi": range(68448, 68480),
-    "Psalter Pahlavi": range(68480, 68528),
-    "Old Turkic": range(68608, 68688),
-    "Old Hungarian": range(68736, 68864),
-    "Hanifi Rohingya": range(68864, 68928),
-    "Rumi Numeral Symbols": range(69216, 69248),
-    "Yezidi": range(69248, 69312),
-    "Arabic Extended-C": range(69312, 69376),
-    "Old Sogdian": range(69376, 69424),
-    "Sogdian": range(69424, 69488),
-    "Old Uyghur": range(69488, 69552),
-    "Chorasmian": range(69552, 69600),
-    "Elymaic": range(69600, 69632),
-    "Brahmi": range(69632, 69760),
-    "Kaithi": range(69760, 69840),
-    "Sora Sompeng": range(69840, 69888),
-    "Chakma": range(69888, 69968),
-    "Mahajani": range(69968, 70016),
-    "Sharada": range(70016, 70112),
-    "Sinhala Archaic Numbers": range(70112, 70144),
-    "Khojki": range(70144, 70224),
-    "Multani": range(70272, 70320),
-    "Khudawadi": range(70320, 70400),
-    "Grantha": range(70400, 70528),
-    "Newa": range(70656, 70784),
-    "Tirhuta": range(70784, 70880),
-    "Siddham": range(71040, 71168),
-    "Modi": range(71168, 71264),
-    "Mongolian Supplement": range(71264, 71296),
-    "Takri": range(71296, 71376),
-    "Ahom": range(71424, 71504),
-    "Dogra": range(71680, 71760),
-    "Warang Citi": range(71840, 71936),
-    "Dives Akuru": range(71936, 72032),
-    "Nandinagari": range(72096, 72192),
-    "Zanabazar Square": range(72192, 72272),
-    "Soyombo": range(72272, 72368),
-    "Unified Canadian Aboriginal Syllabics Extended-A": range(72368, 72384),
-    "Pau Cin Hau": range(72384, 72448),
-    "Devanagari Extended-A": range(72448, 72544),
-    "Bhaiksuki": range(72704, 72816),
-    "Marchen": range(72816, 72896),
-    "Masaram Gondi": range(72960, 73056),
-    "Gunjala Gondi": range(73056, 73136),
-    "Makasar": range(73440, 73472),
-    "Kawi": range(73472, 73568),
-    "Lisu Supplement": range(73648, 73664),
-    "Tamil Supplement": range(73664, 73728),
-    "Cuneiform": range(73728, 74752),
-    "Cuneiform Numbers and Punctuation": range(74752, 74880),
-    "Early Dynastic Cuneiform": range(74880, 75088),
-    "Cypro-Minoan": range(77712, 77824),
-    "Egyptian Hieroglyphs": range(77824, 78896),
-    "Egyptian Hieroglyph Format Controls": range(78896, 78944),
-    "Anatolian Hieroglyphs": range(82944, 83584),
-    "Bamum Supplement": range(92160, 92736),
-    "Mro": range(92736, 92784),
-    "Tangsa": range(92784, 92880),
-    "Bassa Vah": range(92880, 92928),
-    "Pahawh Hmong": range(92928, 93072),
-    "Medefaidrin": range(93760, 93856),
-    "Miao": range(93952, 94112),
-    "Ideographic Symbols and Punctuation": range(94176, 94208),
-    "Tangut": range(94208, 100352),
-    "Tangut Components": range(100352, 101120),
-    "Khitan Small Script": range(101120, 101632),
-    "Tangut Supplement": range(101632, 101760),
-    "Kana Extended-B": range(110576, 110592),
-    "Kana Supplement": range(110592, 110848),
-    "Kana Extended-A": range(110848, 110896),
-    "Small Kana Extension": range(110896, 110960),
-    "Nushu": range(110960, 111360),
-    "Duployan": range(113664, 113824),
-    "Shorthand Format Controls": range(113824, 113840),
-    "Znamenny Musical Notation": range(118528, 118736),
-    "Byzantine Musical Symbols": range(118784, 119040),
-    "Musical Symbols": range(119040, 119296),
-    "Ancient Greek Musical Notation": range(119296, 119376),
-    "Kaktovik Numerals": range(119488, 119520),
-    "Mayan Numerals": range(119520, 119552),
-    "Tai Xuan Jing Symbols": range(119552, 119648),
-    "Counting Rod Numerals": range(119648, 119680),
-    "Mathematical Alphanumeric Symbols": range(119808, 120832),
-    "Sutton SignWriting": range(120832, 121520),
-    "Latin Extended-G": range(122624, 122880),
-    "Glagolitic Supplement": range(122880, 122928),
-    "Cyrillic Extended-D": range(122928, 123024),
-    "Nyiakeng Puachue Hmong": range(123136, 123216),
-    "Toto": range(123536, 123584),
-    "Wancho": range(123584, 123648),
-    "Nag Mundari": range(124112, 124160),
-    "Ethiopic Extended-B": range(124896, 124928),
-    "Mende Kikakui": range(124928, 125152),
-    "Adlam": range(125184, 125280),
-    "Indic Siyaq Numbers": range(126064, 126144),
-    "Ottoman Siyaq Numbers": range(126208, 126288),
-    "Arabic Mathematical Alphabetic Symbols": range(126464, 126720),
-    "Mahjong Tiles": range(126976, 127024),
-    "Domino Tiles": range(127024, 127136),
-    "Playing Cards": range(127136, 127232),
-    "Enclosed Alphanumeric Supplement": range(127232, 127488),
-    "Enclosed Ideographic Supplement": range(127488, 127744),
-    "Miscellaneous Symbols and Pictographs": range(127744, 128512),
-    "Emoticons range(Emoji)": range(128512, 128592),
-    "Ornamental Dingbats": range(128592, 128640),
-    "Transport and Map Symbols": range(128640, 128768),
-    "Alchemical Symbols": range(128768, 128896),
-    "Geometric Shapes Extended": range(128896, 129024),
-    "Supplemental Arrows-C": range(129024, 129280),
-    "Supplemental Symbols and Pictographs": range(129280, 129536),
-    "Chess Symbols": range(129536, 129648),
-    "Symbols and Pictographs Extended-A": range(129648, 129792),
-    "Symbols for Legacy Computing": range(129792, 130048),
-    "CJK Unified Ideographs Extension B": range(131072, 173792),
-    "CJK Unified Ideographs Extension C": range(173824, 177984),
-    "CJK Unified Ideographs Extension D": range(177984, 178208),
-    "CJK Unified Ideographs Extension E": range(178208, 183984),
-    "CJK Unified Ideographs Extension F": range(183984, 191472),
-    "CJK Compatibility Ideographs Supplement": range(194560, 195104),
-    "CJK Unified Ideographs Extension G": range(196608, 201552),
-    "CJK Unified Ideographs Extension H": range(201552, 205744),
-    "Tags": range(917504, 917632),
-    "Variation Selectors Supplement": range(917760, 918000),
-    "Supplementary Private Use Area-A": range(983040, 1048576),
-    "Supplementary Private Use Area-B": range(1048576, 1114112),
-}
-
-
-UNICODE_SECONDARY_RANGE_KEYWORD: list[str] = [
-    "Supplement",
-    "Extended",
-    "Extensions",
-    "Modifier",
-    "Marks",
-    "Punctuation",
-    "Symbols",
-    "Forms",
-    "Operators",
-    "Miscellaneous",
-    "Drawing",
-    "Block",
-    "Shapes",
-    "Supplemental",
-    "Tags",
-]
-
-RE_POSSIBLE_ENCODING_INDICATION = re_compile(
-    r"(?:(?:encoding)|(?:charset)|(?:coding))(?:[\:= ]{1,10})(?:[\"\']?)([a-zA-Z0-9\-_]+)(?:[\"\']?)",
-    IGNORECASE,
-)
-
-IANA_NO_ALIASES = [
-    "cp720",
-    "cp737",
-    "cp856",
-    "cp874",
-    "cp875",
-    "cp1006",
-    "koi8_r",
-    "koi8_t",
-    "koi8_u",
-]
-
-IANA_SUPPORTED: list[str] = sorted(
-    filter(
-        lambda x: x.endswith("_codec") is False
-        and x not in {"rot_13", "tactis", "mbcs"},
-        list(set(aliases.values())) + IANA_NO_ALIASES,
-    )
-)
-
-IANA_SUPPORTED_COUNT: int = len(IANA_SUPPORTED)
-
-# pre-computed code page that are similar using the function cp_similarity.
-IANA_SUPPORTED_SIMILAR: dict[str, list[str]] = {
-    "cp037": ["cp1026", "cp1140", "cp273", "cp500"],
-    "cp1026": ["cp037", "cp1140", "cp273", "cp500"],
-    "cp1125": ["cp866"],
-    "cp1140": ["cp037", "cp1026", "cp273", "cp500"],
-    "cp1250": ["iso8859_2"],
-    "cp1251": ["kz1048", "ptcp154"],
-    "cp1252": ["iso8859_15", "iso8859_9", "latin_1"],
-    "cp1253": ["iso8859_7"],
-    "cp1254": ["iso8859_15", "iso8859_9", "latin_1"],
-    "cp1257": ["iso8859_13"],
-    "cp273": ["cp037", "cp1026", "cp1140", "cp500"],
-    "cp437": ["cp850", "cp858", "cp860", "cp861", "cp862", "cp863", "cp865"],
-    "cp500": ["cp037", "cp1026", "cp1140", "cp273"],
-    "cp850": ["cp437", "cp857", "cp858", "cp865"],
-    "cp857": ["cp850", "cp858", "cp865"],
-    "cp858": ["cp437", "cp850", "cp857", "cp865"],
-    "cp860": ["cp437", "cp861", "cp862", "cp863", "cp865"],
-    "cp861": ["cp437", "cp860", "cp862", "cp863", "cp865"],
-    "cp862": ["cp437", "cp860", "cp861", "cp863", "cp865"],
-    "cp863": ["cp437", "cp860", "cp861", "cp862", "cp865"],
-    "cp865": ["cp437", "cp850", "cp857", "cp858", "cp860", "cp861", "cp862", "cp863"],
-    "cp866": ["cp1125"],
-    "iso8859_10": ["iso8859_14", "iso8859_15", "iso8859_4", "iso8859_9", "latin_1"],
-    "iso8859_11": ["tis_620"],
-    "iso8859_13": ["cp1257"],
-    "iso8859_14": [
-        "iso8859_10",
-        "iso8859_15",
-        "iso8859_16",
-        "iso8859_3",
-        "iso8859_9",
-        "latin_1",
-    ],
-    "iso8859_15": [
-        "cp1252",
-        "cp1254",
-        "iso8859_10",
-        "iso8859_14",
-        "iso8859_16",
-        "iso8859_3",
-        "iso8859_9",
-        "latin_1",
-    ],
-    "iso8859_16": [
-        "iso8859_14",
-        "iso8859_15",
-        "iso8859_2",
-        "iso8859_3",
-        "iso8859_9",
-        "latin_1",
-    ],
-    "iso8859_2": ["cp1250", "iso8859_16", "iso8859_4"],
-    "iso8859_3": ["iso8859_14", "iso8859_15", "iso8859_16", "iso8859_9", "latin_1"],
-    "iso8859_4": ["iso8859_10", "iso8859_2", "iso8859_9", "latin_1"],
-    "iso8859_7": ["cp1253"],
-    "iso8859_9": [
-        "cp1252",
-        "cp1254",
-        "cp1258",
-        "iso8859_10",
-        "iso8859_14",
-        "iso8859_15",
-        "iso8859_16",
-        "iso8859_3",
-        "iso8859_4",
-        "latin_1",
-    ],
-    "kz1048": ["cp1251", "ptcp154"],
-    "latin_1": [
-        "cp1252",
-        "cp1254",
-        "cp1258",
-        "iso8859_10",
-        "iso8859_14",
-        "iso8859_15",
-        "iso8859_16",
-        "iso8859_3",
-        "iso8859_4",
-        "iso8859_9",
-    ],
-    "mac_iceland": ["mac_roman", "mac_turkish"],
-    "mac_roman": ["mac_iceland", "mac_turkish"],
-    "mac_turkish": ["mac_iceland", "mac_roman"],
-    "ptcp154": ["cp1251", "kz1048"],
-    "tis_620": ["iso8859_11"],
-}
-
-
-CHARDET_CORRESPONDENCE: dict[str, str] = {
-    "iso2022_kr": "ISO-2022-KR",
-    "iso2022_jp": "ISO-2022-JP",
-    "euc_kr": "EUC-KR",
-    "tis_620": "TIS-620",
-    "utf_32": "UTF-32",
-    "euc_jp": "EUC-JP",
-    "koi8_r": "KOI8-R",
-    "iso8859_1": "ISO-8859-1",
-    "iso8859_2": "ISO-8859-2",
-    "iso8859_5": "ISO-8859-5",
-    "iso8859_6": "ISO-8859-6",
-    "iso8859_7": "ISO-8859-7",
-    "iso8859_8": "ISO-8859-8",
-    "utf_16": "UTF-16",
-    "cp855": "IBM855",
-    "mac_cyrillic": "MacCyrillic",
-    "gb2312": "GB2312",
-    "gb18030": "GB18030",
-    "cp932": "CP932",
-    "cp866": "IBM866",
-    "utf_8": "utf-8",
-    "utf_8_sig": "UTF-8-SIG",
-    "shift_jis": "SHIFT_JIS",
-    "big5": "Big5",
-    "cp1250": "windows-1250",
-    "cp1251": "windows-1251",
-    "cp1252": "Windows-1252",
-    "cp1253": "windows-1253",
-    "cp1255": "windows-1255",
-    "cp1256": "windows-1256",
-    "cp1254": "Windows-1254",
-    "cp949": "CP949",
-}
-
-
-COMMON_SAFE_ASCII_CHARACTERS: set[str] = {
-    "<",
-    ">",
-    "=",
-    ":",
-    "/",
-    "&",
-    ";",
-    "{",
-    "}",
-    "[",
-    "]",
-    ",",
-    "|",
-    '"',
-    "-",
-    "(",
-    ")",
-}
-
-# Sample character sets — replace with full lists if needed
-COMMON_CHINESE_CHARACTERS = "的一是在�了有和人这中大为上个国我以�他时�用们生到作地于出就分对�会�主�年动�工也能下过�说产��而方�多定行学法所民得��三之进�等部度家电力里如水化高自二�起�物现实加�都两体制机当使点从业本去把性好应开它�还因由其些然�外天政四日那社义事平形相全表间样与关��新线内数正心�你明看原�么利比或但质气第��命此���没结解问�建月公无系军很情者最立代想已通并�直题党程展五果料象员��入常文总次��活设�管特件长求�头基资边�路级少图山统接知较将组�计别她手角期根论�农指几�区强放决西被干�必战先回则任��处队�给色光门��治北造百规热领七海�东导器压志世金增争济阶油�术�交��什认六共�收�改清己美�采转更�风切打白教速花带安场身车例真务具万�目至达走积示议声报斗完类八离��确�科张信马节�米整空元况今集温传土许步群广石记需段研界拉林律�且究观越织装影算低�音众书布�容儿须际商�验连断深难近矿�周委素技备�办��列习�约支般�感劳便团往酸历市克何除消构府太准精值�率�维划选标写存候毛亲快效斯院查江型眼王按格养易置派层片始�专状育厂京识适属圆包��调满县局照�红细引�该�价严龙飞"
-
-COMMON_JAPANESE_CHARACTERS = "日一国年大�二本中長出三時行見月分後�生五間上�四今金�入学高円�外八六下�気�七山話女北�百書先���水�男西電校語土木�食車何�万毎白天���読�左休父雨"
-
-COMMON_KOREAN_CHARACTERS = "一二三四五六七八��百��上下左�中人女�大�山�日月�水木金土父�天地國�年時文校學生"
-
-# Combine all into a set
-COMMON_CJK_CHARACTERS = set(
-    "".join(
-        [
-            COMMON_CHINESE_CHARACTERS,
-            COMMON_JAPANESE_CHARACTERS,
-            COMMON_KOREAN_CHARACTERS,
-        ]
-    )
-)
-
-KO_NAMES: set[str] = {"johab", "cp949", "euc_kr"}
-ZH_NAMES: set[str] = {"big5", "cp950", "big5hkscs", "hz"}
-
-# Logging LEVEL below DEBUG
-TRACE: int = 5
-
-
-# Language label that contain the em dash "—"
-# character are to be considered alternative seq to origin
-FREQUENCIES: dict[str, list[str]] = {
-    "English": [
-        "e",
-        "a",
-        "t",
-        "i",
-        "o",
-        "n",
-        "s",
-        "r",
-        "h",
-        "l",
-        "d",
-        "c",
-        "u",
-        "m",
-        "f",
-        "p",
-        "g",
-        "w",
-        "y",
-        "b",
-        "v",
-        "k",
-        "x",
-        "j",
-        "z",
-        "q",
-    ],
-    "English—": [
-        "e",
-        "a",
-        "t",
-        "i",
-        "o",
-        "n",
-        "s",
-        "r",
-        "h",
-        "l",
-        "d",
-        "c",
-        "m",
-        "u",
-        "f",
-        "p",
-        "g",
-        "w",
-        "b",
-        "y",
-        "v",
-        "k",
-        "j",
-        "x",
-        "z",
-        "q",
-    ],
-    "German": [
-        "e",
-        "n",
-        "i",
-        "r",
-        "s",
-        "t",
-        "a",
-        "d",
-        "h",
-        "u",
-        "l",
-        "g",
-        "o",
-        "c",
-        "m",
-        "b",
-        "f",
-        "k",
-        "w",
-        "z",
-        "p",
-        "v",
-        "ü",
-        "ä",
-        "ö",
-        "j",
-    ],
-    "French": [
-        "e",
-        "a",
-        "s",
-        "n",
-        "i",
-        "t",
-        "r",
-        "l",
-        "u",
-        "o",
-        "d",
-        "c",
-        "p",
-        "m",
-        "é",
-        "v",
-        "g",
-        "f",
-        "b",
-        "h",
-        "q",
-        "à",
-        "x",
-        "è",
-        "y",
-        "j",
-    ],
-    "Dutch": [
-        "e",
-        "n",
-        "a",
-        "i",
-        "r",
-        "t",
-        "o",
-        "d",
-        "s",
-        "l",
-        "g",
-        "h",
-        "v",
-        "m",
-        "u",
-        "k",
-        "c",
-        "p",
-        "b",
-        "w",
-        "j",
-        "z",
-        "f",
-        "y",
-        "x",
-        "ë",
-    ],
-    "Italian": [
-        "e",
-        "i",
-        "a",
-        "o",
-        "n",
-        "l",
-        "t",
-        "r",
-        "s",
-        "c",
-        "d",
-        "u",
-        "p",
-        "m",
-        "g",
-        "v",
-        "f",
-        "b",
-        "z",
-        "h",
-        "q",
-        "è",
-        "à",
-        "k",
-        "y",
-        "ò",
-    ],
-    "Polish": [
-        "a",
-        "i",
-        "o",
-        "e",
-        "n",
-        "r",
-        "z",
-        "w",
-        "s",
-        "c",
-        "t",
-        "k",
-        "y",
-        "d",
-        "p",
-        "m",
-        "u",
-        "l",
-        "j",
-        "Å‚",
-        "g",
-        "b",
-        "h",
-        "Ä…",
-        "Ä™",
-        "ó",
-    ],
-    "Spanish": [
-        "e",
-        "a",
-        "o",
-        "n",
-        "s",
-        "r",
-        "i",
-        "l",
-        "d",
-        "t",
-        "c",
-        "u",
-        "m",
-        "p",
-        "b",
-        "g",
-        "v",
-        "f",
-        "y",
-        "ó",
-        "h",
-        "q",
-        "í",
-        "j",
-        "z",
-        "á",
-    ],
-    "Russian": [
-        "о",
-        "а",
-        "е",
-        "и",
-        "н",
-        "�",
-        "Ñ‚",
-        "Ñ€",
-        "в",
-        "л",
-        "к",
-        "м",
-        "д",
-        "п",
-        "у",
-        "г",
-        "�",
-        "Ñ‹",
-        "з",
-        "б",
-        "й",
-        "ь",
-        "ч",
-        "Ñ…",
-        "ж",
-        "ц",
-    ],
-    # Jap-Kanji
-    "Japanese": [
-        "人",
-        "一",
-        "大",
-        "亅",
-        "�",
-        "丨",
-        "竹",
-        "笑",
-        "�",
-        "æ—¥",
-        "今",
-        "二",
-        "å½³",
-        "行",
-        "�",
-        "土",
-        "丶",
-        "寸",
-        "寺",
-        "時",
-        "ä¹™",
-        "丿",
-        "乂",
-        "æ°”",
-        "æ°—",
-        "冂",
-        "å·¾",
-        "亠",
-        "市",
-        "ç›®",
-        "å„¿",
-        "見",
-        "å…«",
-        "å°�",
-        "凵",
-        "県",
-        "月",
-        "�",
-        "é–€",
-        "é–“",
-        "木",
-        "�",
-        "å±±",
-        "出",
-        "本",
-        "中",
-        "刀",
-        "分",
-        "耳",
-        "�",
-        "�",
-        "最",
-        "言",
-        "ç”°",
-        "心",
-        "�",
-        "刂",
-        "�",
-        "京",
-        "å°¹",
-        "事",
-        "生",
-        "厶",
-        "云",
-        "会",
-        "未",
-        "�",
-        "白",
-        "冫",
-        "楽",
-        "�",
-        "馬",
-        "å°¸",
-        "å°º",
-        "駅",
-        "明",
-        "耂",
-        "者",
-        "了",
-        "�",
-        "都",
-        "高",
-        "�",
-        "�",
-        "厂",
-        "广",
-        "店",
-        "å­�",
-        "申",
-        "奄",
-        "亻",
-        "俺",
-        "上",
-        "æ–¹",
-        "冖",
-        "å­¦",
-        "è¡£",
-        "艮",
-        "食",
-        "自",
-    ],
-    # Jap-Katakana
-    "Japanese—": [
-        "ー",
-        "ン",
-        "ス",
-        "・",
-        "ル",
-        "ト",
-        "リ",
-        "イ",
-        "ã‚¢",
-        "ラ",
-        "ッ",
-        "ク",
-        "ド",
-        "ã‚·",
-        "レ",
-        "ジ",
-        "ã‚¿",
-        "フ",
-        "ロ",
-        "ã‚«",
-        "テ",
-        "マ",
-        "ã‚£",
-        "ã‚°",
-        "�",
-        "ム",
-        "プ",
-        "オ",
-        "コ",
-        "デ",
-        "ニ",
-        "ウ",
-        "メ",
-        "サ",
-        "ビ",
-        "ナ",
-        "ブ",
-        "ャ",
-        "エ",
-        "ュ",
-        "�",
-        "ã‚­",
-        "ズ",
-        "ダ",
-        "パ",
-        "ミ",
-        "ェ",
-        "ョ",
-        "�",
-        "ã‚»",
-        "ベ",
-        "ガ",
-        "モ",
-        "ツ",
-        "�",
-        "ボ",
-        "ソ",
-        "ノ",
-        "ã‚¡",
-        "ヴ",
-        "ワ",
-        "�",
-        "ペ",
-        "ピ",
-        "ケ",
-        "ã‚´",
-        "ã‚®",
-        "ザ",
-        "ホ",
-        "ゲ",
-        "ã‚©",
-        "ヤ",
-        "ヒ",
-        "ユ",
-        "ヨ",
-        "ヘ",
-        "ゼ",
-        "ヌ",
-        "ã‚¥",
-        "ゾ",
-        "ヶ",
-        "ヂ",
-        "ヲ",
-        "ヅ",
-        "ヵ",
-        "ヱ",
-        "ヰ",
-        "ヮ",
-        "ヽ",
-        "ã‚ ",
-        "ヾ",
-        "ヷ",
-        "ヿ",
-        "ヸ",
-        "ヹ",
-        "ヺ",
-    ],
-    # Jap-Hiragana
-    "Japanese——": [
-        "�",
-        "�",
-        "ã‚‹",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "ã‚’",
-        "�",
-        "�",
-        "�",
-        "�",
-        "れ",
-        "�",
-        "ら",
-        "�",
-        "�",
-        "ã‚Š",
-        "�",
-        "�",
-        "ã‚‚",
-        "�",
-        "�",
-        "�",
-        "�",
-        "よ",
-        "�",
-        "ã‚“",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "ã‚„",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "ã‚€",
-        "�",
-        "�",
-        "ょ",
-        "ゆ",
-        "�",
-        "�",
-        "ゃ",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "ã‚…",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "ã‚ž",
-        "�",
-        "�",
-        "�",
-        "�",
-        "�",
-        "ã‚‘",
-        "ã‚›",
-        "゜",
-        "ã‚Ž",
-        "ã‚”",
-        "ã‚š",
-        "ã‚Ÿ",
-        "ã‚™",
-        "ã‚•",
-        "ã‚–",
-    ],
-    "Portuguese": [
-        "a",
-        "e",
-        "o",
-        "s",
-        "i",
-        "r",
-        "d",
-        "n",
-        "t",
-        "m",
-        "u",
-        "c",
-        "l",
-        "p",
-        "g",
-        "v",
-        "b",
-        "f",
-        "h",
-        "ã",
-        "q",
-        "é",
-        "ç",
-        "á",
-        "z",
-        "í",
-    ],
-    "Swedish": [
-        "e",
-        "a",
-        "n",
-        "r",
-        "t",
-        "s",
-        "i",
-        "l",
-        "d",
-        "o",
-        "m",
-        "k",
-        "g",
-        "v",
-        "h",
-        "f",
-        "u",
-        "p",
-        "ä",
-        "c",
-        "b",
-        "ö",
-        "Ã¥",
-        "y",
-        "j",
-        "x",
-    ],
-    "Chinese": [
-        "çš„",
-        "一",
-        "是",
-        "�",
-        "了",
-        "在",
-        "人",
-        "有",
-        "我",
-        "ä»–",
-        "è¿™",
-        "个",
-        "们",
-        "中",
-        "�",
-        "上",
-        "大",
-        "为",
-        "和",
-        "国",
-        "地",
-        "到",
-        "以",
-        "说",
-        "æ—¶",
-        "�",
-        "å°±",
-        "出",
-        "会",
-        "�",
-        "也",
-        "ä½ ",
-        "对",
-        "生",
-        "能",
-        "而",
-        "å­�",
-        "é‚£",
-        "å¾—",
-        "于",
-        "�",
-        "下",
-        "自",
-        "之",
-        "å¹´",
-        "过",
-        "�",
-        "�",
-        "作",
-        "里",
-        "用",
-        "�",
-        "行",
-        "所",
-        "然",
-        "家",
-        "�",
-        "事",
-        "�",
-        "æ–¹",
-        "多",
-        "�",
-        "么",
-        "去",
-        "法",
-        "å­¦",
-        "如",
-        "都",
-        "�",
-        "现",
-        "当",
-        "没",
-        "动",
-        "�",
-        "èµ·",
-        "看",
-        "定",
-        "天",
-        "分",
-        "还",
-        "è¿›",
-        "好",
-        "å°�",
-        "部",
-        "å…¶",
-        "些",
-        "主",
-        "æ ·",
-        "�",
-        "心",
-        "她",
-        "本",
-        "�",
-        "å¼€",
-        "但",
-        "å› ",
-        "�",
-        "从",
-        "想",
-        "实",
-    ],
-    "Ukrainian": [
-        "о",
-        "а",
-        "н",
-        "Ñ–",
-        "и",
-        "Ñ€",
-        "в",
-        "Ñ‚",
-        "е",
-        "�",
-        "к",
-        "л",
-        "у",
-        "д",
-        "м",
-        "п",
-        "з",
-        "�",
-        "ь",
-        "б",
-        "г",
-        "й",
-        "ч",
-        "Ñ…",
-        "ц",
-        "Ñ—",
-    ],
-    "Norwegian": [
-        "e",
-        "r",
-        "n",
-        "t",
-        "a",
-        "s",
-        "i",
-        "o",
-        "l",
-        "d",
-        "g",
-        "k",
-        "m",
-        "v",
-        "f",
-        "p",
-        "u",
-        "b",
-        "h",
-        "Ã¥",
-        "y",
-        "j",
-        "ø",
-        "c",
-        "æ",
-        "w",
-    ],
-    "Finnish": [
-        "a",
-        "i",
-        "n",
-        "t",
-        "e",
-        "s",
-        "l",
-        "o",
-        "u",
-        "k",
-        "ä",
-        "m",
-        "r",
-        "v",
-        "j",
-        "h",
-        "p",
-        "y",
-        "d",
-        "ö",
-        "g",
-        "c",
-        "b",
-        "f",
-        "w",
-        "z",
-    ],
-    "Vietnamese": [
-        "n",
-        "h",
-        "t",
-        "i",
-        "c",
-        "g",
-        "a",
-        "o",
-        "u",
-        "m",
-        "l",
-        "r",
-        "à",
-        "Ä‘",
-        "s",
-        "e",
-        "v",
-        "p",
-        "b",
-        "y",
-        "Æ°",
-        "d",
-        "á",
-        "k",
-        "á»™",
-        "ế",
-    ],
-    "Czech": [
-        "o",
-        "e",
-        "a",
-        "n",
-        "t",
-        "s",
-        "i",
-        "l",
-        "v",
-        "r",
-        "k",
-        "d",
-        "u",
-        "m",
-        "p",
-        "í",
-        "c",
-        "h",
-        "z",
-        "á",
-        "y",
-        "j",
-        "b",
-        "Ä›",
-        "é",
-        "Å™",
-    ],
-    "Hungarian": [
-        "e",
-        "a",
-        "t",
-        "l",
-        "s",
-        "n",
-        "k",
-        "r",
-        "i",
-        "o",
-        "z",
-        "á",
-        "é",
-        "g",
-        "m",
-        "b",
-        "y",
-        "v",
-        "d",
-        "h",
-        "u",
-        "p",
-        "j",
-        "ö",
-        "f",
-        "c",
-    ],
-    "Korean": [
-        "�",
-        "다",
-        "ì—�",
-        "�",
-        "는",
-        "로",
-        "하",
-        "�",
-        "ê°€",
-        "ê³ ",
-        "지",
-        "서",
-        "한",
-        "�",
-        "기",
-        "으",
-        "ë…„",
-        "대",
-        "사",
-        "시",
-        "를",
-        "리",
-        "�",
-        "�",
-        "스",
-        "�",
-    ],
-    "Indonesian": [
-        "a",
-        "n",
-        "e",
-        "i",
-        "r",
-        "t",
-        "u",
-        "s",
-        "d",
-        "k",
-        "m",
-        "l",
-        "g",
-        "p",
-        "b",
-        "o",
-        "h",
-        "y",
-        "j",
-        "c",
-        "w",
-        "f",
-        "v",
-        "z",
-        "x",
-        "q",
-    ],
-    "Turkish": [
-        "a",
-        "e",
-        "i",
-        "n",
-        "r",
-        "l",
-        "ı",
-        "k",
-        "d",
-        "t",
-        "s",
-        "m",
-        "y",
-        "u",
-        "o",
-        "b",
-        "ü",
-        "ÅŸ",
-        "v",
-        "g",
-        "z",
-        "h",
-        "c",
-        "p",
-        "ç",
-        "ÄŸ",
-    ],
-    "Romanian": [
-        "e",
-        "i",
-        "a",
-        "r",
-        "n",
-        "t",
-        "u",
-        "l",
-        "o",
-        "c",
-        "s",
-        "d",
-        "p",
-        "m",
-        "ă",
-        "f",
-        "v",
-        "î",
-        "g",
-        "b",
-        "È™",
-        "È›",
-        "z",
-        "h",
-        "â",
-        "j",
-    ],
-    "Farsi": [
-        "ا",
-        "ی",
-        "ر",
-        "د",
-        "Ù†",
-        "Ù‡",
-        "Ùˆ",
-        "Ù…",
-        "ت",
-        "ب",
-        "س",
-        "Ù„",
-        "Ú©",
-        "Ø´",
-        "ز",
-        "Ù�",
-        "Ú¯",
-        "ع",
-        "Ø®",
-        "Ù‚",
-        "ج",
-        "Ø¢",
-        "Ù¾",
-        "Ø­",
-        "Ø·",
-        "ص",
-    ],
-    "Arabic": [
-        "ا",
-        "Ù„",
-        "ÙŠ",
-        "Ù…",
-        "Ùˆ",
-        "Ù†",
-        "ر",
-        "ت",
-        "ب",
-        "Ø©",
-        "ع",
-        "د",
-        "س",
-        "Ù�",
-        "Ù‡",
-        "Ùƒ",
-        "Ù‚",
-        "Ø£",
-        "Ø­",
-        "ج",
-        "Ø´",
-        "Ø·",
-        "ص",
-        "Ù‰",
-        "Ø®",
-        "Ø¥",
-    ],
-    "Danish": [
-        "e",
-        "r",
-        "n",
-        "t",
-        "a",
-        "i",
-        "s",
-        "d",
-        "l",
-        "o",
-        "g",
-        "m",
-        "k",
-        "f",
-        "v",
-        "u",
-        "b",
-        "h",
-        "p",
-        "Ã¥",
-        "y",
-        "ø",
-        "æ",
-        "c",
-        "j",
-        "w",
-    ],
-    "Serbian": [
-        "а",
-        "и",
-        "о",
-        "е",
-        "н",
-        "Ñ€",
-        "�",
-        "у",
-        "Ñ‚",
-        "к",
-        "ј",
-        "в",
-        "д",
-        "м",
-        "п",
-        "л",
-        "г",
-        "з",
-        "б",
-        "a",
-        "i",
-        "e",
-        "o",
-        "n",
-        "ц",
-        "ш",
-    ],
-    "Lithuanian": [
-        "i",
-        "a",
-        "s",
-        "o",
-        "r",
-        "e",
-        "t",
-        "n",
-        "u",
-        "k",
-        "m",
-        "l",
-        "p",
-        "v",
-        "d",
-        "j",
-        "g",
-        "Ä—",
-        "b",
-        "y",
-        "ų",
-        "Å¡",
-        "ž",
-        "c",
-        "Ä…",
-        "į",
-    ],
-    "Slovene": [
-        "e",
-        "a",
-        "i",
-        "o",
-        "n",
-        "r",
-        "s",
-        "l",
-        "t",
-        "j",
-        "v",
-        "k",
-        "d",
-        "p",
-        "m",
-        "u",
-        "z",
-        "b",
-        "g",
-        "h",
-        "�",
-        "c",
-        "Å¡",
-        "ž",
-        "f",
-        "y",
-    ],
-    "Slovak": [
-        "o",
-        "a",
-        "e",
-        "n",
-        "i",
-        "r",
-        "v",
-        "t",
-        "s",
-        "l",
-        "k",
-        "d",
-        "m",
-        "p",
-        "u",
-        "c",
-        "h",
-        "j",
-        "b",
-        "z",
-        "á",
-        "y",
-        "ý",
-        "í",
-        "�",
-        "é",
-    ],
-    "Hebrew": [
-        "×™",
-        "ו",
-        "×”",
-        "ל",
-        "ר",
-        "ב",
-        "ת",
-        "מ",
-        "�",
-        "ש",
-        "× ",
-        "×¢",
-        "�",
-        "ד",
-        "ק",
-        "×—",
-        "פ",
-        "ס",
-        "×›",
-        "×’",
-        "ט",
-        "צ",
-        "ן",
-        "×–",
-        "ך",
-    ],
-    "Bulgarian": [
-        "а",
-        "и",
-        "о",
-        "е",
-        "н",
-        "Ñ‚",
-        "Ñ€",
-        "�",
-        "в",
-        "л",
-        "к",
-        "д",
-        "п",
-        "м",
-        "з",
-        "г",
-        "�",
-        "ÑŠ",
-        "у",
-        "б",
-        "ч",
-        "ц",
-        "й",
-        "ж",
-        "щ",
-        "Ñ…",
-    ],
-    "Croatian": [
-        "a",
-        "i",
-        "o",
-        "e",
-        "n",
-        "r",
-        "j",
-        "s",
-        "t",
-        "u",
-        "k",
-        "l",
-        "v",
-        "d",
-        "m",
-        "p",
-        "g",
-        "z",
-        "b",
-        "c",
-        "�",
-        "h",
-        "Å¡",
-        "ž",
-        "ć",
-        "f",
-    ],
-    "Hindi": [
-        "क",
-        "र",
-        "स",
-        "न",
-        "त",
-        "म",
-        "ह",
-        "प",
-        "य",
-        "ल",
-        "व",
-        "ज",
-        "द",
-        "ग",
-        "ब",
-        "श",
-        "ट",
-        "अ",
-        "�",
-        "थ",
-        "भ",
-        "ड",
-        "च",
-        "ध",
-        "ष",
-        "इ",
-    ],
-    "Estonian": [
-        "a",
-        "i",
-        "e",
-        "s",
-        "t",
-        "l",
-        "u",
-        "n",
-        "o",
-        "k",
-        "r",
-        "d",
-        "m",
-        "v",
-        "g",
-        "p",
-        "j",
-        "h",
-        "ä",
-        "b",
-        "õ",
-        "ü",
-        "f",
-        "c",
-        "ö",
-        "y",
-    ],
-    "Thai": [
-        "า",
-        "น",
-        "ร",
-        "อ",
-        "�",
-        "เ",
-        "ง",
-        "ม",
-        "ย",
-        "ล",
-        "ว",
-        "ด",
-        "ท",
-        "ส",
-        "ต",
-        "ะ",
-        "ป",
-        "บ",
-        "ค",
-        "ห",
-        "�",
-        "จ",
-        "พ",
-        "ช",
-        "ข",
-        "ใ",
-    ],
-    "Greek": [
-        "α",
-        "Ï„",
-        "ο",
-        "ι",
-        "ε",
-        "ν",
-        "�",
-        "σ",
-        "κ",
-        "η",
-        "Ï€",
-        "Ï‚",
-        "Ï…",
-        "μ",
-        "λ",
-        "ί",
-        "ό",
-        "ά",
-        "γ",
-        "έ",
-        "δ",
-        "ή",
-        "ω",
-        "χ",
-        "θ",
-        "�",
-    ],
-    "Tamil": [
-        "க",
-        "த",
-        "ப",
-        "ட",
-        "à®°",
-        "à®®",
-        "ல",
-        "ன",
-        "வ",
-        "à®±",
-        "ய",
-        "ள",
-        "ச",
-        "ந",
-        "இ",
-        "ண",
-        "à®…",
-        "ஆ",
-        "à®´",
-        "à®™",
-        "எ",
-        "உ",
-        "à®’",
-        "ஸ",
-    ],
-    "Kazakh": [
-        "а",
-        "Ñ‹",
-        "е",
-        "н",
-        "Ñ‚",
-        "Ñ€",
-        "л",
-        "Ñ–",
-        "д",
-        "�",
-        "м",
-        "Ò›",
-        "к",
-        "о",
-        "б",
-        "и",
-        "у",
-        "Ò“",
-        "ж",
-        "Ò£",
-        "з",
-        "ш",
-        "й",
-        "п",
-        "г",
-        "Ó©",
-    ],
-}
-
-LANGUAGE_SUPPORTED_COUNT: int = len(FREQUENCIES)
diff --git a/lib/charset_normalizer/legacy.py b/lib/charset_normalizer/legacy.py
deleted file mode 100644
index e221beca..00000000
--- a/lib/charset_normalizer/legacy.py
+++ /dev/null
@@ -1,64 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING, Any
-from warnings import warn
-
-from .api import from_bytes
-from .constant import CHARDET_CORRESPONDENCE
-
-# TODO: remove this check when dropping Python 3.7 support
-if TYPE_CHECKING:
-    from typing_extensions import TypedDict
-
-    class ResultDict(TypedDict):
-        encoding: str | None
-        language: str
-        confidence: float | None
-
-
-def detect(
-    byte_str: bytes, should_rename_legacy: bool = False, **kwargs: Any
-) -> ResultDict:
-    """
-    chardet legacy method
-    Detect the encoding of the given byte string. It should be mostly backward-compatible.
-    Encoding name will match Chardet own writing whenever possible. (Not on encoding name unsupported by it)
-    This function is deprecated and should be used to migrate your project easily, consult the documentation for
-    further information. Not planned for removal.
-
-    :param byte_str:     The byte sequence to examine.
-    :param should_rename_legacy:  Should we rename legacy encodings
-                                  to their more modern equivalents?
-    """
-    if len(kwargs):
-        warn(
-            f"charset-normalizer disregard arguments '{','.join(list(kwargs.keys()))}' in legacy function detect()"
-        )
-
-    if not isinstance(byte_str, (bytearray, bytes)):
-        raise TypeError(  # pragma: nocover
-            f"Expected object of type bytes or bytearray, got: {type(byte_str)}"
-        )
-
-    if isinstance(byte_str, bytearray):
-        byte_str = bytes(byte_str)
-
-    r = from_bytes(byte_str).best()
-
-    encoding = r.encoding if r is not None else None
-    language = r.language if r is not None and r.language != "Unknown" else ""
-    confidence = 1.0 - r.chaos if r is not None else None
-
-    # Note: CharsetNormalizer does not return 'UTF-8-SIG' as the sig get stripped in the detection/normalization process
-    # but chardet does return 'utf-8-sig' and it is a valid codec name.
-    if r is not None and encoding == "utf_8" and r.bom:
-        encoding += "_sig"
-
-    if should_rename_legacy is False and encoding in CHARDET_CORRESPONDENCE:
-        encoding = CHARDET_CORRESPONDENCE[encoding]
-
-    return {
-        "encoding": encoding,
-        "language": language,
-        "confidence": confidence,
-    }
diff --git a/lib/charset_normalizer/md.py b/lib/charset_normalizer/md.py
deleted file mode 100644
index 12ce024b..00000000
--- a/lib/charset_normalizer/md.py
+++ /dev/null
@@ -1,635 +0,0 @@
-from __future__ import annotations
-
-from functools import lru_cache
-from logging import getLogger
-
-from .constant import (
-    COMMON_SAFE_ASCII_CHARACTERS,
-    TRACE,
-    UNICODE_SECONDARY_RANGE_KEYWORD,
-)
-from .utils import (
-    is_accentuated,
-    is_arabic,
-    is_arabic_isolated_form,
-    is_case_variable,
-    is_cjk,
-    is_emoticon,
-    is_hangul,
-    is_hiragana,
-    is_katakana,
-    is_latin,
-    is_punctuation,
-    is_separator,
-    is_symbol,
-    is_thai,
-    is_unprintable,
-    remove_accent,
-    unicode_range,
-    is_cjk_uncommon,
-)
-
-
-class MessDetectorPlugin:
-    """
-    Base abstract class used for mess detection plugins.
-    All detectors MUST extend and implement given methods.
-    """
-
-    def eligible(self, character: str) -> bool:
-        """
-        Determine if given character should be fed in.
-        """
-        raise NotImplementedError  # pragma: nocover
-
-    def feed(self, character: str) -> None:
-        """
-        The main routine to be executed upon character.
-        Insert the logic in witch the text would be considered chaotic.
-        """
-        raise NotImplementedError  # pragma: nocover
-
-    def reset(self) -> None:  # pragma: no cover
-        """
-        Permit to reset the plugin to the initial state.
-        """
-        raise NotImplementedError
-
-    @property
-    def ratio(self) -> float:
-        """
-        Compute the chaos ratio based on what your feed() has seen.
-        Must NOT be lower than 0.; No restriction gt 0.
-        """
-        raise NotImplementedError  # pragma: nocover
-
-
-class TooManySymbolOrPunctuationPlugin(MessDetectorPlugin):
-    def __init__(self) -> None:
-        self._punctuation_count: int = 0
-        self._symbol_count: int = 0
-        self._character_count: int = 0
-
-        self._last_printable_char: str | None = None
-        self._frenzy_symbol_in_word: bool = False
-
-    def eligible(self, character: str) -> bool:
-        return character.isprintable()
-
-    def feed(self, character: str) -> None:
-        self._character_count += 1
-
-        if (
-            character != self._last_printable_char
-            and character not in COMMON_SAFE_ASCII_CHARACTERS
-        ):
-            if is_punctuation(character):
-                self._punctuation_count += 1
-            elif (
-                character.isdigit() is False
-                and is_symbol(character)
-                and is_emoticon(character) is False
-            ):
-                self._symbol_count += 2
-
-        self._last_printable_char = character
-
-    def reset(self) -> None:  # Abstract
-        self._punctuation_count = 0
-        self._character_count = 0
-        self._symbol_count = 0
-
-    @property
-    def ratio(self) -> float:
-        if self._character_count == 0:
-            return 0.0
-
-        ratio_of_punctuation: float = (
-            self._punctuation_count + self._symbol_count
-        ) / self._character_count
-
-        return ratio_of_punctuation if ratio_of_punctuation >= 0.3 else 0.0
-
-
-class TooManyAccentuatedPlugin(MessDetectorPlugin):
-    def __init__(self) -> None:
-        self._character_count: int = 0
-        self._accentuated_count: int = 0
-
-    def eligible(self, character: str) -> bool:
-        return character.isalpha()
-
-    def feed(self, character: str) -> None:
-        self._character_count += 1
-
-        if is_accentuated(character):
-            self._accentuated_count += 1
-
-    def reset(self) -> None:  # Abstract
-        self._character_count = 0
-        self._accentuated_count = 0
-
-    @property
-    def ratio(self) -> float:
-        if self._character_count < 8:
-            return 0.0
-
-        ratio_of_accentuation: float = self._accentuated_count / self._character_count
-        return ratio_of_accentuation if ratio_of_accentuation >= 0.35 else 0.0
-
-
-class UnprintablePlugin(MessDetectorPlugin):
-    def __init__(self) -> None:
-        self._unprintable_count: int = 0
-        self._character_count: int = 0
-
-    def eligible(self, character: str) -> bool:
-        return True
-
-    def feed(self, character: str) -> None:
-        if is_unprintable(character):
-            self._unprintable_count += 1
-        self._character_count += 1
-
-    def reset(self) -> None:  # Abstract
-        self._unprintable_count = 0
-
-    @property
-    def ratio(self) -> float:
-        if self._character_count == 0:
-            return 0.0
-
-        return (self._unprintable_count * 8) / self._character_count
-
-
-class SuspiciousDuplicateAccentPlugin(MessDetectorPlugin):
-    def __init__(self) -> None:
-        self._successive_count: int = 0
-        self._character_count: int = 0
-
-        self._last_latin_character: str | None = None
-
-    def eligible(self, character: str) -> bool:
-        return character.isalpha() and is_latin(character)
-
-    def feed(self, character: str) -> None:
-        self._character_count += 1
-        if (
-            self._last_latin_character is not None
-            and is_accentuated(character)
-            and is_accentuated(self._last_latin_character)
-        ):
-            if character.isupper() and self._last_latin_character.isupper():
-                self._successive_count += 1
-            # Worse if its the same char duplicated with different accent.
-            if remove_accent(character) == remove_accent(self._last_latin_character):
-                self._successive_count += 1
-        self._last_latin_character = character
-
-    def reset(self) -> None:  # Abstract
-        self._successive_count = 0
-        self._character_count = 0
-        self._last_latin_character = None
-
-    @property
-    def ratio(self) -> float:
-        if self._character_count == 0:
-            return 0.0
-
-        return (self._successive_count * 2) / self._character_count
-
-
-class SuspiciousRange(MessDetectorPlugin):
-    def __init__(self) -> None:
-        self._suspicious_successive_range_count: int = 0
-        self._character_count: int = 0
-        self._last_printable_seen: str | None = None
-
-    def eligible(self, character: str) -> bool:
-        return character.isprintable()
-
-    def feed(self, character: str) -> None:
-        self._character_count += 1
-
-        if (
-            character.isspace()
-            or is_punctuation(character)
-            or character in COMMON_SAFE_ASCII_CHARACTERS
-        ):
-            self._last_printable_seen = None
-            return
-
-        if self._last_printable_seen is None:
-            self._last_printable_seen = character
-            return
-
-        unicode_range_a: str | None = unicode_range(self._last_printable_seen)
-        unicode_range_b: str | None = unicode_range(character)
-
-        if is_suspiciously_successive_range(unicode_range_a, unicode_range_b):
-            self._suspicious_successive_range_count += 1
-
-        self._last_printable_seen = character
-
-    def reset(self) -> None:  # Abstract
-        self._character_count = 0
-        self._suspicious_successive_range_count = 0
-        self._last_printable_seen = None
-
-    @property
-    def ratio(self) -> float:
-        if self._character_count <= 13:
-            return 0.0
-
-        ratio_of_suspicious_range_usage: float = (
-            self._suspicious_successive_range_count * 2
-        ) / self._character_count
-
-        return ratio_of_suspicious_range_usage
-
-
-class SuperWeirdWordPlugin(MessDetectorPlugin):
-    def __init__(self) -> None:
-        self._word_count: int = 0
-        self._bad_word_count: int = 0
-        self._foreign_long_count: int = 0
-
-        self._is_current_word_bad: bool = False
-        self._foreign_long_watch: bool = False
-
-        self._character_count: int = 0
-        self._bad_character_count: int = 0
-
-        self._buffer: str = ""
-        self._buffer_accent_count: int = 0
-        self._buffer_glyph_count: int = 0
-
-    def eligible(self, character: str) -> bool:
-        return True
-
-    def feed(self, character: str) -> None:
-        if character.isalpha():
-            self._buffer += character
-            if is_accentuated(character):
-                self._buffer_accent_count += 1
-            if (
-                self._foreign_long_watch is False
-                and (is_latin(character) is False or is_accentuated(character))
-                and is_cjk(character) is False
-                and is_hangul(character) is False
-                and is_katakana(character) is False
-                and is_hiragana(character) is False
-                and is_thai(character) is False
-            ):
-                self._foreign_long_watch = True
-            if (
-                is_cjk(character)
-                or is_hangul(character)
-                or is_katakana(character)
-                or is_hiragana(character)
-                or is_thai(character)
-            ):
-                self._buffer_glyph_count += 1
-            return
-        if not self._buffer:
-            return
-        if (
-            character.isspace() or is_punctuation(character) or is_separator(character)
-        ) and self._buffer:
-            self._word_count += 1
-            buffer_length: int = len(self._buffer)
-
-            self._character_count += buffer_length
-
-            if buffer_length >= 4:
-                if self._buffer_accent_count / buffer_length >= 0.5:
-                    self._is_current_word_bad = True
-                # Word/Buffer ending with an upper case accentuated letter are so rare,
-                # that we will consider them all as suspicious. Same weight as foreign_long suspicious.
-                elif (
-                    is_accentuated(self._buffer[-1])
-                    and self._buffer[-1].isupper()
-                    and all(_.isupper() for _ in self._buffer) is False
-                ):
-                    self._foreign_long_count += 1
-                    self._is_current_word_bad = True
-                elif self._buffer_glyph_count == 1:
-                    self._is_current_word_bad = True
-                    self._foreign_long_count += 1
-            if buffer_length >= 24 and self._foreign_long_watch:
-                camel_case_dst = [
-                    i
-                    for c, i in zip(self._buffer, range(0, buffer_length))
-                    if c.isupper()
-                ]
-                probable_camel_cased: bool = False
-
-                if camel_case_dst and (len(camel_case_dst) / buffer_length <= 0.3):
-                    probable_camel_cased = True
-
-                if not probable_camel_cased:
-                    self._foreign_long_count += 1
-                    self._is_current_word_bad = True
-
-            if self._is_current_word_bad:
-                self._bad_word_count += 1
-                self._bad_character_count += len(self._buffer)
-                self._is_current_word_bad = False
-
-            self._foreign_long_watch = False
-            self._buffer = ""
-            self._buffer_accent_count = 0
-            self._buffer_glyph_count = 0
-        elif (
-            character not in {"<", ">", "-", "=", "~", "|", "_"}
-            and character.isdigit() is False
-            and is_symbol(character)
-        ):
-            self._is_current_word_bad = True
-            self._buffer += character
-
-    def reset(self) -> None:  # Abstract
-        self._buffer = ""
-        self._is_current_word_bad = False
-        self._foreign_long_watch = False
-        self._bad_word_count = 0
-        self._word_count = 0
-        self._character_count = 0
-        self._bad_character_count = 0
-        self._foreign_long_count = 0
-
-    @property
-    def ratio(self) -> float:
-        if self._word_count <= 10 and self._foreign_long_count == 0:
-            return 0.0
-
-        return self._bad_character_count / self._character_count
-
-
-class CjkUncommonPlugin(MessDetectorPlugin):
-    """
-    Detect messy CJK text that probably means nothing.
-    """
-
-    def __init__(self) -> None:
-        self._character_count: int = 0
-        self._uncommon_count: int = 0
-
-    def eligible(self, character: str) -> bool:
-        return is_cjk(character)
-
-    def feed(self, character: str) -> None:
-        self._character_count += 1
-
-        if is_cjk_uncommon(character):
-            self._uncommon_count += 1
-            return
-
-    def reset(self) -> None:  # Abstract
-        self._character_count = 0
-        self._uncommon_count = 0
-
-    @property
-    def ratio(self) -> float:
-        if self._character_count < 8:
-            return 0.0
-
-        uncommon_form_usage: float = self._uncommon_count / self._character_count
-
-        # we can be pretty sure it's garbage when uncommon characters are widely
-        # used. otherwise it could just be traditional chinese for example.
-        return uncommon_form_usage / 10 if uncommon_form_usage > 0.5 else 0.0
-
-
-class ArchaicUpperLowerPlugin(MessDetectorPlugin):
-    def __init__(self) -> None:
-        self._buf: bool = False
-
-        self._character_count_since_last_sep: int = 0
-
-        self._successive_upper_lower_count: int = 0
-        self._successive_upper_lower_count_final: int = 0
-
-        self._character_count: int = 0
-
-        self._last_alpha_seen: str | None = None
-        self._current_ascii_only: bool = True
-
-    def eligible(self, character: str) -> bool:
-        return True
-
-    def feed(self, character: str) -> None:
-        is_concerned = character.isalpha() and is_case_variable(character)
-        chunk_sep = is_concerned is False
-
-        if chunk_sep and self._character_count_since_last_sep > 0:
-            if (
-                self._character_count_since_last_sep <= 64
-                and character.isdigit() is False
-                and self._current_ascii_only is False
-            ):
-                self._successive_upper_lower_count_final += (
-                    self._successive_upper_lower_count
-                )
-
-            self._successive_upper_lower_count = 0
-            self._character_count_since_last_sep = 0
-            self._last_alpha_seen = None
-            self._buf = False
-            self._character_count += 1
-            self._current_ascii_only = True
-
-            return
-
-        if self._current_ascii_only is True and character.isascii() is False:
-            self._current_ascii_only = False
-
-        if self._last_alpha_seen is not None:
-            if (character.isupper() and self._last_alpha_seen.islower()) or (
-                character.islower() and self._last_alpha_seen.isupper()
-            ):
-                if self._buf is True:
-                    self._successive_upper_lower_count += 2
-                    self._buf = False
-                else:
-                    self._buf = True
-            else:
-                self._buf = False
-
-        self._character_count += 1
-        self._character_count_since_last_sep += 1
-        self._last_alpha_seen = character
-
-    def reset(self) -> None:  # Abstract
-        self._character_count = 0
-        self._character_count_since_last_sep = 0
-        self._successive_upper_lower_count = 0
-        self._successive_upper_lower_count_final = 0
-        self._last_alpha_seen = None
-        self._buf = False
-        self._current_ascii_only = True
-
-    @property
-    def ratio(self) -> float:
-        if self._character_count == 0:
-            return 0.0
-
-        return self._successive_upper_lower_count_final / self._character_count
-
-
-class ArabicIsolatedFormPlugin(MessDetectorPlugin):
-    def __init__(self) -> None:
-        self._character_count: int = 0
-        self._isolated_form_count: int = 0
-
-    def reset(self) -> None:  # Abstract
-        self._character_count = 0
-        self._isolated_form_count = 0
-
-    def eligible(self, character: str) -> bool:
-        return is_arabic(character)
-
-    def feed(self, character: str) -> None:
-        self._character_count += 1
-
-        if is_arabic_isolated_form(character):
-            self._isolated_form_count += 1
-
-    @property
-    def ratio(self) -> float:
-        if self._character_count < 8:
-            return 0.0
-
-        isolated_form_usage: float = self._isolated_form_count / self._character_count
-
-        return isolated_form_usage
-
-
-@lru_cache(maxsize=1024)
-def is_suspiciously_successive_range(
-    unicode_range_a: str | None, unicode_range_b: str | None
-) -> bool:
-    """
-    Determine if two Unicode range seen next to each other can be considered as suspicious.
-    """
-    if unicode_range_a is None or unicode_range_b is None:
-        return True
-
-    if unicode_range_a == unicode_range_b:
-        return False
-
-    if "Latin" in unicode_range_a and "Latin" in unicode_range_b:
-        return False
-
-    if "Emoticons" in unicode_range_a or "Emoticons" in unicode_range_b:
-        return False
-
-    # Latin characters can be accompanied with a combining diacritical mark
-    # eg. Vietnamese.
-    if ("Latin" in unicode_range_a or "Latin" in unicode_range_b) and (
-        "Combining" in unicode_range_a or "Combining" in unicode_range_b
-    ):
-        return False
-
-    keywords_range_a, keywords_range_b = (
-        unicode_range_a.split(" "),
-        unicode_range_b.split(" "),
-    )
-
-    for el in keywords_range_a:
-        if el in UNICODE_SECONDARY_RANGE_KEYWORD:
-            continue
-        if el in keywords_range_b:
-            return False
-
-    # Japanese Exception
-    range_a_jp_chars, range_b_jp_chars = (
-        unicode_range_a
-        in (
-            "Hiragana",
-            "Katakana",
-        ),
-        unicode_range_b in ("Hiragana", "Katakana"),
-    )
-    if (range_a_jp_chars or range_b_jp_chars) and (
-        "CJK" in unicode_range_a or "CJK" in unicode_range_b
-    ):
-        return False
-    if range_a_jp_chars and range_b_jp_chars:
-        return False
-
-    if "Hangul" in unicode_range_a or "Hangul" in unicode_range_b:
-        if "CJK" in unicode_range_a or "CJK" in unicode_range_b:
-            return False
-        if unicode_range_a == "Basic Latin" or unicode_range_b == "Basic Latin":
-            return False
-
-    # Chinese/Japanese use dedicated range for punctuation and/or separators.
-    if ("CJK" in unicode_range_a or "CJK" in unicode_range_b) or (
-        unicode_range_a in ["Katakana", "Hiragana"]
-        and unicode_range_b in ["Katakana", "Hiragana"]
-    ):
-        if "Punctuation" in unicode_range_a or "Punctuation" in unicode_range_b:
-            return False
-        if "Forms" in unicode_range_a or "Forms" in unicode_range_b:
-            return False
-        if unicode_range_a == "Basic Latin" or unicode_range_b == "Basic Latin":
-            return False
-
-    return True
-
-
-@lru_cache(maxsize=2048)
-def mess_ratio(
-    decoded_sequence: str, maximum_threshold: float = 0.2, debug: bool = False
-) -> float:
-    """
-    Compute a mess ratio given a decoded bytes sequence. The maximum threshold does stop the computation earlier.
-    """
-
-    detectors: list[MessDetectorPlugin] = [
-        md_class() for md_class in MessDetectorPlugin.__subclasses__()
-    ]
-
-    length: int = len(decoded_sequence) + 1
-
-    mean_mess_ratio: float = 0.0
-
-    if length < 512:
-        intermediary_mean_mess_ratio_calc: int = 32
-    elif length <= 1024:
-        intermediary_mean_mess_ratio_calc = 64
-    else:
-        intermediary_mean_mess_ratio_calc = 128
-
-    for character, index in zip(decoded_sequence + "\n", range(length)):
-        for detector in detectors:
-            if detector.eligible(character):
-                detector.feed(character)
-
-        if (
-            index > 0 and index % intermediary_mean_mess_ratio_calc == 0
-        ) or index == length - 1:
-            mean_mess_ratio = sum(dt.ratio for dt in detectors)
-
-            if mean_mess_ratio >= maximum_threshold:
-                break
-
-    if debug:
-        logger = getLogger("charset_normalizer")
-
-        logger.log(
-            TRACE,
-            "Mess-detector extended-analysis start. "
-            f"intermediary_mean_mess_ratio_calc={intermediary_mean_mess_ratio_calc} mean_mess_ratio={mean_mess_ratio} "
-            f"maximum_threshold={maximum_threshold}",
-        )
-
-        if len(decoded_sequence) > 16:
-            logger.log(TRACE, f"Starting with: {decoded_sequence[:16]}")
-            logger.log(TRACE, f"Ending with: {decoded_sequence[-16::]}")
-
-        for dt in detectors:
-            logger.log(TRACE, f"{dt.__class__}: {dt.ratio}")
-
-    return round(mean_mess_ratio, 3)
diff --git a/lib/charset_normalizer/models.py b/lib/charset_normalizer/models.py
deleted file mode 100644
index 1042758f..00000000
--- a/lib/charset_normalizer/models.py
+++ /dev/null
@@ -1,360 +0,0 @@
-from __future__ import annotations
-
-from encodings.aliases import aliases
-from hashlib import sha256
-from json import dumps
-from re import sub
-from typing import Any, Iterator, List, Tuple
-
-from .constant import RE_POSSIBLE_ENCODING_INDICATION, TOO_BIG_SEQUENCE
-from .utils import iana_name, is_multi_byte_encoding, unicode_range
-
-
-class CharsetMatch:
-    def __init__(
-        self,
-        payload: bytes,
-        guessed_encoding: str,
-        mean_mess_ratio: float,
-        has_sig_or_bom: bool,
-        languages: CoherenceMatches,
-        decoded_payload: str | None = None,
-        preemptive_declaration: str | None = None,
-    ):
-        self._payload: bytes = payload
-
-        self._encoding: str = guessed_encoding
-        self._mean_mess_ratio: float = mean_mess_ratio
-        self._languages: CoherenceMatches = languages
-        self._has_sig_or_bom: bool = has_sig_or_bom
-        self._unicode_ranges: list[str] | None = None
-
-        self._leaves: list[CharsetMatch] = []
-        self._mean_coherence_ratio: float = 0.0
-
-        self._output_payload: bytes | None = None
-        self._output_encoding: str | None = None
-
-        self._string: str | None = decoded_payload
-
-        self._preemptive_declaration: str | None = preemptive_declaration
-
-    def __eq__(self, other: object) -> bool:
-        if not isinstance(other, CharsetMatch):
-            if isinstance(other, str):
-                return iana_name(other) == self.encoding
-            return False
-        return self.encoding == other.encoding and self.fingerprint == other.fingerprint
-
-    def __lt__(self, other: object) -> bool:
-        """
-        Implemented to make sorted available upon CharsetMatches items.
-        """
-        if not isinstance(other, CharsetMatch):
-            raise ValueError
-
-        chaos_difference: float = abs(self.chaos - other.chaos)
-        coherence_difference: float = abs(self.coherence - other.coherence)
-
-        # Below 1% difference --> Use Coherence
-        if chaos_difference < 0.01 and coherence_difference > 0.02:
-            return self.coherence > other.coherence
-        elif chaos_difference < 0.01 and coherence_difference <= 0.02:
-            # When having a difficult decision, use the result that decoded as many multi-byte as possible.
-            # preserve RAM usage!
-            if len(self._payload) >= TOO_BIG_SEQUENCE:
-                return self.chaos < other.chaos
-            return self.multi_byte_usage > other.multi_byte_usage
-
-        return self.chaos < other.chaos
-
-    @property
-    def multi_byte_usage(self) -> float:
-        return 1.0 - (len(str(self)) / len(self.raw))
-
-    def __str__(self) -> str:
-        # Lazy Str Loading
-        if self._string is None:
-            self._string = str(self._payload, self._encoding, "strict")
-        return self._string
-
-    def __repr__(self) -> str:
-        return f"<CharsetMatch '{self.encoding}' bytes({self.fingerprint})>"
-
-    def add_submatch(self, other: CharsetMatch) -> None:
-        if not isinstance(other, CharsetMatch) or other == self:
-            raise ValueError(
-                "Unable to add instance <{}> as a submatch of a CharsetMatch".format(
-                    other.__class__
-                )
-            )
-
-        other._string = None  # Unload RAM usage; dirty trick.
-        self._leaves.append(other)
-
-    @property
-    def encoding(self) -> str:
-        return self._encoding
-
-    @property
-    def encoding_aliases(self) -> list[str]:
-        """
-        Encoding name are known by many name, using this could help when searching for IBM855 when it's listed as CP855.
-        """
-        also_known_as: list[str] = []
-        for u, p in aliases.items():
-            if self.encoding == u:
-                also_known_as.append(p)
-            elif self.encoding == p:
-                also_known_as.append(u)
-        return also_known_as
-
-    @property
-    def bom(self) -> bool:
-        return self._has_sig_or_bom
-
-    @property
-    def byte_order_mark(self) -> bool:
-        return self._has_sig_or_bom
-
-    @property
-    def languages(self) -> list[str]:
-        """
-        Return the complete list of possible languages found in decoded sequence.
-        Usually not really useful. Returned list may be empty even if 'language' property return something != 'Unknown'.
-        """
-        return [e[0] for e in self._languages]
-
-    @property
-    def language(self) -> str:
-        """
-        Most probable language found in decoded sequence. If none were detected or inferred, the property will return
-        "Unknown".
-        """
-        if not self._languages:
-            # Trying to infer the language based on the given encoding
-            # Its either English or we should not pronounce ourselves in certain cases.
-            if "ascii" in self.could_be_from_charset:
-                return "English"
-
-            # doing it there to avoid circular import
-            from charset_normalizer.cd import encoding_languages, mb_encoding_languages
-
-            languages = (
-                mb_encoding_languages(self.encoding)
-                if is_multi_byte_encoding(self.encoding)
-                else encoding_languages(self.encoding)
-            )
-
-            if len(languages) == 0 or "Latin Based" in languages:
-                return "Unknown"
-
-            return languages[0]
-
-        return self._languages[0][0]
-
-    @property
-    def chaos(self) -> float:
-        return self._mean_mess_ratio
-
-    @property
-    def coherence(self) -> float:
-        if not self._languages:
-            return 0.0
-        return self._languages[0][1]
-
-    @property
-    def percent_chaos(self) -> float:
-        return round(self.chaos * 100, ndigits=3)
-
-    @property
-    def percent_coherence(self) -> float:
-        return round(self.coherence * 100, ndigits=3)
-
-    @property
-    def raw(self) -> bytes:
-        """
-        Original untouched bytes.
-        """
-        return self._payload
-
-    @property
-    def submatch(self) -> list[CharsetMatch]:
-        return self._leaves
-
-    @property
-    def has_submatch(self) -> bool:
-        return len(self._leaves) > 0
-
-    @property
-    def alphabets(self) -> list[str]:
-        if self._unicode_ranges is not None:
-            return self._unicode_ranges
-        # list detected ranges
-        detected_ranges: list[str | None] = [unicode_range(char) for char in str(self)]
-        # filter and sort
-        self._unicode_ranges = sorted(list({r for r in detected_ranges if r}))
-        return self._unicode_ranges
-
-    @property
-    def could_be_from_charset(self) -> list[str]:
-        """
-        The complete list of encoding that output the exact SAME str result and therefore could be the originating
-        encoding.
-        This list does include the encoding available in property 'encoding'.
-        """
-        return [self._encoding] + [m.encoding for m in self._leaves]
-
-    def output(self, encoding: str = "utf_8") -> bytes:
-        """
-        Method to get re-encoded bytes payload using given target encoding. Default to UTF-8.
-        Any errors will be simply ignored by the encoder NOT replaced.
-        """
-        if self._output_encoding is None or self._output_encoding != encoding:
-            self._output_encoding = encoding
-            decoded_string = str(self)
-            if (
-                self._preemptive_declaration is not None
-                and self._preemptive_declaration.lower()
-                not in ["utf-8", "utf8", "utf_8"]
-            ):
-                patched_header = sub(
-                    RE_POSSIBLE_ENCODING_INDICATION,
-                    lambda m: m.string[m.span()[0] : m.span()[1]].replace(
-                        m.groups()[0],
-                        iana_name(self._output_encoding).replace("_", "-"),  # type: ignore[arg-type]
-                    ),
-                    decoded_string[:8192],
-                    count=1,
-                )
-
-                decoded_string = patched_header + decoded_string[8192:]
-
-            self._output_payload = decoded_string.encode(encoding, "replace")
-
-        return self._output_payload  # type: ignore
-
-    @property
-    def fingerprint(self) -> str:
-        """
-        Retrieve the unique SHA256 computed using the transformed (re-encoded) payload. Not the original one.
-        """
-        return sha256(self.output()).hexdigest()
-
-
-class CharsetMatches:
-    """
-    Container with every CharsetMatch items ordered by default from most probable to the less one.
-    Act like a list(iterable) but does not implements all related methods.
-    """
-
-    def __init__(self, results: list[CharsetMatch] | None = None):
-        self._results: list[CharsetMatch] = sorted(results) if results else []
-
-    def __iter__(self) -> Iterator[CharsetMatch]:
-        yield from self._results
-
-    def __getitem__(self, item: int | str) -> CharsetMatch:
-        """
-        Retrieve a single item either by its position or encoding name (alias may be used here).
-        Raise KeyError upon invalid index or encoding not present in results.
-        """
-        if isinstance(item, int):
-            return self._results[item]
-        if isinstance(item, str):
-            item = iana_name(item, False)
-            for result in self._results:
-                if item in result.could_be_from_charset:
-                    return result
-        raise KeyError
-
-    def __len__(self) -> int:
-        return len(self._results)
-
-    def __bool__(self) -> bool:
-        return len(self._results) > 0
-
-    def append(self, item: CharsetMatch) -> None:
-        """
-        Insert a single match. Will be inserted accordingly to preserve sort.
-        Can be inserted as a submatch.
-        """
-        if not isinstance(item, CharsetMatch):
-            raise ValueError(
-                "Cannot append instance '{}' to CharsetMatches".format(
-                    str(item.__class__)
-                )
-            )
-        # We should disable the submatch factoring when the input file is too heavy (conserve RAM usage)
-        if len(item.raw) < TOO_BIG_SEQUENCE:
-            for match in self._results:
-                if match.fingerprint == item.fingerprint and match.chaos == item.chaos:
-                    match.add_submatch(item)
-                    return
-        self._results.append(item)
-        self._results = sorted(self._results)
-
-    def best(self) -> CharsetMatch | None:
-        """
-        Simply return the first match. Strict equivalent to matches[0].
-        """
-        if not self._results:
-            return None
-        return self._results[0]
-
-    def first(self) -> CharsetMatch | None:
-        """
-        Redundant method, call the method best(). Kept for BC reasons.
-        """
-        return self.best()
-
-
-CoherenceMatch = Tuple[str, float]
-CoherenceMatches = List[CoherenceMatch]
-
-
-class CliDetectionResult:
-    def __init__(
-        self,
-        path: str,
-        encoding: str | None,
-        encoding_aliases: list[str],
-        alternative_encodings: list[str],
-        language: str,
-        alphabets: list[str],
-        has_sig_or_bom: bool,
-        chaos: float,
-        coherence: float,
-        unicode_path: str | None,
-        is_preferred: bool,
-    ):
-        self.path: str = path
-        self.unicode_path: str | None = unicode_path
-        self.encoding: str | None = encoding
-        self.encoding_aliases: list[str] = encoding_aliases
-        self.alternative_encodings: list[str] = alternative_encodings
-        self.language: str = language
-        self.alphabets: list[str] = alphabets
-        self.has_sig_or_bom: bool = has_sig_or_bom
-        self.chaos: float = chaos
-        self.coherence: float = coherence
-        self.is_preferred: bool = is_preferred
-
-    @property
-    def __dict__(self) -> dict[str, Any]:  # type: ignore
-        return {
-            "path": self.path,
-            "encoding": self.encoding,
-            "encoding_aliases": self.encoding_aliases,
-            "alternative_encodings": self.alternative_encodings,
-            "language": self.language,
-            "alphabets": self.alphabets,
-            "has_sig_or_bom": self.has_sig_or_bom,
-            "chaos": self.chaos,
-            "coherence": self.coherence,
-            "unicode_path": self.unicode_path,
-            "is_preferred": self.is_preferred,
-        }
-
-    def to_json(self) -> str:
-        return dumps(self.__dict__, ensure_ascii=True, indent=4)
diff --git a/lib/charset_normalizer/py.typed b/lib/charset_normalizer/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/charset_normalizer/utils.py b/lib/charset_normalizer/utils.py
deleted file mode 100644
index 6bf0384c..00000000
--- a/lib/charset_normalizer/utils.py
+++ /dev/null
@@ -1,414 +0,0 @@
-from __future__ import annotations
-
-import importlib
-import logging
-import unicodedata
-from codecs import IncrementalDecoder
-from encodings.aliases import aliases
-from functools import lru_cache
-from re import findall
-from typing import Generator
-
-from _multibytecodec import (  # type: ignore[import-not-found,import]
-    MultibyteIncrementalDecoder,
-)
-
-from .constant import (
-    ENCODING_MARKS,
-    IANA_SUPPORTED_SIMILAR,
-    RE_POSSIBLE_ENCODING_INDICATION,
-    UNICODE_RANGES_COMBINED,
-    UNICODE_SECONDARY_RANGE_KEYWORD,
-    UTF8_MAXIMAL_ALLOCATION,
-    COMMON_CJK_CHARACTERS,
-)
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_accentuated(character: str) -> bool:
-    try:
-        description: str = unicodedata.name(character)
-    except ValueError:  # Defensive: unicode database outdated?
-        return False
-    return (
-        "WITH GRAVE" in description
-        or "WITH ACUTE" in description
-        or "WITH CEDILLA" in description
-        or "WITH DIAERESIS" in description
-        or "WITH CIRCUMFLEX" in description
-        or "WITH TILDE" in description
-        or "WITH MACRON" in description
-        or "WITH RING ABOVE" in description
-    )
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def remove_accent(character: str) -> str:
-    decomposed: str = unicodedata.decomposition(character)
-    if not decomposed:
-        return character
-
-    codes: list[str] = decomposed.split(" ")
-
-    return chr(int(codes[0], 16))
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def unicode_range(character: str) -> str | None:
-    """
-    Retrieve the Unicode range official name from a single character.
-    """
-    character_ord: int = ord(character)
-
-    for range_name, ord_range in UNICODE_RANGES_COMBINED.items():
-        if character_ord in ord_range:
-            return range_name
-
-    return None
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_latin(character: str) -> bool:
-    try:
-        description: str = unicodedata.name(character)
-    except ValueError:  # Defensive: unicode database outdated?
-        return False
-    return "LATIN" in description
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_punctuation(character: str) -> bool:
-    character_category: str = unicodedata.category(character)
-
-    if "P" in character_category:
-        return True
-
-    character_range: str | None = unicode_range(character)
-
-    if character_range is None:
-        return False
-
-    return "Punctuation" in character_range
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_symbol(character: str) -> bool:
-    character_category: str = unicodedata.category(character)
-
-    if "S" in character_category or "N" in character_category:
-        return True
-
-    character_range: str | None = unicode_range(character)
-
-    if character_range is None:
-        return False
-
-    return "Forms" in character_range and character_category != "Lo"
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_emoticon(character: str) -> bool:
-    character_range: str | None = unicode_range(character)
-
-    if character_range is None:
-        return False
-
-    return "Emoticons" in character_range or "Pictographs" in character_range
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_separator(character: str) -> bool:
-    if character.isspace() or character in {"｜", "+", "<", ">"}:
-        return True
-
-    character_category: str = unicodedata.category(character)
-
-    return "Z" in character_category or character_category in {"Po", "Pd", "Pc"}
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_case_variable(character: str) -> bool:
-    return character.islower() != character.isupper()
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_cjk(character: str) -> bool:
-    try:
-        character_name = unicodedata.name(character)
-    except ValueError:  # Defensive: unicode database outdated?
-        return False
-
-    return "CJK" in character_name
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_hiragana(character: str) -> bool:
-    try:
-        character_name = unicodedata.name(character)
-    except ValueError:  # Defensive: unicode database outdated?
-        return False
-
-    return "HIRAGANA" in character_name
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_katakana(character: str) -> bool:
-    try:
-        character_name = unicodedata.name(character)
-    except ValueError:  # Defensive: unicode database outdated?
-        return False
-
-    return "KATAKANA" in character_name
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_hangul(character: str) -> bool:
-    try:
-        character_name = unicodedata.name(character)
-    except ValueError:  # Defensive: unicode database outdated?
-        return False
-
-    return "HANGUL" in character_name
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_thai(character: str) -> bool:
-    try:
-        character_name = unicodedata.name(character)
-    except ValueError:  # Defensive: unicode database outdated?
-        return False
-
-    return "THAI" in character_name
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_arabic(character: str) -> bool:
-    try:
-        character_name = unicodedata.name(character)
-    except ValueError:  # Defensive: unicode database outdated?
-        return False
-
-    return "ARABIC" in character_name
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_arabic_isolated_form(character: str) -> bool:
-    try:
-        character_name = unicodedata.name(character)
-    except ValueError:  # Defensive: unicode database outdated?
-        return False
-
-    return "ARABIC" in character_name and "ISOLATED FORM" in character_name
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_cjk_uncommon(character: str) -> bool:
-    return character not in COMMON_CJK_CHARACTERS
-
-
-@lru_cache(maxsize=len(UNICODE_RANGES_COMBINED))
-def is_unicode_range_secondary(range_name: str) -> bool:
-    return any(keyword in range_name for keyword in UNICODE_SECONDARY_RANGE_KEYWORD)
-
-
-@lru_cache(maxsize=UTF8_MAXIMAL_ALLOCATION)
-def is_unprintable(character: str) -> bool:
-    return (
-        character.isspace() is False  # includes \n \t \r \v
-        and character.isprintable() is False
-        and character != "\x1a"  # Why? Its the ASCII substitute character.
-        and character != "\ufeff"  # bug discovered in Python,
-        # Zero Width No-Break Space located in 	Arabic Presentation Forms-B, Unicode 1.1 not acknowledged as space.
-    )
-
-
-def any_specified_encoding(sequence: bytes, search_zone: int = 8192) -> str | None:
-    """
-    Extract using ASCII-only decoder any specified encoding in the first n-bytes.
-    """
-    if not isinstance(sequence, bytes):
-        raise TypeError
-
-    seq_len: int = len(sequence)
-
-    results: list[str] = findall(
-        RE_POSSIBLE_ENCODING_INDICATION,
-        sequence[: min(seq_len, search_zone)].decode("ascii", errors="ignore"),
-    )
-
-    if len(results) == 0:
-        return None
-
-    for specified_encoding in results:
-        specified_encoding = specified_encoding.lower().replace("-", "_")
-
-        encoding_alias: str
-        encoding_iana: str
-
-        for encoding_alias, encoding_iana in aliases.items():
-            if encoding_alias == specified_encoding:
-                return encoding_iana
-            if encoding_iana == specified_encoding:
-                return encoding_iana
-
-    return None
-
-
-@lru_cache(maxsize=128)
-def is_multi_byte_encoding(name: str) -> bool:
-    """
-    Verify is a specific encoding is a multi byte one based on it IANA name
-    """
-    return name in {
-        "utf_8",
-        "utf_8_sig",
-        "utf_16",
-        "utf_16_be",
-        "utf_16_le",
-        "utf_32",
-        "utf_32_le",
-        "utf_32_be",
-        "utf_7",
-    } or issubclass(
-        importlib.import_module(f"encodings.{name}").IncrementalDecoder,
-        MultibyteIncrementalDecoder,
-    )
-
-
-def identify_sig_or_bom(sequence: bytes) -> tuple[str | None, bytes]:
-    """
-    Identify and extract SIG/BOM in given sequence.
-    """
-
-    for iana_encoding in ENCODING_MARKS:
-        marks: bytes | list[bytes] = ENCODING_MARKS[iana_encoding]
-
-        if isinstance(marks, bytes):
-            marks = [marks]
-
-        for mark in marks:
-            if sequence.startswith(mark):
-                return iana_encoding, mark
-
-    return None, b""
-
-
-def should_strip_sig_or_bom(iana_encoding: str) -> bool:
-    return iana_encoding not in {"utf_16", "utf_32"}
-
-
-def iana_name(cp_name: str, strict: bool = True) -> str:
-    """Returns the Python normalized encoding name (Not the IANA official name)."""
-    cp_name = cp_name.lower().replace("-", "_")
-
-    encoding_alias: str
-    encoding_iana: str
-
-    for encoding_alias, encoding_iana in aliases.items():
-        if cp_name in [encoding_alias, encoding_iana]:
-            return encoding_iana
-
-    if strict:
-        raise ValueError(f"Unable to retrieve IANA for '{cp_name}'")
-
-    return cp_name
-
-
-def cp_similarity(iana_name_a: str, iana_name_b: str) -> float:
-    if is_multi_byte_encoding(iana_name_a) or is_multi_byte_encoding(iana_name_b):
-        return 0.0
-
-    decoder_a = importlib.import_module(f"encodings.{iana_name_a}").IncrementalDecoder
-    decoder_b = importlib.import_module(f"encodings.{iana_name_b}").IncrementalDecoder
-
-    id_a: IncrementalDecoder = decoder_a(errors="ignore")
-    id_b: IncrementalDecoder = decoder_b(errors="ignore")
-
-    character_match_count: int = 0
-
-    for i in range(255):
-        to_be_decoded: bytes = bytes([i])
-        if id_a.decode(to_be_decoded) == id_b.decode(to_be_decoded):
-            character_match_count += 1
-
-    return character_match_count / 254
-
-
-def is_cp_similar(iana_name_a: str, iana_name_b: str) -> bool:
-    """
-    Determine if two code page are at least 80% similar. IANA_SUPPORTED_SIMILAR dict was generated using
-    the function cp_similarity.
-    """
-    return (
-        iana_name_a in IANA_SUPPORTED_SIMILAR
-        and iana_name_b in IANA_SUPPORTED_SIMILAR[iana_name_a]
-    )
-
-
-def set_logging_handler(
-    name: str = "charset_normalizer",
-    level: int = logging.INFO,
-    format_string: str = "%(asctime)s | %(levelname)s | %(message)s",
-) -> None:
-    logger = logging.getLogger(name)
-    logger.setLevel(level)
-
-    handler = logging.StreamHandler()
-    handler.setFormatter(logging.Formatter(format_string))
-    logger.addHandler(handler)
-
-
-def cut_sequence_chunks(
-    sequences: bytes,
-    encoding_iana: str,
-    offsets: range,
-    chunk_size: int,
-    bom_or_sig_available: bool,
-    strip_sig_or_bom: bool,
-    sig_payload: bytes,
-    is_multi_byte_decoder: bool,
-    decoded_payload: str | None = None,
-) -> Generator[str, None, None]:
-    if decoded_payload and is_multi_byte_decoder is False:
-        for i in offsets:
-            chunk = decoded_payload[i : i + chunk_size]
-            if not chunk:
-                break
-            yield chunk
-    else:
-        for i in offsets:
-            chunk_end = i + chunk_size
-            if chunk_end > len(sequences) + 8:
-                continue
-
-            cut_sequence = sequences[i : i + chunk_size]
-
-            if bom_or_sig_available and strip_sig_or_bom is False:
-                cut_sequence = sig_payload + cut_sequence
-
-            chunk = cut_sequence.decode(
-                encoding_iana,
-                errors="ignore" if is_multi_byte_decoder else "strict",
-            )
-
-            # multi-byte bad cutting detector and adjustment
-            # not the cleanest way to perform that fix but clever enough for now.
-            if is_multi_byte_decoder and i > 0:
-                chunk_partial_size_chk: int = min(chunk_size, 16)
-
-                if (
-                    decoded_payload
-                    and chunk[:chunk_partial_size_chk] not in decoded_payload
-                ):
-                    for j in range(i, i - 4, -1):
-                        cut_sequence = sequences[j:chunk_end]
-
-                        if bom_or_sig_available and strip_sig_or_bom is False:
-                            cut_sequence = sig_payload + cut_sequence
-
-                        chunk = cut_sequence.decode(encoding_iana, errors="ignore")
-
-                        if chunk[:chunk_partial_size_chk] in decoded_payload:
-                            break
-
-            yield chunk
diff --git a/lib/charset_normalizer/version.py b/lib/charset_normalizer/version.py
deleted file mode 100644
index e5687e3c..00000000
--- a/lib/charset_normalizer/version.py
+++ /dev/null
@@ -1,8 +0,0 @@
-"""
-Expose version
-"""
-
-from __future__ import annotations
-
-__version__ = "3.4.2"
-VERSION = __version__.split(".")
diff --git a/lib/cheroot/__init__.py b/lib/cheroot/__init__.py
deleted file mode 100644
index aac9cd98..00000000
--- a/lib/cheroot/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-"""High-performance, pure-Python HTTP server used by CherryPy."""
-
-try:
-    from importlib import metadata
-except ImportError:
-    import importlib_metadata as metadata  # noqa: WPS440
-
-
-try:
-    __version__ = metadata.version('cheroot')
-except Exception:
-    __version__ = 'unknown'
diff --git a/lib/cheroot/__init__.pyi b/lib/cheroot/__init__.pyi
deleted file mode 100644
index bda5b5a7..00000000
--- a/lib/cheroot/__init__.pyi
+++ /dev/null
@@ -1 +0,0 @@
-__version__: str
diff --git a/lib/cheroot/__main__.py b/lib/cheroot/__main__.py
deleted file mode 100644
index d2e27c10..00000000
--- a/lib/cheroot/__main__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-"""Stub for accessing the Cheroot CLI tool."""
-
-from .cli import main
-
-if __name__ == '__main__':
-    main()
diff --git a/lib/cheroot/_compat.py b/lib/cheroot/_compat.py
deleted file mode 100644
index dbe5c6d2..00000000
--- a/lib/cheroot/_compat.py
+++ /dev/null
@@ -1,84 +0,0 @@
-# pylint: disable=unused-import
-"""Compatibility code for using Cheroot with various versions of Python."""
-
-import os
-import platform
-
-
-try:
-    import ssl
-    IS_ABOVE_OPENSSL10 = ssl.OPENSSL_VERSION_INFO >= (1, 1)
-    del ssl
-except ImportError:
-    IS_ABOVE_OPENSSL10 = None
-
-
-IS_CI = bool(os.getenv('CI'))
-IS_GITHUB_ACTIONS_WORKFLOW = bool(os.getenv('GITHUB_WORKFLOW'))
-
-
-IS_PYPY = platform.python_implementation() == 'PyPy'
-
-
-SYS_PLATFORM = platform.system()
-IS_WINDOWS = SYS_PLATFORM == 'Windows'
-IS_LINUX = SYS_PLATFORM == 'Linux'
-IS_MACOS = SYS_PLATFORM == 'Darwin'
-IS_SOLARIS = SYS_PLATFORM == 'SunOS'
-
-PLATFORM_ARCH = platform.machine()
-IS_PPC = PLATFORM_ARCH.startswith('ppc')
-
-
-def ntob(n, encoding='ISO-8859-1'):
-    """Return the native string as bytes in the given encoding."""
-    assert_native(n)
-    # In Python 3, the native string type is unicode
-    return n.encode(encoding)
-
-
-def ntou(n, encoding='ISO-8859-1'):
-    """Return the native string as Unicode with the given encoding."""
-    assert_native(n)
-    # In Python 3, the native string type is unicode
-    return n
-
-
-def bton(b, encoding='ISO-8859-1'):
-    """Return the byte string as native string in the given encoding."""
-    return b.decode(encoding)
-
-
-def assert_native(n):
-    """Check whether the input is of native :py:class:`str` type.
-
-    Raises:
-        TypeError: in case of failed check
-
-    """
-    if not isinstance(n, str):
-        raise TypeError('n must be a native str (got %s)' % type(n).__name__)
-
-
-def extract_bytes(mv):
-    r"""Retrieve bytes out of the given input buffer.
-
-    :param mv: input :py:func:`buffer`
-    :type mv: memoryview or bytes
-
-    :return: unwrapped bytes
-    :rtype: bytes
-
-    :raises ValueError: if the input is not one of \
-                        :py:class:`memoryview`/:py:func:`buffer` \
-                        or :py:class:`bytes`
-    """
-    if isinstance(mv, memoryview):
-        return mv.tobytes()
-
-    if isinstance(mv, bytes):
-        return mv
-
-    raise ValueError(
-        'extract_bytes() only accepts bytes and memoryview/buffer',
-    )
diff --git a/lib/cheroot/_compat.pyi b/lib/cheroot/_compat.pyi
deleted file mode 100644
index 67d93cf6..00000000
--- a/lib/cheroot/_compat.pyi
+++ /dev/null
@@ -1,22 +0,0 @@
-from typing import Any, ContextManager, Optional, Type, Union
-
-def suppress(*exceptions: Type[BaseException]) -> ContextManager[None]: ...
-
-IS_ABOVE_OPENSSL10: Optional[bool]
-IS_CI: bool
-IS_GITHUB_ACTIONS_WORKFLOW: bool
-IS_PYPY: bool
-SYS_PLATFORM: str
-IS_WINDOWS: bool
-IS_LINUX: bool
-IS_MACOS: bool
-IS_SOLARIS: bool
-PLATFORM_ARCH: str
-IS_PPC: bool
-
-def ntob(n: str, encoding: str = ...) -> bytes: ...
-def ntou(n: str, encoding: str = ...) -> str: ...
-def bton(b: bytes, encoding: str = ...) -> str: ...
-def assert_native(n: str) -> None: ...
-
-def extract_bytes(mv: Union[memoryview, bytes]) -> bytes: ...
diff --git a/lib/cheroot/cli.py b/lib/cheroot/cli.py
deleted file mode 100644
index cd168e91..00000000
--- a/lib/cheroot/cli.py
+++ /dev/null
@@ -1,243 +0,0 @@
-"""Command line tool for starting a Cheroot WSGI/HTTP server instance.
-
-Basic usage:
-
-.. code-block:: shell-session
-
-    $ # Start a server on 127.0.0.1:8000 with the default settings
-    $ # for the WSGI app myapp/wsgi.py:application()
-    $ cheroot myapp.wsgi
-
-    $ # Start a server on 0.0.0.0:9000 with 8 threads
-    $ # for the WSGI app myapp/wsgi.py:main_app()
-    $ cheroot myapp.wsgi:main_app --bind 0.0.0.0:9000 --threads 8
-
-    $ # Start a server for the cheroot.server.Gateway subclass
-    $ # myapp/gateway.py:HTTPGateway
-    $ cheroot myapp.gateway:HTTPGateway
-
-    $ # Start a server on the UNIX socket /var/spool/myapp.sock
-    $ cheroot myapp.wsgi --bind /var/spool/myapp.sock
-
-    $ # Start a server on the abstract UNIX socket CherootServer
-    $ cheroot myapp.wsgi --bind @CherootServer
-
-.. spelling::
-
-   cli
-"""
-
-import argparse
-import os
-import sys
-import urllib.parse  # noqa: WPS301
-from importlib import import_module
-from contextlib import suppress
-
-from . import server
-from . import wsgi
-
-
-class BindLocation:
-    """A class for storing the bind location for a Cheroot instance."""
-
-
-class TCPSocket(BindLocation):
-    """TCPSocket."""
-
-    def __init__(self, address, port):
-        """Initialize.
-
-        Args:
-            address (str): Host name or IP address
-            port (int): TCP port number
-
-        """
-        self.bind_addr = address, port
-
-
-class UnixSocket(BindLocation):
-    """UnixSocket."""
-
-    def __init__(self, path):
-        """Initialize."""
-        self.bind_addr = path
-
-
-class AbstractSocket(BindLocation):
-    """AbstractSocket."""
-
-    def __init__(self, abstract_socket):
-        """Initialize."""
-        self.bind_addr = '\x00{sock_path}'.format(sock_path=abstract_socket)
-
-
-class Application:
-    """Application."""
-
-    @classmethod
-    def resolve(cls, full_path):
-        """Read WSGI app/Gateway path string and import application module."""
-        mod_path, _, app_path = full_path.partition(':')
-        app = getattr(import_module(mod_path), app_path or 'application')
-        # suppress the `TypeError` exception, just in case `app` is not a class
-        with suppress(TypeError):
-            if issubclass(app, server.Gateway):
-                return GatewayYo(app)
-
-        return cls(app)
-
-    def __init__(self, wsgi_app):
-        """Initialize."""
-        if not callable(wsgi_app):
-            raise TypeError(
-                'Application must be a callable object or '
-                'cheroot.server.Gateway subclass',
-            )
-        self.wsgi_app = wsgi_app
-
-    def server_args(self, parsed_args):
-        """Return keyword args for Server class."""
-        args = {
-            arg: value
-            for arg, value in vars(parsed_args).items()
-            if not arg.startswith('_') and value is not None
-        }
-        args.update(vars(self))
-        return args
-
-    def server(self, parsed_args):
-        """Server."""
-        return wsgi.Server(**self.server_args(parsed_args))
-
-
-class GatewayYo:
-    """Gateway."""
-
-    def __init__(self, gateway):
-        """Init."""
-        self.gateway = gateway
-
-    def server(self, parsed_args):
-        """Server."""
-        server_args = vars(self)
-        server_args['bind_addr'] = parsed_args['bind_addr']
-        if parsed_args.max is not None:
-            server_args['maxthreads'] = parsed_args.max
-        if parsed_args.numthreads is not None:
-            server_args['minthreads'] = parsed_args.numthreads
-        return server.HTTPServer(**server_args)
-
-
-def parse_wsgi_bind_location(bind_addr_string):
-    """Convert bind address string to a BindLocation."""
-    # if the string begins with an @ symbol, use an abstract socket,
-    # this is the first condition to verify, otherwise the urlparse
-    # validation would detect //@<value> as a valid url with a hostname
-    # with value: "<value>" and port: None
-    if bind_addr_string.startswith('@'):
-        return AbstractSocket(bind_addr_string[1:])
-
-    # try and match for an IP/hostname and port
-    match = urllib.parse.urlparse(
-        '//{addr}'.format(addr=bind_addr_string),
-    )
-    try:
-        addr = match.hostname
-        port = match.port
-        if addr is not None or port is not None:
-            return TCPSocket(addr, port)
-    except ValueError:
-        pass
-
-    # else, assume a UNIX socket path
-    return UnixSocket(path=bind_addr_string)
-
-
-def parse_wsgi_bind_addr(bind_addr_string):
-    """Convert bind address string to bind address parameter."""
-    return parse_wsgi_bind_location(bind_addr_string).bind_addr
-
-
-_arg_spec = {
-    '_wsgi_app': {
-        'metavar': 'APP_MODULE',
-        'type': Application.resolve,
-        'help': 'WSGI application callable or cheroot.server.Gateway subclass',
-    },
-    '--bind': {
-        'metavar': 'ADDRESS',
-        'dest': 'bind_addr',
-        'type': parse_wsgi_bind_addr,
-        'default': '[::1]:8000',
-        'help': 'Network interface to listen on (default: [::1]:8000)',
-    },
-    '--chdir': {
-        'metavar': 'PATH',
-        'type': os.chdir,
-        'help': 'Set the working directory',
-    },
-    '--server-name': {
-        'dest': 'server_name',
-        'type': str,
-        'help': 'Web server name to be advertised via Server HTTP header',
-    },
-    '--threads': {
-        'metavar': 'INT',
-        'dest': 'numthreads',
-        'type': int,
-        'help': 'Minimum number of worker threads',
-    },
-    '--max-threads': {
-        'metavar': 'INT',
-        'dest': 'max',
-        'type': int,
-        'help': 'Maximum number of worker threads',
-    },
-    '--timeout': {
-        'metavar': 'INT',
-        'dest': 'timeout',
-        'type': int,
-        'help': 'Timeout in seconds for accepted connections',
-    },
-    '--shutdown-timeout': {
-        'metavar': 'INT',
-        'dest': 'shutdown_timeout',
-        'type': int,
-        'help': 'Time in seconds to wait for worker threads to cleanly exit',
-    },
-    '--request-queue-size': {
-        'metavar': 'INT',
-        'dest': 'request_queue_size',
-        'type': int,
-        'help': 'Maximum number of queued connections',
-    },
-    '--accepted-queue-size': {
-        'metavar': 'INT',
-        'dest': 'accepted_queue_size',
-        'type': int,
-        'help': 'Maximum number of active requests in queue',
-    },
-    '--accepted-queue-timeout': {
-        'metavar': 'INT',
-        'dest': 'accepted_queue_timeout',
-        'type': int,
-        'help': 'Timeout in seconds for putting requests into queue',
-    },
-}
-
-
-def main():
-    """Create a new Cheroot instance with arguments from the command line."""
-    parser = argparse.ArgumentParser(
-        description='Start an instance of the Cheroot WSGI/HTTP server.',
-    )
-    for arg, spec in _arg_spec.items():
-        parser.add_argument(arg, **spec)
-    raw_args = parser.parse_args()
-
-    # ensure cwd in sys.path
-    '' in sys.path or sys.path.insert(0, '')
-
-    # create a server based on the arguments provided
-    raw_args._wsgi_app.server(raw_args).safe_start()
diff --git a/lib/cheroot/cli.pyi b/lib/cheroot/cli.pyi
deleted file mode 100644
index b9803b3e..00000000
--- a/lib/cheroot/cli.pyi
+++ /dev/null
@@ -1,32 +0,0 @@
-from typing import Any
-
-class BindLocation: ...
-
-class TCPSocket(BindLocation):
-    bind_addr: Any
-    def __init__(self, address, port) -> None: ...
-
-class UnixSocket(BindLocation):
-    bind_addr: Any
-    def __init__(self, path) -> None: ...
-
-class AbstractSocket(BindLocation):
-    bind_addr: Any
-    def __init__(self, abstract_socket) -> None: ...
-
-class Application:
-    @classmethod
-    def resolve(cls, full_path): ...
-    wsgi_app: Any
-    def __init__(self, wsgi_app) -> None: ...
-    def server_args(self, parsed_args): ...
-    def server(self, parsed_args): ...
-
-class GatewayYo:
-    gateway: Any
-    def __init__(self, gateway) -> None: ...
-    def server(self, parsed_args): ...
-
-def parse_wsgi_bind_location(bind_addr_string: str): ...
-def parse_wsgi_bind_addr(bind_addr_string: str): ...
-def main() -> None: ...
diff --git a/lib/cheroot/connections.py b/lib/cheroot/connections.py
deleted file mode 100644
index df70e6ea..00000000
--- a/lib/cheroot/connections.py
+++ /dev/null
@@ -1,398 +0,0 @@
-"""Utilities to manage open connections."""
-
-import io
-import os
-import socket
-import threading
-import time
-import selectors
-from contextlib import suppress
-
-from . import errors
-from ._compat import IS_WINDOWS
-from .makefile import MakeFile
-
-try:
-    import fcntl
-except ImportError:
-    try:
-        from ctypes import windll, WinError
-        import ctypes.wintypes
-        _SetHandleInformation = windll.kernel32.SetHandleInformation
-        _SetHandleInformation.argtypes = [
-            ctypes.wintypes.HANDLE,
-            ctypes.wintypes.DWORD,
-            ctypes.wintypes.DWORD,
-        ]
-        _SetHandleInformation.restype = ctypes.wintypes.BOOL
-    except ImportError:
-        def prevent_socket_inheritance(sock):
-            """Stub inheritance prevention.
-
-            Dummy function, since neither fcntl nor ctypes are available.
-            """
-            pass
-    else:
-        def prevent_socket_inheritance(sock):
-            """Mark the given socket fd as non-inheritable (Windows)."""
-            if not _SetHandleInformation(sock.fileno(), 1, 0):
-                raise WinError()
-else:
-    def prevent_socket_inheritance(sock):
-        """Mark the given socket fd as non-inheritable (POSIX)."""
-        fd = sock.fileno()
-        old_flags = fcntl.fcntl(fd, fcntl.F_GETFD)
-        fcntl.fcntl(fd, fcntl.F_SETFD, old_flags | fcntl.FD_CLOEXEC)
-
-
-class _ThreadsafeSelector:
-    """Thread-safe wrapper around a DefaultSelector.
-
-    There are 2 thread contexts in which it may be accessed:
-      * the selector thread
-      * one of the worker threads in workers/threadpool.py
-
-    The expected read/write patterns are:
-      * :py:func:`~iter`: selector thread
-      * :py:meth:`register`: selector thread and threadpool,
-        via :py:meth:`~cheroot.workers.threadpool.ThreadPool.put`
-      * :py:meth:`unregister`: selector thread only
-
-    Notably, this means :py:class:`_ThreadsafeSelector` never needs to worry
-    that connections will be removed behind its back.
-
-    The lock is held when iterating or modifying the selector but is not
-    required when :py:meth:`select()ing <selectors.BaseSelector.select>` on it.
-    """
-
-    def __init__(self):
-        self._selector = selectors.DefaultSelector()
-        self._lock = threading.Lock()
-
-    def __len__(self):
-        with self._lock:
-            return len(self._selector.get_map() or {})
-
-    @property
-    def connections(self):
-        """Retrieve connections registered with the selector."""
-        with self._lock:
-            mapping = self._selector.get_map() or {}
-            for _, (_, sock_fd, _, conn) in mapping.items():
-                yield (sock_fd, conn)
-
-    def register(self, fileobj, events, data=None):
-        """Register ``fileobj`` with the selector."""
-        with self._lock:
-            return self._selector.register(fileobj, events, data)
-
-    def unregister(self, fileobj):
-        """Unregister ``fileobj`` from the selector."""
-        with self._lock:
-            return self._selector.unregister(fileobj)
-
-    def select(self, timeout=None):
-        """Return socket fd and data pairs from selectors.select call.
-
-        Returns entries ready to read in the form:
-            (socket_file_descriptor, connection)
-        """
-        return (
-            (key.fd, key.data)
-            for key, _ in self._selector.select(timeout=timeout)
-        )
-
-    def close(self):
-        """Close the selector."""
-        with self._lock:
-            self._selector.close()
-
-
-class ConnectionManager:
-    """Class which manages HTTPConnection objects.
-
-    This is for connections which are being kept-alive for follow-up requests.
-    """
-
-    def __init__(self, server):
-        """Initialize ConnectionManager object.
-
-        Args:
-            server (cheroot.server.HTTPServer): web server object
-                that uses this ConnectionManager instance.
-        """
-        self._serving = False
-        self._stop_requested = False
-
-        self.server = server
-        self._selector = _ThreadsafeSelector()
-
-        self._selector.register(
-            server.socket.fileno(),
-            selectors.EVENT_READ, data=server,
-        )
-
-    def put(self, conn):
-        """Put idle connection into the ConnectionManager to be managed.
-
-        :param conn: HTTP connection to be managed
-        :type conn: cheroot.server.HTTPConnection
-        """
-        conn.last_used = time.time()
-        # if this conn doesn't have any more data waiting to be read,
-        # register it with the selector.
-        if conn.rfile.has_data():
-            self.server.process_conn(conn)
-        else:
-            self._selector.register(
-                conn.socket.fileno(), selectors.EVENT_READ, data=conn,
-            )
-
-    def _expire(self, threshold):
-        r"""Expire least recently used connections.
-
-        :param threshold: Connections that have not been used within this \
-                          duration (in seconds), are considered expired and \
-                          are closed and removed.
-        :type threshold: float
-
-        This should be called periodically.
-        """
-        # find any connections still registered with the selector
-        # that have not been active recently enough.
-        timed_out_connections = [
-            (sock_fd, conn)
-            for (sock_fd, conn) in self._selector.connections
-            if conn != self.server and conn.last_used < threshold
-        ]
-        for sock_fd, conn in timed_out_connections:
-            self._selector.unregister(sock_fd)
-            conn.close()
-
-    def stop(self):
-        """Stop the selector loop in run() synchronously.
-
-        May take up to half a second.
-        """
-        self._stop_requested = True
-        while self._serving:
-            time.sleep(0.01)
-
-    def run(self, expiration_interval):
-        """Run the connections selector indefinitely.
-
-        Args:
-            expiration_interval (float): Interval, in seconds, at which
-                connections will be checked for expiration.
-
-        Connections that are ready to process are submitted via
-        self.server.process_conn()
-
-        Connections submitted for processing must be `put()`
-        back if they should be examined again for another request.
-
-        Can be shut down by calling `stop()`.
-        """
-        self._serving = True
-        try:
-            self._run(expiration_interval)
-        finally:
-            self._serving = False
-
-    def _run(self, expiration_interval):
-        r"""Run connection handler loop until stop was requested.
-
-        :param expiration_interval: Interval, in seconds, at which \
-                                    connections will be checked for \
-                                    expiration.
-        :type expiration_interval: float
-
-        Use ``expiration_interval`` as ``select()`` timeout
-        to assure expired connections are closed in time.
-
-        On Windows cap the timeout to 0.05 seconds
-        as ``select()`` does not return when a socket is ready.
-        """
-        last_expiration_check = time.time()
-        if IS_WINDOWS:
-            # 0.05 seconds are used as an empirically obtained balance between
-            # max connection delay and idle system load. Benchmarks show a
-            # mean processing time per connection of ~0.03 seconds on Linux
-            # and with 0.01 seconds timeout on Windows:
-            # https://github.com/cherrypy/cheroot/pull/352
-            # While this highly depends on system and hardware, 0.05 seconds
-            # max delay should hence usually not significantly increase the
-            # mean time/delay per connection, but significantly reduce idle
-            # system load by reducing socket loops to 1/5 with 0.01 seconds.
-            select_timeout = min(expiration_interval, 0.05)
-        else:
-            select_timeout = expiration_interval
-
-        while not self._stop_requested:
-            try:
-                active_list = self._selector.select(timeout=select_timeout)
-            except OSError:
-                self._remove_invalid_sockets()
-                continue
-
-            for (sock_fd, conn) in active_list:
-                if conn is self.server:
-                    # New connection
-                    new_conn = self._from_server_socket(self.server.socket)
-                    if new_conn is not None:
-                        self.server.process_conn(new_conn)
-                else:
-                    # unregister connection from the selector until the server
-                    # has read from it and returned it via put()
-                    self._selector.unregister(sock_fd)
-                    self.server.process_conn(conn)
-
-            now = time.time()
-            if (now - last_expiration_check) > expiration_interval:
-                self._expire(threshold=now - self.server.timeout)
-                last_expiration_check = now
-
-    def _remove_invalid_sockets(self):
-        """Clean up the resources of any broken connections.
-
-        This method attempts to detect any connections in an invalid state,
-        unregisters them from the selector and closes the file descriptors of
-        the corresponding network sockets where possible.
-        """
-        invalid_conns = []
-        for sock_fd, conn in self._selector.connections:
-            if conn is self.server:
-                continue
-
-            try:
-                os.fstat(sock_fd)
-            except OSError:
-                invalid_conns.append((sock_fd, conn))
-
-        for sock_fd, conn in invalid_conns:
-            self._selector.unregister(sock_fd)
-            # One of the reason on why a socket could cause an error
-            # is that the socket is already closed, ignore the
-            # socket error if we try to close it at this point.
-            with suppress(OSError):
-                conn.close()
-
-    def _from_server_socket(self, server_socket):  # noqa: C901  # FIXME
-        try:
-            s, addr = server_socket.accept()
-            if self.server.stats['Enabled']:
-                self.server.stats['Accepts'] += 1
-            prevent_socket_inheritance(s)
-            if hasattr(s, 'settimeout'):
-                s.settimeout(self.server.timeout)
-
-            mf = MakeFile
-            ssl_env = {}
-            # if ssl cert and key are set, we try to be a secure HTTP server
-            if self.server.ssl_adapter is not None:
-                try:
-                    s, ssl_env = self.server.ssl_adapter.wrap(s)
-                except errors.FatalSSLAlert as tls_connection_drop_error:
-                    self.server.error_log(
-                        f'Client {addr !s} lost — peer dropped the TLS '
-                        'connection suddenly, during handshake: '
-                        f'{tls_connection_drop_error !s}',
-                    )
-                    return
-                except errors.NoSSLError as http_over_https_err:
-                    self.server.error_log(
-                        f'Client {addr !s} attempted to speak plain HTTP into '
-                        'a TCP connection configured for TLS-only traffic — '
-                        'trying to send back a plain HTTP error response: '
-                        f'{http_over_https_err !s}',
-                    )
-                    msg = (
-                        'The client sent a plain HTTP request, but '
-                        'this server only speaks HTTPS on this port.'
-                    )
-                    buf = [
-                        '%s 400 Bad Request\r\n' % self.server.protocol,
-                        'Content-Length: %s\r\n' % len(msg),
-                        'Content-Type: text/plain\r\n\r\n',
-                        msg,
-                    ]
-
-                    wfile = mf(s, 'wb', io.DEFAULT_BUFFER_SIZE)
-                    try:
-                        wfile.write(''.join(buf).encode('ISO-8859-1'))
-                    except OSError as ex:
-                        if ex.args[0] not in errors.socket_errors_to_ignore:
-                            raise
-                    return
-                mf = self.server.ssl_adapter.makefile
-                # Re-apply our timeout since we may have a new socket object
-                if hasattr(s, 'settimeout'):
-                    s.settimeout(self.server.timeout)
-
-            conn = self.server.ConnectionClass(self.server, s, mf)
-
-            if not isinstance(self.server.bind_addr, (str, bytes)):
-                # optional values
-                # Until we do DNS lookups, omit REMOTE_HOST
-                if addr is None:  # sometimes this can happen
-                    # figure out if AF_INET or AF_INET6.
-                    if len(s.getsockname()) == 2:
-                        # AF_INET
-                        addr = ('0.0.0.0', 0)
-                    else:
-                        # AF_INET6
-                        addr = ('::', 0)
-                conn.remote_addr = addr[0]
-                conn.remote_port = addr[1]
-
-            conn.ssl_env = ssl_env
-            return conn
-
-        except socket.timeout:
-            # The only reason for the timeout in start() is so we can
-            # notice keyboard interrupts on Win32, which don't interrupt
-            # accept() by default
-            return
-        except OSError as ex:
-            if self.server.stats['Enabled']:
-                self.server.stats['Socket Errors'] += 1
-            if ex.args[0] in errors.socket_error_eintr:
-                # I *think* this is right. EINTR should occur when a signal
-                # is received during the accept() call; all docs say retry
-                # the call, and I *think* I'm reading it right that Python
-                # will then go ahead and poll for and handle the signal
-                # elsewhere. See
-                # https://github.com/cherrypy/cherrypy/issues/707.
-                return
-            if ex.args[0] in errors.socket_errors_nonblocking:
-                # Just try again. See
-                # https://github.com/cherrypy/cherrypy/issues/479.
-                return
-            if ex.args[0] in errors.socket_errors_to_ignore:
-                # Our socket was closed.
-                # See https://github.com/cherrypy/cherrypy/issues/686.
-                return
-            raise
-
-    def close(self):
-        """Close all monitored connections."""
-        for (_, conn) in self._selector.connections:
-            if conn is not self.server:  # server closes its own socket
-                conn.close()
-        self._selector.close()
-
-    @property
-    def _num_connections(self):
-        """Return the current number of connections.
-
-        Includes all connections registered with the selector,
-        minus one for the server socket, which is always registered
-        with the selector.
-        """
-        return len(self._selector) - 1
-
-    @property
-    def can_add_keepalive_connection(self):
-        """Flag whether it is allowed to add a new keep-alive connection."""
-        ka_limit = self.server.keep_alive_conn_limit
-        return ka_limit is None or self._num_connections < ka_limit
diff --git a/lib/cheroot/connections.pyi b/lib/cheroot/connections.pyi
deleted file mode 100644
index 528ad765..00000000
--- a/lib/cheroot/connections.pyi
+++ /dev/null
@@ -1,23 +0,0 @@
-from typing import Any
-
-def prevent_socket_inheritance(sock) -> None: ...
-
-class _ThreadsafeSelector:
-    def __init__(self) -> None: ...
-    def __len__(self): ...
-    @property
-    def connections(self) -> None: ...
-    def register(self, fileobj, events, data: Any | None = ...): ...
-    def unregister(self, fileobj): ...
-    def select(self, timeout: Any | None = ...): ...
-    def close(self) -> None: ...
-
-class ConnectionManager:
-    server: Any
-    def __init__(self, server) -> None: ...
-    def put(self, conn) -> None: ...
-    def stop(self) -> None: ...
-    def run(self, expiration_interval) -> None: ...
-    def close(self) -> None: ...
-    @property
-    def can_add_keepalive_connection(self): ...
diff --git a/lib/cheroot/errors.py b/lib/cheroot/errors.py
deleted file mode 100644
index f6b588c2..00000000
--- a/lib/cheroot/errors.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Collection of exceptions raised and/or processed by Cheroot."""
-
-import errno
-import sys
-
-
-class MaxSizeExceeded(Exception):
-    """Exception raised when a client sends more data then allowed under limit.
-
-    Depends on ``request.body.maxbytes`` config option if used within CherryPy.
-    """
-
-
-class NoSSLError(Exception):
-    """Exception raised when a client speaks HTTP to an HTTPS socket."""
-
-
-class FatalSSLAlert(Exception):
-    """Exception raised when the SSL implementation signals a fatal alert."""
-
-
-def plat_specific_errors(*errnames):
-    """Return error numbers for all errors in ``errnames`` on this platform.
-
-    The :py:mod:`errno` module contains different global constants
-    depending on the specific platform (OS). This function will return
-    the list of numeric values for a given list of potential names.
-    """
-    missing_attr = {None}
-    unique_nums = {getattr(errno, k, None) for k in errnames}
-    return list(unique_nums - missing_attr)
-
-
-socket_error_eintr = plat_specific_errors('EINTR', 'WSAEINTR')
-
-socket_errors_to_ignore = plat_specific_errors(
-    'EPIPE',
-    'EBADF', 'WSAEBADF',
-    'ENOTSOCK', 'WSAENOTSOCK',
-    'ETIMEDOUT', 'WSAETIMEDOUT',
-    'ECONNREFUSED', 'WSAECONNREFUSED',
-    'ECONNRESET', 'WSAECONNRESET',
-    'ECONNABORTED', 'WSAECONNABORTED',
-    'ENETRESET', 'WSAENETRESET',
-    'EHOSTDOWN', 'EHOSTUNREACH',
-)
-socket_errors_to_ignore.append('timed out')
-socket_errors_to_ignore.append('The read operation timed out')
-socket_errors_nonblocking = plat_specific_errors(
-    'EAGAIN', 'EWOULDBLOCK', 'WSAEWOULDBLOCK',
-)
-
-if sys.platform == 'darwin':
-    socket_errors_to_ignore.extend(plat_specific_errors('EPROTOTYPE'))
-    socket_errors_nonblocking.extend(plat_specific_errors('EPROTOTYPE'))
-
-
-acceptable_sock_shutdown_error_codes = {
-    errno.ENOTCONN,
-    errno.EPIPE, errno.ESHUTDOWN,  # corresponds to BrokenPipeError in Python 3
-    errno.ECONNRESET,  # corresponds to ConnectionResetError in Python 3
-}
-"""Errors that may happen during the connection close sequence.
-
-* ENOTCONN — client is no longer connected
-* EPIPE — write on a pipe while the other end has been closed
-* ESHUTDOWN — write on a socket which has been shutdown for writing
-* ECONNRESET — connection is reset by the peer, we received a TCP RST packet
-
-Refs:
-* https://github.com/cherrypy/cheroot/issues/341#issuecomment-735884889
-* https://bugs.python.org/issue30319
-* https://bugs.python.org/issue30329
-* https://github.com/python/cpython/commit/83a2c28
-* https://github.com/python/cpython/blob/c39b52f/Lib/poplib.py#L297-L302
-* https://docs.microsoft.com/windows/win32/api/winsock/nf-winsock-shutdown
-"""
-
-acceptable_sock_shutdown_exceptions = (BrokenPipeError, ConnectionResetError)
diff --git a/lib/cheroot/errors.pyi b/lib/cheroot/errors.pyi
deleted file mode 100644
index 18669568..00000000
--- a/lib/cheroot/errors.pyi
+++ /dev/null
@@ -1,13 +0,0 @@
-from typing import List, Set, Tuple, Type
-
-class MaxSizeExceeded(Exception): ...
-class NoSSLError(Exception): ...
-class FatalSSLAlert(Exception): ...
-
-def plat_specific_errors(*errnames: str) -> List[int]: ...
-
-socket_error_eintr: List[int]
-socket_errors_to_ignore: List[int]
-socket_errors_nonblocking: List[int]
-acceptable_sock_shutdown_error_codes: Set[int]
-acceptable_sock_shutdown_exceptions: Tuple[Type[Exception], ...]
diff --git a/lib/cheroot/makefile.py b/lib/cheroot/makefile.py
deleted file mode 100644
index 77878c13..00000000
--- a/lib/cheroot/makefile.py
+++ /dev/null
@@ -1,76 +0,0 @@
-"""Socket file object."""
-
-import socket
-
-# prefer slower Python-based io module
-import _pyio as io
-
-
-# Write only 16K at a time to sockets
-SOCK_WRITE_BLOCKSIZE = 16384
-
-
-class BufferedWriter(io.BufferedWriter):
-    """Faux file object attached to a socket object."""
-
-    def write(self, b):
-        """Write bytes to buffer."""
-        self._checkClosed()
-        if isinstance(b, str):
-            raise TypeError("can't write str to binary stream")
-
-        with self._write_lock:
-            self._write_buf.extend(b)
-            self._flush_unlocked()
-            return len(b)
-
-    def _flush_unlocked(self):
-        self._checkClosed('flush of closed file')
-        while self._write_buf:
-            try:
-                # ssl sockets only except 'bytes', not bytearrays
-                # so perhaps we should conditionally wrap this for perf?
-                n = self.raw.write(bytes(self._write_buf))
-            except io.BlockingIOError as e:
-                n = e.characters_written
-            del self._write_buf[:n]
-
-
-class StreamReader(io.BufferedReader):
-    """Socket stream reader."""
-
-    def __init__(self, sock, mode='r', bufsize=io.DEFAULT_BUFFER_SIZE):
-        """Initialize socket stream reader."""
-        super().__init__(socket.SocketIO(sock, mode), bufsize)
-        self.bytes_read = 0
-
-    def read(self, *args, **kwargs):
-        """Capture bytes read."""
-        val = super().read(*args, **kwargs)
-        self.bytes_read += len(val)
-        return val
-
-    def has_data(self):
-        """Return true if there is buffered data to read."""
-        return len(self._read_buf) > self._read_pos
-
-
-class StreamWriter(BufferedWriter):
-    """Socket stream writer."""
-
-    def __init__(self, sock, mode='w', bufsize=io.DEFAULT_BUFFER_SIZE):
-        """Initialize socket stream writer."""
-        super().__init__(socket.SocketIO(sock, mode), bufsize)
-        self.bytes_written = 0
-
-    def write(self, val, *args, **kwargs):
-        """Capture bytes written."""
-        res = super().write(val, *args, **kwargs)
-        self.bytes_written += len(val)
-        return res
-
-
-def MakeFile(sock, mode='r', bufsize=io.DEFAULT_BUFFER_SIZE):
-    """File object attached to a socket object."""
-    cls = StreamReader if 'r' in mode else StreamWriter
-    return cls(sock, mode, bufsize)
diff --git a/lib/cheroot/makefile.pyi b/lib/cheroot/makefile.pyi
deleted file mode 100644
index 3f5ea275..00000000
--- a/lib/cheroot/makefile.pyi
+++ /dev/null
@@ -1,19 +0,0 @@
-import io
-
-SOCK_WRITE_BLOCKSIZE: int
-
-class BufferedWriter(io.BufferedWriter):
-    def write(self, b): ...
-
-class StreamReader(io.BufferedReader):
-    bytes_read: int
-    def __init__(self, sock, mode: str = ..., bufsize=...) -> None: ...
-    def read(self, *args, **kwargs): ...
-    def has_data(self): ...
-
-class StreamWriter(BufferedWriter):
-    bytes_written: int
-    def __init__(self, sock, mode: str = ..., bufsize=...) -> None: ...
-    def write(self, val, *args, **kwargs): ...
-
-def MakeFile(sock, mode: str = ..., bufsize=...): ...
diff --git a/lib/cheroot/py.typed b/lib/cheroot/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/cheroot/server.py b/lib/cheroot/server.py
deleted file mode 100644
index 91564611..00000000
--- a/lib/cheroot/server.py
+++ /dev/null
@@ -1,2231 +0,0 @@
-"""
-A high-speed, production ready, thread pooled, generic HTTP server.
-
-For those of you wanting to understand internals of this module, here's the
-basic call flow. The server's listening thread runs a very tight loop,
-sticking incoming connections onto a Queue::
-
-    server = HTTPServer(...)
-    server.start()
-    ->  serve()
-        while ready:
-            _connections.run()
-                while not stop_requested:
-                    child = socket.accept()  # blocks until a request comes in
-                    conn = HTTPConnection(child, ...)
-                    server.process_conn(conn)  # adds conn to threadpool
-
-Worker threads are kept in a pool and poll the Queue, popping off and then
-handling each connection in turn. Each connection can consist of an arbitrary
-number of requests and their responses, so we run a nested loop::
-
-    while True:
-        conn = server.requests.get()
-        conn.communicate()
-        ->  while True:
-                req = HTTPRequest(...)
-                req.parse_request()
-                ->  # Read the Request-Line, e.g. "GET /page HTTP/1.1"
-                    req.rfile.readline()
-                    read_headers(req.rfile, req.inheaders)
-                req.respond()
-                ->  response = app(...)
-                    try:
-                        for chunk in response:
-                            if chunk:
-                                req.write(chunk)
-                    finally:
-                        if hasattr(response, "close"):
-                            response.close()
-                if req.close_connection:
-                    return
-
-For running a server you can invoke :func:`start() <HTTPServer.start()>` (it
-will run the server forever) or use invoking :func:`prepare()
-<HTTPServer.prepare()>` and :func:`serve() <HTTPServer.serve()>` like this::
-
-    server = HTTPServer(...)
-    server.prepare()
-    try:
-        threading.Thread(target=server.serve).start()
-
-        # waiting/detecting some appropriate stop condition here
-        ...
-
-    finally:
-        server.stop()
-
-And now for a trivial doctest to exercise the test suite
-
-.. testsetup::
-
-   from cheroot.server import HTTPServer
-
->>> 'HTTPServer' in globals()
-True
-"""
-
-import os
-import io
-import re
-import email.utils
-import socket
-import sys
-import time
-import traceback as traceback_
-import logging
-import platform
-import queue
-import contextlib
-import threading
-import urllib.parse
-from functools import lru_cache
-
-from . import connections, errors, __version__
-from ._compat import bton
-from ._compat import IS_PPC
-from .workers import threadpool
-from .makefile import MakeFile, StreamWriter
-
-
-__all__ = (
-    'HTTPRequest', 'HTTPConnection', 'HTTPServer',
-    'HeaderReader', 'DropUnderscoreHeaderReader',
-    'SizeCheckWrapper', 'KnownLengthRFile', 'ChunkedRFile',
-    'Gateway', 'get_ssl_adapter_class',
-)
-
-
-IS_WINDOWS = platform.system() == 'Windows'
-"""Flag indicating whether the app is running under Windows."""
-
-
-IS_GAE = os.getenv('SERVER_SOFTWARE', '').startswith('Google App Engine/')
-"""Flag indicating whether the app is running in GAE env.
-
-Ref:
-https://cloud.google.com/appengine/docs/standard/python/tools
-/using-local-server#detecting_application_runtime_environment
-"""
-
-
-IS_UID_GID_RESOLVABLE = not IS_WINDOWS and not IS_GAE
-"""Indicates whether UID/GID resolution's available under current platform."""
-
-
-if IS_UID_GID_RESOLVABLE:
-    try:
-        import grp
-        import pwd
-    except ImportError:
-        """Unavailable in the current env.
-
-        This shouldn't be happening normally.
-        All of the known cases are excluded via the if clause.
-        """
-        IS_UID_GID_RESOLVABLE = False
-        grp, pwd = None, None
-    import struct
-
-
-if IS_WINDOWS and hasattr(socket, 'AF_INET6'):
-    if not hasattr(socket, 'IPPROTO_IPV6'):
-        socket.IPPROTO_IPV6 = 41
-    if not hasattr(socket, 'IPV6_V6ONLY'):
-        socket.IPV6_V6ONLY = 27
-
-
-if not hasattr(socket, 'SO_PEERCRED'):
-    """
-    NOTE: the value for SO_PEERCRED can be architecture specific, in
-    which case the getsockopt() will hopefully fail. The arch
-    specific value could be derived from platform.processor()
-    """
-    socket.SO_PEERCRED = 21 if IS_PPC else 17
-
-
-LF = b'\n'
-CRLF = b'\r\n'
-TAB = b'\t'
-SPACE = b' '
-COLON = b':'
-SEMICOLON = b';'
-EMPTY = b''
-ASTERISK = b'*'
-FORWARD_SLASH = b'/'
-QUOTED_SLASH = b'%2F'
-QUOTED_SLASH_REGEX = re.compile(b''.join((b'(?i)', QUOTED_SLASH)))
-
-
-_STOPPING_FOR_INTERRUPT = Exception()  # sentinel used during shutdown
-
-
-comma_separated_headers = [
-    b'Accept', b'Accept-Charset', b'Accept-Encoding',
-    b'Accept-Language', b'Accept-Ranges', b'Allow', b'Cache-Control',
-    b'Connection', b'Content-Encoding', b'Content-Language', b'Expect',
-    b'If-Match', b'If-None-Match', b'Pragma', b'Proxy-Authenticate', b'TE',
-    b'Trailer', b'Transfer-Encoding', b'Upgrade', b'Vary', b'Via', b'Warning',
-    b'WWW-Authenticate',
-]
-
-
-if not hasattr(logging, 'statistics'):
-    logging.statistics = {}
-
-
-class HeaderReader:
-    """Object for reading headers from an HTTP request.
-
-    Interface and default implementation.
-    """
-
-    def __call__(self, rfile, hdict=None):  # noqa: C901  # FIXME
-        """
-        Read headers from the given stream into the given header dict.
-
-        If hdict is None, a new header dict is created. Returns the populated
-        header dict.
-
-        Headers which are repeated are folded together using a comma if their
-        specification so dictates.
-
-        This function raises ValueError when the read bytes violate the HTTP
-        spec.
-        You should probably return "400 Bad Request" if this happens.
-        """
-        if hdict is None:
-            hdict = {}
-
-        while True:
-            line = rfile.readline()
-            if not line:
-                # No more data--illegal end of headers
-                raise ValueError('Illegal end of headers.')
-
-            if line == CRLF:
-                # Normal end of headers
-                break
-            if not line.endswith(CRLF):
-                raise ValueError('HTTP requires CRLF terminators')
-
-            if line[:1] in (SPACE, TAB):
-                # NOTE: `type(line[0]) is int` and `type(line[:1]) is bytes`.
-                # NOTE: The former causes a the following warning:
-                # NOTE: `BytesWarning('Comparison between bytes and int')`
-                # NOTE: The latter is equivalent and does not.
-                # It's a continuation line.
-                v = line.strip()
-            else:
-                try:
-                    k, v = line.split(COLON, 1)
-                except ValueError:
-                    raise ValueError('Illegal header line.')
-                v = v.strip()
-                k = self._transform_key(k)
-                hname = k
-
-            if not self._allow_header(k):
-                continue
-
-            if k in comma_separated_headers:
-                existing = hdict.get(hname)
-                if existing:
-                    v = b', '.join((existing, v))
-            hdict[hname] = v
-
-        return hdict
-
-    def _allow_header(self, key_name):
-        return True
-
-    def _transform_key(self, key_name):
-        # TODO: what about TE and WWW-Authenticate?
-        return key_name.strip().title()
-
-
-class DropUnderscoreHeaderReader(HeaderReader):
-    """Custom HeaderReader to exclude any headers with underscores in them."""
-
-    def _allow_header(self, key_name):
-        orig = super(DropUnderscoreHeaderReader, self)._allow_header(key_name)
-        return orig and '_' not in key_name
-
-
-class SizeCheckWrapper:
-    """Wraps a file-like object, raising MaxSizeExceeded if too large.
-
-    :param rfile: ``file`` of a limited size
-    :param int maxlen: maximum length of the file being read
-    """
-
-    def __init__(self, rfile, maxlen):
-        """Initialize SizeCheckWrapper instance."""
-        self.rfile = rfile
-        self.maxlen = maxlen
-        self.bytes_read = 0
-
-    def _check_length(self):
-        if self.maxlen and self.bytes_read > self.maxlen:
-            raise errors.MaxSizeExceeded()
-
-    def read(self, size=None):
-        """Read a chunk from ``rfile`` buffer and return it.
-
-        :param size: amount of data to read
-        :type size: int
-
-        :returns: chunk from ``rfile``, limited by size if specified
-        :rtype: bytes
-        """
-        data = self.rfile.read(size)
-        self.bytes_read += len(data)
-        self._check_length()
-        return data
-
-    def readline(self, size=None):
-        """Read a single line from ``rfile`` buffer and return it.
-
-        :param size: minimum amount of data to read
-        :type size: int
-
-        :returns: one line from ``rfile``
-        :rtype: bytes
-        """
-        if size is not None:
-            data = self.rfile.readline(size)
-            self.bytes_read += len(data)
-            self._check_length()
-            return data
-
-        # User didn't specify a size ...
-        # We read the line in chunks to make sure it's not a 100MB line !
-        res = []
-        while True:
-            data = self.rfile.readline(256)
-            self.bytes_read += len(data)
-            self._check_length()
-            res.append(data)
-            # See https://github.com/cherrypy/cherrypy/issues/421
-            if len(data) < 256 or data[-1:] == LF:
-                return EMPTY.join(res)
-
-    def readlines(self, sizehint=0):
-        """Read all lines from ``rfile`` buffer and return them.
-
-        :param sizehint: hint of minimum amount of data to read
-        :type sizehint: int
-
-        :returns: lines of bytes read from ``rfile``
-        :rtype: list[bytes]
-        """
-        # Shamelessly stolen from StringIO
-        total = 0
-        lines = []
-        line = self.readline(sizehint)
-        while line:
-            lines.append(line)
-            total += len(line)
-            if 0 < sizehint <= total:
-                break
-            line = self.readline(sizehint)
-        return lines
-
-    def close(self):
-        """Release resources allocated for ``rfile``."""
-        self.rfile.close()
-
-    def __iter__(self):
-        """Return file iterator."""
-        return self
-
-    def __next__(self):
-        """Generate next file chunk."""
-        data = next(self.rfile)
-        self.bytes_read += len(data)
-        self._check_length()
-        return data
-
-    next = __next__
-
-
-class KnownLengthRFile:
-    """Wraps a file-like object, returning an empty string when exhausted.
-
-    :param rfile: ``file`` of a known size
-    :param int content_length: length of the file being read
-    """
-
-    def __init__(self, rfile, content_length):
-        """Initialize KnownLengthRFile instance."""
-        self.rfile = rfile
-        self.remaining = content_length
-
-    def read(self, size=None):
-        """Read a chunk from ``rfile`` buffer and return it.
-
-        :param size: amount of data to read
-        :type size: int
-
-        :rtype: bytes
-        :returns: chunk from ``rfile``, limited by size if specified
-        """
-        if self.remaining == 0:
-            return b''
-        if size is None:
-            size = self.remaining
-        else:
-            size = min(size, self.remaining)
-
-        data = self.rfile.read(size)
-        self.remaining -= len(data)
-        return data
-
-    def readline(self, size=None):
-        """Read a single line from ``rfile`` buffer and return it.
-
-        :param size: minimum amount of data to read
-        :type size: int
-
-        :returns: one line from ``rfile``
-        :rtype: bytes
-        """
-        if self.remaining == 0:
-            return b''
-        if size is None:
-            size = self.remaining
-        else:
-            size = min(size, self.remaining)
-
-        data = self.rfile.readline(size)
-        self.remaining -= len(data)
-        return data
-
-    def readlines(self, sizehint=0):
-        """Read all lines from ``rfile`` buffer and return them.
-
-        :param sizehint: hint of minimum amount of data to read
-        :type sizehint: int
-
-        :returns: lines of bytes read from ``rfile``
-        :rtype: list[bytes]
-        """
-        # Shamelessly stolen from StringIO
-        total = 0
-        lines = []
-        line = self.readline(sizehint)
-        while line:
-            lines.append(line)
-            total += len(line)
-            if 0 < sizehint <= total:
-                break
-            line = self.readline(sizehint)
-        return lines
-
-    def close(self):
-        """Release resources allocated for ``rfile``."""
-        self.rfile.close()
-
-    def __iter__(self):
-        """Return file iterator."""
-        return self
-
-    def __next__(self):
-        """Generate next file chunk."""
-        data = next(self.rfile)
-        self.remaining -= len(data)
-        return data
-
-    next = __next__
-
-
-class ChunkedRFile:
-    """Wraps a file-like object, returning an empty string when exhausted.
-
-    This class is intended to provide a conforming wsgi.input value for
-    request entities that have been encoded with the 'chunked' transfer
-    encoding.
-
-    :param rfile: file encoded with the 'chunked' transfer encoding
-    :param int maxlen: maximum length of the file being read
-    :param int bufsize: size of the buffer used to read the file
-    """
-
-    def __init__(self, rfile, maxlen, bufsize=8192):
-        """Initialize ChunkedRFile instance."""
-        self.rfile = rfile
-        self.maxlen = maxlen
-        self.bytes_read = 0
-        self.buffer = EMPTY
-        self.bufsize = bufsize
-        self.closed = False
-
-    def _fetch(self):
-        if self.closed:
-            return
-
-        line = self.rfile.readline()
-        self.bytes_read += len(line)
-
-        if self.maxlen and self.bytes_read > self.maxlen:
-            raise errors.MaxSizeExceeded(
-                'Request Entity Too Large', self.maxlen,
-            )
-
-        line = line.strip().split(SEMICOLON, 1)
-
-        try:
-            chunk_size = line.pop(0)
-            chunk_size = int(chunk_size, 16)
-        except ValueError:
-            raise ValueError(
-                'Bad chunked transfer size: {chunk_size!r}'.
-                format(chunk_size=chunk_size),
-            )
-
-        if chunk_size <= 0:
-            self.closed = True
-            return
-
-#            if line: chunk_extension = line[0]
-
-        if self.maxlen and self.bytes_read + chunk_size > self.maxlen:
-            raise IOError('Request Entity Too Large')
-
-        chunk = self.rfile.read(chunk_size)
-        self.bytes_read += len(chunk)
-        self.buffer += chunk
-
-        crlf = self.rfile.read(2)
-        if crlf != CRLF:
-            raise ValueError(
-                "Bad chunked transfer coding (expected '\\r\\n', "
-                'got ' + repr(crlf) + ')',
-            )
-
-    def read(self, size=None):
-        """Read a chunk from ``rfile`` buffer and return it.
-
-        :param size: amount of data to read
-        :type size: int
-
-        :returns: chunk from ``rfile``, limited by size if specified
-        :rtype: bytes
-        """
-        data = EMPTY
-
-        if size == 0:
-            return data
-
-        while True:
-            if size and len(data) >= size:
-                return data
-
-            if not self.buffer:
-                self._fetch()
-                if not self.buffer:
-                    # EOF
-                    return data
-
-            if size:
-                remaining = size - len(data)
-                data += self.buffer[:remaining]
-                self.buffer = self.buffer[remaining:]
-            else:
-                data += self.buffer
-                self.buffer = EMPTY
-
-    def readline(self, size=None):
-        """Read a single line from ``rfile`` buffer and return it.
-
-        :param size: minimum amount of data to read
-        :type size: int
-
-        :returns: one line from ``rfile``
-        :rtype: bytes
-        """
-        data = EMPTY
-
-        if size == 0:
-            return data
-
-        while True:
-            if size and len(data) >= size:
-                return data
-
-            if not self.buffer:
-                self._fetch()
-                if not self.buffer:
-                    # EOF
-                    return data
-
-            newline_pos = self.buffer.find(LF)
-            if size:
-                if newline_pos == -1:
-                    remaining = size - len(data)
-                    data += self.buffer[:remaining]
-                    self.buffer = self.buffer[remaining:]
-                else:
-                    remaining = min(size - len(data), newline_pos)
-                    data += self.buffer[:remaining]
-                    self.buffer = self.buffer[remaining:]
-            else:
-                if newline_pos == -1:
-                    data += self.buffer
-                    self.buffer = EMPTY
-                else:
-                    data += self.buffer[:newline_pos]
-                    self.buffer = self.buffer[newline_pos:]
-
-    def readlines(self, sizehint=0):
-        """Read all lines from ``rfile`` buffer and return them.
-
-        :param sizehint: hint of minimum amount of data to read
-        :type sizehint: int
-
-        :returns: lines of bytes read from ``rfile``
-        :rtype: list[bytes]
-        """
-        # Shamelessly stolen from StringIO
-        total = 0
-        lines = []
-        line = self.readline(sizehint)
-        while line:
-            lines.append(line)
-            total += len(line)
-            if 0 < sizehint <= total:
-                break
-            line = self.readline(sizehint)
-        return lines
-
-    def read_trailer_lines(self):
-        """Read HTTP headers and yield them.
-
-        :yields: CRLF separated lines
-        :ytype: bytes
-
-        """
-        if not self.closed:
-            raise ValueError(
-                'Cannot read trailers until the request body has been read.',
-            )
-
-        while True:
-            line = self.rfile.readline()
-            if not line:
-                # No more data--illegal end of headers
-                raise ValueError('Illegal end of headers.')
-
-            self.bytes_read += len(line)
-            if self.maxlen and self.bytes_read > self.maxlen:
-                raise IOError('Request Entity Too Large')
-
-            if line == CRLF:
-                # Normal end of headers
-                break
-            if not line.endswith(CRLF):
-                raise ValueError('HTTP requires CRLF terminators')
-
-            yield line
-
-    def close(self):
-        """Release resources allocated for ``rfile``."""
-        self.rfile.close()
-
-
-class HTTPRequest:
-    """An HTTP Request (and response).
-
-    A single HTTP connection may consist of multiple request/response pairs.
-    """
-
-    server = None
-    """The HTTPServer object which is receiving this request."""
-
-    conn = None
-    """The HTTPConnection object on which this request connected."""
-
-    inheaders = {}
-    """A dict of request headers."""
-
-    outheaders = []
-    """A list of header tuples to write in the response."""
-
-    ready = False
-    """When True, the request has been parsed and is ready to begin generating
-    the response. When False, signals the calling Connection that the response
-    should not be generated and the connection should close."""
-
-    close_connection = False
-    """Signals the calling Connection that the request should close. This does
-    not imply an error! The client and/or server may each request that the
-    connection be closed."""
-
-    chunked_write = False
-    """If True, output will be encoded with the "chunked" transfer-coding.
-
-    This value is set automatically inside send_headers."""
-
-    header_reader = HeaderReader()
-    """
-    A HeaderReader instance or compatible reader.
-    """
-
-    def __init__(self, server, conn, proxy_mode=False, strict_mode=True):
-        """Initialize HTTP request container instance.
-
-        Args:
-            server (HTTPServer): web server object receiving this request
-            conn (HTTPConnection): HTTP connection object for this request
-            proxy_mode (bool): whether this HTTPServer should behave as a PROXY
-            server for certain requests
-            strict_mode (bool): whether we should return a 400 Bad Request when
-            we encounter a request that a HTTP compliant client should not be
-            making
-        """
-        self.server = server
-        self.conn = conn
-
-        self.ready = False
-        self.started_request = False
-        self.scheme = b'http'
-        if self.server.ssl_adapter is not None:
-            self.scheme = b'https'
-        # Use the lowest-common protocol in case read_request_line errors.
-        self.response_protocol = 'HTTP/1.0'
-        self.inheaders = {}
-
-        self.status = ''
-        self.outheaders = []
-        self.sent_headers = False
-        self.close_connection = self.__class__.close_connection
-        self.chunked_read = False
-        self.chunked_write = self.__class__.chunked_write
-        self.proxy_mode = proxy_mode
-        self.strict_mode = strict_mode
-
-    def parse_request(self):
-        """Parse the next HTTP request start-line and message-headers."""
-        self.rfile = SizeCheckWrapper(
-            self.conn.rfile,
-            self.server.max_request_header_size,
-        )
-        try:
-            success = self.read_request_line()
-        except errors.MaxSizeExceeded:
-            self.simple_response(
-                '414 Request-URI Too Long',
-                'The Request-URI sent with the request exceeds the maximum '
-                'allowed bytes.',
-            )
-            return
-        else:
-            if not success:
-                return
-
-        try:
-            success = self.read_request_headers()
-        except errors.MaxSizeExceeded:
-            self.simple_response(
-                '413 Request Entity Too Large',
-                'The headers sent with the request exceed the maximum '
-                'allowed bytes.',
-            )
-            return
-        else:
-            if not success:
-                return
-
-        self.ready = True
-
-    def read_request_line(self):  # noqa: C901  # FIXME
-        """Read and parse first line of the HTTP request.
-
-        Returns:
-            bool: True if the request line is valid or False if it's malformed.
-
-        """
-        # HTTP/1.1 connections are persistent by default. If a client
-        # requests a page, then idles (leaves the connection open),
-        # then rfile.readline() will raise socket.error("timed out").
-        # Note that it does this based on the value given to settimeout(),
-        # and doesn't need the client to request or acknowledge the close
-        # (although your TCP stack might suffer for it: cf Apache's history
-        # with FIN_WAIT_2).
-        request_line = self.rfile.readline()
-
-        # Set started_request to True so communicate() knows to send 408
-        # from here on out.
-        self.started_request = True
-        if not request_line:
-            return False
-
-        if request_line == CRLF:
-            # RFC 2616 sec 4.1: "...if the server is reading the protocol
-            # stream at the beginning of a message and receives a CRLF
-            # first, it should ignore the CRLF."
-            # But only ignore one leading line! else we enable a DoS.
-            request_line = self.rfile.readline()
-            if not request_line:
-                return False
-
-        if not request_line.endswith(CRLF):
-            self.simple_response(
-                '400 Bad Request', 'HTTP requires CRLF terminators',
-            )
-            return False
-
-        try:
-            method, uri, req_protocol = request_line.strip().split(SPACE, 2)
-            if not req_protocol.startswith(b'HTTP/'):
-                self.simple_response(
-                    '400 Bad Request', 'Malformed Request-Line: bad protocol',
-                )
-                return False
-            rp = req_protocol[5:].split(b'.', 1)
-            if len(rp) != 2:
-                self.simple_response(
-                    '400 Bad Request', 'Malformed Request-Line: bad version',
-                )
-                return False
-            rp = tuple(map(int, rp))  # Minor.Major must be threat as integers
-            if rp > (1, 1):
-                self.simple_response(
-                    '505 HTTP Version Not Supported', 'Cannot fulfill request',
-                )
-                return False
-        except (ValueError, IndexError):
-            self.simple_response('400 Bad Request', 'Malformed Request-Line')
-            return False
-
-        self.uri = uri
-        self.method = method.upper()
-
-        if self.strict_mode and method != self.method:
-            resp = (
-                'Malformed method name: According to RFC 2616 '
-                '(section 5.1.1) and its successors '
-                'RFC 7230 (section 3.1.1) and RFC 7231 (section 4.1) '
-                'method names are case-sensitive and uppercase.'
-            )
-            self.simple_response('400 Bad Request', resp)
-            return False
-
-        try:
-            scheme, authority, path, qs, fragment = urllib.parse.urlsplit(uri)
-        except UnicodeError:
-            self.simple_response('400 Bad Request', 'Malformed Request-URI')
-            return False
-
-        uri_is_absolute_form = (scheme or authority)
-
-        if self.method == b'OPTIONS':
-            # TODO: cover this branch with tests
-            path = (
-                uri
-                # https://tools.ietf.org/html/rfc7230#section-5.3.4
-                if (self.proxy_mode and uri_is_absolute_form)
-                else path
-            )
-        elif self.method == b'CONNECT':
-            # TODO: cover this branch with tests
-            if not self.proxy_mode:
-                self.simple_response('405 Method Not Allowed')
-                return False
-
-            # `urlsplit()` above parses "example.com:3128" as path part of URI.
-            # this is a workaround, which makes it detect netloc correctly
-            uri_split = urllib.parse.urlsplit(b''.join((b'//', uri)))
-            _scheme, _authority, _path, _qs, _fragment = uri_split
-            _port = EMPTY
-            try:
-                _port = uri_split.port
-            except ValueError:
-                pass
-
-            # FIXME: use third-party validation to make checks against RFC
-            # the validation doesn't take into account, that urllib parses
-            # invalid URIs without raising errors
-            # https://tools.ietf.org/html/rfc7230#section-5.3.3
-            invalid_path = (
-                _authority != uri
-                or not _port
-                or any((_scheme, _path, _qs, _fragment))
-            )
-            if invalid_path:
-                self.simple_response(
-                    '400 Bad Request',
-                    'Invalid path in Request-URI: request-'
-                    'target must match authority-form.',
-                )
-                return False
-
-            authority = path = _authority
-            scheme = qs = fragment = EMPTY
-        else:
-            disallowed_absolute = (
-                self.strict_mode
-                and not self.proxy_mode
-                and uri_is_absolute_form
-            )
-            if disallowed_absolute:
-                # https://tools.ietf.org/html/rfc7230#section-5.3.2
-                # (absolute form)
-                """Absolute URI is only allowed within proxies."""
-                self.simple_response(
-                    '400 Bad Request',
-                    'Absolute URI not allowed if server is not a proxy.',
-                )
-                return False
-
-            invalid_path = (
-                self.strict_mode
-                and not uri.startswith(FORWARD_SLASH)
-                and not uri_is_absolute_form
-            )
-            if invalid_path:
-                # https://tools.ietf.org/html/rfc7230#section-5.3.1
-                # (origin_form) and
-                """Path should start with a forward slash."""
-                resp = (
-                    'Invalid path in Request-URI: request-target must contain '
-                    'origin-form which starts with absolute-path (URI '
-                    'starting with a slash "/").'
-                )
-                self.simple_response('400 Bad Request', resp)
-                return False
-
-            if fragment:
-                self.simple_response(
-                    '400 Bad Request',
-                    'Illegal #fragment in Request-URI.',
-                )
-                return False
-
-            if path is None:
-                # FIXME: It looks like this case cannot happen
-                self.simple_response(
-                    '400 Bad Request',
-                    'Invalid path in Request-URI.',
-                )
-                return False
-
-            # Unquote the path+params (e.g. "/this%20path" -> "/this path").
-            # https://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html#sec5.1.2
-            #
-            # But note that "...a URI must be separated into its components
-            # before the escaped characters within those components can be
-            # safely decoded." https://www.ietf.org/rfc/rfc2396.txt, sec 2.4.2
-            # Therefore, "/this%2Fpath" becomes "/this%2Fpath", not
-            # "/this/path".
-            try:
-                # TODO: Figure out whether exception can really happen here.
-                # It looks like it's caught on urlsplit() call above.
-                atoms = [
-                    urllib.parse.unquote_to_bytes(x)
-                    for x in QUOTED_SLASH_REGEX.split(path)
-                ]
-            except ValueError as ex:
-                self.simple_response('400 Bad Request', ex.args[0])
-                return False
-            path = QUOTED_SLASH.join(atoms)
-
-        if not path.startswith(FORWARD_SLASH):
-            path = FORWARD_SLASH + path
-
-        if scheme is not EMPTY:
-            self.scheme = scheme
-        self.authority = authority
-        self.path = path
-
-        # Note that, like wsgiref and most other HTTP servers,
-        # we "% HEX HEX"-unquote the path but not the query string.
-        self.qs = qs
-
-        # Compare request and server HTTP protocol versions, in case our
-        # server does not support the requested protocol. Limit our output
-        # to min(req, server). We want the following output:
-        #     request    server     actual written   supported response
-        #     protocol   protocol  response protocol    feature set
-        # a     1.0        1.0           1.0                1.0
-        # b     1.0        1.1           1.1                1.0
-        # c     1.1        1.0           1.0                1.0
-        # d     1.1        1.1           1.1                1.1
-        # Notice that, in (b), the response will be "HTTP/1.1" even though
-        # the client only understands 1.0. RFC 2616 10.5.6 says we should
-        # only return 505 if the _major_ version is different.
-        sp = int(self.server.protocol[5]), int(self.server.protocol[7])
-
-        if sp[0] != rp[0]:
-            self.simple_response('505 HTTP Version Not Supported')
-            return False
-
-        self.request_protocol = req_protocol
-        self.response_protocol = 'HTTP/%s.%s' % min(rp, sp)
-
-        return True
-
-    def read_request_headers(self):  # noqa: C901  # FIXME
-        """Read ``self.rfile`` into ``self.inheaders``.
-
-        Ref: :py:attr:`self.inheaders <HTTPRequest.outheaders>`.
-
-        :returns: success status
-        :rtype: bool
-        """
-        # then all the http headers
-        try:
-            self.header_reader(self.rfile, self.inheaders)
-        except ValueError as ex:
-            self.simple_response('400 Bad Request', ex.args[0])
-            return False
-
-        mrbs = self.server.max_request_body_size
-
-        try:
-            cl = int(self.inheaders.get(b'Content-Length', 0))
-        except ValueError:
-            self.simple_response(
-                '400 Bad Request',
-                'Malformed Content-Length Header.',
-            )
-            return False
-
-        if mrbs and cl > mrbs:
-            self.simple_response(
-                '413 Request Entity Too Large',
-                'The entity sent with the request exceeds the maximum '
-                'allowed bytes.',
-            )
-            return False
-
-        # Persistent connection support
-        if self.response_protocol == 'HTTP/1.1':
-            # Both server and client are HTTP/1.1
-            if self.inheaders.get(b'Connection', b'') == b'close':
-                self.close_connection = True
-        else:
-            # Either the server or client (or both) are HTTP/1.0
-            if self.inheaders.get(b'Connection', b'') != b'Keep-Alive':
-                self.close_connection = True
-
-        # Transfer-Encoding support
-        te = None
-        if self.response_protocol == 'HTTP/1.1':
-            te = self.inheaders.get(b'Transfer-Encoding')
-            if te:
-                te = [x.strip().lower() for x in te.split(b',') if x.strip()]
-
-        self.chunked_read = False
-
-        if te:
-            for enc in te:
-                if enc == b'chunked':
-                    self.chunked_read = True
-                else:
-                    # Note that, even if we see "chunked", we must reject
-                    # if there is an extension we don't recognize.
-                    self.simple_response('501 Unimplemented')
-                    self.close_connection = True
-                    return False
-
-        # From PEP 333:
-        # "Servers and gateways that implement HTTP 1.1 must provide
-        # transparent support for HTTP 1.1's "expect/continue" mechanism.
-        # This may be done in any of several ways:
-        #   1. Respond to requests containing an Expect: 100-continue request
-        #      with an immediate "100 Continue" response, and proceed normally.
-        #   2. Proceed with the request normally, but provide the application
-        #      with a wsgi.input stream that will send the "100 Continue"
-        #      response if/when the application first attempts to read from
-        #      the input stream. The read request must then remain blocked
-        #      until the client responds.
-        #   3. Wait until the client decides that the server does not support
-        #      expect/continue, and sends the request body on its own.
-        #      (This is suboptimal, and is not recommended.)
-        #
-        # We used to do 3, but are now doing 1. Maybe we'll do 2 someday,
-        # but it seems like it would be a big slowdown for such a rare case.
-        if self.inheaders.get(b'Expect', b'') == b'100-continue':
-            # Don't use simple_response here, because it emits headers
-            # we don't want. See
-            # https://github.com/cherrypy/cherrypy/issues/951
-            msg = b''.join((
-                self.server.protocol.encode('ascii'), SPACE, b'100 Continue',
-                CRLF, CRLF,
-            ))
-            try:
-                self.conn.wfile.write(msg)
-            except socket.error as ex:
-                if ex.args[0] not in errors.socket_errors_to_ignore:
-                    raise
-        return True
-
-    def respond(self):
-        """Call the gateway and write its iterable output."""
-        mrbs = self.server.max_request_body_size
-        if self.chunked_read:
-            self.rfile = ChunkedRFile(self.conn.rfile, mrbs)
-        else:
-            cl = int(self.inheaders.get(b'Content-Length', 0))
-            if mrbs and mrbs < cl:
-                if not self.sent_headers:
-                    self.simple_response(
-                        '413 Request Entity Too Large',
-                        'The entity sent with the request exceeds the '
-                        'maximum allowed bytes.',
-                    )
-                return
-            self.rfile = KnownLengthRFile(self.conn.rfile, cl)
-
-        self.server.gateway(self).respond()
-        self.ready and self.ensure_headers_sent()
-
-        if self.chunked_write:
-            self.conn.wfile.write(b'0\r\n\r\n')
-
-    def simple_response(self, status, msg=''):
-        """Write a simple response back to the client."""
-        status = str(status)
-        proto_status = '%s %s\r\n' % (self.server.protocol, status)
-        content_length = 'Content-Length: %s\r\n' % len(msg)
-        content_type = 'Content-Type: text/plain\r\n'
-        buf = [
-            proto_status.encode('ISO-8859-1'),
-            content_length.encode('ISO-8859-1'),
-            content_type.encode('ISO-8859-1'),
-        ]
-
-        if status[:3] in ('413', '414'):
-            # Request Entity Too Large / Request-URI Too Long
-            self.close_connection = True
-            if self.response_protocol == 'HTTP/1.1':
-                # This will not be true for 414, since read_request_line
-                # usually raises 414 before reading the whole line, and we
-                # therefore cannot know the proper response_protocol.
-                buf.append(b'Connection: close\r\n')
-            else:
-                # HTTP/1.0 had no 413/414 status nor Connection header.
-                # Emit 400 instead and trust the message body is enough.
-                status = '400 Bad Request'
-
-        buf.append(CRLF)
-        if msg:
-            if isinstance(msg, str):
-                msg = msg.encode('ISO-8859-1')
-            buf.append(msg)
-
-        try:
-            self.conn.wfile.write(EMPTY.join(buf))
-        except socket.error as ex:
-            if ex.args[0] not in errors.socket_errors_to_ignore:
-                raise
-
-    def ensure_headers_sent(self):
-        """Ensure headers are sent to the client if not already sent."""
-        if not self.sent_headers:
-            self.sent_headers = True
-            self.send_headers()
-
-    def write(self, chunk):
-        """Write unbuffered data to the client."""
-        if self.chunked_write and chunk:
-            chunk_size_hex = hex(len(chunk))[2:].encode('ascii')
-            buf = [chunk_size_hex, CRLF, chunk, CRLF]
-            self.conn.wfile.write(EMPTY.join(buf))
-        else:
-            self.conn.wfile.write(chunk)
-
-    def send_headers(self):  # noqa: C901  # FIXME
-        """Assert, process, and send the HTTP response message-headers.
-
-        You must set ``self.status``, and :py:attr:`self.outheaders
-        <HTTPRequest.outheaders>` before calling this.
-        """
-        hkeys = [key.lower() for key, value in self.outheaders]
-        status = int(self.status[:3])
-
-        if status == 413:
-            # Request Entity Too Large. Close conn to avoid garbage.
-            self.close_connection = True
-        elif b'content-length' not in hkeys:
-            # "All 1xx (informational), 204 (no content),
-            # and 304 (not modified) responses MUST NOT
-            # include a message-body." So no point chunking.
-            if status < 200 or status in (204, 205, 304):
-                pass
-            else:
-                needs_chunked = (
-                    self.response_protocol == 'HTTP/1.1'
-                    and self.method != b'HEAD'
-                )
-                if needs_chunked:
-                    # Use the chunked transfer-coding
-                    self.chunked_write = True
-                    self.outheaders.append((b'Transfer-Encoding', b'chunked'))
-                else:
-                    # Closing the conn is the only way to determine len.
-                    self.close_connection = True
-
-        # Override the decision to not close the connection if the connection
-        # manager doesn't have space for it.
-        if not self.close_connection:
-            can_keep = self.server.can_add_keepalive_connection
-            self.close_connection = not can_keep
-
-        if b'connection' not in hkeys:
-            if self.response_protocol == 'HTTP/1.1':
-                # Both server and client are HTTP/1.1 or better
-                if self.close_connection:
-                    self.outheaders.append((b'Connection', b'close'))
-            else:
-                # Server and/or client are HTTP/1.0
-                if not self.close_connection:
-                    self.outheaders.append((b'Connection', b'Keep-Alive'))
-
-        if (b'Connection', b'Keep-Alive') in self.outheaders:
-            self.outheaders.append((
-                b'Keep-Alive',
-                u'timeout={connection_timeout}'.
-                format(connection_timeout=self.server.timeout).
-                encode('ISO-8859-1'),
-            ))
-
-        if (not self.close_connection) and (not self.chunked_read):
-            # Read any remaining request body data on the socket.
-            # "If an origin server receives a request that does not include an
-            # Expect request-header field with the "100-continue" expectation,
-            # the request includes a request body, and the server responds
-            # with a final status code before reading the entire request body
-            # from the transport connection, then the server SHOULD NOT close
-            # the transport connection until it has read the entire request,
-            # or until the client closes the connection. Otherwise, the client
-            # might not reliably receive the response message. However, this
-            # requirement is not be construed as preventing a server from
-            # defending itself against denial-of-service attacks, or from
-            # badly broken client implementations."
-            remaining = getattr(self.rfile, 'remaining', 0)
-            if remaining > 0:
-                self.rfile.read(remaining)
-
-        if b'date' not in hkeys:
-            self.outheaders.append((
-                b'Date',
-                email.utils.formatdate(usegmt=True).encode('ISO-8859-1'),
-            ))
-
-        if b'server' not in hkeys:
-            self.outheaders.append((
-                b'Server',
-                self.server.server_name.encode('ISO-8859-1'),
-            ))
-
-        proto = self.server.protocol.encode('ascii')
-        buf = [proto + SPACE + self.status + CRLF]
-        for k, v in self.outheaders:
-            buf.append(k + COLON + SPACE + v + CRLF)
-        buf.append(CRLF)
-        self.conn.wfile.write(EMPTY.join(buf))
-
-
-class HTTPConnection:
-    """An HTTP connection (active socket)."""
-
-    remote_addr = None
-    remote_port = None
-    ssl_env = None
-    rbufsize = io.DEFAULT_BUFFER_SIZE
-    wbufsize = io.DEFAULT_BUFFER_SIZE
-    RequestHandlerClass = HTTPRequest
-    peercreds_enabled = False
-    peercreds_resolve_enabled = False
-
-    # Fields set by ConnectionManager.
-    last_used = None
-
-    def __init__(self, server, sock, makefile=MakeFile):
-        """Initialize HTTPConnection instance.
-
-        Args:
-            server (HTTPServer): web server object receiving this request
-            sock (socket._socketobject): the raw socket object (usually
-                TCP) for this connection
-            makefile (file): a fileobject class for reading from the socket
-        """
-        self.server = server
-        self.socket = sock
-        self.rfile = makefile(sock, 'rb', self.rbufsize)
-        self.wfile = makefile(sock, 'wb', self.wbufsize)
-        self.requests_seen = 0
-
-        self.peercreds_enabled = self.server.peercreds_enabled
-        self.peercreds_resolve_enabled = self.server.peercreds_resolve_enabled
-
-        # LRU cached methods:
-        # Ref: https://stackoverflow.com/a/14946506/595220
-        self.resolve_peer_creds = (
-            lru_cache(maxsize=1)(self.resolve_peer_creds)
-        )
-        self.get_peer_creds = (
-            lru_cache(maxsize=1)(self.get_peer_creds)
-        )
-
-    def communicate(self):  # noqa: C901  # FIXME
-        """Read each request and respond appropriately.
-
-        Returns true if the connection should be kept open.
-        """
-        request_seen = False
-        try:
-            req = self.RequestHandlerClass(self.server, self)
-            req.parse_request()
-            if self.server.stats['Enabled']:
-                self.requests_seen += 1
-            if not req.ready:
-                # Something went wrong in the parsing (and the server has
-                # probably already made a simple_response). Return and
-                # let the conn close.
-                return False
-
-            request_seen = True
-            req.respond()
-            if not req.close_connection:
-                return True
-        except socket.error as ex:
-            errnum = ex.args[0]
-            # sadly SSL sockets return a different (longer) time out string
-            timeout_errs = 'timed out', 'The read operation timed out'
-            if errnum in timeout_errs:
-                # Don't error if we're between requests; only error
-                # if 1) no request has been started at all, or 2) we're
-                # in the middle of a request.
-                # See https://github.com/cherrypy/cherrypy/issues/853
-                if (not request_seen) or (req and req.started_request):
-                    self._conditional_error(req, '408 Request Timeout')
-            elif errnum not in errors.socket_errors_to_ignore:
-                self.server.error_log(
-                    'socket.error %s' % repr(errnum),
-                    level=logging.WARNING, traceback=True,
-                )
-                self._conditional_error(req, '500 Internal Server Error')
-        except (KeyboardInterrupt, SystemExit):
-            raise
-        except errors.FatalSSLAlert:
-            pass
-        except errors.NoSSLError:
-            self._handle_no_ssl(req)
-        except Exception as ex:
-            self.server.error_log(
-                repr(ex), level=logging.ERROR, traceback=True,
-            )
-            self._conditional_error(req, '500 Internal Server Error')
-        return False
-
-    linger = False
-
-    def _handle_no_ssl(self, req):
-        if not req or req.sent_headers:
-            return
-        # Unwrap wfile
-        try:
-            resp_sock = self.socket._sock
-        except AttributeError:
-            # self.socket is of OpenSSL.SSL.Connection type
-            resp_sock = self.socket._socket
-        self.wfile = StreamWriter(resp_sock, 'wb', self.wbufsize)
-        msg = (
-            'The client sent a plain HTTP request, but '
-            'this server only speaks HTTPS on this port.'
-        )
-        req.simple_response('400 Bad Request', msg)
-        self.linger = True
-
-    def _conditional_error(self, req, response):
-        """Respond with an error.
-
-        Don't bother writing if a response
-        has already started being written.
-        """
-        if not req or req.sent_headers:
-            return
-
-        try:
-            req.simple_response(response)
-        except errors.FatalSSLAlert:
-            pass
-        except errors.NoSSLError:
-            self._handle_no_ssl(req)
-
-    def close(self):
-        """Close the socket underlying this connection."""
-        self.rfile.close()
-
-        if not self.linger:
-            self._close_kernel_socket()
-            # close the socket file descriptor
-            # (will be closed in the OS if there is no
-            # other reference to the underlying socket)
-            self.socket.close()
-        else:
-            # On the other hand, sometimes we want to hang around for a bit
-            # to make sure the client has a chance to read our entire
-            # response. Skipping the close() calls here delays the FIN
-            # packet until the socket object is garbage-collected later.
-            # Someday, perhaps, we'll do the full lingering_close that
-            # Apache does, but not today.
-            pass
-
-    def get_peer_creds(self):  # LRU cached on per-instance basis, see __init__
-        """Return the PID/UID/GID tuple of the peer socket for UNIX sockets.
-
-        This function uses SO_PEERCRED to query the UNIX PID, UID, GID
-        of the peer, which is only available if the bind address is
-        a UNIX domain socket.
-
-        Raises:
-            NotImplementedError: in case of unsupported socket type
-            RuntimeError: in case of SO_PEERCRED lookup unsupported or disabled
-
-        """
-        PEERCRED_STRUCT_DEF = '3i'
-
-        if IS_WINDOWS or self.socket.family != socket.AF_UNIX:
-            raise NotImplementedError(
-                'SO_PEERCRED is only supported in Linux kernel and WSL',
-            )
-        elif not self.peercreds_enabled:
-            raise RuntimeError(
-                'Peer creds lookup is disabled within this server',
-            )
-
-        try:
-            peer_creds = self.socket.getsockopt(
-                # FIXME: Use LOCAL_CREDS for BSD-like OSs
-                # Ref: https://gist.github.com/LucaFilipozzi/e4f1e118202aff27af6aadebda1b5d91  # noqa
-                socket.SOL_SOCKET, socket.SO_PEERCRED,
-                struct.calcsize(PEERCRED_STRUCT_DEF),
-            )
-        except socket.error as socket_err:
-            """Non-Linux kernels don't support SO_PEERCRED.
-
-            Refs:
-            http://welz.org.za/notes/on-peer-cred.html
-            https://github.com/daveti/tcpSockHack
-            msdn.microsoft.com/en-us/commandline/wsl/release_notes#build-15025
-            """
-            raise RuntimeError from socket_err
-        else:
-            pid, uid, gid = struct.unpack(PEERCRED_STRUCT_DEF, peer_creds)
-            return pid, uid, gid
-
-    @property
-    def peer_pid(self):
-        """Return the id of the connected peer process."""
-        pid, _, _ = self.get_peer_creds()
-        return pid
-
-    @property
-    def peer_uid(self):
-        """Return the user id of the connected peer process."""
-        _, uid, _ = self.get_peer_creds()
-        return uid
-
-    @property
-    def peer_gid(self):
-        """Return the group id of the connected peer process."""
-        _, _, gid = self.get_peer_creds()
-        return gid
-
-    def resolve_peer_creds(self):  # LRU cached on per-instance basis
-        """Look up the username and group tuple of the ``PEERCREDS``.
-
-        :returns: the username and group tuple of the ``PEERCREDS``
-
-        :raises NotImplementedError: if the OS is unsupported
-        :raises RuntimeError: if UID/GID lookup is unsupported or disabled
-        """
-        if not IS_UID_GID_RESOLVABLE:
-            raise NotImplementedError(
-                'UID/GID lookup is unavailable under current platform. '
-                'It can only be done under UNIX-like OS '
-                'but not under the Google App Engine',
-            )
-        elif not self.peercreds_resolve_enabled:
-            raise RuntimeError(
-                'UID/GID lookup is disabled within this server',
-            )
-
-        user = pwd.getpwuid(self.peer_uid).pw_name  # [0]
-        group = grp.getgrgid(self.peer_gid).gr_name  # [0]
-
-        return user, group
-
-    @property
-    def peer_user(self):
-        """Return the username of the connected peer process."""
-        user, _ = self.resolve_peer_creds()
-        return user
-
-    @property
-    def peer_group(self):
-        """Return the group of the connected peer process."""
-        _, group = self.resolve_peer_creds()
-        return group
-
-    def _close_kernel_socket(self):
-        """Terminate the connection at the transport level."""
-        # Honor ``sock_shutdown`` for PyOpenSSL connections.
-        shutdown = getattr(
-            self.socket, 'sock_shutdown',
-            self.socket.shutdown,
-        )
-
-        try:
-            shutdown(socket.SHUT_RDWR)  # actually send a TCP FIN
-        except errors.acceptable_sock_shutdown_exceptions:
-            pass
-        except socket.error as e:
-            if e.errno not in errors.acceptable_sock_shutdown_error_codes:
-                raise
-
-
-class HTTPServer:
-    """An HTTP server."""
-
-    _bind_addr = '127.0.0.1'
-    _interrupt = None
-
-    gateway = None
-    """A Gateway instance."""
-
-    minthreads = None
-    """The minimum number of worker threads to create (default 10)."""
-
-    maxthreads = None
-    """The maximum number of worker threads to create.
-
-    (default -1 = no limit)"""
-
-    server_name = None
-    """The name of the server; defaults to ``self.version``."""
-
-    protocol = 'HTTP/1.1'
-    """The version string to write in the Status-Line of all HTTP responses.
-
-    For example, "HTTP/1.1" is the default. This also limits the supported
-    features used in the response."""
-
-    request_queue_size = 5
-    """The 'backlog' arg to socket.listen(); max queued connections.
-
-    (default 5)."""
-
-    shutdown_timeout = 5
-    """The total time to wait for worker threads to cleanly exit.
-
-    Specified in seconds."""
-
-    timeout = 10
-    """The timeout in seconds for accepted connections (default 10)."""
-
-    expiration_interval = 0.5
-    """The interval, in seconds, at which the server checks for
-    expired connections (default 0.5).
-    """
-
-    version = 'Cheroot/{version!s}'.format(version=__version__)
-    """A version string for the HTTPServer."""
-
-    software = None
-    """The value to set for the SERVER_SOFTWARE entry in the WSGI environ.
-
-    If None, this defaults to ``'%s Server' % self.version``.
-    """
-
-    ready = False
-    """Internal flag which indicating the socket is accepting connections."""
-
-    max_request_header_size = 0
-    """The maximum size, in bytes, for request headers, or 0 for no limit."""
-
-    max_request_body_size = 0
-    """The maximum size, in bytes, for request bodies, or 0 for no limit."""
-
-    nodelay = True
-    """If True (the default since 3.1), sets the TCP_NODELAY socket option."""
-
-    ConnectionClass = HTTPConnection
-    """The class to use for handling HTTP connections."""
-
-    ssl_adapter = None
-    """An instance of ``ssl.Adapter`` (or a subclass).
-
-    Ref: :py:class:`ssl.Adapter <cheroot.ssl.Adapter>`.
-
-    You must have the corresponding TLS driver library installed.
-    """
-
-    peercreds_enabled = False
-    """
-    If :py:data:`True`, peer creds will be looked up via UNIX domain socket.
-    """
-
-    peercreds_resolve_enabled = False
-    """
-    If :py:data:`True`, username/group will be looked up in the OS from
-    ``PEERCREDS``-provided IDs.
-    """
-
-    reuse_port = False
-    """If True, set SO_REUSEPORT on the socket."""
-
-    keep_alive_conn_limit = 10
-    """Maximum number of waiting keep-alive connections that will be kept open.
-
-    Default is 10. Set to None to have unlimited connections."""
-
-    def __init__(
-        self, bind_addr, gateway,
-        minthreads=10, maxthreads=-1, server_name=None,
-        peercreds_enabled=False, peercreds_resolve_enabled=False,
-        reuse_port=False,
-    ):
-        """Initialize HTTPServer instance.
-
-        Args:
-            bind_addr (tuple): network interface to listen to
-            gateway (Gateway): gateway for processing HTTP requests
-            minthreads (int): minimum number of threads for HTTP thread pool
-            maxthreads (int): maximum number of threads for HTTP thread pool
-            server_name (str): web server name to be advertised via Server
-                HTTP header
-            reuse_port (bool): if True SO_REUSEPORT option would be set to
-                socket
-        """
-        self.bind_addr = bind_addr
-        self.gateway = gateway
-
-        self.requests = threadpool.ThreadPool(
-            self, min=minthreads or 1, max=maxthreads,
-        )
-
-        if not server_name:
-            server_name = self.version
-        self.server_name = server_name
-        self.peercreds_enabled = peercreds_enabled
-        self.peercreds_resolve_enabled = (
-            peercreds_resolve_enabled and peercreds_enabled
-        )
-        self.reuse_port = reuse_port
-        self.clear_stats()
-
-    def clear_stats(self):
-        """Reset server stat counters.."""
-        self._start_time = None
-        self._run_time = 0
-        self.stats = {
-            'Enabled': False,
-            'Bind Address': lambda s: repr(self.bind_addr),
-            'Run time': lambda s: (not s['Enabled']) and -1 or self.runtime(),
-            'Accepts': 0,
-            'Accepts/sec': lambda s: s['Accepts'] / self.runtime(),
-            'Queue': lambda s: getattr(self.requests, 'qsize', None),
-            'Threads': lambda s: len(getattr(self.requests, '_threads', [])),
-            'Threads Idle': lambda s: getattr(self.requests, 'idle', None),
-            'Socket Errors': 0,
-            'Requests': lambda s: (not s['Enabled']) and -1 or sum(
-                (w['Requests'](w) for w in s['Worker Threads'].values()), 0,
-            ),
-            'Bytes Read': lambda s: (not s['Enabled']) and -1 or sum(
-                (w['Bytes Read'](w) for w in s['Worker Threads'].values()), 0,
-            ),
-            'Bytes Written': lambda s: (not s['Enabled']) and -1 or sum(
-                (w['Bytes Written'](w) for w in s['Worker Threads'].values()),
-                0,
-            ),
-            'Work Time': lambda s: (not s['Enabled']) and -1 or sum(
-                (w['Work Time'](w) for w in s['Worker Threads'].values()), 0,
-            ),
-            'Read Throughput': lambda s: (not s['Enabled']) and -1 or sum(
-                (
-                    w['Bytes Read'](w) / (w['Work Time'](w) or 1e-6)
-                    for w in s['Worker Threads'].values()
-                ), 0,
-            ),
-            'Write Throughput': lambda s: (not s['Enabled']) and -1 or sum(
-                (
-                    w['Bytes Written'](w) / (w['Work Time'](w) or 1e-6)
-                    for w in s['Worker Threads'].values()
-                ), 0,
-            ),
-            'Worker Threads': {},
-        }
-        logging.statistics['Cheroot HTTPServer %d' % id(self)] = self.stats
-
-    def runtime(self):
-        """Return server uptime."""
-        if self._start_time is None:
-            return self._run_time
-        else:
-            return self._run_time + (time.time() - self._start_time)
-
-    def __str__(self):
-        """Render Server instance representing bind address."""
-        return '%s.%s(%r)' % (
-            self.__module__, self.__class__.__name__,
-            self.bind_addr,
-        )
-
-    @property
-    def bind_addr(self):
-        """Return the interface on which to listen for connections.
-
-        For TCP sockets, a (host, port) tuple. Host values may be any
-        :term:`IPv4` or :term:`IPv6` address, or any valid hostname.
-        The string 'localhost' is a synonym for '127.0.0.1' (or '::1',
-        if your hosts file prefers :term:`IPv6`).
-        The string '0.0.0.0' is a special :term:`IPv4` entry meaning
-        "any active interface" (INADDR_ANY), and '::' is the similar
-        IN6ADDR_ANY for :term:`IPv6`.
-        The empty string or :py:data:`None` are not allowed.
-
-        For UNIX sockets, supply the file name as a string.
-
-        Systemd socket activation is automatic and doesn't require tempering
-        with this variable.
-
-        .. glossary::
-
-           :abbr:`IPv4 (Internet Protocol version 4)`
-              Internet Protocol version 4
-
-           :abbr:`IPv6 (Internet Protocol version 6)`
-              Internet Protocol version 6
-        """
-        return self._bind_addr
-
-    @bind_addr.setter
-    def bind_addr(self, value):
-        """Set the interface on which to listen for connections."""
-        if isinstance(value, tuple) and value[0] in ('', None):
-            # Despite the socket module docs, using '' does not
-            # allow AI_PASSIVE to work. Passing None instead
-            # returns '0.0.0.0' like we want. In other words:
-            #     host    AI_PASSIVE     result
-            #      ''         Y         192.168.x.y
-            #      ''         N         192.168.x.y
-            #     None        Y         0.0.0.0
-            #     None        N         127.0.0.1
-            # But since you can get the same effect with an explicit
-            # '0.0.0.0', we deny both the empty string and None as values.
-            raise ValueError(
-                "Host values of '' or None are not allowed. "
-                "Use '0.0.0.0' (IPv4) or '::' (IPv6) instead "
-                'to listen on all active interfaces.',
-            )
-        self._bind_addr = value
-
-    def safe_start(self):
-        """Run the server forever, and stop it cleanly on exit."""
-        try:
-            self.start()
-        except KeyboardInterrupt as kb_intr_exc:
-            underlying_interrupt = self.interrupt
-            if not underlying_interrupt:
-                self.interrupt = kb_intr_exc
-            raise kb_intr_exc from underlying_interrupt
-        except SystemExit as sys_exit_exc:
-            underlying_interrupt = self.interrupt
-            if not underlying_interrupt:
-                self.interrupt = sys_exit_exc
-            raise sys_exit_exc from underlying_interrupt
-
-    def prepare(self):  # noqa: C901  # FIXME
-        """Prepare server to serving requests.
-
-        It binds a socket's port, setups the socket to ``listen()`` and does
-        other preparing things.
-        """
-        self._interrupt = None
-
-        if self.software is None:
-            self.software = '%s Server' % self.version
-
-        # Select the appropriate socket
-        self.socket = None
-        msg = 'No socket could be created'
-        if os.getenv('LISTEN_PID', None):
-            # systemd socket activation
-            self.socket = socket.fromfd(3, socket.AF_INET, socket.SOCK_STREAM)
-        elif isinstance(self.bind_addr, (str, bytes)):
-            # AF_UNIX socket
-            try:
-                self.bind_unix_socket(self.bind_addr)
-            except socket.error as serr:
-                msg = '%s -- (%s: %s)' % (msg, self.bind_addr, serr)
-                raise socket.error(msg) from serr
-        else:
-            # AF_INET or AF_INET6 socket
-            # Get the correct address family for our host (allows IPv6
-            # addresses)
-            host, port = self.bind_addr
-            try:
-                info = socket.getaddrinfo(
-                    host, port, socket.AF_UNSPEC,
-                    socket.SOCK_STREAM, 0, socket.AI_PASSIVE,
-                )
-            except socket.gaierror:
-                sock_type = socket.AF_INET
-                bind_addr = self.bind_addr
-
-                if ':' in host:
-                    sock_type = socket.AF_INET6
-                    bind_addr = bind_addr + (0, 0)
-
-                info = [(sock_type, socket.SOCK_STREAM, 0, '', bind_addr)]
-
-            for res in info:
-                af, socktype, proto, _canonname, sa = res
-                try:
-                    self.bind(af, socktype, proto)
-                    break
-                except socket.error as serr:
-                    msg = '%s -- (%s: %s)' % (msg, sa, serr)
-                    if self.socket:
-                        self.socket.close()
-                    self.socket = None
-
-        if not self.socket:
-            raise socket.error(msg)
-
-        # Timeout so KeyboardInterrupt can be caught on Win32
-        self.socket.settimeout(1)
-        self.socket.listen(self.request_queue_size)
-
-        # must not be accessed once stop() has been called
-        self._connections = connections.ConnectionManager(self)
-
-        # Create worker threads
-        self.requests.start()
-
-        self.ready = True
-        self._start_time = time.time()
-
-    def serve(self):
-        """Serve requests, after invoking :func:`prepare()`."""
-        while self.ready and not self.interrupt:
-            try:
-                self._connections.run(self.expiration_interval)
-            except (KeyboardInterrupt, SystemExit):
-                raise
-            except Exception:
-                self.error_log(
-                    'Error in HTTPServer.serve', level=logging.ERROR,
-                    traceback=True,
-                )
-
-        # raise exceptions reported by any worker threads,
-        # such that the exception is raised from the serve() thread.
-        if self.interrupt:
-            while self._stopping_for_interrupt:
-                time.sleep(0.1)
-            if self.interrupt:
-                raise self.interrupt
-
-    def start(self):
-        """Run the server forever.
-
-        It is shortcut for invoking :func:`prepare()` then :func:`serve()`.
-        """
-        # We don't have to trap KeyboardInterrupt or SystemExit here,
-        # because cherrypy.server already does so, calling self.stop() for us.
-        # If you're using this server with another framework, you should
-        # trap those exceptions in whatever code block calls start().
-        self.prepare()
-        self.serve()
-
-    @contextlib.contextmanager
-    def _run_in_thread(self):
-        """Context manager for running this server in a thread."""
-        self.prepare()
-        thread = threading.Thread(target=self.serve)
-        thread.daemon = True
-        thread.start()
-        try:
-            yield thread
-        finally:
-            self.stop()
-
-    @property
-    def can_add_keepalive_connection(self):
-        """Flag whether it is allowed to add a new keep-alive connection."""
-        return self.ready and self._connections.can_add_keepalive_connection
-
-    def put_conn(self, conn):
-        """Put an idle connection back into the ConnectionManager."""
-        if self.ready:
-            self._connections.put(conn)
-        else:
-            # server is shutting down, just close it
-            conn.close()
-
-    def error_log(self, msg='', level=20, traceback=False):
-        """Write error message to log.
-
-        Args:
-            msg (str): error message
-            level (int): logging level
-            traceback (bool): add traceback to output or not
-        """
-        # Override this in subclasses as desired
-        sys.stderr.write('{msg!s}\n'.format(msg=msg))
-        sys.stderr.flush()
-        if traceback:
-            tblines = traceback_.format_exc()
-            sys.stderr.write(tblines)
-            sys.stderr.flush()
-
-    def bind(self, family, type, proto=0):
-        """Create (or recreate) the actual socket object."""
-        sock = self.prepare_socket(
-            self.bind_addr,
-            family, type, proto,
-            self.nodelay, self.ssl_adapter,
-            self.reuse_port,
-        )
-        sock = self.socket = self.bind_socket(sock, self.bind_addr)
-        self.bind_addr = self.resolve_real_bind_addr(sock)
-        return sock
-
-    def bind_unix_socket(self, bind_addr):  # noqa: C901  # FIXME
-        """Create (or recreate) a UNIX socket object."""
-        if IS_WINDOWS:
-            """
-            Trying to access socket.AF_UNIX under Windows
-            causes an AttributeError.
-            """
-            raise ValueError(  # or RuntimeError?
-                'AF_UNIX sockets are not supported under Windows.',
-            )
-
-        fs_permissions = 0o777  # TODO: allow changing mode
-
-        try:
-            # Make possible reusing the socket...
-            os.unlink(self.bind_addr)
-        except OSError:
-            """
-            File does not exist, which is the primary goal anyway.
-            """
-        except TypeError as typ_err:
-            err_msg = str(typ_err)
-            if (
-                    'remove() argument 1 must be encoded '
-                    'string without null bytes, not unicode'
-                    not in err_msg
-            ):
-                raise
-        except ValueError as val_err:
-            err_msg = str(val_err)
-            if (
-                    'unlink: embedded null '
-                    'character in path' not in err_msg
-                    and 'embedded null byte' not in err_msg
-                    and 'argument must be a '
-                    'string without NUL characters' not in err_msg  # pypy3
-            ):
-                raise
-
-        sock = self.prepare_socket(
-            bind_addr=bind_addr,
-            family=socket.AF_UNIX, type=socket.SOCK_STREAM, proto=0,
-            nodelay=self.nodelay, ssl_adapter=self.ssl_adapter,
-            reuse_port=self.reuse_port,
-        )
-
-        try:
-            """Linux way of pre-populating fs mode permissions."""
-            # Allow everyone access the socket...
-            os.fchmod(sock.fileno(), fs_permissions)
-            FS_PERMS_SET = True
-        except OSError:
-            FS_PERMS_SET = False
-
-        try:
-            sock = self.bind_socket(sock, bind_addr)
-        except socket.error:
-            sock.close()
-            raise
-
-        bind_addr = self.resolve_real_bind_addr(sock)
-
-        try:
-            """FreeBSD/macOS pre-populating fs mode permissions."""
-            if not FS_PERMS_SET:
-                try:
-                    os.lchmod(bind_addr, fs_permissions)
-                except AttributeError:
-                    os.chmod(bind_addr, fs_permissions, follow_symlinks=False)
-                FS_PERMS_SET = True
-        except OSError:
-            pass
-
-        if not FS_PERMS_SET:
-            self.error_log(
-                'Failed to set socket fs mode permissions',
-                level=logging.WARNING,
-            )
-
-        self.bind_addr = bind_addr
-        self.socket = sock
-        return sock
-
-    @staticmethod
-    def _make_socket_reusable(socket_, bind_addr):
-        host, port = bind_addr[:2]
-        IS_EPHEMERAL_PORT = port == 0
-
-        if socket_.family not in (socket.AF_INET, socket.AF_INET6):
-            raise ValueError('Cannot reuse a non-IP socket')
-
-        if IS_EPHEMERAL_PORT:
-            raise ValueError('Cannot reuse an ephemeral port (0)')
-
-        # Most BSD kernels implement SO_REUSEPORT the way that only the
-        # latest listener can read from socket. Some of BSD kernels also
-        # have SO_REUSEPORT_LB that works similarly to SO_REUSEPORT
-        # in Linux.
-        if hasattr(socket, 'SO_REUSEPORT_LB'):
-            socket_.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT_LB, 1)
-        elif hasattr(socket, 'SO_REUSEPORT'):
-            socket_.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
-        elif IS_WINDOWS:
-            socket_.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        else:
-            raise NotImplementedError(
-                'Current platform does not support port reuse',
-            )
-
-    @classmethod
-    def prepare_socket(
-            cls, bind_addr, family, type, proto, nodelay, ssl_adapter,
-            reuse_port=False,
-    ):
-        """Create and prepare the socket object."""
-        sock = socket.socket(family, type, proto)
-        connections.prevent_socket_inheritance(sock)
-
-        host, port = bind_addr[:2]
-        IS_EPHEMERAL_PORT = port == 0
-
-        if reuse_port:
-            cls._make_socket_reusable(socket_=sock, bind_addr=bind_addr)
-
-        if not (IS_WINDOWS or IS_EPHEMERAL_PORT):
-            """Enable SO_REUSEADDR for the current socket.
-
-            Skip for Windows (has different semantics)
-            or ephemeral ports (can steal ports from others).
-
-            Refs:
-            * https://msdn.microsoft.com/en-us/library/ms740621(v=vs.85).aspx
-            * https://github.com/cherrypy/cheroot/issues/114
-            * https://gavv.github.io/blog/ephemeral-port-reuse/
-            """
-            sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        if nodelay and not isinstance(bind_addr, (str, bytes)):
-            sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
-
-        if ssl_adapter is not None:
-            sock = ssl_adapter.bind(sock)
-
-        # If listening on the IPV6 any address ('::' = IN6ADDR_ANY),
-        # activate dual-stack. See
-        # https://github.com/cherrypy/cherrypy/issues/871.
-        listening_ipv6 = (
-            hasattr(socket, 'AF_INET6')
-            and family == socket.AF_INET6
-            and host in ('::', '::0', '::0.0.0.0')
-        )
-        if listening_ipv6:
-            try:
-                sock.setsockopt(
-                    socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 0,
-                )
-            except (AttributeError, socket.error):
-                # Apparently, the socket option is not available in
-                # this machine's TCP stack
-                pass
-
-        return sock
-
-    @staticmethod
-    def bind_socket(socket_, bind_addr):
-        """Bind the socket to given interface."""
-        socket_.bind(bind_addr)
-        return socket_
-
-    @staticmethod
-    def resolve_real_bind_addr(socket_):
-        """Retrieve actual bind address from bound socket."""
-        # FIXME: keep requested bind_addr separate real bound_addr (port
-        # is different in case of ephemeral port 0)
-        bind_addr = socket_.getsockname()
-        if socket_.family in (
-            # Windows doesn't have socket.AF_UNIX, so not using it in check
-            socket.AF_INET,
-            socket.AF_INET6,
-        ):
-            """UNIX domain sockets are strings or bytes.
-
-            In case of bytes with a leading null-byte it's an abstract socket.
-            """
-            return bind_addr[:2]
-
-        if isinstance(bind_addr, bytes):
-            bind_addr = bton(bind_addr)
-
-        return bind_addr
-
-    def process_conn(self, conn):
-        """Process an incoming HTTPConnection."""
-        try:
-            self.requests.put(conn)
-        except queue.Full:
-            # Just drop the conn. TODO: write 503 back?
-            conn.close()
-
-    @property
-    def interrupt(self):
-        """Flag interrupt of the server."""
-        return self._interrupt
-
-    @property
-    def _stopping_for_interrupt(self):
-        """Return whether the server is responding to an interrupt."""
-        return self._interrupt is _STOPPING_FOR_INTERRUPT
-
-    @interrupt.setter
-    def interrupt(self, interrupt):
-        """Perform the shutdown of this server and save the exception.
-
-        Typically invoked by a worker thread in
-        :py:mod:`~cheroot.workers.threadpool`, the exception is raised
-        from the thread running :py:meth:`serve` once :py:meth:`stop`
-        has completed.
-        """
-        self._interrupt = _STOPPING_FOR_INTERRUPT
-
-        if isinstance(interrupt, KeyboardInterrupt):
-            self.error_log('Keyboard Interrupt: shutting down')
-
-        if isinstance(interrupt, SystemExit):
-            self.error_log('SystemExit raised: shutting down')
-
-        self.stop()
-        self._interrupt = interrupt
-
-    def stop(self):  # noqa: C901  # FIXME
-        """Gracefully shutdown a server that is serving forever."""
-        if not self.ready:
-            return  # already stopped
-
-        self.ready = False
-        if self._start_time is not None:
-            self._run_time += (time.time() - self._start_time)
-        self._start_time = None
-
-        self._connections.stop()
-
-        sock = getattr(self, 'socket', None)
-        if sock:
-            if not isinstance(self.bind_addr, (str, bytes)):
-                # Touch our own socket to make accept() return immediately.
-                try:
-                    host, port = sock.getsockname()[:2]
-                except socket.error as ex:
-                    if ex.args[0] not in errors.socket_errors_to_ignore:
-                        # Changed to use error code and not message
-                        # See
-                        # https://github.com/cherrypy/cherrypy/issues/860.
-                        raise
-                else:
-                    # Note that we're explicitly NOT using AI_PASSIVE,
-                    # here, because we want an actual IP to touch.
-                    # localhost won't work if we've bound to a public IP,
-                    # but it will if we bound to '0.0.0.0' (INADDR_ANY).
-                    for res in socket.getaddrinfo(
-                        host, port, socket.AF_UNSPEC,
-                        socket.SOCK_STREAM,
-                    ):
-                        af, socktype, proto, _canonname, _sa = res
-                        s = None
-                        try:
-                            s = socket.socket(af, socktype, proto)
-                            # See
-                            # https://groups.google.com/group/cherrypy-users/
-                            #     browse_frm/thread/bbfe5eb39c904fe0
-                            s.settimeout(1.0)
-                            s.connect((host, port))
-                            s.close()
-                        except socket.error:
-                            if s:
-                                s.close()
-            if hasattr(sock, 'close'):
-                sock.close()
-            self.socket = None
-
-        self._connections.close()
-        self.requests.stop(self.shutdown_timeout)
-
-
-class Gateway:
-    """Base class to interface HTTPServer with other systems, such as WSGI."""
-
-    def __init__(self, req):
-        """Initialize Gateway instance with request.
-
-        Args:
-            req (HTTPRequest): current HTTP request
-        """
-        self.req = req
-
-    def respond(self):
-        """Process the current request. Must be overridden in a subclass."""
-        raise NotImplementedError  # pragma: no cover
-
-
-# These may either be ssl.Adapter subclasses or the string names
-# of such classes (in which case they will be lazily loaded).
-ssl_adapters = {
-    'builtin': 'cheroot.ssl.builtin.BuiltinSSLAdapter',
-    'pyopenssl': 'cheroot.ssl.pyopenssl.pyOpenSSLAdapter',
-}
-
-
-def get_ssl_adapter_class(name='builtin'):
-    """Return an SSL adapter class for the given name."""
-    adapter = ssl_adapters[name.lower()]
-    if isinstance(adapter, str):
-        last_dot = adapter.rfind('.')
-        attr_name = adapter[last_dot + 1:]
-        mod_path = adapter[:last_dot]
-
-        try:
-            mod = sys.modules[mod_path]
-            if mod is None:
-                raise KeyError()
-        except KeyError:
-            # The last [''] is important.
-            mod = __import__(mod_path, globals(), locals(), [''])
-
-        # Let an AttributeError propagate outward.
-        try:
-            adapter = getattr(mod, attr_name)
-        except AttributeError:
-            raise AttributeError(
-                "'%s' object has no attribute '%s'"
-                % (mod_path, attr_name),
-            )
-
-    return adapter
diff --git a/lib/cheroot/server.pyi b/lib/cheroot/server.pyi
deleted file mode 100644
index ecbe2f27..00000000
--- a/lib/cheroot/server.pyi
+++ /dev/null
@@ -1,175 +0,0 @@
-from typing import Any
-
-class HeaderReader:
-    def __call__(self, rfile, hdict: Any | None = ...): ...
-
-class DropUnderscoreHeaderReader(HeaderReader): ...
-
-class SizeCheckWrapper:
-    rfile: Any
-    maxlen: Any
-    bytes_read: int
-    def __init__(self, rfile, maxlen) -> None: ...
-    def read(self, size: Any | None = ...): ...
-    def readline(self, size: Any | None = ...): ...
-    def readlines(self, sizehint: int = ...): ...
-    def close(self) -> None: ...
-    def __iter__(self): ...
-    def __next__(self): ...
-    next: Any
-
-class KnownLengthRFile:
-    rfile: Any
-    remaining: Any
-    def __init__(self, rfile, content_length) -> None: ...
-    def read(self, size: Any | None = ...): ...
-    def readline(self, size: Any | None = ...): ...
-    def readlines(self, sizehint: int = ...): ...
-    def close(self) -> None: ...
-    def __iter__(self): ...
-    def __next__(self): ...
-    next: Any
-
-class ChunkedRFile:
-    rfile: Any
-    maxlen: Any
-    bytes_read: int
-    buffer: Any
-    bufsize: Any
-    closed: bool
-    def __init__(self, rfile, maxlen, bufsize: int = ...) -> None: ...
-    def read(self, size: Any | None = ...): ...
-    def readline(self, size: Any | None = ...): ...
-    def readlines(self, sizehint: int = ...): ...
-    def read_trailer_lines(self) -> None: ...
-    def close(self) -> None: ...
-
-class HTTPRequest:
-    server: Any
-    conn: Any
-    inheaders: Any
-    outheaders: Any
-    ready: bool
-    close_connection: bool
-    chunked_write: bool
-    header_reader: Any
-    started_request: bool
-    scheme: bytes
-    response_protocol: str
-    status: str
-    sent_headers: bool
-    chunked_read: bool
-    proxy_mode: Any
-    strict_mode: Any
-    def __init__(self, server, conn, proxy_mode: bool = ..., strict_mode: bool = ...) -> None: ...
-    rfile: Any
-    def parse_request(self) -> None: ...
-    uri: Any
-    method: Any
-    authority: Any
-    path: Any
-    qs: Any
-    request_protocol: Any
-    def read_request_line(self): ...
-    def read_request_headers(self): ...
-    def respond(self) -> None: ...
-    def simple_response(self, status, msg: str = ...) -> None: ...
-    def ensure_headers_sent(self) -> None: ...
-    def write(self, chunk) -> None: ...
-    def send_headers(self) -> None: ...
-
-class HTTPConnection:
-    remote_addr: Any
-    remote_port: Any
-    ssl_env: Any
-    rbufsize: Any
-    wbufsize: Any
-    RequestHandlerClass: Any
-    peercreds_enabled: bool
-    peercreds_resolve_enabled: bool
-    last_used: Any
-    server: Any
-    socket: Any
-    rfile: Any
-    wfile: Any
-    requests_seen: int
-    def __init__(self, server, sock, makefile=...) -> None: ...
-    def communicate(self): ...
-    linger: bool
-    def close(self) -> None: ...
-    def get_peer_creds(self): ...
-    @property
-    def peer_pid(self): ...
-    @property
-    def peer_uid(self): ...
-    @property
-    def peer_gid(self): ...
-    def resolve_peer_creds(self): ...
-    @property
-    def peer_user(self): ...
-    @property
-    def peer_group(self): ...
-
-class HTTPServer:
-    gateway: Any
-    minthreads: Any
-    maxthreads: Any
-    server_name: Any
-    protocol: str
-    request_queue_size: int
-    shutdown_timeout: int
-    timeout: int
-    expiration_interval: float
-    version: Any
-    software: Any
-    ready: bool
-    max_request_header_size: int
-    max_request_body_size: int
-    nodelay: bool
-    ConnectionClass: Any
-    ssl_adapter: Any
-    peercreds_enabled: bool
-    peercreds_resolve_enabled: bool
-    reuse_port: bool
-    keep_alive_conn_limit: int
-    requests: Any
-    def __init__(self, bind_addr, gateway, minthreads: int = ..., maxthreads: int = ..., server_name: Any | None = ..., peercreds_enabled: bool = ..., peercreds_resolve_enabled: bool = ..., reuse_port: bool = ...) -> None: ...
-    stats: Any
-    def clear_stats(self): ...
-    def runtime(self): ...
-    @property
-    def bind_addr(self): ...
-    @bind_addr.setter
-    def bind_addr(self, value) -> None: ...
-    def safe_start(self) -> None: ...
-    socket: Any
-    def prepare(self) -> None: ...
-    def serve(self) -> None: ...
-    def start(self) -> None: ...
-    @property
-    def can_add_keepalive_connection(self): ...
-    def put_conn(self, conn) -> None: ...
-    def error_log(self, msg: str = ..., level: int = ..., traceback: bool = ...) -> None: ...
-    def bind(self, family, type, proto: int = ...): ...
-    def bind_unix_socket(self, bind_addr): ...
-    @staticmethod
-    def _make_socket_reusable(socket_, bind_addr) -> None: ...
-    @classmethod
-    def prepare_socket(cls, bind_addr, family, type, proto, nodelay, ssl_adapter, reuse_port: bool = ...): ...
-    @staticmethod
-    def bind_socket(socket_, bind_addr): ...
-    @staticmethod
-    def resolve_real_bind_addr(socket_): ...
-    def process_conn(self, conn) -> None: ...
-    @property
-    def interrupt(self): ...
-    @interrupt.setter
-    def interrupt(self, interrupt) -> None: ...
-    def stop(self) -> None: ...
-
-class Gateway:
-    req: Any
-    def __init__(self, req) -> None: ...
-    def respond(self) -> None: ...
-
-def get_ssl_adapter_class(name: str = ...): ...
diff --git a/lib/cheroot/ssl/__init__.py b/lib/cheroot/ssl/__init__.py
deleted file mode 100644
index 19b587d0..00000000
--- a/lib/cheroot/ssl/__init__.py
+++ /dev/null
@@ -1,46 +0,0 @@
-"""Implementation of the SSL adapter base interface."""
-
-from abc import ABCMeta, abstractmethod
-
-
-class Adapter(metaclass=ABCMeta):
-    """Base class for SSL driver library adapters.
-
-    Required methods:
-
-        * ``wrap(sock) -> (wrapped socket, ssl environ dict)``
-        * ``makefile(sock, mode='r', bufsize=DEFAULT_BUFFER_SIZE) ->
-          socket file object``
-    """
-
-    @abstractmethod
-    def __init__(
-            self, certificate, private_key, certificate_chain=None,
-            ciphers=None,
-    ):
-        """Set up certificates, private key ciphers and reset context."""
-        self.certificate = certificate
-        self.private_key = private_key
-        self.certificate_chain = certificate_chain
-        self.ciphers = ciphers
-        self.context = None
-
-    @abstractmethod
-    def bind(self, sock):
-        """Wrap and return the given socket."""
-        return sock
-
-    @abstractmethod
-    def wrap(self, sock):
-        """Wrap and return the given socket, plus WSGI environ entries."""
-        raise NotImplementedError  # pragma: no cover
-
-    @abstractmethod
-    def get_environ(self):
-        """Return WSGI environ entries to be merged into each request."""
-        raise NotImplementedError  # pragma: no cover
-
-    @abstractmethod
-    def makefile(self, sock, mode='r', bufsize=-1):
-        """Return socket file object."""
-        raise NotImplementedError  # pragma: no cover
diff --git a/lib/cheroot/ssl/__init__.pyi b/lib/cheroot/ssl/__init__.pyi
deleted file mode 100644
index 4801fbdd..00000000
--- a/lib/cheroot/ssl/__init__.pyi
+++ /dev/null
@@ -1,19 +0,0 @@
-from abc import abstractmethod, ABCMeta
-from typing import Any
-
-class Adapter(metaclass=ABCMeta):
-    certificate: Any
-    private_key: Any
-    certificate_chain: Any
-    ciphers: Any
-    context: Any
-    @abstractmethod
-    def __init__(self, certificate, private_key, certificate_chain: Any | None = ..., ciphers: Any | None = ...): ...
-    @abstractmethod
-    def bind(self, sock): ...
-    @abstractmethod
-    def wrap(self, sock): ...
-    @abstractmethod
-    def get_environ(self): ...
-    @abstractmethod
-    def makefile(self, sock, mode: str = ..., bufsize: int = ...): ...
diff --git a/lib/cheroot/ssl/builtin.py b/lib/cheroot/ssl/builtin.py
deleted file mode 100644
index e28e5df1..00000000
--- a/lib/cheroot/ssl/builtin.py
+++ /dev/null
@@ -1,448 +0,0 @@
-"""
-A library for integrating Python's builtin :py:mod:`ssl` library with Cheroot.
-
-The :py:mod:`ssl` module must be importable for SSL functionality.
-
-To use this module, set ``HTTPServer.ssl_adapter`` to an instance of
-``BuiltinSSLAdapter``.
-"""
-
-import socket
-import sys
-import threading
-from contextlib import suppress
-
-try:
-    import ssl
-except ImportError:
-    ssl = None
-
-try:
-    from _pyio import DEFAULT_BUFFER_SIZE
-except ImportError:
-    try:
-        from io import DEFAULT_BUFFER_SIZE
-    except ImportError:
-        DEFAULT_BUFFER_SIZE = -1
-
-from . import Adapter
-from .. import errors
-from ..makefile import StreamReader, StreamWriter
-from ..server import HTTPServer
-
-
-def _assert_ssl_exc_contains(exc, *msgs):
-    """Check whether SSL exception contains either of messages provided."""
-    if len(msgs) < 1:
-        raise TypeError(
-            '_assert_ssl_exc_contains() requires '
-            'at least one message to be passed.',
-        )
-    err_msg_lower = str(exc).lower()
-    return any(m.lower() in err_msg_lower for m in msgs)
-
-
-def _loopback_for_cert_thread(context, server):
-    """Wrap a socket in ssl and perform the server-side handshake."""
-    # As we only care about parsing the certificate, the failure of
-    # which will cause an exception in ``_loopback_for_cert``,
-    # we can safely ignore connection and ssl related exceptions. Ref:
-    # https://github.com/cherrypy/cheroot/issues/302#issuecomment-662592030
-    with suppress(ssl.SSLError, OSError):
-        with context.wrap_socket(
-                server, do_handshake_on_connect=True, server_side=True,
-        ) as ssl_sock:
-            # in TLS 1.3 (Python 3.7+, OpenSSL 1.1.1+), the server
-            # sends the client session tickets that can be used to
-            # resume the TLS session on a new connection without
-            # performing the full handshake again. session tickets are
-            # sent as a post-handshake message at some _unspecified_
-            # time and thus a successful connection may be closed
-            # without the client having received the tickets.
-            # Unfortunately, on Windows (Python 3.8+), this is treated
-            # as an incomplete handshake on the server side and a
-            # ``ConnectionAbortedError`` is raised.
-            # TLS 1.3 support is still incomplete in Python 3.8;
-            # there is no way for the client to wait for tickets.
-            # While not necessary for retrieving the parsed certificate,
-            # we send a tiny bit of data over the connection in an
-            # attempt to give the server a chance to send the session
-            # tickets and close the connection cleanly.
-            # Note that, as this is essentially a race condition,
-            # the error may still occur ocasionally.
-            ssl_sock.send(b'0000')
-
-
-def _loopback_for_cert(certificate, private_key, certificate_chain):
-    """Create a loopback connection to parse a cert with a private key."""
-    context = ssl.create_default_context(cafile=certificate_chain)
-    context.load_cert_chain(certificate, private_key)
-    context.check_hostname = False
-    context.verify_mode = ssl.CERT_NONE
-
-    # Python 3+ Unix, Python 3.5+ Windows
-    client, server = socket.socketpair()
-    try:
-        # `wrap_socket` will block until the ssl handshake is complete.
-        # it must be called on both ends at the same time -> thread
-        # openssl will cache the peer's cert during a successful handshake
-        # and return it via `getpeercert` even after the socket is closed.
-        # when `close` is called, the SSL shutdown notice will be sent
-        # and then python will wait to receive the corollary shutdown.
-        thread = threading.Thread(
-            target=_loopback_for_cert_thread, args=(context, server),
-        )
-        try:
-            thread.start()
-            with context.wrap_socket(
-                    client, do_handshake_on_connect=True,
-                    server_side=False,
-            ) as ssl_sock:
-                ssl_sock.recv(4)
-                return ssl_sock.getpeercert()
-        finally:
-            thread.join()
-    finally:
-        client.close()
-        server.close()
-
-
-def _parse_cert(certificate, private_key, certificate_chain):
-    """Parse a certificate."""
-    # loopback_for_cert uses socket.socketpair which was only
-    # introduced in Python 3.0 for *nix and 3.5 for Windows
-    # and requires OS support (AttributeError, OSError)
-    # it also requires a private key either in its own file
-    # or combined with the cert (SSLError)
-    with suppress(AttributeError, ssl.SSLError, OSError):
-        return _loopback_for_cert(certificate, private_key, certificate_chain)
-
-    # KLUDGE: using an undocumented, private, test method to parse a cert
-    # unfortunately, it is the only built-in way without a connection
-    # as a private, undocumented method, it may change at any time
-    # so be tolerant of *any* possible errors it may raise
-    with suppress(Exception):
-        return ssl._ssl._test_decode_cert(certificate)
-
-    return {}
-
-
-def _sni_callback(sock, sni, context):
-    """Handle the SNI callback to tag the socket with the SNI."""
-    sock.sni = sni
-    # return None to allow the TLS negotiation to continue
-
-
-class BuiltinSSLAdapter(Adapter):
-    """Wrapper for integrating Python's builtin :py:mod:`ssl` with Cheroot."""
-
-    certificate = None
-    """The file name of the server SSL certificate."""
-
-    private_key = None
-    """The file name of the server's private key file."""
-
-    certificate_chain = None
-    """The file name of the certificate chain file."""
-
-    ciphers = None
-    """The ciphers list of SSL."""
-
-    # from mod_ssl/pkg.sslmod/ssl_engine_vars.c ssl_var_lookup_ssl_cert
-    CERT_KEY_TO_ENV = {
-        'version': 'M_VERSION',
-        'serialNumber': 'M_SERIAL',
-        'notBefore': 'V_START',
-        'notAfter': 'V_END',
-        'subject': 'S_DN',
-        'issuer': 'I_DN',
-        'subjectAltName': 'SAN',
-        # not parsed by the Python standard library
-        # - A_SIG
-        # - A_KEY
-        # not provided by mod_ssl
-        # - OCSP
-        # - caIssuers
-        # - crlDistributionPoints
-    }
-
-    # from mod_ssl/pkg.sslmod/ssl_engine_vars.c ssl_var_lookup_ssl_cert_dn_rec
-    CERT_KEY_TO_LDAP_CODE = {
-        'countryName': 'C',
-        'stateOrProvinceName': 'ST',
-        # NOTE: mod_ssl also provides 'stateOrProvinceName' as 'SP'
-        # for compatibility with SSLeay
-        'localityName': 'L',
-        'organizationName': 'O',
-        'organizationalUnitName': 'OU',
-        'commonName': 'CN',
-        'title': 'T',
-        'initials': 'I',
-        'givenName': 'G',
-        'surname': 'S',
-        'description': 'D',
-        'userid': 'UID',
-        'emailAddress': 'Email',
-        # not provided by mod_ssl
-        # - dnQualifier: DNQ
-        # - domainComponent: DC
-        # - postalCode: PC
-        # - streetAddress: STREET
-        # - serialNumber
-        # - generationQualifier
-        # - pseudonym
-        # - jurisdictionCountryName
-        # - jurisdictionLocalityName
-        # - jurisdictionStateOrProvince
-        # - businessCategory
-    }
-
-    def __init__(
-            self, certificate, private_key, certificate_chain=None,
-            ciphers=None,
-    ):
-        """Set up context in addition to base class properties if available."""
-        if ssl is None:
-            raise ImportError('You must install the ssl module to use HTTPS.')
-
-        super(BuiltinSSLAdapter, self).__init__(
-            certificate, private_key, certificate_chain, ciphers,
-        )
-
-        self.context = ssl.create_default_context(
-            purpose=ssl.Purpose.CLIENT_AUTH,
-            cafile=certificate_chain,
-        )
-        self.context.load_cert_chain(certificate, private_key)
-        if self.ciphers is not None:
-            self.context.set_ciphers(ciphers)
-
-        self._server_env = self._make_env_cert_dict(
-            'SSL_SERVER',
-            _parse_cert(certificate, private_key, self.certificate_chain),
-        )
-        if not self._server_env:
-            return
-        cert = None
-        with open(certificate, mode='rt') as f:
-            cert = f.read()
-
-        # strip off any keys by only taking the first certificate
-        cert_start = cert.find(ssl.PEM_HEADER)
-        if cert_start == -1:
-            return
-        cert_end = cert.find(ssl.PEM_FOOTER, cert_start)
-        if cert_end == -1:
-            return
-        cert_end += len(ssl.PEM_FOOTER)
-        self._server_env['SSL_SERVER_CERT'] = cert[cert_start:cert_end]
-
-    @property
-    def context(self):
-        """:py:class:`~ssl.SSLContext` that will be used to wrap sockets."""
-        return self._context
-
-    @context.setter
-    def context(self, context):
-        """Set the ssl ``context`` to use."""
-        self._context = context
-        # Python 3.7+
-        # if a context is provided via `cherrypy.config.update` then
-        # `self.context` will be set after `__init__`
-        # use a property to intercept it to add an SNI callback
-        # but don't override the user's callback
-        # TODO: chain callbacks
-        with suppress(AttributeError):
-            if ssl.HAS_SNI and context.sni_callback is None:
-                context.sni_callback = _sni_callback
-
-    def bind(self, sock):
-        """Wrap and return the given socket."""
-        return super(BuiltinSSLAdapter, self).bind(sock)
-
-    def wrap(self, sock):
-        """Wrap and return the given socket, plus WSGI environ entries."""
-        try:
-            s = self.context.wrap_socket(
-                sock, do_handshake_on_connect=True, server_side=True,
-            )
-        except (
-            ssl.SSLEOFError,
-            ssl.SSLZeroReturnError,
-        ) as tls_connection_drop_error:
-            raise errors.FatalSSLAlert(
-                *tls_connection_drop_error.args,
-            ) from tls_connection_drop_error
-        except ssl.SSLError as generic_tls_error:
-            peer_speaks_plain_http_over_https = (
-                generic_tls_error.errno == ssl.SSL_ERROR_SSL and
-                _assert_ssl_exc_contains(generic_tls_error, 'http request')
-            )
-            if peer_speaks_plain_http_over_https:
-                reraised_connection_drop_exc_cls = errors.NoSSLError
-            else:
-                reraised_connection_drop_exc_cls = errors.FatalSSLAlert
-
-            raise reraised_connection_drop_exc_cls(
-                *generic_tls_error.args,
-            ) from generic_tls_error
-        except OSError as tcp_connection_drop_error:
-            raise errors.FatalSSLAlert(
-                *tcp_connection_drop_error.args,
-            ) from tcp_connection_drop_error
-
-        return s, self.get_environ(s)
-
-    def get_environ(self, sock):
-        """Create WSGI environ entries to be merged into each request."""
-        cipher = sock.cipher()
-        ssl_environ = {
-            'wsgi.url_scheme': 'https',
-            'HTTPS': 'on',
-            'SSL_PROTOCOL': cipher[1],
-            'SSL_CIPHER': cipher[0],
-            'SSL_CIPHER_EXPORT': '',
-            'SSL_CIPHER_USEKEYSIZE': cipher[2],
-            'SSL_VERSION_INTERFACE': '%s Python/%s' % (
-                HTTPServer.version, sys.version,
-            ),
-            'SSL_VERSION_LIBRARY': ssl.OPENSSL_VERSION,
-            'SSL_CLIENT_VERIFY': 'NONE',
-            # 'NONE' - client did not provide a cert (overriden below)
-        }
-
-        # Python 3.3+
-        with suppress(AttributeError):
-            compression = sock.compression()
-            if compression is not None:
-                ssl_environ['SSL_COMPRESS_METHOD'] = compression
-
-        # Python 3.6+
-        with suppress(AttributeError):
-            ssl_environ['SSL_SESSION_ID'] = sock.session.id.hex()
-        with suppress(AttributeError):
-            target_cipher = cipher[:2]
-            for cip in sock.context.get_ciphers():
-                if target_cipher == (cip['name'], cip['protocol']):
-                    ssl_environ['SSL_CIPHER_ALGKEYSIZE'] = cip['alg_bits']
-                    break
-
-        # Python 3.7+ sni_callback
-        with suppress(AttributeError):
-            ssl_environ['SSL_TLS_SNI'] = sock.sni
-
-        if self.context and self.context.verify_mode != ssl.CERT_NONE:
-            client_cert = sock.getpeercert()
-            if client_cert:
-                # builtin ssl **ALWAYS** validates client certificates
-                # and terminates the connection on failure
-                ssl_environ['SSL_CLIENT_VERIFY'] = 'SUCCESS'
-                ssl_environ.update(
-                    self._make_env_cert_dict('SSL_CLIENT', client_cert),
-                )
-                ssl_environ['SSL_CLIENT_CERT'] = ssl.DER_cert_to_PEM_cert(
-                    sock.getpeercert(binary_form=True),
-                ).strip()
-
-        ssl_environ.update(self._server_env)
-
-        # not supplied by the Python standard library (as of 3.8)
-        # - SSL_SESSION_RESUMED
-        # - SSL_SECURE_RENEG
-        # - SSL_CLIENT_CERT_CHAIN_n
-        # - SRP_USER
-        # - SRP_USERINFO
-
-        return ssl_environ
-
-    def _make_env_cert_dict(self, env_prefix, parsed_cert):
-        """Return a dict of WSGI environment variables for a certificate.
-
-        E.g. SSL_CLIENT_M_VERSION, SSL_CLIENT_M_SERIAL, etc.
-        See https://httpd.apache.org/docs/2.4/mod/mod_ssl.html#envvars.
-        """
-        if not parsed_cert:
-            return {}
-
-        env = {}
-        for cert_key, env_var in self.CERT_KEY_TO_ENV.items():
-            key = '%s_%s' % (env_prefix, env_var)
-            value = parsed_cert.get(cert_key)
-            if env_var == 'SAN':
-                env.update(self._make_env_san_dict(key, value))
-            elif env_var.endswith('_DN'):
-                env.update(self._make_env_dn_dict(key, value))
-            else:
-                env[key] = str(value)
-
-        # mod_ssl 2.1+; Python 3.2+
-        # number of days until the certificate expires
-        if 'notBefore' in parsed_cert:
-            remain = ssl.cert_time_to_seconds(parsed_cert['notAfter'])
-            remain -= ssl.cert_time_to_seconds(parsed_cert['notBefore'])
-            remain /= 60 * 60 * 24
-            env['%s_V_REMAIN' % (env_prefix,)] = str(int(remain))
-
-        return env
-
-    def _make_env_san_dict(self, env_prefix, cert_value):
-        """Return a dict of WSGI environment variables for a certificate DN.
-
-        E.g. SSL_CLIENT_SAN_Email_0, SSL_CLIENT_SAN_DNS_0, etc.
-        See SSL_CLIENT_SAN_* at
-        https://httpd.apache.org/docs/2.4/mod/mod_ssl.html#envvars.
-        """
-        if not cert_value:
-            return {}
-
-        env = {}
-        dns_count = 0
-        email_count = 0
-        for attr_name, val in cert_value:
-            if attr_name == 'DNS':
-                env['%s_DNS_%i' % (env_prefix, dns_count)] = val
-                dns_count += 1
-            elif attr_name == 'Email':
-                env['%s_Email_%i' % (env_prefix, email_count)] = val
-                email_count += 1
-
-        # other mod_ssl SAN vars:
-        # - SAN_OTHER_msUPN_n
-        return env
-
-    def _make_env_dn_dict(self, env_prefix, cert_value):
-        """Return a dict of WSGI environment variables for a certificate DN.
-
-        E.g. SSL_CLIENT_S_DN_CN, SSL_CLIENT_S_DN_C, etc.
-        See SSL_CLIENT_S_DN_x509 at
-        https://httpd.apache.org/docs/2.4/mod/mod_ssl.html#envvars.
-        """
-        if not cert_value:
-            return {}
-
-        dn = []
-        dn_attrs = {}
-        for rdn in cert_value:
-            for attr_name, val in rdn:
-                attr_code = self.CERT_KEY_TO_LDAP_CODE.get(attr_name)
-                dn.append('%s=%s' % (attr_code or attr_name, val))
-                if not attr_code:
-                    continue
-                dn_attrs.setdefault(attr_code, [])
-                dn_attrs[attr_code].append(val)
-
-        env = {
-            env_prefix: ','.join(dn),
-        }
-        for attr_code, values in dn_attrs.items():
-            env['%s_%s' % (env_prefix, attr_code)] = ','.join(values)
-            if len(values) == 1:
-                continue
-            for i, val in enumerate(values):
-                env['%s_%s_%i' % (env_prefix, attr_code, i)] = val
-        return env
-
-    def makefile(self, sock, mode='r', bufsize=DEFAULT_BUFFER_SIZE):
-        """Return socket file object."""
-        cls = StreamReader if 'r' in mode else StreamWriter
-        return cls(sock, mode, bufsize)
diff --git a/lib/cheroot/ssl/builtin.pyi b/lib/cheroot/ssl/builtin.pyi
deleted file mode 100644
index 72e45001..00000000
--- a/lib/cheroot/ssl/builtin.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-from typing import Any
-from . import Adapter
-
-DEFAULT_BUFFER_SIZE: int
-
-class BuiltinSSLAdapter(Adapter):
-    CERT_KEY_TO_ENV: Any
-    CERT_KEY_TO_LDAP_CODE: Any
-    def __init__(self, certificate, private_key, certificate_chain: Any | None = ..., ciphers: Any | None = ...) -> None: ...
-    @property
-    def context(self): ...
-    @context.setter
-    def context(self, context) -> None: ...
-    def bind(self, sock): ...
-    def wrap(self, sock): ...
-    def get_environ(self, sock): ...
-    def makefile(self, sock, mode: str = ..., bufsize: int = ...): ...
diff --git a/lib/cheroot/ssl/pyopenssl.py b/lib/cheroot/ssl/pyopenssl.py
deleted file mode 100644
index 8b01b348..00000000
--- a/lib/cheroot/ssl/pyopenssl.py
+++ /dev/null
@@ -1,378 +0,0 @@
-"""
-A library for integrating :doc:`pyOpenSSL <pyopenssl:index>` with Cheroot.
-
-The :py:mod:`OpenSSL <pyopenssl:OpenSSL>` module must be importable
-for SSL/TLS/HTTPS functionality.
-You can obtain it from `here <https://github.com/pyca/pyopenssl>`_.
-
-To use this module, set :py:attr:`HTTPServer.ssl_adapter
-<cheroot.server.HTTPServer.ssl_adapter>` to an instance of
-:py:class:`ssl.Adapter <cheroot.ssl.Adapter>`.
-There are two ways to use :abbr:`TLS (Transport-Level Security)`:
-
-Method One
-----------
-
- * :py:attr:`ssl_adapter.context
-   <cheroot.ssl.pyopenssl.pyOpenSSLAdapter.context>`: an instance of
-   :py:class:`SSL.Context <pyopenssl:OpenSSL.SSL.Context>`.
-
-If this is not None, it is assumed to be an :py:class:`SSL.Context
-<pyopenssl:OpenSSL.SSL.Context>` instance, and will be passed to
-:py:class:`SSL.Connection <pyopenssl:OpenSSL.SSL.Connection>` on bind().
-The developer is responsible for forming a valid :py:class:`Context
-<pyopenssl:OpenSSL.SSL.Context>` object. This
-approach is to be preferred for more flexibility, e.g. if the cert and
-key are streams instead of files, or need decryption, or
-:py:data:`SSL.SSLv3_METHOD <pyopenssl:OpenSSL.SSL.SSLv3_METHOD>`
-is desired instead of the default :py:data:`SSL.SSLv23_METHOD
-<pyopenssl:OpenSSL.SSL.SSLv3_METHOD>`, etc. Consult
-the :doc:`pyOpenSSL <pyopenssl:api/ssl>` documentation for
-complete options.
-
-Method Two (shortcut)
----------------------
-
- * :py:attr:`ssl_adapter.certificate
-   <cheroot.ssl.pyopenssl.pyOpenSSLAdapter.certificate>`: the file name
-   of the server's TLS certificate.
- * :py:attr:`ssl_adapter.private_key
-   <cheroot.ssl.pyopenssl.pyOpenSSLAdapter.private_key>`: the file name
-   of the server's private key file.
-
-Both are :py:data:`None` by default. If :py:attr:`ssl_adapter.context
-<cheroot.ssl.pyopenssl.pyOpenSSLAdapter.context>` is :py:data:`None`,
-but ``.private_key`` and ``.certificate`` are both given and valid, they
-will be read, and the context will be automatically created from them.
-
-.. spelling::
-
-   pyopenssl
-"""
-
-import socket
-import sys
-import threading
-import time
-
-try:
-    import OpenSSL.version
-    from OpenSSL import SSL
-    from OpenSSL import crypto
-
-    try:
-        ssl_conn_type = SSL.Connection
-    except AttributeError:
-        ssl_conn_type = SSL.ConnectionType
-except ImportError:
-    SSL = None
-
-from . import Adapter
-from .. import errors, server as cheroot_server
-from ..makefile import StreamReader, StreamWriter
-
-
-class SSLFileobjectMixin:
-    """Base mixin for a TLS socket stream."""
-
-    ssl_timeout = 3
-    ssl_retry = .01
-
-    # FIXME:
-    def _safe_call(self, is_reader, call, *args, **kwargs):  # noqa: C901
-        """Wrap the given call with TLS error-trapping.
-
-        is_reader: if False EOF errors will be raised. If True, EOF errors
-        will return "" (to emulate normal sockets).
-        """
-        start = time.time()
-        while True:
-            try:
-                return call(*args, **kwargs)
-            except SSL.WantReadError:
-                # Sleep and try again. This is dangerous, because it means
-                # the rest of the stack has no way of differentiating
-                # between a "new handshake" error and "client dropped".
-                # Note this isn't an endless loop: there's a timeout below.
-                # Ref: https://stackoverflow.com/a/5133568/595220
-                time.sleep(self.ssl_retry)
-            except SSL.WantWriteError:
-                time.sleep(self.ssl_retry)
-            except SSL.SysCallError as e:
-                if is_reader and e.args == (-1, 'Unexpected EOF'):
-                    return b''
-
-                errnum = e.args[0]
-                if is_reader and errnum in errors.socket_errors_to_ignore:
-                    return b''
-                raise socket.error(errnum)
-            except SSL.Error as e:
-                if is_reader and e.args == (-1, 'Unexpected EOF'):
-                    return b''
-
-                thirdarg = None
-                try:
-                    thirdarg = e.args[0][0][2]
-                except IndexError:
-                    pass
-
-                if thirdarg == 'http request':
-                    # The client is talking HTTP to an HTTPS server.
-                    raise errors.NoSSLError()
-
-                raise errors.FatalSSLAlert(*e.args)
-
-            if time.time() - start > self.ssl_timeout:
-                raise socket.timeout('timed out')
-
-    def recv(self, size):
-        """Receive message of a size from the socket."""
-        return self._safe_call(
-            True,
-            super(SSLFileobjectMixin, self).recv,
-            size,
-        )
-
-    def readline(self, size=-1):
-        """Receive message of a size from the socket.
-
-        Matches the following interface:
-        https://docs.python.org/3/library/io.html#io.IOBase.readline
-        """
-        return self._safe_call(
-            True,
-            super(SSLFileobjectMixin, self).readline,
-            size,
-        )
-
-    def sendall(self, *args, **kwargs):
-        """Send whole message to the socket."""
-        return self._safe_call(
-            False,
-            super(SSLFileobjectMixin, self).sendall,
-            *args, **kwargs,
-        )
-
-    def send(self, *args, **kwargs):
-        """Send some part of message to the socket."""
-        return self._safe_call(
-            False,
-            super(SSLFileobjectMixin, self).send,
-            *args, **kwargs,
-        )
-
-
-class SSLFileobjectStreamReader(SSLFileobjectMixin, StreamReader):
-    """SSL file object attached to a socket object."""
-
-
-class SSLFileobjectStreamWriter(SSLFileobjectMixin, StreamWriter):
-    """SSL file object attached to a socket object."""
-
-
-class SSLConnectionProxyMeta:
-    """Metaclass for generating a bunch of proxy methods."""
-
-    def __new__(mcl, name, bases, nmspc):
-        """Attach a list of proxy methods to a new class."""
-        proxy_methods = (
-            'get_context', 'pending', 'send', 'write', 'recv', 'read',
-            'renegotiate', 'bind', 'listen', 'connect', 'accept',
-            'setblocking', 'fileno', 'close', 'get_cipher_list',
-            'getpeername', 'getsockname', 'getsockopt', 'setsockopt',
-            'makefile', 'get_app_data', 'set_app_data', 'state_string',
-            'sock_shutdown', 'get_peer_certificate', 'want_read',
-            'want_write', 'set_connect_state', 'set_accept_state',
-            'connect_ex', 'sendall', 'settimeout', 'gettimeout',
-            'shutdown',
-        )
-        proxy_methods_no_args = (
-            'shutdown',
-        )
-
-        proxy_props = (
-            'family',
-        )
-
-        def lock_decorator(method):
-            """Create a proxy method for a new class."""
-
-            def proxy_wrapper(self, *args):
-                self._lock.acquire()
-                try:
-                    new_args = (
-                        args[:] if method not in proxy_methods_no_args else []
-                    )
-                    return getattr(self._ssl_conn, method)(*new_args)
-                finally:
-                    self._lock.release()
-            return proxy_wrapper
-        for m in proxy_methods:
-            nmspc[m] = lock_decorator(m)
-            nmspc[m].__name__ = m
-
-        def make_property(property_):
-            """Create a proxy method for a new class."""
-
-            def proxy_prop_wrapper(self):
-                return getattr(self._ssl_conn, property_)
-            proxy_prop_wrapper.__name__ = property_
-            return property(proxy_prop_wrapper)
-        for p in proxy_props:
-            nmspc[p] = make_property(p)
-
-        # Doesn't work via super() for some reason.
-        # Falling back to type() instead:
-        return type(name, bases, nmspc)
-
-
-class SSLConnection(metaclass=SSLConnectionProxyMeta):
-    r"""A thread-safe wrapper for an ``SSL.Connection``.
-
-    :param tuple args: the arguments to create the wrapped \
-                        :py:class:`SSL.Connection(*args) \
-                        <pyopenssl:OpenSSL.SSL.Connection>`
-    """
-
-    def __init__(self, *args):
-        """Initialize SSLConnection instance."""
-        self._ssl_conn = SSL.Connection(*args)
-        self._lock = threading.RLock()
-
-
-class pyOpenSSLAdapter(Adapter):
-    """A wrapper for integrating pyOpenSSL with Cheroot."""
-
-    certificate = None
-    """The file name of the server's TLS certificate."""
-
-    private_key = None
-    """The file name of the server's private key file."""
-
-    certificate_chain = None
-    """Optional. The file name of CA's intermediate certificate bundle.
-
-    This is needed for cheaper "chained root" TLS certificates,
-    and should be left as :py:data:`None` if not required."""
-
-    context = None
-    """
-    An instance of :py:class:`SSL.Context <pyopenssl:OpenSSL.SSL.Context>`.
-    """
-
-    ciphers = None
-    """The ciphers list of TLS."""
-
-    def __init__(
-            self, certificate, private_key, certificate_chain=None,
-            ciphers=None,
-    ):
-        """Initialize OpenSSL Adapter instance."""
-        if SSL is None:
-            raise ImportError('You must install pyOpenSSL to use HTTPS.')
-
-        super(pyOpenSSLAdapter, self).__init__(
-            certificate, private_key, certificate_chain, ciphers,
-        )
-
-        self._environ = None
-
-    def bind(self, sock):
-        """Wrap and return the given socket."""
-        if self.context is None:
-            self.context = self.get_context()
-        conn = SSLConnection(self.context, sock)
-        self._environ = self.get_environ()
-        return conn
-
-    def wrap(self, sock):
-        """Wrap and return the given socket, plus WSGI environ entries."""
-        # pyOpenSSL doesn't perform the handshake until the first read/write
-        # forcing the handshake to complete tends to result in the connection
-        # closing so we can't reliably access protocol/client cert for the env
-        return sock, self._environ.copy()
-
-    def get_context(self):
-        """Return an ``SSL.Context`` from self attributes.
-
-        Ref: :py:class:`SSL.Context <pyopenssl:OpenSSL.SSL.Context>`
-        """
-        # See https://code.activestate.com/recipes/442473/
-        c = SSL.Context(SSL.SSLv23_METHOD)
-        c.use_privatekey_file(self.private_key)
-        if self.certificate_chain:
-            c.load_verify_locations(self.certificate_chain)
-        c.use_certificate_file(self.certificate)
-        return c
-
-    def get_environ(self):
-        """Return WSGI environ entries to be merged into each request."""
-        ssl_environ = {
-            'wsgi.url_scheme': 'https',
-            'HTTPS': 'on',
-            'SSL_VERSION_INTERFACE': '%s %s/%s Python/%s' % (
-                cheroot_server.HTTPServer.version,
-                OpenSSL.version.__title__, OpenSSL.version.__version__,
-                sys.version,
-            ),
-            'SSL_VERSION_LIBRARY': SSL.SSLeay_version(
-                SSL.SSLEAY_VERSION,
-            ).decode(),
-        }
-
-        if self.certificate:
-            # Server certificate attributes
-            with open(self.certificate, 'rb') as cert_file:
-                cert = crypto.load_certificate(
-                    crypto.FILETYPE_PEM, cert_file.read(),
-                )
-
-            ssl_environ.update({
-                'SSL_SERVER_M_VERSION': cert.get_version(),
-                'SSL_SERVER_M_SERIAL': cert.get_serial_number(),
-                # 'SSL_SERVER_V_START':
-                #   Validity of server's certificate (start time),
-                # 'SSL_SERVER_V_END':
-                #   Validity of server's certificate (end time),
-            })
-
-            for prefix, dn in [
-                ('I', cert.get_issuer()),
-                ('S', cert.get_subject()),
-            ]:
-                # X509Name objects don't seem to have a way to get the
-                # complete DN string. Use str() and slice it instead,
-                # because str(dn) == "<X509Name object '/C=US/ST=...'>"
-                dnstr = str(dn)[18:-2]
-
-                wsgikey = 'SSL_SERVER_%s_DN' % prefix
-                ssl_environ[wsgikey] = dnstr
-
-                # The DN should be of the form: /k1=v1/k2=v2, but we must allow
-                # for any value to contain slashes itself (in a URL).
-                while dnstr:
-                    pos = dnstr.rfind('=')
-                    dnstr, value = dnstr[:pos], dnstr[pos + 1:]
-                    pos = dnstr.rfind('/')
-                    dnstr, key = dnstr[:pos], dnstr[pos + 1:]
-                    if key and value:
-                        wsgikey = 'SSL_SERVER_%s_DN_%s' % (prefix, key)
-                        ssl_environ[wsgikey] = value
-
-        return ssl_environ
-
-    def makefile(self, sock, mode='r', bufsize=-1):
-        """Return socket file object."""
-        cls = (
-            SSLFileobjectStreamReader
-            if 'r' in mode else
-            SSLFileobjectStreamWriter
-        )
-        if SSL and isinstance(sock, ssl_conn_type):
-            wrapped_socket = cls(sock, mode, bufsize)
-            wrapped_socket.ssl_timeout = sock.gettimeout()
-            return wrapped_socket
-        # This is from past:
-        # TODO: figure out what it's meant for
-        else:
-            return cheroot_server.CP_fileobject(sock, mode, bufsize)
diff --git a/lib/cheroot/ssl/pyopenssl.pyi b/lib/cheroot/ssl/pyopenssl.pyi
deleted file mode 100644
index 107675c9..00000000
--- a/lib/cheroot/ssl/pyopenssl.pyi
+++ /dev/null
@@ -1,31 +0,0 @@
-from . import Adapter
-from ..makefile import StreamReader, StreamWriter
-from OpenSSL import SSL
-from typing import Any, Type
-
-ssl_conn_type: Type[SSL.Connection]
-
-class SSLFileobjectMixin:
-    ssl_timeout: int
-    ssl_retry: float
-    def recv(self, size): ...
-    def readline(self, size: int = ...): ...
-    def sendall(self, *args, **kwargs): ...
-    def send(self, *args, **kwargs): ...
-
-class SSLFileobjectStreamReader(SSLFileobjectMixin, StreamReader): ...  # type:ignore[misc]
-class SSLFileobjectStreamWriter(SSLFileobjectMixin, StreamWriter): ...  # type:ignore[misc]
-
-class SSLConnectionProxyMeta:
-    def __new__(mcl, name, bases, nmspc): ...
-
-class SSLConnection:
-    def __init__(self, *args) -> None: ...
-
-class pyOpenSSLAdapter(Adapter):
-    def __init__(self, certificate, private_key, certificate_chain: Any | None = ..., ciphers: Any | None = ...) -> None: ...
-    def bind(self, sock): ...
-    def wrap(self, sock): ...
-    def get_environ(self): ...
-    def makefile(self, sock, mode: str = ..., bufsize: int = ...): ...
-    def get_context(self) -> SSL.Context: ...
diff --git a/lib/cheroot/test/__init__.py b/lib/cheroot/test/__init__.py
deleted file mode 100644
index e2a7b348..00000000
--- a/lib/cheroot/test/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Cheroot test suite."""
diff --git a/lib/cheroot/test/_pytest_plugin.py b/lib/cheroot/test/_pytest_plugin.py
deleted file mode 100644
index 61f2efe1..00000000
--- a/lib/cheroot/test/_pytest_plugin.py
+++ /dev/null
@@ -1,43 +0,0 @@
-"""Local pytest plugin.
-
-Contains hooks, which are tightly bound to the Cheroot framework
-itself, useless for end-users' app testing.
-"""
-
-import pytest
-
-
-pytest_version = tuple(map(int, pytest.__version__.split('.')))
-
-
-def pytest_load_initial_conftests(early_config, parser, args):
-    """Drop unfilterable warning ignores."""
-    if pytest_version < (6, 2, 0):
-        return
-
-    # pytest>=6.2.0 under Python 3.8:
-    # Refs:
-    # * https://docs.pytest.org/en/stable/usage.html#unraisable
-    # * https://github.com/pytest-dev/pytest/issues/5299
-    early_config._inicache['filterwarnings'].extend((
-        'ignore:Exception in thread CP Server Thread-:'
-        'pytest.PytestUnhandledThreadExceptionWarning:_pytest.threadexception',
-        'ignore:Exception in thread Thread-:'
-        'pytest.PytestUnhandledThreadExceptionWarning:_pytest.threadexception',
-        'ignore:Exception ignored in. '
-        '<socket.socket fd=-1, family=AddressFamily.AF_INET, '
-        'type=SocketKind.SOCK_STREAM, proto=.:'
-        'pytest.PytestUnraisableExceptionWarning:_pytest.unraisableexception',
-        'ignore:Exception ignored in. '
-        '<socket.socket fd=-1, family=AddressFamily.AF_INET6, '
-        'type=SocketKind.SOCK_STREAM, proto=.:'
-        'pytest.PytestUnraisableExceptionWarning:_pytest.unraisableexception',
-        'ignore:Exception ignored in. '
-        '<socket.socket fd=-1, family=AF_INET, '
-        'type=SocketKind.SOCK_STREAM, proto=.:'
-        'pytest.PytestUnraisableExceptionWarning:_pytest.unraisableexception',
-        'ignore:Exception ignored in. '
-        '<socket.socket fd=-1, family=AF_INET6, '
-        'type=SocketKind.SOCK_STREAM, proto=.:'
-        'pytest.PytestUnraisableExceptionWarning:_pytest.unraisableexception',
-    ))
diff --git a/lib/cheroot/test/conftest.py b/lib/cheroot/test/conftest.py
deleted file mode 100644
index 2beff2bf..00000000
--- a/lib/cheroot/test/conftest.py
+++ /dev/null
@@ -1,108 +0,0 @@
-"""Pytest configuration module.
-
-Contains fixtures, which are tightly bound to the Cheroot framework
-itself, useless for end-users' app testing.
-"""
-
-import threading
-import time
-
-import pytest
-
-from .._compat import IS_MACOS, IS_WINDOWS  # noqa: WPS436
-from ..server import Gateway, HTTPServer
-from ..testing import (  # noqa: F401  # pylint: disable=unused-import
-    native_server,
-    thread_and_wsgi_server,
-    thread_and_native_server,
-    wsgi_server,
-)
-from ..testing import get_server_client
-
-
-@pytest.fixture
-def http_request_timeout():
-    """Return a common HTTP request timeout for tests with queries."""
-    computed_timeout = 0.1
-
-    if IS_MACOS:
-        computed_timeout *= 2
-
-    if IS_WINDOWS:
-        computed_timeout *= 10
-
-    return computed_timeout
-
-
-@pytest.fixture
-# pylint: disable=redefined-outer-name
-def wsgi_server_thread(thread_and_wsgi_server):  # noqa: F811
-    """Set up and tear down a Cheroot WSGI server instance.
-
-    This exposes the server thread.
-    """
-    server_thread, _srv = thread_and_wsgi_server
-    return server_thread
-
-
-@pytest.fixture
-# pylint: disable=redefined-outer-name
-def native_server_thread(thread_and_native_server):  # noqa: F811
-    """Set up and tear down a Cheroot HTTP server instance.
-
-    This exposes the server thread.
-    """
-    server_thread, _srv = thread_and_native_server
-    return server_thread
-
-
-@pytest.fixture
-# pylint: disable=redefined-outer-name
-def wsgi_server_client(wsgi_server):  # noqa: F811
-    """Create a test client out of given WSGI server."""
-    return get_server_client(wsgi_server)
-
-
-@pytest.fixture
-# pylint: disable=redefined-outer-name
-def native_server_client(native_server):  # noqa: F811
-    """Create a test client out of given HTTP server."""
-    return get_server_client(native_server)
-
-
-@pytest.fixture
-def http_server():
-    """Provision a server creator as a fixture."""
-    def start_srv():
-        bind_addr = yield
-        if bind_addr is None:
-            return
-        httpserver = make_http_server(bind_addr)
-        yield httpserver
-        yield httpserver
-
-    srv_creator = iter(start_srv())
-    next(srv_creator)  # pylint: disable=stop-iteration-return
-    yield srv_creator
-    try:
-        while True:
-            httpserver = next(srv_creator)
-            if httpserver is not None:
-                httpserver.stop()
-    except StopIteration:
-        pass
-
-
-def make_http_server(bind_addr):
-    """Create and start an HTTP server bound to ``bind_addr``."""
-    httpserver = HTTPServer(
-        bind_addr=bind_addr,
-        gateway=Gateway,
-    )
-
-    threading.Thread(target=httpserver.safe_start).start()
-
-    while not httpserver.ready:
-        time.sleep(0.1)
-
-    return httpserver
diff --git a/lib/cheroot/test/helper.py b/lib/cheroot/test/helper.py
deleted file mode 100644
index e5eed08a..00000000
--- a/lib/cheroot/test/helper.py
+++ /dev/null
@@ -1,168 +0,0 @@
-"""A library of helper functions for the Cheroot test suite."""
-
-import datetime
-import logging
-import os
-import sys
-import time
-import threading
-import types
-import http.client
-
-import cheroot.server
-import cheroot.wsgi
-
-from cheroot.test import webtest
-
-log = logging.getLogger(__name__)
-thisdir = os.path.abspath(os.path.dirname(__file__))
-
-
-config = {
-    'bind_addr': ('127.0.0.1', 54583),
-    'server': 'wsgi',
-    'wsgi_app': None,
-}
-
-
-class CherootWebCase(webtest.WebCase):
-    """Helper class for a web app test suite."""
-
-    script_name = ''
-    scheme = 'http'
-
-    available_servers = {
-        'wsgi': cheroot.wsgi.Server,
-        'native': cheroot.server.HTTPServer,
-    }
-
-    @classmethod
-    def setup_class(cls):
-        """Create and run one HTTP server per class."""
-        conf = config.copy()
-        conf.update(getattr(cls, 'config', {}))
-
-        s_class = conf.pop('server', 'wsgi')
-        server_factory = cls.available_servers.get(s_class)
-        if server_factory is None:
-            raise RuntimeError('Unknown server in config: %s' % conf['server'])
-        cls.httpserver = server_factory(**conf)
-
-        cls.HOST, cls.PORT = cls.httpserver.bind_addr
-        if cls.httpserver.ssl_adapter is None:
-            ssl = ''
-            cls.scheme = 'http'
-        else:
-            ssl = ' (ssl)'
-            cls.HTTP_CONN = http.client.HTTPSConnection
-            cls.scheme = 'https'
-
-        v = sys.version.split()[0]
-        log.info('Python version used to run this test script: %s', v)
-        log.info('Cheroot version: %s', cheroot.__version__)
-        log.info('HTTP server version: %s%s', cls.httpserver.protocol, ssl)
-        log.info('PID: %s', os.getpid())
-
-        if hasattr(cls, 'setup_server'):
-            # Clear the wsgi server so that
-            # it can be updated with the new root
-            cls.setup_server()
-            cls.start()
-
-    @classmethod
-    def teardown_class(cls):
-        """Cleanup HTTP server."""
-        if hasattr(cls, 'setup_server'):
-            cls.stop()
-
-    @classmethod
-    def start(cls):
-        """Load and start the HTTP server."""
-        threading.Thread(target=cls.httpserver.safe_start).start()
-        while not cls.httpserver.ready:
-            time.sleep(0.1)
-
-    @classmethod
-    def stop(cls):
-        """Terminate HTTP server."""
-        cls.httpserver.stop()
-        td = getattr(cls, 'teardown', None)
-        if td:
-            td()
-
-    date_tolerance = 2
-
-    def assertEqualDates(self, dt1, dt2, seconds=None):
-        """Assert ``abs(dt1 - dt2)`` is within ``Y`` seconds."""
-        if seconds is None:
-            seconds = self.date_tolerance
-
-        if dt1 > dt2:
-            diff = dt1 - dt2
-        else:
-            diff = dt2 - dt1
-        if not diff < datetime.timedelta(seconds=seconds):
-            raise AssertionError(
-                '%r and %r are not within %r seconds.' %
-                (dt1, dt2, seconds),
-            )
-
-
-class Request:
-    """HTTP request container."""
-
-    def __init__(self, environ):
-        """Initialize HTTP request."""
-        self.environ = environ
-
-
-class Response:
-    """HTTP response container."""
-
-    def __init__(self):
-        """Initialize HTTP response."""
-        self.status = '200 OK'
-        self.headers = {'Content-Type': 'text/html'}
-        self.body = None
-
-    def output(self):
-        """Generate iterable response body object."""
-        if self.body is None:
-            return []
-        elif isinstance(self.body, str):
-            return [self.body.encode('iso-8859-1')]
-        elif isinstance(self.body, bytes):
-            return [self.body]
-        else:
-            return [x.encode('iso-8859-1') for x in self.body]
-
-
-class Controller:
-    """WSGI app for tests."""
-
-    def __call__(self, environ, start_response):
-        """WSGI request handler."""
-        req, resp = Request(environ), Response()
-        try:
-            # Python 3 supports unicode attribute names
-            # Python 2 encodes them
-            handler = self.handlers[environ['PATH_INFO']]
-        except KeyError:
-            resp.status = '404 Not Found'
-        else:
-            output = handler(req, resp)
-            if (
-                output is not None
-                and not any(
-                    resp.status.startswith(status_code)
-                    for status_code in ('204', '304')
-                )
-            ):
-                resp.body = output
-                try:
-                    resp.headers.setdefault('Content-Length', str(len(output)))
-                except TypeError:
-                    if not isinstance(output, types.GeneratorType):
-                        raise
-        start_response(resp.status, resp.headers.items())
-        return resp.output()
diff --git a/lib/cheroot/test/test__compat.py b/lib/cheroot/test/test__compat.py
deleted file mode 100644
index 8a0f3304..00000000
--- a/lib/cheroot/test/test__compat.py
+++ /dev/null
@@ -1,61 +0,0 @@
-"""Test suite for cross-python compatibility helpers."""
-
-import pytest
-
-from cheroot._compat import extract_bytes, ntob, ntou, bton
-
-
-@pytest.mark.parametrize(
-    ('func', 'inp', 'out'),
-    (
-        (ntob, 'bar', b'bar'),
-        (ntou, 'bar', u'bar'),
-        (bton, b'bar', 'bar'),
-    ),
-)
-def test_compat_functions_positive(func, inp, out):
-    """Check that compatibility functions work with correct input."""
-    assert func(inp, encoding='utf-8') == out
-
-
-@pytest.mark.parametrize(
-    'func',
-    (
-        ntob,
-        ntou,
-    ),
-)
-def test_compat_functions_negative_nonnative(func):
-    """Check that compatibility functions fail loudly for incorrect input."""
-    non_native_test_str = b'bar'
-    with pytest.raises(TypeError):
-        func(non_native_test_str, encoding='utf-8')
-
-
-def test_ntou_escape():
-    """Check that ``ntou`` supports escape-encoding under Python 2."""
-    expected = u'hišřії'
-    actual = ntou('hi\u0161\u0159\u0456\u0457', encoding='escape')
-    assert actual == expected
-
-
-@pytest.mark.parametrize(
-    ('input_argument', 'expected_result'),
-    (
-        (b'qwerty', b'qwerty'),
-        (memoryview(b'asdfgh'), b'asdfgh'),
-    ),
-)
-def test_extract_bytes(input_argument, expected_result):
-    """Check that legitimate inputs produce bytes."""
-    assert extract_bytes(input_argument) == expected_result
-
-
-def test_extract_bytes_invalid():
-    """Ensure that invalid input causes exception to be raised."""
-    with pytest.raises(
-            ValueError,
-            match=r'^extract_bytes\(\) only accepts bytes '
-            'and memoryview/buffer$',
-    ):
-        extract_bytes(u'some юнікод їїї')
diff --git a/lib/cheroot/test/test_cli.py b/lib/cheroot/test/test_cli.py
deleted file mode 100644
index a50ba98b..00000000
--- a/lib/cheroot/test/test_cli.py
+++ /dev/null
@@ -1,89 +0,0 @@
-"""Tests to verify the command line interface.
-
-.. spelling::
-
-   cli
-"""
-import sys
-
-import pytest
-
-from cheroot.cli import (
-    Application,
-    parse_wsgi_bind_addr,
-)
-
-
-@pytest.mark.parametrize(
-    ('raw_bind_addr', 'expected_bind_addr'),
-    (
-        # tcp/ip
-        ('192.168.1.1:80', ('192.168.1.1', 80)),
-        # ipv6 ips has to be enclosed in brakets when specified in url form
-        ('[::1]:8000', ('::1', 8000)),
-        ('localhost:5000', ('localhost', 5000)),
-        # this is a valid input, but foo gets discarted
-        ('foo@bar:5000', ('bar', 5000)),
-        ('foo', ('foo', None)),
-        ('123456789', ('123456789', None)),
-        # unix sockets
-        ('/tmp/cheroot.sock', '/tmp/cheroot.sock'),
-        ('/tmp/some-random-file-name', '/tmp/some-random-file-name'),
-        # abstract sockets
-        ('@cheroot', '\x00cheroot'),
-    ),
-)
-def test_parse_wsgi_bind_addr(raw_bind_addr, expected_bind_addr):
-    """Check the parsing of the --bind option.
-
-    Verify some of the supported addresses and the expected return value.
-    """
-    assert parse_wsgi_bind_addr(raw_bind_addr) == expected_bind_addr
-
-
-@pytest.fixture
-def wsgi_app(monkeypatch):
-    """Return a WSGI app stub."""
-    class WSGIAppMock:
-        """Mock of a wsgi module."""
-
-        def application(self):
-            """Empty application method.
-
-            Default method to be called when no specific callable
-            is defined in the wsgi application identifier.
-
-            It has an empty body because we are expecting to verify that
-            the same method is return no the actual execution of it.
-            """
-
-        def main(self):
-            """Empty custom method (callable) inside the mocked WSGI app.
-
-            It has an empty body because we are expecting to verify that
-            the same method is return no the actual execution of it.
-            """
-    app = WSGIAppMock()
-    # patch sys.modules, to include the an instance of WSGIAppMock
-    # under a specific namespace
-    monkeypatch.setitem(sys.modules, 'mypkg.wsgi', app)
-    return app
-
-
-@pytest.mark.parametrize(
-    ('app_name', 'app_method'),
-    (
-        (None, 'application'),
-        ('application', 'application'),
-        ('main', 'main'),
-    ),
-)
-# pylint: disable=invalid-name
-def test_Aplication_resolve(app_name, app_method, wsgi_app):
-    """Check the wsgi application name conversion."""
-    if app_name is None:
-        wsgi_app_spec = 'mypkg.wsgi'
-    else:
-        wsgi_app_spec = 'mypkg.wsgi:{app_name}'.format(**locals())
-    expected_app = getattr(wsgi_app, app_method)
-    assert Application.resolve(wsgi_app_spec).wsgi_app == expected_app
diff --git a/lib/cheroot/test/test_conn.py b/lib/cheroot/test/test_conn.py
deleted file mode 100644
index 21dff855..00000000
--- a/lib/cheroot/test/test_conn.py
+++ /dev/null
@@ -1,1583 +0,0 @@
-"""Tests for TCP connection handling, including proper and timely close."""
-
-import errno
-from re import match as _matches_pattern
-import socket
-import sys
-import time
-import logging
-import traceback as traceback_
-from collections import namedtuple
-import http.client
-import urllib.request
-
-import pytest
-from jaraco.text import trim, unwrap
-
-from cheroot.test import helper, webtest
-from cheroot._compat import IS_CI, IS_MACOS, IS_PYPY, IS_WINDOWS
-import cheroot.server
-
-
-IS_PY36 = sys.version_info[:2] == (3, 6)
-IS_SLOW_ENV = IS_MACOS or IS_WINDOWS
-
-
-timeout = 1
-pov = 'pPeErRsSiIsStTeEnNcCeE oOfF vViIsSiIoOnN'
-
-
-class Controller(helper.Controller):
-    """Controller for serving WSGI apps."""
-
-    def hello(req, resp):
-        """Render Hello world."""
-        return 'Hello, world!'
-
-    def pov(req, resp):
-        """Render ``pov`` value."""
-        return pov
-
-    def stream(req, resp):
-        """Render streaming response."""
-        if 'set_cl' in req.environ['QUERY_STRING']:
-            resp.headers['Content-Length'] = str(10)
-
-        def content():
-            for x in range(10):
-                yield str(x)
-
-        return content()
-
-    def upload(req, resp):
-        """Process file upload and render thank."""
-        if not req.environ['REQUEST_METHOD'] == 'POST':
-            raise AssertionError(
-                "'POST' != request.method %r" %
-                req.environ['REQUEST_METHOD'],
-            )
-        input_contents = req.environ['wsgi.input'].read().decode('utf-8')
-        return f"thanks for '{input_contents !s}'"
-
-    def custom_204(req, resp):
-        """Render response with status 204."""
-        resp.status = '204'
-        return 'Code = 204'
-
-    def custom_304(req, resp):
-        """Render response with status 304."""
-        resp.status = '304'
-        return 'Code = 304'
-
-    def err_before_read(req, resp):
-        """Render response with status 500."""
-        resp.status = '500 Internal Server Error'
-        return 'ok'
-
-    def one_megabyte_of_a(req, resp):
-        """Render 1MB response."""
-        return ['a' * 1024] * 1024
-
-    def wrong_cl_buffered(req, resp):
-        """Render buffered response with invalid length value."""
-        resp.headers['Content-Length'] = '5'
-        return 'I have too many bytes'
-
-    def wrong_cl_unbuffered(req, resp):
-        """Render unbuffered response with invalid length value."""
-        resp.headers['Content-Length'] = '5'
-        return ['I too', ' have too many bytes']
-
-    def _munge(string):
-        """Encode PATH_INFO correctly depending on Python version.
-
-        WSGI 1.0 is a mess around unicode. Create endpoints
-        that match the PATH_INFO that it produces.
-        """
-        return string.encode('utf-8').decode('latin-1')
-
-    handlers = {
-        '/hello': hello,
-        '/pov': pov,
-        '/page1': pov,
-        '/page2': pov,
-        '/page3': pov,
-        '/stream': stream,
-        '/upload': upload,
-        '/custom/204': custom_204,
-        '/custom/304': custom_304,
-        '/err_before_read': err_before_read,
-        '/one_megabyte_of_a': one_megabyte_of_a,
-        '/wrong_cl_buffered': wrong_cl_buffered,
-        '/wrong_cl_unbuffered': wrong_cl_unbuffered,
-    }
-
-
-class ErrorLogMonitor:
-    """Mock class to access the server error_log calls made by the server."""
-
-    ErrorLogCall = namedtuple('ErrorLogCall', ['msg', 'level', 'traceback'])
-
-    def __init__(self):
-        """Initialize the server error log monitor/interceptor.
-
-        If you need to ignore a particular error message use the property
-        ``ignored_msgs`` by appending to the list the expected error messages.
-        """
-        self.calls = []
-        # to be used the the teardown validation
-        self.ignored_msgs = []
-
-    def __call__(self, msg='', level=logging.INFO, traceback=False):
-        """Intercept the call to the server error_log method."""
-        if traceback:
-            tblines = traceback_.format_exc()
-        else:
-            tblines = ''
-        self.calls.append(ErrorLogMonitor.ErrorLogCall(msg, level, tblines))
-
-
-@pytest.fixture
-def raw_testing_server(wsgi_server_client):
-    """Attach a WSGI app to the given server and preconfigure it."""
-    app = Controller()
-
-    def _timeout(req, resp):
-        return str(wsgi_server.timeout)
-    app.handlers['/timeout'] = _timeout
-    wsgi_server = wsgi_server_client.server_instance
-    wsgi_server.wsgi_app = app
-    wsgi_server.max_request_body_size = 1001
-    wsgi_server.timeout = timeout
-    wsgi_server.server_client = wsgi_server_client
-    wsgi_server.keep_alive_conn_limit = 2
-
-    return wsgi_server
-
-
-@pytest.fixture
-def testing_server(raw_testing_server, monkeypatch):
-    """Modify the "raw" base server to monitor the error_log messages.
-
-    If you need to ignore a particular error message use the property
-    ``testing_server.error_log.ignored_msgs`` by appending to the list
-    the expected error messages.
-    """
-    # patch the error_log calls of the server instance
-    monkeypatch.setattr(raw_testing_server, 'error_log', ErrorLogMonitor())
-
-    yield raw_testing_server
-
-    # Teardown verification, in case that the server logged an
-    # error that wasn't notified to the client or we just made a mistake.
-    # pylint: disable=possibly-unused-variable
-    for c_msg, c_level, c_traceback in raw_testing_server.error_log.calls:
-        if c_level <= logging.WARNING:
-            continue
-
-        assert c_msg in raw_testing_server.error_log.ignored_msgs, (
-            'Found error in the error log: '
-            "message = '{c_msg}', level = '{c_level}'\n"
-            '{c_traceback}'.format(**locals()),
-        )
-
-
-@pytest.fixture
-def test_client(testing_server):
-    """Get and return a test client out of the given server."""
-    return testing_server.server_client
-
-
-def header_exists(header_name, headers):
-    """Check that a header is present."""
-    return header_name.lower() in (k.lower() for (k, _) in headers)
-
-
-def header_has_value(header_name, header_value, headers):
-    """Check that a header with a given value is present."""
-    return header_name.lower() in (
-        k.lower() for (k, v) in headers
-        if v == header_value
-    )
-
-
-def test_HTTP11_persistent_connections(test_client):
-    """Test persistent HTTP/1.1 connections."""
-    # Initialize a persistent HTTP connection
-    http_connection = test_client.get_connection()
-    http_connection.auto_open = False
-    http_connection.connect()
-
-    # Make the first request and assert there's no "Connection: close".
-    status_line, actual_headers, actual_resp_body = test_client.get(
-        '/pov', http_conn=http_connection,
-    )
-    actual_status = int(status_line[:3])
-    assert actual_status == 200
-    assert status_line[4:] == 'OK'
-    assert actual_resp_body == pov.encode()
-    assert not header_exists('Connection', actual_headers)
-
-    # Make another request on the same connection.
-    status_line, actual_headers, actual_resp_body = test_client.get(
-        '/page1', http_conn=http_connection,
-    )
-    actual_status = int(status_line[:3])
-    assert actual_status == 200
-    assert status_line[4:] == 'OK'
-    assert actual_resp_body == pov.encode()
-    assert not header_exists('Connection', actual_headers)
-
-    # Test client-side close.
-    status_line, actual_headers, actual_resp_body = test_client.get(
-        '/page2', http_conn=http_connection,
-        headers=[('Connection', 'close')],
-    )
-    actual_status = int(status_line[:3])
-    assert actual_status == 200
-    assert status_line[4:] == 'OK'
-    assert actual_resp_body == pov.encode()
-    assert header_has_value('Connection', 'close', actual_headers)
-
-    # Make another request on the same connection, which should error.
-    with pytest.raises(http.client.NotConnected):
-        test_client.get('/pov', http_conn=http_connection)
-
-
-@pytest.mark.parametrize(
-    'set_cl',
-    (
-        False,  # Without Content-Length
-        True,  # With Content-Length
-    ),
-)
-def test_streaming_11(test_client, set_cl):
-    """Test serving of streaming responses with HTTP/1.1 protocol."""
-    # Initialize a persistent HTTP connection
-    http_connection = test_client.get_connection()
-    http_connection.auto_open = False
-    http_connection.connect()
-
-    # Make the first request and assert there's no "Connection: close".
-    status_line, actual_headers, actual_resp_body = test_client.get(
-        '/pov', http_conn=http_connection,
-    )
-    actual_status = int(status_line[:3])
-    assert actual_status == 200
-    assert status_line[4:] == 'OK'
-    assert actual_resp_body == pov.encode()
-    assert not header_exists('Connection', actual_headers)
-
-    # Make another, streamed request on the same connection.
-    if set_cl:
-        # When a Content-Length is provided, the content should stream
-        # without closing the connection.
-        status_line, actual_headers, actual_resp_body = test_client.get(
-            '/stream?set_cl=Yes', http_conn=http_connection,
-        )
-        assert header_exists('Content-Length', actual_headers)
-        assert not header_has_value('Connection', 'close', actual_headers)
-        assert not header_exists('Transfer-Encoding', actual_headers)
-
-        assert actual_status == 200
-        assert status_line[4:] == 'OK'
-        assert actual_resp_body == b'0123456789'
-    else:
-        # When no Content-Length response header is provided,
-        # streamed output will either close the connection, or use
-        # chunked encoding, to determine transfer-length.
-        status_line, actual_headers, actual_resp_body = test_client.get(
-            '/stream', http_conn=http_connection,
-        )
-        assert not header_exists('Content-Length', actual_headers)
-        assert actual_status == 200
-        assert status_line[4:] == 'OK'
-        assert actual_resp_body == b'0123456789'
-
-        chunked_response = False
-        for k, v in actual_headers:
-            if k.lower() == 'transfer-encoding':
-                if str(v) == 'chunked':
-                    chunked_response = True
-
-        if chunked_response:
-            assert not header_has_value('Connection', 'close', actual_headers)
-        else:
-            assert header_has_value('Connection', 'close', actual_headers)
-
-            # Make another request on the same connection, which should
-            # error.
-            with pytest.raises(http.client.NotConnected):
-                test_client.get('/pov', http_conn=http_connection)
-
-        # Try HEAD.
-        # See https://www.bitbucket.org/cherrypy/cherrypy/issue/864.
-        # TODO: figure out how can this be possible on an closed connection
-        # (chunked_response case)
-        status_line, actual_headers, actual_resp_body = test_client.head(
-            '/stream', http_conn=http_connection,
-        )
-        assert actual_status == 200
-        assert status_line[4:] == 'OK'
-        assert actual_resp_body == b''
-        assert not header_exists('Transfer-Encoding', actual_headers)
-
-    # Prevent the resource warnings:
-    http_connection.close()
-
-
-@pytest.mark.parametrize(
-    'set_cl',
-    (
-        False,  # Without Content-Length
-        True,  # With Content-Length
-    ),
-)
-def test_streaming_10(test_client, set_cl):
-    """Test serving of streaming responses with HTTP/1.0 protocol."""
-    original_server_protocol = test_client.server_instance.protocol
-    test_client.server_instance.protocol = 'HTTP/1.0'
-
-    # Initialize a persistent HTTP connection
-    http_connection = test_client.get_connection()
-    http_connection.auto_open = False
-    http_connection.connect()
-
-    # Make the first request and assert Keep-Alive.
-    status_line, actual_headers, actual_resp_body = test_client.get(
-        '/pov', http_conn=http_connection,
-        headers=[('Connection', 'Keep-Alive')],
-        protocol='HTTP/1.0',
-    )
-    actual_status = int(status_line[:3])
-    assert actual_status == 200
-    assert status_line[4:] == 'OK'
-    assert actual_resp_body == pov.encode()
-    assert header_has_value('Connection', 'Keep-Alive', actual_headers)
-
-    # Make another, streamed request on the same connection.
-    if set_cl:
-        # When a Content-Length is provided, the content should
-        # stream without closing the connection.
-        status_line, actual_headers, actual_resp_body = test_client.get(
-            '/stream?set_cl=Yes', http_conn=http_connection,
-            headers=[('Connection', 'Keep-Alive')],
-            protocol='HTTP/1.0',
-        )
-        actual_status = int(status_line[:3])
-        assert actual_status == 200
-        assert status_line[4:] == 'OK'
-        assert actual_resp_body == b'0123456789'
-
-        assert header_exists('Content-Length', actual_headers)
-        assert header_has_value('Connection', 'Keep-Alive', actual_headers)
-        assert not header_exists('Transfer-Encoding', actual_headers)
-    else:
-        # When a Content-Length is not provided,
-        # the server should close the connection.
-        status_line, actual_headers, actual_resp_body = test_client.get(
-            '/stream', http_conn=http_connection,
-            headers=[('Connection', 'Keep-Alive')],
-            protocol='HTTP/1.0',
-        )
-        actual_status = int(status_line[:3])
-        assert actual_status == 200
-        assert status_line[4:] == 'OK'
-        assert actual_resp_body == b'0123456789'
-
-        assert not header_exists('Content-Length', actual_headers)
-        assert not header_has_value('Connection', 'Keep-Alive', actual_headers)
-        assert not header_exists('Transfer-Encoding', actual_headers)
-
-        # Make another request on the same connection, which should error.
-        with pytest.raises(http.client.NotConnected):
-            test_client.get(
-                '/pov', http_conn=http_connection,
-                protocol='HTTP/1.0',
-            )
-
-    test_client.server_instance.protocol = original_server_protocol
-
-    # Prevent the resource warnings:
-    http_connection.close()
-
-
-@pytest.mark.parametrize(
-    'http_server_protocol',
-    (
-        'HTTP/1.0',
-        pytest.param(
-            'HTTP/1.1',
-            marks=pytest.mark.xfail(
-                IS_PYPY and IS_CI,
-                reason='Fails under PyPy in CI for unknown reason',
-                strict=False,
-            ),
-        ),
-    ),
-)
-def test_keepalive(test_client, http_server_protocol):
-    """Test Keep-Alive enabled connections."""
-    original_server_protocol = test_client.server_instance.protocol
-    test_client.server_instance.protocol = http_server_protocol
-
-    http_client_protocol = 'HTTP/1.0'
-
-    # Initialize a persistent HTTP connection
-    http_connection = test_client.get_connection()
-    http_connection.auto_open = False
-    http_connection.connect()
-
-    # Test a normal HTTP/1.0 request.
-    status_line, actual_headers, actual_resp_body = test_client.get(
-        '/page2',
-        protocol=http_client_protocol,
-    )
-    actual_status = int(status_line[:3])
-    assert actual_status == 200
-    assert status_line[4:] == 'OK'
-    assert actual_resp_body == pov.encode()
-    assert not header_exists('Connection', actual_headers)
-
-    # Test a keep-alive HTTP/1.0 request.
-
-    status_line, actual_headers, actual_resp_body = test_client.get(
-        '/page3', headers=[('Connection', 'Keep-Alive')],
-        http_conn=http_connection, protocol=http_client_protocol,
-    )
-    actual_status = int(status_line[:3])
-    assert actual_status == 200
-    assert status_line[4:] == 'OK'
-    assert actual_resp_body == pov.encode()
-    assert header_has_value('Connection', 'Keep-Alive', actual_headers)
-    assert header_has_value(
-        'Keep-Alive',
-        'timeout={test_client.server_instance.timeout}'.format(**locals()),
-        actual_headers,
-    )
-
-    # Remove the keep-alive header again.
-    status_line, actual_headers, actual_resp_body = test_client.get(
-        '/page3', http_conn=http_connection,
-        protocol=http_client_protocol,
-    )
-    actual_status = int(status_line[:3])
-    assert actual_status == 200
-    assert status_line[4:] == 'OK'
-    assert actual_resp_body == pov.encode()
-    assert not header_exists('Connection', actual_headers)
-    assert not header_exists('Keep-Alive', actual_headers)
-
-    test_client.server_instance.protocol = original_server_protocol
-
-    # Prevent the resource warnings:
-    http_connection.close()
-
-
-def test_keepalive_conn_management(test_client):
-    """Test management of Keep-Alive connections."""
-    test_client.server_instance.timeout = 2
-
-    def connection():
-        # Initialize a persistent HTTP connection
-        http_connection = test_client.get_connection()
-        http_connection.auto_open = False
-        http_connection.connect()
-        return http_connection
-
-    def request(conn, keepalive=True):
-        status_line, actual_headers, actual_resp_body = test_client.get(
-            '/page3', headers=[('Connection', 'Keep-Alive')],
-            http_conn=conn, protocol='HTTP/1.0',
-        )
-        actual_status = int(status_line[:3])
-        assert actual_status == 200
-        assert status_line[4:] == 'OK'
-        assert actual_resp_body == pov.encode()
-        if keepalive:
-            assert header_has_value('Connection', 'Keep-Alive', actual_headers)
-            assert header_has_value(
-                'Keep-Alive',
-                'timeout={test_client.server_instance.timeout}'.
-                format(**locals()),
-                actual_headers,
-            )
-        else:
-            assert not header_exists('Connection', actual_headers)
-            assert not header_exists('Keep-Alive', actual_headers)
-
-    def check_server_idle_conn_count(count, timeout=1.0):
-        deadline = time.time() + timeout
-        while True:
-            n = test_client.server_instance._connections._num_connections
-            if n == count:
-                return
-            assert time.time() <= deadline, (
-                'idle conn count mismatch, wanted {count}, got {n}'.
-                format(**locals()),
-            )
-
-    disconnect_errors = (
-        http.client.BadStatusLine,
-        http.client.CannotSendRequest,
-        http.client.NotConnected,
-    )
-
-    # Make a new connection.
-    c1 = connection()
-    request(c1)
-    check_server_idle_conn_count(1)
-
-    # Make a second one.
-    c2 = connection()
-    request(c2)
-    check_server_idle_conn_count(2)
-
-    # Reusing the first connection should still work.
-    request(c1)
-    check_server_idle_conn_count(2)
-
-    # Creating a new connection should still work, but we should
-    # have run out of available connections to keep alive, so the
-    # server should tell us to close.
-    c3 = connection()
-    request(c3, keepalive=False)
-    check_server_idle_conn_count(2)
-
-    # Show that the third connection was closed.
-    with pytest.raises(disconnect_errors):
-        request(c3)
-    check_server_idle_conn_count(2)
-
-    # Wait for some of our timeout.
-    time.sleep(1.2)
-
-    # Refresh the second connection.
-    request(c2)
-    check_server_idle_conn_count(2)
-
-    # Wait for the remainder of our timeout, plus one tick.
-    time.sleep(1.2)
-    check_server_idle_conn_count(1)
-
-    # First connection should now be expired.
-    with pytest.raises(disconnect_errors):
-        request(c1)
-    check_server_idle_conn_count(1)
-
-    # But the second one should still be valid.
-    request(c2)
-    check_server_idle_conn_count(1)
-
-    # Restore original timeout.
-    test_client.server_instance.timeout = timeout
-
-    # Prevent the resource warnings:
-    c1.close()
-    c2.close()
-    c3.close()
-
-
-@pytest.mark.parametrize(
-    ('simulated_exception', 'error_number', 'exception_leaks'),
-    (
-        pytest.param(
-            socket.error, errno.ECONNRESET, False,
-            id='socket.error(ECONNRESET)',
-        ),
-        pytest.param(
-            socket.error, errno.EPIPE, False,
-            id='socket.error(EPIPE)',
-        ),
-        pytest.param(
-            socket.error, errno.ENOTCONN, False,
-            id='simulated socket.error(ENOTCONN)',
-        ),
-        pytest.param(
-            None,  # <-- don't raise an artificial exception
-            errno.ENOTCONN, False,
-            id='real socket.error(ENOTCONN)',
-            marks=pytest.mark.xfail(
-                IS_WINDOWS,
-                reason='Now reproducible this way on Windows',
-            ),
-        ),
-        pytest.param(
-            socket.error, errno.ESHUTDOWN, False,
-            id='socket.error(ESHUTDOWN)',
-        ),
-        pytest.param(RuntimeError, 666, True, id='RuntimeError(666)'),
-        pytest.param(socket.error, -1, True, id='socket.error(-1)'),
-    ) + (
-        pytest.param(
-            ConnectionResetError, errno.ECONNRESET, False,
-            id='ConnectionResetError(ECONNRESET)',
-        ),
-        pytest.param(
-            BrokenPipeError, errno.EPIPE, False,
-            id='BrokenPipeError(EPIPE)',
-        ),
-        pytest.param(
-            BrokenPipeError, errno.ESHUTDOWN, False,
-            id='BrokenPipeError(ESHUTDOWN)',
-        ),
-    ),
-)
-def test_broken_connection_during_tcp_fin(
-        error_number, exception_leaks,
-        mocker, monkeypatch,
-        simulated_exception, test_client,
-):
-    """Test there's no traceback on broken connection during close.
-
-    It artificially causes :py:data:`~errno.ECONNRESET` /
-    :py:data:`~errno.EPIPE` / :py:data:`~errno.ESHUTDOWN` /
-    :py:data:`~errno.ENOTCONN` as well as unrelated :py:exc:`RuntimeError`
-    and :py:exc:`socket.error(-1) <socket.error>` on the server socket when
-    :py:meth:`socket.shutdown() <socket.socket.shutdown>` is called. It's
-    triggered by closing the client socket before the server had a chance
-    to respond.
-
-    The expectation is that only :py:exc:`RuntimeError` and a
-    :py:exc:`socket.error` with an unusual error code would leak.
-
-    With the :py:data:`None`-parameter, a real non-simulated
-    :py:exc:`OSError(107, 'Transport endpoint is not connected')
-    <OSError>` happens.
-    """
-    exc_instance = (
-        None if simulated_exception is None
-        else simulated_exception(error_number, 'Simulated socket error')
-    )
-    old_close_kernel_socket = (
-        test_client.server_instance.
-        ConnectionClass._close_kernel_socket
-    )
-
-    def _close_kernel_socket(self):
-        monkeypatch.setattr(  # `socket.shutdown` is read-only otherwise
-            self, 'socket',
-            mocker.mock_module.Mock(wraps=self.socket),
-        )
-        if exc_instance is not None:
-            monkeypatch.setattr(
-                self.socket, 'shutdown',
-                mocker.mock_module.Mock(side_effect=exc_instance),
-            )
-        _close_kernel_socket.fin_spy = mocker.spy(self.socket, 'shutdown')
-
-        try:
-            old_close_kernel_socket(self)
-        except simulated_exception:
-            _close_kernel_socket.exception_leaked = True
-        else:
-            _close_kernel_socket.exception_leaked = False
-
-    monkeypatch.setattr(
-        test_client.server_instance.ConnectionClass,
-        '_close_kernel_socket',
-        _close_kernel_socket,
-    )
-
-    conn = test_client.get_connection()
-    conn.auto_open = False
-    conn.connect()
-    conn.send(b'GET /hello HTTP/1.1')
-    conn.send(('Host: %s' % conn.host).encode('ascii'))
-    conn.close()
-
-    # Let the server attempt TCP shutdown:
-    for _ in range(10 * (2 if IS_SLOW_ENV else 1)):
-        time.sleep(0.1)
-        if hasattr(_close_kernel_socket, 'exception_leaked'):
-            break
-
-    if exc_instance is not None:  # simulated by us
-        assert _close_kernel_socket.fin_spy.spy_exception is exc_instance
-    else:  # real
-        assert isinstance(
-            _close_kernel_socket.fin_spy.spy_exception, socket.error,
-        )
-        assert _close_kernel_socket.fin_spy.spy_exception.errno == error_number
-
-    assert _close_kernel_socket.exception_leaked is exception_leaks
-
-
-def test_broken_connection_during_http_communication_fallback(  # noqa: WPS118
-        monkeypatch,
-        test_client,
-        testing_server,
-        wsgi_server_thread,
-):
-    """Test that unhandled internal error cascades into shutdown."""
-    def _raise_connection_reset(*_args, **_kwargs):
-        raise ConnectionResetError(666)
-
-    def _read_request_line(self):
-        monkeypatch.setattr(self.conn.rfile, 'close', _raise_connection_reset)
-        monkeypatch.setattr(self.conn.wfile, 'write', _raise_connection_reset)
-        _raise_connection_reset()
-
-    monkeypatch.setattr(
-        test_client.server_instance.ConnectionClass.RequestHandlerClass,
-        'read_request_line',
-        _read_request_line,
-    )
-
-    test_client.get_connection().send(b'GET / HTTP/1.1')
-    wsgi_server_thread.join()  # no extra logs upon server termination
-
-    actual_log_entries = testing_server.error_log.calls[:]
-    testing_server.error_log.calls.clear()  # prevent post-test assertions
-
-    expected_log_entries = (
-        (logging.WARNING, r'^socket\.error 666$'),
-        (
-            logging.INFO,
-            '^Got a connection error while handling a connection '
-            r'from .*:\d{1,5} \(666\)',
-        ),
-        (
-            logging.CRITICAL,
-            r'A fatal exception happened\. Setting the server interrupt flag '
-            r'to ConnectionResetError\(666,?\) and giving up\.\n\nPlease, '
-            'report this on the Cheroot tracker at '
-            r'<https://github\.com/cherrypy/cheroot/issues/new/choose>, '
-            'providing a full reproducer with as much context and details '
-            r'as possible\.$',
-        ),
-    )
-
-    assert len(actual_log_entries) == len(expected_log_entries)
-
-    for (  # noqa: WPS352
-            (expected_log_level, expected_msg_regex),
-            (actual_msg, actual_log_level, _tb),
-    ) in zip(expected_log_entries, actual_log_entries):
-        assert expected_log_level == actual_log_level
-        assert _matches_pattern(expected_msg_regex, actual_msg) is not None, (
-            f'{actual_msg !r} does not match {expected_msg_regex !r}'
-        )
-
-
-def test_kb_int_from_http_handler(
-        test_client,
-        testing_server,
-        wsgi_server_thread,
-):
-    """Test that a keyboard interrupt from HTTP handler causes shutdown."""
-    def _trigger_kb_intr(_req, _resp):
-        raise KeyboardInterrupt('simulated test handler keyboard interrupt')
-    testing_server.wsgi_app.handlers['/kb_intr'] = _trigger_kb_intr
-
-    http_conn = test_client.get_connection()
-    http_conn.putrequest('GET', '/kb_intr', skip_host=True)
-    http_conn.putheader('Host', http_conn.host)
-    http_conn.endheaders()
-    wsgi_server_thread.join()  # no extra logs upon server termination
-
-    actual_log_entries = testing_server.error_log.calls[:]
-    testing_server.error_log.calls.clear()  # prevent post-test assertions
-
-    expected_log_entries = (
-        (
-            logging.DEBUG,
-            '^Got a server shutdown request while handling a connection '
-            r'from .*:\d{1,5} \(simulated test handler keyboard interrupt\)$',
-        ),
-        (
-            logging.DEBUG,
-            '^Setting the server interrupt flag to KeyboardInterrupt'
-            r"\('simulated test handler keyboard interrupt',?\)$",
-        ),
-        (
-            logging.INFO,
-            '^Keyboard Interrupt: shutting down$',
-        ),
-    )
-
-    assert len(actual_log_entries) == len(expected_log_entries)
-
-    for (  # noqa: WPS352
-            (expected_log_level, expected_msg_regex),
-            (actual_msg, actual_log_level, _tb),
-    ) in zip(expected_log_entries, actual_log_entries):
-        assert expected_log_level == actual_log_level
-        assert _matches_pattern(expected_msg_regex, actual_msg) is not None, (
-            f'{actual_msg !r} does not match {expected_msg_regex !r}'
-        )
-
-
-@pytest.mark.xfail(
-    IS_CI and IS_PYPY and IS_PY36 and not IS_SLOW_ENV,
-    reason='Fails under PyPy 3.6 under Ubuntu 20.04 in CI for unknown reason',
-    # NOTE: Actually covers any Linux
-    strict=False,
-)
-def test_unhandled_exception_in_request_handler(
-        mocker,
-        monkeypatch,
-        test_client,
-        testing_server,
-        wsgi_server_thread,
-):
-    """Ensure worker threads are resilient to in-handler exceptions."""
-
-    class SillyMistake(BaseException):  # noqa: WPS418, WPS431
-        """A simulated crash within an HTTP handler."""
-
-    def _trigger_scary_exc(_req, _resp):
-        raise SillyMistake('simulated unhandled exception 💣 in test handler')
-
-    testing_server.wsgi_app.handlers['/scary_exc'] = _trigger_scary_exc
-
-    server_connection_close_spy = mocker.spy(
-        test_client.server_instance.ConnectionClass,
-        'close',
-    )
-
-    http_conn = test_client.get_connection()
-    http_conn.putrequest('GET', '/scary_exc', skip_host=True)
-    http_conn.putheader('Host', http_conn.host)
-    http_conn.endheaders()
-
-    # NOTE: This spy ensure the log entry gets recorded before we're testing
-    # NOTE: them and before server shutdown, preserving their order and making
-    # NOTE: the log entry presence non-flaky.
-    while not server_connection_close_spy.called:  # noqa: WPS328
-        pass
-
-    assert len(testing_server.requests._threads) == 10
-    while testing_server.requests.idle < 10:  # noqa: WPS328
-        pass
-    assert len(testing_server.requests._threads) == 10
-    testing_server.interrupt = SystemExit('test requesting shutdown')
-    assert not testing_server.requests._threads
-    wsgi_server_thread.join()  # no extra logs upon server termination
-
-    actual_log_entries = testing_server.error_log.calls[:]
-    testing_server.error_log.calls.clear()  # prevent post-test assertions
-
-    expected_log_entries = (
-        (
-            logging.ERROR,
-            '^Unhandled error while processing an incoming connection '
-            'SillyMistake'
-            r"\('simulated unhandled exception 💣 in test handler',?\)$",
-        ),
-        (
-            logging.INFO,
-            '^SystemExit raised: shutting down$',
-        ),
-    )
-
-    assert len(actual_log_entries) == len(expected_log_entries)
-
-    for (  # noqa: WPS352
-            (expected_log_level, expected_msg_regex),
-            (actual_msg, actual_log_level, _tb),
-    ) in zip(expected_log_entries, actual_log_entries):
-        assert expected_log_level == actual_log_level
-        assert _matches_pattern(expected_msg_regex, actual_msg) is not None, (
-            f'{actual_msg !r} does not match {expected_msg_regex !r}'
-        )
-
-
-@pytest.mark.xfail(
-    IS_CI and IS_PYPY and IS_PY36 and not IS_SLOW_ENV,
-    reason='Fails under PyPy 3.6 under Ubuntu 20.04 in CI for unknown reason',
-    # NOTE: Actually covers any Linux
-    strict=False,
-)
-def test_remains_alive_post_unhandled_exception(
-        mocker,
-        monkeypatch,
-        test_client,
-        testing_server,
-        wsgi_server_thread,
-):
-    """Ensure worker threads are resilient to unhandled exceptions."""
-
-    class ScaryCrash(BaseException):  # noqa: WPS418, WPS431
-        """A simulated crash during HTTP parsing."""
-
-    _orig_read_request_line = (
-        test_client.server_instance.
-        ConnectionClass.RequestHandlerClass.
-        read_request_line
-    )
-
-    def _read_request_line(self):
-        _orig_read_request_line(self)
-        raise ScaryCrash(666)
-
-    monkeypatch.setattr(
-        test_client.server_instance.ConnectionClass.RequestHandlerClass,
-        'read_request_line',
-        _read_request_line,
-    )
-
-    server_connection_close_spy = mocker.spy(
-        test_client.server_instance.ConnectionClass,
-        'close',
-    )
-
-    # NOTE: The initial worker thread count is 10.
-    assert len(testing_server.requests._threads) == 10
-
-    test_client.get_connection().send(b'GET / HTTP/1.1')
-
-    # NOTE: This spy ensure the log entry gets recorded before we're testing
-    # NOTE: them and before server shutdown, preserving their order and making
-    # NOTE: the log entry presence non-flaky.
-    while not server_connection_close_spy.called:  # noqa: WPS328
-        pass
-
-    # NOTE: This checks for whether there's any crashed threads
-    while testing_server.requests.idle < 10:  # noqa: WPS328
-        pass
-    assert len(testing_server.requests._threads) == 10
-    assert all(
-        worker_thread.is_alive()
-        for worker_thread in testing_server.requests._threads
-    )
-    testing_server.interrupt = SystemExit('test requesting shutdown')
-    assert not testing_server.requests._threads
-    wsgi_server_thread.join()  # no extra logs upon server termination
-
-    actual_log_entries = testing_server.error_log.calls[:]
-    testing_server.error_log.calls.clear()  # prevent post-test assertions
-
-    expected_log_entries = (
-        (
-            logging.ERROR,
-            '^Unhandled error while processing an incoming connection '
-            r'ScaryCrash\(666,?\)$',
-        ),
-        (
-            logging.INFO,
-            '^SystemExit raised: shutting down$',
-        ),
-    )
-
-    assert len(actual_log_entries) == len(expected_log_entries)
-
-    for (  # noqa: WPS352
-            (expected_log_level, expected_msg_regex),
-            (actual_msg, actual_log_level, _tb),
-    ) in zip(expected_log_entries, actual_log_entries):
-        assert expected_log_level == actual_log_level
-        assert _matches_pattern(expected_msg_regex, actual_msg) is not None, (
-            f'{actual_msg !r} does not match {expected_msg_regex !r}'
-        )
-
-
-@pytest.mark.parametrize(
-    'timeout_before_headers',
-    (
-        True,
-        False,
-    ),
-)
-def test_HTTP11_Timeout(test_client, timeout_before_headers):
-    """Check timeout without sending any data.
-
-    The server will close the connection with a 408.
-    """
-    conn = test_client.get_connection()
-    conn.auto_open = False
-    conn.connect()
-
-    if not timeout_before_headers:
-        # Connect but send half the headers only.
-        conn.send(b'GET /hello HTTP/1.1')
-        conn.send(('Host: %s' % conn.host).encode('ascii'))
-    # else: Connect but send nothing.
-
-    # Wait for our socket timeout
-    time.sleep(timeout * 2)
-
-    # The request should have returned 408 already.
-    response = conn.response_class(conn.sock, method='GET')
-    response.begin()
-    assert response.status == 408
-    conn.close()
-
-
-def test_HTTP11_Timeout_after_request(test_client):
-    """Check timeout after at least one request has succeeded.
-
-    The server should close the connection without 408.
-    """
-    fail_msg = "Writing to timed out socket didn't fail as it should have: %s"
-
-    # Make an initial request
-    conn = test_client.get_connection()
-    conn.putrequest('GET', '/timeout?t=%s' % timeout, skip_host=True)
-    conn.putheader('Host', conn.host)
-    conn.endheaders()
-    response = conn.response_class(conn.sock, method='GET')
-    response.begin()
-    assert response.status == 200
-    actual_body = response.read()
-    expected_body = str(timeout).encode()
-    assert actual_body == expected_body
-
-    # Make a second request on the same socket
-    conn._output(b'GET /hello HTTP/1.1')
-    conn._output(('Host: %s' % conn.host).encode('ascii'))
-    conn._send_output()
-    response = conn.response_class(conn.sock, method='GET')
-    response.begin()
-    assert response.status == 200
-    actual_body = response.read()
-    expected_body = b'Hello, world!'
-    assert actual_body == expected_body
-
-    # Wait for our socket timeout
-    time.sleep(timeout * 2)
-
-    # Make another request on the same socket, which should error
-    conn._output(b'GET /hello HTTP/1.1')
-    conn._output(('Host: %s' % conn.host).encode('ascii'))
-    conn._send_output()
-    response = conn.response_class(conn.sock, method='GET')
-    try:
-        response.begin()
-    except (socket.error, http.client.BadStatusLine):
-        pass
-    except Exception as ex:
-        pytest.fail(fail_msg % ex)
-    else:
-        if response.status != 408:
-            pytest.fail(fail_msg % response.read())
-
-    conn.close()
-
-    # Make another request on a new socket, which should work
-    conn = test_client.get_connection()
-    conn.putrequest('GET', '/pov', skip_host=True)
-    conn.putheader('Host', conn.host)
-    conn.endheaders()
-    response = conn.response_class(conn.sock, method='GET')
-    response.begin()
-    assert response.status == 200
-    actual_body = response.read()
-    expected_body = pov.encode()
-    assert actual_body == expected_body
-
-    # Make another request on the same socket,
-    # but timeout on the headers
-    conn.send(b'GET /hello HTTP/1.1')
-    # Wait for our socket timeout
-    time.sleep(timeout * 2)
-    response = conn.response_class(conn.sock, method='GET')
-    try:
-        response.begin()
-    except (socket.error, http.client.BadStatusLine):
-        pass
-    except Exception as ex:
-        pytest.fail(fail_msg % ex)
-    else:
-        if response.status != 408:
-            pytest.fail(fail_msg % response.read())
-
-    conn.close()
-
-    # Retry the request on a new connection, which should work
-    conn = test_client.get_connection()
-    conn.putrequest('GET', '/pov', skip_host=True)
-    conn.putheader('Host', conn.host)
-    conn.endheaders()
-    response = conn.response_class(conn.sock, method='GET')
-    response.begin()
-    assert response.status == 200
-    actual_body = response.read()
-    expected_body = pov.encode()
-    assert actual_body == expected_body
-    conn.close()
-
-
-def test_HTTP11_pipelining(test_client):
-    """Test HTTP/1.1 pipelining.
-
-    :py:mod:`http.client` doesn't support this directly.
-    """
-    conn = test_client.get_connection()
-
-    # Put request 1
-    conn.putrequest('GET', '/hello', skip_host=True)
-    conn.putheader('Host', conn.host)
-    conn.endheaders()
-
-    for trial in range(5):
-        # Put next request
-        conn._output(
-            ('GET /hello?%s HTTP/1.1' % trial).encode('iso-8859-1'),
-        )
-        conn._output(('Host: %s' % conn.host).encode('ascii'))
-        conn._send_output()
-
-        # Retrieve previous response
-        response = conn.response_class(conn.sock, method='GET')
-        # there is a bug in python3 regarding the buffering of
-        # ``conn.sock``. Until that bug get's fixed we will
-        # monkey patch the ``response`` instance.
-        # https://bugs.python.org/issue23377
-        response.fp = conn.sock.makefile('rb', 0)
-        response.begin()
-        body = response.read(13)
-        assert response.status == 200
-        assert body == b'Hello, world!'
-
-    # Retrieve final response
-    response = conn.response_class(conn.sock, method='GET')
-    response.begin()
-    body = response.read()
-    assert response.status == 200
-    assert body == b'Hello, world!'
-
-    conn.close()
-
-
-def test_100_Continue(test_client):
-    """Test 100-continue header processing."""
-    conn = test_client.get_connection()
-
-    # Try a page without an Expect request header first.
-    # Note that http.client's response.begin automatically ignores
-    # 100 Continue responses, so we must manually check for it.
-    conn.putrequest('POST', '/upload', skip_host=True)
-    conn.putheader('Host', conn.host)
-    conn.putheader('Content-Type', 'text/plain')
-    conn.putheader('Content-Length', '4')
-    conn.endheaders()
-    conn.send(b"d'oh")
-    response = conn.response_class(conn.sock, method='POST')
-    _version, status, _reason = response._read_status()
-    assert status != 100
-    conn.close()
-
-    # Now try a page with an Expect header...
-    conn.connect()
-    conn.putrequest('POST', '/upload', skip_host=True)
-    conn.putheader('Host', conn.host)
-    conn.putheader('Content-Type', 'text/plain')
-    conn.putheader('Content-Length', '17')
-    conn.putheader('Expect', '100-continue')
-    conn.endheaders()
-    response = conn.response_class(conn.sock, method='POST')
-
-    # ...assert and then skip the 100 response
-    version, status, reason = response._read_status()
-    assert status == 100
-    while True:
-        line = response.fp.readline().strip()
-        if line:
-            pytest.fail(
-                '100 Continue should not output any headers. Got %r' %
-                line,
-            )
-        else:
-            break
-
-    # ...send the body
-    body = b'I am a small file'
-    conn.send(body)
-
-    # ...get the final response
-    response.begin()
-    status_line, _actual_headers, actual_resp_body = webtest.shb(response)
-    actual_status = int(status_line[:3])
-    assert actual_status == 200
-    expected_resp_body = f"thanks for '{body.decode() !s}'".encode()
-    assert actual_resp_body == expected_resp_body
-    conn.close()
-
-
-@pytest.mark.parametrize(
-    'max_request_body_size',
-    (
-        0,
-        1001,
-    ),
-)
-def test_readall_or_close(test_client, max_request_body_size):
-    """Test a max_request_body_size of 0 (the default) and 1001."""
-    old_max = test_client.server_instance.max_request_body_size
-
-    test_client.server_instance.max_request_body_size = max_request_body_size
-
-    conn = test_client.get_connection()
-
-    # Get a POST page with an error
-    conn.putrequest('POST', '/err_before_read', skip_host=True)
-    conn.putheader('Host', conn.host)
-    conn.putheader('Content-Type', 'text/plain')
-    conn.putheader('Content-Length', '1000')
-    conn.putheader('Expect', '100-continue')
-    conn.endheaders()
-    response = conn.response_class(conn.sock, method='POST')
-
-    # ...assert and then skip the 100 response
-    _version, status, _reason = response._read_status()
-    assert status == 100
-    skip = True
-    while skip:
-        skip = response.fp.readline().strip()
-
-    # ...send the body
-    conn.send(b'x' * 1000)
-
-    # ...get the final response
-    response.begin()
-    status_line, _actual_headers, actual_resp_body = webtest.shb(response)
-    actual_status = int(status_line[:3])
-    assert actual_status == 500
-
-    # Now try a working page with an Expect header...
-    conn._output(b'POST /upload HTTP/1.1')
-    conn._output(('Host: %s' % conn.host).encode('ascii'))
-    conn._output(b'Content-Type: text/plain')
-    conn._output(b'Content-Length: 17')
-    conn._output(b'Expect: 100-continue')
-    conn._send_output()
-    response = conn.response_class(conn.sock, method='POST')
-
-    # ...assert and then skip the 100 response
-    version, status, reason = response._read_status()
-    assert status == 100
-    skip = True
-    while skip:
-        skip = response.fp.readline().strip()
-
-    # ...send the body
-    body = b'I am a small file'
-    conn.send(body)
-
-    # ...get the final response
-    response.begin()
-    status_line, actual_headers, actual_resp_body = webtest.shb(response)
-    actual_status = int(status_line[:3])
-    assert actual_status == 200
-    expected_resp_body = f"thanks for '{body.decode() !s}'".encode()
-    assert actual_resp_body == expected_resp_body
-    conn.close()
-
-    test_client.server_instance.max_request_body_size = old_max
-
-
-def test_No_Message_Body(test_client):
-    """Test HTTP queries with an empty response body."""
-    # Initialize a persistent HTTP connection
-    http_connection = test_client.get_connection()
-    http_connection.auto_open = False
-    http_connection.connect()
-
-    # Make the first request and assert there's no "Connection: close".
-    status_line, actual_headers, actual_resp_body = test_client.get(
-        '/pov', http_conn=http_connection,
-    )
-    actual_status = int(status_line[:3])
-    assert actual_status == 200
-    assert status_line[4:] == 'OK'
-    assert actual_resp_body == pov.encode()
-    assert not header_exists('Connection', actual_headers)
-
-    # Make a 204 request on the same connection.
-    status_line, actual_headers, actual_resp_body = test_client.get(
-        '/custom/204', http_conn=http_connection,
-    )
-    actual_status = int(status_line[:3])
-    assert actual_status == 204
-    assert not header_exists('Content-Length', actual_headers)
-    assert actual_resp_body == b''
-    assert not header_exists('Connection', actual_headers)
-
-    # Make a 304 request on the same connection.
-    status_line, actual_headers, actual_resp_body = test_client.get(
-        '/custom/304', http_conn=http_connection,
-    )
-    actual_status = int(status_line[:3])
-    assert actual_status == 304
-    assert not header_exists('Content-Length', actual_headers)
-    assert actual_resp_body == b''
-    assert not header_exists('Connection', actual_headers)
-
-    # Prevent the resource warnings:
-    http_connection.close()
-
-
-@pytest.mark.xfail(
-    reason=unwrap(
-        trim("""
-        Headers from earlier request leak into the request
-        line for a subsequent request, resulting in 400
-        instead of 413. See cherrypy/cheroot#69 for details.
-        """),
-    ),
-)
-def test_Chunked_Encoding(test_client):
-    """Test HTTP uploads with chunked transfer-encoding."""
-    # Initialize a persistent HTTP connection
-    conn = test_client.get_connection()
-
-    # Try a normal chunked request (with extensions)
-    body = (
-        b'8;key=value\r\nxx\r\nxxxx\r\n5\r\nyyyyy\r\n0\r\n'
-        b'Content-Type: application/json\r\n'
-        b'\r\n'
-    )
-    conn.putrequest('POST', '/upload', skip_host=True)
-    conn.putheader('Host', conn.host)
-    conn.putheader('Transfer-Encoding', 'chunked')
-    conn.putheader('Trailer', 'Content-Type')
-    # Note that this is somewhat malformed:
-    # we shouldn't be sending Content-Length.
-    # RFC 2616 says the server should ignore it.
-    conn.putheader('Content-Length', '3')
-    conn.endheaders()
-    conn.send(body)
-    response = conn.getresponse()
-    status_line, _actual_headers, actual_resp_body = webtest.shb(response)
-    actual_status = int(status_line[:3])
-    assert actual_status == 200
-    assert status_line[4:] == 'OK'
-    expected_resp_body = ("thanks for '%s'" % b'xx\r\nxxxxyyyyy').encode()
-    assert actual_resp_body == expected_resp_body
-
-    # Try a chunked request that exceeds server.max_request_body_size.
-    # Note that the delimiters and trailer are included.
-    body = b'\r\n'.join((b'3e3', b'x' * 995, b'0', b'', b''))
-    conn.putrequest('POST', '/upload', skip_host=True)
-    conn.putheader('Host', conn.host)
-    conn.putheader('Transfer-Encoding', 'chunked')
-    conn.putheader('Content-Type', 'text/plain')
-    # Chunked requests don't need a content-length
-    # conn.putheader("Content-Length", len(body))
-    conn.endheaders()
-    conn.send(body)
-    response = conn.getresponse()
-    status_line, actual_headers, actual_resp_body = webtest.shb(response)
-    actual_status = int(status_line[:3])
-    assert actual_status == 413
-    conn.close()
-
-
-def test_Content_Length_in(test_client):
-    """Try a non-chunked request where Content-Length exceeds limit.
-
-    (server.max_request_body_size).
-    Assert error before body send.
-    """
-    # Initialize a persistent HTTP connection
-    conn = test_client.get_connection()
-
-    conn.putrequest('POST', '/upload', skip_host=True)
-    conn.putheader('Host', conn.host)
-    conn.putheader('Content-Type', 'text/plain')
-    conn.putheader('Content-Length', '9999')
-    conn.endheaders()
-    response = conn.getresponse()
-    status_line, _actual_headers, actual_resp_body = webtest.shb(response)
-    actual_status = int(status_line[:3])
-    assert actual_status == 413
-    expected_resp_body = (
-        b'The entity sent with the request exceeds '
-        b'the maximum allowed bytes.'
-    )
-    assert actual_resp_body == expected_resp_body
-    conn.close()
-
-
-def test_Content_Length_not_int(test_client):
-    """Test that malicious Content-Length header returns 400."""
-    status_line, _actual_headers, actual_resp_body = test_client.post(
-        '/upload',
-        headers=[
-            ('Content-Type', 'text/plain'),
-            ('Content-Length', 'not-an-integer'),
-        ],
-    )
-    actual_status = int(status_line[:3])
-
-    assert actual_status == 400
-    assert actual_resp_body == b'Malformed Content-Length Header.'
-
-
-@pytest.mark.parametrize(
-    ('uri', 'expected_resp_status', 'expected_resp_body'),
-    (
-        (
-            '/wrong_cl_buffered', 500,
-            (
-                b'The requested resource returned more bytes than the '
-                b'declared Content-Length.'
-            ),
-        ),
-        ('/wrong_cl_unbuffered', 200, b'I too'),
-    ),
-)
-def test_Content_Length_out(
-    test_client,
-    uri, expected_resp_status, expected_resp_body,
-):
-    """Test response with Content-Length less than the response body.
-
-    (non-chunked response)
-    """
-    conn = test_client.get_connection()
-    conn.putrequest('GET', uri, skip_host=True)
-    conn.putheader('Host', conn.host)
-    conn.endheaders()
-
-    response = conn.getresponse()
-    status_line, _actual_headers, actual_resp_body = webtest.shb(response)
-    actual_status = int(status_line[:3])
-
-    assert actual_status == expected_resp_status
-    assert actual_resp_body == expected_resp_body
-
-    conn.close()
-
-    # the server logs the exception that we had verified from the
-    # client perspective. Tell the error_log verification that
-    # it can ignore that message.
-    test_client.server_instance.error_log.ignored_msgs.extend((
-        # Python 3.7+:
-        "ValueError('Response body exceeds the declared Content-Length.')",
-        # Python 2.7-3.6 (macOS?):
-        "ValueError('Response body exceeds the declared Content-Length.',)",
-    ))
-
-
-@pytest.mark.xfail(
-    reason='Sometimes this test fails due to low timeout. '
-           'Ref: https://github.com/cherrypy/cherrypy/issues/598',
-)
-def test_598(test_client):
-    """Test serving large file with a read timeout in place."""
-    # Initialize a persistent HTTP connection
-    conn = test_client.get_connection()
-    remote_data_conn = urllib.request.urlopen(
-        '%s://%s:%s/one_megabyte_of_a'
-        % ('http', conn.host, conn.port),
-    )
-    buf = remote_data_conn.read(512)
-    time.sleep(timeout * 0.6)
-    remaining = (1024 * 1024) - 512
-    while remaining:
-        data = remote_data_conn.read(remaining)
-        if not data:
-            break
-        buf += data
-        remaining -= len(data)
-
-    assert len(buf) == 1024 * 1024
-    assert buf == b'a' * 1024 * 1024
-    assert remaining == 0
-    remote_data_conn.close()
-
-
-@pytest.mark.parametrize(
-    'invalid_terminator',
-    (
-        b'\n\n',
-        b'\r\n\n',
-    ),
-)
-def test_No_CRLF(test_client, invalid_terminator):
-    """Test HTTP queries with no valid CRLF terminators."""
-    # Initialize a persistent HTTP connection
-    conn = test_client.get_connection()
-
-    conn.send(b'GET /hello HTTP/1.1%s' % invalid_terminator)
-    response = conn.response_class(conn.sock, method='GET')
-    response.begin()
-    actual_resp_body = response.read()
-    expected_resp_body = b'HTTP requires CRLF terminators'
-    assert actual_resp_body == expected_resp_body
-    conn.close()
-
-
-class FaultySelect:
-    """Mock class to insert errors in the selector.select method."""
-
-    def __init__(self, original_select):
-        """Initilize helper class to wrap the selector.select method."""
-        self.original_select = original_select
-        self.request_served = False
-        self.os_error_triggered = False
-
-    def __call__(self, timeout):
-        """Intercept the calls to selector.select."""
-        if self.request_served:
-            self.os_error_triggered = True
-            raise OSError('Error while selecting the client socket.')
-
-        return self.original_select(timeout)
-
-
-class FaultyGetMap:
-    """Mock class to insert errors in the selector.get_map method."""
-
-    def __init__(self, original_get_map):
-        """Initilize helper class to wrap the selector.get_map method."""
-        self.original_get_map = original_get_map
-        self.sabotage_conn = False
-        self.conn_closed = False
-
-    def __call__(self):
-        """Intercept the calls to selector.get_map."""
-        sabotage_targets = (
-            conn for _, (_, _, _, conn) in self.original_get_map().items()
-            if isinstance(conn, cheroot.server.HTTPConnection)
-        ) if self.sabotage_conn and not self.conn_closed else ()
-
-        for conn in sabotage_targets:
-            # close the socket to cause OSError
-            conn.close()
-            self.conn_closed = True
-
-        return self.original_get_map()
-
-
-def test_invalid_selected_connection(test_client, monkeypatch):
-    """Test the error handling segment of HTTP connection selection.
-
-    See :py:meth:`cheroot.connections.ConnectionManager.get_conn`.
-    """
-    # patch the select method
-    faux_select = FaultySelect(
-        test_client.server_instance._connections._selector.select,
-    )
-    monkeypatch.setattr(
-        test_client.server_instance._connections._selector,
-        'select',
-        faux_select,
-    )
-
-    # patch the get_map method
-    faux_get_map = FaultyGetMap(
-        test_client.server_instance._connections._selector._selector.get_map,
-    )
-
-    monkeypatch.setattr(
-        test_client.server_instance._connections._selector._selector,
-        'get_map',
-        faux_get_map,
-    )
-
-    # request a page with connection keep-alive to make sure
-    # we'll have a connection to be modified.
-    resp_status, _resp_headers, _resp_body = test_client.request(
-        '/page1', headers=[('Connection', 'Keep-Alive')],
-    )
-
-    assert resp_status == '200 OK'
-    # trigger the internal errors
-    faux_get_map.sabotage_conn = faux_select.request_served = True
-    # give time to make sure the error gets handled
-    time.sleep(test_client.server_instance.expiration_interval * 2)
-    assert faux_select.os_error_triggered
-    assert faux_get_map.conn_closed
diff --git a/lib/cheroot/test/test_core.py b/lib/cheroot/test/test_core.py
deleted file mode 100644
index d3364788..00000000
--- a/lib/cheroot/test/test_core.py
+++ /dev/null
@@ -1,455 +0,0 @@
-"""Tests for managing HTTP issues (malformed requests, etc)."""
-
-import errno
-import socket
-import urllib.parse  # noqa: WPS301
-
-import pytest
-
-from cheroot.test import helper
-
-
-HTTP_BAD_REQUEST = 400
-HTTP_LENGTH_REQUIRED = 411
-HTTP_NOT_FOUND = 404
-HTTP_REQUEST_ENTITY_TOO_LARGE = 413
-HTTP_OK = 200
-HTTP_VERSION_NOT_SUPPORTED = 505
-
-
-class HelloController(helper.Controller):
-    """Controller for serving WSGI apps."""
-
-    def hello(req, resp):
-        """Render Hello world."""
-        return 'Hello world!'
-
-    def body_required(req, resp):
-        """Render Hello world or set 411."""
-        if req.environ.get('Content-Length', None) is None:
-            resp.status = '411 Length Required'
-            return
-        return 'Hello world!'
-
-    def query_string(req, resp):
-        """Render QUERY_STRING value."""
-        return req.environ.get('QUERY_STRING', '')
-
-    def asterisk(req, resp):
-        """Render request method value."""
-        # pylint: disable=possibly-unused-variable
-        method = req.environ.get('REQUEST_METHOD', 'NO METHOD FOUND')
-        tmpl = 'Got asterisk URI path with {method} method'
-        return tmpl.format(**locals())
-
-    def _munge(string):
-        """Encode PATH_INFO correctly depending on Python version.
-
-        WSGI 1.0 is a mess around unicode. Create endpoints
-        that match the PATH_INFO that it produces.
-        """
-        return string.encode('utf-8').decode('latin-1')
-
-    handlers = {
-        '/hello': hello,
-        '/no_body': hello,
-        '/body_required': body_required,
-        '/query_string': query_string,
-        # FIXME: Unignore the pylint rules in pylint >= 2.15.4.
-        # Refs:
-        # * https://github.com/PyCQA/pylint/issues/6592
-        # * https://github.com/PyCQA/pylint/pull/7395
-        # pylint: disable-next=too-many-function-args
-        _munge('/привіт'): hello,
-        # pylint: disable-next=too-many-function-args
-        _munge('/Юххууу'): hello,
-        '/\xa0�blah key 0 900 4 data': hello,
-        '/*': asterisk,
-    }
-
-
-def _get_http_response(connection, method='GET'):
-    return connection.response_class(connection.sock, method=method)
-
-
-@pytest.fixture
-def testing_server(wsgi_server_client):
-    """Attach a WSGI app to the given server and preconfigure it."""
-    wsgi_server = wsgi_server_client.server_instance
-    wsgi_server.wsgi_app = HelloController()
-    wsgi_server.max_request_body_size = 30000000
-    wsgi_server.server_client = wsgi_server_client
-    return wsgi_server
-
-
-@pytest.fixture
-def test_client(testing_server):
-    """Get and return a test client out of the given server."""
-    return testing_server.server_client
-
-
-@pytest.fixture
-def testing_server_with_defaults(wsgi_server_client):
-    """Attach a WSGI app to the given server and preconfigure it."""
-    wsgi_server = wsgi_server_client.server_instance
-    wsgi_server.wsgi_app = HelloController()
-    wsgi_server.server_client = wsgi_server_client
-    return wsgi_server
-
-
-@pytest.fixture
-def test_client_with_defaults(testing_server_with_defaults):
-    """Get and return a test client out of the given server."""
-    return testing_server_with_defaults.server_client
-
-
-def test_http_connect_request(test_client):
-    """Check that CONNECT query results in Method Not Allowed status."""
-    status_line = test_client.connect('/anything')[0]
-    actual_status = int(status_line[:3])
-    assert actual_status == 405
-
-
-def test_normal_request(test_client):
-    """Check that normal GET query succeeds."""
-    status_line, _, actual_resp_body = test_client.get('/hello')
-    actual_status = int(status_line[:3])
-    assert actual_status == HTTP_OK
-    assert actual_resp_body == b'Hello world!'
-
-
-def test_query_string_request(test_client):
-    """Check that GET param is parsed well."""
-    status_line, _, actual_resp_body = test_client.get(
-        '/query_string?test=True',
-    )
-    actual_status = int(status_line[:3])
-    assert actual_status == HTTP_OK
-    assert actual_resp_body == b'test=True'
-
-
-@pytest.mark.parametrize(
-    'uri',
-    (
-        '/hello',  # plain
-        '/query_string?test=True',  # query
-        '/{0}?{1}={2}'.format(  # quoted unicode
-            *map(urllib.parse.quote, ('Юххууу', 'ї', 'йо')),
-        ),
-    ),
-)
-def test_parse_acceptable_uri(test_client, uri):
-    """Check that server responds with OK to valid GET queries."""
-    status_line = test_client.get(uri)[0]
-    actual_status = int(status_line[:3])
-    assert actual_status == HTTP_OK
-
-
-def test_parse_uri_unsafe_uri(test_client):
-    """Test that malicious URI does not allow HTTP injection.
-
-    This effectively checks that sending GET request with URL
-
-    /%A0%D0blah%20key%200%20900%204%20data
-
-    is not converted into
-
-    GET /
-    blah key 0 900 4 data
-    HTTP/1.1
-
-    which would be a security issue otherwise.
-    """
-    c = test_client.get_connection()
-    resource = '/\xa0�blah key 0 900 4 data'.encode('latin-1')
-    quoted = urllib.parse.quote(resource)
-    assert quoted == '/%A0%D0blah%20key%200%20900%204%20data'
-    request = 'GET {quoted} HTTP/1.1'.format(**locals())
-    c._output(request.encode('utf-8'))
-    c._send_output()
-    response = _get_http_response(c, method='GET')
-    response.begin()
-    assert response.status == HTTP_OK
-    assert response.read(12) == b'Hello world!'
-    c.close()
-
-
-def test_parse_uri_invalid_uri(test_client):
-    """Check that server responds with Bad Request to invalid GET queries.
-
-    Invalid request line test case: it should only contain US-ASCII.
-    """
-    c = test_client.get_connection()
-    c._output(u'GET /йопта! HTTP/1.1'.encode('utf-8'))
-    c._send_output()
-    response = _get_http_response(c, method='GET')
-    response.begin()
-    assert response.status == HTTP_BAD_REQUEST
-    assert response.read(21) == b'Malformed Request-URI'
-    c.close()
-
-
-@pytest.mark.parametrize(
-    'uri',
-    (
-        'hello',  # ascii
-        'привіт',  # non-ascii
-    ),
-)
-def test_parse_no_leading_slash_invalid(test_client, uri):
-    """Check that server responds with Bad Request to invalid GET queries.
-
-    Invalid request line test case: it should have leading slash (be absolute).
-    """
-    status_line, _, actual_resp_body = test_client.get(
-        urllib.parse.quote(uri),
-    )
-    actual_status = int(status_line[:3])
-    assert actual_status == HTTP_BAD_REQUEST
-    assert b'starting with a slash' in actual_resp_body
-
-
-def test_parse_uri_absolute_uri(test_client):
-    """Check that server responds with Bad Request to Absolute URI.
-
-    Only proxy servers should allow this.
-    """
-    status_line, _, actual_resp_body = test_client.get('http://google.com/')
-    actual_status = int(status_line[:3])
-    assert actual_status == HTTP_BAD_REQUEST
-    expected_body = b'Absolute URI not allowed if server is not a proxy.'
-    assert actual_resp_body == expected_body
-
-
-def test_parse_uri_asterisk_uri(test_client):
-    """Check that server responds with OK to OPTIONS with "*" Absolute URI."""
-    status_line, _, actual_resp_body = test_client.options('*')
-    actual_status = int(status_line[:3])
-    assert actual_status == HTTP_OK
-    expected_body = b'Got asterisk URI path with OPTIONS method'
-    assert actual_resp_body == expected_body
-
-
-def test_parse_uri_fragment_uri(test_client):
-    """Check that server responds with Bad Request to URI with fragment."""
-    status_line, _, actual_resp_body = test_client.get(
-        '/hello?test=something#fake',
-    )
-    actual_status = int(status_line[:3])
-    assert actual_status == HTTP_BAD_REQUEST
-    expected_body = b'Illegal #fragment in Request-URI.'
-    assert actual_resp_body == expected_body
-
-
-def test_no_content_length(test_client):
-    """Test POST query with an empty body being successful."""
-    # "The presence of a message-body in a request is signaled by the
-    # inclusion of a Content-Length or Transfer-Encoding header field in
-    # the request's message-headers."
-    #
-    # Send a message with neither header and no body.
-    c = test_client.get_connection()
-    c.request('POST', '/no_body')
-    response = c.getresponse()
-    actual_resp_body = response.read()
-    actual_status = response.status
-    assert actual_status == HTTP_OK
-    assert actual_resp_body == b'Hello world!'
-
-    c.close()  # deal with the resource warning
-
-
-def test_content_length_required(test_client):
-    """Test POST query with body failing because of missing Content-Length."""
-    # Now send a message that has no Content-Length, but does send a body.
-    # Verify that CP times out the socket and responds
-    # with 411 Length Required.
-
-    c = test_client.get_connection()
-    c.request('POST', '/body_required')
-    response = c.getresponse()
-    response.read()
-
-    actual_status = response.status
-    assert actual_status == HTTP_LENGTH_REQUIRED
-
-    c.close()  # deal with the resource warning
-
-
-@pytest.mark.xfail(
-    reason='https://github.com/cherrypy/cheroot/issues/106',
-    strict=False,  # sometimes it passes
-)
-def test_large_request(test_client_with_defaults):
-    """Test GET query with maliciously large Content-Length."""
-    # If the server's max_request_body_size is not set (i.e. is set to 0)
-    # then this will result in an `OverflowError: Python int too large to
-    # convert to C ssize_t` in the server.
-    # We expect that this should instead return that the request is too
-    # large.
-    c = test_client_with_defaults.get_connection()
-    c.putrequest('GET', '/hello')
-    c.putheader('Content-Length', str(2**64))
-    c.endheaders()
-
-    response = c.getresponse()
-    actual_status = response.status
-
-    assert actual_status == HTTP_REQUEST_ENTITY_TOO_LARGE
-
-
-@pytest.mark.parametrize(
-    ('request_line', 'status_code', 'expected_body'),
-    (
-        (
-            b'GET /',  # missing proto
-            HTTP_BAD_REQUEST, b'Malformed Request-Line',
-        ),
-        (
-            b'GET / HTTPS/1.1',  # invalid proto
-            HTTP_BAD_REQUEST, b'Malformed Request-Line: bad protocol',
-        ),
-        (
-            b'GET / HTTP/1',  # invalid version
-            HTTP_BAD_REQUEST, b'Malformed Request-Line: bad version',
-        ),
-        (
-            b'GET / HTTP/2.15',  # invalid ver
-            HTTP_VERSION_NOT_SUPPORTED, b'Cannot fulfill request',
-        ),
-    ),
-)
-def test_malformed_request_line(
-    test_client, request_line,
-    status_code, expected_body,
-):
-    """Test missing or invalid HTTP version in Request-Line."""
-    c = test_client.get_connection()
-    c._output(request_line)
-    c._send_output()
-    response = _get_http_response(c, method='GET')
-    response.begin()
-    assert response.status == status_code
-    assert response.read(len(expected_body)) == expected_body
-    c.close()
-
-
-def test_malformed_http_method(test_client):
-    """Test non-uppercase HTTP method."""
-    c = test_client.get_connection()
-    c.putrequest('GeT', '/malformed_method_case')
-    c.putheader('Content-Type', 'text/plain')
-    c.endheaders()
-
-    response = c.getresponse()
-    actual_status = response.status
-    assert actual_status == HTTP_BAD_REQUEST
-    actual_resp_body = response.read(21)
-    assert actual_resp_body == b'Malformed method name'
-
-    c.close()  # deal with the resource warning
-
-
-def test_malformed_header(test_client):
-    """Check that broken HTTP header results in Bad Request."""
-    c = test_client.get_connection()
-    c.putrequest('GET', '/')
-    c.putheader('Content-Type', 'text/plain')
-    # See https://www.bitbucket.org/cherrypy/cherrypy/issue/941
-    c._output(b'Re, 1.2.3.4#015#012')
-    c.endheaders()
-
-    response = c.getresponse()
-    actual_status = response.status
-    assert actual_status == HTTP_BAD_REQUEST
-    actual_resp_body = response.read(20)
-    assert actual_resp_body == b'Illegal header line.'
-
-    c.close()  # deal with the resource warning
-
-
-def test_request_line_split_issue_1220(test_client):
-    """Check that HTTP request line of exactly 256 chars length is OK."""
-    Request_URI = (
-        '/hello?'
-        'intervenant-entreprise-evenement_classaction='
-        'evenement-mailremerciements'
-        '&_path=intervenant-entreprise-evenement'
-        '&intervenant-entreprise-evenement_action-id=19404'
-        '&intervenant-entreprise-evenement_id=19404'
-        '&intervenant-entreprise_id=28092'
-    )
-    assert len('GET %s HTTP/1.1\r\n' % Request_URI) == 256
-
-    actual_resp_body = test_client.get(Request_URI)[2]
-    assert actual_resp_body == b'Hello world!'
-
-
-def test_garbage_in(test_client):
-    """Test that server sends an error for garbage received over TCP."""
-    # Connect without SSL regardless of server.scheme
-
-    c = test_client.get_connection()
-    c._output(b'gjkgjklsgjklsgjkljklsg')
-    c._send_output()
-    response = c.response_class(c.sock, method='GET')
-    try:
-        response.begin()
-        actual_status = response.status
-        assert actual_status == HTTP_BAD_REQUEST
-        actual_resp_body = response.read(22)
-        assert actual_resp_body == b'Malformed Request-Line'
-        c.close()
-    except socket.error as ex:
-        # "Connection reset by peer" is also acceptable.
-        if ex.errno != errno.ECONNRESET:
-            raise
-
-
-class CloseController:
-    """Controller for testing the close callback."""
-
-    def __call__(self, environ, start_response):
-        """Get the req to know header sent status."""
-        self.req = start_response.__self__.req
-        resp = CloseResponse(self.close)
-        start_response(resp.status, resp.headers.items())
-        return resp
-
-    def close(self):
-        """Close, writing hello."""
-        self.req.write(b'hello')
-
-
-class CloseResponse:
-    """Dummy empty response to trigger the no body status."""
-
-    def __init__(self, close):
-        """Use some defaults to ensure we have a header."""
-        self.status = '200 OK'
-        self.headers = {'Content-Type': 'text/html'}
-        self.close = close
-
-    def __getitem__(self, index):
-        """Ensure we don't have a body."""
-        raise IndexError()
-
-    def output(self):
-        """Return self to hook the close method."""
-        return self
-
-
-@pytest.fixture
-def testing_server_close(wsgi_server_client):
-    """Attach a WSGI app to the given server and preconfigure it."""
-    wsgi_server = wsgi_server_client.server_instance
-    wsgi_server.wsgi_app = CloseController()
-    wsgi_server.max_request_body_size = 30000000
-    wsgi_server.server_client = wsgi_server_client
-    return wsgi_server
-
-
-def test_send_header_before_closing(testing_server_close):
-    """Test we are actually sending the headers before calling 'close'."""
-    _, _, resp_body = testing_server_close.server_client.get('/')
-    assert resp_body == b'hello'
diff --git a/lib/cheroot/test/test_dispatch.py b/lib/cheroot/test/test_dispatch.py
deleted file mode 100644
index c42014fa..00000000
--- a/lib/cheroot/test/test_dispatch.py
+++ /dev/null
@@ -1,51 +0,0 @@
-"""Tests for the HTTP server."""
-
-from cheroot.wsgi import PathInfoDispatcher
-
-
-def wsgi_invoke(app, environ):
-    """Serve 1 request from a WSGI application."""
-    response = {}
-
-    def start_response(status, headers):
-        response.update({
-            'status': status,
-            'headers': headers,
-        })
-
-    response['body'] = b''.join(
-        app(environ, start_response),
-    )
-
-    return response
-
-
-def test_dispatch_no_script_name():
-    """Dispatch despite lack of ``SCRIPT_NAME`` in environ."""
-    # Bare bones WSGI hello world app (from PEP 333).
-    def app(environ, start_response):
-        start_response(
-            '200 OK', [
-                ('Content-Type', 'text/plain; charset=utf-8'),
-            ],
-        )
-        return [u'Hello, world!'.encode('utf-8')]
-
-    # Build a dispatch table.
-    d = PathInfoDispatcher([
-        ('/', app),
-    ])
-
-    # Dispatch a request without `SCRIPT_NAME`.
-    response = wsgi_invoke(
-        d, {
-            'PATH_INFO': '/foo',
-        },
-    )
-    assert response == {
-        'status': '200 OK',
-        'headers': [
-            ('Content-Type', 'text/plain; charset=utf-8'),
-        ],
-        'body': b'Hello, world!',
-    }
diff --git a/lib/cheroot/test/test_errors.py b/lib/cheroot/test/test_errors.py
deleted file mode 100644
index a5dd5c2b..00000000
--- a/lib/cheroot/test/test_errors.py
+++ /dev/null
@@ -1,31 +0,0 @@
-"""Test suite for ``cheroot.errors``."""
-
-import pytest
-
-from cheroot import errors
-
-from .._compat import IS_LINUX, IS_MACOS, IS_SOLARIS, IS_WINDOWS  # noqa: WPS130
-
-
-@pytest.mark.parametrize(
-    ('err_names', 'err_nums'),
-    (
-        (('', 'some-nonsense-name'), []),
-        (
-            (
-                'EPROTOTYPE', 'EAGAIN', 'EWOULDBLOCK',
-                'WSAEWOULDBLOCK', 'EPIPE',
-            ),
-            (91, 11, 32) if IS_LINUX else
-            (32, 35, 41) if IS_MACOS else
-            (98, 11, 32) if IS_SOLARIS else
-            (32, 10041, 11, 10035) if IS_WINDOWS else
-            (),
-        ),
-    ),
-)
-def test_plat_specific_errors(err_names, err_nums):
-    """Test that ``plat_specific_errors`` gets correct error numbers list."""
-    actual_err_nums = errors.plat_specific_errors(*err_names)
-    assert len(actual_err_nums) == len(err_nums)
-    assert sorted(actual_err_nums) == sorted(err_nums)
diff --git a/lib/cheroot/test/test_makefile.py b/lib/cheroot/test/test_makefile.py
deleted file mode 100644
index 57f6f57e..00000000
--- a/lib/cheroot/test/test_makefile.py
+++ /dev/null
@@ -1,49 +0,0 @@
-"""Tests for :py:mod:`cheroot.makefile`."""
-
-from cheroot import makefile
-
-
-class MockSocket:
-    """A mock socket."""
-
-    def __init__(self):
-        """Initialize :py:class:`MockSocket`."""
-        self.messages = []
-
-    def recv_into(self, buf):
-        """Simulate ``recv_into`` for Python 3."""
-        if not self.messages:
-            return 0
-        msg = self.messages.pop(0)
-        for index, byte in enumerate(msg):
-            buf[index] = byte
-        return len(msg)
-
-    def recv(self, size):
-        """Simulate ``recv`` for Python 2."""
-        try:
-            return self.messages.pop(0)
-        except IndexError:
-            return ''
-
-    def send(self, val):
-        """Simulate a send."""
-        return len(val)
-
-
-def test_bytes_read():
-    """Reader should capture bytes read."""
-    sock = MockSocket()
-    sock.messages.append(b'foo')
-    rfile = makefile.MakeFile(sock, 'r')
-    rfile.read()
-    assert rfile.bytes_read == 3
-
-
-def test_bytes_written():
-    """Writer should capture bytes written."""
-    sock = MockSocket()
-    sock.messages.append(b'foo')
-    wfile = makefile.MakeFile(sock, 'w')
-    wfile.write(b'bar')
-    assert wfile.bytes_written == 3
diff --git a/lib/cheroot/test/test_server.py b/lib/cheroot/test/test_server.py
deleted file mode 100644
index e2e5f788..00000000
--- a/lib/cheroot/test/test_server.py
+++ /dev/null
@@ -1,558 +0,0 @@
-"""Tests for the HTTP server."""
-
-import os
-import queue
-import socket
-import tempfile
-import threading
-import types
-import uuid
-import urllib.parse  # noqa: WPS301
-
-import pytest
-import requests
-import requests_unixsocket
-
-from pypytools.gc.custom import DefaultGc
-
-from .._compat import bton, ntob
-from .._compat import IS_LINUX, IS_MACOS, IS_WINDOWS, SYS_PLATFORM
-from ..server import IS_UID_GID_RESOLVABLE, Gateway, HTTPServer
-from ..workers.threadpool import ThreadPool
-from ..testing import (
-    ANY_INTERFACE_IPV4,
-    ANY_INTERFACE_IPV6,
-    EPHEMERAL_PORT,
-)
-
-
-IS_SLOW_ENV = IS_MACOS or IS_WINDOWS
-
-
-unix_only_sock_test = pytest.mark.skipif(
-    not hasattr(socket, 'AF_UNIX'),
-    reason='UNIX domain sockets are only available under UNIX-based OS',
-)
-
-
-non_macos_sock_test = pytest.mark.skipif(
-    IS_MACOS,
-    reason='Peercreds lookup does not work under macOS/BSD currently.',
-)
-
-
-@pytest.fixture(params=('abstract', 'file'))
-def unix_sock_file(request):
-    """Check that bound UNIX socket address is stored in server."""
-    name = 'unix_{request.param}_sock'.format(**locals())
-    return request.getfixturevalue(name)
-
-
-@pytest.fixture
-def unix_abstract_sock():
-    """Return an abstract UNIX socket address."""
-    if not IS_LINUX:
-        pytest.skip(
-            '{os} does not support an abstract '
-            'socket namespace'.format(os=SYS_PLATFORM),
-        )
-    return b''.join((
-        b'\x00cheroot-test-socket',
-        ntob(str(uuid.uuid4())),
-    )).decode()
-
-
-@pytest.fixture
-def unix_file_sock():
-    """Yield a unix file socket."""
-    tmp_sock_fh, tmp_sock_fname = tempfile.mkstemp()
-
-    yield tmp_sock_fname
-
-    os.close(tmp_sock_fh)
-    os.unlink(tmp_sock_fname)
-
-
-def test_prepare_makes_server_ready():
-    """Check that prepare() makes the server ready, and stop() clears it."""
-    httpserver = HTTPServer(
-        bind_addr=(ANY_INTERFACE_IPV4, EPHEMERAL_PORT),
-        gateway=Gateway,
-    )
-
-    assert not httpserver.ready
-    assert not httpserver.requests._threads
-
-    httpserver.prepare()
-
-    assert httpserver.ready
-    assert httpserver.requests._threads
-    for thr in httpserver.requests._threads:
-        assert thr.ready
-
-    httpserver.stop()
-
-    assert not httpserver.requests._threads
-    assert not httpserver.ready
-
-
-def test_stop_interrupts_serve():
-    """Check that stop() interrupts running of serve()."""
-    httpserver = HTTPServer(
-        bind_addr=(ANY_INTERFACE_IPV4, EPHEMERAL_PORT),
-        gateway=Gateway,
-    )
-
-    httpserver.prepare()
-    serve_thread = threading.Thread(target=httpserver.serve)
-    serve_thread.start()
-
-    serve_thread.join(0.5)
-    assert serve_thread.is_alive()
-
-    httpserver.stop()
-
-    serve_thread.join(0.5)
-    assert not serve_thread.is_alive()
-
-
-@pytest.mark.parametrize(
-    'exc_cls',
-    (
-        IOError,
-        KeyboardInterrupt,
-        OSError,
-        RuntimeError,
-    ),
-)
-def test_server_interrupt(exc_cls):
-    """Check that assigning interrupt stops the server."""
-    interrupt_msg = 'should catch {uuid!s}'.format(uuid=uuid.uuid4())
-    raise_marker_sentinel = object()
-
-    httpserver = HTTPServer(
-        bind_addr=(ANY_INTERFACE_IPV4, EPHEMERAL_PORT),
-        gateway=Gateway,
-    )
-
-    result_q = queue.Queue()
-
-    def serve_thread():
-        # ensure we catch the exception on the serve() thread
-        try:
-            httpserver.serve()
-        except exc_cls as e:
-            if str(e) == interrupt_msg:
-                result_q.put(raise_marker_sentinel)
-
-    httpserver.prepare()
-    serve_thread = threading.Thread(target=serve_thread)
-    serve_thread.start()
-
-    serve_thread.join(0.5)
-    assert serve_thread.is_alive()
-
-    # this exception is raised on the serve() thread,
-    # not in the calling context.
-    httpserver.interrupt = exc_cls(interrupt_msg)
-
-    serve_thread.join(0.5)
-    assert not serve_thread.is_alive()
-    assert result_q.get_nowait() is raise_marker_sentinel
-
-
-def test_serving_is_false_and_stop_returns_after_ctrlc():
-    """Check that stop() interrupts running of serve()."""
-    httpserver = HTTPServer(
-        bind_addr=(ANY_INTERFACE_IPV4, EPHEMERAL_PORT),
-        gateway=Gateway,
-    )
-
-    httpserver.prepare()
-
-    # Simulate a Ctrl-C on the first call to `run`.
-    def raise_keyboard_interrupt(*args, **kwargs):
-        raise KeyboardInterrupt()
-
-    httpserver._connections._selector.select = raise_keyboard_interrupt
-
-    serve_thread = threading.Thread(target=httpserver.serve)
-    serve_thread.start()
-
-    # The thread should exit right away due to the interrupt.
-    serve_thread.join(
-        httpserver.expiration_interval * (4 if IS_SLOW_ENV else 2),
-    )
-    assert not serve_thread.is_alive()
-
-    assert not httpserver._connections._serving
-    httpserver.stop()
-
-
-@pytest.mark.parametrize(
-    'ip_addr',
-    (
-        ANY_INTERFACE_IPV4,
-        ANY_INTERFACE_IPV6,
-    ),
-)
-def test_bind_addr_inet(http_server, ip_addr):
-    """Check that bound IP address is stored in server."""
-    httpserver = http_server.send((ip_addr, EPHEMERAL_PORT))
-
-    assert httpserver.bind_addr[0] == ip_addr
-    assert httpserver.bind_addr[1] != EPHEMERAL_PORT
-
-
-@unix_only_sock_test
-def test_bind_addr_unix(http_server, unix_sock_file):
-    """Check that bound UNIX socket address is stored in server."""
-    httpserver = http_server.send(unix_sock_file)
-
-    assert httpserver.bind_addr == unix_sock_file
-
-
-@unix_only_sock_test
-def test_bind_addr_unix_abstract(http_server, unix_abstract_sock):
-    """Check that bound UNIX abstract socket address is stored in server."""
-    httpserver = http_server.send(unix_abstract_sock)
-
-    assert httpserver.bind_addr == unix_abstract_sock
-
-
-PEERCRED_IDS_URI = '/peer_creds/ids'
-PEERCRED_TEXTS_URI = '/peer_creds/texts'
-
-
-class _TestGateway(Gateway):
-    def respond(self):
-        req = self.req
-        conn = req.conn
-        req_uri = bton(req.uri)
-        if req_uri == PEERCRED_IDS_URI:
-            peer_creds = conn.peer_pid, conn.peer_uid, conn.peer_gid
-            self.send_payload('|'.join(map(str, peer_creds)))
-            return
-        elif req_uri == PEERCRED_TEXTS_URI:
-            self.send_payload('!'.join((conn.peer_user, conn.peer_group)))
-            return
-        return super(_TestGateway, self).respond()
-
-    def send_payload(self, payload):
-        req = self.req
-        req.status = b'200 OK'
-        req.ensure_headers_sent()
-        req.write(ntob(payload))
-
-
-@pytest.fixture
-def peercreds_enabled_server(http_server, unix_sock_file):
-    """Construct a test server with ``peercreds_enabled``."""
-    httpserver = http_server.send(unix_sock_file)
-    httpserver.gateway = _TestGateway
-    httpserver.peercreds_enabled = True
-    return httpserver
-
-
-@unix_only_sock_test
-@non_macos_sock_test
-@pytest.mark.flaky(reruns=3, reruns_delay=2)
-def test_peercreds_unix_sock(http_request_timeout, peercreds_enabled_server):
-    """Check that ``PEERCRED`` lookup works when enabled."""
-    httpserver = peercreds_enabled_server
-    bind_addr = httpserver.bind_addr
-
-    if isinstance(bind_addr, bytes):
-        bind_addr = bind_addr.decode()
-
-    # pylint: disable=possibly-unused-variable
-    quoted = urllib.parse.quote(bind_addr, safe='')
-    unix_base_uri = 'http+unix://{quoted}'.format(**locals())
-
-    expected_peercreds = os.getpid(), os.getuid(), os.getgid()
-    expected_peercreds = '|'.join(map(str, expected_peercreds))
-
-    with requests_unixsocket.monkeypatch():
-        peercreds_resp = requests.get(
-            unix_base_uri + PEERCRED_IDS_URI,
-            timeout=http_request_timeout,
-        )
-        peercreds_resp.raise_for_status()
-        assert peercreds_resp.text == expected_peercreds
-
-        peercreds_text_resp = requests.get(
-            unix_base_uri + PEERCRED_TEXTS_URI,
-            timeout=http_request_timeout,
-        )
-        assert peercreds_text_resp.status_code == 500
-
-
-@pytest.mark.skipif(
-    not IS_UID_GID_RESOLVABLE,
-    reason='Modules `grp` and `pwd` are not available '
-           'under the current platform',
-)
-@unix_only_sock_test
-@non_macos_sock_test
-def test_peercreds_unix_sock_with_lookup(
-        http_request_timeout,
-        peercreds_enabled_server,
-):
-    """Check that ``PEERCRED`` resolution works when enabled."""
-    httpserver = peercreds_enabled_server
-    httpserver.peercreds_resolve_enabled = True
-
-    bind_addr = httpserver.bind_addr
-
-    if isinstance(bind_addr, bytes):
-        bind_addr = bind_addr.decode()
-
-    # pylint: disable=possibly-unused-variable
-    quoted = urllib.parse.quote(bind_addr, safe='')
-    unix_base_uri = 'http+unix://{quoted}'.format(**locals())
-
-    import grp
-    import pwd
-    expected_textcreds = (
-        pwd.getpwuid(os.getuid()).pw_name,
-        grp.getgrgid(os.getgid()).gr_name,
-    )
-    expected_textcreds = '!'.join(map(str, expected_textcreds))
-    with requests_unixsocket.monkeypatch():
-        peercreds_text_resp = requests.get(
-            unix_base_uri + PEERCRED_TEXTS_URI,
-            timeout=http_request_timeout,
-        )
-        peercreds_text_resp.raise_for_status()
-        assert peercreds_text_resp.text == expected_textcreds
-
-
-@pytest.mark.skipif(
-    IS_WINDOWS,
-    reason='This regression test is for a Linux bug, '
-    'and the resource module is not available on Windows',
-)
-@pytest.mark.parametrize(
-    'resource_limit',
-    (
-        1024,
-        2048,
-    ),
-    indirect=('resource_limit',),
-)
-@pytest.mark.usefixtures('many_open_sockets')
-def test_high_number_of_file_descriptors(native_server_client, resource_limit):
-    """Test the server does not crash with a high file-descriptor value.
-
-    This test shouldn't cause a server crash when trying to access
-    file-descriptor higher than 1024.
-
-    The earlier implementation used to rely on ``select()`` syscall that
-    doesn't support file descriptors with numbers higher than 1024.
-    """
-    # We want to force the server to use a file-descriptor with
-    # a number above resource_limit
-
-    # Patch the method that processes
-    _old_process_conn = native_server_client.server_instance.process_conn
-
-    def native_process_conn(conn):
-        native_process_conn.filenos.add(conn.socket.fileno())
-        return _old_process_conn(conn)
-    native_process_conn.filenos = set()
-    native_server_client.server_instance.process_conn = native_process_conn
-
-    # Trigger a crash if select() is used in the implementation
-    native_server_client.connect('/')
-
-    # Ensure that at least one connection got accepted, otherwise the
-    # follow-up check wouldn't make sense
-    assert len(native_process_conn.filenos) > 0
-
-    # Check at least one of the sockets created are above the target number
-    assert any(fn >= resource_limit for fn in native_process_conn.filenos)
-
-
-@pytest.mark.skipif(
-    not hasattr(socket, 'SO_REUSEPORT'),
-    reason='socket.SO_REUSEPORT is not supported on this platform',
-)
-@pytest.mark.parametrize(
-    'ip_addr',
-    (
-        ANY_INTERFACE_IPV4,
-        ANY_INTERFACE_IPV6,
-    ),
-)
-def test_reuse_port(http_server, ip_addr, mocker):
-    """Check that port initialized externally can be reused."""
-    family = socket.getaddrinfo(ip_addr, EPHEMERAL_PORT)[0][0]
-    s = socket.socket(family)
-    s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
-    s.bind((ip_addr, EPHEMERAL_PORT))
-    server = HTTPServer(
-        bind_addr=s.getsockname()[:2], gateway=Gateway, reuse_port=True,
-    )
-    spy = mocker.spy(server, 'prepare')
-    server.prepare()
-    server.stop()
-    s.close()
-    assert spy.spy_exception is None
-
-
-ISSUE511 = IS_MACOS
-
-
-if not IS_WINDOWS and not ISSUE511:
-    test_high_number_of_file_descriptors = pytest.mark.forked(
-        test_high_number_of_file_descriptors,
-    )
-
-
-@pytest.fixture
-def _garbage_bin():
-    """Disable garbage collection when this fixture is in use."""
-    with DefaultGc().nogc():
-        yield
-
-
-@pytest.fixture
-def resource_limit(request):
-    """Set the resource limit two times bigger then requested."""
-    resource = pytest.importorskip(
-        'resource',
-        reason='The "resource" module is Unix-specific',
-    )
-
-    # Get current resource limits to restore them later
-    soft_limit, hard_limit = resource.getrlimit(resource.RLIMIT_NOFILE)
-
-    # We have to increase the nofile limit above 1024
-    # Otherwise we see a 'Too many files open' error, instead of
-    # an error due to the file descriptor number being too high
-    resource.setrlimit(
-        resource.RLIMIT_NOFILE,
-        (request.param * 2, hard_limit),
-    )
-
-    try:  # noqa: WPS501
-        yield request.param
-    finally:
-        # Reset the resource limit back to the original soft limit
-        resource.setrlimit(resource.RLIMIT_NOFILE, (soft_limit, hard_limit))
-
-
-@pytest.fixture
-def many_open_sockets(request, resource_limit):
-    """Allocate a lot of file descriptors by opening dummy sockets."""
-    # NOTE: `@pytest.mark.usefixtures` doesn't work on fixtures which
-    # NOTE: forces us to invoke this one dynamically to avoid having an
-    # NOTE: unused argument.
-    request.getfixturevalue('_garbage_bin')
-
-    # Hoard a lot of file descriptors by opening and storing a lot of sockets
-    test_sockets = []
-    # Open a lot of file descriptors, so the next one the server
-    # opens is a high number
-    try:
-        for _ in range(resource_limit):
-            sock = socket.socket()
-            test_sockets.append(sock)
-            # If we reach a high enough number, we don't need to open more
-            if sock.fileno() >= resource_limit:
-                break
-        # Check we opened enough descriptors to reach a high number
-        the_highest_fileno = test_sockets[-1].fileno()
-        assert the_highest_fileno >= resource_limit
-        yield the_highest_fileno
-    finally:
-        # Close our open resources
-        for test_socket in test_sockets:
-            test_socket.close()
-
-
-@pytest.mark.parametrize(
-    ('minthreads', 'maxthreads', 'inited_maxthreads'),
-    (
-        (
-            # NOTE: The docstring only mentions -1 to mean "no max", but other
-            # NOTE: negative numbers should also work.
-            1,
-            -2,
-            float('inf'),
-        ),
-        (1, -1, float('inf')),
-        (1, 1, 1),
-        (1, 2, 2),
-        (1, float('inf'), float('inf')),
-        (2, -2, float('inf')),
-        (2, -1, float('inf')),
-        (2, 2, 2),
-        (2, float('inf'), float('inf')),
-    ),
-)
-def test_threadpool_threadrange_set(minthreads, maxthreads, inited_maxthreads):
-    """Test setting the number of threads in a ThreadPool.
-
-    The ThreadPool should properly set the min+max number of the threads to use
-    in the pool if those limits are valid.
-    """
-    tp = ThreadPool(
-        server=None,
-        min=minthreads,
-        max=maxthreads,
-    )
-    assert tp.min == minthreads
-    assert tp.max == inited_maxthreads
-
-
-@pytest.mark.parametrize(
-    ('minthreads', 'maxthreads', 'error'),
-    (
-        (-1, -1, 'min=-1 must be > 0'),
-        (-1, 0, 'min=-1 must be > 0'),
-        (-1, 1, 'min=-1 must be > 0'),
-        (-1, 2, 'min=-1 must be > 0'),
-        (0, -1, 'min=0 must be > 0'),
-        (0, 0, 'min=0 must be > 0'),
-        (0, 1, 'min=0 must be > 0'),
-        (0, 2, 'min=0 must be > 0'),
-        (1, 0, 'Expected an integer or the infinity value for the `max` argument but got 0.'),
-        (1, 0.5, 'Expected an integer or the infinity value for the `max` argument but got 0.5.'),
-        (2, 0, 'Expected an integer or the infinity value for the `max` argument but got 0.'),
-        (2, '1', "Expected an integer or the infinity value for the `max` argument but got '1'."),
-        (2, 1, 'max=1 must be > min=2'),
-    ),
-)
-def test_threadpool_invalid_threadrange(minthreads, maxthreads, error):
-    """Test that a ThreadPool rejects invalid min/max values.
-
-    The ThreadPool should raise an error with the proper message when
-    initialized with an invalid min+max number of threads.
-    """
-    with pytest.raises((ValueError, TypeError), match=error):
-        ThreadPool(
-            server=None,
-            min=minthreads,
-            max=maxthreads,
-        )
-
-
-def test_threadpool_multistart_validation(monkeypatch):
-    """Test for ThreadPool multi-start behavior.
-
-    Tests that when calling start() on a ThreadPool multiple times raises a
-    :exc:`RuntimeError`
-    """
-    # replace _spawn_worker with a function that returns a placeholder to avoid
-    # actually starting any threads
-    monkeypatch.setattr(
-        ThreadPool,
-        '_spawn_worker',
-        lambda _: types.SimpleNamespace(ready=True),
-    )
-
-    tp = ThreadPool(server=None)
-    tp.start()
-    with pytest.raises(RuntimeError, match='Threadpools can only be started once.'):
-        tp.start()
diff --git a/lib/cheroot/test/test_ssl.py b/lib/cheroot/test/test_ssl.py
deleted file mode 100644
index 1900e20d..00000000
--- a/lib/cheroot/test/test_ssl.py
+++ /dev/null
@@ -1,702 +0,0 @@
-"""Tests for TLS support."""
-
-import functools
-import json
-import os
-import ssl
-import subprocess
-import sys
-import threading
-import time
-import traceback
-import http.client
-
-import OpenSSL.SSL
-import pytest
-import requests
-import trustme
-
-from .._compat import bton, ntob, ntou
-from .._compat import IS_ABOVE_OPENSSL10, IS_CI, IS_PYPY
-from .._compat import IS_LINUX, IS_MACOS, IS_WINDOWS
-from ..server import HTTPServer, get_ssl_adapter_class
-from ..testing import (
-    ANY_INTERFACE_IPV4,
-    ANY_INTERFACE_IPV6,
-    EPHEMERAL_PORT,
-    # get_server_client,
-    _get_conn_data,
-    _probe_ipv6_sock,
-)
-from ..wsgi import Gateway_10
-
-
-IS_GITHUB_ACTIONS_WORKFLOW = bool(os.getenv('GITHUB_WORKFLOW'))
-IS_WIN2016 = (
-    IS_WINDOWS
-    # pylint: disable=unsupported-membership-test
-    and b'Microsoft Windows Server 2016 Datacenter' in subprocess.check_output(
-        ('systeminfo',),
-    )
-)
-IS_LIBRESSL_BACKEND = ssl.OPENSSL_VERSION.startswith('LibreSSL')
-IS_PYOPENSSL_SSL_VERSION_1_0 = (
-    OpenSSL.SSL.SSLeay_version(OpenSSL.SSL.SSLEAY_VERSION).
-    startswith(b'OpenSSL 1.0.')
-)
-PY310_PLUS = sys.version_info[:2] >= (3, 10)
-
-
-_stdlib_to_openssl_verify = {
-    ssl.CERT_NONE: OpenSSL.SSL.VERIFY_NONE,
-    ssl.CERT_OPTIONAL: OpenSSL.SSL.VERIFY_PEER,
-    ssl.CERT_REQUIRED:
-        OpenSSL.SSL.VERIFY_PEER + OpenSSL.SSL.VERIFY_FAIL_IF_NO_PEER_CERT,
-}
-
-
-missing_ipv6 = pytest.mark.skipif(
-    not _probe_ipv6_sock('::1'),
-    reason=''
-    'IPv6 is disabled '
-    '(for example, under Travis CI '
-    'which runs under GCE supporting only IPv4)',
-)
-
-
-class HelloWorldGateway(Gateway_10):
-    """Gateway responding with Hello World to root URI."""
-
-    def respond(self):
-        """Respond with dummy content via HTTP."""
-        req = self.req
-        req_uri = bton(req.uri)
-        if req_uri == '/':
-            req.status = b'200 OK'
-            req.ensure_headers_sent()
-            req.write(b'Hello world!')
-            return
-        if req_uri == '/env':
-            req.status = b'200 OK'
-            req.ensure_headers_sent()
-            env = self.get_environ()
-            # drop files so that it can be json dumped
-            env.pop('wsgi.errors')
-            env.pop('wsgi.input')
-            print(env)
-            req.write(json.dumps(env).encode('utf-8'))
-            return
-        return super(HelloWorldGateway, self).respond()
-
-
-def make_tls_http_server(bind_addr, ssl_adapter, request):
-    """Create and start an HTTP server bound to ``bind_addr``."""
-    httpserver = HTTPServer(
-        bind_addr=bind_addr,
-        gateway=HelloWorldGateway,
-    )
-    # httpserver.gateway = HelloWorldGateway
-    httpserver.ssl_adapter = ssl_adapter
-
-    threading.Thread(target=httpserver.safe_start).start()
-
-    while not httpserver.ready:
-        time.sleep(0.1)
-
-    request.addfinalizer(httpserver.stop)
-
-    return httpserver
-
-
-@pytest.fixture
-def tls_http_server(request):
-    """Provision a server creator as a fixture."""
-    return functools.partial(make_tls_http_server, request=request)
-
-
-@pytest.fixture
-def ca():
-    """Provide a certificate authority via fixture."""
-    return trustme.CA()
-
-
-@pytest.fixture
-def tls_ca_certificate_pem_path(ca):
-    """Provide a certificate authority certificate file via fixture."""
-    with ca.cert_pem.tempfile() as ca_cert_pem:
-        yield ca_cert_pem
-
-
-@pytest.fixture
-def tls_certificate(ca):
-    """Provide a leaf certificate via fixture."""
-    interface, _host, _port = _get_conn_data(ANY_INTERFACE_IPV4)
-    return ca.issue_cert(ntou(interface))
-
-
-@pytest.fixture
-def tls_certificate_chain_pem_path(tls_certificate):
-    """Provide a certificate chain PEM file path via fixture."""
-    with tls_certificate.private_key_and_cert_chain_pem.tempfile() as cert_pem:
-        yield cert_pem
-
-
-@pytest.fixture
-def tls_certificate_private_key_pem_path(tls_certificate):
-    """Provide a certificate private key PEM file path via fixture."""
-    with tls_certificate.private_key_pem.tempfile() as cert_key_pem:
-        yield cert_key_pem
-
-
-def _thread_except_hook(exceptions, args):
-    """Append uncaught exception ``args`` in threads to ``exceptions``."""
-    if issubclass(args.exc_type, SystemExit):
-        return
-    # cannot store the exception, it references the thread's stack
-    exceptions.append((
-        args.exc_type,
-        str(args.exc_value),
-        ''.join(
-            traceback.format_exception(
-                args.exc_type, args.exc_value, args.exc_traceback,
-            ),
-        ),
-    ))
-
-
-@pytest.fixture
-def thread_exceptions():
-    """Provide a list of uncaught exceptions from threads via a fixture.
-
-    Only catches exceptions on Python 3.8+.
-    The list contains: ``(type, str(value), str(traceback))``
-    """
-    exceptions = []
-    # Python 3.8+
-    orig_hook = getattr(threading, 'excepthook', None)
-    if orig_hook is not None:
-        threading.excepthook = functools.partial(
-            _thread_except_hook, exceptions,
-        )
-    try:
-        yield exceptions
-    finally:
-        if orig_hook is not None:
-            threading.excepthook = orig_hook
-
-
-@pytest.mark.parametrize(
-    'adapter_type',
-    (
-        'builtin',
-        'pyopenssl',
-    ),
-)
-def test_ssl_adapters(
-    http_request_timeout,
-    tls_http_server, adapter_type,
-    tls_certificate,
-    tls_certificate_chain_pem_path,
-    tls_certificate_private_key_pem_path,
-    tls_ca_certificate_pem_path,
-):
-    """Test ability to connect to server via HTTPS using adapters."""
-    interface, _host, port = _get_conn_data(ANY_INTERFACE_IPV4)
-    tls_adapter_cls = get_ssl_adapter_class(name=adapter_type)
-    tls_adapter = tls_adapter_cls(
-        tls_certificate_chain_pem_path, tls_certificate_private_key_pem_path,
-    )
-    if adapter_type == 'pyopenssl':
-        tls_adapter.context = tls_adapter.get_context()
-
-    tls_certificate.configure_cert(tls_adapter.context)
-
-    tlshttpserver = tls_http_server((interface, port), tls_adapter)
-
-    # testclient = get_server_client(tlshttpserver)
-    # testclient.get('/')
-
-    interface, _host, port = _get_conn_data(
-        tlshttpserver.bind_addr,
-    )
-
-    resp = requests.get(
-        'https://{host!s}:{port!s}/'.format(host=interface, port=port),
-        timeout=http_request_timeout,
-        verify=tls_ca_certificate_pem_path,
-    )
-
-    assert resp.status_code == 200
-    assert resp.text == 'Hello world!'
-
-
-@pytest.mark.parametrize(  # noqa: C901  # FIXME
-    'adapter_type',
-    (
-        'builtin',
-        'pyopenssl',
-    ),
-)
-@pytest.mark.parametrize(
-    ('is_trusted_cert', 'tls_client_identity'),
-    (
-        (True, 'localhost'), (True, '127.0.0.1'),
-        (True, '*.localhost'), (True, 'not_localhost'),
-        (False, 'localhost'),
-    ),
-)
-@pytest.mark.parametrize(
-    'tls_verify_mode',
-    (
-        ssl.CERT_NONE,  # server shouldn't validate client cert
-        ssl.CERT_OPTIONAL,  # same as CERT_REQUIRED in client mode, don't use
-        ssl.CERT_REQUIRED,  # server should validate if client cert CA is OK
-    ),
-)
-@pytest.mark.xfail(
-    IS_PYPY and IS_CI,
-    reason='Fails under PyPy in CI for unknown reason',
-    strict=False,
-)
-def test_tls_client_auth(  # noqa: C901, WPS213  # FIXME
-    # FIXME: remove twisted logic, separate tests
-    http_request_timeout,
-    mocker,
-    tls_http_server, adapter_type,
-    ca,
-    tls_certificate,
-    tls_certificate_chain_pem_path,
-    tls_certificate_private_key_pem_path,
-    tls_ca_certificate_pem_path,
-    is_trusted_cert, tls_client_identity,
-    tls_verify_mode,
-):
-    """Verify that client TLS certificate auth works correctly."""
-    test_cert_rejection = (
-        tls_verify_mode != ssl.CERT_NONE
-        and not is_trusted_cert
-    )
-    interface, _host, port = _get_conn_data(ANY_INTERFACE_IPV4)
-
-    client_cert_root_ca = ca if is_trusted_cert else trustme.CA()
-    with mocker.mock_module.patch(
-        'idna.core.ulabel',
-        return_value=ntob(tls_client_identity),
-    ):
-        client_cert = client_cert_root_ca.issue_cert(
-            ntou(tls_client_identity),
-        )
-        del client_cert_root_ca
-
-    with client_cert.private_key_and_cert_chain_pem.tempfile() as cl_pem:
-        tls_adapter_cls = get_ssl_adapter_class(name=adapter_type)
-        tls_adapter = tls_adapter_cls(
-            tls_certificate_chain_pem_path,
-            tls_certificate_private_key_pem_path,
-        )
-        if adapter_type == 'pyopenssl':
-            tls_adapter.context = tls_adapter.get_context()
-            tls_adapter.context.set_verify(
-                _stdlib_to_openssl_verify[tls_verify_mode],
-                lambda conn, cert, errno, depth, preverify_ok: preverify_ok,
-            )
-        else:
-            tls_adapter.context.verify_mode = tls_verify_mode
-
-        ca.configure_trust(tls_adapter.context)
-        tls_certificate.configure_cert(tls_adapter.context)
-
-        tlshttpserver = tls_http_server((interface, port), tls_adapter)
-
-        interface, _host, port = _get_conn_data(tlshttpserver.bind_addr)
-
-        make_https_request = functools.partial(
-            requests.get,
-            'https://{host!s}:{port!s}/'.format(host=interface, port=port),
-
-            # Don't wait for the first byte forever:
-            timeout=http_request_timeout,
-
-            # Server TLS certificate verification:
-            verify=tls_ca_certificate_pem_path,
-
-            # Client TLS certificate verification:
-            cert=cl_pem,
-        )
-
-        if not test_cert_rejection:
-            resp = make_https_request()
-            is_req_successful = resp.status_code == 200
-            if (
-                    not is_req_successful
-                    and IS_PYOPENSSL_SSL_VERSION_1_0
-                    and adapter_type == 'builtin'
-                    and tls_verify_mode == ssl.CERT_REQUIRED
-                    and tls_client_identity == 'localhost'
-                    and is_trusted_cert
-            ):
-                pytest.xfail(
-                    'OpenSSL 1.0 has problems with verifying client certs',
-                )
-            assert is_req_successful
-            assert resp.text == 'Hello world!'
-            resp.close()
-            return
-
-        # xfail some flaky tests
-        # https://github.com/cherrypy/cheroot/issues/237
-        issue_237 = (
-            IS_MACOS
-            and adapter_type == 'builtin'
-            and tls_verify_mode != ssl.CERT_NONE
-        )
-        if issue_237:
-            pytest.xfail('Test sometimes fails')
-
-        expected_ssl_errors = requests.exceptions.SSLError,
-        if IS_WINDOWS or IS_GITHUB_ACTIONS_WORKFLOW:
-            expected_ssl_errors += requests.exceptions.ConnectionError,
-        with pytest.raises(expected_ssl_errors) as ssl_err:
-            make_https_request().close()
-
-        try:
-            err_text = ssl_err.value.args[0].reason.args[0].args[0]
-        except AttributeError:
-            if IS_WINDOWS or IS_GITHUB_ACTIONS_WORKFLOW:
-                err_text = str(ssl_err.value)
-            else:
-                raise
-
-        if isinstance(err_text, int):
-            err_text = str(ssl_err.value)
-
-        expected_substrings = (
-            'sslv3 alert bad certificate' if IS_LIBRESSL_BACKEND
-            else 'tlsv1 alert unknown ca',
-        )
-        if IS_MACOS and IS_PYPY and adapter_type == 'pyopenssl':
-            expected_substrings = ('tlsv1 alert unknown ca',)
-        if (
-                tls_verify_mode in (
-                    ssl.CERT_REQUIRED,
-                    ssl.CERT_OPTIONAL,
-                )
-                and not is_trusted_cert
-                and tls_client_identity == 'localhost'
-        ):
-            expected_substrings += (
-                'bad handshake: '
-                "SysCallError(10054, 'WSAECONNRESET')",
-                "('Connection aborted.', "
-                'OSError("(10054, \'WSAECONNRESET\')"))',
-                "('Connection aborted.', "
-                'OSError("(10054, \'WSAECONNRESET\')",))',
-                "('Connection aborted.', "
-                'error("(10054, \'WSAECONNRESET\')",))',
-                "('Connection aborted.', "
-                'ConnectionResetError(10054, '
-                "'An existing connection was forcibly closed "
-                "by the remote host', None, 10054, None))",
-                "('Connection aborted.', "
-                'error(10054, '
-                "'An existing connection was forcibly closed "
-                "by the remote host'))",
-            ) if IS_WINDOWS else (
-                "('Connection aborted.', "
-                'OSError("(104, \'ECONNRESET\')"))',
-                "('Connection aborted.', "
-                'OSError("(104, \'ECONNRESET\')",))',
-                "('Connection aborted.', "
-                'error("(104, \'ECONNRESET\')",))',
-                "('Connection aborted.', "
-                "ConnectionResetError(104, 'Connection reset by peer'))",
-                "('Connection aborted.', "
-                "error(104, 'Connection reset by peer'))",
-            ) if (
-                IS_GITHUB_ACTIONS_WORKFLOW
-                and IS_LINUX
-            ) else (
-                "('Connection aborted.', "
-                "BrokenPipeError(32, 'Broken pipe'))",
-            )
-
-        if PY310_PLUS:
-            # FIXME: Figure out what's happening and correct the problem
-            expected_substrings += (
-                'SSLError(SSLEOFError(8, '
-                "'EOF occurred in violation of protocol (_ssl.c:",
-            )
-        if IS_GITHUB_ACTIONS_WORKFLOW and IS_WINDOWS and PY310_PLUS:
-            expected_substrings += (
-                "('Connection aborted.', "
-                'RemoteDisconnected('
-                "'Remote end closed connection without response'))",
-            )
-
-        assert any(e in err_text for e in expected_substrings)
-
-
-@pytest.mark.parametrize(  # noqa: C901  # FIXME
-    'adapter_type',
-    (
-        pytest.param(
-            'builtin',
-            marks=pytest.mark.xfail(
-                IS_MACOS and PY310_PLUS,
-                reason='Unclosed TLS resource warnings happen on macOS '
-                'under Python 3.10 (#508)',
-                strict=False,
-            ),
-        ),
-        'pyopenssl',
-    ),
-)
-@pytest.mark.parametrize(
-    ('tls_verify_mode', 'use_client_cert'),
-    (
-        (ssl.CERT_NONE, False),
-        (ssl.CERT_NONE, True),
-        (ssl.CERT_OPTIONAL, False),
-        (ssl.CERT_OPTIONAL, True),
-        (ssl.CERT_REQUIRED, True),
-    ),
-)
-def test_ssl_env(  # noqa: C901  # FIXME
-        thread_exceptions,
-        recwarn,
-        mocker,
-        http_request_timeout,
-        tls_http_server, adapter_type,
-        ca, tls_verify_mode, tls_certificate,
-        tls_certificate_chain_pem_path,
-        tls_certificate_private_key_pem_path,
-        tls_ca_certificate_pem_path,
-        use_client_cert,
-):
-    """Test the SSL environment generated by the SSL adapters."""
-    interface, _host, port = _get_conn_data(ANY_INTERFACE_IPV4)
-
-    with mocker.mock_module.patch(
-        'idna.core.ulabel',
-        return_value=ntob('127.0.0.1'),
-    ):
-        client_cert = ca.issue_cert(ntou('127.0.0.1'))
-
-    with client_cert.private_key_and_cert_chain_pem.tempfile() as cl_pem:
-        tls_adapter_cls = get_ssl_adapter_class(name=adapter_type)
-        tls_adapter = tls_adapter_cls(
-            tls_certificate_chain_pem_path,
-            tls_certificate_private_key_pem_path,
-        )
-        if adapter_type == 'pyopenssl':
-            tls_adapter.context = tls_adapter.get_context()
-            tls_adapter.context.set_verify(
-                _stdlib_to_openssl_verify[tls_verify_mode],
-                lambda conn, cert, errno, depth, preverify_ok: preverify_ok,
-            )
-        else:
-            tls_adapter.context.verify_mode = tls_verify_mode
-
-        ca.configure_trust(tls_adapter.context)
-        tls_certificate.configure_cert(tls_adapter.context)
-
-        tlswsgiserver = tls_http_server((interface, port), tls_adapter)
-
-        interface, _host, port = _get_conn_data(tlswsgiserver.bind_addr)
-
-        resp = requests.get(
-            'https://' + interface + ':' + str(port) + '/env',
-            timeout=http_request_timeout,
-            verify=tls_ca_certificate_pem_path,
-            cert=cl_pem if use_client_cert else None,
-        )
-
-        env = json.loads(resp.content.decode('utf-8'))
-
-        # hard coded env
-        assert env['wsgi.url_scheme'] == 'https'
-        assert env['HTTPS'] == 'on'
-
-        # ensure these are present
-        for key in {'SSL_VERSION_INTERFACE', 'SSL_VERSION_LIBRARY'}:
-            assert key in env
-
-        # pyOpenSSL generates the env before the handshake completes
-        if adapter_type == 'pyopenssl':
-            return
-
-        for key in {'SSL_PROTOCOL', 'SSL_CIPHER'}:
-            assert key in env
-
-        # client certificate env
-        if tls_verify_mode == ssl.CERT_NONE or not use_client_cert:
-            assert env['SSL_CLIENT_VERIFY'] == 'NONE'
-        else:
-            assert env['SSL_CLIENT_VERIFY'] == 'SUCCESS'
-
-            with open(cl_pem, 'rt') as f:
-                assert env['SSL_CLIENT_CERT'] in f.read()
-
-            for key in {
-                'SSL_CLIENT_M_VERSION', 'SSL_CLIENT_M_SERIAL',
-                'SSL_CLIENT_I_DN', 'SSL_CLIENT_S_DN',
-            }:
-                assert key in env
-
-    # builtin ssl environment generation may use a loopback socket
-    # ensure no ResourceWarning was raised during the test
-    if IS_PYPY:
-        # NOTE: PyPy doesn't have ResourceWarning
-        # Ref: https://doc.pypy.org/en/latest/cpython_differences.html
-        return
-    for warn in recwarn:
-        if not issubclass(warn.category, ResourceWarning):
-            continue
-
-        # the tests can sporadically generate resource warnings
-        # due to timing issues
-        # all of these sporadic warnings appear to be about socket.socket
-        # and have been observed to come from requests connection pool
-        msg = str(warn.message)
-        if 'socket.socket' in msg:
-            pytest.xfail(
-                '\n'.join((
-                    'Sometimes this test fails due to '
-                    'a socket.socket ResourceWarning:',
-                    msg,
-                )),
-            )
-        pytest.fail(msg)
-
-    # to perform the ssl handshake over that loopback socket,
-    # the builtin ssl environment generation uses a thread
-    for _, _, trace in thread_exceptions:
-        print(trace, file=sys.stderr)
-    assert not thread_exceptions, ': '.join((
-        thread_exceptions[0][0].__name__,
-        thread_exceptions[0][1],
-    ))
-
-
-@pytest.mark.parametrize(
-    'ip_addr',
-    (
-        ANY_INTERFACE_IPV4,
-        ANY_INTERFACE_IPV6,
-    ),
-)
-def test_https_over_http_error(http_server, ip_addr):
-    """Ensure that connecting over HTTPS to HTTP port is handled."""
-    httpserver = http_server.send((ip_addr, EPHEMERAL_PORT))
-    interface, _host, port = _get_conn_data(httpserver.bind_addr)
-    with pytest.raises(ssl.SSLError) as ssl_err:
-        http.client.HTTPSConnection(
-            '{interface}:{port}'.format(
-                interface=interface,
-                port=port,
-            ),
-        ).request('GET', '/')
-    expected_substring = (
-        'wrong version number' if IS_ABOVE_OPENSSL10
-        else 'unknown protocol'
-    )
-    assert expected_substring in ssl_err.value.args[-1]
-
-
-@pytest.mark.parametrize(
-    'adapter_type',
-    (
-        'builtin',
-        'pyopenssl',
-    ),
-)
-@pytest.mark.parametrize(
-    'ip_addr',
-    (
-        ANY_INTERFACE_IPV4,
-        pytest.param(ANY_INTERFACE_IPV6, marks=missing_ipv6),
-    ),
-)
-@pytest.mark.flaky(reruns=3, reruns_delay=2)
-def test_http_over_https_error(
-    http_request_timeout,
-    tls_http_server, adapter_type,
-    ca, ip_addr,
-    tls_certificate,
-    tls_certificate_chain_pem_path,
-    tls_certificate_private_key_pem_path,
-):
-    """Ensure that connecting over HTTP to HTTPS port is handled."""
-    # disable some flaky tests
-    # https://github.com/cherrypy/cheroot/issues/225
-    issue_225 = (
-        IS_MACOS
-        and adapter_type == 'builtin'
-    )
-    if issue_225:
-        pytest.xfail('Test fails in Travis-CI')
-
-    tls_adapter_cls = get_ssl_adapter_class(name=adapter_type)
-    tls_adapter = tls_adapter_cls(
-        tls_certificate_chain_pem_path, tls_certificate_private_key_pem_path,
-    )
-    if adapter_type == 'pyopenssl':
-        tls_adapter.context = tls_adapter.get_context()
-
-    tls_certificate.configure_cert(tls_adapter.context)
-
-    interface, _host, port = _get_conn_data(ip_addr)
-    tlshttpserver = tls_http_server((interface, port), tls_adapter)
-
-    interface, _host, port = _get_conn_data(
-        tlshttpserver.bind_addr,
-    )
-
-    fqdn = interface
-    if ip_addr is ANY_INTERFACE_IPV6:
-        fqdn = '[{fqdn}]'.format(**locals())
-
-    expect_fallback_response_over_plain_http = (
-        (
-            adapter_type == 'pyopenssl'
-        )
-    )
-    if expect_fallback_response_over_plain_http:
-        resp = requests.get(
-            'http://{host!s}:{port!s}/'.format(host=fqdn, port=port),
-            timeout=http_request_timeout,
-        )
-        assert resp.status_code == 400
-        assert resp.text == (
-            'The client sent a plain HTTP request, '
-            'but this server only speaks HTTPS on this port.'
-        )
-        return
-
-    with pytest.raises(requests.exceptions.ConnectionError) as ssl_err:
-        requests.get(  # FIXME: make stdlib ssl behave like PyOpenSSL
-            'http://{host!s}:{port!s}/'.format(host=fqdn, port=port),
-            timeout=http_request_timeout,
-        )
-
-    if IS_LINUX:
-        expected_error_code, expected_error_text = (
-            104, 'Connection reset by peer',
-        )
-    if IS_MACOS:
-        expected_error_code, expected_error_text = (
-            54, 'Connection reset by peer',
-        )
-    if IS_WINDOWS:
-        expected_error_code, expected_error_text = (
-            10054,
-            'An existing connection was forcibly closed by the remote host',
-        )
-
-    underlying_error = ssl_err.value.args[0].args[-1]
-    err_text = str(underlying_error)
-    assert underlying_error.errno == expected_error_code, (
-        'The underlying error is {underlying_error!r}'.
-        format(**locals())
-    )
-    assert expected_error_text in err_text
diff --git a/lib/cheroot/test/test_wsgi.py b/lib/cheroot/test/test_wsgi.py
deleted file mode 100644
index 14005a84..00000000
--- a/lib/cheroot/test/test_wsgi.py
+++ /dev/null
@@ -1,85 +0,0 @@
-"""Test wsgi."""
-
-from concurrent.futures.thread import ThreadPoolExecutor
-from traceback import print_tb
-
-import pytest
-import portend
-import requests
-from requests_toolbelt.sessions import BaseUrlSession as Session
-from jaraco.context import ExceptionTrap
-
-from cheroot import wsgi
-from cheroot._compat import IS_MACOS, IS_WINDOWS
-
-
-IS_SLOW_ENV = IS_MACOS or IS_WINDOWS
-
-
-@pytest.fixture
-def simple_wsgi_server():
-    """Fucking simple wsgi server fixture (duh)."""
-    port = portend.find_available_local_port()
-
-    def app(_environ, start_response):
-        status = '200 OK'
-        response_headers = [('Content-type', 'text/plain')]
-        start_response(status, response_headers)
-        return [b'Hello world!']
-
-    host = '::'
-    addr = host, port
-    server = wsgi.Server(addr, app, timeout=600 if IS_SLOW_ENV else 20)
-    # pylint: disable=possibly-unused-variable
-    url = 'http://localhost:{port}/'.format(**locals())
-    # pylint: disable=possibly-unused-variable
-    with server._run_in_thread() as thread:
-        yield locals()
-
-
-@pytest.mark.flaky(reruns=3, reruns_delay=2)
-def test_connection_keepalive(simple_wsgi_server):
-    """Test the connection keepalive works (duh)."""
-    session = Session(base_url=simple_wsgi_server['url'])
-    pooled = requests.adapters.HTTPAdapter(
-        pool_connections=1, pool_maxsize=1000,
-    )
-    session.mount('http://', pooled)
-
-    def do_request():
-        with ExceptionTrap(requests.exceptions.ConnectionError) as trap:
-            resp = session.get('info')
-            resp.raise_for_status()
-        print_tb(trap.tb)
-        return bool(trap)
-
-    with ThreadPoolExecutor(max_workers=10 if IS_SLOW_ENV else 50) as pool:
-        tasks = [
-            pool.submit(do_request)
-            for n in range(250 if IS_SLOW_ENV else 1000)
-        ]
-        failures = sum(task.result() for task in tasks)
-
-    session.close()
-    assert not failures
-
-
-def test_gateway_start_response_called_twice(monkeypatch):
-    """Verify that repeat calls of ``Gateway.start_response()`` fail."""
-    monkeypatch.setattr(wsgi.Gateway, 'get_environ', lambda self: {})
-    wsgi_gateway = wsgi.Gateway(None)
-    wsgi_gateway.started_response = True
-
-    err_msg = '^WSGI start_response called a second time with no exc_info.$'
-    with pytest.raises(RuntimeError, match=err_msg):
-        wsgi_gateway.start_response('200', (), None)
-
-
-def test_gateway_write_needs_start_response_called_before(monkeypatch):
-    """Check that calling ``Gateway.write()`` needs started response."""
-    monkeypatch.setattr(wsgi.Gateway, 'get_environ', lambda self: {})
-    wsgi_gateway = wsgi.Gateway(None)
-
-    err_msg = '^WSGI write called before start_response.$'
-    with pytest.raises(RuntimeError, match=err_msg):
-        wsgi_gateway.write(None)  # The actual arg value is unimportant
diff --git a/lib/cheroot/test/webtest.py b/lib/cheroot/test/webtest.py
deleted file mode 100644
index eafa2dd6..00000000
--- a/lib/cheroot/test/webtest.py
+++ /dev/null
@@ -1,588 +0,0 @@
-"""Extensions to unittest for web frameworks.
-
-Use the :py:meth:`WebCase.getPage` method to request a page
-from your HTTP server.
-
-Framework Integration
-=====================
-If you have control over your server process, you can handle errors
-in the server-side of the HTTP conversation a bit better. You must run
-both the client (your :py:class:`WebCase` tests) and the server in the
-same process (but in separate threads, obviously).
-When an error occurs in the framework, call server_error. It will print
-the traceback to stdout, and keep any assertions you have from running
-(the assumption is that, if the server errors, the page output will not
-be of further significance to your tests).
-"""
-
-import pprint
-import re
-import socket
-import sys
-import time
-import traceback
-import os
-import json
-import unittest  # pylint: disable=deprecated-module,preferred-module
-import warnings
-import functools
-import http.client
-import urllib.parse
-
-from more_itertools.more import always_iterable
-import jaraco.functools
-
-
-def interface(host):
-    """Return an IP address for a client connection given the server host.
-
-    If the server is listening on '0.0.0.0' (INADDR_ANY)
-    or '::' (IN6ADDR_ANY), this will return the proper localhost.
-    """
-    if host == '0.0.0.0':
-        # INADDR_ANY, which should respond on localhost.
-        return '127.0.0.1'
-    if host == '::':
-        # IN6ADDR_ANY, which should respond on localhost.
-        return '::1'
-    return host
-
-
-try:
-    # Jython support
-    if sys.platform[:4] == 'java':
-        def getchar():
-            """Get a key press."""
-            # Hopefully this is enough
-            return sys.stdin.read(1)
-    else:
-        # On Windows, msvcrt.getch reads a single char without output.
-        import msvcrt
-
-        def getchar():
-            """Get a key press."""
-            return msvcrt.getch()
-except ImportError:
-    # Unix getchr
-    import tty
-    import termios
-
-    def getchar():
-        """Get a key press."""
-        fd = sys.stdin.fileno()
-        old_settings = termios.tcgetattr(fd)
-        try:
-            tty.setraw(sys.stdin.fileno())
-            ch = sys.stdin.read(1)
-        finally:
-            termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)
-        return ch
-
-
-# from jaraco.properties
-class NonDataProperty:
-    """Non-data property decorator."""
-
-    def __init__(self, fget):
-        """Initialize a non-data property."""
-        assert fget is not None, 'fget cannot be none'
-        assert callable(fget), 'fget must be callable'
-        self.fget = fget
-
-    def __get__(self, obj, objtype=None):
-        """Return a class property."""
-        if obj is None:
-            return self
-        return self.fget(obj)
-
-
-class WebCase(unittest.TestCase):
-    """Helper web test suite base."""
-
-    HOST = '127.0.0.1'
-    PORT = 8000
-    HTTP_CONN = http.client.HTTPConnection
-    PROTOCOL = 'HTTP/1.1'
-
-    scheme = 'http'
-    url = None
-    ssl_context = None
-
-    status = None
-    headers = None
-    body = None
-
-    encoding = 'utf-8'
-
-    time = None
-
-    @property
-    def _Conn(self):
-        """Return HTTPConnection or HTTPSConnection based on self.scheme.
-
-        * from :py:mod:`python:http.client`.
-        """
-        cls_name = '{scheme}Connection'.format(scheme=self.scheme.upper())
-        return getattr(http.client, cls_name)
-
-    def get_conn(self, auto_open=False):
-        """Return a connection to our HTTP server."""
-        conn = self._Conn(self.interface(), self.PORT)
-        # Automatically re-connect?
-        conn.auto_open = auto_open
-        conn.connect()
-        return conn
-
-    def set_persistent(self, on=True, auto_open=False):
-        """Make our HTTP_CONN persistent (or not).
-
-        If the 'on' argument is True (the default), then self.HTTP_CONN
-        will be set to an instance of HTTP(S)?Connection
-        to persist across requests.
-        As this class only allows for a single open connection, if
-        self already has an open connection, it will be closed.
-        """
-        try:
-            self.HTTP_CONN.close()
-        except (TypeError, AttributeError):
-            pass
-
-        self.HTTP_CONN = (
-            self.get_conn(auto_open=auto_open)
-            if on
-            else self._Conn
-        )
-
-    @property
-    def persistent(self):
-        """Presence of the persistent HTTP connection."""
-        return hasattr(self.HTTP_CONN, '__class__')
-
-    @persistent.setter
-    def persistent(self, on):
-        self.set_persistent(on)
-
-    def interface(self):
-        """Return an IP address for a client connection.
-
-        If the server is listening on '0.0.0.0' (INADDR_ANY)
-        or '::' (IN6ADDR_ANY), this will return the proper localhost.
-        """
-        return interface(self.HOST)
-
-    def getPage(
-        self, url, headers=None, method='GET', body=None,
-        protocol=None, raise_subcls=(),
-    ):
-        """Open the url with debugging support.
-
-        Return status, headers, body.
-
-        url should be the identifier passed to the server, typically a
-        server-absolute path and query string (sent between method and
-        protocol), and should only be an absolute URI if proxy support is
-        enabled in the server.
-
-        If the application under test generates absolute URIs, be sure
-        to wrap them first with :py:func:`strip_netloc`::
-
-            >>> class MyAppWebCase(WebCase):
-            ...     def getPage(url, *args, **kwargs):
-            ...         super(MyAppWebCase, self).getPage(
-            ...             cheroot.test.webtest.strip_netloc(url),
-            ...             *args, **kwargs
-            ...         )
-
-        ``raise_subcls`` is passed through to :py:func:`openURL`.
-        """
-        ServerError.on = False
-
-        if isinstance(url, str):
-            url = url.encode('utf-8')
-        if isinstance(body, str):
-            body = body.encode('utf-8')
-
-        # for compatibility, support raise_subcls is None
-        raise_subcls = raise_subcls or ()
-
-        self.url = url
-        self.time = None
-        start = time.time()
-        result = openURL(
-            url, headers, method, body, self.HOST, self.PORT,
-            self.HTTP_CONN, protocol or self.PROTOCOL,
-            raise_subcls=raise_subcls,
-            ssl_context=self.ssl_context,
-        )
-        self.time = time.time() - start
-        self.status, self.headers, self.body = result
-
-        # Build a list of request cookies from the previous response cookies.
-        self.cookies = [
-            ('Cookie', v) for k, v in self.headers
-            if k.lower() == 'set-cookie'
-        ]
-
-        if ServerError.on:
-            raise ServerError()
-        return result
-
-    @NonDataProperty
-    def interactive(self):
-        """Determine whether tests are run in interactive mode.
-
-        Load interactivity setting from environment, where
-        the value can be numeric or a string like true or
-        False or 1 or 0.
-        """
-        env_str = os.environ.get('WEBTEST_INTERACTIVE', 'True')
-        is_interactive = bool(json.loads(env_str.lower()))
-        if is_interactive:
-            warnings.warn(
-                'Interactive test failure interceptor support via '
-                'WEBTEST_INTERACTIVE environment variable is deprecated.',
-                DeprecationWarning,
-            )
-        return is_interactive
-
-    console_height = 30
-
-    def _handlewebError(self, msg):  # noqa: C901  # FIXME
-        print('')
-        print('    ERROR: %s' % msg)
-
-        if not self.interactive:
-            raise self.failureException(msg)
-
-        p = (
-            '    Show: '
-            '[B]ody [H]eaders [S]tatus [U]RL; '
-            '[I]gnore, [R]aise, or sys.e[X]it >> '
-        )
-        sys.stdout.write(p)
-        sys.stdout.flush()
-        while True:
-            i = getchar().upper()
-            if not isinstance(i, type('')):
-                i = i.decode('ascii')
-            if i not in 'BHSUIRX':
-                continue
-            print(i.upper())  # Also prints new line
-            if i == 'B':
-                for x, line in enumerate(self.body.splitlines()):
-                    if (x + 1) % self.console_height == 0:
-                        # The \r and comma should make the next line overwrite
-                        sys.stdout.write('<-- More -->\r')
-                        m = getchar().lower()
-                        # Erase our "More" prompt
-                        sys.stdout.write('            \r')
-                        if m == 'q':
-                            break
-                    print(line)
-            elif i == 'H':
-                pprint.pprint(self.headers)
-            elif i == 'S':
-                print(self.status)
-            elif i == 'U':
-                print(self.url)
-            elif i == 'I':
-                # return without raising the normal exception
-                return
-            elif i == 'R':
-                raise self.failureException(msg)
-            elif i == 'X':
-                sys.exit()
-            sys.stdout.write(p)
-            sys.stdout.flush()
-
-    @property
-    def status_code(self):  # noqa: D401; irrelevant for properties
-        """Integer HTTP status code."""
-        return int(self.status[:3])
-
-    def status_matches(self, expected):
-        """Check whether actual status matches expected."""
-        actual = (
-            self.status_code
-            if isinstance(expected, int) else
-            self.status
-        )
-        return expected == actual
-
-    def assertStatus(self, status, msg=None):
-        """Fail if self.status != status.
-
-        status may be integer code, exact string status, or
-        iterable of allowed possibilities.
-        """
-        if any(map(self.status_matches, always_iterable(status))):
-            return
-
-        tmpl = 'Status {self.status} does not match {status}'
-        msg = msg or tmpl.format(**locals())
-        self._handlewebError(msg)
-
-    def assertHeader(self, key, value=None, msg=None):
-        """Fail if (key, [value]) not in self.headers."""
-        lowkey = key.lower()
-        for k, v in self.headers:
-            if k.lower() == lowkey:
-                if value is None or str(value) == v:
-                    return v
-
-        if msg is None:
-            if value is None:
-                msg = '%r not in headers' % key
-            else:
-                msg = '%r:%r not in headers' % (key, value)
-        self._handlewebError(msg)
-
-    def assertHeaderIn(self, key, values, msg=None):
-        """Fail if header indicated by key doesn't have one of the values."""
-        lowkey = key.lower()
-        for k, v in self.headers:
-            if k.lower() == lowkey:
-                matches = [value for value in values if str(value) == v]
-                if matches:
-                    return matches
-
-        if msg is None:
-            msg = '%(key)r not in %(values)r' % vars()
-        self._handlewebError(msg)
-
-    def assertHeaderItemValue(self, key, value, msg=None):
-        """Fail if the header does not contain the specified value."""
-        actual_value = self.assertHeader(key, msg=msg)
-        header_values = map(str.strip, actual_value.split(','))
-        if value in header_values:
-            return value
-
-        if msg is None:
-            msg = '%r not in %r' % (value, header_values)
-        self._handlewebError(msg)
-
-    def assertNoHeader(self, key, msg=None):
-        """Fail if key in self.headers."""
-        lowkey = key.lower()
-        matches = [k for k, v in self.headers if k.lower() == lowkey]
-        if matches:
-            if msg is None:
-                msg = '%r in headers' % key
-            self._handlewebError(msg)
-
-    def assertNoHeaderItemValue(self, key, value, msg=None):
-        """Fail if the header contains the specified value."""
-        lowkey = key.lower()
-        hdrs = self.headers
-        matches = [k for k, v in hdrs if k.lower() == lowkey and v == value]
-        if matches:
-            if msg is None:
-                msg = '%r:%r in %r' % (key, value, hdrs)
-            self._handlewebError(msg)
-
-    def assertBody(self, value, msg=None):
-        """Fail if value != self.body."""
-        if isinstance(value, str):
-            value = value.encode(self.encoding)
-        if value != self.body:
-            if msg is None:
-                msg = 'expected body:\n%r\n\nactual body:\n%r' % (
-                    value, self.body,
-                )
-            self._handlewebError(msg)
-
-    def assertInBody(self, value, msg=None):
-        """Fail if value not in self.body."""
-        if isinstance(value, str):
-            value = value.encode(self.encoding)
-        if value not in self.body:
-            if msg is None:
-                msg = '%r not in body: %s' % (value, self.body)
-            self._handlewebError(msg)
-
-    def assertNotInBody(self, value, msg=None):
-        """Fail if value in self.body."""
-        if isinstance(value, str):
-            value = value.encode(self.encoding)
-        if value in self.body:
-            if msg is None:
-                msg = '%r found in body' % value
-            self._handlewebError(msg)
-
-    def assertMatchesBody(self, pattern, msg=None, flags=0):
-        """Fail if value (a regex pattern) is not in self.body."""
-        if isinstance(pattern, str):
-            pattern = pattern.encode(self.encoding)
-        if re.search(pattern, self.body, flags) is None:
-            if msg is None:
-                msg = 'No match for %r in body' % pattern
-            self._handlewebError(msg)
-
-
-methods_with_bodies = ('POST', 'PUT', 'PATCH')
-
-
-def cleanHeaders(headers, method, body, host, port):
-    """Return request headers, with required headers added (if missing)."""
-    if headers is None:
-        headers = []
-
-    # Add the required Host request header if not present.
-    # [This specifies the host:port of the server, not the client.]
-    found = False
-    for k, _v in headers:
-        if k.lower() == 'host':
-            found = True
-            break
-    if not found:
-        if port == 80:
-            headers.append(('Host', host))
-        else:
-            headers.append(('Host', '%s:%s' % (host, port)))
-
-    if method in methods_with_bodies:
-        # Stick in default type and length headers if not present
-        found = False
-        for k, v in headers:
-            if k.lower() == 'content-type':
-                found = True
-                break
-        if not found:
-            headers.append(
-                ('Content-Type', 'application/x-www-form-urlencoded'),
-            )
-            headers.append(('Content-Length', str(len(body or ''))))
-
-    return headers
-
-
-def shb(response):
-    """Return status, headers, body the way we like from a response."""
-    resp_status_line = '%s %s' % (response.status, response.reason)
-
-    return resp_status_line, response.getheaders(), response.read()
-
-
-def openURL(*args, raise_subcls=(), **kwargs):
-    """
-    Open a URL, retrying when it fails.
-
-    Specify ``raise_subcls`` (class or tuple of classes) to exclude
-    those socket.error subclasses from being suppressed and retried.
-    """
-    opener = functools.partial(_open_url_once, *args, **kwargs)
-
-    def on_exception():
-        exc = sys.exc_info()[1]
-        if isinstance(exc, raise_subcls):
-            raise exc
-        time.sleep(0.5)
-
-    # Try up to 10 times
-    return jaraco.functools.retry_call(
-        opener,
-        retries=9,
-        cleanup=on_exception,
-        trap=socket.error,
-    )
-
-
-def _open_url_once(
-    url, headers=None, method='GET', body=None,
-    host='127.0.0.1', port=8000, http_conn=http.client.HTTPConnection,
-    protocol='HTTP/1.1', ssl_context=None,
-):
-    """Open the given HTTP resource and return status, headers, and body."""
-    headers = cleanHeaders(headers, method, body, host, port)
-
-    # Allow http_conn to be a class or an instance
-    if hasattr(http_conn, 'host'):
-        conn = http_conn
-    else:
-        kw = {}
-        if ssl_context:
-            kw['context'] = ssl_context
-        conn = http_conn(interface(host), port, **kw)
-    conn._http_vsn_str = protocol
-    conn._http_vsn = int(''.join([x for x in protocol if x.isdigit()]))
-    if isinstance(url, bytes):
-        url = url.decode()
-    conn.putrequest(
-        method.upper(), url, skip_host=True,
-        skip_accept_encoding=True,
-    )
-    for key, value in headers:
-        conn.putheader(key, value.encode('Latin-1'))
-    conn.endheaders()
-    if body is not None:
-        conn.send(body)
-    # Handle response
-    response = conn.getresponse()
-    s, h, b = shb(response)
-    if not hasattr(http_conn, 'host'):
-        # We made our own conn instance. Close it.
-        conn.close()
-    return s, h, b
-
-
-def strip_netloc(url):
-    """Return absolute-URI path from URL.
-
-    Strip the scheme and host from the URL, returning the
-    server-absolute portion.
-
-    Useful for wrapping an absolute-URI for which only the
-    path is expected (such as in calls to :py:meth:`WebCase.getPage`).
-
-    .. testsetup::
-
-       from cheroot.test.webtest import strip_netloc
-
-    >>> strip_netloc('https://google.com/foo/bar?bing#baz')
-    '/foo/bar?bing'
-
-    >>> strip_netloc('//google.com/foo/bar?bing#baz')
-    '/foo/bar?bing'
-
-    >>> strip_netloc('/foo/bar?bing#baz')
-    '/foo/bar?bing'
-    """
-    parsed = urllib.parse.urlparse(url)
-    _scheme, _netloc, path, params, query, _fragment = parsed
-    stripped = '', '', path, params, query, ''
-    return urllib.parse.urlunparse(stripped)
-
-
-# Add any exceptions which your web framework handles
-# normally (that you don't want server_error to trap).
-ignored_exceptions = []
-
-# You'll want set this to True when you can't guarantee
-# that each response will immediately follow each request;
-# for example, when handling requests via multiple threads.
-ignore_all = False
-
-
-class ServerError(Exception):
-    """Exception for signalling server error."""
-
-    on = False
-
-
-def server_error(exc=None):
-    """Server debug hook.
-
-    Return True if exception handled, False if ignored.
-    You probably want to wrap this, so you can still handle an error using
-    your framework when it's ignored.
-    """
-    if exc is None:
-        exc = sys.exc_info()
-
-    if ignore_all or exc[0] in ignored_exceptions:
-        return False
-    else:
-        ServerError.on = True
-        print('')
-        print(''.join(traceback.format_exception(*exc)))
-        return True
diff --git a/lib/cheroot/testing.py b/lib/cheroot/testing.py
deleted file mode 100644
index 5457a4b1..00000000
--- a/lib/cheroot/testing.py
+++ /dev/null
@@ -1,174 +0,0 @@
-"""Pytest fixtures and other helpers for doing testing by end-users."""
-
-from contextlib import closing, contextmanager
-import errno
-import socket
-import threading
-import time
-import http.client
-
-import pytest
-
-import cheroot.server
-from cheroot.test import webtest
-import cheroot.wsgi
-
-EPHEMERAL_PORT = 0
-NO_INTERFACE = None  # Using this or '' will cause an exception
-ANY_INTERFACE_IPV4 = '0.0.0.0'
-ANY_INTERFACE_IPV6 = '::'
-
-config = {
-    cheroot.wsgi.Server: {
-        'bind_addr': (NO_INTERFACE, EPHEMERAL_PORT),
-        'wsgi_app': None,
-    },
-    cheroot.server.HTTPServer: {
-        'bind_addr': (NO_INTERFACE, EPHEMERAL_PORT),
-        'gateway': cheroot.server.Gateway,
-    },
-}
-
-
-@contextmanager
-def cheroot_server(server_factory):  # noqa: WPS210
-    """Set up and tear down a Cheroot server instance."""
-    conf = config[server_factory].copy()
-    bind_port = conf.pop('bind_addr')[-1]
-
-    for interface in ANY_INTERFACE_IPV6, ANY_INTERFACE_IPV4:
-        try:
-            actual_bind_addr = (interface, bind_port)
-            httpserver = server_factory(  # create it
-                bind_addr=actual_bind_addr,
-                **conf,
-            )
-        except OSError:
-            pass
-        else:
-            break
-
-    httpserver.shutdown_timeout = 0  # Speed-up tests teardown
-
-    # FIXME: Expose this thread through a fixture so that it
-    # FIXME: could be awaited in tests.
-    server_thread = threading.Thread(target=httpserver.safe_start)
-    server_thread.start()  # spawn it
-    while not httpserver.ready:  # wait until fully initialized and bound
-        time.sleep(0.1)
-
-    try:
-        yield server_thread, httpserver
-    finally:
-        httpserver.stop()  # destroy it
-        server_thread.join()  # wait for the thread to be turn down
-
-
-@pytest.fixture
-def thread_and_wsgi_server():
-    """Set up and tear down a Cheroot WSGI server instance.
-
-    This emits a tuple of a thread and a server instance.
-    """
-    with cheroot_server(cheroot.wsgi.Server) as (server_thread, srv):
-        yield server_thread, srv
-
-
-@pytest.fixture
-def thread_and_native_server():
-    """Set up and tear down a Cheroot HTTP server instance.
-
-    This emits a tuple of a thread and a server instance.
-    """
-    with cheroot_server(cheroot.server.HTTPServer) as (server_thread, srv):
-        yield server_thread, srv
-
-
-@pytest.fixture
-def wsgi_server(thread_and_wsgi_server):  # noqa: WPS442
-    """Set up and tear down a Cheroot WSGI server instance."""
-    _server_thread, srv = thread_and_wsgi_server
-    return srv
-
-
-@pytest.fixture
-def native_server(thread_and_native_server):  # noqa: WPS442
-    """Set up and tear down a Cheroot HTTP server instance."""
-    _server_thread, srv = thread_and_native_server
-    return srv
-
-
-class _TestClient:
-    def __init__(self, server):
-        self._interface, self._host, self._port = _get_conn_data(
-            server.bind_addr,
-        )
-        self.server_instance = server
-        self._http_connection = self.get_connection()
-
-    def get_connection(self):
-        name = '{interface}:{port}'.format(
-            interface=self._interface,
-            port=self._port,
-        )
-        conn_cls = (
-            http.client.HTTPConnection
-            if self.server_instance.ssl_adapter is None else
-            http.client.HTTPSConnection
-        )
-        return conn_cls(name)
-
-    def request(
-        self, uri, method='GET', headers=None, http_conn=None,
-        protocol='HTTP/1.1',
-    ):
-        return webtest.openURL(
-            uri, method=method,
-            headers=headers,
-            host=self._host, port=self._port,
-            http_conn=http_conn or self._http_connection,
-            protocol=protocol,
-        )
-
-    def __getattr__(self, attr_name):
-        def _wrapper(uri, **kwargs):
-            http_method = attr_name.upper()
-            return self.request(uri, method=http_method, **kwargs)
-
-        return _wrapper
-
-
-def _probe_ipv6_sock(interface):
-    # Alternate way is to check IPs on interfaces using glibc, like:
-    # github.com/Gautier/minifail/blob/master/minifail/getifaddrs.py
-    try:
-        with closing(socket.socket(family=socket.AF_INET6)) as sock:
-            sock.bind((interface, 0))
-    except OSError as sock_err:
-        if sock_err.errno != errno.EADDRNOTAVAIL:
-            raise
-    else:
-        return True
-
-    return False
-
-
-def _get_conn_data(bind_addr):
-    if isinstance(bind_addr, tuple):
-        host, port = bind_addr
-    else:
-        host, port = bind_addr, 0
-
-    interface = webtest.interface(host)
-
-    if ':' in interface and not _probe_ipv6_sock(interface):
-        interface = '127.0.0.1'
-        if ':' in host:
-            host = interface
-
-    return interface, host, port
-
-
-def get_server_client(server):
-    """Create and return a test client for the given server."""
-    return _TestClient(server)
diff --git a/lib/cheroot/testing.pyi b/lib/cheroot/testing.pyi
deleted file mode 100644
index 4c825f98..00000000
--- a/lib/cheroot/testing.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-from typing import Any, Iterator, Optional, TypeVar
-
-from .server import HTTPServer
-from .wsgi import Server
-
-T = TypeVar('T', bound=HTTPServer)
-
-EPHEMERAL_PORT: int
-NO_INTERFACE: Optional[str]
-ANY_INTERFACE_IPV4: str
-ANY_INTERFACE_IPV6: str
-config: dict
-
-def cheroot_server(server_factory: T) -> Iterator[T]: ...
-def wsgi_server() -> Iterator[Server]: ...
-def native_server() -> Iterator[HTTPServer]: ...
-def get_server_client(server) -> Any: ...
diff --git a/lib/cheroot/workers/__init__.py b/lib/cheroot/workers/__init__.py
deleted file mode 100644
index 098b8f25..00000000
--- a/lib/cheroot/workers/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""HTTP workers pool."""
diff --git a/lib/cheroot/workers/__init__.pyi b/lib/cheroot/workers/__init__.pyi
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/cheroot/workers/threadpool.py b/lib/cheroot/workers/threadpool.py
deleted file mode 100644
index cd28450a..00000000
--- a/lib/cheroot/workers/threadpool.py
+++ /dev/null
@@ -1,426 +0,0 @@
-"""A thread-based worker pool.
-
-.. spelling::
-
-   joinable
-"""
-
-import collections
-import logging
-import threading
-import time
-import socket
-import warnings
-import queue
-
-from jaraco.functools import pass_none
-
-
-__all__ = ('WorkerThread', 'ThreadPool')
-
-
-class TrueyZero:
-    """Object which equals and does math like the integer 0 but evals True."""
-
-    def __add__(self, other):
-        return other
-
-    def __radd__(self, other):
-        return other
-
-
-trueyzero = TrueyZero()
-
-_SHUTDOWNREQUEST = object()
-
-
-class WorkerThread(threading.Thread):
-    """Thread which continuously polls a Queue for Connection objects.
-
-    Due to the timing issues of polling a Queue, a WorkerThread does not
-    check its own 'ready' flag after it has started. To stop the thread,
-    it is necessary to stick a _SHUTDOWNREQUEST object onto the Queue
-    (one for each running WorkerThread).
-    """
-
-    conn = None
-    """The current connection pulled off the Queue, or None."""
-
-    server = None
-    """The HTTP Server which spawned this thread, and which owns the
-    Queue and is placing active connections into it."""
-
-    ready = False
-    """A simple flag for the calling server to know when this thread
-    has begun polling the Queue."""
-
-    def __init__(self, server):
-        """Initialize WorkerThread instance.
-
-        Args:
-            server (cheroot.server.HTTPServer): web server object
-                receiving this request
-        """
-        self.ready = False
-        self.server = server
-
-        self.requests_seen = 0
-        self.bytes_read = 0
-        self.bytes_written = 0
-        self.start_time = None
-        self.work_time = 0
-        self.stats = {
-            'Requests': lambda s: self.requests_seen + (
-                self.start_time is None
-                and trueyzero
-                or self.conn.requests_seen
-            ),
-            'Bytes Read': lambda s: self.bytes_read + (
-                self.start_time is None
-                and trueyzero
-                or self.conn.rfile.bytes_read
-            ),
-            'Bytes Written': lambda s: self.bytes_written + (
-                self.start_time is None
-                and trueyzero
-                or self.conn.wfile.bytes_written
-            ),
-            'Work Time': lambda s: self.work_time + (
-                self.start_time is None
-                and trueyzero
-                or time.time() - self.start_time
-            ),
-            'Read Throughput': lambda s: s['Bytes Read'](s) / (
-                s['Work Time'](s) or 1e-6
-            ),
-            'Write Throughput': lambda s: s['Bytes Written'](s) / (
-                s['Work Time'](s) or 1e-6
-            ),
-        }
-        threading.Thread.__init__(self)
-
-    def run(self):
-        """Set up incoming HTTP connection processing loop.
-
-        This is the thread's entry-point. It performs lop-layer
-        exception handling and interrupt processing.
-        :exc:`KeyboardInterrupt` and :exc:`SystemExit` bubbling up
-        from the inner-layer code constitute a global server interrupt
-        request. When they happen, the worker thread exits.
-
-        :raises BaseException: when an unexpected non-interrupt
-                               exception leaks from the inner layers
-
-        # noqa: DAR401 KeyboardInterrupt SystemExit
-        """
-        self.server.stats['Worker Threads'][self.name] = self.stats
-        self.ready = True
-        try:
-            self._process_connections_until_interrupted()
-        except (KeyboardInterrupt, SystemExit) as interrupt_exc:
-            interrupt_cause = interrupt_exc.__cause__ or interrupt_exc
-            self.server.error_log(
-                f'Setting the server interrupt flag to {interrupt_cause !r}',
-                level=logging.DEBUG,
-            )
-            self.server.interrupt = interrupt_cause
-        except BaseException as underlying_exc:  # noqa: WPS424
-            # NOTE: This is the last resort logging with the last dying breath
-            # NOTE: of the worker. It is only reachable when exceptions happen
-            # NOTE: in the `finally` branch of the internal try/except block.
-            self.server.error_log(
-                'A fatal exception happened. Setting the server interrupt flag'
-                f' to {underlying_exc !r} and giving up.'
-                '\N{NEW LINE}\N{NEW LINE}'
-                'Please, report this on the Cheroot tracker at '
-                '<https://github.com/cherrypy/cheroot/issues/new/choose>, '
-                'providing a full reproducer with as much context and details as possible.',
-                level=logging.CRITICAL,
-                traceback=True,
-            )
-            self.server.interrupt = underlying_exc
-            raise
-        finally:
-            self.ready = False
-
-    def _process_connections_until_interrupted(self):
-        """Process incoming HTTP connections in an infinite loop.
-
-        Retrieves incoming connections from thread pool, processing
-        them one by one.
-
-        :raises SystemExit: on the internal requests to stop the
-                            server instance
-        """
-        while True:
-            conn = self.server.requests.get()
-            if conn is _SHUTDOWNREQUEST:
-                return
-
-            self.conn = conn
-            is_stats_enabled = self.server.stats['Enabled']
-            if is_stats_enabled:
-                self.start_time = time.time()
-            keep_conn_open = False
-            try:
-                keep_conn_open = conn.communicate()
-            except ConnectionError as connection_error:
-                keep_conn_open = False  # Drop the connection cleanly
-                self.server.error_log(
-                    'Got a connection error while handling a '
-                    f'connection from {conn.remote_addr !s}:'
-                    f'{conn.remote_port !s} ({connection_error !s})',
-                    level=logging.INFO,
-                )
-                continue
-            except (KeyboardInterrupt, SystemExit) as shutdown_request:
-                # Shutdown request
-                keep_conn_open = False  # Drop the connection cleanly
-                self.server.error_log(
-                    'Got a server shutdown request while handling a '
-                    f'connection from {conn.remote_addr !s}:'
-                    f'{conn.remote_port !s} ({shutdown_request !s})',
-                    level=logging.DEBUG,
-                )
-                raise SystemExit(
-                    str(shutdown_request),
-                ) from shutdown_request
-            except BaseException as unhandled_error:  # noqa: WPS424
-                # NOTE: Only a shutdown request should bubble up to the
-                # NOTE: external cleanup code. Otherwise, this thread dies.
-                # NOTE: If this were to happen, the threadpool would still
-                # NOTE: list a dead thread without knowing its state. And
-                # NOTE: the calling code would fail to schedule processing
-                # NOTE: of new requests.
-                self.server.error_log(
-                    'Unhandled error while processing an incoming '
-                    f'connection {unhandled_error !r}',
-                    level=logging.ERROR,
-                    traceback=True,
-                )
-                continue  # Prevent the thread from dying
-            finally:
-                # NOTE: Any exceptions coming from within `finally` may
-                # NOTE: kill the thread, causing the threadpool to only
-                # NOTE: contain references to dead threads rendering the
-                # NOTE: server defunct, effectively meaning a DoS.
-                # NOTE: Ideally, things called here should process
-                # NOTE: everything recoverable internally. Any unhandled
-                # NOTE: errors will bubble up into the outer try/except
-                # NOTE: block. They will be treated as fatal and turned
-                # NOTE: into server shutdown requests and then reraised
-                # NOTE: unconditionally.
-                if keep_conn_open:
-                    self.server.put_conn(conn)
-                else:
-                    conn.close()
-                if is_stats_enabled:
-                    self.requests_seen += conn.requests_seen
-                    self.bytes_read += conn.rfile.bytes_read
-                    self.bytes_written += conn.wfile.bytes_written
-                    self.work_time += time.time() - self.start_time
-                    self.start_time = None
-                self.conn = None
-
-
-class ThreadPool:
-    """A Request Queue for an HTTPServer which pools threads.
-
-    ThreadPool objects must provide min, get(), put(obj), start()
-    and stop(timeout) attributes.
-    """
-
-    def __init__(
-            self, server, min=10, max=-1, accepted_queue_size=-1,
-            accepted_queue_timeout=10,
-    ):
-        """Initialize HTTP requests queue instance.
-
-        Args:
-            server (cheroot.server.HTTPServer): web server object
-                receiving this request
-            min (int): minimum number of worker threads
-            max (int): maximum number of worker threads (-1/inf for no max)
-            accepted_queue_size (int): maximum number of active
-                requests in queue
-            accepted_queue_timeout (int): timeout for putting request
-                into queue
-
-        :raises ValueError: if the min/max values are invalid
-        :raises TypeError: if the max is not an integer or inf
-        """
-        if min < 1:
-            raise ValueError(f'min={min!s} must be > 0')
-
-        if max == float('inf'):
-            pass
-        elif not isinstance(max, int) or max == 0:
-            raise TypeError(
-                'Expected an integer or the infinity value for the `max` '
-                f'argument but got {max!r}.',
-            )
-        elif max < 0:
-            max = float('inf')
-
-        if max < min:
-            raise ValueError(
-                f'max={max!s} must be > min={min!s} (or infinity for no max)',
-            )
-
-        self.server = server
-        self.min = min
-        self.max = max
-        self._threads = []
-        self._queue = queue.Queue(maxsize=accepted_queue_size)
-        self._queue_put_timeout = accepted_queue_timeout
-        self.get = self._queue.get
-        self._pending_shutdowns = collections.deque()
-
-    def start(self):
-        """Start the pool of threads.
-
-        :raises RuntimeError: if the pool is already started
-        """
-        if self._threads:
-            raise RuntimeError('Threadpools can only be started once.')
-        self.grow(self.min)
-
-    @property
-    def idle(self):  # noqa: D401; irrelevant for properties
-        """Number of worker threads which are idle. Read-only."""  # noqa: D401
-        idles = len([t for t in self._threads if t.conn is None])
-        return max(idles - len(self._pending_shutdowns), 0)
-
-    def put(self, obj):
-        """Put request into queue.
-
-        Args:
-            obj (:py:class:`~cheroot.server.HTTPConnection`): HTTP connection
-                waiting to be processed
-        """
-        self._queue.put(obj, block=True, timeout=self._queue_put_timeout)
-
-    def _clear_dead_threads(self):
-        # Remove any dead threads from our list
-        for t in [t for t in self._threads if not t.is_alive()]:
-            self._threads.remove(t)
-            try:
-                self._pending_shutdowns.popleft()
-            except IndexError:
-                pass
-
-    def grow(self, amount):
-        """Spawn new worker threads (not above self.max)."""
-        budget = max(self.max - len(self._threads), 0)
-        n_new = min(amount, budget)
-
-        workers = [self._spawn_worker() for i in range(n_new)]
-        for worker in workers:
-            while not worker.ready:
-                time.sleep(.1)
-        self._threads.extend(workers)
-
-    def _spawn_worker(self):
-        worker = WorkerThread(self.server)
-        worker.name = (
-            'CP Server {worker_name!s}'.
-            format(worker_name=worker.name)
-        )
-        worker.start()
-        return worker
-
-    def shrink(self, amount):
-        """Kill off worker threads (not below self.min)."""
-        # Grow/shrink the pool if necessary.
-        # Remove any dead threads from our list
-        amount -= len(self._pending_shutdowns)
-        self._clear_dead_threads()
-        if amount <= 0:
-            return
-
-        # calculate the number of threads above the minimum
-        n_extra = max(len(self._threads) - self.min, 0)
-
-        # don't remove more than amount
-        n_to_remove = min(amount, n_extra)
-
-        # put shutdown requests on the queue equal to the number of threads
-        # to remove. As each request is processed by a worker, that worker
-        # will terminate and be culled from the list.
-        for _ in range(n_to_remove):
-            self._pending_shutdowns.append(None)
-            self._queue.put(_SHUTDOWNREQUEST)
-
-    def stop(self, timeout=5):
-        """Terminate all worker threads.
-
-        Args:
-            timeout (int): time to wait for threads to stop gracefully
-        """
-        # for compatability, negative timeouts are treated like None
-        # TODO: treat negative timeouts like already expired timeouts
-        if timeout is not None and timeout < 0:
-            timeout = None
-            warnings.warning(
-                'In the future, negative timeouts to Server.stop() '
-                'will be equivalent to a timeout of zero.',
-                stacklevel=2,
-            )
-
-        if timeout is not None:
-            endtime = time.time() + timeout
-
-        # Must shut down threads here so the code that calls
-        # this method can know when all threads are stopped.
-        for worker in self._threads:
-            self._queue.put(_SHUTDOWNREQUEST)
-
-        ignored_errors = (
-            # Raised when start_response called >1 time w/o exc_info or
-            # wsgi write is called before start_response. See cheroot#261
-            RuntimeError,
-            # Ignore repeated Ctrl-C. See cherrypy#691.
-            KeyboardInterrupt,
-        )
-
-        for worker in self._clear_threads():
-            remaining_time = timeout and endtime - time.time()
-            try:
-                worker.join(remaining_time)
-                if worker.is_alive():
-                    # Timeout exhausted; forcibly shut down the socket.
-                    self._force_close(worker.conn)
-                    worker.join()
-            except ignored_errors:
-                pass
-
-    @staticmethod
-    @pass_none
-    def _force_close(conn):
-        if conn.rfile.closed:
-            return
-        try:
-            try:
-                conn.socket.shutdown(socket.SHUT_RD)
-            except TypeError:
-                # pyOpenSSL sockets don't take an arg
-                conn.socket.shutdown()
-        except OSError:
-            # shutdown sometimes fails (race with 'closed' check?)
-            # ref #238
-            pass
-
-    def _clear_threads(self):
-        """Clear self._threads and yield all joinable threads."""
-        # threads = pop_all(self._threads)
-        threads, self._threads[:] = self._threads[:], []
-        return (
-            thread
-            for thread in threads
-            if thread is not threading.current_thread()
-        )
-
-    @property
-    def qsize(self):
-        """Return the queue size."""
-        return self._queue.qsize()
diff --git a/lib/cheroot/workers/threadpool.pyi b/lib/cheroot/workers/threadpool.pyi
deleted file mode 100644
index 201d3914..00000000
--- a/lib/cheroot/workers/threadpool.pyi
+++ /dev/null
@@ -1,37 +0,0 @@
-import threading
-from typing import Any
-
-class TrueyZero:
-    def __add__(self, other): ...
-    def __radd__(self, other): ...
-
-trueyzero: TrueyZero
-
-class WorkerThread(threading.Thread):
-    conn: Any
-    server: Any
-    ready: bool
-    requests_seen: int
-    bytes_read: int
-    bytes_written: int
-    start_time: Any
-    work_time: int
-    stats: Any
-    def __init__(self, server): ...
-    def run(self) -> None: ...
-
-class ThreadPool:
-    server: Any
-    min: Any
-    max: Any
-    get: Any
-    def __init__(self, server, min: int = ..., max: int = ..., accepted_queue_size: int = ..., accepted_queue_timeout: int = ...) -> None: ...
-    def start(self) -> None: ...
-    @property
-    def idle(self): ...
-    def put(self, obj) -> None: ...
-    def grow(self, amount) -> None: ...
-    def shrink(self, amount) -> None: ...
-    def stop(self, timeout: int = ...) -> None: ...
-    @property
-    def qsize(self) -> int: ...
diff --git a/lib/cheroot/wsgi.py b/lib/cheroot/wsgi.py
deleted file mode 100644
index 1dbe10ee..00000000
--- a/lib/cheroot/wsgi.py
+++ /dev/null
@@ -1,412 +0,0 @@
-"""This class holds Cheroot WSGI server implementation.
-
-Simplest example on how to use this server::
-
-    from cheroot import wsgi
-
-    def my_crazy_app(environ, start_response):
-        status = '200 OK'
-        response_headers = [('Content-type','text/plain')]
-        start_response(status, response_headers)
-        return [b'Hello world!']
-
-    addr = '0.0.0.0', 8070
-    server = wsgi.Server(addr, my_crazy_app)
-    server.start()
-
-The Cheroot WSGI server can serve as many WSGI applications
-as you want in one instance by using a PathInfoDispatcher::
-
-    path_map = {
-        '/': my_crazy_app,
-        '/blog': my_blog_app,
-    }
-    d = wsgi.PathInfoDispatcher(path_map)
-    server = wsgi.Server(addr, d)
-"""
-
-import sys
-
-from . import server
-from .workers import threadpool
-from ._compat import ntob, bton
-
-
-class Server(server.HTTPServer):
-    """A subclass of HTTPServer which calls a WSGI application."""
-
-    wsgi_version = (1, 0)
-    """The version of WSGI to produce."""
-
-    def __init__(
-        self, bind_addr, wsgi_app, numthreads=10, server_name=None,
-        max=-1, request_queue_size=5, timeout=10, shutdown_timeout=5,
-        accepted_queue_size=-1, accepted_queue_timeout=10,
-        peercreds_enabled=False, peercreds_resolve_enabled=False,
-        reuse_port=False,
-    ):
-        """Initialize WSGI Server instance.
-
-        Args:
-            bind_addr (tuple): network interface to listen to
-            wsgi_app (callable): WSGI application callable
-            numthreads (int): number of threads for WSGI thread pool
-            server_name (str): web server name to be advertised via
-                Server HTTP header
-            max (int): maximum number of worker threads
-            request_queue_size (int): the 'backlog' arg to
-                socket.listen(); max queued connections
-            timeout (int): the timeout in seconds for accepted connections
-            shutdown_timeout (int): the total time, in seconds, to
-                wait for worker threads to cleanly exit
-            accepted_queue_size (int): maximum number of active
-                requests in queue
-            accepted_queue_timeout (int): timeout for putting request
-                into queue
-        """
-        super(Server, self).__init__(
-            bind_addr,
-            gateway=wsgi_gateways[self.wsgi_version],
-            server_name=server_name,
-            peercreds_enabled=peercreds_enabled,
-            peercreds_resolve_enabled=peercreds_resolve_enabled,
-            reuse_port=reuse_port,
-        )
-        self.wsgi_app = wsgi_app
-        self.request_queue_size = request_queue_size
-        self.timeout = timeout
-        self.shutdown_timeout = shutdown_timeout
-        self.requests = threadpool.ThreadPool(
-            self, min=numthreads or 1, max=max,
-            accepted_queue_size=accepted_queue_size,
-            accepted_queue_timeout=accepted_queue_timeout,
-        )
-
-    @property
-    def numthreads(self):
-        """Set minimum number of threads."""
-        return self.requests.min
-
-    @numthreads.setter
-    def numthreads(self, value):
-        self.requests.min = value
-
-
-class Gateway(server.Gateway):
-    """A base class to interface HTTPServer with WSGI."""
-
-    def __init__(self, req):
-        """Initialize WSGI Gateway instance with request.
-
-        Args:
-            req (HTTPRequest): current HTTP request
-        """
-        super(Gateway, self).__init__(req)
-        self.started_response = False
-        self.env = self.get_environ()
-        self.remaining_bytes_out = None
-
-    @classmethod
-    def gateway_map(cls):
-        """Create a mapping of gateways and their versions.
-
-        Returns:
-            dict[tuple[int,int],class]: map of gateway version and
-                corresponding class
-
-        """
-        return {gw.version: gw for gw in cls.__subclasses__()}
-
-    def get_environ(self):
-        """Return a new environ dict targeting the given wsgi.version."""
-        raise NotImplementedError  # pragma: no cover
-
-    def respond(self):
-        """Process the current request.
-
-        From :pep:`333`:
-
-            The start_response callable must not actually transmit
-            the response headers. Instead, it must store them for the
-            server or gateway to transmit only after the first
-            iteration of the application return value that yields
-            a NON-EMPTY string, or upon the application's first
-            invocation of the write() callable.
-        """
-        response = self.req.server.wsgi_app(self.env, self.start_response)
-        try:
-            for chunk in filter(None, response):
-                if not isinstance(chunk, bytes):
-                    raise ValueError('WSGI Applications must yield bytes')
-                self.write(chunk)
-        finally:
-            # Send headers if not already sent
-            self.req.ensure_headers_sent()
-            if hasattr(response, 'close'):
-                response.close()
-
-    def start_response(self, status, headers, exc_info=None):  # noqa: WPS238
-        """WSGI callable to begin the HTTP response."""
-        # "The application may call start_response more than once,
-        # if and only if the exc_info argument is provided."
-        if self.started_response and not exc_info:
-            raise RuntimeError(
-                'WSGI start_response called a second '
-                'time with no exc_info.',
-            )
-        self.started_response = True
-
-        # "if exc_info is provided, and the HTTP headers have already been
-        # sent, start_response must raise an error, and should raise the
-        # exc_info tuple."
-        if self.req.sent_headers:
-            value = exc_info[1]
-            raise value
-
-        self.req.status = self._encode_status(status)
-
-        for k, v in headers:
-            if not isinstance(k, str):
-                raise TypeError(
-                    'WSGI response header key %r is not of type str.' % k,
-                )
-            if not isinstance(v, str):
-                raise TypeError(
-                    'WSGI response header value %r is not of type str.' % v,
-                )
-            if k.lower() == 'content-length':
-                self.remaining_bytes_out = int(v)
-            out_header = ntob(k), ntob(v)
-            self.req.outheaders.append(out_header)
-
-        return self.write
-
-    @staticmethod
-    def _encode_status(status):
-        """Cast status to bytes representation of current Python version.
-
-        According to :pep:`3333`, when using Python 3, the response status
-        and headers must be bytes masquerading as Unicode; that is, they
-        must be of type "str" but are restricted to code points in the
-        "Latin-1" set.
-        """
-        if not isinstance(status, str):
-            raise TypeError('WSGI response status is not of type str.')
-        return status.encode('ISO-8859-1')
-
-    def write(self, chunk):
-        """WSGI callable to write unbuffered data to the client.
-
-        This method is also used internally by start_response (to write
-        data from the iterable returned by the WSGI application).
-        """
-        if not self.started_response:
-            raise RuntimeError('WSGI write called before start_response.')
-
-        chunklen = len(chunk)
-        rbo = self.remaining_bytes_out
-        if rbo is not None and chunklen > rbo:
-            if not self.req.sent_headers:
-                # Whew. We can send a 500 to the client.
-                self.req.simple_response(
-                    '500 Internal Server Error',
-                    'The requested resource returned more bytes than the '
-                    'declared Content-Length.',
-                )
-            else:
-                # Dang. We have probably already sent data. Truncate the chunk
-                # to fit (so the client doesn't hang) and raise an error later.
-                chunk = chunk[:rbo]
-
-        self.req.ensure_headers_sent()
-
-        self.req.write(chunk)
-
-        if rbo is not None:
-            rbo -= chunklen
-            if rbo < 0:
-                raise ValueError(
-                    'Response body exceeds the declared Content-Length.',
-                )
-
-
-class Gateway_10(Gateway):
-    """A Gateway class to interface HTTPServer with WSGI 1.0.x."""
-
-    version = 1, 0
-
-    def get_environ(self):
-        """Return a new environ dict targeting the given wsgi.version."""
-        req = self.req
-        req_conn = req.conn
-        env = {
-            # set a non-standard environ entry so the WSGI app can know what
-            # the *real* server protocol is (and what features to support).
-            # See http://www.faqs.org/rfcs/rfc2145.html.
-            'ACTUAL_SERVER_PROTOCOL': req.server.protocol,
-            'PATH_INFO': bton(req.path),
-            'QUERY_STRING': bton(req.qs),
-            'REMOTE_ADDR': req_conn.remote_addr or '',
-            'REMOTE_PORT': str(req_conn.remote_port or ''),
-            'REQUEST_METHOD': bton(req.method),
-            'REQUEST_URI': bton(req.uri),
-            'SCRIPT_NAME': '',
-            'SERVER_NAME': req.server.server_name,
-            # Bah. "SERVER_PROTOCOL" is actually the REQUEST protocol.
-            'SERVER_PROTOCOL': bton(req.request_protocol),
-            'SERVER_SOFTWARE': req.server.software,
-            'wsgi.errors': sys.stderr,
-            'wsgi.input': req.rfile,
-            'wsgi.input_terminated': bool(req.chunked_read),
-            'wsgi.multiprocess': False,
-            'wsgi.multithread': True,
-            'wsgi.run_once': False,
-            'wsgi.url_scheme': bton(req.scheme),
-            'wsgi.version': self.version,
-        }
-
-        if isinstance(req.server.bind_addr, str):
-            # AF_UNIX. This isn't really allowed by WSGI, which doesn't
-            # address unix domain sockets. But it's better than nothing.
-            env['SERVER_PORT'] = ''
-            try:
-                env['X_REMOTE_PID'] = str(req_conn.peer_pid)
-                env['X_REMOTE_UID'] = str(req_conn.peer_uid)
-                env['X_REMOTE_GID'] = str(req_conn.peer_gid)
-
-                env['X_REMOTE_USER'] = str(req_conn.peer_user)
-                env['X_REMOTE_GROUP'] = str(req_conn.peer_group)
-
-                env['REMOTE_USER'] = env['X_REMOTE_USER']
-            except RuntimeError:
-                """Unable to retrieve peer creds data.
-
-                Unsupported by current kernel or socket error happened, or
-                unsupported socket type, or disabled.
-                """
-        else:
-            env['SERVER_PORT'] = str(req.server.bind_addr[1])
-
-        # Request headers
-        env.update(
-            (
-                'HTTP_{header_name!s}'.
-                format(header_name=bton(k).upper().replace('-', '_')),
-                bton(v),
-            )
-            for k, v in req.inheaders.items()
-        )
-
-        # CONTENT_TYPE/CONTENT_LENGTH
-        ct = env.pop('HTTP_CONTENT_TYPE', None)
-        if ct is not None:
-            env['CONTENT_TYPE'] = ct
-        cl = env.pop('HTTP_CONTENT_LENGTH', None)
-        if cl is not None:
-            env['CONTENT_LENGTH'] = cl
-
-        if req.conn.ssl_env:
-            env.update(req.conn.ssl_env)
-
-        return env
-
-
-class Gateway_u0(Gateway_10):
-    """A Gateway class to interface HTTPServer with WSGI u.0.
-
-    WSGI u.0 is an experimental protocol, which uses Unicode for keys
-    and values in both Python 2 and Python 3.
-    """
-
-    version = 'u', 0
-
-    def get_environ(self):
-        """Return a new environ dict targeting the given wsgi.version."""
-        req = self.req
-        env_10 = super(Gateway_u0, self).get_environ()
-        env = dict(env_10.items())
-
-        # Request-URI
-        enc = env.setdefault('wsgi.url_encoding', 'utf-8')
-        try:
-            env['PATH_INFO'] = req.path.decode(enc)
-            env['QUERY_STRING'] = req.qs.decode(enc)
-        except UnicodeDecodeError:
-            # Fall back to latin 1 so apps can transcode if needed.
-            env['wsgi.url_encoding'] = 'ISO-8859-1'
-            env['PATH_INFO'] = env_10['PATH_INFO']
-            env['QUERY_STRING'] = env_10['QUERY_STRING']
-
-        env.update(env.items())
-
-        return env
-
-
-wsgi_gateways = Gateway.gateway_map()
-
-
-class PathInfoDispatcher:
-    """A WSGI dispatcher for dispatch based on the PATH_INFO."""
-
-    def __init__(self, apps):
-        """Initialize path info WSGI app dispatcher.
-
-        Args:
-            apps (dict[str,object]|list[tuple[str,object]]): URI prefix
-                and WSGI app pairs
-        """
-        try:
-            apps = list(apps.items())
-        except AttributeError:
-            pass
-
-        # Sort the apps by len(path), descending
-        def by_path_len(app):
-            return len(app[0])
-        apps.sort(key=by_path_len, reverse=True)
-
-        # The path_prefix strings must start, but not end, with a slash.
-        # Use "" instead of "/".
-        self.apps = [(p.rstrip('/'), a) for p, a in apps]
-
-    def __call__(self, environ, start_response):
-        """Process incoming WSGI request.
-
-        Ref: :pep:`3333`
-
-        Args:
-            environ (Mapping): a dict containing WSGI environment variables
-            start_response (callable): function, which sets response
-                status and headers
-
-        Returns:
-            list[bytes]: iterable containing bytes to be returned in
-                HTTP response body
-
-        """
-        path = environ['PATH_INFO'] or '/'
-        for p, app in self.apps:
-            # The apps list should be sorted by length, descending.
-            if path.startswith('{path!s}/'.format(path=p)) or path == p:
-                environ = environ.copy()
-                environ['SCRIPT_NAME'] = environ.get('SCRIPT_NAME', '') + p
-                environ['PATH_INFO'] = path[len(p):]
-                return app(environ, start_response)
-
-        start_response(
-            '404 Not Found', [
-                ('Content-Type', 'text/plain'),
-                ('Content-Length', '0'),
-            ],
-        )
-        return ['']
-
-
-# compatibility aliases
-globals().update(
-    WSGIServer=Server,
-    WSGIGateway=Gateway,
-    WSGIGateway_u0=Gateway_u0,
-    WSGIGateway_10=Gateway_10,
-    WSGIPathInfoDispatcher=PathInfoDispatcher,
-)
diff --git a/lib/cheroot/wsgi.pyi b/lib/cheroot/wsgi.pyi
deleted file mode 100644
index f96a18f9..00000000
--- a/lib/cheroot/wsgi.pyi
+++ /dev/null
@@ -1,49 +0,0 @@
-from . import server
-from typing import Any
-
-class Server(server.HTTPServer):
-    wsgi_version: Any
-    wsgi_app: Any
-    request_queue_size: Any
-    timeout: Any
-    shutdown_timeout: Any
-    requests: Any
-    def __init__(self, bind_addr, wsgi_app, numthreads: int = ..., server_name: Any | None = ..., max: int = ..., request_queue_size: int = ..., timeout: int = ..., shutdown_timeout: int = ..., accepted_queue_size: int = ..., accepted_queue_timeout: int = ..., peercreds_enabled: bool = ..., peercreds_resolve_enabled: bool = ..., reuse_port: bool = ...) -> None: ...
-    @property
-    def numthreads(self): ...
-    @numthreads.setter
-    def numthreads(self, value) -> None: ...
-
-class Gateway(server.Gateway):
-    started_response: bool
-    env: Any
-    remaining_bytes_out: Any
-    def __init__(self, req) -> None: ...
-    @classmethod
-    def gateway_map(cls): ...
-    def get_environ(self) -> None: ...
-    def respond(self) -> None: ...
-    def start_response(self, status, headers, exc_info: Any | None = ...): ...
-    def write(self, chunk) -> None: ...
-
-class Gateway_10(Gateway):
-    version: Any
-    def get_environ(self): ...
-
-class Gateway_u0(Gateway_10):
-    version: Any
-    def get_environ(self): ...
-
-wsgi_gateways: Any
-
-class PathInfoDispatcher:
-    apps: Any
-    def __init__(self, apps): ...
-    def __call__(self, environ, start_response): ...
-
-
-WSGIServer = Server
-WSGIGateway = Gateway
-WSGIGateway_u0 = Gateway_u0
-WSGIGateway_10 = Gateway_10
-WSGIPathInfoDispatcher = PathInfoDispatcher
diff --git a/lib/cherrypy/__init__.py b/lib/cherrypy/__init__.py
index 49e955f8..6779f170 100644
--- a/lib/cherrypy/__init__.py
+++ b/lib/cherrypy/__init__.py
@@ -1,5 +1,6 @@
 """CherryPy is a pythonic, object-oriented HTTP framework.
 
+
 CherryPy consists of not one, but four separate API layers.
 
 The APPLICATION LAYER is the simplest. CherryPy applications are written as
@@ -52,74 +53,69 @@ with customized or extended components. The core API's are:
  * Server API
  * WSGI API
 
-These API's are described in the `CherryPy specification
-<https://github.com/cherrypy/cherrypy/wiki/CherryPySpec>`_.
+These API's are described in the `CherryPy specification <https://bitbucket.org/cherrypy/cherrypy/wiki/CherryPySpec>`_.
 """
 
+__version__ = "3.8.0"
+
+from cherrypy._cpcompat import urljoin as _urljoin, urlencode as _urlencode
+from cherrypy._cpcompat import basestring, unicodestr, set
+
+from cherrypy._cperror import HTTPError, HTTPRedirect, InternalRedirect
+from cherrypy._cperror import NotFound, CherryPyException, TimeoutError
+
+from cherrypy import _cpdispatch as dispatch
+
+from cherrypy import _cptools
+tools = _cptools.default_toolbox
+Tool = _cptools.Tool
+
+from cherrypy import _cprequest
+from cherrypy.lib import httputil as _httputil
+
+from cherrypy import _cptree
+tree = _cptree.Tree()
+from cherrypy._cptree import Application
+from cherrypy import _cpwsgi as wsgi
+
+from cherrypy import process
 try:
-    import importlib.metadata as importlib_metadata
-except ImportError:
-    # fall back for python <= 3.7
-    # This try/except can be removed with py <= 3.7 support
-    import importlib_metadata
-
-from threading import local as _local
-
-from ._cperror import (
-    HTTPError, HTTPRedirect, InternalRedirect,
-    NotFound, CherryPyException,
-)
-
-from . import _cpdispatch as dispatch
-
-from ._cptools import default_toolbox as tools, Tool
-from ._helper import expose, popargs, url
-
-from . import _cprequest, _cpserver, _cptree, _cplogging, _cpconfig
-
-import cherrypy.lib.httputil as _httputil
-
-from ._cptree import Application
-from . import _cpwsgi as wsgi
-
-from . import process
-try:
-    from .process import win32
+    from cherrypy.process import win32
     engine = win32.Win32Bus()
     engine.console_control_handler = win32.ConsoleCtrlHandler(engine)
     del win32
 except ImportError:
     engine = process.bus
 
-from . import _cpchecker
-
-__all__ = (
-    'HTTPError', 'HTTPRedirect', 'InternalRedirect',
-    'NotFound', 'CherryPyException',
-    'dispatch', 'tools', 'Tool', 'Application',
-    'wsgi', 'process', 'tree', 'engine',
-    'quickstart', 'serving', 'request', 'response', 'thread_data',
-    'log', 'expose', 'popargs', 'url', 'config',
-)
-
-
-__import__('cherrypy._cptools')
-__import__('cherrypy._cprequest')
-
-
-tree = _cptree.Tree()
-
-
-try:
-    __version__ = importlib_metadata.version('cherrypy')
-except Exception:
-    __version__ = 'unknown'
-
 
+# Timeout monitor. We add two channels to the engine
+# to which cherrypy.Application will publish.
 engine.listeners['before_request'] = set()
 engine.listeners['after_request'] = set()
 
 
+class _TimeoutMonitor(process.plugins.Monitor):
+
+    def __init__(self, bus):
+        self.servings = []
+        process.plugins.Monitor.__init__(self, bus, self.run)
+
+    def before_request(self):
+        self.servings.append((serving.request, serving.response))
+
+    def after_request(self):
+        try:
+            self.servings.remove((serving.request, serving.response))
+        except ValueError:
+            pass
+
+    def run(self):
+        """Check timeout on all responses. (Internal)"""
+        for req, resp in self.servings:
+            resp.check_timeout()
+engine.timeout_monitor = _TimeoutMonitor(engine)
+engine.timeout_monitor.subscribe()
+
 engine.autoreload = process.plugins.Autoreloader(engine)
 engine.autoreload.subscribe()
 
@@ -130,30 +126,29 @@ engine.signal_handler = process.plugins.SignalHandler(engine)
 
 
 class _HandleSignalsPlugin(object):
-    """Handle signals from other processes.
 
-    Based on the configured platform handlers above.
-    """
+    """Handle signals from other processes based on the configured
+    platform handlers above."""
 
     def __init__(self, bus):
         self.bus = bus
 
     def subscribe(self):
-        """Add the handlers based on the platform."""
-        if hasattr(self.bus, 'signal_handler'):
+        """Add the handlers based on the platform"""
+        if hasattr(self.bus, "signal_handler"):
             self.bus.signal_handler.subscribe()
-        if hasattr(self.bus, 'console_control_handler'):
+        if hasattr(self.bus, "console_control_handler"):
             self.bus.console_control_handler.subscribe()
 
-
 engine.signals = _HandleSignalsPlugin(engine)
 
 
+from cherrypy import _cpserver
 server = _cpserver.Server()
 server.subscribe()
 
 
-def quickstart(root=None, script_name='', config=None):
+def quickstart(root=None, script_name="", config=None):
     """Mount the given root, start the builtin server (and engine), then block.
 
     root: an instance of a "controller class" (a collection of page handler
@@ -180,31 +175,31 @@ def quickstart(root=None, script_name='', config=None):
     engine.block()
 
 
+from cherrypy._cpcompat import threadlocal as _local
+
+
 class _Serving(_local):
+
     """An interface for registering request and response objects.
 
-    Rather than have a separate "thread local" object for the request
-    and the response, this class works as a single threadlocal container
-    for both objects (and any others which developers wish to define).
-    In this way, we can easily dump those objects when we stop/start a
-    new HTTP conversation, yet still refer to them as module-level
-    globals in a thread-safe way.
+    Rather than have a separate "thread local" object for the request and
+    the response, this class works as a single threadlocal container for
+    both objects (and any others which developers wish to define). In this
+    way, we can easily dump those objects when we stop/start a new HTTP
+    conversation, yet still refer to them as module-level globals in a
+    thread-safe way.
     """
 
-    request = _cprequest.Request(_httputil.Host('127.0.0.1', 80),
-                                 _httputil.Host('127.0.0.1', 1111))
-    """The request object for the current thread.
-
-    In the main thread, and any threads which are not receiving HTTP
-    requests, this is None.
+    request = _cprequest.Request(_httputil.Host("127.0.0.1", 80),
+                                 _httputil.Host("127.0.0.1", 1111))
     """
+    The request object for the current thread. In the main thread,
+    and any threads which are not receiving HTTP requests, this is None."""
 
     response = _cprequest.Response()
-    """The response object for the current thread.
-
-    In the main thread, and any threads which are not receiving HTTP
-    requests, this is None.
     """
+    The response object for the current thread. In the main thread,
+    and any threads which are not receiving HTTP requests, this is None."""
 
     def load(self, request, response):
         self.request = request
@@ -214,7 +209,6 @@ class _Serving(_local):
         """Remove all attributes of self."""
         self.__dict__.clear()
 
-
 serving = _Serving()
 
 
@@ -230,7 +224,7 @@ class _ThreadLocalProxy(object):
         return getattr(child, name)
 
     def __setattr__(self, name, value):
-        if name in ('__attrname__', ):
+        if name in ("__attrname__", ):
             object.__setattr__(self, name, value)
         else:
             child = getattr(serving, self.__attrname__)
@@ -240,12 +234,12 @@ class _ThreadLocalProxy(object):
         child = getattr(serving, self.__attrname__)
         delattr(child, name)
 
-    @property
-    def __dict__(self):
+    def _get_dict(self):
         child = getattr(serving, self.__attrname__)
         d = child.__class__.__dict__.copy()
         d.update(child.__dict__)
         return d
+    __dict__ = property(_get_dict)
 
     def __getitem__(self, key):
         child = getattr(serving, self.__attrname__)
@@ -273,7 +267,6 @@ class _ThreadLocalProxy(object):
     # Python 3
     __bool__ = __nonzero__
 
-
 # Create request and response object (the same objects will be used
 #   throughout the entire life of the webserver, but will redirect
 #   to the "serving" object)
@@ -284,9 +277,8 @@ response = _ThreadLocalProxy('response')
 
 
 class _ThreadData(_local):
+
     """A container for thread-specific data."""
-
-
 thread_data = _ThreadData()
 
 
@@ -300,7 +292,6 @@ def _cherrypy_pydoc_resolve(thing, forceload=0):
         thing = getattr(serving, thing.__attrname__)
     return _pydoc._builtin_resolve(thing, forceload)
 
-
 try:
     import pydoc as _pydoc
     _pydoc._builtin_resolve = _pydoc.resolve
@@ -309,7 +300,11 @@ except ImportError:
     pass
 
 
+from cherrypy import _cplogging
+
+
 class _GlobalLogManager(_cplogging.LogManager):
+
     """A site-wide LogManager; routes to app.log or global log as appropriate.
 
     This :class:`LogManager<cherrypy._cplogging.LogManager>` implements
@@ -320,13 +315,10 @@ class _GlobalLogManager(_cplogging.LogManager):
     """
 
     def __call__(self, *args, **kwargs):
-        """Log the given message to the app.log or global log.
-
-        Log the given message to the app.log or global log as
-        appropriate.
+        """Log the given message to the app.log or global log as appropriate.
         """
         # Do NOT use try/except here. See
-        # https://github.com/cherrypy/cherrypy/issues/945
+        # https://bitbucket.org/cherrypy/cherrypy/issue/945
         if hasattr(request, 'app') and hasattr(request.app, 'log'):
             log = request.app.log
         else:
@@ -334,10 +326,7 @@ class _GlobalLogManager(_cplogging.LogManager):
         return log.error(*args, **kwargs)
 
     def access(self):
-        """Log an access message to the app.log or global log.
-
-        Log the given message to the app.log or global log as
-        appropriate.
+        """Log an access message to the app.log or global log as appropriate.
         """
         try:
             return request.app.log.access()
@@ -353,11 +342,297 @@ log.error_file = ''
 log.access_file = ''
 
 
-@engine.subscribe('log')
 def _buslog(msg, level):
     log.error(msg, 'ENGINE', severity=level)
+engine.subscribe('log', _buslog)
+
+#                       Helper functions for CP apps                       #
 
 
+def expose(func=None, alias=None):
+    """Expose the function, optionally providing an alias or set of aliases."""
+    def expose_(func):
+        func.exposed = True
+        if alias is not None:
+            if isinstance(alias, basestring):
+                parents[alias.replace(".", "_")] = func
+            else:
+                for a in alias:
+                    parents[a.replace(".", "_")] = func
+        return func
+
+    import sys
+    import types
+    if isinstance(func, (types.FunctionType, types.MethodType)):
+        if alias is None:
+            # @expose
+            func.exposed = True
+            return func
+        else:
+            # func = expose(func, alias)
+            parents = sys._getframe(1).f_locals
+            return expose_(func)
+    elif func is None:
+        if alias is None:
+            # @expose()
+            parents = sys._getframe(1).f_locals
+            return expose_
+        else:
+            # @expose(alias="alias") or
+            # @expose(alias=["alias1", "alias2"])
+            parents = sys._getframe(1).f_locals
+            return expose_
+    else:
+        # @expose("alias") or
+        # @expose(["alias1", "alias2"])
+        parents = sys._getframe(1).f_locals
+        alias = func
+        return expose_
+
+
+def popargs(*args, **kwargs):
+    """A decorator for _cp_dispatch
+    (cherrypy.dispatch.Dispatcher.dispatch_method_name).
+
+    Optional keyword argument: handler=(Object or Function)
+
+    Provides a _cp_dispatch function that pops off path segments into
+    cherrypy.request.params under the names specified.  The dispatch
+    is then forwarded on to the next vpath element.
+
+    Note that any existing (and exposed) member function of the class that
+    popargs is applied to will override that value of the argument.  For
+    instance, if you have a method named "list" on the class decorated with
+    popargs, then accessing "/list" will call that function instead of popping
+    it off as the requested parameter.  This restriction applies to all
+    _cp_dispatch functions.  The only way around this restriction is to create
+    a "blank class" whose only function is to provide _cp_dispatch.
+
+    If there are path elements after the arguments, or more arguments
+    are requested than are available in the vpath, then the 'handler'
+    keyword argument specifies the next object to handle the parameterized
+    request.  If handler is not specified or is None, then self is used.
+    If handler is a function rather than an instance, then that function
+    will be called with the args specified and the return value from that
+    function used as the next object INSTEAD of adding the parameters to
+    cherrypy.request.args.
+
+    This decorator may be used in one of two ways:
+
+    As a class decorator:
+    @cherrypy.popargs('year', 'month', 'day')
+    class Blog:
+        def index(self, year=None, month=None, day=None):
+            #Process the parameters here; any url like
+            #/, /2009, /2009/12, or /2009/12/31
+            #will fill in the appropriate parameters.
+
+        def create(self):
+            #This link will still be available at /create.  Defined functions
+            #take precedence over arguments.
+
+    Or as a member of a class:
+    class Blog:
+        _cp_dispatch = cherrypy.popargs('year', 'month', 'day')
+        #...
+
+    The handler argument may be used to mix arguments with built in functions.
+    For instance, the following setup allows different activities at the
+    day, month, and year level:
+
+    class DayHandler:
+        def index(self, year, month, day):
+            #Do something with this day; probably list entries
+
+        def delete(self, year, month, day):
+            #Delete all entries for this day
+
+    @cherrypy.popargs('day', handler=DayHandler())
+    class MonthHandler:
+        def index(self, year, month):
+            #Do something with this month; probably list entries
+
+        def delete(self, year, month):
+            #Delete all entries for this month
+
+    @cherrypy.popargs('month', handler=MonthHandler())
+    class YearHandler:
+        def index(self, year):
+            #Do something with this year
+
+        #...
+
+    @cherrypy.popargs('year', handler=YearHandler())
+    class Root:
+        def index(self):
+            #...
+
+    """
+
+    # Since keyword arg comes after *args, we have to process it ourselves
+    # for lower versions of python.
+
+    handler = None
+    handler_call = False
+    for k, v in kwargs.items():
+        if k == 'handler':
+            handler = v
+        else:
+            raise TypeError(
+                "cherrypy.popargs() got an unexpected keyword argument '{0}'"
+                .format(k)
+            )
+
+    import inspect
+
+    if handler is not None \
+            and (hasattr(handler, '__call__') or inspect.isclass(handler)):
+        handler_call = True
+
+    def decorated(cls_or_self=None, vpath=None):
+        if inspect.isclass(cls_or_self):
+            # cherrypy.popargs is a class decorator
+            cls = cls_or_self
+            setattr(cls, dispatch.Dispatcher.dispatch_method_name, decorated)
+            return cls
+
+        # We're in the actual function
+        self = cls_or_self
+        parms = {}
+        for arg in args:
+            if not vpath:
+                break
+            parms[arg] = vpath.pop(0)
+
+        if handler is not None:
+            if handler_call:
+                return handler(**parms)
+            else:
+                request.params.update(parms)
+                return handler
+
+        request.params.update(parms)
+
+        # If we are the ultimate handler, then to prevent our _cp_dispatch
+        # from being called again, we will resolve remaining elements through
+        # getattr() directly.
+        if vpath:
+            return getattr(self, vpath.pop(0), None)
+        else:
+            return self
+
+    return decorated
+
+
+def url(path="", qs="", script_name=None, base=None, relative=None):
+    """Create an absolute URL for the given path.
+
+    If 'path' starts with a slash ('/'), this will return
+        (base + script_name + path + qs).
+    If it does not start with a slash, this returns
+        (base + script_name [+ request.path_info] + path + qs).
+
+    If script_name is None, cherrypy.request will be used
+    to find a script_name, if available.
+
+    If base is None, cherrypy.request.base will be used (if available).
+    Note that you can use cherrypy.tools.proxy to change this.
+
+    Finally, note that this function can be used to obtain an absolute URL
+    for the current request path (minus the querystring) by passing no args.
+    If you call url(qs=cherrypy.request.query_string), you should get the
+    original browser URL (assuming no internal redirections).
+
+    If relative is None or not provided, request.app.relative_urls will
+    be used (if available, else False). If False, the output will be an
+    absolute URL (including the scheme, host, vhost, and script_name).
+    If True, the output will instead be a URL that is relative to the
+    current request path, perhaps including '..' atoms. If relative is
+    the string 'server', the output will instead be a URL that is
+    relative to the server root; i.e., it will start with a slash.
+    """
+    if isinstance(qs, (tuple, list, dict)):
+        qs = _urlencode(qs)
+    if qs:
+        qs = '?' + qs
+
+    if request.app:
+        if not path.startswith("/"):
+            # Append/remove trailing slash from path_info as needed
+            # (this is to support mistyped URL's without redirecting;
+            # if you want to redirect, use tools.trailing_slash).
+            pi = request.path_info
+            if request.is_index is True:
+                if not pi.endswith('/'):
+                    pi = pi + '/'
+            elif request.is_index is False:
+                if pi.endswith('/') and pi != '/':
+                    pi = pi[:-1]
+
+            if path == "":
+                path = pi
+            else:
+                path = _urljoin(pi, path)
+
+        if script_name is None:
+            script_name = request.script_name
+        if base is None:
+            base = request.base
+
+        newurl = base + script_name + path + qs
+    else:
+        # No request.app (we're being called outside a request).
+        # We'll have to guess the base from server.* attributes.
+        # This will produce very different results from the above
+        # if you're using vhosts or tools.proxy.
+        if base is None:
+            base = server.base()
+
+        path = (script_name or "") + path
+        newurl = base + path + qs
+
+    if './' in newurl:
+        # Normalize the URL by removing ./ and ../
+        atoms = []
+        for atom in newurl.split('/'):
+            if atom == '.':
+                pass
+            elif atom == '..':
+                atoms.pop()
+            else:
+                atoms.append(atom)
+        newurl = '/'.join(atoms)
+
+    # At this point, we should have a fully-qualified absolute URL.
+
+    if relative is None:
+        relative = getattr(request.app, "relative_urls", False)
+
+    # See http://www.ietf.org/rfc/rfc2396.txt
+    if relative == 'server':
+        # "A relative reference beginning with a single slash character is
+        # termed an absolute-path reference, as defined by <abs_path>..."
+        # This is also sometimes called "server-relative".
+        newurl = '/' + '/'.join(newurl.split('/', 3)[3:])
+    elif relative:
+        # "A relative reference that does not begin with a scheme name
+        # or a slash character is termed a relative-path reference."
+        old = url(relative=False).split('/')[:-1]
+        new = newurl.split('/')
+        while old and new:
+            a, b = old[0], new[0]
+            if a != b:
+                break
+            old.pop(0)
+            new.pop(0)
+        new = (['..'] * len(old)) + new
+        newurl = '/'.join(new)
+
+    return newurl
+
+
+# import _cpconfig last so it can reference other top-level objects
+from cherrypy import _cpconfig
 # Use _global_conf_alias so quickstart can use 'config' as an arg
 # without shadowing cherrypy.config.
 config = _global_conf_alias = _cpconfig.Config()
@@ -367,10 +642,11 @@ config.defaults = {
     'tools.trailing_slash.on': True,
     'tools.encode.on': True
 }
-config.namespaces['log'] = lambda k, v: setattr(log, k, v)
-config.namespaces['checker'] = lambda k, v: setattr(checker, k, v)
+config.namespaces["log"] = lambda k, v: setattr(log, k, v)
+config.namespaces["checker"] = lambda k, v: setattr(checker, k, v)
 # Must reset to get our defaults applied.
 config.reset()
 
+from cherrypy import _cpchecker
 checker = _cpchecker.Checker()
 engine.subscribe('start', checker)
diff --git a/lib/cherrypy/__main__.py b/lib/cherrypy/__main__.py
index 6674f7cb..b1c9c012 100644
--- a/lib/cherrypy/__main__.py
+++ b/lib/cherrypy/__main__.py
@@ -1,5 +1,4 @@
-"""CherryPy'd cherryd daemon runner."""
-from cherrypy.daemon import run
+import cherrypy.daemon
 
-
-__name__ == '__main__' and run()
+if __name__ == '__main__':
+    cherrypy.daemon.run()
diff --git a/lib/cherrypy/_cpchecker.py b/lib/cherrypy/_cpchecker.py
index 096b19c3..4ef82597 100644
--- a/lib/cherrypy/_cpchecker.py
+++ b/lib/cherrypy/_cpchecker.py
@@ -1,12 +1,12 @@
-"""Checker for CherryPy sites and mounted apps."""
 import os
 import warnings
-import builtins
 
 import cherrypy
+from cherrypy._cpcompat import iteritems, copykeys, builtins
 
 
 class Checker(object):
+
     """A checker for CherryPy sites and their mounted applications.
 
     When this object is called at engine startup, it executes each
@@ -24,7 +24,6 @@ class Checker(object):
     """If True (the default), run all checks; if False, turn off all checks."""
 
     def __init__(self):
-        """Initialize Checker instance."""
         self._populate_known_types()
 
     def __call__(self):
@@ -34,7 +33,7 @@ class Checker(object):
             warnings.formatwarning = self.formatwarning
             try:
                 for name in dir(self):
-                    if name.startswith('check_'):
+                    if name.startswith("check_"):
                         method = getattr(self, name)
                         if method and hasattr(method, '__call__'):
                             method()
@@ -42,14 +41,15 @@ class Checker(object):
                 warnings.formatwarning = oldformatwarning
 
     def formatwarning(self, message, category, filename, lineno, line=None):
-        """Format a warning."""
-        return 'CherryPy Checker:\n%s\n\n' % message
+        """Function to format a warning."""
+        return "CherryPy Checker:\n%s\n\n" % message
 
     # This value should be set inside _cpconfig.
     global_config_contained_paths = False
 
     def check_app_config_entries_dont_start_with_script_name(self):
-        """Check for App config with sections that repeat script_name."""
+        """Check for Application config with sections that repeat script_name.
+        """
         for sn, app in cherrypy.tree.apps.items():
             if not isinstance(app, cherrypy.Application):
                 continue
@@ -57,36 +57,36 @@ class Checker(object):
                 continue
             if sn == '':
                 continue
-            sn_atoms = sn.strip('/').split('/')
+            sn_atoms = sn.strip("/").split("/")
             for key in app.config.keys():
-                key_atoms = key.strip('/').split('/')
+                key_atoms = key.strip("/").split("/")
                 if key_atoms[:len(sn_atoms)] == sn_atoms:
                     warnings.warn(
-                        'The application mounted at %r has config '
-                        'entries that start with its script name: %r' % (sn,
+                        "The application mounted at %r has config "
+                        "entries that start with its script name: %r" % (sn,
                                                                          key))
 
     def check_site_config_entries_in_app_config(self):
         """Check for mounted Applications that have site-scoped config."""
-        for sn, app in cherrypy.tree.apps.items():
+        for sn, app in iteritems(cherrypy.tree.apps):
             if not isinstance(app, cherrypy.Application):
                 continue
 
             msg = []
-            for section, entries in app.config.items():
+            for section, entries in iteritems(app.config):
                 if section.startswith('/'):
-                    for key, value in entries.items():
-                        for n in ('engine.', 'server.', 'tree.', 'checker.'):
+                    for key, value in iteritems(entries):
+                        for n in ("engine.", "server.", "tree.", "checker."):
                             if key.startswith(n):
-                                msg.append('[%s] %s = %s' %
+                                msg.append("[%s] %s = %s" %
                                            (section, key, value))
             if msg:
                 msg.insert(0,
-                           'The application mounted at %r contains the '
-                           'following config entries, which are only allowed '
-                           'in site-wide config. Move them to a [global] '
-                           'section and pass them to cherrypy.config.update() '
-                           'instead of tree.mount().' % sn)
+                           "The application mounted at %r contains the "
+                           "following config entries, which are only allowed "
+                           "in site-wide config. Move them to a [global] "
+                           "section and pass them to cherrypy.config.update() "
+                           "instead of tree.mount()." % sn)
                 warnings.warn(os.linesep.join(msg))
 
     def check_skipped_app_config(self):
@@ -95,30 +95,32 @@ class Checker(object):
             if not isinstance(app, cherrypy.Application):
                 continue
             if not app.config:
-                msg = 'The Application mounted at %r has an empty config.' % sn
+                msg = "The Application mounted at %r has an empty config." % sn
                 if self.global_config_contained_paths:
-                    msg += (' It looks like the config you passed to '
-                            'cherrypy.config.update() contains application-'
-                            'specific sections. You must explicitly pass '
-                            'application config via '
-                            'cherrypy.tree.mount(..., config=app_config)')
+                    msg += (" It looks like the config you passed to "
+                            "cherrypy.config.update() contains application-"
+                            "specific sections. You must explicitly pass "
+                            "application config via "
+                            "cherrypy.tree.mount(..., config=app_config)")
                 warnings.warn(msg)
                 return
 
     def check_app_config_brackets(self):
-        """Check for App config with extraneous brackets in section names."""
+        """Check for Application config with extraneous brackets in section
+        names.
+        """
         for sn, app in cherrypy.tree.apps.items():
             if not isinstance(app, cherrypy.Application):
                 continue
             if not app.config:
                 continue
             for key in app.config.keys():
-                if key.startswith('[') or key.endswith(']'):
+                if key.startswith("[") or key.endswith("]"):
                     warnings.warn(
-                        'The application mounted at %r has config '
-                        'section names with extraneous brackets: %r. '
-                        'Config *files* need brackets; config *dicts* '
-                        '(e.g. passed to tree.mount) do not.' % (sn, key))
+                        "The application mounted at %r has config "
+                        "section names with extraneous brackets: %r. "
+                        "Config *files* need brackets; config *dicts* "
+                        "(e.g. passed to tree.mount) do not." % (sn, key))
 
     def check_static_paths(self):
         """Check Application config for incorrect static paths."""
@@ -130,47 +132,47 @@ class Checker(object):
             request.app = app
             for section in app.config:
                 # get_resource will populate request.config
-                request.get_resource(section + '/dummy.html')
+                request.get_resource(section + "/dummy.html")
                 conf = request.config.get
 
-                if conf('tools.staticdir.on', False):
-                    msg = ''
-                    root = conf('tools.staticdir.root')
-                    dir = conf('tools.staticdir.dir')
+                if conf("tools.staticdir.on", False):
+                    msg = ""
+                    root = conf("tools.staticdir.root")
+                    dir = conf("tools.staticdir.dir")
                     if dir is None:
-                        msg = 'tools.staticdir.dir is not set.'
+                        msg = "tools.staticdir.dir is not set."
                     else:
-                        fulldir = ''
+                        fulldir = ""
                         if os.path.isabs(dir):
                             fulldir = dir
                             if root:
-                                msg = ('dir is an absolute path, even '
-                                       'though a root is provided.')
+                                msg = ("dir is an absolute path, even "
+                                       "though a root is provided.")
                                 testdir = os.path.join(root, dir[1:])
                                 if os.path.exists(testdir):
                                     msg += (
-                                        '\nIf you meant to serve the '
-                                        'filesystem folder at %r, remove the '
-                                        'leading slash from dir.' % (testdir,))
+                                        "\nIf you meant to serve the "
+                                        "filesystem folder at %r, remove the "
+                                        "leading slash from dir." % (testdir,))
                         else:
                             if not root:
                                 msg = (
-                                    'dir is a relative path and '
-                                    'no root provided.')
+                                    "dir is a relative path and "
+                                    "no root provided.")
                             else:
                                 fulldir = os.path.join(root, dir)
                                 if not os.path.isabs(fulldir):
-                                    msg = ('%r is not an absolute path.' % (
+                                    msg = ("%r is not an absolute path." % (
                                         fulldir,))
 
                         if fulldir and not os.path.exists(fulldir):
                             if msg:
-                                msg += '\n'
-                            msg += ('%r (root + dir) is not an existing '
-                                    'filesystem path.' % fulldir)
+                                msg += "\n"
+                            msg += ("%r (root + dir) is not an existing "
+                                    "filesystem path." % fulldir)
 
                     if msg:
-                        warnings.warn('%s\nsection: [%s]\nroot: %r\ndir: %r'
+                        warnings.warn("%s\nsection: [%s]\nroot: %r\ndir: %r"
                                       % (msg, section, root, dir))
 
     # -------------------------- Compatibility -------------------------- #
@@ -194,21 +196,21 @@ class Checker(object):
         """Process config and warn on each obsolete or deprecated entry."""
         for section, conf in config.items():
             if isinstance(conf, dict):
-                for k in conf:
+                for k, v in conf.items():
                     if k in self.obsolete:
-                        warnings.warn('%r is obsolete. Use %r instead.\n'
-                                      'section: [%s]' %
+                        warnings.warn("%r is obsolete. Use %r instead.\n"
+                                      "section: [%s]" %
                                       (k, self.obsolete[k], section))
                     elif k in self.deprecated:
-                        warnings.warn('%r is deprecated. Use %r instead.\n'
-                                      'section: [%s]' %
+                        warnings.warn("%r is deprecated. Use %r instead.\n"
+                                      "section: [%s]" %
                                       (k, self.deprecated[k], section))
             else:
                 if section in self.obsolete:
-                    warnings.warn('%r is obsolete. Use %r instead.'
+                    warnings.warn("%r is obsolete. Use %r instead."
                                   % (section, self.obsolete[section]))
                 elif section in self.deprecated:
-                    warnings.warn('%r is deprecated. Use %r instead.'
+                    warnings.warn("%r is deprecated. Use %r instead."
                                   % (section, self.deprecated[section]))
 
     def check_compatibility(self):
@@ -223,40 +225,40 @@ class Checker(object):
     extra_config_namespaces = []
 
     def _known_ns(self, app):
-        ns = ['wsgi']
-        ns.extend(app.toolboxes)
-        ns.extend(app.namespaces)
-        ns.extend(app.request_class.namespaces)
-        ns.extend(cherrypy.config.namespaces)
+        ns = ["wsgi"]
+        ns.extend(copykeys(app.toolboxes))
+        ns.extend(copykeys(app.namespaces))
+        ns.extend(copykeys(app.request_class.namespaces))
+        ns.extend(copykeys(cherrypy.config.namespaces))
         ns += self.extra_config_namespaces
 
         for section, conf in app.config.items():
-            is_path_section = section.startswith('/')
+            is_path_section = section.startswith("/")
             if is_path_section and isinstance(conf, dict):
-                for k in conf:
-                    atoms = k.split('.')
+                for k, v in conf.items():
+                    atoms = k.split(".")
                     if len(atoms) > 1:
                         if atoms[0] not in ns:
                             # Spit out a special warning if a known
                             # namespace is preceded by "cherrypy."
-                            if atoms[0] == 'cherrypy' and atoms[1] in ns:
+                            if atoms[0] == "cherrypy" and atoms[1] in ns:
                                 msg = (
-                                    'The config entry %r is invalid; '
-                                    'try %r instead.\nsection: [%s]'
-                                    % (k, '.'.join(atoms[1:]), section))
+                                    "The config entry %r is invalid; "
+                                    "try %r instead.\nsection: [%s]"
+                                    % (k, ".".join(atoms[1:]), section))
                             else:
                                 msg = (
-                                    'The config entry %r is invalid, '
-                                    'because the %r config namespace '
-                                    'is unknown.\n'
-                                    'section: [%s]' % (k, atoms[0], section))
+                                    "The config entry %r is invalid, "
+                                    "because the %r config namespace "
+                                    "is unknown.\n"
+                                    "section: [%s]" % (k, atoms[0], section))
                             warnings.warn(msg)
-                        elif atoms[0] == 'tools':
+                        elif atoms[0] == "tools":
                             if atoms[1] not in dir(cherrypy.tools):
                                 msg = (
-                                    'The config entry %r may be invalid, '
-                                    'because the %r tool was not found.\n'
-                                    'section: [%s]' % (k, atoms[1], section))
+                                    "The config entry %r may be invalid, "
+                                    "because the %r tool was not found.\n"
+                                    "section: [%s]" % (k, atoms[1], section))
                                 warnings.warn(msg)
 
     def check_config_namespaces(self):
@@ -280,22 +282,29 @@ class Checker(object):
                     continue
                 vtype = type(getattr(obj, name, None))
                 if vtype in b:
-                    self.known_config_types[namespace + '.' + name] = vtype
+                    self.known_config_types[namespace + "." + name] = vtype
 
-        traverse(cherrypy.request, 'request')
-        traverse(cherrypy.response, 'response')
-        traverse(cherrypy.server, 'server')
-        traverse(cherrypy.engine, 'engine')
-        traverse(cherrypy.log, 'log')
+        traverse(cherrypy.request, "request")
+        traverse(cherrypy.response, "response")
+        traverse(cherrypy.server, "server")
+        traverse(cherrypy.engine, "engine")
+        traverse(cherrypy.log, "log")
 
     def _known_types(self, config):
-        msg = ('The config entry %r in section %r is of type %r, '
-               'which does not match the expected type %r.')
+        msg = ("The config entry %r in section %r is of type %r, "
+               "which does not match the expected type %r.")
 
         for section, conf in config.items():
-            if not isinstance(conf, dict):
-                conf = {section: conf}
-            for k, v in conf.items():
+            if isinstance(conf, dict):
+                for k, v in conf.items():
+                    if v is not None:
+                        expected_type = self.known_config_types.get(k, None)
+                        vtype = type(v)
+                        if expected_type and vtype != expected_type:
+                            warnings.warn(msg % (k, section, vtype.__name__,
+                                                 expected_type.__name__))
+            else:
+                k, v = section, conf
                 if v is not None:
                     expected_type = self.known_config_types.get(k, None)
                     vtype = type(v)
@@ -313,14 +322,11 @@ class Checker(object):
 
     # -------------------- Specific config warnings -------------------- #
     def check_localhost(self):
-        """Warn if any socket_host is 'localhost'.
-
-        See #711.
-        """
+        """Warn if any socket_host is 'localhost'. See #711."""
         for k, v in cherrypy.config.items():
             if k == 'server.socket_host' and v == 'localhost':
                 warnings.warn("The use of 'localhost' as a socket host can "
-                              'cause problems on newer systems, since '
+                              "cause problems on newer systems, since "
                               "'localhost' can map to either an IPv4 or an "
                               "IPv6 address. You should use '127.0.0.1' "
                               "or '[::1]' instead.")
diff --git a/lib/cherrypy/_cpcompat.py b/lib/cherrypy/_cpcompat.py
index a43f6d36..8a98b38b 100644
--- a/lib/cherrypy/_cpcompat.py
+++ b/lib/cherrypy/_cpcompat.py
@@ -1,59 +1,383 @@
 """Compatibility code for using CherryPy with various versions of Python.
 
-To retain compatibility with older Python versions, this module provides a
+CherryPy 3.2 is compatible with Python versions 2.3+. This module provides a
 useful abstraction over the differences between Python versions, sometimes by
 preferring a newer idiom, sometimes an older one, and sometimes a custom one.
 
 In particular, Python 2 uses str and '' for byte strings, while Python 3
 uses str and '' for unicode strings. We will call each of these the 'native
 string' type for each version. Because of this major difference, this module
-provides
+provides new 'bytestr', 'unicodestr', and 'nativestr' attributes, as well as
 two functions: 'ntob', which translates native strings (of type 'str') into
 byte strings regardless of Python version, and 'ntou', which translates native
-strings to unicode strings.
-
-Try not to use the compatibility functions 'ntob', 'ntou', 'tonative'.
-They were created with Python 2.3-2.5 compatibility in mind.
-Instead, use unicode literals (from __future__) and bytes literals
-and their .encode/.decode methods as needed.
+strings to unicode strings. This also provides a 'BytesIO' name for dealing
+specifically with bytes, and a 'StringIO' name for dealing with native strings.
+It also provides a 'base64_decode' function with native strings as input and
+output.
 """
+import os
+import re
+import sys
+import threading
 
-import http.client
+if sys.version_info >= (3, 0):
+    py3k = True
+    bytestr = bytes
+    unicodestr = str
+    nativestr = unicodestr
+    basestring = (bytes, str)
 
+    def ntob(n, encoding='ISO-8859-1'):
+        """Return the given native string as a byte string in the given
+        encoding.
+        """
+        assert_native(n)
+        # In Python 3, the native string type is unicode
+        return n.encode(encoding)
 
-def ntob(n, encoding='ISO-8859-1'):
-    """Return the given native string as a byte string in the given
-    encoding.
-    """
-    assert_native(n)
-    # In Python 3, the native string type is unicode
-    return n.encode(encoding)
+    def ntou(n, encoding='ISO-8859-1'):
+        """Return the given native string as a unicode string with the given
+        encoding.
+        """
+        assert_native(n)
+        # In Python 3, the native string type is unicode
+        return n
 
+    def tonative(n, encoding='ISO-8859-1'):
+        """Return the given string as a native string in the given encoding."""
+        # In Python 3, the native string type is unicode
+        if isinstance(n, bytes):
+            return n.decode(encoding)
+        return n
+    # type("")
+    from io import StringIO
+    # bytes:
+    from io import BytesIO as BytesIO
+else:
+    # Python 2
+    py3k = False
+    bytestr = str
+    unicodestr = unicode
+    nativestr = bytestr
+    basestring = basestring
 
-def ntou(n, encoding='ISO-8859-1'):
-    """Return the given native string as a unicode string with the given
-    encoding.
-    """
-    assert_native(n)
-    # In Python 3, the native string type is unicode
-    return n
+    def ntob(n, encoding='ISO-8859-1'):
+        """Return the given native string as a byte string in the given
+        encoding.
+        """
+        assert_native(n)
+        # In Python 2, the native string type is bytes. Assume it's already
+        # in the given encoding, which for ISO-8859-1 is almost always what
+        # was intended.
+        return n
 
-
-def tonative(n, encoding='ISO-8859-1'):
-    """Return the given string as a native string in the given encoding."""
-    # In Python 3, the native string type is unicode
-    if isinstance(n, bytes):
+    def ntou(n, encoding='ISO-8859-1'):
+        """Return the given native string as a unicode string with the given
+        encoding.
+        """
+        assert_native(n)
+        # In Python 2, the native string type is bytes.
+        # First, check for the special encoding 'escape'. The test suite uses
+        # this to signal that it wants to pass a string with embedded \uXXXX
+        # escapes, but without having to prefix it with u'' for Python 2,
+        # but no prefix for Python 3.
+        if encoding == 'escape':
+            return unicode(
+                re.sub(r'\\u([0-9a-zA-Z]{4})',
+                       lambda m: unichr(int(m.group(1), 16)),
+                       n.decode('ISO-8859-1')))
+        # Assume it's already in the given encoding, which for ISO-8859-1
+        # is almost always what was intended.
         return n.decode(encoding)
-    return n
+
+    def tonative(n, encoding='ISO-8859-1'):
+        """Return the given string as a native string in the given encoding."""
+        # In Python 2, the native string type is bytes.
+        if isinstance(n, unicode):
+            return n.encode(encoding)
+        return n
+    try:
+        # type("")
+        from cStringIO import StringIO
+    except ImportError:
+        # type("")
+        from StringIO import StringIO
+    # bytes:
+    BytesIO = StringIO
 
 
 def assert_native(n):
-    if not isinstance(n, str):
-        raise TypeError('n must be a native str (got %s)' % type(n).__name__)
+    if not isinstance(n, nativestr):
+        raise TypeError("n must be a native str (got %s)" % type(n).__name__)
 
+try:
+    set = set
+except NameError:
+    from sets import Set as set
+
+try:
+    # Python 3.1+
+    from base64 import decodebytes as _base64_decodebytes
+except ImportError:
+    # Python 3.0-
+    # since CherryPy claims compability with Python 2.3, we must use
+    # the legacy API of base64
+    from base64 import decodestring as _base64_decodebytes
+
+
+def base64_decode(n, encoding='ISO-8859-1'):
+    """Return the native string base64-decoded (as a native string)."""
+    if isinstance(n, unicodestr):
+        b = n.encode(encoding)
+    else:
+        b = n
+    b = _base64_decodebytes(b)
+    if nativestr is unicodestr:
+        return b.decode(encoding)
+    else:
+        return b
+
+try:
+    # Python 2.5+
+    from hashlib import md5
+except ImportError:
+    from md5 import new as md5
+
+try:
+    # Python 2.5+
+    from hashlib import sha1 as sha
+except ImportError:
+    from sha import new as sha
+
+try:
+    sorted = sorted
+except NameError:
+    def sorted(i):
+        i = i[:]
+        i.sort()
+        return i
+
+try:
+    reversed = reversed
+except NameError:
+    def reversed(x):
+        i = len(x)
+        while i > 0:
+            i -= 1
+            yield x[i]
+
+try:
+    # Python 3
+    from urllib.parse import urljoin, urlencode
+    from urllib.parse import quote, quote_plus
+    from urllib.request import unquote, urlopen
+    from urllib.request import parse_http_list, parse_keqv_list
+except ImportError:
+    # Python 2
+    from urlparse import urljoin
+    from urllib import urlencode, urlopen
+    from urllib import quote, quote_plus
+    from urllib import unquote
+    from urllib2 import parse_http_list, parse_keqv_list
+
+try:
+    from threading import local as threadlocal
+except ImportError:
+    from cherrypy._cpthreadinglocal import local as threadlocal
+
+try:
+    dict.iteritems
+    # Python 2
+    iteritems = lambda d: d.iteritems()
+    copyitems = lambda d: d.items()
+except AttributeError:
+    # Python 3
+    iteritems = lambda d: d.items()
+    copyitems = lambda d: list(d.items())
+
+try:
+    dict.iterkeys
+    # Python 2
+    iterkeys = lambda d: d.iterkeys()
+    copykeys = lambda d: d.keys()
+except AttributeError:
+    # Python 3
+    iterkeys = lambda d: d.keys()
+    copykeys = lambda d: list(d.keys())
+
+try:
+    dict.itervalues
+    # Python 2
+    itervalues = lambda d: d.itervalues()
+    copyvalues = lambda d: d.values()
+except AttributeError:
+    # Python 3
+    itervalues = lambda d: d.values()
+    copyvalues = lambda d: list(d.values())
+
+try:
+    # Python 3
+    import builtins
+except ImportError:
+    # Python 2
+    import __builtin__ as builtins
+
+try:
+    # Python 2. We try Python 2 first clients on Python 2
+    # don't try to import the 'http' module from cherrypy.lib
+    from Cookie import SimpleCookie, CookieError
+    from httplib import BadStatusLine, HTTPConnection, IncompleteRead
+    from httplib import NotConnected
+    from BaseHTTPServer import BaseHTTPRequestHandler
+except ImportError:
+    # Python 3
+    from http.cookies import SimpleCookie, CookieError
+    from http.client import BadStatusLine, HTTPConnection, IncompleteRead
+    from http.client import NotConnected
+    from http.server import BaseHTTPRequestHandler
 
 # Some platforms don't expose HTTPSConnection, so handle it separately
-HTTPSConnection = getattr(http.client, 'HTTPSConnection', None)
+if py3k:
+    try:
+        from http.client import HTTPSConnection
+    except ImportError:
+        # Some platforms which don't have SSL don't expose HTTPSConnection
+        HTTPSConnection = None
+else:
+    try:
+        from httplib import HTTPSConnection
+    except ImportError:
+        HTTPSConnection = None
+
+try:
+    # Python 2
+    xrange = xrange
+except NameError:
+    # Python 3
+    xrange = range
+
+import threading
+if hasattr(threading.Thread, "daemon"):
+    # Python 2.6+
+    def get_daemon(t):
+        return t.daemon
+
+    def set_daemon(t, val):
+        t.daemon = val
+else:
+    def get_daemon(t):
+        return t.isDaemon()
+
+    def set_daemon(t, val):
+        t.setDaemon(val)
+
+try:
+    from email.utils import formatdate
+
+    def HTTPDate(timeval=None):
+        return formatdate(timeval, usegmt=True)
+except ImportError:
+    from rfc822 import formatdate as HTTPDate
+
+try:
+    # Python 3
+    from urllib.parse import unquote as parse_unquote
+
+    def unquote_qs(atom, encoding, errors='strict'):
+        return parse_unquote(
+            atom.replace('+', ' '),
+            encoding=encoding,
+            errors=errors)
+except ImportError:
+    # Python 2
+    from urllib import unquote as parse_unquote
+
+    def unquote_qs(atom, encoding, errors='strict'):
+        return parse_unquote(atom.replace('+', ' ')).decode(encoding, errors)
+
+try:
+    # Prefer simplejson, which is usually more advanced than the builtin
+    # module.
+    import simplejson as json
+    json_decode = json.JSONDecoder().decode
+    _json_encode = json.JSONEncoder().iterencode
+except ImportError:
+    if sys.version_info >= (2, 6):
+        # Python >=2.6 : json is part of the standard library
+        import json
+        json_decode = json.JSONDecoder().decode
+        _json_encode = json.JSONEncoder().iterencode
+    else:
+        json = None
+
+        def json_decode(s):
+            raise ValueError('No JSON library is available')
+
+        def _json_encode(s):
+            raise ValueError('No JSON library is available')
+finally:
+    if json and py3k:
+        # The two Python 3 implementations (simplejson/json)
+        # outputs str. We need bytes.
+        def json_encode(value):
+            for chunk in _json_encode(value):
+                yield chunk.encode('utf8')
+    else:
+        json_encode = _json_encode
 
 
-text_or_bytes = str, bytes
+try:
+    import cPickle as pickle
+except ImportError:
+    # In Python 2, pickle is a Python version.
+    # In Python 3, pickle is the sped-up C version.
+    import pickle
+
+try:
+    os.urandom(20)
+    import binascii
+
+    def random20():
+        return binascii.hexlify(os.urandom(20)).decode('ascii')
+except (AttributeError, NotImplementedError):
+    import random
+    # os.urandom not available until Python 2.4. Fall back to random.random.
+
+    def random20():
+        return sha('%s' % random.random()).hexdigest()
+
+try:
+    from _thread import get_ident as get_thread_ident
+except ImportError:
+    from thread import get_ident as get_thread_ident
+
+try:
+    # Python 3
+    next = next
+except NameError:
+    # Python 2
+    def next(i):
+        return i.next()
+
+if sys.version_info >= (3, 3):
+    Timer = threading.Timer
+    Event = threading.Event
+else:
+    # Python 3.2 and earlier
+    Timer = threading._Timer
+    Event = threading._Event
+
+# Prior to Python 2.6, the Thread class did not have a .daemon property.
+# This mix-in adds that property.
+
+
+class SetDaemonProperty:
+
+    def __get_daemon(self):
+        return self.isDaemon()
+
+    def __set_daemon(self, daemon):
+        self.setDaemon(daemon)
+
+    if sys.version_info < (2, 6):
+        daemon = property(__get_daemon, __set_daemon)
diff --git a/lib/cherrypy/_cpcompat_subprocess.py b/lib/cherrypy/_cpcompat_subprocess.py
new file mode 100644
index 00000000..478f4a74
--- /dev/null
+++ b/lib/cherrypy/_cpcompat_subprocess.py
@@ -0,0 +1,1544 @@
+# subprocess - Subprocesses with accessible I/O streams
+#
+# For more information about this module, see PEP 324.
+#
+# This module should remain compatible with Python 2.2, see PEP 291.
+#
+# Copyright (c) 2003-2005 by Peter Astrand <astrand@lysator.liu.se>
+#
+# Licensed to PSF under a Contributor Agreement.
+# See http://www.python.org/2.4/license for licensing details.
+
+r"""subprocess - Subprocesses with accessible I/O streams
+
+This module allows you to spawn processes, connect to their
+input/output/error pipes, and obtain their return codes.  This module
+intends to replace several other, older modules and functions, like:
+
+os.system
+os.spawn*
+os.popen*
+popen2.*
+commands.*
+
+Information about how the subprocess module can be used to replace these
+modules and functions can be found below.
+
+
+
+Using the subprocess module
+===========================
+This module defines one class called Popen:
+
+class Popen(args, bufsize=0, executable=None,
+            stdin=None, stdout=None, stderr=None,
+            preexec_fn=None, close_fds=False, shell=False,
+            cwd=None, env=None, universal_newlines=False,
+            startupinfo=None, creationflags=0):
+
+
+Arguments are:
+
+args should be a string, or a sequence of program arguments.  The
+program to execute is normally the first item in the args sequence or
+string, but can be explicitly set by using the executable argument.
+
+On UNIX, with shell=False (default): In this case, the Popen class
+uses os.execvp() to execute the child program.  args should normally
+be a sequence.  A string will be treated as a sequence with the string
+as the only item (the program to execute).
+
+On UNIX, with shell=True: If args is a string, it specifies the
+command string to execute through the shell.  If args is a sequence,
+the first item specifies the command string, and any additional items
+will be treated as additional shell arguments.
+
+On Windows: the Popen class uses CreateProcess() to execute the child
+program, which operates on strings.  If args is a sequence, it will be
+converted to a string using the list2cmdline method.  Please note that
+not all MS Windows applications interpret the command line the same
+way: The list2cmdline is designed for applications using the same
+rules as the MS C runtime.
+
+bufsize, if given, has the same meaning as the corresponding argument
+to the built-in open() function: 0 means unbuffered, 1 means line
+buffered, any other positive value means use a buffer of
+(approximately) that size.  A negative bufsize means to use the system
+default, which usually means fully buffered.  The default value for
+bufsize is 0 (unbuffered).
+
+stdin, stdout and stderr specify the executed programs' standard
+input, standard output and standard error file handles, respectively.
+Valid values are PIPE, an existing file descriptor (a positive
+integer), an existing file object, and None.  PIPE indicates that a
+new pipe to the child should be created.  With None, no redirection
+will occur; the child's file handles will be inherited from the
+parent.  Additionally, stderr can be STDOUT, which indicates that the
+stderr data from the applications should be captured into the same
+file handle as for stdout.
+
+If preexec_fn is set to a callable object, this object will be called
+in the child process just before the child is executed.
+
+If close_fds is true, all file descriptors except 0, 1 and 2 will be
+closed before the child process is executed.
+
+if shell is true, the specified command will be executed through the
+shell.
+
+If cwd is not None, the current directory will be changed to cwd
+before the child is executed.
+
+If env is not None, it defines the environment variables for the new
+process.
+
+If universal_newlines is true, the file objects stdout and stderr are
+opened as a text files, but lines may be terminated by any of '\n',
+the Unix end-of-line convention, '\r', the Macintosh convention or
+'\r\n', the Windows convention.  All of these external representations
+are seen as '\n' by the Python program.  Note: This feature is only
+available if Python is built with universal newline support (the
+default).  Also, the newlines attribute of the file objects stdout,
+stdin and stderr are not updated by the communicate() method.
+
+The startupinfo and creationflags, if given, will be passed to the
+underlying CreateProcess() function.  They can specify things such as
+appearance of the main window and priority for the new process.
+(Windows only)
+
+
+This module also defines some shortcut functions:
+
+call(*popenargs, **kwargs):
+    Run command with arguments.  Wait for command to complete, then
+    return the returncode attribute.
+
+    The arguments are the same as for the Popen constructor.  Example:
+
+    retcode = call(["ls", "-l"])
+
+check_call(*popenargs, **kwargs):
+    Run command with arguments.  Wait for command to complete.  If the
+    exit code was zero then return, otherwise raise
+    CalledProcessError.  The CalledProcessError object will have the
+    return code in the returncode attribute.
+
+    The arguments are the same as for the Popen constructor.  Example:
+
+    check_call(["ls", "-l"])
+
+check_output(*popenargs, **kwargs):
+    Run command with arguments and return its output as a byte string.
+
+    If the exit code was non-zero it raises a CalledProcessError.  The
+    CalledProcessError object will have the return code in the returncode
+    attribute and output in the output attribute.
+
+    The arguments are the same as for the Popen constructor.  Example:
+
+    output = check_output(["ls", "-l", "/dev/null"])
+
+
+Exceptions
+----------
+Exceptions raised in the child process, before the new program has
+started to execute, will be re-raised in the parent.  Additionally,
+the exception object will have one extra attribute called
+'child_traceback', which is a string containing traceback information
+from the childs point of view.
+
+The most common exception raised is OSError.  This occurs, for
+example, when trying to execute a non-existent file.  Applications
+should prepare for OSErrors.
+
+A ValueError will be raised if Popen is called with invalid arguments.
+
+check_call() and check_output() will raise CalledProcessError, if the
+called process returns a non-zero return code.
+
+
+Security
+--------
+Unlike some other popen functions, this implementation will never call
+/bin/sh implicitly.  This means that all characters, including shell
+metacharacters, can safely be passed to child processes.
+
+
+Popen objects
+=============
+Instances of the Popen class have the following methods:
+
+poll()
+    Check if child process has terminated.  Returns returncode
+    attribute.
+
+wait()
+    Wait for child process to terminate.  Returns returncode attribute.
+
+communicate(input=None)
+    Interact with process: Send data to stdin.  Read data from stdout
+    and stderr, until end-of-file is reached.  Wait for process to
+    terminate.  The optional input argument should be a string to be
+    sent to the child process, or None, if no data should be sent to
+    the child.
+
+    communicate() returns a tuple (stdout, stderr).
+
+    Note: The data read is buffered in memory, so do not use this
+    method if the data size is large or unlimited.
+
+The following attributes are also available:
+
+stdin
+    If the stdin argument is PIPE, this attribute is a file object
+    that provides input to the child process.  Otherwise, it is None.
+
+stdout
+    If the stdout argument is PIPE, this attribute is a file object
+    that provides output from the child process.  Otherwise, it is
+    None.
+
+stderr
+    If the stderr argument is PIPE, this attribute is file object that
+    provides error output from the child process.  Otherwise, it is
+    None.
+
+pid
+    The process ID of the child process.
+
+returncode
+    The child return code.  A None value indicates that the process
+    hasn't terminated yet.  A negative value -N indicates that the
+    child was terminated by signal N (UNIX only).
+
+
+Replacing older functions with the subprocess module
+====================================================
+In this section, "a ==> b" means that b can be used as a replacement
+for a.
+
+Note: All functions in this section fail (more or less) silently if
+the executed program cannot be found; this module raises an OSError
+exception.
+
+In the following examples, we assume that the subprocess module is
+imported with "from subprocess import *".
+
+
+Replacing /bin/sh shell backquote
+---------------------------------
+output=`mycmd myarg`
+==>
+output = Popen(["mycmd", "myarg"], stdout=PIPE).communicate()[0]
+
+
+Replacing shell pipe line
+-------------------------
+output=`dmesg | grep hda`
+==>
+p1 = Popen(["dmesg"], stdout=PIPE)
+p2 = Popen(["grep", "hda"], stdin=p1.stdout, stdout=PIPE)
+output = p2.communicate()[0]
+
+
+Replacing os.system()
+---------------------
+sts = os.system("mycmd" + " myarg")
+==>
+p = Popen("mycmd" + " myarg", shell=True)
+pid, sts = os.waitpid(p.pid, 0)
+
+Note:
+
+* Calling the program through the shell is usually not required.
+
+* It's easier to look at the returncode attribute than the
+  exitstatus.
+
+A more real-world example would look like this:
+
+try:
+    retcode = call("mycmd" + " myarg", shell=True)
+    if retcode < 0:
+        print >>sys.stderr, "Child was terminated by signal", -retcode
+    else:
+        print >>sys.stderr, "Child returned", retcode
+except OSError, e:
+    print >>sys.stderr, "Execution failed:", e
+
+
+Replacing os.spawn*
+-------------------
+P_NOWAIT example:
+
+pid = os.spawnlp(os.P_NOWAIT, "/bin/mycmd", "mycmd", "myarg")
+==>
+pid = Popen(["/bin/mycmd", "myarg"]).pid
+
+
+P_WAIT example:
+
+retcode = os.spawnlp(os.P_WAIT, "/bin/mycmd", "mycmd", "myarg")
+==>
+retcode = call(["/bin/mycmd", "myarg"])
+
+
+Vector example:
+
+os.spawnvp(os.P_NOWAIT, path, args)
+==>
+Popen([path] + args[1:])
+
+
+Environment example:
+
+os.spawnlpe(os.P_NOWAIT, "/bin/mycmd", "mycmd", "myarg", env)
+==>
+Popen(["/bin/mycmd", "myarg"], env={"PATH": "/usr/bin"})
+
+
+Replacing os.popen*
+-------------------
+pipe = os.popen("cmd", mode='r', bufsize)
+==>
+pipe = Popen("cmd", shell=True, bufsize=bufsize, stdout=PIPE).stdout
+
+pipe = os.popen("cmd", mode='w', bufsize)
+==>
+pipe = Popen("cmd", shell=True, bufsize=bufsize, stdin=PIPE).stdin
+
+
+(child_stdin, child_stdout) = os.popen2("cmd", mode, bufsize)
+==>
+p = Popen("cmd", shell=True, bufsize=bufsize,
+          stdin=PIPE, stdout=PIPE, close_fds=True)
+(child_stdin, child_stdout) = (p.stdin, p.stdout)
+
+
+(child_stdin,
+ child_stdout,
+ child_stderr) = os.popen3("cmd", mode, bufsize)
+==>
+p = Popen("cmd", shell=True, bufsize=bufsize,
+          stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=True)
+(child_stdin,
+ child_stdout,
+ child_stderr) = (p.stdin, p.stdout, p.stderr)
+
+
+(child_stdin, child_stdout_and_stderr) = os.popen4("cmd", mode,
+                                                   bufsize)
+==>
+p = Popen("cmd", shell=True, bufsize=bufsize,
+          stdin=PIPE, stdout=PIPE, stderr=STDOUT, close_fds=True)
+(child_stdin, child_stdout_and_stderr) = (p.stdin, p.stdout)
+
+On Unix, os.popen2, os.popen3 and os.popen4 also accept a sequence as
+the command to execute, in which case arguments will be passed
+directly to the program without shell intervention.  This usage can be
+replaced as follows:
+
+(child_stdin, child_stdout) = os.popen2(["/bin/ls", "-l"], mode,
+                                        bufsize)
+==>
+p = Popen(["/bin/ls", "-l"], bufsize=bufsize, stdin=PIPE, stdout=PIPE)
+(child_stdin, child_stdout) = (p.stdin, p.stdout)
+
+Return code handling translates as follows:
+
+pipe = os.popen("cmd", 'w')
+...
+rc = pipe.close()
+if rc is not None and rc % 256:
+    print "There were some errors"
+==>
+process = Popen("cmd", 'w', shell=True, stdin=PIPE)
+...
+process.stdin.close()
+if process.wait() != 0:
+    print "There were some errors"
+
+
+Replacing popen2.*
+------------------
+(child_stdout, child_stdin) = popen2.popen2("somestring", bufsize, mode)
+==>
+p = Popen(["somestring"], shell=True, bufsize=bufsize
+          stdin=PIPE, stdout=PIPE, close_fds=True)
+(child_stdout, child_stdin) = (p.stdout, p.stdin)
+
+On Unix, popen2 also accepts a sequence as the command to execute, in
+which case arguments will be passed directly to the program without
+shell intervention.  This usage can be replaced as follows:
+
+(child_stdout, child_stdin) = popen2.popen2(["mycmd", "myarg"], bufsize,
+                                            mode)
+==>
+p = Popen(["mycmd", "myarg"], bufsize=bufsize,
+          stdin=PIPE, stdout=PIPE, close_fds=True)
+(child_stdout, child_stdin) = (p.stdout, p.stdin)
+
+The popen2.Popen3 and popen2.Popen4 basically works as subprocess.Popen,
+except that:
+
+* subprocess.Popen raises an exception if the execution fails
+* the capturestderr argument is replaced with the stderr argument.
+* stdin=PIPE and stdout=PIPE must be specified.
+* popen2 closes all filedescriptors by default, but you have to specify
+  close_fds=True with subprocess.Popen.
+"""
+
+import sys
+mswindows = (sys.platform == "win32")
+
+import os
+import types
+import traceback
+import gc
+import signal
+import errno
+
+try:
+    set
+except NameError:
+    from sets import Set as set
+
+# Exception classes used by this module.
+
+
+class CalledProcessError(Exception):
+
+    """This exception is raised when a process run by check_call() or
+    check_output() returns a non-zero exit status.
+    The exit status will be stored in the returncode attribute;
+    check_output() will also store the output in the output attribute.
+    """
+
+    def __init__(self, returncode, cmd, output=None):
+        self.returncode = returncode
+        self.cmd = cmd
+        self.output = output
+
+    def __str__(self):
+        return "Command '%s' returned non-zero exit status %d" % (
+            self.cmd, self.returncode)
+
+
+if mswindows:
+    import threading
+    import msvcrt
+    import _subprocess
+
+    class STARTUPINFO:
+        dwFlags = 0
+        hStdInput = None
+        hStdOutput = None
+        hStdError = None
+        wShowWindow = 0
+
+    class pywintypes:
+        error = IOError
+else:
+    import select
+    _has_poll = hasattr(select, 'poll')
+    import fcntl
+    import pickle
+
+    # When select or poll has indicated that the file is writable,
+    # we can write up to _PIPE_BUF bytes without risk of blocking.
+    # POSIX defines PIPE_BUF as >= 512.
+    _PIPE_BUF = getattr(select, 'PIPE_BUF', 512)
+
+
+__all__ = ["Popen", "PIPE", "STDOUT", "call", "check_call",
+           "check_output", "CalledProcessError"]
+
+if mswindows:
+    from _subprocess import CREATE_NEW_CONSOLE, CREATE_NEW_PROCESS_GROUP, \
+        STD_INPUT_HANDLE, STD_OUTPUT_HANDLE, \
+        STD_ERROR_HANDLE, SW_HIDE, \
+        STARTF_USESTDHANDLES, STARTF_USESHOWWINDOW
+
+    __all__.extend(["CREATE_NEW_CONSOLE", "CREATE_NEW_PROCESS_GROUP",
+                    "STD_INPUT_HANDLE", "STD_OUTPUT_HANDLE",
+                    "STD_ERROR_HANDLE", "SW_HIDE",
+                    "STARTF_USESTDHANDLES", "STARTF_USESHOWWINDOW"])
+try:
+    MAXFD = os.sysconf("SC_OPEN_MAX")
+except:
+    MAXFD = 256
+
+_active = []
+
+
+def _cleanup():
+    for inst in _active[:]:
+        res = inst._internal_poll(_deadstate=sys.maxint)
+        if res is not None:
+            try:
+                _active.remove(inst)
+            except ValueError:
+                # This can happen if two threads create a new Popen instance.
+                # It's harmless that it was already removed, so ignore.
+                pass
+
+PIPE = -1
+STDOUT = -2
+
+
+def _eintr_retry_call(func, *args):
+    while True:
+        try:
+            return func(*args)
+        except (OSError, IOError), e:
+            if e.errno == errno.EINTR:
+                continue
+            raise
+
+
+def call(*popenargs, **kwargs):
+    """Run command with arguments.  Wait for command to complete, then
+    return the returncode attribute.
+
+    The arguments are the same as for the Popen constructor.  Example:
+
+    retcode = call(["ls", "-l"])
+    """
+    return Popen(*popenargs, **kwargs).wait()
+
+
+def check_call(*popenargs, **kwargs):
+    """Run command with arguments.  Wait for command to complete.  If
+    the exit code was zero then return, otherwise raise
+    CalledProcessError.  The CalledProcessError object will have the
+    return code in the returncode attribute.
+
+    The arguments are the same as for the Popen constructor.  Example:
+
+    check_call(["ls", "-l"])
+    """
+    retcode = call(*popenargs, **kwargs)
+    if retcode:
+        cmd = kwargs.get("args")
+        if cmd is None:
+            cmd = popenargs[0]
+        raise CalledProcessError(retcode, cmd)
+    return 0
+
+
+def check_output(*popenargs, **kwargs):
+    r"""Run command with arguments and return its output as a byte string.
+
+    If the exit code was non-zero it raises a CalledProcessError.  The
+    CalledProcessError object will have the return code in the returncode
+    attribute and output in the output attribute.
+
+    The arguments are the same as for the Popen constructor.  Example:
+
+    >>> check_output(["ls", "-l", "/dev/null"])
+    'crw-rw-rw- 1 root root 1, 3 Oct 18  2007 /dev/null\n'
+
+    The stdout argument is not allowed as it is used internally.
+    To capture standard error in the result, use stderr=STDOUT.
+
+    >>> check_output(["/bin/sh", "-c",
+    ...               "ls -l non_existent_file ; exit 0"],
+    ...              stderr=STDOUT)
+    'ls: non_existent_file: No such file or directory\n'
+    """
+    if 'stdout' in kwargs:
+        raise ValueError('stdout argument not allowed, it will be overridden.')
+    process = Popen(stdout=PIPE, *popenargs, **kwargs)
+    output, unused_err = process.communicate()
+    retcode = process.poll()
+    if retcode:
+        cmd = kwargs.get("args")
+        if cmd is None:
+            cmd = popenargs[0]
+        raise CalledProcessError(retcode, cmd, output=output)
+    return output
+
+
+def list2cmdline(seq):
+    """
+    Translate a sequence of arguments into a command line
+    string, using the same rules as the MS C runtime:
+
+    1) Arguments are delimited by white space, which is either a
+       space or a tab.
+
+    2) A string surrounded by double quotation marks is
+       interpreted as a single argument, regardless of white space
+       contained within.  A quoted string can be embedded in an
+       argument.
+
+    3) A double quotation mark preceded by a backslash is
+       interpreted as a literal double quotation mark.
+
+    4) Backslashes are interpreted literally, unless they
+       immediately precede a double quotation mark.
+
+    5) If backslashes immediately precede a double quotation mark,
+       every pair of backslashes is interpreted as a literal
+       backslash.  If the number of backslashes is odd, the last
+       backslash escapes the next double quotation mark as
+       described in rule 3.
+    """
+
+    # See
+    # http://msdn.microsoft.com/en-us/library/17w5ykft.aspx
+    # or search http://msdn.microsoft.com for
+    # "Parsing C++ Command-Line Arguments"
+    result = []
+    needquote = False
+    for arg in seq:
+        bs_buf = []
+
+        # Add a space to separate this argument from the others
+        if result:
+            result.append(' ')
+
+        needquote = (" " in arg) or ("\t" in arg) or not arg
+        if needquote:
+            result.append('"')
+
+        for c in arg:
+            if c == '\\':
+                # Don't know if we need to double yet.
+                bs_buf.append(c)
+            elif c == '"':
+                # Double backslashes.
+                result.append('\\' * len(bs_buf) * 2)
+                bs_buf = []
+                result.append('\\"')
+            else:
+                # Normal char
+                if bs_buf:
+                    result.extend(bs_buf)
+                    bs_buf = []
+                result.append(c)
+
+        # Add remaining backslashes, if any.
+        if bs_buf:
+            result.extend(bs_buf)
+
+        if needquote:
+            result.extend(bs_buf)
+            result.append('"')
+
+    return ''.join(result)
+
+
+class Popen(object):
+
+    def __init__(self, args, bufsize=0, executable=None,
+                 stdin=None, stdout=None, stderr=None,
+                 preexec_fn=None, close_fds=False, shell=False,
+                 cwd=None, env=None, universal_newlines=False,
+                 startupinfo=None, creationflags=0):
+        """Create new Popen instance."""
+        _cleanup()
+
+        self._child_created = False
+        if not isinstance(bufsize, (int, long)):
+            raise TypeError("bufsize must be an integer")
+
+        if mswindows:
+            if preexec_fn is not None:
+                raise ValueError("preexec_fn is not supported on Windows "
+                                 "platforms")
+            if close_fds and (stdin is not None or stdout is not None or
+                              stderr is not None):
+                raise ValueError("close_fds is not supported on Windows "
+                                 "platforms if you redirect "
+                                 "stdin/stdout/stderr")
+        else:
+            # POSIX
+            if startupinfo is not None:
+                raise ValueError("startupinfo is only supported on Windows "
+                                 "platforms")
+            if creationflags != 0:
+                raise ValueError("creationflags is only supported on Windows "
+                                 "platforms")
+
+        self.stdin = None
+        self.stdout = None
+        self.stderr = None
+        self.pid = None
+        self.returncode = None
+        self.universal_newlines = universal_newlines
+
+        # Input and output objects. The general principle is like
+        # this:
+        #
+        # Parent                   Child
+        # ------                   -----
+        # p2cwrite   ---stdin--->  p2cread
+        # c2pread    <--stdout---  c2pwrite
+        # errread    <--stderr---  errwrite
+        #
+        # On POSIX, the child objects are file descriptors.  On
+        # Windows, these are Windows file handles.  The parent objects
+        # are file descriptors on both platforms.  The parent objects
+        # are None when not using PIPEs. The child objects are None
+        # when not redirecting.
+
+        (p2cread, p2cwrite,
+         c2pread, c2pwrite,
+         errread, errwrite) = self._get_handles(stdin, stdout, stderr)
+
+        self._execute_child(args, executable, preexec_fn, close_fds,
+                            cwd, env, universal_newlines,
+                            startupinfo, creationflags, shell,
+                            p2cread, p2cwrite,
+                            c2pread, c2pwrite,
+                            errread, errwrite)
+
+        if mswindows:
+            if p2cwrite is not None:
+                p2cwrite = msvcrt.open_osfhandle(p2cwrite.Detach(), 0)
+            if c2pread is not None:
+                c2pread = msvcrt.open_osfhandle(c2pread.Detach(), 0)
+            if errread is not None:
+                errread = msvcrt.open_osfhandle(errread.Detach(), 0)
+
+        if p2cwrite is not None:
+            self.stdin = os.fdopen(p2cwrite, 'wb', bufsize)
+        if c2pread is not None:
+            if universal_newlines:
+                self.stdout = os.fdopen(c2pread, 'rU', bufsize)
+            else:
+                self.stdout = os.fdopen(c2pread, 'rb', bufsize)
+        if errread is not None:
+            if universal_newlines:
+                self.stderr = os.fdopen(errread, 'rU', bufsize)
+            else:
+                self.stderr = os.fdopen(errread, 'rb', bufsize)
+
+    def _translate_newlines(self, data):
+        data = data.replace("\r\n", "\n")
+        data = data.replace("\r", "\n")
+        return data
+
+    def __del__(self, _maxint=sys.maxint, _active=_active):
+        # If __init__ hasn't had a chance to execute (e.g. if it
+        # was passed an undeclared keyword argument), we don't
+        # have a _child_created attribute at all.
+        if not getattr(self, '_child_created', False):
+            # We didn't get to successfully create a child process.
+            return
+        # In case the child hasn't been waited on, check if it's done.
+        self._internal_poll(_deadstate=_maxint)
+        if self.returncode is None and _active is not None:
+            # Child is still running, keep us alive until we can wait on it.
+            _active.append(self)
+
+    def communicate(self, input=None):
+        """Interact with process: Send data to stdin.  Read data from
+        stdout and stderr, until end-of-file is reached.  Wait for
+        process to terminate.  The optional input argument should be a
+        string to be sent to the child process, or None, if no data
+        should be sent to the child.
+
+        communicate() returns a tuple (stdout, stderr)."""
+
+        # Optimization: If we are only using one pipe, or no pipe at
+        # all, using select() or threads is unnecessary.
+        if [self.stdin, self.stdout, self.stderr].count(None) >= 2:
+            stdout = None
+            stderr = None
+            if self.stdin:
+                if input:
+                    try:
+                        self.stdin.write(input)
+                    except IOError, e:
+                        if e.errno != errno.EPIPE and e.errno != errno.EINVAL:
+                            raise
+                self.stdin.close()
+            elif self.stdout:
+                stdout = _eintr_retry_call(self.stdout.read)
+                self.stdout.close()
+            elif self.stderr:
+                stderr = _eintr_retry_call(self.stderr.read)
+                self.stderr.close()
+            self.wait()
+            return (stdout, stderr)
+
+        return self._communicate(input)
+
+    def poll(self):
+        return self._internal_poll()
+
+    if mswindows:
+        #
+        # Windows methods
+        #
+        def _get_handles(self, stdin, stdout, stderr):
+            """Construct and return tuple with IO objects:
+            p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite
+            """
+            if stdin is None and stdout is None and stderr is None:
+                return (None, None, None, None, None, None)
+
+            p2cread, p2cwrite = None, None
+            c2pread, c2pwrite = None, None
+            errread, errwrite = None, None
+
+            if stdin is None:
+                p2cread = _subprocess.GetStdHandle(
+                    _subprocess.STD_INPUT_HANDLE)
+                if p2cread is None:
+                    p2cread, _ = _subprocess.CreatePipe(None, 0)
+            elif stdin == PIPE:
+                p2cread, p2cwrite = _subprocess.CreatePipe(None, 0)
+            elif isinstance(stdin, int):
+                p2cread = msvcrt.get_osfhandle(stdin)
+            else:
+                # Assuming file-like object
+                p2cread = msvcrt.get_osfhandle(stdin.fileno())
+            p2cread = self._make_inheritable(p2cread)
+
+            if stdout is None:
+                c2pwrite = _subprocess.GetStdHandle(
+                    _subprocess.STD_OUTPUT_HANDLE)
+                if c2pwrite is None:
+                    _, c2pwrite = _subprocess.CreatePipe(None, 0)
+            elif stdout == PIPE:
+                c2pread, c2pwrite = _subprocess.CreatePipe(None, 0)
+            elif isinstance(stdout, int):
+                c2pwrite = msvcrt.get_osfhandle(stdout)
+            else:
+                # Assuming file-like object
+                c2pwrite = msvcrt.get_osfhandle(stdout.fileno())
+            c2pwrite = self._make_inheritable(c2pwrite)
+
+            if stderr is None:
+                errwrite = _subprocess.GetStdHandle(
+                    _subprocess.STD_ERROR_HANDLE)
+                if errwrite is None:
+                    _, errwrite = _subprocess.CreatePipe(None, 0)
+            elif stderr == PIPE:
+                errread, errwrite = _subprocess.CreatePipe(None, 0)
+            elif stderr == STDOUT:
+                errwrite = c2pwrite
+            elif isinstance(stderr, int):
+                errwrite = msvcrt.get_osfhandle(stderr)
+            else:
+                # Assuming file-like object
+                errwrite = msvcrt.get_osfhandle(stderr.fileno())
+            errwrite = self._make_inheritable(errwrite)
+
+            return (p2cread, p2cwrite,
+                    c2pread, c2pwrite,
+                    errread, errwrite)
+
+        def _make_inheritable(self, handle):
+            """Return a duplicate of handle, which is inheritable"""
+            return _subprocess.DuplicateHandle(
+                _subprocess.GetCurrentProcess(),
+                handle,
+                _subprocess.GetCurrentProcess(),
+                0,
+                1,
+                _subprocess.DUPLICATE_SAME_ACCESS
+            )
+
+        def _find_w9xpopen(self):
+            """Find and return absolut path to w9xpopen.exe"""
+            w9xpopen = os.path.join(
+                os.path.dirname(_subprocess.GetModuleFileName(0)),
+                "w9xpopen.exe")
+            if not os.path.exists(w9xpopen):
+                # Eeek - file-not-found - possibly an embedding
+                # situation - see if we can locate it in sys.exec_prefix
+                w9xpopen = os.path.join(os.path.dirname(sys.exec_prefix),
+                                        "w9xpopen.exe")
+                if not os.path.exists(w9xpopen):
+                    raise RuntimeError("Cannot locate w9xpopen.exe, which is "
+                                       "needed for Popen to work with your "
+                                       "shell or platform.")
+            return w9xpopen
+
+        def _execute_child(self, args, executable, preexec_fn, close_fds,
+                           cwd, env, universal_newlines,
+                           startupinfo, creationflags, shell,
+                           p2cread, p2cwrite,
+                           c2pread, c2pwrite,
+                           errread, errwrite):
+            """Execute program (MS Windows version)"""
+
+            if not isinstance(args, types.StringTypes):
+                args = list2cmdline(args)
+
+            # Process startup details
+            if startupinfo is None:
+                startupinfo = STARTUPINFO()
+            if None not in (p2cread, c2pwrite, errwrite):
+                startupinfo.dwFlags |= _subprocess.STARTF_USESTDHANDLES
+                startupinfo.hStdInput = p2cread
+                startupinfo.hStdOutput = c2pwrite
+                startupinfo.hStdError = errwrite
+
+            if shell:
+                startupinfo.dwFlags |= _subprocess.STARTF_USESHOWWINDOW
+                startupinfo.wShowWindow = _subprocess.SW_HIDE
+                comspec = os.environ.get("COMSPEC", "cmd.exe")
+                args = '{} /c "{}"'.format(comspec, args)
+                if (_subprocess.GetVersion() >= 0x80000000 or
+                        os.path.basename(comspec).lower() == "command.com"):
+                    # Win9x, or using command.com on NT. We need to
+                    # use the w9xpopen intermediate program. For more
+                    # information, see KB Q150956
+                    # (http://web.archive.org/web/20011105084002/http://support.microsoft.com/support/kb/articles/Q150/9/56.asp)
+                    w9xpopen = self._find_w9xpopen()
+                    args = '"%s" %s' % (w9xpopen, args)
+                    # Not passing CREATE_NEW_CONSOLE has been known to
+                    # cause random failures on win9x.  Specifically a
+                    # dialog: "Your program accessed mem currently in
+                    # use at xxx" and a hopeful warning about the
+                    # stability of your system.  Cost is Ctrl+C wont
+                    # kill children.
+                    creationflags |= _subprocess.CREATE_NEW_CONSOLE
+
+            # Start the process
+            try:
+                try:
+                    hp, ht, pid, tid = _subprocess.CreateProcess(
+                        executable, args,
+                        # no special
+                        # security
+                        None, None,
+                        int(not close_fds),
+                        creationflags,
+                        env,
+                        cwd,
+                        startupinfo)
+                except pywintypes.error, e:
+                    # Translate pywintypes.error to WindowsError, which is
+                    # a subclass of OSError.  FIXME: We should really
+                    # translate errno using _sys_errlist (or similar), but
+                    # how can this be done from Python?
+                    raise WindowsError(*e.args)
+            finally:
+                # Child is launched. Close the parent's copy of those pipe
+                # handles that only the child should have open.  You need
+                # to make sure that no handles to the write end of the
+                # output pipe are maintained in this process or else the
+                # pipe will not close when the child process exits and the
+                # ReadFile will hang.
+                if p2cread is not None:
+                    p2cread.Close()
+                if c2pwrite is not None:
+                    c2pwrite.Close()
+                if errwrite is not None:
+                    errwrite.Close()
+
+            # Retain the process handle, but close the thread handle
+            self._child_created = True
+            self._handle = hp
+            self.pid = pid
+            ht.Close()
+
+        def _internal_poll(
+                self, _deadstate=None,
+                _WaitForSingleObject=_subprocess.WaitForSingleObject,
+                _WAIT_OBJECT_0=_subprocess.WAIT_OBJECT_0,
+                _GetExitCodeProcess=_subprocess.GetExitCodeProcess
+        ):
+            """Check if child process has terminated.  Returns returncode
+            attribute.
+
+            This method is called by __del__, so it can only refer to objects
+            in its local scope.
+
+            """
+            if self.returncode is None:
+                if _WaitForSingleObject(self._handle, 0) == _WAIT_OBJECT_0:
+                    self.returncode = _GetExitCodeProcess(self._handle)
+            return self.returncode
+
+        def wait(self):
+            """Wait for child process to terminate.  Returns returncode
+            attribute."""
+            if self.returncode is None:
+                _subprocess.WaitForSingleObject(self._handle,
+                                                _subprocess.INFINITE)
+                self.returncode = _subprocess.GetExitCodeProcess(self._handle)
+            return self.returncode
+
+        def _readerthread(self, fh, buffer):
+            buffer.append(fh.read())
+
+        def _communicate(self, input):
+            stdout = None  # Return
+            stderr = None  # Return
+
+            if self.stdout:
+                stdout = []
+                stdout_thread = threading.Thread(target=self._readerthread,
+                                                 args=(self.stdout, stdout))
+                stdout_thread.setDaemon(True)
+                stdout_thread.start()
+            if self.stderr:
+                stderr = []
+                stderr_thread = threading.Thread(target=self._readerthread,
+                                                 args=(self.stderr, stderr))
+                stderr_thread.setDaemon(True)
+                stderr_thread.start()
+
+            if self.stdin:
+                if input is not None:
+                    try:
+                        self.stdin.write(input)
+                    except IOError, e:
+                        if e.errno != errno.EPIPE:
+                            raise
+                self.stdin.close()
+
+            if self.stdout:
+                stdout_thread.join()
+            if self.stderr:
+                stderr_thread.join()
+
+            # All data exchanged.  Translate lists into strings.
+            if stdout is not None:
+                stdout = stdout[0]
+            if stderr is not None:
+                stderr = stderr[0]
+
+            # Translate newlines, if requested.  We cannot let the file
+            # object do the translation: It is based on stdio, which is
+            # impossible to combine with select (unless forcing no
+            # buffering).
+            if self.universal_newlines and hasattr(file, 'newlines'):
+                if stdout:
+                    stdout = self._translate_newlines(stdout)
+                if stderr:
+                    stderr = self._translate_newlines(stderr)
+
+            self.wait()
+            return (stdout, stderr)
+
+        def send_signal(self, sig):
+            """Send a signal to the process
+            """
+            if sig == signal.SIGTERM:
+                self.terminate()
+            elif sig == signal.CTRL_C_EVENT:
+                os.kill(self.pid, signal.CTRL_C_EVENT)
+            elif sig == signal.CTRL_BREAK_EVENT:
+                os.kill(self.pid, signal.CTRL_BREAK_EVENT)
+            else:
+                raise ValueError("Unsupported signal: {}".format(sig))
+
+        def terminate(self):
+            """Terminates the process
+            """
+            _subprocess.TerminateProcess(self._handle, 1)
+
+        kill = terminate
+
+    else:
+        #
+        # POSIX methods
+        #
+        def _get_handles(self, stdin, stdout, stderr):
+            """Construct and return tuple with IO objects:
+            p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite
+            """
+            p2cread, p2cwrite = None, None
+            c2pread, c2pwrite = None, None
+            errread, errwrite = None, None
+
+            if stdin is None:
+                pass
+            elif stdin == PIPE:
+                p2cread, p2cwrite = self.pipe_cloexec()
+            elif isinstance(stdin, int):
+                p2cread = stdin
+            else:
+                # Assuming file-like object
+                p2cread = stdin.fileno()
+
+            if stdout is None:
+                pass
+            elif stdout == PIPE:
+                c2pread, c2pwrite = self.pipe_cloexec()
+            elif isinstance(stdout, int):
+                c2pwrite = stdout
+            else:
+                # Assuming file-like object
+                c2pwrite = stdout.fileno()
+
+            if stderr is None:
+                pass
+            elif stderr == PIPE:
+                errread, errwrite = self.pipe_cloexec()
+            elif stderr == STDOUT:
+                errwrite = c2pwrite
+            elif isinstance(stderr, int):
+                errwrite = stderr
+            else:
+                # Assuming file-like object
+                errwrite = stderr.fileno()
+
+            return (p2cread, p2cwrite,
+                    c2pread, c2pwrite,
+                    errread, errwrite)
+
+        def _set_cloexec_flag(self, fd, cloexec=True):
+            try:
+                cloexec_flag = fcntl.FD_CLOEXEC
+            except AttributeError:
+                cloexec_flag = 1
+
+            old = fcntl.fcntl(fd, fcntl.F_GETFD)
+            if cloexec:
+                fcntl.fcntl(fd, fcntl.F_SETFD, old | cloexec_flag)
+            else:
+                fcntl.fcntl(fd, fcntl.F_SETFD, old & ~cloexec_flag)
+
+        def pipe_cloexec(self):
+            """Create a pipe with FDs set CLOEXEC."""
+            # Pipes' FDs are set CLOEXEC by default because we don't want them
+            # to be inherited by other subprocesses: the CLOEXEC flag is
+            # removed from the child's FDs by _dup2(), between fork() and
+            # exec().
+            # This is not atomic: we would need the pipe2() syscall for that.
+            r, w = os.pipe()
+            self._set_cloexec_flag(r)
+            self._set_cloexec_flag(w)
+            return r, w
+
+        def _close_fds(self, but):
+            if hasattr(os, 'closerange'):
+                os.closerange(3, but)
+                os.closerange(but + 1, MAXFD)
+            else:
+                for i in xrange(3, MAXFD):
+                    if i == but:
+                        continue
+                    try:
+                        os.close(i)
+                    except:
+                        pass
+
+        def _execute_child(self, args, executable, preexec_fn, close_fds,
+                           cwd, env, universal_newlines,
+                           startupinfo, creationflags, shell,
+                           p2cread, p2cwrite,
+                           c2pread, c2pwrite,
+                           errread, errwrite):
+            """Execute program (POSIX version)"""
+
+            if isinstance(args, types.StringTypes):
+                args = [args]
+            else:
+                args = list(args)
+
+            if shell:
+                args = ["/bin/sh", "-c"] + args
+                if executable:
+                    args[0] = executable
+
+            if executable is None:
+                executable = args[0]
+
+            # For transferring possible exec failure from child to parent
+            # The first char specifies the exception type: 0 means
+            # OSError, 1 means some other error.
+            errpipe_read, errpipe_write = self.pipe_cloexec()
+            try:
+                try:
+                    gc_was_enabled = gc.isenabled()
+                    # Disable gc to avoid bug where gc -> file_dealloc ->
+                    # write to stderr -> hang.
+                    # http://bugs.python.org/issue1336
+                    gc.disable()
+                    try:
+                        self.pid = os.fork()
+                    except:
+                        if gc_was_enabled:
+                            gc.enable()
+                        raise
+                    self._child_created = True
+                    if self.pid == 0:
+                        # Child
+                        try:
+                            # Close parent's pipe ends
+                            if p2cwrite is not None:
+                                os.close(p2cwrite)
+                            if c2pread is not None:
+                                os.close(c2pread)
+                            if errread is not None:
+                                os.close(errread)
+                            os.close(errpipe_read)
+
+                            # When duping fds, if there arises a situation
+                            # where one of the fds is either 0, 1 or 2, it
+                            # is possible that it is overwritten (#12607).
+                            if c2pwrite == 0:
+                                c2pwrite = os.dup(c2pwrite)
+                            if errwrite == 0 or errwrite == 1:
+                                errwrite = os.dup(errwrite)
+
+                            # Dup fds for child
+                            def _dup2(a, b):
+                                # dup2() removes the CLOEXEC flag but
+                                # we must do it ourselves if dup2()
+                                # would be a no-op (issue #10806).
+                                if a == b:
+                                    self._set_cloexec_flag(a, False)
+                                elif a is not None:
+                                    os.dup2(a, b)
+                            _dup2(p2cread, 0)
+                            _dup2(c2pwrite, 1)
+                            _dup2(errwrite, 2)
+
+                            # Close pipe fds.  Make sure we don't close the
+                            # same fd more than once, or standard fds.
+                            closed = set([None])
+                            for fd in [p2cread, c2pwrite, errwrite]:
+                                if fd not in closed and fd > 2:
+                                    os.close(fd)
+                                    closed.add(fd)
+
+                            # Close all other fds, if asked for
+                            if close_fds:
+                                self._close_fds(but=errpipe_write)
+
+                            if cwd is not None:
+                                os.chdir(cwd)
+
+                            if preexec_fn:
+                                preexec_fn()
+
+                            if env is None:
+                                os.execvp(executable, args)
+                            else:
+                                os.execvpe(executable, args, env)
+
+                        except:
+                            exc_type, exc_value, tb = sys.exc_info()
+                            # Save the traceback and attach it to the exception
+                            # object
+                            exc_lines = traceback.format_exception(exc_type,
+                                                                   exc_value,
+                                                                   tb)
+                            exc_value.child_traceback = ''.join(exc_lines)
+                            os.write(errpipe_write, pickle.dumps(exc_value))
+
+                        # This exitcode won't be reported to applications,
+                        # so it really doesn't matter what we return.
+                        os._exit(255)
+
+                    # Parent
+                    if gc_was_enabled:
+                        gc.enable()
+                finally:
+                    # be sure the FD is closed no matter what
+                    os.close(errpipe_write)
+
+                if p2cread is not None and p2cwrite is not None:
+                    os.close(p2cread)
+                if c2pwrite is not None and c2pread is not None:
+                    os.close(c2pwrite)
+                if errwrite is not None and errread is not None:
+                    os.close(errwrite)
+
+                # Wait for exec to fail or succeed; possibly raising exception
+                # Exception limited to 1M
+                data = _eintr_retry_call(os.read, errpipe_read, 1048576)
+            finally:
+                # be sure the FD is closed no matter what
+                os.close(errpipe_read)
+
+            if data != "":
+                try:
+                    _eintr_retry_call(os.waitpid, self.pid, 0)
+                except OSError, e:
+                    if e.errno != errno.ECHILD:
+                        raise
+                child_exception = pickle.loads(data)
+                for fd in (p2cwrite, c2pread, errread):
+                    if fd is not None:
+                        os.close(fd)
+                raise child_exception
+
+        def _handle_exitstatus(self, sts, _WIFSIGNALED=os.WIFSIGNALED,
+                               _WTERMSIG=os.WTERMSIG, _WIFEXITED=os.WIFEXITED,
+                               _WEXITSTATUS=os.WEXITSTATUS):
+            # This method is called (indirectly) by __del__, so it cannot
+            # refer to anything outside of its local scope."""
+            if _WIFSIGNALED(sts):
+                self.returncode = -_WTERMSIG(sts)
+            elif _WIFEXITED(sts):
+                self.returncode = _WEXITSTATUS(sts)
+            else:
+                # Should never happen
+                raise RuntimeError("Unknown child exit status!")
+
+        def _internal_poll(self, _deadstate=None, _waitpid=os.waitpid,
+                           _WNOHANG=os.WNOHANG, _os_error=os.error):
+            """Check if child process has terminated.  Returns returncode
+            attribute.
+
+            This method is called by __del__, so it cannot reference anything
+            outside of the local scope (nor can any methods it calls).
+
+            """
+            if self.returncode is None:
+                try:
+                    pid, sts = _waitpid(self.pid, _WNOHANG)
+                    if pid == self.pid:
+                        self._handle_exitstatus(sts)
+                except _os_error:
+                    if _deadstate is not None:
+                        self.returncode = _deadstate
+            return self.returncode
+
+        def wait(self):
+            """Wait for child process to terminate.  Returns returncode
+            attribute."""
+            if self.returncode is None:
+                try:
+                    pid, sts = _eintr_retry_call(os.waitpid, self.pid, 0)
+                except OSError, e:
+                    if e.errno != errno.ECHILD:
+                        raise
+                    # This happens if SIGCLD is set to be ignored or waiting
+                    # for child processes has otherwise been disabled for our
+                    # process.  This child is dead, we can't get the status.
+                    sts = 0
+                self._handle_exitstatus(sts)
+            return self.returncode
+
+        def _communicate(self, input):
+            if self.stdin:
+                # Flush stdio buffer.  This might block, if the user has
+                # been writing to .stdin in an uncontrolled fashion.
+                self.stdin.flush()
+                if not input:
+                    self.stdin.close()
+
+            if _has_poll:
+                stdout, stderr = self._communicate_with_poll(input)
+            else:
+                stdout, stderr = self._communicate_with_select(input)
+
+            # All data exchanged.  Translate lists into strings.
+            if stdout is not None:
+                stdout = ''.join(stdout)
+            if stderr is not None:
+                stderr = ''.join(stderr)
+
+            # Translate newlines, if requested.  We cannot let the file
+            # object do the translation: It is based on stdio, which is
+            # impossible to combine with select (unless forcing no
+            # buffering).
+            if self.universal_newlines and hasattr(file, 'newlines'):
+                if stdout:
+                    stdout = self._translate_newlines(stdout)
+                if stderr:
+                    stderr = self._translate_newlines(stderr)
+
+            self.wait()
+            return (stdout, stderr)
+
+        def _communicate_with_poll(self, input):
+            stdout = None  # Return
+            stderr = None  # Return
+            fd2file = {}
+            fd2output = {}
+
+            poller = select.poll()
+
+            def register_and_append(file_obj, eventmask):
+                poller.register(file_obj.fileno(), eventmask)
+                fd2file[file_obj.fileno()] = file_obj
+
+            def close_unregister_and_remove(fd):
+                poller.unregister(fd)
+                fd2file[fd].close()
+                fd2file.pop(fd)
+
+            if self.stdin and input:
+                register_and_append(self.stdin, select.POLLOUT)
+
+            select_POLLIN_POLLPRI = select.POLLIN | select.POLLPRI
+            if self.stdout:
+                register_and_append(self.stdout, select_POLLIN_POLLPRI)
+                fd2output[self.stdout.fileno()] = stdout = []
+            if self.stderr:
+                register_and_append(self.stderr, select_POLLIN_POLLPRI)
+                fd2output[self.stderr.fileno()] = stderr = []
+
+            input_offset = 0
+            while fd2file:
+                try:
+                    ready = poller.poll()
+                except select.error, e:
+                    if e.args[0] == errno.EINTR:
+                        continue
+                    raise
+
+                for fd, mode in ready:
+                    if mode & select.POLLOUT:
+                        chunk = input[input_offset: input_offset + _PIPE_BUF]
+                        try:
+                            input_offset += os.write(fd, chunk)
+                        except OSError, e:
+                            if e.errno == errno.EPIPE:
+                                close_unregister_and_remove(fd)
+                            else:
+                                raise
+                        else:
+                            if input_offset >= len(input):
+                                close_unregister_and_remove(fd)
+                    elif mode & select_POLLIN_POLLPRI:
+                        data = os.read(fd, 4096)
+                        if not data:
+                            close_unregister_and_remove(fd)
+                        fd2output[fd].append(data)
+                    else:
+                        # Ignore hang up or errors.
+                        close_unregister_and_remove(fd)
+
+            return (stdout, stderr)
+
+        def _communicate_with_select(self, input):
+            read_set = []
+            write_set = []
+            stdout = None  # Return
+            stderr = None  # Return
+
+            if self.stdin and input:
+                write_set.append(self.stdin)
+            if self.stdout:
+                read_set.append(self.stdout)
+                stdout = []
+            if self.stderr:
+                read_set.append(self.stderr)
+                stderr = []
+
+            input_offset = 0
+            while read_set or write_set:
+                try:
+                    rlist, wlist, xlist = select.select(
+                        read_set, write_set, [])
+                except select.error, e:
+                    if e.args[0] == errno.EINTR:
+                        continue
+                    raise
+
+                if self.stdin in wlist:
+                    chunk = input[input_offset: input_offset + _PIPE_BUF]
+                    try:
+                        bytes_written = os.write(self.stdin.fileno(), chunk)
+                    except OSError, e:
+                        if e.errno == errno.EPIPE:
+                            self.stdin.close()
+                            write_set.remove(self.stdin)
+                        else:
+                            raise
+                    else:
+                        input_offset += bytes_written
+                        if input_offset >= len(input):
+                            self.stdin.close()
+                            write_set.remove(self.stdin)
+
+                if self.stdout in rlist:
+                    data = os.read(self.stdout.fileno(), 1024)
+                    if data == "":
+                        self.stdout.close()
+                        read_set.remove(self.stdout)
+                    stdout.append(data)
+
+                if self.stderr in rlist:
+                    data = os.read(self.stderr.fileno(), 1024)
+                    if data == "":
+                        self.stderr.close()
+                        read_set.remove(self.stderr)
+                    stderr.append(data)
+
+            return (stdout, stderr)
+
+        def send_signal(self, sig):
+            """Send a signal to the process
+            """
+            os.kill(self.pid, sig)
+
+        def terminate(self):
+            """Terminate the process with SIGTERM
+            """
+            self.send_signal(signal.SIGTERM)
+
+        def kill(self):
+            """Kill the process with SIGKILL
+            """
+            self.send_signal(signal.SIGKILL)
+
+
+def _demo_posix():
+    #
+    # Example 1: Simple redirection: Get process list
+    #
+    plist = Popen(["ps"], stdout=PIPE).communicate()[0]
+    print "Process list:"
+    print plist
+
+    #
+    # Example 2: Change uid before executing child
+    #
+    if os.getuid() == 0:
+        p = Popen(["id"], preexec_fn=lambda: os.setuid(100))
+        p.wait()
+
+    #
+    # Example 3: Connecting several subprocesses
+    #
+    print "Looking for 'hda'..."
+    p1 = Popen(["dmesg"], stdout=PIPE)
+    p2 = Popen(["grep", "hda"], stdin=p1.stdout, stdout=PIPE)
+    print repr(p2.communicate()[0])
+
+    #
+    # Example 4: Catch execution error
+    #
+    print
+    print "Trying a weird file..."
+    try:
+        print Popen(["/this/path/does/not/exist"]).communicate()
+    except OSError, e:
+        if e.errno == errno.ENOENT:
+            print "The file didn't exist.  I thought so..."
+            print "Child traceback:"
+            print e.child_traceback
+        else:
+            print "Error", e.errno
+    else:
+        print >>sys.stderr, "Gosh.  No error."
+
+
+def _demo_windows():
+    #
+    # Example 1: Connecting several subprocesses
+    #
+    print "Looking for 'PROMPT' in set output..."
+    p1 = Popen("set", stdout=PIPE, shell=True)
+    p2 = Popen('find "PROMPT"', stdin=p1.stdout, stdout=PIPE)
+    print repr(p2.communicate()[0])
+
+    #
+    # Example 2: Simple execution of program
+    #
+    print "Executing calc..."
+    p = Popen("calc")
+    p.wait()
+
+
+if __name__ == "__main__":
+    if mswindows:
+        _demo_windows()
+    else:
+        _demo_posix()
diff --git a/lib/cherrypy/_cpconfig.py b/lib/cherrypy/_cpconfig.py
index c22937d3..c11bc1d1 100644
--- a/lib/cherrypy/_cpconfig.py
+++ b/lib/cherrypy/_cpconfig.py
@@ -1,4 +1,5 @@
-"""Configuration system for CherryPy.
+"""
+Configuration system for CherryPy.
 
 Configuration in CherryPy is implemented via dictionaries. Keys are strings
 which name the mapped value, which may be of any type.
@@ -45,21 +46,21 @@ To declare global configuration entries, place them in a [global] section.
 
 You may also declare config entries directly on the classes and methods
 (page handlers) that make up your CherryPy application via the ``_cp_config``
-attribute, set with the ``cherrypy.config`` decorator. For example::
+attribute. For example::
 
-    @cherrypy.config(**{'tools.gzip.on': True})
     class Demo:
+        _cp_config = {'tools.gzip.on': True}
 
-        @cherrypy.expose
-        @cherrypy.config(**{'request.show_tracebacks': False})
         def index(self):
             return "Hello world"
+        index.exposed = True
+        index._cp_config = {'request.show_tracebacks': False}
 
 .. note::
 
     This behavior is only guaranteed for the default dispatcher.
     Other dispatchers may have different restrictions on where
-    you can attach config attributes.
+    you can attach _cp_config attributes.
 
 
 Namespaces
@@ -118,84 +119,80 @@ style) context manager.
 """
 
 import cherrypy
-from cherrypy._cpcompat import text_or_bytes
+from cherrypy._cpcompat import set, basestring
 from cherrypy.lib import reprconf
 
-
-def _if_filename_register_autoreload(ob):
-    """Register for autoreload if ob is a string (presumed filename)."""
-    is_filename = isinstance(ob, text_or_bytes)
-    is_filename and cherrypy.engine.autoreload.files.add(ob)
+# Deprecated in  CherryPy 3.2--remove in 3.3
+NamespaceSet = reprconf.NamespaceSet
 
 
 def merge(base, other):
     """Merge one app config (from a dict, file, or filename) into another.
 
-    If the given config is a filename, it will be appended to the list
-    of files to monitor for "autoreload" changes.
+    If the given config is a filename, it will be appended to
+    the list of files to monitor for "autoreload" changes.
     """
-    _if_filename_register_autoreload(other)
+    if isinstance(other, basestring):
+        cherrypy.engine.autoreload.files.add(other)
 
     # Load other into base
-    for section, value_map in reprconf.Parser.load(other).items():
+    for section, value_map in reprconf.as_dict(other).items():
         if not isinstance(value_map, dict):
             raise ValueError(
-                'Application config must include section headers, but the '
+                "Application config must include section headers, but the "
                 "config you tried to merge doesn't have any sections. "
-                'Wrap your config in another dict with paths as section '
+                "Wrap your config in another dict with paths as section "
                 "headers, for example: {'/': config}.")
         base.setdefault(section, {}).update(value_map)
 
 
 class Config(reprconf.Config):
+
     """The 'global' configuration data for the entire CherryPy process."""
 
     def update(self, config):
         """Update self from a dict, file or filename."""
-        _if_filename_register_autoreload(config)
-        super(Config, self).update(config)
+        if isinstance(config, basestring):
+            # Filename
+            cherrypy.engine.autoreload.files.add(config)
+        reprconf.Config.update(self, config)
 
     def _apply(self, config):
         """Update self from a dict."""
-        if isinstance(config.get('global'), dict):
+        if isinstance(config.get("global"), dict):
             if len(config) > 1:
                 cherrypy.checker.global_config_contained_paths = True
-            config = config['global']
+            config = config["global"]
         if 'tools.staticdir.dir' in config:
-            config['tools.staticdir.section'] = 'global'
-        super(Config, self)._apply(config)
+            config['tools.staticdir.section'] = "global"
+        reprconf.Config._apply(self, config)
+
+    def __call__(self, *args, **kwargs):
+        """Decorator for page handlers to set _cp_config."""
+        if args:
+            raise TypeError(
+                "The cherrypy.config decorator does not accept positional "
+                "arguments; you must use keyword arguments.")
 
-    @staticmethod
-    def __call__(**kwargs):
-        """Decorate for page handlers to set _cp_config."""
         def tool_decorator(f):
-            _Vars(f).setdefault('_cp_config', {}).update(kwargs)
+            if not hasattr(f, "_cp_config"):
+                f._cp_config = {}
+            for k, v in kwargs.items():
+                f._cp_config[k] = v
             return f
         return tool_decorator
 
 
-class _Vars(object):
-    """Adapter allowing setting a default attribute on a function or class."""
-
-    def __init__(self, target):
-        self.target = target
-
-    def setdefault(self, key, default):
-        if not hasattr(self.target, key):
-            setattr(self.target, key, default)
-        return getattr(self.target, key)
-
-
 # Sphinx begin config.environments
 Config.environments = environments = {
-    'staging': {
+    "staging": {
         'engine.autoreload.on': False,
         'checker.on': False,
         'tools.log_headers.on': False,
         'request.show_tracebacks': False,
         'request.show_mismatched_params': False,
     },
-    'production': {
+    "production": {
         'engine.autoreload.on': False,
         'checker.on': False,
         'tools.log_headers.on': False,
@@ -203,7 +200,7 @@ Config.environments = environments = {
         'request.show_mismatched_params': False,
         'log.screen': False,
     },
-    'embedded': {
+    "embedded": {
         # For use with CherryPy embedded in another deployment stack.
         'engine.autoreload.on': False,
         'checker.on': False,
@@ -214,7 +211,7 @@ Config.environments = environments = {
         'engine.SIGHUP': None,
         'engine.SIGTERM': None,
     },
-    'test_suite': {
+    "test_suite": {
         'engine.autoreload.on': False,
         'checker.on': False,
         'tools.log_headers.on': False,
@@ -228,11 +225,11 @@ Config.environments = environments = {
 
 def _server_namespace_handler(k, v):
     """Config handler for the "server" namespace."""
-    atoms = k.split('.', 1)
+    atoms = k.split(".", 1)
     if len(atoms) > 1:
         # Special-case config keys of the form 'server.servername.socket_port'
         # to configure additional HTTP servers.
-        if not hasattr(cherrypy, 'servers'):
+        if not hasattr(cherrypy, "servers"):
             cherrypy.servers = {}
 
         servername, k = atoms
@@ -251,33 +248,60 @@ def _server_namespace_handler(k, v):
             setattr(cherrypy.servers[servername], k, v)
     else:
         setattr(cherrypy.server, k, v)
-
-
-Config.namespaces['server'] = _server_namespace_handler
+Config.namespaces["server"] = _server_namespace_handler
 
 
 def _engine_namespace_handler(k, v):
-    """Config handler for the "engine" namespace."""
+    """Backward compatibility handler for the "engine" namespace."""
     engine = cherrypy.engine
 
-    if k in {'SIGHUP', 'SIGTERM'}:
-        engine.subscribe(k, v)
-        return
+    deprecated = {
+        'autoreload_on': 'autoreload.on',
+        'autoreload_frequency': 'autoreload.frequency',
+        'autoreload_match': 'autoreload.match',
+        'reload_files': 'autoreload.files',
+        'deadlock_poll_freq': 'timeout_monitor.frequency'
+    }
 
-    if '.' in k:
-        plugin, attrname = k.split('.', 1)
+    if k in deprecated:
+        engine.log(
+            'WARNING: Use of engine.%s is deprecated and will be removed in a '
+            'future version. Use engine.%s instead.' % (k, deprecated[k]))
+
+    if k == 'autoreload_on':
+        if v:
+            engine.autoreload.subscribe()
+        else:
+            engine.autoreload.unsubscribe()
+    elif k == 'autoreload_frequency':
+        engine.autoreload.frequency = v
+    elif k == 'autoreload_match':
+        engine.autoreload.match = v
+    elif k == 'reload_files':
+        engine.autoreload.files = set(v)
+    elif k == 'deadlock_poll_freq':
+        engine.timeout_monitor.frequency = v
+    elif k == 'SIGHUP':
+        engine.listeners['SIGHUP'] = set([v])
+    elif k == 'SIGTERM':
+        engine.listeners['SIGTERM'] = set([v])
+    elif "." in k:
+        plugin, attrname = k.split(".", 1)
         plugin = getattr(engine, plugin)
-        op = 'subscribe' if v else 'unsubscribe'
-        sub_unsub = getattr(plugin, op, None)
-        if attrname == 'on' and callable(sub_unsub):
-            sub_unsub()
-            return
+        if attrname == 'on':
+            if v and hasattr(getattr(plugin, 'subscribe', None), '__call__'):
+                plugin.subscribe()
+                return
+            elif (
+                (not v) and
+                hasattr(getattr(plugin, 'unsubscribe', None), '__call__')
+            ):
+                plugin.unsubscribe()
+                return
         setattr(plugin, attrname, v)
     else:
         setattr(engine, k, v)
-
-
-Config.namespaces['engine'] = _engine_namespace_handler
+Config.namespaces["engine"] = _engine_namespace_handler
 
 
 def _tree_namespace_handler(k, v):
@@ -285,11 +309,9 @@ def _tree_namespace_handler(k, v):
     if isinstance(v, dict):
         for script_name, app in v.items():
             cherrypy.tree.graft(app, script_name)
-            msg = 'Mounted: %s on %s' % (app, script_name or '/')
-            cherrypy.engine.log(msg)
+            cherrypy.engine.log("Mounted: %s on %s" %
+                                (app, script_name or "/"))
     else:
         cherrypy.tree.graft(v, v.script_name)
-        cherrypy.engine.log('Mounted: %s on %s' % (v, v.script_name or '/'))
-
-
-Config.namespaces['tree'] = _tree_namespace_handler
+        cherrypy.engine.log("Mounted: %s on %s" % (v, v.script_name or "/"))
+Config.namespaces["tree"] = _tree_namespace_handler
diff --git a/lib/cherrypy/_cpdispatch.py b/lib/cherrypy/_cpdispatch.py
index 5a3a8ad6..1c2d7df8 100644
--- a/lib/cherrypy/_cpdispatch.py
+++ b/lib/cherrypy/_cpdispatch.py
@@ -1,10 +1,9 @@
 """CherryPy dispatchers.
 
 A 'dispatcher' is the object which looks up the 'page handler' callable
-and collects config for the current request based on the path_info,
-other request attributes, and the application architecture. The core
-calls the dispatcher as early as possible, passing it a 'path_info'
-argument.
+and collects config for the current request based on the path_info, other
+request attributes, and the application architecture. The core calls the
+dispatcher as early as possible, passing it a 'path_info' argument.
 
 The default dispatcher discovers the page handler by matching path_info
 to a hierarchical arrangement of objects, starting at request.app.root.
@@ -19,9 +18,11 @@ except AttributeError:
     classtype = type
 
 import cherrypy
+from cherrypy._cpcompat import set
 
 
 class PageHandler(object):
+
     """Callable which sets response.body."""
 
     def __init__(self, callable, *args, **kwargs):
@@ -29,26 +30,32 @@ class PageHandler(object):
         self.args = args
         self.kwargs = kwargs
 
-    @property
-    def args(self):
-        """The ordered args should be accessible from post dispatch hooks."""
+    def get_args(self):
         return cherrypy.serving.request.args
 
-    @args.setter
-    def args(self, args):
+    def set_args(self, args):
         cherrypy.serving.request.args = args
         return cherrypy.serving.request.args
 
-    @property
-    def kwargs(self):
-        """The named kwargs should be accessible from post dispatch hooks."""
+    args = property(
+        get_args,
+        set_args,
+        doc="The ordered args should be accessible from post dispatch hooks"
+    )
+
+    def get_kwargs(self):
         return cherrypy.serving.request.kwargs
 
-    @kwargs.setter
-    def kwargs(self, kwargs):
+    def set_kwargs(self, kwargs):
         cherrypy.serving.request.kwargs = kwargs
         return cherrypy.serving.request.kwargs
 
+    kwargs = property(
+        get_kwargs,
+        set_kwargs,
+        doc="The named kwargs should be accessible from post dispatch hooks"
+    )
+
     def __call__(self):
         try:
             return self.callable(*self.args, **self.kwargs)
@@ -58,13 +65,14 @@ class PageHandler(object):
                 test_callable_spec(self.callable, self.args, self.kwargs)
             except cherrypy.HTTPError:
                 raise sys.exc_info()[1]
-            except Exception:
+            except:
                 raise x
             raise
 
 
 def test_callable_spec(callable, callable_args, callable_kwargs):
-    """Inspect callable and test to see if the given args are suitable for it.
+    """
+    Inspect callable and test to see if the given args are suitable for it.
 
     When an error occurs during the handler's invoking stage there are 2
     erroneous cases:
@@ -95,13 +103,7 @@ def test_callable_spec(callable, callable_args, callable_kwargs):
             # the original error
             raise
 
-    if args and (
-            # For callable objects, which have a __call__(self) method
-            hasattr(callable, '__call__') or
-            # For normal methods
-            inspect.ismethod(callable)
-    ):
-        # Strip 'self'
+    if args and args[0] == 'self':
         args = args[1:]
 
     arg_usage = dict([(arg, 0,) for arg in args])
@@ -152,7 +154,7 @@ def test_callable_spec(callable, callable_args, callable_kwargs):
         # arguments it's definitely a 404.
         message = None
         if show_mismatched_params:
-            message = 'Missing parameters: %s' % ','.join(missing_args)
+            message = "Missing parameters: %s" % ",".join(missing_args)
         raise cherrypy.HTTPError(404, message=message)
 
     # the extra positional arguments come from the path - 404 Not Found
@@ -174,8 +176,8 @@ def test_callable_spec(callable, callable_args, callable_kwargs):
 
         message = None
         if show_mismatched_params:
-            message = 'Multiple values for parameters: '\
-                '%s' % ','.join(multiple_args)
+            message = "Multiple values for parameters: "\
+                "%s" % ",".join(multiple_args)
         raise cherrypy.HTTPError(error, message=message)
 
     if not varkw and varkw_usage > 0:
@@ -185,8 +187,8 @@ def test_callable_spec(callable, callable_args, callable_kwargs):
         if extra_qs_params:
             message = None
             if show_mismatched_params:
-                message = 'Unexpected query string '\
-                    'parameters: %s' % ', '.join(extra_qs_params)
+                message = "Unexpected query string "\
+                    "parameters: %s" % ", ".join(extra_qs_params)
             raise cherrypy.HTTPError(404, message=message)
 
         # If there were any extra body parameters, it's a 400 Not Found
@@ -194,19 +196,21 @@ def test_callable_spec(callable, callable_args, callable_kwargs):
         if extra_body_params:
             message = None
             if show_mismatched_params:
-                message = 'Unexpected body parameters: '\
-                    '%s' % ', '.join(extra_body_params)
+                message = "Unexpected body parameters: "\
+                    "%s" % ", ".join(extra_body_params)
             raise cherrypy.HTTPError(400, message=message)
 
 
 try:
     import inspect
 except ImportError:
-    def test_callable_spec(callable, args, kwargs):  # noqa: F811
-        return None
+    test_callable_spec = lambda callable, args, kwargs: None
 else:
-    def getargspec(callable):
-        return inspect.getfullargspec(callable)[:4]
+    getargspec = inspect.getargspec
+    # Python 3 requires using getfullargspec if keyword-only arguments are present
+    if hasattr(inspect, 'getfullargspec'):
+        def getargspec(callable):
+            return inspect.getfullargspec(callable)[:4]
 
 
 class LateParamPageHandler(PageHandler):
@@ -219,19 +223,20 @@ class LateParamPageHandler(PageHandler):
     (it's more complicated than that, but that's the effect).
     """
 
-    @property
-    def kwargs(self):
-        """Page handler kwargs (with cherrypy.request.params copied in)."""
+    def _get_kwargs(self):
         kwargs = cherrypy.serving.request.params.copy()
         if self._kwargs:
             kwargs.update(self._kwargs)
         return kwargs
 
-    @kwargs.setter
-    def kwargs(self, kwargs):
+    def _set_kwargs(self, kwargs):
         cherrypy.serving.request.kwargs = kwargs
         self._kwargs = kwargs
 
+    kwargs = property(_get_kwargs, _set_kwargs,
+                      doc='page handler kwargs (with '
+                      'cherrypy.request.params copied in)')
+
 
 if sys.version_info < (3, 0):
     punctuation_to_underscores = string.maketrans(
@@ -240,27 +245,27 @@ if sys.version_info < (3, 0):
     def validate_translator(t):
         if not isinstance(t, str) or len(t) != 256:
             raise ValueError(
-                'The translate argument must be a str of len 256.')
+                "The translate argument must be a str of len 256.")
 else:
     punctuation_to_underscores = str.maketrans(
         string.punctuation, '_' * len(string.punctuation))
 
     def validate_translator(t):
         if not isinstance(t, dict):
-            raise ValueError('The translate argument must be a dict.')
+            raise ValueError("The translate argument must be a dict.")
 
 
 class Dispatcher(object):
+
     """CherryPy Dispatcher which walks a tree of objects to find a handler.
 
-    The tree is rooted at cherrypy.request.app.root, and each
-    hierarchical component in the path_info argument is matched to a
-    corresponding nested attribute of the root object. Matching handlers
-    must have an 'exposed' attribute which evaluates to True. The
-    special method name "index" matches a URI which ends in a slash
-    ("/"). The special method name "default" may match a portion of the
-    path_info (but only when no longer substring of the path_info
-    matches some other object).
+    The tree is rooted at cherrypy.request.app.root, and each hierarchical
+    component in the path_info argument is matched to a corresponding nested
+    attribute of the root object. Matching handlers must have an 'exposed'
+    attribute which evaluates to True. The special method name "index"
+    matches a URI which ends in a slash ("/"). The special method name
+    "default" may match a portion of the path_info (but only when no longer
+    substring of the path_info matches some other object).
 
     This is the default, built-in dispatcher for CherryPy.
     """
@@ -285,7 +290,7 @@ class Dispatcher(object):
 
         if func:
             # Decode any leftover %2F in the virtual_path atoms.
-            vpath = [x.replace('%2F', '/') for x in vpath]
+            vpath = [x.replace("%2F", "/") for x in vpath]
             request.handler = LateParamPageHandler(func, *vpath)
         else:
             request.handler = cherrypy.NotFound()
@@ -305,9 +310,9 @@ class Dispatcher(object):
 
         The second object returned will be a list of names which are
         'virtual path' components: parts of the URL which are dynamic,
-        and were not used when looking up the handler. These virtual
-        path components are passed to the handler as positional
-        arguments.
+        and were not used when looking up the handler.
+        These virtual path components are passed to the handler as
+        positional arguments.
         """
         request = cherrypy.serving.request
         app = request.app
@@ -319,10 +324,10 @@ class Dispatcher(object):
         fullpath_len = len(fullpath)
         segleft = fullpath_len
         nodeconf = {}
-        if hasattr(root, '_cp_config'):
+        if hasattr(root, "_cp_config"):
             nodeconf.update(root._cp_config)
-        if '/' in app.config:
-            nodeconf.update(app.config['/'])
+        if "/" in app.config:
+            nodeconf.update(app.config["/"])
         object_trail = [['root', root, nodeconf, segleft]]
 
         node = root
@@ -357,9 +362,9 @@ class Dispatcher(object):
             if segleft > pre_len:
                 # No path segment was removed.  Raise an error.
                 raise cherrypy.CherryPyException(
-                    'A vpath segment was added.  Custom dispatchers may only '
-                    'remove elements.  While trying to process '
-                    '{0} in {1}'.format(name, fullpath)
+                    "A vpath segment was added.  Custom dispatchers may only "
+                    + "remove elements.  While trying to process "
+                    + "{0} in {1}".format(name, fullpath)
                 )
             elif segleft == pre_len:
                 # Assume that the handler used the current path segment, but
@@ -371,7 +376,7 @@ class Dispatcher(object):
 
             if node is not None:
                 # Get _cp_config attached to this node.
-                if hasattr(node, '_cp_config'):
+                if hasattr(node, "_cp_config"):
                     nodeconf.update(node._cp_config)
 
             # Mix in values from app.config for this path.
@@ -410,16 +415,16 @@ class Dispatcher(object):
                 continue
 
             # Try a "default" method on the current leaf.
-            if hasattr(candidate, 'default'):
+            if hasattr(candidate, "default"):
                 defhandler = candidate.default
                 if getattr(defhandler, 'exposed', False):
                     # Insert any extra _cp_config from the default handler.
-                    conf = getattr(defhandler, '_cp_config', {})
+                    conf = getattr(defhandler, "_cp_config", {})
                     object_trail.insert(
-                        i + 1, ['default', defhandler, conf, segleft])
+                        i + 1, ["default", defhandler, conf, segleft])
                     request.config = set_conf()
-                    # See https://github.com/cherrypy/cherrypy/issues/613
-                    request.is_index = path.endswith('/')
+                    # See https://bitbucket.org/cherrypy/cherrypy/issue/613
+                    request.is_index = path.endswith("/")
                     return defhandler, fullpath[fullpath_len - segleft:-1]
 
             # Uncomment the next line to restrict positional params to
@@ -447,11 +452,13 @@ class Dispatcher(object):
 
 
 class MethodDispatcher(Dispatcher):
+
     """Additional dispatch based on cherrypy.request.method.upper().
 
-    Methods named GET, POST, etc will be called on an exposed class. The
-    method names must be all caps; the appropriate Allow header will be
-    output showing all capitalized method names as allowable HTTP verbs.
+    Methods named GET, POST, etc will be called on an exposed class.
+    The method names must be all caps; the appropriate Allow header
+    will be output showing all capitalized method names as allowable
+    HTTP verbs.
 
     Note that the containing class must be exposed, not the methods.
     """
@@ -464,23 +471,23 @@ class MethodDispatcher(Dispatcher):
         if resource:
             # Set Allow header
             avail = [m for m in dir(resource) if m.isupper()]
-            if 'GET' in avail and 'HEAD' not in avail:
-                avail.append('HEAD')
+            if "GET" in avail and "HEAD" not in avail:
+                avail.append("HEAD")
             avail.sort()
-            cherrypy.serving.response.headers['Allow'] = ', '.join(avail)
+            cherrypy.serving.response.headers['Allow'] = ", ".join(avail)
 
             # Find the subhandler
             meth = request.method.upper()
             func = getattr(resource, meth, None)
-            if func is None and meth == 'HEAD':
-                func = getattr(resource, 'GET', None)
+            if func is None and meth == "HEAD":
+                func = getattr(resource, "GET", None)
             if func:
                 # Grab any _cp_config on the subhandler.
-                if hasattr(func, '_cp_config'):
+                if hasattr(func, "_cp_config"):
                     request.config.update(func._cp_config)
 
                 # Decode any leftover %2F in the virtual_path atoms.
-                vpath = [x.replace('%2F', '/') for x in vpath]
+                vpath = [x.replace("%2F", "/") for x in vpath]
                 request.handler = LateParamPageHandler(func, *vpath)
             else:
                 request.handler = cherrypy.HTTPError(405)
@@ -489,14 +496,16 @@ class MethodDispatcher(Dispatcher):
 
 
 class RoutesDispatcher(object):
+
     """A Routes based dispatcher for CherryPy."""
 
     def __init__(self, full_result=False, **mapper_options):
-        """Routes dispatcher.
+        """
+        Routes dispatcher
 
-        Set full_result to True if you wish the controller and the
-        action to be passed on to the page handler parameters. By
-        default they won't be.
+        Set full_result to True if you wish the controller
+        and the action to be passed on to the page handler
+        parameters. By default they won't be.
         """
         import routes
         self.full_result = full_result
@@ -546,28 +555,28 @@ class RoutesDispatcher(object):
 
         # Get config for the root object/path.
         request.config = base = cherrypy.config.copy()
-        curpath = ''
+        curpath = ""
 
         def merge(nodeconf):
             if 'tools.staticdir.dir' in nodeconf:
-                nodeconf['tools.staticdir.section'] = curpath or '/'
+                nodeconf['tools.staticdir.section'] = curpath or "/"
             base.update(nodeconf)
 
         app = request.app
         root = app.root
-        if hasattr(root, '_cp_config'):
+        if hasattr(root, "_cp_config"):
             merge(root._cp_config)
-        if '/' in app.config:
-            merge(app.config['/'])
+        if "/" in app.config:
+            merge(app.config["/"])
 
         # Mix in values from app.config.
-        atoms = [x for x in path_info.split('/') if x]
+        atoms = [x for x in path_info.split("/") if x]
         if atoms:
             last = atoms.pop()
         else:
             last = None
         for atom in atoms:
-            curpath = '/'.join((curpath, atom))
+            curpath = "/".join((curpath, atom))
             if curpath in app.config:
                 merge(app.config[curpath])
 
@@ -579,14 +588,14 @@ class RoutesDispatcher(object):
                 if isinstance(controller, classtype):
                     controller = controller()
                 # Get config from the controller.
-                if hasattr(controller, '_cp_config'):
+                if hasattr(controller, "_cp_config"):
                     merge(controller._cp_config)
 
             action = result.get('action')
             if action is not None:
                 handler = getattr(controller, action, None)
                 # Get config from the handler
-                if hasattr(handler, '_cp_config'):
+                if hasattr(handler, "_cp_config"):
                     merge(handler._cp_config)
             else:
                 handler = controller
@@ -594,7 +603,7 @@ class RoutesDispatcher(object):
         # Do the last path atom here so it can
         # override the controller's _cp_config.
         if last:
-            curpath = '/'.join((curpath, last))
+            curpath = "/".join((curpath, last))
             if curpath in app.config:
                 merge(app.config[curpath])
 
@@ -612,7 +621,8 @@ def XMLRPCDispatcher(next_dispatcher=Dispatcher()):
 
 def VirtualHost(next_dispatcher=Dispatcher(), use_x_forwarded_host=True,
                 **domains):
-    """Select a different handler based on the Host header.
+    """
+    Select a different handler based on the Host header.
 
     This can be useful when running multiple sites within one CP server.
     It allows several domains to point to different parts of a single
@@ -657,16 +667,16 @@ def VirtualHost(next_dispatcher=Dispatcher(), use_x_forwarded_host=True,
 
         domain = header('Host', '')
         if use_x_forwarded_host:
-            domain = header('X-Forwarded-Host', domain)
+            domain = header("X-Forwarded-Host", domain)
 
-        prefix = domains.get(domain, '')
+        prefix = domains.get(domain, "")
         if prefix:
             path_info = httputil.urljoin(prefix, path_info)
 
         result = next_dispatcher(path_info)
 
         # Touch up staticdir config. See
-        # https://github.com/cherrypy/cherrypy/issues/614.
+        # https://bitbucket.org/cherrypy/cherrypy/issue/614.
         section = request.config.get('tools.staticdir.section')
         if section:
             section = section[len(prefix):]
diff --git a/lib/cherrypy/_cperror.py b/lib/cherrypy/_cperror.py
index 203fabf5..6256595b 100644
--- a/lib/cherrypy/_cperror.py
+++ b/lib/cherrypy/_cperror.py
@@ -29,12 +29,10 @@ user:
 300      Multiple Choices                     Confirm with the user
 301      Moved Permanently                    Confirm with the user
 302      Found (Object moved temporarily)     Confirm with the user
-303      See Other                            GET the new URI; no confirmation
-304      Not modified                         for conditional GET only;
-                                              POST should not raise this error
+303      See Other                            GET the new URI--no confirmation
+304      Not modified                         (for conditional GET only--POST should not raise this error)
 305      Use Proxy                            Confirm with the user
 307      Temporary Redirect                   Confirm with the user
-308      Permanent Redirect                   No confirmation
 =====    =================================    ===========
 
 However, browsers have historically implemented these restrictions poorly;
@@ -60,8 +58,7 @@ The 'error_page' config namespace can be used to provide custom HTML output for
 expected responses (like 404 Not Found). Supply a filename from which the
 output will be read. The contents will be interpolated with the values
 %(status)s, %(message)s, %(traceback)s, and %(version)s using plain old Python
-`string formatting
-<http://docs.python.org/2/library/stdtypes.html#string-formatting-operations>`_.
+`string formatting <http://docs.python.org/2/library/stdtypes.html#string-formatting-operations>`_.
 
 ::
 
@@ -103,65 +100,65 @@ send an e-mail containing the error::
     def handle_error():
         cherrypy.response.status = 500
         cherrypy.response.body = [
-            "<html><body>Sorry, an error occurred</body></html>"
+            "<html><body>Sorry, an error occured</body></html>"
         ]
         sendMail('error@domain.com',
                  'Error in your web app',
                  _cperror.format_exc())
 
-    @cherrypy.config(**{'request.error_response': handle_error})
     class Root:
-        pass
+        _cp_config = {'request.error_response': handle_error}
+
 
 Note that you have to explicitly set
 :attr:`response.body <cherrypy._cprequest.Response.body>`
 and not simply return an error message as a result.
 """
 
-import io
-import contextlib
-import urllib.parse
+from cgi import escape as _escape
 from sys import exc_info as _exc_info
 from traceback import format_exception as _format_exception
-from xml.sax import saxutils
-import html
-
-from more_itertools import always_iterable
-
-import cherrypy
-from cherrypy._cpcompat import ntob
-from cherrypy._cpcompat import tonative
-from cherrypy._helper import classproperty
+from cherrypy._cpcompat import basestring, bytestr, iteritems, ntob
+from cherrypy._cpcompat import tonative, urljoin as _urljoin
 from cherrypy.lib import httputil as _httputil
 
 
 class CherryPyException(Exception):
+
     """A base class for CherryPy exceptions."""
     pass
 
 
+class TimeoutError(CherryPyException):
+
+    """Exception raised when Response.timed_out is detected."""
+    pass
+
+
 class InternalRedirect(CherryPyException):
+
     """Exception raised to switch to the handler for a different URL.
 
-    This exception will redirect processing to another path within the
-    site (without informing the client). Provide the new path as an
-    argument when raising the exception. Provide any params in the
-    querystring for the new URL.
+    This exception will redirect processing to another path within the site
+    (without informing the client). Provide the new path as an argument when
+    raising the exception. Provide any params in the querystring for the new
+    URL.
     """
 
-    def __init__(self, path, query_string=''):
+    def __init__(self, path, query_string=""):
+        import cherrypy
         self.request = cherrypy.serving.request
 
         self.query_string = query_string
-        if '?' in path:
+        if "?" in path:
             # Separate any params included in the path
-            path, self.query_string = path.split('?', 1)
+            path, self.query_string = path.split("?", 1)
 
         # Note that urljoin will "do the right thing" whether url is:
         #  1. a URL relative to root (e.g. "/dummy")
         #  2. a URL relative to the current path
         # Note that any query string will be discarded.
-        path = urllib.parse.urljoin(self.request.path_info, path)
+        path = _urljoin(self.request.path_info, path)
 
         # Set a 'path' member attribute so that code which traps this
         # error can have access to it.
@@ -171,6 +168,7 @@ class InternalRedirect(CherryPyException):
 
 
 class HTTPRedirect(CherryPyException):
+
     """Exception raised when the request should be redirected.
 
     This exception will force a HTTP redirect to the URL or URL's you give it.
@@ -195,65 +193,64 @@ class HTTPRedirect(CherryPyException):
     See :ref:`redirectingpost` for additional caveats.
     """
 
+    status = None
+    """The integer HTTP status code to emit."""
+
     urls = None
     """The list of URL's to emit."""
 
     encoding = 'utf-8'
-    """The encoding when passed urls are not native strings."""
+    """The encoding when passed urls are not native strings"""
 
     def __init__(self, urls, status=None, encoding=None):
-        self.urls = abs_urls = [
+        import cherrypy
+        request = cherrypy.serving.request
+
+        if isinstance(urls, basestring):
+            urls = [urls]
+
+        abs_urls = []
+        for url in urls:
+            url = tonative(url, encoding or self.encoding)
+
             # Note that urljoin will "do the right thing" whether url is:
             #  1. a complete URL with host (e.g. "http://www.example.com/test")
             #  2. a URL relative to root (e.g. "/dummy")
             #  3. a URL relative to the current path
             # Note that any query string in cherrypy.request is discarded.
-            urllib.parse.urljoin(
-                cherrypy.url(),
-                tonative(url, encoding or self.encoding),
-            )
-            for url in always_iterable(urls)
-        ]
+            url = _urljoin(cherrypy.url(), url)
+            abs_urls.append(url)
+        self.urls = abs_urls
 
-        status = (
-            int(status)
-            if status is not None
-            else self.default_status
-        )
-        if not 300 <= status <= 399:
-            raise ValueError('status must be between 300 and 399.')
+        # RFC 2616 indicates a 301 response code fits our goal; however,
+        # browser support for 301 is quite messy. Do 302/303 instead. See
+        # http://www.alanflavell.org.uk/www/post-redirect.html
+        if status is None:
+            if request.protocol >= (1, 1):
+                status = 303
+            else:
+                status = 302
+        else:
+            status = int(status)
+            if status < 300 or status > 399:
+                raise ValueError("status must be between 300 and 399.")
 
+        self.status = status
         CherryPyException.__init__(self, abs_urls, status)
 
-    @classproperty
-    def default_status(cls):
-        """The default redirect status for the request.
-
-        RFC 2616 indicates a 301 response code fits our goal; however,
-        browser support for 301 is quite messy. Use 302/303 instead. See
-        http://www.alanflavell.org.uk/www/post-redirect.html
-        """
-        return 303 if cherrypy.serving.request.protocol >= (1, 1) else 302
-
-    @property
-    def status(self):
-        """The integer HTTP status code to emit."""
-        _, status = self.args[:2]
-        return status
-
     def set_response(self):
         """Modify cherrypy.response status, headers, and body to represent
         self.
 
-        CherryPy uses this internally, but you can also use it to create
-        an HTTPRedirect object and set its output without *raising* the
-        exception.
+        CherryPy uses this internally, but you can also use it to create an
+        HTTPRedirect object and set its output without *raising* the exception.
         """
+        import cherrypy
         response = cherrypy.serving.response
         response.status = status = self.status
 
-        if status in (300, 301, 302, 303, 307, 308):
-            response.headers['Content-Type'] = 'text/html;charset=utf-8'
+        if status in (300, 301, 302, 303, 307):
+            response.headers['Content-Type'] = "text/html;charset=utf-8"
             # "The ... URI SHOULD be given by the Location field
             # in the response."
             response.headers['Location'] = self.urls[0]
@@ -262,19 +259,16 @@ class HTTPRedirect(CherryPyException):
             # SHOULD contain a short hypertext note with a hyperlink to the
             # new URI(s)."
             msg = {
-                300: 'This resource can be found at ',
-                301: 'This resource has permanently moved to ',
-                302: 'This resource resides temporarily at ',
-                303: 'This resource can be found at ',
-                307: 'This resource has moved temporarily to ',
-                308: 'This resource has been moved to ',
+                300: "This resource can be found at ",
+                301: "This resource has permanently moved to ",
+                302: "This resource resides temporarily at ",
+                303: "This resource can be found at ",
+                307: "This resource has moved temporarily to ",
             }[status]
             msg += '<a href=%s>%s</a>.'
-            msgs = [
-                msg % (saxutils.quoteattr(u), html.escape(u, quote=False))
-                for u in self.urls
-            ]
-            response.body = ntob('<br />\n'.join(msgs), 'utf-8')
+            from xml.sax import saxutils
+            msgs = [msg % (saxutils.quoteattr(u), u) for u in self.urls]
+            response.body = ntob("<br />\n".join(msgs), 'utf-8')
             # Previous code may have set C-L, so we have to reset it
             # (allow finalize to set it).
             response.headers.pop('Content-Length', None)
@@ -299,12 +293,12 @@ class HTTPRedirect(CherryPyException):
         elif status == 305:
             # Use Proxy.
             # self.urls[0] should be the URI of the proxy.
-            response.headers['Location'] = ntob(self.urls[0], 'utf-8')
+            response.headers['Location'] = self.urls[0]
             response.body = None
             # Previous code may have set C-L, so we have to reset it.
             response.headers.pop('Content-Length', None)
         else:
-            raise ValueError('The %s status code is unknown.' % status)
+            raise ValueError("The %s status code is unknown." % status)
 
     def __call__(self):
         """Use this exception as a request.handler (raise self)."""
@@ -313,14 +307,16 @@ class HTTPRedirect(CherryPyException):
 
 def clean_headers(status):
     """Remove any headers which should not apply to an error response."""
+    import cherrypy
+
     response = cherrypy.serving.response
 
     # Remove headers which applied to the original content,
     # but do not apply to the error page.
     respheaders = response.headers
-    for key in ['Accept-Ranges', 'Age', 'ETag', 'Location', 'Retry-After',
-                'Vary', 'Content-Encoding', 'Content-Length', 'Expires',
-                'Content-Location', 'Content-MD5', 'Last-Modified']:
+    for key in ["Accept-Ranges", "Age", "ETag", "Location", "Retry-After",
+                "Vary", "Content-Encoding", "Content-Length", "Expires",
+                "Content-Location", "Content-MD5", "Last-Modified"]:
         if key in respheaders:
             del respheaders[key]
 
@@ -331,11 +327,12 @@ def clean_headers(status):
         # specifies the current length of the selected resource.
         # A response with status code 206 (Partial Content) MUST NOT
         # include a Content-Range field with a byte-range- resp-spec of "*".
-        if 'Content-Range' in respheaders:
-            del respheaders['Content-Range']
+        if "Content-Range" in respheaders:
+            del respheaders["Content-Range"]
 
 
 class HTTPError(CherryPyException):
+
     """Exception used to return an HTTP error code (4xx-5xx) to the client.
 
     This exception can be used to automatically send a response using a
@@ -354,9 +351,7 @@ class HTTPError(CherryPyException):
     """
 
     status = None
-    """The HTTP status code.
-
-    May be of type int or str (with a Reason-Phrase).
+    """The HTTP status code. May be of type int or str (with a Reason-Phrase).
     """
 
     code = None
@@ -373,7 +368,7 @@ class HTTPError(CherryPyException):
             raise self.__class__(500, _exc_info()[1].args[0])
 
         if self.code < 400 or self.code > 599:
-            raise ValueError('status must be between 400 and 599.')
+            raise ValueError("status must be between 400 and 599.")
 
         # See http://www.python.org/dev/peps/pep-0352/
         # self.message = message
@@ -384,10 +379,11 @@ class HTTPError(CherryPyException):
         """Modify cherrypy.response status, headers, and body to represent
         self.
 
-        CherryPy uses this internally, but you can also use it to create
-        an HTTPError object and set its output without *raising* the
-        exception.
+        CherryPy uses this internally, but you can also use it to create an
+        HTTPError object and set its output without *raising* the exception.
         """
+        import cherrypy
+
         response = cherrypy.serving.response
 
         clean_headers(self.code)
@@ -414,25 +410,18 @@ class HTTPError(CherryPyException):
         """Use this exception as a request.handler (raise self)."""
         raise self
 
-    @classmethod
-    @contextlib.contextmanager
-    def handle(cls, exception, status=500, message=''):
-        """Translate exception into an HTTPError."""
-        try:
-            yield
-        except exception as exc:
-            raise cls(status, message or str(exc))
-
 
 class NotFound(HTTPError):
+
     """Exception raised when a URL could not be mapped to any handler (404).
 
-    This is equivalent to raising :class:`HTTPError("404 Not Found")
-    <cherrypy._cperror.HTTPError>`.
+    This is equivalent to raising
+    :class:`HTTPError("404 Not Found") <cherrypy._cperror.HTTPError>`.
     """
 
     def __init__(self, path=None):
         if path is None:
+            import cherrypy
             request = cherrypy.serving.request
             path = request.script_name + request.path_info
         self.args = (path,)
@@ -464,7 +453,7 @@ _HTTPErrorTemplate = '''<!DOCTYPE html PUBLIC
         <pre id="traceback">%(traceback)s</pre>
     <div id="powered_by">
       <span>
-        Powered by <a href="http://www.cherrypy.dev">CherryPy %(version)s</a>
+        Powered by <a href="http://www.cherrypy.org">CherryPy %(version)s</a>
       </span>
     </div>
     </body>
@@ -475,9 +464,11 @@ _HTTPErrorTemplate = '''<!DOCTYPE html PUBLIC
 def get_error_page(status, **kwargs):
     """Return an HTML page, containing a pretty error response.
 
-    status should be an int or a str. kwargs will be interpolated into
-    the page template.
+    status should be an int or a str.
+    kwargs will be interpolated into the page template.
     """
+    import cherrypy
+
     try:
         code, reason, message = _httputil.valid_status(status)
     except ValueError:
@@ -486,7 +477,7 @@ def get_error_page(status, **kwargs):
     # We can't use setdefault here, because some
     # callers send None for kwarg values.
     if kwargs.get('status') is None:
-        kwargs['status'] = '%s %s' % (code, reason)
+        kwargs['status'] = "%s %s" % (code, reason)
     if kwargs.get('message') is None:
         kwargs['message'] = message
     if kwargs.get('traceback') is None:
@@ -494,11 +485,11 @@ def get_error_page(status, **kwargs):
     if kwargs.get('version') is None:
         kwargs['version'] = cherrypy.__version__
 
-    for k, v in kwargs.items():
+    for k, v in iteritems(kwargs):
         if v is None:
-            kwargs[k] = ''
+            kwargs[k] = ""
         else:
-            kwargs[k] = html.escape(kwargs[k], quote=False)
+            kwargs[k] = _escape(kwargs[k])
 
     # Use a custom template or callable for the error page?
     pages = cherrypy.serving.request.error_page
@@ -518,34 +509,33 @@ def get_error_page(status, **kwargs):
                 if cherrypy.lib.is_iterator(result):
                     from cherrypy.lib.encoding import UTF8StreamEncoder
                     return UTF8StreamEncoder(result)
-                elif isinstance(result, str):
+                elif isinstance(result, cherrypy._cpcompat.unicodestr):
                     return result.encode('utf-8')
                 else:
-                    if not isinstance(result, bytes):
-                        raise ValueError(
-                            'error page function did not '
-                            'return a bytestring, str or an '
+                    if not isinstance(result, cherrypy._cpcompat.bytestr):
+                        raise ValueError('error page function did not '
+                            'return a bytestring, unicodestring or an '
                             'iterator - returned object of type %s.'
                             % (type(result).__name__))
                     return result
             else:
                 # Load the template from this path.
-                with io.open(error_page, newline='') as f:
-                    template = f.read()
-        except Exception:
+                template = tonative(open(error_page, 'rb').read())
+        except:
             e = _format_exception(*_exc_info())[-1]
             m = kwargs['message']
             if m:
-                m += '<br />'
-            m += 'In addition, the custom error page failed:\n<br />%s' % e
+                m += "<br />"
+            m += "In addition, the custom error page failed:\n<br />%s" % e
             kwargs['message'] = m
 
     response = cherrypy.serving.response
-    response.headers['Content-Type'] = 'text/html;charset=utf-8'
+    response.headers['Content-Type'] = "text/html;charset=utf-8"
     result = template % kwargs
     return result.encode('utf-8')
 
 
+
 _ie_friendly_error_sizes = {
     400: 512, 403: 256, 404: 512, 405: 256,
     406: 512, 408: 512, 409: 512, 410: 256,
@@ -554,6 +544,7 @@ _ie_friendly_error_sizes = {
 
 
 def _be_ie_unfriendly(status):
+    import cherrypy
     response = cherrypy.serving.response
 
     # For some statuses, Internet Explorer 5+ shows "friendly error
@@ -567,11 +558,11 @@ def _be_ie_unfriendly(status):
         # Since we are issuing an HTTP error status, we assume that
         # the entity is short, and we should just collapse it.
         content = response.collapse_body()
-        content_length = len(content)
-        if content_length and content_length < s:
+        l = len(content)
+        if l and l < s:
             # IN ADDITION: the response must be written to IE
             # in one chunk or it will still get replaced! Bah.
-            content = content + (b' ' * (s - content_length))
+            content = content + (ntob(" ") * (s - l))
         response.body = content
         response.headers['Content-Length'] = str(len(content))
 
@@ -582,9 +573,9 @@ def format_exc(exc=None):
         if exc is None:
             exc = _exc_info()
         if exc == (None, None, None):
-            return ''
+            return ""
         import traceback
-        return ''.join(traceback.format_exception(*exc))
+        return "".join(traceback.format_exception(*exc))
     finally:
         del exc
 
@@ -593,8 +584,8 @@ def bare_error(extrabody=None):
     """Produce status, headers, body for a critical error.
 
     Returns a triple without calling any other questionable functions,
-    so it should be as error-free as possible. Call it from an HTTP
-    server if you get errors outside of the request.
+    so it should be as error-free as possible. Call it from an HTTP server
+    if you get errors outside of the request.
 
     If extrabody is None, a friendly but rather unhelpful error message
     is set in the body. If extrabody is a string, it will be appended
@@ -606,13 +597,13 @@ def bare_error(extrabody=None):
     # it cannot be allowed to fail. Therefore, don't add to it!
     # In particular, don't call any other CP functions.
 
-    body = b'Unrecoverable error in the server.'
+    body = ntob("Unrecoverable error in the server.")
     if extrabody is not None:
-        if not isinstance(extrabody, bytes):
+        if not isinstance(extrabody, bytestr):
             extrabody = extrabody.encode('utf-8')
-        body += b'\n' + extrabody
+        body += ntob("\n") + extrabody
 
-    return (b'500 Internal Server Error',
-            [(b'Content-Type', b'text/plain'),
-             (b'Content-Length', ntob(str(len(body)), 'ISO-8859-1'))],
+    return (ntob("500 Internal Server Error"),
+            [(ntob('Content-Type'), ntob('text/plain')),
+             (ntob('Content-Length'), ntob(str(len(body)), 'ISO-8859-1'))],
             [body])
diff --git a/lib/cherrypy/_cplogging.py b/lib/cherrypy/_cplogging.py
index 754ac7bf..19d1d91e 100644
--- a/lib/cherrypy/_cplogging.py
+++ b/lib/cherrypy/_cplogging.py
@@ -59,8 +59,7 @@ tracebacks, if enabled).
 If you are logging the access log and error log to the same source, then there
 is a possibility that a specially crafted error message may replicate an access
 log message as described in CWE-117.  In this case it is the application
-developer's responsibility to manually escape data before
-using CherryPy's log()
+developer's responsibility to manually escape data before using CherryPy's log()
 functionality, or they may create an application that is vulnerable to CWE-117.
 This would be achieved by using a custom handler escape any special characters,
 and attached as described below.
@@ -110,19 +109,19 @@ the "log.error_file" config entry, for example).
 
 import datetime
 import logging
+# Silence the no-handlers "warning" (stderr write!) in stdlib logging
+logging.Logger.manager.emittedNoHandlerWarning = 1
+logfmt = logging.Formatter("%(message)s")
 import os
 import sys
 
 import cherrypy
 from cherrypy import _cperror
-
-
-# Silence the no-handlers "warning" (stderr write!) in stdlib logging
-logging.Logger.manager.emittedNoHandlerWarning = 1
-logfmt = logging.Formatter('%(message)s')
+from cherrypy._cpcompat import ntob, py3k
 
 
 class NullHandler(logging.Handler):
+
     """A no-op logging handler to silence the logging.lastResort handler."""
 
     def handle(self, record):
@@ -136,16 +135,15 @@ class NullHandler(logging.Handler):
 
 
 class LogManager(object):
+
     """An object to assist both simple and advanced logging.
 
     ``cherrypy.log`` is an instance of this class.
     """
 
     appid = None
-    """The id() of the Application object which owns this log manager.
-
-    If this is a global log manager, appid is None.
-    """
+    """The id() of the Application object which owns this log manager. If this
+    is a global log manager, appid is None."""
 
     error_log = None
     """The actual :class:`logging.Logger` instance for error messages."""
@@ -153,7 +151,12 @@ class LogManager(object):
     access_log = None
     """The actual :class:`logging.Logger` instance for access messages."""
 
-    access_log_format = '{h} {l} {u} {t} "{r}" {s} {b} "{f}" "{a}"'
+    if py3k:
+        access_log_format = \
+            '{h} {l} {u} {t} "{r}" {s} {b} "{f}" "{a}"'
+    else:
+        access_log_format = \
+            '%(h)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s"'
 
     logger_root = None
     """The "top-level" logger name.
@@ -166,17 +169,17 @@ class LogManager(object):
         cherrypy.access.<appid>
     """
 
-    def __init__(self, appid=None, logger_root='cherrypy'):
+    def __init__(self, appid=None, logger_root="cherrypy"):
         self.logger_root = logger_root
         self.appid = appid
         if appid is None:
-            self.error_log = logging.getLogger('%s.error' % logger_root)
-            self.access_log = logging.getLogger('%s.access' % logger_root)
+            self.error_log = logging.getLogger("%s.error" % logger_root)
+            self.access_log = logging.getLogger("%s.access" % logger_root)
         else:
             self.error_log = logging.getLogger(
-                '%s.error.%s' % (logger_root, appid))
+                "%s.error.%s" % (logger_root, appid))
             self.access_log = logging.getLogger(
-                '%s.access.%s' % (logger_root, appid))
+                "%s.access.%s" % (logger_root, appid))
         self.error_log.setLevel(logging.INFO)
         self.access_log.setLevel(logging.INFO)
 
@@ -210,11 +213,7 @@ class LogManager(object):
         if traceback:
             exc_info = _cperror._exc_info()
 
-        self.error_log.log(
-            severity,
-            ' '.join((self.time(), context, msg)),
-            exc_info=exc_info,
-        )
+        self.error_log.log(severity, ' '.join((self.time(), context, msg)), exc_info=exc_info)
 
     def __call__(self, *args, **kwargs):
         """An alias for ``error``."""
@@ -224,8 +223,7 @@ class LogManager(object):
         """Write to the access log (in Apache/NCSA Combined Log format).
 
         See the
-        `apache documentation
-        <http://httpd.apache.org/docs/current/logs.html#combined>`_
+        `apache documentation <http://httpd.apache.org/docs/current/logs.html#combined>`_
         for format details.
 
         CherryPy calls this automatically for you. Note there are no arguments;
@@ -245,45 +243,62 @@ class LogManager(object):
         outheaders = response.headers
         inheaders = request.headers
         if response.output_status is None:
-            status = '-'
+            status = "-"
         else:
-            status = response.output_status.split(b' ', 1)[0]
-            status = status.decode('ISO-8859-1')
+            status = response.output_status.split(ntob(" "), 1)[0]
+            if py3k:
+                status = status.decode('ISO-8859-1')
 
         atoms = {'h': remote.name or remote.ip,
                  'l': '-',
-                 'u': getattr(request, 'login', None) or '-',
+                 'u': getattr(request, "login", None) or "-",
                  't': self.time(),
                  'r': request.request_line,
                  's': status,
-                 'b': dict.get(outheaders, 'Content-Length', '') or '-',
+                 'b': dict.get(outheaders, 'Content-Length', '') or "-",
                  'f': dict.get(inheaders, 'Referer', ''),
                  'a': dict.get(inheaders, 'User-Agent', ''),
                  'o': dict.get(inheaders, 'Host', '-'),
-                 'i': request.unique_id,
-                 'z': LazyRfc3339UtcTime(),
                  }
-        for k, v in atoms.items():
-            if not isinstance(v, str):
-                v = str(v)
-            v = v.replace('"', '\\"').encode('utf8')
-            # Fortunately, repr(str) escapes unprintable chars, \n, \t, etc
-            # and backslash for us. All we have to do is strip the quotes.
-            v = repr(v)[2:-1]
+        if py3k:
+            for k, v in atoms.items():
+                if not isinstance(v, str):
+                    v = str(v)
+                v = v.replace('"', '\\"').encode('utf8')
+                # Fortunately, repr(str) escapes unprintable chars, \n, \t, etc
+                # and backslash for us. All we have to do is strip the quotes.
+                v = repr(v)[2:-1]
 
-            # in python 3.0 the repr of bytes (as returned by encode)
-            # uses double \'s.  But then the logger escapes them yet, again
-            # resulting in quadruple slashes.  Remove the extra one here.
-            v = v.replace('\\\\', '\\')
+                # in python 3.0 the repr of bytes (as returned by encode)
+                # uses double \'s.  But then the logger escapes them yet, again
+                # resulting in quadruple slashes.  Remove the extra one here.
+                v = v.replace('\\\\', '\\')
 
-            # Escape double-quote.
-            atoms[k] = v
+                # Escape double-quote.
+                atoms[k] = v
 
-        try:
-            self.access_log.log(
-                logging.INFO, self.access_log_format.format(**atoms))
-        except Exception:
-            self(traceback=True)
+            try:
+                self.access_log.log(
+                    logging.INFO, self.access_log_format.format(**atoms))
+            except:
+                self(traceback=True)
+        else:
+            for k, v in atoms.items():
+                if isinstance(v, unicode):
+                    v = v.encode('utf8')
+                elif not isinstance(v, str):
+                    v = str(v)
+                # Fortunately, repr(str) escapes unprintable chars, \n, \t, etc
+                # and backslash for us. All we have to do is strip the quotes.
+                v = repr(v)[1:-1]
+                # Escape double-quote.
+                atoms[k] = v.replace('"', '\\"')
+
+            try:
+                self.access_log.log(
+                    logging.INFO, self.access_log_format % atoms)
+            except:
+                self(traceback=True)
 
     def time(self):
         """Return now() in Apache Common Log Format (no timezone)."""
@@ -296,49 +311,48 @@ class LogManager(object):
 
     def _get_builtin_handler(self, log, key):
         for h in log.handlers:
-            if getattr(h, '_cpbuiltin', None) == key:
+            if getattr(h, "_cpbuiltin", None) == key:
                 return h
 
     # ------------------------- Screen handlers ------------------------- #
     def _set_screen_handler(self, log, enable, stream=None):
-        h = self._get_builtin_handler(log, 'screen')
+        h = self._get_builtin_handler(log, "screen")
         if enable:
             if not h:
                 if stream is None:
                     stream = sys.stderr
                 h = logging.StreamHandler(stream)
                 h.setFormatter(logfmt)
-                h._cpbuiltin = 'screen'
+                h._cpbuiltin = "screen"
                 log.addHandler(h)
         elif h:
             log.handlers.remove(h)
 
-    @property
-    def screen(self):
-        """Turn stderr/stdout logging on or off.
-
-        If you set this to True, it'll add the appropriate StreamHandler
-        for you. If you set it to False, it will remove the handler.
-        """
+    def _get_screen(self):
         h = self._get_builtin_handler
-        has_h = h(self.error_log, 'screen') or h(self.access_log, 'screen')
+        has_h = h(self.error_log, "screen") or h(self.access_log, "screen")
         return bool(has_h)
 
-    @screen.setter
-    def screen(self, newvalue):
+    def _set_screen(self, newvalue):
         self._set_screen_handler(self.error_log, newvalue, stream=sys.stderr)
         self._set_screen_handler(self.access_log, newvalue, stream=sys.stdout)
+    screen = property(_get_screen, _set_screen,
+                      doc="""Turn stderr/stdout logging on or off.
+
+        If you set this to True, it'll add the appropriate StreamHandler for
+        you. If you set it to False, it will remove the handler.
+        """)
 
     # -------------------------- File handlers -------------------------- #
 
     def _add_builtin_file_handler(self, log, fname):
         h = logging.FileHandler(fname)
         h.setFormatter(logfmt)
-        h._cpbuiltin = 'file'
+        h._cpbuiltin = "file"
         log.addHandler(h)
 
     def _set_file_handler(self, log, filename):
-        h = self._get_builtin_handler(log, 'file')
+        h = self._get_builtin_handler(log, "file")
         if filename:
             if h:
                 if h.baseFilename != os.path.abspath(filename):
@@ -352,68 +366,66 @@ class LogManager(object):
                 h.close()
                 log.handlers.remove(h)
 
-    @property
-    def error_file(self):
-        """The filename for self.error_log.
-
-        If you set this to a string, it'll add the appropriate FileHandler for
-        you. If you set it to ``None`` or ``''``, it will remove the handler.
-        """
-        h = self._get_builtin_handler(self.error_log, 'file')
+    def _get_error_file(self):
+        h = self._get_builtin_handler(self.error_log, "file")
         if h:
             return h.baseFilename
         return ''
 
-    @error_file.setter
-    def error_file(self, newvalue):
+    def _set_error_file(self, newvalue):
         self._set_file_handler(self.error_log, newvalue)
-
-    @property
-    def access_file(self):
-        """The filename for self.access_log.
+    error_file = property(_get_error_file, _set_error_file,
+                          doc="""The filename for self.error_log.
 
         If you set this to a string, it'll add the appropriate FileHandler for
         you. If you set it to ``None`` or ``''``, it will remove the handler.
-        """
-        h = self._get_builtin_handler(self.access_log, 'file')
+        """)
+
+    def _get_access_file(self):
+        h = self._get_builtin_handler(self.access_log, "file")
         if h:
             return h.baseFilename
         return ''
 
-    @access_file.setter
-    def access_file(self, newvalue):
+    def _set_access_file(self, newvalue):
         self._set_file_handler(self.access_log, newvalue)
+    access_file = property(_get_access_file, _set_access_file,
+                           doc="""The filename for self.access_log.
+
+        If you set this to a string, it'll add the appropriate FileHandler for
+        you. If you set it to ``None`` or ``''``, it will remove the handler.
+        """)
 
     # ------------------------- WSGI handlers ------------------------- #
 
     def _set_wsgi_handler(self, log, enable):
-        h = self._get_builtin_handler(log, 'wsgi')
+        h = self._get_builtin_handler(log, "wsgi")
         if enable:
             if not h:
                 h = WSGIErrorHandler()
                 h.setFormatter(logfmt)
-                h._cpbuiltin = 'wsgi'
+                h._cpbuiltin = "wsgi"
                 log.addHandler(h)
         elif h:
             log.handlers.remove(h)
 
-    @property
-    def wsgi(self):
-        """Write errors to wsgi.errors.
+    def _get_wsgi(self):
+        return bool(self._get_builtin_handler(self.error_log, "wsgi"))
+
+    def _set_wsgi(self, newvalue):
+        self._set_wsgi_handler(self.error_log, newvalue)
+    wsgi = property(_get_wsgi, _set_wsgi,
+                    doc="""Write errors to wsgi.errors.
 
         If you set this to True, it'll add the appropriate
         :class:`WSGIErrorHandler<cherrypy._cplogging.WSGIErrorHandler>` for you
         (which writes errors to ``wsgi.errors``).
         If you set it to False, it will remove the handler.
-        """
-        return bool(self._get_builtin_handler(self.error_log, 'wsgi'))
-
-    @wsgi.setter
-    def wsgi(self, newvalue):
-        self._set_wsgi_handler(self.error_log, newvalue)
+        """)
 
 
 class WSGIErrorHandler(logging.Handler):
+
     "A handler class which writes logging records to environ['wsgi.errors']."
 
     def flush(self):
@@ -434,25 +446,16 @@ class WSGIErrorHandler(logging.Handler):
         else:
             try:
                 msg = self.format(record)
-                fs = '%s\n'
+                fs = "%s\n"
                 import types
                 # if no unicode support...
-                if not hasattr(types, 'UnicodeType'):
+                if not hasattr(types, "UnicodeType"):
                     stream.write(fs % msg)
                 else:
                     try:
                         stream.write(fs % msg)
                     except UnicodeError:
-                        stream.write(fs % msg.encode('UTF-8'))
+                        stream.write(fs % msg.encode("UTF-8"))
                 self.flush()
-            except Exception:
+            except:
                 self.handleError(record)
-
-
-class LazyRfc3339UtcTime(object):
-    def __str__(self):
-        """Return datetime in RFC3339 UTC Format."""
-        iso_formatted_now = datetime.datetime.now(
-            datetime.timezone.utc,
-        ).isoformat('T')
-        return f'{iso_formatted_now!s}Z'
diff --git a/lib/cherrypy/_cpmodpy.py b/lib/cherrypy/_cpmodpy.py
index 7c01233d..02154d69 100644
--- a/lib/cherrypy/_cpmodpy.py
+++ b/lib/cherrypy/_cpmodpy.py
@@ -1,4 +1,4 @@
-"""Native adapter for serving CherryPy via mod_python.
+"""Native adapter for serving CherryPy via mod_python
 
 Basic usage:
 
@@ -55,15 +55,11 @@ resides in the global site-package this won't be needed.
 Then restart apache2 and access http://127.0.0.1:8080
 """
 
-import io
 import logging
-import os
-import re
 import sys
 
-from more_itertools import always_iterable
-
 import cherrypy
+from cherrypy._cpcompat import BytesIO, copyitems, ntob
 from cherrypy._cperror import format_exc, bare_error
 from cherrypy.lib import httputil
 
@@ -89,19 +85,18 @@ def setup(req):
                 func()
 
     cherrypy.config.update({'log.screen': False,
-                            'tools.ignore_headers.on': True,
-                            'tools.ignore_headers.headers': ['Range'],
+                            "tools.ignore_headers.on": True,
+                            "tools.ignore_headers.headers": ['Range'],
                             })
 
     engine = cherrypy.engine
-    if hasattr(engine, 'signal_handler'):
+    if hasattr(engine, "signal_handler"):
         engine.signal_handler.unsubscribe()
-    if hasattr(engine, 'console_control_handler'):
+    if hasattr(engine, "console_control_handler"):
         engine.console_control_handler.unsubscribe()
     engine.autoreload.unsubscribe()
     cherrypy.server.unsubscribe()
 
-    @engine.subscribe('log')
     def _log(msg, level):
         newlevel = apache.APLOG_ERR
         if logging.DEBUG >= level:
@@ -114,6 +109,7 @@ def setup(req):
         # http://www.modpython.org/pipermail/mod_python/2003-October/014291.html
         # Also, "When server is not specified...LogLevel does not apply..."
         apache.log_error(msg, newlevel, req.server)
+    engine.subscribe('log', _log)
 
     engine.start()
 
@@ -150,10 +146,10 @@ def handler(req):
         # Obtain a Request object from CherryPy
         local = req.connection.local_addr
         local = httputil.Host(
-            local[0], local[1], req.connection.local_host or '')
+            local[0], local[1], req.connection.local_host or "")
         remote = req.connection.remote_addr
         remote = httputil.Host(
-            remote[0], remote[1], req.connection.remote_host or '')
+            remote[0], remote[1], req.connection.remote_host or "")
 
         scheme = req.parsed_uri[0] or 'http'
         req.get_basic_auth_pw()
@@ -166,9 +162,7 @@ def handler(req):
         except AttributeError:
             bad_value = ("You must provide a PythonOption '%s', "
                          "either 'on' or 'off', when running a version "
-                         'of mod_python < 3.1')
-
-            options = req.get_options()
+                         "of mod_python < 3.1")
 
             threaded = options.get('multithread', '').lower()
             if threaded == 'on':
@@ -176,7 +170,7 @@ def handler(req):
             elif threaded == 'off':
                 threaded = False
             else:
-                raise ValueError(bad_value % 'multithread')
+                raise ValueError(bad_value % "multithread")
 
             forked = options.get('multiprocess', '').lower()
             if forked == 'on':
@@ -184,18 +178,18 @@ def handler(req):
             elif forked == 'off':
                 forked = False
             else:
-                raise ValueError(bad_value % 'multiprocess')
+                raise ValueError(bad_value % "multiprocess")
 
-        sn = cherrypy.tree.script_name(req.uri or '/')
+        sn = cherrypy.tree.script_name(req.uri or "/")
         if sn is None:
             send_response(req, '404 Not Found', [], '')
         else:
             app = cherrypy.tree.apps[sn]
             method = req.method
             path = req.uri
-            qs = req.args or ''
+            qs = req.args or ""
             reqproto = req.protocol
-            headers = list(req.headers_in.copy().items())
+            headers = copyitems(req.headers_in)
             rfile = _ReadOnlyRequest(req)
             prev = None
 
@@ -203,7 +197,7 @@ def handler(req):
                 redirections = []
                 while True:
                     request, response = app.get_serving(local, remote, scheme,
-                                                        'HTTP/1.1')
+                                                        "HTTP/1.1")
                     request.login = req.user
                     request.multithread = bool(threaded)
                     request.multiprocess = bool(forked)
@@ -222,27 +216,27 @@ def handler(req):
                         if not recursive:
                             if ir.path in redirections:
                                 raise RuntimeError(
-                                    'InternalRedirector visited the same URL '
-                                    'twice: %r' % ir.path)
+                                    "InternalRedirector visited the same URL "
+                                    "twice: %r" % ir.path)
                             else:
                                 # Add the *previous* path_info + qs to
                                 # redirections.
                                 if qs:
-                                    qs = '?' + qs
+                                    qs = "?" + qs
                                 redirections.append(sn + path + qs)
 
                         # Munge environment and try again.
-                        method = 'GET'
+                        method = "GET"
                         path = ir.path
                         qs = ir.query_string
-                        rfile = io.BytesIO()
+                        rfile = BytesIO()
 
                 send_response(
                     req, response.output_status, response.header_list,
                     response.body, response.stream)
             finally:
                 app.release_serving()
-    except Exception:
+    except:
         tb = format_exc()
         cherrypy.log(tb, 'MOD_PYTHON', severity=logging.ERROR)
         s, h, b = bare_error()
@@ -255,7 +249,7 @@ def send_response(req, status, headers, body, stream=False):
     req.status = int(status[:3])
 
     # Set response headers
-    req.content_type = 'text/plain'
+    req.content_type = "text/plain"
     for header, value in headers:
         if header.lower() == 'content-type':
             req.content_type = value
@@ -267,11 +261,16 @@ def send_response(req, status, headers, body, stream=False):
         req.flush()
 
     # Set response body
-    for seg in always_iterable(body):
-        req.write(seg)
+    if isinstance(body, basestring):
+        req.write(body)
+    else:
+        for seg in body:
+            req.write(seg)
 
 
 # --------------- Startup tools for CherryPy + mod_python --------------- #
+import os
+import re
 try:
     import subprocess
 
@@ -286,13 +285,13 @@ except ImportError:
         return pipeout
 
 
-def read_process(cmd, args=''):
-    fullcmd = '%s %s' % (cmd, args)
+def read_process(cmd, args=""):
+    fullcmd = "%s %s" % (cmd, args)
     pipeout = popen(fullcmd)
     try:
         firstline = pipeout.readline()
         cmd_not_found = re.search(
-            b'(not recognized|No such file|not found)',
+            ntob("(not recognized|No such file|not found)"),
             firstline,
             re.IGNORECASE
         )
@@ -321,8 +320,8 @@ LoadModule python_module modules/mod_python.so
 </Location>
 """
 
-    def __init__(self, loc='/', port=80, opts=None, apache_path='apache',
-                 handler='cherrypy._cpmodpy::handler'):
+    def __init__(self, loc="/", port=80, opts=None, apache_path="apache",
+                 handler="cherrypy._cpmodpy::handler"):
         self.loc = loc
         self.port = port
         self.opts = opts
@@ -330,22 +329,25 @@ LoadModule python_module modules/mod_python.so
         self.handler = handler
 
     def start(self):
-        opts = ''.join(['    PythonOption %s %s\n' % (k, v)
+        opts = "".join(["    PythonOption %s %s\n" % (k, v)
                         for k, v in self.opts])
-        conf_data = self.template % {'port': self.port,
-                                     'loc': self.loc,
-                                     'opts': opts,
-                                     'handler': self.handler,
+        conf_data = self.template % {"port": self.port,
+                                     "loc": self.loc,
+                                     "opts": opts,
+                                     "handler": self.handler,
                                      }
 
-        mpconf = os.path.join(os.path.dirname(__file__), 'cpmodpy.conf')
-        with open(mpconf, 'wb') as f:
+        mpconf = os.path.join(os.path.dirname(__file__), "cpmodpy.conf")
+        f = open(mpconf, 'wb')
+        try:
             f.write(conf_data)
+        finally:
+            f.close()
 
-        response = read_process(self.apache_path, '-k start -f %s' % mpconf)
+        response = read_process(self.apache_path, "-k start -f %s" % mpconf)
         self.ready = True
         return response
 
     def stop(self):
-        os.popen('apache -k stop')
+        os.popen("apache -k stop")
         self.ready = False
diff --git a/lib/cherrypy/_cpnative_server.py b/lib/cherrypy/_cpnative_server.py
index 0dfc3682..e303573d 100644
--- a/lib/cherrypy/_cpnative_server.py
+++ b/lib/cherrypy/_cpnative_server.py
@@ -2,45 +2,37 @@
 
 import logging
 import sys
-import io
-
-import cheroot.server
 
 import cherrypy
+from cherrypy._cpcompat import BytesIO
 from cherrypy._cperror import format_exc, bare_error
 from cherrypy.lib import httputil
-from ._cpcompat import tonative
+from cherrypy import wsgiserver
 
 
-class NativeGateway(cheroot.server.Gateway):
-    """Native gateway implementation allowing to bypass WSGI."""
+class NativeGateway(wsgiserver.Gateway):
 
     recursive = False
 
     def respond(self):
-        """Obtain response from CherryPy machinery and then send it."""
         req = self.req
         try:
             # Obtain a Request object from CherryPy
-            local = req.server.bind_addr  # FIXME: handle UNIX sockets
-            local = tonative(local[0]), local[1]
-            local = httputil.Host(local[0], local[1], '')
-            remote = tonative(req.conn.remote_addr), req.conn.remote_port
-            remote = httputil.Host(remote[0], remote[1], '')
+            local = req.server.bind_addr
+            local = httputil.Host(local[0], local[1], "")
+            remote = req.conn.remote_addr, req.conn.remote_port
+            remote = httputil.Host(remote[0], remote[1], "")
 
-            scheme = tonative(req.scheme)
-            sn = cherrypy.tree.script_name(tonative(req.uri or '/'))
+            scheme = req.scheme
+            sn = cherrypy.tree.script_name(req.uri or "/")
             if sn is None:
                 self.send_response('404 Not Found', [], [''])
             else:
                 app = cherrypy.tree.apps[sn]
-                method = tonative(req.method)
-                path = tonative(req.path)
-                qs = tonative(req.qs or '')
-                headers = (
-                    (tonative(h), tonative(v))
-                    for h, v in req.inheaders.items()
-                )
+                method = req.method
+                path = req.path
+                qs = req.qs or ""
+                headers = req.inheaders.items()
                 rfile = req.rfile
                 prev = None
 
@@ -48,7 +40,7 @@ class NativeGateway(cheroot.server.Gateway):
                     redirections = []
                     while True:
                         request, response = app.get_serving(
-                            local, remote, scheme, 'HTTP/1.1')
+                            local, remote, scheme, "HTTP/1.1")
                         request.multithread = True
                         request.multiprocess = False
                         request.app = app
@@ -57,11 +49,8 @@ class NativeGateway(cheroot.server.Gateway):
                         # Run the CherryPy Request object and obtain the
                         # response
                         try:
-                            request.run(
-                                method, path, qs,
-                                tonative(req.request_protocol),
-                                headers, rfile,
-                            )
+                            request.run(method, path, qs,
+                                        req.request_protocol, headers, rfile)
                             break
                         except cherrypy.InternalRedirect:
                             ir = sys.exc_info()[1]
@@ -71,27 +60,27 @@ class NativeGateway(cheroot.server.Gateway):
                             if not self.recursive:
                                 if ir.path in redirections:
                                     raise RuntimeError(
-                                        'InternalRedirector visited the same '
-                                        'URL twice: %r' % ir.path)
+                                        "InternalRedirector visited the same "
+                                        "URL twice: %r" % ir.path)
                                 else:
                                     # Add the *previous* path_info + qs to
                                     # redirections.
                                     if qs:
-                                        qs = '?' + qs
+                                        qs = "?" + qs
                                     redirections.append(sn + path + qs)
 
                             # Munge environment and try again.
-                            method = 'GET'
+                            method = "GET"
                             path = ir.path
                             qs = ir.query_string
-                            rfile = io.BytesIO()
+                            rfile = BytesIO()
 
                     self.send_response(
                         response.output_status, response.header_list,
                         response.body)
                 finally:
                     app.release_serving()
-        except Exception:
+        except:
             tb = format_exc()
             # print tb
             cherrypy.log(tb, 'NATIVE_ADAPTER', severity=logging.ERROR)
@@ -99,11 +88,10 @@ class NativeGateway(cheroot.server.Gateway):
             self.send_response(s, h, b)
 
     def send_response(self, status, headers, body):
-        """Send response to HTTP request."""
         req = self.req
 
         # Set response status
-        req.status = status or b'500 Server Error'
+        req.status = str(status or "500 Server Error")
 
         # Set response headers
         for header, value in headers:
@@ -117,24 +105,24 @@ class NativeGateway(cheroot.server.Gateway):
             req.write(seg)
 
 
-class CPHTTPServer(cheroot.server.HTTPServer):
-    """Wrapper for cheroot.server.HTTPServer.
+class CPHTTPServer(wsgiserver.HTTPServer):
 
-    cheroot has been designed to not reference CherryPy in any way, so
-    that it can be used in other frameworks and applications. Therefore,
-    we wrap it here, so we can apply some attributes from config ->
-    cherrypy.server -> HTTPServer.
+    """Wrapper for wsgiserver.HTTPServer.
+
+    wsgiserver has been designed to not reference CherryPy in any way,
+    so that it can be used in other frameworks and applications.
+    Therefore, we wrap it here, so we can apply some attributes
+    from config -> cherrypy.server -> HTTPServer.
     """
 
     def __init__(self, server_adapter=cherrypy.server):
-        """Initialize CPHTTPServer."""
         self.server_adapter = server_adapter
 
         server_name = (self.server_adapter.socket_host or
                        self.server_adapter.socket_file or
                        None)
 
-        cheroot.server.HTTPServer.__init__(
+        wsgiserver.HTTPServer.__init__(
             self, server_adapter.bind_addr, NativeGateway,
             minthreads=server_adapter.thread_pool,
             maxthreads=server_adapter.thread_pool_max,
@@ -152,17 +140,15 @@ class CPHTTPServer(cheroot.server.HTTPServer):
 
         ssl_module = self.server_adapter.ssl_module or 'pyopenssl'
         if self.server_adapter.ssl_context:
-            adapter_class = cheroot.server.get_ssl_adapter_class(ssl_module)
+            adapter_class = wsgiserver.get_ssl_adapter_class(ssl_module)
             self.ssl_adapter = adapter_class(
                 self.server_adapter.ssl_certificate,
                 self.server_adapter.ssl_private_key,
-                self.server_adapter.ssl_certificate_chain,
-                self.server_adapter.ssl_ciphers)
+                self.server_adapter.ssl_certificate_chain)
             self.ssl_adapter.context = self.server_adapter.ssl_context
         elif self.server_adapter.ssl_certificate:
-            adapter_class = cheroot.server.get_ssl_adapter_class(ssl_module)
+            adapter_class = wsgiserver.get_ssl_adapter_class(ssl_module)
             self.ssl_adapter = adapter_class(
                 self.server_adapter.ssl_certificate,
                 self.server_adapter.ssl_private_key,
-                self.server_adapter.ssl_certificate_chain,
-                self.server_adapter.ssl_ciphers)
+                self.server_adapter.ssl_certificate_chain)
diff --git a/lib/cherrypy/_cpreqbody.py b/lib/cherrypy/_cpreqbody.py
index 7e0d98be..d2dbbc92 100644
--- a/lib/cherrypy/_cpreqbody.py
+++ b/lib/cherrypy/_cpreqbody.py
@@ -61,7 +61,7 @@ Here's the built-in JSON tool for an example::
     def json_in(force=True, debug=False):
         request = cherrypy.serving.request
         def json_processor(entity):
-            '''Read application/json data into request.json.'''
+            \"""Read application/json data into request.json.\"""
             if not entity.headers.get("Content-Length", ""):
                 raise cherrypy.HTTPError(411)
 
@@ -115,29 +115,27 @@ except ImportError:
 import re
 import sys
 import tempfile
-from urllib.parse import unquote
-
-import cheroot.server
+try:
+    from urllib import unquote_plus
+except ImportError:
+    def unquote_plus(bs):
+        """Bytes version of urllib.parse.unquote_plus."""
+        bs = bs.replace(ntob('+'), ntob(' '))
+        atoms = bs.split(ntob('%'))
+        for i in range(1, len(atoms)):
+            item = atoms[i]
+            try:
+                pct = int(item[:2], 16)
+                atoms[i] = bytes([pct]) + item[2:]
+            except ValueError:
+                pass
+        return ntob('').join(atoms)
 
 import cherrypy
-from cherrypy._cpcompat import ntou
+from cherrypy._cpcompat import basestring, ntob, ntou
 from cherrypy.lib import httputil
 
 
-def unquote_plus(bs):
-    """Bytes version of urllib.parse.unquote_plus."""
-    bs = bs.replace(b'+', b' ')
-    atoms = bs.split(b'%')
-    for i in range(1, len(atoms)):
-        item = atoms[i]
-        try:
-            pct = int(item[:2], 16)
-            atoms[i] = bytes([pct]) + item[2:]
-        except ValueError:
-            pass
-    return b''.join(atoms)
-
-
 # ------------------------------- Processors -------------------------------- #
 
 def process_urlencoded(entity):
@@ -146,14 +144,14 @@ def process_urlencoded(entity):
     for charset in entity.attempt_charsets:
         try:
             params = {}
-            for aparam in qs.split(b'&'):
-                for pair in aparam.split(b';'):
+            for aparam in qs.split(ntob('&')):
+                for pair in aparam.split(ntob(';')):
                     if not pair:
                         continue
 
-                    atoms = pair.split(b'=', 1)
+                    atoms = pair.split(ntob('='), 1)
                     if len(atoms) == 1:
-                        atoms.append(b'')
+                        atoms.append(ntob(''))
 
                     key = unquote_plus(atoms[0]).decode(charset)
                     value = unquote_plus(atoms[1]).decode(charset)
@@ -171,8 +169,8 @@ def process_urlencoded(entity):
             break
     else:
         raise cherrypy.HTTPError(
-            400, 'The request entity could not be decoded. The following '
-            'charsets were attempted: %s' % repr(entity.attempt_charsets))
+            400, "The request entity could not be decoded. The following "
+            "charsets were attempted: %s" % repr(entity.attempt_charsets))
 
     # Now that all values have been successfully parsed and decoded,
     # apply them to the entity.params dict.
@@ -187,7 +185,7 @@ def process_urlencoded(entity):
 
 def process_multipart(entity):
     """Read all multipart parts into entity.parts."""
-    ib = ''
+    ib = ""
     if 'boundary' in entity.content_type.params:
         # http://tools.ietf.org/html/rfc2046#section-5.1.1
         # "The grammar for parameters on the Content-type field is such that it
@@ -195,7 +193,7 @@ def process_multipart(entity):
         # on the Content-type line"
         ib = entity.content_type.params['boundary'].strip('"')
 
-    if not re.match('^[ -~]{0,200}[!-~]$', ib):
+    if not re.match("^[ -~]{0,200}[!-~]$", ib):
         raise ValueError('Invalid boundary in multipart form: %r' % (ib,))
 
     ib = ('--' + ib).encode('ascii')
@@ -248,10 +246,7 @@ def process_multipart_form_data(entity):
 
 
 def _old_process_multipart(entity):
-    """The behavior of 3.2 and lower.
-
-    Deprecated and will be changed in 3.3.
-    """
+    """The behavior of 3.2 and lower. Deprecated and will be changed in 3.3."""
     process_multipart(entity)
 
     params = entity.params
@@ -280,6 +275,7 @@ def _old_process_multipart(entity):
 
 # -------------------------------- Entities --------------------------------- #
 class Entity(object):
+
     """An HTTP request body, or MIME multipart body.
 
     This class collects information about the HTTP request entity. When a
@@ -319,8 +315,7 @@ class Entity(object):
     :attr:`request.body.parts<cherrypy._cpreqbody.Entity.parts>`. You can
     enable it with::
 
-        cherrypy.request.body.processors['multipart'] = \
-            _cpreqbody.process_multipart
+        cherrypy.request.body.processors['multipart'] = _cpreqbody.process_multipart
 
     in an ``on_start_resource`` tool.
     """
@@ -330,15 +325,14 @@ class Entity(object):
     # absence of a charset parameter, is US-ASCII."
     # However, many browsers send data in utf-8 with no charset.
     attempt_charsets = ['utf-8']
-    r"""A list of strings, each of which should be a known encoding.
+    """A list of strings, each of which should be a known encoding.
 
     When the Content-Type of the request body warrants it, each of the given
     encodings will be tried in order. The first one to successfully decode the
     entity without raising an error is stored as
     :attr:`entity.charset<cherrypy._cpreqbody.Entity.charset>`. This defaults
     to ``['utf-8']`` (plus 'ISO-8859-1' for "text/\*" types, as required by
-    `HTTP/1.1
-    <http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7.1>`_),
+    `HTTP/1.1 <http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7.1>`_),
     but ``['us-ascii', 'utf-8']`` for multipart parts.
     """
 
@@ -348,15 +342,13 @@ class Entity(object):
     content_type = None
     """The value of the Content-Type request header.
 
-    If the Entity is part of a multipart payload, this will be the
-    Content-Type given in the MIME headers for this part.
+    If the Entity is part of a multipart payload, this will be the Content-Type
+    given in the MIME headers for this part.
     """
 
     default_content_type = 'application/x-www-form-urlencoded'
     """This defines a default ``Content-Type`` to use if no Content-Type header
-    is given.
-
-    The empty string is used for RequestBody, which results in the
+    is given. The empty string is used for RequestBody, which results in the
     request body not being read or parsed at all. This is by design; a missing
     ``Content-Type`` header in the HTTP request entity is an error at best,
     and a security hole at worst. For multipart parts, however, the MIME spec
@@ -406,8 +398,8 @@ class Entity(object):
     part_class = None
     """The class used for multipart parts.
 
-    You can replace this with custom subclasses to alter the processing
-    of multipart parts.
+    You can replace this with custom subclasses to alter the processing of
+    multipart parts.
     """
 
     def __init__(self, fp, headers, params=None, parts=None):
@@ -436,7 +428,7 @@ class Entity(object):
 
         # Copy the class 'attempt_charsets', prepending any Content-Type
         # charset
-        dec = self.content_type.params.get('charset', None)
+        dec = self.content_type.params.get("charset", None)
         if dec:
             self.attempt_charsets = [dec] + [c for c in self.attempt_charsets
                                              if c != dec]
@@ -473,10 +465,13 @@ class Entity(object):
                     self.filename.endswith('"')
                 ):
                     self.filename = self.filename[1:-1]
-            if 'filename*' in disp.params:
-                # @see https://tools.ietf.org/html/rfc5987
-                encoding, lang, filename = disp.params['filename*'].split("'")
-                self.filename = unquote(str(filename), encoding)
+
+    # The 'type' attribute is deprecated in 3.2; remove it in 3.3.
+    type = property(
+        lambda self: self.content_type,
+        doc="A deprecated alias for "
+            ":attr:`content_type<cherrypy._cpreqbody.Entity.content_type>`."
+    )
 
     def read(self, size=None, fp_out=None):
         return self.fp.read(size, fp_out)
@@ -513,8 +508,7 @@ class Entity(object):
         """Return a file-like object into which the request body will be read.
 
         By default, this will return a TemporaryFile. Override as needed.
-        See also :attr:`cherrypy._cpreqbody.Part.maxrambytes`.
-        """
+        See also :attr:`cherrypy._cpreqbody.Part.maxrambytes`."""
         return tempfile.TemporaryFile()
 
     def fullvalue(self):
@@ -526,26 +520,8 @@ class Entity(object):
             self.file.seek(0)
         else:
             value = self.value
-        value = self.decode_entity(value)
         return value
 
-    def decode_entity(self, value):
-        """Return a given byte encoded value as a string."""
-        for charset in self.attempt_charsets:
-            try:
-                value = value.decode(charset)
-            except UnicodeDecodeError:
-                pass
-            else:
-                self.charset = charset
-                return value
-        else:
-            raise cherrypy.HTTPError(
-                400,
-                'The request entity could not be decoded. The following '
-                'charsets were attempted: %s' % repr(self.attempt_charsets)
-            )
-
     def process(self):
         """Execute the best-match processor for the given media type."""
         proc = None
@@ -574,20 +550,20 @@ class Entity(object):
 
 
 class Part(Entity):
+
     """A MIME part entity, part of a multipart entity."""
 
     # "The default character set, which must be assumed in the absence of a
     # charset parameter, is US-ASCII."
     attempt_charsets = ['us-ascii', 'utf-8']
-    r"""A list of strings, each of which should be a known encoding.
+    """A list of strings, each of which should be a known encoding.
 
     When the Content-Type of the request body warrants it, each of the given
     encodings will be tried in order. The first one to successfully decode the
     entity without raising an error is stored as
     :attr:`entity.charset<cherrypy._cpreqbody.Entity.charset>`. This defaults
     to ``['utf-8']`` (plus 'ISO-8859-1' for "text/\*" types, as required by
-    `HTTP/1.1
-    <http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7.1>`_),
+    `HTTP/1.1 <http://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.7.1>`_),
     but ``['us-ascii', 'utf-8']`` for multipart parts.
     """
 
@@ -619,61 +595,61 @@ class Part(Entity):
         self.file = None
         self.value = None
 
-    @classmethod
     def from_fp(cls, fp, boundary):
         headers = cls.read_headers(fp)
         return cls(fp, headers, boundary)
+    from_fp = classmethod(from_fp)
 
-    @classmethod
     def read_headers(cls, fp):
         headers = httputil.HeaderMap()
         while True:
             line = fp.readline()
             if not line:
                 # No more data--illegal end of headers
-                raise EOFError('Illegal end of headers.')
+                raise EOFError("Illegal end of headers.")
 
-            if line == b'\r\n':
+            if line == ntob('\r\n'):
                 # Normal end of headers
                 break
-            if not line.endswith(b'\r\n'):
-                raise ValueError('MIME requires CRLF terminators: %r' % line)
+            if not line.endswith(ntob('\r\n')):
+                raise ValueError("MIME requires CRLF terminators: %r" % line)
 
-            if line[0] in b' \t':
+            if line[0] in ntob(' \t'):
                 # It's a continuation line.
                 v = line.strip().decode('ISO-8859-1')
             else:
-                k, v = line.split(b':', 1)
+                k, v = line.split(ntob(":"), 1)
                 k = k.strip().decode('ISO-8859-1')
                 v = v.strip().decode('ISO-8859-1')
 
             existing = headers.get(k)
             if existing:
-                v = ', '.join((existing, v))
+                v = ", ".join((existing, v))
             headers[k] = v
 
         return headers
+    read_headers = classmethod(read_headers)
 
     def read_lines_to_boundary(self, fp_out=None):
         """Read bytes from self.fp and return or write them to a file.
 
-        If the 'fp_out' argument is None (the default), all bytes read
-        are returned in a single byte string.
+        If the 'fp_out' argument is None (the default), all bytes read are
+        returned in a single byte string.
 
         If the 'fp_out' argument is not None, it must be a file-like
         object that supports the 'write' method; all bytes read will be
         written to the fp, and that fp is returned.
         """
-        endmarker = self.boundary + b'--'
-        delim = b''
+        endmarker = self.boundary + ntob("--")
+        delim = ntob("")
         prev_lf = True
         lines = []
         seen = 0
         while True:
             line = self.fp.readline(1 << 16)
             if not line:
-                raise EOFError('Illegal end of multipart body.')
-            if line.startswith(b'--') and prev_lf:
+                raise EOFError("Illegal end of multipart body.")
+            if line.startswith(ntob("--")) and prev_lf:
                 strippedline = line.strip()
                 if strippedline == self.boundary:
                     break
@@ -683,16 +659,16 @@ class Part(Entity):
 
             line = delim + line
 
-            if line.endswith(b'\r\n'):
-                delim = b'\r\n'
+            if line.endswith(ntob("\r\n")):
+                delim = ntob("\r\n")
                 line = line[:-2]
                 prev_lf = True
-            elif line.endswith(b'\n'):
-                delim = b'\n'
+            elif line.endswith(ntob("\n")):
+                delim = ntob("\n")
                 line = line[:-1]
                 prev_lf = True
             else:
-                delim = b''
+                delim = ntob("")
                 prev_lf = False
 
             if fp_out is None:
@@ -706,8 +682,21 @@ class Part(Entity):
                 fp_out.write(line)
 
         if fp_out is None:
-            result = b''.join(lines)
-            return result
+            result = ntob('').join(lines)
+            for charset in self.attempt_charsets:
+                try:
+                    result = result.decode(charset)
+                except UnicodeDecodeError:
+                    pass
+                else:
+                    self.charset = charset
+                    return result
+            else:
+                raise cherrypy.HTTPError(
+                    400,
+                    "The request entity could not be decoded. The following "
+                    "charsets were attempted: %s" % repr(self.attempt_charsets)
+                )
         else:
             fp_out.seek(0)
             return fp_out
@@ -721,7 +710,7 @@ class Part(Entity):
             self.file = self.read_into_file()
         else:
             result = self.read_lines_to_boundary()
-            if isinstance(result, bytes):
+            if isinstance(result, basestring):
                 self.value = result
             else:
                 self.file = result
@@ -736,10 +725,31 @@ class Part(Entity):
         self.read_lines_to_boundary(fp_out=fp_out)
         return fp_out
 
-
 Entity.part_class = Part
 
-inf = float('inf')
+try:
+    inf = float('inf')
+except ValueError:
+    # Python 2.4 and lower
+    class Infinity(object):
+
+        def __cmp__(self, other):
+            return 1
+
+        def __sub__(self, other):
+            return self
+    inf = Infinity()
+
+
+comma_separated_headers = [
+    'Accept', 'Accept-Charset', 'Accept-Encoding',
+    'Accept-Language', 'Accept-Ranges', 'Allow',
+    'Cache-Control', 'Connection', 'Content-Encoding',
+    'Content-Language', 'Expect', 'If-Match',
+    'If-None-Match', 'Pragma', 'Proxy-Authenticate',
+    'Te', 'Trailer', 'Transfer-Encoding', 'Upgrade',
+    'Vary', 'Via', 'Warning', 'Www-Authenticate'
+]
 
 
 class SizedReader:
@@ -750,7 +760,7 @@ class SizedReader:
         self.fp = fp
         self.length = length
         self.maxbytes = maxbytes
-        self.buffer = b''
+        self.buffer = ntob('')
         self.bufsize = bufsize
         self.bytes_read = 0
         self.done = False
@@ -759,15 +769,15 @@ class SizedReader:
     def read(self, size=None, fp_out=None):
         """Read bytes from the request body and return or write them to a file.
 
-        A number of bytes less than or equal to the 'size' argument are
-        read off the socket. The actual number of bytes read are tracked
-        in self.bytes_read. The number may be smaller than 'size' when
-        1) the client sends fewer bytes, 2) the 'Content-Length' request
-        header specifies fewer bytes than requested, or 3) the number of
-        bytes read exceeds self.maxbytes (in which case, 413 is raised).
+        A number of bytes less than or equal to the 'size' argument are read
+        off the socket. The actual number of bytes read are tracked in
+        self.bytes_read. The number may be smaller than 'size' when 1) the
+        client sends fewer bytes, 2) the 'Content-Length' request header
+        specifies fewer bytes than requested, or 3) the number of bytes read
+        exceeds self.maxbytes (in which case, 413 is raised).
 
-        If the 'fp_out' argument is None (the default), all bytes read
-        are returned in a single byte string.
+        If the 'fp_out' argument is None (the default), all bytes read are
+        returned in a single byte string.
 
         If the 'fp_out' argument is not None, it must be a file-like
         object that supports the 'write' method; all bytes read will be
@@ -786,7 +796,7 @@ class SizedReader:
         if remaining == 0:
             self.finish()
             if fp_out is None:
-                return b''
+                return ntob('')
             else:
                 return None
 
@@ -796,7 +806,7 @@ class SizedReader:
         if self.buffer:
             if remaining is inf:
                 data = self.buffer
-                self.buffer = b''
+                self.buffer = ntob('')
             else:
                 data = self.buffer[:remaining]
                 self.buffer = self.buffer[remaining:]
@@ -824,7 +834,7 @@ class SizedReader:
                 if e.__class__.__name__ == 'MaxSizeExceeded':
                     # Post data is too big
                     raise cherrypy.HTTPError(
-                        413, 'Maximum request length: %r' % e.args[1])
+                        413, "Maximum request length: %r" % e.args[1])
                 else:
                     raise
             if not data:
@@ -845,7 +855,7 @@ class SizedReader:
                 fp_out.write(data)
 
         if fp_out is None:
-            return b''.join(chunks)
+            return ntob('').join(chunks)
 
     def readline(self, size=None):
         """Read a line from the request body and return it."""
@@ -857,7 +867,7 @@ class SizedReader:
             data = self.read(chunksize)
             if not data:
                 break
-            pos = data.find(b'\n') + 1
+            pos = data.find(ntob('\n')) + 1
             if pos:
                 chunks.append(data[:pos])
                 remainder = data[pos:]
@@ -866,7 +876,7 @@ class SizedReader:
                 break
             else:
                 chunks.append(data)
-        return b''.join(chunks)
+        return ntob('').join(chunks)
 
     def readlines(self, sizehint=None):
         """Read lines from the request body and return them."""
@@ -895,33 +905,34 @@ class SizedReader:
 
             try:
                 for line in self.fp.read_trailer_lines():
-                    if line[0] in b' \t':
+                    if line[0] in ntob(' \t'):
                         # It's a continuation line.
                         v = line.strip()
                     else:
                         try:
-                            k, v = line.split(b':', 1)
+                            k, v = line.split(ntob(":"), 1)
                         except ValueError:
-                            raise ValueError('Illegal header line.')
+                            raise ValueError("Illegal header line.")
                         k = k.strip().title()
                         v = v.strip()
 
-                    if k in cheroot.server.comma_separated_headers:
-                        existing = self.trailers.get(k)
+                    if k in comma_separated_headers:
+                        existing = self.trailers.get(envname)
                         if existing:
-                            v = b', '.join((existing, v))
+                            v = ntob(", ").join((existing, v))
                     self.trailers[k] = v
             except Exception:
                 e = sys.exc_info()[1]
                 if e.__class__.__name__ == 'MaxSizeExceeded':
                     # Post data is too big
                     raise cherrypy.HTTPError(
-                        413, 'Maximum request length: %r' % e.args[1])
+                        413, "Maximum request length: %r" % e.args[1])
                 else:
                     raise
 
 
 class RequestBody(Entity):
+
     """The entity of the HTTP request."""
 
     bufsize = 8 * 1024
@@ -929,7 +940,7 @@ class RequestBody(Entity):
 
     # Don't parse the request body at all if the client didn't provide
     # a Content-Type header. See
-    # https://github.com/cherrypy/cherrypy/issues/790
+    # https://bitbucket.org/cherrypy/cherrypy/issue/790
     default_content_type = ''
     """This defines a default ``Content-Type`` to use if no Content-Type header
     is given. The empty string is used for RequestBody, which results in the
@@ -988,6 +999,12 @@ class RequestBody(Entity):
         # add them in here.
         request_params = self.request_params
         for key, value in self.params.items():
+            # Python 2 only: keyword arguments must be byte strings (type
+            # 'str').
+            if sys.version_info < (3, 0):
+                if isinstance(key, unicode):
+                    key = key.encode('ISO-8859-1')
+
             if key in request_params:
                 if not isinstance(request_params[key], list):
                     request_params[key] = [request_params[key]]
diff --git a/lib/cherrypy/_cprequest.py b/lib/cherrypy/_cprequest.py
index a4ad298b..290bd2eb 100644
--- a/lib/cherrypy/_cprequest.py
+++ b/lib/cherrypy/_cprequest.py
@@ -1,21 +1,19 @@
+
+import os
 import sys
 import time
-import collections
-import operator
-from http.cookies import SimpleCookie, CookieError
-
-import uuid
-
-from more_itertools import consume
+import warnings
 
 import cherrypy
-from cherrypy._cpcompat import ntob
-from cherrypy import _cpreqbody
+from cherrypy._cpcompat import basestring, copykeys, ntob, unicodestr
+from cherrypy._cpcompat import SimpleCookie, CookieError, py3k
+from cherrypy import _cpreqbody, _cpconfig
 from cherrypy._cperror import format_exc, bare_error
-from cherrypy.lib import httputil, reprconf, encoding
+from cherrypy.lib import httputil, file_generator
 
 
 class Hook(object):
+
     """A callback and its metadata: failsafe, priority, and kwargs."""
 
     callback = None
@@ -29,12 +27,10 @@ class Hook(object):
     from the same call point raise exceptions."""
 
     priority = 50
-    """Defines the order of execution for a list of Hooks.
-
-    Priority numbers should be limited to the closed interval [0, 100],
-    but values outside this range are acceptable, as are fractional
-    values.
     """
+    Defines the order of execution for a list of Hooks. Priority numbers
+    should be limited to the closed interval [0, 100], but values outside
+    this range are acceptable, as are fractional values."""
 
     kwargs = {}
     """
@@ -45,36 +41,38 @@ class Hook(object):
         self.callback = callback
 
         if failsafe is None:
-            failsafe = getattr(callback, 'failsafe', False)
+            failsafe = getattr(callback, "failsafe", False)
         self.failsafe = failsafe
 
         if priority is None:
-            priority = getattr(callback, 'priority', 50)
+            priority = getattr(callback, "priority", 50)
         self.priority = priority
 
         self.kwargs = kwargs
 
     def __lt__(self, other):
-        """
-        Hooks sort by priority, ascending, such that
-        hooks of lower priority are run first.
-        """
+        # Python 3
         return self.priority < other.priority
 
+    def __cmp__(self, other):
+        # Python 2
+        return cmp(self.priority, other.priority)
+
     def __call__(self):
         """Run self.callback(**self.kwargs)."""
         return self.callback(**self.kwargs)
 
     def __repr__(self):
         cls = self.__class__
-        return ('%s.%s(callback=%r, failsafe=%r, priority=%r, %s)'
+        return ("%s.%s(callback=%r, failsafe=%r, priority=%r, %s)"
                 % (cls.__module__, cls.__name__, self.callback,
                    self.failsafe, self.priority,
-                   ', '.join(['%s=%r' % (k, v)
+                   ", ".join(['%s=%r' % (k, v)
                               for k, v in self.kwargs.items()])))
 
 
 class HookMap(dict):
+
     """A map of call points to lists of callbacks (Hook objects)."""
 
     def __new__(cls, points=None):
@@ -92,36 +90,28 @@ class HookMap(dict):
 
     def run(self, point):
         """Execute all registered Hooks (callbacks) for the given point."""
-        self.run_hooks(iter(sorted(self[point])))
-
-    @classmethod
-    def run_hooks(cls, hooks):
-        """Execute the indicated hooks, trapping errors.
-
-        Hooks with ``.failsafe == True`` are guaranteed to run
-        even if others at the same hookpoint fail. In this case,
-        log the failure and proceed on to the next hook. The only
-        way to stop all processing from one of these hooks is
-        to raise a BaseException like SystemExit or
-        KeyboardInterrupt and stop the whole server.
-        """
-        assert isinstance(hooks, collections.abc.Iterator)
-        quiet_errors = (
-            cherrypy.HTTPError,
-            cherrypy.HTTPRedirect,
-            cherrypy.InternalRedirect,
-        )
-        safe = filter(operator.attrgetter('failsafe'), hooks)
+        exc = None
+        hooks = self[point]
+        hooks.sort()
         for hook in hooks:
-            try:
-                hook()
-            except quiet_errors:
-                cls.run_hooks(safe)
-                raise
-            except Exception:
-                cherrypy.log(traceback=True, severity=40)
-                cls.run_hooks(safe)
-                raise
+            # Some hooks are guaranteed to run even if others at
+            # the same hookpoint fail. We will still log the failure,
+            # but proceed on to the next hook. The only way
+            # to stop all processing from one of these hooks is
+            # to raise SystemExit and stop the whole server.
+            if exc is None or hook.failsafe:
+                try:
+                    hook()
+                except (KeyboardInterrupt, SystemExit):
+                    raise
+                except (cherrypy.HTTPError, cherrypy.HTTPRedirect,
+                        cherrypy.InternalRedirect):
+                    exc = sys.exc_info()[1]
+                except:
+                    exc = sys.exc_info()[1]
+                    cherrypy.log(traceback=True, severity=40)
+        if exc:
+            raise exc
 
     def __copy__(self):
         newmap = self.__class__()
@@ -134,10 +124,10 @@ class HookMap(dict):
 
     def __repr__(self):
         cls = self.__class__
-        return '%s.%s(points=%r)' % (
+        return "%s.%s(points=%r)" % (
             cls.__module__,
             cls.__name__,
-            list(self)
+            copykeys(self)
         )
 
 
@@ -148,9 +138,9 @@ def hooks_namespace(k, v):
     # Use split again to allow multiple hooks for a single
     # hookpoint per path (e.g. "hooks.before_handler.1").
     # Little-known fact you only get from reading source ;)
-    hookpoint = k.split('.', 1)[0]
-    if isinstance(v, str):
-        v = cherrypy.lib.reprconf.attributes(v)
+    hookpoint = k.split(".", 1)[0]
+    if isinstance(v, basestring):
+        v = cherrypy.lib.attributes(v)
     if not isinstance(v, Hook):
         v = Hook(v)
     cherrypy.serving.request.hooks[hookpoint].append(v)
@@ -169,7 +159,7 @@ def request_namespace(k, v):
 def response_namespace(k, v):
     """Attach response attributes declared in config."""
     # Provides config entries to set default response headers
-    # http://cherrypy.dev/ticket/889
+    # http://cherrypy.org/ticket/889
     if k[:8] == 'headers.':
         cherrypy.serving.response.headers[k.split('.', 1)[1]] = v
     else:
@@ -190,75 +180,69 @@ hookpoints = ['on_start_resource', 'before_request_body',
 
 
 class Request(object):
+
     """An HTTP request.
 
-    This object represents the metadata of an HTTP request message; that
-    is, it contains attributes which describe the environment in which
-    the request URL, headers, and body were sent (if you want tools to
-    interpret the headers and body, those are elsewhere, mostly in
-    Tools). This 'metadata' consists of socket data, transport
-    characteristics, and the Request-Line. This object also contains
-    data regarding the configuration in effect for the given URL, and
-    the execution plan for generating a response.
+    This object represents the metadata of an HTTP request message;
+    that is, it contains attributes which describe the environment
+    in which the request URL, headers, and body were sent (if you
+    want tools to interpret the headers and body, those are elsewhere,
+    mostly in Tools). This 'metadata' consists of socket data,
+    transport characteristics, and the Request-Line. This object
+    also contains data regarding the configuration in effect for
+    the given URL, and the execution plan for generating a response.
     """
 
     prev = None
-    """The previous Request object (if any).
-
-    This should be None unless we are processing an InternalRedirect.
     """
+    The previous Request object (if any). This should be None
+    unless we are processing an InternalRedirect."""
 
     # Conversation/connection attributes
-    local = httputil.Host('127.0.0.1', 80)
-    'An httputil.Host(ip, port, hostname) object for the server socket.'
+    local = httputil.Host("127.0.0.1", 80)
+    "An httputil.Host(ip, port, hostname) object for the server socket."
 
-    remote = httputil.Host('127.0.0.1', 1111)
-    'An httputil.Host(ip, port, hostname) object for the client socket.'
+    remote = httputil.Host("127.0.0.1", 1111)
+    "An httputil.Host(ip, port, hostname) object for the client socket."
 
-    scheme = 'http'
-    """The protocol used between client and server.
-
-    In most cases, this will be either 'http' or 'https'.
+    scheme = "http"
     """
+    The protocol used between client and server. In most cases,
+    this will be either 'http' or 'https'."""
 
-    server_protocol = 'HTTP/1.1'
+    server_protocol = "HTTP/1.1"
     """
     The HTTP version for which the HTTP server is at least
     conditionally compliant."""
 
-    base = ''
+    base = ""
     """The (scheme://host) portion of the requested URL.
-
     In some cases (e.g. when proxying via mod_rewrite), this may contain
     path segments which cherrypy.url uses when constructing url's, but
-    which otherwise are ignored by CherryPy. Regardless, this value MUST
-    NOT end in a slash.
-    """
+    which otherwise are ignored by CherryPy. Regardless, this value
+    MUST NOT end in a slash."""
 
     # Request-Line attributes
-    request_line = ''
-    """The complete Request-Line received from the client.
-
-    This is a single string consisting of the request method, URI, and
-    protocol version (joined by spaces). Any final CRLF is removed.
+    request_line = ""
     """
+    The complete Request-Line received from the client. This is a
+    single string consisting of the request method, URI, and protocol
+    version (joined by spaces). Any final CRLF is removed."""
 
-    method = 'GET'
-    """Indicates the HTTP method to be performed on the resource identified by
-    the Request-URI.
-
-    Common methods include GET, HEAD, POST, PUT, and DELETE. CherryPy
-    allows any extension method; however, various HTTP servers and
-    gateways may restrict the set of allowable methods. CherryPy
-    applications SHOULD restrict the set (on a per-URI basis).
+    method = "GET"
     """
+    Indicates the HTTP method to be performed on the resource identified
+    by the Request-URI. Common methods include GET, HEAD, POST, PUT, and
+    DELETE. CherryPy allows any extension method; however, various HTTP
+    servers and gateways may restrict the set of allowable methods.
+    CherryPy applications SHOULD restrict the set (on a per-URI basis)."""
 
-    query_string = ''
+    query_string = ""
     """
     The query component of the Request-URI, a string of information to be
     interpreted by the resource. The query portion of a URI follows the
     path component, and is separated by a '?'. For example, the URI
-    'http://www.cherrypy.dev/wiki?a=3&b=4' has the query component,
+    'http://www.cherrypy.org/wiki?a=3&b=4' has the query component,
     'a=3&b=4'."""
 
     query_string_encoding = 'utf8'
@@ -283,26 +267,22 @@ class Request(object):
     A dict which combines query string (GET) and request entity (POST)
     variables. This is populated in two stages: GET params are added
     before the 'on_start_resource' hook, and POST params are added
-    between the 'before_request_body' and 'before_handler' hooks.
-    """
+    between the 'before_request_body' and 'before_handler' hooks."""
 
     # Message attributes
     header_list = []
-    """A list of the HTTP request headers as (name, value) tuples.
-
-    In general, you should use request.headers (a dict) instead.
     """
+    A list of the HTTP request headers as (name, value) tuples.
+    In general, you should use request.headers (a dict) instead."""
 
     headers = httputil.HeaderMap()
-    """A dict-like object containing the request headers.
-
-    Keys are header
+    """
+    A dict-like object containing the request headers. Keys are header
     names (in Title-Case format); however, you may get and set them in
     a case-insensitive manner. That is, headers['Content-Type'] and
     headers['content-type'] refer to the same value. Values are header
     values (decoded according to :rfc:`2047` if necessary). See also:
-    httputil.HeaderMap, httputil.HeaderElement.
-    """
+    httputil.HeaderMap, httputil.HeaderElement."""
 
     cookie = SimpleCookie()
     """See help(Cookie)."""
@@ -332,7 +312,7 @@ class Request(object):
     If True, the rfile (if any) is automatically read and parsed,
     and the result placed into request.params or request.body."""
 
-    methods_with_bodies = ('POST', 'PUT', 'PATCH')
+    methods_with_bodies = ("POST", "PUT")
     """
     A sequence of HTTP methods for which CherryPy will automatically
     attempt to read a body from the rfile. If you are going to change
@@ -346,8 +326,7 @@ class Request(object):
     or multipart, this will be None. Otherwise, this will be an instance
     of :class:`RequestBody<cherrypy._cpreqbody.RequestBody>` (which you
     can .read()); this value is set between the 'before_request_body' and
-    'before_handler' hooks (assuming that process_request_body is True).
-    """
+    'before_handler' hooks (assuming that process_request_body is True)."""
 
     # Dispatch attributes
     dispatch = cherrypy.dispatch.Dispatcher()
@@ -358,24 +337,23 @@ class Request(object):
     calls the dispatcher as early as possible, passing it a 'path_info'
     argument.
 
-    The default dispatcher discovers the page handler by matching
-    path_info to a hierarchical arrangement of objects, starting at
-    request.app.root. See help(cherrypy.dispatch) for more information.
-    """
+    The default dispatcher discovers the page handler by matching path_info
+    to a hierarchical arrangement of objects, starting at request.app.root.
+    See help(cherrypy.dispatch) for more information."""
 
-    script_name = ''
-    """The 'mount point' of the application which is handling this request.
+    script_name = ""
+    """
+    The 'mount point' of the application which is handling this request.
 
     This attribute MUST NOT end in a slash. If the script_name refers to
     the root of the URI, it MUST be an empty string (not "/").
     """
 
-    path_info = '/'
-    """The 'relative path' portion of the Request-URI.
-
-    This is relative to the script_name ('mount point') of the
-    application which is handling this request.
+    path_info = "/"
     """
+    The 'relative path' portion of the Request-URI. This is relative
+    to the script_name ('mount point') of the application which is
+    handling this request."""
 
     login = None
     """
@@ -403,16 +381,14 @@ class Request(object):
     of the form: {Toolbox.namespace: {Tool.name: config dict}}."""
 
     config = None
-    """A flat dict of all configuration entries which apply to the current
-    request.
-
-    These entries are collected from global config, application config
-    (based on request.path_info), and from handler config (exactly how
-    is governed by the request.dispatch object in effect for this
-    request; by default, handler config can be attached anywhere in the
-    tree between request.app.root and the final handler, and inherits
-    downward).
     """
+    A flat dict of all configuration entries which apply to the
+    current request. These entries are collected from global config,
+    application config (based on request.path_info), and from handler
+    config (exactly how is governed by the request.dispatch object in
+    effect for this request; by default, handler config can be attached
+    anywhere in the tree between request.app.root and the final handler,
+    and inherits downward)."""
 
     is_index = None
     """
@@ -423,14 +399,13 @@ class Request(object):
     the trailing slash. See cherrypy.tools.trailing_slash."""
 
     hooks = HookMap(hookpoints)
-    """A HookMap (dict-like object) of the form: {hookpoint: [hook, ...]}.
-
+    """
+    A HookMap (dict-like object) of the form: {hookpoint: [hook, ...]}.
     Each key is a str naming the hook point, and each value is a list
     of hooks which will be called at that hook point during this request.
     The list of hooks is generally populated as early as possible (mostly
     from Tools specified in config), but may be extended at any time.
-    See also: _cprequest.Hook, _cprequest.HookMap, and cherrypy.tools.
-    """
+    See also: _cprequest.Hook, _cprequest.HookMap, and cherrypy.tools."""
 
     error_response = cherrypy.HTTPError(500).set_response
     """
@@ -443,11 +418,12 @@ class Request(object):
     error response to the user-agent."""
 
     error_page = {}
-    """A dict of {error code: response filename or callable} pairs.
+    """
+    A dict of {error code: response filename or callable} pairs.
 
     The error code must be an int representing a given HTTP error code,
-    or the string 'default', which will be used if no matching entry is
-    found for a given numeric code.
+    or the string 'default', which will be used if no matching entry
+    is found for a given numeric code.
 
     If a filename is provided, the file should contain a Python string-
     formatting template, and can expect by default to receive format
@@ -461,8 +437,8 @@ class Request(object):
     iterable of strings which will be set to response.body. It may also
     override headers or perform any other processing.
 
-    If no entry is given for an error code, and no 'default' entry
-    exists, a default template will be used.
+    If no entry is given for an error code, and no 'default' entry exists,
+    a default template will be used.
     """
 
     show_tracebacks = True
@@ -487,30 +463,25 @@ class Request(object):
     """True once the close method has been called, False otherwise."""
 
     stage = None
-    """A string containing the stage reached in the request-handling process.
-
-    This is useful when debugging a live server with hung requests.
     """
+    A string containing the stage reached in the request-handling process.
+    This is useful when debugging a live server with hung requests."""
 
-    unique_id = None
-    """A lazy object generating and memorizing UUID4 on ``str()`` render."""
-
-    namespaces = reprconf.NamespaceSet(
-        **{'hooks': hooks_namespace,
-           'request': request_namespace,
-           'response': response_namespace,
-           'error_page': error_page_namespace,
-           'tools': cherrypy.tools,
+    namespaces = _cpconfig.NamespaceSet(
+        **{"hooks": hooks_namespace,
+           "request": request_namespace,
+           "response": response_namespace,
+           "error_page": error_page_namespace,
+           "tools": cherrypy.tools,
            })
 
-    def __init__(self, local_host, remote_host, scheme='http',
-                 server_protocol='HTTP/1.1'):
+    def __init__(self, local_host, remote_host, scheme="http",
+                 server_protocol="HTTP/1.1"):
         """Populate a new Request object.
 
-        local_host should be an httputil.Host object with the server
-        info. remote_host should be an httputil.Host object with the
-        client info. scheme should be a string, either "http" or
-        "https".
+        local_host should be an httputil.Host object with the server info.
+        remote_host should be an httputil.Host object with the client info.
+        scheme should be a string, either "http" or "https".
         """
         self.local = local_host
         self.remote = remote_host
@@ -527,13 +498,8 @@ class Request(object):
 
         self.stage = None
 
-        self.unique_id = LazyUUID4()
-
     def close(self):
-        """Run cleanup code.
-
-        (Core)
-        """
+        """Run cleanup code. (Core)"""
         if not self.closed:
             self.closed = True
             self.stage = 'on_end_request'
@@ -570,6 +536,7 @@ class Request(object):
 
         Consumer code (HTTP servers) should then access these response
         attributes to build the outbound stream.
+
         """
         response = cherrypy.serving.response
         self.stage = 'run'
@@ -577,7 +544,7 @@ class Request(object):
             self.error_response = cherrypy.HTTPError(500).set_response
 
             self.method = method
-            path = path or '/'
+            path = path or "/"
             self.query_string = query_string or ''
             self.params = {}
 
@@ -623,7 +590,7 @@ class Request(object):
 
         except self.throws:
             raise
-        except Exception:
+        except:
             if self.throw_errors:
                 raise
             else:
@@ -633,116 +600,116 @@ class Request(object):
                 if self.show_tracebacks:
                     body = format_exc()
                 else:
-                    body = ''
+                    body = ""
                 r = bare_error(body)
                 response.output_status, response.header_list, response.body = r
 
-        if self.method == 'HEAD':
+        if self.method == "HEAD":
             # HEAD requests MUST NOT return a message-body in the response.
             response.body = []
 
         try:
             cherrypy.log.access()
-        except Exception:
+        except:
             cherrypy.log.error(traceback=True)
 
+        if response.timed_out:
+            raise cherrypy.TimeoutError()
+
         return response
 
-    def respond(self, path_info):
-        """Generate a response for the resource at self.path_info.
+    # Uncomment for stage debugging
+    # stage = property(lambda self: self._stage, lambda self, v: print(v))
 
-        (Core)
-        """
+    def respond(self, path_info):
+        """Generate a response for the resource at self.path_info. (Core)"""
+        response = cherrypy.serving.response
         try:
             try:
                 try:
-                    self._do_respond(path_info)
+                    if self.app is None:
+                        raise cherrypy.NotFound()
+
+                    # Get the 'Host' header, so we can HTTPRedirect properly.
+                    self.stage = 'process_headers'
+                    self.process_headers()
+
+                    # Make a copy of the class hooks
+                    self.hooks = self.__class__.hooks.copy()
+                    self.toolmaps = {}
+
+                    self.stage = 'get_resource'
+                    self.get_resource(path_info)
+
+                    self.body = _cpreqbody.RequestBody(
+                        self.rfile, self.headers, request_params=self.params)
+
+                    self.namespaces(self.config)
+
+                    self.stage = 'on_start_resource'
+                    self.hooks.run('on_start_resource')
+
+                    # Parse the querystring
+                    self.stage = 'process_query_string'
+                    self.process_query_string()
+
+                    # Process the body
+                    if self.process_request_body:
+                        if self.method not in self.methods_with_bodies:
+                            self.process_request_body = False
+                    self.stage = 'before_request_body'
+                    self.hooks.run('before_request_body')
+                    if self.process_request_body:
+                        self.body.process()
+
+                    # Run the handler
+                    self.stage = 'before_handler'
+                    self.hooks.run('before_handler')
+                    if self.handler:
+                        self.stage = 'handler'
+                        response.body = self.handler()
+
+                    # Finalize
+                    self.stage = 'before_finalize'
+                    self.hooks.run('before_finalize')
+                    response.finalize()
                 except (cherrypy.HTTPRedirect, cherrypy.HTTPError):
                     inst = sys.exc_info()[1]
                     inst.set_response()
                     self.stage = 'before_finalize (HTTPError)'
                     self.hooks.run('before_finalize')
-                    cherrypy.serving.response.finalize()
+                    response.finalize()
             finally:
                 self.stage = 'on_end_resource'
                 self.hooks.run('on_end_resource')
         except self.throws:
             raise
-        except Exception:
+        except:
             if self.throw_errors:
                 raise
             self.handle_error()
 
-    def _do_respond(self, path_info):
-        response = cherrypy.serving.response
-
-        if self.app is None:
-            raise cherrypy.NotFound()
-
-        self.hooks = self.__class__.hooks.copy()
-        self.toolmaps = {}
-
-        # Get the 'Host' header, so we can HTTPRedirect properly.
-        self.stage = 'process_headers'
-        self.process_headers()
-
-        self.stage = 'get_resource'
-        self.get_resource(path_info)
-
-        self.body = _cpreqbody.RequestBody(
-            self.rfile, self.headers, request_params=self.params)
-
-        self.namespaces(self.config)
-
-        self.stage = 'on_start_resource'
-        self.hooks.run('on_start_resource')
-
-        # Parse the querystring
-        self.stage = 'process_query_string'
-        self.process_query_string()
-
-        # Process the body
-        if self.process_request_body:
-            if self.method not in self.methods_with_bodies:
-                self.process_request_body = False
-        self.stage = 'before_request_body'
-        self.hooks.run('before_request_body')
-        if self.process_request_body:
-            self.body.process()
-
-        # Run the handler
-        self.stage = 'before_handler'
-        self.hooks.run('before_handler')
-        if self.handler:
-            self.stage = 'handler'
-            response.body = self.handler()
-
-        # Finalize
-        self.stage = 'before_finalize'
-        self.hooks.run('before_finalize')
-        response.finalize()
-
     def process_query_string(self):
-        """Parse the query string into Python structures.
-
-        (Core)
-        """
+        """Parse the query string into Python structures. (Core)"""
         try:
             p = httputil.parse_query_string(
                 self.query_string, encoding=self.query_string_encoding)
         except UnicodeDecodeError:
             raise cherrypy.HTTPError(
-                404, 'The given query string could not be processed. Query '
-                'strings for this resource must be encoded with %r.' %
+                404, "The given query string could not be processed. Query "
+                "strings for this resource must be encoded with %r." %
                 self.query_string_encoding)
 
+        # Python 2 only: keyword arguments must be byte strings (type 'str').
+        if not py3k:
+            for key, value in p.items():
+                if isinstance(key, unicode):
+                    del p[key]
+                    p[key.encode(self.query_string_encoding)] = value
         self.params.update(p)
 
     def process_headers(self):
-        """Parse HTTP header data into Python structures.
-
-        (Core)
-        """
+        """Parse HTTP header data into Python structures. (Core)"""
         # Process the headers into self.headers
         headers = self.headers
         for name, value in self.header_list:
@@ -751,16 +718,23 @@ class Request(object):
             name = name.title()
             value = value.strip()
 
-            headers[name] = httputil.decode_TEXT_maybe(value)
+            # Warning: if there is more than one header entry for cookies
+            # (AFAIK, only Konqueror does that), only the last one will
+            # remain in headers (but they will be correctly stored in
+            # request.cookie).
+            if "=?" in value:
+                dict.__setitem__(headers, name, httputil.decode_TEXT(value))
+            else:
+                dict.__setitem__(headers, name, value)
 
-            # Some clients, notably Konquoror, supply multiple
-            # cookies on different lines with the same key. To
-            # handle this case, store all cookies in self.cookie.
+            # Handle cookies differently because on Konqueror, multiple
+            # cookies come on different lines with the same key
             if name == 'Cookie':
                 try:
                     self.cookie.load(value)
-                except CookieError as exc:
-                    raise cherrypy.HTTPError(400, str(exc))
+                except CookieError:
+                    msg = "Illegal cookie name %s" % value.split('=')[0]
+                    raise cherrypy.HTTPError(400, msg)
 
         if not dict.__contains__(headers, 'Host'):
             # All Internet-based HTTP/1.1 servers MUST respond with a 400
@@ -769,50 +743,65 @@ class Request(object):
             if self.protocol >= (1, 1):
                 msg = "HTTP/1.1 requires a 'Host' request header."
                 raise cherrypy.HTTPError(400, msg)
-        else:
-            headers['Host'] = httputil.SanitizedHost(dict.get(headers, 'Host'))
-
         host = dict.get(headers, 'Host')
         if not host:
             host = self.local.name or self.local.ip
-        self.base = '%s://%s' % (self.scheme, host)
+        self.base = "%s://%s" % (self.scheme, host)
 
     def get_resource(self, path):
-        """Call a dispatcher (which sets self.handler and .config).
-
-        (Core)
-        """
+        """Call a dispatcher (which sets self.handler and .config). (Core)"""
         # First, see if there is a custom dispatch at this URI. Custom
         # dispatchers can only be specified in app.config, not in _cp_config
         # (since custom dispatchers may not even have an app.root).
         dispatch = self.app.find_config(
-            path, 'request.dispatch', self.dispatch)
+            path, "request.dispatch", self.dispatch)
 
         # dispatch() should set self.handler and self.config
         dispatch(path)
 
     def handle_error(self):
-        """Handle the last unanticipated exception.
-
-        (Core)
-        """
+        """Handle the last unanticipated exception. (Core)"""
         try:
-            self.hooks.run('before_error_response')
+            self.hooks.run("before_error_response")
             if self.error_response:
                 self.error_response()
-            self.hooks.run('after_error_response')
+            self.hooks.run("after_error_response")
             cherrypy.serving.response.finalize()
         except cherrypy.HTTPRedirect:
             inst = sys.exc_info()[1]
             inst.set_response()
             cherrypy.serving.response.finalize()
 
+    # ------------------------- Properties ------------------------- #
+
+    def _get_body_params(self):
+        warnings.warn(
+            "body_params is deprecated in CherryPy 3.2, will be removed in "
+            "CherryPy 3.3.",
+            DeprecationWarning
+        )
+        return self.body.params
+    body_params = property(_get_body_params,
+                           doc="""
+    If the request Content-Type is 'application/x-www-form-urlencoded' or
+    multipart, this will be a dict of the params pulled from the entity
+    body; that is, it will be the portion of request.params that come
+    from the message body (sometimes called "POST params", although they
+    can be sent with various HTTP method verbs). This value is set between
+    the 'before_request_body' and 'before_handler' hooks (assuming that
+    process_request_body is True).
+
+    Deprecated in 3.2, will be removed for 3.3 in favor of
+    :attr:`request.body.params<cherrypy._cprequest.RequestBody.params>`.""")
+
 
 class ResponseBody(object):
+
     """The body of the HTTP response (the response entity)."""
 
-    unicode_err = ('Page handlers MUST return bytes. Use tools.encode '
-                   'if you wish to return unicode.')
+    if py3k:
+        unicode_err = ("Page handlers MUST return bytes. Use tools.encode "
+                       "if you wish to return unicode.")
 
     def __get__(self, obj, objclass=None):
         if obj is None:
@@ -823,29 +812,45 @@ class ResponseBody(object):
 
     def __set__(self, obj, value):
         # Convert the given value to an iterable object.
-        if isinstance(value, str):
+        if py3k and isinstance(value, str):
             raise ValueError(self.unicode_err)
-        elif isinstance(value, list):
-            # every item in a list must be bytes...
-            if any(isinstance(item, str) for item in value):
-                raise ValueError(self.unicode_err)
 
-        obj._body = encoding.prepare_iter(value)
+        if isinstance(value, basestring):
+            # strings get wrapped in a list because iterating over a single
+            # item list is much faster than iterating over every character
+            # in a long string.
+            if value:
+                value = [value]
+            else:
+                # [''] doesn't evaluate to False, so replace it with [].
+                value = []
+        elif py3k and isinstance(value, list):
+            # every item in a list must be bytes...
+            for i, item in enumerate(value):
+                if isinstance(item, str):
+                    raise ValueError(self.unicode_err)
+        # Don't use isinstance here; io.IOBase which has an ABC takes
+        # 1000 times as long as, say, isinstance(value, str)
+        elif hasattr(value, 'read'):
+            value = file_generator(value)
+        elif value is None:
+            value = []
+        obj._body = value
 
 
 class Response(object):
+
     """An HTTP Response, including status, headers, and body."""
 
-    status = ''
+    status = ""
     """The HTTP Status-Code and Reason-Phrase."""
 
     header_list = []
-    """A list of the HTTP response headers as (name, value) tuples.
-
+    """
+    A list of the HTTP response headers as (name, value) tuples.
     In general, you should use response.headers (a dict) instead. This
     attribute is generated from response.headers and is not valid until
-    after the finalize phase.
-    """
+    after the finalize phase."""
 
     headers = httputil.HeaderMap()
     """
@@ -865,10 +870,15 @@ class Response(object):
     """The body (entity) of the HTTP response."""
 
     time = None
-    """The value of time.time() when created.
+    """The value of time.time() when created. Use in HTTP dates."""
 
-    Use in HTTP dates.
+    timeout = 300
+    """Seconds after which the response will be aborted."""
+
+    timed_out = False
     """
+    Flag to indicate the response should be aborted, because it has
+    exceeded its timeout."""
 
     stream = False
     """If False, buffer the response body."""
@@ -883,28 +893,30 @@ class Response(object):
         # Since we know all our keys are titled strings, we can
         # bypass HeaderMap.update and get a big speed boost.
         dict.update(self.headers, {
-            'Content-Type': 'text/html',
-            'Server': 'CherryPy/' + cherrypy.__version__,
-            'Date': httputil.HTTPDate(self.time),
+            "Content-Type": 'text/html',
+            "Server": "CherryPy/" + cherrypy.__version__,
+            "Date": httputil.HTTPDate(self.time),
         })
         self.cookie = SimpleCookie()
 
     def collapse_body(self):
         """Collapse self.body to a single string; replace it and return it."""
-        new_body = b''.join(self.body)
-        self.body = new_body
-        return new_body
+        if isinstance(self.body, basestring):
+            return self.body
 
-    def _flush_body(self):
-        """Discard self.body but consume any generator such that any
-        finalization can occur, such as is required by caching.tee_output()."""
-        consume(iter(self.body))
+        newbody = []
+        for chunk in self.body:
+            if py3k and not isinstance(chunk, bytes):
+                raise TypeError("Chunk %s is not of type 'bytes'." %
+                                repr(chunk))
+            newbody.append(chunk)
+        newbody = ntob('').join(newbody)
+
+        self.body = newbody
+        return newbody
 
     def finalize(self):
-        """Transform headers (and cookies) into self.header_list.
-
-        (Core)
-        """
+        """Transform headers (and cookies) into self.header_list. (Core)"""
         try:
             code, reason, _ = httputil.valid_status(self.status)
         except ValueError:
@@ -912,9 +924,9 @@ class Response(object):
 
         headers = self.headers
 
-        self.status = '%s %s' % (code, reason)
+        self.status = "%s %s" % (code, reason)
         self.output_status = ntob(str(code), 'ascii') + \
-            b' ' + headers.encode(reason)
+            ntob(" ") + headers.encode(reason)
 
         if self.stream:
             # The upshot: wsgiserver will chunk the response if
@@ -927,8 +939,7 @@ class Response(object):
             # and 304 (not modified) responses MUST NOT
             # include a message-body."
             dict.pop(headers, 'Content-Length', None)
-            self._flush_body()
-            self.body = b''
+            self.body = ntob("")
         else:
             # Responses which are not streamed should have a Content-Length,
             # but allow user code to set Content-Length if desired.
@@ -941,30 +952,22 @@ class Response(object):
 
         cookie = self.cookie.output()
         if cookie:
-            for line in cookie.split('\r\n'):
-                name, value = line.split(': ', 1)
-                if isinstance(name, str):
-                    name = name.encode('ISO-8859-1')
-                if isinstance(value, str):
+            for line in cookie.split("\n"):
+                if line.endswith("\r"):
+                    # Python 2.4 emits cookies joined by LF but 2.5+ by CRLF.
+                    line = line[:-1]
+                name, value = line.split(": ", 1)
+                if isinstance(name, unicodestr):
+                    name = name.encode("ISO-8859-1")
+                if isinstance(value, unicodestr):
                     value = headers.encode(value)
                 h.append((name, value))
 
+    def check_timeout(self):
+        """If now > self.time + self.timeout, set self.timed_out.
 
-class LazyUUID4(object):
-    def __str__(self):
-        """Return UUID4 and keep it for future calls."""
-        return str(self.uuid4)
-
-    @property
-    def uuid4(self):
-        """Provide unique id on per-request basis using UUID4.
-
-        It's evaluated lazily on render.
+        This purposefully sets a flag, rather than raising an error,
+        so that a monitor thread can interrupt the Response thread.
         """
-        try:
-            self._uuid4
-        except AttributeError:
-            # evaluate on first access
-            self._uuid4 = uuid.uuid4()
-
-        return self._uuid4
+        if time.time() > self.time + self.timeout:
+            self.timed_out = True
diff --git a/lib/cherrypy/_cpserver.py b/lib/cherrypy/_cpserver.py
index 62331673..a31e7428 100644
--- a/lib/cherrypy/_cpserver.py
+++ b/lib/cherrypy/_cpserver.py
@@ -1,15 +1,18 @@
 """Manage HTTP servers with CherryPy."""
 
+import warnings
+
 import cherrypy
-from cherrypy.lib.reprconf import attributes
-from cherrypy._cpcompat import text_or_bytes
-from cherrypy.process.servers import ServerAdapter
+from cherrypy.lib import attributes
+from cherrypy._cpcompat import basestring, py3k
 
-
-__all__ = ('Server', )
+# We import * because we want to export check_port
+# et al as attributes of this module.
+from cherrypy.process.servers import *
 
 
 class Server(ServerAdapter):
+
     """An adapter for an HTTP server.
 
     You can set attributes (like socket_host and socket_port)
@@ -25,33 +28,32 @@ class Server(ServerAdapter):
 
     _socket_host = '127.0.0.1'
 
-    @property
-    def socket_host(self):  # noqa: D401; irrelevant for properties
-        """The hostname or IP address on which to listen for connections.
+    def _get_socket_host(self):
+        return self._socket_host
+
+    def _set_socket_host(self, value):
+        if value == '':
+            raise ValueError("The empty string ('') is not an allowed value. "
+                             "Use '0.0.0.0' instead to listen on all active "
+                             "interfaces (INADDR_ANY).")
+        self._socket_host = value
+    socket_host = property(
+        _get_socket_host,
+        _set_socket_host,
+        doc="""The hostname or IP address on which to listen for connections.
 
         Host values may be any IPv4 or IPv6 address, or any valid hostname.
         The string 'localhost' is a synonym for '127.0.0.1' (or '::1', if
         your hosts file prefers IPv6). The string '0.0.0.0' is a special
         IPv4 entry meaning "any active interface" (INADDR_ANY), and '::'
         is the similar IN6ADDR_ANY for IPv6. The empty string or None are
-        not allowed.
-        """
-        return self._socket_host
-
-    @socket_host.setter
-    def socket_host(self, value):
-        if value == '':
-            raise ValueError("The empty string ('') is not an allowed value. "
-                             "Use '0.0.0.0' instead to listen on all active "
-                             'interfaces (INADDR_ANY).')
-        self._socket_host = value
+        not allowed.""")
 
     socket_file = None
     """If given, the name of the UNIX socket to use instead of TCP/IP.
 
     When this option is not None, the `socket_host` and `socket_port` options
-    are ignored.
-    """
+    are ignored."""
 
     socket_queue_size = 5
     """The 'backlog' argument to socket.listen(); specifies the maximum number
@@ -59,11 +61,11 @@ class Server(ServerAdapter):
 
     socket_timeout = 10
     """The timeout in seconds for accepted connections (default 10)."""
-
+    
     accepted_queue_size = -1
     """The maximum number of requests which will be queued up before
     the server refuses to accept it (default -1, meaning no limit)."""
-
+    
     accepted_queue_timeout = 10
     """The timeout in seconds for attempting to add a request to the
     queue when the queue is full (default 10)."""
@@ -80,29 +82,21 @@ class Server(ServerAdapter):
     """The number of worker threads to start up in the pool."""
 
     thread_pool_max = -1
-    """The maximum size of the worker-thread pool.
-
-    Use -1 to indicate no limit.
+    """The maximum size of the worker-thread pool. Use -1 to indicate no limit.
     """
 
     max_request_header_size = 500 * 1024
     """The maximum number of bytes allowable in the request headers.
-
-    If exceeded, the HTTP server should return "413 Request Entity Too
-    Large".
+    If exceeded, the HTTP server should return "413 Request Entity Too Large".
     """
 
     max_request_body_size = 100 * 1024 * 1024
-    """The maximum number of bytes allowable in the request body.
-
-    If exceeded, the HTTP server should return "413 Request Entity Too
-    Large".
-    """
+    """The maximum number of bytes allowable in the request body. If exceeded,
+    the HTTP server should return "413 Request Entity Too Large"."""
 
     instance = None
     """If not None, this should be an HTTP server instance (such as
-    cheroot.wsgi.Server) which cherrypy.server will control.
-    Use this when you need
+    CPWSGIServer) which cherrypy.server will control. Use this when you need
     more control over object instantiation than is available in the various
     configuration options."""
 
@@ -119,16 +113,21 @@ class Server(ServerAdapter):
     ssl_private_key = None
     """The filename of the private key to use with SSL."""
 
-    ssl_ciphers = None
-    """The ciphers list of SSL."""
-
-    ssl_module = 'builtin'
-    """The name of a registered SSL adaptation module to use with
-    the builtin WSGI server. Builtin options are: 'builtin' (to
-    use the SSL library built into recent versions of Python).
-    You may also register your own classes in the
-    cheroot.server.ssl_adapters dict.
-    """
+    if py3k:
+        ssl_module = 'builtin'
+        """The name of a registered SSL adaptation module to use with
+        the builtin WSGI server. Builtin options are: 'builtin' (to
+        use the SSL library built into recent versions of Python).
+        You may also register your own classes in the
+        wsgiserver.ssl_adapters dict."""
+    else:
+        ssl_module = 'pyopenssl'
+        """The name of a registered SSL adaptation module to use with the
+        builtin WSGI server. Builtin options are 'builtin' (to use the SSL
+        library built into recent versions of Python) and 'pyopenssl' (to
+        use the PyOpenSSL project, which you must install separately). You
+        may also register your own classes in the wsgiserver.ssl_adapters
+        dict."""
 
     statistics = False
     """Turns statistics-gathering on or off for aware HTTP servers."""
@@ -138,35 +137,13 @@ class Server(ServerAdapter):
 
     wsgi_version = (1, 0)
     """The WSGI version tuple to use with the builtin WSGI server.
-
-    The provided options are (1, 0) [which includes support for PEP
-    3333, which declares it covers WSGI version 1.0.1 but still mandates
-    the wsgi.version (1, 0)] and ('u', 0), an experimental unicode
-    version. You may create and register your own experimental versions
-    of the WSGI protocol by adding custom classes to the
-    cheroot.server.wsgi_gateways dict.
-    """
-
-    peercreds = False
-    """If True, peer cred lookup for UNIX domain socket will put to WSGI env.
-
-    This information will then be available through WSGI env vars:
-    * X_REMOTE_PID
-    * X_REMOTE_UID
-    * X_REMOTE_GID
-    """
-
-    peercreds_resolve = False
-    """If True, username/group will be looked up in the OS from peercreds.
-
-    This information will then be available through WSGI env vars:
-    * REMOTE_USER
-    * X_REMOTE_USER
-    * X_REMOTE_GROUP
-    """
+    The provided options are (1, 0) [which includes support for PEP 3333,
+    which declares it covers WSGI version 1.0.1 but still mandates the
+    wsgi.version (1, 0)] and ('u', 0), an experimental unicode version.
+    You may create and register your own experimental versions of the WSGI
+    protocol by adding custom classes to the wsgiserver.wsgi_gateways dict."""
 
     def __init__(self):
-        """Initialize Server instance."""
         self.bus = cherrypy.engine
         self.httpserver = None
         self.interrupt = None
@@ -179,7 +156,7 @@ class Server(ServerAdapter):
         if httpserver is None:
             from cherrypy import _cpwsgi_server
             httpserver = _cpwsgi_server.CPWSGIServer(self)
-        if isinstance(httpserver, text_or_bytes):
+        if isinstance(httpserver, basestring):
             # Is anyone using this? Can I add an arg?
             httpserver = attributes(httpserver)(self)
         return httpserver, self.bind_addr
@@ -188,29 +165,22 @@ class Server(ServerAdapter):
         """Start the HTTP server."""
         if not self.httpserver:
             self.httpserver, self.bind_addr = self.httpserver_from_self()
-        super(Server, self).start()
+        ServerAdapter.start(self)
     start.priority = 75
 
-    @property
-    def bind_addr(self):
-        """Return bind address.
-
-        A (host, port) tuple for TCP sockets or a str for Unix domain
-        sockets.
-        """
+    def _get_bind_addr(self):
         if self.socket_file:
             return self.socket_file
         if self.socket_host is None and self.socket_port is None:
             return None
         return (self.socket_host, self.socket_port)
 
-    @bind_addr.setter
-    def bind_addr(self, value):
+    def _set_bind_addr(self, value):
         if value is None:
             self.socket_file = None
             self.socket_host = None
             self.socket_port = None
-        elif isinstance(value, text_or_bytes):
+        elif isinstance(value, basestring):
             self.socket_file = value
             self.socket_host = None
             self.socket_port = None
@@ -219,14 +189,17 @@ class Server(ServerAdapter):
                 self.socket_host, self.socket_port = value
                 self.socket_file = None
             except ValueError:
-                raise ValueError('bind_addr must be a (host, port) tuple '
-                                 '(for TCP sockets) or a string (for Unix '
-                                 'domain sockets), not %r' % value)
+                raise ValueError("bind_addr must be a (host, port) tuple "
+                                 "(for TCP sockets) or a string (for Unix "
+                                 "domain sockets), not %r" % value)
+    bind_addr = property(
+        _get_bind_addr,
+        _set_bind_addr,
+        doc='A (host, port) tuple for TCP sockets or '
+            'a str for Unix domain sockets.')
 
     def base(self):
-        """Return the base for this server.
-
-        e.i. scheme://host[:port] or sock file
+        """Return the base (scheme://host[:port] or sock file) for this server.
         """
         if self.socket_file:
             return self.socket_file
@@ -242,12 +215,12 @@ class Server(ServerAdapter):
         port = self.socket_port
 
         if self.ssl_certificate:
-            scheme = 'https'
+            scheme = "https"
             if port != 443:
-                host += ':%s' % port
+                host += ":%s" % port
         else:
-            scheme = 'http'
+            scheme = "http"
             if port != 80:
-                host += ':%s' % port
+                host += ":%s" % port
 
-        return '%s://%s' % (scheme, host)
+        return "%s://%s" % (scheme, host)
diff --git a/lib/cherrypy/_cpthreadinglocal.py b/lib/cherrypy/_cpthreadinglocal.py
new file mode 100644
index 00000000..238c3224
--- /dev/null
+++ b/lib/cherrypy/_cpthreadinglocal.py
@@ -0,0 +1,241 @@
+# This is a backport of Python-2.4's threading.local() implementation
+
+"""Thread-local objects
+
+(Note that this module provides a Python version of thread
+ threading.local class.  Depending on the version of Python you're
+ using, there may be a faster one available.  You should always import
+ the local class from threading.)
+
+Thread-local objects support the management of thread-local data.
+If you have data that you want to be local to a thread, simply create
+a thread-local object and use its attributes:
+
+  >>> mydata = local()
+  >>> mydata.number = 42
+  >>> mydata.number
+  42
+
+You can also access the local-object's dictionary:
+
+  >>> mydata.__dict__
+  {'number': 42}
+  >>> mydata.__dict__.setdefault('widgets', [])
+  []
+  >>> mydata.widgets
+  []
+
+What's important about thread-local objects is that their data are
+local to a thread. If we access the data in a different thread:
+
+  >>> log = []
+  >>> def f():
+  ...     items = mydata.__dict__.items()
+  ...     items.sort()
+  ...     log.append(items)
+  ...     mydata.number = 11
+  ...     log.append(mydata.number)
+
+  >>> import threading
+  >>> thread = threading.Thread(target=f)
+  >>> thread.start()
+  >>> thread.join()
+  >>> log
+  [[], 11]
+
+we get different data.  Furthermore, changes made in the other thread
+don't affect data seen in this thread:
+
+  >>> mydata.number
+  42
+
+Of course, values you get from a local object, including a __dict__
+attribute, are for whatever thread was current at the time the
+attribute was read.  For that reason, you generally don't want to save
+these values across threads, as they apply only to the thread they
+came from.
+
+You can create custom local objects by subclassing the local class:
+
+  >>> class MyLocal(local):
+  ...     number = 2
+  ...     initialized = False
+  ...     def __init__(self, **kw):
+  ...         if self.initialized:
+  ...             raise SystemError('__init__ called too many times')
+  ...         self.initialized = True
+  ...         self.__dict__.update(kw)
+  ...     def squared(self):
+  ...         return self.number ** 2
+
+This can be useful to support default values, methods and
+initialization.  Note that if you define an __init__ method, it will be
+called each time the local object is used in a separate thread.  This
+is necessary to initialize each thread's dictionary.
+
+Now if we create a local object:
+
+  >>> mydata = MyLocal(color='red')
+
+Now we have a default number:
+
+  >>> mydata.number
+  2
+
+an initial color:
+
+  >>> mydata.color
+  'red'
+  >>> del mydata.color
+
+And a method that operates on the data:
+
+  >>> mydata.squared()
+  4
+
+As before, we can access the data in a separate thread:
+
+  >>> log = []
+  >>> thread = threading.Thread(target=f)
+  >>> thread.start()
+  >>> thread.join()
+  >>> log
+  [[('color', 'red'), ('initialized', True)], 11]
+
+without affecting this thread's data:
+
+  >>> mydata.number
+  2
+  >>> mydata.color
+  Traceback (most recent call last):
+  ...
+  AttributeError: 'MyLocal' object has no attribute 'color'
+
+Note that subclasses can define slots, but they are not thread
+local. They are shared across threads:
+
+  >>> class MyLocal(local):
+  ...     __slots__ = 'number'
+
+  >>> mydata = MyLocal()
+  >>> mydata.number = 42
+  >>> mydata.color = 'red'
+
+So, the separate thread:
+
+  >>> thread = threading.Thread(target=f)
+  >>> thread.start()
+  >>> thread.join()
+
+affects what we see:
+
+  >>> mydata.number
+  11
+
+>>> del mydata
+"""
+
+# Threading import is at end
+
+
+class _localbase(object):
+    __slots__ = '_local__key', '_local__args', '_local__lock'
+
+    def __new__(cls, *args, **kw):
+        self = object.__new__(cls)
+        key = 'thread.local.' + str(id(self))
+        object.__setattr__(self, '_local__key', key)
+        object.__setattr__(self, '_local__args', (args, kw))
+        object.__setattr__(self, '_local__lock', RLock())
+
+        if args or kw and (cls.__init__ is object.__init__):
+            raise TypeError("Initialization arguments are not supported")
+
+        # We need to create the thread dict in anticipation of
+        # __init__ being called, to make sure we don't call it
+        # again ourselves.
+        dict = object.__getattribute__(self, '__dict__')
+        currentThread().__dict__[key] = dict
+
+        return self
+
+
+def _patch(self):
+    key = object.__getattribute__(self, '_local__key')
+    d = currentThread().__dict__.get(key)
+    if d is None:
+        d = {}
+        currentThread().__dict__[key] = d
+        object.__setattr__(self, '__dict__', d)
+
+        # we have a new instance dict, so call out __init__ if we have
+        # one
+        cls = type(self)
+        if cls.__init__ is not object.__init__:
+            args, kw = object.__getattribute__(self, '_local__args')
+            cls.__init__(self, *args, **kw)
+    else:
+        object.__setattr__(self, '__dict__', d)
+
+
+class local(_localbase):
+
+    def __getattribute__(self, name):
+        lock = object.__getattribute__(self, '_local__lock')
+        lock.acquire()
+        try:
+            _patch(self)
+            return object.__getattribute__(self, name)
+        finally:
+            lock.release()
+
+    def __setattr__(self, name, value):
+        lock = object.__getattribute__(self, '_local__lock')
+        lock.acquire()
+        try:
+            _patch(self)
+            return object.__setattr__(self, name, value)
+        finally:
+            lock.release()
+
+    def __delattr__(self, name):
+        lock = object.__getattribute__(self, '_local__lock')
+        lock.acquire()
+        try:
+            _patch(self)
+            return object.__delattr__(self, name)
+        finally:
+            lock.release()
+
+    def __del__():
+        threading_enumerate = enumerate
+        __getattribute__ = object.__getattribute__
+
+        def __del__(self):
+            key = __getattribute__(self, '_local__key')
+
+            try:
+                threads = list(threading_enumerate())
+            except:
+                # if enumerate fails, as it seems to do during
+                # shutdown, we'll skip cleanup under the assumption
+                # that there is nothing to clean up
+                return
+
+            for thread in threads:
+                try:
+                    __dict__ = thread.__dict__
+                except AttributeError:
+                    # Thread is dying, rest in peace
+                    continue
+
+                if key in __dict__:
+                    try:
+                        del __dict__[key]
+                    except KeyError:
+                        pass  # didn't have anything in this thread
+
+        return __del__
+    __del__ = __del__()
+
+from threading import currentThread, enumerate, RLock
diff --git a/lib/cherrypy/_cptools.py b/lib/cherrypy/_cptools.py
index e47c046e..06a56e87 100644
--- a/lib/cherrypy/_cptools.py
+++ b/lib/cherrypy/_cptools.py
@@ -1,7 +1,7 @@
 """CherryPy tools. A "tool" is any helper, adapted to CP.
 
-Tools are usually designed to be used in a variety of ways (although
-some may only offer one if they choose):
+Tools are usually designed to be used in a variety of ways (although some
+may only offer one if they choose):
 
     Library calls
         All tools are callables that can be used wherever needed.
@@ -22,39 +22,41 @@ Tools may be implemented as any object with a namespace. The builtins
 are generally either modules or instances of the tools.Tool class.
 """
 
-import cherrypy
-from cherrypy._helper import expose
+import sys
+import warnings
 
-from cherrypy.lib import cptools, encoding, static, jsontools
-from cherrypy.lib import sessions as _sessions, xmlrpcutil as _xmlrpc
-from cherrypy.lib import caching as _caching
-from cherrypy.lib import auth_basic, auth_digest
+import cherrypy
 
 
 def _getargs(func):
     """Return the names of all static arguments to the given function."""
     # Use this instead of importing inspect for less mem overhead.
     import types
-    if isinstance(func, types.MethodType):
-        func = func.__func__
-    co = func.__code__
+    if sys.version_info >= (3, 0):
+        if isinstance(func, types.MethodType):
+            func = func.__func__
+        co = func.__code__
+    else:
+        if isinstance(func, types.MethodType):
+            func = func.im_func
+        co = func.func_code
     return co.co_varnames[:co.co_argcount]
 
 
 _attr_error = (
-    'CherryPy Tools cannot be turned on directly. Instead, turn them '
-    'on via config, or use them as decorators on your page handlers.'
+    "CherryPy Tools cannot be turned on directly. Instead, turn them "
+    "on via config, or use them as decorators on your page handlers."
 )
 
 
 class Tool(object):
+
     """A registered function for use with CherryPy request-processing hooks.
 
-    help(tool.callable) should give you more information about this
-    Tool.
+    help(tool.callable) should give you more information about this Tool.
     """
 
-    namespace = 'tools'
+    namespace = "tools"
 
     def __init__(self, point, callable, name=None, priority=50):
         self._point = point
@@ -64,13 +66,12 @@ class Tool(object):
         self.__doc__ = self.callable.__doc__
         self._setargs()
 
-    @property
-    def on(self):
+    def _get_on(self):
         raise AttributeError(_attr_error)
 
-    @on.setter
-    def on(self, value):
+    def _set_on(self, value):
         raise AttributeError(_attr_error)
+    on = property(_get_on, _set_on)
 
     def _setargs(self):
         """Copy func parameter names to obj attributes."""
@@ -78,7 +79,7 @@ class Tool(object):
             for arg in _getargs(self.callable):
                 setattr(self, arg, None)
         except (TypeError, AttributeError):
-            if hasattr(self.callable, '__call__'):
+            if hasattr(self.callable, "__call__"):
                 for arg in _getargs(self.callable.__call__):
                     setattr(self, arg, None)
         # IronPython 1.0 raises NotImplementedError because
@@ -102,8 +103,8 @@ class Tool(object):
         if self._name in tm:
             conf.update(tm[self._name])
 
-        if 'on' in conf:
-            del conf['on']
+        if "on" in conf:
+            del conf["on"]
 
         return conf
 
@@ -112,21 +113,21 @@ class Tool(object):
 
         For example::
 
-            @expose
             @tools.proxy()
             def whats_my_base(self):
                 return cherrypy.request.base
+            whats_my_base.exposed = True
         """
         if args:
-            raise TypeError('The %r Tool does not accept positional '
-                            'arguments; you must use keyword arguments.'
+            raise TypeError("The %r Tool does not accept positional "
+                            "arguments; you must use keyword arguments."
                             % self._name)
 
         def tool_decorator(f):
-            if not hasattr(f, '_cp_config'):
+            if not hasattr(f, "_cp_config"):
                 f._cp_config = {}
-            subspace = self.namespace + '.' + self._name + '.'
-            f._cp_config[subspace + 'on'] = True
+            subspace = self.namespace + "." + self._name + "."
+            f._cp_config[subspace + "on"] = True
             for k, v in kwargs.items():
                 f._cp_config[subspace + k] = v
             return f
@@ -135,27 +136,27 @@ class Tool(object):
     def _setup(self):
         """Hook this tool into cherrypy.request.
 
-        The standard CherryPy request object will automatically call
-        this method when the tool is "turned on" in config.
+        The standard CherryPy request object will automatically call this
+        method when the tool is "turned on" in config.
         """
         conf = self._merged_args()
-        p = conf.pop('priority', None)
+        p = conf.pop("priority", None)
         if p is None:
-            p = getattr(self.callable, 'priority', self._priority)
+            p = getattr(self.callable, "priority", self._priority)
         cherrypy.serving.request.hooks.attach(self._point, self.callable,
                                               priority=p, **conf)
 
 
 class HandlerTool(Tool):
+
     """Tool which is called 'before main', that may skip normal handlers.
 
-    If the tool successfully handles the request (by setting
-    response.body), if should return True. This will cause CherryPy to
-    skip any 'normal' page handler. If the tool did not handle the
-    request, it should return False to tell CherryPy to continue on and
-    call the normal page handler. If the tool is declared AS a page
-    handler (see the 'handler' method), returning False will raise
-    NotFound.
+    If the tool successfully handles the request (by setting response.body),
+    if should return True. This will cause CherryPy to skip any 'normal' page
+    handler. If the tool did not handle the request, it should return False
+    to tell CherryPy to continue on and call the normal page handler. If the
+    tool is declared AS a page handler (see the 'handler' method), returning
+    False will raise NotFound.
     """
 
     def __init__(self, callable, name=None):
@@ -170,12 +171,12 @@ class HandlerTool(Tool):
                 nav = tools.staticdir.handler(section="/nav", dir="nav",
                                               root=absDir)
         """
-        @expose
         def handle_func(*a, **kw):
             handled = self.callable(*args, **self._merged_args(kwargs))
             if not handled:
                 raise cherrypy.NotFound()
             return cherrypy.serving.response.body
+        handle_func.exposed = True
         return handle_func
 
     def _wrapper(self, **kwargs):
@@ -185,18 +186,19 @@ class HandlerTool(Tool):
     def _setup(self):
         """Hook this tool into cherrypy.request.
 
-        The standard CherryPy request object will automatically call
-        this method when the tool is "turned on" in config.
+        The standard CherryPy request object will automatically call this
+        method when the tool is "turned on" in config.
         """
         conf = self._merged_args()
-        p = conf.pop('priority', None)
+        p = conf.pop("priority", None)
         if p is None:
-            p = getattr(self.callable, 'priority', self._priority)
+            p = getattr(self.callable, "priority", self._priority)
         cherrypy.serving.request.hooks.attach(self._point, self._wrapper,
                                               priority=p, **conf)
 
 
 class HandlerWrapperTool(Tool):
+
     """Tool which wraps request.handler in a provided wrapper function.
 
     The 'newhandler' arg must be a handler wrapper function that takes a
@@ -231,6 +233,7 @@ class HandlerWrapperTool(Tool):
 
 
 class ErrorTool(Tool):
+
     """Tool which is used to replace the default request.error_response."""
 
     def __init__(self, callable, name=None):
@@ -242,16 +245,22 @@ class ErrorTool(Tool):
     def _setup(self):
         """Hook this tool into cherrypy.request.
 
-        The standard CherryPy request object will automatically call
-        this method when the tool is "turned on" in config.
+        The standard CherryPy request object will automatically call this
+        method when the tool is "turned on" in config.
         """
         cherrypy.serving.request.error_response = self._wrapper
 
 
 #                              Builtin tools                              #
 
+from cherrypy.lib import cptools, encoding, auth, static, jsontools
+from cherrypy.lib import sessions as _sessions, xmlrpcutil as _xmlrpc
+from cherrypy.lib import caching as _caching
+from cherrypy.lib import auth_basic, auth_digest
+
 
 class SessionTool(Tool):
+
     """Session Tool for CherryPy.
 
     sessions.locking
@@ -262,7 +271,7 @@ class SessionTool(Tool):
         body. This is off by default for safety reasons; for example,
         a large upload would block the session, denying an AJAX
         progress meter
-        (`issue <https://github.com/cherrypy/cherrypy/issues/630>`_).
+        (`issue <https://bitbucket.org/cherrypy/cherrypy/issue/630>`_).
 
         When 'explicit' (or any other value), you need to call
         cherrypy.session.acquire_lock() yourself before using
@@ -279,16 +288,16 @@ class SessionTool(Tool):
     def _setup(self):
         """Hook this tool into cherrypy.request.
 
-        The standard CherryPy request object will automatically call
-        this method when the tool is "turned on" in config.
+        The standard CherryPy request object will automatically call this
+        method when the tool is "turned on" in config.
         """
         hooks = cherrypy.serving.request.hooks
 
         conf = self._merged_args()
 
-        p = conf.pop('priority', None)
+        p = conf.pop("priority", None)
         if p is None:
-            p = getattr(self.callable, 'priority', self._priority)
+            p = getattr(self.callable, "priority", self._priority)
 
         hooks.attach(self._point, self.callable, priority=p, **conf)
 
@@ -312,16 +321,14 @@ class SessionTool(Tool):
         sess.regenerate()
 
         # Grab cookie-relevant tool args
-        relevant = 'path', 'path_header', 'name', 'timeout', 'domain', 'secure'
-        conf = dict(
-            (k, v)
-            for k, v in self._merged_args().items()
-            if k in relevant
-        )
+        conf = dict([(k, v) for k, v in self._merged_args().items()
+                     if k in ('path', 'path_header', 'name', 'timeout',
+                              'domain', 'secure')])
         _sessions.set_response_cookie(**conf)
 
 
 class XMLRPCController(object):
+
     """A Controller (page handler collection) for XML-RPC.
 
     To use it, have your controllers subclass this base class (it will
@@ -358,7 +365,6 @@ class XMLRPCController(object):
     # would be if someone actually disabled the default_toolbox. Meh.
     _cp_config = {'tools.xmlrpc.on': True}
 
-    @expose
     def default(self, *vpath, **params):
         rpcparams, rpcmethod = _xmlrpc.process_body()
 
@@ -366,28 +372,34 @@ class XMLRPCController(object):
         for attr in str(rpcmethod).split('.'):
             subhandler = getattr(subhandler, attr, None)
 
-        if subhandler and getattr(subhandler, 'exposed', False):
+        if subhandler and getattr(subhandler, "exposed", False):
             body = subhandler(*(vpath + rpcparams), **params)
 
         else:
-            # https://github.com/cherrypy/cherrypy/issues/533
+            # https://bitbucket.org/cherrypy/cherrypy/issue/533
             # if a method is not found, an xmlrpclib.Fault should be returned
             # raising an exception here will do that; see
             # cherrypy.lib.xmlrpcutil.on_error
             raise Exception('method "%s" is not supported' % attr)
 
-        conf = cherrypy.serving.request.toolmaps['tools'].get('xmlrpc', {})
+        conf = cherrypy.serving.request.toolmaps['tools'].get("xmlrpc", {})
         _xmlrpc.respond(body,
                         conf.get('encoding', 'utf-8'),
                         conf.get('allow_none', 0))
         return cherrypy.serving.response.body
+    default.exposed = True
 
 
 class SessionAuthTool(HandlerTool):
-    pass
+
+    def _setargs(self):
+        for name in dir(cptools.SessionAuth):
+            if not name.startswith("__"):
+                setattr(self, name, None)
 
 
 class CachingTool(Tool):
+
     """Caching Tool for CherryPy."""
 
     def _wrapper(self, **kwargs):
@@ -398,24 +410,24 @@ class CachingTool(Tool):
             if request.cacheable:
                 # Note the devious technique here of adding hooks on the fly
                 request.hooks.attach('before_finalize', _caching.tee_output,
-                                     priority=100)
-    _wrapper.priority = 90
+                                     priority=90)
+    _wrapper.priority = 20
 
     def _setup(self):
         """Hook caching into cherrypy.request."""
         conf = self._merged_args()
 
-        p = conf.pop('priority', None)
+        p = conf.pop("priority", None)
         cherrypy.serving.request.hooks.attach('before_handler', self._wrapper,
                                               priority=p, **conf)
 
 
 class Toolbox(object):
+
     """A collection of Tools.
 
     This object also functions as a config namespace handler for itself.
-    Custom toolboxes should be added to each Application's toolboxes
-    dict.
+    Custom toolboxes should be added to each Application's toolboxes dict.
     """
 
     def __init__(self, namespace):
@@ -434,7 +446,7 @@ class Toolbox(object):
         cherrypy.serving.request.toolmaps[self.namespace] = map = {}
 
         def populate(k, v):
-            toolname, arg = k.split('.', 1)
+            toolname, arg = k.split(".", 1)
             bucket = map.setdefault(toolname, {})
             bucket[arg] = v
         return populate
@@ -444,24 +456,33 @@ class Toolbox(object):
         map = cherrypy.serving.request.toolmaps.get(self.namespace)
         if map:
             for name, settings in map.items():
-                if settings.get('on', False):
+                if settings.get("on", False):
                     tool = getattr(self, name)
                     tool._setup()
 
-    def register(self, point, **kwargs):
-        """
-        Return a decorator which registers the function
-        at the given hook point.
-        """
-        def decorator(func):
-            attr_name = kwargs.get('name', func.__name__)
-            tool = Tool(point, func, **kwargs)
-            setattr(self, attr_name, tool)
-            return func
-        return decorator
+
+class DeprecatedTool(Tool):
+
+    _name = None
+    warnmsg = "This Tool is deprecated."
+
+    def __init__(self, point, warnmsg=None):
+        self.point = point
+        if warnmsg is not None:
+            self.warnmsg = warnmsg
+
+    def __call__(self, *args, **kwargs):
+        warnings.warn(self.warnmsg)
+
+        def tool_decorator(f):
+            return f
+        return tool_decorator
+
+    def _setup(self):
+        warnings.warn(self.warnmsg)
 
 
-default_toolbox = _d = Toolbox('tools')
+default_toolbox = _d = Toolbox("tools")
 _d.session_auth = SessionAuthTool(cptools.session_auth)
 _d.allow = Tool('on_start_resource', cptools.allow)
 _d.proxy = Tool('before_request_body', cptools.proxy, priority=30)
@@ -481,8 +502,20 @@ _d.sessions = SessionTool()
 _d.xmlrpc = ErrorTool(_xmlrpc.on_error)
 _d.caching = CachingTool('before_handler', _caching.get, 'caching')
 _d.expires = Tool('before_finalize', _caching.expires)
+_d.tidy = DeprecatedTool(
+    'before_finalize',
+    "The tidy tool has been removed from the standard distribution of "
+    "CherryPy. The most recent version can be found at "
+    "http://tools.cherrypy.org/browser.")
+_d.nsgmls = DeprecatedTool(
+    'before_finalize',
+    "The nsgmls tool has been removed from the standard distribution of "
+    "CherryPy. The most recent version can be found at "
+    "http://tools.cherrypy.org/browser.")
 _d.ignore_headers = Tool('before_request_body', cptools.ignore_headers)
 _d.referer = Tool('before_request_body', cptools.referer)
+_d.basic_auth = Tool('on_start_resource', auth.basic_auth)
+_d.digest_auth = Tool('on_start_resource', auth.digest_auth)
 _d.trailing_slash = Tool('before_handler', cptools.trailing_slash, priority=60)
 _d.flatten = Tool('before_finalize', cptools.flatten)
 _d.accept = Tool('on_start_resource', cptools.accept)
@@ -492,6 +525,5 @@ _d.json_in = Tool('before_request_body', jsontools.json_in, priority=30)
 _d.json_out = Tool('before_handler', jsontools.json_out, priority=30)
 _d.auth_basic = Tool('before_handler', auth_basic.basic_auth, priority=1)
 _d.auth_digest = Tool('before_handler', auth_digest.digest_auth, priority=1)
-_d.params = Tool('before_handler', cptools.convert_params, priority=15)
 
-del _d, cptools, encoding, static
+del _d, cptools, encoding, auth, static
diff --git a/lib/cherrypy/_cptree.py b/lib/cherrypy/_cptree.py
index 3dea1c29..a31b2793 100644
--- a/lib/cherrypy/_cptree.py
+++ b/lib/cherrypy/_cptree.py
@@ -3,72 +3,63 @@
 import os
 
 import cherrypy
+from cherrypy._cpcompat import ntou, py3k
 from cherrypy import _cpconfig, _cplogging, _cprequest, _cpwsgi, tools
-from cherrypy.lib import httputil, reprconf
+from cherrypy.lib import httputil
 
 
 class Application(object):
+
     """A CherryPy Application.
 
-    Servers and gateways should not instantiate Request objects
-    directly. Instead, they should ask an Application object for a
-    request object.
+    Servers and gateways should not instantiate Request objects directly.
+    Instead, they should ask an Application object for a request object.
 
-    An instance of this class may also be used as a WSGI callable (WSGI
-    application object) for itself.
+    An instance of this class may also be used as a WSGI callable
+    (WSGI application object) for itself.
     """
 
     root = None
-    """The top-most container of page handlers for this app.
-
-    Handlers should be arranged in a hierarchy of attributes, matching
-    the expected URI hierarchy; the default dispatcher then searches
-    this hierarchy for a matching handler. When using a dispatcher other
-    than the default, this value may be None.
-    """
+    """The top-most container of page handlers for this app. Handlers should
+    be arranged in a hierarchy of attributes, matching the expected URI
+    hierarchy; the default dispatcher then searches this hierarchy for a
+    matching handler. When using a dispatcher other than the default,
+    this value may be None."""
 
     config = {}
     """A dict of {path: pathconf} pairs, where 'pathconf' is itself a dict
     of {key: value} pairs."""
 
-    namespaces = reprconf.NamespaceSet()
+    namespaces = _cpconfig.NamespaceSet()
     toolboxes = {'tools': cherrypy.tools}
 
     log = None
-    """A LogManager instance.
-
-    See _cplogging.
-    """
+    """A LogManager instance. See _cplogging."""
 
     wsgiapp = None
-    """A CPWSGIApp instance.
-
-    See _cpwsgi.
-    """
+    """A CPWSGIApp instance. See _cpwsgi."""
 
     request_class = _cprequest.Request
     response_class = _cprequest.Response
 
     relative_urls = False
 
-    def __init__(self, root, script_name='', config=None):
-        """Initialize Application with given root."""
+    def __init__(self, root, script_name="", config=None):
         self.log = _cplogging.LogManager(id(self), cherrypy.log.logger_root)
         self.root = root
         self.script_name = script_name
         self.wsgiapp = _cpwsgi.CPWSGIApp(self)
 
         self.namespaces = self.namespaces.copy()
-        self.namespaces['log'] = lambda k, v: setattr(self.log, k, v)
-        self.namespaces['wsgi'] = self.wsgiapp.namespace_handler
+        self.namespaces["log"] = lambda k, v: setattr(self.log, k, v)
+        self.namespaces["wsgi"] = self.wsgiapp.namespace_handler
 
         self.config = self.__class__.config.copy()
         if config:
             self.merge(config)
 
     def __repr__(self):
-        """Generate a representation of the Application instance."""
-        return '%s.%s(%r, %r)' % (self.__module__, self.__class__.__name__,
+        return "%s.%s(%r, %r)" % (self.__module__, self.__class__.__name__,
                                   self.root, self.script_name)
 
     script_name_doc = """The URI "mount point" for this app. A mount point
@@ -87,61 +78,42 @@ class Application(object):
     provided for each call from request.wsgi_environ['SCRIPT_NAME'].
     """
 
-    @property
-    def script_name(self):  # noqa: D401; irrelevant for properties
-        """The URI "mount point" for this app.
-
-        A mount point is that portion of the URI which is constant for
-        all URIs that are serviced by this application; it does not
-        include scheme, host, or proxy ("virtual host") portions of the
-        URI.
-
-        For example, if script_name is "/my/cool/app", then the URL "
-
-        http://www.example.com/my/cool/app/page1"
-        might be handled by a
-        "page1" method on the root object.
-
-        The value of script_name MUST NOT end in a slash. If the script_name
-        refers to the root of the URI, it MUST be an empty string (not "/").
-
-        If script_name is explicitly set to None, then the script_name will be
-        provided for each call from request.wsgi_environ['SCRIPT_NAME'].
-        """
+    def _get_script_name(self):
         if self._script_name is not None:
             return self._script_name
 
         # A `_script_name` with a value of None signals that the script name
         # should be pulled from WSGI environ.
-        return cherrypy.serving.request.wsgi_environ['SCRIPT_NAME'].rstrip('/')
+        return cherrypy.serving.request.wsgi_environ['SCRIPT_NAME'].rstrip("/")
 
-    @script_name.setter
-    def script_name(self, value):
+    def _set_script_name(self, value):
         if value:
-            value = value.rstrip('/')
+            value = value.rstrip("/")
         self._script_name = value
+    script_name = property(fget=_get_script_name, fset=_set_script_name,
+                           doc=script_name_doc)
 
     def merge(self, config):
         """Merge the given config into self.config."""
         _cpconfig.merge(self.config, config)
 
         # Handle namespaces specified in config.
-        self.namespaces(self.config.get('/', {}))
+        self.namespaces(self.config.get("/", {}))
 
     def find_config(self, path, key, default=None):
         """Return the most-specific value for key along path, or default."""
-        trail = path or '/'
+        trail = path or "/"
         while trail:
             nodeconf = self.config.get(trail, {})
 
             if key in nodeconf:
                 return nodeconf[key]
 
-            lastslash = trail.rfind('/')
+            lastslash = trail.rfind("/")
             if lastslash == -1:
                 break
-            elif lastslash == 0 and trail != '/':
-                trail = '/'
+            elif lastslash == 0 and trail != "/":
+                trail = "/"
             else:
                 trail = trail[:lastslash]
 
@@ -170,22 +142,22 @@ class Application(object):
 
         try:
             req.close()
-        except Exception:
+        except:
             cherrypy.log(traceback=True, severity=40)
 
         cherrypy.serving.clear()
 
     def __call__(self, environ, start_response):
-        """Call a WSGI-callable."""
         return self.wsgiapp(environ, start_response)
 
 
 class Tree(object):
+
     """A registry of CherryPy applications, mounted at diverse points.
 
-    An instance of this class may also be used as a WSGI callable (WSGI
-    application object), in which case it dispatches to all mounted
-    apps.
+    An instance of this class may also be used as a WSGI callable
+    (WSGI application object), in which case it dispatches to all
+    mounted apps.
     """
 
     apps = {}
@@ -196,10 +168,9 @@ class Tree(object):
     WSGI callable if you happen to be using a WSGI server)."""
 
     def __init__(self):
-        """Initialize registry Tree."""
         self.apps = {}
 
-    def mount(self, root, script_name='', config=None):
+    def mount(self, root, script_name="", config=None):
         """Mount a new app from a root object, script_name, and config.
 
         root
@@ -224,36 +195,29 @@ class Tree(object):
         if script_name is None:
             raise TypeError(
                 "The 'script_name' argument may not be None. Application "
-                'objects may, however, possess a script_name of None (in '
-                'order to inpect the WSGI environ for SCRIPT_NAME upon each '
-                'request). You cannot mount such Applications on this Tree; '
-                'you must pass them to a WSGI server interface directly.')
+                "objects may, however, possess a script_name of None (in "
+                "order to inpect the WSGI environ for SCRIPT_NAME upon each "
+                "request). You cannot mount such Applications on this Tree; "
+                "you must pass them to a WSGI server interface directly.")
 
         # Next line both 1) strips trailing slash and 2) maps "/" -> "".
-        script_name = script_name.rstrip('/')
+        script_name = script_name.rstrip("/")
 
         if isinstance(root, Application):
             app = root
-            if script_name != '' and script_name != app.script_name:
+            if script_name != "" and script_name != app.script_name:
                 raise ValueError(
-                    'Cannot specify a different script name and pass an '
-                    'Application instance to cherrypy.mount')
+                    "Cannot specify a different script name and pass an "
+                    "Application instance to cherrypy.mount")
             script_name = app.script_name
         else:
             app = Application(root, script_name)
 
             # If mounted at "", add favicon.ico
-            needs_favicon = (
-                script_name == ''
-                and root is not None
-                and not hasattr(root, 'favicon_ico')
-            )
-            if needs_favicon:
-                favicon = os.path.join(
-                    os.getcwd(),
-                    os.path.dirname(__file__),
-                    'favicon.ico',
-                )
+            if (script_name == "" and root is not None
+                    and not hasattr(root, "favicon_ico")):
+                favicon = os.path.join(os.getcwd(), os.path.dirname(__file__),
+                                       "favicon.ico")
                 root.favicon_ico = tools.staticfile.handler(favicon)
 
         if config:
@@ -263,14 +227,14 @@ class Tree(object):
 
         return app
 
-    def graft(self, wsgi_callable, script_name=''):
+    def graft(self, wsgi_callable, script_name=""):
         """Mount a wsgi callable at the given script_name."""
         # Next line both 1) strips trailing slash and 2) maps "/" -> "".
-        script_name = script_name.rstrip('/')
+        script_name = script_name.rstrip("/")
         self.apps[script_name] = wsgi_callable
 
     def script_name(self, path=None):
-        """Return the script_name of the app at the given path, or None.
+        """The script_name of the app at the given path, or None.
 
         If path is None, cherrypy.request is used.
         """
@@ -286,21 +250,22 @@ class Tree(object):
             if path in self.apps:
                 return path
 
-            if path == '':
+            if path == "":
                 return None
 
             # Move one node up the tree and try again.
-            path = path[:path.rfind('/')]
+            path = path[:path.rfind("/")]
 
     def __call__(self, environ, start_response):
-        """Pre-initialize WSGI env and call WSGI-callable."""
         # If you're calling this, then you're probably setting SCRIPT_NAME
         # to '' (some WSGI servers always set SCRIPT_NAME to '').
         # Try to look up the app using the full path.
         env1x = environ
+        if environ.get(ntou('wsgi.version')) == (ntou('u'), 0):
+            env1x = _cpwsgi.downgrade_wsgi_ux_to_1x(environ)
         path = httputil.urljoin(env1x.get('SCRIPT_NAME', ''),
                                 env1x.get('PATH_INFO', ''))
-        sn = self.script_name(path or '/')
+        sn = self.script_name(path or "/")
         if sn is None:
             start_response('404 Not Found', [])
             return []
@@ -309,6 +274,26 @@ class Tree(object):
 
         # Correct the SCRIPT_NAME and PATH_INFO environ entries.
         environ = environ.copy()
-        environ['SCRIPT_NAME'] = sn
-        environ['PATH_INFO'] = path[len(sn.rstrip('/')):]
+        if not py3k:
+            if environ.get(ntou('wsgi.version')) == (ntou('u'), 0):
+                # Python 2/WSGI u.0: all strings MUST be of type unicode
+                enc = environ[ntou('wsgi.url_encoding')]
+                environ[ntou('SCRIPT_NAME')] = sn.decode(enc)
+                environ[ntou('PATH_INFO')] = path[
+                    len(sn.rstrip("/")):].decode(enc)
+            else:
+                # Python 2/WSGI 1.x: all strings MUST be of type str
+                environ['SCRIPT_NAME'] = sn
+                environ['PATH_INFO'] = path[len(sn.rstrip("/")):]
+        else:
+            if environ.get(ntou('wsgi.version')) == (ntou('u'), 0):
+                # Python 3/WSGI u.0: all strings MUST be full unicode
+                environ['SCRIPT_NAME'] = sn
+                environ['PATH_INFO'] = path[len(sn.rstrip("/")):]
+            else:
+                # Python 3/WSGI 1.x: all strings MUST be ISO-8859-1 str
+                environ['SCRIPT_NAME'] = sn.encode(
+                    'utf-8').decode('ISO-8859-1')
+                environ['PATH_INFO'] = path[
+                    len(sn.rstrip("/")):].encode('utf-8').decode('ISO-8859-1')
         return app(environ, start_response)
diff --git a/lib/cherrypy/_cpwsgi.py b/lib/cherrypy/_cpwsgi.py
index b2a6da52..f6db68b0 100644
--- a/lib/cherrypy/_cpwsgi.py
+++ b/lib/cherrypy/_cpwsgi.py
@@ -1,32 +1,30 @@
 """WSGI interface (see PEP 333 and 3333).
 
 Note that WSGI environ keys and values are 'native strings'; that is,
-whatever the type of "" is. For Python 2, that's a byte string; for
-Python 3, it's a unicode string. But PEP 3333 says: "even if Python's
-str type is actually Unicode "under the hood", the content of native
-strings must still be translatable to bytes via the Latin-1 encoding!"
+whatever the type of "" is. For Python 2, that's a byte string; for Python 3,
+it's a unicode string. But PEP 3333 says: "even if Python's str type is
+actually Unicode "under the hood", the content of native strings must
+still be translatable to bytes via the Latin-1 encoding!"
 """
 
 import sys as _sys
-import io
 
 import cherrypy as _cherrypy
-from cherrypy._cpcompat import ntou
+from cherrypy._cpcompat import BytesIO, bytestr, ntob, ntou, py3k, unicodestr
 from cherrypy import _cperror
 from cherrypy.lib import httputil
 from cherrypy.lib import is_closable_iterator
 
-
 def downgrade_wsgi_ux_to_1x(environ):
     """Return a new environ dict for WSGI 1.x from the given WSGI u.x environ.
     """
     env1x = {}
 
     url_encoding = environ[ntou('wsgi.url_encoding')]
-    for k, v in environ.copy().items():
+    for k, v in list(environ.items()):
         if k in [ntou('PATH_INFO'), ntou('SCRIPT_NAME'), ntou('QUERY_STRING')]:
             v = v.encode(url_encoding)
-        elif isinstance(v, str):
+        elif isinstance(v, unicodestr):
             v = v.encode('ISO-8859-1')
         env1x[k.encode('ISO-8859-1')] = v
 
@@ -34,6 +32,7 @@ def downgrade_wsgi_ux_to_1x(environ):
 
 
 class VirtualHost(object):
+
     """Select a different WSGI application based on the Host header.
 
     This can be useful when running multiple sites within one CP server.
@@ -44,21 +43,15 @@ class VirtualHost(object):
         Domain2App = cherrypy.Application(root)
         SecureApp = cherrypy.Application(Secure())
 
-        vhost = cherrypy._cpwsgi.VirtualHost(
-            RootApp,
-            domains={
-                'www.domain2.example': Domain2App,
-                'www.domain2.example:443': SecureApp,
-            },
-        )
+        vhost = cherrypy._cpwsgi.VirtualHost(RootApp,
+            domains={'www.domain2.example': Domain2App,
+                     'www.domain2.example:443': SecureApp,
+                     })
 
         cherrypy.tree.graft(vhost)
     """
     default = None
-    """Required.
-
-    The default WSGI application.
-    """
+    """Required. The default WSGI application."""
 
     use_x_forwarded_host = True
     """If True (the default), any "X-Forwarded-Host"
@@ -67,12 +60,11 @@ class VirtualHost(object):
 
     domains = {}
     """A dict of {host header value: application} pairs.
-
-    The incoming "Host" request header is looked up in this dict, and,
-    if a match is found, the corresponding WSGI application will be
-    called instead of the default. Note that you often need separate
-    entries for "example.com" and "www.example.com". In addition, "Host"
-    headers may contain the port number.
+    The incoming "Host" request header is looked up in this dict,
+    and, if a match is found, the corresponding WSGI application
+    will be called instead of the default. Note that you often need
+    separate entries for "example.com" and "www.example.com".
+    In addition, "Host" headers may contain the port number.
     """
 
     def __init__(self, default, domains=None, use_x_forwarded_host=True):
@@ -83,7 +75,7 @@ class VirtualHost(object):
     def __call__(self, environ, start_response):
         domain = environ.get('HTTP_HOST', '')
         if self.use_x_forwarded_host:
-            domain = environ.get('HTTP_X_FORWARDED_HOST', domain)
+            domain = environ.get("HTTP_X_FORWARDED_HOST", domain)
 
         nextapp = self.domains.get(domain)
         if nextapp is None:
@@ -92,6 +84,7 @@ class VirtualHost(object):
 
 
 class InternalRedirector(object):
+
     """WSGI middleware that handles raised cherrypy.InternalRedirect."""
 
     def __init__(self, nextapp, recursive=False):
@@ -113,7 +106,7 @@ class InternalRedirector(object):
                 # Add the *previous* path_info + qs to redirections.
                 old_uri = sn + path
                 if qs:
-                    old_uri += '?' + qs
+                    old_uri += "?" + qs
                 redirections.append(old_uri)
 
                 if not self.recursive:
@@ -121,24 +114,23 @@ class InternalRedirector(object):
                     # already
                     new_uri = sn + ir.path
                     if ir.query_string:
-                        new_uri += '?' + ir.query_string
+                        new_uri += "?" + ir.query_string
                     if new_uri in redirections:
                         ir.request.close()
-                        tmpl = (
-                            'InternalRedirector visited the same URL twice: %r'
-                        )
-                        raise RuntimeError(tmpl % new_uri)
+                        raise RuntimeError("InternalRedirector visited the "
+                                           "same URL twice: %r" % new_uri)
 
                 # Munge the environment and try again.
-                environ['REQUEST_METHOD'] = 'GET'
+                environ['REQUEST_METHOD'] = "GET"
                 environ['PATH_INFO'] = ir.path
                 environ['QUERY_STRING'] = ir.query_string
-                environ['wsgi.input'] = io.BytesIO()
-                environ['CONTENT_LENGTH'] = '0'
+                environ['wsgi.input'] = BytesIO()
+                environ['CONTENT_LENGTH'] = "0"
                 environ['cherrypy.previous_request'] = ir.request
 
 
 class ExceptionTrapper(object):
+
     """WSGI middleware that traps exceptions."""
 
     def __init__(self, nextapp, throws=(KeyboardInterrupt, SystemExit)):
@@ -165,16 +157,19 @@ class _TrappedResponse(object):
         self.throws = throws
         self.started_response = False
         self.response = self.trap(
-            self.nextapp, self.environ, self.start_response,
-        )
+            self.nextapp, self.environ, self.start_response)
         self.iter_response = iter(self.response)
 
     def __iter__(self):
         self.started_response = True
         return self
 
-    def __next__(self):
-        return self.trap(next, self.iter_response)
+    if py3k:
+        def __next__(self):
+            return self.trap(next, self.iter_response)
+    else:
+        def next(self):
+            return self.trap(self.iter_response.next)
 
     def close(self):
         if hasattr(self.response, 'close'):
@@ -187,19 +182,18 @@ class _TrappedResponse(object):
             raise
         except StopIteration:
             raise
-        except Exception:
+        except:
             tb = _cperror.format_exc()
+            #print('trapped (started %s):' % self.started_response, tb)
             _cherrypy.log(tb, severity=40)
             if not _cherrypy.request.show_tracebacks:
-                tb = ''
+                tb = ""
             s, h, b = _cperror.bare_error(tb)
-            if True:
+            if py3k:
                 # What fun.
                 s = s.decode('ISO-8859-1')
-                h = [
-                    (k.decode('ISO-8859-1'), v.decode('ISO-8859-1'))
-                    for k, v in h
-                ]
+                h = [(k.decode('ISO-8859-1'), v.decode('ISO-8859-1'))
+                     for k, v in h]
             if self.started_response:
                 # Empty our iterable (so future calls raise StopIteration)
                 self.iter_response = iter([])
@@ -208,7 +202,7 @@ class _TrappedResponse(object):
 
             try:
                 self.start_response(s, h, _sys.exc_info())
-            except Exception:
+            except:
                 # "The application must not trap any exceptions raised by
                 # start_response, if it called start_response with exc_info.
                 # Instead, it should allow such exceptions to propagate
@@ -218,7 +212,7 @@ class _TrappedResponse(object):
                 raise
 
             if self.started_response:
-                return b''.join(b)
+                return ntob("").join(b)
             else:
                 return b
 
@@ -227,60 +221,63 @@ class _TrappedResponse(object):
 
 
 class AppResponse(object):
+
     """WSGI response iterable for CherryPy applications."""
 
     def __init__(self, environ, start_response, cpapp):
         self.cpapp = cpapp
         try:
+            if not py3k:
+                if environ.get(ntou('wsgi.version')) == (ntou('u'), 0):
+                    environ = downgrade_wsgi_ux_to_1x(environ)
             self.environ = environ
             self.run()
 
             r = _cherrypy.serving.response
 
             outstatus = r.output_status
-            if not isinstance(outstatus, bytes):
-                raise TypeError('response.output_status is not a byte string.')
+            if not isinstance(outstatus, bytestr):
+                raise TypeError("response.output_status is not a byte string.")
 
             outheaders = []
             for k, v in r.header_list:
-                if not isinstance(k, bytes):
-                    tmpl = 'response.header_list key %r is not a byte string.'
-                    raise TypeError(tmpl % k)
-                if not isinstance(v, bytes):
-                    tmpl = (
-                        'response.header_list value %r is not a byte string.'
-                    )
-                    raise TypeError(tmpl % v)
+                if not isinstance(k, bytestr):
+                    raise TypeError(
+                        "response.header_list key %r is not a byte string." %
+                        k)
+                if not isinstance(v, bytestr):
+                    raise TypeError(
+                        "response.header_list value %r is not a byte string." %
+                        v)
                 outheaders.append((k, v))
 
-            if True:
+            if py3k:
                 # According to PEP 3333, when using Python 3, the response
                 # status and headers must be bytes masquerading as unicode;
                 # that is, they must be of type "str" but are restricted to
                 # code points in the "latin-1" set.
                 outstatus = outstatus.decode('ISO-8859-1')
-                outheaders = [
-                    (k.decode('ISO-8859-1'), v.decode('ISO-8859-1'))
-                    for k, v in outheaders
-                ]
+                outheaders = [(k.decode('ISO-8859-1'), v.decode('ISO-8859-1'))
+                              for k, v in outheaders]
 
             self.iter_response = iter(r.body)
             self.write = start_response(outstatus, outheaders)
-        except BaseException:
+        except:
             self.close()
             raise
 
     def __iter__(self):
         return self
 
-    def __next__(self):
-        return next(self.iter_response)
+    if py3k:
+        def __next__(self):
+            return next(self.iter_response)
+    else:
+        def next(self):
+            return self.iter_response.next()
 
     def close(self):
-        """Close and de-reference the current request and response.
-
-        (Core)
-        """
+        """Close and de-reference the current request and response. (Core)"""
         streaming = _cherrypy.serving.response.stream
         self.cpapp.release_serving()
 
@@ -299,18 +296,13 @@ class AppResponse(object):
         """Create a Request object using environ."""
         env = self.environ.get
 
-        local = httputil.Host(
-            '',
-            int(env('SERVER_PORT', 80) or -1),
-            env('SERVER_NAME', ''),
-        )
-        remote = httputil.Host(
-            env('REMOTE_ADDR', ''),
-            int(env('REMOTE_PORT', -1) or -1),
-            env('REMOTE_HOST', ''),
-        )
+        local = httputil.Host('', int(env('SERVER_PORT', 80)),
+                              env('SERVER_NAME', ''))
+        remote = httputil.Host(env('REMOTE_ADDR', ''),
+                               int(env('REMOTE_PORT', -1) or -1),
+                               env('REMOTE_HOST', ''))
         scheme = env('wsgi.url_scheme')
-        sproto = env('ACTUAL_SERVER_PROTOCOL', 'HTTP/1.1')
+        sproto = env('ACTUAL_SERVER_PROTOCOL', "HTTP/1.1")
         request, resp = self.cpapp.get_serving(local, remote, scheme, sproto)
 
         # LOGON_USER is served by IIS, and is the name of the
@@ -324,51 +316,44 @@ class AppResponse(object):
 
         meth = self.environ['REQUEST_METHOD']
 
-        path = httputil.urljoin(
-            self.environ.get('SCRIPT_NAME', ''),
-            self.environ.get('PATH_INFO', ''),
-        )
+        path = httputil.urljoin(self.environ.get('SCRIPT_NAME', ''),
+                                self.environ.get('PATH_INFO', ''))
         qs = self.environ.get('QUERY_STRING', '')
 
-        path, qs = self.recode_path_qs(path, qs) or (path, qs)
+        if py3k:
+            # This isn't perfect; if the given PATH_INFO is in the
+            # wrong encoding, it may fail to match the appropriate config
+            # section URI. But meh.
+            old_enc = self.environ.get('wsgi.url_encoding', 'ISO-8859-1')
+            new_enc = self.cpapp.find_config(self.environ.get('PATH_INFO', ''),
+                                             "request.uri_encoding", 'utf-8')
+            if new_enc.lower() != old_enc.lower():
+                # Even though the path and qs are unicode, the WSGI server
+                # is required by PEP 3333 to coerce them to ISO-8859-1
+                # masquerading as unicode. So we have to encode back to
+                # bytes and then decode again using the "correct" encoding.
+                try:
+                    u_path = path.encode(old_enc).decode(new_enc)
+                    u_qs = qs.encode(old_enc).decode(new_enc)
+                except (UnicodeEncodeError, UnicodeDecodeError):
+                    # Just pass them through without transcoding and hope.
+                    pass
+                else:
+                    # Only set transcoded values if they both succeed.
+                    path = u_path
+                    qs = u_qs
 
         rproto = self.environ.get('SERVER_PROTOCOL')
         headers = self.translate_headers(self.environ)
         rfile = self.environ['wsgi.input']
         request.run(meth, path, qs, rproto, headers, rfile)
 
-    headerNames = {
-        'HTTP_CGI_AUTHORIZATION': 'Authorization',
-        'CONTENT_LENGTH': 'Content-Length',
-        'CONTENT_TYPE': 'Content-Type',
-        'REMOTE_HOST': 'Remote-Host',
-        'REMOTE_ADDR': 'Remote-Addr',
-    }
-
-    def recode_path_qs(self, path, qs):
-        # This isn't perfect; if the given PATH_INFO is in the
-        # wrong encoding, it may fail to match the appropriate config
-        # section URI. But meh.
-        old_enc = self.environ.get('wsgi.url_encoding', 'ISO-8859-1')
-        new_enc = self.cpapp.find_config(
-            self.environ.get('PATH_INFO', ''),
-            'request.uri_encoding', 'utf-8',
-        )
-        if new_enc.lower() == old_enc.lower():
-            return
-
-        # Even though the path and qs are unicode, the WSGI server
-        # is required by PEP 3333 to coerce them to ISO-8859-1
-        # masquerading as unicode. So we have to encode back to
-        # bytes and then decode again using the "correct" encoding.
-        try:
-            return (
-                path.encode(old_enc).decode(new_enc),
-                qs.encode(old_enc).decode(new_enc),
-            )
-        except (UnicodeEncodeError, UnicodeDecodeError):
-            # Just pass them through without transcoding and hope.
-            pass
+    headerNames = {'HTTP_CGI_AUTHORIZATION': 'Authorization',
+                   'CONTENT_LENGTH': 'Content-Length',
+                   'CONTENT_TYPE': 'Content-Type',
+                   'REMOTE_HOST': 'Remote-Host',
+                   'REMOTE_ADDR': 'Remote-Addr',
+                   }
 
     def translate_headers(self, environ):
         """Translate CGI-environ header names to HTTP header names."""
@@ -376,27 +361,24 @@ class AppResponse(object):
             # We assume all incoming header keys are uppercase already.
             if cgiName in self.headerNames:
                 yield self.headerNames[cgiName], environ[cgiName]
-            elif cgiName[:5] == 'HTTP_':
+            elif cgiName[:5] == "HTTP_":
                 # Hackish attempt at recovering original header names.
-                translatedHeader = cgiName[5:].replace('_', '-')
+                translatedHeader = cgiName[5:].replace("_", "-")
                 yield translatedHeader, environ[cgiName]
 
 
 class CPWSGIApp(object):
+
     """A WSGI application object for a CherryPy Application."""
 
-    pipeline = [
-        ('ExceptionTrapper', ExceptionTrapper),
-        ('InternalRedirector', InternalRedirector),
-    ]
-    """A list of (name, wsgiapp) pairs.
-
-    Each 'wsgiapp' MUST be a constructor that takes an initial,
-    positional 'nextapp' argument, plus optional keyword arguments, and
-    returns a WSGI application (that takes environ and start_response
-    arguments). The 'name' can be any you choose, and will correspond to
-    keys in self.config.
-    """
+    pipeline = [('ExceptionTrapper', ExceptionTrapper),
+                ('InternalRedirector', InternalRedirector),
+                ]
+    """A list of (name, wsgiapp) pairs. Each 'wsgiapp' MUST be a
+    constructor that takes an initial, positional 'nextapp' argument,
+    plus optional keyword arguments, and returns a WSGI application
+    (that takes environ and start_response arguments). The 'name' can
+    be any you choose, and will correspond to keys in self.config."""
 
     head = None
     """Rather than nest all apps in the pipeline on each call, it's only
@@ -404,12 +386,9 @@ class CPWSGIApp(object):
     this to None again if you change self.pipeline after calling self."""
 
     config = {}
-    """A dict whose keys match names listed in the pipeline.
-
-    Each value is a further dict which will be passed to the
-    corresponding named WSGI callable (from the pipeline) as keyword
-    arguments.
-    """
+    """A dict whose keys match names listed in the pipeline. Each
+    value is a further dict which will be passed to the corresponding
+    named WSGI callable (from the pipeline) as keyword arguments."""
 
     response_class = AppResponse
     """The class to instantiate and return as the next app in the WSGI chain.
@@ -425,8 +404,8 @@ class CPWSGIApp(object):
     def tail(self, environ, start_response):
         """WSGI application callable for the actual CherryPy application.
 
-        You probably shouldn't call this; call self.__call__ instead, so
-        that any WSGI middleware in self.pipeline can run first.
+        You probably shouldn't call this; call self.__call__ instead,
+        so that any WSGI middleware in self.pipeline can run first.
         """
         return self.response_class(environ, start_response, self.cpapp)
 
@@ -444,16 +423,16 @@ class CPWSGIApp(object):
 
     def namespace_handler(self, k, v):
         """Config handler for the 'wsgi' namespace."""
-        if k == 'pipeline':
+        if k == "pipeline":
             # Note this allows multiple 'wsgi.pipeline' config entries
             # (but each entry will be processed in a 'random' order).
             # It should also allow developers to set default middleware
             # in code (passed to self.__init__) that deployers can add to
             # (but not remove) via config.
             self.pipeline.extend(v)
-        elif k == 'response_class':
+        elif k == "response_class":
             self.response_class = v
         else:
-            name, arg = k.split('.', 1)
+            name, arg = k.split(".", 1)
             bucket = self.config.setdefault(name, {})
             bucket[arg] = v
diff --git a/lib/cherrypy/_cpwsgi_server.py b/lib/cherrypy/_cpwsgi_server.py
index b8e96deb..874e2e9f 100644
--- a/lib/cherrypy/_cpwsgi_server.py
+++ b/lib/cherrypy/_cpwsgi_server.py
@@ -1,56 +1,23 @@
-"""WSGI server interface (see PEP 333).
-
-This adds some CP-specific bits to the framework-agnostic cheroot
-package.
+"""WSGI server interface (see PEP 333). This adds some CP-specific bits to
+the framework-agnostic wsgiserver package.
 """
 import sys
 
-import cheroot.wsgi
-import cheroot.server
-
 import cherrypy
+from cherrypy import wsgiserver
 
 
-class CPWSGIHTTPRequest(cheroot.server.HTTPRequest):
-    """Wrapper for cheroot.server.HTTPRequest.
+class CPWSGIServer(wsgiserver.CherryPyWSGIServer):
 
-    This is a layer, which preserves URI parsing mode like it which was
-    before Cheroot v5.8.0.
+    """Wrapper for wsgiserver.CherryPyWSGIServer.
+
+    wsgiserver has been designed to not reference CherryPy in any way,
+    so that it can be used in other frameworks and applications. Therefore,
+    we wrap it here, so we can set our own mount points from cherrypy.tree
+    and apply some attributes from config -> cherrypy.server -> wsgiserver.
     """
 
-    def __init__(self, server, conn):
-        """Initialize HTTP request container instance.
-
-        Args:
-            server (cheroot.server.HTTPServer):
-                web server object receiving this request
-            conn (cheroot.server.HTTPConnection):
-                HTTP connection object for this request
-        """
-        super(CPWSGIHTTPRequest, self).__init__(
-            server, conn, proxy_mode=True
-        )
-
-
-class CPWSGIServer(cheroot.wsgi.Server):
-    """Wrapper for cheroot.wsgi.Server.
-
-    cheroot has been designed to not reference CherryPy in any way, so
-    that it can be used in other frameworks and applications. Therefore,
-    we wrap it here, so we can set our own mount points from
-    cherrypy.tree and apply some attributes from config ->
-    cherrypy.server -> wsgi.Server.
-    """
-
-    fmt = 'CherryPy/{cherrypy.__version__} {cheroot.wsgi.Server.version}'
-    version = fmt.format(**globals())
-
     def __init__(self, server_adapter=cherrypy.server):
-        """Initialize CPWSGIServer instance.
-
-        Args:
-            server_adapter (cherrypy._cpserver.Server): ...
-        """
         self.server_adapter = server_adapter
         self.max_request_header_size = (
             self.server_adapter.max_request_header_size or 0
@@ -64,22 +31,17 @@ class CPWSGIServer(cheroot.wsgi.Server):
                        None)
 
         self.wsgi_version = self.server_adapter.wsgi_version
-
-        super(CPWSGIServer, self).__init__(
-            server_adapter.bind_addr, cherrypy.tree,
-            self.server_adapter.thread_pool,
-            server_name,
-            max=self.server_adapter.thread_pool_max,
-            request_queue_size=self.server_adapter.socket_queue_size,
-            timeout=self.server_adapter.socket_timeout,
-            shutdown_timeout=self.server_adapter.shutdown_timeout,
-            accepted_queue_size=self.server_adapter.accepted_queue_size,
-            accepted_queue_timeout=self.server_adapter.accepted_queue_timeout,
-            peercreds_enabled=self.server_adapter.peercreds,
-            peercreds_resolve_enabled=self.server_adapter.peercreds_resolve,
-        )
-        self.ConnectionClass.RequestHandlerClass = CPWSGIHTTPRequest
-
+        s = wsgiserver.CherryPyWSGIServer
+        s.__init__(self, server_adapter.bind_addr, cherrypy.tree,
+                   self.server_adapter.thread_pool,
+                   server_name,
+                   max=self.server_adapter.thread_pool_max,
+                   request_queue_size=self.server_adapter.socket_queue_size,
+                   timeout=self.server_adapter.socket_timeout,
+                   shutdown_timeout=self.server_adapter.shutdown_timeout,
+                   accepted_queue_size=self.server_adapter.accepted_queue_size,
+                   accepted_queue_timeout=self.server_adapter.accepted_queue_timeout,
+                   )
         self.protocol = self.server_adapter.protocol_version
         self.nodelay = self.server_adapter.nodelay
 
@@ -88,24 +50,21 @@ class CPWSGIServer(cheroot.wsgi.Server):
         else:
             ssl_module = self.server_adapter.ssl_module or 'pyopenssl'
         if self.server_adapter.ssl_context:
-            adapter_class = cheroot.server.get_ssl_adapter_class(ssl_module)
+            adapter_class = wsgiserver.get_ssl_adapter_class(ssl_module)
             self.ssl_adapter = adapter_class(
                 self.server_adapter.ssl_certificate,
                 self.server_adapter.ssl_private_key,
-                self.server_adapter.ssl_certificate_chain,
-                self.server_adapter.ssl_ciphers)
+                self.server_adapter.ssl_certificate_chain)
             self.ssl_adapter.context = self.server_adapter.ssl_context
         elif self.server_adapter.ssl_certificate:
-            adapter_class = cheroot.server.get_ssl_adapter_class(ssl_module)
+            adapter_class = wsgiserver.get_ssl_adapter_class(ssl_module)
             self.ssl_adapter = adapter_class(
                 self.server_adapter.ssl_certificate,
                 self.server_adapter.ssl_private_key,
-                self.server_adapter.ssl_certificate_chain,
-                self.server_adapter.ssl_ciphers)
+                self.server_adapter.ssl_certificate_chain)
 
         self.stats['Enabled'] = getattr(
             self.server_adapter, 'statistics', False)
 
-    def error_log(self, msg='', level=20, traceback=False):
-        """Write given message to the error log."""
+    def error_log(self, msg="", level=20, traceback=False):
         cherrypy.engine.log(msg, level, traceback)
diff --git a/lib/cherrypy/_helper.py b/lib/cherrypy/_helper.py
deleted file mode 100644
index 497438eb..00000000
--- a/lib/cherrypy/_helper.py
+++ /dev/null
@@ -1,348 +0,0 @@
-"""Helper functions for CP apps."""
-
-import urllib.parse
-
-from cherrypy._cpcompat import text_or_bytes
-
-import cherrypy
-
-
-def expose(func=None, alias=None):
-    """Expose the function or class.
-
-    Optionally provide an alias or set of aliases.
-    """
-    def expose_(func):
-        func.exposed = True
-        if alias is not None:
-            if isinstance(alias, text_or_bytes):
-                parents[alias.replace('.', '_')] = func
-            else:
-                for a in alias:
-                    parents[a.replace('.', '_')] = func
-        return func
-
-    import sys
-    import types
-    decoratable_types = types.FunctionType, types.MethodType, type,
-    if isinstance(func, decoratable_types):
-        if alias is None:
-            # @expose
-            func.exposed = True
-            return func
-        else:
-            # func = expose(func, alias)
-            parents = sys._getframe(1).f_locals
-            return expose_(func)
-    elif func is None:
-        if alias is None:
-            # @expose()
-            parents = sys._getframe(1).f_locals
-            return expose_
-        else:
-            # @expose(alias="alias") or
-            # @expose(alias=["alias1", "alias2"])
-            parents = sys._getframe(1).f_locals
-            return expose_
-    else:
-        # @expose("alias") or
-        # @expose(["alias1", "alias2"])
-        parents = sys._getframe(1).f_locals
-        alias = func
-        return expose_
-
-
-def popargs(*args, **kwargs):
-    """Decorate _cp_dispatch.
-
-    (cherrypy.dispatch.Dispatcher.dispatch_method_name)
-
-    Optional keyword argument: handler=(Object or Function)
-
-    Provides a _cp_dispatch function that pops off path segments into
-    cherrypy.request.params under the names specified.  The dispatch
-    is then forwarded on to the next vpath element.
-
-    Note that any existing (and exposed) member function of the class that
-    popargs is applied to will override that value of the argument.  For
-    instance, if you have a method named "list" on the class decorated with
-    popargs, then accessing "/list" will call that function instead of popping
-    it off as the requested parameter.  This restriction applies to all
-    _cp_dispatch functions.  The only way around this restriction is to create
-    a "blank class" whose only function is to provide _cp_dispatch.
-
-    If there are path elements after the arguments, or more arguments
-    are requested than are available in the vpath, then the 'handler'
-    keyword argument specifies the next object to handle the parameterized
-    request.  If handler is not specified or is None, then self is used.
-    If handler is a function rather than an instance, then that function
-    will be called with the args specified and the return value from that
-    function used as the next object INSTEAD of adding the parameters to
-    cherrypy.request.args.
-
-    This decorator may be used in one of two ways:
-
-    As a class decorator:
-
-    .. code-block:: python
-
-        @cherrypy.popargs('year', 'month', 'day')
-        class Blog:
-            def index(self, year=None, month=None, day=None):
-                #Process the parameters here; any url like
-                #/, /2009, /2009/12, or /2009/12/31
-                #will fill in the appropriate parameters.
-
-            def create(self):
-                #This link will still be available at /create.
-                #Defined functions take precedence over arguments.
-
-    Or as a member of a class:
-
-    .. code-block:: python
-
-        class Blog:
-            _cp_dispatch = cherrypy.popargs('year', 'month', 'day')
-            #...
-
-    The handler argument may be used to mix arguments with built in functions.
-    For instance, the following setup allows different activities at the
-    day, month, and year level:
-
-    .. code-block:: python
-
-        class DayHandler:
-            def index(self, year, month, day):
-                #Do something with this day; probably list entries
-
-            def delete(self, year, month, day):
-                #Delete all entries for this day
-
-        @cherrypy.popargs('day', handler=DayHandler())
-        class MonthHandler:
-            def index(self, year, month):
-                #Do something with this month; probably list entries
-
-            def delete(self, year, month):
-                #Delete all entries for this month
-
-        @cherrypy.popargs('month', handler=MonthHandler())
-        class YearHandler:
-            def index(self, year):
-                #Do something with this year
-
-            #...
-
-        @cherrypy.popargs('year', handler=YearHandler())
-        class Root:
-            def index(self):
-                #...
-    """
-    # Since keyword arg comes after *args, we have to process it ourselves
-    # for lower versions of python.
-
-    handler = None
-    handler_call = False
-    for k, v in kwargs.items():
-        if k == 'handler':
-            handler = v
-        else:
-            tm = "cherrypy.popargs() got an unexpected keyword argument '{0}'"
-            raise TypeError(tm.format(k))
-
-    import inspect
-
-    if handler is not None \
-            and (hasattr(handler, '__call__') or inspect.isclass(handler)):
-        handler_call = True
-
-    def decorated(cls_or_self=None, vpath=None):
-        if inspect.isclass(cls_or_self):
-            # cherrypy.popargs is a class decorator
-            cls = cls_or_self
-            name = cherrypy.dispatch.Dispatcher.dispatch_method_name
-            setattr(cls, name, decorated)
-            return cls
-
-        # We're in the actual function
-        self = cls_or_self
-        parms = {}
-        for arg in args:
-            if not vpath:
-                break
-            parms[arg] = vpath.pop(0)
-
-        if handler is not None:
-            if handler_call:
-                return handler(**parms)
-            else:
-                cherrypy.request.params.update(parms)
-                return handler
-
-        cherrypy.request.params.update(parms)
-
-        # If we are the ultimate handler, then to prevent our _cp_dispatch
-        # from being called again, we will resolve remaining elements through
-        # getattr() directly.
-        if vpath:
-            return getattr(self, vpath.pop(0), None)
-        else:
-            return self
-
-    return decorated
-
-
-def url(path='', qs='', script_name=None, base=None, relative=None):
-    """Create an absolute URL for the given path.
-
-    If 'path' starts with a slash ('/'), this will return
-        (base + script_name + path + qs).
-    If it does not start with a slash, this returns
-        (base + script_name [+ request.path_info] + path + qs).
-
-    If script_name is None, cherrypy.request will be used to find a
-    script_name, if available.
-
-    If base is None, cherrypy.request.base will be used (if available).
-    Note that you can use cherrypy.tools.proxy to change this.
-
-    Finally, note that this function can be used to obtain an absolute
-    URL for the current request path (minus the querystring) by passing
-    no args. If you call url(qs=cherrypy.request.query_string), you
-    should get the original browser URL (assuming no internal
-    redirections).
-
-    If relative is None or not provided, request.app.relative_urls will
-    be used (if available, else False). If False, the output will be an
-    absolute URL (including the scheme, host, vhost, and script_name).
-    If True, the output will instead be a URL that is relative to the
-    current request path, perhaps including '..' atoms. If relative is
-    the string 'server', the output will instead be a URL that is
-    relative to the server root; i.e., it will start with a slash.
-    """
-    if isinstance(qs, (tuple, list, dict)):
-        qs = urllib.parse.urlencode(qs)
-    if qs:
-        qs = '?' + qs
-
-    if cherrypy.request.app:
-        if not path.startswith('/'):
-            # Append/remove trailing slash from path_info as needed
-            # (this is to support mistyped URL's without redirecting;
-            # if you want to redirect, use tools.trailing_slash).
-            pi = cherrypy.request.path_info
-            if cherrypy.request.is_index is True:
-                if not pi.endswith('/'):
-                    pi = pi + '/'
-            elif cherrypy.request.is_index is False:
-                if pi.endswith('/') and pi != '/':
-                    pi = pi[:-1]
-
-            if path == '':
-                path = pi
-            else:
-                path = urllib.parse.urljoin(pi, path)
-
-        if script_name is None:
-            script_name = cherrypy.request.script_name
-        if base is None:
-            base = cherrypy.request.base
-
-        newurl = base + script_name + normalize_path(path) + qs
-    else:
-        # No request.app (we're being called outside a request).
-        # We'll have to guess the base from server.* attributes.
-        # This will produce very different results from the above
-        # if you're using vhosts or tools.proxy.
-        if base is None:
-            base = cherrypy.server.base()
-
-        path = (script_name or '') + path
-        newurl = base + normalize_path(path) + qs
-
-    # At this point, we should have a fully-qualified absolute URL.
-
-    if relative is None:
-        relative = getattr(cherrypy.request.app, 'relative_urls', False)
-
-    # See http://www.ietf.org/rfc/rfc2396.txt
-    if relative == 'server':
-        # "A relative reference beginning with a single slash character is
-        # termed an absolute-path reference, as defined by <abs_path>..."
-        # This is also sometimes called "server-relative".
-        newurl = '/' + '/'.join(newurl.split('/', 3)[3:])
-    elif relative:
-        # "A relative reference that does not begin with a scheme name
-        # or a slash character is termed a relative-path reference."
-        old = url(relative=False).split('/')[:-1]
-        new = newurl.split('/')
-        while old and new:
-            a, b = old[0], new[0]
-            if a != b:
-                break
-            old.pop(0)
-            new.pop(0)
-        new = (['..'] * len(old)) + new
-        newurl = '/'.join(new)
-
-    return newurl
-
-
-def normalize_path(path):
-    """Resolve given path from relative into absolute form."""
-    if './' not in path:
-        return path
-
-    # Normalize the URL by removing ./ and ../
-    atoms = []
-    for atom in path.split('/'):
-        if atom == '.':
-            pass
-        elif atom == '..':
-            # Don't pop from empty list
-            # (i.e. ignore redundant '..')
-            if atoms:
-                atoms.pop()
-        elif atom:
-            atoms.append(atom)
-
-    newpath = '/'.join(atoms)
-    # Preserve leading '/'
-    if path.startswith('/'):
-        newpath = '/' + newpath
-
-    return newpath
-
-
-####
-# Inlined from jaraco.classes 1.4.3
-# Ref #1673
-class _ClassPropertyDescriptor(object):
-    """Descript for read-only class-based property.
-
-    Turns a classmethod-decorated func into a read-only property of that
-    class type (means the value cannot be set).
-    """
-
-    def __init__(self, fget, fset=None):
-        """Initialize a class property descriptor.
-
-        Instantiated by ``_helper.classproperty``.
-        """
-        self.fget = fget
-        self.fset = fset
-
-    def __get__(self, obj, klass=None):
-        """Return property value."""
-        if klass is None:
-            klass = type(obj)
-        return self.fget.__get__(obj, klass)()
-
-
-def classproperty(func):  # noqa: D401; irrelevant for properties
-    """Decorator like classmethod to implement a static class property."""
-    if not isinstance(func, (classmethod, staticmethod)):
-        func = classmethod(func)
-
-    return _ClassPropertyDescriptor(func)
-####
diff --git a/lib/cherrypy/_json.py b/lib/cherrypy/_json.py
deleted file mode 100644
index 4ef85580..00000000
--- a/lib/cherrypy/_json.py
+++ /dev/null
@@ -1,24 +0,0 @@
-"""JSON support.
-
-Expose preferred json module as json and provide encode/decode
-convenience functions.
-"""
-
-try:
-    # Prefer simplejson
-    import simplejson as json
-except ImportError:
-    import json
-
-
-__all__ = ['json', 'encode', 'decode']
-
-
-decode = json.JSONDecoder().decode
-_encode = json.JSONEncoder().iterencode
-
-
-def encode(value):
-    """Encode to bytes."""
-    for chunk in _encode(value):
-        yield chunk.encode('utf-8')
diff --git a/lib/cherrypy/daemon.py b/lib/cherrypy/daemon.py
index 74488c06..d71e6329 100644
--- a/lib/cherrypy/daemon.py
+++ b/lib/cherrypy/daemon.py
@@ -13,7 +13,7 @@ def start(configfiles=None, daemonize=False, environment=None,
     """Subscribe all engine plugins and start the engine."""
     sys.path = [''] + sys.path
     for i in imports or []:
-        exec('import %s' % i)
+        exec("import %s" % i)
 
     for c in configfiles or []:
         cherrypy.config.update(c)
@@ -37,35 +37,38 @@ def start(configfiles=None, daemonize=False, environment=None,
     if pidfile:
         plugins.PIDFile(engine, pidfile).subscribe()
 
-    if hasattr(engine, 'signal_handler'):
+    if hasattr(engine, "signal_handler"):
         engine.signal_handler.subscribe()
-    if hasattr(engine, 'console_control_handler'):
+    if hasattr(engine, "console_control_handler"):
         engine.console_control_handler.subscribe()
 
     if (fastcgi and (scgi or cgi)) or (scgi and cgi):
-        cherrypy.log.error('You may only specify one of the cgi, fastcgi, and '
-                           'scgi options.', 'ENGINE')
+        cherrypy.log.error("You may only specify one of the cgi, fastcgi, and "
+                           "scgi options.", 'ENGINE')
         sys.exit(1)
     elif fastcgi or scgi or cgi:
         # Turn off autoreload when using *cgi.
-        cherrypy.config.update({'engine.autoreload.on': False})
+        cherrypy.config.update({'engine.autoreload_on': False})
         # Turn off the default HTTP server (which is subscribed by default).
         cherrypy.server.unsubscribe()
 
         addr = cherrypy.server.bind_addr
-        cls = (
-            servers.FlupFCGIServer if fastcgi else
-            servers.FlupSCGIServer if scgi else
-            servers.FlupCGIServer
-        )
-        f = cls(application=cherrypy.tree, bindAddress=addr)
+        if fastcgi:
+            f = servers.FlupFCGIServer(application=cherrypy.tree,
+                                       bindAddress=addr)
+        elif scgi:
+            f = servers.FlupSCGIServer(application=cherrypy.tree,
+                                       bindAddress=addr)
+        else:
+            f = servers.FlupCGIServer(application=cherrypy.tree,
+                                      bindAddress=addr)
         s = servers.ServerAdapter(engine, httpserver=f, bind_addr=addr)
         s.subscribe()
 
     # Always start the engine; this will start all other services
     try:
         engine.start()
-    except Exception:
+    except:
         # Assume the error has been logged already via bus.log.
         sys.exit(1)
     else:
@@ -73,29 +76,28 @@ def start(configfiles=None, daemonize=False, environment=None,
 
 
 def run():
-    """Run cherryd CLI."""
     from optparse import OptionParser
 
     p = OptionParser()
-    p.add_option('-c', '--config', action='append', dest='config',
-                 help='specify config file(s)')
-    p.add_option('-d', action='store_true', dest='daemonize',
-                 help='run the server as a daemon')
+    p.add_option('-c', '--config', action="append", dest='config',
+                 help="specify config file(s)")
+    p.add_option('-d', action="store_true", dest='daemonize',
+                 help="run the server as a daemon")
     p.add_option('-e', '--environment', dest='environment', default=None,
-                 help='apply the given config environment')
-    p.add_option('-f', action='store_true', dest='fastcgi',
-                 help='start a fastcgi server instead of the default HTTP '
-                      'server')
-    p.add_option('-s', action='store_true', dest='scgi',
-                 help='start a scgi server instead of the default HTTP server')
-    p.add_option('-x', action='store_true', dest='cgi',
-                 help='start a cgi server instead of the default HTTP server')
-    p.add_option('-i', '--import', action='append', dest='imports',
-                 help='specify modules to import')
+                 help="apply the given config environment")
+    p.add_option('-f', action="store_true", dest='fastcgi',
+                 help="start a fastcgi server instead of the default HTTP "
+                      "server")
+    p.add_option('-s', action="store_true", dest='scgi',
+                 help="start a scgi server instead of the default HTTP server")
+    p.add_option('-x', action="store_true", dest='cgi',
+                 help="start a cgi server instead of the default HTTP server")
+    p.add_option('-i', '--import', action="append", dest='imports',
+                 help="specify modules to import")
     p.add_option('-p', '--pidfile', dest='pidfile', default=None,
-                 help='store the process id in the given file')
-    p.add_option('-P', '--Path', action='append', dest='Path',
-                 help='add the given paths to sys.path')
+                 help="store the process id in the given file")
+    p.add_option('-P', '--Path', action="append", dest='Path',
+                 help="add the given paths to sys.path")
     options, args = p.parse_args()
 
     if options.Path:
diff --git a/lib/cherrypy/favicon.ico b/lib/cherrypy/favicon.ico
deleted file mode 100644
index f0d7e61b..00000000
Binary files a/lib/cherrypy/favicon.ico and /dev/null differ
diff --git a/lib/cherrypy/lib/__init__.py b/lib/cherrypy/lib/__init__.py
index 9788ffdf..a75a53da 100644
--- a/lib/cherrypy/lib/__init__.py
+++ b/lib/cherrypy/lib/__init__.py
@@ -1,14 +1,12 @@
-"""CherryPy Library."""
+"""CherryPy Library"""
 
+# Deprecated in CherryPy 3.2 -- remove in CherryPy 3.3
+from cherrypy.lib.reprconf import unrepr, modules, attributes
 
 def is_iterator(obj):
-    """Detect if the object provided implements the iterator protocol.
-
-    (i.e. like a generator).
-
-    This will return False for objects which are iterable, but not
-    iterators themselves.
-    """
+    '''Returns a boolean indicating if the object provided implements
+     the iterator protocol (i.e. like a generator). This will return
+     false for objects which iterable, but not iterators themselves.'''
     from types import GeneratorType
     if isinstance(obj, GeneratorType):
         return True
@@ -18,23 +16,22 @@ def is_iterator(obj):
         # Types which implement the protocol must return themselves when
         # invoking 'iter' upon them.
         return iter(obj) is obj
-
-
+        
 def is_closable_iterator(obj):
-    """Detect if the given object is both closable and iterator."""
+    
     # Not an iterator.
     if not is_iterator(obj):
         return False
-
+    
     # A generator - the easiest thing to deal with.
     import inspect
     if inspect.isgenerator(obj):
         return True
-
+    
     # A custom iterator. Look for a close method...
     if not (hasattr(obj, 'close') and callable(obj.close)):
         return False
-
+    
     #  ... which doesn't require any arguments.
     try:
         inspect.getcallargs(obj.close)
@@ -43,24 +40,18 @@ def is_closable_iterator(obj):
     else:
         return True
 
-
 class file_generator(object):
-    """Yield the given input (a file object) in chunks (default 64k).
 
-    (Core)
-    """
+    """Yield the given input (a file object) in chunks (default 64k). (Core)"""
 
     def __init__(self, input, chunkSize=65536):
-        """Initialize file_generator with file ``input`` for chunked access."""
         self.input = input
         self.chunkSize = chunkSize
 
     def __iter__(self):
-        """Return iterator."""
         return self
 
     def __next__(self):
-        """Return next chunk of file."""
         chunk = self.input.read(self.chunkSize)
         if chunk:
             return chunk
@@ -70,17 +61,10 @@ class file_generator(object):
             raise StopIteration()
     next = __next__
 
-    def __del__(self):
-        """Close input on descturct."""
-        if hasattr(self.input, 'close'):
-            self.input.close()
-
 
 def file_generator_limited(fileobj, count, chunk_size=65536):
-    """Yield the given file object in chunks.
-
-    Stopps after `count` bytes has been emitted.
-    Default chunk size is 64kB. (Core)
+    """Yield the given file object in chunks, stopping after `count`
+    bytes has been emitted.  Default chunk size is 64kB. (Core)
     """
     remaining = count
     while remaining > 0:
@@ -93,9 +77,9 @@ def file_generator_limited(fileobj, count, chunk_size=65536):
 
 
 def set_vary_header(response, header_name):
-    """Add a Vary header to a response."""
-    varies = response.headers.get('Vary', '')
-    varies = [x.strip() for x in varies.split(',') if x.strip()]
+    "Add a Vary header to a response"
+    varies = response.headers.get("Vary", "")
+    varies = [x.strip() for x in varies.split(",") if x.strip()]
     if header_name not in varies:
         varies.append(header_name)
-    response.headers['Vary'] = ', '.join(varies)
+    response.headers['Vary'] = ", ".join(varies)
diff --git a/lib/cherrypy/lib/auth.py b/lib/cherrypy/lib/auth.py
new file mode 100644
index 00000000..71591aaa
--- /dev/null
+++ b/lib/cherrypy/lib/auth.py
@@ -0,0 +1,97 @@
+import cherrypy
+from cherrypy.lib import httpauth
+
+
+def check_auth(users, encrypt=None, realm=None):
+    """If an authorization header contains credentials, return True or False.
+    """
+    request = cherrypy.serving.request
+    if 'authorization' in request.headers:
+        # make sure the provided credentials are correctly set
+        ah = httpauth.parseAuthorization(request.headers['authorization'])
+        if ah is None:
+            raise cherrypy.HTTPError(400, 'Bad Request')
+
+        if not encrypt:
+            encrypt = httpauth.DIGEST_AUTH_ENCODERS[httpauth.MD5]
+
+        if hasattr(users, '__call__'):
+            try:
+                # backward compatibility
+                users = users()  # expect it to return a dictionary
+
+                if not isinstance(users, dict):
+                    raise ValueError(
+                        "Authentication users must be a dictionary")
+
+                # fetch the user password
+                password = users.get(ah["username"], None)
+            except TypeError:
+                # returns a password (encrypted or clear text)
+                password = users(ah["username"])
+        else:
+            if not isinstance(users, dict):
+                raise ValueError("Authentication users must be a dictionary")
+
+            # fetch the user password
+            password = users.get(ah["username"], None)
+
+        # validate the authorization by re-computing it here
+        # and compare it with what the user-agent provided
+        if httpauth.checkResponse(ah, password, method=request.method,
+                                  encrypt=encrypt, realm=realm):
+            request.login = ah["username"]
+            return True
+
+        request.login = False
+    return False
+
+
+def basic_auth(realm, users, encrypt=None, debug=False):
+    """If auth fails, raise 401 with a basic authentication header.
+
+    realm
+        A string containing the authentication realm.
+
+    users
+        A dict of the form: {username: password} or a callable returning
+        a dict.
+
+    encrypt
+        callable used to encrypt the password returned from the user-agent.
+        if None it defaults to a md5 encryption.
+
+    """
+    if check_auth(users, encrypt):
+        if debug:
+            cherrypy.log('Auth successful', 'TOOLS.BASIC_AUTH')
+        return
+
+    # inform the user-agent this path is protected
+    cherrypy.serving.response.headers[
+        'www-authenticate'] = httpauth.basicAuth(realm)
+
+    raise cherrypy.HTTPError(
+        401, "You are not authorized to access that resource")
+
+
+def digest_auth(realm, users, debug=False):
+    """If auth fails, raise 401 with a digest authentication header.
+
+    realm
+        A string containing the authentication realm.
+    users
+        A dict of the form: {username: password} or a callable returning
+        a dict.
+    """
+    if check_auth(users, realm=realm):
+        if debug:
+            cherrypy.log('Auth successful', 'TOOLS.DIGEST_AUTH')
+        return
+
+    # inform the user-agent this path is protected
+    cherrypy.serving.response.headers[
+        'www-authenticate'] = httpauth.digestAuth(realm)
+
+    raise cherrypy.HTTPError(
+        401, "You are not authorized to access that resource")
diff --git a/lib/cherrypy/lib/auth_basic.py b/lib/cherrypy/lib/auth_basic.py
index b938a560..5ba16f7f 100644
--- a/lib/cherrypy/lib/auth_basic.py
+++ b/lib/cherrypy/lib/auth_basic.py
@@ -1,9 +1,8 @@
 # This file is part of CherryPy <http://www.cherrypy.org/>
 # -*- coding: utf-8 -*-
 # vim:ts=4:sw=4:expandtab:fileencoding=utf-8
-"""HTTP Basic Authentication tool.
 
-This module provides a CherryPy 3.x tool which implements
+__doc__ = """This module provides a CherryPy 3.x tool which implements
 the server-side of HTTP Basic Access Authentication, as described in
 :rfc:`2617`.
 
@@ -15,22 +14,18 @@ as the credentials store::
     basic_auth = {'tools.auth_basic.on': True,
                   'tools.auth_basic.realm': 'earth',
                   'tools.auth_basic.checkpassword': checkpassword,
-                  'tools.auth_basic.accept_charset': 'UTF-8',
     }
     app_config = { '/' : basic_auth }
+
 """
 
-import binascii
-import unicodedata
-import base64
-
-import cherrypy
-from cherrypy._cpcompat import ntou, tonative
-
-
 __author__ = 'visteya'
 __date__ = 'April 2009'
 
+import binascii
+from cherrypy._cpcompat import base64_decode
+import cherrypy
+
 
 def checkpassword_dict(user_password_dict):
     """Returns a checkpassword function which checks credentials
@@ -47,10 +42,9 @@ def checkpassword_dict(user_password_dict):
     return checkpassword
 
 
-def basic_auth(realm, checkpassword, debug=False, accept_charset='utf-8'):
+def basic_auth(realm, checkpassword, debug=False):
     """A CherryPy tool which hooks at before_handler to perform
-    HTTP Basic Access Authentication, as specified in :rfc:`2617`
-    and :rfc:`7617`.
+    HTTP Basic Access Authentication, as specified in :rfc:`2617`.
 
     If the request has an 'authorization' header with a 'Basic' scheme, this
     tool attempts to authenticate the credentials supplied in that header.  If
@@ -70,50 +64,27 @@ def basic_auth(realm, checkpassword, debug=False, accept_charset='utf-8'):
 
     """
 
-    fallback_charset = 'ISO-8859-1'
-
     if '"' in realm:
         raise ValueError('Realm cannot contain the " (quote) character.')
     request = cherrypy.serving.request
 
     auth_header = request.headers.get('authorization')
     if auth_header is not None:
-        # split() error, base64.decodestring() error
-        msg = 'Bad Request'
-        with cherrypy.HTTPError.handle((ValueError, binascii.Error), 400, msg):
+        try:
             scheme, params = auth_header.split(' ', 1)
             if scheme.lower() == 'basic':
-                charsets = accept_charset, fallback_charset
-                decoded_params = base64.b64decode(params.encode('ascii'))
-                decoded_params = _try_decode(decoded_params, charsets)
-                decoded_params = ntou(decoded_params)
-                decoded_params = unicodedata.normalize('NFC', decoded_params)
-                decoded_params = tonative(decoded_params)
-                username, password = decoded_params.split(':', 1)
+                username, password = base64_decode(params).split(':', 1)
                 if checkpassword(realm, username, password):
                     if debug:
                         cherrypy.log('Auth succeeded', 'TOOLS.AUTH_BASIC')
                     request.login = username
                     return  # successful authentication
+        # split() error, base64.decodestring() error
+        except (ValueError, binascii.Error):
+            raise cherrypy.HTTPError(400, 'Bad Request')
 
-    charset = accept_charset.upper()
-    charset_declaration = (
-        (', charset="%s"' % charset)
-        if charset != fallback_charset
-        else ''
-    )
     # Respond with 401 status and a WWW-Authenticate header
-    cherrypy.serving.response.headers['www-authenticate'] = (
-        'Basic realm="%s"%s' % (realm, charset_declaration)
-    )
+    cherrypy.serving.response.headers[
+        'www-authenticate'] = 'Basic realm="%s"' % realm
     raise cherrypy.HTTPError(
-        401, 'You are not authorized to access that resource')
-
-
-def _try_decode(subject, charsets):
-    for charset in charsets[:-1]:
-        try:
-            return tonative(subject, charset)
-        except ValueError:
-            pass
-    return tonative(subject, charsets[-1])
+        401, "You are not authorized to access that resource")
diff --git a/lib/cherrypy/lib/auth_digest.py b/lib/cherrypy/lib/auth_digest.py
index 46749268..e06535dc 100644
--- a/lib/cherrypy/lib/auth_digest.py
+++ b/lib/cherrypy/lib/auth_digest.py
@@ -1,9 +1,8 @@
 # This file is part of CherryPy <http://www.cherrypy.org/>
 # -*- coding: utf-8 -*-
 # vim:ts=4:sw=4:expandtab:fileencoding=utf-8
-"""HTTP Digest Authentication tool.
 
-An implementation of the server-side of HTTP Digest Access
+__doc__ = """An implementation of the server-side of HTTP Digest Access
 Authentication, which is described in :rfc:`2617`.
 
 Example usage, using the built-in get_ha1_dict_plain function which uses a dict
@@ -15,27 +14,20 @@ of plaintext passwords as the credentials store::
                    'tools.auth_digest.realm': 'wonderland',
                    'tools.auth_digest.get_ha1': get_ha1,
                    'tools.auth_digest.key': 'a565c27146791cfb',
-                   'tools.auth_digest.accept_charset': 'UTF-8',
     }
     app_config = { '/' : digest_auth }
 """
 
-import time
-import functools
-from hashlib import md5
-from urllib.request import parse_http_list, parse_keqv_list
-
-import cherrypy
-from cherrypy._cpcompat import ntob, tonative
-
-
 __author__ = 'visteya'
 __date__ = 'April 2009'
 
 
-def md5_hex(s):
-    return md5(ntob(s, 'utf-8')).hexdigest()
+import time
+from cherrypy._cpcompat import parse_http_list, parse_keqv_list
 
+import cherrypy
+from cherrypy._cpcompat import md5, ntob
+md5_hex = lambda s: md5(ntob(s)).hexdigest()
 
 qop_auth = 'auth'
 qop_auth_int = 'auth-int'
@@ -43,9 +35,6 @@ valid_qops = (qop_auth, qop_auth_int)
 
 valid_algorithms = ('MD5', 'MD5-sess')
 
-FALLBACK_CHARSET = 'ISO-8859-1'
-DEFAULT_CHARSET = 'UTF-8'
-
 
 def TRACE(msg):
     cherrypy.log(msg, context='TOOLS.AUTH_DIGEST')
@@ -55,7 +44,7 @@ def TRACE(msg):
 
 
 def get_ha1_dict_plain(user_password_dict):
-    """Return a get_ha1 function which obtains a plaintext password from a
+    """Returns a get_ha1 function which obtains a plaintext password from a
     dictionary of the form: {username : password}.
 
     If you want a simple dictionary-based authentication scheme, with plaintext
@@ -72,7 +61,7 @@ def get_ha1_dict_plain(user_password_dict):
 
 
 def get_ha1_dict(user_ha1_dict):
-    """Return a get_ha1 function which obtains a HA1 password hash from a
+    """Returns a get_ha1 function which obtains a HA1 password hash from a
     dictionary of the form: {username : HA1}.
 
     If you want a dictionary-based authentication scheme, but with
@@ -87,7 +76,7 @@ def get_ha1_dict(user_ha1_dict):
 
 
 def get_ha1_file_htdigest(filename):
-    """Return a get_ha1 function which obtains a HA1 password hash from a
+    """Returns a get_ha1 function which obtains a HA1 password hash from a
     flat file with lines of the same format as that produced by the Apache
     htdigest utility. For example, for realm 'wonderland', username 'alice',
     and password '4x5istwelve', the htdigest line would be::
@@ -101,12 +90,13 @@ def get_ha1_file_htdigest(filename):
     """
     def get_ha1(realm, username):
         result = None
-        with open(filename, 'r') as f:
-            for line in f:
-                u, r, ha1 = line.rstrip().split(':')
-                if u == username and r == realm:
-                    result = ha1
-                    break
+        f = open(filename, 'r')
+        for line in f:
+            u, r, ha1 = line.rstrip().split(':')
+            if u == username and r == realm:
+                result = ha1
+                break
+        f.close()
         return result
 
     return get_ha1
@@ -135,51 +125,28 @@ def synthesize_nonce(s, key, timestamp=None):
 
 
 def H(s):
-    """The hash function H."""
+    """The hash function H"""
     return md5_hex(s)
 
 
-def _try_decode_header(header, charset):
-    global FALLBACK_CHARSET
+class HttpDigestAuthorization (object):
 
-    for enc in (charset, FALLBACK_CHARSET):
-        try:
-            return tonative(ntob(tonative(header, 'latin1'), 'latin1'), enc)
-        except ValueError as ve:
-            last_err = ve
-    else:
-        raise last_err
-
-
-class HttpDigestAuthorization(object):
+    """Class to parse a Digest Authorization header and perform re-calculation
+    of the digest.
     """
-    Parses a Digest Authorization header and performs
-    re-calculation of the digest.
-    """
-
-    scheme = 'digest'
 
     def errmsg(self, s):
         return 'Digest Authorization header: %s' % s
 
-    @classmethod
-    def matches(cls, header):
-        scheme, _, _ = header.partition(' ')
-        return scheme.lower() == cls.scheme
-
-    def __init__(
-        self, auth_header, http_method,
-        debug=False, accept_charset=DEFAULT_CHARSET[:],
-    ):
+    def __init__(self, auth_header, http_method, debug=False):
         self.http_method = http_method
         self.debug = debug
-
-        if not self.matches(auth_header):
+        scheme, params = auth_header.split(" ", 1)
+        self.scheme = scheme.lower()
+        if self.scheme != 'digest':
             raise ValueError('Authorization scheme is not "Digest"')
 
-        self.auth_header = _try_decode_header(auth_header, accept_charset)
-
-        scheme, params = self.auth_header.split(' ', 1)
+        self.auth_header = auth_header
 
         # make a dict of the params
         items = parse_http_list(params)
@@ -212,7 +179,7 @@ class HttpDigestAuthorization(object):
         )
         if not has_reqd:
             raise ValueError(
-                self.errmsg('Not all required parameters are present.'))
+                self.errmsg("Not all required parameters are present."))
 
         if self.qop:
             if self.qop not in valid_qops:
@@ -220,13 +187,13 @@ class HttpDigestAuthorization(object):
                     self.errmsg("Unsupported value for qop: '%s'" % self.qop))
             if not (self.cnonce and self.nc):
                 raise ValueError(
-                    self.errmsg('If qop is sent then '
-                                'cnonce and nc MUST be present'))
+                    self.errmsg("If qop is sent then "
+                                "cnonce and nc MUST be present"))
         else:
             if self.cnonce or self.nc:
                 raise ValueError(
-                    self.errmsg('If qop is not sent, '
-                                'neither cnonce nor nc can be present'))
+                    self.errmsg("If qop is not sent, "
+                                "neither cnonce nor nc can be present"))
 
     def __str__(self):
         return 'authorization : %s' % self.auth_header
@@ -259,11 +226,10 @@ class HttpDigestAuthorization(object):
         return False
 
     def is_nonce_stale(self, max_age_seconds=600):
-        """Return True if a validated nonce is stale.
-
-        The nonce contains a timestamp in plaintext and also a secure
-        hash of the timestamp. You should first validate the nonce to
-        ensure the plaintext timestamp is not spoofed.
+        """Returns True if a validated nonce is stale. The nonce contains a
+        timestamp in plaintext and also a secure hash of the timestamp.
+        You should first validate the nonce to ensure the plaintext
+        timestamp is not spoofed.
         """
         try:
             timestamp, hashpart = self.nonce.split(':', 1)
@@ -272,14 +238,11 @@ class HttpDigestAuthorization(object):
         except ValueError:  # int() error
             pass
         if self.debug:
-            TRACE('nonce is stale')
+            TRACE("nonce is stale")
         return True
 
     def HA2(self, entity_body=''):
-        """Return the H(A2) string.
-
-        See :rfc:`2617` section 3.2.2.3.
-        """
+        """Returns the H(A2) string. See :rfc:`2617` section 3.2.2.3."""
         # RFC 2617 3.2.2.3
         # If the "qop" directive's value is "auth" or is unspecified,
         # then A2 is:
@@ -287,14 +250,14 @@ class HttpDigestAuthorization(object):
         #
         # If the "qop" value is "auth-int", then A2 is:
         #    A2 = method ":" digest-uri-value ":" H(entity-body)
-        if self.qop is None or self.qop == 'auth':
+        if self.qop is None or self.qop == "auth":
             a2 = '%s:%s' % (self.http_method, self.uri)
-        elif self.qop == 'auth-int':
-            a2 = '%s:%s:%s' % (self.http_method, self.uri, H(entity_body))
+        elif self.qop == "auth-int":
+            a2 = "%s:%s:%s" % (self.http_method, self.uri, H(entity_body))
         else:
             # in theory, this should never happen, since I validate qop in
             # __init__()
-            raise ValueError(self.errmsg('Unrecognized value for qop!'))
+            raise ValueError(self.errmsg("Unrecognized value for qop!"))
         return H(a2)
 
     def request_digest(self, ha1, entity_body=''):
@@ -310,14 +273,15 @@ class HttpDigestAuthorization(object):
             4.3.  This refers to the entity the user agent sent in the
             request which has the Authorization header. Typically GET
             requests don't have an entity, and POST requests do.
+
         """
         ha2 = self.HA2(entity_body)
         # Request-Digest -- RFC 2617 3.2.2.1
         if self.qop:
-            req = '%s:%s:%s:%s:%s' % (
+            req = "%s:%s:%s:%s:%s" % (
                 self.nonce, self.nc, self.cnonce, self.qop, ha2)
         else:
-            req = '%s:%s' % (self.nonce, ha2)
+            req = "%s:%s" % (self.nonce, ha2)
 
         # RFC 2617 3.2.2.2
         #
@@ -337,44 +301,25 @@ class HttpDigestAuthorization(object):
         return digest
 
 
-def _get_charset_declaration(charset):
-    global FALLBACK_CHARSET
-    charset = charset.upper()
-    return (
-        (', charset="%s"' % charset)
-        if charset != FALLBACK_CHARSET
-        else ''
-    )
-
-
-def www_authenticate(
-    realm, key, algorithm='MD5', nonce=None, qop=qop_auth,
-    stale=False, accept_charset=DEFAULT_CHARSET[:],
-):
+def www_authenticate(realm, key, algorithm='MD5', nonce=None, qop=qop_auth,
+                     stale=False):
     """Constructs a WWW-Authenticate header for Digest authentication."""
     if qop not in valid_qops:
         raise ValueError("Unsupported value for qop: '%s'" % qop)
     if algorithm not in valid_algorithms:
         raise ValueError("Unsupported value for algorithm: '%s'" % algorithm)
 
-    HEADER_PATTERN = (
-        'Digest realm="%s", nonce="%s", algorithm="%s", qop="%s"%s%s'
-    )
-
     if nonce is None:
         nonce = synthesize_nonce(realm, key)
-
-    stale_param = ', stale="true"' if stale else ''
-
-    charset_declaration = _get_charset_declaration(accept_charset)
-
-    return HEADER_PATTERN % (
-        realm, nonce, algorithm, qop, stale_param, charset_declaration,
-    )
+    s = 'Digest realm="%s", nonce="%s", algorithm="%s", qop="%s"' % (
+        realm, nonce, algorithm, qop)
+    if stale:
+        s += ', stale="true"'
+    return s
 
 
-def digest_auth(realm, get_ha1, key, debug=False, accept_charset='utf-8'):
-    """A CherryPy tool that hooks at before_handler to perform
+def digest_auth(realm, get_ha1, key, debug=False):
+    """A CherryPy tool which hooks at before_handler to perform
     HTTP Digest Access Authentication, as specified in :rfc:`2617`.
 
     If the request has an 'authorization' header with a 'Digest' scheme,
@@ -387,7 +332,7 @@ def digest_auth(realm, get_ha1, key, debug=False, accept_charset='utf-8'):
         A string containing the authentication realm.
 
     get_ha1
-        A callable that looks up a username in a credentials store
+        A callable which looks up a username in a credentials store
         and returns the HA1 string, which is defined in the RFC to be
         MD5(username : realm : password).  The function's signature is:
         ``get_ha1(realm, username)``
@@ -398,65 +343,48 @@ def digest_auth(realm, get_ha1, key, debug=False, accept_charset='utf-8'):
     key
         A secret string known only to the server, used in the synthesis
         of nonces.
+
     """
     request = cherrypy.serving.request
 
     auth_header = request.headers.get('authorization')
+    nonce_is_stale = False
+    if auth_header is not None:
+        try:
+            auth = HttpDigestAuthorization(
+                auth_header, request.method, debug=debug)
+        except ValueError:
+            raise cherrypy.HTTPError(
+                400, "The Authorization header could not be parsed.")
 
-    respond_401 = functools.partial(
-        _respond_401, realm, key, accept_charset, debug)
+        if debug:
+            TRACE(str(auth))
 
-    if not HttpDigestAuthorization.matches(auth_header or ''):
-        respond_401()
+        if auth.validate_nonce(realm, key):
+            ha1 = get_ha1(realm, auth.username)
+            if ha1 is not None:
+                # note that for request.body to be available we need to
+                # hook in at before_handler, not on_start_resource like
+                # 3.1.x digest_auth does.
+                digest = auth.request_digest(ha1, entity_body=request.body)
+                if digest == auth.response:  # authenticated
+                    if debug:
+                        TRACE("digest matches auth.response")
+                    # Now check if nonce is stale.
+                    # The choice of ten minutes' lifetime for nonce is somewhat
+                    # arbitrary
+                    nonce_is_stale = auth.is_nonce_stale(max_age_seconds=600)
+                    if not nonce_is_stale:
+                        request.login = auth.username
+                        if debug:
+                            TRACE("authentication of %s successful" %
+                                  auth.username)
+                        return
 
-    msg = 'The Authorization header could not be parsed.'
-    with cherrypy.HTTPError.handle(ValueError, 400, msg):
-        auth = HttpDigestAuthorization(
-            auth_header, request.method,
-            debug=debug, accept_charset=accept_charset,
-        )
-
-    if debug:
-        TRACE(str(auth))
-
-    if not auth.validate_nonce(realm, key):
-        respond_401()
-
-    ha1 = get_ha1(realm, auth.username)
-
-    if ha1 is None:
-        respond_401()
-
-    # note that for request.body to be available we need to
-    # hook in at before_handler, not on_start_resource like
-    # 3.1.x digest_auth does.
-    digest = auth.request_digest(ha1, entity_body=request.body)
-    if digest != auth.response:
-        respond_401()
-
-    # authenticated
-    if debug:
-        TRACE('digest matches auth.response')
-    # Now check if nonce is stale.
-    # The choice of ten minutes' lifetime for nonce is somewhat
-    # arbitrary
-    if auth.is_nonce_stale(max_age_seconds=600):
-        respond_401(stale=True)
-
-    request.login = auth.username
-    if debug:
-        TRACE('authentication of %s successful' % auth.username)
-
-
-def _respond_401(realm, key, accept_charset, debug, **kwargs):
-    """Respond with 401 status and a WWW-Authenticate header."""
-    header = www_authenticate(
-        realm, key,
-        accept_charset=accept_charset,
-        **kwargs
-    )
+    # Respond with 401 status and a WWW-Authenticate header
+    header = www_authenticate(realm, key, stale=nonce_is_stale)
     if debug:
         TRACE(header)
     cherrypy.serving.response.headers['WWW-Authenticate'] = header
     raise cherrypy.HTTPError(
-        401, 'You are not authorized to access that resource')
+        401, "You are not authorized to access that resource")
diff --git a/lib/cherrypy/lib/caching.py b/lib/cherrypy/lib/caching.py
index 89cb0442..fab6b569 100644
--- a/lib/cherrypy/lib/caching.py
+++ b/lib/cherrypy/lib/caching.py
@@ -39,45 +39,48 @@ import time
 
 import cherrypy
 from cherrypy.lib import cptools, httputil
+from cherrypy._cpcompat import copyitems, ntob, set_daemon, sorted, Event
 
 
 class Cache(object):
+
     """Base class for Cache implementations."""
 
     def get(self):
         """Return the current variant if in the cache, else None."""
-        raise NotImplementedError
+        raise NotImplemented
 
     def put(self, obj, size):
         """Store the current variant in the cache."""
-        raise NotImplementedError
+        raise NotImplemented
 
     def delete(self):
         """Remove ALL cached variants of the current resource."""
-        raise NotImplementedError
+        raise NotImplemented
 
     def clear(self):
         """Reset the cache to its initial, empty state."""
-        raise NotImplementedError
+        raise NotImplemented
 
 
 # ------------------------------ Memory Cache ------------------------------- #
 class AntiStampedeCache(dict):
+
     """A storage system for cached items which reduces stampede collisions."""
 
     def wait(self, key, timeout=5, debug=False):
         """Return the cached value for the given key, or None.
 
-        If timeout is not None, and the value is already being
-        calculated by another thread, wait until the given timeout has
-        elapsed. If the value is available before the timeout expires,
-        it is returned. If not, None is returned, and a sentinel placed
-        in the cache to signal other threads to wait.
+        If timeout is not None, and the value is already
+        being calculated by another thread, wait until the given timeout has
+        elapsed. If the value is available before the timeout expires, it is
+        returned. If not, None is returned, and a sentinel placed in the cache
+        to signal other threads to wait.
 
         If timeout is None, no waiting is performed nor sentinels used.
         """
         value = self.get(key)
-        if isinstance(value, threading.Event):
+        if isinstance(value, Event):
             if timeout is None:
                 # Ignore the other thread and recalc it ourselves.
                 if debug:
@@ -117,7 +120,7 @@ class AntiStampedeCache(dict):
         """Set the cached value for the given key."""
         existing = self.get(key)
         dict.__setitem__(self, key, value)
-        if isinstance(existing, threading.Event):
+        if isinstance(existing, Event):
             # Set Event.result so other threads waiting on it have
             # immediate access without needing to poll the cache again.
             existing.result = value
@@ -125,6 +128,7 @@ class AntiStampedeCache(dict):
 
 
 class MemoryCache(Cache):
+
     """An in-memory cache for varying response content.
 
     Each key in self.store is a URI, and each value is an AntiStampedeCache.
@@ -166,7 +170,7 @@ class MemoryCache(Cache):
         # Run self.expire_cache in a separate daemon thread.
         t = threading.Thread(target=self.expire_cache, name='expire_cache')
         self.expiration_thread = t
-        t.daemon = True
+        set_daemon(t, True)
         t.start()
 
     def clear(self):
@@ -193,7 +197,7 @@ class MemoryCache(Cache):
             now = time.time()
             # Must make a copy of expirations so it doesn't change size
             # during iteration
-            for expiration_time, objects in self.expirations.copy().items():
+            for expiration_time, objects in copyitems(self.expirations):
                 if expiration_time <= now:
                     for obj_size, uri, sel_header_values in objects:
                         try:
@@ -261,7 +265,7 @@ class MemoryCache(Cache):
         self.store.pop(uri, None)
 
 
-def get(invalid_methods=('POST', 'PUT', 'DELETE'), debug=False, **kwargs):
+def get(invalid_methods=("POST", "PUT", "DELETE"), debug=False, **kwargs):
     """Try to obtain cached output. If fresh enough, raise HTTPError(304).
 
     If POST, PUT, or DELETE:
@@ -287,9 +291,9 @@ def get(invalid_methods=('POST', 'PUT', 'DELETE'), debug=False, **kwargs):
     request = cherrypy.serving.request
     response = cherrypy.serving.response
 
-    if not hasattr(cherrypy, '_cache'):
+    if not hasattr(cherrypy, "_cache"):
         # Make a process-wide Cache object.
-        cherrypy._cache = kwargs.pop('cache_class', MemoryCache)()
+        cherrypy._cache = kwargs.pop("cache_class", MemoryCache)()
 
         # Take all remaining kwargs and set them on the Cache object.
         for k, v in kwargs.items():
@@ -324,7 +328,7 @@ def get(invalid_methods=('POST', 'PUT', 'DELETE'), debug=False, **kwargs):
             if directive == 'max-age':
                 if len(atoms) != 1 or not atoms[0].isdigit():
                     raise cherrypy.HTTPError(
-                        400, 'Invalid Cache-Control header')
+                        400, "Invalid Cache-Control header")
                 max_age = int(atoms[0])
                 break
             elif directive == 'no-cache':
@@ -349,13 +353,13 @@ def get(invalid_methods=('POST', 'PUT', 'DELETE'), debug=False, **kwargs):
             return False
 
         # Copy the response headers. See
-        # https://github.com/cherrypy/cherrypy/issues/721.
+        # https://bitbucket.org/cherrypy/cherrypy/issue/721.
         response.headers = rh = httputil.HeaderMap()
         for k in h:
             dict.__setitem__(rh, k, dict.__getitem__(h, k))
 
         # Add the required Age header
-        response.headers['Age'] = str(age)
+        response.headers["Age"] = str(age)
 
         try:
             # Note that validate_since depends on a Last-Modified header;
@@ -378,10 +382,7 @@ def get(invalid_methods=('POST', 'PUT', 'DELETE'), debug=False, **kwargs):
 
 
 def tee_output():
-    """Tee response output to cache storage.
-
-    Internal.
-    """
+    """Tee response output to cache storage. Internal."""
     # Used by CachingTool by attaching to request.hooks
 
     request = cherrypy.serving.request
@@ -401,19 +402,10 @@ def tee_output():
             output.append(chunk)
             yield chunk
 
-        # Save the cache data, but only if the body isn't empty.
-        # e.g. a 304 Not Modified on a static file response will
-        # have an empty body.
-        # If the body is empty, delete the cache because it
-        # contains a stale Threading._Event object that will
-        # stall all consecutive requests until the _Event times
-        # out
-        body = b''.join(output)
-        if not body:
-            cherrypy._cache.delete()
-        else:
-            cherrypy._cache.put((response.status, response.headers or {},
-                                 body, response.time), len(body))
+        # save the cache data
+        body = ntob('').join(output)
+        cherrypy._cache.put((response.status, response.headers or {},
+                             body, response.time), len(body))
 
     response = cherrypy.serving.response
     response.body = tee(response.body)
@@ -441,6 +433,7 @@ def expires(secs=0, force=False, debug=False):
             * Expires
 
         If any are already present, none of the above response headers are set.
+
     """
 
     response = cherrypy.serving.response
@@ -464,14 +457,14 @@ def expires(secs=0, force=False, debug=False):
             secs = (86400 * secs.days) + secs.seconds
 
         if secs == 0:
-            if force or ('Pragma' not in headers):
-                headers['Pragma'] = 'no-cache'
+            if force or ("Pragma" not in headers):
+                headers["Pragma"] = "no-cache"
             if cherrypy.serving.request.protocol >= (1, 1):
-                if force or 'Cache-Control' not in headers:
-                    headers['Cache-Control'] = 'no-cache, must-revalidate'
+                if force or "Cache-Control" not in headers:
+                    headers["Cache-Control"] = "no-cache, must-revalidate"
             # Set an explicit Expires date in the past.
             expiry = httputil.HTTPDate(1169942400.0)
         else:
             expiry = httputil.HTTPDate(response.time + secs)
-        if force or 'Expires' not in headers:
-            headers['Expires'] = expiry
+        if force or "Expires" not in headers:
+            headers["Expires"] = expiry
diff --git a/lib/cherrypy/lib/covercp.py b/lib/cherrypy/lib/covercp.py
index f22cce74..a74ec342 100644
--- a/lib/cherrypy/lib/covercp.py
+++ b/lib/cherrypy/lib/covercp.py
@@ -22,15 +22,11 @@ it will call ``serve()`` for you.
 
 import re
 import sys
-import html
+import cgi
+from cherrypy._cpcompat import quote_plus
 import os
 import os.path
-import urllib.parse
-
-import cherrypy
-
-
-localFile = os.path.join(os.path.dirname(__file__), 'coverage.cache')
+localFile = os.path.join(os.path.dirname(__file__), "coverage.cache")
 
 the_coverage = None
 try:
@@ -46,8 +42,8 @@ except ImportError:
 
     import warnings
     warnings.warn(
-        'No code coverage will be performed; '
-        'coverage.py could not be imported.')
+        "No code coverage will be performed; "
+        "coverage.py could not be imported.")
 
     def start():
         pass
@@ -197,7 +193,7 @@ def _percent(statements, missing):
     return 0
 
 
-def _show_branch(root, base, path, pct=0, showpct=False, exclude='',
+def _show_branch(root, base, path, pct=0, showpct=False, exclude="",
                  coverage=the_coverage):
 
     # Show the directory name and any of our children
@@ -208,11 +204,11 @@ def _show_branch(root, base, path, pct=0, showpct=False, exclude='',
 
         if newpath.lower().startswith(base):
             relpath = newpath[len(base):]
-            yield '| ' * relpath.count(os.sep)
+            yield "| " * relpath.count(os.sep)
             yield (
                 "<a class='directory' "
                 "href='menu?base=%s&exclude=%s'>%s</a>\n" %
-                (newpath, urllib.parse.quote_plus(exclude), name)
+                (newpath, quote_plus(exclude), name)
             )
 
         for chunk in _show_branch(
@@ -229,22 +225,22 @@ def _show_branch(root, base, path, pct=0, showpct=False, exclude='',
         for name in files:
             newpath = os.path.join(path, name)
 
-            pc_str = ''
+            pc_str = ""
             if showpct:
                 try:
                     _, statements, _, missing, _ = coverage.analysis2(newpath)
-                except Exception:
+                except:
                     # Yes, we really want to pass on all errors.
                     pass
                 else:
                     pc = _percent(statements, missing)
-                    pc_str = ('%3d%% ' % pc).replace(' ', '&nbsp;')
+                    pc_str = ("%3d%% " % pc).replace(' ', '&nbsp;')
                     if pc < float(pct) or pc == -1:
                         pc_str = "<span class='fail'>%s</span>" % pc_str
                     else:
                         pc_str = "<span class='pass'>%s</span>" % pc_str
 
-            yield TEMPLATE_ITEM % ('| ' * (relpath.count(os.sep) + 1),
+            yield TEMPLATE_ITEM % ("| " * (relpath.count(os.sep) + 1),
                                    pc_str, newpath, name)
 
 
@@ -264,8 +260,8 @@ def _graft(path, tree):
             break
         atoms.append(tail)
     atoms.append(p)
-    if p != '/':
-        atoms.append('/')
+    if p != "/":
+        atoms.append("/")
 
     atoms.reverse()
     for node in atoms:
@@ -290,15 +286,15 @@ class CoverStats(object):
         if root is None:
             # Guess initial depth. Files outside this path will not be
             # reachable from the web interface.
+            import cherrypy
             root = os.path.dirname(cherrypy.__file__)
         self.root = root
 
-    @cherrypy.expose
     def index(self):
         return TEMPLATE_FRAMESET % self.root.lower()
+    index.exposed = True
 
-    @cherrypy.expose
-    def menu(self, base='/', pct='50', showpct='',
+    def menu(self, base="/", pct="50", showpct="",
              exclude=r'python\d\.\d|test|tut\d|tutorial'):
 
         # The coverage module uses all-lower-case names.
@@ -309,37 +305,37 @@ class CoverStats(object):
 
         # Start by showing links for parent paths
         yield "<div id='crumbs'>"
-        path = ''
+        path = ""
         atoms = base.split(os.sep)
         atoms.pop()
         for atom in atoms:
             path += atom + os.sep
             yield ("<a href='menu?base=%s&exclude=%s'>%s</a> %s"
-                   % (path, urllib.parse.quote_plus(exclude), atom, os.sep))
-        yield '</div>'
+                   % (path, quote_plus(exclude), atom, os.sep))
+        yield "</div>"
 
         yield "<div id='tree'>"
 
         # Then display the tree
         tree = get_tree(base, exclude, self.coverage)
         if not tree:
-            yield '<p>No modules covered.</p>'
+            yield "<p>No modules covered.</p>"
         else:
-            for chunk in _show_branch(tree, base, '/', pct,
+            for chunk in _show_branch(tree, base, "/", pct,
                                       showpct == 'checked', exclude,
                                       coverage=self.coverage):
                 yield chunk
 
-        yield '</div>'
-        yield '</body></html>'
+        yield "</div>"
+        yield "</body></html>"
+    menu.exposed = True
 
     def annotated_file(self, filename, statements, excluded, missing):
-        with open(filename, 'r') as source:
-            lines = source.readlines()
+        source = open(filename, 'r')
         buffer = []
-        for lineno, line in enumerate(lines):
+        for lineno, line in enumerate(source.readlines()):
             lineno += 1
-            line = line.strip('\n\r')
+            line = line.strip("\n\r")
             empty_the_buffer = True
             if lineno in excluded:
                 template = TEMPLATE_LOC_EXCLUDED
@@ -352,11 +348,10 @@ class CoverStats(object):
                 buffer.append((lineno, line))
             if empty_the_buffer:
                 for lno, pastline in buffer:
-                    yield template % (lno, html.escape(pastline))
+                    yield template % (lno, cgi.escape(pastline))
                 buffer = []
-                yield template % (lineno, html.escape(line))
+                yield template % (lineno, cgi.escape(line))
 
-    @cherrypy.expose
     def report(self, name):
         filename, statements, excluded, missing, _ = self.coverage.analysis2(
             name)
@@ -371,21 +366,22 @@ class CoverStats(object):
         yield '</table>'
         yield '</body>'
         yield '</html>'
+    report.exposed = True
 
 
 def serve(path=localFile, port=8080, root=None):
     if coverage is None:
-        raise ImportError('The coverage module could not be imported.')
+        raise ImportError("The coverage module could not be imported.")
     from coverage import coverage
     cov = coverage(data_file=path)
     cov.load()
 
+    import cherrypy
     cherrypy.config.update({'server.socket_port': int(port),
                             'server.thread_pool': 10,
-                            'environment': 'production',
+                            'environment': "production",
                             })
     cherrypy.quickstart(CoverStats(cov, root))
 
-
-if __name__ == '__main__':
+if __name__ == "__main__":
     serve(*tuple(sys.argv[1:]))
diff --git a/lib/cherrypy/lib/cpstats.py b/lib/cherrypy/lib/cpstats.py
index 5dff319b..a8661a14 100644
--- a/lib/cherrypy/lib/cpstats.py
+++ b/lib/cherrypy/lib/cpstats.py
@@ -184,19 +184,12 @@ To report statistics::
 To format statistics reports::
 
     See 'Reporting', above.
+
 """
 
-import logging
-import os
-import sys
-import threading
-import time
-
-import cherrypy
-from cherrypy._json import json
-
 # ------------------------------- Statistics -------------------------------- #
 
+import logging
 if not hasattr(logging, 'statistics'):
     logging.statistics = {}
 
@@ -204,7 +197,7 @@ if not hasattr(logging, 'statistics'):
 def extrapolate_statistics(scope):
     """Return an extrapolated copy of the given scope."""
     c = {}
-    for k, v in scope.copy().items():
+    for k, v in list(scope.items()):
         if isinstance(v, dict):
             v = extrapolate_statistics(v)
         elif isinstance(v, (list, tuple)):
@@ -217,6 +210,11 @@ def extrapolate_statistics(scope):
 
 # -------------------- CherryPy Applications Statistics --------------------- #
 
+import threading
+import time
+
+import cherrypy
+
 appstats = logging.statistics.setdefault('CherryPy Applications', {})
 appstats.update({
     'Enabled': True,
@@ -247,12 +245,11 @@ appstats.update({
     'Requests': {},
 })
 
-
-def proc_time(s):
-    return time.time() - s['Start Time']
+proc_time = lambda s: time.time() - s['Start Time']
 
 
 class ByteCountWrapper(object):
+
     """Wraps a file-like object, counting the number of bytes read."""
 
     def __init__(self, rfile):
@@ -294,17 +291,11 @@ class ByteCountWrapper(object):
         return data
 
 
-def average_uriset_time(s):
-    return s['Count'] and (s['Sum'] / s['Count']) or 0
-
-
-def _get_threading_ident():
-    if sys.version_info >= (3, 3):
-        return threading.get_ident()
-    return threading._get_ident()
+average_uriset_time = lambda s: s['Count'] and (s['Sum'] / s['Count']) or 0
 
 
 class StatsTool(cherrypy.Tool):
+
     """Record various information about the current request."""
 
     def __init__(self):
@@ -313,8 +304,8 @@ class StatsTool(cherrypy.Tool):
     def _setup(self):
         """Hook this tool into cherrypy.request.
 
-        The standard CherryPy request object will automatically call
-        this method when the tool is "turned on" in config.
+        The standard CherryPy request object will automatically call this
+        method when the tool is "turned on" in config.
         """
         if appstats.get('Enabled', False):
             cherrypy.Tool._setup(self)
@@ -331,7 +322,7 @@ class StatsTool(cherrypy.Tool):
 
         appstats['Current Requests'] += 1
         appstats['Total Requests'] += 1
-        appstats['Requests'][_get_threading_ident()] = {
+        appstats['Requests'][threading._get_ident()] = {
             'Bytes Read': None,
             'Bytes Written': None,
             # Use a lambda so the ip gets updated by tools.proxy later
@@ -348,7 +339,7 @@ class StatsTool(cherrypy.Tool):
             debug=False, **kwargs):
         """Record the end of a request."""
         resp = cherrypy.serving.response
-        w = appstats['Requests'][_get_threading_ident()]
+        w = appstats['Requests'][threading._get_ident()]
 
         r = cherrypy.request.rfile.bytes_read
         w['Bytes Read'] = r
@@ -361,8 +352,8 @@ class StatsTool(cherrypy.Tool):
             w['Bytes Written'] = cl
             appstats['Total Bytes Written'] += cl
 
-        w['Response Status'] = \
-            getattr(resp, 'output_status', resp.status).decode()
+        w['Response Status'] = getattr(
+            resp, 'output_status', None) or resp.status
 
         w['End Time'] = time.time()
         p = w['End Time'] - w['Start Time']
@@ -393,22 +384,28 @@ class StatsTool(cherrypy.Tool):
                 sq.pop(0)
 
 
+import cherrypy
 cherrypy.tools.cpstats = StatsTool()
 
 
 # ---------------------- CherryPy Statistics Reporting ---------------------- #
 
+import os
 thisdir = os.path.abspath(os.path.dirname(__file__))
 
+try:
+    import json
+except ImportError:
+    try:
+        import simplejson as json
+    except ImportError:
+        json = None
+
+
 missing = object()
 
-
-def locale_date(v):
-    return time.strftime('%c', time.gmtime(v))
-
-
-def iso_format(v):
-    return time.strftime('%Y-%m-%d %H:%M:%S', time.gmtime(v))
+locale_date = lambda v: time.strftime('%c', time.gmtime(v))
+iso_format = lambda v: time.strftime('%Y-%m-%d %H:%M:%S', time.gmtime(v))
 
 
 def pause_resume(ns):
@@ -472,7 +469,6 @@ class StatsPage(object):
         },
     }
 
-    @cherrypy.expose
     def index(self):
         # Transform the raw data into pretty output for HTML
         yield """
@@ -576,6 +572,7 @@ table.stats2 th {
 </body>
 </html>
 """
+    index.exposed = True
 
     def get_namespaces(self):
         """Yield (title, scalars, collections) for each namespace."""
@@ -608,8 +605,7 @@ table.stats2 th {
         """Return ([headers], [rows]) for the given collection."""
         # E.g., the 'Requests' dict.
         headers = []
-        vals = v.values()
-        for record in vals:
+        for record in v.itervalues():
             for k3 in record:
                 format = formatting.get(k3, missing)
                 if format is None:
@@ -670,22 +666,22 @@ table.stats2 th {
         return headers, subrows
 
     if json is not None:
-        @cherrypy.expose
         def data(self):
             s = extrapolate_statistics(logging.statistics)
             cherrypy.response.headers['Content-Type'] = 'application/json'
-            return json.dumps(s, sort_keys=True, indent=4).encode('utf-8')
+            return json.dumps(s, sort_keys=True, indent=4)
+        data.exposed = True
 
-    @cherrypy.expose
     def pause(self, namespace):
         logging.statistics.get(namespace, {})['Enabled'] = False
         raise cherrypy.HTTPRedirect('./')
+    pause.exposed = True
     pause.cp_config = {'tools.allow.on': True,
                        'tools.allow.methods': ['POST']}
 
-    @cherrypy.expose
     def resume(self, namespace):
         logging.statistics.get(namespace, {})['Enabled'] = True
         raise cherrypy.HTTPRedirect('./')
+    resume.exposed = True
     resume.cp_config = {'tools.allow.on': True,
                         'tools.allow.methods': ['POST']}
diff --git a/lib/cherrypy/lib/cptools.py b/lib/cherrypy/lib/cptools.py
index 61d4d36b..f376282c 100644
--- a/lib/cherrypy/lib/cptools.py
+++ b/lib/cherrypy/lib/cptools.py
@@ -2,11 +2,9 @@
 
 import logging
 import re
-from hashlib import md5
-import urllib.parse
 
 import cherrypy
-from cherrypy._cpcompat import text_or_bytes
+from cherrypy._cpcompat import basestring, md5, set, unicodestr
 from cherrypy.lib import httputil as _httputil
 from cherrypy.lib import is_iterator
 
@@ -32,7 +30,7 @@ def validate_etags(autotags=False, debug=False):
     response = cherrypy.serving.response
 
     # Guard against being run twice.
-    if hasattr(response, 'ETag'):
+    if hasattr(response, "ETag"):
         return
 
     status, reason, msg = _httputil.valid_status(response.status)
@@ -71,31 +69,31 @@ def validate_etags(autotags=False, debug=False):
         if debug:
             cherrypy.log('If-Match conditions: %s' % repr(conditions),
                          'TOOLS.ETAGS')
-        if conditions and not (conditions == ['*'] or etag in conditions):
-            raise cherrypy.HTTPError(412, 'If-Match failed: ETag %r did '
-                                     'not match %r' % (etag, conditions))
+        if conditions and not (conditions == ["*"] or etag in conditions):
+            raise cherrypy.HTTPError(412, "If-Match failed: ETag %r did "
+                                     "not match %r" % (etag, conditions))
 
         conditions = request.headers.elements('If-None-Match') or []
         conditions = [str(x) for x in conditions]
         if debug:
             cherrypy.log('If-None-Match conditions: %s' % repr(conditions),
                          'TOOLS.ETAGS')
-        if conditions == ['*'] or etag in conditions:
+        if conditions == ["*"] or etag in conditions:
             if debug:
                 cherrypy.log('request.method: %s' %
                              request.method, 'TOOLS.ETAGS')
-            if request.method in ('GET', 'HEAD'):
+            if request.method in ("GET", "HEAD"):
                 raise cherrypy.HTTPRedirect([], 304)
             else:
-                raise cherrypy.HTTPError(412, 'If-None-Match failed: ETag %r '
-                                         'matched %r' % (etag, conditions))
+                raise cherrypy.HTTPError(412, "If-None-Match failed: ETag %r "
+                                         "matched %r" % (etag, conditions))
 
 
 def validate_since():
     """Validate the current Last-Modified against If-Modified-Since headers.
 
-    If no code has set the Last-Modified response header, then no
-    validation will be performed.
+    If no code has set the Last-Modified response header, then no validation
+    will be performed.
     """
     response = cherrypy.serving.response
     lastmod = response.headers.get('Last-Modified')
@@ -112,7 +110,7 @@ def validate_since():
         since = request.headers.get('If-Modified-Since')
         if since and since == lastmod:
             if (status >= 200 and status <= 299) or status == 304:
-                if request.method in ('GET', 'HEAD'):
+                if request.method in ("GET", "HEAD"):
                     raise cherrypy.HTTPRedirect([], 304)
                 else:
                     raise cherrypy.HTTPError(412)
@@ -123,9 +121,9 @@ def validate_since():
 def allow(methods=None, debug=False):
     """Raise 405 if request.method not in methods (default ['GET', 'HEAD']).
 
-    The given methods are case-insensitive, and may be in any order. If
-    only one method is allowed, you may supply a single string; if more
-    than one, supply a list of strings.
+    The given methods are case-insensitive, and may be in any order.
+    If only one method is allowed, you may supply a single string;
+    if more than one, supply a list of strings.
 
     Regardless of whether the current method is allowed or not, this
     also emits an 'Allow' response header, containing the given methods.
@@ -154,23 +152,22 @@ def proxy(base=None, local='X-Forwarded-Host', remote='X-Forwarded-For',
           scheme='X-Forwarded-Proto', debug=False):
     """Change the base URL (scheme://host[:port][/path]).
 
-    For running a CP server behind Apache, lighttpd, or other HTTP
-    server.
+    For running a CP server behind Apache, lighttpd, or other HTTP server.
 
-    For Apache and lighttpd, you should leave the 'local' argument at
-    the default value of 'X-Forwarded-Host'. For Squid, you probably
-    want to set tools.proxy.local = 'Origin'.
+    For Apache and lighttpd, you should leave the 'local' argument at the
+    default value of 'X-Forwarded-Host'. For Squid, you probably want to set
+    tools.proxy.local = 'Origin'.
 
-    If you want the new request.base to include path info (not just the
-    host), you must explicitly set base to the full base path, and ALSO
-    set 'local' to '', so that the X-Forwarded-Host request header
-    (which never includes path info) does not override it. Regardless,
-    the value for 'base' MUST NOT end in a slash.
+    If you want the new request.base to include path info (not just the host),
+    you must explicitly set base to the full base path, and ALSO set 'local'
+    to '', so that the X-Forwarded-Host request header (which never includes
+    path info) does not override it. Regardless, the value for 'base' MUST
+    NOT end in a slash.
 
     cherrypy.request.remote.ip (the IP address of the client) will be
-    rewritten if the header specified by the 'remote' arg is valid. By
-    default, 'remote' is set to 'X-Forwarded-For'. If you do not want to
-    rewrite remote.ip, set the 'remote' arg to an empty string.
+    rewritten if the header specified by the 'remote' arg is valid.
+    By default, 'remote' is set to 'X-Forwarded-For'. If you do not
+    want to rewrite remote.ip, set the 'remote' arg to an empty string.
     """
 
     request = cherrypy.serving.request
@@ -186,7 +183,7 @@ def proxy(base=None, local='X-Forwarded-Host', remote='X-Forwarded-For',
             # This is for lighttpd/pound/Mongrel's 'X-Forwarded-Proto: https'
             scheme = s
     if not scheme:
-        scheme = request.base[:request.base.find('://')]
+        scheme = request.base[:request.base.find("://")]
 
     if local:
         lbase = request.headers.get(local, None)
@@ -195,12 +192,15 @@ def proxy(base=None, local='X-Forwarded-Host', remote='X-Forwarded-For',
         if lbase is not None:
             base = lbase.split(',')[0]
     if not base:
-        default = urllib.parse.urlparse(request.base).netloc
-        base = request.headers.get('Host', default)
+        port = request.local.port
+        if port == 80:
+            base = '127.0.0.1'
+        else:
+            base = '127.0.0.1:%s' % port
 
-    if base.find('://') == -1:
+    if base.find("://") == -1:
         # add http:// or https:// if needed
-        base = scheme + '://' + base
+        base = scheme + "://" + base
 
     request.base = base
 
@@ -210,16 +210,16 @@ def proxy(base=None, local='X-Forwarded-Host', remote='X-Forwarded-For',
             cherrypy.log('Testing remote %r:%r' % (remote, xff), 'TOOLS.PROXY')
         if xff:
             if remote == 'X-Forwarded-For':
-                # Grab the first IP in a comma-separated list. Ref #1268.
-                xff = next(ip.strip() for ip in xff.split(','))
+                #Bug #1268
+                xff = xff.split(',')[0].strip()
             request.remote.ip = xff
 
 
 def ignore_headers(headers=('Range',), debug=False):
     """Delete request headers whose field names are included in 'headers'.
 
-    This is a useful tool for working behind certain HTTP servers; for
-    example, Apache duplicates the work that CP does for 'Range'
+    This is a useful tool for working behind certain HTTP servers;
+    for example, Apache duplicates the work that CP does for 'Range'
     headers, and will doubly-truncate the response.
     """
     request = cherrypy.serving.request
@@ -238,8 +238,6 @@ def response_headers(headers=None, debug=False):
                      'TOOLS.RESPONSE_HEADERS')
     for name, value in (headers or []):
         cherrypy.serving.response.headers[name] = value
-
-
 response_headers.failsafe = True
 
 
@@ -282,9 +280,10 @@ def referer(pattern, accept=True, accept_missing=False, error=403,
 
 
 class SessionAuth(object):
+
     """Assert that the user is logged in."""
 
-    session_key = 'username'
+    session_key = "username"
     debug = False
 
     def check_username_and_password(self, username, password):
@@ -305,7 +304,7 @@ class SessionAuth(object):
 
     def login_screen(self, from_page='..', username='', error_msg='',
                      **kwargs):
-        return (str("""<html><body>
+        return (unicodestr("""<html><body>
 Message: %(error_msg)s
 <form method="post" action="do_login">
     Login: <input type="text" name="username" value="%(username)s" size="10" />
@@ -316,33 +315,27 @@ Message: %(error_msg)s
     <br />
     <input type="submit" />
 </form>
-</body></html>""") % vars()).encode('utf-8')
+</body></html>""") % vars()).encode("utf-8")
 
     def do_login(self, username, password, from_page='..', **kwargs):
-        """Login.
-
-        May raise redirect, or return True if request handled.
-        """
+        """Login. May raise redirect, or return True if request handled."""
         response = cherrypy.serving.response
         error_msg = self.check_username_and_password(username, password)
         if error_msg:
             body = self.login_screen(from_page, username, error_msg)
             response.body = body
-            if 'Content-Length' in response.headers:
+            if "Content-Length" in response.headers:
                 # Delete Content-Length header so finalize() recalcs it.
-                del response.headers['Content-Length']
+                del response.headers["Content-Length"]
             return True
         else:
             cherrypy.serving.request.login = username
             cherrypy.session[self.session_key] = username
             self.on_login(username)
-            raise cherrypy.HTTPRedirect(from_page or '/')
+            raise cherrypy.HTTPRedirect(from_page or "/")
 
     def do_logout(self, from_page='..', **kwargs):
-        """Logout.
-
-        May raise redirect, or return True if request handled.
-        """
+        """Logout. May raise redirect, or return True if request handled."""
         sess = cherrypy.session
         username = sess.get(self.session_key)
         sess[self.session_key] = None
@@ -352,9 +345,7 @@ Message: %(error_msg)s
         raise cherrypy.HTTPRedirect(from_page)
 
     def do_check(self):
-        """Assert username.
-
-        Raise redirect, or return True if request handled.
+        """Assert username. Raise redirect, or return True if request handled.
         """
         sess = cherrypy.session
         request = cherrypy.serving.request
@@ -371,9 +362,9 @@ Message: %(error_msg)s
                 locals(),
             )
             response.body = self.login_screen(url)
-            if 'Content-Length' in response.headers:
+            if "Content-Length" in response.headers:
                 # Delete Content-Length header so finalize() recalcs it.
-                del response.headers['Content-Length']
+                del response.headers["Content-Length"]
             return True
         self._debug_message('Setting request.login to %(username)r', locals())
         request.login = username
@@ -395,14 +386,14 @@ Message: %(error_msg)s
             return True
         elif path.endswith('do_login'):
             if request.method != 'POST':
-                response.headers['Allow'] = 'POST'
+                response.headers['Allow'] = "POST"
                 self._debug_message('do_login requires POST')
                 raise cherrypy.HTTPError(405)
             self._debug_message('routing %(path)r to do_login', locals())
             return self.do_login(**request.params)
         elif path.endswith('do_logout'):
             if request.method != 'POST':
-                response.headers['Allow'] = 'POST'
+                response.headers['Allow'] = "POST"
                 raise cherrypy.HTTPError(405)
             self._debug_message('routing %(path)r to do_logout', locals())
             return self.do_logout(**request.params)
@@ -412,30 +403,28 @@ Message: %(error_msg)s
 
 
 def session_auth(**kwargs):
-    """Session authentication hook.
-
-    Any attribute of the SessionAuth class may be overridden
-    via a keyword arg to this function:
-    """ + '\n' + '\n    '.join(
-        '{!s}: {!s}'.format(k, type(getattr(SessionAuth, k)).__name__)
-        for k in dir(SessionAuth)
-        if not k.startswith('__')
-    )
     sa = SessionAuth()
     for k, v in kwargs.items():
         setattr(sa, k, v)
     return sa.run()
+session_auth.__doc__ = """Session authentication hook.
+
+Any attribute of the SessionAuth class may be overridden via a keyword arg
+to this function:
+
+""" + "\n".join(["%s: %s" % (k, type(getattr(SessionAuth, k)).__name__)
+                 for k in dir(SessionAuth) if not k.startswith("__")])
 
 
 def log_traceback(severity=logging.ERROR, debug=False):
     """Write the last error's traceback to the cherrypy error log."""
-    cherrypy.log('', 'HTTP', severity=severity, traceback=True)
+    cherrypy.log("", "HTTP", severity=severity, traceback=True)
 
 
 def log_request_headers(debug=False):
     """Write request headers to the cherrypy error log."""
-    h = ['  %s: %s' % (k, v) for k, v in cherrypy.serving.request.header_list]
-    cherrypy.log('\nRequest Headers:\n' + '\n'.join(h), 'HTTP')
+    h = ["  %s: %s" % (k, v) for k, v in cherrypy.serving.request.header_list]
+    cherrypy.log('\nRequest Headers:\n' + '\n'.join(h), "HTTP")
 
 
 def log_hooks(debug=False):
@@ -451,13 +440,13 @@ def log_hooks(debug=False):
             points.append(k)
 
     for k in points:
-        msg.append('    %s:' % k)
+        msg.append("    %s:" % k)
         v = request.hooks.get(k, [])
         v.sort()
         for h in v:
-            msg.append('        %r' % h)
+            msg.append("        %r" % h)
     cherrypy.log('\nRequest Hooks for ' + cherrypy.url() +
-                 ':\n' + '\n'.join(msg), 'HTTP')
+                 ':\n' + '\n'.join(msg), "HTTP")
 
 
 def redirect(url='', internal=True, debug=False):
@@ -497,8 +486,8 @@ def trailing_slash(missing=True, extra=False, status=None, debug=False):
 def flatten(debug=False):
     """Wrap response.body in a generator that recursively iterates over body.
 
-    This allows cherrypy.response.body to consist of 'nested
-    generators'; that is, a set of generators that yield generators.
+    This allows cherrypy.response.body to consist of 'nested generators';
+    that is, a set of generators that yield generators.
     """
     def flattener(input):
         numchunks = 0
@@ -542,7 +531,7 @@ def accept(media=None, debug=False):
     """
     if not media:
         return
-    if isinstance(media, text_or_bytes):
+    if isinstance(media, basestring):
         media = [media]
     request = cherrypy.serving.request
 
@@ -558,12 +547,12 @@ def accept(media=None, debug=False):
         # Note that 'ranges' is sorted in order of preference
         for element in ranges:
             if element.qvalue > 0:
-                if element.value == '*/*':
+                if element.value == "*/*":
                     # Matches any type or subtype
                     if debug:
                         cherrypy.log('Match due to */*', 'TOOLS.ACCEPT')
                     return media[0]
-                elif element.value.endswith('/*'):
+                elif element.value.endswith("/*"):
                     # Matches any subtype
                     mtype = element.value[:-1]  # Keep the slash
                     for m in media:
@@ -583,23 +572,36 @@ def accept(media=None, debug=False):
     # No suitable media-range found.
     ah = request.headers.get('Accept')
     if ah is None:
-        msg = 'Your client did not send an Accept header.'
+        msg = "Your client did not send an Accept header."
     else:
-        msg = 'Your client sent this Accept header: %s.' % ah
-    msg += (' But this resource only emits these media types: %s.' %
-            ', '.join(media))
+        msg = "Your client sent this Accept header: %s." % ah
+    msg += (" But this resource only emits these media types: %s." %
+            ", ".join(media))
     raise cherrypy.HTTPError(406, msg)
 
 
 class MonitoredHeaderMap(_httputil.HeaderMap):
 
-    def transform_key(self, key):
-        self.accessed_headers.add(key)
-        return super(MonitoredHeaderMap, self).transform_key(key)
-
     def __init__(self):
         self.accessed_headers = set()
-        super(MonitoredHeaderMap, self).__init__()
+
+    def __getitem__(self, key):
+        self.accessed_headers.add(key)
+        return _httputil.HeaderMap.__getitem__(self, key)
+
+    def __contains__(self, key):
+        self.accessed_headers.add(key)
+        return _httputil.HeaderMap.__contains__(self, key)
+
+    def get(self, key, default=None):
+        self.accessed_headers.add(key)
+        return _httputil.HeaderMap.get(self, key, default=default)
+
+    if hasattr({}, 'has_key'):
+        # Python 2
+        def has_key(self, key):
+            self.accessed_headers.add(key)
+            return _httputil.HeaderMap.has_key(self, key)
 
 
 def autovary(ignore=None, debug=False):
@@ -626,21 +628,3 @@ def autovary(ignore=None, debug=False):
         v.sort()
         resp_h['Vary'] = ', '.join(v)
     request.hooks.attach('before_finalize', set_response_header, 95)
-
-
-def convert_params(exception=ValueError, error=400):
-    """Convert request params based on function annotations.
-
-    This function also processes errors that are subclasses of ``exception``.
-
-    :param BaseException exception: Exception class to catch.
-    :type exception: BaseException
-
-    :param error: The HTTP status code to return to the client on failure.
-    :type error: int
-    """
-    request = cherrypy.serving.request
-    types = request.handler.callable.__annotations__
-    with cherrypy.HTTPError.handle(exception, error):
-        for key in set(types).intersection(request.params):
-            request.params[key] = types[key](request.params[key])
diff --git a/lib/cherrypy/lib/encoding.py b/lib/cherrypy/lib/encoding.py
index 068c88d2..a4c2cbd6 100644
--- a/lib/cherrypy/lib/encoding.py
+++ b/lib/cherrypy/lib/encoding.py
@@ -1,18 +1,13 @@
 import struct
 import time
-import io
 
 import cherrypy
-from cherrypy._cpcompat import text_or_bytes
+from cherrypy._cpcompat import basestring, BytesIO, ntob, set, unicodestr
 from cherrypy.lib import file_generator
 from cherrypy.lib import is_closable_iterator
 from cherrypy.lib import set_vary_header
 
 
-_COMPRESSION_LEVEL_FAST = 1
-_COMPRESSION_LEVEL_BEST = 9
-
-
 def decode(encoding=None, default_encoding='utf-8'):
     """Replace or extend the list of charsets used to decode a request entity.
 
@@ -39,7 +34,6 @@ def decode(encoding=None, default_encoding='utf-8'):
             default_encoding = [default_encoding]
         body.attempt_charsets = body.attempt_charsets + default_encoding
 
-
 class UTF8StreamEncoder:
     def __init__(self, iterator):
         self._iterator = iterator
@@ -52,7 +46,7 @@ class UTF8StreamEncoder:
 
     def __next__(self):
         res = next(self._iterator)
-        if isinstance(res, str):
+        if isinstance(res, unicodestr):
             res = res.encode('utf-8')
         return res
 
@@ -69,7 +63,7 @@ class UTF8StreamEncoder:
 class ResponseEncoder:
 
     default_encoding = 'utf-8'
-    failmsg = 'Response body could not be encoded with %r.'
+    failmsg = "Response body could not be encoded with %r."
     encoding = None
     errors = 'strict'
     text_only = True
@@ -101,7 +95,7 @@ class ResponseEncoder:
 
         def encoder(body):
             for chunk in body:
-                if isinstance(chunk, str):
+                if isinstance(chunk, unicodestr):
                     chunk = chunk.encode(encoding, self.errors)
                 yield chunk
         self.body = encoder(self.body)
@@ -114,7 +108,7 @@ class ResponseEncoder:
         self.attempted_charsets.add(encoding)
         body = []
         for chunk in self.body:
-            if isinstance(chunk, str):
+            if isinstance(chunk, unicodestr):
                 try:
                     chunk = chunk.encode(encoding, self.errors)
                 except (LookupError, UnicodeError):
@@ -134,7 +128,7 @@ class ResponseEncoder:
             encoder = self.encode_stream
         else:
             encoder = self.encode_string
-            if 'Content-Length' in response.headers:
+            if "Content-Length" in response.headers:
                 # Delete Content-Length header so finalize() recalcs it.
                 # Encoded strings may be of different lengths from their
                 # unicode equivalents, and even from each other. For example:
@@ -145,7 +139,7 @@ class ResponseEncoder:
                 # 6
                 # >>> len(t.encode("utf7"))
                 # 8
-                del response.headers['Content-Length']
+                del response.headers["Content-Length"]
 
         # Parse the Accept-Charset request header, and try to provide one
         # of the requested charsets (in order of user preference).
@@ -160,7 +154,7 @@ class ResponseEncoder:
             if self.debug:
                 cherrypy.log('Specified encoding %r' %
                              encoding, 'TOOLS.ENCODE')
-            if (not charsets) or '*' in charsets or encoding in charsets:
+            if (not charsets) or "*" in charsets or encoding in charsets:
                 if self.debug:
                     cherrypy.log('Attempting encoding %r' %
                                  encoding, 'TOOLS.ENCODE')
@@ -180,7 +174,7 @@ class ResponseEncoder:
             else:
                 for element in encs:
                     if element.qvalue > 0:
-                        if element.value == '*':
+                        if element.value == "*":
                             # Matches any charset. Try our default.
                             if self.debug:
                                 cherrypy.log('Attempting default encoding due '
@@ -195,7 +189,7 @@ class ResponseEncoder:
                             if encoder(encoding):
                                 return encoding
 
-                if '*' not in charsets:
+                if "*" not in charsets:
                     # If no "*" is present in an Accept-Charset field, then all
                     # character sets not explicitly mentioned get a quality
                     # value of 0, except for ISO-8859-1, which gets a quality
@@ -211,27 +205,39 @@ class ResponseEncoder:
         # No suitable encoding found.
         ac = request.headers.get('Accept-Charset')
         if ac is None:
-            msg = 'Your client did not send an Accept-Charset header.'
+            msg = "Your client did not send an Accept-Charset header."
         else:
-            msg = 'Your client sent this Accept-Charset header: %s.' % ac
-        _charsets = ', '.join(sorted(self.attempted_charsets))
-        msg += ' We tried these charsets: %s.' % (_charsets,)
+            msg = "Your client sent this Accept-Charset header: %s." % ac
+        _charsets = ", ".join(sorted(self.attempted_charsets))
+        msg += " We tried these charsets: %s." % (_charsets,)
         raise cherrypy.HTTPError(406, msg)
 
     def __call__(self, *args, **kwargs):
         response = cherrypy.serving.response
         self.body = self.oldhandler(*args, **kwargs)
 
-        self.body = prepare_iter(self.body)
+        if isinstance(self.body, basestring):
+            # strings get wrapped in a list because iterating over a single
+            # item list is much faster than iterating over every character
+            # in a long string.
+            if self.body:
+                self.body = [self.body]
+            else:
+                # [''] doesn't evaluate to False, so replace it with [].
+                self.body = []
+        elif hasattr(self.body, 'read'):
+            self.body = file_generator(self.body)
+        elif self.body is None:
+            self.body = []
 
-        ct = response.headers.elements('Content-Type')
+        ct = response.headers.elements("Content-Type")
         if self.debug:
             cherrypy.log('Content-Type: %r' % [str(h)
                          for h in ct], 'TOOLS.ENCODE')
         if ct and self.add_charset:
             ct = ct[0]
             if self.text_only:
-                if ct.value.lower().startswith('text/'):
+                if ct.value.lower().startswith("text/"):
                     if self.debug:
                         cherrypy.log(
                             'Content-Type %s starts with "text/"' % ct,
@@ -255,31 +261,10 @@ class ResponseEncoder:
                 if self.debug:
                     cherrypy.log('Setting Content-Type %s' % ct,
                                  'TOOLS.ENCODE')
-                response.headers['Content-Type'] = str(ct)
+                response.headers["Content-Type"] = str(ct)
 
         return self.body
 
-
-def prepare_iter(value):
-    """Ensure response body is iterable and resolves to False when empty."""
-    if isinstance(value, text_or_bytes):
-        # strings get wrapped in a list because iterating over a single
-        # item list is much faster than iterating over every character
-        # in a long string.
-        if value:
-            value = [value]
-        else:
-            # [''] doesn't evaluate to False, so replace it with [].
-            value = []
-    # Don't use isinstance here; io.IOBase which has an ABC takes
-    # 1000 times as long as, say, isinstance(value, str)
-    elif hasattr(value, 'read'):
-        value = file_generator(value)
-    elif value is None:
-        value = []
-    return value
-
-
 # GZIP
 
 
@@ -287,32 +272,16 @@ def compress(body, compress_level):
     """Compress 'body' at the given compress_level."""
     import zlib
 
-    # See https://tools.ietf.org/html/rfc1952
-    yield b'\x1f\x8b'       # ID1 and ID2: gzip marker
-    yield b'\x08'           # CM: compression method
-    yield b'\x00'           # FLG: none set
+    # See http://www.gzip.org/zlib/rfc-gzip.html
+    yield ntob('\x1f\x8b')       # ID1 and ID2: gzip marker
+    yield ntob('\x08')           # CM: compression method
+    yield ntob('\x00')           # FLG: none set
     # MTIME: 4 bytes
-    yield struct.pack('<L', int(time.time()) & int('FFFFFFFF', 16))
+    yield struct.pack("<L", int(time.time()) & int('FFFFFFFF', 16))
+    yield ntob('\x02')           # XFL: max compression, slowest algo
+    yield ntob('\xff')           # OS: unknown
 
-    # RFC 1952, section 2.3.1:
-    #
-    # XFL (eXtra FLags)
-    #    These flags are available for use by specific compression
-    #    methods.  The "deflate" method (CM = 8) sets these flags as
-    #    follows:
-    #
-    #       XFL = 2 - compressor used maximum compression,
-    #                 slowest algorithm
-    #       XFL = 4 - compressor used fastest algorithm
-    if compress_level == _COMPRESSION_LEVEL_BEST:
-        yield b'\x02'       # XFL: max compression, slowest algo
-    elif compress_level == _COMPRESSION_LEVEL_FAST:
-        yield b'\x04'       # XFL: min compression, fastest algo
-    else:
-        yield b'\x00'       # XFL: compression unset/tradeoff
-    yield b'\xff'           # OS: unknown
-
-    crc = zlib.crc32(b'')
+    crc = zlib.crc32(ntob(""))
     size = 0
     zobj = zlib.compressobj(compress_level,
                             zlib.DEFLATED, -zlib.MAX_WBITS,
@@ -324,15 +293,15 @@ def compress(body, compress_level):
     yield zobj.flush()
 
     # CRC32: 4 bytes
-    yield struct.pack('<L', crc & int('FFFFFFFF', 16))
+    yield struct.pack("<L", crc & int('FFFFFFFF', 16))
     # ISIZE: 4 bytes
-    yield struct.pack('<L', size & int('FFFFFFFF', 16))
+    yield struct.pack("<L", size & int('FFFFFFFF', 16))
 
 
 def decompress(body):
     import gzip
 
-    zbuf = io.BytesIO()
+    zbuf = BytesIO()
     zbuf.write(body)
     zbuf.seek(0)
     zfile = gzip.GzipFile(mode='rb', fileobj=zbuf)
@@ -349,20 +318,21 @@ def gzip(compress_level=5, mime_types=['text/html', 'text/plain'],
     values in the mime_types arg before calling this function.
 
     The provided list of mime-types must be of one of the following form:
-        * `type/subtype`
-        * `type/*`
-        * `type/*+subtype`
+        * type/subtype
+        * type/*
+        * type/*+subtype
 
     No compression is performed if any of the following hold:
         * The client sends no Accept-Encoding request header
         * No 'gzip' or 'x-gzip' is present in the Accept-Encoding header
         * No 'gzip' or 'x-gzip' with a qvalue > 0 is present
         * The 'identity' value is given with a qvalue > 0.
+
     """
     request = cherrypy.serving.request
     response = cherrypy.serving.response
 
-    set_vary_header(response, 'Accept-Encoding')
+    set_vary_header(response, "Accept-Encoding")
 
     if not response.body:
         # Response body is empty (might be a 304 for instance)
@@ -372,7 +342,7 @@ def gzip(compress_level=5, mime_types=['text/html', 'text/plain'],
 
     # If returning cached content (which should already have been gzipped),
     # don't re-zip.
-    if getattr(request, 'cached', False):
+    if getattr(request, "cached", False):
         if debug:
             cherrypy.log('Not gzipping cached response', context='TOOLS.GZIP')
         return
@@ -440,12 +410,12 @@ def gzip(compress_level=5, mime_types=['text/html', 'text/plain'],
             # Return a generator that compresses the page
             response.headers['Content-Encoding'] = 'gzip'
             response.body = compress(response.body, compress_level)
-            if 'Content-Length' in response.headers:
+            if "Content-Length" in response.headers:
                 # Delete Content-Length header so finalize() recalcs it.
-                del response.headers['Content-Length']
+                del response.headers["Content-Length"]
 
             return
 
     if debug:
         cherrypy.log('No acceptable encoding found.', context='GZIP')
-    cherrypy.HTTPError(406, 'identity, gzip').set_response()
+    cherrypy.HTTPError(406, "identity, gzip").set_response()
diff --git a/lib/cherrypy/lib/gctools.py b/lib/cherrypy/lib/gctools.py
index 14d3ba7e..4b616c59 100644
--- a/lib/cherrypy/lib/gctools.py
+++ b/lib/cherrypy/lib/gctools.py
@@ -1,5 +1,6 @@
 import gc
 import inspect
+import os
 import sys
 import time
 
@@ -14,6 +15,7 @@ from cherrypy.process.plugins import SimplePlugin
 
 
 class ReferrerTree(object):
+
     """An object which gathers all referrers of an object to a given depth."""
 
     peek_length = 40
@@ -34,7 +36,7 @@ class ReferrerTree(object):
         refs = gc.get_referrers(obj)
         self.ignore.append(refs)
         if len(refs) > self.maxparents:
-            return [('[%s referrers]' % len(refs), [])]
+            return [("[%s referrers]" % len(refs), [])]
 
         try:
             ascendcode = self.ascend.__code__
@@ -70,20 +72,20 @@ class ReferrerTree(object):
             return self.peek(repr(obj))
 
         if isinstance(obj, dict):
-            return '{' + ', '.join(['%s: %s' % (self._format(k, descend=False),
+            return "{" + ", ".join(["%s: %s" % (self._format(k, descend=False),
                                                 self._format(v, descend=False))
-                                    for k, v in obj.items()]) + '}'
+                                    for k, v in obj.items()]) + "}"
         elif isinstance(obj, list):
-            return '[' + ', '.join([self._format(item, descend=False)
-                                    for item in obj]) + ']'
+            return "[" + ", ".join([self._format(item, descend=False)
+                                    for item in obj]) + "]"
         elif isinstance(obj, tuple):
-            return '(' + ', '.join([self._format(item, descend=False)
-                                    for item in obj]) + ')'
+            return "(" + ", ".join([self._format(item, descend=False)
+                                    for item in obj]) + ")"
 
         r = self.peek(repr(obj))
         if isinstance(obj, (str, int, float)):
             return r
-        return '%s: %s' % (type(obj), r)
+        return "%s: %s" % (type(obj), r)
 
     def format(self, tree):
         """Return a list of string reprs from a nested list of referrers."""
@@ -91,7 +93,7 @@ class ReferrerTree(object):
 
         def ascend(branch, depth=1):
             for parent, grandparents in branch:
-                output.append(('    ' * depth) + self._format(parent))
+                output.append(("    " * depth) + self._format(parent))
                 if grandparents:
                     ascend(grandparents, depth + 1)
         ascend(tree)
@@ -112,50 +114,48 @@ class RequestCounter(SimplePlugin):
 
     def after_request(self):
         self.count -= 1
-
-
 request_counter = RequestCounter(cherrypy.engine)
 request_counter.subscribe()
 
 
 def get_context(obj):
     if isinstance(obj, _cprequest.Request):
-        return 'path=%s;stage=%s' % (obj.path_info, obj.stage)
+        return "path=%s;stage=%s" % (obj.path_info, obj.stage)
     elif isinstance(obj, _cprequest.Response):
-        return 'status=%s' % obj.status
+        return "status=%s" % obj.status
     elif isinstance(obj, _cpwsgi.AppResponse):
-        return 'PATH_INFO=%s' % obj.environ.get('PATH_INFO', '')
-    elif hasattr(obj, 'tb_lineno'):
-        return 'tb_lineno=%s' % obj.tb_lineno
-    return ''
+        return "PATH_INFO=%s" % obj.environ.get('PATH_INFO', '')
+    elif hasattr(obj, "tb_lineno"):
+        return "tb_lineno=%s" % obj.tb_lineno
+    return ""
 
 
 class GCRoot(object):
+
     """A CherryPy page handler for testing reference leaks."""
 
     classes = [
         (_cprequest.Request, 2, 2,
-         'Should be 1 in this request thread and 1 in the main thread.'),
+         "Should be 1 in this request thread and 1 in the main thread."),
         (_cprequest.Response, 2, 2,
-         'Should be 1 in this request thread and 1 in the main thread.'),
+         "Should be 1 in this request thread and 1 in the main thread."),
         (_cpwsgi.AppResponse, 1, 1,
-         'Should be 1 in this request thread only.'),
+         "Should be 1 in this request thread only."),
     ]
 
-    @cherrypy.expose
     def index(self):
-        return 'Hello, world!'
+        return "Hello, world!"
+    index.exposed = True
 
-    @cherrypy.expose
     def stats(self):
-        output = ['Statistics:']
+        output = ["Statistics:"]
 
         for trial in range(10):
             if request_counter.count > 0:
                 break
             time.sleep(0.5)
         else:
-            output.append('\nNot all requests closed properly.')
+            output.append("\nNot all requests closed properly.")
 
         # gc_collect isn't perfectly synchronous, because it may
         # break reference cycles that then take time to fully
@@ -173,11 +173,11 @@ class GCRoot(object):
             for x in gc.garbage:
                 trash[type(x)] = trash.get(type(x), 0) + 1
             if trash:
-                output.insert(0, '\n%s unreachable objects:' % unreachable)
+                output.insert(0, "\n%s unreachable objects:" % unreachable)
                 trash = [(v, k) for k, v in trash.items()]
                 trash.sort()
                 for pair in trash:
-                    output.append('    ' + repr(pair))
+                    output.append("    " + repr(pair))
 
         # Check declared classes to verify uncollected instances.
         # These don't have to be part of a cycle; they can be
@@ -193,24 +193,25 @@ class GCRoot(object):
             if lenobj < minobj or lenobj > maxobj:
                 if minobj == maxobj:
                     output.append(
-                        '\nExpected %s %r references, got %s.' %
+                        "\nExpected %s %r references, got %s." %
                         (minobj, cls, lenobj))
                 else:
                     output.append(
-                        '\nExpected %s to %s %r references, got %s.' %
+                        "\nExpected %s to %s %r references, got %s." %
                         (minobj, maxobj, cls, lenobj))
 
                 for obj in objs:
                     if objgraph is not None:
                         ig = [id(objs), id(inspect.currentframe())]
-                        fname = 'graph_%s_%s.png' % (cls.__name__, id(obj))
+                        fname = "graph_%s_%s.png" % (cls.__name__, id(obj))
                         objgraph.show_backrefs(
                             obj, extra_ignore=ig, max_depth=4, too_many=20,
                             filename=fname, extra_info=get_context)
-                    output.append('\nReferrers for %s (refcount=%s):' %
+                    output.append("\nReferrers for %s (refcount=%s):" %
                                   (repr(obj), sys.getrefcount(obj)))
                     t = ReferrerTree(ignore=[objs], maxdepth=3)
                     tree = t.ascend(obj)
                     output.extend(t.format(tree))
 
-        return '\n'.join(output)
+        return "\n".join(output)
+    stats.exposed = True
diff --git a/lib/cherrypy/lib/headers.py b/lib/cherrypy/lib/headers.py
deleted file mode 100644
index ddbe515b..00000000
--- a/lib/cherrypy/lib/headers.py
+++ /dev/null
@@ -1,39 +0,0 @@
-"""headers."""
-
-
-def _parse_param(s):
-    while s[:1] == ';':
-        s = s[1:]
-        end = s.find(';')
-        while end > 0 and (s.count('"', 0, end) - s.count('\\"', 0, end)) % 2:
-            end = s.find(';', end + 1)
-        if end < 0:
-            end = len(s)
-        f = s[:end]
-        yield f.strip()
-        s = s[end:]
-
-
-def parse_header(line):
-    """Parse a Content-type like header.
-
-    Return the main content-type and a dictionary of options.
-
-    Copied from removed stdlib cgi module. See
-    `cherrypy/cherrypy#2014 (comment)
-    <https://github.com/cherrypy/cherrypy/issues/2014#issuecomment-1883774891>`_
-    for background.
-    """
-    parts = _parse_param(';' + line)
-    key = parts.__next__()
-    pdict = {}
-    for p in parts:
-        i = p.find('=')
-        if i >= 0:
-            name = p[:i].strip().lower()
-            value = p[i + 1:].strip()
-            if len(value) >= 2 and value[0] == value[-1] == '"':
-                value = value[1:-1]
-                value = value.replace('\\\\', '\\').replace('\\"', '"')
-            pdict[name] = value
-    return key, pdict
diff --git a/lib/cherrypy/lib/http.py b/lib/cherrypy/lib/http.py
new file mode 100644
index 00000000..12043ad1
--- /dev/null
+++ b/lib/cherrypy/lib/http.py
@@ -0,0 +1,6 @@
+import warnings
+warnings.warn('cherrypy.lib.http has been deprecated and will be removed '
+              'in CherryPy 3.3 use cherrypy.lib.httputil instead.',
+              DeprecationWarning)
+
+from cherrypy.lib.httputil import *
diff --git a/lib/cherrypy/lib/httpauth.py b/lib/cherrypy/lib/httpauth.py
new file mode 100644
index 00000000..0897ea2a
--- /dev/null
+++ b/lib/cherrypy/lib/httpauth.py
@@ -0,0 +1,371 @@
+"""
+This module defines functions to implement HTTP Digest Authentication
+(:rfc:`2617`).
+This has full compliance with 'Digest' and 'Basic' authentication methods. In
+'Digest' it supports both MD5 and MD5-sess algorithms.
+
+Usage:
+    First use 'doAuth' to request the client authentication for a
+    certain resource. You should send an httplib.UNAUTHORIZED response to the
+    client so he knows he has to authenticate itself.
+
+    Then use 'parseAuthorization' to retrieve the 'auth_map' used in
+    'checkResponse'.
+
+    To use 'checkResponse' you must have already verified the password
+    associated with the 'username' key in 'auth_map' dict. Then you use the
+    'checkResponse' function to verify if the password matches the one sent
+    by the client.
+
+SUPPORTED_ALGORITHM - list of supported 'Digest' algorithms
+SUPPORTED_QOP - list of supported 'Digest' 'qop'.
+"""
+__version__ = 1, 0, 1
+__author__ = "Tiago Cogumbreiro <cogumbreiro@users.sf.net>"
+__credits__ = """
+    Peter van Kampen for its recipe which implement most of Digest
+    authentication:
+    http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/302378
+"""
+
+__license__ = """
+Copyright (c) 2005, Tiago Cogumbreiro <cogumbreiro@users.sf.net>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of Sylvain Hellegouarch nor the names of his
+      contributors may be used to endorse or promote products derived from
+      this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+"""
+
+__all__ = ("digestAuth", "basicAuth", "doAuth", "checkResponse",
+           "parseAuthorization", "SUPPORTED_ALGORITHM", "md5SessionKey",
+           "calculateNonce", "SUPPORTED_QOP")
+
+##########################################################################
+import time
+from cherrypy._cpcompat import base64_decode, ntob, md5
+from cherrypy._cpcompat import parse_http_list, parse_keqv_list
+
+MD5 = "MD5"
+MD5_SESS = "MD5-sess"
+AUTH = "auth"
+AUTH_INT = "auth-int"
+
+SUPPORTED_ALGORITHM = (MD5, MD5_SESS)
+SUPPORTED_QOP = (AUTH, AUTH_INT)
+
+##########################################################################
+# doAuth
+#
+DIGEST_AUTH_ENCODERS = {
+    MD5: lambda val: md5(ntob(val)).hexdigest(),
+    MD5_SESS: lambda val: md5(ntob(val)).hexdigest(),
+    #    SHA: lambda val: sha.new(ntob(val)).hexdigest (),
+}
+
+
+def calculateNonce(realm, algorithm=MD5):
+    """This is an auxaliary function that calculates 'nonce' value. It is used
+    to handle sessions."""
+
+    global SUPPORTED_ALGORITHM, DIGEST_AUTH_ENCODERS
+    assert algorithm in SUPPORTED_ALGORITHM
+
+    try:
+        encoder = DIGEST_AUTH_ENCODERS[algorithm]
+    except KeyError:
+        raise NotImplementedError("The chosen algorithm (%s) does not have "
+                                  "an implementation yet" % algorithm)
+
+    return encoder("%d:%s" % (time.time(), realm))
+
+
+def digestAuth(realm, algorithm=MD5, nonce=None, qop=AUTH):
+    """Challenges the client for a Digest authentication."""
+    global SUPPORTED_ALGORITHM, DIGEST_AUTH_ENCODERS, SUPPORTED_QOP
+    assert algorithm in SUPPORTED_ALGORITHM
+    assert qop in SUPPORTED_QOP
+
+    if nonce is None:
+        nonce = calculateNonce(realm, algorithm)
+
+    return 'Digest realm="%s", nonce="%s", algorithm="%s", qop="%s"' % (
+        realm, nonce, algorithm, qop
+    )
+
+
+def basicAuth(realm):
+    """Challengenes the client for a Basic authentication."""
+    assert '"' not in realm, "Realms cannot contain the \" (quote) character."
+
+    return 'Basic realm="%s"' % realm
+
+
+def doAuth(realm):
+    """'doAuth' function returns the challenge string b giving priority over
+    Digest and fallback to Basic authentication when the browser doesn't
+    support the first one.
+
+    This should be set in the HTTP header under the key 'WWW-Authenticate'."""
+
+    return digestAuth(realm) + " " + basicAuth(realm)
+
+
+##########################################################################
+# Parse authorization parameters
+#
+def _parseDigestAuthorization(auth_params):
+    # Convert the auth params to a dict
+    items = parse_http_list(auth_params)
+    params = parse_keqv_list(items)
+
+    # Now validate the params
+
+    # Check for required parameters
+    required = ["username", "realm", "nonce", "uri", "response"]
+    for k in required:
+        if k not in params:
+            return None
+
+    # If qop is sent then cnonce and nc MUST be present
+    if "qop" in params and not ("cnonce" in params
+                                and "nc" in params):
+        return None
+
+    # If qop is not sent, neither cnonce nor nc can be present
+    if ("cnonce" in params or "nc" in params) and \
+       "qop" not in params:
+        return None
+
+    return params
+
+
+def _parseBasicAuthorization(auth_params):
+    username, password = base64_decode(auth_params).split(":", 1)
+    return {"username": username, "password": password}
+
+AUTH_SCHEMES = {
+    "basic": _parseBasicAuthorization,
+    "digest": _parseDigestAuthorization,
+}
+
+
+def parseAuthorization(credentials):
+    """parseAuthorization will convert the value of the 'Authorization' key in
+    the HTTP header to a map itself. If the parsing fails 'None' is returned.
+    """
+
+    global AUTH_SCHEMES
+
+    auth_scheme, auth_params = credentials.split(" ", 1)
+    auth_scheme = auth_scheme.lower()
+
+    parser = AUTH_SCHEMES[auth_scheme]
+    params = parser(auth_params)
+
+    if params is None:
+        return
+
+    assert "auth_scheme" not in params
+    params["auth_scheme"] = auth_scheme
+    return params
+
+
+##########################################################################
+# Check provided response for a valid password
+#
+def md5SessionKey(params, password):
+    """
+    If the "algorithm" directive's value is "MD5-sess", then A1
+    [the session key] is calculated only once - on the first request by the
+    client following receipt of a WWW-Authenticate challenge from the server.
+
+    This creates a 'session key' for the authentication of subsequent
+    requests and responses which is different for each "authentication
+    session", thus limiting the amount of material hashed with any one
+    key.
+
+    Because the server need only use the hash of the user
+    credentials in order to create the A1 value, this construction could
+    be used in conjunction with a third party authentication service so
+    that the web server would not need the actual password value.  The
+    specification of such a protocol is beyond the scope of this
+    specification.
+"""
+
+    keys = ("username", "realm", "nonce", "cnonce")
+    params_copy = {}
+    for key in keys:
+        params_copy[key] = params[key]
+
+    params_copy["algorithm"] = MD5_SESS
+    return _A1(params_copy, password)
+
+
+def _A1(params, password):
+    algorithm = params.get("algorithm", MD5)
+    H = DIGEST_AUTH_ENCODERS[algorithm]
+
+    if algorithm == MD5:
+        # If the "algorithm" directive's value is "MD5" or is
+        # unspecified, then A1 is:
+        # A1 = unq(username-value) ":" unq(realm-value) ":" passwd
+        return "%s:%s:%s" % (params["username"], params["realm"], password)
+
+    elif algorithm == MD5_SESS:
+
+        # This is A1 if qop is set
+        # A1 = H( unq(username-value) ":" unq(realm-value) ":" passwd )
+        #         ":" unq(nonce-value) ":" unq(cnonce-value)
+        h_a1 = H("%s:%s:%s" % (params["username"], params["realm"], password))
+        return "%s:%s:%s" % (h_a1, params["nonce"], params["cnonce"])
+
+
+def _A2(params, method, kwargs):
+    # If the "qop" directive's value is "auth" or is unspecified, then A2 is:
+    # A2 = Method ":" digest-uri-value
+
+    qop = params.get("qop", "auth")
+    if qop == "auth":
+        return method + ":" + params["uri"]
+    elif qop == "auth-int":
+        # If the "qop" value is "auth-int", then A2 is:
+        # A2 = Method ":" digest-uri-value ":" H(entity-body)
+        entity_body = kwargs.get("entity_body", "")
+        H = kwargs["H"]
+
+        return "%s:%s:%s" % (
+            method,
+            params["uri"],
+            H(entity_body)
+        )
+
+    else:
+        raise NotImplementedError("The 'qop' method is unknown: %s" % qop)
+
+
+def _computeDigestResponse(auth_map, password, method="GET", A1=None,
+                           **kwargs):
+    """
+    Generates a response respecting the algorithm defined in RFC 2617
+    """
+    params = auth_map
+
+    algorithm = params.get("algorithm", MD5)
+
+    H = DIGEST_AUTH_ENCODERS[algorithm]
+    KD = lambda secret, data: H(secret + ":" + data)
+
+    qop = params.get("qop", None)
+
+    H_A2 = H(_A2(params, method, kwargs))
+
+    if algorithm == MD5_SESS and A1 is not None:
+        H_A1 = H(A1)
+    else:
+        H_A1 = H(_A1(params, password))
+
+    if qop in ("auth", "auth-int"):
+        # If the "qop" value is "auth" or "auth-int":
+        # request-digest  = <"> < KD ( H(A1),     unq(nonce-value)
+        #                              ":" nc-value
+        #                              ":" unq(cnonce-value)
+        #                              ":" unq(qop-value)
+        #                              ":" H(A2)
+        #                      ) <">
+        request = "%s:%s:%s:%s:%s" % (
+            params["nonce"],
+            params["nc"],
+            params["cnonce"],
+            params["qop"],
+            H_A2,
+        )
+    elif qop is None:
+        # If the "qop" directive is not present (this construction is
+        # for compatibility with RFC 2069):
+        # request-digest  =
+        #         <"> < KD ( H(A1), unq(nonce-value) ":" H(A2) ) > <">
+        request = "%s:%s" % (params["nonce"], H_A2)
+
+    return KD(H_A1, request)
+
+
+def _checkDigestResponse(auth_map, password, method="GET", A1=None, **kwargs):
+    """This function is used to verify the response given by the client when
+    he tries to authenticate.
+    Optional arguments:
+     entity_body - when 'qop' is set to 'auth-int' you MUST provide the
+                   raw data you are going to send to the client (usually the
+                   HTML page.
+     request_uri - the uri from the request line compared with the 'uri'
+                   directive of the authorization map. They must represent
+                   the same resource (unused at this time).
+    """
+
+    if auth_map['realm'] != kwargs.get('realm', None):
+        return False
+
+    response = _computeDigestResponse(
+        auth_map, password, method, A1, **kwargs)
+
+    return response == auth_map["response"]
+
+
+def _checkBasicResponse(auth_map, password, method='GET', encrypt=None,
+                        **kwargs):
+    # Note that the Basic response doesn't provide the realm value so we cannot
+    # test it
+    pass_through = lambda password, username=None: password
+    encrypt = encrypt or pass_through
+    try:
+        candidate = encrypt(auth_map["password"], auth_map["username"])
+    except TypeError:
+        # if encrypt only takes one parameter, it's the password
+        candidate = encrypt(auth_map["password"])
+    return candidate == password
+
+AUTH_RESPONSES = {
+    "basic": _checkBasicResponse,
+    "digest": _checkDigestResponse,
+}
+
+
+def checkResponse(auth_map, password, method="GET", encrypt=None, **kwargs):
+    """'checkResponse' compares the auth_map with the password and optionally
+    other arguments that each implementation might need.
+
+    If the response is of type 'Basic' then the function has the following
+    signature::
+
+        checkBasicResponse(auth_map, password) -> bool
+
+    If the response is of type 'Digest' then the function has the following
+    signature::
+
+        checkDigestResponse(auth_map, password, method='GET', A1=None) -> bool
+
+    The 'A1' argument is only used in MD5_SESS algorithm based responses.
+    Check md5SessionKey() for more info.
+    """
+    checker = AUTH_RESPONSES[auth_map["auth_scheme"]]
+    return checker(auth_map, password, method=method, encrypt=encrypt,
+                   **kwargs)
diff --git a/lib/cherrypy/lib/httputil.py b/lib/cherrypy/lib/httputil.py
index 7f0a2425..69a18d45 100644
--- a/lib/cherrypy/lib/httputil.py
+++ b/lib/cherrypy/lib/httputil.py
@@ -7,24 +7,13 @@ FuManChu will personally hang you up by your thumbs and submit you
 to a public caning.
 """
 
-import functools
-import email.utils
-import re
-import builtins
 from binascii import b2a_base64
-from email.header import decode_header
-from http.server import BaseHTTPRequestHandler
-from urllib.parse import unquote_plus
-
-import jaraco.collections
-
-import cherrypy
-from cherrypy._cpcompat import ntob, ntou
-from .headers import parse_header
-
+from cherrypy._cpcompat import BaseHTTPRequestHandler, HTTPDate, ntob, ntou
+from cherrypy._cpcompat import basestring, bytestr, iteritems, nativestr
+from cherrypy._cpcompat import reversed, sorted, unicodestr, unquote_qs
 response_codes = BaseHTTPRequestHandler.responses.copy()
 
-# From https://github.com/cherrypy/cherrypy/issues/361
+# From https://bitbucket.org/cherrypy/cherrypy/issue/361
 response_codes[500] = ('Internal Server Error',
                        'The server encountered an unexpected condition '
                        'which prevented it from fulfilling the request.')
@@ -33,34 +22,34 @@ response_codes[503] = ('Service Unavailable',
                        'request due to a temporary overloading or '
                        'maintenance of the server.')
 
-
-HTTPDate = functools.partial(email.utils.formatdate, usegmt=True)
+import re
+import urllib
 
 
 def urljoin(*atoms):
-    r"""Return the given path \*atoms, joined into a single URL.
+    """Return the given path \*atoms, joined into a single URL.
 
     This will correctly join a SCRIPT_NAME and PATH_INFO into the
     original URL, even if either atom is blank.
     """
-    url = '/'.join([x for x in atoms if x])
-    while '//' in url:
-        url = url.replace('//', '/')
+    url = "/".join([x for x in atoms if x])
+    while "//" in url:
+        url = url.replace("//", "/")
     # Special-case the final url of "", and return "/" instead.
-    return url or '/'
+    return url or "/"
 
 
 def urljoin_bytes(*atoms):
-    """Return the given path `*atoms`, joined into a single URL.
+    """Return the given path *atoms, joined into a single URL.
 
     This will correctly join a SCRIPT_NAME and PATH_INFO into the
     original URL, even if either atom is blank.
     """
-    url = b'/'.join([x for x in atoms if x])
-    while b'//' in url:
-        url = url.replace(b'//', b'/')
+    url = ntob("/").join([x for x in atoms if x])
+    while ntob("//") in url:
+        url = url.replace(ntob("//"), ntob("/"))
     # Special-case the final url of "", and return "/" instead.
-    return url or b'/'
+    return url or ntob("/")
 
 
 def protocol_from_http(protocol_str):
@@ -71,10 +60,10 @@ def protocol_from_http(protocol_str):
 def get_ranges(headervalue, content_length):
     """Return a list of (start, stop) indices from a Range header, or None.
 
-    Each (start, stop) tuple will be composed of two ints, which are
-    suitable for use in a slicing operation. That is, the header "Range:
-    bytes=3-6", if applied against a Python string, is requesting
-    resource[3:7]. This function will return the list [(3, 7)].
+    Each (start, stop) tuple will be composed of two ints, which are suitable
+    for use in a slicing operation. That is, the header "Range: bytes=3-6",
+    if applied against a Python string, is requesting resource[3:7]. This
+    function will return the list [(3, 7)].
 
     If this function returns an empty list, you should return HTTP 416.
     """
@@ -83,9 +72,9 @@ def get_ranges(headervalue, content_length):
         return None
 
     result = []
-    bytesunit, byteranges = headervalue.split('=', 1)
-    for brange in byteranges.split(','):
-        start, stop = [x.strip() for x in brange.split('-', 1)]
+    bytesunit, byteranges = headervalue.split("=", 1)
+    for brange in byteranges.split(","):
+        start, stop = [x.strip() for x in brange.split("-", 1)]
         if start:
             if not stop:
                 stop = content_length - 1
@@ -119,14 +108,15 @@ def get_ranges(headervalue, content_length):
             #   If the entity is shorter than the specified suffix-length,
             #   the entire entity-body is used.
             if int(stop) > content_length:
-                result.append((0, content_length))
+              result.append((0, content_length))
             else:
-                result.append((content_length - int(stop), content_length))
+              result.append((content_length - int(stop), content_length))
 
     return result
 
 
 class HeaderElement(object):
+
     """An element (with parameters) from an HTTP header's element list."""
 
     def __init__(self, value, params=None):
@@ -136,14 +126,14 @@ class HeaderElement(object):
         self.params = params
 
     def __cmp__(self, other):
-        return builtins.cmp(self.value, other.value)
+        return cmp(self.value, other.value)
 
     def __lt__(self, other):
         return self.value < other.value
 
     def __str__(self):
-        p = [';%s=%s' % (k, v) for k, v in self.params.items()]
-        return str('%s%s' % (self.value, ''.join(p)))
+        p = [";%s=%s" % (k, v) for k, v in iteritems(self.params)]
+        return str("%s%s" % (self.value, "".join(p)))
 
     def __bytes__(self):
         return ntob(self.__str__())
@@ -151,34 +141,48 @@ class HeaderElement(object):
     def __unicode__(self):
         return ntou(self.__str__())
 
-    @staticmethod
     def parse(elementstr):
         """Transform 'token;key=val' to ('token', {'key': 'val'})."""
-        initial_value, params = parse_header(elementstr)
+        # Split the element into a value and parameters. The 'value' may
+        # be of the form, "token=token", but we don't split that here.
+        atoms = [x.strip() for x in elementstr.split(";") if x.strip()]
+        if not atoms:
+            initial_value = ''
+        else:
+            initial_value = atoms.pop(0).strip()
+        params = {}
+        for atom in atoms:
+            atom = [x.strip() for x in atom.split("=", 1) if x.strip()]
+            key = atom.pop(0)
+            if atom:
+                val = atom[0]
+            else:
+                val = ""
+            params[key] = val
         return initial_value, params
+    parse = staticmethod(parse)
 
-    @classmethod
     def from_str(cls, elementstr):
         """Construct an instance from a string of the form 'token;key=val'."""
         ival, params = cls.parse(elementstr)
         return cls(ival, params)
+    from_str = classmethod(from_str)
 
 
 q_separator = re.compile(r'; *q *=')
 
 
 class AcceptElement(HeaderElement):
+
     """An element (with parameters) from an Accept* header's element list.
 
-    AcceptElement objects are comparable; the more-preferred object will
-    be "less than" the less-preferred object. They are also therefore
-    sortable; if you sort a list of AcceptElement objects, they will be
-    listed in priority order; the most preferred value will be first.
-    Yes, it should have been the other way around, but it's too late to
-    fix now.
+    AcceptElement objects are comparable; the more-preferred object will be
+    "less than" the less-preferred object. They are also therefore sortable;
+    if you sort a list of AcceptElement objects, they will be listed in
+    priority order; the most preferred value will be first. Yes, it should
+    have been the other way around, but it's too late to fix now.
     """
 
-    @classmethod
     def from_str(cls, elementstr):
         qvalue = None
         # The first "q" parameter (if any) separates the initial
@@ -192,32 +196,21 @@ class AcceptElement(HeaderElement):
 
         media_type, params = cls.parse(media_range)
         if qvalue is not None:
-            params['q'] = qvalue
+            params["q"] = qvalue
         return cls(media_type, params)
+    from_str = classmethod(from_str)
 
-    @property
     def qvalue(self):
-        'The qvalue, or priority, of this value.'
-        val = self.params.get('q', '1')
+        val = self.params.get("q", "1")
         if isinstance(val, HeaderElement):
             val = val.value
-        try:
-            return float(val)
-        except ValueError as val_err:
-            """Fail client requests with invalid quality value.
-
-            Ref: https://github.com/cherrypy/cherrypy/issues/1370
-            """
-            raise cherrypy.HTTPError(
-                400,
-                'Malformed HTTP header: `{}`'.
-                format(str(self)),
-            ) from val_err
+        return float(val)
+    qvalue = property(qvalue, doc="The qvalue, or priority, of this value.")
 
     def __cmp__(self, other):
-        diff = builtins.cmp(self.qvalue, other.qvalue)
+        diff = cmp(self.qvalue, other.qvalue)
         if diff == 0:
-            diff = builtins.cmp(str(self), str(other))
+            diff = cmp(str(self), str(other))
         return diff
 
     def __lt__(self, other):
@@ -226,10 +219,7 @@ class AcceptElement(HeaderElement):
         else:
             return self.qvalue < other.qvalue
 
-
 RE_HEADER_SPLIT = re.compile(',(?=(?:[^"]*"[^"]*")*[^"]*$)')
-
-
 def header_elements(fieldname, fieldvalue):
     """Return a sorted HeaderElement list from a comma-separated header string.
     """
@@ -238,7 +228,7 @@ def header_elements(fieldname, fieldvalue):
 
     result = []
     for element in RE_HEADER_SPLIT.split(fieldvalue):
-        if fieldname.startswith('Accept') or fieldname == 'TE':
+        if fieldname.startswith("Accept") or fieldname == 'TE':
             hv = AcceptElement.from_str(element)
         else:
             hv = HeaderElement.from_str(element)
@@ -248,13 +238,14 @@ def header_elements(fieldname, fieldvalue):
 
 
 def decode_TEXT(value):
-    r"""Decode :rfc:`2047` TEXT.
-
-    >>> decode_TEXT("=?utf-8?q?f=C3=BCr?=") == b'f\xfcr'.decode('latin-1')
-    True
-    """
+    r"""Decode :rfc:`2047` TEXT (e.g. "=?utf-8?q?f=C3=BCr?=" -> "f\xfcr")."""
+    try:
+        # Python 3
+        from email.header import decode_header
+    except ImportError:
+        from email.Header import decode_header
     atoms = decode_header(value)
-    decodedvalue = ''
+    decodedvalue = ""
     for atom, charset in atoms:
         if charset is not None:
             atom = atom.decode(charset)
@@ -262,49 +253,41 @@ def decode_TEXT(value):
     return decodedvalue
 
 
-def decode_TEXT_maybe(value):
-    """Decode the text but only if '=?' appears in it."""
-    return decode_TEXT(value) if '=?' in value else value
-
-
 def valid_status(status):
     """Return legal HTTP status Code, Reason-phrase and Message.
 
-    The status arg must be an int, a str that begins with an int
-    or the constant from ``http.client`` stdlib module.
+    The status arg must be an int, or a str that begins with an int.
 
-    If status has no reason-phrase is supplied, a default reason-
-    phrase will be provided.
-
-    >>> import http.client
-    >>> from http.server import BaseHTTPRequestHandler
-    >>> valid_status(http.client.ACCEPTED) == (
-    ...     int(http.client.ACCEPTED),
-    ... ) + BaseHTTPRequestHandler.responses[http.client.ACCEPTED]
-    True
+    If status is an int, or a str and no reason-phrase is supplied,
+    a default reason-phrase will be provided.
     """
 
     if not status:
         status = 200
 
-    code, reason = status, None
-    if isinstance(status, str):
-        code, _, reason = status.partition(' ')
-        reason = reason.strip() or None
+    status = str(status)
+    parts = status.split(" ", 1)
+    if len(parts) == 1:
+        # No reason supplied.
+        code, = parts
+        reason = None
+    else:
+        code, reason = parts
+        reason = reason.strip()
 
     try:
         code = int(code)
-    except (TypeError, ValueError):
-        raise ValueError('Illegal response status from server '
-                         '(%s is non-numeric).' % repr(code))
+    except ValueError:
+        raise ValueError("Illegal response status from server "
+                         "(%s is non-numeric)." % repr(code))
 
     if code < 100 or code > 599:
-        raise ValueError('Illegal response status from server '
-                         '(%s is out of range).' % repr(code))
+        raise ValueError("Illegal response status from server "
+                         "(%s is out of range)." % repr(code))
 
     if code not in response_codes:
         # code is unknown but not illegal
-        default_reason, message = '', ''
+        default_reason, message = "", ""
     else:
         default_reason, message = response_codes[code]
 
@@ -345,15 +328,15 @@ def _parse_qs(qs, keep_blank_values=0, strict_parsing=0, encoding='utf-8'):
         nv = name_value.split('=', 1)
         if len(nv) != 2:
             if strict_parsing:
-                raise ValueError('bad query field: %r' % (name_value,))
+                raise ValueError("bad query field: %r" % (name_value,))
             # Handle case of a control-name with no equal sign
             if keep_blank_values:
                 nv.append('')
             else:
                 continue
         if len(nv[1]) or keep_blank_values:
-            name = unquote_plus(nv[0], encoding, errors='strict')
-            value = unquote_plus(nv[1], encoding, errors='strict')
+            name = unquote_qs(nv[0], encoding)
+            value = unquote_qs(nv[1], encoding)
             if name in d:
                 if not isinstance(d[name], list):
                     d[name] = [d[name]]
@@ -363,7 +346,7 @@ def _parse_qs(qs, keep_blank_values=0, strict_parsing=0, encoding='utf-8'):
     return d
 
 
-image_map_pattern = re.compile(r'[0-9]+,[0-9]+')
+image_map_pattern = re.compile(r"[0-9]+,[0-9]+")
 
 
 def parse_query_string(query_string, keep_blank_values=True, encoding='utf-8'):
@@ -376,25 +359,60 @@ def parse_query_string(query_string, keep_blank_values=True, encoding='utf-8'):
     if image_map_pattern.match(query_string):
         # Server-side image map. Map the coords to 'x' and 'y'
         # (like CGI::Request does).
-        pm = query_string.split(',')
+        pm = query_string.split(",")
         pm = {'x': int(pm[0]), 'y': int(pm[1])}
     else:
         pm = _parse_qs(query_string, keep_blank_values, encoding=encoding)
     return pm
 
 
-class CaseInsensitiveDict(jaraco.collections.KeyTransformingDict):
+class CaseInsensitiveDict(dict):
+
     """A case-insensitive dict subclass.
 
-    Each key is changed on entry to title case.
+    Each key is changed on entry to str(key).title().
     """
 
-    @staticmethod
-    def transform_key(key):
-        if key is None:
-            # TODO(#1830): why?
-            return 'None'
-        return key.title()
+    def __getitem__(self, key):
+        return dict.__getitem__(self, str(key).title())
+
+    def __setitem__(self, key, value):
+        dict.__setitem__(self, str(key).title(), value)
+
+    def __delitem__(self, key):
+        dict.__delitem__(self, str(key).title())
+
+    def __contains__(self, key):
+        return dict.__contains__(self, str(key).title())
+
+    def get(self, key, default=None):
+        return dict.get(self, str(key).title(), default)
+
+    if hasattr({}, 'has_key'):
+        def has_key(self, key):
+            return str(key).title() in self
+
+    def update(self, E):
+        for k in E.keys():
+            self[str(k).title()] = E[k]
+
+    def fromkeys(cls, seq, value=None):
+        newdict = cls()
+        for k in seq:
+            newdict[str(k).title()] = value
+        return newdict
+    fromkeys = classmethod(fromkeys)
+
+    def setdefault(self, key, x=None):
+        key = str(key).title()
+        try:
+            return self[key]
+        except KeyError:
+            self[key] = x
+            return x
+
+    def pop(self, key, default):
+        return dict.pop(self, str(key).title(), default)
 
 
 #   TEXT = <any OCTET except CTLs, but including LWS>
@@ -402,16 +420,17 @@ class CaseInsensitiveDict(jaraco.collections.KeyTransformingDict):
 # A CRLF is allowed in the definition of TEXT only as part of a header
 # field continuation. It is expected that the folding LWS will be
 # replaced with a single SP before interpretation of the TEXT value."
-if str == bytes:
-    header_translate_table = ''.join([chr(i) for i in range(256)])
+if nativestr == bytestr:
+    header_translate_table = ''.join([chr(i) for i in xrange(256)])
     header_translate_deletechars = ''.join(
-        [chr(i) for i in range(32)]) + chr(127)
+        [chr(i) for i in xrange(32)]) + chr(127)
 else:
     header_translate_table = None
     header_translate_deletechars = bytes(range(32)) + bytes([127])
 
 
 class HeaderMap(CaseInsensitiveDict):
+
     """A dict subclass for HTTP request and response headers.
 
     Each key is changed on entry to str(key).title(). This allows headers
@@ -421,7 +440,7 @@ class HeaderMap(CaseInsensitiveDict):
     """
 
     protocol = (1, 1)
-    encodings = ['ISO-8859-1']
+    encodings = ["ISO-8859-1"]
 
     # Someday, when http-bis is done, this will probably get dropped
     # since few servers, clients, or intermediaries do it. But until then,
@@ -432,7 +451,9 @@ class HeaderMap(CaseInsensitiveDict):
 
     def elements(self, key):
         """Return a sorted list of HeaderElements for the given header."""
-        return header_elements(self.transform_key(key), self.get(key))
+        key = str(key).title()
+        value = self.get(key)
+        return header_elements(key, value)
 
     def values(self, key):
         """Return a sorted list of HeaderElement.value for the given header."""
@@ -442,29 +463,31 @@ class HeaderMap(CaseInsensitiveDict):
         """Transform self into a list of (name, value) tuples."""
         return list(self.encode_header_items(self.items()))
 
-    @classmethod
     def encode_header_items(cls, header_items):
         """
         Prepare the sequence of name, value tuples into a form suitable for
         transmitting on the wire for HTTP.
         """
         for k, v in header_items:
-            if not isinstance(v, str) and not isinstance(v, bytes):
+            if isinstance(k, unicodestr):
+                k = cls.encode(k)
+
+            if not isinstance(v, basestring):
                 v = str(v)
 
-            yield tuple(map(cls.encode_header_item, (k, v)))
+            if isinstance(v, unicodestr):
+                v = cls.encode(v)
 
-    @classmethod
-    def encode_header_item(cls, item):
-        if isinstance(item, str):
-            item = cls.encode(item)
+            # See header_translate_* constants above.
+            # Replace only if you really know what you're doing.
+            k = k.translate(header_translate_table,
+                            header_translate_deletechars)
+            v = v.translate(header_translate_table,
+                            header_translate_deletechars)
 
-        # See header_translate_* constants above.
-        # Replace only if you really know what you're doing.
-        return item.translate(
-            header_translate_table, header_translate_deletechars)
+            yield (k, v)
+    encode_header_items = classmethod(encode_header_items)
 
-    @classmethod
     def encode(cls, v):
         """Return the given header name or value, encoded for HTTP output."""
         for enc in cls.encodings:
@@ -480,14 +503,16 @@ class HeaderMap(CaseInsensitiveDict):
             # because we never want to fold lines--folding has
             # been deprecated by the HTTP working group.
             v = b2a_base64(v.encode('utf-8'))
-            return (b'=?utf-8?b?' + v.strip(b'\n') + b'?=')
+            return (ntob('=?utf-8?b?') + v.strip(ntob('\n')) + ntob('?='))
 
-        raise ValueError('Could not encode header part %r using '
-                         'any of the encodings %r.' %
+        raise ValueError("Could not encode header part %r using "
+                         "any of the encodings %r." %
                          (v, cls.encodings))
+    encode = classmethod(encode)
 
 
 class Host(object):
+
     """An internet address.
 
     name
@@ -496,9 +521,9 @@ class Host(object):
 
     """
 
-    ip = '0.0.0.0'
+    ip = "0.0.0.0"
     port = 80
-    name = 'unknown.tld'
+    name = "unknown.tld"
 
     def __init__(self, ip, port, name=None):
         self.ip = ip
@@ -508,34 +533,4 @@ class Host(object):
         self.name = name
 
     def __repr__(self):
-        return 'httputil.Host(%r, %r, %r)' % (self.ip, self.port, self.name)
-
-
-class SanitizedHost(str):
-    r"""
-    Wraps a raw host header received from the network in
-    a sanitized version that elides dangerous characters.
-
-    >>> SanitizedHost('foo\nbar')
-    'foobar'
-    >>> SanitizedHost('foo\nbar').raw
-    'foo\nbar'
-
-    A SanitizedInstance is only returned if sanitization was performed.
-
-    >>> isinstance(SanitizedHost('foobar'), SanitizedHost)
-    False
-    """
-    dangerous = re.compile(r'[\n\r]')
-
-    def __new__(cls, raw):
-        sanitized = cls._sanitize(raw)
-        if sanitized == raw:
-            return raw
-        instance = super().__new__(cls, sanitized)
-        instance.raw = raw
-        return instance
-
-    @classmethod
-    def _sanitize(cls, raw):
-        return cls.dangerous.sub('', raw)
+        return "httputil.Host(%r, %r, %r)" % (self.ip, self.port, self.name)
diff --git a/lib/cherrypy/lib/jsontools.py b/lib/cherrypy/lib/jsontools.py
index 9ca75a8f..90b3ff8a 100644
--- a/lib/cherrypy/lib/jsontools.py
+++ b/lib/cherrypy/lib/jsontools.py
@@ -1,16 +1,17 @@
 import cherrypy
-from cherrypy import _json as json
-from cherrypy._cpcompat import text_or_bytes, ntou
+from cherrypy._cpcompat import basestring, ntou, json_encode, json_decode
 
 
 def json_processor(entity):
     """Read application/json data into request.json."""
-    if not entity.headers.get(ntou('Content-Length'), ntou('')):
+    if not entity.headers.get(ntou("Content-Length"), ntou("")):
         raise cherrypy.HTTPError(411)
 
     body = entity.fp.read()
-    with cherrypy.HTTPError.handle(ValueError, 400, 'Invalid JSON document'):
-        cherrypy.serving.request.json = json.decode(body.decode('utf-8'))
+    try:
+        cherrypy.serving.request.json = json_decode(body.decode('utf-8'))
+    except ValueError:
+        raise cherrypy.HTTPError(400, 'Invalid JSON document')
 
 
 def json_in(content_type=[ntou('application/json'), ntou('text/javascript')],
@@ -35,9 +36,12 @@ def json_in(content_type=[ntou('application/json'), ntou('text/javascript')],
     request header, or it will raise "411 Length Required". If for any
     other reason the request entity cannot be deserialized from JSON,
     it will raise "400 Bad Request: Invalid JSON document".
+
+    You must be using Python 2.6 or greater, or have the 'simplejson'
+    package importable; otherwise, ValueError is raised during processing.
     """
     request = cherrypy.serving.request
-    if isinstance(content_type, text_or_bytes):
+    if isinstance(content_type, basestring):
         content_type = [content_type]
 
     if force:
@@ -57,7 +61,7 @@ def json_in(content_type=[ntou('application/json'), ntou('text/javascript')],
 
 def json_handler(*args, **kwargs):
     value = cherrypy.serving.request._json_inner_handler(*args, **kwargs)
-    return json.encode(value)
+    return json_encode(value)
 
 
 def json_out(content_type='application/json', debug=False,
@@ -70,6 +74,9 @@ def json_out(content_type='application/json', debug=False,
     Provide your own handler to use a custom encoder.  For example
     cherrypy.config['tools.json_out.handler'] = <function>, or
     @json_out(handler=function).
+
+    You must be using Python 2.6 or greater, or have the 'simplejson'
+    package importable; otherwise, ValueError is raised during processing.
     """
     request = cherrypy.serving.request
     # request.handler may be set to None by e.g. the caching tool
diff --git a/lib/cherrypy/lib/lockfile.py b/lib/cherrypy/lib/lockfile.py
new file mode 100644
index 00000000..4cf7b1b6
--- /dev/null
+++ b/lib/cherrypy/lib/lockfile.py
@@ -0,0 +1,147 @@
+"""
+Platform-independent file locking. Inspired by and modeled after zc.lockfile.
+"""
+
+import os
+
+try:
+    import msvcrt
+except ImportError:
+    pass
+
+try:
+    import fcntl
+except ImportError:
+    pass
+
+
+class LockError(Exception):
+
+    "Could not obtain a lock"
+
+    msg = "Unable to lock %r"
+
+    def __init__(self, path):
+        super(LockError, self).__init__(self.msg % path)
+
+
+class UnlockError(LockError):
+
+    "Could not release a lock"
+
+    msg = "Unable to unlock %r"
+
+
+# first, a default, naive locking implementation
+class LockFile(object):
+
+    """
+    A default, naive locking implementation. Always fails if the file
+    already exists.
+    """
+
+    def __init__(self, path):
+        self.path = path
+        try:
+            fd = os.open(path, os.O_CREAT | os.O_WRONLY | os.O_EXCL)
+        except OSError:
+            raise LockError(self.path)
+        os.close(fd)
+
+    def release(self):
+        os.remove(self.path)
+
+    def remove(self):
+        pass
+
+
+class SystemLockFile(object):
+
+    """
+    An abstract base class for platform-specific locking.
+    """
+
+    def __init__(self, path):
+        self.path = path
+
+        try:
+            # Open lockfile for writing without truncation:
+            self.fp = open(path, 'r+')
+        except IOError:
+            # If the file doesn't exist, IOError is raised; Use a+ instead.
+            # Note that there may be a race here. Multiple processes
+            # could fail on the r+ open and open the file a+, but only
+            # one will get the the lock and write a pid.
+            self.fp = open(path, 'a+')
+
+        try:
+            self._lock_file()
+        except:
+            self.fp.seek(1)
+            self.fp.close()
+            del self.fp
+            raise
+
+        self.fp.write(" %s\n" % os.getpid())
+        self.fp.truncate()
+        self.fp.flush()
+
+    def release(self):
+        if not hasattr(self, 'fp'):
+            return
+        self._unlock_file()
+        self.fp.close()
+        del self.fp
+
+    def remove(self):
+        """
+        Attempt to remove the file
+        """
+        try:
+            os.remove(self.path)
+        except:
+            pass
+
+    #@abc.abstract_method
+    # def _lock_file(self):
+    #    """Attempt to obtain the lock on self.fp. Raise LockError if not
+    #    acquired."""
+
+    def _unlock_file(self):
+        """Attempt to obtain the lock on self.fp. Raise UnlockError if not
+        released."""
+
+
+class WindowsLockFile(SystemLockFile):
+
+    def _lock_file(self):
+        # Lock just the first byte
+        try:
+            msvcrt.locking(self.fp.fileno(), msvcrt.LK_NBLCK, 1)
+        except IOError:
+            raise LockError(self.fp.name)
+
+    def _unlock_file(self):
+        try:
+            self.fp.seek(0)
+            msvcrt.locking(self.fp.fileno(), msvcrt.LK_UNLCK, 1)
+        except IOError:
+            raise UnlockError(self.fp.name)
+
+if 'msvcrt' in globals():
+    LockFile = WindowsLockFile
+
+
+class UnixLockFile(SystemLockFile):
+
+    def _lock_file(self):
+        flags = fcntl.LOCK_EX | fcntl.LOCK_NB
+        try:
+            fcntl.flock(self.fp.fileno(), flags)
+        except IOError:
+            raise LockError(self.fp.name)
+
+    # no need to implement _unlock_file, it will be unlocked on close()
+
+if 'fcntl' in globals():
+    LockFile = UnixLockFile
diff --git a/lib/cherrypy/lib/locking.py b/lib/cherrypy/lib/locking.py
index ea76450a..72dda9b3 100644
--- a/lib/cherrypy/lib/locking.py
+++ b/lib/cherrypy/lib/locking.py
@@ -7,30 +7,32 @@ class NeverExpires(object):
 
 
 class Timer(object):
-    """A simple timer that will indicate when an expiration time has passed."""
+    """
+    A simple timer that will indicate when an expiration time has passed.
+    """
     def __init__(self, expiration):
-        'Create a timer that expires at `expiration` (UTC datetime)'
+        "Create a timer that expires at `expiration` (UTC datetime)"
         self.expiration = expiration
 
     @classmethod
     def after(cls, elapsed):
-        """Return a timer that will expire after `elapsed` passes."""
-        return cls(
-            datetime.datetime.now(datetime.timezone.utc) + elapsed,
-        )
+        """
+        Return a timer that will expire after `elapsed` passes.
+        """
+        return cls(datetime.datetime.utcnow() + elapsed)
 
     def expired(self):
-        return datetime.datetime.now(
-            datetime.timezone.utc,
-        ) >= self.expiration
+        return datetime.datetime.utcnow() >= self.expiration
 
 
 class LockTimeout(Exception):
-    'An exception when a lock could not be acquired before a timeout period'
+    "An exception when a lock could not be acquired before a timeout period"
 
 
 class LockChecker(object):
-    """Keep track of the time and detect if a timeout has expired."""
+    """
+    Keep track of the time and detect if a timeout has expired
+    """
     def __init__(self, session_id, timeout):
         self.session_id = session_id
         if timeout:
@@ -41,5 +43,5 @@ class LockChecker(object):
     def expired(self):
         if self.timer.expired():
             raise LockTimeout(
-                'Timeout acquiring lock for %(session_id)s' % vars(self))
+                "Timeout acquiring lock for %(session_id)s" % vars(self))
         return False
diff --git a/lib/cherrypy/lib/profiler.py b/lib/cherrypy/lib/profiler.py
index 9cda41d8..5dac386e 100644
--- a/lib/cherrypy/lib/profiler.py
+++ b/lib/cherrypy/lib/profiler.py
@@ -8,11 +8,11 @@ You can profile any of your pages as follows::
     from cherrypy.lib import profiler
 
     class Root:
-        p = profiler.Profiler("/path/to/profile/dir")
+        p = profile.Profiler("/path/to/profile/dir")
 
-        @cherrypy.expose
         def index(self):
             self.p.run(self._index)
+        index.exposed = True
 
         def _index(self):
             return "Hello, world!"
@@ -30,40 +30,32 @@ to get a quick sanity-check on overall CP performance. Use the
 ``--profile`` flag when running the test suite. Then, use the ``serve()``
 function to browse the results in a web browser. If you run this
 module from the command line, it will call ``serve()`` for you.
+
 """
 
-import io
-import os
-import os.path
-import sys
-import warnings
-
-import cherrypy
 
+def new_func_strip_path(func_name):
+    """Make profiler output more readable by adding `__init__` modules' parents
+    """
+    filename, line, name = func_name
+    if filename.endswith("__init__.py"):
+        return os.path.basename(filename[:-12]) + filename[-12:], line, name
+    return os.path.basename(filename), line, name
 
 try:
     import profile
     import pstats
-
-    def new_func_strip_path(func_name):
-        """Add ``__init__`` modules' parents.
-
-        This makes the profiler output more readable.
-        """
-        filename, line, name = func_name
-        if filename.endswith('__init__.py'):
-            return (
-                os.path.basename(filename[:-12]) + filename[-12:],
-                line,
-                name,
-            )
-        return os.path.basename(filename), line, name
-
     pstats.func_strip_path = new_func_strip_path
 except ImportError:
     profile = None
     pstats = None
 
+import os
+import os.path
+import sys
+import warnings
+
+from cherrypy._cpcompat import StringIO
 
 _count = 0
 
@@ -72,7 +64,7 @@ class Profiler(object):
 
     def __init__(self, path=None):
         if not path:
-            path = os.path.join(os.path.dirname(__file__), 'profile')
+            path = os.path.join(os.path.dirname(__file__), "profile")
         self.path = path
         if not os.path.exists(path):
             os.makedirs(path)
@@ -81,7 +73,7 @@ class Profiler(object):
         """Dump profile data into self.path."""
         global _count
         c = _count = _count + 1
-        path = os.path.join(self.path, 'cp_%04d.prof' % c)
+        path = os.path.join(self.path, "cp_%04d.prof" % c)
         prof = profile.Profile()
         result = prof.runcall(func, *args, **params)
         prof.dump_stats(path)
@@ -91,12 +83,12 @@ class Profiler(object):
         """:rtype: list of available profiles.
         """
         return [f for f in os.listdir(self.path)
-                if f.startswith('cp_') and f.endswith('.prof')]
+                if f.startswith("cp_") and f.endswith(".prof")]
 
     def stats(self, filename, sortby='cumulative'):
         """:rtype stats(index): output of print_stats() for the given profile.
         """
-        sio = io.StringIO()
+        sio = StringIO()
         if sys.version_info >= (2, 5):
             s = pstats.Stats(os.path.join(self.path, filename), stream=sio)
             s.strip_dirs()
@@ -118,7 +110,6 @@ class Profiler(object):
         sio.close()
         return response
 
-    @cherrypy.expose
     def index(self):
         return """<html>
         <head><title>CherryPy profile data</title></head>
@@ -128,21 +119,23 @@ class Profiler(object):
         </frameset>
         </html>
         """
+    index.exposed = True
 
-    @cherrypy.expose
     def menu(self):
-        yield '<h2>Profiling runs</h2>'
-        yield '<p>Click on one of the runs below to see profiling data.</p>'
+        yield "<h2>Profiling runs</h2>"
+        yield "<p>Click on one of the runs below to see profiling data.</p>"
         runs = self.statfiles()
         runs.sort()
         for i in runs:
             yield "<a href='report?filename=%s' target='main'>%s</a><br />" % (
                 i, i)
+    menu.exposed = True
 
-    @cherrypy.expose
     def report(self, filename):
+        import cherrypy
         cherrypy.response.headers['Content-Type'] = 'text/plain'
         return self.stats(filename)
+    report.exposed = True
 
 
 class ProfileAggregator(Profiler):
@@ -154,7 +147,7 @@ class ProfileAggregator(Profiler):
         self.profiler = profile.Profile()
 
     def run(self, func, *args, **params):
-        path = os.path.join(self.path, 'cp_%04d.prof' % self.count)
+        path = os.path.join(self.path, "cp_%04d.prof" % self.count)
         result = self.profiler.runcall(func, *args, **params)
         self.profiler.dump_stats(path)
         return result
@@ -179,11 +172,11 @@ class make_app:
 
         """
         if profile is None or pstats is None:
-            msg = ('Your installation of Python does not have a profile '
+            msg = ("Your installation of Python does not have a profile "
                    "module. If you're on Debian, try "
-                   '`sudo apt-get install python-profiler`. '
-                   'See http://www.cherrypy.org/wiki/ProfilingOnDebian '
-                   'for details.')
+                   "`sudo apt-get install python-profiler`. "
+                   "See http://www.cherrypy.org/wiki/ProfilingOnDebian "
+                   "for details.")
             warnings.warn(msg)
 
         self.nextapp = nextapp
@@ -204,19 +197,20 @@ class make_app:
 
 def serve(path=None, port=8080):
     if profile is None or pstats is None:
-        msg = ('Your installation of Python does not have a profile module. '
+        msg = ("Your installation of Python does not have a profile module. "
                "If you're on Debian, try "
-               '`sudo apt-get install python-profiler`. '
-               'See http://www.cherrypy.org/wiki/ProfilingOnDebian '
-               'for details.')
+               "`sudo apt-get install python-profiler`. "
+               "See http://www.cherrypy.org/wiki/ProfilingOnDebian "
+               "for details.")
         warnings.warn(msg)
 
+    import cherrypy
     cherrypy.config.update({'server.socket_port': int(port),
                             'server.thread_pool': 10,
-                            'environment': 'production',
+                            'environment': "production",
                             })
     cherrypy.quickstart(Profiler(path))
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     serve(*tuple(sys.argv[1:]))
diff --git a/lib/cherrypy/lib/reprconf.py b/lib/cherrypy/lib/reprconf.py
index 53261094..6e70b5ec 100644
--- a/lib/cherrypy/lib/reprconf.py
+++ b/lib/cherrypy/lib/reprconf.py
@@ -18,26 +18,55 @@ by adding a named handler to Config.namespaces. The name can be any string,
 and the handler must be either a callable or a context manager.
 """
 
-import builtins
-import configparser
-import operator
+try:
+    # Python 3.0+
+    from configparser import ConfigParser
+except ImportError:
+    from ConfigParser import ConfigParser
+
+try:
+    set
+except NameError:
+    from sets import Set as set
+
+try:
+    basestring
+except NameError:
+    basestring = str
+
+try:
+    # Python 3
+    import builtins
+except ImportError:
+    # Python 2
+    import __builtin__ as builtins
+
+import operator as _operator
 import sys
 
-from cherrypy._cpcompat import text_or_bytes
+
+def as_dict(config):
+    """Return a dict from 'config' whether it is a dict, file, or filename."""
+    if isinstance(config, basestring):
+        config = Parser().dict_from_file(config)
+    elif hasattr(config, 'read'):
+        config = Parser().dict_from_file(config)
+    return config
 
 
 class NamespaceSet(dict):
+
     """A dict of config namespace names and handlers.
 
-    Each config entry should begin with a namespace name; the
-    corresponding namespace handler will be called once for each config
-    entry in that namespace, and will be passed two arguments: the
-    config key (with the namespace removed) and the config value.
+    Each config entry should begin with a namespace name; the corresponding
+    namespace handler will be called once for each config entry in that
+    namespace, and will be passed two arguments: the config key (with the
+    namespace removed) and the config value.
 
     Namespace handlers may be any Python callable; they may also be
-    context managers, in which case their __enter__ method should return
-    a callable to be used as the handler. See cherrypy.tools (the
-    Toolbox class) for an example.
+    Python 2.5-style 'context managers', in which case their __enter__
+    method should return a callable to be used as the handler.
+    See cherrypy.tools (the Toolbox class) for an example.
     """
 
     def __call__(self, config):
@@ -47,27 +76,26 @@ class NamespaceSet(dict):
             A flat dict, where keys use dots to separate
             namespaces, and values are arbitrary.
 
-        The first name in each config key is used to look up the
-        corresponding namespace handler. For example, a config entry of
-        {'tools.gzip.on': v} will call the 'tools' namespace handler
-        with the args: ('gzip.on', v)
+        The first name in each config key is used to look up the corresponding
+        namespace handler. For example, a config entry of {'tools.gzip.on': v}
+        will call the 'tools' namespace handler with the args: ('gzip.on', v)
         """
         # Separate the given config into namespaces
         ns_confs = {}
         for k in config:
-            if '.' in k:
-                ns, name = k.split('.', 1)
+            if "." in k:
+                ns, name = k.split(".", 1)
                 bucket = ns_confs.setdefault(ns, {})
                 bucket[name] = config[k]
 
         # I chose __enter__ and __exit__ so someday this could be
-        # rewritten using 'with' statement:
-        # for ns, handler in self.items():
+        # rewritten using Python 2.5's 'with' statement:
+        # for ns, handler in self.iteritems():
         #     with handler as callable:
-        #         for k, v in ns_confs.get(ns, {}).items():
+        #         for k, v in ns_confs.get(ns, {}).iteritems():
         #             callable(k, v)
         for ns, handler in self.items():
-            exit = getattr(handler, '__exit__', None)
+            exit = getattr(handler, "__exit__", None)
             if exit:
                 callable = handler.__enter__()
                 no_exc = True
@@ -75,7 +103,7 @@ class NamespaceSet(dict):
                     try:
                         for k, v in ns_confs.get(ns, {}).items():
                             callable(k, v)
-                    except Exception:
+                    except:
                         # The exceptional case is handled here
                         no_exc = False
                         if exit is None:
@@ -92,7 +120,7 @@ class NamespaceSet(dict):
                     handler(k, v)
 
     def __repr__(self):
-        return '%s.%s(%s)' % (self.__module__, self.__class__.__name__,
+        return "%s.%s(%s)" % (self.__module__, self.__class__.__name__,
                               dict.__repr__(self))
 
     def __copy__(self):
@@ -103,6 +131,7 @@ class NamespaceSet(dict):
 
 
 class Config(dict):
+
     """A dict-like set of configuration data, with defaults and namespaces.
 
     May take a file, filename, or dict.
@@ -125,8 +154,16 @@ class Config(dict):
         dict.update(self, self.defaults)
 
     def update(self, config):
-        """Update self from a dict, file, or filename."""
-        self._apply(Parser.load(config))
+        """Update self from a dict, file or filename."""
+        if isinstance(config, basestring):
+            # Filename
+            config = Parser().dict_from_file(config)
+        elif hasattr(config, 'read'):
+            # Open file object
+            config = Parser().dict_from_file(config)
+        else:
+            config = config.copy()
+        self._apply(config)
 
     def _apply(self, config):
         """Update self from a dict."""
@@ -145,7 +182,7 @@ class Config(dict):
         self.namespaces({k: v})
 
 
-class Parser(configparser.ConfigParser):
+class Parser(ConfigParser):
 
     """Sub-class of ConfigParser that keeps the case of options and that
     raises an exception if the file cannot be read.
@@ -155,18 +192,21 @@ class Parser(configparser.ConfigParser):
         return optionstr
 
     def read(self, filenames):
-        if isinstance(filenames, text_or_bytes):
+        if isinstance(filenames, basestring):
             filenames = [filenames]
         for filename in filenames:
             # try:
             #     fp = open(filename)
             # except IOError:
             #     continue
-            with open(filename) as fp:
+            fp = open(filename)
+            try:
                 self._read(fp, filename)
+            finally:
+                fp.close()
 
     def as_dict(self, raw=False, vars=None):
-        """Convert an INI file to a dictionary."""
+        """Convert an INI file to a dictionary"""
         # Load INI file into a dict
         result = {}
         for section in self.sections():
@@ -178,8 +218,8 @@ class Parser(configparser.ConfigParser):
                     value = unrepr(value)
                 except Exception:
                     x = sys.exc_info()[1]
-                    msg = ('Config error in section: %r, option: %r, '
-                           'value: %r. Config values must be valid Python.' %
+                    msg = ("Config error in section: %r, option: %r, "
+                           "value: %r. Config values must be valid Python." %
                            (section, option, value))
                     raise ValueError(msg, x.__class__.__name__, x.args)
                 result[section][option] = value
@@ -187,32 +227,135 @@ class Parser(configparser.ConfigParser):
 
     def dict_from_file(self, file):
         if hasattr(file, 'read'):
-            self.read_file(file)
+            self.readfp(file)
         else:
             self.read(file)
         return self.as_dict()
 
-    @classmethod
-    def load(self, input):
-        """Resolve 'input' to dict from a dict, file, or filename."""
-        is_file = (
-            # Filename
-            isinstance(input, text_or_bytes)
-            # Open file object
-            or hasattr(input, 'read')
-        )
-        return Parser().dict_from_file(input) if is_file else input.copy()
-
 
 # public domain "unrepr" implementation, found on the web and then improved.
 
 
-class _Builder:
+class _Builder2:
 
     def build(self, o):
         m = getattr(self, 'build_' + o.__class__.__name__, None)
         if m is None:
-            raise TypeError('unrepr does not recognize %s' %
+            raise TypeError("unrepr does not recognize %s" %
+                            repr(o.__class__.__name__))
+        return m(o)
+
+    def astnode(self, s):
+        """Return a Python2 ast Node compiled from a string."""
+        try:
+            import compiler
+        except ImportError:
+            # Fallback to eval when compiler package is not available,
+            # e.g. IronPython 1.0.
+            return eval(s)
+
+        p = compiler.parse("__tempvalue__ = " + s)
+        return p.getChildren()[1].getChildren()[0].getChildren()[1]
+
+    def build_Subscript(self, o):
+        expr, flags, subs = o.getChildren()
+        expr = self.build(expr)
+        subs = self.build(subs)
+        return expr[subs]
+
+    def build_CallFunc(self, o):
+        children = o.getChildren()
+        # Build callee from first child
+        callee = self.build(children[0])
+        # Build args and kwargs from remaining children
+        args = []
+        kwargs = {}
+        for child in children[1:]:
+            class_name = child.__class__.__name__
+            # None is ignored
+            if class_name == 'NoneType':
+                continue
+            # Keywords become kwargs
+            if class_name == 'Keyword':
+                kwargs.update(self.build(child))
+            # Everything else becomes args
+            else :
+                args.append(self.build(child))
+        return callee(*args, **kwargs)
+
+    def build_Keyword(self, o):
+        key, value_obj = o.getChildren()
+        value = self.build(value_obj)
+        kw_dict = {key: value}
+        return kw_dict 
+
+    def build_List(self, o):
+        return map(self.build, o.getChildren())
+
+    def build_Const(self, o):
+        return o.value
+
+    def build_Dict(self, o):
+        d = {}
+        i = iter(map(self.build, o.getChildren()))
+        for el in i:
+            d[el] = i.next()
+        return d
+
+    def build_Tuple(self, o):
+        return tuple(self.build_List(o))
+
+    def build_Name(self, o):
+        name = o.name
+        if name == 'None':
+            return None
+        if name == 'True':
+            return True
+        if name == 'False':
+            return False
+
+        # See if the Name is a package or module. If it is, import it.
+        try:
+            return modules(name)
+        except ImportError:
+            pass
+
+        # See if the Name is in builtins.
+        try:
+            return getattr(builtins, name)
+        except AttributeError:
+            pass
+
+        raise TypeError("unrepr could not resolve the name %s" % repr(name))
+
+    def build_Add(self, o):
+        left, right = map(self.build, o.getChildren())
+        return left + right
+
+    def build_Mul(self, o):
+        left, right = map(self.build, o.getChildren())
+        return left * right
+
+    def build_Getattr(self, o):
+        parent = self.build(o.expr)
+        return getattr(parent, o.attrname)
+
+    def build_NoneType(self, o):
+        return None
+
+    def build_UnarySub(self, o):
+        return -self.build(o.getChildren()[0])
+
+    def build_UnaryAdd(self, o):
+        return self.build(o.getChildren()[0])
+
+
+class _Builder3:
+
+    def build(self, o):
+        m = getattr(self, 'build_' + o.__class__.__name__, None)
+        if m is None:
+            raise TypeError("unrepr does not recognize %s" %
                             repr(o.__class__.__name__))
         return m(o)
 
@@ -225,7 +368,7 @@ class _Builder:
             # e.g. IronPython 1.0.
             return eval(s)
 
-        p = ast.parse('__tempvalue__ = ' + s)
+        p = ast.parse("__tempvalue__ = " + s)
         return p.body[0].value
 
     def build_Subscript(self, o):
@@ -234,39 +377,7 @@ class _Builder:
     def build_Index(self, o):
         return self.build(o.value)
 
-    def _build_call35(self, o):
-        """
-        Workaround for python 3.5 _ast.Call signature, docs found here
-        https://greentreesnakes.readthedocs.org/en/latest/nodes.html
-        """
-        import ast
-        callee = self.build(o.func)
-        args = []
-        if o.args is not None:
-            for a in o.args:
-                if isinstance(a, ast.Starred):
-                    args.append(self.build(a.value))
-                else:
-                    args.append(self.build(a))
-        kwargs = {}
-        for kw in o.keywords:
-            if kw.arg is None:  # double asterix `**`
-                rst = self.build(kw.value)
-                if not isinstance(rst, dict):
-                    raise TypeError('Invalid argument for call.'
-                                    'Must be a mapping object.')
-                # give preference to the keys set directly from arg=value
-                for k, v in rst.items():
-                    if k not in kwargs:
-                        kwargs[k] = v
-            else:  # defined on the call as: arg=value
-                kwargs[kw.arg] = self.build(kw.value)
-        return callee(*args, **kwargs)
-
     def build_Call(self, o):
-        if sys.version_info >= (3, 5):
-            return self._build_call35(o)
-
         callee = self.build(o.func)
 
         if o.args is None:
@@ -277,16 +388,13 @@ class _Builder:
         if o.starargs is None:
             starargs = ()
         else:
-            starargs = tuple(self.build(o.starargs))
+            starargs = self.build(o.starargs)
 
         if o.kwargs is None:
             kwargs = {}
         else:
             kwargs = self.build(o.kwargs)
-        if o.keywords is not None:  # direct a=b keywords
-            for kw in o.keywords:
-                # preference because is a direct keyword against **kwargs
-                kwargs[kw.arg] = self.build(kw.value)
+
         return callee(*(args + starargs), **kwargs)
 
     def build_List(self, o):
@@ -322,17 +430,16 @@ class _Builder:
 
         # See if the Name is in builtins.
         try:
+            import builtins
             return getattr(builtins, name)
         except AttributeError:
             pass
 
-        raise TypeError('unrepr could not resolve the name %s' % repr(name))
+        raise TypeError("unrepr could not resolve the name %s" % repr(name))
 
     def build_NameConstant(self, o):
         return o.value
 
-    build_Constant = build_NameConstant  # Python 3.8 change
-
     def build_UnaryOp(self, o):
         op, operand = map(self.build, [o.op, o.operand])
         return op(operand)
@@ -342,13 +449,13 @@ class _Builder:
         return op(left, right)
 
     def build_Add(self, o):
-        return operator.add
+        return _operator.add
 
     def build_Mult(self, o):
-        return operator.mul
+        return _operator.mul
 
     def build_USub(self, o):
-        return operator.neg
+        return _operator.neg
 
     def build_Attribute(self, o):
         parent = self.build(o.value)
@@ -362,7 +469,10 @@ def unrepr(s):
     """Return a Python object compiled from a string."""
     if not s:
         return s
-    b = _Builder()
+    if sys.version_info < (3, 0):
+        b = _Builder2()
+    else:
+        b = _Builder3()
     obj = b.astnode(s)
     return b.build(obj)
 
@@ -377,7 +487,7 @@ def attributes(full_attribute_name):
     """Load a module and retrieve an attribute of that module."""
 
     # Parse out the path, module, and attribute
-    last_dot = full_attribute_name.rfind('.')
+    last_dot = full_attribute_name.rfind(".")
     attr_name = full_attribute_name[last_dot + 1:]
     mod_path = full_attribute_name[:last_dot]
 
diff --git a/lib/cherrypy/lib/sessions.py b/lib/cherrypy/lib/sessions.py
index 68badd93..37556363 100644
--- a/lib/cherrypy/lib/sessions.py
+++ b/lib/cherrypy/lib/sessions.py
@@ -4,13 +4,13 @@ You need to edit your config file to use sessions. Here's an example::
 
     [/]
     tools.sessions.on = True
-    tools.sessions.storage_class = cherrypy.lib.sessions.FileSession
+    tools.sessions.storage_type = "file"
     tools.sessions.storage_path = "/home/site/sessions"
     tools.sessions.timeout = 60
 
 This sets the session to be stored in files in the directory
 /home/site/sessions, and the session timeout to 60 minutes. If you omit
-``storage_class``, the sessions will be saved in RAM.
+``storage_type`` the sessions will be saved in RAM.
 ``tools.sessions.on`` is the only required line for working sessions,
 the rest are optional.
 
@@ -57,17 +57,6 @@ However, CherryPy "recognizes" a session id by looking up the saved session
 data for that id. Therefore, if you never save any session data,
 **you will get a new session id for every request**.
 
-A side effect of CherryPy overwriting unrecognised session ids is that if you
-have multiple, separate CherryPy applications running on a single domain (e.g.
-on different ports), each app will overwrite the other's session id because by
-default they use the same cookie name (``"session_id"``) but do not recognise
-each others sessions. It is therefore a good idea to use a different name for
-each, for example::
-
-    [/]
-    ...
-    tools.sessions.name = "my_app_session_id"
-
 ================
 Sharing Sessions
 ================
@@ -105,21 +94,20 @@ import datetime
 import os
 import time
 import threading
-import binascii
-import pickle
-
-import zc.lockfile
+import types
 
 import cherrypy
+from cherrypy._cpcompat import copyitems, pickle, random20, unicodestr
 from cherrypy.lib import httputil
+from cherrypy.lib import lockfile
 from cherrypy.lib import locking
 from cherrypy.lib import is_iterator
 
-
 missing = object()
 
 
 class Session(object):
+
     """A CherryPy dict-like Session object (one per request)."""
 
     _id = None
@@ -127,19 +115,17 @@ class Session(object):
     id_observers = None
     "A list of callbacks to which to pass new id's."
 
-    @property
-    def id(self):
-        """Return the current session id."""
+    def _get_id(self):
         return self._id
 
-    @id.setter
-    def id(self, value):
+    def _set_id(self, value):
         self._id = value
         for o in self.id_observers:
             o(value)
+    id = property(_get_id, _set_id, doc="The current session ID.")
 
     timeout = 60
-    'Number of minutes after which to delete session data.'
+    "Number of minutes after which to delete session data."
 
     locked = False
     """
@@ -147,32 +133,29 @@ class Session(object):
     to session data."""
 
     loaded = False
-    """If True, data has been retrieved from storage.
-
-    This should happen automatically on the first attempt to access
-    session data.
     """
+    If True, data has been retrieved from storage. This should happen
+    automatically on the first attempt to access session data."""
 
     clean_thread = None
-    'Class-level Monitor which calls self.clean_up.'
+    "Class-level Monitor which calls self.clean_up."
 
     clean_freq = 5
-    'The poll rate for expired session cleanup in minutes.'
+    "The poll rate for expired session cleanup in minutes."
 
     originalid = None
-    'The session id passed by the client. May be missing or unsafe.'
+    "The session id passed by the client. May be missing or unsafe."
 
     missing = False
-    'True if the session requested by the client did not exist.'
+    "True if the session requested by the client did not exist."
 
     regenerated = False
-    """True if the application called session.regenerate().
-
-    This is not set by internal calls to regenerate the session id.
     """
+    True if the application called session.regenerate(). This is not set by
+    internal calls to regenerate the session id."""
 
     debug = False
-    'If True, log debug information.'
+    "If True, log debug information."
 
     # --------------------- Session management methods --------------------- #
 
@@ -199,7 +182,7 @@ class Session(object):
                     cherrypy.log('Expired or malicious session %r; '
                                  'making a new one' % id, 'TOOLS.SESSIONS')
                 # Expired or malicious session. Make a new one.
-                # See https://github.com/cherrypy/cherrypy/issues/709.
+                # See https://bitbucket.org/cherrypy/cherrypy/issue/709.
                 self.id = None
                 self.missing = True
                 self._regenerate()
@@ -253,7 +236,7 @@ class Session(object):
 
     def generate_id(self):
         """Return a new session id."""
-        return binascii.hexlify(os.urandom(20)).decode('ascii')
+        return random20()
 
     def save(self):
         """Save session data."""
@@ -337,9 +320,8 @@ class Session(object):
 
     def pop(self, key, default=missing):
         """Remove the specified key and return the corresponding value.
-
-        If key is not found, default is returned if given, otherwise
-        KeyError is raised.
+        If key is not found, default is returned if given,
+        otherwise KeyError is raised.
         """
         if not self.loaded:
             self.load()
@@ -353,20 +335,21 @@ class Session(object):
             self.load()
         return key in self._data
 
-    def get(self, key, default=None):
-        """D.get(k[,d]) -> D[k] if k in D, else d.
+    if hasattr({}, 'has_key'):
+        def has_key(self, key):
+            """D.has_key(k) -> True if D has a key k, else False."""
+            if not self.loaded:
+                self.load()
+            return key in self._data
 
-        d defaults to None.
-        """
+    def get(self, key, default=None):
+        """D.get(k[,d]) -> D[k] if k in D, else d.  d defaults to None."""
         if not self.loaded:
             self.load()
         return self._data.get(key, default)
 
     def update(self, d):
-        """D.update(E) -> None.
-
-        Update D from E: for k in E: D[k] = E[k].
-        """
+        """D.update(E) -> None.  Update D from E: for k in E: D[k] = E[k]."""
         if not self.loaded:
             self.load()
         self._data.update(d)
@@ -378,10 +361,7 @@ class Session(object):
         return self._data.setdefault(key, default)
 
     def clear(self):
-        """D.clear() -> None.
-
-        Remove all items from D.
-        """
+        """D.clear() -> None.  Remove all items from D."""
         if not self.loaded:
             self.load()
         self._data.clear()
@@ -415,7 +395,7 @@ class RamSession(Session):
         """Clean up expired sessions."""
 
         now = self.now()
-        for _id, (data, expiration_time) in self.cache.copy().items():
+        for _id, (data, expiration_time) in copyitems(self.cache):
             if expiration_time <= now:
                 try:
                     del self.cache[_id]
@@ -430,11 +410,7 @@ class RamSession(Session):
 
         # added to remove obsolete lock objects
         for _id in list(self.locks):
-            locked = (
-                _id not in self.cache
-                and self.locks[_id].acquire(blocking=False)
-            )
-            if locked:
+            if _id not in self.cache and self.locks[_id].acquire(blocking=False):
                 lock = self.locks.pop(_id)
                 lock.release()
 
@@ -495,28 +471,26 @@ class FileSession(Session):
         if isinstance(self.lock_timeout, (int, float)):
             self.lock_timeout = datetime.timedelta(seconds=self.lock_timeout)
         if not isinstance(self.lock_timeout, (datetime.timedelta, type(None))):
-            raise ValueError(
-                'Lock timeout must be numeric seconds or a timedelta instance.'
-            )
+            raise ValueError("Lock timeout must be numeric seconds or "
+                "a timedelta instance.")
 
-    @classmethod
     def setup(cls, **kwargs):
         """Set up the storage system for file-based sessions.
 
         This should only be called once per process; this will be done
-        automatically when using sessions.init (as the built-in Tool
-        does).
+        automatically when using sessions.init (as the built-in Tool does).
         """
         # The 'storage_path' arg is required for file-based sessions.
         kwargs['storage_path'] = os.path.abspath(kwargs['storage_path'])
 
         for k, v in kwargs.items():
             setattr(cls, k, v)
+    setup = classmethod(setup)
 
     def _get_file_path(self):
         f = os.path.join(self.storage_path, self.SESSION_PREFIX + self.id)
         if not os.path.abspath(f).startswith(self.storage_path):
-            raise cherrypy.HTTPError(400, 'Invalid session id in cookie.')
+            raise cherrypy.HTTPError(400, "Invalid session id in cookie.")
         return f
 
     def _exists(self):
@@ -524,28 +498,34 @@ class FileSession(Session):
         return os.path.exists(path)
 
     def _load(self, path=None):
-        assert self.locked, ('The session load without being locked.  '
+        assert self.locked, ("The session load without being locked.  "
                              "Check your tools' priority levels.")
         if path is None:
             path = self._get_file_path()
         try:
-            with open(path, 'rb') as f:
+            f = open(path, "rb")
+            try:
                 return pickle.load(f)
+            finally:
+                f.close()
         except (IOError, EOFError):
             e = sys.exc_info()[1]
             if self.debug:
-                cherrypy.log('Error loading the session pickle: %s' %
+                cherrypy.log("Error loading the session pickle: %s" %
                              e, 'TOOLS.SESSIONS')
             return None
 
     def _save(self, expiration_time):
-        assert self.locked, ('The session was saved without being locked.  '
+        assert self.locked, ("The session was saved without being locked.  "
                              "Check your tools' priority levels.")
-        with open(self._get_file_path(), 'wb') as f:
+        f = open(self._get_file_path(), "wb")
+        try:
             pickle.dump((self._data, expiration_time), f, self.pickle_protocol)
+        finally:
+            f.close()
 
     def _delete(self):
-        assert self.locked, ('The session deletion without being locked.  '
+        assert self.locked, ("The session deletion without being locked.  "
                              "Check your tools' priority levels.")
         try:
             os.unlink(self._get_file_path())
@@ -560,8 +540,8 @@ class FileSession(Session):
         checker = locking.LockChecker(self.id, self.lock_timeout)
         while not checker.expired():
             try:
-                self.lock = zc.lockfile.LockFile(path)
-            except zc.lockfile.LockError:
+                self.lock = lockfile.LockFile(path)
+            except lockfile.LockError:
                 time.sleep(0.1)
             else:
                 break
@@ -571,7 +551,8 @@ class FileSession(Session):
 
     def release_lock(self, path=None):
         """Release the lock on the currently-loaded session data."""
-        self.lock.close()
+        self.lock.release()
+        self.lock.remove()
         self.locked = False
 
     def clean_up(self):
@@ -579,11 +560,8 @@ class FileSession(Session):
         now = self.now()
         # Iterate over all session files in self.storage_path
         for fname in os.listdir(self.storage_path):
-            have_session = (
-                fname.startswith(self.SESSION_PREFIX)
-                and not fname.endswith(self.LOCK_SUFFIX)
-            )
-            if have_session:
+            if (fname.startswith(self.SESSION_PREFIX)
+                    and not fname.endswith(self.LOCK_SUFFIX)):
                 # We have a session file: lock and load it and check
                 #   if it's expired. If it fails, nevermind.
                 path = os.path.join(self.storage_path, fname)
@@ -609,8 +587,95 @@ class FileSession(Session):
     def __len__(self):
         """Return the number of active sessions."""
         return len([fname for fname in os.listdir(self.storage_path)
-                    if (fname.startswith(self.SESSION_PREFIX) and
-                        not fname.endswith(self.LOCK_SUFFIX))])
+                    if (fname.startswith(self.SESSION_PREFIX)
+                        and not fname.endswith(self.LOCK_SUFFIX))])
+
+
+class PostgresqlSession(Session):
+
+    """ Implementation of the PostgreSQL backend for sessions. It assumes
+        a table like this::
+
+            create table session (
+                id varchar(40),
+                data text,
+                expiration_time timestamp
+            )
+
+    You must provide your own get_db function.
+    """
+
+    pickle_protocol = pickle.HIGHEST_PROTOCOL
+
+    def __init__(self, id=None, **kwargs):
+        Session.__init__(self, id, **kwargs)
+        self.cursor = self.db.cursor()
+
+    def setup(cls, **kwargs):
+        """Set up the storage system for Postgres-based sessions.
+
+        This should only be called once per process; this will be done
+        automatically when using sessions.init (as the built-in Tool does).
+        """
+        for k, v in kwargs.items():
+            setattr(cls, k, v)
+
+        self.db = self.get_db()
+    setup = classmethod(setup)
+
+    def __del__(self):
+        if self.cursor:
+            self.cursor.close()
+        self.db.commit()
+
+    def _exists(self):
+        # Select session data from table
+        self.cursor.execute('select data, expiration_time from session '
+                            'where id=%s', (self.id,))
+        rows = self.cursor.fetchall()
+        return bool(rows)
+
+    def _load(self):
+        # Select session data from table
+        self.cursor.execute('select data, expiration_time from session '
+                            'where id=%s', (self.id,))
+        rows = self.cursor.fetchall()
+        if not rows:
+            return None
+
+        pickled_data, expiration_time = rows[0]
+        data = pickle.loads(pickled_data)
+        return data, expiration_time
+
+    def _save(self, expiration_time):
+        pickled_data = pickle.dumps(self._data, self.pickle_protocol)
+        self.cursor.execute('update session set data = %s, '
+                            'expiration_time = %s where id = %s',
+                            (pickled_data, expiration_time, self.id))
+
+    def _delete(self):
+        self.cursor.execute('delete from session where id=%s', (self.id,))
+
+    def acquire_lock(self):
+        """Acquire an exclusive lock on the currently-loaded session data."""
+        # We use the "for update" clause to lock the row
+        self.locked = True
+        self.cursor.execute('select id from session where id=%s for update',
+                            (self.id,))
+        if self.debug:
+            cherrypy.log('Lock acquired.', 'TOOLS.SESSIONS')
+
+    def release_lock(self):
+        """Release the lock on the currently-loaded session data."""
+        # We just close the cursor and that will remove the lock
+        #   introduced by the "for update" clause
+        self.cursor.close()
+        self.locked = False
+
+    def clean_up(self):
+        """Clean up expired sessions."""
+        self.cursor.execute('delete from session where expiration_time < %s',
+                            (self.now(),))
 
 
 class MemcachedSession(Session):
@@ -619,24 +684,37 @@ class MemcachedSession(Session):
     # Wrap all .get and .set operations in a single lock.
     mc_lock = threading.RLock()
 
-    # This is a separate set of locks per session id.
+    # This is a seperate set of locks per session id.
     locks = {}
 
-    servers = ['localhost:11211']
+    servers = ['127.0.0.1:11211']
 
-    @classmethod
     def setup(cls, **kwargs):
         """Set up the storage system for memcached-based sessions.
 
         This should only be called once per process; this will be done
-        automatically when using sessions.init (as the built-in Tool
-        does).
+        automatically when using sessions.init (as the built-in Tool does).
         """
         for k, v in kwargs.items():
             setattr(cls, k, v)
 
         import memcache
         cls.cache = memcache.Client(cls.servers)
+    setup = classmethod(setup)
+
+    def _get_id(self):
+        return self._id
+
+    def _set_id(self, value):
+        # This encode() call is where we differ from the superclass.
+        # Memcache keys MUST be byte strings, not unicode.
+        if isinstance(value, unicodestr):
+            value = value.encode('utf-8')
+
+        self._id = value
+        for o in self.id_observers:
+            o(value)
+    id = property(_get_id, _set_id, doc="The current session ID.")
 
     def _exists(self):
         self.mc_lock.acquire()
@@ -659,7 +737,7 @@ class MemcachedSession(Session):
         try:
             if not self.cache.set(self.id, (self._data, expiration_time), td):
                 raise AssertionError(
-                    'Session data for id %r not set.' % self.id)
+                    "Session data for id %r not set." % self.id)
         finally:
             self.mc_lock.release()
 
@@ -688,13 +766,13 @@ class MemcachedSession(Session):
 def save():
     """Save any changed session data."""
 
-    if not hasattr(cherrypy.serving, 'session'):
+    if not hasattr(cherrypy.serving, "session"):
         return
     request = cherrypy.serving.request
     response = cherrypy.serving.response
 
     # Guard against running twice
-    if hasattr(request, '_sessionsaved'):
+    if hasattr(request, "_sessionsaved"):
         return
     request._sessionsaved = True
 
@@ -708,39 +786,28 @@ def save():
         if is_iterator(response.body):
             response.collapse_body()
         cherrypy.session.save()
-
-
 save.failsafe = True
 
 
 def close():
     """Close the session object for this request."""
-    sess = getattr(cherrypy.serving, 'session', None)
-    if getattr(sess, 'locked', False):
+    sess = getattr(cherrypy.serving, "session", None)
+    if getattr(sess, "locked", False):
         # If the session is still locked we release the lock
         sess.release_lock()
         if sess.debug:
             cherrypy.log('Lock released on close.', 'TOOLS.SESSIONS')
-
-
 close.failsafe = True
 close.priority = 90
 
 
-def init(storage_type=None, path=None, path_header=None, name='session_id',
+def init(storage_type='ram', path=None, path_header=None, name='session_id',
          timeout=60, domain=None, secure=False, clean_freq=5,
-         persistent=True, httponly=False, debug=False,
-         # Py27 compat
-         # *, storage_class=RamSession,
-         **kwargs):
+         persistent=True, httponly=False, debug=False, **kwargs):
     """Initialize session object (using cookies).
 
-    storage_class
-        The Session subclass to use. Defaults to RamSession.
-
     storage_type
-        (deprecated)
-        One of 'ram', 'file', memcached'. This will be
+        One of 'ram', 'file', 'postgresql', 'memcached'. This will be
         used to look up the corresponding class in cherrypy.lib.sessions
         globals. For example, 'file' will use the FileSession class.
 
@@ -784,13 +851,10 @@ def init(storage_type=None, path=None, path_header=None, name='session_id',
     you're using for more information.
     """
 
-    # Py27 compat
-    storage_class = kwargs.pop('storage_class', RamSession)
-
     request = cherrypy.serving.request
 
     # Guard against running twice
-    if hasattr(request, '_session_init_flag'):
+    if hasattr(request, "_session_init_flag"):
         return
     request._session_init_flag = True
 
@@ -802,18 +866,11 @@ def init(storage_type=None, path=None, path_header=None, name='session_id',
             cherrypy.log('ID obtained from request.cookie: %r' % id,
                          'TOOLS.SESSIONS')
 
-    first_time = not hasattr(cherrypy, 'session')
-
-    if storage_type:
-        if first_time:
-            msg = 'storage_type is deprecated. Supply storage_class instead'
-            cherrypy.log(msg)
-        storage_class = storage_type.title() + 'Session'
-        storage_class = globals()[storage_class]
-
-    # call setup first time only
-    if first_time:
-        if hasattr(storage_class, 'setup'):
+    # Find the storage class and call setup (first time only).
+    storage_class = storage_type.title() + 'Session'
+    storage_class = globals()[storage_class]
+    if not hasattr(cherrypy, "session"):
+        if hasattr(storage_class, "setup"):
             storage_class.setup(**kwargs)
 
     # Create and attach a new Session instance to cherrypy.serving.
@@ -830,7 +887,7 @@ def init(storage_type=None, path=None, path_header=None, name='session_id',
     sess.id_observers.append(update_cookie)
 
     # Create cherrypy.session which will proxy to cherrypy.serving.session
-    if not hasattr(cherrypy, 'session'):
+    if not hasattr(cherrypy, "session"):
         cherrypy.session = cherrypy._ThreadLocalProxy('session')
 
     if persistent:
@@ -884,30 +941,24 @@ def set_response_cookie(path=None, path_header=None, name='session_id',
         '/'
     )
 
+    # We'd like to use the "max-age" param as indicated in
+    # http://www.faqs.org/rfcs/rfc2109.html but IE doesn't
+    # save it to disk and the session is lost if people close
+    # the browser. So we have to use the old "expires" ... sigh ...
+##    cookie[name]['max-age'] = timeout * 60
     if timeout:
-        cookie[name]['max-age'] = timeout * 60
-        _add_MSIE_max_age_workaround(cookie[name], timeout)
+        e = time.time() + (timeout * 60)
+        cookie[name]['expires'] = httputil.HTTPDate(e)
     if domain is not None:
         cookie[name]['domain'] = domain
     if secure:
         cookie[name]['secure'] = 1
     if httponly:
         if not cookie[name].isReservedKey('httponly'):
-            raise ValueError('The httponly cookie token is not supported.')
+            raise ValueError("The httponly cookie token is not supported.")
         cookie[name]['httponly'] = 1
 
 
-def _add_MSIE_max_age_workaround(cookie, timeout):
-    """
-    We'd like to use the "max-age" param as indicated in
-    http://www.faqs.org/rfcs/rfc2109.html but IE doesn't
-    save it to disk and the session is lost if people close
-    the browser. So we have to use the old "expires" ... sigh ...
-    """
-    expires = time.time() + timeout * 60
-    cookie['expires'] = httputil.HTTPDate(expires)
-
-
 def expire():
     """Expire the current session cookie."""
     name = cherrypy.serving.request.config.get(
@@ -915,4 +966,3 @@ def expire():
     one_year = 60 * 60 * 24 * 365
     e = time.time() - one_year
     cherrypy.serving.response.cookie[name]['expires'] = httputil.HTTPDate(e)
-    cherrypy.serving.response.cookie[name].pop('max-age', None)
diff --git a/lib/cherrypy/lib/static.py b/lib/cherrypy/lib/static.py
index a942b1b5..a630dae6 100644
--- a/lib/cherrypy/lib/static.py
+++ b/lib/cherrypy/lib/static.py
@@ -1,71 +1,39 @@
-"""Module with helpers for serving static files."""
-
-import mimetypes
 import os
-import platform
 import re
 import stat
-import unicodedata
-import urllib.parse
-from email.generator import _make_boundary as make_boundary
-from io import UnsupportedOperation
+import mimetypes
+
+try:
+    from io import UnsupportedOperation
+except ImportError:
+    UnsupportedOperation = object()
 
 import cherrypy
-from cherrypy._cpcompat import ntob
-from cherrypy.lib import cptools, file_generator_limited, httputil
+from cherrypy._cpcompat import ntob, unquote
+from cherrypy.lib import cptools, httputil, file_generator_limited
 
 
-def _setup_mimetypes():
-    """Pre-initialize global mimetype map."""
-    if not mimetypes.inited:
-        mimetypes.init()
-    mimetypes.types_map['.dwg'] = 'image/x-dwg'
-    mimetypes.types_map['.ico'] = 'image/x-icon'
-    mimetypes.types_map['.bz2'] = 'application/x-bzip2'
-    mimetypes.types_map['.gz'] = 'application/x-gzip'
-
-
-_setup_mimetypes()
-
-
-def _make_content_disposition(disposition, file_name):
-    """Create HTTP header for downloading a file with a UTF-8 filename.
-
-    This function implements the recommendations of :rfc:`6266#appendix-D`.
-    See this and related answers: https://stackoverflow.com/a/8996249/2173868.
-    """
-    # As normalization algorithm for `unicodedata` is used composed form (NFC
-    # and NFKC) with compatibility equivalence criteria (NFK), so "NFKC" is the
-    # one. It first applies the compatibility decomposition, followed by the
-    # canonical composition. Should be displayed in the same manner, should be
-    # treated in the same way by applications such as alphabetizing names or
-    # searching, and may be substituted for each other.
-    # See: https://en.wikipedia.org/wiki/Unicode_equivalence.
-    ascii_name = (
-        unicodedata.normalize('NFKC', file_name).
-        encode('ascii', errors='ignore').decode()
-    )
-    header = '{}; filename="{}"'.format(disposition, ascii_name)
-    if ascii_name != file_name:
-        quoted_name = urllib.parse.quote(file_name)
-        header += '; filename*=UTF-8\'\'{}'.format(quoted_name)
-    return header
+mimetypes.init()
+mimetypes.types_map['.dwg'] = 'image/x-dwg'
+mimetypes.types_map['.ico'] = 'image/x-icon'
+mimetypes.types_map['.bz2'] = 'application/x-bzip2'
+mimetypes.types_map['.gz'] = 'application/x-gzip'
 
 
 def serve_file(path, content_type=None, disposition=None, name=None,
                debug=False):
     """Set status, headers, and body in order to serve the given path.
 
-    The Content-Type header will be set to the content_type arg, if
-    provided. If not provided, the Content-Type will be guessed by the
-    file extension of the 'path' argument.
+    The Content-Type header will be set to the content_type arg, if provided.
+    If not provided, the Content-Type will be guessed by the file extension
+    of the 'path' argument.
 
-    If disposition is not None, the Content-Disposition header will be
-    set to "<disposition>; filename=<name>; filename*=utf-8''<name>" as
-    described in :rfc:`6266#appendix-D`. If name is None, it will be set
-    to the basename of path. If disposition is None, no Content-
-    Disposition header will be written.
+    If disposition is not None, the Content-Disposition header will be set
+    to "<disposition>; filename=<name>". If name is None, it will be set
+    to the basename of path. If disposition is None, no Content-Disposition
+    header will be written.
     """
+
     response = cherrypy.serving.response
 
     # If path is relative, users should fix it by making path absolute.
@@ -81,10 +49,7 @@ def serve_file(path, content_type=None, disposition=None, name=None,
 
     try:
         st = os.stat(path)
-    except (OSError, TypeError, ValueError):
-        # OSError when file fails to stat
-        # TypeError on Python 2 when there's a null byte
-        # ValueError on Python 3 when there's a null byte
+    except OSError:
         if debug:
             cherrypy.log('os.stat(%r) failed' % path, 'TOOLS.STATIC')
         raise cherrypy.NotFound()
@@ -103,7 +68,7 @@ def serve_file(path, content_type=None, disposition=None, name=None,
 
     if content_type is None:
         # Set content-type based on filename extension
-        ext = ''
+        ext = ""
         i = path.rfind('.')
         if i != -1:
             ext = path[i:].lower()
@@ -117,8 +82,8 @@ def serve_file(path, content_type=None, disposition=None, name=None,
     if disposition is not None:
         if name is None:
             name = os.path.basename(path)
-        cd = _make_content_disposition(disposition, name)
-        response.headers['Content-Disposition'] = cd
+        cd = '%s; filename="%s"' % (disposition, name)
+        response.headers["Content-Disposition"] = cd
     if debug:
         cherrypy.log('Content-Disposition: %r' % cd, 'TOOLS.STATIC')
 
@@ -136,10 +101,9 @@ def serve_fileobj(fileobj, content_type=None, disposition=None, name=None,
     The Content-Type header will be set to the content_type arg, if provided.
 
     If disposition is not None, the Content-Disposition header will be set
-    to "<disposition>; filename=<name>; filename*=utf-8''<name>"
-    as described in :rfc:`6266#appendix-D`.
-    If name is None, 'filename' will not be set.
-    If disposition is None, no Content-Disposition header will be written.
+    to "<disposition>; filename=<name>". If name is None, 'filename' will
+    not be set. If disposition is None, no Content-Disposition header will
+    be written.
 
     CAUTION: If the request contains a 'Range' header, one or more seek()s will
     be performed on the file object.  This may cause undesired behavior if
@@ -148,6 +112,7 @@ def serve_fileobj(fileobj, content_type=None, disposition=None, name=None,
     serve_fileobj(), expecting that the data would be served starting from that
     position.
     """
+
     response = cherrypy.serving.response
 
     try:
@@ -175,8 +140,8 @@ def serve_fileobj(fileobj, content_type=None, disposition=None, name=None,
         if name is None:
             cd = disposition
         else:
-            cd = _make_content_disposition(disposition, name)
-        response.headers['Content-Disposition'] = cd
+            cd = '%s; filename="%s"' % (disposition, name)
+        response.headers["Content-Disposition"] = cd
     if debug:
         cherrypy.log('Content-Disposition: %r' % cd, 'TOOLS.STATIC')
 
@@ -184,21 +149,18 @@ def serve_fileobj(fileobj, content_type=None, disposition=None, name=None,
 
 
 def _serve_fileobj(fileobj, content_type, content_length, debug=False):
-    """Set ``response.body`` to the given file object, perhaps ranged.
-
-    Internal helper.
-    """
+    """Internal. Set response.body to the given file object, perhaps ranged."""
     response = cherrypy.serving.response
 
     # HTTP/1.0 didn't have Range/Accept-Ranges headers, or the 206 code
     request = cherrypy.serving.request
     if request.protocol >= (1, 1):
-        response.headers['Accept-Ranges'] = 'bytes'
+        response.headers["Accept-Ranges"] = "bytes"
         r = httputil.get_ranges(request.headers.get('Range'), content_length)
         if r == []:
-            response.headers['Content-Range'] = 'bytes */%s' % content_length
-            message = ('Invalid Range (first-byte-pos greater than '
-                       'Content-Length)')
+            response.headers['Content-Range'] = "bytes */%s" % content_length
+            message = ("Invalid Range (first-byte-pos greater than "
+                       "Content-Length)")
             if debug:
                 cherrypy.log(message, 'TOOLS.STATIC')
             raise cherrypy.HTTPError(416, message)
@@ -214,25 +176,31 @@ def _serve_fileobj(fileobj, content_type, content_length, debug=False):
                     cherrypy.log(
                         'Single part; start: %r, stop: %r' % (start, stop),
                         'TOOLS.STATIC')
-                response.status = '206 Partial Content'
+                response.status = "206 Partial Content"
                 response.headers['Content-Range'] = (
-                    'bytes %s-%s/%s' % (start, stop - 1, content_length))
+                    "bytes %s-%s/%s" % (start, stop - 1, content_length))
                 response.headers['Content-Length'] = r_len
                 fileobj.seek(start)
                 response.body = file_generator_limited(fileobj, r_len)
             else:
                 # Return a multipart/byteranges response.
-                response.status = '206 Partial Content'
+                response.status = "206 Partial Content"
+                try:
+                    # Python 3
+                    from email.generator import _make_boundary as make_boundary
+                except ImportError:
+                    # Python 2
+                    from mimetools import choose_boundary as make_boundary
                 boundary = make_boundary()
-                ct = 'multipart/byteranges; boundary=%s' % boundary
+                ct = "multipart/byteranges; boundary=%s" % boundary
                 response.headers['Content-Type'] = ct
-                if 'Content-Length' in response.headers:
+                if "Content-Length" in response.headers:
                     # Delete Content-Length header so finalize() recalcs it.
-                    del response.headers['Content-Length']
+                    del response.headers["Content-Length"]
 
                 def file_ranges():
                     # Apache compatibility:
-                    yield b'\r\n'
+                    yield ntob("\r\n")
 
                     for start, stop in r:
                         if debug:
@@ -240,23 +208,23 @@ def _serve_fileobj(fileobj, content_type, content_length, debug=False):
                                 'Multipart; start: %r, stop: %r' % (
                                     start, stop),
                                 'TOOLS.STATIC')
-                        yield ntob('--' + boundary, 'ascii')
-                        yield ntob('\r\nContent-type: %s' % content_type,
+                        yield ntob("--" + boundary, 'ascii')
+                        yield ntob("\r\nContent-type: %s" % content_type,
                                    'ascii')
                         yield ntob(
-                            '\r\nContent-range: bytes %s-%s/%s\r\n\r\n' % (
+                            "\r\nContent-range: bytes %s-%s/%s\r\n\r\n" % (
                                 start, stop - 1, content_length),
                             'ascii')
                         fileobj.seek(start)
                         gen = file_generator_limited(fileobj, stop - start)
                         for chunk in gen:
                             yield chunk
-                        yield b'\r\n'
+                        yield ntob("\r\n")
                     # Final boundary
-                    yield ntob('--' + boundary + '--', 'ascii')
+                    yield ntob("--" + boundary + "--", 'ascii')
 
                     # Apache compatibility:
-                    yield b'\r\n'
+                    yield ntob("\r\n")
                 response.body = file_ranges()
             return response.body
         else:
@@ -273,7 +241,7 @@ def _serve_fileobj(fileobj, content_type, content_length, debug=False):
 def serve_download(path, name=None):
     """Serve 'path' as an application/x-download attachment."""
     # This is such a common idiom I felt it deserved its own wrapper.
-    return serve_file(path, 'application/x-download', 'attachment', name)
+    return serve_file(path, "application/x-download", "attachment", name)
 
 
 def _attempt(filename, content_types, debug=False):
@@ -297,7 +265,7 @@ def _attempt(filename, content_types, debug=False):
         return False
 
 
-def staticdir(section, dir, root='', match='', content_types=None, index='',
+def staticdir(section, dir, root="", match="", content_types=None, index="",
               debug=False):
     """Serve a static resource from the given (root +) dir.
 
@@ -335,7 +303,7 @@ def staticdir(section, dir, root='', match='', content_types=None, index='',
     # If dir is relative, make absolute using "root".
     if not os.path.isabs(dir):
         if not root:
-            msg = 'Static dir requires an absolute dir (or root).'
+            msg = "Static dir requires an absolute dir (or root)."
             if debug:
                 cherrypy.log(msg, 'TOOLS.STATICDIR')
             raise ValueError(msg)
@@ -344,18 +312,10 @@ def staticdir(section, dir, root='', match='', content_types=None, index='',
     # Determine where we are in the object tree relative to 'section'
     # (where the static tool was defined).
     if section == 'global':
-        section = '/'
-    section = section.rstrip(r'\/')
+        section = "/"
+    section = section.rstrip(r"\/")
     branch = request.path_info[len(section) + 1:]
-    branch = urllib.parse.unquote(branch.lstrip(r'\/'))
-
-    # Requesting a file in sub-dir of the staticdir results
-    # in mixing of delimiter styles, e.g. C:\static\js/script.js.
-    # Windows accepts this form except not when the path is
-    # supplied in extended-path notation, e.g. \\?\C:\static\js/script.js.
-    # http://bit.ly/1vdioCX
-    if platform.system() == 'Windows':
-        branch = branch.replace('/', '\\')
+    branch = unquote(branch.lstrip(r"\/"))
 
     # If branch is "", filename will end in a slash
     filename = os.path.join(dir, branch)
@@ -375,11 +335,11 @@ def staticdir(section, dir, root='', match='', content_types=None, index='',
         if index:
             handled = _attempt(os.path.join(filename, index), content_types)
             if handled:
-                request.is_index = filename[-1] in (r'\/')
+                request.is_index = filename[-1] in (r"\/")
     return handled
 
 
-def staticfile(filename, root=None, match='', content_types=None, debug=False):
+def staticfile(filename, root=None, match="", content_types=None, debug=False):
     """Serve a static resource from the given (root +) filename.
 
     match
diff --git a/lib/cherrypy/lib/xmlrpcutil.py b/lib/cherrypy/lib/xmlrpcutil.py
index 29d9c4a2..9fc9564f 100644
--- a/lib/cherrypy/lib/xmlrpcutil.py
+++ b/lib/cherrypy/lib/xmlrpcutil.py
@@ -1,18 +1,21 @@
-"""XML-RPC tool helpers."""
 import sys
-from xmlrpc.client import (
-    loads as xmlrpc_loads, dumps as xmlrpc_dumps,
-    Fault as XMLRPCFault
-)
 
 import cherrypy
 from cherrypy._cpcompat import ntob
 
 
+def get_xmlrpclib():
+    try:
+        import xmlrpc.client as x
+    except ImportError:
+        import xmlrpclib as x
+    return x
+
+
 def process_body():
     """Return (params, method) from request body."""
     try:
-        return xmlrpc_loads(cherrypy.request.body.read())
+        return get_xmlrpclib().loads(cherrypy.request.body.read())
     except Exception:
         return ('ERROR PARAMS', ), 'ERRORMETHOD'
 
@@ -28,10 +31,9 @@ def patched_path(path):
 
 
 def _set_response(body):
-    """Set up HTTP status, headers and body within CherryPy."""
     # The XML-RPC spec (http://www.xmlrpc.com/spec) says:
     # "Unless there's a lower-level error, always return 200 OK."
-    # Since Python's xmlrpc_client interprets a non-200 response
+    # Since Python's xmlrpclib interprets a non-200 response
     # as a "Protocol Error", we'll just return 200 every time.
     response = cherrypy.response
     response.status = '200 OK'
@@ -41,20 +43,15 @@ def _set_response(body):
 
 
 def respond(body, encoding='utf-8', allow_none=0):
-    """Construct HTTP response body."""
-    if not isinstance(body, XMLRPCFault):
+    xmlrpclib = get_xmlrpclib()
+    if not isinstance(body, xmlrpclib.Fault):
         body = (body,)
-
-    _set_response(
-        xmlrpc_dumps(
-            body, methodresponse=1,
-            encoding=encoding,
-            allow_none=allow_none
-        )
-    )
+    _set_response(xmlrpclib.dumps(body, methodresponse=1,
+                                  encoding=encoding,
+                                  allow_none=allow_none))
 
 
 def on_error(*args, **kwargs):
-    """Construct HTTP response body for an error response."""
     body = str(sys.exc_info()[1])
-    _set_response(xmlrpc_dumps(XMLRPCFault(1, body)))
+    xmlrpclib = get_xmlrpclib()
+    _set_response(xmlrpclib.dumps(xmlrpclib.Fault(1, body)))
diff --git a/lib/cherrypy/process/__init__.py b/lib/cherrypy/process/__init__.py
index f242d226..f15b1237 100644
--- a/lib/cherrypy/process/__init__.py
+++ b/lib/cherrypy/process/__init__.py
@@ -10,8 +10,5 @@ use with the bus. Some use tool-specific channels; see the documentation
 for each class.
 """
 
-from .wspbus import bus
-from . import plugins, servers
-
-
-__all__ = ('bus', 'plugins', 'servers')
+from cherrypy.process.wspbus import bus
+from cherrypy.process import plugins, servers
diff --git a/lib/cherrypy/process/plugins.py b/lib/cherrypy/process/plugins.py
index 20bf1c66..c787ba92 100644
--- a/lib/cherrypy/process/plugins.py
+++ b/lib/cherrypy/process/plugins.py
@@ -6,10 +6,9 @@ import signal as _signal
 import sys
 import time
 import threading
-import _thread
 
-from cherrypy._cpcompat import text_or_bytes
-from cherrypy._cpcompat import ntob
+from cherrypy._cpcompat import basestring, get_daemon, get_thread_ident
+from cherrypy._cpcompat import ntob, set, Timer, SetDaemonProperty
 
 # _module__file__base is used by Autoreload to make
 # absolute any filenames retrieved from sys.modules which are not
@@ -31,6 +30,7 @@ _module__file__base = os.getcwd()
 
 
 class SimplePlugin(object):
+
     """Plugin base class which auto-subscribes methods for known channels."""
 
     bus = None
@@ -58,6 +58,7 @@ class SimplePlugin(object):
 
 
 class SignalHandler(object):
+
     """Register bus channels (and listeners) for system signals.
 
     You can modify what signals your application listens for, and what it does
@@ -103,37 +104,17 @@ class SignalHandler(object):
         if sys.platform[:4] == 'java':
             del self.handlers['SIGUSR1']
             self.handlers['SIGUSR2'] = self.bus.graceful
-            self.bus.log('SIGUSR1 cannot be set on the JVM platform. '
-                         'Using SIGUSR2 instead.')
+            self.bus.log("SIGUSR1 cannot be set on the JVM platform. "
+                         "Using SIGUSR2 instead.")
             self.handlers['SIGINT'] = self._jython_SIGINT_handler
 
         self._previous_handlers = {}
-        # used to determine is the process is a daemon in `self._is_daemonized`
-        self._original_pid = os.getpid()
 
     def _jython_SIGINT_handler(self, signum=None, frame=None):
         # See http://bugs.jython.org/issue1313
         self.bus.log('Keyboard Interrupt: shutting down bus')
         self.bus.exit()
 
-    def _is_daemonized(self):
-        """Return boolean indicating if the current process is
-        running as a daemon.
-
-        The criteria to determine the `daemon` condition is to verify
-        if the current pid is not the same as the one that got used on
-        the initial construction of the plugin *and* the stdin is not
-        connected to a terminal.
-
-        The sole validation of the tty is not enough when the plugin
-        is executing inside other process like in a CI tool
-        (Buildbot, Jenkins).
-        """
-        return (
-            self._original_pid != os.getpid() and
-            not os.isatty(sys.stdin.fileno())
-        )
-
     def subscribe(self):
         """Subscribe self.handlers to signals."""
         for sig, func in self.handlers.items():
@@ -148,19 +129,19 @@ class SignalHandler(object):
             signame = self.signals[signum]
 
             if handler is None:
-                self.bus.log('Restoring %s handler to SIG_DFL.' % signame)
+                self.bus.log("Restoring %s handler to SIG_DFL." % signame)
                 handler = _signal.SIG_DFL
             else:
-                self.bus.log('Restoring %s handler %r.' % (signame, handler))
+                self.bus.log("Restoring %s handler %r." % (signame, handler))
 
             try:
                 our_handler = _signal.signal(signum, handler)
                 if our_handler is None:
-                    self.bus.log('Restored old %s handler %r, but our '
-                                 'handler was not registered.' %
+                    self.bus.log("Restored old %s handler %r, but our "
+                                 "handler was not registered." %
                                  (signame, handler), level=30)
             except ValueError:
-                self.bus.log('Unable to restore %s handler %r.' %
+                self.bus.log("Unable to restore %s handler %r." %
                              (signame, handler), level=40, traceback=True)
 
     def set_handler(self, signal, listener=None):
@@ -169,43 +150,43 @@ class SignalHandler(object):
         If the optional 'listener' argument is provided, it will be
         subscribed as a listener for the given signal's channel.
 
-        If the given signal name or number is not available on the
-        current platform, ValueError is raised.
+        If the given signal name or number is not available on the current
+        platform, ValueError is raised.
         """
-        if isinstance(signal, text_or_bytes):
+        if isinstance(signal, basestring):
             signum = getattr(_signal, signal, None)
             if signum is None:
-                raise ValueError('No such signal: %r' % signal)
+                raise ValueError("No such signal: %r" % signal)
             signame = signal
         else:
             try:
                 signame = self.signals[signal]
             except KeyError:
-                raise ValueError('No such signal: %r' % signal)
+                raise ValueError("No such signal: %r" % signal)
             signum = signal
 
         prev = _signal.signal(signum, self._handle_signal)
         self._previous_handlers[signum] = prev
 
         if listener is not None:
-            self.bus.log('Listening for %s.' % signame)
+            self.bus.log("Listening for %s." % signame)
             self.bus.subscribe(signame, listener)
 
     def _handle_signal(self, signum=None, frame=None):
         """Python signal handler (self.set_handler subscribes it for you)."""
         signame = self.signals[signum]
-        self.bus.log('Caught signal %s.' % signame)
+        self.bus.log("Caught signal %s." % signame)
         self.bus.publish(signame)
 
     def handle_SIGHUP(self):
         """Restart if daemonized, else exit."""
-        if self._is_daemonized():
-            self.bus.log('SIGHUP caught while daemonized. Restarting.')
-            self.bus.restart()
-        else:
+        if os.isatty(sys.stdin.fileno()):
             # not daemonized (may be foreground or background)
-            self.bus.log('SIGHUP caught but not daemonized. Exiting.')
+            self.bus.log("SIGHUP caught but not daemonized. Exiting.")
             self.bus.exit()
+        else:
+            self.bus.log("SIGHUP caught while daemonized. Restarting.")
+            self.bus.restart()
 
 
 try:
@@ -216,10 +197,10 @@ except ImportError:
 
 
 class DropPrivileges(SimplePlugin):
+
     """Drop privileges. uid/gid arguments not available on Windows.
 
-    Special thanks to `Gavin Baker
-    <http://antonym.org/2005/12/dropping-privileges-in-python.html>`_.
+    Special thanks to `Gavin Baker <http://antonym.org/2005/12/dropping-privileges-in-python.html>`_ 
     """
 
     def __init__(self, bus, umask=None, uid=None, gid=None):
@@ -229,63 +210,57 @@ class DropPrivileges(SimplePlugin):
         self.gid = gid
         self.umask = umask
 
-    @property
-    def uid(self):
-        """The uid under which to run.
-
-        Availability: Unix.
-        """
+    def _get_uid(self):
         return self._uid
 
-    @uid.setter
-    def uid(self, val):
+    def _set_uid(self, val):
         if val is not None:
             if pwd is None:
-                self.bus.log('pwd module not available; ignoring uid.',
+                self.bus.log("pwd module not available; ignoring uid.",
                              level=30)
                 val = None
-            elif isinstance(val, text_or_bytes):
+            elif isinstance(val, basestring):
                 val = pwd.getpwnam(val)[2]
         self._uid = val
+    uid = property(_get_uid, _set_uid,
+                   doc="The uid under which to run. Availability: Unix.")
 
-    @property
-    def gid(self):
-        """The gid under which to run.
-
-        Availability: Unix.
-        """
+    def _get_gid(self):
         return self._gid
 
-    @gid.setter
-    def gid(self, val):
+    def _set_gid(self, val):
         if val is not None:
             if grp is None:
-                self.bus.log('grp module not available; ignoring gid.',
+                self.bus.log("grp module not available; ignoring gid.",
                              level=30)
                 val = None
-            elif isinstance(val, text_or_bytes):
+            elif isinstance(val, basestring):
                 val = grp.getgrnam(val)[2]
         self._gid = val
+    gid = property(_get_gid, _set_gid,
+                   doc="The gid under which to run. Availability: Unix.")
 
-    @property
-    def umask(self):
-        """The default permission mode for newly created files and directories.
-
-        Usually expressed in octal format, for example, ``0644``.
-        Availability: Unix, Windows.
-        """
+    def _get_umask(self):
         return self._umask
 
-    @umask.setter
-    def umask(self, val):
+    def _set_umask(self, val):
         if val is not None:
             try:
                 os.umask
             except AttributeError:
-                self.bus.log('umask function not available; ignoring umask.',
+                self.bus.log("umask function not available; ignoring umask.",
                              level=30)
                 val = None
         self._umask = val
+    umask = property(
+        _get_umask,
+        _set_umask,
+        doc="""The default permission mode for newly created files and
+        directories.
+
+        Usually expressed in octal format, for example, ``0644``.
+        Availability: Unix, Windows.
+        """)
 
     def start(self):
         # uid/gid
@@ -335,6 +310,7 @@ class DropPrivileges(SimplePlugin):
 
 
 class Daemonizer(SimplePlugin):
+
     """Daemonize the running script.
 
     Use this with a Web Site Process Bus via::
@@ -348,7 +324,7 @@ class Daemonizer(SimplePlugin):
     process still return proper exit codes. Therefore, if you use this
     plugin to daemonize, don't use the return code as an accurate indicator
     of whether the process fully started. In fact, that return code only
-    indicates if the process successfully finished the first fork.
+    indicates if the process succesfully finished the first fork.
     """
 
     def __init__(self, bus, stdin='/dev/null', stdout='/dev/null',
@@ -368,20 +344,11 @@ class Daemonizer(SimplePlugin):
         # "The general problem with making fork() work in a multi-threaded
         #  world is what to do with all of the threads..."
         # So we check for active threads:
-        if threading.active_count() != 1:
+        if threading.activeCount() != 1:
             self.bus.log('There are %r active threads. '
                          'Daemonizing now may cause strange failures.' %
                          threading.enumerate(), level=30)
 
-        self.daemonize(self.stdin, self.stdout, self.stderr, self.bus.log)
-
-        self.finalized = True
-    start.priority = 65
-
-    @staticmethod
-    def daemonize(
-            stdin='/dev/null', stdout='/dev/null', stderr='/dev/null',
-            logger=lambda msg: None):
         # See http://www.erlenstar.demon.co.uk/unix/faq_2.html#SEC16
         # (or http://www.faqs.org/faqs/unix-faq/programmer/faq/ section 1.7)
         # and http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/66012
@@ -390,29 +357,41 @@ class Daemonizer(SimplePlugin):
         sys.stdout.flush()
         sys.stderr.flush()
 
-        error_tmpl = (
-            '{sys.argv[0]}: fork #{n} failed: ({exc.errno}) {exc.strerror}\n'
-        )
+        # Do first fork.
+        try:
+            pid = os.fork()
+            if pid == 0:
+                # This is the child process. Continue.
+                pass
+            else:
+                # This is the first parent. Exit, now that we've forked.
+                self.bus.log('Forking once.')
+                os._exit(0)
+        except OSError:
+            # Python raises OSError rather than returning negative numbers.
+            exc = sys.exc_info()[1]
+            sys.exit("%s: fork #1 failed: (%d) %s\n"
+                     % (sys.argv[0], exc.errno, exc.strerror))
 
-        for fork in range(2):
-            msg = ['Forking once.', 'Forking twice.'][fork]
-            try:
-                pid = os.fork()
-                if pid > 0:
-                    # This is the parent; exit.
-                    logger(msg)
-                    os._exit(0)
-            except OSError as exc:
-                # Python raises OSError rather than returning negative numbers.
-                sys.exit(error_tmpl.format(sys=sys, exc=exc, n=fork + 1))
-            if fork == 0:
-                os.setsid()
+        os.setsid()
 
+        # Do second fork
+        try:
+            pid = os.fork()
+            if pid > 0:
+                self.bus.log('Forking twice.')
+                os._exit(0)  # Exit second parent
+        except OSError:
+            exc = sys.exc_info()[1]
+            sys.exit("%s: fork #2 failed: (%d) %s\n"
+                     % (sys.argv[0], exc.errno, exc.strerror))
+
+        os.chdir("/")
         os.umask(0)
 
-        si = open(stdin, 'r')
-        so = open(stdout, 'a+')
-        se = open(stderr, 'a+')
+        si = open(self.stdin, "r")
+        so = open(self.stdout, "a+")
+        se = open(self.stderr, "a+")
 
         # os.dup2(fd, fd2) will close fd2 if necessary,
         # so we don't explicitly close stdin/out/err.
@@ -421,10 +400,13 @@ class Daemonizer(SimplePlugin):
         os.dup2(so.fileno(), sys.stdout.fileno())
         os.dup2(se.fileno(), sys.stderr.fileno())
 
-        logger('Daemonized to PID: %s' % os.getpid())
+        self.bus.log('Daemonized to PID: %s' % os.getpid())
+        self.finalized = True
+    start.priority = 65
 
 
 class PIDFile(SimplePlugin):
+
     """Maintain a PID file via a WSPBus."""
 
     def __init__(self, bus, pidfile):
@@ -437,8 +419,7 @@ class PIDFile(SimplePlugin):
         if self.finalized:
             self.bus.log('PID %r already written to %r.' % (pid, self.pidfile))
         else:
-            with open(self.pidfile, 'wb') as f:
-                f.write(ntob('%s\n' % pid, 'utf8'))
+            open(self.pidfile, "wb").write(ntob("%s\n" % pid, 'utf8'))
             self.bus.log('PID %r written to %r.' % (pid, self.pidfile))
             self.finalized = True
     start.priority = 70
@@ -449,16 +430,17 @@ class PIDFile(SimplePlugin):
             self.bus.log('PID file removed: %r.' % self.pidfile)
         except (KeyboardInterrupt, SystemExit):
             raise
-        except Exception:
+        except:
             pass
 
 
-class PerpetualTimer(threading.Timer):
+class PerpetualTimer(Timer):
+
     """A responsive subclass of threading.Timer whose run() method repeats.
 
     Use this timer only when you really need a very interruptible timer;
-    this checks its 'finished' condition up to 20 times a second, which
-    can results in pretty high CPU usage
+    this checks its 'finished' condition up to 20 times a second, which can
+    results in pretty high CPU usage
     """
 
     def __init__(self, *args, **kwargs):
@@ -476,25 +458,25 @@ class PerpetualTimer(threading.Timer):
             except Exception:
                 if self.bus:
                     self.bus.log(
-                        'Error in perpetual timer thread function %r.' %
+                        "Error in perpetual timer thread function %r." %
                         self.function, level=40, traceback=True)
                 # Quit on first error to avoid massive logs.
                 raise
 
 
-class BackgroundTask(threading.Thread):
+class BackgroundTask(SetDaemonProperty, threading.Thread):
+
     """A subclass of threading.Thread whose run() method repeats.
 
-    Use this class for most repeating tasks. It uses time.sleep() to
-    wait for each interval, which isn't very responsive; that is, even
-    if you call self.cancel(), you'll have to wait until the sleep()
-    call finishes before the thread stops. To compensate, it defaults to
-    being daemonic, which means it won't delay stopping the whole
-    process.
+    Use this class for most repeating tasks. It uses time.sleep() to wait
+    for each interval, which isn't very responsive; that is, even if you call
+    self.cancel(), you'll have to wait until the sleep() call finishes before
+    the thread stops. To compensate, it defaults to being daemonic, which means
+    it won't delay stopping the whole process.
     """
 
     def __init__(self, interval, function, args=[], kwargs={}, bus=None):
-        super(BackgroundTask, self).__init__()
+        threading.Thread.__init__(self)
         self.interval = interval
         self.function = function
         self.args = args
@@ -518,13 +500,14 @@ class BackgroundTask(threading.Thread):
                 self.function(*self.args, **self.kwargs)
             except Exception:
                 if self.bus:
-                    self.bus.log('Error in background task thread function %r.'
+                    self.bus.log("Error in background task thread function %r."
                                  % self.function, level=40, traceback=True)
                 # Quit on first error to avoid massive logs.
                 raise
 
 
 class Monitor(SimplePlugin):
+
     """WSPBus listener to periodically run a callback in its own thread."""
 
     callback = None
@@ -552,26 +535,26 @@ class Monitor(SimplePlugin):
             if self.thread is None:
                 self.thread = BackgroundTask(self.frequency, self.callback,
                                              bus=self.bus)
-                self.thread.name = threadname
+                self.thread.setName(threadname)
                 self.thread.start()
-                self.bus.log('Started monitor thread %r.' % threadname)
+                self.bus.log("Started monitor thread %r." % threadname)
             else:
-                self.bus.log('Monitor thread %r already started.' % threadname)
+                self.bus.log("Monitor thread %r already started." % threadname)
     start.priority = 70
 
     def stop(self):
         """Stop our callback's background task thread."""
         if self.thread is None:
-            self.bus.log('No thread running for %s.' %
+            self.bus.log("No thread running for %s." %
                          self.name or self.__class__.__name__)
         else:
-            if self.thread is not threading.current_thread():
-                name = self.thread.name
+            if self.thread is not threading.currentThread():
+                name = self.thread.getName()
                 self.thread.cancel()
-                if not self.thread.daemon:
-                    self.bus.log('Joining %r' % name)
+                if not get_daemon(self.thread):
+                    self.bus.log("Joining %r" % name)
                     self.thread.join()
-                self.bus.log('Stopped thread %r.' % name)
+                self.bus.log("Stopped thread %r." % name)
             self.thread = None
 
     def graceful(self):
@@ -581,6 +564,7 @@ class Monitor(SimplePlugin):
 
 
 class Autoreloader(Monitor):
+
     """Monitor which re-executes the process when files change.
 
     This :ref:`plugin<plugins>` restarts the process (via :func:`os.execv`)
@@ -625,43 +609,23 @@ class Autoreloader(Monitor):
 
     def sysfiles(self):
         """Return a Set of sys.modules filenames to monitor."""
-        search_mod_names = filter(
-            re.compile(self.match).match,
-            list(sys.modules.keys()),
-        )
-        mods = map(sys.modules.get, search_mod_names)
-        return set(filter(None, map(self._file_for_module, mods)))
-
-    @classmethod
-    def _file_for_module(cls, module):
-        """Return the relevant file for the module."""
-        return (
-            cls._archive_for_zip_module(module)
-            or cls._file_for_file_module(module)
-        )
-
-    @staticmethod
-    def _archive_for_zip_module(module):
-        """Return the archive filename for the module if relevant."""
-        try:
-            return module.__loader__.archive
-        except AttributeError:
-            pass
-
-    @classmethod
-    def _file_for_file_module(cls, module):
-        """Return the file for the module."""
-        try:
-            return module.__file__ and cls._make_absolute(module.__file__)
-        except AttributeError:
-            pass
-
-    @staticmethod
-    def _make_absolute(filename):
-        """Ensure filename is absolute to avoid effect of os.chdir."""
-        return filename if os.path.isabs(filename) else (
-            os.path.normpath(os.path.join(_module__file__base, filename))
-        )
+        files = set()
+        for k, m in list(sys.modules.items()):
+            if re.match(self.match, k):
+                if (
+                    hasattr(m, '__loader__') and
+                    hasattr(m.__loader__, 'archive')
+                ):
+                    f = m.__loader__.archive
+                else:
+                    f = getattr(m, '__file__', None)
+                    if f is not None and not os.path.isabs(f):
+                        # ensure absolute paths so a os.chdir() in the app
+                        # doesn't break me
+                        f = os.path.normpath(
+                            os.path.join(_module__file__base, f))
+                files.add(f)
+        return files
 
     def run(self):
         """Reload the process if registered files have been modified."""
@@ -687,30 +651,30 @@ class Autoreloader(Monitor):
                 else:
                     if mtime is None or mtime > oldtime:
                         # The file has been deleted or modified.
-                        self.bus.log('Restarting because %s changed.' %
+                        self.bus.log("Restarting because %s changed." %
                                      filename)
                         self.thread.cancel()
-                        self.bus.log('Stopped thread %r.' %
-                                     self.thread.name)
+                        self.bus.log("Stopped thread %r." %
+                                     self.thread.getName())
                         self.bus.restart()
                         return
 
 
 class ThreadManager(SimplePlugin):
+
     """Manager for HTTP request threads.
 
     If you have control over thread creation and destruction, publish to
-    the 'acquire_thread' and 'release_thread' channels (for each
-    thread). This will register/unregister the current thread and
-    publish to 'start_thread' and 'stop_thread' listeners in the bus as
-    needed.
+    the 'acquire_thread' and 'release_thread' channels (for each thread).
+    This will register/unregister the current thread and publish to
+    'start_thread' and 'stop_thread' listeners in the bus as needed.
 
     If threads are created and destroyed by code you do not control
     (e.g., Apache), then, at the beginning of every HTTP request,
     publish to 'acquire_thread' only. You should not publish to
-    'release_thread' in this case, since you do not know whether the
-    thread will be re-used or not. The bus will call 'stop_thread'
-    listeners for you when it stops.
+    'release_thread' in this case, since you do not know whether
+    the thread will be re-used or not. The bus will call
+    'stop_thread' listeners for you when it stops.
     """
 
     threads = None
@@ -730,7 +694,7 @@ class ThreadManager(SimplePlugin):
         If the current thread has already been seen, any 'start_thread'
         listeners will not be run again.
         """
-        thread_ident = _thread.get_ident()
+        thread_ident = get_thread_ident()
         if thread_ident not in self.threads:
             # We can't just use get_ident as the thread ID
             # because some platforms reuse thread ID's.
@@ -740,7 +704,7 @@ class ThreadManager(SimplePlugin):
 
     def release_thread(self):
         """Release the current thread and run 'stop_thread' listeners."""
-        thread_ident = _thread.get_ident()
+        thread_ident = get_thread_ident()
         i = self.threads.pop(thread_ident, None)
         if i is not None:
             self.bus.publish('stop_thread', i)
diff --git a/lib/cherrypy/process/servers.py b/lib/cherrypy/process/servers.py
index fdd4bb68..6f8088bd 100644
--- a/lib/cherrypy/process/servers.py
+++ b/lib/cherrypy/process/servers.py
@@ -1,4 +1,4 @@
-r"""
+"""
 Starting in CherryPy 3.1, cherrypy.server is implemented as an
 :ref:`Engine Plugin<plugins>`. It's an instance of
 :class:`cherrypy._cpserver.Server`, which is a subclass of
@@ -12,14 +12,10 @@ If you need to start more than one HTTP server (to serve on multiple ports, or
 protocols, etc.), you can manually register each one and then start them all
 with engine.start::
 
-    s1 = ServerAdapter(
-        cherrypy.engine,
-        MyWSGIServer(host='0.0.0.0', port=80)
-    )
-    s2 = ServerAdapter(
-        cherrypy.engine,
-        another.HTTPServer(host='127.0.0.1', SSL=True)
-    )
+    s1 = ServerAdapter(cherrypy.engine, MyWSGIServer(host='0.0.0.0', port=80))
+    s2 = ServerAdapter(cherrypy.engine,
+                       another.HTTPServer(host='127.0.0.1',
+                       SSL=True))
     s1.subscribe()
     s2.subscribe()
     cherrypy.engine.start()
@@ -62,10 +58,10 @@ hello.py::
     import cherrypy
 
     class HelloWorld:
-        '''Sample request handler class.'''
-        @cherrypy.expose
+        \"""Sample request handler class.\"""
         def index(self):
             return "Hello world!"
+        index.exposed = True
 
     cherrypy.tree.mount(HelloWorld())
     # CherryPy autoreload must be disabled for the flup server to work
@@ -117,21 +113,13 @@ Please see `Lighttpd FastCGI Docs
 an explanation of the possible configuration options.
 """
 
-import os
 import sys
 import time
 import warnings
-import contextlib
-
-import portend
-
-
-class Timeouts:
-    occupied = 5
-    free = 1
 
 
 class ServerAdapter(object):
+
     """Adapter for an HTTP server.
 
     If you need to start more than one HTTP server (to serve on multiple
@@ -162,54 +150,50 @@ class ServerAdapter(object):
 
     def start(self):
         """Start the HTTP server."""
+        if self.bind_addr is None:
+            on_what = "unknown interface (dynamic?)"
+        elif isinstance(self.bind_addr, tuple):
+            on_what = self._get_base()
+        else:
+            on_what = "socket file: %s" % self.bind_addr
+
         if self.running:
-            self.bus.log('Already serving on %s' % self.description)
+            self.bus.log("Already serving on %s" % on_what)
             return
 
         self.interrupt = None
         if not self.httpserver:
-            raise ValueError('No HTTP server has been created.')
+            raise ValueError("No HTTP server has been created.")
 
-        if not os.environ.get('LISTEN_PID', None):
-            # Start the httpserver in a new thread.
-            if isinstance(self.bind_addr, tuple):
-                portend.free(*self.bind_addr, timeout=Timeouts.free)
+        # Start the httpserver in a new thread.
+        if isinstance(self.bind_addr, tuple):
+            wait_for_free_port(*self.bind_addr)
 
         import threading
         t = threading.Thread(target=self._start_http_thread)
-        t.name = 'HTTPServer ' + t.name
+        t.setName("HTTPServer " + t.getName())
         t.start()
 
         self.wait()
         self.running = True
-        self.bus.log('Serving on %s' % self.description)
+        self.bus.log("Serving on %s" % on_what)
     start.priority = 75
 
-    @property
-    def description(self):
-        """A description about where this server is bound."""
-        if self.bind_addr is None:
-            on_what = 'unknown interface (dynamic?)'
-        elif isinstance(self.bind_addr, tuple):
-            on_what = self._get_base()
-        else:
-            on_what = 'socket file: %s' % self.bind_addr
-        return on_what
-
     def _get_base(self):
         if not self.httpserver:
             return ''
-        host, port = self.bound_addr
-        if getattr(self.httpserver, 'ssl_adapter', None):
-            scheme = 'https'
+        host, port = self.bind_addr
+        if getattr(self.httpserver, 'ssl_certificate', None) or \
+                getattr(self.httpserver, 'ssl_adapter', None):
+            scheme = "https"
             if port != 443:
-                host += ':%s' % port
+                host += ":%s" % port
         else:
-            scheme = 'http'
+            scheme = "http"
             if port != 80:
-                host += ':%s' % port
+                host += ":%s" % port
 
-        return '%s://%s' % (scheme, host)
+        return "%s://%s" % (scheme, host)
 
     def _start_http_thread(self):
         """HTTP servers MUST be running in new threads, so that the
@@ -221,52 +205,32 @@ class ServerAdapter(object):
         try:
             self.httpserver.start()
         except KeyboardInterrupt:
-            self.bus.log('<Ctrl-C> hit: shutting down HTTP server')
+            self.bus.log("<Ctrl-C> hit: shutting down HTTP server")
             self.interrupt = sys.exc_info()[1]
             self.bus.exit()
         except SystemExit:
-            self.bus.log('SystemExit raised: shutting down HTTP server')
+            self.bus.log("SystemExit raised: shutting down HTTP server")
             self.interrupt = sys.exc_info()[1]
             self.bus.exit()
             raise
-        except Exception:
+        except:
             self.interrupt = sys.exc_info()[1]
-            self.bus.log('Error in HTTP server: shutting down',
+            self.bus.log("Error in HTTP server: shutting down",
                          traceback=True, level=40)
             self.bus.exit()
             raise
 
     def wait(self):
         """Wait until the HTTP server is ready to receive requests."""
-        while not getattr(self.httpserver, 'ready', False):
+        while not getattr(self.httpserver, "ready", False):
             if self.interrupt:
                 raise self.interrupt
             time.sleep(.1)
 
-        # bypass check when LISTEN_PID is set
-        if os.environ.get('LISTEN_PID', None):
-            return
-
-        # bypass check when running via socket-activation
-        # (for socket-activation the port will be managed by systemd)
-        if not isinstance(self.bind_addr, tuple):
-            return
-
-        # wait for port to be occupied
-        with _safe_wait(*self.bound_addr):
-            portend.occupied(*self.bound_addr, timeout=Timeouts.occupied)
-
-    @property
-    def bound_addr(self):
-        """
-        The bind address, or if it's an ephemeral port and the
-        socket has been bound, return the actual port bound.
-        """
-        host, port = self.bind_addr
-        if port == 0 and self.httpserver.socket:
-            # Bound to ephemeral port. Get the actual port allocated.
-            port = self.httpserver.socket.getsockname()[1]
-        return host, port
+        # Wait for port to be occupied
+        if isinstance(self.bind_addr, tuple):
+            host, port = self.bind_addr
+            wait_for_occupied_port(host, port)
 
     def stop(self):
         """Stop the HTTP server."""
@@ -275,11 +239,11 @@ class ServerAdapter(object):
             self.httpserver.stop()
             # Wait for the socket to be truly freed.
             if isinstance(self.bind_addr, tuple):
-                portend.free(*self.bound_addr, timeout=Timeouts.free)
+                wait_for_free_port(*self.bind_addr)
             self.running = False
-            self.bus.log('HTTP Server %s shut down' % self.httpserver)
+            self.bus.log("HTTP Server %s shut down" % self.httpserver)
         else:
-            self.bus.log('HTTP Server %s already shut down' % self.httpserver)
+            self.bus.log("HTTP Server %s already shut down" % self.httpserver)
     stop.priority = 25
 
     def restart(self):
@@ -289,6 +253,7 @@ class ServerAdapter(object):
 
 
 class FlupCGIServer(object):
+
     """Adapter for a flup.server.cgi.WSGIServer."""
 
     def __init__(self, *args, **kwargs):
@@ -312,6 +277,7 @@ class FlupCGIServer(object):
 
 
 class FlupFCGIServer(object):
+
     """Adapter for a flup.server.fcgi.WSGIServer."""
 
     def __init__(self, *args, **kwargs):
@@ -357,6 +323,7 @@ class FlupFCGIServer(object):
 
 
 class FlupSCGIServer(object):
+
     """Adapter for a flup.server.scgi.WSGIServer."""
 
     def __init__(self, *args, **kwargs):
@@ -393,18 +360,107 @@ class FlupSCGIServer(object):
         self.scgiserver._threadPool.maxSpare = 0
 
 
-@contextlib.contextmanager
-def _safe_wait(host, port):
-    """
-    On systems where a loopback interface is not available and the
-    server is bound to all interfaces, it's difficult to determine
-    whether the server is in fact occupying the port. In this case,
-    just issue a warning and move on. See issue #1100.
-    """
+def client_host(server_host):
+    """Return the host on which a client can connect to the given listener."""
+    if server_host == '0.0.0.0':
+        # 0.0.0.0 is INADDR_ANY, which should answer on localhost.
+        return '127.0.0.1'
+    if server_host in ('::', '::0', '::0.0.0.0'):
+        # :: is IN6ADDR_ANY, which should answer on localhost.
+        # ::0 and ::0.0.0.0 are non-canonical but common
+        # ways to write IN6ADDR_ANY.
+        return '::1'
+    return server_host
+
+
+def check_port(host, port, timeout=1.0):
+    """Raise an error if the given port is not free on the given host."""
+    if not host:
+        raise ValueError("Host values of '' or None are not allowed.")
+    host = client_host(host)
+    port = int(port)
+
+    import socket
+
+    # AF_INET or AF_INET6 socket
+    # Get the correct address family for our host (allows IPv6 addresses)
     try:
-        yield
-    except portend.Timeout:
-        if host == portend.client_host(host):
-            raise
-        msg = 'Unable to verify that the server is bound on %r' % port
-        warnings.warn(msg)
+        info = socket.getaddrinfo(host, port, socket.AF_UNSPEC,
+                                  socket.SOCK_STREAM)
+    except socket.gaierror:
+        if ':' in host:
+            info = [(
+                socket.AF_INET6, socket.SOCK_STREAM, 0, "", (host, port, 0, 0)
+            )]
+        else:
+            info = [(socket.AF_INET, socket.SOCK_STREAM, 0, "", (host, port))]
+
+    for res in info:
+        af, socktype, proto, canonname, sa = res
+        s = None
+        try:
+            s = socket.socket(af, socktype, proto)
+            # See http://groups.google.com/group/cherrypy-users/
+            #        browse_frm/thread/bbfe5eb39c904fe0
+            s.settimeout(timeout)
+            s.connect((host, port))
+            s.close()
+        except socket.error:
+            if s:
+                s.close()
+        else:
+            raise IOError("Port %s is in use on %s; perhaps the previous "
+                          "httpserver did not shut down properly." %
+                          (repr(port), repr(host)))
+
+
+# Feel free to increase these defaults on slow systems:
+free_port_timeout = 0.1
+occupied_port_timeout = 1.0
+
+
+def wait_for_free_port(host, port, timeout=None):
+    """Wait for the specified port to become free (drop requests)."""
+    if not host:
+        raise ValueError("Host values of '' or None are not allowed.")
+    if timeout is None:
+        timeout = free_port_timeout
+
+    for trial in range(50):
+        try:
+            # we are expecting a free port, so reduce the timeout
+            check_port(host, port, timeout=timeout)
+        except IOError:
+            # Give the old server thread time to free the port.
+            time.sleep(timeout)
+        else:
+            return
+
+    raise IOError("Port %r not free on %r" % (port, host))
+
+
+def wait_for_occupied_port(host, port, timeout=None):
+    """Wait for the specified port to become active (receive requests)."""
+    if not host:
+        raise ValueError("Host values of '' or None are not allowed.")
+    if timeout is None:
+        timeout = occupied_port_timeout
+
+    for trial in range(50):
+        try:
+            check_port(host, port, timeout=timeout)
+        except IOError:
+            # port is occupied
+            return
+        else:
+            time.sleep(timeout)
+
+    if host == client_host(host):
+        raise IOError("Port %r not bound on %r" % (port, host))
+
+    # On systems where a loopback interface is not available and the
+    #  server is bound to all interfaces, it's difficult to determine
+    #  whether the server is in fact occupying the port. In this case,
+    # just issue a warning and move on. See issue #1100.
+    msg = "Unable to verify that the server is bound on %r" % port
+    warnings.warn(msg)
diff --git a/lib/cherrypy/process/win32.py b/lib/cherrypy/process/win32.py
index 305596ba..4afd3f14 100644
--- a/lib/cherrypy/process/win32.py
+++ b/lib/cherrypy/process/win32.py
@@ -1,7 +1,4 @@
-"""Windows service.
-
-Requires pywin32.
-"""
+"""Windows service. Requires pywin32."""
 
 import os
 import win32api
@@ -14,6 +11,7 @@ from cherrypy.process import wspbus, plugins
 
 
 class ConsoleCtrlHandler(plugins.SimplePlugin):
+
     """A WSPBus plugin for handling Win32 console events (like Ctrl-C)."""
 
     def __init__(self, bus):
@@ -22,7 +20,7 @@ class ConsoleCtrlHandler(plugins.SimplePlugin):
 
     def start(self):
         if self.is_set:
-            self.bus.log('Handler for console events already set.', level=20)
+            self.bus.log('Handler for console events already set.', level=40)
             return
 
         result = win32api.SetConsoleCtrlHandler(self.handle, 1)
@@ -30,12 +28,12 @@ class ConsoleCtrlHandler(plugins.SimplePlugin):
             self.bus.log('Could not SetConsoleCtrlHandler (error %r)' %
                          win32api.GetLastError(), level=40)
         else:
-            self.bus.log('Set handler for console events.', level=20)
+            self.bus.log('Set handler for console events.', level=40)
             self.is_set = True
 
     def stop(self):
         if not self.is_set:
-            self.bus.log('Handler for console events already off.', level=20)
+            self.bus.log('Handler for console events already off.', level=40)
             return
 
         try:
@@ -48,7 +46,7 @@ class ConsoleCtrlHandler(plugins.SimplePlugin):
             self.bus.log('Could not remove SetConsoleCtrlHandler (error %r)' %
                          win32api.GetLastError(), level=40)
         else:
-            self.bus.log('Removed handler for console events.', level=20)
+            self.bus.log('Removed handler for console events.', level=40)
             self.is_set = False
 
     def handle(self, event):
@@ -71,10 +69,10 @@ class ConsoleCtrlHandler(plugins.SimplePlugin):
 
 
 class Win32Bus(wspbus.Bus):
+
     """A Web Site Process Bus implementation for Win32.
 
-    Instead of time.sleep, this bus blocks using native win32event
-    objects.
+    Instead of time.sleep, this bus blocks using native win32event objects.
     """
 
     def __init__(self):
@@ -87,20 +85,19 @@ class Win32Bus(wspbus.Bus):
             return self.events[state]
         except KeyError:
             event = win32event.CreateEvent(None, 0, 0,
-                                           'WSPBus %s Event (pid=%r)' %
+                                           "WSPBus %s Event (pid=%r)" %
                                            (state.name, os.getpid()))
             self.events[state] = event
             return event
 
-    @property
-    def state(self):
+    def _get_state(self):
         return self._state
 
-    @state.setter
-    def state(self, value):
+    def _set_state(self, value):
         self._state = value
         event = self._get_state_event(value)
         win32event.PulseEvent(event)
+    state = property(_get_state, _set_state)
 
     def wait(self, state, interval=0.1, channel=None):
         """Wait for the given state(s), KeyboardInterrupt or SystemExit.
@@ -122,6 +119,7 @@ class Win32Bus(wspbus.Bus):
 
 
 class _ControlCodes(dict):
+
     """Control codes used to "signal" a service via ControlService.
 
     User-defined control codes are in the range 128-255. We generally use
@@ -137,8 +135,7 @@ class _ControlCodes(dict):
         for key, val in self.items():
             if val is obj:
                 return key
-        raise ValueError('The given object could not be found: %r' % obj)
-
+        raise ValueError("The given object could not be found: %r" % obj)
 
 control_codes = _ControlCodes({'graceful': 138})
 
@@ -153,16 +150,17 @@ def signal_child(service, command):
 
 
 class PyWebService(win32serviceutil.ServiceFramework):
+
     """Python Web Service."""
 
-    _svc_name_ = 'Python Web Service'
-    _svc_display_name_ = 'Python Web Service'
+    _svc_name_ = "Python Web Service"
+    _svc_display_name_ = "Python Web Service"
     _svc_deps_ = None        # sequence of service names on which this depends
-    _exe_name_ = 'pywebsvc'
+    _exe_name_ = "pywebsvc"
     _exe_args_ = None        # Default to no arguments
 
     # Only exists on Windows 2000 or later, ignored on windows NT
-    _svc_description_ = 'Python Web Service'
+    _svc_description_ = "Python Web Service"
 
     def SvcDoRun(self):
         from cherrypy import process
@@ -175,7 +173,6 @@ class PyWebService(win32serviceutil.ServiceFramework):
         process.bus.exit()
 
     def SvcOther(self, control):
-        from cherrypy import process
         process.bus.publish(control_codes.key_for(control))
 
 
diff --git a/lib/cherrypy/process/wspbus.py b/lib/cherrypy/process/wspbus.py
index 57b08b83..5409d038 100644
--- a/lib/cherrypy/process/wspbus.py
+++ b/lib/cherrypy/process/wspbus.py
@@ -1,4 +1,4 @@
-r"""An implementation of the Web Site Process Bus.
+"""An implementation of the Web Site Process Bus.
 
 This module is completely standalone, depending only on the stdlib.
 
@@ -57,31 +57,18 @@ the new state.::
           |        \    |
           |         V   V
         STARTED <-- STARTING
+
 """
 
 import atexit
-
-try:
-    import ctypes
-except ImportError:
-    """Google AppEngine is shipped without ctypes.
-
-    :seealso: http://stackoverflow.com/a/6523777/70170
-    """
-    ctypes = None
-
-import operator
 import os
 import sys
 import threading
 import time
 import traceback as _traceback
 import warnings
-import subprocess
-import functools
-
-from more_itertools import always_iterable
 
+from cherrypy._cpcompat import set
 
 # Here I save the value of os.getcwd(), which, if I am imported early enough,
 # will be the directory from which the startup script was run.  This is needed
@@ -93,13 +80,15 @@ _startup_cwd = os.getcwd()
 
 
 class ChannelFailures(Exception):
-    """Exception raised during errors on Bus.publish()."""
 
+    """Exception raised when errors occur in a listener during Bus.publish().
+    """
     delimiter = '\n'
 
     def __init__(self, *args, **kwargs):
-        """Initialize ChannelFailures errors wrapper."""
-        super(ChannelFailures, self).__init__(*args, **kwargs)
+        # Don't use 'super' here; Exceptions are old-style in Py2.4
+        # See https://bitbucket.org/cherrypy/cherrypy/issue/959
+        Exception.__init__(self, *args, **kwargs)
         self._exceptions = list()
 
     def handle_exception(self):
@@ -111,14 +100,12 @@ class ChannelFailures(Exception):
         return self._exceptions[:]
 
     def __str__(self):
-        """Render the list of errors, which happened in channel."""
         exception_strings = map(repr, self.get_instances())
         return self.delimiter.join(exception_strings)
 
     __repr__ = __str__
 
     def __bool__(self):
-        """Determine whether any error happened in channel."""
         return bool(self._exceptions)
     __nonzero__ = __bool__
 
@@ -131,14 +118,12 @@ class _StateEnum(object):
         name = None
 
         def __repr__(self):
-            return 'states.%s' % self.name
+            return "states.%s" % self.name
 
     def __setattr__(self, key, value):
         if isinstance(value, self.State):
             value.name = key
         object.__setattr__(self, key, value)
-
-
 states = _StateEnum()
 states.STOPPED = states.State()
 states.STARTING = states.State()
@@ -159,13 +144,14 @@ else:
 
 
 class Bus(object):
+
     """Process state-machine and messenger for HTTP site deployment.
 
     All listeners for a given channel are guaranteed to be called even
     if others at the same channel fail. Each failure is logged, but
     execution proceeds on to the next listener. The only way to stop all
-    processing from inside a listener is to raise SystemExit and stop
-    the whole server.
+    processing from inside a listener is to raise SystemExit and stop the
+    whole server.
     """
 
     states = states
@@ -174,31 +160,18 @@ class Bus(object):
     max_cloexec_files = max_files
 
     def __init__(self):
-        """Initialize pub/sub bus."""
         self.execv = False
         self.state = states.STOPPED
-        channels = 'start', 'stop', 'exit', 'graceful', 'log', 'main'
         self.listeners = dict(
-            (channel, set())
-            for channel in channels
-        )
+            [(channel, set()) for channel
+             in ('start', 'stop', 'exit', 'graceful', 'log', 'main')])
         self._priorities = {}
 
-    def subscribe(self, channel, callback=None, priority=None):
-        """Add the given callback at the given channel (if not present).
-
-        If callback is None, return a partial suitable for decorating
-        the callback.
-        """
-        if callback is None:
-            return functools.partial(
-                self.subscribe,
-                channel,
-                priority=priority,
-            )
-
-        ch_listeners = self.listeners.setdefault(channel, set())
-        ch_listeners.add(callback)
+    def subscribe(self, channel, callback, priority=None):
+        """Add the given callback at the given channel (if not present)."""
+        if channel not in self.listeners:
+            self.listeners[channel] = set()
+        self.listeners[channel].add(callback)
 
         if priority is None:
             priority = getattr(callback, 'priority', 50)
@@ -219,11 +192,14 @@ class Bus(object):
         exc = ChannelFailures()
         output = []
 
-        raw_items = (
-            (self._priorities[(channel, listener)], listener)
-            for listener in self.listeners[channel]
-        )
-        items = sorted(raw_items, key=operator.itemgetter(0))
+        items = [(self._priorities[(channel, listener)], listener)
+                 for listener in self.listeners[channel]]
+        try:
+            items.sort(key=lambda item: item[0])
+        except TypeError:
+            # Python 2.3 had no 'key' arg, but that doesn't matter
+            # since it could sort dissimilar types just fine.
+            items.sort()
         for priority, listener in items:
             try:
                 output.append(listener(*args, **kwargs))
@@ -235,26 +211,26 @@ class Bus(object):
                 if exc and e.code == 0:
                     e.code = 1
                 raise
-            except Exception:
+            except:
                 exc.handle_exception()
                 if channel == 'log':
                     # Assume any further messages to 'log' will fail.
                     pass
                 else:
-                    self.log('Error in %r listener %r' % (channel, listener),
+                    self.log("Error in %r listener %r" % (channel, listener),
                              level=40, traceback=True)
         if exc:
             raise exc
         return output
 
     def _clean_exit(self):
-        """Assert that the Bus is not running in atexit handler callback."""
+        """An atexit handler which asserts the Bus is not running."""
         if self.state != states.EXITING:
             warnings.warn(
-                'The main thread is exiting, but the Bus is in the %r state; '
-                'shutting it down automatically now. You must either call '
-                'bus.block() after start(), or call bus.exit() before the '
-                'main thread exits.' % self.state, RuntimeWarning)
+                "The main thread is exiting, but the Bus is in the %r state; "
+                "shutting it down automatically now. You must either call "
+                "bus.block() after start(), or call bus.exit() before the "
+                "main thread exits." % self.state, RuntimeWarning)
             self.exit()
 
     def start(self):
@@ -269,13 +245,13 @@ class Bus(object):
             self.log('Bus STARTED')
         except (KeyboardInterrupt, SystemExit):
             raise
-        except Exception:
-            self.log('Shutting down due to error in start listener:',
+        except:
+            self.log("Shutting down due to error in start listener:",
                      level=40, traceback=True)
             e_info = sys.exc_info()[1]
             try:
                 self.exit()
-            except Exception:
+            except:
                 # Any stop/exit errors will be logged inside publish().
                 pass
             # Re-raise the original error
@@ -284,7 +260,6 @@ class Bus(object):
     def exit(self):
         """Stop all services and prepare to exit the process."""
         exitstate = self.state
-        EX_SOFTWARE = 70
         try:
             self.stop()
 
@@ -294,26 +269,25 @@ class Bus(object):
             # This isn't strictly necessary, but it's better than seeing
             # "Waiting for child threads to terminate..." and then nothing.
             self.log('Bus EXITED')
-        except Exception:
+        except:
             # This method is often called asynchronously (whether thread,
             # signal handler, console handler, or atexit handler), so we
             # can't just let exceptions propagate out unhandled.
             # Assume it's been logged and just die.
-            os._exit(EX_SOFTWARE)
+            os._exit(70)  # EX_SOFTWARE
 
         if exitstate == states.STARTING:
             # exit() was called before start() finished, possibly due to
             # Ctrl-C because a start listener got stuck. In this case,
             # we could get stuck in a loop where Ctrl-C never exits the
             # process, so we just call os.exit here.
-            os._exit(EX_SOFTWARE)
+            os._exit(70)  # EX_SOFTWARE
 
     def restart(self):
         """Restart the process (may close connections).
 
-        This method does not restart the process from the calling
-        thread; instead, it stops the bus and asks the main thread to
-        call execv.
+        This method does not restart the process from the calling thread;
+        instead, it stops the bus and asks the main thread to call execv.
         """
         self.execv = True
         self.exit()
@@ -327,11 +301,10 @@ class Bus(object):
         """Wait for the EXITING state, KeyboardInterrupt or SystemExit.
 
         This function is intended to be called only by the main thread.
-        After waiting for the EXITING state, it also waits for all
-        threads to terminate, and then calls os.execv if self.execv is
-        True. This design allows another thread to call bus.restart, yet
-        have the main thread perform the actual execv call (required on
-        some platforms).
+        After waiting for the EXITING state, it also waits for all threads
+        to terminate, and then calls os.execv if self.execv is True. This
+        design allows another thread to call bus.restart, yet have the main
+        thread perform the actual execv call (required on some platforms).
         """
         try:
             self.wait(states.EXITING, interval=interval, channel='main')
@@ -346,58 +319,73 @@ class Bus(object):
             raise
 
         # Waiting for ALL child threads to finish is necessary on OS X.
-        # See https://github.com/cherrypy/cherrypy/issues/581.
+        # See https://bitbucket.org/cherrypy/cherrypy/issue/581.
         # It's also good to let them all shut down before allowing
         # the main thread to call atexit handlers.
-        # See https://github.com/cherrypy/cherrypy/issues/751.
-        self.log('Waiting for child threads to terminate...')
+        # See https://bitbucket.org/cherrypy/cherrypy/issue/751.
+        self.log("Waiting for child threads to terminate...")
         for t in threading.enumerate():
             # Validate the we're not trying to join the MainThread
             # that will cause a deadlock and the case exist when
             # implemented as a windows service and in any other case
             # that another thread executes cherrypy.engine.exit()
             if (
-                    t != threading.current_thread() and
-                    not isinstance(t, threading._MainThread) and
-                    # Note that any dummy (external) threads are
-                    # always daemonic.
-                    not t.daemon
+                    t != threading.currentThread() and
+                    t.isAlive() and
+                    not isinstance(t, threading._MainThread)
             ):
-                self.log('Waiting for thread %s.' % t.name)
-                t.join()
+                # Note that any dummy (external) threads are always daemonic.
+                if hasattr(threading.Thread, "daemon"):
+                    # Python 2.6+
+                    d = t.daemon
+                else:
+                    d = t.isDaemon()
+                if not d:
+                    self.log("Waiting for thread %s." % t.getName())
+                    t.join()
 
         if self.execv:
             self._do_execv()
 
     def wait(self, state, interval=0.1, channel=None):
         """Poll for the given state(s) at intervals; publish to channel."""
-        states = set(always_iterable(state))
+        if isinstance(state, (tuple, list)):
+            states = state
+        else:
+            states = [state]
 
-        while self.state not in states:
-            time.sleep(interval)
-            self.publish(channel)
+        def _wait():
+            while self.state not in states:
+                time.sleep(interval)
+                self.publish(channel)
+
+        # From http://psyco.sourceforge.net/psycoguide/bugs.html:
+        # "The compiled machine code does not include the regular polling
+        # done by Python, meaning that a KeyboardInterrupt will not be
+        # detected before execution comes back to the regular Python
+        # interpreter. Your program cannot be interrupted if caught
+        # into an infinite Psyco-compiled loop."
+        try:
+            sys.modules['psyco'].cannotcompile(_wait)
+        except (KeyError, AttributeError):
+            pass
+
+        _wait()
 
     def _do_execv(self):
         """Re-execute the current process.
 
-        This must be called from the main thread, because certain
-        platforms (OS X) don't allow execv to be called in a child
-        thread very well.
+        This must be called from the main thread, because certain platforms
+        (OS X) don't allow execv to be called in a child thread very well.
         """
-        try:
-            args = self._get_true_argv()
-        except NotImplementedError:
-            """It's probably win32 or GAE."""
-            args = [sys.executable] + self._get_interpreter_argv() + sys.argv
-
+        args = sys.argv[:]
         self.log('Re-spawning %s' % ' '.join(args))
 
-        self._extend_pythonpath(os.environ)
-
         if sys.platform[:4] == 'java':
             from _systemrestart import SystemRestart
             raise SystemRestart
         else:
+            args.insert(0, sys.executable)
             if sys.platform == 'win32':
                 args = ['"%s"' % arg for arg in args]
 
@@ -406,142 +394,14 @@ class Bus(object):
                 self._set_cloexec()
             os.execv(sys.executable, args)
 
-    @staticmethod
-    def _get_interpreter_argv():
-        """Retrieve current Python interpreter's arguments.
-
-        Returns empty tuple in case of frozen mode, uses built-in arguments
-        reproduction function otherwise.
-
-        Frozen mode is possible for the app has been packaged into a binary
-        executable using py2exe. In this case the interpreter's arguments are
-        already built-in into that executable.
-
-        :seealso: https://github.com/cherrypy/cherrypy/issues/1526
-        Ref: https://pythonhosted.org/PyInstaller/runtime-information.html
-        """
-        return ([]
-                if getattr(sys, 'frozen', False)
-                else subprocess._args_from_interpreter_flags())
-
-    @staticmethod
-    def _get_true_argv():
-        """Retrieve all real arguments of the python interpreter.
-
-        ...even those not listed in ``sys.argv``
-
-        :seealso: http://stackoverflow.com/a/28338254/595220
-        :seealso: http://stackoverflow.com/a/6683222/595220
-        :seealso: http://stackoverflow.com/a/28414807/595220
-        """
-        try:
-            char_p = ctypes.c_wchar_p
-
-            argv = ctypes.POINTER(char_p)()
-            argc = ctypes.c_int()
-
-            ctypes.pythonapi.Py_GetArgcArgv(
-                ctypes.byref(argc),
-                ctypes.byref(argv),
-            )
-
-            _argv = argv[:argc.value]
-
-            # The code below is trying to correctly handle special cases.
-            # `-c`'s argument interpreted by Python itself becomes `-c` as
-            # well. Same applies to `-m`. This snippet is trying to survive
-            # at least the case with `-m`
-            # Ref: https://github.com/cherrypy/cherrypy/issues/1545
-            # Ref: python/cpython@418baf9
-            argv_len, is_command, is_module = len(_argv), False, False
-
-            try:
-                m_ind = _argv.index('-m')
-                if m_ind < argv_len - 1 and _argv[m_ind + 1] in ('-c', '-m'):
-                    """
-                    In some older Python versions `-m`'s argument may be
-                    substituted with `-c`, not `-m`
-                    """
-                    is_module = True
-            except (IndexError, ValueError):
-                m_ind = None
-
-            try:
-                c_ind = _argv.index('-c')
-                if c_ind < argv_len - 1 and _argv[c_ind + 1] == '-c':
-                    is_command = True
-            except (IndexError, ValueError):
-                c_ind = None
-
-            if is_module:
-                """It's containing `-m -m` sequence of arguments."""
-                if is_command and c_ind < m_ind:
-                    """There's `-c -c` before `-m`"""
-                    raise RuntimeError(
-                        "Cannot reconstruct command from '-c'. Ref: "
-                        'https://github.com/cherrypy/cherrypy/issues/1545')
-                # Survive module argument here
-                original_module = sys.argv[0]
-                if not os.access(original_module, os.R_OK):
-                    """There's no such module exist."""
-                    raise AttributeError(
-                        "{} doesn't seem to be a module "
-                        'accessible by current user'.format(original_module))
-                del _argv[m_ind:m_ind + 2]  # remove `-m -m`
-                # ... and substitute it with the original module path:
-                _argv.insert(m_ind, original_module)
-            elif is_command:
-                """It's containing just `-c -c` sequence of arguments."""
-                raise RuntimeError(
-                    "Cannot reconstruct command from '-c'. "
-                    'Ref: https://github.com/cherrypy/cherrypy/issues/1545')
-        except AttributeError:
-            """It looks Py_GetArgcArgv's completely absent in some environments
-
-            It is known, that there's no Py_GetArgcArgv in MS Windows and
-            ``ctypes`` module is completely absent in Google AppEngine
-
-            :seealso: https://github.com/cherrypy/cherrypy/issues/1506
-            :seealso: https://github.com/cherrypy/cherrypy/issues/1512
-            :ref: http://bit.ly/2gK6bXK
-            """
-            raise NotImplementedError
-        else:
-            return _argv
-
-    @staticmethod
-    def _extend_pythonpath(env):
-        """Prepend current working dir to PATH environment variable if needed.
-
-        If sys.path[0] is an empty string, the interpreter was likely
-        invoked with -m and the effective path is about to change on re-
-        exec.  Add the current directory to $PYTHONPATH to ensure that
-        the new process sees the same path.
-
-        This issue cannot be addressed in the general case because
-        Python cannot reliably reconstruct the original command line (
-        http://bugs.python.org/issue14208).
-
-        (This idea filched from tornado.autoreload)
-        """
-        path_prefix = '.' + os.pathsep
-        existing_path = env.get('PYTHONPATH', '')
-        needs_patch = (
-            sys.path[0] == '' and
-            not existing_path.startswith(path_prefix)
-        )
-
-        if needs_patch:
-            env['PYTHONPATH'] = path_prefix + existing_path
-
     def _set_cloexec(self):
         """Set the CLOEXEC flag on all open files (except stdin/out/err).
 
         If self.max_cloexec_files is an integer (the default), then on
-        platforms which support it, it represents the max open files
-        setting for the operating system. This function will be called
-        just before the process is restarted via os.execv() to prevent
-        open files from persisting into the new process.
+        platforms which support it, it represents the max open files setting
+        for the operating system. This function will be called just before
+        the process is restarted via os.execv() to prevent open files
+        from persisting into the new process.
 
         Set self.max_cloexec_files to 0 to disable this behavior.
         """
@@ -572,21 +432,17 @@ class Bus(object):
             self.wait(states.STARTED)
             func(*a, **kw)
         t = threading.Thread(target=_callback, args=args, kwargs=kwargs)
-        t.name = 'Bus Callback ' + t.name
+        t.setName('Bus Callback ' + t.getName())
         t.start()
 
         self.start()
 
         return t
 
-    def log(self, msg='', level=20, traceback=False):
-        """Log the given message.
-
-        Append the last traceback if requested.
-        """
+    def log(self, msg="", level=20, traceback=False):
+        """Log the given message. Append the last traceback if requested."""
         if traceback:
-            msg += '\n' + ''.join(_traceback.format_exception(*sys.exc_info()))
+            msg += "\n" + "".join(_traceback.format_exception(*sys.exc_info()))
         self.publish('log', msg, level)
 
-
 bus = Bus()
diff --git a/lib/cherrypy/scaffold/__init__.py b/lib/cherrypy/scaffold/__init__.py
index 1fa26bee..50de34bb 100644
--- a/lib/cherrypy/scaffold/__init__.py
+++ b/lib/cherrypy/scaffold/__init__.py
@@ -8,7 +8,8 @@ then tweak as desired.
 Even before any tweaking, this should serve a few demonstration pages.
 Change to this directory and run:
 
-    cherryd -c site.conf
+    ../cherryd -c site.conf
+
 """
 
 import cherrypy
@@ -18,38 +19,36 @@ import os
 local_dir = os.path.join(os.getcwd(), os.path.dirname(__file__))
 
 
-@cherrypy.config(**{'tools.log_tracebacks.on': True})
 class Root:
-    """Declaration of the CherryPy app URI structure."""
 
-    @cherrypy.expose
+    _cp_config = {'tools.log_tracebacks.on': True,
+                  }
+
     def index(self):
-        """Render HTML-template at the root path of the web-app."""
         return """<html>
 <body>Try some <a href='%s?a=7'>other</a> path,
 or a <a href='%s?n=14'>default</a> path.<br />
 Or, just look at the pretty picture:<br />
 <img src='%s' />
-</body></html>""" % (url('other'), url('else'),
-                     url('files/made_with_cherrypy_small.png'))
+</body></html>""" % (url("other"), url("else"),
+                     url("files/made_with_cherrypy_small.png"))
+    index.exposed = True
 
-    @cherrypy.expose
     def default(self, *args, **kwargs):
-        """Render catch-all args and kwargs."""
-        return 'args: %s kwargs: %s' % (args, kwargs)
+        return "args: %s kwargs: %s" % (args, kwargs)
+    default.exposed = True
 
-    @cherrypy.expose
     def other(self, a=2, b='bananas', c=None):
-        """Render number of fruits based on third argument."""
         cherrypy.response.headers['Content-Type'] = 'text/plain'
         if c is None:
-            return 'Have %d %s.' % (int(a), b)
+            return "Have %d %s." % (int(a), b)
         else:
-            return 'Have %d %s, %s.' % (int(a), b, c)
+            return "Have %d %s, %s." % (int(a), b, c)
+    other.exposed = True
 
-    files = tools.staticdir.handler(
-        section='/files',
-        dir=os.path.join(local_dir, 'static'),
+    files = cherrypy.tools.staticdir.handler(
+        section="/files",
+        dir=os.path.join(local_dir, "static"),
         # Ignore .php files, etc.
                 match=r'\.(css|gif|html?|ico|jpe?g|js|png|swf|xml)$',
     )
@@ -58,5 +57,5 @@ Or, just look at the pretty picture:<br />
 root = Root()
 
 # Uncomment the following to use your own favicon instead of CP's default.
-# favicon_path = os.path.join(local_dir, "favicon.ico")
-# root.favicon_ico = tools.staticfile.handler(filename=favicon_path)
+#favicon_path = os.path.join(local_dir, "favicon.ico")
+#root.favicon_ico = tools.staticfile.handler(filename=favicon_path)
diff --git a/lib/cherrypy/scaffold/apache-fcgi.conf b/lib/cherrypy/scaffold/apache-fcgi.conf
deleted file mode 100644
index 6e4f144c..00000000
--- a/lib/cherrypy/scaffold/apache-fcgi.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# Apache2 server conf file for using CherryPy with mod_fcgid.
-
-# This doesn't have to be "C:/", but it has to be a directory somewhere, and
-# MUST match the directory used in the FastCgiExternalServer directive, below.
-DocumentRoot "C:/"
-
-ServerName 127.0.0.1
-Listen 80
-LoadModule fastcgi_module modules/mod_fastcgi.dll
-LoadModule rewrite_module modules/mod_rewrite.so
-
-Options ExecCGI
-SetHandler fastcgi-script
-RewriteEngine On
-# Send requests for any URI to our fastcgi handler.
-RewriteRule ^(.*)$ /fastcgi.pyc [L]
-
-# The FastCgiExternalServer directive defines filename as an external FastCGI application.
-# If filename does not begin with a slash (/) then it is assumed to be relative to the ServerRoot.
-# The filename does not have to exist in the local filesystem. URIs that Apache resolves to this
-# filename will be handled by this external FastCGI application.
-FastCgiExternalServer "C:/fastcgi.pyc" -host 127.0.0.1:8088
diff --git a/lib/cherrypy/scaffold/example.conf b/lib/cherrypy/scaffold/example.conf
deleted file mode 100644
index 63250fe3..00000000
--- a/lib/cherrypy/scaffold/example.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[/]
-log.error_file: "error.log"
-log.access_file: "access.log"
diff --git a/lib/cherrypy/scaffold/site.conf b/lib/cherrypy/scaffold/site.conf
deleted file mode 100644
index 6ed38983..00000000
--- a/lib/cherrypy/scaffold/site.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[global]
-# Uncomment this when you're done developing
-#environment: "production"
-
-server.socket_host: "0.0.0.0"
-server.socket_port: 8088
-
-# Uncomment the following lines to run on HTTPS at the same time
-#server.2.socket_host: "0.0.0.0"
-#server.2.socket_port: 8433
-#server.2.ssl_certificate: '../test/test.pem'
-#server.2.ssl_private_key: '../test/test.pem'
-
-tree.myapp: cherrypy.Application(scaffold.root, "/", "example.conf")
diff --git a/lib/cherrypy/scaffold/static/made_with_cherrypy_small.png b/lib/cherrypy/scaffold/static/made_with_cherrypy_small.png
deleted file mode 100644
index 724f9d72..00000000
Binary files a/lib/cherrypy/scaffold/static/made_with_cherrypy_small.png and /dev/null differ
diff --git a/lib/cherrypy/test/__init__.py b/lib/cherrypy/test/__init__.py
deleted file mode 100644
index 72c4c261..00000000
--- a/lib/cherrypy/test/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-"""Regression test suite for CherryPy."""
-
-import os
-import sys
-
-
-def newexit():
-    os._exit(1)
-
-
-def setup():
-    # We want to monkey patch sys.exit so that we can get some
-    # information about where exit is being called.
-    newexit._old = sys.exit
-    sys.exit = newexit
-
-
-def teardown():
-    try:
-        sys.exit = sys.exit._old
-    except AttributeError:
-        sys.exit = sys._exit
diff --git a/lib/cherrypy/test/_test_decorators.py b/lib/cherrypy/test/_test_decorators.py
deleted file mode 100644
index 02effbee..00000000
--- a/lib/cherrypy/test/_test_decorators.py
+++ /dev/null
@@ -1,39 +0,0 @@
-"""Test module for the @-decorator syntax, which is version-specific."""
-
-import cherrypy
-from cherrypy import expose, tools
-
-
-class ExposeExamples(object):
-
-    @expose
-    def no_call(self):
-        return 'Mr E. R. Bradshaw'
-
-    @expose()
-    def call_empty(self):
-        return 'Mrs. B.J. Smegma'
-
-    @expose('call_alias')
-    def nesbitt(self):
-        return 'Mr Nesbitt'
-
-    @expose(['alias1', 'alias2'])
-    def andrews(self):
-        return 'Mr Ken Andrews'
-
-    @expose(alias='alias3')
-    def watson(self):
-        return 'Mr. and Mrs. Watson'
-
-
-class ToolExamples(object):
-
-    @expose
-    # This is here to demonstrate that using the config decorator
-    # does not overwrite other config attributes added by the Tool
-    # decorator (in this case response_headers).
-    @cherrypy.config(**{'response.stream': True})
-    @tools.response_headers(headers=[('Content-Type', 'application/data')])
-    def blah(self):
-        yield b'blah'
diff --git a/lib/cherrypy/test/_test_states_demo.py b/lib/cherrypy/test/_test_states_demo.py
deleted file mode 100644
index a49407ba..00000000
--- a/lib/cherrypy/test/_test_states_demo.py
+++ /dev/null
@@ -1,69 +0,0 @@
-import os
-import sys
-import time
-
-import cherrypy
-
-starttime = time.time()
-
-
-class Root:
-
-    @cherrypy.expose
-    def index(self):
-        return 'Hello World'
-
-    @cherrypy.expose
-    def mtimes(self):
-        return repr(cherrypy.engine.publish('Autoreloader', 'mtimes'))
-
-    @cherrypy.expose
-    def pid(self):
-        return str(os.getpid())
-
-    @cherrypy.expose
-    def start(self):
-        return repr(starttime)
-
-    @cherrypy.expose
-    def exit(self):
-        # This handler might be called before the engine is STARTED if an
-        # HTTP worker thread handles it before the HTTP server returns
-        # control to engine.start. We avoid that race condition here
-        # by waiting for the Bus to be STARTED.
-        cherrypy.engine.wait(state=cherrypy.engine.states.STARTED)
-        cherrypy.engine.exit()
-
-
-@cherrypy.engine.subscribe('start', priority=100)
-def unsub_sig():
-    cherrypy.log('unsubsig: %s' % cherrypy.config.get('unsubsig', False))
-    if cherrypy.config.get('unsubsig', False):
-        cherrypy.log('Unsubscribing the default cherrypy signal handler')
-        cherrypy.engine.signal_handler.unsubscribe()
-    try:
-        from signal import signal, SIGTERM
-    except ImportError:
-        pass
-    else:
-        def old_term_handler(signum=None, frame=None):
-            cherrypy.log('I am an old SIGTERM handler.')
-            sys.exit(0)
-        cherrypy.log('Subscribing the new one.')
-        signal(SIGTERM, old_term_handler)
-
-
-@cherrypy.engine.subscribe('start', priority=6)
-def starterror():
-    if cherrypy.config.get('starterror', False):
-        1 / 0
-
-
-@cherrypy.engine.subscribe('start', priority=6)
-def log_test_case_name():
-    if cherrypy.config.get('test_case_name', False):
-        cherrypy.log('STARTED FROM: %s' %
-                     cherrypy.config.get('test_case_name'))
-
-
-cherrypy.tree.mount(Root(), '/', {'/': {}})
diff --git a/lib/cherrypy/test/benchmark.py b/lib/cherrypy/test/benchmark.py
deleted file mode 100644
index 9c65e17b..00000000
--- a/lib/cherrypy/test/benchmark.py
+++ /dev/null
@@ -1,424 +0,0 @@
-"""CherryPy Benchmark Tool.
-
-Usage:
-    benchmark.py [options]
-
---null:        use a null Request object (to bench the HTTP server only)
---notests:     start the server but do not run the tests; this allows
-               you to check the tested pages with a browser
---help:        show this help message
---cpmodpy:     run tests via apache on 54583 (with the builtin _cpmodpy)
---modpython:   run tests via apache on 54583 (with modpython_gateway)
---ab=path:     Use the ab script/executable at 'path' (see below)
---apache=path: Use the apache script/exe at 'path' (see below)
-
-To run the benchmarks, the Apache Benchmark tool "ab" must either be on
-your system path, or specified via the --ab=path option.
-
-To run the modpython tests, the "apache" executable or script must be
-on your system path, or provided via the --apache=path option. On some
-platforms, "apache" may be called "apachectl" or "apache2ctl"--create
-a symlink to them if needed.
-"""
-
-import getopt
-import os
-import re
-import sys
-import time
-
-import cherrypy
-from cherrypy import _cperror, _cpmodpy
-from cherrypy.lib import httputil
-
-
-curdir = os.path.join(os.getcwd(), os.path.dirname(__file__))
-
-AB_PATH = ''
-APACHE_PATH = 'apache'
-SCRIPT_NAME = '/cpbench/users/rdelon/apps/blog'
-
-__all__ = ['ABSession', 'Root', 'print_report',
-           'run_standard_benchmarks', 'safe_threads',
-           'size_report', 'thread_report',
-           ]
-
-size_cache = {}
-
-
-class Root:
-
-    @cherrypy.expose
-    def index(self):
-        return """<html>
-<head>
-    <title>CherryPy Benchmark</title>
-</head>
-<body>
-    <ul>
-        <li><a href="hello">Hello, world! (14 byte dynamic)</a></li>
-        <li><a href="static/index.html">Static file (14 bytes static)</a></li>
-        <li><form action="sizer">Response of length:
-            <input type='text' name='size' value='10' /></form>
-        </li>
-    </ul>
-</body>
-</html>"""
-
-    @cherrypy.expose
-    def hello(self):
-        return 'Hello, world\r\n'
-
-    @cherrypy.expose
-    def sizer(self, size):
-        resp = size_cache.get(size, None)
-        if resp is None:
-            size_cache[size] = resp = 'X' * int(size)
-        return resp
-
-
-def init():
-
-    cherrypy.config.update({
-        'log.error.file': '',
-        'environment': 'production',
-        'server.socket_host': '127.0.0.1',
-        'server.socket_port': 54583,
-        'server.max_request_header_size': 0,
-        'server.max_request_body_size': 0,
-    })
-
-    # Cheat mode on ;)
-    del cherrypy.config['tools.log_tracebacks.on']
-    del cherrypy.config['tools.log_headers.on']
-    del cherrypy.config['tools.trailing_slash.on']
-
-    appconf = {
-        '/static': {
-            'tools.staticdir.on': True,
-            'tools.staticdir.dir': 'static',
-            'tools.staticdir.root': curdir,
-        },
-    }
-    globals().update(
-        app=cherrypy.tree.mount(Root(), SCRIPT_NAME, appconf),
-    )
-
-
-class NullRequest:
-    """A null HTTP request class, returning 200 and an empty body."""
-
-    def __init__(self, local, remote, scheme='http'):
-        pass
-
-    def close(self):
-        pass
-
-    def run(self, method, path, query_string, protocol, headers, rfile):
-        cherrypy.response.status = '200 OK'
-        cherrypy.response.header_list = [('Content-Type', 'text/html'),
-                                         ('Server', 'Null CherryPy'),
-                                         ('Date', httputil.HTTPDate()),
-                                         ('Content-Length', '0'),
-                                         ]
-        cherrypy.response.body = ['']
-        return cherrypy.response
-
-
-class NullResponse:
-    pass
-
-
-class ABSession:
-    """A session of 'ab', the Apache HTTP server benchmarking tool.
-
-    Example output from ab:
-
-    This is ApacheBench, Version 2.0.40-dev <$Revision: 1.121.2.1 $> apache-2.0
-    Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd,
-    http://www.zeustech.net/
-    Copyright (c) 1998-2002 The Apache Software Foundation,
-    http://www.apache.org/
-
-    Benchmarking 127.0.0.1 (be patient)
-    Completed 100 requests
-    Completed 200 requests
-    Completed 300 requests
-    Completed 400 requests
-    Completed 500 requests
-    Completed 600 requests
-    Completed 700 requests
-    Completed 800 requests
-    Completed 900 requests
-
-
-    Server Software:        CherryPy/3.1beta
-    Server Hostname:        127.0.0.1
-    Server Port:            54583
-
-    Document Path:          /static/index.html
-    Document Length:        14 bytes
-
-    Concurrency Level:      10
-    Time taken for tests:   9.643867 seconds
-    Complete requests:      1000
-    Failed requests:        0
-    Write errors:           0
-    Total transferred:      189000 bytes
-    HTML transferred:       14000 bytes
-    Requests per second:    103.69 [#/sec] (mean)
-    Time per request:       96.439 [ms] (mean)
-    Time per request:       9.644 [ms] (mean, across all concurrent requests)
-    Transfer rate:          19.08 [Kbytes/sec] received
-
-    Connection Times (ms)
-                  min  mean[+/-sd] median   max
-    Connect:        0    0   2.9      0      10
-    Processing:    20   94   7.3     90     130
-    Waiting:        0   43  28.1     40     100
-    Total:         20   95   7.3    100     130
-
-    Percentage of the requests served within a certain time (ms)
-      50%    100
-      66%    100
-      75%    100
-      80%    100
-      90%    100
-      95%    100
-      98%    100
-      99%    110
-     100%    130 (longest request)
-    Finished 1000 requests
-    """
-
-    parse_patterns = [
-        ('complete_requests', 'Completed',
-         br'^Complete requests:\s*(\d+)'),
-        ('failed_requests', 'Failed',
-         br'^Failed requests:\s*(\d+)'),
-        ('requests_per_second', 'req/sec',
-         br'^Requests per second:\s*([0-9.]+)'),
-        ('time_per_request_concurrent', 'msec/req',
-         br'^Time per request:\s*([0-9.]+).*concurrent requests\)$'),
-        ('transfer_rate', 'KB/sec',
-         br'^Transfer rate:\s*([0-9.]+)')
-    ]
-
-    def __init__(self, path=SCRIPT_NAME + '/hello', requests=1000,
-                 concurrency=10):
-        self.path = path
-        self.requests = requests
-        self.concurrency = concurrency
-
-    def args(self):
-        port = cherrypy.server.socket_port
-        assert self.concurrency > 0
-        assert self.requests > 0
-        # Don't use "localhost".
-        # Cf
-        # http://mail.python.org/pipermail/python-win32/2008-March/007050.html
-        return ('-k -n %s -c %s http://127.0.0.1:%s%s' %
-                (self.requests, self.concurrency, port, self.path))
-
-    def run(self):
-        # Parse output of ab, setting attributes on self
-        try:
-            self.output = _cpmodpy.read_process(AB_PATH or 'ab', self.args())
-        except Exception:
-            print(_cperror.format_exc())
-            raise
-
-        for attr, name, pattern in self.parse_patterns:
-            val = re.search(pattern, self.output, re.MULTILINE)
-            if val:
-                val = val.group(1)
-                setattr(self, attr, val)
-            else:
-                setattr(self, attr, None)
-
-
-safe_threads = (25, 50, 100, 200, 400)
-if sys.platform in ('win32',):
-    # For some reason, ab crashes with > 50 threads on my Win2k laptop.
-    safe_threads = (10, 20, 30, 40, 50)
-
-
-def thread_report(path=SCRIPT_NAME + '/hello', concurrency=safe_threads):
-    sess = ABSession(path)
-    attrs, names, patterns = list(zip(*sess.parse_patterns))
-    avg = dict.fromkeys(attrs, 0.0)
-
-    yield ('threads',) + names
-    for c in concurrency:
-        sess.concurrency = c
-        sess.run()
-        row = [c]
-        for attr in attrs:
-            val = getattr(sess, attr)
-            if val is None:
-                print(sess.output)
-                row = None
-                break
-            val = float(val)
-            avg[attr] += float(val)
-            row.append(val)
-        if row:
-            yield row
-
-    # Add a row of averages.
-    yield ['Average'] + [str(avg[attr] / len(concurrency)) for attr in attrs]
-
-
-def size_report(sizes=(10, 100, 1000, 10000, 100000, 100000000),
-                concurrency=50):
-    sess = ABSession(concurrency=concurrency)
-    attrs, names, patterns = list(zip(*sess.parse_patterns))
-    yield ('bytes',) + names
-    for sz in sizes:
-        sess.path = '%s/sizer?size=%s' % (SCRIPT_NAME, sz)
-        sess.run()
-        yield [sz] + [getattr(sess, attr) for attr in attrs]
-
-
-def print_report(rows):
-    for row in rows:
-        print('')
-        for val in row:
-            sys.stdout.write(str(val).rjust(10) + ' | ')
-    print('')
-
-
-def run_standard_benchmarks():
-    print('')
-    print('Client Thread Report (1000 requests, 14 byte response body, '
-          '%s server threads):' % cherrypy.server.thread_pool)
-    print_report(thread_report())
-
-    print('')
-    print('Client Thread Report (1000 requests, 14 bytes via staticdir, '
-          '%s server threads):' % cherrypy.server.thread_pool)
-    print_report(thread_report('%s/static/index.html' % SCRIPT_NAME))
-
-    print('')
-    print('Size Report (1000 requests, 50 client threads, '
-          '%s server threads):' % cherrypy.server.thread_pool)
-    print_report(size_report())
-
-
-#                         modpython and other WSGI                         #
-
-def startup_modpython(req=None):
-    """Start the CherryPy app server in 'serverless' mode (for modpython/WSGI).
-    """
-    if cherrypy.engine.state == cherrypy._cpengine.STOPPED:
-        if req:
-            if 'nullreq' in req.get_options():
-                cherrypy.engine.request_class = NullRequest
-                cherrypy.engine.response_class = NullResponse
-            ab_opt = req.get_options().get('ab', '')
-            if ab_opt:
-                global AB_PATH
-                AB_PATH = ab_opt
-        cherrypy.engine.start()
-    if cherrypy.engine.state == cherrypy._cpengine.STARTING:
-        cherrypy.engine.wait()
-    return 0  # apache.OK
-
-
-def run_modpython(use_wsgi=False):
-    print('Starting mod_python...')
-    pyopts = []
-
-    # Pass the null and ab=path options through Apache
-    if '--null' in opts:
-        pyopts.append(('nullreq', ''))
-
-    if '--ab' in opts:
-        pyopts.append(('ab', opts['--ab']))
-
-    s = _cpmodpy.ModPythonServer
-    if use_wsgi:
-        pyopts.append(('wsgi.application', 'cherrypy::tree'))
-        pyopts.append(
-            ('wsgi.startup', 'cherrypy.test.benchmark::startup_modpython'))
-        handler = 'modpython_gateway::handler'
-        s = s(port=54583, opts=pyopts,
-              apache_path=APACHE_PATH, handler=handler)
-    else:
-        pyopts.append(
-            ('cherrypy.setup', 'cherrypy.test.benchmark::startup_modpython'))
-        s = s(port=54583, opts=pyopts, apache_path=APACHE_PATH)
-
-    try:
-        s.start()
-        run()
-    finally:
-        s.stop()
-
-
-if __name__ == '__main__':
-    init()
-
-    longopts = ['cpmodpy', 'modpython', 'null', 'notests',
-                'help', 'ab=', 'apache=']
-    try:
-        switches, args = getopt.getopt(sys.argv[1:], '', longopts)
-        opts = dict(switches)
-    except getopt.GetoptError:
-        print(__doc__)
-        sys.exit(2)
-
-    if '--help' in opts:
-        print(__doc__)
-        sys.exit(0)
-
-    if '--ab' in opts:
-        AB_PATH = opts['--ab']
-
-    if '--notests' in opts:
-        # Return without stopping the server, so that the pages
-        # can be tested from a standard web browser.
-        def run():
-            port = cherrypy.server.socket_port
-            print('You may now open http://127.0.0.1:%s%s/' %
-                  (port, SCRIPT_NAME))
-
-            if '--null' in opts:
-                print('Using null Request object')
-    else:
-        def run():
-            end = time.time() - start
-            print('Started in %s seconds' % end)
-            if '--null' in opts:
-                print('\nUsing null Request object')
-            try:
-                try:
-                    run_standard_benchmarks()
-                except Exception:
-                    print(_cperror.format_exc())
-                    raise
-            finally:
-                cherrypy.engine.exit()
-
-    print('Starting CherryPy app server...')
-
-    class NullWriter(object):
-        """Suppresses the printing of socket errors."""
-
-        def write(self, data):
-            pass
-    sys.stderr = NullWriter()
-
-    start = time.time()
-
-    if '--cpmodpy' in opts:
-        run_modpython()
-    elif '--modpython' in opts:
-        run_modpython(use_wsgi=True)
-    else:
-        if '--null' in opts:
-            cherrypy.server.request_class = NullRequest
-            cherrypy.server.response_class = NullResponse
-
-        cherrypy.engine.start_with_callback(run)
-        cherrypy.engine.block()
diff --git a/lib/cherrypy/test/checkerdemo.py b/lib/cherrypy/test/checkerdemo.py
deleted file mode 100644
index 02553ab0..00000000
--- a/lib/cherrypy/test/checkerdemo.py
+++ /dev/null
@@ -1,49 +0,0 @@
-"""Demonstration app for cherrypy.checker.
-
-This application is intentionally broken and badly designed. To
-demonstrate the output of the CherryPy Checker, simply execute this
-module.
-"""
-
-import os
-import cherrypy
-thisdir = os.path.dirname(os.path.abspath(__file__))
-
-
-class Root:
-    pass
-
-
-if __name__ == '__main__':
-    conf = {'/base': {'tools.staticdir.root': thisdir,
-                      # Obsolete key.
-                      'throw_errors': True,
-                      },
-            # This entry should be OK.
-            '/base/static': {'tools.staticdir.on': True,
-                             'tools.staticdir.dir': 'static'},
-            # Warn on missing folder.
-            '/base/js': {'tools.staticdir.on': True,
-                         'tools.staticdir.dir': 'js'},
-            # Warn on dir with an abs path even though we provide root.
-            '/base/static2': {'tools.staticdir.on': True,
-                              'tools.staticdir.dir': '/static'},
-            # Warn on dir with a relative path with no root.
-            '/static3': {'tools.staticdir.on': True,
-                         'tools.staticdir.dir': 'static'},
-            # Warn on unknown namespace
-            '/unknown': {'toobles.gzip.on': True},
-            # Warn special on cherrypy.<known ns>.*
-            '/cpknown': {'cherrypy.tools.encode.on': True},
-            # Warn on mismatched types
-            '/conftype': {'request.show_tracebacks': 14},
-            # Warn on unknown tool.
-            '/web': {'tools.unknown.on': True},
-            # Warn on server.* in app config.
-            '/app1': {'server.socket_host': '0.0.0.0'},
-            # Warn on 'localhost'
-            'global': {'server.socket_host': 'localhost'},
-            # Warn on '[name]'
-            '[/extra_brackets]': {},
-            }
-    cherrypy.quickstart(Root(), config=conf)
diff --git a/lib/cherrypy/test/fastcgi.conf b/lib/cherrypy/test/fastcgi.conf
deleted file mode 100644
index e5c5163c..00000000
--- a/lib/cherrypy/test/fastcgi.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-
-# Apache2 server conf file for testing CherryPy with mod_fastcgi.
-# fumanchu: I had to hard-code paths due to crazy Debian layouts :(
-ServerRoot /usr/lib/apache2
-User #1000
-ErrorLog /usr/lib/python2.5/site-packages/cproot/trunk/cherrypy/test/mod_fastcgi.error.log
-
-DocumentRoot "/usr/lib/python2.5/site-packages/cproot/trunk/cherrypy/test"
-ServerName 127.0.0.1
-Listen 8080
-LoadModule fastcgi_module modules/mod_fastcgi.so
-LoadModule rewrite_module modules/mod_rewrite.so
-
-Options +ExecCGI
-SetHandler fastcgi-script
-RewriteEngine On
-RewriteRule ^(.*)$ /fastcgi.pyc [L]
-FastCgiExternalServer "/usr/lib/python2.5/site-packages/cproot/trunk/cherrypy/test/fastcgi.pyc" -host 127.0.0.1:4000
diff --git a/lib/cherrypy/test/fcgi.conf b/lib/cherrypy/test/fcgi.conf
deleted file mode 100644
index 3062eb35..00000000
--- a/lib/cherrypy/test/fcgi.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# Apache2 server conf file for testing CherryPy with mod_fcgid.
-
-DocumentRoot "/usr/lib/python2.6/site-packages/cproot/trunk/cherrypy/test"
-ServerName 127.0.0.1
-Listen 8080
-LoadModule fastcgi_module modules/mod_fastcgi.dll
-LoadModule rewrite_module modules/mod_rewrite.so
-
-Options ExecCGI
-SetHandler fastcgi-script
-RewriteEngine On
-RewriteRule ^(.*)$ /fastcgi.pyc [L]
-FastCgiExternalServer "/usr/lib/python2.6/site-packages/cproot/trunk/cherrypy/test/fastcgi.pyc" -host 127.0.0.1:4000
diff --git a/lib/cherrypy/test/helper.py b/lib/cherrypy/test/helper.py
deleted file mode 100644
index 5cf93d0c..00000000
--- a/lib/cherrypy/test/helper.py
+++ /dev/null
@@ -1,514 +0,0 @@
-"""A library of helper functions for the CherryPy test suite."""
-
-import datetime
-import io
-import logging
-import os
-import re
-import subprocess
-import sys
-import time
-import unittest
-import warnings
-import contextlib
-
-import portend
-import pytest
-
-from cheroot.test import webtest
-
-import cherrypy
-from cherrypy._cpcompat import text_or_bytes, HTTPSConnection, ntob
-from cherrypy.lib import httputil
-from cherrypy.lib import gctools
-
-log = logging.getLogger(__name__)
-thisdir = os.path.abspath(os.path.dirname(__file__))
-serverpem = os.path.join(os.getcwd(), thisdir, 'test.pem')
-
-
-class Supervisor(object):
-    """Base class for modeling and controlling servers during testing."""
-
-    def __init__(self, **kwargs):
-        for k, v in kwargs.items():
-            if k == 'port':
-                setattr(self, k, int(v))
-            setattr(self, k, v)
-
-
-def log_to_stderr(msg, level):
-    return sys.stderr.write(msg + os.linesep)
-
-
-class LocalSupervisor(Supervisor):
-    """Base class for modeling/controlling servers which run in the same
-    process.
-
-    When the server side runs in a different process, start/stop can
-    dump all state between each test module easily. When the server side
-    runs in the same process as the client, however, we have to do a bit
-    more work to ensure config and mounted apps are reset between tests.
-    """
-
-    using_apache = False
-    using_wsgi = False
-
-    def __init__(self, **kwargs):
-        for k, v in kwargs.items():
-            setattr(self, k, v)
-
-        cherrypy.server.httpserver = self.httpserver_class
-
-        # This is perhaps the wrong place for this call but this is the only
-        # place that i've found so far that I KNOW is early enough to set this.
-        cherrypy.config.update({'log.screen': False})
-        engine = cherrypy.engine
-        if hasattr(engine, 'signal_handler'):
-            engine.signal_handler.subscribe()
-        if hasattr(engine, 'console_control_handler'):
-            engine.console_control_handler.subscribe()
-
-    def start(self, modulename=None):
-        """Load and start the HTTP server."""
-        if modulename:
-            # Unhook httpserver so cherrypy.server.start() creates a new
-            # one (with config from setup_server, if declared).
-            cherrypy.server.httpserver = None
-
-        cherrypy.engine.start()
-
-        self.sync_apps()
-
-    def sync_apps(self):
-        """Tell the server about any apps which the setup functions mounted."""
-        pass
-
-    def stop(self):
-        td = getattr(self, 'teardown', None)
-        if td:
-            td()
-
-        cherrypy.engine.exit()
-
-        for name, server in getattr(cherrypy, 'servers', {}).copy().items():
-            server.unsubscribe()
-            del cherrypy.servers[name]
-
-
-class NativeServerSupervisor(LocalSupervisor):
-    """Server supervisor for the builtin HTTP server."""
-
-    httpserver_class = 'cherrypy._cpnative_server.CPHTTPServer'
-    using_apache = False
-    using_wsgi = False
-
-    def __str__(self):
-        return 'Builtin HTTP Server on %s:%s' % (self.host, self.port)
-
-
-class LocalWSGISupervisor(LocalSupervisor):
-    """Server supervisor for the builtin WSGI server."""
-
-    httpserver_class = 'cherrypy._cpwsgi_server.CPWSGIServer'
-    using_apache = False
-    using_wsgi = True
-
-    def __str__(self):
-        return 'Builtin WSGI Server on %s:%s' % (self.host, self.port)
-
-    def sync_apps(self):
-        """Hook a new WSGI app into the origin server."""
-        cherrypy.server.httpserver.wsgi_app = self.get_app()
-
-    def get_app(self, app=None):
-        """Obtain a new (decorated) WSGI app to hook into the origin server."""
-        if app is None:
-            app = cherrypy.tree
-
-        if self.validate:
-            try:
-                from wsgiref import validate
-            except ImportError:
-                warnings.warn(
-                    'Error importing wsgiref. The validator will not run.')
-            else:
-                # wraps the app in the validator
-                app = validate.validator(app)
-
-        return app
-
-
-def get_cpmodpy_supervisor(**options):
-    from cherrypy.test import modpy
-    sup = modpy.ModPythonSupervisor(**options)
-    sup.template = modpy.conf_cpmodpy
-    return sup
-
-
-def get_modpygw_supervisor(**options):
-    from cherrypy.test import modpy
-    sup = modpy.ModPythonSupervisor(**options)
-    sup.template = modpy.conf_modpython_gateway
-    sup.using_wsgi = True
-    return sup
-
-
-def get_modwsgi_supervisor(**options):
-    from cherrypy.test import modwsgi
-    return modwsgi.ModWSGISupervisor(**options)
-
-
-def get_modfcgid_supervisor(**options):
-    from cherrypy.test import modfcgid
-    return modfcgid.ModFCGISupervisor(**options)
-
-
-def get_modfastcgi_supervisor(**options):
-    from cherrypy.test import modfastcgi
-    return modfastcgi.ModFCGISupervisor(**options)
-
-
-def get_wsgi_u_supervisor(**options):
-    cherrypy.server.wsgi_version = ('u', 0)
-    return LocalWSGISupervisor(**options)
-
-
-class CPWebCase(webtest.WebCase):
-
-    script_name = ''
-    scheme = 'http'
-
-    available_servers = {'wsgi': LocalWSGISupervisor,
-                         'wsgi_u': get_wsgi_u_supervisor,
-                         'native': NativeServerSupervisor,
-                         'cpmodpy': get_cpmodpy_supervisor,
-                         'modpygw': get_modpygw_supervisor,
-                         'modwsgi': get_modwsgi_supervisor,
-                         'modfcgid': get_modfcgid_supervisor,
-                         'modfastcgi': get_modfastcgi_supervisor,
-                         }
-    default_server = 'wsgi'
-
-    @classmethod
-    def _setup_server(cls, supervisor, conf):
-        v = sys.version.split()[0]
-        log.info('Python version used to run this test script: %s' % v)
-        log.info('CherryPy version: %s' % cherrypy.__version__)
-        if supervisor.scheme == 'https':
-            ssl = ' (ssl)'
-        else:
-            ssl = ''
-        log.info('HTTP server version: %s%s' % (supervisor.protocol, ssl))
-        log.info('PID: %s' % os.getpid())
-
-        cherrypy.server.using_apache = supervisor.using_apache
-        cherrypy.server.using_wsgi = supervisor.using_wsgi
-
-        if sys.platform[:4] == 'java':
-            cherrypy.config.update({'server.nodelay': False})
-
-        if isinstance(conf, text_or_bytes):
-            parser = cherrypy.lib.reprconf.Parser()
-            conf = parser.dict_from_file(conf).get('global', {})
-        else:
-            conf = conf or {}
-        baseconf = conf.copy()
-        baseconf.update({'server.socket_host': supervisor.host,
-                         'server.socket_port': supervisor.port,
-                         'server.protocol_version': supervisor.protocol,
-                         'environment': 'test_suite',
-                         })
-        if supervisor.scheme == 'https':
-            # baseconf['server.ssl_module'] = 'builtin'
-            baseconf['server.ssl_certificate'] = serverpem
-            baseconf['server.ssl_private_key'] = serverpem
-
-        # helper must be imported lazily so the coverage tool
-        # can run against module-level statements within cherrypy.
-        # Also, we have to do "from cherrypy.test import helper",
-        # exactly like each test module does, because a relative import
-        # would stick a second instance of webtest in sys.modules,
-        # and we wouldn't be able to globally override the port anymore.
-        if supervisor.scheme == 'https':
-            webtest.WebCase.HTTP_CONN = HTTPSConnection
-        return baseconf
-
-    @classmethod
-    def setup_class(cls):
-        ''
-        # Creates a server
-        conf = {
-            'scheme': 'http',
-            'protocol': 'HTTP/1.1',
-            'port': 54583,
-            'host': '127.0.0.1',
-            'validate': False,
-            'server': 'wsgi',
-        }
-        supervisor_factory = cls.available_servers.get(
-            conf.get('server', 'wsgi'))
-        if supervisor_factory is None:
-            raise RuntimeError('Unknown server in config: %s' % conf['server'])
-        supervisor = supervisor_factory(**conf)
-
-        # Copied from "run_test_suite"
-        cherrypy.config.reset()
-        baseconf = cls._setup_server(supervisor, conf)
-        cherrypy.config.update(baseconf)
-        setup_client()
-
-        if hasattr(cls, 'setup_server'):
-            # Clear the cherrypy tree and clear the wsgi server so that
-            # it can be updated with the new root
-            cherrypy.tree = cherrypy._cptree.Tree()
-            cherrypy.server.httpserver = None
-            cls.setup_server()
-            # Add a resource for verifying there are no refleaks
-            # to *every* test class.
-            cherrypy.tree.mount(gctools.GCRoot(), '/gc')
-            cls.do_gc_test = True
-            supervisor.start(cls.__module__)
-
-        cls.supervisor = supervisor
-
-    @classmethod
-    def teardown_class(cls):
-        ''
-        if hasattr(cls, 'setup_server'):
-            cls.supervisor.stop()
-
-    do_gc_test = False
-
-    def test_gc(self):
-        if not self.do_gc_test:
-            return
-
-        self.getPage('/gc/stats')
-        try:
-            self.assertBody('Statistics:')
-        except Exception:
-            'Failures occur intermittently. See #1420'
-
-    def prefix(self):
-        return self.script_name.rstrip('/')
-
-    def base(self):
-        if ((self.scheme == 'http' and self.PORT == 80) or
-                (self.scheme == 'https' and self.PORT == 443)):
-            port = ''
-        else:
-            port = ':%s' % self.PORT
-
-        return '%s://%s%s%s' % (self.scheme, self.HOST, port,
-                                self.script_name.rstrip('/'))
-
-    def exit(self):
-        sys.exit()
-
-    def getPage(self, url, *args, **kwargs):
-        """Open the url."""
-        if self.script_name:
-            url = httputil.urljoin(self.script_name, url)
-        return webtest.WebCase.getPage(self, url, *args, **kwargs)
-
-    def skip(self, msg='skipped '):
-        pytest.skip(msg)
-
-    def assertErrorPage(self, status, message=None, pattern=''):
-        """Compare the response body with a built in error page.
-
-        The function will optionally look for the regexp pattern, within
-        the exception embedded in the error page.
-        """
-
-        # This will never contain a traceback
-        page = cherrypy._cperror.get_error_page(status, message=message)
-
-        # First, test the response body without checking the traceback.
-        # Stick a match-all group (.*) in to grab the traceback.
-        def esc(text):
-            return re.escape(ntob(text))
-        epage = re.escape(page)
-        epage = epage.replace(
-            esc('<pre id="traceback"></pre>'),
-            esc('<pre id="traceback">') + b'(.*)' + esc('</pre>'))
-        m = re.match(epage, self.body, re.DOTALL)
-        if not m:
-            self._handlewebError(
-                'Error page does not match; expected:\n' + page)
-            return
-
-        # Now test the pattern against the traceback
-        if pattern is None:
-            # Special-case None to mean that there should be *no* traceback.
-            if m and m.group(1):
-                self._handlewebError('Error page contains traceback')
-        else:
-            if (m is None) or (
-                not re.search(ntob(re.escape(pattern), self.encoding),
-                              m.group(1))):
-                msg = 'Error page does not contain %s in traceback'
-                self._handlewebError(msg % repr(pattern))
-
-    date_tolerance = 2
-
-    def assertEqualDates(self, dt1, dt2, seconds=None):
-        """Assert abs(dt1 - dt2) is within Y seconds."""
-        if seconds is None:
-            seconds = self.date_tolerance
-
-        if dt1 > dt2:
-            diff = dt1 - dt2
-        else:
-            diff = dt2 - dt1
-        if not diff < datetime.timedelta(seconds=seconds):
-            raise AssertionError('%r and %r are not within %r seconds.' %
-                                 (dt1, dt2, seconds))
-
-
-def _test_method_sorter(_, x, y):
-    """Monkeypatch the test sorter to always run test_gc last in each suite."""
-    if x == 'test_gc':
-        return 1
-    if y == 'test_gc':
-        return -1
-    if x > y:
-        return 1
-    if x < y:
-        return -1
-    return 0
-
-
-unittest.TestLoader.sortTestMethodsUsing = _test_method_sorter
-
-
-def setup_client():
-    """Set up the WebCase classes to match the server's socket settings."""
-    webtest.WebCase.PORT = cherrypy.server.socket_port
-    webtest.WebCase.HOST = cherrypy.server.socket_host
-    if cherrypy.server.ssl_certificate:
-        CPWebCase.scheme = 'https'
-
-# --------------------------- Spawning helpers --------------------------- #
-
-
-class CPProcess(object):
-
-    pid_file = os.path.join(thisdir, 'test.pid')
-    config_file = os.path.join(thisdir, 'test.conf')
-    config_template = """[global]
-server.socket_host: '%(host)s'
-server.socket_port: %(port)s
-checker.on: False
-log.screen: False
-log.error_file: r'%(error_log)s'
-log.access_file: r'%(access_log)s'
-%(ssl)s
-%(extra)s
-"""
-    error_log = os.path.join(thisdir, 'test.error.log')
-    access_log = os.path.join(thisdir, 'test.access.log')
-
-    def __init__(self, wait=False, daemonize=False, ssl=False,
-                 socket_host=None, socket_port=None):
-        self.wait = wait
-        self.daemonize = daemonize
-        self.ssl = ssl
-        self.host = socket_host or cherrypy.server.socket_host
-        self.port = socket_port or cherrypy.server.socket_port
-
-    def write_conf(self, extra=''):
-        if self.ssl:
-            serverpem = os.path.join(thisdir, 'test.pem')
-            ssl = """
-server.ssl_certificate: r'%s'
-server.ssl_private_key: r'%s'
-""" % (serverpem, serverpem)
-        else:
-            ssl = ''
-
-        conf = self.config_template % {
-            'host': self.host,
-            'port': self.port,
-            'error_log': self.error_log,
-            'access_log': self.access_log,
-            'ssl': ssl,
-            'extra': extra,
-        }
-        with io.open(self.config_file, 'w', encoding='utf-8') as f:
-            f.write(str(conf))
-
-    def start(self, imports=None):
-        """Start cherryd in a subprocess."""
-        portend.free(self.host, self.port, timeout=1)
-
-        args = [
-            '-m',
-            'cherrypy',
-            '-c', self.config_file,
-            '-p', self.pid_file,
-        ]
-        r"""Command for running cherryd server with autoreload enabled.
-
-        Using
-
-        ```
-        ['-c',
-         "__requires__ = 'CherryPy'; \
-         import importlib.metadata, re, sys; \
-         sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]); \
-         sys.exit(\
-            importlib.metadata.distribution('cherrypy').entry_points[0])"]
-        ```
-
-        doesn't work as it's impossible to reconstruct the `-c`'s contents.
-        Ref: https://github.com/cherrypy/cherrypy/issues/1545
-        """
-
-        if not isinstance(imports, (list, tuple)):
-            imports = [imports]
-        for i in imports:
-            if i:
-                args.append('-i')
-                args.append(i)
-
-        if self.daemonize:
-            args.append('-d')
-
-        env = os.environ.copy()
-        # Make sure we import the cherrypy package in which this module is
-        # defined.
-        grandparentdir = os.path.abspath(os.path.join(thisdir, '..', '..'))
-        if env.get('PYTHONPATH', ''):
-            env['PYTHONPATH'] = os.pathsep.join(
-                (grandparentdir, env['PYTHONPATH']))
-        else:
-            env['PYTHONPATH'] = grandparentdir
-        self._proc = subprocess.Popen([sys.executable] + args, env=env)
-        if self.wait:
-            self.exit_code = self._proc.wait()
-        else:
-            portend.occupied(self.host, self.port, timeout=5)
-
-        # Give the engine a wee bit more time to finish STARTING
-        if self.daemonize:
-            time.sleep(2)
-        else:
-            time.sleep(1)
-
-    def get_pid(self):
-        if self.daemonize:
-            with open(self.pid_file, 'rb') as f:
-                return int(f.read())
-        return self._proc.pid
-
-    def join(self):
-        """Wait for the process to exit."""
-        if self.daemonize:
-            return self._join_daemon()
-        self._proc.wait()
-
-    def _join_daemon(self):
-        with contextlib.suppress(IOError):
-            os.waitpid(self.get_pid(), 0)
diff --git a/lib/cherrypy/test/logtest.py b/lib/cherrypy/test/logtest.py
deleted file mode 100644
index acdc9587..00000000
--- a/lib/cherrypy/test/logtest.py
+++ /dev/null
@@ -1,240 +0,0 @@
-"""Logtest, a unittest.TestCase helper for testing log output."""
-
-import sys
-import time
-from uuid import UUID
-
-import pytest
-
-from cherrypy._cpcompat import text_or_bytes
-
-
-try:
-    # On Windows, msvcrt.getch reads a single char without output.
-    import msvcrt
-
-    def getchar():
-        return msvcrt.getch()
-except ImportError:
-    # Unix getchr
-    import tty
-    import termios
-
-    def getchar():
-        fd = sys.stdin.fileno()
-        old_settings = termios.tcgetattr(fd)
-        try:
-            tty.setraw(sys.stdin.fileno())
-            ch = sys.stdin.read(1)
-        finally:
-            termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)
-        return ch
-
-
-class LogCase(object):
-    """unittest.TestCase mixin for testing log messages.
-
-    logfile: a filename for the desired log. Yes, I know modes are evil,
-        but it makes the test functions so much cleaner to set this once.
-
-    lastmarker: the last marker in the log. This can be used to search for
-        messages since the last marker.
-
-    markerPrefix: a string with which to prefix log markers. This should be
-        unique enough from normal log output to use for marker identification.
-    """
-
-    interactive = False
-    logfile = None
-    lastmarker = None
-    markerPrefix = b'test suite marker: '
-
-    def _handleLogError(self, msg, data, marker, pattern):
-        print('')
-        print('    ERROR: %s' % msg)
-
-        if not self.interactive:
-            raise pytest.fail(msg)
-
-        p = ('    Show: '
-             '[L]og [M]arker [P]attern; '
-             '[I]gnore, [R]aise, or sys.e[X]it >> ')
-        sys.stdout.write(p + ' ')
-        # ARGH
-        sys.stdout.flush()
-        while True:
-            i = getchar().upper()
-            if i not in 'MPLIRX':
-                continue
-            print(i.upper())  # Also prints new line
-            if i == 'L':
-                for x, line in enumerate(data):
-                    if (x + 1) % self.console_height == 0:
-                        # The \r and comma should make the next line overwrite
-                        sys.stdout.write('<-- More -->\r ')
-                        m = getchar().lower()
-                        # Erase our "More" prompt
-                        sys.stdout.write('            \r ')
-                        if m == 'q':
-                            break
-                    print(line.rstrip())
-            elif i == 'M':
-                print(repr(marker or self.lastmarker))
-            elif i == 'P':
-                print(repr(pattern))
-            elif i == 'I':
-                # return without raising the normal exception
-                return
-            elif i == 'R':
-                raise pytest.fail(msg)
-            elif i == 'X':
-                self.exit()
-            sys.stdout.write(p + ' ')
-
-    def exit(self):
-        sys.exit()
-
-    def emptyLog(self):
-        """Overwrite self.logfile with 0 bytes."""
-        with open(self.logfile, 'wb') as f:
-            f.write('')
-
-    def markLog(self, key=None):
-        """Insert a marker line into the log and set self.lastmarker."""
-        if key is None:
-            key = str(time.time())
-        self.lastmarker = key
-
-        with open(self.logfile, 'ab+') as f:
-            f.write(
-                b'%s%s\n'
-                % (self.markerPrefix, key.encode('utf-8'))
-            )
-
-    def _read_marked_region(self, marker=None):
-        """Return lines from self.logfile in the marked region.
-
-        If marker is None, self.lastmarker is used. If the log hasn't
-        been marked (using self.markLog), the entire log will be
-        returned.
-        """
-# Give the logger time to finish writing?
-# time.sleep(0.5)
-
-        logfile = self.logfile
-        marker = marker or self.lastmarker
-        if marker is None:
-            with open(logfile, 'rb') as f:
-                return f.readlines()
-
-        if isinstance(marker, str):
-            marker = marker.encode('utf-8')
-        data = []
-        in_region = False
-        with open(logfile, 'rb') as f:
-            for line in f:
-                if in_region:
-                    if (line.startswith(self.markerPrefix)
-                            and marker not in line):
-                        break
-                    else:
-                        data.append(line)
-                elif marker in line:
-                    in_region = True
-        return data
-
-    def assertInLog(self, line, marker=None):
-        """Fail if the given (partial) line is not in the log.
-
-        The log will be searched from the given marker to the next
-        marker. If marker is None, self.lastmarker is used. If the log
-        hasn't been marked (using self.markLog), the entire log will be
-        searched.
-        """
-        data = self._read_marked_region(marker)
-        for logline in data:
-            if line in logline:
-                return
-        msg = '%r not found in log' % line
-        self._handleLogError(msg, data, marker, line)
-
-    def assertNotInLog(self, line, marker=None):
-        """Fail if the given (partial) line is in the log.
-
-        The log will be searched from the given marker to the next
-        marker. If marker is None, self.lastmarker is used. If the log
-        hasn't been marked (using self.markLog), the entire log will be
-        searched.
-        """
-        data = self._read_marked_region(marker)
-        for logline in data:
-            if line in logline:
-                msg = '%r found in log' % line
-                self._handleLogError(msg, data, marker, line)
-
-    def assertValidUUIDv4(self, marker=None):
-        """Fail if the given UUIDv4 is not valid.
-
-        The log will be searched from the given marker to the next
-        marker. If marker is None, self.lastmarker is used. If the log
-        hasn't been marked (using self.markLog), the entire log will be
-        searched.
-        """
-        data = self._read_marked_region(marker)
-        data = [
-            chunk.decode('utf-8').rstrip('\n').rstrip('\r')
-            for chunk in data
-        ]
-        for log_chunk in data:
-            try:
-                uuid_log = data[-1]
-                uuid_obj = UUID(uuid_log, version=4)
-            except (TypeError, ValueError):
-                pass  # it might be in other chunk
-            else:
-                if str(uuid_obj) == uuid_log:
-                    return
-                msg = '%r is not a valid UUIDv4' % uuid_log
-                self._handleLogError(msg, data, marker, log_chunk)
-
-        msg = 'UUIDv4 not found in log'
-        self._handleLogError(msg, data, marker, log_chunk)
-
-    def assertLog(self, sliceargs, lines, marker=None):
-        """Fail if log.readlines()[sliceargs] is not contained in 'lines'.
-
-        The log will be searched from the given marker to the next
-        marker. If marker is None, self.lastmarker is used. If the log
-        hasn't been marked (using self.markLog), the entire log will be
-        searched.
-        """
-        data = self._read_marked_region(marker)
-        if isinstance(sliceargs, int):
-            # Single arg. Use __getitem__ and allow lines to be str or list.
-            if isinstance(lines, (tuple, list)):
-                lines = lines[0]
-            if isinstance(lines, str):
-                lines = lines.encode('utf-8')
-            if lines not in data[sliceargs]:
-                msg = '%r not found on log line %r' % (lines, sliceargs)
-                self._handleLogError(
-                    msg,
-                    [data[sliceargs], '--EXTRA CONTEXT--'] + data[
-                        sliceargs + 1:sliceargs + 6],
-                    marker,
-                    lines)
-        else:
-            # Multiple args. Use __getslice__ and require lines to be list.
-            if isinstance(lines, tuple):
-                lines = list(lines)
-            elif isinstance(lines, text_or_bytes):
-                raise TypeError("The 'lines' arg must be a list when "
-                                "'sliceargs' is a tuple.")
-
-            start, stop = sliceargs
-            for line, logline in zip(lines, data[start:stop]):
-                if isinstance(line, str):
-                    line = line.encode('utf-8')
-                if line not in logline:
-                    msg = '%r not found in log' % line
-                    self._handleLogError(msg, data[start:stop], marker, line)
diff --git a/lib/cherrypy/test/modfastcgi.py b/lib/cherrypy/test/modfastcgi.py
deleted file mode 100644
index 16927d3c..00000000
--- a/lib/cherrypy/test/modfastcgi.py
+++ /dev/null
@@ -1,133 +0,0 @@
-"""Wrapper for mod_fastcgi, for use as a CherryPy HTTP server when testing.
-
-To autostart fastcgi, the "apache" executable or script must be
-on your system path, or you must override the global APACHE_PATH.
-On some platforms, "apache" may be called "apachectl", "apache2ctl",
-or "httpd"--create a symlink to them if needed.
-
-You'll also need the WSGIServer from flup.servers.
-See http://projects.amor.org/misc/wiki/ModPythonGateway
-
-
-KNOWN BUGS
-==========
-
-1. Apache processes Range headers automatically; CherryPy's truncated
-    output is then truncated again by Apache. See test_core.testRanges.
-    This was worked around in http://www.cherrypy.dev/changeset/1319.
-2. Apache does not allow custom HTTP methods like CONNECT as per the spec.
-    See test_core.testHTTPMethods.
-3. Max request header and body settings do not work with Apache.
-4. Apache replaces status "reason phrases" automatically. For example,
-    CherryPy may set "304 Not modified" but Apache will write out
-    "304 Not Modified" (capital "M").
-5. Apache does not allow custom error codes as per the spec.
-6. Apache (or perhaps modpython, or modpython_gateway) unquotes %xx in the
-    Request-URI too early.
-7. mod_python will not read request bodies which use the "chunked"
-    transfer-coding (it passes REQUEST_CHUNKED_ERROR to ap_setup_client_block
-    instead of REQUEST_CHUNKED_DECHUNK, see Apache2's http_protocol.c and
-    mod_python's requestobject.c).
-8. Apache will output a "Content-Length: 0" response header even if there's
-    no response entity body. This isn't really a bug; it just differs from
-    the CherryPy default.
-"""
-
-import os
-import re
-
-import cherrypy
-from cherrypy.process import servers
-from cherrypy.test import helper
-
-curdir = os.path.join(os.getcwd(), os.path.dirname(__file__))
-
-
-def read_process(cmd, args=''):
-    pipein, pipeout = os.popen4('%s %s' % (cmd, args))
-    try:
-        firstline = pipeout.readline()
-        if (re.search(r'(not recognized|No such file|not found)', firstline,
-                      re.IGNORECASE)):
-            raise IOError('%s must be on your system path.' % cmd)
-        output = firstline + pipeout.read()
-    finally:
-        pipeout.close()
-    return output
-
-
-APACHE_PATH = 'apache2ctl'
-CONF_PATH = 'fastcgi.conf'
-
-conf_fastcgi = """
-# Apache2 server conf file for testing CherryPy with mod_fastcgi.
-# fumanchu: I had to hard-code paths due to crazy Debian layouts :(
-ServerRoot /usr/lib/apache2
-User #1000
-ErrorLog %(root)s/mod_fastcgi.error.log
-
-DocumentRoot "%(root)s"
-ServerName 127.0.0.1
-Listen %(port)s
-LoadModule fastcgi_module modules/mod_fastcgi.so
-LoadModule rewrite_module modules/mod_rewrite.so
-
-Options +ExecCGI
-SetHandler fastcgi-script
-RewriteEngine On
-RewriteRule ^(.*)$ /fastcgi.pyc [L]
-FastCgiExternalServer "%(server)s" -host 127.0.0.1:4000
-"""
-
-
-def erase_script_name(environ, start_response):
-    environ['SCRIPT_NAME'] = ''
-    return cherrypy.tree(environ, start_response)
-
-
-class ModFCGISupervisor(helper.LocalWSGISupervisor):
-
-    httpserver_class = 'cherrypy.process.servers.FlupFCGIServer'
-    using_apache = True
-    using_wsgi = True
-    template = conf_fastcgi
-
-    def __str__(self):
-        return 'FCGI Server on %s:%s' % (self.host, self.port)
-
-    def start(self, modulename):
-        cherrypy.server.httpserver = servers.FlupFCGIServer(
-            application=erase_script_name, bindAddress=('127.0.0.1', 4000))
-        cherrypy.server.httpserver.bind_addr = ('127.0.0.1', 4000)
-        cherrypy.server.socket_port = 4000
-        # For FCGI, we both start apache...
-        self.start_apache()
-        # ...and our local server
-        cherrypy.engine.start()
-        self.sync_apps()
-
-    def start_apache(self):
-        fcgiconf = CONF_PATH
-        if not os.path.isabs(fcgiconf):
-            fcgiconf = os.path.join(curdir, fcgiconf)
-
-        # Write the Apache conf file.
-        with open(fcgiconf, 'wb') as f:
-            server = repr(os.path.join(curdir, 'fastcgi.pyc'))[1:-1]
-            output = self.template % {'port': self.port, 'root': curdir,
-                                      'server': server}
-            output = output.replace('\r\n', '\n')
-            f.write(output)
-
-        result = read_process(APACHE_PATH, '-k start -f %s' % fcgiconf)
-        if result:
-            print(result)
-
-    def stop(self):
-        """Gracefully shutdown a server that is serving forever."""
-        read_process(APACHE_PATH, '-k stop')
-        helper.LocalWSGISupervisor.stop(self)
-
-    def sync_apps(self):
-        cherrypy.server.httpserver.fcgiserver.application = self.get_app(
-            erase_script_name)
diff --git a/lib/cherrypy/test/modfcgid.py b/lib/cherrypy/test/modfcgid.py
deleted file mode 100644
index 6dd48a94..00000000
--- a/lib/cherrypy/test/modfcgid.py
+++ /dev/null
@@ -1,121 +0,0 @@
-"""Wrapper for mod_fcgid, for use as a CherryPy HTTP server when testing.
-
-To autostart fcgid, the "apache" executable or script must be
-on your system path, or you must override the global APACHE_PATH.
-On some platforms, "apache" may be called "apachectl", "apache2ctl",
-or "httpd"--create a symlink to them if needed.
-
-You'll also need the WSGIServer from flup.servers.
-See http://projects.amor.org/misc/wiki/ModPythonGateway
-
-
-KNOWN BUGS
-==========
-
-1. Apache processes Range headers automatically; CherryPy's truncated
-    output is then truncated again by Apache. See test_core.testRanges.
-    This was worked around in http://www.cherrypy.dev/changeset/1319.
-2. Apache does not allow custom HTTP methods like CONNECT as per the spec.
-    See test_core.testHTTPMethods.
-3. Max request header and body settings do not work with Apache.
-4. Apache replaces status "reason phrases" automatically. For example,
-    CherryPy may set "304 Not modified" but Apache will write out
-    "304 Not Modified" (capital "M").
-5. Apache does not allow custom error codes as per the spec.
-6. Apache (or perhaps modpython, or modpython_gateway) unquotes %xx in the
-    Request-URI too early.
-7. mod_python will not read request bodies which use the "chunked"
-    transfer-coding (it passes REQUEST_CHUNKED_ERROR to ap_setup_client_block
-    instead of REQUEST_CHUNKED_DECHUNK, see Apache2's http_protocol.c and
-    mod_python's requestobject.c).
-8. Apache will output a "Content-Length: 0" response header even if there's
-    no response entity body. This isn't really a bug; it just differs from
-    the CherryPy default.
-"""
-
-import os
-import re
-
-import cherrypy
-from cherrypy._cpcompat import ntob
-from cherrypy.process import servers
-from cherrypy.test import helper
-
-curdir = os.path.join(os.getcwd(), os.path.dirname(__file__))
-
-
-def read_process(cmd, args=''):
-    pipein, pipeout = os.popen4('%s %s' % (cmd, args))
-    try:
-        firstline = pipeout.readline()
-        if (re.search(r'(not recognized|No such file|not found)', firstline,
-                      re.IGNORECASE)):
-            raise IOError('%s must be on your system path.' % cmd)
-        output = firstline + pipeout.read()
-    finally:
-        pipeout.close()
-    return output
-
-
-APACHE_PATH = 'httpd'
-CONF_PATH = 'fcgi.conf'
-
-conf_fcgid = """
-# Apache2 server conf file for testing CherryPy with mod_fcgid.
-
-DocumentRoot "%(root)s"
-ServerName 127.0.0.1
-Listen %(port)s
-LoadModule fastcgi_module modules/mod_fastcgi.dll
-LoadModule rewrite_module modules/mod_rewrite.so
-
-Options ExecCGI
-SetHandler fastcgi-script
-RewriteEngine On
-RewriteRule ^(.*)$ /fastcgi.pyc [L]
-FastCgiExternalServer "%(server)s" -host 127.0.0.1:4000
-"""
-
-
-class ModFCGISupervisor(helper.LocalSupervisor):
-
-    using_apache = True
-    using_wsgi = True
-    template = conf_fcgid
-
-    def __str__(self):
-        return 'FCGI Server on %s:%s' % (self.host, self.port)
-
-    def start(self, modulename):
-        cherrypy.server.httpserver = servers.FlupFCGIServer(
-            application=cherrypy.tree, bindAddress=('127.0.0.1', 4000))
-        cherrypy.server.httpserver.bind_addr = ('127.0.0.1', 4000)
-        # For FCGI, we both start apache...
-        self.start_apache()
-        # ...and our local server
-        helper.LocalServer.start(self, modulename)
-
-    def start_apache(self):
-        fcgiconf = CONF_PATH
-        if not os.path.isabs(fcgiconf):
-            fcgiconf = os.path.join(curdir, fcgiconf)
-
-        # Write the Apache conf file.
-        with open(fcgiconf, 'wb') as f:
-            server = repr(os.path.join(curdir, 'fastcgi.pyc'))[1:-1]
-            output = self.template % {'port': self.port, 'root': curdir,
-                                      'server': server}
-            output = ntob(output.replace('\r\n', '\n'))
-            f.write(output)
-
-        result = read_process(APACHE_PATH, '-k start -f %s' % fcgiconf)
-        if result:
-            print(result)
-
-    def stop(self):
-        """Gracefully shutdown a server that is serving forever."""
-        read_process(APACHE_PATH, '-k stop')
-        helper.LocalServer.stop(self)
-
-    def sync_apps(self):
-        cherrypy.server.httpserver.fcgiserver.application = self.get_app()
diff --git a/lib/cherrypy/test/modpy.py b/lib/cherrypy/test/modpy.py
deleted file mode 100644
index f4f68523..00000000
--- a/lib/cherrypy/test/modpy.py
+++ /dev/null
@@ -1,161 +0,0 @@
-"""Wrapper for mod_python, for use as a CherryPy HTTP server when testing.
-
-To autostart modpython, the "apache" executable or script must be
-on your system path, or you must override the global APACHE_PATH.
-On some platforms, "apache" may be called "apachectl" or "apache2ctl"--
-create a symlink to them if needed.
-
-If you wish to test the WSGI interface instead of our _cpmodpy interface,
-you also need the 'modpython_gateway' module at:
-http://projects.amor.org/misc/wiki/ModPythonGateway
-
-
-KNOWN BUGS
-==========
-
-1. Apache processes Range headers automatically; CherryPy's truncated
-    output is then truncated again by Apache. See test_core.testRanges.
-    This was worked around in http://www.cherrypy.dev/changeset/1319.
-2. Apache does not allow custom HTTP methods like CONNECT as per the spec.
-    See test_core.testHTTPMethods.
-3. Max request header and body settings do not work with Apache.
-4. Apache replaces status "reason phrases" automatically. For example,
-    CherryPy may set "304 Not modified" but Apache will write out
-    "304 Not Modified" (capital "M").
-5. Apache does not allow custom error codes as per the spec.
-6. Apache (or perhaps modpython, or modpython_gateway) unquotes %xx in the
-    Request-URI too early.
-7. mod_python will not read request bodies which use the "chunked"
-    transfer-coding (it passes REQUEST_CHUNKED_ERROR to ap_setup_client_block
-    instead of REQUEST_CHUNKED_DECHUNK, see Apache2's http_protocol.c and
-    mod_python's requestobject.c).
-8. Apache will output a "Content-Length: 0" response header even if there's
-    no response entity body. This isn't really a bug; it just differs from
-    the CherryPy default.
-"""
-
-import os
-import re
-
-import cherrypy
-from cherrypy.test import helper
-
-curdir = os.path.join(os.getcwd(), os.path.dirname(__file__))
-
-
-def read_process(cmd, args=''):
-    pipein, pipeout = os.popen4('%s %s' % (cmd, args))
-    try:
-        firstline = pipeout.readline()
-        if (re.search(r'(not recognized|No such file|not found)', firstline,
-                      re.IGNORECASE)):
-            raise IOError('%s must be on your system path.' % cmd)
-        output = firstline + pipeout.read()
-    finally:
-        pipeout.close()
-    return output
-
-
-APACHE_PATH = 'httpd'
-CONF_PATH = 'test_mp.conf'
-
-conf_modpython_gateway = """
-# Apache2 server conf file for testing CherryPy with modpython_gateway.
-
-ServerName 127.0.0.1
-DocumentRoot "/"
-Listen %(port)s
-LoadModule python_module modules/mod_python.so
-
-SetHandler python-program
-PythonFixupHandler cherrypy.test.modpy::wsgisetup
-PythonOption testmod %(modulename)s
-PythonHandler modpython_gateway::handler
-PythonOption wsgi.application cherrypy::tree
-PythonOption socket_host %(host)s
-PythonDebug On
-"""
-
-conf_cpmodpy = """
-# Apache2 server conf file for testing CherryPy with _cpmodpy.
-
-ServerName 127.0.0.1
-DocumentRoot "/"
-Listen %(port)s
-LoadModule python_module modules/mod_python.so
-
-SetHandler python-program
-PythonFixupHandler cherrypy.test.modpy::cpmodpysetup
-PythonHandler cherrypy._cpmodpy::handler
-PythonOption cherrypy.setup cherrypy.test.%(modulename)s::setup_server
-PythonOption socket_host %(host)s
-PythonDebug On
-"""
-
-
-class ModPythonSupervisor(helper.Supervisor):
-
-    using_apache = True
-    using_wsgi = False
-    template = None
-
-    def __str__(self):
-        return 'ModPython Server on %s:%s' % (self.host, self.port)
-
-    def start(self, modulename):
-        mpconf = CONF_PATH
-        if not os.path.isabs(mpconf):
-            mpconf = os.path.join(curdir, mpconf)
-
-        with open(mpconf, 'wb') as f:
-            f.write(self.template %
-                    {'port': self.port, 'modulename': modulename,
-                     'host': self.host})
-
-        result = read_process(APACHE_PATH, '-k start -f %s' % mpconf)
-        if result:
-            print(result)
-
-    def stop(self):
-        """Gracefully shutdown a server that is serving forever."""
-        read_process(APACHE_PATH, '-k stop')
-
-
-loaded = False
-
-
-def wsgisetup(req):
-    global loaded
-    if not loaded:
-        loaded = True
-        options = req.get_options()
-
-        cherrypy.config.update({
-            'log.error_file': os.path.join(curdir, 'test.log'),
-            'environment': 'test_suite',
-            'server.socket_host': options['socket_host'],
-        })
-
-        modname = options['testmod']
-        mod = __import__(modname, globals(), locals(), [''])
-        mod.setup_server()
-
-        cherrypy.server.unsubscribe()
-        cherrypy.engine.start()
-    from mod_python import apache
-    return apache.OK
-
-
-def cpmodpysetup(req):
-    global loaded
-    if not loaded:
-        loaded = True
-        options = req.get_options()
-
-        cherrypy.config.update({
-            'log.error_file': os.path.join(curdir, 'test.log'),
-            'environment': 'test_suite',
-            'server.socket_host': options['socket_host'],
-        })
-    from mod_python import apache
-    return apache.OK
diff --git a/lib/cherrypy/test/modwsgi.py b/lib/cherrypy/test/modwsgi.py
deleted file mode 100644
index 911d4819..00000000
--- a/lib/cherrypy/test/modwsgi.py
+++ /dev/null
@@ -1,150 +0,0 @@
-"""Wrapper for mod_wsgi, for use as a CherryPy HTTP server.
-
-To autostart modwsgi, the "apache" executable or script must be
-on your system path, or you must override the global APACHE_PATH.
-On some platforms, "apache" may be called "apachectl" or "apache2ctl"--
-create a symlink to them if needed.
-
-
-KNOWN BUGS
-==========
-
-1. Apache processes Range headers automatically; CherryPy's truncated
-    output is then truncated again by Apache. See test_core.testRanges.
-    This was worked around in http://www.cherrypy.dev/changeset/1319.
-2. Apache does not allow custom HTTP methods like CONNECT as per the spec.
-    See test_core.testHTTPMethods.
-3. Max request header and body settings do not work with Apache.
-4. Apache replaces status "reason phrases" automatically. For example,
-    CherryPy may set "304 Not modified" but Apache will write out
-    "304 Not Modified" (capital "M").
-5. Apache does not allow custom error codes as per the spec.
-6. Apache (or perhaps modpython, or modpython_gateway) unquotes %xx in the
-    Request-URI too early.
-7. mod_wsgi will not read request bodies which use the "chunked"
-    transfer-coding (it passes REQUEST_CHUNKED_ERROR to ap_setup_client_block
-    instead of REQUEST_CHUNKED_DECHUNK, see Apache2's http_protocol.c and
-    mod_python's requestobject.c).
-8. When responding with 204 No Content, mod_wsgi adds a Content-Length
-    header for you.
-9. When an error is raised, mod_wsgi has no facility for printing a
-    traceback as the response content (it's sent to the Apache log instead).
-10. Startup and shutdown of Apache when running mod_wsgi seems slow.
-"""
-
-import os
-import re
-import sys
-import time
-
-import portend
-
-from cheroot.test import webtest
-
-import cherrypy
-from cherrypy.test import helper
-
-curdir = os.path.abspath(os.path.dirname(__file__))
-
-
-def read_process(cmd, args=''):
-    pipein, pipeout = os.popen4('%s %s' % (cmd, args))
-    try:
-        firstline = pipeout.readline()
-        if (re.search(r'(not recognized|No such file|not found)', firstline,
-                      re.IGNORECASE)):
-            raise IOError('%s must be on your system path.' % cmd)
-        output = firstline + pipeout.read()
-    finally:
-        pipeout.close()
-    return output
-
-
-if sys.platform == 'win32':
-    APACHE_PATH = 'httpd'
-else:
-    APACHE_PATH = 'apache'
-
-CONF_PATH = 'test_mw.conf'
-
-conf_modwsgi = r"""
-# Apache2 server conf file for testing CherryPy with modpython_gateway.
-
-ServerName 127.0.0.1
-DocumentRoot "/"
-Listen %(port)s
-
-AllowEncodedSlashes On
-LoadModule rewrite_module modules/mod_rewrite.so
-RewriteEngine on
-RewriteMap escaping int:escape
-
-LoadModule log_config_module modules/mod_log_config.so
-LogFormat "%%h %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-agent}i\"" combined
-CustomLog "%(curdir)s/apache.access.log" combined
-ErrorLog "%(curdir)s/apache.error.log"
-LogLevel debug
-
-LoadModule wsgi_module modules/mod_wsgi.so
-LoadModule env_module modules/mod_env.so
-
-WSGIScriptAlias / "%(curdir)s/modwsgi.py"
-SetEnv testmod %(testmod)s
-""" # noqa E501
-
-
-class ModWSGISupervisor(helper.Supervisor):
-    """Server Controller for ModWSGI and CherryPy."""
-
-    using_apache = True
-    using_wsgi = True
-    template = conf_modwsgi
-
-    def __str__(self):
-        return 'ModWSGI Server on %s:%s' % (self.host, self.port)
-
-    def start(self, modulename):
-        mpconf = CONF_PATH
-        if not os.path.isabs(mpconf):
-            mpconf = os.path.join(curdir, mpconf)
-
-        with open(mpconf, 'wb') as f:
-            output = (self.template %
-                      {'port': self.port, 'testmod': modulename,
-                       'curdir': curdir})
-            f.write(output)
-
-        result = read_process(APACHE_PATH, '-k start -f %s' % mpconf)
-        if result:
-            print(result)
-
-        # Make a request so mod_wsgi starts up our app.
-        # If we don't, concurrent initial requests will 404.
-        portend.occupied('127.0.0.1', self.port, timeout=5)
-        webtest.openURL('/ihopetheresnodefault', port=self.port)
-        time.sleep(1)
-
-    def stop(self):
-        """Gracefully shutdown a server that is serving forever."""
-        read_process(APACHE_PATH, '-k stop')
-
-
-loaded = False
-
-
-def application(environ, start_response):
-    global loaded
-    if not loaded:
-        loaded = True
-        modname = 'cherrypy.test.' + environ['testmod']
-        mod = __import__(modname, globals(), locals(), [''])
-        mod.setup_server()
-
-        cherrypy.config.update({
-            'log.error_file': os.path.join(curdir, 'test.error.log'),
-            'log.access_file': os.path.join(curdir, 'test.access.log'),
-            'environment': 'test_suite',
-            'engine.SIGHUP': None,
-            'engine.SIGTERM': None,
-        })
-    return cherrypy.tree(environ, start_response)
diff --git a/lib/cherrypy/test/sessiondemo.py b/lib/cherrypy/test/sessiondemo.py
deleted file mode 100644
index 0eb13cf7..00000000
--- a/lib/cherrypy/test/sessiondemo.py
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/usr/bin/python
-"""A session demonstration app."""
-
-import calendar
-from datetime import datetime
-from datetime import timezone as _timezone
-import sys
-
-import cherrypy
-from cherrypy.lib import sessions
-
-
-page = """
-<html>
-<head>
-<style type='text/css'>
-table { border-collapse: collapse; border: 1px solid #663333; }
-th { text-align: right; background-color: #663333; color: white; padding: 0.5em; }
-td { white-space: pre-wrap; font-family: monospace; padding: 0.5em;
-     border: 1px solid #663333; }
-.warn { font-family: serif; color: #990000; }
-</style>
-<script type="text/javascript">
-<!--
-function twodigit(d) { return d < 10 ? "0" + d : d; }
-function formattime(t) {
-    var month = t.getUTCMonth() + 1;
-    var day = t.getUTCDate();
-    var year = t.getUTCFullYear();
-    var hours = t.getUTCHours();
-    var minutes = t.getUTCMinutes();
-    return (year + "/" + twodigit(month) + "/" + twodigit(day) + " " +
-            hours + ":" + twodigit(minutes) + " UTC");
-}
-
-function interval(s) {
-    // Return the given interval (in seconds) as an English phrase
-    var seconds = s %% 60;
-    s = Math.floor(s / 60);
-    var minutes = s %% 60;
-    s = Math.floor(s / 60);
-    var hours = s %% 24;
-    var v = twodigit(hours) + ":" + twodigit(minutes) + ":" + twodigit(seconds);
-    var days = Math.floor(s / 24);
-    if (days != 0) v = days + ' days, ' + v;
-    return v;
-}
-
-var fudge_seconds = 5;
-
-function init() {
-    // Set the content of the 'btime' cell.
-    var currentTime = new Date();
-    var bunixtime = Math.floor(currentTime.getTime() / 1000);
-
-    var v = formattime(currentTime);
-    v += " (Unix time: " + bunixtime + ")";
-
-    var diff = Math.abs(%(serverunixtime)s - bunixtime);
-    if (diff > fudge_seconds) v += "<p class='warn'>Browser and Server times disagree.</p>";
-
-    document.getElementById('btime').innerHTML = v;
-
-    // Warn if response cookie expires is not close to one hour in the future.
-    // Yes, we want this to happen when wit hit the 'Expire' link, too.
-    var expires = Date.parse("%(expires)s") / 1000;
-    var onehour = (60 * 60);
-    if (Math.abs(expires - (bunixtime + onehour)) > fudge_seconds) {
-        diff = Math.floor(expires - bunixtime);
-        if (expires > (bunixtime + onehour)) {
-            var msg = "Response cookie 'expires' date is " + interval(diff) + " in the future.";
-        } else {
-            var msg = "Response cookie 'expires' date is " + interval(0 - diff) + " in the past.";
-        }
-        document.getElementById('respcookiewarn').innerHTML = msg;
-    }
-}
-//-->
-</script>
-</head>
-
-<body onload='init()'>
-<h2>Session Demo</h2>
-<p>Reload this page. The session ID should not change from one reload to the next</p>
-<p><a href='../'>Index</a> | <a href='expire'>Expire</a> | <a href='regen'>Regenerate</a></p>
-<table>
-    <tr><th>Session ID:</th><td>%(sessionid)s<p class='warn'>%(changemsg)s</p></td></tr>
-    <tr><th>Request Cookie</th><td>%(reqcookie)s</td></tr>
-    <tr><th>Response Cookie</th><td>%(respcookie)s<p id='respcookiewarn' class='warn'></p></td></tr>
-    <tr><th>Session Data</th><td>%(sessiondata)s</td></tr>
-    <tr><th>Server Time</th><td id='stime'>%(servertime)s (Unix time: %(serverunixtime)s)</td></tr>
-    <tr><th>Browser Time</th><td id='btime'>&nbsp;</td></tr>
-    <tr><th>Cherrypy Version:</th><td>%(cpversion)s</td></tr>
-    <tr><th>Python Version:</th><td>%(pyversion)s</td></tr>
-</table>
-</body></html>
-"""  # noqa E501
-
-
-class Root(object):
-
-    def page(self):
-        changemsg = []
-        if cherrypy.session.id != cherrypy.session.originalid:
-            if cherrypy.session.originalid is None:
-                changemsg.append(
-                    'Created new session because no session id was given.')
-            if cherrypy.session.missing:
-                changemsg.append(
-                    'Created new session due to missing '
-                    '(expired or malicious) session.')
-            if cherrypy.session.regenerated:
-                changemsg.append('Application generated a new session.')
-
-        try:
-            expires = cherrypy.response.cookie['session_id']['expires']
-        except KeyError:
-            expires = ''
-
-        return page % {
-            'sessionid': cherrypy.session.id,
-            'changemsg': '<br>'.join(changemsg),
-            'respcookie': cherrypy.response.cookie.output(),
-            'reqcookie': cherrypy.request.cookie.output(),
-            'sessiondata': list(cherrypy.session.items()),
-            'servertime': (
-                datetime.now(_timezone.utc).strftime('%Y/%m/%d %H:%M UTC')
-            ),
-            'serverunixtime':
-            calendar.timegm(
-                datetime.utcnow(_timezone.utc).timetuple(),
-            ),
-            'cpversion': cherrypy.__version__,
-            'pyversion': sys.version,
-            'expires': expires,
-        }
-
-    @cherrypy.expose
-    def index(self):
-        # Must modify data or the session will not be saved.
-        cherrypy.session['color'] = 'green'
-        return self.page()
-
-    @cherrypy.expose
-    def expire(self):
-        sessions.expire()
-        return self.page()
-
-    @cherrypy.expose
-    def regen(self):
-        cherrypy.session.regenerate()
-        # Must modify data or the session will not be saved.
-        cherrypy.session['color'] = 'yellow'
-        return self.page()
-
-
-if __name__ == '__main__':
-    cherrypy.config.update({
-        # 'environment': 'production',
-        'log.screen': True,
-        'tools.sessions.on': True,
-    })
-    cherrypy.quickstart(Root())
diff --git a/lib/cherrypy/test/static/404.html b/lib/cherrypy/test/static/404.html
deleted file mode 100644
index 01b17b09..00000000
--- a/lib/cherrypy/test/static/404.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
- <body>
-  <h1>I couldn't find that thing you were looking for!</h1>
- </body>
-</html>
diff --git a/lib/cherrypy/test/static/dirback.jpg b/lib/cherrypy/test/static/dirback.jpg
deleted file mode 100644
index 80403dc2..00000000
Binary files a/lib/cherrypy/test/static/dirback.jpg and /dev/null differ
diff --git a/lib/cherrypy/test/static/index.html b/lib/cherrypy/test/static/index.html
deleted file mode 100644
index a5c19667..00000000
--- a/lib/cherrypy/test/static/index.html
+++ /dev/null
@@ -1 +0,0 @@
-Hello, world
diff --git a/lib/cherrypy/test/style.css b/lib/cherrypy/test/style.css
deleted file mode 100644
index b266e93d..00000000
--- a/lib/cherrypy/test/style.css
+++ /dev/null
@@ -1 +0,0 @@
-Dummy stylesheet
diff --git a/lib/cherrypy/test/test.pem b/lib/cherrypy/test/test.pem
deleted file mode 100644
index 47a47042..00000000
--- a/lib/cherrypy/test/test.pem
+++ /dev/null
@@ -1,38 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDBKo554mzIMY+AByUNpaUOP9bJnQ7ZLQe9XgHwoLJR4VzpyZZZ
-R9L4WtImEew05FY3Izerfm3MN3+MC0tJ6yQU9sOiU3vBW6RrLIMlfKsnRwBRZ0Kn
-da+O6xldVSosu8Ev3z9VZ94iC/ZgKzrH7Mjj/U8/MQO7RBS/LAqee8bFNQIDAQAB
-AoGAWOCF0ZrWxn3XMucWq2LNwPKqlvVGwbIwX3cDmX22zmnM4Fy6arXbYh4XlyCj
-9+ofqRrxIFz5k/7tFriTmZ0xag5+Jdx+Kwg0/twiP7XCNKipFogwe1Hznw8OFAoT
-enKBdj2+/n2o0Bvo/tDB59m9L/538d46JGQUmJlzMyqYikECQQDyoq+8CtMNvE18
-8VgHcR/KtApxWAjj4HpaHYL637ATjThetUZkW92mgDgowyplthusxdNqhHWyv7E8
-tWNdYErZAkEAy85ShTR0M5aWmrE7o0r0SpWInAkNBH9aXQRRARFYsdBtNfRu6I0i
-0lvU9wiu3eF57FMEC86yViZ5UBnQfTu7vQJAVesj/Zt7pwaCDfdMa740OsxMUlyR
-MVhhGx4OLpYdPJ8qUecxGQKq13XZ7R1HGyNEY4bd2X80Smq08UFuATfC6QJAH8UB
-yBHtKz2GLIcELOg6PIYizW/7v3+6rlVF60yw7sb2vzpjL40QqIn4IKoR2DSVtOkb
-8FtAIX3N21aq0VrGYQJBAIPiaEc2AZ8Bq2GC4F3wOz/BxJ/izvnkiotR12QK4fh5
-yjZMhTjWCas5zwHR5PDjlD88AWGDMsZ1PicD4348xJQ=
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIDxTCCAy6gAwIBAgIJAI18BD7eQxlGMA0GCSqGSIb3DQEBBAUAMIGeMQswCQYD
-VQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTESMBAGA1UEBxMJU2FuIERpZWdv
-MRkwFwYDVQQKExBDaGVycnlQeSBQcm9qZWN0MREwDwYDVQQLEwhkZXYtdGVzdDEW
-MBQGA1UEAxMNQ2hlcnJ5UHkgVGVhbTEgMB4GCSqGSIb3DQEJARYRcmVtaUBjaGVy
-cnlweS5vcmcwHhcNMDYwOTA5MTkyMDIwWhcNMzQwMTI0MTkyMDIwWjCBnjELMAkG
-A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExEjAQBgNVBAcTCVNhbiBEaWVn
-bzEZMBcGA1UEChMQQ2hlcnJ5UHkgUHJvamVjdDERMA8GA1UECxMIZGV2LXRlc3Qx
-FjAUBgNVBAMTDUNoZXJyeVB5IFRlYW0xIDAeBgkqhkiG9w0BCQEWEXJlbWlAY2hl
-cnJ5cHkub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBKo554mzIMY+A
-ByUNpaUOP9bJnQ7ZLQe9XgHwoLJR4VzpyZZZR9L4WtImEew05FY3Izerfm3MN3+M
-C0tJ6yQU9sOiU3vBW6RrLIMlfKsnRwBRZ0Knda+O6xldVSosu8Ev3z9VZ94iC/Zg
-KzrH7Mjj/U8/MQO7RBS/LAqee8bFNQIDAQABo4IBBzCCAQMwHQYDVR0OBBYEFDIQ
-2feb71tVZCWpU0qJ/Tw+wdtoMIHTBgNVHSMEgcswgciAFDIQ2feb71tVZCWpU0qJ
-/Tw+wdtooYGkpIGhMIGeMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5p
-YTESMBAGA1UEBxMJU2FuIERpZWdvMRkwFwYDVQQKExBDaGVycnlQeSBQcm9qZWN0
-MREwDwYDVQQLEwhkZXYtdGVzdDEWMBQGA1UEAxMNQ2hlcnJ5UHkgVGVhbTEgMB4G
-CSqGSIb3DQEJARYRcmVtaUBjaGVycnlweS5vcmeCCQCNfAQ+3kMZRjAMBgNVHRME
-BTADAQH/MA0GCSqGSIb3DQEBBAUAA4GBAL7AAQz7IePV48ZTAFHKr88ntPALsL5S
-8vHCZPNMevNkLTj3DYUw2BcnENxMjm1kou2F2BkvheBPNZKIhc6z4hAml3ed1xa2
-D7w6e6OTcstdK/+KrPDDHeOP1dhMWNs2JE1bNlfF1LiXzYKSXpe88eCKjCXsCT/T
-NluCaWQys3MS
------END CERTIFICATE-----
diff --git a/lib/cherrypy/test/test_auth_basic.py b/lib/cherrypy/test/test_auth_basic.py
deleted file mode 100644
index f178f8f9..00000000
--- a/lib/cherrypy/test/test_auth_basic.py
+++ /dev/null
@@ -1,135 +0,0 @@
-# This file is part of CherryPy <http://www.cherrypy.dev/>
-# -*- coding: utf-8 -*-
-# vim:ts=4:sw=4:expandtab:fileencoding=utf-8
-
-from hashlib import md5
-
-import cherrypy
-from cherrypy._cpcompat import ntob
-from cherrypy.lib import auth_basic
-from cherrypy.test import helper
-
-
-class BasicAuthTest(helper.CPWebCase):
-
-    @staticmethod
-    def setup_server():
-        class Root:
-
-            @cherrypy.expose
-            def index(self):
-                return 'This is public.'
-
-        class BasicProtected:
-
-            @cherrypy.expose
-            def index(self):
-                return "Hello %s, you've been authorized." % (
-                    cherrypy.request.login)
-
-        class BasicProtected2:
-
-            @cherrypy.expose
-            def index(self):
-                return "Hello %s, you've been authorized." % (
-                    cherrypy.request.login)
-
-        class BasicProtected2_u:
-
-            @cherrypy.expose
-            def index(self):
-                return "Hello %s, you've been authorized." % (
-                    cherrypy.request.login)
-
-        userpassdict = {'xuser': 'xpassword'}
-        userhashdict = {'xuser': md5(b'xpassword').hexdigest()}
-        userhashdict_u = {'xюзер': md5(ntob('їжа', 'utf-8')).hexdigest()}
-
-        def checkpasshash(realm, user, password):
-            p = userhashdict.get(user)
-            return p and p == md5(ntob(password)).hexdigest() or False
-
-        def checkpasshash_u(realm, user, password):
-            p = userhashdict_u.get(user)
-            return p and p == md5(ntob(password, 'utf-8')).hexdigest() or False
-
-        basic_checkpassword_dict = auth_basic.checkpassword_dict(userpassdict)
-        conf = {
-            '/basic': {
-                'tools.auth_basic.on': True,
-                'tools.auth_basic.realm': 'wonderland',
-                'tools.auth_basic.checkpassword': basic_checkpassword_dict
-            },
-            '/basic2': {
-                'tools.auth_basic.on': True,
-                'tools.auth_basic.realm': 'wonderland',
-                'tools.auth_basic.checkpassword': checkpasshash,
-                'tools.auth_basic.accept_charset': 'ISO-8859-1',
-            },
-            '/basic2_u': {
-                'tools.auth_basic.on': True,
-                'tools.auth_basic.realm': 'wonderland',
-                'tools.auth_basic.checkpassword': checkpasshash_u,
-                'tools.auth_basic.accept_charset': 'UTF-8',
-            },
-        }
-
-        root = Root()
-        root.basic = BasicProtected()
-        root.basic2 = BasicProtected2()
-        root.basic2_u = BasicProtected2_u()
-        cherrypy.tree.mount(root, config=conf)
-
-    def testPublic(self):
-        self.getPage('/')
-        self.assertStatus('200 OK')
-        self.assertHeader('Content-Type', 'text/html;charset=utf-8')
-        self.assertBody('This is public.')
-
-    def testBasic(self):
-        self.getPage('/basic/')
-        self.assertStatus(401)
-        self.assertHeader(
-            'WWW-Authenticate',
-            'Basic realm="wonderland", charset="UTF-8"'
-        )
-
-        self.getPage('/basic/',
-                     [('Authorization', 'Basic eHVzZXI6eHBhc3N3b3JX')])
-        self.assertStatus(401)
-
-        self.getPage('/basic/',
-                     [('Authorization', 'Basic eHVzZXI6eHBhc3N3b3Jk')])
-        self.assertStatus('200 OK')
-        self.assertBody("Hello xuser, you've been authorized.")
-
-    def testBasic2(self):
-        self.getPage('/basic2/')
-        self.assertStatus(401)
-        self.assertHeader('WWW-Authenticate', 'Basic realm="wonderland"')
-
-        self.getPage('/basic2/',
-                     [('Authorization', 'Basic eHVzZXI6eHBhc3N3b3JX')])
-        self.assertStatus(401)
-
-        self.getPage('/basic2/',
-                     [('Authorization', 'Basic eHVzZXI6eHBhc3N3b3Jk')])
-        self.assertStatus('200 OK')
-        self.assertBody("Hello xuser, you've been authorized.")
-
-    def testBasic2_u(self):
-        self.getPage('/basic2_u/')
-        self.assertStatus(401)
-        self.assertHeader(
-            'WWW-Authenticate',
-            'Basic realm="wonderland", charset="UTF-8"'
-        )
-
-        self.getPage('/basic2_u/',
-                     [('Authorization', 'Basic eNGO0LfQtdGAOtGX0LbRgw==')])
-        self.assertStatus(401)
-
-        self.getPage('/basic2_u/',
-                     [('Authorization', 'Basic eNGO0LfQtdGAOtGX0LbQsA==')])
-        self.assertStatus('200 OK')
-        self.assertBody("Hello xюзер, you've been authorized.")
diff --git a/lib/cherrypy/test/test_auth_digest.py b/lib/cherrypy/test/test_auth_digest.py
deleted file mode 100644
index 4b7b5298..00000000
--- a/lib/cherrypy/test/test_auth_digest.py
+++ /dev/null
@@ -1,131 +0,0 @@
-# This file is part of CherryPy <http://www.cherrypy.dev/>
-# -*- coding: utf-8 -*-
-# vim:ts=4:sw=4:expandtab:fileencoding=utf-8
-
-
-import cherrypy
-from cherrypy.lib import auth_digest
-from cherrypy._cpcompat import ntob
-
-from cherrypy.test import helper
-
-
-def _fetch_users():
-    return {'test': 'test', '☃йюзер': 'їпароль'}
-
-
-get_ha1 = cherrypy.lib.auth_digest.get_ha1_dict_plain(_fetch_users())
-
-
-class DigestAuthTest(helper.CPWebCase):
-
-    @staticmethod
-    def setup_server():
-        class Root:
-
-            @cherrypy.expose
-            def index(self):
-                return 'This is public.'
-
-        class DigestProtected:
-
-            @cherrypy.expose
-            def index(self, *args, **kwargs):
-                return "Hello %s, you've been authorized." % (
-                    cherrypy.request.login)
-
-        conf = {'/digest': {'tools.auth_digest.on': True,
-                            'tools.auth_digest.realm': 'localhost',
-                            'tools.auth_digest.get_ha1': get_ha1,
-                            'tools.auth_digest.key': 'a565c27146791cfb',
-                            'tools.auth_digest.debug': True,
-                            'tools.auth_digest.accept_charset': 'UTF-8'}}
-
-        root = Root()
-        root.digest = DigestProtected()
-        cherrypy.tree.mount(root, config=conf)
-
-    def testPublic(self):
-        self.getPage('/')
-        assert self.status == '200 OK'
-        self.assertHeader('Content-Type', 'text/html;charset=utf-8')
-        assert self.body == b'This is public.'
-
-    def _test_parametric_digest(self, username, realm):
-        test_uri = '/digest/?@/=%2F%40&%f0%9f%99%88=path'
-
-        self.getPage(test_uri)
-        assert self.status_code == 401
-
-        msg = 'Digest authentification scheme was not found'
-        www_auth_digest = tuple(filter(
-            lambda kv: kv[0].lower() == 'www-authenticate'
-            and kv[1].startswith('Digest '),
-            self.headers,
-        ))
-        assert len(www_auth_digest) == 1, msg
-
-        items = www_auth_digest[0][-1][7:].split(', ')
-        tokens = {}
-        for item in items:
-            key, value = item.split('=')
-            tokens[key.lower()] = value
-
-        assert tokens['realm'] == '"localhost"'
-        assert tokens['algorithm'] == '"MD5"'
-        assert tokens['qop'] == '"auth"'
-        assert tokens['charset'] == '"UTF-8"'
-
-        nonce = tokens['nonce'].strip('"')
-
-        # Test user agent response with a wrong value for 'realm'
-        base_auth = ('Digest username="%s", '
-                     'realm="%s", '
-                     'nonce="%s", '
-                     'uri="%s", '
-                     'algorithm=MD5, '
-                     'response="%s", '
-                     'qop=auth, '
-                     'nc=%s, '
-                     'cnonce="1522e61005789929"')
-
-        encoded_user = username
-        encoded_user = encoded_user.encode('utf-8')
-        encoded_user = encoded_user.decode('latin1')
-        auth_header = base_auth % (
-            encoded_user, realm, nonce, test_uri,
-            '11111111111111111111111111111111', '00000001',
-        )
-        auth = auth_digest.HttpDigestAuthorization(auth_header, 'GET')
-        # calculate the response digest
-        ha1 = get_ha1(auth.realm, auth.username)
-        response = auth.request_digest(ha1)
-        auth_header = base_auth % (
-            encoded_user, realm, nonce, test_uri,
-            response, '00000001',
-        )
-        self.getPage(test_uri, [('Authorization', auth_header)])
-
-    def test_wrong_realm(self):
-        # send response with correct response digest, but wrong realm
-        self._test_parametric_digest(username='test', realm='wrong realm')
-        assert self.status_code == 401
-
-    def test_ascii_user(self):
-        self._test_parametric_digest(username='test', realm='localhost')
-        assert self.status == '200 OK'
-        assert self.body == b"Hello test, you've been authorized."
-
-    def test_unicode_user(self):
-        self._test_parametric_digest(username='☃йюзер', realm='localhost')
-        assert self.status == '200 OK'
-        assert self.body == ntob(
-            "Hello ☃йюзер, you've been authorized.", 'utf-8',
-        )
-
-    def test_wrong_scheme(self):
-        basic_auth = {
-            'Authorization': 'Basic foo:bar',
-        }
-        self.getPage('/digest/', headers=list(basic_auth.items()))
-        assert self.status_code == 401
diff --git a/lib/cherrypy/test/test_bus.py b/lib/cherrypy/test/test_bus.py
deleted file mode 100644
index 594023a2..00000000
--- a/lib/cherrypy/test/test_bus.py
+++ /dev/null
@@ -1,327 +0,0 @@
-"""Publish-subscribe bus tests."""
-# pylint: disable=redefined-outer-name
-
-import os
-import sys
-import threading
-import time
-import unittest.mock
-
-import pytest
-
-from cherrypy.process import wspbus
-
-
-CI_ON_MACOS = bool(os.getenv('CI')) and sys.platform == 'darwin'
-msg = 'Listener %d on channel %s: %s.'  # pylint: disable=invalid-name
-
-
-@pytest.fixture
-def bus():
-    """Return a wspbus instance."""
-    return wspbus.Bus()
-
-
-@pytest.fixture
-def log_tracker(bus):
-    """Return an instance of bus log tracker."""
-    class LogTracker:  # pylint: disable=too-few-public-methods
-        """Bus log tracker."""
-
-        log_entries = []
-
-        def __init__(self, bus):
-            def logit(msg, level):  # pylint: disable=unused-argument
-                self.log_entries.append(msg)
-            bus.subscribe('log', logit)
-
-    return LogTracker(bus)
-
-
-@pytest.fixture
-def listener():
-    """Return an instance of bus response tracker."""
-    class Listner:  # pylint: disable=too-few-public-methods
-        """Bus handler return value tracker."""
-
-        responses = []
-
-        def get_listener(self, channel, index):
-            """Return an argument tracking listener."""
-            def listener(arg=None):
-                self.responses.append(msg % (index, channel, arg))
-            return listener
-
-    return Listner()
-
-
-def test_builtin_channels(bus, listener):
-    """Test that built-in channels trigger corresponding listeners."""
-    expected = []
-
-    for channel in bus.listeners:
-        for index, priority in enumerate([100, 50, 0, 51]):
-            bus.subscribe(
-                channel,
-                listener.get_listener(channel, index),
-                priority,
-            )
-
-    for channel in bus.listeners:
-        bus.publish(channel)
-        expected.extend([msg % (i, channel, None) for i in (2, 1, 3, 0)])
-        bus.publish(channel, arg=79347)
-        expected.extend([msg % (i, channel, 79347) for i in (2, 1, 3, 0)])
-
-    assert listener.responses == expected
-
-
-def test_custom_channels(bus, listener):
-    """Test that custom pub-sub channels work as built-in ones."""
-    expected = []
-
-    custom_listeners = ('hugh', 'louis', 'dewey')
-    for channel in custom_listeners:
-        for index, priority in enumerate([None, 10, 60, 40]):
-            bus.subscribe(
-                channel,
-                listener.get_listener(channel, index),
-                priority,
-            )
-
-    for channel in custom_listeners:
-        bus.publish(channel, 'ah so')
-        expected.extend(msg % (i, channel, 'ah so') for i in (1, 3, 0, 2))
-        bus.publish(channel)
-        expected.extend(msg % (i, channel, None) for i in (1, 3, 0, 2))
-
-    assert listener.responses == expected
-
-
-def test_listener_errors(bus, listener):
-    """Test that unhandled exceptions raise channel failures."""
-    expected = []
-    channels = [c for c in bus.listeners if c != 'log']
-
-    for channel in channels:
-        bus.subscribe(channel, listener.get_listener(channel, 1))
-        # This will break since the lambda takes no args.
-        bus.subscribe(channel, lambda: None, priority=20)
-
-    for channel in channels:
-        with pytest.raises(wspbus.ChannelFailures):
-            bus.publish(channel, 123)
-        expected.append(msg % (1, channel, 123))
-
-    assert listener.responses == expected
-
-
-def test_start(bus, listener, log_tracker):
-    """Test that bus start sequence calls all listeners."""
-    num = 3
-    for index in range(num):
-        bus.subscribe('start', listener.get_listener('start', index))
-
-    bus.start()
-    try:
-        # The start method MUST call all 'start' listeners.
-        assert (
-            set(listener.responses) ==
-            set(msg % (i, 'start', None) for i in range(num)))
-        # The start method MUST move the state to STARTED
-        # (or EXITING, if errors occur)
-        assert bus.state == bus.states.STARTED
-        # The start method MUST log its states.
-        assert log_tracker.log_entries == ['Bus STARTING', 'Bus STARTED']
-    finally:
-        # Exit so the atexit handler doesn't complain.
-        bus.exit()
-
-
-def test_stop(bus, listener, log_tracker):
-    """Test that bus stop sequence calls all listeners."""
-    num = 3
-
-    for index in range(num):
-        bus.subscribe('stop', listener.get_listener('stop', index))
-
-    bus.stop()
-
-    # The stop method MUST call all 'stop' listeners.
-    assert (set(listener.responses) ==
-            set(msg % (i, 'stop', None) for i in range(num)))
-
-    # The stop method MUST move the state to STOPPED
-    assert bus.state == bus.states.STOPPED
-
-    # The stop method MUST log its states.
-    assert log_tracker.log_entries == ['Bus STOPPING', 'Bus STOPPED']
-
-
-def test_graceful(bus, listener, log_tracker):
-    """Test that bus graceful state triggers all listeners."""
-    num = 3
-
-    for index in range(num):
-        bus.subscribe('graceful', listener.get_listener('graceful', index))
-
-    bus.graceful()
-
-    # The graceful method MUST call all 'graceful' listeners.
-    assert (
-        set(listener.responses) ==
-        set(msg % (i, 'graceful', None) for i in range(num)))
-
-    # The graceful method MUST log its states.
-    assert log_tracker.log_entries == ['Bus graceful']
-
-
-def test_exit(bus, listener, log_tracker):
-    """Test that bus exit sequence is correct."""
-    num = 3
-
-    for index in range(num):
-        bus.subscribe('stop', listener.get_listener('stop', index))
-        bus.subscribe('exit', listener.get_listener('exit', index))
-
-    bus.exit()
-
-    # The exit method MUST call all 'stop' listeners,
-    # and then all 'exit' listeners.
-    assert (set(listener.responses) ==
-            set([msg % (i, 'stop', None) for i in range(num)] +
-                [msg % (i, 'exit', None) for i in range(num)]))
-
-    # The exit method MUST move the state to EXITING
-    assert bus.state == bus.states.EXITING
-
-    # The exit method MUST log its states.
-    assert (log_tracker.log_entries ==
-            ['Bus STOPPING', 'Bus STOPPED', 'Bus EXITING', 'Bus EXITED'])
-
-
-def test_wait(bus):
-    """Test that bus wait awaits for states."""
-    def f(method):  # pylint: disable=invalid-name
-        time.sleep(0.2)
-        getattr(bus, method)()
-
-    flow = [
-        ('start', [bus.states.STARTED]),
-        ('stop', [bus.states.STOPPED]),
-        ('start', [bus.states.STARTING, bus.states.STARTED]),
-        ('exit', [bus.states.EXITING]),
-    ]
-
-    for method, states in flow:
-        threading.Thread(target=f, args=(method,)).start()
-        bus.wait(states)
-
-        # The wait method MUST wait for the given state(s).
-        assert bus.state in states, 'State %r not in %r' % (bus.state, states)
-
-
-@pytest.mark.xfail(CI_ON_MACOS, reason='continuous integration on macOS fails')
-def test_wait_publishes_periodically(bus):
-    """Test that wait publishes each tick."""
-    callback = unittest.mock.MagicMock()
-    bus.subscribe('main', callback)
-
-    def set_start():
-        time.sleep(0.05)
-        bus.start()
-    threading.Thread(target=set_start).start()
-    bus.wait(bus.states.STARTED, interval=0.01, channel='main')
-    assert callback.call_count > 3
-
-
-def test_block(bus, log_tracker):
-    """Test that bus block waits for exiting."""
-    def f():  # pylint: disable=invalid-name
-        time.sleep(0.2)
-        bus.exit()
-
-    def g():  # pylint: disable=invalid-name
-        time.sleep(0.4)
-
-    threading.Thread(target=f).start()
-    threading.Thread(target=g).start()
-    threads = [t for t in threading.enumerate() if not t.daemon]
-    assert len(threads) == 3
-
-    bus.block()
-
-    # The block method MUST wait for the EXITING state.
-    assert bus.state == bus.states.EXITING
-
-    # The block method MUST wait for ALL non-main, non-daemon threads to
-    # finish.
-    threads = [t for t in threading.enumerate() if not t.daemon]
-    assert len(threads) == 1
-
-    # The last message will mention an indeterminable thread name; ignore
-    # it
-    expected_bus_messages = [
-        'Bus STOPPING',
-        'Bus STOPPED',
-        'Bus EXITING',
-        'Bus EXITED',
-        'Waiting for child threads to terminate...',
-    ]
-    bus_msg_num = len(expected_bus_messages)
-
-    # If the last message mentions an indeterminable thread name then ignore it
-    assert log_tracker.log_entries[:bus_msg_num] == expected_bus_messages
-    assert len(log_tracker.log_entries[bus_msg_num:]) <= 1, (
-        'No more than one extra log line with the thread name expected'
-    )
-
-
-def test_start_with_callback(bus):
-    """Test that callback fires on bus start."""
-    try:
-        events = []
-
-        def f(*args, **kwargs):  # pylint: disable=invalid-name
-            events.append(('f', args, kwargs))
-
-        def g():  # pylint: disable=invalid-name
-            events.append('g')
-        bus.subscribe('start', g)
-        bus.start_with_callback(f, (1, 3, 5), {'foo': 'bar'})
-
-        # Give wait() time to run f()
-        time.sleep(0.2)
-
-        # The callback method MUST wait for the STARTED state.
-        assert bus.state == bus.states.STARTED
-
-        # The callback method MUST run after all start methods.
-        assert events == ['g', ('f', (1, 3, 5), {'foo': 'bar'})]
-    finally:
-        bus.exit()
-
-
-def test_log(bus, log_tracker):
-    """Test that bus messages and errors are logged."""
-    assert log_tracker.log_entries == []
-
-    # Try a normal message.
-    expected = []
-    for msg_ in ["O mah darlin'"] * 3 + ['Clementiiiiiiiine']:
-        bus.log(msg_)
-        expected.append(msg_)
-        assert log_tracker.log_entries == expected
-
-    # Try an error message
-    try:
-        foo
-    except NameError:
-        bus.log('You are lost and gone forever', traceback=True)
-        lastmsg = log_tracker.log_entries[-1]
-        assert 'Traceback' in lastmsg and 'NameError' in lastmsg, (
-            'Last log message %r did not contain '
-            'the expected traceback.' % lastmsg
-        )
-    else:
-        pytest.fail('NameError was not raised as expected.')
diff --git a/lib/cherrypy/test/test_caching.py b/lib/cherrypy/test/test_caching.py
deleted file mode 100644
index c0b89797..00000000
--- a/lib/cherrypy/test/test_caching.py
+++ /dev/null
@@ -1,390 +0,0 @@
-import datetime
-from itertools import count
-import os
-import threading
-import time
-import urllib.parse
-
-import pytest
-
-import cherrypy
-from cherrypy.lib import httputil
-
-from cherrypy.test import helper
-
-
-curdir = os.path.join(os.getcwd(), os.path.dirname(__file__))
-
-gif_bytes = (
-    b'GIF89a\x01\x00\x01\x00\x82\x00\x01\x99"\x1e\x00\x00\x00\x00\x00'
-    b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-    b'\x00,\x00\x00\x00\x00\x01\x00\x01\x00\x02\x03\x02\x08\t\x00;'
-)
-
-
-class CacheTest(helper.CPWebCase):
-
-    @staticmethod
-    def setup_server():
-
-        @cherrypy.config(**{'tools.caching.on': True})
-        class Root:
-
-            def __init__(self):
-                self.counter = 0
-                self.control_counter = 0
-                self.longlock = threading.Lock()
-
-            @cherrypy.expose
-            def index(self):
-                self.counter += 1
-                msg = 'visit #%s' % self.counter
-                return msg
-
-            @cherrypy.expose
-            def control(self):
-                self.control_counter += 1
-                return 'visit #%s' % self.control_counter
-
-            @cherrypy.expose
-            def a_gif(self):
-                cherrypy.response.headers[
-                    'Last-Modified'] = httputil.HTTPDate()
-                return gif_bytes
-
-            @cherrypy.expose
-            def long_process(self, seconds='1'):
-                try:
-                    self.longlock.acquire()
-                    time.sleep(float(seconds))
-                finally:
-                    self.longlock.release()
-                return 'success!'
-
-            @cherrypy.expose
-            def clear_cache(self, path):
-                cherrypy._cache.store[cherrypy.request.base + path].clear()
-
-        @cherrypy.config(**{
-            'tools.caching.on': True,
-            'tools.response_headers.on': True,
-            'tools.response_headers.headers': [
-                ('Vary', 'Our-Varying-Header')
-            ],
-        })
-        class VaryHeaderCachingServer(object):
-
-            def __init__(self):
-                self.counter = count(1)
-
-            @cherrypy.expose
-            def index(self):
-                return 'visit #%s' % next(self.counter)
-
-        @cherrypy.config(**{
-            'tools.expires.on': True,
-            'tools.expires.secs': 60,
-            'tools.staticdir.on': True,
-            'tools.staticdir.dir': 'static',
-            'tools.staticdir.root': curdir,
-        })
-        class UnCached(object):
-
-            @cherrypy.expose
-            @cherrypy.config(**{'tools.expires.secs': 0})
-            def force(self):
-                cherrypy.response.headers['Etag'] = 'bibbitybobbityboo'
-                self._cp_config['tools.expires.force'] = True
-                self._cp_config['tools.expires.secs'] = 0
-                return 'being forceful'
-
-            @cherrypy.expose
-            def dynamic(self):
-                cherrypy.response.headers['Etag'] = 'bibbitybobbityboo'
-                cherrypy.response.headers['Cache-Control'] = 'private'
-                return 'D-d-d-dynamic!'
-
-            @cherrypy.expose
-            def cacheable(self):
-                cherrypy.response.headers['Etag'] = 'bibbitybobbityboo'
-                return "Hi, I'm cacheable."
-
-            @cherrypy.expose
-            @cherrypy.config(**{'tools.expires.secs': 86400})
-            def specific(self):
-                cherrypy.response.headers[
-                    'Etag'] = 'need_this_to_make_me_cacheable'
-                return 'I am being specific'
-
-            class Foo(object):
-                pass
-
-            @cherrypy.expose
-            @cherrypy.config(**{'tools.expires.secs': Foo()})
-            def wrongtype(self):
-                cherrypy.response.headers[
-                    'Etag'] = 'need_this_to_make_me_cacheable'
-                return 'Woops'
-
-        @cherrypy.config(**{
-            'tools.gzip.mime_types': ['text/*', 'image/*'],
-            'tools.caching.on': True,
-            'tools.staticdir.on': True,
-            'tools.staticdir.dir': 'static',
-            'tools.staticdir.root': curdir
-        })
-        class GzipStaticCache(object):
-            pass
-
-        cherrypy.tree.mount(Root())
-        cherrypy.tree.mount(UnCached(), '/expires')
-        cherrypy.tree.mount(VaryHeaderCachingServer(), '/varying_headers')
-        cherrypy.tree.mount(GzipStaticCache(), '/gzip_static_cache')
-        cherrypy.config.update({'tools.gzip.on': True})
-
-    def testCaching(self):
-        elapsed = 0.0
-        for trial in range(10):
-            self.getPage('/')
-            # The response should be the same every time,
-            # except for the Age response header.
-            self.assertBody('visit #1')
-            if trial != 0:
-                age = int(self.assertHeader('Age'))
-                assert age >= elapsed
-                elapsed = age
-
-        # POST, PUT, DELETE should not be cached.
-        self.getPage('/', method='POST')
-        self.assertBody('visit #2')
-        # Because gzip is turned on, the Vary header should always Vary for
-        # content-encoding
-        self.assertHeader('Vary', 'Accept-Encoding')
-        # The previous request should have invalidated the cache,
-        # so this request will recalc the response.
-        self.getPage('/', method='GET')
-        self.assertBody('visit #3')
-        # ...but this request should get the cached copy.
-        self.getPage('/', method='GET')
-        self.assertBody('visit #3')
-        self.getPage('/', method='DELETE')
-        self.assertBody('visit #4')
-
-        # The previous request should have invalidated the cache,
-        # so this request will recalc the response.
-        self.getPage('/', method='GET', headers=[('Accept-Encoding', 'gzip')])
-        self.assertHeader('Content-Encoding', 'gzip')
-        self.assertHeader('Vary')
-        self.assertEqual(
-            cherrypy.lib.encoding.decompress(self.body), b'visit #5')
-
-        # Now check that a second request gets the gzip header and gzipped body
-        # This also tests a bug in 3.0 to 3.0.2 whereby the cached, gzipped
-        # response body was being gzipped a second time.
-        self.getPage('/', method='GET', headers=[('Accept-Encoding', 'gzip')])
-        self.assertHeader('Content-Encoding', 'gzip')
-        self.assertEqual(
-            cherrypy.lib.encoding.decompress(self.body), b'visit #5')
-
-        # Now check that a third request that doesn't accept gzip
-        # skips the cache (because the 'Vary' header denies it).
-        self.getPage('/', method='GET')
-        self.assertNoHeader('Content-Encoding')
-        self.assertBody('visit #6')
-
-    def testVaryHeader(self):
-        self.getPage('/varying_headers/')
-        self.assertStatus('200 OK')
-        self.assertHeaderItemValue('Vary', 'Our-Varying-Header')
-        self.assertBody('visit #1')
-
-        # Now check that different 'Vary'-fields don't evict each other.
-        # This test creates 2 requests with different 'Our-Varying-Header'
-        # and then tests if the first one still exists.
-        self.getPage('/varying_headers/',
-                     headers=[('Our-Varying-Header', 'request 2')])
-        self.assertStatus('200 OK')
-        self.assertBody('visit #2')
-
-        self.getPage('/varying_headers/',
-                     headers=[('Our-Varying-Header', 'request 2')])
-        self.assertStatus('200 OK')
-        self.assertBody('visit #2')
-
-        self.getPage('/varying_headers/')
-        self.assertStatus('200 OK')
-        self.assertBody('visit #1')
-
-    def testExpiresTool(self):
-        # test setting an expires header
-        self.getPage('/expires/specific')
-        self.assertStatus('200 OK')
-        self.assertHeader('Expires')
-
-        # test exceptions for bad time values
-        self.getPage('/expires/wrongtype')
-        self.assertStatus(500)
-        self.assertInBody('TypeError')
-
-        # static content should not have "cache prevention" headers
-        self.getPage('/expires/index.html')
-        self.assertStatus('200 OK')
-        self.assertNoHeader('Pragma')
-        self.assertNoHeader('Cache-Control')
-        self.assertHeader('Expires')
-
-        # dynamic content that sets indicators should not have
-        # "cache prevention" headers
-        self.getPage('/expires/cacheable')
-        self.assertStatus('200 OK')
-        self.assertNoHeader('Pragma')
-        self.assertNoHeader('Cache-Control')
-        self.assertHeader('Expires')
-
-        self.getPage('/expires/dynamic')
-        self.assertBody('D-d-d-dynamic!')
-        # the Cache-Control header should be untouched
-        self.assertHeader('Cache-Control', 'private')
-        self.assertHeader('Expires')
-
-        # configure the tool to ignore indicators and replace existing headers
-        self.getPage('/expires/force')
-        self.assertStatus('200 OK')
-        # This also gives us a chance to test 0 expiry with no other headers
-        self.assertHeader('Pragma', 'no-cache')
-        if cherrypy.server.protocol_version == 'HTTP/1.1':
-            self.assertHeader('Cache-Control', 'no-cache, must-revalidate')
-        self.assertHeader('Expires', 'Sun, 28 Jan 2007 00:00:00 GMT')
-
-        # static content should now have "cache prevention" headers
-        self.getPage('/expires/index.html')
-        self.assertStatus('200 OK')
-        self.assertHeader('Pragma', 'no-cache')
-        if cherrypy.server.protocol_version == 'HTTP/1.1':
-            self.assertHeader('Cache-Control', 'no-cache, must-revalidate')
-        self.assertHeader('Expires', 'Sun, 28 Jan 2007 00:00:00 GMT')
-
-        # the cacheable handler should now have "cache prevention" headers
-        self.getPage('/expires/cacheable')
-        self.assertStatus('200 OK')
-        self.assertHeader('Pragma', 'no-cache')
-        if cherrypy.server.protocol_version == 'HTTP/1.1':
-            self.assertHeader('Cache-Control', 'no-cache, must-revalidate')
-        self.assertHeader('Expires', 'Sun, 28 Jan 2007 00:00:00 GMT')
-
-        self.getPage('/expires/dynamic')
-        self.assertBody('D-d-d-dynamic!')
-        # dynamic sets Cache-Control to private but it should  be
-        # overwritten here ...
-        self.assertHeader('Pragma', 'no-cache')
-        if cherrypy.server.protocol_version == 'HTTP/1.1':
-            self.assertHeader('Cache-Control', 'no-cache, must-revalidate')
-        self.assertHeader('Expires', 'Sun, 28 Jan 2007 00:00:00 GMT')
-
-    def _assert_resp_len_and_enc_for_gzip(self, uri):
-        """
-        Test that after querying gzipped content it's remains valid in
-        cache and available non-gzipped as well.
-        """
-        ACCEPT_GZIP_HEADERS = [('Accept-Encoding', 'gzip')]
-        content_len = None
-
-        for _ in range(3):
-            self.getPage(uri, method='GET', headers=ACCEPT_GZIP_HEADERS)
-
-            if content_len is not None:
-                # all requests should get the same length
-                self.assertHeader('Content-Length', content_len)
-                self.assertHeader('Content-Encoding', 'gzip')
-
-            content_len = dict(self.headers)['Content-Length']
-
-        # check that we can still get non-gzipped version
-        self.getPage(uri, method='GET')
-        self.assertNoHeader('Content-Encoding')
-        # non-gzipped version should have a different content length
-        self.assertNoHeaderItemValue('Content-Length', content_len)
-
-    def testGzipStaticCache(self):
-        """Test that cache and gzip tools play well together when both enabled.
-
-        Ref GitHub issue #1190.
-        """
-        GZIP_STATIC_CACHE_TMPL = '/gzip_static_cache/{}'
-        resource_files = ('index.html', 'dirback.jpg')
-
-        for f in resource_files:
-            uri = GZIP_STATIC_CACHE_TMPL.format(f)
-            self._assert_resp_len_and_enc_for_gzip(uri)
-
-    def testLastModified(self):
-        self.getPage('/a.gif')
-        self.assertStatus(200)
-        self.assertBody(gif_bytes)
-        lm1 = self.assertHeader('Last-Modified')
-
-        # this request should get the cached copy.
-        self.getPage('/a.gif')
-        self.assertStatus(200)
-        self.assertBody(gif_bytes)
-        self.assertHeader('Age')
-        lm2 = self.assertHeader('Last-Modified')
-        self.assertEqual(lm1, lm2)
-
-        # this request should match the cached copy, but raise 304.
-        self.getPage('/a.gif', [('If-Modified-Since', lm1)])
-        self.assertStatus(304)
-        self.assertNoHeader('Last-Modified')
-        if not getattr(cherrypy.server, 'using_apache', False):
-            self.assertHeader('Age')
-
-    @pytest.mark.xfail(reason='#1536')
-    def test_antistampede(self):
-        SECONDS = 4
-        slow_url = '/long_process?seconds={SECONDS}'.format(**locals())
-        # We MUST make an initial synchronous request in order to create the
-        # AntiStampedeCache object, and populate its selecting_headers,
-        # before the actual stampede.
-        self.getPage(slow_url)
-        self.assertBody('success!')
-        path = urllib.parse.quote(slow_url, safe='')
-        self.getPage('/clear_cache?path=' + path)
-        self.assertStatus(200)
-
-        start = datetime.datetime.now()
-
-        def run():
-            self.getPage(slow_url)
-            # The response should be the same every time
-            self.assertBody('success!')
-        ts = [threading.Thread(target=run) for i in range(100)]
-        for t in ts:
-            t.start()
-        for t in ts:
-            t.join()
-        finish = datetime.datetime.now()
-        # Allow for overhead, two seconds for slow hosts
-        allowance = SECONDS + 2
-        self.assertEqualDates(start, finish, seconds=allowance)
-
-    def test_cache_control(self):
-        self.getPage('/control')
-        self.assertBody('visit #1')
-        self.getPage('/control')
-        self.assertBody('visit #1')
-
-        self.getPage('/control', headers=[('Cache-Control', 'no-cache')])
-        self.assertBody('visit #2')
-        self.getPage('/control')
-        self.assertBody('visit #2')
-
-        self.getPage('/control', headers=[('Pragma', 'no-cache')])
-        self.assertBody('visit #3')
-        self.getPage('/control')
-        self.assertBody('visit #3')
-
-        time.sleep(1)
-        self.getPage('/control', headers=[('Cache-Control', 'max-age=0')])
-        self.assertBody('visit #4')
-        self.getPage('/control')
-        self.assertBody('visit #4')
diff --git a/lib/cherrypy/test/test_config.py b/lib/cherrypy/test/test_config.py
deleted file mode 100644
index ecd46019..00000000
--- a/lib/cherrypy/test/test_config.py
+++ /dev/null
@@ -1,291 +0,0 @@
-"""Tests for the CherryPy configuration system."""
-
-import io
-import os
-import sys
-import unittest
-
-import cherrypy
-
-from cherrypy.test import helper
-
-
-localDir = os.path.join(os.getcwd(), os.path.dirname(__file__))
-
-
-def StringIOFromNative(x):
-    return io.StringIO(str(x))
-
-
-def setup_server():
-
-    @cherrypy.config(foo='this', bar='that')
-    class Root:
-
-        def __init__(self):
-            cherrypy.config.namespaces['db'] = self.db_namespace
-
-        def db_namespace(self, k, v):
-            if k == 'scheme':
-                self.db = v
-
-        @cherrypy.expose(alias=('global_', 'xyz'))
-        def index(self, key):
-            return cherrypy.request.config.get(key, 'None')
-
-        @cherrypy.expose
-        def repr(self, key):
-            return repr(cherrypy.request.config.get(key, None))
-
-        @cherrypy.expose
-        def dbscheme(self):
-            return self.db
-
-        @cherrypy.expose
-        @cherrypy.config(**{'request.body.attempt_charsets': ['utf-16']})
-        def plain(self, x):
-            return x
-
-        favicon_ico = cherrypy.tools.staticfile.handler(
-            filename=os.path.join(localDir, '../favicon.ico'))
-
-    @cherrypy.config(foo='this2', baz='that2')
-    class Foo:
-
-        @cherrypy.expose
-        def index(self, key):
-            return cherrypy.request.config.get(key, 'None')
-        nex = index
-
-        @cherrypy.expose
-        @cherrypy.config(**{'response.headers.X-silly': 'sillyval'})
-        def silly(self):
-            return 'Hello world'
-
-        # Test the expose and config decorators
-        @cherrypy.config(foo='this3', **{'bax': 'this4'})
-        @cherrypy.expose
-        def bar(self, key):
-            return repr(cherrypy.request.config.get(key, None))
-
-    class Another:
-
-        @cherrypy.expose
-        def index(self, key):
-            return str(cherrypy.request.config.get(key, 'None'))
-
-    def raw_namespace(key, value):
-        if key == 'input.map':
-            handler = cherrypy.request.handler
-
-            def wrapper():
-                params = cherrypy.request.params
-                for name, coercer in value.copy().items():
-                    try:
-                        params[name] = coercer(params[name])
-                    except KeyError:
-                        pass
-                return handler()
-            cherrypy.request.handler = wrapper
-        elif key == 'output':
-            handler = cherrypy.request.handler
-
-            def wrapper():
-                # 'value' is a type (like int or str).
-                return value(handler())
-            cherrypy.request.handler = wrapper
-
-    @cherrypy.config(**{'raw.output': repr})
-    class Raw:
-
-        @cherrypy.expose
-        @cherrypy.config(**{'raw.input.map': {'num': int}})
-        def incr(self, num):
-            return num + 1
-
-    ioconf = StringIOFromNative("""
-[/]
-neg: -1234
-filename: os.path.join(sys.prefix, "hello.py")
-thing1: cherrypy.lib.httputil.response_codes[404]
-thing2: __import__('cherrypy.tutorial', globals(), locals(), ['']).thing2
-complex: 3+2j
-mul: 6*3
-ones: "11"
-twos: "22"
-stradd: %%(ones)s + %%(twos)s + "33"
-
-[/favicon.ico]
-tools.staticfile.filename = %r
-""" % os.path.join(localDir, 'static/dirback.jpg'))
-
-    root = Root()
-    root.foo = Foo()
-    root.raw = Raw()
-    app = cherrypy.tree.mount(root, config=ioconf)
-    app.request_class.namespaces['raw'] = raw_namespace
-
-    cherrypy.tree.mount(Another(), '/another')
-    cherrypy.config.update({'luxuryyacht': 'throatwobblermangrove',
-                            'db.scheme': r'sqlite///memory',
-                            })
-
-
-#                             Client-side code                             #
-
-
-class ConfigTests(helper.CPWebCase):
-    setup_server = staticmethod(setup_server)
-
-    def testConfig(self):
-        tests = [
-            ('/', 'nex', 'None'),
-            ('/', 'foo', 'this'),
-            ('/', 'bar', 'that'),
-            ('/xyz', 'foo', 'this'),
-            ('/foo/', 'foo', 'this2'),
-            ('/foo/', 'bar', 'that'),
-            ('/foo/', 'bax', 'None'),
-            ('/foo/bar', 'baz', "'that2'"),
-            ('/foo/nex', 'baz', 'that2'),
-            # If 'foo' == 'this', then the mount point '/another' leaks into
-            # '/'.
-            ('/another/', 'foo', 'None'),
-        ]
-        for path, key, expected in tests:
-            self.getPage(path + '?key=' + key)
-            self.assertBody(expected)
-
-        expectedconf = {
-            # From CP defaults
-            'tools.log_headers.on': False,
-            'tools.log_tracebacks.on': True,
-            'request.show_tracebacks': True,
-            'log.screen': False,
-            'environment': 'test_suite',
-            'engine.autoreload.on': False,
-            # From global config
-            'luxuryyacht': 'throatwobblermangrove',
-            # From Root._cp_config
-            'bar': 'that',
-            # From Foo._cp_config
-            'baz': 'that2',
-            # From Foo.bar._cp_config
-            'foo': 'this3',
-            'bax': 'this4',
-        }
-        for key, expected in expectedconf.items():
-            self.getPage('/foo/bar?key=' + key)
-            self.assertBody(repr(expected))
-
-    def testUnrepr(self):
-        self.getPage('/repr?key=neg')
-        self.assertBody('-1234')
-
-        self.getPage('/repr?key=filename')
-        self.assertBody(repr(os.path.join(sys.prefix, 'hello.py')))
-
-        self.getPage('/repr?key=thing1')
-        self.assertBody(repr(cherrypy.lib.httputil.response_codes[404]))
-
-        if not getattr(cherrypy.server, 'using_apache', False):
-            # The object ID's won't match up when using Apache, since the
-            # server and client are running in different processes.
-            self.getPage('/repr?key=thing2')
-            from cherrypy.tutorial import thing2
-            self.assertBody(repr(thing2))
-
-        self.getPage('/repr?key=complex')
-        self.assertBody('(3+2j)')
-
-        self.getPage('/repr?key=mul')
-        self.assertBody('18')
-
-        self.getPage('/repr?key=stradd')
-        self.assertBody(repr('112233'))
-
-    def testRespNamespaces(self):
-        self.getPage('/foo/silly')
-        self.assertHeader('X-silly', 'sillyval')
-        self.assertBody('Hello world')
-
-    def testCustomNamespaces(self):
-        self.getPage('/raw/incr?num=12')
-        self.assertBody('13')
-
-        self.getPage('/dbscheme')
-        self.assertBody(r'sqlite///memory')
-
-    def testHandlerToolConfigOverride(self):
-        # Assert that config overrides tool constructor args. Above, we set
-        # the favicon in the page handler to be '../favicon.ico',
-        # but then overrode it in config to be './static/dirback.jpg'.
-        self.getPage('/favicon.ico')
-        with open(os.path.join(localDir, 'static/dirback.jpg'), 'rb') as tf:
-            self.assertBody(tf.read())
-
-    def test_request_body_namespace(self):
-        self.getPage('/plain', method='POST', headers=[
-            ('Content-Type', 'application/x-www-form-urlencoded'),
-            ('Content-Length', '13')],
-            body=b'\xff\xfex\x00=\xff\xfea\x00b\x00c\x00')
-        self.assertBody('abc')
-
-
-class VariableSubstitutionTests(unittest.TestCase):
-    setup_server = staticmethod(setup_server)
-
-    def test_config(self):
-        from textwrap import dedent
-
-        # variable substitution with [DEFAULT]
-        conf = dedent("""
-        [DEFAULT]
-        dir = "/some/dir"
-        my.dir = %(dir)s + "/sub"
-
-        [my]
-        my.dir = %(dir)s + "/my/dir"
-        my.dir2 = %(my.dir)s + '/dir2'
-
-        """)
-
-        fp = StringIOFromNative(conf)
-
-        cherrypy.config.update(fp)
-        self.assertEqual(cherrypy.config['my']['my.dir'], '/some/dir/my/dir')
-        self.assertEqual(cherrypy.config['my']
-                         ['my.dir2'], '/some/dir/my/dir/dir2')
-
-
-class CallablesInConfigTest(unittest.TestCase):
-    setup_server = staticmethod(setup_server)
-
-    def test_call_with_literal_dict(self):
-        from textwrap import dedent
-        conf = dedent("""
-        [my]
-        value = dict(**{'foo': 'bar'})
-        """)
-        fp = StringIOFromNative(conf)
-        cherrypy.config.update(fp)
-        self.assertEqual(cherrypy.config['my']['value'], {'foo': 'bar'})
-
-    def test_call_with_kwargs(self):
-        from textwrap import dedent
-        conf = dedent("""
-        [my]
-        value = dict(foo="buzz", **cherrypy._test_dict)
-        """)
-        test_dict = {
-            'foo': 'bar',
-            'bar': 'foo',
-            'fizz': 'buzz'
-        }
-        cherrypy._test_dict = test_dict
-        fp = StringIOFromNative(conf)
-        cherrypy.config.update(fp)
-        test_dict['foo'] = 'buzz'
-        self.assertEqual(cherrypy.config['my']['value']['foo'], 'buzz')
-        self.assertEqual(cherrypy.config['my']['value'], test_dict)
-        del cherrypy._test_dict
diff --git a/lib/cherrypy/test/test_config_server.py b/lib/cherrypy/test/test_config_server.py
deleted file mode 100644
index 7b183530..00000000
--- a/lib/cherrypy/test/test_config_server.py
+++ /dev/null
@@ -1,126 +0,0 @@
-"""Tests for the CherryPy configuration system."""
-
-import os
-
-import cherrypy
-from cherrypy.test import helper
-
-
-localDir = os.path.join(os.getcwd(), os.path.dirname(__file__))
-
-
-#                             Client-side code                             #
-
-
-class ServerConfigTests(helper.CPWebCase):
-
-    @staticmethod
-    def setup_server():
-
-        class Root:
-
-            @cherrypy.expose
-            def index(self):
-                return cherrypy.request.wsgi_environ['SERVER_PORT']
-
-            @cherrypy.expose
-            def upload(self, file):
-                return 'Size: %s' % len(file.file.read())
-
-            @cherrypy.expose
-            @cherrypy.config(**{'request.body.maxbytes': 100})
-            def tinyupload(self):
-                return cherrypy.request.body.read()
-
-        cherrypy.tree.mount(Root())
-
-        cherrypy.config.update({
-            'server.socket_host': '0.0.0.0',
-            'server.socket_port': 9876,
-            'server.max_request_body_size': 200,
-            'server.max_request_header_size': 500,
-            'server.socket_timeout': 0.5,
-
-            # Test explicit server.instance
-            'server.2.instance': 'cherrypy._cpwsgi_server.CPWSGIServer',
-            'server.2.socket_port': 9877,
-
-            # Test non-numeric <servername>
-            # Also test default server.instance = builtin server
-            'server.yetanother.socket_port': 9878,
-        })
-
-    PORT = 9876
-
-    def testBasicConfig(self):
-        self.getPage('/')
-        self.assertBody(str(self.PORT))
-
-    def testAdditionalServers(self):
-        if self.scheme == 'https':
-            return self.skip('not available under ssl')
-        self.PORT = 9877
-        self.getPage('/')
-        self.assertBody(str(self.PORT))
-        self.PORT = 9878
-        self.getPage('/')
-        self.assertBody(str(self.PORT))
-
-    def testMaxRequestSizePerHandler(self):
-        if getattr(cherrypy.server, 'using_apache', False):
-            return self.skip('skipped due to known Apache differences... ')
-
-        self.getPage('/tinyupload', method='POST',
-                     headers=[('Content-Type', 'text/plain'),
-                              ('Content-Length', '100')],
-                     body='x' * 100)
-        self.assertStatus(200)
-        self.assertBody('x' * 100)
-
-        self.getPage('/tinyupload', method='POST',
-                     headers=[('Content-Type', 'text/plain'),
-                              ('Content-Length', '101')],
-                     body='x' * 101)
-        self.assertStatus(413)
-
-    def testMaxRequestSize(self):
-        if getattr(cherrypy.server, 'using_apache', False):
-            return self.skip('skipped due to known Apache differences... ')
-
-        for size in (500, 5000, 50000):
-            self.getPage('/', headers=[('From', 'x' * 500)])
-            self.assertStatus(413)
-
-        # Test for https://github.com/cherrypy/cherrypy/issues/421
-        # (Incorrect border condition in readline of SizeCheckWrapper).
-        # This hangs in rev 891 and earlier.
-        lines256 = 'x' * 248
-        self.getPage('/',
-                     headers=[('Host', '%s:%s' % (self.HOST, self.PORT)),
-                              ('From', lines256)])
-
-        # Test upload
-        cd = (
-            'Content-Disposition: form-data; '
-            'name="file"; '
-            'filename="hello.txt"'
-        )
-        body = '\r\n'.join([
-            '--x',
-            cd,
-            'Content-Type: text/plain',
-            '',
-            '%s',
-            '--x--'])
-        partlen = 200 - len(body)
-        b = body % ('x' * partlen)
-        h = [('Content-type', 'multipart/form-data; boundary=x'),
-             ('Content-Length', '%s' % len(b))]
-        self.getPage('/upload', h, 'POST', b)
-        self.assertBody('Size: %d' % partlen)
-
-        b = body % ('x' * 200)
-        h = [('Content-type', 'multipart/form-data; boundary=x'),
-             ('Content-Length', '%s' % len(b))]
-        self.getPage('/upload', h, 'POST', b)
-        self.assertStatus(413)
diff --git a/lib/cherrypy/test/test_conn.py b/lib/cherrypy/test/test_conn.py
deleted file mode 100644
index e4426c42..00000000
--- a/lib/cherrypy/test/test_conn.py
+++ /dev/null
@@ -1,864 +0,0 @@
-"""Tests for TCP connection handling, including proper and timely close."""
-
-import errno
-import socket
-import sys
-import time
-import urllib.parse
-from http.client import BadStatusLine, HTTPConnection, NotConnected
-
-from cheroot.test import webtest
-
-import cherrypy
-from cherrypy._cpcompat import HTTPSConnection, ntob, tonative
-from cherrypy.test import helper
-
-
-timeout = 1
-pov = 'pPeErRsSiIsStTeEnNcCeE oOfF vViIsSiIoOnN'
-
-
-def setup_server():
-
-    def raise500():
-        raise cherrypy.HTTPError(500)
-
-    class Root:
-
-        @cherrypy.expose
-        def index(self):
-            return pov
-        page1 = index
-        page2 = index
-        page3 = index
-
-        @cherrypy.expose
-        def hello(self):
-            return 'Hello, world!'
-
-        @cherrypy.expose
-        def timeout(self, t):
-            return str(cherrypy.server.httpserver.timeout)
-
-        @cherrypy.expose
-        @cherrypy.config(**{'response.stream': True})
-        def stream(self, set_cl=False):
-            if set_cl:
-                cherrypy.response.headers['Content-Length'] = 10
-
-            def content():
-                for x in range(10):
-                    yield str(x)
-
-            return content()
-
-        @cherrypy.expose
-        def error(self, code=500):
-            raise cherrypy.HTTPError(code)
-
-        @cherrypy.expose
-        def upload(self):
-            if not cherrypy.request.method == 'POST':
-                raise AssertionError("'POST' != request.method %r" %
-                                     cherrypy.request.method)
-            return "thanks for '%s'" % cherrypy.request.body.read()
-
-        @cherrypy.expose
-        def custom(self, response_code):
-            cherrypy.response.status = response_code
-            return 'Code = %s' % response_code
-
-        @cherrypy.expose
-        @cherrypy.config(**{'hooks.on_start_resource': raise500})
-        def err_before_read(self):
-            return 'ok'
-
-        @cherrypy.expose
-        def one_megabyte_of_a(self):
-            return ['a' * 1024] * 1024
-
-        @cherrypy.expose
-        # Turn off the encoding tool so it doens't collapse
-        # our response body and reclaculate the Content-Length.
-        @cherrypy.config(**{'tools.encode.on': False})
-        def custom_cl(self, body, cl):
-            cherrypy.response.headers['Content-Length'] = cl
-            if not isinstance(body, list):
-                body = [body]
-            newbody = []
-            for chunk in body:
-                if isinstance(chunk, str):
-                    chunk = chunk.encode('ISO-8859-1')
-                newbody.append(chunk)
-            return newbody
-
-    cherrypy.tree.mount(Root())
-    cherrypy.config.update({
-        'server.max_request_body_size': 1001,
-        'server.socket_timeout': timeout,
-    })
-
-
-class ConnectionCloseTests(helper.CPWebCase):
-    setup_server = staticmethod(setup_server)
-
-    def test_HTTP11(self):
-        if cherrypy.server.protocol_version != 'HTTP/1.1':
-            return self.skip()
-
-        self.PROTOCOL = 'HTTP/1.1'
-
-        self.persistent = True
-
-        # Make the first request and assert there's no "Connection: close".
-        self.getPage('/')
-        self.assertStatus('200 OK')
-        self.assertBody(pov)
-        self.assertNoHeader('Connection')
-
-        # Make another request on the same connection.
-        self.getPage('/page1')
-        self.assertStatus('200 OK')
-        self.assertBody(pov)
-        self.assertNoHeader('Connection')
-
-        # Test client-side close.
-        self.getPage('/page2', headers=[('Connection', 'close')])
-        self.assertStatus('200 OK')
-        self.assertBody(pov)
-        self.assertHeader('Connection', 'close')
-
-        # Make another request on the same connection, which should error.
-        self.assertRaises(NotConnected, self.getPage, '/')
-
-    def test_Streaming_no_len(self):
-        try:
-            self._streaming(set_cl=False)
-        finally:
-            try:
-                self.HTTP_CONN.close()
-            except (TypeError, AttributeError):
-                pass
-
-    def test_Streaming_with_len(self):
-        try:
-            self._streaming(set_cl=True)
-        finally:
-            try:
-                self.HTTP_CONN.close()
-            except (TypeError, AttributeError):
-                pass
-
-    def _streaming(self, set_cl):
-        if cherrypy.server.protocol_version == 'HTTP/1.1':
-            self.PROTOCOL = 'HTTP/1.1'
-
-            self.persistent = True
-
-            # Make the first request and assert there's no "Connection: close".
-            self.getPage('/')
-            self.assertStatus('200 OK')
-            self.assertBody(pov)
-            self.assertNoHeader('Connection')
-
-            # Make another, streamed request on the same connection.
-            if set_cl:
-                # When a Content-Length is provided, the content should stream
-                # without closing the connection.
-                self.getPage('/stream?set_cl=Yes')
-                self.assertHeader('Content-Length')
-                self.assertNoHeader('Connection', 'close')
-                self.assertNoHeader('Transfer-Encoding')
-
-                self.assertStatus('200 OK')
-                self.assertBody('0123456789')
-            else:
-                # When no Content-Length response header is provided,
-                # streamed output will either close the connection, or use
-                # chunked encoding, to determine transfer-length.
-                self.getPage('/stream')
-                self.assertNoHeader('Content-Length')
-                self.assertStatus('200 OK')
-                self.assertBody('0123456789')
-
-                chunked_response = False
-                for k, v in self.headers:
-                    if k.lower() == 'transfer-encoding':
-                        if str(v) == 'chunked':
-                            chunked_response = True
-
-                if chunked_response:
-                    self.assertNoHeader('Connection', 'close')
-                else:
-                    self.assertHeader('Connection', 'close')
-
-                    # Make another request on the same connection, which should
-                    # error.
-                    self.assertRaises(NotConnected, self.getPage, '/')
-
-                # Try HEAD. See
-                # https://github.com/cherrypy/cherrypy/issues/864.
-                self.getPage('/stream', method='HEAD')
-                self.assertStatus('200 OK')
-                self.assertBody('')
-                self.assertNoHeader('Transfer-Encoding')
-        else:
-            self.PROTOCOL = 'HTTP/1.0'
-
-            self.persistent = True
-
-            # Make the first request and assert Keep-Alive.
-            self.getPage('/', headers=[('Connection', 'Keep-Alive')])
-            self.assertStatus('200 OK')
-            self.assertBody(pov)
-            self.assertHeader('Connection', 'Keep-Alive')
-
-            # Make another, streamed request on the same connection.
-            if set_cl:
-                # When a Content-Length is provided, the content should
-                # stream without closing the connection.
-                self.getPage('/stream?set_cl=Yes',
-                             headers=[('Connection', 'Keep-Alive')])
-                self.assertHeader('Content-Length')
-                self.assertHeader('Connection', 'Keep-Alive')
-                self.assertNoHeader('Transfer-Encoding')
-                self.assertStatus('200 OK')
-                self.assertBody('0123456789')
-            else:
-                # When a Content-Length is not provided,
-                # the server should close the connection.
-                self.getPage('/stream', headers=[('Connection', 'Keep-Alive')])
-                self.assertStatus('200 OK')
-                self.assertBody('0123456789')
-
-                self.assertNoHeader('Content-Length')
-                self.assertNoHeader('Connection', 'Keep-Alive')
-                self.assertNoHeader('Transfer-Encoding')
-
-                # Make another request on the same connection, which should
-                # error.
-                self.assertRaises(NotConnected, self.getPage, '/')
-
-    def test_HTTP10_KeepAlive(self):
-        self.PROTOCOL = 'HTTP/1.0'
-        if self.scheme == 'https':
-            self.HTTP_CONN = HTTPSConnection
-        else:
-            self.HTTP_CONN = HTTPConnection
-
-        # Test a normal HTTP/1.0 request.
-        self.getPage('/page2')
-        self.assertStatus('200 OK')
-        self.assertBody(pov)
-        # Apache, for example, may emit a Connection header even for HTTP/1.0
-        # self.assertNoHeader("Connection")
-
-        # Test a keep-alive HTTP/1.0 request.
-        self.persistent = True
-
-        self.getPage('/page3', headers=[('Connection', 'Keep-Alive')])
-        self.assertStatus('200 OK')
-        self.assertBody(pov)
-        self.assertHeader('Connection', 'Keep-Alive')
-
-        # Remove the keep-alive header again.
-        self.getPage('/page3')
-        self.assertStatus('200 OK')
-        self.assertBody(pov)
-        # Apache, for example, may emit a Connection header even for HTTP/1.0
-        # self.assertNoHeader("Connection")
-
-
-class PipelineTests(helper.CPWebCase):
-    setup_server = staticmethod(setup_server)
-
-    def test_HTTP11_Timeout(self):
-        # If we timeout without sending any data,
-        # the server will close the conn with a 408.
-        if cherrypy.server.protocol_version != 'HTTP/1.1':
-            return self.skip()
-
-        self.PROTOCOL = 'HTTP/1.1'
-
-        # Connect but send nothing.
-        self.persistent = True
-        conn = self.HTTP_CONN
-        conn.auto_open = False
-        conn.connect()
-
-        # Wait for our socket timeout
-        time.sleep(timeout * 2)
-
-        # The request should have returned 408 already.
-        response = conn.response_class(conn.sock, method='GET')
-        response.begin()
-        self.assertEqual(response.status, 408)
-        conn.close()
-
-        # Connect but send half the headers only.
-        self.persistent = True
-        conn = self.HTTP_CONN
-        conn.auto_open = False
-        conn.connect()
-        conn.send(b'GET /hello HTTP/1.1')
-        conn.send(('Host: %s' % self.HOST).encode('ascii'))
-
-        # Wait for our socket timeout
-        time.sleep(timeout * 2)
-
-        # The conn should have already sent 408.
-        response = conn.response_class(conn.sock, method='GET')
-        response.begin()
-        self.assertEqual(response.status, 408)
-        conn.close()
-
-    def test_HTTP11_Timeout_after_request(self):
-        # If we timeout after at least one request has succeeded,
-        # the server will close the conn without 408.
-        if cherrypy.server.protocol_version != 'HTTP/1.1':
-            return self.skip()
-
-        self.PROTOCOL = 'HTTP/1.1'
-
-        # Make an initial request
-        self.persistent = True
-        conn = self.HTTP_CONN
-        conn.putrequest('GET', '/timeout?t=%s' % timeout, skip_host=True)
-        conn.putheader('Host', self.HOST)
-        conn.endheaders()
-        response = conn.response_class(conn.sock, method='GET')
-        response.begin()
-        self.assertEqual(response.status, 200)
-        self.body = response.read()
-        self.assertBody(str(timeout))
-
-        # Make a second request on the same socket
-        conn._output(b'GET /hello HTTP/1.1')
-        conn._output(ntob('Host: %s' % self.HOST, 'ascii'))
-        conn._send_output()
-        response = conn.response_class(conn.sock, method='GET')
-        response.begin()
-        self.assertEqual(response.status, 200)
-        self.body = response.read()
-        self.assertBody('Hello, world!')
-
-        # Wait for our socket timeout
-        time.sleep(timeout * 2)
-
-        # Make another request on the same socket, which should error
-        conn._output(b'GET /hello HTTP/1.1')
-        conn._output(ntob('Host: %s' % self.HOST, 'ascii'))
-        conn._send_output()
-        response = conn.response_class(conn.sock, method='GET')
-        msg = (
-            "Writing to timed out socket didn't fail as it should have: %s")
-        try:
-            response.begin()
-        except Exception:
-            if not isinstance(sys.exc_info()[1],
-                              (socket.error, BadStatusLine)):
-                self.fail(msg % sys.exc_info()[1])
-        else:
-            if response.status != 408:
-                self.fail(msg % response.read())
-
-        conn.close()
-
-        # Make another request on a new socket, which should work
-        self.persistent = True
-        conn = self.HTTP_CONN
-        conn.putrequest('GET', '/', skip_host=True)
-        conn.putheader('Host', self.HOST)
-        conn.endheaders()
-        response = conn.response_class(conn.sock, method='GET')
-        response.begin()
-        self.assertEqual(response.status, 200)
-        self.body = response.read()
-        self.assertBody(pov)
-
-        # Make another request on the same socket,
-        # but timeout on the headers
-        conn.send(b'GET /hello HTTP/1.1')
-        # Wait for our socket timeout
-        time.sleep(timeout * 2)
-        response = conn.response_class(conn.sock, method='GET')
-        try:
-            response.begin()
-        except Exception:
-            if not isinstance(sys.exc_info()[1],
-                              (socket.error, BadStatusLine)):
-                self.fail(msg % sys.exc_info()[1])
-        else:
-            if response.status != 408:
-                self.fail(msg % response.read())
-
-        conn.close()
-
-        # Retry the request on a new connection, which should work
-        self.persistent = True
-        conn = self.HTTP_CONN
-        conn.putrequest('GET', '/', skip_host=True)
-        conn.putheader('Host', self.HOST)
-        conn.endheaders()
-        response = conn.response_class(conn.sock, method='GET')
-        response.begin()
-        self.assertEqual(response.status, 200)
-        self.body = response.read()
-        self.assertBody(pov)
-        conn.close()
-
-    def test_HTTP11_pipelining(self):
-        if cherrypy.server.protocol_version != 'HTTP/1.1':
-            return self.skip()
-
-        self.PROTOCOL = 'HTTP/1.1'
-
-        # Test pipelining. httplib doesn't support this directly.
-        self.persistent = True
-        conn = self.HTTP_CONN
-
-        # Put request 1
-        conn.putrequest('GET', '/hello', skip_host=True)
-        conn.putheader('Host', self.HOST)
-        conn.endheaders()
-
-        for trial in range(5):
-            # Put next request
-            conn._output(b'GET /hello HTTP/1.1')
-            conn._output(ntob('Host: %s' % self.HOST, 'ascii'))
-            conn._send_output()
-
-            # Retrieve previous response
-            response = conn.response_class(conn.sock, method='GET')
-            # there is a bug in python3 regarding the buffering of
-            # ``conn.sock``. Until that bug get's fixed we will
-            # monkey patch the ``response`` instance.
-            # https://bugs.python.org/issue23377
-            response.fp = conn.sock.makefile('rb', 0)
-            response.begin()
-            body = response.read(13)
-            self.assertEqual(response.status, 200)
-            self.assertEqual(body, b'Hello, world!')
-
-        # Retrieve final response
-        response = conn.response_class(conn.sock, method='GET')
-        response.begin()
-        body = response.read()
-        self.assertEqual(response.status, 200)
-        self.assertEqual(body, b'Hello, world!')
-
-        conn.close()
-
-    def test_100_Continue(self):
-        if cherrypy.server.protocol_version != 'HTTP/1.1':
-            return self.skip()
-
-        self.PROTOCOL = 'HTTP/1.1'
-
-        self.persistent = True
-        conn = self.HTTP_CONN
-
-        # Try a page without an Expect request header first.
-        # Note that httplib's response.begin automatically ignores
-        # 100 Continue responses, so we must manually check for it.
-        try:
-            conn.putrequest('POST', '/upload', skip_host=True)
-            conn.putheader('Host', self.HOST)
-            conn.putheader('Content-Type', 'text/plain')
-            conn.putheader('Content-Length', '4')
-            conn.endheaders()
-            conn.send(ntob("d'oh"))
-            response = conn.response_class(conn.sock, method='POST')
-            version, status, reason = response._read_status()
-            self.assertNotEqual(status, 100)
-        finally:
-            conn.close()
-
-        # Now try a page with an Expect header...
-        try:
-            conn.connect()
-            conn.putrequest('POST', '/upload', skip_host=True)
-            conn.putheader('Host', self.HOST)
-            conn.putheader('Content-Type', 'text/plain')
-            conn.putheader('Content-Length', '17')
-            conn.putheader('Expect', '100-continue')
-            conn.endheaders()
-            response = conn.response_class(conn.sock, method='POST')
-
-            # ...assert and then skip the 100 response
-            version, status, reason = response._read_status()
-            self.assertEqual(status, 100)
-            while True:
-                line = response.fp.readline().strip()
-                if line:
-                    self.fail(
-                        '100 Continue should not output any headers. Got %r' %
-                        line)
-                else:
-                    break
-
-            # ...send the body
-            body = b'I am a small file'
-            conn.send(body)
-
-            # ...get the final response
-            response.begin()
-            self.status, self.headers, self.body = webtest.shb(response)
-            self.assertStatus(200)
-            self.assertBody("thanks for '%s'" % body)
-        finally:
-            conn.close()
-
-
-class ConnectionTests(helper.CPWebCase):
-    setup_server = staticmethod(setup_server)
-
-    def test_readall_or_close(self):
-        if cherrypy.server.protocol_version != 'HTTP/1.1':
-            return self.skip()
-
-        self.PROTOCOL = 'HTTP/1.1'
-
-        if self.scheme == 'https':
-            self.HTTP_CONN = HTTPSConnection
-        else:
-            self.HTTP_CONN = HTTPConnection
-
-        # Test a max of 0 (the default) and then reset to what it was above.
-        old_max = cherrypy.server.max_request_body_size
-        for new_max in (0, old_max):
-            cherrypy.server.max_request_body_size = new_max
-
-            self.persistent = True
-            conn = self.HTTP_CONN
-
-            # Get a POST page with an error
-            conn.putrequest('POST', '/err_before_read', skip_host=True)
-            conn.putheader('Host', self.HOST)
-            conn.putheader('Content-Type', 'text/plain')
-            conn.putheader('Content-Length', '1000')
-            conn.putheader('Expect', '100-continue')
-            conn.endheaders()
-            response = conn.response_class(conn.sock, method='POST')
-
-            # ...assert and then skip the 100 response
-            version, status, reason = response._read_status()
-            self.assertEqual(status, 100)
-            while True:
-                skip = response.fp.readline().strip()
-                if not skip:
-                    break
-
-            # ...send the body
-            conn.send(ntob('x' * 1000))
-
-            # ...get the final response
-            response.begin()
-            self.status, self.headers, self.body = webtest.shb(response)
-            self.assertStatus(500)
-
-            # Now try a working page with an Expect header...
-            conn._output(b'POST /upload HTTP/1.1')
-            conn._output(ntob('Host: %s' % self.HOST, 'ascii'))
-            conn._output(b'Content-Type: text/plain')
-            conn._output(b'Content-Length: 17')
-            conn._output(b'Expect: 100-continue')
-            conn._send_output()
-            response = conn.response_class(conn.sock, method='POST')
-
-            # ...assert and then skip the 100 response
-            version, status, reason = response._read_status()
-            self.assertEqual(status, 100)
-            while True:
-                skip = response.fp.readline().strip()
-                if not skip:
-                    break
-
-            # ...send the body
-            body = b'I am a small file'
-            conn.send(body)
-
-            # ...get the final response
-            response.begin()
-            self.status, self.headers, self.body = webtest.shb(response)
-            self.assertStatus(200)
-            self.assertBody("thanks for '%s'" % body)
-            conn.close()
-
-    def test_No_Message_Body(self):
-        if cherrypy.server.protocol_version != 'HTTP/1.1':
-            return self.skip()
-
-        self.PROTOCOL = 'HTTP/1.1'
-
-        # Set our HTTP_CONN to an instance so it persists between requests.
-        self.persistent = True
-
-        # Make the first request and assert there's no "Connection: close".
-        self.getPage('/')
-        self.assertStatus('200 OK')
-        self.assertBody(pov)
-        self.assertNoHeader('Connection')
-
-        # Make a 204 request on the same connection.
-        self.getPage('/custom/204')
-        self.assertStatus(204)
-        self.assertNoHeader('Content-Length')
-        self.assertBody('')
-        self.assertNoHeader('Connection')
-
-        # Make a 304 request on the same connection.
-        self.getPage('/custom/304')
-        self.assertStatus(304)
-        self.assertNoHeader('Content-Length')
-        self.assertBody('')
-        self.assertNoHeader('Connection')
-
-    def test_Chunked_Encoding(self):
-        if cherrypy.server.protocol_version != 'HTTP/1.1':
-            return self.skip()
-
-        if (hasattr(self, 'harness') and
-                'modpython' in self.harness.__class__.__name__.lower()):
-            # mod_python forbids chunked encoding
-            return self.skip()
-
-        self.PROTOCOL = 'HTTP/1.1'
-
-        # Set our HTTP_CONN to an instance so it persists between requests.
-        self.persistent = True
-        conn = self.HTTP_CONN
-
-        # Try a normal chunked request (with extensions)
-        body = ntob('8;key=value\r\nxx\r\nxxxx\r\n5\r\nyyyyy\r\n0\r\n'
-                    'Content-Type: application/json\r\n'
-                    '\r\n')
-        conn.putrequest('POST', '/upload', skip_host=True)
-        conn.putheader('Host', self.HOST)
-        conn.putheader('Transfer-Encoding', 'chunked')
-        conn.putheader('Trailer', 'Content-Type')
-        # Note that this is somewhat malformed:
-        # we shouldn't be sending Content-Length.
-        # RFC 2616 says the server should ignore it.
-        conn.putheader('Content-Length', '3')
-        conn.endheaders()
-        conn.send(body)
-        response = conn.getresponse()
-        self.status, self.headers, self.body = webtest.shb(response)
-        self.assertStatus('200 OK')
-        self.assertBody("thanks for '%s'" % b'xx\r\nxxxxyyyyy')
-
-        # Try a chunked request that exceeds server.max_request_body_size.
-        # Note that the delimiters and trailer are included.
-        body = ntob('3e3\r\n' + ('x' * 995) + '\r\n0\r\n\r\n')
-        conn.putrequest('POST', '/upload', skip_host=True)
-        conn.putheader('Host', self.HOST)
-        conn.putheader('Transfer-Encoding', 'chunked')
-        conn.putheader('Content-Type', 'text/plain')
-        # Chunked requests don't need a content-length
-        # #        conn.putheader("Content-Length", len(body))
-        conn.endheaders()
-        conn.send(body)
-        response = conn.getresponse()
-        self.status, self.headers, self.body = webtest.shb(response)
-        self.assertStatus(413)
-        conn.close()
-
-    def test_Content_Length_in(self):
-        # Try a non-chunked request where Content-Length exceeds
-        # server.max_request_body_size. Assert error before body send.
-        self.persistent = True
-        conn = self.HTTP_CONN
-        conn.putrequest('POST', '/upload', skip_host=True)
-        conn.putheader('Host', self.HOST)
-        conn.putheader('Content-Type', 'text/plain')
-        conn.putheader('Content-Length', '9999')
-        conn.endheaders()
-        response = conn.getresponse()
-        self.status, self.headers, self.body = webtest.shb(response)
-        self.assertStatus(413)
-        self.assertBody('The entity sent with the request exceeds '
-                        'the maximum allowed bytes.')
-        conn.close()
-
-    def test_Content_Length_out_preheaders(self):
-        # Try a non-chunked response where Content-Length is less than
-        # the actual bytes in the response body.
-        self.persistent = True
-        conn = self.HTTP_CONN
-        conn.putrequest('GET', '/custom_cl?body=I+have+too+many+bytes&cl=5',
-                        skip_host=True)
-        conn.putheader('Host', self.HOST)
-        conn.endheaders()
-        response = conn.getresponse()
-        self.status, self.headers, self.body = webtest.shb(response)
-        self.assertStatus(500)
-        self.assertBody(
-            'The requested resource returned more bytes than the '
-            'declared Content-Length.')
-        conn.close()
-
-    def test_Content_Length_out_postheaders(self):
-        # Try a non-chunked response where Content-Length is less than
-        # the actual bytes in the response body.
-        self.persistent = True
-        conn = self.HTTP_CONN
-        conn.putrequest(
-            'GET', '/custom_cl?body=I+too&body=+have+too+many&cl=5',
-            skip_host=True)
-        conn.putheader('Host', self.HOST)
-        conn.endheaders()
-        response = conn.getresponse()
-        self.status, self.headers, self.body = webtest.shb(response)
-        self.assertStatus(200)
-        self.assertBody('I too')
-        conn.close()
-
-    def test_598(self):
-        tmpl = '{scheme}://{host}:{port}/one_megabyte_of_a/'
-        url = tmpl.format(
-            scheme=self.scheme,
-            host=self.HOST,
-            port=self.PORT,
-        )
-        remote_data_conn = urllib.request.urlopen(url)
-        buf = remote_data_conn.read(512)
-        time.sleep(timeout * 0.6)
-        remaining = (1024 * 1024) - 512
-        while remaining:
-            data = remote_data_conn.read(remaining)
-            if not data:
-                break
-            else:
-                buf += data
-            remaining -= len(data)
-
-        self.assertEqual(len(buf), 1024 * 1024)
-        self.assertEqual(buf, ntob('a' * 1024 * 1024))
-        self.assertEqual(remaining, 0)
-        remote_data_conn.close()
-
-
-def setup_upload_server():
-
-    class Root:
-        @cherrypy.expose
-        def upload(self):
-            if not cherrypy.request.method == 'POST':
-                raise AssertionError("'POST' != request.method %r" %
-                                     cherrypy.request.method)
-            return "thanks for '%s'" % tonative(cherrypy.request.body.read())
-
-    cherrypy.tree.mount(Root())
-    cherrypy.config.update({
-        'server.max_request_body_size': 1001,
-        'server.socket_timeout': 10,
-        'server.accepted_queue_size': 5,
-        'server.accepted_queue_timeout': 0.1,
-    })
-
-
-reset_names = 'ECONNRESET', 'WSAECONNRESET'
-socket_reset_errors = [
-    getattr(errno, name)
-    for name in reset_names
-    if hasattr(errno, name)
-]
-'reset error numbers available on this platform'
-
-socket_reset_errors += [
-    # Python 3.5 raises an http.client.RemoteDisconnected
-    # with this message
-    'Remote end closed connection without response',
-]
-
-
-class LimitedRequestQueueTests(helper.CPWebCase):
-    setup_server = staticmethod(setup_upload_server)
-
-    def test_queue_full(self):
-        conns = []
-        overflow_conn = None
-
-        try:
-            # Make 15 initial requests and leave them open, which should use
-            # all of wsgiserver's WorkerThreads and fill its Queue.
-            for i in range(15):
-                conn = self.HTTP_CONN(self.HOST, self.PORT)
-                conn.putrequest('POST', '/upload', skip_host=True)
-                conn.putheader('Host', self.HOST)
-                conn.putheader('Content-Type', 'text/plain')
-                conn.putheader('Content-Length', '4')
-                conn.endheaders()
-                conns.append(conn)
-
-            # Now try a 16th conn, which should be closed by the
-            # server immediately.
-            overflow_conn = self.HTTP_CONN(self.HOST, self.PORT)
-            # Manually connect since httplib won't let us set a timeout
-            for res in socket.getaddrinfo(self.HOST, self.PORT, 0,
-                                          socket.SOCK_STREAM):
-                af, socktype, proto, canonname, sa = res
-                overflow_conn.sock = socket.socket(af, socktype, proto)
-                overflow_conn.sock.settimeout(5)
-                overflow_conn.sock.connect(sa)
-                break
-
-            overflow_conn.putrequest('GET', '/', skip_host=True)
-            overflow_conn.putheader('Host', self.HOST)
-            overflow_conn.endheaders()
-            response = overflow_conn.response_class(
-                overflow_conn.sock,
-                method='GET',
-            )
-            try:
-                response.begin()
-            except socket.error as exc:
-                if exc.args[0] in socket_reset_errors:
-                    pass  # Expected.
-                else:
-                    tmpl = (
-                        'Overflow conn did not get RST. '
-                        'Got {exc.args!r} instead'
-                    )
-                    raise AssertionError(tmpl.format(**locals()))
-            except BadStatusLine:
-                # This is a special case in OS X. Linux and Windows will
-                # RST correctly.
-                assert sys.platform == 'darwin'
-            else:
-                raise AssertionError('Overflow conn did not get RST ')
-        finally:
-            for conn in conns:
-                conn.send(b'done')
-                response = conn.response_class(conn.sock, method='POST')
-                response.begin()
-                self.body = response.read()
-                self.assertBody("thanks for 'done'")
-                self.assertEqual(response.status, 200)
-                conn.close()
-            if overflow_conn:
-                overflow_conn.close()
-
-
-class BadRequestTests(helper.CPWebCase):
-    setup_server = staticmethod(setup_server)
-
-    def test_No_CRLF(self):
-        self.persistent = True
-
-        conn = self.HTTP_CONN
-        conn.send(b'GET /hello HTTP/1.1\n\n')
-        response = conn.response_class(conn.sock, method='GET')
-        response.begin()
-        self.body = response.read()
-        self.assertBody('HTTP requires CRLF terminators')
-        conn.close()
-
-        conn.connect()
-        conn.send(b'GET /hello HTTP/1.1\r\n\n')
-        response = conn.response_class(conn.sock, method='GET')
-        response.begin()
-        self.body = response.read()
-        self.assertBody('HTTP requires CRLF terminators')
-        conn.close()
diff --git a/lib/cherrypy/test/test_core.py b/lib/cherrypy/test/test_core.py
deleted file mode 100644
index 1753957a..00000000
--- a/lib/cherrypy/test/test_core.py
+++ /dev/null
@@ -1,823 +0,0 @@
-# coding: utf-8
-"""Basic tests for the CherryPy core: request handling."""
-
-import os
-import sys
-import types
-
-import cherrypy
-from cherrypy._cpcompat import ntou
-from cherrypy import _cptools, tools
-from cherrypy.lib import httputil, static
-
-from cherrypy.test._test_decorators import ExposeExamples
-from cherrypy.test import helper
-
-
-localDir = os.path.dirname(__file__)
-favicon_path = os.path.join(os.getcwd(), localDir, '../favicon.ico')
-
-#                             Client-side code                             #
-
-
-class CoreRequestHandlingTest(helper.CPWebCase):
-
-    @staticmethod
-    def setup_server():
-        class Root:
-
-            @cherrypy.expose
-            def index(self):
-                return 'hello'
-
-            favicon_ico = tools.staticfile.handler(filename=favicon_path)
-
-            @cherrypy.expose
-            def defct(self, newct):
-                newct = 'text/%s' % newct
-                cherrypy.config.update({'tools.response_headers.on': True,
-                                        'tools.response_headers.headers':
-                                        [('Content-Type', newct)]})
-
-            @cherrypy.expose
-            def baseurl(self, path_info, relative=None):
-                return cherrypy.url(path_info, relative=bool(relative))
-
-        root = Root()
-        root.expose_dec = ExposeExamples()
-
-        class TestType(type):
-            """Metaclass which automatically exposes all functions in each
-            subclass, and adds an instance of the subclass as an attribute
-            of root.
-            """
-            def __init__(cls, name, bases, dct):
-                type.__init__(cls, name, bases, dct)
-                for value in dct.values():
-                    if isinstance(value, types.FunctionType):
-                        value.exposed = True
-                setattr(root, name.lower(), cls())
-        Test = TestType('Test', (object, ), {})
-
-        @cherrypy.config(**{'tools.trailing_slash.on': False})
-        class URL(Test):
-
-            def index(self, path_info, relative=None):
-                if relative != 'server':
-                    relative = bool(relative)
-                return cherrypy.url(path_info, relative=relative)
-
-            def leaf(self, path_info, relative=None):
-                if relative != 'server':
-                    relative = bool(relative)
-                return cherrypy.url(path_info, relative=relative)
-
-            def qs(self, qs):
-                return cherrypy.url(qs=qs)
-
-        def log_status():
-            Status.statuses.append(cherrypy.response.status)
-        cherrypy.tools.log_status = cherrypy.Tool(
-            'on_end_resource', log_status)
-
-        class Status(Test):
-
-            def index(self):
-                return 'normal'
-
-            def blank(self):
-                cherrypy.response.status = ''
-
-            # According to RFC 2616, new status codes are OK as long as they
-            # are between 100 and 599.
-
-            # Here is an illegal code...
-            def illegal(self):
-                cherrypy.response.status = 781
-                return 'oops'
-
-            # ...and here is an unknown but legal code.
-            def unknown(self):
-                cherrypy.response.status = '431 My custom error'
-                return 'funky'
-
-            # Non-numeric code
-            def bad(self):
-                cherrypy.response.status = 'error'
-                return 'bad news'
-
-            statuses = []
-
-            @cherrypy.config(**{'tools.log_status.on': True})
-            def on_end_resource_stage(self):
-                return repr(self.statuses)
-
-        class Redirect(Test):
-
-            @cherrypy.config(**{
-                'tools.err_redirect.on': True,
-                'tools.err_redirect.url': '/errpage',
-                'tools.err_redirect.internal': False,
-            })
-            class Error:
-                @cherrypy.expose
-                def index(self):
-                    raise NameError('redirect_test')
-
-            error = Error()
-
-            def index(self):
-                return 'child'
-
-            def custom(self, url, code):
-                raise cherrypy.HTTPRedirect(url, code)
-
-            @cherrypy.config(**{'tools.trailing_slash.extra': True})
-            def by_code(self, code):
-                raise cherrypy.HTTPRedirect('somewhere%20else', code)
-
-            def nomodify(self):
-                raise cherrypy.HTTPRedirect('', 304)
-
-            def proxy(self):
-                raise cherrypy.HTTPRedirect('proxy', 305)
-
-            def stringify(self):
-                return str(cherrypy.HTTPRedirect('/'))
-
-            def fragment(self, frag):
-                raise cherrypy.HTTPRedirect('/some/url#%s' % frag)
-
-            def url_with_quote(self):
-                raise cherrypy.HTTPRedirect("/some\"url/that'we/want")
-
-            def url_with_xss(self):
-                raise cherrypy.HTTPRedirect(
-                    "/some<script>alert(1);</script>url/that'we/want")
-
-            def url_with_unicode(self):
-                raise cherrypy.HTTPRedirect(ntou('те�т', 'utf-8'))
-
-        def login_redir():
-            if not getattr(cherrypy.request, 'login', None):
-                raise cherrypy.InternalRedirect('/internalredirect/login')
-        tools.login_redir = _cptools.Tool('before_handler', login_redir)
-
-        def redir_custom():
-            raise cherrypy.InternalRedirect('/internalredirect/custom_err')
-
-        class InternalRedirect(Test):
-
-            def index(self):
-                raise cherrypy.InternalRedirect('/')
-
-            @cherrypy.expose
-            @cherrypy.config(**{'hooks.before_error_response': redir_custom})
-            def choke(self):
-                return 3 / 0
-
-            def relative(self, a, b):
-                raise cherrypy.InternalRedirect('cousin?t=6')
-
-            def cousin(self, t):
-                assert cherrypy.request.prev.closed
-                return cherrypy.request.prev.query_string
-
-            def petshop(self, user_id):
-                if user_id == 'parrot':
-                    # Trade it for a slug when redirecting
-                    raise cherrypy.InternalRedirect(
-                        '/image/getImagesByUser?user_id=slug')
-                elif user_id == 'terrier':
-                    # Trade it for a fish when redirecting
-                    raise cherrypy.InternalRedirect(
-                        '/image/getImagesByUser?user_id=fish')
-                else:
-                    # This should pass the user_id through to getImagesByUser
-                    raise cherrypy.InternalRedirect(
-                        '/image/getImagesByUser?user_id=%s' % str(user_id))
-
-            # We support Python 2.3, but the @-deco syntax would look like
-            # this:
-            # @tools.login_redir()
-            def secure(self):
-                return 'Welcome!'
-            secure = tools.login_redir()(secure)
-            # Since calling the tool returns the same function you pass in,
-            # you could skip binding the return value, and just write:
-            # tools.login_redir()(secure)
-
-            def login(self):
-                return 'Please log in'
-
-            def custom_err(self):
-                return 'Something went horribly wrong.'
-
-            @cherrypy.config(**{'hooks.before_request_body': redir_custom})
-            def early_ir(self, arg):
-                return 'whatever'
-
-        class Image(Test):
-
-            def getImagesByUser(self, user_id):
-                return '0 images for %s' % user_id
-
-        class Flatten(Test):
-
-            def as_string(self):
-                return 'content'
-
-            def as_list(self):
-                return ['con', 'tent']
-
-            def as_yield(self):
-                yield b'content'
-
-            @cherrypy.config(**{'tools.flatten.on': True})
-            def as_dblyield(self):
-                yield self.as_yield()
-
-            def as_refyield(self):
-                for chunk in self.as_yield():
-                    yield chunk
-
-        class Ranges(Test):
-
-            def get_ranges(self, bytes):
-                return repr(httputil.get_ranges('bytes=%s' % bytes, 8))
-
-            def slice_file(self):
-                path = os.path.join(os.getcwd(), os.path.dirname(__file__))
-                return static.serve_file(
-                    os.path.join(path, 'static/index.html'))
-
-        class Cookies(Test):
-
-            def single(self, name):
-                cookie = cherrypy.request.cookie[name]
-                # Python2's SimpleCookie.__setitem__ won't take unicode keys.
-                cherrypy.response.cookie[str(name)] = cookie.value
-
-            def multiple(self, names):
-                list(map(self.single, names))
-
-        def append_headers(header_list, debug=False):
-            if debug:
-                cherrypy.log(
-                    'Extending response headers with %s' % repr(header_list),
-                    'TOOLS.APPEND_HEADERS')
-            cherrypy.serving.response.header_list.extend(header_list)
-        cherrypy.tools.append_headers = cherrypy.Tool(
-            'on_end_resource', append_headers)
-
-        class MultiHeader(Test):
-
-            def header_list(self):
-                pass
-            header_list = cherrypy.tools.append_headers(header_list=[
-                (b'WWW-Authenticate', b'Negotiate'),
-                (b'WWW-Authenticate', b'Basic realm="foo"'),
-            ])(header_list)
-
-            def commas(self):
-                cherrypy.response.headers[
-                    'WWW-Authenticate'] = 'Negotiate,Basic realm="foo"'
-
-        cherrypy.tree.mount(root)
-
-    def testStatus(self):
-        self.getPage('/status/')
-        self.assertBody('normal')
-        self.assertStatus(200)
-
-        self.getPage('/status/blank')
-        self.assertBody('')
-        self.assertStatus(200)
-
-        self.getPage('/status/illegal')
-        self.assertStatus(500)
-        msg = 'Illegal response status from server (781 is out of range).'
-        self.assertErrorPage(500, msg)
-
-        if not getattr(cherrypy.server, 'using_apache', False):
-            self.getPage('/status/unknown')
-            self.assertBody('funky')
-            self.assertStatus(431)
-
-        self.getPage('/status/bad')
-        self.assertStatus(500)
-        msg = "Illegal response status from server ('error' is non-numeric)."
-        self.assertErrorPage(500, msg)
-
-    def test_on_end_resource_status(self):
-        self.getPage('/status/on_end_resource_stage')
-        self.assertBody('[]')
-        self.getPage('/status/on_end_resource_stage')
-        self.assertBody(repr(['200 OK']))
-
-    def testSlashes(self):
-        # Test that requests for index methods without a trailing slash
-        # get redirected to the same URI path with a trailing slash.
-        # Make sure GET params are preserved.
-        self.getPage('/redirect?id=3')
-        self.assertStatus(301)
-        self.assertMatchesBody(
-            '<a href=([\'"])%s/redirect/[?]id=3\\1>'
-            '%s/redirect/[?]id=3</a>' % (self.base(), self.base())
-        )
-
-        if self.prefix():
-            # Corner case: the "trailing slash" redirect could be tricky if
-            # we're using a virtual root and the URI is "/vroot" (no slash).
-            self.getPage('')
-            self.assertStatus(301)
-            self.assertMatchesBody("<a href=(['\"])%s/\\1>%s/</a>" %
-                                   (self.base(), self.base()))
-
-        # Test that requests for NON-index methods WITH a trailing slash
-        # get redirected to the same URI path WITHOUT a trailing slash.
-        # Make sure GET params are preserved.
-        self.getPage('/redirect/by_code/?code=307')
-        self.assertStatus(301)
-        self.assertMatchesBody(
-            "<a href=(['\"])%s/redirect/by_code[?]code=307\\1>"
-            '%s/redirect/by_code[?]code=307</a>'
-            % (self.base(), self.base())
-        )
-
-        # If the trailing_slash tool is off, CP should just continue
-        # as if the slashes were correct. But it needs some help
-        # inside cherrypy.url to form correct output.
-        self.getPage('/url?path_info=page1')
-        self.assertBody('%s/url/page1' % self.base())
-        self.getPage('/url/leaf/?path_info=page1')
-        self.assertBody('%s/url/page1' % self.base())
-
-    def testRedirect(self):
-        self.getPage('/redirect/')
-        self.assertBody('child')
-        self.assertStatus(200)
-
-        self.getPage('/redirect/by_code?code=300')
-        self.assertMatchesBody(
-            r"<a href=(['\"])(.*)somewhere%20else\1>\2somewhere%20else</a>")
-        self.assertStatus(300)
-
-        self.getPage('/redirect/by_code?code=301')
-        self.assertMatchesBody(
-            r"<a href=(['\"])(.*)somewhere%20else\1>\2somewhere%20else</a>")
-        self.assertStatus(301)
-
-        self.getPage('/redirect/by_code?code=302')
-        self.assertMatchesBody(
-            r"<a href=(['\"])(.*)somewhere%20else\1>\2somewhere%20else</a>")
-        self.assertStatus(302)
-
-        self.getPage('/redirect/by_code?code=303')
-        self.assertMatchesBody(
-            r"<a href=(['\"])(.*)somewhere%20else\1>\2somewhere%20else</a>")
-        self.assertStatus(303)
-
-        self.getPage('/redirect/by_code?code=307')
-        self.assertMatchesBody(
-            r"<a href=(['\"])(.*)somewhere%20else\1>\2somewhere%20else</a>")
-        self.assertStatus(307)
-
-        self.getPage('/redirect/by_code?code=308')
-        self.assertMatchesBody(
-            r"<a href=(['\"])(.*)somewhere%20else\1>\2somewhere%20else</a>")
-        self.assertStatus(308)
-
-        self.getPage('/redirect/nomodify')
-        self.assertBody('')
-        self.assertStatus(304)
-
-        self.getPage('/redirect/proxy')
-        self.assertBody('')
-        self.assertStatus(305)
-
-        # HTTPRedirect on error
-        self.getPage('/redirect/error/')
-        self.assertStatus(('302 Found', '303 See Other'))
-        self.assertInBody('/errpage')
-
-        # Make sure str(HTTPRedirect()) works.
-        self.getPage('/redirect/stringify', protocol='HTTP/1.0')
-        self.assertStatus(200)
-        self.assertBody("(['%s/'], 302)" % self.base())
-        if cherrypy.server.protocol_version == 'HTTP/1.1':
-            self.getPage('/redirect/stringify', protocol='HTTP/1.1')
-            self.assertStatus(200)
-            self.assertBody("(['%s/'], 303)" % self.base())
-
-        # check that #fragments are handled properly
-        # http://skrb.org/ietf/http_errata.html#location-fragments
-        frag = 'foo'
-        self.getPage('/redirect/fragment/%s' % frag)
-        self.assertMatchesBody(
-            r"<a href=(['\"])(.*)\/some\/url\#%s\1>\2\/some\/url\#%s</a>" % (
-                frag, frag))
-        loc = self.assertHeader('Location')
-        assert loc.endswith('#%s' % frag)
-        self.assertStatus(('302 Found', '303 See Other'))
-
-        # check injection protection
-        # See https://github.com/cherrypy/cherrypy/issues/1003
-        self.getPage(
-            '/redirect/custom?'
-            'code=303&url=/foobar/%0d%0aSet-Cookie:%20somecookie=someval')
-        self.assertStatus(303)
-        loc = self.assertHeader('Location')
-        assert 'Set-Cookie' in loc
-        self.assertNoHeader('Set-Cookie')
-
-        def assertValidXHTML():
-            from xml.etree import ElementTree
-            try:
-                ElementTree.fromstring(
-                    '<html><body>%s</body></html>' % self.body,
-                )
-            except ElementTree.ParseError:
-                self._handlewebError(
-                    'automatically generated redirect did not '
-                    'generate well-formed html',
-                )
-
-        # check redirects to URLs generated valid HTML - we check this
-        # by seeing if it appears as valid XHTML.
-        self.getPage('/redirect/by_code?code=303')
-        self.assertStatus(303)
-        assertValidXHTML()
-
-        # do the same with a url containing quote characters.
-        self.getPage('/redirect/url_with_quote')
-        self.assertStatus(303)
-        assertValidXHTML()
-
-    def test_redirect_with_xss(self):
-        """A redirect to a URL with HTML injected should result
-        in page contents escaped."""
-        self.getPage('/redirect/url_with_xss')
-        self.assertStatus(303)
-        assert b'<script>' not in self.body
-        assert b'&lt;script&gt;' in self.body
-
-    def test_redirect_with_unicode(self):
-        """
-        A redirect to a URL with Unicode should return a Location
-        header containing that Unicode URL.
-        """
-        # test disabled due to #1440
-        return
-        self.getPage('/redirect/url_with_unicode')
-        self.assertStatus(303)
-        loc = self.assertHeader('Location')
-        assert ntou('те�т', encoding='utf-8') in loc
-
-    def test_InternalRedirect(self):
-        # InternalRedirect
-        self.getPage('/internalredirect/')
-        self.assertBody('hello')
-        self.assertStatus(200)
-
-        # Test passthrough
-        self.getPage(
-            '/internalredirect/petshop?user_id=Sir-not-appearing-in-this-film')
-        self.assertBody('0 images for Sir-not-appearing-in-this-film')
-        self.assertStatus(200)
-
-        # Test args
-        self.getPage('/internalredirect/petshop?user_id=parrot')
-        self.assertBody('0 images for slug')
-        self.assertStatus(200)
-
-        # Test POST
-        self.getPage('/internalredirect/petshop', method='POST',
-                     body='user_id=terrier')
-        self.assertBody('0 images for fish')
-        self.assertStatus(200)
-
-        # Test ir before body read
-        self.getPage('/internalredirect/early_ir', method='POST',
-                     body='arg=aha!')
-        self.assertBody('Something went horribly wrong.')
-        self.assertStatus(200)
-
-        self.getPage('/internalredirect/secure')
-        self.assertBody('Please log in')
-        self.assertStatus(200)
-
-        # Relative path in InternalRedirect.
-        # Also tests request.prev.
-        self.getPage('/internalredirect/relative?a=3&b=5')
-        self.assertBody('a=3&b=5')
-        self.assertStatus(200)
-
-        # InternalRedirect on error
-        self.getPage('/internalredirect/choke')
-        self.assertStatus(200)
-        self.assertBody('Something went horribly wrong.')
-
-    def testFlatten(self):
-        for url in ['/flatten/as_string', '/flatten/as_list',
-                    '/flatten/as_yield', '/flatten/as_dblyield',
-                    '/flatten/as_refyield']:
-            self.getPage(url)
-            self.assertBody('content')
-
-    def testRanges(self):
-        self.getPage('/ranges/get_ranges?bytes=3-6')
-        self.assertBody('[(3, 7)]')
-
-        # Test multiple ranges and a suffix-byte-range-spec, for good measure.
-        self.getPage('/ranges/get_ranges?bytes=2-4,-1')
-        self.assertBody('[(2, 5), (7, 8)]')
-
-        # Test a suffix-byte-range longer than the content
-        # length. Note that in this test, the content length
-        # is 8 bytes.
-        self.getPage('/ranges/get_ranges?bytes=-100')
-        self.assertBody('[(0, 8)]')
-
-        # Get a partial file.
-        if cherrypy.server.protocol_version == 'HTTP/1.1':
-            self.getPage('/ranges/slice_file', [('Range', 'bytes=2-5')])
-            self.assertStatus(206)
-            self.assertHeader('Content-Type', 'text/html;charset=utf-8')
-            self.assertHeader('Content-Range', 'bytes 2-5/14')
-            self.assertBody('llo,')
-
-            # What happens with overlapping ranges (and out of order, too)?
-            self.getPage('/ranges/slice_file', [('Range', 'bytes=4-6,2-5')])
-            self.assertStatus(206)
-            ct = self.assertHeader('Content-Type')
-            expected_type = 'multipart/byteranges; boundary='
-            assert ct.startswith(expected_type)
-            boundary = ct[len(expected_type):]
-            expected_body = ('\r\n--%s\r\n'
-                             'Content-type: text/html\r\n'
-                             'Content-range: bytes 4-6/14\r\n'
-                             '\r\n'
-                             'o, \r\n'
-                             '--%s\r\n'
-                             'Content-type: text/html\r\n'
-                             'Content-range: bytes 2-5/14\r\n'
-                             '\r\n'
-                             'llo,\r\n'
-                             '--%s--\r\n' % (boundary, boundary, boundary))
-            self.assertBody(expected_body)
-            self.assertHeader('Content-Length')
-
-            # Test "416 Requested Range Not Satisfiable"
-            self.getPage('/ranges/slice_file', [('Range', 'bytes=2300-2900')])
-            self.assertStatus(416)
-            # "When this status code is returned for a byte-range request,
-            # the response SHOULD include a Content-Range entity-header
-            # field specifying the current length of the selected resource"
-            self.assertHeader('Content-Range', 'bytes */14')
-        elif cherrypy.server.protocol_version == 'HTTP/1.0':
-            # Test Range behavior with HTTP/1.0 request
-            self.getPage('/ranges/slice_file', [('Range', 'bytes=2-5')])
-            self.assertStatus(200)
-            self.assertBody('Hello, world\r\n')
-
-    def testFavicon(self):
-        # favicon.ico is served by staticfile.
-        icofilename = os.path.join(localDir, '../favicon.ico')
-        with open(icofilename, 'rb') as icofile:
-            data = icofile.read()
-
-        self.getPage('/favicon.ico')
-        self.assertBody(data)
-
-    def skip_if_bad_cookies(self):
-        """
-        cookies module fails to reject invalid cookies
-        https://github.com/cherrypy/cherrypy/issues/1405
-        """
-        cookies = sys.modules.get('http.cookies')
-        _is_legal_key = getattr(cookies, '_is_legal_key', lambda x: False)
-        if not _is_legal_key(','):
-            return
-        issue = 'http://bugs.python.org/issue26302'
-        tmpl = 'Broken cookies module ({issue})'
-        self.skip(tmpl.format(**locals()))
-
-    def testCookies(self):
-        self.skip_if_bad_cookies()
-
-        self.getPage('/cookies/single?name=First',
-                     [('Cookie', 'First=Dinsdale;')])
-        self.assertHeader('Set-Cookie', 'First=Dinsdale')
-
-        self.getPage('/cookies/multiple?names=First&names=Last',
-                     [('Cookie', 'First=Dinsdale; Last=Piranha;'),
-                      ])
-        self.assertHeader('Set-Cookie', 'First=Dinsdale')
-        self.assertHeader('Set-Cookie', 'Last=Piranha')
-
-        self.getPage('/cookies/single?name=Something-With%2CComma',
-                     [('Cookie', 'Something-With,Comma=some-value')])
-        self.assertStatus(400)
-
-    def testDefaultContentType(self):
-        self.getPage('/')
-        self.assertHeader('Content-Type', 'text/html;charset=utf-8')
-        self.getPage('/defct/plain')
-        self.getPage('/')
-        self.assertHeader('Content-Type', 'text/plain;charset=utf-8')
-        self.getPage('/defct/html')
-
-    def test_multiple_headers(self):
-        self.getPage('/multiheader/header_list')
-        self.assertEqual(
-            [(k, v) for k, v in self.headers if k == 'WWW-Authenticate'],
-            [('WWW-Authenticate', 'Negotiate'),
-             ('WWW-Authenticate', 'Basic realm="foo"'),
-             ])
-        self.getPage('/multiheader/commas')
-        self.assertHeader('WWW-Authenticate', 'Negotiate,Basic realm="foo"')
-
-    def test_cherrypy_url(self):
-        # Input relative to current
-        self.getPage('/url/leaf?path_info=page1')
-        self.assertBody('%s/url/page1' % self.base())
-        self.getPage('/url/?path_info=page1')
-        self.assertBody('%s/url/page1' % self.base())
-        # Other host header
-        host = 'www.mydomain.example'
-        self.getPage('/url/leaf?path_info=page1',
-                     headers=[('Host', host)])
-        self.assertBody('%s://%s/url/page1' % (self.scheme, host))
-
-        # Input is 'absolute'; that is, relative to script_name
-        self.getPage('/url/leaf?path_info=/page1')
-        self.assertBody('%s/page1' % self.base())
-        self.getPage('/url/?path_info=/page1')
-        self.assertBody('%s/page1' % self.base())
-
-        # Single dots
-        self.getPage('/url/leaf?path_info=./page1')
-        self.assertBody('%s/url/page1' % self.base())
-        self.getPage('/url/leaf?path_info=other/./page1')
-        self.assertBody('%s/url/other/page1' % self.base())
-        self.getPage('/url/?path_info=/other/./page1')
-        self.assertBody('%s/other/page1' % self.base())
-        self.getPage('/url/?path_info=/other/././././page1')
-        self.assertBody('%s/other/page1' % self.base())
-
-        # Double dots
-        self.getPage('/url/leaf?path_info=../page1')
-        self.assertBody('%s/page1' % self.base())
-        self.getPage('/url/leaf?path_info=other/../page1')
-        self.assertBody('%s/url/page1' % self.base())
-        self.getPage('/url/leaf?path_info=/other/../page1')
-        self.assertBody('%s/page1' % self.base())
-        self.getPage('/url/leaf?path_info=/other/../../../page1')
-        self.assertBody('%s/page1' % self.base())
-        self.getPage('/url/leaf?path_info=/other/../../../../../page1')
-        self.assertBody('%s/page1' % self.base())
-
-        # qs param is not normalized as a path
-        self.getPage('/url/qs?qs=/other')
-        self.assertBody('%s/url/qs?/other' % self.base())
-        self.getPage('/url/qs?qs=/other/../page1')
-        self.assertBody('%s/url/qs?/other/../page1' % self.base())
-        self.getPage('/url/qs?qs=../page1')
-        self.assertBody('%s/url/qs?../page1' % self.base())
-        self.getPage('/url/qs?qs=../../page1')
-        self.assertBody('%s/url/qs?../../page1' % self.base())
-
-        # Output relative to current path or script_name
-        self.getPage('/url/?path_info=page1&relative=True')
-        self.assertBody('page1')
-        self.getPage('/url/leaf?path_info=/page1&relative=True')
-        self.assertBody('../page1')
-        self.getPage('/url/leaf?path_info=page1&relative=True')
-        self.assertBody('page1')
-        self.getPage('/url/leaf?path_info=leaf/page1&relative=True')
-        self.assertBody('leaf/page1')
-        self.getPage('/url/leaf?path_info=../page1&relative=True')
-        self.assertBody('../page1')
-        self.getPage('/url/?path_info=other/../page1&relative=True')
-        self.assertBody('page1')
-
-        # Output relative to /
-        self.getPage('/baseurl?path_info=ab&relative=True')
-        self.assertBody('ab')
-        # Output relative to /
-        self.getPage('/baseurl?path_info=/ab&relative=True')
-        self.assertBody('ab')
-
-        # absolute-path references ("server-relative")
-        # Input relative to current
-        self.getPage('/url/leaf?path_info=page1&relative=server')
-        self.assertBody('/url/page1')
-        self.getPage('/url/?path_info=page1&relative=server')
-        self.assertBody('/url/page1')
-        # Input is 'absolute'; that is, relative to script_name
-        self.getPage('/url/leaf?path_info=/page1&relative=server')
-        self.assertBody('/page1')
-        self.getPage('/url/?path_info=/page1&relative=server')
-        self.assertBody('/page1')
-
-    def test_expose_decorator(self):
-        # Test @expose
-        self.getPage('/expose_dec/no_call')
-        self.assertStatus(200)
-        self.assertBody('Mr E. R. Bradshaw')
-
-        # Test @expose()
-        self.getPage('/expose_dec/call_empty')
-        self.assertStatus(200)
-        self.assertBody('Mrs. B.J. Smegma')
-
-        # Test @expose("alias")
-        self.getPage('/expose_dec/call_alias')
-        self.assertStatus(200)
-        self.assertBody('Mr Nesbitt')
-        # Does the original name work?
-        self.getPage('/expose_dec/nesbitt')
-        self.assertStatus(200)
-        self.assertBody('Mr Nesbitt')
-
-        # Test @expose(["alias1", "alias2"])
-        self.getPage('/expose_dec/alias1')
-        self.assertStatus(200)
-        self.assertBody('Mr Ken Andrews')
-        self.getPage('/expose_dec/alias2')
-        self.assertStatus(200)
-        self.assertBody('Mr Ken Andrews')
-        # Does the original name work?
-        self.getPage('/expose_dec/andrews')
-        self.assertStatus(200)
-        self.assertBody('Mr Ken Andrews')
-
-        # Test @expose(alias="alias")
-        self.getPage('/expose_dec/alias3')
-        self.assertStatus(200)
-        self.assertBody('Mr. and Mrs. Watson')
-
-
-class ErrorTests(helper.CPWebCase):
-
-    @staticmethod
-    def setup_server():
-        def break_header():
-            # Add a header after finalize that is invalid
-            cherrypy.serving.response.header_list.append((2, 3))
-        cherrypy.tools.break_header = cherrypy.Tool(
-            'on_end_resource', break_header)
-
-        class Root:
-
-            @cherrypy.expose
-            def index(self):
-                return 'hello'
-
-            @cherrypy.config(**{'tools.break_header.on': True})
-            def start_response_error(self):
-                return 'salud!'
-
-            @cherrypy.expose
-            def stat(self, path):
-                with cherrypy.HTTPError.handle(OSError, 404):
-                    os.stat(path)
-
-        root = Root()
-
-        cherrypy.tree.mount(root)
-
-    def test_start_response_error(self):
-        self.getPage('/start_response_error')
-        self.assertStatus(500)
-        self.assertInBody(
-            'TypeError: response.header_list key 2 is not a byte string.')
-
-    def test_contextmanager(self):
-        self.getPage('/stat/missing')
-        self.assertStatus(404)
-        body_text = self.body.decode('utf-8')
-        assert (
-            'No such file or directory' in body_text or
-            'cannot find the file specified' in body_text
-        )
-
-
-class TestBinding:
-    def test_bind_ephemeral_port(self):
-        """
-        A server configured to bind to port 0 will bind to an ephemeral
-        port and indicate that port number on startup.
-        """
-        cherrypy.config.reset()
-        bind_ephemeral_conf = {
-            'server.socket_port': 0,
-        }
-        cherrypy.config.update(bind_ephemeral_conf)
-        cherrypy.engine.start()
-        assert cherrypy.server.bound_addr != cherrypy.server.bind_addr
-        _host, port = cherrypy.server.bound_addr
-        assert port > 0
-        cherrypy.engine.stop()
-        assert cherrypy.server.bind_addr == cherrypy.server.bound_addr
diff --git a/lib/cherrypy/test/test_dynamicobjectmapping.py b/lib/cherrypy/test/test_dynamicobjectmapping.py
deleted file mode 100644
index 6ac33932..00000000
--- a/lib/cherrypy/test/test_dynamicobjectmapping.py
+++ /dev/null
@@ -1,410 +0,0 @@
-import cherrypy
-from cherrypy.test import helper
-
-script_names = ['', '/foo', '/users/fred/blog', '/corp/blog']
-
-
-def setup_server():
-    class SubSubRoot:
-
-        @cherrypy.expose
-        def index(self):
-            return 'SubSubRoot index'
-
-        @cherrypy.expose
-        def default(self, *args):
-            return 'SubSubRoot default'
-
-        @cherrypy.expose
-        def handler(self):
-            return 'SubSubRoot handler'
-
-        @cherrypy.expose
-        def dispatch(self):
-            return 'SubSubRoot dispatch'
-
-    subsubnodes = {
-        '1': SubSubRoot(),
-        '2': SubSubRoot(),
-    }
-
-    class SubRoot:
-
-        @cherrypy.expose
-        def index(self):
-            return 'SubRoot index'
-
-        @cherrypy.expose
-        def default(self, *args):
-            return 'SubRoot %s' % (args,)
-
-        @cherrypy.expose
-        def handler(self):
-            return 'SubRoot handler'
-
-        def _cp_dispatch(self, vpath):
-            return subsubnodes.get(vpath[0], None)
-
-    subnodes = {
-        '1': SubRoot(),
-        '2': SubRoot(),
-    }
-
-    class Root:
-
-        @cherrypy.expose
-        def index(self):
-            return 'index'
-
-        @cherrypy.expose
-        def default(self, *args):
-            return 'default %s' % (args,)
-
-        @cherrypy.expose
-        def handler(self):
-            return 'handler'
-
-        def _cp_dispatch(self, vpath):
-            return subnodes.get(vpath[0])
-
-    # -------------------------------------------------------------------------
-    # DynamicNodeAndMethodDispatcher example.
-    # This example exposes a fairly naive HTTP api
-    class User(object):
-
-        def __init__(self, id, name):
-            self.id = id
-            self.name = name
-
-        def __unicode__(self):
-            return str(self.name)
-
-        def __str__(self):
-            return str(self.name)
-
-    user_lookup = {
-        1: User(1, 'foo'),
-        2: User(2, 'bar'),
-    }
-
-    def make_user(name, id=None):
-        if not id:
-            id = max(*list(user_lookup.keys())) + 1
-        user_lookup[id] = User(id, name)
-        return id
-
-    @cherrypy.expose
-    class UserContainerNode(object):
-
-        def POST(self, name):
-            """Allow the creation of a new Object."""
-            return 'POST %d' % make_user(name)
-
-        def GET(self):
-            return str(sorted(user_lookup.keys()))
-
-        def dynamic_dispatch(self, vpath):
-            try:
-                id = int(vpath[0])
-            except (ValueError, IndexError):
-                return None
-            return UserInstanceNode(id)
-
-    @cherrypy.expose
-    class UserInstanceNode(object):
-
-        def __init__(self, id):
-            self.id = id
-            self.user = user_lookup.get(id, None)
-
-            # For all but PUT methods there MUST be a valid user identified
-            # by self.id
-            if not self.user and cherrypy.request.method != 'PUT':
-                raise cherrypy.HTTPError(404)
-
-        def GET(self, *args, **kwargs):
-            """Return the appropriate representation of the instance."""
-            return str(self.user)
-
-        def POST(self, name):
-            """Update the fields of the user instance."""
-            self.user.name = name
-            return 'POST %d' % self.user.id
-
-        def PUT(self, name):
-            """
-            Create a new user with the specified id, or edit it if it already
-            exists
-            """
-            if self.user:
-                # Edit the current user
-                self.user.name = name
-                return 'PUT %d' % self.user.id
-            else:
-                # Make a new user with said attributes.
-                return 'PUT %d' % make_user(name, self.id)
-
-        def DELETE(self):
-            """Delete the user specified at the id."""
-            id = self.user.id
-            del user_lookup[self.user.id]
-            del self.user
-            return 'DELETE %d' % id
-
-    class ABHandler:
-
-        class CustomDispatch:
-
-            @cherrypy.expose
-            def index(self, a, b):
-                return 'custom'
-
-        def _cp_dispatch(self, vpath):
-            """Make sure that if we don't pop anything from vpath,
-            processing still works.
-            """
-            return self.CustomDispatch()
-
-        @cherrypy.expose
-        def index(self, a, b=None):
-            body = ['a:' + str(a)]
-            if b is not None:
-                body.append(',b:' + str(b))
-            return ''.join(body)
-
-        @cherrypy.expose
-        def delete(self, a, b):
-            return 'deleting ' + str(a) + ' and ' + str(b)
-
-    class IndexOnly:
-
-        def _cp_dispatch(self, vpath):
-            """Make sure that popping ALL of vpath still shows the index
-            handler.
-            """
-            while vpath:
-                vpath.pop()
-            return self
-
-        @cherrypy.expose
-        def index(self):
-            return 'IndexOnly index'
-
-    class DecoratedPopArgs:
-        """Test _cp_dispatch with @cherrypy.popargs."""
-
-        @cherrypy.expose
-        def index(self):
-            return 'no params'
-
-        @cherrypy.expose
-        def hi(self):
-            return "hi was not interpreted as 'a' param"
-    DecoratedPopArgs = cherrypy.popargs(
-        'a', 'b', handler=ABHandler())(DecoratedPopArgs)
-
-    class NonDecoratedPopArgs:
-        """Test _cp_dispatch = cherrypy.popargs()"""
-
-        _cp_dispatch = cherrypy.popargs('a')
-
-        @cherrypy.expose
-        def index(self, a):
-            return 'index: ' + str(a)
-
-    class ParameterizedHandler:
-        """Special handler created for each request."""
-
-        def __init__(self, a):
-            self.a = a
-
-        @cherrypy.expose
-        def index(self):
-            if 'a' in cherrypy.request.params:
-                raise Exception(
-                    'Parameterized handler argument ended up in '
-                    'request.params')
-            return self.a
-
-    class ParameterizedPopArgs:
-        """Test cherrypy.popargs() with a function call handler."""
-    ParameterizedPopArgs = cherrypy.popargs(
-        'a', handler=ParameterizedHandler)(ParameterizedPopArgs)
-
-    Root.decorated = DecoratedPopArgs()
-    Root.undecorated = NonDecoratedPopArgs()
-    Root.index_only = IndexOnly()
-    Root.parameter_test = ParameterizedPopArgs()
-
-    Root.users = UserContainerNode()
-
-    md = cherrypy.dispatch.MethodDispatcher('dynamic_dispatch')
-    for url in script_names:
-        conf = {
-            '/': {
-                'user': (url or '/').split('/')[-2],
-            },
-            '/users': {
-                'request.dispatch': md
-            },
-        }
-        cherrypy.tree.mount(Root(), url, conf)
-
-
-class DynamicObjectMappingTest(helper.CPWebCase):
-    setup_server = staticmethod(setup_server)
-
-    def testObjectMapping(self):
-        for url in script_names:
-            self.script_name = url
-
-            self.getPage('/')
-            self.assertBody('index')
-
-            self.getPage('/handler')
-            self.assertBody('handler')
-
-            # Dynamic dispatch will succeed here for the subnodes
-            # so the subroot gets called
-            self.getPage('/1/')
-            self.assertBody('SubRoot index')
-
-            self.getPage('/2/')
-            self.assertBody('SubRoot index')
-
-            self.getPage('/1/handler')
-            self.assertBody('SubRoot handler')
-
-            self.getPage('/2/handler')
-            self.assertBody('SubRoot handler')
-
-            # Dynamic dispatch will fail here for the subnodes
-            # so the default gets called
-            self.getPage('/asdf/')
-            self.assertBody("default ('asdf',)")
-
-            self.getPage('/asdf/asdf')
-            self.assertBody("default ('asdf', 'asdf')")
-
-            self.getPage('/asdf/handler')
-            self.assertBody("default ('asdf', 'handler')")
-
-            # Dynamic dispatch will succeed here for the subsubnodes
-            # so the subsubroot gets called
-            self.getPage('/1/1/')
-            self.assertBody('SubSubRoot index')
-
-            self.getPage('/2/2/')
-            self.assertBody('SubSubRoot index')
-
-            self.getPage('/1/1/handler')
-            self.assertBody('SubSubRoot handler')
-
-            self.getPage('/2/2/handler')
-            self.assertBody('SubSubRoot handler')
-
-            self.getPage('/2/2/dispatch')
-            self.assertBody('SubSubRoot dispatch')
-
-            # The exposed dispatch will not be called as a dispatch
-            # method.
-            self.getPage('/2/2/foo/foo')
-            self.assertBody('SubSubRoot default')
-
-            # Dynamic dispatch will fail here for the subsubnodes
-            # so the SubRoot gets called
-            self.getPage('/1/asdf/')
-            self.assertBody("SubRoot ('asdf',)")
-
-            self.getPage('/1/asdf/asdf')
-            self.assertBody("SubRoot ('asdf', 'asdf')")
-
-            self.getPage('/1/asdf/handler')
-            self.assertBody("SubRoot ('asdf', 'handler')")
-
-    def testMethodDispatch(self):
-        # GET acts like a container
-        self.getPage('/users')
-        self.assertBody('[1, 2]')
-        self.assertHeader('Allow', 'GET, HEAD, POST')
-
-        # POST to the container URI allows creation
-        self.getPage('/users', method='POST', body='name=baz')
-        self.assertBody('POST 3')
-        self.assertHeader('Allow', 'GET, HEAD, POST')
-
-        # POST to a specific instanct URI results in a 404
-        # as the resource does not exit.
-        self.getPage('/users/5', method='POST', body='name=baz')
-        self.assertStatus(404)
-
-        # PUT to a specific instanct URI results in creation
-        self.getPage('/users/5', method='PUT', body='name=boris')
-        self.assertBody('PUT 5')
-        self.assertHeader('Allow', 'DELETE, GET, HEAD, POST, PUT')
-
-        # GET acts like a container
-        self.getPage('/users')
-        self.assertBody('[1, 2, 3, 5]')
-        self.assertHeader('Allow', 'GET, HEAD, POST')
-
-        test_cases = (
-            (1, 'foo', 'fooupdated', 'DELETE, GET, HEAD, POST, PUT'),
-            (2, 'bar', 'barupdated', 'DELETE, GET, HEAD, POST, PUT'),
-            (3, 'baz', 'bazupdated', 'DELETE, GET, HEAD, POST, PUT'),
-            (5, 'boris', 'borisupdated', 'DELETE, GET, HEAD, POST, PUT'),
-        )
-        for id, name, updatedname, headers in test_cases:
-            self.getPage('/users/%d' % id)
-            self.assertBody(name)
-            self.assertHeader('Allow', headers)
-
-            # Make sure POSTs update already existings resources
-            self.getPage('/users/%d' %
-                         id, method='POST', body='name=%s' % updatedname)
-            self.assertBody('POST %d' % id)
-            self.assertHeader('Allow', headers)
-
-            # Make sure PUTs Update already existing resources.
-            self.getPage('/users/%d' %
-                         id, method='PUT', body='name=%s' % updatedname)
-            self.assertBody('PUT %d' % id)
-            self.assertHeader('Allow', headers)
-
-            # Make sure DELETES Remove already existing resources.
-            self.getPage('/users/%d' % id, method='DELETE')
-            self.assertBody('DELETE %d' % id)
-            self.assertHeader('Allow', headers)
-
-        # GET acts like a container
-        self.getPage('/users')
-        self.assertBody('[]')
-        self.assertHeader('Allow', 'GET, HEAD, POST')
-
-    def testVpathDispatch(self):
-        self.getPage('/decorated/')
-        self.assertBody('no params')
-
-        self.getPage('/decorated/hi')
-        self.assertBody("hi was not interpreted as 'a' param")
-
-        self.getPage('/decorated/yo/')
-        self.assertBody('a:yo')
-
-        self.getPage('/decorated/yo/there/')
-        self.assertBody('a:yo,b:there')
-
-        self.getPage('/decorated/yo/there/delete')
-        self.assertBody('deleting yo and there')
-
-        self.getPage('/decorated/yo/there/handled_by_dispatch/')
-        self.assertBody('custom')
-
-        self.getPage('/undecorated/blah/')
-        self.assertBody('index: blah')
-
-        self.getPage('/index_only/a/b/c/d/e/f/g/')
-        self.assertBody('IndexOnly index')
-
-        self.getPage('/parameter_test/argument2/')
-        self.assertBody('argument2')
diff --git a/lib/cherrypy/test/test_encoding.py b/lib/cherrypy/test/test_encoding.py
deleted file mode 100644
index 6075103d..00000000
--- a/lib/cherrypy/test/test_encoding.py
+++ /dev/null
@@ -1,432 +0,0 @@
-# coding: utf-8
-
-import gzip
-import io
-from unittest import mock
-from http.client import IncompleteRead
-from urllib.parse import quote as url_quote
-
-import cherrypy
-from cherrypy._cpcompat import ntob, ntou
-
-from cherrypy.test import helper
-
-
-europoundUnicode = ntou('£', encoding='utf-8')
-sing = ntou('毛泽东: Sing, Little Birdie?', encoding='utf-8')
-
-sing8 = sing.encode('utf-8')
-sing16 = sing.encode('utf-16')
-
-
-class EncodingTests(helper.CPWebCase):
-
-    @staticmethod
-    def setup_server():
-        class Root:
-
-            @cherrypy.expose
-            def index(self, param):
-                assert param == europoundUnicode, '%r != %r' % (
-                    param, europoundUnicode)
-                yield europoundUnicode
-
-            @cherrypy.expose
-            def mao_zedong(self):
-                return sing
-
-            @cherrypy.expose
-            @cherrypy.config(**{'tools.encode.encoding': 'utf-8'})
-            def utf8(self):
-                return sing8
-
-            @cherrypy.expose
-            def cookies_and_headers(self):
-                # if the headers have non-ascii characters and a cookie has
-                #  any part which is unicode (even ascii), the response
-                #  should not fail.
-                cherrypy.response.cookie['candy'] = 'bar'
-                cherrypy.response.cookie['candy']['domain'] = 'cherrypy.dev'
-                cherrypy.response.headers[
-                    'Some-Header'] = 'My d\xc3\xb6g has fleas'
-                cherrypy.response.headers[
-                    'Bytes-Header'] = b'Bytes given header'
-                return 'Any content'
-
-            @cherrypy.expose
-            def reqparams(self, *args, **kwargs):
-                return b', '.join(
-                    [': '.join((k, v)).encode('utf8')
-                     for k, v in sorted(cherrypy.request.params.items())]
-                )
-
-            @cherrypy.expose
-            @cherrypy.config(**{
-                'tools.encode.text_only': False,
-                'tools.encode.add_charset': True,
-            })
-            def nontext(self, *args, **kwargs):
-                cherrypy.response.headers[
-                    'Content-Type'] = 'application/binary'
-                return '\x00\x01\x02\x03'
-
-        class GZIP:
-
-            @cherrypy.expose
-            def index(self):
-                yield 'Hello, world'
-
-            @cherrypy.expose
-            # Turn encoding off so the gzip tool is the one doing the collapse.
-            @cherrypy.config(**{'tools.encode.on': False})
-            def noshow(self):
-                # Test for ticket #147, where yield showed no exceptions
-                # (content-encoding was still gzip even though traceback
-                # wasn't zipped).
-                raise IndexError()
-                yield 'Here be dragons'
-
-            @cherrypy.expose
-            @cherrypy.config(**{'response.stream': True})
-            def noshow_stream(self):
-                # Test for ticket #147, where yield showed no exceptions
-                # (content-encoding was still gzip even though traceback
-                # wasn't zipped).
-                raise IndexError()
-                yield 'Here be dragons'
-
-        class Decode:
-
-            @cherrypy.expose
-            @cherrypy.config(**{
-                'tools.decode.on': True,
-                'tools.decode.default_encoding': ['utf-16'],
-            })
-            def extra_charset(self, *args, **kwargs):
-                return ', '.join([': '.join((k, v))
-                                  for k, v in cherrypy.request.params.items()])
-
-            @cherrypy.expose
-            @cherrypy.config(**{
-                'tools.decode.on': True,
-                'tools.decode.encoding': 'utf-16',
-            })
-            def force_charset(self, *args, **kwargs):
-                return ', '.join([': '.join((k, v))
-                                  for k, v in cherrypy.request.params.items()])
-
-        root = Root()
-        root.gzip = GZIP()
-        root.decode = Decode()
-        cherrypy.tree.mount(root, config={'/gzip': {'tools.gzip.on': True}})
-
-    def test_query_string_decoding(self):
-        URI_TMPL = '/reqparams?q={q}'
-
-        europoundUtf8_2_bytes = europoundUnicode.encode('utf-8')
-        europoundUtf8_2nd_byte = europoundUtf8_2_bytes[1:2]
-
-        # Encoded utf8 query strings MUST be parsed correctly.
-        # Here, q is the POUND SIGN U+00A3 encoded in utf8 and then %HEX
-        self.getPage(URI_TMPL.format(q=url_quote(europoundUtf8_2_bytes)))
-        # The return value will be encoded as utf8.
-        self.assertBody(b'q: ' + europoundUtf8_2_bytes)
-
-        # Query strings that are incorrectly encoded MUST raise 404.
-        # Here, q is the second byte of POUND SIGN U+A3 encoded in utf8
-        # and then %HEX
-        # TODO: check whether this shouldn't raise 400 Bad Request instead
-        self.getPage(URI_TMPL.format(q=url_quote(europoundUtf8_2nd_byte)))
-        self.assertStatus(404)
-        self.assertErrorPage(
-            404,
-            'The given query string could not be processed. Query '
-            "strings for this resource must be encoded with 'utf8'.")
-
-    def test_urlencoded_decoding(self):
-        # Test the decoding of an application/x-www-form-urlencoded entity.
-        europoundUtf8 = europoundUnicode.encode('utf-8')
-        body = b'param=' + europoundUtf8
-        self.getPage('/',
-                     method='POST',
-                     headers=[
-                         ('Content-Type', 'application/x-www-form-urlencoded'),
-                         ('Content-Length', str(len(body))),
-                     ],
-                     body=body),
-        self.assertBody(europoundUtf8)
-
-        # Encoded utf8 entities MUST be parsed and decoded correctly.
-        # Here, q is the POUND SIGN U+00A3 encoded in utf8
-        body = b'q=\xc2\xa3'
-        self.getPage('/reqparams', method='POST',
-                     headers=[(
-                         'Content-Type', 'application/x-www-form-urlencoded'),
-                         ('Content-Length', str(len(body))),
-                     ],
-                     body=body),
-        self.assertBody(b'q: \xc2\xa3')
-
-        # ...and in utf16, which is not in the default attempt_charsets list:
-        body = b'\xff\xfeq\x00=\xff\xfe\xa3\x00'
-        self.getPage('/reqparams',
-                     method='POST',
-                     headers=[
-                         ('Content-Type',
-                          'application/x-www-form-urlencoded;charset=utf-16'),
-                         ('Content-Length', str(len(body))),
-                     ],
-                     body=body),
-        self.assertBody(b'q: \xc2\xa3')
-
-        # Entities that are incorrectly encoded MUST raise 400.
-        # Here, q is the POUND SIGN U+00A3 encoded in utf16, but
-        # the Content-Type incorrectly labels it utf-8.
-        body = b'\xff\xfeq\x00=\xff\xfe\xa3\x00'
-        self.getPage('/reqparams',
-                     method='POST',
-                     headers=[
-                         ('Content-Type',
-                          'application/x-www-form-urlencoded;charset=utf-8'),
-                         ('Content-Length', str(len(body))),
-                     ],
-                     body=body),
-        self.assertStatus(400)
-        self.assertErrorPage(
-            400,
-            'The request entity could not be decoded. The following charsets '
-            "were attempted: ['utf-8']")
-
-    def test_decode_tool(self):
-        # An extra charset should be tried first, and succeed if it matches.
-        # Here, we add utf-16 as a charset and pass a utf-16 body.
-        body = b'\xff\xfeq\x00=\xff\xfe\xa3\x00'
-        self.getPage('/decode/extra_charset', method='POST',
-                     headers=[(
-                         'Content-Type', 'application/x-www-form-urlencoded'),
-                         ('Content-Length', str(len(body))),
-                     ],
-                     body=body),
-        self.assertBody(b'q: \xc2\xa3')
-
-        # An extra charset should be tried first, and continue to other default
-        # charsets if it doesn't match.
-        # Here, we add utf-16 as a charset but still pass a utf-8 body.
-        body = b'q=\xc2\xa3'
-        self.getPage('/decode/extra_charset', method='POST',
-                     headers=[(
-                         'Content-Type', 'application/x-www-form-urlencoded'),
-                         ('Content-Length', str(len(body))),
-                     ],
-                     body=body),
-        self.assertBody(b'q: \xc2\xa3')
-
-        # An extra charset should error if force is True and it doesn't match.
-        # Here, we force utf-16 as a charset but still pass a utf-8 body.
-        body = b'q=\xc2\xa3'
-        self.getPage('/decode/force_charset', method='POST',
-                     headers=[(
-                         'Content-Type', 'application/x-www-form-urlencoded'),
-                         ('Content-Length', str(len(body))),
-                     ],
-                     body=body),
-        self.assertErrorPage(
-            400,
-            'The request entity could not be decoded. The following charsets '
-            "were attempted: ['utf-16']")
-
-    def test_multipart_decoding(self):
-        # Test the decoding of a multipart entity when the charset (utf16) is
-        # explicitly given.
-        body = ntob('\r\n'.join([
-            '--X',
-            'Content-Type: text/plain;charset=utf-16',
-            'Content-Disposition: form-data; name="text"',
-            '',
-            '\xff\xfea\x00b\x00\x1c c\x00',
-            '--X',
-            'Content-Type: text/plain;charset=utf-16',
-            'Content-Disposition: form-data; name="submit"',
-            '',
-            '\xff\xfeC\x00r\x00e\x00a\x00t\x00e\x00',
-            '--X--'
-        ]))
-        self.getPage('/reqparams', method='POST',
-                     headers=[(
-                         'Content-Type', 'multipart/form-data;boundary=X'),
-                         ('Content-Length', str(len(body))),
-                     ],
-                     body=body),
-        self.assertBody(b'submit: Create, text: ab\xe2\x80\x9cc')
-
-    @mock.patch('cherrypy._cpreqbody.Part.maxrambytes', 1)
-    def test_multipart_decoding_bigger_maxrambytes(self):
-        """
-        Decoding of a multipart entity should also pass when
-        the entity is bigger than maxrambytes. See ticket #1352.
-        """
-        self.test_multipart_decoding()
-
-    def test_multipart_decoding_no_charset(self):
-        # Test the decoding of a multipart entity when the charset (utf8) is
-        # NOT explicitly given, but is in the list of charsets to attempt.
-        body = ntob('\r\n'.join([
-            '--X',
-            'Content-Disposition: form-data; name="text"',
-            '',
-            '\xe2\x80\x9c',
-            '--X',
-            'Content-Disposition: form-data; name="submit"',
-            '',
-            'Create',
-            '--X--'
-        ]))
-        self.getPage('/reqparams', method='POST',
-                     headers=[(
-                         'Content-Type', 'multipart/form-data;boundary=X'),
-                         ('Content-Length', str(len(body))),
-                     ],
-                     body=body),
-        self.assertBody(b'submit: Create, text: \xe2\x80\x9c')
-
-    def test_multipart_decoding_no_successful_charset(self):
-        # Test the decoding of a multipart entity when the charset (utf16) is
-        # NOT explicitly given, and is NOT in the list of charsets to attempt.
-        body = ntob('\r\n'.join([
-            '--X',
-            'Content-Disposition: form-data; name="text"',
-            '',
-            '\xff\xfea\x00b\x00\x1c c\x00',
-            '--X',
-            'Content-Disposition: form-data; name="submit"',
-            '',
-            '\xff\xfeC\x00r\x00e\x00a\x00t\x00e\x00',
-            '--X--'
-        ]))
-        self.getPage('/reqparams', method='POST',
-                     headers=[(
-                         'Content-Type', 'multipart/form-data;boundary=X'),
-                         ('Content-Length', str(len(body))),
-                     ],
-                     body=body),
-        self.assertStatus(400)
-        self.assertErrorPage(
-            400,
-            'The request entity could not be decoded. The following charsets '
-            "were attempted: ['us-ascii', 'utf-8']")
-
-    def test_nontext(self):
-        self.getPage('/nontext')
-        self.assertHeader('Content-Type', 'application/binary;charset=utf-8')
-        self.assertBody('\x00\x01\x02\x03')
-
-    def testEncoding(self):
-        # Default encoding should be utf-8
-        self.getPage('/mao_zedong')
-        self.assertBody(sing8)
-
-        # Ask for utf-16.
-        self.getPage('/mao_zedong', [('Accept-Charset', 'utf-16')])
-        self.assertHeader('Content-Type', 'text/html;charset=utf-16')
-        self.assertBody(sing16)
-
-        # Ask for multiple encodings. ISO-8859-1 should fail, and utf-16
-        # should be produced.
-        self.getPage('/mao_zedong', [('Accept-Charset',
-                                      'iso-8859-1;q=1, utf-16;q=0.5')])
-        self.assertBody(sing16)
-
-        # The "*" value should default to our default_encoding, utf-8
-        self.getPage('/mao_zedong', [('Accept-Charset', '*;q=1, utf-7;q=.2')])
-        self.assertBody(sing8)
-
-        # Only allow iso-8859-1, which should fail and raise 406.
-        self.getPage('/mao_zedong', [('Accept-Charset', 'iso-8859-1, *;q=0')])
-        self.assertStatus('406 Not Acceptable')
-        self.assertInBody('Your client sent this Accept-Charset header: '
-                          'iso-8859-1, *;q=0. We tried these charsets: '
-                          'iso-8859-1.')
-
-        # Ask for x-mac-ce, which should be unknown. See ticket #569.
-        self.getPage('/mao_zedong', [('Accept-Charset',
-                                      'us-ascii, ISO-8859-1, x-mac-ce')])
-        self.assertStatus('406 Not Acceptable')
-        self.assertInBody('Your client sent this Accept-Charset header: '
-                          'us-ascii, ISO-8859-1, x-mac-ce. We tried these '
-                          'charsets: ISO-8859-1, us-ascii, x-mac-ce.')
-
-        # Test the 'encoding' arg to encode.
-        self.getPage('/utf8')
-        self.assertBody(sing8)
-        self.getPage('/utf8', [('Accept-Charset', 'us-ascii, ISO-8859-1')])
-        self.assertStatus('406 Not Acceptable')
-
-        # Test malformed quality value, which should raise 400.
-        self.getPage('/mao_zedong', [('Accept-Charset',
-                                      'ISO-8859-1,utf-8;q=0.7,*;q=0.7)')])
-        self.assertStatus('400 Bad Request')
-
-    def testGzip(self):
-        zbuf = io.BytesIO()
-        zfile = gzip.GzipFile(mode='wb', fileobj=zbuf, compresslevel=9)
-        zfile.write(b'Hello, world')
-        zfile.close()
-
-        self.getPage('/gzip/', headers=[('Accept-Encoding', 'gzip')])
-        self.assertInBody(zbuf.getvalue()[:3])
-        self.assertHeader('Vary', 'Accept-Encoding')
-        self.assertHeader('Content-Encoding', 'gzip')
-
-        # Test when gzip is denied.
-        self.getPage('/gzip/', headers=[('Accept-Encoding', 'identity')])
-        self.assertHeader('Vary', 'Accept-Encoding')
-        self.assertNoHeader('Content-Encoding')
-        self.assertBody('Hello, world')
-
-        self.getPage('/gzip/', headers=[('Accept-Encoding', 'gzip;q=0')])
-        self.assertHeader('Vary', 'Accept-Encoding')
-        self.assertNoHeader('Content-Encoding')
-        self.assertBody('Hello, world')
-
-        # Test that trailing comma doesn't cause IndexError
-        # Ref: https://github.com/cherrypy/cherrypy/issues/988
-        self.getPage('/gzip/', headers=[('Accept-Encoding', 'gzip,deflate,')])
-        self.assertStatus(200)
-        self.assertNotInBody('IndexError')
-
-        self.getPage('/gzip/', headers=[('Accept-Encoding', '*;q=0')])
-        self.assertStatus(406)
-        self.assertNoHeader('Content-Encoding')
-        self.assertErrorPage(406, 'identity, gzip')
-
-        # Test for ticket #147
-        self.getPage('/gzip/noshow', headers=[('Accept-Encoding', 'gzip')])
-        self.assertNoHeader('Content-Encoding')
-        self.assertStatus(500)
-        self.assertErrorPage(500, pattern='IndexError\n')
-
-        # In this case, there's nothing we can do to deliver a
-        # readable page, since 1) the gzip header is already set,
-        # and 2) we may have already written some of the body.
-        # The fix is to never stream yields when using gzip.
-        if (cherrypy.server.protocol_version == 'HTTP/1.0' or
-                getattr(cherrypy.server, 'using_apache', False)):
-            self.getPage('/gzip/noshow_stream',
-                         headers=[('Accept-Encoding', 'gzip')])
-            self.assertHeader('Content-Encoding', 'gzip')
-            self.assertInBody('\x1f\x8b\x08\x00')
-        else:
-            # The wsgiserver will simply stop sending data, and the HTTP client
-            # will error due to an incomplete chunk-encoded stream.
-            self.assertRaises((ValueError, IncompleteRead), self.getPage,
-                              '/gzip/noshow_stream',
-                              headers=[('Accept-Encoding', 'gzip')])
-
-    def test_UnicodeHeaders(self):
-        self.getPage('/cookies_and_headers')
-        self.assertBody('Any content')
-
-    def test_BytesHeaders(self):
-        self.getPage('/cookies_and_headers')
-        self.assertBody('Any content')
-        self.assertHeader('Bytes-Header', 'Bytes given header')
diff --git a/lib/cherrypy/test/test_etags.py b/lib/cherrypy/test/test_etags.py
deleted file mode 100644
index 293eb866..00000000
--- a/lib/cherrypy/test/test_etags.py
+++ /dev/null
@@ -1,84 +0,0 @@
-import cherrypy
-from cherrypy._cpcompat import ntou
-from cherrypy.test import helper
-
-
-class ETagTest(helper.CPWebCase):
-
-    @staticmethod
-    def setup_server():
-        class Root:
-
-            @cherrypy.expose
-            def resource(self):
-                return 'Oh wah ta goo Siam.'
-
-            @cherrypy.expose
-            def fail(self, code):
-                code = int(code)
-                if 300 <= code <= 399:
-                    raise cherrypy.HTTPRedirect([], code)
-                else:
-                    raise cherrypy.HTTPError(code)
-
-            @cherrypy.expose
-            # In Python 3, tools.encode is on by default
-            @cherrypy.config(**{'tools.encode.on': True})
-            def unicoded(self):
-                return ntou('I am a \u1ee4nicode string.', 'escape')
-
-        conf = {'/': {'tools.etags.on': True,
-                      'tools.etags.autotags': True,
-                      }}
-        cherrypy.tree.mount(Root(), config=conf)
-
-    def test_etags(self):
-        self.getPage('/resource')
-        self.assertStatus('200 OK')
-        self.assertHeader('Content-Type', 'text/html;charset=utf-8')
-        self.assertBody('Oh wah ta goo Siam.')
-        etag = self.assertHeader('ETag')
-
-        # Test If-Match (both valid and invalid)
-        self.getPage('/resource', headers=[('If-Match', etag)])
-        self.assertStatus('200 OK')
-        self.getPage('/resource', headers=[('If-Match', '*')])
-        self.assertStatus('200 OK')
-        self.getPage('/resource', headers=[('If-Match', '*')], method='POST')
-        self.assertStatus('200 OK')
-        self.getPage('/resource', headers=[('If-Match', 'a bogus tag')])
-        self.assertStatus('412 Precondition Failed')
-
-        # Test If-None-Match (both valid and invalid)
-        self.getPage('/resource', headers=[('If-None-Match', etag)])
-        self.assertStatus(304)
-        self.getPage('/resource', method='POST',
-                     headers=[('If-None-Match', etag)])
-        self.assertStatus('412 Precondition Failed')
-        self.getPage('/resource', headers=[('If-None-Match', '*')])
-        self.assertStatus(304)
-        self.getPage('/resource', headers=[('If-None-Match', 'a bogus tag')])
-        self.assertStatus('200 OK')
-
-    def test_errors(self):
-        self.getPage('/resource')
-        self.assertStatus(200)
-        etag = self.assertHeader('ETag')
-
-        # Test raising errors in page handler
-        self.getPage('/fail/412', headers=[('If-Match', etag)])
-        self.assertStatus(412)
-        self.getPage('/fail/304', headers=[('If-Match', etag)])
-        self.assertStatus(304)
-        self.getPage('/fail/412', headers=[('If-None-Match', '*')])
-        self.assertStatus(412)
-        self.getPage('/fail/304', headers=[('If-None-Match', '*')])
-        self.assertStatus(304)
-
-    def test_unicode_body(self):
-        self.getPage('/unicoded')
-        self.assertStatus(200)
-        etag1 = self.assertHeader('ETag')
-        self.getPage('/unicoded', headers=[('If-Match', etag1)])
-        self.assertStatus(200)
-        self.assertHeader('ETag', etag1)
diff --git a/lib/cherrypy/test/test_http.py b/lib/cherrypy/test/test_http.py
deleted file mode 100644
index 4fae0ea8..00000000
--- a/lib/cherrypy/test/test_http.py
+++ /dev/null
@@ -1,318 +0,0 @@
-# coding: utf-8
-"""Tests for managing HTTP issues (malformed requests, etc)."""
-
-import errno
-import mimetypes
-import socket
-import sys
-from unittest import mock
-import urllib.parse
-from http.client import HTTPConnection
-
-import cherrypy
-from cherrypy._cpcompat import HTTPSConnection
-
-from cherrypy.test import helper
-
-
-def is_ascii(text):
-    """Return True if the text encodes as ascii."""
-    try:
-        text.encode('ascii')
-        return True
-    except Exception:
-        pass
-    return False
-
-
-def encode_filename(filename):
-    """Given a filename to be used in a multipart/form-data, encode the name.
-
-    Return the key and encoded filename.
-    """
-    if is_ascii(filename):
-        return 'filename', '"{filename}"'.format(**locals())
-    encoded = urllib.parse.quote(filename, encoding='utf-8')
-    return 'filename*', "'".join((
-        'UTF-8',
-        '',  # lang
-        encoded,
-    ))
-
-
-def encode_multipart_formdata(files):
-    """Return (content_type, body) ready for httplib.HTTP instance.
-
-    files: a sequence of (name, filename, value) tuples for multipart uploads.
-    filename can be a string or a tuple ('filename string', 'encoding')
-    """
-    BOUNDARY = '________ThIs_Is_tHe_bouNdaRY_$'
-    L = []
-    for key, filename, value in files:
-        L.append('--' + BOUNDARY)
-
-        fn_key, encoded = encode_filename(filename)
-        tmpl = \
-            'Content-Disposition: form-data; name="{key}"; {fn_key}={encoded}'
-        L.append(tmpl.format(**locals()))
-        ct = mimetypes.guess_type(filename)[0] or 'application/octet-stream'
-        L.append('Content-Type: %s' % ct)
-        L.append('')
-        L.append(value)
-    L.append('--' + BOUNDARY + '--')
-    L.append('')
-    body = '\r\n'.join(L)
-    content_type = 'multipart/form-data; boundary=%s' % BOUNDARY
-    return content_type, body
-
-
-class HTTPTests(helper.CPWebCase):
-
-    def make_connection(self):
-        if self.scheme == 'https':
-            return HTTPSConnection('%s:%s' % (self.interface(), self.PORT))
-        else:
-            return HTTPConnection('%s:%s' % (self.interface(), self.PORT))
-
-    @staticmethod
-    def setup_server():
-        class Root:
-
-            @cherrypy.expose
-            def index(self, *args, **kwargs):
-                return 'Hello world!'
-
-            @cherrypy.expose
-            @cherrypy.config(**{'request.process_request_body': False})
-            def no_body(self, *args, **kwargs):
-                return 'Hello world!'
-
-            @cherrypy.expose
-            def post_multipart(self, file):
-                """Return a summary ("a * 65536\nb * 65536") of the uploaded
-                file.
-                """
-                contents = file.file.read()
-                summary = []
-                curchar = None
-                count = 0
-                for c in contents:
-                    if c == curchar:
-                        count += 1
-                    else:
-                        if count:
-                            curchar = chr(curchar)
-                            summary.append('%s * %d' % (curchar, count))
-                        count = 1
-                        curchar = c
-                if count:
-                    curchar = chr(curchar)
-                    summary.append('%s * %d' % (curchar, count))
-                return ', '.join(summary)
-
-            @cherrypy.expose
-            def post_filename(self, myfile):
-                """Return the name of the file which was uploaded."""
-                return myfile.filename
-
-        cherrypy.tree.mount(Root())
-        cherrypy.config.update({'server.max_request_body_size': 30000000})
-
-    def test_no_content_length(self):
-        # "The presence of a message-body in a request is signaled by the
-        # inclusion of a Content-Length or Transfer-Encoding header field in
-        # the request's message-headers."
-        #
-        # Send a message with neither header and no body. Even though
-        # the request is of method POST, this should be OK because we set
-        # request.process_request_body to False for our handler.
-        c = self.make_connection()
-        c.request('POST', '/no_body')
-        response = c.getresponse()
-        self.body = response.fp.read()
-        self.status = str(response.status)
-        self.assertStatus(200)
-        self.assertBody(b'Hello world!')
-
-        response.close()
-        c.close()
-
-        # Now send a message that has no Content-Length, but does send a body.
-        # Verify that CP times out the socket and responds
-        # with 411 Length Required.
-        if self.scheme == 'https':
-            c = HTTPSConnection('%s:%s' % (self.interface(), self.PORT))
-        else:
-            c = HTTPConnection('%s:%s' % (self.interface(), self.PORT))
-
-        # `_get_content_length` is needed for Python 3.6+
-        with mock.patch.object(
-                c,
-                '_get_content_length',
-                lambda body, method: None,
-                create=True):
-            # `_set_content_length` is needed for Python 2.7-3.5
-            with mock.patch.object(c, '_set_content_length', create=True):
-                c.request('POST', '/')
-
-        response = c.getresponse()
-        self.body = response.fp.read()
-        self.status = str(response.status)
-        self.assertStatus(411)
-
-        response.close()
-        c.close()
-
-    def test_post_multipart(self):
-        alphabet = 'abcdefghijklmnopqrstuvwxyz'
-        # generate file contents for a large post
-        contents = ''.join([c * 65536 for c in alphabet])
-
-        # encode as multipart form data
-        files = [('file', 'file.txt', contents)]
-        content_type, body = encode_multipart_formdata(files)
-        body = body.encode('Latin-1')
-
-        # post file
-        c = self.make_connection()
-        c.putrequest('POST', '/post_multipart')
-        c.putheader('Content-Type', content_type)
-        c.putheader('Content-Length', str(len(body)))
-        c.endheaders()
-        c.send(body)
-
-        response = c.getresponse()
-        self.body = response.fp.read()
-        self.status = str(response.status)
-        self.assertStatus(200)
-        parts = ['%s * 65536' % ch for ch in alphabet]
-        self.assertBody(', '.join(parts))
-
-        response.close()
-        c.close()
-
-    def test_post_filename_with_special_characters(self):
-        """Testing that we can handle filenames with special characters.
-
-        This was reported as a bug in:
-
-        * https://github.com/cherrypy/cherrypy/issues/1146/
-        * https://github.com/cherrypy/cherrypy/issues/1397/
-        * https://github.com/cherrypy/cherrypy/issues/1694/
-        """
-        # We'll upload a bunch of files with differing names.
-        fnames = [
-            'boop.csv', 'foo, bar.csv', 'bar, xxxx.csv', 'file"name.csv',
-            'file;name.csv', 'file; name.csv', u'test_łóąä.txt',
-        ]
-        for fname in fnames:
-            files = [('myfile', fname, 'yunyeenyunyue')]
-            content_type, body = encode_multipart_formdata(files)
-            body = body.encode('Latin-1')
-
-            # post file
-            c = self.make_connection()
-            c.putrequest('POST', '/post_filename')
-            c.putheader('Content-Type', content_type)
-            c.putheader('Content-Length', str(len(body)))
-            c.endheaders()
-            c.send(body)
-
-            response = c.getresponse()
-            self.body = response.fp.read()
-            self.status = str(response.status)
-            self.assertStatus(200)
-            self.assertBody(fname)
-
-            response.close()
-            c.close()
-
-    def test_malformed_request_line(self):
-        if getattr(cherrypy.server, 'using_apache', False):
-            return self.skip('skipped due to known Apache differences...')
-
-        # Test missing version in Request-Line
-        c = self.make_connection()
-        c._output(b'geT /')
-        c._send_output()
-        if hasattr(c, 'strict'):
-            response = c.response_class(c.sock, strict=c.strict, method='GET')
-        else:
-            # Python 3.2 removed the 'strict' feature, saying:
-            # "http.client now always assumes HTTP/1.x compliant servers."
-            response = c.response_class(c.sock, method='GET')
-        response.begin()
-        self.assertEqual(response.status, 400)
-        self.assertEqual(response.fp.read(22), b'Malformed Request-Line')
-        c.close()
-
-    def test_request_line_split_issue_1220(self):
-        params = {
-            'intervenant-entreprise-evenement_classaction':
-                'evenement-mailremerciements',
-            '_path': 'intervenant-entreprise-evenement',
-            'intervenant-entreprise-evenement_action-id': 19404,
-            'intervenant-entreprise-evenement_id': 19404,
-            'intervenant-entreprise_id': 28092,
-        }
-        Request_URI = '/index?' + urllib.parse.urlencode(params)
-        self.assertEqual(len('GET %s HTTP/1.1\r\n' % Request_URI), 256)
-        self.getPage(Request_URI)
-        self.assertBody('Hello world!')
-
-    def test_malformed_header(self):
-        c = self.make_connection()
-        c.putrequest('GET', '/')
-        c.putheader('Content-Type', 'text/plain')
-        # See https://github.com/cherrypy/cherrypy/issues/941
-        c._output(b're, 1.2.3.4#015#012')
-        c.endheaders()
-
-        response = c.getresponse()
-        self.status = str(response.status)
-        self.assertStatus(400)
-        self.body = response.fp.read(20)
-        self.assertBody('Illegal header line.')
-
-        response.close()
-        c.close()
-
-    def test_http_over_https(self):
-        if self.scheme != 'https':
-            return self.skip('skipped (not running HTTPS)... ')
-
-        # Try connecting without SSL.
-        conn = HTTPConnection('%s:%s' % (self.interface(), self.PORT))
-        conn.putrequest('GET', '/', skip_host=True)
-        conn.putheader('Host', self.HOST)
-        conn.endheaders()
-        response = conn.response_class(conn.sock, method='GET')
-        try:
-            response.begin()
-            self.assertEqual(response.status, 400)
-            self.body = response.read()
-            self.assertBody('The client sent a plain HTTP request, but this '
-                            'server only speaks HTTPS on this port.')
-        except socket.error:
-            e = sys.exc_info()[1]
-            # "Connection reset by peer" is also acceptable.
-            if e.errno != errno.ECONNRESET:
-                raise
-
-    def test_garbage_in(self):
-        # Connect without SSL regardless of server.scheme
-        c = HTTPConnection('%s:%s' % (self.interface(), self.PORT))
-        c._output(b'gjkgjklsgjklsgjkljklsg')
-        c._send_output()
-        response = c.response_class(c.sock, method='GET')
-        try:
-            response.begin()
-            self.assertEqual(response.status, 400)
-            self.assertEqual(response.fp.read(22),
-                             b'Malformed Request-Line')
-            c.close()
-        except socket.error:
-            e = sys.exc_info()[1]
-            # "Connection reset by peer" is also acceptable.
-            if e.errno != errno.ECONNRESET:
-                raise
diff --git a/lib/cherrypy/test/test_httputil.py b/lib/cherrypy/test/test_httputil.py
deleted file mode 100644
index 84661424..00000000
--- a/lib/cherrypy/test/test_httputil.py
+++ /dev/null
@@ -1,81 +0,0 @@
-"""Test helpers from ``cherrypy.lib.httputil`` module."""
-import pytest
-import http.client
-
-from cherrypy.lib import httputil
-
-
-@pytest.mark.parametrize(
-    'script_name,path_info,expected_url',
-    [
-        ('/sn/', '/pi/', '/sn/pi/'),
-        ('/sn/', '/pi', '/sn/pi'),
-        ('/sn/', '/', '/sn/'),
-        ('/sn/', '', '/sn/'),
-        ('/sn', '/pi/', '/sn/pi/'),
-        ('/sn', '/pi', '/sn/pi'),
-        ('/sn', '/', '/sn/'),
-        ('/sn', '', '/sn'),
-        ('/', '/pi/', '/pi/'),
-        ('/', '/pi', '/pi'),
-        ('/', '/', '/'),
-        ('/', '', '/'),
-        ('', '/pi/', '/pi/'),
-        ('', '/pi', '/pi'),
-        ('', '/', '/'),
-        ('', '', '/'),
-    ]
-)
-def test_urljoin(script_name, path_info, expected_url):
-    """Test all slash+atom combinations for SCRIPT_NAME and PATH_INFO."""
-    actual_url = httputil.urljoin(script_name, path_info)
-    assert actual_url == expected_url
-
-
-EXPECTED_200 = (200, 'OK', 'Request fulfilled, document follows')
-EXPECTED_500 = (
-    500,
-    'Internal Server Error',
-    'The server encountered an unexpected condition which '
-    'prevented it from fulfilling the request.',
-)
-EXPECTED_404 = (404, 'Not Found', 'Nothing matches the given URI')
-EXPECTED_444 = (444, 'Non-existent reason', '')
-
-
-@pytest.mark.parametrize(
-    'status,expected_status',
-    [
-        (None, EXPECTED_200),
-        (200, EXPECTED_200),
-        ('500', EXPECTED_500),
-        (http.client.NOT_FOUND, EXPECTED_404),
-        ('444 Non-existent reason', EXPECTED_444),
-    ]
-)
-def test_valid_status(status, expected_status):
-    """Check valid int, string and http.client-constants
-    statuses processing."""
-    assert httputil.valid_status(status) == expected_status
-
-
-@pytest.mark.parametrize(
-    'status_code,error_msg',
-    [
-        (
-            'hey',
-            r"Illegal response status from server \('hey' is non-numeric\)."
-        ),
-        (
-            {'hey': 'hi'},
-            r'Illegal response status from server '
-            r"\(\{'hey': 'hi'\} is non-numeric\).",
-        ),
-        (1, r'Illegal response status from server \(1 is out of range\).'),
-        (600, r'Illegal response status from server \(600 is out of range\).'),
-    ]
-)
-def test_invalid_status(status_code, error_msg):
-    """Check that invalid status cause certain errors."""
-    with pytest.raises(ValueError, match=error_msg):
-        httputil.valid_status(status_code)
diff --git a/lib/cherrypy/test/test_iterator.py b/lib/cherrypy/test/test_iterator.py
deleted file mode 100644
index 5bad59be..00000000
--- a/lib/cherrypy/test/test_iterator.py
+++ /dev/null
@@ -1,196 +0,0 @@
-import cherrypy
-from cherrypy.test import helper
-
-
-class IteratorBase(object):
-
-    created = 0
-    datachunk = 'butternut squash' * 256
-
-    @classmethod
-    def incr(cls):
-        cls.created += 1
-
-    @classmethod
-    def decr(cls):
-        cls.created -= 1
-
-
-class OurGenerator(IteratorBase):
-
-    def __iter__(self):
-        self.incr()
-        try:
-            for i in range(1024):
-                yield self.datachunk
-        finally:
-            self.decr()
-
-
-class OurIterator(IteratorBase):
-
-    started = False
-    closed_off = False
-    count = 0
-
-    def increment(self):
-        self.incr()
-
-    def decrement(self):
-        if not self.closed_off:
-            self.closed_off = True
-            self.decr()
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        if not self.started:
-            self.started = True
-            self.increment()
-        self.count += 1
-        if self.count > 1024:
-            raise StopIteration
-        return self.datachunk
-
-    next = __next__
-
-    def __del__(self):
-        self.decrement()
-
-
-class OurClosableIterator(OurIterator):
-
-    def close(self):
-        self.decrement()
-
-
-class OurNotClosableIterator(OurIterator):
-
-    # We can't close something which requires an additional argument.
-    def close(self, somearg):
-        self.decrement()
-
-
-class OurUnclosableIterator(OurIterator):
-    close = 'close'  # not callable!
-
-
-class IteratorTest(helper.CPWebCase):
-
-    @staticmethod
-    def setup_server():
-
-        class Root(object):
-
-            @cherrypy.expose
-            def count(self, clsname):
-                cherrypy.response.headers['Content-Type'] = 'text/plain'
-                return str(globals()[clsname].created)
-
-            @cherrypy.expose
-            def getall(self, clsname):
-                cherrypy.response.headers['Content-Type'] = 'text/plain'
-                return globals()[clsname]()
-
-            @cherrypy.expose
-            @cherrypy.config(**{'response.stream': True})
-            def stream(self, clsname):
-                return self.getall(clsname)
-
-        cherrypy.tree.mount(Root())
-
-    def test_iterator(self):
-        try:
-            self._test_iterator()
-        except Exception:
-            'Test fails intermittently. See #1419'
-
-    def _test_iterator(self):
-        if cherrypy.server.protocol_version != 'HTTP/1.1':
-            return self.skip()
-
-        self.PROTOCOL = 'HTTP/1.1'
-
-        # Check the counts of all the classes, they should be zero.
-        closables = ['OurClosableIterator', 'OurGenerator']
-        unclosables = ['OurUnclosableIterator', 'OurNotClosableIterator']
-        all_classes = closables + unclosables
-
-        import random
-        random.shuffle(all_classes)
-
-        for clsname in all_classes:
-            self.getPage('/count/' + clsname)
-            self.assertStatus(200)
-            self.assertBody('0')
-
-        # We should also be able to read the entire content body
-        # successfully, though we don't need to, we just want to
-        # check the header.
-        for clsname in all_classes:
-            itr_conn = self.get_conn()
-            itr_conn.putrequest('GET', '/getall/' + clsname)
-            itr_conn.endheaders()
-            response = itr_conn.getresponse()
-            self.assertEqual(response.status, 200)
-            headers = response.getheaders()
-            for header_name, header_value in headers:
-                if header_name.lower() == 'content-length':
-                    expected = str(1024 * 16 * 256)
-                    assert header_value == expected, header_value
-                    break
-            else:
-                raise AssertionError('No Content-Length header found')
-
-            # As the response should be fully consumed by CherryPy
-            # before sending back, the count should still be at zero
-            # by the time the response has been sent.
-            self.getPage('/count/' + clsname)
-            self.assertStatus(200)
-            self.assertBody('0')
-
-            itr_conn.close()
-
-        # Now we do the same check with streaming - some classes will
-        # be automatically closed, while others cannot.
-        stream_counts = {}
-        for clsname in all_classes:
-            itr_conn = self.get_conn()
-            itr_conn.putrequest('GET', '/stream/' + clsname)
-            itr_conn.endheaders()
-            response = itr_conn.getresponse()
-            self.assertEqual(response.status, 200)
-            response.fp.read(65536)
-
-            # Let's check the count - this should always be one.
-            self.getPage('/count/' + clsname)
-            self.assertBody('1')
-
-            # Now if we close the connection, the count should go back
-            # to zero.
-            itr_conn.close()
-            self.getPage('/count/' + clsname)
-
-            # If this is a response which should be easily closed, then
-            # we will test to see if the value has gone back down to
-            # zero.
-            if clsname in closables:
-
-                # Sometimes we try to get the answer too quickly - we
-                # will wait for 100 ms before asking again if we didn't
-                # get the answer we wanted.
-                if self.body != '0':
-                    import time
-                    time.sleep(0.1)
-                    self.getPage('/count/' + clsname)
-
-            stream_counts[clsname] = int(self.body)
-
-        # Check that we closed off the classes which should provide
-        # easy mechanisms for doing so.
-        for clsname in closables:
-            assert stream_counts[clsname] == 0, (
-                'did not close off stream response correctly, expected '
-                'count of zero for %s: %s' % (clsname, stream_counts)
-            )
diff --git a/lib/cherrypy/test/test_json.py b/lib/cherrypy/test/test_json.py
deleted file mode 100644
index 4b8be548..00000000
--- a/lib/cherrypy/test/test_json.py
+++ /dev/null
@@ -1,101 +0,0 @@
-import cherrypy
-from cherrypy.test import helper
-from cherrypy._json import json
-
-
-json_out = cherrypy.config(**{'tools.json_out.on': True})
-json_in = cherrypy.config(**{'tools.json_in.on': True})
-
-
-class JsonTest(helper.CPWebCase):
-
-    @staticmethod
-    def setup_server():
-        class Root(object):
-
-            @cherrypy.expose
-            def plain(self):
-                return 'hello'
-
-            @cherrypy.expose
-            @json_out
-            def json_string(self):
-                return 'hello'
-
-            @cherrypy.expose
-            @json_out
-            def json_list(self):
-                return ['a', 'b', 42]
-
-            @cherrypy.expose
-            @json_out
-            def json_dict(self):
-                return {'answer': 42}
-
-            @cherrypy.expose
-            @json_in
-            def json_post(self):
-                if cherrypy.request.json == [13, 'c']:
-                    return 'ok'
-                else:
-                    return 'nok'
-
-            @cherrypy.expose
-            @json_out
-            @cherrypy.config(**{'tools.caching.on': True})
-            def json_cached(self):
-                return 'hello there'
-
-        root = Root()
-        cherrypy.tree.mount(root)
-
-    def test_json_output(self):
-        if json is None:
-            self.skip('json not found ')
-            return
-
-        self.getPage('/plain')
-        self.assertBody('hello')
-
-        self.getPage('/json_string')
-        self.assertBody('"hello"')
-
-        self.getPage('/json_list')
-        self.assertBody('["a", "b", 42]')
-
-        self.getPage('/json_dict')
-        self.assertBody('{"answer": 42}')
-
-    def test_json_input(self):
-        if json is None:
-            self.skip('json not found ')
-            return
-
-        body = '[13, "c"]'
-        headers = [('Content-Type', 'application/json'),
-                   ('Content-Length', str(len(body)))]
-        self.getPage('/json_post', method='POST', headers=headers, body=body)
-        self.assertBody('ok')
-
-        body = '[13, "c"]'
-        headers = [('Content-Type', 'text/plain'),
-                   ('Content-Length', str(len(body)))]
-        self.getPage('/json_post', method='POST', headers=headers, body=body)
-        self.assertStatus(415, 'Expected an application/json content type')
-
-        body = '[13, -]'
-        headers = [('Content-Type', 'application/json'),
-                   ('Content-Length', str(len(body)))]
-        self.getPage('/json_post', method='POST', headers=headers, body=body)
-        self.assertStatus(400, 'Invalid JSON document')
-
-    def test_cached(self):
-        if json is None:
-            self.skip('json not found ')
-            return
-
-        self.getPage('/json_cached')
-        self.assertStatus(200, '"hello"')
-
-        self.getPage('/json_cached')  # 2'nd time to hit cache
-        self.assertStatus(200, '"hello"')
diff --git a/lib/cherrypy/test/test_logging.py b/lib/cherrypy/test/test_logging.py
deleted file mode 100644
index 05203926..00000000
--- a/lib/cherrypy/test/test_logging.py
+++ /dev/null
@@ -1,316 +0,0 @@
-"""Basic tests for the CherryPy core: request handling."""
-
-import datetime
-import logging
-
-from cheroot.test import webtest
-import pytest
-import requests  # FIXME: Temporary using it directly, better switch
-
-import cherrypy
-from cherrypy.test.logtest import LogCase
-
-
-# Some unicode strings.
-tartaros = u'\u03a4\u1f71\u03c1\u03c4\u03b1\u03c1\u03bf\u03c2'
-erebos = u'\u0388\u03c1\u03b5\u03b2\u03bf\u03c2.com'
-
-
-@pytest.fixture
-def access_log_file(tmp_path_factory):
-    return tmp_path_factory.mktemp('logs') / 'access.log'
-
-
-@pytest.fixture
-def error_log_file(tmp_path_factory):
-    return tmp_path_factory.mktemp('logs') / 'access.log'
-
-
-@pytest.fixture
-def server(configure_server):
-    cherrypy.engine.start()
-    cherrypy.engine.wait(cherrypy.engine.states.STARTED)
-
-    yield
-
-    shutdown_server()
-
-
-def shutdown_server():
-    cherrypy.engine.exit()
-    cherrypy.engine.block()
-
-    for name, server in getattr(cherrypy, 'servers', {}).copy().items():
-        server.unsubscribe()
-        del cherrypy.servers[name]
-
-
-@pytest.fixture
-def configure_server(access_log_file, error_log_file):
-    class Root:
-
-        @cherrypy.expose
-        def index(self):
-            return 'hello'
-
-        @cherrypy.expose
-        def uni_code(self):
-            cherrypy.request.login = tartaros
-            cherrypy.request.remote.name = erebos
-
-        @cherrypy.expose
-        def slashes(self):
-            cherrypy.request.request_line = r'GET /slashed\path HTTP/1.1'
-
-        @cherrypy.expose
-        def whitespace(self):
-            # User-Agent = "User-Agent" ":" 1*( product | comment )
-            # comment    = "(" *( ctext | quoted-pair | comment ) ")"
-            # ctext      = <any TEXT excluding "(" and ")">
-            # TEXT       = <any OCTET except CTLs, but including LWS>
-            # LWS        = [CRLF] 1*( SP | HT )
-            cherrypy.request.headers['User-Agent'] = 'Browzuh (1.0\r\n\t\t.3)'
-
-        @cherrypy.expose
-        def as_string(self):
-            return 'content'
-
-        @cherrypy.expose
-        def as_yield(self):
-            yield 'content'
-
-        @cherrypy.expose
-        @cherrypy.config(**{'tools.log_tracebacks.on': True})
-        def error(self):
-            raise ValueError()
-
-    root = Root()
-
-    cherrypy.config.reset()
-    cherrypy.config.update({
-        'server.socket_host': webtest.WebCase.HOST,
-        'server.socket_port': webtest.WebCase.PORT,
-        'server.protocol_version': webtest.WebCase.PROTOCOL,
-        'environment': 'test_suite',
-    })
-    cherrypy.config.update({
-        'log.error_file': str(error_log_file),
-        'log.access_file': str(access_log_file),
-    })
-    cherrypy.tree.mount(root)
-
-
-@pytest.fixture
-def log_tracker(access_log_file):
-    class LogTracker(LogCase):
-        logfile = str(access_log_file)
-    return LogTracker()
-
-
-def test_normal_return(log_tracker, server):
-    log_tracker.markLog()
-    host = webtest.interface(webtest.WebCase.HOST)
-    port = webtest.WebCase.PORT
-    resp = requests.get(
-        'http://%s:%s/as_string' % (host, port),
-        headers={
-            'Referer': 'http://www.cherrypy.dev/',
-            'User-Agent': 'Mozilla/5.0',
-        },
-    )
-    expected_body = 'content'
-    assert resp.text == expected_body
-    assert resp.status_code == 200
-
-    intro = '%s - - [' % host
-
-    log_tracker.assertLog(-1, intro)
-
-    content_length = len(expected_body)
-    if not any(
-            k for k, v in resp.headers.items()
-            if k.lower() == 'content-length'
-    ):
-        content_length = '-'
-
-    log_tracker.assertLog(
-        -1,
-        '] "GET /as_string HTTP/1.1" 200 %s '
-        '"http://www.cherrypy.dev/" "Mozilla/5.0"'
-        % content_length,
-    )
-
-
-def test_normal_yield(log_tracker, server):
-    log_tracker.markLog()
-    host = webtest.interface(webtest.WebCase.HOST)
-    port = webtest.WebCase.PORT
-    resp = requests.get(
-        'http://%s:%s/as_yield' % (host, port),
-        headers={
-            'User-Agent': '',
-        },
-    )
-    expected_body = 'content'
-    assert resp.text == expected_body
-    assert resp.status_code == 200
-
-    intro = '%s - - [' % host
-
-    log_tracker.assertLog(-1, intro)
-    content_length = len(expected_body)
-    if not any(
-            k for k, v in resp.headers.items()
-            if k.lower() == 'content-length'
-    ):
-        content_length = '-'
-
-    log_tracker.assertLog(
-        -1,
-        '] "GET /as_yield HTTP/1.1" 200 %s "" ""'
-        % content_length,
-    )
-
-
-def test_custom_log_format(log_tracker, monkeypatch, server):
-    """Test a customized access_log_format string, which is a
-    feature of _cplogging.LogManager.access()."""
-    monkeypatch.setattr(
-        'cherrypy._cplogging.LogManager.access_log_format',
-        '{h} {l} {u} {t} "{r}" {s} {b} "{f}" "{a}" {o}',
-    )
-    log_tracker.markLog()
-    host = webtest.interface(webtest.WebCase.HOST)
-    port = webtest.WebCase.PORT
-    requests.get(
-        'http://%s:%s/as_string' % (host, port),
-        headers={
-            'Referer': 'REFERER',
-            'User-Agent': 'USERAGENT',
-            'Host': 'HOST',
-        },
-    )
-    log_tracker.assertLog(-1, '%s - - [' % host)
-    log_tracker.assertLog(
-        -1,
-        '] "GET /as_string HTTP/1.1" '
-        '200 7 "REFERER" "USERAGENT" HOST',
-    )
-
-
-def test_utc_in_timez(monkeypatch):
-    """Test ``LazyRfc3339UtcTime`` renders as ``str`` UTC timestamp."""
-    utcoffset8_local_time_in_naive_utc = (
-        datetime.datetime(
-            year=2020,
-            month=1,
-            day=1,
-            hour=1,
-            minute=23,
-            second=45,
-            tzinfo=datetime.timezone(datetime.timedelta(hours=8)),
-        )
-        .astimezone(datetime.timezone.utc)
-        .replace(tzinfo=None)
-    )
-
-    class mock_datetime:
-        @classmethod
-        def now(cls, tz):
-            return utcoffset8_local_time_in_naive_utc
-
-    monkeypatch.setattr('datetime.datetime', mock_datetime)
-    rfc3339_utc_time = str(cherrypy._cplogging.LazyRfc3339UtcTime())
-    expected_time = '2019-12-31T17:23:45Z'
-    assert rfc3339_utc_time == expected_time
-
-
-def test_timez_log_format(log_tracker, monkeypatch, server):
-    """Test a customized access_log_format string, which is a
-    feature of _cplogging.LogManager.access()."""
-    monkeypatch.setattr(
-        'cherrypy._cplogging.LogManager.access_log_format',
-        '{h} {l} {u} {z} "{r}" {s} {b} "{f}" "{a}" {o}',
-    )
-    log_tracker.markLog()
-
-    expected_time = str(cherrypy._cplogging.LazyRfc3339UtcTime())
-    monkeypatch.setattr(
-        'cherrypy._cplogging.LazyRfc3339UtcTime',
-        lambda: expected_time,
-    )
-    host = webtest.interface(webtest.WebCase.HOST)
-    port = webtest.WebCase.PORT
-    requests.get(
-        'http://%s:%s/as_string' % (host, port),
-        headers={
-            'Referer': 'REFERER',
-            'User-Agent': 'USERAGENT',
-            'Host': 'HOST',
-        },
-    )
-
-    log_tracker.assertLog(-1, '%s - - ' % host)
-    log_tracker.assertLog(-1, expected_time)
-    log_tracker.assertLog(
-        -1,
-        ' "GET /as_string HTTP/1.1" '
-        '200 7 "REFERER" "USERAGENT" HOST',
-    )
-
-
-def test_UUIDv4_parameter_log_format(log_tracker, monkeypatch, server):
-    """Test rendering of UUID4 within access log."""
-    monkeypatch.setattr(
-        'cherrypy._cplogging.LogManager.access_log_format',
-        '{i}',
-    )
-    log_tracker.markLog()
-    host = webtest.interface(webtest.WebCase.HOST)
-    port = webtest.WebCase.PORT
-    requests.get('http://%s:%s/as_string' % (host, port))
-    log_tracker.assertValidUUIDv4()
-
-
-def test_escaped_output(log_tracker, server):
-    # Test unicode in access log pieces.
-    log_tracker.markLog()
-    host = webtest.interface(webtest.WebCase.HOST)
-    port = webtest.WebCase.PORT
-    resp = requests.get('http://%s:%s/uni_code' % (host, port))
-    assert resp.status_code == 200
-    # The repr of a bytestring includes a b'' prefix
-    log_tracker.assertLog(-1, repr(tartaros.encode('utf8'))[2:-1])
-    # Test the erebos value. Included inline for your enlightenment.
-    # Note the 'r' prefix--those backslashes are literals.
-    log_tracker.assertLog(
-        -1,
-        r'\xce\x88\xcf\x81\xce\xb5\xce\xb2\xce\xbf\xcf\x82',
-    )
-
-    # Test backslashes in output.
-    log_tracker.markLog()
-    resp = requests.get('http://%s:%s/slashes' % (host, port))
-    assert resp.status_code == 200
-    log_tracker.assertLog(-1, b'"GET /slashed\\path HTTP/1.1"')
-
-    # Test whitespace in output.
-    log_tracker.markLog()
-    resp = requests.get('http://%s:%s/whitespace' % (host, port))
-    assert resp.status_code == 200
-    # Again, note the 'r' prefix.
-    log_tracker.assertLog(-1, r'"Browzuh (1.0\r\n\t\t.3)"')
-
-
-def test_tracebacks(server, caplog):
-    host = webtest.interface(webtest.WebCase.HOST)
-    port = webtest.WebCase.PORT
-    with caplog.at_level(logging.ERROR, logger='cherrypy.error'):
-        resp = requests.get('http://%s:%s/error' % (host, port))
-
-    rec = caplog.records[0]
-    exc_cls, exc_msg = rec.exc_info[0], rec.message
-
-    assert 'raise ValueError()' in resp.text
-    assert 'HTTP' in exc_msg
-    assert exc_cls is ValueError
diff --git a/lib/cherrypy/test/test_mime.py b/lib/cherrypy/test/test_mime.py
deleted file mode 100644
index ef35d10e..00000000
--- a/lib/cherrypy/test/test_mime.py
+++ /dev/null
@@ -1,134 +0,0 @@
-"""Tests for various MIME issues, including the safe_multipart Tool."""
-
-import cherrypy
-from cherrypy._cpcompat import ntou
-from cherrypy.test import helper
-
-
-def setup_server():
-
-    class Root:
-
-        @cherrypy.expose
-        def multipart(self, parts):
-            return repr(parts)
-
-        @cherrypy.expose
-        def multipart_form_data(self, **kwargs):
-            return repr(list(sorted(kwargs.items())))
-
-        @cherrypy.expose
-        def flashupload(self, Filedata, Upload, Filename):
-            return ('Upload: %s, Filename: %s, Filedata: %r' %
-                    (Upload, Filename, Filedata.file.read()))
-
-    cherrypy.config.update({'server.max_request_body_size': 0})
-    cherrypy.tree.mount(Root())
-
-
-#                             Client-side code                             #
-
-
-class MultipartTest(helper.CPWebCase):
-    setup_server = staticmethod(setup_server)
-
-    def test_multipart(self):
-        text_part = ntou('This is the text version')
-        html_part = ntou(
-            """<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
- <meta content="text/html;charset=ISO-8859-1" http-equiv="Content-Type">
-</head>
-<body bgcolor="#ffffff" text="#000000">
-
-This is the <strong>HTML</strong> version
-</body>
-</html>
-""")
-        body = '\r\n'.join([
-            '--123456789',
-            "Content-Type: text/plain; charset='ISO-8859-1'",
-            'Content-Transfer-Encoding: 7bit',
-            '',
-            text_part,
-            '--123456789',
-            "Content-Type: text/html; charset='ISO-8859-1'",
-            '',
-            html_part,
-            '--123456789--'])
-        headers = [
-            ('Content-Type', 'multipart/mixed; boundary=123456789'),
-            ('Content-Length', str(len(body))),
-        ]
-        self.getPage('/multipart', headers, 'POST', body)
-        self.assertBody(repr([text_part, html_part]))
-
-    def test_multipart_form_data(self):
-        body = '\r\n'.join([
-            '--X',
-            'Content-Disposition: form-data; name="foo"',
-            '',
-            'bar',
-            '--X',
-            # Test a param with more than one value.
-            # See
-            # https://github.com/cherrypy/cherrypy/issues/1028
-            'Content-Disposition: form-data; name="baz"',
-            '',
-            '111',
-            '--X',
-            'Content-Disposition: form-data; name="baz"',
-            '',
-            '333',
-            '--X--'
-        ])
-        self.getPage('/multipart_form_data', method='POST',
-                     headers=[(
-                         'Content-Type', 'multipart/form-data;boundary=X'),
-                         ('Content-Length', str(len(body))),
-                     ],
-                     body=body),
-        self.assertBody(
-            repr([('baz', [ntou('111'), ntou('333')]), ('foo', ntou('bar'))]))
-
-
-class SafeMultipartHandlingTest(helper.CPWebCase):
-    setup_server = staticmethod(setup_server)
-
-    def test_Flash_Upload(self):
-        headers = [
-            ('Accept', 'text/*'),
-            ('Content-Type', 'multipart/form-data; '
-             'boundary=----------KM7Ij5cH2KM7Ef1gL6ae0ae0cH2gL6'),
-            ('User-Agent', 'Shockwave Flash'),
-            ('Host', 'www.example.com:54583'),
-            ('Content-Length', '499'),
-            ('Connection', 'Keep-Alive'),
-            ('Cache-Control', 'no-cache'),
-        ]
-        filedata = (b'<?xml version="1.0" encoding="UTF-8"?>\r\n'
-                    b'<projectDescription>\r\n'
-                    b'</projectDescription>\r\n')
-        body = (
-            b'------------KM7Ij5cH2KM7Ef1gL6ae0ae0cH2gL6\r\n'
-            b'Content-Disposition: form-data; name="Filename"\r\n'
-            b'\r\n'
-            b'.project\r\n'
-            b'------------KM7Ij5cH2KM7Ef1gL6ae0ae0cH2gL6\r\n'
-            b'Content-Disposition: form-data; '
-            b'name="Filedata"; filename=".project"\r\n'
-            b'Content-Type: application/octet-stream\r\n'
-            b'\r\n' +
-            filedata +
-            b'\r\n'
-            b'------------KM7Ij5cH2KM7Ef1gL6ae0ae0cH2gL6\r\n'
-            b'Content-Disposition: form-data; name="Upload"\r\n'
-            b'\r\n'
-            b'Submit Query\r\n'
-            # Flash apps omit the trailing \r\n on the last line:
-            b'------------KM7Ij5cH2KM7Ef1gL6ae0ae0cH2gL6--'
-        )
-        self.getPage('/flashupload', headers, 'POST', body)
-        self.assertBody('Upload: Submit Query, Filename: .project, '
-                        'Filedata: %r' % filedata)
diff --git a/lib/cherrypy/test/test_misc_tools.py b/lib/cherrypy/test/test_misc_tools.py
deleted file mode 100644
index fb85b8f8..00000000
--- a/lib/cherrypy/test/test_misc_tools.py
+++ /dev/null
@@ -1,210 +0,0 @@
-import os
-
-import cherrypy
-from cherrypy import tools
-from cherrypy.test import helper
-
-
-localDir = os.path.dirname(__file__)
-logfile = os.path.join(localDir, 'test_misc_tools.log')
-
-
-def setup_server():
-    class Root:
-
-        @cherrypy.expose
-        def index(self):
-            yield 'Hello, world'
-        h = [('Content-Language', 'en-GB'), ('Content-Type', 'text/plain')]
-        tools.response_headers(headers=h)(index)
-
-        @cherrypy.expose
-        @cherrypy.config(**{
-            'tools.response_headers.on': True,
-            'tools.response_headers.headers': [
-                ('Content-Language', 'fr'),
-                ('Content-Type', 'text/plain'),
-            ],
-            'tools.log_hooks.on': True,
-        })
-        def other(self):
-            return 'salut'
-
-    @cherrypy.config(**{'tools.accept.on': True})
-    class Accept:
-
-        @cherrypy.expose
-        def index(self):
-            return '<a href="feed">Atom feed</a>'
-
-        @cherrypy.expose
-        @tools.accept(media='application/atom+xml')
-        def feed(self):
-            return """<?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom">
-    <title>Unknown Blog</title>
-</feed>"""
-
-        @cherrypy.expose
-        def select(self):
-            # We could also write this: mtype = cherrypy.lib.accept.accept(...)
-            mtype = tools.accept.callable(['text/html', 'text/plain'])
-            if mtype == 'text/html':
-                return '<h2>Page Title</h2>'
-            else:
-                return 'PAGE TITLE'
-
-    class Referer:
-
-        @cherrypy.expose
-        def accept(self):
-            return 'Accepted!'
-        reject = accept
-
-    class AutoVary:
-
-        @cherrypy.expose
-        def index(self):
-            # Read a header directly with 'get'
-            cherrypy.request.headers.get('Accept-Encoding')
-            # Read a header directly with '__getitem__'
-            cherrypy.request.headers['Host']
-            # Read a header directly with '__contains__'
-            'If-Modified-Since' in cherrypy.request.headers
-            # Read a header directly
-            'Range' in cherrypy.request.headers
-            # Call a lib function
-            tools.accept.callable(['text/html', 'text/plain'])
-            return 'Hello, world!'
-
-    conf = {'/referer': {'tools.referer.on': True,
-                         'tools.referer.pattern': r'http://[^/]*example\.com',
-                         },
-            '/referer/reject': {'tools.referer.accept': False,
-                                'tools.referer.accept_missing': True,
-                                },
-            '/autovary': {'tools.autovary.on': True},
-            }
-
-    root = Root()
-    root.referer = Referer()
-    root.accept = Accept()
-    root.autovary = AutoVary()
-    cherrypy.tree.mount(root, config=conf)
-    cherrypy.config.update({'log.error_file': logfile})
-
-
-class ResponseHeadersTest(helper.CPWebCase):
-    setup_server = staticmethod(setup_server)
-
-    def testResponseHeadersDecorator(self):
-        self.getPage('/')
-        self.assertHeader('Content-Language', 'en-GB')
-        self.assertHeader('Content-Type', 'text/plain;charset=utf-8')
-
-    def testResponseHeaders(self):
-        self.getPage('/other')
-        self.assertHeader('Content-Language', 'fr')
-        self.assertHeader('Content-Type', 'text/plain;charset=utf-8')
-
-
-class RefererTest(helper.CPWebCase):
-    setup_server = staticmethod(setup_server)
-
-    def testReferer(self):
-        self.getPage('/referer/accept')
-        self.assertErrorPage(403, 'Forbidden Referer header.')
-
-        self.getPage('/referer/accept',
-                     headers=[('Referer', 'http://www.example.com/')])
-        self.assertStatus(200)
-        self.assertBody('Accepted!')
-
-        # Reject
-        self.getPage('/referer/reject')
-        self.assertStatus(200)
-        self.assertBody('Accepted!')
-
-        self.getPage('/referer/reject',
-                     headers=[('Referer', 'http://www.example.com/')])
-        self.assertErrorPage(403, 'Forbidden Referer header.')
-
-
-class AcceptTest(helper.CPWebCase):
-    setup_server = staticmethod(setup_server)
-
-    def test_Accept_Tool(self):
-        # Test with no header provided
-        self.getPage('/accept/feed')
-        self.assertStatus(200)
-        self.assertInBody('<title>Unknown Blog</title>')
-
-        # Specify exact media type
-        self.getPage('/accept/feed',
-                     headers=[('Accept', 'application/atom+xml')])
-        self.assertStatus(200)
-        self.assertInBody('<title>Unknown Blog</title>')
-
-        # Specify matching media range
-        self.getPage('/accept/feed', headers=[('Accept', 'application/*')])
-        self.assertStatus(200)
-        self.assertInBody('<title>Unknown Blog</title>')
-
-        # Specify all media ranges
-        self.getPage('/accept/feed', headers=[('Accept', '*/*')])
-        self.assertStatus(200)
-        self.assertInBody('<title>Unknown Blog</title>')
-
-        # Specify unacceptable media types
-        self.getPage('/accept/feed', headers=[('Accept', 'text/html')])
-        self.assertErrorPage(406,
-                             'Your client sent this Accept header: text/html. '
-                             'But this resource only emits these media types: '
-                             'application/atom+xml.')
-
-        # Test resource where tool is 'on' but media is None (not set).
-        self.getPage('/accept/')
-        self.assertStatus(200)
-        self.assertBody('<a href="feed">Atom feed</a>')
-
-    def test_accept_selection(self):
-        # Try both our expected media types
-        self.getPage('/accept/select', [('Accept', 'text/html')])
-        self.assertStatus(200)
-        self.assertBody('<h2>Page Title</h2>')
-        self.getPage('/accept/select', [('Accept', 'text/plain')])
-        self.assertStatus(200)
-        self.assertBody('PAGE TITLE')
-        self.getPage('/accept/select',
-                     [('Accept', 'text/plain, text/*;q=0.5')])
-        self.assertStatus(200)
-        self.assertBody('PAGE TITLE')
-
-        # text/* and */* should prefer text/html since it comes first
-        # in our 'media' argument to tools.accept
-        self.getPage('/accept/select', [('Accept', 'text/*')])
-        self.assertStatus(200)
-        self.assertBody('<h2>Page Title</h2>')
-        self.getPage('/accept/select', [('Accept', '*/*')])
-        self.assertStatus(200)
-        self.assertBody('<h2>Page Title</h2>')
-
-        # Try unacceptable media types
-        self.getPage('/accept/select', [('Accept', 'application/xml')])
-        self.assertErrorPage(
-            406,
-            'Your client sent this Accept header: application/xml. '
-            'But this resource only emits these media types: '
-            'text/html, text/plain.')
-
-
-class AutoVaryTest(helper.CPWebCase):
-    setup_server = staticmethod(setup_server)
-
-    def testAutoVary(self):
-        self.getPage('/autovary/')
-        self.assertHeader(
-            'Vary',
-            'Accept, Accept-Charset, Accept-Encoding, '
-            'Host, If-Modified-Since, Range'
-        )
diff --git a/lib/cherrypy/test/test_native.py b/lib/cherrypy/test/test_native.py
deleted file mode 100644
index 08bf9997..00000000
--- a/lib/cherrypy/test/test_native.py
+++ /dev/null
@@ -1,38 +0,0 @@
-"""Test the native server."""
-
-import pytest
-from requests_toolbelt import sessions
-
-import cherrypy._cpnative_server
-
-
-pytestmark = pytest.mark.skipif(
-    'sys.platform == "win32"',
-    reason='tests fail on Windows',
-)
-
-
-@pytest.fixture
-def cp_native_server(request):
-    """A native server."""
-    class Root(object):
-        @cherrypy.expose
-        def index(self):
-            return 'Hello World!'
-
-    cls = cherrypy._cpnative_server.CPHTTPServer
-    cherrypy.server.httpserver = cls(cherrypy.server)
-
-    cherrypy.tree.mount(Root(), '/')
-    cherrypy.engine.start()
-    request.addfinalizer(cherrypy.engine.stop)
-    url = 'http://localhost:{cherrypy.server.socket_port}'.format(**globals())
-    return sessions.BaseUrlSession(url)
-
-
-def test_basic_request(cp_native_server):
-    """A request to a native server should succeed."""
-    resp = cp_native_server.get('/')
-    assert resp.ok
-    assert resp.status_code == 200
-    assert resp.text == 'Hello World!'
diff --git a/lib/cherrypy/test/test_objectmapping.py b/lib/cherrypy/test/test_objectmapping.py
deleted file mode 100644
index 98402b8b..00000000
--- a/lib/cherrypy/test/test_objectmapping.py
+++ /dev/null
@@ -1,430 +0,0 @@
-import sys
-import cherrypy
-from cherrypy._cpcompat import ntou
-from cherrypy._cptree import Application
-from cherrypy.test import helper
-
-script_names = ['', '/foo', '/users/fred/blog', '/corp/blog']
-
-
-class ObjectMappingTest(helper.CPWebCase):
-
-    @staticmethod
-    def setup_server():
-        class Root:
-
-            @cherrypy.expose
-            def index(self, name='world'):
-                return name
-
-            @cherrypy.expose
-            def foobar(self):
-                return 'bar'
-
-            @cherrypy.expose
-            def default(self, *params, **kwargs):
-                return 'default:' + repr(params)
-
-            @cherrypy.expose
-            def other(self):
-                return 'other'
-
-            @cherrypy.expose
-            def extra(self, *p):
-                return repr(p)
-
-            @cherrypy.expose
-            def redirect(self):
-                raise cherrypy.HTTPRedirect('dir1/', 302)
-
-            def notExposed(self):
-                return 'not exposed'
-
-            @cherrypy.expose
-            def confvalue(self):
-                return cherrypy.request.config.get('user')
-
-            @cherrypy.expose
-            def redirect_via_url(self, path):
-                raise cherrypy.HTTPRedirect(cherrypy.url(path))
-
-            @cherrypy.expose
-            def translate_html(self):
-                return 'OK'
-
-        @cherrypy.expose
-        def mapped_func(self, ID=None):
-            return 'ID is %s' % ID
-        setattr(Root, 'Von B\xfclow', mapped_func)
-
-        class Exposing:
-
-            @cherrypy.expose
-            def base(self):
-                return 'expose works!'
-            cherrypy.expose(base, '1')
-            cherrypy.expose(base, '2')
-
-        class ExposingNewStyle(object):
-
-            @cherrypy.expose
-            def base(self):
-                return 'expose works!'
-            cherrypy.expose(base, '1')
-            cherrypy.expose(base, '2')
-
-        class Dir1:
-
-            @cherrypy.expose
-            def index(self):
-                return 'index for dir1'
-
-            @cherrypy.expose
-            @cherrypy.config(**{'tools.trailing_slash.extra': True})
-            def myMethod(self):
-                return 'myMethod from dir1, path_info is:' + repr(
-                    cherrypy.request.path_info)
-
-            @cherrypy.expose
-            def default(self, *params):
-                return 'default for dir1, param is:' + repr(params)
-
-        class Dir2:
-
-            @cherrypy.expose
-            def index(self):
-                return 'index for dir2, path is:' + cherrypy.request.path_info
-
-            @cherrypy.expose
-            def script_name(self):
-                return cherrypy.tree.script_name()
-
-            @cherrypy.expose
-            def cherrypy_url(self):
-                return cherrypy.url('/extra')
-
-            @cherrypy.expose
-            def posparam(self, *vpath):
-                return '/'.join(vpath)
-
-        class Dir3:
-
-            def default(self):
-                return 'default for dir3, not exposed'
-
-        class Dir4:
-
-            def index(self):
-                return 'index for dir4, not exposed'
-
-        class DefNoIndex:
-
-            @cherrypy.expose
-            def default(self, *args):
-                raise cherrypy.HTTPRedirect('contact')
-
-        # MethodDispatcher code
-        @cherrypy.expose
-        class ByMethod:
-
-            def __init__(self, *things):
-                self.things = list(things)
-
-            def GET(self):
-                return repr(self.things)
-
-            def POST(self, thing):
-                self.things.append(thing)
-
-        class Collection:
-            default = ByMethod('a', 'bit')
-
-        Root.exposing = Exposing()
-        Root.exposingnew = ExposingNewStyle()
-        Root.dir1 = Dir1()
-        Root.dir1.dir2 = Dir2()
-        Root.dir1.dir2.dir3 = Dir3()
-        Root.dir1.dir2.dir3.dir4 = Dir4()
-        Root.defnoindex = DefNoIndex()
-        Root.bymethod = ByMethod('another')
-        Root.collection = Collection()
-
-        d = cherrypy.dispatch.MethodDispatcher()
-        for url in script_names:
-            conf = {'/': {'user': (url or '/').split('/')[-2]},
-                    '/bymethod': {'request.dispatch': d},
-                    '/collection': {'request.dispatch': d},
-                    }
-            cherrypy.tree.mount(Root(), url, conf)
-
-        class Isolated:
-
-            @cherrypy.expose
-            def index(self):
-                return 'made it!'
-
-        cherrypy.tree.mount(Isolated(), '/isolated')
-
-        @cherrypy.expose
-        class AnotherApp:
-
-            def GET(self):
-                return 'milk'
-
-        cherrypy.tree.mount(AnotherApp(), '/app',
-                            {'/': {'request.dispatch': d}})
-
-    def testObjectMapping(self):
-        for url in script_names:
-            self.script_name = url
-
-            self.getPage('/')
-            self.assertBody('world')
-
-            self.getPage('/dir1/myMethod')
-            self.assertBody(
-                "myMethod from dir1, path_info is:'/dir1/myMethod'")
-
-            self.getPage('/this/method/does/not/exist')
-            self.assertBody(
-                "default:('this', 'method', 'does', 'not', 'exist')")
-
-            self.getPage('/extra/too/much')
-            self.assertBody("('too', 'much')")
-
-            self.getPage('/other')
-            self.assertBody('other')
-
-            self.getPage('/notExposed')
-            self.assertBody("default:('notExposed',)")
-
-            self.getPage('/dir1/dir2/')
-            self.assertBody('index for dir2, path is:/dir1/dir2/')
-
-            # Test omitted trailing slash (should be redirected by default).
-            self.getPage('/dir1/dir2')
-            self.assertStatus(301)
-            self.assertHeader('Location', '%s/dir1/dir2/' % self.base())
-
-            # Test extra trailing slash (should be redirected if configured).
-            self.getPage('/dir1/myMethod/')
-            self.assertStatus(301)
-            self.assertHeader('Location', '%s/dir1/myMethod' % self.base())
-
-            # Test that default method must be exposed in order to match.
-            self.getPage('/dir1/dir2/dir3/dir4/index')
-            self.assertBody(
-                "default for dir1, param is:('dir2', 'dir3', 'dir4', 'index')")
-
-            # Test *vpath when default() is defined but not index()
-            # This also tests HTTPRedirect with default.
-            self.getPage('/defnoindex')
-            self.assertStatus((302, 303))
-            self.assertHeader('Location', '%s/contact' % self.base())
-            self.getPage('/defnoindex/')
-            self.assertStatus((302, 303))
-            self.assertHeader('Location', '%s/defnoindex/contact' %
-                              self.base())
-            self.getPage('/defnoindex/page')
-            self.assertStatus((302, 303))
-            self.assertHeader('Location', '%s/defnoindex/contact' %
-                              self.base())
-
-            self.getPage('/redirect')
-            self.assertStatus('302 Found')
-            self.assertHeader('Location', '%s/dir1/' % self.base())
-
-            if not getattr(cherrypy.server, 'using_apache', False):
-                # Test that we can use URL's which aren't all valid Python
-                # identifiers
-                # This should also test the %XX-unquoting of URL's.
-                self.getPage('/Von%20B%fclow?ID=14')
-                self.assertBody('ID is 14')
-
-                # Test that %2F in the path doesn't get unquoted too early;
-                # that is, it should not be used to separate path components.
-                # See ticket #393.
-                self.getPage('/page%2Fname')
-                self.assertBody("default:('page/name',)")
-
-            self.getPage('/dir1/dir2/script_name')
-            self.assertBody(url)
-            self.getPage('/dir1/dir2/cherrypy_url')
-            self.assertBody('%s/extra' % self.base())
-
-            # Test that configs don't overwrite each other from different apps
-            self.getPage('/confvalue')
-            self.assertBody((url or '/').split('/')[-2])
-
-        self.script_name = ''
-
-        # Test absoluteURI's in the Request-Line
-        self.getPage('http://%s:%s/' % (self.interface(), self.PORT))
-        self.assertBody('world')
-
-        self.getPage('http://%s:%s/abs/?service=http://192.168.0.1/x/y/z' %
-                     (self.interface(), self.PORT))
-        self.assertBody("default:('abs',)")
-
-        self.getPage('/rel/?service=http://192.168.120.121:8000/x/y/z')
-        self.assertBody("default:('rel',)")
-
-        # Test that the "isolated" app doesn't leak url's into the root app.
-        # If it did leak, Root.default() would answer with
-        #   "default:('isolated', 'doesnt', 'exist')".
-        self.getPage('/isolated/')
-        self.assertStatus('200 OK')
-        self.assertBody('made it!')
-        self.getPage('/isolated/doesnt/exist')
-        self.assertStatus('404 Not Found')
-
-        # Make sure /foobar maps to Root.foobar and not to the app
-        # mounted at /foo. See
-        # https://github.com/cherrypy/cherrypy/issues/573
-        self.getPage('/foobar')
-        self.assertBody('bar')
-
-    def test_translate(self):
-        self.getPage('/translate_html')
-        self.assertStatus('200 OK')
-        self.assertBody('OK')
-
-        self.getPage('/translate.html')
-        self.assertStatus('200 OK')
-        self.assertBody('OK')
-
-        self.getPage('/translate-html')
-        self.assertStatus('200 OK')
-        self.assertBody('OK')
-
-    def test_redir_using_url(self):
-        for url in script_names:
-            self.script_name = url
-
-            # Test the absolute path to the parent (leading slash)
-            self.getPage('/redirect_via_url?path=./')
-            self.assertStatus(('302 Found', '303 See Other'))
-            self.assertHeader('Location', '%s/' % self.base())
-
-            # Test the relative path to the parent (no leading slash)
-            self.getPage('/redirect_via_url?path=./')
-            self.assertStatus(('302 Found', '303 See Other'))
-            self.assertHeader('Location', '%s/' % self.base())
-
-            # Test the absolute path to the parent (leading slash)
-            self.getPage('/redirect_via_url/?path=./')
-            self.assertStatus(('302 Found', '303 See Other'))
-            self.assertHeader('Location', '%s/' % self.base())
-
-            # Test the relative path to the parent (no leading slash)
-            self.getPage('/redirect_via_url/?path=./')
-            self.assertStatus(('302 Found', '303 See Other'))
-            self.assertHeader('Location', '%s/' % self.base())
-
-    def testPositionalParams(self):
-        self.getPage('/dir1/dir2/posparam/18/24/hut/hike')
-        self.assertBody('18/24/hut/hike')
-
-        # intermediate index methods should not receive posparams;
-        # only the "final" index method should do so.
-        self.getPage('/dir1/dir2/5/3/sir')
-        self.assertBody("default for dir1, param is:('dir2', '5', '3', 'sir')")
-
-        # test that extra positional args raises an 404 Not Found
-        # See https://github.com/cherrypy/cherrypy/issues/733.
-        self.getPage('/dir1/dir2/script_name/extra/stuff')
-        self.assertStatus(404)
-
-    def testExpose(self):
-        # Test the cherrypy.expose function/decorator
-        self.getPage('/exposing/base')
-        self.assertBody('expose works!')
-
-        self.getPage('/exposing/1')
-        self.assertBody('expose works!')
-
-        self.getPage('/exposing/2')
-        self.assertBody('expose works!')
-
-        self.getPage('/exposingnew/base')
-        self.assertBody('expose works!')
-
-        self.getPage('/exposingnew/1')
-        self.assertBody('expose works!')
-
-        self.getPage('/exposingnew/2')
-        self.assertBody('expose works!')
-
-    def testMethodDispatch(self):
-        self.getPage('/bymethod')
-        self.assertBody("['another']")
-        self.assertHeader('Allow', 'GET, HEAD, POST')
-
-        self.getPage('/bymethod', method='HEAD')
-        self.assertBody('')
-        self.assertHeader('Allow', 'GET, HEAD, POST')
-
-        self.getPage('/bymethod', method='POST', body='thing=one')
-        self.assertBody('')
-        self.assertHeader('Allow', 'GET, HEAD, POST')
-
-        self.getPage('/bymethod')
-        self.assertBody(repr(['another', ntou('one')]))
-        self.assertHeader('Allow', 'GET, HEAD, POST')
-
-        self.getPage('/bymethod', method='PUT')
-        self.assertErrorPage(405)
-        self.assertHeader('Allow', 'GET, HEAD, POST')
-
-        # Test default with posparams
-        self.getPage('/collection/silly', method='POST')
-        self.getPage('/collection', method='GET')
-        self.assertBody("['a', 'bit', 'silly']")
-
-        # Test custom dispatcher set on app root (see #737).
-        self.getPage('/app')
-        self.assertBody('milk')
-
-    def testTreeMounting(self):
-        class Root(object):
-
-            @cherrypy.expose
-            def hello(self):
-                return 'Hello world!'
-
-        # When mounting an application instance,
-        # we can't specify a different script name in the call to mount.
-        a = Application(Root(), '/somewhere')
-        self.assertRaises(ValueError, cherrypy.tree.mount, a, '/somewhereelse')
-
-        # When mounting an application instance...
-        a = Application(Root(), '/somewhere')
-        # ...we MUST allow in identical script name in the call to mount...
-        cherrypy.tree.mount(a, '/somewhere')
-        self.getPage('/somewhere/hello')
-        self.assertStatus(200)
-        # ...and MUST allow a missing script_name.
-        del cherrypy.tree.apps['/somewhere']
-        cherrypy.tree.mount(a)
-        self.getPage('/somewhere/hello')
-        self.assertStatus(200)
-
-        # In addition, we MUST be able to create an Application using
-        # script_name == None for access to the wsgi_environ.
-        a = Application(Root(), script_name=None)
-        # However, this does not apply to tree.mount
-        self.assertRaises(TypeError, cherrypy.tree.mount, a, None)
-
-    def testKeywords(self):
-        if sys.version_info < (3,):
-            return self.skip('skipped (Python 3 only)')
-        exec("""class Root(object):
-    @cherrypy.expose
-    def hello(self, *, name='world'):
-        return 'Hello %s!' % name
-cherrypy.tree.mount(Application(Root(), '/keywords'))""")
-
-        self.getPage('/keywords/hello')
-        self.assertStatus(200)
-        self.getPage('/keywords/hello/extra')
-        self.assertStatus(404)
diff --git a/lib/cherrypy/test/test_params.py b/lib/cherrypy/test/test_params.py
deleted file mode 100644
index 73b4cb4c..00000000
--- a/lib/cherrypy/test/test_params.py
+++ /dev/null
@@ -1,61 +0,0 @@
-import sys
-import textwrap
-
-import cherrypy
-from cherrypy.test import helper
-
-
-class ParamsTest(helper.CPWebCase):
-    @staticmethod
-    def setup_server():
-        class Root:
-            @cherrypy.expose
-            @cherrypy.tools.json_out()
-            @cherrypy.tools.params()
-            def resource(self, limit=None, sort=None):
-                return type(limit).__name__
-            # for testing on Py 2
-            resource.__annotations__ = {'limit': int}
-        conf = {'/': {'tools.params.on': True}}
-        cherrypy.tree.mount(Root(), config=conf)
-
-    def test_pass(self):
-        self.getPage('/resource')
-        self.assertStatus(200)
-        self.assertBody('"NoneType"')
-
-        self.getPage('/resource?limit=0')
-        self.assertStatus(200)
-        self.assertBody('"int"')
-
-    def test_error(self):
-        self.getPage('/resource?limit=')
-        self.assertStatus(400)
-        self.assertInBody('invalid literal for int')
-
-        cherrypy.config['tools.params.error'] = 422
-        self.getPage('/resource?limit=')
-        self.assertStatus(422)
-        self.assertInBody('invalid literal for int')
-
-        cherrypy.config['tools.params.exception'] = TypeError
-        self.getPage('/resource?limit=')
-        self.assertStatus(500)
-
-    def test_syntax(self):
-        if sys.version_info < (3,):
-            return self.skip('skipped (Python 3 only)')
-        code = textwrap.dedent("""
-            class Root:
-                @cherrypy.expose
-                @cherrypy.tools.params()
-                def resource(self, limit: int):
-                    return type(limit).__name__
-            conf = {'/': {'tools.params.on': True}}
-            cherrypy.tree.mount(Root(), config=conf)
-            """)
-        exec(code)
-
-        self.getPage('/resource?limit=0')
-        self.assertStatus(200)
-        self.assertBody('int')
diff --git a/lib/cherrypy/test/test_plugins.py b/lib/cherrypy/test/test_plugins.py
deleted file mode 100644
index e69212db..00000000
--- a/lib/cherrypy/test/test_plugins.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from cherrypy.process import plugins
-
-
-__metaclass__ = type
-
-
-class TestAutoreloader:
-    def test_file_for_file_module_when_None(self):
-        """No error when ``module.__file__`` is :py:data:`None`."""
-        class test_module:
-            __file__ = None
-
-        assert plugins.Autoreloader._file_for_file_module(test_module) is None
diff --git a/lib/cherrypy/test/test_proxy.py b/lib/cherrypy/test/test_proxy.py
deleted file mode 100644
index 4d34440a..00000000
--- a/lib/cherrypy/test/test_proxy.py
+++ /dev/null
@@ -1,154 +0,0 @@
-import cherrypy
-from cherrypy.test import helper
-
-script_names = ['', '/path/to/myapp']
-
-
-class ProxyTest(helper.CPWebCase):
-
-    @staticmethod
-    def setup_server():
-
-        # Set up site
-        cherrypy.config.update({
-            'tools.proxy.on': True,
-            'tools.proxy.base': 'www.mydomain.test',
-        })
-
-        # Set up application
-
-        class Root:
-
-            def __init__(self, sn):
-                # Calculate a URL outside of any requests.
-                self.thisnewpage = cherrypy.url(
-                    '/this/new/page', script_name=sn)
-
-            @cherrypy.expose
-            def pageurl(self):
-                return self.thisnewpage
-
-            @cherrypy.expose
-            def index(self):
-                raise cherrypy.HTTPRedirect('dummy')
-
-            @cherrypy.expose
-            def remoteip(self):
-                return cherrypy.request.remote.ip
-
-            @cherrypy.expose
-            @cherrypy.config(**{
-                'tools.proxy.local': 'X-Host',
-                'tools.trailing_slash.extra': True,
-            })
-            def xhost(self):
-                raise cherrypy.HTTPRedirect('blah')
-
-            @cherrypy.expose
-            def base(self):
-                return cherrypy.request.base
-
-            @cherrypy.expose
-            @cherrypy.config(**{'tools.proxy.scheme': 'X-Forwarded-Ssl'})
-            def ssl(self):
-                return cherrypy.request.base
-
-            @cherrypy.expose
-            def newurl(self):
-                return ("Browse to <a href='%s'>this page</a>."
-                        % cherrypy.url('/this/new/page'))
-
-            @cherrypy.expose
-            @cherrypy.config(**{
-                'tools.proxy.base': None,
-            })
-            def base_no_base(self):
-                return cherrypy.request.base
-
-        for sn in script_names:
-            cherrypy.tree.mount(Root(sn), sn)
-
-    def testProxy(self):
-        self.getPage('/')
-        self.assertHeader('Location',
-                          '%s://www.mydomain.test%s/dummy' %
-                          (self.scheme, self.prefix()))
-
-        # Test X-Forwarded-Host (Apache 1.3.33+ and Apache 2)
-        self.getPage(
-            '/', headers=[('X-Forwarded-Host', 'http://www.example.test')])
-        self.assertHeader('Location', 'http://www.example.test/dummy')
-        self.getPage('/', headers=[('X-Forwarded-Host', 'www.example.test')])
-        self.assertHeader('Location', '%s://www.example.test/dummy' %
-                          self.scheme)
-        # Test multiple X-Forwarded-Host headers
-        self.getPage('/', headers=[
-            ('X-Forwarded-Host', 'http://www.example.test, www.cherrypy.test'),
-        ])
-        self.assertHeader('Location', 'http://www.example.test/dummy')
-
-        # Test X-Forwarded-For (Apache2)
-        self.getPage('/remoteip',
-                     headers=[('X-Forwarded-For', '192.168.0.20')])
-        self.assertBody('192.168.0.20')
-        # Fix bug #1268
-        self.getPage('/remoteip',
-                     headers=[
-                         ('X-Forwarded-For', '67.15.36.43, 192.168.0.20')
-                     ])
-        self.assertBody('67.15.36.43')
-
-        # Test X-Host (lighttpd; see https://trac.lighttpd.net/trac/ticket/418)
-        self.getPage('/xhost', headers=[('X-Host', 'www.example.test')])
-        self.assertHeader('Location', '%s://www.example.test/blah' %
-                          self.scheme)
-
-        # Test X-Forwarded-Proto (lighttpd)
-        self.getPage('/base', headers=[('X-Forwarded-Proto', 'https')])
-        self.assertBody('https://www.mydomain.test')
-
-        # Test X-Forwarded-Ssl (webfaction?)
-        self.getPage('/ssl', headers=[('X-Forwarded-Ssl', 'on')])
-        self.assertBody('https://www.mydomain.test')
-
-        # Test cherrypy.url()
-        for sn in script_names:
-            # Test the value inside requests
-            self.getPage(sn + '/newurl')
-            self.assertBody(
-                "Browse to <a href='%s://www.mydomain.test" % self.scheme +
-                sn + "/this/new/page'>this page</a>.")
-            self.getPage(sn + '/newurl', headers=[('X-Forwarded-Host',
-                                                   'http://www.example.test')])
-            self.assertBody("Browse to <a href='http://www.example.test" +
-                            sn + "/this/new/page'>this page</a>.")
-
-            # Test the value outside requests
-            port = ''
-            if self.scheme == 'http' and self.PORT != 80:
-                port = ':%s' % self.PORT
-            elif self.scheme == 'https' and self.PORT != 443:
-                port = ':%s' % self.PORT
-            host = self.HOST
-            if host in ('0.0.0.0', '::'):
-                import socket
-                host = socket.gethostname()
-            expected = ('%s://%s%s%s/this/new/page'
-                        % (self.scheme, host, port, sn))
-            self.getPage(sn + '/pageurl')
-            self.assertBody(expected)
-
-        # Test trailing slash (see
-        # https://github.com/cherrypy/cherrypy/issues/562).
-        self.getPage('/xhost/', headers=[('X-Host', 'www.example.test')])
-        self.assertHeader('Location', '%s://www.example.test/xhost'
-                          % self.scheme)
-
-    def test_no_base_port_in_host(self):
-        """
-        If no base is indicated, and the host header is used to resolve
-        the base, it should rely on the host header for the port also.
-        """
-        headers = {'Host': 'localhost:8080'}.items()
-        self.getPage('/base_no_base', headers=headers)
-        self.assertBody('http://localhost:8080')
diff --git a/lib/cherrypy/test/test_refleaks.py b/lib/cherrypy/test/test_refleaks.py
deleted file mode 100644
index 95813679..00000000
--- a/lib/cherrypy/test/test_refleaks.py
+++ /dev/null
@@ -1,65 +0,0 @@
-"""Tests for refleaks."""
-
-import itertools
-import platform
-import threading
-from http.client import HTTPConnection
-
-import cherrypy
-from cherrypy._cpcompat import HTTPSConnection
-from cherrypy.test import helper
-
-
-data = object()
-
-
-class ReferenceTests(helper.CPWebCase):
-
-    @staticmethod
-    def setup_server():
-
-        class Root:
-
-            @cherrypy.expose
-            def index(self, *args, **kwargs):
-                cherrypy.request.thing = data
-                return 'Hello world!'
-
-        cherrypy.tree.mount(Root())
-
-    def test_threadlocal_garbage(self):
-        if platform.system() == 'Darwin':
-            self.skip('queue issues; see #1474')
-        success = itertools.count()
-
-        def getpage():
-            host = '%s:%s' % (self.interface(), self.PORT)
-            if self.scheme == 'https':
-                c = HTTPSConnection(host)
-            else:
-                c = HTTPConnection(host)
-            try:
-                c.putrequest('GET', '/')
-                c.endheaders()
-                response = c.getresponse()
-                body = response.read()
-                self.assertEqual(response.status, 200)
-                self.assertEqual(body, b'Hello world!')
-            finally:
-                c.close()
-            next(success)
-
-        ITERATIONS = 25
-
-        ts = [
-            threading.Thread(target=getpage)
-            for _ in range(ITERATIONS)
-        ]
-
-        for t in ts:
-            t.start()
-
-        for t in ts:
-            t.join()
-
-        self.assertEqual(next(success), ITERATIONS)
diff --git a/lib/cherrypy/test/test_request_obj.py b/lib/cherrypy/test/test_request_obj.py
deleted file mode 100644
index 2b3f60f0..00000000
--- a/lib/cherrypy/test/test_request_obj.py
+++ /dev/null
@@ -1,939 +0,0 @@
-"""Basic tests for the cherrypy.Request object."""
-
-from functools import wraps
-import os
-import sys
-import types
-import uuid
-from http.client import IncompleteRead
-
-import cherrypy
-from cherrypy._cpcompat import ntou
-from cherrypy.lib import httputil
-from cherrypy.test import helper
-
-localDir = os.path.dirname(__file__)
-
-defined_http_methods = ('OPTIONS', 'GET', 'HEAD', 'POST', 'PUT', 'DELETE',
-                        'TRACE', 'PROPFIND', 'PATCH')
-
-
-#                             Client-side code                             #
-
-
-class RequestObjectTests(helper.CPWebCase):
-
-    @staticmethod
-    def setup_server():
-        class Root:
-
-            @cherrypy.expose
-            def index(self):
-                return 'hello'
-
-            @cherrypy.expose
-            def scheme(self):
-                return cherrypy.request.scheme
-
-            @cherrypy.expose
-            def created_example_com_3128(self):
-                """Handle CONNECT method."""
-                cherrypy.response.status = 204
-
-            @cherrypy.expose
-            def body_example_com_3128(self):
-                """Handle CONNECT method."""
-                return (
-                    cherrypy.request.method
-                    + 'ed to '
-                    + cherrypy.request.path_info
-                )
-
-            @cherrypy.expose
-            def request_uuid4(self):
-                return [
-                    str(cherrypy.request.unique_id),
-                    ' ',
-                    str(cherrypy.request.unique_id),
-                ]
-
-        root = Root()
-
-        class TestType(type):
-            """Metaclass which automatically exposes all functions in each
-            subclass, and adds an instance of the subclass as an attribute
-            of root.
-            """
-            def __init__(cls, name, bases, dct):
-                type.__init__(cls, name, bases, dct)
-                for value in dct.values():
-                    if isinstance(value, types.FunctionType):
-                        value.exposed = True
-                setattr(root, name.lower(), cls())
-        Test = TestType('Test', (object,), {})
-
-        class PathInfo(Test):
-
-            def default(self, *args):
-                return cherrypy.request.path_info
-
-        class Params(Test):
-
-            def index(self, thing):
-                return repr(thing)
-
-            def ismap(self, x, y):
-                return 'Coordinates: %s, %s' % (x, y)
-
-            @cherrypy.config(**{'request.query_string_encoding': 'latin1'})
-            def default(self, *args, **kwargs):
-                return 'args: %s kwargs: %s' % (args, sorted(kwargs.items()))
-
-        @cherrypy.expose
-        class ParamErrorsCallable(object):
-
-            def __call__(self):
-                return 'data'
-
-        def handler_dec(f):
-            @wraps(f)
-            def wrapper(handler, *args, **kwargs):
-                return f(handler, *args, **kwargs)
-            return wrapper
-
-        class ParamErrors(Test):
-
-            @cherrypy.expose
-            def one_positional(self, param1):
-                return 'data'
-
-            @cherrypy.expose
-            def one_positional_args(self, param1, *args):
-                return 'data'
-
-            @cherrypy.expose
-            def one_positional_args_kwargs(self, param1, *args, **kwargs):
-                return 'data'
-
-            @cherrypy.expose
-            def one_positional_kwargs(self, param1, **kwargs):
-                return 'data'
-
-            @cherrypy.expose
-            def no_positional(self):
-                return 'data'
-
-            @cherrypy.expose
-            def no_positional_args(self, *args):
-                return 'data'
-
-            @cherrypy.expose
-            def no_positional_args_kwargs(self, *args, **kwargs):
-                return 'data'
-
-            @cherrypy.expose
-            def no_positional_kwargs(self, **kwargs):
-                return 'data'
-
-            callable_object = ParamErrorsCallable()
-
-            @cherrypy.expose
-            def raise_type_error(self, **kwargs):
-                raise TypeError('Client Error')
-
-            @cherrypy.expose
-            def raise_type_error_with_default_param(self, x, y=None):
-                return '%d' % 'a'  # throw an exception
-
-            @cherrypy.expose
-            @handler_dec
-            def raise_type_error_decorated(self, *args, **kwargs):
-                raise TypeError('Client Error')
-
-        def callable_error_page(status, **kwargs):
-            return "Error %s - Well, I'm very sorry but you haven't paid!" % (
-                status)
-
-        @cherrypy.config(**{'tools.log_tracebacks.on': True})
-        class Error(Test):
-
-            def reason_phrase(self):
-                raise cherrypy.HTTPError("410 Gone fishin'")
-
-            @cherrypy.config(**{
-                'error_page.404': os.path.join(localDir, 'static/index.html'),
-                'error_page.401': callable_error_page,
-            })
-            def custom(self, err='404'):
-                raise cherrypy.HTTPError(
-                    int(err), 'No, <b>really</b>, not found!')
-
-            @cherrypy.config(**{
-                'error_page.default': callable_error_page,
-            })
-            def custom_default(self):
-                return 1 + 'a'  # raise an unexpected error
-
-            @cherrypy.config(**{'error_page.404': 'nonexistent.html'})
-            def noexist(self):
-                raise cherrypy.HTTPError(404, 'No, <b>really</b>, not found!')
-
-            def page_method(self):
-                raise ValueError()
-
-            def page_yield(self):
-                yield 'howdy'
-                raise ValueError()
-
-            @cherrypy.config(**{'response.stream': True})
-            def page_streamed(self):
-                yield 'word up'
-                raise ValueError()
-                yield 'very oops'
-
-            @cherrypy.config(**{'request.show_tracebacks': False})
-            def cause_err_in_finalize(self):
-                # Since status must start with an int, this should error.
-                cherrypy.response.status = 'ZOO OK'
-
-            @cherrypy.config(**{'request.throw_errors': True})
-            def rethrow(self):
-                """Test that an error raised here will be thrown out to
-                the server.
-                """
-                raise ValueError()
-
-        class Expect(Test):
-
-            def expectation_failed(self):
-                expect = cherrypy.request.headers.elements('Expect')
-                if expect and expect[0].value != '100-continue':
-                    raise cherrypy.HTTPError(400)
-                raise cherrypy.HTTPError(417, 'Expectation Failed')
-
-        class Headers(Test):
-
-            def default(self, headername):
-                """Spit back out the value for the requested header."""
-                return cherrypy.request.headers[headername]
-
-            def doubledheaders(self):
-                # From https://github.com/cherrypy/cherrypy/issues/165:
-                # "header field names should not be case sensitive sayes the
-                # rfc. if i set a headerfield in complete lowercase i end up
-                # with two header fields, one in lowercase, the other in
-                # mixed-case."
-
-                # Set the most common headers
-                hMap = cherrypy.response.headers
-                hMap['content-type'] = 'text/html'
-                hMap['content-length'] = 18
-                hMap['server'] = 'CherryPy headertest'
-                hMap['location'] = ('%s://%s:%s/headers/'
-                                    % (cherrypy.request.local.ip,
-                                       cherrypy.request.local.port,
-                                       cherrypy.request.scheme))
-
-                # Set a rare header for fun
-                hMap['Expires'] = 'Thu, 01 Dec 2194 16:00:00 GMT'
-
-                return 'double header test'
-
-            def ifmatch(self):
-                val = cherrypy.request.headers['If-Match']
-                assert isinstance(val, str)
-                cherrypy.response.headers['ETag'] = val
-                return val
-
-        class HeaderElements(Test):
-
-            def get_elements(self, headername):
-                e = cherrypy.request.headers.elements(headername)
-                return '\n'.join([str(x) for x in e])
-
-        class Method(Test):
-
-            def index(self):
-                m = cherrypy.request.method
-                if m in defined_http_methods or m == 'CONNECT':
-                    return m
-
-                if m == 'LINK':
-                    raise cherrypy.HTTPError(405)
-                else:
-                    raise cherrypy.HTTPError(501)
-
-            def parameterized(self, data):
-                return data
-
-            def request_body(self):
-                # This should be a file object (temp file),
-                # which CP will just pipe back out if we tell it to.
-                return cherrypy.request.body
-
-            def reachable(self):
-                return 'success'
-
-        class Divorce(Test):
-            """HTTP Method handlers shouldn't collide with normal method names.
-            For example, a GET-handler shouldn't collide with a method named
-            'get'.
-
-            If you build HTTP method dispatching into CherryPy, rewrite this
-            class to use your new dispatch mechanism and make sure that:
-                "GET /divorce HTTP/1.1" maps to divorce.index() and
-                "GET /divorce/get?ID=13 HTTP/1.1" maps to divorce.get()
-            """
-
-            documents = {}
-
-            @cherrypy.expose
-            def index(self):
-                yield '<h1>Choose your document</h1>\n'
-                yield '<ul>\n'
-                for id, contents in self.documents.items():
-                    yield (
-                        "    <li><a href='/divorce/get?ID=%s'>%s</a>:"
-                        ' %s</li>\n' % (id, id, contents))
-                yield '</ul>'
-
-            @cherrypy.expose
-            def get(self, ID):
-                return ('Divorce document %s: %s' %
-                        (ID, self.documents.get(ID, 'empty')))
-
-        class ThreadLocal(Test):
-
-            def index(self):
-                existing = repr(getattr(cherrypy.request, 'asdf', None))
-                cherrypy.request.asdf = 'rassfrassin'
-                return existing
-
-        appconf = {
-            '/method': {
-                'request.methods_with_bodies': ('POST', 'PUT', 'PROPFIND',
-                                                'PATCH')
-            },
-        }
-        cherrypy.tree.mount(root, config=appconf)
-
-    def test_scheme(self):
-        self.getPage('/scheme')
-        self.assertBody(self.scheme)
-
-    def test_per_request_uuid4(self):
-        self.getPage('/request_uuid4')
-        first_uuid4, _, second_uuid4 = self.body.decode().partition(' ')
-        assert (
-            uuid.UUID(first_uuid4, version=4)
-            == uuid.UUID(second_uuid4, version=4)
-        )
-
-        self.getPage('/request_uuid4')
-        third_uuid4, _, _ = self.body.decode().partition(' ')
-        assert (
-            uuid.UUID(first_uuid4, version=4)
-            != uuid.UUID(third_uuid4, version=4)
-        )
-
-    def testRelativeURIPathInfo(self):
-        self.getPage('/pathinfo/foo/bar')
-        self.assertBody('/pathinfo/foo/bar')
-
-    def testAbsoluteURIPathInfo(self):
-        # http://cherrypy.dev/ticket/1061
-        self.getPage('http://localhost/pathinfo/foo/bar')
-        self.assertBody('/pathinfo/foo/bar')
-
-    def testParams(self):
-        self.getPage('/params/?thing=a')
-        self.assertBody(repr(ntou('a')))
-
-        self.getPage('/params/?thing=a&thing=b&thing=c')
-        self.assertBody(repr([ntou('a'), ntou('b'), ntou('c')]))
-
-        # Test friendly error message when given params are not accepted.
-        cherrypy.config.update({'request.show_mismatched_params': True})
-        self.getPage('/params/?notathing=meeting')
-        self.assertInBody('Missing parameters: thing')
-        self.getPage('/params/?thing=meeting&notathing=meeting')
-        self.assertInBody('Unexpected query string parameters: notathing')
-
-        # Test ability to turn off friendly error messages
-        cherrypy.config.update({'request.show_mismatched_params': False})
-        self.getPage('/params/?notathing=meeting')
-        self.assertInBody('Not Found')
-        self.getPage('/params/?thing=meeting&notathing=meeting')
-        self.assertInBody('Not Found')
-
-        # Test "% HEX HEX"-encoded URL, param keys, and values
-        self.getPage('/params/%d4%20%e3/cheese?Gruy%E8re=Bulgn%e9ville')
-        self.assertBody('args: %s kwargs: %s' %
-                        (('\xd4 \xe3', 'cheese'),
-                         [('Gruy\xe8re', ntou('Bulgn\xe9ville'))]))
-
-        # Make sure that encoded = and & get parsed correctly
-        self.getPage(
-            '/params/code?url=http%3A//cherrypy.dev/index%3Fa%3D1%26b%3D2')
-        self.assertBody('args: %s kwargs: %s' %
-                        (('code',),
-                         [('url', ntou('http://cherrypy.dev/index?a=1&b=2'))]))
-
-        # Test coordinates sent by <img ismap>
-        self.getPage('/params/ismap?223,114')
-        self.assertBody('Coordinates: 223, 114')
-
-        # Test "name[key]" dict-like params
-        self.getPage('/params/dictlike?a[1]=1&a[2]=2&b=foo&b[bar]=baz')
-        self.assertBody('args: %s kwargs: %s' %
-                        (('dictlike',),
-                         [('a[1]', ntou('1')), ('a[2]', ntou('2')),
-                          ('b', ntou('foo')), ('b[bar]', ntou('baz'))]))
-
-    def testParamErrors(self):
-
-        # test that all of the handlers work when given
-        # the correct parameters in order to ensure that the
-        # errors below aren't coming from some other source.
-        for uri in (
-                '/paramerrors/one_positional?param1=foo',
-                '/paramerrors/one_positional_args?param1=foo',
-                '/paramerrors/one_positional_args/foo',
-                '/paramerrors/one_positional_args/foo/bar/baz',
-                '/paramerrors/one_positional_args_kwargs?'
-                'param1=foo&param2=bar',
-                '/paramerrors/one_positional_args_kwargs/foo?'
-                'param2=bar&param3=baz',
-                '/paramerrors/one_positional_args_kwargs/foo/bar/baz?'
-                'param2=bar&param3=baz',
-                '/paramerrors/one_positional_kwargs?'
-                'param1=foo&param2=bar&param3=baz',
-                '/paramerrors/one_positional_kwargs/foo?'
-                'param4=foo&param2=bar&param3=baz',
-                '/paramerrors/no_positional',
-                '/paramerrors/no_positional_args/foo',
-                '/paramerrors/no_positional_args/foo/bar/baz',
-                '/paramerrors/no_positional_args_kwargs?param1=foo&param2=bar',
-                '/paramerrors/no_positional_args_kwargs/foo?param2=bar',
-                '/paramerrors/no_positional_args_kwargs/foo/bar/baz?'
-                'param2=bar&param3=baz',
-                '/paramerrors/no_positional_kwargs?param1=foo&param2=bar',
-                '/paramerrors/callable_object',
-        ):
-            self.getPage(uri)
-            self.assertStatus(200)
-
-        error_msgs = [
-            'Missing parameters',
-            'Nothing matches the given URI',
-            'Multiple values for parameters',
-            'Unexpected query string parameters',
-            'Unexpected body parameters',
-            'Invalid path in Request-URI',
-            'Illegal #fragment in Request-URI',
-        ]
-
-        # uri should be tested for valid absolute path, the status must be 400.
-        for uri, error_idx in (
-            ('invalid/path/without/leading/slash', 5),
-            ('/valid/path#invalid=fragment', 6),
-        ):
-            self.getPage(uri)
-            self.assertStatus(400)
-            self.assertInBody(error_msgs[error_idx])
-
-        # query string parameters are part of the URI, so if they are wrong
-        # for a particular handler, the status MUST be a 404.
-        for uri, msg in (
-            ('/paramerrors/one_positional', error_msgs[0]),
-            ('/paramerrors/one_positional?foo=foo', error_msgs[0]),
-            ('/paramerrors/one_positional/foo/bar/baz', error_msgs[1]),
-            ('/paramerrors/one_positional/foo?param1=foo', error_msgs[2]),
-            ('/paramerrors/one_positional/foo?param1=foo&param2=foo',
-             error_msgs[2]),
-            ('/paramerrors/one_positional_args/foo?param1=foo&param2=foo',
-             error_msgs[2]),
-            ('/paramerrors/one_positional_args/foo/bar/baz?param2=foo',
-             error_msgs[3]),
-            ('/paramerrors/one_positional_args_kwargs/foo/bar/baz?'
-             'param1=bar&param3=baz',
-             error_msgs[2]),
-            ('/paramerrors/one_positional_kwargs/foo?'
-             'param1=foo&param2=bar&param3=baz',
-             error_msgs[2]),
-            ('/paramerrors/no_positional/boo', error_msgs[1]),
-            ('/paramerrors/no_positional?param1=foo', error_msgs[3]),
-            ('/paramerrors/no_positional_args/boo?param1=foo', error_msgs[3]),
-            ('/paramerrors/no_positional_kwargs/boo?param1=foo',
-             error_msgs[1]),
-            ('/paramerrors/callable_object?param1=foo', error_msgs[3]),
-            ('/paramerrors/callable_object/boo', error_msgs[1]),
-        ):
-            for show_mismatched_params in (True, False):
-                cherrypy.config.update(
-                    {'request.show_mismatched_params': show_mismatched_params})
-                self.getPage(uri)
-                self.assertStatus(404)
-                if show_mismatched_params:
-                    self.assertInBody(msg)
-                else:
-                    self.assertInBody('Not Found')
-
-        # if body parameters are wrong, a 400 must be returned.
-        for uri, body, msg in (
-                ('/paramerrors/one_positional/foo',
-                 'param1=foo', error_msgs[2]),
-                ('/paramerrors/one_positional/foo',
-                 'param1=foo&param2=foo', error_msgs[2]),
-                ('/paramerrors/one_positional_args/foo',
-                 'param1=foo&param2=foo', error_msgs[2]),
-                ('/paramerrors/one_positional_args/foo/bar/baz',
-                 'param2=foo', error_msgs[4]),
-                ('/paramerrors/one_positional_args_kwargs/foo/bar/baz',
-                 'param1=bar&param3=baz', error_msgs[2]),
-                ('/paramerrors/one_positional_kwargs/foo',
-                 'param1=foo&param2=bar&param3=baz', error_msgs[2]),
-                ('/paramerrors/no_positional', 'param1=foo', error_msgs[4]),
-                ('/paramerrors/no_positional_args/boo',
-                 'param1=foo', error_msgs[4]),
-                ('/paramerrors/callable_object', 'param1=foo', error_msgs[4]),
-        ):
-            for show_mismatched_params in (True, False):
-                cherrypy.config.update(
-                    {'request.show_mismatched_params': show_mismatched_params})
-                self.getPage(uri, method='POST', body=body)
-                self.assertStatus(400)
-                if show_mismatched_params:
-                    self.assertInBody(msg)
-                else:
-                    self.assertInBody('400 Bad')
-
-        # even if body parameters are wrong, if we get the uri wrong, then
-        # it's a 404
-        for uri, body, msg in (
-                ('/paramerrors/one_positional?param2=foo',
-                 'param1=foo', error_msgs[3]),
-                ('/paramerrors/one_positional/foo/bar',
-                 'param2=foo', error_msgs[1]),
-                ('/paramerrors/one_positional_args/foo/bar?param2=foo',
-                 'param3=foo', error_msgs[3]),
-                ('/paramerrors/one_positional_kwargs/foo/bar',
-                 'param2=bar&param3=baz', error_msgs[1]),
-                ('/paramerrors/no_positional?param1=foo',
-                 'param2=foo', error_msgs[3]),
-                ('/paramerrors/no_positional_args/boo?param2=foo',
-                 'param1=foo', error_msgs[3]),
-                ('/paramerrors/callable_object?param2=bar',
-                 'param1=foo', error_msgs[3]),
-        ):
-            for show_mismatched_params in (True, False):
-                cherrypy.config.update(
-                    {'request.show_mismatched_params': show_mismatched_params})
-                self.getPage(uri, method='POST', body=body)
-                self.assertStatus(404)
-                if show_mismatched_params:
-                    self.assertInBody(msg)
-                else:
-                    self.assertInBody('Not Found')
-
-        # In the case that a handler raises a TypeError we should
-        # let that type error through.
-        for uri in (
-                '/paramerrors/raise_type_error',
-                '/paramerrors/raise_type_error_with_default_param?x=0',
-                '/paramerrors/raise_type_error_with_default_param?x=0&y=0',
-                '/paramerrors/raise_type_error_decorated',
-        ):
-            self.getPage(uri, method='GET')
-            self.assertStatus(500)
-            self.assertTrue('Client Error', self.body)
-
-    def testErrorHandling(self):
-        self.getPage('/error/missing')
-        self.assertStatus(404)
-        self.assertErrorPage(404, "The path '/error/missing' was not found.")
-
-        ignore = helper.webtest.ignored_exceptions
-        ignore.append(ValueError)
-        try:
-            valerr = '\n    raise ValueError()\nValueError'
-            self.getPage('/error/page_method')
-            self.assertErrorPage(500, pattern=valerr)
-
-            self.getPage('/error/page_yield')
-            self.assertErrorPage(500, pattern=valerr)
-
-            if (cherrypy.server.protocol_version == 'HTTP/1.0' or
-                    getattr(cherrypy.server, 'using_apache', False)):
-                self.getPage('/error/page_streamed')
-                # Because this error is raised after the response body has
-                # started, the status should not change to an error status.
-                self.assertStatus(200)
-                self.assertBody('word up')
-            else:
-                # Under HTTP/1.1, the chunked transfer-coding is used.
-                # The HTTP client will choke when the output is incomplete.
-                self.assertRaises((ValueError, IncompleteRead), self.getPage,
-                                  '/error/page_streamed')
-
-            # No traceback should be present
-            self.getPage('/error/cause_err_in_finalize')
-            msg = "Illegal response status from server ('ZOO' is non-numeric)."
-            self.assertErrorPage(500, msg, None)
-        finally:
-            ignore.pop()
-
-        # Test HTTPError with a reason-phrase in the status arg.
-        self.getPage('/error/reason_phrase')
-        self.assertStatus("410 Gone fishin'")
-
-        # Test custom error page for a specific error.
-        self.getPage('/error/custom')
-        self.assertStatus(404)
-        self.assertBody('Hello, world\r\n' + (' ' * 499))
-
-        # Test custom error page for a specific error.
-        self.getPage('/error/custom?err=401')
-        self.assertStatus(401)
-        self.assertBody(
-            'Error 401 Unauthorized - '
-            "Well, I'm very sorry but you haven't paid!")
-
-        # Test default custom error page.
-        self.getPage('/error/custom_default')
-        self.assertStatus(500)
-        self.assertBody(
-            'Error 500 Internal Server Error - '
-            "Well, I'm very sorry but you haven't paid!".ljust(513))
-
-        # Test error in custom error page (ticket #305).
-        # Note that the message is escaped for HTML (ticket #310).
-        self.getPage('/error/noexist')
-        self.assertStatus(404)
-        if sys.version_info >= (3, 3):
-            exc_name = 'FileNotFoundError'
-        else:
-            exc_name = 'IOError'
-        msg = ('No, &lt;b&gt;really&lt;/b&gt;, not found!<br />'
-               'In addition, the custom error page failed:\n<br />'
-               '%s: [Errno 2] '
-               "No such file or directory: 'nonexistent.html'") % (exc_name,)
-        self.assertInBody(msg)
-
-        if getattr(cherrypy.server, 'using_apache', False):
-            pass
-        else:
-            # Test throw_errors (ticket #186).
-            self.getPage('/error/rethrow')
-            self.assertInBody('raise ValueError()')
-
-    def testExpect(self):
-        e = ('Expect', '100-continue')
-        self.getPage('/headerelements/get_elements?headername=Expect', [e])
-        self.assertBody('100-continue')
-
-        self.getPage('/expect/expectation_failed', [e])
-        self.assertStatus(417)
-
-    def testHeaderElements(self):
-        # Accept-* header elements should be sorted, with most preferred first.
-        h = [('Accept', 'audio/*; q=0.2, audio/basic')]
-        self.getPage('/headerelements/get_elements?headername=Accept', h)
-        self.assertStatus(200)
-        self.assertBody('audio/basic\n'
-                        'audio/*;q=0.2')
-
-        h = [
-            ('Accept',
-             'text/plain; q=0.5, text/html, text/x-dvi; q=0.8, text/x-c')
-        ]
-        self.getPage('/headerelements/get_elements?headername=Accept', h)
-        self.assertStatus(200)
-        self.assertBody('text/x-c\n'
-                        'text/html\n'
-                        'text/x-dvi;q=0.8\n'
-                        'text/plain;q=0.5')
-
-        # Test that more specific media ranges get priority.
-        h = [('Accept', 'text/*, text/html, text/html;level=1, */*')]
-        self.getPage('/headerelements/get_elements?headername=Accept', h)
-        self.assertStatus(200)
-        self.assertBody('text/html;level=1\n'
-                        'text/html\n'
-                        'text/*\n'
-                        '*/*')
-
-        # Test Accept-Charset
-        h = [('Accept-Charset', 'iso-8859-5, unicode-1-1;q=0.8')]
-        self.getPage(
-            '/headerelements/get_elements?headername=Accept-Charset', h)
-        self.assertStatus('200 OK')
-        self.assertBody('iso-8859-5\n'
-                        'unicode-1-1;q=0.8')
-
-        # Test Accept-Encoding
-        h = [('Accept-Encoding', 'gzip;q=1.0, identity; q=0.5, *;q=0')]
-        self.getPage(
-            '/headerelements/get_elements?headername=Accept-Encoding', h)
-        self.assertStatus('200 OK')
-        self.assertBody('gzip;q=1.0\n'
-                        'identity;q=0.5\n'
-                        '*;q=0')
-
-        # Test Accept-Language
-        h = [('Accept-Language', 'da, en-gb;q=0.8, en;q=0.7')]
-        self.getPage(
-            '/headerelements/get_elements?headername=Accept-Language', h)
-        self.assertStatus('200 OK')
-        self.assertBody('da\n'
-                        'en-gb;q=0.8\n'
-                        'en;q=0.7')
-
-        # Test malformed header parsing. See
-        # https://github.com/cherrypy/cherrypy/issues/763.
-        self.getPage('/headerelements/get_elements?headername=Content-Type',
-                     # Note the illegal trailing ";"
-                     headers=[('Content-Type', 'text/html; charset=utf-8;')])
-        self.assertStatus(200)
-        self.assertBody('text/html;charset=utf-8')
-
-    def test_repeated_headers(self):
-        # Test that two request headers are collapsed into one.
-        # See https://github.com/cherrypy/cherrypy/issues/542.
-        self.getPage('/headers/Accept-Charset',
-                     headers=[('Accept-Charset', 'iso-8859-5'),
-                              ('Accept-Charset', 'unicode-1-1;q=0.8')])
-        self.assertBody('iso-8859-5, unicode-1-1;q=0.8')
-
-        # Tests that each header only appears once, regardless of case.
-        self.getPage('/headers/doubledheaders')
-        self.assertBody('double header test')
-        hnames = [name.title() for name, val in self.headers]
-        for key in ['Content-Length', 'Content-Type', 'Date',
-                    'Expires', 'Location', 'Server']:
-            self.assertEqual(hnames.count(key), 1, self.headers)
-
-    def test_encoded_headers(self):
-        # First, make sure the innards work like expected.
-        self.assertEqual(
-            httputil.decode_TEXT(ntou('=?utf-8?q?f=C3=BCr?=')), ntou('f\xfcr'))
-
-        if cherrypy.server.protocol_version == 'HTTP/1.1':
-            # Test RFC-2047-encoded request and response header values
-            u = ntou('\u212bngstr\xf6m', 'escape')
-            c = ntou('=E2=84=ABngstr=C3=B6m')
-            self.getPage('/headers/ifmatch',
-                         [('If-Match', ntou('=?utf-8?q?%s?=') % c)])
-            # The body should be utf-8 encoded.
-            self.assertBody(b'\xe2\x84\xabngstr\xc3\xb6m')
-            # But the Etag header should be RFC-2047 encoded (binary)
-            self.assertHeader('ETag', ntou('=?utf-8?b?4oSrbmdzdHLDtm0=?='))
-
-            # Test a *LONG* RFC-2047-encoded request and response header value
-            self.getPage('/headers/ifmatch',
-                         [('If-Match', ntou('=?utf-8?q?%s?=') % (c * 10))])
-            self.assertBody(b'\xe2\x84\xabngstr\xc3\xb6m' * 10)
-            # Note: this is different output for Python3, but it decodes fine.
-            etag = self.assertHeader(
-                'ETag',
-                '=?utf-8?b?4oSrbmdzdHLDtm3ihKtuZ3N0csO2beKEq25nc3Ryw7Zt'
-                '4oSrbmdzdHLDtm3ihKtuZ3N0csO2beKEq25nc3Ryw7Zt'
-                '4oSrbmdzdHLDtm3ihKtuZ3N0csO2beKEq25nc3Ryw7Zt'
-                '4oSrbmdzdHLDtm0=?=')
-            self.assertEqual(httputil.decode_TEXT(etag), u * 10)
-
-    def test_header_presence(self):
-        # If we don't pass a Content-Type header, it should not be present
-        # in cherrypy.request.headers
-        self.getPage('/headers/Content-Type',
-                     headers=[])
-        self.assertStatus(500)
-
-        # If Content-Type is present in the request, it should be present in
-        # cherrypy.request.headers
-        self.getPage('/headers/Content-Type',
-                     headers=[('Content-type', 'application/json')])
-        self.assertBody('application/json')
-
-    def test_dangerous_host(self):
-        """Dangerous characters like newlines should be elided.
-
-        Ref #1974.
-        """
-        # foo\nbar
-        encoded = '=?iso-8859-1?q?foo=0Abar?='
-        self.getPage('/headers/Host', headers=[('Host', encoded)])
-        self.assertBody('foobar')
-
-    def test_basic_HTTPMethods(self):
-        helper.webtest.methods_with_bodies = ('POST', 'PUT', 'PROPFIND',
-                                              'PATCH')
-
-        # Test that all defined HTTP methods work.
-        for m in defined_http_methods:
-            self.getPage('/method/', method=m)
-
-            # HEAD requests should not return any body.
-            if m == 'HEAD':
-                self.assertBody('')
-            elif m == 'TRACE':
-                # Some HTTP servers (like modpy) have their own TRACE support
-                self.assertEqual(self.body[:5], b'TRACE')
-            else:
-                self.assertBody(m)
-
-        # test of PATCH requests
-        # Request a PATCH method with a form-urlencoded body
-        self.getPage('/method/parameterized', method='PATCH',
-                     body='data=on+top+of+other+things')
-        self.assertBody('on top of other things')
-
-        # Request a PATCH method with a file body
-        b = 'one thing on top of another'
-        h = [('Content-Type', 'text/plain'),
-             ('Content-Length', str(len(b)))]
-        self.getPage('/method/request_body', headers=h, method='PATCH', body=b)
-        self.assertStatus(200)
-        self.assertBody(b)
-
-        # Request a PATCH method with a file body but no Content-Type.
-        # See https://github.com/cherrypy/cherrypy/issues/790.
-        b = b'one thing on top of another'
-        self.persistent = True
-        try:
-            conn = self.HTTP_CONN
-            conn.putrequest('PATCH', '/method/request_body', skip_host=True)
-            conn.putheader('Host', self.HOST)
-            conn.putheader('Content-Length', str(len(b)))
-            conn.endheaders()
-            conn.send(b)
-            response = conn.response_class(conn.sock, method='PATCH')
-            response.begin()
-            self.assertEqual(response.status, 200)
-            self.body = response.read()
-            self.assertBody(b)
-        finally:
-            self.persistent = False
-
-        # Request a PATCH method with no body whatsoever (not an empty one).
-        # See https://github.com/cherrypy/cherrypy/issues/650.
-        # Provide a C-T or webtest will provide one (and a C-L) for us.
-        h = [('Content-Type', 'text/plain')]
-        self.getPage('/method/reachable', headers=h, method='PATCH')
-        self.assertStatus(411)
-
-        # HTTP PUT tests
-        # Request a PUT method with a form-urlencoded body
-        self.getPage('/method/parameterized', method='PUT',
-                     body='data=on+top+of+other+things')
-        self.assertBody('on top of other things')
-
-        # Request a PUT method with a file body
-        b = 'one thing on top of another'
-        h = [('Content-Type', 'text/plain'),
-             ('Content-Length', str(len(b)))]
-        self.getPage('/method/request_body', headers=h, method='PUT', body=b)
-        self.assertStatus(200)
-        self.assertBody(b)
-
-        # Request a PUT method with a file body but no Content-Type.
-        # See https://github.com/cherrypy/cherrypy/issues/790.
-        b = b'one thing on top of another'
-        self.persistent = True
-        try:
-            conn = self.HTTP_CONN
-            conn.putrequest('PUT', '/method/request_body', skip_host=True)
-            conn.putheader('Host', self.HOST)
-            conn.putheader('Content-Length', str(len(b)))
-            conn.endheaders()
-            conn.send(b)
-            response = conn.response_class(conn.sock, method='PUT')
-            response.begin()
-            self.assertEqual(response.status, 200)
-            self.body = response.read()
-            self.assertBody(b)
-        finally:
-            self.persistent = False
-
-        # Request a PUT method with no body whatsoever (not an empty one).
-        # See https://github.com/cherrypy/cherrypy/issues/650.
-        # Provide a C-T or webtest will provide one (and a C-L) for us.
-        h = [('Content-Type', 'text/plain')]
-        self.getPage('/method/reachable', headers=h, method='PUT')
-        self.assertStatus(411)
-
-        # Request a custom method with a request body
-        b = ('<?xml version="1.0" encoding="utf-8" ?>\n\n'
-             '<propfind xmlns="DAV:"><prop><getlastmodified/>'
-             '</prop></propfind>')
-        h = [('Content-Type', 'text/xml'),
-             ('Content-Length', str(len(b)))]
-        self.getPage('/method/request_body', headers=h,
-                     method='PROPFIND', body=b)
-        self.assertStatus(200)
-        self.assertBody(b)
-
-        # Request a disallowed method
-        self.getPage('/method/', method='LINK')
-        self.assertStatus(405)
-
-        # Request an unknown method
-        self.getPage('/method/', method='SEARCH')
-        self.assertStatus(501)
-
-        # For method dispatchers: make sure that an HTTP method doesn't
-        # collide with a virtual path atom. If you build HTTP-method
-        # dispatching into the core, rewrite these handlers to use
-        # your dispatch idioms.
-        self.getPage('/divorce/get?ID=13')
-        self.assertBody('Divorce document 13: empty')
-        self.assertStatus(200)
-        self.getPage('/divorce/', method='GET')
-        self.assertBody('<h1>Choose your document</h1>\n<ul>\n</ul>')
-        self.assertStatus(200)
-
-    def test_CONNECT_method(self):
-        self.persistent = True
-        try:
-            conn = self.HTTP_CONN
-            conn.request('CONNECT', 'created.example.com:3128')
-            response = conn.response_class(conn.sock, method='CONNECT')
-            response.begin()
-            self.assertEqual(response.status, 204)
-        finally:
-            self.persistent = False
-
-        self.persistent = True
-        try:
-            conn = self.HTTP_CONN
-            conn.request('CONNECT', 'body.example.com:3128')
-            response = conn.response_class(conn.sock, method='CONNECT')
-            response.begin()
-            self.assertEqual(response.status, 200)
-            self.body = response.read()
-            self.assertBody(b'CONNECTed to /body.example.com:3128')
-        finally:
-            self.persistent = False
-
-    def test_CONNECT_method_invalid_authority(self):
-        for request_target in ['example.com', 'http://example.com:33',
-                               '/path/', 'path/', '/?q=f', '#f']:
-            self.persistent = True
-            try:
-                conn = self.HTTP_CONN
-                conn.request('CONNECT', request_target)
-                response = conn.response_class(conn.sock, method='CONNECT')
-                response.begin()
-                self.assertEqual(response.status, 400)
-                self.body = response.read()
-                self.assertBody(b'Invalid path in Request-URI: request-target '
-                                b'must match authority-form.')
-            finally:
-                self.persistent = False
-
-    def testEmptyThreadlocals(self):
-        results = []
-        for x in range(20):
-            self.getPage('/threadlocal/')
-            results.append(self.body)
-        self.assertEqual(results, [b'None'] * 20)
diff --git a/lib/cherrypy/test/test_routes.py b/lib/cherrypy/test/test_routes.py
deleted file mode 100644
index cc714765..00000000
--- a/lib/cherrypy/test/test_routes.py
+++ /dev/null
@@ -1,80 +0,0 @@
-"""Test Routes dispatcher."""
-import os
-import importlib
-
-import pytest
-
-import cherrypy
-from cherrypy.test import helper
-
-curdir = os.path.join(os.getcwd(), os.path.dirname(__file__))
-
-
-class RoutesDispatchTest(helper.CPWebCase):
-    """Routes dispatcher test suite."""
-
-    @staticmethod
-    def setup_server():
-        """Set up cherrypy test instance."""
-        try:
-            importlib.import_module('routes')
-        except ImportError:
-            pytest.skip('Install routes to test RoutesDispatcher code')
-
-        class Dummy:
-
-            def index(self):
-                return 'I said good day!'
-
-        class City:
-
-            def __init__(self, name):
-                self.name = name
-                self.population = 10000
-
-            @cherrypy.config(**{
-                'tools.response_headers.on': True,
-                'tools.response_headers.headers': [
-                    ('Content-Language', 'en-GB'),
-                ],
-            })
-            def index(self, **kwargs):
-                return 'Welcome to %s, pop. %s' % (self.name, self.population)
-
-            def update(self, **kwargs):
-                self.population = kwargs['pop']
-                return 'OK'
-
-        d = cherrypy.dispatch.RoutesDispatcher()
-        d.connect(action='index', name='hounslow', route='/hounslow',
-                  controller=City('Hounslow'))
-        d.connect(
-            name='surbiton', route='/surbiton', controller=City('Surbiton'),
-            action='index', conditions=dict(method=['GET']))
-        d.mapper.connect('/surbiton', controller='surbiton',
-                         action='update', conditions=dict(method=['POST']))
-        d.connect('main', ':action', controller=Dummy())
-
-        conf = {'/': {'request.dispatch': d}}
-        cherrypy.tree.mount(root=None, config=conf)
-
-    def test_Routes_Dispatch(self):
-        """Check that routes package based URI dispatching works correctly."""
-        self.getPage('/hounslow')
-        self.assertStatus('200 OK')
-        self.assertBody('Welcome to Hounslow, pop. 10000')
-
-        self.getPage('/foo')
-        self.assertStatus('404 Not Found')
-
-        self.getPage('/surbiton')
-        self.assertStatus('200 OK')
-        self.assertBody('Welcome to Surbiton, pop. 10000')
-
-        self.getPage('/surbiton', method='POST', body='pop=1327')
-        self.assertStatus('200 OK')
-        self.assertBody('OK')
-        self.getPage('/surbiton')
-        self.assertStatus('200 OK')
-        self.assertHeader('Content-Language', 'en-GB')
-        self.assertBody('Welcome to Surbiton, pop. 1327')
diff --git a/lib/cherrypy/test/test_session.py b/lib/cherrypy/test/test_session.py
deleted file mode 100644
index ec1f8d70..00000000
--- a/lib/cherrypy/test/test_session.py
+++ /dev/null
@@ -1,550 +0,0 @@
-import os
-import platform
-import threading
-import time
-from http.client import HTTPConnection
-
-from shutil import which
-import pytest
-from path import Path
-from more_itertools import consume
-import portend
-
-import cherrypy
-from cherrypy._cpcompat import HTTPSConnection
-from cherrypy.lib import sessions
-from cherrypy.lib import reprconf
-from cherrypy.lib.httputil import response_codes
-from cherrypy.test import helper
-from cherrypy import _json as json
-
-localDir = Path(__file__).dirname()
-
-
-def http_methods_allowed(methods=['GET', 'HEAD']):
-    method = cherrypy.request.method.upper()
-    if method not in methods:
-        cherrypy.response.headers['Allow'] = ', '.join(methods)
-        raise cherrypy.HTTPError(405)
-
-
-cherrypy.tools.allow = cherrypy.Tool('on_start_resource', http_methods_allowed)
-
-
-def setup_server():
-
-    @cherrypy.config(**{
-        'tools.sessions.on': True,
-        'tools.sessions.storage_class': sessions.RamSession,
-        'tools.sessions.storage_path': localDir,
-        'tools.sessions.timeout': (1.0 / 60),
-        'tools.sessions.clean_freq': (1.0 / 60),
-    })
-    class Root:
-
-        @cherrypy.expose
-        def clear(self):
-            cherrypy.session.cache.clear()
-
-        @cherrypy.expose
-        @cherrypy.tools.json_out()
-        def data(self):
-            cherrypy.session['aha'] = 'foo'
-            return cherrypy.session._data
-
-        @cherrypy.expose
-        def testGen(self):
-            counter = cherrypy.session.get('counter', 0) + 1
-            cherrypy.session['counter'] = counter
-            yield str(counter)
-
-        @cherrypy.expose
-        def testStr(self):
-            counter = cherrypy.session.get('counter', 0) + 1
-            cherrypy.session['counter'] = counter
-            return str(counter)
-
-        @cherrypy.expose
-        @cherrypy.config(**{'tools.sessions.on': False})
-        def set_session_cls(self, new_cls_name):
-            new_cls = reprconf.attributes(new_cls_name)
-            cfg = {'tools.sessions.storage_class': new_cls}
-            self.__class__._cp_config.update(cfg)
-            if hasattr(cherrypy, 'session'):
-                del cherrypy.session
-            if new_cls.clean_thread:
-                new_cls.clean_thread.stop()
-                new_cls.clean_thread.unsubscribe()
-                del new_cls.clean_thread
-
-        @cherrypy.expose
-        def index(self):
-            sess = cherrypy.session
-            c = sess.get('counter', 0) + 1
-            time.sleep(0.01)
-            sess['counter'] = c
-            return str(c)
-
-        @cherrypy.expose
-        def keyin(self, key):
-            return str(key in cherrypy.session)
-
-        @cherrypy.expose
-        def delete(self):
-            cherrypy.session.delete()
-            sessions.expire()
-            return 'done'
-
-        @cherrypy.expose
-        def delkey(self, key):
-            del cherrypy.session[key]
-            return 'OK'
-
-        @cherrypy.expose
-        def redir_target(self):
-            return self._cp_config['tools.sessions.storage_class'].__name__
-
-        @cherrypy.expose
-        def iredir(self):
-            raise cherrypy.InternalRedirect('/redir_target')
-
-        @cherrypy.expose
-        @cherrypy.config(**{
-            'tools.allow.on': True,
-            'tools.allow.methods': ['GET'],
-        })
-        def restricted(self):
-            return cherrypy.request.method
-
-        @cherrypy.expose
-        def regen(self):
-            cherrypy.tools.sessions.regenerate()
-            return 'logged in'
-
-        @cherrypy.expose
-        def length(self):
-            return str(len(cherrypy.session))
-
-        @cherrypy.expose
-        @cherrypy.config(**{
-            'tools.sessions.path': '/session_cookie',
-            'tools.sessions.name': 'temp',
-            'tools.sessions.persistent': False,
-        })
-        def session_cookie(self):
-            # Must load() to start the clean thread.
-            cherrypy.session.load()
-            return cherrypy.session.id
-
-    cherrypy.tree.mount(Root())
-
-
-class SessionTest(helper.CPWebCase):
-    setup_server = staticmethod(setup_server)
-
-    @classmethod
-    def teardown_class(cls):
-        """Clean up sessions."""
-        super(cls, cls).teardown_class()
-        try:
-            files_to_clean = localDir.iterdir()  # Python 3.8+
-        except AttributeError:
-            files_to_clean = localDir.listdir()  # Python 3.6-3.7
-
-        consume(
-            file.remove_p()
-            for file in files_to_clean
-            if file.basename().startswith(
-                sessions.FileSession.SESSION_PREFIX
-            )
-        )
-
-    def test_0_Session(self):
-        self.getPage('/set_session_cls/cherrypy.lib.sessions.RamSession')
-        self.getPage('/clear')
-
-        # Test that a normal request gets the same id in the cookies.
-        # Note: this wouldn't work if /data didn't load the session.
-        self.getPage('/data')
-        assert self.body == b'{"aha": "foo"}'
-        c = self.cookies[0]
-        self.getPage('/data', self.cookies)
-        self.cookies[0] == c
-
-        self.getPage('/testStr')
-        assert self.body == b'1'
-        cookie_parts = dict([p.strip().split('=')
-                             for p in self.cookies[0][1].split(';')])
-        # Assert there is an 'expires' param
-        expected_cookie_keys = {'session_id', 'expires', 'Path', 'Max-Age'}
-        assert set(cookie_parts.keys()) == expected_cookie_keys
-        self.getPage('/testGen', self.cookies)
-        assert self.body == b'2'
-        self.getPage('/testStr', self.cookies)
-        assert self.body == b'3'
-        self.getPage('/data', self.cookies)
-        expected_data = {'counter': 3, 'aha': 'foo'}
-        assert json.decode(self.body.decode('utf-8')) == expected_data
-        self.getPage('/length', self.cookies)
-        assert self.body == b'2'
-        self.getPage('/delkey?key=counter', self.cookies)
-        assert self.status_code == 200
-
-        self.getPage('/set_session_cls/cherrypy.lib.sessions.FileSession')
-        self.getPage('/testStr')
-        assert self.body == b'1'
-        self.getPage('/testGen', self.cookies)
-        assert self.body == b'2'
-        self.getPage('/testStr', self.cookies)
-        assert self.body == b'3'
-        self.getPage('/delkey?key=counter', self.cookies)
-        assert self.status_code == 200
-
-        # Wait for the session.timeout (1 second)
-        time.sleep(2)
-        self.getPage('/')
-        assert self.body == b'1'
-        self.getPage('/length', self.cookies)
-        assert self.body == b'1'
-
-        # Test session __contains__
-        self.getPage('/keyin?key=counter', self.cookies)
-        assert self.body == b'True'
-        cookieset1 = self.cookies
-
-        # Make a new session and test __len__ again
-        self.getPage('/')
-        self.getPage('/length', self.cookies)
-        assert self.body == b'2'
-
-        # Test session delete
-        self.getPage('/delete', self.cookies)
-        assert self.body == b'done'
-        self.getPage('/delete', cookieset1)
-        assert self.body == b'done'
-
-        def f():
-            return [
-                x
-                for x in os.listdir(localDir)
-                if x.startswith('session-') and not x.endswith('.lock')
-            ]
-        assert f() == []
-
-        # Wait for the cleanup thread to delete remaining session files
-        self.getPage('/')
-        assert f() != []
-        time.sleep(2)
-        assert f() == []
-
-    def test_1_Ram_Concurrency(self):
-        self.getPage('/set_session_cls/cherrypy.lib.sessions.RamSession')
-        self._test_Concurrency()
-
-    def test_2_File_Concurrency(self):
-        self.getPage('/set_session_cls/cherrypy.lib.sessions.FileSession')
-        self._test_Concurrency()
-
-    def _test_Concurrency(self):
-        client_thread_count = 5
-        request_count = 30
-
-        # Get initial cookie
-        self.getPage('/')
-        assert self.body == b'1'
-        cookies = self.cookies
-
-        data_dict = {}
-        errors = []
-
-        def request(index):
-            if self.scheme == 'https':
-                c = HTTPSConnection('%s:%s' % (self.interface(), self.PORT))
-            else:
-                c = HTTPConnection('%s:%s' % (self.interface(), self.PORT))
-            for i in range(request_count):
-                c.putrequest('GET', '/')
-                for k, v in cookies:
-                    c.putheader(k, v)
-                c.endheaders()
-                response = c.getresponse()
-                body = response.read()
-                if response.status != 200 or not body.isdigit():
-                    errors.append((response.status, body))
-                else:
-                    data_dict[index] = max(data_dict[index], int(body))
-                # Uncomment the following line to prove threads overlap.
-                # sys.stdout.write("%d " % index)
-
-        # Start <request_count> requests from each of
-        # <client_thread_count> concurrent clients
-        ts = []
-        for c in range(client_thread_count):
-            data_dict[c] = 0
-            t = threading.Thread(target=request, args=(c,))
-            ts.append(t)
-            t.start()
-
-        for t in ts:
-            t.join()
-
-        hitcount = max(data_dict.values())
-        expected = 1 + (client_thread_count * request_count)
-
-        for e in errors:
-            print(e)
-        assert len(errors) == 0
-        assert hitcount == expected
-
-    def test_3_Redirect(self):
-        # Start a new session
-        self.getPage('/testStr')
-        self.getPage('/iredir', self.cookies)
-        assert self.body == b'FileSession'
-
-    def test_4_File_deletion(self):
-        # Start a new session
-        self.getPage('/testStr')
-        # Delete the session file manually and retry.
-        id = self.cookies[0][1].split(';', 1)[0].split('=', 1)[1]
-        path = os.path.join(localDir, 'session-' + id)
-        os.unlink(path)
-        self.getPage('/testStr', self.cookies)
-
-    def test_5_Error_paths(self):
-        self.getPage('/unknown/page')
-        self.assertErrorPage(404, "The path '/unknown/page' was not found.")
-
-        # Note: this path is *not* the same as above. The above
-        # takes a normal route through the session code; this one
-        # skips the session code's before_handler and only calls
-        # before_finalize (save) and on_end (close). So the session
-        # code has to survive calling save/close without init.
-        self.getPage('/restricted', self.cookies, method='POST')
-        self.assertErrorPage(405, response_codes[405][1])
-
-    def test_6_regenerate(self):
-        self.getPage('/testStr')
-        # grab the cookie ID
-        id1 = self.cookies[0][1].split(';', 1)[0].split('=', 1)[1]
-        self.getPage('/regen')
-        assert self.body == b'logged in'
-        id2 = self.cookies[0][1].split(';', 1)[0].split('=', 1)[1]
-        assert id1 != id2
-
-        self.getPage('/testStr')
-        # grab the cookie ID
-        id1 = self.cookies[0][1].split(';', 1)[0].split('=', 1)[1]
-        self.getPage('/testStr',
-                     headers=[
-                         ('Cookie',
-                          'session_id=maliciousid; '
-                          'expires=Sat, 27 Oct 2017 04:18:28 GMT; Path=/;')])
-        id2 = self.cookies[0][1].split(';', 1)[0].split('=', 1)[1]
-        assert id1 != id2
-        assert id2 != 'maliciousid'
-
-    def test_7_session_cookies(self):
-        self.getPage('/set_session_cls/cherrypy.lib.sessions.RamSession')
-        self.getPage('/clear')
-        self.getPage('/session_cookie')
-        # grab the cookie ID
-        cookie_parts = dict([p.strip().split('=')
-                            for p in self.cookies[0][1].split(';')])
-        # Assert there is no 'expires' param
-        assert set(cookie_parts.keys()) == {'temp', 'Path'}
-        id1 = cookie_parts['temp']
-        assert list(sessions.RamSession.cache) == [id1]
-
-        # Send another request in the same "browser session".
-        self.getPage('/session_cookie', self.cookies)
-        cookie_parts = dict([p.strip().split('=')
-                            for p in self.cookies[0][1].split(';')])
-        # Assert there is no 'expires' param
-        assert set(cookie_parts.keys()) == {'temp', 'Path'}
-        assert self.body.decode('utf-8') == id1
-        assert list(sessions.RamSession.cache) == [id1]
-
-        # Simulate a browser close by just not sending the cookies
-        self.getPage('/session_cookie')
-        # grab the cookie ID
-        cookie_parts = dict([p.strip().split('=')
-                            for p in self.cookies[0][1].split(';')])
-        # Assert there is no 'expires' param
-        assert set(cookie_parts.keys()) == {'temp', 'Path'}
-        # Assert a new id has been generated...
-        id2 = cookie_parts['temp']
-        assert id1 != id2
-        assert set(sessions.RamSession.cache.keys()) == {id1, id2}
-
-        # Wait for the session.timeout on both sessions
-        time.sleep(2.5)
-        cache = list(sessions.RamSession.cache)
-        if cache:
-            if cache == [id2]:
-                self.fail('The second session did not time out.')
-            else:
-                self.fail('Unknown session id in cache: %r', cache)
-
-    def test_8_Ram_Cleanup(self):
-        def lock():
-            s1 = sessions.RamSession()
-            s1.acquire_lock()
-            time.sleep(1)
-            s1.release_lock()
-
-        t = threading.Thread(target=lock)
-        t.start()
-        start = time.time()
-        while not sessions.RamSession.locks and time.time() - start < 5:
-            time.sleep(0.01)
-        assert len(sessions.RamSession.locks) == 1, 'Lock not acquired'
-        s2 = sessions.RamSession()
-        s2.clean_up()
-        msg = 'Clean up should not remove active lock'
-        assert len(sessions.RamSession.locks) == 1, msg
-        t.join()
-
-
-def is_memcached_present():
-    executable = which('memcached')
-    return bool(executable)
-
-
-@pytest.fixture(scope='session')
-def memcached_server_present():
-    is_memcached_present() or pytest.skip('memcached not available')
-
-
-@pytest.fixture()
-def memcached_client_present():
-    pytest.importorskip('memcache')
-
-
-@pytest.fixture(scope='session')
-def memcached_instance(request, watcher_getter, memcached_server_present):
-    """Start up an instance of memcached."""
-
-    port = portend.find_available_local_port()
-
-    def is_occupied():
-        try:
-            portend.Checker().assert_free('localhost', port)
-        except Exception:
-            return True
-        return False
-
-    proc = watcher_getter(
-        name='memcached',
-        arguments=['-p', str(port)],
-        checker=is_occupied,
-        request=request,
-    )
-    return locals()
-
-
-@pytest.fixture
-def memcached_configured(
-    memcached_instance, monkeypatch,
-    memcached_client_present,
-):
-    server = 'localhost:{port}'.format_map(memcached_instance)
-    monkeypatch.setattr(
-        sessions.MemcachedSession,
-        'servers',
-        [server],
-    )
-
-
-@pytest.mark.skipif(
-    platform.system() == 'Windows',
-    reason='pytest-services helper does not work under Windows',
-)
-@pytest.mark.usefixtures('memcached_configured')
-class MemcachedSessionTest(helper.CPWebCase):
-    setup_server = staticmethod(setup_server)
-
-    def test_0_Session(self):
-        self.getPage(
-            '/set_session_cls/cherrypy.lib.sessions.MemcachedSession'
-        )
-
-        self.getPage('/testStr')
-        assert self.body == b'1'
-        self.getPage('/testGen', self.cookies)
-        assert self.body == b'2'
-        self.getPage('/testStr', self.cookies)
-        assert self.body == b'3'
-        self.getPage('/length', self.cookies)
-        self.assertErrorPage(500)
-        assert b'NotImplementedError' in self.body
-        self.getPage('/delkey?key=counter', self.cookies)
-        assert self.status_code == 200
-
-        # Wait for the session.timeout (1 second)
-        time.sleep(1.25)
-        self.getPage('/')
-        assert self.body == b'1'
-
-        # Test session __contains__
-        self.getPage('/keyin?key=counter', self.cookies)
-        assert self.body == b'True'
-
-        # Test session delete
-        self.getPage('/delete', self.cookies)
-        assert self.body == b'done'
-
-    def test_1_Concurrency(self):
-        client_thread_count = 5
-        request_count = 30
-
-        # Get initial cookie
-        self.getPage('/')
-        assert self.body == b'1'
-        cookies = self.cookies
-
-        data_dict = {}
-
-        def request(index):
-            for i in range(request_count):
-                self.getPage('/', cookies)
-                # Uncomment the following line to prove threads overlap.
-                # sys.stdout.write("%d " % index)
-            if not self.body.isdigit():
-                self.fail(self.body)
-            data_dict[index] = int(self.body)
-
-        # Start <request_count> concurrent requests from
-        # each of <client_thread_count> clients
-        ts = []
-        for c in range(client_thread_count):
-            data_dict[c] = 0
-            t = threading.Thread(target=request, args=(c,))
-            ts.append(t)
-            t.start()
-
-        for t in ts:
-            t.join()
-
-        hitcount = max(data_dict.values())
-        expected = 1 + (client_thread_count * request_count)
-        assert hitcount == expected
-
-    def test_3_Redirect(self):
-        # Start a new session
-        self.getPage('/testStr')
-        self.getPage('/iredir', self.cookies)
-        assert self.body == b'MemcachedSession'
-
-    def test_5_Error_paths(self):
-        self.getPage('/unknown/page')
-        self.assertErrorPage(
-            404, "The path '/unknown/page' was not found.")
-
-        # Note: this path is *not* the same as above. The above
-        # takes a normal route through the session code; this one
-        # skips the session code's before_handler and only calls
-        # before_finalize (save) and on_end (close). So the session
-        # code has to survive calling save/close without init.
-        self.getPage('/restricted', self.cookies, method='POST')
-        self.assertErrorPage(405, response_codes[405][1])
diff --git a/lib/cherrypy/test/test_sessionauthenticate.py b/lib/cherrypy/test/test_sessionauthenticate.py
deleted file mode 100644
index 63053fcb..00000000
--- a/lib/cherrypy/test/test_sessionauthenticate.py
+++ /dev/null
@@ -1,61 +0,0 @@
-import cherrypy
-from cherrypy.test import helper
-
-
-class SessionAuthenticateTest(helper.CPWebCase):
-
-    @staticmethod
-    def setup_server():
-
-        def check(username, password):
-            # Dummy check_username_and_password function
-            if username != 'test' or password != 'password':
-                return 'Wrong login/password'
-
-        def augment_params():
-            # A simple tool to add some things to request.params
-            # This is to check to make sure that session_auth can handle
-            # request params (ticket #780)
-            cherrypy.request.params['test'] = 'test'
-
-        cherrypy.tools.augment_params = cherrypy.Tool(
-            'before_handler', augment_params, None, priority=30)
-
-        class Test:
-
-            _cp_config = {
-                'tools.sessions.on': True,
-                'tools.session_auth.on': True,
-                'tools.session_auth.check_username_and_password': check,
-                'tools.augment_params.on': True,
-            }
-
-            @cherrypy.expose
-            def index(self, **kwargs):
-                return 'Hi %s, you are logged in' % cherrypy.request.login
-
-        cherrypy.tree.mount(Test())
-
-    def testSessionAuthenticate(self):
-        # request a page and check for login form
-        self.getPage('/')
-        self.assertInBody('<form method="post" action="do_login">')
-
-        # setup credentials
-        login_body = 'username=test&password=password&from_page=/'
-
-        # attempt a login
-        self.getPage('/do_login', method='POST', body=login_body)
-        self.assertStatus((302, 303))
-
-        # get the page now that we are logged in
-        self.getPage('/', self.cookies)
-        self.assertBody('Hi test, you are logged in')
-
-        # do a logout
-        self.getPage('/do_logout', self.cookies, method='POST')
-        self.assertStatus((302, 303))
-
-        # verify we are logged out
-        self.getPage('/', self.cookies)
-        self.assertInBody('<form method="post" action="do_login">')
diff --git a/lib/cherrypy/test/test_states.py b/lib/cherrypy/test/test_states.py
deleted file mode 100644
index 64177762..00000000
--- a/lib/cherrypy/test/test_states.py
+++ /dev/null
@@ -1,471 +0,0 @@
-import os
-import signal
-import time
-from http.client import BadStatusLine
-
-import pytest
-import portend
-
-import cherrypy
-import cherrypy.process.servers
-from cherrypy.test import helper
-
-
-engine = cherrypy.engine
-thisdir = os.path.join(os.getcwd(), os.path.dirname(__file__))
-
-
-class Dependency:
-
-    def __init__(self, bus):
-        self.bus = bus
-        self.running = False
-        self.startcount = 0
-        self.gracecount = 0
-        self.threads = {}
-
-    def subscribe(self):
-        self.bus.subscribe('start', self.start)
-        self.bus.subscribe('stop', self.stop)
-        self.bus.subscribe('graceful', self.graceful)
-        self.bus.subscribe('start_thread', self.startthread)
-        self.bus.subscribe('stop_thread', self.stopthread)
-
-    def start(self):
-        self.running = True
-        self.startcount += 1
-
-    def stop(self):
-        self.running = False
-
-    def graceful(self):
-        self.gracecount += 1
-
-    def startthread(self, thread_id):
-        self.threads[thread_id] = None
-
-    def stopthread(self, thread_id):
-        del self.threads[thread_id]
-
-
-db_connection = Dependency(engine)
-
-
-def setup_server():
-    class Root:
-
-        @cherrypy.expose
-        def index(self):
-            return 'Hello World'
-
-        @cherrypy.expose
-        def ctrlc(self):
-            raise KeyboardInterrupt()
-
-        @cherrypy.expose
-        def graceful(self):
-            engine.graceful()
-            return 'app was (gracefully) restarted succesfully'
-
-    cherrypy.tree.mount(Root())
-    cherrypy.config.update({
-        'environment': 'test_suite',
-    })
-
-    db_connection.subscribe()
-
-# ------------ Enough helpers. Time for real live test cases. ------------ #
-
-
-class ServerStateTests(helper.CPWebCase):
-    setup_server = staticmethod(setup_server)
-
-    def setUp(self):
-        cherrypy.server.socket_timeout = 0.1
-        self.do_gc_test = False
-
-    def test_0_NormalStateFlow(self):
-        engine.stop()
-        # Our db_connection should not be running
-        self.assertEqual(db_connection.running, False)
-        self.assertEqual(db_connection.startcount, 1)
-        self.assertEqual(len(db_connection.threads), 0)
-
-        # Test server start
-        engine.start()
-        self.assertEqual(engine.state, engine.states.STARTED)
-
-        host = cherrypy.server.socket_host
-        port = cherrypy.server.socket_port
-        portend.occupied(host, port, timeout=0.1)
-
-        # The db_connection should be running now
-        self.assertEqual(db_connection.running, True)
-        self.assertEqual(db_connection.startcount, 2)
-        self.assertEqual(len(db_connection.threads), 0)
-
-        self.getPage('/')
-        self.assertBody('Hello World')
-        self.assertEqual(len(db_connection.threads), 1)
-
-        # Test engine stop. This will also stop the HTTP server.
-        engine.stop()
-        self.assertEqual(engine.state, engine.states.STOPPED)
-
-        # Verify that our custom stop function was called
-        self.assertEqual(db_connection.running, False)
-        self.assertEqual(len(db_connection.threads), 0)
-
-        # Block the main thread now and verify that exit() works.
-        def exittest():
-            self.getPage('/')
-            self.assertBody('Hello World')
-            engine.exit()
-        cherrypy.server.start()
-        engine.start_with_callback(exittest)
-        engine.block()
-        self.assertEqual(engine.state, engine.states.EXITING)
-
-    def test_1_Restart(self):
-        cherrypy.server.start()
-        engine.start()
-
-        # The db_connection should be running now
-        self.assertEqual(db_connection.running, True)
-        grace = db_connection.gracecount
-
-        self.getPage('/')
-        self.assertBody('Hello World')
-        self.assertEqual(len(db_connection.threads), 1)
-
-        # Test server restart from this thread
-        engine.graceful()
-        self.assertEqual(engine.state, engine.states.STARTED)
-        self.getPage('/')
-        self.assertBody('Hello World')
-        self.assertEqual(db_connection.running, True)
-        self.assertEqual(db_connection.gracecount, grace + 1)
-        self.assertEqual(len(db_connection.threads), 1)
-
-        # Test server restart from inside a page handler
-        self.getPage('/graceful')
-        self.assertEqual(engine.state, engine.states.STARTED)
-        self.assertBody('app was (gracefully) restarted succesfully')
-        self.assertEqual(db_connection.running, True)
-        self.assertEqual(db_connection.gracecount, grace + 2)
-        # Since we are requesting synchronously, is only one thread used?
-        # Note that the "/graceful" request has been flushed.
-        self.assertEqual(len(db_connection.threads), 0)
-
-        engine.stop()
-        self.assertEqual(engine.state, engine.states.STOPPED)
-        self.assertEqual(db_connection.running, False)
-        self.assertEqual(len(db_connection.threads), 0)
-
-    def test_2_KeyboardInterrupt(self):
-        # Raise a keyboard interrupt in the HTTP server's main thread.
-        # We must start the server in this, the main thread
-        engine.start()
-        cherrypy.server.start()
-
-        self.persistent = True
-        try:
-            # Make the first request and assert there's no "Connection: close".
-            self.getPage('/')
-            self.assertStatus('200 OK')
-            self.assertBody('Hello World')
-            self.assertNoHeader('Connection')
-
-            cherrypy.server.httpserver.interrupt = KeyboardInterrupt
-            engine.block()
-
-            self.assertEqual(db_connection.running, False)
-            self.assertEqual(len(db_connection.threads), 0)
-            self.assertEqual(engine.state, engine.states.EXITING)
-        finally:
-            self.persistent = False
-
-        # Raise a keyboard interrupt in a page handler; on multithreaded
-        # servers, this should occur in one of the worker threads.
-        # This should raise a BadStatusLine error, since the worker
-        # thread will just die without writing a response.
-        engine.start()
-        cherrypy.server.start()
-        # From python3.5 a new exception is retuned when the connection
-        # ends abruptly:
-        #   http.client.RemoteDisconnected
-        # RemoteDisconnected is a subclass of:
-        #   (ConnectionResetError, http.client.BadStatusLine)
-        # and ConnectionResetError is an indirect subclass of:
-        #    OSError
-        # From python 3.3 an up socket.error is an alias to OSError
-        # following PEP-3151, therefore http.client.RemoteDisconnected
-        # is considered a socket.error.
-        #
-        # raise_subcls specifies the classes that are not going
-        # to be considered as a socket.error for the retries.
-        # Given that RemoteDisconnected is part BadStatusLine
-        # we can use the same call for all py3 versions without
-        # sideffects. python < 3.5 will raise directly BadStatusLine
-        # which is not a subclass for socket.error/OSError.
-        try:
-            self.getPage('/ctrlc', raise_subcls=BadStatusLine)
-        except BadStatusLine:
-            pass
-        else:
-            print(self.body)
-            self.fail('AssertionError: BadStatusLine not raised')
-
-        engine.block()
-        self.assertEqual(db_connection.running, False)
-        self.assertEqual(len(db_connection.threads), 0)
-
-    @pytest.mark.xfail(
-        'sys.platform == "Darwin" '
-        'and sys.version_info > (3, 7) '
-        'and os.environ["TRAVIS"]',
-        reason='https://github.com/cherrypy/cherrypy/issues/1693',
-    )
-    def test_4_Autoreload(self):
-        # If test_3 has not been executed, the server won't be stopped,
-        # so we'll have to do it.
-        if engine.state != engine.states.EXITING:
-            engine.exit()
-
-        # Start the demo script in a new process
-        p = helper.CPProcess(ssl=(self.scheme.lower() == 'https'))
-        p.write_conf(extra='test_case_name: "test_4_Autoreload"')
-        p.start(imports='cherrypy.test._test_states_demo')
-        try:
-            self.getPage('/start')
-            start = float(self.body)
-
-            # Give the autoreloader time to cache the file time.
-            time.sleep(2)
-
-            # Touch the file
-            os.utime(os.path.join(thisdir, '_test_states_demo.py'), None)
-
-            # Give the autoreloader time to re-exec the process
-            time.sleep(2)
-            host = cherrypy.server.socket_host
-            port = cherrypy.server.socket_port
-            portend.occupied(host, port, timeout=5)
-
-            self.getPage('/start')
-            if not (float(self.body) > start):
-                raise AssertionError('start time %s not greater than %s' %
-                                     (float(self.body), start))
-        finally:
-            # Shut down the spawned process
-            self.getPage('/exit')
-        p.join()
-
-    def test_5_Start_Error(self):
-        # If test_3 has not been executed, the server won't be stopped,
-        # so we'll have to do it.
-        if engine.state != engine.states.EXITING:
-            engine.exit()
-
-        # If a process errors during start, it should stop the engine
-        # and exit with a non-zero exit code.
-        p = helper.CPProcess(ssl=(self.scheme.lower() == 'https'),
-                             wait=True)
-        p.write_conf(
-            extra="""starterror: True
-test_case_name: "test_5_Start_Error"
-"""
-        )
-        p.start(imports='cherrypy.test._test_states_demo')
-        if p.exit_code == 0:
-            self.fail('Process failed to return nonzero exit code.')
-
-
-class PluginTests(helper.CPWebCase):
-
-    def test_daemonize(self):
-        if os.name not in ['posix']:
-            return self.skip('skipped (not on posix) ')
-        self.HOST = '127.0.0.1'
-        self.PORT = 8081
-        # Spawn the process and wait, when this returns, the original process
-        # is finished.  If it daemonized properly, we should still be able
-        # to access pages.
-        p = helper.CPProcess(ssl=(self.scheme.lower() == 'https'),
-                             wait=True, daemonize=True,
-                             socket_host='127.0.0.1',
-                             socket_port=8081)
-        p.write_conf(
-            extra='test_case_name: "test_daemonize"')
-        p.start(imports='cherrypy.test._test_states_demo')
-        try:
-            # Just get the pid of the daemonization process.
-            self.getPage('/pid')
-            self.assertStatus(200)
-            page_pid = int(self.body)
-            self.assertEqual(page_pid, p.get_pid())
-        finally:
-            # Shut down the spawned process
-            self.getPage('/exit')
-        p.join()
-
-        # Wait until here to test the exit code because we want to ensure
-        # that we wait for the daemon to finish running before we fail.
-        if p.exit_code != 0:
-            self.fail('Daemonized parent process failed to exit cleanly.')
-
-
-class SignalHandlingTests(helper.CPWebCase):
-
-    def test_SIGHUP_tty(self):
-        # When not daemonized, SIGHUP should shut down the server.
-        try:
-            from signal import SIGHUP
-        except ImportError:
-            return self.skip('skipped (no SIGHUP) ')
-
-        # Spawn the process.
-        p = helper.CPProcess(ssl=(self.scheme.lower() == 'https'))
-        p.write_conf(
-            extra='test_case_name: "test_SIGHUP_tty"')
-        p.start(imports='cherrypy.test._test_states_demo')
-        # Send a SIGHUP
-        os.kill(p.get_pid(), SIGHUP)
-        # This might hang if things aren't working right, but meh.
-        p.join()
-
-    def test_SIGHUP_daemonized(self):
-        # When daemonized, SIGHUP should restart the server.
-        try:
-            from signal import SIGHUP
-        except ImportError:
-            return self.skip('skipped (no SIGHUP) ')
-
-        if os.name not in ['posix']:
-            return self.skip('skipped (not on posix) ')
-
-        # Spawn the process and wait, when this returns, the original process
-        # is finished.  If it daemonized properly, we should still be able
-        # to access pages.
-        p = helper.CPProcess(ssl=(self.scheme.lower() == 'https'),
-                             wait=True, daemonize=True)
-        p.write_conf(
-            extra='test_case_name: "test_SIGHUP_daemonized"')
-        p.start(imports='cherrypy.test._test_states_demo')
-
-        pid = p.get_pid()
-        try:
-            # Send a SIGHUP
-            os.kill(pid, SIGHUP)
-            # Give the server some time to restart
-            time.sleep(2)
-            self.getPage('/pid')
-            self.assertStatus(200)
-            new_pid = int(self.body)
-            self.assertNotEqual(new_pid, pid)
-        finally:
-            # Shut down the spawned process
-            self.getPage('/exit')
-        p.join()
-
-    def _require_signal_and_kill(self, signal_name):
-        if not hasattr(signal, signal_name):
-            self.skip('skipped (no %(signal_name)s)' % vars())
-
-        if not hasattr(os, 'kill'):
-            self.skip('skipped (no os.kill)')
-
-    def test_SIGTERM(self):
-        'SIGTERM should shut down the server whether daemonized or not.'
-        self._require_signal_and_kill('SIGTERM')
-
-        # Spawn a normal, undaemonized process.
-        p = helper.CPProcess(ssl=(self.scheme.lower() == 'https'))
-        p.write_conf(
-            extra='test_case_name: "test_SIGTERM"')
-        p.start(imports='cherrypy.test._test_states_demo')
-        # Send a SIGTERM
-        os.kill(p.get_pid(), signal.SIGTERM)
-        # This might hang if things aren't working right, but meh.
-        p.join()
-
-        if os.name in ['posix']:
-            # Spawn a daemonized process and test again.
-            p = helper.CPProcess(ssl=(self.scheme.lower() == 'https'),
-                                 wait=True, daemonize=True)
-            p.write_conf(
-                extra='test_case_name: "test_SIGTERM_2"')
-            p.start(imports='cherrypy.test._test_states_demo')
-            # Send a SIGTERM
-            os.kill(p.get_pid(), signal.SIGTERM)
-            # This might hang if things aren't working right, but meh.
-            p.join()
-
-    def test_signal_handler_unsubscribe(self):
-        self._require_signal_and_kill('SIGTERM')
-
-        # Although Windows has `os.kill` and SIGTERM is defined, the
-        #  platform does not implement signals and sending SIGTERM
-        #  will result in a forced termination of the process.
-        #  Therefore, this test is not suitable for Windows.
-        if os.name == 'nt':
-            self.skip('SIGTERM not available')
-
-        # Spawn a normal, undaemonized process.
-        p = helper.CPProcess(ssl=(self.scheme.lower() == 'https'))
-        p.write_conf(
-            extra="""unsubsig: True
-test_case_name: "test_signal_handler_unsubscribe"
-""")
-        p.start(imports='cherrypy.test._test_states_demo')
-        # Ask the process to quit
-        os.kill(p.get_pid(), signal.SIGTERM)
-        # This might hang if things aren't working right, but meh.
-        p.join()
-
-        # Assert the old handler ran.
-        with open(p.error_log, 'rb') as f:
-            log_lines = list(f)
-            assert any(
-                line.endswith(b'I am an old SIGTERM handler.\n')
-                for line in log_lines
-            )
-
-
-def test_safe_wait_INADDR_ANY():  # pylint: disable=invalid-name
-    """Wait on INADDR_ANY should not raise IOError.
-
-    In cases where the loopback interface does not exist, CherryPy
-    cannot effectively determine if a port binding to INADDR_ANY was
-    effected. In this situation, CherryPy should assume that it failed
-    to detect the binding (not that the binding failed) and only warn
-    that it could not verify it.
-    """
-    # At such a time that CherryPy can reliably determine one or more
-    #  viable IP addresses of the host, this test may be removed.
-
-    # Simulate the behavior we observe when no loopback interface is
-    #  present by: finding a port that's not occupied, then wait on it.
-
-    free_port = portend.find_available_local_port()
-
-    servers = cherrypy.process.servers
-
-    inaddr_any = '0.0.0.0'
-
-    # Wait on the free port that's unbound
-    with pytest.warns(
-            UserWarning,
-            match='Unable to verify that the server is bound on ',
-    ) as warnings:
-        # pylint: disable=protected-access
-        with servers._safe_wait(inaddr_any, free_port):
-            portend.occupied(inaddr_any, free_port, timeout=1)
-    assert len(warnings) == 1
-
-    # The wait should still raise an IO error if INADDR_ANY was
-    #  not supplied.
-    with pytest.raises(IOError):
-        # pylint: disable=protected-access
-        with servers._safe_wait('127.0.0.1', free_port):
-            portend.occupied('127.0.0.1', free_port, timeout=1)
diff --git a/lib/cherrypy/test/test_static.py b/lib/cherrypy/test/test_static.py
deleted file mode 100644
index bfe2f40f..00000000
--- a/lib/cherrypy/test/test_static.py
+++ /dev/null
@@ -1,464 +0,0 @@
-# -*- coding: utf-8 -*-
-import io
-import os
-import sys
-import re
-import platform
-import tempfile
-import urllib.parse
-import unittest.mock
-from http.client import HTTPConnection
-
-import pytest
-import py.path
-import path
-
-import cherrypy
-from cherrypy.lib import static
-from cherrypy._cpcompat import HTTPSConnection, ntou, tonative
-from cherrypy.test import helper
-
-
-@pytest.fixture
-def unicode_filesystem(tmpdir):
-    _check_unicode_filesystem(tmpdir)
-
-
-def _check_unicode_filesystem(tmpdir):
-    filename = tmpdir / ntou('☃', 'utf-8')
-    tmpl = 'File system encoding ({encoding}) cannot support unicode filenames'
-    msg = tmpl.format(encoding=sys.getfilesystemencoding())
-    try:
-        io.open(str(filename), 'w').close()
-    except UnicodeEncodeError:
-        pytest.skip(msg)
-
-
-def ensure_unicode_filesystem():
-    """
-    TODO: replace with simply pytest fixtures once webtest.TestCase
-    no longer implies unittest.
-    """
-    tmpdir = py.path.local(tempfile.mkdtemp())
-    try:
-        _check_unicode_filesystem(tmpdir)
-    finally:
-        tmpdir.remove()
-
-
-curdir = path.Path(__file__).dirname()
-has_space_filepath = curdir / 'static' / 'has space.html'
-bigfile_filepath = curdir / 'static' / 'bigfile.log'
-
-# The file size needs to be big enough such that half the size of it
-# won't be socket-buffered (or server-buffered) all in one go. See
-# test_file_stream.
-MB = 2 ** 20
-BIGFILE_SIZE = 32 * MB
-
-
-class StaticTest(helper.CPWebCase):
-    files_to_remove = []
-
-    @staticmethod
-    def setup_server():
-        if not os.path.exists(has_space_filepath):
-            with open(has_space_filepath, 'wb') as f:
-                f.write(b'Hello, world\r\n')
-        needs_bigfile = (
-            not os.path.exists(bigfile_filepath) or
-            os.path.getsize(bigfile_filepath) != BIGFILE_SIZE
-        )
-        if needs_bigfile:
-            with open(bigfile_filepath, 'wb') as f:
-                f.write(b'x' * BIGFILE_SIZE)
-
-        class Root:
-
-            @cherrypy.expose
-            @cherrypy.config(**{'response.stream': True})
-            def bigfile(self):
-                self.f = static.serve_file(bigfile_filepath)
-                return self.f
-
-            @cherrypy.expose
-            def tell(self):
-                if self.f.input.closed:
-                    return ''
-                return repr(self.f.input.tell()).rstrip('L')
-
-            @cherrypy.expose
-            def fileobj(self):
-                f = open(os.path.join(curdir, 'style.css'), 'rb')
-                return static.serve_fileobj(f, content_type='text/css')
-
-            @cherrypy.expose
-            def bytesio(self):
-                f = io.BytesIO(b'Fee\nfie\nfo\nfum')
-                return static.serve_fileobj(f, content_type='text/plain')
-
-            @cherrypy.expose
-            def serve_file_utf8_filename(self):
-                return static.serve_file(
-                    __file__,
-                    disposition='attachment',
-                    name='has_utf-8_character_☃.html')
-
-            @cherrypy.expose
-            def serve_fileobj_utf8_filename(self):
-                return static.serve_fileobj(
-                    io.BytesIO('☃\nfie\nfo\nfum'.encode('utf-8')),
-                    disposition='attachment',
-                    name='has_utf-8_character_☃.html')
-
-        class Static:
-
-            @cherrypy.expose
-            def index(self):
-                return 'You want the Baron? You can have the Baron!'
-
-            @cherrypy.expose
-            def dynamic(self):
-                return 'This is a DYNAMIC page'
-
-        root = Root()
-        root.static = Static()
-
-        rootconf = {
-            '/static': {
-                'tools.staticdir.on': True,
-                'tools.staticdir.dir': 'static',
-                'tools.staticdir.root': curdir,
-            },
-            '/static-long': {
-                'tools.staticdir.on': True,
-                'tools.staticdir.dir': r'\\?\%s' % curdir,
-            },
-            '/style.css': {
-                'tools.staticfile.on': True,
-                'tools.staticfile.filename': os.path.join(curdir, 'style.css'),
-            },
-            '/docroot': {
-                'tools.staticdir.on': True,
-                'tools.staticdir.root': curdir,
-                'tools.staticdir.dir': 'static',
-                'tools.staticdir.index': 'index.html',
-            },
-            '/error': {
-                'tools.staticdir.on': True,
-                'request.show_tracebacks': True,
-            },
-            '/404test': {
-                'tools.staticdir.on': True,
-                'tools.staticdir.root': curdir,
-                'tools.staticdir.dir': 'static',
-                'error_page.404': error_page_404,
-            }
-        }
-        rootApp = cherrypy.Application(root)
-        rootApp.merge(rootconf)
-
-        test_app_conf = {
-            '/test': {
-                'tools.staticdir.index': 'index.html',
-                'tools.staticdir.on': True,
-                'tools.staticdir.root': curdir,
-                'tools.staticdir.dir': 'static',
-            },
-        }
-        testApp = cherrypy.Application(Static())
-        testApp.merge(test_app_conf)
-
-        vhost = cherrypy._cpwsgi.VirtualHost(rootApp, {'virt.net': testApp})
-        cherrypy.tree.graft(vhost)
-
-    @classmethod
-    def teardown_class(cls):
-        super(cls, cls).teardown_class()
-        files_to_remove = has_space_filepath, bigfile_filepath
-        files_to_remove += tuple(cls.files_to_remove)
-        for file in files_to_remove:
-            file.remove_p()
-
-    def test_static(self):
-        self.getPage('/static/index.html')
-        self.assertStatus('200 OK')
-        self.assertHeader('Content-Type', 'text/html')
-        self.assertBody('Hello, world\r\n')
-
-        # Using a staticdir.root value in a subdir...
-        self.getPage('/docroot/index.html')
-        self.assertStatus('200 OK')
-        self.assertHeader('Content-Type', 'text/html')
-        self.assertBody('Hello, world\r\n')
-
-        # Check a filename with spaces in it
-        self.getPage('/static/has%20space.html')
-        self.assertStatus('200 OK')
-        self.assertHeader('Content-Type', 'text/html')
-        self.assertBody('Hello, world\r\n')
-
-        self.getPage('/style.css')
-        self.assertStatus('200 OK')
-        self.assertHeader('Content-Type', 'text/css')
-        # Note: The body should be exactly 'Dummy stylesheet\n', but
-        #   unfortunately some tools such as WinZip sometimes turn \n
-        #   into \r\n on Windows when extracting the CherryPy tarball so
-        #   we just check the content
-        self.assertMatchesBody('^Dummy stylesheet')
-
-        # Check a filename with utf-8 characters in it
-        ascii_fn = 'has_utf-8_character_.html'
-        url_quote_fn = 'has_utf-8_character_%E2%98%83.html'  # %E2%98%83 == ☃
-        expected_content_disposition = (
-            'attachment; filename="{!s}"; filename*=UTF-8\'\'{!s}'.
-            format(ascii_fn, url_quote_fn)
-        )
-
-        self.getPage('/serve_file_utf8_filename')
-        self.assertStatus('200 OK')
-        self.assertHeader('Content-Disposition', expected_content_disposition)
-
-        self.getPage('/serve_fileobj_utf8_filename')
-        self.assertStatus('200 OK')
-        self.assertHeader('Content-Disposition', expected_content_disposition)
-
-    @pytest.mark.skipif(platform.system() != 'Windows', reason='Windows only')
-    def test_static_longpath(self):
-        """Test serving of a file in subdir of a Windows long-path
-        staticdir."""
-        self.getPage('/static-long/static/index.html')
-        self.assertStatus('200 OK')
-        self.assertHeader('Content-Type', 'text/html')
-        self.assertBody('Hello, world\r\n')
-
-    def test_fallthrough(self):
-        # Test that NotFound will then try dynamic handlers (see [878]).
-        self.getPage('/static/dynamic')
-        self.assertBody('This is a DYNAMIC page')
-
-        # Check a directory via fall-through to dynamic handler.
-        self.getPage('/static/')
-        self.assertStatus('200 OK')
-        self.assertHeader('Content-Type', 'text/html;charset=utf-8')
-        self.assertBody('You want the Baron? You can have the Baron!')
-
-    def test_index(self):
-        # Check a directory via "staticdir.index".
-        self.getPage('/docroot/')
-        self.assertStatus('200 OK')
-        self.assertHeader('Content-Type', 'text/html')
-        self.assertBody('Hello, world\r\n')
-        # The same page should be returned even if redirected.
-        self.getPage('/docroot')
-        self.assertStatus(301)
-        self.assertHeader('Location', '%s/docroot/' % self.base())
-        self.assertMatchesBody(
-            "This resource .* <a href=(['\"])%s/docroot/\\1>"
-            '%s/docroot/</a>.'
-            % (self.base(), self.base())
-        )
-
-    def test_config_errors(self):
-        # Check that we get an error if no .file or .dir
-        self.getPage('/error/thing.html')
-        self.assertErrorPage(500)
-        if sys.version_info >= (3, 3):
-            errmsg = (
-                r'TypeError: staticdir\(\) missing 2 '
-                'required positional arguments'
-            )
-        else:
-            errmsg = (
-                r'TypeError: staticdir\(\) takes at least 2 '
-                r'(positional )?arguments \(0 given\)'
-            )
-        self.assertMatchesBody(errmsg.encode('ascii'))
-
-    def test_security(self):
-        # Test up-level security
-        self.getPage('/static/../../test/style.css')
-        self.assertStatus((400, 403))
-
-    def test_modif(self):
-        # Test modified-since on a reasonably-large file
-        self.getPage('/static/dirback.jpg')
-        self.assertStatus('200 OK')
-        lastmod = ''
-        for k, v in self.headers:
-            if k == 'Last-Modified':
-                lastmod = v
-        ims = ('If-Modified-Since', lastmod)
-        self.getPage('/static/dirback.jpg', headers=[ims])
-        self.assertStatus(304)
-        self.assertNoHeader('Content-Type')
-        self.assertNoHeader('Content-Length')
-        self.assertNoHeader('Content-Disposition')
-        self.assertBody('')
-
-    def test_755_vhost(self):
-        self.getPage('/test/', [('Host', 'virt.net')])
-        self.assertStatus(200)
-        self.getPage('/test', [('Host', 'virt.net')])
-        self.assertStatus(301)
-        self.assertHeader('Location', self.scheme + '://virt.net/test/')
-
-    def test_serve_fileobj(self):
-        self.getPage('/fileobj')
-        self.assertStatus('200 OK')
-        self.assertHeader('Content-Type', 'text/css;charset=utf-8')
-        self.assertMatchesBody('^Dummy stylesheet')
-
-    def test_serve_bytesio(self):
-        self.getPage('/bytesio')
-        self.assertStatus('200 OK')
-        self.assertHeader('Content-Type', 'text/plain;charset=utf-8')
-        self.assertHeader('Content-Length', 14)
-        self.assertMatchesBody('Fee\nfie\nfo\nfum')
-
-    @pytest.mark.xfail(reason='#1475')
-    def test_file_stream(self):
-        if cherrypy.server.protocol_version != 'HTTP/1.1':
-            return self.skip()
-
-        self.PROTOCOL = 'HTTP/1.1'
-
-        # Make an initial request
-        self.persistent = True
-        conn = self.HTTP_CONN
-        conn.putrequest('GET', '/bigfile', skip_host=True)
-        conn.putheader('Host', self.HOST)
-        conn.endheaders()
-        response = conn.response_class(conn.sock, method='GET')
-        response.begin()
-        self.assertEqual(response.status, 200)
-
-        body = b''
-        remaining = BIGFILE_SIZE
-        while remaining > 0:
-            data = response.fp.read(65536)
-            if not data:
-                break
-            body += data
-            remaining -= len(data)
-
-            if self.scheme == 'https':
-                newconn = HTTPSConnection
-            else:
-                newconn = HTTPConnection
-            s, h, b = helper.webtest.openURL(
-                b'/tell', headers=[], host=self.HOST, port=self.PORT,
-                http_conn=newconn)
-            if not b:
-                # The file was closed on the server.
-                tell_position = BIGFILE_SIZE
-            else:
-                tell_position = int(b)
-
-            read_so_far = len(body)
-
-            # It is difficult for us to force the server to only read
-            # the bytes that we ask for - there are going to be buffers
-            # inbetween.
-            #
-            # CherryPy will attempt to write as much data as it can to
-            # the socket, and we don't have a way to determine what that
-            # size will be. So we make the following assumption - by
-            # the time we have read in the entire file on the server,
-            # we will have at least received half of it. If this is not
-            # the case, then this is an indicator that either:
-            #   - machines that are running this test are using buffer
-            #     sizes greater than half of BIGFILE_SIZE; or
-            #   - streaming is broken.
-            #
-            # At the time of writing, we seem to have encountered
-            # buffer sizes bigger than 512K, so we've increased
-            # BIGFILE_SIZE to 4MB and in 2016 to 20MB and then 32MB.
-            # This test is going to keep failing according to the
-            # improvements in hardware and OS buffers.
-            if tell_position >= BIGFILE_SIZE:
-                if read_so_far < (BIGFILE_SIZE / 2):
-                    self.fail(
-                        'The file should have advanced to position %r, but '
-                        'has already advanced to the end of the file. It '
-                        'may not be streamed as intended, or at the wrong '
-                        'chunk size (64k)' % read_so_far)
-            elif tell_position < read_so_far:
-                self.fail(
-                    'The file should have advanced to position %r, but has '
-                    'only advanced to position %r. It may not be streamed '
-                    'as intended, or at the wrong chunk size (64k)' %
-                    (read_so_far, tell_position))
-
-        if body != b'x' * BIGFILE_SIZE:
-            self.fail("Body != 'x' * %d. Got %r instead (%d bytes)." %
-                      (BIGFILE_SIZE, body[:50], len(body)))
-        conn.close()
-
-    def test_file_stream_deadlock(self):
-        if cherrypy.server.protocol_version != 'HTTP/1.1':
-            return self.skip()
-
-        self.PROTOCOL = 'HTTP/1.1'
-
-        # Make an initial request but abort early.
-        self.persistent = True
-        conn = self.HTTP_CONN
-        conn.putrequest('GET', '/bigfile', skip_host=True)
-        conn.putheader('Host', self.HOST)
-        conn.endheaders()
-        response = conn.response_class(conn.sock, method='GET')
-        response.begin()
-        self.assertEqual(response.status, 200)
-        body = response.fp.read(65536)
-        if body != b'x' * len(body):
-            self.fail("Body != 'x' * %d. Got %r instead (%d bytes)." %
-                      (65536, body[:50], len(body)))
-        response.close()
-        conn.close()
-
-        # Make a second request, which should fetch the whole file.
-        self.persistent = False
-        self.getPage('/bigfile')
-        if self.body != b'x' * BIGFILE_SIZE:
-            self.fail("Body != 'x' * %d. Got %r instead (%d bytes)." %
-                      (BIGFILE_SIZE, self.body[:50], len(body)))
-
-    def test_error_page_with_serve_file(self):
-        self.getPage('/404test/yunyeen')
-        self.assertStatus(404)
-        self.assertInBody("I couldn't find that thing")
-
-    @unittest.mock.patch(
-        'http.client._contains_disallowed_url_pchar_re',
-        re.compile(r'[\n]'),
-        create=True,
-    )
-    def test_null_bytes(self):
-        self.getPage('/static/\x00')
-        self.assertStatus('404 Not Found')
-
-    @classmethod
-    def unicode_file(cls):
-        filename = ntou('Слава Україні.html', 'utf-8')
-        filepath = curdir / 'static' / filename
-        with filepath.open('w', encoding='utf-8')as strm:
-            strm.write(ntou('Геро�м Слава!', 'utf-8'))
-        cls.files_to_remove.append(filepath)
-
-    def test_unicode(self):
-        ensure_unicode_filesystem()
-        self.unicode_file()
-        url = ntou('/static/Слава Україні.html', 'utf-8')
-        # quote function requires str
-        url = tonative(url, 'utf-8')
-        url = urllib.parse.quote(url)
-        self.getPage(url)
-
-        expected = ntou('Геро�м Слава!', 'utf-8')
-        self.assertInBody(expected)
-
-
-def error_page_404(status, message, traceback, version):
-    path = os.path.join(curdir, 'static', '404.html')
-    return static.serve_file(path, content_type='text/html')
diff --git a/lib/cherrypy/test/test_tools.py b/lib/cherrypy/test/test_tools.py
deleted file mode 100644
index 23c59bc2..00000000
--- a/lib/cherrypy/test/test_tools.py
+++ /dev/null
@@ -1,473 +0,0 @@
-"""Test the various means of instantiating and invoking tools."""
-
-import gzip
-import io
-import sys
-import time
-import types
-import unittest
-import operator
-from http.client import IncompleteRead
-
-import cherrypy
-from cherrypy import tools
-from cherrypy._cpcompat import ntou
-from cherrypy.test import helper, _test_decorators
-
-
-*PY_VER_MINOR, _ = PY_VER_PATCH = sys.version_info[:3]
-# Refs:
-# bugs.python.org/issue39389
-# docs.python.org/3.7/whatsnew/changelog.html#python-3-7-7-release-candidate-1
-# docs.python.org/3.8/whatsnew/changelog.html#python-3-8-2-release-candidate-1
-HAS_GZIP_COMPRESSION_HEADER_FIXED = PY_VER_PATCH >= (3, 8, 2) or (
-    PY_VER_MINOR == (3, 7) and PY_VER_PATCH >= (3, 7, 7)
-)
-
-
-timeout = 0.2
-europoundUnicode = ntou('\x80\xa3')
-
-
-#                             Client-side code                             #
-
-
-class ToolTests(helper.CPWebCase):
-
-    @staticmethod
-    def setup_server():
-
-        # Put check_access in a custom toolbox with its own namespace
-        myauthtools = cherrypy._cptools.Toolbox('myauth')
-
-        def check_access(default=False):
-            if not getattr(cherrypy.request, 'userid', default):
-                raise cherrypy.HTTPError(401)
-        myauthtools.check_access = cherrypy.Tool(
-            'before_request_body', check_access)
-
-        def numerify():
-            def number_it(body):
-                for chunk in body:
-                    for k, v in cherrypy.request.numerify_map:
-                        chunk = chunk.replace(k, v)
-                    yield chunk
-            cherrypy.response.body = number_it(cherrypy.response.body)
-
-        class NumTool(cherrypy.Tool):
-
-            def _setup(self):
-                def makemap():
-                    m = self._merged_args().get('map', {})
-                    cherrypy.request.numerify_map = list(m.items())
-                cherrypy.request.hooks.attach('on_start_resource', makemap)
-
-                def critical():
-                    cherrypy.request.error_response = cherrypy.HTTPError(
-                        502).set_response
-                critical.failsafe = True
-
-                cherrypy.request.hooks.attach('on_start_resource', critical)
-                cherrypy.request.hooks.attach(self._point, self.callable)
-
-        tools.numerify = NumTool('before_finalize', numerify)
-
-        # It's not mandatory to inherit from cherrypy.Tool.
-        class NadsatTool:
-
-            def __init__(self):
-                self.ended = {}
-                self._name = 'nadsat'
-
-            def nadsat(self):
-                def nadsat_it_up(body):
-                    for chunk in body:
-                        chunk = chunk.replace(b'good', b'horrorshow')
-                        chunk = chunk.replace(b'piece', b'lomtick')
-                        yield chunk
-                cherrypy.response.body = nadsat_it_up(cherrypy.response.body)
-            nadsat.priority = 0
-
-            def cleanup(self):
-                # This runs after the request has been completely written out.
-                cherrypy.response.body = [b'razdrez']
-                id = cherrypy.request.params.get('id')
-                if id:
-                    self.ended[id] = True
-            cleanup.failsafe = True
-
-            def _setup(self):
-                cherrypy.request.hooks.attach('before_finalize', self.nadsat)
-                cherrypy.request.hooks.attach('on_end_request', self.cleanup)
-        tools.nadsat = NadsatTool()
-
-        def pipe_body():
-            cherrypy.request.process_request_body = False
-            clen = int(cherrypy.request.headers['Content-Length'])
-            cherrypy.request.body = cherrypy.request.rfile.read(clen)
-
-        # Assert that we can use a callable object instead of a function.
-        class Rotator(object):
-
-            def __call__(self, scale):
-                r = cherrypy.response
-                r.collapse_body()
-                r.body = [bytes([(x + scale) % 256 for x in r.body[0]])]
-        cherrypy.tools.rotator = cherrypy.Tool('before_finalize', Rotator())
-
-        def stream_handler(next_handler, *args, **kwargs):
-            actual = cherrypy.request.config.get('tools.streamer.arg')
-            assert actual == 'arg value'
-            cherrypy.response.output = o = io.BytesIO()
-            try:
-                next_handler(*args, **kwargs)
-                # Ignore the response and return our accumulated output
-                # instead.
-                return o.getvalue()
-            finally:
-                o.close()
-        cherrypy.tools.streamer = cherrypy._cptools.HandlerWrapperTool(
-            stream_handler)
-
-        class Root:
-
-            @cherrypy.expose
-            def index(self):
-                return 'Howdy earth!'
-
-            @cherrypy.expose
-            @cherrypy.config(**{
-                'tools.streamer.on': True,
-                'tools.streamer.arg': 'arg value',
-            })
-            def tarfile(self):
-                actual = cherrypy.request.config.get('tools.streamer.arg')
-                assert actual == 'arg value'
-                cherrypy.response.output.write(b'I am ')
-                cherrypy.response.output.write(b'a tarfile')
-
-            @cherrypy.expose
-            def euro(self):
-                hooks = list(cherrypy.request.hooks['before_finalize'])
-                hooks.sort()
-                cbnames = [x.callback.__name__ for x in hooks]
-                assert cbnames == ['gzip'], cbnames
-                priorities = [x.priority for x in hooks]
-                assert priorities == [80], priorities
-                yield ntou('Hello,')
-                yield ntou('world')
-                yield europoundUnicode
-
-            # Bare hooks
-            @cherrypy.expose
-            @cherrypy.config(**{'hooks.before_request_body': pipe_body})
-            def pipe(self):
-                return cherrypy.request.body
-
-            # Multiple decorators; include kwargs just for fun.
-            # Note that rotator must run before gzip.
-            @cherrypy.expose
-            def decorated_euro(self, *vpath):
-                yield ntou('Hello,')
-                yield ntou('world')
-                yield europoundUnicode
-            decorated_euro = tools.gzip(compress_level=6)(decorated_euro)
-            decorated_euro = tools.rotator(scale=3)(decorated_euro)
-
-        root = Root()
-
-        class TestType(type):
-            """Metaclass which automatically exposes all functions in each
-            subclass, and adds an instance of the subclass as an attribute
-            of root.
-            """
-            def __init__(cls, name, bases, dct):
-                type.__init__(cls, name, bases, dct)
-                for value in dct.values():
-                    if isinstance(value, types.FunctionType):
-                        cherrypy.expose(value)
-                setattr(root, name.lower(), cls())
-        Test = TestType('Test', (object,), {})
-
-        # METHOD ONE:
-        # Declare Tools in _cp_config
-        @cherrypy.config(**{'tools.nadsat.on': True})
-        class Demo(Test):
-
-            def index(self, id=None):
-                return 'A good piece of cherry pie'
-
-            def ended(self, id):
-                return repr(tools.nadsat.ended[id])
-
-            def err(self, id=None):
-                raise ValueError()
-
-            def errinstream(self, id=None):
-                yield 'nonconfidential'
-                raise ValueError()
-                yield 'confidential'
-
-            # METHOD TWO: decorator using Tool()
-            # We support Python 2.3, but the @-deco syntax would look like
-            # this:
-            # @tools.check_access()
-            def restricted(self):
-                return 'Welcome!'
-            restricted = myauthtools.check_access()(restricted)
-            userid = restricted
-
-            def err_in_onstart(self):
-                return 'success!'
-
-            @cherrypy.config(**{'response.stream': True})
-            def stream(self, id=None):
-                for x in range(100000000):
-                    yield str(x)
-
-        conf = {
-            # METHOD THREE:
-            # Declare Tools in detached config
-            '/demo': {
-                'tools.numerify.on': True,
-                'tools.numerify.map': {b'pie': b'3.14159'},
-            },
-            '/demo/restricted': {
-                'request.show_tracebacks': False,
-            },
-            '/demo/userid': {
-                'request.show_tracebacks': False,
-                'myauth.check_access.default': True,
-            },
-            '/demo/errinstream': {
-                'response.stream': True,
-            },
-            '/demo/err_in_onstart': {
-                # Because this isn't a dict, on_start_resource will error.
-                'tools.numerify.map': 'pie->3.14159'
-            },
-            # Combined tools
-            '/euro': {
-                'tools.gzip.on': True,
-                'tools.encode.on': True,
-            },
-            # Priority specified in config
-            '/decorated_euro/subpath': {
-                'tools.gzip.priority': 10,
-            },
-            # Handler wrappers
-            '/tarfile': {'tools.streamer.on': True}
-        }
-        app = cherrypy.tree.mount(root, config=conf)
-        app.request_class.namespaces['myauth'] = myauthtools
-
-        root.tooldecs = _test_decorators.ToolExamples()
-
-    def testHookErrors(self):
-        self.getPage('/demo/?id=1')
-        # If body is "razdrez", then on_end_request is being called too early.
-        self.assertBody('A horrorshow lomtick of cherry 3.14159')
-        # If this fails, then on_end_request isn't being called at all.
-        time.sleep(0.1)
-        self.getPage('/demo/ended/1')
-        self.assertBody('True')
-
-        valerr = '\n    raise ValueError()\nValueError'
-        self.getPage('/demo/err?id=3')
-        # If body is "razdrez", then on_end_request is being called too early.
-        self.assertErrorPage(502, pattern=valerr)
-        # If this fails, then on_end_request isn't being called at all.
-        time.sleep(0.1)
-        self.getPage('/demo/ended/3')
-        self.assertBody('True')
-
-        # If body is "razdrez", then on_end_request is being called too early.
-        if (cherrypy.server.protocol_version == 'HTTP/1.0' or
-                getattr(cherrypy.server, 'using_apache', False)):
-            self.getPage('/demo/errinstream?id=5')
-            # Because this error is raised after the response body has
-            # started, the status should not change to an error status.
-            self.assertStatus('200 OK')
-            self.assertBody('nonconfidential')
-        else:
-            # Because this error is raised after the response body has
-            # started, and because it's chunked output, an error is raised by
-            # the HTTP client when it encounters incomplete output.
-            self.assertRaises((ValueError, IncompleteRead), self.getPage,
-                              '/demo/errinstream?id=5')
-        # If this fails, then on_end_request isn't being called at all.
-        time.sleep(0.1)
-        self.getPage('/demo/ended/5')
-        self.assertBody('True')
-
-        # Test the "__call__" technique (compile-time decorator).
-        self.getPage('/demo/restricted')
-        self.assertErrorPage(401)
-
-        # Test compile-time decorator with kwargs from config.
-        self.getPage('/demo/userid')
-        self.assertBody('Welcome!')
-
-    def testEndRequestOnDrop(self):
-        old_timeout = None
-        try:
-            httpserver = cherrypy.server.httpserver
-            old_timeout = httpserver.timeout
-        except (AttributeError, IndexError):
-            return self.skip()
-
-        try:
-            httpserver.timeout = timeout
-
-            # Test that on_end_request is called even if the client drops.
-            self.persistent = True
-            try:
-                conn = self.HTTP_CONN
-                conn.putrequest('GET', '/demo/stream?id=9', skip_host=True)
-                conn.putheader('Host', self.HOST)
-                conn.endheaders()
-                # Skip the rest of the request and close the conn. This will
-                # cause the server's active socket to error, which *should*
-                # result in the request being aborted, and request.close being
-                # called all the way up the stack (including WSGI middleware),
-                # eventually calling our on_end_request hook.
-            finally:
-                self.persistent = False
-            time.sleep(timeout * 2)
-            # Test that the on_end_request hook was called.
-            self.getPage('/demo/ended/9')
-            self.assertBody('True')
-        finally:
-            if old_timeout is not None:
-                httpserver.timeout = old_timeout
-
-    def testGuaranteedHooks(self):
-        # The 'critical' on_start_resource hook is 'failsafe' (guaranteed
-        # to run even if there are failures in other on_start methods).
-        # This is NOT true of the other hooks.
-        # Here, we have set up a failure in NumerifyTool.numerify_map,
-        # but our 'critical' hook should run and set the error to 502.
-        self.getPage('/demo/err_in_onstart')
-        self.assertErrorPage(502)
-        tmpl = "AttributeError: 'str' object has no attribute '{attr}'"
-        expected_msg = tmpl.format(attr='items')
-        self.assertInBody(expected_msg)
-
-    def testCombinedTools(self):
-        expectedResult = (ntou('Hello,world') +
-                          europoundUnicode).encode('utf-8')
-        zbuf = io.BytesIO()
-        zfile = gzip.GzipFile(mode='wb', fileobj=zbuf, compresslevel=9)
-        zfile.write(expectedResult)
-        zfile.close()
-
-        self.getPage('/euro',
-                     headers=[
-                         ('Accept-Encoding', 'gzip'),
-                         ('Accept-Charset', 'ISO-8859-1,utf-8;q=0.7,*;q=0.7')])
-        self.assertInBody(zbuf.getvalue()[:3])
-
-        if not HAS_GZIP_COMPRESSION_HEADER_FIXED:
-            # NOTE: CherryPy adopts a fix from the CPython bug 39389
-            # NOTE: introducing a variable compression XFL flag that
-            # NOTE: was hardcoded to "best compression" before. And so
-            # NOTE: we can only test it on CPython versions that also
-            # NOTE: implement this fix.
-            return
-        zbuf = io.BytesIO()
-        zfile = gzip.GzipFile(mode='wb', fileobj=zbuf, compresslevel=6)
-        zfile.write(expectedResult)
-        zfile.close()
-
-        self.getPage('/decorated_euro', headers=[('Accept-Encoding', 'gzip')])
-        self.assertInBody(zbuf.getvalue()[:3])
-
-        # This returns a different value because gzip's priority was
-        # lowered in conf, allowing the rotator to run after gzip.
-        # Of course, we don't want breakage in production apps,
-        # but it proves the priority was changed.
-        self.getPage('/decorated_euro/subpath',
-                     headers=[('Accept-Encoding', 'gzip')])
-        self.assertInBody(bytes([(x + 3) % 256 for x in zbuf.getvalue()]))
-
-    def testBareHooks(self):
-        content = 'bit of a pain in me gulliver'
-        self.getPage('/pipe',
-                     headers=[('Content-Length', str(len(content))),
-                              ('Content-Type', 'text/plain')],
-                     method='POST', body=content)
-        self.assertBody(content)
-
-    def testHandlerWrapperTool(self):
-        self.getPage('/tarfile')
-        self.assertBody('I am a tarfile')
-
-    def testToolWithConfig(self):
-        if not sys.version_info >= (2, 5):
-            return self.skip('skipped (Python 2.5+ only)')
-
-        self.getPage('/tooldecs/blah')
-        self.assertHeader('Content-Type', 'application/data')
-
-    def testWarnToolOn(self):
-        # get
-        try:
-            cherrypy.tools.numerify.on
-        except AttributeError:
-            pass
-        else:
-            raise AssertionError('Tool.on did not error as it should have.')
-
-        # set
-        try:
-            cherrypy.tools.numerify.on = True
-        except AttributeError:
-            pass
-        else:
-            raise AssertionError('Tool.on did not error as it should have.')
-
-    def testDecorator(self):
-        @cherrypy.tools.register('on_start_resource')
-        def example():
-            pass
-        self.assertTrue(isinstance(cherrypy.tools.example, cherrypy.Tool))
-        self.assertEqual(cherrypy.tools.example._point, 'on_start_resource')
-
-        @cherrypy.tools.register(  # noqa: F811
-            'before_finalize', name='renamed', priority=60,
-        )
-        def example():  # noqa: F811
-            pass
-        self.assertTrue(isinstance(cherrypy.tools.renamed, cherrypy.Tool))
-        self.assertEqual(cherrypy.tools.renamed._point, 'before_finalize')
-        self.assertEqual(cherrypy.tools.renamed._name, 'renamed')
-        self.assertEqual(cherrypy.tools.renamed._priority, 60)
-
-
-class SessionAuthTest(unittest.TestCase):
-
-    def test_login_screen_returns_bytes(self):
-        """
-        login_screen must return bytes even if unicode parameters are passed.
-        Issue 1132 revealed that login_screen would return unicode if the
-        username and password were unicode.
-        """
-        sa = cherrypy.lib.cptools.SessionAuth()
-        res = sa.login_screen(None, username=str('nobody'),
-                              password=str('anypass'))
-        self.assertTrue(isinstance(res, bytes))
-
-
-class TestHooks:
-    def test_priorities(self):
-        """Hooks should sort by priority order."""
-        Hook = cherrypy._cprequest.Hook
-        hooks = [
-            Hook(None, priority=48),
-            Hook(None),
-            Hook(None, priority=49),
-        ]
-        hooks.sort()
-        by_priority = operator.attrgetter('priority')
-        priorities = list(map(by_priority, hooks))
-        assert priorities == [48, 49, 50]
diff --git a/lib/cherrypy/test/test_tutorials.py b/lib/cherrypy/test/test_tutorials.py
deleted file mode 100644
index 4594faa1..00000000
--- a/lib/cherrypy/test/test_tutorials.py
+++ /dev/null
@@ -1,200 +0,0 @@
-import sys
-import importlib
-
-import cherrypy
-from cherrypy.test import helper
-
-
-class TutorialTest(helper.CPWebCase):
-
-    @classmethod
-    def setup_server(cls):
-        """Mount something so the engine starts."""
-        class Dummy:
-            pass
-        cherrypy.tree.mount(Dummy())
-
-    @staticmethod
-    def load_module(name):
-        """Import or reload tutorial module as needed."""
-        target = 'cherrypy.tutorial.' + name
-        if target in sys.modules:
-            module = importlib.reload(sys.modules[target])
-        else:
-            module = importlib.import_module(target)
-        return module
-
-    @classmethod
-    def setup_tutorial(cls, name, root_name, config={}):
-        cherrypy.config.reset()
-        module = cls.load_module(name)
-        root = getattr(module, root_name)
-        conf = getattr(module, 'tutconf')
-        class_types = type,
-        if isinstance(root, class_types):
-            root = root()
-        cherrypy.tree.mount(root, config=conf)
-        cherrypy.config.update(config)
-
-    def test01HelloWorld(self):
-        self.setup_tutorial('tut01_helloworld', 'HelloWorld')
-        self.getPage('/')
-        self.assertBody('Hello world!')
-
-    def test02ExposeMethods(self):
-        self.setup_tutorial('tut02_expose_methods', 'HelloWorld')
-        self.getPage('/show_msg')
-        self.assertBody('Hello world!')
-
-    def test03GetAndPost(self):
-        self.setup_tutorial('tut03_get_and_post', 'WelcomePage')
-
-        # Try different GET queries
-        self.getPage('/greetUser?name=Bob')
-        self.assertBody("Hey Bob, what's up?")
-
-        self.getPage('/greetUser')
-        self.assertBody('Please enter your name <a href="./">here</a>.')
-
-        self.getPage('/greetUser?name=')
-        self.assertBody('No, really, enter your name <a href="./">here</a>.')
-
-        # Try the same with POST
-        self.getPage('/greetUser', method='POST', body='name=Bob')
-        self.assertBody("Hey Bob, what's up?")
-
-        self.getPage('/greetUser', method='POST', body='name=')
-        self.assertBody('No, really, enter your name <a href="./">here</a>.')
-
-    def test04ComplexSite(self):
-        self.setup_tutorial('tut04_complex_site', 'root')
-
-        msg = '''
-            <p>Here are some extra useful links:</p>
-
-            <ul>
-                <li><a href="http://del.icio.us">del.icio.us</a></li>
-                <li><a href="http://www.cherrypy.dev">CherryPy</a></li>
-            </ul>
-
-            <p>[<a href="../">Return to links page</a>]</p>'''
-        self.getPage('/links/extra/')
-        self.assertBody(msg)
-
-    def test05DerivedObjects(self):
-        self.setup_tutorial('tut05_derived_objects', 'HomePage')
-        msg = '''
-            <html>
-            <head>
-                <title>Another Page</title>
-            <head>
-            <body>
-            <h2>Another Page</h2>
-
-            <p>
-            And this is the amazing second page!
-            </p>
-
-            </body>
-            </html>
-        '''
-        # the tutorial has some annoying spaces in otherwise blank lines
-        msg = msg.replace('</h2>\n\n', '</h2>\n        \n')
-        msg = msg.replace('</p>\n\n', '</p>\n        \n')
-        self.getPage('/another/')
-        self.assertBody(msg)
-
-    def test06DefaultMethod(self):
-        self.setup_tutorial('tut06_default_method', 'UsersPage')
-        self.getPage('/hendrik')
-        self.assertBody('Hendrik Mans, CherryPy co-developer & crazy German '
-                        '(<a href="./">back</a>)')
-
-    def test07Sessions(self):
-        self.setup_tutorial('tut07_sessions', 'HitCounter')
-
-        self.getPage('/')
-        self.assertBody(
-            "\n            During your current session, you've viewed this"
-            '\n            page 1 times! Your life is a patio of fun!'
-            '\n        ')
-
-        self.getPage('/', self.cookies)
-        self.assertBody(
-            "\n            During your current session, you've viewed this"
-            '\n            page 2 times! Your life is a patio of fun!'
-            '\n        ')
-
-    def test08GeneratorsAndYield(self):
-        self.setup_tutorial('tut08_generators_and_yield', 'GeneratorDemo')
-        self.getPage('/')
-        self.assertBody('<html><body><h2>Generators rule!</h2>'
-                        '<h3>List of users:</h3>'
-                        'Remi<br/>Carlos<br/>Hendrik<br/>Lorenzo Lamas<br/>'
-                        '</body></html>')
-
-    def test09Files(self):
-        self.setup_tutorial('tut09_files', 'FileDemo')
-
-        # Test upload
-        filesize = 5
-        h = [('Content-type', 'multipart/form-data; boundary=x'),
-             ('Content-Length', str(105 + filesize))]
-        b = ('--x\n'
-             'Content-Disposition: form-data; name="myFile"; '
-             'filename="hello.txt"\r\n'
-             'Content-Type: text/plain\r\n'
-             '\r\n')
-        b += 'a' * filesize + '\n' + '--x--\n'
-        self.getPage('/upload', h, 'POST', b)
-        self.assertBody('''<html>
-        <body>
-            myFile length: %d<br />
-            myFile filename: hello.txt<br />
-            myFile mime-type: text/plain
-        </body>
-        </html>''' % filesize)
-
-        # Test download
-        self.getPage('/download')
-        self.assertStatus('200 OK')
-        self.assertHeader('Content-Type', 'application/x-download')
-        self.assertHeader('Content-Disposition',
-                          # Make sure the filename is quoted.
-                          'attachment; filename="pdf_file.pdf"')
-        self.assertEqual(len(self.body), 11961)
-
-    def test10HTTPErrors(self):
-        self.setup_tutorial('tut10_http_errors', 'HTTPErrorDemo')
-
-        @cherrypy.expose
-        def traceback_setting():
-            return repr(cherrypy.request.show_tracebacks)
-        cherrypy.tree.mount(traceback_setting, '/traceback_setting')
-
-        self.getPage('/')
-        self.assertInBody("""<a href="toggleTracebacks">""")
-        self.assertInBody("""<a href="/doesNotExist">""")
-        self.assertInBody("""<a href="/error?code=403">""")
-        self.assertInBody("""<a href="/error?code=500">""")
-        self.assertInBody("""<a href="/messageArg">""")
-
-        self.getPage('/traceback_setting')
-        setting = self.body
-        self.getPage('/toggleTracebacks')
-        self.assertStatus((302, 303))
-        self.getPage('/traceback_setting')
-        self.assertBody(str(not eval(setting)))
-
-        self.getPage('/error?code=500')
-        self.assertStatus(500)
-        self.assertInBody('The server encountered an unexpected condition '
-                          'which prevented it from fulfilling the request.')
-
-        self.getPage('/error?code=403')
-        self.assertStatus(403)
-        self.assertInBody("<h2>You can't do that!</h2>")
-
-        self.getPage('/messageArg')
-        self.assertStatus(500)
-        self.assertInBody("If you construct an HTTPError with a 'message'")
diff --git a/lib/cherrypy/test/test_virtualhost.py b/lib/cherrypy/test/test_virtualhost.py
deleted file mode 100644
index de88f927..00000000
--- a/lib/cherrypy/test/test_virtualhost.py
+++ /dev/null
@@ -1,113 +0,0 @@
-import os
-
-import cherrypy
-from cherrypy.test import helper
-
-curdir = os.path.join(os.getcwd(), os.path.dirname(__file__))
-
-
-class VirtualHostTest(helper.CPWebCase):
-
-    @staticmethod
-    def setup_server():
-        class Root:
-
-            @cherrypy.expose
-            def index(self):
-                return 'Hello, world'
-
-            @cherrypy.expose
-            def dom4(self):
-                return 'Under construction'
-
-            @cherrypy.expose
-            def method(self, value):
-                return 'You sent %s' % value
-
-        class VHost:
-
-            def __init__(self, sitename):
-                self.sitename = sitename
-
-            @cherrypy.expose
-            def index(self):
-                return 'Welcome to %s' % self.sitename
-
-            @cherrypy.expose
-            def vmethod(self, value):
-                return 'You sent %s' % value
-
-            @cherrypy.expose
-            def url(self):
-                return cherrypy.url('nextpage')
-
-            # Test static as a handler (section must NOT include vhost prefix)
-            static = cherrypy.tools.staticdir.handler(
-                section='/static', dir=curdir)
-
-        root = Root()
-        root.mydom2 = VHost('Domain 2')
-        root.mydom3 = VHost('Domain 3')
-        hostmap = {'www.mydom2.com': '/mydom2',
-                   'www.mydom3.com': '/mydom3',
-                   'www.mydom4.com': '/dom4',
-                   }
-        cherrypy.tree.mount(root, config={
-            '/': {
-                'request.dispatch': cherrypy.dispatch.VirtualHost(**hostmap)
-            },
-            # Test static in config (section must include vhost prefix)
-            '/mydom2/static2': {
-                'tools.staticdir.on': True,
-                'tools.staticdir.root': curdir,
-                'tools.staticdir.dir': 'static',
-                'tools.staticdir.index': 'index.html',
-            },
-        })
-
-    def testVirtualHost(self):
-        self.getPage('/', [('Host', 'www.mydom1.com')])
-        self.assertBody('Hello, world')
-        self.getPage('/mydom2/', [('Host', 'www.mydom1.com')])
-        self.assertBody('Welcome to Domain 2')
-
-        self.getPage('/', [('Host', 'www.mydom2.com')])
-        self.assertBody('Welcome to Domain 2')
-        self.getPage('/', [('Host', 'www.mydom3.com')])
-        self.assertBody('Welcome to Domain 3')
-        self.getPage('/', [('Host', 'www.mydom4.com')])
-        self.assertBody('Under construction')
-
-        # Test GET, POST, and positional params
-        self.getPage('/method?value=root')
-        self.assertBody('You sent root')
-        self.getPage('/vmethod?value=dom2+GET', [('Host', 'www.mydom2.com')])
-        self.assertBody('You sent dom2 GET')
-        self.getPage('/vmethod', [('Host', 'www.mydom3.com')], method='POST',
-                     body='value=dom3+POST')
-        self.assertBody('You sent dom3 POST')
-        self.getPage('/vmethod/pos', [('Host', 'www.mydom3.com')])
-        self.assertBody('You sent pos')
-
-        # Test that cherrypy.url uses the browser url, not the virtual url
-        self.getPage('/url', [('Host', 'www.mydom2.com')])
-        self.assertBody('%s://www.mydom2.com/nextpage' % self.scheme)
-
-    def test_VHost_plus_Static(self):
-        # Test static as a handler
-        self.getPage('/static/style.css', [('Host', 'www.mydom2.com')])
-        self.assertStatus('200 OK')
-        self.assertHeader('Content-Type', 'text/css;charset=utf-8')
-
-        # Test static in config
-        self.getPage('/static2/dirback.jpg', [('Host', 'www.mydom2.com')])
-        self.assertStatus('200 OK')
-        self.assertHeaderIn('Content-Type', ['image/jpeg', 'image/pjpeg'])
-
-        # Test static config with "index" arg
-        self.getPage('/static2/', [('Host', 'www.mydom2.com')])
-        self.assertStatus('200 OK')
-        self.assertBody('Hello, world\r\n')
-        # Since tools.trailing_slash is on by default, this should redirect
-        self.getPage('/static2', [('Host', 'www.mydom2.com')])
-        self.assertStatus(301)
diff --git a/lib/cherrypy/test/test_wsgi_ns.py b/lib/cherrypy/test/test_wsgi_ns.py
deleted file mode 100644
index 3545724c..00000000
--- a/lib/cherrypy/test/test_wsgi_ns.py
+++ /dev/null
@@ -1,93 +0,0 @@
-import cherrypy
-from cherrypy.test import helper
-
-
-class WSGI_Namespace_Test(helper.CPWebCase):
-
-    @staticmethod
-    def setup_server():
-
-        class WSGIResponse(object):
-
-            def __init__(self, appresults):
-                self.appresults = appresults
-                self.iter = iter(appresults)
-
-            def __iter__(self):
-                return self
-
-            def next(self):
-                return self.iter.next()
-
-            def __next__(self):
-                return next(self.iter)
-
-            def close(self):
-                if hasattr(self.appresults, 'close'):
-                    self.appresults.close()
-
-        class ChangeCase(object):
-
-            def __init__(self, app, to=None):
-                self.app = app
-                self.to = to
-
-            def __call__(self, environ, start_response):
-                res = self.app(environ, start_response)
-
-                class CaseResults(WSGIResponse):
-
-                    def next(this):
-                        return getattr(this.iter.next(), self.to)()
-
-                    def __next__(this):
-                        return getattr(next(this.iter), self.to)()
-                return CaseResults(res)
-
-        class Replacer(object):
-
-            def __init__(self, app, map={}):
-                self.app = app
-                self.map = map
-
-            def __call__(self, environ, start_response):
-                res = self.app(environ, start_response)
-
-                class ReplaceResults(WSGIResponse):
-
-                    def next(this):
-                        line = this.iter.next()
-                        for k, v in self.map.iteritems():
-                            line = line.replace(k, v)
-                        return line
-
-                    def __next__(this):
-                        line = next(this.iter)
-                        for k, v in self.map.items():
-                            line = line.replace(k, v)
-                        return line
-                return ReplaceResults(res)
-
-        class Root(object):
-
-            @cherrypy.expose
-            def index(self):
-                return 'HellO WoRlD!'
-
-        root_conf = {'wsgi.pipeline': [('replace', Replacer)],
-                     'wsgi.replace.map': {b'L': b'X',
-                                          b'l': b'r'},
-                     }
-
-        app = cherrypy.Application(Root())
-        app.wsgiapp.pipeline.append(('changecase', ChangeCase))
-        app.wsgiapp.config['changecase'] = {'to': 'upper'}
-        cherrypy.tree.mount(app, config={'/': root_conf})
-
-    def test_pipeline(self):
-        if not cherrypy.server.httpserver:
-            return self.skip()
-
-        self.getPage('/')
-        # If body is "HEXXO WORXD!", the middleware was applied out of order.
-        self.assertBody('HERRO WORRD!')
diff --git a/lib/cherrypy/test/test_wsgi_unix_socket.py b/lib/cherrypy/test/test_wsgi_unix_socket.py
deleted file mode 100644
index 32a3fca8..00000000
--- a/lib/cherrypy/test/test_wsgi_unix_socket.py
+++ /dev/null
@@ -1,90 +0,0 @@
-import os
-import socket
-import atexit
-import tempfile
-from http.client import HTTPConnection
-
-import pytest
-
-import cherrypy
-from cherrypy.test import helper
-
-
-def usocket_path():
-    fd, path = tempfile.mkstemp('cp_test.sock')
-    os.close(fd)
-    os.remove(path)
-    return path
-
-
-USOCKET_PATH = usocket_path()
-
-
-class USocketHTTPConnection(HTTPConnection):
-    """HTTPConnection over a unix socket."""
-
-    def __init__(self, path):
-        HTTPConnection.__init__(self, 'localhost')
-        self.path = path
-
-    def __call__(self, *args, **kwargs):
-        """
-        Catch-all method just to present itself as a constructor for the
-        HTTPConnection.
-        """
-        return self
-
-    def connect(self):
-        """
-        Override the connect method and assign a unix socket as a transport.
-        """
-        sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-        sock.connect(self.path)
-        self.sock = sock
-        atexit.register(lambda: os.remove(self.path))
-
-
-@pytest.mark.skipif("sys.platform == 'win32'")
-class WSGI_UnixSocket_Test(helper.CPWebCase):
-    """
-    Test basic behavior on a cherrypy wsgi server listening
-    on a unix socket.
-
-    It exercises the config option `server.socket_file`.
-    """
-    HTTP_CONN = USocketHTTPConnection(USOCKET_PATH)
-
-    @staticmethod
-    def setup_server():
-        class Root(object):
-
-            @cherrypy.expose
-            def index(self):
-                return 'Test OK'
-
-            @cherrypy.expose
-            def error(self):
-                raise Exception('Invalid page')
-
-        config = {
-            'server.socket_file': USOCKET_PATH
-        }
-        cherrypy.config.update(config)
-        cherrypy.tree.mount(Root())
-
-    def tearDown(self):
-        cherrypy.config.update({'server.socket_file': None})
-
-    def test_simple_request(self):
-        self.getPage('/')
-        self.assertStatus('200 OK')
-        self.assertInBody('Test OK')
-
-    def test_not_found(self):
-        self.getPage('/invalid_path')
-        self.assertStatus('404 Not Found')
-
-    def test_internal_error(self):
-        self.getPage('/error')
-        self.assertStatus('500 Internal Server Error')
-        self.assertInBody('Invalid page')
diff --git a/lib/cherrypy/test/test_wsgi_vhost.py b/lib/cherrypy/test/test_wsgi_vhost.py
deleted file mode 100644
index 2b6e5ba9..00000000
--- a/lib/cherrypy/test/test_wsgi_vhost.py
+++ /dev/null
@@ -1,35 +0,0 @@
-import cherrypy
-from cherrypy.test import helper
-
-
-class WSGI_VirtualHost_Test(helper.CPWebCase):
-
-    @staticmethod
-    def setup_server():
-
-        class ClassOfRoot(object):
-
-            def __init__(self, name):
-                self.name = name
-
-            @cherrypy.expose
-            def index(self):
-                return 'Welcome to the %s website!' % self.name
-
-        default = cherrypy.Application(None)
-
-        domains = {}
-        for year in range(1997, 2008):
-            app = cherrypy.Application(ClassOfRoot('Class of %s' % year))
-            domains['www.classof%s.example' % year] = app
-
-        cherrypy.tree.graft(cherrypy._cpwsgi.VirtualHost(default, domains))
-
-    def test_welcome(self):
-        if not cherrypy.server.using_wsgi:
-            return self.skip('skipped (not using WSGI)... ')
-
-        for year in range(1997, 2008):
-            self.getPage(
-                '/', headers=[('Host', 'www.classof%s.example' % year)])
-            self.assertBody('Welcome to the Class of %s website!' % year)
diff --git a/lib/cherrypy/test/test_wsgiapps.py b/lib/cherrypy/test/test_wsgiapps.py
deleted file mode 100644
index 1b3bf28f..00000000
--- a/lib/cherrypy/test/test_wsgiapps.py
+++ /dev/null
@@ -1,120 +0,0 @@
-import sys
-
-import cherrypy
-from cherrypy._cpcompat import ntob
-from cherrypy.test import helper
-
-
-class WSGIGraftTests(helper.CPWebCase):
-
-    @staticmethod
-    def setup_server():
-
-        def test_app(environ, start_response):
-            status = '200 OK'
-            response_headers = [('Content-type', 'text/plain')]
-            start_response(status, response_headers)
-            output = ['Hello, world!\n',
-                      'This is a wsgi app running within CherryPy!\n\n']
-            keys = list(environ.keys())
-            keys.sort()
-            for k in keys:
-                output.append('%s: %s\n' % (k, environ[k]))
-            return [ntob(x, 'utf-8') for x in output]
-
-        def test_empty_string_app(environ, start_response):
-            status = '200 OK'
-            response_headers = [('Content-type', 'text/plain')]
-            start_response(status, response_headers)
-            return [
-                b'Hello', b'', b' ', b'', b'world',
-            ]
-
-        class WSGIResponse(object):
-
-            def __init__(self, appresults):
-                self.appresults = appresults
-                self.iter = iter(appresults)
-
-            def __iter__(self):
-                return self
-
-            if sys.version_info >= (3, 0):
-                def __next__(self):
-                    return next(self.iter)
-            else:
-                def next(self):
-                    return self.iter.next()
-
-            def close(self):
-                if hasattr(self.appresults, 'close'):
-                    self.appresults.close()
-
-        class ReversingMiddleware(object):
-
-            def __init__(self, app):
-                self.app = app
-
-            def __call__(self, environ, start_response):
-                results = app(environ, start_response)
-
-                class Reverser(WSGIResponse):
-
-                    if sys.version_info >= (3, 0):
-                        def __next__(this):
-                            line = list(next(this.iter))
-                            line.reverse()
-                            return bytes(line)
-                    else:
-                        def next(this):
-                            line = list(this.iter.next())
-                            line.reverse()
-                            return ''.join(line)
-
-                return Reverser(results)
-
-        class Root:
-
-            @cherrypy.expose
-            def index(self):
-                return ntob("I'm a regular CherryPy page handler!")
-
-        cherrypy.tree.mount(Root())
-
-        cherrypy.tree.graft(test_app, '/hosted/app1')
-        cherrypy.tree.graft(test_empty_string_app, '/hosted/app3')
-
-        # Set script_name explicitly to None to signal CP that it should
-        # be pulled from the WSGI environ each time.
-        app = cherrypy.Application(Root(), script_name=None)
-        cherrypy.tree.graft(ReversingMiddleware(app), '/hosted/app2')
-
-    wsgi_output = '''Hello, world!
-This is a wsgi app running within CherryPy!'''
-
-    def test_01_standard_app(self):
-        self.getPage('/')
-        self.assertBody("I'm a regular CherryPy page handler!")
-
-    def test_04_pure_wsgi(self):
-        if not cherrypy.server.using_wsgi:
-            return self.skip('skipped (not using WSGI)... ')
-        self.getPage('/hosted/app1')
-        self.assertHeader('Content-Type', 'text/plain')
-        self.assertInBody(self.wsgi_output)
-
-    def test_05_wrapped_cp_app(self):
-        if not cherrypy.server.using_wsgi:
-            return self.skip('skipped (not using WSGI)... ')
-        self.getPage('/hosted/app2/')
-        body = list("I'm a regular CherryPy page handler!")
-        body.reverse()
-        body = ''.join(body)
-        self.assertInBody(body)
-
-    def test_06_empty_string_app(self):
-        if not cherrypy.server.using_wsgi:
-            return self.skip('skipped (not using WSGI)... ')
-        self.getPage('/hosted/app3')
-        self.assertHeader('Content-Type', 'text/plain')
-        self.assertInBody('Hello world')
diff --git a/lib/cherrypy/test/test_xmlrpc.py b/lib/cherrypy/test/test_xmlrpc.py
deleted file mode 100644
index 61fde8bb..00000000
--- a/lib/cherrypy/test/test_xmlrpc.py
+++ /dev/null
@@ -1,149 +0,0 @@
-import sys
-import socket
-
-from xmlrpc.client import (
-    DateTime, Fault,
-    ServerProxy, SafeTransport
-)
-
-import cherrypy
-from cherrypy import _cptools
-from cherrypy.test import helper
-
-HTTPSTransport = SafeTransport
-
-# Python 3.0's SafeTransport still mistakenly checks for socket.ssl
-if not hasattr(socket, 'ssl'):
-    socket.ssl = True
-
-
-def setup_server():
-
-    class Root:
-
-        @cherrypy.expose
-        def index(self):
-            return "I'm a standard index!"
-
-    class XmlRpc(_cptools.XMLRPCController):
-
-        @cherrypy.expose
-        def foo(self):
-            return 'Hello world!'
-
-        @cherrypy.expose
-        def return_single_item_list(self):
-            return [42]
-
-        @cherrypy.expose
-        def return_string(self):
-            return 'here is a string'
-
-        @cherrypy.expose
-        def return_tuple(self):
-            return ('here', 'is', 1, 'tuple')
-
-        @cherrypy.expose
-        def return_dict(self):
-            return dict(a=1, b=2, c=3)
-
-        @cherrypy.expose
-        def return_composite(self):
-            return dict(a=1, z=26), 'hi', ['welcome', 'friend']
-
-        @cherrypy.expose
-        def return_int(self):
-            return 42
-
-        @cherrypy.expose
-        def return_float(self):
-            return 3.14
-
-        @cherrypy.expose
-        def return_datetime(self):
-            return DateTime((2003, 10, 7, 8, 1, 0, 1, 280, -1))
-
-        @cherrypy.expose
-        def return_boolean(self):
-            return True
-
-        @cherrypy.expose
-        def test_argument_passing(self, num):
-            return num * 2
-
-        @cherrypy.expose
-        def test_returning_Fault(self):
-            return Fault(1, 'custom Fault response')
-
-    root = Root()
-    root.xmlrpc = XmlRpc()
-    cherrypy.tree.mount(root, config={'/': {
-        'request.dispatch': cherrypy.dispatch.XMLRPCDispatcher(),
-        'tools.xmlrpc.allow_none': 0,
-    }})
-
-
-class XmlRpcTest(helper.CPWebCase):
-    setup_server = staticmethod(setup_server)
-
-    def testXmlRpc(self):
-
-        scheme = self.scheme
-        if scheme == 'https':
-            url = 'https://%s:%s/xmlrpc/' % (self.interface(), self.PORT)
-            proxy = ServerProxy(url, transport=HTTPSTransport())
-        else:
-            url = 'http://%s:%s/xmlrpc/' % (self.interface(), self.PORT)
-            proxy = ServerProxy(url)
-
-        # begin the tests ...
-        self.getPage('/xmlrpc/foo')
-        self.assertBody('Hello world!')
-
-        self.assertEqual(proxy.return_single_item_list(), [42])
-        self.assertNotEqual(proxy.return_single_item_list(), 'one bazillion')
-        self.assertEqual(proxy.return_string(), 'here is a string')
-        self.assertEqual(proxy.return_tuple(),
-                         list(('here', 'is', 1, 'tuple')))
-        self.assertEqual(proxy.return_dict(), {'a': 1, 'c': 3, 'b': 2})
-        self.assertEqual(proxy.return_composite(),
-                         [{'a': 1, 'z': 26}, 'hi', ['welcome', 'friend']])
-        self.assertEqual(proxy.return_int(), 42)
-        self.assertEqual(proxy.return_float(), 3.14)
-        self.assertEqual(proxy.return_datetime(),
-                         DateTime((2003, 10, 7, 8, 1, 0, 1, 280, -1)))
-        self.assertEqual(proxy.return_boolean(), True)
-        self.assertEqual(proxy.test_argument_passing(22), 22 * 2)
-
-        # Test an error in the page handler (should raise an xmlrpclib.Fault)
-        try:
-            proxy.test_argument_passing({})
-        except Exception:
-            x = sys.exc_info()[1]
-            self.assertEqual(x.__class__, Fault)
-            self.assertEqual(x.faultString, ('unsupported operand type(s) '
-                                             "for *: 'dict' and 'int'"))
-        else:
-            self.fail('Expected xmlrpclib.Fault')
-
-        # https://github.com/cherrypy/cherrypy/issues/533
-        # if a method is not found, an xmlrpclib.Fault should be raised
-        try:
-            proxy.non_method()
-        except Exception:
-            x = sys.exc_info()[1]
-            self.assertEqual(x.__class__, Fault)
-            self.assertEqual(x.faultString,
-                             'method "non_method" is not supported')
-        else:
-            self.fail('Expected xmlrpclib.Fault')
-
-        # Test returning a Fault from the page handler.
-        try:
-            proxy.test_returning_Fault()
-        except Exception:
-            x = sys.exc_info()[1]
-            self.assertEqual(x.__class__, Fault)
-            self.assertEqual(x.faultString, ('custom Fault response'))
-        else:
-            self.fail('Expected xmlrpclib.Fault')
diff --git a/lib/cherrypy/test/webtest.py b/lib/cherrypy/test/webtest.py
deleted file mode 100644
index 9fb6ce62..00000000
--- a/lib/cherrypy/test/webtest.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# for compatibility, expose cheroot webtest here
-import warnings
-
-from cheroot.test.webtest import (  # noqa
-    interface,
-    WebCase, cleanHeaders, shb, openURL,
-    ServerError, server_error,
-)
-
-
-warnings.warn('Use cheroot.test.webtest', DeprecationWarning)
diff --git a/lib/cherrypy/tutorial/README.rst b/lib/cherrypy/tutorial/README.rst
deleted file mode 100644
index c47e7d32..00000000
--- a/lib/cherrypy/tutorial/README.rst
+++ /dev/null
@@ -1,16 +0,0 @@
-CherryPy Tutorials
-------------------
-
-This is a series of tutorials explaining how to develop dynamic web
-applications using CherryPy. A couple of notes:
-
-
-- Each of these tutorials builds on the ones before it. If you're
-  new to CherryPy, we recommend you start with 01_helloworld.py and
-  work your way upwards. :)
-
-- In most of these tutorials, you will notice that all output is done
-  by returning normal Python strings, often using simple Python
-  variable substitution. In most real-world applications, you will
-  probably want to use a separate template package (like Cheetah,
-  CherryTemplate or XML/XSL).
diff --git a/lib/cherrypy/tutorial/__init__.py b/lib/cherrypy/tutorial/__init__.py
deleted file mode 100644
index 08c142c5..00000000
--- a/lib/cherrypy/tutorial/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# This is used in test_config to test unrepr of "from A import B"
-thing2 = object()
diff --git a/lib/cherrypy/tutorial/custom_error.html b/lib/cherrypy/tutorial/custom_error.html
deleted file mode 100644
index d0f30c8a..00000000
--- a/lib/cherrypy/tutorial/custom_error.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-<head>
-    <title>403 Unauthorized</title>
-</head>
-    <body>
-        <h2>You can't do that!</h2>
-        <p>%(message)s</p>
-        <p>This is a custom error page that is read from a file.<p>
-        <pre>%(traceback)s</pre>
-    </body>
-</html>
diff --git a/lib/cherrypy/tutorial/pdf_file.pdf b/lib/cherrypy/tutorial/pdf_file.pdf
deleted file mode 100644
index 226dfe18..00000000
Binary files a/lib/cherrypy/tutorial/pdf_file.pdf and /dev/null differ
diff --git a/lib/cherrypy/tutorial/tut01_helloworld.py b/lib/cherrypy/tutorial/tut01_helloworld.py
deleted file mode 100644
index e575a9e2..00000000
--- a/lib/cherrypy/tutorial/tut01_helloworld.py
+++ /dev/null
@@ -1,33 +0,0 @@
-"""
-Tutorial - Hello World
-
-The most basic (working) CherryPy application possible.
-"""
-
-import os.path
-
-# Import CherryPy global namespace
-import cherrypy
-
-
-class HelloWorld:
-    """Sample request handler class."""
-
-    # Expose the index method through the web. CherryPy will never
-    # publish methods that don't have the exposed attribute set to True.
-    @cherrypy.expose
-    def index(self):
-        # CherryPy will call this method for the root URI ("/") and send
-        # its return value to the client. Because this is tutorial
-        # lesson number 01, we'll just send something really simple.
-        # How about...
-        return 'Hello world!'
-
-
-tutconf = os.path.join(os.path.dirname(__file__), 'tutorial.conf')
-
-if __name__ == '__main__':
-    # CherryPy always starts with app.root when trying to map request URIs
-    # to objects, so we need to mount a request handler root. A request
-    # to '/' will be mapped to HelloWorld().index().
-    cherrypy.quickstart(HelloWorld(), config=tutconf)
diff --git a/lib/cherrypy/tutorial/tut02_expose_methods.py b/lib/cherrypy/tutorial/tut02_expose_methods.py
deleted file mode 100644
index 8afbf7d8..00000000
--- a/lib/cherrypy/tutorial/tut02_expose_methods.py
+++ /dev/null
@@ -1,32 +0,0 @@
-"""
-Tutorial - Multiple methods
-
-This tutorial shows you how to link to other methods of your request
-handler.
-"""
-
-import os.path
-
-import cherrypy
-
-
-class HelloWorld:
-
-    @cherrypy.expose
-    def index(self):
-        # Let's link to another method here.
-        return 'We have an <a href="show_msg">important message</a> for you!'
-
-    @cherrypy.expose
-    def show_msg(self):
-        # Here's the important message!
-        return 'Hello world!'
-
-
-tutconf = os.path.join(os.path.dirname(__file__), 'tutorial.conf')
-
-if __name__ == '__main__':
-    # CherryPy always starts with app.root when trying to map request URIs
-    # to objects, so we need to mount a request handler root. A request
-    # to '/' will be mapped to HelloWorld().index().
-    cherrypy.quickstart(HelloWorld(), config=tutconf)
diff --git a/lib/cherrypy/tutorial/tut03_get_and_post.py b/lib/cherrypy/tutorial/tut03_get_and_post.py
deleted file mode 100644
index 0b3d4613..00000000
--- a/lib/cherrypy/tutorial/tut03_get_and_post.py
+++ /dev/null
@@ -1,51 +0,0 @@
-"""
-Tutorial - Passing variables
-
-This tutorial shows you how to pass GET/POST variables to methods.
-"""
-
-import os.path
-
-import cherrypy
-
-
-class WelcomePage:
-
-    @cherrypy.expose
-    def index(self):
-        # Ask for the user's name.
-        return '''
-            <form action="greetUser" method="GET">
-            What is your name?
-            <input type="text" name="name" />
-            <input type="submit" />
-            </form>'''
-
-    @cherrypy.expose
-    def greetUser(self, name=None):
-        # CherryPy passes all GET and POST variables as method parameters.
-        # It doesn't make a difference where the variables come from, how
-        # large their contents are, and so on.
-        #
-        # You can define default parameter values as usual. In this
-        # example, the "name" parameter defaults to None so we can check
-        # if a name was actually specified.
-
-        if name:
-            # Greet the user!
-            return "Hey %s, what's up?" % name
-        else:
-            if name is None:
-                # No name was specified
-                return 'Please enter your name <a href="./">here</a>.'
-            else:
-                return 'No, really, enter your name <a href="./">here</a>.'
-
-
-tutconf = os.path.join(os.path.dirname(__file__), 'tutorial.conf')
-
-if __name__ == '__main__':
-    # CherryPy always starts with app.root when trying to map request URIs
-    # to objects, so we need to mount a request handler root. A request
-    # to '/' will be mapped to HelloWorld().index().
-    cherrypy.quickstart(WelcomePage(), config=tutconf)
diff --git a/lib/cherrypy/tutorial/tut04_complex_site.py b/lib/cherrypy/tutorial/tut04_complex_site.py
deleted file mode 100644
index fe04054f..00000000
--- a/lib/cherrypy/tutorial/tut04_complex_site.py
+++ /dev/null
@@ -1,103 +0,0 @@
-"""
-Tutorial - Multiple objects
-
-This tutorial shows you how to create a site structure through multiple
-possibly nested request handler objects.
-"""
-
-import os.path
-
-import cherrypy
-
-
-class HomePage:
-
-    @cherrypy.expose
-    def index(self):
-        return '''
-            <p>Hi, this is the home page! Check out the other
-            fun stuff on this site:</p>
-
-            <ul>
-                <li><a href="/joke/">A silly joke</a></li>
-                <li><a href="/links/">Useful links</a></li>
-            </ul>'''
-
-
-class JokePage:
-
-    @cherrypy.expose
-    def index(self):
-        return '''
-            <p>"In Python, how do you create a string of random
-            characters?" -- "Read a Perl file!"</p>
-            <p>[<a href="../">Return</a>]</p>'''
-
-
-class LinksPage:
-
-    def __init__(self):
-        # Request handler objects can create their own nested request
-        # handler objects. Simply create them inside their __init__
-        # methods!
-        self.extra = ExtraLinksPage()
-
-    @cherrypy.expose
-    def index(self):
-        # Note the way we link to the extra links page (and back).
-        # As you can see, this object doesn't really care about its
-        # absolute position in the site tree, since we use relative
-        # links exclusively.
-        return '''
-            <p>Here are some useful links:</p>
-
-            <ul>
-                <li>
-                    <a href="http://www.cherrypy.dev">The CherryPy Homepage</a>
-                </li>
-                <li>
-                    <a href="http://www.python.org">The Python Homepage</a>
-                </li>
-            </ul>
-
-            <p>You can check out some extra useful
-            links <a href="./extra/">here</a>.</p>
-
-            <p>[<a href="../">Return</a>]</p>
-        '''
-
-
-class ExtraLinksPage:
-
-    @cherrypy.expose
-    def index(self):
-        # Note the relative link back to the Links page!
-        return '''
-            <p>Here are some extra useful links:</p>
-
-            <ul>
-                <li><a href="http://del.icio.us">del.icio.us</a></li>
-                <li><a href="http://www.cherrypy.dev">CherryPy</a></li>
-            </ul>
-
-            <p>[<a href="../">Return to links page</a>]</p>'''
-
-
-# Of course we can also mount request handler objects right here!
-root = HomePage()
-root.joke = JokePage()
-root.links = LinksPage()
-
-# Remember, we don't need to mount ExtraLinksPage here, because
-# LinksPage does that itself on initialization. In fact, there is
-# no reason why you shouldn't let your root object take care of
-# creating all contained request handler objects.
-
-
-tutconf = os.path.join(os.path.dirname(__file__), 'tutorial.conf')
-
-if __name__ == '__main__':
-    # CherryPy always starts with app.root when trying to map request URIs
-    # to objects, so we need to mount a request handler root. A request
-    # to '/' will be mapped to HelloWorld().index().
-    cherrypy.quickstart(root, config=tutconf)
diff --git a/lib/cherrypy/tutorial/tut05_derived_objects.py b/lib/cherrypy/tutorial/tut05_derived_objects.py
deleted file mode 100644
index f626e03f..00000000
--- a/lib/cherrypy/tutorial/tut05_derived_objects.py
+++ /dev/null
@@ -1,80 +0,0 @@
-"""
-Tutorial - Object inheritance
-
-You are free to derive your request handler classes from any base
-class you wish. In most real-world applications, you will probably
-want to create a central base class used for all your pages, which takes
-care of things like printing a common page header and footer.
-"""
-
-import os.path
-
-import cherrypy
-
-
-class Page:
-    # Store the page title in a class attribute
-    title = 'Untitled Page'
-
-    def header(self):
-        return '''
-            <html>
-            <head>
-                <title>%s</title>
-            <head>
-            <body>
-            <h2>%s</h2>
-        ''' % (self.title, self.title)
-
-    def footer(self):
-        return '''
-            </body>
-            </html>
-        '''
-
-    # Note that header and footer don't get their exposed attributes
-    # set to True. This isn't necessary since the user isn't supposed
-    # to call header or footer directly; instead, we'll call them from
-    # within the actually exposed handler methods defined in this
-    # class' subclasses.
-
-
-class HomePage(Page):
-    # Different title for this page
-    title = 'Tutorial 5'
-
-    def __init__(self):
-        # create a subpage
-        self.another = AnotherPage()
-
-    @cherrypy.expose
-    def index(self):
-        # Note that we call the header and footer methods inherited
-        # from the Page class!
-        return self.header() + '''
-            <p>
-            Isn't this exciting? There's
-            <a href="./another/">another page</a>, too!
-            </p>
-        ''' + self.footer()
-
-
-class AnotherPage(Page):
-    title = 'Another Page'
-
-    @cherrypy.expose
-    def index(self):
-        return self.header() + '''
-            <p>
-            And this is the amazing second page!
-            </p>
-        ''' + self.footer()
-
-
-tutconf = os.path.join(os.path.dirname(__file__), 'tutorial.conf')
-
-if __name__ == '__main__':
-    # CherryPy always starts with app.root when trying to map request URIs
-    # to objects, so we need to mount a request handler root. A request
-    # to '/' will be mapped to HelloWorld().index().
-    cherrypy.quickstart(HomePage(), config=tutconf)
diff --git a/lib/cherrypy/tutorial/tut06_default_method.py b/lib/cherrypy/tutorial/tut06_default_method.py
deleted file mode 100644
index 0ce4cabe..00000000
--- a/lib/cherrypy/tutorial/tut06_default_method.py
+++ /dev/null
@@ -1,61 +0,0 @@
-"""
-Tutorial - The default method
-
-Request handler objects can implement a method called "default" that
-is called when no other suitable method/object could be found.
-Essentially, if CherryPy2 can't find a matching request handler object
-for the given request URI, it will use the default method of the object
-located deepest on the URI path.
-
-Using this mechanism you can easily simulate virtual URI structures
-by parsing the extra URI string, which you can access through
-cherrypy.request.virtualPath.
-
-The application in this tutorial simulates an URI structure looking
-like /users/<username>. Since the <username> bit will not be found (as
-there are no matching methods), it is handled by the default method.
-"""
-
-import os.path
-
-import cherrypy
-
-
-class UsersPage:
-
-    @cherrypy.expose
-    def index(self):
-        # Since this is just a stupid little example, we'll simply
-        # display a list of links to random, made-up users. In a real
-        # application, this could be generated from a database result set.
-        return '''
-            <a href="./remi">Remi Delon</a><br/>
-            <a href="./hendrik">Hendrik Mans</a><br/>
-            <a href="./lorenzo">Lorenzo Lamas</a><br/>
-        '''
-
-    @cherrypy.expose
-    def default(self, user):
-        # Here we react depending on the virtualPath -- the part of the
-        # path that could not be mapped to an object method. In a real
-        # application, we would probably do some database lookups here
-        # instead of the silly if/elif/else construct.
-        if user == 'remi':
-            out = 'Remi Delon, CherryPy lead developer'
-        elif user == 'hendrik':
-            out = 'Hendrik Mans, CherryPy co-developer & crazy German'
-        elif user == 'lorenzo':
-            out = 'Lorenzo Lamas, famous actor and singer!'
-        else:
-            out = 'Unknown user. :-('
-
-        return '%s (<a href="./">back</a>)' % out
-
-
-tutconf = os.path.join(os.path.dirname(__file__), 'tutorial.conf')
-
-if __name__ == '__main__':
-    # CherryPy always starts with app.root when trying to map request URIs
-    # to objects, so we need to mount a request handler root. A request
-    # to '/' will be mapped to HelloWorld().index().
-    cherrypy.quickstart(UsersPage(), config=tutconf)
diff --git a/lib/cherrypy/tutorial/tut07_sessions.py b/lib/cherrypy/tutorial/tut07_sessions.py
deleted file mode 100644
index 204322b5..00000000
--- a/lib/cherrypy/tutorial/tut07_sessions.py
+++ /dev/null
@@ -1,41 +0,0 @@
-"""
-Tutorial - Sessions
-
-Storing session data in CherryPy applications is very easy: cherrypy
-provides a dictionary called "session" that represents the session
-data for the current user. If you use RAM based sessions, you can store
-any kind of object into that dictionary; otherwise, you are limited to
-objects that can be pickled.
-"""
-
-import os.path
-
-import cherrypy
-
-
-class HitCounter:
-
-    _cp_config = {'tools.sessions.on': True}
-
-    @cherrypy.expose
-    def index(self):
-        # Increase the silly hit counter
-        count = cherrypy.session.get('count', 0) + 1
-
-        # Store the new value in the session dictionary
-        cherrypy.session['count'] = count
-
-        # And display a silly hit count message!
-        return '''
-            During your current session, you've viewed this
-            page %s times! Your life is a patio of fun!
-        ''' % count
-
-
-tutconf = os.path.join(os.path.dirname(__file__), 'tutorial.conf')
-
-if __name__ == '__main__':
-    # CherryPy always starts with app.root when trying to map request URIs
-    # to objects, so we need to mount a request handler root. A request
-    # to '/' will be mapped to HelloWorld().index().
-    cherrypy.quickstart(HitCounter(), config=tutconf)
diff --git a/lib/cherrypy/tutorial/tut08_generators_and_yield.py b/lib/cherrypy/tutorial/tut08_generators_and_yield.py
deleted file mode 100644
index 18f42f93..00000000
--- a/lib/cherrypy/tutorial/tut08_generators_and_yield.py
+++ /dev/null
@@ -1,44 +0,0 @@
-"""
-Bonus Tutorial: Using generators to return result bodies
-
-Instead of returning a complete result string, you can use the yield
-statement to return one result part after another. This may be convenient
-in situations where using a template package like CherryPy or Cheetah
-would be overkill, and messy string concatenation too uncool. ;-)
-"""
-
-import os.path
-
-import cherrypy
-
-
-class GeneratorDemo:
-
-    def header(self):
-        return '<html><body><h2>Generators rule!</h2>'
-
-    def footer(self):
-        return '</body></html>'
-
-    @cherrypy.expose
-    def index(self):
-        # Let's make up a list of users for presentation purposes
-        users = ['Remi', 'Carlos', 'Hendrik', 'Lorenzo Lamas']
-
-        # Every yield line adds one part to the total result body.
-        yield self.header()
-        yield '<h3>List of users:</h3>'
-
-        for user in users:
-            yield '%s<br/>' % user
-
-        yield self.footer()
-
-
-tutconf = os.path.join(os.path.dirname(__file__), 'tutorial.conf')
-
-if __name__ == '__main__':
-    # CherryPy always starts with app.root when trying to map request URIs
-    # to objects, so we need to mount a request handler root. A request
-    # to '/' will be mapped to HelloWorld().index().
-    cherrypy.quickstart(GeneratorDemo(), config=tutconf)
diff --git a/lib/cherrypy/tutorial/tut09_files.py b/lib/cherrypy/tutorial/tut09_files.py
deleted file mode 100644
index 48585cbe..00000000
--- a/lib/cherrypy/tutorial/tut09_files.py
+++ /dev/null
@@ -1,105 +0,0 @@
-"""
-
-Tutorial: File upload and download
-
-Uploads
--------
-
-When a client uploads a file to a CherryPy application, it's placed
-on disk immediately. CherryPy will pass it to your exposed method
-as an argument (see "myFile" below); that arg will have a "file"
-attribute, which is a handle to the temporary uploaded file.
-If you wish to permanently save the file, you need to read()
-from myFile.file and write() somewhere else.
-
-Note the use of 'enctype="multipart/form-data"' and 'input type="file"'
-in the HTML which the client uses to upload the file.
-
-
-Downloads
----------
-
-If you wish to send a file to the client, you have two options:
-First, you can simply return a file-like object from your page handler.
-CherryPy will read the file and serve it as the content (HTTP body)
-of the response. However, that doesn't tell the client that
-the response is a file to be saved, rather than displayed.
-Use cherrypy.lib.static.serve_file for that; it takes four
-arguments:
-
-serve_file(path, content_type=None, disposition=None, name=None)
-
-Set "name" to the filename that you expect clients to use when they save
-your file. Note that the "name" argument is ignored if you don't also
-provide a "disposition" (usually "attachement"). You can manually set
-"content_type", but be aware that if you also use the encoding tool, it
-may choke if the file extension is not recognized as belonging to a known
-Content-Type. Setting the content_type to "application/x-download" works
-in most cases, and should prompt the user with an Open/Save dialog in
-popular browsers.
-
-"""
-
-import os
-import os.path
-
-import cherrypy
-from cherrypy.lib import static
-
-localDir = os.path.dirname(__file__)
-absDir = os.path.join(os.getcwd(), localDir)
-
-
-class FileDemo(object):
-
-    @cherrypy.expose
-    def index(self):
-        return """
-        <html><body>
-            <h2>Upload a file</h2>
-            <form action="upload" method="post" enctype="multipart/form-data">
-            filename: <input type="file" name="myFile" /><br />
-            <input type="submit" />
-            </form>
-            <h2>Download a file</h2>
-            <a href='download'>This one</a>
-        </body></html>
-        """
-
-    @cherrypy.expose
-    def upload(self, myFile):
-        out = """<html>
-        <body>
-            myFile length: %s<br />
-            myFile filename: %s<br />
-            myFile mime-type: %s
-        </body>
-        </html>"""
-
-        # Although this just counts the file length, it demonstrates
-        # how to read large files in chunks instead of all at once.
-        # CherryPy reads the uploaded file into a temporary file;
-        # myFile.file.read reads from that.
-        size = 0
-        while True:
-            data = myFile.file.read(8192)
-            if not data:
-                break
-            size += len(data)
-
-        return out % (size, myFile.filename, myFile.content_type)
-
-    @cherrypy.expose
-    def download(self):
-        path = os.path.join(absDir, 'pdf_file.pdf')
-        return static.serve_file(path, 'application/x-download',
-                                 'attachment', os.path.basename(path))
-
-
-tutconf = os.path.join(os.path.dirname(__file__), 'tutorial.conf')
-
-if __name__ == '__main__':
-    # CherryPy always starts with app.root when trying to map request URIs
-    # to objects, so we need to mount a request handler root. A request
-    # to '/' will be mapped to HelloWorld().index().
-    cherrypy.quickstart(FileDemo(), config=tutconf)
diff --git a/lib/cherrypy/tutorial/tut10_http_errors.py b/lib/cherrypy/tutorial/tut10_http_errors.py
deleted file mode 100644
index 18f02fd0..00000000
--- a/lib/cherrypy/tutorial/tut10_http_errors.py
+++ /dev/null
@@ -1,84 +0,0 @@
-"""
-
-Tutorial: HTTP errors
-
-HTTPError is used to return an error response to the client.
-CherryPy has lots of options regarding how such errors are
-logged, displayed, and formatted.
-
-"""
-
-import os
-import os.path
-
-import cherrypy
-
-localDir = os.path.dirname(__file__)
-curpath = os.path.normpath(os.path.join(os.getcwd(), localDir))
-
-
-class HTTPErrorDemo(object):
-
-    # Set a custom response for 403 errors.
-    _cp_config = {'error_page.403':
-                  os.path.join(curpath, 'custom_error.html')}
-
-    @cherrypy.expose
-    def index(self):
-        # display some links that will result in errors
-        tracebacks = cherrypy.request.show_tracebacks
-        if tracebacks:
-            trace = 'off'
-        else:
-            trace = 'on'
-
-        return """
-        <html><body>
-            <p>Toggle tracebacks <a href="toggleTracebacks">%s</a></p>
-            <p><a href="/doesNotExist">Click me; I'm a broken link!</a></p>
-            <p>
-              <a href="/error?code=403">
-                Use a custom error page from a file.
-              </a>
-            </p>
-            <p>These errors are explicitly raised by the application:</p>
-            <ul>
-                <li><a href="/error?code=400">400</a></li>
-                <li><a href="/error?code=401">401</a></li>
-                <li><a href="/error?code=402">402</a></li>
-                <li><a href="/error?code=500">500</a></li>
-            </ul>
-            <p><a href="/messageArg">You can also set the response body
-            when you raise an error.</a></p>
-        </body></html>
-        """ % trace
-
-    @cherrypy.expose
-    def toggleTracebacks(self):
-        # simple function to toggle tracebacks on and off
-        tracebacks = cherrypy.request.show_tracebacks
-        cherrypy.config.update({'request.show_tracebacks': not tracebacks})
-
-        # redirect back to the index
-        raise cherrypy.HTTPRedirect('/')
-
-    @cherrypy.expose
-    def error(self, code):
-        # raise an error based on the get query
-        raise cherrypy.HTTPError(status=code)
-
-    @cherrypy.expose
-    def messageArg(self):
-        message = ("If you construct an HTTPError with a 'message' "
-                   'argument, it wil be placed on the error page '
-                   '(underneath the status line by default).')
-        raise cherrypy.HTTPError(500, message=message)
-
-
-tutconf = os.path.join(os.path.dirname(__file__), 'tutorial.conf')
-
-if __name__ == '__main__':
-    # CherryPy always starts with app.root when trying to map request URIs
-    # to objects, so we need to mount a request handler root. A request
-    # to '/' will be mapped to HelloWorld().index().
-    cherrypy.quickstart(HTTPErrorDemo(), config=tutconf)
diff --git a/lib/cherrypy/tutorial/tutorial.conf b/lib/cherrypy/tutorial/tutorial.conf
deleted file mode 100644
index 43dfa60f..00000000
--- a/lib/cherrypy/tutorial/tutorial.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[global]
-server.socket_host = "127.0.0.1"
-server.socket_port = 8080
-server.thread_pool = 10
diff --git a/lib/cherrypy/wsgiserver/__init__.py b/lib/cherrypy/wsgiserver/__init__.py
new file mode 100644
index 00000000..ee6190fe
--- /dev/null
+++ b/lib/cherrypy/wsgiserver/__init__.py
@@ -0,0 +1,14 @@
+__all__ = ['HTTPRequest', 'HTTPConnection', 'HTTPServer',
+           'SizeCheckWrapper', 'KnownLengthRFile', 'ChunkedRFile',
+           'MaxSizeExceeded', 'NoSSLError', 'FatalSSLAlert',
+           'WorkerThread', 'ThreadPool', 'SSLAdapter',
+           'CherryPyWSGIServer',
+           'Gateway', 'WSGIGateway', 'WSGIGateway_10', 'WSGIGateway_u0',
+           'WSGIPathInfoDispatcher', 'get_ssl_adapter_class']
+
+import sys
+if sys.version_info < (3, 0):
+    from wsgiserver2 import *
+else:
+    # Le sigh. Boo for backward-incompatible syntax.
+    exec('from .wsgiserver3 import *')
diff --git a/lib/cherrypy/wsgiserver/ssl_builtin.py b/lib/cherrypy/wsgiserver/ssl_builtin.py
new file mode 100644
index 00000000..2c74ad84
--- /dev/null
+++ b/lib/cherrypy/wsgiserver/ssl_builtin.py
@@ -0,0 +1,92 @@
+"""A library for integrating Python's builtin ``ssl`` library with CherryPy.
+
+The ssl module must be importable for SSL functionality.
+
+To use this module, set ``CherryPyWSGIServer.ssl_adapter`` to an instance of
+``BuiltinSSLAdapter``.
+"""
+
+try:
+    import ssl
+except ImportError:
+    ssl = None
+
+try:
+    from _pyio import DEFAULT_BUFFER_SIZE
+except ImportError:
+    try:
+        from io import DEFAULT_BUFFER_SIZE
+    except ImportError:
+        DEFAULT_BUFFER_SIZE = -1
+
+import sys
+
+from cherrypy import wsgiserver
+
+
+class BuiltinSSLAdapter(wsgiserver.SSLAdapter):
+
+    """A wrapper for integrating Python's builtin ssl module with CherryPy."""
+
+    certificate = None
+    """The filename of the server SSL certificate."""
+
+    private_key = None
+    """The filename of the server's private key file."""
+
+    def __init__(self, certificate, private_key, certificate_chain=None):
+        if ssl is None:
+            raise ImportError("You must install the ssl module to use HTTPS.")
+        self.certificate = certificate
+        self.private_key = private_key
+        self.certificate_chain = certificate_chain
+
+    def bind(self, sock):
+        """Wrap and return the given socket."""
+        return sock
+
+    def wrap(self, sock):
+        """Wrap and return the given socket, plus WSGI environ entries."""
+        try:
+            s = ssl.wrap_socket(sock, do_handshake_on_connect=True,
+                                server_side=True, certfile=self.certificate,
+                                keyfile=self.private_key,
+                                ssl_version=ssl.PROTOCOL_SSLv23)
+        except ssl.SSLError:
+            e = sys.exc_info()[1]
+            if e.errno == ssl.SSL_ERROR_EOF:
+                # This is almost certainly due to the cherrypy engine
+                # 'pinging' the socket to assert it's connectable;
+                # the 'ping' isn't SSL.
+                return None, {}
+            elif e.errno == ssl.SSL_ERROR_SSL:
+                if e.args[1].endswith('http request'):
+                    # The client is speaking HTTP to an HTTPS server.
+                    raise wsgiserver.NoSSLError
+                elif e.args[1].endswith('unknown protocol'):
+                    # The client is speaking some non-HTTP protocol.
+                    # Drop the conn.
+                    return None, {}
+            raise
+        return s, self.get_environ(s)
+
+    # TODO: fill this out more with mod ssl env
+    def get_environ(self, sock):
+        """Create WSGI environ entries to be merged into each request."""
+        cipher = sock.cipher()
+        ssl_environ = {
+            "wsgi.url_scheme": "https",
+            "HTTPS": "on",
+            'SSL_PROTOCOL': cipher[1],
+            'SSL_CIPHER': cipher[0]
+            # SSL_VERSION_INTERFACE 	string 	The mod_ssl program version
+            # SSL_VERSION_LIBRARY 	string 	The OpenSSL program version
+        }
+        return ssl_environ
+
+    if sys.version_info >= (3, 0):
+        def makefile(self, sock, mode='r', bufsize=DEFAULT_BUFFER_SIZE):
+            return wsgiserver.CP_makefile(sock, mode, bufsize)
+    else:
+        def makefile(self, sock, mode='r', bufsize=DEFAULT_BUFFER_SIZE):
+            return wsgiserver.CP_fileobject(sock, mode, bufsize)
diff --git a/lib/cherrypy/wsgiserver/ssl_pyopenssl.py b/lib/cherrypy/wsgiserver/ssl_pyopenssl.py
new file mode 100644
index 00000000..f8f2dafe
--- /dev/null
+++ b/lib/cherrypy/wsgiserver/ssl_pyopenssl.py
@@ -0,0 +1,253 @@
+"""A library for integrating pyOpenSSL with CherryPy.
+
+The OpenSSL module must be importable for SSL functionality.
+You can obtain it from `here <https://launchpad.net/pyopenssl>`_.
+
+To use this module, set CherryPyWSGIServer.ssl_adapter to an instance of
+SSLAdapter. There are two ways to use SSL:
+
+Method One
+----------
+
+ * ``ssl_adapter.context``: an instance of SSL.Context.
+
+If this is not None, it is assumed to be an SSL.Context instance,
+and will be passed to SSL.Connection on bind(). The developer is
+responsible for forming a valid Context object. This approach is
+to be preferred for more flexibility, e.g. if the cert and key are
+streams instead of files, or need decryption, or SSL.SSLv3_METHOD
+is desired instead of the default SSL.SSLv23_METHOD, etc. Consult
+the pyOpenSSL documentation for complete options.
+
+Method Two (shortcut)
+---------------------
+
+ * ``ssl_adapter.certificate``: the filename of the server SSL certificate.
+ * ``ssl_adapter.private_key``: the filename of the server's private key file.
+
+Both are None by default. If ssl_adapter.context is None, but .private_key
+and .certificate are both given and valid, they will be read, and the
+context will be automatically created from them.
+"""
+
+import socket
+import threading
+import time
+
+from cherrypy import wsgiserver
+
+try:
+    from OpenSSL import SSL
+    from OpenSSL import crypto
+except ImportError:
+    SSL = None
+
+
+class SSL_fileobject(wsgiserver.CP_fileobject):
+
+    """SSL file object attached to a socket object."""
+
+    ssl_timeout = 3
+    ssl_retry = .01
+
+    def _safe_call(self, is_reader, call, *args, **kwargs):
+        """Wrap the given call with SSL error-trapping.
+
+        is_reader: if False EOF errors will be raised. If True, EOF errors
+        will return "" (to emulate normal sockets).
+        """
+        start = time.time()
+        while True:
+            try:
+                return call(*args, **kwargs)
+            except SSL.WantReadError:
+                # Sleep and try again. This is dangerous, because it means
+                # the rest of the stack has no way of differentiating
+                # between a "new handshake" error and "client dropped".
+                # Note this isn't an endless loop: there's a timeout below.
+                time.sleep(self.ssl_retry)
+            except SSL.WantWriteError:
+                time.sleep(self.ssl_retry)
+            except SSL.SysCallError, e:
+                if is_reader and e.args == (-1, 'Unexpected EOF'):
+                    return ""
+
+                errnum = e.args[0]
+                if is_reader and errnum in wsgiserver.socket_errors_to_ignore:
+                    return ""
+                raise socket.error(errnum)
+            except SSL.Error, e:
+                if is_reader and e.args == (-1, 'Unexpected EOF'):
+                    return ""
+
+                thirdarg = None
+                try:
+                    thirdarg = e.args[0][0][2]
+                except IndexError:
+                    pass
+
+                if thirdarg == 'http request':
+                    # The client is talking HTTP to an HTTPS server.
+                    raise wsgiserver.NoSSLError()
+
+                raise wsgiserver.FatalSSLAlert(*e.args)
+            except:
+                raise
+
+            if time.time() - start > self.ssl_timeout:
+                raise socket.timeout("timed out")
+
+    def recv(self, size):
+        return self._safe_call(True, super(SSL_fileobject, self).recv, size)
+
+    def sendall(self, *args, **kwargs):
+        return self._safe_call(False, super(SSL_fileobject, self).sendall,
+                               *args, **kwargs)
+
+    def send(self, *args, **kwargs):
+        return self._safe_call(False, super(SSL_fileobject, self).send,
+                               *args, **kwargs)
+
+
+class SSLConnection:
+
+    """A thread-safe wrapper for an SSL.Connection.
+
+    ``*args``: the arguments to create the wrapped ``SSL.Connection(*args)``.
+    """
+
+    def __init__(self, *args):
+        self._ssl_conn = SSL.Connection(*args)
+        self._lock = threading.RLock()
+
+    for f in ('get_context', 'pending', 'send', 'write', 'recv', 'read',
+              'renegotiate', 'bind', 'listen', 'connect', 'accept',
+              'setblocking', 'fileno', 'close', 'get_cipher_list',
+              'getpeername', 'getsockname', 'getsockopt', 'setsockopt',
+              'makefile', 'get_app_data', 'set_app_data', 'state_string',
+              'sock_shutdown', 'get_peer_certificate', 'want_read',
+              'want_write', 'set_connect_state', 'set_accept_state',
+              'connect_ex', 'sendall', 'settimeout', 'gettimeout'):
+        exec("""def %s(self, *args):
+        self._lock.acquire()
+        try:
+            return self._ssl_conn.%s(*args)
+        finally:
+            self._lock.release()
+""" % (f, f))
+
+    def shutdown(self, *args):
+        self._lock.acquire()
+        try:
+            # pyOpenSSL.socket.shutdown takes no args
+            return self._ssl_conn.shutdown()
+        finally:
+            self._lock.release()
+
+
+class pyOpenSSLAdapter(wsgiserver.SSLAdapter):
+
+    """A wrapper for integrating pyOpenSSL with CherryPy."""
+
+    context = None
+    """An instance of SSL.Context."""
+
+    certificate = None
+    """The filename of the server SSL certificate."""
+
+    private_key = None
+    """The filename of the server's private key file."""
+
+    certificate_chain = None
+    """Optional. The filename of CA's intermediate certificate bundle.
+
+    This is needed for cheaper "chained root" SSL certificates, and should be
+    left as None if not required."""
+
+    def __init__(self, certificate, private_key, certificate_chain=None):
+        if SSL is None:
+            raise ImportError("You must install pyOpenSSL to use HTTPS.")
+
+        self.context = None
+        self.certificate = certificate
+        self.private_key = private_key
+        self.certificate_chain = certificate_chain
+        self._environ = None
+
+    def bind(self, sock):
+        """Wrap and return the given socket."""
+        if self.context is None:
+            self.context = self.get_context()
+        conn = SSLConnection(self.context, sock)
+        self._environ = self.get_environ()
+        return conn
+
+    def wrap(self, sock):
+        """Wrap and return the given socket, plus WSGI environ entries."""
+        return sock, self._environ.copy()
+
+    def get_context(self):
+        """Return an SSL.Context from self attributes."""
+        # See http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/442473
+        c = SSL.Context(SSL.SSLv23_METHOD)
+        c.use_privatekey_file(self.private_key)
+        if self.certificate_chain:
+            c.load_verify_locations(self.certificate_chain)
+        c.use_certificate_file(self.certificate)
+        return c
+
+    def get_environ(self):
+        """Return WSGI environ entries to be merged into each request."""
+        ssl_environ = {
+            "HTTPS": "on",
+            # pyOpenSSL doesn't provide access to any of these AFAICT
+            # 'SSL_PROTOCOL': 'SSLv2',
+            # SSL_CIPHER 	string 	The cipher specification name
+            # SSL_VERSION_INTERFACE 	string 	The mod_ssl program version
+            # SSL_VERSION_LIBRARY 	string 	The OpenSSL program version
+        }
+
+        if self.certificate:
+            # Server certificate attributes
+            cert = open(self.certificate, 'rb').read()
+            cert = crypto.load_certificate(crypto.FILETYPE_PEM, cert)
+            ssl_environ.update({
+                'SSL_SERVER_M_VERSION': cert.get_version(),
+                'SSL_SERVER_M_SERIAL': cert.get_serial_number(),
+                # 'SSL_SERVER_V_START':
+                #   Validity of server's certificate (start time),
+                # 'SSL_SERVER_V_END':
+                #   Validity of server's certificate (end time),
+            })
+
+            for prefix, dn in [("I", cert.get_issuer()),
+                               ("S", cert.get_subject())]:
+                # X509Name objects don't seem to have a way to get the
+                # complete DN string. Use str() and slice it instead,
+                # because str(dn) == "<X509Name object '/C=US/ST=...'>"
+                dnstr = str(dn)[18:-2]
+
+                wsgikey = 'SSL_SERVER_%s_DN' % prefix
+                ssl_environ[wsgikey] = dnstr
+
+                # The DN should be of the form: /k1=v1/k2=v2, but we must allow
+                # for any value to contain slashes itself (in a URL).
+                while dnstr:
+                    pos = dnstr.rfind("=")
+                    dnstr, value = dnstr[:pos], dnstr[pos + 1:]
+                    pos = dnstr.rfind("/")
+                    dnstr, key = dnstr[:pos], dnstr[pos + 1:]
+                    if key and value:
+                        wsgikey = 'SSL_SERVER_%s_DN_%s' % (prefix, key)
+                        ssl_environ[wsgikey] = value
+
+        return ssl_environ
+
+    def makefile(self, sock, mode='r', bufsize=-1):
+        if SSL and isinstance(sock, SSL.ConnectionType):
+            timeout = sock.gettimeout()
+            f = SSL_fileobject(sock, mode, bufsize)
+            f.ssl_timeout = timeout
+            return f
+        else:
+            return wsgiserver.CP_fileobject(sock, mode, bufsize)
diff --git a/lib/cherrypy/wsgiserver/wsgiserver2.py b/lib/cherrypy/wsgiserver/wsgiserver2.py
new file mode 100644
index 00000000..c0896d3d
--- /dev/null
+++ b/lib/cherrypy/wsgiserver/wsgiserver2.py
@@ -0,0 +1,2481 @@
+"""A high-speed, production ready, thread pooled, generic HTTP server.
+
+Simplest example on how to use this module directly
+(without using CherryPy's application machinery)::
+
+    from cherrypy import wsgiserver
+
+    def my_crazy_app(environ, start_response):
+        status = '200 OK'
+        response_headers = [('Content-type','text/plain')]
+        start_response(status, response_headers)
+        return ['Hello world!']
+
+    server = wsgiserver.CherryPyWSGIServer(
+                ('0.0.0.0', 8070), my_crazy_app,
+                server_name='www.cherrypy.example')
+    server.start()
+
+The CherryPy WSGI server can serve as many WSGI applications
+as you want in one instance by using a WSGIPathInfoDispatcher::
+
+    d = WSGIPathInfoDispatcher({'/': my_crazy_app, '/blog': my_blog_app})
+    server = wsgiserver.CherryPyWSGIServer(('0.0.0.0', 80), d)
+
+Want SSL support? Just set server.ssl_adapter to an SSLAdapter instance.
+
+This won't call the CherryPy engine (application side) at all, only the
+HTTP server, which is independent from the rest of CherryPy. Don't
+let the name "CherryPyWSGIServer" throw you; the name merely reflects
+its origin, not its coupling.
+
+For those of you wanting to understand internals of this module, here's the
+basic call flow. The server's listening thread runs a very tight loop,
+sticking incoming connections onto a Queue::
+
+    server = CherryPyWSGIServer(...)
+    server.start()
+    while True:
+        tick()
+        # This blocks until a request comes in:
+        child = socket.accept()
+        conn = HTTPConnection(child, ...)
+        server.requests.put(conn)
+
+Worker threads are kept in a pool and poll the Queue, popping off and then
+handling each connection in turn. Each connection can consist of an arbitrary
+number of requests and their responses, so we run a nested loop::
+
+    while True:
+        conn = server.requests.get()
+        conn.communicate()
+        ->  while True:
+                req = HTTPRequest(...)
+                req.parse_request()
+                ->  # Read the Request-Line, e.g. "GET /page HTTP/1.1"
+                    req.rfile.readline()
+                    read_headers(req.rfile, req.inheaders)
+                req.respond()
+                ->  response = app(...)
+                    try:
+                        for chunk in response:
+                            if chunk:
+                                req.write(chunk)
+                    finally:
+                        if hasattr(response, "close"):
+                            response.close()
+                if req.close_connection:
+                    return
+"""
+
+__all__ = ['HTTPRequest', 'HTTPConnection', 'HTTPServer',
+           'SizeCheckWrapper', 'KnownLengthRFile', 'ChunkedRFile',
+           'CP_fileobject',
+           'MaxSizeExceeded', 'NoSSLError', 'FatalSSLAlert',
+           'WorkerThread', 'ThreadPool', 'SSLAdapter',
+           'CherryPyWSGIServer',
+           'Gateway', 'WSGIGateway', 'WSGIGateway_10', 'WSGIGateway_u0',
+           'WSGIPathInfoDispatcher', 'get_ssl_adapter_class']
+
+import os
+try:
+    import queue
+except:
+    import Queue as queue
+import re
+import rfc822
+import socket
+import sys
+if 'win' in sys.platform and hasattr(socket, "AF_INET6"):
+    if not hasattr(socket, 'IPPROTO_IPV6'):
+        socket.IPPROTO_IPV6 = 41
+    if not hasattr(socket, 'IPV6_V6ONLY'):
+        socket.IPV6_V6ONLY = 27
+try:
+    import cStringIO as StringIO
+except ImportError:
+    import StringIO
+DEFAULT_BUFFER_SIZE = -1
+
+
+class FauxSocket(object):
+
+    """Faux socket with the minimal interface required by pypy"""
+
+    def _reuse(self):
+        pass
+
+_fileobject_uses_str_type = isinstance(
+    socket._fileobject(FauxSocket())._rbuf, basestring)
+del FauxSocket  # this class is not longer required for anything.
+
+import threading
+import time
+import traceback
+
+
+def format_exc(limit=None):
+    """Like print_exc() but return a string. Backport for Python 2.3."""
+    try:
+        etype, value, tb = sys.exc_info()
+        return ''.join(traceback.format_exception(etype, value, tb, limit))
+    finally:
+        etype = value = tb = None
+
+import operator
+
+from urllib import unquote
+import warnings
+
+if sys.version_info >= (3, 0):
+    bytestr = bytes
+    unicodestr = str
+    basestring = (bytes, str)
+
+    def ntob(n, encoding='ISO-8859-1'):
+        """Return the given native string as a byte string in the given
+        encoding.
+        """
+        # In Python 3, the native string type is unicode
+        return n.encode(encoding)
+else:
+    bytestr = str
+    unicodestr = unicode
+    basestring = basestring
+
+    def ntob(n, encoding='ISO-8859-1'):
+        """Return the given native string as a byte string in the given
+        encoding.
+        """
+        # In Python 2, the native string type is bytes. Assume it's already
+        # in the given encoding, which for ISO-8859-1 is almost always what
+        # was intended.
+        return n
+
+LF = ntob('\n')
+CRLF = ntob('\r\n')
+TAB = ntob('\t')
+SPACE = ntob(' ')
+COLON = ntob(':')
+SEMICOLON = ntob(';')
+EMPTY = ntob('')
+NUMBER_SIGN = ntob('#')
+QUESTION_MARK = ntob('?')
+ASTERISK = ntob('*')
+FORWARD_SLASH = ntob('/')
+quoted_slash = re.compile(ntob("(?i)%2F"))
+
+import errno
+
+
+def plat_specific_errors(*errnames):
+    """Return error numbers for all errors in errnames on this platform.
+
+    The 'errno' module contains different global constants depending on
+    the specific platform (OS). This function will return the list of
+    numeric values for a given list of potential names.
+    """
+    errno_names = dir(errno)
+    nums = [getattr(errno, k) for k in errnames if k in errno_names]
+    # de-dupe the list
+    return list(dict.fromkeys(nums).keys())
+
+socket_error_eintr = plat_specific_errors("EINTR", "WSAEINTR")
+
+socket_errors_to_ignore = plat_specific_errors(
+    "EPIPE",
+    "EBADF", "WSAEBADF",
+    "ENOTSOCK", "WSAENOTSOCK",
+    "ETIMEDOUT", "WSAETIMEDOUT",
+    "ECONNREFUSED", "WSAECONNREFUSED",
+    "ECONNRESET", "WSAECONNRESET",
+    "ECONNABORTED", "WSAECONNABORTED",
+    "ENETRESET", "WSAENETRESET",
+    "EHOSTDOWN", "EHOSTUNREACH",
+)
+socket_errors_to_ignore.append("timed out")
+socket_errors_to_ignore.append("The read operation timed out")
+
+socket_errors_nonblocking = plat_specific_errors(
+    'EAGAIN', 'EWOULDBLOCK', 'WSAEWOULDBLOCK')
+
+comma_separated_headers = [
+    ntob(h) for h in
+    ['Accept', 'Accept-Charset', 'Accept-Encoding',
+     'Accept-Language', 'Accept-Ranges', 'Allow', 'Cache-Control',
+     'Connection', 'Content-Encoding', 'Content-Language', 'Expect',
+     'If-Match', 'If-None-Match', 'Pragma', 'Proxy-Authenticate', 'TE',
+     'Trailer', 'Transfer-Encoding', 'Upgrade', 'Vary', 'Via', 'Warning',
+     'WWW-Authenticate']
+]
+
+
+import logging
+if not hasattr(logging, 'statistics'):
+    logging.statistics = {}
+
+
+def read_headers(rfile, hdict=None):
+    """Read headers from the given stream into the given header dict.
+
+    If hdict is None, a new header dict is created. Returns the populated
+    header dict.
+
+    Headers which are repeated are folded together using a comma if their
+    specification so dictates.
+
+    This function raises ValueError when the read bytes violate the HTTP spec.
+    You should probably return "400 Bad Request" if this happens.
+    """
+    if hdict is None:
+        hdict = {}
+
+    while True:
+        line = rfile.readline()
+        if not line:
+            # No more data--illegal end of headers
+            raise ValueError("Illegal end of headers.")
+
+        if line == CRLF:
+            # Normal end of headers
+            break
+        if not line.endswith(CRLF):
+            raise ValueError("HTTP requires CRLF terminators")
+
+        if line[0] in (SPACE, TAB):
+            # It's a continuation line.
+            v = line.strip()
+        else:
+            try:
+                k, v = line.split(COLON, 1)
+            except ValueError:
+                raise ValueError("Illegal header line.")
+            # TODO: what about TE and WWW-Authenticate?
+            k = k.strip().title()
+            v = v.strip()
+            hname = k
+
+        if k in comma_separated_headers:
+            existing = hdict.get(hname)
+            if existing:
+                v = ", ".join((existing, v))
+        hdict[hname] = v
+
+    return hdict
+
+
+class MaxSizeExceeded(Exception):
+    pass
+
+
+class SizeCheckWrapper(object):
+
+    """Wraps a file-like object, raising MaxSizeExceeded if too large."""
+
+    def __init__(self, rfile, maxlen):
+        self.rfile = rfile
+        self.maxlen = maxlen
+        self.bytes_read = 0
+
+    def _check_length(self):
+        if self.maxlen and self.bytes_read > self.maxlen:
+            raise MaxSizeExceeded()
+
+    def read(self, size=None):
+        data = self.rfile.read(size)
+        self.bytes_read += len(data)
+        self._check_length()
+        return data
+
+    def readline(self, size=None):
+        if size is not None:
+            data = self.rfile.readline(size)
+            self.bytes_read += len(data)
+            self._check_length()
+            return data
+
+        # User didn't specify a size ...
+        # We read the line in chunks to make sure it's not a 100MB line !
+        res = []
+        while True:
+            data = self.rfile.readline(256)
+            self.bytes_read += len(data)
+            self._check_length()
+            res.append(data)
+            # See https://bitbucket.org/cherrypy/cherrypy/issue/421
+            if len(data) < 256 or data[-1:] == LF:
+                return EMPTY.join(res)
+
+    def readlines(self, sizehint=0):
+        # Shamelessly stolen from StringIO
+        total = 0
+        lines = []
+        line = self.readline()
+        while line:
+            lines.append(line)
+            total += len(line)
+            if 0 < sizehint <= total:
+                break
+            line = self.readline()
+        return lines
+
+    def close(self):
+        self.rfile.close()
+
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        data = next(self.rfile)
+        self.bytes_read += len(data)
+        self._check_length()
+        return data
+
+    def next(self):
+        data = self.rfile.next()
+        self.bytes_read += len(data)
+        self._check_length()
+        return data
+
+
+class KnownLengthRFile(object):
+
+    """Wraps a file-like object, returning an empty string when exhausted."""
+
+    def __init__(self, rfile, content_length):
+        self.rfile = rfile
+        self.remaining = content_length
+
+    def read(self, size=None):
+        if self.remaining == 0:
+            return ''
+        if size is None:
+            size = self.remaining
+        else:
+            size = min(size, self.remaining)
+
+        data = self.rfile.read(size)
+        self.remaining -= len(data)
+        return data
+
+    def readline(self, size=None):
+        if self.remaining == 0:
+            return ''
+        if size is None:
+            size = self.remaining
+        else:
+            size = min(size, self.remaining)
+
+        data = self.rfile.readline(size)
+        self.remaining -= len(data)
+        return data
+
+    def readlines(self, sizehint=0):
+        # Shamelessly stolen from StringIO
+        total = 0
+        lines = []
+        line = self.readline(sizehint)
+        while line:
+            lines.append(line)
+            total += len(line)
+            if 0 < sizehint <= total:
+                break
+            line = self.readline(sizehint)
+        return lines
+
+    def close(self):
+        self.rfile.close()
+
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        data = next(self.rfile)
+        self.remaining -= len(data)
+        return data
+
+
+class ChunkedRFile(object):
+
+    """Wraps a file-like object, returning an empty string when exhausted.
+
+    This class is intended to provide a conforming wsgi.input value for
+    request entities that have been encoded with the 'chunked' transfer
+    encoding.
+    """
+
+    def __init__(self, rfile, maxlen, bufsize=8192):
+        self.rfile = rfile
+        self.maxlen = maxlen
+        self.bytes_read = 0
+        self.buffer = EMPTY
+        self.bufsize = bufsize
+        self.closed = False
+
+    def _fetch(self):
+        if self.closed:
+            return
+
+        line = self.rfile.readline()
+        self.bytes_read += len(line)
+
+        if self.maxlen and self.bytes_read > self.maxlen:
+            raise MaxSizeExceeded("Request Entity Too Large", self.maxlen)
+
+        line = line.strip().split(SEMICOLON, 1)
+
+        try:
+            chunk_size = line.pop(0)
+            chunk_size = int(chunk_size, 16)
+        except ValueError:
+            raise ValueError("Bad chunked transfer size: " + repr(chunk_size))
+
+        if chunk_size <= 0:
+            self.closed = True
+            return
+
+##            if line: chunk_extension = line[0]
+
+        if self.maxlen and self.bytes_read + chunk_size > self.maxlen:
+            raise IOError("Request Entity Too Large")
+
+        chunk = self.rfile.read(chunk_size)
+        self.bytes_read += len(chunk)
+        self.buffer += chunk
+
+        crlf = self.rfile.read(2)
+        if crlf != CRLF:
+            raise ValueError(
+                "Bad chunked transfer coding (expected '\\r\\n', "
+                "got " + repr(crlf) + ")")
+
+    def read(self, size=None):
+        data = EMPTY
+        while True:
+            if size and len(data) >= size:
+                return data
+
+            if not self.buffer:
+                self._fetch()
+                if not self.buffer:
+                    # EOF
+                    return data
+
+            if size:
+                remaining = size - len(data)
+                data += self.buffer[:remaining]
+                self.buffer = self.buffer[remaining:]
+            else:
+                data += self.buffer
+
+    def readline(self, size=None):
+        data = EMPTY
+        while True:
+            if size and len(data) >= size:
+                return data
+
+            if not self.buffer:
+                self._fetch()
+                if not self.buffer:
+                    # EOF
+                    return data
+
+            newline_pos = self.buffer.find(LF)
+            if size:
+                if newline_pos == -1:
+                    remaining = size - len(data)
+                    data += self.buffer[:remaining]
+                    self.buffer = self.buffer[remaining:]
+                else:
+                    remaining = min(size - len(data), newline_pos)
+                    data += self.buffer[:remaining]
+                    self.buffer = self.buffer[remaining:]
+            else:
+                if newline_pos == -1:
+                    data += self.buffer
+                else:
+                    data += self.buffer[:newline_pos]
+                    self.buffer = self.buffer[newline_pos:]
+
+    def readlines(self, sizehint=0):
+        # Shamelessly stolen from StringIO
+        total = 0
+        lines = []
+        line = self.readline(sizehint)
+        while line:
+            lines.append(line)
+            total += len(line)
+            if 0 < sizehint <= total:
+                break
+            line = self.readline(sizehint)
+        return lines
+
+    def read_trailer_lines(self):
+        if not self.closed:
+            raise ValueError(
+                "Cannot read trailers until the request body has been read.")
+
+        while True:
+            line = self.rfile.readline()
+            if not line:
+                # No more data--illegal end of headers
+                raise ValueError("Illegal end of headers.")
+
+            self.bytes_read += len(line)
+            if self.maxlen and self.bytes_read > self.maxlen:
+                raise IOError("Request Entity Too Large")
+
+            if line == CRLF:
+                # Normal end of headers
+                break
+            if not line.endswith(CRLF):
+                raise ValueError("HTTP requires CRLF terminators")
+
+            yield line
+
+    def close(self):
+        self.rfile.close()
+
+    def __iter__(self):
+        # Shamelessly stolen from StringIO
+        total = 0
+        line = self.readline(sizehint)
+        while line:
+            yield line
+            total += len(line)
+            if 0 < sizehint <= total:
+                break
+            line = self.readline(sizehint)
+
+
+class HTTPRequest(object):
+
+    """An HTTP Request (and response).
+
+    A single HTTP connection may consist of multiple request/response pairs.
+    """
+
+    server = None
+    """The HTTPServer object which is receiving this request."""
+
+    conn = None
+    """The HTTPConnection object on which this request connected."""
+
+    inheaders = {}
+    """A dict of request headers."""
+
+    outheaders = []
+    """A list of header tuples to write in the response."""
+
+    ready = False
+    """When True, the request has been parsed and is ready to begin generating
+    the response. When False, signals the calling Connection that the response
+    should not be generated and the connection should close."""
+
+    close_connection = False
+    """Signals the calling Connection that the request should close. This does
+    not imply an error! The client and/or server may each request that the
+    connection be closed."""
+
+    chunked_write = False
+    """If True, output will be encoded with the "chunked" transfer-coding.
+
+    This value is set automatically inside send_headers."""
+
+    def __init__(self, server, conn):
+        self.server = server
+        self.conn = conn
+
+        self.ready = False
+        self.started_request = False
+        self.scheme = ntob("http")
+        if self.server.ssl_adapter is not None:
+            self.scheme = ntob("https")
+        # Use the lowest-common protocol in case read_request_line errors.
+        self.response_protocol = 'HTTP/1.0'
+        self.inheaders = {}
+
+        self.status = ""
+        self.outheaders = []
+        self.sent_headers = False
+        self.close_connection = self.__class__.close_connection
+        self.chunked_read = False
+        self.chunked_write = self.__class__.chunked_write
+
+    def parse_request(self):
+        """Parse the next HTTP request start-line and message-headers."""
+        self.rfile = SizeCheckWrapper(self.conn.rfile,
+                                      self.server.max_request_header_size)
+        try:
+            success = self.read_request_line()
+        except MaxSizeExceeded:
+            self.simple_response(
+                "414 Request-URI Too Long",
+                "The Request-URI sent with the request exceeds the maximum "
+                "allowed bytes.")
+            return
+        else:
+            if not success:
+                return
+
+        try:
+            success = self.read_request_headers()
+        except MaxSizeExceeded:
+            self.simple_response(
+                "413 Request Entity Too Large",
+                "The headers sent with the request exceed the maximum "
+                "allowed bytes.")
+            return
+        else:
+            if not success:
+                return
+
+        self.ready = True
+
+    def read_request_line(self):
+        # HTTP/1.1 connections are persistent by default. If a client
+        # requests a page, then idles (leaves the connection open),
+        # then rfile.readline() will raise socket.error("timed out").
+        # Note that it does this based on the value given to settimeout(),
+        # and doesn't need the client to request or acknowledge the close
+        # (although your TCP stack might suffer for it: cf Apache's history
+        # with FIN_WAIT_2).
+        request_line = self.rfile.readline()
+
+        # Set started_request to True so communicate() knows to send 408
+        # from here on out.
+        self.started_request = True
+        if not request_line:
+            return False
+
+        if request_line == CRLF:
+            # RFC 2616 sec 4.1: "...if the server is reading the protocol
+            # stream at the beginning of a message and receives a CRLF
+            # first, it should ignore the CRLF."
+            # But only ignore one leading line! else we enable a DoS.
+            request_line = self.rfile.readline()
+            if not request_line:
+                return False
+
+        if not request_line.endswith(CRLF):
+            self.simple_response(
+                "400 Bad Request", "HTTP requires CRLF terminators")
+            return False
+
+        try:
+            method, uri, req_protocol = request_line.strip().split(SPACE, 2)
+            rp = int(req_protocol[5]), int(req_protocol[7])
+        except (ValueError, IndexError):
+            self.simple_response("400 Bad Request", "Malformed Request-Line")
+            return False
+
+        self.uri = uri
+        self.method = method
+
+        # uri may be an abs_path (including "http://host.domain.tld");
+        scheme, authority, path = self.parse_request_uri(uri)
+        if NUMBER_SIGN in path:
+            self.simple_response("400 Bad Request",
+                                 "Illegal #fragment in Request-URI.")
+            return False
+
+        if scheme:
+            self.scheme = scheme
+
+        qs = EMPTY
+        if QUESTION_MARK in path:
+            path, qs = path.split(QUESTION_MARK, 1)
+
+        # Unquote the path+params (e.g. "/this%20path" -> "/this path").
+        # http://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html#sec5.1.2
+        #
+        # But note that "...a URI must be separated into its components
+        # before the escaped characters within those components can be
+        # safely decoded." http://www.ietf.org/rfc/rfc2396.txt, sec 2.4.2
+        # Therefore, "/this%2Fpath" becomes "/this%2Fpath", not "/this/path".
+        try:
+            atoms = [unquote(x) for x in quoted_slash.split(path)]
+        except ValueError:
+            ex = sys.exc_info()[1]
+            self.simple_response("400 Bad Request", ex.args[0])
+            return False
+        path = "%2F".join(atoms)
+        self.path = path
+
+        # Note that, like wsgiref and most other HTTP servers,
+        # we "% HEX HEX"-unquote the path but not the query string.
+        self.qs = qs
+
+        # Compare request and server HTTP protocol versions, in case our
+        # server does not support the requested protocol. Limit our output
+        # to min(req, server). We want the following output:
+        #     request    server     actual written   supported response
+        #     protocol   protocol  response protocol    feature set
+        # a     1.0        1.0           1.0                1.0
+        # b     1.0        1.1           1.1                1.0
+        # c     1.1        1.0           1.0                1.0
+        # d     1.1        1.1           1.1                1.1
+        # Notice that, in (b), the response will be "HTTP/1.1" even though
+        # the client only understands 1.0. RFC 2616 10.5.6 says we should
+        # only return 505 if the _major_ version is different.
+        sp = int(self.server.protocol[5]), int(self.server.protocol[7])
+
+        if sp[0] != rp[0]:
+            self.simple_response("505 HTTP Version Not Supported")
+            return False
+
+        self.request_protocol = req_protocol
+        self.response_protocol = "HTTP/%s.%s" % min(rp, sp)
+
+        return True
+
+    def read_request_headers(self):
+        """Read self.rfile into self.inheaders. Return success."""
+
+        # then all the http headers
+        try:
+            read_headers(self.rfile, self.inheaders)
+        except ValueError:
+            ex = sys.exc_info()[1]
+            self.simple_response("400 Bad Request", ex.args[0])
+            return False
+
+        mrbs = self.server.max_request_body_size
+        if mrbs and int(self.inheaders.get("Content-Length", 0)) > mrbs:
+            self.simple_response(
+                "413 Request Entity Too Large",
+                "The entity sent with the request exceeds the maximum "
+                "allowed bytes.")
+            return False
+
+        # Persistent connection support
+        if self.response_protocol == "HTTP/1.1":
+            # Both server and client are HTTP/1.1
+            if self.inheaders.get("Connection", "") == "close":
+                self.close_connection = True
+        else:
+            # Either the server or client (or both) are HTTP/1.0
+            if self.inheaders.get("Connection", "") != "Keep-Alive":
+                self.close_connection = True
+
+        # Transfer-Encoding support
+        te = None
+        if self.response_protocol == "HTTP/1.1":
+            te = self.inheaders.get("Transfer-Encoding")
+            if te:
+                te = [x.strip().lower() for x in te.split(",") if x.strip()]
+
+        self.chunked_read = False
+
+        if te:
+            for enc in te:
+                if enc == "chunked":
+                    self.chunked_read = True
+                else:
+                    # Note that, even if we see "chunked", we must reject
+                    # if there is an extension we don't recognize.
+                    self.simple_response("501 Unimplemented")
+                    self.close_connection = True
+                    return False
+
+        # From PEP 333:
+        # "Servers and gateways that implement HTTP 1.1 must provide
+        # transparent support for HTTP 1.1's "expect/continue" mechanism.
+        # This may be done in any of several ways:
+        #   1. Respond to requests containing an Expect: 100-continue request
+        #      with an immediate "100 Continue" response, and proceed normally.
+        #   2. Proceed with the request normally, but provide the application
+        #      with a wsgi.input stream that will send the "100 Continue"
+        #      response if/when the application first attempts to read from
+        #      the input stream. The read request must then remain blocked
+        #      until the client responds.
+        #   3. Wait until the client decides that the server does not support
+        #      expect/continue, and sends the request body on its own.
+        #      (This is suboptimal, and is not recommended.)
+        #
+        # We used to do 3, but are now doing 1. Maybe we'll do 2 someday,
+        # but it seems like it would be a big slowdown for such a rare case.
+        if self.inheaders.get("Expect", "") == "100-continue":
+            # Don't use simple_response here, because it emits headers
+            # we don't want. See
+            # https://bitbucket.org/cherrypy/cherrypy/issue/951
+            msg = self.server.protocol + " 100 Continue\r\n\r\n"
+            try:
+                self.conn.wfile.sendall(msg)
+            except socket.error:
+                x = sys.exc_info()[1]
+                if x.args[0] not in socket_errors_to_ignore:
+                    raise
+        return True
+
+    def parse_request_uri(self, uri):
+        """Parse a Request-URI into (scheme, authority, path).
+
+        Note that Request-URI's must be one of::
+
+            Request-URI    = "*" | absoluteURI | abs_path | authority
+
+        Therefore, a Request-URI which starts with a double forward-slash
+        cannot be a "net_path"::
+
+            net_path      = "//" authority [ abs_path ]
+
+        Instead, it must be interpreted as an "abs_path" with an empty first
+        path segment::
+
+            abs_path      = "/"  path_segments
+            path_segments = segment *( "/" segment )
+            segment       = *pchar *( ";" param )
+            param         = *pchar
+        """
+        if uri == ASTERISK:
+            return None, None, uri
+
+        i = uri.find('://')
+        if i > 0 and QUESTION_MARK not in uri[:i]:
+            # An absoluteURI.
+            # If there's a scheme (and it must be http or https), then:
+            # http_URL = "http:" "//" host [ ":" port ] [ abs_path [ "?" query
+            # ]]
+            scheme, remainder = uri[:i].lower(), uri[i + 3:]
+            authority, path = remainder.split(FORWARD_SLASH, 1)
+            path = FORWARD_SLASH + path
+            return scheme, authority, path
+
+        if uri.startswith(FORWARD_SLASH):
+            # An abs_path.
+            return None, None, uri
+        else:
+            # An authority.
+            return None, uri, None
+
+    def respond(self):
+        """Call the gateway and write its iterable output."""
+        mrbs = self.server.max_request_body_size
+        if self.chunked_read:
+            self.rfile = ChunkedRFile(self.conn.rfile, mrbs)
+        else:
+            cl = int(self.inheaders.get("Content-Length", 0))
+            if mrbs and mrbs < cl:
+                if not self.sent_headers:
+                    self.simple_response(
+                        "413 Request Entity Too Large",
+                        "The entity sent with the request exceeds the maximum "
+                        "allowed bytes.")
+                return
+            self.rfile = KnownLengthRFile(self.conn.rfile, cl)
+
+        self.server.gateway(self).respond()
+
+        if (self.ready and not self.sent_headers):
+            self.sent_headers = True
+            self.send_headers()
+        if self.chunked_write:
+            self.conn.wfile.sendall("0\r\n\r\n")
+
+    def simple_response(self, status, msg=""):
+        """Write a simple response back to the client."""
+        status = str(status)
+        buf = [self.server.protocol + SPACE +
+               status + CRLF,
+               "Content-Length: %s\r\n" % len(msg),
+               "Content-Type: text/plain\r\n"]
+
+        if status[:3] in ("413", "414"):
+            # Request Entity Too Large / Request-URI Too Long
+            self.close_connection = True
+            if self.response_protocol == 'HTTP/1.1':
+                # This will not be true for 414, since read_request_line
+                # usually raises 414 before reading the whole line, and we
+                # therefore cannot know the proper response_protocol.
+                buf.append("Connection: close\r\n")
+            else:
+                # HTTP/1.0 had no 413/414 status nor Connection header.
+                # Emit 400 instead and trust the message body is enough.
+                status = "400 Bad Request"
+
+        buf.append(CRLF)
+        if msg:
+            if isinstance(msg, unicodestr):
+                msg = msg.encode("ISO-8859-1")
+            buf.append(msg)
+
+        try:
+            self.conn.wfile.sendall("".join(buf))
+        except socket.error:
+            x = sys.exc_info()[1]
+            if x.args[0] not in socket_errors_to_ignore:
+                raise
+
+    def write(self, chunk):
+        """Write unbuffered data to the client."""
+        if self.chunked_write and chunk:
+            buf = [hex(len(chunk))[2:], CRLF, chunk, CRLF]
+            self.conn.wfile.sendall(EMPTY.join(buf))
+        else:
+            self.conn.wfile.sendall(chunk)
+
+    def send_headers(self):
+        """Assert, process, and send the HTTP response message-headers.
+
+        You must set self.status, and self.outheaders before calling this.
+        """
+        hkeys = [key.lower() for key, value in self.outheaders]
+        status = int(self.status[:3])
+
+        if status == 413:
+            # Request Entity Too Large. Close conn to avoid garbage.
+            self.close_connection = True
+        elif "content-length" not in hkeys:
+            # "All 1xx (informational), 204 (no content),
+            # and 304 (not modified) responses MUST NOT
+            # include a message-body." So no point chunking.
+            if status < 200 or status in (204, 205, 304):
+                pass
+            else:
+                if (self.response_protocol == 'HTTP/1.1'
+                        and self.method != 'HEAD'):
+                    # Use the chunked transfer-coding
+                    self.chunked_write = True
+                    self.outheaders.append(("Transfer-Encoding", "chunked"))
+                else:
+                    # Closing the conn is the only way to determine len.
+                    self.close_connection = True
+
+        if "connection" not in hkeys:
+            if self.response_protocol == 'HTTP/1.1':
+                # Both server and client are HTTP/1.1 or better
+                if self.close_connection:
+                    self.outheaders.append(("Connection", "close"))
+            else:
+                # Server and/or client are HTTP/1.0
+                if not self.close_connection:
+                    self.outheaders.append(("Connection", "Keep-Alive"))
+
+        if (not self.close_connection) and (not self.chunked_read):
+            # Read any remaining request body data on the socket.
+            # "If an origin server receives a request that does not include an
+            # Expect request-header field with the "100-continue" expectation,
+            # the request includes a request body, and the server responds
+            # with a final status code before reading the entire request body
+            # from the transport connection, then the server SHOULD NOT close
+            # the transport connection until it has read the entire request,
+            # or until the client closes the connection. Otherwise, the client
+            # might not reliably receive the response message. However, this
+            # requirement is not be construed as preventing a server from
+            # defending itself against denial-of-service attacks, or from
+            # badly broken client implementations."
+            remaining = getattr(self.rfile, 'remaining', 0)
+            if remaining > 0:
+                self.rfile.read(remaining)
+
+        if "date" not in hkeys:
+            self.outheaders.append(("Date", rfc822.formatdate()))
+
+        if "server" not in hkeys:
+            self.outheaders.append(("Server", self.server.server_name))
+
+        buf = [self.server.protocol + SPACE + self.status + CRLF]
+        for k, v in self.outheaders:
+            buf.append(k + COLON + SPACE + v + CRLF)
+        buf.append(CRLF)
+        self.conn.wfile.sendall(EMPTY.join(buf))
+
+
+class NoSSLError(Exception):
+
+    """Exception raised when a client speaks HTTP to an HTTPS socket."""
+    pass
+
+
+class FatalSSLAlert(Exception):
+
+    """Exception raised when the SSL implementation signals a fatal alert."""
+    pass
+
+
+class CP_fileobject(socket._fileobject):
+
+    """Faux file object attached to a socket object."""
+
+    def __init__(self, *args, **kwargs):
+        self.bytes_read = 0
+        self.bytes_written = 0
+        socket._fileobject.__init__(self, *args, **kwargs)
+
+    def sendall(self, data):
+        """Sendall for non-blocking sockets."""
+        while data:
+            try:
+                bytes_sent = self.send(data)
+                data = data[bytes_sent:]
+            except socket.error, e:
+                if e.args[0] not in socket_errors_nonblocking:
+                    raise
+
+    def send(self, data):
+        bytes_sent = self._sock.send(data)
+        self.bytes_written += bytes_sent
+        return bytes_sent
+
+    def flush(self):
+        if self._wbuf:
+            buffer = "".join(self._wbuf)
+            self._wbuf = []
+            self.sendall(buffer)
+
+    def recv(self, size):
+        while True:
+            try:
+                data = self._sock.recv(size)
+                self.bytes_read += len(data)
+                return data
+            except socket.error, e:
+                if (e.args[0] not in socket_errors_nonblocking
+                        and e.args[0] not in socket_error_eintr):
+                    raise
+
+    if not _fileobject_uses_str_type:
+        def read(self, size=-1):
+            # Use max, disallow tiny reads in a loop as they are very
+            # inefficient.
+            # We never leave read() with any leftover data from a new recv()
+            # call in our internal buffer.
+            rbufsize = max(self._rbufsize, self.default_bufsize)
+            # Our use of StringIO rather than lists of string objects returned
+            # by recv() minimizes memory usage and fragmentation that occurs
+            # when rbufsize is large compared to the typical return value of
+            # recv().
+            buf = self._rbuf
+            buf.seek(0, 2)  # seek end
+            if size < 0:
+                # Read until EOF
+                # reset _rbuf.  we consume it via buf.
+                self._rbuf = StringIO.StringIO()
+                while True:
+                    data = self.recv(rbufsize)
+                    if not data:
+                        break
+                    buf.write(data)
+                return buf.getvalue()
+            else:
+                # Read until size bytes or EOF seen, whichever comes first
+                buf_len = buf.tell()
+                if buf_len >= size:
+                    # Already have size bytes in our buffer?  Extract and
+                    # return.
+                    buf.seek(0)
+                    rv = buf.read(size)
+                    self._rbuf = StringIO.StringIO()
+                    self._rbuf.write(buf.read())
+                    return rv
+
+                # reset _rbuf.  we consume it via buf.
+                self._rbuf = StringIO.StringIO()
+                while True:
+                    left = size - buf_len
+                    # recv() will malloc the amount of memory given as its
+                    # parameter even though it often returns much less data
+                    # than that.  The returned data string is short lived
+                    # as we copy it into a StringIO and free it.  This avoids
+                    # fragmentation issues on many platforms.
+                    data = self.recv(left)
+                    if not data:
+                        break
+                    n = len(data)
+                    if n == size and not buf_len:
+                        # Shortcut.  Avoid buffer data copies when:
+                        # - We have no data in our buffer.
+                        # AND
+                        # - Our call to recv returned exactly the
+                        #   number of bytes we were asked to read.
+                        return data
+                    if n == left:
+                        buf.write(data)
+                        del data  # explicit free
+                        break
+                    assert n <= left, "recv(%d) returned %d bytes" % (left, n)
+                    buf.write(data)
+                    buf_len += n
+                    del data  # explicit free
+                    #assert buf_len == buf.tell()
+                return buf.getvalue()
+
+        def readline(self, size=-1):
+            buf = self._rbuf
+            buf.seek(0, 2)  # seek end
+            if buf.tell() > 0:
+                # check if we already have it in our buffer
+                buf.seek(0)
+                bline = buf.readline(size)
+                if bline.endswith('\n') or len(bline) == size:
+                    self._rbuf = StringIO.StringIO()
+                    self._rbuf.write(buf.read())
+                    return bline
+                del bline
+            if size < 0:
+                # Read until \n or EOF, whichever comes first
+                if self._rbufsize <= 1:
+                    # Speed up unbuffered case
+                    buf.seek(0)
+                    buffers = [buf.read()]
+                    # reset _rbuf.  we consume it via buf.
+                    self._rbuf = StringIO.StringIO()
+                    data = None
+                    recv = self.recv
+                    while data != "\n":
+                        data = recv(1)
+                        if not data:
+                            break
+                        buffers.append(data)
+                    return "".join(buffers)
+
+                buf.seek(0, 2)  # seek end
+                # reset _rbuf.  we consume it via buf.
+                self._rbuf = StringIO.StringIO()
+                while True:
+                    data = self.recv(self._rbufsize)
+                    if not data:
+                        break
+                    nl = data.find('\n')
+                    if nl >= 0:
+                        nl += 1
+                        buf.write(data[:nl])
+                        self._rbuf.write(data[nl:])
+                        del data
+                        break
+                    buf.write(data)
+                return buf.getvalue()
+            else:
+                # Read until size bytes or \n or EOF seen, whichever comes
+                # first
+                buf.seek(0, 2)  # seek end
+                buf_len = buf.tell()
+                if buf_len >= size:
+                    buf.seek(0)
+                    rv = buf.read(size)
+                    self._rbuf = StringIO.StringIO()
+                    self._rbuf.write(buf.read())
+                    return rv
+                # reset _rbuf.  we consume it via buf.
+                self._rbuf = StringIO.StringIO()
+                while True:
+                    data = self.recv(self._rbufsize)
+                    if not data:
+                        break
+                    left = size - buf_len
+                    # did we just receive a newline?
+                    nl = data.find('\n', 0, left)
+                    if nl >= 0:
+                        nl += 1
+                        # save the excess data to _rbuf
+                        self._rbuf.write(data[nl:])
+                        if buf_len:
+                            buf.write(data[:nl])
+                            break
+                        else:
+                            # Shortcut.  Avoid data copy through buf when
+                            # returning a substring of our first recv().
+                            return data[:nl]
+                    n = len(data)
+                    if n == size and not buf_len:
+                        # Shortcut.  Avoid data copy through buf when
+                        # returning exactly all of our first recv().
+                        return data
+                    if n >= left:
+                        buf.write(data[:left])
+                        self._rbuf.write(data[left:])
+                        break
+                    buf.write(data)
+                    buf_len += n
+                    #assert buf_len == buf.tell()
+                return buf.getvalue()
+    else:
+        def read(self, size=-1):
+            if size < 0:
+                # Read until EOF
+                buffers = [self._rbuf]
+                self._rbuf = ""
+                if self._rbufsize <= 1:
+                    recv_size = self.default_bufsize
+                else:
+                    recv_size = self._rbufsize
+
+                while True:
+                    data = self.recv(recv_size)
+                    if not data:
+                        break
+                    buffers.append(data)
+                return "".join(buffers)
+            else:
+                # Read until size bytes or EOF seen, whichever comes first
+                data = self._rbuf
+                buf_len = len(data)
+                if buf_len >= size:
+                    self._rbuf = data[size:]
+                    return data[:size]
+                buffers = []
+                if data:
+                    buffers.append(data)
+                self._rbuf = ""
+                while True:
+                    left = size - buf_len
+                    recv_size = max(self._rbufsize, left)
+                    data = self.recv(recv_size)
+                    if not data:
+                        break
+                    buffers.append(data)
+                    n = len(data)
+                    if n >= left:
+                        self._rbuf = data[left:]
+                        buffers[-1] = data[:left]
+                        break
+                    buf_len += n
+                return "".join(buffers)
+
+        def readline(self, size=-1):
+            data = self._rbuf
+            if size < 0:
+                # Read until \n or EOF, whichever comes first
+                if self._rbufsize <= 1:
+                    # Speed up unbuffered case
+                    assert data == ""
+                    buffers = []
+                    while data != "\n":
+                        data = self.recv(1)
+                        if not data:
+                            break
+                        buffers.append(data)
+                    return "".join(buffers)
+                nl = data.find('\n')
+                if nl >= 0:
+                    nl += 1
+                    self._rbuf = data[nl:]
+                    return data[:nl]
+                buffers = []
+                if data:
+                    buffers.append(data)
+                self._rbuf = ""
+                while True:
+                    data = self.recv(self._rbufsize)
+                    if not data:
+                        break
+                    buffers.append(data)
+                    nl = data.find('\n')
+                    if nl >= 0:
+                        nl += 1
+                        self._rbuf = data[nl:]
+                        buffers[-1] = data[:nl]
+                        break
+                return "".join(buffers)
+            else:
+                # Read until size bytes or \n or EOF seen, whichever comes
+                # first
+                nl = data.find('\n', 0, size)
+                if nl >= 0:
+                    nl += 1
+                    self._rbuf = data[nl:]
+                    return data[:nl]
+                buf_len = len(data)
+                if buf_len >= size:
+                    self._rbuf = data[size:]
+                    return data[:size]
+                buffers = []
+                if data:
+                    buffers.append(data)
+                self._rbuf = ""
+                while True:
+                    data = self.recv(self._rbufsize)
+                    if not data:
+                        break
+                    buffers.append(data)
+                    left = size - buf_len
+                    nl = data.find('\n', 0, left)
+                    if nl >= 0:
+                        nl += 1
+                        self._rbuf = data[nl:]
+                        buffers[-1] = data[:nl]
+                        break
+                    n = len(data)
+                    if n >= left:
+                        self._rbuf = data[left:]
+                        buffers[-1] = data[:left]
+                        break
+                    buf_len += n
+                return "".join(buffers)
+
+
+class HTTPConnection(object):
+
+    """An HTTP connection (active socket).
+
+    server: the Server object which received this connection.
+    socket: the raw socket object (usually TCP) for this connection.
+    makefile: a fileobject class for reading from the socket.
+    """
+
+    remote_addr = None
+    remote_port = None
+    ssl_env = None
+    rbufsize = DEFAULT_BUFFER_SIZE
+    wbufsize = DEFAULT_BUFFER_SIZE
+    RequestHandlerClass = HTTPRequest
+
+    def __init__(self, server, sock, makefile=CP_fileobject):
+        self.server = server
+        self.socket = sock
+        self.rfile = makefile(sock, "rb", self.rbufsize)
+        self.wfile = makefile(sock, "wb", self.wbufsize)
+        self.requests_seen = 0
+
+    def communicate(self):
+        """Read each request and respond appropriately."""
+        request_seen = False
+        try:
+            while True:
+                # (re)set req to None so that if something goes wrong in
+                # the RequestHandlerClass constructor, the error doesn't
+                # get written to the previous request.
+                req = None
+                req = self.RequestHandlerClass(self.server, self)
+
+                # This order of operations should guarantee correct pipelining.
+                req.parse_request()
+                if self.server.stats['Enabled']:
+                    self.requests_seen += 1
+                if not req.ready:
+                    # Something went wrong in the parsing (and the server has
+                    # probably already made a simple_response). Return and
+                    # let the conn close.
+                    return
+
+                request_seen = True
+                req.respond()
+                if req.close_connection:
+                    return
+        except socket.error:
+            e = sys.exc_info()[1]
+            errnum = e.args[0]
+            # sadly SSL sockets return a different (longer) time out string
+            if (
+                errnum == 'timed out' or
+                errnum == 'The read operation timed out'
+            ):
+                # Don't error if we're between requests; only error
+                # if 1) no request has been started at all, or 2) we're
+                # in the middle of a request.
+                # See https://bitbucket.org/cherrypy/cherrypy/issue/853
+                if (not request_seen) or (req and req.started_request):
+                    # Don't bother writing the 408 if the response
+                    # has already started being written.
+                    if req and not req.sent_headers:
+                        try:
+                            req.simple_response("408 Request Timeout")
+                        except FatalSSLAlert:
+                            # Close the connection.
+                            return
+            elif errnum not in socket_errors_to_ignore:
+                self.server.error_log("socket.error %s" % repr(errnum),
+                                      level=logging.WARNING, traceback=True)
+                if req and not req.sent_headers:
+                    try:
+                        req.simple_response("500 Internal Server Error")
+                    except FatalSSLAlert:
+                        # Close the connection.
+                        return
+            return
+        except (KeyboardInterrupt, SystemExit):
+            raise
+        except FatalSSLAlert:
+            # Close the connection.
+            return
+        except NoSSLError:
+            if req and not req.sent_headers:
+                # Unwrap our wfile
+                self.wfile = CP_fileobject(
+                    self.socket._sock, "wb", self.wbufsize)
+                req.simple_response(
+                    "400 Bad Request",
+                    "The client sent a plain HTTP request, but "
+                    "this server only speaks HTTPS on this port.")
+                self.linger = True
+        except Exception:
+            e = sys.exc_info()[1]
+            self.server.error_log(repr(e), level=logging.ERROR, traceback=True)
+            if req and not req.sent_headers:
+                try:
+                    req.simple_response("500 Internal Server Error")
+                except FatalSSLAlert:
+                    # Close the connection.
+                    return
+
+    linger = False
+
+    def close(self):
+        """Close the socket underlying this connection."""
+        self.rfile.close()
+
+        if not self.linger:
+            # Python's socket module does NOT call close on the kernel
+            # socket when you call socket.close(). We do so manually here
+            # because we want this server to send a FIN TCP segment
+            # immediately. Note this must be called *before* calling
+            # socket.close(), because the latter drops its reference to
+            # the kernel socket.
+            if hasattr(self.socket, '_sock'):
+                self.socket._sock.close()
+            self.socket.close()
+        else:
+            # On the other hand, sometimes we want to hang around for a bit
+            # to make sure the client has a chance to read our entire
+            # response. Skipping the close() calls here delays the FIN
+            # packet until the socket object is garbage-collected later.
+            # Someday, perhaps, we'll do the full lingering_close that
+            # Apache does, but not today.
+            pass
+
+
+class TrueyZero(object):
+
+    """An object which equals and does math like the integer 0 but evals True.
+    """
+
+    def __add__(self, other):
+        return other
+
+    def __radd__(self, other):
+        return other
+trueyzero = TrueyZero()
+
+
+_SHUTDOWNREQUEST = None
+
+
+class WorkerThread(threading.Thread):
+
+    """Thread which continuously polls a Queue for Connection objects.
+
+    Due to the timing issues of polling a Queue, a WorkerThread does not
+    check its own 'ready' flag after it has started. To stop the thread,
+    it is necessary to stick a _SHUTDOWNREQUEST object onto the Queue
+    (one for each running WorkerThread).
+    """
+
+    conn = None
+    """The current connection pulled off the Queue, or None."""
+
+    server = None
+    """The HTTP Server which spawned this thread, and which owns the
+    Queue and is placing active connections into it."""
+
+    ready = False
+    """A simple flag for the calling server to know when this thread
+    has begun polling the Queue."""
+
+    def __init__(self, server):
+        self.ready = False
+        self.server = server
+
+        self.requests_seen = 0
+        self.bytes_read = 0
+        self.bytes_written = 0
+        self.start_time = None
+        self.work_time = 0
+        self.stats = {
+            'Requests': lambda s: self.requests_seen + (
+                (self.start_time is None) and
+                trueyzero or
+                self.conn.requests_seen
+            ),
+            'Bytes Read': lambda s: self.bytes_read + (
+                (self.start_time is None) and
+                trueyzero or
+                self.conn.rfile.bytes_read
+            ),
+            'Bytes Written': lambda s: self.bytes_written + (
+                (self.start_time is None) and
+                trueyzero or
+                self.conn.wfile.bytes_written
+            ),
+            'Work Time': lambda s: self.work_time + (
+                (self.start_time is None) and
+                trueyzero or
+                time.time() - self.start_time
+            ),
+            'Read Throughput': lambda s: s['Bytes Read'](s) / (
+                s['Work Time'](s) or 1e-6),
+            'Write Throughput': lambda s: s['Bytes Written'](s) / (
+                s['Work Time'](s) or 1e-6),
+        }
+        threading.Thread.__init__(self)
+
+    def run(self):
+        self.server.stats['Worker Threads'][self.getName()] = self.stats
+        try:
+            self.ready = True
+            while True:
+                conn = self.server.requests.get()
+                if conn is _SHUTDOWNREQUEST:
+                    return
+
+                self.conn = conn
+                if self.server.stats['Enabled']:
+                    self.start_time = time.time()
+                try:
+                    conn.communicate()
+                finally:
+                    conn.close()
+                    if self.server.stats['Enabled']:
+                        self.requests_seen += self.conn.requests_seen
+                        self.bytes_read += self.conn.rfile.bytes_read
+                        self.bytes_written += self.conn.wfile.bytes_written
+                        self.work_time += time.time() - self.start_time
+                        self.start_time = None
+                    self.conn = None
+        except (KeyboardInterrupt, SystemExit):
+            exc = sys.exc_info()[1]
+            self.server.interrupt = exc
+
+
+class ThreadPool(object):
+
+    """A Request Queue for an HTTPServer which pools threads.
+
+    ThreadPool objects must provide min, get(), put(obj), start()
+    and stop(timeout) attributes.
+    """
+
+    def __init__(self, server, min=10, max=-1,
+        accepted_queue_size=-1, accepted_queue_timeout=10):
+        self.server = server
+        self.min = min
+        self.max = max
+        self._threads = []
+        self._queue = queue.Queue(maxsize=accepted_queue_size)
+        self._queue_put_timeout = accepted_queue_timeout
+        self.get = self._queue.get
+
+    def start(self):
+        """Start the pool of threads."""
+        for i in range(self.min):
+            self._threads.append(WorkerThread(self.server))
+        for worker in self._threads:
+            worker.setName("CP Server " + worker.getName())
+            worker.start()
+        for worker in self._threads:
+            while not worker.ready:
+                time.sleep(.1)
+
+    def _get_idle(self):
+        """Number of worker threads which are idle. Read-only."""
+        return len([t for t in self._threads if t.conn is None])
+    idle = property(_get_idle, doc=_get_idle.__doc__)
+
+    def put(self, obj):
+        self._queue.put(obj, block=True, timeout=self._queue_put_timeout)
+        if obj is _SHUTDOWNREQUEST:
+            return
+
+    def grow(self, amount):
+        """Spawn new worker threads (not above self.max)."""
+        if self.max > 0:
+            budget = max(self.max - len(self._threads), 0)
+        else:
+            # self.max <= 0 indicates no maximum
+            budget = float('inf')
+
+        n_new = min(amount, budget)
+
+        workers = [self._spawn_worker() for i in range(n_new)]
+        while not self._all(operator.attrgetter('ready'), workers):
+            time.sleep(.1)
+        self._threads.extend(workers)
+
+    def _spawn_worker(self):
+        worker = WorkerThread(self.server)
+        worker.setName("CP Server " + worker.getName())
+        worker.start()
+        return worker
+
+    def _all(func, items):
+        results = [func(item) for item in items]
+        return reduce(operator.and_, results, True)
+    _all = staticmethod(_all)
+
+    def shrink(self, amount):
+        """Kill off worker threads (not below self.min)."""
+        # Grow/shrink the pool if necessary.
+        # Remove any dead threads from our list
+        for t in self._threads:
+            if not t.isAlive():
+                self._threads.remove(t)
+                amount -= 1
+
+        # calculate the number of threads above the minimum
+        n_extra = max(len(self._threads) - self.min, 0)
+
+        # don't remove more than amount
+        n_to_remove = min(amount, n_extra)
+
+        # put shutdown requests on the queue equal to the number of threads
+        # to remove. As each request is processed by a worker, that worker
+        # will terminate and be culled from the list.
+        for n in range(n_to_remove):
+            self._queue.put(_SHUTDOWNREQUEST)
+
+    def stop(self, timeout=5):
+        # Must shut down threads here so the code that calls
+        # this method can know when all threads are stopped.
+        for worker in self._threads:
+            self._queue.put(_SHUTDOWNREQUEST)
+
+        # Don't join currentThread (when stop is called inside a request).
+        current = threading.currentThread()
+        if timeout and timeout >= 0:
+            endtime = time.time() + timeout
+        while self._threads:
+            worker = self._threads.pop()
+            if worker is not current and worker.isAlive():
+                try:
+                    if timeout is None or timeout < 0:
+                        worker.join()
+                    else:
+                        remaining_time = endtime - time.time()
+                        if remaining_time > 0:
+                            worker.join(remaining_time)
+                        if worker.isAlive():
+                            # We exhausted the timeout.
+                            # Forcibly shut down the socket.
+                            c = worker.conn
+                            if c and not c.rfile.closed:
+                                try:
+                                    c.socket.shutdown(socket.SHUT_RD)
+                                except TypeError:
+                                    # pyOpenSSL sockets don't take an arg
+                                    c.socket.shutdown()
+                            worker.join()
+                except (AssertionError,
+                        # Ignore repeated Ctrl-C.
+                        # See
+                        # https://bitbucket.org/cherrypy/cherrypy/issue/691.
+                        KeyboardInterrupt):
+                    pass
+
+    def _get_qsize(self):
+        return self._queue.qsize()
+    qsize = property(_get_qsize)
+
+
+try:
+    import fcntl
+except ImportError:
+    try:
+        from ctypes import windll, WinError
+        import ctypes.wintypes
+        _SetHandleInformation = windll.kernel32.SetHandleInformation
+        _SetHandleInformation.argtypes = [
+            ctypes.wintypes.HANDLE,
+            ctypes.wintypes.DWORD,
+            ctypes.wintypes.DWORD,
+        ]
+        _SetHandleInformation.restype = ctypes.wintypes.BOOL
+    except ImportError:
+        def prevent_socket_inheritance(sock):
+            """Dummy function, since neither fcntl nor ctypes are available."""
+            pass
+    else:
+        def prevent_socket_inheritance(sock):
+            """Mark the given socket fd as non-inheritable (Windows)."""
+            if not _SetHandleInformation(sock.fileno(), 1, 0):
+                raise WinError()
+else:
+    def prevent_socket_inheritance(sock):
+        """Mark the given socket fd as non-inheritable (POSIX)."""
+        fd = sock.fileno()
+        old_flags = fcntl.fcntl(fd, fcntl.F_GETFD)
+        fcntl.fcntl(fd, fcntl.F_SETFD, old_flags | fcntl.FD_CLOEXEC)
+
+
+class SSLAdapter(object):
+
+    """Base class for SSL driver library adapters.
+
+    Required methods:
+
+        * ``wrap(sock) -> (wrapped socket, ssl environ dict)``
+        * ``makefile(sock, mode='r', bufsize=DEFAULT_BUFFER_SIZE) ->
+          socket file object``
+    """
+
+    def __init__(self, certificate, private_key, certificate_chain=None):
+        self.certificate = certificate
+        self.private_key = private_key
+        self.certificate_chain = certificate_chain
+
+    def wrap(self, sock):
+        raise NotImplemented
+
+    def makefile(self, sock, mode='r', bufsize=DEFAULT_BUFFER_SIZE):
+        raise NotImplemented
+
+
+class HTTPServer(object):
+
+    """An HTTP server."""
+
+    _bind_addr = "127.0.0.1"
+    _interrupt = None
+
+    gateway = None
+    """A Gateway instance."""
+
+    minthreads = None
+    """The minimum number of worker threads to create (default 10)."""
+
+    maxthreads = None
+    """The maximum number of worker threads to create (default -1 = no limit).
+    """
+
+    server_name = None
+    """The name of the server; defaults to socket.gethostname()."""
+
+    protocol = "HTTP/1.1"
+    """The version string to write in the Status-Line of all HTTP responses.
+
+    For example, "HTTP/1.1" is the default. This also limits the supported
+    features used in the response."""
+
+    request_queue_size = 5
+    """The 'backlog' arg to socket.listen(); max queued connections
+    (default 5).
+    """
+
+    shutdown_timeout = 5
+    """The total time, in seconds, to wait for worker threads to cleanly exit.
+    """
+
+    timeout = 10
+    """The timeout in seconds for accepted connections (default 10)."""
+
+    version = "CherryPy/3.8.0"
+    """A version string for the HTTPServer."""
+
+    software = None
+    """The value to set for the SERVER_SOFTWARE entry in the WSGI environ.
+
+    If None, this defaults to ``'%s Server' % self.version``."""
+
+    ready = False
+    """An internal flag which marks whether the socket is accepting connections
+    """
+
+    max_request_header_size = 0
+    """The maximum size, in bytes, for request headers, or 0 for no limit."""
+
+    max_request_body_size = 0
+    """The maximum size, in bytes, for request bodies, or 0 for no limit."""
+
+    nodelay = True
+    """If True (the default since 3.1), sets the TCP_NODELAY socket option."""
+
+    ConnectionClass = HTTPConnection
+    """The class to use for handling HTTP connections."""
+
+    ssl_adapter = None
+    """An instance of SSLAdapter (or a subclass).
+
+    You must have the corresponding SSL driver library installed."""
+
+    def __init__(self, bind_addr, gateway, minthreads=10, maxthreads=-1,
+                 server_name=None):
+        self.bind_addr = bind_addr
+        self.gateway = gateway
+
+        self.requests = ThreadPool(self, min=minthreads or 1, max=maxthreads)
+
+        if not server_name:
+            server_name = socket.gethostname()
+        self.server_name = server_name
+        self.clear_stats()
+
+    def clear_stats(self):
+        self._start_time = None
+        self._run_time = 0
+        self.stats = {
+            'Enabled': False,
+            'Bind Address': lambda s: repr(self.bind_addr),
+            'Run time': lambda s: (not s['Enabled']) and -1 or self.runtime(),
+            'Accepts': 0,
+            'Accepts/sec': lambda s: s['Accepts'] / self.runtime(),
+            'Queue': lambda s: getattr(self.requests, "qsize", None),
+            'Threads': lambda s: len(getattr(self.requests, "_threads", [])),
+            'Threads Idle': lambda s: getattr(self.requests, "idle", None),
+            'Socket Errors': 0,
+            'Requests': lambda s: (not s['Enabled']) and -1 or sum(
+                [w['Requests'](w) for w in s['Worker Threads'].values()], 0),
+            'Bytes Read': lambda s: (not s['Enabled']) and -1 or sum(
+                [w['Bytes Read'](w) for w in s['Worker Threads'].values()], 0),
+            'Bytes Written': lambda s: (not s['Enabled']) and -1 or sum(
+                [w['Bytes Written'](w) for w in s['Worker Threads'].values()],
+                0),
+            'Work Time': lambda s: (not s['Enabled']) and -1 or sum(
+                [w['Work Time'](w) for w in s['Worker Threads'].values()], 0),
+            'Read Throughput': lambda s: (not s['Enabled']) and -1 or sum(
+                [w['Bytes Read'](w) / (w['Work Time'](w) or 1e-6)
+                 for w in s['Worker Threads'].values()], 0),
+            'Write Throughput': lambda s: (not s['Enabled']) and -1 or sum(
+                [w['Bytes Written'](w) / (w['Work Time'](w) or 1e-6)
+                 for w in s['Worker Threads'].values()], 0),
+            'Worker Threads': {},
+        }
+        logging.statistics["CherryPy HTTPServer %d" % id(self)] = self.stats
+
+    def runtime(self):
+        if self._start_time is None:
+            return self._run_time
+        else:
+            return self._run_time + (time.time() - self._start_time)
+
+    def __str__(self):
+        return "%s.%s(%r)" % (self.__module__, self.__class__.__name__,
+                              self.bind_addr)
+
+    def _get_bind_addr(self):
+        return self._bind_addr
+
+    def _set_bind_addr(self, value):
+        if isinstance(value, tuple) and value[0] in ('', None):
+            # Despite the socket module docs, using '' does not
+            # allow AI_PASSIVE to work. Passing None instead
+            # returns '0.0.0.0' like we want. In other words:
+            #     host    AI_PASSIVE     result
+            #      ''         Y         192.168.x.y
+            #      ''         N         192.168.x.y
+            #     None        Y         0.0.0.0
+            #     None        N         127.0.0.1
+            # But since you can get the same effect with an explicit
+            # '0.0.0.0', we deny both the empty string and None as values.
+            raise ValueError("Host values of '' or None are not allowed. "
+                             "Use '0.0.0.0' (IPv4) or '::' (IPv6) instead "
+                             "to listen on all active interfaces.")
+        self._bind_addr = value
+    bind_addr = property(
+        _get_bind_addr,
+        _set_bind_addr,
+        doc="""The interface on which to listen for connections.
+
+        For TCP sockets, a (host, port) tuple. Host values may be any IPv4
+        or IPv6 address, or any valid hostname. The string 'localhost' is a
+        synonym for '127.0.0.1' (or '::1', if your hosts file prefers IPv6).
+        The string '0.0.0.0' is a special IPv4 entry meaning "any active
+        interface" (INADDR_ANY), and '::' is the similar IN6ADDR_ANY for
+        IPv6. The empty string or None are not allowed.
+
+        For UNIX sockets, supply the filename as a string.""")
+
+    def start(self):
+        """Run the server forever."""
+        # We don't have to trap KeyboardInterrupt or SystemExit here,
+        # because cherrpy.server already does so, calling self.stop() for us.
+        # If you're using this server with another framework, you should
+        # trap those exceptions in whatever code block calls start().
+        self._interrupt = None
+
+        if self.software is None:
+            self.software = "%s Server" % self.version
+
+        # SSL backward compatibility
+        if (self.ssl_adapter is None and
+                getattr(self, 'ssl_certificate', None) and
+                getattr(self, 'ssl_private_key', None)):
+            warnings.warn(
+                "SSL attributes are deprecated in CherryPy 3.2, and will "
+                "be removed in CherryPy 3.3. Use an ssl_adapter attribute "
+                "instead.",
+                DeprecationWarning
+            )
+            try:
+                from cherrypy.wsgiserver.ssl_pyopenssl import pyOpenSSLAdapter
+            except ImportError:
+                pass
+            else:
+                self.ssl_adapter = pyOpenSSLAdapter(
+                    self.ssl_certificate, self.ssl_private_key,
+                    getattr(self, 'ssl_certificate_chain', None))
+
+        # Select the appropriate socket
+        if isinstance(self.bind_addr, basestring):
+            # AF_UNIX socket
+
+            # So we can reuse the socket...
+            try:
+                os.unlink(self.bind_addr)
+            except:
+                pass
+
+            # So everyone can access the socket...
+            try:
+                os.chmod(self.bind_addr, 511)  # 0777
+            except:
+                pass
+
+            info = [
+                (socket.AF_UNIX, socket.SOCK_STREAM, 0, "", self.bind_addr)]
+        else:
+            # AF_INET or AF_INET6 socket
+            # Get the correct address family for our host (allows IPv6
+            # addresses)
+            host, port = self.bind_addr
+            try:
+                info = socket.getaddrinfo(
+                    host, port, socket.AF_UNSPEC,
+                    socket.SOCK_STREAM, 0, socket.AI_PASSIVE)
+            except socket.gaierror:
+                if ':' in self.bind_addr[0]:
+                    info = [(socket.AF_INET6, socket.SOCK_STREAM,
+                             0, "", self.bind_addr + (0, 0))]
+                else:
+                    info = [(socket.AF_INET, socket.SOCK_STREAM,
+                             0, "", self.bind_addr)]
+
+        self.socket = None
+        msg = "No socket could be created"
+        for res in info:
+            af, socktype, proto, canonname, sa = res
+            try:
+                self.bind(af, socktype, proto)
+            except socket.error, serr:
+                msg = "%s -- (%s: %s)" % (msg, sa, serr)
+                if self.socket:
+                    self.socket.close()
+                self.socket = None
+                continue
+            break
+        if not self.socket:
+            raise socket.error(msg)
+
+        # Timeout so KeyboardInterrupt can be caught on Win32
+        self.socket.settimeout(1)
+        self.socket.listen(self.request_queue_size)
+
+        # Create worker threads
+        self.requests.start()
+
+        self.ready = True
+        self._start_time = time.time()
+        while self.ready:
+            try:
+                self.tick()
+            except (KeyboardInterrupt, SystemExit):
+                raise
+            except:
+                self.error_log("Error in HTTPServer.tick", level=logging.ERROR,
+                               traceback=True)
+
+            if self.interrupt:
+                while self.interrupt is True:
+                    # Wait for self.stop() to complete. See _set_interrupt.
+                    time.sleep(0.1)
+                if self.interrupt:
+                    raise self.interrupt
+
+    def error_log(self, msg="", level=20, traceback=False):
+        # Override this in subclasses as desired
+        sys.stderr.write(msg + '\n')
+        sys.stderr.flush()
+        if traceback:
+            tblines = format_exc()
+            sys.stderr.write(tblines)
+            sys.stderr.flush()
+
+    def bind(self, family, type, proto=0):
+        """Create (or recreate) the actual socket object."""
+        self.socket = socket.socket(family, type, proto)
+        prevent_socket_inheritance(self.socket)
+        self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        if self.nodelay and not isinstance(self.bind_addr, str):
+            self.socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
+
+        if self.ssl_adapter is not None:
+            self.socket = self.ssl_adapter.bind(self.socket)
+
+        # If listening on the IPV6 any address ('::' = IN6ADDR_ANY),
+        # activate dual-stack. See
+        # https://bitbucket.org/cherrypy/cherrypy/issue/871.
+        if (hasattr(socket, 'AF_INET6') and family == socket.AF_INET6
+                and self.bind_addr[0] in ('::', '::0', '::0.0.0.0')):
+            try:
+                self.socket.setsockopt(
+                    socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 0)
+            except (AttributeError, socket.error):
+                # Apparently, the socket option is not available in
+                # this machine's TCP stack
+                pass
+
+        self.socket.bind(self.bind_addr)
+
+    def tick(self):
+        """Accept a new connection and put it on the Queue."""
+        try:
+            s, addr = self.socket.accept()
+            if self.stats['Enabled']:
+                self.stats['Accepts'] += 1
+            if not self.ready:
+                return
+
+            prevent_socket_inheritance(s)
+            if hasattr(s, 'settimeout'):
+                s.settimeout(self.timeout)
+
+            makefile = CP_fileobject
+            ssl_env = {}
+            # if ssl cert and key are set, we try to be a secure HTTP server
+            if self.ssl_adapter is not None:
+                try:
+                    s, ssl_env = self.ssl_adapter.wrap(s)
+                except NoSSLError:
+                    msg = ("The client sent a plain HTTP request, but "
+                           "this server only speaks HTTPS on this port.")
+                    buf = ["%s 400 Bad Request\r\n" % self.protocol,
+                           "Content-Length: %s\r\n" % len(msg),
+                           "Content-Type: text/plain\r\n\r\n",
+                           msg]
+
+                    wfile = makefile(s._sock, "wb", DEFAULT_BUFFER_SIZE)
+                    try:
+                        wfile.sendall("".join(buf))
+                    except socket.error:
+                        x = sys.exc_info()[1]
+                        if x.args[0] not in socket_errors_to_ignore:
+                            raise
+                    return
+                if not s:
+                    return
+                makefile = self.ssl_adapter.makefile
+                # Re-apply our timeout since we may have a new socket object
+                if hasattr(s, 'settimeout'):
+                    s.settimeout(self.timeout)
+
+            conn = self.ConnectionClass(self, s, makefile)
+
+            if not isinstance(self.bind_addr, basestring):
+                # optional values
+                # Until we do DNS lookups, omit REMOTE_HOST
+                if addr is None:  # sometimes this can happen
+                    # figure out if AF_INET or AF_INET6.
+                    if len(s.getsockname()) == 2:
+                        # AF_INET
+                        addr = ('0.0.0.0', 0)
+                    else:
+                        # AF_INET6
+                        addr = ('::', 0)
+                conn.remote_addr = addr[0]
+                conn.remote_port = addr[1]
+
+            conn.ssl_env = ssl_env
+
+            try:
+                self.requests.put(conn)
+            except queue.Full:
+                # Just drop the conn. TODO: write 503 back?
+                conn.close()
+                return
+        except socket.timeout:
+            # The only reason for the timeout in start() is so we can
+            # notice keyboard interrupts on Win32, which don't interrupt
+            # accept() by default
+            return
+        except socket.error:
+            x = sys.exc_info()[1]
+            if self.stats['Enabled']:
+                self.stats['Socket Errors'] += 1
+            if x.args[0] in socket_error_eintr:
+                # I *think* this is right. EINTR should occur when a signal
+                # is received during the accept() call; all docs say retry
+                # the call, and I *think* I'm reading it right that Python
+                # will then go ahead and poll for and handle the signal
+                # elsewhere. See
+                # https://bitbucket.org/cherrypy/cherrypy/issue/707.
+                return
+            if x.args[0] in socket_errors_nonblocking:
+                # Just try again. See
+                # https://bitbucket.org/cherrypy/cherrypy/issue/479.
+                return
+            if x.args[0] in socket_errors_to_ignore:
+                # Our socket was closed.
+                # See https://bitbucket.org/cherrypy/cherrypy/issue/686.
+                return
+            raise
+
+    def _get_interrupt(self):
+        return self._interrupt
+
+    def _set_interrupt(self, interrupt):
+        self._interrupt = True
+        self.stop()
+        self._interrupt = interrupt
+    interrupt = property(_get_interrupt, _set_interrupt,
+                         doc="Set this to an Exception instance to "
+                             "interrupt the server.")
+
+    def stop(self):
+        """Gracefully shutdown a server that is serving forever."""
+        self.ready = False
+        if self._start_time is not None:
+            self._run_time += (time.time() - self._start_time)
+        self._start_time = None
+
+        sock = getattr(self, "socket", None)
+        if sock:
+            if not isinstance(self.bind_addr, basestring):
+                # Touch our own socket to make accept() return immediately.
+                try:
+                    host, port = sock.getsockname()[:2]
+                except socket.error:
+                    x = sys.exc_info()[1]
+                    if x.args[0] not in socket_errors_to_ignore:
+                        # Changed to use error code and not message
+                        # See
+                        # https://bitbucket.org/cherrypy/cherrypy/issue/860.
+                        raise
+                else:
+                    # Note that we're explicitly NOT using AI_PASSIVE,
+                    # here, because we want an actual IP to touch.
+                    # localhost won't work if we've bound to a public IP,
+                    # but it will if we bound to '0.0.0.0' (INADDR_ANY).
+                    for res in socket.getaddrinfo(host, port, socket.AF_UNSPEC,
+                                                  socket.SOCK_STREAM):
+                        af, socktype, proto, canonname, sa = res
+                        s = None
+                        try:
+                            s = socket.socket(af, socktype, proto)
+                            # See
+                            # http://groups.google.com/group/cherrypy-users/
+                            #    browse_frm/thread/bbfe5eb39c904fe0
+                            s.settimeout(1.0)
+                            s.connect((host, port))
+                            s.close()
+                        except socket.error:
+                            if s:
+                                s.close()
+            if hasattr(sock, "close"):
+                sock.close()
+            self.socket = None
+
+        self.requests.stop(self.shutdown_timeout)
+
+
+class Gateway(object):
+
+    """A base class to interface HTTPServer with other systems, such as WSGI.
+    """
+
+    def __init__(self, req):
+        self.req = req
+
+    def respond(self):
+        """Process the current request. Must be overridden in a subclass."""
+        raise NotImplemented
+
+
+# These may either be wsgiserver.SSLAdapter subclasses or the string names
+# of such classes (in which case they will be lazily loaded).
+ssl_adapters = {
+    'builtin': 'cherrypy.wsgiserver.ssl_builtin.BuiltinSSLAdapter',
+    'pyopenssl': 'cherrypy.wsgiserver.ssl_pyopenssl.pyOpenSSLAdapter',
+}
+
+
+def get_ssl_adapter_class(name='pyopenssl'):
+    """Return an SSL adapter class for the given name."""
+    adapter = ssl_adapters[name.lower()]
+    if isinstance(adapter, basestring):
+        last_dot = adapter.rfind(".")
+        attr_name = adapter[last_dot + 1:]
+        mod_path = adapter[:last_dot]
+
+        try:
+            mod = sys.modules[mod_path]
+            if mod is None:
+                raise KeyError()
+        except KeyError:
+            # The last [''] is important.
+            mod = __import__(mod_path, globals(), locals(), [''])
+
+        # Let an AttributeError propagate outward.
+        try:
+            adapter = getattr(mod, attr_name)
+        except AttributeError:
+            raise AttributeError("'%s' object has no attribute '%s'"
+                                 % (mod_path, attr_name))
+
+    return adapter
+
+# ------------------------------- WSGI Stuff -------------------------------- #
+
+
+class CherryPyWSGIServer(HTTPServer):
+
+    """A subclass of HTTPServer which calls a WSGI application."""
+
+    wsgi_version = (1, 0)
+    """The version of WSGI to produce."""
+
+    def __init__(self, bind_addr, wsgi_app, numthreads=10, server_name=None,
+                 max=-1, request_queue_size=5, timeout=10, shutdown_timeout=5,
+                 accepted_queue_size=-1, accepted_queue_timeout=10):
+        self.requests = ThreadPool(self, min=numthreads or 1, max=max,
+            accepted_queue_size=accepted_queue_size,
+            accepted_queue_timeout=accepted_queue_timeout)
+        self.wsgi_app = wsgi_app
+        self.gateway = wsgi_gateways[self.wsgi_version]
+
+        self.bind_addr = bind_addr
+        if not server_name:
+            server_name = socket.gethostname()
+        self.server_name = server_name
+        self.request_queue_size = request_queue_size
+
+        self.timeout = timeout
+        self.shutdown_timeout = shutdown_timeout
+        self.clear_stats()
+
+    def _get_numthreads(self):
+        return self.requests.min
+
+    def _set_numthreads(self, value):
+        self.requests.min = value
+    numthreads = property(_get_numthreads, _set_numthreads)
+
+
+class WSGIGateway(Gateway):
+
+    """A base class to interface HTTPServer with WSGI."""
+
+    def __init__(self, req):
+        self.req = req
+        self.started_response = False
+        self.env = self.get_environ()
+        self.remaining_bytes_out = None
+
+    def get_environ(self):
+        """Return a new environ dict targeting the given wsgi.version"""
+        raise NotImplemented
+
+    def respond(self):
+        """Process the current request."""
+        response = self.req.server.wsgi_app(self.env, self.start_response)
+        try:
+            for chunk in response:
+                # "The start_response callable must not actually transmit
+                # the response headers. Instead, it must store them for the
+                # server or gateway to transmit only after the first
+                # iteration of the application return value that yields
+                # a NON-EMPTY string, or upon the application's first
+                # invocation of the write() callable." (PEP 333)
+                if chunk:
+                    if isinstance(chunk, unicodestr):
+                        chunk = chunk.encode('ISO-8859-1')
+                    self.write(chunk)
+        finally:
+            if hasattr(response, "close"):
+                response.close()
+
+    def start_response(self, status, headers, exc_info=None):
+        """WSGI callable to begin the HTTP response."""
+        # "The application may call start_response more than once,
+        # if and only if the exc_info argument is provided."
+        if self.started_response and not exc_info:
+            raise AssertionError("WSGI start_response called a second "
+                                 "time with no exc_info.")
+        self.started_response = True
+
+        # "if exc_info is provided, and the HTTP headers have already been
+        # sent, start_response must raise an error, and should raise the
+        # exc_info tuple."
+        if self.req.sent_headers:
+            try:
+                raise exc_info[0], exc_info[1], exc_info[2]
+            finally:
+                exc_info = None
+
+        self.req.status = status
+        for k, v in headers:
+            if not isinstance(k, str):
+                raise TypeError(
+                    "WSGI response header key %r is not of type str." % k)
+            if not isinstance(v, str):
+                raise TypeError(
+                    "WSGI response header value %r is not of type str." % v)
+            if k.lower() == 'content-length':
+                self.remaining_bytes_out = int(v)
+        self.req.outheaders.extend(headers)
+
+        return self.write
+
+    def write(self, chunk):
+        """WSGI callable to write unbuffered data to the client.
+
+        This method is also used internally by start_response (to write
+        data from the iterable returned by the WSGI application).
+        """
+        if not self.started_response:
+            raise AssertionError("WSGI write called before start_response.")
+
+        chunklen = len(chunk)
+        rbo = self.remaining_bytes_out
+        if rbo is not None and chunklen > rbo:
+            if not self.req.sent_headers:
+                # Whew. We can send a 500 to the client.
+                self.req.simple_response(
+                    "500 Internal Server Error",
+                    "The requested resource returned more bytes than the "
+                    "declared Content-Length.")
+            else:
+                # Dang. We have probably already sent data. Truncate the chunk
+                # to fit (so the client doesn't hang) and raise an error later.
+                chunk = chunk[:rbo]
+
+        if not self.req.sent_headers:
+            self.req.sent_headers = True
+            self.req.send_headers()
+
+        self.req.write(chunk)
+
+        if rbo is not None:
+            rbo -= chunklen
+            if rbo < 0:
+                raise ValueError(
+                    "Response body exceeds the declared Content-Length.")
+
+
+class WSGIGateway_10(WSGIGateway):
+
+    """A Gateway class to interface HTTPServer with WSGI 1.0.x."""
+
+    def get_environ(self):
+        """Return a new environ dict targeting the given wsgi.version"""
+        req = self.req
+        env = {
+            # set a non-standard environ entry so the WSGI app can know what
+            # the *real* server protocol is (and what features to support).
+            # See http://www.faqs.org/rfcs/rfc2145.html.
+            'ACTUAL_SERVER_PROTOCOL': req.server.protocol,
+            'PATH_INFO': req.path,
+            'QUERY_STRING': req.qs,
+            'REMOTE_ADDR': req.conn.remote_addr or '',
+            'REMOTE_PORT': str(req.conn.remote_port or ''),
+            'REQUEST_METHOD': req.method,
+            'REQUEST_URI': req.uri,
+            'SCRIPT_NAME': '',
+            'SERVER_NAME': req.server.server_name,
+            # Bah. "SERVER_PROTOCOL" is actually the REQUEST protocol.
+            'SERVER_PROTOCOL': req.request_protocol,
+            'SERVER_SOFTWARE': req.server.software,
+            'wsgi.errors': sys.stderr,
+            'wsgi.input': req.rfile,
+            'wsgi.multiprocess': False,
+            'wsgi.multithread': True,
+            'wsgi.run_once': False,
+            'wsgi.url_scheme': req.scheme,
+            'wsgi.version': (1, 0),
+        }
+
+        if isinstance(req.server.bind_addr, basestring):
+            # AF_UNIX. This isn't really allowed by WSGI, which doesn't
+            # address unix domain sockets. But it's better than nothing.
+            env["SERVER_PORT"] = ""
+        else:
+            env["SERVER_PORT"] = str(req.server.bind_addr[1])
+
+        # Request headers
+        for k, v in req.inheaders.iteritems():
+            env["HTTP_" + k.upper().replace("-", "_")] = v
+
+        # CONTENT_TYPE/CONTENT_LENGTH
+        ct = env.pop("HTTP_CONTENT_TYPE", None)
+        if ct is not None:
+            env["CONTENT_TYPE"] = ct
+        cl = env.pop("HTTP_CONTENT_LENGTH", None)
+        if cl is not None:
+            env["CONTENT_LENGTH"] = cl
+
+        if req.conn.ssl_env:
+            env.update(req.conn.ssl_env)
+
+        return env
+
+
+class WSGIGateway_u0(WSGIGateway_10):
+
+    """A Gateway class to interface HTTPServer with WSGI u.0.
+
+    WSGI u.0 is an experimental protocol, which uses unicode for keys and
+    values in both Python 2 and Python 3.
+    """
+
+    def get_environ(self):
+        """Return a new environ dict targeting the given wsgi.version"""
+        req = self.req
+        env_10 = WSGIGateway_10.get_environ(self)
+        env = dict([(k.decode('ISO-8859-1'), v)
+                   for k, v in env_10.iteritems()])
+        env[u'wsgi.version'] = ('u', 0)
+
+        # Request-URI
+        env.setdefault(u'wsgi.url_encoding', u'utf-8')
+        try:
+            for key in [u"PATH_INFO", u"SCRIPT_NAME", u"QUERY_STRING"]:
+                env[key] = env_10[str(key)].decode(env[u'wsgi.url_encoding'])
+        except UnicodeDecodeError:
+            # Fall back to latin 1 so apps can transcode if needed.
+            env[u'wsgi.url_encoding'] = u'ISO-8859-1'
+            for key in [u"PATH_INFO", u"SCRIPT_NAME", u"QUERY_STRING"]:
+                env[key] = env_10[str(key)].decode(env[u'wsgi.url_encoding'])
+
+        for k, v in sorted(env.items()):
+            if isinstance(v, str) and k not in ('REQUEST_URI', 'wsgi.input'):
+                env[k] = v.decode('ISO-8859-1')
+
+        return env
+
+wsgi_gateways = {
+    (1, 0): WSGIGateway_10,
+    ('u', 0): WSGIGateway_u0,
+}
+
+
+class WSGIPathInfoDispatcher(object):
+
+    """A WSGI dispatcher for dispatch based on the PATH_INFO.
+
+    apps: a dict or list of (path_prefix, app) pairs.
+    """
+
+    def __init__(self, apps):
+        try:
+            apps = list(apps.items())
+        except AttributeError:
+            pass
+
+        # Sort the apps by len(path), descending
+        apps.sort(cmp=lambda x, y: cmp(len(x[0]), len(y[0])))
+        apps.reverse()
+
+        # The path_prefix strings must start, but not end, with a slash.
+        # Use "" instead of "/".
+        self.apps = [(p.rstrip("/"), a) for p, a in apps]
+
+    def __call__(self, environ, start_response):
+        path = environ["PATH_INFO"] or "/"
+        for p, app in self.apps:
+            # The apps list should be sorted by length, descending.
+            if path.startswith(p + "/") or path == p:
+                environ = environ.copy()
+                environ["SCRIPT_NAME"] = environ["SCRIPT_NAME"] + p
+                environ["PATH_INFO"] = path[len(p):]
+                return app(environ, start_response)
+
+        start_response('404 Not Found', [('Content-Type', 'text/plain'),
+                                         ('Content-Length', '0')])
+        return ['']
diff --git a/lib/cherrypy_cors/__init__.py b/lib/cherrypy_cors/__init__.py
deleted file mode 100644
index 54003451..00000000
--- a/lib/cherrypy_cors/__init__.py
+++ /dev/null
@@ -1,255 +0,0 @@
-import re
-
-import cherrypy
-from cherrypy.lib import set_vary_header
-import httpagentparser
-
-
-CORS_ALLOW_METHODS = 'Access-Control-Allow-Methods'
-CORS_ALLOW_ORIGIN = 'Access-Control-Allow-Origin'
-CORS_ALLOW_CREDENTIALS = 'Access-Control-Allow-Credentials'
-CORS_EXPOSE_HEADERS = 'Access-Control-Expose-Headers'
-CORS_REQUEST_METHOD = 'Access-Control-Request-Method'
-CORS_REQUEST_HEADERS = 'Access-Control-Request-Headers'
-CORS_MAX_AGE = 'Access-Control-Max-Age'
-CORS_ALLOW_HEADERS = 'Access-Control-Allow-Headers'
-PUBLIC_ORIGIN = '*'
-
-
-def expose(allow_credentials=False, expose_headers=None, origins=None):
-    """Adds CORS support to the resource.
-
-    If the resource is allowed to be exposed, the value of the
-    `Access-Control-Allow-Origin`_ header in the response will echo
-    the `Origin`_ request header, and `Origin` will be
-    appended to the `Vary`_ response header.
-
-    :param allow_credentials: Use credentials to make cookies work
-                              (see `Access-Control-Allow-Credentials`_).
-    :type allow_credentials: bool
-    :param expose_headers: List of headers clients will be able to access
-                           (see `Access-Control-Expose-Headers`_).
-    :type expose_headers: list or None
-    :param origins: List of allowed origins clients must reference.
-    :type origins: list or None
-
-    :returns: Whether the resource is being exposed.
-    :rtype: bool
-
-    - Configuration example:
-
-        .. code-block:: python
-
-            config = {
-                '/static': {
-                    'tools.staticdir.on': True,
-                    'cors.expose.on': True,
-                }
-            }
-    - Decorator example:
-
-        .. code-block:: python
-
-            @cherrypy_cors.tools.expose()
-            def DELETE(self):
-                self._delete()
-
-    """
-    if _get_cors().expose(allow_credentials, expose_headers, origins):
-        _safe_caching_headers()
-        return True
-    return False
-
-
-def expose_public(expose_headers=None):
-    """Adds CORS support to the resource from any origin.
-
-    If the resource is allowed to be exposed, the value of the
-    `Access-Control-Allow-Origin`_ header in the response will be `*`.
-
-    :param expose_headers: List of headers clients will be able to access
-                           (see `Access-Control-Expose-Headers`_).
-    :type expose_headers: list or None
-
-    :rtype: None
-    """
-    _get_cors().expose_public(expose_headers)
-
-
-def preflight(
-    allowed_methods,
-    allowed_headers=None,
-    allow_credentials=False,
-    max_age=None,
-    origins=None,
-):
-    """Adds CORS `preflight`_ support to a `HTTP OPTIONS` request.
-
-    :param allowed_methods: List of supported `HTTP` methods
-                            (see `Access-Control-Allow-Methods`_).
-    :type allowed_methods: list or None
-    :param allowed_headers: List of supported `HTTP` headers
-                            (see `Access-Control-Allow-Headers`_).
-    :type allowed_headers: list or None
-    :param allow_credentials: Use credentials to make cookies work
-                              (see `Access-Control-Allow-Credentials`_).
-    :type allow_credentials: bool
-    :param max_age: Seconds to cache the preflight request
-                    (see `Access-Control-Max-Age`_).
-    :type max_age: int
-    :param origins: List of allowed origins clients must reference.
-    :type origins: list or None
-
-    :returns: Whether the preflight is allowed.
-    :rtype: bool
-
-    - Used as a decorator with the `Method Dispatcher`_
-
-        .. code-block:: python
-
-                @cherrypy_cors.tools.preflight(
-                    allowed_methods=["GET", "DELETE", "PUT"])
-                def OPTIONS(self):
-                    pass
-
-    - Function call with the `Object Dispatcher`_
-
-        .. code-block:: python
-
-                @cherrypy.expose
-                @cherrypy.tools.allow(
-                    methods=["GET", "DELETE", "PUT", "OPTIONS"])
-                def thing(self):
-                    if cherrypy.request.method == "OPTIONS":
-                        cherrypy_cors.preflight(
-                            allowed_methods=["GET", "DELETE", "PUT"])
-                    else:
-                        self._do_other_things()
-
-    """
-    if _get_cors().preflight(
-        allowed_methods, allowed_headers, allow_credentials, max_age, origins
-    ):
-        _safe_caching_headers()
-        return True
-    return False
-
-
-def install():
-    """Install the toolbox such that it's available in all applications."""
-    cherrypy._cptree.Application.toolboxes.update(cors=tools)
-
-
-class CORS:
-    """A generic CORS handler."""
-
-    def __init__(self, req_headers, resp_headers):
-        self.req_headers = req_headers
-        self.resp_headers = resp_headers
-
-    def expose(self, allow_credentials, expose_headers, origins):
-        if self._is_valid_origin(origins):
-            self._add_origin_and_credentials_headers(allow_credentials)
-            self._add_expose_headers(expose_headers)
-            return True
-        return False
-
-    def expose_public(self, expose_headers):
-        self._add_public_origin()
-        self._add_expose_headers(expose_headers)
-
-    def preflight(
-        self, allowed_methods, allowed_headers, allow_credentials, max_age, origins
-    ):
-        if self._is_valid_preflight_request(allowed_headers, allowed_methods, origins):
-            self._add_origin_and_credentials_headers(allow_credentials)
-            self._add_prefligt_headers(allowed_methods, max_age)
-            return True
-        return False
-
-    @property
-    def origin(self):
-        return self.req_headers.get('Origin')
-
-    def _is_valid_origin(self, origins):
-        if origins is None:
-            origins = [self.origin]
-        origins = map(self._make_regex, origins)
-        return self.origin is not None and any(
-            origin.match(self.origin) for origin in origins
-        )
-
-    @staticmethod
-    def _make_regex(pattern):
-        if isinstance(pattern, str):
-            pattern = re.compile(re.escape(pattern) + '$')
-        return pattern
-
-    def _add_origin_and_credentials_headers(self, allow_credentials):
-        self.resp_headers[CORS_ALLOW_ORIGIN] = self.origin
-        if allow_credentials:
-            self.resp_headers[CORS_ALLOW_CREDENTIALS] = 'true'
-
-    def _add_public_origin(self):
-        self.resp_headers[CORS_ALLOW_ORIGIN] = PUBLIC_ORIGIN
-
-    def _add_expose_headers(self, expose_headers):
-        if expose_headers:
-            self.resp_headers[CORS_EXPOSE_HEADERS] = expose_headers
-
-    @property
-    def requested_method(self):
-        return self.req_headers.get(CORS_REQUEST_METHOD)
-
-    @property
-    def requested_headers(self):
-        return self.req_headers.get(CORS_REQUEST_HEADERS)
-
-    def _has_valid_method(self, allowed_methods):
-        return self.requested_method and self.requested_method in allowed_methods
-
-    def _valid_headers(self, allowed_headers):
-        if self.requested_headers and allowed_headers:
-            for header in self.requested_headers.split(','):
-                if header.strip() not in allowed_headers:
-                    return False
-        return True
-
-    def _is_valid_preflight_request(self, allowed_headers, allowed_methods, origins):
-        return (
-            self._is_valid_origin(origins)
-            and self._has_valid_method(allowed_methods)
-            and self._valid_headers(allowed_headers)
-        )
-
-    def _add_prefligt_headers(self, allowed_methods, max_age):
-        rh = self.resp_headers
-        rh[CORS_ALLOW_METHODS] = ', '.join(allowed_methods)
-        if max_age:
-            rh[CORS_MAX_AGE] = max_age
-        if self.requested_headers:
-            rh[CORS_ALLOW_HEADERS] = self.requested_headers
-
-
-def _get_cors():
-    return CORS(cherrypy.serving.request.headers, cherrypy.serving.response.headers)
-
-
-def _safe_caching_headers():
-    """Adds `Origin`_ to the `Vary`_ header to ensure caching works properly.
-
-    Except in IE because it will disable caching completely. The caching
-    strategy in that case is out of the scope of this library.
-    https://blogs.msdn.microsoft.com/ieinternals/2009/06/17/vary-with-care/
-    """
-    uah = cherrypy.serving.request.headers.get('User-Agent', '')
-    ua = httpagentparser.detect(uah)
-    IE = 'Microsoft Internet Explorer'
-    if ua.get('browser', {}).get('name') != IE:
-        set_vary_header(cherrypy.serving.response, "Origin")
-
-
-tools = cherrypy._cptools.Toolbox("cors")
-tools.expose = cherrypy.Tool('before_handler', expose)
-tools.expose_public = cherrypy.Tool('before_handler', expose_public)
-tools.preflight = cherrypy.Tool('before_handler', preflight)
diff --git a/lib/cloudinary/__init__.py b/lib/cloudinary/__init__.py
deleted file mode 100644
index 877340c9..00000000
--- a/lib/cloudinary/__init__.py
+++ /dev/null
@@ -1,841 +0,0 @@
-from __future__ import absolute_import
-
-import abc
-import logging
-import numbers
-import os
-import re
-from copy import deepcopy
-from math import ceil
-
-import certifi
-from six import python_2_unicode_compatible, add_metaclass
-
-logger = logging.getLogger("Cloudinary")
-ch = logging.StreamHandler()
-formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
-ch.setFormatter(formatter)
-logger.addHandler(ch)
-
-from cloudinary import utils
-from cloudinary.exceptions import GeneralError
-from cloudinary.cache import responsive_breakpoints_cache
-from cloudinary.http_client import HttpClient
-from cloudinary.compat import urlparse, parse_qs
-
-from platform import python_version, platform
-
-CERT_KWARGS = {
-    'cert_reqs': 'CERT_REQUIRED',
-    'ca_certs': certifi.where(),
-}
-
-CF_SHARED_CDN = "d3jpl91pxevbkh.cloudfront.net"
-OLD_AKAMAI_SHARED_CDN = "cloudinary-a.akamaihd.net"
-AKAMAI_SHARED_CDN = "res.cloudinary.com"
-SHARED_CDN = AKAMAI_SHARED_CDN
-CL_BLANK = "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"
-URI_SCHEME = "cloudinary"
-API_VERSION = "v1_1"
-
-VERSION = "1.41.0"
-
-_USER_PLATFORM_DETAILS = "; ".join((platform(), "Python {}".format(python_version())))
-
-USER_AGENT = "CloudinaryPython/{} ({})".format(VERSION, _USER_PLATFORM_DETAILS)
-""" :const: USER_AGENT """
-
-USER_PLATFORM = ""
-"""
-Additional information to be passed with the USER_AGENT, e.g. "CloudinaryCLI/1.2.3".
-This value is set in platform-specific implementations that use pycloudinary.
-
-The format of the value should be <ProductName>/Version[ (comment)].
-@see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.43
-
-**Do not set this value in application code!**
-"""
-
-
-def get_user_agent():
-    """
-    Provides the `USER_AGENT` string that is passed to the Cloudinary servers.
-    Prepends  `USER_PLATFORM` if it is defined.
-
-    :returns: the user agent
-    :rtype: str
-    """
-
-    if USER_PLATFORM == "":
-        return USER_AGENT
-    else:
-        return USER_PLATFORM + " " + USER_AGENT
-
-
-def import_django_settings():
-    try:
-        from django.core.exceptions import ImproperlyConfigured
-
-        try:
-            from django.conf import settings as _django_settings
-
-            # We can get a situation when Django module is installed in the system, but not initialized,
-            # which means we are running not in a Django process.
-            # In this case the following line throws ImproperlyConfigured exception
-            if 'cloudinary' in _django_settings.INSTALLED_APPS:
-                from django import get_version as _get_django_version
-                global USER_PLATFORM
-                USER_PLATFORM = "Django/{django_version}".format(django_version=_get_django_version())
-
-            if 'CLOUDINARY' in dir(_django_settings):
-                return _django_settings.CLOUDINARY
-            else:
-                return None
-
-        except ImproperlyConfigured:
-            return None
-
-    except ImportError:
-        return None
-
-
-@add_metaclass(abc.ABCMeta)
-class BaseConfig(object):
-    def __init__(self):
-        django_settings = import_django_settings()
-        if django_settings:
-            self.update(**django_settings)
-
-        self._load_config_from_env()
-
-    def __getattr__(self, i):
-        return self.__dict__.get(i)
-
-    @staticmethod
-    def _is_nested_key(key):
-        return re.match(r'\w+\[\w+\]', key)
-
-    def _put_nested_key(self, key, value):
-        chain = re.split(r'[\[\]]+', key)
-        chain = [k for k in chain if k]
-        outer = self.__dict__
-        last_key = chain.pop()
-        for inner_key in chain:
-            if inner_key in outer:
-                inner = outer[inner_key]
-            else:
-                inner = dict()
-                outer[inner_key] = inner
-            outer = inner
-        if isinstance(value, list):
-            value = value[0]
-        outer[last_key] = value
-
-    def _is_url_scheme_valid(self, url):
-        """
-        Helper function. Validates url scheme
-
-        :param url: A named tuple containing URL components
-
-        :return: bool True on success or False on failure
-        """
-        return url.scheme.lower() == self._uri_scheme
-
-    @staticmethod
-    def _parse_cloudinary_url(cloudinary_url):
-        return urlparse(cloudinary_url)
-
-    @abc.abstractmethod
-    def _config_from_parsed_url(self, parsed_url):
-        """Extract additional config from the parsed URL."""
-        raise NotImplementedError()
-
-    def _setup_from_parsed_url(self, parsed_url):
-        config_from_parsed_url = self._config_from_parsed_url(parsed_url)
-        self.update(**config_from_parsed_url)
-
-        for k, v in parse_qs(parsed_url.query).items():
-            if self._is_nested_key(k):
-                self._put_nested_key(k, v)
-            else:
-                self.__dict__[k] = v[0]
-
-    def _load_from_url(self, url):
-        parsed_url = self._parse_cloudinary_url(url)
-
-        return self._setup_from_parsed_url(parsed_url)
-
-    @abc.abstractmethod
-    def _load_config_from_env(self):
-        """Load config from environment variables or URL."""
-        raise NotImplementedError()
-
-    def update(self, **keywords):
-        for k, v in keywords.items():
-            self.__dict__[k] = v
-
-
-class Config(BaseConfig):
-    def __init__(self):
-        self._uri_scheme = URI_SCHEME
-
-        super(Config, self).__init__()
-
-        if not self.signature_algorithm:
-            self.signature_algorithm = utils.SIGNATURE_SHA1
-
-    def _config_from_parsed_url(self, parsed_url):
-        if not self._is_url_scheme_valid(parsed_url):
-            raise ValueError("Invalid CLOUDINARY_URL scheme. Expecting to start with 'cloudinary://'")
-
-        is_private_cdn = parsed_url.path != ""
-        result = {
-            "cloud_name": parsed_url.hostname,
-            "api_key": parsed_url.username,
-            "api_secret": parsed_url.password,
-            "private_cdn": is_private_cdn,
-        }
-        if is_private_cdn:
-            result.update({"secure_distribution": parsed_url.path[1:]})
-
-        return result
-
-    def _load_config_from_env(self):
-        if os.environ.get("CLOUDINARY_CLOUD_NAME"):
-            config_keys = [key for key in os.environ.keys()
-                           if key.startswith("CLOUDINARY_") and key != "CLOUDINARY_URL"]
-
-            for full_key in config_keys:
-                conf_key = full_key[len("CLOUDINARY_"):].lower()
-                conf_val = os.environ[full_key]
-                if conf_val in ["true", "false"]:
-                    conf_val = conf_val == "true"
-
-                self.update(**{conf_key: conf_val})
-        elif os.environ.get("CLOUDINARY_URL"):
-            self._load_from_url(os.environ.get("CLOUDINARY_URL"))
-
-
-_config = Config()
-
-
-def config(**keywords):
-    global _config
-    _config.update(**keywords)
-    return _config
-
-
-def reset_config():
-    global _config
-    _config = Config()
-
-
-_http_client = HttpClient()
-
-# FIXME: circular import issue
-from cloudinary.search import Search
-from cloudinary.search_folders import SearchFolders
-
-
-@python_2_unicode_compatible
-class CloudinaryResource(object):
-    """
-    Recommended sources for video tag
-    """
-    default_video_sources = [
-        {
-            "type": "mp4",
-            "codecs": "hev1",
-            "transformations": {"video_codec": "h265"}
-        }, {
-            "type": "webm",
-            "codecs": "vp9",
-            "transformations": {"video_codec": "vp9"}
-        }, {
-            "type": "mp4",
-            "transformations": {"video_codec": "auto"}
-        }, {
-            "type": "webm",
-            "transformations": {"video_codec": "auto"}
-        },
-    ]
-
-    def __init__(self, public_id=None, format=None, version=None,
-                 signature=None, url_options=None, metadata=None, type=None, resource_type=None,
-                 default_resource_type=None):
-        self.metadata = metadata
-        metadata = metadata or {}
-        self.public_id = public_id or metadata.get('public_id')
-        self.format = format or metadata.get('format')
-        self.version = version or metadata.get('version')
-        self.signature = signature or metadata.get('signature')
-        self.type = type or metadata.get('type') or "upload"
-        self.resource_type = resource_type or metadata.get('resource_type') or default_resource_type
-        self.url_options = url_options or {}
-
-    def __str__(self):
-        return self.public_id
-
-    def __len__(self):
-        return len(self.public_id) if self.public_id is not None else 0
-
-    def validate(self):
-        return self.signature == self.get_expected_signature()
-
-    def get_prep_value(self):
-        if None in [self.public_id,
-                    self.type,
-                    self.resource_type]:
-            return None
-        prep = ''
-        prep = prep + self.resource_type + '/' + self.type + '/'
-        if self.version:
-            prep = prep + 'v' + str(self.version) + '/'
-        prep = prep + self.public_id
-        if self.format:
-            prep = prep + '.' + self.format
-        return prep
-
-    def get_presigned(self):
-        return self.get_prep_value() + '#' + self.get_expected_signature()
-
-    def get_expected_signature(self):
-        return utils.api_sign_request({"public_id": self.public_id, "version": self.version}, config().api_secret,
-                                      config().signature_algorithm)
-
-    @property
-    def url(self):
-        return self.build_url(**self.url_options)
-
-    def __build_url(self, **options):
-        combined_options = dict(format=self.format, version=self.version, type=self.type,
-                                resource_type=self.resource_type or "image")
-        combined_options.update(options)
-        public_id = combined_options.get('public_id') or self.public_id
-        return utils.cloudinary_url(public_id, **combined_options)
-
-    def build_url(self, **options):
-        return self.__build_url(**options)[0]
-
-    @staticmethod
-    def default_poster_options(options):
-        options["format"] = options.get("format", "jpg")
-
-    @staticmethod
-    def default_source_types():
-        return ['webm', 'mp4', 'ogv']
-
-    @staticmethod
-    def _validate_srcset_data(srcset_data):
-        """
-        Helper function. Validates srcset_data parameters
-
-        :param srcset_data: A dictionary containing the following keys:
-                breakpoints A list of breakpoints.
-                min_width   Minimal width of the srcset images
-                max_width   Maximal width of the srcset images.
-                max_images  Number of srcset images to generate.
-
-        :return: bool True on success or False on failure
-        """
-        if not all(k in srcset_data and isinstance(srcset_data[k], numbers.Number) for k in ("min_width", "max_width",
-                                                                                             "max_images")):
-            logger.warning("Either valid (min_width, max_width, max_images)" +
-                           "or breakpoints must be provided to the image srcset attribute")
-            return False
-
-        if srcset_data["min_width"] > srcset_data["max_width"]:
-            logger.warning("min_width must be less than max_width")
-            return False
-
-        if srcset_data["max_images"] <= 0:
-            logger.warning("max_images must be a positive integer")
-            return False
-
-        return True
-
-    def _generate_breakpoints(self, srcset_data):
-        """
-        Helper function. Calculates static responsive breakpoints using provided parameters.
-
-        Either the breakpoints or min_width, max_width, max_images must be provided.
-
-        :param srcset_data: A dictionary containing the following keys:
-                                breakpoints A list of breakpoints.
-                                min_width   Minimal width of the srcset images
-                                max_width   Maximal width of the srcset images.
-                                max_images  Number of srcset images to generate.
-
-        :return: A list of breakpoints
-
-        :raises ValueError: In case of invalid or missing parameters
-        """
-        breakpoints = srcset_data.get("breakpoints", list())
-
-        if breakpoints:
-            return breakpoints
-
-        if not self._validate_srcset_data(srcset_data):
-            return None
-
-        min_width, max_width, max_images = srcset_data["min_width"], srcset_data["max_width"], srcset_data["max_images"]
-
-        if max_images == 1:
-            # if user requested only 1 image in srcset, we return max_width one
-            min_width = max_width
-
-        step_size = int(ceil(float(max_width - min_width) / (max_images - 1 if max_images > 1 else 1)))
-
-        curr_breakpoint = min_width
-
-        while curr_breakpoint < max_width:
-            breakpoints.append(curr_breakpoint)
-            curr_breakpoint += step_size
-
-        breakpoints.append(max_width)
-
-        return breakpoints
-
-    def _fetch_breakpoints(self, srcset_data=None, **options):
-        """
-        Helper function. Retrieves responsive breakpoints list from cloudinary server
-
-        When passing special string to transformation `width` parameter of form `auto:breakpoints{parameters}:json`,
-        the response contains JSON with data of the responsive breakpoints
-
-        :param srcset_data: A dictionary containing the following keys:
-                                min_width   Minimal width of the srcset images
-                                max_width   Maximal width of the srcset images
-                                bytes_step  Minimal bytes step between images
-                                max_images  Number of srcset images to generate
-        :param options: Additional options
-
-        :return: Resulting breakpoints
-        """
-        if srcset_data is None:
-            srcset_data = dict()
-
-        min_width = srcset_data.get("min_width", 50)
-        max_width = srcset_data.get("max_width", 1000)
-        bytes_step = srcset_data.get("bytes_step", 20000)
-        max_images = srcset_data.get("max_images", 20)
-        transformation = srcset_data.get("transformation")
-
-        kbytes_step = int(ceil(float(bytes_step) / 1024))
-
-        breakpoints_width_param = "auto:breakpoints_{min_width}_{max_width}_{kbytes_step}_{max_images}:json".format(
-            min_width=min_width, max_width=max_width, kbytes_step=kbytes_step, max_images=max_images)
-        breakpoints_url = utils.cloudinary_scaled_url(self.public_id, breakpoints_width_param, transformation, options)
-
-        return _http_client.get_json(breakpoints_url).get("breakpoints", None)
-
-    def _get_or_generate_breakpoints(self, srcset_data, **options):
-        """
-        Helper function. Gets from cache or calculates srcset breakpoints using provided parameters
-
-        :param srcset_data: A dictionary containing the following keys:
-                                breakpoints A list of breakpoints.
-                                min_width   Minimal width of the srcset images
-                                max_width   Maximal width of the srcset images
-                                max_images  Number of srcset images to generate
-        :param options: Additional options
-
-        :return: Resulting breakpoints
-        """
-
-        breakpoints = srcset_data.get("breakpoints")
-
-        if breakpoints:
-            return breakpoints
-
-        if srcset_data.get("use_cache"):
-            breakpoints = responsive_breakpoints_cache.instance.get(self.public_id, **options)
-            if not breakpoints:
-                try:
-                    breakpoints = self._fetch_breakpoints(srcset_data, **options)
-                except GeneralError as e:
-                    logger.warning("Failed getting responsive breakpoints: {error}".format(error=e.message))
-
-                if breakpoints:
-                    responsive_breakpoints_cache.instance.set(self.public_id, breakpoints, **options)
-
-        if not breakpoints:
-            # Static calculation if cache is not enabled or we failed to fetch breakpoints
-            breakpoints = self._generate_breakpoints(srcset_data)
-
-        return breakpoints
-
-    def _generate_srcset_attribute(self, breakpoints, transformation=None, **options):
-        """
-        Helper function. Generates srcset attribute value of the HTML img tag.
-
-        :param breakpoints: A list of breakpoints.
-        :param transformation: Custom transformation
-        :param options:     Additional options
-
-        :return:  Resulting srcset attribute value
-
-        :raises ValueError: In case of invalid or missing parameters
-        """
-        if not breakpoints:
-            return None
-
-        if transformation is None:
-            transformation = dict()
-
-        return ", ".join(["{0} {1}w".format(utils.cloudinary_scaled_url(
-            self.public_id, w, transformation, options), w) for w in breakpoints])
-
-    @staticmethod
-    def _generate_sizes_attribute(breakpoints):
-        """
-        Helper function. Generates sizes attribute value of the HTML img tag.
-
-        :param breakpoints: A list of breakpoints.
-
-        :return: Resulting 'sizes' attribute value
-        """
-        if not breakpoints:
-            return None
-
-        return ", ".join("(max-width: {bp}px) {bp}px".format(bp=bp) for bp in breakpoints)
-
-    def _generate_image_responsive_attributes(self, attributes, srcset_data, **options):
-        """
-        Helper function. Generates srcset and sizes attributes of the image tag
-
-        Create both srcset and sizes here to avoid fetching breakpoints twice
-
-        :param attributes: Existing attributes
-        :param srcset_data: A dictionary containing the following keys:
-                                breakpoints     A list of breakpoints.
-                                min_width       Minimal width of the srcset images
-                                max_width       Maximal width of the srcset images.
-                                max_images      Number of srcset images to generate.
-        :param options:     Additional options
-
-        :return: The responsive attributes
-        """
-        responsive_attributes = dict()
-
-        if not srcset_data:
-            return responsive_attributes
-
-        breakpoints = None
-
-        if "srcset" not in attributes:
-            breakpoints = self._get_or_generate_breakpoints(srcset_data, **options)
-            transformation = srcset_data.get("transformation")
-            srcset_attr = self._generate_srcset_attribute(breakpoints, transformation, **options)
-            if srcset_attr:
-                responsive_attributes["srcset"] = srcset_attr
-
-        if "sizes" not in attributes and srcset_data.get("sizes") is True:
-            if not breakpoints:
-                breakpoints = self._get_or_generate_breakpoints(srcset_data, **options)
-            sizes_attr = self._generate_sizes_attribute(breakpoints)
-            if sizes_attr:
-                responsive_attributes["sizes"] = sizes_attr
-
-        return responsive_attributes
-
-    def image(self, **options):
-        """
-        Generates HTML img tag
-
-        :param options: Additional options
-
-        :return: Resulting img tag
-        """
-        if options.get("resource_type", self.resource_type) == "video":
-            self.default_poster_options(options)
-
-        custom_attributes = options.pop("attributes", dict())
-
-        srcset_option = options.pop("srcset", dict())
-        srcset_data = dict()
-
-        if isinstance(srcset_option, dict):
-            srcset_data = config().srcset or dict()
-            srcset_data = srcset_data.copy()
-            srcset_data.update(srcset_option)
-        else:
-            if "srcset" not in custom_attributes:
-                custom_attributes["srcset"] = srcset_option
-
-        src, attrs = self.__build_url(**options)
-
-        client_hints = attrs.pop("client_hints", config().client_hints)
-        responsive = attrs.pop("responsive", False)
-        hidpi = attrs.pop("hidpi", False)
-
-        if (responsive or hidpi) and not client_hints:
-            attrs["data-src"] = src
-
-            classes = "cld-responsive" if responsive else "cld-hidpi"
-            if "class" in attrs:
-                classes += " " + attrs["class"]
-            attrs["class"] = classes
-
-            src = attrs.pop("responsive_placeholder", config().responsive_placeholder)
-            if src == "blank":
-                src = CL_BLANK
-
-        responsive_attrs = self._generate_image_responsive_attributes(custom_attributes, srcset_data, **options)
-
-        if responsive_attrs:
-            # width and height attributes override srcset behavior, they should be removed from html attributes.
-            for key in {"width", "height"}:
-                attrs.pop(key, None)
-
-        attrs.update(responsive_attrs)
-        # Explicitly provided attributes override options
-        attrs.update(custom_attributes)
-
-        if src:
-            attrs["src"] = src
-
-        return u"<img {0}/>".format(utils.html_attrs(attrs))
-
-    def video_thumbnail(self, **options):
-        self.default_poster_options(options)
-        return self.build_url(**options)
-
-    @staticmethod
-    def _video_mime_type(video_type, codecs=None):
-        """
-        Helper function for video(), generates video MIME type string from video_type and codecs.
-        Example: video/mp4; codecs=mp4a.40.2
-
-        :param video_type: mp4, webm, ogg etc.
-        :param codecs: List or string of codecs. E.g.: "avc1.42E01E" or "avc1.42E01E, mp4a.40.2" or
-                       ["avc1.42E01E", "mp4a.40.2"]
-
-        :return: Resulting mime type
-        """
-
-        video_type = 'ogg' if video_type == 'ogv' else video_type
-
-        if not video_type:
-            return ""
-
-        codecs_str = ", ".join(codecs) if isinstance(codecs, (list, tuple)) else codecs
-        codecs_attr = "; codecs={codecs_str}".format(codecs_str=codecs_str) if codecs_str else ""
-
-        return "video/{}{}".format(video_type, codecs_attr)
-
-    @staticmethod
-    def _collect_video_tag_attributes(video_options):
-        """
-        Helper function for video tag, collects remaining options and returns them as attributes
-
-        :param video_options: Remaining options
-
-        :return: Resulting attributes
-        """
-        attributes = video_options.copy()
-
-        if 'html_width' in attributes:
-            attributes['width'] = attributes.pop('html_width')
-        if 'html_height' in attributes:
-            attributes['height'] = attributes.pop('html_height')
-
-        if "poster" in attributes and not attributes["poster"]:
-            attributes.pop("poster", None)
-
-        return attributes
-
-    def _generate_video_poster_attr(self, source, video_options):
-        """
-        Helper function for video tag, generates video poster URL
-
-        :param source: The public ID of the resource
-        :param video_options: Additional options
-
-        :return: Resulting video poster URL
-        """
-        if 'poster' not in video_options:
-            return self.video_thumbnail(public_id=source, **video_options)
-
-        poster_options = video_options['poster']
-
-        if not isinstance(poster_options, dict):
-            return poster_options
-
-        if 'public_id' not in poster_options:
-            return self.video_thumbnail(public_id=source, **poster_options)
-
-        return utils.cloudinary_url(poster_options['public_id'], **poster_options)[0]
-
-    def _populate_video_source_tags(self, source, options):
-        """
-        Helper function for video tag, populates source tags from provided options.
-
-        source_types and sources are mutually exclusive, only one of them can be used.
-        If both are not provided, source types are used (for backwards compatibility)
-
-        :param source: The public ID of the video
-        :param options: Additional options
-
-        :return: Resulting source tags (may be empty)
-        """
-        source_tags = []
-
-        # Consume all relevant options, otherwise they are left and passed as attributes
-        video_sources = options.pop('sources', [])
-        source_types = options.pop('source_types', [])
-        source_transformation = options.pop('source_transformation', {})
-
-        if video_sources and isinstance(video_sources, list):
-            # processing new source structure with codecs
-            for source_data in video_sources:
-                transformation = options.copy()
-                transformation.update(source_data.get("transformations", {}))
-                source_type = source_data.get("type", '')
-                src = utils.cloudinary_url(source, format=source_type, **transformation)[0]
-                codecs = source_data.get("codecs", [])
-                source_tags.append("<source {attributes}>".format(
-                    attributes=utils.html_attrs({'src': src, 'type': self._video_mime_type(source_type, codecs)})))
-
-            return source_tags
-
-        # processing old source_types structure with out codecs
-        if not source_types:
-            source_types = self.default_source_types()
-
-        if not isinstance(source_types, (list, tuple)):
-            return source_tags
-
-        for source_type in source_types:
-            transformation = options.copy()
-            transformation.update(source_transformation.get(source_type, {}))
-            src = utils.cloudinary_url(source, format=source_type, **transformation)[0]
-            source_tags.append("<source {attributes}>".format(
-                attributes=utils.html_attrs({'src': src, 'type': self._video_mime_type(source_type)})))
-
-        return source_tags
-
-    def video(self, **options):
-        """
-        Creates an HTML video tag for the provided +source+
-
-        Examples:
-           CloudinaryResource("mymovie.mp4").video()
-           CloudinaryResource("mymovie.mp4").video(source_types = 'webm')
-           CloudinaryResource("mymovie.ogv").video(poster = "myspecialplaceholder.jpg")
-           CloudinaryResource("mymovie.webm").video(source_types = ['webm', 'mp4'], poster = {'effect': 'sepia'})
-
-        :param options:
-         * <tt>source_types</tt>            - Specify which source type the tag should include.
-                                              defaults to webm, mp4 and ogv.
-         * <tt>sources</tt>                 - Similar to source_types, but may contain codecs list.
-                                              source_types and sources are mutually exclusive, only one of
-                                              them can be used. If both are not provided, default source types
-                                              are used.
-         * <tt>source_transformation</tt>   - specific transformations to use
-                                              for a specific source type.
-         * <tt>poster</tt>                  - override default thumbnail:
-           * url: provide an ad hoc url
-           * options: with specific poster transformations and/or Cloudinary +:public_id+
-
-        :return: Video tag
-        """
-        public_id = options.get('public_id', self.public_id)
-        use_fetch_format = options.get('use_fetch_format', config().use_fetch_format)
-        if not use_fetch_format:
-            source = re.sub(r"\.({0})$".format("|".join(self.default_source_types())), '', public_id)
-        else:
-            source = public_id
-
-        custom_attributes = options.pop("attributes", dict())
-
-        fallback = options.pop('fallback_content', '')
-
-        # Save source types for a single video source handling (it can be a single type)
-        source_types = options.get('source_types', "")
-
-        poster_options = options.copy()
-        if "poster" not in custom_attributes:
-            options["poster"] = self._generate_video_poster_attr(source, poster_options)
-
-        if "resource_type" not in options:
-            options["resource_type"] = self.resource_type or "video"
-
-        # populate video source tags
-        source_tags = self._populate_video_source_tags(source, options)
-
-        if not source_tags:
-            source = source + '.' + utils.build_array(source_types)[0]
-
-        video_url, video_options = utils.cloudinary_url(source, **options)
-
-        if not source_tags:
-            custom_attributes['src'] = video_url
-
-        attributes = self._collect_video_tag_attributes(video_options)
-        attributes.update(custom_attributes)
-
-        sources_str = ''.join(str(x) for x in source_tags)
-        html = "<video {attributes}>{sources}{fallback}</video>".format(
-            attributes=utils.html_attrs(attributes), sources=sources_str, fallback=fallback)
-
-        return html
-
-    @staticmethod
-    def __generate_media_attr(**media_options):
-        media_query_conditions = []
-        if "min_width" in media_options:
-            media_query_conditions.append("(min-width: {}px)".format(media_options["min_width"]))
-        if "max_width" in media_options:
-            media_query_conditions.append("(max-width: {}px)".format(media_options["max_width"]))
-
-        return " and ".join(media_query_conditions)
-
-    def source(self, **options):
-        attrs = options.get("attributes") or {}
-
-        srcset_data = config().srcset or dict()
-        srcset_data = srcset_data.copy()
-        srcset_data.update(options.pop("srcset", dict()))
-
-        responsive_attrs = self._generate_image_responsive_attributes(attrs, srcset_data, **options)
-
-        attrs.update(responsive_attrs)
-
-        # `source` tag under `picture` tag uses `srcset` attribute for both `srcset` and `src` urls
-        if "srcset" not in attrs:
-            attrs["srcset"], _ = self.__build_url(**options)
-
-        if "media" not in attrs:
-            media_attr = self.__generate_media_attr(**(options.get("media", {})))
-            if media_attr:
-                attrs["media"] = media_attr
-
-        return u"<source {0}>".format(utils.html_attrs(attrs))
-
-    def picture(self, **options):
-        sub_tags = []
-        sources = options.pop("sources") or list()
-        for source in sources:
-            curr_options = deepcopy(options)
-
-            if "transformation" in source:
-                curr_options = utils.chain_transformations(curr_options, source["transformation"])
-
-            curr_options["media"] = dict((k, source[k]) for k in ['min_width', 'max_width'] if k in source)
-
-            sub_tags.append(self.source(**curr_options))
-
-        sub_tags.append(self.image(**options))
-
-        return u"<picture>{}</picture>".format("".join(sub_tags))
-
-
-class CloudinaryImage(CloudinaryResource):
-    def __init__(self, public_id=None, **kwargs):
-        super(CloudinaryImage, self).__init__(public_id=public_id, default_resource_type="image", **kwargs)
-
-
-class CloudinaryVideo(CloudinaryResource):
-    def __init__(self, public_id=None, **kwargs):
-        super(CloudinaryVideo, self).__init__(public_id=public_id, default_resource_type="video", **kwargs)
diff --git a/lib/cloudinary/api.py b/lib/cloudinary/api.py
deleted file mode 100644
index 95543d32..00000000
--- a/lib/cloudinary/api.py
+++ /dev/null
@@ -1,878 +0,0 @@
-# Copyright Cloudinary
-
-import datetime
-import email.utils
-import json
-import socket
-
-import urllib3
-from six import string_types
-from urllib3.exceptions import HTTPError
-
-import cloudinary
-from cloudinary import utils
-from cloudinary.api_client.call_api import (
-    call_api,
-    call_metadata_api,
-    call_json_api,
-    _call_v2_api
-)
-from cloudinary.exceptions import (
-    BadRequest,
-    AuthorizationRequired,
-    NotAllowed,
-    NotFound,
-    AlreadyExists,
-    RateLimited,
-    GeneralError
-)
-
-
-def ping(**options):
-    return call_api("get", ["ping"], {}, **options)
-
-
-def usage(**options):
-    """Get account usage details.
-
-    Get a report on the status of your Cloudinary account usage details, including storage, credits, bandwidth,
-    requests, number of resources, and add-on usage. Note that numbers are updated periodically.
-
-    See: `Get account usage details
-    <https://cloudinary.com/documentation/admin_api#get_account_usage_details>`_
-
-    :param options:     Additional options
-    :type options:      dict, optional
-    :return:            Detailed usage information
-    :rtype:             Response
-    """
-    date = options.pop("date", None)
-    uri = ["usage"]
-    if date:
-        if isinstance(date, datetime.date):
-            date = utils.encode_date_to_usage_api_format(date)
-        uri.append(date)
-    return call_api("get", uri, {}, **options)
-
-
-def config(**options):
-    """
-    Get account config details.
-
-    :param options:     Additional options.
-    :type options:      dict, optional
-    :return:            Detailed config information.
-    :rtype:             Response
-    """
-    params = only(options, "settings")
-    return call_api("get", ["config"], params, **options)
-
-
-def resource_types(**options):
-    return call_api("get", ["resources"], {}, **options)
-
-
-def resources(**options):
-    resource_type = options.pop("resource_type", "image")
-    upload_type = options.pop("type", None)
-    uri = ["resources", resource_type]
-    if upload_type:
-        uri.append(upload_type)
-    params = __list_resources_params(**options)
-    params.update(only(options, "prefix", "start_at"))
-    return call_api("get", uri, params, **options)
-
-
-def resources_by_tag(tag, **options):
-    resource_type = options.pop("resource_type", "image")
-    uri = ["resources", resource_type, "tags", tag]
-    params = __list_resources_params(**options)
-    return call_api("get", uri, params, **options)
-
-
-def resources_by_moderation(kind, status, **options):
-    resource_type = options.pop("resource_type", "image")
-    uri = ["resources", resource_type, "moderations", kind, status]
-    params = __list_resources_params(**options)
-    return call_api("get", uri, params, **options)
-
-
-def resources_by_ids(public_ids, **options):
-    resource_type = options.pop("resource_type", "image")
-    upload_type = options.pop("type", "upload")
-    uri = ["resources", resource_type, upload_type]
-    params = dict(__resources_params(**options), public_ids=public_ids)
-    return call_api("get", uri, params, **options)
-
-
-def resources_by_asset_folder(asset_folder, **options):
-    """
-    Returns the details of the resources (assets) under a specified asset_folder.
-
-    :param asset_folder:    The Asset Folder of the asset
-    :type asset_folder:     string
-    :param options:     Additional options
-    :type options:      dict, optional
-    :return:            Resources (assets) of a specific asset_folder
-    :rtype:             Response
-    """
-    uri = ["resources", "by_asset_folder"]
-    params = __list_resources_params(**options)
-    params["asset_folder"] = asset_folder
-    return call_api("get", uri, params, **options)
-
-
-def resources_by_asset_ids(asset_ids, **options):
-    """Retrieves the resources (assets) indicated in the asset IDs.
-    This method does not return deleted assets even if they have been backed up.
-
-    See: `Get resources by context API reference
-    <https://cloudinary.com/documentation/admin_api#get_resources>`_
-
-    :param asset_ids:   The requested asset IDs.
-    :type asset_ids:    list[str]
-    :param options:     Additional options
-    :type options:      dict, optional
-    :return:            Resources (assets) as indicated in the asset IDs
-    :rtype:             Response
-    """
-    uri = ["resources", 'by_asset_ids']
-    params = dict(__resources_params(**options), asset_ids=asset_ids)
-    return call_api("get", uri, params, **options)
-
-
-def resources_by_context(key, value=None, **options):
-    """Retrieves resources (assets) with a specified context key.
-    This method does not return deleted assets even if they have been backed up.
-
-    See: `Get resources by context API reference
-    <https://cloudinary.com/documentation/admin_api#get_resources_by_context>`_
-
-    :param key:         Only assets with this context key are returned
-    :type key:          str
-    :param value:       Only assets with this value for the context key are returned
-    :type value:        str, optional
-    :param options:     Additional options
-    :type options:      dict, optional
-    :return:            Resources (assets) with a specified context key
-    :rtype:             Response
-    """
-    resource_type = options.pop("resource_type", "image")
-    uri = ["resources", resource_type, "context"]
-    params = __list_resources_params(**options)
-    params["key"] = key
-    if value is not None:
-        params["value"] = value
-    return call_api("get", uri, params, **options)
-
-
-def __resources_params(**options):
-    """
-       Prepares optional parameters for resources_* API calls.
-
-       :param options: Additional options
-       :return: Optional parameters
-
-       :internal
-       """
-    params = only(options, "tags", "context", "metadata", "moderations")
-    params["fields"] = options.get("fields") and utils.encode_list(utils.build_array(options["fields"]))
-    return params
-
-
-def __list_resources_params(**options):
-    """
-       Prepares optional parameters for resources_* API calls.
-
-       :param options: Additional options
-       :return: Optional parameters
-
-       :internal
-       """
-    resources_params = __resources_params(**options)
-    resources_params.update(only(options, "next_cursor", "max_results", "direction"))
-
-    return resources_params
-
-
-def visual_search(image_url=None, image_asset_id=None, text=None, image_file=None, **options):
-    """
-    Find images based on their visual content.
-
-    :param image_url:       The URL of an image.
-    :type image_url:        str
-    :param image_asset_id:  The asset_id of an image in your account.
-    :type image_asset_id:   str
-    :param text:            A textual description, e.g., "cat"
-    :type text:             str
-    :param image_file:      The image file.
-    :type image_file:       str|callable|Path|bytes
-    :param options:         Additional options
-    :type options:          dict, optional
-    :return:                Resources (assets) that were found
-    :rtype:                 Response
-    """
-    uri = ["resources", "visual_search"]
-    params = {"image_url": image_url, "image_asset_id": image_asset_id, "text": text,
-              "image_file": utils.handle_file_parameter(image_file, "file")}
-    return call_api("post", uri, params, **options)
-
-
-def resource(public_id, **options):
-    resource_type = options.pop("resource_type", "image")
-    upload_type = options.pop("type", "upload")
-    uri = ["resources", resource_type, upload_type, public_id]
-    params = _prepare_asset_details_params(**options)
-    return call_api("get", uri, params, **options)
-
-
-def resource_by_asset_id(asset_id, **options):
-    """
-    Returns the details of the specified asset and all its derived assets by asset id.
-
-    :param asset_id:    The Asset ID of the asset
-    :type asset_id:     string
-    :param options:     Additional options
-    :type options:      dict, optional
-    :return:            Resource (asset) of a specific asset_id
-    :rtype:             Response
-    """
-    uri = ["resources", asset_id]
-    params = _prepare_asset_details_params(**options)
-    return call_api("get", uri, params, **options)
-
-
-def _prepare_asset_details_params(**options):
-    """
-    Prepares optional parameters for resource_by_asset_id API calls.
-
-    :param options: Additional options
-    :return: Optional parameters
-
-    :internal
-    """
-    return only(options, "exif", "faces", "colors", "image_metadata", "media_metadata", "cinemagraph_analysis",
-                "pages", "phash", "coordinates", "max_results", "quality_analysis", "derived_next_cursor",
-                "accessibility_analysis", "versions", "related", "related_next_cursor")
-
-
-def update(public_id, **options):
-    resource_type = options.pop("resource_type", "image")
-    upload_type = options.pop("type", "upload")
-    uri = ["resources", resource_type, upload_type, public_id]
-    params = only(options, "moderation_status", "raw_convert",
-                  "quality_override", "ocr",
-                  "categorization", "detection", "similarity_search",
-                  "background_removal", "notification_url")
-    if "tags" in options:
-        params["tags"] = ",".join(utils.build_array(options["tags"]))
-    if "face_coordinates" in options:
-        params["face_coordinates"] = utils.encode_double_array(options.get("face_coordinates"))
-    if "custom_coordinates" in options:
-        params["custom_coordinates"] = utils.encode_double_array(options.get("custom_coordinates"))
-    if "regions" in options:
-        params["regions"] = utils.json_encode(options.get("regions"))
-    if "context" in options:
-        params["context"] = utils.encode_context(options.get("context"))
-    if "metadata" in options:
-        params["metadata"] = utils.encode_context(options.get("metadata"))
-    if "auto_tagging" in options:
-        params["auto_tagging"] = str(options.get("auto_tagging"))
-    if "access_control" in options:
-        params["access_control"] = utils.json_encode(utils.build_list_of_dicts(options.get("access_control")))
-    if "asset_folder" in options:
-        params["asset_folder"] = options.get("asset_folder")
-    if "display_name" in options:
-        params["display_name"] = options.get("display_name")
-    if "unique_display_name" in options:
-        params["unique_display_name"] = options.get("unique_display_name")
-    if "clear_invalid" in options:
-        params["clear_invalid"] = options.get("clear_invalid")
-
-    return call_api("post", uri, params, **options)
-
-
-def delete_resources(public_ids, **options):
-    resource_type = options.pop("resource_type", "image")
-    upload_type = options.pop("type", "upload")
-    uri = ["resources", resource_type, upload_type]
-    params = __delete_resource_params(options, public_ids=public_ids)
-    return call_api("delete", uri, params, **options)
-
-
-def delete_resources_by_prefix(prefix, **options):
-    resource_type = options.pop("resource_type", "image")
-    upload_type = options.pop("type", "upload")
-    uri = ["resources", resource_type, upload_type]
-    params = __delete_resource_params(options, prefix=prefix)
-    return call_api("delete", uri, params, **options)
-
-
-def delete_all_resources(**options):
-    resource_type = options.pop("resource_type", "image")
-    upload_type = options.pop("type", "upload")
-    uri = ["resources", resource_type, upload_type]
-    params = __delete_resource_params(options, all=True)
-    return call_api("delete", uri, params, **options)
-
-
-def delete_resources_by_tag(tag, **options):
-    resource_type = options.pop("resource_type", "image")
-    uri = ["resources", resource_type, "tags", tag]
-    params = __delete_resource_params(options)
-    return call_api("delete", uri, params, **options)
-
-
-def delete_derived_resources(derived_resource_ids, **options):
-    uri = ["derived_resources"]
-    params = {"derived_resource_ids": derived_resource_ids}
-    return call_api("delete", uri, params, **options)
-
-
-def delete_derived_by_transformation(public_ids, transformations,
-                                     resource_type='image', type='upload', invalidate=None,
-                                     **options):
-    """Delete derived resources of public ids, identified by transformations
-
-    :param public_ids: the base resources
-    :type public_ids: list of str
-    :param transformations: the transformation of derived resources, optionally including the format
-    :type transformations: list of (dict or str)
-    :param type: The upload type
-    :type type: str
-    :param resource_type: The type of the resource: defaults to "image"
-    :type resource_type: str
-    :param invalidate: (optional) True to invalidate the resources after deletion
-    :type invalidate: bool
-    :return: a list of the public ids for which derived resources were deleted
-    :rtype: dict
-    """
-    uri = ["resources", resource_type, type]
-    if not isinstance(public_ids, list):
-        public_ids = [public_ids]
-    params = {"public_ids": public_ids,
-              "transformations": utils.build_eager(transformations),
-              "keep_original": True}
-    if invalidate is not None:
-        params['invalidate'] = invalidate
-    return call_api("delete", uri, params, **options)
-
-
-def add_related_assets(public_id, assets_to_relate, resource_type="image", type="upload", **options):
-    """
-    Relates an asset to other assets by public IDs.
-
-    :param public_id: The public ID of the asset to update.
-    :type public_id: str
-    :param assets_to_relate: The array of up to 10 fully_qualified_public_ids given as resource_type/type/public_id.
-    :type assets_to_relate: list[str]
-    :param type: The upload type. Defaults to "upload".
-    :type type: str
-    :param resource_type: The type of the resource. Defaults to "image".
-    :type resource_type: str
-    :param options: Additional options.
-    :type options: dict, optional
-    :return: The result of the command.
-    :rtype: dict
-    """
-    uri = ["resources", "related_assets", resource_type, type, public_id]
-    params = {"assets_to_relate": utils.build_array(assets_to_relate)}
-    return call_json_api("post", uri, params, **options)
-
-
-def add_related_assets_by_asset_ids(asset_id, assets_to_relate, **options):
-    """
-    Relates an asset to other assets by asset IDs.
-
-    :param asset_id: The asset ID of the asset to update.
-    :type asset_id: str
-    :param assets_to_relate: The array of up to 10 asset IDs.
-    :type assets_to_relate: list[str]
-    :param options: Additional options.
-    :type options: dict, optional
-    :return: The result of the command.
-    :rtype: dict
-    """
-    uri = ["resources", "related_assets", asset_id]
-    params = {"assets_to_relate": utils.build_array(assets_to_relate)}
-    return call_json_api("post", uri, params, **options)
-
-
-def delete_related_assets(public_id, assets_to_unrelate, resource_type="image", type="upload", **options):
-    """
-    Unrelates an asset from other assets by public IDs.
-
-    :param public_id: The public ID of the asset to update.
-    :type public_id: str
-    :param assets_to_unrelate: The array of up to 10 fully_qualified_public_ids given as resource_type/type/public_id.
-    :type assets_to_unrelate: list[str]
-    :param type: The upload type.
-    :type type: str
-    :param resource_type: The type of the resource: defaults to "image".
-    :type resource_type: str
-    :param options: Additional options.
-    :type options: dict, optional
-    :return: The result of the command.
-    :rtype: dict
-    """
-    uri = ["resources", "related_assets", resource_type, type, public_id]
-    params = {"assets_to_unrelate": utils.build_array(assets_to_unrelate)}
-    return call_json_api("delete", uri, params, **options)
-
-
-def delete_related_assets_by_asset_ids(asset_id, assets_to_unrelate, **options):
-    """
-    Unrelates an asset from other assets by asset IDs.
-
-    :param asset_id: The asset ID of the asset to update.
-    :type asset_id: str
-    :param assets_to_unrelate: The array of up to 10 asset IDs.
-    :type assets_to_unrelate: list[str]
-    :param options: Additional options.
-    :type options: dict, optional
-    :return: The result of the command.
-    :rtype: dict
-    """
-    uri = ["resources", "related_assets", asset_id]
-    params = {"assets_to_unrelate": utils.build_array(assets_to_unrelate)}
-    return call_json_api("delete", uri, params, **options)
-
-
-def tags(**options):
-    resource_type = options.pop("resource_type", "image")
-    uri = ["tags", resource_type]
-    return call_api("get", uri, only(options, "next_cursor", "max_results", "prefix"), **options)
-
-
-def transformations(**options):
-    uri = ["transformations"]
-    params = only(options, "named", "next_cursor", "max_results")
-
-    return call_api("get", uri, params, **options)
-
-
-def transformation(transformation, **options):
-    uri = ["transformations"]
-
-    params = only(options, "next_cursor", "max_results")
-    params["transformation"] = utils.build_single_eager(transformation)
-
-    return call_api("get", uri, params, **options)
-
-
-def delete_transformation(transformation, **options):
-    uri = ["transformations"]
-
-    params = {"transformation": utils.build_single_eager(transformation)}
-
-    return call_api("delete", uri, params, **options)
-
-
-# updates - currently only supported update is the "allowed_for_strict"
-# boolean flag and unsafe_update
-def update_transformation(transformation, **options):
-    uri = ["transformations"]
-
-    updates = only(options, "allowed_for_strict")
-
-    if "unsafe_update" in options:
-        updates["unsafe_update"] = transformation_string(options.get("unsafe_update"))
-
-    updates["transformation"] = utils.build_single_eager(transformation)
-
-    return call_api("put", uri, updates, **options)
-
-
-def create_transformation(name, definition, **options):
-    uri = ["transformations"]
-
-    params = {"name": name, "transformation": utils.build_single_eager(definition)}
-
-    return call_api("post", uri, params, **options)
-
-
-def publish_by_ids(public_ids, **options):
-    resource_type = options.pop("resource_type", "image")
-    uri = ["resources", resource_type, "publish_resources"]
-    params = dict(only(options, "type", "overwrite", "invalidate"), public_ids=public_ids)
-    return call_api("post", uri, params, **options)
-
-
-def publish_by_prefix(prefix, **options):
-    resource_type = options.pop("resource_type", "image")
-    uri = ["resources", resource_type, "publish_resources"]
-    params = dict(only(options, "type", "overwrite", "invalidate"), prefix=prefix)
-    return call_api("post", uri, params, **options)
-
-
-def publish_by_tag(tag, **options):
-    resource_type = options.pop("resource_type", "image")
-    uri = ["resources", resource_type, "publish_resources"]
-    params = dict(only(options, "type", "overwrite", "invalidate"), tag=tag)
-    return call_api("post", uri, params, **options)
-
-
-def upload_presets(**options):
-    uri = ["upload_presets"]
-    return call_api("get", uri, only(options, "next_cursor", "max_results"), **options)
-
-
-def upload_preset(name, **options):
-    uri = ["upload_presets", name]
-    return call_api("get", uri, only(options, "max_results"), **options)
-
-
-def delete_upload_preset(name, **options):
-    uri = ["upload_presets", name]
-    return call_api("delete", uri, {}, **options)
-
-
-def update_upload_preset(name, **options):
-    uri = ["upload_presets", name]
-    params = utils.build_upload_params(**options)
-    params = utils.cleanup_params(params)
-    params.update(only(options, "unsigned", "disallow_public_id", "live"))
-    return call_api("put", uri, params, **options)
-
-
-def create_upload_preset(**options):
-    uri = ["upload_presets"]
-    params = utils.build_upload_params(**options)
-    params = utils.cleanup_params(params)
-    params.update(only(options, "unsigned", "disallow_public_id", "name", "live"))
-    return call_api("post", uri, params, **options)
-
-
-def root_folders(**options):
-    return call_api("get", ["folders"], only(options, "next_cursor", "max_results"), **options)
-
-
-def subfolders(of_folder_path, **options):
-    return call_api("get", ["folders", of_folder_path], only(options, "next_cursor", "max_results"), **options)
-
-
-def create_folder(path, **options):
-    return call_api("post", ["folders", path], {}, **options)
-
-
-def rename_folder(from_path, to_path, **options):
-    """
-    Renames folder
-
-    :param from_path: The full path of an existing asset folder.
-    :param to_path:   The full path of the new asset folder.
-    :param options:   Additional options
-
-    :rtype: Response
-    """
-    params = {"to_folder": to_path}
-    return call_api("put", ["folders", from_path], params, **options)
-
-
-def delete_folder(path, **options):
-    """Deletes folder
-
-    Deleted folder must be empty, but can have descendant empty sub folders
-
-    :param path: The folder to delete
-    :param options: Additional options
-
-    :rtype: Response
-    """
-
-    params = only(options, "skip_backup")
-    return call_api("delete", ["folders", path], params, **options)
-
-
-def restore(public_ids, **options):
-    resource_type = options.pop("resource_type", "image")
-    upload_type = options.pop("type", "upload")
-    uri = ["resources", resource_type, upload_type, "restore"]
-    params = dict(public_ids=public_ids, **only(options, "versions"))
-    return call_json_api("post", uri, params, **options)
-
-
-def upload_mappings(**options):
-    uri = ["upload_mappings"]
-    return call_api("get", uri, only(options, "next_cursor", "max_results"), **options)
-
-
-def upload_mapping(name, **options):
-    uri = ["upload_mappings"]
-    params = dict(folder=name)
-    return call_api("get", uri, params, **options)
-
-
-def delete_upload_mapping(name, **options):
-    uri = ["upload_mappings"]
-    params = dict(folder=name)
-    return call_api("delete", uri, params, **options)
-
-
-def update_upload_mapping(name, **options):
-    uri = ["upload_mappings"]
-    params = dict(folder=name)
-    params.update(only(options, "template"))
-    return call_api("put", uri, params, **options)
-
-
-def create_upload_mapping(name, **options):
-    uri = ["upload_mappings"]
-    params = dict(folder=name)
-    params.update(only(options, "template"))
-    return call_api("post", uri, params, **options)
-
-
-def list_streaming_profiles(**options):
-    uri = ["streaming_profiles"]
-    return call_api('GET', uri, {}, **options)
-
-
-def get_streaming_profile(name, **options):
-    uri = ["streaming_profiles", name]
-    return call_api('GET', uri, {}, **options)
-
-
-def delete_streaming_profile(name, **options):
-    uri = ["streaming_profiles", name]
-    return call_api('DELETE', uri, {}, **options)
-
-
-def create_streaming_profile(name, **options):
-    uri = ["streaming_profiles"]
-    params = __prepare_streaming_profile_params(**options)
-    params["name"] = name
-    return call_api('POST', uri, params, **options)
-
-
-def update_streaming_profile(name, **options):
-    uri = ["streaming_profiles", name]
-    params = __prepare_streaming_profile_params(**options)
-    return call_api('PUT', uri, params, **options)
-
-
-def only(source, *keys):
-    return {key: source[key] for key in keys if key in source}
-
-
-def transformation_string(transformation):
-    if isinstance(transformation, string_types):
-        return transformation
-    else:
-        return cloudinary.utils.generate_transformation_string(**transformation)[0]
-
-
-def __prepare_streaming_profile_params(**options):
-    params = only(options, "display_name")
-    if "representations" in options:
-        representations = [{"transformation": transformation_string(trans)}
-                           for trans in options["representations"]]
-        params["representations"] = json.dumps(representations)
-    return params
-
-
-def __delete_resource_params(options, **params):
-    p = dict(transformations=utils.build_eager(options.get('transformations')),
-             **only(options, "keep_original", "next_cursor", "invalidate"))
-    p.update(params)
-    return p
-
-
-def list_metadata_fields(**options):
-    """Returns a list of all metadata field definitions
-
-    See: `Get metadata fields API reference <https://cloudinary.com/documentation/admin_api#get_metadata_fields>`_
-
-    :param options: Additional options
-
-    :rtype: Response
-    """
-    return call_metadata_api("get", [], {}, **options)
-
-
-def metadata_field_by_field_id(field_external_id, **options):
-    """Gets a metadata field by external id
-
-    See: `Get metadata field by external ID API reference
-    <https://cloudinary.com/documentation/admin_api#get_a_metadata_field_by_external_id>`_
-
-    :param field_external_id: The ID of the metadata field to retrieve
-    :param options: Additional options
-
-    :rtype: Response
-    """
-    uri = [field_external_id]
-    return call_metadata_api("get", uri, {}, **options)
-
-
-def add_metadata_field(field, **options):
-    """Creates a new metadata field definition
-
-    See: `Create metadata field API reference <https://cloudinary.com/documentation/admin_api#create_a_metadata_field>`_
-
-    :param field: The field to add
-    :param options: Additional options
-
-    :rtype: Response
-    """
-
-    return call_metadata_api("post", [], __metadata_field_params(field), **options)
-
-
-def update_metadata_field(field_external_id, field, **options):
-    """Updates a metadata field by external id
-
-    Updates a metadata field definition (partially, no need to pass the entire
-    object) passed as JSON data.
-
-    See `Generic structure of a metadata field
-    <https://cloudinary.com/documentation/admin_api#generic_structure_of_a_metadata_field>`_ for details.
-
-    :param field_external_id: The id of the metadata field to update
-    :param field: The field definition
-    :param options: Additional options
-
-    :rtype: Response
-    """
-    uri = [field_external_id]
-
-    return call_metadata_api("put", uri, __metadata_field_params(field), **options)
-
-
-def __metadata_field_params(field):
-    return only(field, "type", "external_id", "label", "mandatory", "restrictions",
-                "default_value", "default_disabled", "validation", "datasource")
-
-
-def delete_metadata_field(field_external_id, **options):
-    """Deletes a metadata field definition.
-    The field should no longer be considered a valid candidate for all other endpoints
-
-    See: `Delete metadata field API reference
-    <https://cloudinary.com/documentation/admin_api#delete_a_metadata_field_by_external_id>`_
-
-    :param field_external_id: The external id of the field to delete
-    :param options: Additional options
-
-    :return: An array with a "message" key. "ok" value indicates a successful deletion.
-    :rtype: Response
-    """
-    uri = [field_external_id]
-    return call_metadata_api("delete", uri, {}, **options)
-
-
-def delete_datasource_entries(field_external_id, entries_external_id, **options):
-    """Deletes entries in a metadata field datasource
-
-    Deletes (blocks) the datasource entries for a specified metadata field
-    definition. Sets the state of the entries to inactive. This is a soft delete,
-    the entries still exist under the hood and can be activated again with the
-    restore datasource entries method.
-
-    See: `Delete entries in a metadata field datasource API reference
-    <https://cloudinary.com/documentation/admin_api#delete_entries_in_a_metadata_field_datasource>`_
-
-    :param field_external_id: The id of the field to update
-    :param  entries_external_id: The ids of all the entries to delete from the
-                                 datasource
-    :param options: Additional options
-
-    :rtype: Response
-    """
-    uri = [field_external_id, "datasource"]
-    params = {"external_ids": entries_external_id}
-    return call_metadata_api("delete", uri, params, **options)
-
-
-def update_metadata_field_datasource(field_external_id, entries_external_id, **options):
-    """Updates a metadata field datasource
-
-    Updates the datasource of a supported field type (currently only enum and set),
-    passed as JSON data. The update is partial: datasource entries with an
-    existing external_id will be updated and entries with new external_id's (or
-    without external_id's) will be appended.
-
-    See: `Update a metadata field datasource API reference
-    <https://cloudinary.com/documentation/admin_api#update_a_metadata_field_datasource>`_
-
-    :param field_external_id: The external id of the field to update
-    :param entries_external_id:
-    :param options: Additional options
-
-    :rtype: Response
-    """
-    values = []
-    for item in entries_external_id:
-        external = only(item, "external_id", "value")
-        if external:
-            values.append(external)
-
-    uri = [field_external_id, "datasource"]
-    params = {"values": values}
-    return call_metadata_api("put", uri, params, **options)
-
-
-def restore_metadata_field_datasource(field_external_id, entries_external_ids, **options):
-    """Restores entries in a metadata field datasource
-
-    Restores (unblocks) any previously deleted datasource entries for a specified
-    metadata field definition.
-    Sets the state of the entries to active.
-
-    See: `Restore entries in a metadata field datasource API reference
-    <https://cloudinary.com/documentation/admin_api#restore_entries_in_a_metadata_field_datasource>`_
-
-    :param field_external_id: The ID of the metadata field
-    :param entries_external_ids: An array of IDs of datasource entries to restore
-                                 (unblock)
-    :param options: Additional options
-
-    :rtype: Response
-    """
-    uri = [field_external_id, 'datasource_restore']
-    params = {"external_ids": entries_external_ids}
-    return call_metadata_api("post", uri, params, **options)
-
-
-def reorder_metadata_field_datasource(field_external_id, order_by, direction=None, **options):
-    """Reorders metadata field datasource. Currently, supports only value.
-
-    :param field_external_id: The ID of the metadata field.
-    :param order_by: Criteria for the order. Currently, supports only value.
-    :param direction: Optional (gets either asc or desc).
-    :param options: Additional options.
-
-    :rtype: Response
-    """
-    uri = [field_external_id, 'datasource', 'order']
-    params = {'order_by': order_by, 'direction': direction}
-    return call_metadata_api('post', uri, params, **options)
-
-
-def reorder_metadata_fields(order_by, direction=None, **options):
-    """Reorders metadata fields.
-
-    :param order_by: Criteria for the order (one of the fields 'label', 'external_id', 'created_at').
-    :param direction: Optional (gets either asc or desc).
-    :param options: Additional options.
-
-    :rtype: Response
-    """
-    uri = ['order']
-    params = {'order_by': order_by, 'direction': direction}
-    return call_metadata_api('put', uri, params, **options)
-
-
-def analyze(input_type, analysis_type, uri=None, **options):
-    """Analyzes an asset with the requested analysis type.
-
-    :param input_type: The type of input for the asset to analyze ('uri').
-    :param analysis_type: The type of analysis to run ('google_tagging', 'captioning', 'fashion').
-    :param uri: The URI of the asset to analyze.
-    :param options: Additional options.
-
-    :rtype: Response
-    """
-    api_uri = ['analysis', 'analyze', input_type]
-    params = {'analysis_type': analysis_type, 'uri': uri, 'parameters': options.get("parameters")}
-    return _call_v2_api('post', api_uri, params, **options)
diff --git a/lib/cloudinary/api_client/__init__.py b/lib/cloudinary/api_client/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/cloudinary/api_client/call_account_api.py b/lib/cloudinary/api_client/call_account_api.py
deleted file mode 100644
index 5a6cf3ab..00000000
--- a/lib/cloudinary/api_client/call_account_api.py
+++ /dev/null
@@ -1,34 +0,0 @@
-import cloudinary
-from cloudinary.api_client.execute_request import execute_request
-from cloudinary.provisioning.account_config import account_config
-from cloudinary.utils import get_http_connector, normalize_params
-
-PROVISIONING_SUB_PATH = "provisioning"
-ACCOUNT_SUB_PATH = "accounts"
-_http = get_http_connector(account_config(), cloudinary.CERT_KWARGS)
-
-
-def _call_account_api(method, uri, params=None, headers=None, **options):
-    prefix = options.pop("upload_prefix",
-                         cloudinary.config().upload_prefix) or "https://api.cloudinary.com"
-    account_id = options.pop("account_id", account_config().account_id)
-    if not account_id:
-        raise Exception("Must supply account_id")
-    provisioning_api_key = options.pop("provisioning_api_key", account_config().provisioning_api_key)
-    if not provisioning_api_key:
-        raise Exception("Must supply provisioning_api_key")
-    provisioning_api_secret = options.pop("provisioning_api_secret",
-                                          account_config().provisioning_api_secret)
-    if not provisioning_api_secret:
-        raise Exception("Must supply provisioning_api_secret")
-    provisioning_api_url = "/".join(
-        [prefix, cloudinary.API_VERSION, PROVISIONING_SUB_PATH, ACCOUNT_SUB_PATH, account_id] + uri)
-    auth = {"key": provisioning_api_key, "secret": provisioning_api_secret}
-
-    return execute_request(http_connector=_http,
-                           method=method,
-                           params=normalize_params(params),
-                           headers=headers,
-                           auth=auth,
-                           api_url=provisioning_api_url,
-                           **options)
diff --git a/lib/cloudinary/api_client/call_api.py b/lib/cloudinary/api_client/call_api.py
deleted file mode 100644
index 94a3c9ec..00000000
--- a/lib/cloudinary/api_client/call_api.py
+++ /dev/null
@@ -1,77 +0,0 @@
-import json
-
-import cloudinary
-from cloudinary.api_client.execute_request import execute_request
-from cloudinary.utils import get_http_connector, normalize_params
-
-logger = cloudinary.logger
-_http = get_http_connector(cloudinary.config(), cloudinary.CERT_KWARGS)
-
-
-def call_metadata_api(method, uri, params, **options):
-    """Private function that assists with performing an API call to the
-    metadata_fields part of the Admin API
-    :param method: The HTTP method. Valid methods: get, post, put, delete
-    :param uri: REST endpoint of the API (without 'metadata_fields')
-    :param params: Query/body parameters passed to the method
-    :param options: Additional options
-    :rtype: Response
-    """
-    uri = ["metadata_fields"] + (uri or [])
-    return call_json_api(method, uri, params, **options)
-
-
-def call_json_api(method, uri, json_body, **options):
-    data = json.dumps(json_body).encode('utf-8')
-    return _call_api(method, uri, body=data, headers={'Content-Type': 'application/json'}, **options)
-
-
-def _call_v2_api(method, uri, json_body, **options):
-    return call_json_api(method, uri, json_body=json_body, api_version='v2', **options)
-
-
-def call_api(method, uri, params, **options):
-    return _call_api(method, uri, params=params, **options)
-
-
-def _call_api(method, uri, params=None, body=None, headers=None, extra_headers=None, **options):
-    prefix = options.pop("upload_prefix",
-                         cloudinary.config().upload_prefix) or "https://api.cloudinary.com"
-    cloud_name = options.pop("cloud_name", cloudinary.config().cloud_name)
-    if not cloud_name:
-        raise Exception("Must supply cloud_name")
-
-    api_key = options.pop("api_key", cloudinary.config().api_key)
-    api_secret = options.pop("api_secret", cloudinary.config().api_secret)
-    oauth_token = options.pop("oauth_token", cloudinary.config().oauth_token)
-
-    _validate_authorization(api_key, api_secret, oauth_token)
-    auth = {"key": api_key, "secret": api_secret, "oauth_token": oauth_token}
-
-    api_version = options.pop("api_version",  cloudinary.API_VERSION)
-    api_url = "/".join([prefix, api_version, cloud_name] + uri)
-
-    if body is not None:
-        options["body"] = body
-
-    if extra_headers is not None:
-        headers.update(extra_headers)
-
-    return execute_request(http_connector=_http,
-                           method=method,
-                           params=normalize_params(params),
-                           headers=headers,
-                           auth=auth,
-                           api_url=api_url,
-                           **options)
-
-
-def _validate_authorization(api_key, api_secret, oauth_token):
-    if oauth_token:
-        return
-
-    if not api_key:
-        raise Exception("Must supply api_key")
-
-    if not api_secret:
-        raise Exception("Must supply api_secret")
diff --git a/lib/cloudinary/api_client/execute_request.py b/lib/cloudinary/api_client/execute_request.py
deleted file mode 100644
index 97aba8cb..00000000
--- a/lib/cloudinary/api_client/execute_request.py
+++ /dev/null
@@ -1,85 +0,0 @@
-import email.utils
-import json
-import socket
-
-import urllib3
-from urllib3.exceptions import HTTPError
-
-import cloudinary
-from cloudinary.exceptions import (
-    BadRequest,
-    AuthorizationRequired,
-    NotAllowed,
-    NotFound,
-    AlreadyExists,
-    RateLimited,
-    GeneralError
-)
-from cloudinary.utils import process_params, safe_cast, smart_escape, unquote
-
-EXCEPTION_CODES = {
-    400: BadRequest,
-    401: AuthorizationRequired,
-    403: NotAllowed,
-    404: NotFound,
-    409: AlreadyExists,
-    420: RateLimited,
-    500: GeneralError
-}
-
-
-class Response(dict):
-    def __init__(self, result, response, **kwargs):
-        super(Response, self).__init__(**kwargs)
-        self.update(result)
-
-        self.rate_limit_allowed = safe_cast(response.headers.get("x-featureratelimit-limit"), int)
-        self.rate_limit_reset_at = safe_cast(response.headers.get("x-featureratelimit-reset"), email.utils.parsedate)
-        self.rate_limit_remaining = safe_cast(response.headers.get("x-featureratelimit-remaining"), int)
-
-
-def execute_request(http_connector, method, params, headers, auth, api_url, **options):
-    # authentication
-    key = auth.get("key")
-    secret = auth.get("secret")
-    oauth_token = auth.get("oauth_token")
-    req_headers = urllib3.make_headers(
-        user_agent=cloudinary.get_user_agent()
-    )
-    if oauth_token:
-        req_headers["authorization"] = "Bearer {}".format(oauth_token)
-    else:
-        req_headers.update(urllib3.make_headers(basic_auth="{0}:{1}".format(key, secret)))
-
-    if headers is not None:
-        req_headers.update(headers)
-
-    kw = {}
-    if "timeout" in options:
-        kw["timeout"] = options["timeout"]
-    if "body" in options:
-        kw["body"] = options["body"]
-
-    processed_params = process_params(params)
-
-    api_url = smart_escape(unquote(api_url))
-    try:
-        response = http_connector.request(method=method.upper(), url=api_url, fields=processed_params, headers=req_headers, **kw)
-        body = response.data
-    except HTTPError as e:
-        raise GeneralError("Unexpected error %s" % str(e))
-    except socket.error as e:
-        raise GeneralError("Socket Error: %s" % str(e))
-
-    try:
-        result = json.loads(body.decode('utf-8'))
-    except Exception as e:
-        # Error is parsing json
-        raise GeneralError("Error parsing server response (%d) - %s. Got - %s" % (response.status, body, e))
-
-    if "error" in result:
-        exception_class = EXCEPTION_CODES.get(response.status) or Exception
-        exception_class = exception_class
-        raise exception_class("Error {0} - {1}".format(response.status, result["error"]["message"]))
-
-    return Response(result, response)
diff --git a/lib/cloudinary/api_client/tcp_keep_alive_manager.py b/lib/cloudinary/api_client/tcp_keep_alive_manager.py
deleted file mode 100644
index b2c7b75f..00000000
--- a/lib/cloudinary/api_client/tcp_keep_alive_manager.py
+++ /dev/null
@@ -1,119 +0,0 @@
-import socket
-import sys
-
-from urllib3 import HTTPSConnectionPool, HTTPConnectionPool, PoolManager, ProxyManager
-
-# Inspired by:
-# https://github.com/finbourne/lusid-sdk-python/blob/b813882e4f1777ea78670a03a7596486639e6f40/sdk/lusid/tcp/tcp_keep_alive_probes.py
-
-# The content to send on Mac OS in the TCP Keep Alive probe
-TCP_KEEPALIVE = 0x10
-# The maximum time to keep the connection idle before sending probes
-TCP_KEEP_IDLE = 60
-# The interval between probes
-TCP_KEEPALIVE_INTERVAL = 60
-# The maximum number of failed probes before terminating the connection
-TCP_KEEP_CNT = 3
-
-
-class TCPKeepAliveValidationMethods:
-    """
-    This class contains a single method whose sole purpose is to set up TCP Keep Alive probes on the socket for a
-    connection. This is necessary for long-running requests which will be silently terminated by the AWS Network Load
-    Balancer which kills a connection if it is idle for more than 350 seconds.
-    """
-
-    @staticmethod
-    def adjust_connection_socket(conn, protocol="https"):
-        """
-        Adjusts the socket settings so that the client sends a TCP keep alive probe over the connection. This is only
-        applied where possible, if the ability to set the socket options is not available, for example using Anaconda,
-        then the settings will be left as is.
-        :param conn: The connection to update the socket settings for
-        :param str protocol: The protocol of the connection
-        :return: None
-        """
-
-        if protocol == "http":
-            # It isn't clear how to set this up over HTTP, it seems to differ from HTTPs
-            return
-
-        # TCP Keep Alive Probes for different platforms
-        platform = sys.platform
-        # TCP Keep Alive Probes for Linux
-        if (platform == 'linux' and hasattr(conn.sock, "setsockopt") and hasattr(socket, "SO_KEEPALIVE") and
-                hasattr(socket, "TCP_KEEPIDLE") and hasattr(socket, "TCP_KEEPINTVL") and hasattr(socket,
-                                                                                                 "TCP_KEEPCNT")):
-            conn.sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
-            conn.sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPIDLE, TCP_KEEP_IDLE)
-            conn.sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPINTVL, TCP_KEEPALIVE_INTERVAL)
-            conn.sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_KEEPCNT, TCP_KEEP_CNT)
-
-        # TCP Keep Alive Probes for Windows OS
-        elif platform == 'win32' and hasattr(socket, "SIO_KEEPALIVE_VALS") and getattr(conn.sock, "ioctl",
-                                                                                       None) is not None:
-            conn.sock.ioctl(socket.SIO_KEEPALIVE_VALS, (1, TCP_KEEP_IDLE * 1000, TCP_KEEPALIVE_INTERVAL * 1000))
-
-        # TCP Keep Alive Probes for Mac OS
-        elif platform == 'darwin' and getattr(conn.sock, "setsockopt", None) is not None:
-            conn.sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
-            conn.sock.setsockopt(socket.IPPROTO_TCP, TCP_KEEPALIVE, TCP_KEEPALIVE_INTERVAL)
-
-
-class TCPKeepAliveHTTPSConnectionPool(HTTPSConnectionPool):
-    """
-    This class overrides the _validate_conn method in the HTTPSConnectionPool class. This is the entry point to use
-    for modifying the socket as it is called after the socket is created and before the request is made.
-    """
-
-    def _validate_conn(self, conn):
-        """
-        Called right before a request is made, after the socket is created.
-        """
-        # Call the method on the base class
-        super(TCPKeepAliveHTTPSConnectionPool, self)._validate_conn(conn)
-
-        # Set up TCP Keep Alive probes, this is the only line added to this function
-        TCPKeepAliveValidationMethods.adjust_connection_socket(conn, "https")
-
-
-class TCPKeepAliveHTTPConnectionPool(HTTPConnectionPool):
-    """
-    This class overrides the _validate_conn method in the HTTPSConnectionPool class. This is the entry point to use
-    for modifying the socket as it is called after the socket is created and before the request is made.
-    In the base class this method is passed completely.
-    """
-
-    def _validate_conn(self, conn):
-        """
-        Called right before a request is made, after the socket is created.
-        """
-        # Call the method on the base class
-        super(TCPKeepAliveHTTPConnectionPool, self)._validate_conn(conn)
-
-        # Set up TCP Keep Alive probes, this is the only line added to this function
-        TCPKeepAliveValidationMethods.adjust_connection_socket(conn, "http")
-
-
-class TCPKeepAlivePoolManager(PoolManager):
-    """
-    This Pool Manager has only had the pool_classes_by_scheme variable changed. This now points at the TCPKeepAlive
-    connection pools rather than the default connection pools.
-    """
-
-    def __init__(self, num_pools=10, headers=None, **connection_pool_kw):
-        super(TCPKeepAlivePoolManager, self).__init__(num_pools=num_pools, headers=headers, **connection_pool_kw)
-        self.pool_classes_by_scheme = {"http": TCPKeepAliveHTTPConnectionPool, "https": TCPKeepAliveHTTPSConnectionPool}
-
-
-class TCPKeepAliveProxyManager(ProxyManager):
-    """
-    This Proxy Manager has only had the pool_classes_by_scheme variable changed. This now points at the TCPKeepAlive
-    connection pools rather than the default connection pools.
-    """
-
-    def __init__(self, proxy_url, num_pools=10, headers=None, proxy_headers=None, **connection_pool_kw):
-        super(TCPKeepAliveProxyManager, self).__init__(proxy_url=proxy_url, num_pools=num_pools, headers=headers,
-                                                       proxy_headers=proxy_headers,
-                                                       **connection_pool_kw)
-        self.pool_classes_by_scheme = {"http": TCPKeepAliveHTTPConnectionPool, "https": TCPKeepAliveHTTPSConnectionPool}
diff --git a/lib/cloudinary/auth_token.py b/lib/cloudinary/auth_token.py
deleted file mode 100644
index 8ddeacdf..00000000
--- a/lib/cloudinary/auth_token.py
+++ /dev/null
@@ -1,54 +0,0 @@
-import hashlib
-import hmac
-import re
-import time
-from binascii import a2b_hex
-
-
-AUTH_TOKEN_NAME = "__cld_token__"
-AUTH_TOKEN_SEPARATOR = "~"
-AUTH_TOKEN_UNSAFE_RE = r'([ "#%&\'\/:;<=>?@\[\\\]^`{\|}~]+)'
-
-
-def generate(url=None, acl=None, start_time=None, duration=None,
-             expiration=None, ip=None, key=None, token_name=AUTH_TOKEN_NAME, **_):
-
-    if expiration is None:
-        if duration is not None:
-            start = start_time if start_time is not None else int(time.time())
-            expiration = start + duration
-        else:
-            raise Exception("Must provide either expiration or duration")
-
-    if url is None and acl is None:
-        raise Exception("Must provide either acl or url")
-
-    token_parts = []
-    if ip is not None:
-        token_parts.append("ip=" + ip)
-    if start_time is not None:
-        token_parts.append("st=%d" % start_time)
-    token_parts.append("exp=%d" % expiration)
-    if acl is not None:
-        acl_list = acl if type(acl) is list else [acl]
-        acl_list = [_escape_to_lower(a) for a in acl_list] 
-        token_parts.append("acl=%s" % "!".join(acl_list))
-    to_sign = list(token_parts)
-    if url is not None and acl is None:
-        to_sign.append("url=%s" % _escape_to_lower(url))
-    auth = _digest(AUTH_TOKEN_SEPARATOR.join(to_sign), key)
-    token_parts.append("hmac=%s" % auth)
-    return "%(token_name)s=%(token)s" % {"token_name": token_name, "token": AUTH_TOKEN_SEPARATOR.join(token_parts)}
-
-
-def _digest(message, key):
-    bin_key = a2b_hex(key)
-    return hmac.new(bin_key, message.encode('utf-8'), hashlib.sha256).hexdigest()
-
-
-def _escape_to_lower(url):
-    # There is a circular import issue in this file, need to resolve it in the next major release
-    from cloudinary.utils import smart_escape
-    escaped_url = smart_escape(url, unsafe=AUTH_TOKEN_UNSAFE_RE)
-    escaped_url = re.sub(r"%[0-9A-F]{2}", lambda x: x.group(0).lower(), escaped_url)
-    return escaped_url
diff --git a/lib/cloudinary/cache/__init__.py b/lib/cloudinary/cache/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/cloudinary/cache/adapter/__init__.py b/lib/cloudinary/cache/adapter/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/cloudinary/cache/adapter/cache_adapter.py b/lib/cloudinary/cache/adapter/cache_adapter.py
deleted file mode 100644
index a8907d7c..00000000
--- a/lib/cloudinary/cache/adapter/cache_adapter.py
+++ /dev/null
@@ -1,63 +0,0 @@
-from abc import ABCMeta, abstractmethod
-
-
-class CacheAdapter:
-    """
-    CacheAdapter Abstract Base Class
-    """
-    __metaclass__ = ABCMeta
-
-    @abstractmethod
-    def get(self, public_id, type, resource_type, transformation, format):
-        """
-        Gets value specified by parameters
-
-        :param public_id:       The public ID of the resource
-        :param type:            The storage type
-        :param resource_type:   The type of the resource
-        :param transformation:  The transformation string
-        :param format:          The format of the resource
-
-        :return: None|mixed value, None if not found
-        """
-        raise NotImplementedError
-
-    @abstractmethod
-    def set(self, public_id, type, resource_type, transformation, format, value):
-        """
-        Sets value specified by parameters
-
-        :param public_id:       The public ID of the resource
-        :param type:            The storage type
-        :param resource_type:   The type of the resource
-        :param transformation:  The transformation string
-        :param format:          The format of the resource
-        :param value:           The value to set
-
-        :return: bool True on success or False on failure
-        """
-        raise NotImplementedError
-
-    @abstractmethod
-    def delete(self, public_id, type, resource_type, transformation, format):
-        """
-        Deletes entry specified by parameters
-
-        :param public_id:       The public ID of the resource
-        :param type:            The storage type
-        :param resource_type:   The type of the resource
-        :param transformation:  The transformation string
-        :param format:          The format of the resource
-
-        :return: bool True on success or False on failure
-        """
-        raise NotImplementedError
-
-    @abstractmethod
-    def flush_all(self):
-        """
-        Flushes all entries from cache
-
-        :return: bool True on success or False on failure
-        """
-        raise NotImplementedError
diff --git a/lib/cloudinary/cache/adapter/key_value_cache_adapter.py b/lib/cloudinary/cache/adapter/key_value_cache_adapter.py
deleted file mode 100644
index 5b74bf07..00000000
--- a/lib/cloudinary/cache/adapter/key_value_cache_adapter.py
+++ /dev/null
@@ -1,61 +0,0 @@
-import json
-from hashlib import sha1
-
-from cloudinary.cache.adapter.cache_adapter import CacheAdapter
-from cloudinary.cache.storage.key_value_storage import KeyValueStorage
-from cloudinary.utils import check_property_enabled
-
-
-class KeyValueCacheAdapter(CacheAdapter):
-    """
-    A cache adapter for a key-value storage type
-    """
-    def __init__(self, storage):
-        """Create a new adapter for the provided storage interface"""
-        if not isinstance(storage, KeyValueStorage):
-            raise ValueError("An instance of valid KeyValueStorage must be provided")
-
-        self._key_value_storage = storage
-
-    @property
-    def enabled(self):
-        return self._key_value_storage is not None
-
-    @check_property_enabled
-    def get(self, public_id, type, resource_type, transformation, format):
-        key = self.generate_cache_key(public_id, type, resource_type, transformation, format)
-        value_str = self._key_value_storage.get(key)
-        return json.loads(value_str) if value_str else value_str
-
-    @check_property_enabled
-    def set(self, public_id, type, resource_type, transformation, format, value):
-        key = self.generate_cache_key(public_id, type, resource_type, transformation, format)
-        return self._key_value_storage.set(key, json.dumps(value))
-
-    @check_property_enabled
-    def delete(self, public_id, type, resource_type, transformation, format):
-        return self._key_value_storage.delete(
-            self.generate_cache_key(public_id, type, resource_type, transformation, format)
-        )
-
-    @check_property_enabled
-    def flush_all(self):
-        return self._key_value_storage.clear()
-
-    @staticmethod
-    def generate_cache_key(public_id, type, resource_type, transformation, format):
-        """
-        Generates key-value storage key from parameters
-
-        :param public_id:       The public ID of the resource
-        :param type:            The storage type
-        :param resource_type:   The type of the resource
-        :param transformation:  The transformation string
-        :param format:          The format of the resource
-
-        :return: Resulting cache key
-        """
-
-        valid_params = [p for p in [public_id, type, resource_type, transformation, format] if p]
-
-        return sha1("/".join(valid_params).encode("utf-8")).hexdigest()
diff --git a/lib/cloudinary/cache/responsive_breakpoints_cache.py b/lib/cloudinary/cache/responsive_breakpoints_cache.py
deleted file mode 100644
index ac2c2d57..00000000
--- a/lib/cloudinary/cache/responsive_breakpoints_cache.py
+++ /dev/null
@@ -1,124 +0,0 @@
-import copy
-
-import collections
-
-import cloudinary
-from cloudinary.cache.adapter.cache_adapter import CacheAdapter
-from cloudinary.utils import check_property_enabled
-
-
-class ResponsiveBreakpointsCache:
-    """
-    Caches breakpoint values for image resources
-    """
-    def __init__(self, **cache_options):
-        """
-        Initialize the cache
-
-        :param cache_options: Cache configuration options
-        """
-
-        self._cache_adapter = None
-
-        cache_adapter = cache_options.get("cache_adapter")
-
-        self.set_cache_adapter(cache_adapter)
-
-    def set_cache_adapter(self, cache_adapter):
-        """
-        Assigns cache adapter
-
-        :param cache_adapter: The cache adapter used to store and retrieve values
-
-        :return: Returns True if the cache_adapter is valid
-        """
-        if cache_adapter is None or not isinstance(cache_adapter, CacheAdapter):
-            return False
-
-        self._cache_adapter = cache_adapter
-
-        return True
-
-    @property
-    def enabled(self):
-        """
-        Indicates whether cache is enabled or not
-
-        :return: Rrue if a _cache_adapter has been set
-        """
-        return self._cache_adapter is not None
-
-    @staticmethod
-    def _options_to_parameters(**options):
-        """
-        Extract the parameters required in order to calculate the key of the cache.
-
-        :param options: Input options
-
-        :return: A list of values used to calculate the cache key
-        """
-        options_copy = copy.deepcopy(options)
-        transformation, _ = cloudinary.utils.generate_transformation_string(**options_copy)
-        file_format = options.get("format", "")
-        storage_type = options.get("type", "upload")
-        resource_type = options.get("resource_type", "image")
-
-        return storage_type, resource_type, transformation, file_format
-
-    @check_property_enabled
-    def get(self, public_id, **options):
-        """
-        Retrieve the breakpoints of a particular derived resource identified by the public_id and options
-
-        :param public_id: The public ID of the resource
-        :param options: The public ID of the resource
-
-        :return: Array of responsive breakpoints, None if not found
-        """
-        params = self._options_to_parameters(**options)
-
-        return self._cache_adapter.get(public_id, *params)
-
-    @check_property_enabled
-    def set(self, public_id, value, **options):
-        """
-        Set responsive breakpoints identified by public ID and options
-
-        :param public_id: The public ID of the resource
-        :param value:  Array of responsive breakpoints to set
-        :param options: Additional options
-
-        :return: True on success or False on failure
-        """
-        if not (isinstance(value, (list, tuple))):
-            raise ValueError("A list of breakpoints is expected")
-
-        storage_type, resource_type, transformation, file_format = self._options_to_parameters(**options)
-
-        return self._cache_adapter.set(public_id, storage_type, resource_type, transformation, file_format, value)
-
-    @check_property_enabled
-    def delete(self, public_id, **options):
-        """
-        Delete responsive breakpoints identified by public ID and options
-
-        :param public_id: The public ID of the resource
-        :param options: Additional options
-
-        :return: True on success or False on failure
-        """
-        params = self._options_to_parameters(**options)
-
-        return self._cache_adapter.delete(public_id, *params)
-
-    @check_property_enabled
-    def flush_all(self):
-        """
-        Flush all entries from cache
-
-        :return: True on success or False on failure
-        """
-        return self._cache_adapter.flush_all()
-
-
-instance = ResponsiveBreakpointsCache()
diff --git a/lib/cloudinary/cache/storage/__init__.py b/lib/cloudinary/cache/storage/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/cloudinary/cache/storage/file_system_key_value_storage.py b/lib/cloudinary/cache/storage/file_system_key_value_storage.py
deleted file mode 100644
index 662d1aff..00000000
--- a/lib/cloudinary/cache/storage/file_system_key_value_storage.py
+++ /dev/null
@@ -1,79 +0,0 @@
-import glob
-from tempfile import gettempdir
-
-import os
-
-import errno
-
-from cloudinary.cache.storage.key_value_storage import KeyValueStorage
-
-
-class FileSystemKeyValueStorage(KeyValueStorage):
-    """File-based key-value storage"""
-    _item_ext = ".cldci"
-
-    def __init__(self, root_path):
-        """
-        Create a new Storage object.
-
-        All files will be stored under the root_path location
-
-        :param root_path: The base folder for all storage files
-        """
-        if root_path is None:
-            root_path = gettempdir()
-
-        if not os.path.isdir(root_path):
-            os.makedirs(root_path)
-
-        self._root_path = root_path
-
-    def get(self, key):
-        if not self._exists(key):
-            return None
-
-        with open(self._get_key_full_path(key), 'r') as f:
-            value = f.read()
-
-        return value
-
-    def set(self, key, value):
-        with open(self._get_key_full_path(key), 'w') as f:
-            f.write(value)
-
-        return True
-
-    def delete(self, key):
-        try:
-            os.remove(self._get_key_full_path(key))
-        except OSError as e:
-            if e.errno != errno.ENOENT:  # errno.ENOENT - no such file or directory
-                raise  # re-raise exception if a different error occurred
-
-        return True
-
-    def clear(self):
-        for cache_item_path in glob.iglob(os.path.join(self._root_path, '*' + self._item_ext)):
-            os.remove(cache_item_path)
-
-        return True
-
-    def _get_key_full_path(self, key):
-        """
-        Generate the file path for the key
-
-        :param key: The key
-
-        :return: The absolute path of the value file associated with the key
-        """
-        return os.path.join(self._root_path, key + self._item_ext)
-
-    def _exists(self, key):
-        """
-        Indicate whether key exists
-
-        :param key: The key
-
-        :return: bool True if the file for the given key exists
-        """
-        return os.path.isfile(self._get_key_full_path(key))
diff --git a/lib/cloudinary/cache/storage/key_value_storage.py b/lib/cloudinary/cache/storage/key_value_storage.py
deleted file mode 100644
index 2a4d07d8..00000000
--- a/lib/cloudinary/cache/storage/key_value_storage.py
+++ /dev/null
@@ -1,51 +0,0 @@
-from abc import ABCMeta, abstractmethod
-
-
-class KeyValueStorage:
-    """
-    A simple key-value storage abstract base class
-    """
-    __metaclass__ = ABCMeta
-
-    @abstractmethod
-    def get(self, key):
-        """
-        Get a value identified by the given key
-
-        :param key: The unique identifier
-
-        :return: The value identified by key or None if no value was found
-        """
-        raise NotImplementedError
-
-    @abstractmethod
-    def set(self, key, value):
-        """
-        Store the value identified by the key
-
-        :param key: The unique identifier
-        :param value: Value to store
-
-        :return: bool True on success or False on failure
-        """
-        raise NotImplementedError
-
-    @abstractmethod
-    def delete(self, key):
-        """
-        Deletes item by key
-
-        :param key: The unique identifier
-
-        :return: bool True on success or False on failure
-        """
-        raise NotImplementedError
-
-    @abstractmethod
-    def clear(self):
-        """
-        Clears all entries
-
-        :return: bool True on success or False on failure
-        """
-        raise NotImplementedError
diff --git a/lib/cloudinary/compat.py b/lib/cloudinary/compat.py
deleted file mode 100644
index 5b2b0689..00000000
--- a/lib/cloudinary/compat.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright Cloudinary
-import six.moves.urllib.parse
-from six import PY3, string_types, StringIO, BytesIO
-
-urlencode = six.moves.urllib.parse.urlencode
-unquote = six.moves.urllib.parse.unquote
-urlparse = six.moves.urllib.parse.urlparse
-parse_qs = six.moves.urllib.parse.parse_qs
-parse_qsl = six.moves.urllib.parse.parse_qsl
-quote_plus = six.moves.urllib.parse.quote_plus
-httplib = six.moves.http_client
-urllib2 = six.moves.urllib.request
-NotConnected = six.moves.http_client.NotConnected
-
-if PY3:
-    to_bytes = lambda s: s.encode('utf8')
-    to_bytearray = lambda s: bytearray(s, 'utf8')
-    to_string = lambda b: b.decode('utf8')
-
-else:
-    to_bytes = str
-    to_bytearray = str
-    to_string = str
-
-try:
-    cldrange = xrange
-except NameError:
-    def cldrange(*args, **kwargs):
-        return iter(range(*args, **kwargs))
-
-try:
-    advance_iterator = next
-except NameError:
-    def advance_iterator(it):
-        return it.next()
diff --git a/lib/cloudinary/exceptions.py b/lib/cloudinary/exceptions.py
deleted file mode 100644
index 6ed033bc..00000000
--- a/lib/cloudinary/exceptions.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright Cloudinary
-
-
-class Error(Exception):
-    pass
-
-
-class NotFound(Error):
-    pass
-
-
-class NotAllowed(Error):
-    pass
-
-
-class AlreadyExists(Error):
-    pass
-
-
-class RateLimited(Error):
-    pass
-
-
-class BadRequest(Error):
-    pass
-
-
-class GeneralError(Error):
-    pass
-
-
-class AuthorizationRequired(Error):
-    pass
diff --git a/lib/cloudinary/forms.py b/lib/cloudinary/forms.py
deleted file mode 100644
index 6c0ffaba..00000000
--- a/lib/cloudinary/forms.py
+++ /dev/null
@@ -1,142 +0,0 @@
-import json
-import re
-
-import cloudinary.uploader
-import cloudinary.utils
-from cloudinary import CloudinaryResource
-from django import forms
-from django.utils.translation import gettext_lazy as _
-
-
-def cl_init_js_callbacks(form, request):
-    for field in form.fields.values():
-        if isinstance(field, CloudinaryJsFileField):
-            field.enable_callback(request)
-
-
-class CloudinaryInput(forms.TextInput):
-    input_type = 'file'
-
-    def render(self, name, value, attrs=None, renderer=None):
-        attrs = dict(self.attrs, **attrs)
-        options = attrs.get('options', {})
-        attrs["options"] = ''
-
-        params = cloudinary.utils.build_upload_params(**options)
-        if options.get("unsigned"):
-            params = cloudinary.utils.cleanup_params(params)
-        else:
-            params = cloudinary.utils.sign_request(params, options)
-
-        if 'resource_type' not in options:
-            options['resource_type'] = 'auto'
-        cloudinary_upload_url = cloudinary.utils.cloudinary_api_url("upload", **options)
-
-        attrs["data-url"] = cloudinary_upload_url
-        attrs["data-form-data"] = json.dumps(params)
-        attrs["data-cloudinary-field"] = name
-        chunk_size = options.get("chunk_size", None)
-        if chunk_size:
-            attrs["data-max-chunk-size"] = chunk_size
-        attrs["class"] = " ".join(["cloudinary-fileupload", attrs.get("class", "")])
-
-        widget = super(CloudinaryInput, self).render("file", None, attrs=attrs)
-        if value:
-            if isinstance(value, CloudinaryResource):
-                value_string = value.get_presigned()
-            else:
-                value_string = value
-            widget += forms.HiddenInput().render(name, value_string)
-        return widget
-
-
-class CloudinaryJsFileField(forms.Field):
-    default_error_messages = {
-        "required": _("No file selected!")
-    }
-
-    def __init__(self, attrs=None, options=None, autosave=True, *args, **kwargs):
-        if attrs is None:
-            attrs = {}
-        if options is None:
-            options = {}
-        self.autosave = autosave
-        attrs = attrs.copy()
-        attrs["options"] = options.copy()
-
-        field_options = {'widget': CloudinaryInput(attrs=attrs)}
-        field_options.update(kwargs)
-        super(CloudinaryJsFileField, self).__init__(*args, **field_options)
-
-    def enable_callback(self, request):
-        from django.contrib.staticfiles.storage import staticfiles_storage
-        self.widget.attrs["options"]["callback"] = request.build_absolute_uri(
-            staticfiles_storage.url("html/cloudinary_cors.html"))
-
-    def to_python(self, value):
-        """Convert to CloudinaryResource"""
-        if not value:
-            return None
-        m = re.search(r'^([^/]+)/([^/]+)/v(\d+)/([^#]+)#([^/]+)$', value)
-        if not m:
-            raise forms.ValidationError("Invalid format")
-        resource_type = m.group(1)
-        upload_type = m.group(2)
-        version = m.group(3)
-        filename = m.group(4)
-        signature = m.group(5)
-        m = re.search(r'(.*)\.(.*)', filename)
-        if not m:
-            raise forms.ValidationError("Invalid file name")
-        public_id = m.group(1)
-        image_format = m.group(2)
-        return CloudinaryResource(public_id,
-                                  format=image_format,
-                                  version=version,
-                                  signature=signature,
-                                  type=upload_type,
-                                  resource_type=resource_type)
-
-    def validate(self, value):
-        """Validate the signature"""
-        # Use the parent's handling of required fields, etc.
-        super(CloudinaryJsFileField, self).validate(value)
-        if not value:
-            return
-        if not value.validate():
-            raise forms.ValidationError("Signature mismatch")
-
-
-class CloudinaryUnsignedJsFileField(CloudinaryJsFileField):
-    def __init__(self, upload_preset, attrs=None, options=None, autosave=True, *args, **kwargs):
-        if attrs is None:
-            attrs = {}
-        if options is None:
-            options = {}
-        options = options.copy()
-        options.update({"unsigned": True, "upload_preset": upload_preset})
-        super(CloudinaryUnsignedJsFileField, self).__init__(
-            attrs, options, autosave, *args, **kwargs)
-
-
-class CloudinaryFileField(forms.FileField):
-    my_default_error_messages = {
-        "required": _("No file selected!")
-    }
-    default_error_messages = forms.FileField.default_error_messages.copy()
-    default_error_messages.update(my_default_error_messages)
-
-    def __init__(self, options=None, autosave=True, *args, **kwargs):
-        self.autosave = autosave
-        self.options = options or {}
-        super(CloudinaryFileField, self).__init__(*args, **kwargs)
-
-    def to_python(self, value):
-        """Upload and convert to CloudinaryResource"""
-        value = super(CloudinaryFileField, self).to_python(value)
-        if not value:
-            return None
-        if self.autosave:
-            return cloudinary.uploader.upload_image(value, **self.options)
-        else:
-            return value
diff --git a/lib/cloudinary/http_client.py b/lib/cloudinary/http_client.py
deleted file mode 100644
index b5f6e1b3..00000000
--- a/lib/cloudinary/http_client.py
+++ /dev/null
@@ -1,43 +0,0 @@
-import json
-import socket
-
-import certifi
-from urllib3 import PoolManager
-from urllib3.exceptions import HTTPError
-
-from cloudinary.exceptions import GeneralError
-
-
-class HttpClient:
-    DEFAULT_HTTP_TIMEOUT = 60
-
-    def __init__(self, **options):
-        # Lazy initialization of the client, to improve performance when HttpClient is initialized but not used
-        self._http_client_instance = None
-        self.timeout = options.get("timeout", self.DEFAULT_HTTP_TIMEOUT)
-
-    @property
-    def _http_client(self):
-        if self._http_client_instance is None:
-            self._http_client_instance = PoolManager(cert_reqs='CERT_REQUIRED', ca_certs=certifi.where())
-        return self._http_client_instance
-
-    def get_json(self, url):
-        try:
-            response = self._http_client.request(method="GET", url=url, timeout=self.timeout)
-            body = response.data
-        except HTTPError as e:
-            raise GeneralError("Unexpected error %s" % str(e))
-        except socket.error as e:
-            raise GeneralError("Socket Error: %s" % str(e))
-
-        if response.status != 200:
-            raise GeneralError("Server returned unexpected status code - {} - {}".format(response.status,
-                                                                                         response.data))
-        try:
-            result = json.loads(body.decode('utf-8'))
-        except Exception as e:
-            # Error is parsing json
-            raise GeneralError("Error parsing server response (%d) - %s. Got - %s" % (response.status, body, e))
-
-        return result
diff --git a/lib/cloudinary/models.py b/lib/cloudinary/models.py
deleted file mode 100644
index 1240150e..00000000
--- a/lib/cloudinary/models.py
+++ /dev/null
@@ -1,135 +0,0 @@
-import re
-
-from cloudinary import CloudinaryResource, forms, uploader
-from django.core.files.uploadedfile import UploadedFile
-from django.db import models
-from cloudinary.uploader import upload_options
-from cloudinary.utils import upload_params
-
-# Add introspection rules for South, if it's installed.
-try:
-    from south.modelsinspector import add_introspection_rules
-    add_introspection_rules([], ["^cloudinary.models.CloudinaryField"])
-except ImportError:
-    pass
-
-CLOUDINARY_FIELD_DB_RE = r'(?:(?P<resource_type>image|raw|video)/' \
-                         r'(?P<type>upload|private|authenticated)/)?' \
-                         r'(?:v(?P<version>\d+)/)?' \
-                         r'(?P<public_id>.*?)' \
-                         r'(\.(?P<format>[^.]+))?$'
-
-
-def with_metaclass(meta, *bases):
-    """
-    Create a base class with a metaclass.
-
-    This requires a bit of explanation: the basic idea is to make a dummy
-    metaclass for one level of class instantiation that replaces itself with
-    the actual metaclass.
-
-    Taken from six - https://pythonhosted.org/six/
-    """
-    class metaclass(meta):
-        def __new__(cls, name, this_bases, d):
-            return meta(name, bases, d)
-    return type.__new__(metaclass, 'temporary_class', (), {})
-
-
-class CloudinaryField(models.Field):
-    description = "A resource stored in Cloudinary"
-
-    def __init__(self, *args, **kwargs):
-        self.default_form_class = kwargs.pop("default_form_class", forms.CloudinaryFileField)
-        self.type = kwargs.pop("type", "upload")
-        self.resource_type = kwargs.pop("resource_type", "image")
-        self.width_field = kwargs.pop("width_field", None)
-        self.height_field = kwargs.pop("height_field", None)
-        # Collect all options related to Cloudinary upload
-        self.options = {key: kwargs.pop(key) for key in set(kwargs.keys()) if key in upload_params + upload_options}
-
-        field_options = kwargs
-        field_options['max_length'] = 255
-        super(CloudinaryField, self).__init__(*args, **field_options)
-
-    def get_internal_type(self):
-        return 'CharField'
-
-    def value_to_string(self, obj):
-        """
-        We need to support both legacy `_get_val_from_obj` and new `value_from_object` models.Field methods.
-        It would be better to wrap it with try -> except AttributeError -> fallback to legacy.
-        Unfortunately, we can catch AttributeError exception from `value_from_object` function itself.
-        Parsing exception string is an overkill here, that's why we check for attribute existence
-
-        :param obj: Value to serialize
-
-        :return: Serialized value
-        """
-
-        if hasattr(self, 'value_from_object'):
-            value = self.value_from_object(obj)
-        else:  # fallback for legacy django versions
-            value = self._get_val_from_obj(obj)
-
-        return self.get_prep_value(value)
-
-    def parse_cloudinary_resource(self, value):
-        m = re.match(CLOUDINARY_FIELD_DB_RE, value)
-        resource_type = m.group('resource_type') or self.resource_type
-        upload_type = m.group('type') or self.type
-        return CloudinaryResource(
-            type=upload_type,
-            resource_type=resource_type,
-            version=m.group('version'),
-            public_id=m.group('public_id'),
-            format=m.group('format')
-        )
-
-    def from_db_value(self, value, expression, connection, *args, **kwargs):
-        # TODO: when dropping support for versions prior to 2.0, you may return
-        #   the signature to from_db_value(value, expression, connection)
-        if value is not None:
-            return self.parse_cloudinary_resource(value)
-
-    def to_python(self, value):
-        if isinstance(value, CloudinaryResource):
-            return value
-        elif isinstance(value, UploadedFile):
-            return value
-        elif value is None or value is False:
-            return value
-        else:
-            return self.parse_cloudinary_resource(value)
-
-    def pre_save(self, model_instance, add):
-        value = super(CloudinaryField, self).pre_save(model_instance, add)
-        if isinstance(value, UploadedFile):
-            options = {"type": self.type, "resource_type": self.resource_type}
-            options.update({key: val(model_instance) if callable(val) else val for key, val in self.options.items()})
-            if hasattr(value, 'seekable') and value.seekable():
-                value.seek(0)
-            instance_value = uploader.upload_resource(value, **options)
-            setattr(model_instance, self.attname, instance_value)
-            if self.width_field:
-                setattr(model_instance, self.width_field, instance_value.metadata.get('width'))
-            if self.height_field:
-                setattr(model_instance, self.height_field, instance_value.metadata.get('height'))
-            return self.get_prep_value(instance_value)
-        else:
-            return value
-
-    def get_prep_value(self, value):
-        if not value:
-            return self.get_default()
-        if isinstance(value, CloudinaryResource):
-            return value.get_prep_value()
-        else:
-            return value
-
-    def formfield(self, **kwargs):
-        options = {"type": self.type, "resource_type": self.resource_type}
-        options.update(kwargs.pop('options', {}))
-        defaults = {'form_class': self.default_form_class, 'options': options, 'autosave': False}
-        defaults.update(kwargs)
-        return super(CloudinaryField, self).formfield(**defaults)
diff --git a/lib/cloudinary/poster/__init__.py b/lib/cloudinary/poster/__init__.py
deleted file mode 100644
index 9359a53d..00000000
--- a/lib/cloudinary/poster/__init__.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# MIT licensed code copied from https://bitbucket.org/chrisatlee/poster
-#
-# Copyright (c) 2011 Chris AtLee
-#
-# 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.
-"""poster module
-
-Support for streaming HTTP uploads, and multipart/form-data encoding
-
-```poster.version``` is a 3-tuple of integers representing the version number.
-New releases of poster will always have a version number that compares greater
-than an older version of poster.
-New in version 0.6."""
-
-version = (0, 8, 2)  # Thanks JP!
diff --git a/lib/cloudinary/poster/encode.py b/lib/cloudinary/poster/encode.py
deleted file mode 100644
index 90ef3069..00000000
--- a/lib/cloudinary/poster/encode.py
+++ /dev/null
@@ -1,456 +0,0 @@
-# MIT licensed code copied from https://bitbucket.org/chrisatlee/poster
-"""multipart/form-data encoding module
-
-This module provides functions that faciliate encoding name/value pairs
-as multipart/form-data suitable for a HTTP POST or PUT request.
-
-multipart/form-data is the standard way to upload files over HTTP"""
-
-import mimetypes
-import os
-import re
-from email.header import Header
-
-from cloudinary.compat import (PY3, advance_iterator, quote_plus, to_bytearray,
-                               to_bytes, to_string)
-
-__all__ = [
-    'gen_boundary', 'encode_and_quote', 'MultipartParam', 'encode_string',
-    'encode_file_header', 'get_body_size', 'get_headers', 'multipart_encode']
-
-try:
-    from io import UnsupportedOperation
-except ImportError:
-    UnsupportedOperation = None
-
-try:
-    import uuid
-
-    def gen_boundary():
-        """Returns a random string to use as the boundary for a message"""
-        return uuid.uuid4().hex
-except ImportError:
-    import random
-    import sha
-
-    def gen_boundary():
-        """Returns a random string to use as the boundary for a message"""
-        bits = random.getrandbits(160)
-        return sha.new(str(bits)).hexdigest()
-
-if PY3:
-    def encode_and_quote(data):
-        if data is None:
-            return None
-        return quote_plus(to_bytes(data))
-
-else:
-    def encode_and_quote(data):
-        """If ``data`` is unicode, return quote_plus(data.encode("utf-8")) otherwise return quote_plus(data)"""
-        if data is None:
-            return None
-
-        if isinstance(data, unicode):
-            data = data.encode("utf-8")
-        return quote_plus(data)
-
-if PY3:
-    def _strify(s):
-        if s is None:
-            return None
-        elif isinstance(s, bytes):
-            return s
-        else:
-            try:
-                return to_bytes(s)
-            except AttributeError:
-                return to_bytes(str(s))
-else:
-    def _strify(s):
-        """If s is a unicode string, encode it to UTF-8 and return the results,
-        otherwise return str(s), or None if s is None"""
-        if s is None:
-            return None
-        if isinstance(s, unicode):
-            return s.encode("utf-8")
-        return str(s)
-
-
-class MultipartParam(object):
-    """Represents a single parameter in a multipart/form-data request
-
-    ``name`` is the name of this parameter.
-
-    If ``value`` is set, it must be a string or unicode object to use as the
-    data for this parameter.
-
-    If ``filename`` is set, it is what to say that this parameter's filename
-    is.  Note that this does not have to be the actual filename any local file.
-
-    If ``filetype`` is set, it is used as the Content-Type for this parameter.
-    If unset it defaults to "text/plain; charset=utf8"
-
-    If ``filesize`` is set, it specifies the length of the file ``fileobj``
-
-    If ``fileobj`` is set, it must be a file-like object that supports
-    .read().
-
-    Both ``value`` and ``fileobj`` must not be set, doing so will
-    raise a ValueError assertion.
-
-    If ``fileobj`` is set, and ``filesize`` is not specified, then
-    the file's size will be determined first by stat'ing ``fileobj``'s
-    file descriptor, and if that fails, by seeking to the end of the file,
-    recording the current position as the size, and then by seeking back to the
-    beginning of the file.
-
-    ``cb`` is a callable which will be called from iter_encode with (self,
-    current, total), representing the current parameter, current amount
-    transferred, and the total size.
-    """
-    def __init__(self, name, value=None, filename=None, filetype=None,
-                 filesize=None, fileobj=None, cb=None):
-        self.name = Header(name).encode()
-        self.value = _strify(value)
-        if filename is None:
-            self.filename = None
-        else:
-            if PY3:
-                byte_filename = filename.encode("ascii", "xmlcharrefreplace")
-                self.filename = to_string(byte_filename)
-                encoding = 'unicode_escape'
-            else:
-                if isinstance(filename, unicode):
-                    # Encode with XML entities
-                    self.filename = filename.encode("ascii", "xmlcharrefreplace")
-                else:
-                    self.filename = str(filename)
-                encoding = 'string_escape'
-            self.filename = self.filename.encode(encoding).replace(to_bytes('"'), to_bytes('\\"'))
-        self.filetype = _strify(filetype)
-
-        self.filesize = filesize
-        self.fileobj = fileobj
-        self.cb = cb
-
-        if self.value is not None and self.fileobj is not None:
-            raise ValueError("Only one of value or fileobj may be specified")
-
-        if fileobj is not None and filesize is None:
-            # Try and determine the file size
-            try:
-                self.filesize = os.fstat(fileobj.fileno()).st_size
-            except (OSError, AttributeError, UnsupportedOperation):
-                try:
-                    fileobj.seek(0, 2)
-                    self.filesize = fileobj.tell()
-                    fileobj.seek(0)
-                except Exception:
-                    raise ValueError("Could not determine filesize")
-
-    def __cmp__(self, other):
-        attrs = ['name', 'value', 'filename', 'filetype', 'filesize', 'fileobj']
-        myattrs = [getattr(self, a) for a in attrs]
-        oattrs = [getattr(other, a) for a in attrs]
-        return cmp(myattrs, oattrs)
-
-    def reset(self):
-        if self.fileobj is not None:
-            self.fileobj.seek(0)
-        elif self.value is None:
-            raise ValueError("Don't know how to reset this parameter")
-
-    @classmethod
-    def from_file(cls, paramname, filename):
-        """Returns a new MultipartParam object constructed from the local
-        file at ``filename``.
-
-        ``filesize`` is determined by os.path.getsize(``filename``)
-
-        ``filetype`` is determined by mimetypes.guess_type(``filename``)[0]
-
-        ``filename`` is set to os.path.basename(``filename``)
-        """
-
-        return cls(paramname, filename=os.path.basename(filename),
-                   filetype=mimetypes.guess_type(filename)[0],
-                   filesize=os.path.getsize(filename),
-                   fileobj=open(filename, "rb"))
-
-    @classmethod
-    def from_params(cls, params):
-        """Returns a list of MultipartParam objects from a sequence of
-        name, value pairs, MultipartParam instances,
-        or from a mapping of names to values
-
-        The values may be strings or file objects, or MultipartParam objects.
-        MultipartParam object names must match the given names in the
-        name,value pairs or mapping, if applicable."""
-        if hasattr(params, 'items'):
-            params = params.items()
-
-        retval = []
-        for item in params:
-            if isinstance(item, cls):
-                retval.append(item)
-                continue
-            name, value = item
-            if isinstance(value, cls):
-                assert value.name == name
-                retval.append(value)
-                continue
-            if hasattr(value, 'read'):
-                # Looks like a file object
-                filename = getattr(value, 'name', None)
-                if filename is not None:
-                    filetype = mimetypes.guess_type(filename)[0]
-                else:
-                    filetype = None
-
-                retval.append(cls(name=name, filename=filename,
-                                  filetype=filetype, fileobj=value))
-            else:
-                retval.append(cls(name, value))
-        return retval
-
-    def encode_hdr(self, boundary):
-        """Returns the header of the encoding of this parameter"""
-        boundary = encode_and_quote(boundary)
-
-        headers = ["--%s" % boundary]
-
-        if self.filename:
-            disposition = 'form-data; name="%s"; filename="%s"' % (
-                self.name, to_string(self.filename))
-        else:
-            disposition = 'form-data; name="%s"' % self.name
-
-        headers.append("Content-Disposition: %s" % disposition)
-
-        if self.filetype:
-            filetype = to_string(self.filetype)
-        else:
-            filetype = "text/plain; charset=utf-8"
-
-        headers.append("Content-Type: %s" % filetype)
-
-        headers.append("")
-        headers.append("")
-
-        return "\r\n".join(headers)
-
-    def encode(self, boundary):
-        """Returns the string encoding of this parameter"""
-        if self.value is None:
-            value = self.fileobj.read()
-        else:
-            value = self.value
-
-        if re.search(to_bytes("^--%s$" % re.escape(boundary)), value, re.M):
-            raise ValueError("boundary found in encoded string")
-
-        return to_bytes(self.encode_hdr(boundary)) + value + b"\r\n"
-
-    def iter_encode(self, boundary, blocksize=4096):
-        """Yields the encoding of this parameter
-        If self.fileobj is set, then blocks of ``blocksize`` bytes are read and
-        yielded."""
-        total = self.get_size(boundary)
-        current = 0
-        if self.value is not None:
-            block = self.encode(boundary)
-            current += len(block)
-            yield block
-            if self.cb:
-                self.cb(self, current, total)
-        else:
-            block = to_bytes(self.encode_hdr(boundary))
-            current += len(block)
-            yield block
-            if self.cb:
-                self.cb(self, current, total)
-            last_block = to_bytearray("")
-            encoded_boundary = "--%s" % encode_and_quote(boundary)
-            boundary_exp = re.compile(
-                to_bytes("^%s$" % re.escape(encoded_boundary)), re.M)
-            while True:
-                block = self.fileobj.read(blocksize)
-                if not block:
-                    current += 2
-                    yield to_bytes("\r\n")
-                    if self.cb:
-                        self.cb(self, current, total)
-                    break
-                last_block += block
-                if boundary_exp.search(last_block):
-                    raise ValueError("boundary found in file data")
-                last_block = last_block[-len(to_bytes(encoded_boundary))-2:]
-                current += len(block)
-                yield block
-                if self.cb:
-                    self.cb(self, current, total)
-
-    def get_size(self, boundary):
-        """Returns the size in bytes that this param will be when encoded
-        with the given boundary."""
-        if self.filesize is not None:
-            valuesize = self.filesize
-        else:
-            valuesize = len(self.value)
-
-        return len(self.encode_hdr(boundary)) + 2 + valuesize
-
-
-def encode_string(boundary, name, value):
-    """Returns ``name`` and ``value`` encoded as a multipart/form-data
-    variable.  ``boundary`` is the boundary string used throughout
-    a single request to separate variables."""
-
-    return MultipartParam(name, value).encode(boundary)
-
-
-def encode_file_header(boundary, paramname, filesize, filename=None, filetype=None):
-    """Returns the leading data for a multipart/form-data field that contains
-    file data.
-
-    ``boundary`` is the boundary string used throughout a single request to
-    separate variables.
-
-    ``paramname`` is the name of the variable in this request.
-
-    ``filesize`` is the size of the file data.
-
-    ``filename`` if specified is the filename to give to this field.  This
-    field is only useful to the server for determining the original filename.
-
-    ``filetype`` if specified is the MIME type of this file.
-
-    The actual file data should be sent after this header has been sent.
-    """
-
-    return MultipartParam(paramname, filesize=filesize, filename=filename,
-                          filetype=filetype).encode_hdr(boundary)
-
-
-def get_body_size(params, boundary):
-    """Returns the number of bytes that the multipart/form-data encoding
-    of ``params`` will be."""
-    size = sum(p.get_size(boundary) for p in MultipartParam.from_params(params))
-    return size + len(boundary) + 6
-
-
-def get_headers(params, boundary):
-    """Returns a dictionary with Content-Type and Content-Length headers
-    for the multipart/form-data encoding of ``params``."""
-    headers = {}
-    boundary = quote_plus(boundary)
-    headers['Content-Type'] = "multipart/form-data; boundary=%s" % boundary
-    headers['Content-Length'] = str(get_body_size(params, boundary))
-    return headers
-
-
-class multipart_yielder:
-    def __init__(self, params, boundary, cb):
-        self.params = params
-        self.boundary = boundary
-        self.cb = cb
-
-        self.i = 0
-        self.p = None
-        self.param_iter = None
-        self.current = 0
-        self.total = get_body_size(params, boundary)
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        return self.next()
-
-    def next(self):
-        """generator function to yield multipart/form-data representation
-        of parameters"""
-        if self.param_iter is not None:
-            try:
-                block = advance_iterator(self.param_iter)
-                self.current += len(block)
-                if self.cb:
-                    self.cb(self.p, self.current, self.total)
-                return block
-            except StopIteration:
-                self.p = None
-                self.param_iter = None
-
-        if self.i is None:
-            raise StopIteration
-        elif self.i >= len(self.params):
-            self.param_iter = None
-            self.p = None
-            self.i = None
-            block = to_bytes("--%s--\r\n" % self.boundary)
-            self.current += len(block)
-            if self.cb:
-                self.cb(self.p, self.current, self.total)
-            return block
-
-        self.p = self.params[self.i]
-        self.param_iter = self.p.iter_encode(self.boundary)
-        self.i += 1
-        return advance_iterator(self)
-
-    def reset(self):
-        self.i = 0
-        self.current = 0
-        for param in self.params:
-            param.reset()
-
-
-def multipart_encode(params, boundary=None, cb=None):
-    """Encode ``params`` as multipart/form-data.
-
-    ``params`` should be a sequence of (name, value) pairs or MultipartParam
-    objects, or a mapping of names to values.
-    Values are either strings parameter values, or file-like objects to use as
-    the parameter value.  The file-like objects must support .read() and either
-    .fileno() or both .seek() and .tell().
-
-    If ``boundary`` is set, then it as used as the MIME boundary.  Otherwise
-    a randomly generated boundary will be used.  In either case, if the
-    boundary string appears in the parameter values a ValueError will be
-    raised.
-
-    If ``cb`` is set, it should be a callback which will get called as blocks
-    of data are encoded.  It will be called with (param, current, total),
-    indicating the current parameter being encoded, the current amount encoded,
-    and the total amount to encode.
-
-    Returns a tuple of `datagen`, `headers`, where `datagen` is a
-    generator that will yield blocks of data that make up the encoded
-    parameters, and `headers` is a dictionary with the assoicated
-    Content-Type and Content-Length headers.
-
-    Examples:
-
-    >>> datagen, headers = multipart_encode( [("key", "value1"), ("key", "value2")] )
-    >>> s = "".join(datagen)
-    >>> assert "value2" in s and "value1" in s
-
-    >>> p = MultipartParam("key", "value2")
-    >>> datagen, headers = multipart_encode( [("key", "value1"), p] )
-    >>> s = "".join(datagen)
-    >>> assert "value2" in s and "value1" in s
-
-    >>> datagen, headers = multipart_encode( {"key": "value1"} )
-    >>> s = "".join(datagen)
-    >>> assert "value2" not in s and "value1" in s
-
-    """
-    if boundary is None:
-        boundary = gen_boundary()
-    else:
-        boundary = quote_plus(boundary)
-
-    headers = get_headers(params, boundary)
-    params = MultipartParam.from_params(params)
-
-    return multipart_yielder(params, boundary, cb), headers
diff --git a/lib/cloudinary/poster/streaminghttp.py b/lib/cloudinary/poster/streaminghttp.py
deleted file mode 100644
index f5713cc0..00000000
--- a/lib/cloudinary/poster/streaminghttp.py
+++ /dev/null
@@ -1,209 +0,0 @@
-# MIT licensed code copied from https://bitbucket.org/chrisatlee/poster
-"""Streaming HTTP uploads module.
-
-This module extends the standard httplib and urllib2 objects so that
-iterable objects can be used in the body of HTTP requests.
-
-In most cases all one should have to do is call :func:`register_openers()`
-to register the new streaming http handlers which will take priority over
-the default handlers, and then you can use iterable objects in the body
-of HTTP requests.
-
-**N.B.** You must specify a Content-Length header if using an iterable object
-since there is no way to determine in advance the total size that will be
-yielded, and there is no way to reset an interator.
-
-Example usage:
-
->>> from StringIO import StringIO
->>> import urllib2, poster.streaminghttp
-
->>> opener = poster.streaminghttp.register_openers()
-
->>> s = "Test file data"
->>> f = StringIO(s)
-
->>> req = urllib2.Request("http://localhost:5000", f,
-...                       {'Content-Length': str(len(s))})
-"""
-
-import socket
-import sys
-
-from cloudinary.compat import NotConnected, httplib, urllib2
-
-__all__ = ['StreamingHTTPConnection', 'StreamingHTTPRedirectHandler',
-           'StreamingHTTPHandler', 'register_openers']
-
-if hasattr(httplib, 'HTTPS'):
-    __all__.extend(['StreamingHTTPSHandler', 'StreamingHTTPSConnection'])
-
-
-class _StreamingHTTPMixin:
-    """Mixin class for HTTP and HTTPS connections that implements a streaming
-    send method."""
-    def send(self, value):
-        """Send ``value`` to the server.
-
-        ``value`` can be a string object, a file-like object that supports
-        a .read() method, or an iterable object that supports a .next()
-        method.
-        """
-        # Based on python 2.6's httplib.HTTPConnection.send()
-        if self.sock is None:
-            if self.auto_open:
-                self.connect()
-            else:
-                raise NotConnected()
-
-        # send the data to the server. if we get a broken pipe, then close
-        # the socket. we want to reconnect when somebody tries to send again.
-        #
-        # NOTE: we DO propagate the error, though, because we cannot simply
-        #       ignore the error... the caller will know if they can retry.
-        if self.debuglevel > 0:
-            print("send:", repr(value))
-        try:
-            blocksize = 8192
-            if hasattr(value, 'read'):
-                if hasattr(value, 'seek'):
-                    value.seek(0)
-                if self.debuglevel > 0:
-                    print("sendIng a read()able")
-                data = value.read(blocksize)
-                while data:
-                    self.sock.sendall(data)
-                    data = value.read(blocksize)
-            elif hasattr(value, 'next'):
-                if hasattr(value, 'reset'):
-                    value.reset()
-                if self.debuglevel > 0:
-                    print("sendIng an iterable")
-                for data in value:
-                    self.sock.sendall(data)
-            else:
-                self.sock.sendall(value)
-        except socket.error:
-            e = sys.exc_info()[1]
-            if e[0] == 32:      # Broken pipe
-                self.close()
-            raise
-
-
-class StreamingHTTPConnection(_StreamingHTTPMixin, httplib.HTTPConnection):
-    """Subclass of `httplib.HTTPConnection` that overrides the `send()` method
-    to support iterable body objects"""
-
-
-class StreamingHTTPRedirectHandler(urllib2.HTTPRedirectHandler):
-    """Subclass of `urllib2.HTTPRedirectHandler` that overrides the
-    `redirect_request` method to properly handle redirected POST requests
-
-    This class is required because python 2.5's HTTPRedirectHandler does
-    not remove the Content-Type or Content-Length headers when requesting
-    the new resource, but the body of the original request is not preserved.
-    """
-
-    handler_order = urllib2.HTTPRedirectHandler.handler_order - 1
-
-    # From python2.6 urllib2's HTTPRedirectHandler
-    def redirect_request(self, req, fp, code, msg, headers, newurl):
-        """Return a Request or None in response to a redirect.
-
-        This is called by the http_error_30x methods when a
-        redirection response is received.  If a redirection should
-        take place, return a new Request to allow http_error_30x to
-        perform the redirect.  Otherwise, raise HTTPError if no-one
-        else should try to handle this url.  Return None if you can't
-        but another Handler might.
-        """
-        m = req.get_method()
-        if (code in (301, 302, 303, 307) and m in ("GET", "HEAD")
-                or code in (301, 302, 303) and m == "POST"):
-            # Strictly (according to RFC 2616), 301 or 302 in response
-            # to a POST MUST NOT cause a redirection without confirmation
-            # from the user (of urllib2, in this case).  In practice,
-            # essentially all clients do redirect in this case, so we
-            # do the same.
-            # be conciliant with URIs containing a space
-            newurl = newurl.replace(' ', '%20')
-            newheaders = dict((k, v) for k, v in req.headers.items()
-                              if k.lower() not in (
-                                  "content-length", "content-type")
-                              )
-            return urllib2.Request(
-                newurl,
-                headers=newheaders,
-                origin_req_host=req.get_origin_req_host(),
-                unverifiable=True)
-        else:
-            raise urllib2.HTTPError(req.get_full_url(), code, msg, headers, fp)
-
-
-class StreamingHTTPHandler(urllib2.HTTPHandler):
-    """Subclass of `urllib2.HTTPHandler` that uses
-    StreamingHTTPConnection as its http connection class."""
-
-    handler_order = urllib2.HTTPHandler.handler_order - 1
-
-    def http_open(self, req):
-        """Open a StreamingHTTPConnection for the given request"""
-        return self.do_open(StreamingHTTPConnection, req)
-
-    def http_request(self, req):
-        """Handle a HTTP request.  Make sure that Content-Length is specified
-        if we're using an interable value"""
-        # Make sure that if we're using an iterable object as the request
-        # body, that we've also specified Content-Length
-        if req.has_data():
-            data = req.get_data()
-            if hasattr(data, 'read') or hasattr(data, 'next'):
-                if not req.has_header('Content-length'):
-                    raise ValueError(
-                            "No Content-Length specified for iterable body")
-        return urllib2.HTTPHandler.do_request_(self, req)
-
-
-if hasattr(httplib, 'HTTPS'):
-    class StreamingHTTPSConnection(_StreamingHTTPMixin, httplib.HTTPSConnection):
-        """Subclass of `httplib.HTTSConnection` that overrides the `send()`
-        method to support iterable body objects"""
-
-    class StreamingHTTPSHandler(urllib2.HTTPSHandler):
-        """Subclass of `urllib2.HTTPSHandler` that uses
-        StreamingHTTPSConnection as its http connection class."""
-
-        handler_order = urllib2.HTTPSHandler.handler_order - 1
-
-        def https_open(self, req):
-            return self.do_open(StreamingHTTPSConnection, req)
-
-        def https_request(self, req):
-            # Make sure that if we're using an iterable object as the request
-            # body, that we've also specified Content-Length
-            if req.has_data():
-                data = req.get_data()
-                if hasattr(data, 'read') or hasattr(data, 'next'):
-                    if not req.has_header('Content-length'):
-                        raise ValueError(
-                            "No Content-Length specified for iterable body")
-            return urllib2.HTTPSHandler.do_request_(self, req)
-
-
-def get_handlers():
-    handlers = [StreamingHTTPHandler, StreamingHTTPRedirectHandler]
-    if hasattr(httplib, "HTTPS"):
-        handlers.append(StreamingHTTPSHandler)
-    return handlers
-
-
-def register_openers():
-    """Register the streaming http handlers in the global urllib2 default
-    opener object.
-
-    Returns the created OpenerDirector object."""
-    opener = urllib2.build_opener(*get_handlers())
-
-    urllib2.install_opener(opener)
-
-    return opener
diff --git a/lib/cloudinary/provisioning/__init__.py b/lib/cloudinary/provisioning/__init__.py
deleted file mode 100644
index 7016343a..00000000
--- a/lib/cloudinary/provisioning/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .account_config import AccountConfig, account_config, reset_config
-from .account import (sub_accounts, create_sub_account, delete_sub_account, sub_account, update_sub_account,
-                      user_groups, create_user_group, update_user_group, delete_user_group, user_group,
-                      add_user_to_group, remove_user_from_group, user_group_users, user_in_user_groups,
-                      users, create_user, delete_user, user, update_user, access_keys, generate_access_key,
-                      update_access_key, delete_access_key, Role)
diff --git a/lib/cloudinary/provisioning/account.py b/lib/cloudinary/provisioning/account.py
deleted file mode 100644
index 90b1c385..00000000
--- a/lib/cloudinary/provisioning/account.py
+++ /dev/null
@@ -1,481 +0,0 @@
-from cloudinary.api_client.call_account_api import _call_account_api
-from cloudinary.utils import encode_list
-
-SUB_ACCOUNTS_SUB_PATH = "sub_accounts"
-USERS_SUB_PATH = "users"
-USER_GROUPS_SUB_PATH = "user_groups"
-ACCESS_KEYS = "access_keys"
-
-
-class Role(object):
-    """
-    A user role to use in the user management API (create/update user).
-    """
-    MASTER_ADMIN = "master_admin"
-    ADMIN = "admin"
-    BILLING = "billing"
-    TECHNICAL_ADMIN = "technical_admin"
-    REPORTS = "reports"
-    MEDIA_LIBRARY_ADMIN = "media_library_admin"
-    MEDIA_LIBRARY_USER = "media_library_user"
-
-
-def sub_accounts(enabled=None, ids=None, prefix=None, **options):
-    """
-    List all sub accounts
-    :param enabled:     Whether to only return enabled sub-accounts (true) or disabled accounts (false).
-                        Default: all accounts are returned (both enabled and disabled).
-    :type enabled:      bool, optional
-    :param ids:         List of sub-account IDs. Up to 100. When provided, other filters are ignored.
-    :type ids:          list, optional
-    :param prefix:      Search by prefix of the sub-account name. Case-insensitive.
-    :type prefix:       str, optional
-    :param options:     Generic advanced options dict, see online documentation
-    :type options:      dict, optional
-    :return:            A list of sub accounts
-    :rtype:             dict
-    """
-    uri = [SUB_ACCOUNTS_SUB_PATH]
-    params = {"ids": ids, "enabled": enabled, "prefix": prefix}
-    return _call_account_api("GET", uri, params=params, **options)
-
-
-def create_sub_account(name, cloud_name=None, custom_attributes=None, enabled=None,
-                       base_account=None, **options):
-    """
-    Create a new sub account
-    :param name:                Name of the new sub account
-    :type name:                 str
-    :param cloud_name:          A case-insensitive cloud name comprised of alphanumeric and underscore characters.
-                                * Generates an error if the cloud name is not unique across all Cloudinary accounts.
-    :type cloud_name:           str, optional
-    :param custom_attributes:   Any custom attributes you want to associate with the sub-account
-    :type custom_attributes:    dict, optional
-    :param enabled:             Whether to create the account as enabled (default is enabled).
-    :type enabled:              bool, optional
-    :param base_account:        ID of sub-account from which to copy settings
-    :type base_account:         str, optional
-    :param options:             Generic advanced options dict, see online documentation
-    :type options:              dict, optional
-    :return:                    The created sub account
-    :rtype:                     dict
-    """
-    uri = [SUB_ACCOUNTS_SUB_PATH]
-    params = {"name": name,
-              "cloud_name": cloud_name,
-              "custom_attributes": custom_attributes,
-              "enabled": enabled,
-              "base_sub_account_id": base_account}
-    return _call_account_api("POST", uri, params=params, **options)
-
-
-def delete_sub_account(sub_account_id, **options):
-    """
-    Delete a sub account
-    :param sub_account_id:      The id of the sub account
-    :type sub_account_id:       str
-    :param options:             Generic advanced options dict, see online documentation
-    :type options:              dict, optional
-    :return:                    Result message
-    :rtype:                     dict
-    """
-    uri = [SUB_ACCOUNTS_SUB_PATH, sub_account_id]
-    return _call_account_api("delete", uri, {}, **options)
-
-
-def sub_account(sub_account_id, **options):
-    """
-    Get information of a sub account
-    :param sub_account_id:      The id of the sub account
-    :type sub_account_id:       str
-    :param options:             Generic advanced options dict, see online documentation
-    :type options:              dict, optional
-    :return:                    A sub account
-    :rtype:                     dict
-    """
-    uri = [SUB_ACCOUNTS_SUB_PATH, sub_account_id]
-    return _call_account_api("get", uri, {}, **options)
-
-
-def update_sub_account(sub_account_id, name=None, cloud_name=None, custom_attributes=None, enabled=None, **options):
-    """
-    Update a sub account
-    :param sub_account_id:      The id of the sub account
-    :type sub_account_id:       str
-    :param name:                Name of the account
-    :type name:                 str, optional
-    :param cloud_name:          Unique cloud name
-    :type cloud_name:           str, optional
-    :param custom_attributes:   Any custom attributes you want to associate with the sub-account.
-    :type custom_attributes:    dict, optional
-    :param enabled:             Whether to create the account as enabled (default is enabled).
-    :type enabled:              bool, optional
-    :param options:             Generic advanced options dict, see online documentation
-    :type options:              dict, optional
-    :return:                    Updated sub account
-    :rtype:                     dict
-    """
-    uri = [SUB_ACCOUNTS_SUB_PATH, sub_account_id]
-    params = {"name": name,
-              "cloud_name": cloud_name,
-              "custom_attributes": custom_attributes,
-              "enabled": enabled}
-    return _call_account_api("put", uri, params=params, **options)
-
-
-def users(user_ids=None, sub_account_id=None, pending=None, prefix=None, last_login=None, from_date=None, to_date=None,
-          **options):
-    """
-    List all users
-    :param user_ids:        The ids of the users to fetch
-    :type user_ids:         list, optional
-    :param sub_account_id:  The id of a sub account
-    :type sub_account_id:   str, optional
-    :param pending:         Limit results to pending users (True),
-                            users that are not pending (False),
-                            or all users (None, the default).
-    :type pending:          bool, optional
-    :param prefix:          User prefix
-    :type prefix:           str, optional
-    :param last_login:      Return only users that last logged in in the specified range of dates (true), 
-                            users that didn't last logged in in that range (false), or all users (None).
-    :type last_login:       bool, optional
-    :param from_date:       Last login start date.
-    :type from_date:        datetime, optional
-    :param to_date:         Last login end date.
-    :type to_date:          datetime, optional
-    :param options:         Generic advanced options dict, see online documentation.
-    :type options:          dict, optional
-    :return:                List of users associated with the account
-    :rtype:                 dict
-    """
-    uri = [USERS_SUB_PATH]
-    user_ids = encode_list(user_ids)
-    params = {"ids": user_ids,
-              "sub_account_id": sub_account_id,
-              "pending": pending,
-              "prefix": prefix,
-              "last_login": last_login,
-              "from": from_date,
-              "to": to_date}
-    return _call_account_api("get", uri, params=params, **options)
-
-
-def create_user(name, email, role, sub_account_ids=None, **options):
-    """
-    Create a user
-    :param name:                Username
-    :type name:                 str
-    :param email:               User's email
-    :type email:                str
-    :param role:                User's role
-    :type role:                 str
-    :param sub_account_ids:     Optional. Sub accounts to associate with the user
-    :type sub_account_ids:      list, optional
-    :param options:             Generic advanced options dict, see online documentation.
-    :type options:              dict, optional
-    :return:                    Details of created user
-    :rtype:                     dict
-    """
-    uri = [USERS_SUB_PATH]
-    params = {"name": name,
-              "email": email,
-              "role": role,
-              "sub_account_ids": sub_account_ids}
-    return _call_account_api("post", uri, params=params, **options)
-
-
-def delete_user(user_id, **options):
-    """
-    Delete a user
-    :param user_id:             The id of user to delete
-    :type user_id:              str
-    :param options:             Generic advanced options dict, see online documentation.
-    :type options:              dict, optional
-    :return:                    Result message
-    :rtype:                     dict
-    """
-    uri = [USERS_SUB_PATH, user_id]
-    return _call_account_api("delete", uri, {}, **options)
-
-
-def user(user_id, **options):
-    """
-    Get information of a user
-    :param user_id:             The id of the user
-    :type user_id:              str
-    :param options:             Generic advanced options dict, see online documentation.
-    :type options:              dict, optional
-    :return:                    A user
-    :rtype:                     dict
-    """
-    uri = [USERS_SUB_PATH, user_id]
-    return _call_account_api("get", uri, {}, **options)
-
-
-def update_user(user_id, name=None, email=None, role=None, sub_account_ids=None, **options):
-    """
-    Update a user
-    :param user_id:             The id of the user to update
-    :type user_id:              str
-    :param name:                Username
-    :type name:                 str, optional
-    :param email:               User's email
-    :type email:                str, optional
-    :param role:                User's role
-    :type role:                 Role, optional
-    :param sub_account_ids:     The list of sub-account IDs that this user can access.
-                                Note: This parameter is ignored if the role is specified as master_admin.
-    :type sub_account_ids:      list, optional
-    :param options:             Generic advanced options dict, see online documentation.
-    :type options:              dict, optional
-    :return:                    The updated user
-    :rtype:                     dict
-    """
-    uri = [USERS_SUB_PATH, user_id]
-    params = {"name": name,
-              "email": email,
-              "role": role,
-              "sub_account_ids": sub_account_ids}
-    return _call_account_api("put", uri, params=params, **options)
-
-
-def user_groups(**options):
-    """
-    List all user groups
-    :param options:         Generic advanced options dict, see online documentation
-    :type options:          dict, optional
-    :return:                List of user groups
-    :rtype:                 ProvisioningAPIRespose
-    """
-    uri = [USER_GROUPS_SUB_PATH]
-    return _call_account_api("get", uri, {}, **options)
-
-
-def create_user_group(name, **options):
-    """
-    Create a new user group
-    :param name:            Name of the user group
-    :type name:             str
-    :param options:         Generic advanced options dict, see online documentation
-    :type options:          dict, optional
-    :return:                The newly created group
-    :rtype:                 dict
-    """
-    uri = [USER_GROUPS_SUB_PATH]
-    params = {"name": name}
-    return _call_account_api("post", uri, params, **options)
-
-
-def update_user_group(user_group_id, name, **options):
-    """
-    Update a user group
-    :param user_group_id:       The id of the user group to update
-    :type user_group_id:        str
-    :param name:                Name of the user group
-    :type name:                 str, optional
-    :param options:             Generic advanced options dict, see online documentation
-    :type options:              dict, optional
-    :return:                    The updated group
-    :rtype:                     dict
-    """
-    uri = [USER_GROUPS_SUB_PATH, user_group_id]
-    params = {"name": name}
-    return _call_account_api("put", uri, params, **options)
-
-
-def delete_user_group(user_group_id, **options):
-    """
-    Delete a user group
-    :param user_group_id:       The id of the user group to delete
-    :type user_group_id:        str
-    :param options:             Generic advanced options dict, see online documentation
-    :type options:              dict, optional
-    :return:                    The result message
-    :rtype:                     dict
-    """
-    uri = [USER_GROUPS_SUB_PATH, user_group_id]
-    return _call_account_api("delete", uri, {}, **options)
-
-
-def user_group(user_group_id, **options):
-    """
-    Get information of a user group
-    :param user_group_id:       The id of the user group
-    :type user_group_id:        str
-    :param options:             Generic advanced options dict, see online documentation
-    :type options:              dict, optional
-    :return:                    Details of the group
-    :rtype:                     dict
-    """
-    uri = [USER_GROUPS_SUB_PATH, user_group_id]
-    return _call_account_api("get", uri, {}, **options)
-
-
-def add_user_to_group(user_group_id, user_id, **options):
-    """
-    Add a user to a user group
-    :param user_group_id:       The id of the user group to add the user to
-    :type user_group_id:        str
-    :param user_id:             The user id to add
-    :type user_id:              str
-    :param options:             Generic advanced options dict, see online documentation
-    :type options:              dict, optional
-    :return:                    List of users in the group
-    :rtype:                     dict
-    """
-    uri = [USER_GROUPS_SUB_PATH, user_group_id, "users", user_id]
-    return _call_account_api("post", uri, {}, **options)
-
-
-def remove_user_from_group(user_group_id, user_id, **options):
-    """
-    Remove a user from a user group
-    :param user_group_id:       The id of the user group to remove the user from
-    :type user_group_id:        str
-    :param user_id:             The id of the user to remove
-    :type user_id:              str
-    :param options:             Generic advanced options dict, see online documentation
-    :type options:              dict, optional
-    :return:                    List of users in the group
-    :rtype:                     dict
-    """
-    uri = [USER_GROUPS_SUB_PATH, user_group_id, "users", user_id]
-    return _call_account_api("delete", uri, {}, **options)
-
-
-def user_group_users(user_group_id, **options):
-    """
-    Get all users in a user group
-    :param user_group_id:       The id of user group to get list of users
-    :type user_group_id:        str
-    :param options:             Generic advanced options dict, see online documentation
-    :type options:              dict, optional
-    :return:                    List of users in the group
-    :rtype:                     dict
-    """
-    uri = [USER_GROUPS_SUB_PATH, user_group_id, "users"]
-    return _call_account_api("get", uri, {}, **options)
-
-
-def user_in_user_groups(user_id, **options):
-    """
-    Get all user groups a user belongs to
-    :param user_id:             The id of user
-    :type user_id:              str
-    :param options:             Generic advanced options dict, see online documentation
-    :type options:              dict, optional
-    :return:                    List of groups user is in
-    :rtype:                     dict
-    """
-    uri = [USER_GROUPS_SUB_PATH, user_id]
-    return _call_account_api("get", uri, {}, **options)
-
-
-def access_keys(sub_account_id, page_size=None, page=None, sort_by=None, sort_order=None, **options):
-    """
-    Get sub account access keys.
-
-    :param sub_account_id:  The id of the sub account.
-    :type sub_account_id:   str
-    :param page_size:       How many entries to display on each page.
-    :type page_size:        int
-    :param page:            Which page to return (maximum pages: 100). **Default**: All pages are returned.
-    :type page:             int
-    :param sort_by:         Which response parameter to sort by.
-                                **Possible values**: `api_key`, `created_at`, `name`, `enabled`.
-    :type sort_by:          str
-    :param sort_order:      Control the order of returned keys. **Possible values**: `desc` (default), `asc`.
-    :type sort_order:       str
-    :param options:         Generic advanced options dict, see online documentation.
-    :type options:          dict, optional
-    :return:                List of access keys
-    :rtype:                 dict
-    """
-    uri = [SUB_ACCOUNTS_SUB_PATH, sub_account_id, ACCESS_KEYS]
-    params = {
-        "page_size": page_size,
-        "page": page,
-        "sort_by": sort_by,
-        "sort_order": sort_order,
-    }
-    return _call_account_api("get", uri, params, **options)
-
-
-def generate_access_key(sub_account_id, name=None, enabled=None, **options):
-    """
-    Generate a new access key.
-
-    :param sub_account_id:      The id of the sub account.
-    :type sub_account_id:       str
-    :param name:                The name of the new access key.
-    :type name:                 str
-    :param enabled:             Whether the new access key is enabled or disabled.
-    :type enabled:              bool
-    :param options:             Generic advanced options dict, see online documentation.
-    :type options:              dict, optional
-    :return:                    Access key details
-    :rtype:                     dict
-    """
-    uri = [SUB_ACCOUNTS_SUB_PATH, sub_account_id, ACCESS_KEYS]
-    params = {
-        "name": name,
-        "enabled": enabled,
-    }
-    return _call_account_api("post", uri, params, **options)
-
-
-def update_access_key(sub_account_id, api_key, name=None, enabled=None, dedicated_for=None, **options):
-    """
-    Update the name and/or status of an existing access key.
-
-    :param sub_account_id:      The id of the sub account.
-    :type sub_account_id:       str
-    :param api_key:             The API key of the access key.
-    :type api_key:              str|int
-    :param name:                The updated name of the access key.
-    :type name:                 str
-    :param enabled:             Enable or disable the access key.
-    :type enabled:              bool
-    :param dedicated_for:       Designates the access key for a specific purpose while allowing it to be used for
-                                other purposes, as well. This action replaces any previously assigned key.
-                                **Possible values**: `webhooks`
-    :type dedicated_for:        str
-    :param options:             Generic advanced options dict, see online documentation.
-    :type options:              dict, optional
-    :return:                    Access key details
-    :rtype:                     dict
-    """
-    uri = [SUB_ACCOUNTS_SUB_PATH, sub_account_id, ACCESS_KEYS, str(api_key)]
-    params = {
-        "name": name,
-        "enabled": enabled,
-        "dedicated_for": dedicated_for,
-    }
-    return _call_account_api("put", uri, params, **options)
-
-
-def delete_access_key(sub_account_id, api_key=None, name=None, **options):
-    """
-    Delete an existing access key by api_key or by name.
-
-    :param sub_account_id:      The id of the sub account.
-    :type sub_account_id:       str
-    :param api_key:             The API key of the access key.
-    :type api_key:              str|int
-    :param name:                The name of the access key.
-    :type name:                 str
-    :param options:             Generic advanced options dict, see online documentation.
-    :type options:              dict, optional
-    :return:                    Operation status.
-    :rtype:                     dict
-    """
-    uri = [SUB_ACCOUNTS_SUB_PATH, sub_account_id, ACCESS_KEYS]
-
-    if api_key is not None:
-        uri.append(str(api_key))
-
-    params = {
-        "name": name
-    }
-    return _call_account_api("delete", uri, params, **options)
diff --git a/lib/cloudinary/provisioning/account_config.py b/lib/cloudinary/provisioning/account_config.py
deleted file mode 100644
index 0448e60a..00000000
--- a/lib/cloudinary/provisioning/account_config.py
+++ /dev/null
@@ -1,42 +0,0 @@
-from __future__ import absolute_import
-
-import os
-
-from cloudinary import BaseConfig, import_django_settings
-
-ACCOUNT_URI_SCHEME = "account"
-
-
-class AccountConfig(BaseConfig):
-    def __init__(self):
-        self._uri_scheme = ACCOUNT_URI_SCHEME
-
-        super(AccountConfig, self).__init__()
-
-    def _config_from_parsed_url(self, parsed_url):
-        if not self._is_url_scheme_valid(parsed_url):
-            raise ValueError("Invalid CLOUDINARY_ACCOUNT_URL scheme. URL should begin with 'account://'")
-
-        return {
-            "account_id": parsed_url.hostname,
-            "provisioning_api_key": parsed_url.username,
-            "provisioning_api_secret": parsed_url.password,
-        }
-
-    def _load_config_from_env(self):
-        if os.environ.get("CLOUDINARY_ACCOUNT_URL"):
-            self._load_from_url(os.environ.get("CLOUDINARY_ACCOUNT_URL"))
-
-
-def account_config(**keywords):
-    global _account_config
-    _account_config.update(**keywords)
-    return _account_config
-
-
-def reset_config():
-    global _account_config
-    _account_config = AccountConfig()
-
-
-_account_config = AccountConfig()
diff --git a/lib/cloudinary/search.py b/lib/cloudinary/search.py
deleted file mode 100644
index 4e83af68..00000000
--- a/lib/cloudinary/search.py
+++ /dev/null
@@ -1,143 +0,0 @@
-import base64
-import json
-
-import cloudinary
-from cloudinary.api_client.call_api import call_json_api
-from cloudinary.utils import (unique, build_distribution_domain, base64url_encode, json_encode, compute_hex_hash,
-                              SIGNATURE_SHA256, build_array)
-
-
-class Search(object):
-    ASSETS = 'resources'
-
-    _endpoint = ASSETS
-
-    _KEYS_WITH_UNIQUE_VALUES = {
-        'sort_by': lambda x: next(iter(x)),
-        'aggregate': None,
-        'with_field': None,
-        'fields': None,
-    }
-
-    _ttl = 300  # Used for search URLs
-
-    """Build and execute a search query."""
-
-    def __init__(self):
-        self.query = {}
-
-    def expression(self, value):
-        """Specify the search query expression."""
-        self.query["expression"] = value
-        return self
-
-    def max_results(self, value):
-        """Set the max results to return"""
-        self.query["max_results"] = value
-        return self
-
-    def next_cursor(self, value):
-        """Get next page in the query using the ``next_cursor`` value from a previous invocation."""
-        self.query["next_cursor"] = value
-        return self
-
-    def sort_by(self, field_name, direction=None):
-        """Add a field to sort results by. If not provided, direction is ``desc``."""
-        if direction is None:
-            direction = 'desc'
-        self._add("sort_by", {field_name: direction})
-        return self
-
-    def aggregate(self, value):
-        """Aggregate field."""
-        self._add("aggregate", value)
-        return self
-
-    def with_field(self, value):
-        """Request an additional field in the result set."""
-        self._add("with_field", value)
-        return self
-
-    def fields(self, value):
-        """Request which fields to return in the result set."""
-        self._add("fields", value)
-        return self
-
-    def ttl(self, ttl):
-        """
-        Sets the time to live of the search URL.
-
-        :param ttl: The time to live in seconds.
-        :return: self
-        """
-        self._ttl = ttl
-        return self
-
-    def to_json(self):
-        return json.dumps(self.as_dict())
-
-    def execute(self, **options):
-        """Execute the search and return results."""
-        options["content_type"] = 'application/json'
-        uri = [self._endpoint, 'search']
-        return call_json_api('post', uri, self.as_dict(), **options)
-
-    def as_dict(self):
-        to_return = {}
-
-        for key, value in self.query.items():
-            if key in self._KEYS_WITH_UNIQUE_VALUES:
-                value = unique(value, self._KEYS_WITH_UNIQUE_VALUES[key])
-
-            to_return[key] = value
-
-        return to_return
-
-    def to_url(self, ttl=None, next_cursor=None, **options):
-        """
-        Creates a signed Search URL that can be used on the client side.
-
-        :param ttl: The time to live in seconds.
-        :param next_cursor: Starting position.
-        :param options: Additional url delivery options.
-        :return: The resulting search URL.
-        """
-        api_secret = options.get("api_secret", cloudinary.config().api_secret or None)
-        if not api_secret:
-            raise ValueError("Must supply api_secret")
-
-        if ttl is None:
-            ttl = self._ttl
-
-        query = self.as_dict()
-
-        _next_cursor = query.pop("next_cursor", None)
-        if next_cursor is None:
-            next_cursor = _next_cursor
-
-        b64query = base64url_encode(json_encode(query, sort_keys=True))
-
-        prefix = build_distribution_domain(options)
-
-        signature = compute_hex_hash("{ttl}{b64query}{api_secret}".format(
-            ttl=ttl,
-            b64query=b64query,
-            api_secret=api_secret
-        ), algorithm=SIGNATURE_SHA256)
-
-        return "{prefix}/search/{signature}/{ttl}/{b64query}{next_cursor}".format(
-            prefix=prefix,
-            signature=signature,
-            ttl=ttl,
-            b64query=b64query,
-            next_cursor="/{}".format(next_cursor) if next_cursor else "")
-
-    def endpoint(self, endpoint):
-        self._endpoint = endpoint
-        return self
-
-    def _add(self, name, value):
-        if name not in self.query:
-            self.query[name] = []
-        self.query[name].extend(build_array(value))
-        return self
diff --git a/lib/cloudinary/search_folders.py b/lib/cloudinary/search_folders.py
deleted file mode 100644
index 87e2601d..00000000
--- a/lib/cloudinary/search_folders.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from cloudinary import Search
-
-
-class SearchFolders(Search):
-    FOLDERS = 'folders'
-
-    def __init__(self):
-        super(SearchFolders, self).__init__()
-
-        self.endpoint(self.FOLDERS)
diff --git a/lib/cloudinary/static/cloudinary/html/cloudinary_cors.html b/lib/cloudinary/static/cloudinary/html/cloudinary_cors.html
deleted file mode 100644
index 14ce4206..00000000
--- a/lib/cloudinary/static/cloudinary/html/cloudinary_cors.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
-<body>
-  <script>
-/*
-    json2.js
-    2011-10-19
-
-    Public Domain.
-
-    NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
-
-    See http://www.JSON.org/js.html
-
-    This code should be minified before deployment.
-    See http://javascript.crockford.com/jsmin.html
-
-    USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
-    NOT CONTROL.
-
-*/
-var JSON;if(!JSON){JSON={}}(function(){function str(a,b){var c,d,e,f,g=gap,h,i=b[a];if(i&&typeof i==="object"&&typeof i.toJSON==="function"){i=i.toJSON(a)}if(typeof rep==="function"){i=rep.call(b,a,i)}switch(typeof i){case"string":return quote(i);case"number":return isFinite(i)?String(i):"null";case"boolean":case"null":return String(i);case"object":if(!i){return"null"}gap+=indent;h=[];if(Object.prototype.toString.apply(i)==="[object Array]"){f=i.length;for(c=0;c<f;c+=1){h[c]=str(c,i)||"null"}e=h.length===0?"[]":gap?"[\n"+gap+h.join(",\n"+gap)+"\n"+g+"]":"["+h.join(",")+"]";gap=g;return e}if(rep&&typeof rep==="object"){f=rep.length;for(c=0;c<f;c+=1){if(typeof rep[c]==="string"){d=rep[c];e=str(d,i);if(e){h.push(quote(d)+(gap?": ":":")+e)}}}}else{for(d in i){if(Object.prototype.hasOwnProperty.call(i,d)){e=str(d,i);if(e){h.push(quote(d)+(gap?": ":":")+e)}}}}e=h.length===0?"{}":gap?"{\n"+gap+h.join(",\n"+gap)+"\n"+g+"}":"{"+h.join(",")+"}";gap=g;return e}}function quote(a){escapable.lastIndex=0;return escapable.test(a)?'"'+a.replace(escapable,function(a){var b=meta[a];return typeof b==="string"?b:"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+a+'"'}function f(a){return a<10?"0"+a:a}"use strict";if(typeof Date.prototype.toJSON!=="function"){Date.prototype.toJSON=function(a){return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+f(this.getUTCMonth()+1)+"-"+f(this.getUTCDate())+"T"+f(this.getUTCHours())+":"+f(this.getUTCMinutes())+":"+f(this.getUTCSeconds())+"Z":null};String.prototype.toJSON=Number.prototype.toJSON=Boolean.prototype.toJSON=function(a){return this.valueOf()}}var cx=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,escapable=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,gap,indent,meta={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},rep;if(typeof JSON.stringify!=="function"){JSON.stringify=function(a,b,c){var d;gap="";indent="";if(typeof c==="number"){for(d=0;d<c;d+=1){indent+=" "}}else if(typeof c==="string"){indent=c}rep=b;if(b&&typeof b!=="function"&&(typeof b!=="object"||typeof b.length!=="number")){throw new Error("JSON.stringify")}return str("",{"":a})}}if(typeof JSON.parse!=="function"){JSON.parse=function(text,reviver){function walk(a,b){var c,d,e=a[b];if(e&&typeof e==="object"){for(c in e){if(Object.prototype.hasOwnProperty.call(e,c)){d=walk(e,c);if(d!==undefined){e[c]=d}else{delete e[c]}}}}return reviver.call(a,b,e)}var j;text=String(text);cx.lastIndex=0;if(cx.test(text)){text=text.replace(cx,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})}if(/^[\],:{}\s]*$/.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,""))){j=eval("("+text+")");return typeof reviver==="function"?walk({"":j},""):j}throw new SyntaxError("JSON.parse")}}})()
-/* end of json2.js */
-;
-    function parse(query) {
-      var result = {};
-      var params = query.split("&");
-      for (var i = 0; i < params.length; i++) {
-        var param = params[i].split("=");
-        result[param[0]] = decodeURIComponent(param[1]);
-      }
-      return JSON.stringify(result);
-    }
-
-    document.body.textContent = document.body.innerText = parse(window.location.search.slice(1));
-
-  </script>
-</body>
-</html>
-
diff --git a/lib/cloudinary/static/cloudinary/js/canvas-to-blob.min.js b/lib/cloudinary/static/cloudinary/js/canvas-to-blob.min.js
deleted file mode 100644
index 58a881dc..00000000
--- a/lib/cloudinary/static/cloudinary/js/canvas-to-blob.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(t){"use strict";var e=t.HTMLCanvasElement&&t.HTMLCanvasElement.prototype,o=t.Blob&&function(){try{return Boolean(new Blob)}catch(t){return!1}}(),n=o&&t.Uint8Array&&function(){try{return 100===new Blob([new Uint8Array(100)]).size}catch(t){return!1}}(),r=t.BlobBuilder||t.WebKitBlobBuilder||t.MozBlobBuilder||t.MSBlobBuilder,a=/^data:((.*?)(;charset=.*?)?)(;base64)?,/,i=(o||r)&&t.atob&&t.ArrayBuffer&&t.Uint8Array&&function(t){var e,i,l,u,c,f,b,d,B;if(!(e=t.match(a)))throw new Error("invalid data URI");for(i=e[2]?e[1]:"text/plain"+(e[3]||";charset=US-ASCII"),l=!!e[4],u=t.slice(e[0].length),c=l?atob(u):decodeURIComponent(u),f=new ArrayBuffer(c.length),b=new Uint8Array(f),d=0;d<c.length;d+=1)b[d]=c.charCodeAt(d);return o?new Blob([n?b:f],{type:i}):((B=new r).append(f),B.getBlob(i))};t.HTMLCanvasElement&&!e.toBlob&&(e.mozGetAsFile?e.toBlob=function(t,o,n){var r=this;setTimeout(function(){t(n&&e.toDataURL&&i?i(r.toDataURL(o,n)):r.mozGetAsFile("blob",o))})}:e.toDataURL&&i&&(e.toBlob=function(t,e,o){var n=this;setTimeout(function(){t(i(n.toDataURL(e,o)))})})),"function"==typeof define&&define.amd?define(function(){return i}):"object"==typeof module&&module.exports?module.exports=i:t.dataURLtoBlob=i}(window);
diff --git a/lib/cloudinary/static/cloudinary/js/jquery.cloudinary.js b/lib/cloudinary/static/cloudinary/js/jquery.cloudinary.js
deleted file mode 100644
index b61c442f..00000000
--- a/lib/cloudinary/static/cloudinary/js/jquery.cloudinary.js
+++ /dev/null
@@ -1,4780 +0,0 @@
-
-/**
- * Cloudinary's JavaScript library - Version 2.5.0
- * Copyright Cloudinary
- * see https://github.com/cloudinary/cloudinary_js
- *
- */
-var slice = [].slice,
-  extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-  hasProp = {}.hasOwnProperty;
-
-(function(root, factory) {
-  var name, ref, results, value;
-  if ((typeof define === 'function') && define.amd) {
-    return define(['jquery'], factory);
-  } else if (typeof exports === 'object') {
-    return module.exports = factory(require('jquery'));
-  } else {
-    root.cloudinary || (root.cloudinary = {});
-    ref = factory(jQuery);
-    results = [];
-    for (name in ref) {
-      value = ref[name];
-      results.push(root.cloudinary[name] = value);
-    }
-    return results;
-  }
-})(this, function(jQuery) {
-
-  /*
-   * Includes common utility methods and shims
-   */
-
-  /**
-   * Return true if all items in list are strings
-   * @function Util.allString
-   * @param {Array} list - an array of items
-   */
-  var ArrayParam, BaseUtil, ClientHintsMetaTag, Cloudinary, CloudinaryJQuery, Condition, Configuration, Expression, ExpressionParam, FetchLayer, HtmlTag, ImageTag, Layer, LayerParam, Param, RangeParam, RawParam, SubtitlesLayer, TextLayer, Transformation, TransformationBase, TransformationParam, Util, VideoTag, addClass, allStrings, base64Encode, base64EncodeURL, camelCase, cloneDeep, cloudinary, compact, contains, convertKeys, crc32, defaults, difference, funcTag, functions, getAttribute, getData, hasClass, identity, isEmpty, isFunction, isNumberLike, isObject, isString, m, merge, objToString, objectProto, parameters, reWords, removeAttribute, setAttribute, setAttributes, setData, smartEscape, snakeCase, utf8_encode, webp, width, withCamelCaseKeys, withSnakeCaseKeys, without;
-  allStrings = function(list) {
-    var item, j, len;
-    for (j = 0, len = list.length; j < len; j++) {
-      item = list[j];
-      if (!Util.isString(item)) {
-        return false;
-      }
-    }
-    return true;
-  };
-
-  /**
-  * Creates a new array without the given item.
-  * @function Util.without
-  * @param {Array} array - original array
-  * @param {*} item - the item to exclude from the new array
-  * @return {Array} a new array made of the original array's items except for `item`
-   */
-  without = function(array, item) {
-    var i, length, newArray;
-    newArray = [];
-    i = -1;
-    length = array.length;
-    while (++i < length) {
-      if (array[i] !== item) {
-        newArray.push(array[i]);
-      }
-    }
-    return newArray;
-  };
-
-  /**
-  * Return true is value is a number or a string representation of a number.
-  * @function Util.isNumberLike
-  * @param {*} value
-  * @returns {boolean} true if value is a number
-  * @example
-  *    Util.isNumber(0) // true
-  *    Util.isNumber("1.3") // true
-  *    Util.isNumber("") // false
-  *    Util.isNumber(undefined) // false
-   */
-  isNumberLike = function(value) {
-    return (value != null) && !isNaN(parseFloat(value));
-  };
-
-  /**
-   * Escape all characters matching unsafe in the given string
-   * @function Util.smartEscape
-   * @param {string} string - source string to escape
-   * @param {RegExp} unsafe - characters that must be escaped
-   * @return {string} escaped string
-   */
-  smartEscape = function(string, unsafe) {
-    if (unsafe == null) {
-      unsafe = /([^a-zA-Z0-9_.\-\/:]+)/g;
-    }
-    return string.replace(unsafe, function(match) {
-      return match.split("").map(function(c) {
-        return "%" + c.charCodeAt(0).toString(16).toUpperCase();
-      }).join("");
-    });
-  };
-
-  /**
-   * Assign values from sources if they are not defined in the destination.
-   * Once a value is set it does not change
-   * @function Util.defaults
-   * @param {Object} destination - the object to assign defaults to
-   * @param {...Object} source - the source object(s) to assign defaults from
-   * @return {Object} destination after it was modified
-   */
-  defaults = function() {
-    var destination, sources;
-    destination = arguments[0], sources = 2 <= arguments.length ? slice.call(arguments, 1) : [];
-    return sources.reduce(function(dest, source) {
-      var key, value;
-      for (key in source) {
-        value = source[key];
-        if (dest[key] === void 0) {
-          dest[key] = value;
-        }
-      }
-      return dest;
-    }, destination);
-  };
-
-  /*********** lodash functions */
-  objectProto = Object.prototype;
-
-  /**
-   * Used to resolve the [`toStringTag`](http://ecma-international.org/ecma-262/6.0/#sec-object.prototype.tostring)
-   * of values.
-   */
-  objToString = objectProto.toString;
-
-  /**
-   * Checks if `value` is the [language type](https://es5.github.io/#x8) of `Object`.
-   * (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
-   *
-   * @param {*} value The value to check.
-   * @returns {boolean} Returns `true` if `value` is an object, else `false`.
-   * @example
-   *
-  #isObject({});
-   * // => true
-   *
-  #isObject([1, 2, 3]);
-   * // => true
-   *
-  #isObject(1);
-   * // => false
-   */
-  isObject = function(value) {
-    var type;
-    type = typeof value;
-    return !!value && (type === 'object' || type === 'function');
-  };
-  funcTag = '[object Function]';
-
-  /**
-  * Checks if `value` is classified as a `Function` object.
-  * @function Util.isFunction
-  * @param {*} value The value to check.
-  * @returns {boolean} Returns `true` if `value` is correctly classified, else `false`.
-  * @example
-  *
-  * function Foo(){};
-  * isFunction(Foo);
-  * // => true
-  *
-  * isFunction(/abc/);
-  * // => false
-   */
-  isFunction = function(value) {
-    return isObject(value) && objToString.call(value) === funcTag;
-  };
-
-  /*********** lodash functions */
-
-  /** Used to match words to create compound words. */
-  reWords = (function() {
-    var lower, upper;
-    upper = '[A-Z]';
-    lower = '[a-z]+';
-    return RegExp(upper + '+(?=' + upper + lower + ')|' + upper + '?' + lower + '|' + upper + '+|[0-9]+', 'g');
-  })();
-
-  /**
-  * Convert string to camelCase
-  * @function Util.camelCase
-  * @param {string} string - the string to convert
-  * @return {string} in camelCase format
-   */
-  camelCase = function(source) {
-    var i, word, words;
-    words = source.match(reWords);
-    words = (function() {
-      var j, len, results;
-      results = [];
-      for (i = j = 0, len = words.length; j < len; i = ++j) {
-        word = words[i];
-        word = word.toLocaleLowerCase();
-        if (i) {
-          results.push(word.charAt(0).toLocaleUpperCase() + word.slice(1));
-        } else {
-          results.push(word);
-        }
-      }
-      return results;
-    })();
-    return words.join('');
-  };
-
-  /**
-   * Convert string to snake_case
-   * @function Util.snakeCase
-   * @param {string} string - the string to convert
-   * @return {string} in snake_case format
-   */
-  snakeCase = function(source) {
-    var i, word, words;
-    words = source.match(reWords);
-    words = (function() {
-      var j, len, results;
-      results = [];
-      for (i = j = 0, len = words.length; j < len; i = ++j) {
-        word = words[i];
-        results.push(word.toLocaleLowerCase());
-      }
-      return results;
-    })();
-    return words.join('_');
-  };
-  convertKeys = function(source, converter) {
-    var key, result, value;
-    if (converter == null) {
-      converter = Util.identity;
-    }
-    result = {};
-    for (key in source) {
-      value = source[key];
-      key = converter(key);
-      if (!Util.isEmpty(key)) {
-        result[key] = value;
-      }
-    }
-    return result;
-  };
-
-  /**
-   * Create a copy of the source object with all keys in camelCase
-   * @function Util.withCamelCaseKeys
-   * @param {Object} value - the object to copy
-   * @return {Object} a new object
-   */
-  withCamelCaseKeys = function(source) {
-    return convertKeys(source, Util.camelCase);
-  };
-
-  /**
-   * Create a copy of the source object with all keys in snake_case
-   * @function Util.withSnakeCaseKeys
-   * @param {Object} value - the object to copy
-   * @return {Object} a new object
-   */
-  withSnakeCaseKeys = function(source) {
-    return convertKeys(source, Util.snakeCase);
-  };
-  base64Encode = typeof btoa !== 'undefined' && isFunction(btoa) ? btoa : typeof Buffer !== 'undefined' && isFunction(Buffer) ? function(input) {
-    if (!(input instanceof Buffer)) {
-      input = new Buffer.from(String(input), 'binary');
-    }
-    return input.toString('base64');
-  } : function(input) {
-    throw new Error("No base64 encoding function found");
-  };
-
-  /**
-  * Returns the Base64-decoded version of url.<br>
-  * This method delegates to `btoa` if present. Otherwise it tries `Buffer`.
-  * @function Util.base64EncodeURL
-  * @param {string} url - the url to encode. the value is URIdecoded and then re-encoded before converting to base64 representation
-  * @return {string} the base64 representation of the URL
-   */
-  base64EncodeURL = function(input) {
-    var error1, ignore;
-    try {
-      input = decodeURI(input);
-    } catch (error1) {
-      ignore = error1;
-    }
-    input = encodeURI(input);
-    return base64Encode(input);
-  };
-  BaseUtil = {
-    allStrings: allStrings,
-    camelCase: camelCase,
-    convertKeys: convertKeys,
-    defaults: defaults,
-    snakeCase: snakeCase,
-    without: without,
-    isFunction: isFunction,
-    isNumberLike: isNumberLike,
-    smartEscape: smartEscape,
-    withCamelCaseKeys: withCamelCaseKeys,
-    withSnakeCaseKeys: withSnakeCaseKeys,
-    base64EncodeURL: base64EncodeURL
-  };
-
-  /**
-    * Includes utility methods and lodash / jQuery shims
-   */
-
-  /**
-    * Get data from the DOM element.
-    *
-    * This method will use jQuery's `data()` method if it is available, otherwise it will get the `data-` attribute
-    * @param {Element} element - the element to get the data from
-    * @param {string} name - the name of the data item
-    * @returns the value associated with the `name`
-    * @function Util.getData
-   */
-  getData = function(element, name) {
-    return jQuery(element).data(name);
-  };
-
-  /**
-    * Set data in the DOM element.
-    *
-    * This method will use jQuery's `data()` method if it is available, otherwise it will set the `data-` attribute
-    * @function Util.setData
-    * @param {Element} element - the element to set the data in
-    * @param {string} name - the name of the data item
-    * @param {*} value - the value to be set
-    *
-   */
-  setData = function(element, name, value) {
-    return jQuery(element).data(name, value);
-  };
-
-  /**
-    * Get attribute from the DOM element.
-    *
-    * This method will use jQuery's `attr()` method if it is available, otherwise it will get the attribute directly
-    * @function Util.getAttribute
-    * @param {Element} element - the element to set the attribute for
-    * @param {string} name - the name of the attribute
-    * @returns {*} the value of the attribute
-    *
-   */
-  getAttribute = function(element, name) {
-    return jQuery(element).attr(name);
-  };
-
-  /**
-    * Set attribute in the DOM element.
-    *
-    * This method will use jQuery's `attr()` method if it is available, otherwise it will set the attribute directly
-    * @function Util.setAttribute
-    * @param {Element} element - the element to set the attribute for
-    * @param {string} name - the name of the attribute
-    * @param {*} value - the value to be set
-   */
-  setAttribute = function(element, name, value) {
-    return jQuery(element).attr(name, value);
-  };
-
-  /**
-   * Remove an attribute in the DOM element.
-   *
-   * @function Util.removeAttribute
-   * @param {Element} element - the element to set the attribute for
-   * @param {string} name - the name of the attribute
-   */
-  removeAttribute = function(element, name) {
-    return jQuery(element).removeAttr(name);
-  };
-
-  /**
-    * Set a group of attributes to the element
-    * @function Util.setAttributes
-    * @param {Element} element - the element to set the attributes for
-    * @param {Object} attributes - a hash of attribute names and values
-   */
-  setAttributes = function(element, attributes) {
-    return jQuery(element).attr(attributes);
-  };
-
-  /**
-    * Checks if element has a css class
-    * @function Util.hasClass
-    * @param {Element} element - the element to check
-    * @param {string} name - the class name
-    @returns {boolean} true if the element has the class
-   */
-  hasClass = function(element, name) {
-    return jQuery(element).hasClass(name);
-  };
-
-  /**
-    * Add class to the element
-    * @function Util.addClass
-    * @param {Element} element - the element
-    * @param {string} name - the class name to add
-   */
-  addClass = function(element, name) {
-    return jQuery(element).addClass(name);
-  };
-  width = function(element) {
-    return jQuery(element).width();
-  };
-
-  /**
-   * Returns true if item is empty:
-   * <ul>
-   *   <li>item is null or undefined</li>
-   *   <li>item is an array or string of length 0</li>
-   *   <li>item is an object with no keys</li>
-   * </ul>
-   * @function Util.isEmpty
-   * @param item
-   * @returns {boolean} true if item is empty
-   */
-  isEmpty = function(item) {
-    return (item == null) || (Array.isArray(item) || Util.isString(item)) && item.length === 0 || (jQuery.isPlainObject(item) && jQuery.isEmptyObject(item));
-  };
-
-  /**
-   * Returns true if item is a string
-   * @param item
-   * @returns {boolean} true if item is a string
-   */
-  isString = function(item) {
-    return typeof item === 'string' || (item != null ? item.toString() : void 0) === '[object String]';
-  };
-
-  /**
-   * Recursively assign source properties to destination
-   * @function Util.merge
-   * @param {Object} destination - the object to assign to
-   * @param {...Object} [sources] The source objects.
-   */
-  merge = function() {
-    var args, i;
-    args = (function() {
-      var j, len, results;
-      results = [];
-      for (j = 0, len = arguments.length; j < len; j++) {
-        i = arguments[j];
-        results.push(i);
-      }
-      return results;
-    }).apply(this, arguments);
-    args.unshift(true);
-    return jQuery.extend.apply(this, args);
-  };
-
-  /**
-   * Creates a new array from the parameter with "falsey" values removed
-   * @function Util.compact
-   * @param {Array} array - the array to remove values from
-   * @return {Array} a new array without falsey values
-   */
-  compact = function(arr) {
-    var item, j, len, results;
-    results = [];
-    for (j = 0, len = arr.length; j < len; j++) {
-      item = arr[j];
-      if (item) {
-        results.push(item);
-      }
-    }
-    return results;
-  };
-
-  /**
-   * Create a new copy of the given object, including all internal objects.
-   * @function Util.cloneDeep
-   * @param {Object} value - the object to clone
-   * @return {Object} a new deep copy of the object
-   */
-  cloneDeep = function() {
-    var args;
-    args = jQuery.makeArray(arguments);
-    args.unshift({});
-    args.unshift(true);
-    return jQuery.extend.apply(this, args);
-  };
-
-  /**
-   * Check if a given item is included in the given array
-   * @function Util.contains
-   * @param {Array} array - the array to search in
-   * @param {*} item - the item to search for
-   * @return {boolean} true if the item is included in the array
-   */
-  contains = function(arr, item) {
-    var i, j, len;
-    for (j = 0, len = arr.length; j < len; j++) {
-      i = arr[j];
-      if (i === item) {
-        return true;
-      }
-    }
-    return false;
-  };
-
-  /**
-   * Returns values in the given array that are not included in the other array
-   * @function Util.difference
-   * @param {Array} arr - the array to select from
-   * @param {Array} values - values to filter from arr
-   * @return {Array} the filtered values
-   */
-  difference = function(arr, values) {
-    var item, j, len, results;
-    results = [];
-    for (j = 0, len = arr.length; j < len; j++) {
-      item = arr[j];
-      if (!contains(values, item)) {
-        results.push(item);
-      }
-    }
-    return results;
-  };
-
-  /**
-   * Returns a list of all the function names in obj
-   * @function Util.functions
-   * @param {Object} object - the object to inspect
-   * @return {Array} a list of functions of object
-   */
-  functions = function(object) {
-    var i, results;
-    results = [];
-    for (i in object) {
-      if (jQuery.isFunction(object[i])) {
-        results.push(i);
-      }
-    }
-    return results;
-  };
-
-  /**
-   * Returns the provided value. This functions is used as a default predicate function.
-   * @function Util.identity
-   * @param {*} value
-   * @return {*} the provided value
-   */
-  identity = function(value) {
-    return value;
-  };
-
-  /**
-   * @class Util
-   */
-  Util = jQuery.extend(BaseUtil, {
-    hasClass: hasClass,
-    addClass: addClass,
-    getAttribute: getAttribute,
-    setAttribute: setAttribute,
-    removeAttribute: removeAttribute,
-    setAttributes: setAttributes,
-    getData: getData,
-    setData: setData,
-    width: width,
-    isString: isString,
-    isArray: Array.isArray,
-    isEmpty: isEmpty,
-
-    /**
-     * Assign source properties to destination.
-     * If the property is an object it is assigned as a whole, overriding the destination object.
-     * @function Util.assign
-     * @param {Object} destination - the object to assign to
-     */
-    assign: jQuery.extend,
-    merge: merge,
-    cloneDeep: cloneDeep,
-    compact: compact,
-    contains: contains,
-    difference: difference,
-    functions: functions,
-    identity: identity,
-    isPlainObject: jQuery.isPlainObject,
-
-    /**
-     * Remove leading or trailing spaces from text
-     * @function Util.trim
-     * @param {string} text
-     * @return {string} the `text` without leading or trailing spaces
-     */
-    trim: jQuery.trim
-  });
-
-  /**
-   * UTF8 encoder
-   *
-   */
-  utf8_encode = function(argString) {
-    var c1, enc, end, n, start, string, stringl, utftext;
-    if (argString === null || typeof argString === 'undefined') {
-      return '';
-    }
-    string = argString + '';
-    utftext = '';
-    start = void 0;
-    end = void 0;
-    stringl = 0;
-    start = end = 0;
-    stringl = string.length;
-    n = 0;
-    while (n < stringl) {
-      c1 = string.charCodeAt(n);
-      enc = null;
-      if (c1 < 128) {
-        end++;
-      } else if (c1 > 127 && c1 < 2048) {
-        enc = String.fromCharCode(c1 >> 6 | 192, c1 & 63 | 128);
-      } else {
-        enc = String.fromCharCode(c1 >> 12 | 224, c1 >> 6 & 63 | 128, c1 & 63 | 128);
-      }
-      if (enc !== null) {
-        if (end > start) {
-          utftext += string.slice(start, end);
-        }
-        utftext += enc;
-        start = end = n + 1;
-      }
-      n++;
-    }
-    if (end > start) {
-      utftext += string.slice(start, stringl);
-    }
-    return utftext;
-  };
-
-  /**
-   * CRC32 calculator
-   * Depends on 'utf8_encode'
-   */
-  crc32 = function(str) {
-    var crc, i, iTop, table, x, y;
-    str = utf8_encode(str);
-    table = '00000000 77073096 EE0E612C 990951BA 076DC419 706AF48F E963A535 9E6495A3 0EDB8832 79DCB8A4 E0D5E91E 97D2D988 09B64C2B 7EB17CBD E7B82D07 90BF1D91 1DB71064 6AB020F2 F3B97148 84BE41DE 1ADAD47D 6DDDE4EB F4D4B551 83D385C7 136C9856 646BA8C0 FD62F97A 8A65C9EC 14015C4F 63066CD9 FA0F3D63 8D080DF5 3B6E20C8 4C69105E D56041E4 A2677172 3C03E4D1 4B04D447 D20D85FD A50AB56B 35B5A8FA 42B2986C DBBBC9D6 ACBCF940 32D86CE3 45DF5C75 DCD60DCF ABD13D59 26D930AC 51DE003A C8D75180 BFD06116 21B4F4B5 56B3C423 CFBA9599 B8BDA50F 2802B89E 5F058808 C60CD9B2 B10BE924 2F6F7C87 58684C11 C1611DAB B6662D3D 76DC4190 01DB7106 98D220BC EFD5102A 71B18589 06B6B51F 9FBFE4A5 E8B8D433 7807C9A2 0F00F934 9609A88E E10E9818 7F6A0DBB 086D3D2D 91646C97 E6635C01 6B6B51F4 1C6C6162 856530D8 F262004E 6C0695ED 1B01A57B 8208F4C1 F50FC457 65B0D9C6 12B7E950 8BBEB8EA FCB9887C 62DD1DDF 15DA2D49 8CD37CF3 FBD44C65 4DB26158 3AB551CE A3BC0074 D4BB30E2 4ADFA541 3DD895D7 A4D1C46D D3D6F4FB 4369E96A 346ED9FC AD678846 DA60B8D0 44042D73 33031DE5 AA0A4C5F DD0D7CC9 5005713C 270241AA BE0B1010 C90C2086 5768B525 206F85B3 B966D409 CE61E49F 5EDEF90E 29D9C998 B0D09822 C7D7A8B4 59B33D17 2EB40D81 B7BD5C3B C0BA6CAD EDB88320 9ABFB3B6 03B6E20C 74B1D29A EAD54739 9DD277AF 04DB2615 73DC1683 E3630B12 94643B84 0D6D6A3E 7A6A5AA8 E40ECF0B 9309FF9D 0A00AE27 7D079EB1 F00F9344 8708A3D2 1E01F268 6906C2FE F762575D 806567CB 196C3671 6E6B06E7 FED41B76 89D32BE0 10DA7A5A 67DD4ACC F9B9DF6F 8EBEEFF9 17B7BE43 60B08ED5 D6D6A3E8 A1D1937E 38D8C2C4 4FDFF252 D1BB67F1 A6BC5767 3FB506DD 48B2364B D80D2BDA AF0A1B4C 36034AF6 41047A60 DF60EFC3 A867DF55 316E8EEF 4669BE79 CB61B38C BC66831A 256FD2A0 5268E236 CC0C7795 BB0B4703 220216B9 5505262F C5BA3BBE B2BD0B28 2BB45A92 5CB36A04 C2D7FFA7 B5D0CF31 2CD99E8B 5BDEAE1D 9B64C2B0 EC63F226 756AA39C 026D930A 9C0906A9 EB0E363F 72076785 05005713 95BF4A82 E2B87A14 7BB12BAE 0CB61B38 92D28E9B E5D5BE0D 7CDCEFB7 0BDBDF21 86D3D2D4 F1D4E242 68DDB3F8 1FDA836E 81BE16CD F6B9265B 6FB077E1 18B74777 88085AE6 FF0F6A70 66063BCA 11010B5C 8F659EFF F862AE69 616BFFD3 166CCF45 A00AE278 D70DD2EE 4E048354 3903B3C2 A7672661 D06016F7 4969474D 3E6E77DB AED16A4A D9D65ADC 40DF0B66 37D83BF0 A9BCAE53 DEBB9EC5 47B2CF7F 30B5FFE9 BDBDF21C CABAC28A 53B39330 24B4A3A6 BAD03605 CDD70693 54DE5729 23D967BF B3667A2E C4614AB8 5D681B02 2A6F2B94 B40BBE37 C30C8EA1 5A05DF1B 2D02EF8D';
-    crc = 0;
-    x = 0;
-    y = 0;
-    crc = crc ^ -1;
-    i = 0;
-    iTop = str.length;
-    while (i < iTop) {
-      y = (crc ^ str.charCodeAt(i)) & 0xFF;
-      x = '0x' + table.substr(y * 9, 8);
-      crc = crc >>> 8 ^ x;
-      i++;
-    }
-    crc = crc ^ -1;
-    if (crc < 0) {
-      crc += 4294967296;
-    }
-    return crc;
-  };
-  Layer = (function() {
-
-    /**
-     * Layer
-     * @constructor Layer
-     * @param {Object} options - layer parameters
-     */
-    function Layer(options) {
-      this.options = {};
-      if (options != null) {
-        ["resourceType", "type", "publicId", "format"].forEach((function(_this) {
-          return function(key) {
-            var ref;
-            return _this.options[key] = (ref = options[key]) != null ? ref : options[Util.snakeCase(key)];
-          };
-        })(this));
-      }
-    }
-
-    Layer.prototype.resourceType = function(value) {
-      this.options.resourceType = value;
-      return this;
-    };
-
-    Layer.prototype.type = function(value) {
-      this.options.type = value;
-      return this;
-    };
-
-    Layer.prototype.publicId = function(value) {
-      this.options.publicId = value;
-      return this;
-    };
-
-
-    /**
-     * Get the public ID, formatted for layer parameter
-     * @function Layer#getPublicId
-     * @return {String} public ID
-     */
-
-    Layer.prototype.getPublicId = function() {
-      var ref;
-      return (ref = this.options.publicId) != null ? ref.replace(/\//g, ":") : void 0;
-    };
-
-
-    /**
-     * Get the public ID, with format if present
-     * @function Layer#getFullPublicId
-     * @return {String} public ID
-     */
-
-    Layer.prototype.getFullPublicId = function() {
-      if (this.options.format != null) {
-        return this.getPublicId() + "." + this.options.format;
-      } else {
-        return this.getPublicId();
-      }
-    };
-
-    Layer.prototype.format = function(value) {
-      this.options.format = value;
-      return this;
-    };
-
-
-    /**
-     * generate the string representation of the layer
-     * @function Layer#toString
-     */
-
-    Layer.prototype.toString = function() {
-      var components;
-      components = [];
-      if (this.options.publicId == null) {
-        throw "Must supply publicId";
-      }
-      if (!(this.options.resourceType === "image")) {
-        components.push(this.options.resourceType);
-      }
-      if (!(this.options.type === "upload")) {
-        components.push(this.options.type);
-      }
-      components.push(this.getFullPublicId());
-      return Util.compact(components).join(":");
-    };
-
-    return Layer;
-
-  })();
-  FetchLayer = (function(superClass) {
-    extend(FetchLayer, superClass);
-
-
-    /**
-     * @constructor FetchLayer
-     * @param {Object|string} options - layer parameters or a url
-     * @param {string} options.url the url of the image to fetch
-     */
-
-    function FetchLayer(options) {
-      FetchLayer.__super__.constructor.call(this, options);
-      if (Util.isString(options)) {
-        this.options.url = options;
-      } else if (options != null ? options.url : void 0) {
-        this.options.url = options.url;
-      }
-    }
-
-    FetchLayer.prototype.url = function(url) {
-      this.options.url = url;
-      return this;
-    };
-
-
-    /**
-     * generate the string representation of the layer
-     * @function FetchLayer#toString
-     * @return {String}
-     */
-
-    FetchLayer.prototype.toString = function() {
-      return "fetch:" + (cloudinary.Util.base64EncodeURL(this.options.url));
-    };
-
-    return FetchLayer;
-
-  })(Layer);
-  TextLayer = (function(superClass) {
-    extend(TextLayer, superClass);
-
-
-    /**
-     * @constructor TextLayer
-     * @param {Object} options - layer parameters
-     */
-
-    function TextLayer(options) {
-      var keys;
-      TextLayer.__super__.constructor.call(this, options);
-      keys = ["resourceType", "resourceType", "fontFamily", "fontSize", "fontWeight", "fontStyle", "textDecoration", "textAlign", "stroke", "letterSpacing", "lineSpacing", "fontHinting", "fontAntialiasing", "text", "textStyle"];
-      if (options != null) {
-        keys.forEach((function(_this) {
-          return function(key) {
-            var ref;
-            return _this.options[key] = (ref = options[key]) != null ? ref : options[Util.snakeCase(key)];
-          };
-        })(this));
-      }
-      this.options.resourceType = "text";
-    }
-
-    TextLayer.prototype.resourceType = function(resourceType) {
-      throw "Cannot modify resourceType for text layers";
-    };
-
-    TextLayer.prototype.type = function(type) {
-      throw "Cannot modify type for text layers";
-    };
-
-    TextLayer.prototype.format = function(format) {
-      throw "Cannot modify format for text layers";
-    };
-
-    TextLayer.prototype.fontFamily = function(fontFamily) {
-      this.options.fontFamily = fontFamily;
-      return this;
-    };
-
-    TextLayer.prototype.fontSize = function(fontSize) {
-      this.options.fontSize = fontSize;
-      return this;
-    };
-
-    TextLayer.prototype.fontWeight = function(fontWeight) {
-      this.options.fontWeight = fontWeight;
-      return this;
-    };
-
-    TextLayer.prototype.fontStyle = function(fontStyle) {
-      this.options.fontStyle = fontStyle;
-      return this;
-    };
-
-    TextLayer.prototype.textDecoration = function(textDecoration) {
-      this.options.textDecoration = textDecoration;
-      return this;
-    };
-
-    TextLayer.prototype.textAlign = function(textAlign) {
-      this.options.textAlign = textAlign;
-      return this;
-    };
-
-    TextLayer.prototype.stroke = function(stroke) {
-      this.options.stroke = stroke;
-      return this;
-    };
-
-    TextLayer.prototype.letterSpacing = function(letterSpacing) {
-      this.options.letterSpacing = letterSpacing;
-      return this;
-    };
-
-    TextLayer.prototype.lineSpacing = function(lineSpacing) {
-      this.options.lineSpacing = lineSpacing;
-      return this;
-    };
-
-    TextLayer.prototype.fontAntialiasing = function(fontAntialiasing){
-      this.options.fontAntialiasing = fontAntialiasing;
-      return this;
-    };
-
-    TextLayer.prototype.fontHinting = function(fontHinting ){
-      this.options.fontHinting  = fontHinting ;
-      return this;
-    };
-
-    TextLayer.prototype.text = function(text) {
-      this.options.text = text;
-      return this;
-    };
-
-    TextLayer.prototype.textStyle = function(textStyle) {
-      this.options.textStyle = textStyle;
-      return this;
-    };
-
-
-    /**
-     * generate the string representation of the layer
-     * @function TextLayer#toString
-     * @return {String}
-     */
-
-    TextLayer.prototype.toString = function() {
-      var components, hasPublicId, hasStyle, publicId, re, res, start, style, text, textSource;
-      style = this.textStyleIdentifier();
-      if (this.options.publicId != null) {
-        publicId = this.getFullPublicId();
-      }
-      if (this.options.text != null) {
-        hasPublicId = !Util.isEmpty(publicId);
-        hasStyle = !Util.isEmpty(style);
-        if (hasPublicId && hasStyle || !hasPublicId && !hasStyle) {
-          throw "Must supply either style parameters or a public_id when providing text parameter in a text overlay/underlay, but not both!";
-        }
-        re = /\$\([a-zA-Z]\w*\)/g;
-        start = 0;
-        textSource = Util.smartEscape(this.options.text, /[,\/]/g);
-        text = "";
-        while (res = re.exec(textSource)) {
-          text += Util.smartEscape(textSource.slice(start, res.index));
-          text += res[0];
-          start = res.index + res[0].length;
-        }
-        text += Util.smartEscape(textSource.slice(start));
-      }
-      components = [this.options.resourceType, style, publicId, text];
-      return Util.compact(components).join(":");
-    };
-
-    TextLayer.prototype.textStyleIdentifier = function() {
-      // Note: if a text-style argument is provided as a whole, it overrides everything else, no mix and match.
-      if (!Util.isEmpty(this.options.textStyle)) {
-        return this.options.textStyle;
-      }
-      var components;
-      components = [];
-      if (this.options.fontWeight !== "normal") {
-        components.push(this.options.fontWeight);
-      }
-      if (this.options.fontStyle !== "normal") {
-        components.push(this.options.fontStyle);
-      }
-      if (this.options.textDecoration !== "none") {
-        components.push(this.options.textDecoration);
-      }
-      components.push(this.options.textAlign);
-      if (this.options.stroke !== "none") {
-        components.push(this.options.stroke);
-      }
-      if (!(Util.isEmpty(this.options.letterSpacing) && !Util.isNumberLike(this.options.letterSpacing))) {
-        components.push("letter_spacing_" + this.options.letterSpacing);
-      }
-      if (!(Util.isEmpty(this.options.lineSpacing) && !Util.isNumberLike(this.options.lineSpacing))) {
-        components.push("line_spacing_" + this.options.lineSpacing);
-      }
-      if (this.options.fontAntialiasing !== "none") {
-        components.push("antialias_"+this.options.fontAntialiasing);
-      }
-      if (this.options.fontHinting !== "none") {
-        components.push("hinting_"+this.options.fontHinting);
-      }
-      if (!Util.isEmpty(Util.compact(components))) {
-        if (Util.isEmpty(this.options.fontFamily)) {
-          throw "Must supply fontFamily. " + components;
-        }
-        if (Util.isEmpty(this.options.fontSize) && !Util.isNumberLike(this.options.fontSize)) {
-          throw "Must supply fontSize.";
-        }
-      }
-      components.unshift(this.options.fontFamily, this.options.fontSize);
-      components = Util.compact(components).join("_");
-      return components;
-    };
-
-    return TextLayer;
-
-  })(Layer);
-  SubtitlesLayer = (function(superClass) {
-    extend(SubtitlesLayer, superClass);
-
-
-    /**
-     * Represent a subtitles layer
-     * @constructor SubtitlesLayer
-     * @param {Object} options - layer parameters
-     */
-
-    function SubtitlesLayer(options) {
-      SubtitlesLayer.__super__.constructor.call(this, options);
-      this.options.resourceType = "subtitles";
-    }
-
-    return SubtitlesLayer;
-
-  })(TextLayer);
-
-  /**
-   * Transformation parameters
-   * Depends on 'util', 'transformation'
-   */
-  Param = (function() {
-
-    /**
-     * Represents a single parameter
-     * @class Param
-     * @param {string} name - The name of the parameter in snake_case
-     * @param {string} shortName - The name of the serialized form of the parameter.
-     *                         If a value is not provided, the parameter will not be serialized.
-     * @param {function} [process=cloudinary.Util.identity ] - Manipulate origValue when value is called
-     * @ignore
-     */
-    function Param(name, shortName, process) {
-      if (process == null) {
-        process = cloudinary.Util.identity;
-      }
-
-      /**
-       * The name of the parameter in snake_case
-       * @member {string} Param#name
-       */
-      this.name = name;
-
-      /**
-       * The name of the serialized form of the parameter
-       * @member {string} Param#shortName
-       */
-      this.shortName = shortName;
-
-      /**
-       * Manipulate origValue when value is called
-       * @member {function} Param#process
-       */
-      this.process = process;
-    }
-
-
-    /**
-     * Set a (unprocessed) value for this parameter
-     * @function Param#set
-     * @param {*} origValue - the value of the parameter
-     * @return {Param} self for chaining
-     */
-
-    Param.prototype.set = function(origValue) {
-      this.origValue = origValue;
-      return this;
-    };
-
-
-    /**
-     * Generate the serialized form of the parameter
-     * @function Param#serialize
-     * @return {string} the serialized form of the parameter
-     */
-
-    Param.prototype.serialize = function() {
-      var val, valid;
-      val = this.value();
-      valid = cloudinary.Util.isArray(val) || cloudinary.Util.isPlainObject(val) || cloudinary.Util.isString(val) ? !cloudinary.Util.isEmpty(val) : val != null;
-      if ((this.shortName != null) && valid) {
-        return this.shortName + "_" + val;
-      } else {
-        return '';
-      }
-    };
-
-
-    /**
-     * Return the processed value of the parameter
-     * @function Param#value
-     */
-
-    Param.prototype.value = function() {
-      return this.process(this.origValue);
-    };
-
-    Param.norm_color = function(value) {
-      return value != null ? value.replace(/^#/, 'rgb:') : void 0;
-    };
-
-    Param.prototype.build_array = function(arg) {
-      if (arg == null) {
-        arg = [];
-      }
-      if (cloudinary.Util.isArray(arg)) {
-        return arg;
-      } else {
-        return [arg];
-      }
-    };
-
-
-    /**
-    * Covert value to video codec string.
-    *
-    * If the parameter is an object,
-    * @param {(string|Object)} param - the video codec as either a String or a Hash
-    * @return {string} the video codec string in the format codec:profile:level:b_frames
-    * @example
-    * vc_[ :profile : [level : [b_frames]]]
-    * or
-      { codec: 'h264', profile: 'basic', level: '3.1', b_frames: false }
-    * @ignore
-     */
-
-    Param.process_video_params = function(param) {
-      var video;
-      switch (param.constructor) {
-        case Object:
-          video = "";
-          if ('codec' in param) {
-            video = param['codec'];
-            if ('profile' in param) {
-              video += ":" + param['profile'];
-              if ('level' in param) {
-                video += ":" + param['level'];
-                if ('b_frames' in param && param['b_frames'] === false) {
-                  video += ":bframes_no";
-                }
-              }
-            }
-          }
-          return video;
-        case String:
-          return param;
-        default:
-          return null;
-      }
-    };
-
-    return Param;
-
-  })();
-  ArrayParam = (function(superClass) {
-    extend(ArrayParam, superClass);
-
-
-    /**
-     * A parameter that represents an array
-     * @param {string} name - The name of the parameter in snake_case
-     * @param {string} shortName - The name of the serialized form of the parameter
-     *                         If a value is not provided, the parameter will not be serialized.
-     * @param {string} [sep='.'] - The separator to use when joining the array elements together
-     * @param {function} [process=cloudinary.Util.identity ] - Manipulate origValue when value is called
-     * @class ArrayParam
-     * @extends Param
-     * @ignore
-     */
-
-    function ArrayParam(name, shortName, sep, process) {
-      if (sep == null) {
-        sep = '.';
-      }
-      this.sep = sep;
-      ArrayParam.__super__.constructor.call(this, name, shortName, process);
-    }
-
-    ArrayParam.prototype.serialize = function() {
-      var arrayValue, flat, t;
-      if (this.shortName != null) {
-        arrayValue = this.value();
-        if (cloudinary.Util.isEmpty(arrayValue)) {
-          return '';
-        } else if (cloudinary.Util.isString(arrayValue)) {
-          return this.shortName + "_" + arrayValue;
-        } else {
-          flat = (function() {
-            var j, len, results;
-            results = [];
-            for (j = 0, len = arrayValue.length; j < len; j++) {
-              t = arrayValue[j];
-              if (cloudinary.Util.isFunction(t.serialize)) {
-                results.push(t.serialize());
-              } else {
-                results.push(t);
-              }
-            }
-            return results;
-          })();
-          return this.shortName + "_" + (flat.join(this.sep));
-        }
-      } else {
-        return '';
-      }
-    };
-
-    ArrayParam.prototype.value = function() {
-      var j, len, ref, results, v;
-      if (cloudinary.Util.isArray(this.origValue)) {
-        ref = this.origValue;
-        results = [];
-        for (j = 0, len = ref.length; j < len; j++) {
-          v = ref[j];
-          results.push(this.process(v));
-        }
-        return results;
-      } else {
-        return this.process(this.origValue);
-      }
-    };
-
-    ArrayParam.prototype.set = function(origValue) {
-      if ((origValue == null) || cloudinary.Util.isArray(origValue)) {
-        return ArrayParam.__super__.set.call(this, origValue);
-      } else {
-        return ArrayParam.__super__.set.call(this, [origValue]);
-      }
-    };
-
-    return ArrayParam;
-
-  })(Param);
-  TransformationParam = (function(superClass) {
-    extend(TransformationParam, superClass);
-
-
-    /**
-     * A parameter that represents a transformation
-     * @param {string} name - The name of the parameter in snake_case
-     * @param {string} [shortName='t'] - The name of the serialized form of the parameter
-     * @param {string} [sep='.'] - The separator to use when joining the array elements together
-     * @param {function} [process=cloudinary.Util.identity ] - Manipulate origValue when value is called
-     * @class TransformationParam
-     * @extends Param
-     * @ignore
-     */
-
-    function TransformationParam(name, shortName, sep, process) {
-      if (shortName == null) {
-        shortName = "t";
-      }
-      if (sep == null) {
-        sep = '.';
-      }
-      this.sep = sep;
-      TransformationParam.__super__.constructor.call(this, name, shortName, process);
-    }
-
-    TransformationParam.prototype.serialize = function() {
-      var joined, result, t;
-      if (cloudinary.Util.isEmpty(this.value())) {
-        return '';
-      } else if (cloudinary.Util.allStrings(this.value())) {
-        joined = this.value().join(this.sep);
-        if (!cloudinary.Util.isEmpty(joined)) {
-          return this.shortName + "_" + joined;
-        } else {
-          return '';
-        }
-      } else {
-        result = (function() {
-          var j, len, ref, results;
-          ref = this.value();
-          results = [];
-          for (j = 0, len = ref.length; j < len; j++) {
-            t = ref[j];
-            if (t != null) {
-              if (cloudinary.Util.isString(t) && !cloudinary.Util.isEmpty(t)) {
-                results.push(this.shortName + "_" + t);
-              } else if (cloudinary.Util.isFunction(t.serialize)) {
-                results.push(t.serialize());
-              } else if (cloudinary.Util.isPlainObject(t) && !cloudinary.Util.isEmpty(t)) {
-                results.push(new Transformation(t).serialize());
-              } else {
-                results.push(void 0);
-              }
-            }
-          }
-          return results;
-        }).call(this);
-        return cloudinary.Util.compact(result);
-      }
-    };
-
-    TransformationParam.prototype.set = function(origValue1) {
-      this.origValue = origValue1;
-      if (cloudinary.Util.isArray(this.origValue)) {
-        return TransformationParam.__super__.set.call(this, this.origValue);
-      } else {
-        return TransformationParam.__super__.set.call(this, [this.origValue]);
-      }
-    };
-
-    return TransformationParam;
-
-  })(Param);
-  RangeParam = (function(superClass) {
-    extend(RangeParam, superClass);
-
-
-    /**
-     * A parameter that represents a range
-     * @param {string} name - The name of the parameter in snake_case
-     * @param {string} shortName - The name of the serialized form of the parameter
-     *                         If a value is not provided, the parameter will not be serialized.
-     * @param {function} [process=norm_range_value ] - Manipulate origValue when value is called
-     * @class RangeParam
-     * @extends Param
-     * @ignore
-     */
-
-    function RangeParam(name, shortName, process) {
-      if (process == null) {
-        process = this.norm_range_value;
-      }
-      RangeParam.__super__.constructor.call(this, name, shortName, process);
-    }
-
-    RangeParam.norm_range_value = function(value) {
-      var modifier, offset;
-      offset = String(value).match(new RegExp('^' + offset_any_pattern + '$'));
-      if (offset) {
-        modifier = offset[5] != null ? 'p' : '';
-        value = (offset[1] || offset[4]) + modifier;
-      }
-      return value;
-    };
-
-    return RangeParam;
-
-  })(Param);
-  RawParam = (function(superClass) {
-    extend(RawParam, superClass);
-
-    function RawParam(name, shortName, process) {
-      if (process == null) {
-        process = cloudinary.Util.identity;
-      }
-      RawParam.__super__.constructor.call(this, name, shortName, process);
-    }
-
-    RawParam.prototype.serialize = function() {
-      return this.value();
-    };
-
-    return RawParam;
-
-  })(Param);
-  LayerParam = (function(superClass) {
-    var LAYER_KEYWORD_PARAMS;
-
-    extend(LayerParam, superClass);
-
-    function LayerParam() {
-      return LayerParam.__super__.constructor.apply(this, arguments);
-    }
-
-    LayerParam.prototype.value = function() {
-      var layerOptions, result;
-      layerOptions = this.origValue;
-      if (cloudinary.Util.isPlainObject(layerOptions)) {
-        layerOptions = Util.withCamelCaseKeys(layerOptions);
-        if (layerOptions.resourceType === "text" || (layerOptions.text != null)) {
-          result = new cloudinary.TextLayer(layerOptions).toString();
-        } else if (layerOptions.resourceType === "subtitles") {
-          result = new cloudinary.SubtitlesLayer(layerOptions).toString();
-        } else if (layerOptions.resourceType === "fetch" || (layerOptions.url != null)) {
-          result = new cloudinary.FetchLayer(layerOptions).toString();
-        } else {
-          result = new cloudinary.Layer(layerOptions).toString();
-        }
-      } else if (/^fetch:.+/.test(layerOptions)) {
-        result = new FetchLayer(layerOptions.substr(6)).toString();
-      } else {
-        result = layerOptions;
-      }
-      return result;
-    };
-
-    LAYER_KEYWORD_PARAMS = [["font_weight", "normal"], ["font_style", "normal"], ["text_decoration", "none"], ["text_align", null], ["stroke", "none"], ["letter_spacing", null], ["line_spacing", null]];
-
-    LayerParam.prototype.textStyle = function(layer) {
-      return (new cloudinary.TextLayer(layer)).textStyleIdentifier();
-    };
-
-    return LayerParam;
-
-  })(Param);
-  ExpressionParam = (function(superClass) {
-    extend(ExpressionParam, superClass);
-
-    function ExpressionParam() {
-      return ExpressionParam.__super__.constructor.apply(this, arguments);
-    }
-
-    ExpressionParam.prototype.serialize = function() {
-      return Expression.normalize(ExpressionParam.__super__.serialize.call(this));
-    };
-
-    return ExpressionParam;
-
-  })(Param);
-  parameters = {};
-  parameters.Param = Param;
-  parameters.ArrayParam = ArrayParam;
-  parameters.RangeParam = RangeParam;
-  parameters.RawParam = RawParam;
-  parameters.TransformationParam = TransformationParam;
-  parameters.LayerParam = LayerParam;
-  parameters.ExpressionParam = ExpressionParam;
-  Expression = (function() {
-
-    /**
-     * @internal
-     */
-    var faceCount;
-
-    Expression.OPERATORS = {
-      "=": 'eq',
-      "!=": 'ne',
-      "<": 'lt',
-      ">": 'gt',
-      "<=": 'lte',
-      ">=": 'gte',
-      "&&": 'and',
-      "||": 'or',
-      "*": "mul",
-      "/": "div",
-      "+": "add",
-      "-": "sub",
-      "^": "pow",
-    };
-
-
-    /**
-     * @internal
-     */
-
-    Expression.PREDEFINED_VARS = {
-      "aspect_ratio": "ar",
-      "aspectRatio": "ar",
-      "current_page": "cp",
-      "currentPage": "cp",
-      "face_count": "fc",
-      "faceCount": "fc",
-      "height": "h",
-      "initial_aspect_ratio": "iar",
-      "initial_height": "ih",
-      "initial_width": "iw",
-      "initialAspectRatio": "iar",
-      "initialHeight": "ih",
-      "initialWidth": "iw",
-      "page_count": "pc",
-      "page_x": "px",
-      "page_y": "py",
-      "pageCount": "pc",
-      "pageX": "px",
-      "pageY": "py",
-      "tags": "tags",
-      "width": "w"
-    };
-
-
-    /**
-     * @internal
-     */
-
-    Expression.BOUNDRY = "[ _]+";
-
-
-    /**
-     * Represents a transformation expression
-     * @param {string} expressionStr - a expression in string format
-     * @class Expression
-     *
-     */
-
-    function Expression(expressionStr) {
-
-      /**
-        * @protected
-        * @inner Expression-expressions
-       */
-      this.expressions = [];
-      if (expressionStr != null) {
-        this.expressions.push(Expression.normalize(expressionStr));
-      }
-    }
-
-
-    /**
-     * Convenience constructor method
-     * @function Expression.new
-     */
-
-    Expression["new"] = function(expressionStr) {
-      return new this(expressionStr);
-    };
-
-    /**
-     * Normalize a string expression
-     * @function Cloudinary#normalize
-     * @param {string} expression a expression, e.g. "w gt 100", "width_gt_100", "width > 100"
-     * @return {string} the normalized form of the value expression, e.g. "w_gt_100"
-     */
-    Expression.normalize = function(expression) {
-      var operators, operatorsPattern, operatorsReplaceRE, predefinedVarsPattern, predefinedVarsReplaceRE;
-      if (expression == null) {
-        return expression;
-      }
-      expression = String(expression);
-      operators = "\\|\\||>=|<=|&&|!=|>|=|<|/|-|\\+|\\*|\\^";
-
-      // operators
-      operatorsPattern = "((" + operators + ")(?=[ _]))";
-      operatorsReplaceRE = new RegExp(operatorsPattern, "g");
-      expression = expression.replace(operatorsReplaceRE, function (match) {
-        return Expression.OPERATORS[match];
-      });
-
-      // predefined variables
-      predefinedVarsPattern = "(" + Object.keys(Expression.PREDEFINED_VARS).join("|") + ")";
-      predefinedVarsReplaceRE = new RegExp(predefinedVarsPattern, "g");
-      expression = expression.replace(predefinedVarsReplaceRE, function(match, p1, offset){
-        return (expression[offset - 1] === '$' ? match : Expression.PREDEFINED_VARS[match]);
-      });
-
-      return expression.replace(/[ _]+/g, '_');
-    };
-
-    /**
-     * Serialize the expression
-     * @return {string} the expression as a string
-     */
-
-    Expression.prototype.serialize = function() {
-      return Expression.normalize(this.expressions.join("_"));
-    };
-
-    Expression.prototype.toString = function() {
-      return this.serialize();
-    };
-
-
-    /**
-     * Get the parent transformation of this expression
-     * @return Transformation
-     */
-
-    Expression.prototype.getParent = function() {
-      return this.parent;
-    };
-
-
-    /**
-     * Set the parent transformation of this expression
-     * @param {Transformation} the parent transformation
-     * @return {Expression} this expression
-     */
-
-    Expression.prototype.setParent = function(parent) {
-      this.parent = parent;
-      return this;
-    };
-
-
-    /**
-     * Add a expression
-     * @function Expression#predicate
-     * @internal
-     */
-
-    Expression.prototype.predicate = function(name, operator, value) {
-      if (Expression.OPERATORS[operator] != null) {
-        operator = Expression.OPERATORS[operator];
-      }
-      this.expressions.push(name + "_" + operator + "_" + value);
-      return this;
-    };
-
-
-    /**
-     * @function Expression#and
-     */
-
-    Expression.prototype.and = function() {
-      this.expressions.push("and");
-      return this;
-    };
-
-
-    /**
-     * @function Expression#or
-     */
-
-    Expression.prototype.or = function() {
-      this.expressions.push("or");
-      return this;
-    };
-
-
-    /**
-     * Conclude expression
-     * @function Expression#then
-     * @return {Transformation} the transformation this expression is defined for
-     */
-
-    Expression.prototype.then = function() {
-      return this.getParent()["if"](this.toString());
-    };
-
-
-    /**
-     * @function Expression#height
-     * @param {string} operator the comparison operator (e.g. "<", "lt")
-     * @param {string|number} value the right hand side value
-     * @return {Expression} this expression
-     */
-
-    Expression.prototype.height = function(operator, value) {
-      return this.predicate("h", operator, value);
-    };
-
-
-    /**
-     * @function Expression#width
-     * @param {string} operator the comparison operator (e.g. "<", "lt")
-     * @param {string|number} value the right hand side value
-     * @return {Expression} this expression
-     */
-
-    Expression.prototype.width = function(operator, value) {
-      return this.predicate("w", operator, value);
-    };
-
-
-    /**
-     * @function Expression#aspectRatio
-     * @param {string} operator the comparison operator (e.g. "<", "lt")
-     * @param {string|number} value the right hand side value
-     * @return {Expression} this expression
-     */
-
-    Expression.prototype.aspectRatio = function(operator, value) {
-      return this.predicate("ar", operator, value);
-    };
-
-
-    /**
-     * @function Expression#pages
-     * @param {string} operator the comparison operator (e.g. "<", "lt")
-     * @param {string|number} value the right hand side value
-     * @return {Expression} this expression
-     */
-
-    Expression.prototype.pageCount = function(operator, value) {
-      return this.predicate("pc", operator, value);
-    };
-
-
-    /**
-     * @function Expression#faces
-     * @param {string} operator the comparison operator (e.g. "<", "lt")
-     * @param {string|number} value the right hand side value
-     * @return {Expression} this expression
-     */
-
-    Expression.prototype.faceCount = function(operator, value) {
-      return this.predicate("fc", operator, value);
-    };
-
-    Expression.prototype.value = function(value) {
-      this.expressions.push(value);
-      return this;
-    };
-
-
-    /**
-     */
-
-    Expression.variable = function(name, value) {
-      return new this(name).value(value);
-    };
-
-
-    /**
-      * @returns a new expression with the predefined variable "width"
-      * @function Expression.width
-     */
-
-    Expression.width = function() {
-      return new this("width");
-    };
-
-
-    /**
-      * @returns a new expression with the predefined variable "height"
-      * @function Expression.height
-     */
-
-    Expression.height = function() {
-      return new this("height");
-    };
-
-
-    /**
-      * @returns a new expression with the predefined variable "initialWidth"
-      * @function Expression.initialWidth
-     */
-
-    Expression.initialWidth = function() {
-      return new this("initialWidth");
-    };
-
-
-    /**
-      * @returns a new expression with the predefined variable "initialHeight"
-      * @function Expression.initialHeight
-     */
-
-    Expression.initialHeight = function() {
-      return new this("initialHeight");
-    };
-
-
-    /**
-      * @returns a new expression with the predefined variable "aspectRatio"
-      * @function Expression.aspectRatio
-     */
-
-    Expression.aspectRatio = function() {
-      return new this("aspectRatio");
-    };
-
-
-    /**
-      * @returns a new expression with the predefined variable "initialAspectRatio"
-      * @function Expression.initialAspectRatio
-     */
-
-    Expression.initialAspectRatio = function() {
-      return new this("initialAspectRatio");
-    };
-
-
-    /**
-      * @returns a new expression with the predefined variable "pageCount"
-      * @function Expression.pageCount
-     */
-
-    Expression.pageCount = function() {
-      return new this("pageCount");
-    };
-
-
-    /**
-      * @returns a new expression with the predefined variable "faceCount"
-      * @function Expression.faceCount
-     */
-
-    faceCount = function() {
-      return new this("faceCount");
-    };
-
-
-    /**
-      * @returns a new expression with the predefined variable "currentPage"
-      * @function Expression.currentPage
-     */
-
-    Expression.currentPage = function() {
-      return new this("currentPage");
-    };
-
-
-    /**
-      * @returns a new expression with the predefined variable "tags"
-      * @function Expression.tags
-     */
-
-    Expression.tags = function() {
-      return new this("tags");
-    };
-
-
-    /**
-      * @returns a new expression with the predefined variable "pageX"
-      * @function Expression.pageX
-     */
-
-    Expression.pageX = function() {
-      return new this("pageX");
-    };
-
-
-    /**
-      * @returns a new expression with the predefined variable "pageY"
-      * @function Expression.pageY
-     */
-
-    Expression.pageY = function() {
-      return new this("pageY");
-    };
-
-    return Expression;
-
-  })();
-  Condition = (function(superClass) {
-    extend(Condition, superClass);
-
-
-    /**
-     * Represents a transformation condition
-     * @param {string} conditionStr - a condition in string format
-     * @class Condition
-     * @example
-     * // normally this class is not instantiated directly
-     * var tr = cloudinary.Transformation.new()
-     *    .if().width( ">", 1000).and().aspectRatio("<", "3:4").then()
-     *      .width(1000)
-     *      .crop("scale")
-     *    .else()
-     *      .width(500)
-     *      .crop("scale")
-     *
-     * var tr = cloudinary.Transformation.new()
-     *    .if("w > 1000 and aspectRatio < 3:4")
-     *      .width(1000)
-     *      .crop("scale")
-     *    .else()
-     *      .width(500)
-     *      .crop("scale")
-     *
-     */
-
-    function Condition(conditionStr) {
-      Condition.__super__.constructor.call(this, conditionStr);
-    }
-
-
-    /**
-     * @function Condition#height
-     * @param {string} operator the comparison operator (e.g. "<", "lt")
-     * @param {string|number} value the right hand side value
-     * @return {Condition} this condition
-     */
-
-    Condition.prototype.height = function(operator, value) {
-      return this.predicate("h", operator, value);
-    };
-
-
-    /**
-     * @function Condition#width
-     * @param {string} operator the comparison operator (e.g. "<", "lt")
-     * @param {string|number} value the right hand side value
-     * @return {Condition} this condition
-     */
-
-    Condition.prototype.width = function(operator, value) {
-      return this.predicate("w", operator, value);
-    };
-
-
-    /**
-     * @function Condition#aspectRatio
-     * @param {string} operator the comparison operator (e.g. "<", "lt")
-     * @param {string|number} value the right hand side value
-     * @return {Condition} this condition
-     */
-
-    Condition.prototype.aspectRatio = function(operator, value) {
-      return this.predicate("ar", operator, value);
-    };
-
-
-    /**
-     * @function Condition#pages
-     * @param {string} operator the comparison operator (e.g. "<", "lt")
-     * @param {string|number} value the right hand side value
-     * @return {Condition} this condition
-     */
-
-    Condition.prototype.pageCount = function(operator, value) {
-      return this.predicate("pc", operator, value);
-    };
-
-
-    /**
-     * @function Condition#faces
-     * @param {string} operator the comparison operator (e.g. "<", "lt")
-     * @param {string|number} value the right hand side value
-     * @return {Condition} this condition
-     */
-
-    Condition.prototype.faceCount = function(operator, value) {
-      return this.predicate("fc", operator, value);
-    };
-
-    return Condition;
-
-  })(Expression);
-
-  /**
-   * Cloudinary configuration class
-   * Depends on 'utils'
-   */
-  Configuration = (function() {
-
-    /**
-     * Defaults configuration.
-     */
-    var DEFAULT_CONFIGURATION_PARAMS, ref;
-
-    DEFAULT_CONFIGURATION_PARAMS = {
-      responsive_class: 'cld-responsive',
-      responsive_use_breakpoints: true,
-      round_dpr: true,
-      secure: (typeof window !== "undefined" && window !== null ? (ref = window.location) != null ? ref.protocol : void 0 : void 0) === 'https:'
-    };
-
-    Configuration.CONFIG_PARAMS = ["api_key", "api_secret", "callback", "cdn_subdomain", "cloud_name", "cname", "private_cdn", "protocol", "resource_type", "responsive", "responsive_class", "responsive_use_breakpoints", "responsive_width", "round_dpr", "secure", "secure_cdn_subdomain", "secure_distribution", "shorten", "type", "upload_preset", "url_suffix", "use_root_path", "version"];
-
-
-    /**
-     * Cloudinary configuration class
-     * @constructor Configuration
-     * @param {Object} options - configuration parameters
-     */
-
-    function Configuration(options) {
-      if (options == null) {
-        options = {};
-      }
-      this.configuration = Util.cloneDeep(options);
-      Util.defaults(this.configuration, DEFAULT_CONFIGURATION_PARAMS);
-    }
-
-
-    /**
-     * Initialize the configuration.
-     * The function first tries to retrieve the configuration form the environment and then from the document.
-     * @function Configuration#init
-     * @return {Configuration} returns this for chaining
-     * @see fromDocument
-     * @see fromEnvironment
-     */
-
-    Configuration.prototype.init = function() {
-      this.fromEnvironment();
-      this.fromDocument();
-      return this;
-    };
-
-
-    /**
-     * Set a new configuration item
-     * @function Configuration#set
-     * @param {string} name - the name of the item to set
-     * @param {*} value - the value to be set
-     * @return {Configuration}
-     *
-     */
-
-    Configuration.prototype.set = function(name, value) {
-      this.configuration[name] = value;
-      return this;
-    };
-
-
-    /**
-     * Get the value of a configuration item
-     * @function Configuration#get
-     * @param {string} name - the name of the item to set
-     * @return {*} the configuration item
-     */
-
-    Configuration.prototype.get = function(name) {
-      return this.configuration[name];
-    };
-
-    Configuration.prototype.merge = function(config) {
-      if (config == null) {
-        config = {};
-      }
-      Util.assign(this.configuration, Util.cloneDeep(config));
-      return this;
-    };
-
-
-    /**
-     * Initialize Cloudinary from HTML meta tags.
-     * @function Configuration#fromDocument
-     * @return {Configuration}
-     * @example <meta name="cloudinary_cloud_name" content="mycloud">
-     *
-     */
-
-    Configuration.prototype.fromDocument = function() {
-      var el, j, len, meta_elements;
-      meta_elements = typeof document !== "undefined" && document !== null ? document.querySelectorAll('meta[name^="cloudinary_"]') : void 0;
-      if (meta_elements) {
-        for (j = 0, len = meta_elements.length; j < len; j++) {
-          el = meta_elements[j];
-          this.configuration[el.getAttribute('name').replace('cloudinary_', '')] = el.getAttribute('content');
-        }
-      }
-      return this;
-    };
-
-
-    /**
-     * Initialize Cloudinary from the `CLOUDINARY_URL` environment variable.
-     *
-     * This function will only run under Node.js environment.
-     * @function Configuration#fromEnvironment
-     * @requires Node.js
-     */
-
-    Configuration.prototype.fromEnvironment = function() {
-      var cloudinary_url, j, k, len, query, ref1, ref2, ref3, uri, uriRegex, v, value;
-      cloudinary_url = typeof process !== "undefined" && process !== null ? (ref1 = process.env) != null ? ref1.CLOUDINARY_URL : void 0 : void 0;
-      if (cloudinary_url != null) {
-        uriRegex = /cloudinary:\/\/(?:(\w+)(?:\:([\w-]+))?@)?([\w\.-]+)(?:\/([^?]*))?(?:\?(.+))?/;
-        uri = uriRegex.exec(cloudinary_url);
-        if (uri) {
-          if (uri[3] != null) {
-            this.configuration['cloud_name'] = uri[3];
-          }
-          if (uri[1] != null) {
-            this.configuration['api_key'] = uri[1];
-          }
-          if (uri[2] != null) {
-            this.configuration['api_secret'] = uri[2];
-          }
-          if (uri[4] != null) {
-            this.configuration['private_cdn'] = uri[4] != null;
-          }
-          if (uri[4] != null) {
-            this.configuration['secure_distribution'] = uri[4];
-          }
-          query = uri[5];
-          if (query != null) {
-            ref2 = query.split('&');
-            for (j = 0, len = ref2.length; j < len; j++) {
-              value = ref2[j];
-              ref3 = value.split('='), k = ref3[0], v = ref3[1];
-              if (v == null) {
-                v = true;
-              }
-              this.configuration[k] = v;
-            }
-          }
-        }
-      }
-      return this;
-    };
-
-
-    /**
-     * Create or modify the Cloudinary client configuration
-     *
-     * Warning: `config()` returns the actual internal configuration object. modifying it will change the configuration.
-     *
-     * This is a backward compatibility method. For new code, use get(), merge() etc.
-     * @function Configuration#config
-     * @param {hash|string|boolean} new_config
-     * @param {string} new_value
-     * @returns {*} configuration, or value
-     *
-     * @see {@link fromEnvironment} for initialization using environment variables
-     * @see {@link fromDocument} for initialization using HTML meta tags
-     */
-
-    Configuration.prototype.config = function(new_config, new_value) {
-      switch (false) {
-        case new_value === void 0:
-          this.set(new_config, new_value);
-          return this.configuration;
-        case !Util.isString(new_config):
-          return this.get(new_config);
-        case !Util.isPlainObject(new_config):
-          this.merge(new_config);
-          return this.configuration;
-        default:
-          return this.configuration;
-      }
-    };
-
-
-    /**
-     * Returns a copy of the configuration parameters
-     * @function Configuration#toOptions
-     * @returns {Object} a key:value collection of the configuration parameters
-     */
-
-    Configuration.prototype.toOptions = function() {
-      return Util.cloneDeep(this.configuration);
-    };
-
-    return Configuration;
-
-  })();
-
-  /**
-   * TransformationBase
-   * Depends on 'configuration', 'parameters','util'
-   * @internal
-   */
-  TransformationBase = (function() {
-    var VAR_NAME_RE, lastArgCallback, processVar;
-
-    VAR_NAME_RE = /^\$[a-zA-Z0-9]+$/;
-
-    TransformationBase.prototype.trans_separator = '/';
-
-    TransformationBase.prototype.param_separator = ',';
-
-    lastArgCallback = function(args) {
-      var callback;
-      callback = args != null ? args[args.length - 1] : void 0;
-      if (Util.isFunction(callback)) {
-        return callback;
-      } else {
-        return void 0;
-      }
-    };
-
-
-    /**
-     * The base class for transformations.
-     * Members of this class are documented as belonging to the {@link Transformation} class for convenience.
-     * @class TransformationBase
-     */
-
-    function TransformationBase(options) {
-      var parent, trans;
-      if (options == null) {
-        options = {};
-      }
-
-      /** @private */
-      parent = void 0;
-
-      /** @private */
-      trans = {};
-
-      /**
-       * Return an options object that can be used to create an identical Transformation
-       * @function Transformation#toOptions
-       * @return {Object} Returns a plain object representing this transformation
-       */
-      this.toOptions || (this.toOptions = function(withChain) {
-        var key, list, opt, ref, ref1, tr, value;
-        if (withChain == null) {
-          withChain = true;
-        }
-        opt = {};
-        for (key in trans) {
-          value = trans[key];
-          opt[key] = value.origValue;
-        }
-        ref = this.otherOptions;
-        for (key in ref) {
-          value = ref[key];
-          if (value !== void 0) {
-            opt[key] = value;
-          }
-        }
-        if (withChain && !Util.isEmpty(this.chained)) {
-          list = (function() {
-            var j, len, ref1, results;
-            ref1 = this.chained;
-            results = [];
-            for (j = 0, len = ref1.length; j < len; j++) {
-              tr = ref1[j];
-              results.push(tr.toOptions());
-            }
-            return results;
-          }).call(this);
-          list.push(opt);
-          opt = {};
-          ref1 = this.otherOptions;
-          for (key in ref1) {
-            value = ref1[key];
-            if (value !== void 0) {
-              opt[key] = value;
-            }
-          }
-          opt.transformation = list;
-        }
-        return opt;
-      });
-
-      /**
-       * Set a parent for this object for chaining purposes.
-       *
-       * @function Transformation#setParent
-       * @param {Object} object - the parent to be assigned to
-       * @returns {Transformation} Returns this instance for chaining purposes.
-       */
-      this.setParent || (this.setParent = function(object) {
-        parent = object;
-        if (object != null) {
-          this.fromOptions(typeof object.toOptions === "function" ? object.toOptions() : void 0);
-        }
-        return this;
-      });
-
-      /**
-       * Returns the parent of this object in the chain
-       * @function Transformation#getParent
-       * @protected
-       * @return {Object} Returns the parent of this object if there is any
-       */
-      this.getParent || (this.getParent = function() {
-        return parent;
-      });
-
-      /** @protected */
-      this.param || (this.param = function(value, name, abbr, defaultValue, process) {
-        if (process == null) {
-          if (Util.isFunction(defaultValue)) {
-            process = defaultValue;
-          } else {
-            process = Util.identity;
-          }
-        }
-        trans[name] = new Param(name, abbr, process).set(value);
-        return this;
-      });
-
-      /** @protected */
-      this.rawParam || (this.rawParam = function(value, name, abbr, defaultValue, process) {
-        if (process == null) {
-          process = Util.identity;
-        }
-        process = lastArgCallback(arguments);
-        trans[name] = new RawParam(name, abbr, process).set(value);
-        return this;
-      });
-
-      /** @protected */
-      this.rangeParam || (this.rangeParam = function(value, name, abbr, defaultValue, process) {
-        if (process == null) {
-          process = Util.identity;
-        }
-        process = lastArgCallback(arguments);
-        trans[name] = new RangeParam(name, abbr, process).set(value);
-        return this;
-      });
-
-      /** @protected */
-      this.arrayParam || (this.arrayParam = function(value, name, abbr, sep, defaultValue, process) {
-        if (sep == null) {
-          sep = ":";
-        }
-        if (defaultValue == null) {
-          defaultValue = [];
-        }
-        if (process == null) {
-          process = Util.identity;
-        }
-        process = lastArgCallback(arguments);
-        trans[name] = new ArrayParam(name, abbr, sep, process).set(value);
-        return this;
-      });
-
-      /** @protected */
-      this.transformationParam || (this.transformationParam = function(value, name, abbr, sep, defaultValue, process) {
-        if (sep == null) {
-          sep = ".";
-        }
-        if (process == null) {
-          process = Util.identity;
-        }
-        process = lastArgCallback(arguments);
-        trans[name] = new TransformationParam(name, abbr, sep, process).set(value);
-        return this;
-      });
-      this.layerParam || (this.layerParam = function(value, name, abbr) {
-        trans[name] = new LayerParam(name, abbr).set(value);
-        return this;
-      });
-
-      /**
-       * Get the value associated with the given name.
-       * @function Transformation#getValue
-       * @param {string} name - the name of the parameter
-       * @return {*} the processed value associated with the given name
-       * @description Use {@link get}.origValue for the value originally provided for the parameter
-       */
-      this.getValue || (this.getValue = function(name) {
-        var ref, ref1;
-        return (ref = (ref1 = trans[name]) != null ? ref1.value() : void 0) != null ? ref : this.otherOptions[name];
-      });
-
-      /**
-       * Get the parameter object for the given parameter name
-       * @function Transformation#get
-       * @param {string} name the name of the transformation parameter
-       * @returns {Param} the param object for the given name, or undefined
-       */
-      this.get || (this.get = function(name) {
-        return trans[name];
-      });
-
-      /**
-       * Remove a transformation option from the transformation.
-       * @function Transformation#remove
-       * @param {string} name - the name of the option to remove
-       * @return {*} Returns the option that was removed or null if no option by that name was found. The type of the
-       *              returned value depends on the value.
-       */
-      this.remove || (this.remove = function(name) {
-        var temp;
-        switch (false) {
-          case trans[name] == null:
-            temp = trans[name];
-            delete trans[name];
-            return temp.origValue;
-          case this.otherOptions[name] == null:
-            temp = this.otherOptions[name];
-            delete this.otherOptions[name];
-            return temp;
-          default:
-            return null;
-        }
-      });
-
-      /**
-       * Return an array of all the keys (option names) in the transformation.
-       * @return {Array<string>} the keys in snakeCase format
-       */
-      this.keys || (this.keys = function() {
-        var key;
-        return ((function() {
-          var results;
-          results = [];
-          for (key in trans) {
-            if (key != null) {
-              results.push(key.match(VAR_NAME_RE) ? key : Util.snakeCase(key));
-            }
-          }
-          return results;
-        })()).sort();
-      });
-
-      /**
-       * Returns a plain object representation of the transformation. Values are processed.
-       * @function Transformation#toPlainObject
-       * @return {Object} the transformation options as plain object
-       */
-      this.toPlainObject || (this.toPlainObject = function() {
-        var hash, key, list, tr;
-        hash = {};
-        for (key in trans) {
-          hash[key] = trans[key].value();
-          if (Util.isPlainObject(hash[key])) {
-            hash[key] = Util.cloneDeep(hash[key]);
-          }
-        }
-        if (!Util.isEmpty(this.chained)) {
-          list = (function() {
-            var j, len, ref, results;
-            ref = this.chained;
-            results = [];
-            for (j = 0, len = ref.length; j < len; j++) {
-              tr = ref[j];
-              results.push(tr.toPlainObject());
-            }
-            return results;
-          }).call(this);
-          list.push(hash);
-          hash = {
-            transformation: list
-          };
-        }
-        return hash;
-      });
-
-      /**
-       * Complete the current transformation and chain to a new one.
-       * In the URL, transformations are chained together by slashes.
-       * @function Transformation#chain
-       * @return {Transformation} Returns this transformation for chaining
-       * @example
-       * var tr = cloudinary.Transformation.new();
-       * tr.width(10).crop('fit').chain().angle(15).serialize()
-       * // produces "c_fit,w_10/a_15"
-       */
-      this.chain || (this.chain = function() {
-        var names, tr;
-        names = Object.getOwnPropertyNames(trans);
-        if (names.length !== 0) {
-          tr = new this.constructor(this.toOptions(false));
-          this.resetTransformations();
-          this.chained.push(tr);
-        }
-        return this;
-      });
-      this.resetTransformations || (this.resetTransformations = function() {
-        trans = {};
-        return this;
-      });
-      this.otherOptions || (this.otherOptions = {});
-      this.chained = [];
-      if (!Util.isEmpty(options)) {
-        this.fromOptions(options);
-      }
-    }
-
-
-    /**
-     * Merge the provided options with own's options
-     * @param {Object} [options={}] key-value list of options
-     * @returns {Transformation} Returns this instance for chaining
-     */
-
-    TransformationBase.prototype.fromOptions = function(options) {
-      var key, opt;
-      if (options instanceof TransformationBase) {
-        this.fromTransformation(options);
-      } else {
-        options || (options = {});
-        if (Util.isString(options) || Util.isArray(options)) {
-          options = {
-            transformation: options
-          };
-        }
-        options = Util.cloneDeep(options, function(value) {
-          if (value instanceof TransformationBase) {
-            return new value.constructor(value.toOptions());
-          }
-        });
-        if (options["if"]) {
-          this.set("if", options["if"]);
-          delete options["if"];
-        }
-        for (key in options) {
-          opt = options[key];
-          if (key.match(VAR_NAME_RE)) {
-            if (key !== '$attr') {
-              this.set('variable', key, opt);
-            }
-          } else {
-            this.set(key, opt);
-          }
-        }
-      }
-      return this;
-    };
-
-    TransformationBase.prototype.fromTransformation = function(other) {
-      var j, key, len, ref;
-      if (other instanceof TransformationBase) {
-        ref = other.keys();
-        for (j = 0, len = ref.length; j < len; j++) {
-          key = ref[j];
-          this.set(key, other.get(key).origValue);
-        }
-      }
-      return this;
-    };
-
-
-    /**
-     * Set a parameter.
-     * The parameter name `key` is converted to
-     * @param {string} key - the name of the parameter
-     * @param {*} value - the value of the parameter
-     * @returns {Transformation} Returns this instance for chaining
-     */
-
-    TransformationBase.prototype.set = function() {
-      var camelKey, key, values;
-      key = arguments[0], values = 2 <= arguments.length ? slice.call(arguments, 1) : [];
-      camelKey = Util.camelCase(key);
-      if (Util.contains(Transformation.methods, camelKey)) {
-        this[camelKey].apply(this, values);
-      } else {
-        this.otherOptions[key] = values[0];
-      }
-      return this;
-    };
-
-    TransformationBase.prototype.hasLayer = function() {
-      return this.getValue("overlay") || this.getValue("underlay");
-    };
-
-
-    /**
-     * Generate a string representation of the transformation.
-     * @function Transformation#serialize
-     * @return {string} Returns the transformation as a string
-     */
-
-    TransformationBase.prototype.serialize = function() {
-      var ifParam, j, len, paramList, ref, ref1, ref2, ref3, ref4, resultArray, t, tr, transformationList, transformationString, transformations, value, variables, vars;
-      resultArray = (function() {
-        var j, len, ref, results;
-        ref = this.chained;
-        results = [];
-        for (j = 0, len = ref.length; j < len; j++) {
-          tr = ref[j];
-          results.push(tr.serialize());
-        }
-        return results;
-      }).call(this);
-      paramList = this.keys();
-      transformations = (ref = this.get("transformation")) != null ? ref.serialize() : void 0;
-      ifParam = (ref1 = this.get("if")) != null ? ref1.serialize() : void 0;
-      variables = processVar((ref2 = this.get("variables")) != null ? ref2.value() : void 0);
-      paramList = Util.difference(paramList, ["transformation", "if", "variables"]);
-      vars = [];
-      transformationList = [];
-      for (j = 0, len = paramList.length; j < len; j++) {
-        t = paramList[j];
-        if (t.match(VAR_NAME_RE)) {
-          vars.push(t + "_" + Expression.normalize((ref3 = this.get(t)) != null ? ref3.value() : void 0));
-        } else {
-          transformationList.push((ref4 = this.get(t)) != null ? ref4.serialize() : void 0);
-        }
-      }
-      switch (false) {
-        case !Util.isString(transformations):
-          transformationList.push(transformations);
-          break;
-        case !Util.isArray(transformations):
-          resultArray = resultArray.concat(transformations);
-      }
-      transformationList = (function() {
-        var l, len1, results;
-        results = [];
-        for (l = 0, len1 = transformationList.length; l < len1; l++) {
-          value = transformationList[l];
-          if (Util.isArray(value) && !Util.isEmpty(value) || !Util.isArray(value) && value) {
-            results.push(value);
-          }
-        }
-        return results;
-      })();
-      transformationList = vars.sort().concat(variables).concat(transformationList.sort());
-      if (ifParam === "if_end") {
-        transformationList.push(ifParam);
-      } else if (!Util.isEmpty(ifParam)) {
-        transformationList.unshift(ifParam);
-      }
-      transformationString = Util.compact(transformationList).join(this.param_separator);
-      if (!Util.isEmpty(transformationString)) {
-        resultArray.push(transformationString);
-      }
-      return Util.compact(resultArray).join(this.trans_separator);
-    };
-
-
-    /**
-     * Provide a list of all the valid transformation option names
-     * @function Transformation#listNames
-     * @private
-     * @return {Array<string>} a array of all the valid option names
-     */
-
-    TransformationBase.prototype.listNames = function() {
-      return Transformation.methods;
-    };
-
-
-    /**
-     * Returns attributes for an HTML tag.
-     * @function Cloudinary.toHtmlAttributes
-     * @return PlainObject
-     */
-
-    TransformationBase.prototype.toHtmlAttributes = function() {
-      var attrName, height, j, key, len, options, ref, ref1, ref2, ref3, value;
-      options = {};
-      ref = this.otherOptions;
-      for (key in ref) {
-        value = ref[key];
-        if (!(!Util.contains(Transformation.PARAM_NAMES, Util.snakeCase(key)))) {
-          continue;
-        }
-        attrName = /^html_/.test(key) ? key.slice(5) : key;
-        options[attrName] = value;
-      }
-      ref1 = this.keys();
-      for (j = 0, len = ref1.length; j < len; j++) {
-        key = ref1[j];
-        if (/^html_/.test(key)) {
-          options[Util.camelCase(key.slice(5))] = this.getValue(key);
-        }
-      }
-      if (!(this.hasLayer() || this.getValue("angle") || Util.contains(["fit", "limit", "lfill"], this.getValue("crop")))) {
-        width = (ref2 = this.get("width")) != null ? ref2.origValue : void 0;
-        height = (ref3 = this.get("height")) != null ? ref3.origValue : void 0;
-        if (parseFloat(width) >= 1.0) {
-          if (options['width'] == null) {
-            options['width'] = width;
-          }
-        }
-        if (parseFloat(height) >= 1.0) {
-          if (options['height'] == null) {
-            options['height'] = height;
-          }
-        }
-      }
-      return options;
-    };
-
-    TransformationBase.prototype.isValidParamName = function(name) {
-      return Transformation.methods.indexOf(Util.camelCase(name)) >= 0;
-    };
-
-
-    /**
-     * Delegate to the parent (up the call chain) to produce HTML
-     * @function Transformation#toHtml
-     * @return {string} HTML representation of the parent if possible.
-     * @example
-     * tag = cloudinary.ImageTag.new("sample", {cloud_name: "demo"})
-     * // ImageTag {name: "img", publicId: "sample"}
-     * tag.toHtml()
-     * // <img src="http://res.cloudinary.com/demo/image/upload/sample">
-     * tag.transformation().crop("fit").width(300).toHtml()
-     * // <img src="http://res.cloudinary.com/demo/image/upload/c_fit,w_300/sample">
-     */
-
-    TransformationBase.prototype.toHtml = function() {
-      var ref;
-      return (ref = this.getParent()) != null ? typeof ref.toHtml === "function" ? ref.toHtml() : void 0 : void 0;
-    };
-
-    TransformationBase.prototype.toString = function() {
-      return this.serialize();
-    };
-
-    processVar = function(varArray) {
-      var j, len, name, ref, results, v;
-      if (Util.isArray(varArray)) {
-        results = [];
-        for (j = 0, len = varArray.length; j < len; j++) {
-          ref = varArray[j], name = ref[0], v = ref[1];
-          results.push(name + "_" + (Expression.normalize(v)));
-        }
-        return results;
-      } else {
-        return varArray;
-      }
-
-      /**
-       * Transformation Class methods.
-       * This is a list of the parameters defined in Transformation.
-       * Values are camelCased.
-       * @const Transformation.methods
-       * @private
-       * @ignore
-       * @type {Array<string>}
-       */
-
-      /**
-       * Parameters that are filtered out before passing the options to an HTML tag.
-       *
-       * The list of parameters is a combination of `Transformation::methods` and `Configuration::CONFIG_PARAMS`
-       * @const {Array<string>} Transformation.PARAM_NAMES
-       * @private
-       * @ignore
-       * @see toHtmlAttributes
-       */
-    };
-
-    return TransformationBase;
-
-  })();
-  Transformation = (function(superClass) {
-    extend(Transformation, superClass);
-
-
-    /**
-     *  Represents a single transformation.
-     *  @class Transformation
-     *  @example
-     *  t = new cloudinary.Transformation();
-     * t.angle(20).crop("scale").width("auto");
-     *
-     * // or
-     *
-     * t = new cloudinary.Transformation( {angle: 20, crop: "scale", width: "auto"});
-     */
-
-    function Transformation(options) {
-      if (options == null) {
-        options = {};
-      }
-      Transformation.__super__.constructor.call(this, options);
-      this;
-    }
-
-
-    /**
-     * Convenience constructor
-     * @param {Object} options
-     * @return {Transformation}
-     * @example cl = cloudinary.Transformation.new( {angle: 20, crop: "scale", width: "auto"})
-     */
-
-    Transformation["new"] = function(args) {
-      return new Transformation(args);
-    };
-
-
-    /*
-      Transformation Parameters
-     */
-
-    Transformation.prototype.angle = function(value) {
-      return this.arrayParam(value, "angle", "a", ".", Expression.normalize);
-    };
-
-    Transformation.prototype.audioCodec = function(value) {
-      return this.param(value, "audio_codec", "ac");
-    };
-
-    Transformation.prototype.audioFrequency = function(value) {
-      return this.param(value, "audio_frequency", "af");
-    };
-
-    Transformation.prototype.aspectRatio = function(value) {
-      return this.param(value, "aspect_ratio", "ar", Expression.normalize);
-    };
-
-    Transformation.prototype.background = function(value) {
-      return this.param(value, "background", "b", Param.norm_color);
-    };
-
-    Transformation.prototype.bitRate = function(value) {
-      return this.param(value, "bit_rate", "br");
-    };
-
-    Transformation.prototype.border = function(value) {
-      return this.param(value, "border", "bo", function(border) {
-        if (Util.isPlainObject(border)) {
-          border = Util.assign({}, {
-            color: "black",
-            width: 2
-          }, border);
-          return border.width + "px_solid_" + (Param.norm_color(border.color));
-        } else {
-          return border;
-        }
-      });
-    };
-
-    Transformation.prototype.color = function(value) {
-      return this.param(value, "color", "co", Param.norm_color);
-    };
-
-    Transformation.prototype.colorSpace = function(value) {
-      return this.param(value, "color_space", "cs");
-    };
-
-    Transformation.prototype.crop = function(value) {
-      return this.param(value, "crop", "c");
-    };
-
-    Transformation.prototype.defaultImage = function(value) {
-      return this.param(value, "default_image", "d");
-    };
-
-    Transformation.prototype.delay = function(value) {
-      return this.param(value, "delay", "dl");
-    };
-
-    Transformation.prototype.density = function(value) {
-      return this.param(value, "density", "dn");
-    };
-
-    Transformation.prototype.duration = function(value) {
-      return this.rangeParam(value, "duration", "du");
-    };
-
-    Transformation.prototype.dpr = function(value) {
-      return this.param(value, "dpr", "dpr", (function(_this) {
-        return function(dpr) {
-          dpr = dpr.toString();
-          if (dpr != null ? dpr.match(/^\d+$/) : void 0) {
-            return dpr + ".0";
-          } else {
-            return Expression.normalize(dpr);
-          }
-        };
-      })(this));
-    };
-
-    Transformation.prototype.effect = function(value) {
-      return this.arrayParam(value, "effect", "e", ":", Expression.normalize);
-    };
-
-    Transformation.prototype["else"] = function() {
-      return this["if"]('else');
-    };
-
-    Transformation.prototype.endIf = function() {
-      return this["if"]('end');
-    };
-
-    Transformation.prototype.endOffset = function(value) {
-      return this.rangeParam(value, "end_offset", "eo");
-    };
-
-    Transformation.prototype.fallbackContent = function(value) {
-      return this.param(value, "fallback_content");
-    };
-
-    Transformation.prototype.fetchFormat = function(value) {
-      return this.param(value, "fetch_format", "f");
-    };
-
-    Transformation.prototype.format = function(value) {
-      return this.param(value, "format");
-    };
-
-    Transformation.prototype.flags = function(value) {
-      return this.arrayParam(value, "flags", "fl", ".");
-    };
-
-    Transformation.prototype.gravity = function(value) {
-      return this.param(value, "gravity", "g");
-    };
-
-    Transformation.prototype.fps = function(value) {
-      return this.param(value, "fps", "fps", (function(_this) {
-        return function(fps) {
-          if (Util.isString(fps)) {
-            return fps;
-          } else if (Util.isArray(fps)) {
-            return fps.join("-");
-          } else {
-            return fps;
-          }
-        };
-      })(this));
-    };
-
-    Transformation.prototype.height = function(value) {
-      return this.param(value, "height", "h", (function(_this) {
-        return function() {
-          if (_this.getValue("crop") || _this.getValue("overlay") || _this.getValue("underlay")) {
-            return Expression.normalize(value);
-          } else {
-            return null;
-          }
-        };
-      })(this));
-    };
-
-    Transformation.prototype.htmlHeight = function(value) {
-      return this.param(value, "html_height");
-    };
-
-    Transformation.prototype.htmlWidth = function(value) {
-      return this.param(value, "html_width");
-    };
-
-    Transformation.prototype["if"] = function(value) {
-      var i, ifVal, j, ref, trIf, trRest;
-      if (value == null) {
-        value = "";
-      }
-      switch (value) {
-        case "else":
-          this.chain();
-          return this.param(value, "if", "if");
-        case "end":
-          this.chain();
-          for (i = j = ref = this.chained.length - 1; j >= 0; i = j += -1) {
-            ifVal = this.chained[i].getValue("if");
-            if (ifVal === "end") {
-              break;
-            } else if (ifVal != null) {
-              trIf = Transformation["new"]()["if"](ifVal);
-              this.chained[i].remove("if");
-              trRest = this.chained[i];
-              this.chained[i] = Transformation["new"]().transformation([trIf, trRest]);
-              if (ifVal !== "else") {
-                break;
-              }
-            }
-          }
-          return this.param(value, "if", "if");
-        case "":
-          return Condition["new"]().setParent(this);
-        default:
-          return this.param(value, "if", "if", function(value) {
-            return Condition["new"](value).toString();
-          });
-      }
-    };
-
-    Transformation.prototype.keyframeInterval = function(value) {
-      return this.param(value, "keyframe_interval", "ki");
-    };
-
-    Transformation.prototype.offset = function(value) {
-      var end_o, ref, start_o;
-      ref = Util.isFunction(value != null ? value.split : void 0) ? value.split('..') : Util.isArray(value) ? value : [null, null], start_o = ref[0], end_o = ref[1];
-      if (start_o != null) {
-        this.startOffset(start_o);
-      }
-      if (end_o != null) {
-        return this.endOffset(end_o);
-      }
-    };
-
-    Transformation.prototype.opacity = function(value) {
-      return this.param(value, "opacity", "o", Expression.normalize);
-    };
-
-    Transformation.prototype.overlay = function(value) {
-      return this.layerParam(value, "overlay", "l");
-    };
-
-    Transformation.prototype.page = function(value) {
-      return this.param(value, "page", "pg");
-    };
-
-    Transformation.prototype.poster = function(value) {
-      return this.param(value, "poster");
-    };
-
-    Transformation.prototype.prefix = function(value) {
-      return this.param(value, "prefix", "p");
-    };
-
-    Transformation.prototype.quality = function(value) {
-      return this.param(value, "quality", "q", Expression.normalize);
-    };
-
-    Transformation.prototype.radius = function(value) {
-      return this.param(value, "radius", "r", Expression.normalize);
-    };
-
-    Transformation.prototype.rawTransformation = function(value) {
-      return this.rawParam(value, "raw_transformation");
-    };
-
-    Transformation.prototype.size = function(value) {
-      var height, ref;
-      if (Util.isFunction(value != null ? value.split : void 0)) {
-        ref = value.split('x'), width = ref[0], height = ref[1];
-        this.width(width);
-        return this.height(height);
-      }
-    };
-
-    Transformation.prototype.sourceTypes = function(value) {
-      return this.param(value, "source_types");
-    };
-
-    Transformation.prototype.sourceTransformation = function(value) {
-      return this.param(value, "source_transformation");
-    };
-
-    Transformation.prototype.startOffset = function(value) {
-      return this.rangeParam(value, "start_offset", "so");
-    };
-
-    Transformation.prototype.streamingProfile = function(value) {
-      return this.param(value, "streaming_profile", "sp");
-    };
-
-    Transformation.prototype.transformation = function(value) {
-      return this.transformationParam(value, "transformation", "t");
-    };
-
-    Transformation.prototype.underlay = function(value) {
-      return this.layerParam(value, "underlay", "u");
-    };
-
-    Transformation.prototype.variable = function(name, value) {
-      return this.param(value, name, name);
-    };
-
-    Transformation.prototype.variables = function(values) {
-      return this.arrayParam(values, "variables");
-    };
-
-    Transformation.prototype.videoCodec = function(value) {
-      return this.param(value, "video_codec", "vc", Param.process_video_params);
-    };
-
-    Transformation.prototype.videoSampling = function(value) {
-      return this.param(value, "video_sampling", "vs");
-    };
-
-    Transformation.prototype.width = function(value) {
-      return this.param(value, "width", "w", (function(_this) {
-        return function() {
-          if (_this.getValue("crop") || _this.getValue("overlay") || _this.getValue("underlay")) {
-            return Expression.normalize(value);
-          } else {
-            return null;
-          }
-        };
-      })(this));
-    };
-
-    Transformation.prototype.x = function(value) {
-      return this.param(value, "x", "x", Expression.normalize);
-    };
-
-    Transformation.prototype.y = function(value) {
-      return this.param(value, "y", "y", Expression.normalize);
-    };
-
-    Transformation.prototype.zoom = function(value) {
-      return this.param(value, "zoom", "z", Expression.normalize);
-    };
-
-    return Transformation;
-
-  })(TransformationBase);
-
-  /**
-   * Transformation Class methods.
-   * This is a list of the parameters defined in Transformation.
-   * Values are camelCased.
-   */
-  Transformation.methods || (Transformation.methods = Util.difference(Util.functions(Transformation.prototype), Util.functions(TransformationBase.prototype)));
-
-  /**
-   * Parameters that are filtered out before passing the options to an HTML tag.
-   *
-   * The list of parameters is a combination of `Transformation::methods` and `Configuration::CONFIG_PARAMS`
-   */
-  Transformation.PARAM_NAMES || (Transformation.PARAM_NAMES = ((function() {
-    var j, len, ref, results;
-    ref = Transformation.methods;
-    results = [];
-    for (j = 0, len = ref.length; j < len; j++) {
-      m = ref[j];
-      results.push(Util.snakeCase(m));
-    }
-    return results;
-  })()).concat(Configuration.CONFIG_PARAMS));
-
-  /**
-   * Generic HTML tag
-   * Depends on 'transformation', 'util'
-   */
-  HtmlTag = (function() {
-
-    /**
-     * Represents an HTML (DOM) tag
-     * @constructor HtmlTag
-     * @param {string} name - the name of the tag
-     * @param {string} [publicId]
-     * @param {Object} options
-     * @example tag = new HtmlTag( 'div', { 'width': 10})
-     */
-    var toAttribute;
-
-    function HtmlTag(name, publicId, options) {
-      var transformation;
-      this.name = name;
-      this.publicId = publicId;
-      if (options == null) {
-        if (Util.isPlainObject(publicId)) {
-          options = publicId;
-          this.publicId = void 0;
-        } else {
-          options = {};
-        }
-      }
-      transformation = new Transformation(options);
-      transformation.setParent(this);
-      this.transformation = function() {
-        return transformation;
-      };
-    }
-
-
-    /**
-     * Convenience constructor
-     * Creates a new instance of an HTML (DOM) tag
-     * @function HtmlTag.new
-     * @param {string} name - the name of the tag
-     * @param {string} [publicId]
-     * @param {Object} options
-     * @return {HtmlTag}
-     * @example tag = HtmlTag.new( 'div', { 'width': 10})
-     */
-
-    HtmlTag["new"] = function(name, publicId, options) {
-      return new this(name, publicId, options);
-    };
-
-
-    /**
-     * Represent the given key and value as an HTML attribute.
-     * @function HtmlTag#toAttribute
-     * @protected
-     * @param {string} key - attribute name
-     * @param {*|boolean} value - the value of the attribute. If the value is boolean `true`, return the key only.
-     * @returns {string} the attribute
-     *
-     */
-
-    toAttribute = function(key, value) {
-      if (!value) {
-        return void 0;
-      } else if (value === true) {
-        return key;
-      } else {
-        return key + "=\"" + value + "\"";
-      }
-    };
-
-
-    /**
-     * combine key and value from the `attr` to generate an HTML tag attributes string.
-     * `Transformation::toHtmlTagOptions` is used to filter out transformation and configuration keys.
-     * @protected
-     * @param {Object} attrs
-     * @return {string} the attributes in the format `'key1="value1" key2="value2"'`
-     * @ignore
-     */
-
-    HtmlTag.prototype.htmlAttrs = function(attrs) {
-      var key, pairs, value;
-      return pairs = ((function() {
-        var results;
-        results = [];
-        for (key in attrs) {
-          value = attrs[key];
-          if (value) {
-            results.push(toAttribute(key, value));
-          }
-        }
-        return results;
-      })()).sort().join(' ');
-    };
-
-
-    /**
-     * Get all options related to this tag.
-     * @function HtmlTag#getOptions
-     * @returns {Object} the options
-     *
-     */
-
-    HtmlTag.prototype.getOptions = function() {
-      return this.transformation().toOptions();
-    };
-
-
-    /**
-     * Get the value of option `name`
-     * @function HtmlTag#getOption
-     * @param {string} name - the name of the option
-     * @returns {*} Returns the value of the option
-     *
-     */
-
-    HtmlTag.prototype.getOption = function(name) {
-      return this.transformation().getValue(name);
-    };
-
-
-    /**
-     * Get the attributes of the tag.
-     * @function HtmlTag#attributes
-     * @returns {Object} attributes
-     */
-
-    HtmlTag.prototype.attributes = function() {
-      return this.transformation().toHtmlAttributes();
-    };
-
-
-    /**
-     * Set a tag attribute named `name` to `value`
-     * @function HtmlTag#setAttr
-     * @param {string} name - the name of the attribute
-     * @param {string} value - the value of the attribute
-     */
-
-    HtmlTag.prototype.setAttr = function(name, value) {
-      this.transformation().set("html_" + name, value);
-      return this;
-    };
-
-
-    /**
-     * Get the value of the tag attribute `name`
-     * @function HtmlTag#getAttr
-     * @param {string} name - the name of the attribute
-     * @returns {*}
-     */
-
-    HtmlTag.prototype.getAttr = function(name) {
-      return this.attributes()["html_" + name] || this.attributes()[name];
-    };
-
-
-    /**
-     * Remove the tag attributed named `name`
-     * @function HtmlTag#removeAttr
-     * @param {string} name - the name of the attribute
-     * @returns {*}
-     */
-
-    HtmlTag.prototype.removeAttr = function(name) {
-      var ref;
-      return (ref = this.transformation().remove("html_" + name)) != null ? ref : this.transformation().remove(name);
-    };
-
-
-    /**
-     * @function HtmlTag#content
-     * @protected
-     * @ignore
-     */
-
-    HtmlTag.prototype.content = function() {
-      return "";
-    };
-
-
-    /**
-     * @function HtmlTag#openTag
-     * @protected
-     * @ignore
-     */
-
-    HtmlTag.prototype.openTag = function() {
-      return "<" + this.name + " " + (this.htmlAttrs(this.attributes())) + ">";
-    };
-
-
-    /**
-     * @function HtmlTag#closeTag
-     * @protected
-     * @ignore
-     */
-
-    HtmlTag.prototype.closeTag = function() {
-      return "</" + this.name + ">";
-    };
-
-
-    /**
-     * Generates an HTML representation of the tag.
-     * @function HtmlTag#toHtml
-     * @returns {string} Returns HTML in string format
-     */
-
-    HtmlTag.prototype.toHtml = function() {
-      return this.openTag() + this.content() + this.closeTag();
-    };
-
-
-    /**
-     * Creates a DOM object representing the tag.
-     * @function HtmlTag#toDOM
-     * @returns {Element}
-     */
-
-    HtmlTag.prototype.toDOM = function() {
-      var element, name, ref, value;
-      if (!Util.isFunction(typeof document !== "undefined" && document !== null ? document.createElement : void 0)) {
-        throw "Can't create DOM if document is not present!";
-      }
-      element = document.createElement(this.name);
-      ref = this.attributes();
-      for (name in ref) {
-        value = ref[name];
-        element[name] = value;
-      }
-      return element;
-    };
-
-    HtmlTag.isResponsive = function(tag, responsiveClass) {
-      var dataSrc;
-      dataSrc = Util.getData(tag, 'src-cache') || Util.getData(tag, 'src');
-      return Util.hasClass(tag, responsiveClass) && /\bw_auto\b/.exec(dataSrc);
-    };
-
-    return HtmlTag;
-
-  })();
-
-  /**
-   * Image Tag
-   * Depends on 'tags/htmltag', 'cloudinary'
-   */
-  ImageTag = (function(superClass) {
-    extend(ImageTag, superClass);
-
-
-    /**
-     * Creates an HTML (DOM) Image tag using Cloudinary as the source.
-     * @constructor ImageTag
-     * @extends HtmlTag
-     * @param {string} [publicId]
-     * @param {Object} [options]
-     */
-
-    function ImageTag(publicId, options) {
-      if (options == null) {
-        options = {};
-      }
-      ImageTag.__super__.constructor.call(this, "img", publicId, options);
-    }
-
-
-    /** @override */
-
-    ImageTag.prototype.closeTag = function() {
-      return "";
-    };
-
-
-    /** @override */
-
-    ImageTag.prototype.attributes = function() {
-      var attr, options, srcAttribute;
-      attr = ImageTag.__super__.attributes.call(this) || [];
-      options = this.getOptions();
-      srcAttribute = options.responsive && !options.client_hints ? 'data-src' : 'src';
-      if (attr[srcAttribute] == null) {
-        attr[srcAttribute] = new Cloudinary(this.getOptions()).url(this.publicId);
-      }
-      return attr;
-    };
-
-    return ImageTag;
-
-  })(HtmlTag);
-
-  /**
-   * Video Tag
-   * Depends on 'tags/htmltag', 'util', 'cloudinary'
-   */
-  VideoTag = (function(superClass) {
-    var DEFAULT_POSTER_OPTIONS, DEFAULT_VIDEO_SOURCE_TYPES, VIDEO_TAG_PARAMS;
-
-    extend(VideoTag, superClass);
-
-    VIDEO_TAG_PARAMS = ['source_types', 'source_transformation', 'fallback_content', 'poster'];
-
-    DEFAULT_VIDEO_SOURCE_TYPES = ['webm', 'mp4', 'ogv'];
-
-    DEFAULT_POSTER_OPTIONS = {
-      format: 'jpg',
-      resource_type: 'video'
-    };
-
-
-    /**
-     * Creates an HTML (DOM) Video tag using Cloudinary as the source.
-     * @constructor VideoTag
-     * @extends HtmlTag
-     * @param {string} [publicId]
-     * @param {Object} [options]
-     */
-
-    function VideoTag(publicId, options) {
-      if (options == null) {
-        options = {};
-      }
-      options = Util.defaults({}, options, Cloudinary.DEFAULT_VIDEO_PARAMS);
-      VideoTag.__super__.constructor.call(this, "video", publicId.replace(/\.(mp4|ogv|webm)$/, ''), options);
-    }
-
-
-    /**
-     * Set the transformation to apply on each source
-     * @function VideoTag#setSourceTransformation
-     * @param {Object} an object with pairs of source type and source transformation
-     * @returns {VideoTag} Returns this instance for chaining purposes.
-     */
-
-    VideoTag.prototype.setSourceTransformation = function(value) {
-      this.transformation().sourceTransformation(value);
-      return this;
-    };
-
-
-    /**
-     * Set the source types to include in the video tag
-     * @function VideoTag#setSourceTypes
-     * @param {Array<string>} an array of source types
-     * @returns {VideoTag} Returns this instance for chaining purposes.
-     */
-
-    VideoTag.prototype.setSourceTypes = function(value) {
-      this.transformation().sourceTypes(value);
-      return this;
-    };
-
-
-    /**
-     * Set the poster to be used in the video tag
-     * @function VideoTag#setPoster
-     * @param {string|Object} value
-     * - string: a URL to use for the poster
-     * - Object: transformation parameters to apply to the poster. May optionally include a public_id to use instead of the video public_id.
-     * @returns {VideoTag} Returns this instance for chaining purposes.
-     */
-
-    VideoTag.prototype.setPoster = function(value) {
-      this.transformation().poster(value);
-      return this;
-    };
-
-
-    /**
-     * Set the content to use as fallback in the video tag
-     * @function VideoTag#setFallbackContent
-     * @param {string} value - the content to use, in HTML format
-     * @returns {VideoTag} Returns this instance for chaining purposes.
-     */
-
-    VideoTag.prototype.setFallbackContent = function(value) {
-      this.transformation().fallbackContent(value);
-      return this;
-    };
-
-    VideoTag.prototype.content = function() {
-      var cld, fallback, innerTags, mimeType, sourceTransformation, sourceTypes, src, srcType, transformation, videoType;
-      sourceTypes = this.transformation().getValue('source_types');
-      sourceTransformation = this.transformation().getValue('source_transformation');
-      fallback = this.transformation().getValue('fallback_content');
-      if (Util.isArray(sourceTypes)) {
-        cld = new Cloudinary(this.getOptions());
-        innerTags = (function() {
-          var j, len, results;
-          results = [];
-          for (j = 0, len = sourceTypes.length; j < len; j++) {
-            srcType = sourceTypes[j];
-            transformation = sourceTransformation[srcType] || {};
-            src = cld.url("" + this.publicId, Util.defaults({}, transformation, {
-              resource_type: 'video',
-              format: srcType
-            }));
-            videoType = srcType === 'ogv' ? 'ogg' : srcType;
-            mimeType = 'video/' + videoType;
-            results.push("<source " + (this.htmlAttrs({
-              src: src,
-              type: mimeType
-            })) + ">");
-          }
-          return results;
-        }).call(this);
-      } else {
-        innerTags = [];
-      }
-      return innerTags.join('') + fallback;
-    };
-
-    VideoTag.prototype.attributes = function() {
-      var a, attr, j, len, poster, ref, ref1, sourceTypes;
-      sourceTypes = this.getOption('source_types');
-      poster = (ref = this.getOption('poster')) != null ? ref : {};
-      if (Util.isPlainObject(poster)) {
-        defaults = poster.public_id != null ? Cloudinary.DEFAULT_IMAGE_PARAMS : DEFAULT_POSTER_OPTIONS;
-        poster = new Cloudinary(this.getOptions()).url((ref1 = poster.public_id) != null ? ref1 : this.publicId, Util.defaults({}, poster, defaults));
-      }
-      attr = VideoTag.__super__.attributes.call(this) || [];
-      for (j = 0, len = attr.length; j < len; j++) {
-        a = attr[j];
-        if (!Util.contains(VIDEO_TAG_PARAMS)) {
-          attr = a;
-        }
-      }
-      if (!Util.isArray(sourceTypes)) {
-        attr["src"] = new Cloudinary(this.getOptions()).url(this.publicId, {
-          resource_type: 'video',
-          format: sourceTypes
-        });
-      }
-      if (poster != null) {
-        attr["poster"] = poster;
-      }
-      return attr;
-    };
-
-    return VideoTag;
-
-  })(HtmlTag);
-
-  /**
-   * Image Tag
-   * Depends on 'tags/htmltag', 'cloudinary'
-   */
-  ClientHintsMetaTag = (function(superClass) {
-    extend(ClientHintsMetaTag, superClass);
-
-
-    /**
-     * Creates an HTML (DOM) Meta tag that enables client-hints.
-     * @constructor ClientHintsMetaTag
-     * @extends HtmlTag
-     */
-
-    function ClientHintsMetaTag(options) {
-      ClientHintsMetaTag.__super__.constructor.call(this, 'meta', void 0, Util.assign({
-        "http-equiv": "Accept-CH",
-        content: "DPR, Viewport-Width, Width"
-      }, options));
-    }
-
-
-    /** @override */
-
-    ClientHintsMetaTag.prototype.closeTag = function() {
-      return "";
-    };
-
-    return ClientHintsMetaTag;
-
-  })(HtmlTag);
-  Cloudinary = (function() {
-    var AKAMAI_SHARED_CDN, CF_SHARED_CDN, DEFAULT_POSTER_OPTIONS, DEFAULT_VIDEO_SOURCE_TYPES, OLD_AKAMAI_SHARED_CDN, SEO_TYPES, SHARED_CDN, VERSION, absolutize, applyBreakpoints, cdnSubdomainNumber, closestAbove, cloudinaryUrlPrefix, defaultBreakpoints, finalizeResourceType, findContainerWidth, maxWidth, updateDpr;
-
-    VERSION = "2.5.0";
-
-    CF_SHARED_CDN = "d3jpl91pxevbkh.cloudfront.net";
-
-    OLD_AKAMAI_SHARED_CDN = "cloudinary-a.akamaihd.net";
-
-    AKAMAI_SHARED_CDN = "res.cloudinary.com";
-
-    SHARED_CDN = AKAMAI_SHARED_CDN;
-
-    DEFAULT_POSTER_OPTIONS = {
-      format: 'jpg',
-      resource_type: 'video'
-    };
-
-    DEFAULT_VIDEO_SOURCE_TYPES = ['webm', 'mp4', 'ogv'];
-
-    SEO_TYPES = {
-      "image/upload": "images",
-      "image/private": "private_images",
-      "image/authenticated": "authenticated_images",
-      "raw/upload": "files",
-      "video/upload": "videos"
-    };
-
-
-    /**
-    * @const {Object} Cloudinary.DEFAULT_IMAGE_PARAMS
-    * Defaults values for image parameters.
-    *
-    * (Previously defined using option_consume() )
-     */
-
-    Cloudinary.DEFAULT_IMAGE_PARAMS = {
-      resource_type: "image",
-      transformation: [],
-      type: 'upload'
-    };
-
-
-    /**
-    * Defaults values for video parameters.
-    * @const {Object} Cloudinary.DEFAULT_VIDEO_PARAMS
-    * (Previously defined using option_consume() )
-     */
-
-    Cloudinary.DEFAULT_VIDEO_PARAMS = {
-      fallback_content: '',
-      resource_type: "video",
-      source_transformation: {},
-      source_types: DEFAULT_VIDEO_SOURCE_TYPES,
-      transformation: [],
-      type: 'upload'
-    };
-
-
-    /**
-     * Main Cloudinary class
-     * @class Cloudinary
-     * @param {Object} options - options to configure Cloudinary
-     * @see Configuration for more details
-     * @example
-     *    var cl = new cloudinary.Cloudinary( { cloud_name: "mycloud"});
-     *    var imgTag = cl.image("myPicID");
-     */
-
-    function Cloudinary(options) {
-      var configuration;
-      this.devicePixelRatioCache = {};
-      this.responsiveConfig = {};
-      this.responsiveResizeInitialized = false;
-      configuration = new Configuration(options);
-      this.config = function(newConfig, newValue) {
-        return configuration.config(newConfig, newValue);
-      };
-
-      /**
-       * Use \<meta\> tags in the document to configure this Cloudinary instance.
-       * @return {Cloudinary} this for chaining
-       */
-      this.fromDocument = function() {
-        configuration.fromDocument();
-        return this;
-      };
-
-      /**
-       * Use environment variables to configure this Cloudinary instance.
-       * @return {Cloudinary} this for chaining
-       */
-      this.fromEnvironment = function() {
-        configuration.fromEnvironment();
-        return this;
-      };
-
-      /**
-       * Initialize configuration.
-       * @function Cloudinary#init
-       * @see Configuration#init
-       * @return {Cloudinary} this for chaining
-       */
-      this.init = function() {
-        configuration.init();
-        return this;
-      };
-    }
-
-
-    /**
-     * Convenience constructor
-     * @param {Object} options
-     * @return {Cloudinary}
-     * @example cl = cloudinary.Cloudinary.new( { cloud_name: "mycloud"})
-     */
-
-    Cloudinary["new"] = function(options) {
-      return new this(options);
-    };
-
-
-    /**
-     * Return the resource type and action type based on the given configuration
-     * @function Cloudinary#finalizeResourceType
-     * @param {Object|string} resourceType
-     * @param {string} [type='upload']
-     * @param {string} [urlSuffix]
-     * @param {boolean} [useRootPath]
-     * @param {boolean} [shorten]
-     * @returns {string} resource_type/type
-     * @ignore
-     */
-
-    finalizeResourceType = function(resourceType, type, urlSuffix, useRootPath, shorten) {
-      var key, options;
-      if (resourceType == null) {
-        resourceType = "image";
-      }
-      if (type == null) {
-        type = "upload";
-      }
-      if (Util.isPlainObject(resourceType)) {
-        options = resourceType;
-        resourceType = options.resource_type;
-        type = options.type;
-        urlSuffix = options.url_suffix;
-        useRootPath = options.use_root_path;
-        shorten = options.shorten;
-      }
-      if (type == null) {
-        type = 'upload';
-      }
-      if (urlSuffix != null) {
-        resourceType = SEO_TYPES[resourceType + "/" + type];
-        type = null;
-        if (resourceType == null) {
-          throw new Error("URL Suffix only supported for " + (((function() {
-            var results;
-            results = [];
-            for (key in SEO_TYPES) {
-              results.push(key);
-            }
-            return results;
-          })()).join(', ')));
-        }
-      }
-      if (useRootPath) {
-        if (resourceType === 'image' && type === 'upload' || resourceType === "images") {
-          resourceType = null;
-          type = null;
-        } else {
-          throw new Error("Root path only supported for image/upload");
-        }
-      }
-      if (shorten && resourceType === 'image' && type === 'upload') {
-        resourceType = 'iu';
-        type = null;
-      }
-      return [resourceType, type].join("/");
-    };
-
-    absolutize = function(url) {
-      var prefix;
-      if (!url.match(/^https?:\//)) {
-        prefix = document.location.protocol + '//' + document.location.host;
-        if (url[0] === '?') {
-          prefix += document.location.pathname;
-        } else if (url[0] !== '/') {
-          prefix += document.location.pathname.replace(/\/[^\/]*$/, '/');
-        }
-        url = prefix + url;
-      }
-      return url;
-    };
-
-
-    /**
-     * Generate an resource URL.
-     * @function Cloudinary#url
-     * @param {string} publicId - the public ID of the resource
-     * @param {Object} [options] - options for the tag and transformations, possible values include all {@link Transformation} parameters
-     *                          and {@link Configuration} parameters
-     * @param {string} [options.type='upload'] - the classification of the resource
-     * @param {Object} [options.resource_type='image'] - the type of the resource
-     * @return {string} The resource URL
-     */
-
-    Cloudinary.prototype.url = function(publicId, options) {
-      var error, error1, prefix, ref, resourceTypeAndType, transformation, transformationString, url, version;
-      if (options == null) {
-        options = {};
-      }
-      if (!publicId) {
-        return publicId;
-      }
-      if (options instanceof Transformation) {
-        options = options.toOptions();
-      }
-      options = Util.defaults({}, options, this.config(), Cloudinary.DEFAULT_IMAGE_PARAMS);
-      if (options.type === 'fetch') {
-        options.fetch_format = options.fetch_format || options.format;
-        publicId = absolutize(publicId);
-      }
-      transformation = new Transformation(options);
-      transformationString = transformation.serialize();
-      if (!options.cloud_name) {
-        throw 'Unknown cloud_name';
-      }
-      if (publicId.search('/') >= 0 && !publicId.match(/^v[0-9]+/) && !publicId.match(/^https?:\//) && !((ref = options.version) != null ? ref.toString() : void 0)) {
-        options.version = 1;
-      }
-      if (publicId.match(/^https?:/)) {
-        if (options.type === 'upload' || options.type === 'asset') {
-          url = publicId;
-        } else {
-          publicId = encodeURIComponent(publicId).replace(/%3A/g, ':').replace(/%2F/g, '/');
-        }
-      } else {
-        try {
-          publicId = decodeURIComponent(publicId);
-        } catch (error1) {
-          error = error1;
-        }
-        publicId = encodeURIComponent(publicId).replace(/%3A/g, ':').replace(/%2F/g, '/');
-        if (options.url_suffix) {
-          if (options.url_suffix.match(/[\.\/]/)) {
-            throw 'url_suffix should not include . or /';
-          }
-          publicId = publicId + '/' + options.url_suffix;
-        }
-        if (options.format) {
-          if (!options.trust_public_id) {
-            publicId = publicId.replace(/\.(jpg|png|gif|webp)$/, '');
-          }
-          publicId = publicId + '.' + options.format;
-        }
-      }
-      prefix = cloudinaryUrlPrefix(publicId, options);
-      resourceTypeAndType = finalizeResourceType(options.resource_type, options.type, options.url_suffix, options.use_root_path, options.shorten);
-      version = options.version ? 'v' + options.version : '';
-      return url || Util.compact([prefix, resourceTypeAndType, transformationString, version, publicId]).join('/').replace(/([^:])\/+/g, '$1/');
-    };
-
-
-    /**
-     * Generate an video resource URL.
-     * @function Cloudinary#video_url
-     * @param {string} publicId - the public ID of the resource
-     * @param {Object} [options] - options for the tag and transformations, possible values include all {@link Transformation} parameters
-     *                          and {@link Configuration} parameters
-     * @param {string} [options.type='upload'] - the classification of the resource
-     * @return {string} The video URL
-     */
-
-    Cloudinary.prototype.video_url = function(publicId, options) {
-      options = Util.assign({
-        resource_type: 'video'
-      }, options);
-      return this.url(publicId, options);
-    };
-
-
-    /**
-     * Generate an video thumbnail URL.
-     * @function Cloudinary#video_thumbnail_url
-     * @param {string} publicId - the public ID of the resource
-     * @param {Object} [options] - options for the tag and transformations, possible values include all {@link Transformation} parameters
-     *                          and {@link Configuration} parameters
-     * @param {string} [options.type='upload'] - the classification of the resource
-     * @return {string} The video thumbnail URL
-     */
-
-    Cloudinary.prototype.video_thumbnail_url = function(publicId, options) {
-      options = Util.assign({}, DEFAULT_POSTER_OPTIONS, options);
-      return this.url(publicId, options);
-    };
-
-
-    /**
-     * Generate a string representation of the provided transformation options.
-     * @function Cloudinary#transformation_string
-     * @param {Object} options - the transformation options
-     * @returns {string} The transformation string
-     */
-
-    Cloudinary.prototype.transformation_string = function(options) {
-      return new Transformation(options).serialize();
-    };
-
-
-    /**
-     * Generate an image tag.
-     * @function Cloudinary#image
-     * @param {string} publicId - the public ID of the image
-     * @param {Object} [options] - options for the tag and transformations
-     * @return {HTMLImageElement} an image tag element
-     */
-
-    Cloudinary.prototype.image = function(publicId, options) {
-      var client_hints, img, ref, ref1;
-      if (options == null) {
-        options = {};
-      }
-      img = this.imageTag(publicId, options);
-      client_hints = (ref = (ref1 = options.client_hints) != null ? ref1 : this.config('client_hints')) != null ? ref : false;
-      if (!((options.src != null) || client_hints)) {
-        img.setAttr("src", '');
-      }
-      img = img.toDOM();
-      if (!client_hints) {
-        Util.setData(img, 'src-cache', this.url(publicId, options));
-        this.cloudinary_update(img, options);
-      }
-      return img;
-    };
-
-
-    /**
-     * Creates a new ImageTag instance, configured using this own's configuration.
-     * @function Cloudinary#imageTag
-     * @param {string} publicId - the public ID of the resource
-     * @param {Object} options - additional options to pass to the new ImageTag instance
-     * @return {ImageTag} An ImageTag that is attached (chained) to this Cloudinary instance
-     */
-
-    Cloudinary.prototype.imageTag = function(publicId, options) {
-      var tag;
-      tag = new ImageTag(publicId, this.config());
-      tag.transformation().fromOptions(options);
-      return tag;
-    };
-
-
-    /**
-     * Generate an image tag for the video thumbnail.
-     * @function Cloudinary#video_thumbnail
-     * @param {string} publicId - the public ID of the video
-     * @param {Object} [options] - options for the tag and transformations
-     * @return {HTMLImageElement} An image tag element
-     */
-
-    Cloudinary.prototype.video_thumbnail = function(publicId, options) {
-      return this.image(publicId, Util.merge({}, DEFAULT_POSTER_OPTIONS, options));
-    };
-
-
-    /**
-     * @function Cloudinary#facebook_profile_image
-     * @param {string} publicId - the public ID of the image
-     * @param {Object} [options] - options for the tag and transformations
-     * @return {HTMLImageElement} an image tag element
-     */
-
-    Cloudinary.prototype.facebook_profile_image = function(publicId, options) {
-      return this.image(publicId, Util.assign({
-        type: 'facebook'
-      }, options));
-    };
-
-
-    /**
-     * @function Cloudinary#twitter_profile_image
-     * @param {string} publicId - the public ID of the image
-     * @param {Object} [options] - options for the tag and transformations
-     * @return {HTMLImageElement} an image tag element
-     */
-
-    Cloudinary.prototype.twitter_profile_image = function(publicId, options) {
-      return this.image(publicId, Util.assign({
-        type: 'twitter'
-      }, options));
-    };
-
-
-    /**
-     * @function Cloudinary#twitter_name_profile_image
-     * @param {string} publicId - the public ID of the image
-     * @param {Object} [options] - options for the tag and transformations
-     * @return {HTMLImageElement} an image tag element
-     */
-
-    Cloudinary.prototype.twitter_name_profile_image = function(publicId, options) {
-      return this.image(publicId, Util.assign({
-        type: 'twitter_name'
-      }, options));
-    };
-
-
-    /**
-     * @function Cloudinary#gravatar_image
-     * @param {string} publicId - the public ID of the image
-     * @param {Object} [options] - options for the tag and transformations
-     * @return {HTMLImageElement} an image tag element
-     */
-
-    Cloudinary.prototype.gravatar_image = function(publicId, options) {
-      return this.image(publicId, Util.assign({
-        type: 'gravatar'
-      }, options));
-    };
-
-
-    /**
-     * @function Cloudinary#fetch_image
-     * @param {string} publicId - the public ID of the image
-     * @param {Object} [options] - options for the tag and transformations
-     * @return {HTMLImageElement} an image tag element
-     */
-
-    Cloudinary.prototype.fetch_image = function(publicId, options) {
-      return this.image(publicId, Util.assign({
-        type: 'fetch'
-      }, options));
-    };
-
-
-    /**
-     * @function Cloudinary#video
-     * @param {string} publicId - the public ID of the image
-     * @param {Object} [options] - options for the tag and transformations
-     * @return {HTMLImageElement} an image tag element
-     */
-
-    Cloudinary.prototype.video = function(publicId, options) {
-      if (options == null) {
-        options = {};
-      }
-      return this.videoTag(publicId, options).toHtml();
-    };
-
-
-    /**
-     * Creates a new VideoTag instance, configured using this own's configuration.
-     * @function Cloudinary#videoTag
-     * @param {string} publicId - the public ID of the resource
-     * @param {Object} options - additional options to pass to the new VideoTag instance
-     * @return {VideoTag} A VideoTag that is attached (chained) to this Cloudinary instance
-     */
-
-    Cloudinary.prototype.videoTag = function(publicId, options) {
-      options = Util.defaults({}, options, this.config());
-      return new VideoTag(publicId, options);
-    };
-
-
-    /**
-     * Generate the URL of the sprite image
-     * @function Cloudinary#sprite_css
-     * @param {string} publicId - the public ID of the resource
-     * @param {Object} [options] - options for the tag and transformations
-     * @see {@link http://cloudinary.com/documentation/sprite_generation Sprite generation}
-     */
-
-    Cloudinary.prototype.sprite_css = function(publicId, options) {
-      options = Util.assign({
-        type: 'sprite'
-      }, options);
-      if (!publicId.match(/.css$/)) {
-        options.format = 'css';
-      }
-      return this.url(publicId, options);
-    };
-
-
-    /**
-    * Initialize the responsive behaviour.<br>
-    * Calls {@link Cloudinary#cloudinary_update} to modify image tags.
-     * @function Cloudinary#responsive
-    * @param {Object} options
-    * @param {String} [options.responsive_class='cld-responsive'] - provide an alternative class used to locate img tags
-    * @param {number} [options.responsive_debounce=100] - the debounce interval in milliseconds.
-    * @param {boolean} [bootstrap=true] if true processes the img tags by calling cloudinary_update. When false the tags will be processed only after a resize event.
-    * @see {@link Cloudinary#cloudinary_update} for additional configuration parameters
-     */
-
-    Cloudinary.prototype.responsive = function(options, bootstrap) {
-      var ref, ref1, ref2, responsiveClass, responsiveResize, timeout;
-      if (bootstrap == null) {
-        bootstrap = true;
-      }
-      this.responsiveConfig = Util.merge(this.responsiveConfig || {}, options);
-      responsiveClass = (ref = this.responsiveConfig['responsive_class']) != null ? ref : this.config('responsive_class');
-      if (bootstrap) {
-        this.cloudinary_update("img." + responsiveClass + ", img.cld-hidpi", this.responsiveConfig);
-      }
-      responsiveResize = (ref1 = (ref2 = this.responsiveConfig['responsive_resize']) != null ? ref2 : this.config('responsive_resize')) != null ? ref1 : true;
-      if (responsiveResize && !this.responsiveResizeInitialized) {
-        this.responsiveConfig.resizing = this.responsiveResizeInitialized = true;
-        timeout = null;
-        return window.addEventListener('resize', (function(_this) {
-          return function() {
-            var debounce, ref3, ref4, reset, run, wait, waitFunc;
-            debounce = (ref3 = (ref4 = _this.responsiveConfig['responsive_debounce']) != null ? ref4 : _this.config('responsive_debounce')) != null ? ref3 : 100;
-            reset = function() {
-              if (timeout) {
-                clearTimeout(timeout);
-                return timeout = null;
-              }
-            };
-            run = function() {
-              return _this.cloudinary_update("img." + responsiveClass, _this.responsiveConfig);
-            };
-            waitFunc = function() {
-              reset();
-              return run();
-            };
-            wait = function() {
-              reset();
-              return timeout = setTimeout(waitFunc, debounce);
-            };
-            if (debounce) {
-              return wait();
-            } else {
-              return run();
-            }
-          };
-        })(this));
-      }
-    };
-
-
-    /**
-     * @function Cloudinary#calc_breakpoint
-     * @private
-     * @ignore
-     */
-
-    Cloudinary.prototype.calc_breakpoint = function(element, width, steps) {
-      var breakpoints, point;
-      breakpoints = Util.getData(element, 'breakpoints') || Util.getData(element, 'stoppoints') || this.config('breakpoints') || this.config('stoppoints') || defaultBreakpoints;
-      if (Util.isFunction(breakpoints)) {
-        return breakpoints(width, steps);
-      } else {
-        if (Util.isString(breakpoints)) {
-          breakpoints = ((function() {
-            var j, len, ref, results;
-            ref = breakpoints.split(',');
-            results = [];
-            for (j = 0, len = ref.length; j < len; j++) {
-              point = ref[j];
-              results.push(parseInt(point));
-            }
-            return results;
-          })()).sort(function(a, b) {
-            return a - b;
-          });
-        }
-        return closestAbove(breakpoints, width);
-      }
-    };
-
-
-    /**
-     * @function Cloudinary#calc_stoppoint
-     * @deprecated Use {@link calc_breakpoint} instead.
-     * @private
-     * @ignore
-     */
-
-    Cloudinary.prototype.calc_stoppoint = Cloudinary.prototype.calc_breakpoint;
-
-
-    /**
-     * @function Cloudinary#device_pixel_ratio
-     * @private
-     */
-
-    Cloudinary.prototype.device_pixel_ratio = function(roundDpr) {
-      var dpr, dprString;
-      if (roundDpr == null) {
-        roundDpr = true;
-      }
-      dpr = (typeof window !== "undefined" && window !== null ? window.devicePixelRatio : void 0) || 1;
-      if (roundDpr) {
-        dpr = Math.ceil(dpr);
-      }
-      if (dpr <= 0 || dpr === NaN) {
-        dpr = 1;
-      }
-      dprString = dpr.toString();
-      if (dprString.match(/^\d+$/)) {
-        dprString += '.0';
-      }
-      return dprString;
-    };
-
-    defaultBreakpoints = function(width, steps) {
-      if (steps == null) {
-        steps = 100;
-      }
-      return steps * Math.ceil(width / steps);
-    };
-
-    closestAbove = function(list, value) {
-      var i;
-      i = list.length - 2;
-      while (i >= 0 && list[i] >= value) {
-        i--;
-      }
-      return list[i + 1];
-    };
-
-    cdnSubdomainNumber = function(publicId) {
-      return crc32(publicId) % 5 + 1;
-    };
-
-    cloudinaryUrlPrefix = function(publicId, options) {
-      var cdnPart, host, path, protocol, ref, subdomain;
-      if (((ref = options.cloud_name) != null ? ref.indexOf("/") : void 0) === 0) {
-        return '/res' + options.cloud_name;
-      }
-      protocol = "http://";
-      cdnPart = "";
-      subdomain = "res";
-      host = ".cloudinary.com";
-      path = "/" + options.cloud_name;
-      if (options.protocol) {
-        protocol = options.protocol + '//';
-      }
-      if (options.private_cdn) {
-        cdnPart = options.cloud_name + "-";
-        path = "";
-      }
-      if (options.cdn_subdomain) {
-        subdomain = "res-" + cdnSubdomainNumber(publicId);
-      }
-      if (options.secure) {
-        protocol = "https://";
-        if (options.secure_cdn_subdomain === false) {
-          subdomain = "res";
-        }
-        if ((options.secure_distribution != null) && options.secure_distribution !== OLD_AKAMAI_SHARED_CDN && options.secure_distribution !== SHARED_CDN) {
-          cdnPart = "";
-          subdomain = "";
-          host = options.secure_distribution;
-        }
-      } else if (options.cname) {
-        protocol = "http://";
-        cdnPart = "";
-        subdomain = options.cdn_subdomain ? 'a' + ((crc32(publicId) % 5) + 1) + '.' : '';
-        host = options.cname;
-      }
-      return [protocol, cdnPart, subdomain, host, path].join("");
-    };
-
-
-    /**
-    * Finds all `img` tags under each node and sets it up to provide the image through Cloudinary
-    * @param {Element[]} nodes the parent nodes to search for img under
-    * @param {Object} [options={}] options and transformations params
-    * @function Cloudinary#processImageTags
-     */
-
-    Cloudinary.prototype.processImageTags = function(nodes, options) {
-      var images, imgOptions, node, publicId, url;
-      if (options == null) {
-        options = {};
-      }
-      if (Util.isEmpty(nodes)) {
-        return this;
-      }
-      options = Util.defaults({}, options, this.config());
-      images = (function() {
-        var j, len, ref, results;
-        results = [];
-        for (j = 0, len = nodes.length; j < len; j++) {
-          node = nodes[j];
-          if (!(((ref = node.tagName) != null ? ref.toUpperCase() : void 0) === 'IMG')) {
-            continue;
-          }
-          imgOptions = Util.assign({
-            width: node.getAttribute('width'),
-            height: node.getAttribute('height'),
-            src: node.getAttribute('src')
-          }, options);
-          publicId = imgOptions['source'] || imgOptions['src'];
-          delete imgOptions['source'];
-          delete imgOptions['src'];
-          url = this.url(publicId, imgOptions);
-          imgOptions = new Transformation(imgOptions).toHtmlAttributes();
-          Util.setData(node, 'src-cache', url);
-          node.setAttribute('width', imgOptions.width);
-          node.setAttribute('height', imgOptions.height);
-          results.push(node);
-        }
-        return results;
-      }).call(this);
-      this.cloudinary_update(images, options);
-      return this;
-    };
-
-    applyBreakpoints = function(tag, width, steps, options) {
-      var ref, ref1, ref2, responsive_use_breakpoints;
-      responsive_use_breakpoints = (ref = (ref1 = (ref2 = options['responsive_use_breakpoints']) != null ? ref2 : options['responsive_use_stoppoints']) != null ? ref1 : this.config('responsive_use_breakpoints')) != null ? ref : this.config('responsive_use_stoppoints');
-      if ((!responsive_use_breakpoints) || (responsive_use_breakpoints === 'resize' && !options.resizing)) {
-        return width;
-      } else {
-        return this.calc_breakpoint(tag, width, steps);
-      }
-    };
-
-    findContainerWidth = function(element) {
-      var containerWidth, style;
-      containerWidth = 0;
-      while (((element = element != null ? element.parentNode : void 0) instanceof Element) && !containerWidth) {
-        style = window.getComputedStyle(element);
-        if (!/^inline/.test(style.display)) {
-          containerWidth = Util.width(element);
-        }
-      }
-      return containerWidth;
-    };
-
-    updateDpr = function(dataSrc, roundDpr) {
-      return dataSrc.replace(/\bdpr_(1\.0|auto)\b/g, 'dpr_' + this.device_pixel_ratio(roundDpr));
-    };
-
-    maxWidth = function(requiredWidth, tag) {
-      var imageWidth;
-      imageWidth = Util.getData(tag, 'width') || 0;
-      if (requiredWidth > imageWidth) {
-        imageWidth = requiredWidth;
-        Util.setData(tag, 'width', requiredWidth);
-      }
-      return imageWidth;
-    };
-
-
-    /**
-    * Update hidpi (dpr_auto) and responsive (w_auto) fields according to the current container size and the device pixel ratio.
-    * Only images marked with the cld-responsive class have w_auto updated.
-    * @function Cloudinary#cloudinary_update
-    * @param {(Array|string|NodeList)} elements - the elements to modify
-    * @param {Object} options
-    * @param {boolean|string} [options.responsive_use_breakpoints=true]
-    *  - when `true`, always use breakpoints for width
-    * - when `"resize"` use exact width on first render and breakpoints on resize
-    * - when `false` always use exact width
-    * @param {boolean} [options.responsive] - if `true`, enable responsive on this element. Can be done by adding cld-responsive.
-    * @param {boolean} [options.responsive_preserve_height] - if set to true, original css height is preserved.
-    *   Should only be used if the transformation supports different aspect ratios.
-     */
-
-    Cloudinary.prototype.cloudinary_update = function(elements, options) {
-      var containerWidth, dataSrc, j, len, match, ref, ref1, ref2, ref3, ref4, ref5, requiredWidth, responsive, responsiveClass, roundDpr, setUrl, tag;
-      if (options == null) {
-        options = {};
-      }
-      if (elements === null) {
-        return this;
-      }
-      responsive = (ref = (ref1 = options.responsive) != null ? ref1 : this.config('responsive')) != null ? ref : false;
-      elements = (function() {
-        switch (false) {
-          case !Util.isArray(elements):
-            return elements;
-          case elements.constructor.name !== "NodeList":
-            return elements;
-          case !Util.isString(elements):
-            return document.querySelectorAll(elements);
-          default:
-            return [elements];
-        }
-      })();
-      responsiveClass = (ref2 = (ref3 = this.responsiveConfig['responsive_class']) != null ? ref3 : options['responsive_class']) != null ? ref2 : this.config('responsive_class');
-      roundDpr = (ref4 = options['round_dpr']) != null ? ref4 : this.config('round_dpr');
-      for (j = 0, len = elements.length; j < len; j++) {
-        tag = elements[j];
-        if (!((ref5 = tag.tagName) != null ? ref5.match(/img/i) : void 0)) {
-          continue;
-        }
-        setUrl = true;
-        if (responsive) {
-          Util.addClass(tag, responsiveClass);
-        }
-        dataSrc = Util.getData(tag, 'src-cache') || Util.getData(tag, 'src');
-        if (!Util.isEmpty(dataSrc)) {
-          dataSrc = updateDpr.call(this, dataSrc, roundDpr);
-          if (HtmlTag.isResponsive(tag, responsiveClass)) {
-            containerWidth = findContainerWidth(tag);
-            if (containerWidth !== 0) {
-              switch (false) {
-                case !/w_auto:breakpoints/.test(dataSrc):
-                  requiredWidth = maxWidth(containerWidth, tag);
-                  if (requiredWidth) {
-                    dataSrc = dataSrc.replace(/w_auto:breakpoints([_0-9]*)(:[0-9]+)?/, "w_auto:breakpoints$1:" + requiredWidth);
-                  } else {
-                    setUrl = false;
-                  }
-                  break;
-                case !(match = /w_auto(:(\d+))?/.exec(dataSrc)):
-                  requiredWidth = applyBreakpoints.call(this, tag, containerWidth, match[2], options);
-                  requiredWidth = maxWidth(requiredWidth, tag);
-                  if (requiredWidth) {
-                    dataSrc = dataSrc.replace(/w_auto[^,\/]*/g, "w_" + requiredWidth);
-                  } else {
-                    setUrl = false;
-                  }
-              }
-              Util.removeAttribute(tag, 'width');
-              if (!options.responsive_preserve_height) {
-                Util.removeAttribute(tag, 'height');
-              }
-            } else {
-              setUrl = false;
-            }
-          }
-          if (setUrl) {
-            Util.setAttribute(tag, 'src', dataSrc);
-          }
-        }
-      }
-      return this;
-    };
-
-
-    /**
-     * Provide a transformation object, initialized with own's options, for chaining purposes.
-     * @function Cloudinary#transformation
-     * @param {Object} options
-     * @return {Transformation}
-     */
-
-    Cloudinary.prototype.transformation = function(options) {
-      return Transformation["new"](this.config()).fromOptions(options).setParent(this);
-    };
-
-    return Cloudinary;
-
-  })();
-
-  /**
-   * Cloudinary jQuery plugin
-   * Depends on 'jquery', 'util', 'transformation', 'cloudinary'
-   */
-  CloudinaryJQuery = (function(superClass) {
-    extend(CloudinaryJQuery, superClass);
-
-
-    /**
-     * Cloudinary class with jQuery support
-     * @constructor CloudinaryJQuery
-     * @extends Cloudinary
-     */
-
-    function CloudinaryJQuery(options) {
-      CloudinaryJQuery.__super__.constructor.call(this, options);
-    }
-
-
-    /**
-     * @override
-     */
-
-    CloudinaryJQuery.prototype.image = function(publicId, options) {
-      var client_hints, img, ref, ref1;
-      if (options == null) {
-        options = {};
-      }
-      img = this.imageTag(publicId, options);
-      client_hints = (ref = (ref1 = options.client_hints) != null ? ref1 : this.config('client_hints')) != null ? ref : false;
-      if (!((options.src != null) || client_hints)) {
-        img.setAttr("src", '');
-      }
-      img = jQuery(img.toHtml());
-      if (!client_hints) {
-        img.data('src-cache', this.url(publicId, options)).cloudinary_update(options);
-      }
-      return img;
-    };
-
-
-    /**
-     * @override
-     */
-
-    CloudinaryJQuery.prototype.responsive = function(options) {
-      var ref, ref1, ref2, responsiveClass, responsiveConfig, responsiveResizeInitialized, responsive_resize, timeout;
-      responsiveConfig = jQuery.extend(responsiveConfig || {}, options);
-      responsiveClass = (ref = this.responsiveConfig['responsive_class']) != null ? ref : this.config('responsive_class');
-      jQuery("img." + responsiveClass + ", img.cld-hidpi").cloudinary_update(responsiveConfig);
-      responsive_resize = (ref1 = (ref2 = responsiveConfig['responsive_resize']) != null ? ref2 : this.config('responsive_resize')) != null ? ref1 : true;
-      if (responsive_resize && !responsiveResizeInitialized) {
-        responsiveConfig.resizing = responsiveResizeInitialized = true;
-        timeout = null;
-        return jQuery(window).on('resize', (function(_this) {
-          return function() {
-            var debounce, ref3, ref4, reset, run, wait;
-            debounce = (ref3 = (ref4 = responsiveConfig['responsive_debounce']) != null ? ref4 : _this.config('responsive_debounce')) != null ? ref3 : 100;
-            reset = function() {
-              if (timeout) {
-                clearTimeout(timeout);
-                return timeout = null;
-              }
-            };
-            run = function() {
-              return jQuery("img." + responsiveClass).cloudinary_update(responsiveConfig);
-            };
-            wait = function() {
-              reset();
-              return setTimeout((function() {
-                reset();
-                return run();
-              }), debounce);
-            };
-            if (debounce) {
-              return wait();
-            } else {
-              return run();
-            }
-          };
-        })(this));
-      }
-    };
-
-    return CloudinaryJQuery;
-
-  })(Cloudinary);
-
-  /**
-   * The following methods are provided through the jQuery class
-   * @class jQuery
-   */
-
-  /**
-   * Convert all img tags in the collection to utilize Cloudinary.
-   * @function jQuery#cloudinary
-   * @param {Object} [options] - options for the tag and transformations
-   * @returns {jQuery}
-   */
-  jQuery.fn.cloudinary = function(options) {
-    this.filter('img').each(function() {
-      var img_options, public_id, url;
-      img_options = jQuery.extend({
-        width: jQuery(this).attr('width'),
-        height: jQuery(this).attr('height'),
-        src: jQuery(this).attr('src')
-      }, jQuery(this).data(), options);
-      public_id = img_options.source || img_options.src;
-      delete img_options.source;
-      delete img_options.src;
-      url = jQuery.cloudinary.url(public_id, img_options);
-      img_options = new Transformation(img_options).toHtmlAttributes();
-      return jQuery(this).data('src-cache', url).attr({
-        width: img_options.width,
-        height: img_options.height
-      });
-    }).cloudinary_update(options);
-    return this;
-  };
-
-  /**
-   * Update hidpi (dpr_auto) and responsive (w_auto) fields according to the current container size and the device pixel ratio.
-   * Only images marked with the cld-responsive class have w_auto updated.
-   * options:
-   * - responsive_use_stoppoints:
-   *   - true - always use stoppoints for width
-   *   - "resize" - use exact width on first render and stoppoints on resize (default)
-   *   - false - always use exact width
-   * - responsive:
-   *   - true - enable responsive on this element. Can be done by adding cld-responsive.
-   *            Note that jQuery.cloudinary.responsive() should be called once on the page.
-   * - responsive_preserve_height: if set to true, original css height is perserved. Should only be used if the transformation supports different aspect ratios.
-   */
-  jQuery.fn.cloudinary_update = function(options) {
-    if (options == null) {
-      options = {};
-    }
-    jQuery.cloudinary.cloudinary_update(this.filter('img').toArray(), options);
-    return this;
-  };
-  webp = null;
-
-  /**
-   * @function jQuery#webpify
-   */
-  jQuery.fn.webpify = function(options, webp_options) {
-    var that, webp_canary;
-    if (options == null) {
-      options = {};
-    }
-    that = this;
-    webp_options = webp_options != null ? webp_options : options;
-    if (!webp) {
-      webp = jQuery.Deferred();
-      webp_canary = new Image;
-      webp_canary.onerror = webp.reject;
-      webp_canary.onload = webp.resolve;
-      webp_canary.src = 'data:image/webp;base64,UklGRi4AAABXRUJQVlA4TCEAAAAvAUAAEB8wAiMwAgSSNtse/cXjxyCCmrYNWPwmHRH9jwMA';
-    }
-    jQuery(function() {
-      return webp.done(function() {
-        return jQuery(that).cloudinary(jQuery.extend({}, webp_options, {
-          format: 'webp'
-        }));
-      }).fail(function() {
-        return jQuery(that).cloudinary(options);
-      });
-    });
-    return this;
-  };
-  jQuery.fn.fetchify = function(options) {
-    return this.cloudinary(jQuery.extend(options, {
-      'type': 'fetch'
-    }));
-  };
-  jQuery.cloudinary = new CloudinaryJQuery();
-  jQuery.cloudinary.fromDocument();
-
-  /**
-   * This module extends CloudinaryJquery to support jQuery File Upload
-   * Depends on 'jquery', 'util', 'cloudinaryjquery', 'jquery.ui.widget', 'jquery.iframe-transport','jquery.fileupload'
-   */
-
-  /**
-   * Delete a resource using the upload token
-   * @function CloudinaryJQuery#delete_by_token
-   * @param {string} delete_token - the delete token
-   * @param {Object} [options]
-   * @param {string} [options.url] - an alternative URL to use for the API
-   * @param {string} [options.cloud_name] - an alternative cloud_name to use. This parameter is ignored if `options.url` is provided.
-   */
-  CloudinaryJQuery.prototype.delete_by_token = function(delete_token, options) {
-    var cloud_name, dataType, url;
-    options = options || {};
-    url = options.url;
-    if (!url) {
-      cloud_name = options.cloud_name || jQuery.cloudinary.config().cloud_name;
-      url = 'https://api.cloudinary.com/v1_1/' + cloud_name + '/delete_by_token';
-    }
-    dataType = jQuery.support.xhrFileUpload ? 'json' : 'iframe json';
-    return jQuery.ajax({
-      url: url,
-      method: 'POST',
-      data: {
-        token: delete_token
-      },
-      headers: {
-        'X-Requested-With': 'XMLHttpRequest'
-      },
-      dataType: dataType
-    });
-  };
-
-  /**
-   * Creates an `input` tag and sets it up to upload files to cloudinary
-   * @function CloudinaryJQuery#unsigned_upload_tag
-   * @param {string}
-   */
-  CloudinaryJQuery.prototype.unsigned_upload_tag = function(upload_preset, upload_params, options) {
-    return jQuery('<input/>').attr({
-      type: 'file',
-      name: 'file'
-    }).unsigned_cloudinary_upload(upload_preset, upload_params, options);
-  };
-
-  /**
-   * Initialize the jQuery File Upload plugin to upload to Cloudinary
-   * @function jQuery#cloudinary_fileupload
-   * @param {Object} options
-   * @returns {jQuery}
-   */
-  jQuery.fn.cloudinary_fileupload = function(options) {
-    var cloud_name, initializing, resource_type, type, upload_url;
-    if (!Util.isFunction(jQuery.fn.fileupload)) {
-      return this;
-    }
-    initializing = !this.data('blueimpFileupload');
-    if (initializing) {
-      options = jQuery.extend({
-        maxFileSize: 20000000,
-        dataType: 'json',
-        headers: {
-          'X-Requested-With': 'XMLHttpRequest'
-        }
-      }, options);
-    }
-    this.fileupload(options);
-    if (initializing) {
-      this.bind('fileuploaddone', function(e, data) {
-        var add_field, field, multiple, upload_info;
-        if (data.result.error) {
-          return;
-        }
-        data.result.path = ['v', data.result.version, '/', data.result.public_id, data.result.format ? '.' + data.result.format : ''].join('');
-        if (data.cloudinaryField && data.form.length > 0) {
-          upload_info = [data.result.resource_type, data.result.type, data.result.path].join('/') + '#' + data.result.signature;
-          multiple = jQuery(e.target).prop('multiple');
-          add_field = function() {
-            return jQuery('<input/>').attr({
-              type: 'hidden',
-              name: data.cloudinaryField
-            }).val(upload_info).appendTo(data.form);
-          };
-          if (multiple) {
-            add_field();
-          } else {
-            field = jQuery(data.form).find('input[name="' + data.cloudinaryField + '"]');
-            if (field.length > 0) {
-              field.val(upload_info);
-            } else {
-              add_field();
-            }
-          }
-        }
-        return jQuery(e.target).trigger('cloudinarydone', data);
-      });
-      this.bind('fileuploadsend', function(e, data) {
-        data.headers = jQuery.extend({}, data.headers, {
-          'X-Unique-Upload-Id': (Math.random() * 10000000000).toString(16)
-        });
-        return true;
-      });
-      this.bind('fileuploadstart', function(e) {
-        return jQuery(e.target).trigger('cloudinarystart');
-      });
-      this.bind('fileuploadstop', function(e) {
-        return jQuery(e.target).trigger('cloudinarystop');
-      });
-      this.bind('fileuploadprogress', function(e, data) {
-        return jQuery(e.target).trigger('cloudinaryprogress', data);
-      });
-      this.bind('fileuploadprogressall', function(e, data) {
-        return jQuery(e.target).trigger('cloudinaryprogressall', data);
-      });
-      this.bind('fileuploadfail', function(e, data) {
-        return jQuery(e.target).trigger('cloudinaryfail', data);
-      });
-      this.bind('fileuploadalways', function(e, data) {
-        return jQuery(e.target).trigger('cloudinaryalways', data);
-      });
-      if (!this.fileupload('option').url) {
-        cloud_name = options.cloud_name || jQuery.cloudinary.config().cloud_name;
-        resource_type = options.resource_type || 'auto';
-        type = options.type || 'upload';
-        upload_url = 'https://api.cloudinary.com/v1_1/' + cloud_name + '/' + resource_type + '/' + type;
-        this.fileupload('option', 'url', upload_url);
-      }
-    }
-    return this;
-  };
-
-  /**
-   * Add a file to upload
-   * @function jQuery#cloudinary_upload_url
-   * @param {string} remote_url - the url to add
-   * @returns {jQuery}
-   */
-  jQuery.fn.cloudinary_upload_url = function(remote_url) {
-    if (!Util.isFunction(jQuery.fn.fileupload)) {
-      return this;
-    }
-    this.fileupload('option', 'formData').file = remote_url;
-    this.fileupload('add', {
-      files: [remote_url]
-    });
-    delete this.fileupload('option', 'formData').file;
-    return this;
-  };
-
-  /**
-   * Initialize the jQuery File Upload plugin to upload to Cloudinary using unsigned upload
-   * @function jQuery#unsigned_cloudinary_upload
-   * @param {string} upload_preset - the upload preset to use
-   * @param {Object} [upload_params] - parameters that should be past to the server
-   * @param {Object} [options]
-   * @returns {jQuery}
-   */
-  jQuery.fn.unsigned_cloudinary_upload = function(upload_preset, upload_params, options) {
-    var attr, attrs_to_move, html_options, i, key, value;
-    if (upload_params == null) {
-      upload_params = {};
-    }
-    if (options == null) {
-      options = {};
-    }
-    upload_params = Util.cloneDeep(upload_params);
-    options = Util.cloneDeep(options);
-    attrs_to_move = ['cloud_name', 'resource_type', 'type'];
-    i = 0;
-    while (i < attrs_to_move.length) {
-      attr = attrs_to_move[i];
-      if (upload_params[attr]) {
-        options[attr] = upload_params[attr];
-        delete upload_params[attr];
-      }
-      i++;
-    }
-    for (key in upload_params) {
-      value = upload_params[key];
-      if (Util.isPlainObject(value)) {
-        upload_params[key] = jQuery.map(value, function(v, k) {
-          if (Util.isString(v)) {
-            v = v.replace(/[\|=]/g, "\\$&");
-          }
-          return k + '=' + v;
-        }).join('|');
-      } else if (Util.isArray(value)) {
-        if (value.length > 0 && Array.isArray(value[0])) {
-          upload_params[key] = jQuery.map(value, function(array_value) {
-            return array_value.join(',');
-          }).join('|');
-        } else {
-          upload_params[key] = value.join(',');
-        }
-      }
-    }
-    if (!upload_params.callback) {
-      upload_params.callback = '/cloudinary_cors.html';
-    }
-    upload_params.upload_preset = upload_preset;
-    options.formData = upload_params;
-    if (options.cloudinary_field) {
-      options.cloudinaryField = options.cloudinary_field;
-      delete options.cloudinary_field;
-    }
-    html_options = options.html || {};
-    html_options["class"] = Util.trim("cloudinary_fileupload " + (html_options["class"] || ''));
-    if (options.multiple) {
-      html_options.multiple = true;
-    }
-    this.attr(html_options).cloudinary_fileupload(options);
-    return this;
-  };
-  jQuery.cloudinary = new CloudinaryJQuery();
-  cloudinary = {
-    utf8_encode: utf8_encode,
-    crc32: crc32,
-    Util: Util,
-    Condition: Condition,
-    Transformation: Transformation,
-    Configuration: Configuration,
-    HtmlTag: HtmlTag,
-    ImageTag: ImageTag,
-    VideoTag: VideoTag,
-    ClientHintsMetaTag: ClientHintsMetaTag,
-    Layer: Layer,
-    FetchLayer: FetchLayer,
-    TextLayer: TextLayer,
-    SubtitlesLayer: SubtitlesLayer,
-    Cloudinary: Cloudinary,
-    VERSION: "2.5.0",
-    CloudinaryJQuery: CloudinaryJQuery
-  };
-  return cloudinary;
-});
-
-
diff --git a/lib/cloudinary/static/cloudinary/js/jquery.fileupload-image.js b/lib/cloudinary/static/cloudinary/js/jquery.fileupload-image.js
deleted file mode 100644
index 65fc6d7b..00000000
--- a/lib/cloudinary/static/cloudinary/js/jquery.fileupload-image.js
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * jQuery File Upload Image Preview & Resize Plugin
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2013, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * https://opensource.org/licenses/MIT
- */
-
-/* jshint nomen:false */
-/* global define, require, window, Blob */
-
-;(function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define([
-            'jquery',
-            'load-image',
-            'load-image-meta',
-            'load-image-scale',
-            'load-image-exif',
-            'canvas-to-blob',
-            './jquery.fileupload-process'
-        ], factory);
-    } else if (typeof exports === 'object') {
-        // Node/CommonJS:
-        factory(
-            require('jquery'),
-            require('blueimp-load-image/js/load-image'),
-            require('blueimp-load-image/js/load-image-meta'),
-            require('blueimp-load-image/js/load-image-scale'),
-            require('blueimp-load-image/js/load-image-exif'),
-            require('blueimp-canvas-to-blob'),
-            require('./jquery.fileupload-process')
-        );
-    } else {
-        // Browser globals:
-        factory(
-            window.jQuery,
-            window.loadImage
-        );
-    }
-}(function ($, loadImage) {
-    'use strict';
-
-    // Prepend to the default processQueue:
-    $.blueimp.fileupload.prototype.options.processQueue.unshift(
-        {
-            action: 'loadImageMetaData',
-            disableImageHead: '@',
-            disableExif: '@',
-            disableExifThumbnail: '@',
-            disableExifSub: '@',
-            disableExifGps: '@',
-            disabled: '@disableImageMetaDataLoad'
-        },
-        {
-            action: 'loadImage',
-            // Use the action as prefix for the "@" options:
-            prefix: true,
-            fileTypes: '@',
-            maxFileSize: '@',
-            noRevoke: '@',
-            disabled: '@disableImageLoad'
-        },
-        {
-            action: 'resizeImage',
-            // Use "image" as prefix for the "@" options:
-            prefix: 'image',
-            maxWidth: '@',
-            maxHeight: '@',
-            minWidth: '@',
-            minHeight: '@',
-            crop: '@',
-            orientation: '@',
-            forceResize: '@',
-            disabled: '@disableImageResize'
-        },
-        {
-            action: 'saveImage',
-            quality: '@imageQuality',
-            type: '@imageType',
-            disabled: '@disableImageResize'
-        },
-        {
-            action: 'saveImageMetaData',
-            disabled: '@disableImageMetaDataSave'
-        },
-        {
-            action: 'resizeImage',
-            // Use "preview" as prefix for the "@" options:
-            prefix: 'preview',
-            maxWidth: '@',
-            maxHeight: '@',
-            minWidth: '@',
-            minHeight: '@',
-            crop: '@',
-            orientation: '@',
-            thumbnail: '@',
-            canvas: '@',
-            disabled: '@disableImagePreview'
-        },
-        {
-            action: 'setImage',
-            name: '@imagePreviewName',
-            disabled: '@disableImagePreview'
-        },
-        {
-            action: 'deleteImageReferences',
-            disabled: '@disableImageReferencesDeletion'
-        }
-    );
-
-    // The File Upload Resize plugin extends the fileupload widget
-    // with image resize functionality:
-    $.widget('blueimp.fileupload', $.blueimp.fileupload, {
-
-        options: {
-            // The regular expression for the types of images to load:
-            // matched against the file type:
-            loadImageFileTypes: /^image\/(gif|jpeg|png|svg\+xml)$/,
-            // The maximum file size of images to load:
-            loadImageMaxFileSize: 10000000, // 10MB
-            // The maximum width of resized images:
-            imageMaxWidth: 1920,
-            // The maximum height of resized images:
-            imageMaxHeight: 1080,
-            // Defines the image orientation (1-8) or takes the orientation
-            // value from Exif data if set to true:
-            imageOrientation: false,
-            // Define if resized images should be cropped or only scaled:
-            imageCrop: false,
-            // Disable the resize image functionality by default:
-            disableImageResize: true,
-            // The maximum width of the preview images:
-            previewMaxWidth: 80,
-            // The maximum height of the preview images:
-            previewMaxHeight: 80,
-            // Defines the preview orientation (1-8) or takes the orientation
-            // value from Exif data if set to true:
-            previewOrientation: true,
-            // Create the preview using the Exif data thumbnail:
-            previewThumbnail: true,
-            // Define if preview images should be cropped or only scaled:
-            previewCrop: false,
-            // Define if preview images should be resized as canvas elements:
-            previewCanvas: true
-        },
-
-        processActions: {
-
-            // Loads the image given via data.files and data.index
-            // as img element, if the browser supports the File API.
-            // Accepts the options fileTypes (regular expression)
-            // and maxFileSize (integer) to limit the files to load:
-            loadImage: function (data, options) {
-                if (options.disabled) {
-                    return data;
-                }
-                var that = this,
-                    file = data.files[data.index],
-                    dfd = $.Deferred();
-                if (($.type(options.maxFileSize) === 'number' &&
-                            file.size > options.maxFileSize) ||
-                        (options.fileTypes &&
-                            !options.fileTypes.test(file.type)) ||
-                        !loadImage(
-                            file,
-                            function (img) {
-                                if (img.src) {
-                                    data.img = img;
-                                }
-                                dfd.resolveWith(that, [data]);
-                            },
-                            options
-                        )) {
-                    return data;
-                }
-                return dfd.promise();
-            },
-
-            // Resizes the image given as data.canvas or data.img
-            // and updates data.canvas or data.img with the resized image.
-            // Also stores the resized image as preview property.
-            // Accepts the options maxWidth, maxHeight, minWidth,
-            // minHeight, canvas and crop:
-            resizeImage: function (data, options) {
-                if (options.disabled || !(data.canvas || data.img)) {
-                    return data;
-                }
-                options = $.extend({canvas: true}, options);
-                var that = this,
-                    dfd = $.Deferred(),
-                    img = (options.canvas && data.canvas) || data.img,
-                    resolve = function (newImg) {
-                        if (newImg && (newImg.width !== img.width ||
-                                newImg.height !== img.height ||
-                                options.forceResize)) {
-                            data[newImg.getContext ? 'canvas' : 'img'] = newImg;
-                        }
-                        data.preview = newImg;
-                        dfd.resolveWith(that, [data]);
-                    },
-                    thumbnail;
-                if (data.exif) {
-                    if (options.orientation === true) {
-                        options.orientation = data.exif.get('Orientation');
-                    }
-                    if (options.thumbnail) {
-                        thumbnail = data.exif.get('Thumbnail');
-                        if (thumbnail) {
-                            loadImage(thumbnail, resolve, options);
-                            return dfd.promise();
-                        }
-                    }
-                    // Prevent orienting the same image twice:
-                    if (data.orientation) {
-                        delete options.orientation;
-                    } else {
-                        data.orientation = options.orientation;
-                    }
-                }
-                if (img) {
-                    resolve(loadImage.scale(img, options));
-                    return dfd.promise();
-                }
-                return data;
-            },
-
-            // Saves the processed image given as data.canvas
-            // inplace at data.index of data.files:
-            saveImage: function (data, options) {
-                if (!data.canvas || options.disabled) {
-                    return data;
-                }
-                var that = this,
-                    file = data.files[data.index],
-                    dfd = $.Deferred();
-                if (data.canvas.toBlob) {
-                    data.canvas.toBlob(
-                        function (blob) {
-                            if (!blob.name) {
-                                if (file.type === blob.type) {
-                                    blob.name = file.name;
-                                } else if (file.name) {
-                                    blob.name = file.name.replace(
-                                        /\.\w+$/,
-                                        '.' + blob.type.substr(6)
-                                    );
-                                }
-                            }
-                            // Don't restore invalid meta data:
-                            if (file.type !== blob.type) {
-                                delete data.imageHead;
-                            }
-                            // Store the created blob at the position
-                            // of the original file in the files list:
-                            data.files[data.index] = blob;
-                            dfd.resolveWith(that, [data]);
-                        },
-                        options.type || file.type,
-                        options.quality
-                    );
-                } else {
-                    return data;
-                }
-                return dfd.promise();
-            },
-
-            loadImageMetaData: function (data, options) {
-                if (options.disabled) {
-                    return data;
-                }
-                var that = this,
-                    dfd = $.Deferred();
-                loadImage.parseMetaData(data.files[data.index], function (result) {
-                    $.extend(data, result);
-                    dfd.resolveWith(that, [data]);
-                }, options);
-                return dfd.promise();
-            },
-
-            saveImageMetaData: function (data, options) {
-                if (!(data.imageHead && data.canvas &&
-                        data.canvas.toBlob && !options.disabled)) {
-                    return data;
-                }
-                var file = data.files[data.index],
-                    blob = new Blob([
-                        data.imageHead,
-                        // Resized images always have a head size of 20 bytes,
-                        // including the JPEG marker and a minimal JFIF header:
-                        this._blobSlice.call(file, 20)
-                    ], {type: file.type});
-                blob.name = file.name;
-                data.files[data.index] = blob;
-                return data;
-            },
-
-            // Sets the resized version of the image as a property of the
-            // file object, must be called after "saveImage":
-            setImage: function (data, options) {
-                if (data.preview && !options.disabled) {
-                    data.files[data.index][options.name || 'preview'] = data.preview;
-                }
-                return data;
-            },
-
-            deleteImageReferences: function (data, options) {
-                if (!options.disabled) {
-                    delete data.img;
-                    delete data.canvas;
-                    delete data.preview;
-                    delete data.imageHead;
-                }
-                return data;
-            }
-
-        }
-
-    });
-
-}));
diff --git a/lib/cloudinary/static/cloudinary/js/jquery.fileupload-process.js b/lib/cloudinary/static/cloudinary/js/jquery.fileupload-process.js
deleted file mode 100644
index 638f0d26..00000000
--- a/lib/cloudinary/static/cloudinary/js/jquery.fileupload-process.js
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * jQuery File Upload Processing Plugin
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2012, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * https://opensource.org/licenses/MIT
- */
-
-/* jshint nomen:false */
-/* global define, require, window */
-
-;(function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define([
-            'jquery',
-            './jquery.fileupload'
-        ], factory);
-    } else if (typeof exports === 'object') {
-        // Node/CommonJS:
-        factory(
-            require('jquery'),
-            require('./jquery.fileupload')
-        );
-    } else {
-        // Browser globals:
-        factory(
-            window.jQuery
-        );
-    }
-}(function ($) {
-    'use strict';
-
-    var originalAdd = $.blueimp.fileupload.prototype.options.add;
-
-    // The File Upload Processing plugin extends the fileupload widget
-    // with file processing functionality:
-    $.widget('blueimp.fileupload', $.blueimp.fileupload, {
-
-        options: {
-            // The list of processing actions:
-            processQueue: [
-                /*
-                {
-                    action: 'log',
-                    type: 'debug'
-                }
-                */
-            ],
-            add: function (e, data) {
-                var $this = $(this);
-                data.process(function () {
-                    return $this.fileupload('process', data);
-                });
-                originalAdd.call(this, e, data);
-            }
-        },
-
-        processActions: {
-            /*
-            log: function (data, options) {
-                console[options.type](
-                    'Processing "' + data.files[data.index].name + '"'
-                );
-            }
-            */
-        },
-
-        _processFile: function (data, originalData) {
-            var that = this,
-                dfd = $.Deferred().resolveWith(that, [data]),
-                chain = dfd.promise();
-            this._trigger('process', null, data);
-            $.each(data.processQueue, function (i, settings) {
-                var func = function (data) {
-                    if (originalData.errorThrown) {
-                        return $.Deferred()
-                                .rejectWith(that, [originalData]).promise();
-                    }
-                    return that.processActions[settings.action].call(
-                        that,
-                        data,
-                        settings
-                    );
-                };
-                chain = chain.then(func, settings.always && func);
-            });
-            chain
-                .done(function () {
-                    that._trigger('processdone', null, data);
-                    that._trigger('processalways', null, data);
-                })
-                .fail(function () {
-                    that._trigger('processfail', null, data);
-                    that._trigger('processalways', null, data);
-                });
-            return chain;
-        },
-
-        // Replaces the settings of each processQueue item that
-        // are strings starting with an "@", using the remaining
-        // substring as key for the option map,
-        // e.g. "@autoUpload" is replaced with options.autoUpload:
-        _transformProcessQueue: function (options) {
-            var processQueue = [];
-            $.each(options.processQueue, function () {
-                var settings = {},
-                    action = this.action,
-                    prefix = this.prefix === true ? action : this.prefix;
-                $.each(this, function (key, value) {
-                    if ($.type(value) === 'string' &&
-                            value.charAt(0) === '@') {
-                        settings[key] = options[
-                            value.slice(1) || (prefix ? prefix +
-                                key.charAt(0).toUpperCase() + key.slice(1) : key)
-                        ];
-                    } else {
-                        settings[key] = value;
-                    }
-
-                });
-                processQueue.push(settings);
-            });
-            options.processQueue = processQueue;
-        },
-
-        // Returns the number of files currently in the processsing queue:
-        processing: function () {
-            return this._processing;
-        },
-
-        // Processes the files given as files property of the data parameter,
-        // returns a Promise object that allows to bind callbacks:
-        process: function (data) {
-            var that = this,
-                options = $.extend({}, this.options, data);
-            if (options.processQueue && options.processQueue.length) {
-                this._transformProcessQueue(options);
-                if (this._processing === 0) {
-                    this._trigger('processstart');
-                }
-                $.each(data.files, function (index) {
-                    var opts = index ? $.extend({}, options) : options,
-                        func = function () {
-                            if (data.errorThrown) {
-                                return $.Deferred()
-                                        .rejectWith(that, [data]).promise();
-                            }
-                            return that._processFile(opts, data);
-                        };
-                    opts.index = index;
-                    that._processing += 1;
-                    that._processingQueue = that._processingQueue.then(func, func)
-                        .always(function () {
-                            that._processing -= 1;
-                            if (that._processing === 0) {
-                                that._trigger('processstop');
-                            }
-                        });
-                });
-            }
-            return this._processingQueue;
-        },
-
-        _create: function () {
-            this._super();
-            this._processing = 0;
-            this._processingQueue = $.Deferred().resolveWith(this)
-                .promise();
-        }
-
-    });
-
-}));
diff --git a/lib/cloudinary/static/cloudinary/js/jquery.fileupload-validate.js b/lib/cloudinary/static/cloudinary/js/jquery.fileupload-validate.js
deleted file mode 100644
index eebeb373..00000000
--- a/lib/cloudinary/static/cloudinary/js/jquery.fileupload-validate.js
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * jQuery File Upload Validation Plugin
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2013, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * https://opensource.org/licenses/MIT
- */
-
-/* global define, require, window */
-
-;(function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define([
-            'jquery',
-            './jquery.fileupload-process'
-        ], factory);
-    } else if (typeof exports === 'object') {
-        // Node/CommonJS:
-        factory(
-            require('jquery'),
-            require('./jquery.fileupload-process')
-        );
-    } else {
-        // Browser globals:
-        factory(
-            window.jQuery
-        );
-    }
-}(function ($) {
-    'use strict';
-
-    // Append to the default processQueue:
-    $.blueimp.fileupload.prototype.options.processQueue.push(
-        {
-            action: 'validate',
-            // Always trigger this action,
-            // even if the previous action was rejected:
-            always: true,
-            // Options taken from the global options map:
-            acceptFileTypes: '@',
-            maxFileSize: '@',
-            minFileSize: '@',
-            maxNumberOfFiles: '@',
-            disabled: '@disableValidation'
-        }
-    );
-
-    // The File Upload Validation plugin extends the fileupload widget
-    // with file validation functionality:
-    $.widget('blueimp.fileupload', $.blueimp.fileupload, {
-
-        options: {
-            /*
-            // The regular expression for allowed file types, matches
-            // against either file type or file name:
-            acceptFileTypes: /(\.|\/)(gif|jpe?g|png)$/i,
-            // The maximum allowed file size in bytes:
-            maxFileSize: 10000000, // 10 MB
-            // The minimum allowed file size in bytes:
-            minFileSize: undefined, // No minimal file size
-            // The limit of files to be uploaded:
-            maxNumberOfFiles: 10,
-            */
-
-            // Function returning the current number of files,
-            // has to be overriden for maxNumberOfFiles validation:
-            getNumberOfFiles: $.noop,
-
-            // Error and info messages:
-            messages: {
-                maxNumberOfFiles: 'Maximum number of files exceeded',
-                acceptFileTypes: 'File type not allowed',
-                maxFileSize: 'File is too large',
-                minFileSize: 'File is too small'
-            }
-        },
-
-        processActions: {
-
-            validate: function (data, options) {
-                if (options.disabled) {
-                    return data;
-                }
-                var dfd = $.Deferred(),
-                    settings = this.options,
-                    file = data.files[data.index],
-                    fileSize;
-                if (options.minFileSize || options.maxFileSize) {
-                    fileSize = file.size;
-                }
-                if ($.type(options.maxNumberOfFiles) === 'number' &&
-                        (settings.getNumberOfFiles() || 0) + data.files.length >
-                            options.maxNumberOfFiles) {
-                    file.error = settings.i18n('maxNumberOfFiles');
-                } else if (options.acceptFileTypes &&
-                        !(options.acceptFileTypes.test(file.type) ||
-                        options.acceptFileTypes.test(file.name))) {
-                    file.error = settings.i18n('acceptFileTypes');
-                } else if (fileSize > options.maxFileSize) {
-                    file.error = settings.i18n('maxFileSize');
-                } else if ($.type(fileSize) === 'number' &&
-                        fileSize < options.minFileSize) {
-                    file.error = settings.i18n('minFileSize');
-                } else {
-                    delete file.error;
-                }
-                if (file.error || data.files.error) {
-                    data.files.error = true;
-                    dfd.rejectWith(this, [data]);
-                } else {
-                    dfd.resolveWith(this, [data]);
-                }
-                return dfd.promise();
-            }
-
-        }
-
-    });
-
-}));
diff --git a/lib/cloudinary/static/cloudinary/js/jquery.fileupload.js b/lib/cloudinary/static/cloudinary/js/jquery.fileupload.js
deleted file mode 100644
index 700f9013..00000000
--- a/lib/cloudinary/static/cloudinary/js/jquery.fileupload.js
+++ /dev/null
@@ -1,1502 +0,0 @@
-/*
- * jQuery File Upload Plugin
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2010, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * https://opensource.org/licenses/MIT
- */
-
-/* jshint nomen:false */
-/* global define, require, window, document, location, Blob, FormData */
-
-;(function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define([
-            'jquery',
-            'jquery-ui/ui/widget'
-        ], factory);
-    } else if (typeof exports === 'object') {
-        // Node/CommonJS:
-        factory(
-            require('jquery'),
-            require('./vendor/jquery.ui.widget')
-        );
-    } else {
-        // Browser globals:
-        factory(window.jQuery);
-    }
-}(function ($) {
-    'use strict';
-
-    // Detect file input support, based on
-    // http://viljamis.com/blog/2012/file-upload-support-on-mobile/
-    $.support.fileInput = !(new RegExp(
-        // Handle devices which give false positives for the feature detection:
-        '(Android (1\\.[0156]|2\\.[01]))' +
-            '|(Windows Phone (OS 7|8\\.0))|(XBLWP)|(ZuneWP)|(WPDesktop)' +
-            '|(w(eb)?OSBrowser)|(webOS)' +
-            '|(Kindle/(1\\.0|2\\.[05]|3\\.0))'
-    ).test(window.navigator.userAgent) ||
-        // Feature detection for all other devices:
-        $('<input type="file"/>').prop('disabled'));
-
-    // The FileReader API is not actually used, but works as feature detection,
-    // as some Safari versions (5?) support XHR file uploads via the FormData API,
-    // but not non-multipart XHR file uploads.
-    // window.XMLHttpRequestUpload is not available on IE10, so we check for
-    // window.ProgressEvent instead to detect XHR2 file upload capability:
-    $.support.xhrFileUpload = !!(window.ProgressEvent && window.FileReader);
-    $.support.xhrFormDataFileUpload = !!window.FormData;
-
-    // Detect support for Blob slicing (required for chunked uploads):
-    $.support.blobSlice = window.Blob && (Blob.prototype.slice ||
-        Blob.prototype.webkitSlice || Blob.prototype.mozSlice);
-
-    // Helper function to create drag handlers for dragover/dragenter/dragleave:
-    function getDragHandler(type) {
-        var isDragOver = type === 'dragover';
-        return function (e) {
-            e.dataTransfer = e.originalEvent && e.originalEvent.dataTransfer;
-            var dataTransfer = e.dataTransfer;
-            if (dataTransfer && $.inArray('Files', dataTransfer.types) !== -1 &&
-                    this._trigger(
-                        type,
-                        $.Event(type, {delegatedEvent: e})
-                    ) !== false) {
-                e.preventDefault();
-                if (isDragOver) {
-                    dataTransfer.dropEffect = 'copy';
-                }
-            }
-        };
-    }
-
-    // The fileupload widget listens for change events on file input fields defined
-    // via fileInput setting and paste or drop events of the given dropZone.
-    // In addition to the default jQuery Widget methods, the fileupload widget
-    // exposes the "add" and "send" methods, to add or directly send files using
-    // the fileupload API.
-    // By default, files added via file input selection, paste, drag & drop or
-    // "add" method are uploaded immediately, but it is possible to override
-    // the "add" callback option to queue file uploads.
-    $.widget('blueimp.fileupload', {
-
-        options: {
-            // The drop target element(s), by the default the complete document.
-            // Set to null to disable drag & drop support:
-            dropZone: $(document),
-            // The paste target element(s), by the default undefined.
-            // Set to a DOM node or jQuery object to enable file pasting:
-            pasteZone: undefined,
-            // The file input field(s), that are listened to for change events.
-            // If undefined, it is set to the file input fields inside
-            // of the widget element on plugin initialization.
-            // Set to null to disable the change listener.
-            fileInput: undefined,
-            // By default, the file input field is replaced with a clone after
-            // each input field change event. This is required for iframe transport
-            // queues and allows change events to be fired for the same file
-            // selection, but can be disabled by setting the following option to false:
-            replaceFileInput: true,
-            // The parameter name for the file form data (the request argument name).
-            // If undefined or empty, the name property of the file input field is
-            // used, or "files[]" if the file input name property is also empty,
-            // can be a string or an array of strings:
-            paramName: undefined,
-            // By default, each file of a selection is uploaded using an individual
-            // request for XHR type uploads. Set to false to upload file
-            // selections in one request each:
-            singleFileUploads: true,
-            // To limit the number of files uploaded with one XHR request,
-            // set the following option to an integer greater than 0:
-            limitMultiFileUploads: undefined,
-            // The following option limits the number of files uploaded with one
-            // XHR request to keep the request size under or equal to the defined
-            // limit in bytes:
-            limitMultiFileUploadSize: undefined,
-            // Multipart file uploads add a number of bytes to each uploaded file,
-            // therefore the following option adds an overhead for each file used
-            // in the limitMultiFileUploadSize configuration:
-            limitMultiFileUploadSizeOverhead: 512,
-            // Set the following option to true to issue all file upload requests
-            // in a sequential order:
-            sequentialUploads: false,
-            // To limit the number of concurrent uploads,
-            // set the following option to an integer greater than 0:
-            limitConcurrentUploads: undefined,
-            // Set the following option to true to force iframe transport uploads:
-            forceIframeTransport: false,
-            // Set the following option to the location of a redirect url on the
-            // origin server, for cross-domain iframe transport uploads:
-            redirect: undefined,
-            // The parameter name for the redirect url, sent as part of the form
-            // data and set to 'redirect' if this option is empty:
-            redirectParamName: undefined,
-            // Set the following option to the location of a postMessage window,
-            // to enable postMessage transport uploads:
-            postMessage: undefined,
-            // By default, XHR file uploads are sent as multipart/form-data.
-            // The iframe transport is always using multipart/form-data.
-            // Set to false to enable non-multipart XHR uploads:
-            multipart: true,
-            // To upload large files in smaller chunks, set the following option
-            // to a preferred maximum chunk size. If set to 0, null or undefined,
-            // or the browser does not support the required Blob API, files will
-            // be uploaded as a whole.
-            maxChunkSize: undefined,
-            // When a non-multipart upload or a chunked multipart upload has been
-            // aborted, this option can be used to resume the upload by setting
-            // it to the size of the already uploaded bytes. This option is most
-            // useful when modifying the options object inside of the "add" or
-            // "send" callbacks, as the options are cloned for each file upload.
-            uploadedBytes: undefined,
-            // By default, failed (abort or error) file uploads are removed from the
-            // global progress calculation. Set the following option to false to
-            // prevent recalculating the global progress data:
-            recalculateProgress: true,
-            // Interval in milliseconds to calculate and trigger progress events:
-            progressInterval: 100,
-            // Interval in milliseconds to calculate progress bitrate:
-            bitrateInterval: 500,
-            // By default, uploads are started automatically when adding files:
-            autoUpload: true,
-
-            // Error and info messages:
-            messages: {
-                uploadedBytes: 'Uploaded bytes exceed file size'
-            },
-
-            // Translation function, gets the message key to be translated
-            // and an object with context specific data as arguments:
-            i18n: function (message, context) {
-                message = this.messages[message] || message.toString();
-                if (context) {
-                    $.each(context, function (key, value) {
-                        message = message.replace('{' + key + '}', value);
-                    });
-                }
-                return message;
-            },
-
-            // Additional form data to be sent along with the file uploads can be set
-            // using this option, which accepts an array of objects with name and
-            // value properties, a function returning such an array, a FormData
-            // object (for XHR file uploads), or a simple object.
-            // The form of the first fileInput is given as parameter to the function:
-            formData: function (form) {
-                return form.serializeArray();
-            },
-
-            // The add callback is invoked as soon as files are added to the fileupload
-            // widget (via file input selection, drag & drop, paste or add API call).
-            // If the singleFileUploads option is enabled, this callback will be
-            // called once for each file in the selection for XHR file uploads, else
-            // once for each file selection.
-            //
-            // The upload starts when the submit method is invoked on the data parameter.
-            // The data object contains a files property holding the added files
-            // and allows you to override plugin options as well as define ajax settings.
-            //
-            // Listeners for this callback can also be bound the following way:
-            // .bind('fileuploadadd', func);
-            //
-            // data.submit() returns a Promise object and allows to attach additional
-            // handlers using jQuery's Deferred callbacks:
-            // data.submit().done(func).fail(func).always(func);
-            add: function (e, data) {
-                if (e.isDefaultPrevented()) {
-                    return false;
-                }
-                if (data.autoUpload || (data.autoUpload !== false &&
-                        $(this).fileupload('option', 'autoUpload'))) {
-                    data.process().done(function () {
-                        data.submit();
-                    });
-                }
-            },
-
-            // Other callbacks:
-
-            // Callback for the submit event of each file upload:
-            // submit: function (e, data) {}, // .bind('fileuploadsubmit', func);
-
-            // Callback for the start of each file upload request:
-            // send: function (e, data) {}, // .bind('fileuploadsend', func);
-
-            // Callback for successful uploads:
-            // done: function (e, data) {}, // .bind('fileuploaddone', func);
-
-            // Callback for failed (abort or error) uploads:
-            // fail: function (e, data) {}, // .bind('fileuploadfail', func);
-
-            // Callback for completed (success, abort or error) requests:
-            // always: function (e, data) {}, // .bind('fileuploadalways', func);
-
-            // Callback for upload progress events:
-            // progress: function (e, data) {}, // .bind('fileuploadprogress', func);
-
-            // Callback for global upload progress events:
-            // progressall: function (e, data) {}, // .bind('fileuploadprogressall', func);
-
-            // Callback for uploads start, equivalent to the global ajaxStart event:
-            // start: function (e) {}, // .bind('fileuploadstart', func);
-
-            // Callback for uploads stop, equivalent to the global ajaxStop event:
-            // stop: function (e) {}, // .bind('fileuploadstop', func);
-
-            // Callback for change events of the fileInput(s):
-            // change: function (e, data) {}, // .bind('fileuploadchange', func);
-
-            // Callback for paste events to the pasteZone(s):
-            // paste: function (e, data) {}, // .bind('fileuploadpaste', func);
-
-            // Callback for drop events of the dropZone(s):
-            // drop: function (e, data) {}, // .bind('fileuploaddrop', func);
-
-            // Callback for dragover events of the dropZone(s):
-            // dragover: function (e) {}, // .bind('fileuploaddragover', func);
-
-            // Callback before the start of each chunk upload request (before form data initialization):
-            // chunkbeforesend: function (e, data) {}, // .bind('fileuploadchunkbeforesend', func);
-
-            // Callback for the start of each chunk upload request:
-            // chunksend: function (e, data) {}, // .bind('fileuploadchunksend', func);
-
-            // Callback for successful chunk uploads:
-            // chunkdone: function (e, data) {}, // .bind('fileuploadchunkdone', func);
-
-            // Callback for failed (abort or error) chunk uploads:
-            // chunkfail: function (e, data) {}, // .bind('fileuploadchunkfail', func);
-
-            // Callback for completed (success, abort or error) chunk upload requests:
-            // chunkalways: function (e, data) {}, // .bind('fileuploadchunkalways', func);
-
-            // The plugin options are used as settings object for the ajax calls.
-            // The following are jQuery ajax settings required for the file uploads:
-            processData: false,
-            contentType: false,
-            cache: false,
-            timeout: 0
-        },
-
-        // A list of options that require reinitializing event listeners and/or
-        // special initialization code:
-        _specialOptions: [
-            'fileInput',
-            'dropZone',
-            'pasteZone',
-            'multipart',
-            'forceIframeTransport'
-        ],
-
-        _blobSlice: $.support.blobSlice && function () {
-            var slice = this.slice || this.webkitSlice || this.mozSlice;
-            return slice.apply(this, arguments);
-        },
-
-        _BitrateTimer: function () {
-            this.timestamp = ((Date.now) ? Date.now() : (new Date()).getTime());
-            this.loaded = 0;
-            this.bitrate = 0;
-            this.getBitrate = function (now, loaded, interval) {
-                var timeDiff = now - this.timestamp;
-                if (!this.bitrate || !interval || timeDiff > interval) {
-                    this.bitrate = (loaded - this.loaded) * (1000 / timeDiff) * 8;
-                    this.loaded = loaded;
-                    this.timestamp = now;
-                }
-                return this.bitrate;
-            };
-        },
-
-        _isXHRUpload: function (options) {
-            return !options.forceIframeTransport &&
-                ((!options.multipart && $.support.xhrFileUpload) ||
-                $.support.xhrFormDataFileUpload);
-        },
-
-        _getFormData: function (options) {
-            var formData;
-            if ($.type(options.formData) === 'function') {
-                return options.formData(options.form);
-            }
-            if ($.isArray(options.formData)) {
-                return options.formData;
-            }
-            if ($.type(options.formData) === 'object') {
-                formData = [];
-                $.each(options.formData, function (name, value) {
-                    formData.push({name: name, value: value});
-                });
-                return formData;
-            }
-            return [];
-        },
-
-        _getTotal: function (files) {
-            var total = 0;
-            $.each(files, function (index, file) {
-                total += file.size || 1;
-            });
-            return total;
-        },
-
-        _initProgressObject: function (obj) {
-            var progress = {
-                loaded: 0,
-                total: 0,
-                bitrate: 0
-            };
-            if (obj._progress) {
-                $.extend(obj._progress, progress);
-            } else {
-                obj._progress = progress;
-            }
-        },
-
-        _initResponseObject: function (obj) {
-            var prop;
-            if (obj._response) {
-                for (prop in obj._response) {
-                    if (obj._response.hasOwnProperty(prop)) {
-                        delete obj._response[prop];
-                    }
-                }
-            } else {
-                obj._response = {};
-            }
-        },
-
-        _onProgress: function (e, data) {
-            if (e.lengthComputable) {
-                var now = ((Date.now) ? Date.now() : (new Date()).getTime()),
-                    loaded;
-                if (data._time && data.progressInterval &&
-                        (now - data._time < data.progressInterval) &&
-                        e.loaded !== e.total) {
-                    return;
-                }
-                data._time = now;
-                loaded = Math.floor(
-                    e.loaded / e.total * (data.chunkSize || data._progress.total)
-                ) + (data.uploadedBytes || 0);
-                // Add the difference from the previously loaded state
-                // to the global loaded counter:
-                this._progress.loaded += (loaded - data._progress.loaded);
-                this._progress.bitrate = this._bitrateTimer.getBitrate(
-                    now,
-                    this._progress.loaded,
-                    data.bitrateInterval
-                );
-                data._progress.loaded = data.loaded = loaded;
-                data._progress.bitrate = data.bitrate = data._bitrateTimer.getBitrate(
-                    now,
-                    loaded,
-                    data.bitrateInterval
-                );
-                // Trigger a custom progress event with a total data property set
-                // to the file size(s) of the current upload and a loaded data
-                // property calculated accordingly:
-                this._trigger(
-                    'progress',
-                    $.Event('progress', {delegatedEvent: e}),
-                    data
-                );
-                // Trigger a global progress event for all current file uploads,
-                // including ajax calls queued for sequential file uploads:
-                this._trigger(
-                    'progressall',
-                    $.Event('progressall', {delegatedEvent: e}),
-                    this._progress
-                );
-            }
-        },
-
-        _initProgressListener: function (options) {
-            var that = this,
-                xhr = options.xhr ? options.xhr() : $.ajaxSettings.xhr();
-            // Accesss to the native XHR object is required to add event listeners
-            // for the upload progress event:
-            if (xhr.upload) {
-                $(xhr.upload).bind('progress', function (e) {
-                    var oe = e.originalEvent;
-                    // Make sure the progress event properties get copied over:
-                    e.lengthComputable = oe.lengthComputable;
-                    e.loaded = oe.loaded;
-                    e.total = oe.total;
-                    that._onProgress(e, options);
-                });
-                options.xhr = function () {
-                    return xhr;
-                };
-            }
-        },
-
-        _deinitProgressListener: function (options) {
-            var xhr = options.xhr ? options.xhr() : $.ajaxSettings.xhr();
-            if (xhr.upload) {
-                $(xhr.upload).unbind('progress');
-            }
-        },
-
-        _isInstanceOf: function (type, obj) {
-            // Cross-frame instanceof check
-            return Object.prototype.toString.call(obj) === '[object ' + type + ']';
-        },
-
-        _initXHRData: function (options) {
-            var that = this,
-                formData,
-                file = options.files[0],
-                // Ignore non-multipart setting if not supported:
-                multipart = options.multipart || !$.support.xhrFileUpload,
-                paramName = $.type(options.paramName) === 'array' ?
-                    options.paramName[0] : options.paramName;
-            options.headers = $.extend({}, options.headers);
-            if (options.contentRange) {
-                options.headers['Content-Range'] = options.contentRange;
-            }
-            if (!multipart || options.blob || !this._isInstanceOf('File', file)) {
-                options.headers['Content-Disposition'] = 'attachment; filename="' +
-                    encodeURI(file.uploadName || file.name) + '"';
-            }
-            if (!multipart) {
-                options.contentType = file.type || 'application/octet-stream';
-                options.data = options.blob || file;
-            } else if ($.support.xhrFormDataFileUpload) {
-                if (options.postMessage) {
-                    // window.postMessage does not allow sending FormData
-                    // objects, so we just add the File/Blob objects to
-                    // the formData array and let the postMessage window
-                    // create the FormData object out of this array:
-                    formData = this._getFormData(options);
-                    if (options.blob) {
-                        formData.push({
-                            name: paramName,
-                            value: options.blob
-                        });
-                    } else {
-                        $.each(options.files, function (index, file) {
-                            formData.push({
-                                name: ($.type(options.paramName) === 'array' &&
-                                    options.paramName[index]) || paramName,
-                                value: file
-                            });
-                        });
-                    }
-                } else {
-                    if (that._isInstanceOf('FormData', options.formData)) {
-                        formData = options.formData;
-                    } else {
-                        formData = new FormData();
-                        $.each(this._getFormData(options), function (index, field) {
-                            formData.append(field.name, field.value);
-                        });
-                    }
-                    if (options.blob) {
-                        formData.append(
-                            paramName,
-                            options.blob,
-                            file.uploadName || file.name
-                        );
-                    } else {
-                        $.each(options.files, function (index, file) {
-                            // This check allows the tests to run with
-                            // dummy objects:
-                            if (that._isInstanceOf('File', file) ||
-                                    that._isInstanceOf('Blob', file)) {
-                                formData.append(
-                                    ($.type(options.paramName) === 'array' &&
-                                        options.paramName[index]) || paramName,
-                                    file,
-                                    file.uploadName || file.name
-                                );
-                            }
-                        });
-                    }
-                }
-                options.data = formData;
-            }
-            // Blob reference is not needed anymore, free memory:
-            options.blob = null;
-        },
-
-        _initIframeSettings: function (options) {
-            var targetHost = $('<a></a>').prop('href', options.url).prop('host');
-            // Setting the dataType to iframe enables the iframe transport:
-            options.dataType = 'iframe ' + (options.dataType || '');
-            // The iframe transport accepts a serialized array as form data:
-            options.formData = this._getFormData(options);
-            // Add redirect url to form data on cross-domain uploads:
-            if (options.redirect && targetHost && targetHost !== location.host) {
-                options.formData.push({
-                    name: options.redirectParamName || 'redirect',
-                    value: options.redirect
-                });
-            }
-        },
-
-        _initDataSettings: function (options) {
-            if (this._isXHRUpload(options)) {
-                if (!this._chunkedUpload(options, true)) {
-                    if (!options.data) {
-                        this._initXHRData(options);
-                    }
-                    this._initProgressListener(options);
-                }
-                if (options.postMessage) {
-                    // Setting the dataType to postmessage enables the
-                    // postMessage transport:
-                    options.dataType = 'postmessage ' + (options.dataType || '');
-                }
-            } else {
-                this._initIframeSettings(options);
-            }
-        },
-
-        _getParamName: function (options) {
-            var fileInput = $(options.fileInput),
-                paramName = options.paramName;
-            if (!paramName) {
-                paramName = [];
-                fileInput.each(function () {
-                    var input = $(this),
-                        name = input.prop('name') || 'files[]',
-                        i = (input.prop('files') || [1]).length;
-                    while (i) {
-                        paramName.push(name);
-                        i -= 1;
-                    }
-                });
-                if (!paramName.length) {
-                    paramName = [fileInput.prop('name') || 'files[]'];
-                }
-            } else if (!$.isArray(paramName)) {
-                paramName = [paramName];
-            }
-            return paramName;
-        },
-
-        _initFormSettings: function (options) {
-            // Retrieve missing options from the input field and the
-            // associated form, if available:
-            if (!options.form || !options.form.length) {
-                options.form = $(options.fileInput.prop('form'));
-                // If the given file input doesn't have an associated form,
-                // use the default widget file input's form:
-                if (!options.form.length) {
-                    options.form = $(this.options.fileInput.prop('form'));
-                }
-            }
-            options.paramName = this._getParamName(options);
-            if (!options.url) {
-                options.url = options.form.prop('action') || location.href;
-            }
-            // The HTTP request method must be "POST" or "PUT":
-            options.type = (options.type ||
-                ($.type(options.form.prop('method')) === 'string' &&
-                    options.form.prop('method')) || ''
-                ).toUpperCase();
-            if (options.type !== 'POST' && options.type !== 'PUT' &&
-                    options.type !== 'PATCH') {
-                options.type = 'POST';
-            }
-            if (!options.formAcceptCharset) {
-                options.formAcceptCharset = options.form.attr('accept-charset');
-            }
-        },
-
-        _getAJAXSettings: function (data) {
-            var options = $.extend({}, this.options, data);
-            this._initFormSettings(options);
-            this._initDataSettings(options);
-            return options;
-        },
-
-        // jQuery 1.6 doesn't provide .state(),
-        // while jQuery 1.8+ removed .isRejected() and .isResolved():
-        _getDeferredState: function (deferred) {
-            if (deferred.state) {
-                return deferred.state();
-            }
-            if (deferred.isResolved()) {
-                return 'resolved';
-            }
-            if (deferred.isRejected()) {
-                return 'rejected';
-            }
-            return 'pending';
-        },
-
-        // Maps jqXHR callbacks to the equivalent
-        // methods of the given Promise object:
-        _enhancePromise: function (promise) {
-            promise.success = promise.done;
-            promise.error = promise.fail;
-            promise.complete = promise.always;
-            return promise;
-        },
-
-        // Creates and returns a Promise object enhanced with
-        // the jqXHR methods abort, success, error and complete:
-        _getXHRPromise: function (resolveOrReject, context, args) {
-            var dfd = $.Deferred(),
-                promise = dfd.promise();
-            context = context || this.options.context || promise;
-            if (resolveOrReject === true) {
-                dfd.resolveWith(context, args);
-            } else if (resolveOrReject === false) {
-                dfd.rejectWith(context, args);
-            }
-            promise.abort = dfd.promise;
-            return this._enhancePromise(promise);
-        },
-
-        // Adds convenience methods to the data callback argument:
-        _addConvenienceMethods: function (e, data) {
-            var that = this,
-                getPromise = function (args) {
-                    return $.Deferred().resolveWith(that, args).promise();
-                };
-            data.process = function (resolveFunc, rejectFunc) {
-                if (resolveFunc || rejectFunc) {
-                    data._processQueue = this._processQueue =
-                        (this._processQueue || getPromise([this])).then(
-                            function () {
-                                if (data.errorThrown) {
-                                    return $.Deferred()
-                                        .rejectWith(that, [data]).promise();
-                                }
-                                return getPromise(arguments);
-                            }
-                        ).then(resolveFunc, rejectFunc);
-                }
-                return this._processQueue || getPromise([this]);
-            };
-            data.submit = function () {
-                if (this.state() !== 'pending') {
-                    data.jqXHR = this.jqXHR =
-                        (that._trigger(
-                            'submit',
-                            $.Event('submit', {delegatedEvent: e}),
-                            this
-                        ) !== false) && that._onSend(e, this);
-                }
-                return this.jqXHR || that._getXHRPromise();
-            };
-            data.abort = function () {
-                if (this.jqXHR) {
-                    return this.jqXHR.abort();
-                }
-                this.errorThrown = 'abort';
-                that._trigger('fail', null, this);
-                return that._getXHRPromise(false);
-            };
-            data.state = function () {
-                if (this.jqXHR) {
-                    return that._getDeferredState(this.jqXHR);
-                }
-                if (this._processQueue) {
-                    return that._getDeferredState(this._processQueue);
-                }
-            };
-            data.processing = function () {
-                return !this.jqXHR && this._processQueue && that
-                    ._getDeferredState(this._processQueue) === 'pending';
-            };
-            data.progress = function () {
-                return this._progress;
-            };
-            data.response = function () {
-                return this._response;
-            };
-        },
-
-        // Parses the Range header from the server response
-        // and returns the uploaded bytes:
-        _getUploadedBytes: function (jqXHR) {
-            var range = jqXHR.getResponseHeader('Range'),
-                parts = range && range.split('-'),
-                upperBytesPos = parts && parts.length > 1 &&
-                    parseInt(parts[1], 10);
-            return upperBytesPos && upperBytesPos + 1;
-        },
-
-        // Uploads a file in multiple, sequential requests
-        // by splitting the file up in multiple blob chunks.
-        // If the second parameter is true, only tests if the file
-        // should be uploaded in chunks, but does not invoke any
-        // upload requests:
-        _chunkedUpload: function (options, testOnly) {
-            options.uploadedBytes = options.uploadedBytes || 0;
-            var that = this,
-                file = options.files[0],
-                fs = file.size,
-                ub = options.uploadedBytes,
-                mcs = options.maxChunkSize || fs,
-                slice = this._blobSlice,
-                dfd = $.Deferred(),
-                promise = dfd.promise(),
-                jqXHR,
-                upload;
-            if (!(this._isXHRUpload(options) && slice && (ub || ($.type(mcs) === 'function' ? mcs(options) : mcs) < fs)) ||
-                    options.data) {
-                return false;
-            }
-            if (testOnly) {
-                return true;
-            }
-            if (ub >= fs) {
-                file.error = options.i18n('uploadedBytes');
-                return this._getXHRPromise(
-                    false,
-                    options.context,
-                    [null, 'error', file.error]
-                );
-            }
-            // The chunk upload method:
-            upload = function () {
-                // Clone the options object for each chunk upload:
-                var o = $.extend({}, options),
-                    currentLoaded = o._progress.loaded;
-                o.blob = slice.call(
-                    file,
-                    ub,
-                    ub + ($.type(mcs) === 'function' ? mcs(o) : mcs),
-                    file.type
-                );
-                // Store the current chunk size, as the blob itself
-                // will be dereferenced after data processing:
-                o.chunkSize = o.blob.size;
-                // Expose the chunk bytes position range:
-                o.contentRange = 'bytes ' + ub + '-' +
-                    (ub + o.chunkSize - 1) + '/' + fs;
-                // Trigger chunkbeforesend to allow form data to be updated for this chunk
-                that._trigger('chunkbeforesend', null, o);
-                // Process the upload data (the blob and potential form data):
-                that._initXHRData(o);
-                // Add progress listeners for this chunk upload:
-                that._initProgressListener(o);
-                jqXHR = ((that._trigger('chunksend', null, o) !== false && $.ajax(o)) ||
-                        that._getXHRPromise(false, o.context))
-                    .done(function (result, textStatus, jqXHR) {
-                        ub = that._getUploadedBytes(jqXHR) ||
-                            (ub + o.chunkSize);
-                        // Create a progress event if no final progress event
-                        // with loaded equaling total has been triggered
-                        // for this chunk:
-                        if (currentLoaded + o.chunkSize - o._progress.loaded) {
-                            that._onProgress($.Event('progress', {
-                                lengthComputable: true,
-                                loaded: ub - o.uploadedBytes,
-                                total: ub - o.uploadedBytes
-                            }), o);
-                        }
-                        options.uploadedBytes = o.uploadedBytes = ub;
-                        o.result = result;
-                        o.textStatus = textStatus;
-                        o.jqXHR = jqXHR;
-                        that._trigger('chunkdone', null, o);
-                        that._trigger('chunkalways', null, o);
-                        if (ub < fs) {
-                            // File upload not yet complete,
-                            // continue with the next chunk:
-                            upload();
-                        } else {
-                            dfd.resolveWith(
-                                o.context,
-                                [result, textStatus, jqXHR]
-                            );
-                        }
-                    })
-                    .fail(function (jqXHR, textStatus, errorThrown) {
-                        o.jqXHR = jqXHR;
-                        o.textStatus = textStatus;
-                        o.errorThrown = errorThrown;
-                        that._trigger('chunkfail', null, o);
-                        that._trigger('chunkalways', null, o);
-                        dfd.rejectWith(
-                            o.context,
-                            [jqXHR, textStatus, errorThrown]
-                        );
-                    })
-                    .always(function () {
-                        that._deinitProgressListener(o);
-                    });
-            };
-            this._enhancePromise(promise);
-            promise.abort = function () {
-                return jqXHR.abort();
-            };
-            upload();
-            return promise;
-        },
-
-        _beforeSend: function (e, data) {
-            if (this._active === 0) {
-                // the start callback is triggered when an upload starts
-                // and no other uploads are currently running,
-                // equivalent to the global ajaxStart event:
-                this._trigger('start');
-                // Set timer for global bitrate progress calculation:
-                this._bitrateTimer = new this._BitrateTimer();
-                // Reset the global progress values:
-                this._progress.loaded = this._progress.total = 0;
-                this._progress.bitrate = 0;
-            }
-            // Make sure the container objects for the .response() and
-            // .progress() methods on the data object are available
-            // and reset to their initial state:
-            this._initResponseObject(data);
-            this._initProgressObject(data);
-            data._progress.loaded = data.loaded = data.uploadedBytes || 0;
-            data._progress.total = data.total = this._getTotal(data.files) || 1;
-            data._progress.bitrate = data.bitrate = 0;
-            this._active += 1;
-            // Initialize the global progress values:
-            this._progress.loaded += data.loaded;
-            this._progress.total += data.total;
-        },
-
-        _onDone: function (result, textStatus, jqXHR, options) {
-            var total = options._progress.total,
-                response = options._response;
-            if (options._progress.loaded < total) {
-                // Create a progress event if no final progress event
-                // with loaded equaling total has been triggered:
-                this._onProgress($.Event('progress', {
-                    lengthComputable: true,
-                    loaded: total,
-                    total: total
-                }), options);
-            }
-            response.result = options.result = result;
-            response.textStatus = options.textStatus = textStatus;
-            response.jqXHR = options.jqXHR = jqXHR;
-            this._trigger('done', null, options);
-        },
-
-        _onFail: function (jqXHR, textStatus, errorThrown, options) {
-            var response = options._response;
-            if (options.recalculateProgress) {
-                // Remove the failed (error or abort) file upload from
-                // the global progress calculation:
-                this._progress.loaded -= options._progress.loaded;
-                this._progress.total -= options._progress.total;
-            }
-            response.jqXHR = options.jqXHR = jqXHR;
-            response.textStatus = options.textStatus = textStatus;
-            response.errorThrown = options.errorThrown = errorThrown;
-            this._trigger('fail', null, options);
-        },
-
-        _onAlways: function (jqXHRorResult, textStatus, jqXHRorError, options) {
-            // jqXHRorResult, textStatus and jqXHRorError are added to the
-            // options object via done and fail callbacks
-            this._trigger('always', null, options);
-        },
-
-        _onSend: function (e, data) {
-            if (!data.submit) {
-                this._addConvenienceMethods(e, data);
-            }
-            var that = this,
-                jqXHR,
-                aborted,
-                slot,
-                pipe,
-                options = that._getAJAXSettings(data),
-                send = function () {
-                    that._sending += 1;
-                    // Set timer for bitrate progress calculation:
-                    options._bitrateTimer = new that._BitrateTimer();
-                    jqXHR = jqXHR || (
-                        ((aborted || that._trigger(
-                            'send',
-                            $.Event('send', {delegatedEvent: e}),
-                            options
-                        ) === false) &&
-                        that._getXHRPromise(false, options.context, aborted)) ||
-                        that._chunkedUpload(options) || $.ajax(options)
-                    ).done(function (result, textStatus, jqXHR) {
-                        that._onDone(result, textStatus, jqXHR, options);
-                    }).fail(function (jqXHR, textStatus, errorThrown) {
-                        that._onFail(jqXHR, textStatus, errorThrown, options);
-                    }).always(function (jqXHRorResult, textStatus, jqXHRorError) {
-                        that._deinitProgressListener(options);
-                        that._onAlways(
-                            jqXHRorResult,
-                            textStatus,
-                            jqXHRorError,
-                            options
-                        );
-                        that._sending -= 1;
-                        that._active -= 1;
-                        if (options.limitConcurrentUploads &&
-                                options.limitConcurrentUploads > that._sending) {
-                            // Start the next queued upload,
-                            // that has not been aborted:
-                            var nextSlot = that._slots.shift();
-                            while (nextSlot) {
-                                if (that._getDeferredState(nextSlot) === 'pending') {
-                                    nextSlot.resolve();
-                                    break;
-                                }
-                                nextSlot = that._slots.shift();
-                            }
-                        }
-                        if (that._active === 0) {
-                            // The stop callback is triggered when all uploads have
-                            // been completed, equivalent to the global ajaxStop event:
-                            that._trigger('stop');
-                        }
-                    });
-                    return jqXHR;
-                };
-            this._beforeSend(e, options);
-            if (this.options.sequentialUploads ||
-                    (this.options.limitConcurrentUploads &&
-                    this.options.limitConcurrentUploads <= this._sending)) {
-                if (this.options.limitConcurrentUploads > 1) {
-                    slot = $.Deferred();
-                    this._slots.push(slot);
-                    pipe = slot.then(send);
-                } else {
-                    this._sequence = this._sequence.then(send, send);
-                    pipe = this._sequence;
-                }
-                // Return the piped Promise object, enhanced with an abort method,
-                // which is delegated to the jqXHR object of the current upload,
-                // and jqXHR callbacks mapped to the equivalent Promise methods:
-                pipe.abort = function () {
-                    aborted = [undefined, 'abort', 'abort'];
-                    if (!jqXHR) {
-                        if (slot) {
-                            slot.rejectWith(options.context, aborted);
-                        }
-                        return send();
-                    }
-                    return jqXHR.abort();
-                };
-                return this._enhancePromise(pipe);
-            }
-            return send();
-        },
-
-        _onAdd: function (e, data) {
-            var that = this,
-                result = true,
-                options = $.extend({}, this.options, data),
-                files = data.files,
-                filesLength = files.length,
-                limit = options.limitMultiFileUploads,
-                limitSize = options.limitMultiFileUploadSize,
-                overhead = options.limitMultiFileUploadSizeOverhead,
-                batchSize = 0,
-                paramName = this._getParamName(options),
-                paramNameSet,
-                paramNameSlice,
-                fileSet,
-                i,
-                j = 0;
-            if (!filesLength) {
-                return false;
-            }
-            if (limitSize && files[0].size === undefined) {
-                limitSize = undefined;
-            }
-            if (!(options.singleFileUploads || limit || limitSize) ||
-                    !this._isXHRUpload(options)) {
-                fileSet = [files];
-                paramNameSet = [paramName];
-            } else if (!(options.singleFileUploads || limitSize) && limit) {
-                fileSet = [];
-                paramNameSet = [];
-                for (i = 0; i < filesLength; i += limit) {
-                    fileSet.push(files.slice(i, i + limit));
-                    paramNameSlice = paramName.slice(i, i + limit);
-                    if (!paramNameSlice.length) {
-                        paramNameSlice = paramName;
-                    }
-                    paramNameSet.push(paramNameSlice);
-                }
-            } else if (!options.singleFileUploads && limitSize) {
-                fileSet = [];
-                paramNameSet = [];
-                for (i = 0; i < filesLength; i = i + 1) {
-                    batchSize += files[i].size + overhead;
-                    if (i + 1 === filesLength ||
-                            ((batchSize + files[i + 1].size + overhead) > limitSize) ||
-                            (limit && i + 1 - j >= limit)) {
-                        fileSet.push(files.slice(j, i + 1));
-                        paramNameSlice = paramName.slice(j, i + 1);
-                        if (!paramNameSlice.length) {
-                            paramNameSlice = paramName;
-                        }
-                        paramNameSet.push(paramNameSlice);
-                        j = i + 1;
-                        batchSize = 0;
-                    }
-                }
-            } else {
-                paramNameSet = paramName;
-            }
-            data.originalFiles = files;
-            $.each(fileSet || files, function (index, element) {
-                var newData = $.extend({}, data);
-                newData.files = fileSet ? element : [element];
-                newData.paramName = paramNameSet[index];
-                that._initResponseObject(newData);
-                that._initProgressObject(newData);
-                that._addConvenienceMethods(e, newData);
-                result = that._trigger(
-                    'add',
-                    $.Event('add', {delegatedEvent: e}),
-                    newData
-                );
-                return result;
-            });
-            return result;
-        },
-
-        _replaceFileInput: function (data) {
-            var input = data.fileInput,
-                inputClone = input.clone(true),
-                restoreFocus = input.is(document.activeElement);
-            // Add a reference for the new cloned file input to the data argument:
-            data.fileInputClone = inputClone;
-            $('<form></form>').append(inputClone)[0].reset();
-            // Detaching allows to insert the fileInput on another form
-            // without loosing the file input value:
-            input.after(inputClone).detach();
-            // If the fileInput had focus before it was detached,
-            // restore focus to the inputClone.
-            if (restoreFocus) {
-                inputClone.focus();
-            }
-            // Avoid memory leaks with the detached file input:
-            $.cleanData(input.unbind('remove'));
-            // Replace the original file input element in the fileInput
-            // elements set with the clone, which has been copied including
-            // event handlers:
-            this.options.fileInput = this.options.fileInput.map(function (i, el) {
-                if (el === input[0]) {
-                    return inputClone[0];
-                }
-                return el;
-            });
-            // If the widget has been initialized on the file input itself,
-            // override this.element with the file input clone:
-            if (input[0] === this.element[0]) {
-                this.element = inputClone;
-            }
-        },
-
-        _handleFileTreeEntry: function (entry, path) {
-            var that = this,
-                dfd = $.Deferred(),
-                entries = [],
-                dirReader,
-                errorHandler = function (e) {
-                    if (e && !e.entry) {
-                        e.entry = entry;
-                    }
-                    // Since $.when returns immediately if one
-                    // Deferred is rejected, we use resolve instead.
-                    // This allows valid files and invalid items
-                    // to be returned together in one set:
-                    dfd.resolve([e]);
-                },
-                successHandler = function (entries) {
-                    that._handleFileTreeEntries(
-                        entries,
-                        path + entry.name + '/'
-                    ).done(function (files) {
-                        dfd.resolve(files);
-                    }).fail(errorHandler);
-                },
-                readEntries = function () {
-                    dirReader.readEntries(function (results) {
-                        if (!results.length) {
-                            successHandler(entries);
-                        } else {
-                            entries = entries.concat(results);
-                            readEntries();
-                        }
-                    }, errorHandler);
-                };
-            path = path || '';
-            if (entry.isFile) {
-                if (entry._file) {
-                    // Workaround for Chrome bug #149735
-                    entry._file.relativePath = path;
-                    dfd.resolve(entry._file);
-                } else {
-                    entry.file(function (file) {
-                        file.relativePath = path;
-                        dfd.resolve(file);
-                    }, errorHandler);
-                }
-            } else if (entry.isDirectory) {
-                dirReader = entry.createReader();
-                readEntries();
-            } else {
-                // Return an empty list for file system items
-                // other than files or directories:
-                dfd.resolve([]);
-            }
-            return dfd.promise();
-        },
-
-        _handleFileTreeEntries: function (entries, path) {
-            var that = this;
-            return $.when.apply(
-                $,
-                $.map(entries, function (entry) {
-                    return that._handleFileTreeEntry(entry, path);
-                })
-            ).then(function () {
-                return Array.prototype.concat.apply(
-                    [],
-                    arguments
-                );
-            });
-        },
-
-        _getDroppedFiles: function (dataTransfer) {
-            dataTransfer = dataTransfer || {};
-            var items = dataTransfer.items;
-            if (items && items.length && (items[0].webkitGetAsEntry ||
-                    items[0].getAsEntry)) {
-                return this._handleFileTreeEntries(
-                    $.map(items, function (item) {
-                        var entry;
-                        if (item.webkitGetAsEntry) {
-                            entry = item.webkitGetAsEntry();
-                            if (entry) {
-                                // Workaround for Chrome bug #149735:
-                                entry._file = item.getAsFile();
-                            }
-                            return entry;
-                        }
-                        return item.getAsEntry();
-                    })
-                );
-            }
-            return $.Deferred().resolve(
-                $.makeArray(dataTransfer.files)
-            ).promise();
-        },
-
-        _getSingleFileInputFiles: function (fileInput) {
-            fileInput = $(fileInput);
-            var entries = fileInput.prop('webkitEntries') ||
-                    fileInput.prop('entries'),
-                files,
-                value;
-            if (entries && entries.length) {
-                return this._handleFileTreeEntries(entries);
-            }
-            files = $.makeArray(fileInput.prop('files'));
-            if (!files.length) {
-                value = fileInput.prop('value');
-                if (!value) {
-                    return $.Deferred().resolve([]).promise();
-                }
-                // If the files property is not available, the browser does not
-                // support the File API and we add a pseudo File object with
-                // the input value as name with path information removed:
-                files = [{name: value.replace(/^.*\\/, '')}];
-            } else if (files[0].name === undefined && files[0].fileName) {
-                // File normalization for Safari 4 and Firefox 3:
-                $.each(files, function (index, file) {
-                    file.name = file.fileName;
-                    file.size = file.fileSize;
-                });
-            }
-            return $.Deferred().resolve(files).promise();
-        },
-
-        _getFileInputFiles: function (fileInput) {
-            if (!(fileInput instanceof $) || fileInput.length === 1) {
-                return this._getSingleFileInputFiles(fileInput);
-            }
-            return $.when.apply(
-                $,
-                $.map(fileInput, this._getSingleFileInputFiles)
-            ).then(function () {
-                return Array.prototype.concat.apply(
-                    [],
-                    arguments
-                );
-            });
-        },
-
-        _onChange: function (e) {
-            var that = this,
-                data = {
-                    fileInput: $(e.target),
-                    form: $(e.target.form)
-                };
-            this._getFileInputFiles(data.fileInput).always(function (files) {
-                data.files = files;
-                if (that.options.replaceFileInput) {
-                    that._replaceFileInput(data);
-                }
-                if (that._trigger(
-                        'change',
-                        $.Event('change', {delegatedEvent: e}),
-                        data
-                    ) !== false) {
-                    that._onAdd(e, data);
-                }
-            });
-        },
-
-        _onPaste: function (e) {
-            var items = e.originalEvent && e.originalEvent.clipboardData &&
-                    e.originalEvent.clipboardData.items,
-                data = {files: []};
-            if (items && items.length) {
-                $.each(items, function (index, item) {
-                    var file = item.getAsFile && item.getAsFile();
-                    if (file) {
-                        data.files.push(file);
-                    }
-                });
-                if (this._trigger(
-                        'paste',
-                        $.Event('paste', {delegatedEvent: e}),
-                        data
-                    ) !== false) {
-                    this._onAdd(e, data);
-                }
-            }
-        },
-
-        _onDrop: function (e) {
-            e.dataTransfer = e.originalEvent && e.originalEvent.dataTransfer;
-            var that = this,
-                dataTransfer = e.dataTransfer,
-                data = {};
-            if (dataTransfer && dataTransfer.files && dataTransfer.files.length) {
-                e.preventDefault();
-                this._getDroppedFiles(dataTransfer).always(function (files) {
-                    data.files = files;
-                    if (that._trigger(
-                            'drop',
-                            $.Event('drop', {delegatedEvent: e}),
-                            data
-                        ) !== false) {
-                        that._onAdd(e, data);
-                    }
-                });
-            }
-        },
-
-        _onDragOver: getDragHandler('dragover'),
-
-        _onDragEnter: getDragHandler('dragenter'),
-
-        _onDragLeave: getDragHandler('dragleave'),
-
-        _initEventHandlers: function () {
-            if (this._isXHRUpload(this.options)) {
-                this._on(this.options.dropZone, {
-                    dragover: this._onDragOver,
-                    drop: this._onDrop,
-                    // event.preventDefault() on dragenter is required for IE10+:
-                    dragenter: this._onDragEnter,
-                    // dragleave is not required, but added for completeness:
-                    dragleave: this._onDragLeave
-                });
-                this._on(this.options.pasteZone, {
-                    paste: this._onPaste
-                });
-            }
-            if ($.support.fileInput) {
-                this._on(this.options.fileInput, {
-                    change: this._onChange
-                });
-            }
-        },
-
-        _destroyEventHandlers: function () {
-            this._off(this.options.dropZone, 'dragenter dragleave dragover drop');
-            this._off(this.options.pasteZone, 'paste');
-            this._off(this.options.fileInput, 'change');
-        },
-
-        _destroy: function () {
-            this._destroyEventHandlers();
-        },
-
-        _setOption: function (key, value) {
-            var reinit = $.inArray(key, this._specialOptions) !== -1;
-            if (reinit) {
-                this._destroyEventHandlers();
-            }
-            this._super(key, value);
-            if (reinit) {
-                this._initSpecialOptions();
-                this._initEventHandlers();
-            }
-        },
-
-        _initSpecialOptions: function () {
-            var options = this.options;
-            if (options.fileInput === undefined) {
-                options.fileInput = this.element.is('input[type="file"]') ?
-                        this.element : this.element.find('input[type="file"]');
-            } else if (!(options.fileInput instanceof $)) {
-                options.fileInput = $(options.fileInput);
-            }
-            if (!(options.dropZone instanceof $)) {
-                options.dropZone = $(options.dropZone);
-            }
-            if (!(options.pasteZone instanceof $)) {
-                options.pasteZone = $(options.pasteZone);
-            }
-        },
-
-        _getRegExp: function (str) {
-            var parts = str.split('/'),
-                modifiers = parts.pop();
-            parts.shift();
-            return new RegExp(parts.join('/'), modifiers);
-        },
-
-        _isRegExpOption: function (key, value) {
-            return key !== 'url' && $.type(value) === 'string' &&
-                /^\/.*\/[igm]{0,3}$/.test(value);
-        },
-
-        _initDataAttributes: function () {
-            var that = this,
-                options = this.options,
-                data = this.element.data();
-            // Initialize options set via HTML5 data-attributes:
-            $.each(
-                this.element[0].attributes,
-                function (index, attr) {
-                    var key = attr.name.toLowerCase(),
-                        value;
-                    if (/^data-/.test(key)) {
-                        // Convert hyphen-ated key to camelCase:
-                        key = key.slice(5).replace(/-[a-z]/g, function (str) {
-                            return str.charAt(1).toUpperCase();
-                        });
-                        value = data[key];
-                        if (that._isRegExpOption(key, value)) {
-                            value = that._getRegExp(value);
-                        }
-                        options[key] = value;
-                    }
-                }
-            );
-        },
-
-        _create: function () {
-            this._initDataAttributes();
-            this._initSpecialOptions();
-            this._slots = [];
-            this._sequence = this._getXHRPromise(true);
-            this._sending = this._active = 0;
-            this._initProgressObject(this);
-            this._initEventHandlers();
-        },
-
-        // This method is exposed to the widget API and allows to query
-        // the number of active uploads:
-        active: function () {
-            return this._active;
-        },
-
-        // This method is exposed to the widget API and allows to query
-        // the widget upload progress.
-        // It returns an object with loaded, total and bitrate properties
-        // for the running uploads:
-        progress: function () {
-            return this._progress;
-        },
-
-        // This method is exposed to the widget API and allows adding files
-        // using the fileupload API. The data parameter accepts an object which
-        // must have a files property and can contain additional options:
-        // .fileupload('add', {files: filesList});
-        add: function (data) {
-            var that = this;
-            if (!data || this.options.disabled) {
-                return;
-            }
-            if (data.fileInput && !data.files) {
-                this._getFileInputFiles(data.fileInput).always(function (files) {
-                    data.files = files;
-                    that._onAdd(null, data);
-                });
-            } else {
-                data.files = $.makeArray(data.files);
-                this._onAdd(null, data);
-            }
-        },
-
-        // This method is exposed to the widget API and allows sending files
-        // using the fileupload API. The data parameter accepts an object which
-        // must have a files or fileInput property and can contain additional options:
-        // .fileupload('send', {files: filesList});
-        // The method returns a Promise object for the file upload call.
-        send: function (data) {
-            if (data && !this.options.disabled) {
-                if (data.fileInput && !data.files) {
-                    var that = this,
-                        dfd = $.Deferred(),
-                        promise = dfd.promise(),
-                        jqXHR,
-                        aborted;
-                    promise.abort = function () {
-                        aborted = true;
-                        if (jqXHR) {
-                            return jqXHR.abort();
-                        }
-                        dfd.reject(null, 'abort', 'abort');
-                        return promise;
-                    };
-                    this._getFileInputFiles(data.fileInput).always(
-                        function (files) {
-                            if (aborted) {
-                                return;
-                            }
-                            if (!files.length) {
-                                dfd.reject();
-                                return;
-                            }
-                            data.files = files;
-                            jqXHR = that._onSend(null, data);
-                            jqXHR.then(
-                                function (result, textStatus, jqXHR) {
-                                    dfd.resolve(result, textStatus, jqXHR);
-                                },
-                                function (jqXHR, textStatus, errorThrown) {
-                                    dfd.reject(jqXHR, textStatus, errorThrown);
-                                }
-                            );
-                        }
-                    );
-                    return this._enhancePromise(promise);
-                }
-                data.files = $.makeArray(data.files);
-                if (data.files.length) {
-                    return this._onSend(null, data);
-                }
-            }
-            return this._getXHRPromise(false, data && data.context);
-        }
-
-    });
-
-}));
diff --git a/lib/cloudinary/static/cloudinary/js/jquery.iframe-transport.js b/lib/cloudinary/static/cloudinary/js/jquery.iframe-transport.js
deleted file mode 100644
index 8d25c464..00000000
--- a/lib/cloudinary/static/cloudinary/js/jquery.iframe-transport.js
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * jQuery Iframe Transport Plugin
- * https://github.com/blueimp/jQuery-File-Upload
- *
- * Copyright 2011, Sebastian Tschan
- * https://blueimp.net
- *
- * Licensed under the MIT license:
- * https://opensource.org/licenses/MIT
- */
-
-/* global define, require, window, document, JSON */
-
-;(function (factory) {
-    'use strict';
-    if (typeof define === 'function' && define.amd) {
-        // Register as an anonymous AMD module:
-        define(['jquery'], factory);
-    } else if (typeof exports === 'object') {
-        // Node/CommonJS:
-        factory(require('jquery'));
-    } else {
-        // Browser globals:
-        factory(window.jQuery);
-    }
-}(function ($) {
-    'use strict';
-
-    // Helper variable to create unique names for the transport iframes:
-    var counter = 0,
-        jsonAPI = $,
-        jsonParse = 'parseJSON';
-
-    if ('JSON' in window && 'parse' in JSON) {
-      jsonAPI = JSON;
-      jsonParse = 'parse';
-    }
-
-    // The iframe transport accepts four additional options:
-    // options.fileInput: a jQuery collection of file input fields
-    // options.paramName: the parameter name for the file form data,
-    //  overrides the name property of the file input field(s),
-    //  can be a string or an array of strings.
-    // options.formData: an array of objects with name and value properties,
-    //  equivalent to the return data of .serializeArray(), e.g.:
-    //  [{name: 'a', value: 1}, {name: 'b', value: 2}]
-    // options.initialIframeSrc: the URL of the initial iframe src,
-    //  by default set to "javascript:false;"
-    $.ajaxTransport('iframe', function (options) {
-        if (options.async) {
-            // javascript:false as initial iframe src
-            // prevents warning popups on HTTPS in IE6:
-            /*jshint scripturl: true */
-            var initialIframeSrc = options.initialIframeSrc || 'javascript:false;',
-            /*jshint scripturl: false */
-                form,
-                iframe,
-                addParamChar;
-            return {
-                send: function (_, completeCallback) {
-                    form = $('<form style="display:none;"></form>');
-                    form.attr('accept-charset', options.formAcceptCharset);
-                    addParamChar = /\?/.test(options.url) ? '&' : '?';
-                    // XDomainRequest only supports GET and POST:
-                    if (options.type === 'DELETE') {
-                        options.url = options.url + addParamChar + '_method=DELETE';
-                        options.type = 'POST';
-                    } else if (options.type === 'PUT') {
-                        options.url = options.url + addParamChar + '_method=PUT';
-                        options.type = 'POST';
-                    } else if (options.type === 'PATCH') {
-                        options.url = options.url + addParamChar + '_method=PATCH';
-                        options.type = 'POST';
-                    }
-                    // IE versions below IE8 cannot set the name property of
-                    // elements that have already been added to the DOM,
-                    // so we set the name along with the iframe HTML markup:
-                    counter += 1;
-                    iframe = $(
-                        '<iframe src="' + initialIframeSrc +
-                            '" name="iframe-transport-' + counter + '"></iframe>'
-                    ).bind('load', function () {
-                        var fileInputClones,
-                            paramNames = $.isArray(options.paramName) ?
-                                    options.paramName : [options.paramName];
-                        iframe
-                            .unbind('load')
-                            .bind('load', function () {
-                                var response;
-                                // Wrap in a try/catch block to catch exceptions thrown
-                                // when trying to access cross-domain iframe contents:
-                                try {
-                                    response = iframe.contents();
-                                    // Google Chrome and Firefox do not throw an
-                                    // exception when calling iframe.contents() on
-                                    // cross-domain requests, so we unify the response:
-                                    if (!response.length || !response[0].firstChild) {
-                                        throw new Error();
-                                    }
-                                } catch (e) {
-                                    response = undefined;
-                                }
-                                // The complete callback returns the
-                                // iframe content document as response object:
-                                completeCallback(
-                                    200,
-                                    'success',
-                                    {'iframe': response}
-                                );
-                                // Fix for IE endless progress bar activity bug
-                                // (happens on form submits to iframe targets):
-                                $('<iframe src="' + initialIframeSrc + '"></iframe>')
-                                    .appendTo(form);
-                                window.setTimeout(function () {
-                                    // Removing the form in a setTimeout call
-                                    // allows Chrome's developer tools to display
-                                    // the response result
-                                    form.remove();
-                                }, 0);
-                            });
-                        form
-                            .prop('target', iframe.prop('name'))
-                            .prop('action', options.url)
-                            .prop('method', options.type);
-                        if (options.formData) {
-                            $.each(options.formData, function (index, field) {
-                                $('<input type="hidden"/>')
-                                    .prop('name', field.name)
-                                    .val(field.value)
-                                    .appendTo(form);
-                            });
-                        }
-                        if (options.fileInput && options.fileInput.length &&
-                                options.type === 'POST') {
-                            fileInputClones = options.fileInput.clone();
-                            // Insert a clone for each file input field:
-                            options.fileInput.after(function (index) {
-                                return fileInputClones[index];
-                            });
-                            if (options.paramName) {
-                                options.fileInput.each(function (index) {
-                                    $(this).prop(
-                                        'name',
-                                        paramNames[index] || options.paramName
-                                    );
-                                });
-                            }
-                            // Appending the file input fields to the hidden form
-                            // removes them from their original location:
-                            form
-                                .append(options.fileInput)
-                                .prop('enctype', 'multipart/form-data')
-                                // enctype must be set as encoding for IE:
-                                .prop('encoding', 'multipart/form-data');
-                            // Remove the HTML5 form attribute from the input(s):
-                            options.fileInput.removeAttr('form');
-                        }
-                        form.submit();
-                        // Insert the file input fields at their original location
-                        // by replacing the clones with the originals:
-                        if (fileInputClones && fileInputClones.length) {
-                            options.fileInput.each(function (index, input) {
-                                var clone = $(fileInputClones[index]);
-                                // Restore the original name and form properties:
-                                $(input)
-                                    .prop('name', clone.prop('name'))
-                                    .attr('form', clone.attr('form'));
-                                clone.replaceWith(input);
-                            });
-                        }
-                    });
-                    form.append(iframe).appendTo(document.body);
-                },
-                abort: function () {
-                    if (iframe) {
-                        // javascript:false as iframe src aborts the request
-                        // and prevents warning popups on HTTPS in IE6.
-                        // concat is used to avoid the "Script URL" JSLint error:
-                        iframe
-                            .unbind('load')
-                            .prop('src', initialIframeSrc);
-                    }
-                    if (form) {
-                        form.remove();
-                    }
-                }
-            };
-        }
-    });
-
-    // The iframe transport returns the iframe content document as response.
-    // The following adds converters from iframe to text, json, html, xml
-    // and script.
-    // Please note that the Content-Type for JSON responses has to be text/plain
-    // or text/html, if the browser doesn't include application/json in the
-    // Accept header, else IE will show a download dialog.
-    // The Content-Type for XML responses on the other hand has to be always
-    // application/xml or text/xml, so IE properly parses the XML response.
-    // See also
-    // https://github.com/blueimp/jQuery-File-Upload/wiki/Setup#content-type-negotiation
-    $.ajaxSetup({
-        converters: {
-            'iframe text': function (iframe) {
-                return iframe && $(iframe[0].body).text();
-            },
-            'iframe json': function (iframe) {
-                return iframe && jsonAPI[jsonParse]($(iframe[0].body).text());
-            },
-            'iframe html': function (iframe) {
-                return iframe && $(iframe[0].body).html();
-            },
-            'iframe xml': function (iframe) {
-                var xmlDoc = iframe && iframe[0];
-                return xmlDoc && $.isXMLDoc(xmlDoc) ? xmlDoc :
-                        $.parseXML((xmlDoc.XMLDocument && xmlDoc.XMLDocument.xml) ||
-                            $(xmlDoc.body).html());
-            },
-            'iframe script': function (iframe) {
-                return iframe && $.globalEval($(iframe[0].body).text());
-            }
-        }
-    });
-
-}));
diff --git a/lib/cloudinary/static/cloudinary/js/jquery.ui.widget.js b/lib/cloudinary/static/cloudinary/js/jquery.ui.widget.js
deleted file mode 100644
index 914b8ffb..00000000
--- a/lib/cloudinary/static/cloudinary/js/jquery.ui.widget.js
+++ /dev/null
@@ -1,752 +0,0 @@
-/*! jQuery UI - v1.12.1+CommonJS - 2018-02-10
- * http://jqueryui.com
- * Includes: widget.js
- * Copyright jQuery Foundation and other contributors; Licensed MIT */
-
-(function( factory ) {
-  if ( typeof define === "function" && define.amd ) {
-
-    // AMD. Register as an anonymous module.
-    define([ "jquery" ], factory );
-  } else if ( typeof exports === "object" ) {
-
-    // Node/CommonJS
-    factory( require( "jquery" ) );
-  } else {
-
-    // Browser globals
-    factory( jQuery );
-  }
-}(function( $ ) {
-
-  $.ui = $.ui || {};
-
-  var version = $.ui.version = "1.12.1";
-
-
-  /*!
-   * jQuery UI Widget 1.12.1
-   * http://jqueryui.com
-   *
-   * Copyright jQuery Foundation and other contributors
-   * Released under the MIT license.
-   * http://jquery.org/license
-   */
-
-  //>>label: Widget
-  //>>group: Core
-  //>>description: Provides a factory for creating stateful widgets with a common API.
-  //>>docs: http://api.jqueryui.com/jQuery.widget/
-  //>>demos: http://jqueryui.com/widget/
-
-
-
-  var widgetUuid = 0;
-  var widgetSlice = Array.prototype.slice;
-
-  $.cleanData = ( function( orig ) {
-    return function( elems ) {
-      var events, elem, i;
-      for ( i = 0; ( elem = elems[ i ] ) != null; i++ ) {
-        try {
-
-          // Only trigger remove when necessary to save time
-          events = $._data( elem, "events" );
-          if ( events && events.remove ) {
-            $( elem ).triggerHandler( "remove" );
-          }
-
-          // Http://bugs.jquery.com/ticket/8235
-        } catch ( e ) {}
-      }
-      orig( elems );
-    };
-  } )( $.cleanData );
-
-  $.widget = function( name, base, prototype ) {
-    var existingConstructor, constructor, basePrototype;
-
-    // ProxiedPrototype allows the provided prototype to remain unmodified
-    // so that it can be used as a mixin for multiple widgets (#8876)
-    var proxiedPrototype = {};
-
-    var namespace = name.split( "." )[ 0 ];
-    name = name.split( "." )[ 1 ];
-    var fullName = namespace + "-" + name;
-
-    if ( !prototype ) {
-      prototype = base;
-      base = $.Widget;
-    }
-
-    if ( $.isArray( prototype ) ) {
-      prototype = $.extend.apply( null, [ {} ].concat( prototype ) );
-    }
-
-    // Create selector for plugin
-    $.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) {
-      return !!$.data( elem, fullName );
-    };
-
-    $[ namespace ] = $[ namespace ] || {};
-    existingConstructor = $[ namespace ][ name ];
-    constructor = $[ namespace ][ name ] = function( options, element ) {
-
-      // Allow instantiation without "new" keyword
-      if ( !this._createWidget ) {
-        return new constructor( options, element );
-      }
-
-      // Allow instantiation without initializing for simple inheritance
-      // must use "new" keyword (the code above always passes args)
-      if ( arguments.length ) {
-        this._createWidget( options, element );
-      }
-    };
-
-    // Extend with the existing constructor to carry over any static properties
-    $.extend( constructor, existingConstructor, {
-      version: prototype.version,
-
-      // Copy the object used to create the prototype in case we need to
-      // redefine the widget later
-      _proto: $.extend( {}, prototype ),
-
-      // Track widgets that inherit from this widget in case this widget is
-      // redefined after a widget inherits from it
-      _childConstructors: []
-    } );
-
-    basePrototype = new base();
-
-    // We need to make the options hash a property directly on the new instance
-    // otherwise we'll modify the options hash on the prototype that we're
-    // inheriting from
-    basePrototype.options = $.widget.extend( {}, basePrototype.options );
-    $.each( prototype, function( prop, value ) {
-      if ( !$.isFunction( value ) ) {
-        proxiedPrototype[ prop ] = value;
-        return;
-      }
-      proxiedPrototype[ prop ] = ( function() {
-        function _super() {
-          return base.prototype[ prop ].apply( this, arguments );
-        }
-
-        function _superApply( args ) {
-          return base.prototype[ prop ].apply( this, args );
-        }
-
-        return function() {
-          var __super = this._super;
-          var __superApply = this._superApply;
-          var returnValue;
-
-          this._super = _super;
-          this._superApply = _superApply;
-
-          returnValue = value.apply( this, arguments );
-
-          this._super = __super;
-          this._superApply = __superApply;
-
-          return returnValue;
-        };
-      } )();
-    } );
-    constructor.prototype = $.widget.extend( basePrototype, {
-
-      // TODO: remove support for widgetEventPrefix
-      // always use the name + a colon as the prefix, e.g., draggable:start
-      // don't prefix for widgets that aren't DOM-based
-      widgetEventPrefix: existingConstructor ? ( basePrototype.widgetEventPrefix || name ) : name
-    }, proxiedPrototype, {
-      constructor: constructor,
-      namespace: namespace,
-      widgetName: name,
-      widgetFullName: fullName
-    } );
-
-    // If this widget is being redefined then we need to find all widgets that
-    // are inheriting from it and redefine all of them so that they inherit from
-    // the new version of this widget. We're essentially trying to replace one
-    // level in the prototype chain.
-    if ( existingConstructor ) {
-      $.each( existingConstructor._childConstructors, function( i, child ) {
-        var childPrototype = child.prototype;
-
-        // Redefine the child widget using the same prototype that was
-        // originally used, but inherit from the new version of the base
-        $.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor,
-          child._proto );
-      } );
-
-      // Remove the list of existing child constructors from the old constructor
-      // so the old child constructors can be garbage collected
-      delete existingConstructor._childConstructors;
-    } else {
-      base._childConstructors.push( constructor );
-    }
-
-    $.widget.bridge( name, constructor );
-
-    return constructor;
-  };
-
-  $.widget.extend = function( target ) {
-    var input = widgetSlice.call( arguments, 1 );
-    var inputIndex = 0;
-    var inputLength = input.length;
-    var key;
-    var value;
-
-    for ( ; inputIndex < inputLength; inputIndex++ ) {
-      for ( key in input[ inputIndex ] ) {
-        value = input[ inputIndex ][ key ];
-        if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
-
-          // Clone objects
-          if ( $.isPlainObject( value ) ) {
-            target[ key ] = $.isPlainObject( target[ key ] ) ?
-              $.widget.extend( {}, target[ key ], value ) :
-
-              // Don't extend strings, arrays, etc. with objects
-              $.widget.extend( {}, value );
-
-            // Copy everything else by reference
-          } else {
-            target[ key ] = value;
-          }
-        }
-      }
-    }
-    return target;
-  };
-
-  $.widget.bridge = function( name, object ) {
-    var fullName = object.prototype.widgetFullName || name;
-    $.fn[ name ] = function( options ) {
-      var isMethodCall = typeof options === "string";
-      var args = widgetSlice.call( arguments, 1 );
-      var returnValue = this;
-
-      if ( isMethodCall ) {
-
-        // If this is an empty collection, we need to have the instance method
-        // return undefined instead of the jQuery instance
-        if ( !this.length && options === "instance" ) {
-          returnValue = undefined;
-        } else {
-          this.each( function() {
-            var methodValue;
-            var instance = $.data( this, fullName );
-
-            if ( options === "instance" ) {
-              returnValue = instance;
-              return false;
-            }
-
-            if ( !instance ) {
-              return $.error( "cannot call methods on " + name +
-                " prior to initialization; " +
-                "attempted to call method '" + options + "'" );
-            }
-
-            if ( !$.isFunction( instance[ options ] ) || options.charAt( 0 ) === "_" ) {
-              return $.error( "no such method '" + options + "' for " + name +
-                " widget instance" );
-            }
-
-            methodValue = instance[ options ].apply( instance, args );
-
-            if ( methodValue !== instance && methodValue !== undefined ) {
-              returnValue = methodValue && methodValue.jquery ?
-                returnValue.pushStack( methodValue.get() ) :
-                methodValue;
-              return false;
-            }
-          } );
-        }
-      } else {
-
-        // Allow multiple hashes to be passed on init
-        if ( args.length ) {
-          options = $.widget.extend.apply( null, [ options ].concat( args ) );
-        }
-
-        this.each( function() {
-          var instance = $.data( this, fullName );
-          if ( instance ) {
-            instance.option( options || {} );
-            if ( instance._init ) {
-              instance._init();
-            }
-          } else {
-            $.data( this, fullName, new object( options, this ) );
-          }
-        } );
-      }
-
-      return returnValue;
-    };
-  };
-
-  $.Widget = function( /* options, element */ ) {};
-  $.Widget._childConstructors = [];
-
-  $.Widget.prototype = {
-    widgetName: "widget",
-    widgetEventPrefix: "",
-    defaultElement: "<div>",
-
-    options: {
-      classes: {},
-      disabled: false,
-
-      // Callbacks
-      create: null
-    },
-
-    _createWidget: function( options, element ) {
-      element = $( element || this.defaultElement || this )[ 0 ];
-      this.element = $( element );
-      this.uuid = widgetUuid++;
-      this.eventNamespace = "." + this.widgetName + this.uuid;
-
-      this.bindings = $();
-      this.hoverable = $();
-      this.focusable = $();
-      this.classesElementLookup = {};
-
-      if ( element !== this ) {
-        $.data( element, this.widgetFullName, this );
-        this._on( true, this.element, {
-          remove: function( event ) {
-            if ( event.target === element ) {
-              this.destroy();
-            }
-          }
-        } );
-        this.document = $( element.style ?
-
-          // Element within the document
-          element.ownerDocument :
-
-          // Element is window or document
-          element.document || element );
-        this.window = $( this.document[ 0 ].defaultView || this.document[ 0 ].parentWindow );
-      }
-
-      this.options = $.widget.extend( {},
-        this.options,
-        this._getCreateOptions(),
-        options );
-
-      this._create();
-
-      if ( this.options.disabled ) {
-        this._setOptionDisabled( this.options.disabled );
-      }
-
-      this._trigger( "create", null, this._getCreateEventData() );
-      this._init();
-    },
-
-    _getCreateOptions: function() {
-      return {};
-    },
-
-    _getCreateEventData: $.noop,
-
-    _create: $.noop,
-
-    _init: $.noop,
-
-    destroy: function() {
-      var that = this;
-
-      this._destroy();
-      $.each( this.classesElementLookup, function( key, value ) {
-        that._removeClass( value, key );
-      } );
-
-      // We can probably remove the unbind calls in 2.0
-      // all event bindings should go through this._on()
-      this.element
-        .off( this.eventNamespace )
-        .removeData( this.widgetFullName );
-      this.widget()
-        .off( this.eventNamespace )
-        .removeAttr( "aria-disabled" );
-
-      // Clean up events and states
-      this.bindings.off( this.eventNamespace );
-    },
-
-    _destroy: $.noop,
-
-    widget: function() {
-      return this.element;
-    },
-
-    option: function( key, value ) {
-      var options = key;
-      var parts;
-      var curOption;
-      var i;
-
-      if ( arguments.length === 0 ) {
-
-        // Don't return a reference to the internal hash
-        return $.widget.extend( {}, this.options );
-      }
-
-      if ( typeof key === "string" ) {
-
-        // Handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
-        options = {};
-        parts = key.split( "." );
-        key = parts.shift();
-        if ( parts.length ) {
-          curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] );
-          for ( i = 0; i < parts.length - 1; i++ ) {
-            curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {};
-            curOption = curOption[ parts[ i ] ];
-          }
-          key = parts.pop();
-          if ( arguments.length === 1 ) {
-            return curOption[ key ] === undefined ? null : curOption[ key ];
-          }
-          curOption[ key ] = value;
-        } else {
-          if ( arguments.length === 1 ) {
-            return this.options[ key ] === undefined ? null : this.options[ key ];
-          }
-          options[ key ] = value;
-        }
-      }
-
-      this._setOptions( options );
-
-      return this;
-    },
-
-    _setOptions: function( options ) {
-      var key;
-
-      for ( key in options ) {
-        this._setOption( key, options[ key ] );
-      }
-
-      return this;
-    },
-
-    _setOption: function( key, value ) {
-      if ( key === "classes" ) {
-        this._setOptionClasses( value );
-      }
-
-      this.options[ key ] = value;
-
-      if ( key === "disabled" ) {
-        this._setOptionDisabled( value );
-      }
-
-      return this;
-    },
-
-    _setOptionClasses: function( value ) {
-      var classKey, elements, currentElements;
-
-      for ( classKey in value ) {
-        currentElements = this.classesElementLookup[ classKey ];
-        if ( value[ classKey ] === this.options.classes[ classKey ] ||
-          !currentElements ||
-          !currentElements.length ) {
-          continue;
-        }
-
-        // We are doing this to create a new jQuery object because the _removeClass() call
-        // on the next line is going to destroy the reference to the current elements being
-        // tracked. We need to save a copy of this collection so that we can add the new classes
-        // below.
-        elements = $( currentElements.get() );
-        this._removeClass( currentElements, classKey );
-
-        // We don't use _addClass() here, because that uses this.options.classes
-        // for generating the string of classes. We want to use the value passed in from
-        // _setOption(), this is the new value of the classes option which was passed to
-        // _setOption(). We pass this value directly to _classes().
-        elements.addClass( this._classes( {
-          element: elements,
-          keys: classKey,
-          classes: value,
-          add: true
-        } ) );
-      }
-    },
-
-    _setOptionDisabled: function( value ) {
-      this._toggleClass( this.widget(), this.widgetFullName + "-disabled", null, !!value );
-
-      // If the widget is becoming disabled, then nothing is interactive
-      if ( value ) {
-        this._removeClass( this.hoverable, null, "ui-state-hover" );
-        this._removeClass( this.focusable, null, "ui-state-focus" );
-      }
-    },
-
-    enable: function() {
-      return this._setOptions( { disabled: false } );
-    },
-
-    disable: function() {
-      return this._setOptions( { disabled: true } );
-    },
-
-    _classes: function( options ) {
-      var full = [];
-      var that = this;
-
-      options = $.extend( {
-        element: this.element,
-        classes: this.options.classes || {}
-      }, options );
-
-      function processClassString( classes, checkOption ) {
-        var current, i;
-        for ( i = 0; i < classes.length; i++ ) {
-          current = that.classesElementLookup[ classes[ i ] ] || $();
-          if ( options.add ) {
-            current = $( $.unique( current.get().concat( options.element.get() ) ) );
-          } else {
-            current = $( current.not( options.element ).get() );
-          }
-          that.classesElementLookup[ classes[ i ] ] = current;
-          full.push( classes[ i ] );
-          if ( checkOption && options.classes[ classes[ i ] ] ) {
-            full.push( options.classes[ classes[ i ] ] );
-          }
-        }
-      }
-
-      this._on( options.element, {
-        "remove": "_untrackClassesElement"
-      } );
-
-      if ( options.keys ) {
-        processClassString( options.keys.match( /\S+/g ) || [], true );
-      }
-      if ( options.extra ) {
-        processClassString( options.extra.match( /\S+/g ) || [] );
-      }
-
-      return full.join( " " );
-    },
-
-    _untrackClassesElement: function( event ) {
-      var that = this;
-      $.each( that.classesElementLookup, function( key, value ) {
-        if ( $.inArray( event.target, value ) !== -1 ) {
-          that.classesElementLookup[ key ] = $( value.not( event.target ).get() );
-        }
-      } );
-    },
-
-    _removeClass: function( element, keys, extra ) {
-      return this._toggleClass( element, keys, extra, false );
-    },
-
-    _addClass: function( element, keys, extra ) {
-      return this._toggleClass( element, keys, extra, true );
-    },
-
-    _toggleClass: function( element, keys, extra, add ) {
-      add = ( typeof add === "boolean" ) ? add : extra;
-      var shift = ( typeof element === "string" || element === null ),
-        options = {
-          extra: shift ? keys : extra,
-          keys: shift ? element : keys,
-          element: shift ? this.element : element,
-          add: add
-        };
-      options.element.toggleClass( this._classes( options ), add );
-      return this;
-    },
-
-    _on: function( suppressDisabledCheck, element, handlers ) {
-      var delegateElement;
-      var instance = this;
-
-      // No suppressDisabledCheck flag, shuffle arguments
-      if ( typeof suppressDisabledCheck !== "boolean" ) {
-        handlers = element;
-        element = suppressDisabledCheck;
-        suppressDisabledCheck = false;
-      }
-
-      // No element argument, shuffle and use this.element
-      if ( !handlers ) {
-        handlers = element;
-        element = this.element;
-        delegateElement = this.widget();
-      } else {
-        element = delegateElement = $( element );
-        this.bindings = this.bindings.add( element );
-      }
-
-      $.each( handlers, function( event, handler ) {
-        function handlerProxy() {
-
-          // Allow widgets to customize the disabled handling
-          // - disabled as an array instead of boolean
-          // - disabled class as method for disabling individual parts
-          if ( !suppressDisabledCheck &&
-            ( instance.options.disabled === true ||
-              $( this ).hasClass( "ui-state-disabled" ) ) ) {
-            return;
-          }
-          return ( typeof handler === "string" ? instance[ handler ] : handler )
-            .apply( instance, arguments );
-        }
-
-        // Copy the guid so direct unbinding works
-        if ( typeof handler !== "string" ) {
-          handlerProxy.guid = handler.guid =
-            handler.guid || handlerProxy.guid || $.guid++;
-        }
-
-        var match = event.match( /^([\w:-]*)\s*(.*)$/ );
-        var eventName = match[ 1 ] + instance.eventNamespace;
-        var selector = match[ 2 ];
-
-        if ( selector ) {
-          delegateElement.on( eventName, selector, handlerProxy );
-        } else {
-          element.on( eventName, handlerProxy );
-        }
-      } );
-    },
-
-    _off: function( element, eventName ) {
-      eventName = ( eventName || "" ).split( " " ).join( this.eventNamespace + " " ) +
-        this.eventNamespace;
-      element.off( eventName ).off( eventName );
-
-      // Clear the stack to avoid memory leaks (#10056)
-      this.bindings = $( this.bindings.not( element ).get() );
-      this.focusable = $( this.focusable.not( element ).get() );
-      this.hoverable = $( this.hoverable.not( element ).get() );
-    },
-
-    _delay: function( handler, delay ) {
-      function handlerProxy() {
-        return ( typeof handler === "string" ? instance[ handler ] : handler )
-          .apply( instance, arguments );
-      }
-      var instance = this;
-      return setTimeout( handlerProxy, delay || 0 );
-    },
-
-    _hoverable: function( element ) {
-      this.hoverable = this.hoverable.add( element );
-      this._on( element, {
-        mouseenter: function( event ) {
-          this._addClass( $( event.currentTarget ), null, "ui-state-hover" );
-        },
-        mouseleave: function( event ) {
-          this._removeClass( $( event.currentTarget ), null, "ui-state-hover" );
-        }
-      } );
-    },
-
-    _focusable: function( element ) {
-      this.focusable = this.focusable.add( element );
-      this._on( element, {
-        focusin: function( event ) {
-          this._addClass( $( event.currentTarget ), null, "ui-state-focus" );
-        },
-        focusout: function( event ) {
-          this._removeClass( $( event.currentTarget ), null, "ui-state-focus" );
-        }
-      } );
-    },
-
-    _trigger: function( type, event, data ) {
-      var prop, orig;
-      var callback = this.options[ type ];
-
-      data = data || {};
-      event = $.Event( event );
-      event.type = ( type === this.widgetEventPrefix ?
-        type :
-        this.widgetEventPrefix + type ).toLowerCase();
-
-      // The original event may come from any element
-      // so we need to reset the target on the new event
-      event.target = this.element[ 0 ];
-
-      // Copy original event properties over to the new event
-      orig = event.originalEvent;
-      if ( orig ) {
-        for ( prop in orig ) {
-          if ( !( prop in event ) ) {
-            event[ prop ] = orig[ prop ];
-          }
-        }
-      }
-
-      this.element.trigger( event, data );
-      return !( $.isFunction( callback ) &&
-        callback.apply( this.element[ 0 ], [ event ].concat( data ) ) === false ||
-        event.isDefaultPrevented() );
-    }
-  };
-
-  $.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
-    $.Widget.prototype[ "_" + method ] = function( element, options, callback ) {
-      if ( typeof options === "string" ) {
-        options = { effect: options };
-      }
-
-      var hasOptions;
-      var effectName = !options ?
-        method :
-        options === true || typeof options === "number" ?
-        defaultEffect :
-        options.effect || defaultEffect;
-
-      options = options || {};
-      if ( typeof options === "number" ) {
-        options = { duration: options };
-      }
-
-      hasOptions = !$.isEmptyObject( options );
-      options.complete = callback;
-
-      if ( options.delay ) {
-        element.delay( options.delay );
-      }
-
-      if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) {
-        element[ method ]( options );
-      } else if ( effectName !== method && element[ effectName ] ) {
-        element[ effectName ]( options.duration, options.easing, callback );
-      } else {
-        element.queue( function( next ) {
-          $( this )[ method ]();
-          if ( callback ) {
-            callback.call( element[ 0 ] );
-          }
-          next();
-        } );
-      }
-    };
-  } );
-
-  var widget = $.widget;
-
-
-
-
-}));
diff --git a/lib/cloudinary/static/cloudinary/js/load-image.all.min.js b/lib/cloudinary/static/cloudinary/js/load-image.all.min.js
deleted file mode 100644
index 03eb06ba..00000000
--- a/lib/cloudinary/static/cloudinary/js/load-image.all.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(e){"use strict";function t(e,i,a){var o,n=document.createElement("img");return n.onerror=function(o){return t.onerror(n,o,e,i,a)},n.onload=function(o){return t.onload(n,o,e,i,a)},"string"==typeof e?(t.fetchBlob(e,function(i){i?(e=i,o=t.createObjectURL(e)):(o=e,a&&a.crossOrigin&&(n.crossOrigin=a.crossOrigin)),n.src=o},a),n):t.isInstanceOf("Blob",e)||t.isInstanceOf("File",e)?(o=n._objectURL=t.createObjectURL(e))?(n.src=o,n):t.readFile(e,function(e){var t=e.target;t&&t.result?n.src=t.result:i&&i(e)}):void 0}function i(e,i){!e._objectURL||i&&i.noRevoke||(t.revokeObjectURL(e._objectURL),delete e._objectURL)}var a=e.createObjectURL&&e||e.URL&&URL.revokeObjectURL&&URL||e.webkitURL&&webkitURL;t.fetchBlob=function(e,t,i){t()},t.isInstanceOf=function(e,t){return Object.prototype.toString.call(t)==="[object "+e+"]"},t.transform=function(e,t,i,a,o){i(e,o)},t.onerror=function(e,t,a,o,n){i(e,n),o&&o.call(e,t)},t.onload=function(e,a,o,n,r){i(e,r),n&&t.transform(e,r,n,o,{})},t.createObjectURL=function(e){return!!a&&a.createObjectURL(e)},t.revokeObjectURL=function(e){return!!a&&a.revokeObjectURL(e)},t.readFile=function(t,i,a){if(e.FileReader){var o=new FileReader;if(o.onload=o.onerror=i,a=a||"readAsDataURL",o[a])return o[a](t),o}return!1},"function"==typeof define&&define.amd?define(function(){return t}):"object"==typeof module&&module.exports?module.exports=t:e.loadImage=t}("undefined"!=typeof window&&window||this),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image"],e):e("object"==typeof module&&module.exports?require("./load-image"):window.loadImage)}(function(e){"use strict";var t=e.transform;e.transform=function(i,a,o,n,r){t.call(e,e.scale(i,a,r),a,o,n,r)},e.transformCoordinates=function(){},e.getTransformedOptions=function(e,t){var i,a,o,n,r=t.aspectRatio;if(!r)return t;i={};for(a in t)t.hasOwnProperty(a)&&(i[a]=t[a]);return i.crop=!0,o=e.naturalWidth||e.width,n=e.naturalHeight||e.height,o/n>r?(i.maxWidth=n*r,i.maxHeight=n):(i.maxWidth=o,i.maxHeight=o/r),i},e.renderImageToCanvas=function(e,t,i,a,o,n,r,s,l,c){return e.getContext("2d").drawImage(t,i,a,o,n,r,s,l,c),e},e.hasCanvasOption=function(e){return e.canvas||e.crop||!!e.aspectRatio},e.scale=function(t,i,a){function o(){var e=Math.max((l||I)/I,(c||v)/v);e>1&&(I*=e,v*=e)}function n(){var e=Math.min((r||I)/I,(s||v)/v);e<1&&(I*=e,v*=e)}i=i||{};var r,s,l,c,d,u,f,g,p,m,h,S=document.createElement("canvas"),b=t.getContext||e.hasCanvasOption(i)&&S.getContext,y=t.naturalWidth||t.width,x=t.naturalHeight||t.height,I=y,v=x;if(b&&(f=(i=e.getTransformedOptions(t,i,a)).left||0,g=i.top||0,i.sourceWidth?(d=i.sourceWidth,void 0!==i.right&&void 0===i.left&&(f=y-d-i.right)):d=y-f-(i.right||0),i.sourceHeight?(u=i.sourceHeight,void 0!==i.bottom&&void 0===i.top&&(g=x-u-i.bottom)):u=x-g-(i.bottom||0),I=d,v=u),r=i.maxWidth,s=i.maxHeight,l=i.minWidth,c=i.minHeight,b&&r&&s&&i.crop?(I=r,v=s,(h=d/u-r/s)<0?(u=s*d/r,void 0===i.top&&void 0===i.bottom&&(g=(x-u)/2)):h>0&&(d=r*u/s,void 0===i.left&&void 0===i.right&&(f=(y-d)/2))):((i.contain||i.cover)&&(l=r=r||l,c=s=s||c),i.cover?(n(),o()):(o(),n())),b){if((p=i.pixelRatio)>1&&(S.style.width=I+"px",S.style.height=v+"px",I*=p,v*=p,S.getContext("2d").scale(p,p)),(m=i.downsamplingRatio)>0&&m<1&&I<d&&v<u)for(;d*m>I;)S.width=d*m,S.height=u*m,e.renderImageToCanvas(S,t,f,g,d,u,0,0,S.width,S.height),f=0,g=0,d=S.width,u=S.height,(t=document.createElement("canvas")).width=d,t.height=u,e.renderImageToCanvas(t,S,0,0,d,u,0,0,d,u);return S.width=I,S.height=v,e.transformCoordinates(S,i),e.renderImageToCanvas(S,t,f,g,d,u,0,0,I,v)}return t.width=I,t.height=v,t}}),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image"],e):e("object"==typeof module&&module.exports?require("./load-image"):window.loadImage)}(function(e){"use strict";var t="undefined"!=typeof Blob&&(Blob.prototype.slice||Blob.prototype.webkitSlice||Blob.prototype.mozSlice);e.blobSlice=t&&function(){return(this.slice||this.webkitSlice||this.mozSlice).apply(this,arguments)},e.metaDataParsers={jpeg:{65505:[],65517:[]}},e.parseMetaData=function(t,i,a,o){a=a||{},o=o||{};var n=this,r=a.maxMetaDataSize||262144;!!("undefined"!=typeof DataView&&t&&t.size>=12&&"image/jpeg"===t.type&&e.blobSlice)&&e.readFile(e.blobSlice.call(t,0,r),function(t){if(t.target.error)return console.log(t.target.error),void i(o);var r,s,l,c,d=t.target.result,u=new DataView(d),f=2,g=u.byteLength-4,p=f;if(65496===u.getUint16(0)){for(;f<g&&((r=u.getUint16(f))>=65504&&r<=65519||65534===r);){if(s=u.getUint16(f+2)+2,f+s>u.byteLength){console.log("Invalid meta data: Invalid segment size.");break}if(l=e.metaDataParsers.jpeg[r])for(c=0;c<l.length;c+=1)l[c].call(n,u,f,s,o,a);p=f+=s}!a.disableImageHead&&p>6&&(d.slice?o.imageHead=d.slice(0,p):o.imageHead=new Uint8Array(d).subarray(0,p))}else console.log("Invalid JPEG file: Missing JPEG marker.");i(o)},"readAsArrayBuffer")||i(o)},e.hasMetaOption=function(e){return e&&e.meta};var i=e.transform;e.transform=function(t,a,o,n,r){e.hasMetaOption(a)?e.parseMetaData(n,function(r){i.call(e,t,a,o,n,r)},a,r):i.apply(e,arguments)}}),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image","./load-image-meta"],e):"object"==typeof module&&module.exports?e(require("./load-image"),require("./load-image-meta")):e(window.loadImage)}(function(e){"use strict";"undefined"!=typeof fetch&&"undefined"!=typeof Request&&(e.fetchBlob=function(t,i,a){if(e.hasMetaOption(a))return fetch(new Request(t,a)).then(function(e){return e.blob()}).then(i).catch(function(e){console.log(e),i()});i()})}),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image","./load-image-scale","./load-image-meta"],e):"object"==typeof module&&module.exports?e(require("./load-image"),require("./load-image-scale"),require("./load-image-meta")):e(window.loadImage)}(function(e){"use strict";var t=e.hasCanvasOption,i=e.hasMetaOption,a=e.transformCoordinates,o=e.getTransformedOptions;e.hasCanvasOption=function(i){return!!i.orientation||t.call(e,i)},e.hasMetaOption=function(t){return t&&!0===t.orientation||i.call(e,t)},e.transformCoordinates=function(t,i){a.call(e,t,i);var o=t.getContext("2d"),n=t.width,r=t.height,s=t.style.width,l=t.style.height,c=i.orientation;if(c&&!(c>8))switch(c>4&&(t.width=r,t.height=n,t.style.width=l,t.style.height=s),c){case 2:o.translate(n,0),o.scale(-1,1);break;case 3:o.translate(n,r),o.rotate(Math.PI);break;case 4:o.translate(0,r),o.scale(1,-1);break;case 5:o.rotate(.5*Math.PI),o.scale(1,-1);break;case 6:o.rotate(.5*Math.PI),o.translate(0,-r);break;case 7:o.rotate(.5*Math.PI),o.translate(n,-r),o.scale(-1,1);break;case 8:o.rotate(-.5*Math.PI),o.translate(-n,0)}},e.getTransformedOptions=function(t,i,a){var n,r,s=o.call(e,t,i),l=s.orientation;if(!0===l&&a&&a.exif&&(l=a.exif.get("Orientation")),!l||l>8||1===l)return s;n={};for(r in s)s.hasOwnProperty(r)&&(n[r]=s[r]);switch(n.orientation=l,l){case 2:n.left=s.right,n.right=s.left;break;case 3:n.left=s.right,n.top=s.bottom,n.right=s.left,n.bottom=s.top;break;case 4:n.top=s.bottom,n.bottom=s.top;break;case 5:n.left=s.top,n.top=s.left,n.right=s.bottom,n.bottom=s.right;break;case 6:n.left=s.top,n.top=s.right,n.right=s.bottom,n.bottom=s.left;break;case 7:n.left=s.bottom,n.top=s.right,n.right=s.top,n.bottom=s.left;break;case 8:n.left=s.bottom,n.top=s.left,n.right=s.top,n.bottom=s.right}return n.orientation>4&&(n.maxWidth=s.maxHeight,n.maxHeight=s.maxWidth,n.minWidth=s.minHeight,n.minHeight=s.minWidth,n.sourceWidth=s.sourceHeight,n.sourceHeight=s.sourceWidth),n}}),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image","./load-image-meta"],e):"object"==typeof module&&module.exports?e(require("./load-image"),require("./load-image-meta")):e(window.loadImage)}(function(e){"use strict";e.ExifMap=function(){return this},e.ExifMap.prototype.map={Orientation:274},e.ExifMap.prototype.get=function(e){return this[e]||this[this.map[e]]},e.getExifThumbnail=function(t,i,a){if(a&&!(i+a>t.byteLength))return e.createObjectURL(new Blob([t.buffer.slice(i,i+a)]));console.log("Invalid Exif data: Invalid thumbnail data.")},e.exifTagTypes={1:{getValue:function(e,t){return e.getUint8(t)},size:1},2:{getValue:function(e,t){return String.fromCharCode(e.getUint8(t))},size:1,ascii:!0},3:{getValue:function(e,t,i){return e.getUint16(t,i)},size:2},4:{getValue:function(e,t,i){return e.getUint32(t,i)},size:4},5:{getValue:function(e,t,i){return e.getUint32(t,i)/e.getUint32(t+4,i)},size:8},9:{getValue:function(e,t,i){return e.getInt32(t,i)},size:4},10:{getValue:function(e,t,i){return e.getInt32(t,i)/e.getInt32(t+4,i)},size:8}},e.exifTagTypes[7]=e.exifTagTypes[1],e.getExifValue=function(t,i,a,o,n,r){var s,l,c,d,u,f,g=e.exifTagTypes[o];if(g){if(s=g.size*n,!((l=s>4?i+t.getUint32(a+8,r):a+8)+s>t.byteLength)){if(1===n)return g.getValue(t,l,r);for(c=[],d=0;d<n;d+=1)c[d]=g.getValue(t,l+d*g.size,r);if(g.ascii){for(u="",d=0;d<c.length&&"\0"!==(f=c[d]);d+=1)u+=f;return u}return c}console.log("Invalid Exif data: Invalid data offset.")}else console.log("Invalid Exif data: Invalid tag type.")},e.parseExifTag=function(t,i,a,o,n){var r=t.getUint16(a,o);n.exif[r]=e.getExifValue(t,i,a,t.getUint16(a+2,o),t.getUint32(a+4,o),o)},e.parseExifTags=function(e,t,i,a,o){var n,r,s;if(i+6>e.byteLength)console.log("Invalid Exif data: Invalid directory offset.");else{if(n=e.getUint16(i,a),!((r=i+2+12*n)+4>e.byteLength)){for(s=0;s<n;s+=1)this.parseExifTag(e,t,i+2+12*s,a,o);return e.getUint32(r,a)}console.log("Invalid Exif data: Invalid directory size.")}},e.parseExifData=function(t,i,a,o,n){if(!n.disableExif){var r,s,l,c=i+10;if(1165519206===t.getUint32(i+4))if(c+8>t.byteLength)console.log("Invalid Exif data: Invalid segment size.");else if(0===t.getUint16(i+8)){switch(t.getUint16(c)){case 18761:r=!0;break;case 19789:r=!1;break;default:return void console.log("Invalid Exif data: Invalid byte alignment marker.")}42===t.getUint16(c+2,r)?(s=t.getUint32(c+4,r),o.exif=new e.ExifMap,(s=e.parseExifTags(t,c,c+s,r,o))&&!n.disableExifThumbnail&&(l={exif:{}},s=e.parseExifTags(t,c,c+s,r,l),l.exif[513]&&(o.exif.Thumbnail=e.getExifThumbnail(t,c+l.exif[513],l.exif[514]))),o.exif[34665]&&!n.disableExifSub&&e.parseExifTags(t,c,c+o.exif[34665],r,o),o.exif[34853]&&!n.disableExifGps&&e.parseExifTags(t,c,c+o.exif[34853],r,o)):console.log("Invalid Exif data: Missing TIFF marker.")}else console.log("Invalid Exif data: Missing byte alignment offset.")}},e.metaDataParsers.jpeg[65505].push(e.parseExifData)}),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image","./load-image-exif"],e):"object"==typeof module&&module.exports?e(require("./load-image"),require("./load-image-exif")):e(window.loadImage)}(function(e){"use strict";e.ExifMap.prototype.tags={256:"ImageWidth",257:"ImageHeight",34665:"ExifIFDPointer",34853:"GPSInfoIFDPointer",40965:"InteroperabilityIFDPointer",258:"BitsPerSample",259:"Compression",262:"PhotometricInterpretation",274:"Orientation",277:"SamplesPerPixel",284:"PlanarConfiguration",530:"YCbCrSubSampling",531:"YCbCrPositioning",282:"XResolution",283:"YResolution",296:"ResolutionUnit",273:"StripOffsets",278:"RowsPerStrip",279:"StripByteCounts",513:"JPEGInterchangeFormat",514:"JPEGInterchangeFormatLength",301:"TransferFunction",318:"WhitePoint",319:"PrimaryChromaticities",529:"YCbCrCoefficients",532:"ReferenceBlackWhite",306:"DateTime",270:"ImageDescription",271:"Make",272:"Model",305:"Software",315:"Artist",33432:"Copyright",36864:"ExifVersion",40960:"FlashpixVersion",40961:"ColorSpace",40962:"PixelXDimension",40963:"PixelYDimension",42240:"Gamma",37121:"ComponentsConfiguration",37122:"CompressedBitsPerPixel",37500:"MakerNote",37510:"UserComment",40964:"RelatedSoundFile",36867:"DateTimeOriginal",36868:"DateTimeDigitized",37520:"SubSecTime",37521:"SubSecTimeOriginal",37522:"SubSecTimeDigitized",33434:"ExposureTime",33437:"FNumber",34850:"ExposureProgram",34852:"SpectralSensitivity",34855:"PhotographicSensitivity",34856:"OECF",34864:"SensitivityType",34865:"StandardOutputSensitivity",34866:"RecommendedExposureIndex",34867:"ISOSpeed",34868:"ISOSpeedLatitudeyyy",34869:"ISOSpeedLatitudezzz",37377:"ShutterSpeedValue",37378:"ApertureValue",37379:"BrightnessValue",37380:"ExposureBias",37381:"MaxApertureValue",37382:"SubjectDistance",37383:"MeteringMode",37384:"LightSource",37385:"Flash",37396:"SubjectArea",37386:"FocalLength",41483:"FlashEnergy",41484:"SpatialFrequencyResponse",41486:"FocalPlaneXResolution",41487:"FocalPlaneYResolution",41488:"FocalPlaneResolutionUnit",41492:"SubjectLocation",41493:"ExposureIndex",41495:"SensingMethod",41728:"FileSource",41729:"SceneType",41730:"CFAPattern",41985:"CustomRendered",41986:"ExposureMode",41987:"WhiteBalance",41988:"DigitalZoomRatio",41989:"FocalLengthIn35mmFilm",41990:"SceneCaptureType",41991:"GainControl",41992:"Contrast",41993:"Saturation",41994:"Sharpness",41995:"DeviceSettingDescription",41996:"SubjectDistanceRange",42016:"ImageUniqueID",42032:"CameraOwnerName",42033:"BodySerialNumber",42034:"LensSpecification",42035:"LensMake",42036:"LensModel",42037:"LensSerialNumber",0:"GPSVersionID",1:"GPSLatitudeRef",2:"GPSLatitude",3:"GPSLongitudeRef",4:"GPSLongitude",5:"GPSAltitudeRef",6:"GPSAltitude",7:"GPSTimeStamp",8:"GPSSatellites",9:"GPSStatus",10:"GPSMeasureMode",11:"GPSDOP",12:"GPSSpeedRef",13:"GPSSpeed",14:"GPSTrackRef",15:"GPSTrack",16:"GPSImgDirectionRef",17:"GPSImgDirection",18:"GPSMapDatum",19:"GPSDestLatitudeRef",20:"GPSDestLatitude",21:"GPSDestLongitudeRef",22:"GPSDestLongitude",23:"GPSDestBearingRef",24:"GPSDestBearing",25:"GPSDestDistanceRef",26:"GPSDestDistance",27:"GPSProcessingMethod",28:"GPSAreaInformation",29:"GPSDateStamp",30:"GPSDifferential",31:"GPSHPositioningError"},e.ExifMap.prototype.stringValues={ExposureProgram:{0:"Undefined",1:"Manual",2:"Normal program",3:"Aperture priority",4:"Shutter priority",5:"Creative program",6:"Action program",7:"Portrait mode",8:"Landscape mode"},MeteringMode:{0:"Unknown",1:"Average",2:"CenterWeightedAverage",3:"Spot",4:"MultiSpot",5:"Pattern",6:"Partial",255:"Other"},LightSource:{0:"Unknown",1:"Daylight",2:"Fluorescent",3:"Tungsten (incandescent light)",4:"Flash",9:"Fine weather",10:"Cloudy weather",11:"Shade",12:"Daylight fluorescent (D 5700 - 7100K)",13:"Day white fluorescent (N 4600 - 5400K)",14:"Cool white fluorescent (W 3900 - 4500K)",15:"White fluorescent (WW 3200 - 3700K)",17:"Standard light A",18:"Standard light B",19:"Standard light C",20:"D55",21:"D65",22:"D75",23:"D50",24:"ISO studio tungsten",255:"Other"},Flash:{0:"Flash did not fire",1:"Flash fired",5:"Strobe return light not detected",7:"Strobe return light detected",9:"Flash fired, compulsory flash mode",13:"Flash fired, compulsory flash mode, return light not detected",15:"Flash fired, compulsory flash mode, return light detected",16:"Flash did not fire, compulsory flash mode",24:"Flash did not fire, auto mode",25:"Flash fired, auto mode",29:"Flash fired, auto mode, return light not detected",31:"Flash fired, auto mode, return light detected",32:"No flash function",65:"Flash fired, red-eye reduction mode",69:"Flash fired, red-eye reduction mode, return light not detected",71:"Flash fired, red-eye reduction mode, return light detected",73:"Flash fired, compulsory flash mode, red-eye reduction mode",77:"Flash fired, compulsory flash mode, red-eye reduction mode, return light not detected",79:"Flash fired, compulsory flash mode, red-eye reduction mode, return light detected",89:"Flash fired, auto mode, red-eye reduction mode",93:"Flash fired, auto mode, return light not detected, red-eye reduction mode",95:"Flash fired, auto mode, return light detected, red-eye reduction mode"},SensingMethod:{1:"Undefined",2:"One-chip color area sensor",3:"Two-chip color area sensor",4:"Three-chip color area sensor",5:"Color sequential area sensor",7:"Trilinear sensor",8:"Color sequential linear sensor"},SceneCaptureType:{0:"Standard",1:"Landscape",2:"Portrait",3:"Night scene"},SceneType:{1:"Directly photographed"},CustomRendered:{0:"Normal process",1:"Custom process"},WhiteBalance:{0:"Auto white balance",1:"Manual white balance"},GainControl:{0:"None",1:"Low gain up",2:"High gain up",3:"Low gain down",4:"High gain down"},Contrast:{0:"Normal",1:"Soft",2:"Hard"},Saturation:{0:"Normal",1:"Low saturation",2:"High saturation"},Sharpness:{0:"Normal",1:"Soft",2:"Hard"},SubjectDistanceRange:{0:"Unknown",1:"Macro",2:"Close view",3:"Distant view"},FileSource:{3:"DSC"},ComponentsConfiguration:{0:"",1:"Y",2:"Cb",3:"Cr",4:"R",5:"G",6:"B"},Orientation:{1:"top-left",2:"top-right",3:"bottom-right",4:"bottom-left",5:"left-top",6:"right-top",7:"right-bottom",8:"left-bottom"}},e.ExifMap.prototype.getText=function(e){var t=this.get(e);switch(e){case"LightSource":case"Flash":case"MeteringMode":case"ExposureProgram":case"SensingMethod":case"SceneCaptureType":case"SceneType":case"CustomRendered":case"WhiteBalance":case"GainControl":case"Contrast":case"Saturation":case"Sharpness":case"SubjectDistanceRange":case"FileSource":case"Orientation":return this.stringValues[e][t];case"ExifVersion":case"FlashpixVersion":if(!t)return;return String.fromCharCode(t[0],t[1],t[2],t[3]);case"ComponentsConfiguration":if(!t)return;return this.stringValues[e][t[0]]+this.stringValues[e][t[1]]+this.stringValues[e][t[2]]+this.stringValues[e][t[3]];case"GPSVersionID":if(!t)return;return t[0]+"."+t[1]+"."+t[2]+"."+t[3]}return String(t)},function(e){var t,i=e.tags,a=e.map;for(t in i)i.hasOwnProperty(t)&&(a[i[t]]=t)}(e.ExifMap.prototype),e.ExifMap.prototype.getAll=function(){var e,t,i={};for(e in this)this.hasOwnProperty(e)&&(t=this.tags[e])&&(i[t]=this.getText(t));return i}}),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image","./load-image-meta"],e):"object"==typeof module&&module.exports?e(require("./load-image"),require("./load-image-meta")):e(window.loadImage)}(function(e){"use strict";e.IptcMap=function(){return this},e.IptcMap.prototype.map={ObjectName:5},e.IptcMap.prototype.get=function(e){return this[e]||this[this.map[e]]},e.parseIptcTags=function(e,t,i,a){for(var o,n,r=t;r<t+i;)28===e.getUint8(r)&&2===e.getUint8(r+1)&&(n=e.getUint8(r+2))in a.iptc.tags&&(o=function(e,t,i){for(var a="",o=t;o<t+i;o++)a+=String.fromCharCode(e.getUint8(o));return a}(e,r+5,e.getInt16(r+3)),a.iptc.hasOwnProperty(n)?a.iptc[n]instanceof Array?a.iptc[n].push(o):a.iptc[n]=[a.iptc[n],o]:a.iptc[n]=o),r++},e.parseIptcData=function(t,i,a,o,n){if(!n.disableIptc){for(var r=i+a;i+8<r;){if(function(e,t){return 943868237===e.getUint32(t)&&1028===e.getUint16(t+4)}(t,i)){var s=t.getUint8(i+7);s%2!=0&&(s+=1),0===s&&(s=4);var l=i+8+s;if(l>r){console.log("Invalid IPTC data: Invalid segment offset.");break}var c=t.getUint16(i+6+s);if(i+c>r){console.log("Invalid IPTC data: Invalid segment size.");break}return o.iptc=new e.IptcMap,e.parseIptcTags(t,l,c,o)}i++}console.log("No IPTC data at this offset - could be XMP")}},e.metaDataParsers.jpeg[65517].push(e.parseIptcData)}),function(e){"use strict";"function"==typeof define&&define.amd?define(["./load-image","./load-image-iptc"],e):"object"==typeof module&&module.exports?e(require("./load-image"),require("./load-image-iptc")):e(window.loadImage)}(function(e){"use strict";e.IptcMap.prototype.tags={3:"ObjectType",4:"ObjectAttribute",5:"ObjectName",7:"EditStatus",8:"EditorialUpdate",10:"Urgency",12:"SubjectRef",15:"Category",20:"SupplCategory",22:"FixtureID",25:"Keywords",26:"ContentLocCode",27:"ContentLocName",30:"ReleaseDate",35:"ReleaseTime",37:"ExpirationDate",38:"ExpirationTime",40:"SpecialInstructions",42:"ActionAdvised",45:"RefService",47:"RefDate",50:"RefNumber",55:"DateCreated",60:"TimeCreated",62:"DigitalCreationDate",63:"DigitalCreationTime",65:"OriginatingProgram",70:"ProgramVersion",75:"ObjectCycle",80:"Byline",85:"BylineTitle",90:"City",92:"Sublocation",95:"State",100:"CountryCode",101:"CountryName",103:"OrigTransRef",105:"Headline",110:"Credit",115:"Source",116:"CopyrightNotice",118:"Contact",120:"Caption",122:"WriterEditor",130:"ImageType",131:"ImageOrientation",135:"LanguageID"},e.IptcMap.prototype.getText=function(e){var t=this.get(e);return String(t)},function(e){var t,i=e.tags,a=e.map||{};for(t in i)i.hasOwnProperty(t)&&(a[i[t]]=t)}(e.IptcMap.prototype),e.IptcMap.prototype.getAll=function(){var e,t,i={};for(e in this)this.hasOwnProperty(e)&&(t=this.tags[e])&&(i[t]=this.getText(t));return i}});
diff --git a/lib/cloudinary/templates/cloudinary_direct_upload.html b/lib/cloudinary/templates/cloudinary_direct_upload.html
deleted file mode 100644
index 2bf710c4..00000000
--- a/lib/cloudinary/templates/cloudinary_direct_upload.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<form action={{url}} method="POST" enctype="multipart/form-data">
-  {% for name, value in params.items %}
-    <input type="hidden" name="{{name}}" value="{{value}}"/>
-  {% endfor %}
-  {% block extra %} {% endblock %}
-  {% block file %} 
-    <input type="file" name="file"/>
-  {% endblock %}
-  {% block submit %} 
-    <input type="submit"/>
-  {% endblock %}
-</form>
diff --git a/lib/cloudinary/templates/cloudinary_includes.html b/lib/cloudinary/templates/cloudinary_includes.html
deleted file mode 100644
index 908c41d2..00000000
--- a/lib/cloudinary/templates/cloudinary_includes.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% load static %}
-
-<script src="{% static "cloudinary/js/jquery.ui.widget.js" %}" type="text/javascript"></script>
-<script src="{% static "cloudinary/js/jquery.iframe-transport.js" %}" type="text/javascript"></script>
-<script src="{% static "cloudinary/js/jquery.fileupload.js" %}" type="text/javascript"></script>
-<script src="{% static "cloudinary/js/jquery.cloudinary.js" %}" type="text/javascript"></script>
-
-{% if processing %}
-<script src="{% static "cloudinary/js/load-image.all.min.js" %}" type="text/javascript"></script>
-<script src="{% static "cloudinary/js/canvas-to-blob.min.js" %}" type="text/javascript"></script>
-<script src="{% static "cloudinary/js/jquery.fileupload-process.js" %}" type="text/javascript"></script>
-<script src="{% static "cloudinary/js/jquery.fileupload-image.js" %}" type="text/javascript"></script>
-<script src="{% static "cloudinary/js/jquery.fileupload-validate.js" %}" type="text/javascript"></script>
-{% endif %}
diff --git a/lib/cloudinary/templates/cloudinary_js_config.html b/lib/cloudinary/templates/cloudinary_js_config.html
deleted file mode 100644
index dc7f4890..00000000
--- a/lib/cloudinary/templates/cloudinary_js_config.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<script type='text/javascript'>
-  $.cloudinary.config({{ params|safe }});
-</script>
diff --git a/lib/cloudinary/templatetags/__init__.py b/lib/cloudinary/templatetags/__init__.py
deleted file mode 100644
index 792d6005..00000000
--- a/lib/cloudinary/templatetags/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-#
diff --git a/lib/cloudinary/templatetags/cloudinary.py b/lib/cloudinary/templatetags/cloudinary.py
deleted file mode 100644
index 0a669053..00000000
--- a/lib/cloudinary/templatetags/cloudinary.py
+++ /dev/null
@@ -1,86 +0,0 @@
-from __future__ import absolute_import
-
-import json
-
-import cloudinary
-from cloudinary import CloudinaryResource, utils
-from cloudinary.compat import PY3
-from cloudinary.forms import CloudinaryJsFileField, cl_init_js_callbacks
-from django import template
-from django.forms import Form
-from django.utils.safestring import mark_safe
-
-register = template.Library()
-
-
-@register.simple_tag(takes_context=True)
-def cloudinary_url(context, source, options_dict=None, **options):
-    if options_dict is None:
-        options = dict(**options)
-    else:
-        options = dict(options_dict, **options)
-    try:
-        if context['request'].is_secure() and 'secure' not in options:
-            options['secure'] = True
-    except KeyError:
-        pass
-    if not isinstance(source, CloudinaryResource):
-        source = CloudinaryResource(source)
-    return source.build_url(**options)
-
-
-@register.simple_tag(name='cloudinary', takes_context=True)
-def cloudinary_tag(context, image, options_dict=None, **options):
-    if options_dict is None:
-        options = dict(**options)
-    else:
-        options = dict(options_dict, **options)
-    try:
-        if context['request'].is_secure() and 'secure' not in options:
-            options['secure'] = True
-    except KeyError:
-        pass
-    if not isinstance(image, CloudinaryResource):
-        image = CloudinaryResource(image)
-    return mark_safe(image.image(**options))
-
-
-@register.simple_tag
-def cloudinary_direct_upload_field(field_name="image", request=None):
-    form = type("OnTheFlyForm", (Form,), {field_name: CloudinaryJsFileField()})()
-    if request:
-        cl_init_js_callbacks(form, request)
-    value = form[field_name]
-    if not PY3:
-        value = unicode(value)
-    return value
-
-
-@register.inclusion_tag('cloudinary_direct_upload.html')
-def cloudinary_direct_upload(callback_url, **options):
-    """Deprecated - please use cloudinary_direct_upload_field, or a proper form"""
-    params = utils.build_upload_params(callback=callback_url, **options)
-    params = utils.sign_request(params, options)
-
-    api_url = utils.cloudinary_api_url("upload", resource_type=options.get("resource_type", "image"),
-                                       upload_prefix=options.get("upload_prefix"))
-
-    return {"params": params, "url": api_url}
-
-
-@register.inclusion_tag('cloudinary_includes.html')
-def cloudinary_includes(processing=False):
-    return {"processing": processing}
-
-
-CLOUDINARY_JS_CONFIG_PARAMS = ("api_key", "cloud_name", "private_cdn", "secure_distribution", "cdn_subdomain")
-
-
-@register.inclusion_tag('cloudinary_js_config.html')
-def cloudinary_js_config():
-    config = cloudinary.config()
-    return dict(
-        params=json.dumps(dict(
-          (param, getattr(config, param)) for param in CLOUDINARY_JS_CONFIG_PARAMS if getattr(config, param, None)
-        ))
-    )
diff --git a/lib/cloudinary/uploader.py b/lib/cloudinary/uploader.py
deleted file mode 100644
index a2c91ad5..00000000
--- a/lib/cloudinary/uploader.py
+++ /dev/null
@@ -1,529 +0,0 @@
-# Copyright Cloudinary
-import json
-import os
-import socket
-
-from six import string_types
-from urllib3.exceptions import HTTPError
-
-import cloudinary
-from cloudinary import utils
-from cloudinary.cache.responsive_breakpoints_cache import instance as responsive_breakpoints_cache_instance
-from cloudinary.exceptions import Error
-from cloudinary.utils import build_eager
-
-try:
-    from urllib3.contrib.appengine import AppEngineManager, is_appengine_sandbox
-except Exception:
-    def is_appengine_sandbox():
-        return False
-
-try:  # Python 2.7+
-    from collections import OrderedDict
-except ImportError:
-    from urllib3.packages.ordered_dict import OrderedDict
-
-if is_appengine_sandbox():
-    # AppEngineManager uses AppEngine's URLFetch API behind the scenes
-    _http = AppEngineManager()
-else:
-    # PoolManager uses a socket-level API behind the scenes
-    _http = utils.get_http_connector(cloudinary.config(), cloudinary.CERT_KWARGS)
-
-upload_options = [
-    "filename",
-    "timeout",
-    "chunk_size",
-    "use_cache"
-]
-
-UPLOAD_LARGE_CHUNK_SIZE = 20000000
-
-
-def upload(file, **options):
-    params = utils.build_upload_params(**options)
-    return call_cacheable_api("upload", params, file=file, **options)
-
-
-def unsigned_upload(file, upload_preset, **options):
-    return upload(file, upload_preset=upload_preset, unsigned=True, **options)
-
-
-def upload_image(file, **options):
-    result = upload(file, **options)
-    return cloudinary.CloudinaryImage(
-        result["public_id"], version=str(result["version"]),
-        format=result.get("format"), metadata=result)
-
-
-def upload_resource(file, **options):
-    upload_func = upload
-    if hasattr(file, 'size') and file.size > UPLOAD_LARGE_CHUNK_SIZE:
-        upload_func = upload_large
-
-    result = upload_func(file, **options)
-
-    return cloudinary.CloudinaryResource(
-        result["public_id"], version=str(result["version"]),
-        format=result.get("format"), type=result["type"],
-        resource_type=result["resource_type"], metadata=result)
-
-
-def upload_large(file, **options):
-    """ Upload large files. """
-    if utils.is_remote_url(file):
-        return upload(file, **options)
-
-    if hasattr(file, 'read') and callable(file.read):
-        file_io = file
-    else:
-        file_io = open(file, 'rb')
-
-    upload_result = None
-
-    with file_io:
-        upload_id = utils.random_public_id()
-        current_loc = 0
-        chunk_size = options.get("chunk_size", UPLOAD_LARGE_CHUNK_SIZE)
-        file_size = utils.file_io_size(file_io)
-
-        file_name = options.get(
-            "filename",
-            file_io.name if hasattr(file_io, 'name') and isinstance(file_io.name, str) else "stream")
-
-        chunk = file_io.read(chunk_size)
-
-        while chunk:
-            content_range = "bytes {0}-{1}/{2}".format(current_loc, current_loc + len(chunk) - 1, file_size)
-            current_loc += len(chunk)
-            http_headers = {"Content-Range": content_range, "X-Unique-Upload-Id": upload_id}
-
-            upload_result = upload_large_part((file_name, chunk), http_headers=http_headers, **options)
-
-            options["public_id"] = upload_result.get("public_id")
-
-            chunk = file_io.read(chunk_size)
-
-    return upload_result
-
-
-def upload_large_part(file, **options):
-    """ Upload large files. """
-    params = utils.build_upload_params(**options)
-
-    if 'resource_type' not in options:
-        options['resource_type'] = "raw"
-
-    return call_cacheable_api("upload", params, file=file, **options)
-
-
-def destroy(public_id, **options):
-    params = {
-        "timestamp": utils.now(),
-        "type": options.get("type"),
-        "invalidate": options.get("invalidate"),
-        "public_id": public_id
-    }
-    return call_api("destroy", params, **options)
-
-
-def rename(from_public_id, to_public_id, **options):
-    params = {
-        "timestamp": utils.now(),
-        "type": options.get("type"),
-        "overwrite": options.get("overwrite"),
-        "invalidate": options.get("invalidate"),
-        "from_public_id": from_public_id,
-        "to_public_id": to_public_id,
-        "to_type": options.get("to_type"),
-        "context": options.get("context"),
-        "metadata": options.get("metadata")
-    }
-    return call_api("rename", params, **options)
-
-
-def update_metadata(metadata, public_ids, **options):
-    """
-    Populates metadata fields with the given values. Existing values will be overwritten.
-
-    Any metadata-value pairs given are merged with any existing metadata-value pairs
-    (an empty value for an existing metadata field clears the value)
-
-    :param metadata: A list of custom metadata fields (by external_id) and the values to assign to each
-                     of them.
-    :param public_ids: An array of Public IDs of assets uploaded to Cloudinary.
-    :param options: Options such as
-            *resource_type* (the type of file. Default: image. Valid values: image, raw, or video) and
-            *type* (The storage type. Default: upload. Valid values: upload, private, or authenticated.)
-
-    :return: A list of public IDs that were updated
-    :rtype: mixed
-    """
-    params = {
-        "timestamp": utils.now(),
-        "metadata": utils.encode_context(metadata),
-        "public_ids": utils.build_array(public_ids),
-        "type": options.get("type"),
-        "clear_invalid": options.get("clear_invalid")
-    }
-
-    return call_api("metadata", params, **options)
-
-
-def explicit(public_id, **options):
-    params = utils.build_upload_params(**options)
-    params["public_id"] = public_id
-    return call_cacheable_api("explicit", params, **options)
-
-
-def create_archive(**options):
-    params = utils.archive_params(**options)
-    if options.get("target_format") is not None:
-        params["target_format"] = options.get("target_format")
-    return call_api("generate_archive", params, **options)
-
-
-def create_zip(**options):
-    return create_archive(target_format="zip", **options)
-
-
-def generate_sprite(tag=None, urls=None, **options):
-    """
-    Generates sprites by merging multiple images into a single large image.
-
-    See: `Sprite method API reference
-    <https://cloudinary.com/documentation/image_upload_api_reference#sprite_method>`_
-
-    :param tag:     The sprite is created from all images with this tag. If not set - `urls` parameter is required
-    :type tag:      str
-    :param urls:    List of URLs to create a sprite from. Can only be used if `tag` is not set
-    :type urls:     list
-    :param options: Additional options
-    :type options:  dict, optional
-    :return:        Dictionary with meta information URLs of generated sprite resources
-    :rtype:         dict
-    """
-    params = utils.build_multi_and_sprite_params(tag=tag, urls=urls, **options)
-    return call_api("sprite", params, **options)
-
-
-def download_generated_sprite(tag=None, urls=None, **options):
-    """
-    Returns signed URL for the sprite endpoint with `mode=download`
-
-    :param tag:     The sprite is created from all images with this tag. If not set - `urls` parameter is required
-    :type tag:      str
-    :param urls:    List of URLs to create a sprite from. Can only be used if `tag` is not set
-    :type urls:     list
-    :param options: Additional options
-    :type options:  dict, optional
-    :return:        The signed URL to download sprite
-    :rtype:         str
-    """
-    params = utils.build_multi_and_sprite_params(tag=tag, urls=urls, **options)
-    return utils.cloudinary_api_download_url(action="sprite", params=params, **options)
-
-
-def multi(tag=None, urls=None, **options):
-    """
-    Creates either a single animated image, video or a PDF.
-
-    See: `Upload method API reference
-    <https://cloudinary.com/documentation/image_upload_api_reference#multi_method>`_
-
-    :param tag:     The animated image, video or PDF is created from all images with this tag.
-                    If not set - `urls` parameter is required
-    :type tag:      str
-    :param urls:    List of URLs to create an animated image, video or PDF from. Can only be used if `tag` is not set
-    :type urls:     list
-    :param options: Additional options
-    :type options:  dict, optional
-    :return:        Dictionary with meta information URLs of the generated file
-    :rtype:         dict
-    """
-    params = utils.build_multi_and_sprite_params(tag=tag, urls=urls, **options)
-    return call_api("multi", params, **options)
-
-
-def download_multi(tag=None, urls=None, **options):
-    """
-    Returns signed URL for the multi endpoint with `mode=download`
-
-    :param tag:     The sprite is created from all images with this tag. If not set - `urls` parameter is required
-    :type tag:      str
-    :param urls:    List of URLs to create a sprite from. Can only be used if `tag` is not set
-    :type urls:     list
-    :param options: Additional options
-    :type options:  dict, optional
-    :return:        The signed URL to download multi
-    :rtype:         str
-    """
-    params = utils.build_multi_and_sprite_params(tag=tag, urls=urls, **options)
-    return utils.cloudinary_api_download_url(action="multi", params=params, **options)
-
-
-def explode(public_id, **options):
-    params = {
-        "timestamp": utils.now(),
-        "public_id": public_id,
-        "format": options.get("format"),
-        "notification_url": options.get("notification_url"),
-        "transformation": utils.generate_transformation_string(**options)[0]
-    }
-    return call_api("explode", params, **options)
-
-
-def add_tag(tag, public_ids=None, **options):
-    """
-    Adds a single tag or a list of tags or a comma-separated tags to the assets.
-
-    :param tag:         The tag or tags to assign. Can specify multiple tags in a single string,
-                        separated by commas - "t1,t2,t3" or list of tags - ["t1","t2","t3"].
-    :param public_ids:  A list of public IDs (up to 1000).
-    :param options:     Configuration options may include 'exclusive' (boolean) which causes
-                        clearing this tag from all other assets.
-
-    :return:            Dictionary with a list of public IDs that were updated.
-    """
-    exclusive = options.pop("exclusive", None)
-    command = "set_exclusive" if exclusive else "add"
-    return call_tags_api(tag, command, public_ids, **options)
-
-
-def remove_tag(tag, public_ids=None, **options):
-    """
-    Removes a single tag or a list of tags or a comma-separated tags from the assets.
-
-    :param tag:         The tag or tags to assign. Can specify multiple tags in a single string,
-                        separated by commas - "t1,t2,t3" or list of tags - ["t1","t2","t3"].
-    :param public_ids:  A list of public IDs (up to 1000).
-    :param options:     Additional options.
-
-    :return:            Dictionary with a list of public IDs that were updated.
-    """
-    return call_tags_api(tag, "remove", public_ids, **options)
-
-
-def replace_tag(tag, public_ids=None, **options):
-    """
-    Replaces all existing tags with a single tag or a list of tags or a comma-separated tags of the assets.
-
-    :param tag:         The tag or tags to assign. Can specify multiple tags in a single string,
-                        separated by commas - "t1,t2,t3" or list of tags - ["t1","t2","t3"].
-    :param public_ids:  A list of public IDs (up to 1000).
-    :param options:     Additional options.
-
-    :return:            Dictionary with a list of public IDs that were updated.
-    """
-    return call_tags_api(tag, "replace", public_ids, **options)
-
-
-def remove_all_tags(public_ids, **options):
-    """
-    Remove all tags from the specified public IDs.
-
-    :param public_ids: the public IDs of the resources to update
-    :param options: additional options passed to the request
-
-    :return: dictionary with a list of public IDs that were updated
-    """
-    return call_tags_api(None, "remove_all", public_ids, **options)
-
-
-def add_context(context, public_ids, **options):
-    """
-    Add a context keys and values. If a particular key already exists, the value associated with the key is updated.
-
-    :param context: dictionary of context
-    :param public_ids: the public IDs of the resources to update
-    :param options: additional options passed to the request
-
-    :return: dictionary with a list of public IDs that were updated
-    """
-    return call_context_api(context, "add", public_ids, **options)
-
-
-def remove_all_context(public_ids, **options):
-    """
-    Remove all custom context from the specified public IDs.
-
-    :param public_ids: the public IDs of the resources to update
-    :param options: additional options passed to the request
-
-    :return: dictionary with a list of public IDs that were updated
-    """
-    return call_context_api(None, "remove_all", public_ids, **options)
-
-
-def call_tags_api(tag, command, public_ids=None, **options):
-    params = {
-        "timestamp": utils.now(),
-        "tag": tag,
-        "public_ids": utils.build_array(public_ids),
-        "command": command,
-        "type": options.get("type")
-    }
-    return call_api("tags", params, **options)
-
-
-def call_context_api(context, command, public_ids=None, **options):
-    params = {
-        "timestamp": utils.now(),
-        "context": utils.encode_context(context),
-        "public_ids": utils.build_array(public_ids),
-        "command": command,
-        "type": options.get("type")
-    }
-    return call_api("context", params, **options)
-
-
-TEXT_PARAMS = [
-    "public_id",
-    "font_family",
-    "font_size",
-    "font_color",
-    "text_align",
-    "font_weight",
-    "font_style",
-    "background",
-    "opacity",
-    "text_decoration"
-]
-
-
-def text(text, **options):
-    params = {"timestamp": utils.now(), "text": text}
-    for key in TEXT_PARAMS:
-        params[key] = options.get(key)
-    return call_api("text", params, **options)
-
-
-_SLIDESHOW_PARAMS = [
-    "notification_url",
-    "public_id",
-    "overwrite",
-    "upload_preset",
-]
-
-
-def create_slideshow(**options):
-    """
-    Creates auto-generated video slideshows.
-
-    :param options: The optional parameters.  See the upload API documentation.
-
-    :return: a dictionary with details about created slideshow
-    """
-    options["resource_type"] = options.get("resource_type", "video")
-
-    params = {param_name: options.get(param_name) for param_name in _SLIDESHOW_PARAMS}
-
-    serialized_params = {
-        "timestamp": utils.now(),
-        "transformation": build_eager(options.get("transformation")),
-        "manifest_transformation": build_eager(options.get("manifest_transformation")),
-        "manifest_json": options.get("manifest_json") and utils.json_encode(options.get("manifest_json")),
-        "tags": options.get("tags") and utils.encode_list(utils.build_array(options["tags"])),
-    }
-
-    params.update(serialized_params)
-
-    return call_api("create_slideshow", params, **options)
-
-
-def _save_responsive_breakpoints_to_cache(result):
-    """
-    Saves responsive breakpoints parsed from upload result to cache
-
-    :param result: Upload result
-    """
-    if "responsive_breakpoints" not in result:
-        return
-
-    if "public_id" not in result:
-        # We have some faulty result, nothing to cache
-        return
-
-    options = dict((k, result[k]) for k in ["type", "resource_type"] if k in result)
-
-    for transformation in result.get("responsive_breakpoints", []):
-        options["raw_transformation"] = transformation.get("transformation", "")
-        options["format"] = os.path.splitext(transformation["breakpoints"][0]["url"])[1][1:]
-        breakpoints = [bp["width"] for bp in transformation["breakpoints"]]
-        responsive_breakpoints_cache_instance.set(result["public_id"], breakpoints, **options)
-
-
-def call_cacheable_api(action, params, http_headers=None, return_error=False, unsigned=False, file=None, timeout=None,
-                       **options):
-    """
-    Calls Upload API and saves results to cache (if enabled)
-    """
-
-    result = call_api(action, params, http_headers, return_error, unsigned, file, timeout, **options)
-
-    if "use_cache" in options or cloudinary.config().use_cache:
-        _save_responsive_breakpoints_to_cache(result)
-
-    return result
-
-
-def call_api(action, params, http_headers=None, return_error=False, unsigned=False, file=None, timeout=None,
-             extra_headers=None, **options):
-    params = utils.cleanup_params(params)
-
-    headers = {"User-Agent": cloudinary.get_user_agent()}
-
-    if http_headers is not None:
-        headers.update(http_headers)
-
-    if extra_headers is not None:
-        headers.update(extra_headers)
-
-    oauth_token = options.get("oauth_token", cloudinary.config().oauth_token)
-
-    if oauth_token:
-        headers["authorization"] = "Bearer {}".format(oauth_token)
-    elif not unsigned:
-        params = utils.sign_request(params, options)
-
-    param_list = []
-    for k, v in params.items():
-        if isinstance(v, list):
-            for i in v:
-                param_list.append(("{0}[]".format(k), i))
-        elif v:
-            param_list.append((k, v))
-
-    api_url = utils.cloudinary_api_url(action, **options)
-
-    if file:
-        filename = options.get("filename")  # Custom filename provided by user (relevant only for streams and files)
-        param_list.append(("file", utils.handle_file_parameter(file, filename)))
-
-    kw = {}
-    if timeout is not None:
-        kw['timeout'] = timeout
-
-    code = 200
-    try:
-        response = _http.request(method="POST", url=api_url, fields=param_list, headers=headers, **kw)
-    except HTTPError as e:
-        raise Error("Unexpected error - {0!r}".format(e))
-    except socket.error as e:
-        raise Error("Socket error: {0!r}".format(e))
-
-    try:
-        result = json.loads(response.data.decode('utf-8'))
-    except Exception as e:
-        # Error is parsing json
-        raise Error("Error parsing server response (%d) - %s. Got - %s" % (response.status, response.data, e))
-
-    if "error" in result:
-        if response.status not in [200, 400, 401, 403, 404, 500]:
-            code = response.status
-        if return_error:
-            result["error"]["http_code"] = code
-        else:
-            raise Error(result["error"]["message"])
-
-    return result
diff --git a/lib/cloudinary/utils.py b/lib/cloudinary/utils.py
deleted file mode 100644
index 297bdb7a..00000000
--- a/lib/cloudinary/utils.py
+++ /dev/null
@@ -1,1691 +0,0 @@
-# Copyright Cloudinary
-import base64
-import copy
-import hashlib
-import json
-import os
-import random
-import re
-import string
-import struct
-import time
-import urllib
-import zlib
-from collections import OrderedDict
-from datetime import datetime, date
-from fractions import Fraction
-from numbers import Number
-
-import six.moves.urllib.parse
-from six import iteritems
-from urllib3 import ProxyManager, PoolManager
-
-import cloudinary
-from cloudinary import auth_token
-from cloudinary.api_client.tcp_keep_alive_manager import TCPKeepAlivePoolManager, TCPKeepAliveProxyManager
-from cloudinary.compat import PY3, to_bytes, to_bytearray, to_string, string_types, urlparse
-
-try:  # Python 3.4+
-    from pathlib import Path as PathLibPathType
-except ImportError:
-    PathLibPathType = None
-
-VAR_NAME_RE = r'(\$\([a-zA-Z]\w+\))'
-
-urlencode = six.moves.urllib.parse.urlencode
-unquote = six.moves.urllib.parse.unquote
-
-""" @deprecated: use cloudinary.SHARED_CDN """
-SHARED_CDN = "res.cloudinary.com"
-
-DEFAULT_RESPONSIVE_WIDTH_TRANSFORMATION = {"width": "auto", "crop": "limit"}
-
-RANGE_VALUE_RE = r'^(?P<value>(\d+\.)?\d+)(?P<modifier>[%pP])?$'
-RANGE_RE = r'^(\d+\.)?\d+[%pP]?\.\.(\d+\.)?\d+[%pP]?$'
-FLOAT_RE = r'^(\d+)\.(\d+)?$'
-REMOTE_URL_RE = r'ftp:|https?:|s3:|gs:|data:([\w-]+\/[\w-]+(\+[\w-]+)?)?(;[\w-]+=[\w-]+)*;base64,([a-zA-Z0-9\/+\n=]+)$'
-__LAYER_KEYWORD_PARAMS = [("font_weight", "normal"),
-                          ("font_style", "normal"),
-                          ("text_decoration", "none"),
-                          ("text_align", None),
-                          ("stroke", "none")]
-
-# a list of keys used by the cloudinary_url function
-__URL_KEYS = [
-    'api_secret',
-    'auth_token',
-    'cdn_subdomain',
-    'cloud_name',
-    'cname',
-    'format',
-    'private_cdn',
-    'resource_type',
-    'secure',
-    'secure_cdn_subdomain',
-    'secure_distribution',
-    'shorten',
-    'sign_url',
-    'ssl_detected',
-    'type',
-    'url_suffix',
-    'use_root_path',
-    'version',
-    'long_url_signature',
-    'signature_algorithm',
-]
-
-__SIMPLE_UPLOAD_PARAMS = [
-    "public_id",
-    "public_id_prefix",
-    "callback",
-    "format",
-    "type",
-    "backup",
-    "faces",
-    "image_metadata",
-    "media_metadata",
-    "exif",
-    "colors",
-    "use_filename",
-    "unique_filename",
-    "display_name",
-    "use_filename_as_display_name",
-    "discard_original_filename",
-    "filename_override",
-    "invalidate",
-    "notification_url",
-    "eager_notification_url",
-    "eager_async",
-    "eval",
-    "on_success",
-    "proxy",
-    "folder",
-    "asset_folder",
-    "use_asset_folder_as_public_id_prefix",
-    "unique_display_name",
-    "overwrite",
-    "moderation",
-    "raw_convert",
-    "quality_override",
-    "quality_analysis",
-    "ocr",
-    "categorization",
-    "detection",
-    "similarity_search",
-    "visual_search",
-    "background_removal",
-    "upload_preset",
-    "phash",
-    "return_delete_token",
-    "auto_tagging",
-    "async",
-    "cinemagraph_analysis",
-    "accessibility_analysis",
-]
-
-__SERIALIZED_UPLOAD_PARAMS = [
-    "timestamp",
-    "transformation",
-    "headers",
-    "eager",
-    "tags",
-    "allowed_formats",
-    "face_coordinates",
-    "custom_coordinates",
-    "regions",
-    "context",
-    "auto_tagging",
-    "responsive_breakpoints",
-    "access_control",
-    "metadata",
-]
-
-upload_params = __SIMPLE_UPLOAD_PARAMS + __SERIALIZED_UPLOAD_PARAMS
-
-_SIMPLE_TRANSFORMATION_PARAMS = {
-        "ac": "audio_codec",
-        "af": "audio_frequency",
-        "br": "bit_rate",
-        "cs": "color_space",
-        "d": "default_image",
-        "dl": "delay",
-        "dn": "density",
-        "f": "fetch_format",
-        "g": "gravity",
-        "p": "prefix",
-        "pg": "page",
-        "sp": "streaming_profile",
-        "vs": "video_sampling",
-    }
-
-SHORT_URL_SIGNATURE_LENGTH = 8
-LONG_URL_SIGNATURE_LENGTH = 32
-
-SIGNATURE_SHA1 = "sha1"
-SIGNATURE_SHA256 = "sha256"
-
-signature_algorithms = {
-    SIGNATURE_SHA1: hashlib.sha1,
-    SIGNATURE_SHA256: hashlib.sha256,
-}
-
-
-def compute_hex_hash(s, algorithm=SIGNATURE_SHA1):
-    """
-    Computes string hash using specified algorithm and return HEX string representation of hash.
-
-    :param s:         String to compute hash for
-    :param algorithm: The name of algorithm to use for computing hash
-
-    :return: HEX string of computed hash value
-    """
-    try:
-        hash_fn = signature_algorithms[algorithm]
-    except KeyError:
-        raise ValueError('Unsupported hash algorithm: {}'.format(algorithm))
-    return hash_fn(to_bytes(s)).hexdigest()
-
-
-def build_array(arg):
-    if isinstance(arg, (list, tuple)):
-        return arg
-    elif arg is None:
-        return []
-    return [arg]
-
-
-def build_list_of_dicts(val):
-    """
-    Converts a value that can be presented as a list of dict.
-
-    In case top level item is not a list, it is wrapped with a list
-
-    Valid values examples:
-        - Valid dict: {"k": "v", "k2","v2"}
-        - List of dict: [{"k": "v"}, {"k2","v2"}]
-        - JSON decodable string: '{"k": "v"}', or '[{"k": "v"}]'
-        - List of JSON decodable strings: ['{"k": "v"}', '{"k2","v2"}']
-
-    Invalid values examples:
-        - ["not", "a", "dict"]
-        - [123, None],
-        - [["another", "list"]]
-
-    :param val: Input value
-    :type val: Union[list, dict, str]
-
-    :return: Converted(or original) list of dict
-    :raises: ValueError in case value cannot be converted to a list of dict
-    """
-    if val is None:
-        return []
-
-    if isinstance(val, str):
-        # use OrderedDict to preserve order
-        val = json.loads(val, object_pairs_hook=OrderedDict)
-
-    if isinstance(val, dict):
-        val = [val]
-
-    for index, item in enumerate(val):
-        if isinstance(item, str):
-            # use OrderedDict to preserve order
-            val[index] = json.loads(item, object_pairs_hook=OrderedDict)
-        if not isinstance(val[index], dict):
-            raise ValueError("Expected a list of dicts")
-    return val
-
-
-def encode_double_array(array):
-    array = build_array(array)
-    if len(array) > 0 and isinstance(array[0], list):
-        return "|".join([",".join([str(i) for i in build_array(inner)]) for inner in array])
-    return encode_list([str(i) for i in array])
-
-
-def encode_dict(arg):
-    if isinstance(arg, dict):
-        if PY3:
-            items = arg.items()
-        else:
-            items = arg.iteritems()
-        return "|".join((k + "=" + v) for k, v in items)
-    return arg
-
-
-def normalize_context_value(value):
-    """
-    Escape "=" and "|" delimiter characters and json encode lists
-
-    :param value: Value to escape
-    :type value: int or str or list or tuple
-
-    :return: The normalized value
-    :rtype: str
-    """
-
-    if isinstance(value, (list, tuple)):
-        value = json_encode(value)
-
-    return str(value).replace("=", "\\=").replace("|", "\\|")
-
-
-def encode_context(context):
-    """
-    Encode metadata fields based on incoming value.
-
-    List and tuple values are encoded to json strings.
-
-    :param context: dict of context to be encoded
-
-    :return: a joined string of all keys and values properly escaped and separated by a pipe character
-    """
-    if not isinstance(context, dict):
-        return context
-
-    return "|".join(("{}={}".format(k, normalize_context_value(v))) for k, v in iteritems(context))
-
-
-def json_encode(value, sort_keys=False):
-    """
-    Converts value to a json encoded string
-
-    :param value: value to be encoded
-    :param sort_keys: whether to sort keys
-
-    :return: JSON encoded string
-    """
-
-    if isinstance(value, str) or value is None:
-        return value
-
-    return json.dumps(value, default=__json_serializer, separators=(',', ':'), sort_keys=sort_keys)
-
-
-def encode_date_to_usage_api_format(date_obj):
-    """
-    Encodes date object to `dd-mm-yyyy` format string
-
-    :param date_obj: datetime.date object to encode
-
-    :return: Encoded date as a string
-    """
-    return date_obj.strftime('%d-%m-%Y')
-
-
-def patch_fetch_format(options):
-    """
-    When upload type is fetch, remove the format options.
-    In addition, set the fetch_format options to the format value unless it was already set.
-    Mutates the "options" parameter!
-
-    :param options: URL and transformation options
-    """
-    use_fetch_format = options.pop("use_fetch_format", cloudinary.config().use_fetch_format)
-
-    if options.get("type", "upload") != "fetch" and not use_fetch_format:
-        return
-
-    resource_format = options.pop("format", None)
-    if "fetch_format" not in options:
-        options["fetch_format"] = resource_format
-
-
-def generate_transformation_string(**options):
-    responsive_width = options.pop("responsive_width", cloudinary.config().responsive_width)
-    size = options.pop("size", None)
-    if size:
-        options["width"], options["height"] = size.split("x")
-    width = options.get("width")
-    height = options.get("height")
-    has_layer = ("underlay" in options) or ("overlay" in options)
-
-    crop = options.pop("crop", None)
-    angle = ".".join([str(value) for value in build_array(options.pop("angle", None))])
-    no_html_sizes = has_layer or angle or crop == "fit" or crop == "limit" or responsive_width
-
-    if width and (str(width).startswith("auto") or str(width) == "ow" or is_fraction(width) or no_html_sizes):
-        del options["width"]
-    if height and (str(height) == "oh" or is_fraction(height) or no_html_sizes):
-        del options["height"]
-
-    background = options.pop("background", None)
-    if background:
-        background = background.replace("#", "rgb:")
-    color = options.pop("color", None)
-    if color:
-        color = color.replace("#", "rgb:")
-
-    base_transformations = build_array(options.pop("transformation", None))
-    if any(isinstance(bs, dict) for bs in base_transformations):
-        def recurse(bs):
-            if isinstance(bs, dict):
-                return generate_transformation_string(**bs)[0]
-            return generate_transformation_string(transformation=bs)[0]
-
-        base_transformations = list(map(recurse, base_transformations))
-        named_transformation = None
-    else:
-        named_transformation = ".".join(base_transformations)
-        base_transformations = []
-
-    effect = options.pop("effect", None)
-    if isinstance(effect, list):
-        effect = ":".join([str(x) for x in effect])
-    elif isinstance(effect, dict):
-        effect = ":".join([str(x) for x in list(effect.items())[0]])
-
-    border = options.pop("border", None)
-    if isinstance(border, dict):
-        border_color = border.get("color", "black").replace("#", "rgb:")
-        border = "%(width)spx_solid_%(color)s" % {"color": border_color,
-                                                  "width": str(border.get("width", 2))}
-
-    flags = ".".join(build_array(options.pop("flags", None)))
-    dpr = options.pop("dpr", cloudinary.config().dpr)
-    duration = norm_range_value(options.pop("duration", None))
-
-    so_raw = options.pop("start_offset", None)
-    start_offset = norm_auto_range_value(so_raw)
-    if start_offset == None:
-        start_offset = so_raw
-
-    eo_raw = options.pop("end_offset", None)
-    end_offset = norm_range_value(eo_raw)
-    if end_offset == None:
-        end_offset = eo_raw
-
-    offset = split_range(options.pop("offset", None))
-    if offset:
-        start_offset = norm_auto_range_value(offset[0])
-        end_offset = norm_range_value(offset[1])
-
-    video_codec = process_video_codec_param(options.pop("video_codec", None))
-
-    aspect_ratio = options.pop("aspect_ratio", None)
-    if isinstance(aspect_ratio, Fraction):
-        aspect_ratio = str(aspect_ratio.numerator) + ":" + str(aspect_ratio.denominator)
-
-    overlay = process_layer(options.pop("overlay", None), "overlay")
-    underlay = process_layer(options.pop("underlay", None), "underlay")
-    if_value = process_conditional(options.pop("if", None))
-    custom_function = process_custom_function(options.pop("custom_function", None))
-    custom_pre_function = process_custom_pre_function(options.pop("custom_pre_function", None))
-    fps = process_fps(options.pop("fps", None))
-
-    params = {
-        "a": normalize_expression(angle),
-        "ar": normalize_expression(aspect_ratio),
-        "b": background,
-        "bo": border,
-        "c": crop,
-        "co": color,
-        "dpr": normalize_expression(dpr),
-        "du": normalize_expression(duration),
-        "e": normalize_expression(effect),
-        "eo": normalize_expression(end_offset),
-        "fl": flags,
-        "fn": custom_function or custom_pre_function,
-        "fps": fps,
-        "h": normalize_expression(height),
-        "ki": process_ki(options.pop("keyframe_interval", None)),
-        "l": overlay,
-        "o": normalize_expression(options.pop('opacity', None)),
-        "q": normalize_expression(options.pop('quality', None)),
-        "r": process_radius(options.pop('radius', None)),
-        "so": normalize_expression(start_offset),
-        "t": named_transformation,
-        "u": underlay,
-        "w": normalize_expression(width),
-        "x": normalize_expression(options.pop('x', None)),
-        "y": normalize_expression(options.pop('y', None)),
-        "vc": video_codec,
-        "z": normalize_expression(options.pop('zoom', None))
-    }
-
-    for param, option in _SIMPLE_TRANSFORMATION_PARAMS.items():
-        params[param] = options.pop(option, None)
-
-    variables = options.pop('variables', {})
-    var_params = []
-    for key, value in options.items():
-        if re.match(r'^\$', key):
-            var_params.append(u"{0}_{1}".format(key, normalize_expression(str(value))))
-
-    var_params.sort()
-
-    if variables:
-        for var in variables:
-            var_params.append(u"{0}_{1}".format(var[0], normalize_expression(str(var[1]))))
-
-    variables = ','.join(var_params)
-
-    sorted_params = sorted([param + "_" + str(value) for param, value in params.items() if (value or value == 0)])
-    if variables:
-        sorted_params.insert(0, str(variables))
-
-    if if_value is not None:
-        sorted_params.insert(0, "if_" + str(if_value))
-
-    if "raw_transformation" in options and (options["raw_transformation"] or options["raw_transformation"] == 0):
-        sorted_params.append(options.pop("raw_transformation"))
-
-    transformation = ",".join(sorted_params)
-
-    transformations = base_transformations + [transformation]
-
-    if responsive_width:
-        responsive_width_transformation = cloudinary.config().responsive_width_transformation \
-                                          or DEFAULT_RESPONSIVE_WIDTH_TRANSFORMATION
-        transformations += [generate_transformation_string(**responsive_width_transformation)[0]]
-    url = "/".join([trans for trans in transformations if trans])
-
-    if str(width).startswith("auto") or responsive_width:
-        options["responsive"] = True
-    if dpr == "auto":
-        options["hidpi"] = True
-    return url, options
-
-
-def chain_transformations(options, transformations):
-    """
-    Helper function, allows chaining transformations to the end of transformations list
-
-    The result of this function is an updated options parameter
-
-    :param options:         Original options
-    :param transformations: Transformations to chain at the end
-
-    :return: Resulting options
-    """
-
-    transformations = copy.deepcopy(transformations)
-
-    transformations = build_array(transformations)
-    # preserve url options
-    url_options = dict((o, options[o]) for o in __URL_KEYS if o in options)
-
-    transformations.insert(0, options)
-
-    url_options["transformation"] = transformations
-
-    return url_options
-
-
-def is_fraction(width):
-    width = str(width)
-    return re.match(FLOAT_RE, width) and float(width) < 1
-
-
-def split_range(range):
-    if (isinstance(range, list) or isinstance(range, tuple)) and len(range) >= 2:
-        return [range[0], range[-1]]
-    elif isinstance(range, string_types) and re.match(RANGE_RE, range):
-        return range.split("..", 1)
-    return None
-
-
-def norm_range_value(value):
-    if value is None:
-        return None
-
-    match = re.match(RANGE_VALUE_RE, str(value))
-
-    if match is None:
-        return None
-
-    modifier = ''
-    if match.group('modifier') is not None:
-        modifier = 'p'
-    return match.group('value') + modifier
-
-
-def norm_auto_range_value(value):
-    if value == "auto":
-        return value
-    return norm_range_value(value)
-
-
-def process_video_codec_param(param):
-    out_param = param
-    if isinstance(out_param, dict):
-        out_param = param['codec']
-        if 'profile' in param:
-            out_param = out_param + ':' + param['profile']
-            if 'level' in param:
-                out_param = out_param + ':' + param['level']
-                if param.get('b_frames') is False:
-                    out_param = out_param + ':' + 'bframes_no'
-
-    return out_param
-
-
-def process_radius(param):
-    if param is None:
-        return
-
-    if isinstance(param, (list, tuple)):
-        if not 1 <= len(param) <= 4:
-            raise ValueError("Invalid radius param")
-        return ':'.join(normalize_expression(t) for t in param)
-
-    return normalize_expression(str(param))
-
-
-def process_params(params):
-    processed_params = None
-    if isinstance(params, dict):
-        processed_params = {}
-        for key, value in params.items():
-            if isinstance(value, list) or isinstance(value, tuple):
-                if len(value) == 2 and value[0] == "file":  # keep file parameter as is.
-                    processed_params[key] = value
-                    continue
-                value_list = {"{}[{}]".format(key, i): i_value for i, i_value in enumerate(value)}
-                processed_params.update(value_list)
-            elif value is not None:
-                processed_params[key] = value
-    return processed_params
-
-
-def cleanup_params(params):
-    """
-    Cleans and normalizes parameters when calculating signature in Upload API.
-
-    :param params:
-    :return:
-    """
-    return dict([(k, __safe_value(v)) for (k, v) in params.items() if v is not None and not v == ""])
-
-
-def normalize_params(params):
-    """
-    Normalizes Admin API parameters.
-
-    :param params:
-    :return:
-    """
-    if not params or not isinstance(params, dict):
-        return params
-
-    return dict([(k, __bool_string(v)) for (k, v) in params.items() if v is not None and not v == ""])
-
-
-def sign_request(params, options):
-    api_key = options.get("api_key", cloudinary.config().api_key)
-    if not api_key:
-        raise ValueError("Must supply api_key")
-    api_secret = options.get("api_secret", cloudinary.config().api_secret)
-    if not api_secret:
-        raise ValueError("Must supply api_secret")
-    signature_algorithm = options.get("signature_algorithm", cloudinary.config().signature_algorithm)
-
-    params = cleanup_params(params)
-    params["signature"] = api_sign_request(params, api_secret, signature_algorithm)
-    params["api_key"] = api_key
-
-    return params
-
-
-def api_sign_request(params_to_sign, api_secret, algorithm=SIGNATURE_SHA1):
-    params = [(k + "=" + (",".join(v) if isinstance(v, list) else str(v))) for k, v in params_to_sign.items() if v]
-    to_sign = "&".join(sorted(params))
-    return compute_hex_hash(to_sign + api_secret, algorithm)
-
-
-def breakpoint_settings_mapper(breakpoint_settings):
-    breakpoint_settings = copy.deepcopy(breakpoint_settings)
-    transformation = breakpoint_settings.get("transformation")
-    if transformation is not None:
-        breakpoint_settings["transformation"], _ = generate_transformation_string(**transformation)
-    return breakpoint_settings
-
-
-def generate_responsive_breakpoints_string(breakpoints):
-    if breakpoints is None:
-        return None
-    breakpoints = build_array(breakpoints)
-    return json.dumps(list(map(breakpoint_settings_mapper, breakpoints)))
-
-
-def finalize_source(source, format, url_suffix):
-    source = re.sub(r'([^:])/+', r'\1/', source)
-    if re.match(r'^https?:/', source):
-        source = smart_escape(source)
-        source_to_sign = source
-    else:
-        source = unquote(source)
-        if not PY3:
-            source = source.encode('utf8')
-        source = smart_escape(source)
-        source_to_sign = source
-        if url_suffix is not None:
-            if re.search(r'[\./]', url_suffix):
-                raise ValueError("url_suffix should not include . or /")
-            source = source + "/" + url_suffix
-        if format is not None:
-            source = source + "." + format
-            source_to_sign = source_to_sign + "." + format
-
-    return source, source_to_sign
-
-
-def finalize_resource_type(resource_type, type, url_suffix, use_root_path, shorten):
-    upload_type = type or "upload"
-    if url_suffix is not None:
-        if resource_type == "image" and upload_type == "upload":
-            resource_type = "images"
-            upload_type = None
-        elif resource_type == "raw" and upload_type == "upload":
-            resource_type = "files"
-            upload_type = None
-        else:
-            raise ValueError("URL Suffix only supported for image/upload and raw/upload")
-
-    if use_root_path:
-        if (resource_type == "image" and upload_type == "upload") or (
-                resource_type == "images" and upload_type is None):
-            resource_type = None
-            upload_type = None
-        else:
-            raise ValueError("Root path only supported for image/upload")
-
-    if shorten and resource_type == "image" and upload_type == "upload":
-        resource_type = "iu"
-        upload_type = None
-
-    return resource_type, upload_type
-
-
-def unsigned_download_url_prefix(source, cloud_name, private_cdn, cdn_subdomain,
-                                 secure_cdn_subdomain, cname, secure, secure_distribution):
-    """cdn_subdomain and secure_cdn_subdomain
-    1) Customers in shared distribution (e.g. res.cloudinary.com)
-      if cdn_domain is true uses res-[1-5].cloudinary.com for both http and https.
-      Setting secure_cdn_subdomain to false disables this for https.
-    2) Customers with private cdn
-      if cdn_domain is true uses cloudname-res-[1-5].cloudinary.com for http
-      if secure_cdn_domain is true uses cloudname-res-[1-5].cloudinary.com for https
-      (please contact support if you require this)
-    3) Customers with cname
-      if cdn_domain is true uses a[1-5].cname for http. For https, uses the same naming scheme
-      as 1 for shared distribution and as 2 for private distribution."""
-    shared_domain = not private_cdn
-    shard = __crc(source)
-    if secure:
-        if secure_distribution is None or secure_distribution == cloudinary.OLD_AKAMAI_SHARED_CDN:
-            secure_distribution = cloud_name + "-res.cloudinary.com" \
-                if private_cdn else cloudinary.SHARED_CDN
-
-        shared_domain = shared_domain or secure_distribution == cloudinary.SHARED_CDN
-        if secure_cdn_subdomain is None and shared_domain:
-            secure_cdn_subdomain = cdn_subdomain
-
-        if secure_cdn_subdomain:
-            secure_distribution = re.sub('res.cloudinary.com', "res-" + shard + ".cloudinary.com",
-                                         secure_distribution)
-
-        prefix = "https://" + secure_distribution
-    elif cname:
-        subdomain = "a" + shard + "." if cdn_subdomain else ""
-        prefix = "http://" + subdomain + cname
-    else:
-        subdomain = cloud_name + "-res" if private_cdn else "res"
-        if cdn_subdomain:
-            subdomain = subdomain + "-" + shard
-        prefix = "http://" + subdomain + ".cloudinary.com"
-
-    if shared_domain:
-        prefix += "/" + cloud_name
-
-    return prefix
-
-
-def build_distribution_domain(options):
-    source = options.pop('source', '')
-    cloud_name = options.pop("cloud_name", cloudinary.config().cloud_name or None)
-    if cloud_name is None:
-        raise ValueError("Must supply cloud_name in tag or in configuration")
-    secure = options.pop("secure", cloudinary.config().secure)
-    private_cdn = options.pop("private_cdn", cloudinary.config().private_cdn)
-    cname = options.pop("cname", cloudinary.config().cname)
-    secure_distribution = options.pop("secure_distribution",
-                                      cloudinary.config().secure_distribution)
-    cdn_subdomain = options.pop("cdn_subdomain", cloudinary.config().cdn_subdomain)
-    secure_cdn_subdomain = options.pop("secure_cdn_subdomain",
-                                       cloudinary.config().secure_cdn_subdomain)
-
-    return unsigned_download_url_prefix(
-        source, cloud_name, private_cdn, cdn_subdomain, secure_cdn_subdomain,
-        cname, secure, secure_distribution)
-
-
-def merge(*dict_args):
-    result = None
-    for dictionary in dict_args:
-        if dictionary is not None:
-            if result is None:
-                result = dictionary.copy()
-            else:
-                result.update(dictionary)
-    return result
-
-
-def cloudinary_url(source, **options):
-    original_source = source
-
-    patch_fetch_format(options)
-    type = options.pop("type", "upload")
-
-    transformation, options = generate_transformation_string(**options)
-
-    resource_type = options.pop("resource_type", "image")
-
-    force_version = options.pop("force_version", cloudinary.config().force_version)
-    if force_version is None:
-        force_version = True
-
-    version = options.pop("version", None)
-
-    format = options.pop("format", None)
-    shorten = options.pop("shorten", cloudinary.config().shorten)
-
-    sign_url = options.pop("sign_url", cloudinary.config().sign_url)
-    api_secret = options.pop("api_secret", cloudinary.config().api_secret)
-    url_suffix = options.pop("url_suffix", None)
-    use_root_path = options.pop("use_root_path", cloudinary.config().use_root_path)
-    auth_token = options.pop("auth_token", None)
-    long_url_signature = options.pop("long_url_signature", cloudinary.config().long_url_signature)
-    signature_algorithm = options.pop("signature_algorithm", cloudinary.config().signature_algorithm)
-    if auth_token is not False:
-        auth_token = merge(cloudinary.config().auth_token, auth_token)
-
-    if (not source) or type == "upload" and re.match(r'^https?:', source):
-        return original_source, options
-
-    resource_type, type = finalize_resource_type(
-        resource_type, type, url_suffix, use_root_path, shorten)
-    source, source_to_sign = finalize_source(source, format, url_suffix)
-
-    if not version and force_version \
-            and source_to_sign.find("/") >= 0 \
-            and not re.match(r'^https?:/', source_to_sign) \
-            and not re.match(r'^v[0-9]+', source_to_sign):
-        version = "1"
-    if version:
-        version = "v" + str(version)
-    else:
-        version = None
-
-    transformation = re.sub(r'([^:])/+', r'\1/', transformation)
-
-    signature = None
-    if sign_url and (not auth_token or auth_token.pop('set_url_signature', False)):
-        to_sign = "/".join(__compact([transformation, source_to_sign]))
-        if long_url_signature:
-            # Long signature forces SHA256
-            signature_algorithm = SIGNATURE_SHA256
-            chars_length = LONG_URL_SIGNATURE_LENGTH
-        else:
-            chars_length = SHORT_URL_SIGNATURE_LENGTH
-        if signature_algorithm not in signature_algorithms:
-            raise ValueError("Unsupported signature algorithm '{}'".format(signature_algorithm))
-        hash_fn = signature_algorithms[signature_algorithm]
-        signature = "s--" + to_string(
-            base64.urlsafe_b64encode(
-                hash_fn(to_bytes(to_sign + api_secret)).digest())[0:chars_length]) + "--"
-
-    options["source"] = source
-    prefix = build_distribution_domain(options)
-
-    source = "/".join(__compact(
-        [prefix, resource_type, type, signature, transformation, version, source]))
-    if sign_url and auth_token:
-        path = urlparse(source).path
-        token = cloudinary.auth_token.generate(**merge(auth_token, {"url": path}))
-        source = "%s?%s" % (source, token)
-    return source, options
-
-
-def base_api_url(path, **options):
-    cloudinary_prefix = options.get("upload_prefix", cloudinary.config().upload_prefix) \
-                        or "https://api.cloudinary.com"
-    cloud_name = options.get("cloud_name", cloudinary.config().cloud_name)
-
-    if not cloud_name:
-        raise ValueError("Must supply cloud_name")
-
-    path = build_array(path)
-
-    return encode_unicode_url("/".join([cloudinary_prefix, cloudinary.API_VERSION, cloud_name] + path))
-
-
-def cloudinary_api_url(action='upload', **options):
-    resource_type = options.get("resource_type", "image")
-
-    return base_api_url([resource_type, action], **options)
-
-
-def cloudinary_api_download_url(action, params, **options):
-    params = params.copy()
-    params["mode"] = "download"
-    cloudinary_params = sign_request(params, options)
-    return cloudinary_api_url(action, **options) + "?" + urlencode(bracketize_seq(cloudinary_params), True)
-
-
-def cloudinary_scaled_url(source, width, transformation, options):
-    """
-    Generates a cloudinary url scaled to specified width.
-
-    :param source:          The resource
-    :param width:           Width in pixels of the srcset item
-    :param transformation:  Custom transformation that overrides transformations provided in options
-    :param options:         A dict with additional options
-
-    :return: Resulting URL of the item
-    """
-
-    # preserve options from being destructed
-    options = copy.deepcopy(options)
-
-    if transformation:
-        if isinstance(transformation, string_types):
-            transformation = {"raw_transformation": transformation}
-
-        # Remove all transformation related options
-        options = dict((o, options[o]) for o in __URL_KEYS if o in options)
-        options.update(transformation)
-
-    scale_transformation = {"crop": "scale", "width": width}
-
-    url_options = options
-    patch_fetch_format(url_options)
-    url_options = chain_transformations(url_options, scale_transformation)
-
-    return cloudinary_url(source, **url_options)[0]
-
-
-def smart_escape(source, unsafe=r"([^a-zA-Z0-9_.\-\/:]+)"):
-    """
-    Based on ruby's CGI::unescape. In addition does not escape / :
-
-    :param source: Source string to escape
-    :param unsafe: Unsafe characters
-
-    :return: Escaped string
-    """
-    def pack(m):
-        return to_bytes('%' + "%".join(
-            ["%02X" % x for x in struct.unpack('B' * len(m.group(1)), m.group(1))]
-        ).upper())
-
-    return to_string(re.sub(to_bytes(unsafe), pack, to_bytes(source)))
-
-
-def random_public_id():
-    return ''.join(random.SystemRandom().choice(string.ascii_lowercase + string.digits)
-                   for _ in range(16))
-
-
-def signed_preloaded_image(result):
-    filename = ".".join([x for x in [result["public_id"], result["format"]] if x])
-    path = "/".join([result["resource_type"], "upload", "v" + str(result["version"]), filename])
-    return path + "#" + result["signature"]
-
-
-def now():
-    return str(int(time.time()))
-
-
-def private_download_url(public_id, format, **options):
-    cloudinary_params = sign_request({
-        "timestamp": now(),
-        "public_id": public_id,
-        "format": format,
-        "type": options.get("type"),
-        "attachment": options.get("attachment"),
-        "expires_at": options.get("expires_at")
-    }, options)
-
-    return cloudinary_api_url("download", **options) + "?" + urlencode(cloudinary_params)
-
-
-def zip_download_url(tag, **options):
-    cloudinary_params = sign_request({
-        "timestamp": now(),
-        "tag": tag,
-        "transformation": generate_transformation_string(**options)[0]
-    }, options)
-
-    return cloudinary_api_url("download_tag.zip", **options) + "?" + urlencode(cloudinary_params)
-
-
-def bracketize_seq(params):
-    url_params = dict()
-    for param_name in params:
-        param_value = params[param_name]
-        if isinstance(param_value, list):
-            param_name += "[]"
-        url_params[param_name] = param_value
-    return url_params
-
-
-def download_archive_url(**options):
-    return cloudinary_api_download_url(action="generate_archive", params=archive_params(**options), **options)
-
-
-def download_zip_url(**options):
-    new_options = options.copy()
-    new_options.update(target_format="zip")
-    return download_archive_url(**new_options)
-
-
-def download_folder(folder_path, **options):
-    """
-    Creates and returns a URL that when invoked creates an archive of a folder.
-    :param folder_path: The full path from the root that is used to generate download url.
-    :type folder_path:  str
-    :param options:     Additional options.
-    :type options:      dict, optional
-    :return:            Signed URL to download the folder.
-    :rtype:             str
-    """
-    options["prefixes"] = folder_path
-    options.setdefault("resource_type", "all")
-
-    return download_archive_url(**options)
-
-
-def download_backedup_asset(asset_id, version_id, **options):
-    """
-    The returned url allows downloading the backedup asset based on the the asset ID and the version ID.
-
-    Parameters asset_id and version_id are returned with api.resource(<PUBLIC_ID1>, versions=True) API call.
-
-    :param  asset_id:   The asset ID of the asset.
-    :type   asset_id:   str
-    :param  version_id: The version ID of the asset.
-    :type   version_id: str
-    :param  options:    Additional options.
-    :type   options:    dict, optional
-    :return:The signed URL for downloading backup version of the asset.
-    :rtype: str
-    """
-    params = {
-        "timestamp": options.get("timestamp", now()),
-        "asset_id": asset_id,
-        "version_id": version_id
-    }
-    cloudinary_params = sign_request(params, options)
-
-    return base_api_url("download_backup", **options) + "?" + urlencode(bracketize_seq(cloudinary_params), True)
-
-
-def generate_auth_token(**options):
-    token_options = merge(cloudinary.config().auth_token, options)
-    return auth_token.generate(**token_options)
-
-
-def archive_params(**options):
-    if options.get("timestamp") is None:
-        timestamp = now()
-    else:
-        timestamp = options.get("timestamp")
-    params = {
-        "allow_missing": options.get("allow_missing"),
-        "async": options.get("async"),
-        "expires_at": options.get("expires_at"),
-        "flatten_folders": options.get("flatten_folders"),
-        "flatten_transformations": options.get("flatten_transformations"),
-        "keep_derived": options.get("keep_derived"),
-        "mode": options.get("mode"),
-        "notification_url": options.get("notification_url"),
-        "phash": options.get("phash"),
-        "prefixes": options.get("prefixes") and build_array(options.get("prefixes")),
-        "public_ids": options.get("public_ids") and build_array(options.get("public_ids")),
-        "fully_qualified_public_ids": options.get("fully_qualified_public_ids") and build_array(
-            options.get("fully_qualified_public_ids")),
-        "skip_transformation_name": options.get("skip_transformation_name"),
-        "tags": options.get("tags") and build_array(options.get("tags")),
-        "target_format": options.get("target_format"),
-        "target_asset_folder": options.get("target_asset_folder"),
-        "target_public_id": options.get("target_public_id"),
-        "target_tags": options.get("target_tags") and build_array(options.get("target_tags")),
-        "timestamp": timestamp,
-        "transformations": build_eager(options.get("transformations")),
-        "type": options.get("type"),
-        "use_original_filename": options.get("use_original_filename"),
-    }
-    return params
-
-
-def build_eager(transformations):
-    if transformations is None:
-        return None
-
-    return "|".join([build_single_eager(et) for et in build_array(transformations)])
-
-
-def build_single_eager(options):
-    """
-    Builds a single eager transformation which consists of transformation and (optionally) format joined by "/"
-
-    :param options: Options containing transformation parameters and (optionally) a "format" key
-        format can be a string value (jpg, gif, etc) or can be set to "" (empty string).
-        The latter leads to transformation ending with "/", which means "No extension, use original format"
-        If format is not provided or set to None, only transformation is used (without the trailing "/")
-
-    :return: Resulting eager transformation string
-    """
-    if isinstance(options, string_types):
-        return options
-
-    trans_str = generate_transformation_string(**options)[0]
-
-    if not trans_str:
-        return ""
-
-    file_format = options.get("format")
-
-    return trans_str + ("/" + file_format if file_format is not None else "")
-
-
-def build_custom_headers(headers):
-    if headers is None:
-        return None
-    elif isinstance(headers, list):
-        pass
-    elif isinstance(headers, dict):
-        headers = [k + ": " + v for k, v in headers.items()]
-    else:
-        return headers
-    return "\n".join(headers)
-
-
-def build_upload_params(**options):
-    params = {param_name: options.get(param_name) for param_name in __SIMPLE_UPLOAD_PARAMS if param_name in options}
-    params["upload_preset"] = params.pop("upload_preset", cloudinary.config().upload_preset)
-
-    serialized_params = {
-        "timestamp": now(),
-        "metadata": encode_context(options.get("metadata")),
-        "transformation": generate_transformation_string(**options)[0],
-        "headers": build_custom_headers(options.get("headers")),
-        "eager": build_eager(options.get("eager")),
-        "tags": options.get("tags") and encode_list(build_array(options["tags"])),
-        "allowed_formats": options.get("allowed_formats") and encode_list(build_array(options["allowed_formats"])),
-        "face_coordinates": encode_double_array(options.get("face_coordinates")),
-        "custom_coordinates": encode_double_array(options.get("custom_coordinates")),
-        "regions": json_encode(options.get("regions")),
-        "context": encode_context(options.get("context")),
-        "auto_tagging": options.get("auto_tagging") and str(options.get("auto_tagging")),
-        "responsive_breakpoints": generate_responsive_breakpoints_string(options.get("responsive_breakpoints")),
-        "access_control": options.get("access_control") and json_encode(
-            build_list_of_dicts(options.get("access_control")))
-    }
-
-    # make sure that we are in-sync with __SERIALIZED_UPLOAD_PARAMS which are in use by other methods
-    serialized_params = {param_name: serialized_params[param_name] for param_name in __SERIALIZED_UPLOAD_PARAMS}
-
-    params.update(serialized_params)
-
-    return params
-
-
-def handle_file_parameter(file, filename):
-    if not file:
-        return None
-
-    if PathLibPathType and isinstance(file, PathLibPathType):
-        name = filename or file.name
-        data = file.read_bytes()
-    elif isinstance(file, string_types):
-        if is_remote_url(file):
-            # URL
-            name = None
-            data = file
-        else:
-            # file path
-            name = filename or file
-            with open(file, "rb") as opened:
-                data = opened.read()
-    elif hasattr(file, 'read') and callable(file.read):
-        # stream
-        data = file.read()
-        name = filename or (file.name if hasattr(file, 'name') and isinstance(file.name, str) else "stream")
-    elif isinstance(file, tuple):
-        name, data = file
-    else:
-        # Not a string, not a stream
-        name = filename or "file"
-        data = file
-
-    return (name, data) if name else data
-
-
-def build_multi_and_sprite_params(**options):
-    """
-    Build params for multi, download_multi, generate_sprite, and download_generated_sprite methods
-    """
-    tag = options.get("tag")
-    urls = options.get("urls")
-    if bool(tag) == bool(urls):
-        raise ValueError("Either 'tag' or 'urls' parameter has to be set but not both")
-    params = {
-        "mode": options.get("mode"),
-        "timestamp": now(),
-        "async": options.get("async"),
-        "notification_url": options.get("notification_url"),
-        "tag": tag,
-        "urls": urls,
-        "transformation": generate_transformation_string(fetch_format=options.get("format"), **options)[0]
-    }
-    return params
-
-
-def __process_text_options(layer, layer_parameter):
-    text_style = str(layer.get("text_style", ""))
-    if text_style and not text_style.isspace():
-        return text_style
-
-    font_family = layer.get("font_family")
-    font_size = layer.get("font_size")
-    keywords = []
-    for attr, default_value in __LAYER_KEYWORD_PARAMS:
-        attr_value = layer.get(attr)
-        if attr_value != default_value and attr_value is not None:
-            keywords.append(attr_value)
-
-    letter_spacing = layer.get("letter_spacing")
-    if letter_spacing is not None:
-        keywords.append("letter_spacing_" + str(letter_spacing))
-
-    line_spacing = layer.get("line_spacing")
-    if line_spacing is not None:
-        keywords.append("line_spacing_" + str(line_spacing))
-
-    font_antialiasing = layer.get("font_antialiasing")
-    if font_antialiasing is not None:
-        keywords.append("antialias_" + str(font_antialiasing))
-
-    font_hinting = layer.get("font_hinting")
-    if font_hinting is not None:
-        keywords.append("hinting_" + str(font_hinting))
-
-    if font_size is None and font_family is None and len(keywords) == 0:
-        return None
-
-    if font_family is None:
-        raise ValueError("Must supply font_family for text in " + layer_parameter)
-
-    if font_size is None:
-        raise ValueError("Must supply font_size for text in " + layer_parameter)
-
-    keywords.insert(0, font_size)
-    keywords.insert(0, font_family)
-
-    return '_'.join([str(k) for k in keywords])
-
-
-def process_layer(layer, layer_parameter):
-    if isinstance(layer, string_types):
-        resource_type = None
-        if layer.startswith("fetch:"):
-            url = layer[len('fetch:'):]
-        elif layer.find(":fetch:", 0, 12) != -1:
-            resource_type, _, url = layer.split(":", 2)
-        else:
-            # nothing to process, a raw string, keep as is.
-            return layer
-
-        # handle remote fetch URL
-        layer = {"url": url, "type": "fetch"}
-        if resource_type:
-            layer["resource_type"] = resource_type
-
-    if not isinstance(layer, dict):
-        return layer
-
-    resource_type = layer.get("resource_type")
-    text = layer.get("text")
-    type = layer.get("type")
-    public_id = layer.get("public_id")
-    format = layer.get("format")
-    fetch_url = layer.get("url")
-    components = list()
-
-    if text is not None and resource_type is None:
-        resource_type = "text"
-
-    if fetch_url and type is None:
-        type = "fetch"
-
-    if public_id is not None and format is not None:
-        public_id = public_id + "." + format
-
-    if public_id is None and resource_type != "text" and type != "fetch":
-        raise ValueError("Must supply public_id for for non-text " + layer_parameter)
-
-    if resource_type is not None and resource_type != "image":
-        components.append(resource_type)
-
-    if type is not None and type != "upload":
-        components.append(type)
-
-    if resource_type == "text" or resource_type == "subtitles":
-        if public_id is None and text is None:
-            raise ValueError("Must supply either text or public_id in " + layer_parameter)
-
-        text_options = __process_text_options(layer, layer_parameter)
-
-        if text_options is not None:
-            components.append(text_options)
-
-        if public_id is not None:
-            public_id = public_id.replace("/", ':')
-            components.append(public_id)
-
-        if text is not None:
-            var_pattern = VAR_NAME_RE
-            parts = filter(lambda p: p is not None, re.split(var_pattern, text))
-            encoded_text = []
-            for part in parts:
-                if re.match(var_pattern, part):
-                    encoded_text.append(part)
-                else:
-                    encoded_text.append(smart_escape(smart_escape(part, r"([,/])")))
-
-            text = ''.join(encoded_text)
-            components.append(text)
-    elif type == "fetch":
-        b64 = base64url_encode(fetch_url)
-        components.append(b64)
-    else:
-        public_id = public_id.replace("/", ':')
-        components.append(public_id)
-
-    return ':'.join(components)
-
-
-IF_OPERATORS = {
-    "=": 'eq',
-    "!=": 'ne',
-    "<": 'lt',
-    ">": 'gt',
-    "<=": 'lte',
-    ">=": 'gte',
-    "&&": 'and',
-    "||": 'or',
-    "*": 'mul',
-    "/": 'div',
-    "+": 'add',
-    "-": 'sub',
-    "^": 'pow'
-}
-
-PREDEFINED_VARS = {
-    "aspect_ratio": "ar",
-    "aspectRatio": "ar",
-    "current_page": "cp",
-    "currentPage": "cp",
-    "face_count": "fc",
-    "faceCount": "fc",
-    "height": "h",
-    "initial_aspect_ratio": "iar",
-    "initialAspectRatio": "iar",
-    "trimmed_aspect_ratio": "tar",
-    "trimmedAspectRatio": "tar",
-    "initial_height": "ih",
-    "initialHeight": "ih",
-    "initial_width": "iw",
-    "initialWidth": "iw",
-    "page_count": "pc",
-    "pageCount": "pc",
-    "page_x": "px",
-    "pageX": "px",
-    "page_y": "py",
-    "pageY": "py",
-    "tags": "tags",
-    "width": "w",
-    "duration": "du",
-    "initial_duration": "idu",
-    "initialDuration": "idu",
-    "illustration_score": "ils",
-    "illustrationScore": "ils",
-    "context": "ctx"
-}
-
-replaceRE = "((\\|\\||>=|<=|&&|!=|>|=|<|/|-|\\+|\\*|\\^)(?=[ _])|(\\$_*[^_ ]+)|(?<![\\$:])(" + \
-            '|'.join(PREDEFINED_VARS.keys()) + "))"
-
-
-def translate_if(match):
-    name = match.group(0)
-    return IF_OPERATORS.get(name,
-                            PREDEFINED_VARS.get(name,
-                                                name))
-
-
-def process_custom_function(custom_function):
-    if not isinstance(custom_function, dict):
-        return custom_function
-
-    function_type = custom_function.get("function_type")
-    source = custom_function.get("source")
-    if function_type == "remote":
-        source = base64url_encode(source)
-
-    return ":".join([function_type, source])
-
-
-def process_custom_pre_function(custom_function):
-    value = process_custom_function(custom_function)
-    return "pre:{0}".format(value) if value else None
-
-
-def process_fps(fps):
-    """
-    Serializes fps transformation parameter
-
-    :param fps: A single number, a list of mixed type, a string, including open-ended and closed range values
-                Examples: '24-29.97', 24, 24.973, '-24', [24, 29.97]
-
-    :return: string
-    """
-    if not isinstance(fps, (list, tuple)):
-        return fps
-
-    return "-".join(normalize_expression(f) for f in fps)
-
-
-def process_ki(ki):
-    """
-    Serializes keyframe_interval parameter
-    :param ki: Keyframe interval. Should be either a string or a positive real number.
-    :return: string
-    """
-    if ki is None:
-        return None
-    if isinstance(ki, string_types):
-        return ki
-    if not isinstance(ki, Number):
-        raise ValueError("Keyframe interval should be a number or a string")
-    if ki <= 0:
-        raise ValueError("Keyframe interval should be greater than zero")
-    return str(float(ki))
-
-
-def process_conditional(conditional):
-    if conditional is None:
-        return conditional
-    result = normalize_expression(conditional)
-    return result
-
-
-def normalize_expression(expression):
-    if re.match(r'^!.+!$', str(expression)):  # quoted string
-        return expression
-    elif expression:
-        result = str(expression)
-        result = re.sub(replaceRE, translate_if, result)
-        result = re.sub('[ _]+', '_', result)
-        return result
-    return expression
-
-
-def __join_pair(key, value):
-    if value is None or value == "":
-        return None
-    elif value is True:
-        return key
-    return u"{0}=\"{1}\"".format(key, value)
-
-
-def html_attrs(attrs, only=None):
-    return ' '.join(sorted([__join_pair(key, value) for key, value in attrs.items() if only is None or key in only]))
-
-
-def __safe_value(v):
-    if isinstance(v, bool):
-        return "1" if v else "0"
-    return v
-
-
-def __bool_string(v):
-    if isinstance(v, bool):
-        return "true" if v else "false"
-
-    return v
-
-def __crc(source):
-    return str((zlib.crc32(to_bytearray(source)) & 0xffffffff) % 5 + 1)
-
-
-def __compact(array):
-    return filter(lambda x: x, array)
-
-
-def base64_encode_url(url):
-    """
-    Returns the Base64-decoded version of url.
-    The method tries to unquote the url because quoting it
-
-    :param str url:
-        the url to encode. the value is URIdecoded and then
-        re-encoded before converting to base64 representation
-
-    """
-
-    try:
-        url = unquote(url)
-    except Exception:
-        pass
-    url = smart_escape(url)
-    b64 = base64.b64encode(url.encode('utf-8'))
-    return b64.decode('ascii')
-
-
-def base64url_encode(data):
-    """
-    Url safe version of urlsafe_b64encode with stripped `=` sign at the end.
-
-    :param data: input data
-
-    :return: Base64 URL safe encoded string
-    """
-    return to_string(base64.urlsafe_b64encode(to_bytes(data)))
-
-
-def encode_unicode_url(url_str):
-    """
-    Quote and encode possible unicode url string (applicable for python2)
-
-    :param url_str: Url string to encode
-
-    :return: Encoded string
-    """
-    if six.PY2:
-        url_str = urllib.quote(url_str.encode('utf-8'), ":/?#[]@!$&'()*+,;=")
-
-    return url_str
-
-
-def __json_serializer(obj):
-    """JSON serializer for objects not serializable by default json code"""
-    if isinstance(obj, (datetime, date)):
-        return obj.isoformat()
-    raise TypeError("Object of type %s is not JSON serializable" % type(obj))
-
-
-def is_remote_url(file):
-    """Basic URL scheme check to define if it's remote URL"""
-    return isinstance(file, string_types) and re.match(REMOTE_URL_RE, file)
-
-
-def file_io_size(file_io):
-    """
-    Helper function for getting file-like object size(suitable for both files and streams)
-
-    :param file_io: io.IOBase
-
-    :return: size
-    """
-    initial_position = file_io.tell()
-    file_io.seek(0, os.SEEK_END)
-    size = file_io.tell()
-    file_io.seek(initial_position, os.SEEK_SET)
-
-    return size
-
-
-def check_property_enabled(f):
-    """
-    Used as a class method decorator to check whether class is enabled(self.enabled is True)
-
-    :param f: function to call
-
-    :return: None if not enabled, otherwise calls function f
-    """
-    def wrapper(*args, **kwargs):
-        if not args[0].enabled:
-            return None
-        return f(*args, **kwargs)
-
-    return wrapper
-
-
-def verify_api_response_signature(public_id, version, signature, algorithm=None):
-    """
-    Verifies the authenticity of an API response signature
-
-    :param public_id: The public id of the asset as returned in the API response
-    :param version:   The version of the asset as returned in the API response
-    :param signature: Actual signature. Can be retrieved from the X-Cld-Signature header
-    :param algorithm: Name of hashing algorithm to use for calculation of HMACs.
-                      By default uses `cloudinary.config().signature_algorithm`
-
-    :return: Boolean result of the validation
-    """
-    if not cloudinary.config().api_secret:
-        raise Exception('Api secret key is empty')
-
-    parameters_to_sign = {'public_id': public_id,
-                          'version': version}
-
-    return signature == api_sign_request(
-        parameters_to_sign,
-        cloudinary.config().api_secret,
-        algorithm or cloudinary.config().signature_algorithm
-    )
-
-
-def verify_notification_signature(body, timestamp, signature, valid_for=7200, algorithm=None):
-    """
-    Verifies the authenticity of a notification signature
-
-    :param body: Json of the request's body
-    :param timestamp: Unix timestamp. Can be retrieved from the X-Cld-Timestamp header
-    :param signature: Actual signature. Can be retrieved from the X-Cld-Signature header
-    :param valid_for: The desired time in seconds for considering the request valid
-    :param algorithm: Name of hashing algorithm to use for calculation of HMACs.
-                      By default uses `cloudinary.config().signature_algorithm`
-
-    :return: Boolean result of the validation
-    """
-    if not cloudinary.config().api_secret:
-        raise Exception('Api secret key is empty')
-
-    if timestamp < time.time() - valid_for:
-        return False
-
-    if not isinstance(body, str):
-        raise ValueError('Body should be type of string')
-
-    return signature == compute_hex_hash(
-        '{}{}{}'.format(body, timestamp, cloudinary.config().api_secret),
-        algorithm or cloudinary.config().signature_algorithm)
-
-
-def get_http_connector(conf, options):
-    """
-    Used to create http connector, depends on api_proxy and disable_tcp_keep_alive configuration parameters.
-
-    :param conf: configuration object
-    :param options: additional options
-
-    :return: ProxyManager if api_proxy is set, otherwise PoolManager object
-    """
-    if conf.api_proxy:
-        if conf.disable_tcp_keep_alive:
-            return ProxyManager(conf.api_proxy, **options)
-
-        return TCPKeepAliveProxyManager(conf.api_proxy, **options)
-
-    if conf.disable_tcp_keep_alive:
-        return PoolManager(**options)
-
-    return TCPKeepAlivePoolManager(**options)
-
-
-def encode_list(obj):
-    if isinstance(obj, list):
-        return ",".join(obj)
-    return obj
-
-
-def safe_cast(val, casting_fn, default=None):
-    """
-    Attempts to cast a value to another using a given casting function
-    Will return a default value if casting fails (configurable, defaults to None)
-
-    :param val: The value to cast
-    :param casting_fn: The casting function that will receive the value to cast
-    :param default: The return value if casting fails
-
-    :return: Result of casting the value or the value of the default parameter
-    """
-    try:
-        return casting_fn(val)
-    except (ValueError, TypeError):
-        return default
-
-
-def __id(x):
-    """
-    Identity function. Returns the passed in values.
-    """
-    return x
-
-
-def unique(collection, key=None):
-    """
-    Removes duplicates from collection using key function
-
-    :param collection: The collection to remove duplicates from
-    :param key: The function to generate key from each element. If not passed, identity function is used
-    """
-    if key is None:
-        key = __id
-
-    to_return = OrderedDict()
-
-    for element in collection:
-        to_return[key(element)] = element
-
-    return list(to_return.values())
-
-
-def fq_public_id(public_id, resource_type="image", type="upload"):
-    """
-    Returns the fully qualified public id of form resource_type/type/public_id.
-
-    :param public_id: The public ID of the asset.
-    :type public_id: str
-    :param resource_type: The type of the asset. Defaults to "image".
-    :type resource_type: str
-    :param type: The upload type. Defaults to "upload".
-    :type type: str
-
-    :return:
-    """
-    return "{resource_type}/{type}/{public_id}".format(resource_type=resource_type, type=type, public_id=public_id)
diff --git a/lib/concurrent/LICENSE b/lib/concurrent/LICENSE
new file mode 100644
index 00000000..c430db0f
--- /dev/null
+++ b/lib/concurrent/LICENSE
@@ -0,0 +1,21 @@
+Copyright 2009 Brian Quinlan. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+   2. Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY BRIAN QUINLAN "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+HALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/lib/concurrent/__init__.py b/lib/concurrent/__init__.py
new file mode 100644
index 00000000..b36383a6
--- /dev/null
+++ b/lib/concurrent/__init__.py
@@ -0,0 +1,3 @@
+from pkgutil import extend_path
+
+__path__ = extend_path(__path__, __name__)
diff --git a/lib/concurrent/futures/__init__.py b/lib/concurrent/futures/__init__.py
new file mode 100644
index 00000000..fef52819
--- /dev/null
+++ b/lib/concurrent/futures/__init__.py
@@ -0,0 +1,23 @@
+# Copyright 2009 Brian Quinlan. All Rights Reserved.
+# Licensed to PSF under a Contributor Agreement.
+
+"""Execute computations asynchronously using threads or processes."""
+
+__author__ = 'Brian Quinlan (brian@sweetapp.com)'
+
+from concurrent.futures._base import (FIRST_COMPLETED,
+                                      FIRST_EXCEPTION,
+                                      ALL_COMPLETED,
+                                      CancelledError,
+                                      TimeoutError,
+                                      Future,
+                                      Executor,
+                                      wait,
+                                      as_completed)
+from concurrent.futures.thread import ThreadPoolExecutor
+
+# Jython doesn't have multiprocessing
+try:
+    from concurrent.futures.process import ProcessPoolExecutor
+except ImportError:
+    pass
diff --git a/lib/concurrent/futures/_base.py b/lib/concurrent/futures/_base.py
new file mode 100644
index 00000000..6f0c0f3b
--- /dev/null
+++ b/lib/concurrent/futures/_base.py
@@ -0,0 +1,605 @@
+# Copyright 2009 Brian Quinlan. All Rights Reserved.
+# Licensed to PSF under a Contributor Agreement.
+
+from __future__ import with_statement
+import logging
+import threading
+import time
+
+from concurrent.futures._compat import reraise
+
+try:
+    from collections import namedtuple
+except ImportError:
+    from concurrent.futures._compat import namedtuple
+
+__author__ = 'Brian Quinlan (brian@sweetapp.com)'
+
+FIRST_COMPLETED = 'FIRST_COMPLETED'
+FIRST_EXCEPTION = 'FIRST_EXCEPTION'
+ALL_COMPLETED = 'ALL_COMPLETED'
+_AS_COMPLETED = '_AS_COMPLETED'
+
+# Possible future states (for internal use by the futures package).
+PENDING = 'PENDING'
+RUNNING = 'RUNNING'
+# The future was cancelled by the user...
+CANCELLED = 'CANCELLED'
+# ...and _Waiter.add_cancelled() was called by a worker.
+CANCELLED_AND_NOTIFIED = 'CANCELLED_AND_NOTIFIED'
+FINISHED = 'FINISHED'
+
+_FUTURE_STATES = [
+    PENDING,
+    RUNNING,
+    CANCELLED,
+    CANCELLED_AND_NOTIFIED,
+    FINISHED
+]
+
+_STATE_TO_DESCRIPTION_MAP = {
+    PENDING: "pending",
+    RUNNING: "running",
+    CANCELLED: "cancelled",
+    CANCELLED_AND_NOTIFIED: "cancelled",
+    FINISHED: "finished"
+}
+
+# Logger for internal use by the futures package.
+LOGGER = logging.getLogger("concurrent.futures")
+
+class Error(Exception):
+    """Base class for all future-related exceptions."""
+    pass
+
+class CancelledError(Error):
+    """The Future was cancelled."""
+    pass
+
+class TimeoutError(Error):
+    """The operation exceeded the given deadline."""
+    pass
+
+class _Waiter(object):
+    """Provides the event that wait() and as_completed() block on."""
+    def __init__(self):
+        self.event = threading.Event()
+        self.finished_futures = []
+
+    def add_result(self, future):
+        self.finished_futures.append(future)
+
+    def add_exception(self, future):
+        self.finished_futures.append(future)
+
+    def add_cancelled(self, future):
+        self.finished_futures.append(future)
+
+class _AsCompletedWaiter(_Waiter):
+    """Used by as_completed()."""
+
+    def __init__(self):
+        super(_AsCompletedWaiter, self).__init__()
+        self.lock = threading.Lock()
+
+    def add_result(self, future):
+        with self.lock:
+            super(_AsCompletedWaiter, self).add_result(future)
+            self.event.set()
+
+    def add_exception(self, future):
+        with self.lock:
+            super(_AsCompletedWaiter, self).add_exception(future)
+            self.event.set()
+
+    def add_cancelled(self, future):
+        with self.lock:
+            super(_AsCompletedWaiter, self).add_cancelled(future)
+            self.event.set()
+
+class _FirstCompletedWaiter(_Waiter):
+    """Used by wait(return_when=FIRST_COMPLETED)."""
+
+    def add_result(self, future):
+        super(_FirstCompletedWaiter, self).add_result(future)
+        self.event.set()
+
+    def add_exception(self, future):
+        super(_FirstCompletedWaiter, self).add_exception(future)
+        self.event.set()
+
+    def add_cancelled(self, future):
+        super(_FirstCompletedWaiter, self).add_cancelled(future)
+        self.event.set()
+
+class _AllCompletedWaiter(_Waiter):
+    """Used by wait(return_when=FIRST_EXCEPTION and ALL_COMPLETED)."""
+
+    def __init__(self, num_pending_calls, stop_on_exception):
+        self.num_pending_calls = num_pending_calls
+        self.stop_on_exception = stop_on_exception
+        self.lock = threading.Lock()
+        super(_AllCompletedWaiter, self).__init__()
+
+    def _decrement_pending_calls(self):
+        with self.lock:
+            self.num_pending_calls -= 1
+            if not self.num_pending_calls:
+                self.event.set()
+
+    def add_result(self, future):
+        super(_AllCompletedWaiter, self).add_result(future)
+        self._decrement_pending_calls()
+
+    def add_exception(self, future):
+        super(_AllCompletedWaiter, self).add_exception(future)
+        if self.stop_on_exception:
+            self.event.set()
+        else:
+            self._decrement_pending_calls()
+
+    def add_cancelled(self, future):
+        super(_AllCompletedWaiter, self).add_cancelled(future)
+        self._decrement_pending_calls()
+
+class _AcquireFutures(object):
+    """A context manager that does an ordered acquire of Future conditions."""
+
+    def __init__(self, futures):
+        self.futures = sorted(futures, key=id)
+
+    def __enter__(self):
+        for future in self.futures:
+            future._condition.acquire()
+
+    def __exit__(self, *args):
+        for future in self.futures:
+            future._condition.release()
+
+def _create_and_install_waiters(fs, return_when):
+    if return_when == _AS_COMPLETED:
+        waiter = _AsCompletedWaiter()
+    elif return_when == FIRST_COMPLETED:
+        waiter = _FirstCompletedWaiter()
+    else:
+        pending_count = sum(
+                f._state not in [CANCELLED_AND_NOTIFIED, FINISHED] for f in fs)
+
+        if return_when == FIRST_EXCEPTION:
+            waiter = _AllCompletedWaiter(pending_count, stop_on_exception=True)
+        elif return_when == ALL_COMPLETED:
+            waiter = _AllCompletedWaiter(pending_count, stop_on_exception=False)
+        else:
+            raise ValueError("Invalid return condition: %r" % return_when)
+
+    for f in fs:
+        f._waiters.append(waiter)
+
+    return waiter
+
+def as_completed(fs, timeout=None):
+    """An iterator over the given futures that yields each as it completes.
+
+    Args:
+        fs: The sequence of Futures (possibly created by different Executors) to
+            iterate over.
+        timeout: The maximum number of seconds to wait. If None, then there
+            is no limit on the wait time.
+
+    Returns:
+        An iterator that yields the given Futures as they complete (finished or
+        cancelled).
+
+    Raises:
+        TimeoutError: If the entire result iterator could not be generated
+            before the given timeout.
+    """
+    if timeout is not None:
+        end_time = timeout + time.time()
+
+    with _AcquireFutures(fs):
+        finished = set(
+                f for f in fs
+                if f._state in [CANCELLED_AND_NOTIFIED, FINISHED])
+        pending = set(fs) - finished
+        waiter = _create_and_install_waiters(fs, _AS_COMPLETED)
+
+    try:
+        for future in finished:
+            yield future
+
+        while pending:
+            if timeout is None:
+                wait_timeout = None
+            else:
+                wait_timeout = end_time - time.time()
+                if wait_timeout < 0:
+                    raise TimeoutError(
+                            '%d (of %d) futures unfinished' % (
+                            len(pending), len(fs)))
+
+            waiter.event.wait(wait_timeout)
+
+            with waiter.lock:
+                finished = waiter.finished_futures
+                waiter.finished_futures = []
+                waiter.event.clear()
+
+            for future in finished:
+                yield future
+                pending.remove(future)
+
+    finally:
+        for f in fs:
+            f._waiters.remove(waiter)
+
+DoneAndNotDoneFutures = namedtuple(
+        'DoneAndNotDoneFutures', 'done not_done')
+def wait(fs, timeout=None, return_when=ALL_COMPLETED):
+    """Wait for the futures in the given sequence to complete.
+
+    Args:
+        fs: The sequence of Futures (possibly created by different Executors) to
+            wait upon.
+        timeout: The maximum number of seconds to wait. If None, then there
+            is no limit on the wait time.
+        return_when: Indicates when this function should return. The options
+            are:
+
+            FIRST_COMPLETED - Return when any future finishes or is
+                              cancelled.
+            FIRST_EXCEPTION - Return when any future finishes by raising an
+                              exception. If no future raises an exception
+                              then it is equivalent to ALL_COMPLETED.
+            ALL_COMPLETED -   Return when all futures finish or are cancelled.
+
+    Returns:
+        A named 2-tuple of sets. The first set, named 'done', contains the
+        futures that completed (is finished or cancelled) before the wait
+        completed. The second set, named 'not_done', contains uncompleted
+        futures.
+    """
+    with _AcquireFutures(fs):
+        done = set(f for f in fs
+                   if f._state in [CANCELLED_AND_NOTIFIED, FINISHED])
+        not_done = set(fs) - done
+
+        if (return_when == FIRST_COMPLETED) and done:
+            return DoneAndNotDoneFutures(done, not_done)
+        elif (return_when == FIRST_EXCEPTION) and done:
+            if any(f for f in done
+                   if not f.cancelled() and f.exception() is not None):
+                return DoneAndNotDoneFutures(done, not_done)
+
+        if len(done) == len(fs):
+            return DoneAndNotDoneFutures(done, not_done)
+
+        waiter = _create_and_install_waiters(fs, return_when)
+
+    waiter.event.wait(timeout)
+    for f in fs:
+        f._waiters.remove(waiter)
+
+    done.update(waiter.finished_futures)
+    return DoneAndNotDoneFutures(done, set(fs) - done)
+
+class Future(object):
+    """Represents the result of an asynchronous computation."""
+
+    def __init__(self):
+        """Initializes the future. Should not be called by clients."""
+        self._condition = threading.Condition()
+        self._state = PENDING
+        self._result = None
+        self._exception = None
+        self._traceback = None
+        self._waiters = []
+        self._done_callbacks = []
+
+    def _invoke_callbacks(self):
+        for callback in self._done_callbacks:
+            try:
+                callback(self)
+            except Exception:
+                LOGGER.exception('exception calling callback for %r', self)
+
+    def __repr__(self):
+        with self._condition:
+            if self._state == FINISHED:
+                if self._exception:
+                    return '<Future at %s state=%s raised %s>' % (
+                        hex(id(self)),
+                        _STATE_TO_DESCRIPTION_MAP[self._state],
+                        self._exception.__class__.__name__)
+                else:
+                    return '<Future at %s state=%s returned %s>' % (
+                        hex(id(self)),
+                        _STATE_TO_DESCRIPTION_MAP[self._state],
+                        self._result.__class__.__name__)
+            return '<Future at %s state=%s>' % (
+                    hex(id(self)),
+                   _STATE_TO_DESCRIPTION_MAP[self._state])
+
+    def cancel(self):
+        """Cancel the future if possible.
+
+        Returns True if the future was cancelled, False otherwise. A future
+        cannot be cancelled if it is running or has already completed.
+        """
+        with self._condition:
+            if self._state in [RUNNING, FINISHED]:
+                return False
+
+            if self._state in [CANCELLED, CANCELLED_AND_NOTIFIED]:
+                return True
+
+            self._state = CANCELLED
+            self._condition.notify_all()
+
+        self._invoke_callbacks()
+        return True
+
+    def cancelled(self):
+        """Return True if the future has cancelled."""
+        with self._condition:
+            return self._state in [CANCELLED, CANCELLED_AND_NOTIFIED]
+
+    def running(self):
+        """Return True if the future is currently executing."""
+        with self._condition:
+            return self._state == RUNNING
+
+    def done(self):
+        """Return True of the future was cancelled or finished executing."""
+        with self._condition:
+            return self._state in [CANCELLED, CANCELLED_AND_NOTIFIED, FINISHED]
+
+    def __get_result(self):
+        if self._exception:
+            reraise(self._exception, self._traceback)
+        else:
+            return self._result
+
+    def add_done_callback(self, fn):
+        """Attaches a callable that will be called when the future finishes.
+
+        Args:
+            fn: A callable that will be called with this future as its only
+                argument when the future completes or is cancelled. The callable
+                will always be called by a thread in the same process in which
+                it was added. If the future has already completed or been
+                cancelled then the callable will be called immediately. These
+                callables are called in the order that they were added.
+        """
+        with self._condition:
+            if self._state not in [CANCELLED, CANCELLED_AND_NOTIFIED, FINISHED]:
+                self._done_callbacks.append(fn)
+                return
+        fn(self)
+
+    def result(self, timeout=None):
+        """Return the result of the call that the future represents.
+
+        Args:
+            timeout: The number of seconds to wait for the result if the future
+                isn't done. If None, then there is no limit on the wait time.
+
+        Returns:
+            The result of the call that the future represents.
+
+        Raises:
+            CancelledError: If the future was cancelled.
+            TimeoutError: If the future didn't finish executing before the given
+                timeout.
+            Exception: If the call raised then that exception will be raised.
+        """
+        with self._condition:
+            if self._state in [CANCELLED, CANCELLED_AND_NOTIFIED]:
+                raise CancelledError()
+            elif self._state == FINISHED:
+                return self.__get_result()
+
+            self._condition.wait(timeout)
+
+            if self._state in [CANCELLED, CANCELLED_AND_NOTIFIED]:
+                raise CancelledError()
+            elif self._state == FINISHED:
+                return self.__get_result()
+            else:
+                raise TimeoutError()
+
+    def exception_info(self, timeout=None):
+        """Return a tuple of (exception, traceback) raised by the call that the
+        future represents.
+
+        Args:
+            timeout: The number of seconds to wait for the exception if the
+                future isn't done. If None, then there is no limit on the wait
+                time.
+
+        Returns:
+            The exception raised by the call that the future represents or None
+            if the call completed without raising.
+
+        Raises:
+            CancelledError: If the future was cancelled.
+            TimeoutError: If the future didn't finish executing before the given
+                timeout.
+        """
+        with self._condition:
+            if self._state in [CANCELLED, CANCELLED_AND_NOTIFIED]:
+                raise CancelledError()
+            elif self._state == FINISHED:
+                return self._exception, self._traceback
+
+            self._condition.wait(timeout)
+
+            if self._state in [CANCELLED, CANCELLED_AND_NOTIFIED]:
+                raise CancelledError()
+            elif self._state == FINISHED:
+                return self._exception, self._traceback
+            else:
+                raise TimeoutError()
+
+    def exception(self, timeout=None):
+        """Return the exception raised by the call that the future represents.
+
+        Args:
+            timeout: The number of seconds to wait for the exception if the
+                future isn't done. If None, then there is no limit on the wait
+                time.
+
+        Returns:
+            The exception raised by the call that the future represents or None
+            if the call completed without raising.
+
+        Raises:
+            CancelledError: If the future was cancelled.
+            TimeoutError: If the future didn't finish executing before the given
+                timeout.
+        """
+        return self.exception_info(timeout)[0]
+
+    # The following methods should only be used by Executors and in tests.
+    def set_running_or_notify_cancel(self):
+        """Mark the future as running or process any cancel notifications.
+
+        Should only be used by Executor implementations and unit tests.
+
+        If the future has been cancelled (cancel() was called and returned
+        True) then any threads waiting on the future completing (though calls
+        to as_completed() or wait()) are notified and False is returned.
+
+        If the future was not cancelled then it is put in the running state
+        (future calls to running() will return True) and True is returned.
+
+        This method should be called by Executor implementations before
+        executing the work associated with this future. If this method returns
+        False then the work should not be executed.
+
+        Returns:
+            False if the Future was cancelled, True otherwise.
+
+        Raises:
+            RuntimeError: if this method was already called or if set_result()
+                or set_exception() was called.
+        """
+        with self._condition:
+            if self._state == CANCELLED:
+                self._state = CANCELLED_AND_NOTIFIED
+                for waiter in self._waiters:
+                    waiter.add_cancelled(self)
+                # self._condition.notify_all() is not necessary because
+                # self.cancel() triggers a notification.
+                return False
+            elif self._state == PENDING:
+                self._state = RUNNING
+                return True
+            else:
+                LOGGER.critical('Future %s in unexpected state: %s',
+                                id(self.future),
+                                self.future._state)
+                raise RuntimeError('Future in unexpected state')
+
+    def set_result(self, result):
+        """Sets the return value of work associated with the future.
+
+        Should only be used by Executor implementations and unit tests.
+        """
+        with self._condition:
+            self._result = result
+            self._state = FINISHED
+            for waiter in self._waiters:
+                waiter.add_result(self)
+            self._condition.notify_all()
+        self._invoke_callbacks()
+
+    def set_exception_info(self, exception, traceback):
+        """Sets the result of the future as being the given exception
+        and traceback.
+
+        Should only be used by Executor implementations and unit tests.
+        """
+        with self._condition:
+            self._exception = exception
+            self._traceback = traceback
+            self._state = FINISHED
+            for waiter in self._waiters:
+                waiter.add_exception(self)
+            self._condition.notify_all()
+        self._invoke_callbacks()
+
+    def set_exception(self, exception):
+        """Sets the result of the future as being the given exception.
+
+        Should only be used by Executor implementations and unit tests.
+        """
+        self.set_exception_info(exception, None)
+
+class Executor(object):
+    """This is an abstract base class for concrete asynchronous executors."""
+
+    def submit(self, fn, *args, **kwargs):
+        """Submits a callable to be executed with the given arguments.
+
+        Schedules the callable to be executed as fn(*args, **kwargs) and returns
+        a Future instance representing the execution of the callable.
+
+        Returns:
+            A Future representing the given call.
+        """
+        raise NotImplementedError()
+
+    def map(self, fn, *iterables, **kwargs):
+        """Returns a iterator equivalent to map(fn, iter).
+
+        Args:
+            fn: A callable that will take as many arguments as there are
+                passed iterables.
+            timeout: The maximum number of seconds to wait. If None, then there
+                is no limit on the wait time.
+
+        Returns:
+            An iterator equivalent to: map(func, *iterables) but the calls may
+            be evaluated out-of-order.
+
+        Raises:
+            TimeoutError: If the entire result iterator could not be generated
+                before the given timeout.
+            Exception: If fn(*args) raises for any values.
+        """
+        timeout = kwargs.get('timeout')
+        if timeout is not None:
+            end_time = timeout + time.time()
+
+        fs = [self.submit(fn, *args) for args in zip(*iterables)]
+
+        try:
+            for future in fs:
+                if timeout is None:
+                    yield future.result()
+                else:
+                    yield future.result(end_time - time.time())
+        finally:
+            for future in fs:
+                future.cancel()
+
+    def shutdown(self, wait=True):
+        """Clean-up the resources associated with the Executor.
+
+        It is safe to call this method several times. Otherwise, no other
+        methods can be called after this one.
+
+        Args:
+            wait: If True then shutdown will not return until all running
+                futures have finished executing and the resources used by the
+                executor have been reclaimed.
+        """
+        pass
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.shutdown(wait=True)
+        return False
diff --git a/lib/concurrent/futures/_compat.py b/lib/concurrent/futures/_compat.py
new file mode 100644
index 00000000..e77cf0e5
--- /dev/null
+++ b/lib/concurrent/futures/_compat.py
@@ -0,0 +1,111 @@
+from keyword import iskeyword as _iskeyword
+from operator import itemgetter as _itemgetter
+import sys as _sys
+
+
+def namedtuple(typename, field_names):
+    """Returns a new subclass of tuple with named fields.
+
+    >>> Point = namedtuple('Point', 'x y')
+    >>> Point.__doc__                   # docstring for the new class
+    'Point(x, y)'
+    >>> p = Point(11, y=22)             # instantiate with positional args or keywords
+    >>> p[0] + p[1]                     # indexable like a plain tuple
+    33
+    >>> x, y = p                        # unpack like a regular tuple
+    >>> x, y
+    (11, 22)
+    >>> p.x + p.y                       # fields also accessable by name
+    33
+    >>> d = p._asdict()                 # convert to a dictionary
+    >>> d['x']
+    11
+    >>> Point(**d)                      # convert from a dictionary
+    Point(x=11, y=22)
+    >>> p._replace(x=100)               # _replace() is like str.replace() but targets named fields
+    Point(x=100, y=22)
+
+    """
+
+    # Parse and validate the field names.  Validation serves two purposes,
+    # generating informative error messages and preventing template injection attacks.
+    if isinstance(field_names, basestring):
+        field_names = field_names.replace(',', ' ').split() # names separated by whitespace and/or commas
+    field_names = tuple(map(str, field_names))
+    for name in (typename,) + field_names:
+        if not all(c.isalnum() or c=='_' for c in name):
+            raise ValueError('Type names and field names can only contain alphanumeric characters and underscores: %r' % name)
+        if _iskeyword(name):
+            raise ValueError('Type names and field names cannot be a keyword: %r' % name)
+        if name[0].isdigit():
+            raise ValueError('Type names and field names cannot start with a number: %r' % name)
+    seen_names = set()
+    for name in field_names:
+        if name.startswith('_'):
+            raise ValueError('Field names cannot start with an underscore: %r' % name)
+        if name in seen_names:
+            raise ValueError('Encountered duplicate field name: %r' % name)
+        seen_names.add(name)
+
+    # Create and fill-in the class template
+    numfields = len(field_names)
+    argtxt = repr(field_names).replace("'", "")[1:-1]   # tuple repr without parens or quotes
+    reprtxt = ', '.join('%s=%%r' % name for name in field_names)
+    dicttxt = ', '.join('%r: t[%d]' % (name, pos) for pos, name in enumerate(field_names))
+    template = '''class %(typename)s(tuple):
+        '%(typename)s(%(argtxt)s)' \n
+        __slots__ = () \n
+        _fields = %(field_names)r \n
+        def __new__(_cls, %(argtxt)s):
+            return _tuple.__new__(_cls, (%(argtxt)s)) \n
+        @classmethod
+        def _make(cls, iterable, new=tuple.__new__, len=len):
+            'Make a new %(typename)s object from a sequence or iterable'
+            result = new(cls, iterable)
+            if len(result) != %(numfields)d:
+                raise TypeError('Expected %(numfields)d arguments, got %%d' %% len(result))
+            return result \n
+        def __repr__(self):
+            return '%(typename)s(%(reprtxt)s)' %% self \n
+        def _asdict(t):
+            'Return a new dict which maps field names to their values'
+            return {%(dicttxt)s} \n
+        def _replace(_self, **kwds):
+            'Return a new %(typename)s object replacing specified fields with new values'
+            result = _self._make(map(kwds.pop, %(field_names)r, _self))
+            if kwds:
+                raise ValueError('Got unexpected field names: %%r' %% kwds.keys())
+            return result \n
+        def __getnewargs__(self):
+            return tuple(self) \n\n''' % locals()
+    for i, name in enumerate(field_names):
+        template += '        %s = _property(_itemgetter(%d))\n' % (name, i)
+
+    # Execute the template string in a temporary namespace and
+    # support tracing utilities by setting a value for frame.f_globals['__name__']
+    namespace = dict(_itemgetter=_itemgetter, __name__='namedtuple_%s' % typename,
+                     _property=property, _tuple=tuple)
+    try:
+        exec(template, namespace)
+    except SyntaxError:
+        e = _sys.exc_info()[1]
+        raise SyntaxError(e.message + ':\n' + template)
+    result = namespace[typename]
+
+    # For pickling to work, the __module__ variable needs to be set to the frame
+    # where the named tuple is created.  Bypass this step in enviroments where
+    # sys._getframe is not defined (Jython for example).
+    if hasattr(_sys, '_getframe'):
+        result.__module__ = _sys._getframe(1).f_globals.get('__name__', '__main__')
+
+    return result
+
+
+if _sys.version_info[0] < 3:
+    def reraise(exc, traceback):
+        locals_ = {'exc_type': type(exc), 'exc_value': exc, 'traceback': traceback}
+        exec('raise exc_type, exc_value, traceback', {}, locals_)
+else:
+    def reraise(exc, traceback):
+        # Tracebacks are embedded in exceptions in Python 3
+        raise exc
diff --git a/lib/concurrent/futures/process.py b/lib/concurrent/futures/process.py
new file mode 100644
index 00000000..98684f8e
--- /dev/null
+++ b/lib/concurrent/futures/process.py
@@ -0,0 +1,363 @@
+# Copyright 2009 Brian Quinlan. All Rights Reserved.
+# Licensed to PSF under a Contributor Agreement.
+
+"""Implements ProcessPoolExecutor.
+
+The follow diagram and text describe the data-flow through the system:
+
+|======================= In-process =====================|== Out-of-process ==|
+
++----------+     +----------+       +--------+     +-----------+    +---------+
+|          |  => | Work Ids |    => |        |  => | Call Q    | => |         |
+|          |     +----------+       |        |     +-----------+    |         |
+|          |     | ...      |       |        |     | ...       |    |         |
+|          |     | 6        |       |        |     | 5, call() |    |         |
+|          |     | 7        |       |        |     | ...       |    |         |
+| Process  |     | ...      |       | Local  |     +-----------+    | Process |
+|  Pool    |     +----------+       | Worker |                      |  #1..n  |
+| Executor |                        | Thread |                      |         |
+|          |     +----------- +     |        |     +-----------+    |         |
+|          | <=> | Work Items | <=> |        | <=  | Result Q  | <= |         |
+|          |     +------------+     |        |     +-----------+    |         |
+|          |     | 6: call()  |     |        |     | ...       |    |         |
+|          |     |    future  |     |        |     | 4, result |    |         |
+|          |     | ...        |     |        |     | 3, except |    |         |
++----------+     +------------+     +--------+     +-----------+    +---------+
+
+Executor.submit() called:
+- creates a uniquely numbered _WorkItem and adds it to the "Work Items" dict
+- adds the id of the _WorkItem to the "Work Ids" queue
+
+Local worker thread:
+- reads work ids from the "Work Ids" queue and looks up the corresponding
+  WorkItem from the "Work Items" dict: if the work item has been cancelled then
+  it is simply removed from the dict, otherwise it is repackaged as a
+  _CallItem and put in the "Call Q". New _CallItems are put in the "Call Q"
+  until "Call Q" is full. NOTE: the size of the "Call Q" is kept small because
+  calls placed in the "Call Q" can no longer be cancelled with Future.cancel().
+- reads _ResultItems from "Result Q", updates the future stored in the
+  "Work Items" dict and deletes the dict entry
+
+Process #1..n:
+- reads _CallItems from "Call Q", executes the calls, and puts the resulting
+  _ResultItems in "Request Q"
+"""
+
+from __future__ import with_statement
+import atexit
+import multiprocessing
+import threading
+import weakref
+import sys
+
+from concurrent.futures import _base
+
+try:
+    import queue
+except ImportError:
+    import Queue as queue
+
+__author__ = 'Brian Quinlan (brian@sweetapp.com)'
+
+# Workers are created as daemon threads and processes. This is done to allow the
+# interpreter to exit when there are still idle processes in a
+# ProcessPoolExecutor's process pool (i.e. shutdown() was not called). However,
+# allowing workers to die with the interpreter has two undesirable properties:
+#   - The workers would still be running during interpretor shutdown,
+#     meaning that they would fail in unpredictable ways.
+#   - The workers could be killed while evaluating a work item, which could
+#     be bad if the callable being evaluated has external side-effects e.g.
+#     writing to a file.
+#
+# To work around this problem, an exit handler is installed which tells the
+# workers to exit when their work queues are empty and then waits until the
+# threads/processes finish.
+
+_threads_queues = weakref.WeakKeyDictionary()
+_shutdown = False
+
+def _python_exit():
+    global _shutdown
+    _shutdown = True
+    items = list(_threads_queues.items())
+    for t, q in items:
+        q.put(None)
+    for t, q in items:
+        t.join()
+
+# Controls how many more calls than processes will be queued in the call queue.
+# A smaller number will mean that processes spend more time idle waiting for
+# work while a larger number will make Future.cancel() succeed less frequently
+# (Futures in the call queue cannot be cancelled).
+EXTRA_QUEUED_CALLS = 1
+
+class _WorkItem(object):
+    def __init__(self, future, fn, args, kwargs):
+        self.future = future
+        self.fn = fn
+        self.args = args
+        self.kwargs = kwargs
+
+class _ResultItem(object):
+    def __init__(self, work_id, exception=None, result=None):
+        self.work_id = work_id
+        self.exception = exception
+        self.result = result
+
+class _CallItem(object):
+    def __init__(self, work_id, fn, args, kwargs):
+        self.work_id = work_id
+        self.fn = fn
+        self.args = args
+        self.kwargs = kwargs
+
+def _process_worker(call_queue, result_queue):
+    """Evaluates calls from call_queue and places the results in result_queue.
+
+    This worker is run in a separate process.
+
+    Args:
+        call_queue: A multiprocessing.Queue of _CallItems that will be read and
+            evaluated by the worker.
+        result_queue: A multiprocessing.Queue of _ResultItems that will written
+            to by the worker.
+        shutdown: A multiprocessing.Event that will be set as a signal to the
+            worker that it should exit when call_queue is empty.
+    """
+    while True:
+        call_item = call_queue.get(block=True)
+        if call_item is None:
+            # Wake up queue management thread
+            result_queue.put(None)
+            return
+        try:
+            r = call_item.fn(*call_item.args, **call_item.kwargs)
+        except BaseException:
+            e = sys.exc_info()[1]
+            result_queue.put(_ResultItem(call_item.work_id,
+                                         exception=e))
+        else:
+            result_queue.put(_ResultItem(call_item.work_id,
+                                         result=r))
+
+def _add_call_item_to_queue(pending_work_items,
+                            work_ids,
+                            call_queue):
+    """Fills call_queue with _WorkItems from pending_work_items.
+
+    This function never blocks.
+
+    Args:
+        pending_work_items: A dict mapping work ids to _WorkItems e.g.
+            {5: <_WorkItem...>, 6: <_WorkItem...>, ...}
+        work_ids: A queue.Queue of work ids e.g. Queue([5, 6, ...]). Work ids
+            are consumed and the corresponding _WorkItems from
+            pending_work_items are transformed into _CallItems and put in
+            call_queue.
+        call_queue: A multiprocessing.Queue that will be filled with _CallItems
+            derived from _WorkItems.
+    """
+    while True:
+        if call_queue.full():
+            return
+        try:
+            work_id = work_ids.get(block=False)
+        except queue.Empty:
+            return
+        else:
+            work_item = pending_work_items[work_id]
+
+            if work_item.future.set_running_or_notify_cancel():
+                call_queue.put(_CallItem(work_id,
+                                         work_item.fn,
+                                         work_item.args,
+                                         work_item.kwargs),
+                               block=True)
+            else:
+                del pending_work_items[work_id]
+                continue
+
+def _queue_management_worker(executor_reference,
+                             processes,
+                             pending_work_items,
+                             work_ids_queue,
+                             call_queue,
+                             result_queue):
+    """Manages the communication between this process and the worker processes.
+
+    This function is run in a local thread.
+
+    Args:
+        executor_reference: A weakref.ref to the ProcessPoolExecutor that owns
+            this thread. Used to determine if the ProcessPoolExecutor has been
+            garbage collected and that this function can exit.
+        process: A list of the multiprocessing.Process instances used as
+            workers.
+        pending_work_items: A dict mapping work ids to _WorkItems e.g.
+            {5: <_WorkItem...>, 6: <_WorkItem...>, ...}
+        work_ids_queue: A queue.Queue of work ids e.g. Queue([5, 6, ...]).
+        call_queue: A multiprocessing.Queue that will be filled with _CallItems
+            derived from _WorkItems for processing by the process workers.
+        result_queue: A multiprocessing.Queue of _ResultItems generated by the
+            process workers.
+    """
+    nb_shutdown_processes = [0]
+    def shutdown_one_process():
+        """Tell a worker to terminate, which will in turn wake us again"""
+        call_queue.put(None)
+        nb_shutdown_processes[0] += 1
+    while True:
+        _add_call_item_to_queue(pending_work_items,
+                                work_ids_queue,
+                                call_queue)
+
+        result_item = result_queue.get(block=True)
+        if result_item is not None:
+            work_item = pending_work_items[result_item.work_id]
+            del pending_work_items[result_item.work_id]
+
+            if result_item.exception:
+                work_item.future.set_exception(result_item.exception)
+            else:
+                work_item.future.set_result(result_item.result)
+        # Check whether we should start shutting down.
+        executor = executor_reference()
+        # No more work items can be added if:
+        #   - The interpreter is shutting down OR
+        #   - The executor that owns this worker has been collected OR
+        #   - The executor that owns this worker has been shutdown.
+        if _shutdown or executor is None or executor._shutdown_thread:
+            # Since no new work items can be added, it is safe to shutdown
+            # this thread if there are no pending work items.
+            if not pending_work_items:
+                while nb_shutdown_processes[0] < len(processes):
+                    shutdown_one_process()
+                # If .join() is not called on the created processes then
+                # some multiprocessing.Queue methods may deadlock on Mac OS
+                # X.
+                for p in processes:
+                    p.join()
+                call_queue.close()
+                return
+        del executor
+
+_system_limits_checked = False
+_system_limited = None
+def _check_system_limits():
+    global _system_limits_checked, _system_limited
+    if _system_limits_checked:
+        if _system_limited:
+            raise NotImplementedError(_system_limited)
+    _system_limits_checked = True
+    try:
+        import os
+        nsems_max = os.sysconf("SC_SEM_NSEMS_MAX")
+    except (AttributeError, ValueError):
+        # sysconf not available or setting not available
+        return
+    if nsems_max == -1:
+        # indetermine limit, assume that limit is determined
+        # by available memory only
+        return
+    if nsems_max >= 256:
+        # minimum number of semaphores available
+        # according to POSIX
+        return
+    _system_limited = "system provides too few semaphores (%d available, 256 necessary)" % nsems_max
+    raise NotImplementedError(_system_limited)
+
+class ProcessPoolExecutor(_base.Executor):
+    def __init__(self, max_workers=None):
+        """Initializes a new ProcessPoolExecutor instance.
+
+        Args:
+            max_workers: The maximum number of processes that can be used to
+                execute the given calls. If None or not given then as many
+                worker processes will be created as the machine has processors.
+        """
+        _check_system_limits()
+
+        if max_workers is None:
+            self._max_workers = multiprocessing.cpu_count()
+        else:
+            self._max_workers = max_workers
+
+        # Make the call queue slightly larger than the number of processes to
+        # prevent the worker processes from idling. But don't make it too big
+        # because futures in the call queue cannot be cancelled.
+        self._call_queue = multiprocessing.Queue(self._max_workers +
+                                                 EXTRA_QUEUED_CALLS)
+        self._result_queue = multiprocessing.Queue()
+        self._work_ids = queue.Queue()
+        self._queue_management_thread = None
+        self._processes = set()
+
+        # Shutdown is a two-step process.
+        self._shutdown_thread = False
+        self._shutdown_lock = threading.Lock()
+        self._queue_count = 0
+        self._pending_work_items = {}
+
+    def _start_queue_management_thread(self):
+        # When the executor gets lost, the weakref callback will wake up
+        # the queue management thread.
+        def weakref_cb(_, q=self._result_queue):
+            q.put(None)
+        if self._queue_management_thread is None:
+            self._queue_management_thread = threading.Thread(
+                    target=_queue_management_worker,
+                    args=(weakref.ref(self, weakref_cb),
+                          self._processes,
+                          self._pending_work_items,
+                          self._work_ids,
+                          self._call_queue,
+                          self._result_queue))
+            self._queue_management_thread.daemon = True
+            self._queue_management_thread.start()
+            _threads_queues[self._queue_management_thread] = self._result_queue
+
+    def _adjust_process_count(self):
+        for _ in range(len(self._processes), self._max_workers):
+            p = multiprocessing.Process(
+                    target=_process_worker,
+                    args=(self._call_queue,
+                          self._result_queue))
+            p.start()
+            self._processes.add(p)
+
+    def submit(self, fn, *args, **kwargs):
+        with self._shutdown_lock:
+            if self._shutdown_thread:
+                raise RuntimeError('cannot schedule new futures after shutdown')
+
+            f = _base.Future()
+            w = _WorkItem(f, fn, args, kwargs)
+
+            self._pending_work_items[self._queue_count] = w
+            self._work_ids.put(self._queue_count)
+            self._queue_count += 1
+            # Wake up queue management thread
+            self._result_queue.put(None)
+
+            self._start_queue_management_thread()
+            self._adjust_process_count()
+            return f
+    submit.__doc__ = _base.Executor.submit.__doc__
+
+    def shutdown(self, wait=True):
+        with self._shutdown_lock:
+            self._shutdown_thread = True
+        if self._queue_management_thread:
+            # Wake up queue management thread
+            self._result_queue.put(None)
+            if wait:
+                self._queue_management_thread.join()
+        # To reduce the risk of openning too many files, remove references to
+        # objects that use file descriptors.
+        self._queue_management_thread = None
+        self._call_queue = None
+        self._result_queue = None
+        self._processes = None
+    shutdown.__doc__ = _base.Executor.shutdown.__doc__
+
+atexit.register(_python_exit)
diff --git a/lib/concurrent/futures/thread.py b/lib/concurrent/futures/thread.py
new file mode 100644
index 00000000..930d1673
--- /dev/null
+++ b/lib/concurrent/futures/thread.py
@@ -0,0 +1,138 @@
+# Copyright 2009 Brian Quinlan. All Rights Reserved.
+# Licensed to PSF under a Contributor Agreement.
+
+"""Implements ThreadPoolExecutor."""
+
+from __future__ import with_statement
+import atexit
+import threading
+import weakref
+import sys
+
+from concurrent.futures import _base
+
+try:
+    import queue
+except ImportError:
+    import Queue as queue
+
+__author__ = 'Brian Quinlan (brian@sweetapp.com)'
+
+# Workers are created as daemon threads. This is done to allow the interpreter
+# to exit when there are still idle threads in a ThreadPoolExecutor's thread
+# pool (i.e. shutdown() was not called). However, allowing workers to die with
+# the interpreter has two undesirable properties:
+#   - The workers would still be running during interpretor shutdown,
+#     meaning that they would fail in unpredictable ways.
+#   - The workers could be killed while evaluating a work item, which could
+#     be bad if the callable being evaluated has external side-effects e.g.
+#     writing to a file.
+#
+# To work around this problem, an exit handler is installed which tells the
+# workers to exit when their work queues are empty and then waits until the
+# threads finish.
+
+_threads_queues = weakref.WeakKeyDictionary()
+_shutdown = False
+
+def _python_exit():
+    global _shutdown
+    _shutdown = True
+    items = list(_threads_queues.items())
+    for t, q in items:
+        q.put(None)
+    for t, q in items:
+        t.join()
+
+atexit.register(_python_exit)
+
+class _WorkItem(object):
+    def __init__(self, future, fn, args, kwargs):
+        self.future = future
+        self.fn = fn
+        self.args = args
+        self.kwargs = kwargs
+
+    def run(self):
+        if not self.future.set_running_or_notify_cancel():
+            return
+
+        try:
+            result = self.fn(*self.args, **self.kwargs)
+        except BaseException:
+            e, tb = sys.exc_info()[1:]
+            self.future.set_exception_info(e, tb)
+        else:
+            self.future.set_result(result)
+
+def _worker(executor_reference, work_queue):
+    try:
+        while True:
+            work_item = work_queue.get(block=True)
+            if work_item is not None:
+                work_item.run()
+                continue
+            executor = executor_reference()
+            # Exit if:
+            #   - The interpreter is shutting down OR
+            #   - The executor that owns the worker has been collected OR
+            #   - The executor that owns the worker has been shutdown.
+            if _shutdown or executor is None or executor._shutdown:
+                # Notice other workers
+                work_queue.put(None)
+                return
+            del executor
+    except BaseException:
+        _base.LOGGER.critical('Exception in worker', exc_info=True)
+
+class ThreadPoolExecutor(_base.Executor):
+    def __init__(self, max_workers):
+        """Initializes a new ThreadPoolExecutor instance.
+
+        Args:
+            max_workers: The maximum number of threads that can be used to
+                execute the given calls.
+        """
+        self._max_workers = max_workers
+        self._work_queue = queue.Queue()
+        self._threads = set()
+        self._shutdown = False
+        self._shutdown_lock = threading.Lock()
+
+    def submit(self, fn, *args, **kwargs):
+        with self._shutdown_lock:
+            if self._shutdown:
+                raise RuntimeError('cannot schedule new futures after shutdown')
+
+            f = _base.Future()
+            w = _WorkItem(f, fn, args, kwargs)
+
+            self._work_queue.put(w)
+            self._adjust_thread_count()
+            return f
+    submit.__doc__ = _base.Executor.submit.__doc__
+
+    def _adjust_thread_count(self):
+        # When the executor gets lost, the weakref callback will wake up
+        # the worker threads.
+        def weakref_cb(_, q=self._work_queue):
+            q.put(None)
+        # TODO(bquinlan): Should avoid creating new threads if there are more
+        # idle threads than items in the work queue.
+        if len(self._threads) < self._max_workers:
+            t = threading.Thread(target=_worker,
+                                 args=(weakref.ref(self, weakref_cb),
+                                       self._work_queue))
+            t.daemon = True
+            t.start()
+            self._threads.add(t)
+            _threads_queues[t] = self._work_queue
+
+    def shutdown(self, wait=True):
+        with self._shutdown_lock:
+            self._shutdown = True
+            self._work_queue.put(None)
+        if wait:
+            for t in self._threads:
+                t.join()
+    shutdown.__doc__ = _base.Executor.shutdown.__doc__
diff --git a/lib/configobj.py b/lib/configobj.py
new file mode 100644
index 00000000..eae556a7
--- /dev/null
+++ b/lib/configobj.py
@@ -0,0 +1,2468 @@
+# configobj.py
+# A config file reader/writer that supports nested sections in config files.
+# Copyright (C) 2005-2010 Michael Foord, Nicola Larosa
+# E-mail: fuzzyman AT voidspace DOT org DOT uk
+#         nico AT tekNico DOT net
+
+# ConfigObj 4
+# http://www.voidspace.org.uk/python/configobj.html
+
+# Released subject to the BSD License
+# Please see http://www.voidspace.org.uk/python/license.shtml
+
+# Scripts maintained at http://www.voidspace.org.uk/python/index.shtml
+# For information about bugfixes, updates and support, please join the
+# ConfigObj mailing list:
+# http://lists.sourceforge.net/lists/listinfo/configobj-develop
+# Comments, suggestions and bug reports welcome.
+
+from __future__ import generators
+
+import os
+import re
+import sys
+
+from codecs import BOM_UTF8, BOM_UTF16, BOM_UTF16_BE, BOM_UTF16_LE
+
+
+# imported lazily to avoid startup performance hit if it isn't used
+compiler = None
+
+# A dictionary mapping BOM to
+# the encoding to decode with, and what to set the
+# encoding attribute to.
+BOMS = {
+    BOM_UTF8: ('utf_8', None),
+    BOM_UTF16_BE: ('utf16_be', 'utf_16'),
+    BOM_UTF16_LE: ('utf16_le', 'utf_16'),
+    BOM_UTF16: ('utf_16', 'utf_16'),
+    }
+# All legal variants of the BOM codecs.
+# TODO: the list of aliases is not meant to be exhaustive, is there a
+#   better way ?
+BOM_LIST = {
+    'utf_16': 'utf_16',
+    'u16': 'utf_16',
+    'utf16': 'utf_16',
+    'utf-16': 'utf_16',
+    'utf16_be': 'utf16_be',
+    'utf_16_be': 'utf16_be',
+    'utf-16be': 'utf16_be',
+    'utf16_le': 'utf16_le',
+    'utf_16_le': 'utf16_le',
+    'utf-16le': 'utf16_le',
+    'utf_8': 'utf_8',
+    'u8': 'utf_8',
+    'utf': 'utf_8',
+    'utf8': 'utf_8',
+    'utf-8': 'utf_8',
+    }
+
+# Map of encodings to the BOM to write.
+BOM_SET = {
+    'utf_8': BOM_UTF8,
+    'utf_16': BOM_UTF16,
+    'utf16_be': BOM_UTF16_BE,
+    'utf16_le': BOM_UTF16_LE,
+    None: BOM_UTF8
+    }
+
+
+def match_utf8(encoding):
+    return BOM_LIST.get(encoding.lower()) == 'utf_8'
+
+
+# Quote strings used for writing values
+squot = "'%s'"
+dquot = '"%s"'
+noquot = "%s"
+wspace_plus = ' \r\n\v\t\'"'
+tsquot = '"""%s"""'
+tdquot = "'''%s'''"
+
+# Sentinel for use in getattr calls to replace hasattr
+MISSING = object()
+
+__version__ = '4.7.2'
+
+try:
+    any
+except NameError:
+    def any(iterable):
+        for entry in iterable:
+            if entry:
+                return True
+        return False
+
+
+__all__ = (
+    '__version__',
+    'DEFAULT_INDENT_TYPE',
+    'DEFAULT_INTERPOLATION',
+    'ConfigObjError',
+    'NestingError',
+    'ParseError',
+    'DuplicateError',
+    'ConfigspecError',
+    'ConfigObj',
+    'SimpleVal',
+    'InterpolationError',
+    'InterpolationLoopError',
+    'MissingInterpolationOption',
+    'RepeatSectionError',
+    'ReloadError',
+    'UnreprError',
+    'UnknownType',
+    'flatten_errors',
+    'get_extra_values'
+)
+
+DEFAULT_INTERPOLATION = 'configparser'
+DEFAULT_INDENT_TYPE = '    '
+MAX_INTERPOL_DEPTH = 10
+
+OPTION_DEFAULTS = {
+    'interpolation': True,
+    'raise_errors': False,
+    'list_values': True,
+    'create_empty': False,
+    'file_error': False,
+    'configspec': None,
+    'stringify': True,
+    # option may be set to one of ('', ' ', '\t')
+    'indent_type': None,
+    'encoding': None,
+    'default_encoding': None,
+    'unrepr': False,
+    'write_empty_values': False,
+}
+
+
+
+def getObj(s):
+    global compiler
+    if compiler is None:
+        import compiler
+    s = "a=" + s
+    p = compiler.parse(s)
+    return p.getChildren()[1].getChildren()[0].getChildren()[1]
+
+
+class UnknownType(Exception):
+    pass
+
+
+class Builder(object):
+
+    def build(self, o):
+        m = getattr(self, 'build_' + o.__class__.__name__, None)
+        if m is None:
+            raise UnknownType(o.__class__.__name__)
+        return m(o)
+
+    def build_List(self, o):
+        return map(self.build, o.getChildren())
+
+    def build_Const(self, o):
+        return o.value
+
+    def build_Dict(self, o):
+        d = {}
+        i = iter(map(self.build, o.getChildren()))
+        for el in i:
+            d[el] = i.next()
+        return d
+
+    def build_Tuple(self, o):
+        return tuple(self.build_List(o))
+
+    def build_Name(self, o):
+        if o.name == 'None':
+            return None
+        if o.name == 'True':
+            return True
+        if o.name == 'False':
+            return False
+
+        # An undefined Name
+        raise UnknownType('Undefined Name')
+
+    def build_Add(self, o):
+        real, imag = map(self.build_Const, o.getChildren())
+        try:
+            real = float(real)
+        except TypeError:
+            raise UnknownType('Add')
+        if not isinstance(imag, complex) or imag.real != 0.0:
+            raise UnknownType('Add')
+        return real+imag
+
+    def build_Getattr(self, o):
+        parent = self.build(o.expr)
+        return getattr(parent, o.attrname)
+
+    def build_UnarySub(self, o):
+        return -self.build_Const(o.getChildren()[0])
+
+    def build_UnaryAdd(self, o):
+        return self.build_Const(o.getChildren()[0])
+
+
+_builder = Builder()
+
+
+def unrepr(s):
+    if not s:
+        return s
+    return _builder.build(getObj(s))
+
+
+
+class ConfigObjError(SyntaxError):
+    """
+    This is the base class for all errors that ConfigObj raises.
+    It is a subclass of SyntaxError.
+    """
+    def __init__(self, message='', line_number=None, line=''):
+        self.line = line
+        self.line_number = line_number
+        SyntaxError.__init__(self, message)
+
+
+class NestingError(ConfigObjError):
+    """
+    This error indicates a level of nesting that doesn't match.
+    """
+
+
+class ParseError(ConfigObjError):
+    """
+    This error indicates that a line is badly written.
+    It is neither a valid ``key = value`` line,
+    nor a valid section marker line.
+    """
+
+
+class ReloadError(IOError):
+    """
+    A 'reload' operation failed.
+    This exception is a subclass of ``IOError``.
+    """
+    def __init__(self):
+        IOError.__init__(self, 'reload failed, filename is not set.')
+
+
+class DuplicateError(ConfigObjError):
+    """
+    The keyword or section specified already exists.
+    """
+
+
+class ConfigspecError(ConfigObjError):
+    """
+    An error occured whilst parsing a configspec.
+    """
+
+
+class InterpolationError(ConfigObjError):
+    """Base class for the two interpolation errors."""
+
+
+class InterpolationLoopError(InterpolationError):
+    """Maximum interpolation depth exceeded in string interpolation."""
+
+    def __init__(self, option):
+        InterpolationError.__init__(
+            self,
+            'interpolation loop detected in value "%s".' % option)
+
+
+class RepeatSectionError(ConfigObjError):
+    """
+    This error indicates additional sections in a section with a
+    ``__many__`` (repeated) section.
+    """
+
+
+class MissingInterpolationOption(InterpolationError):
+    """A value specified for interpolation was missing."""
+    def __init__(self, option):
+        msg = 'missing option "%s" in interpolation.' % option
+        InterpolationError.__init__(self, msg)
+
+
+class UnreprError(ConfigObjError):
+    """An error parsing in unrepr mode."""
+
+
+
+class InterpolationEngine(object):
+    """
+    A helper class to help perform string interpolation.
+
+    This class is an abstract base class; its descendants perform
+    the actual work.
+    """
+
+    # compiled regexp to use in self.interpolate()
+    _KEYCRE = re.compile(r"%\(([^)]*)\)s")
+    _cookie = '%'
+
+    def __init__(self, section):
+        # the Section instance that "owns" this engine
+        self.section = section
+
+
+    def interpolate(self, key, value):
+        # short-cut
+        if not self._cookie in value:
+            return value
+
+        def recursive_interpolate(key, value, section, backtrail):
+            """The function that does the actual work.
+
+            ``value``: the string we're trying to interpolate.
+            ``section``: the section in which that string was found
+            ``backtrail``: a dict to keep track of where we've been,
+            to detect and prevent infinite recursion loops
+
+            This is similar to a depth-first-search algorithm.
+            """
+            # Have we been here already?
+            if (key, section.name) in backtrail:
+                # Yes - infinite loop detected
+                raise InterpolationLoopError(key)
+            # Place a marker on our backtrail so we won't come back here again
+            backtrail[(key, section.name)] = 1
+
+            # Now start the actual work
+            match = self._KEYCRE.search(value)
+            while match:
+                # The actual parsing of the match is implementation-dependent,
+                # so delegate to our helper function
+                k, v, s = self._parse_match(match)
+                if k is None:
+                    # That's the signal that no further interpolation is needed
+                    replacement = v
+                else:
+                    # Further interpolation may be needed to obtain final value
+                    replacement = recursive_interpolate(k, v, s, backtrail)
+                # Replace the matched string with its final value
+                start, end = match.span()
+                value = ''.join((value[:start], replacement, value[end:]))
+                new_search_start = start + len(replacement)
+                # Pick up the next interpolation key, if any, for next time
+                # through the while loop
+                match = self._KEYCRE.search(value, new_search_start)
+
+            # Now safe to come back here again; remove marker from backtrail
+            del backtrail[(key, section.name)]
+
+            return value
+
+        # Back in interpolate(), all we have to do is kick off the recursive
+        # function with appropriate starting values
+        value = recursive_interpolate(key, value, self.section, {})
+        return value
+
+
+    def _fetch(self, key):
+        """Helper function to fetch values from owning section.
+
+        Returns a 2-tuple: the value, and the section where it was found.
+        """
+        # switch off interpolation before we try and fetch anything !
+        save_interp = self.section.main.interpolation
+        self.section.main.interpolation = False
+
+        # Start at section that "owns" this InterpolationEngine
+        current_section = self.section
+        while True:
+            # try the current section first
+            val = current_section.get(key)
+            if val is not None and not isinstance(val, Section):
+                break
+            # try "DEFAULT" next
+            val = current_section.get('DEFAULT', {}).get(key)
+            if val is not None and not isinstance(val, Section):
+                break
+            # move up to parent and try again
+            # top-level's parent is itself
+            if current_section.parent is current_section:
+                # reached top level, time to give up
+                break
+            current_section = current_section.parent
+
+        # restore interpolation to previous value before returning
+        self.section.main.interpolation = save_interp
+        if val is None:
+            raise MissingInterpolationOption(key)
+        return val, current_section
+
+
+    def _parse_match(self, match):
+        """Implementation-dependent helper function.
+
+        Will be passed a match object corresponding to the interpolation
+        key we just found (e.g., "%(foo)s" or "$foo"). Should look up that
+        key in the appropriate config file section (using the ``_fetch()``
+        helper function) and return a 3-tuple: (key, value, section)
+
+        ``key`` is the name of the key we're looking for
+        ``value`` is the value found for that key
+        ``section`` is a reference to the section where it was found
+
+        ``key`` and ``section`` should be None if no further
+        interpolation should be performed on the resulting value
+        (e.g., if we interpolated "$$" and returned "$").
+        """
+        raise NotImplementedError()
+
+
+
+class ConfigParserInterpolation(InterpolationEngine):
+    """Behaves like ConfigParser."""
+    _cookie = '%'
+    _KEYCRE = re.compile(r"%\(([^)]*)\)s")
+
+    def _parse_match(self, match):
+        key = match.group(1)
+        value, section = self._fetch(key)
+        return key, value, section
+
+
+
+class TemplateInterpolation(InterpolationEngine):
+    """Behaves like string.Template."""
+    _cookie = '$'
+    _delimiter = '$'
+    _KEYCRE = re.compile(r"""
+        \$(?:
+          (?P<escaped>\$)              |   # Two $ signs
+          (?P<named>[_a-z][_a-z0-9]*)  |   # $name format
+          {(?P<braced>[^}]*)}              # ${name} format
+        )
+        """, re.IGNORECASE | re.VERBOSE)
+
+    def _parse_match(self, match):
+        # Valid name (in or out of braces): fetch value from section
+        key = match.group('named') or match.group('braced')
+        if key is not None:
+            value, section = self._fetch(key)
+            return key, value, section
+        # Escaped delimiter (e.g., $$): return single delimiter
+        if match.group('escaped') is not None:
+            # Return None for key and section to indicate it's time to stop
+            return None, self._delimiter, None
+        # Anything else: ignore completely, just return it unchanged
+        return None, match.group(), None
+
+
+interpolation_engines = {
+    'configparser': ConfigParserInterpolation,
+    'template': TemplateInterpolation,
+}
+
+
+def __newobj__(cls, *args):
+    # Hack for pickle
+    return cls.__new__(cls, *args)
+
+class Section(dict):
+    """
+    A dictionary-like object that represents a section in a config file.
+
+    It does string interpolation if the 'interpolation' attribute
+    of the 'main' object is set to True.
+
+    Interpolation is tried first from this object, then from the 'DEFAULT'
+    section of this object, next from the parent and its 'DEFAULT' section,
+    and so on until the main object is reached.
+
+    A Section will behave like an ordered dictionary - following the
+    order of the ``scalars`` and ``sections`` attributes.
+    You can use this to change the order of members.
+
+    Iteration follows the order: scalars, then sections.
+    """
+
+
+    def __setstate__(self, state):
+        dict.update(self, state[0])
+        self.__dict__.update(state[1])
+
+    def __reduce__(self):
+        state = (dict(self), self.__dict__)
+        return (__newobj__, (self.__class__,), state)
+
+
+    def __init__(self, parent, depth, main, indict=None, name=None):
+        """
+        * parent is the section above
+        * depth is the depth level of this section
+        * main is the main ConfigObj
+        * indict is a dictionary to initialise the section with
+        """
+        if indict is None:
+            indict = {}
+        dict.__init__(self)
+        # used for nesting level *and* interpolation
+        self.parent = parent
+        # used for the interpolation attribute
+        self.main = main
+        # level of nesting depth of this Section
+        self.depth = depth
+        # purely for information
+        self.name = name
+        #
+        self._initialise()
+        # we do this explicitly so that __setitem__ is used properly
+        # (rather than just passing to ``dict.__init__``)
+        for entry, value in indict.iteritems():
+            self[entry] = value
+
+
+    def _initialise(self):
+        # the sequence of scalar values in this Section
+        self.scalars = []
+        # the sequence of sections in this Section
+        self.sections = []
+        # for comments :-)
+        self.comments = {}
+        self.inline_comments = {}
+        # the configspec
+        self.configspec = None
+        # for defaults
+        self.defaults = []
+        self.default_values = {}
+        self.extra_values = []
+        self._created = False
+
+
+    def _interpolate(self, key, value):
+        try:
+            # do we already have an interpolation engine?
+            engine = self._interpolation_engine
+        except AttributeError:
+            # not yet: first time running _interpolate(), so pick the engine
+            name = self.main.interpolation
+            if name == True:  # note that "if name:" would be incorrect here
+                # backwards-compatibility: interpolation=True means use default
+                name = DEFAULT_INTERPOLATION
+            name = name.lower()  # so that "Template", "template", etc. all work
+            class_ = interpolation_engines.get(name, None)
+            if class_ is None:
+                # invalid value for self.main.interpolation
+                self.main.interpolation = False
+                return value
+            else:
+                # save reference to engine so we don't have to do this again
+                engine = self._interpolation_engine = class_(self)
+        # let the engine do the actual work
+        return engine.interpolate(key, value)
+
+
+    def __getitem__(self, key):
+        """Fetch the item and do string interpolation."""
+        val = dict.__getitem__(self, key)
+        if self.main.interpolation:
+            if isinstance(val, basestring):
+                return self._interpolate(key, val)
+            if isinstance(val, list):
+                def _check(entry):
+                    if isinstance(entry, basestring):
+                        return self._interpolate(key, entry)
+                    return entry
+                new = [_check(entry) for entry in val]
+                if new != val:
+                    return new
+        return val
+
+
+    def __setitem__(self, key, value, unrepr=False):
+        """
+        Correctly set a value.
+
+        Making dictionary values Section instances.
+        (We have to special case 'Section' instances - which are also dicts)
+
+        Keys must be strings.
+        Values need only be strings (or lists of strings) if
+        ``main.stringify`` is set.
+
+        ``unrepr`` must be set when setting a value to a dictionary, without
+        creating a new sub-section.
+        """
+        if not isinstance(key, basestring):
+            raise ValueError('The key "%s" is not a string.' % key)
+
+        # add the comment
+        if key not in self.comments:
+            self.comments[key] = []
+            self.inline_comments[key] = ''
+        # remove the entry from defaults
+        if key in self.defaults:
+            self.defaults.remove(key)
+        #
+        if isinstance(value, Section):
+            if key not in self:
+                self.sections.append(key)
+            dict.__setitem__(self, key, value)
+        elif isinstance(value, dict) and not unrepr:
+            # First create the new depth level,
+            # then create the section
+            if key not in self:
+                self.sections.append(key)
+            new_depth = self.depth + 1
+            dict.__setitem__(
+                self,
+                key,
+                Section(
+                    self,
+                    new_depth,
+                    self.main,
+                    indict=value,
+                    name=key))
+        else:
+            if key not in self:
+                self.scalars.append(key)
+            if not self.main.stringify:
+                if isinstance(value, basestring):
+                    pass
+                elif isinstance(value, (list, tuple)):
+                    for entry in value:
+                        if not isinstance(entry, basestring):
+                            raise TypeError('Value is not a string "%s".' % entry)
+                else:
+                    raise TypeError('Value is not a string "%s".' % value)
+            dict.__setitem__(self, key, value)
+
+
+    def __delitem__(self, key):
+        """Remove items from the sequence when deleting."""
+        dict. __delitem__(self, key)
+        if key in self.scalars:
+            self.scalars.remove(key)
+        else:
+            self.sections.remove(key)
+        del self.comments[key]
+        del self.inline_comments[key]
+
+
+    def get(self, key, default=None):
+        """A version of ``get`` that doesn't bypass string interpolation."""
+        try:
+            return self[key]
+        except KeyError:
+            return default
+
+
+    def update(self, indict):
+        """
+        A version of update that uses our ``__setitem__``.
+        """
+        for entry in indict:
+            self[entry] = indict[entry]
+
+
+    def pop(self, key, default=MISSING):
+        """
+        'D.pop(k[,d]) -> v, remove specified key and return the corresponding value.
+        If key is not found, d is returned if given, otherwise KeyError is raised'
+        """
+        try:
+            val = self[key]
+        except KeyError:
+            if default is MISSING:
+                raise
+            val = default
+        else:
+            del self[key]
+        return val
+
+
+    def popitem(self):
+        """Pops the first (key,val)"""
+        sequence = (self.scalars + self.sections)
+        if not sequence:
+            raise KeyError(": 'popitem(): dictionary is empty'")
+        key = sequence[0]
+        val =  self[key]
+        del self[key]
+        return key, val
+
+
+    def clear(self):
+        """
+        A version of clear that also affects scalars/sections
+        Also clears comments and configspec.
+
+        Leaves other attributes alone :
+            depth/main/parent are not affected
+        """
+        dict.clear(self)
+        self.scalars = []
+        self.sections = []
+        self.comments = {}
+        self.inline_comments = {}
+        self.configspec = None
+        self.defaults = []
+        self.extra_values = []
+
+
+    def setdefault(self, key, default=None):
+        """A version of setdefault that sets sequence if appropriate."""
+        try:
+            return self[key]
+        except KeyError:
+            self[key] = default
+            return self[key]
+
+
+    def items(self):
+        """D.items() -> list of D's (key, value) pairs, as 2-tuples"""
+        return zip((self.scalars + self.sections), self.values())
+
+
+    def keys(self):
+        """D.keys() -> list of D's keys"""
+        return (self.scalars + self.sections)
+
+
+    def values(self):
+        """D.values() -> list of D's values"""
+        return [self[key] for key in (self.scalars + self.sections)]
+
+
+    def iteritems(self):
+        """D.iteritems() -> an iterator over the (key, value) items of D"""
+        return iter(self.items())
+
+
+    def iterkeys(self):
+        """D.iterkeys() -> an iterator over the keys of D"""
+        return iter((self.scalars + self.sections))
+
+    __iter__ = iterkeys
+
+
+    def itervalues(self):
+        """D.itervalues() -> an iterator over the values of D"""
+        return iter(self.values())
+
+
+    def __repr__(self):
+        """x.__repr__() <==> repr(x)"""
+        def _getval(key):
+            try:
+                return self[key]
+            except MissingInterpolationOption:
+                return dict.__getitem__(self, key)
+        return '{%s}' % ', '.join([('%s: %s' % (repr(key), repr(_getval(key))))
+            for key in (self.scalars + self.sections)])
+
+    __str__ = __repr__
+    __str__.__doc__ = "x.__str__() <==> str(x)"
+
+
+    # Extra methods - not in a normal dictionary
+
+    def dict(self):
+        """
+        Return a deepcopy of self as a dictionary.
+
+        All members that are ``Section`` instances are recursively turned to
+        ordinary dictionaries - by calling their ``dict`` method.
+
+        >>> n = a.dict()
+        >>> n == a
+        1
+        >>> n is a
+        0
+        """
+        newdict = {}
+        for entry in self:
+            this_entry = self[entry]
+            if isinstance(this_entry, Section):
+                this_entry = this_entry.dict()
+            elif isinstance(this_entry, list):
+                # create a copy rather than a reference
+                this_entry = list(this_entry)
+            elif isinstance(this_entry, tuple):
+                # create a copy rather than a reference
+                this_entry = tuple(this_entry)
+            newdict[entry] = this_entry
+        return newdict
+
+
+    def merge(self, indict):
+        """
+        A recursive update - useful for merging config files.
+
+        >>> a = '''[section1]
+        ...     option1 = True
+        ...     [[subsection]]
+        ...     more_options = False
+        ...     # end of file'''.splitlines()
+        >>> b = '''# File is user.ini
+        ...     [section1]
+        ...     option1 = False
+        ...     # end of file'''.splitlines()
+        >>> c1 = ConfigObj(b)
+        >>> c2 = ConfigObj(a)
+        >>> c2.merge(c1)
+        >>> c2
+        ConfigObj({'section1': {'option1': 'False', 'subsection': {'more_options': 'False'}}})
+        """
+        for key, val in indict.items():
+            if (key in self and isinstance(self[key], dict) and
+                                isinstance(val, dict)):
+                self[key].merge(val)
+            else:
+                self[key] = val
+
+
+    def rename(self, oldkey, newkey):
+        """
+        Change a keyname to another, without changing position in sequence.
+
+        Implemented so that transformations can be made on keys,
+        as well as on values. (used by encode and decode)
+
+        Also renames comments.
+        """
+        if oldkey in self.scalars:
+            the_list = self.scalars
+        elif oldkey in self.sections:
+            the_list = self.sections
+        else:
+            raise KeyError('Key "%s" not found.' % oldkey)
+        pos = the_list.index(oldkey)
+        #
+        val = self[oldkey]
+        dict.__delitem__(self, oldkey)
+        dict.__setitem__(self, newkey, val)
+        the_list.remove(oldkey)
+        the_list.insert(pos, newkey)
+        comm = self.comments[oldkey]
+        inline_comment = self.inline_comments[oldkey]
+        del self.comments[oldkey]
+        del self.inline_comments[oldkey]
+        self.comments[newkey] = comm
+        self.inline_comments[newkey] = inline_comment
+
+
+    def walk(self, function, raise_errors=True,
+            call_on_sections=False, **keywargs):
+        """
+        Walk every member and call a function on the keyword and value.
+
+        Return a dictionary of the return values
+
+        If the function raises an exception, raise the errror
+        unless ``raise_errors=False``, in which case set the return value to
+        ``False``.
+
+        Any unrecognised keyword arguments you pass to walk, will be pased on
+        to the function you pass in.
+
+        Note: if ``call_on_sections`` is ``True`` then - on encountering a
+        subsection, *first* the function is called for the *whole* subsection,
+        and then recurses into it's members. This means your function must be
+        able to handle strings, dictionaries and lists. This allows you
+        to change the key of subsections as well as for ordinary members. The
+        return value when called on the whole subsection has to be discarded.
+
+        See  the encode and decode methods for examples, including functions.
+
+        .. admonition:: caution
+
+            You can use ``walk`` to transform the names of members of a section
+            but you mustn't add or delete members.
+
+        >>> config = '''[XXXXsection]
+        ... XXXXkey = XXXXvalue'''.splitlines()
+        >>> cfg = ConfigObj(config)
+        >>> cfg
+        ConfigObj({'XXXXsection': {'XXXXkey': 'XXXXvalue'}})
+        >>> def transform(section, key):
+        ...     val = section[key]
+        ...     newkey = key.replace('XXXX', 'CLIENT1')
+        ...     section.rename(key, newkey)
+        ...     if isinstance(val, (tuple, list, dict)):
+        ...         pass
+        ...     else:
+        ...         val = val.replace('XXXX', 'CLIENT1')
+        ...         section[newkey] = val
+        >>> cfg.walk(transform, call_on_sections=True)
+        {'CLIENT1section': {'CLIENT1key': None}}
+        >>> cfg
+        ConfigObj({'CLIENT1section': {'CLIENT1key': 'CLIENT1value'}})
+        """
+        out = {}
+        # scalars first
+        for i in range(len(self.scalars)):
+            entry = self.scalars[i]
+            try:
+                val = function(self, entry, **keywargs)
+                # bound again in case name has changed
+                entry = self.scalars[i]
+                out[entry] = val
+            except Exception:
+                if raise_errors:
+                    raise
+                else:
+                    entry = self.scalars[i]
+                    out[entry] = False
+        # then sections
+        for i in range(len(self.sections)):
+            entry = self.sections[i]
+            if call_on_sections:
+                try:
+                    function(self, entry, **keywargs)
+                except Exception:
+                    if raise_errors:
+                        raise
+                    else:
+                        entry = self.sections[i]
+                        out[entry] = False
+                # bound again in case name has changed
+                entry = self.sections[i]
+            # previous result is discarded
+            out[entry] = self[entry].walk(
+                function,
+                raise_errors=raise_errors,
+                call_on_sections=call_on_sections,
+                **keywargs)
+        return out
+
+
+    def as_bool(self, key):
+        """
+        Accepts a key as input. The corresponding value must be a string or
+        the objects (``True`` or 1) or (``False`` or 0). We allow 0 and 1 to
+        retain compatibility with Python 2.2.
+
+        If the string is one of  ``True``, ``On``, ``Yes``, or ``1`` it returns
+        ``True``.
+
+        If the string is one of  ``False``, ``Off``, ``No``, or ``0`` it returns
+        ``False``.
+
+        ``as_bool`` is not case sensitive.
+
+        Any other input will raise a ``ValueError``.
+
+        >>> a = ConfigObj()
+        >>> a['a'] = 'fish'
+        >>> a.as_bool('a')
+        Traceback (most recent call last):
+        ValueError: Value "fish" is neither True nor False
+        >>> a['b'] = 'True'
+        >>> a.as_bool('b')
+        1
+        >>> a['b'] = 'off'
+        >>> a.as_bool('b')
+        0
+        """
+        val = self[key]
+        if val == True:
+            return True
+        elif val == False:
+            return False
+        else:
+            try:
+                if not isinstance(val, basestring):
+                    # TODO: Why do we raise a KeyError here?
+                    raise KeyError()
+                else:
+                    return self.main._bools[val.lower()]
+            except KeyError:
+                raise ValueError('Value "%s" is neither True nor False' % val)
+
+
+    def as_int(self, key):
+        """
+        A convenience method which coerces the specified value to an integer.
+
+        If the value is an invalid literal for ``int``, a ``ValueError`` will
+        be raised.
+
+        >>> a = ConfigObj()
+        >>> a['a'] = 'fish'
+        >>> a.as_int('a')
+        Traceback (most recent call last):
+        ValueError: invalid literal for int() with base 10: 'fish'
+        >>> a['b'] = '1'
+        >>> a.as_int('b')
+        1
+        >>> a['b'] = '3.2'
+        >>> a.as_int('b')
+        Traceback (most recent call last):
+        ValueError: invalid literal for int() with base 10: '3.2'
+        """
+        return int(self[key])
+
+
+    def as_float(self, key):
+        """
+        A convenience method which coerces the specified value to a float.
+
+        If the value is an invalid literal for ``float``, a ``ValueError`` will
+        be raised.
+
+        >>> a = ConfigObj()
+        >>> a['a'] = 'fish'
+        >>> a.as_float('a')
+        Traceback (most recent call last):
+        ValueError: invalid literal for float(): fish
+        >>> a['b'] = '1'
+        >>> a.as_float('b')
+        1.0
+        >>> a['b'] = '3.2'
+        >>> a.as_float('b')
+        3.2000000000000002
+        """
+        return float(self[key])
+
+
+    def as_list(self, key):
+        """
+        A convenience method which fetches the specified value, guaranteeing
+        that it is a list.
+
+        >>> a = ConfigObj()
+        >>> a['a'] = 1
+        >>> a.as_list('a')
+        [1]
+        >>> a['a'] = (1,)
+        >>> a.as_list('a')
+        [1]
+        >>> a['a'] = [1]
+        >>> a.as_list('a')
+        [1]
+        """
+        result = self[key]
+        if isinstance(result, (tuple, list)):
+            return list(result)
+        return [result]
+
+
+    def restore_default(self, key):
+        """
+        Restore (and return) default value for the specified key.
+
+        This method will only work for a ConfigObj that was created
+        with a configspec and has been validated.
+
+        If there is no default value for this key, ``KeyError`` is raised.
+        """
+        default = self.default_values[key]
+        dict.__setitem__(self, key, default)
+        if key not in self.defaults:
+            self.defaults.append(key)
+        return default
+
+
+    def restore_defaults(self):
+        """
+        Recursively restore default values to all members
+        that have them.
+
+        This method will only work for a ConfigObj that was created
+        with a configspec and has been validated.
+
+        It doesn't delete or modify entries without default values.
+        """
+        for key in self.default_values:
+            self.restore_default(key)
+
+        for section in self.sections:
+            self[section].restore_defaults()
+
+
+class ConfigObj(Section):
+    """An object to read, create, and write config files."""
+
+    _keyword = re.compile(r'''^ # line start
+        (\s*)                   # indentation
+        (                       # keyword
+            (?:".*?")|          # double quotes
+            (?:'.*?')|          # single quotes
+            (?:[^'"=].*?)       # no quotes
+        )
+        \s*=\s*                 # divider
+        (.*)                    # value (including list values and comments)
+        $   # line end
+        ''',
+        re.VERBOSE)
+
+    _sectionmarker = re.compile(r'''^
+        (\s*)                     # 1: indentation
+        ((?:\[\s*)+)              # 2: section marker open
+        (                         # 3: section name open
+            (?:"\s*\S.*?\s*")|    # at least one non-space with double quotes
+            (?:'\s*\S.*?\s*')|    # at least one non-space with single quotes
+            (?:[^'"\s].*?)        # at least one non-space unquoted
+        )                         # section name close
+        ((?:\s*\])+)              # 4: section marker close
+        \s*(\#.*)?                # 5: optional comment
+        $''',
+        re.VERBOSE)
+
+    # this regexp pulls list values out as a single string
+    # or single values and comments
+    # FIXME: this regex adds a '' to the end of comma terminated lists
+    #   workaround in ``_handle_value``
+    _valueexp = re.compile(r'''^
+        (?:
+            (?:
+                (
+                    (?:
+                        (?:
+                            (?:".*?")|              # double quotes
+                            (?:'.*?')|              # single quotes
+                            (?:[^'",\#][^,\#]*?)    # unquoted
+                        )
+                        \s*,\s*                     # comma
+                    )*      # match all list items ending in a comma (if any)
+                )
+                (
+                    (?:".*?")|                      # double quotes
+                    (?:'.*?')|                      # single quotes
+                    (?:[^'",\#\s][^,]*?)|           # unquoted
+                    (?:(?<!,))                      # Empty value
+                )?          # last item in a list - or string value
+            )|
+            (,)             # alternatively a single comma - empty list
+        )
+        \s*(\#.*)?          # optional comment
+        $''',
+        re.VERBOSE)
+
+    # use findall to get the members of a list value
+    _listvalueexp = re.compile(r'''
+        (
+            (?:".*?")|          # double quotes
+            (?:'.*?')|          # single quotes
+            (?:[^'",\#]?.*?)       # unquoted
+        )
+        \s*,\s*                 # comma
+        ''',
+        re.VERBOSE)
+
+    # this regexp is used for the value
+    # when lists are switched off
+    _nolistvalue = re.compile(r'''^
+        (
+            (?:".*?")|          # double quotes
+            (?:'.*?')|          # single quotes
+            (?:[^'"\#].*?)|     # unquoted
+            (?:)                # Empty value
+        )
+        \s*(\#.*)?              # optional comment
+        $''',
+        re.VERBOSE)
+
+    # regexes for finding triple quoted values on one line
+    _single_line_single = re.compile(r"^'''(.*?)'''\s*(#.*)?$")
+    _single_line_double = re.compile(r'^"""(.*?)"""\s*(#.*)?$')
+    _multi_line_single = re.compile(r"^(.*?)'''\s*(#.*)?$")
+    _multi_line_double = re.compile(r'^(.*?)"""\s*(#.*)?$')
+
+    _triple_quote = {
+        "'''": (_single_line_single, _multi_line_single),
+        '"""': (_single_line_double, _multi_line_double),
+    }
+
+    # Used by the ``istrue`` Section method
+    _bools = {
+        'yes': True, 'no': False,
+        'on': True, 'off': False,
+        '1': True, '0': False,
+        'true': True, 'false': False,
+        }
+
+
+    def __init__(self, infile=None, options=None, configspec=None, encoding=None,
+                 interpolation=True, raise_errors=False, list_values=True,
+                 create_empty=False, file_error=False, stringify=True,
+                 indent_type=None, default_encoding=None, unrepr=False,
+                 write_empty_values=False, _inspec=False):
+        """
+        Parse a config file or create a config file object.
+
+        ``ConfigObj(infile=None, configspec=None, encoding=None,
+                    interpolation=True, raise_errors=False, list_values=True,
+                    create_empty=False, file_error=False, stringify=True,
+                    indent_type=None, default_encoding=None, unrepr=False,
+                    write_empty_values=False, _inspec=False)``
+        """
+        self._inspec = _inspec
+        # init the superclass
+        Section.__init__(self, self, 0, self)
+
+        infile = infile or []
+
+        _options = {'configspec': configspec,
+                    'encoding': encoding, 'interpolation': interpolation,
+                    'raise_errors': raise_errors, 'list_values': list_values,
+                    'create_empty': create_empty, 'file_error': file_error,
+                    'stringify': stringify, 'indent_type': indent_type,
+                    'default_encoding': default_encoding, 'unrepr': unrepr,
+                    'write_empty_values': write_empty_values}
+
+        if options is None:
+            options = _options
+        else:
+            import warnings
+            warnings.warn('Passing in an options dictionary to ConfigObj() is '
+                          'deprecated. Use **options instead.',
+                          DeprecationWarning, stacklevel=2)
+
+            # TODO: check the values too.
+            for entry in options:
+                if entry not in OPTION_DEFAULTS:
+                    raise TypeError('Unrecognised option "%s".' % entry)
+            for entry, value in OPTION_DEFAULTS.items():
+                if entry not in options:
+                    options[entry] = value
+                keyword_value = _options[entry]
+                if value != keyword_value:
+                    options[entry] = keyword_value
+
+        # XXXX this ignores an explicit list_values = True in combination
+        # with _inspec. The user should *never* do that anyway, but still...
+        if _inspec:
+            options['list_values'] = False
+
+        self._initialise(options)
+        configspec = options['configspec']
+        self._original_configspec = configspec
+        self._load(infile, configspec)
+
+
+    def _load(self, infile, configspec):
+        if isinstance(infile, basestring):
+            self.filename = infile
+            if os.path.isfile(infile):
+                h = open(infile, 'rb')
+                infile = h.read() or []
+                h.close()
+            elif self.file_error:
+                # raise an error if the file doesn't exist
+                raise IOError('Config file not found: "%s".' % self.filename)
+            else:
+                # file doesn't already exist
+                if self.create_empty:
+                    # this is a good test that the filename specified
+                    # isn't impossible - like on a non-existent device
+                    h = open(infile, 'w')
+                    h.write('')
+                    h.close()
+                infile = []
+
+        elif isinstance(infile, (list, tuple)):
+            infile = list(infile)
+
+        elif isinstance(infile, dict):
+            # initialise self
+            # the Section class handles creating subsections
+            if isinstance(infile, ConfigObj):
+                # get a copy of our ConfigObj
+                def set_section(in_section, this_section):
+                    for entry in in_section.scalars:
+                        this_section[entry] = in_section[entry]
+                    for section in in_section.sections:
+                        this_section[section] = {}
+                        set_section(in_section[section], this_section[section])
+                set_section(infile, self)
+
+            else:
+                for entry in infile:
+                    self[entry] = infile[entry]
+            del self._errors
+
+            if configspec is not None:
+                self._handle_configspec(configspec)
+            else:
+                self.configspec = None
+            return
+
+        elif getattr(infile, 'read', MISSING) is not MISSING:
+            # This supports file like objects
+            infile = infile.read() or []
+            # needs splitting into lines - but needs doing *after* decoding
+            # in case it's not an 8 bit encoding
+        else:
+            raise TypeError('infile must be a filename, file like object, or list of lines.')
+
+        if infile:
+            # don't do it for the empty ConfigObj
+            infile = self._handle_bom(infile)
+            # infile is now *always* a list
+            #
+            # Set the newlines attribute (first line ending it finds)
+            # and strip trailing '\n' or '\r' from lines
+            for line in infile:
+                if (not line) or (line[-1] not in ('\r', '\n', '\r\n')):
+                    continue
+                for end in ('\r\n', '\n', '\r'):
+                    if line.endswith(end):
+                        self.newlines = end
+                        break
+                break
+
+            infile = [line.rstrip('\r\n') for line in infile]
+
+        self._parse(infile)
+        # if we had any errors, now is the time to raise them
+        if self._errors:
+            info = "at line %s." % self._errors[0].line_number
+            if len(self._errors) > 1:
+                msg = "Parsing failed with several errors.\nFirst error %s" % info
+                error = ConfigObjError(msg)
+            else:
+                error = self._errors[0]
+            # set the errors attribute; it's a list of tuples:
+            # (error_type, message, line_number)
+            error.errors = self._errors
+            # set the config attribute
+            error.config = self
+            raise error
+        # delete private attributes
+        del self._errors
+
+        if configspec is None:
+            self.configspec = None
+        else:
+            self._handle_configspec(configspec)
+
+
+    def _initialise(self, options=None):
+        if options is None:
+            options = OPTION_DEFAULTS
+
+        # initialise a few variables
+        self.filename = None
+        self._errors = []
+        self.raise_errors = options['raise_errors']
+        self.interpolation = options['interpolation']
+        self.list_values = options['list_values']
+        self.create_empty = options['create_empty']
+        self.file_error = options['file_error']
+        self.stringify = options['stringify']
+        self.indent_type = options['indent_type']
+        self.encoding = options['encoding']
+        self.default_encoding = options['default_encoding']
+        self.BOM = False
+        self.newlines = None
+        self.write_empty_values = options['write_empty_values']
+        self.unrepr = options['unrepr']
+
+        self.initial_comment = []
+        self.final_comment = []
+        self.configspec = None
+
+        if self._inspec:
+            self.list_values = False
+
+        # Clear section attributes as well
+        Section._initialise(self)
+
+
+    def __repr__(self):
+        def _getval(key):
+            try:
+                return self[key]
+            except MissingInterpolationOption:
+                return dict.__getitem__(self, key)
+        return ('ConfigObj({%s})' %
+                ', '.join([('%s: %s' % (repr(key), repr(_getval(key))))
+                for key in (self.scalars + self.sections)]))
+
+
+    def _handle_bom(self, infile):
+        """
+        Handle any BOM, and decode if necessary.
+
+        If an encoding is specified, that *must* be used - but the BOM should
+        still be removed (and the BOM attribute set).
+
+        (If the encoding is wrongly specified, then a BOM for an alternative
+        encoding won't be discovered or removed.)
+
+        If an encoding is not specified, UTF8 or UTF16 BOM will be detected and
+        removed. The BOM attribute will be set. UTF16 will be decoded to
+        unicode.
+
+        NOTE: This method must not be called with an empty ``infile``.
+
+        Specifying the *wrong* encoding is likely to cause a
+        ``UnicodeDecodeError``.
+
+        ``infile`` must always be returned as a list of lines, but may be
+        passed in as a single string.
+        """
+        if ((self.encoding is not None) and
+            (self.encoding.lower() not in BOM_LIST)):
+            # No need to check for a BOM
+            # the encoding specified doesn't have one
+            # just decode
+            return self._decode(infile, self.encoding)
+
+        if isinstance(infile, (list, tuple)):
+            line = infile[0]
+        else:
+            line = infile
+        if self.encoding is not None:
+            # encoding explicitly supplied
+            # And it could have an associated BOM
+            # TODO: if encoding is just UTF16 - we ought to check for both
+            # TODO: big endian and little endian versions.
+            enc = BOM_LIST[self.encoding.lower()]
+            if enc == 'utf_16':
+                # For UTF16 we try big endian and little endian
+                for BOM, (encoding, final_encoding) in BOMS.items():
+                    if not final_encoding:
+                        # skip UTF8
+                        continue
+                    if infile.startswith(BOM):
+                        ### BOM discovered
+                        ##self.BOM = True
+                        # Don't need to remove BOM
+                        return self._decode(infile, encoding)
+
+                # If we get this far, will *probably* raise a DecodeError
+                # As it doesn't appear to start with a BOM
+                return self._decode(infile, self.encoding)
+
+            # Must be UTF8
+            BOM = BOM_SET[enc]
+            if not line.startswith(BOM):
+                return self._decode(infile, self.encoding)
+
+            newline = line[len(BOM):]
+
+            # BOM removed
+            if isinstance(infile, (list, tuple)):
+                infile[0] = newline
+            else:
+                infile = newline
+            self.BOM = True
+            return self._decode(infile, self.encoding)
+
+        # No encoding specified - so we need to check for UTF8/UTF16
+        for BOM, (encoding, final_encoding) in BOMS.items():
+            if not line.startswith(BOM):
+                continue
+            else:
+                # BOM discovered
+                self.encoding = final_encoding
+                if not final_encoding:
+                    self.BOM = True
+                    # UTF8
+                    # remove BOM
+                    newline = line[len(BOM):]
+                    if isinstance(infile, (list, tuple)):
+                        infile[0] = newline
+                    else:
+                        infile = newline
+                    # UTF8 - don't decode
+                    if isinstance(infile, basestring):
+                        return infile.splitlines(True)
+                    else:
+                        return infile
+                # UTF16 - have to decode
+                return self._decode(infile, encoding)
+
+        # No BOM discovered and no encoding specified, just return
+        if isinstance(infile, basestring):
+            # infile read from a file will be a single string
+            return infile.splitlines(True)
+        return infile
+
+
+    def _a_to_u(self, aString):
+        """Decode ASCII strings to unicode if a self.encoding is specified."""
+        if self.encoding:
+            return aString.decode('ascii')
+        else:
+            return aString
+
+
+    def _decode(self, infile, encoding):
+        """
+        Decode infile to unicode. Using the specified encoding.
+
+        if is a string, it also needs converting to a list.
+        """
+        if isinstance(infile, basestring):
+            # can't be unicode
+            # NOTE: Could raise a ``UnicodeDecodeError``
+            return infile.decode(encoding).splitlines(True)
+        for i, line in enumerate(infile):
+            if not isinstance(line, unicode):
+                # NOTE: The isinstance test here handles mixed lists of unicode/string
+                # NOTE: But the decode will break on any non-string values
+                # NOTE: Or could raise a ``UnicodeDecodeError``
+                infile[i] = line.decode(encoding)
+        return infile
+
+
+    def _decode_element(self, line):
+        """Decode element to unicode if necessary."""
+        if not self.encoding:
+            return line
+        if isinstance(line, str) and self.default_encoding:
+            return line.decode(self.default_encoding)
+        return line
+
+
+    def _str(self, value):
+        """
+        Used by ``stringify`` within validate, to turn non-string values
+        into strings.
+        """
+        if not isinstance(value, basestring):
+            return str(value)
+        else:
+            return value
+
+
+    def _parse(self, infile):
+        """Actually parse the config file."""
+        temp_list_values = self.list_values
+        if self.unrepr:
+            self.list_values = False
+
+        comment_list = []
+        done_start = False
+        this_section = self
+        maxline = len(infile) - 1
+        cur_index = -1
+        reset_comment = False
+
+        while cur_index < maxline:
+            if reset_comment:
+                comment_list = []
+            cur_index += 1
+            line = infile[cur_index]
+            sline = line.strip()
+            # do we have anything on the line ?
+            if not sline or sline.startswith('#'):
+                reset_comment = False
+                comment_list.append(line)
+                continue
+
+            if not done_start:
+                # preserve initial comment
+                self.initial_comment = comment_list
+                comment_list = []
+                done_start = True
+
+            reset_comment = True
+            # first we check if it's a section marker
+            mat = self._sectionmarker.match(line)
+            if mat is not None:
+                # is a section line
+                (indent, sect_open, sect_name, sect_close, comment) = mat.groups()
+                if indent and (self.indent_type is None):
+                    self.indent_type = indent
+                cur_depth = sect_open.count('[')
+                if cur_depth != sect_close.count(']'):
+                    self._handle_error("Cannot compute the section depth at line %s.",
+                                       NestingError, infile, cur_index)
+                    continue
+
+                if cur_depth < this_section.depth:
+                    # the new section is dropping back to a previous level
+                    try:
+                        parent = self._match_depth(this_section,
+                                                   cur_depth).parent
+                    except SyntaxError:
+                        self._handle_error("Cannot compute nesting level at line %s.",
+                                           NestingError, infile, cur_index)
+                        continue
+                elif cur_depth == this_section.depth:
+                    # the new section is a sibling of the current section
+                    parent = this_section.parent
+                elif cur_depth == this_section.depth + 1:
+                    # the new section is a child the current section
+                    parent = this_section
+                else:
+                    self._handle_error("Section too nested at line %s.",
+                                       NestingError, infile, cur_index)
+
+                sect_name = self._unquote(sect_name)
+                if sect_name in parent:
+                    self._handle_error('Duplicate section name at line %s.',
+                                       DuplicateError, infile, cur_index)
+                    continue
+
+                # create the new section
+                this_section = Section(
+                    parent,
+                    cur_depth,
+                    self,
+                    name=sect_name)
+                parent[sect_name] = this_section
+                parent.inline_comments[sect_name] = comment
+                parent.comments[sect_name] = comment_list
+                continue
+            #
+            # it's not a section marker,
+            # so it should be a valid ``key = value`` line
+            mat = self._keyword.match(line)
+            if mat is None:
+                # it neither matched as a keyword
+                # or a section marker
+                self._handle_error(
+                    'Invalid line at line "%s".',
+                    ParseError, infile, cur_index)
+            else:
+                # is a keyword value
+                # value will include any inline comment
+                (indent, key, value) = mat.groups()
+                if indent and (self.indent_type is None):
+                    self.indent_type = indent
+                # check for a multiline value
+                if value[:3] in ['"""', "'''"]:
+                    try:
+                        value, comment, cur_index = self._multiline(
+                            value, infile, cur_index, maxline)
+                    except SyntaxError:
+                        self._handle_error(
+                            'Parse error in value at line %s.',
+                            ParseError, infile, cur_index)
+                        continue
+                    else:
+                        if self.unrepr:
+                            comment = ''
+                            try:
+                                value = unrepr(value)
+                            except Exception, e:
+                                if type(e) == UnknownType:
+                                    msg = 'Unknown name or type in value at line %s.'
+                                else:
+                                    msg = 'Parse error in value at line %s.'
+                                self._handle_error(msg, UnreprError, infile,
+                                    cur_index)
+                                continue
+                else:
+                    if self.unrepr:
+                        comment = ''
+                        try:
+                            value = unrepr(value)
+                        except Exception, e:
+                            if isinstance(e, UnknownType):
+                                msg = 'Unknown name or type in value at line %s.'
+                            else:
+                                msg = 'Parse error in value at line %s.'
+                            self._handle_error(msg, UnreprError, infile,
+                                cur_index)
+                            continue
+                    else:
+                        # extract comment and lists
+                        try:
+                            (value, comment) = self._handle_value(value)
+                        except SyntaxError:
+                            self._handle_error(
+                                'Parse error in value at line %s.',
+                                ParseError, infile, cur_index)
+                            continue
+                #
+                key = self._unquote(key)
+                if key in this_section:
+                    self._handle_error(
+                        'Duplicate keyword name at line %s.',
+                        DuplicateError, infile, cur_index)
+                    continue
+                # add the key.
+                # we set unrepr because if we have got this far we will never
+                # be creating a new section
+                this_section.__setitem__(key, value, unrepr=True)
+                this_section.inline_comments[key] = comment
+                this_section.comments[key] = comment_list
+                continue
+        #
+        if self.indent_type is None:
+            # no indentation used, set the type accordingly
+            self.indent_type = ''
+
+        # preserve the final comment
+        if not self and not self.initial_comment:
+            self.initial_comment = comment_list
+        elif not reset_comment:
+            self.final_comment = comment_list
+        self.list_values = temp_list_values
+
+
+    def _match_depth(self, sect, depth):
+        """
+        Given a section and a depth level, walk back through the sections
+        parents to see if the depth level matches a previous section.
+
+        Return a reference to the right section,
+        or raise a SyntaxError.
+        """
+        while depth < sect.depth:
+            if sect is sect.parent:
+                # we've reached the top level already
+                raise SyntaxError()
+            sect = sect.parent
+        if sect.depth == depth:
+            return sect
+        # shouldn't get here
+        raise SyntaxError()
+
+
+    def _handle_error(self, text, ErrorClass, infile, cur_index):
+        """
+        Handle an error according to the error settings.
+
+        Either raise the error or store it.
+        The error will have occured at ``cur_index``
+        """
+        line = infile[cur_index]
+        cur_index += 1
+        message = text % cur_index
+        error = ErrorClass(message, cur_index, line)
+        if self.raise_errors:
+            # raise the error - parsing stops here
+            raise error
+        # store the error
+        # reraise when parsing has finished
+        self._errors.append(error)
+
+
+    def _unquote(self, value):
+        """Return an unquoted version of a value"""
+        if not value:
+            # should only happen during parsing of lists
+            raise SyntaxError
+        if (value[0] == value[-1]) and (value[0] in ('"', "'")):
+            value = value[1:-1]
+        return value
+
+
+    def _quote(self, value, multiline=True):
+        """
+        Return a safely quoted version of a value.
+
+        Raise a ConfigObjError if the value cannot be safely quoted.
+        If multiline is ``True`` (default) then use triple quotes
+        if necessary.
+
+        * Don't quote values that don't need it.
+        * Recursively quote members of a list and return a comma joined list.
+        * Multiline is ``False`` for lists.
+        * Obey list syntax for empty and single member lists.
+
+        If ``list_values=False`` then the value is only quoted if it contains
+        a ``\\n`` (is multiline) or '#'.
+
+        If ``write_empty_values`` is set, and the value is an empty string, it
+        won't be quoted.
+        """
+        if multiline and self.write_empty_values and value == '':
+            # Only if multiline is set, so that it is used for values not
+            # keys, and not values that are part of a list
+            return ''
+
+        if multiline and isinstance(value, (list, tuple)):
+            if not value:
+                return ','
+            elif len(value) == 1:
+                return self._quote(value[0], multiline=False) + ','
+            return ', '.join([self._quote(val, multiline=False)
+                for val in value])
+        if not isinstance(value, basestring):
+            if self.stringify:
+                value = str(value)
+            else:
+                raise TypeError('Value "%s" is not a string.' % value)
+
+        if not value:
+            return '""'
+
+        no_lists_no_quotes = not self.list_values and '\n' not in value and '#' not in value
+        need_triple = multiline and ((("'" in value) and ('"' in value)) or ('\n' in value ))
+        hash_triple_quote = multiline and not need_triple and ("'" in value) and ('"' in value) and ('#' in value)
+        check_for_single = (no_lists_no_quotes or not need_triple) and not hash_triple_quote
+
+        if check_for_single:
+            if not self.list_values:
+                # we don't quote if ``list_values=False``
+                quot = noquot
+            # for normal values either single or double quotes will do
+            elif '\n' in value:
+                # will only happen if multiline is off - e.g. '\n' in key
+                raise ConfigObjError('Value "%s" cannot be safely quoted.' % value)
+            elif ((value[0] not in wspace_plus) and
+                    (value[-1] not in wspace_plus) and
+                    (',' not in value)):
+                quot = noquot
+            else:
+                quot = self._get_single_quote(value)
+        else:
+            # if value has '\n' or "'" *and* '"', it will need triple quotes
+            quot = self._get_triple_quote(value)
+
+        if quot == noquot and '#' in value and self.list_values:
+            quot = self._get_single_quote(value)
+
+        return quot % value
+
+
+    def _get_single_quote(self, value):
+        if ("'" in value) and ('"' in value):
+            raise ConfigObjError('Value "%s" cannot be safely quoted.' % value)
+        elif '"' in value:
+            quot = squot
+        else:
+            quot = dquot
+        return quot
+
+
+    def _get_triple_quote(self, value):
+        if (value.find('"""') != -1) and (value.find("'''") != -1):
+            raise ConfigObjError('Value "%s" cannot be safely quoted.' % value)
+        if value.find('"""') == -1:
+            quot = tdquot
+        else:
+            quot = tsquot
+        return quot
+
+
+    def _handle_value(self, value):
+        """
+        Given a value string, unquote, remove comment,
+        handle lists. (including empty and single member lists)
+        """
+        if self._inspec:
+            # Parsing a configspec so don't handle comments
+            return (value, '')
+        # do we look for lists in values ?
+        if not self.list_values:
+            mat = self._nolistvalue.match(value)
+            if mat is None:
+                raise SyntaxError()
+            # NOTE: we don't unquote here
+            return mat.groups()
+        #
+        mat = self._valueexp.match(value)
+        if mat is None:
+            # the value is badly constructed, probably badly quoted,
+            # or an invalid list
+            raise SyntaxError()
+        (list_values, single, empty_list, comment) = mat.groups()
+        if (list_values == '') and (single is None):
+            # change this if you want to accept empty values
+            raise SyntaxError()
+        # NOTE: note there is no error handling from here if the regex
+        # is wrong: then incorrect values will slip through
+        if empty_list is not None:
+            # the single comma - meaning an empty list
+            return ([], comment)
+        if single is not None:
+            # handle empty values
+            if list_values and not single:
+                # FIXME: the '' is a workaround because our regex now matches
+                #   '' at the end of a list if it has a trailing comma
+                single = None
+            else:
+                single = single or '""'
+                single = self._unquote(single)
+        if list_values == '':
+            # not a list value
+            return (single, comment)
+        the_list = self._listvalueexp.findall(list_values)
+        the_list = [self._unquote(val) for val in the_list]
+        if single is not None:
+            the_list += [single]
+        return (the_list, comment)
+
+
+    def _multiline(self, value, infile, cur_index, maxline):
+        """Extract the value, where we are in a multiline situation."""
+        quot = value[:3]
+        newvalue = value[3:]
+        single_line = self._triple_quote[quot][0]
+        multi_line = self._triple_quote[quot][1]
+        mat = single_line.match(value)
+        if mat is not None:
+            retval = list(mat.groups())
+            retval.append(cur_index)
+            return retval
+        elif newvalue.find(quot) != -1:
+            # somehow the triple quote is missing
+            raise SyntaxError()
+        #
+        while cur_index < maxline:
+            cur_index += 1
+            newvalue += '\n'
+            line = infile[cur_index]
+            if line.find(quot) == -1:
+                newvalue += line
+            else:
+                # end of multiline, process it
+                break
+        else:
+            # we've got to the end of the config, oops...
+            raise SyntaxError()
+        mat = multi_line.match(line)
+        if mat is None:
+            # a badly formed line
+            raise SyntaxError()
+        (value, comment) = mat.groups()
+        return (newvalue + value, comment, cur_index)
+
+
+    def _handle_configspec(self, configspec):
+        """Parse the configspec."""
+        # FIXME: Should we check that the configspec was created with the
+        #        correct settings ? (i.e. ``list_values=False``)
+        if not isinstance(configspec, ConfigObj):
+            try:
+                configspec = ConfigObj(configspec,
+                                       raise_errors=True,
+                                       file_error=True,
+                                       _inspec=True)
+            except ConfigObjError, e:
+                # FIXME: Should these errors have a reference
+                #        to the already parsed ConfigObj ?
+                raise ConfigspecError('Parsing configspec failed: %s' % e)
+            except IOError, e:
+                raise IOError('Reading configspec failed: %s' % e)
+
+        self.configspec = configspec
+
+
+
+    def _set_configspec(self, section, copy):
+        """
+        Called by validate. Handles setting the configspec on subsections
+        including sections to be validated by __many__
+        """
+        configspec = section.configspec
+        many = configspec.get('__many__')
+        if isinstance(many, dict):
+            for entry in section.sections:
+                if entry not in configspec:
+                    section[entry].configspec = many
+
+        for entry in configspec.sections:
+            if entry == '__many__':
+                continue
+            if entry not in section:
+                section[entry] = {}
+                section[entry]._created = True
+                if copy:
+                    # copy comments
+                    section.comments[entry] = configspec.comments.get(entry, [])
+                    section.inline_comments[entry] = configspec.inline_comments.get(entry, '')
+
+            # Could be a scalar when we expect a section
+            if isinstance(section[entry], Section):
+                section[entry].configspec = configspec[entry]
+
+
+    def _write_line(self, indent_string, entry, this_entry, comment):
+        """Write an individual line, for the write method"""
+        # NOTE: the calls to self._quote here handles non-StringType values.
+        if not self.unrepr:
+            val = self._decode_element(self._quote(this_entry))
+        else:
+            val = repr(this_entry)
+        return '%s%s%s%s%s' % (indent_string,
+                               self._decode_element(self._quote(entry, multiline=False)),
+                               self._a_to_u(' = '),
+                               val,
+                               self._decode_element(comment))
+
+
+    def _write_marker(self, indent_string, depth, entry, comment):
+        """Write a section marker line"""
+        return '%s%s%s%s%s' % (indent_string,
+                               self._a_to_u('[' * depth),
+                               self._quote(self._decode_element(entry), multiline=False),
+                               self._a_to_u(']' * depth),
+                               self._decode_element(comment))
+
+
+    def _handle_comment(self, comment):
+        """Deal with a comment."""
+        if not comment:
+            return ''
+        start = self.indent_type
+        if not comment.startswith('#'):
+            start += self._a_to_u(' # ')
+        return (start + comment)
+
+
+    # Public methods
+
+    def write(self, outfile=None, section=None):
+        """
+        Write the current ConfigObj as a file
+
+        tekNico: FIXME: use StringIO instead of real files
+
+        >>> filename = a.filename
+        >>> a.filename = 'test.ini'
+        >>> a.write()
+        >>> a.filename = filename
+        >>> a == ConfigObj('test.ini', raise_errors=True)
+        1
+        >>> import os
+        >>> os.remove('test.ini')
+        """
+        if self.indent_type is None:
+            # this can be true if initialised from a dictionary
+            self.indent_type = DEFAULT_INDENT_TYPE
+
+        out = []
+        cs = self._a_to_u('#')
+        csp = self._a_to_u('# ')
+        if section is None:
+            int_val = self.interpolation
+            self.interpolation = False
+            section = self
+            for line in self.initial_comment:
+                line = self._decode_element(line)
+                stripped_line = line.strip()
+                if stripped_line and not stripped_line.startswith(cs):
+                    line = csp + line
+                out.append(line)
+
+        indent_string = self.indent_type * section.depth
+        for entry in (section.scalars + section.sections):
+            if entry in section.defaults:
+                # don't write out default values
+                continue
+            for comment_line in section.comments[entry]:
+                comment_line = self._decode_element(comment_line.lstrip())
+                if comment_line and not comment_line.startswith(cs):
+                    comment_line = csp + comment_line
+                out.append(indent_string + comment_line)
+            this_entry = section[entry]
+            comment = self._handle_comment(section.inline_comments[entry])
+
+            if isinstance(this_entry, dict):
+                # a section
+                out.append(self._write_marker(
+                    indent_string,
+                    this_entry.depth,
+                    entry,
+                    comment))
+                out.extend(self.write(section=this_entry))
+            else:
+                out.append(self._write_line(
+                    indent_string,
+                    entry,
+                    this_entry,
+                    comment))
+
+        if section is self:
+            for line in self.final_comment:
+                line = self._decode_element(line)
+                stripped_line = line.strip()
+                if stripped_line and not stripped_line.startswith(cs):
+                    line = csp + line
+                out.append(line)
+            self.interpolation = int_val
+
+        if section is not self:
+            return out
+
+        if (self.filename is None) and (outfile is None):
+            # output a list of lines
+            # might need to encode
+            # NOTE: This will *screw* UTF16, each line will start with the BOM
+            if self.encoding:
+                out = [l.encode(self.encoding) for l in out]
+            if (self.BOM and ((self.encoding is None) or
+                (BOM_LIST.get(self.encoding.lower()) == 'utf_8'))):
+                # Add the UTF8 BOM
+                if not out:
+                    out.append('')
+                out[0] = BOM_UTF8 + out[0]
+            return out
+
+        # Turn the list to a string, joined with correct newlines
+        newline = self.newlines or os.linesep
+        if (getattr(outfile, 'mode', None) is not None and outfile.mode == 'w'
+            and sys.platform == 'win32' and newline == '\r\n'):
+            # Windows specific hack to avoid writing '\r\r\n'
+            newline = '\n'
+        output = self._a_to_u(newline).join(out)
+        if self.encoding:
+            output = output.encode(self.encoding)
+        if self.BOM and ((self.encoding is None) or match_utf8(self.encoding)):
+            # Add the UTF8 BOM
+            output = BOM_UTF8 + output
+
+        if not output.endswith(newline):
+            output += newline
+        if outfile is not None:
+            outfile.write(output)
+        else:
+            h = open(self.filename, 'wb')
+            h.write(output)
+            h.close()
+
+
+    def validate(self, validator, preserve_errors=False, copy=False,
+                 section=None):
+        """
+        Test the ConfigObj against a configspec.
+
+        It uses the ``validator`` object from *validate.py*.
+
+        To run ``validate`` on the current ConfigObj, call: ::
+
+            test = config.validate(validator)
+
+        (Normally having previously passed in the configspec when the ConfigObj
+        was created - you can dynamically assign a dictionary of checks to the
+        ``configspec`` attribute of a section though).
+
+        It returns ``True`` if everything passes, or a dictionary of
+        pass/fails (True/False). If every member of a subsection passes, it
+        will just have the value ``True``. (It also returns ``False`` if all
+        members fail).
+
+        In addition, it converts the values from strings to their native
+        types if their checks pass (and ``stringify`` is set).
+
+        If ``preserve_errors`` is ``True`` (``False`` is default) then instead
+        of a marking a fail with a ``False``, it will preserve the actual
+        exception object. This can contain info about the reason for failure.
+        For example the ``VdtValueTooSmallError`` indicates that the value
+        supplied was too small. If a value (or section) is missing it will
+        still be marked as ``False``.
+
+        You must have the validate module to use ``preserve_errors=True``.
+
+        You can then use the ``flatten_errors`` function to turn your nested
+        results dictionary into a flattened list of failures - useful for
+        displaying meaningful error messages.
+        """
+        if section is None:
+            if self.configspec is None:
+                raise ValueError('No configspec supplied.')
+            if preserve_errors:
+                # We do this once to remove a top level dependency on the validate module
+                # Which makes importing configobj faster
+                from validate import VdtMissingValue
+                self._vdtMissingValue = VdtMissingValue
+
+            section = self
+
+            if copy:
+                section.initial_comment = section.configspec.initial_comment
+                section.final_comment = section.configspec.final_comment
+                section.encoding = section.configspec.encoding
+                section.BOM = section.configspec.BOM
+                section.newlines = section.configspec.newlines
+                section.indent_type = section.configspec.indent_type
+
+        #
+        # section.default_values.clear() #??
+        configspec = section.configspec
+        self._set_configspec(section, copy)
+
+
+        def validate_entry(entry, spec, val, missing, ret_true, ret_false):
+            section.default_values.pop(entry, None)
+
+            try:
+                section.default_values[entry] = validator.get_default_value(configspec[entry])
+            except (KeyError, AttributeError, validator.baseErrorClass):
+                # No default, bad default or validator has no 'get_default_value'
+                # (e.g. SimpleVal)
+                pass
+
+            try:
+                check = validator.check(spec,
+                                        val,
+                                        missing=missing
+                                        )
+            except validator.baseErrorClass, e:
+                if not preserve_errors or isinstance(e, self._vdtMissingValue):
+                    out[entry] = False
+                else:
+                    # preserve the error
+                    out[entry] = e
+                    ret_false = False
+                ret_true = False
+            else:
+                ret_false = False
+                out[entry] = True
+                if self.stringify or missing:
+                    # if we are doing type conversion
+                    # or the value is a supplied default
+                    if not self.stringify:
+                        if isinstance(check, (list, tuple)):
+                            # preserve lists
+                            check = [self._str(item) for item in check]
+                        elif missing and check is None:
+                            # convert the None from a default to a ''
+                            check = ''
+                        else:
+                            check = self._str(check)
+                    if (check != val) or missing:
+                        section[entry] = check
+                if not copy and missing and entry not in section.defaults:
+                    section.defaults.append(entry)
+            return ret_true, ret_false
+
+        #
+        out = {}
+        ret_true = True
+        ret_false = True
+
+        unvalidated = [k for k in section.scalars if k not in configspec]
+        incorrect_sections = [k for k in configspec.sections if k in section.scalars]
+        incorrect_scalars = [k for k in configspec.scalars if k in section.sections]
+
+        for entry in configspec.scalars:
+            if entry in ('__many__', '___many___'):
+                # reserved names
+                continue
+            if (not entry in section.scalars) or (entry in section.defaults):
+                # missing entries
+                # or entries from defaults
+                missing = True
+                val = None
+                if copy and entry not in section.scalars:
+                    # copy comments
+                    section.comments[entry] = (
+                        configspec.comments.get(entry, []))
+                    section.inline_comments[entry] = (
+                        configspec.inline_comments.get(entry, ''))
+                #
+            else:
+                missing = False
+                val = section[entry]
+
+            ret_true, ret_false = validate_entry(entry, configspec[entry], val,
+                                                 missing, ret_true, ret_false)
+
+        many = None
+        if '__many__' in configspec.scalars:
+            many = configspec['__many__']
+        elif '___many___' in configspec.scalars:
+            many = configspec['___many___']
+
+        if many is not None:
+            for entry in unvalidated:
+                val = section[entry]
+                ret_true, ret_false = validate_entry(entry, many, val, False,
+                                                     ret_true, ret_false)
+            unvalidated = []
+
+        for entry in incorrect_scalars:
+            ret_true = False
+            if not preserve_errors:
+                out[entry] = False
+            else:
+                ret_false = False
+                msg = 'Value %r was provided as a section' % entry
+                out[entry] = validator.baseErrorClass(msg)
+        for entry in incorrect_sections:
+            ret_true = False
+            if not preserve_errors:
+                out[entry] = False
+            else:
+                ret_false = False
+                msg = 'Section %r was provided as a single value' % entry
+                out[entry] = validator.baseErrorClass(msg)
+
+        # Missing sections will have been created as empty ones when the
+        # configspec was read.
+        for entry in section.sections:
+            # FIXME: this means DEFAULT is not copied in copy mode
+            if section is self and entry == 'DEFAULT':
+                continue
+            if section[entry].configspec is None:
+                unvalidated.append(entry)
+                continue
+            if copy:
+                section.comments[entry] = configspec.comments.get(entry, [])
+                section.inline_comments[entry] = configspec.inline_comments.get(entry, '')
+            check = self.validate(validator, preserve_errors=preserve_errors, copy=copy, section=section[entry])
+            out[entry] = check
+            if check == False:
+                ret_true = False
+            elif check == True:
+                ret_false = False
+            else:
+                ret_true = False
+
+        section.extra_values = unvalidated
+        if preserve_errors and not section._created:
+            # If the section wasn't created (i.e. it wasn't missing)
+            # then we can't return False, we need to preserve errors
+            ret_false = False
+        #
+        if ret_false and preserve_errors and out:
+            # If we are preserving errors, but all
+            # the failures are from missing sections / values
+            # then we can return False. Otherwise there is a
+            # real failure that we need to preserve.
+            ret_false = not any(out.values())
+        if ret_true:
+            return True
+        elif ret_false:
+            return False
+        return out
+
+
+    def reset(self):
+        """Clear ConfigObj instance and restore to 'freshly created' state."""
+        self.clear()
+        self._initialise()
+        # FIXME: Should be done by '_initialise', but ConfigObj constructor (and reload)
+        #        requires an empty dictionary
+        self.configspec = None
+        # Just to be sure ;-)
+        self._original_configspec = None
+
+
+    def reload(self):
+        """
+        Reload a ConfigObj from file.
+
+        This method raises a ``ReloadError`` if the ConfigObj doesn't have
+        a filename attribute pointing to a file.
+        """
+        if not isinstance(self.filename, basestring):
+            raise ReloadError()
+
+        filename = self.filename
+        current_options = {}
+        for entry in OPTION_DEFAULTS:
+            if entry == 'configspec':
+                continue
+            current_options[entry] = getattr(self, entry)
+
+        configspec = self._original_configspec
+        current_options['configspec'] = configspec
+
+        self.clear()
+        self._initialise(current_options)
+        self._load(filename, configspec)
+
+
+
+class SimpleVal(object):
+    """
+    A simple validator.
+    Can be used to check that all members expected are present.
+
+    To use it, provide a configspec with all your members in (the value given
+    will be ignored). Pass an instance of ``SimpleVal`` to the ``validate``
+    method of your ``ConfigObj``. ``validate`` will return ``True`` if all
+    members are present, or a dictionary with True/False meaning
+    present/missing. (Whole missing sections will be replaced with ``False``)
+    """
+
+    def __init__(self):
+        self.baseErrorClass = ConfigObjError
+
+    def check(self, check, member, missing=False):
+        """A dummy check method, always returns the value unchanged."""
+        if missing:
+            raise self.baseErrorClass()
+        return member
+
+
+def flatten_errors(cfg, res, levels=None, results=None):
+    """
+    An example function that will turn a nested dictionary of results
+    (as returned by ``ConfigObj.validate``) into a flat list.
+
+    ``cfg`` is the ConfigObj instance being checked, ``res`` is the results
+    dictionary returned by ``validate``.
+
+    (This is a recursive function, so you shouldn't use the ``levels`` or
+    ``results`` arguments - they are used by the function.)
+
+    Returns a list of keys that failed. Each member of the list is a tuple::
+
+        ([list of sections...], key, result)
+
+    If ``validate`` was called with ``preserve_errors=False`` (the default)
+    then ``result`` will always be ``False``.
+
+    *list of sections* is a flattened list of sections that the key was found
+    in.
+
+    If the section was missing (or a section was expected and a scalar provided
+    - or vice-versa) then key will be ``None``.
+
+    If the value (or section) was missing then ``result`` will be ``False``.
+
+    If ``validate`` was called with ``preserve_errors=True`` and a value
+    was present, but failed the check, then ``result`` will be the exception
+    object returned. You can use this as a string that describes the failure.
+
+    For example *The value "3" is of the wrong type*.
+    """
+    if levels is None:
+        # first time called
+        levels = []
+        results = []
+    if res == True:
+        return results
+    if res == False or isinstance(res, Exception):
+        results.append((levels[:], None, res))
+        if levels:
+            levels.pop()
+        return results
+    for (key, val) in res.items():
+        if val == True:
+            continue
+        if isinstance(cfg.get(key), dict):
+            # Go down one level
+            levels.append(key)
+            flatten_errors(cfg[key], val, levels, results)
+            continue
+        results.append((levels[:], key, val))
+    #
+    # Go up one level
+    if levels:
+        levels.pop()
+    #
+    return results
+
+
+def get_extra_values(conf, _prepend=()):
+    """
+    Find all the values and sections not in the configspec from a validated
+    ConfigObj.
+
+    ``get_extra_values`` returns a list of tuples where each tuple represents
+    either an extra section, or an extra value.
+
+    The tuples contain two values, a tuple representing the section the value
+    is in and the name of the extra values. For extra values in the top level
+    section the first member will be an empty tuple. For values in the 'foo'
+    section the first member will be ``('foo',)``. For members in the 'bar'
+    subsection of the 'foo' section the first member will be ``('foo', 'bar')``.
+
+    NOTE: If you call ``get_extra_values`` on a ConfigObj instance that hasn't
+    been validated it will return an empty list.
+    """
+    out = []
+
+    out.extend([(_prepend, name) for name in conf.extra_values])
+    for name in conf.sections:
+        if name not in conf.extra_values:
+            out.extend(get_extra_values(conf[name], _prepend + (name,)))
+    return out
+
+
+"""*A programming language is a medium of expression.* - Paul Graham"""
diff --git a/lib/configobj/__init__.py b/lib/configobj/__init__.py
deleted file mode 100644
index 928c2083..00000000
--- a/lib/configobj/__init__.py
+++ /dev/null
@@ -1,2453 +0,0 @@
-# configobj.py
-# -*- coding: utf-8 -*-
-# pylint: disable=bad-continuation
-
-"""A config file reader/writer that supports nested sections in config files."""
-
-# Copyright (C) 2005-2014:
-# (name) : (email)
-# Michael Foord: fuzzyman AT voidspace DOT org DOT uk
-# Nicola Larosa: nico AT tekNico DOT net
-# Rob Dennis: rdennis AT gmail DOT com
-# Eli Courtwright: eli AT courtwright DOT org
-
-# This software is licensed under the terms of the BSD license.
-# http://opensource.org/licenses/BSD-3-Clause
-
-# ConfigObj 5 - main repository for documentation and issue tracking:
-# https://github.com/DiffSK/configobj
-
-import os
-import re
-import sys
-import copy
-
-from codecs import BOM_UTF8, BOM_UTF16, BOM_UTF16_BE, BOM_UTF16_LE
-
-try:
-    # Python 3
-    from collections.abc import Mapping
-except ImportError:
-    # Python 2.7
-    from collections import Mapping
-
-import six
-from ._version import __version__
-
-# imported lazily to avoid startup performance hit if it isn't used
-compiler = None
-
-# A dictionary mapping BOM to
-# the encoding to decode with, and what to set the
-# encoding attribute to.
-BOMS = {
-    BOM_UTF8: ('utf_8', None),
-    BOM_UTF16_BE: ('utf16_be', 'utf_16'),
-    BOM_UTF16_LE: ('utf16_le', 'utf_16'),
-    BOM_UTF16: ('utf_16', 'utf_16'),
-    }
-# All legal variants of the BOM codecs.
-# TODO: the list of aliases is not meant to be exhaustive, is there a
-#   better way ?
-BOM_LIST = {
-    'utf_16': 'utf_16',
-    'u16': 'utf_16',
-    'utf16': 'utf_16',
-    'utf-16': 'utf_16',
-    'utf16_be': 'utf16_be',
-    'utf_16_be': 'utf16_be',
-    'utf-16be': 'utf16_be',
-    'utf16_le': 'utf16_le',
-    'utf_16_le': 'utf16_le',
-    'utf-16le': 'utf16_le',
-    'utf_8': 'utf_8',
-    'u8': 'utf_8',
-    'utf': 'utf_8',
-    'utf8': 'utf_8',
-    'utf-8': 'utf_8',
-    }
-
-# Map of encodings to the BOM to write.
-BOM_SET = {
-    'utf_8': BOM_UTF8,
-    'utf_16': BOM_UTF16,
-    'utf16_be': BOM_UTF16_BE,
-    'utf16_le': BOM_UTF16_LE,
-    None: BOM_UTF8
-    }
-
-
-def match_utf8(encoding):
-    return BOM_LIST.get(encoding.lower()) == 'utf_8'
-
-
-# Quote strings used for writing values
-squot = "'%s'"
-dquot = '"%s"'
-noquot = "%s"
-wspace_plus = ' \r\n\v\t\'"'
-tsquot = '"""%s"""'
-tdquot = "'''%s'''"
-
-# Sentinel for use in getattr calls to replace hasattr
-MISSING = object()
-
-__all__ = (
-    'DEFAULT_INDENT_TYPE',
-    'DEFAULT_INTERPOLATION',
-    'ConfigObjError',
-    'NestingError',
-    'ParseError',
-    'DuplicateError',
-    'ConfigspecError',
-    'ConfigObj',
-    'SimpleVal',
-    'InterpolationError',
-    'InterpolationLoopError',
-    'MissingInterpolationOption',
-    'RepeatSectionError',
-    'ReloadError',
-    'UnreprError',
-    'UnknownType',
-    'flatten_errors',
-    'get_extra_values'
-)
-
-DEFAULT_INTERPOLATION = 'configparser'
-DEFAULT_INDENT_TYPE = '    '
-MAX_INTERPOL_DEPTH = 10
-
-OPTION_DEFAULTS = {
-    'interpolation': True,
-    'raise_errors': False,
-    'list_values': True,
-    'create_empty': False,
-    'file_error': False,
-    'configspec': None,
-    'stringify': True,
-    # option may be set to one of ('', ' ', '\t')
-    'indent_type': None,
-    'encoding': None,
-    'default_encoding': None,
-    'unrepr': False,
-    'write_empty_values': False,
-}
-
-# this could be replaced if six is used for compatibility, or there are no
-# more assertions about items being a string
-
-
-def getObj(s):
-    global compiler
-    if compiler is None:
-        import compiler
-    s = "a=" + s
-    p = compiler.parse(s)
-    return p.getChildren()[1].getChildren()[0].getChildren()[1]
-
-
-class UnknownType(Exception):
-    pass
-
-
-def unrepr(s):
-    if not s:
-        return s
-
-    # this is supposed to be safe
-    import ast
-    return ast.literal_eval(s)
-
-
-class ConfigObjError(SyntaxError):
-    """
-    This is the base class for all errors that ConfigObj raises.
-    It is a subclass of SyntaxError.
-    """
-    def __init__(self, message='', line_number=None, line=''):
-        self.line = line
-        self.line_number = line_number
-        SyntaxError.__init__(self, message)
-
-
-class NestingError(ConfigObjError):
-    """
-    This error indicates a level of nesting that doesn't match.
-    """
-
-
-class ParseError(ConfigObjError):
-    """
-    This error indicates that a line is badly written.
-    It is neither a valid ``key = value`` line,
-    nor a valid section marker line.
-    """
-
-
-class ReloadError(IOError):
-    """
-    A 'reload' operation failed.
-    This exception is a subclass of ``IOError``.
-    """
-    def __init__(self):
-        IOError.__init__(self, 'reload failed, filename is not set.')
-
-
-class DuplicateError(ConfigObjError):
-    """
-    The keyword or section specified already exists.
-    """
-
-
-class ConfigspecError(ConfigObjError):
-    """
-    An error occured whilst parsing a configspec.
-    """
-
-
-class InterpolationError(ConfigObjError):
-    """Base class for the two interpolation errors."""
-
-
-class InterpolationLoopError(InterpolationError):
-    """Maximum interpolation depth exceeded in string interpolation."""
-
-    def __init__(self, option):
-        InterpolationError.__init__(
-            self,
-            'interpolation loop detected in value "%s".' % option)
-
-
-class RepeatSectionError(ConfigObjError):
-    """
-    This error indicates additional sections in a section with a
-    ``__many__`` (repeated) section.
-    """
-
-
-class MissingInterpolationOption(InterpolationError):
-    """A value specified for interpolation was missing."""
-    def __init__(self, option):
-        msg = 'missing option "%s" in interpolation.' % option
-        InterpolationError.__init__(self, msg)
-
-
-class UnreprError(ConfigObjError):
-    """An error parsing in unrepr mode."""
-
-
-
-class InterpolationEngine(object):
-    """
-    A helper class to help perform string interpolation.
-
-    This class is an abstract base class; its descendants perform
-    the actual work.
-    """
-
-    # compiled regexp to use in self.interpolate()
-    _KEYCRE = re.compile(r"%\(([^)]*)\)s")
-    _cookie = '%'
-
-    def __init__(self, section):
-        # the Section instance that "owns" this engine
-        self.section = section
-
-
-    def interpolate(self, key, value):
-        # short-cut
-        if not self._cookie in value:
-            return value
-
-        def recursive_interpolate(key, value, section, backtrail):
-            """The function that does the actual work.
-
-            ``value``: the string we're trying to interpolate.
-            ``section``: the section in which that string was found
-            ``backtrail``: a dict to keep track of where we've been,
-            to detect and prevent infinite recursion loops
-
-            This is similar to a depth-first-search algorithm.
-            """
-            # Have we been here already?
-            if (key, section.name) in backtrail:
-                # Yes - infinite loop detected
-                raise InterpolationLoopError(key)
-            # Place a marker on our backtrail so we won't come back here again
-            backtrail[(key, section.name)] = 1
-
-            # Now start the actual work
-            match = self._KEYCRE.search(value)
-            while match:
-                # The actual parsing of the match is implementation-dependent,
-                # so delegate to our helper function
-                k, v, s = self._parse_match(match)
-                if k is None:
-                    # That's the signal that no further interpolation is needed
-                    replacement = v
-                else:
-                    # Further interpolation may be needed to obtain final value
-                    replacement = recursive_interpolate(k, v, s, backtrail)
-                # Replace the matched string with its final value
-                start, end = match.span()
-                value = ''.join((value[:start], replacement, value[end:]))
-                new_search_start = start + len(replacement)
-                # Pick up the next interpolation key, if any, for next time
-                # through the while loop
-                match = self._KEYCRE.search(value, new_search_start)
-
-            # Now safe to come back here again; remove marker from backtrail
-            del backtrail[(key, section.name)]
-
-            return value
-
-        # Back in interpolate(), all we have to do is kick off the recursive
-        # function with appropriate starting values
-        value = recursive_interpolate(key, value, self.section, {})
-        return value
-
-
-    def _fetch(self, key):
-        """Helper function to fetch values from owning section.
-
-        Returns a 2-tuple: the value, and the section where it was found.
-        """
-        # switch off interpolation before we try and fetch anything !
-        save_interp = self.section.main.interpolation
-        self.section.main.interpolation = False
-
-        # Start at section that "owns" this InterpolationEngine
-        current_section = self.section
-        while True:
-            # try the current section first
-            val = current_section.get(key)
-            if val is not None and not isinstance(val, Section):
-                break
-            # try "DEFAULT" next
-            val = current_section.get('DEFAULT', {}).get(key)
-            if val is not None and not isinstance(val, Section):
-                break
-            # move up to parent and try again
-            # top-level's parent is itself
-            if current_section.parent is current_section:
-                # reached top level, time to give up
-                break
-            current_section = current_section.parent
-
-        # restore interpolation to previous value before returning
-        self.section.main.interpolation = save_interp
-        if val is None:
-            raise MissingInterpolationOption(key)
-        return val, current_section
-
-
-    def _parse_match(self, match):
-        """Implementation-dependent helper function.
-
-        Will be passed a match object corresponding to the interpolation
-        key we just found (e.g., "%(foo)s" or "$foo"). Should look up that
-        key in the appropriate config file section (using the ``_fetch()``
-        helper function) and return a 3-tuple: (key, value, section)
-
-        ``key`` is the name of the key we're looking for
-        ``value`` is the value found for that key
-        ``section`` is a reference to the section where it was found
-
-        ``key`` and ``section`` should be None if no further
-        interpolation should be performed on the resulting value
-        (e.g., if we interpolated "$$" and returned "$").
-        """
-        raise NotImplementedError()
-
-
-
-class ConfigParserInterpolation(InterpolationEngine):
-    """Behaves like ConfigParser."""
-    _cookie = '%'
-    _KEYCRE = re.compile(r"%\(([^)]*)\)s")
-
-    def _parse_match(self, match):
-        key = match.group(1)
-        value, section = self._fetch(key)
-        return key, value, section
-
-
-
-class TemplateInterpolation(InterpolationEngine):
-    """Behaves like string.Template."""
-    _cookie = '$'
-    _delimiter = '$'
-    _KEYCRE = re.compile(r"""
-        \$(?:
-          (?P<escaped>\$)              |   # Two $ signs
-          (?P<named>[_a-z][_a-z0-9]*)  |   # $name format
-          {(?P<braced>[^}]*)}              # ${name} format
-        )
-        """, re.IGNORECASE | re.VERBOSE)
-
-    def _parse_match(self, match):
-        # Valid name (in or out of braces): fetch value from section
-        key = match.group('named') or match.group('braced')
-        if key is not None:
-            value, section = self._fetch(key)
-            return key, value, section
-        # Escaped delimiter (e.g., $$): return single delimiter
-        if match.group('escaped') is not None:
-            # Return None for key and section to indicate it's time to stop
-            return None, self._delimiter, None
-        # Anything else: ignore completely, just return it unchanged
-        return None, match.group(), None
-
-
-interpolation_engines = {
-    'configparser': ConfigParserInterpolation,
-    'template': TemplateInterpolation,
-}
-
-
-def __newobj__(cls, *args):
-    # Hack for pickle
-    return cls.__new__(cls, *args)
-
-class Section(dict):
-    """
-    A dictionary-like object that represents a section in a config file.
-
-    It does string interpolation if the 'interpolation' attribute
-    of the 'main' object is set to True.
-
-    Interpolation is tried first from this object, then from the 'DEFAULT'
-    section of this object, next from the parent and its 'DEFAULT' section,
-    and so on until the main object is reached.
-
-    A Section will behave like an ordered dictionary - following the
-    order of the ``scalars`` and ``sections`` attributes.
-    You can use this to change the order of members.
-
-    Iteration follows the order: scalars, then sections.
-    """
-
-
-    def __setstate__(self, state):
-        dict.update(self, state[0])
-        self.__dict__.update(state[1])
-
-    def __reduce__(self):
-        state = (dict(self), self.__dict__)
-        return (__newobj__, (self.__class__,), state)
-
-
-    def __init__(self, parent, depth, main, indict=None, name=None):
-        """
-        * parent is the section above
-        * depth is the depth level of this section
-        * main is the main ConfigObj
-        * indict is a dictionary to initialise the section with
-        """
-        if indict is None:
-            indict = {}
-        dict.__init__(self)
-        # used for nesting level *and* interpolation
-        self.parent = parent
-        # used for the interpolation attribute
-        self.main = main
-        # level of nesting depth of this Section
-        self.depth = depth
-        # purely for information
-        self.name = name
-        #
-        self._initialise()
-        # we do this explicitly so that __setitem__ is used properly
-        # (rather than just passing to ``dict.__init__``)
-        for entry, value in indict.items():
-            self[entry] = value
-
-
-    def _initialise(self):
-        # the sequence of scalar values in this Section
-        self.scalars = []
-        # the sequence of sections in this Section
-        self.sections = []
-        # for comments :-)
-        self.comments = {}
-        self.inline_comments = {}
-        # the configspec
-        self.configspec = None
-        # for defaults
-        self.defaults = []
-        self.default_values = {}
-        self.extra_values = []
-        self._created = False
-
-
-    def _interpolate(self, key, value):
-        try:
-            # do we already have an interpolation engine?
-            engine = self._interpolation_engine
-        except AttributeError:
-            # not yet: first time running _interpolate(), so pick the engine
-            name = self.main.interpolation
-            if name == True:  # note that "if name:" would be incorrect here
-                # backwards-compatibility: interpolation=True means use default
-                name = DEFAULT_INTERPOLATION
-            name = name.lower()  # so that "Template", "template", etc. all work
-            class_ = interpolation_engines.get(name, None)
-            if class_ is None:
-                # invalid value for self.main.interpolation
-                self.main.interpolation = False
-                return value
-            else:
-                # save reference to engine so we don't have to do this again
-                engine = self._interpolation_engine = class_(self)
-        # let the engine do the actual work
-        return engine.interpolate(key, value)
-
-
-    def __getitem__(self, key):
-        """Fetch the item and do string interpolation."""
-        val = dict.__getitem__(self, key)
-        if self.main.interpolation:
-            if isinstance(val, six.string_types):
-                return self._interpolate(key, val)
-            if isinstance(val, list):
-                def _check(entry):
-                    if isinstance(entry, six.string_types):
-                        return self._interpolate(key, entry)
-                    return entry
-                new = [_check(entry) for entry in val]
-                if new != val:
-                    return new
-        return val
-
-
-    def __setitem__(self, key, value, unrepr=False):
-        """
-        Correctly set a value.
-
-        Making dictionary values Section instances.
-        (We have to special case 'Section' instances - which are also dicts)
-
-        Keys must be strings.
-        Values need only be strings (or lists of strings) if
-        ``main.stringify`` is set.
-
-        ``unrepr`` must be set when setting a value to a dictionary, without
-        creating a new sub-section.
-        """
-        if not isinstance(key, six.string_types):
-            raise ValueError('The key "%s" is not a string.' % key)
-
-        # add the comment
-        if key not in self.comments:
-            self.comments[key] = []
-            self.inline_comments[key] = ''
-        # remove the entry from defaults
-        if key in self.defaults:
-            self.defaults.remove(key)
-        #
-        if isinstance(value, Section):
-            if key not in self:
-                self.sections.append(key)
-            dict.__setitem__(self, key, value)
-        elif isinstance(value, Mapping) and not unrepr:
-            # First create the new depth level,
-            # then create the section
-            if key not in self:
-                self.sections.append(key)
-            new_depth = self.depth + 1
-            dict.__setitem__(
-                self,
-                key,
-                Section(
-                    self,
-                    new_depth,
-                    self.main,
-                    indict=value,
-                    name=key))
-        else:
-            if key not in self:
-                self.scalars.append(key)
-            if not self.main.stringify:
-                if isinstance(value, six.string_types):
-                    pass
-                elif isinstance(value, (list, tuple)):
-                    for entry in value:
-                        if not isinstance(entry, six.string_types):
-                            raise TypeError('Value is not a string "%s".' % entry)
-                else:
-                    raise TypeError('Value is not a string "%s".' % value)
-            dict.__setitem__(self, key, value)
-
-
-    def __delitem__(self, key):
-        """Remove items from the sequence when deleting."""
-        dict. __delitem__(self, key)
-        if key in self.scalars:
-            self.scalars.remove(key)
-        else:
-            self.sections.remove(key)
-        del self.comments[key]
-        del self.inline_comments[key]
-
-
-    def get(self, key, default=None):
-        """A version of ``get`` that doesn't bypass string interpolation."""
-        try:
-            return self[key]
-        except KeyError:
-            return default
-
-
-    def update(self, indict):
-        """
-        A version of update that uses our ``__setitem__``.
-        """
-        for entry in indict:
-            self[entry] = indict[entry]
-
-
-    def pop(self, key, default=MISSING):
-        """
-        'D.pop(k[,d]) -> v, remove specified key and return the corresponding value.
-        If key is not found, d is returned if given, otherwise KeyError is raised'
-        """
-        try:
-            val = self[key]
-        except KeyError:
-            if default is MISSING:
-                raise
-            val = default
-        else:
-            del self[key]
-        return val
-
-
-    def popitem(self):
-        """Pops the first (key,val)"""
-        sequence = (self.scalars + self.sections)
-        if not sequence:
-            raise KeyError(": 'popitem(): dictionary is empty'")
-        key = sequence[0]
-        val =  self[key]
-        del self[key]
-        return key, val
-
-
-    def clear(self):
-        """
-        A version of clear that also affects scalars/sections
-        Also clears comments and configspec.
-
-        Leaves other attributes alone :
-            depth/main/parent are not affected
-        """
-        dict.clear(self)
-        self.scalars = []
-        self.sections = []
-        self.comments = {}
-        self.inline_comments = {}
-        self.configspec = None
-        self.defaults = []
-        self.extra_values = []
-
-
-    def setdefault(self, key, default=None):
-        """A version of setdefault that sets sequence if appropriate."""
-        try:
-            return self[key]
-        except KeyError:
-            self[key] = default
-            return self[key]
-
-
-    def items(self):
-        """D.items() -> list of D's (key, value) pairs, as 2-tuples"""
-        return [(key, self[key]) for key in self.keys()]
-
-
-    def keys(self):
-        """D.keys() -> list of D's keys"""
-        return self.scalars + self.sections
-
-
-    def values(self):
-        """D.values() -> list of D's values"""
-        return [self[key] for key in self.keys()]
-
-
-    def iteritems(self):
-        """D.iteritems() -> an iterator over the (key, value) items of D"""
-        return iter(self.items())
-
-
-    def iterkeys(self):
-        """D.iterkeys() -> an iterator over the keys of D"""
-        return iter(self.keys())
-
-    __iter__ = iterkeys
-
-
-    def itervalues(self):
-        """D.itervalues() -> an iterator over the values of D"""
-        return iter(self.values())
-
-
-    def __repr__(self):
-        """x.__repr__() <==> repr(x)"""
-        def _getval(key):
-            try:
-                return self[key]
-            except MissingInterpolationOption:
-                return dict.__getitem__(self, key)
-        return '{%s}' % ', '.join([('{}: {}'.format(repr(key), repr(_getval(key))))
-            for key in (self.scalars + self.sections)])
-
-    __str__ = __repr__
-    __str__.__doc__ = "x.__str__() <==> str(x)"
-
-
-    # Extra methods - not in a normal dictionary
-
-    def dict(self):
-        """
-        Return a deepcopy of self as a dictionary.
-
-        All members that are ``Section`` instances are recursively turned to
-        ordinary dictionaries - by calling their ``dict`` method.
-
-        >>> n = a.dict()
-        >>> n == a
-        1
-        >>> n is a
-        0
-        """
-        newdict = {}
-        for entry in self:
-            this_entry = self[entry]
-            if isinstance(this_entry, Section):
-                this_entry = this_entry.dict()
-            elif isinstance(this_entry, list):
-                # create a copy rather than a reference
-                this_entry = list(this_entry)
-            elif isinstance(this_entry, tuple):
-                # create a copy rather than a reference
-                this_entry = tuple(this_entry)
-            newdict[entry] = this_entry
-        return newdict
-
-
-    def merge(self, indict, decoupled=False):
-        """
-        A recursive update - useful for merging config files.
-
-        Note: if ``decoupled`` is ``True``, then the target object (self)
-        gets its own copy of any mutable objects in the source dictionary
-        (both sections and values), paid for by more work for ``merge()``
-        and more memory usage.
-
-        >>> a = '''[section1]
-        ...     option1 = True
-        ...     [[subsection]]
-        ...     more_options = False
-        ...     # end of file'''.splitlines()
-        >>> b = '''# File is user.ini
-        ...     [section1]
-        ...     option1 = False
-        ...     # end of file'''.splitlines()
-        >>> c1 = ConfigObj(b)
-        >>> c2 = ConfigObj(a)
-        >>> c2.merge(c1)
-        >>> c2
-        ConfigObj({'section1': {'option1': 'False', 'subsection': {'more_options': 'False'}}})
-        """
-        for key, val in indict.items():
-            if decoupled:
-                val = copy.deepcopy(val)
-            if (key in self and isinstance(self[key], Mapping) and
-                                isinstance(val, Mapping)):
-                self[key].merge(val, decoupled=decoupled)
-            else:
-                self[key] = val
-
-
-    def rename(self, oldkey, newkey):
-        """
-        Change a keyname to another, without changing position in sequence.
-
-        Implemented so that transformations can be made on keys,
-        as well as on values. (used by encode and decode)
-
-        Also renames comments.
-        """
-        if oldkey in self.scalars:
-            the_list = self.scalars
-        elif oldkey in self.sections:
-            the_list = self.sections
-        else:
-            raise KeyError('Key "%s" not found.' % oldkey)
-        pos = the_list.index(oldkey)
-        #
-        val = self[oldkey]
-        dict.__delitem__(self, oldkey)
-        dict.__setitem__(self, newkey, val)
-        the_list.remove(oldkey)
-        the_list.insert(pos, newkey)
-        comm = self.comments[oldkey]
-        inline_comment = self.inline_comments[oldkey]
-        del self.comments[oldkey]
-        del self.inline_comments[oldkey]
-        self.comments[newkey] = comm
-        self.inline_comments[newkey] = inline_comment
-
-
-    def walk(self, function, raise_errors=True,
-            call_on_sections=False, **keywargs):
-        """
-        Walk every member and call a function on the keyword and value.
-
-        Return a dictionary of the return values
-
-        If the function raises an exception, raise the errror
-        unless ``raise_errors=False``, in which case set the return value to
-        ``False``.
-
-        Any unrecognised keyword arguments you pass to walk, will be pased on
-        to the function you pass in.
-
-        Note: if ``call_on_sections`` is ``True`` then - on encountering a
-        subsection, *first* the function is called for the *whole* subsection,
-        and then recurses into it's members. This means your function must be
-        able to handle strings, dictionaries and lists. This allows you
-        to change the key of subsections as well as for ordinary members. The
-        return value when called on the whole subsection has to be discarded.
-
-        See  the encode and decode methods for examples, including functions.
-
-        .. admonition:: caution
-
-            You can use ``walk`` to transform the names of members of a section
-            but you mustn't add or delete members.
-
-        >>> config = '''[XXXXsection]
-        ... XXXXkey = XXXXvalue'''.splitlines()
-        >>> cfg = ConfigObj(config)
-        >>> cfg
-        ConfigObj({'XXXXsection': {'XXXXkey': 'XXXXvalue'}})
-        >>> def transform(section, key):
-        ...     val = section[key]
-        ...     newkey = key.replace('XXXX', 'CLIENT1')
-        ...     section.rename(key, newkey)
-        ...     if isinstance(val, (tuple, list, dict)):
-        ...         pass
-        ...     else:
-        ...         val = val.replace('XXXX', 'CLIENT1')
-        ...         section[newkey] = val
-        >>> cfg.walk(transform, call_on_sections=True)
-        {'CLIENT1section': {'CLIENT1key': None}}
-        >>> cfg
-        ConfigObj({'CLIENT1section': {'CLIENT1key': 'CLIENT1value'}})
-        """
-        out = {}
-        # scalars first
-        for i in range(len(self.scalars)):
-            entry = self.scalars[i]
-            try:
-                val = function(self, entry, **keywargs)
-                # bound again in case name has changed
-                entry = self.scalars[i]
-                out[entry] = val
-            except Exception:
-                if raise_errors:
-                    raise
-                else:
-                    entry = self.scalars[i]
-                    out[entry] = False
-        # then sections
-        for i in range(len(self.sections)):
-            entry = self.sections[i]
-            if call_on_sections:
-                try:
-                    function(self, entry, **keywargs)
-                except Exception:
-                    if raise_errors:
-                        raise
-                    else:
-                        entry = self.sections[i]
-                        out[entry] = False
-                # bound again in case name has changed
-                entry = self.sections[i]
-            # previous result is discarded
-            out[entry] = self[entry].walk(
-                function,
-                raise_errors=raise_errors,
-                call_on_sections=call_on_sections,
-                **keywargs)
-        return out
-
-
-    def as_bool(self, key):
-        """
-        Accepts a key as input. The corresponding value must be a string or
-        the objects (``True`` or 1) or (``False`` or 0). We allow 0 and 1 to
-        retain compatibility with Python 2.2.
-
-        If the string is one of  ``True``, ``On``, ``Yes``, or ``1`` it returns
-        ``True``.
-
-        If the string is one of  ``False``, ``Off``, ``No``, or ``0`` it returns
-        ``False``.
-
-        ``as_bool`` is not case sensitive.
-
-        Any other input will raise a ``ValueError``.
-
-        >>> a = ConfigObj()
-        >>> a['a'] = 'fish'
-        >>> a.as_bool('a')
-        Traceback (most recent call last):
-        ValueError: Value "fish" is neither True nor False
-        >>> a['b'] = 'True'
-        >>> a.as_bool('b')
-        1
-        >>> a['b'] = 'off'
-        >>> a.as_bool('b')
-        0
-        """
-        val = self[key]
-        if val == True:
-            return True
-        elif val == False:
-            return False
-        else:
-            try:
-                if not isinstance(val, six.string_types):
-                    # TODO: Why do we raise a KeyError here?
-                    raise KeyError()
-                else:
-                    return self.main._bools[val.lower()]
-            except KeyError:
-                raise ValueError('Value "%s" is neither True nor False' % val)
-
-
-    def as_int(self, key):
-        """
-        A convenience method which coerces the specified value to an integer.
-
-        If the value is an invalid literal for ``int``, a ``ValueError`` will
-        be raised.
-
-        >>> a = ConfigObj()
-        >>> a['a'] = 'fish'
-        >>> a.as_int('a')
-        Traceback (most recent call last):
-        ValueError: invalid literal for int() with base 10: 'fish'
-        >>> a['b'] = '1'
-        >>> a.as_int('b')
-        1
-        >>> a['b'] = '3.2'
-        >>> a.as_int('b')
-        Traceback (most recent call last):
-        ValueError: invalid literal for int() with base 10: '3.2'
-        """
-        return int(self[key])
-
-
-    def as_float(self, key):
-        """
-        A convenience method which coerces the specified value to a float.
-
-        If the value is an invalid literal for ``float``, a ``ValueError`` will
-        be raised.
-
-        >>> a = ConfigObj()
-        >>> a['a'] = 'fish'
-        >>> a.as_float('a')  #doctest: +IGNORE_EXCEPTION_DETAIL
-        Traceback (most recent call last):
-        ValueError: invalid literal for float(): fish
-        >>> a['b'] = '1'
-        >>> a.as_float('b')
-        1.0
-        >>> a['b'] = '3.2'
-        >>> a.as_float('b')  #doctest: +ELLIPSIS
-        3.2...
-        """
-        return float(self[key])
-
-
-    def as_list(self, key):
-        """
-        A convenience method which fetches the specified value, guaranteeing
-        that it is a list.
-
-        >>> a = ConfigObj()
-        >>> a['a'] = 1
-        >>> a.as_list('a')
-        [1]
-        >>> a['a'] = (1,)
-        >>> a.as_list('a')
-        [1]
-        >>> a['a'] = [1]
-        >>> a.as_list('a')
-        [1]
-        """
-        result = self[key]
-        if isinstance(result, (tuple, list)):
-            return list(result)
-        return [result]
-
-
-    def restore_default(self, key):
-        """
-        Restore (and return) default value for the specified key.
-
-        This method will only work for a ConfigObj that was created
-        with a configspec and has been validated.
-
-        If there is no default value for this key, ``KeyError`` is raised.
-        """
-        default = self.default_values[key]
-        dict.__setitem__(self, key, default)
-        if key not in self.defaults:
-            self.defaults.append(key)
-        return default
-
-
-    def restore_defaults(self):
-        """
-        Recursively restore default values to all members
-        that have them.
-
-        This method will only work for a ConfigObj that was created
-        with a configspec and has been validated.
-
-        It doesn't delete or modify entries without default values.
-        """
-        for key in self.default_values:
-            self.restore_default(key)
-
-        for section in self.sections:
-            self[section].restore_defaults()
-
-
-def _get_triple_quote(value):
-    """Helper for triple-quoting round-trips."""
-    if ('"""' in value) and ("'''" in value):
-        raise ConfigObjError('Value cannot be safely quoted: {!r}'.format(value))
-
-    return tsquot if "'''" in value else tdquot
-
-
-class ConfigObj(Section):
-    """An object to read, create, and write config files."""
-
-    MAX_PARSE_ERROR_DETAILS = 5
-
-    # Override/append to this class variable for alternative comment markers
-    # TODO: also support inline comments (needs dynamic compiling of the regex below)
-    COMMENT_MARKERS = ['#']
-
-    _keyword = re.compile(r'''^ # line start
-        (\s*)                   # indentation
-        (                       # keyword
-            (?:".*?")|          # double quotes
-            (?:'.*?')|          # single quotes
-            (?:[^'"=].*?)       # no quotes
-        )
-        \s*=\s*                 # divider
-        (.*)                    # value (including list values and comments)
-        $   # line end
-        ''',
-        re.VERBOSE)
-
-    _sectionmarker = re.compile(r'''^
-        (\s*)                     # 1: indentation
-        ((?:\[\s*)+)              # 2: section marker open
-        (                         # 3: section name open
-            (?:"\s*\S.*?\s*")|    # at least one non-space with double quotes
-            (?:'\s*\S.*?\s*')|    # at least one non-space with single quotes
-            (?:[^'"\s].*?)        # at least one non-space unquoted
-        )                         # section name close
-        ((?:\s*\])+)              # 4: section marker close
-        (\s*(?:\#.*)?)?           # 5: optional comment
-        $''',
-        re.VERBOSE)
-
-    # this regexp pulls list values out as a single string
-    # or single values and comments
-    # FIXME: this regex adds a '' to the end of comma terminated lists
-    #   workaround in ``_handle_value``
-    _valueexp = re.compile(r'''^
-        (?:
-            (?:
-                (
-                    (?:
-                        (?:
-                            (?:".*?")|              # double quotes
-                            (?:'.*?')|              # single quotes
-                            (?:[^'",\#][^,\#]*?)    # unquoted
-                        )
-                        \s*,\s*                     # comma
-                    )*      # match all list items ending in a comma (if any)
-                )
-                (
-                    (?:".*?")|                      # double quotes
-                    (?:'.*?')|                      # single quotes
-                    (?:[^'",\#\s][^,]*?)|           # unquoted
-                    (?:(?<!,))                      # Empty value
-                )?          # last item in a list - or string value
-            )|
-            (,)             # alternatively a single comma - empty list
-        )
-        (\s*(?:\#.*)?)?     # optional comment
-        $''',
-        re.VERBOSE)
-
-    # use findall to get the members of a list value
-    _listvalueexp = re.compile(r'''
-        (
-            (?:".*?")|          # double quotes
-            (?:'.*?')|          # single quotes
-            (?:[^'",\#]?.*?)    # unquoted
-        )
-        \s*,\s*                 # comma
-        ''',
-        re.VERBOSE)
-
-    # this regexp is used for the value
-    # when lists are switched off
-    _nolistvalue = re.compile(r'''^
-        (
-            (?:".*?")|          # double quotes
-            (?:'.*?')|          # single quotes
-            (?:[^'"\#].*?)|     # unquoted
-            (?:)                # Empty value
-        )
-        (\s*(?:\#.*)?)?         # optional comment
-        $''',
-        re.VERBOSE)
-
-    # regexes for finding triple quoted values on one line
-    _triple_trailer = r"(\s*(?:#.*)?)?$"
-    _single_line_single = re.compile(r"^'''(.*?)'''" + _triple_trailer)
-    _single_line_double = re.compile(r'^"""(.*?)"""' + _triple_trailer)
-    _multi_line_single = re.compile(r"^(.*?)'''" + _triple_trailer)
-    _multi_line_double = re.compile(r'^(.*?)"""' + _triple_trailer)
-
-    _triple_quote = {
-        "'''": (_single_line_single, _multi_line_single),
-        '"""': (_single_line_double, _multi_line_double),
-    }
-
-    # Used by the ``istrue`` Section method
-    _bools = {
-        'yes': True, 'no': False,
-        'on': True, 'off': False,
-        '1': True, '0': False,
-        'true': True, 'false': False,
-        }
-
-
-    def __init__(self, infile=None, options=None, configspec=None, encoding=None,
-                 interpolation=True, raise_errors=False, list_values=True,
-                 create_empty=False, file_error=False, stringify=True,
-                 indent_type=None, default_encoding=None, unrepr=False,
-                 write_empty_values=False, _inspec=False):
-        """
-        Parse a config file or create a config file object.
-
-        ``ConfigObj(infile=None, configspec=None, encoding=None,
-                    interpolation=True, raise_errors=False, list_values=True,
-                    create_empty=False, file_error=False, stringify=True,
-                    indent_type=None, default_encoding=None, unrepr=False,
-                    write_empty_values=False, _inspec=False)``
-        """
-        self._inspec = _inspec
-        # init the superclass
-        Section.__init__(self, self, 0, self)
-
-        infile = infile or []
-
-        _options = {'configspec': configspec,
-                    'encoding': encoding, 'interpolation': interpolation,
-                    'raise_errors': raise_errors, 'list_values': list_values,
-                    'create_empty': create_empty, 'file_error': file_error,
-                    'stringify': stringify, 'indent_type': indent_type,
-                    'default_encoding': default_encoding, 'unrepr': unrepr,
-                    'write_empty_values': write_empty_values}
-
-        if options is None:
-            options = _options
-        else:
-            import warnings
-            warnings.warn('Passing in an options dictionary to ConfigObj() is '
-                          'deprecated. Use **options instead.',
-                          DeprecationWarning)
-
-            # TODO: check the values too.
-            for entry in options:
-                if entry not in OPTION_DEFAULTS:
-                    raise TypeError('Unrecognised option "%s".' % entry)
-            for entry, value in list(OPTION_DEFAULTS.items()):
-                if entry not in options:
-                    options[entry] = value
-                keyword_value = _options[entry]
-                if value != keyword_value:
-                    options[entry] = keyword_value
-
-        # XXXX this ignores an explicit list_values = True in combination
-        # with _inspec. The user should *never* do that anyway, but still...
-        if _inspec:
-            options['list_values'] = False
-
-        self._initialise(options)
-        configspec = options['configspec']
-        self._original_configspec = configspec
-        self._load(infile, configspec)
-
-    def _load(self, infile, configspec):
-        try:
-            infile = infile.__fspath__()
-        except AttributeError:
-            pass
-
-        if isinstance(infile, six.string_types):
-            self.filename = infile
-            if os.path.isfile(infile):
-                with open(infile, 'rb') as h:
-                    content = h.readlines() or []
-            elif self.file_error:
-                # raise an error if the file doesn't exist
-                raise IOError('Config file not found: "%s".' % self.filename)
-            else:
-                # file doesn't already exist
-                if self.create_empty:
-                    # this is a good test that the filename specified
-                    # isn't impossible - like on a non-existent device
-                    with open(infile, 'w') as h:
-                        h.write('')
-                content = []
-
-        elif isinstance(infile, (list, tuple)):
-            content = list(infile)
-
-        elif isinstance(infile, dict):
-            # initialise self
-            # the Section class handles creating subsections
-            if isinstance(infile, ConfigObj):
-                # get a copy of our ConfigObj
-                def set_section(in_section, this_section):
-                    for entry in in_section.scalars:
-                        this_section[entry] = in_section[entry]
-                    for section in in_section.sections:
-                        this_section[section] = {}
-                        set_section(in_section[section], this_section[section])
-                set_section(infile, self)
-
-            else:
-                for entry in infile:
-                    self[entry] = infile[entry]
-            del self._errors
-
-            if configspec is not None:
-                self._handle_configspec(configspec)
-            else:
-                self.configspec = None
-            return
-
-        elif getattr(infile, 'read', MISSING) is not MISSING:
-            # This supports file like objects
-            content = infile.read() or []
-            # needs splitting into lines - but needs doing *after* decoding
-            # in case it's not an 8 bit encoding
-        else:
-            raise TypeError('infile must be a path-like object, file like object, or list of lines.')
-
-        if content:
-            # don't do it for the empty ConfigObj
-            content = self._handle_bom(content)
-            # infile is now *always* a list
-            #
-            # Set the newlines attribute (first line ending it finds)
-            # and strip trailing '\n' or '\r' from lines
-            for line in content:
-                if (not line) or (line[-1] not in ('\r', '\n')):
-                    continue
-                for end in ('\r\n', '\n', '\r'):
-                    if line.endswith(end):
-                        self.newlines = end
-                        break
-                break
-
-        assert all(isinstance(line, six.string_types) for line in content), repr(content)
-        content = [line.rstrip('\r\n') for line in content]
-
-        self._parse(content)
-        # if we had any errors, now is the time to raise them
-        if self._errors:
-            if len(self._errors) > 1:
-                msg = ["Parsing failed with {} errors.".format(len(self._errors))]
-                for error in self._errors[:self.MAX_PARSE_ERROR_DETAILS]:
-                    msg.append(str(error))
-                if len(self._errors) > self.MAX_PARSE_ERROR_DETAILS:
-                    msg.append("{} more error(s)!"
-                               .format(len(self._errors) - self.MAX_PARSE_ERROR_DETAILS))
-                error = ConfigObjError('\n    '.join(msg))
-            else:
-                error = self._errors[0]
-            # set the errors attribute; it's a list of tuples:
-            # (error_type, message, line_number)
-            error.errors = self._errors
-            # set the config attribute
-            error.config = self
-            raise error
-        # delete private attributes
-        del self._errors
-
-        if configspec is None:
-            self.configspec = None
-        else:
-            self._handle_configspec(configspec)
-
-
-    def _initialise(self, options=None):
-        if options is None:
-            options = OPTION_DEFAULTS
-
-        # initialise a few variables
-        self.filename = None
-        self._errors = []
-        self.raise_errors = options['raise_errors']
-        self.interpolation = options['interpolation']
-        self.list_values = options['list_values']
-        self.create_empty = options['create_empty']
-        self.file_error = options['file_error']
-        self.stringify = options['stringify']
-        self.indent_type = options['indent_type']
-        self.encoding = options['encoding']
-        self.default_encoding = options['default_encoding']
-        self.BOM = False
-        self.newlines = None
-        self.write_empty_values = options['write_empty_values']
-        self.unrepr = options['unrepr']
-
-        self.initial_comment = []
-        self.final_comment = []
-        self.configspec = None
-
-        if self._inspec:
-            self.list_values = False
-
-        # Clear section attributes as well
-        Section._initialise(self)
-
-
-    def __repr__(self):
-        def _getval(key):
-            try:
-                return self[key]
-            except MissingInterpolationOption:
-                return dict.__getitem__(self, key)
-        return ('{}({{{}}})'.format(self.__class__.__name__,
-                ', '.join([('{}: {}'.format(repr(key), repr(_getval(key))))
-                for key in (self.scalars + self.sections)])))
-
-
-    def _handle_bom(self, infile):
-        """
-        Handle any BOM, and decode if necessary.
-
-        If an encoding is specified, that *must* be used - but the BOM should
-        still be removed (and the BOM attribute set).
-
-        (If the encoding is wrongly specified, then a BOM for an alternative
-        encoding won't be discovered or removed.)
-
-        If an encoding is not specified, UTF8 or UTF16 BOM will be detected and
-        removed. The BOM attribute will be set. UTF16 will be decoded to
-        unicode.
-
-        NOTE: This method must not be called with an empty ``infile``.
-
-        Specifying the *wrong* encoding is likely to cause a
-        ``UnicodeDecodeError``.
-
-        ``infile`` must always be returned as a list of lines, but may be
-        passed in as a single string.
-        """
-
-        if ((self.encoding is not None) and
-            (self.encoding.lower() not in BOM_LIST)):
-            # No need to check for a BOM
-            # the encoding specified doesn't have one
-            # just decode
-            return self._decode(infile, self.encoding)
-
-        if isinstance(infile, (list, tuple)):
-            line = infile[0]
-        else:
-            line = infile
-
-        if isinstance(line, six.text_type):
-            # it's already decoded and there's no need to do anything
-            # else, just use the _decode utility method to handle
-            # listifying appropriately
-            return self._decode(infile, self.encoding)
-
-        if self.encoding is not None:
-            # encoding explicitly supplied
-            # And it could have an associated BOM
-            # TODO: if encoding is just UTF16 - we ought to check for both
-            # TODO: big endian and little endian versions.
-            enc = BOM_LIST[self.encoding.lower()]
-            if enc == 'utf_16':
-                # For UTF16 we try big endian and little endian
-                for BOM, (encoding, final_encoding) in list(BOMS.items()):
-                    if not final_encoding:
-                        # skip UTF8
-                        continue
-                    if infile.startswith(BOM):
-                        ### BOM discovered
-                        ##self.BOM = True
-                        # Don't need to remove BOM
-                        return self._decode(infile, encoding)
-
-                # If we get this far, will *probably* raise a DecodeError
-                # As it doesn't appear to start with a BOM
-                return self._decode(infile, self.encoding)
-
-            # Must be UTF8
-            BOM = BOM_SET[enc]
-            if not line.startswith(BOM):
-                return self._decode(infile, self.encoding)
-
-            newline = line[len(BOM):]
-
-            # BOM removed
-            if isinstance(infile, (list, tuple)):
-                infile[0] = newline
-            else:
-                infile = newline
-            self.BOM = True
-            return self._decode(infile, self.encoding)
-
-        # No encoding specified - so we need to check for UTF8/UTF16
-        for BOM, (encoding, final_encoding) in list(BOMS.items()):
-            if not isinstance(line, six.binary_type) or not line.startswith(BOM):
-                # didn't specify a BOM, or it's not a bytestring
-                continue
-            else:
-                # BOM discovered
-                self.encoding = final_encoding
-                if not final_encoding:
-                    self.BOM = True
-                    # UTF8
-                    # remove BOM
-                    newline = line[len(BOM):]
-                    if isinstance(infile, (list, tuple)):
-                        infile[0] = newline
-                    else:
-                        infile = newline
-                    # UTF-8
-                    if isinstance(infile, six.text_type):
-                        return infile.splitlines(True)
-                    elif isinstance(infile, six.binary_type):
-                        return infile.decode('utf-8').splitlines(True)
-                    else:
-                        return self._decode(infile, 'utf-8')
-                # UTF16 - have to decode
-                return self._decode(infile, encoding)
-
-
-        if six.PY2 and isinstance(line, str):
-            # don't actually do any decoding, since we're on python 2 and
-            # returning a bytestring is fine
-            return self._decode(infile, None)
-        # No BOM discovered and no encoding specified, default to UTF-8
-        if isinstance(infile, six.binary_type):
-            return infile.decode('utf-8').splitlines(True)
-        else:
-            return self._decode(infile, 'utf-8')
-
-
-    def _decode(self, infile, encoding):
-        """
-        Decode infile to unicode. Using the specified encoding.
-
-        if is a string, it also needs converting to a list.
-        """
-        if isinstance(infile, six.binary_type):
-            # NOTE: Could raise a ``UnicodeDecodeError``
-            if encoding:
-                return infile.decode(encoding).splitlines(True)
-            else:
-                return infile.splitlines(True)
-        if isinstance(infile, six.string_types):
-            return infile.splitlines(True)
-
-        if encoding:
-            for i, line in enumerate(infile):
-                if isinstance(line, six.binary_type):
-                    # NOTE: The isinstance test here handles mixed lists of unicode/string
-                    # NOTE: But the decode will break on any non-string values
-                    # NOTE: Or could raise a ``UnicodeDecodeError``
-                    infile[i] = line.decode(encoding)
-        return infile
-
-
-    def _decode_element(self, line):
-        """Decode element to unicode if necessary."""
-        if isinstance(line, six.binary_type) and self.default_encoding:
-            return line.decode(self.default_encoding)
-        else:
-            return line
-
-
-    # TODO: this may need to be modified
-    def _str(self, value):
-        """
-        Used by ``stringify`` within validate, to turn non-string values
-        into strings.
-        """
-        if not isinstance(value, six.string_types):
-            # intentially 'str' because it's just whatever the "normal"
-            # string type is for the python version we're dealing with
-            return str(value)
-        else:
-            return value
-
-
-    def _parse(self, infile):
-        """Actually parse the config file."""
-        temp_list_values = self.list_values
-        if self.unrepr:
-            self.list_values = False
-
-        comment_list = []
-        done_start = False
-        this_section = self
-        maxline = len(infile) - 1
-        cur_index = -1
-        reset_comment = False
-        comment_markers = tuple(self.COMMENT_MARKERS)
-
-        while cur_index < maxline:
-            if reset_comment:
-                comment_list = []
-            cur_index += 1
-            line = infile[cur_index]
-            sline = line.strip()
-            # do we have anything on the line ?
-            if not sline or sline.startswith(comment_markers):
-                reset_comment = False
-                comment_list.append(line)
-                continue
-
-            if not done_start:
-                # preserve initial comment
-                self.initial_comment = comment_list
-                comment_list = []
-                done_start = True
-
-            reset_comment = True
-            # first we check if it's a section marker
-            mat = self._sectionmarker.match(line)
-            if mat is not None:
-                # is a section line
-                (indent, sect_open, sect_name, sect_close, comment) = mat.groups()
-                if indent and (self.indent_type is None):
-                    self.indent_type = indent
-                cur_depth = sect_open.count('[')
-                if cur_depth != sect_close.count(']'):
-                    self._handle_error("Cannot compute the section depth",
-                                       NestingError, infile, cur_index)
-                    continue
-
-                if cur_depth < this_section.depth:
-                    # the new section is dropping back to a previous level
-                    try:
-                        parent = self._match_depth(this_section,
-                                                   cur_depth).parent
-                    except SyntaxError:
-                        self._handle_error("Cannot compute nesting level",
-                                           NestingError, infile, cur_index)
-                        continue
-                elif cur_depth == this_section.depth:
-                    # the new section is a sibling of the current section
-                    parent = this_section.parent
-                elif cur_depth == this_section.depth + 1:
-                    # the new section is a child the current section
-                    parent = this_section
-                else:
-                    self._handle_error("Section too nested",
-                                       NestingError, infile, cur_index)
-                    continue
-
-                sect_name = self._unquote(sect_name)
-                if sect_name in parent:
-                    self._handle_error('Duplicate section name',
-                                       DuplicateError, infile, cur_index)
-                    continue
-
-                # create the new section
-                this_section = Section(
-                    parent,
-                    cur_depth,
-                    self,
-                    name=sect_name)
-                parent[sect_name] = this_section
-                parent.inline_comments[sect_name] = comment
-                parent.comments[sect_name] = comment_list
-                continue
-            #
-            # it's not a section marker,
-            # so it should be a valid ``key = value`` line
-            mat = self._keyword.match(line)
-            if mat is None:
-                self._handle_error(
-                    'Invalid line ({!r}) (matched as neither section nor keyword)'.format(line),
-                    ParseError, infile, cur_index)
-            else:
-                # is a keyword value
-                # value will include any inline comment
-                (indent, key, value) = mat.groups()
-                if indent and (self.indent_type is None):
-                    self.indent_type = indent
-                # check for a multiline value
-                if value[:3] in ['"""', "'''"]:
-                    try:
-                        value, comment, cur_index = self._multiline(
-                            value, infile, cur_index, maxline)
-                    except SyntaxError:
-                        self._handle_error(
-                            'Parse error in multiline value',
-                            ParseError, infile, cur_index)
-                        continue
-                    else:
-                        if self.unrepr:
-                            comment = ''
-                            try:
-                                value = unrepr(value)
-                            except Exception as cause:
-                                if isinstance(cause, UnknownType):
-                                    msg = 'Unknown name or type in value'
-                                else:
-                                    msg = 'Parse error from unrepr-ing multiline value'
-                                self._handle_error(msg, UnreprError, infile, cur_index)
-                                continue
-                else:
-                    if self.unrepr:
-                        comment = ''
-                        try:
-                            value = unrepr(value)
-                        except Exception as cause:
-                            if isinstance(cause, UnknownType):
-                                msg = 'Unknown name or type in value'
-                            else:
-                                msg = 'Parse error from unrepr-ing value'
-                            self._handle_error(msg, UnreprError, infile, cur_index)
-                            continue
-                    else:
-                        # extract comment and lists
-                        try:
-                            (value, comment) = self._handle_value(value)
-                        except SyntaxError:
-                            self._handle_error(
-                                'Parse error in value',
-                                ParseError, infile, cur_index)
-                            continue
-                #
-                key = self._unquote(key)
-                if key in this_section:
-                    self._handle_error(
-                        'Duplicate keyword name',
-                        DuplicateError, infile, cur_index)
-                    continue
-                # add the key.
-                # we set unrepr because if we have got this far we will never
-                # be creating a new section
-                this_section.__setitem__(key, value, unrepr=True)
-                this_section.inline_comments[key] = comment
-                this_section.comments[key] = comment_list
-                continue
-        #
-        if self.indent_type is None:
-            # no indentation used, set the type accordingly
-            self.indent_type = ''
-
-        # preserve the final comment
-        if not self and not self.initial_comment:
-            self.initial_comment = comment_list
-        elif not reset_comment:
-            self.final_comment = comment_list
-        self.list_values = temp_list_values
-
-
-    def _match_depth(self, sect, depth):
-        """
-        Given a section and a depth level, walk back through the sections
-        parents to see if the depth level matches a previous section.
-
-        Return a reference to the right section,
-        or raise a SyntaxError.
-        """
-        while depth < sect.depth:
-            if sect is sect.parent:
-                # we've reached the top level already
-                raise SyntaxError()
-            sect = sect.parent
-        if sect.depth == depth:
-            return sect
-        # shouldn't get here
-        raise SyntaxError()
-
-
-    def _handle_error(self, text, ErrorClass, infile, cur_index):
-        """
-        Handle an error according to the error settings.
-
-        Either raise the error or store it.
-        The error will have occured at ``cur_index``
-        """
-        line = infile[cur_index]
-        cur_index += 1
-        message = '{} at line {}.'.format(text, cur_index)
-        error = ErrorClass(message, cur_index, line)
-        if self.raise_errors:
-            # raise the error - parsing stops here
-            raise error
-        # store the error
-        # reraise when parsing has finished
-        self._errors.append(error)
-
-
-    def _unquote(self, value):
-        """Return an unquoted version of a value"""
-        if not value:
-            # should only happen during parsing of lists
-            raise SyntaxError
-        if (value[0] == value[-1]) and (value[0] in ('"', "'")):
-            value = value[1:-1]
-        return value
-
-
-    def _quote(self, value, multiline=True):
-        """
-        Return a safely quoted version of a value.
-
-        Raise a ConfigObjError if the value cannot be safely quoted.
-        If multiline is ``True`` (default) then use triple quotes
-        if necessary.
-
-        * Don't quote values that don't need it.
-        * Recursively quote members of a list and return a comma joined list.
-        * Multiline is ``False`` for lists.
-        * Obey list syntax for empty and single member lists.
-
-        If ``list_values=False`` then the value is only quoted if it contains
-        a ``\\n`` (is multiline) or '#'.
-
-        If ``write_empty_values`` is set, and the value is an empty string, it
-        won't be quoted.
-        """
-        if multiline and self.write_empty_values and value == '':
-            # Only if multiline is set, so that it is used for values not
-            # keys, and not values that are part of a list
-            return ''
-
-        if multiline and isinstance(value, (list, tuple)):
-            if not value:
-                return ','
-            elif len(value) == 1:
-                return self._quote(value[0], multiline=False) + ','
-            return ', '.join([self._quote(val, multiline=False)
-                for val in value])
-        if not isinstance(value, six.string_types):
-            if self.stringify:
-                # intentially 'str' because it's just whatever the "normal"
-                # string type is for the python version we're dealing with
-                value = str(value)
-            else:
-                raise TypeError('Value "%s" is not a string.' % value)
-
-        if not value:
-            return '""'
-
-        no_lists_no_quotes = not self.list_values and '\n' not in value and '#' not in value
-        need_triple = multiline and ((("'" in value) and ('"' in value)) or ('\n' in value ))
-        hash_triple_quote = multiline and not need_triple and ("'" in value) and ('"' in value) and ('#' in value)
-        check_for_single = (no_lists_no_quotes or not need_triple) and not hash_triple_quote
-
-        if check_for_single:
-            if not self.list_values:
-                # we don't quote if ``list_values=False``
-                quot = noquot
-            # for normal values either single or double quotes will do
-            elif '\n' in value:
-                # will only happen if multiline is off - e.g. '\n' in key
-                raise ConfigObjError('Value cannot be safely quoted: {!r}'.format(value))
-            elif ((value[0] not in wspace_plus) and
-                    (value[-1] not in wspace_plus) and
-                    (',' not in value)):
-                quot = noquot
-            else:
-                quot = self._get_single_quote(value)
-        else:
-            # if value has '\n' or "'" *and* '"', it will need triple quotes
-            quot = _get_triple_quote(value)
-
-        if quot == noquot and '#' in value and self.list_values:
-            quot = self._get_single_quote(value)
-
-        return quot % value
-
-
-    def _get_single_quote(self, value):
-        if ("'" in value) and ('"' in value):
-            raise ConfigObjError('Value cannot be safely quoted: {!r}'.format(value))
-        elif '"' in value:
-            quot = squot
-        else:
-            quot = dquot
-        return quot
-
-
-    def _handle_value(self, value):
-        """
-        Given a value string, unquote, remove comment,
-        handle lists. (including empty and single member lists)
-        """
-        if self._inspec:
-            # Parsing a configspec so don't handle comments
-            return (value, '')
-        # do we look for lists in values ?
-        if not self.list_values:
-            mat = self._nolistvalue.match(value)
-            if mat is None:
-                raise SyntaxError()
-            # NOTE: we don't unquote here
-            return mat.groups()
-        #
-        mat = self._valueexp.match(value)
-        if mat is None:
-            # the value is badly constructed, probably badly quoted,
-            # or an invalid list
-            raise SyntaxError()
-        (list_values, single, empty_list, comment) = mat.groups()
-        if (list_values == '') and (single is None):
-            # change this if you want to accept empty values
-            raise SyntaxError()
-        # NOTE: note there is no error handling from here if the regex
-        # is wrong: then incorrect values will slip through
-        if empty_list is not None:
-            # the single comma - meaning an empty list
-            return ([], comment)
-        if single is not None:
-            # handle empty values
-            if list_values and not single:
-                # FIXME: the '' is a workaround because our regex now matches
-                #   '' at the end of a list if it has a trailing comma
-                single = None
-            else:
-                single = single or '""'
-                single = self._unquote(single)
-        if list_values == '':
-            # not a list value
-            return (single, comment)
-        the_list = self._listvalueexp.findall(list_values)
-        the_list = [self._unquote(val) for val in the_list]
-        if single is not None:
-            the_list += [single]
-        return (the_list, comment)
-
-
-    def _multiline(self, value, infile, cur_index, maxline):
-        """Extract the value, where we are in a multiline situation."""
-        quot = value[:3]
-        newvalue = value[3:]
-        single_line = self._triple_quote[quot][0]
-        multi_line = self._triple_quote[quot][1]
-        mat = single_line.match(value)
-        if mat is not None:
-            retval = list(mat.groups())
-            retval.append(cur_index)
-            return retval
-        elif newvalue.find(quot) != -1:
-            # somehow the triple quote is missing
-            raise SyntaxError()
-        #
-        while cur_index < maxline:
-            cur_index += 1
-            newvalue += '\n'
-            line = infile[cur_index]
-            if line.find(quot) == -1:
-                newvalue += line
-            else:
-                # end of multiline, process it
-                break
-        else:
-            # we've got to the end of the config, oops...
-            raise SyntaxError()
-        mat = multi_line.match(line)
-        if mat is None:
-            # a badly formed line
-            raise SyntaxError()
-        (value, comment) = mat.groups()
-        return (newvalue + value, comment, cur_index)
-
-
-    def _handle_configspec(self, configspec):
-        """Parse the configspec."""
-        # FIXME: Should we check that the configspec was created with the
-        #        correct settings ? (i.e. ``list_values=False``)
-        if not isinstance(configspec, ConfigObj):
-            try:
-                configspec = ConfigObj(configspec,
-                                       raise_errors=True,
-                                       file_error=True,
-                                       _inspec=True)
-            except ConfigObjError as cause:
-                # FIXME: Should these errors have a reference
-                #        to the already parsed ConfigObj ?
-                raise ConfigspecError('Parsing configspec failed: %s' % cause)
-            except IOError as cause:
-                raise IOError('Reading configspec failed: %s' % cause)
-
-        self.configspec = configspec
-
-
-
-    def _set_configspec(self, section, copy):
-        """
-        Called by validate. Handles setting the configspec on subsections
-        including sections to be validated by __many__
-        """
-        configspec = section.configspec
-        many = configspec.get('__many__')
-        if isinstance(many, dict):
-            for entry in section.sections:
-                if entry not in configspec:
-                    section[entry].configspec = many
-
-        for entry in configspec.sections:
-            if entry == '__many__':
-                continue
-            if entry not in section:
-                section[entry] = {}
-                section[entry]._created = True
-                if copy:
-                    # copy comments
-                    section.comments[entry] = configspec.comments.get(entry, [])
-                    section.inline_comments[entry] = configspec.inline_comments.get(entry, '')
-
-            # Could be a scalar when we expect a section
-            if isinstance(section[entry], Section):
-                section[entry].configspec = configspec[entry]
-
-
-    def _write_line(self, indent_string, entry, this_entry, comment):
-        """Write an individual line, for the write method"""
-        # NOTE: the calls to self._quote here handles non-StringType values.
-        if not self.unrepr:
-            val = self._decode_element(self._quote(this_entry))
-        else:
-            val = repr(this_entry)
-        return '%s%s%s%s%s' % (indent_string,
-                               self._decode_element(self._quote(entry, multiline=False)),
-                               ' = ',
-                               val,
-                               self._decode_element(comment))
-
-
-    def _write_marker(self, indent_string, depth, entry, comment):
-        """Write a section marker line"""
-        entry_str = self._decode_element(entry)
-        title = self._quote(entry_str, multiline=False)
-        if entry_str and title[0] in '\'"' and title[1:-1] == entry_str:
-            # titles are in '[]' already, so quoting for contained quotes is not necessary (#74)
-            title = entry_str
-        return '%s%s%s%s%s' % (indent_string,
-                               '[' * depth,
-                               title,
-                               ']' * depth,
-                               self._decode_element(comment))
-
-
-    def _handle_comment(self, comment):
-        """Deal with a comment."""
-        if not comment.strip():
-            return comment or ''  # return trailing whitespace as-is
-        start = self.indent_type
-        if not comment.lstrip().startswith('#'):
-            start += ' # '
-        return (start + comment)
-
-
-    # Public methods
-
-    def write(self, outfile=None, section=None):
-        """
-        Write the current ConfigObj as a file
-
-        tekNico: FIXME: use StringIO instead of real files
-
-        >>> filename = a.filename
-        >>> a.filename = 'test.ini'
-        >>> a.write()
-        >>> a.filename = filename
-        >>> a == ConfigObj('test.ini', raise_errors=True)
-        1
-        >>> import os
-        >>> os.remove('test.ini')
-        """
-        if self.indent_type is None:
-            # this can be true if initialised from a dictionary
-            self.indent_type = DEFAULT_INDENT_TYPE
-
-        out = []
-        comment_markers = tuple(self.COMMENT_MARKERS)
-        comment_marker_default = comment_markers[0] + ' '
-        if section is None:
-            int_val = self.interpolation
-            self.interpolation = False
-            section = self
-            for line in self.initial_comment:
-                line = self._decode_element(line)
-                stripped_line = line.strip()
-                if stripped_line and not stripped_line.startswith(comment_markers):
-                    line = comment_marker_default + line
-                out.append(line)
-
-        indent_string = self.indent_type * section.depth
-        for entry in (section.scalars + section.sections):
-            if entry in section.defaults:
-                # don't write out default values
-                continue
-            for comment_line in section.comments[entry]:
-                comment_line = self._decode_element(comment_line.lstrip())
-                if comment_line and not comment_line.startswith(comment_markers):
-                    comment_line = comment_marker_default + comment_line
-                out.append(indent_string + comment_line)
-            this_entry = section[entry]
-            comment = self._handle_comment(section.inline_comments[entry])
-
-            if isinstance(this_entry, Section):
-                # a section
-                out.append(self._write_marker(
-                    indent_string,
-                    this_entry.depth,
-                    entry,
-                    comment))
-                out.extend(self.write(section=this_entry))
-            else:
-                out.append(self._write_line(
-                    indent_string,
-                    entry,
-                    this_entry,
-                    comment))
-
-        if section is self:
-            for line in self.final_comment:
-                line = self._decode_element(line)
-                stripped_line = line.strip()
-                if stripped_line and not stripped_line.startswith(comment_markers):
-                    line = comment_marker_default + line
-                out.append(line)
-            self.interpolation = int_val
-
-        if section is not self:
-            return out
-
-        if (self.filename is None) and (outfile is None):
-            # output a list of lines
-            # might need to encode
-            # NOTE: This will *screw* UTF16, each line will start with the BOM
-            if self.encoding:
-                out = [l.encode(self.encoding) for l in out]
-            if (self.BOM and ((self.encoding is None) or
-                (BOM_LIST.get(self.encoding.lower()) == 'utf_8'))):
-                # Add the UTF8 BOM
-                if not out:
-                    out.append('')
-                out[0] = BOM_UTF8 + out[0]
-            return out
-
-        # Turn the list to a string, joined with correct newlines
-        newline = self.newlines or os.linesep
-        if (getattr(outfile, 'mode', None) is not None and outfile.mode == 'w'
-            and sys.platform == 'win32' and newline == '\r\n'):
-            # Windows specific hack to avoid writing '\r\r\n'
-            newline = '\n'
-        output = newline.join(out)
-        if not output.endswith(newline):
-            output += newline
-
-        if isinstance(output, six.binary_type):
-            output_bytes = output
-        else:
-            output_bytes = output.encode(self.encoding or
-                                         self.default_encoding or
-                                         'ascii')
-
-        if self.BOM and ((self.encoding is None) or match_utf8(self.encoding)):
-            # Add the UTF8 BOM
-            output_bytes = BOM_UTF8 + output_bytes
-
-        if outfile is not None:
-            outfile.write(output_bytes)
-        else:
-            with open(self.filename, 'wb') as h:
-                h.write(output_bytes)
-
-    def validate(self, validator, preserve_errors=False, copy=False,
-                 section=None):
-        """
-        Test the ConfigObj against a configspec.
-
-        It uses the ``validator`` object from *validate.py*.
-
-        To run ``validate`` on the current ConfigObj, call: ::
-
-            test = config.validate(validator)
-
-        (Normally having previously passed in the configspec when the ConfigObj
-        was created - you can dynamically assign a dictionary of checks to the
-        ``configspec`` attribute of a section though).
-
-        It returns ``True`` if everything passes, or a dictionary of
-        pass/fails (True/False). If every member of a subsection passes, it
-        will just have the value ``True``. (It also returns ``False`` if all
-        members fail).
-
-        In addition, it converts the values from strings to their native
-        types if their checks pass (and ``stringify`` is set).
-
-        If ``preserve_errors`` is ``True`` (``False`` is default) then instead
-        of a marking a fail with a ``False``, it will preserve the actual
-        exception object. This can contain info about the reason for failure.
-        For example the ``VdtValueTooSmallError`` indicates that the value
-        supplied was too small. If a value (or section) is missing it will
-        still be marked as ``False``.
-
-        You must have the validate module to use ``preserve_errors=True``.
-
-        You can then use the ``flatten_errors`` function to turn your nested
-        results dictionary into a flattened list of failures - useful for
-        displaying meaningful error messages.
-        """
-        if section is None:
-            if self.configspec is None:
-                raise ValueError('No configspec supplied.')
-            if preserve_errors:
-                # We do this once to remove a top level dependency on the validate module
-                # Which makes importing configobj faster
-                from configobj.validate import VdtMissingValue
-                self._vdtMissingValue = VdtMissingValue
-
-            section = self
-
-            if copy:
-                section.initial_comment = section.configspec.initial_comment
-                section.final_comment = section.configspec.final_comment
-                section.encoding = section.configspec.encoding
-                section.BOM = section.configspec.BOM
-                section.newlines = section.configspec.newlines
-                section.indent_type = section.configspec.indent_type
-
-        #
-        # section.default_values.clear() #??
-        configspec = section.configspec
-        self._set_configspec(section, copy)
-
-
-        def validate_entry(entry, spec, val, missing, ret_true, ret_false):
-            section.default_values.pop(entry, None)
-
-            try:
-                section.default_values[entry] = validator.get_default_value(configspec[entry])
-            except (KeyError, AttributeError, validator.baseErrorClass):
-                # No default, bad default or validator has no 'get_default_value'
-                # (e.g. SimpleVal)
-                pass
-
-            try:
-                check = validator.check(spec,
-                                        val,
-                                        missing=missing
-                                        )
-            except validator.baseErrorClass as cause:
-                if not preserve_errors or isinstance(cause, self._vdtMissingValue):
-                    out[entry] = False
-                else:
-                    # preserve the error
-                    out[entry] = cause
-                    ret_false = False
-                ret_true = False
-            else:
-                ret_false = False
-                out[entry] = True
-                if self.stringify or missing:
-                    # if we are doing type conversion
-                    # or the value is a supplied default
-                    if not self.stringify:
-                        if isinstance(check, (list, tuple)):
-                            # preserve lists
-                            check = [self._str(item) for item in check]
-                        elif missing and check is None:
-                            # convert the None from a default to a ''
-                            check = ''
-                        else:
-                            check = self._str(check)
-                    if (check != val) or missing:
-                        section[entry] = check
-                if not copy and missing and entry not in section.defaults:
-                    section.defaults.append(entry)
-            return ret_true, ret_false
-
-        #
-        out = {}
-        ret_true = True
-        ret_false = True
-
-        unvalidated = [k for k in section.scalars if k not in configspec]
-        incorrect_sections = [k for k in configspec.sections if k in section.scalars]
-        incorrect_scalars = [k for k in configspec.scalars if k in section.sections]
-
-        for entry in configspec.scalars:
-            if entry in ('__many__', '___many___'):
-                # reserved names
-                continue
-            if (not entry in section.scalars) or (entry in section.defaults):
-                # missing entries
-                # or entries from defaults
-                missing = True
-                val = None
-                if copy and entry not in section.scalars:
-                    # copy comments
-                    section.comments[entry] = (
-                        configspec.comments.get(entry, []))
-                    section.inline_comments[entry] = (
-                        configspec.inline_comments.get(entry, ''))
-                #
-            else:
-                missing = False
-                val = section[entry]
-
-            ret_true, ret_false = validate_entry(entry, configspec[entry], val,
-                                                 missing, ret_true, ret_false)
-
-        many = None
-        if '__many__' in configspec.scalars:
-            many = configspec['__many__']
-        elif '___many___' in configspec.scalars:
-            many = configspec['___many___']
-
-        if many is not None:
-            for entry in unvalidated:
-                val = section[entry]
-                ret_true, ret_false = validate_entry(entry, many, val, False,
-                                                     ret_true, ret_false)
-            unvalidated = []
-
-        for entry in incorrect_scalars:
-            ret_true = False
-            if not preserve_errors:
-                out[entry] = False
-            else:
-                ret_false = False
-                msg = 'Value %r was provided as a section' % entry
-                out[entry] = validator.baseErrorClass(msg)
-        for entry in incorrect_sections:
-            ret_true = False
-            if not preserve_errors:
-                out[entry] = False
-            else:
-                ret_false = False
-                msg = 'Section %r was provided as a single value' % entry
-                out[entry] = validator.baseErrorClass(msg)
-
-        # Missing sections will have been created as empty ones when the
-        # configspec was read.
-        for entry in section.sections:
-            # FIXME: this means DEFAULT is not copied in copy mode
-            if section is self and entry == 'DEFAULT':
-                continue
-            if section[entry].configspec is None:
-                unvalidated.append(entry)
-                continue
-            if copy:
-                section.comments[entry] = configspec.comments.get(entry, [])
-                section.inline_comments[entry] = configspec.inline_comments.get(entry, '')
-            check = self.validate(validator, preserve_errors=preserve_errors, copy=copy, section=section[entry])
-            out[entry] = check
-            if check == False:
-                ret_true = False
-            elif check == True:
-                ret_false = False
-            else:
-                ret_true = False
-
-        section.extra_values = unvalidated
-        if preserve_errors and not section._created:
-            # If the section wasn't created (i.e. it wasn't missing)
-            # then we can't return False, we need to preserve errors
-            ret_false = False
-        #
-        if ret_false and preserve_errors and out:
-            # If we are preserving errors, but all
-            # the failures are from missing sections / values
-            # then we can return False. Otherwise there is a
-            # real failure that we need to preserve.
-            ret_false = not any(out.values())
-        if ret_true:
-            return True
-        elif ret_false:
-            return False
-        return out
-
-
-    def reset(self):
-        """Clear ConfigObj instance and restore to 'freshly created' state."""
-        self.clear()
-        self._initialise()
-        # FIXME: Should be done by '_initialise', but ConfigObj constructor (and reload)
-        #        requires an empty dictionary
-        self.configspec = None
-        # Just to be sure ;-)
-        self._original_configspec = None
-
-
-    def reload(self):
-        """
-        Reload a ConfigObj from file.
-
-        This method raises a ``ReloadError`` if the ConfigObj doesn't have
-        a filename attribute pointing to a file.
-        """
-        if not isinstance(self.filename, six.string_types):
-            raise ReloadError()
-
-        filename = self.filename
-        current_options = {}
-        for entry in OPTION_DEFAULTS:
-            if entry == 'configspec':
-                continue
-            current_options[entry] = getattr(self, entry)
-
-        configspec = self._original_configspec
-        current_options['configspec'] = configspec
-
-        self.clear()
-        self._initialise(current_options)
-        self._load(filename, configspec)
-
-
-
-class SimpleVal(object):
-    """
-    A simple validator.
-    Can be used to check that all members expected are present.
-
-    To use it, provide a configspec with all your members in (the value given
-    will be ignored). Pass an instance of ``SimpleVal`` to the ``validate``
-    method of your ``ConfigObj``. ``validate`` will return ``True`` if all
-    members are present, or a dictionary with True/False meaning
-    present/missing. (Whole missing sections will be replaced with ``False``)
-    """
-
-    def __init__(self):
-        self.baseErrorClass = ConfigObjError
-
-    def check(self, check, member, missing=False):
-        """A dummy check method, always returns the value unchanged."""
-        if missing:
-            raise self.baseErrorClass()
-        return member
-
-
-def flatten_errors(cfg, res, levels=None, results=None):
-    """
-    An example function that will turn a nested dictionary of results
-    (as returned by ``ConfigObj.validate``) into a flat list.
-
-    ``cfg`` is the ConfigObj instance being checked, ``res`` is the results
-    dictionary returned by ``validate``.
-
-    (This is a recursive function, so you shouldn't use the ``levels`` or
-    ``results`` arguments - they are used by the function.)
-
-    Returns a list of keys that failed. Each member of the list is a tuple::
-
-        ([list of sections...], key, result)
-
-    If ``validate`` was called with ``preserve_errors=False`` (the default)
-    then ``result`` will always be ``False``.
-
-    *list of sections* is a flattened list of sections that the key was found
-    in.
-
-    If the section was missing (or a section was expected and a scalar provided
-    - or vice-versa) then key will be ``None``.
-
-    If the value (or section) was missing then ``result`` will be ``False``.
-
-    If ``validate`` was called with ``preserve_errors=True`` and a value
-    was present, but failed the check, then ``result`` will be the exception
-    object returned. You can use this as a string that describes the failure.
-
-    For example *The value "3" is of the wrong type*.
-    """
-    if levels is None:
-        # first time called
-        levels = []
-        results = []
-    if res == True:
-        return sorted(results)
-    if res == False or isinstance(res, Exception):
-        results.append((levels[:], None, res))
-        if levels:
-            levels.pop()
-        return sorted(results)
-    for (key, val) in list(res.items()):
-        if val == True:
-            continue
-        if isinstance(cfg.get(key), Mapping):
-            # Go down one level
-            levels.append(key)
-            flatten_errors(cfg[key], val, levels, results)
-            continue
-        results.append((levels[:], key, val))
-    #
-    # Go up one level
-    if levels:
-        levels.pop()
-    #
-    return sorted(results)
-
-
-def get_extra_values(conf, _prepend=()):
-    """
-    Find all the values and sections not in the configspec from a validated
-    ConfigObj.
-
-    ``get_extra_values`` returns a list of tuples where each tuple represents
-    either an extra section, or an extra value.
-
-    The tuples contain two values, a tuple representing the section the value
-    is in and the name of the extra values. For extra values in the top level
-    section the first member will be an empty tuple. For values in the 'foo'
-    section the first member will be ``('foo',)``. For members in the 'bar'
-    subsection of the 'foo' section the first member will be ``('foo', 'bar')``.
-
-    NOTE: If you call ``get_extra_values`` on a ConfigObj instance that hasn't
-    been validated it will return an empty list.
-    """
-    out = []
-
-    out.extend([(_prepend, name) for name in conf.extra_values])
-    for name in conf.sections:
-        if name not in conf.extra_values:
-            out.extend(get_extra_values(conf[name], _prepend + (name,)))
-    return out
-
-
-"""*A programming language is a medium of expression.* - Paul Graham"""
diff --git a/lib/configobj/_version.py b/lib/configobj/_version.py
deleted file mode 100644
index 19a71401..00000000
--- a/lib/configobj/_version.py
+++ /dev/null
@@ -1,2 +0,0 @@
-"""Project version"""
-__version__ = '5.1.0'
diff --git a/lib/configobj/validate.py b/lib/configobj/validate.py
deleted file mode 100644
index c21b5864..00000000
--- a/lib/configobj/validate.py
+++ /dev/null
@@ -1,1474 +0,0 @@
-# validate.py
-# -*- coding: utf-8 -*-
-# pylint: disable=
-#
-# A Validator object.
-#
-# Copyright (C) 2005-2014:
-# (name) : (email)
-# Michael Foord: fuzzyman AT voidspace DOT org DOT uk
-# Mark Andrews: mark AT la-la DOT com
-# Nicola Larosa: nico AT tekNico DOT net
-# Rob Dennis: rdennis AT gmail DOT com
-# Eli Courtwright: eli AT courtwright DOT org
-
-# This software is licensed under the terms of the BSD license.
-# http://opensource.org/licenses/BSD-3-Clause
-
-# ConfigObj 5 - main repository for documentation and issue tracking:
-# https://github.com/DiffSK/configobj
-
-"""
-    The Validator object is used to check that supplied values
-    conform to a specification.
-
-    The value can be supplied as a string - e.g. from a config file.
-    In this case the check will also *convert* the value to
-    the required type. This allows you to add validation
-    as a transparent layer to access data stored as strings.
-    The validation checks that the data is correct *and*
-    converts it to the expected type.
-
-    Some standard checks are provided for basic data types.
-    Additional checks are easy to write. They can be
-    provided when the ``Validator`` is instantiated or
-    added afterwards.
-
-    The standard functions work with the following basic data types :
-
-    * integers
-    * floats
-    * booleans
-    * strings
-    * ip_addr
-
-    plus lists of these datatypes
-
-    Adding additional checks is done through coding simple functions.
-
-    The full set of standard checks are :
-
-    * 'integer': matches integer values (including negative)
-                 Takes optional 'min' and 'max' arguments : ::
-
-                   integer()
-                   integer(3, 9)  # any value from 3 to 9
-                   integer(min=0) # any positive value
-                   integer(max=9)
-
-    * 'float': matches float values
-               Has the same parameters as the integer check.
-
-    * 'boolean': matches boolean values - ``True`` or ``False``
-                 Acceptable string values for True are :
-                   true, on, yes, 1
-                 Acceptable string values for False are :
-                   false, off, no, 0
-
-                 Any other value raises an error.
-
-    * 'ip_addr': matches an Internet Protocol address, v.4, represented
-                 by a dotted-quad string, i.e. '1.2.3.4'.
-
-    * 'string': matches any string.
-                Takes optional keyword args 'min' and 'max'
-                to specify min and max lengths of the string.
-
-    * 'list': matches any list.
-              Takes optional keyword args 'min', and 'max' to specify min and
-              max sizes of the list. (Always returns a list.)
-
-    * 'tuple': matches any tuple.
-              Takes optional keyword args 'min', and 'max' to specify min and
-              max sizes of the tuple. (Always returns a tuple.)
-
-    * 'int_list': Matches a list of integers.
-                  Takes the same arguments as list.
-
-    * 'float_list': Matches a list of floats.
-                    Takes the same arguments as list.
-
-    * 'bool_list': Matches a list of boolean values.
-                   Takes the same arguments as list.
-
-    * 'ip_addr_list': Matches a list of IP addresses.
-                     Takes the same arguments as list.
-
-    * 'string_list': Matches a list of strings.
-                     Takes the same arguments as list.
-
-    * 'mixed_list': Matches a list with different types in
-                    specific positions. List size must match
-                    the number of arguments.
-
-                    Each position can be one of :
-                    'integer', 'float', 'ip_addr', 'string', 'boolean'
-
-                    So to specify a list with two strings followed
-                    by two integers, you write the check as : ::
-
-                      mixed_list('string', 'string', 'integer', 'integer')
-
-    * 'pass': This check matches everything ! It never fails
-              and the value is unchanged.
-
-              It is also the default if no check is specified.
-
-    * 'option': This check matches any from a list of options.
-                You specify this check with : ::
-
-                  option('option 1', 'option 2', 'option 3')
-
-    You can supply a default value (returned if no value is supplied)
-    using the default keyword argument.
-
-    You specify a list argument for default using a list constructor syntax in
-    the check : ::
-
-        checkname(arg1, arg2, default=list('val 1', 'val 2', 'val 3'))
-
-    A badly formatted set of arguments will raise a ``VdtParamError``.
-"""
-import re
-import sys
-from pprint import pprint
-
-__version__ = '1.0.1'
-
-__all__ = (
-    'dottedQuadToNum',
-    'numToDottedQuad',
-    'ValidateError',
-    'VdtUnknownCheckError',
-    'VdtParamError',
-    'VdtTypeError',
-    'VdtValueError',
-    'VdtValueTooSmallError',
-    'VdtValueTooBigError',
-    'VdtValueTooShortError',
-    'VdtValueTooLongError',
-    'VdtMissingValue',
-    'Validator',
-    'is_integer',
-    'is_float',
-    'is_boolean',
-    'is_list',
-    'is_tuple',
-    'is_ip_addr',
-    'is_string',
-    'is_int_list',
-    'is_bool_list',
-    'is_float_list',
-    'is_string_list',
-    'is_ip_addr_list',
-    'is_mixed_list',
-    'is_option',
-    # '__docformat__',  -- where is this supposed to come from? [jhe 2015-04-11]
-)
-
-
-#TODO - #21 - six is part of the repo now, but we didn't switch over to it here
-# this could be replaced if six is used for compatibility, or there are no
-# more assertions about items being a string
-if sys.version_info < (3,):
-    string_type = basestring
-else:
-    string_type = str
-    # so tests that care about unicode on 2.x can specify unicode, and the same
-    # tests when run on 3.x won't complain about a undefined name "unicode"
-    # since all strings are unicode on 3.x we just want to pass it through
-    # unchanged
-    unicode = lambda x: x
-    # in python 3, all ints are equivalent to python 2 longs, and they'll
-    # never show "L" in the repr
-    long = int
-
-_list_arg = re.compile(r'''
-    (?:
-        ([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*list\(
-            (
-                (?:
-                    \s*
-                    (?:
-                        (?:".*?")|              # double quotes
-                        (?:'.*?')|              # single quotes
-                        (?:[^'",\s\)][^,\)]*?)  # unquoted
-                    )
-                    \s*,\s*
-                )*
-                (?:
-                    (?:".*?")|              # double quotes
-                    (?:'.*?')|              # single quotes
-                    (?:[^'",\s\)][^,\)]*?)  # unquoted
-                )?                          # last one
-            )
-        \)
-    )
-''', re.VERBOSE | re.DOTALL)    # two groups
-
-_list_members = re.compile(r'''
-    (
-        (?:".*?")|              # double quotes
-        (?:'.*?')|              # single quotes
-        (?:[^'",\s=][^,=]*?)       # unquoted
-    )
-    (?:
-    (?:\s*,\s*)|(?:\s*$)            # comma
-    )
-''', re.VERBOSE | re.DOTALL)    # one group
-
-_paramstring = r'''
-    (?:
-        (
-            (?:
-                [a-zA-Z_][a-zA-Z0-9_]*\s*=\s*list\(
-                    (?:
-                        \s*
-                        (?:
-                            (?:".*?")|              # double quotes
-                            (?:'.*?')|              # single quotes
-                            (?:[^'",\s\)][^,\)]*?)       # unquoted
-                        )
-                        \s*,\s*
-                    )*
-                    (?:
-                        (?:".*?")|              # double quotes
-                        (?:'.*?')|              # single quotes
-                        (?:[^'",\s\)][^,\)]*?)       # unquoted
-                    )?                              # last one
-                \)
-            )|
-            (?:
-                (?:".*?")|              # double quotes
-                (?:'.*?')|              # single quotes
-                (?:[^'",\s=][^,=]*?)|       # unquoted
-                (?:                         # keyword argument
-                    [a-zA-Z_][a-zA-Z0-9_]*\s*=\s*
-                    (?:
-                        (?:".*?")|              # double quotes
-                        (?:'.*?')|              # single quotes
-                        (?:[^'",\s=][^,=]*?)       # unquoted
-                    )
-                )
-            )
-        )
-        (?:
-            (?:\s*,\s*)|(?:\s*$)            # comma
-        )
-    )
-    '''
-
-_matchstring = '^%s*' % _paramstring
-
-
-def dottedQuadToNum(ip):
-    """
-    Convert decimal dotted quad string to long integer
-
-    >>> int(dottedQuadToNum('1 '))
-    1
-    >>> int(dottedQuadToNum('1.2.3.4'))
-    16909060
-    """
-
-    # import here to avoid it when ip_addr values are not used
-    import socket, struct
-
-    try:
-        return struct.unpack('!L',
-            socket.inet_aton(ip.strip()))[0]
-    except socket.error:
-        raise ValueError('Not a good dotted-quad IP: %s' % ip)
-    return
-
-
-def numToDottedQuad(num):
-    """
-    Convert int or long int to dotted quad string
-
-    >>> numToDottedQuad(long(-1))
-    Traceback (most recent call last):
-    ValueError: Not a good numeric IP: -1
-    >>> numToDottedQuad(long(1))
-    '0.0.0.1'
-    >>> numToDottedQuad(long(16777218))
-    '1.0.0.2'
-    >>> numToDottedQuad(long(16908291))
-    '1.2.0.3'
-    >>> numToDottedQuad(long(16909060))
-    '1.2.3.4'
-    >>> numToDottedQuad(long(4294967295))
-    '255.255.255.255'
-    >>> numToDottedQuad(long(4294967296))
-    Traceback (most recent call last):
-    ValueError: Not a good numeric IP: 4294967296
-    >>> numToDottedQuad(-1)
-    Traceback (most recent call last):
-    ValueError: Not a good numeric IP: -1
-    >>> numToDottedQuad(1)
-    '0.0.0.1'
-    >>> numToDottedQuad(16777218)
-    '1.0.0.2'
-    >>> numToDottedQuad(16908291)
-    '1.2.0.3'
-    >>> numToDottedQuad(16909060)
-    '1.2.3.4'
-    >>> numToDottedQuad(4294967295)
-    '255.255.255.255'
-    >>> numToDottedQuad(4294967296)
-    Traceback (most recent call last):
-    ValueError: Not a good numeric IP: 4294967296
-
-    """
-
-    # import here to avoid it when ip_addr values are not used
-    import socket, struct
-
-    # no need to intercept here, 4294967295L is fine
-    if num > long(4294967295) or num < 0:
-        raise ValueError('Not a good numeric IP: %s' % num)
-    try:
-        return socket.inet_ntoa(
-            struct.pack('!L', long(num)))
-    except (socket.error, struct.error, OverflowError):
-        raise ValueError('Not a good numeric IP: %s' % num)
-
-
-class ValidateError(Exception):
-    """
-    This error indicates that the check failed.
-    It can be the base class for more specific errors.
-
-    Any check function that fails ought to raise this error.
-    (or a subclass)
-
-    >>> raise ValidateError
-    Traceback (most recent call last):
-    ValidateError
-    """
-
-
-class VdtMissingValue(ValidateError):
-    """No value was supplied to a check that needed one."""
-
-
-class VdtUnknownCheckError(ValidateError):
-    """An unknown check function was requested"""
-
-    def __init__(self, value):
-        """
-        >>> raise VdtUnknownCheckError('yoda')
-        Traceback (most recent call last):
-        VdtUnknownCheckError: the check "yoda" is unknown.
-        """
-        ValidateError.__init__(self, 'the check "{}" is unknown.'.format(value))
-
-
-class VdtParamError(SyntaxError):
-    """An incorrect parameter was passed"""
-
-    NOT_GIVEN = object()
-
-    def __init__(self, name_or_msg, value=NOT_GIVEN):
-        """
-        >>> raise VdtParamError('yoda', 'jedi')
-        Traceback (most recent call last):
-        VdtParamError: passed an incorrect value "jedi" for parameter "yoda".
-        >>> raise VdtParamError('preformatted message')
-        Traceback (most recent call last):
-        VdtParamError: preformatted message
-        """
-        if value is self.NOT_GIVEN:
-            SyntaxError.__init__(self, name_or_msg)
-        else:
-            SyntaxError.__init__(self, 'passed an incorrect value "{}" for parameter "{}".'.format(value, name_or_msg))
-
-
-class VdtTypeError(ValidateError):
-    """The value supplied was of the wrong type"""
-
-    def __init__(self, value):
-        """
-        >>> raise VdtTypeError('jedi')
-        Traceback (most recent call last):
-        VdtTypeError: the value "jedi" is of the wrong type.
-        """
-        ValidateError.__init__(self, 'the value "{}" is of the wrong type.'.format(value))
-
-
-class VdtValueError(ValidateError):
-    """The value supplied was of the correct type, but was not an allowed value."""
-
-    def __init__(self, value):
-        """
-        >>> raise VdtValueError('jedi')
-        Traceback (most recent call last):
-        VdtValueError: the value "jedi" is unacceptable.
-        """
-        ValidateError.__init__(self, 'the value "{}" is unacceptable.'.format(value))
-
-
-class VdtValueTooSmallError(VdtValueError):
-    """The value supplied was of the correct type, but was too small."""
-
-    def __init__(self, value):
-        """
-        >>> raise VdtValueTooSmallError('0')
-        Traceback (most recent call last):
-        VdtValueTooSmallError: the value "0" is too small.
-        """
-        ValidateError.__init__(self, 'the value "{}" is too small.'.format(value))
-
-
-class VdtValueTooBigError(VdtValueError):
-    """The value supplied was of the correct type, but was too big."""
-
-    def __init__(self, value):
-        """
-        >>> raise VdtValueTooBigError('1')
-        Traceback (most recent call last):
-        VdtValueTooBigError: the value "1" is too big.
-        """
-        ValidateError.__init__(self, 'the value "{}" is too big.'.format(value))
-
-
-class VdtValueTooShortError(VdtValueError):
-    """The value supplied was of the correct type, but was too short."""
-
-    def __init__(self, value):
-        """
-        >>> raise VdtValueTooShortError('jed')
-        Traceback (most recent call last):
-        VdtValueTooShortError: the value "jed" is too short.
-        """
-        ValidateError.__init__(
-            self,
-            'the value "{}" is too short.'.format(value))
-
-
-class VdtValueTooLongError(VdtValueError):
-    """The value supplied was of the correct type, but was too long."""
-
-    def __init__(self, value):
-        """
-        >>> raise VdtValueTooLongError('jedie')
-        Traceback (most recent call last):
-        VdtValueTooLongError: the value "jedie" is too long.
-        """
-        ValidateError.__init__(self, 'the value "{}" is too long.'.format(value))
-
-
-class Validator(object):
-    """
-    Validator is an object that allows you to register a set of 'checks'.
-    These checks take input and test that it conforms to the check.
-
-    This can also involve converting the value from a string into
-    the correct datatype.
-
-    The ``check`` method takes an input string which configures which
-    check is to be used and applies that check to a supplied value.
-
-    An example input string would be:
-    'int_range(param1, param2)'
-
-    You would then provide something like:
-
-    >>> def int_range_check(value, min, max):
-    ...     # turn min and max from strings to integers
-    ...     min = int(min)
-    ...     max = int(max)
-    ...     # check that value is of the correct type.
-    ...     # possible valid inputs are integers or strings
-    ...     # that represent integers
-    ...     if not isinstance(value, (int, long, string_type)):
-    ...         raise VdtTypeError(value)
-    ...     elif isinstance(value, string_type):
-    ...         # if we are given a string
-    ...         # attempt to convert to an integer
-    ...         try:
-    ...             value = int(value)
-    ...         except ValueError:
-    ...             raise VdtValueError(value)
-    ...     # check the value is between our constraints
-    ...     if not min <= value:
-    ...          raise VdtValueTooSmallError(value)
-    ...     if not value <= max:
-    ...          raise VdtValueTooBigError(value)
-    ...     return value
-
-    >>> fdict = {'int_range': int_range_check}
-    >>> vtr1 = Validator(fdict)
-    >>> vtr1.check('int_range(20, 40)', '30')
-    30
-    >>> vtr1.check('int_range(20, 40)', '60')
-    Traceback (most recent call last):
-    VdtValueTooBigError: the value "60" is too big.
-
-    New functions can be added with : ::
-
-    >>> vtr2 = Validator()
-    >>> vtr2.functions['int_range'] = int_range_check
-
-    Or by passing in a dictionary of functions when Validator
-    is instantiated.
-
-    Your functions *can* use keyword arguments,
-    but the first argument should always be 'value'.
-
-    If the function doesn't take additional arguments,
-    the parentheses are optional in the check.
-    It can be written with either of : ::
-
-        keyword = function_name
-        keyword = function_name()
-
-    The first program to utilise Validator() was Michael Foord's
-    ConfigObj, an alternative to ConfigParser which supports lists and
-    can validate a config file using a config schema.
-    For more details on using Validator with ConfigObj see:
-    https://configobj.readthedocs.io/en/latest/configobj.html
-    """
-
-    # this regex does the initial parsing of the checks
-    _func_re = re.compile(r'(.+?)\((.*)\)', re.DOTALL)
-
-    # this regex takes apart keyword arguments
-    _key_arg = re.compile(r'^([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.*)$',  re.DOTALL)
-
-
-    # this regex finds keyword=list(....) type values
-    _list_arg = _list_arg
-
-    # this regex takes individual values out of lists - in one pass
-    _list_members = _list_members
-
-    # These regexes check a set of arguments for validity
-    # and then pull the members out
-    _paramfinder = re.compile(_paramstring, re.VERBOSE | re.DOTALL)
-    _matchfinder = re.compile(_matchstring, re.VERBOSE | re.DOTALL)
-
-
-    def __init__(self, functions=None):
-        """
-        >>> vtri = Validator()
-        """
-        self.functions = {
-            '': self._pass,
-            'integer': is_integer,
-            'float': is_float,
-            'boolean': is_boolean,
-            'ip_addr': is_ip_addr,
-            'string': is_string,
-            'list': is_list,
-            'tuple': is_tuple,
-            'int_list': is_int_list,
-            'float_list': is_float_list,
-            'bool_list': is_bool_list,
-            'ip_addr_list': is_ip_addr_list,
-            'string_list': is_string_list,
-            'mixed_list': is_mixed_list,
-            'pass': self._pass,
-            'option': is_option,
-            'force_list': force_list,
-        }
-        if functions is not None:
-            self.functions.update(functions)
-        # tekNico: for use by ConfigObj
-        self.baseErrorClass = ValidateError
-        self._cache = {}
-
-
-    def check(self, check, value, missing=False):
-        """
-        Usage: check(check, value)
-
-        Arguments:
-            check: string representing check to apply (including arguments)
-            value: object to be checked
-
-        Returns value, converted to correct type if necessary
-
-        If the check fails, raises a ``ValidateError`` subclass.
-
-        >>> vtor.check('yoda', '')
-        Traceback (most recent call last):
-        VdtUnknownCheckError: the check "yoda" is unknown.
-        >>> vtor.check('yoda()', '')
-        Traceback (most recent call last):
-        VdtUnknownCheckError: the check "yoda" is unknown.
-
-        >>> vtor.check('string(default="")', '', missing=True)
-        ''
-        """
-        fun_name, fun_args, fun_kwargs, default = self._parse_with_caching(check)
-
-        if missing:
-            if default is None:
-                # no information needed here - to be handled by caller
-                raise VdtMissingValue()
-            value = self._handle_none(default)
-
-        if value is None:
-            return None
-
-        return self._check_value(value, fun_name, fun_args, fun_kwargs)
-
-
-    def _handle_none(self, value):
-        if value == 'None':
-            return None
-        elif value in ("'None'", '"None"'):
-            # Special case a quoted None
-            value = self._unquote(value)
-        return value
-
-
-    def _parse_with_caching(self, check):
-        if check in self._cache:
-            fun_name, fun_args, fun_kwargs, default = self._cache[check]
-            # We call list and dict below to work with *copies* of the data
-            # rather than the original (which are mutable of course)
-            fun_args = list(fun_args)
-            fun_kwargs = dict(fun_kwargs)
-        else:
-            fun_name, fun_args, fun_kwargs, default = self._parse_check(check)
-            fun_kwargs = {str(key): value for (key, value) in list(fun_kwargs.items())}
-            self._cache[check] = fun_name, list(fun_args), dict(fun_kwargs), default
-        return fun_name, fun_args, fun_kwargs, default
-
-
-    def _check_value(self, value, fun_name, fun_args, fun_kwargs):
-        try:
-            fun = self.functions[fun_name]
-        except KeyError:
-            raise VdtUnknownCheckError(fun_name)
-        else:
-            return fun(value, *fun_args, **fun_kwargs)
-
-
-    def _parse_check(self, check):
-        fun_match = self._func_re.match(check)
-        if fun_match:
-            fun_name = fun_match.group(1)
-            arg_string = fun_match.group(2)
-            arg_match = self._matchfinder.match(arg_string)
-            if arg_match is None:
-                # Bad syntax
-                raise VdtParamError('Bad syntax in check "%s".' % check)
-            fun_args = []
-            fun_kwargs = {}
-            # pull out args of group 2
-            for arg in self._paramfinder.findall(arg_string):
-                # args may need whitespace removing (before removing quotes)
-                arg = arg.strip()
-                listmatch = self._list_arg.match(arg)
-                if listmatch:
-                    key, val = self._list_handle(listmatch)
-                    fun_kwargs[key] = val
-                    continue
-                keymatch = self._key_arg.match(arg)
-                if keymatch:
-                    val = keymatch.group(2)
-                    if not val in ("'None'", '"None"'):
-                        # Special case a quoted None
-                        val = self._unquote(val)
-                    fun_kwargs[keymatch.group(1)] = val
-                    continue
-
-                fun_args.append(self._unquote(arg))
-        else:
-            # allows for function names without (args)
-            return check, (), {}, None
-
-        # Default must be deleted if the value is specified too,
-        # otherwise the check function will get a spurious "default" keyword arg
-        default = fun_kwargs.pop('default', None)
-        return fun_name, fun_args, fun_kwargs, default
-
-
-    def _unquote(self, val):
-        """Unquote a value if necessary."""
-        if (len(val) >= 2) and (val[0] in ("'", '"')) and (val[0] == val[-1]):
-            val = val[1:-1]
-        return val
-
-
-    def _list_handle(self, listmatch):
-        """Take apart a ``keyword=list('val, 'val')`` type string."""
-        out = []
-        name = listmatch.group(1)
-        args = listmatch.group(2)
-        for arg in self._list_members.findall(args):
-            out.append(self._unquote(arg))
-        return name, out
-
-
-    def _pass(self, value):
-        """
-        Dummy check that always passes
-
-        >>> vtor.check('', 0)
-        0
-        >>> vtor.check('', '0')
-        '0'
-        """
-        return value
-
-
-    def get_default_value(self, check):
-        """
-        Given a check, return the default value for the check
-        (converted to the right type).
-
-        If the check doesn't specify a default value then a
-        ``KeyError`` will be raised.
-        """
-        fun_name, fun_args, fun_kwargs, default = self._parse_with_caching(check)
-        if default is None:
-            raise KeyError('Check "%s" has no default value.' % check)
-        value = self._handle_none(default)
-        if value is None:
-            return value
-        return self._check_value(value, fun_name, fun_args, fun_kwargs)
-
-
-def _is_num_param(names, values, to_float=False):
-    """
-    Return numbers from inputs or raise VdtParamError.
-
-    Lets ``None`` pass through.
-    Pass in keyword argument ``to_float=True`` to
-    use float for the conversion rather than int.
-
-    >>> _is_num_param(('', ''), (0, 1.0))
-    [0, 1]
-    >>> _is_num_param(('', ''), (0, 1.0), to_float=True)
-    [0.0, 1.0]
-    >>> _is_num_param(('a'), ('a'))
-    Traceback (most recent call last):
-    VdtParamError: passed an incorrect value "a" for parameter "a".
-    """
-    fun = to_float and float or int
-    out_params = []
-    for (name, val) in zip(names, values):
-        if val is None:
-            out_params.append(val)
-        elif isinstance(val, (int, long, float, string_type)):
-            try:
-                out_params.append(fun(val))
-            except ValueError:
-                raise VdtParamError(name, val)
-        else:
-            raise VdtParamError(name, val)
-    return out_params
-
-
-# built in checks
-# you can override these by setting the appropriate name
-# in Validator.functions
-# note: if the params are specified wrongly in your input string,
-#       you will also raise errors.
-
-def is_integer(value, min=None, max=None):
-    """
-    A check that tests that a given value is an integer (int, or long)
-    and optionally, between bounds. A negative value is accepted, while
-    a float will fail.
-
-    If the value is a string, then the conversion is done - if possible.
-    Otherwise a VdtError is raised.
-
-    >>> vtor.check('integer', '-1')
-    -1
-    >>> vtor.check('integer', '0')
-    0
-    >>> vtor.check('integer', 9)
-    9
-    >>> vtor.check('integer', 'a')
-    Traceback (most recent call last):
-    VdtTypeError: the value "a" is of the wrong type.
-    >>> vtor.check('integer', '2.2')
-    Traceback (most recent call last):
-    VdtTypeError: the value "2.2" is of the wrong type.
-    >>> vtor.check('integer(10)', '20')
-    20
-    >>> vtor.check('integer(max=20)', '15')
-    15
-    >>> vtor.check('integer(10)', '9')
-    Traceback (most recent call last):
-    VdtValueTooSmallError: the value "9" is too small.
-    >>> vtor.check('integer(10)', 9)
-    Traceback (most recent call last):
-    VdtValueTooSmallError: the value "9" is too small.
-    >>> vtor.check('integer(max=20)', '35')
-    Traceback (most recent call last):
-    VdtValueTooBigError: the value "35" is too big.
-    >>> vtor.check('integer(max=20)', 35)
-    Traceback (most recent call last):
-    VdtValueTooBigError: the value "35" is too big.
-    >>> vtor.check('integer(0, 9)', False)
-    0
-    """
-    (min_val, max_val) = _is_num_param(  # pylint: disable=unbalanced-tuple-unpacking
-        ('min', 'max'), (min, max))
-    if not isinstance(value, (int, long, string_type)):
-        raise VdtTypeError(value)
-    if isinstance(value, string_type):
-        # if it's a string - does it represent an integer ?
-        try:
-            value = int(value)
-        except ValueError:
-            raise VdtTypeError(value)
-    if (min_val is not None) and (value < min_val):
-        raise VdtValueTooSmallError(value)
-    if (max_val is not None) and (value > max_val):
-        raise VdtValueTooBigError(value)
-    return value
-
-
-def is_float(value, min=None, max=None):
-    """
-    A check that tests that a given value is a float
-    (an integer will be accepted), and optionally - that it is between bounds.
-
-    If the value is a string, then the conversion is done - if possible.
-    Otherwise a VdtError is raised.
-
-    This can accept negative values.
-
-    >>> vtor.check('float', '2')
-    2.0
-
-    From now on we multiply the value to avoid comparing decimals
-
-    >>> vtor.check('float', '-6.8') * 10
-    -68.0
-    >>> vtor.check('float', '12.2') * 10
-    122.0
-    >>> vtor.check('float', 8.4) * 10
-    84.0
-    >>> vtor.check('float', 'a')
-    Traceback (most recent call last):
-    VdtTypeError: the value "a" is of the wrong type.
-    >>> vtor.check('float(10.1)', '10.2') * 10
-    102.0
-    >>> vtor.check('float(max=20.2)', '15.1') * 10
-    151.0
-    >>> vtor.check('float(10.0)', '9.0')
-    Traceback (most recent call last):
-    VdtValueTooSmallError: the value "9.0" is too small.
-    >>> vtor.check('float(max=20.0)', '35.0')
-    Traceback (most recent call last):
-    VdtValueTooBigError: the value "35.0" is too big.
-    """
-    (min_val, max_val) = _is_num_param(  # pylint: disable=unbalanced-tuple-unpacking
-        ('min', 'max'), (min, max), to_float=True)
-    if not isinstance(value, (int, long, float, string_type)):
-        raise VdtTypeError(value)
-    if not isinstance(value, float):
-        # if it's a string - does it represent a float ?
-        try:
-            value = float(value)
-        except ValueError:
-            raise VdtTypeError(value)
-    if (min_val is not None) and (value < min_val):
-        raise VdtValueTooSmallError(value)
-    if (max_val is not None) and (value > max_val):
-        raise VdtValueTooBigError(value)
-    return value
-
-
-bool_dict = {
-    True: True, 'on': True, '1': True, 'true': True, 'yes': True,
-    False: False, 'off': False, '0': False, 'false': False, 'no': False,
-}
-
-
-def is_boolean(value):
-    """
-    Check if the value represents a boolean.
-
-    >>> vtor.check('boolean', 0)
-    0
-    >>> vtor.check('boolean', False)
-    0
-    >>> vtor.check('boolean', '0')
-    0
-    >>> vtor.check('boolean', 'off')
-    0
-    >>> vtor.check('boolean', 'false')
-    0
-    >>> vtor.check('boolean', 'no')
-    0
-    >>> vtor.check('boolean', 'nO')
-    0
-    >>> vtor.check('boolean', 'NO')
-    0
-    >>> vtor.check('boolean', 1)
-    1
-    >>> vtor.check('boolean', True)
-    1
-    >>> vtor.check('boolean', '1')
-    1
-    >>> vtor.check('boolean', 'on')
-    1
-    >>> vtor.check('boolean', 'true')
-    1
-    >>> vtor.check('boolean', 'yes')
-    1
-    >>> vtor.check('boolean', 'Yes')
-    1
-    >>> vtor.check('boolean', 'YES')
-    1
-    >>> vtor.check('boolean', '')
-    Traceback (most recent call last):
-    VdtTypeError: the value "" is of the wrong type.
-    >>> vtor.check('boolean', 'up')
-    Traceback (most recent call last):
-    VdtTypeError: the value "up" is of the wrong type.
-
-    """
-    if isinstance(value, string_type):
-        try:
-            return bool_dict[value.lower()]
-        except KeyError:
-            raise VdtTypeError(value)
-    # we do an equality test rather than an identity test
-    # this ensures Python 2.2 compatibilty
-    # and allows 0 and 1 to represent True and False
-    if value == False:
-        return False
-    elif value == True:
-        return True
-    else:
-        raise VdtTypeError(value)
-
-
-def is_ip_addr(value):
-    """
-    Check that the supplied value is an Internet Protocol address, v.4,
-    represented by a dotted-quad string, i.e. '1.2.3.4'.
-
-    >>> vtor.check('ip_addr', '1 ')
-    '1'
-    >>> vtor.check('ip_addr', ' 1.2')
-    '1.2'
-    >>> vtor.check('ip_addr', ' 1.2.3 ')
-    '1.2.3'
-    >>> vtor.check('ip_addr', '1.2.3.4')
-    '1.2.3.4'
-    >>> vtor.check('ip_addr', '0.0.0.0')
-    '0.0.0.0'
-    >>> vtor.check('ip_addr', '255.255.255.255')
-    '255.255.255.255'
-    >>> vtor.check('ip_addr', '255.255.255.256')
-    Traceback (most recent call last):
-    VdtValueError: the value "255.255.255.256" is unacceptable.
-    >>> vtor.check('ip_addr', '1.2.3.4.5')
-    Traceback (most recent call last):
-    VdtValueError: the value "1.2.3.4.5" is unacceptable.
-    >>> vtor.check('ip_addr', 0)
-    Traceback (most recent call last):
-    VdtTypeError: the value "0" is of the wrong type.
-    """
-    if not isinstance(value, string_type):
-        raise VdtTypeError(value)
-    value = value.strip()
-    try:
-        dottedQuadToNum(value)
-    except ValueError:
-        raise VdtValueError(value)
-    return value
-
-
-def is_list(value, min=None, max=None):
-    """
-    Check that the value is a list of values.
-
-    You can optionally specify the minimum and maximum number of members.
-
-    It does no check on list members.
-
-    >>> vtor.check('list', ())
-    []
-    >>> vtor.check('list', [])
-    []
-    >>> vtor.check('list', (1, 2))
-    [1, 2]
-    >>> vtor.check('list', [1, 2])
-    [1, 2]
-    >>> vtor.check('list(3)', (1, 2))
-    Traceback (most recent call last):
-    VdtValueTooShortError: the value "(1, 2)" is too short.
-    >>> vtor.check('list(max=5)', (1, 2, 3, 4, 5, 6))
-    Traceback (most recent call last):
-    VdtValueTooLongError: the value "(1, 2, 3, 4, 5, 6)" is too long.
-    >>> vtor.check('list(min=3, max=5)', (1, 2, 3, 4))
-    [1, 2, 3, 4]
-    >>> vtor.check('list', 0)
-    Traceback (most recent call last):
-    VdtTypeError: the value "0" is of the wrong type.
-    >>> vtor.check('list', '12')
-    Traceback (most recent call last):
-    VdtTypeError: the value "12" is of the wrong type.
-    """
-    (min_len, max_len) = _is_num_param(  # pylint: disable=unbalanced-tuple-unpacking
-        ('min', 'max'), (min, max))
-    if isinstance(value, string_type):
-        raise VdtTypeError(value)
-    try:
-        num_members = len(value)
-    except TypeError:
-        raise VdtTypeError(value)
-    if min_len is not None and num_members < min_len:
-        raise VdtValueTooShortError(value)
-    if max_len is not None and num_members > max_len:
-        raise VdtValueTooLongError(value)
-    return list(value)
-
-
-def is_tuple(value, min=None, max=None):
-    """
-    Check that the value is a tuple of values.
-
-    You can optionally specify the minimum and maximum number of members.
-
-    It does no check on members.
-
-    >>> vtor.check('tuple', ())
-    ()
-    >>> vtor.check('tuple', [])
-    ()
-    >>> vtor.check('tuple', (1, 2))
-    (1, 2)
-    >>> vtor.check('tuple', [1, 2])
-    (1, 2)
-    >>> vtor.check('tuple(3)', (1, 2))
-    Traceback (most recent call last):
-    VdtValueTooShortError: the value "(1, 2)" is too short.
-    >>> vtor.check('tuple(max=5)', (1, 2, 3, 4, 5, 6))
-    Traceback (most recent call last):
-    VdtValueTooLongError: the value "(1, 2, 3, 4, 5, 6)" is too long.
-    >>> vtor.check('tuple(min=3, max=5)', (1, 2, 3, 4))
-    (1, 2, 3, 4)
-    >>> vtor.check('tuple', 0)
-    Traceback (most recent call last):
-    VdtTypeError: the value "0" is of the wrong type.
-    >>> vtor.check('tuple', '12')
-    Traceback (most recent call last):
-    VdtTypeError: the value "12" is of the wrong type.
-    """
-    return tuple(is_list(value, min, max))
-
-
-def is_string(value, min=None, max=None):
-    """
-    Check that the supplied value is a string.
-
-    You can optionally specify the minimum and maximum number of members.
-
-    >>> vtor.check('string', '0')
-    '0'
-    >>> vtor.check('string', 0)
-    Traceback (most recent call last):
-    VdtTypeError: the value "0" is of the wrong type.
-    >>> vtor.check('string(2)', '12')
-    '12'
-    >>> vtor.check('string(2)', '1')
-    Traceback (most recent call last):
-    VdtValueTooShortError: the value "1" is too short.
-    >>> vtor.check('string(min=2, max=3)', '123')
-    '123'
-    >>> vtor.check('string(min=2, max=3)', '1234')
-    Traceback (most recent call last):
-    VdtValueTooLongError: the value "1234" is too long.
-    """
-    if not isinstance(value, string_type):
-        raise VdtTypeError(value)
-    (min_len, max_len) = _is_num_param(  # pylint: disable=unbalanced-tuple-unpacking
-        ('min', 'max'), (min, max))
-    try:
-        num_members = len(value)
-    except TypeError:
-        raise VdtTypeError(value)
-    if min_len is not None and num_members < min_len:
-        raise VdtValueTooShortError(value)
-    if max_len is not None and num_members > max_len:
-        raise VdtValueTooLongError(value)
-    return value
-
-
-def is_int_list(value, min=None, max=None):
-    """
-    Check that the value is a list of integers.
-
-    You can optionally specify the minimum and maximum number of members.
-
-    Each list member is checked that it is an integer.
-
-    >>> vtor.check('int_list', ())
-    []
-    >>> vtor.check('int_list', [])
-    []
-    >>> vtor.check('int_list', (1, 2))
-    [1, 2]
-    >>> vtor.check('int_list', [1, 2])
-    [1, 2]
-    >>> vtor.check('int_list', [1, 'a'])
-    Traceback (most recent call last):
-    VdtTypeError: the value "a" is of the wrong type.
-    """
-    return [is_integer(mem) for mem in is_list(value, min, max)]
-
-
-def is_bool_list(value, min=None, max=None):
-    """
-    Check that the value is a list of booleans.
-
-    You can optionally specify the minimum and maximum number of members.
-
-    Each list member is checked that it is a boolean.
-
-    >>> vtor.check('bool_list', ())
-    []
-    >>> vtor.check('bool_list', [])
-    []
-    >>> check_res = vtor.check('bool_list', (True, False))
-    >>> check_res == [True, False]
-    1
-    >>> check_res = vtor.check('bool_list', [True, False])
-    >>> check_res == [True, False]
-    1
-    >>> vtor.check('bool_list', [True, 'a'])
-    Traceback (most recent call last):
-    VdtTypeError: the value "a" is of the wrong type.
-    """
-    return [is_boolean(mem) for mem in is_list(value, min, max)]
-
-
-def is_float_list(value, min=None, max=None):
-    """
-    Check that the value is a list of floats.
-
-    You can optionally specify the minimum and maximum number of members.
-
-    Each list member is checked that it is a float.
-
-    >>> vtor.check('float_list', ())
-    []
-    >>> vtor.check('float_list', [])
-    []
-    >>> vtor.check('float_list', (1, 2.0))
-    [1.0, 2.0]
-    >>> vtor.check('float_list', [1, 2.0])
-    [1.0, 2.0]
-    >>> vtor.check('float_list', [1, 'a'])
-    Traceback (most recent call last):
-    VdtTypeError: the value "a" is of the wrong type.
-    """
-    return [is_float(mem) for mem in is_list(value, min, max)]
-
-
-def is_string_list(value, min=None, max=None):
-    """
-    Check that the value is a list of strings.
-
-    You can optionally specify the minimum and maximum number of members.
-
-    Each list member is checked that it is a string.
-
-    >>> vtor.check('string_list', ())
-    []
-    >>> vtor.check('string_list', [])
-    []
-    >>> vtor.check('string_list', ('a', 'b'))
-    ['a', 'b']
-    >>> vtor.check('string_list', ['a', 1])
-    Traceback (most recent call last):
-    VdtTypeError: the value "1" is of the wrong type.
-    >>> vtor.check('string_list', 'hello')
-    Traceback (most recent call last):
-    VdtTypeError: the value "hello" is of the wrong type.
-    """
-    if isinstance(value, string_type):
-        raise VdtTypeError(value)
-    return [is_string(mem) for mem in is_list(value, min, max)]
-
-
-def is_ip_addr_list(value, min=None, max=None):
-    """
-    Check that the value is a list of IP addresses.
-
-    You can optionally specify the minimum and maximum number of members.
-
-    Each list member is checked that it is an IP address.
-
-    >>> vtor.check('ip_addr_list', ())
-    []
-    >>> vtor.check('ip_addr_list', [])
-    []
-    >>> vtor.check('ip_addr_list', ('1.2.3.4', '5.6.7.8'))
-    ['1.2.3.4', '5.6.7.8']
-    >>> vtor.check('ip_addr_list', ['a'])
-    Traceback (most recent call last):
-    VdtValueError: the value "a" is unacceptable.
-    """
-    return [is_ip_addr(mem) for mem in is_list(value, min, max)]
-
-
-def force_list(value, min=None, max=None):
-    """
-    Check that a value is a list, coercing strings into
-    a list with one member. Useful where users forget the
-    trailing comma that turns a single value into a list.
-
-    You can optionally specify the minimum and maximum number of members.
-    A minumum of greater than one will fail if the user only supplies a
-    string.
-
-    >>> vtor.check('force_list', ())
-    []
-    >>> vtor.check('force_list', [])
-    []
-    >>> vtor.check('force_list', 'hello')
-    ['hello']
-    """
-    if not isinstance(value, (list, tuple)):
-        value = [value]
-    return is_list(value, min, max)
-
-
-
-fun_dict = {
-    int: is_integer,
-    'int': is_integer,
-    'integer': is_integer,
-    float: is_float,
-    'float': is_float,
-    'ip_addr': is_ip_addr,
-    str: is_string,
-    'str': is_string,
-    'string': is_string,
-    bool: is_boolean,
-    'bool': is_boolean,
-    'boolean': is_boolean,
-}
-
-
-def is_mixed_list(value, *args):
-    """
-    Check that the value is a list.
-    Allow specifying the type of each member.
-    Work on lists of specific lengths.
-
-    You specify each member as a positional argument specifying type
-
-    Each type should be one of the following strings :
-      'integer', 'float', 'ip_addr', 'string', 'boolean'
-
-    So you can specify a list of two strings, followed by
-    two integers as :
-
-      mixed_list('string', 'string', 'integer', 'integer')
-
-    The length of the list must match the number of positional
-    arguments you supply.
-
-    >>> mix_str = "mixed_list('integer', 'float', 'ip_addr', 'string', 'boolean')"
-    >>> check_res = vtor.check(mix_str, (1, 2.0, '1.2.3.4', 'a', True))
-    >>> check_res == [1, 2.0, '1.2.3.4', 'a', True]
-    1
-    >>> check_res = vtor.check(mix_str, ('1', '2.0', '1.2.3.4', 'a', 'True'))
-    >>> check_res == [1, 2.0, '1.2.3.4', 'a', True]
-    1
-    >>> vtor.check(mix_str, ('b', 2.0, '1.2.3.4', 'a', True))
-    Traceback (most recent call last):
-    VdtTypeError: the value "b" is of the wrong type.
-    >>> vtor.check(mix_str, (1, 2.0, '1.2.3.4', 'a'))
-    Traceback (most recent call last):
-    VdtValueTooShortError: the value "(1, 2.0, '1.2.3.4', 'a')" is too short.
-    >>> vtor.check(mix_str, (1, 2.0, '1.2.3.4', 'a', 1, 'b'))
-    Traceback (most recent call last):
-    VdtValueTooLongError: the value "(1, 2.0, '1.2.3.4', 'a', 1, 'b')" is too long.
-    >>> vtor.check(mix_str, 0)
-    Traceback (most recent call last):
-    VdtTypeError: the value "0" is of the wrong type.
-
-    >>> vtor.check('mixed_list("yoda")', ('a'))
-    Traceback (most recent call last):
-    VdtParamError: passed an incorrect value "KeyError('yoda',)" for parameter "'mixed_list'"
-    """
-    try:
-        length = len(value)
-    except TypeError:
-        raise VdtTypeError(value)
-    if length < len(args):
-        raise VdtValueTooShortError(value)
-    elif length > len(args):
-        raise VdtValueTooLongError(value)
-    try:
-        return [fun_dict[arg](val) for arg, val in zip(args, value)]
-    except KeyError as cause:
-        raise VdtParamError('mixed_list', cause)
-
-
-def is_option(value, *options):
-    """
-    This check matches the value to any of a set of options.
-
-    >>> vtor.check('option("yoda", "jedi")', 'yoda')
-    'yoda'
-    >>> vtor.check('option("yoda", "jedi")', 'jed')
-    Traceback (most recent call last):
-    VdtValueError: the value "jed" is unacceptable.
-    >>> vtor.check('option("yoda", "jedi")', 0)
-    Traceback (most recent call last):
-    VdtTypeError: the value "0" is of the wrong type.
-    """
-    if not isinstance(value, string_type):
-        raise VdtTypeError(value)
-    if not value in options:
-        raise VdtValueError(value)
-    return value
-
-
-def _test(value, *args, **keywargs):
-    """
-    A function that exists for test purposes.
-
-    >>> checks = [
-    ...     '3, 6, min=1, max=3, test=list(a, b, c)',
-    ...     '3',
-    ...     '3, 6',
-    ...     '3,',
-    ...     'min=1, test="a b c"',
-    ...     'min=5, test="a, b, c"',
-    ...     'min=1, max=3, test="a, b, c"',
-    ...     'min=-100, test=-99',
-    ...     'min=1, max=3',
-    ...     '3, 6, test="36"',
-    ...     '3, 6, test="a, b, c"',
-    ...     '3, max=3, test=list("a", "b", "c")',
-    ...     '''3, max=3, test=list("'a'", 'b', "x=(c)")''',
-    ...     "test='x=fish(3)'",
-    ...    ]
-    >>> v = Validator({'test': _test})
-    >>> for entry in checks:
-    ...     pprint(v.check(('test(%s)' % entry), 3))
-    (3, ('3', '6'), {'max': '3', 'min': '1', 'test': ['a', 'b', 'c']})
-    (3, ('3',), {})
-    (3, ('3', '6'), {})
-    (3, ('3',), {})
-    (3, (), {'min': '1', 'test': 'a b c'})
-    (3, (), {'min': '5', 'test': 'a, b, c'})
-    (3, (), {'max': '3', 'min': '1', 'test': 'a, b, c'})
-    (3, (), {'min': '-100', 'test': '-99'})
-    (3, (), {'max': '3', 'min': '1'})
-    (3, ('3', '6'), {'test': '36'})
-    (3, ('3', '6'), {'test': 'a, b, c'})
-    (3, ('3',), {'max': '3', 'test': ['a', 'b', 'c']})
-    (3, ('3',), {'max': '3', 'test': ["'a'", 'b', 'x=(c)']})
-    (3, (), {'test': 'x=fish(3)'})
-
-    >>> v = Validator()
-    >>> v.check('integer(default=6)', '3')
-    3
-    >>> v.check('integer(default=6)', None, True)
-    6
-    >>> v.get_default_value('integer(default=6)')
-    6
-    >>> v.get_default_value('float(default=6)')
-    6.0
-    >>> v.get_default_value('pass(default=None)')
-    >>> v.get_default_value("string(default='None')")
-    'None'
-    >>> v.get_default_value('pass')
-    Traceback (most recent call last):
-    KeyError: 'Check "pass" has no default value.'
-    >>> v.get_default_value('pass(default=list(1, 2, 3, 4))')
-    ['1', '2', '3', '4']
-
-    >>> v = Validator()
-    >>> v.check("pass(default=None)", None, True)
-    >>> v.check("pass(default='None')", None, True)
-    'None'
-    >>> v.check('pass(default="None")', None, True)
-    'None'
-    >>> v.check('pass(default=list(1, 2, 3, 4))', None, True)
-    ['1', '2', '3', '4']
-
-    Bug test for unicode arguments
-    >>> v = Validator()
-    >>> v.check(unicode('string(min=4)'), unicode('test')) == unicode('test')
-    True
-
-    >>> v = Validator()
-    >>> v.get_default_value(unicode('string(min=4, default="1234")')) == unicode('1234')
-    True
-    >>> v.check(unicode('string(min=4, default="1234")'), unicode('test')) == unicode('test')
-    True
-
-    >>> v = Validator()
-    >>> default = v.get_default_value('string(default=None)')
-    >>> default == None
-    1
-    """
-    return (value, args, keywargs)
-
-
-def _test2():
-    """
-    >>>
-    >>> v = Validator()
-    >>> v.get_default_value('string(default="#ff00dd")')
-    '#ff00dd'
-    >>> v.get_default_value('integer(default=3) # comment')
-    3
-    """
-
-def _test3():
-    r"""
-    >>> vtor.check('string(default="")', '', missing=True)
-    ''
-    >>> vtor.check('string(default="\n")', '', missing=True)
-    '\n'
-    >>> print(vtor.check('string(default="\n")', '', missing=True))
-    <BLANKLINE>
-    <BLANKLINE>
-    >>> vtor.check('string()', '\n')
-    '\n'
-    >>> vtor.check('string(default="\n\n\n")', '', missing=True)
-    '\n\n\n'
-    >>> vtor.check('string()', 'random \n text goes here\n\n')
-    'random \n text goes here\n\n'
-    >>> vtor.check('string(default=" \nrandom text\ngoes \n here\n\n ")',
-    ... '', missing=True)
-    ' \nrandom text\ngoes \n here\n\n '
-    >>> vtor.check("string(default='\n\n\n')", '', missing=True)
-    '\n\n\n'
-    >>> vtor.check("option('\n','a','b',default='\n')", '', missing=True)
-    '\n'
-    >>> vtor.check("string_list()", ['foo', '\n', 'bar'])
-    ['foo', '\n', 'bar']
-    >>> vtor.check("string_list(default=list('\n'))", '', missing=True)
-    ['\n']
-    """
-
-
-if __name__ == '__main__':
-    # run the code tests in doctest format
-    import sys
-    import doctest
-    m = sys.modules.get('__main__')
-    globs = m.__dict__.copy()
-    globs.update({
-        'vtor': Validator(),
-    })
-
-    failures, tests = doctest.testmod(
-        m, globs=globs,
-        optionflags=doctest.IGNORE_EXCEPTION_DETAIL | doctest.ELLIPSIS)
-    print('{} {} failures out of {} tests'
-          .format("FAIL" if failures else "*OK*", failures, tests))
-    sys.exit(bool(failures))
diff --git a/lib/dateutil-stubs/METADATA.toml b/lib/dateutil-stubs/METADATA.toml
deleted file mode 100644
index 5f2be1e4..00000000
--- a/lib/dateutil-stubs/METADATA.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-version = "2.9.*"
-upstream_repository = "https://github.com/dateutil/dateutil"
-partial_stub = true
-
-[tool.stubtest]
-ignore_missing_stub = true
diff --git a/lib/dateutil-stubs/__init__.pyi b/lib/dateutil-stubs/__init__.pyi
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/dateutil-stubs/_common.pyi b/lib/dateutil-stubs/_common.pyi
deleted file mode 100644
index 75bf74c5..00000000
--- a/lib/dateutil-stubs/_common.pyi
+++ /dev/null
@@ -1,9 +0,0 @@
-from typing_extensions import Self
-
-class weekday:
-    def __init__(self, weekday: int, n: int | None = None) -> None: ...
-    def __call__(self, n: int) -> Self: ...
-    def __eq__(self, other: object) -> bool: ...
-    def __hash__(self) -> int: ...
-    weekday: int
-    n: int
diff --git a/lib/dateutil-stubs/easter.pyi b/lib/dateutil-stubs/easter.pyi
deleted file mode 100644
index 952d1191..00000000
--- a/lib/dateutil-stubs/easter.pyi
+++ /dev/null
@@ -1,8 +0,0 @@
-from datetime import date
-from typing import Literal
-
-EASTER_JULIAN: Literal[1]
-EASTER_ORTHODOX: Literal[2]
-EASTER_WESTERN: Literal[3]
-
-def easter(year: int, method: Literal[1, 2, 3] = 3) -> date: ...
diff --git a/lib/dateutil-stubs/parser/__init__.pyi b/lib/dateutil-stubs/parser/__init__.pyi
deleted file mode 100644
index c375ff15..00000000
--- a/lib/dateutil-stubs/parser/__init__.pyi
+++ /dev/null
@@ -1,67 +0,0 @@
-from collections.abc import Callable, Mapping
-from datetime import datetime, tzinfo
-from typing import IO, Any
-from typing_extensions import TypeAlias
-
-from .isoparser import isoparse as isoparse, isoparser as isoparser
-
-_FileOrStr: TypeAlias = bytes | str | IO[str] | IO[Any]
-_TzData: TypeAlias = tzinfo | int | str | None
-_TzInfo: TypeAlias = Mapping[str, _TzData] | Callable[[str, int], _TzData]
-
-class parserinfo:
-    JUMP: list[str]
-    WEEKDAYS: list[tuple[str, ...]]
-    MONTHS: list[tuple[str, ...]]
-    HMS: list[tuple[str, str, str]]
-    AMPM: list[tuple[str, str]]
-    UTCZONE: list[str]
-    PERTAIN: list[str]
-    TZOFFSET: dict[str, int]
-    def __init__(self, dayfirst: bool = False, yearfirst: bool = False) -> None: ...
-    def jump(self, name: str) -> bool: ...
-    def weekday(self, name: str) -> int | None: ...
-    def month(self, name: str) -> int | None: ...
-    def hms(self, name: str) -> int | None: ...
-    def ampm(self, name: str) -> int | None: ...
-    def pertain(self, name: str) -> bool: ...
-    def utczone(self, name: str) -> bool: ...
-    def tzoffset(self, name: str) -> int | None: ...
-    def convertyear(self, year: int) -> int: ...
-    def validate(self, res: datetime) -> bool: ...
-
-class parser:
-    def __init__(self, info: parserinfo | None = None) -> None: ...
-    def parse(
-        self,
-        timestr: _FileOrStr,
-        default: datetime | None = None,
-        ignoretz: bool = False,
-        tzinfos: _TzInfo | None = None,
-        *,
-        dayfirst: bool | None = ...,
-        yearfirst: bool | None = ...,
-        fuzzy: bool = ...,
-        fuzzy_with_tokens: bool = ...,
-    ) -> datetime: ...
-
-DEFAULTPARSER: parser
-
-def parse(
-    timestr: _FileOrStr,
-    parserinfo: parserinfo | None = None,
-    *,
-    dayfirst: bool | None = ...,
-    yearfirst: bool | None = ...,
-    ignoretz: bool = ...,
-    fuzzy: bool = ...,
-    fuzzy_with_tokens: bool = ...,
-    default: datetime | None = ...,
-    tzinfos: _TzInfo | None = ...,
-) -> datetime: ...
-
-class _tzparser: ...
-
-DEFAULTTZPARSER: _tzparser
-
-class ParserError(ValueError): ...
diff --git a/lib/dateutil-stubs/parser/isoparser.pyi b/lib/dateutil-stubs/parser/isoparser.pyi
deleted file mode 100644
index fc5e46d9..00000000
--- a/lib/dateutil-stubs/parser/isoparser.pyi
+++ /dev/null
@@ -1,15 +0,0 @@
-from _typeshed import SupportsRead
-from datetime import date, datetime, time, tzinfo
-from typing_extensions import TypeAlias
-
-_Readable: TypeAlias = SupportsRead[str | bytes]
-_TakesAscii: TypeAlias = str | bytes | _Readable
-
-class isoparser:
-    def __init__(self, sep: str | bytes | None = None): ...
-    def isoparse(self, dt_str: _TakesAscii) -> datetime: ...
-    def parse_isodate(self, datestr: _TakesAscii) -> date: ...
-    def parse_isotime(self, timestr: _TakesAscii) -> time: ...
-    def parse_tzstr(self, tzstr: _TakesAscii, zero_as_utc: bool = True) -> tzinfo: ...
-
-def isoparse(dt_str: _TakesAscii) -> datetime: ...
diff --git a/lib/dateutil-stubs/py.typed b/lib/dateutil-stubs/py.typed
deleted file mode 100644
index b648ac92..00000000
--- a/lib/dateutil-stubs/py.typed
+++ /dev/null
@@ -1 +0,0 @@
-partial
diff --git a/lib/dateutil-stubs/relativedelta.pyi b/lib/dateutil-stubs/relativedelta.pyi
deleted file mode 100644
index 394713db..00000000
--- a/lib/dateutil-stubs/relativedelta.pyi
+++ /dev/null
@@ -1,97 +0,0 @@
-from datetime import date, timedelta
-from typing import SupportsFloat, TypeVar, overload
-from typing_extensions import Self, TypeAlias
-
-# See #9817 for why we reexport this here
-from ._common import weekday as weekday
-
-_DateT = TypeVar("_DateT", bound=date)
-# Work around attribute and type having the same name.
-_Weekday: TypeAlias = weekday
-
-MO: weekday
-TU: weekday
-WE: weekday
-TH: weekday
-FR: weekday
-SA: weekday
-SU: weekday
-
-class relativedelta:
-    years: int
-    months: int
-    days: int
-    leapdays: int
-    hours: int
-    minutes: int
-    seconds: int
-    microseconds: int
-    year: int | None
-    month: int | None
-    weekday: _Weekday | None
-    day: int | None
-    hour: int | None
-    minute: int | None
-    second: int | None
-    microsecond: int | None
-    def __init__(
-        self,
-        dt1: date | None = None,
-        dt2: date | None = None,
-        years: int | None = 0,
-        months: int | None = 0,
-        days: int | None = 0,
-        leapdays: int | None = 0,
-        weeks: int | None = 0,
-        hours: int | None = 0,
-        minutes: int | None = 0,
-        seconds: int | None = 0,
-        microseconds: int | None = 0,
-        year: int | None = None,
-        month: int | None = None,
-        day: int | None = None,
-        weekday: int | _Weekday | None = None,
-        yearday: int | None = None,
-        nlyearday: int | None = None,
-        hour: int | None = None,
-        minute: int | None = None,
-        second: int | None = None,
-        microsecond: int | None = None,
-    ) -> None: ...
-    @property
-    def weeks(self) -> int: ...
-    @weeks.setter
-    def weeks(self, value: int) -> None: ...
-    def normalized(self) -> Self: ...
-    # TODO: use Union when mypy will handle it properly in overloaded operator
-    # methods (#2129, #1442, #1264 in mypy)
-    @overload
-    def __add__(self, other: relativedelta) -> Self: ...
-    @overload
-    def __add__(self, other: timedelta) -> Self: ...
-    @overload
-    def __add__(self, other: _DateT) -> _DateT: ...
-    @overload
-    def __radd__(self, other: relativedelta) -> Self: ...
-    @overload
-    def __radd__(self, other: timedelta) -> Self: ...
-    @overload
-    def __radd__(self, other: _DateT) -> _DateT: ...
-    @overload
-    def __rsub__(self, other: relativedelta) -> Self: ...
-    @overload
-    def __rsub__(self, other: timedelta) -> Self: ...
-    @overload
-    def __rsub__(self, other: _DateT) -> _DateT: ...
-    def __sub__(self, other: relativedelta) -> Self: ...
-    def __neg__(self) -> Self: ...
-    def __bool__(self) -> bool: ...
-    def __nonzero__(self) -> bool: ...
-    def __mul__(self, other: SupportsFloat) -> Self: ...
-    def __rmul__(self, other: SupportsFloat) -> Self: ...
-    def __eq__(self, other: object) -> bool: ...
-    def __ne__(self, other: object) -> bool: ...
-    def __div__(self, other: SupportsFloat) -> Self: ...
-    def __truediv__(self, other: SupportsFloat) -> Self: ...
-    def __abs__(self) -> Self: ...
-    def __hash__(self) -> int: ...
diff --git a/lib/dateutil-stubs/rrule.pyi b/lib/dateutil-stubs/rrule.pyi
deleted file mode 100644
index f091cfbd..00000000
--- a/lib/dateutil-stubs/rrule.pyi
+++ /dev/null
@@ -1,111 +0,0 @@
-import datetime
-from _typeshed import Incomplete
-from collections.abc import Iterable, Iterator, Sequence
-from typing_extensions import TypeAlias
-
-from ._common import weekday as weekdaybase
-
-YEARLY: int
-MONTHLY: int
-WEEKLY: int
-DAILY: int
-HOURLY: int
-MINUTELY: int
-SECONDLY: int
-
-class weekday(weekdaybase): ...
-
-weekdays: tuple[weekday, weekday, weekday, weekday, weekday, weekday, weekday]
-MO: weekday
-TU: weekday
-WE: weekday
-TH: weekday
-FR: weekday
-SA: weekday
-SU: weekday
-
-class rrulebase:
-    def __init__(self, cache: bool = False) -> None: ...
-    def __iter__(self) -> Iterator[datetime.datetime]: ...
-    def __getitem__(self, item): ...
-    def __contains__(self, item): ...
-    def count(self): ...
-    def before(self, dt, inc: bool = False): ...
-    def after(self, dt, inc: bool = False): ...
-    def xafter(self, dt, count: Incomplete | None = None, inc: bool = False): ...
-    def between(self, after, before, inc: bool = False, count: int = 1): ...
-
-class rrule(rrulebase):
-    def __init__(
-        self,
-        freq,
-        dtstart: datetime.date | None = None,
-        interval: int = 1,
-        wkst: weekday | int | None = None,
-        count: int | None = None,
-        until: datetime.date | int | None = None,
-        bysetpos: int | Iterable[int] | None = None,
-        bymonth: int | Iterable[int] | None = None,
-        bymonthday: int | Iterable[int] | None = None,
-        byyearday: int | Iterable[int] | None = None,
-        byeaster: int | Iterable[int] | None = None,
-        byweekno: int | Iterable[int] | None = None,
-        byweekday: int | weekday | Iterable[int] | Iterable[weekday] | None = None,
-        byhour: int | Iterable[int] | None = None,
-        byminute: int | Iterable[int] | None = None,
-        bysecond: int | Iterable[int] | None = None,
-        cache: bool = False,
-    ) -> None: ...
-    def replace(self, **kwargs): ...
-
-_RRule: TypeAlias = rrule
-
-class _iterinfo:
-    rrule: _RRule
-    def __init__(self, rrule: _RRule) -> None: ...
-    yearlen: int | None
-    nextyearlen: int | None
-    yearordinal: int | None
-    yearweekday: int | None
-    mmask: Sequence[int] | None
-    mdaymask: Sequence[int] | None
-    nmdaymask: Sequence[int] | None
-    wdaymask: Sequence[int] | None
-    mrange: Sequence[int] | None
-    wnomask: Sequence[int] | None
-    nwdaymask: Sequence[int] | None
-    eastermask: Sequence[int] | None
-    lastyear: int | None
-    lastmonth: int | None
-    def rebuild(self, year, month): ...
-    def ydayset(self, year, month, day): ...
-    def mdayset(self, year, month, day): ...
-    def wdayset(self, year, month, day): ...
-    def ddayset(self, year, month, day): ...
-    def htimeset(self, hour, minute, second): ...
-    def mtimeset(self, hour, minute, second): ...
-    def stimeset(self, hour, minute, second): ...
-
-class rruleset(rrulebase):
-    class _genitem:
-        dt: Incomplete
-        genlist: list[Incomplete]
-        gen: Incomplete
-        def __init__(self, genlist, gen) -> None: ...
-        def __next__(self) -> None: ...
-        next = __next__
-        def __lt__(self, other) -> bool: ...
-        def __gt__(self, other) -> bool: ...
-        def __eq__(self, other) -> bool: ...
-        def __ne__(self, other) -> bool: ...
-
-    def __init__(self, cache: bool = False) -> None: ...
-    def rrule(self, rrule: _RRule): ...
-    def rdate(self, rdate): ...
-    def exrule(self, exrule): ...
-    def exdate(self, exdate): ...
-
-class _rrulestr:
-    def __call__(self, s, **kwargs) -> rrule | rruleset: ...
-
-rrulestr: _rrulestr
diff --git a/lib/dateutil-stubs/tz/__init__.pyi b/lib/dateutil-stubs/tz/__init__.pyi
deleted file mode 100644
index 334ca482..00000000
--- a/lib/dateutil-stubs/tz/__init__.pyi
+++ /dev/null
@@ -1,15 +0,0 @@
-from .tz import (
-    datetime_ambiguous as datetime_ambiguous,
-    datetime_exists as datetime_exists,
-    gettz as gettz,
-    resolve_imaginary as resolve_imaginary,
-    tzfile as tzfile,
-    tzical as tzical,
-    tzlocal as tzlocal,
-    tzoffset as tzoffset,
-    tzrange as tzrange,
-    tzstr as tzstr,
-    tzutc as tzutc,
-)
-
-UTC: tzutc
diff --git a/lib/dateutil-stubs/tz/_common.pyi b/lib/dateutil-stubs/tz/_common.pyi
deleted file mode 100644
index 4e64822f..00000000
--- a/lib/dateutil-stubs/tz/_common.pyi
+++ /dev/null
@@ -1,28 +0,0 @@
-import abc
-from datetime import datetime, timedelta, tzinfo
-from typing import ClassVar
-
-def tzname_in_python2(namefunc): ...
-def enfold(dt: datetime, fold: int = 1): ...
-
-class _DatetimeWithFold(datetime):
-    @property
-    def fold(self): ...
-
-# Doesn't actually have ABCMeta as the metaclass at runtime,
-# but mypy complains if we don't have it in the stub.
-# See discussion in #8908
-class _tzinfo(tzinfo, metaclass=abc.ABCMeta):
-    def is_ambiguous(self, dt: datetime) -> bool: ...
-    def fromutc(self, dt: datetime) -> datetime: ...
-
-class tzrangebase(_tzinfo):
-    def __init__(self) -> None: ...
-    def utcoffset(self, dt: datetime | None) -> timedelta | None: ...
-    def dst(self, dt: datetime | None) -> timedelta | None: ...
-    def tzname(self, dt: datetime | None) -> str: ...
-    def fromutc(self, dt: datetime) -> datetime: ...
-    def is_ambiguous(self, dt: datetime) -> bool: ...
-    __hash__: ClassVar[None]  # type: ignore[assignment]
-    def __ne__(self, other): ...
-    __reduce__ = object.__reduce__
diff --git a/lib/dateutil-stubs/tz/tz.pyi b/lib/dateutil-stubs/tz/tz.pyi
deleted file mode 100644
index 6addba65..00000000
--- a/lib/dateutil-stubs/tz/tz.pyi
+++ /dev/null
@@ -1,115 +0,0 @@
-import datetime
-from _typeshed import Incomplete
-from typing import ClassVar, Literal, Protocol, TypeVar
-
-from ..relativedelta import relativedelta
-from ._common import _tzinfo as _tzinfo, enfold as enfold, tzname_in_python2 as tzname_in_python2, tzrangebase as tzrangebase
-
-_DT = TypeVar("_DT", bound=datetime.datetime)
-
-ZERO: datetime.timedelta
-EPOCH: datetime.datetime
-EPOCHORDINAL: int
-
-class tzutc(datetime.tzinfo):
-    def utcoffset(self, dt: datetime.datetime | None) -> datetime.timedelta | None: ...
-    def dst(self, dt: datetime.datetime | None) -> datetime.timedelta | None: ...
-    def tzname(self, dt: datetime.datetime | None) -> str: ...
-    def is_ambiguous(self, dt: datetime.datetime | None) -> bool: ...
-    def fromutc(self, dt: _DT) -> _DT: ...
-    def __eq__(self, other): ...
-    __hash__: ClassVar[None]  # type: ignore[assignment]
-    def __ne__(self, other): ...
-    __reduce__ = object.__reduce__
-
-class tzoffset(datetime.tzinfo):
-    def __init__(self, name, offset) -> None: ...
-    def utcoffset(self, dt: datetime.datetime | None) -> datetime.timedelta | None: ...
-    def dst(self, dt: datetime.datetime | None) -> datetime.timedelta | None: ...
-    def is_ambiguous(self, dt: datetime.datetime | None) -> bool: ...
-    def tzname(self, dt: datetime.datetime | None) -> str: ...
-    def fromutc(self, dt: _DT) -> _DT: ...
-    def __eq__(self, other): ...
-    __hash__: ClassVar[None]  # type: ignore[assignment]
-    def __ne__(self, other): ...
-    __reduce__ = object.__reduce__
-    @classmethod
-    def instance(cls, name, offset) -> tzoffset: ...
-
-class tzlocal(_tzinfo):
-    def __init__(self) -> None: ...
-    def utcoffset(self, dt: datetime.datetime | None) -> datetime.timedelta | None: ...
-    def dst(self, dt: datetime.datetime | None) -> datetime.timedelta | None: ...
-    def tzname(self, dt: datetime.datetime | None) -> str: ...
-    def is_ambiguous(self, dt: datetime.datetime | None) -> bool: ...
-    def __eq__(self, other): ...
-    __hash__: ClassVar[None]  # type: ignore[assignment]
-    def __ne__(self, other): ...
-    __reduce__ = object.__reduce__
-
-class _ttinfo:
-    def __init__(self) -> None: ...
-    def __eq__(self, other): ...
-    __hash__: ClassVar[None]  # type: ignore[assignment]
-    def __ne__(self, other): ...
-
-class _TZFileReader(Protocol):
-    # optional attribute:
-    # name: str
-    def read(self, size: int, /) -> bytes: ...
-    def seek(self, target: int, whence: Literal[1], /) -> object: ...
-
-class tzfile(_tzinfo):
-    def __init__(self, fileobj: str | _TZFileReader, filename: str | None = None) -> None: ...
-    def is_ambiguous(self, dt: datetime.datetime | None, idx: int | None = None) -> bool: ...
-    def utcoffset(self, dt: datetime.datetime | None) -> datetime.timedelta | None: ...
-    def dst(self, dt: datetime.datetime | None) -> datetime.timedelta | None: ...
-    def tzname(self, dt: datetime.datetime | None) -> str: ...
-    def __eq__(self, other): ...
-    __hash__: ClassVar[None]  # type: ignore[assignment]
-    def __ne__(self, other): ...
-    def __reduce__(self): ...
-    def __reduce_ex__(self, protocol): ...
-
-class tzrange(tzrangebase):
-    hasdst: bool
-    def __init__(
-        self,
-        stdabbr: str,
-        stdoffset: int | datetime.timedelta | None = None,
-        dstabbr: str | None = None,
-        dstoffset: int | datetime.timedelta | None = None,
-        start: relativedelta | None = None,
-        end: relativedelta | None = None,
-    ) -> None: ...
-    def transitions(self, year: int) -> tuple[datetime.datetime, datetime.datetime]: ...
-    def __eq__(self, other): ...
-
-class tzstr(tzrange):
-    hasdst: bool
-    def __init__(self, s: str, posix_offset: bool = False) -> None: ...
-    @classmethod
-    def instance(cls, name, offset) -> tzoffset: ...
-
-class _ICalReader(Protocol):
-    # optional attribute:
-    # name: str
-    def read(self) -> str: ...
-
-class tzical:
-    def __init__(self, fileobj: str | _ICalReader) -> None: ...
-    def keys(self): ...
-    def get(self, tzid: Incomplete | None = None): ...
-
-TZFILES: list[str]
-TZPATHS: list[str]
-
-def datetime_exists(dt: datetime.datetime, tz: datetime.tzinfo | None = None) -> bool: ...
-def datetime_ambiguous(dt: datetime.datetime, tz: datetime.tzinfo | None = None) -> bool: ...
-def resolve_imaginary(dt: datetime.datetime) -> datetime.datetime: ...
-
-class _GetTZ:
-    def __call__(self, name: str | None = ...) -> datetime.tzinfo | None: ...
-    def nocache(self, name: str | None) -> datetime.tzinfo | None: ...
-
-gettz: _GetTZ
diff --git a/lib/dateutil-stubs/utils.pyi b/lib/dateutil-stubs/utils.pyi
deleted file mode 100644
index 8c9f5e44..00000000
--- a/lib/dateutil-stubs/utils.pyi
+++ /dev/null
@@ -1,5 +0,0 @@
-from datetime import datetime, timedelta, tzinfo
-
-def default_tzinfo(dt: datetime, tzinfo: tzinfo) -> datetime: ...
-def today(tzinfo: tzinfo | None = None) -> datetime: ...
-def within_delta(dt1: datetime, dt2: datetime, delta: timedelta) -> bool: ...
diff --git a/lib/dateutil-stubs/zoneinfo/__init__.pyi b/lib/dateutil-stubs/zoneinfo/__init__.pyi
deleted file mode 100644
index 7bd2845a..00000000
--- a/lib/dateutil-stubs/zoneinfo/__init__.pyi
+++ /dev/null
@@ -1,17 +0,0 @@
-from _typeshed import Incomplete
-from typing import IO
-from typing_extensions import TypeAlias
-
-__all__ = ["get_zonefile_instance", "gettz", "gettz_db_metadata"]
-
-_MetadataType: TypeAlias = dict[str, Incomplete]
-
-class ZoneInfoFile:
-    zones: dict[Incomplete, Incomplete]
-    metadata: _MetadataType | None
-    def __init__(self, zonefile_stream: IO[bytes] | None = None) -> None: ...
-    def get(self, name, default: Incomplete | None = None): ...
-
-def get_zonefile_instance(new_instance: bool = False) -> ZoneInfoFile: ...
-def gettz(name): ...
-def gettz_db_metadata() -> _MetadataType: ...
diff --git a/lib/dateutil-stubs/zoneinfo/rebuild.pyi b/lib/dateutil-stubs/zoneinfo/rebuild.pyi
deleted file mode 100644
index e3845926..00000000
--- a/lib/dateutil-stubs/zoneinfo/rebuild.pyi
+++ /dev/null
@@ -1,11 +0,0 @@
-from _typeshed import Incomplete, StrOrBytesPath
-from collections.abc import Sequence
-from tarfile import TarInfo
-
-def rebuild(
-    filename: StrOrBytesPath,
-    tag: Incomplete | None = None,
-    format: str = "gz",
-    zonegroups: Sequence[str | TarInfo] = [],
-    metadata: Incomplete | None = None,
-) -> None: ...
diff --git a/lib/dateutil/__init__.py b/lib/dateutil/__init__.py
deleted file mode 100644
index a2c19c06..00000000
--- a/lib/dateutil/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-import sys
-
-try:
-    from ._version import version as __version__
-except ImportError:
-    __version__ = 'unknown'
-
-__all__ = ['easter', 'parser', 'relativedelta', 'rrule', 'tz',
-           'utils', 'zoneinfo']
-
-def __getattr__(name):
-    import importlib
-
-    if name in __all__:
-        return importlib.import_module("." + name, __name__)
-    raise AttributeError(
-        "module {!r} has not attribute {!r}".format(__name__, name)
-    )
-
-
-def __dir__():
-    # __dir__ should include all the lazy-importable modules as well.
-    return [x for x in globals() if x not in sys.modules] + __all__
diff --git a/lib/dateutil/_common.py b/lib/dateutil/_common.py
deleted file mode 100644
index 4eb2659b..00000000
--- a/lib/dateutil/_common.py
+++ /dev/null
@@ -1,43 +0,0 @@
-"""
-Common code used in multiple modules.
-"""
-
-
-class weekday(object):
-    __slots__ = ["weekday", "n"]
-
-    def __init__(self, weekday, n=None):
-        self.weekday = weekday
-        self.n = n
-
-    def __call__(self, n):
-        if n == self.n:
-            return self
-        else:
-            return self.__class__(self.weekday, n)
-
-    def __eq__(self, other):
-        try:
-            if self.weekday != other.weekday or self.n != other.n:
-                return False
-        except AttributeError:
-            return False
-        return True
-
-    def __hash__(self):
-        return hash((
-          self.weekday,
-          self.n,
-        ))
-
-    def __ne__(self, other):
-        return not (self == other)
-
-    def __repr__(self):
-        s = ("MO", "TU", "WE", "TH", "FR", "SA", "SU")[self.weekday]
-        if not self.n:
-            return s
-        else:
-            return "%s(%+d)" % (s, self.n)
-
-# vim:ts=4:sw=4:et
diff --git a/lib/dateutil/_version.py b/lib/dateutil/_version.py
deleted file mode 100644
index ddda9809..00000000
--- a/lib/dateutil/_version.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# file generated by setuptools_scm
-# don't change, don't track in version control
-__version__ = version = '2.9.0.post0'
-__version_tuple__ = version_tuple = (2, 9, 0)
diff --git a/lib/dateutil/easter.py b/lib/dateutil/easter.py
deleted file mode 100644
index f74d1f74..00000000
--- a/lib/dateutil/easter.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-This module offers a generic Easter computing method for any given year, using
-Western, Orthodox or Julian algorithms.
-"""
-
-import datetime
-
-__all__ = ["easter", "EASTER_JULIAN", "EASTER_ORTHODOX", "EASTER_WESTERN"]
-
-EASTER_JULIAN = 1
-EASTER_ORTHODOX = 2
-EASTER_WESTERN = 3
-
-
-def easter(year, method=EASTER_WESTERN):
-    """
-    This method was ported from the work done by GM Arts,
-    on top of the algorithm by Claus Tondering, which was
-    based in part on the algorithm of Ouding (1940), as
-    quoted in "Explanatory Supplement to the Astronomical
-    Almanac", P.  Kenneth Seidelmann, editor.
-
-    This algorithm implements three different Easter
-    calculation methods:
-
-    1. Original calculation in Julian calendar, valid in
-       dates after 326 AD
-    2. Original method, with date converted to Gregorian
-       calendar, valid in years 1583 to 4099
-    3. Revised method, in Gregorian calendar, valid in
-       years 1583 to 4099 as well
-
-    These methods are represented by the constants:
-
-    * ``EASTER_JULIAN   = 1``
-    * ``EASTER_ORTHODOX = 2``
-    * ``EASTER_WESTERN  = 3``
-
-    The default method is method 3.
-
-    More about the algorithm may be found at:
-
-    `GM Arts: Easter Algorithms <http://www.gmarts.org/index.php?go=415>`_
-
-    and
-
-    `The Calendar FAQ: Easter <https://www.tondering.dk/claus/cal/easter.php>`_
-
-    """
-
-    if not (1 <= method <= 3):
-        raise ValueError("invalid method")
-
-    # g - Golden year - 1
-    # c - Century
-    # h - (23 - Epact) mod 30
-    # i - Number of days from March 21 to Paschal Full Moon
-    # j - Weekday for PFM (0=Sunday, etc)
-    # p - Number of days from March 21 to Sunday on or before PFM
-    #     (-6 to 28 methods 1 & 3, to 56 for method 2)
-    # e - Extra days to add for method 2 (converting Julian
-    #     date to Gregorian date)
-
-    y = year
-    g = y % 19
-    e = 0
-    if method < 3:
-        # Old method
-        i = (19*g + 15) % 30
-        j = (y + y//4 + i) % 7
-        if method == 2:
-            # Extra dates to convert Julian to Gregorian date
-            e = 10
-            if y > 1600:
-                e = e + y//100 - 16 - (y//100 - 16)//4
-    else:
-        # New method
-        c = y//100
-        h = (c - c//4 - (8*c + 13)//25 + 19*g + 15) % 30
-        i = h - (h//28)*(1 - (h//28)*(29//(h + 1))*((21 - g)//11))
-        j = (y + y//4 + i + 2 - c + c//4) % 7
-
-    # p can be from -6 to 56 corresponding to dates 22 March to 23 May
-    # (later dates apply to method 2, although 23 May never actually occurs)
-    p = i - j + e
-    d = 1 + (p + 27 + (p + 6)//40) % 31
-    m = 3 + (p + 26)//30
-    return datetime.date(int(y), int(m), int(d))
diff --git a/lib/dateutil/parser/__init__.py b/lib/dateutil/parser/__init__.py
deleted file mode 100644
index d174b0e4..00000000
--- a/lib/dateutil/parser/__init__.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-from ._parser import parse, parser, parserinfo, ParserError
-from ._parser import DEFAULTPARSER, DEFAULTTZPARSER
-from ._parser import UnknownTimezoneWarning
-
-from ._parser import __doc__
-
-from .isoparser import isoparser, isoparse
-
-__all__ = ['parse', 'parser', 'parserinfo',
-           'isoparse', 'isoparser',
-           'ParserError',
-           'UnknownTimezoneWarning']
-
-
-###
-# Deprecate portions of the private interface so that downstream code that
-# is improperly relying on it is given *some* notice.
-
-
-def __deprecated_private_func(f):
-    from functools import wraps
-    import warnings
-
-    msg = ('{name} is a private function and may break without warning, '
-           'it will be moved and or renamed in future versions.')
-    msg = msg.format(name=f.__name__)
-
-    @wraps(f)
-    def deprecated_func(*args, **kwargs):
-        warnings.warn(msg, DeprecationWarning)
-        return f(*args, **kwargs)
-
-    return deprecated_func
-
-def __deprecate_private_class(c):
-    import warnings
-
-    msg = ('{name} is a private class and may break without warning, '
-           'it will be moved and or renamed in future versions.')
-    msg = msg.format(name=c.__name__)
-
-    class private_class(c):
-        __doc__ = c.__doc__
-
-        def __init__(self, *args, **kwargs):
-            warnings.warn(msg, DeprecationWarning)
-            super(private_class, self).__init__(*args, **kwargs)
-
-    private_class.__name__ = c.__name__
-
-    return private_class
-
-
-from ._parser import _timelex, _resultbase
-from ._parser import _tzparser, _parsetz
-
-_timelex = __deprecate_private_class(_timelex)
-_tzparser = __deprecate_private_class(_tzparser)
-_resultbase = __deprecate_private_class(_resultbase)
-_parsetz = __deprecated_private_func(_parsetz)
diff --git a/lib/dateutil/parser/_parser.py b/lib/dateutil/parser/_parser.py
deleted file mode 100644
index 37d1663b..00000000
--- a/lib/dateutil/parser/_parser.py
+++ /dev/null
@@ -1,1613 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-This module offers a generic date/time string parser which is able to parse
-most known formats to represent a date and/or time.
-
-This module attempts to be forgiving with regards to unlikely input formats,
-returning a datetime object even for dates which are ambiguous. If an element
-of a date/time stamp is omitted, the following rules are applied:
-
-- If AM or PM is left unspecified, a 24-hour clock is assumed, however, an hour
-  on a 12-hour clock (``0 <= hour <= 12``) *must* be specified if AM or PM is
-  specified.
-- If a time zone is omitted, a timezone-naive datetime is returned.
-
-If any other elements are missing, they are taken from the
-:class:`datetime.datetime` object passed to the parameter ``default``. If this
-results in a day number exceeding the valid number of days per month, the
-value falls back to the end of the month.
-
-Additional resources about date/time string formats can be found below:
-
-- `A summary of the international standard date and time notation
-  <https://www.cl.cam.ac.uk/~mgk25/iso-time.html>`_
-- `W3C Date and Time Formats <https://www.w3.org/TR/NOTE-datetime>`_
-- `Time Formats (Planetary Rings Node) <https://pds-rings.seti.org:443/tools/time_formats.html>`_
-- `CPAN ParseDate module
-  <https://metacpan.org/pod/release/MUIR/Time-modules-2013.0912/lib/Time/ParseDate.pm>`_
-- `Java SimpleDateFormat Class
-  <https://docs.oracle.com/javase/6/docs/api/java/text/SimpleDateFormat.html>`_
-"""
-from __future__ import unicode_literals
-
-import datetime
-import re
-import string
-import time
-import warnings
-
-from calendar import monthrange
-from io import StringIO
-
-import six
-from six import integer_types, text_type
-
-from decimal import Decimal
-
-from warnings import warn
-
-from .. import relativedelta
-from .. import tz
-
-__all__ = ["parse", "parserinfo", "ParserError"]
-
-
-# TODO: pandas.core.tools.datetimes imports this explicitly.  Might be worth
-# making public and/or figuring out if there is something we can
-# take off their plate.
-class _timelex(object):
-    # Fractional seconds are sometimes split by a comma
-    _split_decimal = re.compile("([.,])")
-
-    def __init__(self, instream):
-        if isinstance(instream, (bytes, bytearray)):
-            instream = instream.decode()
-
-        if isinstance(instream, text_type):
-            instream = StringIO(instream)
-        elif getattr(instream, 'read', None) is None:
-            raise TypeError('Parser must be a string or character stream, not '
-                            '{itype}'.format(itype=instream.__class__.__name__))
-
-        self.instream = instream
-        self.charstack = []
-        self.tokenstack = []
-        self.eof = False
-
-    def get_token(self):
-        """
-        This function breaks the time string into lexical units (tokens), which
-        can be parsed by the parser. Lexical units are demarcated by changes in
-        the character set, so any continuous string of letters is considered
-        one unit, any continuous string of numbers is considered one unit.
-
-        The main complication arises from the fact that dots ('.') can be used
-        both as separators (e.g. "Sep.20.2009") or decimal points (e.g.
-        "4:30:21.447"). As such, it is necessary to read the full context of
-        any dot-separated strings before breaking it into tokens; as such, this
-        function maintains a "token stack", for when the ambiguous context
-        demands that multiple tokens be parsed at once.
-        """
-        if self.tokenstack:
-            return self.tokenstack.pop(0)
-
-        seenletters = False
-        token = None
-        state = None
-
-        while not self.eof:
-            # We only realize that we've reached the end of a token when we
-            # find a character that's not part of the current token - since
-            # that character may be part of the next token, it's stored in the
-            # charstack.
-            if self.charstack:
-                nextchar = self.charstack.pop(0)
-            else:
-                nextchar = self.instream.read(1)
-                while nextchar == '\x00':
-                    nextchar = self.instream.read(1)
-
-            if not nextchar:
-                self.eof = True
-                break
-            elif not state:
-                # First character of the token - determines if we're starting
-                # to parse a word, a number or something else.
-                token = nextchar
-                if self.isword(nextchar):
-                    state = 'a'
-                elif self.isnum(nextchar):
-                    state = '0'
-                elif self.isspace(nextchar):
-                    token = ' '
-                    break  # emit token
-                else:
-                    break  # emit token
-            elif state == 'a':
-                # If we've already started reading a word, we keep reading
-                # letters until we find something that's not part of a word.
-                seenletters = True
-                if self.isword(nextchar):
-                    token += nextchar
-                elif nextchar == '.':
-                    token += nextchar
-                    state = 'a.'
-                else:
-                    self.charstack.append(nextchar)
-                    break  # emit token
-            elif state == '0':
-                # If we've already started reading a number, we keep reading
-                # numbers until we find something that doesn't fit.
-                if self.isnum(nextchar):
-                    token += nextchar
-                elif nextchar == '.' or (nextchar == ',' and len(token) >= 2):
-                    token += nextchar
-                    state = '0.'
-                else:
-                    self.charstack.append(nextchar)
-                    break  # emit token
-            elif state == 'a.':
-                # If we've seen some letters and a dot separator, continue
-                # parsing, and the tokens will be broken up later.
-                seenletters = True
-                if nextchar == '.' or self.isword(nextchar):
-                    token += nextchar
-                elif self.isnum(nextchar) and token[-1] == '.':
-                    token += nextchar
-                    state = '0.'
-                else:
-                    self.charstack.append(nextchar)
-                    break  # emit token
-            elif state == '0.':
-                # If we've seen at least one dot separator, keep going, we'll
-                # break up the tokens later.
-                if nextchar == '.' or self.isnum(nextchar):
-                    token += nextchar
-                elif self.isword(nextchar) and token[-1] == '.':
-                    token += nextchar
-                    state = 'a.'
-                else:
-                    self.charstack.append(nextchar)
-                    break  # emit token
-
-        if (state in ('a.', '0.') and (seenletters or token.count('.') > 1 or
-                                       token[-1] in '.,')):
-            l = self._split_decimal.split(token)
-            token = l[0]
-            for tok in l[1:]:
-                if tok:
-                    self.tokenstack.append(tok)
-
-        if state == '0.' and token.count('.') == 0:
-            token = token.replace(',', '.')
-
-        return token
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        token = self.get_token()
-        if token is None:
-            raise StopIteration
-
-        return token
-
-    def next(self):
-        return self.__next__()  # Python 2.x support
-
-    @classmethod
-    def split(cls, s):
-        return list(cls(s))
-
-    @classmethod
-    def isword(cls, nextchar):
-        """ Whether or not the next character is part of a word """
-        return nextchar.isalpha()
-
-    @classmethod
-    def isnum(cls, nextchar):
-        """ Whether the next character is part of a number """
-        return nextchar.isdigit()
-
-    @classmethod
-    def isspace(cls, nextchar):
-        """ Whether the next character is whitespace """
-        return nextchar.isspace()
-
-
-class _resultbase(object):
-
-    def __init__(self):
-        for attr in self.__slots__:
-            setattr(self, attr, None)
-
-    def _repr(self, classname):
-        l = []
-        for attr in self.__slots__:
-            value = getattr(self, attr)
-            if value is not None:
-                l.append("%s=%s" % (attr, repr(value)))
-        return "%s(%s)" % (classname, ", ".join(l))
-
-    def __len__(self):
-        return (sum(getattr(self, attr) is not None
-                    for attr in self.__slots__))
-
-    def __repr__(self):
-        return self._repr(self.__class__.__name__)
-
-
-class parserinfo(object):
-    """
-    Class which handles what inputs are accepted. Subclass this to customize
-    the language and acceptable values for each parameter.
-
-    :param dayfirst:
-        Whether to interpret the first value in an ambiguous 3-integer date
-        (e.g. 01/05/09) as the day (``True``) or month (``False``). If
-        ``yearfirst`` is set to ``True``, this distinguishes between YDM
-        and YMD. Default is ``False``.
-
-    :param yearfirst:
-        Whether to interpret the first value in an ambiguous 3-integer date
-        (e.g. 01/05/09) as the year. If ``True``, the first number is taken
-        to be the year, otherwise the last number is taken to be the year.
-        Default is ``False``.
-    """
-
-    # m from a.m/p.m, t from ISO T separator
-    JUMP = [" ", ".", ",", ";", "-", "/", "'",
-            "at", "on", "and", "ad", "m", "t", "of",
-            "st", "nd", "rd", "th"]
-
-    WEEKDAYS = [("Mon", "Monday"),
-                ("Tue", "Tuesday"),     # TODO: "Tues"
-                ("Wed", "Wednesday"),
-                ("Thu", "Thursday"),    # TODO: "Thurs"
-                ("Fri", "Friday"),
-                ("Sat", "Saturday"),
-                ("Sun", "Sunday")]
-    MONTHS = [("Jan", "January"),
-              ("Feb", "February"),      # TODO: "Febr"
-              ("Mar", "March"),
-              ("Apr", "April"),
-              ("May", "May"),
-              ("Jun", "June"),
-              ("Jul", "July"),
-              ("Aug", "August"),
-              ("Sep", "Sept", "September"),
-              ("Oct", "October"),
-              ("Nov", "November"),
-              ("Dec", "December")]
-    HMS = [("h", "hour", "hours"),
-           ("m", "minute", "minutes"),
-           ("s", "second", "seconds")]
-    AMPM = [("am", "a"),
-            ("pm", "p")]
-    UTCZONE = ["UTC", "GMT", "Z", "z"]
-    PERTAIN = ["of"]
-    TZOFFSET = {}
-    # TODO: ERA = ["AD", "BC", "CE", "BCE", "Stardate",
-    #              "Anno Domini", "Year of Our Lord"]
-
-    def __init__(self, dayfirst=False, yearfirst=False):
-        self._jump = self._convert(self.JUMP)
-        self._weekdays = self._convert(self.WEEKDAYS)
-        self._months = self._convert(self.MONTHS)
-        self._hms = self._convert(self.HMS)
-        self._ampm = self._convert(self.AMPM)
-        self._utczone = self._convert(self.UTCZONE)
-        self._pertain = self._convert(self.PERTAIN)
-
-        self.dayfirst = dayfirst
-        self.yearfirst = yearfirst
-
-        self._year = time.localtime().tm_year
-        self._century = self._year // 100 * 100
-
-    def _convert(self, lst):
-        dct = {}
-        for i, v in enumerate(lst):
-            if isinstance(v, tuple):
-                for v in v:
-                    dct[v.lower()] = i
-            else:
-                dct[v.lower()] = i
-        return dct
-
-    def jump(self, name):
-        return name.lower() in self._jump
-
-    def weekday(self, name):
-        try:
-            return self._weekdays[name.lower()]
-        except KeyError:
-            pass
-        return None
-
-    def month(self, name):
-        try:
-            return self._months[name.lower()] + 1
-        except KeyError:
-            pass
-        return None
-
-    def hms(self, name):
-        try:
-            return self._hms[name.lower()]
-        except KeyError:
-            return None
-
-    def ampm(self, name):
-        try:
-            return self._ampm[name.lower()]
-        except KeyError:
-            return None
-
-    def pertain(self, name):
-        return name.lower() in self._pertain
-
-    def utczone(self, name):
-        return name.lower() in self._utczone
-
-    def tzoffset(self, name):
-        if name in self._utczone:
-            return 0
-
-        return self.TZOFFSET.get(name)
-
-    def convertyear(self, year, century_specified=False):
-        """
-        Converts two-digit years to year within [-50, 49]
-        range of self._year (current local time)
-        """
-
-        # Function contract is that the year is always positive
-        assert year >= 0
-
-        if year < 100 and not century_specified:
-            # assume current century to start
-            year += self._century
-
-            if year >= self._year + 50:  # if too far in future
-                year -= 100
-            elif year < self._year - 50:  # if too far in past
-                year += 100
-
-        return year
-
-    def validate(self, res):
-        # move to info
-        if res.year is not None:
-            res.year = self.convertyear(res.year, res.century_specified)
-
-        if ((res.tzoffset == 0 and not res.tzname) or
-             (res.tzname == 'Z' or res.tzname == 'z')):
-            res.tzname = "UTC"
-            res.tzoffset = 0
-        elif res.tzoffset != 0 and res.tzname and self.utczone(res.tzname):
-            res.tzoffset = 0
-        return True
-
-
-class _ymd(list):
-    def __init__(self, *args, **kwargs):
-        super(self.__class__, self).__init__(*args, **kwargs)
-        self.century_specified = False
-        self.dstridx = None
-        self.mstridx = None
-        self.ystridx = None
-
-    @property
-    def has_year(self):
-        return self.ystridx is not None
-
-    @property
-    def has_month(self):
-        return self.mstridx is not None
-
-    @property
-    def has_day(self):
-        return self.dstridx is not None
-
-    def could_be_day(self, value):
-        if self.has_day:
-            return False
-        elif not self.has_month:
-            return 1 <= value <= 31
-        elif not self.has_year:
-            # Be permissive, assume leap year
-            month = self[self.mstridx]
-            return 1 <= value <= monthrange(2000, month)[1]
-        else:
-            month = self[self.mstridx]
-            year = self[self.ystridx]
-            return 1 <= value <= monthrange(year, month)[1]
-
-    def append(self, val, label=None):
-        if hasattr(val, '__len__'):
-            if val.isdigit() and len(val) > 2:
-                self.century_specified = True
-                if label not in [None, 'Y']:  # pragma: no cover
-                    raise ValueError(label)
-                label = 'Y'
-        elif val > 100:
-            self.century_specified = True
-            if label not in [None, 'Y']:  # pragma: no cover
-                raise ValueError(label)
-            label = 'Y'
-
-        super(self.__class__, self).append(int(val))
-
-        if label == 'M':
-            if self.has_month:
-                raise ValueError('Month is already set')
-            self.mstridx = len(self) - 1
-        elif label == 'D':
-            if self.has_day:
-                raise ValueError('Day is already set')
-            self.dstridx = len(self) - 1
-        elif label == 'Y':
-            if self.has_year:
-                raise ValueError('Year is already set')
-            self.ystridx = len(self) - 1
-
-    def _resolve_from_stridxs(self, strids):
-        """
-        Try to resolve the identities of year/month/day elements using
-        ystridx, mstridx, and dstridx, if enough of these are specified.
-        """
-        if len(self) == 3 and len(strids) == 2:
-            # we can back out the remaining stridx value
-            missing = [x for x in range(3) if x not in strids.values()]
-            key = [x for x in ['y', 'm', 'd'] if x not in strids]
-            assert len(missing) == len(key) == 1
-            key = key[0]
-            val = missing[0]
-            strids[key] = val
-
-        assert len(self) == len(strids)  # otherwise this should not be called
-        out = {key: self[strids[key]] for key in strids}
-        return (out.get('y'), out.get('m'), out.get('d'))
-
-    def resolve_ymd(self, yearfirst, dayfirst):
-        len_ymd = len(self)
-        year, month, day = (None, None, None)
-
-        strids = (('y', self.ystridx),
-                  ('m', self.mstridx),
-                  ('d', self.dstridx))
-
-        strids = {key: val for key, val in strids if val is not None}
-        if (len(self) == len(strids) > 0 or
-                (len(self) == 3 and len(strids) == 2)):
-            return self._resolve_from_stridxs(strids)
-
-        mstridx = self.mstridx
-
-        if len_ymd > 3:
-            raise ValueError("More than three YMD values")
-        elif len_ymd == 1 or (mstridx is not None and len_ymd == 2):
-            # One member, or two members with a month string
-            if mstridx is not None:
-                month = self[mstridx]
-                # since mstridx is 0 or 1, self[mstridx-1] always
-                # looks up the other element
-                other = self[mstridx - 1]
-            else:
-                other = self[0]
-
-            if len_ymd > 1 or mstridx is None:
-                if other > 31:
-                    year = other
-                else:
-                    day = other
-
-        elif len_ymd == 2:
-            # Two members with numbers
-            if self[0] > 31:
-                # 99-01
-                year, month = self
-            elif self[1] > 31:
-                # 01-99
-                month, year = self
-            elif dayfirst and self[1] <= 12:
-                # 13-01
-                day, month = self
-            else:
-                # 01-13
-                month, day = self
-
-        elif len_ymd == 3:
-            # Three members
-            if mstridx == 0:
-                if self[1] > 31:
-                    # Apr-2003-25
-                    month, year, day = self
-                else:
-                    month, day, year = self
-            elif mstridx == 1:
-                if self[0] > 31 or (yearfirst and self[2] <= 31):
-                    # 99-Jan-01
-                    year, month, day = self
-                else:
-                    # 01-Jan-01
-                    # Give precedence to day-first, since
-                    # two-digit years is usually hand-written.
-                    day, month, year = self
-
-            elif mstridx == 2:
-                # WTF!?
-                if self[1] > 31:
-                    # 01-99-Jan
-                    day, year, month = self
-                else:
-                    # 99-01-Jan
-                    year, day, month = self
-
-            else:
-                if (self[0] > 31 or
-                    self.ystridx == 0 or
-                        (yearfirst and self[1] <= 12 and self[2] <= 31)):
-                    # 99-01-01
-                    if dayfirst and self[2] <= 12:
-                        year, day, month = self
-                    else:
-                        year, month, day = self
-                elif self[0] > 12 or (dayfirst and self[1] <= 12):
-                    # 13-01-01
-                    day, month, year = self
-                else:
-                    # 01-13-01
-                    month, day, year = self
-
-        return year, month, day
-
-
-class parser(object):
-    def __init__(self, info=None):
-        self.info = info or parserinfo()
-
-    def parse(self, timestr, default=None,
-              ignoretz=False, tzinfos=None, **kwargs):
-        """
-        Parse the date/time string into a :class:`datetime.datetime` object.
-
-        :param timestr:
-            Any date/time string using the supported formats.
-
-        :param default:
-            The default datetime object, if this is a datetime object and not
-            ``None``, elements specified in ``timestr`` replace elements in the
-            default object.
-
-        :param ignoretz:
-            If set ``True``, time zones in parsed strings are ignored and a
-            naive :class:`datetime.datetime` object is returned.
-
-        :param tzinfos:
-            Additional time zone names / aliases which may be present in the
-            string. This argument maps time zone names (and optionally offsets
-            from those time zones) to time zones. This parameter can be a
-            dictionary with timezone aliases mapping time zone names to time
-            zones or a function taking two parameters (``tzname`` and
-            ``tzoffset``) and returning a time zone.
-
-            The timezones to which the names are mapped can be an integer
-            offset from UTC in seconds or a :class:`tzinfo` object.
-
-            .. doctest::
-               :options: +NORMALIZE_WHITESPACE
-
-                >>> from dateutil.parser import parse
-                >>> from dateutil.tz import gettz
-                >>> tzinfos = {"BRST": -7200, "CST": gettz("America/Chicago")}
-                >>> parse("2012-01-19 17:21:00 BRST", tzinfos=tzinfos)
-                datetime.datetime(2012, 1, 19, 17, 21, tzinfo=tzoffset(u'BRST', -7200))
-                >>> parse("2012-01-19 17:21:00 CST", tzinfos=tzinfos)
-                datetime.datetime(2012, 1, 19, 17, 21,
-                                  tzinfo=tzfile('/usr/share/zoneinfo/America/Chicago'))
-
-            This parameter is ignored if ``ignoretz`` is set.
-
-        :param \\*\\*kwargs:
-            Keyword arguments as passed to ``_parse()``.
-
-        :return:
-            Returns a :class:`datetime.datetime` object or, if the
-            ``fuzzy_with_tokens`` option is ``True``, returns a tuple, the
-            first element being a :class:`datetime.datetime` object, the second
-            a tuple containing the fuzzy tokens.
-
-        :raises ParserError:
-            Raised for invalid or unknown string format, if the provided
-            :class:`tzinfo` is not in a valid format, or if an invalid date
-            would be created.
-
-        :raises TypeError:
-            Raised for non-string or character stream input.
-
-        :raises OverflowError:
-            Raised if the parsed date exceeds the largest valid C integer on
-            your system.
-        """
-
-        if default is None:
-            default = datetime.datetime.now().replace(hour=0, minute=0,
-                                                      second=0, microsecond=0)
-
-        res, skipped_tokens = self._parse(timestr, **kwargs)
-
-        if res is None:
-            raise ParserError("Unknown string format: %s", timestr)
-
-        if len(res) == 0:
-            raise ParserError("String does not contain a date: %s", timestr)
-
-        try:
-            ret = self._build_naive(res, default)
-        except ValueError as e:
-            six.raise_from(ParserError(str(e) + ": %s", timestr), e)
-
-        if not ignoretz:
-            ret = self._build_tzaware(ret, res, tzinfos)
-
-        if kwargs.get('fuzzy_with_tokens', False):
-            return ret, skipped_tokens
-        else:
-            return ret
-
-    class _result(_resultbase):
-        __slots__ = ["year", "month", "day", "weekday",
-                     "hour", "minute", "second", "microsecond",
-                     "tzname", "tzoffset", "ampm","any_unused_tokens"]
-
-    def _parse(self, timestr, dayfirst=None, yearfirst=None, fuzzy=False,
-               fuzzy_with_tokens=False):
-        """
-        Private method which performs the heavy lifting of parsing, called from
-        ``parse()``, which passes on its ``kwargs`` to this function.
-
-        :param timestr:
-            The string to parse.
-
-        :param dayfirst:
-            Whether to interpret the first value in an ambiguous 3-integer date
-            (e.g. 01/05/09) as the day (``True``) or month (``False``). If
-            ``yearfirst`` is set to ``True``, this distinguishes between YDM
-            and YMD. If set to ``None``, this value is retrieved from the
-            current :class:`parserinfo` object (which itself defaults to
-            ``False``).
-
-        :param yearfirst:
-            Whether to interpret the first value in an ambiguous 3-integer date
-            (e.g. 01/05/09) as the year. If ``True``, the first number is taken
-            to be the year, otherwise the last number is taken to be the year.
-            If this is set to ``None``, the value is retrieved from the current
-            :class:`parserinfo` object (which itself defaults to ``False``).
-
-        :param fuzzy:
-            Whether to allow fuzzy parsing, allowing for string like "Today is
-            January 1, 2047 at 8:21:00AM".
-
-        :param fuzzy_with_tokens:
-            If ``True``, ``fuzzy`` is automatically set to True, and the parser
-            will return a tuple where the first element is the parsed
-            :class:`datetime.datetime` datetimestamp and the second element is
-            a tuple containing the portions of the string which were ignored:
-
-            .. doctest::
-
-                >>> from dateutil.parser import parse
-                >>> parse("Today is January 1, 2047 at 8:21:00AM", fuzzy_with_tokens=True)
-                (datetime.datetime(2047, 1, 1, 8, 21), (u'Today is ', u' ', u'at '))
-
-        """
-        if fuzzy_with_tokens:
-            fuzzy = True
-
-        info = self.info
-
-        if dayfirst is None:
-            dayfirst = info.dayfirst
-
-        if yearfirst is None:
-            yearfirst = info.yearfirst
-
-        res = self._result()
-        l = _timelex.split(timestr)         # Splits the timestr into tokens
-
-        skipped_idxs = []
-
-        # year/month/day list
-        ymd = _ymd()
-
-        len_l = len(l)
-        i = 0
-        try:
-            while i < len_l:
-
-                # Check if it's a number
-                value_repr = l[i]
-                try:
-                    value = float(value_repr)
-                except ValueError:
-                    value = None
-
-                if value is not None:
-                    # Numeric token
-                    i = self._parse_numeric_token(l, i, info, ymd, res, fuzzy)
-
-                # Check weekday
-                elif info.weekday(l[i]) is not None:
-                    value = info.weekday(l[i])
-                    res.weekday = value
-
-                # Check month name
-                elif info.month(l[i]) is not None:
-                    value = info.month(l[i])
-                    ymd.append(value, 'M')
-
-                    if i + 1 < len_l:
-                        if l[i + 1] in ('-', '/'):
-                            # Jan-01[-99]
-                            sep = l[i + 1]
-                            ymd.append(l[i + 2])
-
-                            if i + 3 < len_l and l[i + 3] == sep:
-                                # Jan-01-99
-                                ymd.append(l[i + 4])
-                                i += 2
-
-                            i += 2
-
-                        elif (i + 4 < len_l and l[i + 1] == l[i + 3] == ' ' and
-                              info.pertain(l[i + 2])):
-                            # Jan of 01
-                            # In this case, 01 is clearly year
-                            if l[i + 4].isdigit():
-                                # Convert it here to become unambiguous
-                                value = int(l[i + 4])
-                                year = str(info.convertyear(value))
-                                ymd.append(year, 'Y')
-                            else:
-                                # Wrong guess
-                                pass
-                                # TODO: not hit in tests
-                            i += 4
-
-                # Check am/pm
-                elif info.ampm(l[i]) is not None:
-                    value = info.ampm(l[i])
-                    val_is_ampm = self._ampm_valid(res.hour, res.ampm, fuzzy)
-
-                    if val_is_ampm:
-                        res.hour = self._adjust_ampm(res.hour, value)
-                        res.ampm = value
-
-                    elif fuzzy:
-                        skipped_idxs.append(i)
-
-                # Check for a timezone name
-                elif self._could_be_tzname(res.hour, res.tzname, res.tzoffset, l[i]):
-                    res.tzname = l[i]
-                    res.tzoffset = info.tzoffset(res.tzname)
-
-                    # Check for something like GMT+3, or BRST+3. Notice
-                    # that it doesn't mean "I am 3 hours after GMT", but
-                    # "my time +3 is GMT". If found, we reverse the
-                    # logic so that timezone parsing code will get it
-                    # right.
-                    if i + 1 < len_l and l[i + 1] in ('+', '-'):
-                        l[i + 1] = ('+', '-')[l[i + 1] == '+']
-                        res.tzoffset = None
-                        if info.utczone(res.tzname):
-                            # With something like GMT+3, the timezone
-                            # is *not* GMT.
-                            res.tzname = None
-
-                # Check for a numbered timezone
-                elif res.hour is not None and l[i] in ('+', '-'):
-                    signal = (-1, 1)[l[i] == '+']
-                    len_li = len(l[i + 1])
-
-                    # TODO: check that l[i + 1] is integer?
-                    if len_li == 4:
-                        # -0300
-                        hour_offset = int(l[i + 1][:2])
-                        min_offset = int(l[i + 1][2:])
-                    elif i + 2 < len_l and l[i + 2] == ':':
-                        # -03:00
-                        hour_offset = int(l[i + 1])
-                        min_offset = int(l[i + 3])  # TODO: Check that l[i+3] is minute-like?
-                        i += 2
-                    elif len_li <= 2:
-                        # -[0]3
-                        hour_offset = int(l[i + 1][:2])
-                        min_offset = 0
-                    else:
-                        raise ValueError(timestr)
-
-                    res.tzoffset = signal * (hour_offset * 3600 + min_offset * 60)
-
-                    # Look for a timezone name between parenthesis
-                    if (i + 5 < len_l and
-                            info.jump(l[i + 2]) and l[i + 3] == '(' and
-                            l[i + 5] == ')' and
-                            3 <= len(l[i + 4]) and
-                            self._could_be_tzname(res.hour, res.tzname,
-                                                  None, l[i + 4])):
-                        # -0300 (BRST)
-                        res.tzname = l[i + 4]
-                        i += 4
-
-                    i += 1
-
-                # Check jumps
-                elif not (info.jump(l[i]) or fuzzy):
-                    raise ValueError(timestr)
-
-                else:
-                    skipped_idxs.append(i)
-                i += 1
-
-            # Process year/month/day
-            year, month, day = ymd.resolve_ymd(yearfirst, dayfirst)
-
-            res.century_specified = ymd.century_specified
-            res.year = year
-            res.month = month
-            res.day = day
-
-        except (IndexError, ValueError):
-            return None, None
-
-        if not info.validate(res):
-            return None, None
-
-        if fuzzy_with_tokens:
-            skipped_tokens = self._recombine_skipped(l, skipped_idxs)
-            return res, tuple(skipped_tokens)
-        else:
-            return res, None
-
-    def _parse_numeric_token(self, tokens, idx, info, ymd, res, fuzzy):
-        # Token is a number
-        value_repr = tokens[idx]
-        try:
-            value = self._to_decimal(value_repr)
-        except Exception as e:
-            six.raise_from(ValueError('Unknown numeric token'), e)
-
-        len_li = len(value_repr)
-
-        len_l = len(tokens)
-
-        if (len(ymd) == 3 and len_li in (2, 4) and
-            res.hour is None and
-            (idx + 1 >= len_l or
-             (tokens[idx + 1] != ':' and
-              info.hms(tokens[idx + 1]) is None))):
-            # 19990101T23[59]
-            s = tokens[idx]
-            res.hour = int(s[:2])
-
-            if len_li == 4:
-                res.minute = int(s[2:])
-
-        elif len_li == 6 or (len_li > 6 and tokens[idx].find('.') == 6):
-            # YYMMDD or HHMMSS[.ss]
-            s = tokens[idx]
-
-            if not ymd and '.' not in tokens[idx]:
-                ymd.append(s[:2])
-                ymd.append(s[2:4])
-                ymd.append(s[4:])
-            else:
-                # 19990101T235959[.59]
-
-                # TODO: Check if res attributes already set.
-                res.hour = int(s[:2])
-                res.minute = int(s[2:4])
-                res.second, res.microsecond = self._parsems(s[4:])
-
-        elif len_li in (8, 12, 14):
-            # YYYYMMDD
-            s = tokens[idx]
-            ymd.append(s[:4], 'Y')
-            ymd.append(s[4:6])
-            ymd.append(s[6:8])
-
-            if len_li > 8:
-                res.hour = int(s[8:10])
-                res.minute = int(s[10:12])
-
-                if len_li > 12:
-                    res.second = int(s[12:])
-
-        elif self._find_hms_idx(idx, tokens, info, allow_jump=True) is not None:
-            # HH[ ]h or MM[ ]m or SS[.ss][ ]s
-            hms_idx = self._find_hms_idx(idx, tokens, info, allow_jump=True)
-            (idx, hms) = self._parse_hms(idx, tokens, info, hms_idx)
-            if hms is not None:
-                # TODO: checking that hour/minute/second are not
-                # already set?
-                self._assign_hms(res, value_repr, hms)
-
-        elif idx + 2 < len_l and tokens[idx + 1] == ':':
-            # HH:MM[:SS[.ss]]
-            res.hour = int(value)
-            value = self._to_decimal(tokens[idx + 2])  # TODO: try/except for this?
-            (res.minute, res.second) = self._parse_min_sec(value)
-
-            if idx + 4 < len_l and tokens[idx + 3] == ':':
-                res.second, res.microsecond = self._parsems(tokens[idx + 4])
-
-                idx += 2
-
-            idx += 2
-
-        elif idx + 1 < len_l and tokens[idx + 1] in ('-', '/', '.'):
-            sep = tokens[idx + 1]
-            ymd.append(value_repr)
-
-            if idx + 2 < len_l and not info.jump(tokens[idx + 2]):
-                if tokens[idx + 2].isdigit():
-                    # 01-01[-01]
-                    ymd.append(tokens[idx + 2])
-                else:
-                    # 01-Jan[-01]
-                    value = info.month(tokens[idx + 2])
-
-                    if value is not None:
-                        ymd.append(value, 'M')
-                    else:
-                        raise ValueError()
-
-                if idx + 3 < len_l and tokens[idx + 3] == sep:
-                    # We have three members
-                    value = info.month(tokens[idx + 4])
-
-                    if value is not None:
-                        ymd.append(value, 'M')
-                    else:
-                        ymd.append(tokens[idx + 4])
-                    idx += 2
-
-                idx += 1
-            idx += 1
-
-        elif idx + 1 >= len_l or info.jump(tokens[idx + 1]):
-            if idx + 2 < len_l and info.ampm(tokens[idx + 2]) is not None:
-                # 12 am
-                hour = int(value)
-                res.hour = self._adjust_ampm(hour, info.ampm(tokens[idx + 2]))
-                idx += 1
-            else:
-                # Year, month or day
-                ymd.append(value)
-            idx += 1
-
-        elif info.ampm(tokens[idx + 1]) is not None and (0 <= value < 24):
-            # 12am
-            hour = int(value)
-            res.hour = self._adjust_ampm(hour, info.ampm(tokens[idx + 1]))
-            idx += 1
-
-        elif ymd.could_be_day(value):
-            ymd.append(value)
-
-        elif not fuzzy:
-            raise ValueError()
-
-        return idx
-
-    def _find_hms_idx(self, idx, tokens, info, allow_jump):
-        len_l = len(tokens)
-
-        if idx+1 < len_l and info.hms(tokens[idx+1]) is not None:
-            # There is an "h", "m", or "s" label following this token.  We take
-            # assign the upcoming label to the current token.
-            # e.g. the "12" in 12h"
-            hms_idx = idx + 1
-
-        elif (allow_jump and idx+2 < len_l and tokens[idx+1] == ' ' and
-              info.hms(tokens[idx+2]) is not None):
-            # There is a space and then an "h", "m", or "s" label.
-            # e.g. the "12" in "12 h"
-            hms_idx = idx + 2
-
-        elif idx > 0 and info.hms(tokens[idx-1]) is not None:
-            # There is a "h", "m", or "s" preceding this token.  Since neither
-            # of the previous cases was hit, there is no label following this
-            # token, so we use the previous label.
-            # e.g. the "04" in "12h04"
-            hms_idx = idx-1
-
-        elif (1 < idx == len_l-1 and tokens[idx-1] == ' ' and
-              info.hms(tokens[idx-2]) is not None):
-            # If we are looking at the final token, we allow for a
-            # backward-looking check to skip over a space.
-            # TODO: Are we sure this is the right condition here?
-            hms_idx = idx - 2
-
-        else:
-            hms_idx = None
-
-        return hms_idx
-
-    def _assign_hms(self, res, value_repr, hms):
-        # See GH issue #427, fixing float rounding
-        value = self._to_decimal(value_repr)
-
-        if hms == 0:
-            # Hour
-            res.hour = int(value)
-            if value % 1:
-                res.minute = int(60*(value % 1))
-
-        elif hms == 1:
-            (res.minute, res.second) = self._parse_min_sec(value)
-
-        elif hms == 2:
-            (res.second, res.microsecond) = self._parsems(value_repr)
-
-    def _could_be_tzname(self, hour, tzname, tzoffset, token):
-        return (hour is not None and
-                tzname is None and
-                tzoffset is None and
-                len(token) <= 5 and
-                (all(x in string.ascii_uppercase for x in token)
-                 or token in self.info.UTCZONE))
-
-    def _ampm_valid(self, hour, ampm, fuzzy):
-        """
-        For fuzzy parsing, 'a' or 'am' (both valid English words)
-        may erroneously trigger the AM/PM flag. Deal with that
-        here.
-        """
-        val_is_ampm = True
-
-        # If there's already an AM/PM flag, this one isn't one.
-        if fuzzy and ampm is not None:
-            val_is_ampm = False
-
-        # If AM/PM is found and hour is not, raise a ValueError
-        if hour is None:
-            if fuzzy:
-                val_is_ampm = False
-            else:
-                raise ValueError('No hour specified with AM or PM flag.')
-        elif not 0 <= hour <= 12:
-            # If AM/PM is found, it's a 12 hour clock, so raise
-            # an error for invalid range
-            if fuzzy:
-                val_is_ampm = False
-            else:
-                raise ValueError('Invalid hour specified for 12-hour clock.')
-
-        return val_is_ampm
-
-    def _adjust_ampm(self, hour, ampm):
-        if hour < 12 and ampm == 1:
-            hour += 12
-        elif hour == 12 and ampm == 0:
-            hour = 0
-        return hour
-
-    def _parse_min_sec(self, value):
-        # TODO: Every usage of this function sets res.second to the return
-        # value. Are there any cases where second will be returned as None and
-        # we *don't* want to set res.second = None?
-        minute = int(value)
-        second = None
-
-        sec_remainder = value % 1
-        if sec_remainder:
-            second = int(60 * sec_remainder)
-        return (minute, second)
-
-    def _parse_hms(self, idx, tokens, info, hms_idx):
-        # TODO: Is this going to admit a lot of false-positives for when we
-        # just happen to have digits and "h", "m" or "s" characters in non-date
-        # text?  I guess hex hashes won't have that problem, but there's plenty
-        # of random junk out there.
-        if hms_idx is None:
-            hms = None
-            new_idx = idx
-        elif hms_idx > idx:
-            hms = info.hms(tokens[hms_idx])
-            new_idx = hms_idx
-        else:
-            # Looking backwards, increment one.
-            hms = info.hms(tokens[hms_idx]) + 1
-            new_idx = idx
-
-        return (new_idx, hms)
-
-    # ------------------------------------------------------------------
-    # Handling for individual tokens.  These are kept as methods instead
-    #  of functions for the sake of customizability via subclassing.
-
-    def _parsems(self, value):
-        """Parse a I[.F] seconds value into (seconds, microseconds)."""
-        if "." not in value:
-            return int(value), 0
-        else:
-            i, f = value.split(".")
-            return int(i), int(f.ljust(6, "0")[:6])
-
-    def _to_decimal(self, val):
-        try:
-            decimal_value = Decimal(val)
-            # See GH 662, edge case, infinite value should not be converted
-            #  via `_to_decimal`
-            if not decimal_value.is_finite():
-                raise ValueError("Converted decimal value is infinite or NaN")
-        except Exception as e:
-            msg = "Could not convert %s to decimal" % val
-            six.raise_from(ValueError(msg), e)
-        else:
-            return decimal_value
-
-    # ------------------------------------------------------------------
-    # Post-Parsing construction of datetime output.  These are kept as
-    #  methods instead of functions for the sake of customizability via
-    #  subclassing.
-
-    def _build_tzinfo(self, tzinfos, tzname, tzoffset):
-        if callable(tzinfos):
-            tzdata = tzinfos(tzname, tzoffset)
-        else:
-            tzdata = tzinfos.get(tzname)
-        # handle case where tzinfo is paased an options that returns None
-        # eg tzinfos = {'BRST' : None}
-        if isinstance(tzdata, datetime.tzinfo) or tzdata is None:
-            tzinfo = tzdata
-        elif isinstance(tzdata, text_type):
-            tzinfo = tz.tzstr(tzdata)
-        elif isinstance(tzdata, integer_types):
-            tzinfo = tz.tzoffset(tzname, tzdata)
-        else:
-            raise TypeError("Offset must be tzinfo subclass, tz string, "
-                            "or int offset.")
-        return tzinfo
-
-    def _build_tzaware(self, naive, res, tzinfos):
-        if (callable(tzinfos) or (tzinfos and res.tzname in tzinfos)):
-            tzinfo = self._build_tzinfo(tzinfos, res.tzname, res.tzoffset)
-            aware = naive.replace(tzinfo=tzinfo)
-            aware = self._assign_tzname(aware, res.tzname)
-
-        elif res.tzname and res.tzname in time.tzname:
-            aware = naive.replace(tzinfo=tz.tzlocal())
-
-            # Handle ambiguous local datetime
-            aware = self._assign_tzname(aware, res.tzname)
-
-            # This is mostly relevant for winter GMT zones parsed in the UK
-            if (aware.tzname() != res.tzname and
-                    res.tzname in self.info.UTCZONE):
-                aware = aware.replace(tzinfo=tz.UTC)
-
-        elif res.tzoffset == 0:
-            aware = naive.replace(tzinfo=tz.UTC)
-
-        elif res.tzoffset:
-            aware = naive.replace(tzinfo=tz.tzoffset(res.tzname, res.tzoffset))
-
-        elif not res.tzname and not res.tzoffset:
-            # i.e. no timezone information was found.
-            aware = naive
-
-        elif res.tzname:
-            # tz-like string was parsed but we don't know what to do
-            # with it
-            warnings.warn("tzname {tzname} identified but not understood.  "
-                          "Pass `tzinfos` argument in order to correctly "
-                          "return a timezone-aware datetime.  In a future "
-                          "version, this will raise an "
-                          "exception.".format(tzname=res.tzname),
-                          category=UnknownTimezoneWarning)
-            aware = naive
-
-        return aware
-
-    def _build_naive(self, res, default):
-        repl = {}
-        for attr in ("year", "month", "day", "hour",
-                     "minute", "second", "microsecond"):
-            value = getattr(res, attr)
-            if value is not None:
-                repl[attr] = value
-
-        if 'day' not in repl:
-            # If the default day exceeds the last day of the month, fall back
-            # to the end of the month.
-            cyear = default.year if res.year is None else res.year
-            cmonth = default.month if res.month is None else res.month
-            cday = default.day if res.day is None else res.day
-
-            if cday > monthrange(cyear, cmonth)[1]:
-                repl['day'] = monthrange(cyear, cmonth)[1]
-
-        naive = default.replace(**repl)
-
-        if res.weekday is not None and not res.day:
-            naive = naive + relativedelta.relativedelta(weekday=res.weekday)
-
-        return naive
-
-    def _assign_tzname(self, dt, tzname):
-        if dt.tzname() != tzname:
-            new_dt = tz.enfold(dt, fold=1)
-            if new_dt.tzname() == tzname:
-                return new_dt
-
-        return dt
-
-    def _recombine_skipped(self, tokens, skipped_idxs):
-        """
-        >>> tokens = ["foo", " ", "bar", " ", "19June2000", "baz"]
-        >>> skipped_idxs = [0, 1, 2, 5]
-        >>> _recombine_skipped(tokens, skipped_idxs)
-        ["foo bar", "baz"]
-        """
-        skipped_tokens = []
-        for i, idx in enumerate(sorted(skipped_idxs)):
-            if i > 0 and idx - 1 == skipped_idxs[i - 1]:
-                skipped_tokens[-1] = skipped_tokens[-1] + tokens[idx]
-            else:
-                skipped_tokens.append(tokens[idx])
-
-        return skipped_tokens
-
-
-DEFAULTPARSER = parser()
-
-
-def parse(timestr, parserinfo=None, **kwargs):
-    """
-
-    Parse a string in one of the supported formats, using the
-    ``parserinfo`` parameters.
-
-    :param timestr:
-        A string containing a date/time stamp.
-
-    :param parserinfo:
-        A :class:`parserinfo` object containing parameters for the parser.
-        If ``None``, the default arguments to the :class:`parserinfo`
-        constructor are used.
-
-    The ``**kwargs`` parameter takes the following keyword arguments:
-
-    :param default:
-        The default datetime object, if this is a datetime object and not
-        ``None``, elements specified in ``timestr`` replace elements in the
-        default object.
-
-    :param ignoretz:
-        If set ``True``, time zones in parsed strings are ignored and a naive
-        :class:`datetime` object is returned.
-
-    :param tzinfos:
-        Additional time zone names / aliases which may be present in the
-        string. This argument maps time zone names (and optionally offsets
-        from those time zones) to time zones. This parameter can be a
-        dictionary with timezone aliases mapping time zone names to time
-        zones or a function taking two parameters (``tzname`` and
-        ``tzoffset``) and returning a time zone.
-
-        The timezones to which the names are mapped can be an integer
-        offset from UTC in seconds or a :class:`tzinfo` object.
-
-        .. doctest::
-           :options: +NORMALIZE_WHITESPACE
-
-            >>> from dateutil.parser import parse
-            >>> from dateutil.tz import gettz
-            >>> tzinfos = {"BRST": -7200, "CST": gettz("America/Chicago")}
-            >>> parse("2012-01-19 17:21:00 BRST", tzinfos=tzinfos)
-            datetime.datetime(2012, 1, 19, 17, 21, tzinfo=tzoffset(u'BRST', -7200))
-            >>> parse("2012-01-19 17:21:00 CST", tzinfos=tzinfos)
-            datetime.datetime(2012, 1, 19, 17, 21,
-                              tzinfo=tzfile('/usr/share/zoneinfo/America/Chicago'))
-
-        This parameter is ignored if ``ignoretz`` is set.
-
-    :param dayfirst:
-        Whether to interpret the first value in an ambiguous 3-integer date
-        (e.g. 01/05/09) as the day (``True``) or month (``False``). If
-        ``yearfirst`` is set to ``True``, this distinguishes between YDM and
-        YMD. If set to ``None``, this value is retrieved from the current
-        :class:`parserinfo` object (which itself defaults to ``False``).
-
-    :param yearfirst:
-        Whether to interpret the first value in an ambiguous 3-integer date
-        (e.g. 01/05/09) as the year. If ``True``, the first number is taken to
-        be the year, otherwise the last number is taken to be the year. If
-        this is set to ``None``, the value is retrieved from the current
-        :class:`parserinfo` object (which itself defaults to ``False``).
-
-    :param fuzzy:
-        Whether to allow fuzzy parsing, allowing for string like "Today is
-        January 1, 2047 at 8:21:00AM".
-
-    :param fuzzy_with_tokens:
-        If ``True``, ``fuzzy`` is automatically set to True, and the parser
-        will return a tuple where the first element is the parsed
-        :class:`datetime.datetime` datetimestamp and the second element is
-        a tuple containing the portions of the string which were ignored:
-
-        .. doctest::
-
-            >>> from dateutil.parser import parse
-            >>> parse("Today is January 1, 2047 at 8:21:00AM", fuzzy_with_tokens=True)
-            (datetime.datetime(2047, 1, 1, 8, 21), (u'Today is ', u' ', u'at '))
-
-    :return:
-        Returns a :class:`datetime.datetime` object or, if the
-        ``fuzzy_with_tokens`` option is ``True``, returns a tuple, the
-        first element being a :class:`datetime.datetime` object, the second
-        a tuple containing the fuzzy tokens.
-
-    :raises ParserError:
-        Raised for invalid or unknown string formats, if the provided
-        :class:`tzinfo` is not in a valid format, or if an invalid date would
-        be created.
-
-    :raises OverflowError:
-        Raised if the parsed date exceeds the largest valid C integer on
-        your system.
-    """
-    if parserinfo:
-        return parser(parserinfo).parse(timestr, **kwargs)
-    else:
-        return DEFAULTPARSER.parse(timestr, **kwargs)
-
-
-class _tzparser(object):
-
-    class _result(_resultbase):
-
-        __slots__ = ["stdabbr", "stdoffset", "dstabbr", "dstoffset",
-                     "start", "end"]
-
-        class _attr(_resultbase):
-            __slots__ = ["month", "week", "weekday",
-                         "yday", "jyday", "day", "time"]
-
-        def __repr__(self):
-            return self._repr("")
-
-        def __init__(self):
-            _resultbase.__init__(self)
-            self.start = self._attr()
-            self.end = self._attr()
-
-    def parse(self, tzstr):
-        res = self._result()
-        l = [x for x in re.split(r'([,:.]|[a-zA-Z]+|[0-9]+)',tzstr) if x]
-        used_idxs = list()
-        try:
-
-            len_l = len(l)
-
-            i = 0
-            while i < len_l:
-                # BRST+3[BRDT[+2]]
-                j = i
-                while j < len_l and not [x for x in l[j]
-                                         if x in "0123456789:,-+"]:
-                    j += 1
-                if j != i:
-                    if not res.stdabbr:
-                        offattr = "stdoffset"
-                        res.stdabbr = "".join(l[i:j])
-                    else:
-                        offattr = "dstoffset"
-                        res.dstabbr = "".join(l[i:j])
-
-                    for ii in range(j):
-                        used_idxs.append(ii)
-                    i = j
-                    if (i < len_l and (l[i] in ('+', '-') or l[i][0] in
-                                       "0123456789")):
-                        if l[i] in ('+', '-'):
-                            # Yes, that's right.  See the TZ variable
-                            # documentation.
-                            signal = (1, -1)[l[i] == '+']
-                            used_idxs.append(i)
-                            i += 1
-                        else:
-                            signal = -1
-                        len_li = len(l[i])
-                        if len_li == 4:
-                            # -0300
-                            setattr(res, offattr, (int(l[i][:2]) * 3600 +
-                                                   int(l[i][2:]) * 60) * signal)
-                        elif i + 1 < len_l and l[i + 1] == ':':
-                            # -03:00
-                            setattr(res, offattr,
-                                    (int(l[i]) * 3600 +
-                                     int(l[i + 2]) * 60) * signal)
-                            used_idxs.append(i)
-                            i += 2
-                        elif len_li <= 2:
-                            # -[0]3
-                            setattr(res, offattr,
-                                    int(l[i][:2]) * 3600 * signal)
-                        else:
-                            return None
-                        used_idxs.append(i)
-                        i += 1
-                    if res.dstabbr:
-                        break
-                else:
-                    break
-
-
-            if i < len_l:
-                for j in range(i, len_l):
-                    if l[j] == ';':
-                        l[j] = ','
-
-                assert l[i] == ','
-
-                i += 1
-
-            if i >= len_l:
-                pass
-            elif (8 <= l.count(',') <= 9 and
-                  not [y for x in l[i:] if x != ','
-                       for y in x if y not in "0123456789+-"]):
-                # GMT0BST,3,0,30,3600,10,0,26,7200[,3600]
-                for x in (res.start, res.end):
-                    x.month = int(l[i])
-                    used_idxs.append(i)
-                    i += 2
-                    if l[i] == '-':
-                        value = int(l[i + 1]) * -1
-                        used_idxs.append(i)
-                        i += 1
-                    else:
-                        value = int(l[i])
-                    used_idxs.append(i)
-                    i += 2
-                    if value:
-                        x.week = value
-                        x.weekday = (int(l[i]) - 1) % 7
-                    else:
-                        x.day = int(l[i])
-                    used_idxs.append(i)
-                    i += 2
-                    x.time = int(l[i])
-                    used_idxs.append(i)
-                    i += 2
-                if i < len_l:
-                    if l[i] in ('-', '+'):
-                        signal = (-1, 1)[l[i] == "+"]
-                        used_idxs.append(i)
-                        i += 1
-                    else:
-                        signal = 1
-                    used_idxs.append(i)
-                    res.dstoffset = (res.stdoffset + int(l[i]) * signal)
-
-                # This was a made-up format that is not in normal use
-                warn(('Parsed time zone "%s"' % tzstr) +
-                     'is in a non-standard dateutil-specific format, which ' +
-                     'is now deprecated; support for parsing this format ' +
-                     'will be removed in future versions. It is recommended ' +
-                     'that you switch to a standard format like the GNU ' +
-                     'TZ variable format.', tz.DeprecatedTzFormatWarning)
-            elif (l.count(',') == 2 and l[i:].count('/') <= 2 and
-                  not [y for x in l[i:] if x not in (',', '/', 'J', 'M',
-                                                     '.', '-', ':')
-                       for y in x if y not in "0123456789"]):
-                for x in (res.start, res.end):
-                    if l[i] == 'J':
-                        # non-leap year day (1 based)
-                        used_idxs.append(i)
-                        i += 1
-                        x.jyday = int(l[i])
-                    elif l[i] == 'M':
-                        # month[-.]week[-.]weekday
-                        used_idxs.append(i)
-                        i += 1
-                        x.month = int(l[i])
-                        used_idxs.append(i)
-                        i += 1
-                        assert l[i] in ('-', '.')
-                        used_idxs.append(i)
-                        i += 1
-                        x.week = int(l[i])
-                        if x.week == 5:
-                            x.week = -1
-                        used_idxs.append(i)
-                        i += 1
-                        assert l[i] in ('-', '.')
-                        used_idxs.append(i)
-                        i += 1
-                        x.weekday = (int(l[i]) - 1) % 7
-                    else:
-                        # year day (zero based)
-                        x.yday = int(l[i]) + 1
-
-                    used_idxs.append(i)
-                    i += 1
-
-                    if i < len_l and l[i] == '/':
-                        used_idxs.append(i)
-                        i += 1
-                        # start time
-                        len_li = len(l[i])
-                        if len_li == 4:
-                            # -0300
-                            x.time = (int(l[i][:2]) * 3600 +
-                                      int(l[i][2:]) * 60)
-                        elif i + 1 < len_l and l[i + 1] == ':':
-                            # -03:00
-                            x.time = int(l[i]) * 3600 + int(l[i + 2]) * 60
-                            used_idxs.append(i)
-                            i += 2
-                            if i + 1 < len_l and l[i + 1] == ':':
-                                used_idxs.append(i)
-                                i += 2
-                                x.time += int(l[i])
-                        elif len_li <= 2:
-                            # -[0]3
-                            x.time = (int(l[i][:2]) * 3600)
-                        else:
-                            return None
-                        used_idxs.append(i)
-                        i += 1
-
-                    assert i == len_l or l[i] == ','
-
-                    i += 1
-
-                assert i >= len_l
-
-        except (IndexError, ValueError, AssertionError):
-            return None
-
-        unused_idxs = set(range(len_l)).difference(used_idxs)
-        res.any_unused_tokens = not {l[n] for n in unused_idxs}.issubset({",",":"})
-        return res
-
-
-DEFAULTTZPARSER = _tzparser()
-
-
-def _parsetz(tzstr):
-    return DEFAULTTZPARSER.parse(tzstr)
-
-
-class ParserError(ValueError):
-    """Exception subclass used for any failure to parse a datetime string.
-
-    This is a subclass of :py:exc:`ValueError`, and should be raised any time
-    earlier versions of ``dateutil`` would have raised ``ValueError``.
-
-    .. versionadded:: 2.8.1
-    """
-    def __str__(self):
-        try:
-            return self.args[0] % self.args[1:]
-        except (TypeError, IndexError):
-            return super(ParserError, self).__str__()
-
-    def __repr__(self):
-        args = ", ".join("'%s'" % arg for arg in self.args)
-        return "%s(%s)" % (self.__class__.__name__, args)
-
-
-class UnknownTimezoneWarning(RuntimeWarning):
-    """Raised when the parser finds a timezone it cannot parse into a tzinfo.
-
-    .. versionadded:: 2.7.0
-    """
-# vim:ts=4:sw=4:et
diff --git a/lib/dateutil/parser/isoparser.py b/lib/dateutil/parser/isoparser.py
deleted file mode 100644
index 7060087d..00000000
--- a/lib/dateutil/parser/isoparser.py
+++ /dev/null
@@ -1,416 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-This module offers a parser for ISO-8601 strings
-
-It is intended to support all valid date, time and datetime formats per the
-ISO-8601 specification.
-
-..versionadded:: 2.7.0
-"""
-from datetime import datetime, timedelta, time, date
-import calendar
-from dateutil import tz
-
-from functools import wraps
-
-import re
-import six
-
-__all__ = ["isoparse", "isoparser"]
-
-
-def _takes_ascii(f):
-    @wraps(f)
-    def func(self, str_in, *args, **kwargs):
-        # If it's a stream, read the whole thing
-        str_in = getattr(str_in, 'read', lambda: str_in)()
-
-        # If it's unicode, turn it into bytes, since ISO-8601 only covers ASCII
-        if isinstance(str_in, six.text_type):
-            # ASCII is the same in UTF-8
-            try:
-                str_in = str_in.encode('ascii')
-            except UnicodeEncodeError as e:
-                msg = 'ISO-8601 strings should contain only ASCII characters'
-                six.raise_from(ValueError(msg), e)
-
-        return f(self, str_in, *args, **kwargs)
-
-    return func
-
-
-class isoparser(object):
-    def __init__(self, sep=None):
-        """
-        :param sep:
-            A single character that separates date and time portions. If
-            ``None``, the parser will accept any single character.
-            For strict ISO-8601 adherence, pass ``'T'``.
-        """
-        if sep is not None:
-            if (len(sep) != 1 or ord(sep) >= 128 or sep in '0123456789'):
-                raise ValueError('Separator must be a single, non-numeric ' +
-                                 'ASCII character')
-
-            sep = sep.encode('ascii')
-
-        self._sep = sep
-
-    @_takes_ascii
-    def isoparse(self, dt_str):
-        """
-        Parse an ISO-8601 datetime string into a :class:`datetime.datetime`.
-
-        An ISO-8601 datetime string consists of a date portion, followed
-        optionally by a time portion - the date and time portions are separated
-        by a single character separator, which is ``T`` in the official
-        standard. Incomplete date formats (such as ``YYYY-MM``) may *not* be
-        combined with a time portion.
-
-        Supported date formats are:
-
-        Common:
-
-        - ``YYYY``
-        - ``YYYY-MM``
-        - ``YYYY-MM-DD`` or ``YYYYMMDD``
-
-        Uncommon:
-
-        - ``YYYY-Www`` or ``YYYYWww`` - ISO week (day defaults to 0)
-        - ``YYYY-Www-D`` or ``YYYYWwwD`` - ISO week and day
-
-        The ISO week and day numbering follows the same logic as
-        :func:`datetime.date.isocalendar`.
-
-        Supported time formats are:
-
-        - ``hh``
-        - ``hh:mm`` or ``hhmm``
-        - ``hh:mm:ss`` or ``hhmmss``
-        - ``hh:mm:ss.ssssss`` (Up to 6 sub-second digits)
-
-        Midnight is a special case for `hh`, as the standard supports both
-        00:00 and 24:00 as a representation. The decimal separator can be
-        either a dot or a comma.
-
-
-        .. caution::
-
-            Support for fractional components other than seconds is part of the
-            ISO-8601 standard, but is not currently implemented in this parser.
-
-        Supported time zone offset formats are:
-
-        - `Z` (UTC)
-        - `±HH:MM`
-        - `±HHMM`
-        - `±HH`
-
-        Offsets will be represented as :class:`dateutil.tz.tzoffset` objects,
-        with the exception of UTC, which will be represented as
-        :class:`dateutil.tz.tzutc`. Time zone offsets equivalent to UTC (such
-        as `+00:00`) will also be represented as :class:`dateutil.tz.tzutc`.
-
-        :param dt_str:
-            A string or stream containing only an ISO-8601 datetime string
-
-        :return:
-            Returns a :class:`datetime.datetime` representing the string.
-            Unspecified components default to their lowest value.
-
-        .. warning::
-
-            As of version 2.7.0, the strictness of the parser should not be
-            considered a stable part of the contract. Any valid ISO-8601 string
-            that parses correctly with the default settings will continue to
-            parse correctly in future versions, but invalid strings that
-            currently fail (e.g. ``2017-01-01T00:00+00:00:00``) are not
-            guaranteed to continue failing in future versions if they encode
-            a valid date.
-
-        .. versionadded:: 2.7.0
-        """
-        components, pos = self._parse_isodate(dt_str)
-
-        if len(dt_str) > pos:
-            if self._sep is None or dt_str[pos:pos + 1] == self._sep:
-                components += self._parse_isotime(dt_str[pos + 1:])
-            else:
-                raise ValueError('String contains unknown ISO components')
-
-        if len(components) > 3 and components[3] == 24:
-            components[3] = 0
-            return datetime(*components) + timedelta(days=1)
-
-        return datetime(*components)
-
-    @_takes_ascii
-    def parse_isodate(self, datestr):
-        """
-        Parse the date portion of an ISO string.
-
-        :param datestr:
-            The string portion of an ISO string, without a separator
-
-        :return:
-            Returns a :class:`datetime.date` object
-        """
-        components, pos = self._parse_isodate(datestr)
-        if pos < len(datestr):
-            raise ValueError('String contains unknown ISO ' +
-                             'components: {!r}'.format(datestr.decode('ascii')))
-        return date(*components)
-
-    @_takes_ascii
-    def parse_isotime(self, timestr):
-        """
-        Parse the time portion of an ISO string.
-
-        :param timestr:
-            The time portion of an ISO string, without a separator
-
-        :return:
-            Returns a :class:`datetime.time` object
-        """
-        components = self._parse_isotime(timestr)
-        if components[0] == 24:
-            components[0] = 0
-        return time(*components)
-
-    @_takes_ascii
-    def parse_tzstr(self, tzstr, zero_as_utc=True):
-        """
-        Parse a valid ISO time zone string.
-
-        See :func:`isoparser.isoparse` for details on supported formats.
-
-        :param tzstr:
-            A string representing an ISO time zone offset
-
-        :param zero_as_utc:
-            Whether to return :class:`dateutil.tz.tzutc` for zero-offset zones
-
-        :return:
-            Returns :class:`dateutil.tz.tzoffset` for offsets and
-            :class:`dateutil.tz.tzutc` for ``Z`` and (if ``zero_as_utc`` is
-            specified) offsets equivalent to UTC.
-        """
-        return self._parse_tzstr(tzstr, zero_as_utc=zero_as_utc)
-
-    # Constants
-    _DATE_SEP = b'-'
-    _TIME_SEP = b':'
-    _FRACTION_REGEX = re.compile(b'[\\.,]([0-9]+)')
-
-    def _parse_isodate(self, dt_str):
-        try:
-            return self._parse_isodate_common(dt_str)
-        except ValueError:
-            return self._parse_isodate_uncommon(dt_str)
-
-    def _parse_isodate_common(self, dt_str):
-        len_str = len(dt_str)
-        components = [1, 1, 1]
-
-        if len_str < 4:
-            raise ValueError('ISO string too short')
-
-        # Year
-        components[0] = int(dt_str[0:4])
-        pos = 4
-        if pos >= len_str:
-            return components, pos
-
-        has_sep = dt_str[pos:pos + 1] == self._DATE_SEP
-        if has_sep:
-            pos += 1
-
-        # Month
-        if len_str - pos < 2:
-            raise ValueError('Invalid common month')
-
-        components[1] = int(dt_str[pos:pos + 2])
-        pos += 2
-
-        if pos >= len_str:
-            if has_sep:
-                return components, pos
-            else:
-                raise ValueError('Invalid ISO format')
-
-        if has_sep:
-            if dt_str[pos:pos + 1] != self._DATE_SEP:
-                raise ValueError('Invalid separator in ISO string')
-            pos += 1
-
-        # Day
-        if len_str - pos < 2:
-            raise ValueError('Invalid common day')
-        components[2] = int(dt_str[pos:pos + 2])
-        return components, pos + 2
-
-    def _parse_isodate_uncommon(self, dt_str):
-        if len(dt_str) < 4:
-            raise ValueError('ISO string too short')
-
-        # All ISO formats start with the year
-        year = int(dt_str[0:4])
-
-        has_sep = dt_str[4:5] == self._DATE_SEP
-
-        pos = 4 + has_sep       # Skip '-' if it's there
-        if dt_str[pos:pos + 1] == b'W':
-            # YYYY-?Www-?D?
-            pos += 1
-            weekno = int(dt_str[pos:pos + 2])
-            pos += 2
-
-            dayno = 1
-            if len(dt_str) > pos:
-                if (dt_str[pos:pos + 1] == self._DATE_SEP) != has_sep:
-                    raise ValueError('Inconsistent use of dash separator')
-
-                pos += has_sep
-
-                dayno = int(dt_str[pos:pos + 1])
-                pos += 1
-
-            base_date = self._calculate_weekdate(year, weekno, dayno)
-        else:
-            # YYYYDDD or YYYY-DDD
-            if len(dt_str) - pos < 3:
-                raise ValueError('Invalid ordinal day')
-
-            ordinal_day = int(dt_str[pos:pos + 3])
-            pos += 3
-
-            if ordinal_day < 1 or ordinal_day > (365 + calendar.isleap(year)):
-                raise ValueError('Invalid ordinal day' +
-                                 ' {} for year {}'.format(ordinal_day, year))
-
-            base_date = date(year, 1, 1) + timedelta(days=ordinal_day - 1)
-
-        components = [base_date.year, base_date.month, base_date.day]
-        return components, pos
-
-    def _calculate_weekdate(self, year, week, day):
-        """
-        Calculate the day of corresponding to the ISO year-week-day calendar.
-
-        This function is effectively the inverse of
-        :func:`datetime.date.isocalendar`.
-
-        :param year:
-            The year in the ISO calendar
-
-        :param week:
-            The week in the ISO calendar - range is [1, 53]
-
-        :param day:
-            The day in the ISO calendar - range is [1 (MON), 7 (SUN)]
-
-        :return:
-            Returns a :class:`datetime.date`
-        """
-        if not 0 < week < 54:
-            raise ValueError('Invalid week: {}'.format(week))
-
-        if not 0 < day < 8:     # Range is 1-7
-            raise ValueError('Invalid weekday: {}'.format(day))
-
-        # Get week 1 for the specific year:
-        jan_4 = date(year, 1, 4)   # Week 1 always has January 4th in it
-        week_1 = jan_4 - timedelta(days=jan_4.isocalendar()[2] - 1)
-
-        # Now add the specific number of weeks and days to get what we want
-        week_offset = (week - 1) * 7 + (day - 1)
-        return week_1 + timedelta(days=week_offset)
-
-    def _parse_isotime(self, timestr):
-        len_str = len(timestr)
-        components = [0, 0, 0, 0, None]
-        pos = 0
-        comp = -1
-
-        if len_str < 2:
-            raise ValueError('ISO time too short')
-
-        has_sep = False
-
-        while pos < len_str and comp < 5:
-            comp += 1
-
-            if timestr[pos:pos + 1] in b'-+Zz':
-                # Detect time zone boundary
-                components[-1] = self._parse_tzstr(timestr[pos:])
-                pos = len_str
-                break
-
-            if comp == 1 and timestr[pos:pos+1] == self._TIME_SEP:
-                has_sep = True
-                pos += 1
-            elif comp == 2 and has_sep:
-                if timestr[pos:pos+1] != self._TIME_SEP:
-                    raise ValueError('Inconsistent use of colon separator')
-                pos += 1
-
-            if comp < 3:
-                # Hour, minute, second
-                components[comp] = int(timestr[pos:pos + 2])
-                pos += 2
-
-            if comp == 3:
-                # Fraction of a second
-                frac = self._FRACTION_REGEX.match(timestr[pos:])
-                if not frac:
-                    continue
-
-                us_str = frac.group(1)[:6]  # Truncate to microseconds
-                components[comp] = int(us_str) * 10**(6 - len(us_str))
-                pos += len(frac.group())
-
-        if pos < len_str:
-            raise ValueError('Unused components in ISO string')
-
-        if components[0] == 24:
-            # Standard supports 00:00 and 24:00 as representations of midnight
-            if any(component != 0 for component in components[1:4]):
-                raise ValueError('Hour may only be 24 at 24:00:00.000')
-
-        return components
-
-    def _parse_tzstr(self, tzstr, zero_as_utc=True):
-        if tzstr == b'Z' or tzstr == b'z':
-            return tz.UTC
-
-        if len(tzstr) not in {3, 5, 6}:
-            raise ValueError('Time zone offset must be 1, 3, 5 or 6 characters')
-
-        if tzstr[0:1] == b'-':
-            mult = -1
-        elif tzstr[0:1] == b'+':
-            mult = 1
-        else:
-            raise ValueError('Time zone offset requires sign')
-
-        hours = int(tzstr[1:3])
-        if len(tzstr) == 3:
-            minutes = 0
-        else:
-            minutes = int(tzstr[(4 if tzstr[3:4] == self._TIME_SEP else 3):])
-
-        if zero_as_utc and hours == 0 and minutes == 0:
-            return tz.UTC
-        else:
-            if minutes > 59:
-                raise ValueError('Invalid minutes in time zone offset')
-
-            if hours > 23:
-                raise ValueError('Invalid hours in time zone offset')
-
-            return tz.tzoffset(None, mult * (hours * 60 + minutes) * 60)
-
-
-DEFAULT_ISOPARSER = isoparser()
-isoparse = DEFAULT_ISOPARSER.isoparse
diff --git a/lib/dateutil/relativedelta.py b/lib/dateutil/relativedelta.py
deleted file mode 100644
index cd323a54..00000000
--- a/lib/dateutil/relativedelta.py
+++ /dev/null
@@ -1,599 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-import calendar
-
-import operator
-from math import copysign
-
-from six import integer_types
-from warnings import warn
-
-from ._common import weekday
-
-MO, TU, WE, TH, FR, SA, SU = weekdays = tuple(weekday(x) for x in range(7))
-
-__all__ = ["relativedelta", "MO", "TU", "WE", "TH", "FR", "SA", "SU"]
-
-
-class relativedelta(object):
-    """
-    The relativedelta type is designed to be applied to an existing datetime and
-    can replace specific components of that datetime, or represents an interval
-    of time.
-
-    It is based on the specification of the excellent work done by M.-A. Lemburg
-    in his
-    `mx.DateTime <https://www.egenix.com/products/python/mxBase/mxDateTime/>`_ extension.
-    However, notice that this type does *NOT* implement the same algorithm as
-    his work. Do *NOT* expect it to behave like mx.DateTime's counterpart.
-
-    There are two different ways to build a relativedelta instance. The
-    first one is passing it two date/datetime classes::
-
-        relativedelta(datetime1, datetime2)
-
-    The second one is passing it any number of the following keyword arguments::
-
-        relativedelta(arg1=x,arg2=y,arg3=z...)
-
-        year, month, day, hour, minute, second, microsecond:
-            Absolute information (argument is singular); adding or subtracting a
-            relativedelta with absolute information does not perform an arithmetic
-            operation, but rather REPLACES the corresponding value in the
-            original datetime with the value(s) in relativedelta.
-
-        years, months, weeks, days, hours, minutes, seconds, microseconds:
-            Relative information, may be negative (argument is plural); adding
-            or subtracting a relativedelta with relative information performs
-            the corresponding arithmetic operation on the original datetime value
-            with the information in the relativedelta.
-
-        weekday:
-            One of the weekday instances (MO, TU, etc) available in the
-            relativedelta module. These instances may receive a parameter N,
-            specifying the Nth weekday, which could be positive or negative
-            (like MO(+1) or MO(-2)). Not specifying it is the same as specifying
-            +1. You can also use an integer, where 0=MO. This argument is always
-            relative e.g. if the calculated date is already Monday, using MO(1)
-            or MO(-1) won't change the day. To effectively make it absolute, use
-            it in combination with the day argument (e.g. day=1, MO(1) for first
-            Monday of the month).
-
-        leapdays:
-            Will add given days to the date found, if year is a leap
-            year, and the date found is post 28 of february.
-
-        yearday, nlyearday:
-            Set the yearday or the non-leap year day (jump leap days).
-            These are converted to day/month/leapdays information.
-
-    There are relative and absolute forms of the keyword
-    arguments. The plural is relative, and the singular is
-    absolute. For each argument in the order below, the absolute form
-    is applied first (by setting each attribute to that value) and
-    then the relative form (by adding the value to the attribute).
-
-    The order of attributes considered when this relativedelta is
-    added to a datetime is:
-
-    1. Year
-    2. Month
-    3. Day
-    4. Hours
-    5. Minutes
-    6. Seconds
-    7. Microseconds
-
-    Finally, weekday is applied, using the rule described above.
-
-    For example
-
-    >>> from datetime import datetime
-    >>> from dateutil.relativedelta import relativedelta, MO
-    >>> dt = datetime(2018, 4, 9, 13, 37, 0)
-    >>> delta = relativedelta(hours=25, day=1, weekday=MO(1))
-    >>> dt + delta
-    datetime.datetime(2018, 4, 2, 14, 37)
-
-    First, the day is set to 1 (the first of the month), then 25 hours
-    are added, to get to the 2nd day and 14th hour, finally the
-    weekday is applied, but since the 2nd is already a Monday there is
-    no effect.
-
-    """
-
-    def __init__(self, dt1=None, dt2=None,
-                 years=0, months=0, days=0, leapdays=0, weeks=0,
-                 hours=0, minutes=0, seconds=0, microseconds=0,
-                 year=None, month=None, day=None, weekday=None,
-                 yearday=None, nlyearday=None,
-                 hour=None, minute=None, second=None, microsecond=None):
-
-        if dt1 and dt2:
-            # datetime is a subclass of date. So both must be date
-            if not (isinstance(dt1, datetime.date) and
-                    isinstance(dt2, datetime.date)):
-                raise TypeError("relativedelta only diffs datetime/date")
-
-            # We allow two dates, or two datetimes, so we coerce them to be
-            # of the same type
-            if (isinstance(dt1, datetime.datetime) !=
-                    isinstance(dt2, datetime.datetime)):
-                if not isinstance(dt1, datetime.datetime):
-                    dt1 = datetime.datetime.fromordinal(dt1.toordinal())
-                elif not isinstance(dt2, datetime.datetime):
-                    dt2 = datetime.datetime.fromordinal(dt2.toordinal())
-
-            self.years = 0
-            self.months = 0
-            self.days = 0
-            self.leapdays = 0
-            self.hours = 0
-            self.minutes = 0
-            self.seconds = 0
-            self.microseconds = 0
-            self.year = None
-            self.month = None
-            self.day = None
-            self.weekday = None
-            self.hour = None
-            self.minute = None
-            self.second = None
-            self.microsecond = None
-            self._has_time = 0
-
-            # Get year / month delta between the two
-            months = (dt1.year - dt2.year) * 12 + (dt1.month - dt2.month)
-            self._set_months(months)
-
-            # Remove the year/month delta so the timedelta is just well-defined
-            # time units (seconds, days and microseconds)
-            dtm = self.__radd__(dt2)
-
-            # If we've overshot our target, make an adjustment
-            if dt1 < dt2:
-                compare = operator.gt
-                increment = 1
-            else:
-                compare = operator.lt
-                increment = -1
-
-            while compare(dt1, dtm):
-                months += increment
-                self._set_months(months)
-                dtm = self.__radd__(dt2)
-
-            # Get the timedelta between the "months-adjusted" date and dt1
-            delta = dt1 - dtm
-            self.seconds = delta.seconds + delta.days * 86400
-            self.microseconds = delta.microseconds
-        else:
-            # Check for non-integer values in integer-only quantities
-            if any(x is not None and x != int(x) for x in (years, months)):
-                raise ValueError("Non-integer years and months are "
-                                 "ambiguous and not currently supported.")
-
-            # Relative information
-            self.years = int(years)
-            self.months = int(months)
-            self.days = days + weeks * 7
-            self.leapdays = leapdays
-            self.hours = hours
-            self.minutes = minutes
-            self.seconds = seconds
-            self.microseconds = microseconds
-
-            # Absolute information
-            self.year = year
-            self.month = month
-            self.day = day
-            self.hour = hour
-            self.minute = minute
-            self.second = second
-            self.microsecond = microsecond
-
-            if any(x is not None and int(x) != x
-                   for x in (year, month, day, hour,
-                             minute, second, microsecond)):
-                # For now we'll deprecate floats - later it'll be an error.
-                warn("Non-integer value passed as absolute information. " +
-                     "This is not a well-defined condition and will raise " +
-                     "errors in future versions.", DeprecationWarning)
-
-            if isinstance(weekday, integer_types):
-                self.weekday = weekdays[weekday]
-            else:
-                self.weekday = weekday
-
-            yday = 0
-            if nlyearday:
-                yday = nlyearday
-            elif yearday:
-                yday = yearday
-                if yearday > 59:
-                    self.leapdays = -1
-            if yday:
-                ydayidx = [31, 59, 90, 120, 151, 181, 212,
-                           243, 273, 304, 334, 366]
-                for idx, ydays in enumerate(ydayidx):
-                    if yday <= ydays:
-                        self.month = idx+1
-                        if idx == 0:
-                            self.day = yday
-                        else:
-                            self.day = yday-ydayidx[idx-1]
-                        break
-                else:
-                    raise ValueError("invalid year day (%d)" % yday)
-
-        self._fix()
-
-    def _fix(self):
-        if abs(self.microseconds) > 999999:
-            s = _sign(self.microseconds)
-            div, mod = divmod(self.microseconds * s, 1000000)
-            self.microseconds = mod * s
-            self.seconds += div * s
-        if abs(self.seconds) > 59:
-            s = _sign(self.seconds)
-            div, mod = divmod(self.seconds * s, 60)
-            self.seconds = mod * s
-            self.minutes += div * s
-        if abs(self.minutes) > 59:
-            s = _sign(self.minutes)
-            div, mod = divmod(self.minutes * s, 60)
-            self.minutes = mod * s
-            self.hours += div * s
-        if abs(self.hours) > 23:
-            s = _sign(self.hours)
-            div, mod = divmod(self.hours * s, 24)
-            self.hours = mod * s
-            self.days += div * s
-        if abs(self.months) > 11:
-            s = _sign(self.months)
-            div, mod = divmod(self.months * s, 12)
-            self.months = mod * s
-            self.years += div * s
-        if (self.hours or self.minutes or self.seconds or self.microseconds
-                or self.hour is not None or self.minute is not None or
-                self.second is not None or self.microsecond is not None):
-            self._has_time = 1
-        else:
-            self._has_time = 0
-
-    @property
-    def weeks(self):
-        return int(self.days / 7.0)
-
-    @weeks.setter
-    def weeks(self, value):
-        self.days = self.days - (self.weeks * 7) + value * 7
-
-    def _set_months(self, months):
-        self.months = months
-        if abs(self.months) > 11:
-            s = _sign(self.months)
-            div, mod = divmod(self.months * s, 12)
-            self.months = mod * s
-            self.years = div * s
-        else:
-            self.years = 0
-
-    def normalized(self):
-        """
-        Return a version of this object represented entirely using integer
-        values for the relative attributes.
-
-        >>> relativedelta(days=1.5, hours=2).normalized()
-        relativedelta(days=+1, hours=+14)
-
-        :return:
-            Returns a :class:`dateutil.relativedelta.relativedelta` object.
-        """
-        # Cascade remainders down (rounding each to roughly nearest microsecond)
-        days = int(self.days)
-
-        hours_f = round(self.hours + 24 * (self.days - days), 11)
-        hours = int(hours_f)
-
-        minutes_f = round(self.minutes + 60 * (hours_f - hours), 10)
-        minutes = int(minutes_f)
-
-        seconds_f = round(self.seconds + 60 * (minutes_f - minutes), 8)
-        seconds = int(seconds_f)
-
-        microseconds = round(self.microseconds + 1e6 * (seconds_f - seconds))
-
-        # Constructor carries overflow back up with call to _fix()
-        return self.__class__(years=self.years, months=self.months,
-                              days=days, hours=hours, minutes=minutes,
-                              seconds=seconds, microseconds=microseconds,
-                              leapdays=self.leapdays, year=self.year,
-                              month=self.month, day=self.day,
-                              weekday=self.weekday, hour=self.hour,
-                              minute=self.minute, second=self.second,
-                              microsecond=self.microsecond)
-
-    def __add__(self, other):
-        if isinstance(other, relativedelta):
-            return self.__class__(years=other.years + self.years,
-                                 months=other.months + self.months,
-                                 days=other.days + self.days,
-                                 hours=other.hours + self.hours,
-                                 minutes=other.minutes + self.minutes,
-                                 seconds=other.seconds + self.seconds,
-                                 microseconds=(other.microseconds +
-                                               self.microseconds),
-                                 leapdays=other.leapdays or self.leapdays,
-                                 year=(other.year if other.year is not None
-                                       else self.year),
-                                 month=(other.month if other.month is not None
-                                        else self.month),
-                                 day=(other.day if other.day is not None
-                                      else self.day),
-                                 weekday=(other.weekday if other.weekday is not None
-                                          else self.weekday),
-                                 hour=(other.hour if other.hour is not None
-                                       else self.hour),
-                                 minute=(other.minute if other.minute is not None
-                                         else self.minute),
-                                 second=(other.second if other.second is not None
-                                         else self.second),
-                                 microsecond=(other.microsecond if other.microsecond
-                                              is not None else
-                                              self.microsecond))
-        if isinstance(other, datetime.timedelta):
-            return self.__class__(years=self.years,
-                                  months=self.months,
-                                  days=self.days + other.days,
-                                  hours=self.hours,
-                                  minutes=self.minutes,
-                                  seconds=self.seconds + other.seconds,
-                                  microseconds=self.microseconds + other.microseconds,
-                                  leapdays=self.leapdays,
-                                  year=self.year,
-                                  month=self.month,
-                                  day=self.day,
-                                  weekday=self.weekday,
-                                  hour=self.hour,
-                                  minute=self.minute,
-                                  second=self.second,
-                                  microsecond=self.microsecond)
-        if not isinstance(other, datetime.date):
-            return NotImplemented
-        elif self._has_time and not isinstance(other, datetime.datetime):
-            other = datetime.datetime.fromordinal(other.toordinal())
-        year = (self.year or other.year)+self.years
-        month = self.month or other.month
-        if self.months:
-            assert 1 <= abs(self.months) <= 12
-            month += self.months
-            if month > 12:
-                year += 1
-                month -= 12
-            elif month < 1:
-                year -= 1
-                month += 12
-        day = min(calendar.monthrange(year, month)[1],
-                  self.day or other.day)
-        repl = {"year": year, "month": month, "day": day}
-        for attr in ["hour", "minute", "second", "microsecond"]:
-            value = getattr(self, attr)
-            if value is not None:
-                repl[attr] = value
-        days = self.days
-        if self.leapdays and month > 2 and calendar.isleap(year):
-            days += self.leapdays
-        ret = (other.replace(**repl)
-               + datetime.timedelta(days=days,
-                                    hours=self.hours,
-                                    minutes=self.minutes,
-                                    seconds=self.seconds,
-                                    microseconds=self.microseconds))
-        if self.weekday:
-            weekday, nth = self.weekday.weekday, self.weekday.n or 1
-            jumpdays = (abs(nth) - 1) * 7
-            if nth > 0:
-                jumpdays += (7 - ret.weekday() + weekday) % 7
-            else:
-                jumpdays += (ret.weekday() - weekday) % 7
-                jumpdays *= -1
-            ret += datetime.timedelta(days=jumpdays)
-        return ret
-
-    def __radd__(self, other):
-        return self.__add__(other)
-
-    def __rsub__(self, other):
-        return self.__neg__().__radd__(other)
-
-    def __sub__(self, other):
-        if not isinstance(other, relativedelta):
-            return NotImplemented   # In case the other object defines __rsub__
-        return self.__class__(years=self.years - other.years,
-                             months=self.months - other.months,
-                             days=self.days - other.days,
-                             hours=self.hours - other.hours,
-                             minutes=self.minutes - other.minutes,
-                             seconds=self.seconds - other.seconds,
-                             microseconds=self.microseconds - other.microseconds,
-                             leapdays=self.leapdays or other.leapdays,
-                             year=(self.year if self.year is not None
-                                   else other.year),
-                             month=(self.month if self.month is not None else
-                                    other.month),
-                             day=(self.day if self.day is not None else
-                                  other.day),
-                             weekday=(self.weekday if self.weekday is not None else
-                                      other.weekday),
-                             hour=(self.hour if self.hour is not None else
-                                   other.hour),
-                             minute=(self.minute if self.minute is not None else
-                                     other.minute),
-                             second=(self.second if self.second is not None else
-                                     other.second),
-                             microsecond=(self.microsecond if self.microsecond
-                                          is not None else
-                                          other.microsecond))
-
-    def __abs__(self):
-        return self.__class__(years=abs(self.years),
-                              months=abs(self.months),
-                              days=abs(self.days),
-                              hours=abs(self.hours),
-                              minutes=abs(self.minutes),
-                              seconds=abs(self.seconds),
-                              microseconds=abs(self.microseconds),
-                              leapdays=self.leapdays,
-                              year=self.year,
-                              month=self.month,
-                              day=self.day,
-                              weekday=self.weekday,
-                              hour=self.hour,
-                              minute=self.minute,
-                              second=self.second,
-                              microsecond=self.microsecond)
-
-    def __neg__(self):
-        return self.__class__(years=-self.years,
-                             months=-self.months,
-                             days=-self.days,
-                             hours=-self.hours,
-                             minutes=-self.minutes,
-                             seconds=-self.seconds,
-                             microseconds=-self.microseconds,
-                             leapdays=self.leapdays,
-                             year=self.year,
-                             month=self.month,
-                             day=self.day,
-                             weekday=self.weekday,
-                             hour=self.hour,
-                             minute=self.minute,
-                             second=self.second,
-                             microsecond=self.microsecond)
-
-    def __bool__(self):
-        return not (not self.years and
-                    not self.months and
-                    not self.days and
-                    not self.hours and
-                    not self.minutes and
-                    not self.seconds and
-                    not self.microseconds and
-                    not self.leapdays and
-                    self.year is None and
-                    self.month is None and
-                    self.day is None and
-                    self.weekday is None and
-                    self.hour is None and
-                    self.minute is None and
-                    self.second is None and
-                    self.microsecond is None)
-    # Compatibility with Python 2.x
-    __nonzero__ = __bool__
-
-    def __mul__(self, other):
-        try:
-            f = float(other)
-        except TypeError:
-            return NotImplemented
-
-        return self.__class__(years=int(self.years * f),
-                             months=int(self.months * f),
-                             days=int(self.days * f),
-                             hours=int(self.hours * f),
-                             minutes=int(self.minutes * f),
-                             seconds=int(self.seconds * f),
-                             microseconds=int(self.microseconds * f),
-                             leapdays=self.leapdays,
-                             year=self.year,
-                             month=self.month,
-                             day=self.day,
-                             weekday=self.weekday,
-                             hour=self.hour,
-                             minute=self.minute,
-                             second=self.second,
-                             microsecond=self.microsecond)
-
-    __rmul__ = __mul__
-
-    def __eq__(self, other):
-        if not isinstance(other, relativedelta):
-            return NotImplemented
-        if self.weekday or other.weekday:
-            if not self.weekday or not other.weekday:
-                return False
-            if self.weekday.weekday != other.weekday.weekday:
-                return False
-            n1, n2 = self.weekday.n, other.weekday.n
-            if n1 != n2 and not ((not n1 or n1 == 1) and (not n2 or n2 == 1)):
-                return False
-        return (self.years == other.years and
-                self.months == other.months and
-                self.days == other.days and
-                self.hours == other.hours and
-                self.minutes == other.minutes and
-                self.seconds == other.seconds and
-                self.microseconds == other.microseconds and
-                self.leapdays == other.leapdays and
-                self.year == other.year and
-                self.month == other.month and
-                self.day == other.day and
-                self.hour == other.hour and
-                self.minute == other.minute and
-                self.second == other.second and
-                self.microsecond == other.microsecond)
-
-    def __hash__(self):
-        return hash((
-            self.weekday,
-            self.years,
-            self.months,
-            self.days,
-            self.hours,
-            self.minutes,
-            self.seconds,
-            self.microseconds,
-            self.leapdays,
-            self.year,
-            self.month,
-            self.day,
-            self.hour,
-            self.minute,
-            self.second,
-            self.microsecond,
-        ))
-
-    def __ne__(self, other):
-        return not self.__eq__(other)
-
-    def __div__(self, other):
-        try:
-            reciprocal = 1 / float(other)
-        except TypeError:
-            return NotImplemented
-
-        return self.__mul__(reciprocal)
-
-    __truediv__ = __div__
-
-    def __repr__(self):
-        l = []
-        for attr in ["years", "months", "days", "leapdays",
-                     "hours", "minutes", "seconds", "microseconds"]:
-            value = getattr(self, attr)
-            if value:
-                l.append("{attr}={value:+g}".format(attr=attr, value=value))
-        for attr in ["year", "month", "day", "weekday",
-                     "hour", "minute", "second", "microsecond"]:
-            value = getattr(self, attr)
-            if value is not None:
-                l.append("{attr}={value}".format(attr=attr, value=repr(value)))
-        return "{classname}({attrs})".format(classname=self.__class__.__name__,
-                                             attrs=", ".join(l))
-
-
-def _sign(x):
-    return int(copysign(1, x))
-
-# vim:ts=4:sw=4:et
diff --git a/lib/dateutil/rrule.py b/lib/dateutil/rrule.py
deleted file mode 100644
index 571a0d2b..00000000
--- a/lib/dateutil/rrule.py
+++ /dev/null
@@ -1,1737 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-The rrule module offers a small, complete, and very fast, implementation of
-the recurrence rules documented in the
-`iCalendar RFC <https://tools.ietf.org/html/rfc5545>`_,
-including support for caching of results.
-"""
-import calendar
-import datetime
-import heapq
-import itertools
-import re
-import sys
-from functools import wraps
-# For warning about deprecation of until and count
-from warnings import warn
-
-from six import advance_iterator, integer_types
-
-from six.moves import _thread, range
-
-from ._common import weekday as weekdaybase
-
-try:
-    from math import gcd
-except ImportError:
-    from fractions import gcd
-
-__all__ = ["rrule", "rruleset", "rrulestr",
-           "YEARLY", "MONTHLY", "WEEKLY", "DAILY",
-           "HOURLY", "MINUTELY", "SECONDLY",
-           "MO", "TU", "WE", "TH", "FR", "SA", "SU"]
-
-# Every mask is 7 days longer to handle cross-year weekly periods.
-M366MASK = tuple([1]*31+[2]*29+[3]*31+[4]*30+[5]*31+[6]*30 +
-                 [7]*31+[8]*31+[9]*30+[10]*31+[11]*30+[12]*31+[1]*7)
-M365MASK = list(M366MASK)
-M29, M30, M31 = list(range(1, 30)), list(range(1, 31)), list(range(1, 32))
-MDAY366MASK = tuple(M31+M29+M31+M30+M31+M30+M31+M31+M30+M31+M30+M31+M31[:7])
-MDAY365MASK = list(MDAY366MASK)
-M29, M30, M31 = list(range(-29, 0)), list(range(-30, 0)), list(range(-31, 0))
-NMDAY366MASK = tuple(M31+M29+M31+M30+M31+M30+M31+M31+M30+M31+M30+M31+M31[:7])
-NMDAY365MASK = list(NMDAY366MASK)
-M366RANGE = (0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366)
-M365RANGE = (0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365)
-WDAYMASK = [0, 1, 2, 3, 4, 5, 6]*55
-del M29, M30, M31, M365MASK[59], MDAY365MASK[59], NMDAY365MASK[31]
-MDAY365MASK = tuple(MDAY365MASK)
-M365MASK = tuple(M365MASK)
-
-FREQNAMES = ['YEARLY', 'MONTHLY', 'WEEKLY', 'DAILY', 'HOURLY', 'MINUTELY', 'SECONDLY']
-
-(YEARLY,
- MONTHLY,
- WEEKLY,
- DAILY,
- HOURLY,
- MINUTELY,
- SECONDLY) = list(range(7))
-
-# Imported on demand.
-easter = None
-parser = None
-
-
-class weekday(weekdaybase):
-    """
-    This version of weekday does not allow n = 0.
-    """
-    def __init__(self, wkday, n=None):
-        if n == 0:
-            raise ValueError("Can't create weekday with n==0")
-
-        super(weekday, self).__init__(wkday, n)
-
-
-MO, TU, WE, TH, FR, SA, SU = weekdays = tuple(weekday(x) for x in range(7))
-
-
-def _invalidates_cache(f):
-    """
-    Decorator for rruleset methods which may invalidate the
-    cached length.
-    """
-    @wraps(f)
-    def inner_func(self, *args, **kwargs):
-        rv = f(self, *args, **kwargs)
-        self._invalidate_cache()
-        return rv
-
-    return inner_func
-
-
-class rrulebase(object):
-    def __init__(self, cache=False):
-        if cache:
-            self._cache = []
-            self._cache_lock = _thread.allocate_lock()
-            self._invalidate_cache()
-        else:
-            self._cache = None
-            self._cache_complete = False
-            self._len = None
-
-    def __iter__(self):
-        if self._cache_complete:
-            return iter(self._cache)
-        elif self._cache is None:
-            return self._iter()
-        else:
-            return self._iter_cached()
-
-    def _invalidate_cache(self):
-        if self._cache is not None:
-            self._cache = []
-            self._cache_complete = False
-            self._cache_gen = self._iter()
-
-            if self._cache_lock.locked():
-                self._cache_lock.release()
-
-        self._len = None
-
-    def _iter_cached(self):
-        i = 0
-        gen = self._cache_gen
-        cache = self._cache
-        acquire = self._cache_lock.acquire
-        release = self._cache_lock.release
-        while gen:
-            if i == len(cache):
-                acquire()
-                if self._cache_complete:
-                    break
-                try:
-                    for j in range(10):
-                        cache.append(advance_iterator(gen))
-                except StopIteration:
-                    self._cache_gen = gen = None
-                    self._cache_complete = True
-                    break
-                release()
-            yield cache[i]
-            i += 1
-        while i < self._len:
-            yield cache[i]
-            i += 1
-
-    def __getitem__(self, item):
-        if self._cache_complete:
-            return self._cache[item]
-        elif isinstance(item, slice):
-            if item.step and item.step < 0:
-                return list(iter(self))[item]
-            else:
-                return list(itertools.islice(self,
-                                             item.start or 0,
-                                             item.stop or sys.maxsize,
-                                             item.step or 1))
-        elif item >= 0:
-            gen = iter(self)
-            try:
-                for i in range(item+1):
-                    res = advance_iterator(gen)
-            except StopIteration:
-                raise IndexError
-            return res
-        else:
-            return list(iter(self))[item]
-
-    def __contains__(self, item):
-        if self._cache_complete:
-            return item in self._cache
-        else:
-            for i in self:
-                if i == item:
-                    return True
-                elif i > item:
-                    return False
-        return False
-
-    # __len__() introduces a large performance penalty.
-    def count(self):
-        """ Returns the number of recurrences in this set. It will have go
-            through the whole recurrence, if this hasn't been done before. """
-        if self._len is None:
-            for x in self:
-                pass
-        return self._len
-
-    def before(self, dt, inc=False):
-        """ Returns the last recurrence before the given datetime instance. The
-            inc keyword defines what happens if dt is an occurrence. With
-            inc=True, if dt itself is an occurrence, it will be returned. """
-        if self._cache_complete:
-            gen = self._cache
-        else:
-            gen = self
-        last = None
-        if inc:
-            for i in gen:
-                if i > dt:
-                    break
-                last = i
-        else:
-            for i in gen:
-                if i >= dt:
-                    break
-                last = i
-        return last
-
-    def after(self, dt, inc=False):
-        """ Returns the first recurrence after the given datetime instance. The
-            inc keyword defines what happens if dt is an occurrence. With
-            inc=True, if dt itself is an occurrence, it will be returned.  """
-        if self._cache_complete:
-            gen = self._cache
-        else:
-            gen = self
-        if inc:
-            for i in gen:
-                if i >= dt:
-                    return i
-        else:
-            for i in gen:
-                if i > dt:
-                    return i
-        return None
-
-    def xafter(self, dt, count=None, inc=False):
-        """
-        Generator which yields up to `count` recurrences after the given
-        datetime instance, equivalent to `after`.
-
-        :param dt:
-            The datetime at which to start generating recurrences.
-
-        :param count:
-            The maximum number of recurrences to generate. If `None` (default),
-            dates are generated until the recurrence rule is exhausted.
-
-        :param inc:
-            If `dt` is an instance of the rule and `inc` is `True`, it is
-            included in the output.
-
-        :yields: Yields a sequence of `datetime` objects.
-        """
-
-        if self._cache_complete:
-            gen = self._cache
-        else:
-            gen = self
-
-        # Select the comparison function
-        if inc:
-            comp = lambda dc, dtc: dc >= dtc
-        else:
-            comp = lambda dc, dtc: dc > dtc
-
-        # Generate dates
-        n = 0
-        for d in gen:
-            if comp(d, dt):
-                if count is not None:
-                    n += 1
-                    if n > count:
-                        break
-
-                yield d
-
-    def between(self, after, before, inc=False, count=1):
-        """ Returns all the occurrences of the rrule between after and before.
-        The inc keyword defines what happens if after and/or before are
-        themselves occurrences. With inc=True, they will be included in the
-        list, if they are found in the recurrence set. """
-        if self._cache_complete:
-            gen = self._cache
-        else:
-            gen = self
-        started = False
-        l = []
-        if inc:
-            for i in gen:
-                if i > before:
-                    break
-                elif not started:
-                    if i >= after:
-                        started = True
-                        l.append(i)
-                else:
-                    l.append(i)
-        else:
-            for i in gen:
-                if i >= before:
-                    break
-                elif not started:
-                    if i > after:
-                        started = True
-                        l.append(i)
-                else:
-                    l.append(i)
-        return l
-
-
-class rrule(rrulebase):
-    """
-    That's the base of the rrule operation. It accepts all the keywords
-    defined in the RFC as its constructor parameters (except byday,
-    which was renamed to byweekday) and more. The constructor prototype is::
-
-            rrule(freq)
-
-    Where freq must be one of YEARLY, MONTHLY, WEEKLY, DAILY, HOURLY, MINUTELY,
-    or SECONDLY.
-
-    .. note::
-        Per RFC section 3.3.10, recurrence instances falling on invalid dates
-        and times are ignored rather than coerced:
-
-            Recurrence rules may generate recurrence instances with an invalid
-            date (e.g., February 30) or nonexistent local time (e.g., 1:30 AM
-            on a day where the local time is moved forward by an hour at 1:00
-            AM).  Such recurrence instances MUST be ignored and MUST NOT be
-            counted as part of the recurrence set.
-
-        This can lead to possibly surprising behavior when, for example, the
-        start date occurs at the end of the month:
-
-        >>> from dateutil.rrule import rrule, MONTHLY
-        >>> from datetime import datetime
-        >>> start_date = datetime(2014, 12, 31)
-        >>> list(rrule(freq=MONTHLY, count=4, dtstart=start_date))
-        ... # doctest: +NORMALIZE_WHITESPACE
-        [datetime.datetime(2014, 12, 31, 0, 0),
-         datetime.datetime(2015, 1, 31, 0, 0),
-         datetime.datetime(2015, 3, 31, 0, 0),
-         datetime.datetime(2015, 5, 31, 0, 0)]
-
-    Additionally, it supports the following keyword arguments:
-
-    :param dtstart:
-        The recurrence start. Besides being the base for the recurrence,
-        missing parameters in the final recurrence instances will also be
-        extracted from this date. If not given, datetime.now() will be used
-        instead.
-    :param interval:
-        The interval between each freq iteration. For example, when using
-        YEARLY, an interval of 2 means once every two years, but with HOURLY,
-        it means once every two hours. The default interval is 1.
-    :param wkst:
-        The week start day. Must be one of the MO, TU, WE constants, or an
-        integer, specifying the first day of the week. This will affect
-        recurrences based on weekly periods. The default week start is got
-        from calendar.firstweekday(), and may be modified by
-        calendar.setfirstweekday().
-    :param count:
-        If given, this determines how many occurrences will be generated.
-
-        .. note::
-            As of version 2.5.0, the use of the keyword ``until`` in conjunction
-            with ``count`` is deprecated, to make sure ``dateutil`` is fully
-            compliant with `RFC-5545 Sec. 3.3.10 <https://tools.ietf.org/
-            html/rfc5545#section-3.3.10>`_. Therefore, ``until`` and ``count``
-            **must not** occur in the same call to ``rrule``.
-    :param until:
-        If given, this must be a datetime instance specifying the upper-bound
-        limit of the recurrence. The last recurrence in the rule is the greatest
-        datetime that is less than or equal to the value specified in the
-        ``until`` parameter.
-
-        .. note::
-            As of version 2.5.0, the use of the keyword ``until`` in conjunction
-            with ``count`` is deprecated, to make sure ``dateutil`` is fully
-            compliant with `RFC-5545 Sec. 3.3.10 <https://tools.ietf.org/
-            html/rfc5545#section-3.3.10>`_. Therefore, ``until`` and ``count``
-            **must not** occur in the same call to ``rrule``.
-    :param bysetpos:
-        If given, it must be either an integer, or a sequence of integers,
-        positive or negative. Each given integer will specify an occurrence
-        number, corresponding to the nth occurrence of the rule inside the
-        frequency period. For example, a bysetpos of -1 if combined with a
-        MONTHLY frequency, and a byweekday of (MO, TU, WE, TH, FR), will
-        result in the last work day of every month.
-    :param bymonth:
-        If given, it must be either an integer, or a sequence of integers,
-        meaning the months to apply the recurrence to.
-    :param bymonthday:
-        If given, it must be either an integer, or a sequence of integers,
-        meaning the month days to apply the recurrence to.
-    :param byyearday:
-        If given, it must be either an integer, or a sequence of integers,
-        meaning the year days to apply the recurrence to.
-    :param byeaster:
-        If given, it must be either an integer, or a sequence of integers,
-        positive or negative. Each integer will define an offset from the
-        Easter Sunday. Passing the offset 0 to byeaster will yield the Easter
-        Sunday itself. This is an extension to the RFC specification.
-    :param byweekno:
-        If given, it must be either an integer, or a sequence of integers,
-        meaning the week numbers to apply the recurrence to. Week numbers
-        have the meaning described in ISO8601, that is, the first week of
-        the year is that containing at least four days of the new year.
-    :param byweekday:
-        If given, it must be either an integer (0 == MO), a sequence of
-        integers, one of the weekday constants (MO, TU, etc), or a sequence
-        of these constants. When given, these variables will define the
-        weekdays where the recurrence will be applied. It's also possible to
-        use an argument n for the weekday instances, which will mean the nth
-        occurrence of this weekday in the period. For example, with MONTHLY,
-        or with YEARLY and BYMONTH, using FR(+1) in byweekday will specify the
-        first friday of the month where the recurrence happens. Notice that in
-        the RFC documentation, this is specified as BYDAY, but was renamed to
-        avoid the ambiguity of that keyword.
-    :param byhour:
-        If given, it must be either an integer, or a sequence of integers,
-        meaning the hours to apply the recurrence to.
-    :param byminute:
-        If given, it must be either an integer, or a sequence of integers,
-        meaning the minutes to apply the recurrence to.
-    :param bysecond:
-        If given, it must be either an integer, or a sequence of integers,
-        meaning the seconds to apply the recurrence to.
-    :param cache:
-        If given, it must be a boolean value specifying to enable or disable
-        caching of results. If you will use the same rrule instance multiple
-        times, enabling caching will improve the performance considerably.
-     """
-    def __init__(self, freq, dtstart=None,
-                 interval=1, wkst=None, count=None, until=None, bysetpos=None,
-                 bymonth=None, bymonthday=None, byyearday=None, byeaster=None,
-                 byweekno=None, byweekday=None,
-                 byhour=None, byminute=None, bysecond=None,
-                 cache=False):
-        super(rrule, self).__init__(cache)
-        global easter
-        if not dtstart:
-            if until and until.tzinfo:
-                dtstart = datetime.datetime.now(tz=until.tzinfo).replace(microsecond=0)
-            else:
-                dtstart = datetime.datetime.now().replace(microsecond=0)
-        elif not isinstance(dtstart, datetime.datetime):
-            dtstart = datetime.datetime.fromordinal(dtstart.toordinal())
-        else:
-            dtstart = dtstart.replace(microsecond=0)
-        self._dtstart = dtstart
-        self._tzinfo = dtstart.tzinfo
-        self._freq = freq
-        self._interval = interval
-        self._count = count
-
-        # Cache the original byxxx rules, if they are provided, as the _byxxx
-        # attributes do not necessarily map to the inputs, and this can be
-        # a problem in generating the strings. Only store things if they've
-        # been supplied (the string retrieval will just use .get())
-        self._original_rule = {}
-
-        if until and not isinstance(until, datetime.datetime):
-            until = datetime.datetime.fromordinal(until.toordinal())
-        self._until = until
-
-        if self._dtstart and self._until:
-            if (self._dtstart.tzinfo is not None) != (self._until.tzinfo is not None):
-                # According to RFC5545 Section 3.3.10:
-                # https://tools.ietf.org/html/rfc5545#section-3.3.10
-                #
-                # > If the "DTSTART" property is specified as a date with UTC
-                # > time or a date with local time and time zone reference,
-                # > then the UNTIL rule part MUST be specified as a date with
-                # > UTC time.
-                raise ValueError(
-                    'RRULE UNTIL values must be specified in UTC when DTSTART '
-                    'is timezone-aware'
-                )
-
-        if count is not None and until:
-            warn("Using both 'count' and 'until' is inconsistent with RFC 5545"
-                 " and has been deprecated in dateutil. Future versions will "
-                 "raise an error.", DeprecationWarning)
-
-        if wkst is None:
-            self._wkst = calendar.firstweekday()
-        elif isinstance(wkst, integer_types):
-            self._wkst = wkst
-        else:
-            self._wkst = wkst.weekday
-
-        if bysetpos is None:
-            self._bysetpos = None
-        elif isinstance(bysetpos, integer_types):
-            if bysetpos == 0 or not (-366 <= bysetpos <= 366):
-                raise ValueError("bysetpos must be between 1 and 366, "
-                                 "or between -366 and -1")
-            self._bysetpos = (bysetpos,)
-        else:
-            self._bysetpos = tuple(bysetpos)
-            for pos in self._bysetpos:
-                if pos == 0 or not (-366 <= pos <= 366):
-                    raise ValueError("bysetpos must be between 1 and 366, "
-                                     "or between -366 and -1")
-
-        if self._bysetpos:
-            self._original_rule['bysetpos'] = self._bysetpos
-
-        if (byweekno is None and byyearday is None and bymonthday is None and
-                byweekday is None and byeaster is None):
-            if freq == YEARLY:
-                if bymonth is None:
-                    bymonth = dtstart.month
-                    self._original_rule['bymonth'] = None
-                bymonthday = dtstart.day
-                self._original_rule['bymonthday'] = None
-            elif freq == MONTHLY:
-                bymonthday = dtstart.day
-                self._original_rule['bymonthday'] = None
-            elif freq == WEEKLY:
-                byweekday = dtstart.weekday()
-                self._original_rule['byweekday'] = None
-
-        # bymonth
-        if bymonth is None:
-            self._bymonth = None
-        else:
-            if isinstance(bymonth, integer_types):
-                bymonth = (bymonth,)
-
-            self._bymonth = tuple(sorted(set(bymonth)))
-
-            if 'bymonth' not in self._original_rule:
-                self._original_rule['bymonth'] = self._bymonth
-
-        # byyearday
-        if byyearday is None:
-            self._byyearday = None
-        else:
-            if isinstance(byyearday, integer_types):
-                byyearday = (byyearday,)
-
-            self._byyearday = tuple(sorted(set(byyearday)))
-            self._original_rule['byyearday'] = self._byyearday
-
-        # byeaster
-        if byeaster is not None:
-            if not easter:
-                from dateutil import easter
-            if isinstance(byeaster, integer_types):
-                self._byeaster = (byeaster,)
-            else:
-                self._byeaster = tuple(sorted(byeaster))
-
-            self._original_rule['byeaster'] = self._byeaster
-        else:
-            self._byeaster = None
-
-        # bymonthday
-        if bymonthday is None:
-            self._bymonthday = ()
-            self._bynmonthday = ()
-        else:
-            if isinstance(bymonthday, integer_types):
-                bymonthday = (bymonthday,)
-
-            bymonthday = set(bymonthday)            # Ensure it's unique
-
-            self._bymonthday = tuple(sorted(x for x in bymonthday if x > 0))
-            self._bynmonthday = tuple(sorted(x for x in bymonthday if x < 0))
-
-            # Storing positive numbers first, then negative numbers
-            if 'bymonthday' not in self._original_rule:
-                self._original_rule['bymonthday'] = tuple(
-                    itertools.chain(self._bymonthday, self._bynmonthday))
-
-        # byweekno
-        if byweekno is None:
-            self._byweekno = None
-        else:
-            if isinstance(byweekno, integer_types):
-                byweekno = (byweekno,)
-
-            self._byweekno = tuple(sorted(set(byweekno)))
-
-            self._original_rule['byweekno'] = self._byweekno
-
-        # byweekday / bynweekday
-        if byweekday is None:
-            self._byweekday = None
-            self._bynweekday = None
-        else:
-            # If it's one of the valid non-sequence types, convert to a
-            # single-element sequence before the iterator that builds the
-            # byweekday set.
-            if isinstance(byweekday, integer_types) or hasattr(byweekday, "n"):
-                byweekday = (byweekday,)
-
-            self._byweekday = set()
-            self._bynweekday = set()
-            for wday in byweekday:
-                if isinstance(wday, integer_types):
-                    self._byweekday.add(wday)
-                elif not wday.n or freq > MONTHLY:
-                    self._byweekday.add(wday.weekday)
-                else:
-                    self._bynweekday.add((wday.weekday, wday.n))
-
-            if not self._byweekday:
-                self._byweekday = None
-            elif not self._bynweekday:
-                self._bynweekday = None
-
-            if self._byweekday is not None:
-                self._byweekday = tuple(sorted(self._byweekday))
-                orig_byweekday = [weekday(x) for x in self._byweekday]
-            else:
-                orig_byweekday = ()
-
-            if self._bynweekday is not None:
-                self._bynweekday = tuple(sorted(self._bynweekday))
-                orig_bynweekday = [weekday(*x) for x in self._bynweekday]
-            else:
-                orig_bynweekday = ()
-
-            if 'byweekday' not in self._original_rule:
-                self._original_rule['byweekday'] = tuple(itertools.chain(
-                    orig_byweekday, orig_bynweekday))
-
-        # byhour
-        if byhour is None:
-            if freq < HOURLY:
-                self._byhour = {dtstart.hour}
-            else:
-                self._byhour = None
-        else:
-            if isinstance(byhour, integer_types):
-                byhour = (byhour,)
-
-            if freq == HOURLY:
-                self._byhour = self.__construct_byset(start=dtstart.hour,
-                                                      byxxx=byhour,
-                                                      base=24)
-            else:
-                self._byhour = set(byhour)
-
-            self._byhour = tuple(sorted(self._byhour))
-            self._original_rule['byhour'] = self._byhour
-
-        # byminute
-        if byminute is None:
-            if freq < MINUTELY:
-                self._byminute = {dtstart.minute}
-            else:
-                self._byminute = None
-        else:
-            if isinstance(byminute, integer_types):
-                byminute = (byminute,)
-
-            if freq == MINUTELY:
-                self._byminute = self.__construct_byset(start=dtstart.minute,
-                                                        byxxx=byminute,
-                                                        base=60)
-            else:
-                self._byminute = set(byminute)
-
-            self._byminute = tuple(sorted(self._byminute))
-            self._original_rule['byminute'] = self._byminute
-
-        # bysecond
-        if bysecond is None:
-            if freq < SECONDLY:
-                self._bysecond = ((dtstart.second,))
-            else:
-                self._bysecond = None
-        else:
-            if isinstance(bysecond, integer_types):
-                bysecond = (bysecond,)
-
-            self._bysecond = set(bysecond)
-
-            if freq == SECONDLY:
-                self._bysecond = self.__construct_byset(start=dtstart.second,
-                                                        byxxx=bysecond,
-                                                        base=60)
-            else:
-                self._bysecond = set(bysecond)
-
-            self._bysecond = tuple(sorted(self._bysecond))
-            self._original_rule['bysecond'] = self._bysecond
-
-        if self._freq >= HOURLY:
-            self._timeset = None
-        else:
-            self._timeset = []
-            for hour in self._byhour:
-                for minute in self._byminute:
-                    for second in self._bysecond:
-                        self._timeset.append(
-                            datetime.time(hour, minute, second,
-                                          tzinfo=self._tzinfo))
-            self._timeset.sort()
-            self._timeset = tuple(self._timeset)
-
-    def __str__(self):
-        """
-        Output a string that would generate this RRULE if passed to rrulestr.
-        This is mostly compatible with RFC5545, except for the
-        dateutil-specific extension BYEASTER.
-        """
-
-        output = []
-        h, m, s = [None] * 3
-        if self._dtstart:
-            output.append(self._dtstart.strftime('DTSTART:%Y%m%dT%H%M%S'))
-            h, m, s = self._dtstart.timetuple()[3:6]
-
-        parts = ['FREQ=' + FREQNAMES[self._freq]]
-        if self._interval != 1:
-            parts.append('INTERVAL=' + str(self._interval))
-
-        if self._wkst:
-            parts.append('WKST=' + repr(weekday(self._wkst))[0:2])
-
-        if self._count is not None:
-            parts.append('COUNT=' + str(self._count))
-
-        if self._until:
-            parts.append(self._until.strftime('UNTIL=%Y%m%dT%H%M%S'))
-
-        if self._original_rule.get('byweekday') is not None:
-            # The str() method on weekday objects doesn't generate
-            # RFC5545-compliant strings, so we should modify that.
-            original_rule = dict(self._original_rule)
-            wday_strings = []
-            for wday in original_rule['byweekday']:
-                if wday.n:
-                    wday_strings.append('{n:+d}{wday}'.format(
-                        n=wday.n,
-                        wday=repr(wday)[0:2]))
-                else:
-                    wday_strings.append(repr(wday))
-
-            original_rule['byweekday'] = wday_strings
-        else:
-            original_rule = self._original_rule
-
-        partfmt = '{name}={vals}'
-        for name, key in [('BYSETPOS', 'bysetpos'),
-                          ('BYMONTH', 'bymonth'),
-                          ('BYMONTHDAY', 'bymonthday'),
-                          ('BYYEARDAY', 'byyearday'),
-                          ('BYWEEKNO', 'byweekno'),
-                          ('BYDAY', 'byweekday'),
-                          ('BYHOUR', 'byhour'),
-                          ('BYMINUTE', 'byminute'),
-                          ('BYSECOND', 'bysecond'),
-                          ('BYEASTER', 'byeaster')]:
-            value = original_rule.get(key)
-            if value:
-                parts.append(partfmt.format(name=name, vals=(','.join(str(v)
-                                                             for v in value))))
-
-        output.append('RRULE:' + ';'.join(parts))
-        return '\n'.join(output)
-
-    def replace(self, **kwargs):
-        """Return new rrule with same attributes except for those attributes given new
-           values by whichever keyword arguments are specified."""
-        new_kwargs = {"interval": self._interval,
-                      "count": self._count,
-                      "dtstart": self._dtstart,
-                      "freq": self._freq,
-                      "until": self._until,
-                      "wkst": self._wkst,
-                      "cache": False if self._cache is None else True }
-        new_kwargs.update(self._original_rule)
-        new_kwargs.update(kwargs)
-        return rrule(**new_kwargs)
-
-    def _iter(self):
-        year, month, day, hour, minute, second, weekday, yearday, _ = \
-            self._dtstart.timetuple()
-
-        # Some local variables to speed things up a bit
-        freq = self._freq
-        interval = self._interval
-        wkst = self._wkst
-        until = self._until
-        bymonth = self._bymonth
-        byweekno = self._byweekno
-        byyearday = self._byyearday
-        byweekday = self._byweekday
-        byeaster = self._byeaster
-        bymonthday = self._bymonthday
-        bynmonthday = self._bynmonthday
-        bysetpos = self._bysetpos
-        byhour = self._byhour
-        byminute = self._byminute
-        bysecond = self._bysecond
-
-        ii = _iterinfo(self)
-        ii.rebuild(year, month)
-
-        getdayset = {YEARLY: ii.ydayset,
-                     MONTHLY: ii.mdayset,
-                     WEEKLY: ii.wdayset,
-                     DAILY: ii.ddayset,
-                     HOURLY: ii.ddayset,
-                     MINUTELY: ii.ddayset,
-                     SECONDLY: ii.ddayset}[freq]
-
-        if freq < HOURLY:
-            timeset = self._timeset
-        else:
-            gettimeset = {HOURLY: ii.htimeset,
-                          MINUTELY: ii.mtimeset,
-                          SECONDLY: ii.stimeset}[freq]
-            if ((freq >= HOURLY and
-                 self._byhour and hour not in self._byhour) or
-                (freq >= MINUTELY and
-                 self._byminute and minute not in self._byminute) or
-                (freq >= SECONDLY and
-                 self._bysecond and second not in self._bysecond)):
-                timeset = ()
-            else:
-                timeset = gettimeset(hour, minute, second)
-
-        total = 0
-        count = self._count
-        while True:
-            # Get dayset with the right frequency
-            dayset, start, end = getdayset(year, month, day)
-
-            # Do the "hard" work ;-)
-            filtered = False
-            for i in dayset[start:end]:
-                if ((bymonth and ii.mmask[i] not in bymonth) or
-                    (byweekno and not ii.wnomask[i]) or
-                    (byweekday and ii.wdaymask[i] not in byweekday) or
-                    (ii.nwdaymask and not ii.nwdaymask[i]) or
-                    (byeaster and not ii.eastermask[i]) or
-                    ((bymonthday or bynmonthday) and
-                     ii.mdaymask[i] not in bymonthday and
-                     ii.nmdaymask[i] not in bynmonthday) or
-                    (byyearday and
-                     ((i < ii.yearlen and i+1 not in byyearday and
-                       -ii.yearlen+i not in byyearday) or
-                      (i >= ii.yearlen and i+1-ii.yearlen not in byyearday and
-                       -ii.nextyearlen+i-ii.yearlen not in byyearday)))):
-                    dayset[i] = None
-                    filtered = True
-
-            # Output results
-            if bysetpos and timeset:
-                poslist = []
-                for pos in bysetpos:
-                    if pos < 0:
-                        daypos, timepos = divmod(pos, len(timeset))
-                    else:
-                        daypos, timepos = divmod(pos-1, len(timeset))
-                    try:
-                        i = [x for x in dayset[start:end]
-                             if x is not None][daypos]
-                        time = timeset[timepos]
-                    except IndexError:
-                        pass
-                    else:
-                        date = datetime.date.fromordinal(ii.yearordinal+i)
-                        res = datetime.datetime.combine(date, time)
-                        if res not in poslist:
-                            poslist.append(res)
-                poslist.sort()
-                for res in poslist:
-                    if until and res > until:
-                        self._len = total
-                        return
-                    elif res >= self._dtstart:
-                        if count is not None:
-                            count -= 1
-                            if count < 0:
-                                self._len = total
-                                return
-                        total += 1
-                        yield res
-            else:
-                for i in dayset[start:end]:
-                    if i is not None:
-                        date = datetime.date.fromordinal(ii.yearordinal + i)
-                        for time in timeset:
-                            res = datetime.datetime.combine(date, time)
-                            if until and res > until:
-                                self._len = total
-                                return
-                            elif res >= self._dtstart:
-                                if count is not None:
-                                    count -= 1
-                                    if count < 0:
-                                        self._len = total
-                                        return
-
-                                total += 1
-                                yield res
-
-            # Handle frequency and interval
-            fixday = False
-            if freq == YEARLY:
-                year += interval
-                if year > datetime.MAXYEAR:
-                    self._len = total
-                    return
-                ii.rebuild(year, month)
-            elif freq == MONTHLY:
-                month += interval
-                if month > 12:
-                    div, mod = divmod(month, 12)
-                    month = mod
-                    year += div
-                    if month == 0:
-                        month = 12
-                        year -= 1
-                    if year > datetime.MAXYEAR:
-                        self._len = total
-                        return
-                ii.rebuild(year, month)
-            elif freq == WEEKLY:
-                if wkst > weekday:
-                    day += -(weekday+1+(6-wkst))+self._interval*7
-                else:
-                    day += -(weekday-wkst)+self._interval*7
-                weekday = wkst
-                fixday = True
-            elif freq == DAILY:
-                day += interval
-                fixday = True
-            elif freq == HOURLY:
-                if filtered:
-                    # Jump to one iteration before next day
-                    hour += ((23-hour)//interval)*interval
-
-                if byhour:
-                    ndays, hour = self.__mod_distance(value=hour,
-                                                      byxxx=self._byhour,
-                                                      base=24)
-                else:
-                    ndays, hour = divmod(hour+interval, 24)
-
-                if ndays:
-                    day += ndays
-                    fixday = True
-
-                timeset = gettimeset(hour, minute, second)
-            elif freq == MINUTELY:
-                if filtered:
-                    # Jump to one iteration before next day
-                    minute += ((1439-(hour*60+minute))//interval)*interval
-
-                valid = False
-                rep_rate = (24*60)
-                for j in range(rep_rate // gcd(interval, rep_rate)):
-                    if byminute:
-                        nhours, minute = \
-                            self.__mod_distance(value=minute,
-                                                byxxx=self._byminute,
-                                                base=60)
-                    else:
-                        nhours, minute = divmod(minute+interval, 60)
-
-                    div, hour = divmod(hour+nhours, 24)
-                    if div:
-                        day += div
-                        fixday = True
-                        filtered = False
-
-                    if not byhour or hour in byhour:
-                        valid = True
-                        break
-
-                if not valid:
-                    raise ValueError('Invalid combination of interval and ' +
-                                     'byhour resulting in empty rule.')
-
-                timeset = gettimeset(hour, minute, second)
-            elif freq == SECONDLY:
-                if filtered:
-                    # Jump to one iteration before next day
-                    second += (((86399 - (hour * 3600 + minute * 60 + second))
-                                // interval) * interval)
-
-                rep_rate = (24 * 3600)
-                valid = False
-                for j in range(0, rep_rate // gcd(interval, rep_rate)):
-                    if bysecond:
-                        nminutes, second = \
-                            self.__mod_distance(value=second,
-                                                byxxx=self._bysecond,
-                                                base=60)
-                    else:
-                        nminutes, second = divmod(second+interval, 60)
-
-                    div, minute = divmod(minute+nminutes, 60)
-                    if div:
-                        hour += div
-                        div, hour = divmod(hour, 24)
-                        if div:
-                            day += div
-                            fixday = True
-
-                    if ((not byhour or hour in byhour) and
-                            (not byminute or minute in byminute) and
-                            (not bysecond or second in bysecond)):
-                        valid = True
-                        break
-
-                if not valid:
-                    raise ValueError('Invalid combination of interval, ' +
-                                     'byhour and byminute resulting in empty' +
-                                     ' rule.')
-
-                timeset = gettimeset(hour, minute, second)
-
-            if fixday and day > 28:
-                daysinmonth = calendar.monthrange(year, month)[1]
-                if day > daysinmonth:
-                    while day > daysinmonth:
-                        day -= daysinmonth
-                        month += 1
-                        if month == 13:
-                            month = 1
-                            year += 1
-                            if year > datetime.MAXYEAR:
-                                self._len = total
-                                return
-                        daysinmonth = calendar.monthrange(year, month)[1]
-                    ii.rebuild(year, month)
-
-    def __construct_byset(self, start, byxxx, base):
-        """
-        If a `BYXXX` sequence is passed to the constructor at the same level as
-        `FREQ` (e.g. `FREQ=HOURLY,BYHOUR={2,4,7},INTERVAL=3`), there are some
-        specifications which cannot be reached given some starting conditions.
-
-        This occurs whenever the interval is not coprime with the base of a
-        given unit and the difference between the starting position and the
-        ending position is not coprime with the greatest common denominator
-        between the interval and the base. For example, with a FREQ of hourly
-        starting at 17:00 and an interval of 4, the only valid values for
-        BYHOUR would be {21, 1, 5, 9, 13, 17}, because 4 and 24 are not
-        coprime.
-
-        :param start:
-            Specifies the starting position.
-        :param byxxx:
-            An iterable containing the list of allowed values.
-        :param base:
-            The largest allowable value for the specified frequency (e.g.
-            24 hours, 60 minutes).
-
-        This does not preserve the type of the iterable, returning a set, since
-        the values should be unique and the order is irrelevant, this will
-        speed up later lookups.
-
-        In the event of an empty set, raises a :exception:`ValueError`, as this
-        results in an empty rrule.
-        """
-
-        cset = set()
-
-        # Support a single byxxx value.
-        if isinstance(byxxx, integer_types):
-            byxxx = (byxxx, )
-
-        for num in byxxx:
-            i_gcd = gcd(self._interval, base)
-            # Use divmod rather than % because we need to wrap negative nums.
-            if i_gcd == 1 or divmod(num - start, i_gcd)[1] == 0:
-                cset.add(num)
-
-        if len(cset) == 0:
-            raise ValueError("Invalid rrule byxxx generates an empty set.")
-
-        return cset
-
-    def __mod_distance(self, value, byxxx, base):
-        """
-        Calculates the next value in a sequence where the `FREQ` parameter is
-        specified along with a `BYXXX` parameter at the same "level"
-        (e.g. `HOURLY` specified with `BYHOUR`).
-
-        :param value:
-            The old value of the component.
-        :param byxxx:
-            The `BYXXX` set, which should have been generated by
-            `rrule._construct_byset`, or something else which checks that a
-            valid rule is present.
-        :param base:
-            The largest allowable value for the specified frequency (e.g.
-            24 hours, 60 minutes).
-
-        If a valid value is not found after `base` iterations (the maximum
-        number before the sequence would start to repeat), this raises a
-        :exception:`ValueError`, as no valid values were found.
-
-        This returns a tuple of `divmod(n*interval, base)`, where `n` is the
-        smallest number of `interval` repetitions until the next specified
-        value in `byxxx` is found.
-        """
-        accumulator = 0
-        for ii in range(1, base + 1):
-            # Using divmod() over % to account for negative intervals
-            div, value = divmod(value + self._interval, base)
-            accumulator += div
-            if value in byxxx:
-                return (accumulator, value)
-
-
-class _iterinfo(object):
-    __slots__ = ["rrule", "lastyear", "lastmonth",
-                 "yearlen", "nextyearlen", "yearordinal", "yearweekday",
-                 "mmask", "mrange", "mdaymask", "nmdaymask",
-                 "wdaymask", "wnomask", "nwdaymask", "eastermask"]
-
-    def __init__(self, rrule):
-        for attr in self.__slots__:
-            setattr(self, attr, None)
-        self.rrule = rrule
-
-    def rebuild(self, year, month):
-        # Every mask is 7 days longer to handle cross-year weekly periods.
-        rr = self.rrule
-        if year != self.lastyear:
-            self.yearlen = 365 + calendar.isleap(year)
-            self.nextyearlen = 365 + calendar.isleap(year + 1)
-            firstyday = datetime.date(year, 1, 1)
-            self.yearordinal = firstyday.toordinal()
-            self.yearweekday = firstyday.weekday()
-
-            wday = datetime.date(year, 1, 1).weekday()
-            if self.yearlen == 365:
-                self.mmask = M365MASK
-                self.mdaymask = MDAY365MASK
-                self.nmdaymask = NMDAY365MASK
-                self.wdaymask = WDAYMASK[wday:]
-                self.mrange = M365RANGE
-            else:
-                self.mmask = M366MASK
-                self.mdaymask = MDAY366MASK
-                self.nmdaymask = NMDAY366MASK
-                self.wdaymask = WDAYMASK[wday:]
-                self.mrange = M366RANGE
-
-            if not rr._byweekno:
-                self.wnomask = None
-            else:
-                self.wnomask = [0]*(self.yearlen+7)
-                # no1wkst = firstwkst = self.wdaymask.index(rr._wkst)
-                no1wkst = firstwkst = (7-self.yearweekday+rr._wkst) % 7
-                if no1wkst >= 4:
-                    no1wkst = 0
-                    # Number of days in the year, plus the days we got
-                    # from last year.
-                    wyearlen = self.yearlen+(self.yearweekday-rr._wkst) % 7
-                else:
-                    # Number of days in the year, minus the days we
-                    # left in last year.
-                    wyearlen = self.yearlen-no1wkst
-                div, mod = divmod(wyearlen, 7)
-                numweeks = div+mod//4
-                for n in rr._byweekno:
-                    if n < 0:
-                        n += numweeks+1
-                    if not (0 < n <= numweeks):
-                        continue
-                    if n > 1:
-                        i = no1wkst+(n-1)*7
-                        if no1wkst != firstwkst:
-                            i -= 7-firstwkst
-                    else:
-                        i = no1wkst
-                    for j in range(7):
-                        self.wnomask[i] = 1
-                        i += 1
-                        if self.wdaymask[i] == rr._wkst:
-                            break
-                if 1 in rr._byweekno:
-                    # Check week number 1 of next year as well
-                    # TODO: Check -numweeks for next year.
-                    i = no1wkst+numweeks*7
-                    if no1wkst != firstwkst:
-                        i -= 7-firstwkst
-                    if i < self.yearlen:
-                        # If week starts in next year, we
-                        # don't care about it.
-                        for j in range(7):
-                            self.wnomask[i] = 1
-                            i += 1
-                            if self.wdaymask[i] == rr._wkst:
-                                break
-                if no1wkst:
-                    # Check last week number of last year as
-                    # well. If no1wkst is 0, either the year
-                    # started on week start, or week number 1
-                    # got days from last year, so there are no
-                    # days from last year's last week number in
-                    # this year.
-                    if -1 not in rr._byweekno:
-                        lyearweekday = datetime.date(year-1, 1, 1).weekday()
-                        lno1wkst = (7-lyearweekday+rr._wkst) % 7
-                        lyearlen = 365+calendar.isleap(year-1)
-                        if lno1wkst >= 4:
-                            lno1wkst = 0
-                            lnumweeks = 52+(lyearlen +
-                                            (lyearweekday-rr._wkst) % 7) % 7//4
-                        else:
-                            lnumweeks = 52+(self.yearlen-no1wkst) % 7//4
-                    else:
-                        lnumweeks = -1
-                    if lnumweeks in rr._byweekno:
-                        for i in range(no1wkst):
-                            self.wnomask[i] = 1
-
-        if (rr._bynweekday and (month != self.lastmonth or
-                                year != self.lastyear)):
-            ranges = []
-            if rr._freq == YEARLY:
-                if rr._bymonth:
-                    for month in rr._bymonth:
-                        ranges.append(self.mrange[month-1:month+1])
-                else:
-                    ranges = [(0, self.yearlen)]
-            elif rr._freq == MONTHLY:
-                ranges = [self.mrange[month-1:month+1]]
-            if ranges:
-                # Weekly frequency won't get here, so we may not
-                # care about cross-year weekly periods.
-                self.nwdaymask = [0]*self.yearlen
-                for first, last in ranges:
-                    last -= 1
-                    for wday, n in rr._bynweekday:
-                        if n < 0:
-                            i = last+(n+1)*7
-                            i -= (self.wdaymask[i]-wday) % 7
-                        else:
-                            i = first+(n-1)*7
-                            i += (7-self.wdaymask[i]+wday) % 7
-                        if first <= i <= last:
-                            self.nwdaymask[i] = 1
-
-        if rr._byeaster:
-            self.eastermask = [0]*(self.yearlen+7)
-            eyday = easter.easter(year).toordinal()-self.yearordinal
-            for offset in rr._byeaster:
-                self.eastermask[eyday+offset] = 1
-
-        self.lastyear = year
-        self.lastmonth = month
-
-    def ydayset(self, year, month, day):
-        return list(range(self.yearlen)), 0, self.yearlen
-
-    def mdayset(self, year, month, day):
-        dset = [None]*self.yearlen
-        start, end = self.mrange[month-1:month+1]
-        for i in range(start, end):
-            dset[i] = i
-        return dset, start, end
-
-    def wdayset(self, year, month, day):
-        # We need to handle cross-year weeks here.
-        dset = [None]*(self.yearlen+7)
-        i = datetime.date(year, month, day).toordinal()-self.yearordinal
-        start = i
-        for j in range(7):
-            dset[i] = i
-            i += 1
-            # if (not (0 <= i < self.yearlen) or
-            #    self.wdaymask[i] == self.rrule._wkst):
-            # This will cross the year boundary, if necessary.
-            if self.wdaymask[i] == self.rrule._wkst:
-                break
-        return dset, start, i
-
-    def ddayset(self, year, month, day):
-        dset = [None] * self.yearlen
-        i = datetime.date(year, month, day).toordinal() - self.yearordinal
-        dset[i] = i
-        return dset, i, i + 1
-
-    def htimeset(self, hour, minute, second):
-        tset = []
-        rr = self.rrule
-        for minute in rr._byminute:
-            for second in rr._bysecond:
-                tset.append(datetime.time(hour, minute, second,
-                                          tzinfo=rr._tzinfo))
-        tset.sort()
-        return tset
-
-    def mtimeset(self, hour, minute, second):
-        tset = []
-        rr = self.rrule
-        for second in rr._bysecond:
-            tset.append(datetime.time(hour, minute, second, tzinfo=rr._tzinfo))
-        tset.sort()
-        return tset
-
-    def stimeset(self, hour, minute, second):
-        return (datetime.time(hour, minute, second,
-                tzinfo=self.rrule._tzinfo),)
-
-
-class rruleset(rrulebase):
-    """ The rruleset type allows more complex recurrence setups, mixing
-    multiple rules, dates, exclusion rules, and exclusion dates. The type
-    constructor takes the following keyword arguments:
-
-    :param cache: If True, caching of results will be enabled, improving
-                  performance of multiple queries considerably. """
-
-    class _genitem(object):
-        def __init__(self, genlist, gen):
-            try:
-                self.dt = advance_iterator(gen)
-                genlist.append(self)
-            except StopIteration:
-                pass
-            self.genlist = genlist
-            self.gen = gen
-
-        def __next__(self):
-            try:
-                self.dt = advance_iterator(self.gen)
-            except StopIteration:
-                if self.genlist[0] is self:
-                    heapq.heappop(self.genlist)
-                else:
-                    self.genlist.remove(self)
-                    heapq.heapify(self.genlist)
-
-        next = __next__
-
-        def __lt__(self, other):
-            return self.dt < other.dt
-
-        def __gt__(self, other):
-            return self.dt > other.dt
-
-        def __eq__(self, other):
-            return self.dt == other.dt
-
-        def __ne__(self, other):
-            return self.dt != other.dt
-
-    def __init__(self, cache=False):
-        super(rruleset, self).__init__(cache)
-        self._rrule = []
-        self._rdate = []
-        self._exrule = []
-        self._exdate = []
-
-    @_invalidates_cache
-    def rrule(self, rrule):
-        """ Include the given :py:class:`rrule` instance in the recurrence set
-            generation. """
-        self._rrule.append(rrule)
-
-    @_invalidates_cache
-    def rdate(self, rdate):
-        """ Include the given :py:class:`datetime` instance in the recurrence
-            set generation. """
-        self._rdate.append(rdate)
-
-    @_invalidates_cache
-    def exrule(self, exrule):
-        """ Include the given rrule instance in the recurrence set exclusion
-            list. Dates which are part of the given recurrence rules will not
-            be generated, even if some inclusive rrule or rdate matches them.
-        """
-        self._exrule.append(exrule)
-
-    @_invalidates_cache
-    def exdate(self, exdate):
-        """ Include the given datetime instance in the recurrence set
-            exclusion list. Dates included that way will not be generated,
-            even if some inclusive rrule or rdate matches them. """
-        self._exdate.append(exdate)
-
-    def _iter(self):
-        rlist = []
-        self._rdate.sort()
-        self._genitem(rlist, iter(self._rdate))
-        for gen in [iter(x) for x in self._rrule]:
-            self._genitem(rlist, gen)
-        exlist = []
-        self._exdate.sort()
-        self._genitem(exlist, iter(self._exdate))
-        for gen in [iter(x) for x in self._exrule]:
-            self._genitem(exlist, gen)
-        lastdt = None
-        total = 0
-        heapq.heapify(rlist)
-        heapq.heapify(exlist)
-        while rlist:
-            ritem = rlist[0]
-            if not lastdt or lastdt != ritem.dt:
-                while exlist and exlist[0] < ritem:
-                    exitem = exlist[0]
-                    advance_iterator(exitem)
-                    if exlist and exlist[0] is exitem:
-                        heapq.heapreplace(exlist, exitem)
-                if not exlist or ritem != exlist[0]:
-                    total += 1
-                    yield ritem.dt
-                lastdt = ritem.dt
-            advance_iterator(ritem)
-            if rlist and rlist[0] is ritem:
-                heapq.heapreplace(rlist, ritem)
-        self._len = total
-
-
-
-
-class _rrulestr(object):
-    """ Parses a string representation of a recurrence rule or set of
-    recurrence rules.
-
-    :param s:
-        Required, a string defining one or more recurrence rules.
-
-    :param dtstart:
-        If given, used as the default recurrence start if not specified in the
-        rule string.
-
-    :param cache:
-        If set ``True`` caching of results will be enabled, improving
-        performance of multiple queries considerably.
-
-    :param unfold:
-        If set ``True`` indicates that a rule string is split over more
-        than one line and should be joined before processing.
-
-    :param forceset:
-        If set ``True`` forces a :class:`dateutil.rrule.rruleset` to
-        be returned.
-
-    :param compatible:
-        If set ``True`` forces ``unfold`` and ``forceset`` to be ``True``.
-
-    :param ignoretz:
-        If set ``True``, time zones in parsed strings are ignored and a naive
-        :class:`datetime.datetime` object is returned.
-
-    :param tzids:
-        If given, a callable or mapping used to retrieve a
-        :class:`datetime.tzinfo` from a string representation.
-        Defaults to :func:`dateutil.tz.gettz`.
-
-    :param tzinfos:
-        Additional time zone names / aliases which may be present in a string
-        representation.  See :func:`dateutil.parser.parse` for more
-        information.
-
-    :return:
-        Returns a :class:`dateutil.rrule.rruleset` or
-        :class:`dateutil.rrule.rrule`
-    """
-
-    _freq_map = {"YEARLY": YEARLY,
-                 "MONTHLY": MONTHLY,
-                 "WEEKLY": WEEKLY,
-                 "DAILY": DAILY,
-                 "HOURLY": HOURLY,
-                 "MINUTELY": MINUTELY,
-                 "SECONDLY": SECONDLY}
-
-    _weekday_map = {"MO": 0, "TU": 1, "WE": 2, "TH": 3,
-                    "FR": 4, "SA": 5, "SU": 6}
-
-    def _handle_int(self, rrkwargs, name, value, **kwargs):
-        rrkwargs[name.lower()] = int(value)
-
-    def _handle_int_list(self, rrkwargs, name, value, **kwargs):
-        rrkwargs[name.lower()] = [int(x) for x in value.split(',')]
-
-    _handle_INTERVAL = _handle_int
-    _handle_COUNT = _handle_int
-    _handle_BYSETPOS = _handle_int_list
-    _handle_BYMONTH = _handle_int_list
-    _handle_BYMONTHDAY = _handle_int_list
-    _handle_BYYEARDAY = _handle_int_list
-    _handle_BYEASTER = _handle_int_list
-    _handle_BYWEEKNO = _handle_int_list
-    _handle_BYHOUR = _handle_int_list
-    _handle_BYMINUTE = _handle_int_list
-    _handle_BYSECOND = _handle_int_list
-
-    def _handle_FREQ(self, rrkwargs, name, value, **kwargs):
-        rrkwargs["freq"] = self._freq_map[value]
-
-    def _handle_UNTIL(self, rrkwargs, name, value, **kwargs):
-        global parser
-        if not parser:
-            from dateutil import parser
-        try:
-            rrkwargs["until"] = parser.parse(value,
-                                             ignoretz=kwargs.get("ignoretz"),
-                                             tzinfos=kwargs.get("tzinfos"))
-        except ValueError:
-            raise ValueError("invalid until date")
-
-    def _handle_WKST(self, rrkwargs, name, value, **kwargs):
-        rrkwargs["wkst"] = self._weekday_map[value]
-
-    def _handle_BYWEEKDAY(self, rrkwargs, name, value, **kwargs):
-        """
-        Two ways to specify this: +1MO or MO(+1)
-        """
-        l = []
-        for wday in value.split(','):
-            if '(' in wday:
-                # If it's of the form TH(+1), etc.
-                splt = wday.split('(')
-                w = splt[0]
-                n = int(splt[1][:-1])
-            elif len(wday):
-                # If it's of the form +1MO
-                for i in range(len(wday)):
-                    if wday[i] not in '+-0123456789':
-                        break
-                n = wday[:i] or None
-                w = wday[i:]
-                if n:
-                    n = int(n)
-            else:
-                raise ValueError("Invalid (empty) BYDAY specification.")
-
-            l.append(weekdays[self._weekday_map[w]](n))
-        rrkwargs["byweekday"] = l
-
-    _handle_BYDAY = _handle_BYWEEKDAY
-
-    def _parse_rfc_rrule(self, line,
-                         dtstart=None,
-                         cache=False,
-                         ignoretz=False,
-                         tzinfos=None):
-        if line.find(':') != -1:
-            name, value = line.split(':')
-            if name != "RRULE":
-                raise ValueError("unknown parameter name")
-        else:
-            value = line
-        rrkwargs = {}
-        for pair in value.split(';'):
-            name, value = pair.split('=')
-            name = name.upper()
-            value = value.upper()
-            try:
-                getattr(self, "_handle_"+name)(rrkwargs, name, value,
-                                               ignoretz=ignoretz,
-                                               tzinfos=tzinfos)
-            except AttributeError:
-                raise ValueError("unknown parameter '%s'" % name)
-            except (KeyError, ValueError):
-                raise ValueError("invalid '%s': %s" % (name, value))
-        return rrule(dtstart=dtstart, cache=cache, **rrkwargs)
-
-    def _parse_date_value(self, date_value, parms, rule_tzids,
-                          ignoretz, tzids, tzinfos):
-        global parser
-        if not parser:
-            from dateutil import parser
-
-        datevals = []
-        value_found = False
-        TZID = None
-
-        for parm in parms:
-            if parm.startswith("TZID="):
-                try:
-                    tzkey = rule_tzids[parm.split('TZID=')[-1]]
-                except KeyError:
-                    continue
-                if tzids is None:
-                    from . import tz
-                    tzlookup = tz.gettz
-                elif callable(tzids):
-                    tzlookup = tzids
-                else:
-                    tzlookup = getattr(tzids, 'get', None)
-                    if tzlookup is None:
-                        msg = ('tzids must be a callable, mapping, or None, '
-                               'not %s' % tzids)
-                        raise ValueError(msg)
-
-                TZID = tzlookup(tzkey)
-                continue
-
-            # RFC 5445 3.8.2.4: The VALUE parameter is optional, but may be found
-            # only once.
-            if parm not in {"VALUE=DATE-TIME", "VALUE=DATE"}:
-                raise ValueError("unsupported parm: " + parm)
-            else:
-                if value_found:
-                    msg = ("Duplicate value parameter found in: " + parm)
-                    raise ValueError(msg)
-                value_found = True
-
-        for datestr in date_value.split(','):
-            date = parser.parse(datestr, ignoretz=ignoretz, tzinfos=tzinfos)
-            if TZID is not None:
-                if date.tzinfo is None:
-                    date = date.replace(tzinfo=TZID)
-                else:
-                    raise ValueError('DTSTART/EXDATE specifies multiple timezone')
-            datevals.append(date)
-
-        return datevals
-
-    def _parse_rfc(self, s,
-                   dtstart=None,
-                   cache=False,
-                   unfold=False,
-                   forceset=False,
-                   compatible=False,
-                   ignoretz=False,
-                   tzids=None,
-                   tzinfos=None):
-        global parser
-        if compatible:
-            forceset = True
-            unfold = True
-
-        TZID_NAMES = dict(map(
-            lambda x: (x.upper(), x),
-            re.findall('TZID=(?P<name>[^:]+):', s)
-        ))
-        s = s.upper()
-        if not s.strip():
-            raise ValueError("empty string")
-        if unfold:
-            lines = s.splitlines()
-            i = 0
-            while i < len(lines):
-                line = lines[i].rstrip()
-                if not line:
-                    del lines[i]
-                elif i > 0 and line[0] == " ":
-                    lines[i-1] += line[1:]
-                    del lines[i]
-                else:
-                    i += 1
-        else:
-            lines = s.split()
-        if (not forceset and len(lines) == 1 and (s.find(':') == -1 or
-                                                  s.startswith('RRULE:'))):
-            return self._parse_rfc_rrule(lines[0], cache=cache,
-                                         dtstart=dtstart, ignoretz=ignoretz,
-                                         tzinfos=tzinfos)
-        else:
-            rrulevals = []
-            rdatevals = []
-            exrulevals = []
-            exdatevals = []
-            for line in lines:
-                if not line:
-                    continue
-                if line.find(':') == -1:
-                    name = "RRULE"
-                    value = line
-                else:
-                    name, value = line.split(':', 1)
-                parms = name.split(';')
-                if not parms:
-                    raise ValueError("empty property name")
-                name = parms[0]
-                parms = parms[1:]
-                if name == "RRULE":
-                    for parm in parms:
-                        raise ValueError("unsupported RRULE parm: "+parm)
-                    rrulevals.append(value)
-                elif name == "RDATE":
-                    for parm in parms:
-                        if parm != "VALUE=DATE-TIME":
-                            raise ValueError("unsupported RDATE parm: "+parm)
-                    rdatevals.append(value)
-                elif name == "EXRULE":
-                    for parm in parms:
-                        raise ValueError("unsupported EXRULE parm: "+parm)
-                    exrulevals.append(value)
-                elif name == "EXDATE":
-                    exdatevals.extend(
-                        self._parse_date_value(value, parms,
-                                               TZID_NAMES, ignoretz,
-                                               tzids, tzinfos)
-                    )
-                elif name == "DTSTART":
-                    dtvals = self._parse_date_value(value, parms, TZID_NAMES,
-                                                    ignoretz, tzids, tzinfos)
-                    if len(dtvals) != 1:
-                        raise ValueError("Multiple DTSTART values specified:" +
-                                         value)
-                    dtstart = dtvals[0]
-                else:
-                    raise ValueError("unsupported property: "+name)
-            if (forceset or len(rrulevals) > 1 or rdatevals
-                    or exrulevals or exdatevals):
-                if not parser and (rdatevals or exdatevals):
-                    from dateutil import parser
-                rset = rruleset(cache=cache)
-                for value in rrulevals:
-                    rset.rrule(self._parse_rfc_rrule(value, dtstart=dtstart,
-                                                     ignoretz=ignoretz,
-                                                     tzinfos=tzinfos))
-                for value in rdatevals:
-                    for datestr in value.split(','):
-                        rset.rdate(parser.parse(datestr,
-                                                ignoretz=ignoretz,
-                                                tzinfos=tzinfos))
-                for value in exrulevals:
-                    rset.exrule(self._parse_rfc_rrule(value, dtstart=dtstart,
-                                                      ignoretz=ignoretz,
-                                                      tzinfos=tzinfos))
-                for value in exdatevals:
-                    rset.exdate(value)
-                if compatible and dtstart:
-                    rset.rdate(dtstart)
-                return rset
-            else:
-                return self._parse_rfc_rrule(rrulevals[0],
-                                             dtstart=dtstart,
-                                             cache=cache,
-                                             ignoretz=ignoretz,
-                                             tzinfos=tzinfos)
-
-    def __call__(self, s, **kwargs):
-        return self._parse_rfc(s, **kwargs)
-
-
-rrulestr = _rrulestr()
-
-# vim:ts=4:sw=4:et
diff --git a/lib/dateutil/tz/__init__.py b/lib/dateutil/tz/__init__.py
deleted file mode 100644
index af1352c4..00000000
--- a/lib/dateutil/tz/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-from .tz import *
-from .tz import __doc__
-
-__all__ = ["tzutc", "tzoffset", "tzlocal", "tzfile", "tzrange",
-           "tzstr", "tzical", "tzwin", "tzwinlocal", "gettz",
-           "enfold", "datetime_ambiguous", "datetime_exists",
-           "resolve_imaginary", "UTC", "DeprecatedTzFormatWarning"]
-
-
-class DeprecatedTzFormatWarning(Warning):
-    """Warning raised when time zones are parsed from deprecated formats."""
diff --git a/lib/dateutil/tz/_common.py b/lib/dateutil/tz/_common.py
deleted file mode 100644
index e6ac1183..00000000
--- a/lib/dateutil/tz/_common.py
+++ /dev/null
@@ -1,419 +0,0 @@
-from six import PY2
-
-from functools import wraps
-
-from datetime import datetime, timedelta, tzinfo
-
-
-ZERO = timedelta(0)
-
-__all__ = ['tzname_in_python2', 'enfold']
-
-
-def tzname_in_python2(namefunc):
-    """Change unicode output into bytestrings in Python 2
-
-    tzname() API changed in Python 3. It used to return bytes, but was changed
-    to unicode strings
-    """
-    if PY2:
-        @wraps(namefunc)
-        def adjust_encoding(*args, **kwargs):
-            name = namefunc(*args, **kwargs)
-            if name is not None:
-                name = name.encode()
-
-            return name
-
-        return adjust_encoding
-    else:
-        return namefunc
-
-
-# The following is adapted from Alexander Belopolsky's tz library
-# https://github.com/abalkin/tz
-if hasattr(datetime, 'fold'):
-    # This is the pre-python 3.6 fold situation
-    def enfold(dt, fold=1):
-        """
-        Provides a unified interface for assigning the ``fold`` attribute to
-        datetimes both before and after the implementation of PEP-495.
-
-        :param fold:
-            The value for the ``fold`` attribute in the returned datetime. This
-            should be either 0 or 1.
-
-        :return:
-            Returns an object for which ``getattr(dt, 'fold', 0)`` returns
-            ``fold`` for all versions of Python. In versions prior to
-            Python 3.6, this is a ``_DatetimeWithFold`` object, which is a
-            subclass of :py:class:`datetime.datetime` with the ``fold``
-            attribute added, if ``fold`` is 1.
-
-        .. versionadded:: 2.6.0
-        """
-        return dt.replace(fold=fold)
-
-else:
-    class _DatetimeWithFold(datetime):
-        """
-        This is a class designed to provide a PEP 495-compliant interface for
-        Python versions before 3.6. It is used only for dates in a fold, so
-        the ``fold`` attribute is fixed at ``1``.
-
-        .. versionadded:: 2.6.0
-        """
-        __slots__ = ()
-
-        def replace(self, *args, **kwargs):
-            """
-            Return a datetime with the same attributes, except for those
-            attributes given new values by whichever keyword arguments are
-            specified. Note that tzinfo=None can be specified to create a naive
-            datetime from an aware datetime with no conversion of date and time
-            data.
-
-            This is reimplemented in ``_DatetimeWithFold`` because pypy3 will
-            return a ``datetime.datetime`` even if ``fold`` is unchanged.
-            """
-            argnames = (
-                'year', 'month', 'day', 'hour', 'minute', 'second',
-                'microsecond', 'tzinfo'
-            )
-
-            for arg, argname in zip(args, argnames):
-                if argname in kwargs:
-                    raise TypeError('Duplicate argument: {}'.format(argname))
-
-                kwargs[argname] = arg
-
-            for argname in argnames:
-                if argname not in kwargs:
-                    kwargs[argname] = getattr(self, argname)
-
-            dt_class = self.__class__ if kwargs.get('fold', 1) else datetime
-
-            return dt_class(**kwargs)
-
-        @property
-        def fold(self):
-            return 1
-
-    def enfold(dt, fold=1):
-        """
-        Provides a unified interface for assigning the ``fold`` attribute to
-        datetimes both before and after the implementation of PEP-495.
-
-        :param fold:
-            The value for the ``fold`` attribute in the returned datetime. This
-            should be either 0 or 1.
-
-        :return:
-            Returns an object for which ``getattr(dt, 'fold', 0)`` returns
-            ``fold`` for all versions of Python. In versions prior to
-            Python 3.6, this is a ``_DatetimeWithFold`` object, which is a
-            subclass of :py:class:`datetime.datetime` with the ``fold``
-            attribute added, if ``fold`` is 1.
-
-        .. versionadded:: 2.6.0
-        """
-        if getattr(dt, 'fold', 0) == fold:
-            return dt
-
-        args = dt.timetuple()[:6]
-        args += (dt.microsecond, dt.tzinfo)
-
-        if fold:
-            return _DatetimeWithFold(*args)
-        else:
-            return datetime(*args)
-
-
-def _validate_fromutc_inputs(f):
-    """
-    The CPython version of ``fromutc`` checks that the input is a ``datetime``
-    object and that ``self`` is attached as its ``tzinfo``.
-    """
-    @wraps(f)
-    def fromutc(self, dt):
-        if not isinstance(dt, datetime):
-            raise TypeError("fromutc() requires a datetime argument")
-        if dt.tzinfo is not self:
-            raise ValueError("dt.tzinfo is not self")
-
-        return f(self, dt)
-
-    return fromutc
-
-
-class _tzinfo(tzinfo):
-    """
-    Base class for all ``dateutil`` ``tzinfo`` objects.
-    """
-
-    def is_ambiguous(self, dt):
-        """
-        Whether or not the "wall time" of a given datetime is ambiguous in this
-        zone.
-
-        :param dt:
-            A :py:class:`datetime.datetime`, naive or time zone aware.
-
-
-        :return:
-            Returns ``True`` if ambiguous, ``False`` otherwise.
-
-        .. versionadded:: 2.6.0
-        """
-
-        dt = dt.replace(tzinfo=self)
-
-        wall_0 = enfold(dt, fold=0)
-        wall_1 = enfold(dt, fold=1)
-
-        same_offset = wall_0.utcoffset() == wall_1.utcoffset()
-        same_dt = wall_0.replace(tzinfo=None) == wall_1.replace(tzinfo=None)
-
-        return same_dt and not same_offset
-
-    def _fold_status(self, dt_utc, dt_wall):
-        """
-        Determine the fold status of a "wall" datetime, given a representation
-        of the same datetime as a (naive) UTC datetime. This is calculated based
-        on the assumption that ``dt.utcoffset() - dt.dst()`` is constant for all
-        datetimes, and that this offset is the actual number of hours separating
-        ``dt_utc`` and ``dt_wall``.
-
-        :param dt_utc:
-            Representation of the datetime as UTC
-
-        :param dt_wall:
-            Representation of the datetime as "wall time". This parameter must
-            either have a `fold` attribute or have a fold-naive
-            :class:`datetime.tzinfo` attached, otherwise the calculation may
-            fail.
-        """
-        if self.is_ambiguous(dt_wall):
-            delta_wall = dt_wall - dt_utc
-            _fold = int(delta_wall == (dt_utc.utcoffset() - dt_utc.dst()))
-        else:
-            _fold = 0
-
-        return _fold
-
-    def _fold(self, dt):
-        return getattr(dt, 'fold', 0)
-
-    def _fromutc(self, dt):
-        """
-        Given a timezone-aware datetime in a given timezone, calculates a
-        timezone-aware datetime in a new timezone.
-
-        Since this is the one time that we *know* we have an unambiguous
-        datetime object, we take this opportunity to determine whether the
-        datetime is ambiguous and in a "fold" state (e.g. if it's the first
-        occurrence, chronologically, of the ambiguous datetime).
-
-        :param dt:
-            A timezone-aware :class:`datetime.datetime` object.
-        """
-
-        # Re-implement the algorithm from Python's datetime.py
-        dtoff = dt.utcoffset()
-        if dtoff is None:
-            raise ValueError("fromutc() requires a non-None utcoffset() "
-                             "result")
-
-        # The original datetime.py code assumes that `dst()` defaults to
-        # zero during ambiguous times. PEP 495 inverts this presumption, so
-        # for pre-PEP 495 versions of python, we need to tweak the algorithm.
-        dtdst = dt.dst()
-        if dtdst is None:
-            raise ValueError("fromutc() requires a non-None dst() result")
-        delta = dtoff - dtdst
-
-        dt += delta
-        # Set fold=1 so we can default to being in the fold for
-        # ambiguous dates.
-        dtdst = enfold(dt, fold=1).dst()
-        if dtdst is None:
-            raise ValueError("fromutc(): dt.dst gave inconsistent "
-                             "results; cannot convert")
-        return dt + dtdst
-
-    @_validate_fromutc_inputs
-    def fromutc(self, dt):
-        """
-        Given a timezone-aware datetime in a given timezone, calculates a
-        timezone-aware datetime in a new timezone.
-
-        Since this is the one time that we *know* we have an unambiguous
-        datetime object, we take this opportunity to determine whether the
-        datetime is ambiguous and in a "fold" state (e.g. if it's the first
-        occurrence, chronologically, of the ambiguous datetime).
-
-        :param dt:
-            A timezone-aware :class:`datetime.datetime` object.
-        """
-        dt_wall = self._fromutc(dt)
-
-        # Calculate the fold status given the two datetimes.
-        _fold = self._fold_status(dt, dt_wall)
-
-        # Set the default fold value for ambiguous dates
-        return enfold(dt_wall, fold=_fold)
-
-
-class tzrangebase(_tzinfo):
-    """
-    This is an abstract base class for time zones represented by an annual
-    transition into and out of DST. Child classes should implement the following
-    methods:
-
-        * ``__init__(self, *args, **kwargs)``
-        * ``transitions(self, year)`` - this is expected to return a tuple of
-          datetimes representing the DST on and off transitions in standard
-          time.
-
-    A fully initialized ``tzrangebase`` subclass should also provide the
-    following attributes:
-        * ``hasdst``: Boolean whether or not the zone uses DST.
-        * ``_dst_offset`` / ``_std_offset``: :class:`datetime.timedelta` objects
-          representing the respective UTC offsets.
-        * ``_dst_abbr`` / ``_std_abbr``: Strings representing the timezone short
-          abbreviations in DST and STD, respectively.
-        * ``_hasdst``: Whether or not the zone has DST.
-
-    .. versionadded:: 2.6.0
-    """
-    def __init__(self):
-        raise NotImplementedError('tzrangebase is an abstract base class')
-
-    def utcoffset(self, dt):
-        isdst = self._isdst(dt)
-
-        if isdst is None:
-            return None
-        elif isdst:
-            return self._dst_offset
-        else:
-            return self._std_offset
-
-    def dst(self, dt):
-        isdst = self._isdst(dt)
-
-        if isdst is None:
-            return None
-        elif isdst:
-            return self._dst_base_offset
-        else:
-            return ZERO
-
-    @tzname_in_python2
-    def tzname(self, dt):
-        if self._isdst(dt):
-            return self._dst_abbr
-        else:
-            return self._std_abbr
-
-    def fromutc(self, dt):
-        """ Given a datetime in UTC, return local time """
-        if not isinstance(dt, datetime):
-            raise TypeError("fromutc() requires a datetime argument")
-
-        if dt.tzinfo is not self:
-            raise ValueError("dt.tzinfo is not self")
-
-        # Get transitions - if there are none, fixed offset
-        transitions = self.transitions(dt.year)
-        if transitions is None:
-            return dt + self.utcoffset(dt)
-
-        # Get the transition times in UTC
-        dston, dstoff = transitions
-
-        dston -= self._std_offset
-        dstoff -= self._std_offset
-
-        utc_transitions = (dston, dstoff)
-        dt_utc = dt.replace(tzinfo=None)
-
-        isdst = self._naive_isdst(dt_utc, utc_transitions)
-
-        if isdst:
-            dt_wall = dt + self._dst_offset
-        else:
-            dt_wall = dt + self._std_offset
-
-        _fold = int(not isdst and self.is_ambiguous(dt_wall))
-
-        return enfold(dt_wall, fold=_fold)
-
-    def is_ambiguous(self, dt):
-        """
-        Whether or not the "wall time" of a given datetime is ambiguous in this
-        zone.
-
-        :param dt:
-            A :py:class:`datetime.datetime`, naive or time zone aware.
-
-
-        :return:
-            Returns ``True`` if ambiguous, ``False`` otherwise.
-
-        .. versionadded:: 2.6.0
-        """
-        if not self.hasdst:
-            return False
-
-        start, end = self.transitions(dt.year)
-
-        dt = dt.replace(tzinfo=None)
-        return (end <= dt < end + self._dst_base_offset)
-
-    def _isdst(self, dt):
-        if not self.hasdst:
-            return False
-        elif dt is None:
-            return None
-
-        transitions = self.transitions(dt.year)
-
-        if transitions is None:
-            return False
-
-        dt = dt.replace(tzinfo=None)
-
-        isdst = self._naive_isdst(dt, transitions)
-
-        # Handle ambiguous dates
-        if not isdst and self.is_ambiguous(dt):
-            return not self._fold(dt)
-        else:
-            return isdst
-
-    def _naive_isdst(self, dt, transitions):
-        dston, dstoff = transitions
-
-        dt = dt.replace(tzinfo=None)
-
-        if dston < dstoff:
-            isdst = dston <= dt < dstoff
-        else:
-            isdst = not dstoff <= dt < dston
-
-        return isdst
-
-    @property
-    def _dst_base_offset(self):
-        return self._dst_offset - self._std_offset
-
-    __hash__ = None
-
-    def __ne__(self, other):
-        return not (self == other)
-
-    def __repr__(self):
-        return "%s(...)" % self.__class__.__name__
-
-    __reduce__ = object.__reduce__
diff --git a/lib/dateutil/tz/_factories.py b/lib/dateutil/tz/_factories.py
deleted file mode 100644
index f8a65891..00000000
--- a/lib/dateutil/tz/_factories.py
+++ /dev/null
@@ -1,80 +0,0 @@
-from datetime import timedelta
-import weakref
-from collections import OrderedDict
-
-from six.moves import _thread
-
-
-class _TzSingleton(type):
-    def __init__(cls, *args, **kwargs):
-        cls.__instance = None
-        super(_TzSingleton, cls).__init__(*args, **kwargs)
-
-    def __call__(cls):
-        if cls.__instance is None:
-            cls.__instance = super(_TzSingleton, cls).__call__()
-        return cls.__instance
-
-
-class _TzFactory(type):
-    def instance(cls, *args, **kwargs):
-        """Alternate constructor that returns a fresh instance"""
-        return type.__call__(cls, *args, **kwargs)
-
-
-class _TzOffsetFactory(_TzFactory):
-    def __init__(cls, *args, **kwargs):
-        cls.__instances = weakref.WeakValueDictionary()
-        cls.__strong_cache = OrderedDict()
-        cls.__strong_cache_size = 8
-
-        cls._cache_lock = _thread.allocate_lock()
-
-    def __call__(cls, name, offset):
-        if isinstance(offset, timedelta):
-            key = (name, offset.total_seconds())
-        else:
-            key = (name, offset)
-
-        instance = cls.__instances.get(key, None)
-        if instance is None:
-            instance = cls.__instances.setdefault(key,
-                                                  cls.instance(name, offset))
-
-        # This lock may not be necessary in Python 3. See GH issue #901
-        with cls._cache_lock:
-            cls.__strong_cache[key] = cls.__strong_cache.pop(key, instance)
-
-            # Remove an item if the strong cache is overpopulated
-            if len(cls.__strong_cache) > cls.__strong_cache_size:
-                cls.__strong_cache.popitem(last=False)
-
-        return instance
-
-
-class _TzStrFactory(_TzFactory):
-    def __init__(cls, *args, **kwargs):
-        cls.__instances = weakref.WeakValueDictionary()
-        cls.__strong_cache = OrderedDict()
-        cls.__strong_cache_size = 8
-
-        cls.__cache_lock = _thread.allocate_lock()
-
-    def __call__(cls, s, posix_offset=False):
-        key = (s, posix_offset)
-        instance = cls.__instances.get(key, None)
-
-        if instance is None:
-            instance = cls.__instances.setdefault(key,
-                cls.instance(s, posix_offset))
-
-        # This lock may not be necessary in Python 3. See GH issue #901
-        with cls.__cache_lock:
-            cls.__strong_cache[key] = cls.__strong_cache.pop(key, instance)
-
-            # Remove an item if the strong cache is overpopulated
-            if len(cls.__strong_cache) > cls.__strong_cache_size:
-                cls.__strong_cache.popitem(last=False)
-
-        return instance
-
diff --git a/lib/dateutil/tz/tz.py b/lib/dateutil/tz/tz.py
deleted file mode 100644
index 61759144..00000000
--- a/lib/dateutil/tz/tz.py
+++ /dev/null
@@ -1,1849 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-This module offers timezone implementations subclassing the abstract
-:py:class:`datetime.tzinfo` type. There are classes to handle tzfile format
-files (usually are in :file:`/etc/localtime`, :file:`/usr/share/zoneinfo`,
-etc), TZ environment string (in all known formats), given ranges (with help
-from relative deltas), local machine timezone, fixed offset timezone, and UTC
-timezone.
-"""
-import datetime
-import struct
-import time
-import sys
-import os
-import bisect
-import weakref
-from collections import OrderedDict
-
-import six
-from six import string_types
-from six.moves import _thread
-from ._common import tzname_in_python2, _tzinfo
-from ._common import tzrangebase, enfold
-from ._common import _validate_fromutc_inputs
-
-from ._factories import _TzSingleton, _TzOffsetFactory
-from ._factories import _TzStrFactory
-try:
-    from .win import tzwin, tzwinlocal
-except ImportError:
-    tzwin = tzwinlocal = None
-
-# For warning about rounding tzinfo
-from warnings import warn
-
-ZERO = datetime.timedelta(0)
-EPOCH = datetime.datetime(1970, 1, 1, 0, 0)
-EPOCHORDINAL = EPOCH.toordinal()
-
-
-@six.add_metaclass(_TzSingleton)
-class tzutc(datetime.tzinfo):
-    """
-    This is a tzinfo object that represents the UTC time zone.
-
-    **Examples:**
-
-    .. doctest::
-
-        >>> from datetime import *
-        >>> from dateutil.tz import *
-
-        >>> datetime.now()
-        datetime.datetime(2003, 9, 27, 9, 40, 1, 521290)
-
-        >>> datetime.now(tzutc())
-        datetime.datetime(2003, 9, 27, 12, 40, 12, 156379, tzinfo=tzutc())
-
-        >>> datetime.now(tzutc()).tzname()
-        'UTC'
-
-    .. versionchanged:: 2.7.0
-        ``tzutc()`` is now a singleton, so the result of ``tzutc()`` will
-        always return the same object.
-
-        .. doctest::
-
-            >>> from dateutil.tz import tzutc, UTC
-            >>> tzutc() is tzutc()
-            True
-            >>> tzutc() is UTC
-            True
-    """
-    def utcoffset(self, dt):
-        return ZERO
-
-    def dst(self, dt):
-        return ZERO
-
-    @tzname_in_python2
-    def tzname(self, dt):
-        return "UTC"
-
-    def is_ambiguous(self, dt):
-        """
-        Whether or not the "wall time" of a given datetime is ambiguous in this
-        zone.
-
-        :param dt:
-            A :py:class:`datetime.datetime`, naive or time zone aware.
-
-
-        :return:
-            Returns ``True`` if ambiguous, ``False`` otherwise.
-
-        .. versionadded:: 2.6.0
-        """
-        return False
-
-    @_validate_fromutc_inputs
-    def fromutc(self, dt):
-        """
-        Fast track version of fromutc() returns the original ``dt`` object for
-        any valid :py:class:`datetime.datetime` object.
-        """
-        return dt
-
-    def __eq__(self, other):
-        if not isinstance(other, (tzutc, tzoffset)):
-            return NotImplemented
-
-        return (isinstance(other, tzutc) or
-                (isinstance(other, tzoffset) and other._offset == ZERO))
-
-    __hash__ = None
-
-    def __ne__(self, other):
-        return not (self == other)
-
-    def __repr__(self):
-        return "%s()" % self.__class__.__name__
-
-    __reduce__ = object.__reduce__
-
-
-#: Convenience constant providing a :class:`tzutc()` instance
-#:
-#: .. versionadded:: 2.7.0
-UTC = tzutc()
-
-
-@six.add_metaclass(_TzOffsetFactory)
-class tzoffset(datetime.tzinfo):
-    """
-    A simple class for representing a fixed offset from UTC.
-
-    :param name:
-        The timezone name, to be returned when ``tzname()`` is called.
-    :param offset:
-        The time zone offset in seconds, or (since version 2.6.0, represented
-        as a :py:class:`datetime.timedelta` object).
-    """
-    def __init__(self, name, offset):
-        self._name = name
-
-        try:
-            # Allow a timedelta
-            offset = offset.total_seconds()
-        except (TypeError, AttributeError):
-            pass
-
-        self._offset = datetime.timedelta(seconds=_get_supported_offset(offset))
-
-    def utcoffset(self, dt):
-        return self._offset
-
-    def dst(self, dt):
-        return ZERO
-
-    @tzname_in_python2
-    def tzname(self, dt):
-        return self._name
-
-    @_validate_fromutc_inputs
-    def fromutc(self, dt):
-        return dt + self._offset
-
-    def is_ambiguous(self, dt):
-        """
-        Whether or not the "wall time" of a given datetime is ambiguous in this
-        zone.
-
-        :param dt:
-            A :py:class:`datetime.datetime`, naive or time zone aware.
-        :return:
-            Returns ``True`` if ambiguous, ``False`` otherwise.
-
-        .. versionadded:: 2.6.0
-        """
-        return False
-
-    def __eq__(self, other):
-        if not isinstance(other, tzoffset):
-            return NotImplemented
-
-        return self._offset == other._offset
-
-    __hash__ = None
-
-    def __ne__(self, other):
-        return not (self == other)
-
-    def __repr__(self):
-        return "%s(%s, %s)" % (self.__class__.__name__,
-                               repr(self._name),
-                               int(self._offset.total_seconds()))
-
-    __reduce__ = object.__reduce__
-
-
-class tzlocal(_tzinfo):
-    """
-    A :class:`tzinfo` subclass built around the ``time`` timezone functions.
-    """
-    def __init__(self):
-        super(tzlocal, self).__init__()
-
-        self._std_offset = datetime.timedelta(seconds=-time.timezone)
-        if time.daylight:
-            self._dst_offset = datetime.timedelta(seconds=-time.altzone)
-        else:
-            self._dst_offset = self._std_offset
-
-        self._dst_saved = self._dst_offset - self._std_offset
-        self._hasdst = bool(self._dst_saved)
-        self._tznames = tuple(time.tzname)
-
-    def utcoffset(self, dt):
-        if dt is None and self._hasdst:
-            return None
-
-        if self._isdst(dt):
-            return self._dst_offset
-        else:
-            return self._std_offset
-
-    def dst(self, dt):
-        if dt is None and self._hasdst:
-            return None
-
-        if self._isdst(dt):
-            return self._dst_offset - self._std_offset
-        else:
-            return ZERO
-
-    @tzname_in_python2
-    def tzname(self, dt):
-        return self._tznames[self._isdst(dt)]
-
-    def is_ambiguous(self, dt):
-        """
-        Whether or not the "wall time" of a given datetime is ambiguous in this
-        zone.
-
-        :param dt:
-            A :py:class:`datetime.datetime`, naive or time zone aware.
-
-
-        :return:
-            Returns ``True`` if ambiguous, ``False`` otherwise.
-
-        .. versionadded:: 2.6.0
-        """
-        naive_dst = self._naive_is_dst(dt)
-        return (not naive_dst and
-                (naive_dst != self._naive_is_dst(dt - self._dst_saved)))
-
-    def _naive_is_dst(self, dt):
-        timestamp = _datetime_to_timestamp(dt)
-        return time.localtime(timestamp + time.timezone).tm_isdst
-
-    def _isdst(self, dt, fold_naive=True):
-        # We can't use mktime here. It is unstable when deciding if
-        # the hour near to a change is DST or not.
-        #
-        # timestamp = time.mktime((dt.year, dt.month, dt.day, dt.hour,
-        #                         dt.minute, dt.second, dt.weekday(), 0, -1))
-        # return time.localtime(timestamp).tm_isdst
-        #
-        # The code above yields the following result:
-        #
-        # >>> import tz, datetime
-        # >>> t = tz.tzlocal()
-        # >>> datetime.datetime(2003,2,15,23,tzinfo=t).tzname()
-        # 'BRDT'
-        # >>> datetime.datetime(2003,2,16,0,tzinfo=t).tzname()
-        # 'BRST'
-        # >>> datetime.datetime(2003,2,15,23,tzinfo=t).tzname()
-        # 'BRST'
-        # >>> datetime.datetime(2003,2,15,22,tzinfo=t).tzname()
-        # 'BRDT'
-        # >>> datetime.datetime(2003,2,15,23,tzinfo=t).tzname()
-        # 'BRDT'
-        #
-        # Here is a more stable implementation:
-        #
-        if not self._hasdst:
-            return False
-
-        # Check for ambiguous times:
-        dstval = self._naive_is_dst(dt)
-        fold = getattr(dt, 'fold', None)
-
-        if self.is_ambiguous(dt):
-            if fold is not None:
-                return not self._fold(dt)
-            else:
-                return True
-
-        return dstval
-
-    def __eq__(self, other):
-        if isinstance(other, tzlocal):
-            return (self._std_offset == other._std_offset and
-                    self._dst_offset == other._dst_offset)
-        elif isinstance(other, tzutc):
-            return (not self._hasdst and
-                    self._tznames[0] in {'UTC', 'GMT'} and
-                    self._std_offset == ZERO)
-        elif isinstance(other, tzoffset):
-            return (not self._hasdst and
-                    self._tznames[0] == other._name and
-                    self._std_offset == other._offset)
-        else:
-            return NotImplemented
-
-    __hash__ = None
-
-    def __ne__(self, other):
-        return not (self == other)
-
-    def __repr__(self):
-        return "%s()" % self.__class__.__name__
-
-    __reduce__ = object.__reduce__
-
-
-class _ttinfo(object):
-    __slots__ = ["offset", "delta", "isdst", "abbr",
-                 "isstd", "isgmt", "dstoffset"]
-
-    def __init__(self):
-        for attr in self.__slots__:
-            setattr(self, attr, None)
-
-    def __repr__(self):
-        l = []
-        for attr in self.__slots__:
-            value = getattr(self, attr)
-            if value is not None:
-                l.append("%s=%s" % (attr, repr(value)))
-        return "%s(%s)" % (self.__class__.__name__, ", ".join(l))
-
-    def __eq__(self, other):
-        if not isinstance(other, _ttinfo):
-            return NotImplemented
-
-        return (self.offset == other.offset and
-                self.delta == other.delta and
-                self.isdst == other.isdst and
-                self.abbr == other.abbr and
-                self.isstd == other.isstd and
-                self.isgmt == other.isgmt and
-                self.dstoffset == other.dstoffset)
-
-    __hash__ = None
-
-    def __ne__(self, other):
-        return not (self == other)
-
-    def __getstate__(self):
-        state = {}
-        for name in self.__slots__:
-            state[name] = getattr(self, name, None)
-        return state
-
-    def __setstate__(self, state):
-        for name in self.__slots__:
-            if name in state:
-                setattr(self, name, state[name])
-
-
-class _tzfile(object):
-    """
-    Lightweight class for holding the relevant transition and time zone
-    information read from binary tzfiles.
-    """
-    attrs = ['trans_list', 'trans_list_utc', 'trans_idx', 'ttinfo_list',
-             'ttinfo_std', 'ttinfo_dst', 'ttinfo_before', 'ttinfo_first']
-
-    def __init__(self, **kwargs):
-        for attr in self.attrs:
-            setattr(self, attr, kwargs.get(attr, None))
-
-
-class tzfile(_tzinfo):
-    """
-    This is a ``tzinfo`` subclass that allows one to use the ``tzfile(5)``
-    format timezone files to extract current and historical zone information.
-
-    :param fileobj:
-        This can be an opened file stream or a file name that the time zone
-        information can be read from.
-
-    :param filename:
-        This is an optional parameter specifying the source of the time zone
-        information in the event that ``fileobj`` is a file object. If omitted
-        and ``fileobj`` is a file stream, this parameter will be set either to
-        ``fileobj``'s ``name`` attribute or to ``repr(fileobj)``.
-
-    See `Sources for Time Zone and Daylight Saving Time Data
-    <https://data.iana.org/time-zones/tz-link.html>`_ for more information.
-    Time zone files can be compiled from the `IANA Time Zone database files
-    <https://www.iana.org/time-zones>`_ with the `zic time zone compiler
-    <https://www.freebsd.org/cgi/man.cgi?query=zic&sektion=8>`_
-
-    .. note::
-
-        Only construct a ``tzfile`` directly if you have a specific timezone
-        file on disk that you want to read into a Python ``tzinfo`` object.
-        If you want to get a ``tzfile`` representing a specific IANA zone,
-        (e.g. ``'America/New_York'``), you should call
-        :func:`dateutil.tz.gettz` with the zone identifier.
-
-
-    **Examples:**
-
-    Using the US Eastern time zone as an example, we can see that a ``tzfile``
-    provides time zone information for the standard Daylight Saving offsets:
-
-    .. testsetup:: tzfile
-
-        from dateutil.tz import gettz
-        from datetime import datetime
-
-    .. doctest:: tzfile
-
-        >>> NYC = gettz('America/New_York')
-        >>> NYC
-        tzfile('/usr/share/zoneinfo/America/New_York')
-
-        >>> print(datetime(2016, 1, 3, tzinfo=NYC))     # EST
-        2016-01-03 00:00:00-05:00
-
-        >>> print(datetime(2016, 7, 7, tzinfo=NYC))     # EDT
-        2016-07-07 00:00:00-04:00
-
-
-    The ``tzfile`` structure contains a fully history of the time zone,
-    so historical dates will also have the right offsets. For example, before
-    the adoption of the UTC standards, New York used local solar  mean time:
-
-    .. doctest:: tzfile
-
-       >>> print(datetime(1901, 4, 12, tzinfo=NYC))    # LMT
-       1901-04-12 00:00:00-04:56
-
-    And during World War II, New York was on "Eastern War Time", which was a
-    state of permanent daylight saving time:
-
-    .. doctest:: tzfile
-
-        >>> print(datetime(1944, 2, 7, tzinfo=NYC))    # EWT
-        1944-02-07 00:00:00-04:00
-
-    """
-
-    def __init__(self, fileobj, filename=None):
-        super(tzfile, self).__init__()
-
-        file_opened_here = False
-        if isinstance(fileobj, string_types):
-            self._filename = fileobj
-            fileobj = open(fileobj, 'rb')
-            file_opened_here = True
-        elif filename is not None:
-            self._filename = filename
-        elif hasattr(fileobj, "name"):
-            self._filename = fileobj.name
-        else:
-            self._filename = repr(fileobj)
-
-        if fileobj is not None:
-            if not file_opened_here:
-                fileobj = _nullcontext(fileobj)
-
-            with fileobj as file_stream:
-                tzobj = self._read_tzfile(file_stream)
-
-            self._set_tzdata(tzobj)
-
-    def _set_tzdata(self, tzobj):
-        """ Set the time zone data of this object from a _tzfile object """
-        # Copy the relevant attributes over as private attributes
-        for attr in _tzfile.attrs:
-            setattr(self, '_' + attr, getattr(tzobj, attr))
-
-    def _read_tzfile(self, fileobj):
-        out = _tzfile()
-
-        # From tzfile(5):
-        #
-        # The time zone information files used by tzset(3)
-        # begin with the magic characters "TZif" to identify
-        # them as time zone information files, followed by
-        # sixteen bytes reserved for future use, followed by
-        # six four-byte values of type long, written in a
-        # ``standard'' byte order (the high-order  byte
-        # of the value is written first).
-        if fileobj.read(4).decode() != "TZif":
-            raise ValueError("magic not found")
-
-        fileobj.read(16)
-
-        (
-            # The number of UTC/local indicators stored in the file.
-            ttisgmtcnt,
-
-            # The number of standard/wall indicators stored in the file.
-            ttisstdcnt,
-
-            # The number of leap seconds for which data is
-            # stored in the file.
-            leapcnt,
-
-            # The number of "transition times" for which data
-            # is stored in the file.
-            timecnt,
-
-            # The number of "local time types" for which data
-            # is stored in the file (must not be zero).
-            typecnt,
-
-            # The  number  of  characters  of "time zone
-            # abbreviation strings" stored in the file.
-            charcnt,
-
-        ) = struct.unpack(">6l", fileobj.read(24))
-
-        # The above header is followed by tzh_timecnt four-byte
-        # values  of  type long,  sorted  in ascending order.
-        # These values are written in ``standard'' byte order.
-        # Each is used as a transition time (as  returned  by
-        # time(2)) at which the rules for computing local time
-        # change.
-
-        if timecnt:
-            out.trans_list_utc = list(struct.unpack(">%dl" % timecnt,
-                                                    fileobj.read(timecnt*4)))
-        else:
-            out.trans_list_utc = []
-
-        # Next come tzh_timecnt one-byte values of type unsigned
-        # char; each one tells which of the different types of
-        # ``local time'' types described in the file is associated
-        # with the same-indexed transition time. These values
-        # serve as indices into an array of ttinfo structures that
-        # appears next in the file.
-
-        if timecnt:
-            out.trans_idx = struct.unpack(">%dB" % timecnt,
-                                          fileobj.read(timecnt))
-        else:
-            out.trans_idx = []
-
-        # Each ttinfo structure is written as a four-byte value
-        # for tt_gmtoff  of  type long,  in  a  standard  byte
-        # order, followed  by a one-byte value for tt_isdst
-        # and a one-byte  value  for  tt_abbrind.   In  each
-        # structure, tt_gmtoff  gives  the  number  of
-        # seconds to be added to UTC, tt_isdst tells whether
-        # tm_isdst should be set by  localtime(3),  and
-        # tt_abbrind serves  as an index into the array of
-        # time zone abbreviation characters that follow the
-        # ttinfo structure(s) in the file.
-
-        ttinfo = []
-
-        for i in range(typecnt):
-            ttinfo.append(struct.unpack(">lbb", fileobj.read(6)))
-
-        abbr = fileobj.read(charcnt).decode()
-
-        # Then there are tzh_leapcnt pairs of four-byte
-        # values, written in  standard byte  order;  the
-        # first  value  of  each pair gives the time (as
-        # returned by time(2)) at which a leap second
-        # occurs;  the  second  gives the  total  number of
-        # leap seconds to be applied after the given time.
-        # The pairs of values are sorted in ascending order
-        # by time.
-
-        # Not used, for now (but seek for correct file position)
-        if leapcnt:
-            fileobj.seek(leapcnt * 8, os.SEEK_CUR)
-
-        # Then there are tzh_ttisstdcnt standard/wall
-        # indicators, each stored as a one-byte value;
-        # they tell whether the transition times associated
-        # with local time types were specified as standard
-        # time or wall clock time, and are used when
-        # a time zone file is used in handling POSIX-style
-        # time zone environment variables.
-
-        if ttisstdcnt:
-            isstd = struct.unpack(">%db" % ttisstdcnt,
-                                  fileobj.read(ttisstdcnt))
-
-        # Finally, there are tzh_ttisgmtcnt UTC/local
-        # indicators, each stored as a one-byte value;
-        # they tell whether the transition times associated
-        # with local time types were specified as UTC or
-        # local time, and are used when a time zone file
-        # is used in handling POSIX-style time zone envi-
-        # ronment variables.
-
-        if ttisgmtcnt:
-            isgmt = struct.unpack(">%db" % ttisgmtcnt,
-                                  fileobj.read(ttisgmtcnt))
-
-        # Build ttinfo list
-        out.ttinfo_list = []
-        for i in range(typecnt):
-            gmtoff, isdst, abbrind = ttinfo[i]
-            gmtoff = _get_supported_offset(gmtoff)
-            tti = _ttinfo()
-            tti.offset = gmtoff
-            tti.dstoffset = datetime.timedelta(0)
-            tti.delta = datetime.timedelta(seconds=gmtoff)
-            tti.isdst = isdst
-            tti.abbr = abbr[abbrind:abbr.find('\x00', abbrind)]
-            tti.isstd = (ttisstdcnt > i and isstd[i] != 0)
-            tti.isgmt = (ttisgmtcnt > i and isgmt[i] != 0)
-            out.ttinfo_list.append(tti)
-
-        # Replace ttinfo indexes for ttinfo objects.
-        out.trans_idx = [out.ttinfo_list[idx] for idx in out.trans_idx]
-
-        # Set standard, dst, and before ttinfos. before will be
-        # used when a given time is before any transitions,
-        # and will be set to the first non-dst ttinfo, or to
-        # the first dst, if all of them are dst.
-        out.ttinfo_std = None
-        out.ttinfo_dst = None
-        out.ttinfo_before = None
-        if out.ttinfo_list:
-            if not out.trans_list_utc:
-                out.ttinfo_std = out.ttinfo_first = out.ttinfo_list[0]
-            else:
-                for i in range(timecnt-1, -1, -1):
-                    tti = out.trans_idx[i]
-                    if not out.ttinfo_std and not tti.isdst:
-                        out.ttinfo_std = tti
-                    elif not out.ttinfo_dst and tti.isdst:
-                        out.ttinfo_dst = tti
-
-                    if out.ttinfo_std and out.ttinfo_dst:
-                        break
-                else:
-                    if out.ttinfo_dst and not out.ttinfo_std:
-                        out.ttinfo_std = out.ttinfo_dst
-
-                for tti in out.ttinfo_list:
-                    if not tti.isdst:
-                        out.ttinfo_before = tti
-                        break
-                else:
-                    out.ttinfo_before = out.ttinfo_list[0]
-
-        # Now fix transition times to become relative to wall time.
-        #
-        # I'm not sure about this. In my tests, the tz source file
-        # is setup to wall time, and in the binary file isstd and
-        # isgmt are off, so it should be in wall time. OTOH, it's
-        # always in gmt time. Let me know if you have comments
-        # about this.
-        lastdst = None
-        lastoffset = None
-        lastdstoffset = None
-        lastbaseoffset = None
-        out.trans_list = []
-
-        for i, tti in enumerate(out.trans_idx):
-            offset = tti.offset
-            dstoffset = 0
-
-            if lastdst is not None:
-                if tti.isdst:
-                    if not lastdst:
-                        dstoffset = offset - lastoffset
-
-                    if not dstoffset and lastdstoffset:
-                        dstoffset = lastdstoffset
-
-                    tti.dstoffset = datetime.timedelta(seconds=dstoffset)
-                    lastdstoffset = dstoffset
-
-            # If a time zone changes its base offset during a DST transition,
-            # then you need to adjust by the previous base offset to get the
-            # transition time in local time. Otherwise you use the current
-            # base offset. Ideally, I would have some mathematical proof of
-            # why this is true, but I haven't really thought about it enough.
-            baseoffset = offset - dstoffset
-            adjustment = baseoffset
-            if (lastbaseoffset is not None and baseoffset != lastbaseoffset
-                    and tti.isdst != lastdst):
-                # The base DST has changed
-                adjustment = lastbaseoffset
-
-            lastdst = tti.isdst
-            lastoffset = offset
-            lastbaseoffset = baseoffset
-
-            out.trans_list.append(out.trans_list_utc[i] + adjustment)
-
-        out.trans_idx = tuple(out.trans_idx)
-        out.trans_list = tuple(out.trans_list)
-        out.trans_list_utc = tuple(out.trans_list_utc)
-
-        return out
-
-    def _find_last_transition(self, dt, in_utc=False):
-        # If there's no list, there are no transitions to find
-        if not self._trans_list:
-            return None
-
-        timestamp = _datetime_to_timestamp(dt)
-
-        # Find where the timestamp fits in the transition list - if the
-        # timestamp is a transition time, it's part of the "after" period.
-        trans_list = self._trans_list_utc if in_utc else self._trans_list
-        idx = bisect.bisect_right(trans_list, timestamp)
-
-        # We want to know when the previous transition was, so subtract off 1
-        return idx - 1
-
-    def _get_ttinfo(self, idx):
-        # For no list or after the last transition, default to _ttinfo_std
-        if idx is None or (idx + 1) >= len(self._trans_list):
-            return self._ttinfo_std
-
-        # If there is a list and the time is before it, return _ttinfo_before
-        if idx < 0:
-            return self._ttinfo_before
-
-        return self._trans_idx[idx]
-
-    def _find_ttinfo(self, dt):
-        idx = self._resolve_ambiguous_time(dt)
-
-        return self._get_ttinfo(idx)
-
-    def fromutc(self, dt):
-        """
-        The ``tzfile`` implementation of :py:func:`datetime.tzinfo.fromutc`.
-
-        :param dt:
-            A :py:class:`datetime.datetime` object.
-
-        :raises TypeError:
-            Raised if ``dt`` is not a :py:class:`datetime.datetime` object.
-
-        :raises ValueError:
-            Raised if this is called with a ``dt`` which does not have this
-            ``tzinfo`` attached.
-
-        :return:
-            Returns a :py:class:`datetime.datetime` object representing the
-            wall time in ``self``'s time zone.
-        """
-        # These isinstance checks are in datetime.tzinfo, so we'll preserve
-        # them, even if we don't care about duck typing.
-        if not isinstance(dt, datetime.datetime):
-            raise TypeError("fromutc() requires a datetime argument")
-
-        if dt.tzinfo is not self:
-            raise ValueError("dt.tzinfo is not self")
-
-        # First treat UTC as wall time and get the transition we're in.
-        idx = self._find_last_transition(dt, in_utc=True)
-        tti = self._get_ttinfo(idx)
-
-        dt_out = dt + datetime.timedelta(seconds=tti.offset)
-
-        fold = self.is_ambiguous(dt_out, idx=idx)
-
-        return enfold(dt_out, fold=int(fold))
-
-    def is_ambiguous(self, dt, idx=None):
-        """
-        Whether or not the "wall time" of a given datetime is ambiguous in this
-        zone.
-
-        :param dt:
-            A :py:class:`datetime.datetime`, naive or time zone aware.
-
-
-        :return:
-            Returns ``True`` if ambiguous, ``False`` otherwise.
-
-        .. versionadded:: 2.6.0
-        """
-        if idx is None:
-            idx = self._find_last_transition(dt)
-
-        # Calculate the difference in offsets from current to previous
-        timestamp = _datetime_to_timestamp(dt)
-        tti = self._get_ttinfo(idx)
-
-        if idx is None or idx <= 0:
-            return False
-
-        od = self._get_ttinfo(idx - 1).offset - tti.offset
-        tt = self._trans_list[idx]          # Transition time
-
-        return timestamp < tt + od
-
-    def _resolve_ambiguous_time(self, dt):
-        idx = self._find_last_transition(dt)
-
-        # If we have no transitions, return the index
-        _fold = self._fold(dt)
-        if idx is None or idx == 0:
-            return idx
-
-        # If it's ambiguous and we're in a fold, shift to a different index.
-        idx_offset = int(not _fold and self.is_ambiguous(dt, idx))
-
-        return idx - idx_offset
-
-    def utcoffset(self, dt):
-        if dt is None:
-            return None
-
-        if not self._ttinfo_std:
-            return ZERO
-
-        return self._find_ttinfo(dt).delta
-
-    def dst(self, dt):
-        if dt is None:
-            return None
-
-        if not self._ttinfo_dst:
-            return ZERO
-
-        tti = self._find_ttinfo(dt)
-
-        if not tti.isdst:
-            return ZERO
-
-        # The documentation says that utcoffset()-dst() must
-        # be constant for every dt.
-        return tti.dstoffset
-
-    @tzname_in_python2
-    def tzname(self, dt):
-        if not self._ttinfo_std or dt is None:
-            return None
-        return self._find_ttinfo(dt).abbr
-
-    def __eq__(self, other):
-        if not isinstance(other, tzfile):
-            return NotImplemented
-        return (self._trans_list == other._trans_list and
-                self._trans_idx == other._trans_idx and
-                self._ttinfo_list == other._ttinfo_list)
-
-    __hash__ = None
-
-    def __ne__(self, other):
-        return not (self == other)
-
-    def __repr__(self):
-        return "%s(%s)" % (self.__class__.__name__, repr(self._filename))
-
-    def __reduce__(self):
-        return self.__reduce_ex__(None)
-
-    def __reduce_ex__(self, protocol):
-        return (self.__class__, (None, self._filename), self.__dict__)
-
-
-class tzrange(tzrangebase):
-    """
-    The ``tzrange`` object is a time zone specified by a set of offsets and
-    abbreviations, equivalent to the way the ``TZ`` variable can be specified
-    in POSIX-like systems, but using Python delta objects to specify DST
-    start, end and offsets.
-
-    :param stdabbr:
-        The abbreviation for standard time (e.g. ``'EST'``).
-
-    :param stdoffset:
-        An integer or :class:`datetime.timedelta` object or equivalent
-        specifying the base offset from UTC.
-
-        If unspecified, +00:00 is used.
-
-    :param dstabbr:
-        The abbreviation for DST / "Summer" time (e.g. ``'EDT'``).
-
-        If specified, with no other DST information, DST is assumed to occur
-        and the default behavior or ``dstoffset``, ``start`` and ``end`` is
-        used. If unspecified and no other DST information is specified, it
-        is assumed that this zone has no DST.
-
-        If this is unspecified and other DST information is *is* specified,
-        DST occurs in the zone but the time zone abbreviation is left
-        unchanged.
-
-    :param dstoffset:
-        A an integer or :class:`datetime.timedelta` object or equivalent
-        specifying the UTC offset during DST. If unspecified and any other DST
-        information is specified, it is assumed to be the STD offset +1 hour.
-
-    :param start:
-        A :class:`relativedelta.relativedelta` object or equivalent specifying
-        the time and time of year that daylight savings time starts. To
-        specify, for example, that DST starts at 2AM on the 2nd Sunday in
-        March, pass:
-
-            ``relativedelta(hours=2, month=3, day=1, weekday=SU(+2))``
-
-        If unspecified and any other DST information is specified, the default
-        value is 2 AM on the first Sunday in April.
-
-    :param end:
-        A :class:`relativedelta.relativedelta` object or equivalent
-        representing the time and time of year that daylight savings time
-        ends, with the same specification method as in ``start``. One note is
-        that this should point to the first time in the *standard* zone, so if
-        a transition occurs at 2AM in the DST zone and the clocks are set back
-        1 hour to 1AM, set the ``hours`` parameter to +1.
-
-
-    **Examples:**
-
-    .. testsetup:: tzrange
-
-        from dateutil.tz import tzrange, tzstr
-
-    .. doctest:: tzrange
-
-        >>> tzstr('EST5EDT') == tzrange("EST", -18000, "EDT")
-        True
-
-        >>> from dateutil.relativedelta import *
-        >>> range1 = tzrange("EST", -18000, "EDT")
-        >>> range2 = tzrange("EST", -18000, "EDT", -14400,
-        ...                  relativedelta(hours=+2, month=4, day=1,
-        ...                                weekday=SU(+1)),
-        ...                  relativedelta(hours=+1, month=10, day=31,
-        ...                                weekday=SU(-1)))
-        >>> tzstr('EST5EDT') == range1 == range2
-        True
-
-    """
-    def __init__(self, stdabbr, stdoffset=None,
-                 dstabbr=None, dstoffset=None,
-                 start=None, end=None):
-
-        global relativedelta
-        from dateutil import relativedelta
-
-        self._std_abbr = stdabbr
-        self._dst_abbr = dstabbr
-
-        try:
-            stdoffset = stdoffset.total_seconds()
-        except (TypeError, AttributeError):
-            pass
-
-        try:
-            dstoffset = dstoffset.total_seconds()
-        except (TypeError, AttributeError):
-            pass
-
-        if stdoffset is not None:
-            self._std_offset = datetime.timedelta(seconds=stdoffset)
-        else:
-            self._std_offset = ZERO
-
-        if dstoffset is not None:
-            self._dst_offset = datetime.timedelta(seconds=dstoffset)
-        elif dstabbr and stdoffset is not None:
-            self._dst_offset = self._std_offset + datetime.timedelta(hours=+1)
-        else:
-            self._dst_offset = ZERO
-
-        if dstabbr and start is None:
-            self._start_delta = relativedelta.relativedelta(
-                hours=+2, month=4, day=1, weekday=relativedelta.SU(+1))
-        else:
-            self._start_delta = start
-
-        if dstabbr and end is None:
-            self._end_delta = relativedelta.relativedelta(
-                hours=+1, month=10, day=31, weekday=relativedelta.SU(-1))
-        else:
-            self._end_delta = end
-
-        self._dst_base_offset_ = self._dst_offset - self._std_offset
-        self.hasdst = bool(self._start_delta)
-
-    def transitions(self, year):
-        """
-        For a given year, get the DST on and off transition times, expressed
-        always on the standard time side. For zones with no transitions, this
-        function returns ``None``.
-
-        :param year:
-            The year whose transitions you would like to query.
-
-        :return:
-            Returns a :class:`tuple` of :class:`datetime.datetime` objects,
-            ``(dston, dstoff)`` for zones with an annual DST transition, or
-            ``None`` for fixed offset zones.
-        """
-        if not self.hasdst:
-            return None
-
-        base_year = datetime.datetime(year, 1, 1)
-
-        start = base_year + self._start_delta
-        end = base_year + self._end_delta
-
-        return (start, end)
-
-    def __eq__(self, other):
-        if not isinstance(other, tzrange):
-            return NotImplemented
-
-        return (self._std_abbr == other._std_abbr and
-                self._dst_abbr == other._dst_abbr and
-                self._std_offset == other._std_offset and
-                self._dst_offset == other._dst_offset and
-                self._start_delta == other._start_delta and
-                self._end_delta == other._end_delta)
-
-    @property
-    def _dst_base_offset(self):
-        return self._dst_base_offset_
-
-
-@six.add_metaclass(_TzStrFactory)
-class tzstr(tzrange):
-    """
-    ``tzstr`` objects are time zone objects specified by a time-zone string as
-    it would be passed to a ``TZ`` variable on POSIX-style systems (see
-    the `GNU C Library: TZ Variable`_ for more details).
-
-    There is one notable exception, which is that POSIX-style time zones use an
-    inverted offset format, so normally ``GMT+3`` would be parsed as an offset
-    3 hours *behind* GMT. The ``tzstr`` time zone object will parse this as an
-    offset 3 hours *ahead* of GMT. If you would like to maintain the POSIX
-    behavior, pass a ``True`` value to ``posix_offset``.
-
-    The :class:`tzrange` object provides the same functionality, but is
-    specified using :class:`relativedelta.relativedelta` objects. rather than
-    strings.
-
-    :param s:
-        A time zone string in ``TZ`` variable format. This can be a
-        :class:`bytes` (2.x: :class:`str`), :class:`str` (2.x:
-        :class:`unicode`) or a stream emitting unicode characters
-        (e.g. :class:`StringIO`).
-
-    :param posix_offset:
-        Optional. If set to ``True``, interpret strings such as ``GMT+3`` or
-        ``UTC+3`` as being 3 hours *behind* UTC rather than ahead, per the
-        POSIX standard.
-
-    .. caution::
-
-        Prior to version 2.7.0, this function also supported time zones
-        in the format:
-
-            * ``EST5EDT,4,0,6,7200,10,0,26,7200,3600``
-            * ``EST5EDT,4,1,0,7200,10,-1,0,7200,3600``
-
-        This format is non-standard and has been deprecated; this function
-        will raise a :class:`DeprecatedTZFormatWarning` until
-        support is removed in a future version.
-
-    .. _`GNU C Library: TZ Variable`:
-        https://www.gnu.org/software/libc/manual/html_node/TZ-Variable.html
-    """
-    def __init__(self, s, posix_offset=False):
-        global parser
-        from dateutil.parser import _parser as parser
-
-        self._s = s
-
-        res = parser._parsetz(s)
-        if res is None or res.any_unused_tokens:
-            raise ValueError("unknown string format")
-
-        # Here we break the compatibility with the TZ variable handling.
-        # GMT-3 actually *means* the timezone -3.
-        if res.stdabbr in ("GMT", "UTC") and not posix_offset:
-            res.stdoffset *= -1
-
-        # We must initialize it first, since _delta() needs
-        # _std_offset and _dst_offset set. Use False in start/end
-        # to avoid building it two times.
-        tzrange.__init__(self, res.stdabbr, res.stdoffset,
-                         res.dstabbr, res.dstoffset,
-                         start=False, end=False)
-
-        if not res.dstabbr:
-            self._start_delta = None
-            self._end_delta = None
-        else:
-            self._start_delta = self._delta(res.start)
-            if self._start_delta:
-                self._end_delta = self._delta(res.end, isend=1)
-
-        self.hasdst = bool(self._start_delta)
-
-    def _delta(self, x, isend=0):
-        from dateutil import relativedelta
-        kwargs = {}
-        if x.month is not None:
-            kwargs["month"] = x.month
-            if x.weekday is not None:
-                kwargs["weekday"] = relativedelta.weekday(x.weekday, x.week)
-                if x.week > 0:
-                    kwargs["day"] = 1
-                else:
-                    kwargs["day"] = 31
-            elif x.day:
-                kwargs["day"] = x.day
-        elif x.yday is not None:
-            kwargs["yearday"] = x.yday
-        elif x.jyday is not None:
-            kwargs["nlyearday"] = x.jyday
-        if not kwargs:
-            # Default is to start on first sunday of april, and end
-            # on last sunday of october.
-            if not isend:
-                kwargs["month"] = 4
-                kwargs["day"] = 1
-                kwargs["weekday"] = relativedelta.SU(+1)
-            else:
-                kwargs["month"] = 10
-                kwargs["day"] = 31
-                kwargs["weekday"] = relativedelta.SU(-1)
-        if x.time is not None:
-            kwargs["seconds"] = x.time
-        else:
-            # Default is 2AM.
-            kwargs["seconds"] = 7200
-        if isend:
-            # Convert to standard time, to follow the documented way
-            # of working with the extra hour. See the documentation
-            # of the tzinfo class.
-            delta = self._dst_offset - self._std_offset
-            kwargs["seconds"] -= delta.seconds + delta.days * 86400
-        return relativedelta.relativedelta(**kwargs)
-
-    def __repr__(self):
-        return "%s(%s)" % (self.__class__.__name__, repr(self._s))
-
-
-class _tzicalvtzcomp(object):
-    def __init__(self, tzoffsetfrom, tzoffsetto, isdst,
-                 tzname=None, rrule=None):
-        self.tzoffsetfrom = datetime.timedelta(seconds=tzoffsetfrom)
-        self.tzoffsetto = datetime.timedelta(seconds=tzoffsetto)
-        self.tzoffsetdiff = self.tzoffsetto - self.tzoffsetfrom
-        self.isdst = isdst
-        self.tzname = tzname
-        self.rrule = rrule
-
-
-class _tzicalvtz(_tzinfo):
-    def __init__(self, tzid, comps=[]):
-        super(_tzicalvtz, self).__init__()
-
-        self._tzid = tzid
-        self._comps = comps
-        self._cachedate = []
-        self._cachecomp = []
-        self._cache_lock = _thread.allocate_lock()
-
-    def _find_comp(self, dt):
-        if len(self._comps) == 1:
-            return self._comps[0]
-
-        dt = dt.replace(tzinfo=None)
-
-        try:
-            with self._cache_lock:
-                return self._cachecomp[self._cachedate.index(
-                    (dt, self._fold(dt)))]
-        except ValueError:
-            pass
-
-        lastcompdt = None
-        lastcomp = None
-
-        for comp in self._comps:
-            compdt = self._find_compdt(comp, dt)
-
-            if compdt and (not lastcompdt or lastcompdt < compdt):
-                lastcompdt = compdt
-                lastcomp = comp
-
-        if not lastcomp:
-            # RFC says nothing about what to do when a given
-            # time is before the first onset date. We'll look for the
-            # first standard component, or the first component, if
-            # none is found.
-            for comp in self._comps:
-                if not comp.isdst:
-                    lastcomp = comp
-                    break
-            else:
-                lastcomp = comp[0]
-
-        with self._cache_lock:
-            self._cachedate.insert(0, (dt, self._fold(dt)))
-            self._cachecomp.insert(0, lastcomp)
-
-            if len(self._cachedate) > 10:
-                self._cachedate.pop()
-                self._cachecomp.pop()
-
-        return lastcomp
-
-    def _find_compdt(self, comp, dt):
-        if comp.tzoffsetdiff < ZERO and self._fold(dt):
-            dt -= comp.tzoffsetdiff
-
-        compdt = comp.rrule.before(dt, inc=True)
-
-        return compdt
-
-    def utcoffset(self, dt):
-        if dt is None:
-            return None
-
-        return self._find_comp(dt).tzoffsetto
-
-    def dst(self, dt):
-        comp = self._find_comp(dt)
-        if comp.isdst:
-            return comp.tzoffsetdiff
-        else:
-            return ZERO
-
-    @tzname_in_python2
-    def tzname(self, dt):
-        return self._find_comp(dt).tzname
-
-    def __repr__(self):
-        return "<tzicalvtz %s>" % repr(self._tzid)
-
-    __reduce__ = object.__reduce__
-
-
-class tzical(object):
-    """
-    This object is designed to parse an iCalendar-style ``VTIMEZONE`` structure
-    as set out in `RFC 5545`_ Section 4.6.5 into one or more `tzinfo` objects.
-
-    :param `fileobj`:
-        A file or stream in iCalendar format, which should be UTF-8 encoded
-        with CRLF endings.
-
-    .. _`RFC 5545`: https://tools.ietf.org/html/rfc5545
-    """
-    def __init__(self, fileobj):
-        global rrule
-        from dateutil import rrule
-
-        if isinstance(fileobj, string_types):
-            self._s = fileobj
-            # ical should be encoded in UTF-8 with CRLF
-            fileobj = open(fileobj, 'r')
-        else:
-            self._s = getattr(fileobj, 'name', repr(fileobj))
-            fileobj = _nullcontext(fileobj)
-
-        self._vtz = {}
-
-        with fileobj as fobj:
-            self._parse_rfc(fobj.read())
-
-    def keys(self):
-        """
-        Retrieves the available time zones as a list.
-        """
-        return list(self._vtz.keys())
-
-    def get(self, tzid=None):
-        """
-        Retrieve a :py:class:`datetime.tzinfo` object by its ``tzid``.
-
-        :param tzid:
-            If there is exactly one time zone available, omitting ``tzid``
-            or passing :py:const:`None` value returns it. Otherwise a valid
-            key (which can be retrieved from :func:`keys`) is required.
-
-        :raises ValueError:
-            Raised if ``tzid`` is not specified but there are either more
-            or fewer than 1 zone defined.
-
-        :returns:
-            Returns either a :py:class:`datetime.tzinfo` object representing
-            the relevant time zone or :py:const:`None` if the ``tzid`` was
-            not found.
-        """
-        if tzid is None:
-            if len(self._vtz) == 0:
-                raise ValueError("no timezones defined")
-            elif len(self._vtz) > 1:
-                raise ValueError("more than one timezone available")
-            tzid = next(iter(self._vtz))
-
-        return self._vtz.get(tzid)
-
-    def _parse_offset(self, s):
-        s = s.strip()
-        if not s:
-            raise ValueError("empty offset")
-        if s[0] in ('+', '-'):
-            signal = (-1, +1)[s[0] == '+']
-            s = s[1:]
-        else:
-            signal = +1
-        if len(s) == 4:
-            return (int(s[:2]) * 3600 + int(s[2:]) * 60) * signal
-        elif len(s) == 6:
-            return (int(s[:2]) * 3600 + int(s[2:4]) * 60 + int(s[4:])) * signal
-        else:
-            raise ValueError("invalid offset: " + s)
-
-    def _parse_rfc(self, s):
-        lines = s.splitlines()
-        if not lines:
-            raise ValueError("empty string")
-
-        # Unfold
-        i = 0
-        while i < len(lines):
-            line = lines[i].rstrip()
-            if not line:
-                del lines[i]
-            elif i > 0 and line[0] == " ":
-                lines[i-1] += line[1:]
-                del lines[i]
-            else:
-                i += 1
-
-        tzid = None
-        comps = []
-        invtz = False
-        comptype = None
-        for line in lines:
-            if not line:
-                continue
-            name, value = line.split(':', 1)
-            parms = name.split(';')
-            if not parms:
-                raise ValueError("empty property name")
-            name = parms[0].upper()
-            parms = parms[1:]
-            if invtz:
-                if name == "BEGIN":
-                    if value in ("STANDARD", "DAYLIGHT"):
-                        # Process component
-                        pass
-                    else:
-                        raise ValueError("unknown component: "+value)
-                    comptype = value
-                    founddtstart = False
-                    tzoffsetfrom = None
-                    tzoffsetto = None
-                    rrulelines = []
-                    tzname = None
-                elif name == "END":
-                    if value == "VTIMEZONE":
-                        if comptype:
-                            raise ValueError("component not closed: "+comptype)
-                        if not tzid:
-                            raise ValueError("mandatory TZID not found")
-                        if not comps:
-                            raise ValueError(
-                                "at least one component is needed")
-                        # Process vtimezone
-                        self._vtz[tzid] = _tzicalvtz(tzid, comps)
-                        invtz = False
-                    elif value == comptype:
-                        if not founddtstart:
-                            raise ValueError("mandatory DTSTART not found")
-                        if tzoffsetfrom is None:
-                            raise ValueError(
-                                "mandatory TZOFFSETFROM not found")
-                        if tzoffsetto is None:
-                            raise ValueError(
-                                "mandatory TZOFFSETFROM not found")
-                        # Process component
-                        rr = None
-                        if rrulelines:
-                            rr = rrule.rrulestr("\n".join(rrulelines),
-                                                compatible=True,
-                                                ignoretz=True,
-                                                cache=True)
-                        comp = _tzicalvtzcomp(tzoffsetfrom, tzoffsetto,
-                                              (comptype == "DAYLIGHT"),
-                                              tzname, rr)
-                        comps.append(comp)
-                        comptype = None
-                    else:
-                        raise ValueError("invalid component end: "+value)
-                elif comptype:
-                    if name == "DTSTART":
-                        # DTSTART in VTIMEZONE takes a subset of valid RRULE
-                        # values under RFC 5545.
-                        for parm in parms:
-                            if parm != 'VALUE=DATE-TIME':
-                                msg = ('Unsupported DTSTART param in ' +
-                                       'VTIMEZONE: ' + parm)
-                                raise ValueError(msg)
-                        rrulelines.append(line)
-                        founddtstart = True
-                    elif name in ("RRULE", "RDATE", "EXRULE", "EXDATE"):
-                        rrulelines.append(line)
-                    elif name == "TZOFFSETFROM":
-                        if parms:
-                            raise ValueError(
-                                "unsupported %s parm: %s " % (name, parms[0]))
-                        tzoffsetfrom = self._parse_offset(value)
-                    elif name == "TZOFFSETTO":
-                        if parms:
-                            raise ValueError(
-                                "unsupported TZOFFSETTO parm: "+parms[0])
-                        tzoffsetto = self._parse_offset(value)
-                    elif name == "TZNAME":
-                        if parms:
-                            raise ValueError(
-                                "unsupported TZNAME parm: "+parms[0])
-                        tzname = value
-                    elif name == "COMMENT":
-                        pass
-                    else:
-                        raise ValueError("unsupported property: "+name)
-                else:
-                    if name == "TZID":
-                        if parms:
-                            raise ValueError(
-                                "unsupported TZID parm: "+parms[0])
-                        tzid = value
-                    elif name in ("TZURL", "LAST-MODIFIED", "COMMENT"):
-                        pass
-                    else:
-                        raise ValueError("unsupported property: "+name)
-            elif name == "BEGIN" and value == "VTIMEZONE":
-                tzid = None
-                comps = []
-                invtz = True
-
-    def __repr__(self):
-        return "%s(%s)" % (self.__class__.__name__, repr(self._s))
-
-
-if sys.platform != "win32":
-    TZFILES = ["/etc/localtime", "localtime"]
-    TZPATHS = ["/usr/share/zoneinfo",
-               "/usr/lib/zoneinfo",
-               "/usr/share/lib/zoneinfo",
-               "/etc/zoneinfo"]
-else:
-    TZFILES = []
-    TZPATHS = []
-
-
-def __get_gettz():
-    tzlocal_classes = (tzlocal,)
-    if tzwinlocal is not None:
-        tzlocal_classes += (tzwinlocal,)
-
-    class GettzFunc(object):
-        """
-        Retrieve a time zone object from a string representation
-
-        This function is intended to retrieve the :py:class:`tzinfo` subclass
-        that best represents the time zone that would be used if a POSIX
-        `TZ variable`_ were set to the same value.
-
-        If no argument or an empty string is passed to ``gettz``, local time
-        is returned:
-
-        .. code-block:: python3
-
-            >>> gettz()
-            tzfile('/etc/localtime')
-
-        This function is also the preferred way to map IANA tz database keys
-        to :class:`tzfile` objects:
-
-        .. code-block:: python3
-
-            >>> gettz('Pacific/Kiritimati')
-            tzfile('/usr/share/zoneinfo/Pacific/Kiritimati')
-
-        On Windows, the standard is extended to include the Windows-specific
-        zone names provided by the operating system:
-
-        .. code-block:: python3
-
-            >>> gettz('Egypt Standard Time')
-            tzwin('Egypt Standard Time')
-
-        Passing a GNU ``TZ`` style string time zone specification returns a
-        :class:`tzstr` object:
-
-        .. code-block:: python3
-
-            >>> gettz('AEST-10AEDT-11,M10.1.0/2,M4.1.0/3')
-            tzstr('AEST-10AEDT-11,M10.1.0/2,M4.1.0/3')
-
-        :param name:
-            A time zone name (IANA, or, on Windows, Windows keys), location of
-            a ``tzfile(5)`` zoneinfo file or ``TZ`` variable style time zone
-            specifier. An empty string, no argument or ``None`` is interpreted
-            as local time.
-
-        :return:
-            Returns an instance of one of ``dateutil``'s :py:class:`tzinfo`
-            subclasses.
-
-        .. versionchanged:: 2.7.0
-
-            After version 2.7.0, any two calls to ``gettz`` using the same
-            input strings will return the same object:
-
-            .. code-block:: python3
-
-                >>> tz.gettz('America/Chicago') is tz.gettz('America/Chicago')
-                True
-
-            In addition to improving performance, this ensures that
-            `"same zone" semantics`_ are used for datetimes in the same zone.
-
-
-        .. _`TZ variable`:
-            https://www.gnu.org/software/libc/manual/html_node/TZ-Variable.html
-
-        .. _`"same zone" semantics`:
-            https://blog.ganssle.io/articles/2018/02/aware-datetime-arithmetic.html
-        """
-        def __init__(self):
-
-            self.__instances = weakref.WeakValueDictionary()
-            self.__strong_cache_size = 8
-            self.__strong_cache = OrderedDict()
-            self._cache_lock = _thread.allocate_lock()
-
-        def __call__(self, name=None):
-            with self._cache_lock:
-                rv = self.__instances.get(name, None)
-
-                if rv is None:
-                    rv = self.nocache(name=name)
-                    if not (name is None
-                            or isinstance(rv, tzlocal_classes)
-                            or rv is None):
-                        # tzlocal is slightly more complicated than the other
-                        # time zone providers because it depends on environment
-                        # at construction time, so don't cache that.
-                        #
-                        # We also cannot store weak references to None, so we
-                        # will also not store that.
-                        self.__instances[name] = rv
-                    else:
-                        # No need for strong caching, return immediately
-                        return rv
-
-                self.__strong_cache[name] = self.__strong_cache.pop(name, rv)
-
-                if len(self.__strong_cache) > self.__strong_cache_size:
-                    self.__strong_cache.popitem(last=False)
-
-            return rv
-
-        def set_cache_size(self, size):
-            with self._cache_lock:
-                self.__strong_cache_size = size
-                while len(self.__strong_cache) > size:
-                    self.__strong_cache.popitem(last=False)
-
-        def cache_clear(self):
-            with self._cache_lock:
-                self.__instances = weakref.WeakValueDictionary()
-                self.__strong_cache.clear()
-
-        @staticmethod
-        def nocache(name=None):
-            """A non-cached version of gettz"""
-            tz = None
-            if not name:
-                try:
-                    name = os.environ["TZ"]
-                except KeyError:
-                    pass
-            if name is None or name in ("", ":"):
-                for filepath in TZFILES:
-                    if not os.path.isabs(filepath):
-                        filename = filepath
-                        for path in TZPATHS:
-                            filepath = os.path.join(path, filename)
-                            if os.path.isfile(filepath):
-                                break
-                        else:
-                            continue
-                    if os.path.isfile(filepath):
-                        try:
-                            tz = tzfile(filepath)
-                            break
-                        except (IOError, OSError, ValueError):
-                            pass
-                else:
-                    tz = tzlocal()
-            else:
-                try:
-                    if name.startswith(":"):
-                        name = name[1:]
-                except TypeError as e:
-                    if isinstance(name, bytes):
-                        new_msg = "gettz argument should be str, not bytes"
-                        six.raise_from(TypeError(new_msg), e)
-                    else:
-                        raise
-                if os.path.isabs(name):
-                    if os.path.isfile(name):
-                        tz = tzfile(name)
-                    else:
-                        tz = None
-                else:
-                    for path in TZPATHS:
-                        filepath = os.path.join(path, name)
-                        if not os.path.isfile(filepath):
-                            filepath = filepath.replace(' ', '_')
-                            if not os.path.isfile(filepath):
-                                continue
-                        try:
-                            tz = tzfile(filepath)
-                            break
-                        except (IOError, OSError, ValueError):
-                            pass
-                    else:
-                        tz = None
-                        if tzwin is not None:
-                            try:
-                                tz = tzwin(name)
-                            except (WindowsError, UnicodeEncodeError):
-                                # UnicodeEncodeError is for Python 2.7 compat
-                                tz = None
-
-                        if not tz:
-                            from dateutil.zoneinfo import get_zonefile_instance
-                            tz = get_zonefile_instance().get(name)
-
-                        if not tz:
-                            for c in name:
-                                # name is not a tzstr unless it has at least
-                                # one offset. For short values of "name", an
-                                # explicit for loop seems to be the fastest way
-                                # To determine if a string contains a digit
-                                if c in "0123456789":
-                                    try:
-                                        tz = tzstr(name)
-                                    except ValueError:
-                                        pass
-                                    break
-                            else:
-                                if name in ("GMT", "UTC"):
-                                    tz = UTC
-                                elif name in time.tzname:
-                                    tz = tzlocal()
-            return tz
-
-    return GettzFunc()
-
-
-gettz = __get_gettz()
-del __get_gettz
-
-
-def datetime_exists(dt, tz=None):
-    """
-    Given a datetime and a time zone, determine whether or not a given datetime
-    would fall in a gap.
-
-    :param dt:
-        A :class:`datetime.datetime` (whose time zone will be ignored if ``tz``
-        is provided.)
-
-    :param tz:
-        A :class:`datetime.tzinfo` with support for the ``fold`` attribute. If
-        ``None`` or not provided, the datetime's own time zone will be used.
-
-    :return:
-        Returns a boolean value whether or not the "wall time" exists in
-        ``tz``.
-
-    .. versionadded:: 2.7.0
-    """
-    if tz is None:
-        if dt.tzinfo is None:
-            raise ValueError('Datetime is naive and no time zone provided.')
-        tz = dt.tzinfo
-
-    dt = dt.replace(tzinfo=None)
-
-    # This is essentially a test of whether or not the datetime can survive
-    # a round trip to UTC.
-    dt_rt = dt.replace(tzinfo=tz).astimezone(UTC).astimezone(tz)
-    dt_rt = dt_rt.replace(tzinfo=None)
-
-    return dt == dt_rt
-
-
-def datetime_ambiguous(dt, tz=None):
-    """
-    Given a datetime and a time zone, determine whether or not a given datetime
-    is ambiguous (i.e if there are two times differentiated only by their DST
-    status).
-
-    :param dt:
-        A :class:`datetime.datetime` (whose time zone will be ignored if ``tz``
-        is provided.)
-
-    :param tz:
-        A :class:`datetime.tzinfo` with support for the ``fold`` attribute. If
-        ``None`` or not provided, the datetime's own time zone will be used.
-
-    :return:
-        Returns a boolean value whether or not the "wall time" is ambiguous in
-        ``tz``.
-
-    .. versionadded:: 2.6.0
-    """
-    if tz is None:
-        if dt.tzinfo is None:
-            raise ValueError('Datetime is naive and no time zone provided.')
-
-        tz = dt.tzinfo
-
-    # If a time zone defines its own "is_ambiguous" function, we'll use that.
-    is_ambiguous_fn = getattr(tz, 'is_ambiguous', None)
-    if is_ambiguous_fn is not None:
-        try:
-            return tz.is_ambiguous(dt)
-        except Exception:
-            pass
-
-    # If it doesn't come out and tell us it's ambiguous, we'll just check if
-    # the fold attribute has any effect on this particular date and time.
-    dt = dt.replace(tzinfo=tz)
-    wall_0 = enfold(dt, fold=0)
-    wall_1 = enfold(dt, fold=1)
-
-    same_offset = wall_0.utcoffset() == wall_1.utcoffset()
-    same_dst = wall_0.dst() == wall_1.dst()
-
-    return not (same_offset and same_dst)
-
-
-def resolve_imaginary(dt):
-    """
-    Given a datetime that may be imaginary, return an existing datetime.
-
-    This function assumes that an imaginary datetime represents what the
-    wall time would be in a zone had the offset transition not occurred, so
-    it will always fall forward by the transition's change in offset.
-
-    .. doctest::
-
-        >>> from dateutil import tz
-        >>> from datetime import datetime
-        >>> NYC = tz.gettz('America/New_York')
-        >>> print(tz.resolve_imaginary(datetime(2017, 3, 12, 2, 30, tzinfo=NYC)))
-        2017-03-12 03:30:00-04:00
-
-        >>> KIR = tz.gettz('Pacific/Kiritimati')
-        >>> print(tz.resolve_imaginary(datetime(1995, 1, 1, 12, 30, tzinfo=KIR)))
-        1995-01-02 12:30:00+14:00
-
-    As a note, :func:`datetime.astimezone` is guaranteed to produce a valid,
-    existing datetime, so a round-trip to and from UTC is sufficient to get
-    an extant datetime, however, this generally "falls back" to an earlier time
-    rather than falling forward to the STD side (though no guarantees are made
-    about this behavior).
-
-    :param dt:
-        A :class:`datetime.datetime` which may or may not exist.
-
-    :return:
-        Returns an existing :class:`datetime.datetime`. If ``dt`` was not
-        imaginary, the datetime returned is guaranteed to be the same object
-        passed to the function.
-
-    .. versionadded:: 2.7.0
-    """
-    if dt.tzinfo is not None and not datetime_exists(dt):
-
-        curr_offset = (dt + datetime.timedelta(hours=24)).utcoffset()
-        old_offset = (dt - datetime.timedelta(hours=24)).utcoffset()
-
-        dt += curr_offset - old_offset
-
-    return dt
-
-
-def _datetime_to_timestamp(dt):
-    """
-    Convert a :class:`datetime.datetime` object to an epoch timestamp in
-    seconds since January 1, 1970, ignoring the time zone.
-    """
-    return (dt.replace(tzinfo=None) - EPOCH).total_seconds()
-
-
-if sys.version_info >= (3, 6):
-    def _get_supported_offset(second_offset):
-        return second_offset
-else:
-    def _get_supported_offset(second_offset):
-        # For python pre-3.6, round to full-minutes if that's not the case.
-        # Python's datetime doesn't accept sub-minute timezones. Check
-        # http://python.org/sf/1447945 or https://bugs.python.org/issue5288
-        # for some information.
-        old_offset = second_offset
-        calculated_offset = 60 * ((second_offset + 30) // 60)
-        return calculated_offset
-
-
-try:
-    # Python 3.7 feature
-    from contextlib import nullcontext as _nullcontext
-except ImportError:
-    class _nullcontext(object):
-        """
-        Class for wrapping contexts so that they are passed through in a
-        with statement.
-        """
-        def __init__(self, context):
-            self.context = context
-
-        def __enter__(self):
-            return self.context
-
-        def __exit__(*args, **kwargs):
-            pass
-
-# vim:ts=4:sw=4:et
diff --git a/lib/dateutil/tz/win.py b/lib/dateutil/tz/win.py
deleted file mode 100644
index cde07ba7..00000000
--- a/lib/dateutil/tz/win.py
+++ /dev/null
@@ -1,370 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-This module provides an interface to the native time zone data on Windows,
-including :py:class:`datetime.tzinfo` implementations.
-
-Attempting to import this module on a non-Windows platform will raise an
-:py:obj:`ImportError`.
-"""
-# This code was originally contributed by Jeffrey Harris.
-import datetime
-import struct
-
-from six.moves import winreg
-from six import text_type
-
-try:
-    import ctypes
-    from ctypes import wintypes
-except ValueError:
-    # ValueError is raised on non-Windows systems for some horrible reason.
-    raise ImportError("Running tzwin on non-Windows system")
-
-from ._common import tzrangebase
-
-__all__ = ["tzwin", "tzwinlocal", "tzres"]
-
-ONEWEEK = datetime.timedelta(7)
-
-TZKEYNAMENT = r"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones"
-TZKEYNAME9X = r"SOFTWARE\Microsoft\Windows\CurrentVersion\Time Zones"
-TZLOCALKEYNAME = r"SYSTEM\CurrentControlSet\Control\TimeZoneInformation"
-
-
-def _settzkeyname():
-    handle = winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE)
-    try:
-        winreg.OpenKey(handle, TZKEYNAMENT).Close()
-        TZKEYNAME = TZKEYNAMENT
-    except WindowsError:
-        TZKEYNAME = TZKEYNAME9X
-    handle.Close()
-    return TZKEYNAME
-
-
-TZKEYNAME = _settzkeyname()
-
-
-class tzres(object):
-    """
-    Class for accessing ``tzres.dll``, which contains timezone name related
-    resources.
-
-    .. versionadded:: 2.5.0
-    """
-    p_wchar = ctypes.POINTER(wintypes.WCHAR)        # Pointer to a wide char
-
-    def __init__(self, tzres_loc='tzres.dll'):
-        # Load the user32 DLL so we can load strings from tzres
-        user32 = ctypes.WinDLL('user32')
-
-        # Specify the LoadStringW function
-        user32.LoadStringW.argtypes = (wintypes.HINSTANCE,
-                                       wintypes.UINT,
-                                       wintypes.LPWSTR,
-                                       ctypes.c_int)
-
-        self.LoadStringW = user32.LoadStringW
-        self._tzres = ctypes.WinDLL(tzres_loc)
-        self.tzres_loc = tzres_loc
-
-    def load_name(self, offset):
-        """
-        Load a timezone name from a DLL offset (integer).
-
-        >>> from dateutil.tzwin import tzres
-        >>> tzr = tzres()
-        >>> print(tzr.load_name(112))
-        'Eastern Standard Time'
-
-        :param offset:
-            A positive integer value referring to a string from the tzres dll.
-
-        .. note::
-
-            Offsets found in the registry are generally of the form
-            ``@tzres.dll,-114``. The offset in this case is 114, not -114.
-
-        """
-        resource = self.p_wchar()
-        lpBuffer = ctypes.cast(ctypes.byref(resource), wintypes.LPWSTR)
-        nchar = self.LoadStringW(self._tzres._handle, offset, lpBuffer, 0)
-        return resource[:nchar]
-
-    def name_from_string(self, tzname_str):
-        """
-        Parse strings as returned from the Windows registry into the time zone
-        name as defined in the registry.
-
-        >>> from dateutil.tzwin import tzres
-        >>> tzr = tzres()
-        >>> print(tzr.name_from_string('@tzres.dll,-251'))
-        'Dateline Daylight Time'
-        >>> print(tzr.name_from_string('Eastern Standard Time'))
-        'Eastern Standard Time'
-
-        :param tzname_str:
-            A timezone name string as returned from a Windows registry key.
-
-        :return:
-            Returns the localized timezone string from tzres.dll if the string
-            is of the form `@tzres.dll,-offset`, else returns the input string.
-        """
-        if not tzname_str.startswith('@'):
-            return tzname_str
-
-        name_splt = tzname_str.split(',-')
-        try:
-            offset = int(name_splt[1])
-        except:
-            raise ValueError("Malformed timezone string.")
-
-        return self.load_name(offset)
-
-
-class tzwinbase(tzrangebase):
-    """tzinfo class based on win32's timezones available in the registry."""
-    def __init__(self):
-        raise NotImplementedError('tzwinbase is an abstract base class')
-
-    def __eq__(self, other):
-        # Compare on all relevant dimensions, including name.
-        if not isinstance(other, tzwinbase):
-            return NotImplemented
-
-        return  (self._std_offset == other._std_offset and
-                 self._dst_offset == other._dst_offset and
-                 self._stddayofweek == other._stddayofweek and
-                 self._dstdayofweek == other._dstdayofweek and
-                 self._stdweeknumber == other._stdweeknumber and
-                 self._dstweeknumber == other._dstweeknumber and
-                 self._stdhour == other._stdhour and
-                 self._dsthour == other._dsthour and
-                 self._stdminute == other._stdminute and
-                 self._dstminute == other._dstminute and
-                 self._std_abbr == other._std_abbr and
-                 self._dst_abbr == other._dst_abbr)
-
-    @staticmethod
-    def list():
-        """Return a list of all time zones known to the system."""
-        with winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE) as handle:
-            with winreg.OpenKey(handle, TZKEYNAME) as tzkey:
-                result = [winreg.EnumKey(tzkey, i)
-                          for i in range(winreg.QueryInfoKey(tzkey)[0])]
-        return result
-
-    def display(self):
-        """
-        Return the display name of the time zone.
-        """
-        return self._display
-
-    def transitions(self, year):
-        """
-        For a given year, get the DST on and off transition times, expressed
-        always on the standard time side. For zones with no transitions, this
-        function returns ``None``.
-
-        :param year:
-            The year whose transitions you would like to query.
-
-        :return:
-            Returns a :class:`tuple` of :class:`datetime.datetime` objects,
-            ``(dston, dstoff)`` for zones with an annual DST transition, or
-            ``None`` for fixed offset zones.
-        """
-
-        if not self.hasdst:
-            return None
-
-        dston = picknthweekday(year, self._dstmonth, self._dstdayofweek,
-                               self._dsthour, self._dstminute,
-                               self._dstweeknumber)
-
-        dstoff = picknthweekday(year, self._stdmonth, self._stddayofweek,
-                                self._stdhour, self._stdminute,
-                                self._stdweeknumber)
-
-        # Ambiguous dates default to the STD side
-        dstoff -= self._dst_base_offset
-
-        return dston, dstoff
-
-    def _get_hasdst(self):
-        return self._dstmonth != 0
-
-    @property
-    def _dst_base_offset(self):
-        return self._dst_base_offset_
-
-
-class tzwin(tzwinbase):
-    """
-    Time zone object created from the zone info in the Windows registry
-
-    These are similar to :py:class:`dateutil.tz.tzrange` objects in that
-    the time zone data is provided in the format of a single offset rule
-    for either 0 or 2 time zone transitions per year.
-
-    :param: name
-        The name of a Windows time zone key, e.g. "Eastern Standard Time".
-        The full list of keys can be retrieved with :func:`tzwin.list`.
-    """
-
-    def __init__(self, name):
-        self._name = name
-
-        with winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE) as handle:
-            tzkeyname = text_type("{kn}\\{name}").format(kn=TZKEYNAME, name=name)
-            with winreg.OpenKey(handle, tzkeyname) as tzkey:
-                keydict = valuestodict(tzkey)
-
-        self._std_abbr = keydict["Std"]
-        self._dst_abbr = keydict["Dlt"]
-
-        self._display = keydict["Display"]
-
-        # See http://ww_winreg.jsiinc.com/SUBA/tip0300/rh0398.htm
-        tup = struct.unpack("=3l16h", keydict["TZI"])
-        stdoffset = -tup[0]-tup[1]          # Bias + StandardBias * -1
-        dstoffset = stdoffset-tup[2]        # + DaylightBias * -1
-        self._std_offset = datetime.timedelta(minutes=stdoffset)
-        self._dst_offset = datetime.timedelta(minutes=dstoffset)
-
-        # for the meaning see the win32 TIME_ZONE_INFORMATION structure docs
-        # http://msdn.microsoft.com/en-us/library/windows/desktop/ms725481(v=vs.85).aspx
-        (self._stdmonth,
-         self._stddayofweek,   # Sunday = 0
-         self._stdweeknumber,  # Last = 5
-         self._stdhour,
-         self._stdminute) = tup[4:9]
-
-        (self._dstmonth,
-         self._dstdayofweek,   # Sunday = 0
-         self._dstweeknumber,  # Last = 5
-         self._dsthour,
-         self._dstminute) = tup[12:17]
-
-        self._dst_base_offset_ = self._dst_offset - self._std_offset
-        self.hasdst = self._get_hasdst()
-
-    def __repr__(self):
-        return "tzwin(%s)" % repr(self._name)
-
-    def __reduce__(self):
-        return (self.__class__, (self._name,))
-
-
-class tzwinlocal(tzwinbase):
-    """
-    Class representing the local time zone information in the Windows registry
-
-    While :class:`dateutil.tz.tzlocal` makes system calls (via the :mod:`time`
-    module) to retrieve time zone information, ``tzwinlocal`` retrieves the
-    rules directly from the Windows registry and creates an object like
-    :class:`dateutil.tz.tzwin`.
-
-    Because Windows does not have an equivalent of :func:`time.tzset`, on
-    Windows, :class:`dateutil.tz.tzlocal` instances will always reflect the
-    time zone settings *at the time that the process was started*, meaning
-    changes to the machine's time zone settings during the run of a program
-    on Windows will **not** be reflected by :class:`dateutil.tz.tzlocal`.
-    Because ``tzwinlocal`` reads the registry directly, it is unaffected by
-    this issue.
-    """
-    def __init__(self):
-        with winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE) as handle:
-            with winreg.OpenKey(handle, TZLOCALKEYNAME) as tzlocalkey:
-                keydict = valuestodict(tzlocalkey)
-
-            self._std_abbr = keydict["StandardName"]
-            self._dst_abbr = keydict["DaylightName"]
-
-            try:
-                tzkeyname = text_type('{kn}\\{sn}').format(kn=TZKEYNAME,
-                                                          sn=self._std_abbr)
-                with winreg.OpenKey(handle, tzkeyname) as tzkey:
-                    _keydict = valuestodict(tzkey)
-                    self._display = _keydict["Display"]
-            except OSError:
-                self._display = None
-
-        stdoffset = -keydict["Bias"]-keydict["StandardBias"]
-        dstoffset = stdoffset-keydict["DaylightBias"]
-
-        self._std_offset = datetime.timedelta(minutes=stdoffset)
-        self._dst_offset = datetime.timedelta(minutes=dstoffset)
-
-        # For reasons unclear, in this particular key, the day of week has been
-        # moved to the END of the SYSTEMTIME structure.
-        tup = struct.unpack("=8h", keydict["StandardStart"])
-
-        (self._stdmonth,
-         self._stdweeknumber,  # Last = 5
-         self._stdhour,
-         self._stdminute) = tup[1:5]
-
-        self._stddayofweek = tup[7]
-
-        tup = struct.unpack("=8h", keydict["DaylightStart"])
-
-        (self._dstmonth,
-         self._dstweeknumber,  # Last = 5
-         self._dsthour,
-         self._dstminute) = tup[1:5]
-
-        self._dstdayofweek = tup[7]
-
-        self._dst_base_offset_ = self._dst_offset - self._std_offset
-        self.hasdst = self._get_hasdst()
-
-    def __repr__(self):
-        return "tzwinlocal()"
-
-    def __str__(self):
-        # str will return the standard name, not the daylight name.
-        return "tzwinlocal(%s)" % repr(self._std_abbr)
-
-    def __reduce__(self):
-        return (self.__class__, ())
-
-
-def picknthweekday(year, month, dayofweek, hour, minute, whichweek):
-    """ dayofweek == 0 means Sunday, whichweek 5 means last instance """
-    first = datetime.datetime(year, month, 1, hour, minute)
-
-    # This will work if dayofweek is ISO weekday (1-7) or Microsoft-style (0-6),
-    # Because 7 % 7 = 0
-    weekdayone = first.replace(day=((dayofweek - first.isoweekday()) % 7) + 1)
-    wd = weekdayone + ((whichweek - 1) * ONEWEEK)
-    if (wd.month != month):
-        wd -= ONEWEEK
-
-    return wd
-
-
-def valuestodict(key):
-    """Convert a registry key's values to a dictionary."""
-    dout = {}
-    size = winreg.QueryInfoKey(key)[1]
-    tz_res = None
-
-    for i in range(size):
-        key_name, value, dtype = winreg.EnumValue(key, i)
-        if dtype == winreg.REG_DWORD or dtype == winreg.REG_DWORD_LITTLE_ENDIAN:
-            # If it's a DWORD (32-bit integer), it's stored as unsigned - convert
-            # that to a proper signed integer
-            if value & (1 << 31):
-                value = value - (1 << 32)
-        elif dtype == winreg.REG_SZ:
-            # If it's a reference to the tzres DLL, load the actual string
-            if value.startswith('@tzres'):
-                tz_res = tz_res or tzres()
-                value = tz_res.name_from_string(value)
-
-            value = value.rstrip('\x00')    # Remove trailing nulls
-
-        dout[key_name] = value
-
-    return dout
diff --git a/lib/dateutil/tzwin.py b/lib/dateutil/tzwin.py
deleted file mode 100644
index cebc673e..00000000
--- a/lib/dateutil/tzwin.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# tzwin has moved to dateutil.tz.win
-from .tz.win import *
diff --git a/lib/dateutil/utils.py b/lib/dateutil/utils.py
deleted file mode 100644
index dd2d245a..00000000
--- a/lib/dateutil/utils.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-This module offers general convenience and utility functions for dealing with
-datetimes.
-
-.. versionadded:: 2.7.0
-"""
-from __future__ import unicode_literals
-
-from datetime import datetime, time
-
-
-def today(tzinfo=None):
-    """
-    Returns a :py:class:`datetime` representing the current day at midnight
-
-    :param tzinfo:
-        The time zone to attach (also used to determine the current day).
-
-    :return:
-        A :py:class:`datetime.datetime` object representing the current day
-        at midnight.
-    """
-
-    dt = datetime.now(tzinfo)
-    return datetime.combine(dt.date(), time(0, tzinfo=tzinfo))
-
-
-def default_tzinfo(dt, tzinfo):
-    """
-    Sets the ``tzinfo`` parameter on naive datetimes only
-
-    This is useful for example when you are provided a datetime that may have
-    either an implicit or explicit time zone, such as when parsing a time zone
-    string.
-
-    .. doctest::
-
-        >>> from dateutil.tz import tzoffset
-        >>> from dateutil.parser import parse
-        >>> from dateutil.utils import default_tzinfo
-        >>> dflt_tz = tzoffset("EST", -18000)
-        >>> print(default_tzinfo(parse('2014-01-01 12:30 UTC'), dflt_tz))
-        2014-01-01 12:30:00+00:00
-        >>> print(default_tzinfo(parse('2014-01-01 12:30'), dflt_tz))
-        2014-01-01 12:30:00-05:00
-
-    :param dt:
-        The datetime on which to replace the time zone
-
-    :param tzinfo:
-        The :py:class:`datetime.tzinfo` subclass instance to assign to
-        ``dt`` if (and only if) it is naive.
-
-    :return:
-        Returns an aware :py:class:`datetime.datetime`.
-    """
-    if dt.tzinfo is not None:
-        return dt
-    else:
-        return dt.replace(tzinfo=tzinfo)
-
-
-def within_delta(dt1, dt2, delta):
-    """
-    Useful for comparing two datetimes that may have a negligible difference
-    to be considered equal.
-    """
-    delta = abs(delta)
-    difference = dt1 - dt2
-    return -delta <= difference <= delta
diff --git a/lib/dateutil/zoneinfo/__init__.py b/lib/dateutil/zoneinfo/__init__.py
deleted file mode 100644
index 34f11ad6..00000000
--- a/lib/dateutil/zoneinfo/__init__.py
+++ /dev/null
@@ -1,167 +0,0 @@
-# -*- coding: utf-8 -*-
-import warnings
-import json
-
-from tarfile import TarFile
-from pkgutil import get_data
-from io import BytesIO
-
-from dateutil.tz import tzfile as _tzfile
-
-__all__ = ["get_zonefile_instance", "gettz", "gettz_db_metadata"]
-
-ZONEFILENAME = "dateutil-zoneinfo.tar.gz"
-METADATA_FN = 'METADATA'
-
-
-class tzfile(_tzfile):
-    def __reduce__(self):
-        return (gettz, (self._filename,))
-
-
-def getzoneinfofile_stream():
-    try:
-        return BytesIO(get_data(__name__, ZONEFILENAME))
-    except IOError as e:  # TODO  switch to FileNotFoundError?
-        warnings.warn("I/O error({0}): {1}".format(e.errno, e.strerror))
-        return None
-
-
-class ZoneInfoFile(object):
-    def __init__(self, zonefile_stream=None):
-        if zonefile_stream is not None:
-            with TarFile.open(fileobj=zonefile_stream) as tf:
-                self.zones = {zf.name: tzfile(tf.extractfile(zf), filename=zf.name)
-                              for zf in tf.getmembers()
-                              if zf.isfile() and zf.name != METADATA_FN}
-                # deal with links: They'll point to their parent object. Less
-                # waste of memory
-                links = {zl.name: self.zones[zl.linkname]
-                         for zl in tf.getmembers() if
-                         zl.islnk() or zl.issym()}
-                self.zones.update(links)
-                try:
-                    metadata_json = tf.extractfile(tf.getmember(METADATA_FN))
-                    metadata_str = metadata_json.read().decode('UTF-8')
-                    self.metadata = json.loads(metadata_str)
-                except KeyError:
-                    # no metadata in tar file
-                    self.metadata = None
-        else:
-            self.zones = {}
-            self.metadata = None
-
-    def get(self, name, default=None):
-        """
-        Wrapper for :func:`ZoneInfoFile.zones.get`. This is a convenience method
-        for retrieving zones from the zone dictionary.
-
-        :param name:
-            The name of the zone to retrieve. (Generally IANA zone names)
-
-        :param default:
-            The value to return in the event of a missing key.
-
-        .. versionadded:: 2.6.0
-
-        """
-        return self.zones.get(name, default)
-
-
-# The current API has gettz as a module function, although in fact it taps into
-# a stateful class. So as a workaround for now, without changing the API, we
-# will create a new "global" class instance the first time a user requests a
-# timezone. Ugly, but adheres to the api.
-#
-# TODO: Remove after deprecation period.
-_CLASS_ZONE_INSTANCE = []
-
-
-def get_zonefile_instance(new_instance=False):
-    """
-    This is a convenience function which provides a :class:`ZoneInfoFile`
-    instance using the data provided by the ``dateutil`` package. By default, it
-    caches a single instance of the ZoneInfoFile object and returns that.
-
-    :param new_instance:
-        If ``True``, a new instance of :class:`ZoneInfoFile` is instantiated and
-        used as the cached instance for the next call. Otherwise, new instances
-        are created only as necessary.
-
-    :return:
-        Returns a :class:`ZoneInfoFile` object.
-
-    .. versionadded:: 2.6
-    """
-    if new_instance:
-        zif = None
-    else:
-        zif = getattr(get_zonefile_instance, '_cached_instance', None)
-
-    if zif is None:
-        zif = ZoneInfoFile(getzoneinfofile_stream())
-
-        get_zonefile_instance._cached_instance = zif
-
-    return zif
-
-
-def gettz(name):
-    """
-    This retrieves a time zone from the local zoneinfo tarball that is packaged
-    with dateutil.
-
-    :param name:
-        An IANA-style time zone name, as found in the zoneinfo file.
-
-    :return:
-        Returns a :class:`dateutil.tz.tzfile` time zone object.
-
-    .. warning::
-        It is generally inadvisable to use this function, and it is only
-        provided for API compatibility with earlier versions. This is *not*
-        equivalent to ``dateutil.tz.gettz()``, which selects an appropriate
-        time zone based on the inputs, favoring system zoneinfo. This is ONLY
-        for accessing the dateutil-specific zoneinfo (which may be out of
-        date compared to the system zoneinfo).
-
-    .. deprecated:: 2.6
-        If you need to use a specific zoneinfofile over the system zoneinfo,
-        instantiate a :class:`dateutil.zoneinfo.ZoneInfoFile` object and call
-        :func:`dateutil.zoneinfo.ZoneInfoFile.get(name)` instead.
-
-        Use :func:`get_zonefile_instance` to retrieve an instance of the
-        dateutil-provided zoneinfo.
-    """
-    warnings.warn("zoneinfo.gettz() will be removed in future versions, "
-                  "to use the dateutil-provided zoneinfo files, instantiate a "
-                  "ZoneInfoFile object and use ZoneInfoFile.zones.get() "
-                  "instead. See the documentation for details.",
-                  DeprecationWarning)
-
-    if len(_CLASS_ZONE_INSTANCE) == 0:
-        _CLASS_ZONE_INSTANCE.append(ZoneInfoFile(getzoneinfofile_stream()))
-    return _CLASS_ZONE_INSTANCE[0].zones.get(name)
-
-
-def gettz_db_metadata():
-    """ Get the zonefile metadata
-
-    See `zonefile_metadata`_
-
-    :returns:
-        A dictionary with the database metadata
-
-    .. deprecated:: 2.6
-        See deprecation warning in :func:`zoneinfo.gettz`. To get metadata,
-        query the attribute ``zoneinfo.ZoneInfoFile.metadata``.
-    """
-    warnings.warn("zoneinfo.gettz_db_metadata() will be removed in future "
-                  "versions, to use the dateutil-provided zoneinfo files, "
-                  "ZoneInfoFile object and query the 'metadata' attribute "
-                  "instead. See the documentation for details.",
-                  DeprecationWarning)
-
-    if len(_CLASS_ZONE_INSTANCE) == 0:
-        _CLASS_ZONE_INSTANCE.append(ZoneInfoFile(getzoneinfofile_stream()))
-    return _CLASS_ZONE_INSTANCE[0].metadata
diff --git a/lib/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz b/lib/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz
deleted file mode 100644
index 1461f8c8..00000000
Binary files a/lib/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz and /dev/null differ
diff --git a/lib/dateutil/zoneinfo/rebuild.py b/lib/dateutil/zoneinfo/rebuild.py
deleted file mode 100644
index 684c6586..00000000
--- a/lib/dateutil/zoneinfo/rebuild.py
+++ /dev/null
@@ -1,75 +0,0 @@
-import logging
-import os
-import tempfile
-import shutil
-import json
-from subprocess import check_call, check_output
-from tarfile import TarFile
-
-from dateutil.zoneinfo import METADATA_FN, ZONEFILENAME
-
-
-def rebuild(filename, tag=None, format="gz", zonegroups=[], metadata=None):
-    """Rebuild the internal timezone info in dateutil/zoneinfo/zoneinfo*tar*
-
-    filename is the timezone tarball from ``ftp.iana.org/tz``.
-
-    """
-    tmpdir = tempfile.mkdtemp()
-    zonedir = os.path.join(tmpdir, "zoneinfo")
-    moduledir = os.path.dirname(__file__)
-    try:
-        with TarFile.open(filename) as tf:
-            for name in zonegroups:
-                tf.extract(name, tmpdir)
-            filepaths = [os.path.join(tmpdir, n) for n in zonegroups]
-
-            _run_zic(zonedir, filepaths)
-
-        # write metadata file
-        with open(os.path.join(zonedir, METADATA_FN), 'w') as f:
-            json.dump(metadata, f, indent=4, sort_keys=True)
-        target = os.path.join(moduledir, ZONEFILENAME)
-        with TarFile.open(target, "w:%s" % format) as tf:
-            for entry in os.listdir(zonedir):
-                entrypath = os.path.join(zonedir, entry)
-                tf.add(entrypath, entry)
-    finally:
-        shutil.rmtree(tmpdir)
-
-
-def _run_zic(zonedir, filepaths):
-    """Calls the ``zic`` compiler in a compatible way to get a "fat" binary.
-
-    Recent versions of ``zic`` default to ``-b slim``, while older versions
-    don't even have the ``-b`` option (but default to "fat" binaries). The
-    current version of dateutil does not support Version 2+ TZif files, which
-    causes problems when used in conjunction with "slim" binaries, so this
-    function is used to ensure that we always get a "fat" binary.
-    """
-
-    try:
-        help_text = check_output(["zic", "--help"])
-    except OSError as e:
-        _print_on_nosuchfile(e)
-        raise
-
-    if b"-b " in help_text:
-        bloat_args = ["-b", "fat"]
-    else:
-        bloat_args = []
-
-    check_call(["zic"] + bloat_args + ["-d", zonedir] + filepaths)
-
-
-def _print_on_nosuchfile(e):
-    """Print helpful troubleshooting message
-
-    e is an exception raised by subprocess.check_call()
-
-    """
-    if e.errno == 2:
-        logging.error(
-            "Could not find zic. Perhaps you need to install "
-            "libc-bin or some other package that provides it, "
-            "or it's not in your PATH?")
diff --git a/lib/distro.py b/lib/distro.py
deleted file mode 100644
index 78927413..00000000
--- a/lib/distro.py
+++ /dev/null
@@ -1,1386 +0,0 @@
-# Copyright 2015,2016,2017 Nir Cohen
-#
-# 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.
-
-"""
-The ``distro`` package (``distro`` stands for Linux Distribution) provides
-information about the Linux distribution it runs on, such as a reliable
-machine-readable distro ID, or version information.
-
-It is the recommended replacement for Python's original
-:py:func:`platform.linux_distribution` function, but it provides much more
-functionality. An alternative implementation became necessary because Python
-3.5 deprecated this function, and Python 3.8 removed it altogether. Its
-predecessor function :py:func:`platform.dist` was already deprecated since
-Python 2.6 and removed in Python 3.8. Still, there are many cases in which
-access to OS distribution information is needed. See `Python issue 1322
-<https://bugs.python.org/issue1322>`_ for more information.
-"""
-
-import argparse
-import json
-import logging
-import os
-import re
-import shlex
-import subprocess
-import sys
-import warnings
-
-__version__ = "1.6.0"
-
-# Use `if False` to avoid an ImportError on Python 2. After dropping Python 2
-# support, can use typing.TYPE_CHECKING instead. See:
-# https://docs.python.org/3/library/typing.html#typing.TYPE_CHECKING
-if False:  # pragma: nocover
-    from typing import (
-        Any,
-        Callable,
-        Dict,
-        Iterable,
-        Optional,
-        Sequence,
-        TextIO,
-        Tuple,
-        Type,
-        TypedDict,
-        Union,
-    )
-
-    VersionDict = TypedDict(
-        "VersionDict", {"major": str, "minor": str, "build_number": str}
-    )
-    InfoDict = TypedDict(
-        "InfoDict",
-        {
-            "id": str,
-            "version": str,
-            "version_parts": VersionDict,
-            "like": str,
-            "codename": str,
-        },
-    )
-
-
-_UNIXCONFDIR = os.environ.get("UNIXCONFDIR", "/etc")
-_UNIXUSRLIBDIR = os.environ.get("UNIXUSRLIBDIR", "/usr/lib")
-_OS_RELEASE_BASENAME = "os-release"
-
-#: Translation table for normalizing the "ID" attribute defined in os-release
-#: files, for use by the :func:`distro.id` method.
-#:
-#: * Key: Value as defined in the os-release file, translated to lower case,
-#:   with blanks translated to underscores.
-#:
-#: * Value: Normalized value.
-NORMALIZED_OS_ID = {
-    "ol": "oracle",  # Oracle Linux
-}
-
-#: Translation table for normalizing the "Distributor ID" attribute returned by
-#: the lsb_release command, for use by the :func:`distro.id` method.
-#:
-#: * Key: Value as returned by the lsb_release command, translated to lower
-#:   case, with blanks translated to underscores.
-#:
-#: * Value: Normalized value.
-NORMALIZED_LSB_ID = {
-    "enterpriseenterpriseas": "oracle",  # Oracle Enterprise Linux 4
-    "enterpriseenterpriseserver": "oracle",  # Oracle Linux 5
-    "redhatenterpriseworkstation": "rhel",  # RHEL 6, 7 Workstation
-    "redhatenterpriseserver": "rhel",  # RHEL 6, 7 Server
-    "redhatenterprisecomputenode": "rhel",  # RHEL 6 ComputeNode
-}
-
-#: Translation table for normalizing the distro ID derived from the file name
-#: of distro release files, for use by the :func:`distro.id` method.
-#:
-#: * Key: Value as derived from the file name of a distro release file,
-#:   translated to lower case, with blanks translated to underscores.
-#:
-#: * Value: Normalized value.
-NORMALIZED_DISTRO_ID = {
-    "redhat": "rhel",  # RHEL 6.x, 7.x
-}
-
-# Pattern for content of distro release file (reversed)
-_DISTRO_RELEASE_CONTENT_REVERSED_PATTERN = re.compile(
-    r"(?:[^)]*\)(.*)\()? *(?:STL )?([\d.+\-a-z]*\d) *(?:esaeler *)?(.+)"
-)
-
-# Pattern for base file name of distro release file
-_DISTRO_RELEASE_BASENAME_PATTERN = re.compile(r"(\w+)[-_](release|version)$")
-
-# Base file names to be ignored when searching for distro release file
-_DISTRO_RELEASE_IGNORE_BASENAMES = (
-    "debian_version",
-    "lsb-release",
-    "oem-release",
-    _OS_RELEASE_BASENAME,
-    "system-release",
-    "plesk-release",
-    "iredmail-release",
-)
-
-
-def linux_distribution(full_distribution_name=True):
-    # type: (bool) -> Tuple[str, str, str]
-    """
-    .. deprecated:: 1.6.0
-
-        :func:`distro.linux_distribution()` is deprecated. It should only be
-        used as a compatibility shim with Python's
-        :py:func:`platform.linux_distribution()`. Please use :func:`distro.id`,
-        :func:`distro.version` and :func:`distro.name` instead.
-
-    Return information about the current OS distribution as a tuple
-    ``(id_name, version, codename)`` with items as follows:
-
-    * ``id_name``:  If *full_distribution_name* is false, the result of
-      :func:`distro.id`. Otherwise, the result of :func:`distro.name`.
-
-    * ``version``:  The result of :func:`distro.version`.
-
-    * ``codename``:  The result of :func:`distro.codename`.
-
-    The interface of this function is compatible with the original
-    :py:func:`platform.linux_distribution` function, supporting a subset of
-    its parameters.
-
-    The data it returns may not exactly be the same, because it uses more data
-    sources than the original function, and that may lead to different data if
-    the OS distribution is not consistent across multiple data sources it
-    provides (there are indeed such distributions ...).
-
-    Another reason for differences is the fact that the :func:`distro.id`
-    method normalizes the distro ID string to a reliable machine-readable value
-    for a number of popular OS distributions.
-    """
-    warnings.warn(
-        "distro.linux_distribution() is deprecated. It should only be used as a "
-        "compatibility shim with Python's platform.linux_distribution(). Please use "
-        "distro.id(), distro.version() and distro.name() instead.",
-        DeprecationWarning,
-        stacklevel=2,
-    )
-    return _distro.linux_distribution(full_distribution_name)
-
-
-def id():
-    # type: () -> str
-    """
-    Return the distro ID of the current distribution, as a
-    machine-readable string.
-
-    For a number of OS distributions, the returned distro ID value is
-    *reliable*, in the sense that it is documented and that it does not change
-    across releases of the distribution.
-
-    This package maintains the following reliable distro ID values:
-
-    ==============  =========================================
-    Distro ID       Distribution
-    ==============  =========================================
-    "ubuntu"        Ubuntu
-    "debian"        Debian
-    "rhel"          RedHat Enterprise Linux
-    "centos"        CentOS
-    "fedora"        Fedora
-    "sles"          SUSE Linux Enterprise Server
-    "opensuse"      openSUSE
-    "amazon"        Amazon Linux
-    "arch"          Arch Linux
-    "cloudlinux"    CloudLinux OS
-    "exherbo"       Exherbo Linux
-    "gentoo"        GenToo Linux
-    "ibm_powerkvm"  IBM PowerKVM
-    "kvmibm"        KVM for IBM z Systems
-    "linuxmint"     Linux Mint
-    "mageia"        Mageia
-    "mandriva"      Mandriva Linux
-    "parallels"     Parallels
-    "pidora"        Pidora
-    "raspbian"      Raspbian
-    "oracle"        Oracle Linux (and Oracle Enterprise Linux)
-    "scientific"    Scientific Linux
-    "slackware"     Slackware
-    "xenserver"     XenServer
-    "openbsd"       OpenBSD
-    "netbsd"        NetBSD
-    "freebsd"       FreeBSD
-    "midnightbsd"   MidnightBSD
-    ==============  =========================================
-
-    If you have a need to get distros for reliable IDs added into this set,
-    or if you find that the :func:`distro.id` function returns a different
-    distro ID for one of the listed distros, please create an issue in the
-    `distro issue tracker`_.
-
-    **Lookup hierarchy and transformations:**
-
-    First, the ID is obtained from the following sources, in the specified
-    order. The first available and non-empty value is used:
-
-    * the value of the "ID" attribute of the os-release file,
-
-    * the value of the "Distributor ID" attribute returned by the lsb_release
-      command,
-
-    * the first part of the file name of the distro release file,
-
-    The so determined ID value then passes the following transformations,
-    before it is returned by this method:
-
-    * it is translated to lower case,
-
-    * blanks (which should not be there anyway) are translated to underscores,
-
-    * a normalization of the ID is performed, based upon
-      `normalization tables`_. The purpose of this normalization is to ensure
-      that the ID is as reliable as possible, even across incompatible changes
-      in the OS distributions. A common reason for an incompatible change is
-      the addition of an os-release file, or the addition of the lsb_release
-      command, with ID values that differ from what was previously determined
-      from the distro release file name.
-    """
-    return _distro.id()
-
-
-def name(pretty=False):
-    # type: (bool) -> str
-    """
-    Return the name of the current OS distribution, as a human-readable
-    string.
-
-    If *pretty* is false, the name is returned without version or codename.
-    (e.g. "CentOS Linux")
-
-    If *pretty* is true, the version and codename are appended.
-    (e.g. "CentOS Linux 7.1.1503 (Core)")
-
-    **Lookup hierarchy:**
-
-    The name is obtained from the following sources, in the specified order.
-    The first available and non-empty value is used:
-
-    * If *pretty* is false:
-
-      - the value of the "NAME" attribute of the os-release file,
-
-      - the value of the "Distributor ID" attribute returned by the lsb_release
-        command,
-
-      - the value of the "<name>" field of the distro release file.
-
-    * If *pretty* is true:
-
-      - the value of the "PRETTY_NAME" attribute of the os-release file,
-
-      - the value of the "Description" attribute returned by the lsb_release
-        command,
-
-      - the value of the "<name>" field of the distro release file, appended
-        with the value of the pretty version ("<version_id>" and "<codename>"
-        fields) of the distro release file, if available.
-    """
-    return _distro.name(pretty)
-
-
-def version(pretty=False, best=False):
-    # type: (bool, bool) -> str
-    """
-    Return the version of the current OS distribution, as a human-readable
-    string.
-
-    If *pretty* is false, the version is returned without codename (e.g.
-    "7.0").
-
-    If *pretty* is true, the codename in parenthesis is appended, if the
-    codename is non-empty (e.g. "7.0 (Maipo)").
-
-    Some distributions provide version numbers with different precisions in
-    the different sources of distribution information. Examining the different
-    sources in a fixed priority order does not always yield the most precise
-    version (e.g. for Debian 8.2, or CentOS 7.1).
-
-    The *best* parameter can be used to control the approach for the returned
-    version:
-
-    If *best* is false, the first non-empty version number in priority order of
-    the examined sources is returned.
-
-    If *best* is true, the most precise version number out of all examined
-    sources is returned.
-
-    **Lookup hierarchy:**
-
-    In all cases, the version number is obtained from the following sources.
-    If *best* is false, this order represents the priority order:
-
-    * the value of the "VERSION_ID" attribute of the os-release file,
-    * the value of the "Release" attribute returned by the lsb_release
-      command,
-    * the version number parsed from the "<version_id>" field of the first line
-      of the distro release file,
-    * the version number parsed from the "PRETTY_NAME" attribute of the
-      os-release file, if it follows the format of the distro release files.
-    * the version number parsed from the "Description" attribute returned by
-      the lsb_release command, if it follows the format of the distro release
-      files.
-    """
-    return _distro.version(pretty, best)
-
-
-def version_parts(best=False):
-    # type: (bool) -> Tuple[str, str, str]
-    """
-    Return the version of the current OS distribution as a tuple
-    ``(major, minor, build_number)`` with items as follows:
-
-    * ``major``:  The result of :func:`distro.major_version`.
-
-    * ``minor``:  The result of :func:`distro.minor_version`.
-
-    * ``build_number``:  The result of :func:`distro.build_number`.
-
-    For a description of the *best* parameter, see the :func:`distro.version`
-    method.
-    """
-    return _distro.version_parts(best)
-
-
-def major_version(best=False):
-    # type: (bool) -> str
-    """
-    Return the major version of the current OS distribution, as a string,
-    if provided.
-    Otherwise, the empty string is returned. The major version is the first
-    part of the dot-separated version string.
-
-    For a description of the *best* parameter, see the :func:`distro.version`
-    method.
-    """
-    return _distro.major_version(best)
-
-
-def minor_version(best=False):
-    # type: (bool) -> str
-    """
-    Return the minor version of the current OS distribution, as a string,
-    if provided.
-    Otherwise, the empty string is returned. The minor version is the second
-    part of the dot-separated version string.
-
-    For a description of the *best* parameter, see the :func:`distro.version`
-    method.
-    """
-    return _distro.minor_version(best)
-
-
-def build_number(best=False):
-    # type: (bool) -> str
-    """
-    Return the build number of the current OS distribution, as a string,
-    if provided.
-    Otherwise, the empty string is returned. The build number is the third part
-    of the dot-separated version string.
-
-    For a description of the *best* parameter, see the :func:`distro.version`
-    method.
-    """
-    return _distro.build_number(best)
-
-
-def like():
-    # type: () -> str
-    """
-    Return a space-separated list of distro IDs of distributions that are
-    closely related to the current OS distribution in regards to packaging
-    and programming interfaces, for example distributions the current
-    distribution is a derivative from.
-
-    **Lookup hierarchy:**
-
-    This information item is only provided by the os-release file.
-    For details, see the description of the "ID_LIKE" attribute in the
-    `os-release man page
-    <http://www.freedesktop.org/software/systemd/man/os-release.html>`_.
-    """
-    return _distro.like()
-
-
-def codename():
-    # type: () -> str
-    """
-    Return the codename for the release of the current OS distribution,
-    as a string.
-
-    If the distribution does not have a codename, an empty string is returned.
-
-    Note that the returned codename is not always really a codename. For
-    example, openSUSE returns "x86_64". This function does not handle such
-    cases in any special way and just returns the string it finds, if any.
-
-    **Lookup hierarchy:**
-
-    * the codename within the "VERSION" attribute of the os-release file, if
-      provided,
-
-    * the value of the "Codename" attribute returned by the lsb_release
-      command,
-
-    * the value of the "<codename>" field of the distro release file.
-    """
-    return _distro.codename()
-
-
-def info(pretty=False, best=False):
-    # type: (bool, bool) -> InfoDict
-    """
-    Return certain machine-readable information items about the current OS
-    distribution in a dictionary, as shown in the following example:
-
-    .. sourcecode:: python
-
-        {
-            'id': 'rhel',
-            'version': '7.0',
-            'version_parts': {
-                'major': '7',
-                'minor': '0',
-                'build_number': ''
-            },
-            'like': 'fedora',
-            'codename': 'Maipo'
-        }
-
-    The dictionary structure and keys are always the same, regardless of which
-    information items are available in the underlying data sources. The values
-    for the various keys are as follows:
-
-    * ``id``:  The result of :func:`distro.id`.
-
-    * ``version``:  The result of :func:`distro.version`.
-
-    * ``version_parts -> major``:  The result of :func:`distro.major_version`.
-
-    * ``version_parts -> minor``:  The result of :func:`distro.minor_version`.
-
-    * ``version_parts -> build_number``:  The result of
-      :func:`distro.build_number`.
-
-    * ``like``:  The result of :func:`distro.like`.
-
-    * ``codename``:  The result of :func:`distro.codename`.
-
-    For a description of the *pretty* and *best* parameters, see the
-    :func:`distro.version` method.
-    """
-    return _distro.info(pretty, best)
-
-
-def os_release_info():
-    # type: () -> Dict[str, str]
-    """
-    Return a dictionary containing key-value pairs for the information items
-    from the os-release file data source of the current OS distribution.
-
-    See `os-release file`_ for details about these information items.
-    """
-    return _distro.os_release_info()
-
-
-def lsb_release_info():
-    # type: () -> Dict[str, str]
-    """
-    Return a dictionary containing key-value pairs for the information items
-    from the lsb_release command data source of the current OS distribution.
-
-    See `lsb_release command output`_ for details about these information
-    items.
-    """
-    return _distro.lsb_release_info()
-
-
-def distro_release_info():
-    # type: () -> Dict[str, str]
-    """
-    Return a dictionary containing key-value pairs for the information items
-    from the distro release file data source of the current OS distribution.
-
-    See `distro release file`_ for details about these information items.
-    """
-    return _distro.distro_release_info()
-
-
-def uname_info():
-    # type: () -> Dict[str, str]
-    """
-    Return a dictionary containing key-value pairs for the information items
-    from the distro release file data source of the current OS distribution.
-    """
-    return _distro.uname_info()
-
-
-def os_release_attr(attribute):
-    # type: (str) -> str
-    """
-    Return a single named information item from the os-release file data source
-    of the current OS distribution.
-
-    Parameters:
-
-    * ``attribute`` (string): Key of the information item.
-
-    Returns:
-
-    * (string): Value of the information item, if the item exists.
-      The empty string, if the item does not exist.
-
-    See `os-release file`_ for details about these information items.
-    """
-    return _distro.os_release_attr(attribute)
-
-
-def lsb_release_attr(attribute):
-    # type: (str) -> str
-    """
-    Return a single named information item from the lsb_release command output
-    data source of the current OS distribution.
-
-    Parameters:
-
-    * ``attribute`` (string): Key of the information item.
-
-    Returns:
-
-    * (string): Value of the information item, if the item exists.
-      The empty string, if the item does not exist.
-
-    See `lsb_release command output`_ for details about these information
-    items.
-    """
-    return _distro.lsb_release_attr(attribute)
-
-
-def distro_release_attr(attribute):
-    # type: (str) -> str
-    """
-    Return a single named information item from the distro release file
-    data source of the current OS distribution.
-
-    Parameters:
-
-    * ``attribute`` (string): Key of the information item.
-
-    Returns:
-
-    * (string): Value of the information item, if the item exists.
-      The empty string, if the item does not exist.
-
-    See `distro release file`_ for details about these information items.
-    """
-    return _distro.distro_release_attr(attribute)
-
-
-def uname_attr(attribute):
-    # type: (str) -> str
-    """
-    Return a single named information item from the distro release file
-    data source of the current OS distribution.
-
-    Parameters:
-
-    * ``attribute`` (string): Key of the information item.
-
-    Returns:
-
-    * (string): Value of the information item, if the item exists.
-                The empty string, if the item does not exist.
-    """
-    return _distro.uname_attr(attribute)
-
-
-try:
-    from functools import cached_property
-except ImportError:
-    # Python < 3.8
-    class cached_property(object):  # type: ignore
-        """A version of @property which caches the value.  On access, it calls the
-        underlying function and sets the value in `__dict__` so future accesses
-        will not re-call the property.
-        """
-
-        def __init__(self, f):
-            # type: (Callable[[Any], Any]) -> None
-            self._fname = f.__name__
-            self._f = f
-
-        def __get__(self, obj, owner):
-            # type: (Any, Type[Any]) -> Any
-            assert obj is not None, "call {} on an instance".format(self._fname)
-            ret = obj.__dict__[self._fname] = self._f(obj)
-            return ret
-
-
-class LinuxDistribution(object):
-    """
-    Provides information about a OS distribution.
-
-    This package creates a private module-global instance of this class with
-    default initialization arguments, that is used by the
-    `consolidated accessor functions`_ and `single source accessor functions`_.
-    By using default initialization arguments, that module-global instance
-    returns data about the current OS distribution (i.e. the distro this
-    package runs on).
-
-    Normally, it is not necessary to create additional instances of this class.
-    However, in situations where control is needed over the exact data sources
-    that are used, instances of this class can be created with a specific
-    distro release file, or a specific os-release file, or without invoking the
-    lsb_release command.
-    """
-
-    def __init__(
-        self,
-        include_lsb=True,
-        os_release_file="",
-        distro_release_file="",
-        include_uname=True,
-        root_dir=None,
-    ):
-        # type: (bool, str, str, bool, Optional[str]) -> None
-        """
-        The initialization method of this class gathers information from the
-        available data sources, and stores that in private instance attributes.
-        Subsequent access to the information items uses these private instance
-        attributes, so that the data sources are read only once.
-
-        Parameters:
-
-        * ``include_lsb`` (bool): Controls whether the
-          `lsb_release command output`_ is included as a data source.
-
-          If the lsb_release command is not available in the program execution
-          path, the data source for the lsb_release command will be empty.
-
-        * ``os_release_file`` (string): The path name of the
-          `os-release file`_ that is to be used as a data source.
-
-          An empty string (the default) will cause the default path name to
-          be used (see `os-release file`_ for details).
-
-          If the specified or defaulted os-release file does not exist, the
-          data source for the os-release file will be empty.
-
-        * ``distro_release_file`` (string): The path name of the
-          `distro release file`_ that is to be used as a data source.
-
-          An empty string (the default) will cause a default search algorithm
-          to be used (see `distro release file`_ for details).
-
-          If the specified distro release file does not exist, or if no default
-          distro release file can be found, the data source for the distro
-          release file will be empty.
-
-        * ``include_uname`` (bool): Controls whether uname command output is
-          included as a data source. If the uname command is not available in
-          the program execution path the data source for the uname command will
-          be empty.
-
-        * ``root_dir`` (string): The absolute path to the root directory to use
-          to find distro-related information files.
-
-        Public instance attributes:
-
-        * ``os_release_file`` (string): The path name of the
-          `os-release file`_ that is actually used as a data source. The
-          empty string if no distro release file is used as a data source.
-
-        * ``distro_release_file`` (string): The path name of the
-          `distro release file`_ that is actually used as a data source. The
-          empty string if no distro release file is used as a data source.
-
-        * ``include_lsb`` (bool): The result of the ``include_lsb`` parameter.
-          This controls whether the lsb information will be loaded.
-
-        * ``include_uname`` (bool): The result of the ``include_uname``
-          parameter. This controls whether the uname information will
-          be loaded.
-
-        Raises:
-
-        * :py:exc:`IOError`: Some I/O issue with an os-release file or distro
-          release file.
-
-        * :py:exc:`subprocess.CalledProcessError`: The lsb_release command had
-          some issue (other than not being available in the program execution
-          path).
-
-        * :py:exc:`UnicodeError`: A data source has unexpected characters or
-          uses an unexpected encoding.
-        """
-        self.root_dir = root_dir
-        self.etc_dir = os.path.join(root_dir, "etc") if root_dir else _UNIXCONFDIR
-        self.usr_lib_dir = (
-            os.path.join(root_dir, "usr/lib") if root_dir else _UNIXUSRLIBDIR
-        )
-
-        if os_release_file:
-            self.os_release_file = os_release_file
-        else:
-            etc_dir_os_release_file = os.path.join(self.etc_dir, _OS_RELEASE_BASENAME)
-            usr_lib_os_release_file = os.path.join(
-                self.usr_lib_dir, _OS_RELEASE_BASENAME
-            )
-
-            # NOTE: The idea is to respect order **and** have it set
-            #       at all times for API backwards compatibility.
-            if os.path.isfile(etc_dir_os_release_file) or not os.path.isfile(
-                usr_lib_os_release_file
-            ):
-                self.os_release_file = etc_dir_os_release_file
-            else:
-                self.os_release_file = usr_lib_os_release_file
-
-        self.distro_release_file = distro_release_file or ""  # updated later
-        self.include_lsb = include_lsb
-        self.include_uname = include_uname
-
-    def __repr__(self):
-        # type: () -> str
-        """Return repr of all info"""
-        return (
-            "LinuxDistribution("
-            "os_release_file={self.os_release_file!r}, "
-            "distro_release_file={self.distro_release_file!r}, "
-            "include_lsb={self.include_lsb!r}, "
-            "include_uname={self.include_uname!r}, "
-            "_os_release_info={self._os_release_info!r}, "
-            "_lsb_release_info={self._lsb_release_info!r}, "
-            "_distro_release_info={self._distro_release_info!r}, "
-            "_uname_info={self._uname_info!r})".format(self=self)
-        )
-
-    def linux_distribution(self, full_distribution_name=True):
-        # type: (bool) -> Tuple[str, str, str]
-        """
-        Return information about the OS distribution that is compatible
-        with Python's :func:`platform.linux_distribution`, supporting a subset
-        of its parameters.
-
-        For details, see :func:`distro.linux_distribution`.
-        """
-        return (
-            self.name() if full_distribution_name else self.id(),
-            self.version(),
-            self.codename(),
-        )
-
-    def id(self):
-        # type: () -> str
-        """Return the distro ID of the OS distribution, as a string.
-
-        For details, see :func:`distro.id`.
-        """
-
-        def normalize(distro_id, table):
-            # type: (str, Dict[str, str]) -> str
-            distro_id = distro_id.lower().replace(" ", "_")
-            return table.get(distro_id, distro_id)
-
-        distro_id = self.os_release_attr("id")
-        if distro_id:
-            return normalize(distro_id, NORMALIZED_OS_ID)
-
-        distro_id = self.lsb_release_attr("distributor_id")
-        if distro_id:
-            return normalize(distro_id, NORMALIZED_LSB_ID)
-
-        distro_id = self.distro_release_attr("id")
-        if distro_id:
-            return normalize(distro_id, NORMALIZED_DISTRO_ID)
-
-        distro_id = self.uname_attr("id")
-        if distro_id:
-            return normalize(distro_id, NORMALIZED_DISTRO_ID)
-
-        return ""
-
-    def name(self, pretty=False):
-        # type: (bool) -> str
-        """
-        Return the name of the OS distribution, as a string.
-
-        For details, see :func:`distro.name`.
-        """
-        name = (
-            self.os_release_attr("name")
-            or self.lsb_release_attr("distributor_id")
-            or self.distro_release_attr("name")
-            or self.uname_attr("name")
-        )
-        if pretty:
-            name = self.os_release_attr("pretty_name") or self.lsb_release_attr(
-                "description"
-            )
-            if not name:
-                name = self.distro_release_attr("name") or self.uname_attr("name")
-                version = self.version(pretty=True)
-                if version:
-                    name = name + " " + version
-        return name or ""
-
-    def version(self, pretty=False, best=False):
-        # type: (bool, bool) -> str
-        """
-        Return the version of the OS distribution, as a string.
-
-        For details, see :func:`distro.version`.
-        """
-        versions = [
-            self.os_release_attr("version_id"),
-            self.lsb_release_attr("release"),
-            self.distro_release_attr("version_id"),
-            self._parse_distro_release_content(self.os_release_attr("pretty_name")).get(
-                "version_id", ""
-            ),
-            self._parse_distro_release_content(
-                self.lsb_release_attr("description")
-            ).get("version_id", ""),
-            self.uname_attr("release"),
-        ]
-        version = ""
-        if best:
-            # This algorithm uses the last version in priority order that has
-            # the best precision. If the versions are not in conflict, that
-            # does not matter; otherwise, using the last one instead of the
-            # first one might be considered a surprise.
-            for v in versions:
-                if v.count(".") > version.count(".") or version == "":
-                    version = v
-        else:
-            for v in versions:
-                if v != "":
-                    version = v
-                    break
-        if pretty and version and self.codename():
-            version = "{0} ({1})".format(version, self.codename())
-        return version
-
-    def version_parts(self, best=False):
-        # type: (bool) -> Tuple[str, str, str]
-        """
-        Return the version of the OS distribution, as a tuple of version
-        numbers.
-
-        For details, see :func:`distro.version_parts`.
-        """
-        version_str = self.version(best=best)
-        if version_str:
-            version_regex = re.compile(r"(\d+)\.?(\d+)?\.?(\d+)?")
-            matches = version_regex.match(version_str)
-            if matches:
-                major, minor, build_number = matches.groups()
-                return major, minor or "", build_number or ""
-        return "", "", ""
-
-    def major_version(self, best=False):
-        # type: (bool) -> str
-        """
-        Return the major version number of the current distribution.
-
-        For details, see :func:`distro.major_version`.
-        """
-        return self.version_parts(best)[0]
-
-    def minor_version(self, best=False):
-        # type: (bool) -> str
-        """
-        Return the minor version number of the current distribution.
-
-        For details, see :func:`distro.minor_version`.
-        """
-        return self.version_parts(best)[1]
-
-    def build_number(self, best=False):
-        # type: (bool) -> str
-        """
-        Return the build number of the current distribution.
-
-        For details, see :func:`distro.build_number`.
-        """
-        return self.version_parts(best)[2]
-
-    def like(self):
-        # type: () -> str
-        """
-        Return the IDs of distributions that are like the OS distribution.
-
-        For details, see :func:`distro.like`.
-        """
-        return self.os_release_attr("id_like") or ""
-
-    def codename(self):
-        # type: () -> str
-        """
-        Return the codename of the OS distribution.
-
-        For details, see :func:`distro.codename`.
-        """
-        try:
-            # Handle os_release specially since distros might purposefully set
-            # this to empty string to have no codename
-            return self._os_release_info["codename"]
-        except KeyError:
-            return (
-                self.lsb_release_attr("codename")
-                or self.distro_release_attr("codename")
-                or ""
-            )
-
-    def info(self, pretty=False, best=False):
-        # type: (bool, bool) -> InfoDict
-        """
-        Return certain machine-readable information about the OS
-        distribution.
-
-        For details, see :func:`distro.info`.
-        """
-        return dict(
-            id=self.id(),
-            version=self.version(pretty, best),
-            version_parts=dict(
-                major=self.major_version(best),
-                minor=self.minor_version(best),
-                build_number=self.build_number(best),
-            ),
-            like=self.like(),
-            codename=self.codename(),
-        )
-
-    def os_release_info(self):
-        # type: () -> Dict[str, str]
-        """
-        Return a dictionary containing key-value pairs for the information
-        items from the os-release file data source of the OS distribution.
-
-        For details, see :func:`distro.os_release_info`.
-        """
-        return self._os_release_info
-
-    def lsb_release_info(self):
-        # type: () -> Dict[str, str]
-        """
-        Return a dictionary containing key-value pairs for the information
-        items from the lsb_release command data source of the OS
-        distribution.
-
-        For details, see :func:`distro.lsb_release_info`.
-        """
-        return self._lsb_release_info
-
-    def distro_release_info(self):
-        # type: () -> Dict[str, str]
-        """
-        Return a dictionary containing key-value pairs for the information
-        items from the distro release file data source of the OS
-        distribution.
-
-        For details, see :func:`distro.distro_release_info`.
-        """
-        return self._distro_release_info
-
-    def uname_info(self):
-        # type: () -> Dict[str, str]
-        """
-        Return a dictionary containing key-value pairs for the information
-        items from the uname command data source of the OS distribution.
-
-        For details, see :func:`distro.uname_info`.
-        """
-        return self._uname_info
-
-    def os_release_attr(self, attribute):
-        # type: (str) -> str
-        """
-        Return a single named information item from the os-release file data
-        source of the OS distribution.
-
-        For details, see :func:`distro.os_release_attr`.
-        """
-        return self._os_release_info.get(attribute, "")
-
-    def lsb_release_attr(self, attribute):
-        # type: (str) -> str
-        """
-        Return a single named information item from the lsb_release command
-        output data source of the OS distribution.
-
-        For details, see :func:`distro.lsb_release_attr`.
-        """
-        return self._lsb_release_info.get(attribute, "")
-
-    def distro_release_attr(self, attribute):
-        # type: (str) -> str
-        """
-        Return a single named information item from the distro release file
-        data source of the OS distribution.
-
-        For details, see :func:`distro.distro_release_attr`.
-        """
-        return self._distro_release_info.get(attribute, "")
-
-    def uname_attr(self, attribute):
-        # type: (str) -> str
-        """
-        Return a single named information item from the uname command
-        output data source of the OS distribution.
-
-        For details, see :func:`distro.uname_attr`.
-        """
-        return self._uname_info.get(attribute, "")
-
-    @cached_property
-    def _os_release_info(self):
-        # type: () -> Dict[str, str]
-        """
-        Get the information items from the specified os-release file.
-
-        Returns:
-            A dictionary containing all information items.
-        """
-        if os.path.isfile(self.os_release_file):
-            with open(self.os_release_file) as release_file:
-                return self._parse_os_release_content(release_file)
-        return {}
-
-    @staticmethod
-    def _parse_os_release_content(lines):
-        # type: (TextIO) -> Dict[str, str]
-        """
-        Parse the lines of an os-release file.
-
-        Parameters:
-
-        * lines: Iterable through the lines in the os-release file.
-                 Each line must be a unicode string or a UTF-8 encoded byte
-                 string.
-
-        Returns:
-            A dictionary containing all information items.
-        """
-        props = {}
-        lexer = shlex.shlex(lines, posix=True)
-        lexer.whitespace_split = True
-
-        # The shlex module defines its `wordchars` variable using literals,
-        # making it dependent on the encoding of the Python source file.
-        # In Python 2.6 and 2.7, the shlex source file is encoded in
-        # 'iso-8859-1', and the `wordchars` variable is defined as a byte
-        # string. This causes a UnicodeDecodeError to be raised when the
-        # parsed content is a unicode object. The following fix resolves that
-        # (... but it should be fixed in shlex...):
-        if sys.version_info[0] == 2 and isinstance(lexer.wordchars, bytes):
-            lexer.wordchars = lexer.wordchars.decode("iso-8859-1")
-
-        tokens = list(lexer)
-        for token in tokens:
-            # At this point, all shell-like parsing has been done (i.e.
-            # comments processed, quotes and backslash escape sequences
-            # processed, multi-line values assembled, trailing newlines
-            # stripped, etc.), so the tokens are now either:
-            # * variable assignments: var=value
-            # * commands or their arguments (not allowed in os-release)
-            if "=" in token:
-                k, v = token.split("=", 1)
-                props[k.lower()] = v
-            else:
-                # Ignore any tokens that are not variable assignments
-                pass
-
-        if "version_codename" in props:
-            # os-release added a version_codename field.  Use that in
-            # preference to anything else Note that some distros purposefully
-            # do not have code names.  They should be setting
-            # version_codename=""
-            props["codename"] = props["version_codename"]
-        elif "ubuntu_codename" in props:
-            # Same as above but a non-standard field name used on older Ubuntus
-            props["codename"] = props["ubuntu_codename"]
-        elif "version" in props:
-            # If there is no version_codename, parse it from the version
-            match = re.search(r"(\(\D+\))|,(\s+)?\D+", props["version"])
-            if match:
-                codename = match.group()
-                codename = codename.strip("()")
-                codename = codename.strip(",")
-                codename = codename.strip()
-                # codename appears within paranthese.
-                props["codename"] = codename
-
-        return props
-
-    @cached_property
-    def _lsb_release_info(self):
-        # type: () -> Dict[str, str]
-        """
-        Get the information items from the lsb_release command output.
-
-        Returns:
-            A dictionary containing all information items.
-        """
-        if not self.include_lsb:
-            return {}
-        with open(os.devnull, "wb") as devnull:
-            try:
-                cmd = ("lsb_release", "-a")
-                stdout = subprocess.check_output(cmd, stderr=devnull)
-            # Command not found or lsb_release returned error
-            except (OSError, subprocess.CalledProcessError):
-                return {}
-        content = self._to_str(stdout).splitlines()
-        return self._parse_lsb_release_content(content)
-
-    @staticmethod
-    def _parse_lsb_release_content(lines):
-        # type: (Iterable[str]) -> Dict[str, str]
-        """
-        Parse the output of the lsb_release command.
-
-        Parameters:
-
-        * lines: Iterable through the lines of the lsb_release output.
-                 Each line must be a unicode string or a UTF-8 encoded byte
-                 string.
-
-        Returns:
-            A dictionary containing all information items.
-        """
-        props = {}
-        for line in lines:
-            kv = line.strip("\n").split(":", 1)
-            if len(kv) != 2:
-                # Ignore lines without colon.
-                continue
-            k, v = kv
-            props.update({k.replace(" ", "_").lower(): v.strip()})
-        return props
-
-    @cached_property
-    def _uname_info(self):
-        # type: () -> Dict[str, str]
-        with open(os.devnull, "wb") as devnull:
-            try:
-                cmd = ("uname", "-rs")
-                stdout = subprocess.check_output(cmd, stderr=devnull)
-            except OSError:
-                return {}
-        content = self._to_str(stdout).splitlines()
-        return self._parse_uname_content(content)
-
-    @staticmethod
-    def _parse_uname_content(lines):
-        # type: (Sequence[str]) -> Dict[str, str]
-        props = {}
-        match = re.search(r"^([^\s]+)\s+([\d\.]+)", lines[0].strip())
-        if match:
-            name, version = match.groups()
-
-            # This is to prevent the Linux kernel version from
-            # appearing as the 'best' version on otherwise
-            # identifiable distributions.
-            if name == "Linux":
-                return {}
-            props["id"] = name.lower()
-            props["name"] = name
-            props["release"] = version
-        return props
-
-    @staticmethod
-    def _to_str(text):
-        # type: (Union[bytes, str]) -> str
-        encoding = sys.getfilesystemencoding()
-        encoding = "utf-8" if encoding == "ascii" else encoding
-
-        if sys.version_info[0] >= 3:
-            if isinstance(text, bytes):
-                return text.decode(encoding)
-        else:
-            if isinstance(text, unicode):  # noqa
-                return text.encode(encoding)
-
-        return text
-
-    @cached_property
-    def _distro_release_info(self):
-        # type: () -> Dict[str, str]
-        """
-        Get the information items from the specified distro release file.
-
-        Returns:
-            A dictionary containing all information items.
-        """
-        if self.distro_release_file:
-            # If it was specified, we use it and parse what we can, even if
-            # its file name or content does not match the expected pattern.
-            distro_info = self._parse_distro_release_file(self.distro_release_file)
-            basename = os.path.basename(self.distro_release_file)
-            # The file name pattern for user-specified distro release files
-            # is somewhat more tolerant (compared to when searching for the
-            # file), because we want to use what was specified as best as
-            # possible.
-            match = _DISTRO_RELEASE_BASENAME_PATTERN.match(basename)
-            if "name" in distro_info and "cloudlinux" in distro_info["name"].lower():
-                distro_info["id"] = "cloudlinux"
-            elif match:
-                distro_info["id"] = match.group(1)
-            return distro_info
-        else:
-            try:
-                basenames = os.listdir(self.etc_dir)
-                # We sort for repeatability in cases where there are multiple
-                # distro specific files; e.g. CentOS, Oracle, Enterprise all
-                # containing `redhat-release` on top of their own.
-                basenames.sort()
-            except OSError:
-                # This may occur when /etc is not readable but we can't be
-                # sure about the *-release files. Check common entries of
-                # /etc for information. If they turn out to not be there the
-                # error is handled in `_parse_distro_release_file()`.
-                basenames = [
-                    "SuSE-release",
-                    "arch-release",
-                    "base-release",
-                    "centos-release",
-                    "fedora-release",
-                    "gentoo-release",
-                    "mageia-release",
-                    "mandrake-release",
-                    "mandriva-release",
-                    "mandrivalinux-release",
-                    "manjaro-release",
-                    "oracle-release",
-                    "redhat-release",
-                    "sl-release",
-                    "slackware-version",
-                ]
-            for basename in basenames:
-                if basename in _DISTRO_RELEASE_IGNORE_BASENAMES:
-                    continue
-                match = _DISTRO_RELEASE_BASENAME_PATTERN.match(basename)
-                if match:
-                    filepath = os.path.join(self.etc_dir, basename)
-                    distro_info = self._parse_distro_release_file(filepath)
-                    if "name" in distro_info:
-                        # The name is always present if the pattern matches
-                        self.distro_release_file = filepath
-                        distro_info["id"] = match.group(1)
-                        if "cloudlinux" in distro_info["name"].lower():
-                            distro_info["id"] = "cloudlinux"
-                        return distro_info
-            return {}
-
-    def _parse_distro_release_file(self, filepath):
-        # type: (str) -> Dict[str, str]
-        """
-        Parse a distro release file.
-
-        Parameters:
-
-        * filepath: Path name of the distro release file.
-
-        Returns:
-            A dictionary containing all information items.
-        """
-        try:
-            with open(filepath) as fp:
-                # Only parse the first line. For instance, on SLES there
-                # are multiple lines. We don't want them...
-                return self._parse_distro_release_content(fp.readline())
-        except (OSError, IOError):
-            # Ignore not being able to read a specific, seemingly version
-            # related file.
-            # See https://github.com/python-distro/distro/issues/162
-            return {}
-
-    @staticmethod
-    def _parse_distro_release_content(line):
-        # type: (str) -> Dict[str, str]
-        """
-        Parse a line from a distro release file.
-
-        Parameters:
-        * line: Line from the distro release file. Must be a unicode string
-                or a UTF-8 encoded byte string.
-
-        Returns:
-            A dictionary containing all information items.
-        """
-        matches = _DISTRO_RELEASE_CONTENT_REVERSED_PATTERN.match(line.strip()[::-1])
-        distro_info = {}
-        if matches:
-            # regexp ensures non-None
-            distro_info["name"] = matches.group(3)[::-1]
-            if matches.group(2):
-                distro_info["version_id"] = matches.group(2)[::-1]
-            if matches.group(1):
-                distro_info["codename"] = matches.group(1)[::-1]
-        elif line:
-            distro_info["name"] = line.strip()
-        return distro_info
-
-
-_distro = LinuxDistribution()
-
-
-def main():
-    # type: () -> None
-    logger = logging.getLogger(__name__)
-    logger.setLevel(logging.DEBUG)
-    logger.addHandler(logging.StreamHandler(sys.stdout))
-
-    parser = argparse.ArgumentParser(description="OS distro info tool")
-    parser.add_argument(
-        "--json", "-j", help="Output in machine readable format", action="store_true"
-    )
-
-    parser.add_argument(
-        "--root-dir",
-        "-r",
-        type=str,
-        dest="root_dir",
-        help="Path to the root filesystem directory (defaults to /)",
-    )
-
-    args = parser.parse_args()
-
-    if args.root_dir:
-        dist = LinuxDistribution(
-            include_lsb=False, include_uname=False, root_dir=args.root_dir
-        )
-    else:
-        dist = _distro
-
-    if args.json:
-        logger.info(json.dumps(dist.info(), indent=4, sort_keys=True))
-    else:
-        logger.info("Name: %s", dist.name(pretty=True))
-        distribution_version = dist.version(pretty=True)
-        logger.info("Version: %s", distribution_version)
-        distribution_codename = dist.codename()
-        logger.info("Codename: %s", distribution_codename)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/lib/distro/__init__.py b/lib/distro/__init__.py
deleted file mode 100644
index 7686fe85..00000000
--- a/lib/distro/__init__.py
+++ /dev/null
@@ -1,54 +0,0 @@
-from .distro import (
-    NORMALIZED_DISTRO_ID,
-    NORMALIZED_LSB_ID,
-    NORMALIZED_OS_ID,
-    LinuxDistribution,
-    __version__,
-    build_number,
-    codename,
-    distro_release_attr,
-    distro_release_info,
-    id,
-    info,
-    like,
-    linux_distribution,
-    lsb_release_attr,
-    lsb_release_info,
-    major_version,
-    minor_version,
-    name,
-    os_release_attr,
-    os_release_info,
-    uname_attr,
-    uname_info,
-    version,
-    version_parts,
-)
-
-__all__ = [
-    "NORMALIZED_DISTRO_ID",
-    "NORMALIZED_LSB_ID",
-    "NORMALIZED_OS_ID",
-    "LinuxDistribution",
-    "build_number",
-    "codename",
-    "distro_release_attr",
-    "distro_release_info",
-    "id",
-    "info",
-    "like",
-    "linux_distribution",
-    "lsb_release_attr",
-    "lsb_release_info",
-    "major_version",
-    "minor_version",
-    "name",
-    "os_release_attr",
-    "os_release_info",
-    "uname_attr",
-    "uname_info",
-    "version",
-    "version_parts",
-]
-
-__version__ = __version__
diff --git a/lib/distro/__main__.py b/lib/distro/__main__.py
deleted file mode 100644
index 0c01d5b0..00000000
--- a/lib/distro/__main__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from .distro import main
-
-if __name__ == "__main__":
-    main()
diff --git a/lib/distro/distro.py b/lib/distro/distro.py
deleted file mode 100644
index 78ccdfa4..00000000
--- a/lib/distro/distro.py
+++ /dev/null
@@ -1,1403 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2015-2021 Nir Cohen
-#
-# 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.
-
-"""
-The ``distro`` package (``distro`` stands for Linux Distribution) provides
-information about the Linux distribution it runs on, such as a reliable
-machine-readable distro ID, or version information.
-
-It is the recommended replacement for Python's original
-:py:func:`platform.linux_distribution` function, but it provides much more
-functionality. An alternative implementation became necessary because Python
-3.5 deprecated this function, and Python 3.8 removed it altogether. Its
-predecessor function :py:func:`platform.dist` was already deprecated since
-Python 2.6 and removed in Python 3.8. Still, there are many cases in which
-access to OS distribution information is needed. See `Python issue 1322
-<https://bugs.python.org/issue1322>`_ for more information.
-"""
-
-import argparse
-import json
-import logging
-import os
-import re
-import shlex
-import subprocess
-import sys
-import warnings
-from typing import (
-    Any,
-    Callable,
-    Dict,
-    Iterable,
-    Optional,
-    Sequence,
-    TextIO,
-    Tuple,
-    Type,
-)
-
-try:
-    from typing import TypedDict
-except ImportError:
-    # Python 3.7
-    TypedDict = dict
-
-__version__ = "1.9.0"
-
-
-class VersionDict(TypedDict):
-    major: str
-    minor: str
-    build_number: str
-
-
-class InfoDict(TypedDict):
-    id: str
-    version: str
-    version_parts: VersionDict
-    like: str
-    codename: str
-
-
-_UNIXCONFDIR = os.environ.get("UNIXCONFDIR", "/etc")
-_UNIXUSRLIBDIR = os.environ.get("UNIXUSRLIBDIR", "/usr/lib")
-_OS_RELEASE_BASENAME = "os-release"
-
-#: Translation table for normalizing the "ID" attribute defined in os-release
-#: files, for use by the :func:`distro.id` method.
-#:
-#: * Key: Value as defined in the os-release file, translated to lower case,
-#:   with blanks translated to underscores.
-#:
-#: * Value: Normalized value.
-NORMALIZED_OS_ID = {
-    "ol": "oracle",  # Oracle Linux
-    "opensuse-leap": "opensuse",  # Newer versions of OpenSuSE report as opensuse-leap
-}
-
-#: Translation table for normalizing the "Distributor ID" attribute returned by
-#: the lsb_release command, for use by the :func:`distro.id` method.
-#:
-#: * Key: Value as returned by the lsb_release command, translated to lower
-#:   case, with blanks translated to underscores.
-#:
-#: * Value: Normalized value.
-NORMALIZED_LSB_ID = {
-    "enterpriseenterpriseas": "oracle",  # Oracle Enterprise Linux 4
-    "enterpriseenterpriseserver": "oracle",  # Oracle Linux 5
-    "redhatenterpriseworkstation": "rhel",  # RHEL 6, 7 Workstation
-    "redhatenterpriseserver": "rhel",  # RHEL 6, 7 Server
-    "redhatenterprisecomputenode": "rhel",  # RHEL 6 ComputeNode
-}
-
-#: Translation table for normalizing the distro ID derived from the file name
-#: of distro release files, for use by the :func:`distro.id` method.
-#:
-#: * Key: Value as derived from the file name of a distro release file,
-#:   translated to lower case, with blanks translated to underscores.
-#:
-#: * Value: Normalized value.
-NORMALIZED_DISTRO_ID = {
-    "redhat": "rhel",  # RHEL 6.x, 7.x
-}
-
-# Pattern for content of distro release file (reversed)
-_DISTRO_RELEASE_CONTENT_REVERSED_PATTERN = re.compile(
-    r"(?:[^)]*\)(.*)\()? *(?:STL )?([\d.+\-a-z]*\d) *(?:esaeler *)?(.+)"
-)
-
-# Pattern for base file name of distro release file
-_DISTRO_RELEASE_BASENAME_PATTERN = re.compile(r"(\w+)[-_](release|version)$")
-
-# Base file names to be looked up for if _UNIXCONFDIR is not readable.
-_DISTRO_RELEASE_BASENAMES = [
-    "SuSE-release",
-    "altlinux-release",
-    "arch-release",
-    "base-release",
-    "centos-release",
-    "fedora-release",
-    "gentoo-release",
-    "mageia-release",
-    "mandrake-release",
-    "mandriva-release",
-    "mandrivalinux-release",
-    "manjaro-release",
-    "oracle-release",
-    "redhat-release",
-    "rocky-release",
-    "sl-release",
-    "slackware-version",
-]
-
-# Base file names to be ignored when searching for distro release file
-_DISTRO_RELEASE_IGNORE_BASENAMES = (
-    "debian_version",
-    "lsb-release",
-    "oem-release",
-    _OS_RELEASE_BASENAME,
-    "system-release",
-    "plesk-release",
-    "iredmail-release",
-    "board-release",
-    "ec2_version",
-)
-
-
-def linux_distribution(full_distribution_name: bool = True) -> Tuple[str, str, str]:
-    """
-    .. deprecated:: 1.6.0
-
-        :func:`distro.linux_distribution()` is deprecated. It should only be
-        used as a compatibility shim with Python's
-        :py:func:`platform.linux_distribution()`. Please use :func:`distro.id`,
-        :func:`distro.version` and :func:`distro.name` instead.
-
-    Return information about the current OS distribution as a tuple
-    ``(id_name, version, codename)`` with items as follows:
-
-    * ``id_name``:  If *full_distribution_name* is false, the result of
-      :func:`distro.id`. Otherwise, the result of :func:`distro.name`.
-
-    * ``version``:  The result of :func:`distro.version`.
-
-    * ``codename``:  The extra item (usually in parentheses) after the
-      os-release version number, or the result of :func:`distro.codename`.
-
-    The interface of this function is compatible with the original
-    :py:func:`platform.linux_distribution` function, supporting a subset of
-    its parameters.
-
-    The data it returns may not exactly be the same, because it uses more data
-    sources than the original function, and that may lead to different data if
-    the OS distribution is not consistent across multiple data sources it
-    provides (there are indeed such distributions ...).
-
-    Another reason for differences is the fact that the :func:`distro.id`
-    method normalizes the distro ID string to a reliable machine-readable value
-    for a number of popular OS distributions.
-    """
-    warnings.warn(
-        "distro.linux_distribution() is deprecated. It should only be used as a "
-        "compatibility shim with Python's platform.linux_distribution(). Please use "
-        "distro.id(), distro.version() and distro.name() instead.",
-        DeprecationWarning,
-        stacklevel=2,
-    )
-    return _distro.linux_distribution(full_distribution_name)
-
-
-def id() -> str:
-    """
-    Return the distro ID of the current distribution, as a
-    machine-readable string.
-
-    For a number of OS distributions, the returned distro ID value is
-    *reliable*, in the sense that it is documented and that it does not change
-    across releases of the distribution.
-
-    This package maintains the following reliable distro ID values:
-
-    ==============  =========================================
-    Distro ID       Distribution
-    ==============  =========================================
-    "ubuntu"        Ubuntu
-    "debian"        Debian
-    "rhel"          RedHat Enterprise Linux
-    "centos"        CentOS
-    "fedora"        Fedora
-    "sles"          SUSE Linux Enterprise Server
-    "opensuse"      openSUSE
-    "amzn"          Amazon Linux
-    "arch"          Arch Linux
-    "buildroot"     Buildroot
-    "cloudlinux"    CloudLinux OS
-    "exherbo"       Exherbo Linux
-    "gentoo"        GenToo Linux
-    "ibm_powerkvm"  IBM PowerKVM
-    "kvmibm"        KVM for IBM z Systems
-    "linuxmint"     Linux Mint
-    "mageia"        Mageia
-    "mandriva"      Mandriva Linux
-    "parallels"     Parallels
-    "pidora"        Pidora
-    "raspbian"      Raspbian
-    "oracle"        Oracle Linux (and Oracle Enterprise Linux)
-    "scientific"    Scientific Linux
-    "slackware"     Slackware
-    "xenserver"     XenServer
-    "openbsd"       OpenBSD
-    "netbsd"        NetBSD
-    "freebsd"       FreeBSD
-    "midnightbsd"   MidnightBSD
-    "rocky"         Rocky Linux
-    "aix"           AIX
-    "guix"          Guix System
-    "altlinux"      ALT Linux
-    ==============  =========================================
-
-    If you have a need to get distros for reliable IDs added into this set,
-    or if you find that the :func:`distro.id` function returns a different
-    distro ID for one of the listed distros, please create an issue in the
-    `distro issue tracker`_.
-
-    **Lookup hierarchy and transformations:**
-
-    First, the ID is obtained from the following sources, in the specified
-    order. The first available and non-empty value is used:
-
-    * the value of the "ID" attribute of the os-release file,
-
-    * the value of the "Distributor ID" attribute returned by the lsb_release
-      command,
-
-    * the first part of the file name of the distro release file,
-
-    The so determined ID value then passes the following transformations,
-    before it is returned by this method:
-
-    * it is translated to lower case,
-
-    * blanks (which should not be there anyway) are translated to underscores,
-
-    * a normalization of the ID is performed, based upon
-      `normalization tables`_. The purpose of this normalization is to ensure
-      that the ID is as reliable as possible, even across incompatible changes
-      in the OS distributions. A common reason for an incompatible change is
-      the addition of an os-release file, or the addition of the lsb_release
-      command, with ID values that differ from what was previously determined
-      from the distro release file name.
-    """
-    return _distro.id()
-
-
-def name(pretty: bool = False) -> str:
-    """
-    Return the name of the current OS distribution, as a human-readable
-    string.
-
-    If *pretty* is false, the name is returned without version or codename.
-    (e.g. "CentOS Linux")
-
-    If *pretty* is true, the version and codename are appended.
-    (e.g. "CentOS Linux 7.1.1503 (Core)")
-
-    **Lookup hierarchy:**
-
-    The name is obtained from the following sources, in the specified order.
-    The first available and non-empty value is used:
-
-    * If *pretty* is false:
-
-      - the value of the "NAME" attribute of the os-release file,
-
-      - the value of the "Distributor ID" attribute returned by the lsb_release
-        command,
-
-      - the value of the "<name>" field of the distro release file.
-
-    * If *pretty* is true:
-
-      - the value of the "PRETTY_NAME" attribute of the os-release file,
-
-      - the value of the "Description" attribute returned by the lsb_release
-        command,
-
-      - the value of the "<name>" field of the distro release file, appended
-        with the value of the pretty version ("<version_id>" and "<codename>"
-        fields) of the distro release file, if available.
-    """
-    return _distro.name(pretty)
-
-
-def version(pretty: bool = False, best: bool = False) -> str:
-    """
-    Return the version of the current OS distribution, as a human-readable
-    string.
-
-    If *pretty* is false, the version is returned without codename (e.g.
-    "7.0").
-
-    If *pretty* is true, the codename in parenthesis is appended, if the
-    codename is non-empty (e.g. "7.0 (Maipo)").
-
-    Some distributions provide version numbers with different precisions in
-    the different sources of distribution information. Examining the different
-    sources in a fixed priority order does not always yield the most precise
-    version (e.g. for Debian 8.2, or CentOS 7.1).
-
-    Some other distributions may not provide this kind of information. In these
-    cases, an empty string would be returned. This behavior can be observed
-    with rolling releases distributions (e.g. Arch Linux).
-
-    The *best* parameter can be used to control the approach for the returned
-    version:
-
-    If *best* is false, the first non-empty version number in priority order of
-    the examined sources is returned.
-
-    If *best* is true, the most precise version number out of all examined
-    sources is returned.
-
-    **Lookup hierarchy:**
-
-    In all cases, the version number is obtained from the following sources.
-    If *best* is false, this order represents the priority order:
-
-    * the value of the "VERSION_ID" attribute of the os-release file,
-    * the value of the "Release" attribute returned by the lsb_release
-      command,
-    * the version number parsed from the "<version_id>" field of the first line
-      of the distro release file,
-    * the version number parsed from the "PRETTY_NAME" attribute of the
-      os-release file, if it follows the format of the distro release files.
-    * the version number parsed from the "Description" attribute returned by
-      the lsb_release command, if it follows the format of the distro release
-      files.
-    """
-    return _distro.version(pretty, best)
-
-
-def version_parts(best: bool = False) -> Tuple[str, str, str]:
-    """
-    Return the version of the current OS distribution as a tuple
-    ``(major, minor, build_number)`` with items as follows:
-
-    * ``major``:  The result of :func:`distro.major_version`.
-
-    * ``minor``:  The result of :func:`distro.minor_version`.
-
-    * ``build_number``:  The result of :func:`distro.build_number`.
-
-    For a description of the *best* parameter, see the :func:`distro.version`
-    method.
-    """
-    return _distro.version_parts(best)
-
-
-def major_version(best: bool = False) -> str:
-    """
-    Return the major version of the current OS distribution, as a string,
-    if provided.
-    Otherwise, the empty string is returned. The major version is the first
-    part of the dot-separated version string.
-
-    For a description of the *best* parameter, see the :func:`distro.version`
-    method.
-    """
-    return _distro.major_version(best)
-
-
-def minor_version(best: bool = False) -> str:
-    """
-    Return the minor version of the current OS distribution, as a string,
-    if provided.
-    Otherwise, the empty string is returned. The minor version is the second
-    part of the dot-separated version string.
-
-    For a description of the *best* parameter, see the :func:`distro.version`
-    method.
-    """
-    return _distro.minor_version(best)
-
-
-def build_number(best: bool = False) -> str:
-    """
-    Return the build number of the current OS distribution, as a string,
-    if provided.
-    Otherwise, the empty string is returned. The build number is the third part
-    of the dot-separated version string.
-
-    For a description of the *best* parameter, see the :func:`distro.version`
-    method.
-    """
-    return _distro.build_number(best)
-
-
-def like() -> str:
-    """
-    Return a space-separated list of distro IDs of distributions that are
-    closely related to the current OS distribution in regards to packaging
-    and programming interfaces, for example distributions the current
-    distribution is a derivative from.
-
-    **Lookup hierarchy:**
-
-    This information item is only provided by the os-release file.
-    For details, see the description of the "ID_LIKE" attribute in the
-    `os-release man page
-    <http://www.freedesktop.org/software/systemd/man/os-release.html>`_.
-    """
-    return _distro.like()
-
-
-def codename() -> str:
-    """
-    Return the codename for the release of the current OS distribution,
-    as a string.
-
-    If the distribution does not have a codename, an empty string is returned.
-
-    Note that the returned codename is not always really a codename. For
-    example, openSUSE returns "x86_64". This function does not handle such
-    cases in any special way and just returns the string it finds, if any.
-
-    **Lookup hierarchy:**
-
-    * the codename within the "VERSION" attribute of the os-release file, if
-      provided,
-
-    * the value of the "Codename" attribute returned by the lsb_release
-      command,
-
-    * the value of the "<codename>" field of the distro release file.
-    """
-    return _distro.codename()
-
-
-def info(pretty: bool = False, best: bool = False) -> InfoDict:
-    """
-    Return certain machine-readable information items about the current OS
-    distribution in a dictionary, as shown in the following example:
-
-    .. sourcecode:: python
-
-        {
-            'id': 'rhel',
-            'version': '7.0',
-            'version_parts': {
-                'major': '7',
-                'minor': '0',
-                'build_number': ''
-            },
-            'like': 'fedora',
-            'codename': 'Maipo'
-        }
-
-    The dictionary structure and keys are always the same, regardless of which
-    information items are available in the underlying data sources. The values
-    for the various keys are as follows:
-
-    * ``id``:  The result of :func:`distro.id`.
-
-    * ``version``:  The result of :func:`distro.version`.
-
-    * ``version_parts -> major``:  The result of :func:`distro.major_version`.
-
-    * ``version_parts -> minor``:  The result of :func:`distro.minor_version`.
-
-    * ``version_parts -> build_number``:  The result of
-      :func:`distro.build_number`.
-
-    * ``like``:  The result of :func:`distro.like`.
-
-    * ``codename``:  The result of :func:`distro.codename`.
-
-    For a description of the *pretty* and *best* parameters, see the
-    :func:`distro.version` method.
-    """
-    return _distro.info(pretty, best)
-
-
-def os_release_info() -> Dict[str, str]:
-    """
-    Return a dictionary containing key-value pairs for the information items
-    from the os-release file data source of the current OS distribution.
-
-    See `os-release file`_ for details about these information items.
-    """
-    return _distro.os_release_info()
-
-
-def lsb_release_info() -> Dict[str, str]:
-    """
-    Return a dictionary containing key-value pairs for the information items
-    from the lsb_release command data source of the current OS distribution.
-
-    See `lsb_release command output`_ for details about these information
-    items.
-    """
-    return _distro.lsb_release_info()
-
-
-def distro_release_info() -> Dict[str, str]:
-    """
-    Return a dictionary containing key-value pairs for the information items
-    from the distro release file data source of the current OS distribution.
-
-    See `distro release file`_ for details about these information items.
-    """
-    return _distro.distro_release_info()
-
-
-def uname_info() -> Dict[str, str]:
-    """
-    Return a dictionary containing key-value pairs for the information items
-    from the distro release file data source of the current OS distribution.
-    """
-    return _distro.uname_info()
-
-
-def os_release_attr(attribute: str) -> str:
-    """
-    Return a single named information item from the os-release file data source
-    of the current OS distribution.
-
-    Parameters:
-
-    * ``attribute`` (string): Key of the information item.
-
-    Returns:
-
-    * (string): Value of the information item, if the item exists.
-      The empty string, if the item does not exist.
-
-    See `os-release file`_ for details about these information items.
-    """
-    return _distro.os_release_attr(attribute)
-
-
-def lsb_release_attr(attribute: str) -> str:
-    """
-    Return a single named information item from the lsb_release command output
-    data source of the current OS distribution.
-
-    Parameters:
-
-    * ``attribute`` (string): Key of the information item.
-
-    Returns:
-
-    * (string): Value of the information item, if the item exists.
-      The empty string, if the item does not exist.
-
-    See `lsb_release command output`_ for details about these information
-    items.
-    """
-    return _distro.lsb_release_attr(attribute)
-
-
-def distro_release_attr(attribute: str) -> str:
-    """
-    Return a single named information item from the distro release file
-    data source of the current OS distribution.
-
-    Parameters:
-
-    * ``attribute`` (string): Key of the information item.
-
-    Returns:
-
-    * (string): Value of the information item, if the item exists.
-      The empty string, if the item does not exist.
-
-    See `distro release file`_ for details about these information items.
-    """
-    return _distro.distro_release_attr(attribute)
-
-
-def uname_attr(attribute: str) -> str:
-    """
-    Return a single named information item from the distro release file
-    data source of the current OS distribution.
-
-    Parameters:
-
-    * ``attribute`` (string): Key of the information item.
-
-    Returns:
-
-    * (string): Value of the information item, if the item exists.
-                The empty string, if the item does not exist.
-    """
-    return _distro.uname_attr(attribute)
-
-
-try:
-    from functools import cached_property
-except ImportError:
-    # Python < 3.8
-    class cached_property:  # type: ignore
-        """A version of @property which caches the value.  On access, it calls the
-        underlying function and sets the value in `__dict__` so future accesses
-        will not re-call the property.
-        """
-
-        def __init__(self, f: Callable[[Any], Any]) -> None:
-            self._fname = f.__name__
-            self._f = f
-
-        def __get__(self, obj: Any, owner: Type[Any]) -> Any:
-            assert obj is not None, f"call {self._fname} on an instance"
-            ret = obj.__dict__[self._fname] = self._f(obj)
-            return ret
-
-
-class LinuxDistribution:
-    """
-    Provides information about a OS distribution.
-
-    This package creates a private module-global instance of this class with
-    default initialization arguments, that is used by the
-    `consolidated accessor functions`_ and `single source accessor functions`_.
-    By using default initialization arguments, that module-global instance
-    returns data about the current OS distribution (i.e. the distro this
-    package runs on).
-
-    Normally, it is not necessary to create additional instances of this class.
-    However, in situations where control is needed over the exact data sources
-    that are used, instances of this class can be created with a specific
-    distro release file, or a specific os-release file, or without invoking the
-    lsb_release command.
-    """
-
-    def __init__(
-        self,
-        include_lsb: Optional[bool] = None,
-        os_release_file: str = "",
-        distro_release_file: str = "",
-        include_uname: Optional[bool] = None,
-        root_dir: Optional[str] = None,
-        include_oslevel: Optional[bool] = None,
-    ) -> None:
-        """
-        The initialization method of this class gathers information from the
-        available data sources, and stores that in private instance attributes.
-        Subsequent access to the information items uses these private instance
-        attributes, so that the data sources are read only once.
-
-        Parameters:
-
-        * ``include_lsb`` (bool): Controls whether the
-          `lsb_release command output`_ is included as a data source.
-
-          If the lsb_release command is not available in the program execution
-          path, the data source for the lsb_release command will be empty.
-
-        * ``os_release_file`` (string): The path name of the
-          `os-release file`_ that is to be used as a data source.
-
-          An empty string (the default) will cause the default path name to
-          be used (see `os-release file`_ for details).
-
-          If the specified or defaulted os-release file does not exist, the
-          data source for the os-release file will be empty.
-
-        * ``distro_release_file`` (string): The path name of the
-          `distro release file`_ that is to be used as a data source.
-
-          An empty string (the default) will cause a default search algorithm
-          to be used (see `distro release file`_ for details).
-
-          If the specified distro release file does not exist, or if no default
-          distro release file can be found, the data source for the distro
-          release file will be empty.
-
-        * ``include_uname`` (bool): Controls whether uname command output is
-          included as a data source. If the uname command is not available in
-          the program execution path the data source for the uname command will
-          be empty.
-
-        * ``root_dir`` (string): The absolute path to the root directory to use
-          to find distro-related information files. Note that ``include_*``
-          parameters must not be enabled in combination with ``root_dir``.
-
-        * ``include_oslevel`` (bool): Controls whether (AIX) oslevel command
-          output is included as a data source. If the oslevel command is not
-          available in the program execution path the data source will be
-          empty.
-
-        Public instance attributes:
-
-        * ``os_release_file`` (string): The path name of the
-          `os-release file`_ that is actually used as a data source. The
-          empty string if no distro release file is used as a data source.
-
-        * ``distro_release_file`` (string): The path name of the
-          `distro release file`_ that is actually used as a data source. The
-          empty string if no distro release file is used as a data source.
-
-        * ``include_lsb`` (bool): The result of the ``include_lsb`` parameter.
-          This controls whether the lsb information will be loaded.
-
-        * ``include_uname`` (bool): The result of the ``include_uname``
-          parameter. This controls whether the uname information will
-          be loaded.
-
-        * ``include_oslevel`` (bool): The result of the ``include_oslevel``
-          parameter. This controls whether (AIX) oslevel information will be
-          loaded.
-
-        * ``root_dir`` (string): The result of the ``root_dir`` parameter.
-          The absolute path to the root directory to use to find distro-related
-          information files.
-
-        Raises:
-
-        * :py:exc:`ValueError`: Initialization parameters combination is not
-           supported.
-
-        * :py:exc:`OSError`: Some I/O issue with an os-release file or distro
-          release file.
-
-        * :py:exc:`UnicodeError`: A data source has unexpected characters or
-          uses an unexpected encoding.
-        """
-        self.root_dir = root_dir
-        self.etc_dir = os.path.join(root_dir, "etc") if root_dir else _UNIXCONFDIR
-        self.usr_lib_dir = (
-            os.path.join(root_dir, "usr/lib") if root_dir else _UNIXUSRLIBDIR
-        )
-
-        if os_release_file:
-            self.os_release_file = os_release_file
-        else:
-            etc_dir_os_release_file = os.path.join(self.etc_dir, _OS_RELEASE_BASENAME)
-            usr_lib_os_release_file = os.path.join(
-                self.usr_lib_dir, _OS_RELEASE_BASENAME
-            )
-
-            # NOTE: The idea is to respect order **and** have it set
-            #       at all times for API backwards compatibility.
-            if os.path.isfile(etc_dir_os_release_file) or not os.path.isfile(
-                usr_lib_os_release_file
-            ):
-                self.os_release_file = etc_dir_os_release_file
-            else:
-                self.os_release_file = usr_lib_os_release_file
-
-        self.distro_release_file = distro_release_file or ""  # updated later
-
-        is_root_dir_defined = root_dir is not None
-        if is_root_dir_defined and (include_lsb or include_uname or include_oslevel):
-            raise ValueError(
-                "Including subprocess data sources from specific root_dir is disallowed"
-                " to prevent false information"
-            )
-        self.include_lsb = (
-            include_lsb if include_lsb is not None else not is_root_dir_defined
-        )
-        self.include_uname = (
-            include_uname if include_uname is not None else not is_root_dir_defined
-        )
-        self.include_oslevel = (
-            include_oslevel if include_oslevel is not None else not is_root_dir_defined
-        )
-
-    def __repr__(self) -> str:
-        """Return repr of all info"""
-        return (
-            "LinuxDistribution("
-            "os_release_file={self.os_release_file!r}, "
-            "distro_release_file={self.distro_release_file!r}, "
-            "include_lsb={self.include_lsb!r}, "
-            "include_uname={self.include_uname!r}, "
-            "include_oslevel={self.include_oslevel!r}, "
-            "root_dir={self.root_dir!r}, "
-            "_os_release_info={self._os_release_info!r}, "
-            "_lsb_release_info={self._lsb_release_info!r}, "
-            "_distro_release_info={self._distro_release_info!r}, "
-            "_uname_info={self._uname_info!r}, "
-            "_oslevel_info={self._oslevel_info!r})".format(self=self)
-        )
-
-    def linux_distribution(
-        self, full_distribution_name: bool = True
-    ) -> Tuple[str, str, str]:
-        """
-        Return information about the OS distribution that is compatible
-        with Python's :func:`platform.linux_distribution`, supporting a subset
-        of its parameters.
-
-        For details, see :func:`distro.linux_distribution`.
-        """
-        return (
-            self.name() if full_distribution_name else self.id(),
-            self.version(),
-            self._os_release_info.get("release_codename") or self.codename(),
-        )
-
-    def id(self) -> str:
-        """Return the distro ID of the OS distribution, as a string.
-
-        For details, see :func:`distro.id`.
-        """
-
-        def normalize(distro_id: str, table: Dict[str, str]) -> str:
-            distro_id = distro_id.lower().replace(" ", "_")
-            return table.get(distro_id, distro_id)
-
-        distro_id = self.os_release_attr("id")
-        if distro_id:
-            return normalize(distro_id, NORMALIZED_OS_ID)
-
-        distro_id = self.lsb_release_attr("distributor_id")
-        if distro_id:
-            return normalize(distro_id, NORMALIZED_LSB_ID)
-
-        distro_id = self.distro_release_attr("id")
-        if distro_id:
-            return normalize(distro_id, NORMALIZED_DISTRO_ID)
-
-        distro_id = self.uname_attr("id")
-        if distro_id:
-            return normalize(distro_id, NORMALIZED_DISTRO_ID)
-
-        return ""
-
-    def name(self, pretty: bool = False) -> str:
-        """
-        Return the name of the OS distribution, as a string.
-
-        For details, see :func:`distro.name`.
-        """
-        name = (
-            self.os_release_attr("name")
-            or self.lsb_release_attr("distributor_id")
-            or self.distro_release_attr("name")
-            or self.uname_attr("name")
-        )
-        if pretty:
-            name = self.os_release_attr("pretty_name") or self.lsb_release_attr(
-                "description"
-            )
-            if not name:
-                name = self.distro_release_attr("name") or self.uname_attr("name")
-                version = self.version(pretty=True)
-                if version:
-                    name = f"{name} {version}"
-        return name or ""
-
-    def version(self, pretty: bool = False, best: bool = False) -> str:
-        """
-        Return the version of the OS distribution, as a string.
-
-        For details, see :func:`distro.version`.
-        """
-        versions = [
-            self.os_release_attr("version_id"),
-            self.lsb_release_attr("release"),
-            self.distro_release_attr("version_id"),
-            self._parse_distro_release_content(self.os_release_attr("pretty_name")).get(
-                "version_id", ""
-            ),
-            self._parse_distro_release_content(
-                self.lsb_release_attr("description")
-            ).get("version_id", ""),
-            self.uname_attr("release"),
-        ]
-        if self.uname_attr("id").startswith("aix"):
-            # On AIX platforms, prefer oslevel command output.
-            versions.insert(0, self.oslevel_info())
-        elif self.id() == "debian" or "debian" in self.like().split():
-            # On Debian-like, add debian_version file content to candidates list.
-            versions.append(self._debian_version)
-        version = ""
-        if best:
-            # This algorithm uses the last version in priority order that has
-            # the best precision. If the versions are not in conflict, that
-            # does not matter; otherwise, using the last one instead of the
-            # first one might be considered a surprise.
-            for v in versions:
-                if v.count(".") > version.count(".") or version == "":
-                    version = v
-        else:
-            for v in versions:
-                if v != "":
-                    version = v
-                    break
-        if pretty and version and self.codename():
-            version = f"{version} ({self.codename()})"
-        return version
-
-    def version_parts(self, best: bool = False) -> Tuple[str, str, str]:
-        """
-        Return the version of the OS distribution, as a tuple of version
-        numbers.
-
-        For details, see :func:`distro.version_parts`.
-        """
-        version_str = self.version(best=best)
-        if version_str:
-            version_regex = re.compile(r"(\d+)\.?(\d+)?\.?(\d+)?")
-            matches = version_regex.match(version_str)
-            if matches:
-                major, minor, build_number = matches.groups()
-                return major, minor or "", build_number or ""
-        return "", "", ""
-
-    def major_version(self, best: bool = False) -> str:
-        """
-        Return the major version number of the current distribution.
-
-        For details, see :func:`distro.major_version`.
-        """
-        return self.version_parts(best)[0]
-
-    def minor_version(self, best: bool = False) -> str:
-        """
-        Return the minor version number of the current distribution.
-
-        For details, see :func:`distro.minor_version`.
-        """
-        return self.version_parts(best)[1]
-
-    def build_number(self, best: bool = False) -> str:
-        """
-        Return the build number of the current distribution.
-
-        For details, see :func:`distro.build_number`.
-        """
-        return self.version_parts(best)[2]
-
-    def like(self) -> str:
-        """
-        Return the IDs of distributions that are like the OS distribution.
-
-        For details, see :func:`distro.like`.
-        """
-        return self.os_release_attr("id_like") or ""
-
-    def codename(self) -> str:
-        """
-        Return the codename of the OS distribution.
-
-        For details, see :func:`distro.codename`.
-        """
-        try:
-            # Handle os_release specially since distros might purposefully set
-            # this to empty string to have no codename
-            return self._os_release_info["codename"]
-        except KeyError:
-            return (
-                self.lsb_release_attr("codename")
-                or self.distro_release_attr("codename")
-                or ""
-            )
-
-    def info(self, pretty: bool = False, best: bool = False) -> InfoDict:
-        """
-        Return certain machine-readable information about the OS
-        distribution.
-
-        For details, see :func:`distro.info`.
-        """
-        return InfoDict(
-            id=self.id(),
-            version=self.version(pretty, best),
-            version_parts=VersionDict(
-                major=self.major_version(best),
-                minor=self.minor_version(best),
-                build_number=self.build_number(best),
-            ),
-            like=self.like(),
-            codename=self.codename(),
-        )
-
-    def os_release_info(self) -> Dict[str, str]:
-        """
-        Return a dictionary containing key-value pairs for the information
-        items from the os-release file data source of the OS distribution.
-
-        For details, see :func:`distro.os_release_info`.
-        """
-        return self._os_release_info
-
-    def lsb_release_info(self) -> Dict[str, str]:
-        """
-        Return a dictionary containing key-value pairs for the information
-        items from the lsb_release command data source of the OS
-        distribution.
-
-        For details, see :func:`distro.lsb_release_info`.
-        """
-        return self._lsb_release_info
-
-    def distro_release_info(self) -> Dict[str, str]:
-        """
-        Return a dictionary containing key-value pairs for the information
-        items from the distro release file data source of the OS
-        distribution.
-
-        For details, see :func:`distro.distro_release_info`.
-        """
-        return self._distro_release_info
-
-    def uname_info(self) -> Dict[str, str]:
-        """
-        Return a dictionary containing key-value pairs for the information
-        items from the uname command data source of the OS distribution.
-
-        For details, see :func:`distro.uname_info`.
-        """
-        return self._uname_info
-
-    def oslevel_info(self) -> str:
-        """
-        Return AIX' oslevel command output.
-        """
-        return self._oslevel_info
-
-    def os_release_attr(self, attribute: str) -> str:
-        """
-        Return a single named information item from the os-release file data
-        source of the OS distribution.
-
-        For details, see :func:`distro.os_release_attr`.
-        """
-        return self._os_release_info.get(attribute, "")
-
-    def lsb_release_attr(self, attribute: str) -> str:
-        """
-        Return a single named information item from the lsb_release command
-        output data source of the OS distribution.
-
-        For details, see :func:`distro.lsb_release_attr`.
-        """
-        return self._lsb_release_info.get(attribute, "")
-
-    def distro_release_attr(self, attribute: str) -> str:
-        """
-        Return a single named information item from the distro release file
-        data source of the OS distribution.
-
-        For details, see :func:`distro.distro_release_attr`.
-        """
-        return self._distro_release_info.get(attribute, "")
-
-    def uname_attr(self, attribute: str) -> str:
-        """
-        Return a single named information item from the uname command
-        output data source of the OS distribution.
-
-        For details, see :func:`distro.uname_attr`.
-        """
-        return self._uname_info.get(attribute, "")
-
-    @cached_property
-    def _os_release_info(self) -> Dict[str, str]:
-        """
-        Get the information items from the specified os-release file.
-
-        Returns:
-            A dictionary containing all information items.
-        """
-        if os.path.isfile(self.os_release_file):
-            with open(self.os_release_file, encoding="utf-8") as release_file:
-                return self._parse_os_release_content(release_file)
-        return {}
-
-    @staticmethod
-    def _parse_os_release_content(lines: TextIO) -> Dict[str, str]:
-        """
-        Parse the lines of an os-release file.
-
-        Parameters:
-
-        * lines: Iterable through the lines in the os-release file.
-                 Each line must be a unicode string or a UTF-8 encoded byte
-                 string.
-
-        Returns:
-            A dictionary containing all information items.
-        """
-        props = {}
-        lexer = shlex.shlex(lines, posix=True)
-        lexer.whitespace_split = True
-
-        tokens = list(lexer)
-        for token in tokens:
-            # At this point, all shell-like parsing has been done (i.e.
-            # comments processed, quotes and backslash escape sequences
-            # processed, multi-line values assembled, trailing newlines
-            # stripped, etc.), so the tokens are now either:
-            # * variable assignments: var=value
-            # * commands or their arguments (not allowed in os-release)
-            # Ignore any tokens that are not variable assignments
-            if "=" in token:
-                k, v = token.split("=", 1)
-                props[k.lower()] = v
-
-        if "version" in props:
-            # extract release codename (if any) from version attribute
-            match = re.search(r"\((\D+)\)|,\s*(\D+)", props["version"])
-            if match:
-                release_codename = match.group(1) or match.group(2)
-                props["codename"] = props["release_codename"] = release_codename
-
-        if "version_codename" in props:
-            # os-release added a version_codename field.  Use that in
-            # preference to anything else Note that some distros purposefully
-            # do not have code names.  They should be setting
-            # version_codename=""
-            props["codename"] = props["version_codename"]
-        elif "ubuntu_codename" in props:
-            # Same as above but a non-standard field name used on older Ubuntus
-            props["codename"] = props["ubuntu_codename"]
-
-        return props
-
-    @cached_property
-    def _lsb_release_info(self) -> Dict[str, str]:
-        """
-        Get the information items from the lsb_release command output.
-
-        Returns:
-            A dictionary containing all information items.
-        """
-        if not self.include_lsb:
-            return {}
-        try:
-            cmd = ("lsb_release", "-a")
-            stdout = subprocess.check_output(cmd, stderr=subprocess.DEVNULL)
-        # Command not found or lsb_release returned error
-        except (OSError, subprocess.CalledProcessError):
-            return {}
-        content = self._to_str(stdout).splitlines()
-        return self._parse_lsb_release_content(content)
-
-    @staticmethod
-    def _parse_lsb_release_content(lines: Iterable[str]) -> Dict[str, str]:
-        """
-        Parse the output of the lsb_release command.
-
-        Parameters:
-
-        * lines: Iterable through the lines of the lsb_release output.
-                 Each line must be a unicode string or a UTF-8 encoded byte
-                 string.
-
-        Returns:
-            A dictionary containing all information items.
-        """
-        props = {}
-        for line in lines:
-            kv = line.strip("\n").split(":", 1)
-            if len(kv) != 2:
-                # Ignore lines without colon.
-                continue
-            k, v = kv
-            props.update({k.replace(" ", "_").lower(): v.strip()})
-        return props
-
-    @cached_property
-    def _uname_info(self) -> Dict[str, str]:
-        if not self.include_uname:
-            return {}
-        try:
-            cmd = ("uname", "-rs")
-            stdout = subprocess.check_output(cmd, stderr=subprocess.DEVNULL)
-        except OSError:
-            return {}
-        content = self._to_str(stdout).splitlines()
-        return self._parse_uname_content(content)
-
-    @cached_property
-    def _oslevel_info(self) -> str:
-        if not self.include_oslevel:
-            return ""
-        try:
-            stdout = subprocess.check_output("oslevel", stderr=subprocess.DEVNULL)
-        except (OSError, subprocess.CalledProcessError):
-            return ""
-        return self._to_str(stdout).strip()
-
-    @cached_property
-    def _debian_version(self) -> str:
-        try:
-            with open(
-                os.path.join(self.etc_dir, "debian_version"), encoding="ascii"
-            ) as fp:
-                return fp.readline().rstrip()
-        except FileNotFoundError:
-            return ""
-
-    @staticmethod
-    def _parse_uname_content(lines: Sequence[str]) -> Dict[str, str]:
-        if not lines:
-            return {}
-        props = {}
-        match = re.search(r"^([^\s]+)\s+([\d\.]+)", lines[0].strip())
-        if match:
-            name, version = match.groups()
-
-            # This is to prevent the Linux kernel version from
-            # appearing as the 'best' version on otherwise
-            # identifiable distributions.
-            if name == "Linux":
-                return {}
-            props["id"] = name.lower()
-            props["name"] = name
-            props["release"] = version
-        return props
-
-    @staticmethod
-    def _to_str(bytestring: bytes) -> str:
-        encoding = sys.getfilesystemencoding()
-        return bytestring.decode(encoding)
-
-    @cached_property
-    def _distro_release_info(self) -> Dict[str, str]:
-        """
-        Get the information items from the specified distro release file.
-
-        Returns:
-            A dictionary containing all information items.
-        """
-        if self.distro_release_file:
-            # If it was specified, we use it and parse what we can, even if
-            # its file name or content does not match the expected pattern.
-            distro_info = self._parse_distro_release_file(self.distro_release_file)
-            basename = os.path.basename(self.distro_release_file)
-            # The file name pattern for user-specified distro release files
-            # is somewhat more tolerant (compared to when searching for the
-            # file), because we want to use what was specified as best as
-            # possible.
-            match = _DISTRO_RELEASE_BASENAME_PATTERN.match(basename)
-        else:
-            try:
-                basenames = [
-                    basename
-                    for basename in os.listdir(self.etc_dir)
-                    if basename not in _DISTRO_RELEASE_IGNORE_BASENAMES
-                    and os.path.isfile(os.path.join(self.etc_dir, basename))
-                ]
-                # We sort for repeatability in cases where there are multiple
-                # distro specific files; e.g. CentOS, Oracle, Enterprise all
-                # containing `redhat-release` on top of their own.
-                basenames.sort()
-            except OSError:
-                # This may occur when /etc is not readable but we can't be
-                # sure about the *-release files. Check common entries of
-                # /etc for information. If they turn out to not be there the
-                # error is handled in `_parse_distro_release_file()`.
-                basenames = _DISTRO_RELEASE_BASENAMES
-            for basename in basenames:
-                match = _DISTRO_RELEASE_BASENAME_PATTERN.match(basename)
-                if match is None:
-                    continue
-                filepath = os.path.join(self.etc_dir, basename)
-                distro_info = self._parse_distro_release_file(filepath)
-                # The name is always present if the pattern matches.
-                if "name" not in distro_info:
-                    continue
-                self.distro_release_file = filepath
-                break
-            else:  # the loop didn't "break": no candidate.
-                return {}
-
-        if match is not None:
-            distro_info["id"] = match.group(1)
-
-        # CloudLinux < 7: manually enrich info with proper id.
-        if "cloudlinux" in distro_info.get("name", "").lower():
-            distro_info["id"] = "cloudlinux"
-
-        return distro_info
-
-    def _parse_distro_release_file(self, filepath: str) -> Dict[str, str]:
-        """
-        Parse a distro release file.
-
-        Parameters:
-
-        * filepath: Path name of the distro release file.
-
-        Returns:
-            A dictionary containing all information items.
-        """
-        try:
-            with open(filepath, encoding="utf-8") as fp:
-                # Only parse the first line. For instance, on SLES there
-                # are multiple lines. We don't want them...
-                return self._parse_distro_release_content(fp.readline())
-        except OSError:
-            # Ignore not being able to read a specific, seemingly version
-            # related file.
-            # See https://github.com/python-distro/distro/issues/162
-            return {}
-
-    @staticmethod
-    def _parse_distro_release_content(line: str) -> Dict[str, str]:
-        """
-        Parse a line from a distro release file.
-
-        Parameters:
-        * line: Line from the distro release file. Must be a unicode string
-                or a UTF-8 encoded byte string.
-
-        Returns:
-            A dictionary containing all information items.
-        """
-        matches = _DISTRO_RELEASE_CONTENT_REVERSED_PATTERN.match(line.strip()[::-1])
-        distro_info = {}
-        if matches:
-            # regexp ensures non-None
-            distro_info["name"] = matches.group(3)[::-1]
-            if matches.group(2):
-                distro_info["version_id"] = matches.group(2)[::-1]
-            if matches.group(1):
-                distro_info["codename"] = matches.group(1)[::-1]
-        elif line:
-            distro_info["name"] = line.strip()
-        return distro_info
-
-
-_distro = LinuxDistribution()
-
-
-def main() -> None:
-    logger = logging.getLogger(__name__)
-    logger.setLevel(logging.DEBUG)
-    logger.addHandler(logging.StreamHandler(sys.stdout))
-
-    parser = argparse.ArgumentParser(description="OS distro info tool")
-    parser.add_argument(
-        "--json", "-j", help="Output in machine readable format", action="store_true"
-    )
-
-    parser.add_argument(
-        "--root-dir",
-        "-r",
-        type=str,
-        dest="root_dir",
-        help="Path to the root filesystem directory (defaults to /)",
-    )
-
-    args = parser.parse_args()
-
-    if args.root_dir:
-        dist = LinuxDistribution(
-            include_lsb=False,
-            include_uname=False,
-            include_oslevel=False,
-            root_dir=args.root_dir,
-        )
-    else:
-        dist = _distro
-
-    if args.json:
-        logger.info(json.dumps(dist.info(), indent=4, sort_keys=True))
-    else:
-        logger.info("Name: %s", dist.name(pretty=True))
-        distribution_version = dist.version(pretty=True)
-        logger.info("Version: %s", distribution_version)
-        distribution_codename = dist.codename()
-        logger.info("Codename: %s", distribution_codename)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/lib/distro/py.typed b/lib/distro/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/dns/__init__.py b/lib/dns/__init__.py
deleted file mode 100644
index a4249b9e..00000000
--- a/lib/dns/__init__.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009, 2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""dnspython DNS toolkit"""
-
-__all__ = [
-    "asyncbackend",
-    "asyncquery",
-    "asyncresolver",
-    "dnssec",
-    "dnssecalgs",
-    "dnssectypes",
-    "e164",
-    "edns",
-    "entropy",
-    "exception",
-    "flags",
-    "immutable",
-    "inet",
-    "ipv4",
-    "ipv6",
-    "message",
-    "name",
-    "namedict",
-    "node",
-    "opcode",
-    "query",
-    "quic",
-    "rcode",
-    "rdata",
-    "rdataclass",
-    "rdataset",
-    "rdatatype",
-    "renderer",
-    "resolver",
-    "reversename",
-    "rrset",
-    "serial",
-    "set",
-    "tokenizer",
-    "transaction",
-    "tsig",
-    "tsigkeyring",
-    "ttl",
-    "rdtypes",
-    "update",
-    "version",
-    "versioned",
-    "wire",
-    "xfr",
-    "zone",
-    "zonetypes",
-    "zonefile",
-]
-
-from dns.version import version as __version__  # noqa
diff --git a/lib/dns/_asyncbackend.py b/lib/dns/_asyncbackend.py
deleted file mode 100644
index f6760fd0..00000000
--- a/lib/dns/_asyncbackend.py
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# This is a nullcontext for both sync and async.  3.7 has a nullcontext,
-# but it is only for sync use.
-
-
-class NullContext:
-    def __init__(self, enter_result=None):
-        self.enter_result = enter_result
-
-    def __enter__(self):
-        return self.enter_result
-
-    def __exit__(self, exc_type, exc_value, traceback):
-        pass
-
-    async def __aenter__(self):
-        return self.enter_result
-
-    async def __aexit__(self, exc_type, exc_value, traceback):
-        pass
-
-
-# These are declared here so backends can import them without creating
-# circular dependencies with dns.asyncbackend.
-
-
-class Socket:  # pragma: no cover
-    def __init__(self, family: int, type: int):
-        self.family = family
-        self.type = type
-
-    async def close(self):
-        pass
-
-    async def getpeername(self):
-        raise NotImplementedError
-
-    async def getsockname(self):
-        raise NotImplementedError
-
-    async def getpeercert(self, timeout):
-        raise NotImplementedError
-
-    async def __aenter__(self):
-        return self
-
-    async def __aexit__(self, exc_type, exc_value, traceback):
-        await self.close()
-
-
-class DatagramSocket(Socket):  # pragma: no cover
-    async def sendto(self, what, destination, timeout):
-        raise NotImplementedError
-
-    async def recvfrom(self, size, timeout):
-        raise NotImplementedError
-
-
-class StreamSocket(Socket):  # pragma: no cover
-    async def sendall(self, what, timeout):
-        raise NotImplementedError
-
-    async def recv(self, size, timeout):
-        raise NotImplementedError
-
-
-class NullTransport:
-    async def connect_tcp(self, host, port, timeout, local_address):
-        raise NotImplementedError
-
-
-class Backend:  # pragma: no cover
-    def name(self):
-        return "unknown"
-
-    async def make_socket(
-        self,
-        af,
-        socktype,
-        proto=0,
-        source=None,
-        destination=None,
-        timeout=None,
-        ssl_context=None,
-        server_hostname=None,
-    ):
-        raise NotImplementedError
-
-    def datagram_connection_required(self):
-        return False
-
-    async def sleep(self, interval):
-        raise NotImplementedError
-
-    def get_transport_class(self):
-        raise NotImplementedError
-
-    async def wait_for(self, awaitable, timeout):
-        raise NotImplementedError
diff --git a/lib/dns/_asyncio_backend.py b/lib/dns/_asyncio_backend.py
deleted file mode 100644
index 6ab168de..00000000
--- a/lib/dns/_asyncio_backend.py
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-"""asyncio library query support"""
-
-import asyncio
-import socket
-import sys
-
-import dns._asyncbackend
-import dns._features
-import dns.exception
-import dns.inet
-
-_is_win32 = sys.platform == "win32"
-
-
-def _get_running_loop():
-    try:
-        return asyncio.get_running_loop()
-    except AttributeError:  # pragma: no cover
-        return asyncio.get_event_loop()
-
-
-class _DatagramProtocol:
-    def __init__(self):
-        self.transport = None
-        self.recvfrom = None
-
-    def connection_made(self, transport):
-        self.transport = transport
-
-    def datagram_received(self, data, addr):
-        if self.recvfrom and not self.recvfrom.done():
-            self.recvfrom.set_result((data, addr))
-
-    def error_received(self, exc):  # pragma: no cover
-        if self.recvfrom and not self.recvfrom.done():
-            self.recvfrom.set_exception(exc)
-
-    def connection_lost(self, exc):
-        if self.recvfrom and not self.recvfrom.done():
-            if exc is None:
-                # EOF we triggered.  Is there a better way to do this?
-                try:
-                    raise EOFError("EOF")
-                except EOFError as e:
-                    self.recvfrom.set_exception(e)
-            else:
-                self.recvfrom.set_exception(exc)
-
-    def close(self):
-        self.transport.close()
-
-
-async def _maybe_wait_for(awaitable, timeout):
-    if timeout is not None:
-        try:
-            return await asyncio.wait_for(awaitable, timeout)
-        except asyncio.TimeoutError:
-            raise dns.exception.Timeout(timeout=timeout)
-    else:
-        return await awaitable
-
-
-class DatagramSocket(dns._asyncbackend.DatagramSocket):
-    def __init__(self, family, transport, protocol):
-        super().__init__(family, socket.SOCK_DGRAM)
-        self.transport = transport
-        self.protocol = protocol
-
-    async def sendto(self, what, destination, timeout):  # pragma: no cover
-        # no timeout for asyncio sendto
-        self.transport.sendto(what, destination)
-        return len(what)
-
-    async def recvfrom(self, size, timeout):
-        # ignore size as there's no way I know to tell protocol about it
-        done = _get_running_loop().create_future()
-        try:
-            assert self.protocol.recvfrom is None
-            self.protocol.recvfrom = done
-            await _maybe_wait_for(done, timeout)
-            return done.result()
-        finally:
-            self.protocol.recvfrom = None
-
-    async def close(self):
-        self.protocol.close()
-
-    async def getpeername(self):
-        return self.transport.get_extra_info("peername")
-
-    async def getsockname(self):
-        return self.transport.get_extra_info("sockname")
-
-    async def getpeercert(self, timeout):
-        raise NotImplementedError
-
-
-class StreamSocket(dns._asyncbackend.StreamSocket):
-    def __init__(self, af, reader, writer):
-        super().__init__(af, socket.SOCK_STREAM)
-        self.reader = reader
-        self.writer = writer
-
-    async def sendall(self, what, timeout):
-        self.writer.write(what)
-        return await _maybe_wait_for(self.writer.drain(), timeout)
-
-    async def recv(self, size, timeout):
-        return await _maybe_wait_for(self.reader.read(size), timeout)
-
-    async def close(self):
-        self.writer.close()
-
-    async def getpeername(self):
-        return self.writer.get_extra_info("peername")
-
-    async def getsockname(self):
-        return self.writer.get_extra_info("sockname")
-
-    async def getpeercert(self, timeout):
-        return self.writer.get_extra_info("peercert")
-
-
-if dns._features.have("doh"):
-    import anyio
-    import httpcore
-    import httpcore._backends.anyio
-    import httpx
-
-    _CoreAsyncNetworkBackend = httpcore.AsyncNetworkBackend
-    _CoreAnyIOStream = httpcore._backends.anyio.AnyIOStream
-
-    from dns.query import _compute_times, _expiration_for_this_attempt, _remaining
-
-    class _NetworkBackend(_CoreAsyncNetworkBackend):
-        def __init__(self, resolver, local_port, bootstrap_address, family):
-            super().__init__()
-            self._local_port = local_port
-            self._resolver = resolver
-            self._bootstrap_address = bootstrap_address
-            self._family = family
-            if local_port != 0:
-                raise NotImplementedError(
-                    "the asyncio transport for HTTPX cannot set the local port"
-                )
-
-        async def connect_tcp(
-            self, host, port, timeout, local_address, socket_options=None
-        ):  # pylint: disable=signature-differs
-            addresses = []
-            _, expiration = _compute_times(timeout)
-            if dns.inet.is_address(host):
-                addresses.append(host)
-            elif self._bootstrap_address is not None:
-                addresses.append(self._bootstrap_address)
-            else:
-                timeout = _remaining(expiration)
-                family = self._family
-                if local_address:
-                    family = dns.inet.af_for_address(local_address)
-                answers = await self._resolver.resolve_name(
-                    host, family=family, lifetime=timeout
-                )
-                addresses = answers.addresses()
-            for address in addresses:
-                try:
-                    attempt_expiration = _expiration_for_this_attempt(2.0, expiration)
-                    timeout = _remaining(attempt_expiration)
-                    with anyio.fail_after(timeout):
-                        stream = await anyio.connect_tcp(
-                            remote_host=address,
-                            remote_port=port,
-                            local_host=local_address,
-                        )
-                    return _CoreAnyIOStream(stream)
-                except Exception:
-                    pass
-            raise httpcore.ConnectError
-
-        async def connect_unix_socket(
-            self, path, timeout, socket_options=None
-        ):  # pylint: disable=signature-differs
-            raise NotImplementedError
-
-        async def sleep(self, seconds):  # pylint: disable=signature-differs
-            await anyio.sleep(seconds)
-
-    class _HTTPTransport(httpx.AsyncHTTPTransport):
-        def __init__(
-            self,
-            *args,
-            local_port=0,
-            bootstrap_address=None,
-            resolver=None,
-            family=socket.AF_UNSPEC,
-            **kwargs,
-        ):
-            if resolver is None and bootstrap_address is None:
-                # pylint: disable=import-outside-toplevel,redefined-outer-name
-                import dns.asyncresolver
-
-                resolver = dns.asyncresolver.Resolver()
-            super().__init__(*args, **kwargs)
-            self._pool._network_backend = _NetworkBackend(
-                resolver, local_port, bootstrap_address, family
-            )
-
-else:
-    _HTTPTransport = dns._asyncbackend.NullTransport  # type: ignore
-
-
-class Backend(dns._asyncbackend.Backend):
-    def name(self):
-        return "asyncio"
-
-    async def make_socket(
-        self,
-        af,
-        socktype,
-        proto=0,
-        source=None,
-        destination=None,
-        timeout=None,
-        ssl_context=None,
-        server_hostname=None,
-    ):
-        loop = _get_running_loop()
-        if socktype == socket.SOCK_DGRAM:
-            if _is_win32 and source is None:
-                # Win32 wants explicit binding before recvfrom().  This is the
-                # proper fix for [#637].
-                source = (dns.inet.any_for_af(af), 0)
-            transport, protocol = await loop.create_datagram_endpoint(
-                _DatagramProtocol,
-                source,
-                family=af,
-                proto=proto,
-                remote_addr=destination,
-            )
-            return DatagramSocket(af, transport, protocol)
-        elif socktype == socket.SOCK_STREAM:
-            if destination is None:
-                # This shouldn't happen, but we check to make code analysis software
-                # happier.
-                raise ValueError("destination required for stream sockets")
-            (r, w) = await _maybe_wait_for(
-                asyncio.open_connection(
-                    destination[0],
-                    destination[1],
-                    ssl=ssl_context,
-                    family=af,
-                    proto=proto,
-                    local_addr=source,
-                    server_hostname=server_hostname,
-                ),
-                timeout,
-            )
-            return StreamSocket(af, r, w)
-        raise NotImplementedError(
-            "unsupported socket " + f"type {socktype}"
-        )  # pragma: no cover
-
-    async def sleep(self, interval):
-        await asyncio.sleep(interval)
-
-    def datagram_connection_required(self):
-        return False
-
-    def get_transport_class(self):
-        return _HTTPTransport
-
-    async def wait_for(self, awaitable, timeout):
-        return await _maybe_wait_for(awaitable, timeout)
diff --git a/lib/dns/_ddr.py b/lib/dns/_ddr.py
deleted file mode 100644
index bf5c11eb..00000000
--- a/lib/dns/_ddr.py
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-#
-# Support for Discovery of Designated Resolvers
-
-import socket
-import time
-from urllib.parse import urlparse
-
-import dns.asyncbackend
-import dns.inet
-import dns.name
-import dns.nameserver
-import dns.query
-import dns.rdtypes.svcbbase
-
-# The special name of the local resolver when using DDR
-_local_resolver_name = dns.name.from_text("_dns.resolver.arpa")
-
-
-#
-# Processing is split up into I/O independent and I/O dependent parts to
-# make supporting sync and async versions easy.
-#
-
-
-class _SVCBInfo:
-    def __init__(self, bootstrap_address, port, hostname, nameservers):
-        self.bootstrap_address = bootstrap_address
-        self.port = port
-        self.hostname = hostname
-        self.nameservers = nameservers
-
-    def ddr_check_certificate(self, cert):
-        """Verify that the _SVCBInfo's address is in the cert's subjectAltName (SAN)"""
-        for name, value in cert["subjectAltName"]:
-            if name == "IP Address" and value == self.bootstrap_address:
-                return True
-        return False
-
-    def make_tls_context(self):
-        ssl = dns.query.ssl
-        ctx = ssl.create_default_context()
-        ctx.minimum_version = ssl.TLSVersion.TLSv1_2
-        return ctx
-
-    def ddr_tls_check_sync(self, lifetime):
-        ctx = self.make_tls_context()
-        expiration = time.time() + lifetime
-        with socket.create_connection(
-            (self.bootstrap_address, self.port), lifetime
-        ) as s:
-            with ctx.wrap_socket(s, server_hostname=self.hostname) as ts:
-                ts.settimeout(dns.query._remaining(expiration))
-                ts.do_handshake()
-                cert = ts.getpeercert()
-                return self.ddr_check_certificate(cert)
-
-    async def ddr_tls_check_async(self, lifetime, backend=None):
-        if backend is None:
-            backend = dns.asyncbackend.get_default_backend()
-        ctx = self.make_tls_context()
-        expiration = time.time() + lifetime
-        async with await backend.make_socket(
-            dns.inet.af_for_address(self.bootstrap_address),
-            socket.SOCK_STREAM,
-            0,
-            None,
-            (self.bootstrap_address, self.port),
-            lifetime,
-            ctx,
-            self.hostname,
-        ) as ts:
-            cert = await ts.getpeercert(dns.query._remaining(expiration))
-            return self.ddr_check_certificate(cert)
-
-
-def _extract_nameservers_from_svcb(answer):
-    bootstrap_address = answer.nameserver
-    if not dns.inet.is_address(bootstrap_address):
-        return []
-    infos = []
-    for rr in answer.rrset.processing_order():
-        nameservers = []
-        param = rr.params.get(dns.rdtypes.svcbbase.ParamKey.ALPN)
-        if param is None:
-            continue
-        alpns = set(param.ids)
-        host = rr.target.to_text(omit_final_dot=True)
-        port = None
-        param = rr.params.get(dns.rdtypes.svcbbase.ParamKey.PORT)
-        if param is not None:
-            port = param.port
-        # For now we ignore address hints and address resolution and always use the
-        # bootstrap address
-        if b"h2" in alpns:
-            param = rr.params.get(dns.rdtypes.svcbbase.ParamKey.DOHPATH)
-            if param is None or not param.value.endswith(b"{?dns}"):
-                continue
-            path = param.value[:-6].decode()
-            if not path.startswith("/"):
-                path = "/" + path
-            if port is None:
-                port = 443
-            url = f"https://{host}:{port}{path}"
-            # check the URL
-            try:
-                urlparse(url)
-                nameservers.append(dns.nameserver.DoHNameserver(url, bootstrap_address))
-            except Exception:
-                # continue processing other ALPN types
-                pass
-        if b"dot" in alpns:
-            if port is None:
-                port = 853
-            nameservers.append(
-                dns.nameserver.DoTNameserver(bootstrap_address, port, host)
-            )
-        if b"doq" in alpns:
-            if port is None:
-                port = 853
-            nameservers.append(
-                dns.nameserver.DoQNameserver(bootstrap_address, port, True, host)
-            )
-        if len(nameservers) > 0:
-            infos.append(_SVCBInfo(bootstrap_address, port, host, nameservers))
-    return infos
-
-
-def _get_nameservers_sync(answer, lifetime):
-    """Return a list of TLS-validated resolver nameservers extracted from an SVCB
-    answer."""
-    nameservers = []
-    infos = _extract_nameservers_from_svcb(answer)
-    for info in infos:
-        try:
-            if info.ddr_tls_check_sync(lifetime):
-                nameservers.extend(info.nameservers)
-        except Exception:
-            pass
-    return nameservers
-
-
-async def _get_nameservers_async(answer, lifetime):
-    """Return a list of TLS-validated resolver nameservers extracted from an SVCB
-    answer."""
-    nameservers = []
-    infos = _extract_nameservers_from_svcb(answer)
-    for info in infos:
-        try:
-            if await info.ddr_tls_check_async(lifetime):
-                nameservers.extend(info.nameservers)
-        except Exception:
-            pass
-    return nameservers
diff --git a/lib/dns/_features.py b/lib/dns/_features.py
deleted file mode 100644
index fa6d4955..00000000
--- a/lib/dns/_features.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-import importlib.metadata
-import itertools
-import string
-from typing import Dict, List, Tuple
-
-
-def _tuple_from_text(version: str) -> Tuple:
-    text_parts = version.split(".")
-    int_parts = []
-    for text_part in text_parts:
-        digit_prefix = "".join(
-            itertools.takewhile(lambda x: x in string.digits, text_part)
-        )
-        try:
-            int_parts.append(int(digit_prefix))
-        except Exception:
-            break
-    return tuple(int_parts)
-
-
-def _version_check(
-    requirement: str,
-) -> bool:
-    """Is the requirement fulfilled?
-
-    The requirement must be of the form
-
-        package>=version
-    """
-    package, minimum = requirement.split(">=")
-    try:
-        version = importlib.metadata.version(package)
-        # This shouldn't happen, but it apparently can.
-        if version is None:
-            return False
-    except Exception:
-        return False
-    t_version = _tuple_from_text(version)
-    t_minimum = _tuple_from_text(minimum)
-    if t_version < t_minimum:
-        return False
-    return True
-
-
-_cache: Dict[str, bool] = {}
-
-
-def have(feature: str) -> bool:
-    """Is *feature* available?
-
-    This tests if all optional packages needed for the
-    feature are available and recent enough.
-
-    Returns ``True`` if the feature is available,
-    and ``False`` if it is not or if metadata is
-    missing.
-    """
-    value = _cache.get(feature)
-    if value is not None:
-        return value
-    requirements = _requirements.get(feature)
-    if requirements is None:
-        # we make a cache entry here for consistency not performance
-        _cache[feature] = False
-        return False
-    ok = True
-    for requirement in requirements:
-        if not _version_check(requirement):
-            ok = False
-            break
-    _cache[feature] = ok
-    return ok
-
-
-def force(feature: str, enabled: bool) -> None:
-    """Force the status of *feature* to be *enabled*.
-
-    This method is provided as a workaround for any cases
-    where importlib.metadata is ineffective, or for testing.
-    """
-    _cache[feature] = enabled
-
-
-_requirements: Dict[str, List[str]] = {
-    ### BEGIN generated requirements
-    "dnssec": ["cryptography>=43"],
-    "doh": ["httpcore>=1.0.0", "httpx>=0.26.0", "h2>=4.1.0"],
-    "doq": ["aioquic>=1.0.0"],
-    "idna": ["idna>=3.7"],
-    "trio": ["trio>=0.23"],
-    "wmi": ["wmi>=1.5.1"],
-    ### END generated requirements
-}
diff --git a/lib/dns/_immutable_ctx.py b/lib/dns/_immutable_ctx.py
deleted file mode 100644
index ae7a33bf..00000000
--- a/lib/dns/_immutable_ctx.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# This implementation of the immutable decorator requires python >=
-# 3.7, and is significantly more storage efficient when making classes
-# with slots immutable.  It's also faster.
-
-import contextvars
-import inspect
-
-_in__init__ = contextvars.ContextVar("_immutable_in__init__", default=False)
-
-
-class _Immutable:
-    """Immutable mixin class"""
-
-    # We set slots to the empty list to say "we don't have any attributes".
-    # We do this so that if we're mixed in with a class with __slots__, we
-    # don't cause a __dict__ to be added which would waste space.
-
-    __slots__ = ()
-
-    def __setattr__(self, name, value):
-        if _in__init__.get() is not self:
-            raise TypeError("object doesn't support attribute assignment")
-        else:
-            super().__setattr__(name, value)
-
-    def __delattr__(self, name):
-        if _in__init__.get() is not self:
-            raise TypeError("object doesn't support attribute assignment")
-        else:
-            super().__delattr__(name)
-
-
-def _immutable_init(f):
-    def nf(*args, **kwargs):
-        previous = _in__init__.set(args[0])
-        try:
-            # call the actual __init__
-            f(*args, **kwargs)
-        finally:
-            _in__init__.reset(previous)
-
-    nf.__signature__ = inspect.signature(f)
-    return nf
-
-
-def immutable(cls):
-    if _Immutable in cls.__mro__:
-        # Some ancestor already has the mixin, so just make sure we keep
-        # following the __init__ protocol.
-        cls.__init__ = _immutable_init(cls.__init__)
-        if hasattr(cls, "__setstate__"):
-            cls.__setstate__ = _immutable_init(cls.__setstate__)
-        ncls = cls
-    else:
-        # Mixin the Immutable class and follow the __init__ protocol.
-        class ncls(_Immutable, cls):
-            # We have to do the __slots__ declaration here too!
-            __slots__ = ()
-
-            @_immutable_init
-            def __init__(self, *args, **kwargs):
-                super().__init__(*args, **kwargs)
-
-            if hasattr(cls, "__setstate__"):
-
-                @_immutable_init
-                def __setstate__(self, *args, **kwargs):
-                    super().__setstate__(*args, **kwargs)
-
-        # make ncls have the same name and module as cls
-        ncls.__name__ = cls.__name__
-        ncls.__qualname__ = cls.__qualname__
-        ncls.__module__ = cls.__module__
-    return ncls
diff --git a/lib/dns/_trio_backend.py b/lib/dns/_trio_backend.py
deleted file mode 100644
index 0ed904dd..00000000
--- a/lib/dns/_trio_backend.py
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-"""trio async I/O library query support"""
-
-import socket
-
-import trio
-import trio.socket  # type: ignore
-
-import dns._asyncbackend
-import dns._features
-import dns.exception
-import dns.inet
-
-if not dns._features.have("trio"):
-    raise ImportError("trio not found or too old")
-
-
-def _maybe_timeout(timeout):
-    if timeout is not None:
-        return trio.move_on_after(timeout)
-    else:
-        return dns._asyncbackend.NullContext()
-
-
-# for brevity
-_lltuple = dns.inet.low_level_address_tuple
-
-# pylint: disable=redefined-outer-name
-
-
-class DatagramSocket(dns._asyncbackend.DatagramSocket):
-    def __init__(self, sock):
-        super().__init__(sock.family, socket.SOCK_DGRAM)
-        self.socket = sock
-
-    async def sendto(self, what, destination, timeout):
-        with _maybe_timeout(timeout):
-            if destination is None:
-                return await self.socket.send(what)
-            else:
-                return await self.socket.sendto(what, destination)
-        raise dns.exception.Timeout(
-            timeout=timeout
-        )  # pragma: no cover  lgtm[py/unreachable-statement]
-
-    async def recvfrom(self, size, timeout):
-        with _maybe_timeout(timeout):
-            return await self.socket.recvfrom(size)
-        raise dns.exception.Timeout(timeout=timeout)  # lgtm[py/unreachable-statement]
-
-    async def close(self):
-        self.socket.close()
-
-    async def getpeername(self):
-        return self.socket.getpeername()
-
-    async def getsockname(self):
-        return self.socket.getsockname()
-
-    async def getpeercert(self, timeout):
-        raise NotImplementedError
-
-
-class StreamSocket(dns._asyncbackend.StreamSocket):
-    def __init__(self, family, stream, tls=False):
-        super().__init__(family, socket.SOCK_STREAM)
-        self.stream = stream
-        self.tls = tls
-
-    async def sendall(self, what, timeout):
-        with _maybe_timeout(timeout):
-            return await self.stream.send_all(what)
-        raise dns.exception.Timeout(timeout=timeout)  # lgtm[py/unreachable-statement]
-
-    async def recv(self, size, timeout):
-        with _maybe_timeout(timeout):
-            return await self.stream.receive_some(size)
-        raise dns.exception.Timeout(timeout=timeout)  # lgtm[py/unreachable-statement]
-
-    async def close(self):
-        await self.stream.aclose()
-
-    async def getpeername(self):
-        if self.tls:
-            return self.stream.transport_stream.socket.getpeername()
-        else:
-            return self.stream.socket.getpeername()
-
-    async def getsockname(self):
-        if self.tls:
-            return self.stream.transport_stream.socket.getsockname()
-        else:
-            return self.stream.socket.getsockname()
-
-    async def getpeercert(self, timeout):
-        if self.tls:
-            with _maybe_timeout(timeout):
-                await self.stream.do_handshake()
-            return self.stream.getpeercert()
-        else:
-            raise NotImplementedError
-
-
-if dns._features.have("doh"):
-    import httpcore
-    import httpcore._backends.trio
-    import httpx
-
-    _CoreAsyncNetworkBackend = httpcore.AsyncNetworkBackend
-    _CoreTrioStream = httpcore._backends.trio.TrioStream
-
-    from dns.query import _compute_times, _expiration_for_this_attempt, _remaining
-
-    class _NetworkBackend(_CoreAsyncNetworkBackend):
-        def __init__(self, resolver, local_port, bootstrap_address, family):
-            super().__init__()
-            self._local_port = local_port
-            self._resolver = resolver
-            self._bootstrap_address = bootstrap_address
-            self._family = family
-
-        async def connect_tcp(
-            self, host, port, timeout, local_address, socket_options=None
-        ):  # pylint: disable=signature-differs
-            addresses = []
-            _, expiration = _compute_times(timeout)
-            if dns.inet.is_address(host):
-                addresses.append(host)
-            elif self._bootstrap_address is not None:
-                addresses.append(self._bootstrap_address)
-            else:
-                timeout = _remaining(expiration)
-                family = self._family
-                if local_address:
-                    family = dns.inet.af_for_address(local_address)
-                answers = await self._resolver.resolve_name(
-                    host, family=family, lifetime=timeout
-                )
-                addresses = answers.addresses()
-            for address in addresses:
-                try:
-                    af = dns.inet.af_for_address(address)
-                    if local_address is not None or self._local_port != 0:
-                        source = (local_address, self._local_port)
-                    else:
-                        source = None
-                    destination = (address, port)
-                    attempt_expiration = _expiration_for_this_attempt(2.0, expiration)
-                    timeout = _remaining(attempt_expiration)
-                    sock = await Backend().make_socket(
-                        af, socket.SOCK_STREAM, 0, source, destination, timeout
-                    )
-                    return _CoreTrioStream(sock.stream)
-                except Exception:
-                    continue
-            raise httpcore.ConnectError
-
-        async def connect_unix_socket(
-            self, path, timeout, socket_options=None
-        ):  # pylint: disable=signature-differs
-            raise NotImplementedError
-
-        async def sleep(self, seconds):  # pylint: disable=signature-differs
-            await trio.sleep(seconds)
-
-    class _HTTPTransport(httpx.AsyncHTTPTransport):
-        def __init__(
-            self,
-            *args,
-            local_port=0,
-            bootstrap_address=None,
-            resolver=None,
-            family=socket.AF_UNSPEC,
-            **kwargs,
-        ):
-            if resolver is None and bootstrap_address is None:
-                # pylint: disable=import-outside-toplevel,redefined-outer-name
-                import dns.asyncresolver
-
-                resolver = dns.asyncresolver.Resolver()
-            super().__init__(*args, **kwargs)
-            self._pool._network_backend = _NetworkBackend(
-                resolver, local_port, bootstrap_address, family
-            )
-
-else:
-    _HTTPTransport = dns._asyncbackend.NullTransport  # type: ignore
-
-
-class Backend(dns._asyncbackend.Backend):
-    def name(self):
-        return "trio"
-
-    async def make_socket(
-        self,
-        af,
-        socktype,
-        proto=0,
-        source=None,
-        destination=None,
-        timeout=None,
-        ssl_context=None,
-        server_hostname=None,
-    ):
-        s = trio.socket.socket(af, socktype, proto)
-        stream = None
-        try:
-            if source:
-                await s.bind(_lltuple(source, af))
-            if socktype == socket.SOCK_STREAM or destination is not None:
-                connected = False
-                with _maybe_timeout(timeout):
-                    await s.connect(_lltuple(destination, af))
-                    connected = True
-                if not connected:
-                    raise dns.exception.Timeout(
-                        timeout=timeout
-                    )  # lgtm[py/unreachable-statement]
-        except Exception:  # pragma: no cover
-            s.close()
-            raise
-        if socktype == socket.SOCK_DGRAM:
-            return DatagramSocket(s)
-        elif socktype == socket.SOCK_STREAM:
-            stream = trio.SocketStream(s)
-            tls = False
-            if ssl_context:
-                tls = True
-                try:
-                    stream = trio.SSLStream(
-                        stream, ssl_context, server_hostname=server_hostname
-                    )
-                except Exception:  # pragma: no cover
-                    await stream.aclose()
-                    raise
-            return StreamSocket(af, stream, tls)
-        raise NotImplementedError(
-            "unsupported socket " + f"type {socktype}"
-        )  # pragma: no cover
-
-    async def sleep(self, interval):
-        await trio.sleep(interval)
-
-    def get_transport_class(self):
-        return _HTTPTransport
-
-    async def wait_for(self, awaitable, timeout):
-        with _maybe_timeout(timeout):
-            return await awaitable
-        raise dns.exception.Timeout(
-            timeout=timeout
-        )  # pragma: no cover  lgtm[py/unreachable-statement]
diff --git a/lib/dns/asyncbackend.py b/lib/dns/asyncbackend.py
deleted file mode 100644
index 0ec58b06..00000000
--- a/lib/dns/asyncbackend.py
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-from typing import Dict
-
-import dns.exception
-
-# pylint: disable=unused-import
-from dns._asyncbackend import (  # noqa: F401  lgtm[py/unused-import]
-    Backend,
-    DatagramSocket,
-    Socket,
-    StreamSocket,
-)
-
-# pylint: enable=unused-import
-
-_default_backend = None
-
-_backends: Dict[str, Backend] = {}
-
-# Allow sniffio import to be disabled for testing purposes
-_no_sniffio = False
-
-
-class AsyncLibraryNotFoundError(dns.exception.DNSException):
-    pass
-
-
-def get_backend(name: str) -> Backend:
-    """Get the specified asynchronous backend.
-
-    *name*, a ``str``, the name of the backend.  Currently the "trio"
-    and "asyncio" backends are available.
-
-    Raises NotImplementedError if an unknown backend name is specified.
-    """
-    # pylint: disable=import-outside-toplevel,redefined-outer-name
-    backend = _backends.get(name)
-    if backend:
-        return backend
-    if name == "trio":
-        import dns._trio_backend
-
-        backend = dns._trio_backend.Backend()
-    elif name == "asyncio":
-        import dns._asyncio_backend
-
-        backend = dns._asyncio_backend.Backend()
-    else:
-        raise NotImplementedError(f"unimplemented async backend {name}")
-    _backends[name] = backend
-    return backend
-
-
-def sniff() -> str:
-    """Attempt to determine the in-use asynchronous I/O library by using
-    the ``sniffio`` module if it is available.
-
-    Returns the name of the library, or raises AsyncLibraryNotFoundError
-    if the library cannot be determined.
-    """
-    # pylint: disable=import-outside-toplevel
-    try:
-        if _no_sniffio:
-            raise ImportError
-        import sniffio
-
-        try:
-            return sniffio.current_async_library()
-        except sniffio.AsyncLibraryNotFoundError:
-            raise AsyncLibraryNotFoundError("sniffio cannot determine async library")
-    except ImportError:
-        import asyncio
-
-        try:
-            asyncio.get_running_loop()
-            return "asyncio"
-        except RuntimeError:
-            raise AsyncLibraryNotFoundError("no async library detected")
-
-
-def get_default_backend() -> Backend:
-    """Get the default backend, initializing it if necessary."""
-    if _default_backend:
-        return _default_backend
-
-    return set_default_backend(sniff())
-
-
-def set_default_backend(name: str) -> Backend:
-    """Set the default backend.
-
-    It's not normally necessary to call this method, as
-    ``get_default_backend()`` will initialize the backend
-    appropriately in many cases.  If ``sniffio`` is not installed, or
-    in testing situations, this function allows the backend to be set
-    explicitly.
-    """
-    global _default_backend
-    _default_backend = get_backend(name)
-    return _default_backend
diff --git a/lib/dns/asyncquery.py b/lib/dns/asyncquery.py
deleted file mode 100644
index efad0fd7..00000000
--- a/lib/dns/asyncquery.py
+++ /dev/null
@@ -1,913 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""Talk to a DNS server."""
-
-import base64
-import contextlib
-import random
-import socket
-import struct
-import time
-import urllib.parse
-from typing import Any, Dict, Optional, Tuple, Union, cast
-
-import dns.asyncbackend
-import dns.exception
-import dns.inet
-import dns.message
-import dns.name
-import dns.quic
-import dns.rcode
-import dns.rdataclass
-import dns.rdatatype
-import dns.transaction
-from dns._asyncbackend import NullContext
-from dns.query import (
-    BadResponse,
-    HTTPVersion,
-    NoDOH,
-    NoDOQ,
-    UDPMode,
-    _check_status,
-    _compute_times,
-    _make_dot_ssl_context,
-    _matches_destination,
-    _remaining,
-    have_doh,
-    ssl,
-)
-
-if have_doh:
-    import httpx
-
-# for brevity
-_lltuple = dns.inet.low_level_address_tuple
-
-
-def _source_tuple(af, address, port):
-    # Make a high level source tuple, or return None if address and port
-    # are both None
-    if address or port:
-        if address is None:
-            if af == socket.AF_INET:
-                address = "0.0.0.0"
-            elif af == socket.AF_INET6:
-                address = "::"
-            else:
-                raise NotImplementedError(f"unknown address family {af}")
-        return (address, port)
-    else:
-        return None
-
-
-def _timeout(expiration, now=None):
-    if expiration is not None:
-        if not now:
-            now = time.time()
-        return max(expiration - now, 0)
-    else:
-        return None
-
-
-async def send_udp(
-    sock: dns.asyncbackend.DatagramSocket,
-    what: Union[dns.message.Message, bytes],
-    destination: Any,
-    expiration: Optional[float] = None,
-) -> Tuple[int, float]:
-    """Send a DNS message to the specified UDP socket.
-
-    *sock*, a ``dns.asyncbackend.DatagramSocket``.
-
-    *what*, a ``bytes`` or ``dns.message.Message``, the message to send.
-
-    *destination*, a destination tuple appropriate for the address family
-    of the socket, specifying where to send the query.
-
-    *expiration*, a ``float`` or ``None``, the absolute time at which
-    a timeout exception should be raised.  If ``None``, no timeout will
-    occur.  The expiration value is meaningless for the asyncio backend, as
-    asyncio's transport sendto() never blocks.
-
-    Returns an ``(int, float)`` tuple of bytes sent and the sent time.
-    """
-
-    if isinstance(what, dns.message.Message):
-        what = what.to_wire()
-    sent_time = time.time()
-    n = await sock.sendto(what, destination, _timeout(expiration, sent_time))
-    return (n, sent_time)
-
-
-async def receive_udp(
-    sock: dns.asyncbackend.DatagramSocket,
-    destination: Optional[Any] = None,
-    expiration: Optional[float] = None,
-    ignore_unexpected: bool = False,
-    one_rr_per_rrset: bool = False,
-    keyring: Optional[Dict[dns.name.Name, dns.tsig.Key]] = None,
-    request_mac: Optional[bytes] = b"",
-    ignore_trailing: bool = False,
-    raise_on_truncation: bool = False,
-    ignore_errors: bool = False,
-    query: Optional[dns.message.Message] = None,
-) -> Any:
-    """Read a DNS message from a UDP socket.
-
-    *sock*, a ``dns.asyncbackend.DatagramSocket``.
-
-    See :py:func:`dns.query.receive_udp()` for the documentation of the other
-    parameters, and exceptions.
-
-    Returns a ``(dns.message.Message, float, tuple)`` tuple of the received message, the
-    received time, and the address where the message arrived from.
-    """
-
-    wire = b""
-    while True:
-        (wire, from_address) = await sock.recvfrom(65535, _timeout(expiration))
-        if not _matches_destination(
-            sock.family, from_address, destination, ignore_unexpected
-        ):
-            continue
-        received_time = time.time()
-        try:
-            r = dns.message.from_wire(
-                wire,
-                keyring=keyring,
-                request_mac=request_mac,
-                one_rr_per_rrset=one_rr_per_rrset,
-                ignore_trailing=ignore_trailing,
-                raise_on_truncation=raise_on_truncation,
-            )
-        except dns.message.Truncated as e:
-            # See the comment in query.py for details.
-            if (
-                ignore_errors
-                and query is not None
-                and not query.is_response(e.message())
-            ):
-                continue
-            else:
-                raise
-        except Exception:
-            if ignore_errors:
-                continue
-            else:
-                raise
-        if ignore_errors and query is not None and not query.is_response(r):
-            continue
-        return (r, received_time, from_address)
-
-
-async def udp(
-    q: dns.message.Message,
-    where: str,
-    timeout: Optional[float] = None,
-    port: int = 53,
-    source: Optional[str] = None,
-    source_port: int = 0,
-    ignore_unexpected: bool = False,
-    one_rr_per_rrset: bool = False,
-    ignore_trailing: bool = False,
-    raise_on_truncation: bool = False,
-    sock: Optional[dns.asyncbackend.DatagramSocket] = None,
-    backend: Optional[dns.asyncbackend.Backend] = None,
-    ignore_errors: bool = False,
-) -> dns.message.Message:
-    """Return the response obtained after sending a query via UDP.
-
-    *sock*, a ``dns.asyncbackend.DatagramSocket``, or ``None``,
-    the socket to use for the query.  If ``None``, the default, a
-    socket is created.  Note that if a socket is provided, the
-    *source*, *source_port*, and *backend* are ignored.
-
-    *backend*, a ``dns.asyncbackend.Backend``, or ``None``.  If ``None``,
-    the default, then dnspython will use the default backend.
-
-    See :py:func:`dns.query.udp()` for the documentation of the other
-    parameters, exceptions, and return type of this method.
-    """
-    wire = q.to_wire()
-    (begin_time, expiration) = _compute_times(timeout)
-    af = dns.inet.af_for_address(where)
-    destination = _lltuple((where, port), af)
-    if sock:
-        cm: contextlib.AbstractAsyncContextManager = NullContext(sock)
-    else:
-        if not backend:
-            backend = dns.asyncbackend.get_default_backend()
-        stuple = _source_tuple(af, source, source_port)
-        if backend.datagram_connection_required():
-            dtuple = (where, port)
-        else:
-            dtuple = None
-        cm = await backend.make_socket(af, socket.SOCK_DGRAM, 0, stuple, dtuple)
-    async with cm as s:
-        await send_udp(s, wire, destination, expiration)
-        (r, received_time, _) = await receive_udp(
-            s,
-            destination,
-            expiration,
-            ignore_unexpected,
-            one_rr_per_rrset,
-            q.keyring,
-            q.mac,
-            ignore_trailing,
-            raise_on_truncation,
-            ignore_errors,
-            q,
-        )
-        r.time = received_time - begin_time
-        # We don't need to check q.is_response() if we are in ignore_errors mode
-        # as receive_udp() will have checked it.
-        if not (ignore_errors or q.is_response(r)):
-            raise BadResponse
-        return r
-
-
-async def udp_with_fallback(
-    q: dns.message.Message,
-    where: str,
-    timeout: Optional[float] = None,
-    port: int = 53,
-    source: Optional[str] = None,
-    source_port: int = 0,
-    ignore_unexpected: bool = False,
-    one_rr_per_rrset: bool = False,
-    ignore_trailing: bool = False,
-    udp_sock: Optional[dns.asyncbackend.DatagramSocket] = None,
-    tcp_sock: Optional[dns.asyncbackend.StreamSocket] = None,
-    backend: Optional[dns.asyncbackend.Backend] = None,
-    ignore_errors: bool = False,
-) -> Tuple[dns.message.Message, bool]:
-    """Return the response to the query, trying UDP first and falling back
-    to TCP if UDP results in a truncated response.
-
-    *udp_sock*, a ``dns.asyncbackend.DatagramSocket``, or ``None``,
-    the socket to use for the UDP query.  If ``None``, the default, a
-    socket is created.  Note that if a socket is provided the *source*,
-    *source_port*, and *backend* are ignored for the UDP query.
-
-    *tcp_sock*, a ``dns.asyncbackend.StreamSocket``, or ``None``, the
-    socket to use for the TCP query.  If ``None``, the default, a
-    socket is created.  Note that if a socket is provided *where*,
-    *source*, *source_port*, and *backend*  are ignored for the TCP query.
-
-    *backend*, a ``dns.asyncbackend.Backend``, or ``None``.  If ``None``,
-    the default, then dnspython will use the default backend.
-
-    See :py:func:`dns.query.udp_with_fallback()` for the documentation
-    of the other parameters, exceptions, and return type of this
-    method.
-    """
-    try:
-        response = await udp(
-            q,
-            where,
-            timeout,
-            port,
-            source,
-            source_port,
-            ignore_unexpected,
-            one_rr_per_rrset,
-            ignore_trailing,
-            True,
-            udp_sock,
-            backend,
-            ignore_errors,
-        )
-        return (response, False)
-    except dns.message.Truncated:
-        response = await tcp(
-            q,
-            where,
-            timeout,
-            port,
-            source,
-            source_port,
-            one_rr_per_rrset,
-            ignore_trailing,
-            tcp_sock,
-            backend,
-        )
-        return (response, True)
-
-
-async def send_tcp(
-    sock: dns.asyncbackend.StreamSocket,
-    what: Union[dns.message.Message, bytes],
-    expiration: Optional[float] = None,
-) -> Tuple[int, float]:
-    """Send a DNS message to the specified TCP socket.
-
-    *sock*, a ``dns.asyncbackend.StreamSocket``.
-
-    See :py:func:`dns.query.send_tcp()` for the documentation of the other
-    parameters, exceptions, and return type of this method.
-    """
-
-    if isinstance(what, dns.message.Message):
-        tcpmsg = what.to_wire(prepend_length=True)
-    else:
-        # copying the wire into tcpmsg is inefficient, but lets us
-        # avoid writev() or doing a short write that would get pushed
-        # onto the net
-        tcpmsg = len(what).to_bytes(2, "big") + what
-    sent_time = time.time()
-    await sock.sendall(tcpmsg, _timeout(expiration, sent_time))
-    return (len(tcpmsg), sent_time)
-
-
-async def _read_exactly(sock, count, expiration):
-    """Read the specified number of bytes from stream.  Keep trying until we
-    either get the desired amount, or we hit EOF.
-    """
-    s = b""
-    while count > 0:
-        n = await sock.recv(count, _timeout(expiration))
-        if n == b"":
-            raise EOFError("EOF")
-        count = count - len(n)
-        s = s + n
-    return s
-
-
-async def receive_tcp(
-    sock: dns.asyncbackend.StreamSocket,
-    expiration: Optional[float] = None,
-    one_rr_per_rrset: bool = False,
-    keyring: Optional[Dict[dns.name.Name, dns.tsig.Key]] = None,
-    request_mac: Optional[bytes] = b"",
-    ignore_trailing: bool = False,
-) -> Tuple[dns.message.Message, float]:
-    """Read a DNS message from a TCP socket.
-
-    *sock*, a ``dns.asyncbackend.StreamSocket``.
-
-    See :py:func:`dns.query.receive_tcp()` for the documentation of the other
-    parameters, exceptions, and return type of this method.
-    """
-
-    ldata = await _read_exactly(sock, 2, expiration)
-    (l,) = struct.unpack("!H", ldata)
-    wire = await _read_exactly(sock, l, expiration)
-    received_time = time.time()
-    r = dns.message.from_wire(
-        wire,
-        keyring=keyring,
-        request_mac=request_mac,
-        one_rr_per_rrset=one_rr_per_rrset,
-        ignore_trailing=ignore_trailing,
-    )
-    return (r, received_time)
-
-
-async def tcp(
-    q: dns.message.Message,
-    where: str,
-    timeout: Optional[float] = None,
-    port: int = 53,
-    source: Optional[str] = None,
-    source_port: int = 0,
-    one_rr_per_rrset: bool = False,
-    ignore_trailing: bool = False,
-    sock: Optional[dns.asyncbackend.StreamSocket] = None,
-    backend: Optional[dns.asyncbackend.Backend] = None,
-) -> dns.message.Message:
-    """Return the response obtained after sending a query via TCP.
-
-    *sock*, a ``dns.asyncbacket.StreamSocket``, or ``None``, the
-    socket to use for the query.  If ``None``, the default, a socket
-    is created.  Note that if a socket is provided
-    *where*, *port*, *source*, *source_port*, and *backend* are ignored.
-
-    *backend*, a ``dns.asyncbackend.Backend``, or ``None``.  If ``None``,
-    the default, then dnspython will use the default backend.
-
-    See :py:func:`dns.query.tcp()` for the documentation of the other
-    parameters, exceptions, and return type of this method.
-    """
-
-    wire = q.to_wire()
-    (begin_time, expiration) = _compute_times(timeout)
-    if sock:
-        # Verify that the socket is connected, as if it's not connected,
-        # it's not writable, and the polling in send_tcp() will time out or
-        # hang forever.
-        await sock.getpeername()
-        cm: contextlib.AbstractAsyncContextManager = NullContext(sock)
-    else:
-        # These are simple (address, port) pairs, not family-dependent tuples
-        # you pass to low-level socket code.
-        af = dns.inet.af_for_address(where)
-        stuple = _source_tuple(af, source, source_port)
-        dtuple = (where, port)
-        if not backend:
-            backend = dns.asyncbackend.get_default_backend()
-        cm = await backend.make_socket(
-            af, socket.SOCK_STREAM, 0, stuple, dtuple, timeout
-        )
-    async with cm as s:
-        await send_tcp(s, wire, expiration)
-        (r, received_time) = await receive_tcp(
-            s, expiration, one_rr_per_rrset, q.keyring, q.mac, ignore_trailing
-        )
-        r.time = received_time - begin_time
-        if not q.is_response(r):
-            raise BadResponse
-        return r
-
-
-async def tls(
-    q: dns.message.Message,
-    where: str,
-    timeout: Optional[float] = None,
-    port: int = 853,
-    source: Optional[str] = None,
-    source_port: int = 0,
-    one_rr_per_rrset: bool = False,
-    ignore_trailing: bool = False,
-    sock: Optional[dns.asyncbackend.StreamSocket] = None,
-    backend: Optional[dns.asyncbackend.Backend] = None,
-    ssl_context: Optional[ssl.SSLContext] = None,
-    server_hostname: Optional[str] = None,
-    verify: Union[bool, str] = True,
-) -> dns.message.Message:
-    """Return the response obtained after sending a query via TLS.
-
-    *sock*, an ``asyncbackend.StreamSocket``, or ``None``, the socket
-    to use for the query.  If ``None``, the default, a socket is
-    created.  Note that if a socket is provided, it must be a
-    connected SSL stream socket, and *where*, *port*,
-    *source*, *source_port*, *backend*, *ssl_context*, and *server_hostname*
-    are ignored.
-
-    *backend*, a ``dns.asyncbackend.Backend``, or ``None``.  If ``None``,
-    the default, then dnspython will use the default backend.
-
-    See :py:func:`dns.query.tls()` for the documentation of the other
-    parameters, exceptions, and return type of this method.
-    """
-    (begin_time, expiration) = _compute_times(timeout)
-    if sock:
-        cm: contextlib.AbstractAsyncContextManager = NullContext(sock)
-    else:
-        if ssl_context is None:
-            ssl_context = _make_dot_ssl_context(server_hostname, verify)
-        af = dns.inet.af_for_address(where)
-        stuple = _source_tuple(af, source, source_port)
-        dtuple = (where, port)
-        if not backend:
-            backend = dns.asyncbackend.get_default_backend()
-        cm = await backend.make_socket(
-            af,
-            socket.SOCK_STREAM,
-            0,
-            stuple,
-            dtuple,
-            timeout,
-            ssl_context,
-            server_hostname,
-        )
-    async with cm as s:
-        timeout = _timeout(expiration)
-        response = await tcp(
-            q,
-            where,
-            timeout,
-            port,
-            source,
-            source_port,
-            one_rr_per_rrset,
-            ignore_trailing,
-            s,
-            backend,
-        )
-        end_time = time.time()
-        response.time = end_time - begin_time
-        return response
-
-
-def _maybe_get_resolver(
-    resolver: Optional["dns.asyncresolver.Resolver"],
-) -> "dns.asyncresolver.Resolver":
-    # We need a separate method for this to avoid overriding the global
-    # variable "dns" with the as-yet undefined local variable "dns"
-    # in https().
-    if resolver is None:
-        # pylint: disable=import-outside-toplevel,redefined-outer-name
-        import dns.asyncresolver
-
-        resolver = dns.asyncresolver.Resolver()
-    return resolver
-
-
-async def https(
-    q: dns.message.Message,
-    where: str,
-    timeout: Optional[float] = None,
-    port: int = 443,
-    source: Optional[str] = None,
-    source_port: int = 0,  # pylint: disable=W0613
-    one_rr_per_rrset: bool = False,
-    ignore_trailing: bool = False,
-    client: Optional["httpx.AsyncClient"] = None,
-    path: str = "/dns-query",
-    post: bool = True,
-    verify: Union[bool, str] = True,
-    bootstrap_address: Optional[str] = None,
-    resolver: Optional["dns.asyncresolver.Resolver"] = None,
-    family: int = socket.AF_UNSPEC,
-    http_version: HTTPVersion = HTTPVersion.DEFAULT,
-) -> dns.message.Message:
-    """Return the response obtained after sending a query via DNS-over-HTTPS.
-
-    *client*, a ``httpx.AsyncClient``.  If provided, the client to use for
-    the query.
-
-    Unlike the other dnspython async functions, a backend cannot be provided
-    in this function because httpx always auto-detects the async backend.
-
-    See :py:func:`dns.query.https()` for the documentation of the other
-    parameters, exceptions, and return type of this method.
-    """
-
-    try:
-        af = dns.inet.af_for_address(where)
-    except ValueError:
-        af = None
-    if af is not None and dns.inet.is_address(where):
-        if af == socket.AF_INET:
-            url = f"https://{where}:{port}{path}"
-        elif af == socket.AF_INET6:
-            url = f"https://[{where}]:{port}{path}"
-    else:
-        url = where
-
-    extensions = {}
-    if bootstrap_address is None:
-        # pylint: disable=possibly-used-before-assignment
-        parsed = urllib.parse.urlparse(url)
-        if parsed.hostname is None:
-            raise ValueError("no hostname in URL")
-        if dns.inet.is_address(parsed.hostname):
-            bootstrap_address = parsed.hostname
-            extensions["sni_hostname"] = parsed.hostname
-        if parsed.port is not None:
-            port = parsed.port
-
-    if http_version == HTTPVersion.H3 or (
-        http_version == HTTPVersion.DEFAULT and not have_doh
-    ):
-        if bootstrap_address is None:
-            resolver = _maybe_get_resolver(resolver)
-            assert parsed.hostname is not None  # for mypy
-            answers = await resolver.resolve_name(parsed.hostname, family)
-            bootstrap_address = random.choice(list(answers.addresses()))
-        return await _http3(
-            q,
-            bootstrap_address,
-            url,
-            timeout,
-            port,
-            source,
-            source_port,
-            one_rr_per_rrset,
-            ignore_trailing,
-            verify=verify,
-            post=post,
-        )
-
-    if not have_doh:
-        raise NoDOH  # pragma: no cover
-    # pylint: disable=possibly-used-before-assignment
-    if client and not isinstance(client, httpx.AsyncClient):
-        raise ValueError("session parameter must be an httpx.AsyncClient")
-    # pylint: enable=possibly-used-before-assignment
-
-    wire = q.to_wire()
-    headers = {"accept": "application/dns-message"}
-
-    h1 = http_version in (HTTPVersion.H1, HTTPVersion.DEFAULT)
-    h2 = http_version in (HTTPVersion.H2, HTTPVersion.DEFAULT)
-
-    backend = dns.asyncbackend.get_default_backend()
-
-    if source is None:
-        local_address = None
-        local_port = 0
-    else:
-        local_address = source
-        local_port = source_port
-
-    if client:
-        cm: contextlib.AbstractAsyncContextManager = NullContext(client)
-    else:
-        transport = backend.get_transport_class()(
-            local_address=local_address,
-            http1=h1,
-            http2=h2,
-            verify=verify,
-            local_port=local_port,
-            bootstrap_address=bootstrap_address,
-            resolver=resolver,
-            family=family,
-        )
-
-        cm = httpx.AsyncClient(http1=h1, http2=h2, verify=verify, transport=transport)
-
-    async with cm as the_client:
-        # see https://tools.ietf.org/html/rfc8484#section-4.1.1 for DoH
-        # GET and POST examples
-        if post:
-            headers.update(
-                {
-                    "content-type": "application/dns-message",
-                    "content-length": str(len(wire)),
-                }
-            )
-            response = await backend.wait_for(
-                the_client.post(
-                    url,
-                    headers=headers,
-                    content=wire,
-                    extensions=extensions,
-                ),
-                timeout,
-            )
-        else:
-            wire = base64.urlsafe_b64encode(wire).rstrip(b"=")
-            twire = wire.decode()  # httpx does a repr() if we give it bytes
-            response = await backend.wait_for(
-                the_client.get(
-                    url,
-                    headers=headers,
-                    params={"dns": twire},
-                    extensions=extensions,
-                ),
-                timeout,
-            )
-
-    # see https://tools.ietf.org/html/rfc8484#section-4.2.1 for info about DoH
-    # status codes
-    if response.status_code < 200 or response.status_code > 299:
-        raise ValueError(
-            f"{where} responded with status code {response.status_code}"
-            f"\nResponse body: {response.content!r}"
-        )
-    r = dns.message.from_wire(
-        response.content,
-        keyring=q.keyring,
-        request_mac=q.request_mac,
-        one_rr_per_rrset=one_rr_per_rrset,
-        ignore_trailing=ignore_trailing,
-    )
-    r.time = response.elapsed.total_seconds()
-    if not q.is_response(r):
-        raise BadResponse
-    return r
-
-
-async def _http3(
-    q: dns.message.Message,
-    where: str,
-    url: str,
-    timeout: Optional[float] = None,
-    port: int = 853,
-    source: Optional[str] = None,
-    source_port: int = 0,
-    one_rr_per_rrset: bool = False,
-    ignore_trailing: bool = False,
-    verify: Union[bool, str] = True,
-    backend: Optional[dns.asyncbackend.Backend] = None,
-    hostname: Optional[str] = None,
-    post: bool = True,
-) -> dns.message.Message:
-    if not dns.quic.have_quic:
-        raise NoDOH("DNS-over-HTTP3 is not available.")  # pragma: no cover
-
-    url_parts = urllib.parse.urlparse(url)
-    hostname = url_parts.hostname
-    if url_parts.port is not None:
-        port = url_parts.port
-
-    q.id = 0
-    wire = q.to_wire()
-    (cfactory, mfactory) = dns.quic.factories_for_backend(backend)
-
-    async with cfactory() as context:
-        async with mfactory(
-            context, verify_mode=verify, server_name=hostname, h3=True
-        ) as the_manager:
-            the_connection = the_manager.connect(where, port, source, source_port)
-            (start, expiration) = _compute_times(timeout)
-            stream = await the_connection.make_stream(timeout)
-            async with stream:
-                # note that send_h3() does not need await
-                stream.send_h3(url, wire, post)
-                wire = await stream.receive(_remaining(expiration))
-                _check_status(stream.headers(), where, wire)
-            finish = time.time()
-        r = dns.message.from_wire(
-            wire,
-            keyring=q.keyring,
-            request_mac=q.request_mac,
-            one_rr_per_rrset=one_rr_per_rrset,
-            ignore_trailing=ignore_trailing,
-        )
-    r.time = max(finish - start, 0.0)
-    if not q.is_response(r):
-        raise BadResponse
-    return r
-
-
-async def quic(
-    q: dns.message.Message,
-    where: str,
-    timeout: Optional[float] = None,
-    port: int = 853,
-    source: Optional[str] = None,
-    source_port: int = 0,
-    one_rr_per_rrset: bool = False,
-    ignore_trailing: bool = False,
-    connection: Optional[dns.quic.AsyncQuicConnection] = None,
-    verify: Union[bool, str] = True,
-    backend: Optional[dns.asyncbackend.Backend] = None,
-    hostname: Optional[str] = None,
-    server_hostname: Optional[str] = None,
-) -> dns.message.Message:
-    """Return the response obtained after sending an asynchronous query via
-    DNS-over-QUIC.
-
-    *backend*, a ``dns.asyncbackend.Backend``, or ``None``.  If ``None``,
-    the default, then dnspython will use the default backend.
-
-    See :py:func:`dns.query.quic()` for the documentation of the other
-    parameters, exceptions, and return type of this method.
-    """
-
-    if not dns.quic.have_quic:
-        raise NoDOQ("DNS-over-QUIC is not available.")  # pragma: no cover
-
-    if server_hostname is not None and hostname is None:
-        hostname = server_hostname
-
-    q.id = 0
-    wire = q.to_wire()
-    the_connection: dns.quic.AsyncQuicConnection
-    if connection:
-        cfactory = dns.quic.null_factory
-        mfactory = dns.quic.null_factory
-        the_connection = connection
-    else:
-        (cfactory, mfactory) = dns.quic.factories_for_backend(backend)
-
-    async with cfactory() as context:
-        async with mfactory(
-            context,
-            verify_mode=verify,
-            server_name=server_hostname,
-        ) as the_manager:
-            if not connection:
-                the_connection = the_manager.connect(where, port, source, source_port)
-            (start, expiration) = _compute_times(timeout)
-            stream = await the_connection.make_stream(timeout)
-            async with stream:
-                await stream.send(wire, True)
-                wire = await stream.receive(_remaining(expiration))
-            finish = time.time()
-        r = dns.message.from_wire(
-            wire,
-            keyring=q.keyring,
-            request_mac=q.request_mac,
-            one_rr_per_rrset=one_rr_per_rrset,
-            ignore_trailing=ignore_trailing,
-        )
-    r.time = max(finish - start, 0.0)
-    if not q.is_response(r):
-        raise BadResponse
-    return r
-
-
-async def _inbound_xfr(
-    txn_manager: dns.transaction.TransactionManager,
-    s: dns.asyncbackend.Socket,
-    query: dns.message.Message,
-    serial: Optional[int],
-    timeout: Optional[float],
-    expiration: float,
-) -> Any:
-    """Given a socket, does the zone transfer."""
-    rdtype = query.question[0].rdtype
-    is_ixfr = rdtype == dns.rdatatype.IXFR
-    origin = txn_manager.from_wire_origin()
-    wire = query.to_wire()
-    is_udp = s.type == socket.SOCK_DGRAM
-    if is_udp:
-        udp_sock = cast(dns.asyncbackend.DatagramSocket, s)
-        await udp_sock.sendto(wire, None, _timeout(expiration))
-    else:
-        tcp_sock = cast(dns.asyncbackend.StreamSocket, s)
-        tcpmsg = struct.pack("!H", len(wire)) + wire
-        await tcp_sock.sendall(tcpmsg, expiration)
-    with dns.xfr.Inbound(txn_manager, rdtype, serial, is_udp) as inbound:
-        done = False
-        tsig_ctx = None
-        while not done:
-            (_, mexpiration) = _compute_times(timeout)
-            if mexpiration is None or (
-                expiration is not None and mexpiration > expiration
-            ):
-                mexpiration = expiration
-            if is_udp:
-                timeout = _timeout(mexpiration)
-                (rwire, _) = await udp_sock.recvfrom(65535, timeout)
-            else:
-                ldata = await _read_exactly(tcp_sock, 2, mexpiration)
-                (l,) = struct.unpack("!H", ldata)
-                rwire = await _read_exactly(tcp_sock, l, mexpiration)
-            r = dns.message.from_wire(
-                rwire,
-                keyring=query.keyring,
-                request_mac=query.mac,
-                xfr=True,
-                origin=origin,
-                tsig_ctx=tsig_ctx,
-                multi=(not is_udp),
-                one_rr_per_rrset=is_ixfr,
-            )
-            done = inbound.process_message(r)
-            yield r
-            tsig_ctx = r.tsig_ctx
-        if query.keyring and not r.had_tsig:
-            raise dns.exception.FormError("missing TSIG")
-
-
-async def inbound_xfr(
-    where: str,
-    txn_manager: dns.transaction.TransactionManager,
-    query: Optional[dns.message.Message] = None,
-    port: int = 53,
-    timeout: Optional[float] = None,
-    lifetime: Optional[float] = None,
-    source: Optional[str] = None,
-    source_port: int = 0,
-    udp_mode: UDPMode = UDPMode.NEVER,
-    backend: Optional[dns.asyncbackend.Backend] = None,
-) -> None:
-    """Conduct an inbound transfer and apply it via a transaction from the
-    txn_manager.
-
-    *backend*, a ``dns.asyncbackend.Backend``, or ``None``.  If ``None``,
-    the default, then dnspython will use the default backend.
-
-    See :py:func:`dns.query.inbound_xfr()` for the documentation of
-    the other parameters, exceptions, and return type of this method.
-    """
-    if query is None:
-        (query, serial) = dns.xfr.make_query(txn_manager)
-    else:
-        serial = dns.xfr.extract_serial_from_query(query)
-    af = dns.inet.af_for_address(where)
-    stuple = _source_tuple(af, source, source_port)
-    dtuple = (where, port)
-    if not backend:
-        backend = dns.asyncbackend.get_default_backend()
-    (_, expiration) = _compute_times(lifetime)
-    if query.question[0].rdtype == dns.rdatatype.IXFR and udp_mode != UDPMode.NEVER:
-        s = await backend.make_socket(
-            af, socket.SOCK_DGRAM, 0, stuple, dtuple, _timeout(expiration)
-        )
-        async with s:
-            try:
-                async for _ in _inbound_xfr(
-                    txn_manager, s, query, serial, timeout, expiration
-                ):
-                    pass
-                return
-            except dns.xfr.UseTCP:
-                if udp_mode == UDPMode.ONLY:
-                    raise
-
-    s = await backend.make_socket(
-        af, socket.SOCK_STREAM, 0, stuple, dtuple, _timeout(expiration)
-    )
-    async with s:
-        async for _ in _inbound_xfr(txn_manager, s, query, serial, timeout, expiration):
-            pass
diff --git a/lib/dns/asyncresolver.py b/lib/dns/asyncresolver.py
deleted file mode 100644
index 8f5e062a..00000000
--- a/lib/dns/asyncresolver.py
+++ /dev/null
@@ -1,475 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""Asynchronous DNS stub resolver."""
-
-import socket
-import time
-from typing import Any, Dict, List, Optional, Union
-
-import dns._ddr
-import dns.asyncbackend
-import dns.asyncquery
-import dns.exception
-import dns.name
-import dns.query
-import dns.rdataclass
-import dns.rdatatype
-import dns.resolver  # lgtm[py/import-and-import-from]
-
-# import some resolver symbols for brevity
-from dns.resolver import NXDOMAIN, NoAnswer, NoRootSOA, NotAbsolute
-
-# for indentation purposes below
-_udp = dns.asyncquery.udp
-_tcp = dns.asyncquery.tcp
-
-
-class Resolver(dns.resolver.BaseResolver):
-    """Asynchronous DNS stub resolver."""
-
-    async def resolve(
-        self,
-        qname: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.A,
-        rdclass: Union[dns.rdataclass.RdataClass, str] = dns.rdataclass.IN,
-        tcp: bool = False,
-        source: Optional[str] = None,
-        raise_on_no_answer: bool = True,
-        source_port: int = 0,
-        lifetime: Optional[float] = None,
-        search: Optional[bool] = None,
-        backend: Optional[dns.asyncbackend.Backend] = None,
-    ) -> dns.resolver.Answer:
-        """Query nameservers asynchronously to find the answer to the question.
-
-        *backend*, a ``dns.asyncbackend.Backend``, or ``None``.  If ``None``,
-        the default, then dnspython will use the default backend.
-
-        See :py:func:`dns.resolver.Resolver.resolve()` for the
-        documentation of the other parameters, exceptions, and return
-        type of this method.
-        """
-
-        resolution = dns.resolver._Resolution(
-            self, qname, rdtype, rdclass, tcp, raise_on_no_answer, search
-        )
-        if not backend:
-            backend = dns.asyncbackend.get_default_backend()
-        start = time.time()
-        while True:
-            (request, answer) = resolution.next_request()
-            # Note we need to say "if answer is not None" and not just
-            # "if answer" because answer implements __len__, and python
-            # will call that.  We want to return if we have an answer
-            # object, including in cases where its length is 0.
-            if answer is not None:
-                # cache hit!
-                return answer
-            assert request is not None  # needed for type checking
-            done = False
-            while not done:
-                (nameserver, tcp, backoff) = resolution.next_nameserver()
-                if backoff:
-                    await backend.sleep(backoff)
-                timeout = self._compute_timeout(start, lifetime, resolution.errors)
-                try:
-                    response = await nameserver.async_query(
-                        request,
-                        timeout=timeout,
-                        source=source,
-                        source_port=source_port,
-                        max_size=tcp,
-                        backend=backend,
-                    )
-                except Exception as ex:
-                    (_, done) = resolution.query_result(None, ex)
-                    continue
-                (answer, done) = resolution.query_result(response, None)
-                # Note we need to say "if answer is not None" and not just
-                # "if answer" because answer implements __len__, and python
-                # will call that.  We want to return if we have an answer
-                # object, including in cases where its length is 0.
-                if answer is not None:
-                    return answer
-
-    async def resolve_address(
-        self, ipaddr: str, *args: Any, **kwargs: Any
-    ) -> dns.resolver.Answer:
-        """Use an asynchronous resolver to run a reverse query for PTR
-        records.
-
-        This utilizes the resolve() method to perform a PTR lookup on the
-        specified IP address.
-
-        *ipaddr*, a ``str``, the IPv4 or IPv6 address you want to get
-        the PTR record for.
-
-        All other arguments that can be passed to the resolve() function
-        except for rdtype and rdclass are also supported by this
-        function.
-
-        """
-        # We make a modified kwargs for type checking happiness, as otherwise
-        # we get a legit warning about possibly having rdtype and rdclass
-        # in the kwargs more than once.
-        modified_kwargs: Dict[str, Any] = {}
-        modified_kwargs.update(kwargs)
-        modified_kwargs["rdtype"] = dns.rdatatype.PTR
-        modified_kwargs["rdclass"] = dns.rdataclass.IN
-        return await self.resolve(
-            dns.reversename.from_address(ipaddr), *args, **modified_kwargs
-        )
-
-    async def resolve_name(
-        self,
-        name: Union[dns.name.Name, str],
-        family: int = socket.AF_UNSPEC,
-        **kwargs: Any,
-    ) -> dns.resolver.HostAnswers:
-        """Use an asynchronous resolver to query for address records.
-
-        This utilizes the resolve() method to perform A and/or AAAA lookups on
-        the specified name.
-
-        *qname*, a ``dns.name.Name`` or ``str``, the name to resolve.
-
-        *family*, an ``int``, the address family.  If socket.AF_UNSPEC
-        (the default), both A and AAAA records will be retrieved.
-
-        All other arguments that can be passed to the resolve() function
-        except for rdtype and rdclass are also supported by this
-        function.
-        """
-        # We make a modified kwargs for type checking happiness, as otherwise
-        # we get a legit warning about possibly having rdtype and rdclass
-        # in the kwargs more than once.
-        modified_kwargs: Dict[str, Any] = {}
-        modified_kwargs.update(kwargs)
-        modified_kwargs.pop("rdtype", None)
-        modified_kwargs["rdclass"] = dns.rdataclass.IN
-
-        if family == socket.AF_INET:
-            v4 = await self.resolve(name, dns.rdatatype.A, **modified_kwargs)
-            return dns.resolver.HostAnswers.make(v4=v4)
-        elif family == socket.AF_INET6:
-            v6 = await self.resolve(name, dns.rdatatype.AAAA, **modified_kwargs)
-            return dns.resolver.HostAnswers.make(v6=v6)
-        elif family != socket.AF_UNSPEC:
-            raise NotImplementedError(f"unknown address family {family}")
-
-        raise_on_no_answer = modified_kwargs.pop("raise_on_no_answer", True)
-        lifetime = modified_kwargs.pop("lifetime", None)
-        start = time.time()
-        v6 = await self.resolve(
-            name,
-            dns.rdatatype.AAAA,
-            raise_on_no_answer=False,
-            lifetime=self._compute_timeout(start, lifetime),
-            **modified_kwargs,
-        )
-        # Note that setting name ensures we query the same name
-        # for A as we did for AAAA.  (This is just in case search lists
-        # are active by default in the resolver configuration and
-        # we might be talking to a server that says NXDOMAIN when it
-        # wants to say NOERROR no data.
-        name = v6.qname
-        v4 = await self.resolve(
-            name,
-            dns.rdatatype.A,
-            raise_on_no_answer=False,
-            lifetime=self._compute_timeout(start, lifetime),
-            **modified_kwargs,
-        )
-        answers = dns.resolver.HostAnswers.make(
-            v6=v6, v4=v4, add_empty=not raise_on_no_answer
-        )
-        if not answers:
-            raise NoAnswer(response=v6.response)
-        return answers
-
-    # pylint: disable=redefined-outer-name
-
-    async def canonical_name(self, name: Union[dns.name.Name, str]) -> dns.name.Name:
-        """Determine the canonical name of *name*.
-
-        The canonical name is the name the resolver uses for queries
-        after all CNAME and DNAME renamings have been applied.
-
-        *name*, a ``dns.name.Name`` or ``str``, the query name.
-
-        This method can raise any exception that ``resolve()`` can
-        raise, other than ``dns.resolver.NoAnswer`` and
-        ``dns.resolver.NXDOMAIN``.
-
-        Returns a ``dns.name.Name``.
-        """
-        try:
-            answer = await self.resolve(name, raise_on_no_answer=False)
-            canonical_name = answer.canonical_name
-        except dns.resolver.NXDOMAIN as e:
-            canonical_name = e.canonical_name
-        return canonical_name
-
-    async def try_ddr(self, lifetime: float = 5.0) -> None:
-        """Try to update the resolver's nameservers using Discovery of Designated
-        Resolvers (DDR).  If successful, the resolver will subsequently use
-        DNS-over-HTTPS or DNS-over-TLS for future queries.
-
-        *lifetime*, a float, is the maximum time to spend attempting DDR.  The default
-        is 5 seconds.
-
-        If the SVCB query is successful and results in a non-empty list of nameservers,
-        then the resolver's nameservers are set to the returned servers in priority
-        order.
-
-        The current implementation does not use any address hints from the SVCB record,
-        nor does it resolve addresses for the SCVB target name, rather it assumes that
-        the bootstrap nameserver will always be one of the addresses and uses it.
-        A future revision to the code may offer fuller support.  The code verifies that
-        the bootstrap nameserver is in the Subject Alternative Name field of the
-        TLS certficate.
-        """
-        try:
-            expiration = time.time() + lifetime
-            answer = await self.resolve(
-                dns._ddr._local_resolver_name, "svcb", lifetime=lifetime
-            )
-            timeout = dns.query._remaining(expiration)
-            nameservers = await dns._ddr._get_nameservers_async(answer, timeout)
-            if len(nameservers) > 0:
-                self.nameservers = nameservers
-        except Exception:
-            pass
-
-
-default_resolver = None
-
-
-def get_default_resolver() -> Resolver:
-    """Get the default asynchronous resolver, initializing it if necessary."""
-    if default_resolver is None:
-        reset_default_resolver()
-    assert default_resolver is not None
-    return default_resolver
-
-
-def reset_default_resolver() -> None:
-    """Re-initialize default asynchronous resolver.
-
-    Note that the resolver configuration (i.e. /etc/resolv.conf on UNIX
-    systems) will be re-read immediately.
-    """
-
-    global default_resolver
-    default_resolver = Resolver()
-
-
-async def resolve(
-    qname: Union[dns.name.Name, str],
-    rdtype: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.A,
-    rdclass: Union[dns.rdataclass.RdataClass, str] = dns.rdataclass.IN,
-    tcp: bool = False,
-    source: Optional[str] = None,
-    raise_on_no_answer: bool = True,
-    source_port: int = 0,
-    lifetime: Optional[float] = None,
-    search: Optional[bool] = None,
-    backend: Optional[dns.asyncbackend.Backend] = None,
-) -> dns.resolver.Answer:
-    """Query nameservers asynchronously to find the answer to the question.
-
-    This is a convenience function that uses the default resolver
-    object to make the query.
-
-    See :py:func:`dns.asyncresolver.Resolver.resolve` for more
-    information on the parameters.
-    """
-
-    return await get_default_resolver().resolve(
-        qname,
-        rdtype,
-        rdclass,
-        tcp,
-        source,
-        raise_on_no_answer,
-        source_port,
-        lifetime,
-        search,
-        backend,
-    )
-
-
-async def resolve_address(
-    ipaddr: str, *args: Any, **kwargs: Any
-) -> dns.resolver.Answer:
-    """Use a resolver to run a reverse query for PTR records.
-
-    See :py:func:`dns.asyncresolver.Resolver.resolve_address` for more
-    information on the parameters.
-    """
-
-    return await get_default_resolver().resolve_address(ipaddr, *args, **kwargs)
-
-
-async def resolve_name(
-    name: Union[dns.name.Name, str], family: int = socket.AF_UNSPEC, **kwargs: Any
-) -> dns.resolver.HostAnswers:
-    """Use a resolver to asynchronously query for address records.
-
-    See :py:func:`dns.asyncresolver.Resolver.resolve_name` for more
-    information on the parameters.
-    """
-
-    return await get_default_resolver().resolve_name(name, family, **kwargs)
-
-
-async def canonical_name(name: Union[dns.name.Name, str]) -> dns.name.Name:
-    """Determine the canonical name of *name*.
-
-    See :py:func:`dns.resolver.Resolver.canonical_name` for more
-    information on the parameters and possible exceptions.
-    """
-
-    return await get_default_resolver().canonical_name(name)
-
-
-async def try_ddr(timeout: float = 5.0) -> None:
-    """Try to update the default resolver's nameservers using Discovery of Designated
-    Resolvers (DDR).  If successful, the resolver will subsequently use
-    DNS-over-HTTPS or DNS-over-TLS for future queries.
-
-    See :py:func:`dns.resolver.Resolver.try_ddr` for more information.
-    """
-    return await get_default_resolver().try_ddr(timeout)
-
-
-async def zone_for_name(
-    name: Union[dns.name.Name, str],
-    rdclass: dns.rdataclass.RdataClass = dns.rdataclass.IN,
-    tcp: bool = False,
-    resolver: Optional[Resolver] = None,
-    backend: Optional[dns.asyncbackend.Backend] = None,
-) -> dns.name.Name:
-    """Find the name of the zone which contains the specified name.
-
-    See :py:func:`dns.resolver.Resolver.zone_for_name` for more
-    information on the parameters and possible exceptions.
-    """
-
-    if isinstance(name, str):
-        name = dns.name.from_text(name, dns.name.root)
-    if resolver is None:
-        resolver = get_default_resolver()
-    if not name.is_absolute():
-        raise NotAbsolute(name)
-    while True:
-        try:
-            answer = await resolver.resolve(
-                name, dns.rdatatype.SOA, rdclass, tcp, backend=backend
-            )
-            assert answer.rrset is not None
-            if answer.rrset.name == name:
-                return name
-            # otherwise we were CNAMEd or DNAMEd and need to look higher
-        except (NXDOMAIN, NoAnswer):
-            pass
-        try:
-            name = name.parent()
-        except dns.name.NoParent:  # pragma: no cover
-            raise NoRootSOA
-
-
-async def make_resolver_at(
-    where: Union[dns.name.Name, str],
-    port: int = 53,
-    family: int = socket.AF_UNSPEC,
-    resolver: Optional[Resolver] = None,
-) -> Resolver:
-    """Make a stub resolver using the specified destination as the full resolver.
-
-    *where*, a ``dns.name.Name`` or ``str`` the domain name or IP address of the
-    full resolver.
-
-    *port*, an ``int``, the port to use.  If not specified, the default is 53.
-
-    *family*, an ``int``, the address family to use.  This parameter is used if
-    *where* is not an address.  The default is ``socket.AF_UNSPEC`` in which case
-    the first address returned by ``resolve_name()`` will be used, otherwise the
-    first address of the specified family will be used.
-
-    *resolver*, a ``dns.asyncresolver.Resolver`` or ``None``, the resolver to use for
-    resolution of hostnames.  If not specified, the default resolver will be used.
-
-    Returns a ``dns.resolver.Resolver`` or raises an exception.
-    """
-    if resolver is None:
-        resolver = get_default_resolver()
-    nameservers: List[Union[str, dns.nameserver.Nameserver]] = []
-    if isinstance(where, str) and dns.inet.is_address(where):
-        nameservers.append(dns.nameserver.Do53Nameserver(where, port))
-    else:
-        answers = await resolver.resolve_name(where, family)
-        for address in answers.addresses():
-            nameservers.append(dns.nameserver.Do53Nameserver(address, port))
-    res = dns.asyncresolver.Resolver(configure=False)
-    res.nameservers = nameservers
-    return res
-
-
-async def resolve_at(
-    where: Union[dns.name.Name, str],
-    qname: Union[dns.name.Name, str],
-    rdtype: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.A,
-    rdclass: Union[dns.rdataclass.RdataClass, str] = dns.rdataclass.IN,
-    tcp: bool = False,
-    source: Optional[str] = None,
-    raise_on_no_answer: bool = True,
-    source_port: int = 0,
-    lifetime: Optional[float] = None,
-    search: Optional[bool] = None,
-    backend: Optional[dns.asyncbackend.Backend] = None,
-    port: int = 53,
-    family: int = socket.AF_UNSPEC,
-    resolver: Optional[Resolver] = None,
-) -> dns.resolver.Answer:
-    """Query nameservers to find the answer to the question.
-
-    This is a convenience function that calls ``dns.asyncresolver.make_resolver_at()``
-    to make a resolver, and then uses it to resolve the query.
-
-    See ``dns.asyncresolver.Resolver.resolve`` for more information on the resolution
-    parameters, and ``dns.asyncresolver.make_resolver_at`` for information about the
-    resolver parameters *where*, *port*, *family*, and *resolver*.
-
-    If making more than one query, it is more efficient to call
-    ``dns.asyncresolver.make_resolver_at()`` and then use that resolver for the queries
-    instead of calling ``resolve_at()`` multiple times.
-    """
-    res = await make_resolver_at(where, port, family, resolver)
-    return await res.resolve(
-        qname,
-        rdtype,
-        rdclass,
-        tcp,
-        source,
-        raise_on_no_answer,
-        source_port,
-        lifetime,
-        search,
-        backend,
-    )
diff --git a/lib/dns/dnssec.py b/lib/dns/dnssec.py
deleted file mode 100644
index b69d0a12..00000000
--- a/lib/dns/dnssec.py
+++ /dev/null
@@ -1,1247 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""Common DNSSEC-related functions and constants."""
-
-
-import base64
-import contextlib
-import functools
-import hashlib
-import struct
-import time
-from datetime import datetime
-from typing import Callable, Dict, List, Optional, Set, Tuple, Union, cast
-
-import dns._features
-import dns.exception
-import dns.name
-import dns.node
-import dns.rdata
-import dns.rdataclass
-import dns.rdataset
-import dns.rdatatype
-import dns.rrset
-import dns.transaction
-import dns.zone
-from dns.dnssectypes import Algorithm, DSDigest, NSEC3Hash
-from dns.exception import (  # pylint: disable=W0611
-    AlgorithmKeyMismatch,
-    DeniedByPolicy,
-    UnsupportedAlgorithm,
-    ValidationFailure,
-)
-from dns.rdtypes.ANY.CDNSKEY import CDNSKEY
-from dns.rdtypes.ANY.CDS import CDS
-from dns.rdtypes.ANY.DNSKEY import DNSKEY
-from dns.rdtypes.ANY.DS import DS
-from dns.rdtypes.ANY.NSEC import NSEC, Bitmap
-from dns.rdtypes.ANY.NSEC3PARAM import NSEC3PARAM
-from dns.rdtypes.ANY.RRSIG import RRSIG, sigtime_to_posixtime
-from dns.rdtypes.dnskeybase import Flag
-
-PublicKey = Union[
-    "GenericPublicKey",
-    "rsa.RSAPublicKey",
-    "ec.EllipticCurvePublicKey",
-    "ed25519.Ed25519PublicKey",
-    "ed448.Ed448PublicKey",
-]
-
-PrivateKey = Union[
-    "GenericPrivateKey",
-    "rsa.RSAPrivateKey",
-    "ec.EllipticCurvePrivateKey",
-    "ed25519.Ed25519PrivateKey",
-    "ed448.Ed448PrivateKey",
-]
-
-RRsetSigner = Callable[[dns.transaction.Transaction, dns.rrset.RRset], None]
-
-
-def algorithm_from_text(text: str) -> Algorithm:
-    """Convert text into a DNSSEC algorithm value.
-
-    *text*, a ``str``, the text to convert to into an algorithm value.
-
-    Returns an ``int``.
-    """
-
-    return Algorithm.from_text(text)
-
-
-def algorithm_to_text(value: Union[Algorithm, int]) -> str:
-    """Convert a DNSSEC algorithm value to text
-
-    *value*, a ``dns.dnssec.Algorithm``.
-
-    Returns a ``str``, the name of a DNSSEC algorithm.
-    """
-
-    return Algorithm.to_text(value)
-
-
-def to_timestamp(value: Union[datetime, str, float, int]) -> int:
-    """Convert various format to a timestamp"""
-    if isinstance(value, datetime):
-        return int(value.timestamp())
-    elif isinstance(value, str):
-        return sigtime_to_posixtime(value)
-    elif isinstance(value, float):
-        return int(value)
-    elif isinstance(value, int):
-        return value
-    else:
-        raise TypeError("Unsupported timestamp type")
-
-
-def key_id(key: Union[DNSKEY, CDNSKEY]) -> int:
-    """Return the key id (a 16-bit number) for the specified key.
-
-    *key*, a ``dns.rdtypes.ANY.DNSKEY.DNSKEY``
-
-    Returns an ``int`` between 0 and 65535
-    """
-
-    rdata = key.to_wire()
-    assert rdata is not None  # for mypy
-    if key.algorithm == Algorithm.RSAMD5:
-        return (rdata[-3] << 8) + rdata[-2]
-    else:
-        total = 0
-        for i in range(len(rdata) // 2):
-            total += (rdata[2 * i] << 8) + rdata[2 * i + 1]
-        if len(rdata) % 2 != 0:
-            total += rdata[len(rdata) - 1] << 8
-        total += (total >> 16) & 0xFFFF
-        return total & 0xFFFF
-
-
-class Policy:
-    def __init__(self):
-        pass
-
-    def ok_to_sign(self, _: DNSKEY) -> bool:  # pragma: no cover
-        return False
-
-    def ok_to_validate(self, _: DNSKEY) -> bool:  # pragma: no cover
-        return False
-
-    def ok_to_create_ds(self, _: DSDigest) -> bool:  # pragma: no cover
-        return False
-
-    def ok_to_validate_ds(self, _: DSDigest) -> bool:  # pragma: no cover
-        return False
-
-
-class SimpleDeny(Policy):
-    def __init__(self, deny_sign, deny_validate, deny_create_ds, deny_validate_ds):
-        super().__init__()
-        self._deny_sign = deny_sign
-        self._deny_validate = deny_validate
-        self._deny_create_ds = deny_create_ds
-        self._deny_validate_ds = deny_validate_ds
-
-    def ok_to_sign(self, key: DNSKEY) -> bool:
-        return key.algorithm not in self._deny_sign
-
-    def ok_to_validate(self, key: DNSKEY) -> bool:
-        return key.algorithm not in self._deny_validate
-
-    def ok_to_create_ds(self, algorithm: DSDigest) -> bool:
-        return algorithm not in self._deny_create_ds
-
-    def ok_to_validate_ds(self, algorithm: DSDigest) -> bool:
-        return algorithm not in self._deny_validate_ds
-
-
-rfc_8624_policy = SimpleDeny(
-    {Algorithm.RSAMD5, Algorithm.DSA, Algorithm.DSANSEC3SHA1, Algorithm.ECCGOST},
-    {Algorithm.RSAMD5, Algorithm.DSA, Algorithm.DSANSEC3SHA1},
-    {DSDigest.NULL, DSDigest.SHA1, DSDigest.GOST},
-    {DSDigest.NULL},
-)
-
-allow_all_policy = SimpleDeny(set(), set(), set(), set())
-
-
-default_policy = rfc_8624_policy
-
-
-def make_ds(
-    name: Union[dns.name.Name, str],
-    key: dns.rdata.Rdata,
-    algorithm: Union[DSDigest, str],
-    origin: Optional[dns.name.Name] = None,
-    policy: Optional[Policy] = None,
-    validating: bool = False,
-) -> DS:
-    """Create a DS record for a DNSSEC key.
-
-    *name*, a ``dns.name.Name`` or ``str``, the owner name of the DS record.
-
-    *key*, a ``dns.rdtypes.ANY.DNSKEY.DNSKEY`` or ``dns.rdtypes.ANY.DNSKEY.CDNSKEY``,
-    the key the DS is about.
-
-    *algorithm*, a ``str`` or ``int`` specifying the hash algorithm.
-    The currently supported hashes are "SHA1", "SHA256", and "SHA384". Case
-    does not matter for these strings.
-
-    *origin*, a ``dns.name.Name`` or ``None``.  If *key* is a relative name,
-    then it will be made absolute using the specified origin.
-
-    *policy*, a ``dns.dnssec.Policy`` or ``None``.  If ``None``, the default policy,
-    ``dns.dnssec.default_policy`` is used; this policy defaults to that of RFC 8624.
-
-    *validating*, a ``bool``.  If ``True``, then policy is checked in
-    validating mode, i.e. "Is it ok to validate using this digest algorithm?".
-    Otherwise the policy is checked in creating mode, i.e. "Is it ok to create a DS with
-    this digest algorithm?".
-
-    Raises ``UnsupportedAlgorithm`` if the algorithm is unknown.
-
-    Raises ``DeniedByPolicy`` if the algorithm is denied by policy.
-
-    Returns a ``dns.rdtypes.ANY.DS.DS``
-    """
-
-    if policy is None:
-        policy = default_policy
-    try:
-        if isinstance(algorithm, str):
-            algorithm = DSDigest[algorithm.upper()]
-    except Exception:
-        raise UnsupportedAlgorithm(f'unsupported algorithm "{algorithm}"')
-    if validating:
-        check = policy.ok_to_validate_ds
-    else:
-        check = policy.ok_to_create_ds
-    if not check(algorithm):
-        raise DeniedByPolicy
-    if not isinstance(key, (DNSKEY, CDNSKEY)):
-        raise ValueError("key is not a DNSKEY/CDNSKEY")
-    if algorithm == DSDigest.SHA1:
-        dshash = hashlib.sha1()
-    elif algorithm == DSDigest.SHA256:
-        dshash = hashlib.sha256()
-    elif algorithm == DSDigest.SHA384:
-        dshash = hashlib.sha384()
-    else:
-        raise UnsupportedAlgorithm(f'unsupported algorithm "{algorithm}"')
-
-    if isinstance(name, str):
-        name = dns.name.from_text(name, origin)
-    wire = name.canonicalize().to_wire()
-    kwire = key.to_wire(origin=origin)
-    assert wire is not None and kwire is not None  # for mypy
-    dshash.update(wire)
-    dshash.update(kwire)
-    digest = dshash.digest()
-
-    dsrdata = struct.pack("!HBB", key_id(key), key.algorithm, algorithm) + digest
-    ds = dns.rdata.from_wire(
-        dns.rdataclass.IN, dns.rdatatype.DS, dsrdata, 0, len(dsrdata)
-    )
-    return cast(DS, ds)
-
-
-def make_cds(
-    name: Union[dns.name.Name, str],
-    key: dns.rdata.Rdata,
-    algorithm: Union[DSDigest, str],
-    origin: Optional[dns.name.Name] = None,
-) -> CDS:
-    """Create a CDS record for a DNSSEC key.
-
-    *name*, a ``dns.name.Name`` or ``str``, the owner name of the DS record.
-
-    *key*, a ``dns.rdtypes.ANY.DNSKEY.DNSKEY`` or ``dns.rdtypes.ANY.DNSKEY.CDNSKEY``,
-    the key the DS is about.
-
-    *algorithm*, a ``str`` or ``int`` specifying the hash algorithm.
-    The currently supported hashes are "SHA1", "SHA256", and "SHA384". Case
-    does not matter for these strings.
-
-    *origin*, a ``dns.name.Name`` or ``None``.  If *key* is a relative name,
-    then it will be made absolute using the specified origin.
-
-    Raises ``UnsupportedAlgorithm`` if the algorithm is unknown.
-
-    Returns a ``dns.rdtypes.ANY.DS.CDS``
-    """
-
-    ds = make_ds(name, key, algorithm, origin)
-    return CDS(
-        rdclass=ds.rdclass,
-        rdtype=dns.rdatatype.CDS,
-        key_tag=ds.key_tag,
-        algorithm=ds.algorithm,
-        digest_type=ds.digest_type,
-        digest=ds.digest,
-    )
-
-
-def _find_candidate_keys(
-    keys: Dict[dns.name.Name, Union[dns.rdataset.Rdataset, dns.node.Node]], rrsig: RRSIG
-) -> Optional[List[DNSKEY]]:
-    value = keys.get(rrsig.signer)
-    if isinstance(value, dns.node.Node):
-        rdataset = value.get_rdataset(dns.rdataclass.IN, dns.rdatatype.DNSKEY)
-    else:
-        rdataset = value
-    if rdataset is None:
-        return None
-    return [
-        cast(DNSKEY, rd)
-        for rd in rdataset
-        if rd.algorithm == rrsig.algorithm
-        and key_id(rd) == rrsig.key_tag
-        and (rd.flags & Flag.ZONE) == Flag.ZONE  # RFC 4034 2.1.1
-        and rd.protocol == 3  # RFC 4034 2.1.2
-    ]
-
-
-def _get_rrname_rdataset(
-    rrset: Union[dns.rrset.RRset, Tuple[dns.name.Name, dns.rdataset.Rdataset]],
-) -> Tuple[dns.name.Name, dns.rdataset.Rdataset]:
-    if isinstance(rrset, tuple):
-        return rrset[0], rrset[1]
-    else:
-        return rrset.name, rrset
-
-
-def _validate_signature(sig: bytes, data: bytes, key: DNSKEY) -> None:
-    # pylint: disable=possibly-used-before-assignment
-    public_cls = get_algorithm_cls_from_dnskey(key).public_cls
-    try:
-        public_key = public_cls.from_dnskey(key)
-    except ValueError:
-        raise ValidationFailure("invalid public key")
-    public_key.verify(sig, data)
-
-
-def _validate_rrsig(
-    rrset: Union[dns.rrset.RRset, Tuple[dns.name.Name, dns.rdataset.Rdataset]],
-    rrsig: RRSIG,
-    keys: Dict[dns.name.Name, Union[dns.node.Node, dns.rdataset.Rdataset]],
-    origin: Optional[dns.name.Name] = None,
-    now: Optional[float] = None,
-    policy: Optional[Policy] = None,
-) -> None:
-    """Validate an RRset against a single signature rdata, throwing an
-    exception if validation is not successful.
-
-    *rrset*, the RRset to validate.  This can be a
-    ``dns.rrset.RRset`` or a (``dns.name.Name``, ``dns.rdataset.Rdataset``)
-    tuple.
-
-    *rrsig*, a ``dns.rdata.Rdata``, the signature to validate.
-
-    *keys*, the key dictionary, used to find the DNSKEY associated
-    with a given name.  The dictionary is keyed by a
-    ``dns.name.Name``, and has ``dns.node.Node`` or
-    ``dns.rdataset.Rdataset`` values.
-
-    *origin*, a ``dns.name.Name`` or ``None``, the origin to use for relative
-    names.
-
-    *now*, a ``float`` or ``None``, the time, in seconds since the epoch, to
-    use as the current time when validating.  If ``None``, the actual current
-    time is used.
-
-    *policy*, a ``dns.dnssec.Policy`` or ``None``.  If ``None``, the default policy,
-    ``dns.dnssec.default_policy`` is used; this policy defaults to that of RFC 8624.
-
-    Raises ``ValidationFailure`` if the signature is expired, not yet valid,
-    the public key is invalid, the algorithm is unknown, the verification
-    fails, etc.
-
-    Raises ``UnsupportedAlgorithm`` if the algorithm is recognized by
-    dnspython but not implemented.
-    """
-
-    if policy is None:
-        policy = default_policy
-
-    candidate_keys = _find_candidate_keys(keys, rrsig)
-    if candidate_keys is None:
-        raise ValidationFailure("unknown key")
-
-    if now is None:
-        now = time.time()
-    if rrsig.expiration < now:
-        raise ValidationFailure("expired")
-    if rrsig.inception > now:
-        raise ValidationFailure("not yet valid")
-
-    data = _make_rrsig_signature_data(rrset, rrsig, origin)
-
-    # pylint: disable=possibly-used-before-assignment
-    for candidate_key in candidate_keys:
-        if not policy.ok_to_validate(candidate_key):
-            continue
-        try:
-            _validate_signature(rrsig.signature, data, candidate_key)
-            return
-        except (InvalidSignature, ValidationFailure):
-            # this happens on an individual validation failure
-            continue
-    # nothing verified -- raise failure:
-    raise ValidationFailure("verify failure")
-
-
-def _validate(
-    rrset: Union[dns.rrset.RRset, Tuple[dns.name.Name, dns.rdataset.Rdataset]],
-    rrsigset: Union[dns.rrset.RRset, Tuple[dns.name.Name, dns.rdataset.Rdataset]],
-    keys: Dict[dns.name.Name, Union[dns.node.Node, dns.rdataset.Rdataset]],
-    origin: Optional[dns.name.Name] = None,
-    now: Optional[float] = None,
-    policy: Optional[Policy] = None,
-) -> None:
-    """Validate an RRset against a signature RRset, throwing an exception
-    if none of the signatures validate.
-
-    *rrset*, the RRset to validate.  This can be a
-    ``dns.rrset.RRset`` or a (``dns.name.Name``, ``dns.rdataset.Rdataset``)
-    tuple.
-
-    *rrsigset*, the signature RRset.  This can be a
-    ``dns.rrset.RRset`` or a (``dns.name.Name``, ``dns.rdataset.Rdataset``)
-    tuple.
-
-    *keys*, the key dictionary, used to find the DNSKEY associated
-    with a given name.  The dictionary is keyed by a
-    ``dns.name.Name``, and has ``dns.node.Node`` or
-    ``dns.rdataset.Rdataset`` values.
-
-    *origin*, a ``dns.name.Name``, the origin to use for relative names;
-    defaults to None.
-
-    *now*, an ``int`` or ``None``, the time, in seconds since the epoch, to
-    use as the current time when validating.  If ``None``, the actual current
-    time is used.
-
-    *policy*, a ``dns.dnssec.Policy`` or ``None``.  If ``None``, the default policy,
-    ``dns.dnssec.default_policy`` is used; this policy defaults to that of RFC 8624.
-
-    Raises ``ValidationFailure`` if the signature is expired, not yet valid,
-    the public key is invalid, the algorithm is unknown, the verification
-    fails, etc.
-    """
-
-    if policy is None:
-        policy = default_policy
-
-    if isinstance(origin, str):
-        origin = dns.name.from_text(origin, dns.name.root)
-
-    if isinstance(rrset, tuple):
-        rrname = rrset[0]
-    else:
-        rrname = rrset.name
-
-    if isinstance(rrsigset, tuple):
-        rrsigname = rrsigset[0]
-        rrsigrdataset = rrsigset[1]
-    else:
-        rrsigname = rrsigset.name
-        rrsigrdataset = rrsigset
-
-    rrname = rrname.choose_relativity(origin)
-    rrsigname = rrsigname.choose_relativity(origin)
-    if rrname != rrsigname:
-        raise ValidationFailure("owner names do not match")
-
-    for rrsig in rrsigrdataset:
-        if not isinstance(rrsig, RRSIG):
-            raise ValidationFailure("expected an RRSIG")
-        try:
-            _validate_rrsig(rrset, rrsig, keys, origin, now, policy)
-            return
-        except (ValidationFailure, UnsupportedAlgorithm):
-            pass
-    raise ValidationFailure("no RRSIGs validated")
-
-
-def _sign(
-    rrset: Union[dns.rrset.RRset, Tuple[dns.name.Name, dns.rdataset.Rdataset]],
-    private_key: PrivateKey,
-    signer: dns.name.Name,
-    dnskey: DNSKEY,
-    inception: Optional[Union[datetime, str, int, float]] = None,
-    expiration: Optional[Union[datetime, str, int, float]] = None,
-    lifetime: Optional[int] = None,
-    verify: bool = False,
-    policy: Optional[Policy] = None,
-    origin: Optional[dns.name.Name] = None,
-    deterministic: bool = True,
-) -> RRSIG:
-    """Sign RRset using private key.
-
-    *rrset*, the RRset to validate.  This can be a
-    ``dns.rrset.RRset`` or a (``dns.name.Name``, ``dns.rdataset.Rdataset``)
-    tuple.
-
-    *private_key*, the private key to use for signing, a
-    ``cryptography.hazmat.primitives.asymmetric`` private key class applicable
-    for DNSSEC.
-
-    *signer*, a ``dns.name.Name``, the Signer's name.
-
-    *dnskey*, a ``DNSKEY`` matching ``private_key``.
-
-    *inception*, a ``datetime``, ``str``, ``int``, ``float`` or ``None``, the
-    signature inception time.  If ``None``, the current time is used.  If a ``str``, the
-    format is "YYYYMMDDHHMMSS" or alternatively the number of seconds since the UNIX
-    epoch in text form; this is the same the RRSIG rdata's text form.
-    Values of type `int` or `float` are interpreted as seconds since the UNIX epoch.
-
-    *expiration*, a ``datetime``, ``str``, ``int``, ``float`` or ``None``, the signature
-    expiration time.  If ``None``, the expiration time will be the inception time plus
-    the value of the *lifetime* parameter.  See the description of *inception* above
-    for how the various parameter types are interpreted.
-
-    *lifetime*, an ``int`` or ``None``, the signature lifetime in seconds.  This
-    parameter is only meaningful if *expiration* is ``None``.
-
-    *verify*, a ``bool``.  If set to ``True``, the signer will verify signatures
-    after they are created; the default is ``False``.
-
-    *policy*, a ``dns.dnssec.Policy`` or ``None``.  If ``None``, the default policy,
-    ``dns.dnssec.default_policy`` is used; this policy defaults to that of RFC 8624.
-
-    *origin*, a ``dns.name.Name`` or ``None``.  If ``None``, the default, then all
-    names in the rrset (including its owner name) must be absolute; otherwise the
-    specified origin will be used to make names absolute when signing.
-
-    *deterministic*, a ``bool``. If ``True``, the default, use deterministic
-    (reproducible) signatures when supported by the algorithm used for signing.
-    Currently, this only affects ECDSA.
-
-    Raises ``DeniedByPolicy`` if the signature is denied by policy.
-    """
-
-    if policy is None:
-        policy = default_policy
-    if not policy.ok_to_sign(dnskey):
-        raise DeniedByPolicy
-
-    if isinstance(rrset, tuple):
-        rdclass = rrset[1].rdclass
-        rdtype = rrset[1].rdtype
-        rrname = rrset[0]
-        original_ttl = rrset[1].ttl
-    else:
-        rdclass = rrset.rdclass
-        rdtype = rrset.rdtype
-        rrname = rrset.name
-        original_ttl = rrset.ttl
-
-    if inception is not None:
-        rrsig_inception = to_timestamp(inception)
-    else:
-        rrsig_inception = int(time.time())
-
-    if expiration is not None:
-        rrsig_expiration = to_timestamp(expiration)
-    elif lifetime is not None:
-        rrsig_expiration = rrsig_inception + lifetime
-    else:
-        raise ValueError("expiration or lifetime must be specified")
-
-    # Derelativize now because we need a correct labels length for the
-    # rrsig_template.
-    if origin is not None:
-        rrname = rrname.derelativize(origin)
-    labels = len(rrname) - 1
-
-    # Adjust labels appropriately for wildcards.
-    if rrname.is_wild():
-        labels -= 1
-
-    rrsig_template = RRSIG(
-        rdclass=rdclass,
-        rdtype=dns.rdatatype.RRSIG,
-        type_covered=rdtype,
-        algorithm=dnskey.algorithm,
-        labels=labels,
-        original_ttl=original_ttl,
-        expiration=rrsig_expiration,
-        inception=rrsig_inception,
-        key_tag=key_id(dnskey),
-        signer=signer,
-        signature=b"",
-    )
-
-    data = dns.dnssec._make_rrsig_signature_data(rrset, rrsig_template, origin)
-
-    # pylint: disable=possibly-used-before-assignment
-    if isinstance(private_key, GenericPrivateKey):
-        signing_key = private_key
-    else:
-        try:
-            private_cls = get_algorithm_cls_from_dnskey(dnskey)
-            signing_key = private_cls(key=private_key)
-        except UnsupportedAlgorithm:
-            raise TypeError("Unsupported key algorithm")
-
-    signature = signing_key.sign(data, verify, deterministic)
-
-    return cast(RRSIG, rrsig_template.replace(signature=signature))
-
-
-def _make_rrsig_signature_data(
-    rrset: Union[dns.rrset.RRset, Tuple[dns.name.Name, dns.rdataset.Rdataset]],
-    rrsig: RRSIG,
-    origin: Optional[dns.name.Name] = None,
-) -> bytes:
-    """Create signature rdata.
-
-    *rrset*, the RRset to sign/validate.  This can be a
-    ``dns.rrset.RRset`` or a (``dns.name.Name``, ``dns.rdataset.Rdataset``)
-    tuple.
-
-    *rrsig*, a ``dns.rdata.Rdata``, the signature to validate, or the
-    signature template used when signing.
-
-    *origin*, a ``dns.name.Name`` or ``None``, the origin to use for relative
-    names.
-
-    Raises ``UnsupportedAlgorithm`` if the algorithm is recognized by
-    dnspython but not implemented.
-    """
-
-    if isinstance(origin, str):
-        origin = dns.name.from_text(origin, dns.name.root)
-
-    signer = rrsig.signer
-    if not signer.is_absolute():
-        if origin is None:
-            raise ValidationFailure("relative RR name without an origin specified")
-        signer = signer.derelativize(origin)
-
-    # For convenience, allow the rrset to be specified as a (name,
-    # rdataset) tuple as well as a proper rrset
-    rrname, rdataset = _get_rrname_rdataset(rrset)
-
-    data = b""
-    wire = rrsig.to_wire(origin=signer)
-    assert wire is not None  # for mypy
-    data += wire[:18]
-    data += rrsig.signer.to_digestable(signer)
-
-    # Derelativize the name before considering labels.
-    if not rrname.is_absolute():
-        if origin is None:
-            raise ValidationFailure("relative RR name without an origin specified")
-        rrname = rrname.derelativize(origin)
-
-    name_len = len(rrname)
-    if rrname.is_wild() and rrsig.labels != name_len - 2:
-        raise ValidationFailure("wild owner name has wrong label length")
-    if name_len - 1 < rrsig.labels:
-        raise ValidationFailure("owner name longer than RRSIG labels")
-    elif rrsig.labels < name_len - 1:
-        suffix = rrname.split(rrsig.labels + 1)[1]
-        rrname = dns.name.from_text("*", suffix)
-    rrnamebuf = rrname.to_digestable()
-    rrfixed = struct.pack("!HHI", rdataset.rdtype, rdataset.rdclass, rrsig.original_ttl)
-    rdatas = [rdata.to_digestable(origin) for rdata in rdataset]
-    for rdata in sorted(rdatas):
-        data += rrnamebuf
-        data += rrfixed
-        rrlen = struct.pack("!H", len(rdata))
-        data += rrlen
-        data += rdata
-
-    return data
-
-
-def _make_dnskey(
-    public_key: PublicKey,
-    algorithm: Union[int, str],
-    flags: int = Flag.ZONE,
-    protocol: int = 3,
-) -> DNSKEY:
-    """Convert a public key to DNSKEY Rdata
-
-    *public_key*, a ``PublicKey`` (``GenericPublicKey`` or
-    ``cryptography.hazmat.primitives.asymmetric``) to convert.
-
-    *algorithm*, a ``str`` or ``int`` specifying the DNSKEY algorithm.
-
-    *flags*: DNSKEY flags field as an integer.
-
-    *protocol*: DNSKEY protocol field as an integer.
-
-    Raises ``ValueError`` if the specified key algorithm parameters are not
-    unsupported, ``TypeError`` if the key type is unsupported,
-    `UnsupportedAlgorithm` if the algorithm is unknown and
-    `AlgorithmKeyMismatch` if the algorithm does not match the key type.
-
-    Return DNSKEY ``Rdata``.
-    """
-
-    algorithm = Algorithm.make(algorithm)
-
-    # pylint: disable=possibly-used-before-assignment
-    if isinstance(public_key, GenericPublicKey):
-        return public_key.to_dnskey(flags=flags, protocol=protocol)
-    else:
-        public_cls = get_algorithm_cls(algorithm).public_cls
-        return public_cls(key=public_key).to_dnskey(flags=flags, protocol=protocol)
-
-
-def _make_cdnskey(
-    public_key: PublicKey,
-    algorithm: Union[int, str],
-    flags: int = Flag.ZONE,
-    protocol: int = 3,
-) -> CDNSKEY:
-    """Convert a public key to CDNSKEY Rdata
-
-    *public_key*, the public key to convert, a
-    ``cryptography.hazmat.primitives.asymmetric`` public key class applicable
-    for DNSSEC.
-
-    *algorithm*, a ``str`` or ``int`` specifying the DNSKEY algorithm.
-
-    *flags*: DNSKEY flags field as an integer.
-
-    *protocol*: DNSKEY protocol field as an integer.
-
-    Raises ``ValueError`` if the specified key algorithm parameters are not
-    unsupported, ``TypeError`` if the key type is unsupported,
-    `UnsupportedAlgorithm` if the algorithm is unknown and
-    `AlgorithmKeyMismatch` if the algorithm does not match the key type.
-
-    Return CDNSKEY ``Rdata``.
-    """
-
-    dnskey = _make_dnskey(public_key, algorithm, flags, protocol)
-
-    return CDNSKEY(
-        rdclass=dnskey.rdclass,
-        rdtype=dns.rdatatype.CDNSKEY,
-        flags=dnskey.flags,
-        protocol=dnskey.protocol,
-        algorithm=dnskey.algorithm,
-        key=dnskey.key,
-    )
-
-
-def nsec3_hash(
-    domain: Union[dns.name.Name, str],
-    salt: Optional[Union[str, bytes]],
-    iterations: int,
-    algorithm: Union[int, str],
-) -> str:
-    """
-    Calculate the NSEC3 hash, according to
-    https://tools.ietf.org/html/rfc5155#section-5
-
-    *domain*, a ``dns.name.Name`` or ``str``, the name to hash.
-
-    *salt*, a ``str``, ``bytes``, or ``None``, the hash salt.  If a
-    string, it is decoded as a hex string.
-
-    *iterations*, an ``int``, the number of iterations.
-
-    *algorithm*, a ``str`` or ``int``, the hash algorithm.
-    The only defined algorithm is SHA1.
-
-    Returns a ``str``, the encoded NSEC3 hash.
-    """
-
-    b32_conversion = str.maketrans(
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567", "0123456789ABCDEFGHIJKLMNOPQRSTUV"
-    )
-
-    try:
-        if isinstance(algorithm, str):
-            algorithm = NSEC3Hash[algorithm.upper()]
-    except Exception:
-        raise ValueError("Wrong hash algorithm (only SHA1 is supported)")
-
-    if algorithm != NSEC3Hash.SHA1:
-        raise ValueError("Wrong hash algorithm (only SHA1 is supported)")
-
-    if salt is None:
-        salt_encoded = b""
-    elif isinstance(salt, str):
-        if len(salt) % 2 == 0:
-            salt_encoded = bytes.fromhex(salt)
-        else:
-            raise ValueError("Invalid salt length")
-    else:
-        salt_encoded = salt
-
-    if not isinstance(domain, dns.name.Name):
-        domain = dns.name.from_text(domain)
-    domain_encoded = domain.canonicalize().to_wire()
-    assert domain_encoded is not None
-
-    digest = hashlib.sha1(domain_encoded + salt_encoded).digest()
-    for _ in range(iterations):
-        digest = hashlib.sha1(digest + salt_encoded).digest()
-
-    output = base64.b32encode(digest).decode("utf-8")
-    output = output.translate(b32_conversion)
-
-    return output
-
-
-def make_ds_rdataset(
-    rrset: Union[dns.rrset.RRset, Tuple[dns.name.Name, dns.rdataset.Rdataset]],
-    algorithms: Set[Union[DSDigest, str]],
-    origin: Optional[dns.name.Name] = None,
-) -> dns.rdataset.Rdataset:
-    """Create a DS record from DNSKEY/CDNSKEY/CDS.
-
-    *rrset*, the RRset to create DS Rdataset for.  This can be a
-    ``dns.rrset.RRset`` or a (``dns.name.Name``, ``dns.rdataset.Rdataset``)
-    tuple.
-
-    *algorithms*, a set of ``str`` or ``int`` specifying the hash algorithms.
-    The currently supported hashes are "SHA1", "SHA256", and "SHA384". Case
-    does not matter for these strings. If the RRset is a CDS, only digest
-    algorithms matching algorithms are accepted.
-
-    *origin*, a ``dns.name.Name`` or ``None``.  If `key` is a relative name,
-    then it will be made absolute using the specified origin.
-
-    Raises ``UnsupportedAlgorithm`` if any of the algorithms are unknown and
-    ``ValueError`` if the given RRset is not usable.
-
-    Returns a ``dns.rdataset.Rdataset``
-    """
-
-    rrname, rdataset = _get_rrname_rdataset(rrset)
-
-    if rdataset.rdtype not in (
-        dns.rdatatype.DNSKEY,
-        dns.rdatatype.CDNSKEY,
-        dns.rdatatype.CDS,
-    ):
-        raise ValueError("rrset not a DNSKEY/CDNSKEY/CDS")
-
-    _algorithms = set()
-    for algorithm in algorithms:
-        try:
-            if isinstance(algorithm, str):
-                algorithm = DSDigest[algorithm.upper()]
-        except Exception:
-            raise UnsupportedAlgorithm(f'unsupported algorithm "{algorithm}"')
-        _algorithms.add(algorithm)
-
-    if rdataset.rdtype == dns.rdatatype.CDS:
-        res = []
-        for rdata in cds_rdataset_to_ds_rdataset(rdataset):
-            if rdata.digest_type in _algorithms:
-                res.append(rdata)
-        if len(res) == 0:
-            raise ValueError("no acceptable CDS rdata found")
-        return dns.rdataset.from_rdata_list(rdataset.ttl, res)
-
-    res = []
-    for algorithm in _algorithms:
-        res.extend(dnskey_rdataset_to_cds_rdataset(rrname, rdataset, algorithm, origin))
-    return dns.rdataset.from_rdata_list(rdataset.ttl, res)
-
-
-def cds_rdataset_to_ds_rdataset(
-    rdataset: dns.rdataset.Rdataset,
-) -> dns.rdataset.Rdataset:
-    """Create a CDS record from DS.
-
-    *rdataset*, a ``dns.rdataset.Rdataset``, to create DS Rdataset for.
-
-    Raises ``ValueError`` if the rdataset is not CDS.
-
-    Returns a ``dns.rdataset.Rdataset``
-    """
-
-    if rdataset.rdtype != dns.rdatatype.CDS:
-        raise ValueError("rdataset not a CDS")
-    res = []
-    for rdata in rdataset:
-        res.append(
-            CDS(
-                rdclass=rdata.rdclass,
-                rdtype=dns.rdatatype.DS,
-                key_tag=rdata.key_tag,
-                algorithm=rdata.algorithm,
-                digest_type=rdata.digest_type,
-                digest=rdata.digest,
-            )
-        )
-    return dns.rdataset.from_rdata_list(rdataset.ttl, res)
-
-
-def dnskey_rdataset_to_cds_rdataset(
-    name: Union[dns.name.Name, str],
-    rdataset: dns.rdataset.Rdataset,
-    algorithm: Union[DSDigest, str],
-    origin: Optional[dns.name.Name] = None,
-) -> dns.rdataset.Rdataset:
-    """Create a CDS record from DNSKEY/CDNSKEY.
-
-    *name*, a ``dns.name.Name`` or ``str``, the owner name of the CDS record.
-
-    *rdataset*, a ``dns.rdataset.Rdataset``, to create DS Rdataset for.
-
-    *algorithm*, a ``str`` or ``int`` specifying the hash algorithm.
-    The currently supported hashes are "SHA1", "SHA256", and "SHA384". Case
-    does not matter for these strings.
-
-    *origin*, a ``dns.name.Name`` or ``None``.  If `key` is a relative name,
-    then it will be made absolute using the specified origin.
-
-    Raises ``UnsupportedAlgorithm`` if the algorithm is unknown or
-    ``ValueError`` if the rdataset is not DNSKEY/CDNSKEY.
-
-    Returns a ``dns.rdataset.Rdataset``
-    """
-
-    if rdataset.rdtype not in (dns.rdatatype.DNSKEY, dns.rdatatype.CDNSKEY):
-        raise ValueError("rdataset not a DNSKEY/CDNSKEY")
-    res = []
-    for rdata in rdataset:
-        res.append(make_cds(name, rdata, algorithm, origin))
-    return dns.rdataset.from_rdata_list(rdataset.ttl, res)
-
-
-def dnskey_rdataset_to_cdnskey_rdataset(
-    rdataset: dns.rdataset.Rdataset,
-) -> dns.rdataset.Rdataset:
-    """Create a CDNSKEY record from DNSKEY.
-
-    *rdataset*, a ``dns.rdataset.Rdataset``, to create CDNSKEY Rdataset for.
-
-    Returns a ``dns.rdataset.Rdataset``
-    """
-
-    if rdataset.rdtype != dns.rdatatype.DNSKEY:
-        raise ValueError("rdataset not a DNSKEY")
-    res = []
-    for rdata in rdataset:
-        res.append(
-            CDNSKEY(
-                rdclass=rdataset.rdclass,
-                rdtype=rdataset.rdtype,
-                flags=rdata.flags,
-                protocol=rdata.protocol,
-                algorithm=rdata.algorithm,
-                key=rdata.key,
-            )
-        )
-    return dns.rdataset.from_rdata_list(rdataset.ttl, res)
-
-
-def default_rrset_signer(
-    txn: dns.transaction.Transaction,
-    rrset: dns.rrset.RRset,
-    signer: dns.name.Name,
-    ksks: List[Tuple[PrivateKey, DNSKEY]],
-    zsks: List[Tuple[PrivateKey, DNSKEY]],
-    inception: Optional[Union[datetime, str, int, float]] = None,
-    expiration: Optional[Union[datetime, str, int, float]] = None,
-    lifetime: Optional[int] = None,
-    policy: Optional[Policy] = None,
-    origin: Optional[dns.name.Name] = None,
-    deterministic: bool = True,
-) -> None:
-    """Default RRset signer"""
-
-    if rrset.rdtype in set(
-        [
-            dns.rdatatype.RdataType.DNSKEY,
-            dns.rdatatype.RdataType.CDS,
-            dns.rdatatype.RdataType.CDNSKEY,
-        ]
-    ):
-        keys = ksks
-    else:
-        keys = zsks
-
-    for private_key, dnskey in keys:
-        rrsig = dns.dnssec.sign(
-            rrset=rrset,
-            private_key=private_key,
-            dnskey=dnskey,
-            inception=inception,
-            expiration=expiration,
-            lifetime=lifetime,
-            signer=signer,
-            policy=policy,
-            origin=origin,
-            deterministic=deterministic,
-        )
-        txn.add(rrset.name, rrset.ttl, rrsig)
-
-
-def sign_zone(
-    zone: dns.zone.Zone,
-    txn: Optional[dns.transaction.Transaction] = None,
-    keys: Optional[List[Tuple[PrivateKey, DNSKEY]]] = None,
-    add_dnskey: bool = True,
-    dnskey_ttl: Optional[int] = None,
-    inception: Optional[Union[datetime, str, int, float]] = None,
-    expiration: Optional[Union[datetime, str, int, float]] = None,
-    lifetime: Optional[int] = None,
-    nsec3: Optional[NSEC3PARAM] = None,
-    rrset_signer: Optional[RRsetSigner] = None,
-    policy: Optional[Policy] = None,
-    deterministic: bool = True,
-) -> None:
-    """Sign zone.
-
-    *zone*, a ``dns.zone.Zone``, the zone to sign.
-
-    *txn*, a ``dns.transaction.Transaction``, an optional transaction to use for
-    signing.
-
-    *keys*, a list of (``PrivateKey``, ``DNSKEY``) tuples, to use for signing. KSK/ZSK
-    roles are assigned automatically if the SEP flag is used, otherwise all RRsets are
-    signed by all keys.
-
-    *add_dnskey*, a ``bool``.  If ``True``, the default, all specified DNSKEYs are
-    automatically added to the zone on signing.
-
-    *dnskey_ttl*, a``int``, specifies the TTL for DNSKEY RRs. If not specified the TTL
-    of the existing DNSKEY RRset used or the TTL of the SOA RRset.
-
-    *inception*, a ``datetime``, ``str``, ``int``, ``float`` or ``None``, the signature
-    inception time.  If ``None``, the current time is used.  If a ``str``, the format is
-    "YYYYMMDDHHMMSS" or alternatively the number of seconds since the UNIX epoch in text
-    form; this is the same the RRSIG rdata's text form. Values of type `int` or `float`
-    are interpreted as seconds since the UNIX epoch.
-
-    *expiration*, a ``datetime``, ``str``, ``int``, ``float`` or ``None``, the signature
-    expiration time.  If ``None``, the expiration time will be the inception time plus
-    the value of the *lifetime* parameter.  See the description of *inception* above for
-    how the various parameter types are interpreted.
-
-    *lifetime*, an ``int`` or ``None``, the signature lifetime in seconds.  This
-    parameter is only meaningful if *expiration* is ``None``.
-
-    *nsec3*, a ``NSEC3PARAM`` Rdata, configures signing using NSEC3. Not yet
-    implemented.
-
-    *rrset_signer*, a ``Callable``, an optional function for signing RRsets. The
-    function requires two arguments: transaction and RRset. If the not specified,
-    ``dns.dnssec.default_rrset_signer`` will be used.
-
-    *deterministic*, a ``bool``. If ``True``, the default, use deterministic
-    (reproducible) signatures when supported by the algorithm used for signing.
-    Currently, this only affects ECDSA.
-
-    Returns ``None``.
-    """
-
-    ksks = []
-    zsks = []
-
-    # if we have both KSKs and ZSKs, split by SEP flag. if not, sign all
-    # records with all keys
-    if keys:
-        for key in keys:
-            if key[1].flags & Flag.SEP:
-                ksks.append(key)
-            else:
-                zsks.append(key)
-        if not ksks:
-            ksks = keys
-        if not zsks:
-            zsks = keys
-    else:
-        keys = []
-
-    if txn:
-        cm: contextlib.AbstractContextManager = contextlib.nullcontext(txn)
-    else:
-        cm = zone.writer()
-
-    if zone.origin is None:
-        raise ValueError("no zone origin")
-
-    with cm as _txn:
-        if add_dnskey:
-            if dnskey_ttl is None:
-                dnskey = _txn.get(zone.origin, dns.rdatatype.DNSKEY)
-                if dnskey:
-                    dnskey_ttl = dnskey.ttl
-                else:
-                    soa = _txn.get(zone.origin, dns.rdatatype.SOA)
-                    dnskey_ttl = soa.ttl
-            for _, dnskey in keys:
-                _txn.add(zone.origin, dnskey_ttl, dnskey)
-
-        if nsec3:
-            raise NotImplementedError("Signing with NSEC3 not yet implemented")
-        else:
-            _rrset_signer = rrset_signer or functools.partial(
-                default_rrset_signer,
-                signer=zone.origin,
-                ksks=ksks,
-                zsks=zsks,
-                inception=inception,
-                expiration=expiration,
-                lifetime=lifetime,
-                policy=policy,
-                origin=zone.origin,
-                deterministic=deterministic,
-            )
-            return _sign_zone_nsec(zone, _txn, _rrset_signer)
-
-
-def _sign_zone_nsec(
-    zone: dns.zone.Zone,
-    txn: dns.transaction.Transaction,
-    rrset_signer: Optional[RRsetSigner] = None,
-) -> None:
-    """NSEC zone signer"""
-
-    def _txn_add_nsec(
-        txn: dns.transaction.Transaction,
-        name: dns.name.Name,
-        next_secure: Optional[dns.name.Name],
-        rdclass: dns.rdataclass.RdataClass,
-        ttl: int,
-        rrset_signer: Optional[RRsetSigner] = None,
-    ) -> None:
-        """NSEC zone signer helper"""
-        mandatory_types = set(
-            [dns.rdatatype.RdataType.RRSIG, dns.rdatatype.RdataType.NSEC]
-        )
-        node = txn.get_node(name)
-        if node and next_secure:
-            types = (
-                set([rdataset.rdtype for rdataset in node.rdatasets]) | mandatory_types
-            )
-            windows = Bitmap.from_rdtypes(list(types))
-            rrset = dns.rrset.from_rdata(
-                name,
-                ttl,
-                NSEC(
-                    rdclass=rdclass,
-                    rdtype=dns.rdatatype.RdataType.NSEC,
-                    next=next_secure,
-                    windows=windows,
-                ),
-            )
-            txn.add(rrset)
-            if rrset_signer:
-                rrset_signer(txn, rrset)
-
-    rrsig_ttl = zone.get_soa().minimum
-    delegation = None
-    last_secure = None
-
-    for name in sorted(txn.iterate_names()):
-        if delegation and name.is_subdomain(delegation):
-            # names below delegations are not secure
-            continue
-        elif txn.get(name, dns.rdatatype.NS) and name != zone.origin:
-            # inside delegation
-            delegation = name
-        else:
-            # outside delegation
-            delegation = None
-
-        if rrset_signer:
-            node = txn.get_node(name)
-            if node:
-                for rdataset in node.rdatasets:
-                    if rdataset.rdtype == dns.rdatatype.RRSIG:
-                        # do not sign RRSIGs
-                        continue
-                    elif delegation and rdataset.rdtype != dns.rdatatype.DS:
-                        # do not sign delegations except DS records
-                        continue
-                    else:
-                        rrset = dns.rrset.from_rdata(name, rdataset.ttl, *rdataset)
-                        rrset_signer(txn, rrset)
-
-        # We need "is not None" as the empty name is False because its length is 0.
-        if last_secure is not None:
-            _txn_add_nsec(txn, last_secure, name, zone.rdclass, rrsig_ttl, rrset_signer)
-        last_secure = name
-
-    if last_secure:
-        _txn_add_nsec(
-            txn, last_secure, zone.origin, zone.rdclass, rrsig_ttl, rrset_signer
-        )
-
-
-def _need_pyca(*args, **kwargs):
-    raise ImportError(
-        "DNSSEC validation requires python cryptography"
-    )  # pragma: no cover
-
-
-if dns._features.have("dnssec"):
-    from cryptography.exceptions import InvalidSignature
-    from cryptography.hazmat.primitives.asymmetric import dsa  # pylint: disable=W0611
-    from cryptography.hazmat.primitives.asymmetric import ec  # pylint: disable=W0611
-    from cryptography.hazmat.primitives.asymmetric import ed448  # pylint: disable=W0611
-    from cryptography.hazmat.primitives.asymmetric import rsa  # pylint: disable=W0611
-    from cryptography.hazmat.primitives.asymmetric import (  # pylint: disable=W0611
-        ed25519,
-    )
-
-    from dns.dnssecalgs import (  # pylint: disable=C0412
-        get_algorithm_cls,
-        get_algorithm_cls_from_dnskey,
-    )
-    from dns.dnssecalgs.base import GenericPrivateKey, GenericPublicKey
-
-    validate = _validate  # type: ignore
-    validate_rrsig = _validate_rrsig  # type: ignore
-    sign = _sign
-    make_dnskey = _make_dnskey
-    make_cdnskey = _make_cdnskey
-    _have_pyca = True
-else:  # pragma: no cover
-    validate = _need_pyca
-    validate_rrsig = _need_pyca
-    sign = _need_pyca
-    make_dnskey = _need_pyca
-    make_cdnskey = _need_pyca
-    _have_pyca = False
-
-### BEGIN generated Algorithm constants
-
-RSAMD5 = Algorithm.RSAMD5
-DH = Algorithm.DH
-DSA = Algorithm.DSA
-ECC = Algorithm.ECC
-RSASHA1 = Algorithm.RSASHA1
-DSANSEC3SHA1 = Algorithm.DSANSEC3SHA1
-RSASHA1NSEC3SHA1 = Algorithm.RSASHA1NSEC3SHA1
-RSASHA256 = Algorithm.RSASHA256
-RSASHA512 = Algorithm.RSASHA512
-ECCGOST = Algorithm.ECCGOST
-ECDSAP256SHA256 = Algorithm.ECDSAP256SHA256
-ECDSAP384SHA384 = Algorithm.ECDSAP384SHA384
-ED25519 = Algorithm.ED25519
-ED448 = Algorithm.ED448
-INDIRECT = Algorithm.INDIRECT
-PRIVATEDNS = Algorithm.PRIVATEDNS
-PRIVATEOID = Algorithm.PRIVATEOID
-
-### END generated Algorithm constants
diff --git a/lib/dns/dnssecalgs/__init__.py b/lib/dns/dnssecalgs/__init__.py
deleted file mode 100644
index 602367e3..00000000
--- a/lib/dns/dnssecalgs/__init__.py
+++ /dev/null
@@ -1,121 +0,0 @@
-from typing import Dict, Optional, Tuple, Type, Union
-
-import dns.name
-from dns.dnssecalgs.base import GenericPrivateKey
-from dns.dnssectypes import Algorithm
-from dns.exception import UnsupportedAlgorithm
-from dns.rdtypes.ANY.DNSKEY import DNSKEY
-
-if dns._features.have("dnssec"):
-    from dns.dnssecalgs.dsa import PrivateDSA, PrivateDSANSEC3SHA1
-    from dns.dnssecalgs.ecdsa import PrivateECDSAP256SHA256, PrivateECDSAP384SHA384
-    from dns.dnssecalgs.eddsa import PrivateED448, PrivateED25519
-    from dns.dnssecalgs.rsa import (
-        PrivateRSAMD5,
-        PrivateRSASHA1,
-        PrivateRSASHA1NSEC3SHA1,
-        PrivateRSASHA256,
-        PrivateRSASHA512,
-    )
-
-    _have_cryptography = True
-else:
-    _have_cryptography = False
-
-AlgorithmPrefix = Optional[Union[bytes, dns.name.Name]]
-
-algorithms: Dict[Tuple[Algorithm, AlgorithmPrefix], Type[GenericPrivateKey]] = {}
-if _have_cryptography:
-    # pylint: disable=possibly-used-before-assignment
-    algorithms.update(
-        {
-            (Algorithm.RSAMD5, None): PrivateRSAMD5,
-            (Algorithm.DSA, None): PrivateDSA,
-            (Algorithm.RSASHA1, None): PrivateRSASHA1,
-            (Algorithm.DSANSEC3SHA1, None): PrivateDSANSEC3SHA1,
-            (Algorithm.RSASHA1NSEC3SHA1, None): PrivateRSASHA1NSEC3SHA1,
-            (Algorithm.RSASHA256, None): PrivateRSASHA256,
-            (Algorithm.RSASHA512, None): PrivateRSASHA512,
-            (Algorithm.ECDSAP256SHA256, None): PrivateECDSAP256SHA256,
-            (Algorithm.ECDSAP384SHA384, None): PrivateECDSAP384SHA384,
-            (Algorithm.ED25519, None): PrivateED25519,
-            (Algorithm.ED448, None): PrivateED448,
-        }
-    )
-
-
-def get_algorithm_cls(
-    algorithm: Union[int, str], prefix: AlgorithmPrefix = None
-) -> Type[GenericPrivateKey]:
-    """Get Private Key class from Algorithm.
-
-    *algorithm*, a ``str`` or ``int`` specifying the DNSKEY algorithm.
-
-    Raises ``UnsupportedAlgorithm`` if the algorithm is unknown.
-
-    Returns a ``dns.dnssecalgs.GenericPrivateKey``
-    """
-    algorithm = Algorithm.make(algorithm)
-    cls = algorithms.get((algorithm, prefix))
-    if cls:
-        return cls
-    raise UnsupportedAlgorithm(
-        f'algorithm "{Algorithm.to_text(algorithm)}" not supported by dnspython'
-    )
-
-
-def get_algorithm_cls_from_dnskey(dnskey: DNSKEY) -> Type[GenericPrivateKey]:
-    """Get Private Key class from DNSKEY.
-
-    *dnskey*, a ``DNSKEY`` to get Algorithm class for.
-
-    Raises ``UnsupportedAlgorithm`` if the algorithm is unknown.
-
-    Returns a ``dns.dnssecalgs.GenericPrivateKey``
-    """
-    prefix: AlgorithmPrefix = None
-    if dnskey.algorithm == Algorithm.PRIVATEDNS:
-        prefix, _ = dns.name.from_wire(dnskey.key, 0)
-    elif dnskey.algorithm == Algorithm.PRIVATEOID:
-        length = int(dnskey.key[0])
-        prefix = dnskey.key[0 : length + 1]
-    return get_algorithm_cls(dnskey.algorithm, prefix)
-
-
-def register_algorithm_cls(
-    algorithm: Union[int, str],
-    algorithm_cls: Type[GenericPrivateKey],
-    name: Optional[Union[dns.name.Name, str]] = None,
-    oid: Optional[bytes] = None,
-) -> None:
-    """Register Algorithm Private Key class.
-
-    *algorithm*, a ``str`` or ``int`` specifying the DNSKEY algorithm.
-
-    *algorithm_cls*: A `GenericPrivateKey` class.
-
-    *name*, an optional ``dns.name.Name`` or ``str``, for for PRIVATEDNS algorithms.
-
-    *oid*: an optional BER-encoded `bytes` for PRIVATEOID algorithms.
-
-    Raises ``ValueError`` if a name or oid is specified incorrectly.
-    """
-    if not issubclass(algorithm_cls, GenericPrivateKey):
-        raise TypeError("Invalid algorithm class")
-    algorithm = Algorithm.make(algorithm)
-    prefix: AlgorithmPrefix = None
-    if algorithm == Algorithm.PRIVATEDNS:
-        if name is None:
-            raise ValueError("Name required for PRIVATEDNS algorithms")
-        if isinstance(name, str):
-            name = dns.name.from_text(name)
-        prefix = name
-    elif algorithm == Algorithm.PRIVATEOID:
-        if oid is None:
-            raise ValueError("OID required for PRIVATEOID algorithms")
-        prefix = bytes([len(oid)]) + oid
-    elif name:
-        raise ValueError("Name only supported for PRIVATEDNS algorithm")
-    elif oid:
-        raise ValueError("OID only supported for PRIVATEOID algorithm")
-    algorithms[(algorithm, prefix)] = algorithm_cls
diff --git a/lib/dns/dnssecalgs/base.py b/lib/dns/dnssecalgs/base.py
deleted file mode 100644
index 752ee480..00000000
--- a/lib/dns/dnssecalgs/base.py
+++ /dev/null
@@ -1,89 +0,0 @@
-from abc import ABC, abstractmethod  # pylint: disable=no-name-in-module
-from typing import Any, Optional, Type
-
-import dns.rdataclass
-import dns.rdatatype
-from dns.dnssectypes import Algorithm
-from dns.exception import AlgorithmKeyMismatch
-from dns.rdtypes.ANY.DNSKEY import DNSKEY
-from dns.rdtypes.dnskeybase import Flag
-
-
-class GenericPublicKey(ABC):
-    algorithm: Algorithm
-
-    @abstractmethod
-    def __init__(self, key: Any) -> None:
-        pass
-
-    @abstractmethod
-    def verify(self, signature: bytes, data: bytes) -> None:
-        """Verify signed DNSSEC data"""
-
-    @abstractmethod
-    def encode_key_bytes(self) -> bytes:
-        """Encode key as bytes for DNSKEY"""
-
-    @classmethod
-    def _ensure_algorithm_key_combination(cls, key: DNSKEY) -> None:
-        if key.algorithm != cls.algorithm:
-            raise AlgorithmKeyMismatch
-
-    def to_dnskey(self, flags: int = Flag.ZONE, protocol: int = 3) -> DNSKEY:
-        """Return public key as DNSKEY"""
-        return DNSKEY(
-            rdclass=dns.rdataclass.IN,
-            rdtype=dns.rdatatype.DNSKEY,
-            flags=flags,
-            protocol=protocol,
-            algorithm=self.algorithm,
-            key=self.encode_key_bytes(),
-        )
-
-    @classmethod
-    @abstractmethod
-    def from_dnskey(cls, key: DNSKEY) -> "GenericPublicKey":
-        """Create public key from DNSKEY"""
-
-    @classmethod
-    @abstractmethod
-    def from_pem(cls, public_pem: bytes) -> "GenericPublicKey":
-        """Create public key from PEM-encoded SubjectPublicKeyInfo as specified
-        in RFC 5280"""
-
-    @abstractmethod
-    def to_pem(self) -> bytes:
-        """Return public-key as PEM-encoded SubjectPublicKeyInfo as specified
-        in RFC 5280"""
-
-
-class GenericPrivateKey(ABC):
-    public_cls: Type[GenericPublicKey]
-
-    @abstractmethod
-    def __init__(self, key: Any) -> None:
-        pass
-
-    @abstractmethod
-    def sign(
-        self,
-        data: bytes,
-        verify: bool = False,
-        deterministic: bool = True,
-    ) -> bytes:
-        """Sign DNSSEC data"""
-
-    @abstractmethod
-    def public_key(self) -> "GenericPublicKey":
-        """Return public key instance"""
-
-    @classmethod
-    @abstractmethod
-    def from_pem(
-        cls, private_pem: bytes, password: Optional[bytes] = None
-    ) -> "GenericPrivateKey":
-        """Create private key from PEM-encoded PKCS#8"""
-
-    @abstractmethod
-    def to_pem(self, password: Optional[bytes] = None) -> bytes:
-        """Return private key as PEM-encoded PKCS#8"""
diff --git a/lib/dns/dnssecalgs/cryptography.py b/lib/dns/dnssecalgs/cryptography.py
deleted file mode 100644
index 5a31a812..00000000
--- a/lib/dns/dnssecalgs/cryptography.py
+++ /dev/null
@@ -1,68 +0,0 @@
-from typing import Any, Optional, Type
-
-from cryptography.hazmat.primitives import serialization
-
-from dns.dnssecalgs.base import GenericPrivateKey, GenericPublicKey
-from dns.exception import AlgorithmKeyMismatch
-
-
-class CryptographyPublicKey(GenericPublicKey):
-    key: Any = None
-    key_cls: Any = None
-
-    def __init__(self, key: Any) -> None:  # pylint: disable=super-init-not-called
-        if self.key_cls is None:
-            raise TypeError("Undefined private key class")
-        if not isinstance(  # pylint: disable=isinstance-second-argument-not-valid-type
-            key, self.key_cls
-        ):
-            raise AlgorithmKeyMismatch
-        self.key = key
-
-    @classmethod
-    def from_pem(cls, public_pem: bytes) -> "GenericPublicKey":
-        key = serialization.load_pem_public_key(public_pem)
-        return cls(key=key)
-
-    def to_pem(self) -> bytes:
-        return self.key.public_bytes(
-            encoding=serialization.Encoding.PEM,
-            format=serialization.PublicFormat.SubjectPublicKeyInfo,
-        )
-
-
-class CryptographyPrivateKey(GenericPrivateKey):
-    key: Any = None
-    key_cls: Any = None
-    public_cls: Type[CryptographyPublicKey]
-
-    def __init__(self, key: Any) -> None:  # pylint: disable=super-init-not-called
-        if self.key_cls is None:
-            raise TypeError("Undefined private key class")
-        if not isinstance(  # pylint: disable=isinstance-second-argument-not-valid-type
-            key, self.key_cls
-        ):
-            raise AlgorithmKeyMismatch
-        self.key = key
-
-    def public_key(self) -> "CryptographyPublicKey":
-        return self.public_cls(key=self.key.public_key())
-
-    @classmethod
-    def from_pem(
-        cls, private_pem: bytes, password: Optional[bytes] = None
-    ) -> "GenericPrivateKey":
-        key = serialization.load_pem_private_key(private_pem, password=password)
-        return cls(key=key)
-
-    def to_pem(self, password: Optional[bytes] = None) -> bytes:
-        encryption_algorithm: serialization.KeySerializationEncryption
-        if password:
-            encryption_algorithm = serialization.BestAvailableEncryption(password)
-        else:
-            encryption_algorithm = serialization.NoEncryption()
-        return self.key.private_bytes(
-            encoding=serialization.Encoding.PEM,
-            format=serialization.PrivateFormat.PKCS8,
-            encryption_algorithm=encryption_algorithm,
-        )
diff --git a/lib/dns/dnssecalgs/dsa.py b/lib/dns/dnssecalgs/dsa.py
deleted file mode 100644
index adca3def..00000000
--- a/lib/dns/dnssecalgs/dsa.py
+++ /dev/null
@@ -1,106 +0,0 @@
-import struct
-
-from cryptography.hazmat.backends import default_backend
-from cryptography.hazmat.primitives import hashes
-from cryptography.hazmat.primitives.asymmetric import dsa, utils
-
-from dns.dnssecalgs.cryptography import CryptographyPrivateKey, CryptographyPublicKey
-from dns.dnssectypes import Algorithm
-from dns.rdtypes.ANY.DNSKEY import DNSKEY
-
-
-class PublicDSA(CryptographyPublicKey):
-    key: dsa.DSAPublicKey
-    key_cls = dsa.DSAPublicKey
-    algorithm = Algorithm.DSA
-    chosen_hash = hashes.SHA1()
-
-    def verify(self, signature: bytes, data: bytes) -> None:
-        sig_r = signature[1:21]
-        sig_s = signature[21:]
-        sig = utils.encode_dss_signature(
-            int.from_bytes(sig_r, "big"), int.from_bytes(sig_s, "big")
-        )
-        self.key.verify(sig, data, self.chosen_hash)
-
-    def encode_key_bytes(self) -> bytes:
-        """Encode a public key per RFC 2536, section 2."""
-        pn = self.key.public_numbers()
-        dsa_t = (self.key.key_size // 8 - 64) // 8
-        if dsa_t > 8:
-            raise ValueError("unsupported DSA key size")
-        octets = 64 + dsa_t * 8
-        res = struct.pack("!B", dsa_t)
-        res += pn.parameter_numbers.q.to_bytes(20, "big")
-        res += pn.parameter_numbers.p.to_bytes(octets, "big")
-        res += pn.parameter_numbers.g.to_bytes(octets, "big")
-        res += pn.y.to_bytes(octets, "big")
-        return res
-
-    @classmethod
-    def from_dnskey(cls, key: DNSKEY) -> "PublicDSA":
-        cls._ensure_algorithm_key_combination(key)
-        keyptr = key.key
-        (t,) = struct.unpack("!B", keyptr[0:1])
-        keyptr = keyptr[1:]
-        octets = 64 + t * 8
-        dsa_q = keyptr[0:20]
-        keyptr = keyptr[20:]
-        dsa_p = keyptr[0:octets]
-        keyptr = keyptr[octets:]
-        dsa_g = keyptr[0:octets]
-        keyptr = keyptr[octets:]
-        dsa_y = keyptr[0:octets]
-        return cls(
-            key=dsa.DSAPublicNumbers(  # type: ignore
-                int.from_bytes(dsa_y, "big"),
-                dsa.DSAParameterNumbers(
-                    int.from_bytes(dsa_p, "big"),
-                    int.from_bytes(dsa_q, "big"),
-                    int.from_bytes(dsa_g, "big"),
-                ),
-            ).public_key(default_backend()),
-        )
-
-
-class PrivateDSA(CryptographyPrivateKey):
-    key: dsa.DSAPrivateKey
-    key_cls = dsa.DSAPrivateKey
-    public_cls = PublicDSA
-
-    def sign(
-        self,
-        data: bytes,
-        verify: bool = False,
-        deterministic: bool = True,
-    ) -> bytes:
-        """Sign using a private key per RFC 2536, section 3."""
-        public_dsa_key = self.key.public_key()
-        if public_dsa_key.key_size > 1024:
-            raise ValueError("DSA key size overflow")
-        der_signature = self.key.sign(data, self.public_cls.chosen_hash)
-        dsa_r, dsa_s = utils.decode_dss_signature(der_signature)
-        dsa_t = (public_dsa_key.key_size // 8 - 64) // 8
-        octets = 20
-        signature = (
-            struct.pack("!B", dsa_t)
-            + int.to_bytes(dsa_r, length=octets, byteorder="big")
-            + int.to_bytes(dsa_s, length=octets, byteorder="big")
-        )
-        if verify:
-            self.public_key().verify(signature, data)
-        return signature
-
-    @classmethod
-    def generate(cls, key_size: int) -> "PrivateDSA":
-        return cls(
-            key=dsa.generate_private_key(key_size=key_size),
-        )
-
-
-class PublicDSANSEC3SHA1(PublicDSA):
-    algorithm = Algorithm.DSANSEC3SHA1
-
-
-class PrivateDSANSEC3SHA1(PrivateDSA):
-    public_cls = PublicDSANSEC3SHA1
diff --git a/lib/dns/dnssecalgs/ecdsa.py b/lib/dns/dnssecalgs/ecdsa.py
deleted file mode 100644
index 86d5764c..00000000
--- a/lib/dns/dnssecalgs/ecdsa.py
+++ /dev/null
@@ -1,97 +0,0 @@
-from cryptography.hazmat.backends import default_backend
-from cryptography.hazmat.primitives import hashes
-from cryptography.hazmat.primitives.asymmetric import ec, utils
-
-from dns.dnssecalgs.cryptography import CryptographyPrivateKey, CryptographyPublicKey
-from dns.dnssectypes import Algorithm
-from dns.rdtypes.ANY.DNSKEY import DNSKEY
-
-
-class PublicECDSA(CryptographyPublicKey):
-    key: ec.EllipticCurvePublicKey
-    key_cls = ec.EllipticCurvePublicKey
-    algorithm: Algorithm
-    chosen_hash: hashes.HashAlgorithm
-    curve: ec.EllipticCurve
-    octets: int
-
-    def verify(self, signature: bytes, data: bytes) -> None:
-        sig_r = signature[0 : self.octets]
-        sig_s = signature[self.octets :]
-        sig = utils.encode_dss_signature(
-            int.from_bytes(sig_r, "big"), int.from_bytes(sig_s, "big")
-        )
-        self.key.verify(sig, data, ec.ECDSA(self.chosen_hash))
-
-    def encode_key_bytes(self) -> bytes:
-        """Encode a public key per RFC 6605, section 4."""
-        pn = self.key.public_numbers()
-        return pn.x.to_bytes(self.octets, "big") + pn.y.to_bytes(self.octets, "big")
-
-    @classmethod
-    def from_dnskey(cls, key: DNSKEY) -> "PublicECDSA":
-        cls._ensure_algorithm_key_combination(key)
-        ecdsa_x = key.key[0 : cls.octets]
-        ecdsa_y = key.key[cls.octets : cls.octets * 2]
-        return cls(
-            key=ec.EllipticCurvePublicNumbers(
-                curve=cls.curve,
-                x=int.from_bytes(ecdsa_x, "big"),
-                y=int.from_bytes(ecdsa_y, "big"),
-            ).public_key(default_backend()),
-        )
-
-
-class PrivateECDSA(CryptographyPrivateKey):
-    key: ec.EllipticCurvePrivateKey
-    key_cls = ec.EllipticCurvePrivateKey
-    public_cls = PublicECDSA
-
-    def sign(
-        self,
-        data: bytes,
-        verify: bool = False,
-        deterministic: bool = True,
-    ) -> bytes:
-        """Sign using a private key per RFC 6605, section 4."""
-        algorithm = ec.ECDSA(
-            self.public_cls.chosen_hash, deterministic_signing=deterministic
-        )
-        der_signature = self.key.sign(data, algorithm)
-        dsa_r, dsa_s = utils.decode_dss_signature(der_signature)
-        signature = int.to_bytes(
-            dsa_r, length=self.public_cls.octets, byteorder="big"
-        ) + int.to_bytes(dsa_s, length=self.public_cls.octets, byteorder="big")
-        if verify:
-            self.public_key().verify(signature, data)
-        return signature
-
-    @classmethod
-    def generate(cls) -> "PrivateECDSA":
-        return cls(
-            key=ec.generate_private_key(
-                curve=cls.public_cls.curve, backend=default_backend()
-            ),
-        )
-
-
-class PublicECDSAP256SHA256(PublicECDSA):
-    algorithm = Algorithm.ECDSAP256SHA256
-    chosen_hash = hashes.SHA256()
-    curve = ec.SECP256R1()
-    octets = 32
-
-
-class PrivateECDSAP256SHA256(PrivateECDSA):
-    public_cls = PublicECDSAP256SHA256
-
-
-class PublicECDSAP384SHA384(PublicECDSA):
-    algorithm = Algorithm.ECDSAP384SHA384
-    chosen_hash = hashes.SHA384()
-    curve = ec.SECP384R1()
-    octets = 48
-
-
-class PrivateECDSAP384SHA384(PrivateECDSA):
-    public_cls = PublicECDSAP384SHA384
diff --git a/lib/dns/dnssecalgs/eddsa.py b/lib/dns/dnssecalgs/eddsa.py
deleted file mode 100644
index 604bcbfe..00000000
--- a/lib/dns/dnssecalgs/eddsa.py
+++ /dev/null
@@ -1,70 +0,0 @@
-from typing import Type
-
-from cryptography.hazmat.primitives import serialization
-from cryptography.hazmat.primitives.asymmetric import ed448, ed25519
-
-from dns.dnssecalgs.cryptography import CryptographyPrivateKey, CryptographyPublicKey
-from dns.dnssectypes import Algorithm
-from dns.rdtypes.ANY.DNSKEY import DNSKEY
-
-
-class PublicEDDSA(CryptographyPublicKey):
-    def verify(self, signature: bytes, data: bytes) -> None:
-        self.key.verify(signature, data)
-
-    def encode_key_bytes(self) -> bytes:
-        """Encode a public key per RFC 8080, section 3."""
-        return self.key.public_bytes(
-            encoding=serialization.Encoding.Raw, format=serialization.PublicFormat.Raw
-        )
-
-    @classmethod
-    def from_dnskey(cls, key: DNSKEY) -> "PublicEDDSA":
-        cls._ensure_algorithm_key_combination(key)
-        return cls(
-            key=cls.key_cls.from_public_bytes(key.key),
-        )
-
-
-class PrivateEDDSA(CryptographyPrivateKey):
-    public_cls: Type[PublicEDDSA]
-
-    def sign(
-        self,
-        data: bytes,
-        verify: bool = False,
-        deterministic: bool = True,
-    ) -> bytes:
-        """Sign using a private key per RFC 8080, section 4."""
-        signature = self.key.sign(data)
-        if verify:
-            self.public_key().verify(signature, data)
-        return signature
-
-    @classmethod
-    def generate(cls) -> "PrivateEDDSA":
-        return cls(key=cls.key_cls.generate())
-
-
-class PublicED25519(PublicEDDSA):
-    key: ed25519.Ed25519PublicKey
-    key_cls = ed25519.Ed25519PublicKey
-    algorithm = Algorithm.ED25519
-
-
-class PrivateED25519(PrivateEDDSA):
-    key: ed25519.Ed25519PrivateKey
-    key_cls = ed25519.Ed25519PrivateKey
-    public_cls = PublicED25519
-
-
-class PublicED448(PublicEDDSA):
-    key: ed448.Ed448PublicKey
-    key_cls = ed448.Ed448PublicKey
-    algorithm = Algorithm.ED448
-
-
-class PrivateED448(PrivateEDDSA):
-    key: ed448.Ed448PrivateKey
-    key_cls = ed448.Ed448PrivateKey
-    public_cls = PublicED448
diff --git a/lib/dns/dnssecalgs/rsa.py b/lib/dns/dnssecalgs/rsa.py
deleted file mode 100644
index 27537aad..00000000
--- a/lib/dns/dnssecalgs/rsa.py
+++ /dev/null
@@ -1,124 +0,0 @@
-import math
-import struct
-
-from cryptography.hazmat.backends import default_backend
-from cryptography.hazmat.primitives import hashes
-from cryptography.hazmat.primitives.asymmetric import padding, rsa
-
-from dns.dnssecalgs.cryptography import CryptographyPrivateKey, CryptographyPublicKey
-from dns.dnssectypes import Algorithm
-from dns.rdtypes.ANY.DNSKEY import DNSKEY
-
-
-class PublicRSA(CryptographyPublicKey):
-    key: rsa.RSAPublicKey
-    key_cls = rsa.RSAPublicKey
-    algorithm: Algorithm
-    chosen_hash: hashes.HashAlgorithm
-
-    def verify(self, signature: bytes, data: bytes) -> None:
-        self.key.verify(signature, data, padding.PKCS1v15(), self.chosen_hash)
-
-    def encode_key_bytes(self) -> bytes:
-        """Encode a public key per RFC 3110, section 2."""
-        pn = self.key.public_numbers()
-        _exp_len = math.ceil(int.bit_length(pn.e) / 8)
-        exp = int.to_bytes(pn.e, length=_exp_len, byteorder="big")
-        if _exp_len > 255:
-            exp_header = b"\0" + struct.pack("!H", _exp_len)
-        else:
-            exp_header = struct.pack("!B", _exp_len)
-        if pn.n.bit_length() < 512 or pn.n.bit_length() > 4096:
-            raise ValueError("unsupported RSA key length")
-        return exp_header + exp + pn.n.to_bytes((pn.n.bit_length() + 7) // 8, "big")
-
-    @classmethod
-    def from_dnskey(cls, key: DNSKEY) -> "PublicRSA":
-        cls._ensure_algorithm_key_combination(key)
-        keyptr = key.key
-        (bytes_,) = struct.unpack("!B", keyptr[0:1])
-        keyptr = keyptr[1:]
-        if bytes_ == 0:
-            (bytes_,) = struct.unpack("!H", keyptr[0:2])
-            keyptr = keyptr[2:]
-        rsa_e = keyptr[0:bytes_]
-        rsa_n = keyptr[bytes_:]
-        return cls(
-            key=rsa.RSAPublicNumbers(
-                int.from_bytes(rsa_e, "big"), int.from_bytes(rsa_n, "big")
-            ).public_key(default_backend())
-        )
-
-
-class PrivateRSA(CryptographyPrivateKey):
-    key: rsa.RSAPrivateKey
-    key_cls = rsa.RSAPrivateKey
-    public_cls = PublicRSA
-    default_public_exponent = 65537
-
-    def sign(
-        self,
-        data: bytes,
-        verify: bool = False,
-        deterministic: bool = True,
-    ) -> bytes:
-        """Sign using a private key per RFC 3110, section 3."""
-        signature = self.key.sign(data, padding.PKCS1v15(), self.public_cls.chosen_hash)
-        if verify:
-            self.public_key().verify(signature, data)
-        return signature
-
-    @classmethod
-    def generate(cls, key_size: int) -> "PrivateRSA":
-        return cls(
-            key=rsa.generate_private_key(
-                public_exponent=cls.default_public_exponent,
-                key_size=key_size,
-                backend=default_backend(),
-            )
-        )
-
-
-class PublicRSAMD5(PublicRSA):
-    algorithm = Algorithm.RSAMD5
-    chosen_hash = hashes.MD5()
-
-
-class PrivateRSAMD5(PrivateRSA):
-    public_cls = PublicRSAMD5
-
-
-class PublicRSASHA1(PublicRSA):
-    algorithm = Algorithm.RSASHA1
-    chosen_hash = hashes.SHA1()
-
-
-class PrivateRSASHA1(PrivateRSA):
-    public_cls = PublicRSASHA1
-
-
-class PublicRSASHA1NSEC3SHA1(PublicRSA):
-    algorithm = Algorithm.RSASHA1NSEC3SHA1
-    chosen_hash = hashes.SHA1()
-
-
-class PrivateRSASHA1NSEC3SHA1(PrivateRSA):
-    public_cls = PublicRSASHA1NSEC3SHA1
-
-
-class PublicRSASHA256(PublicRSA):
-    algorithm = Algorithm.RSASHA256
-    chosen_hash = hashes.SHA256()
-
-
-class PrivateRSASHA256(PrivateRSA):
-    public_cls = PublicRSASHA256
-
-
-class PublicRSASHA512(PublicRSA):
-    algorithm = Algorithm.RSASHA512
-    chosen_hash = hashes.SHA512()
-
-
-class PrivateRSASHA512(PrivateRSA):
-    public_cls = PublicRSASHA512
diff --git a/lib/dns/dnssectypes.py b/lib/dns/dnssectypes.py
deleted file mode 100644
index 02131e0a..00000000
--- a/lib/dns/dnssectypes.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""Common DNSSEC-related types."""
-
-# This is a separate file to avoid import circularity between dns.dnssec and
-# the implementations of the DS and DNSKEY types.
-
-import dns.enum
-
-
-class Algorithm(dns.enum.IntEnum):
-    RSAMD5 = 1
-    DH = 2
-    DSA = 3
-    ECC = 4
-    RSASHA1 = 5
-    DSANSEC3SHA1 = 6
-    RSASHA1NSEC3SHA1 = 7
-    RSASHA256 = 8
-    RSASHA512 = 10
-    ECCGOST = 12
-    ECDSAP256SHA256 = 13
-    ECDSAP384SHA384 = 14
-    ED25519 = 15
-    ED448 = 16
-    INDIRECT = 252
-    PRIVATEDNS = 253
-    PRIVATEOID = 254
-
-    @classmethod
-    def _maximum(cls):
-        return 255
-
-
-class DSDigest(dns.enum.IntEnum):
-    """DNSSEC Delegation Signer Digest Algorithm"""
-
-    NULL = 0
-    SHA1 = 1
-    SHA256 = 2
-    GOST = 3
-    SHA384 = 4
-
-    @classmethod
-    def _maximum(cls):
-        return 255
-
-
-class NSEC3Hash(dns.enum.IntEnum):
-    """NSEC3 hash algorithm"""
-
-    SHA1 = 1
-
-    @classmethod
-    def _maximum(cls):
-        return 255
diff --git a/lib/dns/e164.py b/lib/dns/e164.py
deleted file mode 100644
index 453736d4..00000000
--- a/lib/dns/e164.py
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2006-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""DNS E.164 helpers."""
-
-from typing import Iterable, Optional, Union
-
-import dns.exception
-import dns.name
-import dns.resolver
-
-#: The public E.164 domain.
-public_enum_domain = dns.name.from_text("e164.arpa.")
-
-
-def from_e164(
-    text: str, origin: Optional[dns.name.Name] = public_enum_domain
-) -> dns.name.Name:
-    """Convert an E.164 number in textual form into a Name object whose
-    value is the ENUM domain name for that number.
-
-    Non-digits in the text are ignored, i.e. "16505551212",
-    "+1.650.555.1212" and "1 (650) 555-1212" are all the same.
-
-    *text*, a ``str``, is an E.164 number in textual form.
-
-    *origin*, a ``dns.name.Name``, the domain in which the number
-    should be constructed.  The default is ``e164.arpa.``.
-
-    Returns a ``dns.name.Name``.
-    """
-
-    parts = [d for d in text if d.isdigit()]
-    parts.reverse()
-    return dns.name.from_text(".".join(parts), origin=origin)
-
-
-def to_e164(
-    name: dns.name.Name,
-    origin: Optional[dns.name.Name] = public_enum_domain,
-    want_plus_prefix: bool = True,
-) -> str:
-    """Convert an ENUM domain name into an E.164 number.
-
-    Note that dnspython does not have any information about preferred
-    number formats within national numbering plans, so all numbers are
-    emitted as a simple string of digits, prefixed by a '+' (unless
-    *want_plus_prefix* is ``False``).
-
-    *name* is a ``dns.name.Name``, the ENUM domain name.
-
-    *origin* is a ``dns.name.Name``, a domain containing the ENUM
-    domain name.  The name is relativized to this domain before being
-    converted to text.  If ``None``, no relativization is done.
-
-    *want_plus_prefix* is a ``bool``.  If True, add a '+' to the beginning of
-    the returned number.
-
-    Returns a ``str``.
-
-    """
-    if origin is not None:
-        name = name.relativize(origin)
-    dlabels = [d for d in name.labels if d.isdigit() and len(d) == 1]
-    if len(dlabels) != len(name.labels):
-        raise dns.exception.SyntaxError("non-digit labels in ENUM domain name")
-    dlabels.reverse()
-    text = b"".join(dlabels)
-    if want_plus_prefix:
-        text = b"+" + text
-    return text.decode()
-
-
-def query(
-    number: str,
-    domains: Iterable[Union[dns.name.Name, str]],
-    resolver: Optional[dns.resolver.Resolver] = None,
-) -> dns.resolver.Answer:
-    """Look for NAPTR RRs for the specified number in the specified domains.
-
-    e.g. lookup('16505551212', ['e164.dnspython.org.', 'e164.arpa.'])
-
-    *number*, a ``str`` is the number to look for.
-
-    *domains* is an iterable containing ``dns.name.Name`` values.
-
-    *resolver*, a ``dns.resolver.Resolver``, is the resolver to use.  If
-    ``None``, the default resolver is used.
-    """
-
-    if resolver is None:
-        resolver = dns.resolver.get_default_resolver()
-    e_nx = dns.resolver.NXDOMAIN()
-    for domain in domains:
-        if isinstance(domain, str):
-            domain = dns.name.from_text(domain)
-        qname = dns.e164.from_e164(number, domain)
-        try:
-            return resolver.resolve(qname, "NAPTR")
-        except dns.resolver.NXDOMAIN as e:
-            e_nx += e
-    raise e_nx
diff --git a/lib/dns/edns.py b/lib/dns/edns.py
deleted file mode 100644
index f7d9ff99..00000000
--- a/lib/dns/edns.py
+++ /dev/null
@@ -1,572 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2009-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""EDNS Options"""
-
-import binascii
-import math
-import socket
-import struct
-from typing import Any, Dict, Optional, Union
-
-import dns.enum
-import dns.inet
-import dns.rdata
-import dns.wire
-
-
-class OptionType(dns.enum.IntEnum):
-    #: NSID
-    NSID = 3
-    #: DAU
-    DAU = 5
-    #: DHU
-    DHU = 6
-    #: N3U
-    N3U = 7
-    #: ECS (client-subnet)
-    ECS = 8
-    #: EXPIRE
-    EXPIRE = 9
-    #: COOKIE
-    COOKIE = 10
-    #: KEEPALIVE
-    KEEPALIVE = 11
-    #: PADDING
-    PADDING = 12
-    #: CHAIN
-    CHAIN = 13
-    #: EDE (extended-dns-error)
-    EDE = 15
-    #: REPORTCHANNEL
-    REPORTCHANNEL = 18
-
-    @classmethod
-    def _maximum(cls):
-        return 65535
-
-
-class Option:
-    """Base class for all EDNS option types."""
-
-    def __init__(self, otype: Union[OptionType, str]):
-        """Initialize an option.
-
-        *otype*, a ``dns.edns.OptionType``, is the option type.
-        """
-        self.otype = OptionType.make(otype)
-
-    def to_wire(self, file: Optional[Any] = None) -> Optional[bytes]:
-        """Convert an option to wire format.
-
-        Returns a ``bytes`` or ``None``.
-
-        """
-        raise NotImplementedError  # pragma: no cover
-
-    def to_text(self) -> str:
-        raise NotImplementedError  # pragma: no cover
-
-    @classmethod
-    def from_wire_parser(cls, otype: OptionType, parser: "dns.wire.Parser") -> "Option":
-        """Build an EDNS option object from wire format.
-
-        *otype*, a ``dns.edns.OptionType``, is the option type.
-
-        *parser*, a ``dns.wire.Parser``, the parser, which should be
-        restructed to the option length.
-
-        Returns a ``dns.edns.Option``.
-        """
-        raise NotImplementedError  # pragma: no cover
-
-    def _cmp(self, other):
-        """Compare an EDNS option with another option of the same type.
-
-        Returns < 0 if < *other*, 0 if == *other*, and > 0 if > *other*.
-        """
-        wire = self.to_wire()
-        owire = other.to_wire()
-        if wire == owire:
-            return 0
-        if wire > owire:
-            return 1
-        return -1
-
-    def __eq__(self, other):
-        if not isinstance(other, Option):
-            return False
-        if self.otype != other.otype:
-            return False
-        return self._cmp(other) == 0
-
-    def __ne__(self, other):
-        if not isinstance(other, Option):
-            return True
-        if self.otype != other.otype:
-            return True
-        return self._cmp(other) != 0
-
-    def __lt__(self, other):
-        if not isinstance(other, Option) or self.otype != other.otype:
-            return NotImplemented
-        return self._cmp(other) < 0
-
-    def __le__(self, other):
-        if not isinstance(other, Option) or self.otype != other.otype:
-            return NotImplemented
-        return self._cmp(other) <= 0
-
-    def __ge__(self, other):
-        if not isinstance(other, Option) or self.otype != other.otype:
-            return NotImplemented
-        return self._cmp(other) >= 0
-
-    def __gt__(self, other):
-        if not isinstance(other, Option) or self.otype != other.otype:
-            return NotImplemented
-        return self._cmp(other) > 0
-
-    def __str__(self):
-        return self.to_text()
-
-
-class GenericOption(Option):  # lgtm[py/missing-equals]
-    """Generic Option Class
-
-    This class is used for EDNS option types for which we have no better
-    implementation.
-    """
-
-    def __init__(self, otype: Union[OptionType, str], data: Union[bytes, str]):
-        super().__init__(otype)
-        self.data = dns.rdata.Rdata._as_bytes(data, True)
-
-    def to_wire(self, file: Optional[Any] = None) -> Optional[bytes]:
-        if file:
-            file.write(self.data)
-            return None
-        else:
-            return self.data
-
-    def to_text(self) -> str:
-        return "Generic %d" % self.otype
-
-    @classmethod
-    def from_wire_parser(
-        cls, otype: Union[OptionType, str], parser: "dns.wire.Parser"
-    ) -> Option:
-        return cls(otype, parser.get_remaining())
-
-
-class ECSOption(Option):  # lgtm[py/missing-equals]
-    """EDNS Client Subnet (ECS, RFC7871)"""
-
-    def __init__(self, address: str, srclen: Optional[int] = None, scopelen: int = 0):
-        """*address*, a ``str``, is the client address information.
-
-        *srclen*, an ``int``, the source prefix length, which is the
-        leftmost number of bits of the address to be used for the
-        lookup.  The default is 24 for IPv4 and 56 for IPv6.
-
-        *scopelen*, an ``int``, the scope prefix length.  This value
-        must be 0 in queries, and should be set in responses.
-        """
-
-        super().__init__(OptionType.ECS)
-        af = dns.inet.af_for_address(address)
-
-        if af == socket.AF_INET6:
-            self.family = 2
-            if srclen is None:
-                srclen = 56
-            address = dns.rdata.Rdata._as_ipv6_address(address)
-            srclen = dns.rdata.Rdata._as_int(srclen, 0, 128)
-            scopelen = dns.rdata.Rdata._as_int(scopelen, 0, 128)
-        elif af == socket.AF_INET:
-            self.family = 1
-            if srclen is None:
-                srclen = 24
-            address = dns.rdata.Rdata._as_ipv4_address(address)
-            srclen = dns.rdata.Rdata._as_int(srclen, 0, 32)
-            scopelen = dns.rdata.Rdata._as_int(scopelen, 0, 32)
-        else:  # pragma: no cover   (this will never happen)
-            raise ValueError("Bad address family")
-
-        assert srclen is not None
-        self.address = address
-        self.srclen = srclen
-        self.scopelen = scopelen
-
-        addrdata = dns.inet.inet_pton(af, address)
-        nbytes = int(math.ceil(srclen / 8.0))
-
-        # Truncate to srclen and pad to the end of the last octet needed
-        # See RFC section 6
-        self.addrdata = addrdata[:nbytes]
-        nbits = srclen % 8
-        if nbits != 0:
-            last = struct.pack("B", ord(self.addrdata[-1:]) & (0xFF << (8 - nbits)))
-            self.addrdata = self.addrdata[:-1] + last
-
-    def to_text(self) -> str:
-        return f"ECS {self.address}/{self.srclen} scope/{self.scopelen}"
-
-    @staticmethod
-    def from_text(text: str) -> Option:
-        """Convert a string into a `dns.edns.ECSOption`
-
-        *text*, a `str`, the text form of the option.
-
-        Returns a `dns.edns.ECSOption`.
-
-        Examples:
-
-        >>> import dns.edns
-        >>>
-        >>> # basic example
-        >>> dns.edns.ECSOption.from_text('1.2.3.4/24')
-        >>>
-        >>> # also understands scope
-        >>> dns.edns.ECSOption.from_text('1.2.3.4/24/32')
-        >>>
-        >>> # IPv6
-        >>> dns.edns.ECSOption.from_text('2001:4b98::1/64/64')
-        >>>
-        >>> # it understands results from `dns.edns.ECSOption.to_text()`
-        >>> dns.edns.ECSOption.from_text('ECS 1.2.3.4/24/32')
-        """
-        optional_prefix = "ECS"
-        tokens = text.split()
-        ecs_text = None
-        if len(tokens) == 1:
-            ecs_text = tokens[0]
-        elif len(tokens) == 2:
-            if tokens[0] != optional_prefix:
-                raise ValueError(f'could not parse ECS from "{text}"')
-            ecs_text = tokens[1]
-        else:
-            raise ValueError(f'could not parse ECS from "{text}"')
-        n_slashes = ecs_text.count("/")
-        if n_slashes == 1:
-            address, tsrclen = ecs_text.split("/")
-            tscope = "0"
-        elif n_slashes == 2:
-            address, tsrclen, tscope = ecs_text.split("/")
-        else:
-            raise ValueError(f'could not parse ECS from "{text}"')
-        try:
-            scope = int(tscope)
-        except ValueError:
-            raise ValueError("invalid scope " + f'"{tscope}": scope must be an integer')
-        try:
-            srclen = int(tsrclen)
-        except ValueError:
-            raise ValueError(
-                "invalid srclen " + f'"{tsrclen}": srclen must be an integer'
-            )
-        return ECSOption(address, srclen, scope)
-
-    def to_wire(self, file: Optional[Any] = None) -> Optional[bytes]:
-        value = (
-            struct.pack("!HBB", self.family, self.srclen, self.scopelen) + self.addrdata
-        )
-        if file:
-            file.write(value)
-            return None
-        else:
-            return value
-
-    @classmethod
-    def from_wire_parser(
-        cls, otype: Union[OptionType, str], parser: "dns.wire.Parser"
-    ) -> Option:
-        family, src, scope = parser.get_struct("!HBB")
-        addrlen = int(math.ceil(src / 8.0))
-        prefix = parser.get_bytes(addrlen)
-        if family == 1:
-            pad = 4 - addrlen
-            addr = dns.ipv4.inet_ntoa(prefix + b"\x00" * pad)
-        elif family == 2:
-            pad = 16 - addrlen
-            addr = dns.ipv6.inet_ntoa(prefix + b"\x00" * pad)
-        else:
-            raise ValueError("unsupported family")
-
-        return cls(addr, src, scope)
-
-
-class EDECode(dns.enum.IntEnum):
-    OTHER = 0
-    UNSUPPORTED_DNSKEY_ALGORITHM = 1
-    UNSUPPORTED_DS_DIGEST_TYPE = 2
-    STALE_ANSWER = 3
-    FORGED_ANSWER = 4
-    DNSSEC_INDETERMINATE = 5
-    DNSSEC_BOGUS = 6
-    SIGNATURE_EXPIRED = 7
-    SIGNATURE_NOT_YET_VALID = 8
-    DNSKEY_MISSING = 9
-    RRSIGS_MISSING = 10
-    NO_ZONE_KEY_BIT_SET = 11
-    NSEC_MISSING = 12
-    CACHED_ERROR = 13
-    NOT_READY = 14
-    BLOCKED = 15
-    CENSORED = 16
-    FILTERED = 17
-    PROHIBITED = 18
-    STALE_NXDOMAIN_ANSWER = 19
-    NOT_AUTHORITATIVE = 20
-    NOT_SUPPORTED = 21
-    NO_REACHABLE_AUTHORITY = 22
-    NETWORK_ERROR = 23
-    INVALID_DATA = 24
-
-    @classmethod
-    def _maximum(cls):
-        return 65535
-
-
-class EDEOption(Option):  # lgtm[py/missing-equals]
-    """Extended DNS Error (EDE, RFC8914)"""
-
-    _preserve_case = {"DNSKEY", "DS", "DNSSEC", "RRSIGs", "NSEC", "NXDOMAIN"}
-
-    def __init__(self, code: Union[EDECode, str], text: Optional[str] = None):
-        """*code*, a ``dns.edns.EDECode`` or ``str``, the info code of the
-        extended error.
-
-        *text*, a ``str`` or ``None``, specifying additional information about
-        the error.
-        """
-
-        super().__init__(OptionType.EDE)
-
-        self.code = EDECode.make(code)
-        if text is not None and not isinstance(text, str):
-            raise ValueError("text must be string or None")
-        self.text = text
-
-    def to_text(self) -> str:
-        output = f"EDE {self.code}"
-        if self.code in EDECode:
-            desc = EDECode.to_text(self.code)
-            desc = " ".join(
-                word if word in self._preserve_case else word.title()
-                for word in desc.split("_")
-            )
-            output += f" ({desc})"
-        if self.text is not None:
-            output += f": {self.text}"
-        return output
-
-    def to_wire(self, file: Optional[Any] = None) -> Optional[bytes]:
-        value = struct.pack("!H", self.code)
-        if self.text is not None:
-            value += self.text.encode("utf8")
-
-        if file:
-            file.write(value)
-            return None
-        else:
-            return value
-
-    @classmethod
-    def from_wire_parser(
-        cls, otype: Union[OptionType, str], parser: "dns.wire.Parser"
-    ) -> Option:
-        code = EDECode.make(parser.get_uint16())
-        text = parser.get_remaining()
-
-        if text:
-            if text[-1] == 0:  # text MAY be null-terminated
-                text = text[:-1]
-            btext = text.decode("utf8")
-        else:
-            btext = None
-
-        return cls(code, btext)
-
-
-class NSIDOption(Option):
-    def __init__(self, nsid: bytes):
-        super().__init__(OptionType.NSID)
-        self.nsid = nsid
-
-    def to_wire(self, file: Any = None) -> Optional[bytes]:
-        if file:
-            file.write(self.nsid)
-            return None
-        else:
-            return self.nsid
-
-    def to_text(self) -> str:
-        if all(c >= 0x20 and c <= 0x7E for c in self.nsid):
-            # All ASCII printable, so it's probably a string.
-            value = self.nsid.decode()
-        else:
-            value = binascii.hexlify(self.nsid).decode()
-        return f"NSID {value}"
-
-    @classmethod
-    def from_wire_parser(
-        cls, otype: Union[OptionType, str], parser: dns.wire.Parser
-    ) -> Option:
-        return cls(parser.get_remaining())
-
-
-class CookieOption(Option):
-    def __init__(self, client: bytes, server: bytes):
-        super().__init__(dns.edns.OptionType.COOKIE)
-        self.client = client
-        self.server = server
-        if len(client) != 8:
-            raise ValueError("client cookie must be 8 bytes")
-        if len(server) != 0 and (len(server) < 8 or len(server) > 32):
-            raise ValueError("server cookie must be empty or between 8 and 32 bytes")
-
-    def to_wire(self, file: Any = None) -> Optional[bytes]:
-        if file:
-            file.write(self.client)
-            if len(self.server) > 0:
-                file.write(self.server)
-            return None
-        else:
-            return self.client + self.server
-
-    def to_text(self) -> str:
-        client = binascii.hexlify(self.client).decode()
-        if len(self.server) > 0:
-            server = binascii.hexlify(self.server).decode()
-        else:
-            server = ""
-        return f"COOKIE {client}{server}"
-
-    @classmethod
-    def from_wire_parser(
-        cls, otype: Union[OptionType, str], parser: dns.wire.Parser
-    ) -> Option:
-        return cls(parser.get_bytes(8), parser.get_remaining())
-
-
-class ReportChannelOption(Option):
-    # RFC 9567
-    def __init__(self, agent_domain: dns.name.Name):
-        super().__init__(OptionType.REPORTCHANNEL)
-        self.agent_domain = agent_domain
-
-    def to_wire(self, file: Any = None) -> Optional[bytes]:
-        return self.agent_domain.to_wire(file)
-
-    def to_text(self) -> str:
-        return "REPORTCHANNEL " + self.agent_domain.to_text()
-
-    @classmethod
-    def from_wire_parser(
-        cls, otype: Union[OptionType, str], parser: dns.wire.Parser
-    ) -> Option:
-        return cls(parser.get_name())
-
-
-_type_to_class: Dict[OptionType, Any] = {
-    OptionType.ECS: ECSOption,
-    OptionType.EDE: EDEOption,
-    OptionType.NSID: NSIDOption,
-    OptionType.COOKIE: CookieOption,
-    OptionType.REPORTCHANNEL: ReportChannelOption,
-}
-
-
-def get_option_class(otype: OptionType) -> Any:
-    """Return the class for the specified option type.
-
-    The GenericOption class is used if a more specific class is not
-    known.
-    """
-
-    cls = _type_to_class.get(otype)
-    if cls is None:
-        cls = GenericOption
-    return cls
-
-
-def option_from_wire_parser(
-    otype: Union[OptionType, str], parser: "dns.wire.Parser"
-) -> Option:
-    """Build an EDNS option object from wire format.
-
-    *otype*, an ``int``, is the option type.
-
-    *parser*, a ``dns.wire.Parser``, the parser, which should be
-    restricted to the option length.
-
-    Returns an instance of a subclass of ``dns.edns.Option``.
-    """
-    otype = OptionType.make(otype)
-    cls = get_option_class(otype)
-    return cls.from_wire_parser(otype, parser)
-
-
-def option_from_wire(
-    otype: Union[OptionType, str], wire: bytes, current: int, olen: int
-) -> Option:
-    """Build an EDNS option object from wire format.
-
-    *otype*, an ``int``, is the option type.
-
-    *wire*, a ``bytes``, is the wire-format message.
-
-    *current*, an ``int``, is the offset in *wire* of the beginning
-    of the rdata.
-
-    *olen*, an ``int``, is the length of the wire-format option data
-
-    Returns an instance of a subclass of ``dns.edns.Option``.
-    """
-    parser = dns.wire.Parser(wire, current)
-    with parser.restrict_to(olen):
-        return option_from_wire_parser(otype, parser)
-
-
-def register_type(implementation: Any, otype: OptionType) -> None:
-    """Register the implementation of an option type.
-
-    *implementation*, a ``class``, is a subclass of ``dns.edns.Option``.
-
-    *otype*, an ``int``, is the option type.
-    """
-
-    _type_to_class[otype] = implementation
-
-
-### BEGIN generated OptionType constants
-
-NSID = OptionType.NSID
-DAU = OptionType.DAU
-DHU = OptionType.DHU
-N3U = OptionType.N3U
-ECS = OptionType.ECS
-EXPIRE = OptionType.EXPIRE
-COOKIE = OptionType.COOKIE
-KEEPALIVE = OptionType.KEEPALIVE
-PADDING = OptionType.PADDING
-CHAIN = OptionType.CHAIN
-EDE = OptionType.EDE
-REPORTCHANNEL = OptionType.REPORTCHANNEL
-
-### END generated OptionType constants
diff --git a/lib/dns/entropy.py b/lib/dns/entropy.py
deleted file mode 100644
index 4dcdc627..00000000
--- a/lib/dns/entropy.py
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2009-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import hashlib
-import os
-import random
-import threading
-import time
-from typing import Any, Optional
-
-
-class EntropyPool:
-    # This is an entropy pool for Python implementations that do not
-    # have a working SystemRandom.  I'm not sure there are any, but
-    # leaving this code doesn't hurt anything as the library code
-    # is used if present.
-
-    def __init__(self, seed: Optional[bytes] = None):
-        self.pool_index = 0
-        self.digest: Optional[bytearray] = None
-        self.next_byte = 0
-        self.lock = threading.Lock()
-        self.hash = hashlib.sha1()
-        self.hash_len = 20
-        self.pool = bytearray(b"\0" * self.hash_len)
-        if seed is not None:
-            self._stir(seed)
-            self.seeded = True
-            self.seed_pid = os.getpid()
-        else:
-            self.seeded = False
-            self.seed_pid = 0
-
-    def _stir(self, entropy: bytes) -> None:
-        for c in entropy:
-            if self.pool_index == self.hash_len:
-                self.pool_index = 0
-            b = c & 0xFF
-            self.pool[self.pool_index] ^= b
-            self.pool_index += 1
-
-    def stir(self, entropy: bytes) -> None:
-        with self.lock:
-            self._stir(entropy)
-
-    def _maybe_seed(self) -> None:
-        if not self.seeded or self.seed_pid != os.getpid():
-            try:
-                seed = os.urandom(16)
-            except Exception:  # pragma: no cover
-                try:
-                    with open("/dev/urandom", "rb", 0) as r:
-                        seed = r.read(16)
-                except Exception:
-                    seed = str(time.time()).encode()
-            self.seeded = True
-            self.seed_pid = os.getpid()
-            self.digest = None
-            seed = bytearray(seed)
-            self._stir(seed)
-
-    def random_8(self) -> int:
-        with self.lock:
-            self._maybe_seed()
-            if self.digest is None or self.next_byte == self.hash_len:
-                self.hash.update(bytes(self.pool))
-                self.digest = bytearray(self.hash.digest())
-                self._stir(self.digest)
-                self.next_byte = 0
-            value = self.digest[self.next_byte]
-            self.next_byte += 1
-        return value
-
-    def random_16(self) -> int:
-        return self.random_8() * 256 + self.random_8()
-
-    def random_32(self) -> int:
-        return self.random_16() * 65536 + self.random_16()
-
-    def random_between(self, first: int, last: int) -> int:
-        size = last - first + 1
-        if size > 4294967296:
-            raise ValueError("too big")
-        if size > 65536:
-            rand = self.random_32
-            max = 4294967295
-        elif size > 256:
-            rand = self.random_16
-            max = 65535
-        else:
-            rand = self.random_8
-            max = 255
-        return first + size * rand() // (max + 1)
-
-
-pool = EntropyPool()
-
-system_random: Optional[Any]
-try:
-    system_random = random.SystemRandom()
-except Exception:  # pragma: no cover
-    system_random = None
-
-
-def random_16() -> int:
-    if system_random is not None:
-        return system_random.randrange(0, 65536)
-    else:
-        return pool.random_16()
-
-
-def between(first: int, last: int) -> int:
-    if system_random is not None:
-        return system_random.randrange(first, last + 1)
-    else:
-        return pool.random_between(first, last)
diff --git a/lib/dns/enum.py b/lib/dns/enum.py
deleted file mode 100644
index 71461f17..00000000
--- a/lib/dns/enum.py
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import enum
-from typing import Type, TypeVar, Union
-
-TIntEnum = TypeVar("TIntEnum", bound="IntEnum")
-
-
-class IntEnum(enum.IntEnum):
-    @classmethod
-    def _missing_(cls, value):
-        cls._check_value(value)
-        val = int.__new__(cls, value)
-        val._name_ = cls._extra_to_text(value, None) or f"{cls._prefix()}{value}"
-        val._value_ = value
-        return val
-
-    @classmethod
-    def _check_value(cls, value):
-        max = cls._maximum()
-        if not isinstance(value, int):
-            raise TypeError
-        if value < 0 or value > max:
-            name = cls._short_name()
-            raise ValueError(f"{name} must be an int between >= 0 and <= {max}")
-
-    @classmethod
-    def from_text(cls: Type[TIntEnum], text: str) -> TIntEnum:
-        text = text.upper()
-        try:
-            return cls[text]
-        except KeyError:
-            pass
-        value = cls._extra_from_text(text)
-        if value:
-            return value
-        prefix = cls._prefix()
-        if text.startswith(prefix) and text[len(prefix) :].isdigit():
-            value = int(text[len(prefix) :])
-            cls._check_value(value)
-            try:
-                return cls(value)
-            except ValueError:
-                return value
-        raise cls._unknown_exception_class()
-
-    @classmethod
-    def to_text(cls: Type[TIntEnum], value: int) -> str:
-        cls._check_value(value)
-        try:
-            text = cls(value).name
-        except ValueError:
-            text = None
-        text = cls._extra_to_text(value, text)
-        if text is None:
-            text = f"{cls._prefix()}{value}"
-        return text
-
-    @classmethod
-    def make(cls: Type[TIntEnum], value: Union[int, str]) -> TIntEnum:
-        """Convert text or a value into an enumerated type, if possible.
-
-        *value*, the ``int`` or ``str`` to convert.
-
-        Raises a class-specific exception if a ``str`` is provided that
-        cannot be converted.
-
-        Raises ``ValueError`` if the value is out of range.
-
-        Returns an enumeration from the calling class corresponding to the
-        value, if one is defined, or an ``int`` otherwise.
-        """
-
-        if isinstance(value, str):
-            return cls.from_text(value)
-        cls._check_value(value)
-        return cls(value)
-
-    @classmethod
-    def _maximum(cls):
-        raise NotImplementedError  # pragma: no cover
-
-    @classmethod
-    def _short_name(cls):
-        return cls.__name__.lower()
-
-    @classmethod
-    def _prefix(cls):
-        return ""
-
-    @classmethod
-    def _extra_from_text(cls, text):  # pylint: disable=W0613
-        return None
-
-    @classmethod
-    def _extra_to_text(cls, value, current_text):  # pylint: disable=W0613
-        return current_text
-
-    @classmethod
-    def _unknown_exception_class(cls):
-        return ValueError
diff --git a/lib/dns/exception.py b/lib/dns/exception.py
deleted file mode 100644
index 223f2d68..00000000
--- a/lib/dns/exception.py
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""Common DNS Exceptions.
-
-Dnspython modules may also define their own exceptions, which will
-always be subclasses of ``DNSException``.
-"""
-
-
-from typing import Optional, Set
-
-
-class DNSException(Exception):
-    """Abstract base class shared by all dnspython exceptions.
-
-    It supports two basic modes of operation:
-
-    a) Old/compatible mode is used if ``__init__`` was called with
-    empty *kwargs*.  In compatible mode all *args* are passed
-    to the standard Python Exception class as before and all *args* are
-    printed by the standard ``__str__`` implementation.  Class variable
-    ``msg`` (or doc string if ``msg`` is ``None``) is returned from ``str()``
-    if *args* is empty.
-
-    b) New/parametrized mode is used if ``__init__`` was called with
-    non-empty *kwargs*.
-    In the new mode *args* must be empty and all kwargs must match
-    those set in class variable ``supp_kwargs``. All kwargs are stored inside
-    ``self.kwargs`` and used in a new ``__str__`` implementation to construct
-    a formatted message based on the ``fmt`` class variable, a ``string``.
-
-    In the simplest case it is enough to override the ``supp_kwargs``
-    and ``fmt`` class variables to get nice parametrized messages.
-    """
-
-    msg: Optional[str] = None  # non-parametrized message
-    supp_kwargs: Set[str] = set()  # accepted parameters for _fmt_kwargs (sanity check)
-    fmt: Optional[str] = None  # message parametrized with results from _fmt_kwargs
-
-    def __init__(self, *args, **kwargs):
-        self._check_params(*args, **kwargs)
-        if kwargs:
-            # This call to a virtual method from __init__ is ok in our usage
-            self.kwargs = self._check_kwargs(**kwargs)  # lgtm[py/init-calls-subclass]
-            self.msg = str(self)
-        else:
-            self.kwargs = dict()  # defined but empty for old mode exceptions
-        if self.msg is None:
-            # doc string is better implicit message than empty string
-            self.msg = self.__doc__
-        if args:
-            super().__init__(*args)
-        else:
-            super().__init__(self.msg)
-
-    def _check_params(self, *args, **kwargs):
-        """Old exceptions supported only args and not kwargs.
-
-        For sanity we do not allow to mix old and new behavior."""
-        if args or kwargs:
-            assert bool(args) != bool(
-                kwargs
-            ), "keyword arguments are mutually exclusive with positional args"
-
-    def _check_kwargs(self, **kwargs):
-        if kwargs:
-            assert (
-                set(kwargs.keys()) == self.supp_kwargs
-            ), f"following set of keyword args is required: {self.supp_kwargs}"
-        return kwargs
-
-    def _fmt_kwargs(self, **kwargs):
-        """Format kwargs before printing them.
-
-        Resulting dictionary has to have keys necessary for str.format call
-        on fmt class variable.
-        """
-        fmtargs = {}
-        for kw, data in kwargs.items():
-            if isinstance(data, (list, set)):
-                # convert list of <someobj> to list of str(<someobj>)
-                fmtargs[kw] = list(map(str, data))
-                if len(fmtargs[kw]) == 1:
-                    # remove list brackets [] from single-item lists
-                    fmtargs[kw] = fmtargs[kw].pop()
-            else:
-                fmtargs[kw] = data
-        return fmtargs
-
-    def __str__(self):
-        if self.kwargs and self.fmt:
-            # provide custom message constructed from keyword arguments
-            fmtargs = self._fmt_kwargs(**self.kwargs)
-            return self.fmt.format(**fmtargs)
-        else:
-            # print *args directly in the same way as old DNSException
-            return super().__str__()
-
-
-class FormError(DNSException):
-    """DNS message is malformed."""
-
-
-class SyntaxError(DNSException):
-    """Text input is malformed."""
-
-
-class UnexpectedEnd(SyntaxError):
-    """Text input ended unexpectedly."""
-
-
-class TooBig(DNSException):
-    """The DNS message is too big."""
-
-
-class Timeout(DNSException):
-    """The DNS operation timed out."""
-
-    supp_kwargs = {"timeout"}
-    fmt = "The DNS operation timed out after {timeout:.3f} seconds"
-
-    # We do this as otherwise mypy complains about unexpected keyword argument
-    # idna_exception
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-
-class UnsupportedAlgorithm(DNSException):
-    """The DNSSEC algorithm is not supported."""
-
-
-class AlgorithmKeyMismatch(UnsupportedAlgorithm):
-    """The DNSSEC algorithm is not supported for the given key type."""
-
-
-class ValidationFailure(DNSException):
-    """The DNSSEC signature is invalid."""
-
-
-class DeniedByPolicy(DNSException):
-    """Denied by DNSSEC policy."""
-
-
-class ExceptionWrapper:
-    def __init__(self, exception_class):
-        self.exception_class = exception_class
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        if exc_type is not None and not isinstance(exc_val, self.exception_class):
-            raise self.exception_class(str(exc_val)) from exc_val
-        return False
diff --git a/lib/dns/flags.py b/lib/dns/flags.py
deleted file mode 100644
index 4c60be13..00000000
--- a/lib/dns/flags.py
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2001-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""DNS Message Flags."""
-
-import enum
-from typing import Any
-
-# Standard DNS flags
-
-
-class Flag(enum.IntFlag):
-    #: Query Response
-    QR = 0x8000
-    #: Authoritative Answer
-    AA = 0x0400
-    #: Truncated Response
-    TC = 0x0200
-    #: Recursion Desired
-    RD = 0x0100
-    #: Recursion Available
-    RA = 0x0080
-    #: Authentic Data
-    AD = 0x0020
-    #: Checking Disabled
-    CD = 0x0010
-
-
-# EDNS flags
-
-
-class EDNSFlag(enum.IntFlag):
-    #: DNSSEC answer OK
-    DO = 0x8000
-
-
-def _from_text(text: str, enum_class: Any) -> int:
-    flags = 0
-    tokens = text.split()
-    for t in tokens:
-        flags |= enum_class[t.upper()]
-    return flags
-
-
-def _to_text(flags: int, enum_class: Any) -> str:
-    text_flags = []
-    for k, v in enum_class.__members__.items():
-        if flags & v != 0:
-            text_flags.append(k)
-    return " ".join(text_flags)
-
-
-def from_text(text: str) -> int:
-    """Convert a space-separated list of flag text values into a flags
-    value.
-
-    Returns an ``int``
-    """
-
-    return _from_text(text, Flag)
-
-
-def to_text(flags: int) -> str:
-    """Convert a flags value into a space-separated list of flag text
-    values.
-
-    Returns a ``str``.
-    """
-
-    return _to_text(flags, Flag)
-
-
-def edns_from_text(text: str) -> int:
-    """Convert a space-separated list of EDNS flag text values into a EDNS
-    flags value.
-
-    Returns an ``int``
-    """
-
-    return _from_text(text, EDNSFlag)
-
-
-def edns_to_text(flags: int) -> str:
-    """Convert an EDNS flags value into a space-separated list of EDNS flag
-    text values.
-
-    Returns a ``str``.
-    """
-
-    return _to_text(flags, EDNSFlag)
-
-
-### BEGIN generated Flag constants
-
-QR = Flag.QR
-AA = Flag.AA
-TC = Flag.TC
-RD = Flag.RD
-RA = Flag.RA
-AD = Flag.AD
-CD = Flag.CD
-
-### END generated Flag constants
-
-### BEGIN generated EDNSFlag constants
-
-DO = EDNSFlag.DO
-
-### END generated EDNSFlag constants
diff --git a/lib/dns/grange.py b/lib/dns/grange.py
deleted file mode 100644
index a967ca41..00000000
--- a/lib/dns/grange.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2012-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""DNS GENERATE range conversion."""
-
-from typing import Tuple
-
-import dns
-
-
-def from_text(text: str) -> Tuple[int, int, int]:
-    """Convert the text form of a range in a ``$GENERATE`` statement to an
-    integer.
-
-    *text*, a ``str``, the textual range in ``$GENERATE`` form.
-
-    Returns a tuple of three ``int`` values ``(start, stop, step)``.
-    """
-
-    start = -1
-    stop = -1
-    step = 1
-    cur = ""
-    state = 0
-    # state   0   1   2
-    #         x - y / z
-
-    if text and text[0] == "-":
-        raise dns.exception.SyntaxError("Start cannot be a negative number")
-
-    for c in text:
-        if c == "-" and state == 0:
-            start = int(cur)
-            cur = ""
-            state = 1
-        elif c == "/":
-            stop = int(cur)
-            cur = ""
-            state = 2
-        elif c.isdigit():
-            cur += c
-        else:
-            raise dns.exception.SyntaxError(f"Could not parse {c}")
-
-    if state == 0:
-        raise dns.exception.SyntaxError("no stop value specified")
-    elif state == 1:
-        stop = int(cur)
-    else:
-        assert state == 2
-        step = int(cur)
-
-    assert step >= 1
-    assert start >= 0
-    if start > stop:
-        raise dns.exception.SyntaxError("start must be <= stop")
-
-    return (start, stop, step)
diff --git a/lib/dns/immutable.py b/lib/dns/immutable.py
deleted file mode 100644
index 36b0362c..00000000
--- a/lib/dns/immutable.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-import collections.abc
-from typing import Any, Callable
-
-from dns._immutable_ctx import immutable
-
-
-@immutable
-class Dict(collections.abc.Mapping):  # lgtm[py/missing-equals]
-    def __init__(
-        self,
-        dictionary: Any,
-        no_copy: bool = False,
-        map_factory: Callable[[], collections.abc.MutableMapping] = dict,
-    ):
-        """Make an immutable dictionary from the specified dictionary.
-
-        If *no_copy* is `True`, then *dictionary* will be wrapped instead
-        of copied.  Only set this if you are sure there will be no external
-        references to the dictionary.
-        """
-        if no_copy and isinstance(dictionary, collections.abc.MutableMapping):
-            self._odict = dictionary
-        else:
-            self._odict = map_factory()
-            self._odict.update(dictionary)
-        self._hash = None
-
-    def __getitem__(self, key):
-        return self._odict.__getitem__(key)
-
-    def __hash__(self):  # pylint: disable=invalid-hash-returned
-        if self._hash is None:
-            h = 0
-            for key in sorted(self._odict.keys()):
-                h ^= hash(key)
-            object.__setattr__(self, "_hash", h)
-        # this does return an int, but pylint doesn't figure that out
-        return self._hash
-
-    def __len__(self):
-        return len(self._odict)
-
-    def __iter__(self):
-        return iter(self._odict)
-
-
-def constify(o: Any) -> Any:
-    """
-    Convert mutable types to immutable types.
-    """
-    if isinstance(o, bytearray):
-        return bytes(o)
-    if isinstance(o, tuple):
-        try:
-            hash(o)
-            return o
-        except Exception:
-            return tuple(constify(elt) for elt in o)
-    if isinstance(o, list):
-        return tuple(constify(elt) for elt in o)
-    if isinstance(o, dict):
-        cdict = dict()
-        for k, v in o.items():
-            cdict[k] = constify(v)
-        return Dict(cdict, True)
-    return o
diff --git a/lib/dns/inet.py b/lib/dns/inet.py
deleted file mode 100644
index 4a03f996..00000000
--- a/lib/dns/inet.py
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""Generic Internet address helper functions."""
-
-import socket
-from typing import Any, Optional, Tuple
-
-import dns.ipv4
-import dns.ipv6
-
-# We assume that AF_INET and AF_INET6 are always defined.  We keep
-# these here for the benefit of any old code (unlikely though that
-# is!).
-AF_INET = socket.AF_INET
-AF_INET6 = socket.AF_INET6
-
-
-def inet_pton(family: int, text: str) -> bytes:
-    """Convert the textual form of a network address into its binary form.
-
-    *family* is an ``int``, the address family.
-
-    *text* is a ``str``, the textual address.
-
-    Raises ``NotImplementedError`` if the address family specified is not
-    implemented.
-
-    Returns a ``bytes``.
-    """
-
-    if family == AF_INET:
-        return dns.ipv4.inet_aton(text)
-    elif family == AF_INET6:
-        return dns.ipv6.inet_aton(text, True)
-    else:
-        raise NotImplementedError
-
-
-def inet_ntop(family: int, address: bytes) -> str:
-    """Convert the binary form of a network address into its textual form.
-
-    *family* is an ``int``, the address family.
-
-    *address* is a ``bytes``, the network address in binary form.
-
-    Raises ``NotImplementedError`` if the address family specified is not
-    implemented.
-
-    Returns a ``str``.
-    """
-
-    if family == AF_INET:
-        return dns.ipv4.inet_ntoa(address)
-    elif family == AF_INET6:
-        return dns.ipv6.inet_ntoa(address)
-    else:
-        raise NotImplementedError
-
-
-def af_for_address(text: str) -> int:
-    """Determine the address family of a textual-form network address.
-
-    *text*, a ``str``, the textual address.
-
-    Raises ``ValueError`` if the address family cannot be determined
-    from the input.
-
-    Returns an ``int``.
-    """
-
-    try:
-        dns.ipv4.inet_aton(text)
-        return AF_INET
-    except Exception:
-        try:
-            dns.ipv6.inet_aton(text, True)
-            return AF_INET6
-        except Exception:
-            raise ValueError
-
-
-def is_multicast(text: str) -> bool:
-    """Is the textual-form network address a multicast address?
-
-    *text*, a ``str``, the textual address.
-
-    Raises ``ValueError`` if the address family cannot be determined
-    from the input.
-
-    Returns a ``bool``.
-    """
-
-    try:
-        first = dns.ipv4.inet_aton(text)[0]
-        return first >= 224 and first <= 239
-    except Exception:
-        try:
-            first = dns.ipv6.inet_aton(text, True)[0]
-            return first == 255
-        except Exception:
-            raise ValueError
-
-
-def is_address(text: str) -> bool:
-    """Is the specified string an IPv4 or IPv6 address?
-
-    *text*, a ``str``, the textual address.
-
-    Returns a ``bool``.
-    """
-
-    try:
-        dns.ipv4.inet_aton(text)
-        return True
-    except Exception:
-        try:
-            dns.ipv6.inet_aton(text, True)
-            return True
-        except Exception:
-            return False
-
-
-def low_level_address_tuple(
-    high_tuple: Tuple[str, int], af: Optional[int] = None
-) -> Any:
-    """Given a "high-level" address tuple, i.e.
-    an (address, port) return the appropriate "low-level" address tuple
-    suitable for use in socket calls.
-
-    If an *af* other than ``None`` is provided, it is assumed the
-    address in the high-level tuple is valid and has that af.  If af
-    is ``None``, then af_for_address will be called.
-    """
-    address, port = high_tuple
-    if af is None:
-        af = af_for_address(address)
-    if af == AF_INET:
-        return (address, port)
-    elif af == AF_INET6:
-        i = address.find("%")
-        if i < 0:
-            # no scope, shortcut!
-            return (address, port, 0, 0)
-        # try to avoid getaddrinfo()
-        addrpart = address[:i]
-        scope = address[i + 1 :]
-        if scope.isdigit():
-            return (addrpart, port, 0, int(scope))
-        try:
-            return (addrpart, port, 0, socket.if_nametoindex(scope))
-        except AttributeError:  # pragma: no cover  (we can't really test this)
-            ai_flags = socket.AI_NUMERICHOST
-            ((*_, tup), *_) = socket.getaddrinfo(address, port, flags=ai_flags)
-            return tup
-    else:
-        raise NotImplementedError(f"unknown address family {af}")
-
-
-def any_for_af(af):
-    """Return the 'any' address for the specified address family."""
-    if af == socket.AF_INET:
-        return "0.0.0.0"
-    elif af == socket.AF_INET6:
-        return "::"
-    raise NotImplementedError(f"unknown address family {af}")
-
-
-def canonicalize(text: str) -> str:
-    """Verify that *address* is a valid text form IPv4 or IPv6 address and return its
-    canonical text form.  IPv6 addresses with scopes are rejected.
-
-    *text*, a ``str``, the address in textual form.
-
-    Raises ``ValueError`` if the text is not valid.
-    """
-    try:
-        return dns.ipv6.canonicalize(text)
-    except Exception:
-        try:
-            return dns.ipv4.canonicalize(text)
-        except Exception:
-            raise ValueError
diff --git a/lib/dns/ipv4.py b/lib/dns/ipv4.py
deleted file mode 100644
index 65ee69c0..00000000
--- a/lib/dns/ipv4.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""IPv4 helper functions."""
-
-import struct
-from typing import Union
-
-import dns.exception
-
-
-def inet_ntoa(address: bytes) -> str:
-    """Convert an IPv4 address in binary form to text form.
-
-    *address*, a ``bytes``, the IPv4 address in binary form.
-
-    Returns a ``str``.
-    """
-
-    if len(address) != 4:
-        raise dns.exception.SyntaxError
-    return "%u.%u.%u.%u" % (address[0], address[1], address[2], address[3])
-
-
-def inet_aton(text: Union[str, bytes]) -> bytes:
-    """Convert an IPv4 address in text form to binary form.
-
-    *text*, a ``str`` or ``bytes``, the IPv4 address in textual form.
-
-    Returns a ``bytes``.
-    """
-
-    if not isinstance(text, bytes):
-        btext = text.encode()
-    else:
-        btext = text
-    parts = btext.split(b".")
-    if len(parts) != 4:
-        raise dns.exception.SyntaxError
-    for part in parts:
-        if not part.isdigit():
-            raise dns.exception.SyntaxError
-        if len(part) > 1 and part[0] == ord("0"):
-            # No leading zeros
-            raise dns.exception.SyntaxError
-    try:
-        b = [int(part) for part in parts]
-        return struct.pack("BBBB", *b)
-    except Exception:
-        raise dns.exception.SyntaxError
-
-
-def canonicalize(text: Union[str, bytes]) -> str:
-    """Verify that *address* is a valid text form IPv4 address and return its
-    canonical text form.
-
-    *text*, a ``str`` or ``bytes``, the IPv4 address in textual form.
-
-    Raises ``dns.exception.SyntaxError`` if the text is not valid.
-    """
-    # Note that inet_aton() only accepts canonial form, but we still run through
-    # inet_ntoa() to ensure the output is a str.
-    return dns.ipv4.inet_ntoa(dns.ipv4.inet_aton(text))
diff --git a/lib/dns/ipv6.py b/lib/dns/ipv6.py
deleted file mode 100644
index 4dd1d1ca..00000000
--- a/lib/dns/ipv6.py
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""IPv6 helper functions."""
-
-import binascii
-import re
-from typing import List, Union
-
-import dns.exception
-import dns.ipv4
-
-_leading_zero = re.compile(r"0+([0-9a-f]+)")
-
-
-def inet_ntoa(address: bytes) -> str:
-    """Convert an IPv6 address in binary form to text form.
-
-    *address*, a ``bytes``, the IPv6 address in binary form.
-
-    Raises ``ValueError`` if the address isn't 16 bytes long.
-    Returns a ``str``.
-    """
-
-    if len(address) != 16:
-        raise ValueError("IPv6 addresses are 16 bytes long")
-    hex = binascii.hexlify(address)
-    chunks = []
-    i = 0
-    l = len(hex)
-    while i < l:
-        chunk = hex[i : i + 4].decode()
-        # strip leading zeros.  we do this with an re instead of
-        # with lstrip() because lstrip() didn't support chars until
-        # python 2.2.2
-        m = _leading_zero.match(chunk)
-        if m is not None:
-            chunk = m.group(1)
-        chunks.append(chunk)
-        i += 4
-    #
-    # Compress the longest subsequence of 0-value chunks to ::
-    #
-    best_start = 0
-    best_len = 0
-    start = -1
-    last_was_zero = False
-    for i in range(8):
-        if chunks[i] != "0":
-            if last_was_zero:
-                end = i
-                current_len = end - start
-                if current_len > best_len:
-                    best_start = start
-                    best_len = current_len
-                last_was_zero = False
-        elif not last_was_zero:
-            start = i
-            last_was_zero = True
-    if last_was_zero:
-        end = 8
-        current_len = end - start
-        if current_len > best_len:
-            best_start = start
-            best_len = current_len
-    if best_len > 1:
-        if best_start == 0 and (best_len == 6 or best_len == 5 and chunks[5] == "ffff"):
-            # We have an embedded IPv4 address
-            if best_len == 6:
-                prefix = "::"
-            else:
-                prefix = "::ffff:"
-            thex = prefix + dns.ipv4.inet_ntoa(address[12:])
-        else:
-            thex = (
-                ":".join(chunks[:best_start])
-                + "::"
-                + ":".join(chunks[best_start + best_len :])
-            )
-    else:
-        thex = ":".join(chunks)
-    return thex
-
-
-_v4_ending = re.compile(rb"(.*):(\d+\.\d+\.\d+\.\d+)$")
-_colon_colon_start = re.compile(rb"::.*")
-_colon_colon_end = re.compile(rb".*::$")
-
-
-def inet_aton(text: Union[str, bytes], ignore_scope: bool = False) -> bytes:
-    """Convert an IPv6 address in text form to binary form.
-
-    *text*, a ``str`` or ``bytes``, the IPv6 address in textual form.
-
-    *ignore_scope*, a ``bool``.  If ``True``, a scope will be ignored.
-    If ``False``, the default, it is an error for a scope to be present.
-
-    Returns a ``bytes``.
-    """
-
-    #
-    # Our aim here is not something fast; we just want something that works.
-    #
-    if not isinstance(text, bytes):
-        btext = text.encode()
-    else:
-        btext = text
-
-    if ignore_scope:
-        parts = btext.split(b"%")
-        l = len(parts)
-        if l == 2:
-            btext = parts[0]
-        elif l > 2:
-            raise dns.exception.SyntaxError
-
-    if btext == b"":
-        raise dns.exception.SyntaxError
-    elif btext.endswith(b":") and not btext.endswith(b"::"):
-        raise dns.exception.SyntaxError
-    elif btext.startswith(b":") and not btext.startswith(b"::"):
-        raise dns.exception.SyntaxError
-    elif btext == b"::":
-        btext = b"0::"
-    #
-    # Get rid of the icky dot-quad syntax if we have it.
-    #
-    m = _v4_ending.match(btext)
-    if m is not None:
-        b = dns.ipv4.inet_aton(m.group(2))
-        btext = (
-            f"{m.group(1).decode()}:{b[0]:02x}{b[1]:02x}:{b[2]:02x}{b[3]:02x}"
-        ).encode()
-    #
-    # Try to turn '::<whatever>' into ':<whatever>'; if no match try to
-    # turn '<whatever>::' into '<whatever>:'
-    #
-    m = _colon_colon_start.match(btext)
-    if m is not None:
-        btext = btext[1:]
-    else:
-        m = _colon_colon_end.match(btext)
-        if m is not None:
-            btext = btext[:-1]
-    #
-    # Now canonicalize into 8 chunks of 4 hex digits each
-    #
-    chunks = btext.split(b":")
-    l = len(chunks)
-    if l > 8:
-        raise dns.exception.SyntaxError
-    seen_empty = False
-    canonical: List[bytes] = []
-    for c in chunks:
-        if c == b"":
-            if seen_empty:
-                raise dns.exception.SyntaxError
-            seen_empty = True
-            for _ in range(0, 8 - l + 1):
-                canonical.append(b"0000")
-        else:
-            lc = len(c)
-            if lc > 4:
-                raise dns.exception.SyntaxError
-            if lc != 4:
-                c = (b"0" * (4 - lc)) + c
-            canonical.append(c)
-    if l < 8 and not seen_empty:
-        raise dns.exception.SyntaxError
-    btext = b"".join(canonical)
-
-    #
-    # Finally we can go to binary.
-    #
-    try:
-        return binascii.unhexlify(btext)
-    except (binascii.Error, TypeError):
-        raise dns.exception.SyntaxError
-
-
-_mapped_prefix = b"\x00" * 10 + b"\xff\xff"
-
-
-def is_mapped(address: bytes) -> bool:
-    """Is the specified address a mapped IPv4 address?
-
-    *address*, a ``bytes`` is an IPv6 address in binary form.
-
-    Returns a ``bool``.
-    """
-
-    return address.startswith(_mapped_prefix)
-
-
-def canonicalize(text: Union[str, bytes]) -> str:
-    """Verify that *address* is a valid text form IPv6 address and return its
-    canonical text form.  Addresses with scopes are rejected.
-
-    *text*, a ``str`` or ``bytes``, the IPv6 address in textual form.
-
-    Raises ``dns.exception.SyntaxError`` if the text is not valid.
-    """
-    return dns.ipv6.inet_ntoa(dns.ipv6.inet_aton(text))
diff --git a/lib/dns/message.py b/lib/dns/message.py
deleted file mode 100644
index e978a0a2..00000000
--- a/lib/dns/message.py
+++ /dev/null
@@ -1,1933 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2001-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""DNS Messages"""
-
-import contextlib
-import enum
-import io
-import time
-from typing import Any, Dict, List, Optional, Tuple, Union, cast
-
-import dns.edns
-import dns.entropy
-import dns.enum
-import dns.exception
-import dns.flags
-import dns.name
-import dns.opcode
-import dns.rcode
-import dns.rdata
-import dns.rdataclass
-import dns.rdatatype
-import dns.rdtypes.ANY.OPT
-import dns.rdtypes.ANY.TSIG
-import dns.renderer
-import dns.rrset
-import dns.tsig
-import dns.ttl
-import dns.wire
-
-
-class ShortHeader(dns.exception.FormError):
-    """The DNS packet passed to from_wire() is too short."""
-
-
-class TrailingJunk(dns.exception.FormError):
-    """The DNS packet passed to from_wire() has extra junk at the end of it."""
-
-
-class UnknownHeaderField(dns.exception.DNSException):
-    """The header field name was not recognized when converting from text
-    into a message."""
-
-
-class BadEDNS(dns.exception.FormError):
-    """An OPT record occurred somewhere other than
-    the additional data section."""
-
-
-class BadTSIG(dns.exception.FormError):
-    """A TSIG record occurred somewhere other than the end of
-    the additional data section."""
-
-
-class UnknownTSIGKey(dns.exception.DNSException):
-    """A TSIG with an unknown key was received."""
-
-
-class Truncated(dns.exception.DNSException):
-    """The truncated flag is set."""
-
-    supp_kwargs = {"message"}
-
-    # We do this as otherwise mypy complains about unexpected keyword argument
-    # idna_exception
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-    def message(self):
-        """As much of the message as could be processed.
-
-        Returns a ``dns.message.Message``.
-        """
-        return self.kwargs["message"]
-
-
-class NotQueryResponse(dns.exception.DNSException):
-    """Message is not a response to a query."""
-
-
-class ChainTooLong(dns.exception.DNSException):
-    """The CNAME chain is too long."""
-
-
-class AnswerForNXDOMAIN(dns.exception.DNSException):
-    """The rcode is NXDOMAIN but an answer was found."""
-
-
-class NoPreviousName(dns.exception.SyntaxError):
-    """No previous name was known."""
-
-
-class MessageSection(dns.enum.IntEnum):
-    """Message sections"""
-
-    QUESTION = 0
-    ANSWER = 1
-    AUTHORITY = 2
-    ADDITIONAL = 3
-
-    @classmethod
-    def _maximum(cls):
-        return 3
-
-
-class MessageError:
-    def __init__(self, exception: Exception, offset: int):
-        self.exception = exception
-        self.offset = offset
-
-
-DEFAULT_EDNS_PAYLOAD = 1232
-MAX_CHAIN = 16
-
-IndexKeyType = Tuple[
-    int,
-    dns.name.Name,
-    dns.rdataclass.RdataClass,
-    dns.rdatatype.RdataType,
-    Optional[dns.rdatatype.RdataType],
-    Optional[dns.rdataclass.RdataClass],
-]
-IndexType = Dict[IndexKeyType, dns.rrset.RRset]
-SectionType = Union[int, str, List[dns.rrset.RRset]]
-
-
-class Message:
-    """A DNS message."""
-
-    _section_enum = MessageSection
-
-    def __init__(self, id: Optional[int] = None):
-        if id is None:
-            self.id = dns.entropy.random_16()
-        else:
-            self.id = id
-        self.flags = 0
-        self.sections: List[List[dns.rrset.RRset]] = [[], [], [], []]
-        self.opt: Optional[dns.rrset.RRset] = None
-        self.request_payload = 0
-        self.pad = 0
-        self.keyring: Any = None
-        self.tsig: Optional[dns.rrset.RRset] = None
-        self.request_mac = b""
-        self.xfr = False
-        self.origin: Optional[dns.name.Name] = None
-        self.tsig_ctx: Optional[Any] = None
-        self.index: IndexType = {}
-        self.errors: List[MessageError] = []
-        self.time = 0.0
-        self.wire: Optional[bytes] = None
-
-    @property
-    def question(self) -> List[dns.rrset.RRset]:
-        """The question section."""
-        return self.sections[0]
-
-    @question.setter
-    def question(self, v):
-        self.sections[0] = v
-
-    @property
-    def answer(self) -> List[dns.rrset.RRset]:
-        """The answer section."""
-        return self.sections[1]
-
-    @answer.setter
-    def answer(self, v):
-        self.sections[1] = v
-
-    @property
-    def authority(self) -> List[dns.rrset.RRset]:
-        """The authority section."""
-        return self.sections[2]
-
-    @authority.setter
-    def authority(self, v):
-        self.sections[2] = v
-
-    @property
-    def additional(self) -> List[dns.rrset.RRset]:
-        """The additional data section."""
-        return self.sections[3]
-
-    @additional.setter
-    def additional(self, v):
-        self.sections[3] = v
-
-    def __repr__(self):
-        return "<DNS message, ID " + repr(self.id) + ">"
-
-    def __str__(self):
-        return self.to_text()
-
-    def to_text(
-        self,
-        origin: Optional[dns.name.Name] = None,
-        relativize: bool = True,
-        **kw: Dict[str, Any],
-    ) -> str:
-        """Convert the message to text.
-
-        The *origin*, *relativize*, and any other keyword
-        arguments are passed to the RRset ``to_wire()`` method.
-
-        Returns a ``str``.
-        """
-
-        s = io.StringIO()
-        s.write("id %d\n" % self.id)
-        s.write(f"opcode {dns.opcode.to_text(self.opcode())}\n")
-        s.write(f"rcode {dns.rcode.to_text(self.rcode())}\n")
-        s.write(f"flags {dns.flags.to_text(self.flags)}\n")
-        if self.edns >= 0:
-            s.write(f"edns {self.edns}\n")
-            if self.ednsflags != 0:
-                s.write(f"eflags {dns.flags.edns_to_text(self.ednsflags)}\n")
-            s.write("payload %d\n" % self.payload)
-        for opt in self.options:
-            s.write(f"option {opt.to_text()}\n")
-        for name, which in self._section_enum.__members__.items():
-            s.write(f";{name}\n")
-            for rrset in self.section_from_number(which):
-                s.write(rrset.to_text(origin, relativize, **kw))
-                s.write("\n")
-        #
-        # We strip off the final \n so the caller can print the result without
-        # doing weird things to get around eccentricities in Python print
-        # formatting
-        #
-        return s.getvalue()[:-1]
-
-    def __eq__(self, other):
-        """Two messages are equal if they have the same content in the
-        header, question, answer, and authority sections.
-
-        Returns a ``bool``.
-        """
-
-        if not isinstance(other, Message):
-            return False
-        if self.id != other.id:
-            return False
-        if self.flags != other.flags:
-            return False
-        for i, section in enumerate(self.sections):
-            other_section = other.sections[i]
-            for n in section:
-                if n not in other_section:
-                    return False
-            for n in other_section:
-                if n not in section:
-                    return False
-        return True
-
-    def __ne__(self, other):
-        return not self.__eq__(other)
-
-    def is_response(self, other: "Message") -> bool:
-        """Is *other*, also a ``dns.message.Message``, a response to this
-        message?
-
-        Returns a ``bool``.
-        """
-
-        if (
-            other.flags & dns.flags.QR == 0
-            or self.id != other.id
-            or dns.opcode.from_flags(self.flags) != dns.opcode.from_flags(other.flags)
-        ):
-            return False
-        if other.rcode() in {
-            dns.rcode.FORMERR,
-            dns.rcode.SERVFAIL,
-            dns.rcode.NOTIMP,
-            dns.rcode.REFUSED,
-        }:
-            # We don't check the question section in these cases if
-            # the other question section is empty, even though they
-            # still really ought to have a question section.
-            if len(other.question) == 0:
-                return True
-        if dns.opcode.is_update(self.flags):
-            # This is assuming the "sender doesn't include anything
-            # from the update", but we don't care to check the other
-            # case, which is that all the sections are returned and
-            # identical.
-            return True
-        for n in self.question:
-            if n not in other.question:
-                return False
-        for n in other.question:
-            if n not in self.question:
-                return False
-        return True
-
-    def section_number(self, section: List[dns.rrset.RRset]) -> int:
-        """Return the "section number" of the specified section for use
-        in indexing.
-
-        *section* is one of the section attributes of this message.
-
-        Raises ``ValueError`` if the section isn't known.
-
-        Returns an ``int``.
-        """
-
-        for i, our_section in enumerate(self.sections):
-            if section is our_section:
-                return self._section_enum(i)
-        raise ValueError("unknown section")
-
-    def section_from_number(self, number: int) -> List[dns.rrset.RRset]:
-        """Return the section list associated with the specified section
-        number.
-
-        *number* is a section number `int` or the text form of a section
-        name.
-
-        Raises ``ValueError`` if the section isn't known.
-
-        Returns a ``list``.
-        """
-
-        section = self._section_enum.make(number)
-        return self.sections[section]
-
-    def find_rrset(
-        self,
-        section: SectionType,
-        name: dns.name.Name,
-        rdclass: dns.rdataclass.RdataClass,
-        rdtype: dns.rdatatype.RdataType,
-        covers: dns.rdatatype.RdataType = dns.rdatatype.NONE,
-        deleting: Optional[dns.rdataclass.RdataClass] = None,
-        create: bool = False,
-        force_unique: bool = False,
-        idna_codec: Optional[dns.name.IDNACodec] = None,
-    ) -> dns.rrset.RRset:
-        """Find the RRset with the given attributes in the specified section.
-
-        *section*, an ``int`` section number, a ``str`` section name, or one of
-        the section attributes of this message.  This specifies the
-        the section of the message to search.  For example::
-
-            my_message.find_rrset(my_message.answer, name, rdclass, rdtype)
-            my_message.find_rrset(dns.message.ANSWER, name, rdclass, rdtype)
-            my_message.find_rrset("ANSWER", name, rdclass, rdtype)
-
-        *name*, a ``dns.name.Name`` or ``str``, the name of the RRset.
-
-        *rdclass*, an ``int`` or ``str``, the class of the RRset.
-
-        *rdtype*, an ``int`` or ``str``, the type of the RRset.
-
-        *covers*, an ``int`` or ``str``, the covers value of the RRset.
-        The default is ``dns.rdatatype.NONE``.
-
-        *deleting*, an ``int``, ``str``, or ``None``, the deleting value of the
-        RRset.  The default is ``None``.
-
-        *create*, a ``bool``.  If ``True``, create the RRset if it is not found.
-        The created RRset is appended to *section*.
-
-        *force_unique*, a ``bool``.  If ``True`` and *create* is also ``True``,
-        create a new RRset regardless of whether a matching RRset exists
-        already.  The default is ``False``.  This is useful when creating
-        DDNS Update messages, as order matters for them.
-
-        *idna_codec*, a ``dns.name.IDNACodec``, specifies the IDNA
-        encoder/decoder.  If ``None``, the default IDNA 2003 encoder/decoder
-        is used.
-
-        Raises ``KeyError`` if the RRset was not found and create was
-        ``False``.
-
-        Returns a ``dns.rrset.RRset object``.
-        """
-
-        if isinstance(section, int):
-            section_number = section
-            section = self.section_from_number(section_number)
-        elif isinstance(section, str):
-            section_number = self._section_enum.from_text(section)
-            section = self.section_from_number(section_number)
-        else:
-            section_number = self.section_number(section)
-        if isinstance(name, str):
-            name = dns.name.from_text(name, idna_codec=idna_codec)
-        rdtype = dns.rdatatype.RdataType.make(rdtype)
-        rdclass = dns.rdataclass.RdataClass.make(rdclass)
-        covers = dns.rdatatype.RdataType.make(covers)
-        if deleting is not None:
-            deleting = dns.rdataclass.RdataClass.make(deleting)
-        key = (section_number, name, rdclass, rdtype, covers, deleting)
-        if not force_unique:
-            if self.index is not None:
-                rrset = self.index.get(key)
-                if rrset is not None:
-                    return rrset
-            else:
-                for rrset in section:
-                    if rrset.full_match(name, rdclass, rdtype, covers, deleting):
-                        return rrset
-        if not create:
-            raise KeyError
-        rrset = dns.rrset.RRset(name, rdclass, rdtype, covers, deleting)
-        section.append(rrset)
-        if self.index is not None:
-            self.index[key] = rrset
-        return rrset
-
-    def get_rrset(
-        self,
-        section: SectionType,
-        name: dns.name.Name,
-        rdclass: dns.rdataclass.RdataClass,
-        rdtype: dns.rdatatype.RdataType,
-        covers: dns.rdatatype.RdataType = dns.rdatatype.NONE,
-        deleting: Optional[dns.rdataclass.RdataClass] = None,
-        create: bool = False,
-        force_unique: bool = False,
-        idna_codec: Optional[dns.name.IDNACodec] = None,
-    ) -> Optional[dns.rrset.RRset]:
-        """Get the RRset with the given attributes in the specified section.
-
-        If the RRset is not found, None is returned.
-
-        *section*, an ``int`` section number, a ``str`` section name, or one of
-        the section attributes of this message.  This specifies the
-        the section of the message to search.  For example::
-
-            my_message.get_rrset(my_message.answer, name, rdclass, rdtype)
-            my_message.get_rrset(dns.message.ANSWER, name, rdclass, rdtype)
-            my_message.get_rrset("ANSWER", name, rdclass, rdtype)
-
-        *name*, a ``dns.name.Name`` or ``str``, the name of the RRset.
-
-        *rdclass*, an ``int`` or ``str``, the class of the RRset.
-
-        *rdtype*, an ``int`` or ``str``, the type of the RRset.
-
-        *covers*, an ``int`` or ``str``, the covers value of the RRset.
-        The default is ``dns.rdatatype.NONE``.
-
-        *deleting*, an ``int``, ``str``, or ``None``, the deleting value of the
-        RRset.  The default is ``None``.
-
-        *create*, a ``bool``.  If ``True``, create the RRset if it is not found.
-        The created RRset is appended to *section*.
-
-        *force_unique*, a ``bool``.  If ``True`` and *create* is also ``True``,
-        create a new RRset regardless of whether a matching RRset exists
-        already.  The default is ``False``.  This is useful when creating
-        DDNS Update messages, as order matters for them.
-
-        *idna_codec*, a ``dns.name.IDNACodec``, specifies the IDNA
-        encoder/decoder.  If ``None``, the default IDNA 2003 encoder/decoder
-        is used.
-
-        Returns a ``dns.rrset.RRset object`` or ``None``.
-        """
-
-        try:
-            rrset = self.find_rrset(
-                section,
-                name,
-                rdclass,
-                rdtype,
-                covers,
-                deleting,
-                create,
-                force_unique,
-                idna_codec,
-            )
-        except KeyError:
-            rrset = None
-        return rrset
-
-    def section_count(self, section: SectionType) -> int:
-        """Returns the number of records in the specified section.
-
-        *section*, an ``int`` section number, a ``str`` section name, or one of
-        the section attributes of this message.  This specifies the
-        the section of the message to count.  For example::
-
-            my_message.section_count(my_message.answer)
-            my_message.section_count(dns.message.ANSWER)
-            my_message.section_count("ANSWER")
-        """
-
-        if isinstance(section, int):
-            section_number = section
-            section = self.section_from_number(section_number)
-        elif isinstance(section, str):
-            section_number = self._section_enum.from_text(section)
-            section = self.section_from_number(section_number)
-        else:
-            section_number = self.section_number(section)
-        count = sum(max(1, len(rrs)) for rrs in section)
-        if section_number == MessageSection.ADDITIONAL:
-            if self.opt is not None:
-                count += 1
-            if self.tsig is not None:
-                count += 1
-        return count
-
-    def _compute_opt_reserve(self) -> int:
-        """Compute the size required for the OPT RR, padding excluded"""
-        if not self.opt:
-            return 0
-        # 1 byte for the root name, 10 for the standard RR fields
-        size = 11
-        # This would be more efficient if options had a size() method, but we won't
-        # worry about that for now.  We also don't worry if there is an existing padding
-        # option, as it is unlikely and probably harmless, as the worst case is that we
-        # may add another, and this seems to be legal.
-        for option in self.opt[0].options:
-            wire = option.to_wire()
-            # We add 4 here to account for the option type and length
-            size += len(wire) + 4
-        if self.pad:
-            # Padding will be added, so again add the option type and length.
-            size += 4
-        return size
-
-    def _compute_tsig_reserve(self) -> int:
-        """Compute the size required for the TSIG RR"""
-        # This would be more efficient if TSIGs had a size method, but we won't
-        # worry about for now.  Also, we can't really cope with the potential
-        # compressibility of the TSIG owner name, so we estimate with the uncompressed
-        # size.  We will disable compression when TSIG and padding are both is active
-        # so that the padding comes out right.
-        if not self.tsig:
-            return 0
-        f = io.BytesIO()
-        self.tsig.to_wire(f)
-        return len(f.getvalue())
-
-    def to_wire(
-        self,
-        origin: Optional[dns.name.Name] = None,
-        max_size: int = 0,
-        multi: bool = False,
-        tsig_ctx: Optional[Any] = None,
-        prepend_length: bool = False,
-        prefer_truncation: bool = False,
-        **kw: Dict[str, Any],
-    ) -> bytes:
-        """Return a string containing the message in DNS compressed wire
-        format.
-
-        Additional keyword arguments are passed to the RRset ``to_wire()``
-        method.
-
-        *origin*, a ``dns.name.Name`` or ``None``, the origin to be appended
-        to any relative names.  If ``None``, and the message has an origin
-        attribute that is not ``None``, then it will be used.
-
-        *max_size*, an ``int``, the maximum size of the wire format
-        output; default is 0, which means "the message's request
-        payload, if nonzero, or 65535".
-
-        *multi*, a ``bool``, should be set to ``True`` if this message is
-        part of a multiple message sequence.
-
-        *tsig_ctx*, a ``dns.tsig.HMACTSig`` or ``dns.tsig.GSSTSig`` object, the
-        ongoing TSIG context, used when signing zone transfers.
-
-        *prepend_length*, a ``bool``, should be set to ``True`` if the caller
-        wants the message length prepended to the message itself.  This is
-        useful for messages sent over TCP, TLS (DoT), or QUIC (DoQ).
-
-        *prefer_truncation*, a ``bool``, should be set to ``True`` if the caller
-        wants the message to be truncated if it would otherwise exceed the
-        maximum length.  If the truncation occurs before the additional section,
-        the TC bit will be set.
-
-        Raises ``dns.exception.TooBig`` if *max_size* was exceeded.
-
-        Returns a ``bytes``.
-        """
-
-        if origin is None and self.origin is not None:
-            origin = self.origin
-        if max_size == 0:
-            if self.request_payload != 0:
-                max_size = self.request_payload
-            else:
-                max_size = 65535
-        if max_size < 512:
-            max_size = 512
-        elif max_size > 65535:
-            max_size = 65535
-        r = dns.renderer.Renderer(self.id, self.flags, max_size, origin)
-        opt_reserve = self._compute_opt_reserve()
-        r.reserve(opt_reserve)
-        tsig_reserve = self._compute_tsig_reserve()
-        r.reserve(tsig_reserve)
-        try:
-            for rrset in self.question:
-                r.add_question(rrset.name, rrset.rdtype, rrset.rdclass)
-            for rrset in self.answer:
-                r.add_rrset(dns.renderer.ANSWER, rrset, **kw)
-            for rrset in self.authority:
-                r.add_rrset(dns.renderer.AUTHORITY, rrset, **kw)
-            for rrset in self.additional:
-                r.add_rrset(dns.renderer.ADDITIONAL, rrset, **kw)
-        except dns.exception.TooBig:
-            if prefer_truncation:
-                if r.section < dns.renderer.ADDITIONAL:
-                    r.flags |= dns.flags.TC
-            else:
-                raise
-        r.release_reserved()
-        if self.opt is not None:
-            r.add_opt(self.opt, self.pad, opt_reserve, tsig_reserve)
-        r.write_header()
-        if self.tsig is not None:
-            (new_tsig, ctx) = dns.tsig.sign(
-                r.get_wire(),
-                self.keyring,
-                self.tsig[0],
-                int(time.time()),
-                self.request_mac,
-                tsig_ctx,
-                multi,
-            )
-            self.tsig.clear()
-            self.tsig.add(new_tsig)
-            r.add_rrset(dns.renderer.ADDITIONAL, self.tsig)
-            r.write_header()
-            if multi:
-                self.tsig_ctx = ctx
-        wire = r.get_wire()
-        self.wire = wire
-        if prepend_length:
-            wire = len(wire).to_bytes(2, "big") + wire
-        return wire
-
-    @staticmethod
-    def _make_tsig(
-        keyname, algorithm, time_signed, fudge, mac, original_id, error, other
-    ):
-        tsig = dns.rdtypes.ANY.TSIG.TSIG(
-            dns.rdataclass.ANY,
-            dns.rdatatype.TSIG,
-            algorithm,
-            time_signed,
-            fudge,
-            mac,
-            original_id,
-            error,
-            other,
-        )
-        return dns.rrset.from_rdata(keyname, 0, tsig)
-
-    def use_tsig(
-        self,
-        keyring: Any,
-        keyname: Optional[Union[dns.name.Name, str]] = None,
-        fudge: int = 300,
-        original_id: Optional[int] = None,
-        tsig_error: int = 0,
-        other_data: bytes = b"",
-        algorithm: Union[dns.name.Name, str] = dns.tsig.default_algorithm,
-    ) -> None:
-        """When sending, a TSIG signature using the specified key
-        should be added.
-
-        *key*, a ``dns.tsig.Key`` is the key to use.  If a key is specified,
-        the *keyring* and *algorithm* fields are not used.
-
-        *keyring*, a ``dict``, ``callable`` or ``dns.tsig.Key``, is either
-        the TSIG keyring or key to use.
-
-        The format of a keyring dict is a mapping from TSIG key name, as
-        ``dns.name.Name`` to ``dns.tsig.Key`` or a TSIG secret, a ``bytes``.
-        If a ``dict`` *keyring* is specified but a *keyname* is not, the key
-        used will be the first key in the *keyring*.  Note that the order of
-        keys in a dictionary is not defined, so applications should supply a
-        keyname when a ``dict`` keyring is used, unless they know the keyring
-        contains only one key.  If a ``callable`` keyring is specified, the
-        callable will be called with the message and the keyname, and is
-        expected to return a key.
-
-        *keyname*, a ``dns.name.Name``, ``str`` or ``None``, the name of
-        this TSIG key to use; defaults to ``None``.  If *keyring* is a
-        ``dict``, the key must be defined in it.  If *keyring* is a
-        ``dns.tsig.Key``, this is ignored.
-
-        *fudge*, an ``int``, the TSIG time fudge.
-
-        *original_id*, an ``int``, the TSIG original id.  If ``None``,
-        the message's id is used.
-
-        *tsig_error*, an ``int``, the TSIG error code.
-
-        *other_data*, a ``bytes``, the TSIG other data.
-
-        *algorithm*, a ``dns.name.Name`` or ``str``, the TSIG algorithm to use.  This is
-        only used if *keyring* is a ``dict``, and the key entry is a ``bytes``.
-        """
-
-        if isinstance(keyring, dns.tsig.Key):
-            key = keyring
-            keyname = key.name
-        elif callable(keyring):
-            key = keyring(self, keyname)
-        else:
-            if isinstance(keyname, str):
-                keyname = dns.name.from_text(keyname)
-            if keyname is None:
-                keyname = next(iter(keyring))
-            key = keyring[keyname]
-            if isinstance(key, bytes):
-                key = dns.tsig.Key(keyname, key, algorithm)
-        self.keyring = key
-        if original_id is None:
-            original_id = self.id
-        self.tsig = self._make_tsig(
-            keyname,
-            self.keyring.algorithm,
-            0,
-            fudge,
-            b"\x00" * dns.tsig.mac_sizes[self.keyring.algorithm],
-            original_id,
-            tsig_error,
-            other_data,
-        )
-
-    @property
-    def keyname(self) -> Optional[dns.name.Name]:
-        if self.tsig:
-            return self.tsig.name
-        else:
-            return None
-
-    @property
-    def keyalgorithm(self) -> Optional[dns.name.Name]:
-        if self.tsig:
-            return self.tsig[0].algorithm
-        else:
-            return None
-
-    @property
-    def mac(self) -> Optional[bytes]:
-        if self.tsig:
-            return self.tsig[0].mac
-        else:
-            return None
-
-    @property
-    def tsig_error(self) -> Optional[int]:
-        if self.tsig:
-            return self.tsig[0].error
-        else:
-            return None
-
-    @property
-    def had_tsig(self) -> bool:
-        return bool(self.tsig)
-
-    @staticmethod
-    def _make_opt(flags=0, payload=DEFAULT_EDNS_PAYLOAD, options=None):
-        opt = dns.rdtypes.ANY.OPT.OPT(payload, dns.rdatatype.OPT, options or ())
-        return dns.rrset.from_rdata(dns.name.root, int(flags), opt)
-
-    def use_edns(
-        self,
-        edns: Optional[Union[int, bool]] = 0,
-        ednsflags: int = 0,
-        payload: int = DEFAULT_EDNS_PAYLOAD,
-        request_payload: Optional[int] = None,
-        options: Optional[List[dns.edns.Option]] = None,
-        pad: int = 0,
-    ) -> None:
-        """Configure EDNS behavior.
-
-        *edns*, an ``int``, is the EDNS level to use.  Specifying ``None``, ``False``,
-        or ``-1`` means "do not use EDNS", and in this case the other parameters are
-        ignored.  Specifying ``True`` is equivalent to specifying 0, i.e. "use EDNS0".
-
-        *ednsflags*, an ``int``, the EDNS flag values.
-
-        *payload*, an ``int``, is the EDNS sender's payload field, which is the maximum
-        size of UDP datagram the sender can handle.  I.e. how big a response to this
-        message can be.
-
-        *request_payload*, an ``int``, is the EDNS payload size to use when sending this
-        message.  If not specified, defaults to the value of *payload*.
-
-        *options*, a list of ``dns.edns.Option`` objects or ``None``, the EDNS options.
-
-        *pad*, a non-negative ``int``.  If 0, the default, do not pad; otherwise add
-        padding bytes to make the message size a multiple of *pad*.  Note that if
-        padding is non-zero, an EDNS PADDING option will always be added to the
-        message.
-        """
-
-        if edns is None or edns is False:
-            edns = -1
-        elif edns is True:
-            edns = 0
-        if edns < 0:
-            self.opt = None
-            self.request_payload = 0
-        else:
-            # make sure the EDNS version in ednsflags agrees with edns
-            ednsflags &= 0xFF00FFFF
-            ednsflags |= edns << 16
-            if options is None:
-                options = []
-            self.opt = self._make_opt(ednsflags, payload, options)
-            if request_payload is None:
-                request_payload = payload
-            self.request_payload = request_payload
-            if pad < 0:
-                raise ValueError("pad must be non-negative")
-            self.pad = pad
-
-    @property
-    def edns(self) -> int:
-        if self.opt:
-            return (self.ednsflags & 0xFF0000) >> 16
-        else:
-            return -1
-
-    @property
-    def ednsflags(self) -> int:
-        if self.opt:
-            return self.opt.ttl
-        else:
-            return 0
-
-    @ednsflags.setter
-    def ednsflags(self, v):
-        if self.opt:
-            self.opt.ttl = v
-        elif v:
-            self.opt = self._make_opt(v)
-
-    @property
-    def payload(self) -> int:
-        if self.opt:
-            return self.opt[0].payload
-        else:
-            return 0
-
-    @property
-    def options(self) -> Tuple:
-        if self.opt:
-            return self.opt[0].options
-        else:
-            return ()
-
-    def want_dnssec(self, wanted: bool = True) -> None:
-        """Enable or disable 'DNSSEC desired' flag in requests.
-
-        *wanted*, a ``bool``.  If ``True``, then DNSSEC data is
-        desired in the response, EDNS is enabled if required, and then
-        the DO bit is set.  If ``False``, the DO bit is cleared if
-        EDNS is enabled.
-        """
-
-        if wanted:
-            self.ednsflags |= dns.flags.DO
-        elif self.opt:
-            self.ednsflags &= ~int(dns.flags.DO)
-
-    def rcode(self) -> dns.rcode.Rcode:
-        """Return the rcode.
-
-        Returns a ``dns.rcode.Rcode``.
-        """
-        return dns.rcode.from_flags(int(self.flags), int(self.ednsflags))
-
-    def set_rcode(self, rcode: dns.rcode.Rcode) -> None:
-        """Set the rcode.
-
-        *rcode*, a ``dns.rcode.Rcode``, is the rcode to set.
-        """
-        (value, evalue) = dns.rcode.to_flags(rcode)
-        self.flags &= 0xFFF0
-        self.flags |= value
-        self.ednsflags &= 0x00FFFFFF
-        self.ednsflags |= evalue
-
-    def opcode(self) -> dns.opcode.Opcode:
-        """Return the opcode.
-
-        Returns a ``dns.opcode.Opcode``.
-        """
-        return dns.opcode.from_flags(int(self.flags))
-
-    def set_opcode(self, opcode: dns.opcode.Opcode) -> None:
-        """Set the opcode.
-
-        *opcode*, a ``dns.opcode.Opcode``, is the opcode to set.
-        """
-        self.flags &= 0x87FF
-        self.flags |= dns.opcode.to_flags(opcode)
-
-    def get_options(self, otype: dns.edns.OptionType) -> List[dns.edns.Option]:
-        """Return the list of options of the specified type."""
-        return [option for option in self.options if option.otype == otype]
-
-    def extended_errors(self) -> List[dns.edns.EDEOption]:
-        """Return the list of Extended DNS Error (EDE) options in the message"""
-        return cast(List[dns.edns.EDEOption], self.get_options(dns.edns.OptionType.EDE))
-
-    def _get_one_rr_per_rrset(self, value):
-        # What the caller picked is fine.
-        return value
-
-    # pylint: disable=unused-argument
-
-    def _parse_rr_header(self, section, name, rdclass, rdtype):
-        return (rdclass, rdtype, None, False)
-
-    # pylint: enable=unused-argument
-
-    def _parse_special_rr_header(self, section, count, position, name, rdclass, rdtype):
-        if rdtype == dns.rdatatype.OPT:
-            if (
-                section != MessageSection.ADDITIONAL
-                or self.opt
-                or name != dns.name.root
-            ):
-                raise BadEDNS
-        elif rdtype == dns.rdatatype.TSIG:
-            if (
-                section != MessageSection.ADDITIONAL
-                or rdclass != dns.rdatatype.ANY
-                or position != count - 1
-            ):
-                raise BadTSIG
-        return (rdclass, rdtype, None, False)
-
-
-class ChainingResult:
-    """The result of a call to dns.message.QueryMessage.resolve_chaining().
-
-    The ``answer`` attribute is the answer RRSet, or ``None`` if it doesn't
-    exist.
-
-    The ``canonical_name`` attribute is the canonical name after all
-    chaining has been applied (this is the same name as ``rrset.name`` in cases
-    where rrset is not ``None``).
-
-    The ``minimum_ttl`` attribute is the minimum TTL, i.e. the TTL to
-    use if caching the data.  It is the smallest of all the CNAME TTLs
-    and either the answer TTL if it exists or the SOA TTL and SOA
-    minimum values for negative answers.
-
-    The ``cnames`` attribute is a list of all the CNAME RRSets followed to
-    get to the canonical name.
-    """
-
-    def __init__(
-        self,
-        canonical_name: dns.name.Name,
-        answer: Optional[dns.rrset.RRset],
-        minimum_ttl: int,
-        cnames: List[dns.rrset.RRset],
-    ):
-        self.canonical_name = canonical_name
-        self.answer = answer
-        self.minimum_ttl = minimum_ttl
-        self.cnames = cnames
-
-
-class QueryMessage(Message):
-    def resolve_chaining(self) -> ChainingResult:
-        """Follow the CNAME chain in the response to determine the answer
-        RRset.
-
-        Raises ``dns.message.NotQueryResponse`` if the message is not
-        a response.
-
-        Raises ``dns.message.ChainTooLong`` if the CNAME chain is too long.
-
-        Raises ``dns.message.AnswerForNXDOMAIN`` if the rcode is NXDOMAIN
-        but an answer was found.
-
-        Raises ``dns.exception.FormError`` if the question count is not 1.
-
-        Returns a ChainingResult object.
-        """
-        if self.flags & dns.flags.QR == 0:
-            raise NotQueryResponse
-        if len(self.question) != 1:
-            raise dns.exception.FormError
-        question = self.question[0]
-        qname = question.name
-        min_ttl = dns.ttl.MAX_TTL
-        answer = None
-        count = 0
-        cnames = []
-        while count < MAX_CHAIN:
-            try:
-                answer = self.find_rrset(
-                    self.answer, qname, question.rdclass, question.rdtype
-                )
-                min_ttl = min(min_ttl, answer.ttl)
-                break
-            except KeyError:
-                if question.rdtype != dns.rdatatype.CNAME:
-                    try:
-                        crrset = self.find_rrset(
-                            self.answer, qname, question.rdclass, dns.rdatatype.CNAME
-                        )
-                        cnames.append(crrset)
-                        min_ttl = min(min_ttl, crrset.ttl)
-                        for rd in crrset:
-                            qname = rd.target
-                            break
-                        count += 1
-                        continue
-                    except KeyError:
-                        # Exit the chaining loop
-                        break
-                else:
-                    # Exit the chaining loop
-                    break
-        if count >= MAX_CHAIN:
-            raise ChainTooLong
-        if self.rcode() == dns.rcode.NXDOMAIN and answer is not None:
-            raise AnswerForNXDOMAIN
-        if answer is None:
-            # Further minimize the TTL with NCACHE.
-            auname = qname
-            while True:
-                # Look for an SOA RR whose owner name is a superdomain
-                # of qname.
-                try:
-                    srrset = self.find_rrset(
-                        self.authority, auname, question.rdclass, dns.rdatatype.SOA
-                    )
-                    min_ttl = min(min_ttl, srrset.ttl, srrset[0].minimum)
-                    break
-                except KeyError:
-                    try:
-                        auname = auname.parent()
-                    except dns.name.NoParent:
-                        break
-        return ChainingResult(qname, answer, min_ttl, cnames)
-
-    def canonical_name(self) -> dns.name.Name:
-        """Return the canonical name of the first name in the question
-        section.
-
-        Raises ``dns.message.NotQueryResponse`` if the message is not
-        a response.
-
-        Raises ``dns.message.ChainTooLong`` if the CNAME chain is too long.
-
-        Raises ``dns.message.AnswerForNXDOMAIN`` if the rcode is NXDOMAIN
-        but an answer was found.
-
-        Raises ``dns.exception.FormError`` if the question count is not 1.
-        """
-        return self.resolve_chaining().canonical_name
-
-
-def _maybe_import_update():
-    # We avoid circular imports by doing this here.  We do it in another
-    # function as doing it in _message_factory_from_opcode() makes "dns"
-    # a local symbol, and the first line fails :)
-
-    # pylint: disable=redefined-outer-name,import-outside-toplevel,unused-import
-    import dns.update  # noqa: F401
-
-
-def _message_factory_from_opcode(opcode):
-    if opcode == dns.opcode.QUERY:
-        return QueryMessage
-    elif opcode == dns.opcode.UPDATE:
-        _maybe_import_update()
-        return dns.update.UpdateMessage
-    else:
-        return Message
-
-
-class _WireReader:
-    """Wire format reader.
-
-    parser: the binary parser
-    message: The message object being built
-    initialize_message: Callback to set message parsing options
-    question_only: Are we only reading the question?
-    one_rr_per_rrset: Put each RR into its own RRset?
-    keyring: TSIG keyring
-    ignore_trailing: Ignore trailing junk at end of request?
-    multi: Is this message part of a multi-message sequence?
-    DNS dynamic updates.
-    continue_on_error: try to extract as much information as possible from
-    the message, accumulating MessageErrors in the *errors* attribute instead of
-    raising them.
-    """
-
-    def __init__(
-        self,
-        wire,
-        initialize_message,
-        question_only=False,
-        one_rr_per_rrset=False,
-        ignore_trailing=False,
-        keyring=None,
-        multi=False,
-        continue_on_error=False,
-    ):
-        self.parser = dns.wire.Parser(wire)
-        self.message = None
-        self.initialize_message = initialize_message
-        self.question_only = question_only
-        self.one_rr_per_rrset = one_rr_per_rrset
-        self.ignore_trailing = ignore_trailing
-        self.keyring = keyring
-        self.multi = multi
-        self.continue_on_error = continue_on_error
-        self.errors = []
-
-    def _get_question(self, section_number, qcount):
-        """Read the next *qcount* records from the wire data and add them to
-        the question section.
-        """
-        assert self.message is not None
-        section = self.message.sections[section_number]
-        for _ in range(qcount):
-            qname = self.parser.get_name(self.message.origin)
-            (rdtype, rdclass) = self.parser.get_struct("!HH")
-            (rdclass, rdtype, _, _) = self.message._parse_rr_header(
-                section_number, qname, rdclass, rdtype
-            )
-            self.message.find_rrset(
-                section, qname, rdclass, rdtype, create=True, force_unique=True
-            )
-
-    def _add_error(self, e):
-        self.errors.append(MessageError(e, self.parser.current))
-
-    def _get_section(self, section_number, count):
-        """Read the next I{count} records from the wire data and add them to
-        the specified section.
-
-        section_number: the section of the message to which to add records
-        count: the number of records to read
-        """
-        assert self.message is not None
-        section = self.message.sections[section_number]
-        force_unique = self.one_rr_per_rrset
-        for i in range(count):
-            rr_start = self.parser.current
-            absolute_name = self.parser.get_name()
-            if self.message.origin is not None:
-                name = absolute_name.relativize(self.message.origin)
-            else:
-                name = absolute_name
-            (rdtype, rdclass, ttl, rdlen) = self.parser.get_struct("!HHIH")
-            if rdtype in (dns.rdatatype.OPT, dns.rdatatype.TSIG):
-                (
-                    rdclass,
-                    rdtype,
-                    deleting,
-                    empty,
-                ) = self.message._parse_special_rr_header(
-                    section_number, count, i, name, rdclass, rdtype
-                )
-            else:
-                (rdclass, rdtype, deleting, empty) = self.message._parse_rr_header(
-                    section_number, name, rdclass, rdtype
-                )
-            rdata_start = self.parser.current
-            try:
-                if empty:
-                    if rdlen > 0:
-                        raise dns.exception.FormError
-                    rd = None
-                    covers = dns.rdatatype.NONE
-                else:
-                    with self.parser.restrict_to(rdlen):
-                        rd = dns.rdata.from_wire_parser(
-                            rdclass, rdtype, self.parser, self.message.origin
-                        )
-                    covers = rd.covers()
-                if self.message.xfr and rdtype == dns.rdatatype.SOA:
-                    force_unique = True
-                if rdtype == dns.rdatatype.OPT:
-                    self.message.opt = dns.rrset.from_rdata(name, ttl, rd)
-                elif rdtype == dns.rdatatype.TSIG:
-                    if self.keyring is None or self.keyring is True:
-                        raise UnknownTSIGKey("got signed message without keyring")
-                    elif isinstance(self.keyring, dict):
-                        key = self.keyring.get(absolute_name)
-                        if isinstance(key, bytes):
-                            key = dns.tsig.Key(absolute_name, key, rd.algorithm)
-                    elif callable(self.keyring):
-                        key = self.keyring(self.message, absolute_name)
-                    else:
-                        key = self.keyring
-                    if key is None:
-                        raise UnknownTSIGKey(f"key '{name}' unknown")
-                    if key:
-                        self.message.keyring = key
-                        self.message.tsig_ctx = dns.tsig.validate(
-                            self.parser.wire,
-                            key,
-                            absolute_name,
-                            rd,
-                            int(time.time()),
-                            self.message.request_mac,
-                            rr_start,
-                            self.message.tsig_ctx,
-                            self.multi,
-                        )
-                    self.message.tsig = dns.rrset.from_rdata(absolute_name, 0, rd)
-                else:
-                    rrset = self.message.find_rrset(
-                        section,
-                        name,
-                        rdclass,
-                        rdtype,
-                        covers,
-                        deleting,
-                        True,
-                        force_unique,
-                    )
-                    if rd is not None:
-                        if ttl > 0x7FFFFFFF:
-                            ttl = 0
-                        rrset.add(rd, ttl)
-            except Exception as e:
-                if self.continue_on_error:
-                    self._add_error(e)
-                    self.parser.seek(rdata_start + rdlen)
-                else:
-                    raise
-
-    def read(self):
-        """Read a wire format DNS message and build a dns.message.Message
-        object."""
-
-        if self.parser.remaining() < 12:
-            raise ShortHeader
-        (id, flags, qcount, ancount, aucount, adcount) = self.parser.get_struct(
-            "!HHHHHH"
-        )
-        factory = _message_factory_from_opcode(dns.opcode.from_flags(flags))
-        self.message = factory(id=id)
-        self.message.flags = dns.flags.Flag(flags)
-        self.message.wire = self.parser.wire
-        self.initialize_message(self.message)
-        self.one_rr_per_rrset = self.message._get_one_rr_per_rrset(
-            self.one_rr_per_rrset
-        )
-        try:
-            self._get_question(MessageSection.QUESTION, qcount)
-            if self.question_only:
-                return self.message
-            self._get_section(MessageSection.ANSWER, ancount)
-            self._get_section(MessageSection.AUTHORITY, aucount)
-            self._get_section(MessageSection.ADDITIONAL, adcount)
-            if not self.ignore_trailing and self.parser.remaining() != 0:
-                raise TrailingJunk
-            if self.multi and self.message.tsig_ctx and not self.message.had_tsig:
-                self.message.tsig_ctx.update(self.parser.wire)
-        except Exception as e:
-            if self.continue_on_error:
-                self._add_error(e)
-            else:
-                raise
-        return self.message
-
-
-def from_wire(
-    wire: bytes,
-    keyring: Optional[Any] = None,
-    request_mac: Optional[bytes] = b"",
-    xfr: bool = False,
-    origin: Optional[dns.name.Name] = None,
-    tsig_ctx: Optional[Union[dns.tsig.HMACTSig, dns.tsig.GSSTSig]] = None,
-    multi: bool = False,
-    question_only: bool = False,
-    one_rr_per_rrset: bool = False,
-    ignore_trailing: bool = False,
-    raise_on_truncation: bool = False,
-    continue_on_error: bool = False,
-) -> Message:
-    """Convert a DNS wire format message into a message object.
-
-    *keyring*, a ``dns.tsig.Key``, ``dict``, ``bool``, or ``None``, the key or keyring
-    to use if the message is signed.  If ``None`` or ``True``, then trying to decode
-    a message with a TSIG will fail as it cannot be validated.  If ``False``, then
-    TSIG validation is disabled.
-
-    *request_mac*, a ``bytes`` or ``None``.  If the message is a response to a
-    TSIG-signed request, *request_mac* should be set to the MAC of that request.
-
-    *xfr*, a ``bool``, should be set to ``True`` if this message is part of a zone
-    transfer.
-
-    *origin*, a ``dns.name.Name`` or ``None``.  If the message is part of a zone
-    transfer, *origin* should be the origin name of the zone.  If not ``None``, names
-    will be relativized to the origin.
-
-    *tsig_ctx*, a ``dns.tsig.HMACTSig`` or ``dns.tsig.GSSTSig`` object, the ongoing TSIG
-    context, used when validating zone transfers.
-
-    *multi*, a ``bool``, should be set to ``True`` if this message is part of a multiple
-    message sequence.
-
-    *question_only*, a ``bool``.  If ``True``, read only up to the end of the question
-    section.
-
-    *one_rr_per_rrset*, a ``bool``.  If ``True``, put each RR into its own RRset.
-
-    *ignore_trailing*, a ``bool``.  If ``True``, ignore trailing junk at end of the
-    message.
-
-    *raise_on_truncation*, a ``bool``.  If ``True``, raise an exception if the TC bit is
-    set.
-
-    *continue_on_error*, a ``bool``.  If ``True``, try to continue parsing even if
-    errors occur.  Erroneous rdata will be ignored.  Errors will be accumulated as a
-    list of MessageError objects in the message's ``errors`` attribute.  This option is
-    recommended only for DNS analysis tools, or for use in a server as part of an error
-    handling path.  The default is ``False``.
-
-    Raises ``dns.message.ShortHeader`` if the message is less than 12 octets long.
-
-    Raises ``dns.message.TrailingJunk`` if there were octets in the message past the end
-    of the proper DNS message, and *ignore_trailing* is ``False``.
-
-    Raises ``dns.message.BadEDNS`` if an OPT record was in the wrong section, or
-    occurred more than once.
-
-    Raises ``dns.message.BadTSIG`` if a TSIG record was not the last record of the
-    additional data section.
-
-    Raises ``dns.message.Truncated`` if the TC flag is set and *raise_on_truncation* is
-    ``True``.
-
-    Returns a ``dns.message.Message``.
-    """
-
-    # We permit None for request_mac solely for backwards compatibility
-    if request_mac is None:
-        request_mac = b""
-
-    def initialize_message(message):
-        message.request_mac = request_mac
-        message.xfr = xfr
-        message.origin = origin
-        message.tsig_ctx = tsig_ctx
-
-    reader = _WireReader(
-        wire,
-        initialize_message,
-        question_only,
-        one_rr_per_rrset,
-        ignore_trailing,
-        keyring,
-        multi,
-        continue_on_error,
-    )
-    try:
-        m = reader.read()
-    except dns.exception.FormError:
-        if (
-            reader.message
-            and (reader.message.flags & dns.flags.TC)
-            and raise_on_truncation
-        ):
-            raise Truncated(message=reader.message)
-        else:
-            raise
-    # Reading a truncated message might not have any errors, so we
-    # have to do this check here too.
-    if m.flags & dns.flags.TC and raise_on_truncation:
-        raise Truncated(message=m)
-    if continue_on_error:
-        m.errors = reader.errors
-
-    return m
-
-
-class _TextReader:
-    """Text format reader.
-
-    tok: the tokenizer.
-    message: The message object being built.
-    DNS dynamic updates.
-    last_name: The most recently read name when building a message object.
-    one_rr_per_rrset: Put each RR into its own RRset?
-    origin: The origin for relative names
-    relativize: relativize names?
-    relativize_to: the origin to relativize to.
-    """
-
-    def __init__(
-        self,
-        text,
-        idna_codec,
-        one_rr_per_rrset=False,
-        origin=None,
-        relativize=True,
-        relativize_to=None,
-    ):
-        self.message = None
-        self.tok = dns.tokenizer.Tokenizer(text, idna_codec=idna_codec)
-        self.last_name = None
-        self.one_rr_per_rrset = one_rr_per_rrset
-        self.origin = origin
-        self.relativize = relativize
-        self.relativize_to = relativize_to
-        self.id = None
-        self.edns = -1
-        self.ednsflags = 0
-        self.payload = DEFAULT_EDNS_PAYLOAD
-        self.rcode = None
-        self.opcode = dns.opcode.QUERY
-        self.flags = 0
-
-    def _header_line(self, _):
-        """Process one line from the text format header section."""
-
-        token = self.tok.get()
-        what = token.value
-        if what == "id":
-            self.id = self.tok.get_int()
-        elif what == "flags":
-            while True:
-                token = self.tok.get()
-                if not token.is_identifier():
-                    self.tok.unget(token)
-                    break
-                self.flags = self.flags | dns.flags.from_text(token.value)
-        elif what == "edns":
-            self.edns = self.tok.get_int()
-            self.ednsflags = self.ednsflags | (self.edns << 16)
-        elif what == "eflags":
-            if self.edns < 0:
-                self.edns = 0
-            while True:
-                token = self.tok.get()
-                if not token.is_identifier():
-                    self.tok.unget(token)
-                    break
-                self.ednsflags = self.ednsflags | dns.flags.edns_from_text(token.value)
-        elif what == "payload":
-            self.payload = self.tok.get_int()
-            if self.edns < 0:
-                self.edns = 0
-        elif what == "opcode":
-            text = self.tok.get_string()
-            self.opcode = dns.opcode.from_text(text)
-            self.flags = self.flags | dns.opcode.to_flags(self.opcode)
-        elif what == "rcode":
-            text = self.tok.get_string()
-            self.rcode = dns.rcode.from_text(text)
-        else:
-            raise UnknownHeaderField
-        self.tok.get_eol()
-
-    def _question_line(self, section_number):
-        """Process one line from the text format question section."""
-
-        section = self.message.sections[section_number]
-        token = self.tok.get(want_leading=True)
-        if not token.is_whitespace():
-            self.last_name = self.tok.as_name(
-                token, self.message.origin, self.relativize, self.relativize_to
-            )
-        name = self.last_name
-        if name is None:
-            raise NoPreviousName
-        token = self.tok.get()
-        if not token.is_identifier():
-            raise dns.exception.SyntaxError
-        # Class
-        try:
-            rdclass = dns.rdataclass.from_text(token.value)
-            token = self.tok.get()
-            if not token.is_identifier():
-                raise dns.exception.SyntaxError
-        except dns.exception.SyntaxError:
-            raise dns.exception.SyntaxError
-        except Exception:
-            rdclass = dns.rdataclass.IN
-        # Type
-        rdtype = dns.rdatatype.from_text(token.value)
-        (rdclass, rdtype, _, _) = self.message._parse_rr_header(
-            section_number, name, rdclass, rdtype
-        )
-        self.message.find_rrset(
-            section, name, rdclass, rdtype, create=True, force_unique=True
-        )
-        self.tok.get_eol()
-
-    def _rr_line(self, section_number):
-        """Process one line from the text format answer, authority, or
-        additional data sections.
-        """
-
-        section = self.message.sections[section_number]
-        # Name
-        token = self.tok.get(want_leading=True)
-        if not token.is_whitespace():
-            self.last_name = self.tok.as_name(
-                token, self.message.origin, self.relativize, self.relativize_to
-            )
-        name = self.last_name
-        if name is None:
-            raise NoPreviousName
-        token = self.tok.get()
-        if not token.is_identifier():
-            raise dns.exception.SyntaxError
-        # TTL
-        try:
-            ttl = int(token.value, 0)
-            token = self.tok.get()
-            if not token.is_identifier():
-                raise dns.exception.SyntaxError
-        except dns.exception.SyntaxError:
-            raise dns.exception.SyntaxError
-        except Exception:
-            ttl = 0
-        # Class
-        try:
-            rdclass = dns.rdataclass.from_text(token.value)
-            token = self.tok.get()
-            if not token.is_identifier():
-                raise dns.exception.SyntaxError
-        except dns.exception.SyntaxError:
-            raise dns.exception.SyntaxError
-        except Exception:
-            rdclass = dns.rdataclass.IN
-        # Type
-        rdtype = dns.rdatatype.from_text(token.value)
-        (rdclass, rdtype, deleting, empty) = self.message._parse_rr_header(
-            section_number, name, rdclass, rdtype
-        )
-        token = self.tok.get()
-        if empty and not token.is_eol_or_eof():
-            raise dns.exception.SyntaxError
-        if not empty and token.is_eol_or_eof():
-            raise dns.exception.UnexpectedEnd
-        if not token.is_eol_or_eof():
-            self.tok.unget(token)
-            rd = dns.rdata.from_text(
-                rdclass,
-                rdtype,
-                self.tok,
-                self.message.origin,
-                self.relativize,
-                self.relativize_to,
-            )
-            covers = rd.covers()
-        else:
-            rd = None
-            covers = dns.rdatatype.NONE
-        rrset = self.message.find_rrset(
-            section,
-            name,
-            rdclass,
-            rdtype,
-            covers,
-            deleting,
-            True,
-            self.one_rr_per_rrset,
-        )
-        if rd is not None:
-            rrset.add(rd, ttl)
-
-    def _make_message(self):
-        factory = _message_factory_from_opcode(self.opcode)
-        message = factory(id=self.id)
-        message.flags = self.flags
-        if self.edns >= 0:
-            message.use_edns(self.edns, self.ednsflags, self.payload)
-        if self.rcode:
-            message.set_rcode(self.rcode)
-        if self.origin:
-            message.origin = self.origin
-        return message
-
-    def read(self):
-        """Read a text format DNS message and build a dns.message.Message
-        object."""
-
-        line_method = self._header_line
-        section_number = None
-        while 1:
-            token = self.tok.get(True, True)
-            if token.is_eol_or_eof():
-                break
-            if token.is_comment():
-                u = token.value.upper()
-                if u == "HEADER":
-                    line_method = self._header_line
-
-                if self.message:
-                    message = self.message
-                else:
-                    # If we don't have a message, create one with the current
-                    # opcode, so that we know which section names to parse.
-                    message = self._make_message()
-                try:
-                    section_number = message._section_enum.from_text(u)
-                    # We found a section name.  If we don't have a message,
-                    # use the one we just created.
-                    if not self.message:
-                        self.message = message
-                        self.one_rr_per_rrset = message._get_one_rr_per_rrset(
-                            self.one_rr_per_rrset
-                        )
-                    if section_number == MessageSection.QUESTION:
-                        line_method = self._question_line
-                    else:
-                        line_method = self._rr_line
-                except Exception:
-                    # It's just a comment.
-                    pass
-                self.tok.get_eol()
-                continue
-            self.tok.unget(token)
-            line_method(section_number)
-        if not self.message:
-            self.message = self._make_message()
-        return self.message
-
-
-def from_text(
-    text: str,
-    idna_codec: Optional[dns.name.IDNACodec] = None,
-    one_rr_per_rrset: bool = False,
-    origin: Optional[dns.name.Name] = None,
-    relativize: bool = True,
-    relativize_to: Optional[dns.name.Name] = None,
-) -> Message:
-    """Convert the text format message into a message object.
-
-    The reader stops after reading the first blank line in the input to
-    facilitate reading multiple messages from a single file with
-    ``dns.message.from_file()``.
-
-    *text*, a ``str``, the text format message.
-
-    *idna_codec*, a ``dns.name.IDNACodec``, specifies the IDNA
-    encoder/decoder.  If ``None``, the default IDNA 2003 encoder/decoder
-    is used.
-
-    *one_rr_per_rrset*, a ``bool``.  If ``True``, then each RR is put
-    into its own rrset.  The default is ``False``.
-
-    *origin*, a ``dns.name.Name`` (or ``None``), the
-    origin to use for relative names.
-
-    *relativize*, a ``bool``.  If true, name will be relativized.
-
-    *relativize_to*, a ``dns.name.Name`` (or ``None``), the origin to use
-    when relativizing names.  If not set, the *origin* value will be used.
-
-    Raises ``dns.message.UnknownHeaderField`` if a header is unknown.
-
-    Raises ``dns.exception.SyntaxError`` if the text is badly formed.
-
-    Returns a ``dns.message.Message object``
-    """
-
-    # 'text' can also be a file, but we don't publish that fact
-    # since it's an implementation detail.  The official file
-    # interface is from_file().
-
-    reader = _TextReader(
-        text, idna_codec, one_rr_per_rrset, origin, relativize, relativize_to
-    )
-    return reader.read()
-
-
-def from_file(
-    f: Any,
-    idna_codec: Optional[dns.name.IDNACodec] = None,
-    one_rr_per_rrset: bool = False,
-) -> Message:
-    """Read the next text format message from the specified file.
-
-    Message blocks are separated by a single blank line.
-
-    *f*, a ``file`` or ``str``.  If *f* is text, it is treated as the
-    pathname of a file to open.
-
-    *idna_codec*, a ``dns.name.IDNACodec``, specifies the IDNA
-    encoder/decoder.  If ``None``, the default IDNA 2003 encoder/decoder
-    is used.
-
-    *one_rr_per_rrset*, a ``bool``.  If ``True``, then each RR is put
-    into its own rrset.  The default is ``False``.
-
-    Raises ``dns.message.UnknownHeaderField`` if a header is unknown.
-
-    Raises ``dns.exception.SyntaxError`` if the text is badly formed.
-
-    Returns a ``dns.message.Message object``
-    """
-
-    if isinstance(f, str):
-        cm: contextlib.AbstractContextManager = open(f)
-    else:
-        cm = contextlib.nullcontext(f)
-    with cm as f:
-        return from_text(f, idna_codec, one_rr_per_rrset)
-    assert False  # for mypy  lgtm[py/unreachable-statement]
-
-
-def make_query(
-    qname: Union[dns.name.Name, str],
-    rdtype: Union[dns.rdatatype.RdataType, str],
-    rdclass: Union[dns.rdataclass.RdataClass, str] = dns.rdataclass.IN,
-    use_edns: Optional[Union[int, bool]] = None,
-    want_dnssec: bool = False,
-    ednsflags: Optional[int] = None,
-    payload: Optional[int] = None,
-    request_payload: Optional[int] = None,
-    options: Optional[List[dns.edns.Option]] = None,
-    idna_codec: Optional[dns.name.IDNACodec] = None,
-    id: Optional[int] = None,
-    flags: int = dns.flags.RD,
-    pad: int = 0,
-) -> QueryMessage:
-    """Make a query message.
-
-    The query name, type, and class may all be specified either
-    as objects of the appropriate type, or as strings.
-
-    The query will have a randomly chosen query id, and its DNS flags
-    will be set to dns.flags.RD.
-
-    qname, a ``dns.name.Name`` or ``str``, the query name.
-
-    *rdtype*, an ``int`` or ``str``, the desired rdata type.
-
-    *rdclass*, an ``int`` or ``str``,  the desired rdata class; the default
-    is class IN.
-
-    *use_edns*, an ``int``, ``bool`` or ``None``.  The EDNS level to use; the
-    default is ``None``.  If ``None``, EDNS will be enabled only if other
-    parameters (*ednsflags*, *payload*, *request_payload*, or *options*) are
-    set.
-    See the description of dns.message.Message.use_edns() for the possible
-    values for use_edns and their meanings.
-
-    *want_dnssec*, a ``bool``.  If ``True``, DNSSEC data is desired.
-
-    *ednsflags*, an ``int``, the EDNS flag values.
-
-    *payload*, an ``int``, is the EDNS sender's payload field, which is the
-    maximum size of UDP datagram the sender can handle.  I.e. how big
-    a response to this message can be.
-
-    *request_payload*, an ``int``, is the EDNS payload size to use when
-    sending this message.  If not specified, defaults to the value of
-    *payload*.
-
-    *options*, a list of ``dns.edns.Option`` objects or ``None``, the EDNS
-    options.
-
-    *idna_codec*, a ``dns.name.IDNACodec``, specifies the IDNA
-    encoder/decoder.  If ``None``, the default IDNA 2003 encoder/decoder
-    is used.
-
-    *id*, an ``int`` or ``None``, the desired query id.  The default is
-    ``None``, which generates a random query id.
-
-    *flags*, an ``int``, the desired query flags.  The default is
-    ``dns.flags.RD``.
-
-    *pad*, a non-negative ``int``.  If 0, the default, do not pad; otherwise add
-    padding bytes to make the message size a multiple of *pad*.  Note that if
-    padding is non-zero, an EDNS PADDING option will always be added to the
-    message.
-
-    Returns a ``dns.message.QueryMessage``
-    """
-
-    if isinstance(qname, str):
-        qname = dns.name.from_text(qname, idna_codec=idna_codec)
-    rdtype = dns.rdatatype.RdataType.make(rdtype)
-    rdclass = dns.rdataclass.RdataClass.make(rdclass)
-    m = QueryMessage(id=id)
-    m.flags = dns.flags.Flag(flags)
-    m.find_rrset(m.question, qname, rdclass, rdtype, create=True, force_unique=True)
-    # only pass keywords on to use_edns if they have been set to a
-    # non-None value.  Setting a field will turn EDNS on if it hasn't
-    # been configured.
-    kwargs: Dict[str, Any] = {}
-    if ednsflags is not None:
-        kwargs["ednsflags"] = ednsflags
-    if payload is not None:
-        kwargs["payload"] = payload
-    if request_payload is not None:
-        kwargs["request_payload"] = request_payload
-    if options is not None:
-        kwargs["options"] = options
-    if kwargs and use_edns is None:
-        use_edns = 0
-    kwargs["edns"] = use_edns
-    kwargs["pad"] = pad
-    m.use_edns(**kwargs)
-    m.want_dnssec(want_dnssec)
-    return m
-
-
-class CopyMode(enum.Enum):
-    """
-    How should sections be copied when making an update response?
-    """
-
-    NOTHING = 0
-    QUESTION = 1
-    EVERYTHING = 2
-
-
-def make_response(
-    query: Message,
-    recursion_available: bool = False,
-    our_payload: int = 8192,
-    fudge: int = 300,
-    tsig_error: int = 0,
-    pad: Optional[int] = None,
-    copy_mode: Optional[CopyMode] = None,
-) -> Message:
-    """Make a message which is a response for the specified query.
-    The message returned is really a response skeleton; it has all of the infrastructure
-    required of a response, but none of the content.
-
-    Response section(s) which are copied are shallow copies of the matching section(s)
-    in the query, so the query's RRsets should not be changed.
-
-    *query*, a ``dns.message.Message``, the query to respond to.
-
-    *recursion_available*, a ``bool``, should RA be set in the response?
-
-    *our_payload*, an ``int``, the payload size to advertise in EDNS responses.
-
-    *fudge*, an ``int``, the TSIG time fudge.
-
-    *tsig_error*, an ``int``, the TSIG error.
-
-    *pad*, a non-negative ``int`` or ``None``.  If 0, the default, do not pad; otherwise
-    if not ``None`` add padding bytes to make the message size a multiple of *pad*. Note
-    that if padding is non-zero, an EDNS PADDING option will always be added to the
-    message.  If ``None``, add padding following RFC 8467, namely if the request is
-    padded, pad the response to 468 otherwise do not pad.
-
-    *copy_mode*, a ``dns.message.CopyMode`` or ``None``, determines how sections are
-    copied.  The default, ``None`` copies sections according to the default for the
-    message's opcode, which is currently ``dns.message.CopyMode.QUESTION`` for all
-    opcodes.   ``dns.message.CopyMode.QUESTION`` copies only the question section.
-    ``dns.message.CopyMode.EVERYTHING`` copies all sections other than OPT or TSIG
-    records, which are created appropriately if needed. ``dns.message.CopyMode.NOTHING``
-    copies no sections; note that this mode is for server testing purposes and is
-    otherwise not recommended for use.  In particular, ``dns.message.is_response()``
-    will be ``False`` if you create a response this way and the rcode is not
-    ``FORMERR``, ``SERVFAIL``, ``NOTIMP``, or ``REFUSED``.
-
-    Returns a ``dns.message.Message`` object whose specific class is appropriate for the
-    query.  For example, if query is a ``dns.update.UpdateMessage``, the response will
-    be one too.
-    """
-
-    if query.flags & dns.flags.QR:
-        raise dns.exception.FormError("specified query message is not a query")
-    opcode = query.opcode()
-    factory = _message_factory_from_opcode(opcode)
-    response = factory(id=query.id)
-    response.flags = dns.flags.QR | (query.flags & dns.flags.RD)
-    if recursion_available:
-        response.flags |= dns.flags.RA
-    response.set_opcode(opcode)
-    if copy_mode is None:
-        copy_mode = CopyMode.QUESTION
-    if copy_mode != CopyMode.NOTHING:
-        response.question = list(query.question)
-    if copy_mode == CopyMode.EVERYTHING:
-        response.answer = list(query.answer)
-        response.authority = list(query.authority)
-        response.additional = list(query.additional)
-    if query.edns >= 0:
-        if pad is None:
-            # Set response padding per RFC 8467
-            pad = 0
-            for option in query.options:
-                if option.otype == dns.edns.OptionType.PADDING:
-                    pad = 468
-        response.use_edns(0, 0, our_payload, query.payload, pad=pad)
-    if query.had_tsig:
-        response.use_tsig(
-            query.keyring,
-            query.keyname,
-            fudge,
-            None,
-            tsig_error,
-            b"",
-            query.keyalgorithm,
-        )
-        response.request_mac = query.mac
-    return response
-
-
-### BEGIN generated MessageSection constants
-
-QUESTION = MessageSection.QUESTION
-ANSWER = MessageSection.ANSWER
-AUTHORITY = MessageSection.AUTHORITY
-ADDITIONAL = MessageSection.ADDITIONAL
-
-### END generated MessageSection constants
diff --git a/lib/dns/name.py b/lib/dns/name.py
deleted file mode 100644
index f79f0d0f..00000000
--- a/lib/dns/name.py
+++ /dev/null
@@ -1,1284 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2001-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""DNS Names.
-"""
-
-import copy
-import encodings.idna  # type: ignore
-import functools
-import struct
-from typing import Any, Callable, Dict, Iterable, Optional, Tuple, Union
-
-import dns._features
-import dns.enum
-import dns.exception
-import dns.immutable
-import dns.wire
-
-if dns._features.have("idna"):
-    import idna  # type: ignore
-
-    have_idna_2008 = True
-else:  # pragma: no cover
-    have_idna_2008 = False
-
-CompressType = Dict["Name", int]
-
-
-class NameRelation(dns.enum.IntEnum):
-    """Name relation result from fullcompare()."""
-
-    # This is an IntEnum for backwards compatibility in case anyone
-    # has hardwired the constants.
-
-    #: The compared names have no relationship to each other.
-    NONE = 0
-    #: the first name is a superdomain of the second.
-    SUPERDOMAIN = 1
-    #: The first name is a subdomain of the second.
-    SUBDOMAIN = 2
-    #: The compared names are equal.
-    EQUAL = 3
-    #: The compared names have a common ancestor.
-    COMMONANCESTOR = 4
-
-    @classmethod
-    def _maximum(cls):
-        return cls.COMMONANCESTOR  # pragma: no cover
-
-    @classmethod
-    def _short_name(cls):
-        return cls.__name__  # pragma: no cover
-
-
-# Backwards compatibility
-NAMERELN_NONE = NameRelation.NONE
-NAMERELN_SUPERDOMAIN = NameRelation.SUPERDOMAIN
-NAMERELN_SUBDOMAIN = NameRelation.SUBDOMAIN
-NAMERELN_EQUAL = NameRelation.EQUAL
-NAMERELN_COMMONANCESTOR = NameRelation.COMMONANCESTOR
-
-
-class EmptyLabel(dns.exception.SyntaxError):
-    """A DNS label is empty."""
-
-
-class BadEscape(dns.exception.SyntaxError):
-    """An escaped code in a text format of DNS name is invalid."""
-
-
-class BadPointer(dns.exception.FormError):
-    """A DNS compression pointer points forward instead of backward."""
-
-
-class BadLabelType(dns.exception.FormError):
-    """The label type in DNS name wire format is unknown."""
-
-
-class NeedAbsoluteNameOrOrigin(dns.exception.DNSException):
-    """An attempt was made to convert a non-absolute name to
-    wire when there was also a non-absolute (or missing) origin."""
-
-
-class NameTooLong(dns.exception.FormError):
-    """A DNS name is > 255 octets long."""
-
-
-class LabelTooLong(dns.exception.SyntaxError):
-    """A DNS label is > 63 octets long."""
-
-
-class AbsoluteConcatenation(dns.exception.DNSException):
-    """An attempt was made to append anything other than the
-    empty name to an absolute DNS name."""
-
-
-class NoParent(dns.exception.DNSException):
-    """An attempt was made to get the parent of the root name
-    or the empty name."""
-
-
-class NoIDNA2008(dns.exception.DNSException):
-    """IDNA 2008 processing was requested but the idna module is not
-    available."""
-
-
-class IDNAException(dns.exception.DNSException):
-    """IDNA processing raised an exception."""
-
-    supp_kwargs = {"idna_exception"}
-    fmt = "IDNA processing exception: {idna_exception}"
-
-    # We do this as otherwise mypy complains about unexpected keyword argument
-    # idna_exception
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-
-class NeedSubdomainOfOrigin(dns.exception.DNSException):
-    """An absolute name was provided that is not a subdomain of the specified origin."""
-
-
-_escaped = b'"().;\\@$'
-_escaped_text = '"().;\\@$'
-
-
-def _escapify(label: Union[bytes, str]) -> str:
-    """Escape the characters in label which need it.
-    @returns: the escaped string
-    @rtype: string"""
-    if isinstance(label, bytes):
-        # Ordinary DNS label mode.  Escape special characters and values
-        # < 0x20 or > 0x7f.
-        text = ""
-        for c in label:
-            if c in _escaped:
-                text += "\\" + chr(c)
-            elif c > 0x20 and c < 0x7F:
-                text += chr(c)
-            else:
-                text += "\\%03d" % c
-        return text
-
-    # Unicode label mode.  Escape only special characters and values < 0x20
-    text = ""
-    for uc in label:
-        if uc in _escaped_text:
-            text += "\\" + uc
-        elif uc <= "\x20":
-            text += "\\%03d" % ord(uc)
-        else:
-            text += uc
-    return text
-
-
-class IDNACodec:
-    """Abstract base class for IDNA encoder/decoders."""
-
-    def __init__(self):
-        pass
-
-    def is_idna(self, label: bytes) -> bool:
-        return label.lower().startswith(b"xn--")
-
-    def encode(self, label: str) -> bytes:
-        raise NotImplementedError  # pragma: no cover
-
-    def decode(self, label: bytes) -> str:
-        # We do not apply any IDNA policy on decode.
-        if self.is_idna(label):
-            try:
-                slabel = label[4:].decode("punycode")
-                return _escapify(slabel)
-            except Exception as e:
-                raise IDNAException(idna_exception=e)
-        else:
-            return _escapify(label)
-
-
-class IDNA2003Codec(IDNACodec):
-    """IDNA 2003 encoder/decoder."""
-
-    def __init__(self, strict_decode: bool = False):
-        """Initialize the IDNA 2003 encoder/decoder.
-
-        *strict_decode* is a ``bool``. If `True`, then IDNA2003 checking
-        is done when decoding.  This can cause failures if the name
-        was encoded with IDNA2008.  The default is `False`.
-        """
-
-        super().__init__()
-        self.strict_decode = strict_decode
-
-    def encode(self, label: str) -> bytes:
-        """Encode *label*."""
-
-        if label == "":
-            return b""
-        try:
-            return encodings.idna.ToASCII(label)
-        except UnicodeError:
-            raise LabelTooLong
-
-    def decode(self, label: bytes) -> str:
-        """Decode *label*."""
-        if not self.strict_decode:
-            return super().decode(label)
-        if label == b"":
-            return ""
-        try:
-            return _escapify(encodings.idna.ToUnicode(label))
-        except Exception as e:
-            raise IDNAException(idna_exception=e)
-
-
-class IDNA2008Codec(IDNACodec):
-    """IDNA 2008 encoder/decoder."""
-
-    def __init__(
-        self,
-        uts_46: bool = False,
-        transitional: bool = False,
-        allow_pure_ascii: bool = False,
-        strict_decode: bool = False,
-    ):
-        """Initialize the IDNA 2008 encoder/decoder.
-
-        *uts_46* is a ``bool``.  If True, apply Unicode IDNA
-        compatibility processing as described in Unicode Technical
-        Standard #46 (https://unicode.org/reports/tr46/).
-        If False, do not apply the mapping.  The default is False.
-
-        *transitional* is a ``bool``: If True, use the
-        "transitional" mode described in Unicode Technical Standard
-        #46.  The default is False.
-
-        *allow_pure_ascii* is a ``bool``.  If True, then a label which
-        consists of only ASCII characters is allowed.  This is less
-        strict than regular IDNA 2008, but is also necessary for mixed
-        names, e.g. a name with starting with "_sip._tcp." and ending
-        in an IDN suffix which would otherwise be disallowed.  The
-        default is False.
-
-        *strict_decode* is a ``bool``: If True, then IDNA2008 checking
-        is done when decoding.  This can cause failures if the name
-        was encoded with IDNA2003.  The default is False.
-        """
-        super().__init__()
-        self.uts_46 = uts_46
-        self.transitional = transitional
-        self.allow_pure_ascii = allow_pure_ascii
-        self.strict_decode = strict_decode
-
-    def encode(self, label: str) -> bytes:
-        if label == "":
-            return b""
-        if self.allow_pure_ascii and is_all_ascii(label):
-            encoded = label.encode("ascii")
-            if len(encoded) > 63:
-                raise LabelTooLong
-            return encoded
-        if not have_idna_2008:
-            raise NoIDNA2008
-        try:
-            if self.uts_46:
-                # pylint: disable=possibly-used-before-assignment
-                label = idna.uts46_remap(label, False, self.transitional)
-            return idna.alabel(label)
-        except idna.IDNAError as e:
-            if e.args[0] == "Label too long":
-                raise LabelTooLong
-            else:
-                raise IDNAException(idna_exception=e)
-
-    def decode(self, label: bytes) -> str:
-        if not self.strict_decode:
-            return super().decode(label)
-        if label == b"":
-            return ""
-        if not have_idna_2008:
-            raise NoIDNA2008
-        try:
-            ulabel = idna.ulabel(label)
-            if self.uts_46:
-                ulabel = idna.uts46_remap(ulabel, False, self.transitional)
-            return _escapify(ulabel)
-        except (idna.IDNAError, UnicodeError) as e:
-            raise IDNAException(idna_exception=e)
-
-
-IDNA_2003_Practical = IDNA2003Codec(False)
-IDNA_2003_Strict = IDNA2003Codec(True)
-IDNA_2003 = IDNA_2003_Practical
-IDNA_2008_Practical = IDNA2008Codec(True, False, True, False)
-IDNA_2008_UTS_46 = IDNA2008Codec(True, False, False, False)
-IDNA_2008_Strict = IDNA2008Codec(False, False, False, True)
-IDNA_2008_Transitional = IDNA2008Codec(True, True, False, False)
-IDNA_2008 = IDNA_2008_Practical
-
-
-def _validate_labels(labels: Tuple[bytes, ...]) -> None:
-    """Check for empty labels in the middle of a label sequence,
-    labels that are too long, and for too many labels.
-
-    Raises ``dns.name.NameTooLong`` if the name as a whole is too long.
-
-    Raises ``dns.name.EmptyLabel`` if a label is empty (i.e. the root
-    label) and appears in a position other than the end of the label
-    sequence
-
-    """
-
-    l = len(labels)
-    total = 0
-    i = -1
-    j = 0
-    for label in labels:
-        ll = len(label)
-        total += ll + 1
-        if ll > 63:
-            raise LabelTooLong
-        if i < 0 and label == b"":
-            i = j
-        j += 1
-    if total > 255:
-        raise NameTooLong
-    if i >= 0 and i != l - 1:
-        raise EmptyLabel
-
-
-def _maybe_convert_to_binary(label: Union[bytes, str]) -> bytes:
-    """If label is ``str``, convert it to ``bytes``.  If it is already
-    ``bytes`` just return it.
-
-    """
-
-    if isinstance(label, bytes):
-        return label
-    if isinstance(label, str):
-        return label.encode()
-    raise ValueError  # pragma: no cover
-
-
-@dns.immutable.immutable
-class Name:
-    """A DNS name.
-
-    The dns.name.Name class represents a DNS name as a tuple of
-    labels.  Each label is a ``bytes`` in DNS wire format.  Instances
-    of the class are immutable.
-    """
-
-    __slots__ = ["labels"]
-
-    def __init__(self, labels: Iterable[Union[bytes, str]]):
-        """*labels* is any iterable whose values are ``str`` or ``bytes``."""
-
-        blabels = [_maybe_convert_to_binary(x) for x in labels]
-        self.labels = tuple(blabels)
-        _validate_labels(self.labels)
-
-    def __copy__(self):
-        return Name(self.labels)
-
-    def __deepcopy__(self, memo):
-        return Name(copy.deepcopy(self.labels, memo))
-
-    def __getstate__(self):
-        # Names can be pickled
-        return {"labels": self.labels}
-
-    def __setstate__(self, state):
-        super().__setattr__("labels", state["labels"])
-        _validate_labels(self.labels)
-
-    def is_absolute(self) -> bool:
-        """Is the most significant label of this name the root label?
-
-        Returns a ``bool``.
-        """
-
-        return len(self.labels) > 0 and self.labels[-1] == b""
-
-    def is_wild(self) -> bool:
-        """Is this name wild?  (I.e. Is the least significant label '*'?)
-
-        Returns a ``bool``.
-        """
-
-        return len(self.labels) > 0 and self.labels[0] == b"*"
-
-    def __hash__(self) -> int:
-        """Return a case-insensitive hash of the name.
-
-        Returns an ``int``.
-        """
-
-        h = 0
-        for label in self.labels:
-            for c in label.lower():
-                h += (h << 3) + c
-        return h
-
-    def fullcompare(self, other: "Name") -> Tuple[NameRelation, int, int]:
-        """Compare two names, returning a 3-tuple
-        ``(relation, order, nlabels)``.
-
-        *relation* describes the relation ship between the names,
-        and is one of: ``dns.name.NameRelation.NONE``,
-        ``dns.name.NameRelation.SUPERDOMAIN``, ``dns.name.NameRelation.SUBDOMAIN``,
-        ``dns.name.NameRelation.EQUAL``, or ``dns.name.NameRelation.COMMONANCESTOR``.
-
-        *order* is < 0 if *self* < *other*, > 0 if *self* > *other*, and ==
-        0 if *self* == *other*.  A relative name is always less than an
-        absolute name.  If both names have the same relativity, then
-        the DNSSEC order relation is used to order them.
-
-        *nlabels* is the number of significant labels that the two names
-        have in common.
-
-        Here are some examples.  Names ending in "." are absolute names,
-        those not ending in "." are relative names.
-
-        =============  =============  ===========  =====  =======
-        self           other          relation     order  nlabels
-        =============  =============  ===========  =====  =======
-        www.example.   www.example.   equal        0      3
-        www.example.   example.       subdomain    > 0    2
-        example.       www.example.   superdomain  < 0    2
-        example1.com.  example2.com.  common anc.  < 0    2
-        example1       example2.      none         < 0    0
-        example1.      example2       none         > 0    0
-        =============  =============  ===========  =====  =======
-        """
-
-        sabs = self.is_absolute()
-        oabs = other.is_absolute()
-        if sabs != oabs:
-            if sabs:
-                return (NameRelation.NONE, 1, 0)
-            else:
-                return (NameRelation.NONE, -1, 0)
-        l1 = len(self.labels)
-        l2 = len(other.labels)
-        ldiff = l1 - l2
-        if ldiff < 0:
-            l = l1
-        else:
-            l = l2
-
-        order = 0
-        nlabels = 0
-        namereln = NameRelation.NONE
-        while l > 0:
-            l -= 1
-            l1 -= 1
-            l2 -= 1
-            label1 = self.labels[l1].lower()
-            label2 = other.labels[l2].lower()
-            if label1 < label2:
-                order = -1
-                if nlabels > 0:
-                    namereln = NameRelation.COMMONANCESTOR
-                return (namereln, order, nlabels)
-            elif label1 > label2:
-                order = 1
-                if nlabels > 0:
-                    namereln = NameRelation.COMMONANCESTOR
-                return (namereln, order, nlabels)
-            nlabels += 1
-        order = ldiff
-        if ldiff < 0:
-            namereln = NameRelation.SUPERDOMAIN
-        elif ldiff > 0:
-            namereln = NameRelation.SUBDOMAIN
-        else:
-            namereln = NameRelation.EQUAL
-        return (namereln, order, nlabels)
-
-    def is_subdomain(self, other: "Name") -> bool:
-        """Is self a subdomain of other?
-
-        Note that the notion of subdomain includes equality, e.g.
-        "dnspython.org" is a subdomain of itself.
-
-        Returns a ``bool``.
-        """
-
-        (nr, _, _) = self.fullcompare(other)
-        if nr == NameRelation.SUBDOMAIN or nr == NameRelation.EQUAL:
-            return True
-        return False
-
-    def is_superdomain(self, other: "Name") -> bool:
-        """Is self a superdomain of other?
-
-        Note that the notion of superdomain includes equality, e.g.
-        "dnspython.org" is a superdomain of itself.
-
-        Returns a ``bool``.
-        """
-
-        (nr, _, _) = self.fullcompare(other)
-        if nr == NameRelation.SUPERDOMAIN or nr == NameRelation.EQUAL:
-            return True
-        return False
-
-    def canonicalize(self) -> "Name":
-        """Return a name which is equal to the current name, but is in
-        DNSSEC canonical form.
-        """
-
-        return Name([x.lower() for x in self.labels])
-
-    def __eq__(self, other):
-        if isinstance(other, Name):
-            return self.fullcompare(other)[1] == 0
-        else:
-            return False
-
-    def __ne__(self, other):
-        if isinstance(other, Name):
-            return self.fullcompare(other)[1] != 0
-        else:
-            return True
-
-    def __lt__(self, other):
-        if isinstance(other, Name):
-            return self.fullcompare(other)[1] < 0
-        else:
-            return NotImplemented
-
-    def __le__(self, other):
-        if isinstance(other, Name):
-            return self.fullcompare(other)[1] <= 0
-        else:
-            return NotImplemented
-
-    def __ge__(self, other):
-        if isinstance(other, Name):
-            return self.fullcompare(other)[1] >= 0
-        else:
-            return NotImplemented
-
-    def __gt__(self, other):
-        if isinstance(other, Name):
-            return self.fullcompare(other)[1] > 0
-        else:
-            return NotImplemented
-
-    def __repr__(self):
-        return "<DNS name " + self.__str__() + ">"
-
-    def __str__(self):
-        return self.to_text(False)
-
-    def to_text(self, omit_final_dot: bool = False) -> str:
-        """Convert name to DNS text format.
-
-        *omit_final_dot* is a ``bool``.  If True, don't emit the final
-        dot (denoting the root label) for absolute names.  The default
-        is False.
-
-        Returns a ``str``.
-        """
-
-        if len(self.labels) == 0:
-            return "@"
-        if len(self.labels) == 1 and self.labels[0] == b"":
-            return "."
-        if omit_final_dot and self.is_absolute():
-            l = self.labels[:-1]
-        else:
-            l = self.labels
-        s = ".".join(map(_escapify, l))
-        return s
-
-    def to_unicode(
-        self, omit_final_dot: bool = False, idna_codec: Optional[IDNACodec] = None
-    ) -> str:
-        """Convert name to Unicode text format.
-
-        IDN ACE labels are converted to Unicode.
-
-        *omit_final_dot* is a ``bool``.  If True, don't emit the final
-        dot (denoting the root label) for absolute names.  The default
-        is False.
-        *idna_codec* specifies the IDNA encoder/decoder.  If None, the
-        dns.name.IDNA_2003_Practical encoder/decoder is used.
-        The IDNA_2003_Practical decoder does
-        not impose any policy, it just decodes punycode, so if you
-        don't want checking for compliance, you can use this decoder
-        for IDNA2008 as well.
-
-        Returns a ``str``.
-        """
-
-        if len(self.labels) == 0:
-            return "@"
-        if len(self.labels) == 1 and self.labels[0] == b"":
-            return "."
-        if omit_final_dot and self.is_absolute():
-            l = self.labels[:-1]
-        else:
-            l = self.labels
-        if idna_codec is None:
-            idna_codec = IDNA_2003_Practical
-        return ".".join([idna_codec.decode(x) for x in l])
-
-    def to_digestable(self, origin: Optional["Name"] = None) -> bytes:
-        """Convert name to a format suitable for digesting in hashes.
-
-        The name is canonicalized and converted to uncompressed wire
-        format.  All names in wire format are absolute.  If the name
-        is a relative name, then an origin must be supplied.
-
-        *origin* is a ``dns.name.Name`` or ``None``.  If the name is
-        relative and origin is not ``None``, then origin will be appended
-        to the name.
-
-        Raises ``dns.name.NeedAbsoluteNameOrOrigin`` if the name is
-        relative and no origin was provided.
-
-        Returns a ``bytes``.
-        """
-
-        digest = self.to_wire(origin=origin, canonicalize=True)
-        assert digest is not None
-        return digest
-
-    def to_wire(
-        self,
-        file: Optional[Any] = None,
-        compress: Optional[CompressType] = None,
-        origin: Optional["Name"] = None,
-        canonicalize: bool = False,
-    ) -> Optional[bytes]:
-        """Convert name to wire format, possibly compressing it.
-
-        *file* is the file where the name is emitted (typically an
-        io.BytesIO file).  If ``None`` (the default), a ``bytes``
-        containing the wire name will be returned.
-
-        *compress*, a ``dict``, is the compression table to use.  If
-        ``None`` (the default), names will not be compressed.  Note that
-        the compression code assumes that compression offset 0 is the
-        start of *file*, and thus compression will not be correct
-        if this is not the case.
-
-        *origin* is a ``dns.name.Name`` or ``None``.  If the name is
-        relative and origin is not ``None``, then *origin* will be appended
-        to it.
-
-        *canonicalize*, a ``bool``, indicates whether the name should
-        be canonicalized; that is, converted to a format suitable for
-        digesting in hashes.
-
-        Raises ``dns.name.NeedAbsoluteNameOrOrigin`` if the name is
-        relative and no origin was provided.
-
-        Returns a ``bytes`` or ``None``.
-        """
-
-        if file is None:
-            out = bytearray()
-            for label in self.labels:
-                out.append(len(label))
-                if canonicalize:
-                    out += label.lower()
-                else:
-                    out += label
-            if not self.is_absolute():
-                if origin is None or not origin.is_absolute():
-                    raise NeedAbsoluteNameOrOrigin
-                for label in origin.labels:
-                    out.append(len(label))
-                    if canonicalize:
-                        out += label.lower()
-                    else:
-                        out += label
-            return bytes(out)
-
-        labels: Iterable[bytes]
-        if not self.is_absolute():
-            if origin is None or not origin.is_absolute():
-                raise NeedAbsoluteNameOrOrigin
-            labels = list(self.labels)
-            labels.extend(list(origin.labels))
-        else:
-            labels = self.labels
-        i = 0
-        for label in labels:
-            n = Name(labels[i:])
-            i += 1
-            if compress is not None:
-                pos = compress.get(n)
-            else:
-                pos = None
-            if pos is not None:
-                value = 0xC000 + pos
-                s = struct.pack("!H", value)
-                file.write(s)
-                break
-            else:
-                if compress is not None and len(n) > 1:
-                    pos = file.tell()
-                    if pos <= 0x3FFF:
-                        compress[n] = pos
-                l = len(label)
-                file.write(struct.pack("!B", l))
-                if l > 0:
-                    if canonicalize:
-                        file.write(label.lower())
-                    else:
-                        file.write(label)
-        return None
-
-    def __len__(self) -> int:
-        """The length of the name (in labels).
-
-        Returns an ``int``.
-        """
-
-        return len(self.labels)
-
-    def __getitem__(self, index):
-        return self.labels[index]
-
-    def __add__(self, other):
-        return self.concatenate(other)
-
-    def __sub__(self, other):
-        return self.relativize(other)
-
-    def split(self, depth: int) -> Tuple["Name", "Name"]:
-        """Split a name into a prefix and suffix names at the specified depth.
-
-        *depth* is an ``int`` specifying the number of labels in the suffix
-
-        Raises ``ValueError`` if *depth* was not >= 0 and <= the length of the
-        name.
-
-        Returns the tuple ``(prefix, suffix)``.
-        """
-
-        l = len(self.labels)
-        if depth == 0:
-            return (self, dns.name.empty)
-        elif depth == l:
-            return (dns.name.empty, self)
-        elif depth < 0 or depth > l:
-            raise ValueError("depth must be >= 0 and <= the length of the name")
-        return (Name(self[:-depth]), Name(self[-depth:]))
-
-    def concatenate(self, other: "Name") -> "Name":
-        """Return a new name which is the concatenation of self and other.
-
-        Raises ``dns.name.AbsoluteConcatenation`` if the name is
-        absolute and *other* is not the empty name.
-
-        Returns a ``dns.name.Name``.
-        """
-
-        if self.is_absolute() and len(other) > 0:
-            raise AbsoluteConcatenation
-        labels = list(self.labels)
-        labels.extend(list(other.labels))
-        return Name(labels)
-
-    def relativize(self, origin: "Name") -> "Name":
-        """If the name is a subdomain of *origin*, return a new name which is
-        the name relative to origin.  Otherwise return the name.
-
-        For example, relativizing ``www.dnspython.org.`` to origin
-        ``dnspython.org.`` returns the name ``www``.  Relativizing ``example.``
-        to origin ``dnspython.org.`` returns ``example.``.
-
-        Returns a ``dns.name.Name``.
-        """
-
-        if origin is not None and self.is_subdomain(origin):
-            return Name(self[: -len(origin)])
-        else:
-            return self
-
-    def derelativize(self, origin: "Name") -> "Name":
-        """If the name is a relative name, return a new name which is the
-        concatenation of the name and origin.  Otherwise return the name.
-
-        For example, derelativizing ``www`` to origin ``dnspython.org.``
-        returns the name ``www.dnspython.org.``.  Derelativizing ``example.``
-        to origin ``dnspython.org.`` returns ``example.``.
-
-        Returns a ``dns.name.Name``.
-        """
-
-        if not self.is_absolute():
-            return self.concatenate(origin)
-        else:
-            return self
-
-    def choose_relativity(
-        self, origin: Optional["Name"] = None, relativize: bool = True
-    ) -> "Name":
-        """Return a name with the relativity desired by the caller.
-
-        If *origin* is ``None``, then the name is returned.
-        Otherwise, if *relativize* is ``True`` the name is
-        relativized, and if *relativize* is ``False`` the name is
-        derelativized.
-
-        Returns a ``dns.name.Name``.
-        """
-
-        if origin:
-            if relativize:
-                return self.relativize(origin)
-            else:
-                return self.derelativize(origin)
-        else:
-            return self
-
-    def parent(self) -> "Name":
-        """Return the parent of the name.
-
-        For example, the parent of ``www.dnspython.org.`` is ``dnspython.org``.
-
-        Raises ``dns.name.NoParent`` if the name is either the root name or the
-        empty name, and thus has no parent.
-
-        Returns a ``dns.name.Name``.
-        """
-
-        if self == root or self == empty:
-            raise NoParent
-        return Name(self.labels[1:])
-
-    def predecessor(self, origin: "Name", prefix_ok: bool = True) -> "Name":
-        """Return the maximal predecessor of *name* in the DNSSEC ordering in the zone
-        whose origin is *origin*, or return the longest name under *origin* if the
-        name is origin (i.e. wrap around to the longest name, which may still be
-        *origin* due to length considerations.
-
-        The relativity of the name is preserved, so if this name is relative
-        then the method will return a relative name, and likewise if this name
-        is absolute then the predecessor will be absolute.
-
-        *prefix_ok* indicates if prefixing labels is allowed, and
-        defaults to ``True``.  Normally it is good to allow this, but if computing
-        a maximal predecessor at a zone cut point then ``False`` must be specified.
-        """
-        return _handle_relativity_and_call(
-            _absolute_predecessor, self, origin, prefix_ok
-        )
-
-    def successor(self, origin: "Name", prefix_ok: bool = True) -> "Name":
-        """Return the minimal successor of *name* in the DNSSEC ordering in the zone
-        whose origin is *origin*, or return *origin* if the successor cannot be
-        computed due to name length limitations.
-
-        Note that *origin* is returned in the "too long" cases because wrapping
-        around to the origin is how NSEC records express "end of the zone".
-
-        The relativity of the name is preserved, so if this name is relative
-        then the method will return a relative name, and likewise if this name
-        is absolute then the successor will be absolute.
-
-        *prefix_ok* indicates if prefixing a new minimal label is allowed, and
-        defaults to ``True``.  Normally it is good to allow this, but if computing
-        a minimal successor at a zone cut point then ``False`` must be specified.
-        """
-        return _handle_relativity_and_call(_absolute_successor, self, origin, prefix_ok)
-
-
-#: The root name, '.'
-root = Name([b""])
-
-#: The empty name.
-empty = Name([])
-
-
-def from_unicode(
-    text: str, origin: Optional[Name] = root, idna_codec: Optional[IDNACodec] = None
-) -> Name:
-    """Convert unicode text into a Name object.
-
-    Labels are encoded in IDN ACE form according to rules specified by
-    the IDNA codec.
-
-    *text*, a ``str``, is the text to convert into a name.
-
-    *origin*, a ``dns.name.Name``, specifies the origin to
-    append to non-absolute names.  The default is the root name.
-
-    *idna_codec*, a ``dns.name.IDNACodec``, specifies the IDNA
-    encoder/decoder.  If ``None``, the default IDNA 2003 encoder/decoder
-    is used.
-
-    Returns a ``dns.name.Name``.
-    """
-
-    if not isinstance(text, str):
-        raise ValueError("input to from_unicode() must be a unicode string")
-    if not (origin is None or isinstance(origin, Name)):
-        raise ValueError("origin must be a Name or None")
-    labels = []
-    label = ""
-    escaping = False
-    edigits = 0
-    total = 0
-    if idna_codec is None:
-        idna_codec = IDNA_2003
-    if text == "@":
-        text = ""
-    if text:
-        if text in [".", "\u3002", "\uff0e", "\uff61"]:
-            return Name([b""])  # no Unicode "u" on this constant!
-        for c in text:
-            if escaping:
-                if edigits == 0:
-                    if c.isdigit():
-                        total = int(c)
-                        edigits += 1
-                    else:
-                        label += c
-                        escaping = False
-                else:
-                    if not c.isdigit():
-                        raise BadEscape
-                    total *= 10
-                    total += int(c)
-                    edigits += 1
-                    if edigits == 3:
-                        escaping = False
-                        label += chr(total)
-            elif c in [".", "\u3002", "\uff0e", "\uff61"]:
-                if len(label) == 0:
-                    raise EmptyLabel
-                labels.append(idna_codec.encode(label))
-                label = ""
-            elif c == "\\":
-                escaping = True
-                edigits = 0
-                total = 0
-            else:
-                label += c
-        if escaping:
-            raise BadEscape
-        if len(label) > 0:
-            labels.append(idna_codec.encode(label))
-        else:
-            labels.append(b"")
-
-    if (len(labels) == 0 or labels[-1] != b"") and origin is not None:
-        labels.extend(list(origin.labels))
-    return Name(labels)
-
-
-def is_all_ascii(text: str) -> bool:
-    for c in text:
-        if ord(c) > 0x7F:
-            return False
-    return True
-
-
-def from_text(
-    text: Union[bytes, str],
-    origin: Optional[Name] = root,
-    idna_codec: Optional[IDNACodec] = None,
-) -> Name:
-    """Convert text into a Name object.
-
-    *text*, a ``bytes`` or ``str``, is the text to convert into a name.
-
-    *origin*, a ``dns.name.Name``, specifies the origin to
-    append to non-absolute names.  The default is the root name.
-
-    *idna_codec*, a ``dns.name.IDNACodec``, specifies the IDNA
-    encoder/decoder.  If ``None``, the default IDNA 2003 encoder/decoder
-    is used.
-
-    Returns a ``dns.name.Name``.
-    """
-
-    if isinstance(text, str):
-        if not is_all_ascii(text):
-            # Some codepoint in the input text is > 127, so IDNA applies.
-            return from_unicode(text, origin, idna_codec)
-        # The input is all ASCII, so treat this like an ordinary non-IDNA
-        # domain name.  Note that "all ASCII" is about the input text,
-        # not the codepoints in the domain name.  E.g. if text has value
-        #
-        # r'\150\151\152\153\154\155\156\157\158\159'
-        #
-        # then it's still "all ASCII" even though the domain name has
-        # codepoints > 127.
-        text = text.encode("ascii")
-    if not isinstance(text, bytes):
-        raise ValueError("input to from_text() must be a string")
-    if not (origin is None or isinstance(origin, Name)):
-        raise ValueError("origin must be a Name or None")
-    labels = []
-    label = b""
-    escaping = False
-    edigits = 0
-    total = 0
-    if text == b"@":
-        text = b""
-    if text:
-        if text == b".":
-            return Name([b""])
-        for c in text:
-            byte_ = struct.pack("!B", c)
-            if escaping:
-                if edigits == 0:
-                    if byte_.isdigit():
-                        total = int(byte_)
-                        edigits += 1
-                    else:
-                        label += byte_
-                        escaping = False
-                else:
-                    if not byte_.isdigit():
-                        raise BadEscape
-                    total *= 10
-                    total += int(byte_)
-                    edigits += 1
-                    if edigits == 3:
-                        escaping = False
-                        label += struct.pack("!B", total)
-            elif byte_ == b".":
-                if len(label) == 0:
-                    raise EmptyLabel
-                labels.append(label)
-                label = b""
-            elif byte_ == b"\\":
-                escaping = True
-                edigits = 0
-                total = 0
-            else:
-                label += byte_
-        if escaping:
-            raise BadEscape
-        if len(label) > 0:
-            labels.append(label)
-        else:
-            labels.append(b"")
-    if (len(labels) == 0 or labels[-1] != b"") and origin is not None:
-        labels.extend(list(origin.labels))
-    return Name(labels)
-
-
-# we need 'dns.wire.Parser' quoted as dns.name and dns.wire depend on each other.
-
-
-def from_wire_parser(parser: "dns.wire.Parser") -> Name:
-    """Convert possibly compressed wire format into a Name.
-
-    *parser* is a dns.wire.Parser.
-
-    Raises ``dns.name.BadPointer`` if a compression pointer did not
-    point backwards in the message.
-
-    Raises ``dns.name.BadLabelType`` if an invalid label type was encountered.
-
-    Returns a ``dns.name.Name``
-    """
-
-    labels = []
-    biggest_pointer = parser.current
-    with parser.restore_furthest():
-        count = parser.get_uint8()
-        while count != 0:
-            if count < 64:
-                labels.append(parser.get_bytes(count))
-            elif count >= 192:
-                current = (count & 0x3F) * 256 + parser.get_uint8()
-                if current >= biggest_pointer:
-                    raise BadPointer
-                biggest_pointer = current
-                parser.seek(current)
-            else:
-                raise BadLabelType
-            count = parser.get_uint8()
-        labels.append(b"")
-    return Name(labels)
-
-
-def from_wire(message: bytes, current: int) -> Tuple[Name, int]:
-    """Convert possibly compressed wire format into a Name.
-
-    *message* is a ``bytes`` containing an entire DNS message in DNS
-    wire form.
-
-    *current*, an ``int``, is the offset of the beginning of the name
-    from the start of the message
-
-    Raises ``dns.name.BadPointer`` if a compression pointer did not
-    point backwards in the message.
-
-    Raises ``dns.name.BadLabelType`` if an invalid label type was encountered.
-
-    Returns a ``(dns.name.Name, int)`` tuple consisting of the name
-    that was read and the number of bytes of the wire format message
-    which were consumed reading it.
-    """
-
-    if not isinstance(message, bytes):
-        raise ValueError("input to from_wire() must be a byte string")
-    parser = dns.wire.Parser(message, current)
-    name = from_wire_parser(parser)
-    return (name, parser.current - current)
-
-
-# RFC 4471 Support
-
-_MINIMAL_OCTET = b"\x00"
-_MINIMAL_OCTET_VALUE = ord(_MINIMAL_OCTET)
-_SUCCESSOR_PREFIX = Name([_MINIMAL_OCTET])
-_MAXIMAL_OCTET = b"\xff"
-_MAXIMAL_OCTET_VALUE = ord(_MAXIMAL_OCTET)
-_AT_SIGN_VALUE = ord("@")
-_LEFT_SQUARE_BRACKET_VALUE = ord("[")
-
-
-def _wire_length(labels):
-    return functools.reduce(lambda v, x: v + len(x) + 1, labels, 0)
-
-
-def _pad_to_max_name(name):
-    needed = 255 - _wire_length(name.labels)
-    new_labels = []
-    while needed > 64:
-        new_labels.append(_MAXIMAL_OCTET * 63)
-        needed -= 64
-    if needed >= 2:
-        new_labels.append(_MAXIMAL_OCTET * (needed - 1))
-    # Note we're already maximal in the needed == 1 case as while we'd like
-    # to add one more byte as a new label, we can't, as adding a new non-empty
-    # label requires at least 2 bytes.
-    new_labels = list(reversed(new_labels))
-    new_labels.extend(name.labels)
-    return Name(new_labels)
-
-
-def _pad_to_max_label(label, suffix_labels):
-    length = len(label)
-    # We have to subtract one here to account for the length byte of label.
-    remaining = 255 - _wire_length(suffix_labels) - length - 1
-    if remaining <= 0:
-        # Shouldn't happen!
-        return label
-    needed = min(63 - length, remaining)
-    return label + _MAXIMAL_OCTET * needed
-
-
-def _absolute_predecessor(name: Name, origin: Name, prefix_ok: bool) -> Name:
-    # This is the RFC 4471 predecessor algorithm using the "absolute method" of section
-    # 3.1.1.
-    #
-    # Our caller must ensure that the name and origin are absolute, and that name is a
-    # subdomain of origin.
-    if name == origin:
-        return _pad_to_max_name(name)
-    least_significant_label = name[0]
-    if least_significant_label == _MINIMAL_OCTET:
-        return name.parent()
-    least_octet = least_significant_label[-1]
-    suffix_labels = name.labels[1:]
-    if least_octet == _MINIMAL_OCTET_VALUE:
-        new_labels = [least_significant_label[:-1]]
-    else:
-        octets = bytearray(least_significant_label)
-        octet = octets[-1]
-        if octet == _LEFT_SQUARE_BRACKET_VALUE:
-            octet = _AT_SIGN_VALUE
-        else:
-            octet -= 1
-        octets[-1] = octet
-        least_significant_label = bytes(octets)
-        new_labels = [_pad_to_max_label(least_significant_label, suffix_labels)]
-    new_labels.extend(suffix_labels)
-    name = Name(new_labels)
-    if prefix_ok:
-        return _pad_to_max_name(name)
-    else:
-        return name
-
-
-def _absolute_successor(name: Name, origin: Name, prefix_ok: bool) -> Name:
-    # This is the RFC 4471 successor algorithm using the "absolute method" of section
-    # 3.1.2.
-    #
-    # Our caller must ensure that the name and origin are absolute, and that name is a
-    # subdomain of origin.
-    if prefix_ok:
-        # Try prefixing \000 as new label
-        try:
-            return _SUCCESSOR_PREFIX.concatenate(name)
-        except NameTooLong:
-            pass
-    while name != origin:
-        # Try extending the least significant label.
-        least_significant_label = name[0]
-        if len(least_significant_label) < 63:
-            # We may be able to extend the least label with a minimal additional byte.
-            # This is only "may" because we could have a maximal length name even though
-            # the least significant label isn't maximally long.
-            new_labels = [least_significant_label + _MINIMAL_OCTET]
-            new_labels.extend(name.labels[1:])
-            try:
-                return dns.name.Name(new_labels)
-            except dns.name.NameTooLong:
-                pass
-        # We can't extend the label either, so we'll try to increment the least
-        # signficant non-maximal byte in it.
-        octets = bytearray(least_significant_label)
-        # We do this reversed iteration with an explicit indexing variable because
-        # if we find something to increment, we're going to want to truncate everything
-        # to the right of it.
-        for i in range(len(octets) - 1, -1, -1):
-            octet = octets[i]
-            if octet == _MAXIMAL_OCTET_VALUE:
-                # We can't increment this, so keep looking.
-                continue
-            # Finally, something we can increment.  We have to apply a special rule for
-            # incrementing "@", sending it to "[", because RFC 4034 6.1 says that when
-            # comparing names, uppercase letters compare as if they were their
-            # lower-case equivalents. If we increment "@" to "A", then it would compare
-            # as "a", which is after "[", "\", "]", "^", "_", and "`", so we would have
-            # skipped the most minimal successor, namely "[".
-            if octet == _AT_SIGN_VALUE:
-                octet = _LEFT_SQUARE_BRACKET_VALUE
-            else:
-                octet += 1
-            octets[i] = octet
-            # We can now truncate all of the maximal values we skipped (if any)
-            new_labels = [bytes(octets[: i + 1])]
-            new_labels.extend(name.labels[1:])
-            # We haven't changed the length of the name, so the Name constructor will
-            # always work.
-            return Name(new_labels)
-        # We couldn't increment, so chop off the least significant label and try
-        # again.
-        name = name.parent()
-
-    # We couldn't increment at all, so return the origin, as wrapping around is the
-    # DNSSEC way.
-    return origin
-
-
-def _handle_relativity_and_call(
-    function: Callable[[Name, Name, bool], Name],
-    name: Name,
-    origin: Name,
-    prefix_ok: bool,
-) -> Name:
-    # Make "name" absolute if needed, ensure that the origin is absolute,
-    # call function(), and then relativize the result if needed.
-    if not origin.is_absolute():
-        raise NeedAbsoluteNameOrOrigin
-    relative = not name.is_absolute()
-    if relative:
-        name = name.derelativize(origin)
-    elif not name.is_subdomain(origin):
-        raise NeedSubdomainOfOrigin
-    result_name = function(name, origin, prefix_ok)
-    if relative:
-        result_name = result_name.relativize(origin)
-    return result_name
diff --git a/lib/dns/namedict.py b/lib/dns/namedict.py
deleted file mode 100644
index ca8b1978..00000000
--- a/lib/dns/namedict.py
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2017 Nominum, Inc.
-# Copyright (C) 2016 Coresec Systems AB
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND CORESEC SYSTEMS AB DISCLAIMS ALL
-# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL CORESEC
-# SYSTEMS AB BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR
-# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
-# OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""DNS name dictionary"""
-
-# pylint seems to be confused about this one!
-from collections.abc import MutableMapping  # pylint: disable=no-name-in-module
-
-import dns.name
-
-
-class NameDict(MutableMapping):
-    """A dictionary whose keys are dns.name.Name objects.
-
-    In addition to being like a regular Python dictionary, this
-    dictionary can also get the deepest match for a given key.
-    """
-
-    __slots__ = ["max_depth", "max_depth_items", "__store"]
-
-    def __init__(self, *args, **kwargs):
-        super().__init__()
-        self.__store = dict()
-        #: the maximum depth of the keys that have ever been added
-        self.max_depth = 0
-        #: the number of items of maximum depth
-        self.max_depth_items = 0
-        self.update(dict(*args, **kwargs))
-
-    def __update_max_depth(self, key):
-        if len(key) == self.max_depth:
-            self.max_depth_items = self.max_depth_items + 1
-        elif len(key) > self.max_depth:
-            self.max_depth = len(key)
-            self.max_depth_items = 1
-
-    def __getitem__(self, key):
-        return self.__store[key]
-
-    def __setitem__(self, key, value):
-        if not isinstance(key, dns.name.Name):
-            raise ValueError("NameDict key must be a name")
-        self.__store[key] = value
-        self.__update_max_depth(key)
-
-    def __delitem__(self, key):
-        self.__store.pop(key)
-        if len(key) == self.max_depth:
-            self.max_depth_items = self.max_depth_items - 1
-        if self.max_depth_items == 0:
-            self.max_depth = 0
-            for k in self.__store:
-                self.__update_max_depth(k)
-
-    def __iter__(self):
-        return iter(self.__store)
-
-    def __len__(self):
-        return len(self.__store)
-
-    def has_key(self, key):
-        return key in self.__store
-
-    def get_deepest_match(self, name):
-        """Find the deepest match to *name* in the dictionary.
-
-        The deepest match is the longest name in the dictionary which is
-        a superdomain of *name*.  Note that *superdomain* includes matching
-        *name* itself.
-
-        *name*, a ``dns.name.Name``, the name to find.
-
-        Returns a ``(key, value)`` where *key* is the deepest
-        ``dns.name.Name``, and *value* is the value associated with *key*.
-        """
-
-        depth = len(name)
-        if depth > self.max_depth:
-            depth = self.max_depth
-        for i in range(-depth, 0):
-            n = dns.name.Name(name[i:])
-            if n in self:
-                return (n, self[n])
-        v = self[dns.name.empty]
-        return (dns.name.empty, v)
diff --git a/lib/dns/nameserver.py b/lib/dns/nameserver.py
deleted file mode 100644
index b02a239b..00000000
--- a/lib/dns/nameserver.py
+++ /dev/null
@@ -1,363 +0,0 @@
-from typing import Optional, Union
-from urllib.parse import urlparse
-
-import dns.asyncbackend
-import dns.asyncquery
-import dns.inet
-import dns.message
-import dns.query
-
-
-class Nameserver:
-    def __init__(self):
-        pass
-
-    def __str__(self):
-        raise NotImplementedError
-
-    def kind(self) -> str:
-        raise NotImplementedError
-
-    def is_always_max_size(self) -> bool:
-        raise NotImplementedError
-
-    def answer_nameserver(self) -> str:
-        raise NotImplementedError
-
-    def answer_port(self) -> int:
-        raise NotImplementedError
-
-    def query(
-        self,
-        request: dns.message.QueryMessage,
-        timeout: float,
-        source: Optional[str],
-        source_port: int,
-        max_size: bool,
-        one_rr_per_rrset: bool = False,
-        ignore_trailing: bool = False,
-    ) -> dns.message.Message:
-        raise NotImplementedError
-
-    async def async_query(
-        self,
-        request: dns.message.QueryMessage,
-        timeout: float,
-        source: Optional[str],
-        source_port: int,
-        max_size: bool,
-        backend: dns.asyncbackend.Backend,
-        one_rr_per_rrset: bool = False,
-        ignore_trailing: bool = False,
-    ) -> dns.message.Message:
-        raise NotImplementedError
-
-
-class AddressAndPortNameserver(Nameserver):
-    def __init__(self, address: str, port: int):
-        super().__init__()
-        self.address = address
-        self.port = port
-
-    def kind(self) -> str:
-        raise NotImplementedError
-
-    def is_always_max_size(self) -> bool:
-        return False
-
-    def __str__(self):
-        ns_kind = self.kind()
-        return f"{ns_kind}:{self.address}@{self.port}"
-
-    def answer_nameserver(self) -> str:
-        return self.address
-
-    def answer_port(self) -> int:
-        return self.port
-
-
-class Do53Nameserver(AddressAndPortNameserver):
-    def __init__(self, address: str, port: int = 53):
-        super().__init__(address, port)
-
-    def kind(self):
-        return "Do53"
-
-    def query(
-        self,
-        request: dns.message.QueryMessage,
-        timeout: float,
-        source: Optional[str],
-        source_port: int,
-        max_size: bool,
-        one_rr_per_rrset: bool = False,
-        ignore_trailing: bool = False,
-    ) -> dns.message.Message:
-        if max_size:
-            response = dns.query.tcp(
-                request,
-                self.address,
-                timeout=timeout,
-                port=self.port,
-                source=source,
-                source_port=source_port,
-                one_rr_per_rrset=one_rr_per_rrset,
-                ignore_trailing=ignore_trailing,
-            )
-        else:
-            response = dns.query.udp(
-                request,
-                self.address,
-                timeout=timeout,
-                port=self.port,
-                source=source,
-                source_port=source_port,
-                raise_on_truncation=True,
-                one_rr_per_rrset=one_rr_per_rrset,
-                ignore_trailing=ignore_trailing,
-                ignore_errors=True,
-                ignore_unexpected=True,
-            )
-        return response
-
-    async def async_query(
-        self,
-        request: dns.message.QueryMessage,
-        timeout: float,
-        source: Optional[str],
-        source_port: int,
-        max_size: bool,
-        backend: dns.asyncbackend.Backend,
-        one_rr_per_rrset: bool = False,
-        ignore_trailing: bool = False,
-    ) -> dns.message.Message:
-        if max_size:
-            response = await dns.asyncquery.tcp(
-                request,
-                self.address,
-                timeout=timeout,
-                port=self.port,
-                source=source,
-                source_port=source_port,
-                backend=backend,
-                one_rr_per_rrset=one_rr_per_rrset,
-                ignore_trailing=ignore_trailing,
-            )
-        else:
-            response = await dns.asyncquery.udp(
-                request,
-                self.address,
-                timeout=timeout,
-                port=self.port,
-                source=source,
-                source_port=source_port,
-                raise_on_truncation=True,
-                backend=backend,
-                one_rr_per_rrset=one_rr_per_rrset,
-                ignore_trailing=ignore_trailing,
-                ignore_errors=True,
-                ignore_unexpected=True,
-            )
-        return response
-
-
-class DoHNameserver(Nameserver):
-    def __init__(
-        self,
-        url: str,
-        bootstrap_address: Optional[str] = None,
-        verify: Union[bool, str] = True,
-        want_get: bool = False,
-        http_version: dns.query.HTTPVersion = dns.query.HTTPVersion.DEFAULT,
-    ):
-        super().__init__()
-        self.url = url
-        self.bootstrap_address = bootstrap_address
-        self.verify = verify
-        self.want_get = want_get
-        self.http_version = http_version
-
-    def kind(self):
-        return "DoH"
-
-    def is_always_max_size(self) -> bool:
-        return True
-
-    def __str__(self):
-        return self.url
-
-    def answer_nameserver(self) -> str:
-        return self.url
-
-    def answer_port(self) -> int:
-        port = urlparse(self.url).port
-        if port is None:
-            port = 443
-        return port
-
-    def query(
-        self,
-        request: dns.message.QueryMessage,
-        timeout: float,
-        source: Optional[str],
-        source_port: int,
-        max_size: bool = False,
-        one_rr_per_rrset: bool = False,
-        ignore_trailing: bool = False,
-    ) -> dns.message.Message:
-        return dns.query.https(
-            request,
-            self.url,
-            timeout=timeout,
-            source=source,
-            source_port=source_port,
-            bootstrap_address=self.bootstrap_address,
-            one_rr_per_rrset=one_rr_per_rrset,
-            ignore_trailing=ignore_trailing,
-            verify=self.verify,
-            post=(not self.want_get),
-            http_version=self.http_version,
-        )
-
-    async def async_query(
-        self,
-        request: dns.message.QueryMessage,
-        timeout: float,
-        source: Optional[str],
-        source_port: int,
-        max_size: bool,
-        backend: dns.asyncbackend.Backend,
-        one_rr_per_rrset: bool = False,
-        ignore_trailing: bool = False,
-    ) -> dns.message.Message:
-        return await dns.asyncquery.https(
-            request,
-            self.url,
-            timeout=timeout,
-            source=source,
-            source_port=source_port,
-            bootstrap_address=self.bootstrap_address,
-            one_rr_per_rrset=one_rr_per_rrset,
-            ignore_trailing=ignore_trailing,
-            verify=self.verify,
-            post=(not self.want_get),
-            http_version=self.http_version,
-        )
-
-
-class DoTNameserver(AddressAndPortNameserver):
-    def __init__(
-        self,
-        address: str,
-        port: int = 853,
-        hostname: Optional[str] = None,
-        verify: Union[bool, str] = True,
-    ):
-        super().__init__(address, port)
-        self.hostname = hostname
-        self.verify = verify
-
-    def kind(self):
-        return "DoT"
-
-    def query(
-        self,
-        request: dns.message.QueryMessage,
-        timeout: float,
-        source: Optional[str],
-        source_port: int,
-        max_size: bool = False,
-        one_rr_per_rrset: bool = False,
-        ignore_trailing: bool = False,
-    ) -> dns.message.Message:
-        return dns.query.tls(
-            request,
-            self.address,
-            port=self.port,
-            timeout=timeout,
-            one_rr_per_rrset=one_rr_per_rrset,
-            ignore_trailing=ignore_trailing,
-            server_hostname=self.hostname,
-            verify=self.verify,
-        )
-
-    async def async_query(
-        self,
-        request: dns.message.QueryMessage,
-        timeout: float,
-        source: Optional[str],
-        source_port: int,
-        max_size: bool,
-        backend: dns.asyncbackend.Backend,
-        one_rr_per_rrset: bool = False,
-        ignore_trailing: bool = False,
-    ) -> dns.message.Message:
-        return await dns.asyncquery.tls(
-            request,
-            self.address,
-            port=self.port,
-            timeout=timeout,
-            one_rr_per_rrset=one_rr_per_rrset,
-            ignore_trailing=ignore_trailing,
-            server_hostname=self.hostname,
-            verify=self.verify,
-        )
-
-
-class DoQNameserver(AddressAndPortNameserver):
-    def __init__(
-        self,
-        address: str,
-        port: int = 853,
-        verify: Union[bool, str] = True,
-        server_hostname: Optional[str] = None,
-    ):
-        super().__init__(address, port)
-        self.verify = verify
-        self.server_hostname = server_hostname
-
-    def kind(self):
-        return "DoQ"
-
-    def query(
-        self,
-        request: dns.message.QueryMessage,
-        timeout: float,
-        source: Optional[str],
-        source_port: int,
-        max_size: bool = False,
-        one_rr_per_rrset: bool = False,
-        ignore_trailing: bool = False,
-    ) -> dns.message.Message:
-        return dns.query.quic(
-            request,
-            self.address,
-            port=self.port,
-            timeout=timeout,
-            one_rr_per_rrset=one_rr_per_rrset,
-            ignore_trailing=ignore_trailing,
-            verify=self.verify,
-            server_hostname=self.server_hostname,
-        )
-
-    async def async_query(
-        self,
-        request: dns.message.QueryMessage,
-        timeout: float,
-        source: Optional[str],
-        source_port: int,
-        max_size: bool,
-        backend: dns.asyncbackend.Backend,
-        one_rr_per_rrset: bool = False,
-        ignore_trailing: bool = False,
-    ) -> dns.message.Message:
-        return await dns.asyncquery.quic(
-            request,
-            self.address,
-            port=self.port,
-            timeout=timeout,
-            one_rr_per_rrset=one_rr_per_rrset,
-            ignore_trailing=ignore_trailing,
-            verify=self.verify,
-            server_hostname=self.server_hostname,
-        )
diff --git a/lib/dns/node.py b/lib/dns/node.py
deleted file mode 100644
index de85a82d..00000000
--- a/lib/dns/node.py
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2001-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""DNS nodes.  A node is a set of rdatasets."""
-
-import enum
-import io
-from typing import Any, Dict, Optional
-
-import dns.immutable
-import dns.name
-import dns.rdataclass
-import dns.rdataset
-import dns.rdatatype
-import dns.renderer
-import dns.rrset
-
-_cname_types = {
-    dns.rdatatype.CNAME,
-}
-
-# "neutral" types can coexist with a CNAME and thus are not "other data"
-_neutral_types = {
-    dns.rdatatype.NSEC,  # RFC 4035 section 2.5
-    dns.rdatatype.NSEC3,  # This is not likely to happen, but not impossible!
-    dns.rdatatype.KEY,  # RFC 4035 section 2.5, RFC 3007
-}
-
-
-def _matches_type_or_its_signature(rdtypes, rdtype, covers):
-    return rdtype in rdtypes or (rdtype == dns.rdatatype.RRSIG and covers in rdtypes)
-
-
-@enum.unique
-class NodeKind(enum.Enum):
-    """Rdatasets in nodes"""
-
-    REGULAR = 0  # a.k.a "other data"
-    NEUTRAL = 1
-    CNAME = 2
-
-    @classmethod
-    def classify(
-        cls, rdtype: dns.rdatatype.RdataType, covers: dns.rdatatype.RdataType
-    ) -> "NodeKind":
-        if _matches_type_or_its_signature(_cname_types, rdtype, covers):
-            return NodeKind.CNAME
-        elif _matches_type_or_its_signature(_neutral_types, rdtype, covers):
-            return NodeKind.NEUTRAL
-        else:
-            return NodeKind.REGULAR
-
-    @classmethod
-    def classify_rdataset(cls, rdataset: dns.rdataset.Rdataset) -> "NodeKind":
-        return cls.classify(rdataset.rdtype, rdataset.covers)
-
-
-class Node:
-    """A Node is a set of rdatasets.
-
-    A node is either a CNAME node or an "other data" node.  A CNAME
-    node contains only CNAME, KEY, NSEC, and NSEC3 rdatasets along with their
-    covering RRSIG rdatasets.  An "other data" node contains any
-    rdataset other than a CNAME or RRSIG(CNAME) rdataset.  When
-    changes are made to a node, the CNAME or "other data" state is
-    always consistent with the update, i.e. the most recent change
-    wins.  For example, if you have a node which contains a CNAME
-    rdataset, and then add an MX rdataset to it, then the CNAME
-    rdataset will be deleted.  Likewise if you have a node containing
-    an MX rdataset and add a CNAME rdataset, the MX rdataset will be
-    deleted.
-    """
-
-    __slots__ = ["rdatasets"]
-
-    def __init__(self):
-        # the set of rdatasets, represented as a list.
-        self.rdatasets = []
-
-    def to_text(self, name: dns.name.Name, **kw: Dict[str, Any]) -> str:
-        """Convert a node to text format.
-
-        Each rdataset at the node is printed.  Any keyword arguments
-        to this method are passed on to the rdataset's to_text() method.
-
-        *name*, a ``dns.name.Name``, the owner name of the
-        rdatasets.
-
-        Returns a ``str``.
-
-        """
-
-        s = io.StringIO()
-        for rds in self.rdatasets:
-            if len(rds) > 0:
-                s.write(rds.to_text(name, **kw))  # type: ignore[arg-type]
-                s.write("\n")
-        return s.getvalue()[:-1]
-
-    def __repr__(self):
-        return "<DNS node " + str(id(self)) + ">"
-
-    def __eq__(self, other):
-        #
-        # This is inefficient.  Good thing we don't need to do it much.
-        #
-        for rd in self.rdatasets:
-            if rd not in other.rdatasets:
-                return False
-        for rd in other.rdatasets:
-            if rd not in self.rdatasets:
-                return False
-        return True
-
-    def __ne__(self, other):
-        return not self.__eq__(other)
-
-    def __len__(self):
-        return len(self.rdatasets)
-
-    def __iter__(self):
-        return iter(self.rdatasets)
-
-    def _append_rdataset(self, rdataset):
-        """Append rdataset to the node with special handling for CNAME and
-        other data conditions.
-
-        Specifically, if the rdataset being appended has ``NodeKind.CNAME``,
-        then all rdatasets other than KEY, NSEC, NSEC3, and their covering
-        RRSIGs are deleted.  If the rdataset being appended has
-        ``NodeKind.REGULAR`` then CNAME and RRSIG(CNAME) are deleted.
-        """
-        # Make having just one rdataset at the node fast.
-        if len(self.rdatasets) > 0:
-            kind = NodeKind.classify_rdataset(rdataset)
-            if kind == NodeKind.CNAME:
-                self.rdatasets = [
-                    rds
-                    for rds in self.rdatasets
-                    if NodeKind.classify_rdataset(rds) != NodeKind.REGULAR
-                ]
-            elif kind == NodeKind.REGULAR:
-                self.rdatasets = [
-                    rds
-                    for rds in self.rdatasets
-                    if NodeKind.classify_rdataset(rds) != NodeKind.CNAME
-                ]
-            # Otherwise the rdataset is NodeKind.NEUTRAL and we do not need to
-            # edit self.rdatasets.
-        self.rdatasets.append(rdataset)
-
-    def find_rdataset(
-        self,
-        rdclass: dns.rdataclass.RdataClass,
-        rdtype: dns.rdatatype.RdataType,
-        covers: dns.rdatatype.RdataType = dns.rdatatype.NONE,
-        create: bool = False,
-    ) -> dns.rdataset.Rdataset:
-        """Find an rdataset matching the specified properties in the
-        current node.
-
-        *rdclass*, a ``dns.rdataclass.RdataClass``, the class of the rdataset.
-
-        *rdtype*, a ``dns.rdatatype.RdataType``, the type of the rdataset.
-
-        *covers*, a ``dns.rdatatype.RdataType``, the covered type.
-        Usually this value is ``dns.rdatatype.NONE``, but if the
-        rdtype is ``dns.rdatatype.SIG`` or ``dns.rdatatype.RRSIG``,
-        then the covers value will be the rdata type the SIG/RRSIG
-        covers.  The library treats the SIG and RRSIG types as if they
-        were a family of types, e.g. RRSIG(A), RRSIG(NS), RRSIG(SOA).
-        This makes RRSIGs much easier to work with than if RRSIGs
-        covering different rdata types were aggregated into a single
-        RRSIG rdataset.
-
-        *create*, a ``bool``.  If True, create the rdataset if it is not found.
-
-        Raises ``KeyError`` if an rdataset of the desired type and class does
-        not exist and *create* is not ``True``.
-
-        Returns a ``dns.rdataset.Rdataset``.
-        """
-
-        for rds in self.rdatasets:
-            if rds.match(rdclass, rdtype, covers):
-                return rds
-        if not create:
-            raise KeyError
-        rds = dns.rdataset.Rdataset(rdclass, rdtype, covers)
-        self._append_rdataset(rds)
-        return rds
-
-    def get_rdataset(
-        self,
-        rdclass: dns.rdataclass.RdataClass,
-        rdtype: dns.rdatatype.RdataType,
-        covers: dns.rdatatype.RdataType = dns.rdatatype.NONE,
-        create: bool = False,
-    ) -> Optional[dns.rdataset.Rdataset]:
-        """Get an rdataset matching the specified properties in the
-        current node.
-
-        None is returned if an rdataset of the specified type and
-        class does not exist and *create* is not ``True``.
-
-        *rdclass*, an ``int``, the class of the rdataset.
-
-        *rdtype*, an ``int``, the type of the rdataset.
-
-        *covers*, an ``int``, the covered type.  Usually this value is
-        dns.rdatatype.NONE, but if the rdtype is dns.rdatatype.SIG or
-        dns.rdatatype.RRSIG, then the covers value will be the rdata
-        type the SIG/RRSIG covers.  The library treats the SIG and RRSIG
-        types as if they were a family of
-        types, e.g. RRSIG(A), RRSIG(NS), RRSIG(SOA).  This makes RRSIGs much
-        easier to work with than if RRSIGs covering different rdata
-        types were aggregated into a single RRSIG rdataset.
-
-        *create*, a ``bool``.  If True, create the rdataset if it is not found.
-
-        Returns a ``dns.rdataset.Rdataset`` or ``None``.
-        """
-
-        try:
-            rds = self.find_rdataset(rdclass, rdtype, covers, create)
-        except KeyError:
-            rds = None
-        return rds
-
-    def delete_rdataset(
-        self,
-        rdclass: dns.rdataclass.RdataClass,
-        rdtype: dns.rdatatype.RdataType,
-        covers: dns.rdatatype.RdataType = dns.rdatatype.NONE,
-    ) -> None:
-        """Delete the rdataset matching the specified properties in the
-        current node.
-
-        If a matching rdataset does not exist, it is not an error.
-
-        *rdclass*, an ``int``, the class of the rdataset.
-
-        *rdtype*, an ``int``, the type of the rdataset.
-
-        *covers*, an ``int``, the covered type.
-        """
-
-        rds = self.get_rdataset(rdclass, rdtype, covers)
-        if rds is not None:
-            self.rdatasets.remove(rds)
-
-    def replace_rdataset(self, replacement: dns.rdataset.Rdataset) -> None:
-        """Replace an rdataset.
-
-        It is not an error if there is no rdataset matching *replacement*.
-
-        Ownership of the *replacement* object is transferred to the node;
-        in other words, this method does not store a copy of *replacement*
-        at the node, it stores *replacement* itself.
-
-        *replacement*, a ``dns.rdataset.Rdataset``.
-
-        Raises ``ValueError`` if *replacement* is not a
-        ``dns.rdataset.Rdataset``.
-        """
-
-        if not isinstance(replacement, dns.rdataset.Rdataset):
-            raise ValueError("replacement is not an rdataset")
-        if isinstance(replacement, dns.rrset.RRset):
-            # RRsets are not good replacements as the match() method
-            # is not compatible.
-            replacement = replacement.to_rdataset()
-        self.delete_rdataset(
-            replacement.rdclass, replacement.rdtype, replacement.covers
-        )
-        self._append_rdataset(replacement)
-
-    def classify(self) -> NodeKind:
-        """Classify a node.
-
-        A node which contains a CNAME or RRSIG(CNAME) is a
-        ``NodeKind.CNAME`` node.
-
-        A node which contains only "neutral" types, i.e. types allowed to
-        co-exist with a CNAME, is a ``NodeKind.NEUTRAL`` node.  The neutral
-        types are NSEC, NSEC3, KEY, and their associated RRSIGS.  An empty node
-        is also considered neutral.
-
-        A node which contains some rdataset which is not a CNAME, RRSIG(CNAME),
-        or a neutral type is a a ``NodeKind.REGULAR`` node.  Regular nodes are
-        also commonly referred to as "other data".
-        """
-        for rdataset in self.rdatasets:
-            kind = NodeKind.classify(rdataset.rdtype, rdataset.covers)
-            if kind != NodeKind.NEUTRAL:
-                return kind
-        return NodeKind.NEUTRAL
-
-    def is_immutable(self) -> bool:
-        return False
-
-
-@dns.immutable.immutable
-class ImmutableNode(Node):
-    def __init__(self, node):
-        super().__init__()
-        self.rdatasets = tuple(
-            [dns.rdataset.ImmutableRdataset(rds) for rds in node.rdatasets]
-        )
-
-    def find_rdataset(
-        self,
-        rdclass: dns.rdataclass.RdataClass,
-        rdtype: dns.rdatatype.RdataType,
-        covers: dns.rdatatype.RdataType = dns.rdatatype.NONE,
-        create: bool = False,
-    ) -> dns.rdataset.Rdataset:
-        if create:
-            raise TypeError("immutable")
-        return super().find_rdataset(rdclass, rdtype, covers, False)
-
-    def get_rdataset(
-        self,
-        rdclass: dns.rdataclass.RdataClass,
-        rdtype: dns.rdatatype.RdataType,
-        covers: dns.rdatatype.RdataType = dns.rdatatype.NONE,
-        create: bool = False,
-    ) -> Optional[dns.rdataset.Rdataset]:
-        if create:
-            raise TypeError("immutable")
-        return super().get_rdataset(rdclass, rdtype, covers, False)
-
-    def delete_rdataset(
-        self,
-        rdclass: dns.rdataclass.RdataClass,
-        rdtype: dns.rdatatype.RdataType,
-        covers: dns.rdatatype.RdataType = dns.rdatatype.NONE,
-    ) -> None:
-        raise TypeError("immutable")
-
-    def replace_rdataset(self, replacement: dns.rdataset.Rdataset) -> None:
-        raise TypeError("immutable")
-
-    def is_immutable(self) -> bool:
-        return True
diff --git a/lib/dns/opcode.py b/lib/dns/opcode.py
deleted file mode 100644
index 78b43d2c..00000000
--- a/lib/dns/opcode.py
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2001-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""DNS Opcodes."""
-
-import dns.enum
-import dns.exception
-
-
-class Opcode(dns.enum.IntEnum):
-    #: Query
-    QUERY = 0
-    #: Inverse Query (historical)
-    IQUERY = 1
-    #: Server Status (unspecified and unimplemented anywhere)
-    STATUS = 2
-    #: Notify
-    NOTIFY = 4
-    #: Dynamic Update
-    UPDATE = 5
-
-    @classmethod
-    def _maximum(cls):
-        return 15
-
-    @classmethod
-    def _unknown_exception_class(cls):
-        return UnknownOpcode
-
-
-class UnknownOpcode(dns.exception.DNSException):
-    """An DNS opcode is unknown."""
-
-
-def from_text(text: str) -> Opcode:
-    """Convert text into an opcode.
-
-    *text*, a ``str``, the textual opcode
-
-    Raises ``dns.opcode.UnknownOpcode`` if the opcode is unknown.
-
-    Returns an ``int``.
-    """
-
-    return Opcode.from_text(text)
-
-
-def from_flags(flags: int) -> Opcode:
-    """Extract an opcode from DNS message flags.
-
-    *flags*, an ``int``, the DNS flags.
-
-    Returns an ``int``.
-    """
-
-    return Opcode((flags & 0x7800) >> 11)
-
-
-def to_flags(value: Opcode) -> int:
-    """Convert an opcode to a value suitable for ORing into DNS message
-    flags.
-
-    *value*, an ``int``, the DNS opcode value.
-
-    Returns an ``int``.
-    """
-
-    return (value << 11) & 0x7800
-
-
-def to_text(value: Opcode) -> str:
-    """Convert an opcode to text.
-
-    *value*, an ``int`` the opcode value,
-
-    Raises ``dns.opcode.UnknownOpcode`` if the opcode is unknown.
-
-    Returns a ``str``.
-    """
-
-    return Opcode.to_text(value)
-
-
-def is_update(flags: int) -> bool:
-    """Is the opcode in flags UPDATE?
-
-    *flags*, an ``int``, the DNS message flags.
-
-    Returns a ``bool``.
-    """
-
-    return from_flags(flags) == Opcode.UPDATE
-
-
-### BEGIN generated Opcode constants
-
-QUERY = Opcode.QUERY
-IQUERY = Opcode.IQUERY
-STATUS = Opcode.STATUS
-NOTIFY = Opcode.NOTIFY
-UPDATE = Opcode.UPDATE
-
-### END generated Opcode constants
diff --git a/lib/dns/py.typed b/lib/dns/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/dns/query.py b/lib/dns/query.py
deleted file mode 100644
index 0d8a977a..00000000
--- a/lib/dns/query.py
+++ /dev/null
@@ -1,1665 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""Talk to a DNS server."""
-
-import base64
-import contextlib
-import enum
-import errno
-import os
-import os.path
-import random
-import selectors
-import socket
-import struct
-import time
-import urllib.parse
-from typing import Any, Dict, Optional, Tuple, Union, cast
-
-import dns._features
-import dns.exception
-import dns.inet
-import dns.message
-import dns.name
-import dns.quic
-import dns.rcode
-import dns.rdataclass
-import dns.rdatatype
-import dns.serial
-import dns.transaction
-import dns.tsig
-import dns.xfr
-
-
-def _remaining(expiration):
-    if expiration is None:
-        return None
-    timeout = expiration - time.time()
-    if timeout <= 0.0:
-        raise dns.exception.Timeout
-    return timeout
-
-
-def _expiration_for_this_attempt(timeout, expiration):
-    if expiration is None:
-        return None
-    return min(time.time() + timeout, expiration)
-
-
-_have_httpx = dns._features.have("doh")
-if _have_httpx:
-    import httpcore._backends.sync
-    import httpx
-
-    _CoreNetworkBackend = httpcore.NetworkBackend
-    _CoreSyncStream = httpcore._backends.sync.SyncStream
-
-    class _NetworkBackend(_CoreNetworkBackend):
-        def __init__(self, resolver, local_port, bootstrap_address, family):
-            super().__init__()
-            self._local_port = local_port
-            self._resolver = resolver
-            self._bootstrap_address = bootstrap_address
-            self._family = family
-
-        def connect_tcp(
-            self, host, port, timeout, local_address, socket_options=None
-        ):  # pylint: disable=signature-differs
-            addresses = []
-            _, expiration = _compute_times(timeout)
-            if dns.inet.is_address(host):
-                addresses.append(host)
-            elif self._bootstrap_address is not None:
-                addresses.append(self._bootstrap_address)
-            else:
-                timeout = _remaining(expiration)
-                family = self._family
-                if local_address:
-                    family = dns.inet.af_for_address(local_address)
-                answers = self._resolver.resolve_name(
-                    host, family=family, lifetime=timeout
-                )
-                addresses = answers.addresses()
-            for address in addresses:
-                af = dns.inet.af_for_address(address)
-                if local_address is not None or self._local_port != 0:
-                    source = dns.inet.low_level_address_tuple(
-                        (local_address, self._local_port), af
-                    )
-                else:
-                    source = None
-                sock = _make_socket(af, socket.SOCK_STREAM, source)
-                attempt_expiration = _expiration_for_this_attempt(2.0, expiration)
-                try:
-                    _connect(
-                        sock,
-                        dns.inet.low_level_address_tuple((address, port), af),
-                        attempt_expiration,
-                    )
-                    return _CoreSyncStream(sock)
-                except Exception:
-                    pass
-            raise httpcore.ConnectError
-
-        def connect_unix_socket(
-            self, path, timeout, socket_options=None
-        ):  # pylint: disable=signature-differs
-            raise NotImplementedError
-
-    class _HTTPTransport(httpx.HTTPTransport):
-        def __init__(
-            self,
-            *args,
-            local_port=0,
-            bootstrap_address=None,
-            resolver=None,
-            family=socket.AF_UNSPEC,
-            **kwargs,
-        ):
-            if resolver is None and bootstrap_address is None:
-                # pylint: disable=import-outside-toplevel,redefined-outer-name
-                import dns.resolver
-
-                resolver = dns.resolver.Resolver()
-            super().__init__(*args, **kwargs)
-            self._pool._network_backend = _NetworkBackend(
-                resolver, local_port, bootstrap_address, family
-            )
-
-else:
-
-    class _HTTPTransport:  # type: ignore
-        def connect_tcp(self, host, port, timeout, local_address):
-            raise NotImplementedError
-
-
-have_doh = _have_httpx
-
-try:
-    import ssl
-except ImportError:  # pragma: no cover
-
-    class ssl:  # type: ignore
-        CERT_NONE = 0
-
-        class WantReadException(Exception):
-            pass
-
-        class WantWriteException(Exception):
-            pass
-
-        class SSLContext:
-            pass
-
-        class SSLSocket:
-            pass
-
-        @classmethod
-        def create_default_context(cls, *args, **kwargs):
-            raise Exception("no ssl support")  # pylint: disable=broad-exception-raised
-
-
-# Function used to create a socket.  Can be overridden if needed in special
-# situations.
-socket_factory = socket.socket
-
-
-class UnexpectedSource(dns.exception.DNSException):
-    """A DNS query response came from an unexpected address or port."""
-
-
-class BadResponse(dns.exception.FormError):
-    """A DNS query response does not respond to the question asked."""
-
-
-class NoDOH(dns.exception.DNSException):
-    """DNS over HTTPS (DOH) was requested but the httpx module is not
-    available."""
-
-
-class NoDOQ(dns.exception.DNSException):
-    """DNS over QUIC (DOQ) was requested but the aioquic module is not
-    available."""
-
-
-# for backwards compatibility
-TransferError = dns.xfr.TransferError
-
-
-def _compute_times(timeout):
-    now = time.time()
-    if timeout is None:
-        return (now, None)
-    else:
-        return (now, now + timeout)
-
-
-def _wait_for(fd, readable, writable, _, expiration):
-    # Use the selected selector class to wait for any of the specified
-    # events.  An "expiration" absolute time is converted into a relative
-    # timeout.
-    #
-    # The unused parameter is 'error', which is always set when
-    # selecting for read or write, and we have no error-only selects.
-
-    if readable and isinstance(fd, ssl.SSLSocket) and fd.pending() > 0:
-        return True
-    sel = selectors.DefaultSelector()
-    events = 0
-    if readable:
-        events |= selectors.EVENT_READ
-    if writable:
-        events |= selectors.EVENT_WRITE
-    if events:
-        sel.register(fd, events)
-    if expiration is None:
-        timeout = None
-    else:
-        timeout = expiration - time.time()
-        if timeout <= 0.0:
-            raise dns.exception.Timeout
-    if not sel.select(timeout):
-        raise dns.exception.Timeout
-
-
-def _wait_for_readable(s, expiration):
-    _wait_for(s, True, False, True, expiration)
-
-
-def _wait_for_writable(s, expiration):
-    _wait_for(s, False, True, True, expiration)
-
-
-def _addresses_equal(af, a1, a2):
-    # Convert the first value of the tuple, which is a textual format
-    # address into binary form, so that we are not confused by different
-    # textual representations of the same address
-    try:
-        n1 = dns.inet.inet_pton(af, a1[0])
-        n2 = dns.inet.inet_pton(af, a2[0])
-    except dns.exception.SyntaxError:
-        return False
-    return n1 == n2 and a1[1:] == a2[1:]
-
-
-def _matches_destination(af, from_address, destination, ignore_unexpected):
-    # Check that from_address is appropriate for a response to a query
-    # sent to destination.
-    if not destination:
-        return True
-    if _addresses_equal(af, from_address, destination) or (
-        dns.inet.is_multicast(destination[0]) and from_address[1:] == destination[1:]
-    ):
-        return True
-    elif ignore_unexpected:
-        return False
-    raise UnexpectedSource(
-        f"got a response from {from_address} instead of " f"{destination}"
-    )
-
-
-def _destination_and_source(
-    where, port, source, source_port, where_must_be_address=True
-):
-    # Apply defaults and compute destination and source tuples
-    # suitable for use in connect(), sendto(), or bind().
-    af = None
-    destination = None
-    try:
-        af = dns.inet.af_for_address(where)
-        destination = where
-    except Exception:
-        if where_must_be_address:
-            raise
-        # URLs are ok so eat the exception
-    if source:
-        saf = dns.inet.af_for_address(source)
-        if af:
-            # We know the destination af, so source had better agree!
-            if saf != af:
-                raise ValueError(
-                    "different address families for source and destination"
-                )
-        else:
-            # We didn't know the destination af, but we know the source,
-            # so that's our af.
-            af = saf
-    if source_port and not source:
-        # Caller has specified a source_port but not an address, so we
-        # need to return a source, and we need to use the appropriate
-        # wildcard address as the address.
-        try:
-            source = dns.inet.any_for_af(af)
-        except Exception:
-            # we catch this and raise ValueError for backwards compatibility
-            raise ValueError("source_port specified but address family is unknown")
-    # Convert high-level (address, port) tuples into low-level address
-    # tuples.
-    if destination:
-        destination = dns.inet.low_level_address_tuple((destination, port), af)
-    if source:
-        source = dns.inet.low_level_address_tuple((source, source_port), af)
-    return (af, destination, source)
-
-
-def _make_socket(af, type, source, ssl_context=None, server_hostname=None):
-    s = socket_factory(af, type)
-    try:
-        s.setblocking(False)
-        if source is not None:
-            s.bind(source)
-        if ssl_context:
-            # LGTM gets a false positive here, as our default context is OK
-            return ssl_context.wrap_socket(
-                s,
-                do_handshake_on_connect=False,  # lgtm[py/insecure-protocol]
-                server_hostname=server_hostname,
-            )
-        else:
-            return s
-    except Exception:
-        s.close()
-        raise
-
-
-def _maybe_get_resolver(
-    resolver: Optional["dns.resolver.Resolver"],
-) -> "dns.resolver.Resolver":
-    # We need a separate method for this to avoid overriding the global
-    # variable "dns" with the as-yet undefined local variable "dns"
-    # in https().
-    if resolver is None:
-        # pylint: disable=import-outside-toplevel,redefined-outer-name
-        import dns.resolver
-
-        resolver = dns.resolver.Resolver()
-    return resolver
-
-
-class HTTPVersion(enum.IntEnum):
-    """Which version of HTTP should be used?
-
-    DEFAULT will select the first version from the list [2, 1.1, 3] that
-    is available.
-    """
-
-    DEFAULT = 0
-    HTTP_1 = 1
-    H1 = 1
-    HTTP_2 = 2
-    H2 = 2
-    HTTP_3 = 3
-    H3 = 3
-
-
-def https(
-    q: dns.message.Message,
-    where: str,
-    timeout: Optional[float] = None,
-    port: int = 443,
-    source: Optional[str] = None,
-    source_port: int = 0,
-    one_rr_per_rrset: bool = False,
-    ignore_trailing: bool = False,
-    session: Optional[Any] = None,
-    path: str = "/dns-query",
-    post: bool = True,
-    bootstrap_address: Optional[str] = None,
-    verify: Union[bool, str] = True,
-    resolver: Optional["dns.resolver.Resolver"] = None,
-    family: int = socket.AF_UNSPEC,
-    http_version: HTTPVersion = HTTPVersion.DEFAULT,
-) -> dns.message.Message:
-    """Return the response obtained after sending a query via DNS-over-HTTPS.
-
-    *q*, a ``dns.message.Message``, the query to send.
-
-    *where*, a ``str``, the nameserver IP address or the full URL. If an IP address is
-    given, the URL will be constructed using the following schema:
-    https://<IP-address>:<port>/<path>.
-
-    *timeout*, a ``float`` or ``None``, the number of seconds to wait before the query
-    times out. If ``None``, the default, wait forever.
-
-    *port*, a ``int``, the port to send the query to. The default is 443.
-
-    *source*, a ``str`` containing an IPv4 or IPv6 address, specifying the source
-    address.  The default is the wildcard address.
-
-    *source_port*, an ``int``, the port from which to send the message. The default is
-    0.
-
-    *one_rr_per_rrset*, a ``bool``. If ``True``, put each RR into its own RRset.
-
-    *ignore_trailing*, a ``bool``. If ``True``, ignore trailing junk at end of the
-    received message.
-
-    *session*, an ``httpx.Client``.  If provided, the client session to use to send the
-    queries.
-
-    *path*, a ``str``. If *where* is an IP address, then *path* will be used to
-    construct the URL to send the DNS query to.
-
-    *post*, a ``bool``. If ``True``, the default, POST method will be used.
-
-    *bootstrap_address*, a ``str``, the IP address to use to bypass resolution.
-
-    *verify*, a ``bool`` or ``str``.  If a ``True``, then TLS certificate verification
-    of the server is done using the default CA bundle; if ``False``, then no
-    verification is done; if a `str` then it specifies the path to a certificate file or
-    directory which will be used for verification.
-
-    *resolver*, a ``dns.resolver.Resolver`` or ``None``, the resolver to use for
-    resolution of hostnames in URLs.  If not specified, a new resolver with a default
-    configuration will be used; note this is *not* the default resolver as that resolver
-    might have been configured to use DoH causing a chicken-and-egg problem.  This
-    parameter only has an effect if the HTTP library is httpx.
-
-    *family*, an ``int``, the address family.  If socket.AF_UNSPEC (the default), both A
-    and AAAA records will be retrieved.
-
-    *http_version*, a ``dns.query.HTTPVersion``, indicating which HTTP version to use.
-
-    Returns a ``dns.message.Message``.
-    """
-
-    (af, _, the_source) = _destination_and_source(
-        where, port, source, source_port, False
-    )
-    if af is not None and dns.inet.is_address(where):
-        if af == socket.AF_INET:
-            url = f"https://{where}:{port}{path}"
-        elif af == socket.AF_INET6:
-            url = f"https://[{where}]:{port}{path}"
-    else:
-        url = where
-
-    extensions = {}
-    if bootstrap_address is None:
-        # pylint: disable=possibly-used-before-assignment
-        parsed = urllib.parse.urlparse(url)
-        if parsed.hostname is None:
-            raise ValueError("no hostname in URL")
-        if dns.inet.is_address(parsed.hostname):
-            bootstrap_address = parsed.hostname
-            extensions["sni_hostname"] = parsed.hostname
-        if parsed.port is not None:
-            port = parsed.port
-
-    if http_version == HTTPVersion.H3 or (
-        http_version == HTTPVersion.DEFAULT and not have_doh
-    ):
-        if bootstrap_address is None:
-            resolver = _maybe_get_resolver(resolver)
-            assert parsed.hostname is not None  # for mypy
-            answers = resolver.resolve_name(parsed.hostname, family)
-            bootstrap_address = random.choice(list(answers.addresses()))
-        return _http3(
-            q,
-            bootstrap_address,
-            url,
-            timeout,
-            port,
-            source,
-            source_port,
-            one_rr_per_rrset,
-            ignore_trailing,
-            verify=verify,
-            post=post,
-        )
-
-    if not have_doh:
-        raise NoDOH  # pragma: no cover
-    if session and not isinstance(session, httpx.Client):
-        raise ValueError("session parameter must be an httpx.Client")
-
-    wire = q.to_wire()
-    headers = {"accept": "application/dns-message"}
-
-    h1 = http_version in (HTTPVersion.H1, HTTPVersion.DEFAULT)
-    h2 = http_version in (HTTPVersion.H2, HTTPVersion.DEFAULT)
-
-    # set source port and source address
-
-    if the_source is None:
-        local_address = None
-        local_port = 0
-    else:
-        local_address = the_source[0]
-        local_port = the_source[1]
-
-    if session:
-        cm: contextlib.AbstractContextManager = contextlib.nullcontext(session)
-    else:
-        transport = _HTTPTransport(
-            local_address=local_address,
-            http1=h1,
-            http2=h2,
-            verify=verify,
-            local_port=local_port,
-            bootstrap_address=bootstrap_address,
-            resolver=resolver,
-            family=family,
-        )
-
-        cm = httpx.Client(http1=h1, http2=h2, verify=verify, transport=transport)
-    with cm as session:
-        # see https://tools.ietf.org/html/rfc8484#section-4.1.1 for DoH
-        # GET and POST examples
-        if post:
-            headers.update(
-                {
-                    "content-type": "application/dns-message",
-                    "content-length": str(len(wire)),
-                }
-            )
-            response = session.post(
-                url,
-                headers=headers,
-                content=wire,
-                timeout=timeout,
-                extensions=extensions,
-            )
-        else:
-            wire = base64.urlsafe_b64encode(wire).rstrip(b"=")
-            twire = wire.decode()  # httpx does a repr() if we give it bytes
-            response = session.get(
-                url,
-                headers=headers,
-                timeout=timeout,
-                params={"dns": twire},
-                extensions=extensions,
-            )
-
-    # see https://tools.ietf.org/html/rfc8484#section-4.2.1 for info about DoH
-    # status codes
-    if response.status_code < 200 or response.status_code > 299:
-        raise ValueError(
-            f"{where} responded with status code {response.status_code}"
-            f"\nResponse body: {response.content}"
-        )
-    r = dns.message.from_wire(
-        response.content,
-        keyring=q.keyring,
-        request_mac=q.request_mac,
-        one_rr_per_rrset=one_rr_per_rrset,
-        ignore_trailing=ignore_trailing,
-    )
-    r.time = response.elapsed.total_seconds()
-    if not q.is_response(r):
-        raise BadResponse
-    return r
-
-
-def _find_header(headers: dns.quic.Headers, name: bytes) -> bytes:
-    if headers is None:
-        raise KeyError
-    for header, value in headers:
-        if header == name:
-            return value
-    raise KeyError
-
-
-def _check_status(headers: dns.quic.Headers, peer: str, wire: bytes) -> None:
-    value = _find_header(headers, b":status")
-    if value is None:
-        raise SyntaxError("no :status header in response")
-    status = int(value)
-    if status < 0:
-        raise SyntaxError("status is negative")
-    if status < 200 or status > 299:
-        error = ""
-        if len(wire) > 0:
-            try:
-                error = ": " + wire.decode()
-            except Exception:
-                pass
-        raise ValueError(f"{peer} responded with status code {status}{error}")
-
-
-def _http3(
-    q: dns.message.Message,
-    where: str,
-    url: str,
-    timeout: Optional[float] = None,
-    port: int = 853,
-    source: Optional[str] = None,
-    source_port: int = 0,
-    one_rr_per_rrset: bool = False,
-    ignore_trailing: bool = False,
-    verify: Union[bool, str] = True,
-    hostname: Optional[str] = None,
-    post: bool = True,
-) -> dns.message.Message:
-    if not dns.quic.have_quic:
-        raise NoDOH("DNS-over-HTTP3 is not available.")  # pragma: no cover
-
-    url_parts = urllib.parse.urlparse(url)
-    hostname = url_parts.hostname
-    if url_parts.port is not None:
-        port = url_parts.port
-
-    q.id = 0
-    wire = q.to_wire()
-    manager = dns.quic.SyncQuicManager(
-        verify_mode=verify, server_name=hostname, h3=True
-    )
-
-    with manager:
-        connection = manager.connect(where, port, source, source_port)
-        (start, expiration) = _compute_times(timeout)
-        with connection.make_stream(timeout) as stream:
-            stream.send_h3(url, wire, post)
-            wire = stream.receive(_remaining(expiration))
-            _check_status(stream.headers(), where, wire)
-        finish = time.time()
-    r = dns.message.from_wire(
-        wire,
-        keyring=q.keyring,
-        request_mac=q.request_mac,
-        one_rr_per_rrset=one_rr_per_rrset,
-        ignore_trailing=ignore_trailing,
-    )
-    r.time = max(finish - start, 0.0)
-    if not q.is_response(r):
-        raise BadResponse
-    return r
-
-
-def _udp_recv(sock, max_size, expiration):
-    """Reads a datagram from the socket.
-    A Timeout exception will be raised if the operation is not completed
-    by the expiration time.
-    """
-    while True:
-        try:
-            return sock.recvfrom(max_size)
-        except BlockingIOError:
-            _wait_for_readable(sock, expiration)
-
-
-def _udp_send(sock, data, destination, expiration):
-    """Sends the specified datagram to destination over the socket.
-    A Timeout exception will be raised if the operation is not completed
-    by the expiration time.
-    """
-    while True:
-        try:
-            if destination:
-                return sock.sendto(data, destination)
-            else:
-                return sock.send(data)
-        except BlockingIOError:  # pragma: no cover
-            _wait_for_writable(sock, expiration)
-
-
-def send_udp(
-    sock: Any,
-    what: Union[dns.message.Message, bytes],
-    destination: Any,
-    expiration: Optional[float] = None,
-) -> Tuple[int, float]:
-    """Send a DNS message to the specified UDP socket.
-
-    *sock*, a ``socket``.
-
-    *what*, a ``bytes`` or ``dns.message.Message``, the message to send.
-
-    *destination*, a destination tuple appropriate for the address family
-    of the socket, specifying where to send the query.
-
-    *expiration*, a ``float`` or ``None``, the absolute time at which
-    a timeout exception should be raised.  If ``None``, no timeout will
-    occur.
-
-    Returns an ``(int, float)`` tuple of bytes sent and the sent time.
-    """
-
-    if isinstance(what, dns.message.Message):
-        what = what.to_wire()
-    sent_time = time.time()
-    n = _udp_send(sock, what, destination, expiration)
-    return (n, sent_time)
-
-
-def receive_udp(
-    sock: Any,
-    destination: Optional[Any] = None,
-    expiration: Optional[float] = None,
-    ignore_unexpected: bool = False,
-    one_rr_per_rrset: bool = False,
-    keyring: Optional[Dict[dns.name.Name, dns.tsig.Key]] = None,
-    request_mac: Optional[bytes] = b"",
-    ignore_trailing: bool = False,
-    raise_on_truncation: bool = False,
-    ignore_errors: bool = False,
-    query: Optional[dns.message.Message] = None,
-) -> Any:
-    """Read a DNS message from a UDP socket.
-
-    *sock*, a ``socket``.
-
-    *destination*, a destination tuple appropriate for the address family
-    of the socket, specifying where the message is expected to arrive from.
-    When receiving a response, this would be where the associated query was
-    sent.
-
-    *expiration*, a ``float`` or ``None``, the absolute time at which
-    a timeout exception should be raised.  If ``None``, no timeout will
-    occur.
-
-    *ignore_unexpected*, a ``bool``.  If ``True``, ignore responses from
-    unexpected sources.
-
-    *one_rr_per_rrset*, a ``bool``.  If ``True``, put each RR into its own
-    RRset.
-
-    *keyring*, a ``dict``, the keyring to use for TSIG.
-
-    *request_mac*, a ``bytes`` or ``None``, the MAC of the request (for TSIG).
-
-    *ignore_trailing*, a ``bool``.  If ``True``, ignore trailing
-    junk at end of the received message.
-
-    *raise_on_truncation*, a ``bool``.  If ``True``, raise an exception if
-    the TC bit is set.
-
-    Raises if the message is malformed, if network errors occur, of if
-    there is a timeout.
-
-    If *destination* is not ``None``, returns a ``(dns.message.Message, float)``
-    tuple of the received message and the received time.
-
-    If *destination* is ``None``, returns a
-    ``(dns.message.Message, float, tuple)``
-    tuple of the received message, the received time, and the address where
-    the message arrived from.
-
-    *ignore_errors*, a ``bool``.  If various format errors or response
-    mismatches occur, ignore them and keep listening for a valid response.
-    The default is ``False``.
-
-    *query*, a ``dns.message.Message`` or ``None``.  If not ``None`` and
-    *ignore_errors* is ``True``, check that the received message is a response
-    to this query, and if not keep listening for a valid response.
-    """
-
-    wire = b""
-    while True:
-        (wire, from_address) = _udp_recv(sock, 65535, expiration)
-        if not _matches_destination(
-            sock.family, from_address, destination, ignore_unexpected
-        ):
-            continue
-        received_time = time.time()
-        try:
-            r = dns.message.from_wire(
-                wire,
-                keyring=keyring,
-                request_mac=request_mac,
-                one_rr_per_rrset=one_rr_per_rrset,
-                ignore_trailing=ignore_trailing,
-                raise_on_truncation=raise_on_truncation,
-            )
-        except dns.message.Truncated as e:
-            # If we got Truncated and not FORMERR, we at least got the header with TC
-            # set, and very likely the question section, so we'll re-raise if the
-            # message seems to be a response as we need to know when truncation happens.
-            # We need to check that it seems to be a response as we don't want a random
-            # injected message with TC set to cause us to bail out.
-            if (
-                ignore_errors
-                and query is not None
-                and not query.is_response(e.message())
-            ):
-                continue
-            else:
-                raise
-        except Exception:
-            if ignore_errors:
-                continue
-            else:
-                raise
-        if ignore_errors and query is not None and not query.is_response(r):
-            continue
-        if destination:
-            return (r, received_time)
-        else:
-            return (r, received_time, from_address)
-
-
-def udp(
-    q: dns.message.Message,
-    where: str,
-    timeout: Optional[float] = None,
-    port: int = 53,
-    source: Optional[str] = None,
-    source_port: int = 0,
-    ignore_unexpected: bool = False,
-    one_rr_per_rrset: bool = False,
-    ignore_trailing: bool = False,
-    raise_on_truncation: bool = False,
-    sock: Optional[Any] = None,
-    ignore_errors: bool = False,
-) -> dns.message.Message:
-    """Return the response obtained after sending a query via UDP.
-
-    *q*, a ``dns.message.Message``, the query to send
-
-    *where*, a ``str`` containing an IPv4 or IPv6 address,  where
-    to send the message.
-
-    *timeout*, a ``float`` or ``None``, the number of seconds to wait before the
-    query times out.  If ``None``, the default, wait forever.
-
-    *port*, an ``int``, the port send the message to.  The default is 53.
-
-    *source*, a ``str`` containing an IPv4 or IPv6 address, specifying
-    the source address.  The default is the wildcard address.
-
-    *source_port*, an ``int``, the port from which to send the message.
-    The default is 0.
-
-    *ignore_unexpected*, a ``bool``.  If ``True``, ignore responses from
-    unexpected sources.
-
-    *one_rr_per_rrset*, a ``bool``.  If ``True``, put each RR into its own
-    RRset.
-
-    *ignore_trailing*, a ``bool``.  If ``True``, ignore trailing
-    junk at end of the received message.
-
-    *raise_on_truncation*, a ``bool``.  If ``True``, raise an exception if
-    the TC bit is set.
-
-    *sock*, a ``socket.socket``, or ``None``, the socket to use for the
-    query.  If ``None``, the default, a socket is created.  Note that
-    if a socket is provided, it must be a nonblocking datagram socket,
-    and the *source* and *source_port* are ignored.
-
-    *ignore_errors*, a ``bool``.  If various format errors or response
-    mismatches occur, ignore them and keep listening for a valid response.
-    The default is ``False``.
-
-    Returns a ``dns.message.Message``.
-    """
-
-    wire = q.to_wire()
-    (af, destination, source) = _destination_and_source(
-        where, port, source, source_port
-    )
-    (begin_time, expiration) = _compute_times(timeout)
-    if sock:
-        cm: contextlib.AbstractContextManager = contextlib.nullcontext(sock)
-    else:
-        cm = _make_socket(af, socket.SOCK_DGRAM, source)
-    with cm as s:
-        send_udp(s, wire, destination, expiration)
-        (r, received_time) = receive_udp(
-            s,
-            destination,
-            expiration,
-            ignore_unexpected,
-            one_rr_per_rrset,
-            q.keyring,
-            q.mac,
-            ignore_trailing,
-            raise_on_truncation,
-            ignore_errors,
-            q,
-        )
-        r.time = received_time - begin_time
-        # We don't need to check q.is_response() if we are in ignore_errors mode
-        # as receive_udp() will have checked it.
-        if not (ignore_errors or q.is_response(r)):
-            raise BadResponse
-        return r
-    assert (
-        False  # help mypy figure out we can't get here  lgtm[py/unreachable-statement]
-    )
-
-
-def udp_with_fallback(
-    q: dns.message.Message,
-    where: str,
-    timeout: Optional[float] = None,
-    port: int = 53,
-    source: Optional[str] = None,
-    source_port: int = 0,
-    ignore_unexpected: bool = False,
-    one_rr_per_rrset: bool = False,
-    ignore_trailing: bool = False,
-    udp_sock: Optional[Any] = None,
-    tcp_sock: Optional[Any] = None,
-    ignore_errors: bool = False,
-) -> Tuple[dns.message.Message, bool]:
-    """Return the response to the query, trying UDP first and falling back
-    to TCP if UDP results in a truncated response.
-
-    *q*, a ``dns.message.Message``, the query to send
-
-    *where*, a ``str`` containing an IPv4 or IPv6 address,  where to send the message.
-
-    *timeout*, a ``float`` or ``None``, the number of seconds to wait before the query
-    times out.  If ``None``, the default, wait forever.
-
-    *port*, an ``int``, the port send the message to.  The default is 53.
-
-    *source*, a ``str`` containing an IPv4 or IPv6 address, specifying the source
-    address.  The default is the wildcard address.
-
-    *source_port*, an ``int``, the port from which to send the message. The default is
-    0.
-
-    *ignore_unexpected*, a ``bool``.  If ``True``, ignore responses from unexpected
-    sources.
-
-    *one_rr_per_rrset*, a ``bool``.  If ``True``, put each RR into its own RRset.
-
-    *ignore_trailing*, a ``bool``.  If ``True``, ignore trailing junk at end of the
-    received message.
-
-    *udp_sock*, a ``socket.socket``, or ``None``, the socket to use for the UDP query.
-    If ``None``, the default, a socket is created.  Note that if a socket is provided,
-    it must be a nonblocking datagram socket, and the *source* and *source_port* are
-    ignored for the UDP query.
-
-    *tcp_sock*, a ``socket.socket``, or ``None``, the connected socket to use for the
-    TCP query.  If ``None``, the default, a socket is created.  Note that if a socket is
-    provided, it must be a nonblocking connected stream socket, and *where*, *source*
-    and *source_port* are ignored for the TCP query.
-
-    *ignore_errors*, a ``bool``.  If various format errors or response mismatches occur
-    while listening for UDP, ignore them and keep listening for a valid response. The
-    default is ``False``.
-
-    Returns a (``dns.message.Message``, tcp) tuple where tcp is ``True`` if and only if
-    TCP was used.
-    """
-    try:
-        response = udp(
-            q,
-            where,
-            timeout,
-            port,
-            source,
-            source_port,
-            ignore_unexpected,
-            one_rr_per_rrset,
-            ignore_trailing,
-            True,
-            udp_sock,
-            ignore_errors,
-        )
-        return (response, False)
-    except dns.message.Truncated:
-        response = tcp(
-            q,
-            where,
-            timeout,
-            port,
-            source,
-            source_port,
-            one_rr_per_rrset,
-            ignore_trailing,
-            tcp_sock,
-        )
-        return (response, True)
-
-
-def _net_read(sock, count, expiration):
-    """Read the specified number of bytes from sock.  Keep trying until we
-    either get the desired amount, or we hit EOF.
-    A Timeout exception will be raised if the operation is not completed
-    by the expiration time.
-    """
-    s = b""
-    while count > 0:
-        try:
-            n = sock.recv(count)
-            if n == b"":
-                raise EOFError("EOF")
-            count -= len(n)
-            s += n
-        except (BlockingIOError, ssl.SSLWantReadError):
-            _wait_for_readable(sock, expiration)
-        except ssl.SSLWantWriteError:  # pragma: no cover
-            _wait_for_writable(sock, expiration)
-    return s
-
-
-def _net_write(sock, data, expiration):
-    """Write the specified data to the socket.
-    A Timeout exception will be raised if the operation is not completed
-    by the expiration time.
-    """
-    current = 0
-    l = len(data)
-    while current < l:
-        try:
-            current += sock.send(data[current:])
-        except (BlockingIOError, ssl.SSLWantWriteError):
-            _wait_for_writable(sock, expiration)
-        except ssl.SSLWantReadError:  # pragma: no cover
-            _wait_for_readable(sock, expiration)
-
-
-def send_tcp(
-    sock: Any,
-    what: Union[dns.message.Message, bytes],
-    expiration: Optional[float] = None,
-) -> Tuple[int, float]:
-    """Send a DNS message to the specified TCP socket.
-
-    *sock*, a ``socket``.
-
-    *what*, a ``bytes`` or ``dns.message.Message``, the message to send.
-
-    *expiration*, a ``float`` or ``None``, the absolute time at which
-    a timeout exception should be raised.  If ``None``, no timeout will
-    occur.
-
-    Returns an ``(int, float)`` tuple of bytes sent and the sent time.
-    """
-
-    if isinstance(what, dns.message.Message):
-        tcpmsg = what.to_wire(prepend_length=True)
-    else:
-        # copying the wire into tcpmsg is inefficient, but lets us
-        # avoid writev() or doing a short write that would get pushed
-        # onto the net
-        tcpmsg = len(what).to_bytes(2, "big") + what
-    sent_time = time.time()
-    _net_write(sock, tcpmsg, expiration)
-    return (len(tcpmsg), sent_time)
-
-
-def receive_tcp(
-    sock: Any,
-    expiration: Optional[float] = None,
-    one_rr_per_rrset: bool = False,
-    keyring: Optional[Dict[dns.name.Name, dns.tsig.Key]] = None,
-    request_mac: Optional[bytes] = b"",
-    ignore_trailing: bool = False,
-) -> Tuple[dns.message.Message, float]:
-    """Read a DNS message from a TCP socket.
-
-    *sock*, a ``socket``.
-
-    *expiration*, a ``float`` or ``None``, the absolute time at which
-    a timeout exception should be raised.  If ``None``, no timeout will
-    occur.
-
-    *one_rr_per_rrset*, a ``bool``.  If ``True``, put each RR into its own
-    RRset.
-
-    *keyring*, a ``dict``, the keyring to use for TSIG.
-
-    *request_mac*, a ``bytes`` or ``None``, the MAC of the request (for TSIG).
-
-    *ignore_trailing*, a ``bool``.  If ``True``, ignore trailing
-    junk at end of the received message.
-
-    Raises if the message is malformed, if network errors occur, of if
-    there is a timeout.
-
-    Returns a ``(dns.message.Message, float)`` tuple of the received message
-    and the received time.
-    """
-
-    ldata = _net_read(sock, 2, expiration)
-    (l,) = struct.unpack("!H", ldata)
-    wire = _net_read(sock, l, expiration)
-    received_time = time.time()
-    r = dns.message.from_wire(
-        wire,
-        keyring=keyring,
-        request_mac=request_mac,
-        one_rr_per_rrset=one_rr_per_rrset,
-        ignore_trailing=ignore_trailing,
-    )
-    return (r, received_time)
-
-
-def _connect(s, address, expiration):
-    err = s.connect_ex(address)
-    if err == 0:
-        return
-    if err in (errno.EINPROGRESS, errno.EWOULDBLOCK, errno.EALREADY):
-        _wait_for_writable(s, expiration)
-        err = s.getsockopt(socket.SOL_SOCKET, socket.SO_ERROR)
-    if err != 0:
-        raise OSError(err, os.strerror(err))
-
-
-def tcp(
-    q: dns.message.Message,
-    where: str,
-    timeout: Optional[float] = None,
-    port: int = 53,
-    source: Optional[str] = None,
-    source_port: int = 0,
-    one_rr_per_rrset: bool = False,
-    ignore_trailing: bool = False,
-    sock: Optional[Any] = None,
-) -> dns.message.Message:
-    """Return the response obtained after sending a query via TCP.
-
-    *q*, a ``dns.message.Message``, the query to send
-
-    *where*, a ``str`` containing an IPv4 or IPv6 address, where
-    to send the message.
-
-    *timeout*, a ``float`` or ``None``, the number of seconds to wait before the
-    query times out.  If ``None``, the default, wait forever.
-
-    *port*, an ``int``, the port send the message to.  The default is 53.
-
-    *source*, a ``str`` containing an IPv4 or IPv6 address, specifying
-    the source address.  The default is the wildcard address.
-
-    *source_port*, an ``int``, the port from which to send the message.
-    The default is 0.
-
-    *one_rr_per_rrset*, a ``bool``.  If ``True``, put each RR into its own
-    RRset.
-
-    *ignore_trailing*, a ``bool``.  If ``True``, ignore trailing
-    junk at end of the received message.
-
-    *sock*, a ``socket.socket``, or ``None``, the connected socket to use for the
-    query.  If ``None``, the default, a socket is created.  Note that
-    if a socket is provided, it must be a nonblocking connected stream
-    socket, and *where*, *port*, *source* and *source_port* are ignored.
-
-    Returns a ``dns.message.Message``.
-    """
-
-    wire = q.to_wire()
-    (begin_time, expiration) = _compute_times(timeout)
-    if sock:
-        cm: contextlib.AbstractContextManager = contextlib.nullcontext(sock)
-    else:
-        (af, destination, source) = _destination_and_source(
-            where, port, source, source_port
-        )
-        cm = _make_socket(af, socket.SOCK_STREAM, source)
-    with cm as s:
-        if not sock:
-            # pylint: disable=possibly-used-before-assignment
-            _connect(s, destination, expiration)
-        send_tcp(s, wire, expiration)
-        (r, received_time) = receive_tcp(
-            s, expiration, one_rr_per_rrset, q.keyring, q.mac, ignore_trailing
-        )
-        r.time = received_time - begin_time
-        if not q.is_response(r):
-            raise BadResponse
-        return r
-    assert (
-        False  # help mypy figure out we can't get here  lgtm[py/unreachable-statement]
-    )
-
-
-def _tls_handshake(s, expiration):
-    while True:
-        try:
-            s.do_handshake()
-            return
-        except ssl.SSLWantReadError:
-            _wait_for_readable(s, expiration)
-        except ssl.SSLWantWriteError:  # pragma: no cover
-            _wait_for_writable(s, expiration)
-
-
-def _make_dot_ssl_context(
-    server_hostname: Optional[str], verify: Union[bool, str]
-) -> ssl.SSLContext:
-    cafile: Optional[str] = None
-    capath: Optional[str] = None
-    if isinstance(verify, str):
-        if os.path.isfile(verify):
-            cafile = verify
-        elif os.path.isdir(verify):
-            capath = verify
-        else:
-            raise ValueError("invalid verify string")
-    ssl_context = ssl.create_default_context(cafile=cafile, capath=capath)
-    ssl_context.minimum_version = ssl.TLSVersion.TLSv1_2
-    if server_hostname is None:
-        ssl_context.check_hostname = False
-    ssl_context.set_alpn_protocols(["dot"])
-    if verify is False:
-        ssl_context.verify_mode = ssl.CERT_NONE
-    return ssl_context
-
-
-def tls(
-    q: dns.message.Message,
-    where: str,
-    timeout: Optional[float] = None,
-    port: int = 853,
-    source: Optional[str] = None,
-    source_port: int = 0,
-    one_rr_per_rrset: bool = False,
-    ignore_trailing: bool = False,
-    sock: Optional[ssl.SSLSocket] = None,
-    ssl_context: Optional[ssl.SSLContext] = None,
-    server_hostname: Optional[str] = None,
-    verify: Union[bool, str] = True,
-) -> dns.message.Message:
-    """Return the response obtained after sending a query via TLS.
-
-    *q*, a ``dns.message.Message``, the query to send
-
-    *where*, a ``str`` containing an IPv4 or IPv6 address,  where
-    to send the message.
-
-    *timeout*, a ``float`` or ``None``, the number of seconds to wait before the
-    query times out.  If ``None``, the default, wait forever.
-
-    *port*, an ``int``, the port send the message to.  The default is 853.
-
-    *source*, a ``str`` containing an IPv4 or IPv6 address, specifying
-    the source address.  The default is the wildcard address.
-
-    *source_port*, an ``int``, the port from which to send the message.
-    The default is 0.
-
-    *one_rr_per_rrset*, a ``bool``.  If ``True``, put each RR into its own
-    RRset.
-
-    *ignore_trailing*, a ``bool``.  If ``True``, ignore trailing
-    junk at end of the received message.
-
-    *sock*, an ``ssl.SSLSocket``, or ``None``, the socket to use for
-    the query.  If ``None``, the default, a socket is created.  Note
-    that if a socket is provided, it must be a nonblocking connected
-    SSL stream socket, and *where*, *port*, *source*, *source_port*,
-    and *ssl_context* are ignored.
-
-    *ssl_context*, an ``ssl.SSLContext``, the context to use when establishing
-    a TLS connection. If ``None``, the default, creates one with the default
-    configuration.
-
-    *server_hostname*, a ``str`` containing the server's hostname.  The
-    default is ``None``, which means that no hostname is known, and if an
-    SSL context is created, hostname checking will be disabled.
-
-    *verify*, a ``bool`` or ``str``.  If a ``True``, then TLS certificate verification
-    of the server is done using the default CA bundle; if ``False``, then no
-    verification is done; if a `str` then it specifies the path to a certificate file or
-    directory which will be used for verification.
-
-    Returns a ``dns.message.Message``.
-
-    """
-
-    if sock:
-        #
-        # If a socket was provided, there's no special TLS handling needed.
-        #
-        return tcp(
-            q,
-            where,
-            timeout,
-            port,
-            source,
-            source_port,
-            one_rr_per_rrset,
-            ignore_trailing,
-            sock,
-        )
-
-    wire = q.to_wire()
-    (begin_time, expiration) = _compute_times(timeout)
-    (af, destination, source) = _destination_and_source(
-        where, port, source, source_port
-    )
-    if ssl_context is None and not sock:
-        ssl_context = _make_dot_ssl_context(server_hostname, verify)
-
-    with _make_socket(
-        af,
-        socket.SOCK_STREAM,
-        source,
-        ssl_context=ssl_context,
-        server_hostname=server_hostname,
-    ) as s:
-        _connect(s, destination, expiration)
-        _tls_handshake(s, expiration)
-        send_tcp(s, wire, expiration)
-        (r, received_time) = receive_tcp(
-            s, expiration, one_rr_per_rrset, q.keyring, q.mac, ignore_trailing
-        )
-        r.time = received_time - begin_time
-        if not q.is_response(r):
-            raise BadResponse
-        return r
-    assert (
-        False  # help mypy figure out we can't get here  lgtm[py/unreachable-statement]
-    )
-
-
-def quic(
-    q: dns.message.Message,
-    where: str,
-    timeout: Optional[float] = None,
-    port: int = 853,
-    source: Optional[str] = None,
-    source_port: int = 0,
-    one_rr_per_rrset: bool = False,
-    ignore_trailing: bool = False,
-    connection: Optional[dns.quic.SyncQuicConnection] = None,
-    verify: Union[bool, str] = True,
-    hostname: Optional[str] = None,
-    server_hostname: Optional[str] = None,
-) -> dns.message.Message:
-    """Return the response obtained after sending a query via DNS-over-QUIC.
-
-    *q*, a ``dns.message.Message``, the query to send.
-
-    *where*, a ``str``, the nameserver IP address.
-
-    *timeout*, a ``float`` or ``None``, the number of seconds to wait before the query
-    times out. If ``None``, the default, wait forever.
-
-    *port*, a ``int``, the port to send the query to. The default is 853.
-
-    *source*, a ``str`` containing an IPv4 or IPv6 address, specifying the source
-    address.  The default is the wildcard address.
-
-    *source_port*, an ``int``, the port from which to send the message. The default is
-    0.
-
-    *one_rr_per_rrset*, a ``bool``. If ``True``, put each RR into its own RRset.
-
-    *ignore_trailing*, a ``bool``. If ``True``, ignore trailing junk at end of the
-    received message.
-
-    *connection*, a ``dns.quic.SyncQuicConnection``.  If provided, the connection to use
-    to send the query.
-
-    *verify*, a ``bool`` or ``str``.  If a ``True``, then TLS certificate verification
-    of the server is done using the default CA bundle; if ``False``, then no
-    verification is done; if a `str` then it specifies the path to a certificate file or
-    directory which will be used for verification.
-
-    *hostname*, a ``str`` containing the server's hostname or ``None``.  The default is
-    ``None``, which means that no hostname is known, and if an SSL context is created,
-    hostname checking will be disabled.  This value is ignored if *url* is not
-    ``None``.
-
-    *server_hostname*, a ``str`` or ``None``.  This item is for backwards compatibility
-    only, and has the same meaning as *hostname*.
-
-    Returns a ``dns.message.Message``.
-    """
-
-    if not dns.quic.have_quic:
-        raise NoDOQ("DNS-over-QUIC is not available.")  # pragma: no cover
-
-    if server_hostname is not None and hostname is None:
-        hostname = server_hostname
-
-    q.id = 0
-    wire = q.to_wire()
-    the_connection: dns.quic.SyncQuicConnection
-    the_manager: dns.quic.SyncQuicManager
-    if connection:
-        manager: contextlib.AbstractContextManager = contextlib.nullcontext(None)
-        the_connection = connection
-    else:
-        manager = dns.quic.SyncQuicManager(verify_mode=verify, server_name=hostname)
-        the_manager = manager  # for type checking happiness
-
-    with manager:
-        if not connection:
-            the_connection = the_manager.connect(where, port, source, source_port)
-        (start, expiration) = _compute_times(timeout)
-        with the_connection.make_stream(timeout) as stream:
-            stream.send(wire, True)
-            wire = stream.receive(_remaining(expiration))
-        finish = time.time()
-    r = dns.message.from_wire(
-        wire,
-        keyring=q.keyring,
-        request_mac=q.request_mac,
-        one_rr_per_rrset=one_rr_per_rrset,
-        ignore_trailing=ignore_trailing,
-    )
-    r.time = max(finish - start, 0.0)
-    if not q.is_response(r):
-        raise BadResponse
-    return r
-
-
-class UDPMode(enum.IntEnum):
-    """How should UDP be used in an IXFR from :py:func:`inbound_xfr()`?
-
-    NEVER means "never use UDP; always use TCP"
-    TRY_FIRST means "try to use UDP but fall back to TCP if needed"
-    ONLY means "raise ``dns.xfr.UseTCP`` if trying UDP does not succeed"
-    """
-
-    NEVER = 0
-    TRY_FIRST = 1
-    ONLY = 2
-
-
-def _inbound_xfr(
-    txn_manager: dns.transaction.TransactionManager,
-    s: socket.socket,
-    query: dns.message.Message,
-    serial: Optional[int],
-    timeout: Optional[float],
-    expiration: float,
-) -> Any:
-    """Given a socket, does the zone transfer."""
-    rdtype = query.question[0].rdtype
-    is_ixfr = rdtype == dns.rdatatype.IXFR
-    origin = txn_manager.from_wire_origin()
-    wire = query.to_wire()
-    is_udp = s.type == socket.SOCK_DGRAM
-    if is_udp:
-        _udp_send(s, wire, None, expiration)
-    else:
-        tcpmsg = struct.pack("!H", len(wire)) + wire
-        _net_write(s, tcpmsg, expiration)
-    with dns.xfr.Inbound(txn_manager, rdtype, serial, is_udp) as inbound:
-        done = False
-        tsig_ctx = None
-        while not done:
-            (_, mexpiration) = _compute_times(timeout)
-            if mexpiration is None or (
-                expiration is not None and mexpiration > expiration
-            ):
-                mexpiration = expiration
-            if is_udp:
-                (rwire, _) = _udp_recv(s, 65535, mexpiration)
-            else:
-                ldata = _net_read(s, 2, mexpiration)
-                (l,) = struct.unpack("!H", ldata)
-                rwire = _net_read(s, l, mexpiration)
-            r = dns.message.from_wire(
-                rwire,
-                keyring=query.keyring,
-                request_mac=query.mac,
-                xfr=True,
-                origin=origin,
-                tsig_ctx=tsig_ctx,
-                multi=(not is_udp),
-                one_rr_per_rrset=is_ixfr,
-            )
-            done = inbound.process_message(r)
-            yield r
-            tsig_ctx = r.tsig_ctx
-        if query.keyring and not r.had_tsig:
-            raise dns.exception.FormError("missing TSIG")
-
-
-def xfr(
-    where: str,
-    zone: Union[dns.name.Name, str],
-    rdtype: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.AXFR,
-    rdclass: Union[dns.rdataclass.RdataClass, str] = dns.rdataclass.IN,
-    timeout: Optional[float] = None,
-    port: int = 53,
-    keyring: Optional[Dict[dns.name.Name, dns.tsig.Key]] = None,
-    keyname: Optional[Union[dns.name.Name, str]] = None,
-    relativize: bool = True,
-    lifetime: Optional[float] = None,
-    source: Optional[str] = None,
-    source_port: int = 0,
-    serial: int = 0,
-    use_udp: bool = False,
-    keyalgorithm: Union[dns.name.Name, str] = dns.tsig.default_algorithm,
-) -> Any:
-    """Return a generator for the responses to a zone transfer.
-
-    *where*, a ``str`` containing an IPv4 or IPv6 address,  where
-    to send the message.
-
-    *zone*, a ``dns.name.Name`` or ``str``, the name of the zone to transfer.
-
-    *rdtype*, an ``int`` or ``str``, the type of zone transfer.  The
-    default is ``dns.rdatatype.AXFR``.  ``dns.rdatatype.IXFR`` can be
-    used to do an incremental transfer instead.
-
-    *rdclass*, an ``int`` or ``str``, the class of the zone transfer.
-    The default is ``dns.rdataclass.IN``.
-
-    *timeout*, a ``float``, the number of seconds to wait for each
-    response message.  If None, the default, wait forever.
-
-    *port*, an ``int``, the port send the message to.  The default is 53.
-
-    *keyring*, a ``dict``, the keyring to use for TSIG.
-
-    *keyname*, a ``dns.name.Name`` or ``str``, the name of the TSIG
-    key to use.
-
-    *relativize*, a ``bool``.  If ``True``, all names in the zone will be
-    relativized to the zone origin.  It is essential that the
-    relativize setting matches the one specified to
-    ``dns.zone.from_xfr()`` if using this generator to make a zone.
-
-    *lifetime*, a ``float``, the total number of seconds to spend
-    doing the transfer.  If ``None``, the default, then there is no
-    limit on the time the transfer may take.
-
-    *source*, a ``str`` containing an IPv4 or IPv6 address, specifying
-    the source address.  The default is the wildcard address.
-
-    *source_port*, an ``int``, the port from which to send the message.
-    The default is 0.
-
-    *serial*, an ``int``, the SOA serial number to use as the base for
-    an IXFR diff sequence (only meaningful if *rdtype* is
-    ``dns.rdatatype.IXFR``).
-
-    *use_udp*, a ``bool``.  If ``True``, use UDP (only meaningful for IXFR).
-
-    *keyalgorithm*, a ``dns.name.Name`` or ``str``, the TSIG algorithm to use.
-
-    Raises on errors, and so does the generator.
-
-    Returns a generator of ``dns.message.Message`` objects.
-    """
-
-    class DummyTransactionManager(dns.transaction.TransactionManager):
-        def __init__(self, origin, relativize):
-            self.info = (origin, relativize, dns.name.empty if relativize else origin)
-
-        def origin_information(self):
-            return self.info
-
-        def get_class(self) -> dns.rdataclass.RdataClass:
-            raise NotImplementedError  # pragma: no cover
-
-        def reader(self):
-            raise NotImplementedError  # pragma: no cover
-
-        def writer(self, replacement: bool = False) -> dns.transaction.Transaction:
-            class DummyTransaction:
-                def nop(self, *args, **kw):
-                    pass
-
-                def __getattr__(self, _):
-                    return self.nop
-
-            return cast(dns.transaction.Transaction, DummyTransaction())
-
-    if isinstance(zone, str):
-        zone = dns.name.from_text(zone)
-    rdtype = dns.rdatatype.RdataType.make(rdtype)
-    q = dns.message.make_query(zone, rdtype, rdclass)
-    if rdtype == dns.rdatatype.IXFR:
-        rrset = q.find_rrset(
-            q.authority, zone, dns.rdataclass.IN, dns.rdatatype.SOA, create=True
-        )
-        soa = dns.rdata.from_text("IN", "SOA", ". . %u 0 0 0 0" % serial)
-        rrset.add(soa, 0)
-    if keyring is not None:
-        q.use_tsig(keyring, keyname, algorithm=keyalgorithm)
-    (af, destination, source) = _destination_and_source(
-        where, port, source, source_port
-    )
-    (_, expiration) = _compute_times(lifetime)
-    tm = DummyTransactionManager(zone, relativize)
-    if use_udp and rdtype != dns.rdatatype.IXFR:
-        raise ValueError("cannot do a UDP AXFR")
-    sock_type = socket.SOCK_DGRAM if use_udp else socket.SOCK_STREAM
-    with _make_socket(af, sock_type, source) as s:
-        _connect(s, destination, expiration)
-        yield from _inbound_xfr(tm, s, q, serial, timeout, expiration)
-
-
-def inbound_xfr(
-    where: str,
-    txn_manager: dns.transaction.TransactionManager,
-    query: Optional[dns.message.Message] = None,
-    port: int = 53,
-    timeout: Optional[float] = None,
-    lifetime: Optional[float] = None,
-    source: Optional[str] = None,
-    source_port: int = 0,
-    udp_mode: UDPMode = UDPMode.NEVER,
-) -> None:
-    """Conduct an inbound transfer and apply it via a transaction from the
-    txn_manager.
-
-    *where*, a ``str`` containing an IPv4 or IPv6 address,  where
-    to send the message.
-
-    *txn_manager*, a ``dns.transaction.TransactionManager``, the txn_manager
-    for this transfer (typically a ``dns.zone.Zone``).
-
-    *query*, the query to send.  If not supplied, a default query is
-    constructed using information from the *txn_manager*.
-
-    *port*, an ``int``, the port send the message to.  The default is 53.
-
-    *timeout*, a ``float``, the number of seconds to wait for each
-    response message.  If None, the default, wait forever.
-
-    *lifetime*, a ``float``, the total number of seconds to spend
-    doing the transfer.  If ``None``, the default, then there is no
-    limit on the time the transfer may take.
-
-    *source*, a ``str`` containing an IPv4 or IPv6 address, specifying
-    the source address.  The default is the wildcard address.
-
-    *source_port*, an ``int``, the port from which to send the message.
-    The default is 0.
-
-    *udp_mode*, a ``dns.query.UDPMode``, determines how UDP is used
-    for IXFRs.  The default is ``dns.UDPMode.NEVER``, i.e. only use
-    TCP.  Other possibilities are ``dns.UDPMode.TRY_FIRST``, which
-    means "try UDP but fallback to TCP if needed", and
-    ``dns.UDPMode.ONLY``, which means "try UDP and raise
-    ``dns.xfr.UseTCP`` if it does not succeed.
-
-    Raises on errors.
-    """
-    if query is None:
-        (query, serial) = dns.xfr.make_query(txn_manager)
-    else:
-        serial = dns.xfr.extract_serial_from_query(query)
-
-    (af, destination, source) = _destination_and_source(
-        where, port, source, source_port
-    )
-    (_, expiration) = _compute_times(lifetime)
-    if query.question[0].rdtype == dns.rdatatype.IXFR and udp_mode != UDPMode.NEVER:
-        with _make_socket(af, socket.SOCK_DGRAM, source) as s:
-            _connect(s, destination, expiration)
-            try:
-                for _ in _inbound_xfr(
-                    txn_manager, s, query, serial, timeout, expiration
-                ):
-                    pass
-                return
-            except dns.xfr.UseTCP:
-                if udp_mode == UDPMode.ONLY:
-                    raise
-
-    with _make_socket(af, socket.SOCK_STREAM, source) as s:
-        _connect(s, destination, expiration)
-        for _ in _inbound_xfr(txn_manager, s, query, serial, timeout, expiration):
-            pass
diff --git a/lib/dns/quic/__init__.py b/lib/dns/quic/__init__.py
deleted file mode 100644
index 0750e729..00000000
--- a/lib/dns/quic/__init__.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-from typing import List, Tuple
-
-import dns._features
-import dns.asyncbackend
-
-if dns._features.have("doq"):
-    import aioquic.quic.configuration  # type: ignore
-
-    from dns._asyncbackend import NullContext
-    from dns.quic._asyncio import (
-        AsyncioQuicConnection,
-        AsyncioQuicManager,
-        AsyncioQuicStream,
-    )
-    from dns.quic._common import AsyncQuicConnection, AsyncQuicManager
-    from dns.quic._sync import SyncQuicConnection, SyncQuicManager, SyncQuicStream
-
-    have_quic = True
-
-    def null_factory(
-        *args,  # pylint: disable=unused-argument
-        **kwargs,  # pylint: disable=unused-argument
-    ):
-        return NullContext(None)
-
-    def _asyncio_manager_factory(
-        context, *args, **kwargs  # pylint: disable=unused-argument
-    ):
-        return AsyncioQuicManager(*args, **kwargs)
-
-    # We have a context factory and a manager factory as for trio we need to have
-    # a nursery.
-
-    _async_factories = {"asyncio": (null_factory, _asyncio_manager_factory)}
-
-    if dns._features.have("trio"):
-        import trio
-
-        from dns.quic._trio import (  # pylint: disable=ungrouped-imports
-            TrioQuicConnection,
-            TrioQuicManager,
-            TrioQuicStream,
-        )
-
-        def _trio_context_factory():
-            return trio.open_nursery()
-
-        def _trio_manager_factory(context, *args, **kwargs):
-            return TrioQuicManager(context, *args, **kwargs)
-
-        _async_factories["trio"] = (_trio_context_factory, _trio_manager_factory)
-
-    def factories_for_backend(backend=None):
-        if backend is None:
-            backend = dns.asyncbackend.get_default_backend()
-        return _async_factories[backend.name()]
-
-else:  # pragma: no cover
-    have_quic = False
-
-    from typing import Any
-
-    class AsyncQuicStream:  # type: ignore
-        pass
-
-    class AsyncQuicConnection:  # type: ignore
-        async def make_stream(self) -> Any:
-            raise NotImplementedError
-
-    class SyncQuicStream:  # type: ignore
-        pass
-
-    class SyncQuicConnection:  # type: ignore
-        def make_stream(self) -> Any:
-            raise NotImplementedError
-
-
-Headers = List[Tuple[bytes, bytes]]
diff --git a/lib/dns/quic/_asyncio.py b/lib/dns/quic/_asyncio.py
deleted file mode 100644
index f87515da..00000000
--- a/lib/dns/quic/_asyncio.py
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-import asyncio
-import socket
-import ssl
-import struct
-import time
-
-import aioquic.quic.configuration  # type: ignore
-import aioquic.quic.connection  # type: ignore
-import aioquic.quic.events  # type: ignore
-
-import dns.asyncbackend
-import dns.exception
-import dns.inet
-from dns.quic._common import (
-    QUIC_MAX_DATAGRAM,
-    AsyncQuicConnection,
-    AsyncQuicManager,
-    BaseQuicStream,
-    UnexpectedEOF,
-)
-
-
-class AsyncioQuicStream(BaseQuicStream):
-    def __init__(self, connection, stream_id):
-        super().__init__(connection, stream_id)
-        self._wake_up = asyncio.Condition()
-
-    async def _wait_for_wake_up(self):
-        async with self._wake_up:
-            await self._wake_up.wait()
-
-    async def wait_for(self, amount, expiration):
-        while True:
-            timeout = self._timeout_from_expiration(expiration)
-            if self._buffer.have(amount):
-                return
-            self._expecting = amount
-            try:
-                await asyncio.wait_for(self._wait_for_wake_up(), timeout)
-            except TimeoutError:
-                raise dns.exception.Timeout
-            self._expecting = 0
-
-    async def wait_for_end(self, expiration):
-        while True:
-            timeout = self._timeout_from_expiration(expiration)
-            if self._buffer.seen_end():
-                return
-            try:
-                await asyncio.wait_for(self._wait_for_wake_up(), timeout)
-            except TimeoutError:
-                raise dns.exception.Timeout
-
-    async def receive(self, timeout=None):
-        expiration = self._expiration_from_timeout(timeout)
-        if self._connection.is_h3():
-            await self.wait_for_end(expiration)
-            return self._buffer.get_all()
-        else:
-            await self.wait_for(2, expiration)
-            (size,) = struct.unpack("!H", self._buffer.get(2))
-            await self.wait_for(size, expiration)
-            return self._buffer.get(size)
-
-    async def send(self, datagram, is_end=False):
-        data = self._encapsulate(datagram)
-        await self._connection.write(self._stream_id, data, is_end)
-
-    async def _add_input(self, data, is_end):
-        if self._common_add_input(data, is_end):
-            async with self._wake_up:
-                self._wake_up.notify()
-
-    async def close(self):
-        self._close()
-
-    # Streams are async context managers
-
-    async def __aenter__(self):
-        return self
-
-    async def __aexit__(self, exc_type, exc_val, exc_tb):
-        await self.close()
-        async with self._wake_up:
-            self._wake_up.notify()
-        return False
-
-
-class AsyncioQuicConnection(AsyncQuicConnection):
-    def __init__(self, connection, address, port, source, source_port, manager=None):
-        super().__init__(connection, address, port, source, source_port, manager)
-        self._socket = None
-        self._handshake_complete = asyncio.Event()
-        self._socket_created = asyncio.Event()
-        self._wake_timer = asyncio.Condition()
-        self._receiver_task = None
-        self._sender_task = None
-        self._wake_pending = False
-
-    async def _receiver(self):
-        try:
-            af = dns.inet.af_for_address(self._address)
-            backend = dns.asyncbackend.get_backend("asyncio")
-            # Note that peer is a low-level address tuple, but make_socket() wants
-            # a high-level address tuple, so we convert.
-            self._socket = await backend.make_socket(
-                af, socket.SOCK_DGRAM, 0, self._source, (self._peer[0], self._peer[1])
-            )
-            self._socket_created.set()
-            async with self._socket:
-                while not self._done:
-                    (datagram, address) = await self._socket.recvfrom(
-                        QUIC_MAX_DATAGRAM, None
-                    )
-                    if address[0] != self._peer[0] or address[1] != self._peer[1]:
-                        continue
-                    self._connection.receive_datagram(datagram, address, time.time())
-                    # Wake up the timer in case the sender is sleeping, as there may be
-                    # stuff to send now.
-                    await self._wakeup()
-        except Exception:
-            pass
-        finally:
-            self._done = True
-            await self._wakeup()
-            self._handshake_complete.set()
-
-    async def _wakeup(self):
-        self._wake_pending = True
-        async with self._wake_timer:
-            self._wake_timer.notify_all()
-
-    async def _wait_for_wake_timer(self):
-        async with self._wake_timer:
-            if not self._wake_pending:
-                await self._wake_timer.wait()
-        self._wake_pending = False
-
-    async def _sender(self):
-        await self._socket_created.wait()
-        while not self._done:
-            datagrams = self._connection.datagrams_to_send(time.time())
-            for datagram, address in datagrams:
-                assert address == self._peer
-                await self._socket.sendto(datagram, self._peer, None)
-            (expiration, interval) = self._get_timer_values()
-            try:
-                await asyncio.wait_for(self._wait_for_wake_timer(), interval)
-            except Exception:
-                pass
-            self._handle_timer(expiration)
-            await self._handle_events()
-
-    async def _handle_events(self):
-        count = 0
-        while True:
-            event = self._connection.next_event()
-            if event is None:
-                return
-            if isinstance(event, aioquic.quic.events.StreamDataReceived):
-                if self.is_h3():
-                    h3_events = self._h3_conn.handle_event(event)
-                    for h3_event in h3_events:
-                        if isinstance(h3_event, aioquic.h3.events.HeadersReceived):
-                            stream = self._streams.get(event.stream_id)
-                            if stream:
-                                if stream._headers is None:
-                                    stream._headers = h3_event.headers
-                                elif stream._trailers is None:
-                                    stream._trailers = h3_event.headers
-                                if h3_event.stream_ended:
-                                    await stream._add_input(b"", True)
-                        elif isinstance(h3_event, aioquic.h3.events.DataReceived):
-                            stream = self._streams.get(event.stream_id)
-                            if stream:
-                                await stream._add_input(
-                                    h3_event.data, h3_event.stream_ended
-                                )
-                else:
-                    stream = self._streams.get(event.stream_id)
-                    if stream:
-                        await stream._add_input(event.data, event.end_stream)
-            elif isinstance(event, aioquic.quic.events.HandshakeCompleted):
-                self._handshake_complete.set()
-            elif isinstance(event, aioquic.quic.events.ConnectionTerminated):
-                self._done = True
-                self._receiver_task.cancel()
-            elif isinstance(event, aioquic.quic.events.StreamReset):
-                stream = self._streams.get(event.stream_id)
-                if stream:
-                    await stream._add_input(b"", True)
-
-            count += 1
-            if count > 10:
-                # yield
-                count = 0
-                await asyncio.sleep(0)
-
-    async def write(self, stream, data, is_end=False):
-        self._connection.send_stream_data(stream, data, is_end)
-        await self._wakeup()
-
-    def run(self):
-        if self._closed:
-            return
-        self._receiver_task = asyncio.Task(self._receiver())
-        self._sender_task = asyncio.Task(self._sender())
-
-    async def make_stream(self, timeout=None):
-        try:
-            await asyncio.wait_for(self._handshake_complete.wait(), timeout)
-        except TimeoutError:
-            raise dns.exception.Timeout
-        if self._done:
-            raise UnexpectedEOF
-        stream_id = self._connection.get_next_available_stream_id(False)
-        stream = AsyncioQuicStream(self, stream_id)
-        self._streams[stream_id] = stream
-        return stream
-
-    async def close(self):
-        if not self._closed:
-            self._manager.closed(self._peer[0], self._peer[1])
-            self._closed = True
-            self._connection.close()
-            # sender might be blocked on this, so set it
-            self._socket_created.set()
-            await self._wakeup()
-            try:
-                await self._receiver_task
-            except asyncio.CancelledError:
-                pass
-            try:
-                await self._sender_task
-            except asyncio.CancelledError:
-                pass
-            await self._socket.close()
-
-
-class AsyncioQuicManager(AsyncQuicManager):
-    def __init__(
-        self, conf=None, verify_mode=ssl.CERT_REQUIRED, server_name=None, h3=False
-    ):
-        super().__init__(conf, verify_mode, AsyncioQuicConnection, server_name, h3)
-
-    def connect(
-        self, address, port=853, source=None, source_port=0, want_session_ticket=True
-    ):
-        (connection, start) = self._connect(
-            address, port, source, source_port, want_session_ticket
-        )
-        if start:
-            connection.run()
-        return connection
-
-    async def __aenter__(self):
-        return self
-
-    async def __aexit__(self, exc_type, exc_val, exc_tb):
-        # Copy the iterator into a list as exiting things will mutate the connections
-        # table.
-        connections = list(self._connections.values())
-        for connection in connections:
-            await connection.close()
-        return False
diff --git a/lib/dns/quic/_common.py b/lib/dns/quic/_common.py
deleted file mode 100644
index ce575b03..00000000
--- a/lib/dns/quic/_common.py
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-import base64
-import copy
-import functools
-import socket
-import struct
-import time
-import urllib
-from typing import Any, Optional
-
-import aioquic.h3.connection  # type: ignore
-import aioquic.h3.events  # type: ignore
-import aioquic.quic.configuration  # type: ignore
-import aioquic.quic.connection  # type: ignore
-
-import dns.inet
-
-QUIC_MAX_DATAGRAM = 2048
-MAX_SESSION_TICKETS = 8
-# If we hit the max sessions limit we will delete this many of the oldest connections.
-# The value must be a integer > 0 and <= MAX_SESSION_TICKETS.
-SESSIONS_TO_DELETE = MAX_SESSION_TICKETS // 4
-
-
-class UnexpectedEOF(Exception):
-    pass
-
-
-class Buffer:
-    def __init__(self):
-        self._buffer = b""
-        self._seen_end = False
-
-    def put(self, data, is_end):
-        if self._seen_end:
-            return
-        self._buffer += data
-        if is_end:
-            self._seen_end = True
-
-    def have(self, amount):
-        if len(self._buffer) >= amount:
-            return True
-        if self._seen_end:
-            raise UnexpectedEOF
-        return False
-
-    def seen_end(self):
-        return self._seen_end
-
-    def get(self, amount):
-        assert self.have(amount)
-        data = self._buffer[:amount]
-        self._buffer = self._buffer[amount:]
-        return data
-
-    def get_all(self):
-        assert self.seen_end()
-        data = self._buffer
-        self._buffer = b""
-        return data
-
-
-class BaseQuicStream:
-    def __init__(self, connection, stream_id):
-        self._connection = connection
-        self._stream_id = stream_id
-        self._buffer = Buffer()
-        self._expecting = 0
-        self._headers = None
-        self._trailers = None
-
-    def id(self):
-        return self._stream_id
-
-    def headers(self):
-        return self._headers
-
-    def trailers(self):
-        return self._trailers
-
-    def _expiration_from_timeout(self, timeout):
-        if timeout is not None:
-            expiration = time.time() + timeout
-        else:
-            expiration = None
-        return expiration
-
-    def _timeout_from_expiration(self, expiration):
-        if expiration is not None:
-            timeout = max(expiration - time.time(), 0.0)
-        else:
-            timeout = None
-        return timeout
-
-    # Subclass must implement receive() as sync / async and which returns a message
-    # or raises.
-
-    # Subclass must implement send() as sync / async and which takes a message and
-    # an EOF indicator.
-
-    def send_h3(self, url, datagram, post=True):
-        if not self._connection.is_h3():
-            raise SyntaxError("cannot send H3 to a non-H3 connection")
-        url_parts = urllib.parse.urlparse(url)
-        path = url_parts.path.encode()
-        if post:
-            method = b"POST"
-        else:
-            method = b"GET"
-            path += b"?dns=" + base64.urlsafe_b64encode(datagram).rstrip(b"=")
-        headers = [
-            (b":method", method),
-            (b":scheme", url_parts.scheme.encode()),
-            (b":authority", url_parts.netloc.encode()),
-            (b":path", path),
-            (b"accept", b"application/dns-message"),
-        ]
-        if post:
-            headers.extend(
-                [
-                    (b"content-type", b"application/dns-message"),
-                    (b"content-length", str(len(datagram)).encode()),
-                ]
-            )
-        self._connection.send_headers(self._stream_id, headers, not post)
-        if post:
-            self._connection.send_data(self._stream_id, datagram, True)
-
-    def _encapsulate(self, datagram):
-        if self._connection.is_h3():
-            return datagram
-        l = len(datagram)
-        return struct.pack("!H", l) + datagram
-
-    def _common_add_input(self, data, is_end):
-        self._buffer.put(data, is_end)
-        try:
-            return (
-                self._expecting > 0 and self._buffer.have(self._expecting)
-            ) or self._buffer.seen_end
-        except UnexpectedEOF:
-            return True
-
-    def _close(self):
-        self._connection.close_stream(self._stream_id)
-        self._buffer.put(b"", True)  # send EOF in case we haven't seen it.
-
-
-class BaseQuicConnection:
-    def __init__(
-        self,
-        connection,
-        address,
-        port,
-        source=None,
-        source_port=0,
-        manager=None,
-    ):
-        self._done = False
-        self._connection = connection
-        self._address = address
-        self._port = port
-        self._closed = False
-        self._manager = manager
-        self._streams = {}
-        if manager.is_h3():
-            self._h3_conn = aioquic.h3.connection.H3Connection(connection, False)
-        else:
-            self._h3_conn = None
-        self._af = dns.inet.af_for_address(address)
-        self._peer = dns.inet.low_level_address_tuple((address, port))
-        if source is None and source_port != 0:
-            if self._af == socket.AF_INET:
-                source = "0.0.0.0"
-            elif self._af == socket.AF_INET6:
-                source = "::"
-            else:
-                raise NotImplementedError
-        if source:
-            self._source = (source, source_port)
-        else:
-            self._source = None
-
-    def is_h3(self):
-        return self._h3_conn is not None
-
-    def close_stream(self, stream_id):
-        del self._streams[stream_id]
-
-    def send_headers(self, stream_id, headers, is_end=False):
-        self._h3_conn.send_headers(stream_id, headers, is_end)
-
-    def send_data(self, stream_id, data, is_end=False):
-        self._h3_conn.send_data(stream_id, data, is_end)
-
-    def _get_timer_values(self, closed_is_special=True):
-        now = time.time()
-        expiration = self._connection.get_timer()
-        if expiration is None:
-            expiration = now + 3600  # arbitrary "big" value
-        interval = max(expiration - now, 0)
-        if self._closed and closed_is_special:
-            # lower sleep interval to avoid a race in the closing process
-            # which can lead to higher latency closing due to sleeping when
-            # we have events.
-            interval = min(interval, 0.05)
-        return (expiration, interval)
-
-    def _handle_timer(self, expiration):
-        now = time.time()
-        if expiration <= now:
-            self._connection.handle_timer(now)
-
-
-class AsyncQuicConnection(BaseQuicConnection):
-    async def make_stream(self, timeout: Optional[float] = None) -> Any:
-        pass
-
-
-class BaseQuicManager:
-    def __init__(
-        self, conf, verify_mode, connection_factory, server_name=None, h3=False
-    ):
-        self._connections = {}
-        self._connection_factory = connection_factory
-        self._session_tickets = {}
-        self._tokens = {}
-        self._h3 = h3
-        if conf is None:
-            verify_path = None
-            if isinstance(verify_mode, str):
-                verify_path = verify_mode
-                verify_mode = True
-            if h3:
-                alpn_protocols = ["h3"]
-            else:
-                alpn_protocols = ["doq", "doq-i03"]
-            conf = aioquic.quic.configuration.QuicConfiguration(
-                alpn_protocols=alpn_protocols,
-                verify_mode=verify_mode,
-                server_name=server_name,
-            )
-            if verify_path is not None:
-                conf.load_verify_locations(verify_path)
-        self._conf = conf
-
-    def _connect(
-        self,
-        address,
-        port=853,
-        source=None,
-        source_port=0,
-        want_session_ticket=True,
-        want_token=True,
-    ):
-        connection = self._connections.get((address, port))
-        if connection is not None:
-            return (connection, False)
-        conf = self._conf
-        if want_session_ticket:
-            try:
-                session_ticket = self._session_tickets.pop((address, port))
-                # We found a session ticket, so make a configuration that uses it.
-                conf = copy.copy(conf)
-                conf.session_ticket = session_ticket
-            except KeyError:
-                # No session ticket.
-                pass
-            # Whether or not we found a session ticket, we want a handler to save
-            # one.
-            session_ticket_handler = functools.partial(
-                self.save_session_ticket, address, port
-            )
-        else:
-            session_ticket_handler = None
-        if want_token:
-            try:
-                token = self._tokens.pop((address, port))
-                # We found a token, so make a configuration that uses it.
-                conf = copy.copy(conf)
-                conf.token = token
-            except KeyError:
-                # No token
-                pass
-            # Whether or not we found a token, we want a handler to save # one.
-            token_handler = functools.partial(self.save_token, address, port)
-        else:
-            token_handler = None
-
-        qconn = aioquic.quic.connection.QuicConnection(
-            configuration=conf,
-            session_ticket_handler=session_ticket_handler,
-            token_handler=token_handler,
-        )
-        lladdress = dns.inet.low_level_address_tuple((address, port))
-        qconn.connect(lladdress, time.time())
-        connection = self._connection_factory(
-            qconn, address, port, source, source_port, self
-        )
-        self._connections[(address, port)] = connection
-        return (connection, True)
-
-    def closed(self, address, port):
-        try:
-            del self._connections[(address, port)]
-        except KeyError:
-            pass
-
-    def is_h3(self):
-        return self._h3
-
-    def save_session_ticket(self, address, port, ticket):
-        # We rely on dictionaries keys() being in insertion order here.  We
-        # can't just popitem() as that would be LIFO which is the opposite of
-        # what we want.
-        l = len(self._session_tickets)
-        if l >= MAX_SESSION_TICKETS:
-            keys_to_delete = list(self._session_tickets.keys())[0:SESSIONS_TO_DELETE]
-            for key in keys_to_delete:
-                del self._session_tickets[key]
-        self._session_tickets[(address, port)] = ticket
-
-    def save_token(self, address, port, token):
-        # We rely on dictionaries keys() being in insertion order here.  We
-        # can't just popitem() as that would be LIFO which is the opposite of
-        # what we want.
-        l = len(self._tokens)
-        if l >= MAX_SESSION_TICKETS:
-            keys_to_delete = list(self._tokens.keys())[0:SESSIONS_TO_DELETE]
-            for key in keys_to_delete:
-                del self._tokens[key]
-        self._tokens[(address, port)] = token
-
-
-class AsyncQuicManager(BaseQuicManager):
-    def connect(self, address, port=853, source=None, source_port=0):
-        raise NotImplementedError
diff --git a/lib/dns/quic/_sync.py b/lib/dns/quic/_sync.py
deleted file mode 100644
index 473d1f48..00000000
--- a/lib/dns/quic/_sync.py
+++ /dev/null
@@ -1,295 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-import selectors
-import socket
-import ssl
-import struct
-import threading
-import time
-
-import aioquic.quic.configuration  # type: ignore
-import aioquic.quic.connection  # type: ignore
-import aioquic.quic.events  # type: ignore
-
-import dns.exception
-import dns.inet
-from dns.quic._common import (
-    QUIC_MAX_DATAGRAM,
-    BaseQuicConnection,
-    BaseQuicManager,
-    BaseQuicStream,
-    UnexpectedEOF,
-)
-
-# Function used to create a socket.  Can be overridden if needed in special
-# situations.
-socket_factory = socket.socket
-
-
-class SyncQuicStream(BaseQuicStream):
-    def __init__(self, connection, stream_id):
-        super().__init__(connection, stream_id)
-        self._wake_up = threading.Condition()
-        self._lock = threading.Lock()
-
-    def wait_for(self, amount, expiration):
-        while True:
-            timeout = self._timeout_from_expiration(expiration)
-            with self._lock:
-                if self._buffer.have(amount):
-                    return
-                self._expecting = amount
-            with self._wake_up:
-                if not self._wake_up.wait(timeout):
-                    raise dns.exception.Timeout
-            self._expecting = 0
-
-    def wait_for_end(self, expiration):
-        while True:
-            timeout = self._timeout_from_expiration(expiration)
-            with self._lock:
-                if self._buffer.seen_end():
-                    return
-            with self._wake_up:
-                if not self._wake_up.wait(timeout):
-                    raise dns.exception.Timeout
-
-    def receive(self, timeout=None):
-        expiration = self._expiration_from_timeout(timeout)
-        if self._connection.is_h3():
-            self.wait_for_end(expiration)
-            with self._lock:
-                return self._buffer.get_all()
-        else:
-            self.wait_for(2, expiration)
-            with self._lock:
-                (size,) = struct.unpack("!H", self._buffer.get(2))
-            self.wait_for(size, expiration)
-            with self._lock:
-                return self._buffer.get(size)
-
-    def send(self, datagram, is_end=False):
-        data = self._encapsulate(datagram)
-        self._connection.write(self._stream_id, data, is_end)
-
-    def _add_input(self, data, is_end):
-        if self._common_add_input(data, is_end):
-            with self._wake_up:
-                self._wake_up.notify()
-
-    def close(self):
-        with self._lock:
-            self._close()
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        self.close()
-        with self._wake_up:
-            self._wake_up.notify()
-        return False
-
-
-class SyncQuicConnection(BaseQuicConnection):
-    def __init__(self, connection, address, port, source, source_port, manager):
-        super().__init__(connection, address, port, source, source_port, manager)
-        self._socket = socket_factory(self._af, socket.SOCK_DGRAM, 0)
-        if self._source is not None:
-            try:
-                self._socket.bind(
-                    dns.inet.low_level_address_tuple(self._source, self._af)
-                )
-            except Exception:
-                self._socket.close()
-                raise
-        self._socket.connect(self._peer)
-        (self._send_wakeup, self._receive_wakeup) = socket.socketpair()
-        self._receive_wakeup.setblocking(False)
-        self._socket.setblocking(False)
-        self._handshake_complete = threading.Event()
-        self._worker_thread = None
-        self._lock = threading.Lock()
-
-    def _read(self):
-        count = 0
-        while count < 10:
-            count += 1
-            try:
-                datagram = self._socket.recv(QUIC_MAX_DATAGRAM)
-            except BlockingIOError:
-                return
-            with self._lock:
-                self._connection.receive_datagram(datagram, self._peer, time.time())
-
-    def _drain_wakeup(self):
-        while True:
-            try:
-                self._receive_wakeup.recv(32)
-            except BlockingIOError:
-                return
-
-    def _worker(self):
-        try:
-            sel = selectors.DefaultSelector()
-            sel.register(self._socket, selectors.EVENT_READ, self._read)
-            sel.register(self._receive_wakeup, selectors.EVENT_READ, self._drain_wakeup)
-            while not self._done:
-                (expiration, interval) = self._get_timer_values(False)
-                items = sel.select(interval)
-                for key, _ in items:
-                    key.data()
-                with self._lock:
-                    self._handle_timer(expiration)
-                self._handle_events()
-                with self._lock:
-                    datagrams = self._connection.datagrams_to_send(time.time())
-                for datagram, _ in datagrams:
-                    try:
-                        self._socket.send(datagram)
-                    except BlockingIOError:
-                        # we let QUIC handle any lossage
-                        pass
-        finally:
-            with self._lock:
-                self._done = True
-            self._socket.close()
-            # Ensure anyone waiting for this gets woken up.
-            self._handshake_complete.set()
-
-    def _handle_events(self):
-        while True:
-            with self._lock:
-                event = self._connection.next_event()
-            if event is None:
-                return
-            if isinstance(event, aioquic.quic.events.StreamDataReceived):
-                if self.is_h3():
-                    h3_events = self._h3_conn.handle_event(event)
-                    for h3_event in h3_events:
-                        if isinstance(h3_event, aioquic.h3.events.HeadersReceived):
-                            with self._lock:
-                                stream = self._streams.get(event.stream_id)
-                            if stream:
-                                if stream._headers is None:
-                                    stream._headers = h3_event.headers
-                                elif stream._trailers is None:
-                                    stream._trailers = h3_event.headers
-                                if h3_event.stream_ended:
-                                    stream._add_input(b"", True)
-                        elif isinstance(h3_event, aioquic.h3.events.DataReceived):
-                            with self._lock:
-                                stream = self._streams.get(event.stream_id)
-                            if stream:
-                                stream._add_input(h3_event.data, h3_event.stream_ended)
-                else:
-                    with self._lock:
-                        stream = self._streams.get(event.stream_id)
-                    if stream:
-                        stream._add_input(event.data, event.end_stream)
-            elif isinstance(event, aioquic.quic.events.HandshakeCompleted):
-                self._handshake_complete.set()
-            elif isinstance(event, aioquic.quic.events.ConnectionTerminated):
-                with self._lock:
-                    self._done = True
-            elif isinstance(event, aioquic.quic.events.StreamReset):
-                with self._lock:
-                    stream = self._streams.get(event.stream_id)
-                if stream:
-                    stream._add_input(b"", True)
-
-    def write(self, stream, data, is_end=False):
-        with self._lock:
-            self._connection.send_stream_data(stream, data, is_end)
-        self._send_wakeup.send(b"\x01")
-
-    def send_headers(self, stream_id, headers, is_end=False):
-        with self._lock:
-            super().send_headers(stream_id, headers, is_end)
-        if is_end:
-            self._send_wakeup.send(b"\x01")
-
-    def send_data(self, stream_id, data, is_end=False):
-        with self._lock:
-            super().send_data(stream_id, data, is_end)
-        if is_end:
-            self._send_wakeup.send(b"\x01")
-
-    def run(self):
-        if self._closed:
-            return
-        self._worker_thread = threading.Thread(target=self._worker)
-        self._worker_thread.start()
-
-    def make_stream(self, timeout=None):
-        if not self._handshake_complete.wait(timeout):
-            raise dns.exception.Timeout
-        with self._lock:
-            if self._done:
-                raise UnexpectedEOF
-            stream_id = self._connection.get_next_available_stream_id(False)
-            stream = SyncQuicStream(self, stream_id)
-            self._streams[stream_id] = stream
-        return stream
-
-    def close_stream(self, stream_id):
-        with self._lock:
-            super().close_stream(stream_id)
-
-    def close(self):
-        with self._lock:
-            if self._closed:
-                return
-            self._manager.closed(self._peer[0], self._peer[1])
-            self._closed = True
-            self._connection.close()
-            self._send_wakeup.send(b"\x01")
-        self._worker_thread.join()
-
-
-class SyncQuicManager(BaseQuicManager):
-    def __init__(
-        self, conf=None, verify_mode=ssl.CERT_REQUIRED, server_name=None, h3=False
-    ):
-        super().__init__(conf, verify_mode, SyncQuicConnection, server_name, h3)
-        self._lock = threading.Lock()
-
-    def connect(
-        self,
-        address,
-        port=853,
-        source=None,
-        source_port=0,
-        want_session_ticket=True,
-        want_token=True,
-    ):
-        with self._lock:
-            (connection, start) = self._connect(
-                address, port, source, source_port, want_session_ticket, want_token
-            )
-            if start:
-                connection.run()
-            return connection
-
-    def closed(self, address, port):
-        with self._lock:
-            super().closed(address, port)
-
-    def save_session_ticket(self, address, port, ticket):
-        with self._lock:
-            super().save_session_ticket(address, port, ticket)
-
-    def save_token(self, address, port, token):
-        with self._lock:
-            super().save_token(address, port, token)
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        # Copy the iterator into a list as exiting things will mutate the connections
-        # table.
-        connections = list(self._connections.values())
-        for connection in connections:
-            connection.close()
-        return False
diff --git a/lib/dns/quic/_trio.py b/lib/dns/quic/_trio.py
deleted file mode 100644
index ae79f369..00000000
--- a/lib/dns/quic/_trio.py
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-import socket
-import ssl
-import struct
-import time
-
-import aioquic.quic.configuration  # type: ignore
-import aioquic.quic.connection  # type: ignore
-import aioquic.quic.events  # type: ignore
-import trio
-
-import dns.exception
-import dns.inet
-from dns._asyncbackend import NullContext
-from dns.quic._common import (
-    QUIC_MAX_DATAGRAM,
-    AsyncQuicConnection,
-    AsyncQuicManager,
-    BaseQuicStream,
-    UnexpectedEOF,
-)
-
-
-class TrioQuicStream(BaseQuicStream):
-    def __init__(self, connection, stream_id):
-        super().__init__(connection, stream_id)
-        self._wake_up = trio.Condition()
-
-    async def wait_for(self, amount):
-        while True:
-            if self._buffer.have(amount):
-                return
-            self._expecting = amount
-            async with self._wake_up:
-                await self._wake_up.wait()
-            self._expecting = 0
-
-    async def wait_for_end(self):
-        while True:
-            if self._buffer.seen_end():
-                return
-            async with self._wake_up:
-                await self._wake_up.wait()
-
-    async def receive(self, timeout=None):
-        if timeout is None:
-            context = NullContext(None)
-        else:
-            context = trio.move_on_after(timeout)
-        with context:
-            if self._connection.is_h3():
-                await self.wait_for_end()
-                return self._buffer.get_all()
-            else:
-                await self.wait_for(2)
-                (size,) = struct.unpack("!H", self._buffer.get(2))
-                await self.wait_for(size)
-                return self._buffer.get(size)
-        raise dns.exception.Timeout
-
-    async def send(self, datagram, is_end=False):
-        data = self._encapsulate(datagram)
-        await self._connection.write(self._stream_id, data, is_end)
-
-    async def _add_input(self, data, is_end):
-        if self._common_add_input(data, is_end):
-            async with self._wake_up:
-                self._wake_up.notify()
-
-    async def close(self):
-        self._close()
-
-    # Streams are async context managers
-
-    async def __aenter__(self):
-        return self
-
-    async def __aexit__(self, exc_type, exc_val, exc_tb):
-        await self.close()
-        async with self._wake_up:
-            self._wake_up.notify()
-        return False
-
-
-class TrioQuicConnection(AsyncQuicConnection):
-    def __init__(self, connection, address, port, source, source_port, manager=None):
-        super().__init__(connection, address, port, source, source_port, manager)
-        self._socket = trio.socket.socket(self._af, socket.SOCK_DGRAM, 0)
-        self._handshake_complete = trio.Event()
-        self._run_done = trio.Event()
-        self._worker_scope = None
-        self._send_pending = False
-
-    async def _worker(self):
-        try:
-            if self._source:
-                await self._socket.bind(
-                    dns.inet.low_level_address_tuple(self._source, self._af)
-                )
-            await self._socket.connect(self._peer)
-            while not self._done:
-                (expiration, interval) = self._get_timer_values(False)
-                if self._send_pending:
-                    # Do not block forever if sends are pending.  Even though we
-                    # have a wake-up mechanism if we've already started the blocking
-                    # read, the possibility of context switching in send means that
-                    # more writes can happen while we have no wake up context, so
-                    # we need self._send_pending to avoid (effectively) a "lost wakeup"
-                    # race.
-                    interval = 0.0
-                with trio.CancelScope(
-                    deadline=trio.current_time() + interval
-                ) as self._worker_scope:
-                    datagram = await self._socket.recv(QUIC_MAX_DATAGRAM)
-                    self._connection.receive_datagram(datagram, self._peer, time.time())
-                self._worker_scope = None
-                self._handle_timer(expiration)
-                await self._handle_events()
-                # We clear this now, before sending anything, as sending can cause
-                # context switches that do more sends.  We want to know if that
-                # happens so we don't block a long time on the recv() above.
-                self._send_pending = False
-                datagrams = self._connection.datagrams_to_send(time.time())
-                for datagram, _ in datagrams:
-                    await self._socket.send(datagram)
-        finally:
-            self._done = True
-            self._socket.close()
-            self._handshake_complete.set()
-
-    async def _handle_events(self):
-        count = 0
-        while True:
-            event = self._connection.next_event()
-            if event is None:
-                return
-            if isinstance(event, aioquic.quic.events.StreamDataReceived):
-                if self.is_h3():
-                    h3_events = self._h3_conn.handle_event(event)
-                    for h3_event in h3_events:
-                        if isinstance(h3_event, aioquic.h3.events.HeadersReceived):
-                            stream = self._streams.get(event.stream_id)
-                            if stream:
-                                if stream._headers is None:
-                                    stream._headers = h3_event.headers
-                                elif stream._trailers is None:
-                                    stream._trailers = h3_event.headers
-                                if h3_event.stream_ended:
-                                    await stream._add_input(b"", True)
-                        elif isinstance(h3_event, aioquic.h3.events.DataReceived):
-                            stream = self._streams.get(event.stream_id)
-                            if stream:
-                                await stream._add_input(
-                                    h3_event.data, h3_event.stream_ended
-                                )
-                else:
-                    stream = self._streams.get(event.stream_id)
-                    if stream:
-                        await stream._add_input(event.data, event.end_stream)
-            elif isinstance(event, aioquic.quic.events.HandshakeCompleted):
-                self._handshake_complete.set()
-            elif isinstance(event, aioquic.quic.events.ConnectionTerminated):
-                self._done = True
-                self._socket.close()
-            elif isinstance(event, aioquic.quic.events.StreamReset):
-                stream = self._streams.get(event.stream_id)
-                if stream:
-                    await stream._add_input(b"", True)
-            count += 1
-            if count > 10:
-                # yield
-                count = 0
-                await trio.sleep(0)
-
-    async def write(self, stream, data, is_end=False):
-        self._connection.send_stream_data(stream, data, is_end)
-        self._send_pending = True
-        if self._worker_scope is not None:
-            self._worker_scope.cancel()
-
-    async def run(self):
-        if self._closed:
-            return
-        async with trio.open_nursery() as nursery:
-            nursery.start_soon(self._worker)
-        self._run_done.set()
-
-    async def make_stream(self, timeout=None):
-        if timeout is None:
-            context = NullContext(None)
-        else:
-            context = trio.move_on_after(timeout)
-        with context:
-            await self._handshake_complete.wait()
-            if self._done:
-                raise UnexpectedEOF
-            stream_id = self._connection.get_next_available_stream_id(False)
-            stream = TrioQuicStream(self, stream_id)
-            self._streams[stream_id] = stream
-            return stream
-        raise dns.exception.Timeout
-
-    async def close(self):
-        if not self._closed:
-            self._manager.closed(self._peer[0], self._peer[1])
-            self._closed = True
-            self._connection.close()
-            self._send_pending = True
-            if self._worker_scope is not None:
-                self._worker_scope.cancel()
-            await self._run_done.wait()
-
-
-class TrioQuicManager(AsyncQuicManager):
-    def __init__(
-        self,
-        nursery,
-        conf=None,
-        verify_mode=ssl.CERT_REQUIRED,
-        server_name=None,
-        h3=False,
-    ):
-        super().__init__(conf, verify_mode, TrioQuicConnection, server_name, h3)
-        self._nursery = nursery
-
-    def connect(
-        self, address, port=853, source=None, source_port=0, want_session_ticket=True
-    ):
-        (connection, start) = self._connect(
-            address, port, source, source_port, want_session_ticket
-        )
-        if start:
-            self._nursery.start_soon(connection.run)
-        return connection
-
-    async def __aenter__(self):
-        return self
-
-    async def __aexit__(self, exc_type, exc_val, exc_tb):
-        # Copy the iterator into a list as exiting things will mutate the connections
-        # table.
-        connections = list(self._connections.values())
-        for connection in connections:
-            await connection.close()
-        return False
diff --git a/lib/dns/rcode.py b/lib/dns/rcode.py
deleted file mode 100644
index 8e6386f8..00000000
--- a/lib/dns/rcode.py
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2001-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""DNS Result Codes."""
-
-from typing import Tuple
-
-import dns.enum
-import dns.exception
-
-
-class Rcode(dns.enum.IntEnum):
-    #: No error
-    NOERROR = 0
-    #: Format error
-    FORMERR = 1
-    #: Server failure
-    SERVFAIL = 2
-    #: Name does not exist ("Name Error" in RFC 1025 terminology).
-    NXDOMAIN = 3
-    #: Not implemented
-    NOTIMP = 4
-    #: Refused
-    REFUSED = 5
-    #: Name exists.
-    YXDOMAIN = 6
-    #: RRset exists.
-    YXRRSET = 7
-    #: RRset does not exist.
-    NXRRSET = 8
-    #: Not authoritative.
-    NOTAUTH = 9
-    #: Name not in zone.
-    NOTZONE = 10
-    #: DSO-TYPE Not Implemented
-    DSOTYPENI = 11
-    #: Bad EDNS version.
-    BADVERS = 16
-    #: TSIG Signature Failure
-    BADSIG = 16
-    #: Key not recognized.
-    BADKEY = 17
-    #: Signature out of time window.
-    BADTIME = 18
-    #: Bad TKEY Mode.
-    BADMODE = 19
-    #: Duplicate key name.
-    BADNAME = 20
-    #: Algorithm not supported.
-    BADALG = 21
-    #: Bad Truncation
-    BADTRUNC = 22
-    #: Bad/missing Server Cookie
-    BADCOOKIE = 23
-
-    @classmethod
-    def _maximum(cls):
-        return 4095
-
-    @classmethod
-    def _unknown_exception_class(cls):
-        return UnknownRcode
-
-
-class UnknownRcode(dns.exception.DNSException):
-    """A DNS rcode is unknown."""
-
-
-def from_text(text: str) -> Rcode:
-    """Convert text into an rcode.
-
-    *text*, a ``str``, the textual rcode or an integer in textual form.
-
-    Raises ``dns.rcode.UnknownRcode`` if the rcode mnemonic is unknown.
-
-    Returns a ``dns.rcode.Rcode``.
-    """
-
-    return Rcode.from_text(text)
-
-
-def from_flags(flags: int, ednsflags: int) -> Rcode:
-    """Return the rcode value encoded by flags and ednsflags.
-
-    *flags*, an ``int``, the DNS flags field.
-
-    *ednsflags*, an ``int``, the EDNS flags field.
-
-    Raises ``ValueError`` if rcode is < 0 or > 4095
-
-    Returns a ``dns.rcode.Rcode``.
-    """
-
-    value = (flags & 0x000F) | ((ednsflags >> 20) & 0xFF0)
-    return Rcode.make(value)
-
-
-def to_flags(value: Rcode) -> Tuple[int, int]:
-    """Return a (flags, ednsflags) tuple which encodes the rcode.
-
-    *value*, a ``dns.rcode.Rcode``, the rcode.
-
-    Raises ``ValueError`` if rcode is < 0 or > 4095.
-
-    Returns an ``(int, int)`` tuple.
-    """
-
-    if value < 0 or value > 4095:
-        raise ValueError("rcode must be >= 0 and <= 4095")
-    v = value & 0xF
-    ev = (value & 0xFF0) << 20
-    return (v, ev)
-
-
-def to_text(value: Rcode, tsig: bool = False) -> str:
-    """Convert rcode into text.
-
-    *value*, a ``dns.rcode.Rcode``, the rcode.
-
-    Raises ``ValueError`` if rcode is < 0 or > 4095.
-
-    Returns a ``str``.
-    """
-
-    if tsig and value == Rcode.BADVERS:
-        return "BADSIG"
-    return Rcode.to_text(value)
-
-
-### BEGIN generated Rcode constants
-
-NOERROR = Rcode.NOERROR
-FORMERR = Rcode.FORMERR
-SERVFAIL = Rcode.SERVFAIL
-NXDOMAIN = Rcode.NXDOMAIN
-NOTIMP = Rcode.NOTIMP
-REFUSED = Rcode.REFUSED
-YXDOMAIN = Rcode.YXDOMAIN
-YXRRSET = Rcode.YXRRSET
-NXRRSET = Rcode.NXRRSET
-NOTAUTH = Rcode.NOTAUTH
-NOTZONE = Rcode.NOTZONE
-DSOTYPENI = Rcode.DSOTYPENI
-BADVERS = Rcode.BADVERS
-BADSIG = Rcode.BADSIG
-BADKEY = Rcode.BADKEY
-BADTIME = Rcode.BADTIME
-BADMODE = Rcode.BADMODE
-BADNAME = Rcode.BADNAME
-BADALG = Rcode.BADALG
-BADTRUNC = Rcode.BADTRUNC
-BADCOOKIE = Rcode.BADCOOKIE
-
-### END generated Rcode constants
diff --git a/lib/dns/rdata.py b/lib/dns/rdata.py
deleted file mode 100644
index 8099c26a..00000000
--- a/lib/dns/rdata.py
+++ /dev/null
@@ -1,911 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2001-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""DNS rdata."""
-
-import base64
-import binascii
-import inspect
-import io
-import itertools
-import random
-from importlib import import_module
-from typing import Any, Dict, Optional, Tuple, Union
-
-import dns.exception
-import dns.immutable
-import dns.ipv4
-import dns.ipv6
-import dns.name
-import dns.rdataclass
-import dns.rdatatype
-import dns.tokenizer
-import dns.ttl
-import dns.wire
-
-_chunksize = 32
-
-# We currently allow comparisons for rdata with relative names for backwards
-# compatibility, but in the future we will not, as these kinds of comparisons
-# can lead to subtle bugs if code is not carefully written.
-#
-# This switch allows the future behavior to be turned on so code can be
-# tested with it.
-_allow_relative_comparisons = True
-
-
-class NoRelativeRdataOrdering(dns.exception.DNSException):
-    """An attempt was made to do an ordered comparison of one or more
-    rdata with relative names.  The only reliable way of sorting rdata
-    is to use non-relativized rdata.
-
-    """
-
-
-def _wordbreak(data, chunksize=_chunksize, separator=b" "):
-    """Break a binary string into chunks of chunksize characters separated by
-    a space.
-    """
-
-    if not chunksize:
-        return data.decode()
-    return separator.join(
-        [data[i : i + chunksize] for i in range(0, len(data), chunksize)]
-    ).decode()
-
-
-# pylint: disable=unused-argument
-
-
-def _hexify(data, chunksize=_chunksize, separator=b" ", **kw):
-    """Convert a binary string into its hex encoding, broken up into chunks
-    of chunksize characters separated by a separator.
-    """
-
-    return _wordbreak(binascii.hexlify(data), chunksize, separator)
-
-
-def _base64ify(data, chunksize=_chunksize, separator=b" ", **kw):
-    """Convert a binary string into its base64 encoding, broken up into chunks
-    of chunksize characters separated by a separator.
-    """
-
-    return _wordbreak(base64.b64encode(data), chunksize, separator)
-
-
-# pylint: enable=unused-argument
-
-__escaped = b'"\\'
-
-
-def _escapify(qstring):
-    """Escape the characters in a quoted string which need it."""
-
-    if isinstance(qstring, str):
-        qstring = qstring.encode()
-    if not isinstance(qstring, bytearray):
-        qstring = bytearray(qstring)
-
-    text = ""
-    for c in qstring:
-        if c in __escaped:
-            text += "\\" + chr(c)
-        elif c >= 0x20 and c < 0x7F:
-            text += chr(c)
-        else:
-            text += "\\%03d" % c
-    return text
-
-
-def _truncate_bitmap(what):
-    """Determine the index of greatest byte that isn't all zeros, and
-    return the bitmap that contains all the bytes less than that index.
-    """
-
-    for i in range(len(what) - 1, -1, -1):
-        if what[i] != 0:
-            return what[0 : i + 1]
-    return what[0:1]
-
-
-# So we don't have to edit all the rdata classes...
-_constify = dns.immutable.constify
-
-
-@dns.immutable.immutable
-class Rdata:
-    """Base class for all DNS rdata types."""
-
-    __slots__ = ["rdclass", "rdtype", "rdcomment"]
-
-    def __init__(self, rdclass, rdtype):
-        """Initialize an rdata.
-
-        *rdclass*, an ``int`` is the rdataclass of the Rdata.
-
-        *rdtype*, an ``int`` is the rdatatype of the Rdata.
-        """
-
-        self.rdclass = self._as_rdataclass(rdclass)
-        self.rdtype = self._as_rdatatype(rdtype)
-        self.rdcomment = None
-
-    def _get_all_slots(self):
-        return itertools.chain.from_iterable(
-            getattr(cls, "__slots__", []) for cls in self.__class__.__mro__
-        )
-
-    def __getstate__(self):
-        # We used to try to do a tuple of all slots here, but it
-        # doesn't work as self._all_slots isn't available at
-        # __setstate__() time.  Before that we tried to store a tuple
-        # of __slots__, but that didn't work as it didn't store the
-        # slots defined by ancestors.  This older way didn't fail
-        # outright, but ended up with partially broken objects, e.g.
-        # if you unpickled an A RR it wouldn't have rdclass and rdtype
-        # attributes, and would compare badly.
-        state = {}
-        for slot in self._get_all_slots():
-            state[slot] = getattr(self, slot)
-        return state
-
-    def __setstate__(self, state):
-        for slot, val in state.items():
-            object.__setattr__(self, slot, val)
-        if not hasattr(self, "rdcomment"):
-            # Pickled rdata from 2.0.x might not have a rdcomment, so add
-            # it if needed.
-            object.__setattr__(self, "rdcomment", None)
-
-    def covers(self) -> dns.rdatatype.RdataType:
-        """Return the type a Rdata covers.
-
-        DNS SIG/RRSIG rdatas apply to a specific type; this type is
-        returned by the covers() function.  If the rdata type is not
-        SIG or RRSIG, dns.rdatatype.NONE is returned.  This is useful when
-        creating rdatasets, allowing the rdataset to contain only RRSIGs
-        of a particular type, e.g. RRSIG(NS).
-
-        Returns a ``dns.rdatatype.RdataType``.
-        """
-
-        return dns.rdatatype.NONE
-
-    def extended_rdatatype(self) -> int:
-        """Return a 32-bit type value, the least significant 16 bits of
-        which are the ordinary DNS type, and the upper 16 bits of which are
-        the "covered" type, if any.
-
-        Returns an ``int``.
-        """
-
-        return self.covers() << 16 | self.rdtype
-
-    def to_text(
-        self,
-        origin: Optional[dns.name.Name] = None,
-        relativize: bool = True,
-        **kw: Dict[str, Any],
-    ) -> str:
-        """Convert an rdata to text format.
-
-        Returns a ``str``.
-        """
-
-        raise NotImplementedError  # pragma: no cover
-
-    def _to_wire(
-        self,
-        file: Optional[Any],
-        compress: Optional[dns.name.CompressType] = None,
-        origin: Optional[dns.name.Name] = None,
-        canonicalize: bool = False,
-    ) -> None:
-        raise NotImplementedError  # pragma: no cover
-
-    def to_wire(
-        self,
-        file: Optional[Any] = None,
-        compress: Optional[dns.name.CompressType] = None,
-        origin: Optional[dns.name.Name] = None,
-        canonicalize: bool = False,
-    ) -> Optional[bytes]:
-        """Convert an rdata to wire format.
-
-        Returns a ``bytes`` if no output file was specified, or ``None`` otherwise.
-        """
-
-        if file:
-            # We call _to_wire() and then return None explicitly instead of
-            # of just returning the None from _to_wire() as mypy's func-returns-value
-            # unhelpfully errors out with "error: "_to_wire" of "Rdata" does not return
-            # a value (it only ever returns None)"
-            self._to_wire(file, compress, origin, canonicalize)
-            return None
-        else:
-            f = io.BytesIO()
-            self._to_wire(f, compress, origin, canonicalize)
-            return f.getvalue()
-
-    def to_generic(
-        self, origin: Optional[dns.name.Name] = None
-    ) -> "dns.rdata.GenericRdata":
-        """Creates a dns.rdata.GenericRdata equivalent of this rdata.
-
-        Returns a ``dns.rdata.GenericRdata``.
-        """
-        return dns.rdata.GenericRdata(
-            self.rdclass, self.rdtype, self.to_wire(origin=origin)
-        )
-
-    def to_digestable(self, origin: Optional[dns.name.Name] = None) -> bytes:
-        """Convert rdata to a format suitable for digesting in hashes.  This
-        is also the DNSSEC canonical form.
-
-        Returns a ``bytes``.
-        """
-        wire = self.to_wire(origin=origin, canonicalize=True)
-        assert wire is not None  # for mypy
-        return wire
-
-    def __repr__(self):
-        covers = self.covers()
-        if covers == dns.rdatatype.NONE:
-            ctext = ""
-        else:
-            ctext = "(" + dns.rdatatype.to_text(covers) + ")"
-        return (
-            "<DNS "
-            + dns.rdataclass.to_text(self.rdclass)
-            + " "
-            + dns.rdatatype.to_text(self.rdtype)
-            + ctext
-            + " rdata: "
-            + str(self)
-            + ">"
-        )
-
-    def __str__(self):
-        return self.to_text()
-
-    def _cmp(self, other):
-        """Compare an rdata with another rdata of the same rdtype and
-        rdclass.
-
-        For rdata with only absolute names:
-            Return < 0 if self < other in the DNSSEC ordering, 0 if self
-            == other, and > 0 if self > other.
-        For rdata with at least one relative names:
-            The rdata sorts before any rdata with only absolute names.
-            When compared with another relative rdata, all names are
-            made absolute as if they were relative to the root, as the
-            proper origin is not available.  While this creates a stable
-            ordering, it is NOT guaranteed to be the DNSSEC ordering.
-            In the future, all ordering comparisons for rdata with
-            relative names will be disallowed.
-        """
-        try:
-            our = self.to_digestable()
-            our_relative = False
-        except dns.name.NeedAbsoluteNameOrOrigin:
-            if _allow_relative_comparisons:
-                our = self.to_digestable(dns.name.root)
-            our_relative = True
-        try:
-            their = other.to_digestable()
-            their_relative = False
-        except dns.name.NeedAbsoluteNameOrOrigin:
-            if _allow_relative_comparisons:
-                their = other.to_digestable(dns.name.root)
-            their_relative = True
-        if _allow_relative_comparisons:
-            if our_relative != their_relative:
-                # For the purpose of comparison, all rdata with at least one
-                # relative name is less than an rdata with only absolute names.
-                if our_relative:
-                    return -1
-                else:
-                    return 1
-        elif our_relative or their_relative:
-            raise NoRelativeRdataOrdering
-        if our == their:
-            return 0
-        elif our > their:
-            return 1
-        else:
-            return -1
-
-    def __eq__(self, other):
-        if not isinstance(other, Rdata):
-            return False
-        if self.rdclass != other.rdclass or self.rdtype != other.rdtype:
-            return False
-        our_relative = False
-        their_relative = False
-        try:
-            our = self.to_digestable()
-        except dns.name.NeedAbsoluteNameOrOrigin:
-            our = self.to_digestable(dns.name.root)
-            our_relative = True
-        try:
-            their = other.to_digestable()
-        except dns.name.NeedAbsoluteNameOrOrigin:
-            their = other.to_digestable(dns.name.root)
-            their_relative = True
-        if our_relative != their_relative:
-            return False
-        return our == their
-
-    def __ne__(self, other):
-        if not isinstance(other, Rdata):
-            return True
-        if self.rdclass != other.rdclass or self.rdtype != other.rdtype:
-            return True
-        return not self.__eq__(other)
-
-    def __lt__(self, other):
-        if (
-            not isinstance(other, Rdata)
-            or self.rdclass != other.rdclass
-            or self.rdtype != other.rdtype
-        ):
-            return NotImplemented
-        return self._cmp(other) < 0
-
-    def __le__(self, other):
-        if (
-            not isinstance(other, Rdata)
-            or self.rdclass != other.rdclass
-            or self.rdtype != other.rdtype
-        ):
-            return NotImplemented
-        return self._cmp(other) <= 0
-
-    def __ge__(self, other):
-        if (
-            not isinstance(other, Rdata)
-            or self.rdclass != other.rdclass
-            or self.rdtype != other.rdtype
-        ):
-            return NotImplemented
-        return self._cmp(other) >= 0
-
-    def __gt__(self, other):
-        if (
-            not isinstance(other, Rdata)
-            or self.rdclass != other.rdclass
-            or self.rdtype != other.rdtype
-        ):
-            return NotImplemented
-        return self._cmp(other) > 0
-
-    def __hash__(self):
-        return hash(self.to_digestable(dns.name.root))
-
-    @classmethod
-    def from_text(
-        cls,
-        rdclass: dns.rdataclass.RdataClass,
-        rdtype: dns.rdatatype.RdataType,
-        tok: dns.tokenizer.Tokenizer,
-        origin: Optional[dns.name.Name] = None,
-        relativize: bool = True,
-        relativize_to: Optional[dns.name.Name] = None,
-    ) -> "Rdata":
-        raise NotImplementedError  # pragma: no cover
-
-    @classmethod
-    def from_wire_parser(
-        cls,
-        rdclass: dns.rdataclass.RdataClass,
-        rdtype: dns.rdatatype.RdataType,
-        parser: dns.wire.Parser,
-        origin: Optional[dns.name.Name] = None,
-    ) -> "Rdata":
-        raise NotImplementedError  # pragma: no cover
-
-    def replace(self, **kwargs: Any) -> "Rdata":
-        """
-        Create a new Rdata instance based on the instance replace was
-        invoked on. It is possible to pass different parameters to
-        override the corresponding properties of the base Rdata.
-
-        Any field specific to the Rdata type can be replaced, but the
-        *rdtype* and *rdclass* fields cannot.
-
-        Returns an instance of the same Rdata subclass as *self*.
-        """
-
-        # Get the constructor parameters.
-        parameters = inspect.signature(self.__init__).parameters  # type: ignore
-
-        # Ensure that all of the arguments correspond to valid fields.
-        # Don't allow rdclass or rdtype to be changed, though.
-        for key in kwargs:
-            if key == "rdcomment":
-                continue
-            if key not in parameters:
-                raise AttributeError(
-                    f"'{self.__class__.__name__}' object has no attribute '{key}'"
-                )
-            if key in ("rdclass", "rdtype"):
-                raise AttributeError(
-                    f"Cannot overwrite '{self.__class__.__name__}' attribute '{key}'"
-                )
-
-        # Construct the parameter list.  For each field, use the value in
-        # kwargs if present, and the current value otherwise.
-        args = (kwargs.get(key, getattr(self, key)) for key in parameters)
-
-        # Create, validate, and return the new object.
-        rd = self.__class__(*args)
-        # The comment is not set in the constructor, so give it special
-        # handling.
-        rdcomment = kwargs.get("rdcomment", self.rdcomment)
-        if rdcomment is not None:
-            object.__setattr__(rd, "rdcomment", rdcomment)
-        return rd
-
-    # Type checking and conversion helpers.  These are class methods as
-    # they don't touch object state and may be useful to others.
-
-    @classmethod
-    def _as_rdataclass(cls, value):
-        return dns.rdataclass.RdataClass.make(value)
-
-    @classmethod
-    def _as_rdatatype(cls, value):
-        return dns.rdatatype.RdataType.make(value)
-
-    @classmethod
-    def _as_bytes(
-        cls,
-        value: Any,
-        encode: bool = False,
-        max_length: Optional[int] = None,
-        empty_ok: bool = True,
-    ) -> bytes:
-        if encode and isinstance(value, str):
-            bvalue = value.encode()
-        elif isinstance(value, bytearray):
-            bvalue = bytes(value)
-        elif isinstance(value, bytes):
-            bvalue = value
-        else:
-            raise ValueError("not bytes")
-        if max_length is not None and len(bvalue) > max_length:
-            raise ValueError("too long")
-        if not empty_ok and len(bvalue) == 0:
-            raise ValueError("empty bytes not allowed")
-        return bvalue
-
-    @classmethod
-    def _as_name(cls, value):
-        # Note that proper name conversion (e.g. with origin and IDNA
-        # awareness) is expected to be done via from_text.  This is just
-        # a simple thing for people invoking the constructor directly.
-        if isinstance(value, str):
-            return dns.name.from_text(value)
-        elif not isinstance(value, dns.name.Name):
-            raise ValueError("not a name")
-        return value
-
-    @classmethod
-    def _as_uint8(cls, value):
-        if not isinstance(value, int):
-            raise ValueError("not an integer")
-        if value < 0 or value > 255:
-            raise ValueError("not a uint8")
-        return value
-
-    @classmethod
-    def _as_uint16(cls, value):
-        if not isinstance(value, int):
-            raise ValueError("not an integer")
-        if value < 0 or value > 65535:
-            raise ValueError("not a uint16")
-        return value
-
-    @classmethod
-    def _as_uint32(cls, value):
-        if not isinstance(value, int):
-            raise ValueError("not an integer")
-        if value < 0 or value > 4294967295:
-            raise ValueError("not a uint32")
-        return value
-
-    @classmethod
-    def _as_uint48(cls, value):
-        if not isinstance(value, int):
-            raise ValueError("not an integer")
-        if value < 0 or value > 281474976710655:
-            raise ValueError("not a uint48")
-        return value
-
-    @classmethod
-    def _as_int(cls, value, low=None, high=None):
-        if not isinstance(value, int):
-            raise ValueError("not an integer")
-        if low is not None and value < low:
-            raise ValueError("value too small")
-        if high is not None and value > high:
-            raise ValueError("value too large")
-        return value
-
-    @classmethod
-    def _as_ipv4_address(cls, value):
-        if isinstance(value, str):
-            return dns.ipv4.canonicalize(value)
-        elif isinstance(value, bytes):
-            return dns.ipv4.inet_ntoa(value)
-        else:
-            raise ValueError("not an IPv4 address")
-
-    @classmethod
-    def _as_ipv6_address(cls, value):
-        if isinstance(value, str):
-            return dns.ipv6.canonicalize(value)
-        elif isinstance(value, bytes):
-            return dns.ipv6.inet_ntoa(value)
-        else:
-            raise ValueError("not an IPv6 address")
-
-    @classmethod
-    def _as_bool(cls, value):
-        if isinstance(value, bool):
-            return value
-        else:
-            raise ValueError("not a boolean")
-
-    @classmethod
-    def _as_ttl(cls, value):
-        if isinstance(value, int):
-            return cls._as_int(value, 0, dns.ttl.MAX_TTL)
-        elif isinstance(value, str):
-            return dns.ttl.from_text(value)
-        else:
-            raise ValueError("not a TTL")
-
-    @classmethod
-    def _as_tuple(cls, value, as_value):
-        try:
-            # For user convenience, if value is a singleton of the list
-            # element type, wrap it in a tuple.
-            return (as_value(value),)
-        except Exception:
-            # Otherwise, check each element of the iterable *value*
-            # against *as_value*.
-            return tuple(as_value(v) for v in value)
-
-    # Processing order
-
-    @classmethod
-    def _processing_order(cls, iterable):
-        items = list(iterable)
-        random.shuffle(items)
-        return items
-
-
-@dns.immutable.immutable
-class GenericRdata(Rdata):
-    """Generic Rdata Class
-
-    This class is used for rdata types for which we have no better
-    implementation.  It implements the DNS "unknown RRs" scheme.
-    """
-
-    __slots__ = ["data"]
-
-    def __init__(self, rdclass, rdtype, data):
-        super().__init__(rdclass, rdtype)
-        self.data = data
-
-    def to_text(
-        self,
-        origin: Optional[dns.name.Name] = None,
-        relativize: bool = True,
-        **kw: Dict[str, Any],
-    ) -> str:
-        return r"\# %d " % len(self.data) + _hexify(self.data, **kw)
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        token = tok.get()
-        if not token.is_identifier() or token.value != r"\#":
-            raise dns.exception.SyntaxError(r"generic rdata does not start with \#")
-        length = tok.get_int()
-        hex = tok.concatenate_remaining_identifiers(True).encode()
-        data = binascii.unhexlify(hex)
-        if len(data) != length:
-            raise dns.exception.SyntaxError("generic rdata hex data has wrong length")
-        return cls(rdclass, rdtype, data)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        file.write(self.data)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        return cls(rdclass, rdtype, parser.get_remaining())
-
-
-_rdata_classes: Dict[Tuple[dns.rdataclass.RdataClass, dns.rdatatype.RdataType], Any] = (
-    {}
-)
-_module_prefix = "dns.rdtypes"
-_dynamic_load_allowed = True
-
-
-def get_rdata_class(rdclass, rdtype, use_generic=True):
-    cls = _rdata_classes.get((rdclass, rdtype))
-    if not cls:
-        cls = _rdata_classes.get((dns.rdatatype.ANY, rdtype))
-        if not cls and _dynamic_load_allowed:
-            rdclass_text = dns.rdataclass.to_text(rdclass)
-            rdtype_text = dns.rdatatype.to_text(rdtype)
-            rdtype_text = rdtype_text.replace("-", "_")
-            try:
-                mod = import_module(
-                    ".".join([_module_prefix, rdclass_text, rdtype_text])
-                )
-                cls = getattr(mod, rdtype_text)
-                _rdata_classes[(rdclass, rdtype)] = cls
-            except ImportError:
-                try:
-                    mod = import_module(".".join([_module_prefix, "ANY", rdtype_text]))
-                    cls = getattr(mod, rdtype_text)
-                    _rdata_classes[(dns.rdataclass.ANY, rdtype)] = cls
-                    _rdata_classes[(rdclass, rdtype)] = cls
-                except ImportError:
-                    pass
-    if not cls and use_generic:
-        cls = GenericRdata
-        _rdata_classes[(rdclass, rdtype)] = cls
-    return cls
-
-
-def load_all_types(disable_dynamic_load=True):
-    """Load all rdata types for which dnspython has a non-generic implementation.
-
-    Normally dnspython loads DNS rdatatype implementations on demand, but in some
-    specialized cases loading all types at an application-controlled time is preferred.
-
-    If *disable_dynamic_load*, a ``bool``, is ``True`` then dnspython will not attempt
-    to use its dynamic loading mechanism if an unknown type is subsequently encountered,
-    and will simply use the ``GenericRdata`` class.
-    """
-    # Load class IN and ANY types.
-    for rdtype in dns.rdatatype.RdataType:
-        get_rdata_class(dns.rdataclass.IN, rdtype, False)
-    # Load the one non-ANY implementation we have in CH.  Everything
-    # else in CH is an ANY type, and we'll discover those on demand but won't
-    # have to import anything.
-    get_rdata_class(dns.rdataclass.CH, dns.rdatatype.A, False)
-    if disable_dynamic_load:
-        # Now disable dynamic loading so any subsequent unknown type immediately becomes
-        # GenericRdata without a load attempt.
-        global _dynamic_load_allowed
-        _dynamic_load_allowed = False
-
-
-def from_text(
-    rdclass: Union[dns.rdataclass.RdataClass, str],
-    rdtype: Union[dns.rdatatype.RdataType, str],
-    tok: Union[dns.tokenizer.Tokenizer, str],
-    origin: Optional[dns.name.Name] = None,
-    relativize: bool = True,
-    relativize_to: Optional[dns.name.Name] = None,
-    idna_codec: Optional[dns.name.IDNACodec] = None,
-) -> Rdata:
-    """Build an rdata object from text format.
-
-    This function attempts to dynamically load a class which
-    implements the specified rdata class and type.  If there is no
-    class-and-type-specific implementation, the GenericRdata class
-    is used.
-
-    Once a class is chosen, its from_text() class method is called
-    with the parameters to this function.
-
-    If *tok* is a ``str``, then a tokenizer is created and the string
-    is used as its input.
-
-    *rdclass*, a ``dns.rdataclass.RdataClass`` or ``str``, the rdataclass.
-
-    *rdtype*, a ``dns.rdatatype.RdataType`` or ``str``, the rdatatype.
-
-    *tok*, a ``dns.tokenizer.Tokenizer`` or a ``str``.
-
-    *origin*, a ``dns.name.Name`` (or ``None``), the
-    origin to use for relative names.
-
-    *relativize*, a ``bool``.  If true, name will be relativized.
-
-    *relativize_to*, a ``dns.name.Name`` (or ``None``), the origin to use
-    when relativizing names.  If not set, the *origin* value will be used.
-
-    *idna_codec*, a ``dns.name.IDNACodec``, specifies the IDNA
-    encoder/decoder to use if a tokenizer needs to be created.  If
-    ``None``, the default IDNA 2003 encoder/decoder is used.  If a
-    tokenizer is not created, then the codec associated with the tokenizer
-    is the one that is used.
-
-    Returns an instance of the chosen Rdata subclass.
-
-    """
-    if isinstance(tok, str):
-        tok = dns.tokenizer.Tokenizer(tok, idna_codec=idna_codec)
-    rdclass = dns.rdataclass.RdataClass.make(rdclass)
-    rdtype = dns.rdatatype.RdataType.make(rdtype)
-    cls = get_rdata_class(rdclass, rdtype)
-    with dns.exception.ExceptionWrapper(dns.exception.SyntaxError):
-        rdata = None
-        if cls != GenericRdata:
-            # peek at first token
-            token = tok.get()
-            tok.unget(token)
-            if token.is_identifier() and token.value == r"\#":
-                #
-                # Known type using the generic syntax.  Extract the
-                # wire form from the generic syntax, and then run
-                # from_wire on it.
-                #
-                grdata = GenericRdata.from_text(
-                    rdclass, rdtype, tok, origin, relativize, relativize_to
-                )
-                rdata = from_wire(
-                    rdclass, rdtype, grdata.data, 0, len(grdata.data), origin
-                )
-                #
-                # If this comparison isn't equal, then there must have been
-                # compressed names in the wire format, which is an error,
-                # there being no reasonable context to decompress with.
-                #
-                rwire = rdata.to_wire()
-                if rwire != grdata.data:
-                    raise dns.exception.SyntaxError(
-                        "compressed data in "
-                        "generic syntax form "
-                        "of known rdatatype"
-                    )
-        if rdata is None:
-            rdata = cls.from_text(
-                rdclass, rdtype, tok, origin, relativize, relativize_to
-            )
-        token = tok.get_eol_as_token()
-        if token.comment is not None:
-            object.__setattr__(rdata, "rdcomment", token.comment)
-        return rdata
-
-
-def from_wire_parser(
-    rdclass: Union[dns.rdataclass.RdataClass, str],
-    rdtype: Union[dns.rdatatype.RdataType, str],
-    parser: dns.wire.Parser,
-    origin: Optional[dns.name.Name] = None,
-) -> Rdata:
-    """Build an rdata object from wire format
-
-    This function attempts to dynamically load a class which
-    implements the specified rdata class and type.  If there is no
-    class-and-type-specific implementation, the GenericRdata class
-    is used.
-
-    Once a class is chosen, its from_wire() class method is called
-    with the parameters to this function.
-
-    *rdclass*, a ``dns.rdataclass.RdataClass`` or ``str``, the rdataclass.
-
-    *rdtype*, a ``dns.rdatatype.RdataType`` or ``str``, the rdatatype.
-
-    *parser*, a ``dns.wire.Parser``, the parser, which should be
-    restricted to the rdata length.
-
-    *origin*, a ``dns.name.Name`` (or ``None``).  If not ``None``,
-    then names will be relativized to this origin.
-
-    Returns an instance of the chosen Rdata subclass.
-    """
-
-    rdclass = dns.rdataclass.RdataClass.make(rdclass)
-    rdtype = dns.rdatatype.RdataType.make(rdtype)
-    cls = get_rdata_class(rdclass, rdtype)
-    with dns.exception.ExceptionWrapper(dns.exception.FormError):
-        return cls.from_wire_parser(rdclass, rdtype, parser, origin)
-
-
-def from_wire(
-    rdclass: Union[dns.rdataclass.RdataClass, str],
-    rdtype: Union[dns.rdatatype.RdataType, str],
-    wire: bytes,
-    current: int,
-    rdlen: int,
-    origin: Optional[dns.name.Name] = None,
-) -> Rdata:
-    """Build an rdata object from wire format
-
-    This function attempts to dynamically load a class which
-    implements the specified rdata class and type.  If there is no
-    class-and-type-specific implementation, the GenericRdata class
-    is used.
-
-    Once a class is chosen, its from_wire() class method is called
-    with the parameters to this function.
-
-    *rdclass*, an ``int``, the rdataclass.
-
-    *rdtype*, an ``int``, the rdatatype.
-
-    *wire*, a ``bytes``, the wire-format message.
-
-    *current*, an ``int``, the offset in wire of the beginning of
-    the rdata.
-
-    *rdlen*, an ``int``, the length of the wire-format rdata
-
-    *origin*, a ``dns.name.Name`` (or ``None``).  If not ``None``,
-    then names will be relativized to this origin.
-
-    Returns an instance of the chosen Rdata subclass.
-    """
-    parser = dns.wire.Parser(wire, current)
-    with parser.restrict_to(rdlen):
-        return from_wire_parser(rdclass, rdtype, parser, origin)
-
-
-class RdatatypeExists(dns.exception.DNSException):
-    """DNS rdatatype already exists."""
-
-    supp_kwargs = {"rdclass", "rdtype"}
-    fmt = (
-        "The rdata type with class {rdclass:d} and rdtype {rdtype:d} "
-        + "already exists."
-    )
-
-
-def register_type(
-    implementation: Any,
-    rdtype: int,
-    rdtype_text: str,
-    is_singleton: bool = False,
-    rdclass: dns.rdataclass.RdataClass = dns.rdataclass.IN,
-) -> None:
-    """Dynamically register a module to handle an rdatatype.
-
-    *implementation*, a module implementing the type in the usual dnspython
-    way.
-
-    *rdtype*, an ``int``, the rdatatype to register.
-
-    *rdtype_text*, a ``str``, the textual form of the rdatatype.
-
-    *is_singleton*, a ``bool``, indicating if the type is a singleton (i.e.
-    RRsets of the type can have only one member.)
-
-    *rdclass*, the rdataclass of the type, or ``dns.rdataclass.ANY`` if
-    it applies to all classes.
-    """
-
-    rdtype = dns.rdatatype.RdataType.make(rdtype)
-    existing_cls = get_rdata_class(rdclass, rdtype)
-    if existing_cls != GenericRdata or dns.rdatatype.is_metatype(rdtype):
-        raise RdatatypeExists(rdclass=rdclass, rdtype=rdtype)
-    _rdata_classes[(rdclass, rdtype)] = getattr(
-        implementation, rdtype_text.replace("-", "_")
-    )
-    dns.rdatatype.register_type(rdtype, rdtype_text, is_singleton)
diff --git a/lib/dns/rdataclass.py b/lib/dns/rdataclass.py
deleted file mode 100644
index 89b85a79..00000000
--- a/lib/dns/rdataclass.py
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2001-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""DNS Rdata Classes."""
-
-import dns.enum
-import dns.exception
-
-
-class RdataClass(dns.enum.IntEnum):
-    """DNS Rdata Class"""
-
-    RESERVED0 = 0
-    IN = 1
-    INTERNET = IN
-    CH = 3
-    CHAOS = CH
-    HS = 4
-    HESIOD = HS
-    NONE = 254
-    ANY = 255
-
-    @classmethod
-    def _maximum(cls):
-        return 65535
-
-    @classmethod
-    def _short_name(cls):
-        return "class"
-
-    @classmethod
-    def _prefix(cls):
-        return "CLASS"
-
-    @classmethod
-    def _unknown_exception_class(cls):
-        return UnknownRdataclass
-
-
-_metaclasses = {RdataClass.NONE, RdataClass.ANY}
-
-
-class UnknownRdataclass(dns.exception.DNSException):
-    """A DNS class is unknown."""
-
-
-def from_text(text: str) -> RdataClass:
-    """Convert text into a DNS rdata class value.
-
-    The input text can be a defined DNS RR class mnemonic or
-    instance of the DNS generic class syntax.
-
-    For example, "IN" and "CLASS1" will both result in a value of 1.
-
-    Raises ``dns.rdatatype.UnknownRdataclass`` if the class is unknown.
-
-    Raises ``ValueError`` if the rdata class value is not >= 0 and <= 65535.
-
-    Returns a ``dns.rdataclass.RdataClass``.
-    """
-
-    return RdataClass.from_text(text)
-
-
-def to_text(value: RdataClass) -> str:
-    """Convert a DNS rdata class value to text.
-
-    If the value has a known mnemonic, it will be used, otherwise the
-    DNS generic class syntax will be used.
-
-    Raises ``ValueError`` if the rdata class value is not >= 0 and <= 65535.
-
-    Returns a ``str``.
-    """
-
-    return RdataClass.to_text(value)
-
-
-def is_metaclass(rdclass: RdataClass) -> bool:
-    """True if the specified class is a metaclass.
-
-    The currently defined metaclasses are ANY and NONE.
-
-    *rdclass* is a ``dns.rdataclass.RdataClass``.
-    """
-
-    if rdclass in _metaclasses:
-        return True
-    return False
-
-
-### BEGIN generated RdataClass constants
-
-RESERVED0 = RdataClass.RESERVED0
-IN = RdataClass.IN
-INTERNET = RdataClass.INTERNET
-CH = RdataClass.CH
-CHAOS = RdataClass.CHAOS
-HS = RdataClass.HS
-HESIOD = RdataClass.HESIOD
-NONE = RdataClass.NONE
-ANY = RdataClass.ANY
-
-### END generated RdataClass constants
diff --git a/lib/dns/rdataset.py b/lib/dns/rdataset.py
deleted file mode 100644
index 39cab236..00000000
--- a/lib/dns/rdataset.py
+++ /dev/null
@@ -1,512 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2001-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""DNS rdatasets (an rdataset is a set of rdatas of a given type and class)"""
-
-import io
-import random
-import struct
-from typing import Any, Collection, Dict, List, Optional, Union, cast
-
-import dns.exception
-import dns.immutable
-import dns.name
-import dns.rdata
-import dns.rdataclass
-import dns.rdatatype
-import dns.renderer
-import dns.set
-import dns.ttl
-
-# define SimpleSet here for backwards compatibility
-SimpleSet = dns.set.Set
-
-
-class DifferingCovers(dns.exception.DNSException):
-    """An attempt was made to add a DNS SIG/RRSIG whose covered type
-    is not the same as that of the other rdatas in the rdataset."""
-
-
-class IncompatibleTypes(dns.exception.DNSException):
-    """An attempt was made to add DNS RR data of an incompatible type."""
-
-
-class Rdataset(dns.set.Set):
-    """A DNS rdataset."""
-
-    __slots__ = ["rdclass", "rdtype", "covers", "ttl"]
-
-    def __init__(
-        self,
-        rdclass: dns.rdataclass.RdataClass,
-        rdtype: dns.rdatatype.RdataType,
-        covers: dns.rdatatype.RdataType = dns.rdatatype.NONE,
-        ttl: int = 0,
-    ):
-        """Create a new rdataset of the specified class and type.
-
-        *rdclass*, a ``dns.rdataclass.RdataClass``, the rdataclass.
-
-        *rdtype*, an ``dns.rdatatype.RdataType``, the rdatatype.
-
-        *covers*, an ``dns.rdatatype.RdataType``, the covered rdatatype.
-
-        *ttl*, an ``int``, the TTL.
-        """
-
-        super().__init__()
-        self.rdclass = rdclass
-        self.rdtype: dns.rdatatype.RdataType = rdtype
-        self.covers: dns.rdatatype.RdataType = covers
-        self.ttl = ttl
-
-    def _clone(self):
-        obj = super()._clone()
-        obj.rdclass = self.rdclass
-        obj.rdtype = self.rdtype
-        obj.covers = self.covers
-        obj.ttl = self.ttl
-        return obj
-
-    def update_ttl(self, ttl: int) -> None:
-        """Perform TTL minimization.
-
-        Set the TTL of the rdataset to be the lesser of the set's current
-        TTL or the specified TTL.  If the set contains no rdatas, set the TTL
-        to the specified TTL.
-
-        *ttl*, an ``int`` or ``str``.
-        """
-        ttl = dns.ttl.make(ttl)
-        if len(self) == 0:
-            self.ttl = ttl
-        elif ttl < self.ttl:
-            self.ttl = ttl
-
-    def add(  # pylint: disable=arguments-differ,arguments-renamed
-        self, rd: dns.rdata.Rdata, ttl: Optional[int] = None
-    ) -> None:
-        """Add the specified rdata to the rdataset.
-
-        If the optional *ttl* parameter is supplied, then
-        ``self.update_ttl(ttl)`` will be called prior to adding the rdata.
-
-        *rd*, a ``dns.rdata.Rdata``, the rdata
-
-        *ttl*, an ``int``, the TTL.
-
-        Raises ``dns.rdataset.IncompatibleTypes`` if the type and class
-        do not match the type and class of the rdataset.
-
-        Raises ``dns.rdataset.DifferingCovers`` if the type is a signature
-        type and the covered type does not match that of the rdataset.
-        """
-
-        #
-        # If we're adding a signature, do some special handling to
-        # check that the signature covers the same type as the
-        # other rdatas in this rdataset.  If this is the first rdata
-        # in the set, initialize the covers field.
-        #
-        if self.rdclass != rd.rdclass or self.rdtype != rd.rdtype:
-            raise IncompatibleTypes
-        if ttl is not None:
-            self.update_ttl(ttl)
-        if self.rdtype == dns.rdatatype.RRSIG or self.rdtype == dns.rdatatype.SIG:
-            covers = rd.covers()
-            if len(self) == 0 and self.covers == dns.rdatatype.NONE:
-                self.covers = covers
-            elif self.covers != covers:
-                raise DifferingCovers
-        if dns.rdatatype.is_singleton(rd.rdtype) and len(self) > 0:
-            self.clear()
-        super().add(rd)
-
-    def union_update(self, other):
-        self.update_ttl(other.ttl)
-        super().union_update(other)
-
-    def intersection_update(self, other):
-        self.update_ttl(other.ttl)
-        super().intersection_update(other)
-
-    def update(self, other):
-        """Add all rdatas in other to self.
-
-        *other*, a ``dns.rdataset.Rdataset``, the rdataset from which
-        to update.
-        """
-
-        self.update_ttl(other.ttl)
-        super().update(other)
-
-    def _rdata_repr(self):
-        def maybe_truncate(s):
-            if len(s) > 100:
-                return s[:100] + "..."
-            return s
-
-        return "[" + ", ".join(f"<{maybe_truncate(str(rr))}>" for rr in self) + "]"
-
-    def __repr__(self):
-        if self.covers == 0:
-            ctext = ""
-        else:
-            ctext = "(" + dns.rdatatype.to_text(self.covers) + ")"
-        return (
-            "<DNS "
-            + dns.rdataclass.to_text(self.rdclass)
-            + " "
-            + dns.rdatatype.to_text(self.rdtype)
-            + ctext
-            + " rdataset: "
-            + self._rdata_repr()
-            + ">"
-        )
-
-    def __str__(self):
-        return self.to_text()
-
-    def __eq__(self, other):
-        if not isinstance(other, Rdataset):
-            return False
-        if (
-            self.rdclass != other.rdclass
-            or self.rdtype != other.rdtype
-            or self.covers != other.covers
-        ):
-            return False
-        return super().__eq__(other)
-
-    def __ne__(self, other):
-        return not self.__eq__(other)
-
-    def to_text(
-        self,
-        name: Optional[dns.name.Name] = None,
-        origin: Optional[dns.name.Name] = None,
-        relativize: bool = True,
-        override_rdclass: Optional[dns.rdataclass.RdataClass] = None,
-        want_comments: bool = False,
-        **kw: Dict[str, Any],
-    ) -> str:
-        """Convert the rdataset into DNS zone file format.
-
-        See ``dns.name.Name.choose_relativity`` for more information
-        on how *origin* and *relativize* determine the way names
-        are emitted.
-
-        Any additional keyword arguments are passed on to the rdata
-        ``to_text()`` method.
-
-        *name*, a ``dns.name.Name``.  If name is not ``None``, emit RRs with
-        *name* as the owner name.
-
-        *origin*, a ``dns.name.Name`` or ``None``, the origin for relative
-        names.
-
-        *relativize*, a ``bool``.  If ``True``, names will be relativized
-        to *origin*.
-
-        *override_rdclass*, a ``dns.rdataclass.RdataClass`` or ``None``.
-        If not ``None``, use this class instead of the Rdataset's class.
-
-        *want_comments*, a ``bool``.  If ``True``, emit comments for rdata
-        which have them.  The default is ``False``.
-        """
-
-        if name is not None:
-            name = name.choose_relativity(origin, relativize)
-            ntext = str(name)
-            pad = " "
-        else:
-            ntext = ""
-            pad = ""
-        s = io.StringIO()
-        if override_rdclass is not None:
-            rdclass = override_rdclass
-        else:
-            rdclass = self.rdclass
-        if len(self) == 0:
-            #
-            # Empty rdatasets are used for the question section, and in
-            # some dynamic updates, so we don't need to print out the TTL
-            # (which is meaningless anyway).
-            #
-            s.write(
-                f"{ntext}{pad}{dns.rdataclass.to_text(rdclass)} "
-                f"{dns.rdatatype.to_text(self.rdtype)}\n"
-            )
-        else:
-            for rd in self:
-                extra = ""
-                if want_comments:
-                    if rd.rdcomment:
-                        extra = f" ;{rd.rdcomment}"
-                s.write(
-                    "%s%s%d %s %s %s%s\n"
-                    % (
-                        ntext,
-                        pad,
-                        self.ttl,
-                        dns.rdataclass.to_text(rdclass),
-                        dns.rdatatype.to_text(self.rdtype),
-                        rd.to_text(origin=origin, relativize=relativize, **kw),
-                        extra,
-                    )
-                )
-        #
-        # We strip off the final \n for the caller's convenience in printing
-        #
-        return s.getvalue()[:-1]
-
-    def to_wire(
-        self,
-        name: dns.name.Name,
-        file: Any,
-        compress: Optional[dns.name.CompressType] = None,
-        origin: Optional[dns.name.Name] = None,
-        override_rdclass: Optional[dns.rdataclass.RdataClass] = None,
-        want_shuffle: bool = True,
-    ) -> int:
-        """Convert the rdataset to wire format.
-
-        *name*, a ``dns.name.Name`` is the owner name to use.
-
-        *file* is the file where the name is emitted (typically a
-        BytesIO file).
-
-        *compress*, a ``dict``, is the compression table to use.  If
-        ``None`` (the default), names will not be compressed.
-
-        *origin* is a ``dns.name.Name`` or ``None``.  If the name is
-        relative and origin is not ``None``, then *origin* will be appended
-        to it.
-
-        *override_rdclass*, an ``int``, is used as the class instead of the
-        class of the rdataset.  This is useful when rendering rdatasets
-        associated with dynamic updates.
-
-        *want_shuffle*, a ``bool``.  If ``True``, then the order of the
-        Rdatas within the Rdataset will be shuffled before rendering.
-
-        Returns an ``int``, the number of records emitted.
-        """
-
-        if override_rdclass is not None:
-            rdclass = override_rdclass
-            want_shuffle = False
-        else:
-            rdclass = self.rdclass
-        if len(self) == 0:
-            name.to_wire(file, compress, origin)
-            file.write(struct.pack("!HHIH", self.rdtype, rdclass, 0, 0))
-            return 1
-        else:
-            l: Union[Rdataset, List[dns.rdata.Rdata]]
-            if want_shuffle:
-                l = list(self)
-                random.shuffle(l)
-            else:
-                l = self
-            for rd in l:
-                name.to_wire(file, compress, origin)
-                file.write(struct.pack("!HHI", self.rdtype, rdclass, self.ttl))
-                with dns.renderer.prefixed_length(file, 2):
-                    rd.to_wire(file, compress, origin)
-            return len(self)
-
-    def match(
-        self,
-        rdclass: dns.rdataclass.RdataClass,
-        rdtype: dns.rdatatype.RdataType,
-        covers: dns.rdatatype.RdataType,
-    ) -> bool:
-        """Returns ``True`` if this rdataset matches the specified class,
-        type, and covers.
-        """
-        if self.rdclass == rdclass and self.rdtype == rdtype and self.covers == covers:
-            return True
-        return False
-
-    def processing_order(self) -> List[dns.rdata.Rdata]:
-        """Return rdatas in a valid processing order according to the type's
-        specification.  For example, MX records are in preference order from
-        lowest to highest preferences, with items of the same preference
-        shuffled.
-
-        For types that do not define a processing order, the rdatas are
-        simply shuffled.
-        """
-        if len(self) == 0:
-            return []
-        else:
-            return self[0]._processing_order(iter(self))
-
-
-@dns.immutable.immutable
-class ImmutableRdataset(Rdataset):  # lgtm[py/missing-equals]
-    """An immutable DNS rdataset."""
-
-    _clone_class = Rdataset
-
-    def __init__(self, rdataset: Rdataset):
-        """Create an immutable rdataset from the specified rdataset."""
-
-        super().__init__(
-            rdataset.rdclass, rdataset.rdtype, rdataset.covers, rdataset.ttl
-        )
-        self.items = dns.immutable.Dict(rdataset.items)
-
-    def update_ttl(self, ttl):
-        raise TypeError("immutable")
-
-    def add(self, rd, ttl=None):
-        raise TypeError("immutable")
-
-    def union_update(self, other):
-        raise TypeError("immutable")
-
-    def intersection_update(self, other):
-        raise TypeError("immutable")
-
-    def update(self, other):
-        raise TypeError("immutable")
-
-    def __delitem__(self, i):
-        raise TypeError("immutable")
-
-    # lgtm complains about these not raising ArithmeticError, but there is
-    # precedent for overrides of these methods in other classes to raise
-    # TypeError, and it seems like the better exception.
-
-    def __ior__(self, other):  # lgtm[py/unexpected-raise-in-special-method]
-        raise TypeError("immutable")
-
-    def __iand__(self, other):  # lgtm[py/unexpected-raise-in-special-method]
-        raise TypeError("immutable")
-
-    def __iadd__(self, other):  # lgtm[py/unexpected-raise-in-special-method]
-        raise TypeError("immutable")
-
-    def __isub__(self, other):  # lgtm[py/unexpected-raise-in-special-method]
-        raise TypeError("immutable")
-
-    def clear(self):
-        raise TypeError("immutable")
-
-    def __copy__(self):
-        return ImmutableRdataset(super().copy())
-
-    def copy(self):
-        return ImmutableRdataset(super().copy())
-
-    def union(self, other):
-        return ImmutableRdataset(super().union(other))
-
-    def intersection(self, other):
-        return ImmutableRdataset(super().intersection(other))
-
-    def difference(self, other):
-        return ImmutableRdataset(super().difference(other))
-
-    def symmetric_difference(self, other):
-        return ImmutableRdataset(super().symmetric_difference(other))
-
-
-def from_text_list(
-    rdclass: Union[dns.rdataclass.RdataClass, str],
-    rdtype: Union[dns.rdatatype.RdataType, str],
-    ttl: int,
-    text_rdatas: Collection[str],
-    idna_codec: Optional[dns.name.IDNACodec] = None,
-    origin: Optional[dns.name.Name] = None,
-    relativize: bool = True,
-    relativize_to: Optional[dns.name.Name] = None,
-) -> Rdataset:
-    """Create an rdataset with the specified class, type, and TTL, and with
-    the specified list of rdatas in text format.
-
-    *idna_codec*, a ``dns.name.IDNACodec``, specifies the IDNA
-    encoder/decoder to use; if ``None``, the default IDNA 2003
-    encoder/decoder is used.
-
-    *origin*, a ``dns.name.Name`` (or ``None``), the
-    origin to use for relative names.
-
-    *relativize*, a ``bool``.  If true, name will be relativized.
-
-    *relativize_to*, a ``dns.name.Name`` (or ``None``), the origin to use
-    when relativizing names.  If not set, the *origin* value will be used.
-
-    Returns a ``dns.rdataset.Rdataset`` object.
-    """
-
-    rdclass = dns.rdataclass.RdataClass.make(rdclass)
-    rdtype = dns.rdatatype.RdataType.make(rdtype)
-    r = Rdataset(rdclass, rdtype)
-    r.update_ttl(ttl)
-    for t in text_rdatas:
-        rd = dns.rdata.from_text(
-            r.rdclass, r.rdtype, t, origin, relativize, relativize_to, idna_codec
-        )
-        r.add(rd)
-    return r
-
-
-def from_text(
-    rdclass: Union[dns.rdataclass.RdataClass, str],
-    rdtype: Union[dns.rdatatype.RdataType, str],
-    ttl: int,
-    *text_rdatas: Any,
-) -> Rdataset:
-    """Create an rdataset with the specified class, type, and TTL, and with
-    the specified rdatas in text format.
-
-    Returns a ``dns.rdataset.Rdataset`` object.
-    """
-
-    return from_text_list(rdclass, rdtype, ttl, cast(Collection[str], text_rdatas))
-
-
-def from_rdata_list(ttl: int, rdatas: Collection[dns.rdata.Rdata]) -> Rdataset:
-    """Create an rdataset with the specified TTL, and with
-    the specified list of rdata objects.
-
-    Returns a ``dns.rdataset.Rdataset`` object.
-    """
-
-    if len(rdatas) == 0:
-        raise ValueError("rdata list must not be empty")
-    r = None
-    for rd in rdatas:
-        if r is None:
-            r = Rdataset(rd.rdclass, rd.rdtype)
-            r.update_ttl(ttl)
-        r.add(rd)
-    assert r is not None
-    return r
-
-
-def from_rdata(ttl: int, *rdatas: Any) -> Rdataset:
-    """Create an rdataset with the specified TTL, and with
-    the specified rdata objects.
-
-    Returns a ``dns.rdataset.Rdataset`` object.
-    """
-
-    return from_rdata_list(ttl, cast(Collection[dns.rdata.Rdata], rdatas))
diff --git a/lib/dns/rdatatype.py b/lib/dns/rdatatype.py
deleted file mode 100644
index aa9e561c..00000000
--- a/lib/dns/rdatatype.py
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2001-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""DNS Rdata Types."""
-
-from typing import Dict
-
-import dns.enum
-import dns.exception
-
-
-class RdataType(dns.enum.IntEnum):
-    """DNS Rdata Type"""
-
-    TYPE0 = 0
-    NONE = 0
-    A = 1
-    NS = 2
-    MD = 3
-    MF = 4
-    CNAME = 5
-    SOA = 6
-    MB = 7
-    MG = 8
-    MR = 9
-    NULL = 10
-    WKS = 11
-    PTR = 12
-    HINFO = 13
-    MINFO = 14
-    MX = 15
-    TXT = 16
-    RP = 17
-    AFSDB = 18
-    X25 = 19
-    ISDN = 20
-    RT = 21
-    NSAP = 22
-    NSAP_PTR = 23
-    SIG = 24
-    KEY = 25
-    PX = 26
-    GPOS = 27
-    AAAA = 28
-    LOC = 29
-    NXT = 30
-    SRV = 33
-    NAPTR = 35
-    KX = 36
-    CERT = 37
-    A6 = 38
-    DNAME = 39
-    OPT = 41
-    APL = 42
-    DS = 43
-    SSHFP = 44
-    IPSECKEY = 45
-    RRSIG = 46
-    NSEC = 47
-    DNSKEY = 48
-    DHCID = 49
-    NSEC3 = 50
-    NSEC3PARAM = 51
-    TLSA = 52
-    SMIMEA = 53
-    HIP = 55
-    NINFO = 56
-    CDS = 59
-    CDNSKEY = 60
-    OPENPGPKEY = 61
-    CSYNC = 62
-    ZONEMD = 63
-    SVCB = 64
-    HTTPS = 65
-    SPF = 99
-    UNSPEC = 103
-    NID = 104
-    L32 = 105
-    L64 = 106
-    LP = 107
-    EUI48 = 108
-    EUI64 = 109
-    TKEY = 249
-    TSIG = 250
-    IXFR = 251
-    AXFR = 252
-    MAILB = 253
-    MAILA = 254
-    ANY = 255
-    URI = 256
-    CAA = 257
-    AVC = 258
-    AMTRELAY = 260
-    RESINFO = 261
-    WALLET = 262
-    TA = 32768
-    DLV = 32769
-
-    @classmethod
-    def _maximum(cls):
-        return 65535
-
-    @classmethod
-    def _short_name(cls):
-        return "type"
-
-    @classmethod
-    def _prefix(cls):
-        return "TYPE"
-
-    @classmethod
-    def _extra_from_text(cls, text):
-        if text.find("-") >= 0:
-            try:
-                return cls[text.replace("-", "_")]
-            except KeyError:  # pragma: no cover
-                pass
-        return _registered_by_text.get(text)
-
-    @classmethod
-    def _extra_to_text(cls, value, current_text):
-        if current_text is None:
-            return _registered_by_value.get(value)
-        if current_text.find("_") >= 0:
-            return current_text.replace("_", "-")
-        return current_text
-
-    @classmethod
-    def _unknown_exception_class(cls):
-        return UnknownRdatatype
-
-
-_registered_by_text: Dict[str, RdataType] = {}
-_registered_by_value: Dict[RdataType, str] = {}
-
-_metatypes = {RdataType.OPT}
-
-_singletons = {
-    RdataType.SOA,
-    RdataType.NXT,
-    RdataType.DNAME,
-    RdataType.NSEC,
-    RdataType.CNAME,
-}
-
-
-class UnknownRdatatype(dns.exception.DNSException):
-    """DNS resource record type is unknown."""
-
-
-def from_text(text: str) -> RdataType:
-    """Convert text into a DNS rdata type value.
-
-    The input text can be a defined DNS RR type mnemonic or
-    instance of the DNS generic type syntax.
-
-    For example, "NS" and "TYPE2" will both result in a value of 2.
-
-    Raises ``dns.rdatatype.UnknownRdatatype`` if the type is unknown.
-
-    Raises ``ValueError`` if the rdata type value is not >= 0 and <= 65535.
-
-    Returns a ``dns.rdatatype.RdataType``.
-    """
-
-    return RdataType.from_text(text)
-
-
-def to_text(value: RdataType) -> str:
-    """Convert a DNS rdata type value to text.
-
-    If the value has a known mnemonic, it will be used, otherwise the
-    DNS generic type syntax will be used.
-
-    Raises ``ValueError`` if the rdata type value is not >= 0 and <= 65535.
-
-    Returns a ``str``.
-    """
-
-    return RdataType.to_text(value)
-
-
-def is_metatype(rdtype: RdataType) -> bool:
-    """True if the specified type is a metatype.
-
-    *rdtype* is a ``dns.rdatatype.RdataType``.
-
-    The currently defined metatypes are TKEY, TSIG, IXFR, AXFR, MAILA,
-    MAILB, ANY, and OPT.
-
-    Returns a ``bool``.
-    """
-
-    return (256 > rdtype >= 128) or rdtype in _metatypes
-
-
-def is_singleton(rdtype: RdataType) -> bool:
-    """Is the specified type a singleton type?
-
-    Singleton types can only have a single rdata in an rdataset, or a single
-    RR in an RRset.
-
-    The currently defined singleton types are CNAME, DNAME, NSEC, NXT, and
-    SOA.
-
-    *rdtype* is an ``int``.
-
-    Returns a ``bool``.
-    """
-
-    if rdtype in _singletons:
-        return True
-    return False
-
-
-# pylint: disable=redefined-outer-name
-def register_type(
-    rdtype: RdataType, rdtype_text: str, is_singleton: bool = False
-) -> None:
-    """Dynamically register an rdatatype.
-
-    *rdtype*, a ``dns.rdatatype.RdataType``, the rdatatype to register.
-
-    *rdtype_text*, a ``str``, the textual form of the rdatatype.
-
-    *is_singleton*, a ``bool``, indicating if the type is a singleton (i.e.
-    RRsets of the type can have only one member.)
-    """
-
-    _registered_by_text[rdtype_text] = rdtype
-    _registered_by_value[rdtype] = rdtype_text
-    if is_singleton:
-        _singletons.add(rdtype)
-
-
-### BEGIN generated RdataType constants
-
-TYPE0 = RdataType.TYPE0
-NONE = RdataType.NONE
-A = RdataType.A
-NS = RdataType.NS
-MD = RdataType.MD
-MF = RdataType.MF
-CNAME = RdataType.CNAME
-SOA = RdataType.SOA
-MB = RdataType.MB
-MG = RdataType.MG
-MR = RdataType.MR
-NULL = RdataType.NULL
-WKS = RdataType.WKS
-PTR = RdataType.PTR
-HINFO = RdataType.HINFO
-MINFO = RdataType.MINFO
-MX = RdataType.MX
-TXT = RdataType.TXT
-RP = RdataType.RP
-AFSDB = RdataType.AFSDB
-X25 = RdataType.X25
-ISDN = RdataType.ISDN
-RT = RdataType.RT
-NSAP = RdataType.NSAP
-NSAP_PTR = RdataType.NSAP_PTR
-SIG = RdataType.SIG
-KEY = RdataType.KEY
-PX = RdataType.PX
-GPOS = RdataType.GPOS
-AAAA = RdataType.AAAA
-LOC = RdataType.LOC
-NXT = RdataType.NXT
-SRV = RdataType.SRV
-NAPTR = RdataType.NAPTR
-KX = RdataType.KX
-CERT = RdataType.CERT
-A6 = RdataType.A6
-DNAME = RdataType.DNAME
-OPT = RdataType.OPT
-APL = RdataType.APL
-DS = RdataType.DS
-SSHFP = RdataType.SSHFP
-IPSECKEY = RdataType.IPSECKEY
-RRSIG = RdataType.RRSIG
-NSEC = RdataType.NSEC
-DNSKEY = RdataType.DNSKEY
-DHCID = RdataType.DHCID
-NSEC3 = RdataType.NSEC3
-NSEC3PARAM = RdataType.NSEC3PARAM
-TLSA = RdataType.TLSA
-SMIMEA = RdataType.SMIMEA
-HIP = RdataType.HIP
-NINFO = RdataType.NINFO
-CDS = RdataType.CDS
-CDNSKEY = RdataType.CDNSKEY
-OPENPGPKEY = RdataType.OPENPGPKEY
-CSYNC = RdataType.CSYNC
-ZONEMD = RdataType.ZONEMD
-SVCB = RdataType.SVCB
-HTTPS = RdataType.HTTPS
-SPF = RdataType.SPF
-UNSPEC = RdataType.UNSPEC
-NID = RdataType.NID
-L32 = RdataType.L32
-L64 = RdataType.L64
-LP = RdataType.LP
-EUI48 = RdataType.EUI48
-EUI64 = RdataType.EUI64
-TKEY = RdataType.TKEY
-TSIG = RdataType.TSIG
-IXFR = RdataType.IXFR
-AXFR = RdataType.AXFR
-MAILB = RdataType.MAILB
-MAILA = RdataType.MAILA
-ANY = RdataType.ANY
-URI = RdataType.URI
-CAA = RdataType.CAA
-AVC = RdataType.AVC
-AMTRELAY = RdataType.AMTRELAY
-RESINFO = RdataType.RESINFO
-WALLET = RdataType.WALLET
-TA = RdataType.TA
-DLV = RdataType.DLV
-
-### END generated RdataType constants
diff --git a/lib/dns/rdtypes/ANY/AFSDB.py b/lib/dns/rdtypes/ANY/AFSDB.py
deleted file mode 100644
index 06a3b970..00000000
--- a/lib/dns/rdtypes/ANY/AFSDB.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.immutable
-import dns.rdtypes.mxbase
-
-
-@dns.immutable.immutable
-class AFSDB(dns.rdtypes.mxbase.UncompressedDowncasingMX):
-    """AFSDB record"""
-
-    # Use the property mechanism to make "subtype" an alias for the
-    # "preference" attribute, and "hostname" an alias for the "exchange"
-    # attribute.
-    #
-    # This lets us inherit the UncompressedMX implementation but lets
-    # the caller use appropriate attribute names for the rdata type.
-    #
-    # We probably lose some performance vs. a cut-and-paste
-    # implementation, but this way we don't copy code, and that's
-    # good.
-
-    @property
-    def subtype(self):
-        "the AFSDB subtype"
-        return self.preference
-
-    @property
-    def hostname(self):
-        "the AFSDB hostname"
-        return self.exchange
diff --git a/lib/dns/rdtypes/ANY/AMTRELAY.py b/lib/dns/rdtypes/ANY/AMTRELAY.py
deleted file mode 100644
index ed2b072b..00000000
--- a/lib/dns/rdtypes/ANY/AMTRELAY.py
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2006, 2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import struct
-
-import dns.exception
-import dns.immutable
-import dns.rdtypes.util
-
-
-class Relay(dns.rdtypes.util.Gateway):
-    name = "AMTRELAY relay"
-
-    @property
-    def relay(self):
-        return self.gateway
-
-
-@dns.immutable.immutable
-class AMTRELAY(dns.rdata.Rdata):
-    """AMTRELAY record"""
-
-    # see: RFC 8777
-
-    __slots__ = ["precedence", "discovery_optional", "relay_type", "relay"]
-
-    def __init__(
-        self, rdclass, rdtype, precedence, discovery_optional, relay_type, relay
-    ):
-        super().__init__(rdclass, rdtype)
-        relay = Relay(relay_type, relay)
-        self.precedence = self._as_uint8(precedence)
-        self.discovery_optional = self._as_bool(discovery_optional)
-        self.relay_type = relay.type
-        self.relay = relay.relay
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        relay = Relay(self.relay_type, self.relay).to_text(origin, relativize)
-        return "%d %d %d %s" % (
-            self.precedence,
-            self.discovery_optional,
-            self.relay_type,
-            relay,
-        )
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        precedence = tok.get_uint8()
-        discovery_optional = tok.get_uint8()
-        if discovery_optional > 1:
-            raise dns.exception.SyntaxError("expecting 0 or 1")
-        discovery_optional = bool(discovery_optional)
-        relay_type = tok.get_uint8()
-        if relay_type > 0x7F:
-            raise dns.exception.SyntaxError("expecting an integer <= 127")
-        relay = Relay.from_text(relay_type, tok, origin, relativize, relativize_to)
-        return cls(
-            rdclass, rdtype, precedence, discovery_optional, relay_type, relay.relay
-        )
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        relay_type = self.relay_type | (self.discovery_optional << 7)
-        header = struct.pack("!BB", self.precedence, relay_type)
-        file.write(header)
-        Relay(self.relay_type, self.relay).to_wire(file, compress, origin, canonicalize)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        (precedence, relay_type) = parser.get_struct("!BB")
-        discovery_optional = bool(relay_type >> 7)
-        relay_type &= 0x7F
-        relay = Relay.from_wire_parser(relay_type, parser, origin)
-        return cls(
-            rdclass, rdtype, precedence, discovery_optional, relay_type, relay.relay
-        )
diff --git a/lib/dns/rdtypes/ANY/AVC.py b/lib/dns/rdtypes/ANY/AVC.py
deleted file mode 100644
index a27ae2d6..00000000
--- a/lib/dns/rdtypes/ANY/AVC.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2016 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.immutable
-import dns.rdtypes.txtbase
-
-
-@dns.immutable.immutable
-class AVC(dns.rdtypes.txtbase.TXTBase):
-    """AVC record"""
-
-    # See: IANA dns parameters for AVC
diff --git a/lib/dns/rdtypes/ANY/CAA.py b/lib/dns/rdtypes/ANY/CAA.py
deleted file mode 100644
index 2e6a7e7e..00000000
--- a/lib/dns/rdtypes/ANY/CAA.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import struct
-
-import dns.exception
-import dns.immutable
-import dns.rdata
-import dns.tokenizer
-
-
-@dns.immutable.immutable
-class CAA(dns.rdata.Rdata):
-    """CAA (Certification Authority Authorization) record"""
-
-    # see: RFC 6844
-
-    __slots__ = ["flags", "tag", "value"]
-
-    def __init__(self, rdclass, rdtype, flags, tag, value):
-        super().__init__(rdclass, rdtype)
-        self.flags = self._as_uint8(flags)
-        self.tag = self._as_bytes(tag, True, 255)
-        if not tag.isalnum():
-            raise ValueError("tag is not alphanumeric")
-        self.value = self._as_bytes(value)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        return '%u %s "%s"' % (
-            self.flags,
-            dns.rdata._escapify(self.tag),
-            dns.rdata._escapify(self.value),
-        )
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        flags = tok.get_uint8()
-        tag = tok.get_string().encode()
-        value = tok.get_string().encode()
-        return cls(rdclass, rdtype, flags, tag, value)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        file.write(struct.pack("!B", self.flags))
-        l = len(self.tag)
-        assert l < 256
-        file.write(struct.pack("!B", l))
-        file.write(self.tag)
-        file.write(self.value)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        flags = parser.get_uint8()
-        tag = parser.get_counted_bytes()
-        value = parser.get_remaining()
-        return cls(rdclass, rdtype, flags, tag, value)
diff --git a/lib/dns/rdtypes/ANY/CDNSKEY.py b/lib/dns/rdtypes/ANY/CDNSKEY.py
deleted file mode 100644
index b613409f..00000000
--- a/lib/dns/rdtypes/ANY/CDNSKEY.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2004-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.immutable
-import dns.rdtypes.dnskeybase  # lgtm[py/import-and-import-from]
-
-# pylint: disable=unused-import
-from dns.rdtypes.dnskeybase import (  # noqa: F401  lgtm[py/unused-import]
-    REVOKE,
-    SEP,
-    ZONE,
-)
-
-# pylint: enable=unused-import
-
-
-@dns.immutable.immutable
-class CDNSKEY(dns.rdtypes.dnskeybase.DNSKEYBase):
-    """CDNSKEY record"""
diff --git a/lib/dns/rdtypes/ANY/CDS.py b/lib/dns/rdtypes/ANY/CDS.py
deleted file mode 100644
index 8312b972..00000000
--- a/lib/dns/rdtypes/ANY/CDS.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.immutable
-import dns.rdtypes.dsbase
-
-
-@dns.immutable.immutable
-class CDS(dns.rdtypes.dsbase.DSBase):
-    """CDS record"""
-
-    _digest_length_by_type = {
-        **dns.rdtypes.dsbase.DSBase._digest_length_by_type,
-        0: 1,  # delete, RFC 8078 Sec. 4 (including Errata ID 5049)
-    }
diff --git a/lib/dns/rdtypes/ANY/CERT.py b/lib/dns/rdtypes/ANY/CERT.py
deleted file mode 100644
index f369cc85..00000000
--- a/lib/dns/rdtypes/ANY/CERT.py
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import base64
-import struct
-
-import dns.dnssectypes
-import dns.exception
-import dns.immutable
-import dns.rdata
-import dns.tokenizer
-
-_ctype_by_value = {
-    1: "PKIX",
-    2: "SPKI",
-    3: "PGP",
-    4: "IPKIX",
-    5: "ISPKI",
-    6: "IPGP",
-    7: "ACPKIX",
-    8: "IACPKIX",
-    253: "URI",
-    254: "OID",
-}
-
-_ctype_by_name = {
-    "PKIX": 1,
-    "SPKI": 2,
-    "PGP": 3,
-    "IPKIX": 4,
-    "ISPKI": 5,
-    "IPGP": 6,
-    "ACPKIX": 7,
-    "IACPKIX": 8,
-    "URI": 253,
-    "OID": 254,
-}
-
-
-def _ctype_from_text(what):
-    v = _ctype_by_name.get(what)
-    if v is not None:
-        return v
-    return int(what)
-
-
-def _ctype_to_text(what):
-    v = _ctype_by_value.get(what)
-    if v is not None:
-        return v
-    return str(what)
-
-
-@dns.immutable.immutable
-class CERT(dns.rdata.Rdata):
-    """CERT record"""
-
-    # see RFC 4398
-
-    __slots__ = ["certificate_type", "key_tag", "algorithm", "certificate"]
-
-    def __init__(
-        self, rdclass, rdtype, certificate_type, key_tag, algorithm, certificate
-    ):
-        super().__init__(rdclass, rdtype)
-        self.certificate_type = self._as_uint16(certificate_type)
-        self.key_tag = self._as_uint16(key_tag)
-        self.algorithm = self._as_uint8(algorithm)
-        self.certificate = self._as_bytes(certificate)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        certificate_type = _ctype_to_text(self.certificate_type)
-        return "%s %d %s %s" % (
-            certificate_type,
-            self.key_tag,
-            dns.dnssectypes.Algorithm.to_text(self.algorithm),
-            dns.rdata._base64ify(self.certificate, **kw),
-        )
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        certificate_type = _ctype_from_text(tok.get_string())
-        key_tag = tok.get_uint16()
-        algorithm = dns.dnssectypes.Algorithm.from_text(tok.get_string())
-        b64 = tok.concatenate_remaining_identifiers().encode()
-        certificate = base64.b64decode(b64)
-        return cls(rdclass, rdtype, certificate_type, key_tag, algorithm, certificate)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        prefix = struct.pack(
-            "!HHB", self.certificate_type, self.key_tag, self.algorithm
-        )
-        file.write(prefix)
-        file.write(self.certificate)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        (certificate_type, key_tag, algorithm) = parser.get_struct("!HHB")
-        certificate = parser.get_remaining()
-        return cls(rdclass, rdtype, certificate_type, key_tag, algorithm, certificate)
diff --git a/lib/dns/rdtypes/ANY/CNAME.py b/lib/dns/rdtypes/ANY/CNAME.py
deleted file mode 100644
index 665e407c..00000000
--- a/lib/dns/rdtypes/ANY/CNAME.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.immutable
-import dns.rdtypes.nsbase
-
-
-@dns.immutable.immutable
-class CNAME(dns.rdtypes.nsbase.NSBase):
-    """CNAME record
-
-    Note: although CNAME is officially a singleton type, dnspython allows
-    non-singleton CNAME rdatasets because such sets have been commonly
-    used by BIND and other nameservers for load balancing."""
diff --git a/lib/dns/rdtypes/ANY/CSYNC.py b/lib/dns/rdtypes/ANY/CSYNC.py
deleted file mode 100644
index 2f972f6e..00000000
--- a/lib/dns/rdtypes/ANY/CSYNC.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2004-2007, 2009-2011, 2016 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import struct
-
-import dns.exception
-import dns.immutable
-import dns.name
-import dns.rdata
-import dns.rdatatype
-import dns.rdtypes.util
-
-
-@dns.immutable.immutable
-class Bitmap(dns.rdtypes.util.Bitmap):
-    type_name = "CSYNC"
-
-
-@dns.immutable.immutable
-class CSYNC(dns.rdata.Rdata):
-    """CSYNC record"""
-
-    __slots__ = ["serial", "flags", "windows"]
-
-    def __init__(self, rdclass, rdtype, serial, flags, windows):
-        super().__init__(rdclass, rdtype)
-        self.serial = self._as_uint32(serial)
-        self.flags = self._as_uint16(flags)
-        if not isinstance(windows, Bitmap):
-            windows = Bitmap(windows)
-        self.windows = tuple(windows.windows)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        text = Bitmap(self.windows).to_text()
-        return "%d %d%s" % (self.serial, self.flags, text)
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        serial = tok.get_uint32()
-        flags = tok.get_uint16()
-        bitmap = Bitmap.from_text(tok)
-        return cls(rdclass, rdtype, serial, flags, bitmap)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        file.write(struct.pack("!IH", self.serial, self.flags))
-        Bitmap(self.windows).to_wire(file)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        (serial, flags) = parser.get_struct("!IH")
-        bitmap = Bitmap.from_wire_parser(parser)
-        return cls(rdclass, rdtype, serial, flags, bitmap)
diff --git a/lib/dns/rdtypes/ANY/DLV.py b/lib/dns/rdtypes/ANY/DLV.py
deleted file mode 100644
index 6c134f18..00000000
--- a/lib/dns/rdtypes/ANY/DLV.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.immutable
-import dns.rdtypes.dsbase
-
-
-@dns.immutable.immutable
-class DLV(dns.rdtypes.dsbase.DSBase):
-    """DLV record"""
diff --git a/lib/dns/rdtypes/ANY/DNAME.py b/lib/dns/rdtypes/ANY/DNAME.py
deleted file mode 100644
index bbf9186c..00000000
--- a/lib/dns/rdtypes/ANY/DNAME.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.immutable
-import dns.rdtypes.nsbase
-
-
-@dns.immutable.immutable
-class DNAME(dns.rdtypes.nsbase.UncompressedNS):
-    """DNAME record"""
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        self.target.to_wire(file, None, origin, canonicalize)
diff --git a/lib/dns/rdtypes/ANY/DNSKEY.py b/lib/dns/rdtypes/ANY/DNSKEY.py
deleted file mode 100644
index 6d961a9f..00000000
--- a/lib/dns/rdtypes/ANY/DNSKEY.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2004-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.immutable
-import dns.rdtypes.dnskeybase  # lgtm[py/import-and-import-from]
-
-# pylint: disable=unused-import
-from dns.rdtypes.dnskeybase import (  # noqa: F401  lgtm[py/unused-import]
-    REVOKE,
-    SEP,
-    ZONE,
-)
-
-# pylint: enable=unused-import
-
-
-@dns.immutable.immutable
-class DNSKEY(dns.rdtypes.dnskeybase.DNSKEYBase):
-    """DNSKEY record"""
diff --git a/lib/dns/rdtypes/ANY/DS.py b/lib/dns/rdtypes/ANY/DS.py
deleted file mode 100644
index 58b3108d..00000000
--- a/lib/dns/rdtypes/ANY/DS.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.immutable
-import dns.rdtypes.dsbase
-
-
-@dns.immutable.immutable
-class DS(dns.rdtypes.dsbase.DSBase):
-    """DS record"""
diff --git a/lib/dns/rdtypes/ANY/EUI48.py b/lib/dns/rdtypes/ANY/EUI48.py
deleted file mode 100644
index c843be50..00000000
--- a/lib/dns/rdtypes/ANY/EUI48.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2015 Red Hat, Inc.
-# Author: Petr Spacek <pspacek@redhat.com>
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED 'AS IS' AND RED HAT DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.immutable
-import dns.rdtypes.euibase
-
-
-@dns.immutable.immutable
-class EUI48(dns.rdtypes.euibase.EUIBase):
-    """EUI48 record"""
-
-    # see: rfc7043.txt
-
-    byte_len = 6  # 0123456789ab (in hex)
-    text_len = byte_len * 3 - 1  # 01-23-45-67-89-ab
diff --git a/lib/dns/rdtypes/ANY/EUI64.py b/lib/dns/rdtypes/ANY/EUI64.py
deleted file mode 100644
index f6d7e257..00000000
--- a/lib/dns/rdtypes/ANY/EUI64.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2015 Red Hat, Inc.
-# Author: Petr Spacek <pspacek@redhat.com>
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED 'AS IS' AND RED HAT DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.immutable
-import dns.rdtypes.euibase
-
-
-@dns.immutable.immutable
-class EUI64(dns.rdtypes.euibase.EUIBase):
-    """EUI64 record"""
-
-    # see: rfc7043.txt
-
-    byte_len = 8  # 0123456789abcdef (in hex)
-    text_len = byte_len * 3 - 1  # 01-23-45-67-89-ab-cd-ef
diff --git a/lib/dns/rdtypes/ANY/GPOS.py b/lib/dns/rdtypes/ANY/GPOS.py
deleted file mode 100644
index d79f4a06..00000000
--- a/lib/dns/rdtypes/ANY/GPOS.py
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import struct
-
-import dns.exception
-import dns.immutable
-import dns.rdata
-import dns.tokenizer
-
-
-def _validate_float_string(what):
-    if len(what) == 0:
-        raise dns.exception.FormError
-    if what[0] == b"-"[0] or what[0] == b"+"[0]:
-        what = what[1:]
-    if what.isdigit():
-        return
-    try:
-        (left, right) = what.split(b".")
-    except ValueError:
-        raise dns.exception.FormError
-    if left == b"" and right == b"":
-        raise dns.exception.FormError
-    if not left == b"" and not left.decode().isdigit():
-        raise dns.exception.FormError
-    if not right == b"" and not right.decode().isdigit():
-        raise dns.exception.FormError
-
-
-@dns.immutable.immutable
-class GPOS(dns.rdata.Rdata):
-    """GPOS record"""
-
-    # see: RFC 1712
-
-    __slots__ = ["latitude", "longitude", "altitude"]
-
-    def __init__(self, rdclass, rdtype, latitude, longitude, altitude):
-        super().__init__(rdclass, rdtype)
-        if isinstance(latitude, float) or isinstance(latitude, int):
-            latitude = str(latitude)
-        if isinstance(longitude, float) or isinstance(longitude, int):
-            longitude = str(longitude)
-        if isinstance(altitude, float) or isinstance(altitude, int):
-            altitude = str(altitude)
-        latitude = self._as_bytes(latitude, True, 255)
-        longitude = self._as_bytes(longitude, True, 255)
-        altitude = self._as_bytes(altitude, True, 255)
-        _validate_float_string(latitude)
-        _validate_float_string(longitude)
-        _validate_float_string(altitude)
-        self.latitude = latitude
-        self.longitude = longitude
-        self.altitude = altitude
-        flat = self.float_latitude
-        if flat < -90.0 or flat > 90.0:
-            raise dns.exception.FormError("bad latitude")
-        flong = self.float_longitude
-        if flong < -180.0 or flong > 180.0:
-            raise dns.exception.FormError("bad longitude")
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        return (
-            f"{self.latitude.decode()} {self.longitude.decode()} "
-            f"{self.altitude.decode()}"
-        )
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        latitude = tok.get_string()
-        longitude = tok.get_string()
-        altitude = tok.get_string()
-        return cls(rdclass, rdtype, latitude, longitude, altitude)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        l = len(self.latitude)
-        assert l < 256
-        file.write(struct.pack("!B", l))
-        file.write(self.latitude)
-        l = len(self.longitude)
-        assert l < 256
-        file.write(struct.pack("!B", l))
-        file.write(self.longitude)
-        l = len(self.altitude)
-        assert l < 256
-        file.write(struct.pack("!B", l))
-        file.write(self.altitude)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        latitude = parser.get_counted_bytes()
-        longitude = parser.get_counted_bytes()
-        altitude = parser.get_counted_bytes()
-        return cls(rdclass, rdtype, latitude, longitude, altitude)
-
-    @property
-    def float_latitude(self):
-        "latitude as a floating point value"
-        return float(self.latitude)
-
-    @property
-    def float_longitude(self):
-        "longitude as a floating point value"
-        return float(self.longitude)
-
-    @property
-    def float_altitude(self):
-        "altitude as a floating point value"
-        return float(self.altitude)
diff --git a/lib/dns/rdtypes/ANY/HINFO.py b/lib/dns/rdtypes/ANY/HINFO.py
deleted file mode 100644
index 06ad3487..00000000
--- a/lib/dns/rdtypes/ANY/HINFO.py
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import struct
-
-import dns.exception
-import dns.immutable
-import dns.rdata
-import dns.tokenizer
-
-
-@dns.immutable.immutable
-class HINFO(dns.rdata.Rdata):
-    """HINFO record"""
-
-    # see: RFC 1035
-
-    __slots__ = ["cpu", "os"]
-
-    def __init__(self, rdclass, rdtype, cpu, os):
-        super().__init__(rdclass, rdtype)
-        self.cpu = self._as_bytes(cpu, True, 255)
-        self.os = self._as_bytes(os, True, 255)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        return f'"{dns.rdata._escapify(self.cpu)}" "{dns.rdata._escapify(self.os)}"'
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        cpu = tok.get_string(max_length=255)
-        os = tok.get_string(max_length=255)
-        return cls(rdclass, rdtype, cpu, os)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        l = len(self.cpu)
-        assert l < 256
-        file.write(struct.pack("!B", l))
-        file.write(self.cpu)
-        l = len(self.os)
-        assert l < 256
-        file.write(struct.pack("!B", l))
-        file.write(self.os)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        cpu = parser.get_counted_bytes()
-        os = parser.get_counted_bytes()
-        return cls(rdclass, rdtype, cpu, os)
diff --git a/lib/dns/rdtypes/ANY/HIP.py b/lib/dns/rdtypes/ANY/HIP.py
deleted file mode 100644
index f3157da7..00000000
--- a/lib/dns/rdtypes/ANY/HIP.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2010, 2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import base64
-import binascii
-import struct
-
-import dns.exception
-import dns.immutable
-import dns.rdata
-import dns.rdatatype
-
-
-@dns.immutable.immutable
-class HIP(dns.rdata.Rdata):
-    """HIP record"""
-
-    # see: RFC 5205
-
-    __slots__ = ["hit", "algorithm", "key", "servers"]
-
-    def __init__(self, rdclass, rdtype, hit, algorithm, key, servers):
-        super().__init__(rdclass, rdtype)
-        self.hit = self._as_bytes(hit, True, 255)
-        self.algorithm = self._as_uint8(algorithm)
-        self.key = self._as_bytes(key, True)
-        self.servers = self._as_tuple(servers, self._as_name)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        hit = binascii.hexlify(self.hit).decode()
-        key = base64.b64encode(self.key).replace(b"\n", b"").decode()
-        text = ""
-        servers = []
-        for server in self.servers:
-            servers.append(server.choose_relativity(origin, relativize))
-        if len(servers) > 0:
-            text += " " + " ".join(x.to_unicode() for x in servers)
-        return "%u %s %s%s" % (self.algorithm, hit, key, text)
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        algorithm = tok.get_uint8()
-        hit = binascii.unhexlify(tok.get_string().encode())
-        key = base64.b64decode(tok.get_string().encode())
-        servers = []
-        for token in tok.get_remaining():
-            server = tok.as_name(token, origin, relativize, relativize_to)
-            servers.append(server)
-        return cls(rdclass, rdtype, hit, algorithm, key, servers)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        lh = len(self.hit)
-        lk = len(self.key)
-        file.write(struct.pack("!BBH", lh, self.algorithm, lk))
-        file.write(self.hit)
-        file.write(self.key)
-        for server in self.servers:
-            server.to_wire(file, None, origin, False)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        (lh, algorithm, lk) = parser.get_struct("!BBH")
-        hit = parser.get_bytes(lh)
-        key = parser.get_bytes(lk)
-        servers = []
-        while parser.remaining() > 0:
-            server = parser.get_name(origin)
-            servers.append(server)
-        return cls(rdclass, rdtype, hit, algorithm, key, servers)
diff --git a/lib/dns/rdtypes/ANY/ISDN.py b/lib/dns/rdtypes/ANY/ISDN.py
deleted file mode 100644
index 6428a0a8..00000000
--- a/lib/dns/rdtypes/ANY/ISDN.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import struct
-
-import dns.exception
-import dns.immutable
-import dns.rdata
-import dns.tokenizer
-
-
-@dns.immutable.immutable
-class ISDN(dns.rdata.Rdata):
-    """ISDN record"""
-
-    # see: RFC 1183
-
-    __slots__ = ["address", "subaddress"]
-
-    def __init__(self, rdclass, rdtype, address, subaddress):
-        super().__init__(rdclass, rdtype)
-        self.address = self._as_bytes(address, True, 255)
-        self.subaddress = self._as_bytes(subaddress, True, 255)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        if self.subaddress:
-            return (
-                f'"{dns.rdata._escapify(self.address)}" '
-                f'"{dns.rdata._escapify(self.subaddress)}"'
-            )
-        else:
-            return f'"{dns.rdata._escapify(self.address)}"'
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        address = tok.get_string()
-        tokens = tok.get_remaining(max_tokens=1)
-        if len(tokens) >= 1:
-            subaddress = tokens[0].unescape().value
-        else:
-            subaddress = ""
-        return cls(rdclass, rdtype, address, subaddress)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        l = len(self.address)
-        assert l < 256
-        file.write(struct.pack("!B", l))
-        file.write(self.address)
-        l = len(self.subaddress)
-        if l > 0:
-            assert l < 256
-            file.write(struct.pack("!B", l))
-            file.write(self.subaddress)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        address = parser.get_counted_bytes()
-        if parser.remaining() > 0:
-            subaddress = parser.get_counted_bytes()
-        else:
-            subaddress = b""
-        return cls(rdclass, rdtype, address, subaddress)
diff --git a/lib/dns/rdtypes/ANY/L32.py b/lib/dns/rdtypes/ANY/L32.py
deleted file mode 100644
index 09804c2d..00000000
--- a/lib/dns/rdtypes/ANY/L32.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-import struct
-
-import dns.immutable
-import dns.rdata
-
-
-@dns.immutable.immutable
-class L32(dns.rdata.Rdata):
-    """L32 record"""
-
-    # see: rfc6742.txt
-
-    __slots__ = ["preference", "locator32"]
-
-    def __init__(self, rdclass, rdtype, preference, locator32):
-        super().__init__(rdclass, rdtype)
-        self.preference = self._as_uint16(preference)
-        self.locator32 = self._as_ipv4_address(locator32)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        return f"{self.preference} {self.locator32}"
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        preference = tok.get_uint16()
-        nodeid = tok.get_identifier()
-        return cls(rdclass, rdtype, preference, nodeid)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        file.write(struct.pack("!H", self.preference))
-        file.write(dns.ipv4.inet_aton(self.locator32))
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        preference = parser.get_uint16()
-        locator32 = parser.get_remaining()
-        return cls(rdclass, rdtype, preference, locator32)
diff --git a/lib/dns/rdtypes/ANY/L64.py b/lib/dns/rdtypes/ANY/L64.py
deleted file mode 100644
index fb76808e..00000000
--- a/lib/dns/rdtypes/ANY/L64.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-import struct
-
-import dns.immutable
-import dns.rdtypes.util
-
-
-@dns.immutable.immutable
-class L64(dns.rdata.Rdata):
-    """L64 record"""
-
-    # see: rfc6742.txt
-
-    __slots__ = ["preference", "locator64"]
-
-    def __init__(self, rdclass, rdtype, preference, locator64):
-        super().__init__(rdclass, rdtype)
-        self.preference = self._as_uint16(preference)
-        if isinstance(locator64, bytes):
-            if len(locator64) != 8:
-                raise ValueError("invalid locator64")
-            self.locator64 = dns.rdata._hexify(locator64, 4, b":")
-        else:
-            dns.rdtypes.util.parse_formatted_hex(locator64, 4, 4, ":")
-            self.locator64 = locator64
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        return f"{self.preference} {self.locator64}"
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        preference = tok.get_uint16()
-        locator64 = tok.get_identifier()
-        return cls(rdclass, rdtype, preference, locator64)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        file.write(struct.pack("!H", self.preference))
-        file.write(dns.rdtypes.util.parse_formatted_hex(self.locator64, 4, 4, ":"))
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        preference = parser.get_uint16()
-        locator64 = parser.get_remaining()
-        return cls(rdclass, rdtype, preference, locator64)
diff --git a/lib/dns/rdtypes/ANY/LOC.py b/lib/dns/rdtypes/ANY/LOC.py
deleted file mode 100644
index 1153cf03..00000000
--- a/lib/dns/rdtypes/ANY/LOC.py
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import struct
-
-import dns.exception
-import dns.immutable
-import dns.rdata
-
-_pows = tuple(10**i for i in range(0, 11))
-
-# default values are in centimeters
-_default_size = 100.0
-_default_hprec = 1000000.0
-_default_vprec = 1000.0
-
-# for use by from_wire()
-_MAX_LATITUDE = 0x80000000 + 90 * 3600000
-_MIN_LATITUDE = 0x80000000 - 90 * 3600000
-_MAX_LONGITUDE = 0x80000000 + 180 * 3600000
-_MIN_LONGITUDE = 0x80000000 - 180 * 3600000
-
-
-def _exponent_of(what, desc):
-    if what == 0:
-        return 0
-    exp = None
-    for i, pow in enumerate(_pows):
-        if what < pow:
-            exp = i - 1
-            break
-    if exp is None or exp < 0:
-        raise dns.exception.SyntaxError(f"{desc} value out of bounds")
-    return exp
-
-
-def _float_to_tuple(what):
-    if what < 0:
-        sign = -1
-        what *= -1
-    else:
-        sign = 1
-    what = round(what * 3600000)
-    degrees = int(what // 3600000)
-    what -= degrees * 3600000
-    minutes = int(what // 60000)
-    what -= minutes * 60000
-    seconds = int(what // 1000)
-    what -= int(seconds * 1000)
-    what = int(what)
-    return (degrees, minutes, seconds, what, sign)
-
-
-def _tuple_to_float(what):
-    value = float(what[0])
-    value += float(what[1]) / 60.0
-    value += float(what[2]) / 3600.0
-    value += float(what[3]) / 3600000.0
-    return float(what[4]) * value
-
-
-def _encode_size(what, desc):
-    what = int(what)
-    exponent = _exponent_of(what, desc) & 0xF
-    base = what // pow(10, exponent) & 0xF
-    return base * 16 + exponent
-
-
-def _decode_size(what, desc):
-    exponent = what & 0x0F
-    if exponent > 9:
-        raise dns.exception.FormError(f"bad {desc} exponent")
-    base = (what & 0xF0) >> 4
-    if base > 9:
-        raise dns.exception.FormError(f"bad {desc} base")
-    return base * pow(10, exponent)
-
-
-def _check_coordinate_list(value, low, high):
-    if value[0] < low or value[0] > high:
-        raise ValueError(f"not in range [{low}, {high}]")
-    if value[1] < 0 or value[1] > 59:
-        raise ValueError("bad minutes value")
-    if value[2] < 0 or value[2] > 59:
-        raise ValueError("bad seconds value")
-    if value[3] < 0 or value[3] > 999:
-        raise ValueError("bad milliseconds value")
-    if value[4] != 1 and value[4] != -1:
-        raise ValueError("bad hemisphere value")
-
-
-@dns.immutable.immutable
-class LOC(dns.rdata.Rdata):
-    """LOC record"""
-
-    # see: RFC 1876
-
-    __slots__ = [
-        "latitude",
-        "longitude",
-        "altitude",
-        "size",
-        "horizontal_precision",
-        "vertical_precision",
-    ]
-
-    def __init__(
-        self,
-        rdclass,
-        rdtype,
-        latitude,
-        longitude,
-        altitude,
-        size=_default_size,
-        hprec=_default_hprec,
-        vprec=_default_vprec,
-    ):
-        """Initialize a LOC record instance.
-
-        The parameters I{latitude} and I{longitude} may be either a 4-tuple
-        of integers specifying (degrees, minutes, seconds, milliseconds),
-        or they may be floating point values specifying the number of
-        degrees. The other parameters are floats. Size, horizontal precision,
-        and vertical precision are specified in centimeters."""
-
-        super().__init__(rdclass, rdtype)
-        if isinstance(latitude, int):
-            latitude = float(latitude)
-        if isinstance(latitude, float):
-            latitude = _float_to_tuple(latitude)
-        _check_coordinate_list(latitude, -90, 90)
-        self.latitude = tuple(latitude)
-        if isinstance(longitude, int):
-            longitude = float(longitude)
-        if isinstance(longitude, float):
-            longitude = _float_to_tuple(longitude)
-        _check_coordinate_list(longitude, -180, 180)
-        self.longitude = tuple(longitude)
-        self.altitude = float(altitude)
-        self.size = float(size)
-        self.horizontal_precision = float(hprec)
-        self.vertical_precision = float(vprec)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        if self.latitude[4] > 0:
-            lat_hemisphere = "N"
-        else:
-            lat_hemisphere = "S"
-        if self.longitude[4] > 0:
-            long_hemisphere = "E"
-        else:
-            long_hemisphere = "W"
-        text = "%d %d %d.%03d %s %d %d %d.%03d %s %0.2fm" % (
-            self.latitude[0],
-            self.latitude[1],
-            self.latitude[2],
-            self.latitude[3],
-            lat_hemisphere,
-            self.longitude[0],
-            self.longitude[1],
-            self.longitude[2],
-            self.longitude[3],
-            long_hemisphere,
-            self.altitude / 100.0,
-        )
-
-        # do not print default values
-        if (
-            self.size != _default_size
-            or self.horizontal_precision != _default_hprec
-            or self.vertical_precision != _default_vprec
-        ):
-            text += (
-                f" {self.size / 100.0:0.2f}m {self.horizontal_precision / 100.0:0.2f}m"
-                f" {self.vertical_precision / 100.0:0.2f}m"
-            )
-        return text
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        latitude = [0, 0, 0, 0, 1]
-        longitude = [0, 0, 0, 0, 1]
-        size = _default_size
-        hprec = _default_hprec
-        vprec = _default_vprec
-
-        latitude[0] = tok.get_int()
-        t = tok.get_string()
-        if t.isdigit():
-            latitude[1] = int(t)
-            t = tok.get_string()
-            if "." in t:
-                (seconds, milliseconds) = t.split(".")
-                if not seconds.isdigit():
-                    raise dns.exception.SyntaxError("bad latitude seconds value")
-                latitude[2] = int(seconds)
-                l = len(milliseconds)
-                if l == 0 or l > 3 or not milliseconds.isdigit():
-                    raise dns.exception.SyntaxError("bad latitude milliseconds value")
-                if l == 1:
-                    m = 100
-                elif l == 2:
-                    m = 10
-                else:
-                    m = 1
-                latitude[3] = m * int(milliseconds)
-                t = tok.get_string()
-            elif t.isdigit():
-                latitude[2] = int(t)
-                t = tok.get_string()
-        if t == "S":
-            latitude[4] = -1
-        elif t != "N":
-            raise dns.exception.SyntaxError("bad latitude hemisphere value")
-
-        longitude[0] = tok.get_int()
-        t = tok.get_string()
-        if t.isdigit():
-            longitude[1] = int(t)
-            t = tok.get_string()
-            if "." in t:
-                (seconds, milliseconds) = t.split(".")
-                if not seconds.isdigit():
-                    raise dns.exception.SyntaxError("bad longitude seconds value")
-                longitude[2] = int(seconds)
-                l = len(milliseconds)
-                if l == 0 or l > 3 or not milliseconds.isdigit():
-                    raise dns.exception.SyntaxError("bad longitude milliseconds value")
-                if l == 1:
-                    m = 100
-                elif l == 2:
-                    m = 10
-                else:
-                    m = 1
-                longitude[3] = m * int(milliseconds)
-                t = tok.get_string()
-            elif t.isdigit():
-                longitude[2] = int(t)
-                t = tok.get_string()
-        if t == "W":
-            longitude[4] = -1
-        elif t != "E":
-            raise dns.exception.SyntaxError("bad longitude hemisphere value")
-
-        t = tok.get_string()
-        if t[-1] == "m":
-            t = t[0:-1]
-        altitude = float(t) * 100.0  # m -> cm
-
-        tokens = tok.get_remaining(max_tokens=3)
-        if len(tokens) >= 1:
-            value = tokens[0].unescape().value
-            if value[-1] == "m":
-                value = value[0:-1]
-            size = float(value) * 100.0  # m -> cm
-            if len(tokens) >= 2:
-                value = tokens[1].unescape().value
-                if value[-1] == "m":
-                    value = value[0:-1]
-                hprec = float(value) * 100.0  # m -> cm
-                if len(tokens) >= 3:
-                    value = tokens[2].unescape().value
-                    if value[-1] == "m":
-                        value = value[0:-1]
-                    vprec = float(value) * 100.0  # m -> cm
-
-        # Try encoding these now so we raise if they are bad
-        _encode_size(size, "size")
-        _encode_size(hprec, "horizontal precision")
-        _encode_size(vprec, "vertical precision")
-
-        return cls(rdclass, rdtype, latitude, longitude, altitude, size, hprec, vprec)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        milliseconds = (
-            self.latitude[0] * 3600000
-            + self.latitude[1] * 60000
-            + self.latitude[2] * 1000
-            + self.latitude[3]
-        ) * self.latitude[4]
-        latitude = 0x80000000 + milliseconds
-        milliseconds = (
-            self.longitude[0] * 3600000
-            + self.longitude[1] * 60000
-            + self.longitude[2] * 1000
-            + self.longitude[3]
-        ) * self.longitude[4]
-        longitude = 0x80000000 + milliseconds
-        altitude = int(self.altitude) + 10000000
-        size = _encode_size(self.size, "size")
-        hprec = _encode_size(self.horizontal_precision, "horizontal precision")
-        vprec = _encode_size(self.vertical_precision, "vertical precision")
-        wire = struct.pack(
-            "!BBBBIII", 0, size, hprec, vprec, latitude, longitude, altitude
-        )
-        file.write(wire)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        (
-            version,
-            size,
-            hprec,
-            vprec,
-            latitude,
-            longitude,
-            altitude,
-        ) = parser.get_struct("!BBBBIII")
-        if version != 0:
-            raise dns.exception.FormError("LOC version not zero")
-        if latitude < _MIN_LATITUDE or latitude > _MAX_LATITUDE:
-            raise dns.exception.FormError("bad latitude")
-        if latitude > 0x80000000:
-            latitude = (latitude - 0x80000000) / 3600000
-        else:
-            latitude = -1 * (0x80000000 - latitude) / 3600000
-        if longitude < _MIN_LONGITUDE or longitude > _MAX_LONGITUDE:
-            raise dns.exception.FormError("bad longitude")
-        if longitude > 0x80000000:
-            longitude = (longitude - 0x80000000) / 3600000
-        else:
-            longitude = -1 * (0x80000000 - longitude) / 3600000
-        altitude = float(altitude) - 10000000.0
-        size = _decode_size(size, "size")
-        hprec = _decode_size(hprec, "horizontal precision")
-        vprec = _decode_size(vprec, "vertical precision")
-        return cls(rdclass, rdtype, latitude, longitude, altitude, size, hprec, vprec)
-
-    @property
-    def float_latitude(self):
-        "latitude as a floating point value"
-        return _tuple_to_float(self.latitude)
-
-    @property
-    def float_longitude(self):
-        "longitude as a floating point value"
-        return _tuple_to_float(self.longitude)
diff --git a/lib/dns/rdtypes/ANY/LP.py b/lib/dns/rdtypes/ANY/LP.py
deleted file mode 100644
index 312663f1..00000000
--- a/lib/dns/rdtypes/ANY/LP.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-import struct
-
-import dns.immutable
-import dns.rdata
-
-
-@dns.immutable.immutable
-class LP(dns.rdata.Rdata):
-    """LP record"""
-
-    # see: rfc6742.txt
-
-    __slots__ = ["preference", "fqdn"]
-
-    def __init__(self, rdclass, rdtype, preference, fqdn):
-        super().__init__(rdclass, rdtype)
-        self.preference = self._as_uint16(preference)
-        self.fqdn = self._as_name(fqdn)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        fqdn = self.fqdn.choose_relativity(origin, relativize)
-        return "%d %s" % (self.preference, fqdn)
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        preference = tok.get_uint16()
-        fqdn = tok.get_name(origin, relativize, relativize_to)
-        return cls(rdclass, rdtype, preference, fqdn)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        file.write(struct.pack("!H", self.preference))
-        self.fqdn.to_wire(file, compress, origin, canonicalize)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        preference = parser.get_uint16()
-        fqdn = parser.get_name(origin)
-        return cls(rdclass, rdtype, preference, fqdn)
diff --git a/lib/dns/rdtypes/ANY/MX.py b/lib/dns/rdtypes/ANY/MX.py
deleted file mode 100644
index 0c300c5a..00000000
--- a/lib/dns/rdtypes/ANY/MX.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.immutable
-import dns.rdtypes.mxbase
-
-
-@dns.immutable.immutable
-class MX(dns.rdtypes.mxbase.MXBase):
-    """MX record"""
diff --git a/lib/dns/rdtypes/ANY/NID.py b/lib/dns/rdtypes/ANY/NID.py
deleted file mode 100644
index 2f649178..00000000
--- a/lib/dns/rdtypes/ANY/NID.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-import struct
-
-import dns.immutable
-import dns.rdtypes.util
-
-
-@dns.immutable.immutable
-class NID(dns.rdata.Rdata):
-    """NID record"""
-
-    # see: rfc6742.txt
-
-    __slots__ = ["preference", "nodeid"]
-
-    def __init__(self, rdclass, rdtype, preference, nodeid):
-        super().__init__(rdclass, rdtype)
-        self.preference = self._as_uint16(preference)
-        if isinstance(nodeid, bytes):
-            if len(nodeid) != 8:
-                raise ValueError("invalid nodeid")
-            self.nodeid = dns.rdata._hexify(nodeid, 4, b":")
-        else:
-            dns.rdtypes.util.parse_formatted_hex(nodeid, 4, 4, ":")
-            self.nodeid = nodeid
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        return f"{self.preference} {self.nodeid}"
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        preference = tok.get_uint16()
-        nodeid = tok.get_identifier()
-        return cls(rdclass, rdtype, preference, nodeid)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        file.write(struct.pack("!H", self.preference))
-        file.write(dns.rdtypes.util.parse_formatted_hex(self.nodeid, 4, 4, ":"))
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        preference = parser.get_uint16()
-        nodeid = parser.get_remaining()
-        return cls(rdclass, rdtype, preference, nodeid)
diff --git a/lib/dns/rdtypes/ANY/NINFO.py b/lib/dns/rdtypes/ANY/NINFO.py
deleted file mode 100644
index b177bddb..00000000
--- a/lib/dns/rdtypes/ANY/NINFO.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2006, 2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.immutable
-import dns.rdtypes.txtbase
-
-
-@dns.immutable.immutable
-class NINFO(dns.rdtypes.txtbase.TXTBase):
-    """NINFO record"""
-
-    # see: draft-reid-dnsext-zs-01
diff --git a/lib/dns/rdtypes/ANY/NS.py b/lib/dns/rdtypes/ANY/NS.py
deleted file mode 100644
index c3f34ce9..00000000
--- a/lib/dns/rdtypes/ANY/NS.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.immutable
-import dns.rdtypes.nsbase
-
-
-@dns.immutable.immutable
-class NS(dns.rdtypes.nsbase.NSBase):
-    """NS record"""
diff --git a/lib/dns/rdtypes/ANY/NSEC.py b/lib/dns/rdtypes/ANY/NSEC.py
deleted file mode 100644
index 3c78b722..00000000
--- a/lib/dns/rdtypes/ANY/NSEC.py
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2004-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.exception
-import dns.immutable
-import dns.name
-import dns.rdata
-import dns.rdatatype
-import dns.rdtypes.util
-
-
-@dns.immutable.immutable
-class Bitmap(dns.rdtypes.util.Bitmap):
-    type_name = "NSEC"
-
-
-@dns.immutable.immutable
-class NSEC(dns.rdata.Rdata):
-    """NSEC record"""
-
-    __slots__ = ["next", "windows"]
-
-    def __init__(self, rdclass, rdtype, next, windows):
-        super().__init__(rdclass, rdtype)
-        self.next = self._as_name(next)
-        if not isinstance(windows, Bitmap):
-            windows = Bitmap(windows)
-        self.windows = tuple(windows.windows)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        next = self.next.choose_relativity(origin, relativize)
-        text = Bitmap(self.windows).to_text()
-        return f"{next}{text}"
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        next = tok.get_name(origin, relativize, relativize_to)
-        windows = Bitmap.from_text(tok)
-        return cls(rdclass, rdtype, next, windows)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        # Note that NSEC downcasing, originally mandated by RFC 4034
-        # section 6.2 was removed by RFC 6840 section 5.1.
-        self.next.to_wire(file, None, origin, False)
-        Bitmap(self.windows).to_wire(file)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        next = parser.get_name(origin)
-        bitmap = Bitmap.from_wire_parser(parser)
-        return cls(rdclass, rdtype, next, bitmap)
diff --git a/lib/dns/rdtypes/ANY/NSEC3.py b/lib/dns/rdtypes/ANY/NSEC3.py
deleted file mode 100644
index d71302b7..00000000
--- a/lib/dns/rdtypes/ANY/NSEC3.py
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2004-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import base64
-import binascii
-import struct
-
-import dns.exception
-import dns.immutable
-import dns.rdata
-import dns.rdatatype
-import dns.rdtypes.util
-
-b32_hex_to_normal = bytes.maketrans(
-    b"0123456789ABCDEFGHIJKLMNOPQRSTUV", b"ABCDEFGHIJKLMNOPQRSTUVWXYZ234567"
-)
-b32_normal_to_hex = bytes.maketrans(
-    b"ABCDEFGHIJKLMNOPQRSTUVWXYZ234567", b"0123456789ABCDEFGHIJKLMNOPQRSTUV"
-)
-
-# hash algorithm constants
-SHA1 = 1
-
-# flag constants
-OPTOUT = 1
-
-
-@dns.immutable.immutable
-class Bitmap(dns.rdtypes.util.Bitmap):
-    type_name = "NSEC3"
-
-
-@dns.immutable.immutable
-class NSEC3(dns.rdata.Rdata):
-    """NSEC3 record"""
-
-    __slots__ = ["algorithm", "flags", "iterations", "salt", "next", "windows"]
-
-    def __init__(
-        self, rdclass, rdtype, algorithm, flags, iterations, salt, next, windows
-    ):
-        super().__init__(rdclass, rdtype)
-        self.algorithm = self._as_uint8(algorithm)
-        self.flags = self._as_uint8(flags)
-        self.iterations = self._as_uint16(iterations)
-        self.salt = self._as_bytes(salt, True, 255)
-        self.next = self._as_bytes(next, True, 255)
-        if not isinstance(windows, Bitmap):
-            windows = Bitmap(windows)
-        self.windows = tuple(windows.windows)
-
-    def _next_text(self):
-        next = base64.b32encode(self.next).translate(b32_normal_to_hex).lower().decode()
-        next = next.rstrip("=")
-        return next
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        next = self._next_text()
-        if self.salt == b"":
-            salt = "-"
-        else:
-            salt = binascii.hexlify(self.salt).decode()
-        text = Bitmap(self.windows).to_text()
-        return "%u %u %u %s %s%s" % (
-            self.algorithm,
-            self.flags,
-            self.iterations,
-            salt,
-            next,
-            text,
-        )
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        algorithm = tok.get_uint8()
-        flags = tok.get_uint8()
-        iterations = tok.get_uint16()
-        salt = tok.get_string()
-        if salt == "-":
-            salt = b""
-        else:
-            salt = binascii.unhexlify(salt.encode("ascii"))
-        next = tok.get_string().encode("ascii").upper().translate(b32_hex_to_normal)
-        if next.endswith(b"="):
-            raise binascii.Error("Incorrect padding")
-        if len(next) % 8 != 0:
-            next += b"=" * (8 - len(next) % 8)
-        next = base64.b32decode(next)
-        bitmap = Bitmap.from_text(tok)
-        return cls(rdclass, rdtype, algorithm, flags, iterations, salt, next, bitmap)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        l = len(self.salt)
-        file.write(struct.pack("!BBHB", self.algorithm, self.flags, self.iterations, l))
-        file.write(self.salt)
-        l = len(self.next)
-        file.write(struct.pack("!B", l))
-        file.write(self.next)
-        Bitmap(self.windows).to_wire(file)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        (algorithm, flags, iterations) = parser.get_struct("!BBH")
-        salt = parser.get_counted_bytes()
-        next = parser.get_counted_bytes()
-        bitmap = Bitmap.from_wire_parser(parser)
-        return cls(rdclass, rdtype, algorithm, flags, iterations, salt, next, bitmap)
-
-    def next_name(self, origin=None):
-        return dns.name.from_text(self._next_text(), origin)
diff --git a/lib/dns/rdtypes/ANY/NSEC3PARAM.py b/lib/dns/rdtypes/ANY/NSEC3PARAM.py
deleted file mode 100644
index d1e62ebc..00000000
--- a/lib/dns/rdtypes/ANY/NSEC3PARAM.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2004-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import binascii
-import struct
-
-import dns.exception
-import dns.immutable
-import dns.rdata
-
-
-@dns.immutable.immutable
-class NSEC3PARAM(dns.rdata.Rdata):
-    """NSEC3PARAM record"""
-
-    __slots__ = ["algorithm", "flags", "iterations", "salt"]
-
-    def __init__(self, rdclass, rdtype, algorithm, flags, iterations, salt):
-        super().__init__(rdclass, rdtype)
-        self.algorithm = self._as_uint8(algorithm)
-        self.flags = self._as_uint8(flags)
-        self.iterations = self._as_uint16(iterations)
-        self.salt = self._as_bytes(salt, True, 255)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        if self.salt == b"":
-            salt = "-"
-        else:
-            salt = binascii.hexlify(self.salt).decode()
-        return "%u %u %u %s" % (self.algorithm, self.flags, self.iterations, salt)
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        algorithm = tok.get_uint8()
-        flags = tok.get_uint8()
-        iterations = tok.get_uint16()
-        salt = tok.get_string()
-        if salt == "-":
-            salt = ""
-        else:
-            salt = binascii.unhexlify(salt.encode())
-        return cls(rdclass, rdtype, algorithm, flags, iterations, salt)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        l = len(self.salt)
-        file.write(struct.pack("!BBHB", self.algorithm, self.flags, self.iterations, l))
-        file.write(self.salt)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        (algorithm, flags, iterations) = parser.get_struct("!BBH")
-        salt = parser.get_counted_bytes()
-        return cls(rdclass, rdtype, algorithm, flags, iterations, salt)
diff --git a/lib/dns/rdtypes/ANY/OPENPGPKEY.py b/lib/dns/rdtypes/ANY/OPENPGPKEY.py
deleted file mode 100644
index 4d7a4b6c..00000000
--- a/lib/dns/rdtypes/ANY/OPENPGPKEY.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2016 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import base64
-
-import dns.exception
-import dns.immutable
-import dns.rdata
-import dns.tokenizer
-
-
-@dns.immutable.immutable
-class OPENPGPKEY(dns.rdata.Rdata):
-    """OPENPGPKEY record"""
-
-    # see: RFC 7929
-
-    def __init__(self, rdclass, rdtype, key):
-        super().__init__(rdclass, rdtype)
-        self.key = self._as_bytes(key)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        return dns.rdata._base64ify(self.key, chunksize=None, **kw)
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        b64 = tok.concatenate_remaining_identifiers().encode()
-        key = base64.b64decode(b64)
-        return cls(rdclass, rdtype, key)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        file.write(self.key)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        key = parser.get_remaining()
-        return cls(rdclass, rdtype, key)
diff --git a/lib/dns/rdtypes/ANY/OPT.py b/lib/dns/rdtypes/ANY/OPT.py
deleted file mode 100644
index d343dfa5..00000000
--- a/lib/dns/rdtypes/ANY/OPT.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2001-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import struct
-
-import dns.edns
-import dns.exception
-import dns.immutable
-import dns.rdata
-
-# We don't implement from_text, and that's ok.
-# pylint: disable=abstract-method
-
-
-@dns.immutable.immutable
-class OPT(dns.rdata.Rdata):
-    """OPT record"""
-
-    __slots__ = ["options"]
-
-    def __init__(self, rdclass, rdtype, options):
-        """Initialize an OPT rdata.
-
-        *rdclass*, an ``int`` is the rdataclass of the Rdata,
-        which is also the payload size.
-
-        *rdtype*, an ``int`` is the rdatatype of the Rdata.
-
-        *options*, a tuple of ``bytes``
-        """
-
-        super().__init__(rdclass, rdtype)
-
-        def as_option(option):
-            if not isinstance(option, dns.edns.Option):
-                raise ValueError("option is not a dns.edns.option")
-            return option
-
-        self.options = self._as_tuple(options, as_option)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        for opt in self.options:
-            owire = opt.to_wire()
-            file.write(struct.pack("!HH", opt.otype, len(owire)))
-            file.write(owire)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        return " ".join(opt.to_text() for opt in self.options)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        options = []
-        while parser.remaining() > 0:
-            (otype, olen) = parser.get_struct("!HH")
-            with parser.restrict_to(olen):
-                opt = dns.edns.option_from_wire_parser(otype, parser)
-            options.append(opt)
-        return cls(rdclass, rdtype, options)
-
-    @property
-    def payload(self):
-        "payload size"
-        return self.rdclass
diff --git a/lib/dns/rdtypes/ANY/PTR.py b/lib/dns/rdtypes/ANY/PTR.py
deleted file mode 100644
index 98c36167..00000000
--- a/lib/dns/rdtypes/ANY/PTR.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.immutable
-import dns.rdtypes.nsbase
-
-
-@dns.immutable.immutable
-class PTR(dns.rdtypes.nsbase.NSBase):
-    """PTR record"""
diff --git a/lib/dns/rdtypes/ANY/RESINFO.py b/lib/dns/rdtypes/ANY/RESINFO.py
deleted file mode 100644
index 76c8ea2a..00000000
--- a/lib/dns/rdtypes/ANY/RESINFO.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.immutable
-import dns.rdtypes.txtbase
-
-
-@dns.immutable.immutable
-class RESINFO(dns.rdtypes.txtbase.TXTBase):
-    """RESINFO record"""
diff --git a/lib/dns/rdtypes/ANY/RP.py b/lib/dns/rdtypes/ANY/RP.py
deleted file mode 100644
index a66cfc50..00000000
--- a/lib/dns/rdtypes/ANY/RP.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.exception
-import dns.immutable
-import dns.name
-import dns.rdata
-
-
-@dns.immutable.immutable
-class RP(dns.rdata.Rdata):
-    """RP record"""
-
-    # see: RFC 1183
-
-    __slots__ = ["mbox", "txt"]
-
-    def __init__(self, rdclass, rdtype, mbox, txt):
-        super().__init__(rdclass, rdtype)
-        self.mbox = self._as_name(mbox)
-        self.txt = self._as_name(txt)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        mbox = self.mbox.choose_relativity(origin, relativize)
-        txt = self.txt.choose_relativity(origin, relativize)
-        return f"{str(mbox)} {str(txt)}"
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        mbox = tok.get_name(origin, relativize, relativize_to)
-        txt = tok.get_name(origin, relativize, relativize_to)
-        return cls(rdclass, rdtype, mbox, txt)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        self.mbox.to_wire(file, None, origin, canonicalize)
-        self.txt.to_wire(file, None, origin, canonicalize)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        mbox = parser.get_name(origin)
-        txt = parser.get_name(origin)
-        return cls(rdclass, rdtype, mbox, txt)
diff --git a/lib/dns/rdtypes/ANY/RRSIG.py b/lib/dns/rdtypes/ANY/RRSIG.py
deleted file mode 100644
index 8beb4237..00000000
--- a/lib/dns/rdtypes/ANY/RRSIG.py
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2004-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import base64
-import calendar
-import struct
-import time
-
-import dns.dnssectypes
-import dns.exception
-import dns.immutable
-import dns.rdata
-import dns.rdatatype
-
-
-class BadSigTime(dns.exception.DNSException):
-    """Time in DNS SIG or RRSIG resource record cannot be parsed."""
-
-
-def sigtime_to_posixtime(what):
-    if len(what) <= 10 and what.isdigit():
-        return int(what)
-    if len(what) != 14:
-        raise BadSigTime
-    year = int(what[0:4])
-    month = int(what[4:6])
-    day = int(what[6:8])
-    hour = int(what[8:10])
-    minute = int(what[10:12])
-    second = int(what[12:14])
-    return calendar.timegm((year, month, day, hour, minute, second, 0, 0, 0))
-
-
-def posixtime_to_sigtime(what):
-    return time.strftime("%Y%m%d%H%M%S", time.gmtime(what))
-
-
-@dns.immutable.immutable
-class RRSIG(dns.rdata.Rdata):
-    """RRSIG record"""
-
-    __slots__ = [
-        "type_covered",
-        "algorithm",
-        "labels",
-        "original_ttl",
-        "expiration",
-        "inception",
-        "key_tag",
-        "signer",
-        "signature",
-    ]
-
-    def __init__(
-        self,
-        rdclass,
-        rdtype,
-        type_covered,
-        algorithm,
-        labels,
-        original_ttl,
-        expiration,
-        inception,
-        key_tag,
-        signer,
-        signature,
-    ):
-        super().__init__(rdclass, rdtype)
-        self.type_covered = self._as_rdatatype(type_covered)
-        self.algorithm = dns.dnssectypes.Algorithm.make(algorithm)
-        self.labels = self._as_uint8(labels)
-        self.original_ttl = self._as_ttl(original_ttl)
-        self.expiration = self._as_uint32(expiration)
-        self.inception = self._as_uint32(inception)
-        self.key_tag = self._as_uint16(key_tag)
-        self.signer = self._as_name(signer)
-        self.signature = self._as_bytes(signature)
-
-    def covers(self):
-        return self.type_covered
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        return "%s %d %d %d %s %s %d %s %s" % (
-            dns.rdatatype.to_text(self.type_covered),
-            self.algorithm,
-            self.labels,
-            self.original_ttl,
-            posixtime_to_sigtime(self.expiration),
-            posixtime_to_sigtime(self.inception),
-            self.key_tag,
-            self.signer.choose_relativity(origin, relativize),
-            dns.rdata._base64ify(self.signature, **kw),
-        )
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        type_covered = dns.rdatatype.from_text(tok.get_string())
-        algorithm = dns.dnssectypes.Algorithm.from_text(tok.get_string())
-        labels = tok.get_int()
-        original_ttl = tok.get_ttl()
-        expiration = sigtime_to_posixtime(tok.get_string())
-        inception = sigtime_to_posixtime(tok.get_string())
-        key_tag = tok.get_int()
-        signer = tok.get_name(origin, relativize, relativize_to)
-        b64 = tok.concatenate_remaining_identifiers().encode()
-        signature = base64.b64decode(b64)
-        return cls(
-            rdclass,
-            rdtype,
-            type_covered,
-            algorithm,
-            labels,
-            original_ttl,
-            expiration,
-            inception,
-            key_tag,
-            signer,
-            signature,
-        )
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        header = struct.pack(
-            "!HBBIIIH",
-            self.type_covered,
-            self.algorithm,
-            self.labels,
-            self.original_ttl,
-            self.expiration,
-            self.inception,
-            self.key_tag,
-        )
-        file.write(header)
-        self.signer.to_wire(file, None, origin, canonicalize)
-        file.write(self.signature)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        header = parser.get_struct("!HBBIIIH")
-        signer = parser.get_name(origin)
-        signature = parser.get_remaining()
-        return cls(rdclass, rdtype, *header, signer, signature)
diff --git a/lib/dns/rdtypes/ANY/RT.py b/lib/dns/rdtypes/ANY/RT.py
deleted file mode 100644
index 5a4d45cf..00000000
--- a/lib/dns/rdtypes/ANY/RT.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.immutable
-import dns.rdtypes.mxbase
-
-
-@dns.immutable.immutable
-class RT(dns.rdtypes.mxbase.UncompressedDowncasingMX):
-    """RT record"""
diff --git a/lib/dns/rdtypes/ANY/SMIMEA.py b/lib/dns/rdtypes/ANY/SMIMEA.py
deleted file mode 100644
index 55d87bf8..00000000
--- a/lib/dns/rdtypes/ANY/SMIMEA.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-import dns.immutable
-import dns.rdtypes.tlsabase
-
-
-@dns.immutable.immutable
-class SMIMEA(dns.rdtypes.tlsabase.TLSABase):
-    """SMIMEA record"""
diff --git a/lib/dns/rdtypes/ANY/SOA.py b/lib/dns/rdtypes/ANY/SOA.py
deleted file mode 100644
index 09aa8321..00000000
--- a/lib/dns/rdtypes/ANY/SOA.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import struct
-
-import dns.exception
-import dns.immutable
-import dns.name
-import dns.rdata
-
-
-@dns.immutable.immutable
-class SOA(dns.rdata.Rdata):
-    """SOA record"""
-
-    # see: RFC 1035
-
-    __slots__ = ["mname", "rname", "serial", "refresh", "retry", "expire", "minimum"]
-
-    def __init__(
-        self, rdclass, rdtype, mname, rname, serial, refresh, retry, expire, minimum
-    ):
-        super().__init__(rdclass, rdtype)
-        self.mname = self._as_name(mname)
-        self.rname = self._as_name(rname)
-        self.serial = self._as_uint32(serial)
-        self.refresh = self._as_ttl(refresh)
-        self.retry = self._as_ttl(retry)
-        self.expire = self._as_ttl(expire)
-        self.minimum = self._as_ttl(minimum)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        mname = self.mname.choose_relativity(origin, relativize)
-        rname = self.rname.choose_relativity(origin, relativize)
-        return "%s %s %d %d %d %d %d" % (
-            mname,
-            rname,
-            self.serial,
-            self.refresh,
-            self.retry,
-            self.expire,
-            self.minimum,
-        )
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        mname = tok.get_name(origin, relativize, relativize_to)
-        rname = tok.get_name(origin, relativize, relativize_to)
-        serial = tok.get_uint32()
-        refresh = tok.get_ttl()
-        retry = tok.get_ttl()
-        expire = tok.get_ttl()
-        minimum = tok.get_ttl()
-        return cls(
-            rdclass, rdtype, mname, rname, serial, refresh, retry, expire, minimum
-        )
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        self.mname.to_wire(file, compress, origin, canonicalize)
-        self.rname.to_wire(file, compress, origin, canonicalize)
-        five_ints = struct.pack(
-            "!IIIII", self.serial, self.refresh, self.retry, self.expire, self.minimum
-        )
-        file.write(five_ints)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        mname = parser.get_name(origin)
-        rname = parser.get_name(origin)
-        return cls(rdclass, rdtype, mname, rname, *parser.get_struct("!IIIII"))
diff --git a/lib/dns/rdtypes/ANY/SPF.py b/lib/dns/rdtypes/ANY/SPF.py
deleted file mode 100644
index 1df3b705..00000000
--- a/lib/dns/rdtypes/ANY/SPF.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2006, 2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.immutable
-import dns.rdtypes.txtbase
-
-
-@dns.immutable.immutable
-class SPF(dns.rdtypes.txtbase.TXTBase):
-    """SPF record"""
-
-    # see: RFC 4408
diff --git a/lib/dns/rdtypes/ANY/SSHFP.py b/lib/dns/rdtypes/ANY/SSHFP.py
deleted file mode 100644
index d2c4b073..00000000
--- a/lib/dns/rdtypes/ANY/SSHFP.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2005-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import binascii
-import struct
-
-import dns.immutable
-import dns.rdata
-import dns.rdatatype
-
-
-@dns.immutable.immutable
-class SSHFP(dns.rdata.Rdata):
-    """SSHFP record"""
-
-    # See RFC 4255
-
-    __slots__ = ["algorithm", "fp_type", "fingerprint"]
-
-    def __init__(self, rdclass, rdtype, algorithm, fp_type, fingerprint):
-        super().__init__(rdclass, rdtype)
-        self.algorithm = self._as_uint8(algorithm)
-        self.fp_type = self._as_uint8(fp_type)
-        self.fingerprint = self._as_bytes(fingerprint, True)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        kw = kw.copy()
-        chunksize = kw.pop("chunksize", 128)
-        return "%d %d %s" % (
-            self.algorithm,
-            self.fp_type,
-            dns.rdata._hexify(self.fingerprint, chunksize=chunksize, **kw),
-        )
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        algorithm = tok.get_uint8()
-        fp_type = tok.get_uint8()
-        fingerprint = tok.concatenate_remaining_identifiers().encode()
-        fingerprint = binascii.unhexlify(fingerprint)
-        return cls(rdclass, rdtype, algorithm, fp_type, fingerprint)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        header = struct.pack("!BB", self.algorithm, self.fp_type)
-        file.write(header)
-        file.write(self.fingerprint)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        header = parser.get_struct("BB")
-        fingerprint = parser.get_remaining()
-        return cls(rdclass, rdtype, header[0], header[1], fingerprint)
diff --git a/lib/dns/rdtypes/ANY/TKEY.py b/lib/dns/rdtypes/ANY/TKEY.py
deleted file mode 100644
index 75f62249..00000000
--- a/lib/dns/rdtypes/ANY/TKEY.py
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2004-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import base64
-import struct
-
-import dns.exception
-import dns.immutable
-import dns.rdata
-
-
-@dns.immutable.immutable
-class TKEY(dns.rdata.Rdata):
-    """TKEY Record"""
-
-    __slots__ = [
-        "algorithm",
-        "inception",
-        "expiration",
-        "mode",
-        "error",
-        "key",
-        "other",
-    ]
-
-    def __init__(
-        self,
-        rdclass,
-        rdtype,
-        algorithm,
-        inception,
-        expiration,
-        mode,
-        error,
-        key,
-        other=b"",
-    ):
-        super().__init__(rdclass, rdtype)
-        self.algorithm = self._as_name(algorithm)
-        self.inception = self._as_uint32(inception)
-        self.expiration = self._as_uint32(expiration)
-        self.mode = self._as_uint16(mode)
-        self.error = self._as_uint16(error)
-        self.key = self._as_bytes(key)
-        self.other = self._as_bytes(other)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        _algorithm = self.algorithm.choose_relativity(origin, relativize)
-        text = "%s %u %u %u %u %s" % (
-            str(_algorithm),
-            self.inception,
-            self.expiration,
-            self.mode,
-            self.error,
-            dns.rdata._base64ify(self.key, 0),
-        )
-        if len(self.other) > 0:
-            text += f" {dns.rdata._base64ify(self.other, 0)}"
-
-        return text
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        algorithm = tok.get_name(relativize=False)
-        inception = tok.get_uint32()
-        expiration = tok.get_uint32()
-        mode = tok.get_uint16()
-        error = tok.get_uint16()
-        key_b64 = tok.get_string().encode()
-        key = base64.b64decode(key_b64)
-        other_b64 = tok.concatenate_remaining_identifiers(True).encode()
-        other = base64.b64decode(other_b64)
-
-        return cls(
-            rdclass, rdtype, algorithm, inception, expiration, mode, error, key, other
-        )
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        self.algorithm.to_wire(file, compress, origin)
-        file.write(
-            struct.pack("!IIHH", self.inception, self.expiration, self.mode, self.error)
-        )
-        file.write(struct.pack("!H", len(self.key)))
-        file.write(self.key)
-        file.write(struct.pack("!H", len(self.other)))
-        if len(self.other) > 0:
-            file.write(self.other)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        algorithm = parser.get_name(origin)
-        inception, expiration, mode, error = parser.get_struct("!IIHH")
-        key = parser.get_counted_bytes(2)
-        other = parser.get_counted_bytes(2)
-
-        return cls(
-            rdclass, rdtype, algorithm, inception, expiration, mode, error, key, other
-        )
-
-    # Constants for the mode field - from RFC 2930:
-    # 2.5 The Mode Field
-    #
-    #    The mode field specifies the general scheme for key agreement or
-    #    the purpose of the TKEY DNS message.  Servers and resolvers
-    #    supporting this specification MUST implement the Diffie-Hellman key
-    #    agreement mode and the key deletion mode for queries.  All other
-    #    modes are OPTIONAL.  A server supporting TKEY that receives a TKEY
-    #    request with a mode it does not support returns the BADMODE error.
-    #    The following values of the Mode octet are defined, available, or
-    #    reserved:
-    #
-    #          Value    Description
-    #          -----    -----------
-    #           0        - reserved, see section 7
-    #           1       server assignment
-    #           2       Diffie-Hellman exchange
-    #           3       GSS-API negotiation
-    #           4       resolver assignment
-    #           5       key deletion
-    #          6-65534   - available, see section 7
-    #          65535     - reserved, see section 7
-    SERVER_ASSIGNMENT = 1
-    DIFFIE_HELLMAN_EXCHANGE = 2
-    GSSAPI_NEGOTIATION = 3
-    RESOLVER_ASSIGNMENT = 4
-    KEY_DELETION = 5
diff --git a/lib/dns/rdtypes/ANY/TLSA.py b/lib/dns/rdtypes/ANY/TLSA.py
deleted file mode 100644
index 4dffc553..00000000
--- a/lib/dns/rdtypes/ANY/TLSA.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-import dns.immutable
-import dns.rdtypes.tlsabase
-
-
-@dns.immutable.immutable
-class TLSA(dns.rdtypes.tlsabase.TLSABase):
-    """TLSA record"""
diff --git a/lib/dns/rdtypes/ANY/TSIG.py b/lib/dns/rdtypes/ANY/TSIG.py
deleted file mode 100644
index 79423826..00000000
--- a/lib/dns/rdtypes/ANY/TSIG.py
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2001-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import base64
-import struct
-
-import dns.exception
-import dns.immutable
-import dns.rcode
-import dns.rdata
-
-
-@dns.immutable.immutable
-class TSIG(dns.rdata.Rdata):
-    """TSIG record"""
-
-    __slots__ = [
-        "algorithm",
-        "time_signed",
-        "fudge",
-        "mac",
-        "original_id",
-        "error",
-        "other",
-    ]
-
-    def __init__(
-        self,
-        rdclass,
-        rdtype,
-        algorithm,
-        time_signed,
-        fudge,
-        mac,
-        original_id,
-        error,
-        other,
-    ):
-        """Initialize a TSIG rdata.
-
-        *rdclass*, an ``int`` is the rdataclass of the Rdata.
-
-        *rdtype*, an ``int`` is the rdatatype of the Rdata.
-
-        *algorithm*, a ``dns.name.Name``.
-
-        *time_signed*, an ``int``.
-
-        *fudge*, an ``int`.
-
-        *mac*, a ``bytes``
-
-        *original_id*, an ``int``
-
-        *error*, an ``int``
-
-        *other*, a ``bytes``
-        """
-
-        super().__init__(rdclass, rdtype)
-        self.algorithm = self._as_name(algorithm)
-        self.time_signed = self._as_uint48(time_signed)
-        self.fudge = self._as_uint16(fudge)
-        self.mac = self._as_bytes(mac)
-        self.original_id = self._as_uint16(original_id)
-        self.error = dns.rcode.Rcode.make(error)
-        self.other = self._as_bytes(other)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        algorithm = self.algorithm.choose_relativity(origin, relativize)
-        error = dns.rcode.to_text(self.error, True)
-        text = (
-            f"{algorithm} {self.time_signed} {self.fudge} "
-            + f"{len(self.mac)} {dns.rdata._base64ify(self.mac, 0)} "
-            + f"{self.original_id} {error} {len(self.other)}"
-        )
-        if self.other:
-            text += f" {dns.rdata._base64ify(self.other, 0)}"
-        return text
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        algorithm = tok.get_name(relativize=False)
-        time_signed = tok.get_uint48()
-        fudge = tok.get_uint16()
-        mac_len = tok.get_uint16()
-        mac = base64.b64decode(tok.get_string())
-        if len(mac) != mac_len:
-            raise SyntaxError("invalid MAC")
-        original_id = tok.get_uint16()
-        error = dns.rcode.from_text(tok.get_string())
-        other_len = tok.get_uint16()
-        if other_len > 0:
-            other = base64.b64decode(tok.get_string())
-            if len(other) != other_len:
-                raise SyntaxError("invalid other data")
-        else:
-            other = b""
-        return cls(
-            rdclass,
-            rdtype,
-            algorithm,
-            time_signed,
-            fudge,
-            mac,
-            original_id,
-            error,
-            other,
-        )
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        self.algorithm.to_wire(file, None, origin, False)
-        file.write(
-            struct.pack(
-                "!HIHH",
-                (self.time_signed >> 32) & 0xFFFF,
-                self.time_signed & 0xFFFFFFFF,
-                self.fudge,
-                len(self.mac),
-            )
-        )
-        file.write(self.mac)
-        file.write(struct.pack("!HHH", self.original_id, self.error, len(self.other)))
-        file.write(self.other)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        algorithm = parser.get_name()
-        time_signed = parser.get_uint48()
-        fudge = parser.get_uint16()
-        mac = parser.get_counted_bytes(2)
-        (original_id, error) = parser.get_struct("!HH")
-        other = parser.get_counted_bytes(2)
-        return cls(
-            rdclass,
-            rdtype,
-            algorithm,
-            time_signed,
-            fudge,
-            mac,
-            original_id,
-            error,
-            other,
-        )
diff --git a/lib/dns/rdtypes/ANY/TXT.py b/lib/dns/rdtypes/ANY/TXT.py
deleted file mode 100644
index 6d4dae27..00000000
--- a/lib/dns/rdtypes/ANY/TXT.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.immutable
-import dns.rdtypes.txtbase
-
-
-@dns.immutable.immutable
-class TXT(dns.rdtypes.txtbase.TXTBase):
-    """TXT record"""
diff --git a/lib/dns/rdtypes/ANY/URI.py b/lib/dns/rdtypes/ANY/URI.py
deleted file mode 100644
index 2efbb305..00000000
--- a/lib/dns/rdtypes/ANY/URI.py
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-# Copyright (C) 2015 Red Hat, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import struct
-
-import dns.exception
-import dns.immutable
-import dns.name
-import dns.rdata
-import dns.rdtypes.util
-
-
-@dns.immutable.immutable
-class URI(dns.rdata.Rdata):
-    """URI record"""
-
-    # see RFC 7553
-
-    __slots__ = ["priority", "weight", "target"]
-
-    def __init__(self, rdclass, rdtype, priority, weight, target):
-        super().__init__(rdclass, rdtype)
-        self.priority = self._as_uint16(priority)
-        self.weight = self._as_uint16(weight)
-        self.target = self._as_bytes(target, True)
-        if len(self.target) == 0:
-            raise dns.exception.SyntaxError("URI target cannot be empty")
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        return '%d %d "%s"' % (self.priority, self.weight, self.target.decode())
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        priority = tok.get_uint16()
-        weight = tok.get_uint16()
-        target = tok.get().unescape()
-        if not (target.is_quoted_string() or target.is_identifier()):
-            raise dns.exception.SyntaxError("URI target must be a string")
-        return cls(rdclass, rdtype, priority, weight, target.value)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        two_ints = struct.pack("!HH", self.priority, self.weight)
-        file.write(two_ints)
-        file.write(self.target)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        (priority, weight) = parser.get_struct("!HH")
-        target = parser.get_remaining()
-        if len(target) == 0:
-            raise dns.exception.FormError("URI target may not be empty")
-        return cls(rdclass, rdtype, priority, weight, target)
-
-    def _processing_priority(self):
-        return self.priority
-
-    def _processing_weight(self):
-        return self.weight
-
-    @classmethod
-    def _processing_order(cls, iterable):
-        return dns.rdtypes.util.weighted_processing_order(iterable)
diff --git a/lib/dns/rdtypes/ANY/WALLET.py b/lib/dns/rdtypes/ANY/WALLET.py
deleted file mode 100644
index ff464763..00000000
--- a/lib/dns/rdtypes/ANY/WALLET.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-import dns.immutable
-import dns.rdtypes.txtbase
-
-
-@dns.immutable.immutable
-class WALLET(dns.rdtypes.txtbase.TXTBase):
-    """WALLET record"""
diff --git a/lib/dns/rdtypes/ANY/X25.py b/lib/dns/rdtypes/ANY/X25.py
deleted file mode 100644
index 2436ddb6..00000000
--- a/lib/dns/rdtypes/ANY/X25.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import struct
-
-import dns.exception
-import dns.immutable
-import dns.rdata
-import dns.tokenizer
-
-
-@dns.immutable.immutable
-class X25(dns.rdata.Rdata):
-    """X25 record"""
-
-    # see RFC 1183
-
-    __slots__ = ["address"]
-
-    def __init__(self, rdclass, rdtype, address):
-        super().__init__(rdclass, rdtype)
-        self.address = self._as_bytes(address, True, 255)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        return f'"{dns.rdata._escapify(self.address)}"'
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        address = tok.get_string()
-        return cls(rdclass, rdtype, address)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        l = len(self.address)
-        assert l < 256
-        file.write(struct.pack("!B", l))
-        file.write(self.address)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        address = parser.get_counted_bytes()
-        return cls(rdclass, rdtype, address)
diff --git a/lib/dns/rdtypes/ANY/ZONEMD.py b/lib/dns/rdtypes/ANY/ZONEMD.py
deleted file mode 100644
index c90e3ee1..00000000
--- a/lib/dns/rdtypes/ANY/ZONEMD.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-import binascii
-import struct
-
-import dns.immutable
-import dns.rdata
-import dns.rdatatype
-import dns.zonetypes
-
-
-@dns.immutable.immutable
-class ZONEMD(dns.rdata.Rdata):
-    """ZONEMD record"""
-
-    # See RFC 8976
-
-    __slots__ = ["serial", "scheme", "hash_algorithm", "digest"]
-
-    def __init__(self, rdclass, rdtype, serial, scheme, hash_algorithm, digest):
-        super().__init__(rdclass, rdtype)
-        self.serial = self._as_uint32(serial)
-        self.scheme = dns.zonetypes.DigestScheme.make(scheme)
-        self.hash_algorithm = dns.zonetypes.DigestHashAlgorithm.make(hash_algorithm)
-        self.digest = self._as_bytes(digest)
-
-        if self.scheme == 0:  # reserved, RFC 8976 Sec. 5.2
-            raise ValueError("scheme 0 is reserved")
-        if self.hash_algorithm == 0:  # reserved, RFC 8976 Sec. 5.3
-            raise ValueError("hash_algorithm 0 is reserved")
-
-        hasher = dns.zonetypes._digest_hashers.get(self.hash_algorithm)
-        if hasher and hasher().digest_size != len(self.digest):
-            raise ValueError("digest length inconsistent with hash algorithm")
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        kw = kw.copy()
-        chunksize = kw.pop("chunksize", 128)
-        return "%d %d %d %s" % (
-            self.serial,
-            self.scheme,
-            self.hash_algorithm,
-            dns.rdata._hexify(self.digest, chunksize=chunksize, **kw),
-        )
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        serial = tok.get_uint32()
-        scheme = tok.get_uint8()
-        hash_algorithm = tok.get_uint8()
-        digest = tok.concatenate_remaining_identifiers().encode()
-        digest = binascii.unhexlify(digest)
-        return cls(rdclass, rdtype, serial, scheme, hash_algorithm, digest)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        header = struct.pack("!IBB", self.serial, self.scheme, self.hash_algorithm)
-        file.write(header)
-        file.write(self.digest)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        header = parser.get_struct("!IBB")
-        digest = parser.get_remaining()
-        return cls(rdclass, rdtype, header[0], header[1], header[2], digest)
diff --git a/lib/dns/rdtypes/ANY/__init__.py b/lib/dns/rdtypes/ANY/__init__.py
deleted file mode 100644
index 647b215b..00000000
--- a/lib/dns/rdtypes/ANY/__init__.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""Class ANY (generic) rdata type classes."""
-
-__all__ = [
-    "AFSDB",
-    "AMTRELAY",
-    "AVC",
-    "CAA",
-    "CDNSKEY",
-    "CDS",
-    "CERT",
-    "CNAME",
-    "CSYNC",
-    "DLV",
-    "DNAME",
-    "DNSKEY",
-    "DS",
-    "EUI48",
-    "EUI64",
-    "GPOS",
-    "HINFO",
-    "HIP",
-    "ISDN",
-    "L32",
-    "L64",
-    "LOC",
-    "LP",
-    "MX",
-    "NID",
-    "NINFO",
-    "NS",
-    "NSEC",
-    "NSEC3",
-    "NSEC3PARAM",
-    "OPENPGPKEY",
-    "OPT",
-    "PTR",
-    "RESINFO",
-    "RP",
-    "RRSIG",
-    "RT",
-    "SMIMEA",
-    "SOA",
-    "SPF",
-    "SSHFP",
-    "TKEY",
-    "TLSA",
-    "TSIG",
-    "TXT",
-    "URI",
-    "WALLET",
-    "X25",
-    "ZONEMD",
-]
diff --git a/lib/dns/rdtypes/CH/A.py b/lib/dns/rdtypes/CH/A.py
deleted file mode 100644
index 832e8d3a..00000000
--- a/lib/dns/rdtypes/CH/A.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import struct
-
-import dns.immutable
-import dns.rdtypes.mxbase
-
-
-@dns.immutable.immutable
-class A(dns.rdata.Rdata):
-    """A record for Chaosnet"""
-
-    # domain: the domain of the address
-    # address: the 16-bit address
-
-    __slots__ = ["domain", "address"]
-
-    def __init__(self, rdclass, rdtype, domain, address):
-        super().__init__(rdclass, rdtype)
-        self.domain = self._as_name(domain)
-        self.address = self._as_uint16(address)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        domain = self.domain.choose_relativity(origin, relativize)
-        return f"{domain} {self.address:o}"
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        domain = tok.get_name(origin, relativize, relativize_to)
-        address = tok.get_uint16(base=8)
-        return cls(rdclass, rdtype, domain, address)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        self.domain.to_wire(file, compress, origin, canonicalize)
-        pref = struct.pack("!H", self.address)
-        file.write(pref)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        domain = parser.get_name(origin)
-        address = parser.get_uint16()
-        return cls(rdclass, rdtype, domain, address)
diff --git a/lib/dns/rdtypes/CH/__init__.py b/lib/dns/rdtypes/CH/__init__.py
deleted file mode 100644
index 0760c26c..00000000
--- a/lib/dns/rdtypes/CH/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""Class CH rdata type classes."""
-
-__all__ = [
-    "A",
-]
diff --git a/lib/dns/rdtypes/IN/A.py b/lib/dns/rdtypes/IN/A.py
deleted file mode 100644
index e09d6110..00000000
--- a/lib/dns/rdtypes/IN/A.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.exception
-import dns.immutable
-import dns.ipv4
-import dns.rdata
-import dns.tokenizer
-
-
-@dns.immutable.immutable
-class A(dns.rdata.Rdata):
-    """A record."""
-
-    __slots__ = ["address"]
-
-    def __init__(self, rdclass, rdtype, address):
-        super().__init__(rdclass, rdtype)
-        self.address = self._as_ipv4_address(address)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        return self.address
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        address = tok.get_identifier()
-        return cls(rdclass, rdtype, address)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        file.write(dns.ipv4.inet_aton(self.address))
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        address = parser.get_remaining()
-        return cls(rdclass, rdtype, address)
diff --git a/lib/dns/rdtypes/IN/AAAA.py b/lib/dns/rdtypes/IN/AAAA.py
deleted file mode 100644
index 0cd139e7..00000000
--- a/lib/dns/rdtypes/IN/AAAA.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.exception
-import dns.immutable
-import dns.ipv6
-import dns.rdata
-import dns.tokenizer
-
-
-@dns.immutable.immutable
-class AAAA(dns.rdata.Rdata):
-    """AAAA record."""
-
-    __slots__ = ["address"]
-
-    def __init__(self, rdclass, rdtype, address):
-        super().__init__(rdclass, rdtype)
-        self.address = self._as_ipv6_address(address)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        return self.address
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        address = tok.get_identifier()
-        return cls(rdclass, rdtype, address)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        file.write(dns.ipv6.inet_aton(self.address))
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        address = parser.get_remaining()
-        return cls(rdclass, rdtype, address)
diff --git a/lib/dns/rdtypes/IN/APL.py b/lib/dns/rdtypes/IN/APL.py
deleted file mode 100644
index 44cb3fef..00000000
--- a/lib/dns/rdtypes/IN/APL.py
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import binascii
-import codecs
-import struct
-
-import dns.exception
-import dns.immutable
-import dns.ipv4
-import dns.ipv6
-import dns.rdata
-import dns.tokenizer
-
-
-@dns.immutable.immutable
-class APLItem:
-    """An APL list item."""
-
-    __slots__ = ["family", "negation", "address", "prefix"]
-
-    def __init__(self, family, negation, address, prefix):
-        self.family = dns.rdata.Rdata._as_uint16(family)
-        self.negation = dns.rdata.Rdata._as_bool(negation)
-        if self.family == 1:
-            self.address = dns.rdata.Rdata._as_ipv4_address(address)
-            self.prefix = dns.rdata.Rdata._as_int(prefix, 0, 32)
-        elif self.family == 2:
-            self.address = dns.rdata.Rdata._as_ipv6_address(address)
-            self.prefix = dns.rdata.Rdata._as_int(prefix, 0, 128)
-        else:
-            self.address = dns.rdata.Rdata._as_bytes(address, max_length=127)
-            self.prefix = dns.rdata.Rdata._as_uint8(prefix)
-
-    def __str__(self):
-        if self.negation:
-            return "!%d:%s/%s" % (self.family, self.address, self.prefix)
-        else:
-            return "%d:%s/%s" % (self.family, self.address, self.prefix)
-
-    def to_wire(self, file):
-        if self.family == 1:
-            address = dns.ipv4.inet_aton(self.address)
-        elif self.family == 2:
-            address = dns.ipv6.inet_aton(self.address)
-        else:
-            address = binascii.unhexlify(self.address)
-        #
-        # Truncate least significant zero bytes.
-        #
-        last = 0
-        for i in range(len(address) - 1, -1, -1):
-            if address[i] != 0:
-                last = i + 1
-                break
-        address = address[0:last]
-        l = len(address)
-        assert l < 128
-        if self.negation:
-            l |= 0x80
-        header = struct.pack("!HBB", self.family, self.prefix, l)
-        file.write(header)
-        file.write(address)
-
-
-@dns.immutable.immutable
-class APL(dns.rdata.Rdata):
-    """APL record."""
-
-    # see: RFC 3123
-
-    __slots__ = ["items"]
-
-    def __init__(self, rdclass, rdtype, items):
-        super().__init__(rdclass, rdtype)
-        for item in items:
-            if not isinstance(item, APLItem):
-                raise ValueError("item not an APLItem")
-        self.items = tuple(items)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        return " ".join(map(str, self.items))
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        items = []
-        for token in tok.get_remaining():
-            item = token.unescape().value
-            if item[0] == "!":
-                negation = True
-                item = item[1:]
-            else:
-                negation = False
-            (family, rest) = item.split(":", 1)
-            family = int(family)
-            (address, prefix) = rest.split("/", 1)
-            prefix = int(prefix)
-            item = APLItem(family, negation, address, prefix)
-            items.append(item)
-
-        return cls(rdclass, rdtype, items)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        for item in self.items:
-            item.to_wire(file)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        items = []
-        while parser.remaining() > 0:
-            header = parser.get_struct("!HBB")
-            afdlen = header[2]
-            if afdlen > 127:
-                negation = True
-                afdlen -= 128
-            else:
-                negation = False
-            address = parser.get_bytes(afdlen)
-            l = len(address)
-            if header[0] == 1:
-                if l < 4:
-                    address += b"\x00" * (4 - l)
-            elif header[0] == 2:
-                if l < 16:
-                    address += b"\x00" * (16 - l)
-            else:
-                #
-                # This isn't really right according to the RFC, but it
-                # seems better than throwing an exception
-                #
-                address = codecs.encode(address, "hex_codec")
-            item = APLItem(header[0], negation, address, header[1])
-            items.append(item)
-        return cls(rdclass, rdtype, items)
diff --git a/lib/dns/rdtypes/IN/DHCID.py b/lib/dns/rdtypes/IN/DHCID.py
deleted file mode 100644
index 723492fa..00000000
--- a/lib/dns/rdtypes/IN/DHCID.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2006, 2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import base64
-
-import dns.exception
-import dns.immutable
-import dns.rdata
-
-
-@dns.immutable.immutable
-class DHCID(dns.rdata.Rdata):
-    """DHCID record"""
-
-    # see: RFC 4701
-
-    __slots__ = ["data"]
-
-    def __init__(self, rdclass, rdtype, data):
-        super().__init__(rdclass, rdtype)
-        self.data = self._as_bytes(data)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        return dns.rdata._base64ify(self.data, **kw)
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        b64 = tok.concatenate_remaining_identifiers().encode()
-        data = base64.b64decode(b64)
-        return cls(rdclass, rdtype, data)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        file.write(self.data)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        data = parser.get_remaining()
-        return cls(rdclass, rdtype, data)
diff --git a/lib/dns/rdtypes/IN/HTTPS.py b/lib/dns/rdtypes/IN/HTTPS.py
deleted file mode 100644
index 15464cbd..00000000
--- a/lib/dns/rdtypes/IN/HTTPS.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-import dns.immutable
-import dns.rdtypes.svcbbase
-
-
-@dns.immutable.immutable
-class HTTPS(dns.rdtypes.svcbbase.SVCBBase):
-    """HTTPS record"""
diff --git a/lib/dns/rdtypes/IN/IPSECKEY.py b/lib/dns/rdtypes/IN/IPSECKEY.py
deleted file mode 100644
index e3a66157..00000000
--- a/lib/dns/rdtypes/IN/IPSECKEY.py
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2006, 2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import base64
-import struct
-
-import dns.exception
-import dns.immutable
-import dns.rdtypes.util
-
-
-class Gateway(dns.rdtypes.util.Gateway):
-    name = "IPSECKEY gateway"
-
-
-@dns.immutable.immutable
-class IPSECKEY(dns.rdata.Rdata):
-    """IPSECKEY record"""
-
-    # see: RFC 4025
-
-    __slots__ = ["precedence", "gateway_type", "algorithm", "gateway", "key"]
-
-    def __init__(
-        self, rdclass, rdtype, precedence, gateway_type, algorithm, gateway, key
-    ):
-        super().__init__(rdclass, rdtype)
-        gateway = Gateway(gateway_type, gateway)
-        self.precedence = self._as_uint8(precedence)
-        self.gateway_type = gateway.type
-        self.algorithm = self._as_uint8(algorithm)
-        self.gateway = gateway.gateway
-        self.key = self._as_bytes(key)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        gateway = Gateway(self.gateway_type, self.gateway).to_text(origin, relativize)
-        return "%d %d %d %s %s" % (
-            self.precedence,
-            self.gateway_type,
-            self.algorithm,
-            gateway,
-            dns.rdata._base64ify(self.key, **kw),
-        )
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        precedence = tok.get_uint8()
-        gateway_type = tok.get_uint8()
-        algorithm = tok.get_uint8()
-        gateway = Gateway.from_text(
-            gateway_type, tok, origin, relativize, relativize_to
-        )
-        b64 = tok.concatenate_remaining_identifiers().encode()
-        key = base64.b64decode(b64)
-        return cls(
-            rdclass, rdtype, precedence, gateway_type, algorithm, gateway.gateway, key
-        )
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        header = struct.pack("!BBB", self.precedence, self.gateway_type, self.algorithm)
-        file.write(header)
-        Gateway(self.gateway_type, self.gateway).to_wire(
-            file, compress, origin, canonicalize
-        )
-        file.write(self.key)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        header = parser.get_struct("!BBB")
-        gateway_type = header[1]
-        gateway = Gateway.from_wire_parser(gateway_type, parser, origin)
-        key = parser.get_remaining()
-        return cls(
-            rdclass, rdtype, header[0], gateway_type, header[2], gateway.gateway, key
-        )
diff --git a/lib/dns/rdtypes/IN/KX.py b/lib/dns/rdtypes/IN/KX.py
deleted file mode 100644
index 6073df47..00000000
--- a/lib/dns/rdtypes/IN/KX.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.immutable
-import dns.rdtypes.mxbase
-
-
-@dns.immutable.immutable
-class KX(dns.rdtypes.mxbase.UncompressedDowncasingMX):
-    """KX record"""
diff --git a/lib/dns/rdtypes/IN/NAPTR.py b/lib/dns/rdtypes/IN/NAPTR.py
deleted file mode 100644
index 195d1cba..00000000
--- a/lib/dns/rdtypes/IN/NAPTR.py
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import struct
-
-import dns.exception
-import dns.immutable
-import dns.name
-import dns.rdata
-import dns.rdtypes.util
-
-
-def _write_string(file, s):
-    l = len(s)
-    assert l < 256
-    file.write(struct.pack("!B", l))
-    file.write(s)
-
-
-@dns.immutable.immutable
-class NAPTR(dns.rdata.Rdata):
-    """NAPTR record"""
-
-    # see: RFC 3403
-
-    __slots__ = ["order", "preference", "flags", "service", "regexp", "replacement"]
-
-    def __init__(
-        self, rdclass, rdtype, order, preference, flags, service, regexp, replacement
-    ):
-        super().__init__(rdclass, rdtype)
-        self.flags = self._as_bytes(flags, True, 255)
-        self.service = self._as_bytes(service, True, 255)
-        self.regexp = self._as_bytes(regexp, True, 255)
-        self.order = self._as_uint16(order)
-        self.preference = self._as_uint16(preference)
-        self.replacement = self._as_name(replacement)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        replacement = self.replacement.choose_relativity(origin, relativize)
-        return '%d %d "%s" "%s" "%s" %s' % (
-            self.order,
-            self.preference,
-            dns.rdata._escapify(self.flags),
-            dns.rdata._escapify(self.service),
-            dns.rdata._escapify(self.regexp),
-            replacement,
-        )
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        order = tok.get_uint16()
-        preference = tok.get_uint16()
-        flags = tok.get_string()
-        service = tok.get_string()
-        regexp = tok.get_string()
-        replacement = tok.get_name(origin, relativize, relativize_to)
-        return cls(
-            rdclass, rdtype, order, preference, flags, service, regexp, replacement
-        )
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        two_ints = struct.pack("!HH", self.order, self.preference)
-        file.write(two_ints)
-        _write_string(file, self.flags)
-        _write_string(file, self.service)
-        _write_string(file, self.regexp)
-        self.replacement.to_wire(file, compress, origin, canonicalize)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        (order, preference) = parser.get_struct("!HH")
-        strings = []
-        for _ in range(3):
-            s = parser.get_counted_bytes()
-            strings.append(s)
-        replacement = parser.get_name(origin)
-        return cls(
-            rdclass,
-            rdtype,
-            order,
-            preference,
-            strings[0],
-            strings[1],
-            strings[2],
-            replacement,
-        )
-
-    def _processing_priority(self):
-        return (self.order, self.preference)
-
-    @classmethod
-    def _processing_order(cls, iterable):
-        return dns.rdtypes.util.priority_processing_order(iterable)
diff --git a/lib/dns/rdtypes/IN/NSAP.py b/lib/dns/rdtypes/IN/NSAP.py
deleted file mode 100644
index d55edb73..00000000
--- a/lib/dns/rdtypes/IN/NSAP.py
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import binascii
-
-import dns.exception
-import dns.immutable
-import dns.rdata
-import dns.tokenizer
-
-
-@dns.immutable.immutable
-class NSAP(dns.rdata.Rdata):
-    """NSAP record."""
-
-    # see: RFC 1706
-
-    __slots__ = ["address"]
-
-    def __init__(self, rdclass, rdtype, address):
-        super().__init__(rdclass, rdtype)
-        self.address = self._as_bytes(address)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        return f"0x{binascii.hexlify(self.address).decode()}"
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        address = tok.get_string()
-        if address[0:2] != "0x":
-            raise dns.exception.SyntaxError("string does not start with 0x")
-        address = address[2:].replace(".", "")
-        if len(address) % 2 != 0:
-            raise dns.exception.SyntaxError("hexstring has odd length")
-        address = binascii.unhexlify(address.encode())
-        return cls(rdclass, rdtype, address)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        file.write(self.address)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        address = parser.get_remaining()
-        return cls(rdclass, rdtype, address)
diff --git a/lib/dns/rdtypes/IN/NSAP_PTR.py b/lib/dns/rdtypes/IN/NSAP_PTR.py
deleted file mode 100644
index ce1c6632..00000000
--- a/lib/dns/rdtypes/IN/NSAP_PTR.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import dns.immutable
-import dns.rdtypes.nsbase
-
-
-@dns.immutable.immutable
-class NSAP_PTR(dns.rdtypes.nsbase.UncompressedNS):
-    """NSAP-PTR record"""
diff --git a/lib/dns/rdtypes/IN/PX.py b/lib/dns/rdtypes/IN/PX.py
deleted file mode 100644
index cdca1532..00000000
--- a/lib/dns/rdtypes/IN/PX.py
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import struct
-
-import dns.exception
-import dns.immutable
-import dns.name
-import dns.rdata
-import dns.rdtypes.util
-
-
-@dns.immutable.immutable
-class PX(dns.rdata.Rdata):
-    """PX record."""
-
-    # see: RFC 2163
-
-    __slots__ = ["preference", "map822", "mapx400"]
-
-    def __init__(self, rdclass, rdtype, preference, map822, mapx400):
-        super().__init__(rdclass, rdtype)
-        self.preference = self._as_uint16(preference)
-        self.map822 = self._as_name(map822)
-        self.mapx400 = self._as_name(mapx400)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        map822 = self.map822.choose_relativity(origin, relativize)
-        mapx400 = self.mapx400.choose_relativity(origin, relativize)
-        return "%d %s %s" % (self.preference, map822, mapx400)
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        preference = tok.get_uint16()
-        map822 = tok.get_name(origin, relativize, relativize_to)
-        mapx400 = tok.get_name(origin, relativize, relativize_to)
-        return cls(rdclass, rdtype, preference, map822, mapx400)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        pref = struct.pack("!H", self.preference)
-        file.write(pref)
-        self.map822.to_wire(file, None, origin, canonicalize)
-        self.mapx400.to_wire(file, None, origin, canonicalize)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        preference = parser.get_uint16()
-        map822 = parser.get_name(origin)
-        mapx400 = parser.get_name(origin)
-        return cls(rdclass, rdtype, preference, map822, mapx400)
-
-    def _processing_priority(self):
-        return self.preference
-
-    @classmethod
-    def _processing_order(cls, iterable):
-        return dns.rdtypes.util.priority_processing_order(iterable)
diff --git a/lib/dns/rdtypes/IN/SRV.py b/lib/dns/rdtypes/IN/SRV.py
deleted file mode 100644
index 5adef98f..00000000
--- a/lib/dns/rdtypes/IN/SRV.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import struct
-
-import dns.exception
-import dns.immutable
-import dns.name
-import dns.rdata
-import dns.rdtypes.util
-
-
-@dns.immutable.immutable
-class SRV(dns.rdata.Rdata):
-    """SRV record"""
-
-    # see: RFC 2782
-
-    __slots__ = ["priority", "weight", "port", "target"]
-
-    def __init__(self, rdclass, rdtype, priority, weight, port, target):
-        super().__init__(rdclass, rdtype)
-        self.priority = self._as_uint16(priority)
-        self.weight = self._as_uint16(weight)
-        self.port = self._as_uint16(port)
-        self.target = self._as_name(target)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        target = self.target.choose_relativity(origin, relativize)
-        return "%d %d %d %s" % (self.priority, self.weight, self.port, target)
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        priority = tok.get_uint16()
-        weight = tok.get_uint16()
-        port = tok.get_uint16()
-        target = tok.get_name(origin, relativize, relativize_to)
-        return cls(rdclass, rdtype, priority, weight, port, target)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        three_ints = struct.pack("!HHH", self.priority, self.weight, self.port)
-        file.write(three_ints)
-        self.target.to_wire(file, compress, origin, canonicalize)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        (priority, weight, port) = parser.get_struct("!HHH")
-        target = parser.get_name(origin)
-        return cls(rdclass, rdtype, priority, weight, port, target)
-
-    def _processing_priority(self):
-        return self.priority
-
-    def _processing_weight(self):
-        return self.weight
-
-    @classmethod
-    def _processing_order(cls, iterable):
-        return dns.rdtypes.util.weighted_processing_order(iterable)
diff --git a/lib/dns/rdtypes/IN/SVCB.py b/lib/dns/rdtypes/IN/SVCB.py
deleted file mode 100644
index ff3e9327..00000000
--- a/lib/dns/rdtypes/IN/SVCB.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-import dns.immutable
-import dns.rdtypes.svcbbase
-
-
-@dns.immutable.immutable
-class SVCB(dns.rdtypes.svcbbase.SVCBBase):
-    """SVCB record"""
diff --git a/lib/dns/rdtypes/IN/WKS.py b/lib/dns/rdtypes/IN/WKS.py
deleted file mode 100644
index 881a7849..00000000
--- a/lib/dns/rdtypes/IN/WKS.py
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import socket
-import struct
-
-import dns.immutable
-import dns.ipv4
-import dns.rdata
-
-try:
-    _proto_tcp = socket.getprotobyname("tcp")
-    _proto_udp = socket.getprotobyname("udp")
-except OSError:
-    # Fall back to defaults in case /etc/protocols is unavailable.
-    _proto_tcp = 6
-    _proto_udp = 17
-
-
-@dns.immutable.immutable
-class WKS(dns.rdata.Rdata):
-    """WKS record"""
-
-    # see: RFC 1035
-
-    __slots__ = ["address", "protocol", "bitmap"]
-
-    def __init__(self, rdclass, rdtype, address, protocol, bitmap):
-        super().__init__(rdclass, rdtype)
-        self.address = self._as_ipv4_address(address)
-        self.protocol = self._as_uint8(protocol)
-        self.bitmap = self._as_bytes(bitmap)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        bits = []
-        for i, byte in enumerate(self.bitmap):
-            for j in range(0, 8):
-                if byte & (0x80 >> j):
-                    bits.append(str(i * 8 + j))
-        text = " ".join(bits)
-        return "%s %d %s" % (self.address, self.protocol, text)
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        address = tok.get_string()
-        protocol = tok.get_string()
-        if protocol.isdigit():
-            protocol = int(protocol)
-        else:
-            protocol = socket.getprotobyname(protocol)
-        bitmap = bytearray()
-        for token in tok.get_remaining():
-            value = token.unescape().value
-            if value.isdigit():
-                serv = int(value)
-            else:
-                if protocol != _proto_udp and protocol != _proto_tcp:
-                    raise NotImplementedError("protocol must be TCP or UDP")
-                if protocol == _proto_udp:
-                    protocol_text = "udp"
-                else:
-                    protocol_text = "tcp"
-                serv = socket.getservbyname(value, protocol_text)
-            i = serv // 8
-            l = len(bitmap)
-            if l < i + 1:
-                for _ in range(l, i + 1):
-                    bitmap.append(0)
-            bitmap[i] = bitmap[i] | (0x80 >> (serv % 8))
-        bitmap = dns.rdata._truncate_bitmap(bitmap)
-        return cls(rdclass, rdtype, address, protocol, bitmap)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        file.write(dns.ipv4.inet_aton(self.address))
-        protocol = struct.pack("!B", self.protocol)
-        file.write(protocol)
-        file.write(self.bitmap)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        address = parser.get_bytes(4)
-        protocol = parser.get_uint8()
-        bitmap = parser.get_remaining()
-        return cls(rdclass, rdtype, address, protocol, bitmap)
diff --git a/lib/dns/rdtypes/IN/__init__.py b/lib/dns/rdtypes/IN/__init__.py
deleted file mode 100644
index dcec4dd2..00000000
--- a/lib/dns/rdtypes/IN/__init__.py
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""Class IN rdata type classes."""
-
-__all__ = [
-    "A",
-    "AAAA",
-    "APL",
-    "DHCID",
-    "HTTPS",
-    "IPSECKEY",
-    "KX",
-    "NAPTR",
-    "NSAP",
-    "NSAP_PTR",
-    "PX",
-    "SRV",
-    "SVCB",
-    "WKS",
-]
diff --git a/lib/dns/rdtypes/__init__.py b/lib/dns/rdtypes/__init__.py
deleted file mode 100644
index 3997f84c..00000000
--- a/lib/dns/rdtypes/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""DNS rdata type classes"""
-
-__all__ = [
-    "ANY",
-    "IN",
-    "CH",
-    "dnskeybase",
-    "dsbase",
-    "euibase",
-    "mxbase",
-    "nsbase",
-    "svcbbase",
-    "tlsabase",
-    "txtbase",
-    "util",
-]
diff --git a/lib/dns/rdtypes/dnskeybase.py b/lib/dns/rdtypes/dnskeybase.py
deleted file mode 100644
index db300f8b..00000000
--- a/lib/dns/rdtypes/dnskeybase.py
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2004-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import base64
-import enum
-import struct
-
-import dns.dnssectypes
-import dns.exception
-import dns.immutable
-import dns.rdata
-
-# wildcard import
-__all__ = ["SEP", "REVOKE", "ZONE"]  # noqa: F822
-
-
-class Flag(enum.IntFlag):
-    SEP = 0x0001
-    REVOKE = 0x0080
-    ZONE = 0x0100
-
-
-@dns.immutable.immutable
-class DNSKEYBase(dns.rdata.Rdata):
-    """Base class for rdata that is like a DNSKEY record"""
-
-    __slots__ = ["flags", "protocol", "algorithm", "key"]
-
-    def __init__(self, rdclass, rdtype, flags, protocol, algorithm, key):
-        super().__init__(rdclass, rdtype)
-        self.flags = Flag(self._as_uint16(flags))
-        self.protocol = self._as_uint8(protocol)
-        self.algorithm = dns.dnssectypes.Algorithm.make(algorithm)
-        self.key = self._as_bytes(key)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        return "%d %d %d %s" % (
-            self.flags,
-            self.protocol,
-            self.algorithm,
-            dns.rdata._base64ify(self.key, **kw),
-        )
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        flags = tok.get_uint16()
-        protocol = tok.get_uint8()
-        algorithm = tok.get_string()
-        b64 = tok.concatenate_remaining_identifiers().encode()
-        key = base64.b64decode(b64)
-        return cls(rdclass, rdtype, flags, protocol, algorithm, key)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        header = struct.pack("!HBB", self.flags, self.protocol, self.algorithm)
-        file.write(header)
-        file.write(self.key)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        header = parser.get_struct("!HBB")
-        key = parser.get_remaining()
-        return cls(rdclass, rdtype, header[0], header[1], header[2], key)
-
-
-### BEGIN generated Flag constants
-
-SEP = Flag.SEP
-REVOKE = Flag.REVOKE
-ZONE = Flag.ZONE
-
-### END generated Flag constants
diff --git a/lib/dns/rdtypes/dsbase.py b/lib/dns/rdtypes/dsbase.py
deleted file mode 100644
index cd21f026..00000000
--- a/lib/dns/rdtypes/dsbase.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2010, 2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import binascii
-import struct
-
-import dns.dnssectypes
-import dns.immutable
-import dns.rdata
-import dns.rdatatype
-
-
-@dns.immutable.immutable
-class DSBase(dns.rdata.Rdata):
-    """Base class for rdata that is like a DS record"""
-
-    __slots__ = ["key_tag", "algorithm", "digest_type", "digest"]
-
-    # Digest types registry:
-    # https://www.iana.org/assignments/ds-rr-types/ds-rr-types.xhtml
-    _digest_length_by_type = {
-        1: 20,  # SHA-1, RFC 3658 Sec. 2.4
-        2: 32,  # SHA-256, RFC 4509 Sec. 2.2
-        3: 32,  # GOST R 34.11-94, RFC 5933 Sec. 4 in conjunction with RFC 4490 Sec. 2.1
-        4: 48,  # SHA-384, RFC 6605 Sec. 2
-    }
-
-    def __init__(self, rdclass, rdtype, key_tag, algorithm, digest_type, digest):
-        super().__init__(rdclass, rdtype)
-        self.key_tag = self._as_uint16(key_tag)
-        self.algorithm = dns.dnssectypes.Algorithm.make(algorithm)
-        self.digest_type = dns.dnssectypes.DSDigest.make(self._as_uint8(digest_type))
-        self.digest = self._as_bytes(digest)
-        try:
-            if len(self.digest) != self._digest_length_by_type[self.digest_type]:
-                raise ValueError("digest length inconsistent with digest type")
-        except KeyError:
-            if self.digest_type == 0:  # reserved, RFC 3658 Sec. 2.4
-                raise ValueError("digest type 0 is reserved")
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        kw = kw.copy()
-        chunksize = kw.pop("chunksize", 128)
-        return "%d %d %d %s" % (
-            self.key_tag,
-            self.algorithm,
-            self.digest_type,
-            dns.rdata._hexify(self.digest, chunksize=chunksize, **kw),
-        )
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        key_tag = tok.get_uint16()
-        algorithm = tok.get_string()
-        digest_type = tok.get_uint8()
-        digest = tok.concatenate_remaining_identifiers().encode()
-        digest = binascii.unhexlify(digest)
-        return cls(rdclass, rdtype, key_tag, algorithm, digest_type, digest)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        header = struct.pack("!HBB", self.key_tag, self.algorithm, self.digest_type)
-        file.write(header)
-        file.write(self.digest)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        header = parser.get_struct("!HBB")
-        digest = parser.get_remaining()
-        return cls(rdclass, rdtype, header[0], header[1], header[2], digest)
diff --git a/lib/dns/rdtypes/euibase.py b/lib/dns/rdtypes/euibase.py
deleted file mode 100644
index a39c166b..00000000
--- a/lib/dns/rdtypes/euibase.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright (C) 2015 Red Hat, Inc.
-# Author: Petr Spacek <pspacek@redhat.com>
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED 'AS IS' AND RED HAT DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import binascii
-
-import dns.immutable
-import dns.rdata
-
-
-@dns.immutable.immutable
-class EUIBase(dns.rdata.Rdata):
-    """EUIxx record"""
-
-    # see: rfc7043.txt
-
-    __slots__ = ["eui"]
-    # define these in subclasses
-    # byte_len = 6  # 0123456789ab (in hex)
-    # text_len = byte_len * 3 - 1  # 01-23-45-67-89-ab
-
-    def __init__(self, rdclass, rdtype, eui):
-        super().__init__(rdclass, rdtype)
-        self.eui = self._as_bytes(eui)
-        if len(self.eui) != self.byte_len:
-            raise dns.exception.FormError(
-                f"EUI{self.byte_len * 8} rdata has to have {self.byte_len} bytes"
-            )
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        return dns.rdata._hexify(self.eui, chunksize=2, separator=b"-", **kw)
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        text = tok.get_string()
-        if len(text) != cls.text_len:
-            raise dns.exception.SyntaxError(
-                f"Input text must have {cls.text_len} characters"
-            )
-        for i in range(2, cls.byte_len * 3 - 1, 3):
-            if text[i] != "-":
-                raise dns.exception.SyntaxError(f"Dash expected at position {i}")
-        text = text.replace("-", "")
-        try:
-            data = binascii.unhexlify(text.encode())
-        except (ValueError, TypeError) as ex:
-            raise dns.exception.SyntaxError(f"Hex decoding error: {str(ex)}")
-        return cls(rdclass, rdtype, data)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        file.write(self.eui)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        eui = parser.get_bytes(cls.byte_len)
-        return cls(rdclass, rdtype, eui)
diff --git a/lib/dns/rdtypes/mxbase.py b/lib/dns/rdtypes/mxbase.py
deleted file mode 100644
index 6d5e3d87..00000000
--- a/lib/dns/rdtypes/mxbase.py
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""MX-like base classes."""
-
-import struct
-
-import dns.exception
-import dns.immutable
-import dns.name
-import dns.rdata
-import dns.rdtypes.util
-
-
-@dns.immutable.immutable
-class MXBase(dns.rdata.Rdata):
-    """Base class for rdata that is like an MX record."""
-
-    __slots__ = ["preference", "exchange"]
-
-    def __init__(self, rdclass, rdtype, preference, exchange):
-        super().__init__(rdclass, rdtype)
-        self.preference = self._as_uint16(preference)
-        self.exchange = self._as_name(exchange)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        exchange = self.exchange.choose_relativity(origin, relativize)
-        return "%d %s" % (self.preference, exchange)
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        preference = tok.get_uint16()
-        exchange = tok.get_name(origin, relativize, relativize_to)
-        return cls(rdclass, rdtype, preference, exchange)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        pref = struct.pack("!H", self.preference)
-        file.write(pref)
-        self.exchange.to_wire(file, compress, origin, canonicalize)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        preference = parser.get_uint16()
-        exchange = parser.get_name(origin)
-        return cls(rdclass, rdtype, preference, exchange)
-
-    def _processing_priority(self):
-        return self.preference
-
-    @classmethod
-    def _processing_order(cls, iterable):
-        return dns.rdtypes.util.priority_processing_order(iterable)
-
-
-@dns.immutable.immutable
-class UncompressedMX(MXBase):
-    """Base class for rdata that is like an MX record, but whose name
-    is not compressed when converted to DNS wire format, and whose
-    digestable form is not downcased."""
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        super()._to_wire(file, None, origin, False)
-
-
-@dns.immutable.immutable
-class UncompressedDowncasingMX(MXBase):
-    """Base class for rdata that is like an MX record, but whose name
-    is not compressed when convert to DNS wire format."""
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        super()._to_wire(file, None, origin, canonicalize)
diff --git a/lib/dns/rdtypes/nsbase.py b/lib/dns/rdtypes/nsbase.py
deleted file mode 100644
index 904224f0..00000000
--- a/lib/dns/rdtypes/nsbase.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""NS-like base classes."""
-
-import dns.exception
-import dns.immutable
-import dns.name
-import dns.rdata
-
-
-@dns.immutable.immutable
-class NSBase(dns.rdata.Rdata):
-    """Base class for rdata that is like an NS record."""
-
-    __slots__ = ["target"]
-
-    def __init__(self, rdclass, rdtype, target):
-        super().__init__(rdclass, rdtype)
-        self.target = self._as_name(target)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        target = self.target.choose_relativity(origin, relativize)
-        return str(target)
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        target = tok.get_name(origin, relativize, relativize_to)
-        return cls(rdclass, rdtype, target)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        self.target.to_wire(file, compress, origin, canonicalize)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        target = parser.get_name(origin)
-        return cls(rdclass, rdtype, target)
-
-
-@dns.immutable.immutable
-class UncompressedNS(NSBase):
-    """Base class for rdata that is like an NS record, but whose name
-    is not compressed when convert to DNS wire format, and whose
-    digestable form is not downcased."""
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        self.target.to_wire(file, None, origin, False)
diff --git a/lib/dns/rdtypes/svcbbase.py b/lib/dns/rdtypes/svcbbase.py
deleted file mode 100644
index a2b15b92..00000000
--- a/lib/dns/rdtypes/svcbbase.py
+++ /dev/null
@@ -1,585 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-import base64
-import enum
-import struct
-
-import dns.enum
-import dns.exception
-import dns.immutable
-import dns.ipv4
-import dns.ipv6
-import dns.name
-import dns.rdata
-import dns.rdtypes.util
-import dns.renderer
-import dns.tokenizer
-import dns.wire
-
-# Until there is an RFC, this module is experimental and may be changed in
-# incompatible ways.
-
-
-class UnknownParamKey(dns.exception.DNSException):
-    """Unknown SVCB ParamKey"""
-
-
-class ParamKey(dns.enum.IntEnum):
-    """SVCB ParamKey"""
-
-    MANDATORY = 0
-    ALPN = 1
-    NO_DEFAULT_ALPN = 2
-    PORT = 3
-    IPV4HINT = 4
-    ECH = 5
-    IPV6HINT = 6
-    DOHPATH = 7
-    OHTTP = 8
-
-    @classmethod
-    def _maximum(cls):
-        return 65535
-
-    @classmethod
-    def _short_name(cls):
-        return "SVCBParamKey"
-
-    @classmethod
-    def _prefix(cls):
-        return "KEY"
-
-    @classmethod
-    def _unknown_exception_class(cls):
-        return UnknownParamKey
-
-
-class Emptiness(enum.IntEnum):
-    NEVER = 0
-    ALWAYS = 1
-    ALLOWED = 2
-
-
-def _validate_key(key):
-    force_generic = False
-    if isinstance(key, bytes):
-        # We decode to latin-1 so we get 0-255 as valid and do NOT interpret
-        # UTF-8 sequences
-        key = key.decode("latin-1")
-    if isinstance(key, str):
-        if key.lower().startswith("key"):
-            force_generic = True
-            if key[3:].startswith("0") and len(key) != 4:
-                # key has leading zeros
-                raise ValueError("leading zeros in key")
-        key = key.replace("-", "_")
-    return (ParamKey.make(key), force_generic)
-
-
-def key_to_text(key):
-    return ParamKey.to_text(key).replace("_", "-").lower()
-
-
-# Like rdata escapify, but escapes ',' too.
-
-_escaped = b'",\\'
-
-
-def _escapify(qstring):
-    text = ""
-    for c in qstring:
-        if c in _escaped:
-            text += "\\" + chr(c)
-        elif c >= 0x20 and c < 0x7F:
-            text += chr(c)
-        else:
-            text += "\\%03d" % c
-    return text
-
-
-def _unescape(value):
-    if value == "":
-        return value
-    unescaped = b""
-    l = len(value)
-    i = 0
-    while i < l:
-        c = value[i]
-        i += 1
-        if c == "\\":
-            if i >= l:  # pragma: no cover   (can't happen via tokenizer get())
-                raise dns.exception.UnexpectedEnd
-            c = value[i]
-            i += 1
-            if c.isdigit():
-                if i >= l:
-                    raise dns.exception.UnexpectedEnd
-                c2 = value[i]
-                i += 1
-                if i >= l:
-                    raise dns.exception.UnexpectedEnd
-                c3 = value[i]
-                i += 1
-                if not (c2.isdigit() and c3.isdigit()):
-                    raise dns.exception.SyntaxError
-                codepoint = int(c) * 100 + int(c2) * 10 + int(c3)
-                if codepoint > 255:
-                    raise dns.exception.SyntaxError
-                unescaped += b"%c" % (codepoint)
-                continue
-        unescaped += c.encode()
-    return unescaped
-
-
-def _split(value):
-    l = len(value)
-    i = 0
-    items = []
-    unescaped = b""
-    while i < l:
-        c = value[i]
-        i += 1
-        if c == ord("\\"):
-            if i >= l:  # pragma: no cover   (can't happen via tokenizer get())
-                raise dns.exception.UnexpectedEnd
-            c = value[i]
-            i += 1
-            unescaped += b"%c" % (c)
-        elif c == ord(","):
-            items.append(unescaped)
-            unescaped = b""
-        else:
-            unescaped += b"%c" % (c)
-    items.append(unescaped)
-    return items
-
-
-@dns.immutable.immutable
-class Param:
-    """Abstract base class for SVCB parameters"""
-
-    @classmethod
-    def emptiness(cls):
-        return Emptiness.NEVER
-
-
-@dns.immutable.immutable
-class GenericParam(Param):
-    """Generic SVCB parameter"""
-
-    def __init__(self, value):
-        self.value = dns.rdata.Rdata._as_bytes(value, True)
-
-    @classmethod
-    def emptiness(cls):
-        return Emptiness.ALLOWED
-
-    @classmethod
-    def from_value(cls, value):
-        if value is None or len(value) == 0:
-            return None
-        else:
-            return cls(_unescape(value))
-
-    def to_text(self):
-        return '"' + dns.rdata._escapify(self.value) + '"'
-
-    @classmethod
-    def from_wire_parser(cls, parser, origin=None):  # pylint: disable=W0613
-        value = parser.get_bytes(parser.remaining())
-        if len(value) == 0:
-            return None
-        else:
-            return cls(value)
-
-    def to_wire(self, file, origin=None):  # pylint: disable=W0613
-        file.write(self.value)
-
-
-@dns.immutable.immutable
-class MandatoryParam(Param):
-    def __init__(self, keys):
-        # check for duplicates
-        keys = sorted([_validate_key(key)[0] for key in keys])
-        prior_k = None
-        for k in keys:
-            if k == prior_k:
-                raise ValueError(f"duplicate key {k:d}")
-            prior_k = k
-            if k == ParamKey.MANDATORY:
-                raise ValueError("listed the mandatory key as mandatory")
-        self.keys = tuple(keys)
-
-    @classmethod
-    def from_value(cls, value):
-        keys = [k.encode() for k in value.split(",")]
-        return cls(keys)
-
-    def to_text(self):
-        return '"' + ",".join([key_to_text(key) for key in self.keys]) + '"'
-
-    @classmethod
-    def from_wire_parser(cls, parser, origin=None):  # pylint: disable=W0613
-        keys = []
-        last_key = -1
-        while parser.remaining() > 0:
-            key = parser.get_uint16()
-            if key < last_key:
-                raise dns.exception.FormError("manadatory keys not ascending")
-            last_key = key
-            keys.append(key)
-        return cls(keys)
-
-    def to_wire(self, file, origin=None):  # pylint: disable=W0613
-        for key in self.keys:
-            file.write(struct.pack("!H", key))
-
-
-@dns.immutable.immutable
-class ALPNParam(Param):
-    def __init__(self, ids):
-        self.ids = dns.rdata.Rdata._as_tuple(
-            ids, lambda x: dns.rdata.Rdata._as_bytes(x, True, 255, False)
-        )
-
-    @classmethod
-    def from_value(cls, value):
-        return cls(_split(_unescape(value)))
-
-    def to_text(self):
-        value = ",".join([_escapify(id) for id in self.ids])
-        return '"' + dns.rdata._escapify(value.encode()) + '"'
-
-    @classmethod
-    def from_wire_parser(cls, parser, origin=None):  # pylint: disable=W0613
-        ids = []
-        while parser.remaining() > 0:
-            id = parser.get_counted_bytes()
-            ids.append(id)
-        return cls(ids)
-
-    def to_wire(self, file, origin=None):  # pylint: disable=W0613
-        for id in self.ids:
-            file.write(struct.pack("!B", len(id)))
-            file.write(id)
-
-
-@dns.immutable.immutable
-class NoDefaultALPNParam(Param):
-    # We don't ever expect to instantiate this class, but we need
-    # a from_value() and a from_wire_parser(), so we just return None
-    # from the class methods when things are OK.
-
-    @classmethod
-    def emptiness(cls):
-        return Emptiness.ALWAYS
-
-    @classmethod
-    def from_value(cls, value):
-        if value is None or value == "":
-            return None
-        else:
-            raise ValueError("no-default-alpn with non-empty value")
-
-    def to_text(self):
-        raise NotImplementedError  # pragma: no cover
-
-    @classmethod
-    def from_wire_parser(cls, parser, origin=None):  # pylint: disable=W0613
-        if parser.remaining() != 0:
-            raise dns.exception.FormError
-        return None
-
-    def to_wire(self, file, origin=None):  # pylint: disable=W0613
-        raise NotImplementedError  # pragma: no cover
-
-
-@dns.immutable.immutable
-class PortParam(Param):
-    def __init__(self, port):
-        self.port = dns.rdata.Rdata._as_uint16(port)
-
-    @classmethod
-    def from_value(cls, value):
-        value = int(value)
-        return cls(value)
-
-    def to_text(self):
-        return f'"{self.port}"'
-
-    @classmethod
-    def from_wire_parser(cls, parser, origin=None):  # pylint: disable=W0613
-        port = parser.get_uint16()
-        return cls(port)
-
-    def to_wire(self, file, origin=None):  # pylint: disable=W0613
-        file.write(struct.pack("!H", self.port))
-
-
-@dns.immutable.immutable
-class IPv4HintParam(Param):
-    def __init__(self, addresses):
-        self.addresses = dns.rdata.Rdata._as_tuple(
-            addresses, dns.rdata.Rdata._as_ipv4_address
-        )
-
-    @classmethod
-    def from_value(cls, value):
-        addresses = value.split(",")
-        return cls(addresses)
-
-    def to_text(self):
-        return '"' + ",".join(self.addresses) + '"'
-
-    @classmethod
-    def from_wire_parser(cls, parser, origin=None):  # pylint: disable=W0613
-        addresses = []
-        while parser.remaining() > 0:
-            ip = parser.get_bytes(4)
-            addresses.append(dns.ipv4.inet_ntoa(ip))
-        return cls(addresses)
-
-    def to_wire(self, file, origin=None):  # pylint: disable=W0613
-        for address in self.addresses:
-            file.write(dns.ipv4.inet_aton(address))
-
-
-@dns.immutable.immutable
-class IPv6HintParam(Param):
-    def __init__(self, addresses):
-        self.addresses = dns.rdata.Rdata._as_tuple(
-            addresses, dns.rdata.Rdata._as_ipv6_address
-        )
-
-    @classmethod
-    def from_value(cls, value):
-        addresses = value.split(",")
-        return cls(addresses)
-
-    def to_text(self):
-        return '"' + ",".join(self.addresses) + '"'
-
-    @classmethod
-    def from_wire_parser(cls, parser, origin=None):  # pylint: disable=W0613
-        addresses = []
-        while parser.remaining() > 0:
-            ip = parser.get_bytes(16)
-            addresses.append(dns.ipv6.inet_ntoa(ip))
-        return cls(addresses)
-
-    def to_wire(self, file, origin=None):  # pylint: disable=W0613
-        for address in self.addresses:
-            file.write(dns.ipv6.inet_aton(address))
-
-
-@dns.immutable.immutable
-class ECHParam(Param):
-    def __init__(self, ech):
-        self.ech = dns.rdata.Rdata._as_bytes(ech, True)
-
-    @classmethod
-    def from_value(cls, value):
-        if "\\" in value:
-            raise ValueError("escape in ECH value")
-        value = base64.b64decode(value.encode())
-        return cls(value)
-
-    def to_text(self):
-        b64 = base64.b64encode(self.ech).decode("ascii")
-        return f'"{b64}"'
-
-    @classmethod
-    def from_wire_parser(cls, parser, origin=None):  # pylint: disable=W0613
-        value = parser.get_bytes(parser.remaining())
-        return cls(value)
-
-    def to_wire(self, file, origin=None):  # pylint: disable=W0613
-        file.write(self.ech)
-
-
-@dns.immutable.immutable
-class OHTTPParam(Param):
-    # We don't ever expect to instantiate this class, but we need
-    # a from_value() and a from_wire_parser(), so we just return None
-    # from the class methods when things are OK.
-
-    @classmethod
-    def emptiness(cls):
-        return Emptiness.ALWAYS
-
-    @classmethod
-    def from_value(cls, value):
-        if value is None or value == "":
-            return None
-        else:
-            raise ValueError("ohttp with non-empty value")
-
-    def to_text(self):
-        raise NotImplementedError  # pragma: no cover
-
-    @classmethod
-    def from_wire_parser(cls, parser, origin=None):  # pylint: disable=W0613
-        if parser.remaining() != 0:
-            raise dns.exception.FormError
-        return None
-
-    def to_wire(self, file, origin=None):  # pylint: disable=W0613
-        raise NotImplementedError  # pragma: no cover
-
-
-_class_for_key = {
-    ParamKey.MANDATORY: MandatoryParam,
-    ParamKey.ALPN: ALPNParam,
-    ParamKey.NO_DEFAULT_ALPN: NoDefaultALPNParam,
-    ParamKey.PORT: PortParam,
-    ParamKey.IPV4HINT: IPv4HintParam,
-    ParamKey.ECH: ECHParam,
-    ParamKey.IPV6HINT: IPv6HintParam,
-    ParamKey.OHTTP: OHTTPParam,
-}
-
-
-def _validate_and_define(params, key, value):
-    (key, force_generic) = _validate_key(_unescape(key))
-    if key in params:
-        raise SyntaxError(f'duplicate key "{key:d}"')
-    cls = _class_for_key.get(key, GenericParam)
-    emptiness = cls.emptiness()
-    if value is None:
-        if emptiness == Emptiness.NEVER:
-            raise SyntaxError("value cannot be empty")
-        value = cls.from_value(value)
-    else:
-        if force_generic:
-            value = cls.from_wire_parser(dns.wire.Parser(_unescape(value)))
-        else:
-            value = cls.from_value(value)
-    params[key] = value
-
-
-@dns.immutable.immutable
-class SVCBBase(dns.rdata.Rdata):
-    """Base class for SVCB-like records"""
-
-    # see: draft-ietf-dnsop-svcb-https-11
-
-    __slots__ = ["priority", "target", "params"]
-
-    def __init__(self, rdclass, rdtype, priority, target, params):
-        super().__init__(rdclass, rdtype)
-        self.priority = self._as_uint16(priority)
-        self.target = self._as_name(target)
-        for k, v in params.items():
-            k = ParamKey.make(k)
-            if not isinstance(v, Param) and v is not None:
-                raise ValueError(f"{k:d} not a Param")
-        self.params = dns.immutable.Dict(params)
-        # Make sure any parameter listed as mandatory is present in the
-        # record.
-        mandatory = params.get(ParamKey.MANDATORY)
-        if mandatory:
-            for key in mandatory.keys:
-                # Note we have to say "not in" as we have None as a value
-                # so a get() and a not None test would be wrong.
-                if key not in params:
-                    raise ValueError(f"key {key:d} declared mandatory but not present")
-        # The no-default-alpn parameter requires the alpn parameter.
-        if ParamKey.NO_DEFAULT_ALPN in params:
-            if ParamKey.ALPN not in params:
-                raise ValueError("no-default-alpn present, but alpn missing")
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        target = self.target.choose_relativity(origin, relativize)
-        params = []
-        for key in sorted(self.params.keys()):
-            value = self.params[key]
-            if value is None:
-                params.append(key_to_text(key))
-            else:
-                kv = key_to_text(key) + "=" + value.to_text()
-                params.append(kv)
-        if len(params) > 0:
-            space = " "
-        else:
-            space = ""
-        return "%d %s%s%s" % (self.priority, target, space, " ".join(params))
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        priority = tok.get_uint16()
-        target = tok.get_name(origin, relativize, relativize_to)
-        if priority == 0:
-            token = tok.get()
-            if not token.is_eol_or_eof():
-                raise SyntaxError("parameters in AliasMode")
-            tok.unget(token)
-        params = {}
-        while True:
-            token = tok.get()
-            if token.is_eol_or_eof():
-                tok.unget(token)
-                break
-            if token.ttype != dns.tokenizer.IDENTIFIER:
-                raise SyntaxError("parameter is not an identifier")
-            equals = token.value.find("=")
-            if equals == len(token.value) - 1:
-                # 'key=', so next token should be a quoted string without
-                # any intervening whitespace.
-                key = token.value[:-1]
-                token = tok.get(want_leading=True)
-                if token.ttype != dns.tokenizer.QUOTED_STRING:
-                    raise SyntaxError("whitespace after =")
-                value = token.value
-            elif equals > 0:
-                # key=value
-                key = token.value[:equals]
-                value = token.value[equals + 1 :]
-            elif equals == 0:
-                # =key
-                raise SyntaxError('parameter cannot start with "="')
-            else:
-                # key
-                key = token.value
-                value = None
-            _validate_and_define(params, key, value)
-        return cls(rdclass, rdtype, priority, target, params)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        file.write(struct.pack("!H", self.priority))
-        self.target.to_wire(file, None, origin, False)
-        for key in sorted(self.params):
-            file.write(struct.pack("!H", key))
-            value = self.params[key]
-            with dns.renderer.prefixed_length(file, 2):
-                # Note that we're still writing a length of zero if the value is None
-                if value is not None:
-                    value.to_wire(file, origin)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        priority = parser.get_uint16()
-        target = parser.get_name(origin)
-        if priority == 0 and parser.remaining() != 0:
-            raise dns.exception.FormError("parameters in AliasMode")
-        params = {}
-        prior_key = -1
-        while parser.remaining() > 0:
-            key = parser.get_uint16()
-            if key < prior_key:
-                raise dns.exception.FormError("keys not in order")
-            prior_key = key
-            vlen = parser.get_uint16()
-            pcls = _class_for_key.get(key, GenericParam)
-            with parser.restrict_to(vlen):
-                value = pcls.from_wire_parser(parser, origin)
-            params[key] = value
-        return cls(rdclass, rdtype, priority, target, params)
-
-    def _processing_priority(self):
-        return self.priority
-
-    @classmethod
-    def _processing_order(cls, iterable):
-        return dns.rdtypes.util.priority_processing_order(iterable)
diff --git a/lib/dns/rdtypes/tlsabase.py b/lib/dns/rdtypes/tlsabase.py
deleted file mode 100644
index a059d2c4..00000000
--- a/lib/dns/rdtypes/tlsabase.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2005-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import binascii
-import struct
-
-import dns.immutable
-import dns.rdata
-import dns.rdatatype
-
-
-@dns.immutable.immutable
-class TLSABase(dns.rdata.Rdata):
-    """Base class for TLSA and SMIMEA records"""
-
-    # see: RFC 6698
-
-    __slots__ = ["usage", "selector", "mtype", "cert"]
-
-    def __init__(self, rdclass, rdtype, usage, selector, mtype, cert):
-        super().__init__(rdclass, rdtype)
-        self.usage = self._as_uint8(usage)
-        self.selector = self._as_uint8(selector)
-        self.mtype = self._as_uint8(mtype)
-        self.cert = self._as_bytes(cert)
-
-    def to_text(self, origin=None, relativize=True, **kw):
-        kw = kw.copy()
-        chunksize = kw.pop("chunksize", 128)
-        return "%d %d %d %s" % (
-            self.usage,
-            self.selector,
-            self.mtype,
-            dns.rdata._hexify(self.cert, chunksize=chunksize, **kw),
-        )
-
-    @classmethod
-    def from_text(
-        cls, rdclass, rdtype, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        usage = tok.get_uint8()
-        selector = tok.get_uint8()
-        mtype = tok.get_uint8()
-        cert = tok.concatenate_remaining_identifiers().encode()
-        cert = binascii.unhexlify(cert)
-        return cls(rdclass, rdtype, usage, selector, mtype, cert)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        header = struct.pack("!BBB", self.usage, self.selector, self.mtype)
-        file.write(header)
-        file.write(self.cert)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        header = parser.get_struct("BBB")
-        cert = parser.get_remaining()
-        return cls(rdclass, rdtype, header[0], header[1], header[2], cert)
diff --git a/lib/dns/rdtypes/txtbase.py b/lib/dns/rdtypes/txtbase.py
deleted file mode 100644
index 73db6d9e..00000000
--- a/lib/dns/rdtypes/txtbase.py
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2006-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""TXT-like base class."""
-
-from typing import Any, Dict, Iterable, Optional, Tuple, Union
-
-import dns.exception
-import dns.immutable
-import dns.rdata
-import dns.renderer
-import dns.tokenizer
-
-
-@dns.immutable.immutable
-class TXTBase(dns.rdata.Rdata):
-    """Base class for rdata that is like a TXT record (see RFC 1035)."""
-
-    __slots__ = ["strings"]
-
-    def __init__(
-        self,
-        rdclass: dns.rdataclass.RdataClass,
-        rdtype: dns.rdatatype.RdataType,
-        strings: Iterable[Union[bytes, str]],
-    ):
-        """Initialize a TXT-like rdata.
-
-        *rdclass*, an ``int`` is the rdataclass of the Rdata.
-
-        *rdtype*, an ``int`` is the rdatatype of the Rdata.
-
-        *strings*, a tuple of ``bytes``
-        """
-        super().__init__(rdclass, rdtype)
-        self.strings: Tuple[bytes] = self._as_tuple(
-            strings, lambda x: self._as_bytes(x, True, 255)
-        )
-        if len(self.strings) == 0:
-            raise ValueError("the list of strings must not be empty")
-
-    def to_text(
-        self,
-        origin: Optional[dns.name.Name] = None,
-        relativize: bool = True,
-        **kw: Dict[str, Any],
-    ) -> str:
-        txt = ""
-        prefix = ""
-        for s in self.strings:
-            txt += f'{prefix}"{dns.rdata._escapify(s)}"'
-            prefix = " "
-        return txt
-
-    @classmethod
-    def from_text(
-        cls,
-        rdclass: dns.rdataclass.RdataClass,
-        rdtype: dns.rdatatype.RdataType,
-        tok: dns.tokenizer.Tokenizer,
-        origin: Optional[dns.name.Name] = None,
-        relativize: bool = True,
-        relativize_to: Optional[dns.name.Name] = None,
-    ) -> dns.rdata.Rdata:
-        strings = []
-        for token in tok.get_remaining():
-            token = token.unescape_to_bytes()
-            # The 'if' below is always true in the current code, but we
-            # are leaving this check in in case things change some day.
-            if not (
-                token.is_quoted_string() or token.is_identifier()
-            ):  # pragma: no cover
-                raise dns.exception.SyntaxError("expected a string")
-            if len(token.value) > 255:
-                raise dns.exception.SyntaxError("string too long")
-            strings.append(token.value)
-        if len(strings) == 0:
-            raise dns.exception.UnexpectedEnd
-        return cls(rdclass, rdtype, strings)
-
-    def _to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        for s in self.strings:
-            with dns.renderer.prefixed_length(file, 1):
-                file.write(s)
-
-    @classmethod
-    def from_wire_parser(cls, rdclass, rdtype, parser, origin=None):
-        strings = []
-        while parser.remaining() > 0:
-            s = parser.get_counted_bytes()
-            strings.append(s)
-        return cls(rdclass, rdtype, strings)
diff --git a/lib/dns/rdtypes/util.py b/lib/dns/rdtypes/util.py
deleted file mode 100644
index 653a0bf2..00000000
--- a/lib/dns/rdtypes/util.py
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2006, 2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import collections
-import random
-import struct
-from typing import Any, List
-
-import dns.exception
-import dns.ipv4
-import dns.ipv6
-import dns.name
-import dns.rdata
-
-
-class Gateway:
-    """A helper class for the IPSECKEY gateway and AMTRELAY relay fields"""
-
-    name = ""
-
-    def __init__(self, type, gateway=None):
-        self.type = dns.rdata.Rdata._as_uint8(type)
-        self.gateway = gateway
-        self._check()
-
-    @classmethod
-    def _invalid_type(cls, gateway_type):
-        return f"invalid {cls.name} type: {gateway_type}"
-
-    def _check(self):
-        if self.type == 0:
-            if self.gateway not in (".", None):
-                raise SyntaxError(f"invalid {self.name} for type 0")
-            self.gateway = None
-        elif self.type == 1:
-            # check that it's OK
-            dns.ipv4.inet_aton(self.gateway)
-        elif self.type == 2:
-            # check that it's OK
-            dns.ipv6.inet_aton(self.gateway)
-        elif self.type == 3:
-            if not isinstance(self.gateway, dns.name.Name):
-                raise SyntaxError(f"invalid {self.name}; not a name")
-        else:
-            raise SyntaxError(self._invalid_type(self.type))
-
-    def to_text(self, origin=None, relativize=True):
-        if self.type == 0:
-            return "."
-        elif self.type in (1, 2):
-            return self.gateway
-        elif self.type == 3:
-            return str(self.gateway.choose_relativity(origin, relativize))
-        else:
-            raise ValueError(self._invalid_type(self.type))  # pragma: no cover
-
-    @classmethod
-    def from_text(
-        cls, gateway_type, tok, origin=None, relativize=True, relativize_to=None
-    ):
-        if gateway_type in (0, 1, 2):
-            gateway = tok.get_string()
-        elif gateway_type == 3:
-            gateway = tok.get_name(origin, relativize, relativize_to)
-        else:
-            raise dns.exception.SyntaxError(
-                cls._invalid_type(gateway_type)
-            )  # pragma: no cover
-        return cls(gateway_type, gateway)
-
-    # pylint: disable=unused-argument
-    def to_wire(self, file, compress=None, origin=None, canonicalize=False):
-        if self.type == 0:
-            pass
-        elif self.type == 1:
-            file.write(dns.ipv4.inet_aton(self.gateway))
-        elif self.type == 2:
-            file.write(dns.ipv6.inet_aton(self.gateway))
-        elif self.type == 3:
-            self.gateway.to_wire(file, None, origin, False)
-        else:
-            raise ValueError(self._invalid_type(self.type))  # pragma: no cover
-
-    # pylint: enable=unused-argument
-
-    @classmethod
-    def from_wire_parser(cls, gateway_type, parser, origin=None):
-        if gateway_type == 0:
-            gateway = None
-        elif gateway_type == 1:
-            gateway = dns.ipv4.inet_ntoa(parser.get_bytes(4))
-        elif gateway_type == 2:
-            gateway = dns.ipv6.inet_ntoa(parser.get_bytes(16))
-        elif gateway_type == 3:
-            gateway = parser.get_name(origin)
-        else:
-            raise dns.exception.FormError(cls._invalid_type(gateway_type))
-        return cls(gateway_type, gateway)
-
-
-class Bitmap:
-    """A helper class for the NSEC/NSEC3/CSYNC type bitmaps"""
-
-    type_name = ""
-
-    def __init__(self, windows=None):
-        last_window = -1
-        self.windows = windows
-        for window, bitmap in self.windows:
-            if not isinstance(window, int):
-                raise ValueError(f"bad {self.type_name} window type")
-            if window <= last_window:
-                raise ValueError(f"bad {self.type_name} window order")
-            if window > 256:
-                raise ValueError(f"bad {self.type_name} window number")
-            last_window = window
-            if not isinstance(bitmap, bytes):
-                raise ValueError(f"bad {self.type_name} octets type")
-            if len(bitmap) == 0 or len(bitmap) > 32:
-                raise ValueError(f"bad {self.type_name} octets")
-
-    def to_text(self) -> str:
-        text = ""
-        for window, bitmap in self.windows:
-            bits = []
-            for i, byte in enumerate(bitmap):
-                for j in range(0, 8):
-                    if byte & (0x80 >> j):
-                        rdtype = window * 256 + i * 8 + j
-                        bits.append(dns.rdatatype.to_text(rdtype))
-            text += " " + " ".join(bits)
-        return text
-
-    @classmethod
-    def from_text(cls, tok: "dns.tokenizer.Tokenizer") -> "Bitmap":
-        rdtypes = []
-        for token in tok.get_remaining():
-            rdtype = dns.rdatatype.from_text(token.unescape().value)
-            if rdtype == 0:
-                raise dns.exception.SyntaxError(f"{cls.type_name} with bit 0")
-            rdtypes.append(rdtype)
-        return cls.from_rdtypes(rdtypes)
-
-    @classmethod
-    def from_rdtypes(cls, rdtypes: List[dns.rdatatype.RdataType]) -> "Bitmap":
-        rdtypes = sorted(rdtypes)
-        window = 0
-        octets = 0
-        prior_rdtype = 0
-        bitmap = bytearray(b"\0" * 32)
-        windows = []
-        for rdtype in rdtypes:
-            if rdtype == prior_rdtype:
-                continue
-            prior_rdtype = rdtype
-            new_window = rdtype // 256
-            if new_window != window:
-                if octets != 0:
-                    windows.append((window, bytes(bitmap[0:octets])))
-                bitmap = bytearray(b"\0" * 32)
-                window = new_window
-            offset = rdtype % 256
-            byte = offset // 8
-            bit = offset % 8
-            octets = byte + 1
-            bitmap[byte] = bitmap[byte] | (0x80 >> bit)
-        if octets != 0:
-            windows.append((window, bytes(bitmap[0:octets])))
-        return cls(windows)
-
-    def to_wire(self, file: Any) -> None:
-        for window, bitmap in self.windows:
-            file.write(struct.pack("!BB", window, len(bitmap)))
-            file.write(bitmap)
-
-    @classmethod
-    def from_wire_parser(cls, parser: "dns.wire.Parser") -> "Bitmap":
-        windows = []
-        while parser.remaining() > 0:
-            window = parser.get_uint8()
-            bitmap = parser.get_counted_bytes()
-            windows.append((window, bitmap))
-        return cls(windows)
-
-
-def _priority_table(items):
-    by_priority = collections.defaultdict(list)
-    for rdata in items:
-        by_priority[rdata._processing_priority()].append(rdata)
-    return by_priority
-
-
-def priority_processing_order(iterable):
-    items = list(iterable)
-    if len(items) == 1:
-        return items
-    by_priority = _priority_table(items)
-    ordered = []
-    for k in sorted(by_priority.keys()):
-        rdatas = by_priority[k]
-        random.shuffle(rdatas)
-        ordered.extend(rdatas)
-    return ordered
-
-
-_no_weight = 0.1
-
-
-def weighted_processing_order(iterable):
-    items = list(iterable)
-    if len(items) == 1:
-        return items
-    by_priority = _priority_table(items)
-    ordered = []
-    for k in sorted(by_priority.keys()):
-        rdatas = by_priority[k]
-        total = sum(rdata._processing_weight() or _no_weight for rdata in rdatas)
-        while len(rdatas) > 1:
-            r = random.uniform(0, total)
-            for n, rdata in enumerate(rdatas):  # noqa: B007
-                weight = rdata._processing_weight() or _no_weight
-                if weight > r:
-                    break
-                r -= weight
-            total -= weight
-            ordered.append(rdata)  # pylint: disable=undefined-loop-variable
-            del rdatas[n]  # pylint: disable=undefined-loop-variable
-        ordered.append(rdatas[0])
-    return ordered
-
-
-def parse_formatted_hex(formatted, num_chunks, chunk_size, separator):
-    if len(formatted) != num_chunks * (chunk_size + 1) - 1:
-        raise ValueError("invalid formatted hex string")
-    value = b""
-    for _ in range(num_chunks):
-        chunk = formatted[0:chunk_size]
-        value += int(chunk, 16).to_bytes(chunk_size // 2, "big")
-        formatted = formatted[chunk_size:]
-        if len(formatted) > 0 and formatted[0] != separator:
-            raise ValueError("invalid formatted hex string")
-        formatted = formatted[1:]
-    return value
diff --git a/lib/dns/renderer.py b/lib/dns/renderer.py
deleted file mode 100644
index a77481f6..00000000
--- a/lib/dns/renderer.py
+++ /dev/null
@@ -1,346 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2001-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""Help for building DNS wire format messages"""
-
-import contextlib
-import io
-import random
-import struct
-import time
-
-import dns.exception
-import dns.tsig
-
-QUESTION = 0
-ANSWER = 1
-AUTHORITY = 2
-ADDITIONAL = 3
-
-
-@contextlib.contextmanager
-def prefixed_length(output, length_length):
-    output.write(b"\00" * length_length)
-    start = output.tell()
-    yield
-    end = output.tell()
-    length = end - start
-    if length > 0:
-        try:
-            output.seek(start - length_length)
-            try:
-                output.write(length.to_bytes(length_length, "big"))
-            except OverflowError:
-                raise dns.exception.FormError
-        finally:
-            output.seek(end)
-
-
-class Renderer:
-    """Helper class for building DNS wire-format messages.
-
-    Most applications can use the higher-level L{dns.message.Message}
-    class and its to_wire() method to generate wire-format messages.
-    This class is for those applications which need finer control
-    over the generation of messages.
-
-    Typical use::
-
-        r = dns.renderer.Renderer(id=1, flags=0x80, max_size=512)
-        r.add_question(qname, qtype, qclass)
-        r.add_rrset(dns.renderer.ANSWER, rrset_1)
-        r.add_rrset(dns.renderer.ANSWER, rrset_2)
-        r.add_rrset(dns.renderer.AUTHORITY, ns_rrset)
-        r.add_rrset(dns.renderer.ADDITIONAL, ad_rrset_1)
-        r.add_rrset(dns.renderer.ADDITIONAL, ad_rrset_2)
-        r.add_edns(0, 0, 4096)
-        r.write_header()
-        r.add_tsig(keyname, secret, 300, 1, 0, '', request_mac)
-        wire = r.get_wire()
-
-    If padding is going to be used, then the OPT record MUST be
-    written after everything else in the additional section except for
-    the TSIG (if any).
-
-    output, an io.BytesIO, where rendering is written
-
-    id: the message id
-
-    flags: the message flags
-
-    max_size: the maximum size of the message
-
-    origin: the origin to use when rendering relative names
-
-    compress: the compression table
-
-    section: an int, the section currently being rendered
-
-    counts: list of the number of RRs in each section
-
-    mac: the MAC of the rendered message (if TSIG was used)
-    """
-
-    def __init__(self, id=None, flags=0, max_size=65535, origin=None):
-        """Initialize a new renderer."""
-
-        self.output = io.BytesIO()
-        if id is None:
-            self.id = random.randint(0, 65535)
-        else:
-            self.id = id
-        self.flags = flags
-        self.max_size = max_size
-        self.origin = origin
-        self.compress = {}
-        self.section = QUESTION
-        self.counts = [0, 0, 0, 0]
-        self.output.write(b"\x00" * 12)
-        self.mac = ""
-        self.reserved = 0
-        self.was_padded = False
-
-    def _rollback(self, where):
-        """Truncate the output buffer at offset *where*, and remove any
-        compression table entries that pointed beyond the truncation
-        point.
-        """
-
-        self.output.seek(where)
-        self.output.truncate()
-        keys_to_delete = []
-        for k, v in self.compress.items():
-            if v >= where:
-                keys_to_delete.append(k)
-        for k in keys_to_delete:
-            del self.compress[k]
-
-    def _set_section(self, section):
-        """Set the renderer's current section.
-
-        Sections must be rendered order: QUESTION, ANSWER, AUTHORITY,
-        ADDITIONAL.  Sections may be empty.
-
-        Raises dns.exception.FormError if an attempt was made to set
-        a section value less than the current section.
-        """
-
-        if self.section != section:
-            if self.section > section:
-                raise dns.exception.FormError
-            self.section = section
-
-    @contextlib.contextmanager
-    def _track_size(self):
-        start = self.output.tell()
-        yield start
-        if self.output.tell() > self.max_size:
-            self._rollback(start)
-            raise dns.exception.TooBig
-
-    @contextlib.contextmanager
-    def _temporarily_seek_to(self, where):
-        current = self.output.tell()
-        try:
-            self.output.seek(where)
-            yield
-        finally:
-            self.output.seek(current)
-
-    def add_question(self, qname, rdtype, rdclass=dns.rdataclass.IN):
-        """Add a question to the message."""
-
-        self._set_section(QUESTION)
-        with self._track_size():
-            qname.to_wire(self.output, self.compress, self.origin)
-            self.output.write(struct.pack("!HH", rdtype, rdclass))
-        self.counts[QUESTION] += 1
-
-    def add_rrset(self, section, rrset, **kw):
-        """Add the rrset to the specified section.
-
-        Any keyword arguments are passed on to the rdataset's to_wire()
-        routine.
-        """
-
-        self._set_section(section)
-        with self._track_size():
-            n = rrset.to_wire(self.output, self.compress, self.origin, **kw)
-        self.counts[section] += n
-
-    def add_rdataset(self, section, name, rdataset, **kw):
-        """Add the rdataset to the specified section, using the specified
-        name as the owner name.
-
-        Any keyword arguments are passed on to the rdataset's to_wire()
-        routine.
-        """
-
-        self._set_section(section)
-        with self._track_size():
-            n = rdataset.to_wire(name, self.output, self.compress, self.origin, **kw)
-        self.counts[section] += n
-
-    def add_opt(self, opt, pad=0, opt_size=0, tsig_size=0):
-        """Add *opt* to the additional section, applying padding if desired.  The
-        padding will take the specified precomputed OPT size and TSIG size into
-        account.
-
-        Note that we don't have reliable way of knowing how big a GSS-TSIG digest
-        might be, so we we might not get an even multiple of the pad in that case."""
-        if pad:
-            ttl = opt.ttl
-            assert opt_size >= 11
-            opt_rdata = opt[0]
-            size_without_padding = self.output.tell() + opt_size + tsig_size
-            remainder = size_without_padding % pad
-            if remainder:
-                pad = b"\x00" * (pad - remainder)
-            else:
-                pad = b""
-            options = list(opt_rdata.options)
-            options.append(dns.edns.GenericOption(dns.edns.OptionType.PADDING, pad))
-            opt = dns.message.Message._make_opt(ttl, opt_rdata.rdclass, options)
-            self.was_padded = True
-        self.add_rrset(ADDITIONAL, opt)
-
-    def add_edns(self, edns, ednsflags, payload, options=None):
-        """Add an EDNS OPT record to the message."""
-
-        # make sure the EDNS version in ednsflags agrees with edns
-        ednsflags &= 0xFF00FFFF
-        ednsflags |= edns << 16
-        opt = dns.message.Message._make_opt(ednsflags, payload, options)
-        self.add_opt(opt)
-
-    def add_tsig(
-        self,
-        keyname,
-        secret,
-        fudge,
-        id,
-        tsig_error,
-        other_data,
-        request_mac,
-        algorithm=dns.tsig.default_algorithm,
-    ):
-        """Add a TSIG signature to the message."""
-
-        s = self.output.getvalue()
-
-        if isinstance(secret, dns.tsig.Key):
-            key = secret
-        else:
-            key = dns.tsig.Key(keyname, secret, algorithm)
-        tsig = dns.message.Message._make_tsig(
-            keyname, algorithm, 0, fudge, b"", id, tsig_error, other_data
-        )
-        (tsig, _) = dns.tsig.sign(s, key, tsig[0], int(time.time()), request_mac)
-        self._write_tsig(tsig, keyname)
-
-    def add_multi_tsig(
-        self,
-        ctx,
-        keyname,
-        secret,
-        fudge,
-        id,
-        tsig_error,
-        other_data,
-        request_mac,
-        algorithm=dns.tsig.default_algorithm,
-    ):
-        """Add a TSIG signature to the message. Unlike add_tsig(), this can be
-        used for a series of consecutive DNS envelopes, e.g. for a zone
-        transfer over TCP [RFC2845, 4.4].
-
-        For the first message in the sequence, give ctx=None. For each
-        subsequent message, give the ctx that was returned from the
-        add_multi_tsig() call for the previous message."""
-
-        s = self.output.getvalue()
-
-        if isinstance(secret, dns.tsig.Key):
-            key = secret
-        else:
-            key = dns.tsig.Key(keyname, secret, algorithm)
-        tsig = dns.message.Message._make_tsig(
-            keyname, algorithm, 0, fudge, b"", id, tsig_error, other_data
-        )
-        (tsig, ctx) = dns.tsig.sign(
-            s, key, tsig[0], int(time.time()), request_mac, ctx, True
-        )
-        self._write_tsig(tsig, keyname)
-        return ctx
-
-    def _write_tsig(self, tsig, keyname):
-        if self.was_padded:
-            compress = None
-        else:
-            compress = self.compress
-        self._set_section(ADDITIONAL)
-        with self._track_size():
-            keyname.to_wire(self.output, compress, self.origin)
-            self.output.write(
-                struct.pack("!HHI", dns.rdatatype.TSIG, dns.rdataclass.ANY, 0)
-            )
-            with prefixed_length(self.output, 2):
-                tsig.to_wire(self.output)
-
-        self.counts[ADDITIONAL] += 1
-        with self._temporarily_seek_to(10):
-            self.output.write(struct.pack("!H", self.counts[ADDITIONAL]))
-
-    def write_header(self):
-        """Write the DNS message header.
-
-        Writing the DNS message header is done after all sections
-        have been rendered, but before the optional TSIG signature
-        is added.
-        """
-
-        with self._temporarily_seek_to(0):
-            self.output.write(
-                struct.pack(
-                    "!HHHHHH",
-                    self.id,
-                    self.flags,
-                    self.counts[0],
-                    self.counts[1],
-                    self.counts[2],
-                    self.counts[3],
-                )
-            )
-
-    def get_wire(self):
-        """Return the wire format message."""
-
-        return self.output.getvalue()
-
-    def reserve(self, size: int) -> None:
-        """Reserve *size* bytes."""
-        if size < 0:
-            raise ValueError("reserved amount must be non-negative")
-        if size > self.max_size:
-            raise ValueError("cannot reserve more than the maximum size")
-        self.reserved += size
-        self.max_size -= size
-
-    def release_reserved(self) -> None:
-        """Release the reserved bytes."""
-        self.max_size += self.reserved
-        self.reserved = 0
diff --git a/lib/dns/resolver.py b/lib/dns/resolver.py
deleted file mode 100644
index 3ba76e31..00000000
--- a/lib/dns/resolver.py
+++ /dev/null
@@ -1,2053 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""DNS stub resolver."""
-
-import contextlib
-import random
-import socket
-import sys
-import threading
-import time
-import warnings
-from typing import Any, Dict, Iterator, List, Optional, Sequence, Tuple, Union
-from urllib.parse import urlparse
-
-import dns._ddr
-import dns.edns
-import dns.exception
-import dns.flags
-import dns.inet
-import dns.ipv4
-import dns.ipv6
-import dns.message
-import dns.name
-import dns.rdata
-import dns.nameserver
-import dns.query
-import dns.rcode
-import dns.rdataclass
-import dns.rdatatype
-import dns.rdtypes.svcbbase
-import dns.reversename
-import dns.tsig
-
-if sys.platform == "win32":  # pragma: no cover
-    import dns.win32util
-
-
-class NXDOMAIN(dns.exception.DNSException):
-    """The DNS query name does not exist."""
-
-    supp_kwargs = {"qnames", "responses"}
-    fmt = None  # we have our own __str__ implementation
-
-    # pylint: disable=arguments-differ
-
-    # We do this as otherwise mypy complains about unexpected keyword argument
-    # idna_exception
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-    def _check_kwargs(self, qnames, responses=None):
-        if not isinstance(qnames, (list, tuple, set)):
-            raise AttributeError("qnames must be a list, tuple or set")
-        if len(qnames) == 0:
-            raise AttributeError("qnames must contain at least one element")
-        if responses is None:
-            responses = {}
-        elif not isinstance(responses, dict):
-            raise AttributeError("responses must be a dict(qname=response)")
-        kwargs = dict(qnames=qnames, responses=responses)
-        return kwargs
-
-    def __str__(self) -> str:
-        if "qnames" not in self.kwargs:
-            return super().__str__()
-        qnames = self.kwargs["qnames"]
-        if len(qnames) > 1:
-            msg = "None of DNS query names exist"
-        else:
-            msg = "The DNS query name does not exist"
-        qnames = ", ".join(map(str, qnames))
-        return f"{msg}: {qnames}"
-
-    @property
-    def canonical_name(self):
-        """Return the unresolved canonical name."""
-        if "qnames" not in self.kwargs:
-            raise TypeError("parametrized exception required")
-        for qname in self.kwargs["qnames"]:
-            response = self.kwargs["responses"][qname]
-            try:
-                cname = response.canonical_name()
-                if cname != qname:
-                    return cname
-            except Exception:  # pragma: no cover
-                # We can just eat this exception as it means there was
-                # something wrong with the response.
-                pass
-        return self.kwargs["qnames"][0]
-
-    def __add__(self, e_nx):
-        """Augment by results from another NXDOMAIN exception."""
-        qnames0 = list(self.kwargs.get("qnames", []))
-        responses0 = dict(self.kwargs.get("responses", {}))
-        responses1 = e_nx.kwargs.get("responses", {})
-        for qname1 in e_nx.kwargs.get("qnames", []):
-            if qname1 not in qnames0:
-                qnames0.append(qname1)
-            if qname1 in responses1:
-                responses0[qname1] = responses1[qname1]
-        return NXDOMAIN(qnames=qnames0, responses=responses0)
-
-    def qnames(self):
-        """All of the names that were tried.
-
-        Returns a list of ``dns.name.Name``.
-        """
-        return self.kwargs["qnames"]
-
-    def responses(self):
-        """A map from queried names to their NXDOMAIN responses.
-
-        Returns a dict mapping a ``dns.name.Name`` to a
-        ``dns.message.Message``.
-        """
-        return self.kwargs["responses"]
-
-    def response(self, qname):
-        """The response for query *qname*.
-
-        Returns a ``dns.message.Message``.
-        """
-        return self.kwargs["responses"][qname]
-
-
-class YXDOMAIN(dns.exception.DNSException):
-    """The DNS query name is too long after DNAME substitution."""
-
-
-ErrorTuple = Tuple[
-    Optional[str],
-    bool,
-    int,
-    Union[Exception, str],
-    Optional[dns.message.Message],
-]
-
-
-def _errors_to_text(errors: List[ErrorTuple]) -> List[str]:
-    """Turn a resolution errors trace into a list of text."""
-    texts = []
-    for err in errors:
-        texts.append(f"Server {err[0]} answered {err[3]}")
-    return texts
-
-
-class LifetimeTimeout(dns.exception.Timeout):
-    """The resolution lifetime expired."""
-
-    msg = "The resolution lifetime expired."
-    fmt = f"{msg[:-1]} after {{timeout:.3f}} seconds: {{errors}}"
-    supp_kwargs = {"timeout", "errors"}
-
-    # We do this as otherwise mypy complains about unexpected keyword argument
-    # idna_exception
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-    def _fmt_kwargs(self, **kwargs):
-        srv_msgs = _errors_to_text(kwargs["errors"])
-        return super()._fmt_kwargs(
-            timeout=kwargs["timeout"], errors="; ".join(srv_msgs)
-        )
-
-
-# We added more detail to resolution timeouts, but they are still
-# subclasses of dns.exception.Timeout for backwards compatibility.  We also
-# keep dns.resolver.Timeout defined for backwards compatibility.
-Timeout = LifetimeTimeout
-
-
-class NoAnswer(dns.exception.DNSException):
-    """The DNS response does not contain an answer to the question."""
-
-    fmt = "The DNS response does not contain an answer to the question: {query}"
-    supp_kwargs = {"response"}
-
-    # We do this as otherwise mypy complains about unexpected keyword argument
-    # idna_exception
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-    def _fmt_kwargs(self, **kwargs):
-        return super()._fmt_kwargs(query=kwargs["response"].question)
-
-    def response(self):
-        return self.kwargs["response"]
-
-
-class NoNameservers(dns.exception.DNSException):
-    """All nameservers failed to answer the query.
-
-    errors: list of servers and respective errors
-    The type of errors is
-    [(server IP address, any object convertible to string)].
-    Non-empty errors list will add explanatory message ()
-    """
-
-    msg = "All nameservers failed to answer the query."
-    fmt = f"{msg[:-1]} {{query}}: {{errors}}"
-    supp_kwargs = {"request", "errors"}
-
-    # We do this as otherwise mypy complains about unexpected keyword argument
-    # idna_exception
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-    def _fmt_kwargs(self, **kwargs):
-        srv_msgs = _errors_to_text(kwargs["errors"])
-        return super()._fmt_kwargs(
-            query=kwargs["request"].question, errors="; ".join(srv_msgs)
-        )
-
-
-class NotAbsolute(dns.exception.DNSException):
-    """An absolute domain name is required but a relative name was provided."""
-
-
-class NoRootSOA(dns.exception.DNSException):
-    """There is no SOA RR at the DNS root name. This should never happen!"""
-
-
-class NoMetaqueries(dns.exception.DNSException):
-    """DNS metaqueries are not allowed."""
-
-
-class NoResolverConfiguration(dns.exception.DNSException):
-    """Resolver configuration could not be read or specified no nameservers."""
-
-
-class Answer:
-    """DNS stub resolver answer.
-
-    Instances of this class bundle up the result of a successful DNS
-    resolution.
-
-    For convenience, the answer object implements much of the sequence
-    protocol, forwarding to its ``rrset`` attribute.  E.g.
-    ``for a in answer`` is equivalent to ``for a in answer.rrset``.
-    ``answer[i]`` is equivalent to ``answer.rrset[i]``, and
-    ``answer[i:j]`` is equivalent to ``answer.rrset[i:j]``.
-
-    Note that CNAMEs or DNAMEs in the response may mean that answer
-    RRset's name might not be the query name.
-    """
-
-    def __init__(
-        self,
-        qname: dns.name.Name,
-        rdtype: dns.rdatatype.RdataType,
-        rdclass: dns.rdataclass.RdataClass,
-        response: dns.message.QueryMessage,
-        nameserver: Optional[str] = None,
-        port: Optional[int] = None,
-    ) -> None:
-        self.qname = qname
-        self.rdtype = rdtype
-        self.rdclass = rdclass
-        self.response = response
-        self.nameserver = nameserver
-        self.port = port
-        self.chaining_result = response.resolve_chaining()
-        # Copy some attributes out of chaining_result for backwards
-        # compatibility and convenience.
-        self.canonical_name = self.chaining_result.canonical_name
-        self.rrset = self.chaining_result.answer
-        self.expiration = time.time() + self.chaining_result.minimum_ttl
-
-    def __getattr__(self, attr):  # pragma: no cover
-        if attr == "name":
-            return self.rrset.name
-        elif attr == "ttl":
-            return self.rrset.ttl
-        elif attr == "covers":
-            return self.rrset.covers
-        elif attr == "rdclass":
-            return self.rrset.rdclass
-        elif attr == "rdtype":
-            return self.rrset.rdtype
-        else:
-            raise AttributeError(attr)
-
-    def __len__(self) -> int:
-        return self.rrset and len(self.rrset) or 0
-
-    def __iter__(self) -> Iterator[dns.rdata.Rdata]:
-        return self.rrset and iter(self.rrset) or iter(tuple())
-
-    def __getitem__(self, i):
-        if self.rrset is None:
-            raise IndexError
-        return self.rrset[i]
-
-    def __delitem__(self, i):
-        if self.rrset is None:
-            raise IndexError
-        del self.rrset[i]
-
-
-class Answers(dict):
-    """A dict of DNS stub resolver answers, indexed by type."""
-
-
-class HostAnswers(Answers):
-    """A dict of DNS stub resolver answers to a host name lookup, indexed by
-    type.
-    """
-
-    @classmethod
-    def make(
-        cls,
-        v6: Optional[Answer] = None,
-        v4: Optional[Answer] = None,
-        add_empty: bool = True,
-    ) -> "HostAnswers":
-        answers = HostAnswers()
-        if v6 is not None and (add_empty or v6.rrset):
-            answers[dns.rdatatype.AAAA] = v6
-        if v4 is not None and (add_empty or v4.rrset):
-            answers[dns.rdatatype.A] = v4
-        return answers
-
-    # Returns pairs of (address, family) from this result, potentially
-    # filtering by address family.
-    def addresses_and_families(
-        self, family: int = socket.AF_UNSPEC
-    ) -> Iterator[Tuple[str, int]]:
-        if family == socket.AF_UNSPEC:
-            yield from self.addresses_and_families(socket.AF_INET6)
-            yield from self.addresses_and_families(socket.AF_INET)
-            return
-        elif family == socket.AF_INET6:
-            answer = self.get(dns.rdatatype.AAAA)
-        elif family == socket.AF_INET:
-            answer = self.get(dns.rdatatype.A)
-        else:  # pragma: no cover
-            raise NotImplementedError(f"unknown address family {family}")
-        if answer:
-            for rdata in answer:
-                yield (rdata.address, family)
-
-    # Returns addresses from this result, potentially filtering by
-    # address family.
-    def addresses(self, family: int = socket.AF_UNSPEC) -> Iterator[str]:
-        return (pair[0] for pair in self.addresses_and_families(family))
-
-    # Returns the canonical name from this result.
-    def canonical_name(self) -> dns.name.Name:
-        answer = self.get(dns.rdatatype.AAAA, self.get(dns.rdatatype.A))
-        return answer.canonical_name
-
-
-class CacheStatistics:
-    """Cache Statistics"""
-
-    def __init__(self, hits: int = 0, misses: int = 0) -> None:
-        self.hits = hits
-        self.misses = misses
-
-    def reset(self) -> None:
-        self.hits = 0
-        self.misses = 0
-
-    def clone(self) -> "CacheStatistics":
-        return CacheStatistics(self.hits, self.misses)
-
-
-class CacheBase:
-    def __init__(self) -> None:
-        self.lock = threading.Lock()
-        self.statistics = CacheStatistics()
-
-    def reset_statistics(self) -> None:
-        """Reset all statistics to zero."""
-        with self.lock:
-            self.statistics.reset()
-
-    def hits(self) -> int:
-        """How many hits has the cache had?"""
-        with self.lock:
-            return self.statistics.hits
-
-    def misses(self) -> int:
-        """How many misses has the cache had?"""
-        with self.lock:
-            return self.statistics.misses
-
-    def get_statistics_snapshot(self) -> CacheStatistics:
-        """Return a consistent snapshot of all the statistics.
-
-        If running with multiple threads, it's better to take a
-        snapshot than to call statistics methods such as hits() and
-        misses() individually.
-        """
-        with self.lock:
-            return self.statistics.clone()
-
-
-CacheKey = Tuple[dns.name.Name, dns.rdatatype.RdataType, dns.rdataclass.RdataClass]
-
-
-class Cache(CacheBase):
-    """Simple thread-safe DNS answer cache."""
-
-    def __init__(self, cleaning_interval: float = 300.0) -> None:
-        """*cleaning_interval*, a ``float`` is the number of seconds between
-        periodic cleanings.
-        """
-
-        super().__init__()
-        self.data: Dict[CacheKey, Answer] = {}
-        self.cleaning_interval = cleaning_interval
-        self.next_cleaning: float = time.time() + self.cleaning_interval
-
-    def _maybe_clean(self) -> None:
-        """Clean the cache if it's time to do so."""
-
-        now = time.time()
-        if self.next_cleaning <= now:
-            keys_to_delete = []
-            for k, v in self.data.items():
-                if v.expiration <= now:
-                    keys_to_delete.append(k)
-            for k in keys_to_delete:
-                del self.data[k]
-            now = time.time()
-            self.next_cleaning = now + self.cleaning_interval
-
-    def get(self, key: CacheKey) -> Optional[Answer]:
-        """Get the answer associated with *key*.
-
-        Returns None if no answer is cached for the key.
-
-        *key*, a ``(dns.name.Name, dns.rdatatype.RdataType, dns.rdataclass.RdataClass)``
-        tuple whose values are the query name, rdtype, and rdclass respectively.
-
-        Returns a ``dns.resolver.Answer`` or ``None``.
-        """
-
-        with self.lock:
-            self._maybe_clean()
-            v = self.data.get(key)
-            if v is None or v.expiration <= time.time():
-                self.statistics.misses += 1
-                return None
-            self.statistics.hits += 1
-            return v
-
-    def put(self, key: CacheKey, value: Answer) -> None:
-        """Associate key and value in the cache.
-
-        *key*, a ``(dns.name.Name, dns.rdatatype.RdataType, dns.rdataclass.RdataClass)``
-        tuple whose values are the query name, rdtype, and rdclass respectively.
-
-        *value*, a ``dns.resolver.Answer``, the answer.
-        """
-
-        with self.lock:
-            self._maybe_clean()
-            self.data[key] = value
-
-    def flush(self, key: Optional[CacheKey] = None) -> None:
-        """Flush the cache.
-
-        If *key* is not ``None``, only that item is flushed.  Otherwise the entire cache
-        is flushed.
-
-        *key*, a ``(dns.name.Name, dns.rdatatype.RdataType, dns.rdataclass.RdataClass)``
-        tuple whose values are the query name, rdtype, and rdclass respectively.
-        """
-
-        with self.lock:
-            if key is not None:
-                if key in self.data:
-                    del self.data[key]
-            else:
-                self.data = {}
-                self.next_cleaning = time.time() + self.cleaning_interval
-
-
-class LRUCacheNode:
-    """LRUCache node."""
-
-    def __init__(self, key, value):
-        self.key = key
-        self.value = value
-        self.hits = 0
-        self.prev = self
-        self.next = self
-
-    def link_after(self, node: "LRUCacheNode") -> None:
-        self.prev = node
-        self.next = node.next
-        node.next.prev = self
-        node.next = self
-
-    def unlink(self) -> None:
-        self.next.prev = self.prev
-        self.prev.next = self.next
-
-
-class LRUCache(CacheBase):
-    """Thread-safe, bounded, least-recently-used DNS answer cache.
-
-    This cache is better than the simple cache (above) if you're
-    running a web crawler or other process that does a lot of
-    resolutions.  The LRUCache has a maximum number of nodes, and when
-    it is full, the least-recently used node is removed to make space
-    for a new one.
-    """
-
-    def __init__(self, max_size: int = 100000) -> None:
-        """*max_size*, an ``int``, is the maximum number of nodes to cache;
-        it must be greater than 0.
-        """
-
-        super().__init__()
-        self.data: Dict[CacheKey, LRUCacheNode] = {}
-        self.set_max_size(max_size)
-        self.sentinel: LRUCacheNode = LRUCacheNode(None, None)
-        self.sentinel.prev = self.sentinel
-        self.sentinel.next = self.sentinel
-
-    def set_max_size(self, max_size: int) -> None:
-        if max_size < 1:
-            max_size = 1
-        self.max_size = max_size
-
-    def get(self, key: CacheKey) -> Optional[Answer]:
-        """Get the answer associated with *key*.
-
-        Returns None if no answer is cached for the key.
-
-        *key*, a ``(dns.name.Name, dns.rdatatype.RdataType, dns.rdataclass.RdataClass)``
-        tuple whose values are the query name, rdtype, and rdclass respectively.
-
-        Returns a ``dns.resolver.Answer`` or ``None``.
-        """
-
-        with self.lock:
-            node = self.data.get(key)
-            if node is None:
-                self.statistics.misses += 1
-                return None
-            # Unlink because we're either going to move the node to the front
-            # of the LRU list or we're going to free it.
-            node.unlink()
-            if node.value.expiration <= time.time():
-                del self.data[node.key]
-                self.statistics.misses += 1
-                return None
-            node.link_after(self.sentinel)
-            self.statistics.hits += 1
-            node.hits += 1
-            return node.value
-
-    def get_hits_for_key(self, key: CacheKey) -> int:
-        """Return the number of cache hits associated with the specified key."""
-        with self.lock:
-            node = self.data.get(key)
-            if node is None or node.value.expiration <= time.time():
-                return 0
-            else:
-                return node.hits
-
-    def put(self, key: CacheKey, value: Answer) -> None:
-        """Associate key and value in the cache.
-
-        *key*, a ``(dns.name.Name, dns.rdatatype.RdataType, dns.rdataclass.RdataClass)``
-        tuple whose values are the query name, rdtype, and rdclass respectively.
-
-        *value*, a ``dns.resolver.Answer``, the answer.
-        """
-
-        with self.lock:
-            node = self.data.get(key)
-            if node is not None:
-                node.unlink()
-                del self.data[node.key]
-            while len(self.data) >= self.max_size:
-                gnode = self.sentinel.prev
-                gnode.unlink()
-                del self.data[gnode.key]
-            node = LRUCacheNode(key, value)
-            node.link_after(self.sentinel)
-            self.data[key] = node
-
-    def flush(self, key: Optional[CacheKey] = None) -> None:
-        """Flush the cache.
-
-        If *key* is not ``None``, only that item is flushed.  Otherwise the entire cache
-        is flushed.
-
-        *key*, a ``(dns.name.Name, dns.rdatatype.RdataType, dns.rdataclass.RdataClass)``
-        tuple whose values are the query name, rdtype, and rdclass respectively.
-        """
-
-        with self.lock:
-            if key is not None:
-                node = self.data.get(key)
-                if node is not None:
-                    node.unlink()
-                    del self.data[node.key]
-            else:
-                gnode = self.sentinel.next
-                while gnode != self.sentinel:
-                    next = gnode.next
-                    gnode.unlink()
-                    gnode = next
-                self.data = {}
-
-
-class _Resolution:
-    """Helper class for dns.resolver.Resolver.resolve().
-
-    All of the "business logic" of resolution is encapsulated in this
-    class, allowing us to have multiple resolve() implementations
-    using different I/O schemes without copying all of the
-    complicated logic.
-
-    This class is a "friend" to dns.resolver.Resolver and manipulates
-    resolver data structures directly.
-    """
-
-    def __init__(
-        self,
-        resolver: "BaseResolver",
-        qname: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str],
-        rdclass: Union[dns.rdataclass.RdataClass, str],
-        tcp: bool,
-        raise_on_no_answer: bool,
-        search: Optional[bool],
-    ) -> None:
-        if isinstance(qname, str):
-            qname = dns.name.from_text(qname, None)
-        rdtype = dns.rdatatype.RdataType.make(rdtype)
-        if dns.rdatatype.is_metatype(rdtype):
-            raise NoMetaqueries
-        rdclass = dns.rdataclass.RdataClass.make(rdclass)
-        if dns.rdataclass.is_metaclass(rdclass):
-            raise NoMetaqueries
-        self.resolver = resolver
-        self.qnames_to_try = resolver._get_qnames_to_try(qname, search)
-        self.qnames = self.qnames_to_try[:]
-        self.rdtype = rdtype
-        self.rdclass = rdclass
-        self.tcp = tcp
-        self.raise_on_no_answer = raise_on_no_answer
-        self.nxdomain_responses: Dict[dns.name.Name, dns.message.QueryMessage] = {}
-        # Initialize other things to help analysis tools
-        self.qname = dns.name.empty
-        self.nameservers: List[dns.nameserver.Nameserver] = []
-        self.current_nameservers: List[dns.nameserver.Nameserver] = []
-        self.errors: List[ErrorTuple] = []
-        self.nameserver: Optional[dns.nameserver.Nameserver] = None
-        self.tcp_attempt = False
-        self.retry_with_tcp = False
-        self.request: Optional[dns.message.QueryMessage] = None
-        self.backoff = 0.0
-
-    def next_request(
-        self,
-    ) -> Tuple[Optional[dns.message.QueryMessage], Optional[Answer]]:
-        """Get the next request to send, and check the cache.
-
-        Returns a (request, answer) tuple.  At most one of request or
-        answer will not be None.
-        """
-
-        # We return a tuple instead of Union[Message,Answer] as it lets
-        # the caller avoid isinstance().
-
-        while len(self.qnames) > 0:
-            self.qname = self.qnames.pop(0)
-
-            # Do we know the answer?
-            if self.resolver.cache:
-                answer = self.resolver.cache.get(
-                    (self.qname, self.rdtype, self.rdclass)
-                )
-                if answer is not None:
-                    if answer.rrset is None and self.raise_on_no_answer:
-                        raise NoAnswer(response=answer.response)
-                    else:
-                        return (None, answer)
-                answer = self.resolver.cache.get(
-                    (self.qname, dns.rdatatype.ANY, self.rdclass)
-                )
-                if answer is not None and answer.response.rcode() == dns.rcode.NXDOMAIN:
-                    # cached NXDOMAIN; record it and continue to next
-                    # name.
-                    self.nxdomain_responses[self.qname] = answer.response
-                    continue
-
-            # Build the request
-            request = dns.message.make_query(self.qname, self.rdtype, self.rdclass)
-            if self.resolver.keyname is not None:
-                request.use_tsig(
-                    self.resolver.keyring,
-                    self.resolver.keyname,
-                    algorithm=self.resolver.keyalgorithm,
-                )
-            request.use_edns(
-                self.resolver.edns,
-                self.resolver.ednsflags,
-                self.resolver.payload,
-                options=self.resolver.ednsoptions,
-            )
-            if self.resolver.flags is not None:
-                request.flags = self.resolver.flags
-
-            self.nameservers = self.resolver._enrich_nameservers(
-                self.resolver._nameservers,
-                self.resolver.nameserver_ports,
-                self.resolver.port,
-            )
-            if self.resolver.rotate:
-                random.shuffle(self.nameservers)
-            self.current_nameservers = self.nameservers[:]
-            self.errors = []
-            self.nameserver = None
-            self.tcp_attempt = False
-            self.retry_with_tcp = False
-            self.request = request
-            self.backoff = 0.10
-
-            return (request, None)
-
-        #
-        # We've tried everything and only gotten NXDOMAINs.  (We know
-        # it's only NXDOMAINs as anything else would have returned
-        # before now.)
-        #
-        raise NXDOMAIN(qnames=self.qnames_to_try, responses=self.nxdomain_responses)
-
-    def next_nameserver(self) -> Tuple[dns.nameserver.Nameserver, bool, float]:
-        if self.retry_with_tcp:
-            assert self.nameserver is not None
-            assert not self.nameserver.is_always_max_size()
-            self.tcp_attempt = True
-            self.retry_with_tcp = False
-            return (self.nameserver, True, 0)
-
-        backoff = 0.0
-        if not self.current_nameservers:
-            if len(self.nameservers) == 0:
-                # Out of things to try!
-                raise NoNameservers(request=self.request, errors=self.errors)
-            self.current_nameservers = self.nameservers[:]
-            backoff = self.backoff
-            self.backoff = min(self.backoff * 2, 2)
-
-        self.nameserver = self.current_nameservers.pop(0)
-        self.tcp_attempt = self.tcp or self.nameserver.is_always_max_size()
-        return (self.nameserver, self.tcp_attempt, backoff)
-
-    def query_result(
-        self, response: Optional[dns.message.Message], ex: Optional[Exception]
-    ) -> Tuple[Optional[Answer], bool]:
-        #
-        # returns an (answer: Answer, end_loop: bool) tuple.
-        #
-        assert self.nameserver is not None
-        if ex:
-            # Exception during I/O or from_wire()
-            assert response is None
-            self.errors.append(
-                (
-                    str(self.nameserver),
-                    self.tcp_attempt,
-                    self.nameserver.answer_port(),
-                    ex,
-                    response,
-                )
-            )
-            if (
-                isinstance(ex, dns.exception.FormError)
-                or isinstance(ex, EOFError)
-                or isinstance(ex, OSError)
-                or isinstance(ex, NotImplementedError)
-            ):
-                # This nameserver is no good, take it out of the mix.
-                self.nameservers.remove(self.nameserver)
-            elif isinstance(ex, dns.message.Truncated):
-                if self.tcp_attempt:
-                    # Truncation with TCP is no good!
-                    self.nameservers.remove(self.nameserver)
-                else:
-                    self.retry_with_tcp = True
-            return (None, False)
-        # We got an answer!
-        assert response is not None
-        assert isinstance(response, dns.message.QueryMessage)
-        rcode = response.rcode()
-        if rcode == dns.rcode.NOERROR:
-            try:
-                answer = Answer(
-                    self.qname,
-                    self.rdtype,
-                    self.rdclass,
-                    response,
-                    self.nameserver.answer_nameserver(),
-                    self.nameserver.answer_port(),
-                )
-            except Exception as e:
-                self.errors.append(
-                    (
-                        str(self.nameserver),
-                        self.tcp_attempt,
-                        self.nameserver.answer_port(),
-                        e,
-                        response,
-                    )
-                )
-                # The nameserver is no good, take it out of the mix.
-                self.nameservers.remove(self.nameserver)
-                return (None, False)
-            if self.resolver.cache:
-                self.resolver.cache.put((self.qname, self.rdtype, self.rdclass), answer)
-            if answer.rrset is None and self.raise_on_no_answer:
-                raise NoAnswer(response=answer.response)
-            return (answer, True)
-        elif rcode == dns.rcode.NXDOMAIN:
-            # Further validate the response by making an Answer, even
-            # if we aren't going to cache it.
-            try:
-                answer = Answer(
-                    self.qname, dns.rdatatype.ANY, dns.rdataclass.IN, response
-                )
-            except Exception as e:
-                self.errors.append(
-                    (
-                        str(self.nameserver),
-                        self.tcp_attempt,
-                        self.nameserver.answer_port(),
-                        e,
-                        response,
-                    )
-                )
-                # The nameserver is no good, take it out of the mix.
-                self.nameservers.remove(self.nameserver)
-                return (None, False)
-            self.nxdomain_responses[self.qname] = response
-            if self.resolver.cache:
-                self.resolver.cache.put(
-                    (self.qname, dns.rdatatype.ANY, self.rdclass), answer
-                )
-            # Make next_nameserver() return None, so caller breaks its
-            # inner loop and calls next_request().
-            return (None, True)
-        elif rcode == dns.rcode.YXDOMAIN:
-            yex = YXDOMAIN()
-            self.errors.append(
-                (
-                    str(self.nameserver),
-                    self.tcp_attempt,
-                    self.nameserver.answer_port(),
-                    yex,
-                    response,
-                )
-            )
-            raise yex
-        else:
-            #
-            # We got a response, but we're not happy with the
-            # rcode in it.
-            #
-            if rcode != dns.rcode.SERVFAIL or not self.resolver.retry_servfail:
-                self.nameservers.remove(self.nameserver)
-            self.errors.append(
-                (
-                    str(self.nameserver),
-                    self.tcp_attempt,
-                    self.nameserver.answer_port(),
-                    dns.rcode.to_text(rcode),
-                    response,
-                )
-            )
-            return (None, False)
-
-
-class BaseResolver:
-    """DNS stub resolver."""
-
-    # We initialize in reset()
-    #
-    # pylint: disable=attribute-defined-outside-init
-
-    domain: dns.name.Name
-    nameserver_ports: Dict[str, int]
-    port: int
-    search: List[dns.name.Name]
-    use_search_by_default: bool
-    timeout: float
-    lifetime: float
-    keyring: Optional[Any]
-    keyname: Optional[Union[dns.name.Name, str]]
-    keyalgorithm: Union[dns.name.Name, str]
-    edns: int
-    ednsflags: int
-    ednsoptions: Optional[List[dns.edns.Option]]
-    payload: int
-    cache: Any
-    flags: Optional[int]
-    retry_servfail: bool
-    rotate: bool
-    ndots: Optional[int]
-    _nameservers: Sequence[Union[str, dns.nameserver.Nameserver]]
-
-    def __init__(
-        self, filename: str = "/etc/resolv.conf", configure: bool = True
-    ) -> None:
-        """*filename*, a ``str`` or file object, specifying a file
-        in standard /etc/resolv.conf format.  This parameter is meaningful
-        only when *configure* is true and the platform is POSIX.
-
-        *configure*, a ``bool``.  If True (the default), the resolver
-        instance is configured in the normal fashion for the operating
-        system the resolver is running on.  (I.e. by reading a
-        /etc/resolv.conf file on POSIX systems and from the registry
-        on Windows systems.)
-        """
-
-        self.reset()
-        if configure:
-            if sys.platform == "win32":  # pragma: no cover
-                self.read_registry()
-            elif filename:
-                self.read_resolv_conf(filename)
-
-    def reset(self) -> None:
-        """Reset all resolver configuration to the defaults."""
-
-        self.domain = dns.name.Name(dns.name.from_text(socket.gethostname())[1:])
-        if len(self.domain) == 0:  # pragma: no cover
-            self.domain = dns.name.root
-        self._nameservers = []
-        self.nameserver_ports = {}
-        self.port = 53
-        self.search = []
-        self.use_search_by_default = False
-        self.timeout = 2.0
-        self.lifetime = 5.0
-        self.keyring = None
-        self.keyname = None
-        self.keyalgorithm = dns.tsig.default_algorithm
-        self.edns = -1
-        self.ednsflags = 0
-        self.ednsoptions = None
-        self.payload = 0
-        self.cache = None
-        self.flags = None
-        self.retry_servfail = False
-        self.rotate = False
-        self.ndots = None
-
-    def read_resolv_conf(self, f: Any) -> None:
-        """Process *f* as a file in the /etc/resolv.conf format.  If f is
-        a ``str``, it is used as the name of the file to open; otherwise it
-        is treated as the file itself.
-
-        Interprets the following items:
-
-        - nameserver - name server IP address
-
-        - domain - local domain name
-
-        - search - search list for host-name lookup
-
-        - options - supported options are rotate, timeout, edns0, and ndots
-
-        """
-
-        nameservers = []
-        if isinstance(f, str):
-            try:
-                cm: contextlib.AbstractContextManager = open(f)
-            except OSError:
-                # /etc/resolv.conf doesn't exist, can't be read, etc.
-                raise NoResolverConfiguration(f"cannot open {f}")
-        else:
-            cm = contextlib.nullcontext(f)
-        with cm as f:
-            for l in f:
-                if len(l) == 0 or l[0] == "#" or l[0] == ";":
-                    continue
-                tokens = l.split()
-
-                # Any line containing less than 2 tokens is malformed
-                if len(tokens) < 2:
-                    continue
-
-                if tokens[0] == "nameserver":
-                    nameservers.append(tokens[1])
-                elif tokens[0] == "domain":
-                    self.domain = dns.name.from_text(tokens[1])
-                    # domain and search are exclusive
-                    self.search = []
-                elif tokens[0] == "search":
-                    # the last search wins
-                    self.search = []
-                    for suffix in tokens[1:]:
-                        self.search.append(dns.name.from_text(suffix))
-                    # We don't set domain as it is not used if
-                    # len(self.search) > 0
-                elif tokens[0] == "options":
-                    for opt in tokens[1:]:
-                        if opt == "rotate":
-                            self.rotate = True
-                        elif opt == "edns0":
-                            self.use_edns()
-                        elif "timeout" in opt:
-                            try:
-                                self.timeout = int(opt.split(":")[1])
-                            except (ValueError, IndexError):
-                                pass
-                        elif "ndots" in opt:
-                            try:
-                                self.ndots = int(opt.split(":")[1])
-                            except (ValueError, IndexError):
-                                pass
-        if len(nameservers) == 0:
-            raise NoResolverConfiguration("no nameservers")
-        # Assigning directly instead of appending means we invoke the
-        # setter logic, with additonal checking and enrichment.
-        self.nameservers = nameservers
-
-    def read_registry(self) -> None:  # pragma: no cover
-        """Extract resolver configuration from the Windows registry."""
-        try:
-            info = dns.win32util.get_dns_info()  # type: ignore
-            if info.domain is not None:
-                self.domain = info.domain
-            self.nameservers = info.nameservers
-            self.search = info.search
-        except AttributeError:
-            raise NotImplementedError
-
-    def _compute_timeout(
-        self,
-        start: float,
-        lifetime: Optional[float] = None,
-        errors: Optional[List[ErrorTuple]] = None,
-    ) -> float:
-        lifetime = self.lifetime if lifetime is None else lifetime
-        now = time.time()
-        duration = now - start
-        if errors is None:
-            errors = []
-        if duration < 0:
-            if duration < -1:
-                # Time going backwards is bad.  Just give up.
-                raise LifetimeTimeout(timeout=duration, errors=errors)
-            else:
-                # Time went backwards, but only a little.  This can
-                # happen, e.g. under vmware with older linux kernels.
-                # Pretend it didn't happen.
-                duration = 0
-        if duration >= lifetime:
-            raise LifetimeTimeout(timeout=duration, errors=errors)
-        return min(lifetime - duration, self.timeout)
-
-    def _get_qnames_to_try(
-        self, qname: dns.name.Name, search: Optional[bool]
-    ) -> List[dns.name.Name]:
-        # This is a separate method so we can unit test the search
-        # rules without requiring the Internet.
-        if search is None:
-            search = self.use_search_by_default
-        qnames_to_try = []
-        if qname.is_absolute():
-            qnames_to_try.append(qname)
-        else:
-            abs_qname = qname.concatenate(dns.name.root)
-            if search:
-                if len(self.search) > 0:
-                    # There is a search list, so use it exclusively
-                    search_list = self.search[:]
-                elif self.domain != dns.name.root and self.domain is not None:
-                    # We have some notion of a domain that isn't the root, so
-                    # use it as the search list.
-                    search_list = [self.domain]
-                else:
-                    search_list = []
-                # Figure out the effective ndots (default is 1)
-                if self.ndots is None:
-                    ndots = 1
-                else:
-                    ndots = self.ndots
-                for suffix in search_list:
-                    qnames_to_try.append(qname + suffix)
-                if len(qname) > ndots:
-                    # The name has at least ndots dots, so we should try an
-                    # absolute query first.
-                    qnames_to_try.insert(0, abs_qname)
-                else:
-                    # The name has less than ndots dots, so we should search
-                    # first, then try the absolute name.
-                    qnames_to_try.append(abs_qname)
-            else:
-                qnames_to_try.append(abs_qname)
-        return qnames_to_try
-
-    def use_tsig(
-        self,
-        keyring: Any,
-        keyname: Optional[Union[dns.name.Name, str]] = None,
-        algorithm: Union[dns.name.Name, str] = dns.tsig.default_algorithm,
-    ) -> None:
-        """Add a TSIG signature to each query.
-
-        The parameters are passed to ``dns.message.Message.use_tsig()``;
-        see its documentation for details.
-        """
-
-        self.keyring = keyring
-        self.keyname = keyname
-        self.keyalgorithm = algorithm
-
-    def use_edns(
-        self,
-        edns: Optional[Union[int, bool]] = 0,
-        ednsflags: int = 0,
-        payload: int = dns.message.DEFAULT_EDNS_PAYLOAD,
-        options: Optional[List[dns.edns.Option]] = None,
-    ) -> None:
-        """Configure EDNS behavior.
-
-        *edns*, an ``int``, is the EDNS level to use.  Specifying
-        ``None``, ``False``, or ``-1`` means "do not use EDNS", and in this case
-        the other parameters are ignored.  Specifying ``True`` is
-        equivalent to specifying 0, i.e. "use EDNS0".
-
-        *ednsflags*, an ``int``, the EDNS flag values.
-
-        *payload*, an ``int``, is the EDNS sender's payload field, which is the
-        maximum size of UDP datagram the sender can handle.  I.e. how big
-        a response to this message can be.
-
-        *options*, a list of ``dns.edns.Option`` objects or ``None``, the EDNS
-        options.
-        """
-
-        if edns is None or edns is False:
-            edns = -1
-        elif edns is True:
-            edns = 0
-        self.edns = edns
-        self.ednsflags = ednsflags
-        self.payload = payload
-        self.ednsoptions = options
-
-    def set_flags(self, flags: int) -> None:
-        """Overrides the default flags with your own.
-
-        *flags*, an ``int``, the message flags to use.
-        """
-
-        self.flags = flags
-
-    @classmethod
-    def _enrich_nameservers(
-        cls,
-        nameservers: Sequence[Union[str, dns.nameserver.Nameserver]],
-        nameserver_ports: Dict[str, int],
-        default_port: int,
-    ) -> List[dns.nameserver.Nameserver]:
-        enriched_nameservers = []
-        if isinstance(nameservers, list):
-            for nameserver in nameservers:
-                enriched_nameserver: dns.nameserver.Nameserver
-                if isinstance(nameserver, dns.nameserver.Nameserver):
-                    enriched_nameserver = nameserver
-                elif dns.inet.is_address(nameserver):
-                    port = nameserver_ports.get(nameserver, default_port)
-                    enriched_nameserver = dns.nameserver.Do53Nameserver(
-                        nameserver, port
-                    )
-                else:
-                    try:
-                        if urlparse(nameserver).scheme != "https":
-                            raise NotImplementedError
-                    except Exception:
-                        raise ValueError(
-                            f"nameserver {nameserver} is not a "
-                            "dns.nameserver.Nameserver instance or text form, "
-                            "IP address, nor a valid https URL"
-                        )
-                    enriched_nameserver = dns.nameserver.DoHNameserver(nameserver)
-                enriched_nameservers.append(enriched_nameserver)
-        else:
-            raise ValueError(
-                f"nameservers must be a list or tuple (not a {type(nameservers)})"
-            )
-        return enriched_nameservers
-
-    @property
-    def nameservers(
-        self,
-    ) -> Sequence[Union[str, dns.nameserver.Nameserver]]:
-        return self._nameservers
-
-    @nameservers.setter
-    def nameservers(
-        self, nameservers: Sequence[Union[str, dns.nameserver.Nameserver]]
-    ) -> None:
-        """
-        *nameservers*, a ``list`` of nameservers, where a nameserver is either
-        a string interpretable as a nameserver, or a ``dns.nameserver.Nameserver``
-        instance.
-
-        Raises ``ValueError`` if *nameservers* is not a list of nameservers.
-        """
-        # We just call _enrich_nameservers() for checking
-        self._enrich_nameservers(nameservers, self.nameserver_ports, self.port)
-        self._nameservers = nameservers
-
-
-class Resolver(BaseResolver):
-    """DNS stub resolver."""
-
-    def resolve(
-        self,
-        qname: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.A,
-        rdclass: Union[dns.rdataclass.RdataClass, str] = dns.rdataclass.IN,
-        tcp: bool = False,
-        source: Optional[str] = None,
-        raise_on_no_answer: bool = True,
-        source_port: int = 0,
-        lifetime: Optional[float] = None,
-        search: Optional[bool] = None,
-    ) -> Answer:  # pylint: disable=arguments-differ
-        """Query nameservers to find the answer to the question.
-
-        The *qname*, *rdtype*, and *rdclass* parameters may be objects
-        of the appropriate type, or strings that can be converted into objects
-        of the appropriate type.
-
-        *qname*, a ``dns.name.Name`` or ``str``, the query name.
-
-        *rdtype*, an ``int`` or ``str``,  the query type.
-
-        *rdclass*, an ``int`` or ``str``,  the query class.
-
-        *tcp*, a ``bool``.  If ``True``, use TCP to make the query.
-
-        *source*, a ``str`` or ``None``.  If not ``None``, bind to this IP
-        address when making queries.
-
-        *raise_on_no_answer*, a ``bool``.  If ``True``, raise
-        ``dns.resolver.NoAnswer`` if there's no answer to the question.
-
-        *source_port*, an ``int``, the port from which to send the message.
-
-        *lifetime*, a ``float``, how many seconds a query should run
-        before timing out.
-
-        *search*, a ``bool`` or ``None``, determines whether the
-        search list configured in the system's resolver configuration
-        are used for relative names, and whether the resolver's domain
-        may be added to relative names.  The default is ``None``,
-        which causes the value of the resolver's
-        ``use_search_by_default`` attribute to be used.
-
-        Raises ``dns.resolver.LifetimeTimeout`` if no answers could be found
-        in the specified lifetime.
-
-        Raises ``dns.resolver.NXDOMAIN`` if the query name does not exist.
-
-        Raises ``dns.resolver.YXDOMAIN`` if the query name is too long after
-        DNAME substitution.
-
-        Raises ``dns.resolver.NoAnswer`` if *raise_on_no_answer* is
-        ``True`` and the query name exists but has no RRset of the
-        desired type and class.
-
-        Raises ``dns.resolver.NoNameservers`` if no non-broken
-        nameservers are available to answer the question.
-
-        Returns a ``dns.resolver.Answer`` instance.
-
-        """
-
-        resolution = _Resolution(
-            self, qname, rdtype, rdclass, tcp, raise_on_no_answer, search
-        )
-        start = time.time()
-        while True:
-            (request, answer) = resolution.next_request()
-            # Note we need to say "if answer is not None" and not just
-            # "if answer" because answer implements __len__, and python
-            # will call that.  We want to return if we have an answer
-            # object, including in cases where its length is 0.
-            if answer is not None:
-                # cache hit!
-                return answer
-            assert request is not None  # needed for type checking
-            done = False
-            while not done:
-                (nameserver, tcp, backoff) = resolution.next_nameserver()
-                if backoff:
-                    time.sleep(backoff)
-                timeout = self._compute_timeout(start, lifetime, resolution.errors)
-                try:
-                    response = nameserver.query(
-                        request,
-                        timeout=timeout,
-                        source=source,
-                        source_port=source_port,
-                        max_size=tcp,
-                    )
-                except Exception as ex:
-                    (_, done) = resolution.query_result(None, ex)
-                    continue
-                (answer, done) = resolution.query_result(response, None)
-                # Note we need to say "if answer is not None" and not just
-                # "if answer" because answer implements __len__, and python
-                # will call that.  We want to return if we have an answer
-                # object, including in cases where its length is 0.
-                if answer is not None:
-                    return answer
-
-    def query(
-        self,
-        qname: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.A,
-        rdclass: Union[dns.rdataclass.RdataClass, str] = dns.rdataclass.IN,
-        tcp: bool = False,
-        source: Optional[str] = None,
-        raise_on_no_answer: bool = True,
-        source_port: int = 0,
-        lifetime: Optional[float] = None,
-    ) -> Answer:  # pragma: no cover
-        """Query nameservers to find the answer to the question.
-
-        This method calls resolve() with ``search=True``, and is
-        provided for backwards compatibility with prior versions of
-        dnspython.  See the documentation for the resolve() method for
-        further details.
-        """
-        warnings.warn(
-            "please use dns.resolver.Resolver.resolve() instead",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return self.resolve(
-            qname,
-            rdtype,
-            rdclass,
-            tcp,
-            source,
-            raise_on_no_answer,
-            source_port,
-            lifetime,
-            True,
-        )
-
-    def resolve_address(self, ipaddr: str, *args: Any, **kwargs: Any) -> Answer:
-        """Use a resolver to run a reverse query for PTR records.
-
-        This utilizes the resolve() method to perform a PTR lookup on the
-        specified IP address.
-
-        *ipaddr*, a ``str``, the IPv4 or IPv6 address you want to get
-        the PTR record for.
-
-        All other arguments that can be passed to the resolve() function
-        except for rdtype and rdclass are also supported by this
-        function.
-        """
-        # We make a modified kwargs for type checking happiness, as otherwise
-        # we get a legit warning about possibly having rdtype and rdclass
-        # in the kwargs more than once.
-        modified_kwargs: Dict[str, Any] = {}
-        modified_kwargs.update(kwargs)
-        modified_kwargs["rdtype"] = dns.rdatatype.PTR
-        modified_kwargs["rdclass"] = dns.rdataclass.IN
-        return self.resolve(
-            dns.reversename.from_address(ipaddr), *args, **modified_kwargs
-        )
-
-    def resolve_name(
-        self,
-        name: Union[dns.name.Name, str],
-        family: int = socket.AF_UNSPEC,
-        **kwargs: Any,
-    ) -> HostAnswers:
-        """Use a resolver to query for address records.
-
-        This utilizes the resolve() method to perform A and/or AAAA lookups on
-        the specified name.
-
-        *qname*, a ``dns.name.Name`` or ``str``, the name to resolve.
-
-        *family*, an ``int``, the address family.  If socket.AF_UNSPEC
-        (the default), both A and AAAA records will be retrieved.
-
-        All other arguments that can be passed to the resolve() function
-        except for rdtype and rdclass are also supported by this
-        function.
-        """
-        # We make a modified kwargs for type checking happiness, as otherwise
-        # we get a legit warning about possibly having rdtype and rdclass
-        # in the kwargs more than once.
-        modified_kwargs: Dict[str, Any] = {}
-        modified_kwargs.update(kwargs)
-        modified_kwargs.pop("rdtype", None)
-        modified_kwargs["rdclass"] = dns.rdataclass.IN
-
-        if family == socket.AF_INET:
-            v4 = self.resolve(name, dns.rdatatype.A, **modified_kwargs)
-            return HostAnswers.make(v4=v4)
-        elif family == socket.AF_INET6:
-            v6 = self.resolve(name, dns.rdatatype.AAAA, **modified_kwargs)
-            return HostAnswers.make(v6=v6)
-        elif family != socket.AF_UNSPEC:  # pragma: no cover
-            raise NotImplementedError(f"unknown address family {family}")
-
-        raise_on_no_answer = modified_kwargs.pop("raise_on_no_answer", True)
-        lifetime = modified_kwargs.pop("lifetime", None)
-        start = time.time()
-        v6 = self.resolve(
-            name,
-            dns.rdatatype.AAAA,
-            raise_on_no_answer=False,
-            lifetime=self._compute_timeout(start, lifetime),
-            **modified_kwargs,
-        )
-        # Note that setting name ensures we query the same name
-        # for A as we did for AAAA.  (This is just in case search lists
-        # are active by default in the resolver configuration and
-        # we might be talking to a server that says NXDOMAIN when it
-        # wants to say NOERROR no data.
-        name = v6.qname
-        v4 = self.resolve(
-            name,
-            dns.rdatatype.A,
-            raise_on_no_answer=False,
-            lifetime=self._compute_timeout(start, lifetime),
-            **modified_kwargs,
-        )
-        answers = HostAnswers.make(v6=v6, v4=v4, add_empty=not raise_on_no_answer)
-        if not answers:
-            raise NoAnswer(response=v6.response)
-        return answers
-
-    # pylint: disable=redefined-outer-name
-
-    def canonical_name(self, name: Union[dns.name.Name, str]) -> dns.name.Name:
-        """Determine the canonical name of *name*.
-
-        The canonical name is the name the resolver uses for queries
-        after all CNAME and DNAME renamings have been applied.
-
-        *name*, a ``dns.name.Name`` or ``str``, the query name.
-
-        This method can raise any exception that ``resolve()`` can
-        raise, other than ``dns.resolver.NoAnswer`` and
-        ``dns.resolver.NXDOMAIN``.
-
-        Returns a ``dns.name.Name``.
-        """
-        try:
-            answer = self.resolve(name, raise_on_no_answer=False)
-            canonical_name = answer.canonical_name
-        except dns.resolver.NXDOMAIN as e:
-            canonical_name = e.canonical_name
-        return canonical_name
-
-    # pylint: enable=redefined-outer-name
-
-    def try_ddr(self, lifetime: float = 5.0) -> None:
-        """Try to update the resolver's nameservers using Discovery of Designated
-        Resolvers (DDR).  If successful, the resolver will subsequently use
-        DNS-over-HTTPS or DNS-over-TLS for future queries.
-
-        *lifetime*, a float, is the maximum time to spend attempting DDR.  The default
-        is 5 seconds.
-
-        If the SVCB query is successful and results in a non-empty list of nameservers,
-        then the resolver's nameservers are set to the returned servers in priority
-        order.
-
-        The current implementation does not use any address hints from the SVCB record,
-        nor does it resolve addresses for the SCVB target name, rather it assumes that
-        the bootstrap nameserver will always be one of the addresses and uses it.
-        A future revision to the code may offer fuller support.  The code verifies that
-        the bootstrap nameserver is in the Subject Alternative Name field of the
-        TLS certficate.
-        """
-        try:
-            expiration = time.time() + lifetime
-            answer = self.resolve(
-                dns._ddr._local_resolver_name, "SVCB", lifetime=lifetime
-            )
-            timeout = dns.query._remaining(expiration)
-            nameservers = dns._ddr._get_nameservers_sync(answer, timeout)
-            if len(nameservers) > 0:
-                self.nameservers = nameservers
-        except Exception:  # pragma: no cover
-            pass
-
-
-#: The default resolver.
-default_resolver: Optional[Resolver] = None
-
-
-def get_default_resolver() -> Resolver:
-    """Get the default resolver, initializing it if necessary."""
-    if default_resolver is None:
-        reset_default_resolver()
-    assert default_resolver is not None
-    return default_resolver
-
-
-def reset_default_resolver() -> None:
-    """Re-initialize default resolver.
-
-    Note that the resolver configuration (i.e. /etc/resolv.conf on UNIX
-    systems) will be re-read immediately.
-    """
-
-    global default_resolver
-    default_resolver = Resolver()
-
-
-def resolve(
-    qname: Union[dns.name.Name, str],
-    rdtype: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.A,
-    rdclass: Union[dns.rdataclass.RdataClass, str] = dns.rdataclass.IN,
-    tcp: bool = False,
-    source: Optional[str] = None,
-    raise_on_no_answer: bool = True,
-    source_port: int = 0,
-    lifetime: Optional[float] = None,
-    search: Optional[bool] = None,
-) -> Answer:  # pragma: no cover
-    """Query nameservers to find the answer to the question.
-
-    This is a convenience function that uses the default resolver
-    object to make the query.
-
-    See ``dns.resolver.Resolver.resolve`` for more information on the
-    parameters.
-    """
-
-    return get_default_resolver().resolve(
-        qname,
-        rdtype,
-        rdclass,
-        tcp,
-        source,
-        raise_on_no_answer,
-        source_port,
-        lifetime,
-        search,
-    )
-
-
-def query(
-    qname: Union[dns.name.Name, str],
-    rdtype: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.A,
-    rdclass: Union[dns.rdataclass.RdataClass, str] = dns.rdataclass.IN,
-    tcp: bool = False,
-    source: Optional[str] = None,
-    raise_on_no_answer: bool = True,
-    source_port: int = 0,
-    lifetime: Optional[float] = None,
-) -> Answer:  # pragma: no cover
-    """Query nameservers to find the answer to the question.
-
-    This method calls resolve() with ``search=True``, and is
-    provided for backwards compatibility with prior versions of
-    dnspython.  See the documentation for the resolve() method for
-    further details.
-    """
-    warnings.warn(
-        "please use dns.resolver.resolve() instead", DeprecationWarning, stacklevel=2
-    )
-    return resolve(
-        qname,
-        rdtype,
-        rdclass,
-        tcp,
-        source,
-        raise_on_no_answer,
-        source_port,
-        lifetime,
-        True,
-    )
-
-
-def resolve_address(ipaddr: str, *args: Any, **kwargs: Any) -> Answer:
-    """Use a resolver to run a reverse query for PTR records.
-
-    See ``dns.resolver.Resolver.resolve_address`` for more information on the
-    parameters.
-    """
-
-    return get_default_resolver().resolve_address(ipaddr, *args, **kwargs)
-
-
-def resolve_name(
-    name: Union[dns.name.Name, str], family: int = socket.AF_UNSPEC, **kwargs: Any
-) -> HostAnswers:
-    """Use a resolver to query for address records.
-
-    See ``dns.resolver.Resolver.resolve_name`` for more information on the
-    parameters.
-    """
-
-    return get_default_resolver().resolve_name(name, family, **kwargs)
-
-
-def canonical_name(name: Union[dns.name.Name, str]) -> dns.name.Name:
-    """Determine the canonical name of *name*.
-
-    See ``dns.resolver.Resolver.canonical_name`` for more information on the
-    parameters and possible exceptions.
-    """
-
-    return get_default_resolver().canonical_name(name)
-
-
-def try_ddr(lifetime: float = 5.0) -> None:  # pragma: no cover
-    """Try to update the default resolver's nameservers using Discovery of Designated
-    Resolvers (DDR).  If successful, the resolver will subsequently use
-    DNS-over-HTTPS or DNS-over-TLS for future queries.
-
-    See :py:func:`dns.resolver.Resolver.try_ddr` for more information.
-    """
-    return get_default_resolver().try_ddr(lifetime)
-
-
-def zone_for_name(
-    name: Union[dns.name.Name, str],
-    rdclass: dns.rdataclass.RdataClass = dns.rdataclass.IN,
-    tcp: bool = False,
-    resolver: Optional[Resolver] = None,
-    lifetime: Optional[float] = None,
-) -> dns.name.Name:
-    """Find the name of the zone which contains the specified name.
-
-    *name*, an absolute ``dns.name.Name`` or ``str``, the query name.
-
-    *rdclass*, an ``int``, the query class.
-
-    *tcp*, a ``bool``.  If ``True``, use TCP to make the query.
-
-    *resolver*, a ``dns.resolver.Resolver`` or ``None``, the resolver to use.
-    If ``None``, the default, then the default resolver is used.
-
-    *lifetime*, a ``float``, the total time to allow for the queries needed
-    to determine the zone.  If ``None``, the default, then only the individual
-    query limits of the resolver apply.
-
-    Raises ``dns.resolver.NoRootSOA`` if there is no SOA RR at the DNS
-    root.  (This is only likely to happen if you're using non-default
-    root servers in your network and they are misconfigured.)
-
-    Raises ``dns.resolver.LifetimeTimeout`` if the answer could not be
-    found in the allotted lifetime.
-
-    Returns a ``dns.name.Name``.
-    """
-
-    if isinstance(name, str):
-        name = dns.name.from_text(name, dns.name.root)
-    if resolver is None:
-        resolver = get_default_resolver()
-    if not name.is_absolute():
-        raise NotAbsolute(name)
-    start = time.time()
-    expiration: Optional[float]
-    if lifetime is not None:
-        expiration = start + lifetime
-    else:
-        expiration = None
-    while 1:
-        try:
-            rlifetime: Optional[float]
-            if expiration is not None:
-                rlifetime = expiration - time.time()
-                if rlifetime <= 0:
-                    rlifetime = 0
-            else:
-                rlifetime = None
-            answer = resolver.resolve(
-                name, dns.rdatatype.SOA, rdclass, tcp, lifetime=rlifetime
-            )
-            assert answer.rrset is not None
-            if answer.rrset.name == name:
-                return name
-            # otherwise we were CNAMEd or DNAMEd and need to look higher
-        except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer) as e:
-            if isinstance(e, dns.resolver.NXDOMAIN):
-                response = e.responses().get(name)
-            else:
-                response = e.response()  # pylint: disable=no-value-for-parameter
-            if response:
-                for rrs in response.authority:
-                    if rrs.rdtype == dns.rdatatype.SOA and rrs.rdclass == rdclass:
-                        (nr, _, _) = rrs.name.fullcompare(name)
-                        if nr == dns.name.NAMERELN_SUPERDOMAIN:
-                            # We're doing a proper superdomain check as
-                            # if the name were equal we ought to have gotten
-                            # it in the answer section!  We are ignoring the
-                            # possibility that the authority is insane and
-                            # is including multiple SOA RRs for different
-                            # authorities.
-                            return rrs.name
-            # we couldn't extract anything useful from the response (e.g. it's
-            # a type 3 NXDOMAIN)
-        try:
-            name = name.parent()
-        except dns.name.NoParent:
-            raise NoRootSOA
-
-
-def make_resolver_at(
-    where: Union[dns.name.Name, str],
-    port: int = 53,
-    family: int = socket.AF_UNSPEC,
-    resolver: Optional[Resolver] = None,
-) -> Resolver:
-    """Make a stub resolver using the specified destination as the full resolver.
-
-    *where*, a ``dns.name.Name`` or ``str`` the domain name or IP address of the
-    full resolver.
-
-    *port*, an ``int``, the port to use.  If not specified, the default is 53.
-
-    *family*, an ``int``, the address family to use.  This parameter is used if
-    *where* is not an address.  The default is ``socket.AF_UNSPEC`` in which case
-    the first address returned by ``resolve_name()`` will be used, otherwise the
-    first address of the specified family will be used.
-
-    *resolver*, a ``dns.resolver.Resolver`` or ``None``, the resolver to use for
-    resolution of hostnames.  If not specified, the default resolver will be used.
-
-    Returns a ``dns.resolver.Resolver`` or raises an exception.
-    """
-    if resolver is None:
-        resolver = get_default_resolver()
-    nameservers: List[Union[str, dns.nameserver.Nameserver]] = []
-    if isinstance(where, str) and dns.inet.is_address(where):
-        nameservers.append(dns.nameserver.Do53Nameserver(where, port))
-    else:
-        for address in resolver.resolve_name(where, family).addresses():
-            nameservers.append(dns.nameserver.Do53Nameserver(address, port))
-    res = dns.resolver.Resolver(configure=False)
-    res.nameservers = nameservers
-    return res
-
-
-def resolve_at(
-    where: Union[dns.name.Name, str],
-    qname: Union[dns.name.Name, str],
-    rdtype: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.A,
-    rdclass: Union[dns.rdataclass.RdataClass, str] = dns.rdataclass.IN,
-    tcp: bool = False,
-    source: Optional[str] = None,
-    raise_on_no_answer: bool = True,
-    source_port: int = 0,
-    lifetime: Optional[float] = None,
-    search: Optional[bool] = None,
-    port: int = 53,
-    family: int = socket.AF_UNSPEC,
-    resolver: Optional[Resolver] = None,
-) -> Answer:
-    """Query nameservers to find the answer to the question.
-
-    This is a convenience function that calls ``dns.resolver.make_resolver_at()`` to
-    make a resolver, and then uses it to resolve the query.
-
-    See ``dns.resolver.Resolver.resolve`` for more information on the resolution
-    parameters, and ``dns.resolver.make_resolver_at`` for information about the resolver
-    parameters *where*, *port*, *family*, and *resolver*.
-
-    If making more than one query, it is more efficient to call
-    ``dns.resolver.make_resolver_at()`` and then use that resolver for the queries
-    instead of calling ``resolve_at()`` multiple times.
-    """
-    return make_resolver_at(where, port, family, resolver).resolve(
-        qname,
-        rdtype,
-        rdclass,
-        tcp,
-        source,
-        raise_on_no_answer,
-        source_port,
-        lifetime,
-        search,
-    )
-
-
-#
-# Support for overriding the system resolver for all python code in the
-# running process.
-#
-
-_protocols_for_socktype = {
-    socket.SOCK_DGRAM: [socket.SOL_UDP],
-    socket.SOCK_STREAM: [socket.SOL_TCP],
-}
-
-_resolver = None
-_original_getaddrinfo = socket.getaddrinfo
-_original_getnameinfo = socket.getnameinfo
-_original_getfqdn = socket.getfqdn
-_original_gethostbyname = socket.gethostbyname
-_original_gethostbyname_ex = socket.gethostbyname_ex
-_original_gethostbyaddr = socket.gethostbyaddr
-
-
-def _getaddrinfo(
-    host=None, service=None, family=socket.AF_UNSPEC, socktype=0, proto=0, flags=0
-):
-    if flags & socket.AI_NUMERICHOST != 0:
-        # Short circuit directly into the system's getaddrinfo().  We're
-        # not adding any value in this case, and this avoids infinite loops
-        # because dns.query.* needs to call getaddrinfo() for IPv6 scoping
-        # reasons.  We will also do this short circuit below if we
-        # discover that the host is an address literal.
-        return _original_getaddrinfo(host, service, family, socktype, proto, flags)
-    if flags & (socket.AI_ADDRCONFIG | socket.AI_V4MAPPED) != 0:
-        # Not implemented.  We raise a gaierror as opposed to a
-        # NotImplementedError as it helps callers handle errors more
-        # appropriately.  [Issue #316]
-        #
-        # We raise EAI_FAIL as opposed to EAI_SYSTEM because there is
-        # no EAI_SYSTEM on Windows [Issue #416].  We didn't go for
-        # EAI_BADFLAGS as the flags aren't bad, we just don't
-        # implement them.
-        raise socket.gaierror(
-            socket.EAI_FAIL, "Non-recoverable failure in name resolution"
-        )
-    if host is None and service is None:
-        raise socket.gaierror(socket.EAI_NONAME, "Name or service not known")
-    addrs = []
-    canonical_name = None  # pylint: disable=redefined-outer-name
-    # Is host None or an address literal?  If so, use the system's
-    # getaddrinfo().
-    if host is None:
-        return _original_getaddrinfo(host, service, family, socktype, proto, flags)
-    try:
-        # We don't care about the result of af_for_address(), we're just
-        # calling it so it raises an exception if host is not an IPv4 or
-        # IPv6 address.
-        dns.inet.af_for_address(host)
-        return _original_getaddrinfo(host, service, family, socktype, proto, flags)
-    except Exception:
-        pass
-    # Something needs resolution!
-    try:
-        answers = _resolver.resolve_name(host, family)
-        addrs = answers.addresses_and_families()
-        canonical_name = answers.canonical_name().to_text(True)
-    except dns.resolver.NXDOMAIN:
-        raise socket.gaierror(socket.EAI_NONAME, "Name or service not known")
-    except Exception:
-        # We raise EAI_AGAIN here as the failure may be temporary
-        # (e.g. a timeout) and EAI_SYSTEM isn't defined on Windows.
-        # [Issue #416]
-        raise socket.gaierror(socket.EAI_AGAIN, "Temporary failure in name resolution")
-    port = None
-    try:
-        # Is it a port literal?
-        if service is None:
-            port = 0
-        else:
-            port = int(service)
-    except Exception:
-        if flags & socket.AI_NUMERICSERV == 0:
-            try:
-                port = socket.getservbyname(service)
-            except Exception:
-                pass
-    if port is None:
-        raise socket.gaierror(socket.EAI_NONAME, "Name or service not known")
-    tuples = []
-    if socktype == 0:
-        socktypes = [socket.SOCK_DGRAM, socket.SOCK_STREAM]
-    else:
-        socktypes = [socktype]
-    if flags & socket.AI_CANONNAME != 0:
-        cname = canonical_name
-    else:
-        cname = ""
-    for addr, af in addrs:
-        for socktype in socktypes:
-            for proto in _protocols_for_socktype[socktype]:
-                addr_tuple = dns.inet.low_level_address_tuple((addr, port), af)
-                tuples.append((af, socktype, proto, cname, addr_tuple))
-    if len(tuples) == 0:
-        raise socket.gaierror(socket.EAI_NONAME, "Name or service not known")
-    return tuples
-
-
-def _getnameinfo(sockaddr, flags=0):
-    host = sockaddr[0]
-    port = sockaddr[1]
-    if len(sockaddr) == 4:
-        scope = sockaddr[3]
-        family = socket.AF_INET6
-    else:
-        scope = None
-        family = socket.AF_INET
-    tuples = _getaddrinfo(host, port, family, socket.SOCK_STREAM, socket.SOL_TCP, 0)
-    if len(tuples) > 1:
-        raise OSError("sockaddr resolved to multiple addresses")
-    addr = tuples[0][4][0]
-    if flags & socket.NI_DGRAM:
-        pname = "udp"
-    else:
-        pname = "tcp"
-    qname = dns.reversename.from_address(addr)
-    if flags & socket.NI_NUMERICHOST == 0:
-        try:
-            answer = _resolver.resolve(qname, "PTR")
-            hostname = answer.rrset[0].target.to_text(True)
-        except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
-            if flags & socket.NI_NAMEREQD:
-                raise socket.gaierror(socket.EAI_NONAME, "Name or service not known")
-            hostname = addr
-            if scope is not None:
-                hostname += "%" + str(scope)
-    else:
-        hostname = addr
-        if scope is not None:
-            hostname += "%" + str(scope)
-    if flags & socket.NI_NUMERICSERV:
-        service = str(port)
-    else:
-        service = socket.getservbyport(port, pname)
-    return (hostname, service)
-
-
-def _getfqdn(name=None):
-    if name is None:
-        name = socket.gethostname()
-    try:
-        (name, _, _) = _gethostbyaddr(name)
-        # Python's version checks aliases too, but our gethostbyname
-        # ignores them, so we do so here as well.
-    except Exception:  # pragma: no cover
-        pass
-    return name
-
-
-def _gethostbyname(name):
-    return _gethostbyname_ex(name)[2][0]
-
-
-def _gethostbyname_ex(name):
-    aliases = []
-    addresses = []
-    tuples = _getaddrinfo(
-        name, 0, socket.AF_INET, socket.SOCK_STREAM, socket.SOL_TCP, socket.AI_CANONNAME
-    )
-    canonical = tuples[0][3]
-    for item in tuples:
-        addresses.append(item[4][0])
-    # XXX we just ignore aliases
-    return (canonical, aliases, addresses)
-
-
-def _gethostbyaddr(ip):
-    try:
-        dns.ipv6.inet_aton(ip)
-        sockaddr = (ip, 80, 0, 0)
-        family = socket.AF_INET6
-    except Exception:
-        try:
-            dns.ipv4.inet_aton(ip)
-        except Exception:
-            raise socket.gaierror(socket.EAI_NONAME, "Name or service not known")
-        sockaddr = (ip, 80)
-        family = socket.AF_INET
-    (name, _) = _getnameinfo(sockaddr, socket.NI_NAMEREQD)
-    aliases = []
-    addresses = []
-    tuples = _getaddrinfo(
-        name, 0, family, socket.SOCK_STREAM, socket.SOL_TCP, socket.AI_CANONNAME
-    )
-    canonical = tuples[0][3]
-    # We only want to include an address from the tuples if it's the
-    # same as the one we asked about.  We do this comparison in binary
-    # to avoid any differences in text representations.
-    bin_ip = dns.inet.inet_pton(family, ip)
-    for item in tuples:
-        addr = item[4][0]
-        bin_addr = dns.inet.inet_pton(family, addr)
-        if bin_ip == bin_addr:
-            addresses.append(addr)
-    # XXX we just ignore aliases
-    return (canonical, aliases, addresses)
-
-
-def override_system_resolver(resolver: Optional[Resolver] = None) -> None:
-    """Override the system resolver routines in the socket module with
-    versions which use dnspython's resolver.
-
-    This can be useful in testing situations where you want to control
-    the resolution behavior of python code without having to change
-    the system's resolver settings (e.g. /etc/resolv.conf).
-
-    The resolver to use may be specified; if it's not, the default
-    resolver will be used.
-
-    resolver, a ``dns.resolver.Resolver`` or ``None``, the resolver to use.
-    """
-
-    if resolver is None:
-        resolver = get_default_resolver()
-    global _resolver
-    _resolver = resolver
-    socket.getaddrinfo = _getaddrinfo
-    socket.getnameinfo = _getnameinfo
-    socket.getfqdn = _getfqdn
-    socket.gethostbyname = _gethostbyname
-    socket.gethostbyname_ex = _gethostbyname_ex
-    socket.gethostbyaddr = _gethostbyaddr
-
-
-def restore_system_resolver() -> None:
-    """Undo the effects of prior override_system_resolver()."""
-
-    global _resolver
-    _resolver = None
-    socket.getaddrinfo = _original_getaddrinfo
-    socket.getnameinfo = _original_getnameinfo
-    socket.getfqdn = _original_getfqdn
-    socket.gethostbyname = _original_gethostbyname
-    socket.gethostbyname_ex = _original_gethostbyname_ex
-    socket.gethostbyaddr = _original_gethostbyaddr
diff --git a/lib/dns/reversename.py b/lib/dns/reversename.py
deleted file mode 100644
index 8236c711..00000000
--- a/lib/dns/reversename.py
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2006-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""DNS Reverse Map Names."""
-
-import binascii
-
-import dns.ipv4
-import dns.ipv6
-import dns.name
-
-ipv4_reverse_domain = dns.name.from_text("in-addr.arpa.")
-ipv6_reverse_domain = dns.name.from_text("ip6.arpa.")
-
-
-def from_address(
-    text: str,
-    v4_origin: dns.name.Name = ipv4_reverse_domain,
-    v6_origin: dns.name.Name = ipv6_reverse_domain,
-) -> dns.name.Name:
-    """Convert an IPv4 or IPv6 address in textual form into a Name object whose
-    value is the reverse-map domain name of the address.
-
-    *text*, a ``str``, is an IPv4 or IPv6 address in textual form
-    (e.g. '127.0.0.1', '::1')
-
-    *v4_origin*, a ``dns.name.Name`` to append to the labels corresponding to
-    the address if the address is an IPv4 address, instead of the default
-    (in-addr.arpa.)
-
-    *v6_origin*, a ``dns.name.Name`` to append to the labels corresponding to
-    the address if the address is an IPv6 address, instead of the default
-    (ip6.arpa.)
-
-    Raises ``dns.exception.SyntaxError`` if the address is badly formed.
-
-    Returns a ``dns.name.Name``.
-    """
-
-    try:
-        v6 = dns.ipv6.inet_aton(text)
-        if dns.ipv6.is_mapped(v6):
-            parts = ["%d" % byte for byte in v6[12:]]
-            origin = v4_origin
-        else:
-            parts = [x for x in str(binascii.hexlify(v6).decode())]
-            origin = v6_origin
-    except Exception:
-        parts = ["%d" % byte for byte in dns.ipv4.inet_aton(text)]
-        origin = v4_origin
-    return dns.name.from_text(".".join(reversed(parts)), origin=origin)
-
-
-def to_address(
-    name: dns.name.Name,
-    v4_origin: dns.name.Name = ipv4_reverse_domain,
-    v6_origin: dns.name.Name = ipv6_reverse_domain,
-) -> str:
-    """Convert a reverse map domain name into textual address form.
-
-    *name*, a ``dns.name.Name``, an IPv4 or IPv6 address in reverse-map name
-    form.
-
-    *v4_origin*, a ``dns.name.Name`` representing the top-level domain for
-    IPv4 addresses, instead of the default (in-addr.arpa.)
-
-    *v6_origin*, a ``dns.name.Name`` representing the top-level domain for
-    IPv4 addresses, instead of the default (ip6.arpa.)
-
-    Raises ``dns.exception.SyntaxError`` if the name does not have a
-    reverse-map form.
-
-    Returns a ``str``.
-    """
-
-    if name.is_subdomain(v4_origin):
-        name = name.relativize(v4_origin)
-        text = b".".join(reversed(name.labels))
-        # run through inet_ntoa() to check syntax and make pretty.
-        return dns.ipv4.inet_ntoa(dns.ipv4.inet_aton(text))
-    elif name.is_subdomain(v6_origin):
-        name = name.relativize(v6_origin)
-        labels = list(reversed(name.labels))
-        parts = []
-        for i in range(0, len(labels), 4):
-            parts.append(b"".join(labels[i : i + 4]))
-        text = b":".join(parts)
-        # run through inet_ntoa() to check syntax and make pretty.
-        return dns.ipv6.inet_ntoa(dns.ipv6.inet_aton(text))
-    else:
-        raise dns.exception.SyntaxError("unknown reverse-map address family")
diff --git a/lib/dns/rrset.py b/lib/dns/rrset.py
deleted file mode 100644
index 6f39b108..00000000
--- a/lib/dns/rrset.py
+++ /dev/null
@@ -1,285 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""DNS RRsets (an RRset is a named rdataset)"""
-
-from typing import Any, Collection, Dict, Optional, Union, cast
-
-import dns.name
-import dns.rdataclass
-import dns.rdataset
-import dns.renderer
-
-
-class RRset(dns.rdataset.Rdataset):
-    """A DNS RRset (named rdataset).
-
-    RRset inherits from Rdataset, and RRsets can be treated as
-    Rdatasets in most cases.  There are, however, a few notable
-    exceptions.  RRsets have different to_wire() and to_text() method
-    arguments, reflecting the fact that RRsets always have an owner
-    name.
-    """
-
-    __slots__ = ["name", "deleting"]
-
-    def __init__(
-        self,
-        name: dns.name.Name,
-        rdclass: dns.rdataclass.RdataClass,
-        rdtype: dns.rdatatype.RdataType,
-        covers: dns.rdatatype.RdataType = dns.rdatatype.NONE,
-        deleting: Optional[dns.rdataclass.RdataClass] = None,
-    ):
-        """Create a new RRset."""
-
-        super().__init__(rdclass, rdtype, covers)
-        self.name = name
-        self.deleting = deleting
-
-    def _clone(self):
-        obj = super()._clone()
-        obj.name = self.name
-        obj.deleting = self.deleting
-        return obj
-
-    def __repr__(self):
-        if self.covers == 0:
-            ctext = ""
-        else:
-            ctext = "(" + dns.rdatatype.to_text(self.covers) + ")"
-        if self.deleting is not None:
-            dtext = " delete=" + dns.rdataclass.to_text(self.deleting)
-        else:
-            dtext = ""
-        return (
-            "<DNS "
-            + str(self.name)
-            + " "
-            + dns.rdataclass.to_text(self.rdclass)
-            + " "
-            + dns.rdatatype.to_text(self.rdtype)
-            + ctext
-            + dtext
-            + " RRset: "
-            + self._rdata_repr()
-            + ">"
-        )
-
-    def __str__(self):
-        return self.to_text()
-
-    def __eq__(self, other):
-        if isinstance(other, RRset):
-            if self.name != other.name:
-                return False
-        elif not isinstance(other, dns.rdataset.Rdataset):
-            return False
-        return super().__eq__(other)
-
-    def match(self, *args: Any, **kwargs: Any) -> bool:  # type: ignore[override]
-        """Does this rrset match the specified attributes?
-
-        Behaves as :py:func:`full_match()` if the first argument is a
-        ``dns.name.Name``, and as :py:func:`dns.rdataset.Rdataset.match()`
-        otherwise.
-
-        (This behavior fixes a design mistake where the signature of this
-        method became incompatible with that of its superclass.  The fix
-        makes RRsets matchable as Rdatasets while preserving backwards
-        compatibility.)
-        """
-        if isinstance(args[0], dns.name.Name):
-            return self.full_match(*args, **kwargs)  # type: ignore[arg-type]
-        else:
-            return super().match(*args, **kwargs)  # type: ignore[arg-type]
-
-    def full_match(
-        self,
-        name: dns.name.Name,
-        rdclass: dns.rdataclass.RdataClass,
-        rdtype: dns.rdatatype.RdataType,
-        covers: dns.rdatatype.RdataType,
-        deleting: Optional[dns.rdataclass.RdataClass] = None,
-    ) -> bool:
-        """Returns ``True`` if this rrset matches the specified name, class,
-        type, covers, and deletion state.
-        """
-        if not super().match(rdclass, rdtype, covers):
-            return False
-        if self.name != name or self.deleting != deleting:
-            return False
-        return True
-
-    # pylint: disable=arguments-differ
-
-    def to_text(  # type: ignore[override]
-        self,
-        origin: Optional[dns.name.Name] = None,
-        relativize: bool = True,
-        **kw: Dict[str, Any],
-    ) -> str:
-        """Convert the RRset into DNS zone file format.
-
-        See ``dns.name.Name.choose_relativity`` for more information
-        on how *origin* and *relativize* determine the way names
-        are emitted.
-
-        Any additional keyword arguments are passed on to the rdata
-        ``to_text()`` method.
-
-        *origin*, a ``dns.name.Name`` or ``None``, the origin for relative
-        names.
-
-        *relativize*, a ``bool``.  If ``True``, names will be relativized
-        to *origin*.
-        """
-
-        return super().to_text(
-            self.name, origin, relativize, self.deleting, **kw  # type: ignore
-        )
-
-    def to_wire(  # type: ignore[override]
-        self,
-        file: Any,
-        compress: Optional[dns.name.CompressType] = None,  # type: ignore
-        origin: Optional[dns.name.Name] = None,
-        **kw: Dict[str, Any],
-    ) -> int:
-        """Convert the RRset to wire format.
-
-        All keyword arguments are passed to ``dns.rdataset.to_wire()``; see
-        that function for details.
-
-        Returns an ``int``, the number of records emitted.
-        """
-
-        return super().to_wire(
-            self.name, file, compress, origin, self.deleting, **kw  # type:ignore
-        )
-
-    # pylint: enable=arguments-differ
-
-    def to_rdataset(self) -> dns.rdataset.Rdataset:
-        """Convert an RRset into an Rdataset.
-
-        Returns a ``dns.rdataset.Rdataset``.
-        """
-        return dns.rdataset.from_rdata_list(self.ttl, list(self))
-
-
-def from_text_list(
-    name: Union[dns.name.Name, str],
-    ttl: int,
-    rdclass: Union[dns.rdataclass.RdataClass, str],
-    rdtype: Union[dns.rdatatype.RdataType, str],
-    text_rdatas: Collection[str],
-    idna_codec: Optional[dns.name.IDNACodec] = None,
-    origin: Optional[dns.name.Name] = None,
-    relativize: bool = True,
-    relativize_to: Optional[dns.name.Name] = None,
-) -> RRset:
-    """Create an RRset with the specified name, TTL, class, and type, and with
-    the specified list of rdatas in text format.
-
-    *idna_codec*, a ``dns.name.IDNACodec``, specifies the IDNA
-    encoder/decoder to use; if ``None``, the default IDNA 2003
-    encoder/decoder is used.
-
-    *origin*, a ``dns.name.Name`` (or ``None``), the
-    origin to use for relative names.
-
-    *relativize*, a ``bool``.  If true, name will be relativized.
-
-    *relativize_to*, a ``dns.name.Name`` (or ``None``), the origin to use
-    when relativizing names.  If not set, the *origin* value will be used.
-
-    Returns a ``dns.rrset.RRset`` object.
-    """
-
-    if isinstance(name, str):
-        name = dns.name.from_text(name, None, idna_codec=idna_codec)
-    rdclass = dns.rdataclass.RdataClass.make(rdclass)
-    rdtype = dns.rdatatype.RdataType.make(rdtype)
-    r = RRset(name, rdclass, rdtype)
-    r.update_ttl(ttl)
-    for t in text_rdatas:
-        rd = dns.rdata.from_text(
-            r.rdclass, r.rdtype, t, origin, relativize, relativize_to, idna_codec
-        )
-        r.add(rd)
-    return r
-
-
-def from_text(
-    name: Union[dns.name.Name, str],
-    ttl: int,
-    rdclass: Union[dns.rdataclass.RdataClass, str],
-    rdtype: Union[dns.rdatatype.RdataType, str],
-    *text_rdatas: Any,
-) -> RRset:
-    """Create an RRset with the specified name, TTL, class, and type and with
-    the specified rdatas in text format.
-
-    Returns a ``dns.rrset.RRset`` object.
-    """
-
-    return from_text_list(
-        name, ttl, rdclass, rdtype, cast(Collection[str], text_rdatas)
-    )
-
-
-def from_rdata_list(
-    name: Union[dns.name.Name, str],
-    ttl: int,
-    rdatas: Collection[dns.rdata.Rdata],
-    idna_codec: Optional[dns.name.IDNACodec] = None,
-) -> RRset:
-    """Create an RRset with the specified name and TTL, and with
-    the specified list of rdata objects.
-
-    *idna_codec*, a ``dns.name.IDNACodec``, specifies the IDNA
-    encoder/decoder to use; if ``None``, the default IDNA 2003
-    encoder/decoder is used.
-
-    Returns a ``dns.rrset.RRset`` object.
-
-    """
-
-    if isinstance(name, str):
-        name = dns.name.from_text(name, None, idna_codec=idna_codec)
-
-    if len(rdatas) == 0:
-        raise ValueError("rdata list must not be empty")
-    r = None
-    for rd in rdatas:
-        if r is None:
-            r = RRset(name, rd.rdclass, rd.rdtype)
-            r.update_ttl(ttl)
-        r.add(rd)
-    assert r is not None
-    return r
-
-
-def from_rdata(name: Union[dns.name.Name, str], ttl: int, *rdatas: Any) -> RRset:
-    """Create an RRset with the specified name and TTL, and with
-    the specified rdata objects.
-
-    Returns a ``dns.rrset.RRset`` object.
-    """
-
-    return from_rdata_list(name, ttl, cast(Collection[dns.rdata.Rdata], rdatas))
diff --git a/lib/dns/serial.py b/lib/dns/serial.py
deleted file mode 100644
index 3417299b..00000000
--- a/lib/dns/serial.py
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-"""Serial Number Arthimetic from RFC 1982"""
-
-
-class Serial:
-    def __init__(self, value: int, bits: int = 32):
-        self.value = value % 2**bits
-        self.bits = bits
-
-    def __repr__(self):
-        return f"dns.serial.Serial({self.value}, {self.bits})"
-
-    def __eq__(self, other):
-        if isinstance(other, int):
-            other = Serial(other, self.bits)
-        elif not isinstance(other, Serial) or other.bits != self.bits:
-            return NotImplemented
-        return self.value == other.value
-
-    def __ne__(self, other):
-        if isinstance(other, int):
-            other = Serial(other, self.bits)
-        elif not isinstance(other, Serial) or other.bits != self.bits:
-            return NotImplemented
-        return self.value != other.value
-
-    def __lt__(self, other):
-        if isinstance(other, int):
-            other = Serial(other, self.bits)
-        elif not isinstance(other, Serial) or other.bits != self.bits:
-            return NotImplemented
-        if self.value < other.value and other.value - self.value < 2 ** (self.bits - 1):
-            return True
-        elif self.value > other.value and self.value - other.value > 2 ** (
-            self.bits - 1
-        ):
-            return True
-        else:
-            return False
-
-    def __le__(self, other):
-        return self == other or self < other
-
-    def __gt__(self, other):
-        if isinstance(other, int):
-            other = Serial(other, self.bits)
-        elif not isinstance(other, Serial) or other.bits != self.bits:
-            return NotImplemented
-        if self.value < other.value and other.value - self.value > 2 ** (self.bits - 1):
-            return True
-        elif self.value > other.value and self.value - other.value < 2 ** (
-            self.bits - 1
-        ):
-            return True
-        else:
-            return False
-
-    def __ge__(self, other):
-        return self == other or self > other
-
-    def __add__(self, other):
-        v = self.value
-        if isinstance(other, Serial):
-            delta = other.value
-        elif isinstance(other, int):
-            delta = other
-        else:
-            raise ValueError
-        if abs(delta) > (2 ** (self.bits - 1) - 1):
-            raise ValueError
-        v += delta
-        v = v % 2**self.bits
-        return Serial(v, self.bits)
-
-    def __iadd__(self, other):
-        v = self.value
-        if isinstance(other, Serial):
-            delta = other.value
-        elif isinstance(other, int):
-            delta = other
-        else:
-            raise ValueError
-        if abs(delta) > (2 ** (self.bits - 1) - 1):
-            raise ValueError
-        v += delta
-        v = v % 2**self.bits
-        self.value = v
-        return self
-
-    def __sub__(self, other):
-        v = self.value
-        if isinstance(other, Serial):
-            delta = other.value
-        elif isinstance(other, int):
-            delta = other
-        else:
-            raise ValueError
-        if abs(delta) > (2 ** (self.bits - 1) - 1):
-            raise ValueError
-        v -= delta
-        v = v % 2**self.bits
-        return Serial(v, self.bits)
-
-    def __isub__(self, other):
-        v = self.value
-        if isinstance(other, Serial):
-            delta = other.value
-        elif isinstance(other, int):
-            delta = other
-        else:
-            raise ValueError
-        if abs(delta) > (2 ** (self.bits - 1) - 1):
-            raise ValueError
-        v -= delta
-        v = v % 2**self.bits
-        self.value = v
-        return self
diff --git a/lib/dns/set.py b/lib/dns/set.py
deleted file mode 100644
index ae8f0dd5..00000000
--- a/lib/dns/set.py
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-import itertools
-
-
-class Set:
-    """A simple set class.
-
-    This class was originally used to deal with python not having a set class, and
-    originally the class used lists in its implementation.  The ordered and indexable
-    nature of RRsets and Rdatasets is unfortunately widely used in dnspython
-    applications, so for backwards compatibility sets continue to be a custom class, now
-    based on an ordered dictionary.
-    """
-
-    __slots__ = ["items"]
-
-    def __init__(self, items=None):
-        """Initialize the set.
-
-        *items*, an iterable or ``None``, the initial set of items.
-        """
-
-        self.items = dict()
-        if items is not None:
-            for item in items:
-                # This is safe for how we use set, but if other code
-                # subclasses it could be a legitimate issue.
-                self.add(item)  # lgtm[py/init-calls-subclass]
-
-    def __repr__(self):
-        return f"dns.set.Set({repr(list(self.items.keys()))})"  # pragma: no cover
-
-    def add(self, item):
-        """Add an item to the set."""
-
-        if item not in self.items:
-            self.items[item] = None
-
-    def remove(self, item):
-        """Remove an item from the set."""
-
-        try:
-            del self.items[item]
-        except KeyError:
-            raise ValueError
-
-    def discard(self, item):
-        """Remove an item from the set if present."""
-
-        self.items.pop(item, None)
-
-    def pop(self):
-        """Remove an arbitrary item from the set."""
-        (k, _) = self.items.popitem()
-        return k
-
-    def _clone(self) -> "Set":
-        """Make a (shallow) copy of the set.
-
-        There is a 'clone protocol' that subclasses of this class
-        should use.  To make a copy, first call your super's _clone()
-        method, and use the object returned as the new instance.  Then
-        make shallow copies of the attributes defined in the subclass.
-
-        This protocol allows us to write the set algorithms that
-        return new instances (e.g. union) once, and keep using them in
-        subclasses.
-        """
-
-        if hasattr(self, "_clone_class"):
-            cls = self._clone_class  # type: ignore
-        else:
-            cls = self.__class__
-        obj = cls.__new__(cls)
-        obj.items = dict()
-        obj.items.update(self.items)
-        return obj
-
-    def __copy__(self):
-        """Make a (shallow) copy of the set."""
-
-        return self._clone()
-
-    def copy(self):
-        """Make a (shallow) copy of the set."""
-
-        return self._clone()
-
-    def union_update(self, other):
-        """Update the set, adding any elements from other which are not
-        already in the set.
-        """
-
-        if not isinstance(other, Set):
-            raise ValueError("other must be a Set instance")
-        if self is other:  # lgtm[py/comparison-using-is]
-            return
-        for item in other.items:
-            self.add(item)
-
-    def intersection_update(self, other):
-        """Update the set, removing any elements from other which are not
-        in both sets.
-        """
-
-        if not isinstance(other, Set):
-            raise ValueError("other must be a Set instance")
-        if self is other:  # lgtm[py/comparison-using-is]
-            return
-        # we make a copy of the list so that we can remove items from
-        # the list without breaking the iterator.
-        for item in list(self.items):
-            if item not in other.items:
-                del self.items[item]
-
-    def difference_update(self, other):
-        """Update the set, removing any elements from other which are in
-        the set.
-        """
-
-        if not isinstance(other, Set):
-            raise ValueError("other must be a Set instance")
-        if self is other:  # lgtm[py/comparison-using-is]
-            self.items.clear()
-        else:
-            for item in other.items:
-                self.discard(item)
-
-    def symmetric_difference_update(self, other):
-        """Update the set, retaining only elements unique to both sets."""
-
-        if not isinstance(other, Set):
-            raise ValueError("other must be a Set instance")
-        if self is other:  # lgtm[py/comparison-using-is]
-            self.items.clear()
-        else:
-            overlap = self.intersection(other)
-            self.union_update(other)
-            self.difference_update(overlap)
-
-    def union(self, other):
-        """Return a new set which is the union of ``self`` and ``other``.
-
-        Returns the same Set type as this set.
-        """
-
-        obj = self._clone()
-        obj.union_update(other)
-        return obj
-
-    def intersection(self, other):
-        """Return a new set which is the intersection of ``self`` and
-        ``other``.
-
-        Returns the same Set type as this set.
-        """
-
-        obj = self._clone()
-        obj.intersection_update(other)
-        return obj
-
-    def difference(self, other):
-        """Return a new set which ``self`` - ``other``, i.e. the items
-        in ``self`` which are not also in ``other``.
-
-        Returns the same Set type as this set.
-        """
-
-        obj = self._clone()
-        obj.difference_update(other)
-        return obj
-
-    def symmetric_difference(self, other):
-        """Return a new set which (``self`` - ``other``) | (``other``
-        - ``self), ie: the items in either ``self`` or ``other`` which
-        are not contained in their intersection.
-
-        Returns the same Set type as this set.
-        """
-
-        obj = self._clone()
-        obj.symmetric_difference_update(other)
-        return obj
-
-    def __or__(self, other):
-        return self.union(other)
-
-    def __and__(self, other):
-        return self.intersection(other)
-
-    def __add__(self, other):
-        return self.union(other)
-
-    def __sub__(self, other):
-        return self.difference(other)
-
-    def __xor__(self, other):
-        return self.symmetric_difference(other)
-
-    def __ior__(self, other):
-        self.union_update(other)
-        return self
-
-    def __iand__(self, other):
-        self.intersection_update(other)
-        return self
-
-    def __iadd__(self, other):
-        self.union_update(other)
-        return self
-
-    def __isub__(self, other):
-        self.difference_update(other)
-        return self
-
-    def __ixor__(self, other):
-        self.symmetric_difference_update(other)
-        return self
-
-    def update(self, other):
-        """Update the set, adding any elements from other which are not
-        already in the set.
-
-        *other*, the collection of items with which to update the set, which
-        may be any iterable type.
-        """
-
-        for item in other:
-            self.add(item)
-
-    def clear(self):
-        """Make the set empty."""
-        self.items.clear()
-
-    def __eq__(self, other):
-        return self.items == other.items
-
-    def __ne__(self, other):
-        return not self.__eq__(other)
-
-    def __len__(self):
-        return len(self.items)
-
-    def __iter__(self):
-        return iter(self.items)
-
-    def __getitem__(self, i):
-        if isinstance(i, slice):
-            return list(itertools.islice(self.items, i.start, i.stop, i.step))
-        else:
-            return next(itertools.islice(self.items, i, i + 1))
-
-    def __delitem__(self, i):
-        if isinstance(i, slice):
-            for elt in list(self[i]):
-                del self.items[elt]
-        else:
-            del self.items[self[i]]
-
-    def issubset(self, other):
-        """Is this set a subset of *other*?
-
-        Returns a ``bool``.
-        """
-
-        if not isinstance(other, Set):
-            raise ValueError("other must be a Set instance")
-        for item in self.items:
-            if item not in other.items:
-                return False
-        return True
-
-    def issuperset(self, other):
-        """Is this set a superset of *other*?
-
-        Returns a ``bool``.
-        """
-
-        if not isinstance(other, Set):
-            raise ValueError("other must be a Set instance")
-        for item in other.items:
-            if item not in self.items:
-                return False
-        return True
-
-    def isdisjoint(self, other):
-        if not isinstance(other, Set):
-            raise ValueError("other must be a Set instance")
-        for item in other.items:
-            if item in self.items:
-                return False
-        return True
diff --git a/lib/dns/tokenizer.py b/lib/dns/tokenizer.py
deleted file mode 100644
index ab205bc3..00000000
--- a/lib/dns/tokenizer.py
+++ /dev/null
@@ -1,708 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""Tokenize DNS zone file format"""
-
-import io
-import sys
-from typing import Any, List, Optional, Tuple
-
-import dns.exception
-import dns.name
-import dns.ttl
-
-_DELIMITERS = {" ", "\t", "\n", ";", "(", ")", '"'}
-_QUOTING_DELIMITERS = {'"'}
-
-EOF = 0
-EOL = 1
-WHITESPACE = 2
-IDENTIFIER = 3
-QUOTED_STRING = 4
-COMMENT = 5
-DELIMITER = 6
-
-
-class UngetBufferFull(dns.exception.DNSException):
-    """An attempt was made to unget a token when the unget buffer was full."""
-
-
-class Token:
-    """A DNS zone file format token.
-
-    ttype: The token type
-    value: The token value
-    has_escape: Does the token value contain escapes?
-    """
-
-    def __init__(
-        self,
-        ttype: int,
-        value: Any = "",
-        has_escape: bool = False,
-        comment: Optional[str] = None,
-    ):
-        """Initialize a token instance."""
-
-        self.ttype = ttype
-        self.value = value
-        self.has_escape = has_escape
-        self.comment = comment
-
-    def is_eof(self) -> bool:
-        return self.ttype == EOF
-
-    def is_eol(self) -> bool:
-        return self.ttype == EOL
-
-    def is_whitespace(self) -> bool:
-        return self.ttype == WHITESPACE
-
-    def is_identifier(self) -> bool:
-        return self.ttype == IDENTIFIER
-
-    def is_quoted_string(self) -> bool:
-        return self.ttype == QUOTED_STRING
-
-    def is_comment(self) -> bool:
-        return self.ttype == COMMENT
-
-    def is_delimiter(self) -> bool:  # pragma: no cover (we don't return delimiters yet)
-        return self.ttype == DELIMITER
-
-    def is_eol_or_eof(self) -> bool:
-        return self.ttype == EOL or self.ttype == EOF
-
-    def __eq__(self, other):
-        if not isinstance(other, Token):
-            return False
-        return self.ttype == other.ttype and self.value == other.value
-
-    def __ne__(self, other):
-        if not isinstance(other, Token):
-            return True
-        return self.ttype != other.ttype or self.value != other.value
-
-    def __str__(self):
-        return '%d "%s"' % (self.ttype, self.value)
-
-    def unescape(self) -> "Token":
-        if not self.has_escape:
-            return self
-        unescaped = ""
-        l = len(self.value)
-        i = 0
-        while i < l:
-            c = self.value[i]
-            i += 1
-            if c == "\\":
-                if i >= l:  # pragma: no cover   (can't happen via get())
-                    raise dns.exception.UnexpectedEnd
-                c = self.value[i]
-                i += 1
-                if c.isdigit():
-                    if i >= l:
-                        raise dns.exception.UnexpectedEnd
-                    c2 = self.value[i]
-                    i += 1
-                    if i >= l:
-                        raise dns.exception.UnexpectedEnd
-                    c3 = self.value[i]
-                    i += 1
-                    if not (c2.isdigit() and c3.isdigit()):
-                        raise dns.exception.SyntaxError
-                    codepoint = int(c) * 100 + int(c2) * 10 + int(c3)
-                    if codepoint > 255:
-                        raise dns.exception.SyntaxError
-                    c = chr(codepoint)
-            unescaped += c
-        return Token(self.ttype, unescaped)
-
-    def unescape_to_bytes(self) -> "Token":
-        # We used to use unescape() for TXT-like records, but this
-        # caused problems as we'd process DNS escapes into Unicode code
-        # points instead of byte values, and then a to_text() of the
-        # processed data would not equal the original input.  For
-        # example, \226 in the TXT record would have a to_text() of
-        # \195\162 because we applied UTF-8 encoding to Unicode code
-        # point 226.
-        #
-        # We now apply escapes while converting directly to bytes,
-        # avoiding this double encoding.
-        #
-        # This code also handles cases where the unicode input has
-        # non-ASCII code-points in it by converting it to UTF-8.  TXT
-        # records aren't defined for Unicode, but this is the best we
-        # can do to preserve meaning.  For example,
-        #
-        #     foo\u200bbar
-        #
-        # (where \u200b is Unicode code point 0x200b) will be treated
-        # as if the input had been the UTF-8 encoding of that string,
-        # namely:
-        #
-        #     foo\226\128\139bar
-        #
-        unescaped = b""
-        l = len(self.value)
-        i = 0
-        while i < l:
-            c = self.value[i]
-            i += 1
-            if c == "\\":
-                if i >= l:  # pragma: no cover   (can't happen via get())
-                    raise dns.exception.UnexpectedEnd
-                c = self.value[i]
-                i += 1
-                if c.isdigit():
-                    if i >= l:
-                        raise dns.exception.UnexpectedEnd
-                    c2 = self.value[i]
-                    i += 1
-                    if i >= l:
-                        raise dns.exception.UnexpectedEnd
-                    c3 = self.value[i]
-                    i += 1
-                    if not (c2.isdigit() and c3.isdigit()):
-                        raise dns.exception.SyntaxError
-                    codepoint = int(c) * 100 + int(c2) * 10 + int(c3)
-                    if codepoint > 255:
-                        raise dns.exception.SyntaxError
-                    unescaped += b"%c" % (codepoint)
-                else:
-                    # Note that as mentioned above, if c is a Unicode
-                    # code point outside of the ASCII range, then this
-                    # += is converting that code point to its UTF-8
-                    # encoding and appending multiple bytes to
-                    # unescaped.
-                    unescaped += c.encode()
-            else:
-                unescaped += c.encode()
-        return Token(self.ttype, bytes(unescaped))
-
-
-class Tokenizer:
-    """A DNS zone file format tokenizer.
-
-    A token object is basically a (type, value) tuple.  The valid
-    types are EOF, EOL, WHITESPACE, IDENTIFIER, QUOTED_STRING,
-    COMMENT, and DELIMITER.
-
-    file: The file to tokenize
-
-    ungotten_char: The most recently ungotten character, or None.
-
-    ungotten_token: The most recently ungotten token, or None.
-
-    multiline: The current multiline level.  This value is increased
-    by one every time a '(' delimiter is read, and decreased by one every time
-    a ')' delimiter is read.
-
-    quoting: This variable is true if the tokenizer is currently
-    reading a quoted string.
-
-    eof: This variable is true if the tokenizer has encountered EOF.
-
-    delimiters: The current delimiter dictionary.
-
-    line_number: The current line number
-
-    filename: A filename that will be returned by the where() method.
-
-    idna_codec: A dns.name.IDNACodec, specifies the IDNA
-    encoder/decoder.  If None, the default IDNA 2003
-    encoder/decoder is used.
-    """
-
-    def __init__(
-        self,
-        f: Any = sys.stdin,
-        filename: Optional[str] = None,
-        idna_codec: Optional[dns.name.IDNACodec] = None,
-    ):
-        """Initialize a tokenizer instance.
-
-        f: The file to tokenize.  The default is sys.stdin.
-        This parameter may also be a string, in which case the tokenizer
-        will take its input from the contents of the string.
-
-        filename: the name of the filename that the where() method
-        will return.
-
-        idna_codec: A dns.name.IDNACodec, specifies the IDNA
-        encoder/decoder.  If None, the default IDNA 2003
-        encoder/decoder is used.
-        """
-
-        if isinstance(f, str):
-            f = io.StringIO(f)
-            if filename is None:
-                filename = "<string>"
-        elif isinstance(f, bytes):
-            f = io.StringIO(f.decode())
-            if filename is None:
-                filename = "<string>"
-        else:
-            if filename is None:
-                if f is sys.stdin:
-                    filename = "<stdin>"
-                else:
-                    filename = "<file>"
-        self.file = f
-        self.ungotten_char: Optional[str] = None
-        self.ungotten_token: Optional[Token] = None
-        self.multiline = 0
-        self.quoting = False
-        self.eof = False
-        self.delimiters = _DELIMITERS
-        self.line_number = 1
-        assert filename is not None
-        self.filename = filename
-        if idna_codec is None:
-            self.idna_codec: dns.name.IDNACodec = dns.name.IDNA_2003
-        else:
-            self.idna_codec = idna_codec
-
-    def _get_char(self) -> str:
-        """Read a character from input."""
-
-        if self.ungotten_char is None:
-            if self.eof:
-                c = ""
-            else:
-                c = self.file.read(1)
-                if c == "":
-                    self.eof = True
-                elif c == "\n":
-                    self.line_number += 1
-        else:
-            c = self.ungotten_char
-            self.ungotten_char = None
-        return c
-
-    def where(self) -> Tuple[str, int]:
-        """Return the current location in the input.
-
-        Returns a (string, int) tuple.  The first item is the filename of
-        the input, the second is the current line number.
-        """
-
-        return (self.filename, self.line_number)
-
-    def _unget_char(self, c: str) -> None:
-        """Unget a character.
-
-        The unget buffer for characters is only one character large; it is
-        an error to try to unget a character when the unget buffer is not
-        empty.
-
-        c: the character to unget
-        raises UngetBufferFull: there is already an ungotten char
-        """
-
-        if self.ungotten_char is not None:
-            # this should never happen!
-            raise UngetBufferFull  # pragma: no cover
-        self.ungotten_char = c
-
-    def skip_whitespace(self) -> int:
-        """Consume input until a non-whitespace character is encountered.
-
-        The non-whitespace character is then ungotten, and the number of
-        whitespace characters consumed is returned.
-
-        If the tokenizer is in multiline mode, then newlines are whitespace.
-
-        Returns the number of characters skipped.
-        """
-
-        skipped = 0
-        while True:
-            c = self._get_char()
-            if c != " " and c != "\t":
-                if (c != "\n") or not self.multiline:
-                    self._unget_char(c)
-                    return skipped
-            skipped += 1
-
-    def get(self, want_leading: bool = False, want_comment: bool = False) -> Token:
-        """Get the next token.
-
-        want_leading: If True, return a WHITESPACE token if the
-        first character read is whitespace.  The default is False.
-
-        want_comment: If True, return a COMMENT token if the
-        first token read is a comment.  The default is False.
-
-        Raises dns.exception.UnexpectedEnd: input ended prematurely
-
-        Raises dns.exception.SyntaxError: input was badly formed
-
-        Returns a Token.
-        """
-
-        if self.ungotten_token is not None:
-            utoken = self.ungotten_token
-            self.ungotten_token = None
-            if utoken.is_whitespace():
-                if want_leading:
-                    return utoken
-            elif utoken.is_comment():
-                if want_comment:
-                    return utoken
-            else:
-                return utoken
-        skipped = self.skip_whitespace()
-        if want_leading and skipped > 0:
-            return Token(WHITESPACE, " ")
-        token = ""
-        ttype = IDENTIFIER
-        has_escape = False
-        while True:
-            c = self._get_char()
-            if c == "" or c in self.delimiters:
-                if c == "" and self.quoting:
-                    raise dns.exception.UnexpectedEnd
-                if token == "" and ttype != QUOTED_STRING:
-                    if c == "(":
-                        self.multiline += 1
-                        self.skip_whitespace()
-                        continue
-                    elif c == ")":
-                        if self.multiline <= 0:
-                            raise dns.exception.SyntaxError
-                        self.multiline -= 1
-                        self.skip_whitespace()
-                        continue
-                    elif c == '"':
-                        if not self.quoting:
-                            self.quoting = True
-                            self.delimiters = _QUOTING_DELIMITERS
-                            ttype = QUOTED_STRING
-                            continue
-                        else:
-                            self.quoting = False
-                            self.delimiters = _DELIMITERS
-                            self.skip_whitespace()
-                            continue
-                    elif c == "\n":
-                        return Token(EOL, "\n")
-                    elif c == ";":
-                        while 1:
-                            c = self._get_char()
-                            if c == "\n" or c == "":
-                                break
-                            token += c
-                        if want_comment:
-                            self._unget_char(c)
-                            return Token(COMMENT, token)
-                        elif c == "":
-                            if self.multiline:
-                                raise dns.exception.SyntaxError(
-                                    "unbalanced parentheses"
-                                )
-                            return Token(EOF, comment=token)
-                        elif self.multiline:
-                            self.skip_whitespace()
-                            token = ""
-                            continue
-                        else:
-                            return Token(EOL, "\n", comment=token)
-                    else:
-                        # This code exists in case we ever want a
-                        # delimiter to be returned.  It never produces
-                        # a token currently.
-                        token = c
-                        ttype = DELIMITER
-                else:
-                    self._unget_char(c)
-                break
-            elif self.quoting and c == "\n":
-                raise dns.exception.SyntaxError("newline in quoted string")
-            elif c == "\\":
-                #
-                # It's an escape.  Put it and the next character into
-                # the token; it will be checked later for goodness.
-                #
-                token += c
-                has_escape = True
-                c = self._get_char()
-                if c == "" or (c == "\n" and not self.quoting):
-                    raise dns.exception.UnexpectedEnd
-            token += c
-        if token == "" and ttype != QUOTED_STRING:
-            if self.multiline:
-                raise dns.exception.SyntaxError("unbalanced parentheses")
-            ttype = EOF
-        return Token(ttype, token, has_escape)
-
-    def unget(self, token: Token) -> None:
-        """Unget a token.
-
-        The unget buffer for tokens is only one token large; it is
-        an error to try to unget a token when the unget buffer is not
-        empty.
-
-        token: the token to unget
-
-        Raises UngetBufferFull: there is already an ungotten token
-        """
-
-        if self.ungotten_token is not None:
-            raise UngetBufferFull
-        self.ungotten_token = token
-
-    def next(self):
-        """Return the next item in an iteration.
-
-        Returns a Token.
-        """
-
-        token = self.get()
-        if token.is_eof():
-            raise StopIteration
-        return token
-
-    __next__ = next
-
-    def __iter__(self):
-        return self
-
-    # Helpers
-
-    def get_int(self, base: int = 10) -> int:
-        """Read the next token and interpret it as an unsigned integer.
-
-        Raises dns.exception.SyntaxError if not an unsigned integer.
-
-        Returns an int.
-        """
-
-        token = self.get().unescape()
-        if not token.is_identifier():
-            raise dns.exception.SyntaxError("expecting an identifier")
-        if not token.value.isdigit():
-            raise dns.exception.SyntaxError("expecting an integer")
-        return int(token.value, base)
-
-    def get_uint8(self) -> int:
-        """Read the next token and interpret it as an 8-bit unsigned
-        integer.
-
-        Raises dns.exception.SyntaxError if not an 8-bit unsigned integer.
-
-        Returns an int.
-        """
-
-        value = self.get_int()
-        if value < 0 or value > 255:
-            raise dns.exception.SyntaxError(
-                "%d is not an unsigned 8-bit integer" % value
-            )
-        return value
-
-    def get_uint16(self, base: int = 10) -> int:
-        """Read the next token and interpret it as a 16-bit unsigned
-        integer.
-
-        Raises dns.exception.SyntaxError if not a 16-bit unsigned integer.
-
-        Returns an int.
-        """
-
-        value = self.get_int(base=base)
-        if value < 0 or value > 65535:
-            if base == 8:
-                raise dns.exception.SyntaxError(
-                    f"{value:o} is not an octal unsigned 16-bit integer"
-                )
-            else:
-                raise dns.exception.SyntaxError(
-                    "%d is not an unsigned 16-bit integer" % value
-                )
-        return value
-
-    def get_uint32(self, base: int = 10) -> int:
-        """Read the next token and interpret it as a 32-bit unsigned
-        integer.
-
-        Raises dns.exception.SyntaxError if not a 32-bit unsigned integer.
-
-        Returns an int.
-        """
-
-        value = self.get_int(base=base)
-        if value < 0 or value > 4294967295:
-            raise dns.exception.SyntaxError(
-                "%d is not an unsigned 32-bit integer" % value
-            )
-        return value
-
-    def get_uint48(self, base: int = 10) -> int:
-        """Read the next token and interpret it as a 48-bit unsigned
-        integer.
-
-        Raises dns.exception.SyntaxError if not a 48-bit unsigned integer.
-
-        Returns an int.
-        """
-
-        value = self.get_int(base=base)
-        if value < 0 or value > 281474976710655:
-            raise dns.exception.SyntaxError(
-                "%d is not an unsigned 48-bit integer" % value
-            )
-        return value
-
-    def get_string(self, max_length: Optional[int] = None) -> str:
-        """Read the next token and interpret it as a string.
-
-        Raises dns.exception.SyntaxError if not a string.
-        Raises dns.exception.SyntaxError if token value length
-        exceeds max_length (if specified).
-
-        Returns a string.
-        """
-
-        token = self.get().unescape()
-        if not (token.is_identifier() or token.is_quoted_string()):
-            raise dns.exception.SyntaxError("expecting a string")
-        if max_length and len(token.value) > max_length:
-            raise dns.exception.SyntaxError("string too long")
-        return token.value
-
-    def get_identifier(self) -> str:
-        """Read the next token, which should be an identifier.
-
-        Raises dns.exception.SyntaxError if not an identifier.
-
-        Returns a string.
-        """
-
-        token = self.get().unescape()
-        if not token.is_identifier():
-            raise dns.exception.SyntaxError("expecting an identifier")
-        return token.value
-
-    def get_remaining(self, max_tokens: Optional[int] = None) -> List[Token]:
-        """Return the remaining tokens on the line, until an EOL or EOF is seen.
-
-        max_tokens: If not None, stop after this number of tokens.
-
-        Returns a list of tokens.
-        """
-
-        tokens = []
-        while True:
-            token = self.get()
-            if token.is_eol_or_eof():
-                self.unget(token)
-                break
-            tokens.append(token)
-            if len(tokens) == max_tokens:
-                break
-        return tokens
-
-    def concatenate_remaining_identifiers(self, allow_empty: bool = False) -> str:
-        """Read the remaining tokens on the line, which should be identifiers.
-
-        Raises dns.exception.SyntaxError if there are no remaining tokens,
-        unless `allow_empty=True` is given.
-
-        Raises dns.exception.SyntaxError if a token is seen that is not an
-        identifier.
-
-        Returns a string containing a concatenation of the remaining
-        identifiers.
-        """
-        s = ""
-        while True:
-            token = self.get().unescape()
-            if token.is_eol_or_eof():
-                self.unget(token)
-                break
-            if not token.is_identifier():
-                raise dns.exception.SyntaxError
-            s += token.value
-        if not (allow_empty or s):
-            raise dns.exception.SyntaxError("expecting another identifier")
-        return s
-
-    def as_name(
-        self,
-        token: Token,
-        origin: Optional[dns.name.Name] = None,
-        relativize: bool = False,
-        relativize_to: Optional[dns.name.Name] = None,
-    ) -> dns.name.Name:
-        """Try to interpret the token as a DNS name.
-
-        Raises dns.exception.SyntaxError if not a name.
-
-        Returns a dns.name.Name.
-        """
-        if not token.is_identifier():
-            raise dns.exception.SyntaxError("expecting an identifier")
-        name = dns.name.from_text(token.value, origin, self.idna_codec)
-        return name.choose_relativity(relativize_to or origin, relativize)
-
-    def get_name(
-        self,
-        origin: Optional[dns.name.Name] = None,
-        relativize: bool = False,
-        relativize_to: Optional[dns.name.Name] = None,
-    ) -> dns.name.Name:
-        """Read the next token and interpret it as a DNS name.
-
-        Raises dns.exception.SyntaxError if not a name.
-
-        Returns a dns.name.Name.
-        """
-
-        token = self.get()
-        return self.as_name(token, origin, relativize, relativize_to)
-
-    def get_eol_as_token(self) -> Token:
-        """Read the next token and raise an exception if it isn't EOL or
-        EOF.
-
-        Returns a string.
-        """
-
-        token = self.get()
-        if not token.is_eol_or_eof():
-            raise dns.exception.SyntaxError(
-                'expected EOL or EOF, got %d "%s"' % (token.ttype, token.value)
-            )
-        return token
-
-    def get_eol(self) -> str:
-        return self.get_eol_as_token().value
-
-    def get_ttl(self) -> int:
-        """Read the next token and interpret it as a DNS TTL.
-
-        Raises dns.exception.SyntaxError or dns.ttl.BadTTL if not an
-        identifier or badly formed.
-
-        Returns an int.
-        """
-
-        token = self.get().unescape()
-        if not token.is_identifier():
-            raise dns.exception.SyntaxError("expecting an identifier")
-        return dns.ttl.from_text(token.value)
diff --git a/lib/dns/transaction.py b/lib/dns/transaction.py
deleted file mode 100644
index aa2e1160..00000000
--- a/lib/dns/transaction.py
+++ /dev/null
@@ -1,649 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-import collections
-from typing import Any, Callable, Iterator, List, Optional, Tuple, Union
-
-import dns.exception
-import dns.name
-import dns.node
-import dns.rdataclass
-import dns.rdataset
-import dns.rdatatype
-import dns.rrset
-import dns.serial
-import dns.ttl
-
-
-class TransactionManager:
-    def reader(self) -> "Transaction":
-        """Begin a read-only transaction."""
-        raise NotImplementedError  # pragma: no cover
-
-    def writer(self, replacement: bool = False) -> "Transaction":
-        """Begin a writable transaction.
-
-        *replacement*, a ``bool``.  If `True`, the content of the
-        transaction completely replaces any prior content.  If False,
-        the default, then the content of the transaction updates the
-        existing content.
-        """
-        raise NotImplementedError  # pragma: no cover
-
-    def origin_information(
-        self,
-    ) -> Tuple[Optional[dns.name.Name], bool, Optional[dns.name.Name]]:
-        """Returns a tuple
-
-            (absolute_origin, relativize, effective_origin)
-
-        giving the absolute name of the default origin for any
-        relative domain names, the "effective origin", and whether
-        names should be relativized.  The "effective origin" is the
-        absolute origin if relativize is False, and the empty name if
-        relativize is true.  (The effective origin is provided even
-        though it can be computed from the absolute_origin and
-        relativize setting because it avoids a lot of code
-        duplication.)
-
-        If the returned names are `None`, then no origin information is
-        available.
-
-        This information is used by code working with transactions to
-        allow it to coordinate relativization.  The transaction code
-        itself takes what it gets (i.e. does not change name
-        relativity).
-
-        """
-        raise NotImplementedError  # pragma: no cover
-
-    def get_class(self) -> dns.rdataclass.RdataClass:
-        """The class of the transaction manager."""
-        raise NotImplementedError  # pragma: no cover
-
-    def from_wire_origin(self) -> Optional[dns.name.Name]:
-        """Origin to use in from_wire() calls."""
-        (absolute_origin, relativize, _) = self.origin_information()
-        if relativize:
-            return absolute_origin
-        else:
-            return None
-
-
-class DeleteNotExact(dns.exception.DNSException):
-    """Existing data did not match data specified by an exact delete."""
-
-
-class ReadOnly(dns.exception.DNSException):
-    """Tried to write to a read-only transaction."""
-
-
-class AlreadyEnded(dns.exception.DNSException):
-    """Tried to use an already-ended transaction."""
-
-
-def _ensure_immutable_rdataset(rdataset):
-    if rdataset is None or isinstance(rdataset, dns.rdataset.ImmutableRdataset):
-        return rdataset
-    return dns.rdataset.ImmutableRdataset(rdataset)
-
-
-def _ensure_immutable_node(node):
-    if node is None or node.is_immutable():
-        return node
-    return dns.node.ImmutableNode(node)
-
-
-CheckPutRdatasetType = Callable[
-    ["Transaction", dns.name.Name, dns.rdataset.Rdataset], None
-]
-CheckDeleteRdatasetType = Callable[
-    ["Transaction", dns.name.Name, dns.rdatatype.RdataType, dns.rdatatype.RdataType],
-    None,
-]
-CheckDeleteNameType = Callable[["Transaction", dns.name.Name], None]
-
-
-class Transaction:
-    def __init__(
-        self,
-        manager: TransactionManager,
-        replacement: bool = False,
-        read_only: bool = False,
-    ):
-        self.manager = manager
-        self.replacement = replacement
-        self.read_only = read_only
-        self._ended = False
-        self._check_put_rdataset: List[CheckPutRdatasetType] = []
-        self._check_delete_rdataset: List[CheckDeleteRdatasetType] = []
-        self._check_delete_name: List[CheckDeleteNameType] = []
-
-    #
-    # This is the high level API
-    #
-    # Note that we currently use non-immutable types in the return type signature to
-    # avoid covariance problems, e.g. if the caller has a List[Rdataset], mypy will be
-    # unhappy if we return an ImmutableRdataset.
-
-    def get(
-        self,
-        name: Optional[Union[dns.name.Name, str]],
-        rdtype: Union[dns.rdatatype.RdataType, str],
-        covers: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.NONE,
-    ) -> dns.rdataset.Rdataset:
-        """Return the rdataset associated with *name*, *rdtype*, and *covers*,
-        or `None` if not found.
-
-        Note that the returned rdataset is immutable.
-        """
-        self._check_ended()
-        if isinstance(name, str):
-            name = dns.name.from_text(name, None)
-        rdtype = dns.rdatatype.RdataType.make(rdtype)
-        covers = dns.rdatatype.RdataType.make(covers)
-        rdataset = self._get_rdataset(name, rdtype, covers)
-        return _ensure_immutable_rdataset(rdataset)
-
-    def get_node(self, name: dns.name.Name) -> Optional[dns.node.Node]:
-        """Return the node at *name*, if any.
-
-        Returns an immutable node or ``None``.
-        """
-        return _ensure_immutable_node(self._get_node(name))
-
-    def _check_read_only(self) -> None:
-        if self.read_only:
-            raise ReadOnly
-
-    def add(self, *args: Any) -> None:
-        """Add records.
-
-        The arguments may be:
-
-            - rrset
-
-            - name, rdataset...
-
-            - name, ttl, rdata...
-        """
-        self._check_ended()
-        self._check_read_only()
-        self._add(False, args)
-
-    def replace(self, *args: Any) -> None:
-        """Replace the existing rdataset at the name with the specified
-        rdataset, or add the specified rdataset if there was no existing
-        rdataset.
-
-        The arguments may be:
-
-            - rrset
-
-            - name, rdataset...
-
-            - name, ttl, rdata...
-
-        Note that if you want to replace the entire node, you should do
-        a delete of the name followed by one or more calls to add() or
-        replace().
-        """
-        self._check_ended()
-        self._check_read_only()
-        self._add(True, args)
-
-    def delete(self, *args: Any) -> None:
-        """Delete records.
-
-        It is not an error if some of the records are not in the existing
-        set.
-
-        The arguments may be:
-
-            - rrset
-
-            - name
-
-            - name, rdatatype, [covers]
-
-            - name, rdataset...
-
-            - name, rdata...
-        """
-        self._check_ended()
-        self._check_read_only()
-        self._delete(False, args)
-
-    def delete_exact(self, *args: Any) -> None:
-        """Delete records.
-
-        The arguments may be:
-
-            - rrset
-
-            - name
-
-            - name, rdatatype, [covers]
-
-            - name, rdataset...
-
-            - name, rdata...
-
-        Raises dns.transaction.DeleteNotExact if some of the records
-        are not in the existing set.
-
-        """
-        self._check_ended()
-        self._check_read_only()
-        self._delete(True, args)
-
-    def name_exists(self, name: Union[dns.name.Name, str]) -> bool:
-        """Does the specified name exist?"""
-        self._check_ended()
-        if isinstance(name, str):
-            name = dns.name.from_text(name, None)
-        return self._name_exists(name)
-
-    def update_serial(
-        self,
-        value: int = 1,
-        relative: bool = True,
-        name: dns.name.Name = dns.name.empty,
-    ) -> None:
-        """Update the serial number.
-
-        *value*, an `int`, is an increment if *relative* is `True`, or the
-        actual value to set if *relative* is `False`.
-
-        Raises `KeyError` if there is no SOA rdataset at *name*.
-
-        Raises `ValueError` if *value* is negative or if the increment is
-        so large that it would cause the new serial to be less than the
-        prior value.
-        """
-        self._check_ended()
-        if value < 0:
-            raise ValueError("negative update_serial() value")
-        if isinstance(name, str):
-            name = dns.name.from_text(name, None)
-        rdataset = self._get_rdataset(name, dns.rdatatype.SOA, dns.rdatatype.NONE)
-        if rdataset is None or len(rdataset) == 0:
-            raise KeyError
-        if relative:
-            serial = dns.serial.Serial(rdataset[0].serial) + value
-        else:
-            serial = dns.serial.Serial(value)
-        serial = serial.value  # convert back to int
-        if serial == 0:
-            serial = 1
-        rdata = rdataset[0].replace(serial=serial)
-        new_rdataset = dns.rdataset.from_rdata(rdataset.ttl, rdata)
-        self.replace(name, new_rdataset)
-
-    def __iter__(self):
-        self._check_ended()
-        return self._iterate_rdatasets()
-
-    def changed(self) -> bool:
-        """Has this transaction changed anything?
-
-        For read-only transactions, the result is always `False`.
-
-        For writable transactions, the result is `True` if at some time
-        during the life of the transaction, the content was changed.
-        """
-        self._check_ended()
-        return self._changed()
-
-    def commit(self) -> None:
-        """Commit the transaction.
-
-        Normally transactions are used as context managers and commit
-        or rollback automatically, but it may be done explicitly if needed.
-        A ``dns.transaction.Ended`` exception will be raised if you try
-        to use a transaction after it has been committed or rolled back.
-
-        Raises an exception if the commit fails (in which case the transaction
-        is also rolled back.
-        """
-        self._end(True)
-
-    def rollback(self) -> None:
-        """Rollback the transaction.
-
-        Normally transactions are used as context managers and commit
-        or rollback automatically, but it may be done explicitly if needed.
-        A ``dns.transaction.AlreadyEnded`` exception will be raised if you try
-        to use a transaction after it has been committed or rolled back.
-
-        Rollback cannot otherwise fail.
-        """
-        self._end(False)
-
-    def check_put_rdataset(self, check: CheckPutRdatasetType) -> None:
-        """Call *check* before putting (storing) an rdataset.
-
-        The function is called with the transaction, the name, and the rdataset.
-
-        The check function may safely make non-mutating transaction method
-        calls, but behavior is undefined if mutating transaction methods are
-        called.  The check function should raise an exception if it objects to
-        the put, and otherwise should return ``None``.
-        """
-        self._check_put_rdataset.append(check)
-
-    def check_delete_rdataset(self, check: CheckDeleteRdatasetType) -> None:
-        """Call *check* before deleting an rdataset.
-
-        The function is called with the transaction, the name, the rdatatype,
-        and the covered rdatatype.
-
-        The check function may safely make non-mutating transaction method
-        calls, but behavior is undefined if mutating transaction methods are
-        called.  The check function should raise an exception if it objects to
-        the put, and otherwise should return ``None``.
-        """
-        self._check_delete_rdataset.append(check)
-
-    def check_delete_name(self, check: CheckDeleteNameType) -> None:
-        """Call *check* before putting (storing) an rdataset.
-
-        The function is called with the transaction and the name.
-
-        The check function may safely make non-mutating transaction method
-        calls, but behavior is undefined if mutating transaction methods are
-        called.  The check function should raise an exception if it objects to
-        the put, and otherwise should return ``None``.
-        """
-        self._check_delete_name.append(check)
-
-    def iterate_rdatasets(
-        self,
-    ) -> Iterator[Tuple[dns.name.Name, dns.rdataset.Rdataset]]:
-        """Iterate all the rdatasets in the transaction, returning
-        (`dns.name.Name`, `dns.rdataset.Rdataset`) tuples.
-
-        Note that as is usual with python iterators, adding or removing items
-        while iterating will invalidate the iterator and may raise `RuntimeError`
-        or fail to iterate over all entries."""
-        self._check_ended()
-        return self._iterate_rdatasets()
-
-    def iterate_names(self) -> Iterator[dns.name.Name]:
-        """Iterate all the names in the transaction.
-
-        Note that as is usual with python iterators, adding or removing names
-        while iterating will invalidate the iterator and may raise `RuntimeError`
-        or fail to iterate over all entries."""
-        self._check_ended()
-        return self._iterate_names()
-
-    #
-    # Helper methods
-    #
-
-    def _raise_if_not_empty(self, method, args):
-        if len(args) != 0:
-            raise TypeError(f"extra parameters to {method}")
-
-    def _rdataset_from_args(self, method, deleting, args):
-        try:
-            arg = args.popleft()
-            if isinstance(arg, dns.rrset.RRset):
-                rdataset = arg.to_rdataset()
-            elif isinstance(arg, dns.rdataset.Rdataset):
-                rdataset = arg
-            else:
-                if deleting:
-                    ttl = 0
-                else:
-                    if isinstance(arg, int):
-                        ttl = arg
-                        if ttl > dns.ttl.MAX_TTL:
-                            raise ValueError(f"{method}: TTL value too big")
-                    else:
-                        raise TypeError(f"{method}: expected a TTL")
-                    arg = args.popleft()
-                if isinstance(arg, dns.rdata.Rdata):
-                    rdataset = dns.rdataset.from_rdata(ttl, arg)
-                else:
-                    raise TypeError(f"{method}: expected an Rdata")
-            return rdataset
-        except IndexError:
-            if deleting:
-                return None
-            else:
-                # reraise
-                raise TypeError(f"{method}: expected more arguments")
-
-    def _add(self, replace, args):
-        try:
-            args = collections.deque(args)
-            if replace:
-                method = "replace()"
-            else:
-                method = "add()"
-            arg = args.popleft()
-            if isinstance(arg, str):
-                arg = dns.name.from_text(arg, None)
-            if isinstance(arg, dns.name.Name):
-                name = arg
-                rdataset = self._rdataset_from_args(method, False, args)
-            elif isinstance(arg, dns.rrset.RRset):
-                rrset = arg
-                name = rrset.name
-                # rrsets are also rdatasets, but they don't print the
-                # same and can't be stored in nodes, so convert.
-                rdataset = rrset.to_rdataset()
-            else:
-                raise TypeError(
-                    f"{method} requires a name or RRset as the first argument"
-                )
-            if rdataset.rdclass != self.manager.get_class():
-                raise ValueError(f"{method} has objects of wrong RdataClass")
-            if rdataset.rdtype == dns.rdatatype.SOA:
-                (_, _, origin) = self._origin_information()
-                if name != origin:
-                    raise ValueError(f"{method} has non-origin SOA")
-            self._raise_if_not_empty(method, args)
-            if not replace:
-                existing = self._get_rdataset(name, rdataset.rdtype, rdataset.covers)
-                if existing is not None:
-                    if isinstance(existing, dns.rdataset.ImmutableRdataset):
-                        trds = dns.rdataset.Rdataset(
-                            existing.rdclass, existing.rdtype, existing.covers
-                        )
-                        trds.update(existing)
-                        existing = trds
-                    rdataset = existing.union(rdataset)
-            self._checked_put_rdataset(name, rdataset)
-        except IndexError:
-            raise TypeError(f"not enough parameters to {method}")
-
-    def _delete(self, exact, args):
-        try:
-            args = collections.deque(args)
-            if exact:
-                method = "delete_exact()"
-            else:
-                method = "delete()"
-            arg = args.popleft()
-            if isinstance(arg, str):
-                arg = dns.name.from_text(arg, None)
-            if isinstance(arg, dns.name.Name):
-                name = arg
-                if len(args) > 0 and (
-                    isinstance(args[0], int) or isinstance(args[0], str)
-                ):
-                    # deleting by type and (optionally) covers
-                    rdtype = dns.rdatatype.RdataType.make(args.popleft())
-                    if len(args) > 0:
-                        covers = dns.rdatatype.RdataType.make(args.popleft())
-                    else:
-                        covers = dns.rdatatype.NONE
-                    self._raise_if_not_empty(method, args)
-                    existing = self._get_rdataset(name, rdtype, covers)
-                    if existing is None:
-                        if exact:
-                            raise DeleteNotExact(f"{method}: missing rdataset")
-                    else:
-                        self._checked_delete_rdataset(name, rdtype, covers)
-                    return
-                else:
-                    rdataset = self._rdataset_from_args(method, True, args)
-            elif isinstance(arg, dns.rrset.RRset):
-                rdataset = arg  # rrsets are also rdatasets
-                name = rdataset.name
-            else:
-                raise TypeError(
-                    f"{method} requires a name or RRset as the first argument"
-                )
-            self._raise_if_not_empty(method, args)
-            if rdataset:
-                if rdataset.rdclass != self.manager.get_class():
-                    raise ValueError(f"{method} has objects of wrong RdataClass")
-                existing = self._get_rdataset(name, rdataset.rdtype, rdataset.covers)
-                if existing is not None:
-                    if exact:
-                        intersection = existing.intersection(rdataset)
-                        if intersection != rdataset:
-                            raise DeleteNotExact(f"{method}: missing rdatas")
-                    rdataset = existing.difference(rdataset)
-                    if len(rdataset) == 0:
-                        self._checked_delete_rdataset(
-                            name, rdataset.rdtype, rdataset.covers
-                        )
-                    else:
-                        self._checked_put_rdataset(name, rdataset)
-                elif exact:
-                    raise DeleteNotExact(f"{method}: missing rdataset")
-            else:
-                if exact and not self._name_exists(name):
-                    raise DeleteNotExact(f"{method}: name not known")
-                self._checked_delete_name(name)
-        except IndexError:
-            raise TypeError(f"not enough parameters to {method}")
-
-    def _check_ended(self):
-        if self._ended:
-            raise AlreadyEnded
-
-    def _end(self, commit):
-        self._check_ended()
-        try:
-            self._end_transaction(commit)
-        finally:
-            self._ended = True
-
-    def _checked_put_rdataset(self, name, rdataset):
-        for check in self._check_put_rdataset:
-            check(self, name, rdataset)
-        self._put_rdataset(name, rdataset)
-
-    def _checked_delete_rdataset(self, name, rdtype, covers):
-        for check in self._check_delete_rdataset:
-            check(self, name, rdtype, covers)
-        self._delete_rdataset(name, rdtype, covers)
-
-    def _checked_delete_name(self, name):
-        for check in self._check_delete_name:
-            check(self, name)
-        self._delete_name(name)
-
-    #
-    # Transactions are context managers.
-    #
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        if not self._ended:
-            if exc_type is None:
-                self.commit()
-            else:
-                self.rollback()
-        return False
-
-    #
-    # This is the low level API, which must be implemented by subclasses
-    # of Transaction.
-    #
-
-    def _get_rdataset(self, name, rdtype, covers):
-        """Return the rdataset associated with *name*, *rdtype*, and *covers*,
-        or `None` if not found.
-        """
-        raise NotImplementedError  # pragma: no cover
-
-    def _put_rdataset(self, name, rdataset):
-        """Store the rdataset."""
-        raise NotImplementedError  # pragma: no cover
-
-    def _delete_name(self, name):
-        """Delete all data associated with *name*.
-
-        It is not an error if the name does not exist.
-        """
-        raise NotImplementedError  # pragma: no cover
-
-    def _delete_rdataset(self, name, rdtype, covers):
-        """Delete all data associated with *name*, *rdtype*, and *covers*.
-
-        It is not an error if the rdataset does not exist.
-        """
-        raise NotImplementedError  # pragma: no cover
-
-    def _name_exists(self, name):
-        """Does name exist?
-
-        Returns a bool.
-        """
-        raise NotImplementedError  # pragma: no cover
-
-    def _changed(self):
-        """Has this transaction changed anything?"""
-        raise NotImplementedError  # pragma: no cover
-
-    def _end_transaction(self, commit):
-        """End the transaction.
-
-        *commit*, a bool.  If ``True``, commit the transaction, otherwise
-        roll it back.
-
-        If committing and the commit fails, then roll back and raise an
-        exception.
-        """
-        raise NotImplementedError  # pragma: no cover
-
-    def _set_origin(self, origin):
-        """Set the origin.
-
-        This method is called when reading a possibly relativized
-        source, and an origin setting operation occurs (e.g. $ORIGIN
-        in a zone file).
-        """
-        raise NotImplementedError  # pragma: no cover
-
-    def _iterate_rdatasets(self):
-        """Return an iterator that yields (name, rdataset) tuples."""
-        raise NotImplementedError  # pragma: no cover
-
-    def _iterate_names(self):
-        """Return an iterator that yields a name."""
-        raise NotImplementedError  # pragma: no cover
-
-    def _get_node(self, name):
-        """Return the node at *name*, if any.
-
-        Returns a node or ``None``.
-        """
-        raise NotImplementedError  # pragma: no cover
-
-    #
-    # Low-level API with a default implementation, in case a subclass needs
-    # to override.
-    #
-
-    def _origin_information(self):
-        # This is only used by _add()
-        return self.manager.origin_information()
diff --git a/lib/dns/tsig.py b/lib/dns/tsig.py
deleted file mode 100644
index 780852e8..00000000
--- a/lib/dns/tsig.py
+++ /dev/null
@@ -1,352 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2001-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""DNS TSIG support."""
-
-import base64
-import hashlib
-import hmac
-import struct
-
-import dns.exception
-import dns.name
-import dns.rcode
-import dns.rdataclass
-
-
-class BadTime(dns.exception.DNSException):
-    """The current time is not within the TSIG's validity time."""
-
-
-class BadSignature(dns.exception.DNSException):
-    """The TSIG signature fails to verify."""
-
-
-class BadKey(dns.exception.DNSException):
-    """The TSIG record owner name does not match the key."""
-
-
-class BadAlgorithm(dns.exception.DNSException):
-    """The TSIG algorithm does not match the key."""
-
-
-class PeerError(dns.exception.DNSException):
-    """Base class for all TSIG errors generated by the remote peer"""
-
-
-class PeerBadKey(PeerError):
-    """The peer didn't know the key we used"""
-
-
-class PeerBadSignature(PeerError):
-    """The peer didn't like the signature we sent"""
-
-
-class PeerBadTime(PeerError):
-    """The peer didn't like the time we sent"""
-
-
-class PeerBadTruncation(PeerError):
-    """The peer didn't like amount of truncation in the TSIG we sent"""
-
-
-# TSIG Algorithms
-
-HMAC_MD5 = dns.name.from_text("HMAC-MD5.SIG-ALG.REG.INT")
-HMAC_SHA1 = dns.name.from_text("hmac-sha1")
-HMAC_SHA224 = dns.name.from_text("hmac-sha224")
-HMAC_SHA256 = dns.name.from_text("hmac-sha256")
-HMAC_SHA256_128 = dns.name.from_text("hmac-sha256-128")
-HMAC_SHA384 = dns.name.from_text("hmac-sha384")
-HMAC_SHA384_192 = dns.name.from_text("hmac-sha384-192")
-HMAC_SHA512 = dns.name.from_text("hmac-sha512")
-HMAC_SHA512_256 = dns.name.from_text("hmac-sha512-256")
-GSS_TSIG = dns.name.from_text("gss-tsig")
-
-default_algorithm = HMAC_SHA256
-
-mac_sizes = {
-    HMAC_SHA1: 20,
-    HMAC_SHA224: 28,
-    HMAC_SHA256: 32,
-    HMAC_SHA256_128: 16,
-    HMAC_SHA384: 48,
-    HMAC_SHA384_192: 24,
-    HMAC_SHA512: 64,
-    HMAC_SHA512_256: 32,
-    HMAC_MD5: 16,
-    GSS_TSIG: 128,  # This is what we assume to be the worst case!
-}
-
-
-class GSSTSig:
-    """
-    GSS-TSIG TSIG implementation.  This uses the GSS-API context established
-    in the TKEY message handshake to sign messages using GSS-API message
-    integrity codes, per the RFC.
-
-    In order to avoid a direct GSSAPI dependency, the keyring holds a ref
-    to the GSSAPI object required, rather than the key itself.
-    """
-
-    def __init__(self, gssapi_context):
-        self.gssapi_context = gssapi_context
-        self.data = b""
-        self.name = "gss-tsig"
-
-    def update(self, data):
-        self.data += data
-
-    def sign(self):
-        # defer to the GSSAPI function to sign
-        return self.gssapi_context.get_signature(self.data)
-
-    def verify(self, expected):
-        try:
-            # defer to the GSSAPI function to verify
-            return self.gssapi_context.verify_signature(self.data, expected)
-        except Exception:
-            # note the usage of a bare exception
-            raise BadSignature
-
-
-class GSSTSigAdapter:
-    def __init__(self, keyring):
-        self.keyring = keyring
-
-    def __call__(self, message, keyname):
-        if keyname in self.keyring:
-            key = self.keyring[keyname]
-            if isinstance(key, Key) and key.algorithm == GSS_TSIG:
-                if message:
-                    GSSTSigAdapter.parse_tkey_and_step(key, message, keyname)
-            return key
-        else:
-            return None
-
-    @classmethod
-    def parse_tkey_and_step(cls, key, message, keyname):
-        # if the message is a TKEY type, absorb the key material
-        # into the context using step(); this is used to allow the
-        # client to complete the GSSAPI negotiation before attempting
-        # to verify the signed response to a TKEY message exchange
-        try:
-            rrset = message.find_rrset(
-                message.answer, keyname, dns.rdataclass.ANY, dns.rdatatype.TKEY
-            )
-            if rrset:
-                token = rrset[0].key
-                gssapi_context = key.secret
-                return gssapi_context.step(token)
-        except KeyError:
-            pass
-
-
-class HMACTSig:
-    """
-    HMAC TSIG implementation.  This uses the HMAC python module to handle the
-    sign/verify operations.
-    """
-
-    _hashes = {
-        HMAC_SHA1: hashlib.sha1,
-        HMAC_SHA224: hashlib.sha224,
-        HMAC_SHA256: hashlib.sha256,
-        HMAC_SHA256_128: (hashlib.sha256, 128),
-        HMAC_SHA384: hashlib.sha384,
-        HMAC_SHA384_192: (hashlib.sha384, 192),
-        HMAC_SHA512: hashlib.sha512,
-        HMAC_SHA512_256: (hashlib.sha512, 256),
-        HMAC_MD5: hashlib.md5,
-    }
-
-    def __init__(self, key, algorithm):
-        try:
-            hashinfo = self._hashes[algorithm]
-        except KeyError:
-            raise NotImplementedError(f"TSIG algorithm {algorithm} is not supported")
-
-        # create the HMAC context
-        if isinstance(hashinfo, tuple):
-            self.hmac_context = hmac.new(key, digestmod=hashinfo[0])
-            self.size = hashinfo[1]
-        else:
-            self.hmac_context = hmac.new(key, digestmod=hashinfo)
-            self.size = None
-        self.name = self.hmac_context.name
-        if self.size:
-            self.name += f"-{self.size}"
-
-    def update(self, data):
-        return self.hmac_context.update(data)
-
-    def sign(self):
-        # defer to the HMAC digest() function for that digestmod
-        digest = self.hmac_context.digest()
-        if self.size:
-            digest = digest[: (self.size // 8)]
-        return digest
-
-    def verify(self, expected):
-        # re-digest and compare the results
-        mac = self.sign()
-        if not hmac.compare_digest(mac, expected):
-            raise BadSignature
-
-
-def _digest(wire, key, rdata, time=None, request_mac=None, ctx=None, multi=None):
-    """Return a context containing the TSIG rdata for the input parameters
-    @rtype: dns.tsig.HMACTSig or dns.tsig.GSSTSig object
-    @raises ValueError: I{other_data} is too long
-    @raises NotImplementedError: I{algorithm} is not supported
-    """
-
-    first = not (ctx and multi)
-    if first:
-        ctx = get_context(key)
-        if request_mac:
-            ctx.update(struct.pack("!H", len(request_mac)))
-            ctx.update(request_mac)
-    ctx.update(struct.pack("!H", rdata.original_id))
-    ctx.update(wire[2:])
-    if first:
-        ctx.update(key.name.to_digestable())
-        ctx.update(struct.pack("!H", dns.rdataclass.ANY))
-        ctx.update(struct.pack("!I", 0))
-    if time is None:
-        time = rdata.time_signed
-    upper_time = (time >> 32) & 0xFFFF
-    lower_time = time & 0xFFFFFFFF
-    time_encoded = struct.pack("!HIH", upper_time, lower_time, rdata.fudge)
-    other_len = len(rdata.other)
-    if other_len > 65535:
-        raise ValueError("TSIG Other Data is > 65535 bytes")
-    if first:
-        ctx.update(key.algorithm.to_digestable() + time_encoded)
-        ctx.update(struct.pack("!HH", rdata.error, other_len) + rdata.other)
-    else:
-        ctx.update(time_encoded)
-    return ctx
-
-
-def _maybe_start_digest(key, mac, multi):
-    """If this is the first message in a multi-message sequence,
-    start a new context.
-    @rtype: dns.tsig.HMACTSig or dns.tsig.GSSTSig object
-    """
-    if multi:
-        ctx = get_context(key)
-        ctx.update(struct.pack("!H", len(mac)))
-        ctx.update(mac)
-        return ctx
-    else:
-        return None
-
-
-def sign(wire, key, rdata, time=None, request_mac=None, ctx=None, multi=False):
-    """Return a (tsig_rdata, mac, ctx) tuple containing the HMAC TSIG rdata
-    for the input parameters, the HMAC MAC calculated by applying the
-    TSIG signature algorithm, and the TSIG digest context.
-    @rtype: (string, dns.tsig.HMACTSig or dns.tsig.GSSTSig object)
-    @raises ValueError: I{other_data} is too long
-    @raises NotImplementedError: I{algorithm} is not supported
-    """
-
-    ctx = _digest(wire, key, rdata, time, request_mac, ctx, multi)
-    mac = ctx.sign()
-    tsig = rdata.replace(time_signed=time, mac=mac)
-
-    return (tsig, _maybe_start_digest(key, mac, multi))
-
-
-def validate(
-    wire, key, owner, rdata, now, request_mac, tsig_start, ctx=None, multi=False
-):
-    """Validate the specified TSIG rdata against the other input parameters.
-
-    @raises FormError: The TSIG is badly formed.
-    @raises BadTime: There is too much time skew between the client and the
-    server.
-    @raises BadSignature: The TSIG signature did not validate
-    @rtype: dns.tsig.HMACTSig or dns.tsig.GSSTSig object"""
-
-    (adcount,) = struct.unpack("!H", wire[10:12])
-    if adcount == 0:
-        raise dns.exception.FormError
-    adcount -= 1
-    new_wire = wire[0:10] + struct.pack("!H", adcount) + wire[12:tsig_start]
-    if rdata.error != 0:
-        if rdata.error == dns.rcode.BADSIG:
-            raise PeerBadSignature
-        elif rdata.error == dns.rcode.BADKEY:
-            raise PeerBadKey
-        elif rdata.error == dns.rcode.BADTIME:
-            raise PeerBadTime
-        elif rdata.error == dns.rcode.BADTRUNC:
-            raise PeerBadTruncation
-        else:
-            raise PeerError("unknown TSIG error code %d" % rdata.error)
-    if abs(rdata.time_signed - now) > rdata.fudge:
-        raise BadTime
-    if key.name != owner:
-        raise BadKey
-    if key.algorithm != rdata.algorithm:
-        raise BadAlgorithm
-    ctx = _digest(new_wire, key, rdata, None, request_mac, ctx, multi)
-    ctx.verify(rdata.mac)
-    return _maybe_start_digest(key, rdata.mac, multi)
-
-
-def get_context(key):
-    """Returns an HMAC context for the specified key.
-
-    @rtype: HMAC context
-    @raises NotImplementedError: I{algorithm} is not supported
-    """
-
-    if key.algorithm == GSS_TSIG:
-        return GSSTSig(key.secret)
-    else:
-        return HMACTSig(key.secret, key.algorithm)
-
-
-class Key:
-    def __init__(self, name, secret, algorithm=default_algorithm):
-        if isinstance(name, str):
-            name = dns.name.from_text(name)
-        self.name = name
-        if isinstance(secret, str):
-            secret = base64.decodebytes(secret.encode())
-        self.secret = secret
-        if isinstance(algorithm, str):
-            algorithm = dns.name.from_text(algorithm)
-        self.algorithm = algorithm
-
-    def __eq__(self, other):
-        return (
-            isinstance(other, Key)
-            and self.name == other.name
-            and self.secret == other.secret
-            and self.algorithm == other.algorithm
-        )
-
-    def __repr__(self):
-        r = f"<DNS key name='{self.name}', " + f"algorithm='{self.algorithm}'"
-        if self.algorithm != GSS_TSIG:
-            r += f", secret='{base64.b64encode(self.secret).decode()}'"
-        r += ">"
-        return r
diff --git a/lib/dns/tsigkeyring.py b/lib/dns/tsigkeyring.py
deleted file mode 100644
index 1010a79f..00000000
--- a/lib/dns/tsigkeyring.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""A place to store TSIG keys."""
-
-import base64
-from typing import Any, Dict
-
-import dns.name
-import dns.tsig
-
-
-def from_text(textring: Dict[str, Any]) -> Dict[dns.name.Name, dns.tsig.Key]:
-    """Convert a dictionary containing (textual DNS name, base64 secret)
-    pairs into a binary keyring which has (dns.name.Name, bytes) pairs, or
-    a dictionary containing (textual DNS name, (algorithm, base64 secret))
-    pairs into a binary keyring which has (dns.name.Name, dns.tsig.Key) pairs.
-    @rtype: dict"""
-
-    keyring = {}
-    for name, value in textring.items():
-        kname = dns.name.from_text(name)
-        if isinstance(value, str):
-            keyring[kname] = dns.tsig.Key(kname, value).secret
-        else:
-            (algorithm, secret) = value
-            keyring[kname] = dns.tsig.Key(kname, secret, algorithm)
-    return keyring
-
-
-def to_text(keyring: Dict[dns.name.Name, Any]) -> Dict[str, Any]:
-    """Convert a dictionary containing (dns.name.Name, dns.tsig.Key) pairs
-    into a text keyring which has (textual DNS name, (textual algorithm,
-    base64 secret)) pairs, or a dictionary containing (dns.name.Name, bytes)
-    pairs into a text keyring which has (textual DNS name, base64 secret) pairs.
-    @rtype: dict"""
-
-    textring = {}
-
-    def b64encode(secret):
-        return base64.encodebytes(secret).decode().rstrip()
-
-    for name, key in keyring.items():
-        tname = name.to_text()
-        if isinstance(key, bytes):
-            textring[tname] = b64encode(key)
-        else:
-            if isinstance(key.secret, bytes):
-                text_secret = b64encode(key.secret)
-            else:
-                text_secret = str(key.secret)
-
-            textring[tname] = (key.algorithm.to_text(), text_secret)
-    return textring
diff --git a/lib/dns/ttl.py b/lib/dns/ttl.py
deleted file mode 100644
index b9a99fe3..00000000
--- a/lib/dns/ttl.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""DNS TTL conversion."""
-
-from typing import Union
-
-import dns.exception
-
-# Technically TTLs are supposed to be between 0 and 2**31 - 1, with values
-# greater than that interpreted as 0, but we do not impose this policy here
-# as values > 2**31 - 1 occur in real world data.
-#
-# We leave it to applications to impose tighter bounds if desired.
-MAX_TTL = 2**32 - 1
-
-
-class BadTTL(dns.exception.SyntaxError):
-    """DNS TTL value is not well-formed."""
-
-
-def from_text(text: str) -> int:
-    """Convert the text form of a TTL to an integer.
-
-    The BIND 8 units syntax for TTLs (e.g. '1w6d4h3m10s') is supported.
-
-    *text*, a ``str``, the textual TTL.
-
-    Raises ``dns.ttl.BadTTL`` if the TTL is not well-formed.
-
-    Returns an ``int``.
-    """
-
-    if text.isdigit():
-        total = int(text)
-    elif len(text) == 0:
-        raise BadTTL
-    else:
-        total = 0
-        current = 0
-        need_digit = True
-        for c in text:
-            if c.isdigit():
-                current *= 10
-                current += int(c)
-                need_digit = False
-            else:
-                if need_digit:
-                    raise BadTTL
-                c = c.lower()
-                if c == "w":
-                    total += current * 604800
-                elif c == "d":
-                    total += current * 86400
-                elif c == "h":
-                    total += current * 3600
-                elif c == "m":
-                    total += current * 60
-                elif c == "s":
-                    total += current
-                else:
-                    raise BadTTL(f"unknown unit '{c}'")
-                current = 0
-                need_digit = True
-        if not current == 0:
-            raise BadTTL("trailing integer")
-    if total < 0 or total > MAX_TTL:
-        raise BadTTL("TTL should be between 0 and 2**32 - 1 (inclusive)")
-    return total
-
-
-def make(value: Union[int, str]) -> int:
-    if isinstance(value, int):
-        return value
-    elif isinstance(value, str):
-        return dns.ttl.from_text(value)
-    else:
-        raise ValueError("cannot convert value to TTL")
diff --git a/lib/dns/update.py b/lib/dns/update.py
deleted file mode 100644
index bf1157ac..00000000
--- a/lib/dns/update.py
+++ /dev/null
@@ -1,386 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""DNS Dynamic Update Support"""
-
-from typing import Any, List, Optional, Union
-
-import dns.message
-import dns.name
-import dns.opcode
-import dns.rdata
-import dns.rdataclass
-import dns.rdataset
-import dns.rdatatype
-import dns.tsig
-
-
-class UpdateSection(dns.enum.IntEnum):
-    """Update sections"""
-
-    ZONE = 0
-    PREREQ = 1
-    UPDATE = 2
-    ADDITIONAL = 3
-
-    @classmethod
-    def _maximum(cls):
-        return 3
-
-
-class UpdateMessage(dns.message.Message):  # lgtm[py/missing-equals]
-    # ignore the mypy error here as we mean to use a different enum
-    _section_enum = UpdateSection  # type: ignore
-
-    def __init__(
-        self,
-        zone: Optional[Union[dns.name.Name, str]] = None,
-        rdclass: dns.rdataclass.RdataClass = dns.rdataclass.IN,
-        keyring: Optional[Any] = None,
-        keyname: Optional[dns.name.Name] = None,
-        keyalgorithm: Union[dns.name.Name, str] = dns.tsig.default_algorithm,
-        id: Optional[int] = None,
-    ):
-        """Initialize a new DNS Update object.
-
-        See the documentation of the Message class for a complete
-        description of the keyring dictionary.
-
-        *zone*, a ``dns.name.Name``, ``str``, or ``None``, the zone
-        which is being updated.  ``None`` should only be used by dnspython's
-        message constructors, as a zone is required for the convenience
-        methods like ``add()``, ``replace()``, etc.
-
-        *rdclass*, an ``int`` or ``str``, the class of the zone.
-
-        The *keyring*, *keyname*, and *keyalgorithm* parameters are passed to
-        ``use_tsig()``; see its documentation for details.
-        """
-        super().__init__(id=id)
-        self.flags |= dns.opcode.to_flags(dns.opcode.UPDATE)
-        if isinstance(zone, str):
-            zone = dns.name.from_text(zone)
-        self.origin = zone
-        rdclass = dns.rdataclass.RdataClass.make(rdclass)
-        self.zone_rdclass = rdclass
-        if self.origin:
-            self.find_rrset(
-                self.zone,
-                self.origin,
-                rdclass,
-                dns.rdatatype.SOA,
-                create=True,
-                force_unique=True,
-            )
-        if keyring is not None:
-            self.use_tsig(keyring, keyname, algorithm=keyalgorithm)
-
-    @property
-    def zone(self) -> List[dns.rrset.RRset]:
-        """The zone section."""
-        return self.sections[0]
-
-    @zone.setter
-    def zone(self, v):
-        self.sections[0] = v
-
-    @property
-    def prerequisite(self) -> List[dns.rrset.RRset]:
-        """The prerequisite section."""
-        return self.sections[1]
-
-    @prerequisite.setter
-    def prerequisite(self, v):
-        self.sections[1] = v
-
-    @property
-    def update(self) -> List[dns.rrset.RRset]:
-        """The update section."""
-        return self.sections[2]
-
-    @update.setter
-    def update(self, v):
-        self.sections[2] = v
-
-    def _add_rr(self, name, ttl, rd, deleting=None, section=None):
-        """Add a single RR to the update section."""
-
-        if section is None:
-            section = self.update
-        covers = rd.covers()
-        rrset = self.find_rrset(
-            section, name, self.zone_rdclass, rd.rdtype, covers, deleting, True, True
-        )
-        rrset.add(rd, ttl)
-
-    def _add(self, replace, section, name, *args):
-        """Add records.
-
-        *replace* is the replacement mode.  If ``False``,
-        RRs are added to an existing RRset; if ``True``, the RRset
-        is replaced with the specified contents.  The second
-        argument is the section to add to.  The third argument
-        is always a name.  The other arguments can be:
-
-                - rdataset...
-
-                - ttl, rdata...
-
-                - ttl, rdtype, string...
-        """
-
-        if isinstance(name, str):
-            name = dns.name.from_text(name, None)
-        if isinstance(args[0], dns.rdataset.Rdataset):
-            for rds in args:
-                if replace:
-                    self.delete(name, rds.rdtype)
-                for rd in rds:
-                    self._add_rr(name, rds.ttl, rd, section=section)
-        else:
-            args = list(args)
-            ttl = int(args.pop(0))
-            if isinstance(args[0], dns.rdata.Rdata):
-                if replace:
-                    self.delete(name, args[0].rdtype)
-                for rd in args:
-                    self._add_rr(name, ttl, rd, section=section)
-            else:
-                rdtype = dns.rdatatype.RdataType.make(args.pop(0))
-                if replace:
-                    self.delete(name, rdtype)
-                for s in args:
-                    rd = dns.rdata.from_text(self.zone_rdclass, rdtype, s, self.origin)
-                    self._add_rr(name, ttl, rd, section=section)
-
-    def add(self, name: Union[dns.name.Name, str], *args: Any) -> None:
-        """Add records.
-
-        The first argument is always a name.  The other
-        arguments can be:
-
-                - rdataset...
-
-                - ttl, rdata...
-
-                - ttl, rdtype, string...
-        """
-
-        self._add(False, self.update, name, *args)
-
-    def delete(self, name: Union[dns.name.Name, str], *args: Any) -> None:
-        """Delete records.
-
-        The first argument is always a name.  The other
-        arguments can be:
-
-                - *empty*
-
-                - rdataset...
-
-                - rdata...
-
-                - rdtype, [string...]
-        """
-
-        if isinstance(name, str):
-            name = dns.name.from_text(name, None)
-        if len(args) == 0:
-            self.find_rrset(
-                self.update,
-                name,
-                dns.rdataclass.ANY,
-                dns.rdatatype.ANY,
-                dns.rdatatype.NONE,
-                dns.rdataclass.ANY,
-                True,
-                True,
-            )
-        elif isinstance(args[0], dns.rdataset.Rdataset):
-            for rds in args:
-                for rd in rds:
-                    self._add_rr(name, 0, rd, dns.rdataclass.NONE)
-        else:
-            largs = list(args)
-            if isinstance(largs[0], dns.rdata.Rdata):
-                for rd in largs:
-                    self._add_rr(name, 0, rd, dns.rdataclass.NONE)
-            else:
-                rdtype = dns.rdatatype.RdataType.make(largs.pop(0))
-                if len(largs) == 0:
-                    self.find_rrset(
-                        self.update,
-                        name,
-                        self.zone_rdclass,
-                        rdtype,
-                        dns.rdatatype.NONE,
-                        dns.rdataclass.ANY,
-                        True,
-                        True,
-                    )
-                else:
-                    for s in largs:
-                        rd = dns.rdata.from_text(
-                            self.zone_rdclass,
-                            rdtype,
-                            s,  # type: ignore[arg-type]
-                            self.origin,
-                        )
-                        self._add_rr(name, 0, rd, dns.rdataclass.NONE)
-
-    def replace(self, name: Union[dns.name.Name, str], *args: Any) -> None:
-        """Replace records.
-
-        The first argument is always a name.  The other
-        arguments can be:
-
-                - rdataset...
-
-                - ttl, rdata...
-
-                - ttl, rdtype, string...
-
-        Note that if you want to replace the entire node, you should do
-        a delete of the name followed by one or more calls to add.
-        """
-
-        self._add(True, self.update, name, *args)
-
-    def present(self, name: Union[dns.name.Name, str], *args: Any) -> None:
-        """Require that an owner name (and optionally an rdata type,
-        or specific rdataset) exists as a prerequisite to the
-        execution of the update.
-
-        The first argument is always a name.
-        The other arguments can be:
-
-                - rdataset...
-
-                - rdata...
-
-                - rdtype, string...
-        """
-
-        if isinstance(name, str):
-            name = dns.name.from_text(name, None)
-        if len(args) == 0:
-            self.find_rrset(
-                self.prerequisite,
-                name,
-                dns.rdataclass.ANY,
-                dns.rdatatype.ANY,
-                dns.rdatatype.NONE,
-                None,
-                True,
-                True,
-            )
-        elif (
-            isinstance(args[0], dns.rdataset.Rdataset)
-            or isinstance(args[0], dns.rdata.Rdata)
-            or len(args) > 1
-        ):
-            if not isinstance(args[0], dns.rdataset.Rdataset):
-                # Add a 0 TTL
-                largs = list(args)
-                largs.insert(0, 0)  # type: ignore[arg-type]
-                self._add(False, self.prerequisite, name, *largs)
-            else:
-                self._add(False, self.prerequisite, name, *args)
-        else:
-            rdtype = dns.rdatatype.RdataType.make(args[0])
-            self.find_rrset(
-                self.prerequisite,
-                name,
-                dns.rdataclass.ANY,
-                rdtype,
-                dns.rdatatype.NONE,
-                None,
-                True,
-                True,
-            )
-
-    def absent(
-        self,
-        name: Union[dns.name.Name, str],
-        rdtype: Optional[Union[dns.rdatatype.RdataType, str]] = None,
-    ) -> None:
-        """Require that an owner name (and optionally an rdata type) does
-        not exist as a prerequisite to the execution of the update."""
-
-        if isinstance(name, str):
-            name = dns.name.from_text(name, None)
-        if rdtype is None:
-            self.find_rrset(
-                self.prerequisite,
-                name,
-                dns.rdataclass.NONE,
-                dns.rdatatype.ANY,
-                dns.rdatatype.NONE,
-                None,
-                True,
-                True,
-            )
-        else:
-            rdtype = dns.rdatatype.RdataType.make(rdtype)
-            self.find_rrset(
-                self.prerequisite,
-                name,
-                dns.rdataclass.NONE,
-                rdtype,
-                dns.rdatatype.NONE,
-                None,
-                True,
-                True,
-            )
-
-    def _get_one_rr_per_rrset(self, value):
-        # Updates are always one_rr_per_rrset
-        return True
-
-    def _parse_rr_header(self, section, name, rdclass, rdtype):
-        deleting = None
-        empty = False
-        if section == UpdateSection.ZONE:
-            if (
-                dns.rdataclass.is_metaclass(rdclass)
-                or rdtype != dns.rdatatype.SOA
-                or self.zone
-            ):
-                raise dns.exception.FormError
-        else:
-            if not self.zone:
-                raise dns.exception.FormError
-            if rdclass in (dns.rdataclass.ANY, dns.rdataclass.NONE):
-                deleting = rdclass
-                rdclass = self.zone[0].rdclass
-                empty = (
-                    deleting == dns.rdataclass.ANY or section == UpdateSection.PREREQ
-                )
-        return (rdclass, rdtype, deleting, empty)
-
-
-# backwards compatibility
-Update = UpdateMessage
-
-### BEGIN generated UpdateSection constants
-
-ZONE = UpdateSection.ZONE
-PREREQ = UpdateSection.PREREQ
-UPDATE = UpdateSection.UPDATE
-ADDITIONAL = UpdateSection.ADDITIONAL
-
-### END generated UpdateSection constants
diff --git a/lib/dns/version.py b/lib/dns/version.py
deleted file mode 100644
index 9ed2ce19..00000000
--- a/lib/dns/version.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""dnspython release version information."""
-
-#: MAJOR
-MAJOR = 2
-#: MINOR
-MINOR = 7
-#: MICRO
-MICRO = 0
-#: RELEASELEVEL
-RELEASELEVEL = 0x0F
-#: SERIAL
-SERIAL = 0
-
-if RELEASELEVEL == 0x0F:  # pragma: no cover  lgtm[py/unreachable-statement]
-    #: version
-    version = "%d.%d.%d" % (MAJOR, MINOR, MICRO)  # lgtm[py/unreachable-statement]
-elif RELEASELEVEL == 0x00:  # pragma: no cover  lgtm[py/unreachable-statement]
-    version = "%d.%d.%ddev%d" % (
-        MAJOR,
-        MINOR,
-        MICRO,
-        SERIAL,
-    )  # lgtm[py/unreachable-statement]
-elif RELEASELEVEL == 0x0C:  # pragma: no cover  lgtm[py/unreachable-statement]
-    version = "%d.%d.%drc%d" % (
-        MAJOR,
-        MINOR,
-        MICRO,
-        SERIAL,
-    )  # lgtm[py/unreachable-statement]
-else:  # pragma: no cover  lgtm[py/unreachable-statement]
-    version = "%d.%d.%d%x%d" % (
-        MAJOR,
-        MINOR,
-        MICRO,
-        RELEASELEVEL,
-        SERIAL,
-    )  # lgtm[py/unreachable-statement]
-
-#: hexversion
-hexversion = MAJOR << 24 | MINOR << 16 | MICRO << 8 | RELEASELEVEL << 4 | SERIAL
diff --git a/lib/dns/versioned.py b/lib/dns/versioned.py
deleted file mode 100644
index fd78e674..00000000
--- a/lib/dns/versioned.py
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-"""DNS Versioned Zones."""
-
-import collections
-import threading
-from typing import Callable, Deque, Optional, Set, Union
-
-import dns.exception
-import dns.immutable
-import dns.name
-import dns.node
-import dns.rdataclass
-import dns.rdataset
-import dns.rdatatype
-import dns.rdtypes.ANY.SOA
-import dns.zone
-
-
-class UseTransaction(dns.exception.DNSException):
-    """To alter a versioned zone, use a transaction."""
-
-
-# Backwards compatibility
-Node = dns.zone.VersionedNode
-ImmutableNode = dns.zone.ImmutableVersionedNode
-Version = dns.zone.Version
-WritableVersion = dns.zone.WritableVersion
-ImmutableVersion = dns.zone.ImmutableVersion
-Transaction = dns.zone.Transaction
-
-
-class Zone(dns.zone.Zone):  # lgtm[py/missing-equals]
-    __slots__ = [
-        "_versions",
-        "_versions_lock",
-        "_write_txn",
-        "_write_waiters",
-        "_write_event",
-        "_pruning_policy",
-        "_readers",
-    ]
-
-    node_factory = Node
-
-    def __init__(
-        self,
-        origin: Optional[Union[dns.name.Name, str]],
-        rdclass: dns.rdataclass.RdataClass = dns.rdataclass.IN,
-        relativize: bool = True,
-        pruning_policy: Optional[Callable[["Zone", Version], Optional[bool]]] = None,
-    ):
-        """Initialize a versioned zone object.
-
-        *origin* is the origin of the zone.  It may be a ``dns.name.Name``,
-        a ``str``, or ``None``.  If ``None``, then the zone's origin will
-        be set by the first ``$ORIGIN`` line in a zone file.
-
-        *rdclass*, an ``int``, the zone's rdata class; the default is class IN.
-
-        *relativize*, a ``bool``, determine's whether domain names are
-        relativized to the zone's origin.  The default is ``True``.
-
-        *pruning policy*, a function taking a ``Zone`` and a ``Version`` and returning
-        a ``bool``, or ``None``.  Should the version be pruned?  If ``None``,
-        the default policy, which retains one version is used.
-        """
-        super().__init__(origin, rdclass, relativize)
-        self._versions: Deque[Version] = collections.deque()
-        self._version_lock = threading.Lock()
-        if pruning_policy is None:
-            self._pruning_policy = self._default_pruning_policy
-        else:
-            self._pruning_policy = pruning_policy
-        self._write_txn: Optional[Transaction] = None
-        self._write_event: Optional[threading.Event] = None
-        self._write_waiters: Deque[threading.Event] = collections.deque()
-        self._readers: Set[Transaction] = set()
-        self._commit_version_unlocked(
-            None, WritableVersion(self, replacement=True), origin
-        )
-
-    def reader(
-        self, id: Optional[int] = None, serial: Optional[int] = None
-    ) -> Transaction:  # pylint: disable=arguments-differ
-        if id is not None and serial is not None:
-            raise ValueError("cannot specify both id and serial")
-        with self._version_lock:
-            if id is not None:
-                version = None
-                for v in reversed(self._versions):
-                    if v.id == id:
-                        version = v
-                        break
-                if version is None:
-                    raise KeyError("version not found")
-            elif serial is not None:
-                if self.relativize:
-                    oname = dns.name.empty
-                else:
-                    assert self.origin is not None
-                    oname = self.origin
-                version = None
-                for v in reversed(self._versions):
-                    n = v.nodes.get(oname)
-                    if n:
-                        rds = n.get_rdataset(self.rdclass, dns.rdatatype.SOA)
-                        if rds and rds[0].serial == serial:
-                            version = v
-                            break
-                if version is None:
-                    raise KeyError("serial not found")
-            else:
-                version = self._versions[-1]
-            txn = Transaction(self, False, version)
-            self._readers.add(txn)
-            return txn
-
-    def writer(self, replacement: bool = False) -> Transaction:
-        event = None
-        while True:
-            with self._version_lock:
-                # Checking event == self._write_event ensures that either
-                # no one was waiting before we got lucky and found no write
-                # txn, or we were the one who was waiting and got woken up.
-                # This prevents "taking cuts" when creating a write txn.
-                if self._write_txn is None and event == self._write_event:
-                    # Creating the transaction defers version setup
-                    # (i.e.  copying the nodes dictionary) until we
-                    # give up the lock, so that we hold the lock as
-                    # short a time as possible.  This is why we call
-                    # _setup_version() below.
-                    self._write_txn = Transaction(
-                        self, replacement, make_immutable=True
-                    )
-                    # give up our exclusive right to make a Transaction
-                    self._write_event = None
-                    break
-                # Someone else is writing already, so we will have to
-                # wait, but we want to do the actual wait outside the
-                # lock.
-                event = threading.Event()
-                self._write_waiters.append(event)
-            # wait (note we gave up the lock!)
-            #
-            # We only wake one sleeper at a time, so it's important
-            # that no event waiter can exit this method (e.g. via
-            # cancellation) without returning a transaction or waking
-            # someone else up.
-            #
-            # This is not a problem with Threading module threads as
-            # they cannot be canceled, but could be an issue with trio
-            # tasks when we do the async version of writer().
-            # I.e. we'd need to do something like:
-            #
-            # try:
-            #     event.wait()
-            # except trio.Cancelled:
-            #     with self._version_lock:
-            #         self._maybe_wakeup_one_waiter_unlocked()
-            #     raise
-            #
-            event.wait()
-        # Do the deferred version setup.
-        self._write_txn._setup_version()
-        return self._write_txn
-
-    def _maybe_wakeup_one_waiter_unlocked(self):
-        if len(self._write_waiters) > 0:
-            self._write_event = self._write_waiters.popleft()
-            self._write_event.set()
-
-    # pylint: disable=unused-argument
-    def _default_pruning_policy(self, zone, version):
-        return True
-
-    # pylint: enable=unused-argument
-
-    def _prune_versions_unlocked(self):
-        assert len(self._versions) > 0
-        # Don't ever prune a version greater than or equal to one that
-        # a reader has open.  This pins versions in memory while the
-        # reader is open, and importantly lets the reader open a txn on
-        # a successor version (e.g. if generating an IXFR).
-        #
-        # Note our definition of least_kept also ensures we do not try to
-        # delete the greatest version.
-        if len(self._readers) > 0:
-            least_kept = min(txn.version.id for txn in self._readers)
-        else:
-            least_kept = self._versions[-1].id
-        while self._versions[0].id < least_kept and self._pruning_policy(
-            self, self._versions[0]
-        ):
-            self._versions.popleft()
-
-    def set_max_versions(self, max_versions: Optional[int]) -> None:
-        """Set a pruning policy that retains up to the specified number
-        of versions
-        """
-        if max_versions is not None and max_versions < 1:
-            raise ValueError("max versions must be at least 1")
-        if max_versions is None:
-
-            def policy(zone, _):  # pylint: disable=unused-argument
-                return False
-
-        else:
-
-            def policy(zone, _):
-                return len(zone._versions) > max_versions
-
-        self.set_pruning_policy(policy)
-
-    def set_pruning_policy(
-        self, policy: Optional[Callable[["Zone", Version], Optional[bool]]]
-    ) -> None:
-        """Set the pruning policy for the zone.
-
-        The *policy* function takes a `Version` and returns `True` if
-        the version should be pruned, and `False` otherwise.  `None`
-        may also be specified for policy, in which case the default policy
-        is used.
-
-        Pruning checking proceeds from the least version and the first
-        time the function returns `False`, the checking stops.  I.e. the
-        retained versions are always a consecutive sequence.
-        """
-        if policy is None:
-            policy = self._default_pruning_policy
-        with self._version_lock:
-            self._pruning_policy = policy
-            self._prune_versions_unlocked()
-
-    def _end_read(self, txn):
-        with self._version_lock:
-            self._readers.remove(txn)
-            self._prune_versions_unlocked()
-
-    def _end_write_unlocked(self, txn):
-        assert self._write_txn == txn
-        self._write_txn = None
-        self._maybe_wakeup_one_waiter_unlocked()
-
-    def _end_write(self, txn):
-        with self._version_lock:
-            self._end_write_unlocked(txn)
-
-    def _commit_version_unlocked(self, txn, version, origin):
-        self._versions.append(version)
-        self._prune_versions_unlocked()
-        self.nodes = version.nodes
-        if self.origin is None:
-            self.origin = origin
-        # txn can be None in __init__ when we make the empty version.
-        if txn is not None:
-            self._end_write_unlocked(txn)
-
-    def _commit_version(self, txn, version, origin):
-        with self._version_lock:
-            self._commit_version_unlocked(txn, version, origin)
-
-    def _get_next_version_id(self):
-        if len(self._versions) > 0:
-            id = self._versions[-1].id + 1
-        else:
-            id = 1
-        return id
-
-    def find_node(
-        self, name: Union[dns.name.Name, str], create: bool = False
-    ) -> dns.node.Node:
-        if create:
-            raise UseTransaction
-        return super().find_node(name)
-
-    def delete_node(self, name: Union[dns.name.Name, str]) -> None:
-        raise UseTransaction
-
-    def find_rdataset(
-        self,
-        name: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str],
-        covers: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.NONE,
-        create: bool = False,
-    ) -> dns.rdataset.Rdataset:
-        if create:
-            raise UseTransaction
-        rdataset = super().find_rdataset(name, rdtype, covers)
-        return dns.rdataset.ImmutableRdataset(rdataset)
-
-    def get_rdataset(
-        self,
-        name: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str],
-        covers: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.NONE,
-        create: bool = False,
-    ) -> Optional[dns.rdataset.Rdataset]:
-        if create:
-            raise UseTransaction
-        rdataset = super().get_rdataset(name, rdtype, covers)
-        if rdataset is not None:
-            return dns.rdataset.ImmutableRdataset(rdataset)
-        else:
-            return None
-
-    def delete_rdataset(
-        self,
-        name: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str],
-        covers: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.NONE,
-    ) -> None:
-        raise UseTransaction
-
-    def replace_rdataset(
-        self, name: Union[dns.name.Name, str], replacement: dns.rdataset.Rdataset
-    ) -> None:
-        raise UseTransaction
diff --git a/lib/dns/win32util.py b/lib/dns/win32util.py
deleted file mode 100644
index 9ed3f11b..00000000
--- a/lib/dns/win32util.py
+++ /dev/null
@@ -1,242 +0,0 @@
-import sys
-
-import dns._features
-
-if sys.platform == "win32":
-    from typing import Any
-
-    import dns.name
-
-    _prefer_wmi = True
-
-    import winreg  # pylint: disable=import-error
-
-    # Keep pylint quiet on non-windows.
-    try:
-        _ = WindowsError  # pylint: disable=used-before-assignment
-    except NameError:
-        WindowsError = Exception
-
-    if dns._features.have("wmi"):
-        import threading
-
-        import pythoncom  # pylint: disable=import-error
-        import wmi  # pylint: disable=import-error
-
-        _have_wmi = True
-    else:
-        _have_wmi = False
-
-    def _config_domain(domain):
-        # Sometimes DHCP servers add a '.' prefix to the default domain, and
-        # Windows just stores such values in the registry (see #687).
-        # Check for this and fix it.
-        if domain.startswith("."):
-            domain = domain[1:]
-        return dns.name.from_text(domain)
-
-    class DnsInfo:
-        def __init__(self):
-            self.domain = None
-            self.nameservers = []
-            self.search = []
-
-    if _have_wmi:
-
-        class _WMIGetter(threading.Thread):
-            # pylint: disable=possibly-used-before-assignment
-            def __init__(self):
-                super().__init__()
-                self.info = DnsInfo()
-
-            def run(self):
-                pythoncom.CoInitialize()
-                try:
-                    system = wmi.WMI()
-                    for interface in system.Win32_NetworkAdapterConfiguration():
-                        if interface.IPEnabled and interface.DNSServerSearchOrder:
-                            self.info.nameservers = list(interface.DNSServerSearchOrder)
-                            if interface.DNSDomain:
-                                self.info.domain = _config_domain(interface.DNSDomain)
-                            if interface.DNSDomainSuffixSearchOrder:
-                                self.info.search = [
-                                    _config_domain(x)
-                                    for x in interface.DNSDomainSuffixSearchOrder
-                                ]
-                            break
-                finally:
-                    pythoncom.CoUninitialize()
-
-            def get(self):
-                # We always run in a separate thread to avoid any issues with
-                # the COM threading model.
-                self.start()
-                self.join()
-                return self.info
-
-    else:
-
-        class _WMIGetter:  # type: ignore
-            pass
-
-    class _RegistryGetter:
-        def __init__(self):
-            self.info = DnsInfo()
-
-        def _split(self, text):
-            # The windows registry has used both " " and "," as a delimiter, and while
-            # it is currently using "," in Windows 10 and later, updates can seemingly
-            # leave a space in too, e.g. "a, b".  So we just convert all commas to
-            # spaces, and use split() in its default configuration, which splits on
-            # all whitespace and ignores empty strings.
-            return text.replace(",", " ").split()
-
-        def _config_nameservers(self, nameservers):
-            for ns in self._split(nameservers):
-                if ns not in self.info.nameservers:
-                    self.info.nameservers.append(ns)
-
-        def _config_search(self, search):
-            for s in self._split(search):
-                s = _config_domain(s)
-                if s not in self.info.search:
-                    self.info.search.append(s)
-
-        def _config_fromkey(self, key, always_try_domain):
-            try:
-                servers, _ = winreg.QueryValueEx(key, "NameServer")
-            except WindowsError:
-                servers = None
-            if servers:
-                self._config_nameservers(servers)
-            if servers or always_try_domain:
-                try:
-                    dom, _ = winreg.QueryValueEx(key, "Domain")
-                    if dom:
-                        self.info.domain = _config_domain(dom)
-                except WindowsError:
-                    pass
-            else:
-                try:
-                    servers, _ = winreg.QueryValueEx(key, "DhcpNameServer")
-                except WindowsError:
-                    servers = None
-                if servers:
-                    self._config_nameservers(servers)
-                    try:
-                        dom, _ = winreg.QueryValueEx(key, "DhcpDomain")
-                        if dom:
-                            self.info.domain = _config_domain(dom)
-                    except WindowsError:
-                        pass
-            try:
-                search, _ = winreg.QueryValueEx(key, "SearchList")
-            except WindowsError:
-                search = None
-            if search is None:
-                try:
-                    search, _ = winreg.QueryValueEx(key, "DhcpSearchList")
-                except WindowsError:
-                    search = None
-            if search:
-                self._config_search(search)
-
-        def _is_nic_enabled(self, lm, guid):
-            # Look in the Windows Registry to determine whether the network
-            # interface corresponding to the given guid is enabled.
-            #
-            # (Code contributed by Paul Marks, thanks!)
-            #
-            try:
-                # This hard-coded location seems to be consistent, at least
-                # from Windows 2000 through Vista.
-                connection_key = winreg.OpenKey(
-                    lm,
-                    r"SYSTEM\CurrentControlSet\Control\Network"
-                    r"\{4D36E972-E325-11CE-BFC1-08002BE10318}"
-                    rf"\{guid}\Connection",
-                )
-
-                try:
-                    # The PnpInstanceID points to a key inside Enum
-                    (pnp_id, ttype) = winreg.QueryValueEx(
-                        connection_key, "PnpInstanceID"
-                    )
-
-                    if ttype != winreg.REG_SZ:
-                        raise ValueError  # pragma: no cover
-
-                    device_key = winreg.OpenKey(
-                        lm, rf"SYSTEM\CurrentControlSet\Enum\{pnp_id}"
-                    )
-
-                    try:
-                        # Get ConfigFlags for this device
-                        (flags, ttype) = winreg.QueryValueEx(device_key, "ConfigFlags")
-
-                        if ttype != winreg.REG_DWORD:
-                            raise ValueError  # pragma: no cover
-
-                        # Based on experimentation, bit 0x1 indicates that the
-                        # device is disabled.
-                        #
-                        # XXXRTH I suspect we really want to & with 0x03 so
-                        # that CONFIGFLAGS_REMOVED devices are also ignored,
-                        # but we're shifting to WMI as ConfigFlags is not
-                        # supposed to be used.
-                        return not flags & 0x1
-
-                    finally:
-                        device_key.Close()
-                finally:
-                    connection_key.Close()
-            except Exception:  # pragma: no cover
-                return False
-
-        def get(self):
-            """Extract resolver configuration from the Windows registry."""
-
-            lm = winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE)
-            try:
-                tcp_params = winreg.OpenKey(
-                    lm, r"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters"
-                )
-                try:
-                    self._config_fromkey(tcp_params, True)
-                finally:
-                    tcp_params.Close()
-                interfaces = winreg.OpenKey(
-                    lm,
-                    r"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\Interfaces",
-                )
-                try:
-                    i = 0
-                    while True:
-                        try:
-                            guid = winreg.EnumKey(interfaces, i)
-                            i += 1
-                            key = winreg.OpenKey(interfaces, guid)
-                            try:
-                                if not self._is_nic_enabled(lm, guid):
-                                    continue
-                                self._config_fromkey(key, False)
-                            finally:
-                                key.Close()
-                        except OSError:
-                            break
-                finally:
-                    interfaces.Close()
-            finally:
-                lm.Close()
-            return self.info
-
-    _getter_class: Any
-    if _have_wmi and _prefer_wmi:
-        _getter_class = _WMIGetter
-    else:
-        _getter_class = _RegistryGetter
-
-    def get_dns_info():
-        """Extract resolver configuration."""
-        getter = _getter_class()
-        return getter.get()
diff --git a/lib/dns/wire.py b/lib/dns/wire.py
deleted file mode 100644
index 9f9b1573..00000000
--- a/lib/dns/wire.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-import contextlib
-import struct
-from typing import Iterator, Optional, Tuple
-
-import dns.exception
-import dns.name
-
-
-class Parser:
-    def __init__(self, wire: bytes, current: int = 0):
-        self.wire = wire
-        self.current = 0
-        self.end = len(self.wire)
-        if current:
-            self.seek(current)
-        self.furthest = current
-
-    def remaining(self) -> int:
-        return self.end - self.current
-
-    def get_bytes(self, size: int) -> bytes:
-        assert size >= 0
-        if size > self.remaining():
-            raise dns.exception.FormError
-        output = self.wire[self.current : self.current + size]
-        self.current += size
-        self.furthest = max(self.furthest, self.current)
-        return output
-
-    def get_counted_bytes(self, length_size: int = 1) -> bytes:
-        length = int.from_bytes(self.get_bytes(length_size), "big")
-        return self.get_bytes(length)
-
-    def get_remaining(self) -> bytes:
-        return self.get_bytes(self.remaining())
-
-    def get_uint8(self) -> int:
-        return struct.unpack("!B", self.get_bytes(1))[0]
-
-    def get_uint16(self) -> int:
-        return struct.unpack("!H", self.get_bytes(2))[0]
-
-    def get_uint32(self) -> int:
-        return struct.unpack("!I", self.get_bytes(4))[0]
-
-    def get_uint48(self) -> int:
-        return int.from_bytes(self.get_bytes(6), "big")
-
-    def get_struct(self, format: str) -> Tuple:
-        return struct.unpack(format, self.get_bytes(struct.calcsize(format)))
-
-    def get_name(self, origin: Optional["dns.name.Name"] = None) -> "dns.name.Name":
-        name = dns.name.from_wire_parser(self)
-        if origin:
-            name = name.relativize(origin)
-        return name
-
-    def seek(self, where: int) -> None:
-        # Note that seeking to the end is OK!  (If you try to read
-        # after such a seek, you'll get an exception as expected.)
-        if where < 0 or where > self.end:
-            raise dns.exception.FormError
-        self.current = where
-
-    @contextlib.contextmanager
-    def restrict_to(self, size: int) -> Iterator:
-        assert size >= 0
-        if size > self.remaining():
-            raise dns.exception.FormError
-        saved_end = self.end
-        try:
-            self.end = self.current + size
-            yield
-            # We make this check here and not in the finally as we
-            # don't want to raise if we're already raising for some
-            # other reason.
-            if self.current != self.end:
-                raise dns.exception.FormError
-        finally:
-            self.end = saved_end
-
-    @contextlib.contextmanager
-    def restore_furthest(self) -> Iterator:
-        try:
-            yield None
-        finally:
-            self.current = self.furthest
diff --git a/lib/dns/xfr.py b/lib/dns/xfr.py
deleted file mode 100644
index 520aa32d..00000000
--- a/lib/dns/xfr.py
+++ /dev/null
@@ -1,343 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2017 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-from typing import Any, List, Optional, Tuple, Union
-
-import dns.exception
-import dns.message
-import dns.name
-import dns.rcode
-import dns.rdataset
-import dns.rdatatype
-import dns.serial
-import dns.transaction
-import dns.tsig
-import dns.zone
-
-
-class TransferError(dns.exception.DNSException):
-    """A zone transfer response got a non-zero rcode."""
-
-    def __init__(self, rcode):
-        message = f"Zone transfer error: {dns.rcode.to_text(rcode)}"
-        super().__init__(message)
-        self.rcode = rcode
-
-
-class SerialWentBackwards(dns.exception.FormError):
-    """The current serial number is less than the serial we know."""
-
-
-class UseTCP(dns.exception.DNSException):
-    """This IXFR cannot be completed with UDP."""
-
-
-class Inbound:
-    """
-    State machine for zone transfers.
-    """
-
-    def __init__(
-        self,
-        txn_manager: dns.transaction.TransactionManager,
-        rdtype: dns.rdatatype.RdataType = dns.rdatatype.AXFR,
-        serial: Optional[int] = None,
-        is_udp: bool = False,
-    ):
-        """Initialize an inbound zone transfer.
-
-        *txn_manager* is a :py:class:`dns.transaction.TransactionManager`.
-
-        *rdtype* can be `dns.rdatatype.AXFR` or `dns.rdatatype.IXFR`
-
-        *serial* is the base serial number for IXFRs, and is required in
-        that case.
-
-        *is_udp*, a ``bool`` indidicates if UDP is being used for this
-        XFR.
-        """
-        self.txn_manager = txn_manager
-        self.txn: Optional[dns.transaction.Transaction] = None
-        self.rdtype = rdtype
-        if rdtype == dns.rdatatype.IXFR:
-            if serial is None:
-                raise ValueError("a starting serial must be supplied for IXFRs")
-        elif is_udp:
-            raise ValueError("is_udp specified for AXFR")
-        self.serial = serial
-        self.is_udp = is_udp
-        (_, _, self.origin) = txn_manager.origin_information()
-        self.soa_rdataset: Optional[dns.rdataset.Rdataset] = None
-        self.done = False
-        self.expecting_SOA = False
-        self.delete_mode = False
-
-    def process_message(self, message: dns.message.Message) -> bool:
-        """Process one message in the transfer.
-
-        The message should have the same relativization as was specified when
-        the `dns.xfr.Inbound` was created.  The message should also have been
-        created with `one_rr_per_rrset=True` because order matters.
-
-        Returns `True` if the transfer is complete, and `False` otherwise.
-        """
-        if self.txn is None:
-            replacement = self.rdtype == dns.rdatatype.AXFR
-            self.txn = self.txn_manager.writer(replacement)
-        rcode = message.rcode()
-        if rcode != dns.rcode.NOERROR:
-            raise TransferError(rcode)
-        #
-        # We don't require a question section, but if it is present is
-        # should be correct.
-        #
-        if len(message.question) > 0:
-            if message.question[0].name != self.origin:
-                raise dns.exception.FormError("wrong question name")
-            if message.question[0].rdtype != self.rdtype:
-                raise dns.exception.FormError("wrong question rdatatype")
-        answer_index = 0
-        if self.soa_rdataset is None:
-            #
-            # This is the first message.  We're expecting an SOA at
-            # the origin.
-            #
-            if not message.answer or message.answer[0].name != self.origin:
-                raise dns.exception.FormError("No answer or RRset not for zone origin")
-            rrset = message.answer[0]
-            rdataset = rrset
-            if rdataset.rdtype != dns.rdatatype.SOA:
-                raise dns.exception.FormError("first RRset is not an SOA")
-            answer_index = 1
-            self.soa_rdataset = rdataset.copy()
-            if self.rdtype == dns.rdatatype.IXFR:
-                if self.soa_rdataset[0].serial == self.serial:
-                    #
-                    # We're already up-to-date.
-                    #
-                    self.done = True
-                elif dns.serial.Serial(self.soa_rdataset[0].serial) < self.serial:
-                    # It went backwards!
-                    raise SerialWentBackwards
-                else:
-                    if self.is_udp and len(message.answer[answer_index:]) == 0:
-                        #
-                        # There are no more records, so this is the
-                        # "truncated" response.  Say to use TCP
-                        #
-                        raise UseTCP
-                    #
-                    # Note we're expecting another SOA so we can detect
-                    # if this IXFR response is an AXFR-style response.
-                    #
-                    self.expecting_SOA = True
-        #
-        # Process the answer section (other than the initial SOA in
-        # the first message).
-        #
-        for rrset in message.answer[answer_index:]:
-            name = rrset.name
-            rdataset = rrset
-            if self.done:
-                raise dns.exception.FormError("answers after final SOA")
-            assert self.txn is not None  # for mypy
-            if rdataset.rdtype == dns.rdatatype.SOA and name == self.origin:
-                #
-                # Every time we see an origin SOA delete_mode inverts
-                #
-                if self.rdtype == dns.rdatatype.IXFR:
-                    self.delete_mode = not self.delete_mode
-                #
-                # If this SOA Rdataset is equal to the first we saw
-                # then we're finished. If this is an IXFR we also
-                # check that we're seeing the record in the expected
-                # part of the response.
-                #
-                if rdataset == self.soa_rdataset and (
-                    self.rdtype == dns.rdatatype.AXFR
-                    or (self.rdtype == dns.rdatatype.IXFR and self.delete_mode)
-                ):
-                    #
-                    # This is the final SOA
-                    #
-                    if self.expecting_SOA:
-                        # We got an empty IXFR sequence!
-                        raise dns.exception.FormError("empty IXFR sequence")
-                    if (
-                        self.rdtype == dns.rdatatype.IXFR
-                        and self.serial != rdataset[0].serial
-                    ):
-                        raise dns.exception.FormError("unexpected end of IXFR sequence")
-                    self.txn.replace(name, rdataset)
-                    self.txn.commit()
-                    self.txn = None
-                    self.done = True
-                else:
-                    #
-                    # This is not the final SOA
-                    #
-                    self.expecting_SOA = False
-                    if self.rdtype == dns.rdatatype.IXFR:
-                        if self.delete_mode:
-                            # This is the start of an IXFR deletion set
-                            if rdataset[0].serial != self.serial:
-                                raise dns.exception.FormError(
-                                    "IXFR base serial mismatch"
-                                )
-                        else:
-                            # This is the start of an IXFR addition set
-                            self.serial = rdataset[0].serial
-                            self.txn.replace(name, rdataset)
-                    else:
-                        # We saw a non-final SOA for the origin in an AXFR.
-                        raise dns.exception.FormError("unexpected origin SOA in AXFR")
-                continue
-            if self.expecting_SOA:
-                #
-                # We made an IXFR request and are expecting another
-                # SOA RR, but saw something else, so this must be an
-                # AXFR response.
-                #
-                self.rdtype = dns.rdatatype.AXFR
-                self.expecting_SOA = False
-                self.delete_mode = False
-                self.txn.rollback()
-                self.txn = self.txn_manager.writer(True)
-                #
-                # Note we are falling through into the code below
-                # so whatever rdataset this was gets written.
-                #
-            # Add or remove the data
-            if self.delete_mode:
-                self.txn.delete_exact(name, rdataset)
-            else:
-                self.txn.add(name, rdataset)
-        if self.is_udp and not self.done:
-            #
-            # This is a UDP IXFR and we didn't get to done, and we didn't
-            # get the proper "truncated" response
-            #
-            raise dns.exception.FormError("unexpected end of UDP IXFR")
-        return self.done
-
-    #
-    # Inbounds are context managers.
-    #
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        if self.txn:
-            self.txn.rollback()
-        return False
-
-
-def make_query(
-    txn_manager: dns.transaction.TransactionManager,
-    serial: Optional[int] = 0,
-    use_edns: Optional[Union[int, bool]] = None,
-    ednsflags: Optional[int] = None,
-    payload: Optional[int] = None,
-    request_payload: Optional[int] = None,
-    options: Optional[List[dns.edns.Option]] = None,
-    keyring: Any = None,
-    keyname: Optional[dns.name.Name] = None,
-    keyalgorithm: Union[dns.name.Name, str] = dns.tsig.default_algorithm,
-) -> Tuple[dns.message.QueryMessage, Optional[int]]:
-    """Make an AXFR or IXFR query.
-
-    *txn_manager* is a ``dns.transaction.TransactionManager``, typically a
-    ``dns.zone.Zone``.
-
-    *serial* is an ``int`` or ``None``.  If 0, then IXFR will be
-    attempted using the most recent serial number from the
-    *txn_manager*; it is the caller's responsibility to ensure there
-    are no write transactions active that could invalidate the
-    retrieved serial.  If a serial cannot be determined, AXFR will be
-    forced.  Other integer values are the starting serial to use.
-    ``None`` forces an AXFR.
-
-    Please see the documentation for :py:func:`dns.message.make_query` and
-    :py:func:`dns.message.Message.use_tsig` for details on the other parameters
-    to this function.
-
-    Returns a `(query, serial)` tuple.
-    """
-    (zone_origin, _, origin) = txn_manager.origin_information()
-    if zone_origin is None:
-        raise ValueError("no zone origin")
-    if serial is None:
-        rdtype = dns.rdatatype.AXFR
-    elif not isinstance(serial, int):
-        raise ValueError("serial is not an integer")
-    elif serial == 0:
-        with txn_manager.reader() as txn:
-            rdataset = txn.get(origin, "SOA")
-            if rdataset:
-                serial = rdataset[0].serial
-                rdtype = dns.rdatatype.IXFR
-            else:
-                serial = None
-                rdtype = dns.rdatatype.AXFR
-    elif serial > 0 and serial < 4294967296:
-        rdtype = dns.rdatatype.IXFR
-    else:
-        raise ValueError("serial out-of-range")
-    rdclass = txn_manager.get_class()
-    q = dns.message.make_query(
-        zone_origin,
-        rdtype,
-        rdclass,
-        use_edns,
-        False,
-        ednsflags,
-        payload,
-        request_payload,
-        options,
-    )
-    if serial is not None:
-        rdata = dns.rdata.from_text(rdclass, "SOA", f". . {serial} 0 0 0 0")
-        rrset = q.find_rrset(
-            q.authority, zone_origin, rdclass, dns.rdatatype.SOA, create=True
-        )
-        rrset.add(rdata, 0)
-    if keyring is not None:
-        q.use_tsig(keyring, keyname, algorithm=keyalgorithm)
-    return (q, serial)
-
-
-def extract_serial_from_query(query: dns.message.Message) -> Optional[int]:
-    """Extract the SOA serial number from query if it is an IXFR and return
-    it, otherwise return None.
-
-    *query* is a dns.message.QueryMessage that is an IXFR or AXFR request.
-
-    Raises if the query is not an IXFR or AXFR, or if an IXFR doesn't have
-    an appropriate SOA RRset in the authority section.
-    """
-    if not isinstance(query, dns.message.QueryMessage):
-        raise ValueError("query not a QueryMessage")
-    question = query.question[0]
-    if question.rdtype == dns.rdatatype.AXFR:
-        return None
-    elif question.rdtype != dns.rdatatype.IXFR:
-        raise ValueError("query is not an AXFR or IXFR")
-    soa = query.find_rrset(
-        query.authority, question.name, question.rdclass, dns.rdatatype.SOA
-    )
-    return soa[0].serial
diff --git a/lib/dns/zone.py b/lib/dns/zone.py
deleted file mode 100644
index 844919e4..00000000
--- a/lib/dns/zone.py
+++ /dev/null
@@ -1,1434 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""DNS Zones."""
-
-import contextlib
-import io
-import os
-import struct
-from typing import (
-    Any,
-    Callable,
-    Iterable,
-    Iterator,
-    List,
-    MutableMapping,
-    Optional,
-    Set,
-    Tuple,
-    Union,
-)
-
-import dns.exception
-import dns.grange
-import dns.immutable
-import dns.name
-import dns.node
-import dns.rdata
-import dns.rdataclass
-import dns.rdataset
-import dns.rdatatype
-import dns.rdtypes.ANY.SOA
-import dns.rdtypes.ANY.ZONEMD
-import dns.rrset
-import dns.tokenizer
-import dns.transaction
-import dns.ttl
-import dns.zonefile
-from dns.zonetypes import DigestHashAlgorithm, DigestScheme, _digest_hashers
-
-
-class BadZone(dns.exception.DNSException):
-    """The DNS zone is malformed."""
-
-
-class NoSOA(BadZone):
-    """The DNS zone has no SOA RR at its origin."""
-
-
-class NoNS(BadZone):
-    """The DNS zone has no NS RRset at its origin."""
-
-
-class UnknownOrigin(BadZone):
-    """The DNS zone's origin is unknown."""
-
-
-class UnsupportedDigestScheme(dns.exception.DNSException):
-    """The zone digest's scheme is unsupported."""
-
-
-class UnsupportedDigestHashAlgorithm(dns.exception.DNSException):
-    """The zone digest's origin is unsupported."""
-
-
-class NoDigest(dns.exception.DNSException):
-    """The DNS zone has no ZONEMD RRset at its origin."""
-
-
-class DigestVerificationFailure(dns.exception.DNSException):
-    """The ZONEMD digest failed to verify."""
-
-
-def _validate_name(
-    name: dns.name.Name,
-    origin: Optional[dns.name.Name],
-    relativize: bool,
-) -> dns.name.Name:
-    # This name validation code is shared by Zone and Version
-    if origin is None:
-        # This should probably never happen as other code (e.g.
-        # _rr_line) will notice the lack of an origin before us, but
-        # we check just in case!
-        raise KeyError("no zone origin is defined")
-    if name.is_absolute():
-        if not name.is_subdomain(origin):
-            raise KeyError("name parameter must be a subdomain of the zone origin")
-        if relativize:
-            name = name.relativize(origin)
-    else:
-        # We have a relative name.  Make sure that the derelativized name is
-        # not too long.
-        try:
-            abs_name = name.derelativize(origin)
-        except dns.name.NameTooLong:
-            # We map dns.name.NameTooLong to KeyError to be consistent with
-            # the other exceptions above.
-            raise KeyError("relative name too long for zone")
-        if not relativize:
-            # We have a relative name in a non-relative zone, so use the
-            # derelativized name.
-            name = abs_name
-    return name
-
-
-class Zone(dns.transaction.TransactionManager):
-    """A DNS zone.
-
-    A ``Zone`` is a mapping from names to nodes.  The zone object may be
-    treated like a Python dictionary, e.g. ``zone[name]`` will retrieve
-    the node associated with that name.  The *name* may be a
-    ``dns.name.Name object``, or it may be a string.  In either case,
-    if the name is relative it is treated as relative to the origin of
-    the zone.
-    """
-
-    node_factory: Callable[[], dns.node.Node] = dns.node.Node
-    map_factory: Callable[[], MutableMapping[dns.name.Name, dns.node.Node]] = dict
-    writable_version_factory: Optional[Callable[[], "WritableVersion"]] = None
-    immutable_version_factory: Optional[Callable[[], "ImmutableVersion"]] = None
-
-    __slots__ = ["rdclass", "origin", "nodes", "relativize"]
-
-    def __init__(
-        self,
-        origin: Optional[Union[dns.name.Name, str]],
-        rdclass: dns.rdataclass.RdataClass = dns.rdataclass.IN,
-        relativize: bool = True,
-    ):
-        """Initialize a zone object.
-
-        *origin* is the origin of the zone.  It may be a ``dns.name.Name``,
-        a ``str``, or ``None``.  If ``None``, then the zone's origin will
-        be set by the first ``$ORIGIN`` line in a zone file.
-
-        *rdclass*, an ``int``, the zone's rdata class; the default is class IN.
-
-        *relativize*, a ``bool``, determine's whether domain names are
-        relativized to the zone's origin.  The default is ``True``.
-        """
-
-        if origin is not None:
-            if isinstance(origin, str):
-                origin = dns.name.from_text(origin)
-            elif not isinstance(origin, dns.name.Name):
-                raise ValueError("origin parameter must be convertible to a DNS name")
-            if not origin.is_absolute():
-                raise ValueError("origin parameter must be an absolute name")
-        self.origin = origin
-        self.rdclass = rdclass
-        self.nodes: MutableMapping[dns.name.Name, dns.node.Node] = self.map_factory()
-        self.relativize = relativize
-
-    def __eq__(self, other):
-        """Two zones are equal if they have the same origin, class, and
-        nodes.
-
-        Returns a ``bool``.
-        """
-
-        if not isinstance(other, Zone):
-            return False
-        if (
-            self.rdclass != other.rdclass
-            or self.origin != other.origin
-            or self.nodes != other.nodes
-        ):
-            return False
-        return True
-
-    def __ne__(self, other):
-        """Are two zones not equal?
-
-        Returns a ``bool``.
-        """
-
-        return not self.__eq__(other)
-
-    def _validate_name(self, name: Union[dns.name.Name, str]) -> dns.name.Name:
-        # Note that any changes in this method should have corresponding changes
-        # made in the Version _validate_name() method.
-        if isinstance(name, str):
-            name = dns.name.from_text(name, None)
-        elif not isinstance(name, dns.name.Name):
-            raise KeyError("name parameter must be convertible to a DNS name")
-        return _validate_name(name, self.origin, self.relativize)
-
-    def __getitem__(self, key):
-        key = self._validate_name(key)
-        return self.nodes[key]
-
-    def __setitem__(self, key, value):
-        key = self._validate_name(key)
-        self.nodes[key] = value
-
-    def __delitem__(self, key):
-        key = self._validate_name(key)
-        del self.nodes[key]
-
-    def __iter__(self):
-        return self.nodes.__iter__()
-
-    def keys(self):
-        return self.nodes.keys()
-
-    def values(self):
-        return self.nodes.values()
-
-    def items(self):
-        return self.nodes.items()
-
-    def get(self, key):
-        key = self._validate_name(key)
-        return self.nodes.get(key)
-
-    def __contains__(self, key):
-        key = self._validate_name(key)
-        return key in self.nodes
-
-    def find_node(
-        self, name: Union[dns.name.Name, str], create: bool = False
-    ) -> dns.node.Node:
-        """Find a node in the zone, possibly creating it.
-
-        *name*: the name of the node to find.
-        The value may be a ``dns.name.Name`` or a ``str``.  If absolute, the
-        name must be a subdomain of the zone's origin.  If ``zone.relativize``
-        is ``True``, then the name will be relativized.
-
-        *create*, a ``bool``.  If true, the node will be created if it does
-        not exist.
-
-        Raises ``KeyError`` if the name is not known and create was
-        not specified, or if the name was not a subdomain of the origin.
-
-        Returns a ``dns.node.Node``.
-        """
-
-        name = self._validate_name(name)
-        node = self.nodes.get(name)
-        if node is None:
-            if not create:
-                raise KeyError
-            node = self.node_factory()
-            self.nodes[name] = node
-        return node
-
-    def get_node(
-        self, name: Union[dns.name.Name, str], create: bool = False
-    ) -> Optional[dns.node.Node]:
-        """Get a node in the zone, possibly creating it.
-
-        This method is like ``find_node()``, except it returns None instead
-        of raising an exception if the node does not exist and creation
-        has not been requested.
-
-        *name*: the name of the node to find.
-        The value may be a ``dns.name.Name`` or a ``str``.  If absolute, the
-        name must be a subdomain of the zone's origin.  If ``zone.relativize``
-        is ``True``, then the name will be relativized.
-
-        *create*, a ``bool``.  If true, the node will be created if it does
-        not exist.
-
-        Returns a ``dns.node.Node`` or ``None``.
-        """
-
-        try:
-            node = self.find_node(name, create)
-        except KeyError:
-            node = None
-        return node
-
-    def delete_node(self, name: Union[dns.name.Name, str]) -> None:
-        """Delete the specified node if it exists.
-
-        *name*: the name of the node to find.
-        The value may be a ``dns.name.Name`` or a ``str``.  If absolute, the
-        name must be a subdomain of the zone's origin.  If ``zone.relativize``
-        is ``True``, then the name will be relativized.
-
-        It is not an error if the node does not exist.
-        """
-
-        name = self._validate_name(name)
-        if name in self.nodes:
-            del self.nodes[name]
-
-    def find_rdataset(
-        self,
-        name: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str],
-        covers: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.NONE,
-        create: bool = False,
-    ) -> dns.rdataset.Rdataset:
-        """Look for an rdataset with the specified name and type in the zone,
-        and return an rdataset encapsulating it.
-
-        The rdataset returned is not a copy; changes to it will change
-        the zone.
-
-        KeyError is raised if the name or type are not found.
-
-        *name*: the name of the node to find.
-        The value may be a ``dns.name.Name`` or a ``str``.  If absolute, the
-        name must be a subdomain of the zone's origin.  If ``zone.relativize``
-        is ``True``, then the name will be relativized.
-
-        *rdtype*, a ``dns.rdatatype.RdataType`` or ``str``, the rdata type desired.
-
-        *covers*, a ``dns.rdatatype.RdataType`` or ``str`` the covered type.
-        Usually this value is ``dns.rdatatype.NONE``, but if the
-        rdtype is ``dns.rdatatype.SIG`` or ``dns.rdatatype.RRSIG``,
-        then the covers value will be the rdata type the SIG/RRSIG
-        covers.  The library treats the SIG and RRSIG types as if they
-        were a family of types, e.g. RRSIG(A), RRSIG(NS), RRSIG(SOA).
-        This makes RRSIGs much easier to work with than if RRSIGs
-        covering different rdata types were aggregated into a single
-        RRSIG rdataset.
-
-        *create*, a ``bool``.  If true, the node will be created if it does
-        not exist.
-
-        Raises ``KeyError`` if the name is not known and create was
-        not specified, or if the name was not a subdomain of the origin.
-
-        Returns a ``dns.rdataset.Rdataset``.
-        """
-
-        name = self._validate_name(name)
-        rdtype = dns.rdatatype.RdataType.make(rdtype)
-        covers = dns.rdatatype.RdataType.make(covers)
-        node = self.find_node(name, create)
-        return node.find_rdataset(self.rdclass, rdtype, covers, create)
-
-    def get_rdataset(
-        self,
-        name: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str],
-        covers: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.NONE,
-        create: bool = False,
-    ) -> Optional[dns.rdataset.Rdataset]:
-        """Look for an rdataset with the specified name and type in the zone.
-
-        This method is like ``find_rdataset()``, except it returns None instead
-        of raising an exception if the rdataset does not exist and creation
-        has not been requested.
-
-        The rdataset returned is not a copy; changes to it will change
-        the zone.
-
-        *name*: the name of the node to find.
-        The value may be a ``dns.name.Name`` or a ``str``.  If absolute, the
-        name must be a subdomain of the zone's origin.  If ``zone.relativize``
-        is ``True``, then the name will be relativized.
-
-        *rdtype*, a ``dns.rdatatype.RdataType`` or ``str``, the rdata type desired.
-
-        *covers*, a ``dns.rdatatype.RdataType`` or ``str``, the covered type.
-        Usually this value is ``dns.rdatatype.NONE``, but if the
-        rdtype is ``dns.rdatatype.SIG`` or ``dns.rdatatype.RRSIG``,
-        then the covers value will be the rdata type the SIG/RRSIG
-        covers.  The library treats the SIG and RRSIG types as if they
-        were a family of types, e.g. RRSIG(A), RRSIG(NS), RRSIG(SOA).
-        This makes RRSIGs much easier to work with than if RRSIGs
-        covering different rdata types were aggregated into a single
-        RRSIG rdataset.
-
-        *create*, a ``bool``.  If true, the node will be created if it does
-        not exist.
-
-        Raises ``KeyError`` if the name is not known and create was
-        not specified, or if the name was not a subdomain of the origin.
-
-        Returns a ``dns.rdataset.Rdataset`` or ``None``.
-        """
-
-        try:
-            rdataset = self.find_rdataset(name, rdtype, covers, create)
-        except KeyError:
-            rdataset = None
-        return rdataset
-
-    def delete_rdataset(
-        self,
-        name: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str],
-        covers: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.NONE,
-    ) -> None:
-        """Delete the rdataset matching *rdtype* and *covers*, if it
-        exists at the node specified by *name*.
-
-        It is not an error if the node does not exist, or if there is no matching
-        rdataset at the node.
-
-        If the node has no rdatasets after the deletion, it will itself be deleted.
-
-        *name*: the name of the node to find. The value may be a ``dns.name.Name`` or a
-        ``str``.  If absolute, the name must be a subdomain of the zone's origin.  If
-        ``zone.relativize`` is ``True``, then the name will be relativized.
-
-        *rdtype*, a ``dns.rdatatype.RdataType`` or ``str``, the rdata type desired.
-
-        *covers*, a ``dns.rdatatype.RdataType`` or ``str`` or ``None``, the covered
-        type. Usually this value is ``dns.rdatatype.NONE``, but if the rdtype is
-        ``dns.rdatatype.SIG`` or ``dns.rdatatype.RRSIG``, then the covers value will be
-        the rdata type the SIG/RRSIG covers.  The library treats the SIG and RRSIG types
-        as if they were a family of types, e.g. RRSIG(A), RRSIG(NS), RRSIG(SOA). This
-        makes RRSIGs much easier to work with than if RRSIGs covering different rdata
-        types were aggregated into a single RRSIG rdataset.
-        """
-
-        name = self._validate_name(name)
-        rdtype = dns.rdatatype.RdataType.make(rdtype)
-        covers = dns.rdatatype.RdataType.make(covers)
-        node = self.get_node(name)
-        if node is not None:
-            node.delete_rdataset(self.rdclass, rdtype, covers)
-            if len(node) == 0:
-                self.delete_node(name)
-
-    def replace_rdataset(
-        self, name: Union[dns.name.Name, str], replacement: dns.rdataset.Rdataset
-    ) -> None:
-        """Replace an rdataset at name.
-
-        It is not an error if there is no rdataset matching I{replacement}.
-
-        Ownership of the *replacement* object is transferred to the zone;
-        in other words, this method does not store a copy of *replacement*
-        at the node, it stores *replacement* itself.
-
-        If the node does not exist, it is created.
-
-        *name*: the name of the node to find.
-        The value may be a ``dns.name.Name`` or a ``str``.  If absolute, the
-        name must be a subdomain of the zone's origin.  If ``zone.relativize``
-        is ``True``, then the name will be relativized.
-
-        *replacement*, a ``dns.rdataset.Rdataset``, the replacement rdataset.
-        """
-
-        if replacement.rdclass != self.rdclass:
-            raise ValueError("replacement.rdclass != zone.rdclass")
-        node = self.find_node(name, True)
-        node.replace_rdataset(replacement)
-
-    def find_rrset(
-        self,
-        name: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str],
-        covers: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.NONE,
-    ) -> dns.rrset.RRset:
-        """Look for an rdataset with the specified name and type in the zone,
-        and return an RRset encapsulating it.
-
-        This method is less efficient than the similar
-        ``find_rdataset()`` because it creates an RRset instead of
-        returning the matching rdataset.  It may be more convenient
-        for some uses since it returns an object which binds the owner
-        name to the rdataset.
-
-        This method may not be used to create new nodes or rdatasets;
-        use ``find_rdataset`` instead.
-
-        *name*: the name of the node to find.
-        The value may be a ``dns.name.Name`` or a ``str``.  If absolute, the
-        name must be a subdomain of the zone's origin.  If ``zone.relativize``
-        is ``True``, then the name will be relativized.
-
-        *rdtype*, a ``dns.rdatatype.RdataType`` or ``str``, the rdata type desired.
-
-        *covers*, a ``dns.rdatatype.RdataType`` or ``str``, the covered type.
-        Usually this value is ``dns.rdatatype.NONE``, but if the
-        rdtype is ``dns.rdatatype.SIG`` or ``dns.rdatatype.RRSIG``,
-        then the covers value will be the rdata type the SIG/RRSIG
-        covers.  The library treats the SIG and RRSIG types as if they
-        were a family of types, e.g. RRSIG(A), RRSIG(NS), RRSIG(SOA).
-        This makes RRSIGs much easier to work with than if RRSIGs
-        covering different rdata types were aggregated into a single
-        RRSIG rdataset.
-
-        *create*, a ``bool``.  If true, the node will be created if it does
-        not exist.
-
-        Raises ``KeyError`` if the name is not known and create was
-        not specified, or if the name was not a subdomain of the origin.
-
-        Returns a ``dns.rrset.RRset`` or ``None``.
-        """
-
-        vname = self._validate_name(name)
-        rdtype = dns.rdatatype.RdataType.make(rdtype)
-        covers = dns.rdatatype.RdataType.make(covers)
-        rdataset = self.nodes[vname].find_rdataset(self.rdclass, rdtype, covers)
-        rrset = dns.rrset.RRset(vname, self.rdclass, rdtype, covers)
-        rrset.update(rdataset)
-        return rrset
-
-    def get_rrset(
-        self,
-        name: Union[dns.name.Name, str],
-        rdtype: Union[dns.rdatatype.RdataType, str],
-        covers: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.NONE,
-    ) -> Optional[dns.rrset.RRset]:
-        """Look for an rdataset with the specified name and type in the zone,
-        and return an RRset encapsulating it.
-
-        This method is less efficient than the similar ``get_rdataset()``
-        because it creates an RRset instead of returning the matching
-        rdataset.  It may be more convenient for some uses since it
-        returns an object which binds the owner name to the rdataset.
-
-        This method may not be used to create new nodes or rdatasets;
-        use ``get_rdataset()`` instead.
-
-        *name*: the name of the node to find.
-        The value may be a ``dns.name.Name`` or a ``str``.  If absolute, the
-        name must be a subdomain of the zone's origin.  If ``zone.relativize``
-        is ``True``, then the name will be relativized.
-
-        *rdtype*, a ``dns.rdataset.Rdataset`` or ``str``, the rdata type desired.
-
-        *covers*, a ``dns.rdataset.Rdataset`` or ``str``, the covered type.
-        Usually this value is ``dns.rdatatype.NONE``, but if the
-        rdtype is ``dns.rdatatype.SIG`` or ``dns.rdatatype.RRSIG``,
-        then the covers value will be the rdata type the SIG/RRSIG
-        covers.  The library treats the SIG and RRSIG types as if they
-        were a family of types, e.g. RRSIG(A), RRSIG(NS), RRSIG(SOA).
-        This makes RRSIGs much easier to work with than if RRSIGs
-        covering different rdata types were aggregated into a single
-        RRSIG rdataset.
-
-        *create*, a ``bool``.  If true, the node will be created if it does
-        not exist.
-
-        Returns a ``dns.rrset.RRset`` or ``None``.
-        """
-
-        try:
-            rrset = self.find_rrset(name, rdtype, covers)
-        except KeyError:
-            rrset = None
-        return rrset
-
-    def iterate_rdatasets(
-        self,
-        rdtype: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.ANY,
-        covers: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.NONE,
-    ) -> Iterator[Tuple[dns.name.Name, dns.rdataset.Rdataset]]:
-        """Return a generator which yields (name, rdataset) tuples for
-        all rdatasets in the zone which have the specified *rdtype*
-        and *covers*.  If *rdtype* is ``dns.rdatatype.ANY``, the default,
-        then all rdatasets will be matched.
-
-        *rdtype*, a ``dns.rdataset.Rdataset`` or ``str``, the rdata type desired.
-
-        *covers*, a ``dns.rdataset.Rdataset`` or ``str``, the covered type.
-        Usually this value is ``dns.rdatatype.NONE``, but if the
-        rdtype is ``dns.rdatatype.SIG`` or ``dns.rdatatype.RRSIG``,
-        then the covers value will be the rdata type the SIG/RRSIG
-        covers.  The library treats the SIG and RRSIG types as if they
-        were a family of types, e.g. RRSIG(A), RRSIG(NS), RRSIG(SOA).
-        This makes RRSIGs much easier to work with than if RRSIGs
-        covering different rdata types were aggregated into a single
-        RRSIG rdataset.
-        """
-
-        rdtype = dns.rdatatype.RdataType.make(rdtype)
-        covers = dns.rdatatype.RdataType.make(covers)
-        for name, node in self.items():
-            for rds in node:
-                if rdtype == dns.rdatatype.ANY or (
-                    rds.rdtype == rdtype and rds.covers == covers
-                ):
-                    yield (name, rds)
-
-    def iterate_rdatas(
-        self,
-        rdtype: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.ANY,
-        covers: Union[dns.rdatatype.RdataType, str] = dns.rdatatype.NONE,
-    ) -> Iterator[Tuple[dns.name.Name, int, dns.rdata.Rdata]]:
-        """Return a generator which yields (name, ttl, rdata) tuples for
-        all rdatas in the zone which have the specified *rdtype*
-        and *covers*.  If *rdtype* is ``dns.rdatatype.ANY``, the default,
-        then all rdatas will be matched.
-
-        *rdtype*, a ``dns.rdataset.Rdataset`` or ``str``, the rdata type desired.
-
-        *covers*, a ``dns.rdataset.Rdataset`` or ``str``, the covered type.
-        Usually this value is ``dns.rdatatype.NONE``, but if the
-        rdtype is ``dns.rdatatype.SIG`` or ``dns.rdatatype.RRSIG``,
-        then the covers value will be the rdata type the SIG/RRSIG
-        covers.  The library treats the SIG and RRSIG types as if they
-        were a family of types, e.g. RRSIG(A), RRSIG(NS), RRSIG(SOA).
-        This makes RRSIGs much easier to work with than if RRSIGs
-        covering different rdata types were aggregated into a single
-        RRSIG rdataset.
-        """
-
-        rdtype = dns.rdatatype.RdataType.make(rdtype)
-        covers = dns.rdatatype.RdataType.make(covers)
-        for name, node in self.items():
-            for rds in node:
-                if rdtype == dns.rdatatype.ANY or (
-                    rds.rdtype == rdtype and rds.covers == covers
-                ):
-                    for rdata in rds:
-                        yield (name, rds.ttl, rdata)
-
-    def to_file(
-        self,
-        f: Any,
-        sorted: bool = True,
-        relativize: bool = True,
-        nl: Optional[str] = None,
-        want_comments: bool = False,
-        want_origin: bool = False,
-    ) -> None:
-        """Write a zone to a file.
-
-        *f*, a file or `str`.  If *f* is a string, it is treated
-        as the name of a file to open.
-
-        *sorted*, a ``bool``.  If True, the default, then the file
-        will be written with the names sorted in DNSSEC order from
-        least to greatest.  Otherwise the names will be written in
-        whatever order they happen to have in the zone's dictionary.
-
-        *relativize*, a ``bool``.  If True, the default, then domain
-        names in the output will be relativized to the zone's origin
-        if possible.
-
-        *nl*, a ``str`` or None.  The end of line string.  If not
-        ``None``, the output will use the platform's native
-        end-of-line marker (i.e. LF on POSIX, CRLF on Windows).
-
-        *want_comments*, a ``bool``.  If ``True``, emit end-of-line comments
-        as part of writing the file.  If ``False``, the default, do not
-        emit them.
-
-        *want_origin*, a ``bool``.  If ``True``, emit a $ORIGIN line at
-        the start of the file.  If ``False``, the default, do not emit
-        one.
-        """
-
-        if isinstance(f, str):
-            cm: contextlib.AbstractContextManager = open(f, "wb")
-        else:
-            cm = contextlib.nullcontext(f)
-        with cm as f:
-            # must be in this way, f.encoding may contain None, or even
-            # attribute may not be there
-            file_enc = getattr(f, "encoding", None)
-            if file_enc is None:
-                file_enc = "utf-8"
-
-            if nl is None:
-                # binary mode, '\n' is not enough
-                nl_b = os.linesep.encode(file_enc)
-                nl = "\n"
-            elif isinstance(nl, str):
-                nl_b = nl.encode(file_enc)
-            else:
-                nl_b = nl
-                nl = nl.decode()
-
-            if want_origin:
-                assert self.origin is not None
-                l = "$ORIGIN " + self.origin.to_text()
-                l_b = l.encode(file_enc)
-                try:
-                    f.write(l_b)
-                    f.write(nl_b)
-                except TypeError:  # textual mode
-                    f.write(l)
-                    f.write(nl)
-
-            if sorted:
-                names = list(self.keys())
-                names.sort()
-            else:
-                names = self.keys()
-            for n in names:
-                l = self[n].to_text(
-                    n,
-                    origin=self.origin,
-                    relativize=relativize,
-                    want_comments=want_comments,
-                )
-                l_b = l.encode(file_enc)
-
-                try:
-                    f.write(l_b)
-                    f.write(nl_b)
-                except TypeError:  # textual mode
-                    f.write(l)
-                    f.write(nl)
-
-    def to_text(
-        self,
-        sorted: bool = True,
-        relativize: bool = True,
-        nl: Optional[str] = None,
-        want_comments: bool = False,
-        want_origin: bool = False,
-    ) -> str:
-        """Return a zone's text as though it were written to a file.
-
-        *sorted*, a ``bool``.  If True, the default, then the file
-        will be written with the names sorted in DNSSEC order from
-        least to greatest.  Otherwise the names will be written in
-        whatever order they happen to have in the zone's dictionary.
-
-        *relativize*, a ``bool``.  If True, the default, then domain
-        names in the output will be relativized to the zone's origin
-        if possible.
-
-        *nl*, a ``str`` or None.  The end of line string.  If not
-        ``None``, the output will use the platform's native
-        end-of-line marker (i.e. LF on POSIX, CRLF on Windows).
-
-        *want_comments*, a ``bool``.  If ``True``, emit end-of-line comments
-        as part of writing the file.  If ``False``, the default, do not
-        emit them.
-
-        *want_origin*, a ``bool``.  If ``True``, emit a $ORIGIN line at
-        the start of the output.  If ``False``, the default, do not emit
-        one.
-
-        Returns a ``str``.
-        """
-        temp_buffer = io.StringIO()
-        self.to_file(temp_buffer, sorted, relativize, nl, want_comments, want_origin)
-        return_value = temp_buffer.getvalue()
-        temp_buffer.close()
-        return return_value
-
-    def check_origin(self) -> None:
-        """Do some simple checking of the zone's origin.
-
-        Raises ``dns.zone.NoSOA`` if there is no SOA RRset.
-
-        Raises ``dns.zone.NoNS`` if there is no NS RRset.
-
-        Raises ``KeyError`` if there is no origin node.
-        """
-        if self.relativize:
-            name = dns.name.empty
-        else:
-            assert self.origin is not None
-            name = self.origin
-        if self.get_rdataset(name, dns.rdatatype.SOA) is None:
-            raise NoSOA
-        if self.get_rdataset(name, dns.rdatatype.NS) is None:
-            raise NoNS
-
-    def get_soa(
-        self, txn: Optional[dns.transaction.Transaction] = None
-    ) -> dns.rdtypes.ANY.SOA.SOA:
-        """Get the zone SOA rdata.
-
-        Raises ``dns.zone.NoSOA`` if there is no SOA RRset.
-
-        Returns a ``dns.rdtypes.ANY.SOA.SOA`` Rdata.
-        """
-        if self.relativize:
-            origin_name = dns.name.empty
-        else:
-            if self.origin is None:
-                # get_soa() has been called very early, and there must not be
-                # an SOA if there is no origin.
-                raise NoSOA
-            origin_name = self.origin
-        soa: Optional[dns.rdataset.Rdataset]
-        if txn:
-            soa = txn.get(origin_name, dns.rdatatype.SOA)
-        else:
-            soa = self.get_rdataset(origin_name, dns.rdatatype.SOA)
-        if soa is None:
-            raise NoSOA
-        return soa[0]
-
-    def _compute_digest(
-        self,
-        hash_algorithm: DigestHashAlgorithm,
-        scheme: DigestScheme = DigestScheme.SIMPLE,
-    ) -> bytes:
-        hashinfo = _digest_hashers.get(hash_algorithm)
-        if not hashinfo:
-            raise UnsupportedDigestHashAlgorithm
-        if scheme != DigestScheme.SIMPLE:
-            raise UnsupportedDigestScheme
-
-        if self.relativize:
-            origin_name = dns.name.empty
-        else:
-            assert self.origin is not None
-            origin_name = self.origin
-        hasher = hashinfo()
-        for name, node in sorted(self.items()):
-            rrnamebuf = name.to_digestable(self.origin)
-            for rdataset in sorted(node, key=lambda rds: (rds.rdtype, rds.covers)):
-                if name == origin_name and dns.rdatatype.ZONEMD in (
-                    rdataset.rdtype,
-                    rdataset.covers,
-                ):
-                    continue
-                rrfixed = struct.pack(
-                    "!HHI", rdataset.rdtype, rdataset.rdclass, rdataset.ttl
-                )
-                rdatas = [rdata.to_digestable(self.origin) for rdata in rdataset]
-                for rdata in sorted(rdatas):
-                    rrlen = struct.pack("!H", len(rdata))
-                    hasher.update(rrnamebuf + rrfixed + rrlen + rdata)
-        return hasher.digest()
-
-    def compute_digest(
-        self,
-        hash_algorithm: DigestHashAlgorithm,
-        scheme: DigestScheme = DigestScheme.SIMPLE,
-    ) -> dns.rdtypes.ANY.ZONEMD.ZONEMD:
-        serial = self.get_soa().serial
-        digest = self._compute_digest(hash_algorithm, scheme)
-        return dns.rdtypes.ANY.ZONEMD.ZONEMD(
-            self.rdclass, dns.rdatatype.ZONEMD, serial, scheme, hash_algorithm, digest
-        )
-
-    def verify_digest(
-        self, zonemd: Optional[dns.rdtypes.ANY.ZONEMD.ZONEMD] = None
-    ) -> None:
-        digests: Union[dns.rdataset.Rdataset, List[dns.rdtypes.ANY.ZONEMD.ZONEMD]]
-        if zonemd:
-            digests = [zonemd]
-        else:
-            assert self.origin is not None
-            rds = self.get_rdataset(self.origin, dns.rdatatype.ZONEMD)
-            if rds is None:
-                raise NoDigest
-            digests = rds
-        for digest in digests:
-            try:
-                computed = self._compute_digest(digest.hash_algorithm, digest.scheme)
-                if computed == digest.digest:
-                    return
-            except Exception:
-                pass
-        raise DigestVerificationFailure
-
-    # TransactionManager methods
-
-    def reader(self) -> "Transaction":
-        return Transaction(self, False, Version(self, 1, self.nodes, self.origin))
-
-    def writer(self, replacement: bool = False) -> "Transaction":
-        txn = Transaction(self, replacement)
-        txn._setup_version()
-        return txn
-
-    def origin_information(
-        self,
-    ) -> Tuple[Optional[dns.name.Name], bool, Optional[dns.name.Name]]:
-        effective: Optional[dns.name.Name]
-        if self.relativize:
-            effective = dns.name.empty
-        else:
-            effective = self.origin
-        return (self.origin, self.relativize, effective)
-
-    def get_class(self):
-        return self.rdclass
-
-    # Transaction methods
-
-    def _end_read(self, txn):
-        pass
-
-    def _end_write(self, txn):
-        pass
-
-    def _commit_version(self, _, version, origin):
-        self.nodes = version.nodes
-        if self.origin is None:
-            self.origin = origin
-
-    def _get_next_version_id(self):
-        # Versions are ephemeral and all have id 1
-        return 1
-
-
-# These classes used to be in dns.versioned, but have moved here so we can use
-# the copy-on-write transaction mechanism for both kinds of zones.  In a
-# regular zone, the version only exists during the transaction, and the nodes
-# are regular dns.node.Nodes.
-
-# A node with a version id.
-
-
-class VersionedNode(dns.node.Node):  # lgtm[py/missing-equals]
-    __slots__ = ["id"]
-
-    def __init__(self):
-        super().__init__()
-        # A proper id will get set by the Version
-        self.id = 0
-
-
-@dns.immutable.immutable
-class ImmutableVersionedNode(VersionedNode):
-    def __init__(self, node):
-        super().__init__()
-        self.id = node.id
-        self.rdatasets = tuple(
-            [dns.rdataset.ImmutableRdataset(rds) for rds in node.rdatasets]
-        )
-
-    def find_rdataset(
-        self,
-        rdclass: dns.rdataclass.RdataClass,
-        rdtype: dns.rdatatype.RdataType,
-        covers: dns.rdatatype.RdataType = dns.rdatatype.NONE,
-        create: bool = False,
-    ) -> dns.rdataset.Rdataset:
-        if create:
-            raise TypeError("immutable")
-        return super().find_rdataset(rdclass, rdtype, covers, False)
-
-    def get_rdataset(
-        self,
-        rdclass: dns.rdataclass.RdataClass,
-        rdtype: dns.rdatatype.RdataType,
-        covers: dns.rdatatype.RdataType = dns.rdatatype.NONE,
-        create: bool = False,
-    ) -> Optional[dns.rdataset.Rdataset]:
-        if create:
-            raise TypeError("immutable")
-        return super().get_rdataset(rdclass, rdtype, covers, False)
-
-    def delete_rdataset(
-        self,
-        rdclass: dns.rdataclass.RdataClass,
-        rdtype: dns.rdatatype.RdataType,
-        covers: dns.rdatatype.RdataType = dns.rdatatype.NONE,
-    ) -> None:
-        raise TypeError("immutable")
-
-    def replace_rdataset(self, replacement: dns.rdataset.Rdataset) -> None:
-        raise TypeError("immutable")
-
-    def is_immutable(self) -> bool:
-        return True
-
-
-class Version:
-    def __init__(
-        self,
-        zone: Zone,
-        id: int,
-        nodes: Optional[MutableMapping[dns.name.Name, dns.node.Node]] = None,
-        origin: Optional[dns.name.Name] = None,
-    ):
-        self.zone = zone
-        self.id = id
-        if nodes is not None:
-            self.nodes = nodes
-        else:
-            self.nodes = zone.map_factory()
-        self.origin = origin
-
-    def _validate_name(self, name: dns.name.Name) -> dns.name.Name:
-        return _validate_name(name, self.origin, self.zone.relativize)
-
-    def get_node(self, name: dns.name.Name) -> Optional[dns.node.Node]:
-        name = self._validate_name(name)
-        return self.nodes.get(name)
-
-    def get_rdataset(
-        self,
-        name: dns.name.Name,
-        rdtype: dns.rdatatype.RdataType,
-        covers: dns.rdatatype.RdataType,
-    ) -> Optional[dns.rdataset.Rdataset]:
-        node = self.get_node(name)
-        if node is None:
-            return None
-        return node.get_rdataset(self.zone.rdclass, rdtype, covers)
-
-    def keys(self):
-        return self.nodes.keys()
-
-    def items(self):
-        return self.nodes.items()
-
-
-class WritableVersion(Version):
-    def __init__(self, zone: Zone, replacement: bool = False):
-        # The zone._versions_lock must be held by our caller in a versioned
-        # zone.
-        id = zone._get_next_version_id()
-        super().__init__(zone, id)
-        if not replacement:
-            # We copy the map, because that gives us a simple and thread-safe
-            # way of doing versions, and we have a garbage collector to help
-            # us.  We only make new node objects if we actually change the
-            # node.
-            self.nodes.update(zone.nodes)
-        # We have to copy the zone origin as it may be None in the first
-        # version, and we don't want to mutate the zone until we commit.
-        self.origin = zone.origin
-        self.changed: Set[dns.name.Name] = set()
-
-    def _maybe_cow(self, name: dns.name.Name) -> dns.node.Node:
-        name = self._validate_name(name)
-        node = self.nodes.get(name)
-        if node is None or name not in self.changed:
-            new_node = self.zone.node_factory()
-            if hasattr(new_node, "id"):
-                # We keep doing this for backwards compatibility, as earlier
-                # code used new_node.id != self.id for the "do we need to CoW?"
-                # test.  Now we use the changed set as this works with both
-                # regular zones and versioned zones.
-                #
-                # We ignore the mypy error as this is safe but it doesn't see it.
-                new_node.id = self.id  # type: ignore
-            if node is not None:
-                # moo!  copy on write!
-                new_node.rdatasets.extend(node.rdatasets)
-            self.nodes[name] = new_node
-            self.changed.add(name)
-            return new_node
-        else:
-            return node
-
-    def delete_node(self, name: dns.name.Name) -> None:
-        name = self._validate_name(name)
-        if name in self.nodes:
-            del self.nodes[name]
-            self.changed.add(name)
-
-    def put_rdataset(
-        self, name: dns.name.Name, rdataset: dns.rdataset.Rdataset
-    ) -> None:
-        node = self._maybe_cow(name)
-        node.replace_rdataset(rdataset)
-
-    def delete_rdataset(
-        self,
-        name: dns.name.Name,
-        rdtype: dns.rdatatype.RdataType,
-        covers: dns.rdatatype.RdataType,
-    ) -> None:
-        node = self._maybe_cow(name)
-        node.delete_rdataset(self.zone.rdclass, rdtype, covers)
-        if len(node) == 0:
-            del self.nodes[name]
-
-
-@dns.immutable.immutable
-class ImmutableVersion(Version):
-    def __init__(self, version: WritableVersion):
-        # We tell super() that it's a replacement as we don't want it
-        # to copy the nodes, as we're about to do that with an
-        # immutable Dict.
-        super().__init__(version.zone, True)
-        # set the right id!
-        self.id = version.id
-        # keep the origin
-        self.origin = version.origin
-        # Make changed nodes immutable
-        for name in version.changed:
-            node = version.nodes.get(name)
-            # it might not exist if we deleted it in the version
-            if node:
-                version.nodes[name] = ImmutableVersionedNode(node)
-        # We're changing the type of the nodes dictionary here on purpose, so
-        # we ignore the mypy error.
-        self.nodes = dns.immutable.Dict(
-            version.nodes, True, self.zone.map_factory
-        )  # type: ignore
-
-
-class Transaction(dns.transaction.Transaction):
-    def __init__(self, zone, replacement, version=None, make_immutable=False):
-        read_only = version is not None
-        super().__init__(zone, replacement, read_only)
-        self.version = version
-        self.make_immutable = make_immutable
-
-    @property
-    def zone(self):
-        return self.manager
-
-    def _setup_version(self):
-        assert self.version is None
-        factory = self.manager.writable_version_factory
-        if factory is None:
-            factory = WritableVersion
-        self.version = factory(self.zone, self.replacement)
-
-    def _get_rdataset(self, name, rdtype, covers):
-        return self.version.get_rdataset(name, rdtype, covers)
-
-    def _put_rdataset(self, name, rdataset):
-        assert not self.read_only
-        self.version.put_rdataset(name, rdataset)
-
-    def _delete_name(self, name):
-        assert not self.read_only
-        self.version.delete_node(name)
-
-    def _delete_rdataset(self, name, rdtype, covers):
-        assert not self.read_only
-        self.version.delete_rdataset(name, rdtype, covers)
-
-    def _name_exists(self, name):
-        return self.version.get_node(name) is not None
-
-    def _changed(self):
-        if self.read_only:
-            return False
-        else:
-            return len(self.version.changed) > 0
-
-    def _end_transaction(self, commit):
-        if self.read_only:
-            self.zone._end_read(self)
-        elif commit and len(self.version.changed) > 0:
-            if self.make_immutable:
-                factory = self.manager.immutable_version_factory
-                if factory is None:
-                    factory = ImmutableVersion
-                version = factory(self.version)
-            else:
-                version = self.version
-            self.zone._commit_version(self, version, self.version.origin)
-        else:
-            # rollback
-            self.zone._end_write(self)
-
-    def _set_origin(self, origin):
-        if self.version.origin is None:
-            self.version.origin = origin
-
-    def _iterate_rdatasets(self):
-        for name, node in self.version.items():
-            for rdataset in node:
-                yield (name, rdataset)
-
-    def _iterate_names(self):
-        return self.version.keys()
-
-    def _get_node(self, name):
-        return self.version.get_node(name)
-
-    def _origin_information(self):
-        (absolute, relativize, effective) = self.manager.origin_information()
-        if absolute is None and self.version.origin is not None:
-            # No origin has been committed yet, but we've learned one as part of
-            # this txn.  Use it.
-            absolute = self.version.origin
-            if relativize:
-                effective = dns.name.empty
-            else:
-                effective = absolute
-        return (absolute, relativize, effective)
-
-
-def _from_text(
-    text: Any,
-    origin: Optional[Union[dns.name.Name, str]] = None,
-    rdclass: dns.rdataclass.RdataClass = dns.rdataclass.IN,
-    relativize: bool = True,
-    zone_factory: Any = Zone,
-    filename: Optional[str] = None,
-    allow_include: bool = False,
-    check_origin: bool = True,
-    idna_codec: Optional[dns.name.IDNACodec] = None,
-    allow_directives: Union[bool, Iterable[str]] = True,
-) -> Zone:
-    # See the comments for the public APIs from_text() and from_file() for
-    # details.
-
-    # 'text' can also be a file, but we don't publish that fact
-    # since it's an implementation detail.  The official file
-    # interface is from_file().
-
-    if filename is None:
-        filename = "<string>"
-    zone = zone_factory(origin, rdclass, relativize=relativize)
-    with zone.writer(True) as txn:
-        tok = dns.tokenizer.Tokenizer(text, filename, idna_codec=idna_codec)
-        reader = dns.zonefile.Reader(
-            tok,
-            rdclass,
-            txn,
-            allow_include=allow_include,
-            allow_directives=allow_directives,
-        )
-        try:
-            reader.read()
-        except dns.zonefile.UnknownOrigin:
-            # for backwards compatibility
-            raise dns.zone.UnknownOrigin
-    # Now that we're done reading, do some basic checking of the zone.
-    if check_origin:
-        zone.check_origin()
-    return zone
-
-
-def from_text(
-    text: str,
-    origin: Optional[Union[dns.name.Name, str]] = None,
-    rdclass: dns.rdataclass.RdataClass = dns.rdataclass.IN,
-    relativize: bool = True,
-    zone_factory: Any = Zone,
-    filename: Optional[str] = None,
-    allow_include: bool = False,
-    check_origin: bool = True,
-    idna_codec: Optional[dns.name.IDNACodec] = None,
-    allow_directives: Union[bool, Iterable[str]] = True,
-) -> Zone:
-    """Build a zone object from a zone file format string.
-
-    *text*, a ``str``, the zone file format input.
-
-    *origin*, a ``dns.name.Name``, a ``str``, or ``None``.  The origin
-    of the zone; if not specified, the first ``$ORIGIN`` statement in the
-    zone file will determine the origin of the zone.
-
-    *rdclass*, a ``dns.rdataclass.RdataClass``, the zone's rdata class; the default is
-    class IN.
-
-    *relativize*, a ``bool``, determine's whether domain names are
-    relativized to the zone's origin.  The default is ``True``.
-
-    *zone_factory*, the zone factory to use or ``None``.  If ``None``, then
-    ``dns.zone.Zone`` will be used.  The value may be any class or callable
-    that returns a subclass of ``dns.zone.Zone``.
-
-    *filename*, a ``str`` or ``None``, the filename to emit when
-    describing where an error occurred; the default is ``'<string>'``.
-
-    *allow_include*, a ``bool``.  If ``True``, the default, then ``$INCLUDE``
-    directives are permitted.  If ``False``, then encoutering a ``$INCLUDE``
-    will raise a ``SyntaxError`` exception.
-
-    *check_origin*, a ``bool``.  If ``True``, the default, then sanity
-    checks of the origin node will be made by calling the zone's
-    ``check_origin()`` method.
-
-    *idna_codec*, a ``dns.name.IDNACodec``, specifies the IDNA
-    encoder/decoder.  If ``None``, the default IDNA 2003 encoder/decoder
-    is used.
-
-    *allow_directives*, a ``bool`` or an iterable of `str`.  If ``True``, the default,
-    then directives are permitted, and the *allow_include* parameter controls whether
-    ``$INCLUDE`` is permitted.  If ``False`` or an empty iterable, then no directive
-    processing is done and any directive-like text will be treated as a regular owner
-    name.  If a non-empty iterable, then only the listed directives (including the
-    ``$``) are allowed.
-
-    Raises ``dns.zone.NoSOA`` if there is no SOA RRset.
-
-    Raises ``dns.zone.NoNS`` if there is no NS RRset.
-
-    Raises ``KeyError`` if there is no origin node.
-
-    Returns a subclass of ``dns.zone.Zone``.
-    """
-    return _from_text(
-        text,
-        origin,
-        rdclass,
-        relativize,
-        zone_factory,
-        filename,
-        allow_include,
-        check_origin,
-        idna_codec,
-        allow_directives,
-    )
-
-
-def from_file(
-    f: Any,
-    origin: Optional[Union[dns.name.Name, str]] = None,
-    rdclass: dns.rdataclass.RdataClass = dns.rdataclass.IN,
-    relativize: bool = True,
-    zone_factory: Any = Zone,
-    filename: Optional[str] = None,
-    allow_include: bool = True,
-    check_origin: bool = True,
-    idna_codec: Optional[dns.name.IDNACodec] = None,
-    allow_directives: Union[bool, Iterable[str]] = True,
-) -> Zone:
-    """Read a zone file and build a zone object.
-
-    *f*, a file or ``str``.  If *f* is a string, it is treated
-    as the name of a file to open.
-
-    *origin*, a ``dns.name.Name``, a ``str``, or ``None``.  The origin
-    of the zone; if not specified, the first ``$ORIGIN`` statement in the
-    zone file will determine the origin of the zone.
-
-    *rdclass*, an ``int``, the zone's rdata class; the default is class IN.
-
-    *relativize*, a ``bool``, determine's whether domain names are
-    relativized to the zone's origin.  The default is ``True``.
-
-    *zone_factory*, the zone factory to use or ``None``.  If ``None``, then
-    ``dns.zone.Zone`` will be used.  The value may be any class or callable
-    that returns a subclass of ``dns.zone.Zone``.
-
-    *filename*, a ``str`` or ``None``, the filename to emit when
-    describing where an error occurred; the default is ``'<string>'``.
-
-    *allow_include*, a ``bool``.  If ``True``, the default, then ``$INCLUDE``
-    directives are permitted.  If ``False``, then encoutering a ``$INCLUDE``
-    will raise a ``SyntaxError`` exception.
-
-    *check_origin*, a ``bool``.  If ``True``, the default, then sanity
-    checks of the origin node will be made by calling the zone's
-    ``check_origin()`` method.
-
-    *idna_codec*, a ``dns.name.IDNACodec``, specifies the IDNA
-    encoder/decoder.  If ``None``, the default IDNA 2003 encoder/decoder
-    is used.
-
-    *allow_directives*, a ``bool`` or an iterable of `str`.  If ``True``, the default,
-    then directives are permitted, and the *allow_include* parameter controls whether
-    ``$INCLUDE`` is permitted.  If ``False`` or an empty iterable, then no directive
-    processing is done and any directive-like text will be treated as a regular owner
-    name.  If a non-empty iterable, then only the listed directives (including the
-    ``$``) are allowed.
-
-    Raises ``dns.zone.NoSOA`` if there is no SOA RRset.
-
-    Raises ``dns.zone.NoNS`` if there is no NS RRset.
-
-    Raises ``KeyError`` if there is no origin node.
-
-    Returns a subclass of ``dns.zone.Zone``.
-    """
-
-    if isinstance(f, str):
-        if filename is None:
-            filename = f
-        cm: contextlib.AbstractContextManager = open(f)
-    else:
-        cm = contextlib.nullcontext(f)
-    with cm as f:
-        return _from_text(
-            f,
-            origin,
-            rdclass,
-            relativize,
-            zone_factory,
-            filename,
-            allow_include,
-            check_origin,
-            idna_codec,
-            allow_directives,
-        )
-    assert False  # make mypy happy  lgtm[py/unreachable-statement]
-
-
-def from_xfr(
-    xfr: Any,
-    zone_factory: Any = Zone,
-    relativize: bool = True,
-    check_origin: bool = True,
-) -> Zone:
-    """Convert the output of a zone transfer generator into a zone object.
-
-    *xfr*, a generator of ``dns.message.Message`` objects, typically
-    ``dns.query.xfr()``.
-
-    *relativize*, a ``bool``, determine's whether domain names are
-    relativized to the zone's origin.  The default is ``True``.
-    It is essential that the relativize setting matches the one specified
-    to the generator.
-
-    *check_origin*, a ``bool``.  If ``True``, the default, then sanity
-    checks of the origin node will be made by calling the zone's
-    ``check_origin()`` method.
-
-    Raises ``dns.zone.NoSOA`` if there is no SOA RRset.
-
-    Raises ``dns.zone.NoNS`` if there is no NS RRset.
-
-    Raises ``KeyError`` if there is no origin node.
-
-    Raises ``ValueError`` if no messages are yielded by the generator.
-
-    Returns a subclass of ``dns.zone.Zone``.
-    """
-
-    z = None
-    for r in xfr:
-        if z is None:
-            if relativize:
-                origin = r.origin
-            else:
-                origin = r.answer[0].name
-            rdclass = r.answer[0].rdclass
-            z = zone_factory(origin, rdclass, relativize=relativize)
-        for rrset in r.answer:
-            znode = z.nodes.get(rrset.name)
-            if not znode:
-                znode = z.node_factory()
-                z.nodes[rrset.name] = znode
-            zrds = znode.find_rdataset(rrset.rdclass, rrset.rdtype, rrset.covers, True)
-            zrds.update_ttl(rrset.ttl)
-            for rd in rrset:
-                zrds.add(rd)
-    if z is None:
-        raise ValueError("empty transfer")
-    if check_origin:
-        z.check_origin()
-    return z
diff --git a/lib/dns/zonefile.py b/lib/dns/zonefile.py
deleted file mode 100644
index d74510b2..00000000
--- a/lib/dns/zonefile.py
+++ /dev/null
@@ -1,744 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-# Copyright (C) 2003-2007, 2009-2011 Nominum, Inc.
-#
-# Permission to use, copy, modify, and distribute this software and its
-# documentation for any purpose with or without fee is hereby granted,
-# provided that the above copyright notice and this permission notice
-# appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND NOMINUM DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NOMINUM BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""DNS Zones."""
-
-import re
-import sys
-from typing import Any, Iterable, List, Optional, Set, Tuple, Union
-
-import dns.exception
-import dns.grange
-import dns.name
-import dns.node
-import dns.rdata
-import dns.rdataclass
-import dns.rdatatype
-import dns.rdtypes.ANY.SOA
-import dns.rrset
-import dns.tokenizer
-import dns.transaction
-import dns.ttl
-
-
-class UnknownOrigin(dns.exception.DNSException):
-    """Unknown origin"""
-
-
-class CNAMEAndOtherData(dns.exception.DNSException):
-    """A node has a CNAME and other data"""
-
-
-def _check_cname_and_other_data(txn, name, rdataset):
-    rdataset_kind = dns.node.NodeKind.classify_rdataset(rdataset)
-    node = txn.get_node(name)
-    if node is None:
-        # empty nodes are neutral.
-        return
-    node_kind = node.classify()
-    if (
-        node_kind == dns.node.NodeKind.CNAME
-        and rdataset_kind == dns.node.NodeKind.REGULAR
-    ):
-        raise CNAMEAndOtherData("rdataset type is not compatible with a CNAME node")
-    elif (
-        node_kind == dns.node.NodeKind.REGULAR
-        and rdataset_kind == dns.node.NodeKind.CNAME
-    ):
-        raise CNAMEAndOtherData(
-            "CNAME rdataset is not compatible with a regular data node"
-        )
-    # Otherwise at least one of the node and the rdataset is neutral, so
-    # adding the rdataset is ok
-
-
-SavedStateType = Tuple[
-    dns.tokenizer.Tokenizer,
-    Optional[dns.name.Name],  # current_origin
-    Optional[dns.name.Name],  # last_name
-    Optional[Any],  # current_file
-    int,  # last_ttl
-    bool,  # last_ttl_known
-    int,  # default_ttl
-    bool,
-]  # default_ttl_known
-
-
-def _upper_dollarize(s):
-    s = s.upper()
-    if not s.startswith("$"):
-        s = "$" + s
-    return s
-
-
-class Reader:
-    """Read a DNS zone file into a transaction."""
-
-    def __init__(
-        self,
-        tok: dns.tokenizer.Tokenizer,
-        rdclass: dns.rdataclass.RdataClass,
-        txn: dns.transaction.Transaction,
-        allow_include: bool = False,
-        allow_directives: Union[bool, Iterable[str]] = True,
-        force_name: Optional[dns.name.Name] = None,
-        force_ttl: Optional[int] = None,
-        force_rdclass: Optional[dns.rdataclass.RdataClass] = None,
-        force_rdtype: Optional[dns.rdatatype.RdataType] = None,
-        default_ttl: Optional[int] = None,
-    ):
-        self.tok = tok
-        (self.zone_origin, self.relativize, _) = txn.manager.origin_information()
-        self.current_origin = self.zone_origin
-        self.last_ttl = 0
-        self.last_ttl_known = False
-        if force_ttl is not None:
-            default_ttl = force_ttl
-        if default_ttl is None:
-            self.default_ttl = 0
-            self.default_ttl_known = False
-        else:
-            self.default_ttl = default_ttl
-            self.default_ttl_known = True
-        self.last_name = self.current_origin
-        self.zone_rdclass = rdclass
-        self.txn = txn
-        self.saved_state: List[SavedStateType] = []
-        self.current_file: Optional[Any] = None
-        self.allowed_directives: Set[str]
-        if allow_directives is True:
-            self.allowed_directives = {"$GENERATE", "$ORIGIN", "$TTL"}
-            if allow_include:
-                self.allowed_directives.add("$INCLUDE")
-        elif allow_directives is False:
-            # allow_include was ignored in earlier releases if allow_directives was
-            # False, so we continue that.
-            self.allowed_directives = set()
-        else:
-            # Note that if directives are explicitly specified, then allow_include
-            # is ignored.
-            self.allowed_directives = set(_upper_dollarize(d) for d in allow_directives)
-        self.force_name = force_name
-        self.force_ttl = force_ttl
-        self.force_rdclass = force_rdclass
-        self.force_rdtype = force_rdtype
-        self.txn.check_put_rdataset(_check_cname_and_other_data)
-
-    def _eat_line(self):
-        while 1:
-            token = self.tok.get()
-            if token.is_eol_or_eof():
-                break
-
-    def _get_identifier(self):
-        token = self.tok.get()
-        if not token.is_identifier():
-            raise dns.exception.SyntaxError
-        return token
-
-    def _rr_line(self):
-        """Process one line from a DNS zone file."""
-        token = None
-        # Name
-        if self.force_name is not None:
-            name = self.force_name
-        else:
-            if self.current_origin is None:
-                raise UnknownOrigin
-            token = self.tok.get(want_leading=True)
-            if not token.is_whitespace():
-                self.last_name = self.tok.as_name(token, self.current_origin)
-            else:
-                token = self.tok.get()
-                if token.is_eol_or_eof():
-                    # treat leading WS followed by EOL/EOF as if they were EOL/EOF.
-                    return
-                self.tok.unget(token)
-            name = self.last_name
-            if not name.is_subdomain(self.zone_origin):
-                self._eat_line()
-                return
-            if self.relativize:
-                name = name.relativize(self.zone_origin)
-
-        # TTL
-        if self.force_ttl is not None:
-            ttl = self.force_ttl
-            self.last_ttl = ttl
-            self.last_ttl_known = True
-        else:
-            token = self._get_identifier()
-            ttl = None
-            try:
-                ttl = dns.ttl.from_text(token.value)
-                self.last_ttl = ttl
-                self.last_ttl_known = True
-                token = None
-            except dns.ttl.BadTTL:
-                self.tok.unget(token)
-
-        # Class
-        if self.force_rdclass is not None:
-            rdclass = self.force_rdclass
-        else:
-            token = self._get_identifier()
-            try:
-                rdclass = dns.rdataclass.from_text(token.value)
-            except dns.exception.SyntaxError:
-                raise
-            except Exception:
-                rdclass = self.zone_rdclass
-                self.tok.unget(token)
-            if rdclass != self.zone_rdclass:
-                raise dns.exception.SyntaxError("RR class is not zone's class")
-
-        if ttl is None:
-            # support for <class> <ttl> <type> syntax
-            token = self._get_identifier()
-            ttl = None
-            try:
-                ttl = dns.ttl.from_text(token.value)
-                self.last_ttl = ttl
-                self.last_ttl_known = True
-                token = None
-            except dns.ttl.BadTTL:
-                if self.default_ttl_known:
-                    ttl = self.default_ttl
-                elif self.last_ttl_known:
-                    ttl = self.last_ttl
-                self.tok.unget(token)
-
-        # Type
-        if self.force_rdtype is not None:
-            rdtype = self.force_rdtype
-        else:
-            token = self._get_identifier()
-            try:
-                rdtype = dns.rdatatype.from_text(token.value)
-            except Exception:
-                raise dns.exception.SyntaxError(f"unknown rdatatype '{token.value}'")
-
-        try:
-            rd = dns.rdata.from_text(
-                rdclass,
-                rdtype,
-                self.tok,
-                self.current_origin,
-                self.relativize,
-                self.zone_origin,
-            )
-        except dns.exception.SyntaxError:
-            # Catch and reraise.
-            raise
-        except Exception:
-            # All exceptions that occur in the processing of rdata
-            # are treated as syntax errors.  This is not strictly
-            # correct, but it is correct almost all of the time.
-            # We convert them to syntax errors so that we can emit
-            # helpful filename:line info.
-            (ty, va) = sys.exc_info()[:2]
-            raise dns.exception.SyntaxError(f"caught exception {str(ty)}: {str(va)}")
-
-        if not self.default_ttl_known and rdtype == dns.rdatatype.SOA:
-            # The pre-RFC2308 and pre-BIND9 behavior inherits the zone default
-            # TTL from the SOA minttl if no $TTL statement is present before the
-            # SOA is parsed.
-            self.default_ttl = rd.minimum
-            self.default_ttl_known = True
-            if ttl is None:
-                # if we didn't have a TTL on the SOA, set it!
-                ttl = rd.minimum
-
-        # TTL check.  We had to wait until now to do this as the SOA RR's
-        # own TTL can be inferred from its minimum.
-        if ttl is None:
-            raise dns.exception.SyntaxError("Missing default TTL value")
-
-        self.txn.add(name, ttl, rd)
-
-    def _parse_modify(self, side: str) -> Tuple[str, str, int, int, str]:
-        # Here we catch everything in '{' '}' in a group so we can replace it
-        # with ''.
-        is_generate1 = re.compile(r"^.*\$({(\+|-?)(\d+),(\d+),(.)}).*$")
-        is_generate2 = re.compile(r"^.*\$({(\+|-?)(\d+)}).*$")
-        is_generate3 = re.compile(r"^.*\$({(\+|-?)(\d+),(\d+)}).*$")
-        # Sometimes there are modifiers in the hostname. These come after
-        # the dollar sign. They are in the form: ${offset[,width[,base]]}.
-        # Make names
-        mod = ""
-        sign = "+"
-        offset = "0"
-        width = "0"
-        base = "d"
-        g1 = is_generate1.match(side)
-        if g1:
-            mod, sign, offset, width, base = g1.groups()
-            if sign == "":
-                sign = "+"
-        else:
-            g2 = is_generate2.match(side)
-            if g2:
-                mod, sign, offset = g2.groups()
-                if sign == "":
-                    sign = "+"
-                width = "0"
-                base = "d"
-            else:
-                g3 = is_generate3.match(side)
-                if g3:
-                    mod, sign, offset, width = g3.groups()
-                    if sign == "":
-                        sign = "+"
-                    base = "d"
-
-        ioffset = int(offset)
-        iwidth = int(width)
-
-        if sign not in ["+", "-"]:
-            raise dns.exception.SyntaxError(f"invalid offset sign {sign}")
-        if base not in ["d", "o", "x", "X", "n", "N"]:
-            raise dns.exception.SyntaxError(f"invalid type {base}")
-
-        return mod, sign, ioffset, iwidth, base
-
-    def _generate_line(self):
-        # range lhs [ttl] [class] type rhs [ comment ]
-        """Process one line containing the GENERATE statement from a DNS
-        zone file."""
-        if self.current_origin is None:
-            raise UnknownOrigin
-
-        token = self.tok.get()
-        # Range (required)
-        try:
-            start, stop, step = dns.grange.from_text(token.value)
-            token = self.tok.get()
-            if not token.is_identifier():
-                raise dns.exception.SyntaxError
-        except Exception:
-            raise dns.exception.SyntaxError
-
-        # lhs (required)
-        try:
-            lhs = token.value
-            token = self.tok.get()
-            if not token.is_identifier():
-                raise dns.exception.SyntaxError
-        except Exception:
-            raise dns.exception.SyntaxError
-
-        # TTL
-        try:
-            ttl = dns.ttl.from_text(token.value)
-            self.last_ttl = ttl
-            self.last_ttl_known = True
-            token = self.tok.get()
-            if not token.is_identifier():
-                raise dns.exception.SyntaxError
-        except dns.ttl.BadTTL:
-            if not (self.last_ttl_known or self.default_ttl_known):
-                raise dns.exception.SyntaxError("Missing default TTL value")
-            if self.default_ttl_known:
-                ttl = self.default_ttl
-            elif self.last_ttl_known:
-                ttl = self.last_ttl
-        # Class
-        try:
-            rdclass = dns.rdataclass.from_text(token.value)
-            token = self.tok.get()
-            if not token.is_identifier():
-                raise dns.exception.SyntaxError
-        except dns.exception.SyntaxError:
-            raise dns.exception.SyntaxError
-        except Exception:
-            rdclass = self.zone_rdclass
-        if rdclass != self.zone_rdclass:
-            raise dns.exception.SyntaxError("RR class is not zone's class")
-        # Type
-        try:
-            rdtype = dns.rdatatype.from_text(token.value)
-            token = self.tok.get()
-            if not token.is_identifier():
-                raise dns.exception.SyntaxError
-        except Exception:
-            raise dns.exception.SyntaxError(f"unknown rdatatype '{token.value}'")
-
-        # rhs (required)
-        rhs = token.value
-
-        def _calculate_index(counter: int, offset_sign: str, offset: int) -> int:
-            """Calculate the index from the counter and offset."""
-            if offset_sign == "-":
-                offset *= -1
-            return counter + offset
-
-        def _format_index(index: int, base: str, width: int) -> str:
-            """Format the index with the given base, and zero-fill it
-            to the given width."""
-            if base in ["d", "o", "x", "X"]:
-                return format(index, base).zfill(width)
-
-            # base can only be n or N here
-            hexa = _format_index(index, "x", width)
-            nibbles = ".".join(hexa[::-1])[:width]
-            if base == "N":
-                nibbles = nibbles.upper()
-            return nibbles
-
-        lmod, lsign, loffset, lwidth, lbase = self._parse_modify(lhs)
-        rmod, rsign, roffset, rwidth, rbase = self._parse_modify(rhs)
-        for i in range(start, stop + 1, step):
-            # +1 because bind is inclusive and python is exclusive
-
-            lindex = _calculate_index(i, lsign, loffset)
-            rindex = _calculate_index(i, rsign, roffset)
-
-            lzfindex = _format_index(lindex, lbase, lwidth)
-            rzfindex = _format_index(rindex, rbase, rwidth)
-
-            name = lhs.replace(f"${lmod}", lzfindex)
-            rdata = rhs.replace(f"${rmod}", rzfindex)
-
-            self.last_name = dns.name.from_text(
-                name, self.current_origin, self.tok.idna_codec
-            )
-            name = self.last_name
-            if not name.is_subdomain(self.zone_origin):
-                self._eat_line()
-                return
-            if self.relativize:
-                name = name.relativize(self.zone_origin)
-
-            try:
-                rd = dns.rdata.from_text(
-                    rdclass,
-                    rdtype,
-                    rdata,
-                    self.current_origin,
-                    self.relativize,
-                    self.zone_origin,
-                )
-            except dns.exception.SyntaxError:
-                # Catch and reraise.
-                raise
-            except Exception:
-                # All exceptions that occur in the processing of rdata
-                # are treated as syntax errors.  This is not strictly
-                # correct, but it is correct almost all of the time.
-                # We convert them to syntax errors so that we can emit
-                # helpful filename:line info.
-                (ty, va) = sys.exc_info()[:2]
-                raise dns.exception.SyntaxError(
-                    f"caught exception {str(ty)}: {str(va)}"
-                )
-
-            self.txn.add(name, ttl, rd)
-
-    def read(self) -> None:
-        """Read a DNS zone file and build a zone object.
-
-        @raises dns.zone.NoSOA: No SOA RR was found at the zone origin
-        @raises dns.zone.NoNS: No NS RRset was found at the zone origin
-        """
-
-        try:
-            while 1:
-                token = self.tok.get(True, True)
-                if token.is_eof():
-                    if self.current_file is not None:
-                        self.current_file.close()
-                    if len(self.saved_state) > 0:
-                        (
-                            self.tok,
-                            self.current_origin,
-                            self.last_name,
-                            self.current_file,
-                            self.last_ttl,
-                            self.last_ttl_known,
-                            self.default_ttl,
-                            self.default_ttl_known,
-                        ) = self.saved_state.pop(-1)
-                        continue
-                    break
-                elif token.is_eol():
-                    continue
-                elif token.is_comment():
-                    self.tok.get_eol()
-                    continue
-                elif token.value[0] == "$" and len(self.allowed_directives) > 0:
-                    # Note that we only run directive processing code if at least
-                    # one directive is allowed in order to be backwards compatible
-                    c = token.value.upper()
-                    if c not in self.allowed_directives:
-                        raise dns.exception.SyntaxError(
-                            f"zone file directive '{c}' is not allowed"
-                        )
-                    if c == "$TTL":
-                        token = self.tok.get()
-                        if not token.is_identifier():
-                            raise dns.exception.SyntaxError("bad $TTL")
-                        self.default_ttl = dns.ttl.from_text(token.value)
-                        self.default_ttl_known = True
-                        self.tok.get_eol()
-                    elif c == "$ORIGIN":
-                        self.current_origin = self.tok.get_name()
-                        self.tok.get_eol()
-                        if self.zone_origin is None:
-                            self.zone_origin = self.current_origin
-                        self.txn._set_origin(self.current_origin)
-                    elif c == "$INCLUDE":
-                        token = self.tok.get()
-                        filename = token.value
-                        token = self.tok.get()
-                        new_origin: Optional[dns.name.Name]
-                        if token.is_identifier():
-                            new_origin = dns.name.from_text(
-                                token.value, self.current_origin, self.tok.idna_codec
-                            )
-                            self.tok.get_eol()
-                        elif not token.is_eol_or_eof():
-                            raise dns.exception.SyntaxError("bad origin in $INCLUDE")
-                        else:
-                            new_origin = self.current_origin
-                        self.saved_state.append(
-                            (
-                                self.tok,
-                                self.current_origin,
-                                self.last_name,
-                                self.current_file,
-                                self.last_ttl,
-                                self.last_ttl_known,
-                                self.default_ttl,
-                                self.default_ttl_known,
-                            )
-                        )
-                        self.current_file = open(filename)
-                        self.tok = dns.tokenizer.Tokenizer(self.current_file, filename)
-                        self.current_origin = new_origin
-                    elif c == "$GENERATE":
-                        self._generate_line()
-                    else:
-                        raise dns.exception.SyntaxError(
-                            f"Unknown zone file directive '{c}'"
-                        )
-                    continue
-                self.tok.unget(token)
-                self._rr_line()
-        except dns.exception.SyntaxError as detail:
-            (filename, line_number) = self.tok.where()
-            if detail is None:
-                detail = "syntax error"
-            ex = dns.exception.SyntaxError(
-                "%s:%d: %s" % (filename, line_number, detail)
-            )
-            tb = sys.exc_info()[2]
-            raise ex.with_traceback(tb) from None
-
-
-class RRsetsReaderTransaction(dns.transaction.Transaction):
-    def __init__(self, manager, replacement, read_only):
-        assert not read_only
-        super().__init__(manager, replacement, read_only)
-        self.rdatasets = {}
-
-    def _get_rdataset(self, name, rdtype, covers):
-        return self.rdatasets.get((name, rdtype, covers))
-
-    def _get_node(self, name):
-        rdatasets = []
-        for (rdataset_name, _, _), rdataset in self.rdatasets.items():
-            if name == rdataset_name:
-                rdatasets.append(rdataset)
-        if len(rdatasets) == 0:
-            return None
-        node = dns.node.Node()
-        node.rdatasets = rdatasets
-        return node
-
-    def _put_rdataset(self, name, rdataset):
-        self.rdatasets[(name, rdataset.rdtype, rdataset.covers)] = rdataset
-
-    def _delete_name(self, name):
-        # First remove any changes involving the name
-        remove = []
-        for key in self.rdatasets:
-            if key[0] == name:
-                remove.append(key)
-        if len(remove) > 0:
-            for key in remove:
-                del self.rdatasets[key]
-
-    def _delete_rdataset(self, name, rdtype, covers):
-        try:
-            del self.rdatasets[(name, rdtype, covers)]
-        except KeyError:
-            pass
-
-    def _name_exists(self, name):
-        for n, _, _ in self.rdatasets:
-            if n == name:
-                return True
-        return False
-
-    def _changed(self):
-        return len(self.rdatasets) > 0
-
-    def _end_transaction(self, commit):
-        if commit and self._changed():
-            rrsets = []
-            for (name, _, _), rdataset in self.rdatasets.items():
-                rrset = dns.rrset.RRset(
-                    name, rdataset.rdclass, rdataset.rdtype, rdataset.covers
-                )
-                rrset.update(rdataset)
-                rrsets.append(rrset)
-            self.manager.set_rrsets(rrsets)
-
-    def _set_origin(self, origin):
-        pass
-
-    def _iterate_rdatasets(self):
-        raise NotImplementedError  # pragma: no cover
-
-    def _iterate_names(self):
-        raise NotImplementedError  # pragma: no cover
-
-
-class RRSetsReaderManager(dns.transaction.TransactionManager):
-    def __init__(
-        self, origin=dns.name.root, relativize=False, rdclass=dns.rdataclass.IN
-    ):
-        self.origin = origin
-        self.relativize = relativize
-        self.rdclass = rdclass
-        self.rrsets = []
-
-    def reader(self):  # pragma: no cover
-        raise NotImplementedError
-
-    def writer(self, replacement=False):
-        assert replacement is True
-        return RRsetsReaderTransaction(self, True, False)
-
-    def get_class(self):
-        return self.rdclass
-
-    def origin_information(self):
-        if self.relativize:
-            effective = dns.name.empty
-        else:
-            effective = self.origin
-        return (self.origin, self.relativize, effective)
-
-    def set_rrsets(self, rrsets):
-        self.rrsets = rrsets
-
-
-def read_rrsets(
-    text: Any,
-    name: Optional[Union[dns.name.Name, str]] = None,
-    ttl: Optional[int] = None,
-    rdclass: Optional[Union[dns.rdataclass.RdataClass, str]] = dns.rdataclass.IN,
-    default_rdclass: Union[dns.rdataclass.RdataClass, str] = dns.rdataclass.IN,
-    rdtype: Optional[Union[dns.rdatatype.RdataType, str]] = None,
-    default_ttl: Optional[Union[int, str]] = None,
-    idna_codec: Optional[dns.name.IDNACodec] = None,
-    origin: Optional[Union[dns.name.Name, str]] = dns.name.root,
-    relativize: bool = False,
-) -> List[dns.rrset.RRset]:
-    """Read one or more rrsets from the specified text, possibly subject
-    to restrictions.
-
-    *text*, a file object or a string, is the input to process.
-
-    *name*, a string, ``dns.name.Name``, or ``None``, is the owner name of
-    the rrset.  If not ``None``, then the owner name is "forced", and the
-    input must not specify an owner name.  If ``None``, then any owner names
-    are allowed and must be present in the input.
-
-    *ttl*, an ``int``, string, or None.  If not ``None``, the the TTL is
-    forced to be the specified value and the input must not specify a TTL.
-    If ``None``, then a TTL may be specified in the input.  If it is not
-    specified, then the *default_ttl* will be used.
-
-    *rdclass*, a ``dns.rdataclass.RdataClass``, string, or ``None``.  If
-    not ``None``, then the class is forced to the specified value, and the
-    input must not specify a class.  If ``None``, then the input may specify
-    a class that matches *default_rdclass*.  Note that it is not possible to
-    return rrsets with differing classes; specifying ``None`` for the class
-    simply allows the user to optionally type a class as that may be convenient
-    when cutting and pasting.
-
-    *default_rdclass*, a ``dns.rdataclass.RdataClass`` or string.  The class
-    of the returned rrsets.
-
-    *rdtype*, a ``dns.rdatatype.RdataType``, string, or ``None``.  If not
-    ``None``, then the type is forced to the specified value, and the
-    input must not specify a type.  If ``None``, then a type must be present
-    for each RR.
-
-    *default_ttl*, an ``int``, string, or ``None``.  If not ``None``, then if
-    the TTL is not forced and is not specified, then this value will be used.
-    if ``None``, then if the TTL is not forced an error will occur if the TTL
-    is not specified.
-
-    *idna_codec*, a ``dns.name.IDNACodec``, specifies the IDNA
-    encoder/decoder.  If ``None``, the default IDNA 2003 encoder/decoder
-    is used.  Note that codecs only apply to the owner name; dnspython does
-    not do IDNA for names in rdata, as there is no IDNA zonefile format.
-
-    *origin*, a string, ``dns.name.Name``, or ``None``, is the origin for any
-    relative names in the input, and also the origin to relativize to if
-    *relativize* is ``True``.
-
-    *relativize*, a bool.  If ``True``, names are relativized to the *origin*;
-    if ``False`` then any relative names in the input are made absolute by
-    appending the *origin*.
-    """
-    if isinstance(origin, str):
-        origin = dns.name.from_text(origin, dns.name.root, idna_codec)
-    if isinstance(name, str):
-        name = dns.name.from_text(name, origin, idna_codec)
-    if isinstance(ttl, str):
-        ttl = dns.ttl.from_text(ttl)
-    if isinstance(default_ttl, str):
-        default_ttl = dns.ttl.from_text(default_ttl)
-    if rdclass is not None:
-        rdclass = dns.rdataclass.RdataClass.make(rdclass)
-    else:
-        rdclass = None
-    default_rdclass = dns.rdataclass.RdataClass.make(default_rdclass)
-    if rdtype is not None:
-        rdtype = dns.rdatatype.RdataType.make(rdtype)
-    else:
-        rdtype = None
-    manager = RRSetsReaderManager(origin, relativize, default_rdclass)
-    with manager.writer(True) as txn:
-        tok = dns.tokenizer.Tokenizer(text, "<input>", idna_codec=idna_codec)
-        reader = Reader(
-            tok,
-            default_rdclass,
-            txn,
-            allow_directives=False,
-            force_name=name,
-            force_ttl=ttl,
-            force_rdclass=rdclass,
-            force_rdtype=rdtype,
-            default_ttl=default_ttl,
-        )
-        reader.read()
-    return manager.rrsets
diff --git a/lib/dns/zonetypes.py b/lib/dns/zonetypes.py
deleted file mode 100644
index 195ee2ec..00000000
--- a/lib/dns/zonetypes.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (C) Dnspython Contributors, see LICENSE for text of ISC license
-
-"""Common zone-related types."""
-
-# This is a separate file to avoid import circularity between dns.zone and
-# the implementation of the ZONEMD type.
-
-import hashlib
-
-import dns.enum
-
-
-class DigestScheme(dns.enum.IntEnum):
-    """ZONEMD Scheme"""
-
-    SIMPLE = 1
-
-    @classmethod
-    def _maximum(cls):
-        return 255
-
-
-class DigestHashAlgorithm(dns.enum.IntEnum):
-    """ZONEMD Hash Algorithm"""
-
-    SHA384 = 1
-    SHA512 = 2
-
-    @classmethod
-    def _maximum(cls):
-        return 255
-
-
-_digest_hashers = {
-    DigestHashAlgorithm.SHA384: hashlib.sha384,
-    DigestHashAlgorithm.SHA512: hashlib.sha512,
-}
diff --git a/lib/enum/LICENSE b/lib/enum/LICENSE
new file mode 100644
index 00000000..9003b885
--- /dev/null
+++ b/lib/enum/LICENSE
@@ -0,0 +1,32 @@
+Copyright (c) 2013, Ethan Furman.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    Redistributions of source code must retain the above
+    copyright notice, this list of conditions and the
+    following disclaimer.
+
+    Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials
+    provided with the distribution.
+
+    Neither the name Ethan Furman nor the names of any
+    contributors may be used to endorse or promote products
+    derived from this software without specific prior written
+    permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/lib/enum/README b/lib/enum/README
new file mode 100644
index 00000000..511af984
--- /dev/null
+++ b/lib/enum/README
@@ -0,0 +1,2 @@
+enum34 is the new Python stdlib enum module available in Python 3.4
+backported for previous versions of Python from 2.4 to 3.3.
diff --git a/lib/enum/__init__.py b/lib/enum/__init__.py
new file mode 100644
index 00000000..6a327a8a
--- /dev/null
+++ b/lib/enum/__init__.py
@@ -0,0 +1,790 @@
+"""Python Enumerations"""
+
+import sys as _sys
+
+__all__ = ['Enum', 'IntEnum', 'unique']
+
+version = 1, 0, 4
+
+pyver = float('%s.%s' % _sys.version_info[:2])
+
+try:
+    any
+except NameError:
+    def any(iterable):
+        for element in iterable:
+            if element:
+                return True
+        return False
+
+try:
+    from collections import OrderedDict
+except ImportError:
+    OrderedDict = None
+
+try:
+    basestring
+except NameError:
+    # In Python 2 basestring is the ancestor of both str and unicode
+    # in Python 3 it's just str, but was missing in 3.1
+    basestring = str
+
+try:
+    unicode
+except NameError:
+    # In Python 3 unicode no longer exists (it's just str)
+    unicode = str
+
+class _RouteClassAttributeToGetattr(object):
+    """Route attribute access on a class to __getattr__.
+
+    This is a descriptor, used to define attributes that act differently when
+    accessed through an instance and through a class.  Instance access remains
+    normal, but access to an attribute through a class will be routed to the
+    class's __getattr__ method; this is done by raising AttributeError.
+
+    """
+    def __init__(self, fget=None):
+        self.fget = fget
+
+    def __get__(self, instance, ownerclass=None):
+        if instance is None:
+            raise AttributeError()
+        return self.fget(instance)
+
+    def __set__(self, instance, value):
+        raise AttributeError("can't set attribute")
+
+    def __delete__(self, instance):
+        raise AttributeError("can't delete attribute")
+
+
+def _is_descriptor(obj):
+    """Returns True if obj is a descriptor, False otherwise."""
+    return (
+            hasattr(obj, '__get__') or
+            hasattr(obj, '__set__') or
+            hasattr(obj, '__delete__'))
+
+
+def _is_dunder(name):
+    """Returns True if a __dunder__ name, False otherwise."""
+    return (name[:2] == name[-2:] == '__' and
+            name[2:3] != '_' and
+            name[-3:-2] != '_' and
+            len(name) > 4)
+
+
+def _is_sunder(name):
+    """Returns True if a _sunder_ name, False otherwise."""
+    return (name[0] == name[-1] == '_' and 
+            name[1:2] != '_' and
+            name[-2:-1] != '_' and
+            len(name) > 2)
+
+
+def _make_class_unpicklable(cls):
+    """Make the given class un-picklable."""
+    def _break_on_call_reduce(self, protocol=None):
+        raise TypeError('%r cannot be pickled' % self)
+    cls.__reduce_ex__ = _break_on_call_reduce
+    cls.__module__ = '<unknown>'
+
+
+class _EnumDict(dict):
+    """Track enum member order and ensure member names are not reused.
+
+    EnumMeta will use the names found in self._member_names as the
+    enumeration member names.
+
+    """
+    def __init__(self):
+        super(_EnumDict, self).__init__()
+        self._member_names = []
+
+    def __setitem__(self, key, value):
+        """Changes anything not dundered or not a descriptor.
+
+        If a descriptor is added with the same name as an enum member, the name
+        is removed from _member_names (this may leave a hole in the numerical
+        sequence of values).
+
+        If an enum member name is used twice, an error is raised; duplicate
+        values are not checked for.
+
+        Single underscore (sunder) names are reserved.
+
+        Note:   in 3.x __order__ is simply discarded as a not necessary piece
+                leftover from 2.x
+
+        """
+        if pyver >= 3.0 and key == '__order__':
+                return
+        if _is_sunder(key):
+            raise ValueError('_names_ are reserved for future Enum use')
+        elif _is_dunder(key):
+            pass
+        elif key in self._member_names:
+            # descriptor overwriting an enum?
+            raise TypeError('Attempted to reuse key: %r' % key)
+        elif not _is_descriptor(value):
+            if key in self:
+                # enum overwriting a descriptor?
+                raise TypeError('Key already defined as: %r' % self[key])
+            self._member_names.append(key)
+        super(_EnumDict, self).__setitem__(key, value)
+
+
+# Dummy value for Enum as EnumMeta explicity checks for it, but of course until
+# EnumMeta finishes running the first time the Enum class doesn't exist.  This
+# is also why there are checks in EnumMeta like `if Enum is not None`
+Enum = None
+
+
+class EnumMeta(type):
+    """Metaclass for Enum"""
+    @classmethod
+    def __prepare__(metacls, cls, bases):
+        return _EnumDict()
+
+    def __new__(metacls, cls, bases, classdict):
+        # an Enum class is final once enumeration items have been defined; it
+        # cannot be mixed with other types (int, float, etc.) if it has an
+        # inherited __new__ unless a new __new__ is defined (or the resulting
+        # class will fail).
+        if type(classdict) is dict:
+            original_dict = classdict
+            classdict = _EnumDict()
+            for k, v in original_dict.items():
+                classdict[k] = v
+
+        member_type, first_enum = metacls._get_mixins_(bases)
+        __new__, save_new, use_args = metacls._find_new_(classdict, member_type,
+                                                        first_enum)
+        # save enum items into separate mapping so they don't get baked into
+        # the new class
+        members = dict((k, classdict[k]) for k in classdict._member_names)
+        for name in classdict._member_names:
+            del classdict[name]
+
+        # py2 support for definition order
+        __order__ = classdict.get('__order__')
+        if __order__ is None:
+            if pyver < 3.0:
+                try:
+                    __order__ = [name for (name, value) in sorted(members.items(), key=lambda item: item[1])]
+                except TypeError:
+                    __order__ = [name for name in sorted(members.keys())]
+            else:
+                __order__ = classdict._member_names
+        else:
+            del classdict['__order__']
+            if pyver < 3.0:
+                __order__ = __order__.replace(',', ' ').split()
+                aliases = [name for name in members if name not in __order__]
+                __order__ += aliases
+
+        # check for illegal enum names (any others?)
+        invalid_names = set(members) & set(['mro'])
+        if invalid_names:
+            raise ValueError('Invalid enum member name(s): %s' % (
+                ', '.join(invalid_names), ))
+
+        # create our new Enum type
+        enum_class = super(EnumMeta, metacls).__new__(metacls, cls, bases, classdict)
+        enum_class._member_names_ = []               # names in random order
+        if OrderedDict is not None:
+            enum_class._member_map_ = OrderedDict()
+        else:
+            enum_class._member_map_ = {}             # name->value map
+        enum_class._member_type_ = member_type
+
+        # Reverse value->name map for hashable values.
+        enum_class._value2member_map_ = {}
+
+        # instantiate them, checking for duplicates as we go
+        # we instantiate first instead of checking for duplicates first in case
+        # a custom __new__ is doing something funky with the values -- such as
+        # auto-numbering ;)
+        if __new__ is None:
+            __new__ = enum_class.__new__
+        for member_name in __order__:
+            value = members[member_name]
+            if not isinstance(value, tuple):
+                args = (value, )
+            else:
+                args = value
+            if member_type is tuple:   # special case for tuple enums
+                args = (args, )     # wrap it one more time
+            if not use_args or not args:
+                enum_member = __new__(enum_class)
+                if not hasattr(enum_member, '_value_'):
+                    enum_member._value_ = value
+            else:
+                enum_member = __new__(enum_class, *args)
+                if not hasattr(enum_member, '_value_'):
+                    enum_member._value_ = member_type(*args)
+            value = enum_member._value_
+            enum_member._name_ = member_name
+            enum_member.__objclass__ = enum_class
+            enum_member.__init__(*args)
+            # If another member with the same value was already defined, the
+            # new member becomes an alias to the existing one.
+            for name, canonical_member in enum_class._member_map_.items():
+                if canonical_member.value == enum_member._value_:
+                    enum_member = canonical_member
+                    break
+            else:
+                # Aliases don't appear in member names (only in __members__).
+                enum_class._member_names_.append(member_name)
+            enum_class._member_map_[member_name] = enum_member
+            try:
+                # This may fail if value is not hashable. We can't add the value
+                # to the map, and by-value lookups for this value will be
+                # linear.
+                enum_class._value2member_map_[value] = enum_member
+            except TypeError:
+                pass
+
+
+        # If a custom type is mixed into the Enum, and it does not know how
+        # to pickle itself, pickle.dumps will succeed but pickle.loads will
+        # fail.  Rather than have the error show up later and possibly far
+        # from the source, sabotage the pickle protocol for this class so
+        # that pickle.dumps also fails.
+        #
+        # However, if the new class implements its own __reduce_ex__, do not
+        # sabotage -- it's on them to make sure it works correctly.  We use
+        # __reduce_ex__ instead of any of the others as it is preferred by
+        # pickle over __reduce__, and it handles all pickle protocols.
+        unpicklable = False
+        if '__reduce_ex__' not in classdict:
+            if member_type is not object:
+                methods = ('__getnewargs_ex__', '__getnewargs__',
+                        '__reduce_ex__', '__reduce__')
+                if not any(m in member_type.__dict__ for m in methods):
+                    _make_class_unpicklable(enum_class)
+                    unpicklable = True
+
+
+        # double check that repr and friends are not the mixin's or various
+        # things break (such as pickle)
+        for name in ('__repr__', '__str__', '__format__', '__reduce_ex__'):
+            class_method = getattr(enum_class, name)
+            obj_method = getattr(member_type, name, None)
+            enum_method = getattr(first_enum, name, None)
+            if name not in classdict and class_method is not enum_method:
+                if name == '__reduce_ex__' and unpicklable:
+                    continue
+                setattr(enum_class, name, enum_method)
+
+        # method resolution and int's are not playing nice
+        # Python's less than 2.6 use __cmp__
+
+        if pyver < 2.6:
+
+            if issubclass(enum_class, int):
+                setattr(enum_class, '__cmp__', getattr(int, '__cmp__'))
+
+        elif pyver < 3.0:
+
+            if issubclass(enum_class, int):
+                for method in (
+                        '__le__',
+                        '__lt__',
+                        '__gt__',
+                        '__ge__',
+                        '__eq__',
+                        '__ne__',
+                        '__hash__',
+                        ):
+                    setattr(enum_class, method, getattr(int, method))
+
+        # replace any other __new__ with our own (as long as Enum is not None,
+        # anyway) -- again, this is to support pickle
+        if Enum is not None:
+            # if the user defined their own __new__, save it before it gets
+            # clobbered in case they subclass later
+            if save_new:
+                setattr(enum_class, '__member_new__', enum_class.__dict__['__new__'])
+            setattr(enum_class, '__new__', Enum.__dict__['__new__'])
+        return enum_class
+
+    def __call__(cls, value, names=None, module=None, type=None):
+        """Either returns an existing member, or creates a new enum class.
+
+        This method is used both when an enum class is given a value to match
+        to an enumeration member (i.e. Color(3)) and for the functional API
+        (i.e. Color = Enum('Color', names='red green blue')).
+
+        When used for the functional API: `module`, if set, will be stored in
+        the new class' __module__ attribute; `type`, if set, will be mixed in
+        as the first base class.
+
+        Note: if `module` is not set this routine will attempt to discover the
+        calling module by walking the frame stack; if this is unsuccessful
+        the resulting class will not be pickleable.
+
+        """
+        if names is None:  # simple value lookup
+            return cls.__new__(cls, value)
+        # otherwise, functional API: we're creating a new Enum type
+        return cls._create_(value, names, module=module, type=type)
+
+    def __contains__(cls, member):
+        return isinstance(member, cls) and member.name in cls._member_map_
+
+    def __delattr__(cls, attr):
+        # nicer error message when someone tries to delete an attribute
+        # (see issue19025).
+        if attr in cls._member_map_:
+            raise AttributeError(
+                    "%s: cannot delete Enum member." % cls.__name__)
+        super(EnumMeta, cls).__delattr__(attr)
+
+    def __dir__(self):
+        return (['__class__', '__doc__', '__members__', '__module__'] +
+                self._member_names_)
+
+    @property
+    def __members__(cls):
+        """Returns a mapping of member name->value.
+
+        This mapping lists all enum members, including aliases. Note that this
+        is a copy of the internal mapping.
+
+        """
+        return cls._member_map_.copy()
+
+    def __getattr__(cls, name):
+        """Return the enum member matching `name`
+
+        We use __getattr__ instead of descriptors or inserting into the enum
+        class' __dict__ in order to support `name` and `value` being both
+        properties for enum members (which live in the class' __dict__) and
+        enum members themselves.
+
+        """
+        if _is_dunder(name):
+            raise AttributeError(name)
+        try:
+            return cls._member_map_[name]
+        except KeyError:
+            raise AttributeError(name)
+
+    def __getitem__(cls, name):
+        return cls._member_map_[name]
+
+    def __iter__(cls):
+        return (cls._member_map_[name] for name in cls._member_names_)
+
+    def __reversed__(cls):
+        return (cls._member_map_[name] for name in reversed(cls._member_names_))
+
+    def __len__(cls):
+        return len(cls._member_names_)
+
+    def __repr__(cls):
+        return "<enum %r>" % cls.__name__
+
+    def __setattr__(cls, name, value):
+        """Block attempts to reassign Enum members.
+
+        A simple assignment to the class namespace only changes one of the
+        several possible ways to get an Enum member from the Enum class,
+        resulting in an inconsistent Enumeration.
+
+        """
+        member_map = cls.__dict__.get('_member_map_', {})
+        if name in member_map:
+            raise AttributeError('Cannot reassign members.')
+        super(EnumMeta, cls).__setattr__(name, value)
+
+    def _create_(cls, class_name, names=None, module=None, type=None):
+        """Convenience method to create a new Enum class.
+
+        `names` can be:
+
+        * A string containing member names, separated either with spaces or
+          commas.  Values are auto-numbered from 1.
+        * An iterable of member names.  Values are auto-numbered from 1.
+        * An iterable of (member name, value) pairs.
+        * A mapping of member name -> value.
+
+        """
+        if pyver < 3.0:
+            # if class_name is unicode, attempt a conversion to ASCII
+            if isinstance(class_name, unicode):
+                try:
+                    class_name = class_name.encode('ascii')
+                except UnicodeEncodeError:
+                    raise TypeError('%r is not representable in ASCII' % class_name)
+        metacls = cls.__class__
+        if type is None:
+            bases = (cls, )
+        else:
+            bases = (type, cls)
+        classdict = metacls.__prepare__(class_name, bases)
+        __order__ = []
+
+        # special processing needed for names?
+        if isinstance(names, basestring):
+            names = names.replace(',', ' ').split()
+        if isinstance(names, (tuple, list)) and isinstance(names[0], basestring):
+            names = [(e, i+1) for (i, e) in enumerate(names)]
+
+        # Here, names is either an iterable of (name, value) or a mapping.
+        for item in names:
+            if isinstance(item, basestring):
+                member_name, member_value = item, names[item]
+            else:
+                member_name, member_value = item
+            classdict[member_name] = member_value
+            __order__.append(member_name)
+        # only set __order__ in classdict if name/value was not from a mapping
+        if not isinstance(item, basestring):
+            classdict['__order__'] = ' '.join(__order__)
+        enum_class = metacls.__new__(metacls, class_name, bases, classdict)
+
+        # TODO: replace the frame hack if a blessed way to know the calling
+        # module is ever developed
+        if module is None:
+            try:
+                module = _sys._getframe(2).f_globals['__name__']
+            except (AttributeError, ValueError):
+                pass
+        if module is None:
+            _make_class_unpicklable(enum_class)
+        else:
+            enum_class.__module__ = module
+
+        return enum_class
+
+    @staticmethod
+    def _get_mixins_(bases):
+        """Returns the type for creating enum members, and the first inherited
+        enum class.
+
+        bases: the tuple of bases that was given to __new__
+
+        """
+        if not bases or Enum is None:
+            return object, Enum
+        
+
+        # double check that we are not subclassing a class with existing
+        # enumeration members; while we're at it, see if any other data
+        # type has been mixed in so we can use the correct __new__
+        member_type = first_enum = None
+        for base in bases:
+            if  (base is not Enum and
+                    issubclass(base, Enum) and
+                    base._member_names_):
+                raise TypeError("Cannot extend enumerations")
+        # base is now the last base in bases
+        if not issubclass(base, Enum):
+            raise TypeError("new enumerations must be created as "
+                    "`ClassName([mixin_type,] enum_type)`")
+
+        # get correct mix-in type (either mix-in type of Enum subclass, or
+        # first base if last base is Enum)
+        if not issubclass(bases[0], Enum):
+            member_type = bases[0]     # first data type
+            first_enum = bases[-1]  # enum type
+        else:
+            for base in bases[0].__mro__:
+                # most common: (IntEnum, int, Enum, object)
+                # possible:    (<Enum 'AutoIntEnum'>, <Enum 'IntEnum'>,
+                #               <class 'int'>, <Enum 'Enum'>,
+                #               <class 'object'>)
+                if issubclass(base, Enum):
+                    if first_enum is None:
+                        first_enum = base
+                else:
+                    if member_type is None:
+                        member_type = base
+
+        return member_type, first_enum
+
+    if pyver < 3.0:
+        @staticmethod
+        def _find_new_(classdict, member_type, first_enum):
+            """Returns the __new__ to be used for creating the enum members.
+
+            classdict: the class dictionary given to __new__
+            member_type: the data type whose __new__ will be used by default
+            first_enum: enumeration to check for an overriding __new__
+
+            """
+            # now find the correct __new__, checking to see of one was defined
+            # by the user; also check earlier enum classes in case a __new__ was
+            # saved as __member_new__
+            __new__ = classdict.get('__new__', None)
+            if __new__:
+                return None, True, True      # __new__, save_new, use_args
+
+            N__new__ = getattr(None, '__new__')
+            O__new__ = getattr(object, '__new__')
+            if Enum is None:
+                E__new__ = N__new__
+            else:
+                E__new__ = Enum.__dict__['__new__']
+            # check all possibles for __member_new__ before falling back to
+            # __new__
+            for method in ('__member_new__', '__new__'):
+                for possible in (member_type, first_enum):
+                    try:
+                        target = possible.__dict__[method]
+                    except (AttributeError, KeyError):
+                        target = getattr(possible, method, None)
+                    if target not in [
+                            None,
+                            N__new__,
+                            O__new__,
+                            E__new__,
+                            ]:
+                        if method == '__member_new__':
+                            classdict['__new__'] = target
+                            return None, False, True
+                        if isinstance(target, staticmethod):
+                            target = target.__get__(member_type)
+                        __new__ = target
+                        break
+                if __new__ is not None:
+                    break
+            else:
+                __new__ = object.__new__
+
+            # if a non-object.__new__ is used then whatever value/tuple was
+            # assigned to the enum member name will be passed to __new__ and to the
+            # new enum member's __init__
+            if __new__ is object.__new__:
+                use_args = False
+            else:
+                use_args = True
+
+            return __new__, False, use_args
+    else:
+        @staticmethod
+        def _find_new_(classdict, member_type, first_enum):
+            """Returns the __new__ to be used for creating the enum members.
+
+            classdict: the class dictionary given to __new__
+            member_type: the data type whose __new__ will be used by default
+            first_enum: enumeration to check for an overriding __new__
+
+            """
+            # now find the correct __new__, checking to see of one was defined
+            # by the user; also check earlier enum classes in case a __new__ was
+            # saved as __member_new__
+            __new__ = classdict.get('__new__', None)
+
+            # should __new__ be saved as __member_new__ later?
+            save_new = __new__ is not None
+
+            if __new__ is None:
+                # check all possibles for __member_new__ before falling back to
+                # __new__
+                for method in ('__member_new__', '__new__'):
+                    for possible in (member_type, first_enum):
+                        target = getattr(possible, method, None)
+                        if target not in (
+                                None,
+                                None.__new__,
+                                object.__new__,
+                                Enum.__new__,
+                                ):
+                            __new__ = target
+                            break
+                    if __new__ is not None:
+                        break
+                else:
+                    __new__ = object.__new__
+
+            # if a non-object.__new__ is used then whatever value/tuple was
+            # assigned to the enum member name will be passed to __new__ and to the
+            # new enum member's __init__
+            if __new__ is object.__new__:
+                use_args = False
+            else:
+                use_args = True
+
+            return __new__, save_new, use_args
+
+
+########################################################
+# In order to support Python 2 and 3 with a single
+# codebase we have to create the Enum methods separately
+# and then use the `type(name, bases, dict)` method to
+# create the class.
+########################################################
+temp_enum_dict = {}
+temp_enum_dict['__doc__'] = "Generic enumeration.\n\n    Derive from this class to define new enumerations.\n\n"
+
+def __new__(cls, value):
+    # all enum instances are actually created during class construction
+    # without calling this method; this method is called by the metaclass'
+    # __call__ (i.e. Color(3) ), and by pickle
+    if type(value) is cls:
+        # For lookups like Color(Color.red)
+        value = value.value
+        #return value
+    # by-value search for a matching enum member
+    # see if it's in the reverse mapping (for hashable values)
+    try:
+        if value in cls._value2member_map_:
+            return cls._value2member_map_[value]
+    except TypeError:
+        # not there, now do long search -- O(n) behavior
+        for member in cls._member_map_.values():
+            if member.value == value:
+                return member
+    raise ValueError("%s is not a valid %s" % (value, cls.__name__))
+temp_enum_dict['__new__'] = __new__
+del __new__
+
+def __repr__(self):
+    return "<%s.%s: %r>" % (
+            self.__class__.__name__, self._name_, self._value_)
+temp_enum_dict['__repr__'] = __repr__
+del __repr__
+
+def __str__(self):
+    return "%s.%s" % (self.__class__.__name__, self._name_)
+temp_enum_dict['__str__'] = __str__
+del __str__
+
+def __dir__(self):
+    added_behavior = [
+            m
+            for cls in self.__class__.mro()
+            for m in cls.__dict__
+            if m[0] != '_'
+            ]
+    return (['__class__', '__doc__', '__module__', ] + added_behavior)
+temp_enum_dict['__dir__'] = __dir__
+del __dir__
+
+def __format__(self, format_spec):
+    # mixed-in Enums should use the mixed-in type's __format__, otherwise
+    # we can get strange results with the Enum name showing up instead of
+    # the value
+
+    # pure Enum branch
+    if self._member_type_ is object:
+        cls = str
+        val = str(self)
+    # mix-in branch
+    else:
+        cls = self._member_type_
+        val = self.value
+    return cls.__format__(val, format_spec)
+temp_enum_dict['__format__'] = __format__
+del __format__
+
+
+####################################
+# Python's less than 2.6 use __cmp__
+
+if pyver < 2.6:
+
+    def __cmp__(self, other):
+        if type(other) is self.__class__:
+            if self is other:
+                return 0
+            return -1
+        return NotImplemented
+        raise TypeError("unorderable types: %s() and %s()" % (self.__class__.__name__, other.__class__.__name__))
+    temp_enum_dict['__cmp__'] = __cmp__
+    del __cmp__
+
+else:
+
+    def __le__(self, other):
+        raise TypeError("unorderable types: %s() <= %s()" % (self.__class__.__name__, other.__class__.__name__))
+    temp_enum_dict['__le__'] = __le__
+    del __le__
+
+    def __lt__(self, other):
+        raise TypeError("unorderable types: %s() < %s()" % (self.__class__.__name__, other.__class__.__name__))
+    temp_enum_dict['__lt__'] = __lt__
+    del __lt__
+
+    def __ge__(self, other):
+        raise TypeError("unorderable types: %s() >= %s()" % (self.__class__.__name__, other.__class__.__name__))
+    temp_enum_dict['__ge__'] = __ge__
+    del __ge__
+
+    def __gt__(self, other):
+        raise TypeError("unorderable types: %s() > %s()" % (self.__class__.__name__, other.__class__.__name__))
+    temp_enum_dict['__gt__'] = __gt__
+    del __gt__
+    
+
+def __eq__(self, other):
+    if type(other) is self.__class__:
+        return self is other
+    return NotImplemented
+temp_enum_dict['__eq__'] = __eq__
+del __eq__
+
+def __ne__(self, other):
+    if type(other) is self.__class__:
+        return self is not other
+    return NotImplemented
+temp_enum_dict['__ne__'] = __ne__
+del __ne__
+
+def __hash__(self):
+    return hash(self._name_)
+temp_enum_dict['__hash__'] = __hash__
+del __hash__
+
+def __reduce_ex__(self, proto):
+    return self.__class__, (self._value_, )
+temp_enum_dict['__reduce_ex__'] = __reduce_ex__
+del __reduce_ex__
+
+# _RouteClassAttributeToGetattr is used to provide access to the `name`
+# and `value` properties of enum members while keeping some measure of
+# protection from modification, while still allowing for an enumeration
+# to have members named `name` and `value`.  This works because enumeration
+# members are not set directly on the enum class -- __getattr__ is
+# used to look them up.
+
+@_RouteClassAttributeToGetattr
+def name(self):
+    return self._name_
+temp_enum_dict['name'] = name
+del name
+
+@_RouteClassAttributeToGetattr
+def value(self):
+    return self._value_
+temp_enum_dict['value'] = value
+del value
+
+Enum = EnumMeta('Enum', (object, ), temp_enum_dict)
+del temp_enum_dict
+
+# Enum has now been created
+###########################
+
+class IntEnum(int, Enum):
+    """Enum where members are also (and must be) ints"""
+
+
+def unique(enumeration):
+    """Class decorator that ensures only unique members exist in an enumeration."""
+    duplicates = []
+    for name, member in enumeration.__members__.items():
+        if name != member.name:
+            duplicates.append((name, member.name))
+    if duplicates:
+        duplicate_names = ', '.join(
+                ["%s -> %s" % (alias, name) for (alias, name) in duplicates]
+                )
+        raise ValueError('duplicate names found in %r: %s' %
+                (enumeration, duplicate_names)
+                )
+    return enumeration
diff --git a/lib/enum/doc/enum.rst b/lib/enum/doc/enum.rst
new file mode 100644
index 00000000..0d429bfc
--- /dev/null
+++ b/lib/enum/doc/enum.rst
@@ -0,0 +1,725 @@
+``enum`` --- support for enumerations
+========================================
+
+.. :synopsis: enumerations are sets of symbolic names bound to unique, constant
+  values.
+.. :moduleauthor:: Ethan Furman <ethan@stoneleaf.us>
+.. :sectionauthor:: Barry Warsaw <barry@python.org>,
+.. :sectionauthor:: Eli Bendersky <eliben@gmail.com>,
+.. :sectionauthor:: Ethan Furman <ethan@stoneleaf.us>
+
+----------------
+
+An enumeration is a set of symbolic names (members) bound to unique, constant
+values.  Within an enumeration, the members can be compared by identity, and
+the enumeration itself can be iterated over.
+
+
+Module Contents
+---------------
+
+This module defines two enumeration classes that can be used to define unique
+sets of names and values: ``Enum`` and ``IntEnum``.  It also defines
+one decorator, ``unique``.
+
+``Enum``
+
+Base class for creating enumerated constants.  See section `Functional API`_
+for an alternate construction syntax.
+
+``IntEnum``
+
+Base class for creating enumerated constants that are also subclasses of ``int``.
+
+``unique``
+
+Enum class decorator that ensures only one name is bound to any one value.
+
+
+Creating an Enum
+----------------
+
+Enumerations are created using the ``class`` syntax, which makes them
+easy to read and write.  An alternative creation method is described in
+`Functional API`_.  To define an enumeration, subclass ``Enum`` as
+follows::
+
+    >>> from enum import Enum
+    >>> class Color(Enum):
+    ...     red = 1
+    ...     green = 2
+    ...     blue = 3
+
+Note: Nomenclature
+
+  - The class ``Color`` is an *enumeration* (or *enum*)
+  - The attributes ``Color.red``, ``Color.green``, etc., are
+    *enumeration members* (or *enum members*).
+  - The enum members have *names* and *values* (the name of
+    ``Color.red`` is ``red``, the value of ``Color.blue`` is
+    ``3``, etc.)
+    
+Note:
+
+    Even though we use the ``class`` syntax to create Enums, Enums
+    are not normal Python classes.  See `How are Enums different?`_ for
+    more details.
+
+Enumeration members have human readable string representations::
+
+    >>> print(Color.red)
+    Color.red
+
+...while their ``repr`` has more information::
+
+    >>> print(repr(Color.red))
+    <Color.red: 1>
+
+The *type* of an enumeration member is the enumeration it belongs to::
+
+    >>> type(Color.red)
+    <enum 'Color'>
+    >>> isinstance(Color.green, Color)
+    True
+    >>>
+
+Enum members also have a property that contains just their item name::
+
+    >>> print(Color.red.name)
+    red
+
+Enumerations support iteration.  In Python 3.x definition order is used; in
+Python 2.x the definition order is not available, but class attribute
+``__order__`` is supported;  otherwise, value order is used::
+
+    >>> class Shake(Enum):
+    ...   __order__ = 'vanilla chocolate cookies mint'  # only needed in 2.x
+    ...   vanilla = 7
+    ...   chocolate = 4
+    ...   cookies = 9
+    ...   mint = 3
+    ...
+    >>> for shake in Shake:
+    ...   print(shake)
+    ...
+    Shake.vanilla
+    Shake.chocolate
+    Shake.cookies
+    Shake.mint
+
+The ``__order__`` attribute is always removed, and in 3.x it is also ignored
+(order is definition order); however, in the stdlib version it will be ignored
+but not removed.
+
+Enumeration members are hashable, so they can be used in dictionaries and sets::
+
+    >>> apples = {}
+    >>> apples[Color.red] = 'red delicious'
+    >>> apples[Color.green] = 'granny smith'
+    >>> apples == {Color.red: 'red delicious', Color.green: 'granny smith'}
+    True
+
+
+Programmatic access to enumeration members and their attributes
+---------------------------------------------------------------
+
+Sometimes it's useful to access members in enumerations programmatically (i.e.
+situations where ``Color.red`` won't do because the exact color is not known
+at program-writing time).  ``Enum`` allows such access::
+
+    >>> Color(1)
+    <Color.red: 1>
+    >>> Color(3)
+    <Color.blue: 3>
+
+If you want to access enum members by *name*, use item access::
+
+    >>> Color['red']
+    <Color.red: 1>
+    >>> Color['green']
+    <Color.green: 2>
+
+If have an enum member and need its ``name`` or ``value``::
+
+    >>> member = Color.red
+    >>> member.name
+    'red'
+    >>> member.value
+    1
+
+
+Duplicating enum members and values
+-----------------------------------
+
+Having two enum members (or any other attribute) with the same name is invalid;
+in Python 3.x this would raise an error, but in Python 2.x the second member
+simply overwrites the first::
+
+    >>> # python 2.x
+    >>> class Shape(Enum):
+    ...   square = 2
+    ...   square = 3
+    ...
+    >>> Shape.square
+    <Shape.square: 3>
+
+    >>> # python 3.x
+    >>> class Shape(Enum):
+    ...   square = 2
+    ...   square = 3
+    Traceback (most recent call last):
+    ...
+    TypeError: Attempted to reuse key: 'square'
+
+However, two enum members are allowed to have the same value.  Given two members
+A and B with the same value (and A defined first), B is an alias to A.  By-value
+lookup of the value of A and B will return A.  By-name lookup of B will also
+return A::
+
+    >>> class Shape(Enum):
+    ...   __order__ = 'square diamond circle alias_for_square'  # only needed in 2.x
+    ...   square = 2
+    ...   diamond = 1
+    ...   circle = 3
+    ...   alias_for_square = 2
+    ...
+    >>> Shape.square
+    <Shape.square: 2>
+    >>> Shape.alias_for_square
+    <Shape.square: 2>
+    >>> Shape(2)
+    <Shape.square: 2>
+
+
+Allowing aliases is not always desirable.  ``unique`` can be used to ensure
+that none exist in a particular enumeration::
+
+    >>> from enum import unique
+    >>> @unique
+    ... class Mistake(Enum):
+    ...   __order__ = 'one two three four'  # only needed in 2.x
+    ...   one = 1
+    ...   two = 2
+    ...   three = 3
+    ...   four = 3
+    Traceback (most recent call last):
+    ...
+    ValueError: duplicate names found in <enum 'Mistake'>: four -> three
+
+Iterating over the members of an enum does not provide the aliases::
+
+    >>> list(Shape)
+    [<Shape.square: 2>, <Shape.diamond: 1>, <Shape.circle: 3>]
+
+The special attribute ``__members__`` is a dictionary mapping names to members.
+It includes all names defined in the enumeration, including the aliases::
+
+    >>> for name, member in sorted(Shape.__members__.items()):
+    ...   name, member
+    ...
+    ('alias_for_square', <Shape.square: 2>)
+    ('circle', <Shape.circle: 3>)
+    ('diamond', <Shape.diamond: 1>)
+    ('square', <Shape.square: 2>)
+
+The ``__members__`` attribute can be used for detailed programmatic access to
+the enumeration members.  For example, finding all the aliases::
+
+    >>> [name for name, member in Shape.__members__.items() if member.name != name]
+    ['alias_for_square']
+
+Comparisons
+-----------
+
+Enumeration members are compared by identity::
+
+    >>> Color.red is Color.red
+    True
+    >>> Color.red is Color.blue
+    False
+    >>> Color.red is not Color.blue
+    True
+
+Ordered comparisons between enumeration values are *not* supported.  Enum
+members are not integers (but see `IntEnum`_ below)::
+
+    >>> Color.red < Color.blue
+    Traceback (most recent call last):
+      File "<stdin>", line 1, in <module>
+    TypeError: unorderable types: Color() < Color()
+
+.. warning::
+
+    In Python 2 *everything* is ordered, even though the ordering may not
+    make sense.  If you want your enumerations to have a sensible ordering
+    check out the `OrderedEnum`_ recipe below.
+
+
+Equality comparisons are defined though::
+
+    >>> Color.blue == Color.red
+    False
+    >>> Color.blue != Color.red
+    True
+    >>> Color.blue == Color.blue
+    True
+
+Comparisons against non-enumeration values will always compare not equal
+(again, ``IntEnum`` was explicitly designed to behave differently, see
+below)::
+
+    >>> Color.blue == 2
+    False
+
+
+Allowed members and attributes of enumerations
+----------------------------------------------
+
+The examples above use integers for enumeration values.  Using integers is
+short and handy (and provided by default by the `Functional API`_), but not
+strictly enforced.  In the vast majority of use-cases, one doesn't care what
+the actual value of an enumeration is.  But if the value *is* important,
+enumerations can have arbitrary values.
+
+Enumerations are Python classes, and can have methods and special methods as
+usual.  If we have this enumeration::
+
+    >>> class Mood(Enum):
+    ...   funky = 1
+    ...   happy = 3
+    ... 
+    ...   def describe(self):
+    ...     # self is the member here
+    ...     return self.name, self.value
+    ... 
+    ...   def __str__(self):
+    ...     return 'my custom str! {0}'.format(self.value)
+    ... 
+    ...   @classmethod
+    ...   def favorite_mood(cls):
+    ...     # cls here is the enumeration
+    ...     return cls.happy
+
+Then::
+
+    >>> Mood.favorite_mood()
+    <Mood.happy: 3>
+    >>> Mood.happy.describe()
+    ('happy', 3)
+    >>> str(Mood.funky)
+    'my custom str! 1'
+
+The rules for what is allowed are as follows: _sunder_ names (starting and
+ending with a single underscore) are reserved by enum and cannot be used;
+all other attributes defined within an enumeration will become members of this
+enumeration, with the exception of *__dunder__* names and descriptors (methods
+are also descriptors).
+
+Note:
+
+    If your enumeration defines ``__new__`` and/or ``__init__`` then
+    whatever value(s) were given to the enum member will be passed into
+    those methods.  See `Planet`_ for an example.
+
+
+Restricted subclassing of enumerations
+--------------------------------------
+
+Subclassing an enumeration is allowed only if the enumeration does not define
+any members.  So this is forbidden::
+
+    >>> class MoreColor(Color):
+    ...   pink = 17
+    Traceback (most recent call last):
+    ...
+    TypeError: Cannot extend enumerations
+
+But this is allowed::
+
+    >>> class Foo(Enum):
+    ...   def some_behavior(self):
+    ...     pass
+    ...
+    >>> class Bar(Foo):
+    ...   happy = 1
+    ...   sad = 2
+    ...
+
+Allowing subclassing of enums that define members would lead to a violation of
+some important invariants of types and instances.  On the other hand, it makes
+sense to allow sharing some common behavior between a group of enumerations.
+(See `OrderedEnum`_ for an example.)
+
+
+Pickling
+--------
+
+Enumerations can be pickled and unpickled::
+
+    >>> from enum.test_enum import Fruit
+    >>> from pickle import dumps, loads
+    >>> Fruit.tomato is loads(dumps(Fruit.tomato, 2))
+    True
+
+The usual restrictions for pickling apply: picklable enums must be defined in
+the top level of a module, since unpickling requires them to be importable
+from that module.
+
+Note:
+
+    With pickle protocol version 4 (introduced in Python 3.4) it is possible
+    to easily pickle enums nested in other classes.
+
+
+
+Functional API
+--------------
+
+The ``Enum`` class is callable, providing the following functional API::
+
+    >>> Animal = Enum('Animal', 'ant bee cat dog')
+    >>> Animal
+    <enum 'Animal'>
+    >>> Animal.ant
+    <Animal.ant: 1>
+    >>> Animal.ant.value
+    1
+    >>> list(Animal)
+    [<Animal.ant: 1>, <Animal.bee: 2>, <Animal.cat: 3>, <Animal.dog: 4>]
+
+The semantics of this API resemble ``namedtuple``. The first argument
+of the call to ``Enum`` is the name of the enumeration. 
+
+The second argument is the *source* of enumeration member names.  It can be a
+whitespace-separated string of names, a sequence of names, a sequence of
+2-tuples with key/value pairs, or a mapping (e.g. dictionary) of names to
+values.  The last two options enable assigning arbitrary values to
+enumerations; the others auto-assign increasing integers starting with 1.  A
+new class derived from ``Enum`` is returned.  In other words, the above
+assignment to ``Animal`` is equivalent to::
+
+    >>> class Animals(Enum):
+    ...   ant = 1
+    ...   bee = 2
+    ...   cat = 3
+    ...   dog = 4
+
+Pickling enums created with the functional API can be tricky as frame stack
+implementation details are used to try and figure out which module the
+enumeration is being created in (e.g. it will fail if you use a utility
+function in separate module, and also may not work on IronPython or Jython).
+The solution is to specify the module name explicitly as follows::
+
+    >>> Animals = Enum('Animals', 'ant bee cat dog', module=__name__)
+
+Derived Enumerations
+--------------------
+
+IntEnum
+^^^^^^^
+
+A variation of ``Enum`` is provided which is also a subclass of
+``int``.  Members of an ``IntEnum`` can be compared to integers;
+by extension, integer enumerations of different types can also be compared
+to each other::
+
+    >>> from enum import IntEnum
+    >>> class Shape(IntEnum):
+    ...   circle = 1
+    ...   square = 2
+    ...
+    >>> class Request(IntEnum):
+    ...   post = 1
+    ...   get = 2
+    ...
+    >>> Shape == 1
+    False
+    >>> Shape.circle == 1
+    True
+    >>> Shape.circle == Request.post
+    True
+
+However, they still can't be compared to standard ``Enum`` enumerations::
+
+    >>> class Shape(IntEnum):
+    ...   circle = 1
+    ...   square = 2
+    ...
+    >>> class Color(Enum):
+    ...   red = 1
+    ...   green = 2
+    ...
+    >>> Shape.circle == Color.red
+    False
+
+``IntEnum`` values behave like integers in other ways you'd expect::
+
+    >>> int(Shape.circle)
+    1
+    >>> ['a', 'b', 'c'][Shape.circle]
+    'b'
+    >>> [i for i in range(Shape.square)]
+    [0, 1]
+
+For the vast majority of code, ``Enum`` is strongly recommended,
+since ``IntEnum`` breaks some semantic promises of an enumeration (by
+being comparable to integers, and thus by transitivity to other
+unrelated enumerations).  It should be used only in special cases where
+there's no other choice; for example, when integer constants are
+replaced with enumerations and backwards compatibility is required with code
+that still expects integers.
+
+
+Others
+^^^^^^
+
+While ``IntEnum`` is part of the ``enum`` module, it would be very
+simple to implement independently::
+
+    class IntEnum(int, Enum):
+        pass
+
+This demonstrates how similar derived enumerations can be defined; for example
+a ``StrEnum`` that mixes in ``str`` instead of ``int``.
+
+Some rules:
+
+1. When subclassing ``Enum``, mix-in types must appear before
+   ``Enum`` itself in the sequence of bases, as in the ``IntEnum``
+   example above.
+2. While ``Enum`` can have members of any type, once you mix in an
+   additional type, all the members must have values of that type, e.g.
+   ``int`` above.  This restriction does not apply to mix-ins which only
+   add methods and don't specify another data type such as ``int`` or
+   ``str``.
+3. When another data type is mixed in, the ``value`` attribute is *not the
+   same* as the enum member itself, although it is equivalant and will compare
+   equal.
+4. %-style formatting:  ``%s`` and ``%r`` call ``Enum``'s ``__str__`` and
+   ``__repr__`` respectively; other codes (such as ``%i`` or ``%h`` for
+   IntEnum) treat the enum member as its mixed-in type.
+
+   Note: Prior to Python 3.4 there is a bug in ``str``'s %-formatting: ``int``
+   subclasses are printed as strings and not numbers when the ``%d``, ``%i``,
+   or ``%u`` codes are used.
+5. ``str.__format__`` (or ``format``) will use the mixed-in
+   type's ``__format__``.  If the ``Enum``'s ``str`` or
+   ``repr`` is desired use the ``!s`` or ``!r`` ``str`` format codes.
+
+
+Decorators
+----------
+
+unique
+^^^^^^
+
+A ``class`` decorator specifically for enumerations.  It searches an
+enumeration's ``__members__`` gathering any aliases it finds; if any are
+found ``ValueError`` is raised with the details::
+
+    >>> @unique
+    ... class NoDupes(Enum):
+    ...    first = 'one'
+    ...    second = 'two'
+    ...    third = 'two'
+    Traceback (most recent call last):
+    ...
+    ValueError: duplicate names found in <enum 'NoDupes'>: third -> second
+
+
+Interesting examples
+--------------------
+
+While ``Enum`` and ``IntEnum`` are expected to cover the majority of
+use-cases, they cannot cover them all.  Here are recipes for some different
+types of enumerations that can be used directly, or as examples for creating
+one's own.
+
+
+AutoNumber
+^^^^^^^^^^
+
+Avoids having to specify the value for each enumeration member::
+
+    >>> class AutoNumber(Enum):
+    ...     def __new__(cls):
+    ...         value = len(cls.__members__) + 1
+    ...         obj = object.__new__(cls)
+    ...         obj._value_ = value
+    ...         return obj
+    ...
+    >>> class Color(AutoNumber):
+    ...     __order__ = "red green blue"  # only needed in 2.x
+    ...     red = ()
+    ...     green = ()
+    ...     blue = ()
+    ...
+    >>> Color.green.value == 2
+    True
+
+Note:
+
+    The `__new__` method, if defined, is used during creation of the Enum
+    members; it is then replaced by Enum's `__new__` which is used after
+    class creation for lookup of existing members.  Due to the way Enums are
+    supposed to behave, there is no way to customize Enum's `__new__`.
+
+
+UniqueEnum
+^^^^^^^^^^
+
+Raises an error if a duplicate member name is found instead of creating an
+alias::
+
+    >>> class UniqueEnum(Enum):
+    ...     def __init__(self, *args):
+    ...         cls = self.__class__
+    ...         if any(self.value == e.value for e in cls):
+    ...             a = self.name
+    ...             e = cls(self.value).name
+    ...             raise ValueError(
+    ...                     "aliases not allowed in UniqueEnum:  %r --> %r"
+    ...                     % (a, e))
+    ... 
+    >>> class Color(UniqueEnum):
+    ...     red = 1
+    ...     green = 2
+    ...     blue = 3
+    ...     grene = 2
+    Traceback (most recent call last):
+    ...
+    ValueError: aliases not allowed in UniqueEnum:  'grene' --> 'green'
+    
+
+OrderedEnum
+^^^^^^^^^^^
+
+An ordered enumeration that is not based on ``IntEnum`` and so maintains
+the normal ``Enum`` invariants (such as not being comparable to other
+enumerations)::
+
+    >>> class OrderedEnum(Enum):
+    ...     def __ge__(self, other):
+    ...         if self.__class__ is other.__class__:
+    ...             return self._value_ >= other._value_
+    ...         return NotImplemented
+    ...     def __gt__(self, other):
+    ...         if self.__class__ is other.__class__:
+    ...             return self._value_ > other._value_
+    ...         return NotImplemented
+    ...     def __le__(self, other):
+    ...         if self.__class__ is other.__class__:
+    ...             return self._value_ <= other._value_
+    ...         return NotImplemented
+    ...     def __lt__(self, other):
+    ...         if self.__class__ is other.__class__:
+    ...             return self._value_ < other._value_
+    ...         return NotImplemented
+    ...
+    >>> class Grade(OrderedEnum):
+    ...     __ordered__ = 'A B C D F'
+    ...     A = 5
+    ...     B = 4
+    ...     C = 3
+    ...     D = 2
+    ...     F = 1
+    ...
+    >>> Grade.C < Grade.A
+    True
+
+
+Planet
+^^^^^^
+
+If ``__new__`` or ``__init__`` is defined the value of the enum member
+will be passed to those methods::
+
+    >>> class Planet(Enum):
+    ...     MERCURY = (3.303e+23, 2.4397e6)
+    ...     VENUS   = (4.869e+24, 6.0518e6)
+    ...     EARTH   = (5.976e+24, 6.37814e6)
+    ...     MARS    = (6.421e+23, 3.3972e6)
+    ...     JUPITER = (1.9e+27,   7.1492e7)
+    ...     SATURN  = (5.688e+26, 6.0268e7)
+    ...     URANUS  = (8.686e+25, 2.5559e7)
+    ...     NEPTUNE = (1.024e+26, 2.4746e7)
+    ...     def __init__(self, mass, radius):
+    ...         self.mass = mass       # in kilograms
+    ...         self.radius = radius   # in meters
+    ...     @property
+    ...     def surface_gravity(self):
+    ...         # universal gravitational constant  (m3 kg-1 s-2)
+    ...         G = 6.67300E-11
+    ...         return G * self.mass / (self.radius * self.radius)
+    ... 
+    >>> Planet.EARTH.value
+    (5.976e+24, 6378140.0)
+    >>> Planet.EARTH.surface_gravity
+    9.802652743337129
+
+
+How are Enums different?
+------------------------
+
+Enums have a custom metaclass that affects many aspects of both derived Enum
+classes and their instances (members).
+
+
+Enum Classes
+^^^^^^^^^^^^
+
+The ``EnumMeta`` metaclass is responsible for providing the
+``__contains__``, ``__dir__``, ``__iter__`` and other methods that
+allow one to do things with an ``Enum`` class that fail on a typical
+class, such as ``list(Color)`` or ``some_var in Color``.  ``EnumMeta`` is
+responsible for ensuring that various other methods on the final ``Enum``
+class are correct (such as ``__new__``, ``__getnewargs__``,
+``__str__`` and ``__repr__``)
+
+
+Enum Members (aka instances)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The most interesting thing about Enum members is that they are singletons.
+``EnumMeta`` creates them all while it is creating the ``Enum``
+class itself, and then puts a custom ``__new__`` in place to ensure
+that no new ones are ever instantiated by returning only the existing
+member instances.
+
+
+Finer Points
+^^^^^^^^^^^^
+
+Enum members are instances of an Enum class, and even though they are
+accessible as ``EnumClass.member``, they are not accessible directly from
+the member::
+
+    >>> Color.red
+    <Color.red: 1>
+    >>> Color.red.blue
+    Traceback (most recent call last):
+    ...
+    AttributeError: 'Color' object has no attribute 'blue'
+
+Likewise, ``__members__`` is only available on the class.
+
+In Python 3.x ``__members__`` is always an ``OrderedDict``, with the order being
+the definition order.  In Python 2.7 ``__members__`` is an ``OrderedDict`` if
+``__order__`` was specified, and a plain ``dict`` otherwise.  In all other Python
+2.x versions ``__members__`` is a plain ``dict`` even if ``__order__`` was specified
+as the ``OrderedDict`` type didn't exist yet.
+
+If you give your ``Enum`` subclass extra methods, like the `Planet`_
+class above, those methods will show up in a `dir` of the member,
+but not of the class::
+
+    >>> dir(Planet)
+    ['EARTH', 'JUPITER', 'MARS', 'MERCURY', 'NEPTUNE', 'SATURN', 'URANUS',
+    'VENUS', '__class__', '__doc__', '__members__', '__module__']
+    >>> dir(Planet.EARTH)
+    ['__class__', '__doc__', '__module__', 'name', 'surface_gravity', 'value']
+
+A ``__new__`` method will only be used for the creation of the
+``Enum`` members -- after that it is replaced.  This means if you wish to
+change how ``Enum`` members are looked up you either have to write a
+helper function or a ``classmethod``.
diff --git a/lib/enum/enum.py b/lib/enum/enum.py
new file mode 100644
index 00000000..6a327a8a
--- /dev/null
+++ b/lib/enum/enum.py
@@ -0,0 +1,790 @@
+"""Python Enumerations"""
+
+import sys as _sys
+
+__all__ = ['Enum', 'IntEnum', 'unique']
+
+version = 1, 0, 4
+
+pyver = float('%s.%s' % _sys.version_info[:2])
+
+try:
+    any
+except NameError:
+    def any(iterable):
+        for element in iterable:
+            if element:
+                return True
+        return False
+
+try:
+    from collections import OrderedDict
+except ImportError:
+    OrderedDict = None
+
+try:
+    basestring
+except NameError:
+    # In Python 2 basestring is the ancestor of both str and unicode
+    # in Python 3 it's just str, but was missing in 3.1
+    basestring = str
+
+try:
+    unicode
+except NameError:
+    # In Python 3 unicode no longer exists (it's just str)
+    unicode = str
+
+class _RouteClassAttributeToGetattr(object):
+    """Route attribute access on a class to __getattr__.
+
+    This is a descriptor, used to define attributes that act differently when
+    accessed through an instance and through a class.  Instance access remains
+    normal, but access to an attribute through a class will be routed to the
+    class's __getattr__ method; this is done by raising AttributeError.
+
+    """
+    def __init__(self, fget=None):
+        self.fget = fget
+
+    def __get__(self, instance, ownerclass=None):
+        if instance is None:
+            raise AttributeError()
+        return self.fget(instance)
+
+    def __set__(self, instance, value):
+        raise AttributeError("can't set attribute")
+
+    def __delete__(self, instance):
+        raise AttributeError("can't delete attribute")
+
+
+def _is_descriptor(obj):
+    """Returns True if obj is a descriptor, False otherwise."""
+    return (
+            hasattr(obj, '__get__') or
+            hasattr(obj, '__set__') or
+            hasattr(obj, '__delete__'))
+
+
+def _is_dunder(name):
+    """Returns True if a __dunder__ name, False otherwise."""
+    return (name[:2] == name[-2:] == '__' and
+            name[2:3] != '_' and
+            name[-3:-2] != '_' and
+            len(name) > 4)
+
+
+def _is_sunder(name):
+    """Returns True if a _sunder_ name, False otherwise."""
+    return (name[0] == name[-1] == '_' and 
+            name[1:2] != '_' and
+            name[-2:-1] != '_' and
+            len(name) > 2)
+
+
+def _make_class_unpicklable(cls):
+    """Make the given class un-picklable."""
+    def _break_on_call_reduce(self, protocol=None):
+        raise TypeError('%r cannot be pickled' % self)
+    cls.__reduce_ex__ = _break_on_call_reduce
+    cls.__module__ = '<unknown>'
+
+
+class _EnumDict(dict):
+    """Track enum member order and ensure member names are not reused.
+
+    EnumMeta will use the names found in self._member_names as the
+    enumeration member names.
+
+    """
+    def __init__(self):
+        super(_EnumDict, self).__init__()
+        self._member_names = []
+
+    def __setitem__(self, key, value):
+        """Changes anything not dundered or not a descriptor.
+
+        If a descriptor is added with the same name as an enum member, the name
+        is removed from _member_names (this may leave a hole in the numerical
+        sequence of values).
+
+        If an enum member name is used twice, an error is raised; duplicate
+        values are not checked for.
+
+        Single underscore (sunder) names are reserved.
+
+        Note:   in 3.x __order__ is simply discarded as a not necessary piece
+                leftover from 2.x
+
+        """
+        if pyver >= 3.0 and key == '__order__':
+                return
+        if _is_sunder(key):
+            raise ValueError('_names_ are reserved for future Enum use')
+        elif _is_dunder(key):
+            pass
+        elif key in self._member_names:
+            # descriptor overwriting an enum?
+            raise TypeError('Attempted to reuse key: %r' % key)
+        elif not _is_descriptor(value):
+            if key in self:
+                # enum overwriting a descriptor?
+                raise TypeError('Key already defined as: %r' % self[key])
+            self._member_names.append(key)
+        super(_EnumDict, self).__setitem__(key, value)
+
+
+# Dummy value for Enum as EnumMeta explicity checks for it, but of course until
+# EnumMeta finishes running the first time the Enum class doesn't exist.  This
+# is also why there are checks in EnumMeta like `if Enum is not None`
+Enum = None
+
+
+class EnumMeta(type):
+    """Metaclass for Enum"""
+    @classmethod
+    def __prepare__(metacls, cls, bases):
+        return _EnumDict()
+
+    def __new__(metacls, cls, bases, classdict):
+        # an Enum class is final once enumeration items have been defined; it
+        # cannot be mixed with other types (int, float, etc.) if it has an
+        # inherited __new__ unless a new __new__ is defined (or the resulting
+        # class will fail).
+        if type(classdict) is dict:
+            original_dict = classdict
+            classdict = _EnumDict()
+            for k, v in original_dict.items():
+                classdict[k] = v
+
+        member_type, first_enum = metacls._get_mixins_(bases)
+        __new__, save_new, use_args = metacls._find_new_(classdict, member_type,
+                                                        first_enum)
+        # save enum items into separate mapping so they don't get baked into
+        # the new class
+        members = dict((k, classdict[k]) for k in classdict._member_names)
+        for name in classdict._member_names:
+            del classdict[name]
+
+        # py2 support for definition order
+        __order__ = classdict.get('__order__')
+        if __order__ is None:
+            if pyver < 3.0:
+                try:
+                    __order__ = [name for (name, value) in sorted(members.items(), key=lambda item: item[1])]
+                except TypeError:
+                    __order__ = [name for name in sorted(members.keys())]
+            else:
+                __order__ = classdict._member_names
+        else:
+            del classdict['__order__']
+            if pyver < 3.0:
+                __order__ = __order__.replace(',', ' ').split()
+                aliases = [name for name in members if name not in __order__]
+                __order__ += aliases
+
+        # check for illegal enum names (any others?)
+        invalid_names = set(members) & set(['mro'])
+        if invalid_names:
+            raise ValueError('Invalid enum member name(s): %s' % (
+                ', '.join(invalid_names), ))
+
+        # create our new Enum type
+        enum_class = super(EnumMeta, metacls).__new__(metacls, cls, bases, classdict)
+        enum_class._member_names_ = []               # names in random order
+        if OrderedDict is not None:
+            enum_class._member_map_ = OrderedDict()
+        else:
+            enum_class._member_map_ = {}             # name->value map
+        enum_class._member_type_ = member_type
+
+        # Reverse value->name map for hashable values.
+        enum_class._value2member_map_ = {}
+
+        # instantiate them, checking for duplicates as we go
+        # we instantiate first instead of checking for duplicates first in case
+        # a custom __new__ is doing something funky with the values -- such as
+        # auto-numbering ;)
+        if __new__ is None:
+            __new__ = enum_class.__new__
+        for member_name in __order__:
+            value = members[member_name]
+            if not isinstance(value, tuple):
+                args = (value, )
+            else:
+                args = value
+            if member_type is tuple:   # special case for tuple enums
+                args = (args, )     # wrap it one more time
+            if not use_args or not args:
+                enum_member = __new__(enum_class)
+                if not hasattr(enum_member, '_value_'):
+                    enum_member._value_ = value
+            else:
+                enum_member = __new__(enum_class, *args)
+                if not hasattr(enum_member, '_value_'):
+                    enum_member._value_ = member_type(*args)
+            value = enum_member._value_
+            enum_member._name_ = member_name
+            enum_member.__objclass__ = enum_class
+            enum_member.__init__(*args)
+            # If another member with the same value was already defined, the
+            # new member becomes an alias to the existing one.
+            for name, canonical_member in enum_class._member_map_.items():
+                if canonical_member.value == enum_member._value_:
+                    enum_member = canonical_member
+                    break
+            else:
+                # Aliases don't appear in member names (only in __members__).
+                enum_class._member_names_.append(member_name)
+            enum_class._member_map_[member_name] = enum_member
+            try:
+                # This may fail if value is not hashable. We can't add the value
+                # to the map, and by-value lookups for this value will be
+                # linear.
+                enum_class._value2member_map_[value] = enum_member
+            except TypeError:
+                pass
+
+
+        # If a custom type is mixed into the Enum, and it does not know how
+        # to pickle itself, pickle.dumps will succeed but pickle.loads will
+        # fail.  Rather than have the error show up later and possibly far
+        # from the source, sabotage the pickle protocol for this class so
+        # that pickle.dumps also fails.
+        #
+        # However, if the new class implements its own __reduce_ex__, do not
+        # sabotage -- it's on them to make sure it works correctly.  We use
+        # __reduce_ex__ instead of any of the others as it is preferred by
+        # pickle over __reduce__, and it handles all pickle protocols.
+        unpicklable = False
+        if '__reduce_ex__' not in classdict:
+            if member_type is not object:
+                methods = ('__getnewargs_ex__', '__getnewargs__',
+                        '__reduce_ex__', '__reduce__')
+                if not any(m in member_type.__dict__ for m in methods):
+                    _make_class_unpicklable(enum_class)
+                    unpicklable = True
+
+
+        # double check that repr and friends are not the mixin's or various
+        # things break (such as pickle)
+        for name in ('__repr__', '__str__', '__format__', '__reduce_ex__'):
+            class_method = getattr(enum_class, name)
+            obj_method = getattr(member_type, name, None)
+            enum_method = getattr(first_enum, name, None)
+            if name not in classdict and class_method is not enum_method:
+                if name == '__reduce_ex__' and unpicklable:
+                    continue
+                setattr(enum_class, name, enum_method)
+
+        # method resolution and int's are not playing nice
+        # Python's less than 2.6 use __cmp__
+
+        if pyver < 2.6:
+
+            if issubclass(enum_class, int):
+                setattr(enum_class, '__cmp__', getattr(int, '__cmp__'))
+
+        elif pyver < 3.0:
+
+            if issubclass(enum_class, int):
+                for method in (
+                        '__le__',
+                        '__lt__',
+                        '__gt__',
+                        '__ge__',
+                        '__eq__',
+                        '__ne__',
+                        '__hash__',
+                        ):
+                    setattr(enum_class, method, getattr(int, method))
+
+        # replace any other __new__ with our own (as long as Enum is not None,
+        # anyway) -- again, this is to support pickle
+        if Enum is not None:
+            # if the user defined their own __new__, save it before it gets
+            # clobbered in case they subclass later
+            if save_new:
+                setattr(enum_class, '__member_new__', enum_class.__dict__['__new__'])
+            setattr(enum_class, '__new__', Enum.__dict__['__new__'])
+        return enum_class
+
+    def __call__(cls, value, names=None, module=None, type=None):
+        """Either returns an existing member, or creates a new enum class.
+
+        This method is used both when an enum class is given a value to match
+        to an enumeration member (i.e. Color(3)) and for the functional API
+        (i.e. Color = Enum('Color', names='red green blue')).
+
+        When used for the functional API: `module`, if set, will be stored in
+        the new class' __module__ attribute; `type`, if set, will be mixed in
+        as the first base class.
+
+        Note: if `module` is not set this routine will attempt to discover the
+        calling module by walking the frame stack; if this is unsuccessful
+        the resulting class will not be pickleable.
+
+        """
+        if names is None:  # simple value lookup
+            return cls.__new__(cls, value)
+        # otherwise, functional API: we're creating a new Enum type
+        return cls._create_(value, names, module=module, type=type)
+
+    def __contains__(cls, member):
+        return isinstance(member, cls) and member.name in cls._member_map_
+
+    def __delattr__(cls, attr):
+        # nicer error message when someone tries to delete an attribute
+        # (see issue19025).
+        if attr in cls._member_map_:
+            raise AttributeError(
+                    "%s: cannot delete Enum member." % cls.__name__)
+        super(EnumMeta, cls).__delattr__(attr)
+
+    def __dir__(self):
+        return (['__class__', '__doc__', '__members__', '__module__'] +
+                self._member_names_)
+
+    @property
+    def __members__(cls):
+        """Returns a mapping of member name->value.
+
+        This mapping lists all enum members, including aliases. Note that this
+        is a copy of the internal mapping.
+
+        """
+        return cls._member_map_.copy()
+
+    def __getattr__(cls, name):
+        """Return the enum member matching `name`
+
+        We use __getattr__ instead of descriptors or inserting into the enum
+        class' __dict__ in order to support `name` and `value` being both
+        properties for enum members (which live in the class' __dict__) and
+        enum members themselves.
+
+        """
+        if _is_dunder(name):
+            raise AttributeError(name)
+        try:
+            return cls._member_map_[name]
+        except KeyError:
+            raise AttributeError(name)
+
+    def __getitem__(cls, name):
+        return cls._member_map_[name]
+
+    def __iter__(cls):
+        return (cls._member_map_[name] for name in cls._member_names_)
+
+    def __reversed__(cls):
+        return (cls._member_map_[name] for name in reversed(cls._member_names_))
+
+    def __len__(cls):
+        return len(cls._member_names_)
+
+    def __repr__(cls):
+        return "<enum %r>" % cls.__name__
+
+    def __setattr__(cls, name, value):
+        """Block attempts to reassign Enum members.
+
+        A simple assignment to the class namespace only changes one of the
+        several possible ways to get an Enum member from the Enum class,
+        resulting in an inconsistent Enumeration.
+
+        """
+        member_map = cls.__dict__.get('_member_map_', {})
+        if name in member_map:
+            raise AttributeError('Cannot reassign members.')
+        super(EnumMeta, cls).__setattr__(name, value)
+
+    def _create_(cls, class_name, names=None, module=None, type=None):
+        """Convenience method to create a new Enum class.
+
+        `names` can be:
+
+        * A string containing member names, separated either with spaces or
+          commas.  Values are auto-numbered from 1.
+        * An iterable of member names.  Values are auto-numbered from 1.
+        * An iterable of (member name, value) pairs.
+        * A mapping of member name -> value.
+
+        """
+        if pyver < 3.0:
+            # if class_name is unicode, attempt a conversion to ASCII
+            if isinstance(class_name, unicode):
+                try:
+                    class_name = class_name.encode('ascii')
+                except UnicodeEncodeError:
+                    raise TypeError('%r is not representable in ASCII' % class_name)
+        metacls = cls.__class__
+        if type is None:
+            bases = (cls, )
+        else:
+            bases = (type, cls)
+        classdict = metacls.__prepare__(class_name, bases)
+        __order__ = []
+
+        # special processing needed for names?
+        if isinstance(names, basestring):
+            names = names.replace(',', ' ').split()
+        if isinstance(names, (tuple, list)) and isinstance(names[0], basestring):
+            names = [(e, i+1) for (i, e) in enumerate(names)]
+
+        # Here, names is either an iterable of (name, value) or a mapping.
+        for item in names:
+            if isinstance(item, basestring):
+                member_name, member_value = item, names[item]
+            else:
+                member_name, member_value = item
+            classdict[member_name] = member_value
+            __order__.append(member_name)
+        # only set __order__ in classdict if name/value was not from a mapping
+        if not isinstance(item, basestring):
+            classdict['__order__'] = ' '.join(__order__)
+        enum_class = metacls.__new__(metacls, class_name, bases, classdict)
+
+        # TODO: replace the frame hack if a blessed way to know the calling
+        # module is ever developed
+        if module is None:
+            try:
+                module = _sys._getframe(2).f_globals['__name__']
+            except (AttributeError, ValueError):
+                pass
+        if module is None:
+            _make_class_unpicklable(enum_class)
+        else:
+            enum_class.__module__ = module
+
+        return enum_class
+
+    @staticmethod
+    def _get_mixins_(bases):
+        """Returns the type for creating enum members, and the first inherited
+        enum class.
+
+        bases: the tuple of bases that was given to __new__
+
+        """
+        if not bases or Enum is None:
+            return object, Enum
+        
+
+        # double check that we are not subclassing a class with existing
+        # enumeration members; while we're at it, see if any other data
+        # type has been mixed in so we can use the correct __new__
+        member_type = first_enum = None
+        for base in bases:
+            if  (base is not Enum and
+                    issubclass(base, Enum) and
+                    base._member_names_):
+                raise TypeError("Cannot extend enumerations")
+        # base is now the last base in bases
+        if not issubclass(base, Enum):
+            raise TypeError("new enumerations must be created as "
+                    "`ClassName([mixin_type,] enum_type)`")
+
+        # get correct mix-in type (either mix-in type of Enum subclass, or
+        # first base if last base is Enum)
+        if not issubclass(bases[0], Enum):
+            member_type = bases[0]     # first data type
+            first_enum = bases[-1]  # enum type
+        else:
+            for base in bases[0].__mro__:
+                # most common: (IntEnum, int, Enum, object)
+                # possible:    (<Enum 'AutoIntEnum'>, <Enum 'IntEnum'>,
+                #               <class 'int'>, <Enum 'Enum'>,
+                #               <class 'object'>)
+                if issubclass(base, Enum):
+                    if first_enum is None:
+                        first_enum = base
+                else:
+                    if member_type is None:
+                        member_type = base
+
+        return member_type, first_enum
+
+    if pyver < 3.0:
+        @staticmethod
+        def _find_new_(classdict, member_type, first_enum):
+            """Returns the __new__ to be used for creating the enum members.
+
+            classdict: the class dictionary given to __new__
+            member_type: the data type whose __new__ will be used by default
+            first_enum: enumeration to check for an overriding __new__
+
+            """
+            # now find the correct __new__, checking to see of one was defined
+            # by the user; also check earlier enum classes in case a __new__ was
+            # saved as __member_new__
+            __new__ = classdict.get('__new__', None)
+            if __new__:
+                return None, True, True      # __new__, save_new, use_args
+
+            N__new__ = getattr(None, '__new__')
+            O__new__ = getattr(object, '__new__')
+            if Enum is None:
+                E__new__ = N__new__
+            else:
+                E__new__ = Enum.__dict__['__new__']
+            # check all possibles for __member_new__ before falling back to
+            # __new__
+            for method in ('__member_new__', '__new__'):
+                for possible in (member_type, first_enum):
+                    try:
+                        target = possible.__dict__[method]
+                    except (AttributeError, KeyError):
+                        target = getattr(possible, method, None)
+                    if target not in [
+                            None,
+                            N__new__,
+                            O__new__,
+                            E__new__,
+                            ]:
+                        if method == '__member_new__':
+                            classdict['__new__'] = target
+                            return None, False, True
+                        if isinstance(target, staticmethod):
+                            target = target.__get__(member_type)
+                        __new__ = target
+                        break
+                if __new__ is not None:
+                    break
+            else:
+                __new__ = object.__new__
+
+            # if a non-object.__new__ is used then whatever value/tuple was
+            # assigned to the enum member name will be passed to __new__ and to the
+            # new enum member's __init__
+            if __new__ is object.__new__:
+                use_args = False
+            else:
+                use_args = True
+
+            return __new__, False, use_args
+    else:
+        @staticmethod
+        def _find_new_(classdict, member_type, first_enum):
+            """Returns the __new__ to be used for creating the enum members.
+
+            classdict: the class dictionary given to __new__
+            member_type: the data type whose __new__ will be used by default
+            first_enum: enumeration to check for an overriding __new__
+
+            """
+            # now find the correct __new__, checking to see of one was defined
+            # by the user; also check earlier enum classes in case a __new__ was
+            # saved as __member_new__
+            __new__ = classdict.get('__new__', None)
+
+            # should __new__ be saved as __member_new__ later?
+            save_new = __new__ is not None
+
+            if __new__ is None:
+                # check all possibles for __member_new__ before falling back to
+                # __new__
+                for method in ('__member_new__', '__new__'):
+                    for possible in (member_type, first_enum):
+                        target = getattr(possible, method, None)
+                        if target not in (
+                                None,
+                                None.__new__,
+                                object.__new__,
+                                Enum.__new__,
+                                ):
+                            __new__ = target
+                            break
+                    if __new__ is not None:
+                        break
+                else:
+                    __new__ = object.__new__
+
+            # if a non-object.__new__ is used then whatever value/tuple was
+            # assigned to the enum member name will be passed to __new__ and to the
+            # new enum member's __init__
+            if __new__ is object.__new__:
+                use_args = False
+            else:
+                use_args = True
+
+            return __new__, save_new, use_args
+
+
+########################################################
+# In order to support Python 2 and 3 with a single
+# codebase we have to create the Enum methods separately
+# and then use the `type(name, bases, dict)` method to
+# create the class.
+########################################################
+temp_enum_dict = {}
+temp_enum_dict['__doc__'] = "Generic enumeration.\n\n    Derive from this class to define new enumerations.\n\n"
+
+def __new__(cls, value):
+    # all enum instances are actually created during class construction
+    # without calling this method; this method is called by the metaclass'
+    # __call__ (i.e. Color(3) ), and by pickle
+    if type(value) is cls:
+        # For lookups like Color(Color.red)
+        value = value.value
+        #return value
+    # by-value search for a matching enum member
+    # see if it's in the reverse mapping (for hashable values)
+    try:
+        if value in cls._value2member_map_:
+            return cls._value2member_map_[value]
+    except TypeError:
+        # not there, now do long search -- O(n) behavior
+        for member in cls._member_map_.values():
+            if member.value == value:
+                return member
+    raise ValueError("%s is not a valid %s" % (value, cls.__name__))
+temp_enum_dict['__new__'] = __new__
+del __new__
+
+def __repr__(self):
+    return "<%s.%s: %r>" % (
+            self.__class__.__name__, self._name_, self._value_)
+temp_enum_dict['__repr__'] = __repr__
+del __repr__
+
+def __str__(self):
+    return "%s.%s" % (self.__class__.__name__, self._name_)
+temp_enum_dict['__str__'] = __str__
+del __str__
+
+def __dir__(self):
+    added_behavior = [
+            m
+            for cls in self.__class__.mro()
+            for m in cls.__dict__
+            if m[0] != '_'
+            ]
+    return (['__class__', '__doc__', '__module__', ] + added_behavior)
+temp_enum_dict['__dir__'] = __dir__
+del __dir__
+
+def __format__(self, format_spec):
+    # mixed-in Enums should use the mixed-in type's __format__, otherwise
+    # we can get strange results with the Enum name showing up instead of
+    # the value
+
+    # pure Enum branch
+    if self._member_type_ is object:
+        cls = str
+        val = str(self)
+    # mix-in branch
+    else:
+        cls = self._member_type_
+        val = self.value
+    return cls.__format__(val, format_spec)
+temp_enum_dict['__format__'] = __format__
+del __format__
+
+
+####################################
+# Python's less than 2.6 use __cmp__
+
+if pyver < 2.6:
+
+    def __cmp__(self, other):
+        if type(other) is self.__class__:
+            if self is other:
+                return 0
+            return -1
+        return NotImplemented
+        raise TypeError("unorderable types: %s() and %s()" % (self.__class__.__name__, other.__class__.__name__))
+    temp_enum_dict['__cmp__'] = __cmp__
+    del __cmp__
+
+else:
+
+    def __le__(self, other):
+        raise TypeError("unorderable types: %s() <= %s()" % (self.__class__.__name__, other.__class__.__name__))
+    temp_enum_dict['__le__'] = __le__
+    del __le__
+
+    def __lt__(self, other):
+        raise TypeError("unorderable types: %s() < %s()" % (self.__class__.__name__, other.__class__.__name__))
+    temp_enum_dict['__lt__'] = __lt__
+    del __lt__
+
+    def __ge__(self, other):
+        raise TypeError("unorderable types: %s() >= %s()" % (self.__class__.__name__, other.__class__.__name__))
+    temp_enum_dict['__ge__'] = __ge__
+    del __ge__
+
+    def __gt__(self, other):
+        raise TypeError("unorderable types: %s() > %s()" % (self.__class__.__name__, other.__class__.__name__))
+    temp_enum_dict['__gt__'] = __gt__
+    del __gt__
+    
+
+def __eq__(self, other):
+    if type(other) is self.__class__:
+        return self is other
+    return NotImplemented
+temp_enum_dict['__eq__'] = __eq__
+del __eq__
+
+def __ne__(self, other):
+    if type(other) is self.__class__:
+        return self is not other
+    return NotImplemented
+temp_enum_dict['__ne__'] = __ne__
+del __ne__
+
+def __hash__(self):
+    return hash(self._name_)
+temp_enum_dict['__hash__'] = __hash__
+del __hash__
+
+def __reduce_ex__(self, proto):
+    return self.__class__, (self._value_, )
+temp_enum_dict['__reduce_ex__'] = __reduce_ex__
+del __reduce_ex__
+
+# _RouteClassAttributeToGetattr is used to provide access to the `name`
+# and `value` properties of enum members while keeping some measure of
+# protection from modification, while still allowing for an enumeration
+# to have members named `name` and `value`.  This works because enumeration
+# members are not set directly on the enum class -- __getattr__ is
+# used to look them up.
+
+@_RouteClassAttributeToGetattr
+def name(self):
+    return self._name_
+temp_enum_dict['name'] = name
+del name
+
+@_RouteClassAttributeToGetattr
+def value(self):
+    return self._value_
+temp_enum_dict['value'] = value
+del value
+
+Enum = EnumMeta('Enum', (object, ), temp_enum_dict)
+del temp_enum_dict
+
+# Enum has now been created
+###########################
+
+class IntEnum(int, Enum):
+    """Enum where members are also (and must be) ints"""
+
+
+def unique(enumeration):
+    """Class decorator that ensures only unique members exist in an enumeration."""
+    duplicates = []
+    for name, member in enumeration.__members__.items():
+        if name != member.name:
+            duplicates.append((name, member.name))
+    if duplicates:
+        duplicate_names = ', '.join(
+                ["%s -> %s" % (alias, name) for (alias, name) in duplicates]
+                )
+        raise ValueError('duplicate names found in %r: %s' %
+                (enumeration, duplicate_names)
+                )
+    return enumeration
diff --git a/lib/enum/test_enum.py b/lib/enum/test_enum.py
new file mode 100644
index 00000000..d7a97942
--- /dev/null
+++ b/lib/enum/test_enum.py
@@ -0,0 +1,1690 @@
+import enum
+import sys
+import unittest
+from enum import Enum, IntEnum, unique, EnumMeta
+from pickle import dumps, loads, PicklingError, HIGHEST_PROTOCOL
+
+pyver = float('%s.%s' % sys.version_info[:2])
+
+try:
+    any
+except NameError:
+    def any(iterable):
+        for element in iterable:
+            if element:
+                return True
+        return False
+
+try:
+    unicode
+except NameError:
+    unicode = str
+
+try:
+    from collections import OrderedDict
+except ImportError:
+    OrderedDict = None
+
+# for pickle tests
+try:
+    class Stooges(Enum):
+        LARRY = 1
+        CURLY = 2
+        MOE = 3
+except Exception:
+    Stooges = sys.exc_info()[1]
+
+try:
+    class IntStooges(int, Enum):
+        LARRY = 1
+        CURLY = 2
+        MOE = 3
+except Exception:
+    IntStooges = sys.exc_info()[1]
+
+try:
+    class FloatStooges(float, Enum):
+        LARRY = 1.39
+        CURLY = 2.72
+        MOE = 3.142596
+except Exception:
+    FloatStooges = sys.exc_info()[1]
+
+# for pickle test and subclass tests
+try:
+    class StrEnum(str, Enum):
+        'accepts only string values'
+    class Name(StrEnum):
+        BDFL = 'Guido van Rossum'
+        FLUFL = 'Barry Warsaw'
+except Exception:
+    Name = sys.exc_info()[1]
+
+try:
+    Question = Enum('Question', 'who what when where why', module=__name__)
+except Exception:
+    Question = sys.exc_info()[1]
+
+try:
+    Answer = Enum('Answer', 'him this then there because')
+except Exception:
+    Answer = sys.exc_info()[1]
+
+try:
+    Theory = Enum('Theory', 'rule law supposition', qualname='spanish_inquisition')
+except Exception:
+    Theory = sys.exc_info()[1]
+
+# for doctests
+try:
+    class Fruit(Enum):
+        tomato = 1
+        banana = 2
+        cherry = 3
+except Exception:
+    pass
+
+def test_pickle_dump_load(assertion, source, target=None,
+        protocol=(0, HIGHEST_PROTOCOL)):
+    start, stop = protocol
+    failures = []
+    for protocol in range(start, stop+1):
+        try:
+            if target is None:
+                assertion(loads(dumps(source, protocol=protocol)) is source)
+            else:
+                assertion(loads(dumps(source, protocol=protocol)), target)
+        except Exception:
+            exc, tb = sys.exc_info()[1:]
+            failures.append('%2d: %s' %(protocol, exc))
+    if failures:
+        raise ValueError('Failed with protocols: %s' % ', '.join(failures))
+
+def test_pickle_exception(assertion, exception, obj,
+        protocol=(0, HIGHEST_PROTOCOL)):
+    start, stop = protocol
+    failures = []
+    for protocol in range(start, stop+1):
+        try:
+            assertion(exception, dumps, obj, protocol=protocol)
+        except Exception:
+            exc = sys.exc_info()[1]
+            failures.append('%d: %s %s' % (protocol, exc.__class__.__name__, exc))
+    if failures:
+        raise ValueError('Failed with protocols: %s' % ', '.join(failures))
+
+
+class TestHelpers(unittest.TestCase):
+    # _is_descriptor, _is_sunder, _is_dunder
+
+    def test_is_descriptor(self):
+        class foo:
+            pass
+        for attr in ('__get__','__set__','__delete__'):
+            obj = foo()
+            self.assertFalse(enum._is_descriptor(obj))
+            setattr(obj, attr, 1)
+            self.assertTrue(enum._is_descriptor(obj))
+
+    def test_is_sunder(self):
+        for s in ('_a_', '_aa_'):
+            self.assertTrue(enum._is_sunder(s))
+
+        for s in ('a', 'a_', '_a', '__a', 'a__', '__a__', '_a__', '__a_', '_',
+                '__', '___', '____', '_____',):
+            self.assertFalse(enum._is_sunder(s))
+
+    def test_is_dunder(self):
+        for s in ('__a__', '__aa__'):
+            self.assertTrue(enum._is_dunder(s))
+        for s in ('a', 'a_', '_a', '__a', 'a__', '_a_', '_a__', '__a_', '_',
+                '__', '___', '____', '_____',):
+            self.assertFalse(enum._is_dunder(s))
+
+
+class TestEnum(unittest.TestCase):
+    def setUp(self):
+        class Season(Enum):
+            SPRING = 1
+            SUMMER = 2
+            AUTUMN = 3
+            WINTER = 4
+        self.Season = Season
+
+        class Konstants(float, Enum):
+            E = 2.7182818
+            PI = 3.1415926
+            TAU = 2 * PI
+        self.Konstants = Konstants
+
+        class Grades(IntEnum):
+            A = 5
+            B = 4
+            C = 3
+            D = 2
+            F = 0
+        self.Grades = Grades
+
+        class Directional(str, Enum):
+            EAST = 'east'
+            WEST = 'west'
+            NORTH = 'north'
+            SOUTH = 'south'
+        self.Directional = Directional
+
+        from datetime import date
+        class Holiday(date, Enum):
+            NEW_YEAR = 2013, 1, 1
+            IDES_OF_MARCH = 2013, 3, 15
+        self.Holiday = Holiday
+
+    if pyver >= 2.6:     # cannot specify custom `dir` on previous versions
+        def test_dir_on_class(self):
+            Season = self.Season
+            self.assertEqual(
+                set(dir(Season)),
+                set(['__class__', '__doc__', '__members__', '__module__',
+                    'SPRING', 'SUMMER', 'AUTUMN', 'WINTER']),
+                )
+
+        def test_dir_on_item(self):
+            Season = self.Season
+            self.assertEqual(
+                set(dir(Season.WINTER)),
+                set(['__class__', '__doc__', '__module__', 'name', 'value']),
+                )
+
+        def test_dir_on_sub_with_behavior_on_super(self):
+            # see issue22506
+            class SuperEnum(Enum):
+                def invisible(self):
+                    return "did you see me?"
+            class SubEnum(SuperEnum):
+                sample = 5
+            self.assertEqual(
+                    set(dir(SubEnum.sample)),
+                    set(['__class__', '__doc__', '__module__', 'name', 'value', 'invisible']),
+                    )
+
+    if pyver >= 2.7:    # OrderedDict first available here
+        def test_members_is_ordereddict_if_ordered(self):
+            class Ordered(Enum):
+                __order__ = 'first second third'
+                first = 'bippity'
+                second = 'boppity'
+                third = 'boo'
+            self.assertTrue(type(Ordered.__members__) is OrderedDict)
+
+        def test_members_is_ordereddict_if_not_ordered(self):
+            class Unordered(Enum):
+                this = 'that'
+                these = 'those'
+            self.assertTrue(type(Unordered.__members__) is OrderedDict)
+
+    if pyver >= 3.0:     # all objects are ordered in Python 2.x
+        def test_members_is_always_ordered(self):
+            class AlwaysOrdered(Enum):
+                first = 1
+                second = 2
+                third = 3
+            self.assertTrue(type(AlwaysOrdered.__members__) is OrderedDict)
+
+        def test_comparisons(self):
+            def bad_compare():
+                Season.SPRING > 4
+            Season = self.Season
+            self.assertNotEqual(Season.SPRING, 1)
+            self.assertRaises(TypeError, bad_compare)
+
+            class Part(Enum):
+                SPRING = 1
+                CLIP = 2
+                BARREL = 3
+
+            self.assertNotEqual(Season.SPRING, Part.SPRING)
+            def bad_compare():
+                Season.SPRING < Part.CLIP
+            self.assertRaises(TypeError, bad_compare) 
+
+    def test_enum_in_enum_out(self):
+        Season = self.Season
+        self.assertTrue(Season(Season.WINTER) is Season.WINTER)
+
+    def test_enum_value(self):
+        Season = self.Season
+        self.assertEqual(Season.SPRING.value, 1)
+
+    def test_intenum_value(self):
+        self.assertEqual(IntStooges.CURLY.value, 2)
+
+    def test_enum(self):
+        Season = self.Season
+        lst = list(Season)
+        self.assertEqual(len(lst), len(Season))
+        self.assertEqual(len(Season), 4, Season)
+        self.assertEqual(
+            [Season.SPRING, Season.SUMMER, Season.AUTUMN, Season.WINTER], lst)
+
+        for i, season in enumerate('SPRING SUMMER AUTUMN WINTER'.split()):
+            i += 1
+            e = Season(i)
+            self.assertEqual(e, getattr(Season, season))
+            self.assertEqual(e.value, i)
+            self.assertNotEqual(e, i)
+            self.assertEqual(e.name, season)
+            self.assertTrue(e in Season)
+            self.assertTrue(type(e) is Season)
+            self.assertTrue(isinstance(e, Season))
+            self.assertEqual(str(e), 'Season.' + season)
+            self.assertEqual(
+                    repr(e),
+                    '<Season.%s: %s>' % (season, i),
+                    )
+
+    def test_value_name(self):
+        Season = self.Season
+        self.assertEqual(Season.SPRING.name, 'SPRING')
+        self.assertEqual(Season.SPRING.value, 1)
+        def set_name(obj, new_value):
+            obj.name = new_value
+        def set_value(obj, new_value):
+            obj.value = new_value
+        self.assertRaises(AttributeError, set_name, Season.SPRING, 'invierno', )
+        self.assertRaises(AttributeError, set_value, Season.SPRING, 2)
+
+    def test_attribute_deletion(self):
+        class Season(Enum):
+            SPRING = 1
+            SUMMER = 2
+            AUTUMN = 3
+            WINTER = 4
+
+            def spam(cls):
+                pass
+
+        self.assertTrue(hasattr(Season, 'spam'))
+        del Season.spam
+        self.assertFalse(hasattr(Season, 'spam'))
+
+        self.assertRaises(AttributeError, delattr, Season, 'SPRING')
+        self.assertRaises(AttributeError, delattr, Season, 'DRY')
+        self.assertRaises(AttributeError, delattr, Season.SPRING, 'name')
+
+    def test_invalid_names(self):
+        def create_bad_class_1():
+            class Wrong(Enum):
+                mro = 9
+        def create_bad_class_2():
+            class Wrong(Enum):
+                _reserved_ = 3
+        self.assertRaises(ValueError, create_bad_class_1)
+        self.assertRaises(ValueError, create_bad_class_2)
+
+    def test_contains(self):
+        Season = self.Season
+        self.assertTrue(Season.AUTUMN in Season)
+        self.assertTrue(3 not in Season)
+
+        val = Season(3)
+        self.assertTrue(val in Season)
+
+        class OtherEnum(Enum):
+            one = 1; two = 2
+        self.assertTrue(OtherEnum.two not in Season)
+
+    if pyver >= 2.6:     # when `format` came into being
+
+        def test_format_enum(self):
+            Season = self.Season
+            self.assertEqual('{0}'.format(Season.SPRING),
+                             '{0}'.format(str(Season.SPRING)))
+            self.assertEqual( '{0:}'.format(Season.SPRING),
+                              '{0:}'.format(str(Season.SPRING)))
+            self.assertEqual('{0:20}'.format(Season.SPRING),
+                             '{0:20}'.format(str(Season.SPRING)))
+            self.assertEqual('{0:^20}'.format(Season.SPRING),
+                             '{0:^20}'.format(str(Season.SPRING)))
+            self.assertEqual('{0:>20}'.format(Season.SPRING),
+                             '{0:>20}'.format(str(Season.SPRING)))
+            self.assertEqual('{0:<20}'.format(Season.SPRING),
+                             '{0:<20}'.format(str(Season.SPRING)))
+
+        def test_format_enum_custom(self):
+            class TestFloat(float, Enum):
+                one = 1.0
+                two = 2.0
+                def __format__(self, spec):
+                    return 'TestFloat success!'
+            self.assertEqual('{0}'.format(TestFloat.one), 'TestFloat success!')
+
+        def assertFormatIsValue(self, spec, member):
+            self.assertEqual(spec.format(member), spec.format(member.value))
+
+        def test_format_enum_date(self):
+            Holiday = self.Holiday
+            self.assertFormatIsValue('{0}', Holiday.IDES_OF_MARCH)
+            self.assertFormatIsValue('{0:}', Holiday.IDES_OF_MARCH)
+            self.assertFormatIsValue('{0:20}', Holiday.IDES_OF_MARCH)
+            self.assertFormatIsValue('{0:^20}', Holiday.IDES_OF_MARCH)
+            self.assertFormatIsValue('{0:>20}', Holiday.IDES_OF_MARCH)
+            self.assertFormatIsValue('{0:<20}', Holiday.IDES_OF_MARCH)
+            self.assertFormatIsValue('{0:%Y %m}', Holiday.IDES_OF_MARCH)
+            self.assertFormatIsValue('{0:%Y %m %M:00}', Holiday.IDES_OF_MARCH)
+
+        def test_format_enum_float(self):
+            Konstants = self.Konstants
+            self.assertFormatIsValue('{0}', Konstants.TAU)
+            self.assertFormatIsValue('{0:}', Konstants.TAU)
+            self.assertFormatIsValue('{0:20}', Konstants.TAU)
+            self.assertFormatIsValue('{0:^20}', Konstants.TAU)
+            self.assertFormatIsValue('{0:>20}', Konstants.TAU)
+            self.assertFormatIsValue('{0:<20}', Konstants.TAU)
+            self.assertFormatIsValue('{0:n}', Konstants.TAU)
+            self.assertFormatIsValue('{0:5.2}', Konstants.TAU)
+            self.assertFormatIsValue('{0:f}', Konstants.TAU)
+
+        def test_format_enum_int(self):
+            Grades = self.Grades
+            self.assertFormatIsValue('{0}', Grades.C)
+            self.assertFormatIsValue('{0:}', Grades.C)
+            self.assertFormatIsValue('{0:20}', Grades.C)
+            self.assertFormatIsValue('{0:^20}', Grades.C)
+            self.assertFormatIsValue('{0:>20}', Grades.C)
+            self.assertFormatIsValue('{0:<20}', Grades.C)
+            self.assertFormatIsValue('{0:+}', Grades.C)
+            self.assertFormatIsValue('{0:08X}', Grades.C)
+            self.assertFormatIsValue('{0:b}', Grades.C)
+
+        def test_format_enum_str(self):
+            Directional = self.Directional
+            self.assertFormatIsValue('{0}', Directional.WEST)
+            self.assertFormatIsValue('{0:}', Directional.WEST)
+            self.assertFormatIsValue('{0:20}', Directional.WEST)
+            self.assertFormatIsValue('{0:^20}', Directional.WEST)
+            self.assertFormatIsValue('{0:>20}', Directional.WEST)
+            self.assertFormatIsValue('{0:<20}', Directional.WEST)
+
+    def test_hash(self):
+        Season = self.Season
+        dates = {}
+        dates[Season.WINTER] = '1225'
+        dates[Season.SPRING] = '0315'
+        dates[Season.SUMMER] = '0704'
+        dates[Season.AUTUMN] = '1031'
+        self.assertEqual(dates[Season.AUTUMN], '1031')
+
+    def test_enum_duplicates(self):
+        __order__ = "SPRING SUMMER AUTUMN WINTER"
+        class Season(Enum):
+            SPRING = 1
+            SUMMER = 2
+            AUTUMN = FALL = 3
+            WINTER = 4
+            ANOTHER_SPRING = 1
+        lst = list(Season)
+        self.assertEqual(
+            lst,
+            [Season.SPRING, Season.SUMMER,
+             Season.AUTUMN, Season.WINTER,
+            ])
+        self.assertTrue(Season.FALL is Season.AUTUMN)
+        self.assertEqual(Season.FALL.value, 3)
+        self.assertEqual(Season.AUTUMN.value, 3)
+        self.assertTrue(Season(3) is Season.AUTUMN)
+        self.assertTrue(Season(1) is Season.SPRING)
+        self.assertEqual(Season.FALL.name, 'AUTUMN')
+        self.assertEqual(
+                set([k for k,v in Season.__members__.items() if v.name != k]),
+                set(['FALL', 'ANOTHER_SPRING']),
+                )
+
+    if pyver >= 3.0:
+        cls = vars()
+        result = {'Enum':Enum}
+        exec("""def test_duplicate_name(self):
+            with self.assertRaises(TypeError):
+                class Color(Enum):
+                    red = 1
+                    green = 2
+                    blue = 3
+                    red = 4
+
+            with self.assertRaises(TypeError):
+                class Color(Enum):
+                    red = 1
+                    green = 2
+                    blue = 3
+                    def red(self):
+                        return 'red'
+
+            with self.assertRaises(TypeError):
+                class Color(Enum):
+                    @property
+
+                    def red(self):
+                        return 'redder'
+                    red = 1
+                    green = 2
+                    blue = 3""",
+            result)
+        cls['test_duplicate_name'] = result['test_duplicate_name']
+
+    def test_enum_with_value_name(self):
+        class Huh(Enum):
+            name = 1
+            value = 2
+        self.assertEqual(
+            list(Huh),
+            [Huh.name, Huh.value],
+            )
+        self.assertTrue(type(Huh.name) is Huh)
+        self.assertEqual(Huh.name.name, 'name')
+        self.assertEqual(Huh.name.value, 1)
+
+    def test_intenum_from_scratch(self):
+        class phy(int, Enum):
+            pi = 3
+            tau = 2 * pi
+        self.assertTrue(phy.pi < phy.tau)
+
+    def test_intenum_inherited(self):
+        class IntEnum(int, Enum):
+            pass
+        class phy(IntEnum):
+            pi = 3
+            tau = 2 * pi
+        self.assertTrue(phy.pi < phy.tau)
+
+    def test_floatenum_from_scratch(self):
+        class phy(float, Enum):
+            pi = 3.1415926
+            tau = 2 * pi
+        self.assertTrue(phy.pi < phy.tau)
+
+    def test_floatenum_inherited(self):
+        class FloatEnum(float, Enum):
+            pass
+        class phy(FloatEnum):
+            pi = 3.1415926
+            tau = 2 * pi
+        self.assertTrue(phy.pi < phy.tau)
+
+    def test_strenum_from_scratch(self):
+        class phy(str, Enum):
+            pi = 'Pi'
+            tau = 'Tau'
+        self.assertTrue(phy.pi < phy.tau)
+
+    def test_strenum_inherited(self):
+        class StrEnum(str, Enum):
+            pass
+        class phy(StrEnum):
+            pi = 'Pi'
+            tau = 'Tau'
+        self.assertTrue(phy.pi < phy.tau)
+
+    def test_intenum(self):
+        class WeekDay(IntEnum):
+            SUNDAY = 1
+            MONDAY = 2
+            TUESDAY = 3
+            WEDNESDAY = 4
+            THURSDAY = 5
+            FRIDAY = 6
+            SATURDAY = 7
+
+        self.assertEqual(['a', 'b', 'c'][WeekDay.MONDAY], 'c')
+        self.assertEqual([i for i in range(WeekDay.TUESDAY)], [0, 1, 2])
+
+        lst = list(WeekDay)
+        self.assertEqual(len(lst), len(WeekDay))
+        self.assertEqual(len(WeekDay), 7)
+        target = 'SUNDAY MONDAY TUESDAY WEDNESDAY THURSDAY FRIDAY SATURDAY'
+        target = target.split()
+        for i, weekday in enumerate(target):
+            i += 1
+            e = WeekDay(i)
+            self.assertEqual(e, i)
+            self.assertEqual(int(e), i)
+            self.assertEqual(e.name, weekday)
+            self.assertTrue(e in WeekDay)
+            self.assertEqual(lst.index(e)+1, i)
+            self.assertTrue(0 < e < 8)
+            self.assertTrue(type(e) is WeekDay)
+            self.assertTrue(isinstance(e, int))
+            self.assertTrue(isinstance(e, Enum))
+
+    def test_intenum_duplicates(self):
+        class WeekDay(IntEnum):
+            __order__ = 'SUNDAY MONDAY TUESDAY WEDNESDAY THURSDAY FRIDAY SATURDAY'
+            SUNDAY = 1
+            MONDAY = 2
+            TUESDAY = TEUSDAY = 3
+            WEDNESDAY = 4
+            THURSDAY = 5
+            FRIDAY = 6
+            SATURDAY = 7
+        self.assertTrue(WeekDay.TEUSDAY is WeekDay.TUESDAY)
+        self.assertEqual(WeekDay(3).name, 'TUESDAY')
+        self.assertEqual([k for k,v in WeekDay.__members__.items()
+                if v.name != k], ['TEUSDAY', ])
+
+    def test_pickle_enum(self):
+        if isinstance(Stooges, Exception):
+            raise Stooges
+        test_pickle_dump_load(self.assertTrue, Stooges.CURLY)
+        test_pickle_dump_load(self.assertTrue, Stooges)
+
+    def test_pickle_int(self):
+        if isinstance(IntStooges, Exception):
+            raise IntStooges
+        test_pickle_dump_load(self.assertTrue, IntStooges.CURLY)
+        test_pickle_dump_load(self.assertTrue, IntStooges)
+
+    def test_pickle_float(self):
+        if isinstance(FloatStooges, Exception):
+            raise FloatStooges
+        test_pickle_dump_load(self.assertTrue, FloatStooges.CURLY)
+        test_pickle_dump_load(self.assertTrue, FloatStooges)
+
+    def test_pickle_enum_function(self):
+        if isinstance(Answer, Exception):
+            raise Answer
+        test_pickle_dump_load(self.assertTrue, Answer.him)
+        test_pickle_dump_load(self.assertTrue, Answer)
+
+    def test_pickle_enum_function_with_module(self):
+        if isinstance(Question, Exception):
+            raise Question
+        test_pickle_dump_load(self.assertTrue, Question.who)
+        test_pickle_dump_load(self.assertTrue, Question)
+
+    if pyver >= 3.4:
+        def test_class_nested_enum_and_pickle_protocol_four(self):
+            # would normally just have this directly in the class namespace
+            class NestedEnum(Enum):
+                twigs = 'common'
+                shiny = 'rare'
+
+            self.__class__.NestedEnum = NestedEnum
+            self.NestedEnum.__qualname__ = '%s.NestedEnum' % self.__class__.__name__
+            test_pickle_exception(
+                    self.assertRaises, PicklingError, self.NestedEnum.twigs,
+                    protocol=(0, 3))
+            test_pickle_dump_load(self.assertTrue, self.NestedEnum.twigs,
+                    protocol=(4, HIGHEST_PROTOCOL))
+
+    def test_exploding_pickle(self):
+        BadPickle = Enum('BadPickle', 'dill sweet bread-n-butter')
+        enum._make_class_unpicklable(BadPickle)
+        globals()['BadPickle'] = BadPickle
+        test_pickle_exception(self.assertRaises, TypeError, BadPickle.dill)
+        test_pickle_exception(self.assertRaises, PicklingError, BadPickle)
+
+    def test_string_enum(self):
+        class SkillLevel(str, Enum):
+            master = 'what is the sound of one hand clapping?'
+            journeyman = 'why did the chicken cross the road?'
+            apprentice = 'knock, knock!'
+        self.assertEqual(SkillLevel.apprentice, 'knock, knock!')
+
+    def test_getattr_getitem(self):
+        class Period(Enum):
+            morning = 1
+            noon = 2
+            evening = 3
+            night = 4
+        self.assertTrue(Period(2) is Period.noon)
+        self.assertTrue(getattr(Period, 'night') is Period.night)
+        self.assertTrue(Period['morning'] is Period.morning)
+
+    def test_getattr_dunder(self):
+        Season = self.Season
+        self.assertTrue(getattr(Season, '__hash__'))
+
+    def test_iteration_order(self):
+        class Season(Enum):
+            __order__ = 'SUMMER WINTER AUTUMN SPRING'
+            SUMMER = 2
+            WINTER = 4
+            AUTUMN = 3
+            SPRING = 1
+        self.assertEqual(
+                list(Season),
+                [Season.SUMMER, Season.WINTER, Season.AUTUMN, Season.SPRING],
+                )
+
+    def test_iteration_order_with_unorderable_values(self):
+        class Complex(Enum):
+            a = complex(7, 9)
+            b = complex(3.14, 2)
+            c = complex(1, -1)
+            d = complex(-77, 32)
+        self.assertEqual(
+                list(Complex),
+                [Complex.a, Complex.b, Complex.c, Complex.d],
+                )
+
+    def test_programatic_function_string(self):
+        SummerMonth = Enum('SummerMonth', 'june july august')
+        lst = list(SummerMonth)
+        self.assertEqual(len(lst), len(SummerMonth))
+        self.assertEqual(len(SummerMonth), 3, SummerMonth)
+        self.assertEqual(
+                [SummerMonth.june, SummerMonth.july, SummerMonth.august],
+                lst,
+                )
+        for i, month in enumerate('june july august'.split()):
+            i += 1
+            e = SummerMonth(i)
+            self.assertEqual(int(e.value), i)
+            self.assertNotEqual(e, i)
+            self.assertEqual(e.name, month)
+            self.assertTrue(e in SummerMonth)
+            self.assertTrue(type(e) is SummerMonth)
+
+    def test_programatic_function_string_list(self):
+        SummerMonth = Enum('SummerMonth', ['june', 'july', 'august'])
+        lst = list(SummerMonth)
+        self.assertEqual(len(lst), len(SummerMonth))
+        self.assertEqual(len(SummerMonth), 3, SummerMonth)
+        self.assertEqual(
+                [SummerMonth.june, SummerMonth.july, SummerMonth.august],
+                lst,
+                )
+        for i, month in enumerate('june july august'.split()):
+            i += 1
+            e = SummerMonth(i)
+            self.assertEqual(int(e.value), i)
+            self.assertNotEqual(e, i)
+            self.assertEqual(e.name, month)
+            self.assertTrue(e in SummerMonth)
+            self.assertTrue(type(e) is SummerMonth)
+
+    def test_programatic_function_iterable(self):
+        SummerMonth = Enum(
+                'SummerMonth',
+                (('june', 1), ('july', 2), ('august', 3))
+                )
+        lst = list(SummerMonth)
+        self.assertEqual(len(lst), len(SummerMonth))
+        self.assertEqual(len(SummerMonth), 3, SummerMonth)
+        self.assertEqual(
+                [SummerMonth.june, SummerMonth.july, SummerMonth.august],
+                lst,
+                )
+        for i, month in enumerate('june july august'.split()):
+            i += 1
+            e = SummerMonth(i)
+            self.assertEqual(int(e.value), i)
+            self.assertNotEqual(e, i)
+            self.assertEqual(e.name, month)
+            self.assertTrue(e in SummerMonth)
+            self.assertTrue(type(e) is SummerMonth)
+
+    def test_programatic_function_from_dict(self):
+        SummerMonth = Enum(
+                'SummerMonth',
+                dict((('june', 1), ('july', 2), ('august', 3)))
+                )
+        lst = list(SummerMonth)
+        self.assertEqual(len(lst), len(SummerMonth))
+        self.assertEqual(len(SummerMonth), 3, SummerMonth)
+        if pyver < 3.0:
+            self.assertEqual(
+                    [SummerMonth.june, SummerMonth.july, SummerMonth.august],
+                    lst,
+                    )
+        for i, month in enumerate('june july august'.split()):
+            i += 1
+            e = SummerMonth(i)
+            self.assertEqual(int(e.value), i)
+            self.assertNotEqual(e, i)
+            self.assertEqual(e.name, month)
+            self.assertTrue(e in SummerMonth)
+            self.assertTrue(type(e) is SummerMonth)
+
+    def test_programatic_function_type(self):
+        SummerMonth = Enum('SummerMonth', 'june july august', type=int)
+        lst = list(SummerMonth)
+        self.assertEqual(len(lst), len(SummerMonth))
+        self.assertEqual(len(SummerMonth), 3, SummerMonth)
+        self.assertEqual(
+                [SummerMonth.june, SummerMonth.july, SummerMonth.august],
+                lst,
+                )
+        for i, month in enumerate('june july august'.split()):
+            i += 1
+            e = SummerMonth(i)
+            self.assertEqual(e, i)
+            self.assertEqual(e.name, month)
+            self.assertTrue(e in SummerMonth)
+            self.assertTrue(type(e) is SummerMonth)
+
+    def test_programatic_function_type_from_subclass(self):
+        SummerMonth = IntEnum('SummerMonth', 'june july august')
+        lst = list(SummerMonth)
+        self.assertEqual(len(lst), len(SummerMonth))
+        self.assertEqual(len(SummerMonth), 3, SummerMonth)
+        self.assertEqual(
+                [SummerMonth.june, SummerMonth.july, SummerMonth.august],
+                lst,
+                )
+        for i, month in enumerate('june july august'.split()):
+            i += 1
+            e = SummerMonth(i)
+            self.assertEqual(e, i)
+            self.assertEqual(e.name, month)
+            self.assertTrue(e in SummerMonth)
+            self.assertTrue(type(e) is SummerMonth)
+
+    def test_programatic_function_unicode(self):
+        SummerMonth = Enum('SummerMonth', unicode('june july august'))
+        lst = list(SummerMonth)
+        self.assertEqual(len(lst), len(SummerMonth))
+        self.assertEqual(len(SummerMonth), 3, SummerMonth)
+        self.assertEqual(
+                [SummerMonth.june, SummerMonth.july, SummerMonth.august],
+                lst,
+                )
+        for i, month in enumerate(unicode('june july august').split()):
+            i += 1
+            e = SummerMonth(i)
+            self.assertEqual(int(e.value), i)
+            self.assertNotEqual(e, i)
+            self.assertEqual(e.name, month)
+            self.assertTrue(e in SummerMonth)
+            self.assertTrue(type(e) is SummerMonth)
+
+    def test_programatic_function_unicode_list(self):
+        SummerMonth = Enum('SummerMonth', [unicode('june'), unicode('july'), unicode('august')])
+        lst = list(SummerMonth)
+        self.assertEqual(len(lst), len(SummerMonth))
+        self.assertEqual(len(SummerMonth), 3, SummerMonth)
+        self.assertEqual(
+                [SummerMonth.june, SummerMonth.july, SummerMonth.august],
+                lst,
+                )
+        for i, month in enumerate(unicode('june july august').split()):
+            i += 1
+            e = SummerMonth(i)
+            self.assertEqual(int(e.value), i)
+            self.assertNotEqual(e, i)
+            self.assertEqual(e.name, month)
+            self.assertTrue(e in SummerMonth)
+            self.assertTrue(type(e) is SummerMonth)
+
+    def test_programatic_function_unicode_iterable(self):
+        SummerMonth = Enum(
+                'SummerMonth',
+                ((unicode('june'), 1), (unicode('july'), 2), (unicode('august'), 3))
+                )
+        lst = list(SummerMonth)
+        self.assertEqual(len(lst), len(SummerMonth))
+        self.assertEqual(len(SummerMonth), 3, SummerMonth)
+        self.assertEqual(
+                [SummerMonth.june, SummerMonth.july, SummerMonth.august],
+                lst,
+                )
+        for i, month in enumerate(unicode('june july august').split()):
+            i += 1
+            e = SummerMonth(i)
+            self.assertEqual(int(e.value), i)
+            self.assertNotEqual(e, i)
+            self.assertEqual(e.name, month)
+            self.assertTrue(e in SummerMonth)
+            self.assertTrue(type(e) is SummerMonth)
+
+    def test_programatic_function_from_unicode_dict(self):
+        SummerMonth = Enum(
+                'SummerMonth',
+                dict(((unicode('june'), 1), (unicode('july'), 2), (unicode('august'), 3)))
+                )
+        lst = list(SummerMonth)
+        self.assertEqual(len(lst), len(SummerMonth))
+        self.assertEqual(len(SummerMonth), 3, SummerMonth)
+        if pyver < 3.0:
+            self.assertEqual(
+                    [SummerMonth.june, SummerMonth.july, SummerMonth.august],
+                    lst,
+                    )
+        for i, month in enumerate(unicode('june july august').split()):
+            i += 1
+            e = SummerMonth(i)
+            self.assertEqual(int(e.value), i)
+            self.assertNotEqual(e, i)
+            self.assertEqual(e.name, month)
+            self.assertTrue(e in SummerMonth)
+            self.assertTrue(type(e) is SummerMonth)
+
+    def test_programatic_function_unicode_type(self):
+        SummerMonth = Enum('SummerMonth', unicode('june july august'), type=int)
+        lst = list(SummerMonth)
+        self.assertEqual(len(lst), len(SummerMonth))
+        self.assertEqual(len(SummerMonth), 3, SummerMonth)
+        self.assertEqual(
+                [SummerMonth.june, SummerMonth.july, SummerMonth.august],
+                lst,
+                )
+        for i, month in enumerate(unicode('june july august').split()):
+            i += 1
+            e = SummerMonth(i)
+            self.assertEqual(e, i)
+            self.assertEqual(e.name, month)
+            self.assertTrue(e in SummerMonth)
+            self.assertTrue(type(e) is SummerMonth)
+
+    def test_programatic_function_unicode_type_from_subclass(self):
+        SummerMonth = IntEnum('SummerMonth', unicode('june july august'))
+        lst = list(SummerMonth)
+        self.assertEqual(len(lst), len(SummerMonth))
+        self.assertEqual(len(SummerMonth), 3, SummerMonth)
+        self.assertEqual(
+                [SummerMonth.june, SummerMonth.july, SummerMonth.august],
+                lst,
+                )
+        for i, month in enumerate(unicode('june july august').split()):
+            i += 1
+            e = SummerMonth(i)
+            self.assertEqual(e, i)
+            self.assertEqual(e.name, month)
+            self.assertTrue(e in SummerMonth)
+            self.assertTrue(type(e) is SummerMonth)
+
+    def test_programmatic_function_unicode_class(self):
+        if pyver < 3.0:
+            class_names = unicode('SummerMonth'), 'S\xfcmm\xe9rM\xf6nth'.decode('latin1')
+        else:
+            class_names = 'SummerMonth', 'S\xfcmm\xe9rM\xf6nth'
+        for i, class_name in enumerate(class_names):
+            if pyver < 3.0 and i == 1:
+                self.assertRaises(TypeError, Enum, class_name, unicode('june july august'))
+            else:
+                SummerMonth = Enum(class_name, unicode('june july august'))
+                lst = list(SummerMonth)
+                self.assertEqual(len(lst), len(SummerMonth))
+                self.assertEqual(len(SummerMonth), 3, SummerMonth)
+                self.assertEqual(
+                        [SummerMonth.june, SummerMonth.july, SummerMonth.august],
+                        lst,
+                        )
+                for i, month in enumerate(unicode('june july august').split()):
+                    i += 1
+                    e = SummerMonth(i)
+                    self.assertEqual(e.value, i)
+                    self.assertEqual(e.name, month)
+                    self.assertTrue(e in SummerMonth)
+                    self.assertTrue(type(e) is SummerMonth)
+
+    def test_subclassing(self):
+        if isinstance(Name, Exception):
+            raise Name
+        self.assertEqual(Name.BDFL, 'Guido van Rossum')
+        self.assertTrue(Name.BDFL, Name('Guido van Rossum'))
+        self.assertTrue(Name.BDFL is getattr(Name, 'BDFL'))
+        test_pickle_dump_load(self.assertTrue, Name.BDFL)
+
+    def test_extending(self):
+        def bad_extension():
+            class Color(Enum):
+                red = 1
+                green = 2
+                blue = 3
+            class MoreColor(Color):
+                cyan = 4
+                magenta = 5
+                yellow = 6
+        self.assertRaises(TypeError, bad_extension)
+
+    def test_exclude_methods(self):
+        class whatever(Enum):
+            this = 'that'
+            these = 'those'
+            def really(self):
+                return 'no, not %s' % self.value
+        self.assertFalse(type(whatever.really) is whatever)
+        self.assertEqual(whatever.this.really(), 'no, not that')
+
+    def test_wrong_inheritance_order(self):
+        def wrong_inherit():
+            class Wrong(Enum, str):
+                NotHere = 'error before this point'
+        self.assertRaises(TypeError, wrong_inherit)
+
+    def test_intenum_transitivity(self):
+        class number(IntEnum):
+            one = 1
+            two = 2
+            three = 3
+        class numero(IntEnum):
+            uno = 1
+            dos = 2
+            tres = 3
+        self.assertEqual(number.one, numero.uno)
+        self.assertEqual(number.two, numero.dos)
+        self.assertEqual(number.three, numero.tres)
+
+    def test_introspection(self):
+        class Number(IntEnum):
+            one = 100
+            two = 200
+        self.assertTrue(Number.one._member_type_ is int)
+        self.assertTrue(Number._member_type_ is int)
+        class String(str, Enum):
+            yarn = 'soft'
+            rope = 'rough'
+            wire = 'hard'
+        self.assertTrue(String.yarn._member_type_ is str)
+        self.assertTrue(String._member_type_ is str)
+        class Plain(Enum):
+            vanilla = 'white'
+            one = 1
+        self.assertTrue(Plain.vanilla._member_type_ is object)
+        self.assertTrue(Plain._member_type_ is object)
+
+    def test_wrong_enum_in_call(self):
+        class Monochrome(Enum):
+            black = 0
+            white = 1
+        class Gender(Enum):
+            male = 0
+            female = 1
+        self.assertRaises(ValueError, Monochrome, Gender.male)
+
+    def test_wrong_enum_in_mixed_call(self):
+        class Monochrome(IntEnum):
+            black = 0
+            white = 1
+        class Gender(Enum):
+            male = 0
+            female = 1
+        self.assertRaises(ValueError, Monochrome, Gender.male)
+
+    def test_mixed_enum_in_call_1(self):
+        class Monochrome(IntEnum):
+            black = 0
+            white = 1
+        class Gender(IntEnum):
+            male = 0
+            female = 1
+        self.assertTrue(Monochrome(Gender.female) is Monochrome.white)
+
+    def test_mixed_enum_in_call_2(self):
+        class Monochrome(Enum):
+            black = 0
+            white = 1
+        class Gender(IntEnum):
+            male = 0
+            female = 1
+        self.assertTrue(Monochrome(Gender.male) is Monochrome.black)
+
+    def test_flufl_enum(self):
+        class Fluflnum(Enum):
+            def __int__(self):
+                return int(self.value)
+        class MailManOptions(Fluflnum):
+            option1 = 1
+            option2 = 2
+            option3 = 3
+        self.assertEqual(int(MailManOptions.option1), 1)
+
+    def test_no_such_enum_member(self):
+        class Color(Enum):
+            red = 1
+            green = 2
+            blue = 3
+        self.assertRaises(ValueError, Color, 4)
+        self.assertRaises(KeyError, Color.__getitem__, 'chartreuse')
+
+    def test_new_repr(self):
+        class Color(Enum):
+            red = 1
+            green = 2
+            blue = 3
+            def __repr__(self):
+                return "don't you just love shades of %s?" % self.name
+        self.assertEqual(
+                repr(Color.blue),
+                "don't you just love shades of blue?",
+                )
+
+    def test_inherited_repr(self):
+        class MyEnum(Enum):
+            def __repr__(self):
+                return "My name is %s." % self.name
+        class MyIntEnum(int, MyEnum):
+            this = 1
+            that = 2
+            theother = 3
+        self.assertEqual(repr(MyIntEnum.that), "My name is that.")
+
+    def test_multiple_mixin_mro(self):
+        class auto_enum(EnumMeta):
+            def __new__(metacls, cls, bases, classdict):
+                original_dict = classdict
+                classdict = enum._EnumDict()
+                for k, v in original_dict.items():
+                    classdict[k] = v
+                temp = type(classdict)()
+                names = set(classdict._member_names)
+                i = 0
+                for k in classdict._member_names:
+                    v = classdict[k]
+                    if v == ():
+                        v = i
+                    else:
+                        i = v
+                    i += 1
+                    temp[k] = v
+                for k, v in classdict.items():
+                    if k not in names:
+                        temp[k] = v
+                return super(auto_enum, metacls).__new__(
+                        metacls, cls, bases, temp)
+
+        AutoNumberedEnum = auto_enum('AutoNumberedEnum', (Enum,), {})
+
+        AutoIntEnum = auto_enum('AutoIntEnum', (IntEnum,), {})
+
+        class TestAutoNumber(AutoNumberedEnum):
+            a = ()
+            b = 3
+            c = ()
+
+        class TestAutoInt(AutoIntEnum):
+            a = ()
+            b = 3
+            c = ()
+
+    def test_subclasses_with_getnewargs(self):
+        class NamedInt(int):
+            __qualname__ = 'NamedInt'  # needed for pickle protocol 4
+            def __new__(cls, *args):
+                _args = args
+                if len(args) < 1:
+                    raise TypeError("name and value must be specified")
+                name, args = args[0], args[1:]
+                self = int.__new__(cls, *args)
+                self._intname = name
+                self._args = _args
+                return self
+            def __getnewargs__(self):
+                return self._args
+            @property
+            def __name__(self):
+                return self._intname
+            def __repr__(self):
+                # repr() is updated to include the name and type info
+                return "%s(%r, %s)" % (type(self).__name__,
+                                             self.__name__,
+                                             int.__repr__(self))
+            def __str__(self):
+                # str() is unchanged, even if it relies on the repr() fallback
+                base = int
+                base_str = base.__str__
+                if base_str.__objclass__ is object:
+                    return base.__repr__(self)
+                return base_str(self)
+            # for simplicity, we only define one operator that
+            # propagates expressions
+            def __add__(self, other):
+                temp = int(self) + int( other)
+                if isinstance(self, NamedInt) and isinstance(other, NamedInt):
+                    return NamedInt(
+                        '(%s + %s)' % (self.__name__, other.__name__),
+                        temp )
+                else:
+                    return temp
+
+        class NEI(NamedInt, Enum):
+            __qualname__ = 'NEI'  # needed for pickle protocol 4
+            x = ('the-x', 1)
+            y = ('the-y', 2)
+
+        self.assertTrue(NEI.__new__ is Enum.__new__)
+        self.assertEqual(repr(NEI.x + NEI.y), "NamedInt('(the-x + the-y)', 3)")
+        globals()['NamedInt'] = NamedInt
+        globals()['NEI'] = NEI
+        NI5 = NamedInt('test', 5)
+        self.assertEqual(NI5, 5)
+        test_pickle_dump_load(self.assertTrue, NI5, 5)
+        self.assertEqual(NEI.y.value, 2)
+        test_pickle_dump_load(self.assertTrue, NEI.y)
+
+    if pyver >= 3.4:
+        def test_subclasses_with_getnewargs_ex(self):
+            class NamedInt(int):
+                __qualname__ = 'NamedInt'       # needed for pickle protocol 4
+                def __new__(cls, *args):
+                    _args = args
+                    if len(args) < 2:
+                        raise TypeError("name and value must be specified")
+                    name, args = args[0], args[1:]
+                    self = int.__new__(cls, *args)
+                    self._intname = name
+                    self._args = _args
+                    return self
+                def __getnewargs_ex__(self):
+                    return self._args, {}
+                @property
+                def __name__(self):
+                    return self._intname
+                def __repr__(self):
+                    # repr() is updated to include the name and type info
+                    return "{}({!r}, {})".format(type(self).__name__,
+                                                 self.__name__,
+                                                 int.__repr__(self))
+                def __str__(self):
+                    # str() is unchanged, even if it relies on the repr() fallback
+                    base = int
+                    base_str = base.__str__
+                    if base_str.__objclass__ is object:
+                        return base.__repr__(self)
+                    return base_str(self)
+                # for simplicity, we only define one operator that
+                # propagates expressions
+                def __add__(self, other):
+                    temp = int(self) + int( other)
+                    if isinstance(self, NamedInt) and isinstance(other, NamedInt):
+                        return NamedInt(
+                            '({0} + {1})'.format(self.__name__, other.__name__),
+                            temp )
+                    else:
+                        return temp
+
+            class NEI(NamedInt, Enum):
+                __qualname__ = 'NEI'      # needed for pickle protocol 4
+                x = ('the-x', 1)
+                y = ('the-y', 2)
+
+
+            self.assertIs(NEI.__new__, Enum.__new__)
+            self.assertEqual(repr(NEI.x + NEI.y), "NamedInt('(the-x + the-y)', 3)")
+            globals()['NamedInt'] = NamedInt
+            globals()['NEI'] = NEI
+            NI5 = NamedInt('test', 5)
+            self.assertEqual(NI5, 5)
+            test_pickle_dump_load(self.assertEqual, NI5, 5, protocol=(4, HIGHEST_PROTOCOL))
+            self.assertEqual(NEI.y.value, 2)
+            test_pickle_dump_load(self.assertTrue, NEI.y, protocol=(4, HIGHEST_PROTOCOL))
+
+    def test_subclasses_with_reduce(self):
+        class NamedInt(int):
+            __qualname__ = 'NamedInt'       # needed for pickle protocol 4
+            def __new__(cls, *args):
+                _args = args
+                if len(args) < 1:
+                    raise TypeError("name and value must be specified")
+                name, args = args[0], args[1:]
+                self = int.__new__(cls, *args)
+                self._intname = name
+                self._args = _args
+                return self
+            def __reduce__(self):
+                return self.__class__, self._args
+            @property
+            def __name__(self):
+                return self._intname
+            def __repr__(self):
+                # repr() is updated to include the name and type info
+                return "%s(%r, %s)" % (type(self).__name__,
+                                             self.__name__,
+                                             int.__repr__(self))
+            def __str__(self):
+                # str() is unchanged, even if it relies on the repr() fallback
+                base = int
+                base_str = base.__str__
+                if base_str.__objclass__ is object:
+                    return base.__repr__(self)
+                return base_str(self)
+            # for simplicity, we only define one operator that
+            # propagates expressions
+            def __add__(self, other):
+                temp = int(self) + int( other)
+                if isinstance(self, NamedInt) and isinstance(other, NamedInt):
+                    return NamedInt(
+                        '(%s + %s)' % (self.__name__, other.__name__),
+                        temp )
+                else:
+                    return temp
+
+        class NEI(NamedInt, Enum):
+            __qualname__ = 'NEI'      # needed for pickle protocol 4
+            x = ('the-x', 1)
+            y = ('the-y', 2)
+
+
+        self.assertTrue(NEI.__new__ is Enum.__new__)
+        self.assertEqual(repr(NEI.x + NEI.y), "NamedInt('(the-x + the-y)', 3)")
+        globals()['NamedInt'] = NamedInt
+        globals()['NEI'] = NEI
+        NI5 = NamedInt('test', 5)
+        self.assertEqual(NI5, 5)
+        test_pickle_dump_load(self.assertEqual, NI5, 5)
+        self.assertEqual(NEI.y.value, 2)
+        test_pickle_dump_load(self.assertTrue, NEI.y)
+
+    def test_subclasses_with_reduce_ex(self):
+        class NamedInt(int):
+            __qualname__ = 'NamedInt'       # needed for pickle protocol 4
+            def __new__(cls, *args):
+                _args = args
+                if len(args) < 1:
+                    raise TypeError("name and value must be specified")
+                name, args = args[0], args[1:]
+                self = int.__new__(cls, *args)
+                self._intname = name
+                self._args = _args
+                return self
+            def __reduce_ex__(self, proto):
+                return self.__class__, self._args
+            @property
+            def __name__(self):
+                return self._intname
+            def __repr__(self):
+                # repr() is updated to include the name and type info
+                return "%s(%r, %s)" % (type(self).__name__,
+                                             self.__name__,
+                                             int.__repr__(self))
+            def __str__(self):
+                # str() is unchanged, even if it relies on the repr() fallback
+                base = int
+                base_str = base.__str__
+                if base_str.__objclass__ is object:
+                    return base.__repr__(self)
+                return base_str(self)
+            # for simplicity, we only define one operator that
+            # propagates expressions
+            def __add__(self, other):
+                temp = int(self) + int( other)
+                if isinstance(self, NamedInt) and isinstance(other, NamedInt):
+                    return NamedInt(
+                        '(%s + %s)' % (self.__name__, other.__name__),
+                        temp )
+                else:
+                    return temp
+
+        class NEI(NamedInt, Enum):
+            __qualname__ = 'NEI'      # needed for pickle protocol 4
+            x = ('the-x', 1)
+            y = ('the-y', 2)
+
+
+        self.assertTrue(NEI.__new__ is Enum.__new__)
+        self.assertEqual(repr(NEI.x + NEI.y), "NamedInt('(the-x + the-y)', 3)")
+        globals()['NamedInt'] = NamedInt
+        globals()['NEI'] = NEI
+        NI5 = NamedInt('test', 5)
+        self.assertEqual(NI5, 5)
+        test_pickle_dump_load(self.assertEqual, NI5, 5)
+        self.assertEqual(NEI.y.value, 2)
+        test_pickle_dump_load(self.assertTrue, NEI.y)
+
+    def test_subclasses_without_direct_pickle_support(self):
+        class NamedInt(int):
+            __qualname__ = 'NamedInt'
+            def __new__(cls, *args):
+                _args = args
+                name, args = args[0], args[1:]
+                if len(args) == 0:
+                    raise TypeError("name and value must be specified")
+                self = int.__new__(cls, *args)
+                self._intname = name
+                self._args = _args
+                return self
+            @property
+            def __name__(self):
+                return self._intname
+            def __repr__(self):
+                # repr() is updated to include the name and type info
+                return "%s(%r, %s)" % (type(self).__name__,
+                                             self.__name__,
+                                             int.__repr__(self))
+            def __str__(self):
+                # str() is unchanged, even if it relies on the repr() fallback
+                base = int
+                base_str = base.__str__
+                if base_str.__objclass__ is object:
+                    return base.__repr__(self)
+                return base_str(self)
+            # for simplicity, we only define one operator that
+            # propagates expressions
+            def __add__(self, other):
+                temp = int(self) + int( other)
+                if isinstance(self, NamedInt) and isinstance(other, NamedInt):
+                    return NamedInt(
+                        '(%s + %s)' % (self.__name__, other.__name__),
+                        temp )
+                else:
+                    return temp
+
+        class NEI(NamedInt, Enum):
+            __qualname__ = 'NEI'
+            x = ('the-x', 1)
+            y = ('the-y', 2)
+
+        self.assertTrue(NEI.__new__ is Enum.__new__)
+        self.assertEqual(repr(NEI.x + NEI.y), "NamedInt('(the-x + the-y)', 3)")
+        globals()['NamedInt'] = NamedInt
+        globals()['NEI'] = NEI
+        NI5 = NamedInt('test', 5)
+        self.assertEqual(NI5, 5)
+        self.assertEqual(NEI.y.value, 2)
+        test_pickle_exception(self.assertRaises, TypeError, NEI.x)
+        test_pickle_exception(self.assertRaises, PicklingError, NEI)
+
+    def test_subclasses_without_direct_pickle_support_using_name(self):
+        class NamedInt(int):
+            __qualname__ = 'NamedInt'
+            def __new__(cls, *args):
+                _args = args
+                name, args = args[0], args[1:]
+                if len(args) == 0:
+                    raise TypeError("name and value must be specified")
+                self = int.__new__(cls, *args)
+                self._intname = name
+                self._args = _args
+                return self
+            @property
+            def __name__(self):
+                return self._intname
+            def __repr__(self):
+                # repr() is updated to include the name and type info
+                return "%s(%r, %s)" % (type(self).__name__,
+                                             self.__name__,
+                                             int.__repr__(self))
+            def __str__(self):
+                # str() is unchanged, even if it relies on the repr() fallback
+                base = int
+                base_str = base.__str__
+                if base_str.__objclass__ is object:
+                    return base.__repr__(self)
+                return base_str(self)
+            # for simplicity, we only define one operator that
+            # propagates expressions
+            def __add__(self, other):
+                temp = int(self) + int( other)
+                if isinstance(self, NamedInt) and isinstance(other, NamedInt):
+                    return NamedInt(
+                        '(%s + %s)' % (self.__name__, other.__name__),
+                        temp )
+                else:
+                    return temp
+
+        class NEI(NamedInt, Enum):
+            __qualname__ = 'NEI'
+            x = ('the-x', 1)
+            y = ('the-y', 2)
+            def __reduce_ex__(self, proto):
+                return getattr, (self.__class__, self._name_)
+
+        self.assertTrue(NEI.__new__ is Enum.__new__)
+        self.assertEqual(repr(NEI.x + NEI.y), "NamedInt('(the-x + the-y)', 3)")
+        globals()['NamedInt'] = NamedInt
+        globals()['NEI'] = NEI
+        NI5 = NamedInt('test', 5)
+        self.assertEqual(NI5, 5)
+        self.assertEqual(NEI.y.value, 2)
+        test_pickle_dump_load(self.assertTrue, NEI.y)
+        test_pickle_dump_load(self.assertTrue, NEI)
+
+    def test_tuple_subclass(self):
+        class SomeTuple(tuple, Enum):
+            __qualname__ = 'SomeTuple'
+            first = (1, 'for the money')
+            second = (2, 'for the show')
+            third = (3, 'for the music')
+        self.assertTrue(type(SomeTuple.first) is SomeTuple)
+        self.assertTrue(isinstance(SomeTuple.second, tuple))
+        self.assertEqual(SomeTuple.third, (3, 'for the music'))
+        globals()['SomeTuple'] = SomeTuple
+        test_pickle_dump_load(self.assertTrue, SomeTuple.first)
+
+    def test_duplicate_values_give_unique_enum_items(self):
+        class AutoNumber(Enum):
+            __order__ = 'enum_m enum_d enum_y'
+            enum_m = ()
+            enum_d = ()
+            enum_y = ()
+            def __new__(cls):
+                value = len(cls.__members__) + 1
+                obj = object.__new__(cls)
+                obj._value_ = value
+                return obj
+            def __int__(self):
+                return int(self._value_)
+        self.assertEqual(int(AutoNumber.enum_d), 2)
+        self.assertEqual(AutoNumber.enum_y.value, 3)
+        self.assertTrue(AutoNumber(1) is AutoNumber.enum_m)
+        self.assertEqual(
+            list(AutoNumber),
+            [AutoNumber.enum_m, AutoNumber.enum_d, AutoNumber.enum_y],
+            )
+
+    def test_inherited_new_from_enhanced_enum(self):
+        class AutoNumber2(Enum):
+            def __new__(cls):
+                value = len(cls.__members__) + 1
+                obj = object.__new__(cls)
+                obj._value_ = value
+                return obj
+            def __int__(self):
+                return int(self._value_)
+        class Color(AutoNumber2):
+            __order__ = 'red green blue'
+            red = ()
+            green = ()
+            blue = ()
+        self.assertEqual(len(Color), 3, "wrong number of elements: %d (should be %d)" % (len(Color), 3))
+        self.assertEqual(list(Color), [Color.red, Color.green, Color.blue])
+        if pyver >= 3.0:
+            self.assertEqual(list(map(int, Color)), [1, 2, 3])
+
+    def test_inherited_new_from_mixed_enum(self):
+        class AutoNumber3(IntEnum):
+            def __new__(cls):
+                value = len(cls.__members__) + 1
+                obj = int.__new__(cls, value)
+                obj._value_ = value
+                return obj
+        class Color(AutoNumber3):
+            red = ()
+            green = ()
+            blue = ()
+        self.assertEqual(len(Color), 3, "wrong number of elements: %d (should be %d)" % (len(Color), 3))
+        Color.red
+        Color.green
+        Color.blue
+
+    def test_ordered_mixin(self):
+        class OrderedEnum(Enum):
+            def __ge__(self, other):
+                if self.__class__ is other.__class__:
+                    return self._value_ >= other._value_
+                return NotImplemented
+            def __gt__(self, other):
+                if self.__class__ is other.__class__:
+                    return self._value_ > other._value_
+                return NotImplemented
+            def __le__(self, other):
+                if self.__class__ is other.__class__:
+                    return self._value_ <= other._value_
+                return NotImplemented
+            def __lt__(self, other):
+                if self.__class__ is other.__class__:
+                    return self._value_ < other._value_
+                return NotImplemented
+        class Grade(OrderedEnum):
+            __order__ = 'A B C D F'
+            A = 5
+            B = 4
+            C = 3
+            D = 2
+            F = 1
+        self.assertEqual(list(Grade), [Grade.A, Grade.B, Grade.C, Grade.D, Grade.F])
+        self.assertTrue(Grade.A > Grade.B)
+        self.assertTrue(Grade.F <= Grade.C)
+        self.assertTrue(Grade.D < Grade.A)
+        self.assertTrue(Grade.B >= Grade.B)
+
+    def test_extending2(self):
+        def bad_extension():
+            class Shade(Enum):
+                def shade(self):
+                    print(self.name)
+            class Color(Shade):
+                red = 1
+                green = 2
+                blue = 3
+            class MoreColor(Color):
+                cyan = 4
+                magenta = 5
+                yellow = 6
+        self.assertRaises(TypeError, bad_extension)
+
+    def test_extending3(self):
+        class Shade(Enum):
+            def shade(self):
+                return self.name
+        class Color(Shade):
+            def hex(self):
+                return '%s hexlified!' % self.value
+        class MoreColor(Color):
+            cyan = 4
+            magenta = 5
+            yellow = 6
+        self.assertEqual(MoreColor.magenta.hex(), '5 hexlified!')
+
+    def test_no_duplicates(self):
+        def bad_duplicates():
+            class UniqueEnum(Enum):
+                def __init__(self, *args):
+                    cls = self.__class__
+                    if any(self.value == e.value for e in cls):
+                        a = self.name
+                        e = cls(self.value).name
+                        raise ValueError(
+                                "aliases not allowed in UniqueEnum:  %r --> %r"
+                                % (a, e)
+                                )
+            class Color(UniqueEnum):
+                red = 1
+                green = 2
+                blue = 3
+            class Color(UniqueEnum):
+                red = 1
+                green = 2
+                blue = 3
+                grene = 2
+        self.assertRaises(ValueError, bad_duplicates)
+
+    def test_reversed(self):
+        self.assertEqual(
+                list(reversed(self.Season)),
+                [self.Season.WINTER, self.Season.AUTUMN, self.Season.SUMMER,
+                 self.Season.SPRING]
+                )
+
+    def test_init(self):
+        class Planet(Enum):
+            MERCURY = (3.303e+23, 2.4397e6)
+            VENUS   = (4.869e+24, 6.0518e6)
+            EARTH   = (5.976e+24, 6.37814e6)
+            MARS    = (6.421e+23, 3.3972e6)
+            JUPITER = (1.9e+27,   7.1492e7)
+            SATURN  = (5.688e+26, 6.0268e7)
+            URANUS  = (8.686e+25, 2.5559e7)
+            NEPTUNE = (1.024e+26, 2.4746e7)
+            def __init__(self, mass, radius):
+                self.mass = mass       # in kilograms
+                self.radius = radius   # in meters
+            @property
+            def surface_gravity(self):
+                # universal gravitational constant  (m3 kg-1 s-2)
+                G = 6.67300E-11
+                return G * self.mass / (self.radius * self.radius)
+        self.assertEqual(round(Planet.EARTH.surface_gravity, 2), 9.80)
+        self.assertEqual(Planet.EARTH.value, (5.976e+24, 6.37814e6))
+
+    def test_nonhash_value(self):
+        class AutoNumberInAList(Enum):
+            def __new__(cls):
+                value = [len(cls.__members__) + 1]
+                obj = object.__new__(cls)
+                obj._value_ = value
+                return obj
+        class ColorInAList(AutoNumberInAList):
+            __order__ = 'red green blue'
+            red = ()
+            green = ()
+            blue = ()
+        self.assertEqual(list(ColorInAList), [ColorInAList.red, ColorInAList.green, ColorInAList.blue])
+        self.assertEqual(ColorInAList.red.value, [1])
+        self.assertEqual(ColorInAList([1]), ColorInAList.red)
+
+    def test_conflicting_types_resolved_in_new(self):
+        class LabelledIntEnum(int, Enum):
+            def __new__(cls, *args):
+                value, label = args
+                obj = int.__new__(cls, value)
+                obj.label = label
+                obj._value_ = value
+                return obj
+
+        class LabelledList(LabelledIntEnum):
+            unprocessed = (1, "Unprocessed")
+            payment_complete = (2, "Payment Complete")
+
+        self.assertEqual(list(LabelledList), [LabelledList.unprocessed, LabelledList.payment_complete])
+        self.assertEqual(LabelledList.unprocessed, 1)
+        self.assertEqual(LabelledList(1), LabelledList.unprocessed)
+
+class TestUnique(unittest.TestCase):
+    """2.4 doesn't allow class decorators, use function syntax."""
+
+    def test_unique_clean(self):
+        class Clean(Enum):
+            one = 1
+            two = 'dos'
+            tres = 4.0
+        unique(Clean)
+        class Cleaner(IntEnum):
+            single = 1
+            double = 2
+            triple = 3
+        unique(Cleaner)
+
+    def test_unique_dirty(self):
+        try:
+            class Dirty(Enum):
+                __order__ = 'one two tres'
+                one = 1
+                two = 'dos'
+                tres = 1
+            unique(Dirty)
+        except ValueError:
+            exc = sys.exc_info()[1]
+            message = exc.args[0]
+        self.assertTrue('tres -> one' in message)
+
+        try:
+            class Dirtier(IntEnum):
+                __order__ = 'single double triple turkey'
+                single = 1
+                double = 1
+                triple = 3
+                turkey = 3
+            unique(Dirtier)
+        except ValueError:
+            exc = sys.exc_info()[1]
+            message = exc.args[0]
+        self.assertTrue('double -> single' in message)
+        self.assertTrue('turkey -> triple' in message)
+
+
+class TestMe(unittest.TestCase):
+
+    pass
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/lib/facebook/__init__.py b/lib/facebook/__init__.py
deleted file mode 100644
index 677cf2c4..00000000
--- a/lib/facebook/__init__.py
+++ /dev/null
@@ -1,510 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2010 Facebook
-# Copyright 2015 Mobolic
-#
-# 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
-#
-#     https://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.
-
-"""Python client library for the Facebook Platform.
-
-This client library is designed to support the Graph API and the
-official Facebook JavaScript SDK, which is the canonical way to
-implement Facebook authentication. Read more about the Graph API at
-https://developers.facebook.com/docs/graph-api.
-
-"""
-
-import hashlib
-import hmac
-import binascii
-import base64
-import requests
-import json
-import re
-
-try:
-    from urllib.parse import parse_qs, urlencode, urlparse
-except ImportError:
-    from urlparse import parse_qs, urlparse
-    from urllib import urlencode
-
-from . import version
-
-
-__version__ = version.__version__
-
-FACEBOOK_GRAPH_URL = "https://graph.facebook.com/"
-FACEBOOK_WWW_URL = "https://www.facebook.com/"
-FACEBOOK_OAUTH_DIALOG_PATH = "dialog/oauth?"
-VALID_API_VERSIONS = ["2.8", "2.9", "2.10", "2.11", "2.12", "3.0", "3.1"]
-VALID_SEARCH_TYPES = ["place", "placetopic"]
-
-
-class GraphAPI(object):
-    """A client for the Facebook Graph API.
-
-    https://developers.facebook.com/docs/graph-api
-
-    The Graph API is made up of the objects in Facebook (e.g., people,
-    pages, events, photos) and the connections between them (e.g.,
-    friends, photo tags, and event RSVPs). This client provides access
-    to those primitive types in a generic way. For example, given an
-    OAuth access token, this will fetch the profile of the active user
-    and the list of the user's friends:
-
-       graph = facebook.GraphAPI(access_token)
-       user = graph.get_object("me")
-       friends = graph.get_connections(user["id"], "friends")
-
-    You can see a list of all of the objects and connections supported
-    by the API at https://developers.facebook.com/docs/graph-api/reference/.
-
-    You can obtain an access token via OAuth or by using the Facebook
-    JavaScript SDK. See
-    https://developers.facebook.com/docs/facebook-login for details.
-
-    If you are using the JavaScript SDK, you can use the
-    get_user_from_cookie() method below to get the OAuth access token
-    for the active user from the cookie saved by the SDK.
-
-    """
-
-    def __init__(
-        self,
-        access_token=None,
-        timeout=None,
-        version=None,
-        proxies=None,
-        session=None,
-    ):
-        # The default version is only used if the version kwarg does not exist.
-        default_version = VALID_API_VERSIONS[0]
-
-        self.access_token = access_token
-        self.timeout = timeout
-        self.proxies = proxies
-        self.session = session or requests.Session()
-
-        if version:
-            version_regex = re.compile("^\d\.\d{1,2}$")
-            match = version_regex.search(str(version))
-            if match is not None:
-                if str(version) not in VALID_API_VERSIONS:
-                    raise GraphAPIError(
-                        "Valid API versions are "
-                        + str(VALID_API_VERSIONS).strip("[]")
-                    )
-                else:
-                    self.version = "v" + str(version)
-            else:
-                raise GraphAPIError(
-                    "Version number should be in the"
-                    " following format: #.# (e.g. 2.0)."
-                )
-        else:
-            self.version = "v" + default_version
-
-    def get_permissions(self, user_id):
-        """Fetches the permissions object from the graph."""
-        response = self.request(
-            "{0}/{1}/permissions".format(self.version, user_id), {}
-        )["data"]
-        return {x["permission"] for x in response if x["status"] == "granted"}
-
-    def get_object(self, id, **args):
-        """Fetches the given object from the graph."""
-        return self.request("{0}/{1}".format(self.version, id), args)
-
-    def get_objects(self, ids, **args):
-        """Fetches all of the given object from the graph.
-
-        We return a map from ID to object. If any of the IDs are
-        invalid, we raise an exception.
-        """
-        args["ids"] = ",".join(ids)
-        return self.request(self.version + "/", args)
-
-    def search(self, type, **args):
-        """https://developers.facebook.com/docs/places/search"""
-        if type not in VALID_SEARCH_TYPES:
-            raise GraphAPIError(
-                "Valid types are: %s" % ", ".join(VALID_SEARCH_TYPES)
-            )
-
-        args["type"] = type
-        return self.request(self.version + "/search/", args)
-
-    def get_connections(self, id, connection_name, **args):
-        """Fetches the connections for given object."""
-        return self.request(
-            "{0}/{1}/{2}".format(self.version, id, connection_name), args
-        )
-
-    def get_all_connections(self, id, connection_name, **args):
-        """Get all pages from a get_connections call
-
-        This will iterate over all pages returned by a get_connections call
-        and yield the individual items.
-        """
-        while True:
-            page = self.get_connections(id, connection_name, **args)
-            for post in page["data"]:
-                yield post
-            next = page.get("paging", {}).get("next")
-            if not next:
-                return
-            args = parse_qs(urlparse(next).query)
-            del args["access_token"]
-
-    def put_object(self, parent_object, connection_name, **data):
-        """Writes the given object to the graph, connected to the given parent.
-
-        For example,
-
-            graph.put_object("me", "feed", message="Hello, world")
-
-        writes "Hello, world" to the active user's wall. Likewise, this
-        will comment on the first post of the active user's feed:
-
-            feed = graph.get_connections("me", "feed")
-            post = feed["data"][0]
-            graph.put_object(post["id"], "comments", message="First!")
-
-        Certain operations require extended permissions. See
-        https://developers.facebook.com/docs/facebook-login/permissions
-        for details about permissions.
-
-        """
-        assert self.access_token, "Write operations require an access token"
-        return self.request(
-            "{0}/{1}/{2}".format(self.version, parent_object, connection_name),
-            post_args=data,
-            method="POST",
-        )
-
-    def put_comment(self, object_id, message):
-        """Writes the given comment on the given post."""
-        return self.put_object(object_id, "comments", message=message)
-
-    def put_like(self, object_id):
-        """Likes the given post."""
-        return self.put_object(object_id, "likes")
-
-    def delete_object(self, id):
-        """Deletes the object with the given ID from the graph."""
-        return self.request(
-            "{0}/{1}".format(self.version, id), method="DELETE"
-        )
-
-    def delete_request(self, user_id, request_id):
-        """Deletes the Request with the given ID for the given user."""
-        return self.request(
-            "{0}_{1}".format(request_id, user_id), method="DELETE"
-        )
-
-    def put_photo(self, image, album_path="me/photos", **kwargs):
-        """
-        Upload an image using multipart/form-data.
-
-        image - A file object representing the image to be uploaded.
-        album_path - A path representing where the image should be uploaded.
-
-        """
-        return self.request(
-            "{0}/{1}".format(self.version, album_path),
-            post_args=kwargs,
-            files={"source": image},
-            method="POST",
-        )
-
-    def get_version(self):
-        """Fetches the current version number of the Graph API being used."""
-        args = {"access_token": self.access_token}
-        try:
-            response = self.session.request(
-                "GET",
-                FACEBOOK_GRAPH_URL + self.version + "/me",
-                params=args,
-                timeout=self.timeout,
-                proxies=self.proxies,
-            )
-        except requests.HTTPError as e:
-            response = json.loads(e.read())
-            raise GraphAPIError(response)
-
-        try:
-            headers = response.headers
-            version = headers["facebook-api-version"].replace("v", "")
-            return str(version)
-        except Exception:
-            raise GraphAPIError("API version number not available")
-
-    def request(
-        self, path, args=None, post_args=None, files=None, method=None
-    ):
-        """Fetches the given path in the Graph API.
-
-        We translate args to a valid query string. If post_args is
-        given, we send a POST request to the given path with the given
-        arguments.
-
-        """
-        if args is None:
-            args = dict()
-        if post_args is not None:
-            method = "POST"
-
-        # Add `access_token` to post_args or args if it has not already been
-        # included.
-        if self.access_token:
-            # If post_args exists, we assume that args either does not exists
-            # or it does not need `access_token`.
-            if post_args and "access_token" not in post_args:
-                post_args["access_token"] = self.access_token
-            elif "access_token" not in args:
-                args["access_token"] = self.access_token
-
-        try:
-            response = self.session.request(
-                method or "GET",
-                FACEBOOK_GRAPH_URL + path,
-                timeout=self.timeout,
-                params=args,
-                data=post_args,
-                proxies=self.proxies,
-                files=files,
-            )
-        except requests.HTTPError as e:
-            response = json.loads(e.read())
-            raise GraphAPIError(response)
-
-        headers = response.headers
-        if "json" in headers["content-type"]:
-            result = response.json()
-        elif "image/" in headers["content-type"]:
-            mimetype = headers["content-type"]
-            result = {
-                "data": response.content,
-                "mime-type": mimetype,
-                "url": response.url,
-            }
-        elif "access_token" in parse_qs(response.text):
-            query_str = parse_qs(response.text)
-            if "access_token" in query_str:
-                result = {"access_token": query_str["access_token"][0]}
-                if "expires" in query_str:
-                    result["expires"] = query_str["expires"][0]
-            else:
-                raise GraphAPIError(response.json())
-        else:
-            raise GraphAPIError("Maintype was not text, image, or querystring")
-
-        if result and isinstance(result, dict) and result.get("error"):
-            raise GraphAPIError(result)
-        return result
-
-    def get_app_access_token(self, app_id, app_secret, offline=False):
-        """
-        Get the application's access token as a string.
-        If offline=True, use the concatenated app ID and secret
-        instead of making an API call.
-        <https://developers.facebook.com/docs/facebook-login/
-        access-tokens#apptokens>
-        """
-        if offline:
-            return "{0}|{1}".format(app_id, app_secret)
-        else:
-            args = {
-                "grant_type": "client_credentials",
-                "client_id": app_id,
-                "client_secret": app_secret,
-            }
-
-            return self.request(
-                "{0}/oauth/access_token".format(self.version), args=args
-            )["access_token"]
-
-    def get_access_token_from_code(
-        self, code, redirect_uri, app_id, app_secret
-    ):
-        """Get an access token from the "code" returned from an OAuth dialog.
-
-        Returns a dict containing the user-specific access token and its
-        expiration date (if applicable).
-
-        """
-        args = {
-            "code": code,
-            "redirect_uri": redirect_uri,
-            "client_id": app_id,
-            "client_secret": app_secret,
-        }
-
-        return self.request(
-            "{0}/oauth/access_token".format(self.version), args
-        )
-
-    def extend_access_token(self, app_id, app_secret):
-        """
-        Extends the expiration time of a valid OAuth access token. See
-        <https://developers.facebook.com/docs/facebook-login/access-tokens/
-        expiration-and-extension>
-
-        """
-        args = {
-            "client_id": app_id,
-            "client_secret": app_secret,
-            "grant_type": "fb_exchange_token",
-            "fb_exchange_token": self.access_token,
-        }
-
-        return self.request(
-            "{0}/oauth/access_token".format(self.version), args=args
-        )
-
-    def debug_access_token(self, token, app_id, app_secret):
-        """
-        Gets information about a user access token issued by an app. See
-        <https://developers.facebook.com/docs/facebook-login/
-        access-tokens/debugging-and-error-handling>
-
-        We can generate the app access token by concatenating the app
-        id and secret: <https://developers.facebook.com/docs/
-        facebook-login/access-tokens#apptokens>
-
-        """
-        args = {
-            "input_token": token,
-            "access_token": "{0}|{1}".format(app_id, app_secret),
-        }
-        return self.request(self.version + "/" + "debug_token", args=args)
-
-    def get_auth_url(self, app_id, canvas_url, perms=None, **kwargs):
-        """Build a URL to create an OAuth dialog."""
-        url = "{0}{1}/{2}".format(
-            FACEBOOK_WWW_URL, self.version, FACEBOOK_OAUTH_DIALOG_PATH
-        )
-
-        args = {"client_id": app_id, "redirect_uri": canvas_url}
-        if perms:
-            args["scope"] = ",".join(perms)
-        args.update(kwargs)
-        return url + urlencode(args)
-
-
-class GraphAPIError(Exception):
-    def __init__(self, result):
-        self.result = result
-        self.code = None
-        try:
-            self.type = result["error_code"]
-        except (KeyError, TypeError):
-            self.type = ""
-
-        # OAuth 2.0 Draft 10
-        try:
-            self.message = result["error_description"]
-        except (KeyError, TypeError):
-            # OAuth 2.0 Draft 00
-            try:
-                self.message = result["error"]["message"]
-                self.code = result["error"].get("code")
-                if not self.type:
-                    self.type = result["error"].get("type", "")
-            except (KeyError, TypeError):
-                # REST server style
-                try:
-                    self.message = result["error_msg"]
-                except (KeyError, TypeError):
-                    self.message = result
-
-        Exception.__init__(self, self.message)
-
-
-def get_user_from_cookie(cookies, app_id, app_secret):
-    """Parses the cookie set by the official Facebook JavaScript SDK.
-
-    cookies should be a dictionary-like object mapping cookie names to
-    cookie values.
-
-    If the user is logged in via Facebook, we return a dictionary with
-    the keys "uid" and "access_token". The former is the user's
-    Facebook ID, and the latter can be used to make authenticated
-    requests to the Graph API. If the user is not logged in, we
-    return None.
-
-    Read more about Facebook authentication at
-    https://developers.facebook.com/docs/facebook-login.
-
-    """
-    cookie = cookies.get("fbsr_" + app_id, "")
-    if not cookie:
-        return None
-    parsed_request = parse_signed_request(cookie, app_secret)
-    if not parsed_request:
-        return None
-    try:
-        result = GraphAPI().get_access_token_from_code(
-            parsed_request["code"], "", app_id, app_secret
-        )
-    except GraphAPIError:
-        return None
-    result["uid"] = parsed_request["user_id"]
-    return result
-
-
-def parse_signed_request(signed_request, app_secret):
-    """ Return dictionary with signed request data.
-
-    We return a dictionary containing the information in the
-    signed_request. This includes a user_id if the user has authorised
-    your application, as well as any information requested.
-
-    If the signed_request is malformed or corrupted, False is returned.
-
-    """
-    try:
-        encoded_sig, payload = map(str, signed_request.split(".", 1))
-
-        sig = base64.urlsafe_b64decode(
-            encoded_sig + "=" * ((4 - len(encoded_sig) % 4) % 4)
-        )
-        data = base64.urlsafe_b64decode(
-            payload + "=" * ((4 - len(payload) % 4) % 4)
-        )
-    except IndexError:
-        # Signed request was malformed.
-        return False
-    except TypeError:
-        # Signed request had a corrupted payload.
-        return False
-    except binascii.Error:
-        # Signed request had a corrupted payload.
-        return False
-
-    data = json.loads(data.decode("ascii"))
-    if data.get("algorithm", "").upper() != "HMAC-SHA256":
-        return False
-
-    # HMAC can only handle ascii (byte) strings
-    # https://bugs.python.org/issue5285
-    app_secret = app_secret.encode("ascii")
-    payload = payload.encode("ascii")
-
-    expected_sig = hmac.new(
-        app_secret, msg=payload, digestmod=hashlib.sha256
-    ).digest()
-    if sig != expected_sig:
-        return False
-
-    return data
diff --git a/lib/facebook/version.py b/lib/facebook/version.py
deleted file mode 100644
index a0e28279..00000000
--- a/lib/facebook/version.py
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2015-2018 Mobolic
-#
-# 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
-#
-#     https://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.
-
-__version__ = "3.1.0"
diff --git a/lib/feedparser.py b/lib/feedparser.py
new file mode 100644
index 00000000..15fdc95b
--- /dev/null
+++ b/lib/feedparser.py
@@ -0,0 +1,3909 @@
+#!/usr/bin/env python
+"""Universal feed parser
+
+Handles RSS 0.9x, RSS 1.0, RSS 2.0, CDF, Atom 0.3, and Atom 1.0 feeds
+
+Visit http://feedparser.org/ for the latest version
+Visit http://feedparser.org/docs/ for the latest documentation
+
+Required: Python 2.4 or later
+Recommended: CJKCodecs and iconv_codec <http://cjkpython.i18n.org/>
+"""
+
+__version__ = "5.0.1"
+__license__ = """Copyright (c) 2002-2008, Mark Pilgrim, All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS'
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE."""
+__author__ = "Mark Pilgrim <http://diveintomark.org/>"
+__contributors__ = ["Jason Diamond <http://injektilo.org/>",
+                    "John Beimler <http://john.beimler.org/>",
+                    "Fazal Majid <http://www.majid.info/mylos/weblog/>",
+                    "Aaron Swartz <http://aaronsw.com/>",
+                    "Kevin Marks <http://epeus.blogspot.com/>",
+                    "Sam Ruby <http://intertwingly.net/>",
+                    "Ade Oshineye <http://blog.oshineye.com/>",
+                    "Martin Pool <http://sourcefrog.net/>",
+                    "Kurt McKee <http://kurtmckee.org/>"]
+_debug = 0
+
+# HTTP "User-Agent" header to send to servers when downloading feeds.
+# If you are embedding feedparser in a larger application, you should
+# change this to your application name and URL.
+USER_AGENT = "UniversalFeedParser/%s +http://feedparser.org/" % __version__
+
+# HTTP "Accept" header to send to servers when downloading feeds.  If you don't
+# want to send an Accept header, set this to None.
+ACCEPT_HEADER = "application/atom+xml,application/rdf+xml,application/rss+xml,application/x-netcdf,application/xml;q=0.9,text/xml;q=0.2,*/*;q=0.1"
+
+# List of preferred XML parsers, by SAX driver name.  These will be tried first,
+# but if they're not installed, Python will keep searching through its own list
+# of pre-installed parsers until it finds one that supports everything we need.
+PREFERRED_XML_PARSERS = ["drv_libxml2"]
+
+# If you want feedparser to automatically run HTML markup through HTML Tidy, set
+# this to 1.  Requires mxTidy <http://www.egenix.com/files/python/mxTidy.html>
+# or utidylib <http://utidylib.berlios.de/>.
+TIDY_MARKUP = 0
+
+# List of Python interfaces for HTML Tidy, in order of preference.  Only useful
+# if TIDY_MARKUP = 1
+PREFERRED_TIDY_INTERFACES = ["uTidy", "mxTidy"]
+
+# If you want feedparser to automatically resolve all relative URIs, set this
+# to 1.
+RESOLVE_RELATIVE_URIS = 1
+
+# If you want feedparser to automatically sanitize all potentially unsafe
+# HTML content, set this to 1.
+SANITIZE_HTML = 1
+
+# ---------- Python 3 modules (make it work if possible) ----------
+try:
+    import rfc822
+except ImportError:
+    from email import _parseaddr as rfc822
+
+try:
+    # Python 3.1 introduces bytes.maketrans and simultaneously
+    # deprecates string.maketrans; use bytes.maketrans if possible
+    _maketrans = bytes.maketrans
+except (NameError, AttributeError):
+    import string
+    _maketrans = string.maketrans
+
+# base64 support for Atom feeds that contain embedded binary data
+try:
+    import base64, binascii
+    # Python 3.1 deprecates decodestring in favor of decodebytes
+    _base64decode = getattr(base64, 'decodebytes', base64.decodestring)
+except:
+    base64 = binascii = None
+
+def _s2bytes(s):
+  # Convert a UTF-8 str to bytes if the interpreter is Python 3
+  try:
+    return bytes(s, 'utf8')
+  except (NameError, TypeError):
+    # In Python 2.5 and below, bytes doesn't exist (NameError)
+    # In Python 2.6 and above, bytes and str are the same (TypeError)
+    return s
+
+def _l2bytes(l):
+  # Convert a list of ints to bytes if the interpreter is Python 3
+  try:
+    if bytes is not str:
+      # In Python 2.6 and above, this call won't raise an exception
+      # but it will return bytes([65]) as '[65]' instead of 'A'
+      return bytes(l)
+    raise NameError
+  except NameError:
+    return ''.join(map(chr, l))
+
+# If you want feedparser to allow all URL schemes, set this to ()
+# List culled from Python's urlparse documentation at:
+#   http://docs.python.org/library/urlparse.html
+# as well as from "URI scheme" at Wikipedia:
+#   https://secure.wikimedia.org/wikipedia/en/wiki/URI_scheme
+# Many more will likely need to be added!
+ACCEPTABLE_URI_SCHEMES = (
+    'file', 'ftp', 'gopher', 'h323', 'hdl', 'http', 'https', 'imap', 'mailto',
+    'mms', 'news', 'nntp', 'prospero', 'rsync', 'rtsp', 'rtspu', 'sftp',
+    'shttp', 'sip', 'sips', 'snews', 'svn', 'svn+ssh', 'telnet', 'wais',
+    # Additional common-but-unofficial schemes
+    'aim', 'callto', 'cvs', 'facetime', 'feed', 'git', 'gtalk', 'irc', 'ircs',
+    'irc6', 'itms', 'mms', 'msnim', 'skype', 'ssh', 'smb', 'svn', 'ymsg',
+)
+#ACCEPTABLE_URI_SCHEMES = ()
+
+# ---------- required modules (should come with any Python distribution) ----------
+import sgmllib, re, sys, copy, urlparse, time, types, cgi, urllib, urllib2, datetime
+try:
+    from io import BytesIO as _StringIO
+except ImportError:
+    try:
+        from cStringIO import StringIO as _StringIO
+    except:
+        from StringIO import StringIO as _StringIO
+
+# ---------- optional modules (feedparser will work without these, but with reduced functionality) ----------
+
+# gzip is included with most Python distributions, but may not be available if you compiled your own
+try:
+    import gzip
+except:
+    gzip = None
+try:
+    import zlib
+except:
+    zlib = None
+
+# If a real XML parser is available, feedparser will attempt to use it.  feedparser has
+# been tested with the built-in SAX parser, PyXML, and libxml2.  On platforms where the
+# Python distribution does not come with an XML parser (such as Mac OS X 10.2 and some
+# versions of FreeBSD), feedparser will quietly fall back on regex-based parsing.
+try:
+    import xml.sax
+    xml.sax.make_parser(PREFERRED_XML_PARSERS) # test for valid parsers
+    from xml.sax.saxutils import escape as _xmlescape
+    _XML_AVAILABLE = 1
+except:
+    _XML_AVAILABLE = 0
+    def _xmlescape(data,entities={}):
+        data = data.replace('&', '&amp;')
+        data = data.replace('>', '&gt;')
+        data = data.replace('<', '&lt;')
+        for char, entity in entities:
+            data = data.replace(char, entity)
+        return data
+
+# cjkcodecs and iconv_codec provide support for more character encodings.
+# Both are available from http://cjkpython.i18n.org/
+try:
+    import cjkcodecs.aliases
+except:
+    pass
+try:
+    import iconv_codec
+except:
+    pass
+
+# chardet library auto-detects character encodings
+# Download from http://chardet.feedparser.org/
+try:
+    import chardet
+    if _debug:
+        import chardet.constants
+        chardet.constants._debug = 1
+except:
+    chardet = None
+
+# reversable htmlentitydefs mappings for Python 2.2
+try:
+  from htmlentitydefs import name2codepoint, codepoint2name
+except:
+  import htmlentitydefs
+  name2codepoint={}
+  codepoint2name={}
+  for (name,codepoint) in htmlentitydefs.entitydefs.iteritems():
+    if codepoint.startswith('&#'): codepoint=unichr(int(codepoint[2:-1]))
+    name2codepoint[name]=ord(codepoint)
+    codepoint2name[ord(codepoint)]=name
+
+# BeautifulSoup parser used for parsing microformats from embedded HTML content
+# http://www.crummy.com/software/BeautifulSoup/
+# feedparser is tested with BeautifulSoup 3.0.x, but it might work with the
+# older 2.x series.  If it doesn't, and you can figure out why, I'll accept a
+# patch and modify the compatibility statement accordingly.
+try:
+    import BeautifulSoup
+except:
+    BeautifulSoup = None
+
+# ---------- don't touch these ----------
+class ThingsNobodyCaresAboutButMe(Exception): pass
+class CharacterEncodingOverride(ThingsNobodyCaresAboutButMe): pass
+class CharacterEncodingUnknown(ThingsNobodyCaresAboutButMe): pass
+class NonXMLContentType(ThingsNobodyCaresAboutButMe): pass
+class UndeclaredNamespace(Exception): pass
+
+sgmllib.tagfind = re.compile('[a-zA-Z][-_.:a-zA-Z0-9]*')
+sgmllib.special = re.compile('<!')
+sgmllib.charref = re.compile('&#(\d+|[xX][0-9a-fA-F]+);')
+
+if sgmllib.endbracket.search(' <').start(0):
+    class EndBracketRegEx:
+        def __init__(self):
+            # Overriding the built-in sgmllib.endbracket regex allows the
+            # parser to find angle brackets embedded in element attributes.
+            self.endbracket = re.compile('''([^'"<>]|"[^"]*"(?=>|/|\s|\w+=)|'[^']*'(?=>|/|\s|\w+=))*(?=[<>])|.*?(?=[<>])''')
+        def search(self,string,index=0):
+            match = self.endbracket.match(string,index)
+            if match is not None:
+                # Returning a new object in the calling thread's context
+                # resolves a thread-safety.
+                return EndBracketMatch(match)
+            return None
+    class EndBracketMatch:
+        def __init__(self, match):
+            self.match = match
+        def start(self, n):
+            return self.match.end(n)
+    sgmllib.endbracket = EndBracketRegEx()
+
+SUPPORTED_VERSIONS = {'': 'unknown',
+                      'rss090': 'RSS 0.90',
+                      'rss091n': 'RSS 0.91 (Netscape)',
+                      'rss091u': 'RSS 0.91 (Userland)',
+                      'rss092': 'RSS 0.92',
+                      'rss093': 'RSS 0.93',
+                      'rss094': 'RSS 0.94',
+                      'rss20': 'RSS 2.0',
+                      'rss10': 'RSS 1.0',
+                      'rss': 'RSS (unknown version)',
+                      'atom01': 'Atom 0.1',
+                      'atom02': 'Atom 0.2',
+                      'atom03': 'Atom 0.3',
+                      'atom10': 'Atom 1.0',
+                      'atom': 'Atom (unknown version)',
+                      'cdf': 'CDF',
+                      'hotrss': 'Hot RSS'
+                      }
+
+try:
+    UserDict = dict
+except NameError:
+    # Python 2.1 does not have dict
+    from UserDict import UserDict
+    def dict(aList):
+        rc = {}
+        for k, v in aList:
+            rc[k] = v
+        return rc
+
+class FeedParserDict(UserDict):
+    keymap = {'channel': 'feed',
+              'items': 'entries',
+              'guid': 'id',
+              'date': 'updated',
+              'date_parsed': 'updated_parsed',
+              'description': ['summary', 'subtitle'],
+              'url': ['href'],
+              'modified': 'updated',
+              'modified_parsed': 'updated_parsed',
+              'issued': 'published',
+              'issued_parsed': 'published_parsed',
+              'copyright': 'rights',
+              'copyright_detail': 'rights_detail',
+              'tagline': 'subtitle',
+              'tagline_detail': 'subtitle_detail'}
+    def __getitem__(self, key):
+        if key == 'category':
+            return UserDict.__getitem__(self, 'tags')[0]['term']
+        if key == 'enclosures':
+            norel = lambda link: FeedParserDict([(name,value) for (name,value) in link.items() if name!='rel'])
+            return [norel(link) for link in UserDict.__getitem__(self, 'links') if link['rel']=='enclosure']
+        if key == 'license':
+            for link in UserDict.__getitem__(self, 'links'):
+                if link['rel']=='license' and link.has_key('href'):
+                    return link['href']
+        if key == 'categories':
+            return [(tag['scheme'], tag['term']) for tag in UserDict.__getitem__(self, 'tags')]
+        realkey = self.keymap.get(key, key)
+        if type(realkey) == types.ListType:
+            for k in realkey:
+                if UserDict.__contains__(self, k):
+                    return UserDict.__getitem__(self, k)
+        if UserDict.__contains__(self, key):
+            return UserDict.__getitem__(self, key)
+        return UserDict.__getitem__(self, realkey)
+
+    def __setitem__(self, key, value):
+        for k in self.keymap.keys():
+            if key == k:
+                key = self.keymap[k]
+                if type(key) == types.ListType:
+                    key = key[0]
+        return UserDict.__setitem__(self, key, value)
+
+    def get(self, key, default=None):
+        if self.has_key(key):
+            return self[key]
+        else:
+            return default
+
+    def setdefault(self, key, value):
+        if not self.has_key(key):
+            self[key] = value
+        return self[key]
+
+    def has_key(self, key):
+        try:
+            return hasattr(self, key) or UserDict.__contains__(self, key)
+        except AttributeError:
+            return False
+    # This alias prevents the 2to3 tool from changing the semantics of the
+    # __contains__ function below and exhausting the maximum recursion depth
+    __has_key = has_key
+
+    def __getattr__(self, key):
+        try:
+            return self.__dict__[key]
+        except KeyError:
+            pass
+        try:
+            assert not key.startswith('_')
+            return self.__getitem__(key)
+        except:
+            raise AttributeError, "object has no attribute '%s'" % key
+
+    def __setattr__(self, key, value):
+        if key.startswith('_') or key == 'data':
+            self.__dict__[key] = value
+        else:
+            return self.__setitem__(key, value)
+
+    def __contains__(self, key):
+        return self.__has_key(key)
+
+def zopeCompatibilityHack():
+    global FeedParserDict
+    del FeedParserDict
+    def FeedParserDict(aDict=None):
+        rc = {}
+        if aDict:
+            rc.update(aDict)
+        return rc
+
+_ebcdic_to_ascii_map = None
+def _ebcdic_to_ascii(s):
+    global _ebcdic_to_ascii_map
+    if not _ebcdic_to_ascii_map:
+        emap = (
+            0,1,2,3,156,9,134,127,151,141,142,11,12,13,14,15,
+            16,17,18,19,157,133,8,135,24,25,146,143,28,29,30,31,
+            128,129,130,131,132,10,23,27,136,137,138,139,140,5,6,7,
+            144,145,22,147,148,149,150,4,152,153,154,155,20,21,158,26,
+            32,160,161,162,163,164,165,166,167,168,91,46,60,40,43,33,
+            38,169,170,171,172,173,174,175,176,177,93,36,42,41,59,94,
+            45,47,178,179,180,181,182,183,184,185,124,44,37,95,62,63,
+            186,187,188,189,190,191,192,193,194,96,58,35,64,39,61,34,
+            195,97,98,99,100,101,102,103,104,105,196,197,198,199,200,201,
+            202,106,107,108,109,110,111,112,113,114,203,204,205,206,207,208,
+            209,126,115,116,117,118,119,120,121,122,210,211,212,213,214,215,
+            216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,
+            123,65,66,67,68,69,70,71,72,73,232,233,234,235,236,237,
+            125,74,75,76,77,78,79,80,81,82,238,239,240,241,242,243,
+            92,159,83,84,85,86,87,88,89,90,244,245,246,247,248,249,
+            48,49,50,51,52,53,54,55,56,57,250,251,252,253,254,255
+            )
+        _ebcdic_to_ascii_map = _maketrans( \
+            _l2bytes(range(256)), _l2bytes(emap))
+    return s.translate(_ebcdic_to_ascii_map)
+
+_cp1252 = {
+  unichr(128): unichr(8364), # euro sign
+  unichr(130): unichr(8218), # single low-9 quotation mark
+  unichr(131): unichr( 402), # latin small letter f with hook
+  unichr(132): unichr(8222), # double low-9 quotation mark
+  unichr(133): unichr(8230), # horizontal ellipsis
+  unichr(134): unichr(8224), # dagger
+  unichr(135): unichr(8225), # double dagger
+  unichr(136): unichr( 710), # modifier letter circumflex accent
+  unichr(137): unichr(8240), # per mille sign
+  unichr(138): unichr( 352), # latin capital letter s with caron
+  unichr(139): unichr(8249), # single left-pointing angle quotation mark
+  unichr(140): unichr( 338), # latin capital ligature oe
+  unichr(142): unichr( 381), # latin capital letter z with caron
+  unichr(145): unichr(8216), # left single quotation mark
+  unichr(146): unichr(8217), # right single quotation mark
+  unichr(147): unichr(8220), # left double quotation mark
+  unichr(148): unichr(8221), # right double quotation mark
+  unichr(149): unichr(8226), # bullet
+  unichr(150): unichr(8211), # en dash
+  unichr(151): unichr(8212), # em dash
+  unichr(152): unichr( 732), # small tilde
+  unichr(153): unichr(8482), # trade mark sign
+  unichr(154): unichr( 353), # latin small letter s with caron
+  unichr(155): unichr(8250), # single right-pointing angle quotation mark
+  unichr(156): unichr( 339), # latin small ligature oe
+  unichr(158): unichr( 382), # latin small letter z with caron
+  unichr(159): unichr( 376)} # latin capital letter y with diaeresis
+
+_urifixer = re.compile('^([A-Za-z][A-Za-z0-9+-.]*://)(/*)(.*?)')
+def _urljoin(base, uri):
+    uri = _urifixer.sub(r'\1\3', uri)
+    try:
+        return urlparse.urljoin(base, uri)
+    except:
+        uri = urlparse.urlunparse([urllib.quote(part) for part in urlparse.urlparse(uri)])
+        return urlparse.urljoin(base, uri)
+
+class _FeedParserMixin:
+    namespaces = {'': '',
+                  'http://backend.userland.com/rss': '',
+                  'http://blogs.law.harvard.edu/tech/rss': '',
+                  'http://purl.org/rss/1.0/': '',
+                  'http://my.netscape.com/rdf/simple/0.9/': '',
+                  'http://example.com/newformat#': '',
+                  'http://example.com/necho': '',
+                  'http://purl.org/echo/': '',
+                  'uri/of/echo/namespace#': '',
+                  'http://purl.org/pie/': '',
+                  'http://purl.org/atom/ns#': '',
+                  'http://www.w3.org/2005/Atom': '',
+                  'http://purl.org/rss/1.0/modules/rss091#': '',
+
+                  'http://webns.net/mvcb/':                               'admin',
+                  'http://purl.org/rss/1.0/modules/aggregation/':         'ag',
+                  'http://purl.org/rss/1.0/modules/annotate/':            'annotate',
+                  'http://media.tangent.org/rss/1.0/':                    'audio',
+                  'http://backend.userland.com/blogChannelModule':        'blogChannel',
+                  'http://web.resource.org/cc/':                          'cc',
+                  'http://backend.userland.com/creativeCommonsRssModule': 'creativeCommons',
+                  'http://purl.org/rss/1.0/modules/company':              'co',
+                  'http://purl.org/rss/1.0/modules/content/':             'content',
+                  'http://my.theinfo.org/changed/1.0/rss/':               'cp',
+                  'http://purl.org/dc/elements/1.1/':                     'dc',
+                  'http://purl.org/dc/terms/':                            'dcterms',
+                  'http://purl.org/rss/1.0/modules/email/':               'email',
+                  'http://purl.org/rss/1.0/modules/event/':               'ev',
+                  'http://rssnamespace.org/feedburner/ext/1.0':           'feedburner',
+                  'http://freshmeat.net/rss/fm/':                         'fm',
+                  'http://xmlns.com/foaf/0.1/':                           'foaf',
+                  'http://www.w3.org/2003/01/geo/wgs84_pos#':             'geo',
+                  'http://postneo.com/icbm/':                             'icbm',
+                  'http://purl.org/rss/1.0/modules/image/':               'image',
+                  'http://www.itunes.com/DTDs/PodCast-1.0.dtd':           'itunes',
+                  'http://example.com/DTDs/PodCast-1.0.dtd':              'itunes',
+                  'http://purl.org/rss/1.0/modules/link/':                'l',
+                  'http://search.yahoo.com/mrss':                         'media',
+                  #Version 1.1.2 of the Media RSS spec added the trailing slash on the namespace
+                  'http://search.yahoo.com/mrss/':                         'media',
+                  'http://madskills.com/public/xml/rss/module/pingback/': 'pingback',
+                  'http://prismstandard.org/namespaces/1.2/basic/':       'prism',
+                  'http://www.w3.org/1999/02/22-rdf-syntax-ns#':          'rdf',
+                  'http://www.w3.org/2000/01/rdf-schema#':                'rdfs',
+                  'http://purl.org/rss/1.0/modules/reference/':           'ref',
+                  'http://purl.org/rss/1.0/modules/richequiv/':           'reqv',
+                  'http://purl.org/rss/1.0/modules/search/':              'search',
+                  'http://purl.org/rss/1.0/modules/slash/':               'slash',
+                  'http://schemas.xmlsoap.org/soap/envelope/':            'soap',
+                  'http://purl.org/rss/1.0/modules/servicestatus/':       'ss',
+                  'http://hacks.benhammersley.com/rss/streaming/':        'str',
+                  'http://purl.org/rss/1.0/modules/subscription/':        'sub',
+                  'http://purl.org/rss/1.0/modules/syndication/':         'sy',
+                  'http://schemas.pocketsoap.com/rss/myDescModule/':      'szf',
+                  'http://purl.org/rss/1.0/modules/taxonomy/':            'taxo',
+                  'http://purl.org/rss/1.0/modules/threading/':           'thr',
+                  'http://purl.org/rss/1.0/modules/textinput/':           'ti',
+                  'http://madskills.com/public/xml/rss/module/trackback/':'trackback',
+                  'http://wellformedweb.org/commentAPI/':                 'wfw',
+                  'http://purl.org/rss/1.0/modules/wiki/':                'wiki',
+                  'http://www.w3.org/1999/xhtml':                         'xhtml',
+                  'http://www.w3.org/1999/xlink':                         'xlink',
+                  'http://www.w3.org/XML/1998/namespace':                 'xml'
+}
+    _matchnamespaces = {}
+
+    can_be_relative_uri = ['link', 'id', 'wfw_comment', 'wfw_commentrss', 'docs', 'url', 'href', 'comments', 'icon', 'logo']
+    can_contain_relative_uris = ['content', 'title', 'summary', 'info', 'tagline', 'subtitle', 'copyright', 'rights', 'description']
+    can_contain_dangerous_markup = ['content', 'title', 'summary', 'info', 'tagline', 'subtitle', 'copyright', 'rights', 'description']
+    html_types = ['text/html', 'application/xhtml+xml']
+
+    def __init__(self, baseuri=None, baselang=None, encoding='utf-8'):
+        if _debug: sys.stderr.write('initializing FeedParser\n')
+        if not self._matchnamespaces:
+            for k, v in self.namespaces.items():
+                self._matchnamespaces[k.lower()] = v
+        self.feeddata = FeedParserDict() # feed-level data
+        self.encoding = encoding # character encoding
+        self.entries = [] # list of entry-level data
+        self.version = '' # feed type/version, see SUPPORTED_VERSIONS
+        self.namespacesInUse = {} # dictionary of namespaces defined by the feed
+
+        # the following are used internally to track state;
+        # this is really out of control and should be refactored
+        self.infeed = 0
+        self.inentry = 0
+        self.incontent = 0
+        self.intextinput = 0
+        self.inimage = 0
+        self.inauthor = 0
+        self.incontributor = 0
+        self.inpublisher = 0
+        self.insource = 0
+        self.sourcedata = FeedParserDict()
+        self.contentparams = FeedParserDict()
+        self._summaryKey = None
+        self.namespacemap = {}
+        self.elementstack = []
+        self.basestack = []
+        self.langstack = []
+        self.baseuri = baseuri or ''
+        self.lang = baselang or None
+        self.svgOK = 0
+        self.hasTitle = 0
+        if baselang:
+            self.feeddata['language'] = baselang.replace('_','-')
+
+    def unknown_starttag(self, tag, attrs):
+        if _debug: sys.stderr.write('start %s with %s\n' % (tag, attrs))
+        # normalize attrs
+        attrs = [(k.lower(), v) for k, v in attrs]
+        attrs = [(k, k in ('rel', 'type') and v.lower() or v) for k, v in attrs]
+        # the sgml parser doesn't handle entities in attributes, but
+        # strict xml parsers do -- account for this difference
+        if isinstance(self, _LooseFeedParser):
+            attrs = [(k, v.replace('&amp;', '&')) for k, v in attrs]
+
+        # track xml:base and xml:lang
+        attrsD = dict(attrs)
+        baseuri = attrsD.get('xml:base', attrsD.get('base')) or self.baseuri
+        if type(baseuri) != type(u''):
+            try:
+                baseuri = unicode(baseuri, self.encoding)
+            except:
+                baseuri = unicode(baseuri, 'iso-8859-1')
+        # ensure that self.baseuri is always an absolute URI that
+        # uses a whitelisted URI scheme (e.g. not `javscript:`)
+        if self.baseuri:
+            self.baseuri = _makeSafeAbsoluteURI(self.baseuri, baseuri) or self.baseuri
+        else:
+            self.baseuri = _urljoin(self.baseuri, baseuri)
+        lang = attrsD.get('xml:lang', attrsD.get('lang'))
+        if lang == '':
+            # xml:lang could be explicitly set to '', we need to capture that
+            lang = None
+        elif lang is None:
+            # if no xml:lang is specified, use parent lang
+            lang = self.lang
+        if lang:
+            if tag in ('feed', 'rss', 'rdf:RDF'):
+                self.feeddata['language'] = lang.replace('_','-')
+        self.lang = lang
+        self.basestack.append(self.baseuri)
+        self.langstack.append(lang)
+
+        # track namespaces
+        for prefix, uri in attrs:
+            if prefix.startswith('xmlns:'):
+                self.trackNamespace(prefix[6:], uri)
+            elif prefix == 'xmlns':
+                self.trackNamespace(None, uri)
+
+        # track inline content
+        if self.incontent and self.contentparams.has_key('type') and not self.contentparams.get('type', 'xml').endswith('xml'):
+            if tag in ['xhtml:div', 'div']: return # typepad does this 10/2007
+            # element declared itself as escaped markup, but it isn't really
+            self.contentparams['type'] = 'application/xhtml+xml'
+        if self.incontent and self.contentparams.get('type') == 'application/xhtml+xml':
+            if tag.find(':') <> -1:
+                prefix, tag = tag.split(':', 1)
+                namespace = self.namespacesInUse.get(prefix, '')
+                if tag=='math' and namespace=='http://www.w3.org/1998/Math/MathML':
+                    attrs.append(('xmlns',namespace))
+                if tag=='svg' and namespace=='http://www.w3.org/2000/svg':
+                    attrs.append(('xmlns',namespace))
+            if tag == 'svg': self.svgOK += 1
+            return self.handle_data('<%s%s>' % (tag, self.strattrs(attrs)), escape=0)
+
+        # match namespaces
+        if tag.find(':') <> -1:
+            prefix, suffix = tag.split(':', 1)
+        else:
+            prefix, suffix = '', tag
+        prefix = self.namespacemap.get(prefix, prefix)
+        if prefix:
+            prefix = prefix + '_'
+
+        # special hack for better tracking of empty textinput/image elements in illformed feeds
+        if (not prefix) and tag not in ('title', 'link', 'description', 'name'):
+            self.intextinput = 0
+        if (not prefix) and tag not in ('title', 'link', 'description', 'url', 'href', 'width', 'height'):
+            self.inimage = 0
+
+        # call special handler (if defined) or default handler
+        methodname = '_start_' + prefix + suffix
+        try:
+            method = getattr(self, methodname)
+            return method(attrsD)
+        except AttributeError:
+            # Since there's no handler or something has gone wrong we explicitly add the element and its attributes
+            unknown_tag = prefix + suffix
+            if len(attrsD) == 0:
+                # No attributes so merge it into the encosing dictionary
+                return self.push(unknown_tag, 1)
+            else:
+                # Has attributes so create it in its own dictionary
+                context = self._getContext()
+                context[unknown_tag] = attrsD
+
+    def unknown_endtag(self, tag):
+        if _debug: sys.stderr.write('end %s\n' % tag)
+        # match namespaces
+        if tag.find(':') <> -1:
+            prefix, suffix = tag.split(':', 1)
+        else:
+            prefix, suffix = '', tag
+        prefix = self.namespacemap.get(prefix, prefix)
+        if prefix:
+            prefix = prefix + '_'
+        if suffix == 'svg' and self.svgOK: self.svgOK -= 1
+
+        # call special handler (if defined) or default handler
+        methodname = '_end_' + prefix + suffix
+        try:
+            if self.svgOK: raise AttributeError()
+            method = getattr(self, methodname)
+            method()
+        except AttributeError:
+            self.pop(prefix + suffix)
+
+        # track inline content
+        if self.incontent and self.contentparams.has_key('type') and not self.contentparams.get('type', 'xml').endswith('xml'):
+            # element declared itself as escaped markup, but it isn't really
+            if tag in ['xhtml:div', 'div']: return # typepad does this 10/2007
+            self.contentparams['type'] = 'application/xhtml+xml'
+        if self.incontent and self.contentparams.get('type') == 'application/xhtml+xml':
+            tag = tag.split(':')[-1]
+            self.handle_data('</%s>' % tag, escape=0)
+
+        # track xml:base and xml:lang going out of scope
+        if self.basestack:
+            self.basestack.pop()
+            if self.basestack and self.basestack[-1]:
+                self.baseuri = self.basestack[-1]
+        if self.langstack:
+            self.langstack.pop()
+            if self.langstack: # and (self.langstack[-1] is not None):
+                self.lang = self.langstack[-1]
+
+    def handle_charref(self, ref):
+        # called for each character reference, e.g. for '&#160;', ref will be '160'
+        if not self.elementstack: return
+        ref = ref.lower()
+        if ref in ('34', '38', '39', '60', '62', 'x22', 'x26', 'x27', 'x3c', 'x3e'):
+            text = '&#%s;' % ref
+        else:
+            if ref[0] == 'x':
+                c = int(ref[1:], 16)
+            else:
+                c = int(ref)
+            text = unichr(c).encode('utf-8')
+        self.elementstack[-1][2].append(text)
+
+    def handle_entityref(self, ref):
+        # called for each entity reference, e.g. for '&copy;', ref will be 'copy'
+        if not self.elementstack: return
+        if _debug: sys.stderr.write('entering handle_entityref with %s\n' % ref)
+        if ref in ('lt', 'gt', 'quot', 'amp', 'apos'):
+            text = '&%s;' % ref
+        elif ref in self.entities.keys():
+            text = self.entities[ref]
+            if text.startswith('&#') and text.endswith(';'):
+                return self.handle_entityref(text)
+        else:
+            try: name2codepoint[ref]
+            except KeyError: text = '&%s;' % ref
+            else: text = unichr(name2codepoint[ref]).encode('utf-8')
+        self.elementstack[-1][2].append(text)
+
+    def handle_data(self, text, escape=1):
+        # called for each block of plain text, i.e. outside of any tag and
+        # not containing any character or entity references
+        if not self.elementstack: return
+        if escape and self.contentparams.get('type') == 'application/xhtml+xml':
+            text = _xmlescape(text)
+        self.elementstack[-1][2].append(text)
+
+    def handle_comment(self, text):
+        # called for each comment, e.g. <!-- insert message here -->
+        pass
+
+    def handle_pi(self, text):
+        # called for each processing instruction, e.g. <?instruction>
+        pass
+
+    def handle_decl(self, text):
+        pass
+
+    def parse_declaration(self, i):
+        # override internal declaration handler to handle CDATA blocks
+        if _debug: sys.stderr.write('entering parse_declaration\n')
+        if self.rawdata[i:i+9] == '<![CDATA[':
+            k = self.rawdata.find(']]>', i)
+            if k == -1:
+                # CDATA block began but didn't finish
+                k = len(self.rawdata)
+                return k
+            self.handle_data(_xmlescape(self.rawdata[i+9:k]), 0)
+            return k+3
+        else:
+            k = self.rawdata.find('>', i)
+            if k >= 0:
+                return k+1
+            else:
+                # We have an incomplete CDATA block.
+                return k
+
+    def mapContentType(self, contentType):
+        contentType = contentType.lower()
+        if contentType == 'text' or contentType == 'plain':
+            contentType = 'text/plain'
+        elif contentType == 'html':
+            contentType = 'text/html'
+        elif contentType == 'xhtml':
+            contentType = 'application/xhtml+xml'
+        return contentType
+
+    def trackNamespace(self, prefix, uri):
+        loweruri = uri.lower()
+        if (prefix, loweruri) == (None, 'http://my.netscape.com/rdf/simple/0.9/') and not self.version:
+            self.version = 'rss090'
+        if loweruri == 'http://purl.org/rss/1.0/' and not self.version:
+            self.version = 'rss10'
+        if loweruri == 'http://www.w3.org/2005/atom' and not self.version:
+            self.version = 'atom10'
+        if loweruri.find('backend.userland.com/rss') <> -1:
+            # match any backend.userland.com namespace
+            uri = 'http://backend.userland.com/rss'
+            loweruri = uri
+        if self._matchnamespaces.has_key(loweruri):
+            self.namespacemap[prefix] = self._matchnamespaces[loweruri]
+            self.namespacesInUse[self._matchnamespaces[loweruri]] = uri
+        else:
+            self.namespacesInUse[prefix or ''] = uri
+
+    def resolveURI(self, uri):
+        return _urljoin(self.baseuri or '', uri)
+
+    def decodeEntities(self, element, data):
+        return data
+
+    def strattrs(self, attrs):
+        return ''.join([' %s="%s"' % (t[0],_xmlescape(t[1],{'"':'&quot;'})) for t in attrs])
+
+    def push(self, element, expectingText):
+        self.elementstack.append([element, expectingText, []])
+
+    def pop(self, element, stripWhitespace=1):
+        if not self.elementstack: return
+        if self.elementstack[-1][0] != element: return
+
+        element, expectingText, pieces = self.elementstack.pop()
+
+        if self.version == 'atom10' and self.contentparams.get('type','text') == 'application/xhtml+xml':
+            # remove enclosing child element, but only if it is a <div> and
+            # only if all the remaining content is nested underneath it.
+            # This means that the divs would be retained in the following:
+            #    <div>foo</div><div>bar</div>
+            while pieces and len(pieces)>1 and not pieces[-1].strip():
+                del pieces[-1]
+            while pieces and len(pieces)>1 and not pieces[0].strip():
+                del pieces[0]
+            if pieces and (pieces[0] == '<div>' or pieces[0].startswith('<div ')) and pieces[-1]=='</div>':
+                depth = 0
+                for piece in pieces[:-1]:
+                    if piece.startswith('</'):
+                        depth -= 1
+                        if depth == 0: break
+                    elif piece.startswith('<') and not piece.endswith('/>'):
+                        depth += 1
+                else:
+                    pieces = pieces[1:-1]
+
+        # Ensure each piece is a str for Python 3
+        for (i, v) in enumerate(pieces):
+            if not isinstance(v, basestring):
+                pieces[i] = v.decode('utf-8')
+
+        output = ''.join(pieces)
+        if stripWhitespace:
+            output = output.strip()
+        if not expectingText: return output
+
+        # decode base64 content
+        if base64 and self.contentparams.get('base64', 0):
+            try:
+                output = _base64decode(output)
+            except binascii.Error:
+                pass
+            except binascii.Incomplete:
+                pass
+            except TypeError:
+                # In Python 3, base64 takes and outputs bytes, not str
+                # This may not be the most correct way to accomplish this
+                output = _base64decode(output.encode('utf-8')).decode('utf-8')
+
+        # resolve relative URIs
+        if (element in self.can_be_relative_uri) and output:
+            output = self.resolveURI(output)
+
+        # decode entities within embedded markup
+        if not self.contentparams.get('base64', 0):
+            output = self.decodeEntities(element, output)
+
+        if self.lookslikehtml(output):
+            self.contentparams['type']='text/html'
+
+        # remove temporary cruft from contentparams
+        try:
+            del self.contentparams['mode']
+        except KeyError:
+            pass
+        try:
+            del self.contentparams['base64']
+        except KeyError:
+            pass
+
+        is_htmlish = self.mapContentType(self.contentparams.get('type', 'text/html')) in self.html_types
+        # resolve relative URIs within embedded markup
+        if is_htmlish and RESOLVE_RELATIVE_URIS:
+            if element in self.can_contain_relative_uris:
+                output = _resolveRelativeURIs(output, self.baseuri, self.encoding, self.contentparams.get('type', 'text/html'))
+
+        # parse microformats
+        # (must do this before sanitizing because some microformats
+        # rely on elements that we sanitize)
+        if is_htmlish and element in ['content', 'description', 'summary']:
+            mfresults = _parseMicroformats(output, self.baseuri, self.encoding)
+            if mfresults:
+                for tag in mfresults.get('tags', []):
+                    self._addTag(tag['term'], tag['scheme'], tag['label'])
+                for enclosure in mfresults.get('enclosures', []):
+                    self._start_enclosure(enclosure)
+                for xfn in mfresults.get('xfn', []):
+                    self._addXFN(xfn['relationships'], xfn['href'], xfn['name'])
+                vcard = mfresults.get('vcard')
+                if vcard:
+                    self._getContext()['vcard'] = vcard
+
+        # sanitize embedded markup
+        if is_htmlish and SANITIZE_HTML:
+            if element in self.can_contain_dangerous_markup:
+                output = _sanitizeHTML(output, self.encoding, self.contentparams.get('type', 'text/html'))
+
+        if self.encoding and type(output) != type(u''):
+            try:
+                output = unicode(output, self.encoding)
+            except:
+                pass
+
+        # address common error where people take data that is already
+        # utf-8, presume that it is iso-8859-1, and re-encode it.
+        if self.encoding in ('utf-8', 'utf-8_INVALID_PYTHON_3') and type(output) == type(u''):
+            try:
+                output = unicode(output.encode('iso-8859-1'), 'utf-8')
+            except:
+                pass
+
+        # map win-1252 extensions to the proper code points
+        if type(output) == type(u''):
+            output = u''.join([c in _cp1252.keys() and _cp1252[c] or c for c in output])
+
+        # categories/tags/keywords/whatever are handled in _end_category
+        if element == 'category':
+            return output
+
+        if element == 'title' and self.hasTitle:
+            return output
+
+        # store output in appropriate place(s)
+        if self.inentry and not self.insource:
+            if element == 'content':
+                self.entries[-1].setdefault(element, [])
+                contentparams = copy.deepcopy(self.contentparams)
+                contentparams['value'] = output
+                self.entries[-1][element].append(contentparams)
+            elif element == 'link':
+                if not self.inimage:
+                    # query variables in urls in link elements are improperly
+                    # converted from `?a=1&b=2` to `?a=1&b;=2` as if they're
+                    # unhandled character references. fix this special case.
+                    output = re.sub("&([A-Za-z0-9_]+);", "&\g<1>", output)
+                    self.entries[-1][element] = output
+                    if output:
+                        self.entries[-1]['links'][-1]['href'] = output
+            else:
+                if element == 'description':
+                    element = 'summary'
+                self.entries[-1][element] = output
+                if self.incontent:
+                    contentparams = copy.deepcopy(self.contentparams)
+                    contentparams['value'] = output
+                    self.entries[-1][element + '_detail'] = contentparams
+        elif (self.infeed or self.insource):# and (not self.intextinput) and (not self.inimage):
+            context = self._getContext()
+            if element == 'description':
+                element = 'subtitle'
+            context[element] = output
+            if element == 'link':
+                # fix query variables; see above for the explanation
+                output = re.sub("&([A-Za-z0-9_]+);", "&\g<1>", output)
+                context[element] = output
+                context['links'][-1]['href'] = output
+            elif self.incontent:
+                contentparams = copy.deepcopy(self.contentparams)
+                contentparams['value'] = output
+                context[element + '_detail'] = contentparams
+        return output
+
+    def pushContent(self, tag, attrsD, defaultContentType, expectingText):
+        self.incontent += 1
+        if self.lang: self.lang=self.lang.replace('_','-')
+        self.contentparams = FeedParserDict({
+            'type': self.mapContentType(attrsD.get('type', defaultContentType)),
+            'language': self.lang,
+            'base': self.baseuri})
+        self.contentparams['base64'] = self._isBase64(attrsD, self.contentparams)
+        self.push(tag, expectingText)
+
+    def popContent(self, tag):
+        value = self.pop(tag)
+        self.incontent -= 1
+        self.contentparams.clear()
+        return value
+
+    # a number of elements in a number of RSS variants are nominally plain
+    # text, but this is routinely ignored.  This is an attempt to detect
+    # the most common cases.  As false positives often result in silent
+    # data loss, this function errs on the conservative side.
+    def lookslikehtml(self, s):
+        if self.version.startswith('atom'): return
+        if self.contentparams.get('type','text/html') != 'text/plain': return
+
+        # must have a close tag or a entity reference to qualify
+        if not (re.search(r'</(\w+)>',s) or re.search("&#?\w+;",s)): return
+
+        # all tags must be in a restricted subset of valid HTML tags
+        if filter(lambda t: t.lower() not in _HTMLSanitizer.acceptable_elements,
+            re.findall(r'</?(\w+)',s)): return
+
+        # all entities must have been defined as valid HTML entities
+        from htmlentitydefs import entitydefs
+        if filter(lambda e: e not in entitydefs.keys(),
+            re.findall(r'&(\w+);',s)): return
+
+        return 1
+
+    def _mapToStandardPrefix(self, name):
+        colonpos = name.find(':')
+        if colonpos <> -1:
+            prefix = name[:colonpos]
+            suffix = name[colonpos+1:]
+            prefix = self.namespacemap.get(prefix, prefix)
+            name = prefix + ':' + suffix
+        return name
+
+    def _getAttribute(self, attrsD, name):
+        return attrsD.get(self._mapToStandardPrefix(name))
+
+    def _isBase64(self, attrsD, contentparams):
+        if attrsD.get('mode', '') == 'base64':
+            return 1
+        if self.contentparams['type'].startswith('text/'):
+            return 0
+        if self.contentparams['type'].endswith('+xml'):
+            return 0
+        if self.contentparams['type'].endswith('/xml'):
+            return 0
+        return 1
+
+    def _itsAnHrefDamnIt(self, attrsD):
+        href = attrsD.get('url', attrsD.get('uri', attrsD.get('href', None)))
+        if href:
+            try:
+                del attrsD['url']
+            except KeyError:
+                pass
+            try:
+                del attrsD['uri']
+            except KeyError:
+                pass
+            attrsD['href'] = href
+        return attrsD
+
+    def _save(self, key, value, overwrite=False):
+        context = self._getContext()
+        if overwrite:
+            context[key] = value
+        else:
+            context.setdefault(key, value)
+
+    def _start_rss(self, attrsD):
+        versionmap = {'0.91': 'rss091u',
+                      '0.92': 'rss092',
+                      '0.93': 'rss093',
+                      '0.94': 'rss094'}
+        #If we're here then this is an RSS feed.
+        #If we don't have a version or have a version that starts with something
+        #other than RSS then there's been a mistake. Correct it.
+        if not self.version or not self.version.startswith('rss'):
+            attr_version = attrsD.get('version', '')
+            version = versionmap.get(attr_version)
+            if version:
+                self.version = version
+            elif attr_version.startswith('2.'):
+                self.version = 'rss20'
+            else:
+                self.version = 'rss'
+
+    def _start_dlhottitles(self, attrsD):
+        self.version = 'hotrss'
+
+    def _start_channel(self, attrsD):
+        self.infeed = 1
+        self._cdf_common(attrsD)
+    _start_feedinfo = _start_channel
+
+    def _cdf_common(self, attrsD):
+        if attrsD.has_key('lastmod'):
+            self._start_modified({})
+            self.elementstack[-1][-1] = attrsD['lastmod']
+            self._end_modified()
+        if attrsD.has_key('href'):
+            self._start_link({})
+            self.elementstack[-1][-1] = attrsD['href']
+            self._end_link()
+
+    def _start_feed(self, attrsD):
+        self.infeed = 1
+        versionmap = {'0.1': 'atom01',
+                      '0.2': 'atom02',
+                      '0.3': 'atom03'}
+        if not self.version:
+            attr_version = attrsD.get('version')
+            version = versionmap.get(attr_version)
+            if version:
+                self.version = version
+            else:
+                self.version = 'atom'
+
+    def _end_channel(self):
+        self.infeed = 0
+    _end_feed = _end_channel
+
+    def _start_image(self, attrsD):
+        context = self._getContext()
+        if not self.inentry:
+            context.setdefault('image', FeedParserDict())
+        self.inimage = 1
+        self.hasTitle = 0
+        self.push('image', 0)
+
+    def _end_image(self):
+        self.pop('image')
+        self.inimage = 0
+
+    def _start_textinput(self, attrsD):
+        context = self._getContext()
+        context.setdefault('textinput', FeedParserDict())
+        self.intextinput = 1
+        self.hasTitle = 0
+        self.push('textinput', 0)
+    _start_textInput = _start_textinput
+
+    def _end_textinput(self):
+        self.pop('textinput')
+        self.intextinput = 0
+    _end_textInput = _end_textinput
+
+    def _start_author(self, attrsD):
+        self.inauthor = 1
+        self.push('author', 1)
+        # Append a new FeedParserDict when expecting an author
+        context = self._getContext()
+        context.setdefault('authors', [])
+        context['authors'].append(FeedParserDict())
+    _start_managingeditor = _start_author
+    _start_dc_author = _start_author
+    _start_dc_creator = _start_author
+    _start_itunes_author = _start_author
+
+    def _end_author(self):
+        self.pop('author')
+        self.inauthor = 0
+        self._sync_author_detail()
+    _end_managingeditor = _end_author
+    _end_dc_author = _end_author
+    _end_dc_creator = _end_author
+    _end_itunes_author = _end_author
+
+    def _start_itunes_owner(self, attrsD):
+        self.inpublisher = 1
+        self.push('publisher', 0)
+
+    def _end_itunes_owner(self):
+        self.pop('publisher')
+        self.inpublisher = 0
+        self._sync_author_detail('publisher')
+
+    def _start_contributor(self, attrsD):
+        self.incontributor = 1
+        context = self._getContext()
+        context.setdefault('contributors', [])
+        context['contributors'].append(FeedParserDict())
+        self.push('contributor', 0)
+
+    def _end_contributor(self):
+        self.pop('contributor')
+        self.incontributor = 0
+
+    def _start_dc_contributor(self, attrsD):
+        self.incontributor = 1
+        context = self._getContext()
+        context.setdefault('contributors', [])
+        context['contributors'].append(FeedParserDict())
+        self.push('name', 0)
+
+    def _end_dc_contributor(self):
+        self._end_name()
+        self.incontributor = 0
+
+    def _start_name(self, attrsD):
+        self.push('name', 0)
+    _start_itunes_name = _start_name
+
+    def _end_name(self):
+        value = self.pop('name')
+        if self.inpublisher:
+            self._save_author('name', value, 'publisher')
+        elif self.inauthor:
+            self._save_author('name', value)
+        elif self.incontributor:
+            self._save_contributor('name', value)
+        elif self.intextinput:
+            context = self._getContext()
+            context['name'] = value
+    _end_itunes_name = _end_name
+
+    def _start_width(self, attrsD):
+        self.push('width', 0)
+
+    def _end_width(self):
+        value = self.pop('width')
+        try:
+            value = int(value)
+        except:
+            value = 0
+        if self.inimage:
+            context = self._getContext()
+            context['width'] = value
+
+    def _start_height(self, attrsD):
+        self.push('height', 0)
+
+    def _end_height(self):
+        value = self.pop('height')
+        try:
+            value = int(value)
+        except:
+            value = 0
+        if self.inimage:
+            context = self._getContext()
+            context['height'] = value
+
+    def _start_url(self, attrsD):
+        self.push('href', 1)
+    _start_homepage = _start_url
+    _start_uri = _start_url
+
+    def _end_url(self):
+        value = self.pop('href')
+        if self.inauthor:
+            self._save_author('href', value)
+        elif self.incontributor:
+            self._save_contributor('href', value)
+    _end_homepage = _end_url
+    _end_uri = _end_url
+
+    def _start_email(self, attrsD):
+        self.push('email', 0)
+    _start_itunes_email = _start_email
+
+    def _end_email(self):
+        value = self.pop('email')
+        if self.inpublisher:
+            self._save_author('email', value, 'publisher')
+        elif self.inauthor:
+            self._save_author('email', value)
+        elif self.incontributor:
+            self._save_contributor('email', value)
+    _end_itunes_email = _end_email
+
+    def _getContext(self):
+        if self.insource:
+            context = self.sourcedata
+        elif self.inimage and self.feeddata.has_key('image'):
+            context = self.feeddata['image']
+        elif self.intextinput:
+            context = self.feeddata['textinput']
+        elif self.inentry:
+            context = self.entries[-1]
+        else:
+            context = self.feeddata
+        return context
+
+    def _save_author(self, key, value, prefix='author'):
+        context = self._getContext()
+        context.setdefault(prefix + '_detail', FeedParserDict())
+        context[prefix + '_detail'][key] = value
+        self._sync_author_detail()
+        context.setdefault('authors', [FeedParserDict()])
+        context['authors'][-1][key] = value
+
+    def _save_contributor(self, key, value):
+        context = self._getContext()
+        context.setdefault('contributors', [FeedParserDict()])
+        context['contributors'][-1][key] = value
+
+    def _sync_author_detail(self, key='author'):
+        context = self._getContext()
+        detail = context.get('%s_detail' % key)
+        if detail:
+            name = detail.get('name')
+            email = detail.get('email')
+            if name and email:
+                context[key] = '%s (%s)' % (name, email)
+            elif name:
+                context[key] = name
+            elif email:
+                context[key] = email
+        else:
+            author, email = context.get(key), None
+            if not author: return
+            emailmatch = re.search(r'''(([a-zA-Z0-9\_\-\.\+]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?))(\?subject=\S+)?''', author)
+            if emailmatch:
+                email = emailmatch.group(0)
+                # probably a better way to do the following, but it passes all the tests
+                author = author.replace(email, '')
+                author = author.replace('()', '')
+                author = author.replace('<>', '')
+                author = author.replace('&lt;&gt;', '')
+                author = author.strip()
+                if author and (author[0] == '('):
+                    author = author[1:]
+                if author and (author[-1] == ')'):
+                    author = author[:-1]
+                author = author.strip()
+            if author or email:
+                context.setdefault('%s_detail' % key, FeedParserDict())
+            if author:
+                context['%s_detail' % key]['name'] = author
+            if email:
+                context['%s_detail' % key]['email'] = email
+
+    def _start_subtitle(self, attrsD):
+        self.pushContent('subtitle', attrsD, 'text/plain', 1)
+    _start_tagline = _start_subtitle
+    _start_itunes_subtitle = _start_subtitle
+
+    def _end_subtitle(self):
+        self.popContent('subtitle')
+    _end_tagline = _end_subtitle
+    _end_itunes_subtitle = _end_subtitle
+
+    def _start_rights(self, attrsD):
+        self.pushContent('rights', attrsD, 'text/plain', 1)
+    _start_dc_rights = _start_rights
+    _start_copyright = _start_rights
+
+    def _end_rights(self):
+        self.popContent('rights')
+    _end_dc_rights = _end_rights
+    _end_copyright = _end_rights
+
+    def _start_item(self, attrsD):
+        self.entries.append(FeedParserDict())
+        self.push('item', 0)
+        self.inentry = 1
+        self.guidislink = 0
+        self.hasTitle = 0
+        id = self._getAttribute(attrsD, 'rdf:about')
+        if id:
+            context = self._getContext()
+            context['id'] = id
+        self._cdf_common(attrsD)
+    _start_entry = _start_item
+    _start_product = _start_item
+
+    def _end_item(self):
+        self.pop('item')
+        self.inentry = 0
+    _end_entry = _end_item
+
+    def _start_dc_language(self, attrsD):
+        self.push('language', 1)
+    _start_language = _start_dc_language
+
+    def _end_dc_language(self):
+        self.lang = self.pop('language')
+    _end_language = _end_dc_language
+
+    def _start_dc_publisher(self, attrsD):
+        self.push('publisher', 1)
+    _start_webmaster = _start_dc_publisher
+
+    def _end_dc_publisher(self):
+        self.pop('publisher')
+        self._sync_author_detail('publisher')
+    _end_webmaster = _end_dc_publisher
+
+    def _start_published(self, attrsD):
+        self.push('published', 1)
+    _start_dcterms_issued = _start_published
+    _start_issued = _start_published
+
+    def _end_published(self):
+        value = self.pop('published')
+        self._save('published_parsed', _parse_date(value), overwrite=True)
+    _end_dcterms_issued = _end_published
+    _end_issued = _end_published
+
+    def _start_updated(self, attrsD):
+        self.push('updated', 1)
+    _start_modified = _start_updated
+    _start_dcterms_modified = _start_updated
+    _start_pubdate = _start_updated
+    _start_dc_date = _start_updated
+    _start_lastbuilddate = _start_updated
+
+    def _end_updated(self):
+        value = self.pop('updated')
+        parsed_value = _parse_date(value)
+        self._save('updated_parsed', parsed_value, overwrite=True)
+    _end_modified = _end_updated
+    _end_dcterms_modified = _end_updated
+    _end_pubdate = _end_updated
+    _end_dc_date = _end_updated
+    _end_lastbuilddate = _end_updated
+
+    def _start_created(self, attrsD):
+        self.push('created', 1)
+    _start_dcterms_created = _start_created
+
+    def _end_created(self):
+        value = self.pop('created')
+        self._save('created_parsed', _parse_date(value), overwrite=True)
+    _end_dcterms_created = _end_created
+
+    def _start_expirationdate(self, attrsD):
+        self.push('expired', 1)
+
+    def _end_expirationdate(self):
+        self._save('expired_parsed', _parse_date(self.pop('expired')), overwrite=True)
+
+    def _start_cc_license(self, attrsD):
+        context = self._getContext()
+        value = self._getAttribute(attrsD, 'rdf:resource')
+        attrsD = FeedParserDict()
+        attrsD['rel']='license'
+        if value: attrsD['href']=value
+        context.setdefault('links', []).append(attrsD)
+
+    def _start_creativecommons_license(self, attrsD):
+        self.push('license', 1)
+    _start_creativeCommons_license = _start_creativecommons_license
+
+    def _end_creativecommons_license(self):
+        value = self.pop('license')
+        context = self._getContext()
+        attrsD = FeedParserDict()
+        attrsD['rel']='license'
+        if value: attrsD['href']=value
+        context.setdefault('links', []).append(attrsD)
+        del context['license']
+    _end_creativeCommons_license = _end_creativecommons_license
+
+    def _addXFN(self, relationships, href, name):
+        context = self._getContext()
+        xfn = context.setdefault('xfn', [])
+        value = FeedParserDict({'relationships': relationships, 'href': href, 'name': name})
+        if value not in xfn:
+            xfn.append(value)
+
+    def _addTag(self, term, scheme, label):
+        context = self._getContext()
+        tags = context.setdefault('tags', [])
+        if (not term) and (not scheme) and (not label): return
+        value = FeedParserDict({'term': term, 'scheme': scheme, 'label': label})
+        if value not in tags:
+            tags.append(value)
+
+    def _start_category(self, attrsD):
+        if _debug: sys.stderr.write('entering _start_category with %s\n' % repr(attrsD))
+        term = attrsD.get('term')
+        scheme = attrsD.get('scheme', attrsD.get('domain'))
+        label = attrsD.get('label')
+        self._addTag(term, scheme, label)
+        self.push('category', 1)
+    _start_dc_subject = _start_category
+    _start_keywords = _start_category
+
+    def _start_media_category(self, attrsD):
+        attrsD.setdefault('scheme', 'http://search.yahoo.com/mrss/category_schema')
+        self._start_category(attrsD)
+
+    def _end_itunes_keywords(self):
+        for term in self.pop('itunes_keywords').split():
+            self._addTag(term, 'http://www.itunes.com/', None)
+
+    def _start_itunes_category(self, attrsD):
+        self._addTag(attrsD.get('text'), 'http://www.itunes.com/', None)
+        self.push('category', 1)
+
+    def _end_category(self):
+        value = self.pop('category')
+        if not value: return
+        context = self._getContext()
+        tags = context['tags']
+        if value and len(tags) and not tags[-1]['term']:
+            tags[-1]['term'] = value
+        else:
+            self._addTag(value, None, None)
+    _end_dc_subject = _end_category
+    _end_keywords = _end_category
+    _end_itunes_category = _end_category
+    _end_media_category = _end_category
+
+    def _start_cloud(self, attrsD):
+        self._getContext()['cloud'] = FeedParserDict(attrsD)
+
+    def _start_link(self, attrsD):
+        attrsD.setdefault('rel', 'alternate')
+        if attrsD['rel'] == 'self':
+            attrsD.setdefault('type', 'application/atom+xml')
+        else:
+            attrsD.setdefault('type', 'text/html')
+        context = self._getContext()
+        attrsD = self._itsAnHrefDamnIt(attrsD)
+        if attrsD.has_key('href'):
+            attrsD['href'] = self.resolveURI(attrsD['href'])
+        expectingText = self.infeed or self.inentry or self.insource
+        context.setdefault('links', [])
+        if not (self.inentry and self.inimage):
+            context['links'].append(FeedParserDict(attrsD))
+        if attrsD.has_key('href'):
+            expectingText = 0
+            if (attrsD.get('rel') == 'alternate') and (self.mapContentType(attrsD.get('type')) in self.html_types):
+                context['link'] = attrsD['href']
+        else:
+            self.push('link', expectingText)
+    _start_producturl = _start_link
+
+    def _end_link(self):
+        value = self.pop('link')
+        context = self._getContext()
+    _end_producturl = _end_link
+
+    def _start_guid(self, attrsD):
+        self.guidislink = (attrsD.get('ispermalink', 'true') == 'true')
+        self.push('id', 1)
+
+    def _end_guid(self):
+        value = self.pop('id')
+        self._save('guidislink', self.guidislink and not self._getContext().has_key('link'))
+        if self.guidislink:
+            # guid acts as link, but only if 'ispermalink' is not present or is 'true',
+            # and only if the item doesn't already have a link element
+            self._save('link', value)
+
+    def _start_title(self, attrsD):
+        if self.svgOK: return self.unknown_starttag('title', attrsD.items())
+        self.pushContent('title', attrsD, 'text/plain', self.infeed or self.inentry or self.insource)
+    _start_dc_title = _start_title
+    _start_media_title = _start_title
+
+    def _end_title(self):
+        if self.svgOK: return
+        value = self.popContent('title')
+        if not value: return
+        context = self._getContext()
+        self.hasTitle = 1
+    _end_dc_title = _end_title
+
+    def _end_media_title(self):
+        hasTitle = self.hasTitle
+        self._end_title()
+        self.hasTitle = hasTitle
+
+    def _start_description(self, attrsD):
+        context = self._getContext()
+        if context.has_key('summary'):
+            self._summaryKey = 'content'
+            self._start_content(attrsD)
+        else:
+            self.pushContent('description', attrsD, 'text/html', self.infeed or self.inentry or self.insource)
+    _start_dc_description = _start_description
+
+    def _start_abstract(self, attrsD):
+        self.pushContent('description', attrsD, 'text/plain', self.infeed or self.inentry or self.insource)
+
+    def _end_description(self):
+        if self._summaryKey == 'content':
+            self._end_content()
+        else:
+            value = self.popContent('description')
+        self._summaryKey = None
+    _end_abstract = _end_description
+    _end_dc_description = _end_description
+
+    def _start_info(self, attrsD):
+        self.pushContent('info', attrsD, 'text/plain', 1)
+    _start_feedburner_browserfriendly = _start_info
+
+    def _end_info(self):
+        self.popContent('info')
+    _end_feedburner_browserfriendly = _end_info
+
+    def _start_generator(self, attrsD):
+        if attrsD:
+            attrsD = self._itsAnHrefDamnIt(attrsD)
+            if attrsD.has_key('href'):
+                attrsD['href'] = self.resolveURI(attrsD['href'])
+        self._getContext()['generator_detail'] = FeedParserDict(attrsD)
+        self.push('generator', 1)
+
+    def _end_generator(self):
+        value = self.pop('generator')
+        context = self._getContext()
+        if context.has_key('generator_detail'):
+            context['generator_detail']['name'] = value
+
+    def _start_admin_generatoragent(self, attrsD):
+        self.push('generator', 1)
+        value = self._getAttribute(attrsD, 'rdf:resource')
+        if value:
+            self.elementstack[-1][2].append(value)
+        self.pop('generator')
+        self._getContext()['generator_detail'] = FeedParserDict({'href': value})
+
+    def _start_admin_errorreportsto(self, attrsD):
+        self.push('errorreportsto', 1)
+        value = self._getAttribute(attrsD, 'rdf:resource')
+        if value:
+            self.elementstack[-1][2].append(value)
+        self.pop('errorreportsto')
+
+    def _start_summary(self, attrsD):
+        context = self._getContext()
+        if context.has_key('summary'):
+            self._summaryKey = 'content'
+            self._start_content(attrsD)
+        else:
+            self._summaryKey = 'summary'
+            self.pushContent(self._summaryKey, attrsD, 'text/plain', 1)
+    _start_itunes_summary = _start_summary
+
+    def _end_summary(self):
+        if self._summaryKey == 'content':
+            self._end_content()
+        else:
+            self.popContent(self._summaryKey or 'summary')
+        self._summaryKey = None
+    _end_itunes_summary = _end_summary
+
+    def _start_enclosure(self, attrsD):
+        attrsD = self._itsAnHrefDamnIt(attrsD)
+        context = self._getContext()
+        attrsD['rel']='enclosure'
+        context.setdefault('links', []).append(FeedParserDict(attrsD))
+
+    def _start_source(self, attrsD):
+        if 'url' in attrsD:
+          # This means that we're processing a source element from an RSS 2.0 feed
+          self.sourcedata['href'] = attrsD[u'url']
+        self.push('source', 1)
+        self.insource = 1
+        self.hasTitle = 0
+
+    def _end_source(self):
+        self.insource = 0
+        value = self.pop('source')
+        if value:
+          self.sourcedata['title'] = value
+        self._getContext()['source'] = copy.deepcopy(self.sourcedata)
+        self.sourcedata.clear()
+
+    def _start_content(self, attrsD):
+        self.pushContent('content', attrsD, 'text/plain', 1)
+        src = attrsD.get('src')
+        if src:
+            self.contentparams['src'] = src
+        self.push('content', 1)
+
+    def _start_prodlink(self, attrsD):
+        self.pushContent('content', attrsD, 'text/html', 1)
+
+    def _start_body(self, attrsD):
+        self.pushContent('content', attrsD, 'application/xhtml+xml', 1)
+    _start_xhtml_body = _start_body
+
+    def _start_content_encoded(self, attrsD):
+        self.pushContent('content', attrsD, 'text/html', 1)
+    _start_fullitem = _start_content_encoded
+
+    def _end_content(self):
+        copyToSummary = self.mapContentType(self.contentparams.get('type')) in (['text/plain'] + self.html_types)
+        value = self.popContent('content')
+        if copyToSummary:
+            self._save('summary', value)
+
+    _end_body = _end_content
+    _end_xhtml_body = _end_content
+    _end_content_encoded = _end_content
+    _end_fullitem = _end_content
+    _end_prodlink = _end_content
+
+    def _start_itunes_image(self, attrsD):
+        self.push('itunes_image', 0)
+        if attrsD.get('href'):
+            self._getContext()['image'] = FeedParserDict({'href': attrsD.get('href')})
+    _start_itunes_link = _start_itunes_image
+
+    def _end_itunes_block(self):
+        value = self.pop('itunes_block', 0)
+        self._getContext()['itunes_block'] = (value == 'yes') and 1 or 0
+
+    def _end_itunes_explicit(self):
+        value = self.pop('itunes_explicit', 0)
+        # Convert 'yes' -> True, 'clean' to False, and any other value to None
+        # False and None both evaluate as False, so the difference can be ignored
+        # by applications that only need to know if the content is explicit.
+        self._getContext()['itunes_explicit'] = (None, False, True)[(value == 'yes' and 2) or value == 'clean' or 0]
+
+    def _start_media_content(self, attrsD):
+        context = self._getContext()
+        context.setdefault('media_content', [])
+        context['media_content'].append(attrsD)
+
+    def _start_media_thumbnail(self, attrsD):
+        context = self._getContext()
+        context.setdefault('media_thumbnail', [])
+        self.push('url', 1) # new
+        context['media_thumbnail'].append(attrsD)
+
+    def _end_media_thumbnail(self):
+        url = self.pop('url')
+        context = self._getContext()
+        if url != None and len(url.strip()) != 0:
+            if not context['media_thumbnail'][-1].has_key('url'):
+                context['media_thumbnail'][-1]['url'] = url
+
+    def _start_media_player(self, attrsD):
+        self.push('media_player', 0)
+        self._getContext()['media_player'] = FeedParserDict(attrsD)
+
+    def _end_media_player(self):
+        value = self.pop('media_player')
+        context = self._getContext()
+        context['media_player']['content'] = value
+
+    def _start_newlocation(self, attrsD):
+        self.push('newlocation', 1)
+
+    def _end_newlocation(self):
+        url = self.pop('newlocation')
+        context = self._getContext()
+        # don't set newlocation if the context isn't right
+        if context is not self.feeddata:
+            return
+        context['newlocation'] = _makeSafeAbsoluteURI(self.baseuri, url.strip())
+
+if _XML_AVAILABLE:
+    class _StrictFeedParser(_FeedParserMixin, xml.sax.handler.ContentHandler):
+        def __init__(self, baseuri, baselang, encoding):
+            if _debug: sys.stderr.write('trying StrictFeedParser\n')
+            xml.sax.handler.ContentHandler.__init__(self)
+            _FeedParserMixin.__init__(self, baseuri, baselang, encoding)
+            self.bozo = 0
+            self.exc = None
+            self.decls = {}
+
+        def startPrefixMapping(self, prefix, uri):
+            self.trackNamespace(prefix, uri)
+            if uri == 'http://www.w3.org/1999/xlink':
+              self.decls['xmlns:'+prefix] = uri
+
+        def startElementNS(self, name, qname, attrs):
+            namespace, localname = name
+            lowernamespace = str(namespace or '').lower()
+            if lowernamespace.find('backend.userland.com/rss') <> -1:
+                # match any backend.userland.com namespace
+                namespace = 'http://backend.userland.com/rss'
+                lowernamespace = namespace
+            if qname and qname.find(':') > 0:
+                givenprefix = qname.split(':')[0]
+            else:
+                givenprefix = None
+            prefix = self._matchnamespaces.get(lowernamespace, givenprefix)
+            if givenprefix and (prefix is None or (prefix == '' and lowernamespace == '')) and not self.namespacesInUse.has_key(givenprefix):
+                    raise UndeclaredNamespace, "'%s' is not associated with a namespace" % givenprefix
+            localname = str(localname).lower()
+
+            # qname implementation is horribly broken in Python 2.1 (it
+            # doesn't report any), and slightly broken in Python 2.2 (it
+            # doesn't report the xml: namespace). So we match up namespaces
+            # with a known list first, and then possibly override them with
+            # the qnames the SAX parser gives us (if indeed it gives us any
+            # at all).  Thanks to MatejC for helping me test this and
+            # tirelessly telling me that it didn't work yet.
+            attrsD, self.decls = self.decls, {}
+            if localname=='math' and namespace=='http://www.w3.org/1998/Math/MathML':
+                attrsD['xmlns']=namespace
+            if localname=='svg' and namespace=='http://www.w3.org/2000/svg':
+                attrsD['xmlns']=namespace
+
+            if prefix:
+                localname = prefix.lower() + ':' + localname
+            elif namespace and not qname: #Expat
+                for name,value in self.namespacesInUse.items():
+                     if name and value == namespace:
+                         localname = name + ':' + localname
+                         break
+            if _debug: sys.stderr.write('startElementNS: qname = %s, namespace = %s, givenprefix = %s, prefix = %s, attrs = %s, localname = %s\n' % (qname, namespace, givenprefix, prefix, attrs.items(), localname))
+
+            for (namespace, attrlocalname), attrvalue in attrs._attrs.items():
+                lowernamespace = (namespace or '').lower()
+                prefix = self._matchnamespaces.get(lowernamespace, '')
+                if prefix:
+                    attrlocalname = prefix + ':' + attrlocalname
+                attrsD[str(attrlocalname).lower()] = attrvalue
+            for qname in attrs.getQNames():
+                attrsD[str(qname).lower()] = attrs.getValueByQName(qname)
+            self.unknown_starttag(localname, attrsD.items())
+
+        def characters(self, text):
+            self.handle_data(text)
+
+        def endElementNS(self, name, qname):
+            namespace, localname = name
+            lowernamespace = str(namespace or '').lower()
+            if qname and qname.find(':') > 0:
+                givenprefix = qname.split(':')[0]
+            else:
+                givenprefix = ''
+            prefix = self._matchnamespaces.get(lowernamespace, givenprefix)
+            if prefix:
+                localname = prefix + ':' + localname
+            elif namespace and not qname: #Expat
+                for name,value in self.namespacesInUse.items():
+                     if name and value == namespace:
+                         localname = name + ':' + localname
+                         break
+            localname = str(localname).lower()
+            self.unknown_endtag(localname)
+
+        def error(self, exc):
+            self.bozo = 1
+            self.exc = exc
+
+        def fatalError(self, exc):
+            self.error(exc)
+            raise exc
+
+class _BaseHTMLProcessor(sgmllib.SGMLParser):
+    special = re.compile('''[<>'"]''')
+    bare_ampersand = re.compile("&(?!#\d+;|#x[0-9a-fA-F]+;|\w+;)")
+    elements_no_end_tag = [
+      'area', 'base', 'basefont', 'br', 'col', 'command', 'embed', 'frame',
+      'hr', 'img', 'input', 'isindex', 'keygen', 'link', 'meta', 'param',
+      'source', 'track', 'wbr'
+    ]
+
+    def __init__(self, encoding, _type):
+        self.encoding = encoding
+        self._type = _type
+        if _debug: sys.stderr.write('entering BaseHTMLProcessor, encoding=%s\n' % self.encoding)
+        sgmllib.SGMLParser.__init__(self)
+
+    def reset(self):
+        self.pieces = []
+        sgmllib.SGMLParser.reset(self)
+
+    def _shorttag_replace(self, match):
+        tag = match.group(1)
+        if tag in self.elements_no_end_tag:
+            return '<' + tag + ' />'
+        else:
+            return '<' + tag + '></' + tag + '>'
+
+    def parse_starttag(self,i):
+        j=sgmllib.SGMLParser.parse_starttag(self, i)
+        if self._type == 'application/xhtml+xml':
+            if j>2 and self.rawdata[j-2:j]=='/>':
+                self.unknown_endtag(self.lasttag)
+        return j
+
+    def feed(self, data):
+        data = re.compile(r'<!((?!DOCTYPE|--|\[))', re.IGNORECASE).sub(r'&lt;!\1', data)
+        #data = re.sub(r'<(\S+?)\s*?/>', self._shorttag_replace, data) # bug [ 1399464 ] Bad regexp for _shorttag_replace
+        data = re.sub(r'<([^<>\s]+?)\s*/>', self._shorttag_replace, data)
+        data = data.replace('&#39;', "'")
+        data = data.replace('&#34;', '"')
+        try:
+            bytes
+            if bytes is str:
+                raise NameError
+            self.encoding = self.encoding + '_INVALID_PYTHON_3'
+        except NameError:
+            if self.encoding and type(data) == type(u''):
+                data = data.encode(self.encoding)
+        sgmllib.SGMLParser.feed(self, data)
+        sgmllib.SGMLParser.close(self)
+
+    def normalize_attrs(self, attrs):
+        if not attrs: return attrs
+        # utility method to be called by descendants
+        attrs = dict([(k.lower(), v) for k, v in attrs]).items()
+        attrs = [(k, k in ('rel', 'type') and v.lower() or v) for k, v in attrs]
+        attrs.sort()
+        return attrs
+
+    def unknown_starttag(self, tag, attrs):
+        # called for each start tag
+        # attrs is a list of (attr, value) tuples
+        # e.g. for <pre class='screen'>, tag='pre', attrs=[('class', 'screen')]
+        if _debug: sys.stderr.write('_BaseHTMLProcessor, unknown_starttag, tag=%s\n' % tag)
+        uattrs = []
+        strattrs=''
+        if attrs:
+            for key, value in attrs:
+                value=value.replace('>','&gt;').replace('<','&lt;').replace('"','&quot;')
+                value = self.bare_ampersand.sub("&amp;", value)
+                # thanks to Kevin Marks for this breathtaking hack to deal with (valid) high-bit attribute values in UTF-8 feeds
+                if type(value) != type(u''):
+                    try:
+                        value = unicode(value, self.encoding)
+                    except:
+                        value = unicode(value, 'iso-8859-1')
+                try:
+                    # Currently, in Python 3 the key is already a str, and cannot be decoded again
+                    uattrs.append((unicode(key, self.encoding), value))
+                except TypeError:
+                    uattrs.append((key, value))
+            strattrs = u''.join([u' %s="%s"' % (key, value) for key, value in uattrs])
+            if self.encoding:
+                try:
+                    strattrs=strattrs.encode(self.encoding)
+                except:
+                    pass
+        if tag in self.elements_no_end_tag:
+            self.pieces.append('<%(tag)s%(strattrs)s />' % locals())
+        else:
+            self.pieces.append('<%(tag)s%(strattrs)s>' % locals())
+
+    def unknown_endtag(self, tag):
+        # called for each end tag, e.g. for </pre>, tag will be 'pre'
+        # Reconstruct the original end tag.
+        if tag not in self.elements_no_end_tag:
+            self.pieces.append("</%(tag)s>" % locals())
+
+    def handle_charref(self, ref):
+        # called for each character reference, e.g. for '&#160;', ref will be '160'
+        # Reconstruct the original character reference.
+        if ref.startswith('x'):
+            value = unichr(int(ref[1:],16))
+        else:
+            value = unichr(int(ref))
+
+        if value in _cp1252.keys():
+            self.pieces.append('&#%s;' % hex(ord(_cp1252[value]))[1:])
+        else:
+            self.pieces.append('&#%(ref)s;' % locals())
+
+    def handle_entityref(self, ref):
+        # called for each entity reference, e.g. for '&copy;', ref will be 'copy'
+        # Reconstruct the original entity reference.
+        if name2codepoint.has_key(ref):
+            self.pieces.append('&%(ref)s;' % locals())
+        else:
+            self.pieces.append('&amp;%(ref)s' % locals())
+
+    def handle_data(self, text):
+        # called for each block of plain text, i.e. outside of any tag and
+        # not containing any character or entity references
+        # Store the original text verbatim.
+        if _debug: sys.stderr.write('_BaseHTMLProcessor, handle_data, text=%s\n' % text)
+        self.pieces.append(text)
+
+    def handle_comment(self, text):
+        # called for each HTML comment, e.g. <!-- insert Javascript code here -->
+        # Reconstruct the original comment.
+        self.pieces.append('<!--%(text)s-->' % locals())
+
+    def handle_pi(self, text):
+        # called for each processing instruction, e.g. <?instruction>
+        # Reconstruct original processing instruction.
+        self.pieces.append('<?%(text)s>' % locals())
+
+    def handle_decl(self, text):
+        # called for the DOCTYPE, if present, e.g.
+        # <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+        #     "http://www.w3.org/TR/html4/loose.dtd">
+        # Reconstruct original DOCTYPE
+        self.pieces.append('<!%(text)s>' % locals())
+
+    _new_declname_match = re.compile(r'[a-zA-Z][-_.a-zA-Z0-9:]*\s*').match
+    def _scan_name(self, i, declstartpos):
+        rawdata = self.rawdata
+        n = len(rawdata)
+        if i == n:
+            return None, -1
+        m = self._new_declname_match(rawdata, i)
+        if m:
+            s = m.group()
+            name = s.strip()
+            if (i + len(s)) == n:
+                return None, -1  # end of buffer
+            return name.lower(), m.end()
+        else:
+            self.handle_data(rawdata)
+#            self.updatepos(declstartpos, i)
+            return None, -1
+
+    def convert_charref(self, name):
+        return '&#%s;' % name
+
+    def convert_entityref(self, name):
+        return '&%s;' % name
+
+    def output(self):
+        '''Return processed HTML as a single string'''
+        return ''.join([str(p) for p in self.pieces])
+
+    def parse_declaration(self, i):
+        try:
+            return sgmllib.SGMLParser.parse_declaration(self, i)
+        except sgmllib.SGMLParseError:
+            # escape the doctype declaration and continue parsing
+            self.handle_data('&lt;')
+            return i+1
+
+class _LooseFeedParser(_FeedParserMixin, _BaseHTMLProcessor):
+    def __init__(self, baseuri, baselang, encoding, entities):
+        sgmllib.SGMLParser.__init__(self)
+        _FeedParserMixin.__init__(self, baseuri, baselang, encoding)
+        _BaseHTMLProcessor.__init__(self, encoding, 'application/xhtml+xml')
+        self.entities=entities
+
+    def decodeEntities(self, element, data):
+        data = data.replace('&#60;', '&lt;')
+        data = data.replace('&#x3c;', '&lt;')
+        data = data.replace('&#x3C;', '&lt;')
+        data = data.replace('&#62;', '&gt;')
+        data = data.replace('&#x3e;', '&gt;')
+        data = data.replace('&#x3E;', '&gt;')
+        data = data.replace('&#38;', '&amp;')
+        data = data.replace('&#x26;', '&amp;')
+        data = data.replace('&#34;', '&quot;')
+        data = data.replace('&#x22;', '&quot;')
+        data = data.replace('&#39;', '&apos;')
+        data = data.replace('&#x27;', '&apos;')
+        if self.contentparams.has_key('type') and not self.contentparams.get('type', 'xml').endswith('xml'):
+            data = data.replace('&lt;', '<')
+            data = data.replace('&gt;', '>')
+            data = data.replace('&amp;', '&')
+            data = data.replace('&quot;', '"')
+            data = data.replace('&apos;', "'")
+        return data
+
+    def strattrs(self, attrs):
+        return ''.join([' %s="%s"' % (n,v.replace('"','&quot;')) for n,v in attrs])
+
+class _MicroformatsParser:
+    STRING = 1
+    DATE = 2
+    URI = 3
+    NODE = 4
+    EMAIL = 5
+
+    known_xfn_relationships = ['contact', 'acquaintance', 'friend', 'met', 'co-worker', 'coworker', 'colleague', 'co-resident', 'coresident', 'neighbor', 'child', 'parent', 'sibling', 'brother', 'sister', 'spouse', 'wife', 'husband', 'kin', 'relative', 'muse', 'crush', 'date', 'sweetheart', 'me']
+    known_binary_extensions =  ['zip','rar','exe','gz','tar','tgz','tbz2','bz2','z','7z','dmg','img','sit','sitx','hqx','deb','rpm','bz2','jar','rar','iso','bin','msi','mp2','mp3','ogg','ogm','mp4','m4v','m4a','avi','wma','wmv']
+
+    def __init__(self, data, baseuri, encoding):
+        self.document = BeautifulSoup.BeautifulSoup(data)
+        self.baseuri = baseuri
+        self.encoding = encoding
+        if type(data) == type(u''):
+            data = data.encode(encoding)
+        self.tags = []
+        self.enclosures = []
+        self.xfn = []
+        self.vcard = None
+
+    def vcardEscape(self, s):
+        if type(s) in (type(''), type(u'')):
+            s = s.replace(',', '\\,').replace(';', '\\;').replace('\n', '\\n')
+        return s
+
+    def vcardFold(self, s):
+        s = re.sub(';+$', '', s)
+        sFolded = ''
+        iMax = 75
+        sPrefix = ''
+        while len(s) > iMax:
+            sFolded += sPrefix + s[:iMax] + '\n'
+            s = s[iMax:]
+            sPrefix = ' '
+            iMax = 74
+        sFolded += sPrefix + s
+        return sFolded
+
+    def normalize(self, s):
+        return re.sub(r'\s+', ' ', s).strip()
+
+    def unique(self, aList):
+        results = []
+        for element in aList:
+            if element not in results:
+                results.append(element)
+        return results
+
+    def toISO8601(self, dt):
+        return time.strftime('%Y-%m-%dT%H:%M:%SZ', dt)
+
+    def getPropertyValue(self, elmRoot, sProperty, iPropertyType=4, bAllowMultiple=0, bAutoEscape=0):
+        all = lambda x: 1
+        sProperty = sProperty.lower()
+        bFound = 0
+        bNormalize = 1
+        propertyMatch = {'class': re.compile(r'\b%s\b' % sProperty)}
+        if bAllowMultiple and (iPropertyType != self.NODE):
+            snapResults = []
+            containers = elmRoot(['ul', 'ol'], propertyMatch)
+            for container in containers:
+                snapResults.extend(container('li'))
+            bFound = (len(snapResults) != 0)
+        if not bFound:
+            snapResults = elmRoot(all, propertyMatch)
+            bFound = (len(snapResults) != 0)
+        if (not bFound) and (sProperty == 'value'):
+            snapResults = elmRoot('pre')
+            bFound = (len(snapResults) != 0)
+            bNormalize = not bFound
+            if not bFound:
+                snapResults = [elmRoot]
+                bFound = (len(snapResults) != 0)
+        arFilter = []
+        if sProperty == 'vcard':
+            snapFilter = elmRoot(all, propertyMatch)
+            for node in snapFilter:
+                if node.findParent(all, propertyMatch):
+                    arFilter.append(node)
+        arResults = []
+        for node in snapResults:
+            if node not in arFilter:
+                arResults.append(node)
+        bFound = (len(arResults) != 0)
+        if not bFound:
+            if bAllowMultiple: return []
+            elif iPropertyType == self.STRING: return ''
+            elif iPropertyType == self.DATE: return None
+            elif iPropertyType == self.URI: return ''
+            elif iPropertyType == self.NODE: return None
+            else: return None
+        arValues = []
+        for elmResult in arResults:
+            sValue = None
+            if iPropertyType == self.NODE:
+                if bAllowMultiple:
+                    arValues.append(elmResult)
+                    continue
+                else:
+                    return elmResult
+            sNodeName = elmResult.name.lower()
+            if (iPropertyType == self.EMAIL) and (sNodeName == 'a'):
+                sValue = (elmResult.get('href') or '').split('mailto:').pop().split('?')[0]
+            if sValue:
+                sValue = bNormalize and self.normalize(sValue) or sValue.strip()
+            if (not sValue) and (sNodeName == 'abbr'):
+                sValue = elmResult.get('title')
+            if sValue:
+                sValue = bNormalize and self.normalize(sValue) or sValue.strip()
+            if (not sValue) and (iPropertyType == self.URI):
+                if sNodeName == 'a': sValue = elmResult.get('href')
+                elif sNodeName == 'img': sValue = elmResult.get('src')
+                elif sNodeName == 'object': sValue = elmResult.get('data')
+            if sValue:
+                sValue = bNormalize and self.normalize(sValue) or sValue.strip()
+            if (not sValue) and (sNodeName == 'img'):
+                sValue = elmResult.get('alt')
+            if sValue:
+                sValue = bNormalize and self.normalize(sValue) or sValue.strip()
+            if not sValue:
+                sValue = elmResult.renderContents()
+                sValue = re.sub(r'<\S[^>]*>', '', sValue)
+                sValue = sValue.replace('\r\n', '\n')
+                sValue = sValue.replace('\r', '\n')
+            if sValue:
+                sValue = bNormalize and self.normalize(sValue) or sValue.strip()
+            if not sValue: continue
+            if iPropertyType == self.DATE:
+                sValue = _parse_date_iso8601(sValue)
+            if bAllowMultiple:
+                arValues.append(bAutoEscape and self.vcardEscape(sValue) or sValue)
+            else:
+                return bAutoEscape and self.vcardEscape(sValue) or sValue
+        return arValues
+
+    def findVCards(self, elmRoot, bAgentParsing=0):
+        sVCards = ''
+
+        if not bAgentParsing:
+            arCards = self.getPropertyValue(elmRoot, 'vcard', bAllowMultiple=1)
+        else:
+            arCards = [elmRoot]
+
+        for elmCard in arCards:
+            arLines = []
+
+            def processSingleString(sProperty):
+                sValue = self.getPropertyValue(elmCard, sProperty, self.STRING, bAutoEscape=1).decode(self.encoding)
+                if sValue:
+                    arLines.append(self.vcardFold(sProperty.upper() + ':' + sValue))
+                return sValue or u''
+
+            def processSingleURI(sProperty):
+                sValue = self.getPropertyValue(elmCard, sProperty, self.URI)
+                if sValue:
+                    sContentType = ''
+                    sEncoding = ''
+                    sValueKey = ''
+                    if sValue.startswith('data:'):
+                        sEncoding = ';ENCODING=b'
+                        sContentType = sValue.split(';')[0].split('/').pop()
+                        sValue = sValue.split(',', 1).pop()
+                    else:
+                        elmValue = self.getPropertyValue(elmCard, sProperty)
+                        if elmValue:
+                            if sProperty != 'url':
+                                sValueKey = ';VALUE=uri'
+                            sContentType = elmValue.get('type', '').strip().split('/').pop().strip()
+                    sContentType = sContentType.upper()
+                    if sContentType == 'OCTET-STREAM':
+                        sContentType = ''
+                    if sContentType:
+                        sContentType = ';TYPE=' + sContentType.upper()
+                    arLines.append(self.vcardFold(sProperty.upper() + sEncoding + sContentType + sValueKey + ':' + sValue))
+
+            def processTypeValue(sProperty, arDefaultType, arForceType=None):
+                arResults = self.getPropertyValue(elmCard, sProperty, bAllowMultiple=1)
+                for elmResult in arResults:
+                    arType = self.getPropertyValue(elmResult, 'type', self.STRING, 1, 1)
+                    if arForceType:
+                        arType = self.unique(arForceType + arType)
+                    if not arType:
+                        arType = arDefaultType
+                    sValue = self.getPropertyValue(elmResult, 'value', self.EMAIL, 0)
+                    if sValue:
+                        arLines.append(self.vcardFold(sProperty.upper() + ';TYPE=' + ','.join(arType) + ':' + sValue))
+
+            # AGENT
+            # must do this before all other properties because it is destructive
+            # (removes nested class="vcard" nodes so they don't interfere with
+            # this vcard's other properties)
+            arAgent = self.getPropertyValue(elmCard, 'agent', bAllowMultiple=1)
+            for elmAgent in arAgent:
+                if re.compile(r'\bvcard\b').search(elmAgent.get('class')):
+                    sAgentValue = self.findVCards(elmAgent, 1) + '\n'
+                    sAgentValue = sAgentValue.replace('\n', '\\n')
+                    sAgentValue = sAgentValue.replace(';', '\\;')
+                    if sAgentValue:
+                        arLines.append(self.vcardFold('AGENT:' + sAgentValue))
+                    # Completely remove the agent element from the parse tree
+                    elmAgent.extract()
+                else:
+                    sAgentValue = self.getPropertyValue(elmAgent, 'value', self.URI, bAutoEscape=1);
+                    if sAgentValue:
+                        arLines.append(self.vcardFold('AGENT;VALUE=uri:' + sAgentValue))
+
+            # FN (full name)
+            sFN = processSingleString('fn')
+
+            # N (name)
+            elmName = self.getPropertyValue(elmCard, 'n')
+            if elmName:
+                sFamilyName = self.getPropertyValue(elmName, 'family-name', self.STRING, bAutoEscape=1)
+                sGivenName = self.getPropertyValue(elmName, 'given-name', self.STRING, bAutoEscape=1)
+                arAdditionalNames = self.getPropertyValue(elmName, 'additional-name', self.STRING, 1, 1) + self.getPropertyValue(elmName, 'additional-names', self.STRING, 1, 1)
+                arHonorificPrefixes = self.getPropertyValue(elmName, 'honorific-prefix', self.STRING, 1, 1) + self.getPropertyValue(elmName, 'honorific-prefixes', self.STRING, 1, 1)
+                arHonorificSuffixes = self.getPropertyValue(elmName, 'honorific-suffix', self.STRING, 1, 1) + self.getPropertyValue(elmName, 'honorific-suffixes', self.STRING, 1, 1)
+                arLines.append(self.vcardFold('N:' + sFamilyName + ';' +
+                                         sGivenName + ';' +
+                                         ','.join(arAdditionalNames) + ';' +
+                                         ','.join(arHonorificPrefixes) + ';' +
+                                         ','.join(arHonorificSuffixes)))
+            elif sFN:
+                # implied "N" optimization
+                # http://microformats.org/wiki/hcard#Implied_.22N.22_Optimization
+                arNames = self.normalize(sFN).split()
+                if len(arNames) == 2:
+                    bFamilyNameFirst = (arNames[0].endswith(',') or
+                                        len(arNames[1]) == 1 or
+                                        ((len(arNames[1]) == 2) and (arNames[1].endswith('.'))))
+                    if bFamilyNameFirst:
+                        arLines.append(self.vcardFold('N:' + arNames[0] + ';' + arNames[1]))
+                    else:
+                        arLines.append(self.vcardFold('N:' + arNames[1] + ';' + arNames[0]))
+
+            # SORT-STRING
+            sSortString = self.getPropertyValue(elmCard, 'sort-string', self.STRING, bAutoEscape=1)
+            if sSortString:
+                arLines.append(self.vcardFold('SORT-STRING:' + sSortString))
+
+            # NICKNAME
+            arNickname = self.getPropertyValue(elmCard, 'nickname', self.STRING, 1, 1)
+            if arNickname:
+                arLines.append(self.vcardFold('NICKNAME:' + ','.join(arNickname)))
+
+            # PHOTO
+            processSingleURI('photo')
+
+            # BDAY
+            dtBday = self.getPropertyValue(elmCard, 'bday', self.DATE)
+            if dtBday:
+                arLines.append(self.vcardFold('BDAY:' + self.toISO8601(dtBday)))
+
+            # ADR (address)
+            arAdr = self.getPropertyValue(elmCard, 'adr', bAllowMultiple=1)
+            for elmAdr in arAdr:
+                arType = self.getPropertyValue(elmAdr, 'type', self.STRING, 1, 1)
+                if not arType:
+                    arType = ['intl','postal','parcel','work'] # default adr types, see RFC 2426 section 3.2.1
+                sPostOfficeBox = self.getPropertyValue(elmAdr, 'post-office-box', self.STRING, 0, 1)
+                sExtendedAddress = self.getPropertyValue(elmAdr, 'extended-address', self.STRING, 0, 1)
+                sStreetAddress = self.getPropertyValue(elmAdr, 'street-address', self.STRING, 0, 1)
+                sLocality = self.getPropertyValue(elmAdr, 'locality', self.STRING, 0, 1)
+                sRegion = self.getPropertyValue(elmAdr, 'region', self.STRING, 0, 1)
+                sPostalCode = self.getPropertyValue(elmAdr, 'postal-code', self.STRING, 0, 1)
+                sCountryName = self.getPropertyValue(elmAdr, 'country-name', self.STRING, 0, 1)
+                arLines.append(self.vcardFold('ADR;TYPE=' + ','.join(arType) + ':' +
+                                         sPostOfficeBox + ';' +
+                                         sExtendedAddress + ';' +
+                                         sStreetAddress + ';' +
+                                         sLocality + ';' +
+                                         sRegion + ';' +
+                                         sPostalCode + ';' +
+                                         sCountryName))
+
+            # LABEL
+            processTypeValue('label', ['intl','postal','parcel','work'])
+
+            # TEL (phone number)
+            processTypeValue('tel', ['voice'])
+
+            # EMAIL
+            processTypeValue('email', ['internet'], ['internet'])
+
+            # MAILER
+            processSingleString('mailer')
+
+            # TZ (timezone)
+            processSingleString('tz')
+
+            # GEO (geographical information)
+            elmGeo = self.getPropertyValue(elmCard, 'geo')
+            if elmGeo:
+                sLatitude = self.getPropertyValue(elmGeo, 'latitude', self.STRING, 0, 1)
+                sLongitude = self.getPropertyValue(elmGeo, 'longitude', self.STRING, 0, 1)
+                arLines.append(self.vcardFold('GEO:' + sLatitude + ';' + sLongitude))
+
+            # TITLE
+            processSingleString('title')
+
+            # ROLE
+            processSingleString('role')
+
+            # LOGO
+            processSingleURI('logo')
+
+            # ORG (organization)
+            elmOrg = self.getPropertyValue(elmCard, 'org')
+            if elmOrg:
+                sOrganizationName = self.getPropertyValue(elmOrg, 'organization-name', self.STRING, 0, 1)
+                if not sOrganizationName:
+                    # implied "organization-name" optimization
+                    # http://microformats.org/wiki/hcard#Implied_.22organization-name.22_Optimization
+                    sOrganizationName = self.getPropertyValue(elmCard, 'org', self.STRING, 0, 1)
+                    if sOrganizationName:
+                        arLines.append(self.vcardFold('ORG:' + sOrganizationName))
+                else:
+                    arOrganizationUnit = self.getPropertyValue(elmOrg, 'organization-unit', self.STRING, 1, 1)
+                    arLines.append(self.vcardFold('ORG:' + sOrganizationName + ';' + ';'.join(arOrganizationUnit)))
+
+            # CATEGORY
+            arCategory = self.getPropertyValue(elmCard, 'category', self.STRING, 1, 1) + self.getPropertyValue(elmCard, 'categories', self.STRING, 1, 1)
+            if arCategory:
+                arLines.append(self.vcardFold('CATEGORIES:' + ','.join(arCategory)))
+
+            # NOTE
+            processSingleString('note')
+
+            # REV
+            processSingleString('rev')
+
+            # SOUND
+            processSingleURI('sound')
+
+            # UID
+            processSingleString('uid')
+
+            # URL
+            processSingleURI('url')
+
+            # CLASS
+            processSingleString('class')
+
+            # KEY
+            processSingleURI('key')
+
+            if arLines:
+                arLines = [u'BEGIN:vCard',u'VERSION:3.0'] + arLines + [u'END:vCard']
+                sVCards += u'\n'.join(arLines) + u'\n'
+
+        return sVCards.strip()
+
+    def isProbablyDownloadable(self, elm):
+        attrsD = elm.attrMap
+        if not attrsD.has_key('href'): return 0
+        linktype = attrsD.get('type', '').strip()
+        if linktype.startswith('audio/') or \
+           linktype.startswith('video/') or \
+           (linktype.startswith('application/') and not linktype.endswith('xml')):
+            return 1
+        path = urlparse.urlparse(attrsD['href'])[2]
+        if path.find('.') == -1: return 0
+        fileext = path.split('.').pop().lower()
+        return fileext in self.known_binary_extensions
+
+    def findTags(self):
+        all = lambda x: 1
+        for elm in self.document(all, {'rel': re.compile(r'\btag\b')}):
+            href = elm.get('href')
+            if not href: continue
+            urlscheme, domain, path, params, query, fragment = \
+                       urlparse.urlparse(_urljoin(self.baseuri, href))
+            segments = path.split('/')
+            tag = segments.pop()
+            if not tag:
+                tag = segments.pop()
+            tagscheme = urlparse.urlunparse((urlscheme, domain, '/'.join(segments), '', '', ''))
+            if not tagscheme.endswith('/'):
+                tagscheme += '/'
+            self.tags.append(FeedParserDict({"term": tag, "scheme": tagscheme, "label": elm.string or ''}))
+
+    def findEnclosures(self):
+        all = lambda x: 1
+        enclosure_match = re.compile(r'\benclosure\b')
+        for elm in self.document(all, {'href': re.compile(r'.+')}):
+            if not enclosure_match.search(elm.get('rel', '')) and not self.isProbablyDownloadable(elm): continue
+            if elm.attrMap not in self.enclosures:
+                self.enclosures.append(elm.attrMap)
+                if elm.string and not elm.get('title'):
+                    self.enclosures[-1]['title'] = elm.string
+
+    def findXFN(self):
+        all = lambda x: 1
+        for elm in self.document(all, {'rel': re.compile('.+'), 'href': re.compile('.+')}):
+            rels = elm.get('rel', '').split()
+            xfn_rels = []
+            for rel in rels:
+                if rel in self.known_xfn_relationships:
+                    xfn_rels.append(rel)
+            if xfn_rels:
+                self.xfn.append({"relationships": xfn_rels, "href": elm.get('href', ''), "name": elm.string})
+
+def _parseMicroformats(htmlSource, baseURI, encoding):
+    if not BeautifulSoup: return
+    if _debug: sys.stderr.write('entering _parseMicroformats\n')
+    try:
+        p = _MicroformatsParser(htmlSource, baseURI, encoding)
+    except UnicodeEncodeError:
+        # sgmllib throws this exception when performing lookups of tags
+        # with non-ASCII characters in them.
+        return
+    p.vcard = p.findVCards(p.document)
+    p.findTags()
+    p.findEnclosures()
+    p.findXFN()
+    return {"tags": p.tags, "enclosures": p.enclosures, "xfn": p.xfn, "vcard": p.vcard}
+
+class _RelativeURIResolver(_BaseHTMLProcessor):
+    relative_uris = [('a', 'href'),
+                     ('applet', 'codebase'),
+                     ('area', 'href'),
+                     ('blockquote', 'cite'),
+                     ('body', 'background'),
+                     ('del', 'cite'),
+                     ('form', 'action'),
+                     ('frame', 'longdesc'),
+                     ('frame', 'src'),
+                     ('iframe', 'longdesc'),
+                     ('iframe', 'src'),
+                     ('head', 'profile'),
+                     ('img', 'longdesc'),
+                     ('img', 'src'),
+                     ('img', 'usemap'),
+                     ('input', 'src'),
+                     ('input', 'usemap'),
+                     ('ins', 'cite'),
+                     ('link', 'href'),
+                     ('object', 'classid'),
+                     ('object', 'codebase'),
+                     ('object', 'data'),
+                     ('object', 'usemap'),
+                     ('q', 'cite'),
+                     ('script', 'src')]
+
+    def __init__(self, baseuri, encoding, _type):
+        _BaseHTMLProcessor.__init__(self, encoding, _type)
+        self.baseuri = baseuri
+
+    def resolveURI(self, uri):
+        return _makeSafeAbsoluteURI(_urljoin(self.baseuri, uri.strip()))
+
+    def unknown_starttag(self, tag, attrs):
+        if _debug:
+            sys.stderr.write('tag: [%s] with attributes: [%s]\n' % (tag, str(attrs)))
+        attrs = self.normalize_attrs(attrs)
+        attrs = [(key, ((tag, key) in self.relative_uris) and self.resolveURI(value) or value) for key, value in attrs]
+        _BaseHTMLProcessor.unknown_starttag(self, tag, attrs)
+
+def _resolveRelativeURIs(htmlSource, baseURI, encoding, _type):
+    if _debug:
+        sys.stderr.write('entering _resolveRelativeURIs\n')
+
+    p = _RelativeURIResolver(baseURI, encoding, _type)
+    p.feed(htmlSource)
+    return p.output()
+
+def _makeSafeAbsoluteURI(base, rel=None):
+    # bail if ACCEPTABLE_URI_SCHEMES is empty
+    if not ACCEPTABLE_URI_SCHEMES:
+        return _urljoin(base, rel or u'')
+    if not base:
+        return rel or u''
+    if not rel:
+        scheme = urlparse.urlparse(base)[0]
+        if not scheme or scheme in ACCEPTABLE_URI_SCHEMES:
+            return base
+        return u''
+    uri = _urljoin(base, rel)
+    if uri.strip().split(':', 1)[0] not in ACCEPTABLE_URI_SCHEMES:
+        return u''
+    return uri
+
+class _HTMLSanitizer(_BaseHTMLProcessor):
+    acceptable_elements = ['a', 'abbr', 'acronym', 'address', 'area',
+        'article', 'aside', 'audio', 'b', 'big', 'blockquote', 'br', 'button',
+        'canvas', 'caption', 'center', 'cite', 'code', 'col', 'colgroup',
+        'command', 'datagrid', 'datalist', 'dd', 'del', 'details', 'dfn',
+        'dialog', 'dir', 'div', 'dl', 'dt', 'em', 'event-source', 'fieldset',
+        'figcaption', 'figure', 'footer', 'font', 'form', 'header', 'h1',
+        'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'img', 'input', 'ins',
+        'keygen', 'kbd', 'label', 'legend', 'li', 'm', 'map', 'menu', 'meter',
+        'multicol', 'nav', 'nextid', 'ol', 'output', 'optgroup', 'option',
+        'p', 'pre', 'progress', 'q', 's', 'samp', 'section', 'select',
+        'small', 'sound', 'source', 'spacer', 'span', 'strike', 'strong',
+        'sub', 'sup', 'table', 'tbody', 'td', 'textarea', 'time', 'tfoot',
+        'th', 'thead', 'tr', 'tt', 'u', 'ul', 'var', 'video', 'noscript']
+
+    acceptable_attributes = ['abbr', 'accept', 'accept-charset', 'accesskey',
+      'action', 'align', 'alt', 'autocomplete', 'autofocus', 'axis',
+      'background', 'balance', 'bgcolor', 'bgproperties', 'border',
+      'bordercolor', 'bordercolordark', 'bordercolorlight', 'bottompadding',
+      'cellpadding', 'cellspacing', 'ch', 'challenge', 'char', 'charoff',
+      'choff', 'charset', 'checked', 'cite', 'class', 'clear', 'color', 'cols',
+      'colspan', 'compact', 'contenteditable', 'controls', 'coords', 'data',
+      'datafld', 'datapagesize', 'datasrc', 'datetime', 'default', 'delay',
+      'dir', 'disabled', 'draggable', 'dynsrc', 'enctype', 'end', 'face', 'for',
+      'form', 'frame', 'galleryimg', 'gutter', 'headers', 'height', 'hidefocus',
+      'hidden', 'high', 'href', 'hreflang', 'hspace', 'icon', 'id', 'inputmode',
+      'ismap', 'keytype', 'label', 'leftspacing', 'lang', 'list', 'longdesc',
+      'loop', 'loopcount', 'loopend', 'loopstart', 'low', 'lowsrc', 'max',
+      'maxlength', 'media', 'method', 'min', 'multiple', 'name', 'nohref',
+      'noshade', 'nowrap', 'open', 'optimum', 'pattern', 'ping', 'point-size',
+      'prompt', 'pqg', 'radiogroup', 'readonly', 'rel', 'repeat-max',
+      'repeat-min', 'replace', 'required', 'rev', 'rightspacing', 'rows',
+      'rowspan', 'rules', 'scope', 'selected', 'shape', 'size', 'span', 'src',
+      'start', 'step', 'summary', 'suppress', 'tabindex', 'target', 'template',
+      'title', 'toppadding', 'type', 'unselectable', 'usemap', 'urn', 'valign',
+      'value', 'variable', 'volume', 'vspace', 'vrml', 'width', 'wrap',
+      'xml:lang']
+
+    unacceptable_elements_with_end_tag = ['script', 'applet', 'style']
+
+    acceptable_css_properties = ['azimuth', 'background-color',
+      'border-bottom-color', 'border-collapse', 'border-color',
+      'border-left-color', 'border-right-color', 'border-top-color', 'clear',
+      'color', 'cursor', 'direction', 'display', 'elevation', 'float', 'font',
+      'font-family', 'font-size', 'font-style', 'font-variant', 'font-weight',
+      'height', 'letter-spacing', 'line-height', 'overflow', 'pause',
+      'pause-after', 'pause-before', 'pitch', 'pitch-range', 'richness',
+      'speak', 'speak-header', 'speak-numeral', 'speak-punctuation',
+      'speech-rate', 'stress', 'text-align', 'text-decoration', 'text-indent',
+      'unicode-bidi', 'vertical-align', 'voice-family', 'volume',
+      'white-space', 'width']
+
+    # survey of common keywords found in feeds
+    acceptable_css_keywords = ['auto', 'aqua', 'black', 'block', 'blue',
+      'bold', 'both', 'bottom', 'brown', 'center', 'collapse', 'dashed',
+      'dotted', 'fuchsia', 'gray', 'green', '!important', 'italic', 'left',
+      'lime', 'maroon', 'medium', 'none', 'navy', 'normal', 'nowrap', 'olive',
+      'pointer', 'purple', 'red', 'right', 'solid', 'silver', 'teal', 'top',
+      'transparent', 'underline', 'white', 'yellow']
+
+    valid_css_values = re.compile('^(#[0-9a-f]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|' +
+      '\d{0,2}\.?\d{0,2}(cm|em|ex|in|mm|pc|pt|px|%|,|\))?)$')
+
+    mathml_elements = ['annotation', 'annotation-xml', 'maction', 'math',
+      'merror', 'mfenced', 'mfrac', 'mi', 'mmultiscripts', 'mn', 'mo', 'mover', 'mpadded',
+      'mphantom', 'mprescripts', 'mroot', 'mrow', 'mspace', 'msqrt', 'mstyle',
+      'msub', 'msubsup', 'msup', 'mtable', 'mtd', 'mtext', 'mtr', 'munder',
+      'munderover', 'none', 'semantics']
+
+    mathml_attributes = ['actiontype', 'align', 'columnalign', 'columnalign',
+      'columnalign', 'close', 'columnlines', 'columnspacing', 'columnspan', 'depth',
+      'display', 'displaystyle', 'encoding', 'equalcolumns', 'equalrows',
+      'fence', 'fontstyle', 'fontweight', 'frame', 'height', 'linethickness',
+      'lspace', 'mathbackground', 'mathcolor', 'mathvariant', 'mathvariant',
+      'maxsize', 'minsize', 'open', 'other', 'rowalign', 'rowalign', 'rowalign',
+      'rowlines', 'rowspacing', 'rowspan', 'rspace', 'scriptlevel', 'selection',
+      'separator', 'separators', 'stretchy', 'width', 'width', 'xlink:href',
+      'xlink:show', 'xlink:type', 'xmlns', 'xmlns:xlink']
+
+    # svgtiny - foreignObject + linearGradient + radialGradient + stop
+    svg_elements = ['a', 'animate', 'animateColor', 'animateMotion',
+      'animateTransform', 'circle', 'defs', 'desc', 'ellipse', 'foreignObject',
+      'font-face', 'font-face-name', 'font-face-src', 'g', 'glyph', 'hkern',
+      'linearGradient', 'line', 'marker', 'metadata', 'missing-glyph', 'mpath',
+      'path', 'polygon', 'polyline', 'radialGradient', 'rect', 'set', 'stop',
+      'svg', 'switch', 'text', 'title', 'tspan', 'use']
+
+    # svgtiny + class + opacity + offset + xmlns + xmlns:xlink
+    svg_attributes = ['accent-height', 'accumulate', 'additive', 'alphabetic',
+       'arabic-form', 'ascent', 'attributeName', 'attributeType',
+       'baseProfile', 'bbox', 'begin', 'by', 'calcMode', 'cap-height',
+       'class', 'color', 'color-rendering', 'content', 'cx', 'cy', 'd', 'dx',
+       'dy', 'descent', 'display', 'dur', 'end', 'fill', 'fill-opacity',
+       'fill-rule', 'font-family', 'font-size', 'font-stretch', 'font-style',
+       'font-variant', 'font-weight', 'from', 'fx', 'fy', 'g1', 'g2',
+       'glyph-name', 'gradientUnits', 'hanging', 'height', 'horiz-adv-x',
+       'horiz-origin-x', 'id', 'ideographic', 'k', 'keyPoints', 'keySplines',
+       'keyTimes', 'lang', 'mathematical', 'marker-end', 'marker-mid',
+       'marker-start', 'markerHeight', 'markerUnits', 'markerWidth', 'max',
+       'min', 'name', 'offset', 'opacity', 'orient', 'origin',
+       'overline-position', 'overline-thickness', 'panose-1', 'path',
+       'pathLength', 'points', 'preserveAspectRatio', 'r', 'refX', 'refY',
+       'repeatCount', 'repeatDur', 'requiredExtensions', 'requiredFeatures',
+       'restart', 'rotate', 'rx', 'ry', 'slope', 'stemh', 'stemv',
+       'stop-color', 'stop-opacity', 'strikethrough-position',
+       'strikethrough-thickness', 'stroke', 'stroke-dasharray',
+       'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin',
+       'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'systemLanguage',
+       'target', 'text-anchor', 'to', 'transform', 'type', 'u1', 'u2',
+       'underline-position', 'underline-thickness', 'unicode', 'unicode-range',
+       'units-per-em', 'values', 'version', 'viewBox', 'visibility', 'width',
+       'widths', 'x', 'x-height', 'x1', 'x2', 'xlink:actuate', 'xlink:arcrole',
+       'xlink:href', 'xlink:role', 'xlink:show', 'xlink:title', 'xlink:type',
+       'xml:base', 'xml:lang', 'xml:space', 'xmlns', 'xmlns:xlink', 'y', 'y1',
+       'y2', 'zoomAndPan']
+
+    svg_attr_map = None
+    svg_elem_map = None
+
+    acceptable_svg_properties = [ 'fill', 'fill-opacity', 'fill-rule',
+      'stroke', 'stroke-width', 'stroke-linecap', 'stroke-linejoin',
+      'stroke-opacity']
+
+    def reset(self):
+        _BaseHTMLProcessor.reset(self)
+        self.unacceptablestack = 0
+        self.mathmlOK = 0
+        self.svgOK = 0
+
+    def unknown_starttag(self, tag, attrs):
+        acceptable_attributes = self.acceptable_attributes
+        keymap = {}
+        if not tag in self.acceptable_elements or self.svgOK:
+            if tag in self.unacceptable_elements_with_end_tag:
+                self.unacceptablestack += 1
+
+            # add implicit namespaces to html5 inline svg/mathml
+            if self._type.endswith('html'):
+                if not dict(attrs).get('xmlns'):
+                    if tag=='svg':
+                        attrs.append( ('xmlns','http://www.w3.org/2000/svg') )
+                    if tag=='math':
+                        attrs.append( ('xmlns','http://www.w3.org/1998/Math/MathML') )
+
+            # not otherwise acceptable, perhaps it is MathML or SVG?
+            if tag=='math' and ('xmlns','http://www.w3.org/1998/Math/MathML') in attrs:
+                self.mathmlOK += 1
+            if tag=='svg' and ('xmlns','http://www.w3.org/2000/svg') in attrs:
+                self.svgOK += 1
+
+            # chose acceptable attributes based on tag class, else bail
+            if  self.mathmlOK and tag in self.mathml_elements:
+                acceptable_attributes = self.mathml_attributes
+            elif self.svgOK and tag in self.svg_elements:
+                # for most vocabularies, lowercasing is a good idea.  Many
+                # svg elements, however, are camel case
+                if not self.svg_attr_map:
+                    lower=[attr.lower() for attr in self.svg_attributes]
+                    mix=[a for a in self.svg_attributes if a not in lower]
+                    self.svg_attributes = lower
+                    self.svg_attr_map = dict([(a.lower(),a) for a in mix])
+
+                    lower=[attr.lower() for attr in self.svg_elements]
+                    mix=[a for a in self.svg_elements if a not in lower]
+                    self.svg_elements = lower
+                    self.svg_elem_map = dict([(a.lower(),a) for a in mix])
+                acceptable_attributes = self.svg_attributes
+                tag = self.svg_elem_map.get(tag,tag)
+                keymap = self.svg_attr_map
+            elif not tag in self.acceptable_elements:
+                return
+
+        # declare xlink namespace, if needed
+        if self.mathmlOK or self.svgOK:
+            if filter(lambda (n,v): n.startswith('xlink:'),attrs):
+                if not ('xmlns:xlink','http://www.w3.org/1999/xlink') in attrs:
+                    attrs.append(('xmlns:xlink','http://www.w3.org/1999/xlink'))
+
+        clean_attrs = []
+        for key, value in self.normalize_attrs(attrs):
+            if key in acceptable_attributes:
+                key=keymap.get(key,key)
+                # make sure the uri uses an acceptable uri scheme
+                if key == u'href':
+                    value = _makeSafeAbsoluteURI(value)
+                clean_attrs.append((key,value))
+            elif key=='style':
+                clean_value = self.sanitize_style(value)
+                if clean_value: clean_attrs.append((key,clean_value))
+        _BaseHTMLProcessor.unknown_starttag(self, tag, clean_attrs)
+
+    def unknown_endtag(self, tag):
+        if not tag in self.acceptable_elements:
+            if tag in self.unacceptable_elements_with_end_tag:
+                self.unacceptablestack -= 1
+            if self.mathmlOK and tag in self.mathml_elements:
+                if tag == 'math' and self.mathmlOK: self.mathmlOK -= 1
+            elif self.svgOK and tag in self.svg_elements:
+                tag = self.svg_elem_map.get(tag,tag)
+                if tag == 'svg' and self.svgOK: self.svgOK -= 1
+            else:
+                return
+        _BaseHTMLProcessor.unknown_endtag(self, tag)
+
+    def handle_pi(self, text):
+        pass
+
+    def handle_decl(self, text):
+        pass
+
+    def handle_data(self, text):
+        if not self.unacceptablestack:
+            _BaseHTMLProcessor.handle_data(self, text)
+
+    def sanitize_style(self, style):
+        # disallow urls
+        style=re.compile('url\s*\(\s*[^\s)]+?\s*\)\s*').sub(' ',style)
+
+        # gauntlet
+        if not re.match("""^([:,;#%.\sa-zA-Z0-9!]|\w-\w|'[\s\w]+'|"[\s\w]+"|\([\d,\s]+\))*$""", style): return ''
+        # This replaced a regexp that used re.match and was prone to pathological back-tracking.
+        if re.sub("\s*[-\w]+\s*:\s*[^:;]*;?", '', style).strip(): return ''
+
+        clean = []
+        for prop,value in re.findall("([-\w]+)\s*:\s*([^:;]*)",style):
+          if not value: continue
+          if prop.lower() in self.acceptable_css_properties:
+              clean.append(prop + ': ' + value + ';')
+          elif prop.split('-')[0].lower() in ['background','border','margin','padding']:
+              for keyword in value.split():
+                  if not keyword in self.acceptable_css_keywords and \
+                      not self.valid_css_values.match(keyword):
+                      break
+              else:
+                  clean.append(prop + ': ' + value + ';')
+          elif self.svgOK and prop.lower() in self.acceptable_svg_properties:
+              clean.append(prop + ': ' + value + ';')
+
+        return ' '.join(clean)
+
+    def parse_comment(self, i, report=1):
+        ret = _BaseHTMLProcessor.parse_comment(self, i, report)
+        if ret >= 0:
+            return ret
+        # if ret == -1, this may be a malicious attempt to circumvent
+        # sanitization, or a page-destroying unclosed comment
+        match = re.compile(r'--[^>]*>').search(self.rawdata, i+4)
+        if match:
+            return match.end()
+        # unclosed comment; deliberately fail to handle_data()
+        return len(self.rawdata)
+
+
+def _sanitizeHTML(htmlSource, encoding, _type):
+    p = _HTMLSanitizer(encoding, _type)
+    htmlSource = htmlSource.replace('<![CDATA[', '&lt;![CDATA[')
+    p.feed(htmlSource)
+    data = p.output()
+    if TIDY_MARKUP:
+        # loop through list of preferred Tidy interfaces looking for one that's installed,
+        # then set up a common _tidy function to wrap the interface-specific API.
+        _tidy = None
+        for tidy_interface in PREFERRED_TIDY_INTERFACES:
+            try:
+                if tidy_interface == "uTidy":
+                    from tidy import parseString as _utidy
+                    def _tidy(data, **kwargs):
+                        return str(_utidy(data, **kwargs))
+                    break
+                elif tidy_interface == "mxTidy":
+                    from mx.Tidy import Tidy as _mxtidy
+                    def _tidy(data, **kwargs):
+                        nerrors, nwarnings, data, errordata = _mxtidy.tidy(data, **kwargs)
+                        return data
+                    break
+            except:
+                pass
+        if _tidy:
+            utf8 = type(data) == type(u'')
+            if utf8:
+                data = data.encode('utf-8')
+            data = _tidy(data, output_xhtml=1, numeric_entities=1, wrap=0, char_encoding="utf8")
+            if utf8:
+                data = unicode(data, 'utf-8')
+            if data.count('<body'):
+                data = data.split('<body', 1)[1]
+                if data.count('>'):
+                    data = data.split('>', 1)[1]
+            if data.count('</body'):
+                data = data.split('</body', 1)[0]
+    data = data.strip().replace('\r\n', '\n')
+    return data
+
+class _FeedURLHandler(urllib2.HTTPDigestAuthHandler, urllib2.HTTPRedirectHandler, urllib2.HTTPDefaultErrorHandler):
+    def http_error_default(self, req, fp, code, msg, headers):
+        if ((code / 100) == 3) and (code != 304):
+            return self.http_error_302(req, fp, code, msg, headers)
+        infourl = urllib.addinfourl(fp, headers, req.get_full_url())
+        infourl.status = code
+        return infourl
+
+    def http_error_302(self, req, fp, code, msg, headers):
+        if headers.dict.has_key('location'):
+            infourl = urllib2.HTTPRedirectHandler.http_error_302(self, req, fp, code, msg, headers)
+        else:
+            infourl = urllib.addinfourl(fp, headers, req.get_full_url())
+        if not hasattr(infourl, 'status'):
+            infourl.status = code
+        return infourl
+
+    def http_error_301(self, req, fp, code, msg, headers):
+        if headers.dict.has_key('location'):
+            infourl = urllib2.HTTPRedirectHandler.http_error_301(self, req, fp, code, msg, headers)
+        else:
+            infourl = urllib.addinfourl(fp, headers, req.get_full_url())
+        if not hasattr(infourl, 'status'):
+            infourl.status = code
+        return infourl
+
+    http_error_300 = http_error_302
+    http_error_303 = http_error_302
+    http_error_307 = http_error_302
+
+    def http_error_401(self, req, fp, code, msg, headers):
+        # Check if
+        # - server requires digest auth, AND
+        # - we tried (unsuccessfully) with basic auth, AND
+        # - we're using Python 2.3.3 or later (digest auth is irreparably broken in earlier versions)
+        # If all conditions hold, parse authentication information
+        # out of the Authorization header we sent the first time
+        # (for the username and password) and the WWW-Authenticate
+        # header the server sent back (for the realm) and retry
+        # the request with the appropriate digest auth headers instead.
+        # This evil genius hack has been brought to you by Aaron Swartz.
+        host = urlparse.urlparse(req.get_full_url())[1]
+        try:
+            assert sys.version.split()[0] >= '2.3.3'
+            assert base64 != None
+            user, passw = _base64decode(req.headers['Authorization'].split(' ')[1]).split(':')
+            realm = re.findall('realm="([^"]*)"', headers['WWW-Authenticate'])[0]
+            self.add_password(realm, host, user, passw)
+            retry = self.http_error_auth_reqed('www-authenticate', host, req, headers)
+            self.reset_retry_count()
+            return retry
+        except:
+            return self.http_error_default(req, fp, code, msg, headers)
+
+def _open_resource(url_file_stream_or_string, etag, modified, agent, referrer, handlers, request_headers):
+    """URL, filename, or string --> stream
+
+    This function lets you define parsers that take any input source
+    (URL, pathname to local or network file, or actual data as a string)
+    and deal with it in a uniform manner.  Returned object is guaranteed
+    to have all the basic stdio read methods (read, readline, readlines).
+    Just .close() the object when you're done with it.
+
+    If the etag argument is supplied, it will be used as the value of an
+    If-None-Match request header.
+
+    If the modified argument is supplied, it can be a tuple of 9 integers
+    (as returned by gmtime() in the standard Python time module) or a date
+    string in any format supported by feedparser. Regardless, it MUST
+    be in GMT (Greenwich Mean Time). It will be reformatted into an
+    RFC 1123-compliant date and used as the value of an If-Modified-Since
+    request header.
+
+    If the agent argument is supplied, it will be used as the value of a
+    User-Agent request header.
+
+    If the referrer argument is supplied, it will be used as the value of a
+    Referer[sic] request header.
+
+    If handlers is supplied, it is a list of handlers used to build a
+    urllib2 opener.
+
+    if request_headers is supplied it is a dictionary of HTTP request headers
+    that will override the values generated by FeedParser.
+    """
+
+    if hasattr(url_file_stream_or_string, 'read'):
+        return url_file_stream_or_string
+
+    if url_file_stream_or_string == '-':
+        return sys.stdin
+
+    if urlparse.urlparse(url_file_stream_or_string)[0] in ('http', 'https', 'ftp', 'file', 'feed'):
+        # Deal with the feed URI scheme
+        if url_file_stream_or_string.startswith('feed:http'):
+            url_file_stream_or_string = url_file_stream_or_string[5:]
+        elif url_file_stream_or_string.startswith('feed:'):
+            url_file_stream_or_string = 'http:' + url_file_stream_or_string[5:]
+        if not agent:
+            agent = USER_AGENT
+        # test for inline user:password for basic auth
+        auth = None
+        if base64:
+            urltype, rest = urllib.splittype(url_file_stream_or_string)
+            realhost, rest = urllib.splithost(rest)
+            if realhost:
+                user_passwd, realhost = urllib.splituser(realhost)
+                if user_passwd:
+                    url_file_stream_or_string = '%s://%s%s' % (urltype, realhost, rest)
+                    auth = base64.standard_b64encode(user_passwd).strip()
+
+        # iri support
+        try:
+            if isinstance(url_file_stream_or_string,unicode):
+                url_file_stream_or_string = url_file_stream_or_string.encode('idna').decode('utf-8')
+            else:
+                url_file_stream_or_string = url_file_stream_or_string.decode('utf-8').encode('idna').decode('utf-8')
+        except:
+            pass
+
+        # try to open with urllib2 (to use optional headers)
+        request = _build_urllib2_request(url_file_stream_or_string, agent, etag, modified, referrer, auth, request_headers)
+        opener = apply(urllib2.build_opener, tuple(handlers + [_FeedURLHandler()]))
+        opener.addheaders = [] # RMK - must clear so we only send our custom User-Agent
+        try:
+            return opener.open(request, timeout=15)
+        finally:
+            opener.close() # JohnD
+
+    # try to open with native open function (if url_file_stream_or_string is a filename)
+    try:
+        return open(url_file_stream_or_string, 'rb')
+    except:
+        pass
+
+    # treat url_file_stream_or_string as string
+    return _StringIO(str(url_file_stream_or_string))
+
+def _build_urllib2_request(url, agent, etag, modified, referrer, auth, request_headers):
+    request = urllib2.Request(url)
+    request.add_header('User-Agent', agent)
+    if etag:
+        request.add_header('If-None-Match', etag)
+    if type(modified) == type(''):
+        modified = _parse_date(modified)
+    elif isinstance(modified, datetime.datetime):
+        modified = modified.utctimetuple()
+    if modified:
+        # format into an RFC 1123-compliant timestamp. We can't use
+        # time.strftime() since the %a and %b directives can be affected
+        # by the current locale, but RFC 2616 states that dates must be
+        # in English.
+        short_weekdays = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+        months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
+        request.add_header('If-Modified-Since', '%s, %02d %s %04d %02d:%02d:%02d GMT' % (short_weekdays[modified[6]], modified[2], months[modified[1] - 1], modified[0], modified[3], modified[4], modified[5]))
+    if referrer:
+        request.add_header('Referer', referrer)
+    if gzip and zlib:
+        request.add_header('Accept-encoding', 'gzip, deflate')
+    elif gzip:
+        request.add_header('Accept-encoding', 'gzip')
+    elif zlib:
+        request.add_header('Accept-encoding', 'deflate')
+    else:
+        request.add_header('Accept-encoding', '')
+    if auth:
+        request.add_header('Authorization', 'Basic %s' % auth)
+    if ACCEPT_HEADER:
+        request.add_header('Accept', ACCEPT_HEADER)
+    # use this for whatever -- cookies, special headers, etc
+    # [('Cookie','Something'),('x-special-header','Another Value')]
+    for header_name, header_value in request_headers.items():
+        request.add_header(header_name, header_value)
+    request.add_header('A-IM', 'feed') # RFC 3229 support
+    return request
+
+_date_handlers = []
+def registerDateHandler(func):
+    '''Register a date handler function (takes string, returns 9-tuple date in GMT)'''
+    _date_handlers.insert(0, func)
+
+# ISO-8601 date parsing routines written by Fazal Majid.
+# The ISO 8601 standard is very convoluted and irregular - a full ISO 8601
+# parser is beyond the scope of feedparser and would be a worthwhile addition
+# to the Python library.
+# A single regular expression cannot parse ISO 8601 date formats into groups
+# as the standard is highly irregular (for instance is 030104 2003-01-04 or
+# 0301-04-01), so we use templates instead.
+# Please note the order in templates is significant because we need a
+# greedy match.
+_iso8601_tmpl = ['YYYY-?MM-?DD', 'YYYY-0MM?-?DD', 'YYYY-MM', 'YYYY-?OOO',
+                'YY-?MM-?DD', 'YY-?OOO', 'YYYY',
+                '-YY-?MM', '-OOO', '-YY',
+                '--MM-?DD', '--MM',
+                '---DD',
+                'CC', '']
+_iso8601_re = [
+    tmpl.replace(
+    'YYYY', r'(?P<year>\d{4})').replace(
+    'YY', r'(?P<year>\d\d)').replace(
+    'MM', r'(?P<month>[01]\d)').replace(
+    'DD', r'(?P<day>[0123]\d)').replace(
+    'OOO', r'(?P<ordinal>[0123]\d\d)').replace(
+    'CC', r'(?P<century>\d\d$)')
+    + r'(T?(?P<hour>\d{2}):(?P<minute>\d{2})'
+    + r'(:(?P<second>\d{2}))?'
+    + r'(\.(?P<fracsecond>\d+))?'
+    + r'(?P<tz>[+-](?P<tzhour>\d{2})(:(?P<tzmin>\d{2}))?|Z)?)?'
+    for tmpl in _iso8601_tmpl]
+try:
+    del tmpl
+except NameError:
+    pass
+_iso8601_matches = [re.compile(regex).match for regex in _iso8601_re]
+try:
+    del regex
+except NameError:
+    pass
+def _parse_date_iso8601(dateString):
+    '''Parse a variety of ISO-8601-compatible formats like 20040105'''
+    m = None
+    for _iso8601_match in _iso8601_matches:
+        m = _iso8601_match(dateString)
+        if m: break
+    if not m: return
+    if m.span() == (0, 0): return
+    params = m.groupdict()
+    ordinal = params.get('ordinal', 0)
+    if ordinal:
+        ordinal = int(ordinal)
+    else:
+        ordinal = 0
+    year = params.get('year', '--')
+    if not year or year == '--':
+        year = time.gmtime()[0]
+    elif len(year) == 2:
+        # ISO 8601 assumes current century, i.e. 93 -> 2093, NOT 1993
+        year = 100 * int(time.gmtime()[0] / 100) + int(year)
+    else:
+        year = int(year)
+    month = params.get('month', '-')
+    if not month or month == '-':
+        # ordinals are NOT normalized by mktime, we simulate them
+        # by setting month=1, day=ordinal
+        if ordinal:
+            month = 1
+        else:
+            month = time.gmtime()[1]
+    month = int(month)
+    day = params.get('day', 0)
+    if not day:
+        # see above
+        if ordinal:
+            day = ordinal
+        elif params.get('century', 0) or \
+                 params.get('year', 0) or params.get('month', 0):
+            day = 1
+        else:
+            day = time.gmtime()[2]
+    else:
+        day = int(day)
+    # special case of the century - is the first year of the 21st century
+    # 2000 or 2001 ? The debate goes on...
+    if 'century' in params.keys():
+        year = (int(params['century']) - 1) * 100 + 1
+    # in ISO 8601 most fields are optional
+    for field in ['hour', 'minute', 'second', 'tzhour', 'tzmin']:
+        if not params.get(field, None):
+            params[field] = 0
+    hour = int(params.get('hour', 0))
+    minute = int(params.get('minute', 0))
+    second = int(float(params.get('second', 0)))
+    # weekday is normalized by mktime(), we can ignore it
+    weekday = 0
+    daylight_savings_flag = -1
+    tm = [year, month, day, hour, minute, second, weekday,
+          ordinal, daylight_savings_flag]
+    # ISO 8601 time zone adjustments
+    tz = params.get('tz')
+    if tz and tz != 'Z':
+        if tz[0] == '-':
+            tm[3] += int(params.get('tzhour', 0))
+            tm[4] += int(params.get('tzmin', 0))
+        elif tz[0] == '+':
+            tm[3] -= int(params.get('tzhour', 0))
+            tm[4] -= int(params.get('tzmin', 0))
+        else:
+            return None
+    # Python's time.mktime() is a wrapper around the ANSI C mktime(3c)
+    # which is guaranteed to normalize d/m/y/h/m/s.
+    # Many implementations have bugs, but we'll pretend they don't.
+    return time.localtime(time.mktime(tuple(tm)))
+registerDateHandler(_parse_date_iso8601)
+
+# 8-bit date handling routines written by ytrewq1.
+_korean_year  = u'\ub144' # b3e2 in euc-kr
+_korean_month = u'\uc6d4' # bff9 in euc-kr
+_korean_day   = u'\uc77c' # c0cf in euc-kr
+_korean_am    = u'\uc624\uc804' # bfc0 c0fc in euc-kr
+_korean_pm    = u'\uc624\ud6c4' # bfc0 c8c4 in euc-kr
+
+_korean_onblog_date_re = \
+    re.compile('(\d{4})%s\s+(\d{2})%s\s+(\d{2})%s\s+(\d{2}):(\d{2}):(\d{2})' % \
+               (_korean_year, _korean_month, _korean_day))
+_korean_nate_date_re = \
+    re.compile(u'(\d{4})-(\d{2})-(\d{2})\s+(%s|%s)\s+(\d{,2}):(\d{,2}):(\d{,2})' % \
+               (_korean_am, _korean_pm))
+def _parse_date_onblog(dateString):
+    '''Parse a string according to the OnBlog 8-bit date format'''
+    m = _korean_onblog_date_re.match(dateString)
+    if not m: return
+    w3dtfdate = '%(year)s-%(month)s-%(day)sT%(hour)s:%(minute)s:%(second)s%(zonediff)s' % \
+                {'year': m.group(1), 'month': m.group(2), 'day': m.group(3),\
+                 'hour': m.group(4), 'minute': m.group(5), 'second': m.group(6),\
+                 'zonediff': '+09:00'}
+    if _debug: sys.stderr.write('OnBlog date parsed as: %s\n' % w3dtfdate)
+    return _parse_date_w3dtf(w3dtfdate)
+registerDateHandler(_parse_date_onblog)
+
+def _parse_date_nate(dateString):
+    '''Parse a string according to the Nate 8-bit date format'''
+    m = _korean_nate_date_re.match(dateString)
+    if not m: return
+    hour = int(m.group(5))
+    ampm = m.group(4)
+    if (ampm == _korean_pm):
+        hour += 12
+    hour = str(hour)
+    if len(hour) == 1:
+        hour = '0' + hour
+    w3dtfdate = '%(year)s-%(month)s-%(day)sT%(hour)s:%(minute)s:%(second)s%(zonediff)s' % \
+                {'year': m.group(1), 'month': m.group(2), 'day': m.group(3),\
+                 'hour': hour, 'minute': m.group(6), 'second': m.group(7),\
+                 'zonediff': '+09:00'}
+    if _debug: sys.stderr.write('Nate date parsed as: %s\n' % w3dtfdate)
+    return _parse_date_w3dtf(w3dtfdate)
+registerDateHandler(_parse_date_nate)
+
+_mssql_date_re = \
+    re.compile('(\d{4})-(\d{2})-(\d{2})\s+(\d{2}):(\d{2}):(\d{2})(\.\d+)?')
+def _parse_date_mssql(dateString):
+    '''Parse a string according to the MS SQL date format'''
+    m = _mssql_date_re.match(dateString)
+    if not m: return
+    w3dtfdate = '%(year)s-%(month)s-%(day)sT%(hour)s:%(minute)s:%(second)s%(zonediff)s' % \
+                {'year': m.group(1), 'month': m.group(2), 'day': m.group(3),\
+                 'hour': m.group(4), 'minute': m.group(5), 'second': m.group(6),\
+                 'zonediff': '+09:00'}
+    if _debug: sys.stderr.write('MS SQL date parsed as: %s\n' % w3dtfdate)
+    return _parse_date_w3dtf(w3dtfdate)
+registerDateHandler(_parse_date_mssql)
+
+# Unicode strings for Greek date strings
+_greek_months = \
+  { \
+   u'\u0399\u03b1\u03bd': u'Jan',       # c9e1ed in iso-8859-7
+   u'\u03a6\u03b5\u03b2': u'Feb',       # d6e5e2 in iso-8859-7
+   u'\u039c\u03ac\u03ce': u'Mar',       # ccdcfe in iso-8859-7
+   u'\u039c\u03b1\u03ce': u'Mar',       # cce1fe in iso-8859-7
+   u'\u0391\u03c0\u03c1': u'Apr',       # c1f0f1 in iso-8859-7
+   u'\u039c\u03ac\u03b9': u'May',       # ccdce9 in iso-8859-7
+   u'\u039c\u03b1\u03ca': u'May',       # cce1fa in iso-8859-7
+   u'\u039c\u03b1\u03b9': u'May',       # cce1e9 in iso-8859-7
+   u'\u0399\u03bf\u03cd\u03bd': u'Jun', # c9effded in iso-8859-7
+   u'\u0399\u03bf\u03bd': u'Jun',       # c9efed in iso-8859-7
+   u'\u0399\u03bf\u03cd\u03bb': u'Jul', # c9effdeb in iso-8859-7
+   u'\u0399\u03bf\u03bb': u'Jul',       # c9f9eb in iso-8859-7
+   u'\u0391\u03cd\u03b3': u'Aug',       # c1fde3 in iso-8859-7
+   u'\u0391\u03c5\u03b3': u'Aug',       # c1f5e3 in iso-8859-7
+   u'\u03a3\u03b5\u03c0': u'Sep',       # d3e5f0 in iso-8859-7
+   u'\u039f\u03ba\u03c4': u'Oct',       # cfeaf4 in iso-8859-7
+   u'\u039d\u03bf\u03ad': u'Nov',       # cdefdd in iso-8859-7
+   u'\u039d\u03bf\u03b5': u'Nov',       # cdefe5 in iso-8859-7
+   u'\u0394\u03b5\u03ba': u'Dec',       # c4e5ea in iso-8859-7
+  }
+
+_greek_wdays = \
+  { \
+   u'\u039a\u03c5\u03c1': u'Sun', # caf5f1 in iso-8859-7
+   u'\u0394\u03b5\u03c5': u'Mon', # c4e5f5 in iso-8859-7
+   u'\u03a4\u03c1\u03b9': u'Tue', # d4f1e9 in iso-8859-7
+   u'\u03a4\u03b5\u03c4': u'Wed', # d4e5f4 in iso-8859-7
+   u'\u03a0\u03b5\u03bc': u'Thu', # d0e5ec in iso-8859-7
+   u'\u03a0\u03b1\u03c1': u'Fri', # d0e1f1 in iso-8859-7
+   u'\u03a3\u03b1\u03b2': u'Sat', # d3e1e2 in iso-8859-7
+  }
+
+_greek_date_format_re = \
+    re.compile(u'([^,]+),\s+(\d{2})\s+([^\s]+)\s+(\d{4})\s+(\d{2}):(\d{2}):(\d{2})\s+([^\s]+)')
+
+def _parse_date_greek(dateString):
+    '''Parse a string according to a Greek 8-bit date format.'''
+    m = _greek_date_format_re.match(dateString)
+    if not m: return
+    try:
+        wday = _greek_wdays[m.group(1)]
+        month = _greek_months[m.group(3)]
+    except:
+        return
+    rfc822date = '%(wday)s, %(day)s %(month)s %(year)s %(hour)s:%(minute)s:%(second)s %(zonediff)s' % \
+                 {'wday': wday, 'day': m.group(2), 'month': month, 'year': m.group(4),\
+                  'hour': m.group(5), 'minute': m.group(6), 'second': m.group(7),\
+                  'zonediff': m.group(8)}
+    if _debug: sys.stderr.write('Greek date parsed as: %s\n' % rfc822date)
+    return _parse_date_rfc822(rfc822date)
+registerDateHandler(_parse_date_greek)
+
+# Unicode strings for Hungarian date strings
+_hungarian_months = \
+  { \
+    u'janu\u00e1r':   u'01',  # e1 in iso-8859-2
+    u'febru\u00e1ri': u'02',  # e1 in iso-8859-2
+    u'm\u00e1rcius':  u'03',  # e1 in iso-8859-2
+    u'\u00e1prilis':  u'04',  # e1 in iso-8859-2
+    u'm\u00e1ujus':   u'05',  # e1 in iso-8859-2
+    u'j\u00fanius':   u'06',  # fa in iso-8859-2
+    u'j\u00falius':   u'07',  # fa in iso-8859-2
+    u'augusztus':     u'08',
+    u'szeptember':    u'09',
+    u'okt\u00f3ber':  u'10',  # f3 in iso-8859-2
+    u'november':      u'11',
+    u'december':      u'12',
+  }
+
+_hungarian_date_format_re = \
+  re.compile(u'(\d{4})-([^-]+)-(\d{,2})T(\d{,2}):(\d{2})((\+|-)(\d{,2}:\d{2}))')
+
+def _parse_date_hungarian(dateString):
+    '''Parse a string according to a Hungarian 8-bit date format.'''
+    m = _hungarian_date_format_re.match(dateString)
+    if not m: return
+    try:
+        month = _hungarian_months[m.group(2)]
+        day = m.group(3)
+        if len(day) == 1:
+            day = '0' + day
+        hour = m.group(4)
+        if len(hour) == 1:
+            hour = '0' + hour
+    except:
+        return
+    w3dtfdate = '%(year)s-%(month)s-%(day)sT%(hour)s:%(minute)s%(zonediff)s' % \
+                {'year': m.group(1), 'month': month, 'day': day,\
+                 'hour': hour, 'minute': m.group(5),\
+                 'zonediff': m.group(6)}
+    if _debug: sys.stderr.write('Hungarian date parsed as: %s\n' % w3dtfdate)
+    return _parse_date_w3dtf(w3dtfdate)
+registerDateHandler(_parse_date_hungarian)
+
+# W3DTF-style date parsing adapted from PyXML xml.utils.iso8601, written by
+# Drake and licensed under the Python license.  Removed all range checking
+# for month, day, hour, minute, and second, since mktime will normalize
+# these later
+def _parse_date_w3dtf(dateString):
+    def __extract_date(m):
+        year = int(m.group('year'))
+        if year < 100:
+            year = 100 * int(time.gmtime()[0] / 100) + int(year)
+        if year < 1000:
+            return 0, 0, 0
+        julian = m.group('julian')
+        if julian:
+            julian = int(julian)
+            month = julian / 30 + 1
+            day = julian % 30 + 1
+            jday = None
+            while jday != julian:
+                t = time.mktime((year, month, day, 0, 0, 0, 0, 0, 0))
+                jday = time.gmtime(t)[-2]
+                diff = abs(jday - julian)
+                if jday > julian:
+                    if diff < day:
+                        day = day - diff
+                    else:
+                        month = month - 1
+                        day = 31
+                elif jday < julian:
+                    if day + diff < 28:
+                       day = day + diff
+                    else:
+                        month = month + 1
+            return year, month, day
+        month = m.group('month')
+        day = 1
+        if month is None:
+            month = 1
+        else:
+            month = int(month)
+            day = m.group('day')
+            if day:
+                day = int(day)
+            else:
+                day = 1
+        return year, month, day
+
+    def __extract_time(m):
+        if not m:
+            return 0, 0, 0
+        hours = m.group('hours')
+        if not hours:
+            return 0, 0, 0
+        hours = int(hours)
+        minutes = int(m.group('minutes'))
+        seconds = m.group('seconds')
+        if seconds:
+            seconds = int(seconds)
+        else:
+            seconds = 0
+        return hours, minutes, seconds
+
+    def __extract_tzd(m):
+        '''Return the Time Zone Designator as an offset in seconds from UTC.'''
+        if not m:
+            return 0
+        tzd = m.group('tzd')
+        if not tzd:
+            return 0
+        if tzd == 'Z':
+            return 0
+        hours = int(m.group('tzdhours'))
+        minutes = m.group('tzdminutes')
+        if minutes:
+            minutes = int(minutes)
+        else:
+            minutes = 0
+        offset = (hours*60 + minutes) * 60
+        if tzd[0] == '+':
+            return -offset
+        return offset
+
+    __date_re = ('(?P<year>\d\d\d\d)'
+                 '(?:(?P<dsep>-|)'
+                 '(?:(?P<month>\d\d)(?:(?P=dsep)(?P<day>\d\d))?'
+                 '|(?P<julian>\d\d\d)))?')
+    __tzd_re = '(?P<tzd>[-+](?P<tzdhours>\d\d)(?::?(?P<tzdminutes>\d\d))|Z)'
+    __tzd_rx = re.compile(__tzd_re)
+    __time_re = ('(?P<hours>\d\d)(?P<tsep>:|)(?P<minutes>\d\d)'
+                 '(?:(?P=tsep)(?P<seconds>\d\d)(?:[.,]\d+)?)?'
+                 + __tzd_re)
+    __datetime_re = '%s(?:T%s)?' % (__date_re, __time_re)
+    __datetime_rx = re.compile(__datetime_re)
+    m = __datetime_rx.match(dateString)
+    if (m is None) or (m.group() != dateString): return
+    gmt = __extract_date(m) + __extract_time(m) + (0, 0, 0)
+    if gmt[0] == 0: return
+    return time.gmtime(time.mktime(gmt) + __extract_tzd(m) - time.timezone)
+registerDateHandler(_parse_date_w3dtf)
+
+def _parse_date_rfc822(dateString):
+    '''Parse an RFC822, RFC1123, RFC2822, or asctime-style date'''
+    data = dateString.split()
+    if data[0][-1] in (',', '.') or data[0].lower() in rfc822._daynames:
+        del data[0]
+    if len(data) == 4:
+        s = data[3]
+        i = s.find('+')
+        if i > 0:
+            data[3:] = [s[:i], s[i+1:]]
+        else:
+            data.append('')
+        dateString = " ".join(data)
+    # Account for the Etc/GMT timezone by stripping 'Etc/'
+    elif len(data) == 5 and data[4].lower().startswith('etc/'):
+        data[4] = data[4][4:]
+        dateString = " ".join(data)
+    if len(data) < 5:
+        dateString += ' 00:00:00 GMT'
+    tm = rfc822.parsedate_tz(dateString)
+    if tm:
+        return time.gmtime(rfc822.mktime_tz(tm))
+# rfc822.py defines several time zones, but we define some extra ones.
+# 'ET' is equivalent to 'EST', etc.
+_additional_timezones = {'AT': -400, 'ET': -500, 'CT': -600, 'MT': -700, 'PT': -800}
+rfc822._timezones.update(_additional_timezones)
+registerDateHandler(_parse_date_rfc822)
+
+def _parse_date_perforce(aDateString):
+	"""parse a date in yyyy/mm/dd hh:mm:ss TTT format"""
+	# Fri, 2006/09/15 08:19:53 EDT
+	_my_date_pattern = re.compile( \
+		r'(\w{,3}), (\d{,4})/(\d{,2})/(\d{2}) (\d{,2}):(\d{2}):(\d{2}) (\w{,3})')
+
+	dow, year, month, day, hour, minute, second, tz = \
+		_my_date_pattern.search(aDateString).groups()
+	months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
+	dateString = "%s, %s %s %s %s:%s:%s %s" % (dow, day, months[int(month) - 1], year, hour, minute, second, tz)
+	tm = rfc822.parsedate_tz(dateString)
+	if tm:
+		return time.gmtime(rfc822.mktime_tz(tm))
+registerDateHandler(_parse_date_perforce)
+
+def _parse_date(dateString):
+    '''Parses a variety of date formats into a 9-tuple in GMT'''
+    for handler in _date_handlers:
+        try:
+            date9tuple = handler(dateString)
+            if not date9tuple: continue
+            if len(date9tuple) != 9:
+                if _debug: sys.stderr.write('date handler function must return 9-tuple\n')
+                raise ValueError
+            map(int, date9tuple)
+            return date9tuple
+        except Exception, e:
+            if _debug: sys.stderr.write('%s raised %s\n' % (handler.__name__, repr(e)))
+            pass
+    return None
+
+def _getCharacterEncoding(http_headers, xml_data):
+    '''Get the character encoding of the XML document
+
+    http_headers is a dictionary
+    xml_data is a raw string (not Unicode)
+
+    This is so much trickier than it sounds, it's not even funny.
+    According to RFC 3023 ('XML Media Types'), if the HTTP Content-Type
+    is application/xml, application/*+xml,
+    application/xml-external-parsed-entity, or application/xml-dtd,
+    the encoding given in the charset parameter of the HTTP Content-Type
+    takes precedence over the encoding given in the XML prefix within the
+    document, and defaults to 'utf-8' if neither are specified.  But, if
+    the HTTP Content-Type is text/xml, text/*+xml, or
+    text/xml-external-parsed-entity, the encoding given in the XML prefix
+    within the document is ALWAYS IGNORED and only the encoding given in
+    the charset parameter of the HTTP Content-Type header should be
+    respected, and it defaults to 'us-ascii' if not specified.
+
+    Furthermore, discussion on the atom-syntax mailing list with the
+    author of RFC 3023 leads me to the conclusion that any document
+    served with a Content-Type of text/* and no charset parameter
+    must be treated as us-ascii.  (We now do this.)  And also that it
+    must always be flagged as non-well-formed.  (We now do this too.)
+
+    If Content-Type is unspecified (input was local file or non-HTTP source)
+    or unrecognized (server just got it totally wrong), then go by the
+    encoding given in the XML prefix of the document and default to
+    'iso-8859-1' as per the HTTP specification (RFC 2616).
+
+    Then, assuming we didn't find a character encoding in the HTTP headers
+    (and the HTTP Content-type allowed us to look in the body), we need
+    to sniff the first few bytes of the XML data and try to determine
+    whether the encoding is ASCII-compatible.  Section F of the XML
+    specification shows the way here:
+    http://www.w3.org/TR/REC-xml/#sec-guessing-no-ext-info
+
+    If the sniffed encoding is not ASCII-compatible, we need to make it
+    ASCII compatible so that we can sniff further into the XML declaration
+    to find the encoding attribute, which will tell us the true encoding.
+
+    Of course, none of this guarantees that we will be able to parse the
+    feed in the declared character encoding (assuming it was declared
+    correctly, which many are not).  CJKCodecs and iconv_codec help a lot;
+    you should definitely install them if you can.
+    http://cjkpython.i18n.org/
+    '''
+
+    def _parseHTTPContentType(content_type):
+        '''takes HTTP Content-Type header and returns (content type, charset)
+
+        If no charset is specified, returns (content type, '')
+        If no content type is specified, returns ('', '')
+        Both return parameters are guaranteed to be lowercase strings
+        '''
+        content_type = content_type or ''
+        content_type, params = cgi.parse_header(content_type)
+        return content_type, params.get('charset', '').replace("'", '')
+
+    sniffed_xml_encoding = ''
+    xml_encoding = ''
+    true_encoding = ''
+    http_content_type, http_encoding = _parseHTTPContentType(http_headers.get('content-type', http_headers.get('Content-type')))
+    # Must sniff for non-ASCII-compatible character encodings before
+    # searching for XML declaration.  This heuristic is defined in
+    # section F of the XML specification:
+    # http://www.w3.org/TR/REC-xml/#sec-guessing-no-ext-info
+    try:
+        if xml_data[:4] == _l2bytes([0x4c, 0x6f, 0xa7, 0x94]):
+            # EBCDIC
+            xml_data = _ebcdic_to_ascii(xml_data)
+        elif xml_data[:4] == _l2bytes([0x00, 0x3c, 0x00, 0x3f]):
+            # UTF-16BE
+            sniffed_xml_encoding = 'utf-16be'
+            xml_data = unicode(xml_data, 'utf-16be').encode('utf-8')
+        elif (len(xml_data) >= 4) and (xml_data[:2] == _l2bytes([0xfe, 0xff])) and (xml_data[2:4] != _l2bytes([0x00, 0x00])):
+            # UTF-16BE with BOM
+            sniffed_xml_encoding = 'utf-16be'
+            xml_data = unicode(xml_data[2:], 'utf-16be').encode('utf-8')
+        elif xml_data[:4] == _l2bytes([0x3c, 0x00, 0x3f, 0x00]):
+            # UTF-16LE
+            sniffed_xml_encoding = 'utf-16le'
+            xml_data = unicode(xml_data, 'utf-16le').encode('utf-8')
+        elif (len(xml_data) >= 4) and (xml_data[:2] == _l2bytes([0xff, 0xfe])) and (xml_data[2:4] != _l2bytes([0x00, 0x00])):
+            # UTF-16LE with BOM
+            sniffed_xml_encoding = 'utf-16le'
+            xml_data = unicode(xml_data[2:], 'utf-16le').encode('utf-8')
+        elif xml_data[:4] == _l2bytes([0x00, 0x00, 0x00, 0x3c]):
+            # UTF-32BE
+            sniffed_xml_encoding = 'utf-32be'
+            xml_data = unicode(xml_data, 'utf-32be').encode('utf-8')
+        elif xml_data[:4] == _l2bytes([0x3c, 0x00, 0x00, 0x00]):
+            # UTF-32LE
+            sniffed_xml_encoding = 'utf-32le'
+            xml_data = unicode(xml_data, 'utf-32le').encode('utf-8')
+        elif xml_data[:4] == _l2bytes([0x00, 0x00, 0xfe, 0xff]):
+            # UTF-32BE with BOM
+            sniffed_xml_encoding = 'utf-32be'
+            xml_data = unicode(xml_data[4:], 'utf-32be').encode('utf-8')
+        elif xml_data[:4] == _l2bytes([0xff, 0xfe, 0x00, 0x00]):
+            # UTF-32LE with BOM
+            sniffed_xml_encoding = 'utf-32le'
+            xml_data = unicode(xml_data[4:], 'utf-32le').encode('utf-8')
+        elif xml_data[:3] == _l2bytes([0xef, 0xbb, 0xbf]):
+            # UTF-8 with BOM
+            sniffed_xml_encoding = 'utf-8'
+            xml_data = unicode(xml_data[3:], 'utf-8').encode('utf-8')
+        else:
+            # ASCII-compatible
+            pass
+        xml_encoding_match = re.compile(_s2bytes('^<\?.*encoding=[\'"](.*?)[\'"].*\?>')).match(xml_data)
+    except:
+        xml_encoding_match = None
+    if xml_encoding_match:
+        xml_encoding = xml_encoding_match.groups()[0].decode('utf-8').lower()
+        if sniffed_xml_encoding and (xml_encoding in ('iso-10646-ucs-2', 'ucs-2', 'csunicode', 'iso-10646-ucs-4', 'ucs-4', 'csucs4', 'utf-16', 'utf-32', 'utf_16', 'utf_32', 'utf16', 'u16')):
+            xml_encoding = sniffed_xml_encoding
+    acceptable_content_type = 0
+    application_content_types = ('application/xml', 'application/xml-dtd', 'application/xml-external-parsed-entity')
+    text_content_types = ('text/xml', 'text/xml-external-parsed-entity')
+    if (http_content_type in application_content_types) or \
+       (http_content_type.startswith('application/') and http_content_type.endswith('+xml')):
+        acceptable_content_type = 1
+        true_encoding = http_encoding or xml_encoding or 'utf-8'
+    elif (http_content_type in text_content_types) or \
+         (http_content_type.startswith('text/')) and http_content_type.endswith('+xml'):
+        acceptable_content_type = 1
+        true_encoding = http_encoding or 'us-ascii'
+    elif http_content_type.startswith('text/'):
+        true_encoding = http_encoding or 'us-ascii'
+    elif http_headers and (not (http_headers.has_key('content-type') or http_headers.has_key('Content-type'))):
+        true_encoding = xml_encoding or 'iso-8859-1'
+    else:
+        true_encoding = xml_encoding or 'utf-8'
+    # some feeds claim to be gb2312 but are actually gb18030.
+    # apparently MSIE and Firefox both do the following switch:
+    if true_encoding.lower() == 'gb2312':
+        true_encoding = 'gb18030'
+    return true_encoding, http_encoding, xml_encoding, sniffed_xml_encoding, acceptable_content_type
+
+def _toUTF8(data, encoding):
+    '''Changes an XML data stream on the fly to specify a new encoding
+
+    data is a raw sequence of bytes (not Unicode) that is presumed to be in %encoding already
+    encoding is a string recognized by encodings.aliases
+    '''
+    if _debug: sys.stderr.write('entering _toUTF8, trying encoding %s\n' % encoding)
+    # strip Byte Order Mark (if present)
+    if (len(data) >= 4) and (data[:2] == _l2bytes([0xfe, 0xff])) and (data[2:4] != _l2bytes([0x00, 0x00])):
+        if _debug:
+            sys.stderr.write('stripping BOM\n')
+            if encoding != 'utf-16be':
+                sys.stderr.write('trying utf-16be instead\n')
+        encoding = 'utf-16be'
+        data = data[2:]
+    elif (len(data) >= 4) and (data[:2] == _l2bytes([0xff, 0xfe])) and (data[2:4] != _l2bytes([0x00, 0x00])):
+        if _debug:
+            sys.stderr.write('stripping BOM\n')
+            if encoding != 'utf-16le':
+                sys.stderr.write('trying utf-16le instead\n')
+        encoding = 'utf-16le'
+        data = data[2:]
+    elif data[:3] == _l2bytes([0xef, 0xbb, 0xbf]):
+        if _debug:
+            sys.stderr.write('stripping BOM\n')
+            if encoding != 'utf-8':
+                sys.stderr.write('trying utf-8 instead\n')
+        encoding = 'utf-8'
+        data = data[3:]
+    elif data[:4] == _l2bytes([0x00, 0x00, 0xfe, 0xff]):
+        if _debug:
+            sys.stderr.write('stripping BOM\n')
+            if encoding != 'utf-32be':
+                sys.stderr.write('trying utf-32be instead\n')
+        encoding = 'utf-32be'
+        data = data[4:]
+    elif data[:4] == _l2bytes([0xff, 0xfe, 0x00, 0x00]):
+        if _debug:
+            sys.stderr.write('stripping BOM\n')
+            if encoding != 'utf-32le':
+                sys.stderr.write('trying utf-32le instead\n')
+        encoding = 'utf-32le'
+        data = data[4:]
+    newdata = unicode(data, encoding)
+    if _debug: sys.stderr.write('successfully converted %s data to unicode\n' % encoding)
+    declmatch = re.compile('^<\?xml[^>]*?>')
+    newdecl = '''<?xml version='1.0' encoding='utf-8'?>'''
+    if declmatch.search(newdata):
+        newdata = declmatch.sub(newdecl, newdata)
+    else:
+        newdata = newdecl + u'\n' + newdata
+    return newdata.encode('utf-8')
+
+def _stripDoctype(data):
+    '''Strips DOCTYPE from XML document, returns (rss_version, stripped_data)
+
+    rss_version may be 'rss091n' or None
+    stripped_data is the same XML document, minus the DOCTYPE
+    '''
+    start = re.search(_s2bytes('<\w'), data)
+    start = start and start.start() or -1
+    head,data = data[:start+1], data[start+1:]
+
+    entity_pattern = re.compile(_s2bytes(r'^\s*<!ENTITY([^>]*?)>'), re.MULTILINE)
+    entity_results=entity_pattern.findall(head)
+    head = entity_pattern.sub(_s2bytes(''), head)
+    doctype_pattern = re.compile(_s2bytes(r'^\s*<!DOCTYPE([^>]*?)>'), re.MULTILINE)
+    doctype_results = doctype_pattern.findall(head)
+    doctype = doctype_results and doctype_results[0] or _s2bytes('')
+    if doctype.lower().count(_s2bytes('netscape')):
+        version = 'rss091n'
+    else:
+        version = None
+
+    # only allow in 'safe' inline entity definitions
+    replacement=_s2bytes('')
+    if len(doctype_results)==1 and entity_results:
+       safe_pattern=re.compile(_s2bytes('\s+(\w+)\s+"(&#\w+;|[^&"]*)"'))
+       safe_entities=filter(lambda e: safe_pattern.match(e),entity_results)
+       if safe_entities:
+           replacement=_s2bytes('<!DOCTYPE feed [\n  <!ENTITY') + _s2bytes('>\n  <!ENTITY ').join(safe_entities) + _s2bytes('>\n]>')
+    data = doctype_pattern.sub(replacement, head) + data
+
+    return version, data, dict(replacement and [(k.decode('utf-8'), v.decode('utf-8')) for k, v in safe_pattern.findall(replacement)])
+
+def parse(url_file_stream_or_string, etag=None, modified=None, agent=None, referrer=None, handlers=[], request_headers={}, response_headers={}):
+    '''Parse a feed from a URL, file, stream, or string.
+
+    request_headers, if given, is a dict from http header name to value to add
+    to the request; this overrides internally generated values.
+    '''
+    result = FeedParserDict()
+    result['feed'] = FeedParserDict()
+    result['entries'] = []
+    if _XML_AVAILABLE:
+        result['bozo'] = 0
+    if not isinstance(handlers, list):
+        handlers = [handlers]
+    try:
+        f = _open_resource(url_file_stream_or_string, etag, modified, agent, referrer, handlers, request_headers)
+        data = f.read()
+    except Exception, e:
+        result['bozo'] = 1
+        result['bozo_exception'] = e
+        data = None
+        f = None
+
+    if hasattr(f, 'headers'):
+        result['headers'] = dict(f.headers)
+    # overwrite existing headers using response_headers
+    if 'headers' in result:
+        result['headers'].update(response_headers)
+    elif response_headers:
+        result['headers'] = copy.deepcopy(response_headers)
+
+    # if feed is gzip-compressed, decompress it
+    if f and data and 'headers' in result:
+        if gzip and result['headers'].get('content-encoding') == 'gzip':
+            try:
+                data = gzip.GzipFile(fileobj=_StringIO(data)).read()
+            except Exception, e:
+                # Some feeds claim to be gzipped but they're not, so
+                # we get garbage.  Ideally, we should re-request the
+                # feed without the 'Accept-encoding: gzip' header,
+                # but we don't.
+                result['bozo'] = 1
+                result['bozo_exception'] = e
+                data = ''
+        elif zlib and result['headers'].get('content-encoding') == 'deflate':
+            try:
+                data = zlib.decompress(data, -zlib.MAX_WBITS)
+            except Exception, e:
+                result['bozo'] = 1
+                result['bozo_exception'] = e
+                data = ''
+
+    # save HTTP headers
+    if 'headers' in result:
+        if 'etag' in result['headers'] or 'ETag' in result['headers']:
+            etag = result['headers'].get('etag', result['headers'].get('ETag'))
+            if etag:
+                result['etag'] = etag
+        if 'last-modified' in result['headers'] or 'Last-Modified' in result['headers']:
+            modified = result['headers'].get('last-modified', result['headers'].get('Last-Modified'))
+            if modified:
+                result['modified'] = _parse_date(modified)
+    if hasattr(f, 'url'):
+        result['href'] = f.url
+        result['status'] = 200
+    if hasattr(f, 'status'):
+        result['status'] = f.status
+    if hasattr(f, 'close'):
+        f.close()
+
+    # there are four encodings to keep track of:
+    # - http_encoding is the encoding declared in the Content-Type HTTP header
+    # - xml_encoding is the encoding declared in the <?xml declaration
+    # - sniffed_encoding is the encoding sniffed from the first 4 bytes of the XML data
+    # - result['encoding'] is the actual encoding, as per RFC 3023 and a variety of other conflicting specifications
+    http_headers = result.get('headers', {})
+    result['encoding'], http_encoding, xml_encoding, sniffed_xml_encoding, acceptable_content_type = \
+        _getCharacterEncoding(http_headers, data)
+    if http_headers and (not acceptable_content_type):
+        if http_headers.has_key('content-type') or http_headers.has_key('Content-type'):
+            bozo_message = '%s is not an XML media type' % http_headers.get('content-type', http_headers.get('Content-type'))
+        else:
+            bozo_message = 'no Content-type specified'
+        result['bozo'] = 1
+        result['bozo_exception'] = NonXMLContentType(bozo_message)
+
+    if data is not None:
+        result['version'], data, entities = _stripDoctype(data)
+
+    # ensure that baseuri is an absolute uri using an acceptable URI scheme
+    contentloc = http_headers.get('content-location', http_headers.get('Content-Location', ''))
+    href = result.get('href', '')
+    baseuri = _makeSafeAbsoluteURI(href, contentloc) or _makeSafeAbsoluteURI(contentloc) or href
+
+    baselang = http_headers.get('content-language', http_headers.get('Content-Language', None))
+
+    # if server sent 304, we're done
+    if result.get('status', 0) == 304:
+        result['version'] = ''
+        result['debug_message'] = 'The feed has not changed since you last checked, ' + \
+            'so the server sent no data.  This is a feature, not a bug!'
+        return result
+
+    # if there was a problem downloading, we're done
+    if data is None:
+        return result
+
+    # determine character encoding
+    use_strict_parser = 0
+    known_encoding = 0
+    tried_encodings = []
+    # try: HTTP encoding, declared XML encoding, encoding sniffed from BOM
+    for proposed_encoding in (result['encoding'], xml_encoding, sniffed_xml_encoding):
+        if not proposed_encoding: continue
+        if proposed_encoding in tried_encodings: continue
+        tried_encodings.append(proposed_encoding)
+        try:
+            data = _toUTF8(data, proposed_encoding)
+            known_encoding = use_strict_parser = 1
+            break
+        except:
+            pass
+    # if no luck and we have auto-detection library, try that
+    if (not known_encoding) and chardet:
+        try:
+            proposed_encoding = chardet.detect(data)['encoding']
+            if proposed_encoding and (proposed_encoding not in tried_encodings):
+                tried_encodings.append(proposed_encoding)
+                data = _toUTF8(data, proposed_encoding)
+                known_encoding = use_strict_parser = 1
+        except:
+            pass
+    # if still no luck and we haven't tried utf-8 yet, try that
+    if (not known_encoding) and ('utf-8' not in tried_encodings):
+        try:
+            proposed_encoding = 'utf-8'
+            tried_encodings.append(proposed_encoding)
+            data = _toUTF8(data, proposed_encoding)
+            known_encoding = use_strict_parser = 1
+        except:
+            pass
+    # if still no luck and we haven't tried windows-1252 yet, try that
+    if (not known_encoding) and ('windows-1252' not in tried_encodings):
+        try:
+            proposed_encoding = 'windows-1252'
+            tried_encodings.append(proposed_encoding)
+            data = _toUTF8(data, proposed_encoding)
+            known_encoding = use_strict_parser = 1
+        except:
+            pass
+    # if still no luck and we haven't tried iso-8859-2 yet, try that.
+    if (not known_encoding) and ('iso-8859-2' not in tried_encodings):
+        try:
+            proposed_encoding = 'iso-8859-2'
+            tried_encodings.append(proposed_encoding)
+            data = _toUTF8(data, proposed_encoding)
+            known_encoding = use_strict_parser = 1
+        except:
+            pass
+    # if still no luck, give up
+    if not known_encoding:
+        result['bozo'] = 1
+        result['bozo_exception'] = CharacterEncodingUnknown( \
+            'document encoding unknown, I tried ' + \
+            '%s, %s, utf-8, windows-1252, and iso-8859-2 but nothing worked' % \
+            (result['encoding'], xml_encoding))
+        result['encoding'] = ''
+    elif proposed_encoding != result['encoding']:
+        result['bozo'] = 1
+        result['bozo_exception'] = CharacterEncodingOverride( \
+            'document declared as %s, but parsed as %s' % \
+            (result['encoding'], proposed_encoding))
+        result['encoding'] = proposed_encoding
+
+    if not _XML_AVAILABLE:
+        use_strict_parser = 0
+    if use_strict_parser:
+        # initialize the SAX parser
+        feedparser = _StrictFeedParser(baseuri, baselang, 'utf-8')
+        saxparser = xml.sax.make_parser(PREFERRED_XML_PARSERS)
+        saxparser.setFeature(xml.sax.handler.feature_namespaces, 1)
+        saxparser.setContentHandler(feedparser)
+        saxparser.setErrorHandler(feedparser)
+        source = xml.sax.xmlreader.InputSource()
+        source.setByteStream(_StringIO(data))
+        if hasattr(saxparser, '_ns_stack'):
+            # work around bug in built-in SAX parser (doesn't recognize xml: namespace)
+            # PyXML doesn't have this problem, and it doesn't have _ns_stack either
+            saxparser._ns_stack.append({'http://www.w3.org/XML/1998/namespace':'xml'})
+        try:
+            saxparser.parse(source)
+        except Exception, e:
+            if _debug:
+                import traceback
+                traceback.print_stack()
+                traceback.print_exc()
+                sys.stderr.write('xml parsing failed\n')
+            result['bozo'] = 1
+            result['bozo_exception'] = feedparser.exc or e
+            use_strict_parser = 0
+    if not use_strict_parser:
+        feedparser = _LooseFeedParser(baseuri, baselang, 'utf-8', entities)
+        feedparser.feed(data.decode('utf-8', 'replace'))
+    result['feed'] = feedparser.feeddata
+    result['entries'] = feedparser.entries
+    result['version'] = result['version'] or feedparser.version
+    result['namespaces'] = feedparser.namespacesInUse
+    return result
+
+class Serializer:
+    def __init__(self, results):
+        self.results = results
+
+class TextSerializer(Serializer):
+    def write(self, stream=sys.stdout):
+        self._writer(stream, self.results, '')
+
+    def _writer(self, stream, node, prefix):
+        if not node: return
+        if hasattr(node, 'keys'):
+            keys = node.keys()
+            keys.sort()
+            for k in keys:
+                if k in ('description', 'link'): continue
+                if node.has_key(k + '_detail'): continue
+                if node.has_key(k + '_parsed'): continue
+                self._writer(stream, node[k], prefix + k + '.')
+        elif type(node) == types.ListType:
+            index = 0
+            for n in node:
+                self._writer(stream, n, prefix[:-1] + '[' + str(index) + '].')
+                index += 1
+        else:
+            try:
+                s = str(node).encode('utf-8')
+                s = s.replace('\\', '\\\\')
+                s = s.replace('\r', '')
+                s = s.replace('\n', r'\n')
+                stream.write(prefix[:-1])
+                stream.write('=')
+                stream.write(s)
+                stream.write('\n')
+            except:
+                pass
+
+class PprintSerializer(Serializer):
+    def write(self, stream=sys.stdout):
+        if self.results.has_key('href'):
+            stream.write(self.results['href'] + '\n\n')
+        from pprint import pprint
+        pprint(self.results, stream)
+        stream.write('\n')
+
+if __name__ == '__main__':
+    try:
+        from optparse import OptionParser
+    except:
+        OptionParser = None
+
+    if OptionParser:
+        optionParser = OptionParser(version=__version__, usage="%prog [options] url_or_filename_or_-")
+        optionParser.set_defaults(format="pprint")
+        optionParser.add_option("-A", "--user-agent", dest="agent", metavar="AGENT", help="User-Agent for HTTP URLs")
+        optionParser.add_option("-e", "--referer", "--referrer", dest="referrer", metavar="URL", help="Referrer for HTTP URLs")
+        optionParser.add_option("-t", "--etag", dest="etag", metavar="TAG", help="ETag/If-None-Match for HTTP URLs")
+        optionParser.add_option("-m", "--last-modified", dest="modified", metavar="DATE", help="Last-modified/If-Modified-Since for HTTP URLs (any supported date format)")
+        optionParser.add_option("-f", "--format", dest="format", metavar="FORMAT", help="output results in FORMAT (text, pprint)")
+        optionParser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False, help="write debugging information to stderr")
+        (options, urls) = optionParser.parse_args()
+        if options.verbose:
+            _debug = 1
+        if not urls:
+            optionParser.print_help()
+            sys.exit(0)
+    else:
+        if not sys.argv[1:]:
+            print __doc__
+            sys.exit(0)
+        class _Options:
+            etag = modified = agent = referrer = None
+            format = 'pprint'
+        options = _Options()
+        urls = sys.argv[1:]
+
+    zopeCompatibilityHack()
+
+    serializer = globals().get(options.format.capitalize() + 'Serializer', Serializer)
+    for url in urls:
+        results = parse(url, etag=options.etag, modified=options.modified, agent=options.agent, referrer=options.referrer)
+        serializer(results).write(sys.stdout)
diff --git a/lib/future/__init__.py b/lib/future/__init__.py
deleted file mode 100644
index b097fd81..00000000
--- a/lib/future/__init__.py
+++ /dev/null
@@ -1,92 +0,0 @@
-"""
-future: Easy, safe support for Python 2/3 compatibility
-=======================================================
-
-``future`` is the missing compatibility layer between Python 2 and Python
-3. It allows you to use a single, clean Python 3.x-compatible codebase to
-support both Python 2 and Python 3 with minimal overhead.
-
-It is designed to be used as follows::
-
-    from __future__ import (absolute_import, division,
-                            print_function, unicode_literals)
-    from builtins import (
-             bytes, dict, int, list, object, range, str,
-             ascii, chr, hex, input, next, oct, open,
-             pow, round, super,
-             filter, map, zip)
-
-followed by predominantly standard, idiomatic Python 3 code that then runs
-similarly on Python 2.6/2.7 and Python 3.3+.
-
-The imports have no effect on Python 3. On Python 2, they shadow the
-corresponding builtins, which normally have different semantics on Python 3
-versus 2, to provide their Python 3 semantics.
-
-
-Standard library reorganization
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-``future`` supports the standard library reorganization (PEP 3108) through the
-following Py3 interfaces:
-
-    >>> # Top-level packages with Py3 names provided on Py2:
-    >>> import html.parser
-    >>> import queue
-    >>> import tkinter.dialog
-    >>> import xmlrpc.client
-    >>> # etc.
-
-    >>> # Aliases provided for extensions to existing Py2 module names:
-    >>> from future.standard_library import install_aliases
-    >>> install_aliases()
-
-    >>> from collections import Counter, OrderedDict   # backported to Py2.6
-    >>> from collections import UserDict, UserList, UserString
-    >>> import urllib.request
-    >>> from itertools import filterfalse, zip_longest
-    >>> from subprocess import getoutput, getstatusoutput
-
-
-Automatic conversion
---------------------
-
-An included script called `futurize
-<https://python-future.org/automatic_conversion.html>`_ aids in converting
-code (from either Python 2 or Python 3) to code compatible with both
-platforms. It is similar to ``python-modernize`` but goes further in
-providing Python 3 compatibility through the use of the backported types
-and builtin functions in ``future``.
-
-
-Documentation
--------------
-
-See: https://python-future.org
-
-
-Credits
--------
-
-:Author:  Ed Schofield, Jordan M. Adler, et al
-:Sponsor: Python Charmers: https://pythoncharmers.com
-:Others:  See docs/credits.rst or https://python-future.org/credits.html
-
-
-Licensing
----------
-Copyright 2013-2024 Python Charmers, Australia.
-The software is distributed under an MIT licence. See LICENSE.txt.
-
-"""
-
-__title__ = 'future'
-__author__ = 'Ed Schofield'
-__license__ = 'MIT'
-__copyright__ = 'Copyright 2013-2024 Python Charmers (https://pythoncharmers.com)'
-__ver_major__ = 1
-__ver_minor__ = 0
-__ver_patch__ = 0
-__ver_sub__ = ''
-__version__ = "%d.%d.%d%s" % (__ver_major__, __ver_minor__,
-                              __ver_patch__, __ver_sub__)
diff --git a/lib/future/backports/__init__.py b/lib/future/backports/__init__.py
deleted file mode 100644
index c71e0653..00000000
--- a/lib/future/backports/__init__.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""
-future.backports package
-"""
-
-from __future__ import absolute_import
-
-import sys
-
-__future_module__ = True
-from future.standard_library import import_top_level_modules
-
-
-if sys.version_info[0] >= 3:
-    import_top_level_modules()
-
-
-from .misc import (ceil,
-                   OrderedDict,
-                   Counter,
-                   ChainMap,
-                   check_output,
-                   count,
-                   recursive_repr,
-                   _count_elements,
-                   cmp_to_key
-                  )
diff --git a/lib/future/backports/_markupbase.py b/lib/future/backports/_markupbase.py
deleted file mode 100644
index d51bfc7e..00000000
--- a/lib/future/backports/_markupbase.py
+++ /dev/null
@@ -1,422 +0,0 @@
-"""Shared support for scanning document type declarations in HTML and XHTML.
-
-Backported for python-future from Python 3.3. Reason: ParserBase is an
-old-style class in the Python 2.7 source of markupbase.py, which I suspect
-might be the cause of sporadic unit-test failures on travis-ci.org with
-test_htmlparser.py.  The test failures look like this:
-
-    ======================================================================
-
-ERROR: test_attr_entity_replacement (future.tests.test_htmlparser.AttributesStrictTestCase)
-
-----------------------------------------------------------------------
-
-Traceback (most recent call last):
-  File "/home/travis/build/edschofield/python-future/future/tests/test_htmlparser.py", line 661, in test_attr_entity_replacement
-    [("starttag", "a", [("b", "&><\"'")])])
-  File "/home/travis/build/edschofield/python-future/future/tests/test_htmlparser.py", line 93, in _run_check
-    collector = self.get_collector()
-  File "/home/travis/build/edschofield/python-future/future/tests/test_htmlparser.py", line 617, in get_collector
-    return EventCollector(strict=True)
-  File "/home/travis/build/edschofield/python-future/future/tests/test_htmlparser.py", line 27, in __init__
-    html.parser.HTMLParser.__init__(self, *args, **kw)
-  File "/home/travis/build/edschofield/python-future/future/backports/html/parser.py", line 135, in __init__
-    self.reset()
-  File "/home/travis/build/edschofield/python-future/future/backports/html/parser.py", line 143, in reset
-    _markupbase.ParserBase.reset(self)
-
-TypeError: unbound method reset() must be called with ParserBase instance as first argument (got EventCollector instance instead)
-
-This module is used as a foundation for the html.parser module.  It has no
-documented public API and should not be used directly.
-
-"""
-
-import re
-
-_declname_match = re.compile(r'[a-zA-Z][-_.a-zA-Z0-9]*\s*').match
-_declstringlit_match = re.compile(r'(\'[^\']*\'|"[^"]*")\s*').match
-_commentclose = re.compile(r'--\s*>')
-_markedsectionclose = re.compile(r']\s*]\s*>')
-
-# An analysis of the MS-Word extensions is available at
-# http://www.planetpublish.com/xmlarena/xap/Thursday/WordtoXML.pdf
-
-_msmarkedsectionclose = re.compile(r']\s*>')
-
-del re
-
-
-class ParserBase(object):
-    """Parser base class which provides some common support methods used
-    by the SGML/HTML and XHTML parsers."""
-
-    def __init__(self):
-        if self.__class__ is ParserBase:
-            raise RuntimeError(
-                "_markupbase.ParserBase must be subclassed")
-
-    def error(self, message):
-        raise NotImplementedError(
-            "subclasses of ParserBase must override error()")
-
-    def reset(self):
-        self.lineno = 1
-        self.offset = 0
-
-    def getpos(self):
-        """Return current line number and offset."""
-        return self.lineno, self.offset
-
-    # Internal -- update line number and offset.  This should be
-    # called for each piece of data exactly once, in order -- in other
-    # words the concatenation of all the input strings to this
-    # function should be exactly the entire input.
-    def updatepos(self, i, j):
-        if i >= j:
-            return j
-        rawdata = self.rawdata
-        nlines = rawdata.count("\n", i, j)
-        if nlines:
-            self.lineno = self.lineno + nlines
-            pos = rawdata.rindex("\n", i, j) # Should not fail
-            self.offset = j-(pos+1)
-        else:
-            self.offset = self.offset + j-i
-        return j
-
-    _decl_otherchars = ''
-
-    # Internal -- parse declaration (for use by subclasses).
-    def parse_declaration(self, i):
-        # This is some sort of declaration; in "HTML as
-        # deployed," this should only be the document type
-        # declaration ("<!DOCTYPE html...>").
-        # ISO 8879:1986, however, has more complex
-        # declaration syntax for elements in <!...>, including:
-        # --comment--
-        # [marked section]
-        # name in the following list: ENTITY, DOCTYPE, ELEMENT,
-        # ATTLIST, NOTATION, SHORTREF, USEMAP,
-        # LINKTYPE, LINK, IDLINK, USELINK, SYSTEM
-        rawdata = self.rawdata
-        j = i + 2
-        assert rawdata[i:j] == "<!", "unexpected call to parse_declaration"
-        if rawdata[j:j+1] == ">":
-            # the empty comment <!>
-            return j + 1
-        if rawdata[j:j+1] in ("-", ""):
-            # Start of comment followed by buffer boundary,
-            # or just a buffer boundary.
-            return -1
-        # A simple, practical version could look like: ((name|stringlit) S*) + '>'
-        n = len(rawdata)
-        if rawdata[j:j+2] == '--': #comment
-            # Locate --.*-- as the body of the comment
-            return self.parse_comment(i)
-        elif rawdata[j] == '[': #marked section
-            # Locate [statusWord [...arbitrary SGML...]] as the body of the marked section
-            # Where statusWord is one of TEMP, CDATA, IGNORE, INCLUDE, RCDATA
-            # Note that this is extended by Microsoft Office "Save as Web" function
-            # to include [if...] and [endif].
-            return self.parse_marked_section(i)
-        else: #all other declaration elements
-            decltype, j = self._scan_name(j, i)
-        if j < 0:
-            return j
-        if decltype == "doctype":
-            self._decl_otherchars = ''
-        while j < n:
-            c = rawdata[j]
-            if c == ">":
-                # end of declaration syntax
-                data = rawdata[i+2:j]
-                if decltype == "doctype":
-                    self.handle_decl(data)
-                else:
-                    # According to the HTML5 specs sections "8.2.4.44 Bogus
-                    # comment state" and "8.2.4.45 Markup declaration open
-                    # state", a comment token should be emitted.
-                    # Calling unknown_decl provides more flexibility though.
-                    self.unknown_decl(data)
-                return j + 1
-            if c in "\"'":
-                m = _declstringlit_match(rawdata, j)
-                if not m:
-                    return -1 # incomplete
-                j = m.end()
-            elif c in "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ":
-                name, j = self._scan_name(j, i)
-            elif c in self._decl_otherchars:
-                j = j + 1
-            elif c == "[":
-                # this could be handled in a separate doctype parser
-                if decltype == "doctype":
-                    j = self._parse_doctype_subset(j + 1, i)
-                elif decltype in set(["attlist", "linktype", "link", "element"]):
-                    # must tolerate []'d groups in a content model in an element declaration
-                    # also in data attribute specifications of attlist declaration
-                    # also link type declaration subsets in linktype declarations
-                    # also link attribute specification lists in link declarations
-                    self.error("unsupported '[' char in %s declaration" % decltype)
-                else:
-                    self.error("unexpected '[' char in declaration")
-            else:
-                self.error(
-                    "unexpected %r char in declaration" % rawdata[j])
-            if j < 0:
-                return j
-        return -1 # incomplete
-
-    # Internal -- parse a marked section
-    # Override this to handle MS-word extension syntax <![if word]>content<![endif]>
-    def parse_marked_section(self, i, report=1):
-        rawdata= self.rawdata
-        assert rawdata[i:i+3] == '<![', "unexpected call to parse_marked_section()"
-        sectName, j = self._scan_name( i+3, i )
-        if j < 0:
-            return j
-        if sectName in set(["temp", "cdata", "ignore", "include", "rcdata"]):
-            # look for standard ]]> ending
-            match= _markedsectionclose.search(rawdata, i+3)
-        elif sectName in set(["if", "else", "endif"]):
-            # look for MS Office ]> ending
-            match= _msmarkedsectionclose.search(rawdata, i+3)
-        else:
-            self.error('unknown status keyword %r in marked section' % rawdata[i+3:j])
-        if not match:
-            return -1
-        if report:
-            j = match.start(0)
-            self.unknown_decl(rawdata[i+3: j])
-        return match.end(0)
-
-    # Internal -- parse comment, return length or -1 if not terminated
-    def parse_comment(self, i, report=1):
-        rawdata = self.rawdata
-        if rawdata[i:i+4] != '<!--':
-            self.error('unexpected call to parse_comment()')
-        match = _commentclose.search(rawdata, i+4)
-        if not match:
-            return -1
-        if report:
-            j = match.start(0)
-            self.handle_comment(rawdata[i+4: j])
-        return match.end(0)
-
-    # Internal -- scan past the internal subset in a <!DOCTYPE declaration,
-    # returning the index just past any whitespace following the trailing ']'.
-    def _parse_doctype_subset(self, i, declstartpos):
-        rawdata = self.rawdata
-        n = len(rawdata)
-        j = i
-        while j < n:
-            c = rawdata[j]
-            if c == "<":
-                s = rawdata[j:j+2]
-                if s == "<":
-                    # end of buffer; incomplete
-                    return -1
-                if s != "<!":
-                    self.updatepos(declstartpos, j + 1)
-                    self.error("unexpected char in internal subset (in %r)" % s)
-                if (j + 2) == n:
-                    # end of buffer; incomplete
-                    return -1
-                if (j + 4) > n:
-                    # end of buffer; incomplete
-                    return -1
-                if rawdata[j:j+4] == "<!--":
-                    j = self.parse_comment(j, report=0)
-                    if j < 0:
-                        return j
-                    continue
-                name, j = self._scan_name(j + 2, declstartpos)
-                if j == -1:
-                    return -1
-                if name not in set(["attlist", "element", "entity", "notation"]):
-                    self.updatepos(declstartpos, j + 2)
-                    self.error(
-                        "unknown declaration %r in internal subset" % name)
-                # handle the individual names
-                meth = getattr(self, "_parse_doctype_" + name)
-                j = meth(j, declstartpos)
-                if j < 0:
-                    return j
-            elif c == "%":
-                # parameter entity reference
-                if (j + 1) == n:
-                    # end of buffer; incomplete
-                    return -1
-                s, j = self._scan_name(j + 1, declstartpos)
-                if j < 0:
-                    return j
-                if rawdata[j] == ";":
-                    j = j + 1
-            elif c == "]":
-                j = j + 1
-                while j < n and rawdata[j].isspace():
-                    j = j + 1
-                if j < n:
-                    if rawdata[j] == ">":
-                        return j
-                    self.updatepos(declstartpos, j)
-                    self.error("unexpected char after internal subset")
-                else:
-                    return -1
-            elif c.isspace():
-                j = j + 1
-            else:
-                self.updatepos(declstartpos, j)
-                self.error("unexpected char %r in internal subset" % c)
-        # end of buffer reached
-        return -1
-
-    # Internal -- scan past <!ELEMENT declarations
-    def _parse_doctype_element(self, i, declstartpos):
-        name, j = self._scan_name(i, declstartpos)
-        if j == -1:
-            return -1
-        # style content model; just skip until '>'
-        rawdata = self.rawdata
-        if '>' in rawdata[j:]:
-            return rawdata.find(">", j) + 1
-        return -1
-
-    # Internal -- scan past <!ATTLIST declarations
-    def _parse_doctype_attlist(self, i, declstartpos):
-        rawdata = self.rawdata
-        name, j = self._scan_name(i, declstartpos)
-        c = rawdata[j:j+1]
-        if c == "":
-            return -1
-        if c == ">":
-            return j + 1
-        while 1:
-            # scan a series of attribute descriptions; simplified:
-            #   name type [value] [#constraint]
-            name, j = self._scan_name(j, declstartpos)
-            if j < 0:
-                return j
-            c = rawdata[j:j+1]
-            if c == "":
-                return -1
-            if c == "(":
-                # an enumerated type; look for ')'
-                if ")" in rawdata[j:]:
-                    j = rawdata.find(")", j) + 1
-                else:
-                    return -1
-                while rawdata[j:j+1].isspace():
-                    j = j + 1
-                if not rawdata[j:]:
-                    # end of buffer, incomplete
-                    return -1
-            else:
-                name, j = self._scan_name(j, declstartpos)
-            c = rawdata[j:j+1]
-            if not c:
-                return -1
-            if c in "'\"":
-                m = _declstringlit_match(rawdata, j)
-                if m:
-                    j = m.end()
-                else:
-                    return -1
-                c = rawdata[j:j+1]
-                if not c:
-                    return -1
-            if c == "#":
-                if rawdata[j:] == "#":
-                    # end of buffer
-                    return -1
-                name, j = self._scan_name(j + 1, declstartpos)
-                if j < 0:
-                    return j
-                c = rawdata[j:j+1]
-                if not c:
-                    return -1
-            if c == '>':
-                # all done
-                return j + 1
-
-    # Internal -- scan past <!NOTATION declarations
-    def _parse_doctype_notation(self, i, declstartpos):
-        name, j = self._scan_name(i, declstartpos)
-        if j < 0:
-            return j
-        rawdata = self.rawdata
-        while 1:
-            c = rawdata[j:j+1]
-            if not c:
-                # end of buffer; incomplete
-                return -1
-            if c == '>':
-                return j + 1
-            if c in "'\"":
-                m = _declstringlit_match(rawdata, j)
-                if not m:
-                    return -1
-                j = m.end()
-            else:
-                name, j = self._scan_name(j, declstartpos)
-                if j < 0:
-                    return j
-
-    # Internal -- scan past <!ENTITY declarations
-    def _parse_doctype_entity(self, i, declstartpos):
-        rawdata = self.rawdata
-        if rawdata[i:i+1] == "%":
-            j = i + 1
-            while 1:
-                c = rawdata[j:j+1]
-                if not c:
-                    return -1
-                if c.isspace():
-                    j = j + 1
-                else:
-                    break
-        else:
-            j = i
-        name, j = self._scan_name(j, declstartpos)
-        if j < 0:
-            return j
-        while 1:
-            c = self.rawdata[j:j+1]
-            if not c:
-                return -1
-            if c in "'\"":
-                m = _declstringlit_match(rawdata, j)
-                if m:
-                    j = m.end()
-                else:
-                    return -1    # incomplete
-            elif c == ">":
-                return j + 1
-            else:
-                name, j = self._scan_name(j, declstartpos)
-                if j < 0:
-                    return j
-
-    # Internal -- scan a name token and the new position and the token, or
-    # return -1 if we've reached the end of the buffer.
-    def _scan_name(self, i, declstartpos):
-        rawdata = self.rawdata
-        n = len(rawdata)
-        if i == n:
-            return None, -1
-        m = _declname_match(rawdata, i)
-        if m:
-            s = m.group()
-            name = s.strip()
-            if (i + len(s)) == n:
-                return None, -1  # end of buffer
-            return name.lower(), m.end()
-        else:
-            self.updatepos(declstartpos, i)
-            self.error("expected name token at %r"
-                       % rawdata[declstartpos:declstartpos+20])
-
-    # To be overridden -- handlers for unknown objects
-    def unknown_decl(self, data):
-        pass
diff --git a/lib/future/backports/datetime.py b/lib/future/backports/datetime.py
deleted file mode 100644
index 8cd62ddf..00000000
--- a/lib/future/backports/datetime.py
+++ /dev/null
@@ -1,2152 +0,0 @@
-"""Concrete date/time and related types.
-
-See http://www.iana.org/time-zones/repository/tz-link.html for
-time zone and DST data sources.
-"""
-from __future__ import division
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import absolute_import
-from future.builtins import str
-from future.builtins import bytes
-from future.builtins import map
-from future.builtins import round
-from future.builtins import int
-from future.builtins import object
-from future.utils import native_str, PY2
-
-import time as _time
-import math as _math
-
-def _cmp(x, y):
-    return 0 if x == y else 1 if x > y else -1
-
-MINYEAR = 1
-MAXYEAR = 9999
-_MAXORDINAL = 3652059 # date.max.toordinal()
-
-# Utility functions, adapted from Python's Demo/classes/Dates.py, which
-# also assumes the current Gregorian calendar indefinitely extended in
-# both directions.  Difference:  Dates.py calls January 1 of year 0 day
-# number 1.  The code here calls January 1 of year 1 day number 1.  This is
-# to match the definition of the "proleptic Gregorian" calendar in Dershowitz
-# and Reingold's "Calendrical Calculations", where it's the base calendar
-# for all computations.  See the book for algorithms for converting between
-# proleptic Gregorian ordinals and many other calendar systems.
-
-_DAYS_IN_MONTH = [None, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
-
-_DAYS_BEFORE_MONTH = [None]
-dbm = 0
-for dim in _DAYS_IN_MONTH[1:]:
-    _DAYS_BEFORE_MONTH.append(dbm)
-    dbm += dim
-del dbm, dim
-
-def _is_leap(year):
-    "year -> 1 if leap year, else 0."
-    return year % 4 == 0 and (year % 100 != 0 or year % 400 == 0)
-
-def _days_before_year(year):
-    "year -> number of days before January 1st of year."
-    y = year - 1
-    return y*365 + y//4 - y//100 + y//400
-
-def _days_in_month(year, month):
-    "year, month -> number of days in that month in that year."
-    assert 1 <= month <= 12, month
-    if month == 2 and _is_leap(year):
-        return 29
-    return _DAYS_IN_MONTH[month]
-
-def _days_before_month(year, month):
-    "year, month -> number of days in year preceding first day of month."
-    assert 1 <= month <= 12, 'month must be in 1..12'
-    return _DAYS_BEFORE_MONTH[month] + (month > 2 and _is_leap(year))
-
-def _ymd2ord(year, month, day):
-    "year, month, day -> ordinal, considering 01-Jan-0001 as day 1."
-    assert 1 <= month <= 12, 'month must be in 1..12'
-    dim = _days_in_month(year, month)
-    assert 1 <= day <= dim, ('day must be in 1..%d' % dim)
-    return (_days_before_year(year) +
-            _days_before_month(year, month) +
-            day)
-
-_DI400Y = _days_before_year(401)    # number of days in 400 years
-_DI100Y = _days_before_year(101)    #    "    "   "   " 100   "
-_DI4Y   = _days_before_year(5)      #    "    "   "   "   4   "
-
-# A 4-year cycle has an extra leap day over what we'd get from pasting
-# together 4 single years.
-assert _DI4Y == 4 * 365 + 1
-
-# Similarly, a 400-year cycle has an extra leap day over what we'd get from
-# pasting together 4 100-year cycles.
-assert _DI400Y == 4 * _DI100Y + 1
-
-# OTOH, a 100-year cycle has one fewer leap day than we'd get from
-# pasting together 25 4-year cycles.
-assert _DI100Y == 25 * _DI4Y - 1
-
-def _ord2ymd(n):
-    "ordinal -> (year, month, day), considering 01-Jan-0001 as day 1."
-
-    # n is a 1-based index, starting at 1-Jan-1.  The pattern of leap years
-    # repeats exactly every 400 years.  The basic strategy is to find the
-    # closest 400-year boundary at or before n, then work with the offset
-    # from that boundary to n.  Life is much clearer if we subtract 1 from
-    # n first -- then the values of n at 400-year boundaries are exactly
-    # those divisible by _DI400Y:
-    #
-    #     D  M   Y            n              n-1
-    #     -- --- ----        ----------     ----------------
-    #     31 Dec -400        -_DI400Y       -_DI400Y -1
-    #      1 Jan -399         -_DI400Y +1   -_DI400Y      400-year boundary
-    #     ...
-    #     30 Dec  000        -1             -2
-    #     31 Dec  000         0             -1
-    #      1 Jan  001         1              0            400-year boundary
-    #      2 Jan  001         2              1
-    #      3 Jan  001         3              2
-    #     ...
-    #     31 Dec  400         _DI400Y        _DI400Y -1
-    #      1 Jan  401         _DI400Y +1     _DI400Y      400-year boundary
-    n -= 1
-    n400, n = divmod(n, _DI400Y)
-    year = n400 * 400 + 1   # ..., -399, 1, 401, ...
-
-    # Now n is the (non-negative) offset, in days, from January 1 of year, to
-    # the desired date.  Now compute how many 100-year cycles precede n.
-    # Note that it's possible for n100 to equal 4!  In that case 4 full
-    # 100-year cycles precede the desired day, which implies the desired
-    # day is December 31 at the end of a 400-year cycle.
-    n100, n = divmod(n, _DI100Y)
-
-    # Now compute how many 4-year cycles precede it.
-    n4, n = divmod(n, _DI4Y)
-
-    # And now how many single years.  Again n1 can be 4, and again meaning
-    # that the desired day is December 31 at the end of the 4-year cycle.
-    n1, n = divmod(n, 365)
-
-    year += n100 * 100 + n4 * 4 + n1
-    if n1 == 4 or n100 == 4:
-        assert n == 0
-        return year-1, 12, 31
-
-    # Now the year is correct, and n is the offset from January 1.  We find
-    # the month via an estimate that's either exact or one too large.
-    leapyear = n1 == 3 and (n4 != 24 or n100 == 3)
-    assert leapyear == _is_leap(year)
-    month = (n + 50) >> 5
-    preceding = _DAYS_BEFORE_MONTH[month] + (month > 2 and leapyear)
-    if preceding > n:  # estimate is too large
-        month -= 1
-        preceding -= _DAYS_IN_MONTH[month] + (month == 2 and leapyear)
-    n -= preceding
-    assert 0 <= n < _days_in_month(year, month)
-
-    # Now the year and month are correct, and n is the offset from the
-    # start of that month:  we're done!
-    return year, month, n+1
-
-# Month and day names.  For localized versions, see the calendar module.
-_MONTHNAMES = [None, "Jan", "Feb", "Mar", "Apr", "May", "Jun",
-                     "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
-_DAYNAMES = [None, "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]
-
-
-def _build_struct_time(y, m, d, hh, mm, ss, dstflag):
-    wday = (_ymd2ord(y, m, d) + 6) % 7
-    dnum = _days_before_month(y, m) + d
-    return _time.struct_time((y, m, d, hh, mm, ss, wday, dnum, dstflag))
-
-def _format_time(hh, mm, ss, us):
-    # Skip trailing microseconds when us==0.
-    result = "%02d:%02d:%02d" % (hh, mm, ss)
-    if us:
-        result += ".%06d" % us
-    return result
-
-# Correctly substitute for %z and %Z escapes in strftime formats.
-def _wrap_strftime(object, format, timetuple):
-    # Don't call utcoffset() or tzname() unless actually needed.
-    freplace = None # the string to use for %f
-    zreplace = None # the string to use for %z
-    Zreplace = None # the string to use for %Z
-
-    # Scan format for %z and %Z escapes, replacing as needed.
-    newformat = []
-    push = newformat.append
-    i, n = 0, len(format)
-    while i < n:
-        ch = format[i]
-        i += 1
-        if ch == '%':
-            if i < n:
-                ch = format[i]
-                i += 1
-                if ch == 'f':
-                    if freplace is None:
-                        freplace = '%06d' % getattr(object,
-                                                    'microsecond', 0)
-                    newformat.append(freplace)
-                elif ch == 'z':
-                    if zreplace is None:
-                        zreplace = ""
-                        if hasattr(object, "utcoffset"):
-                            offset = object.utcoffset()
-                            if offset is not None:
-                                sign = '+'
-                                if offset.days < 0:
-                                    offset = -offset
-                                    sign = '-'
-                                h, m = divmod(offset, timedelta(hours=1))
-                                assert not m % timedelta(minutes=1), "whole minute"
-                                m //= timedelta(minutes=1)
-                                zreplace = '%c%02d%02d' % (sign, h, m)
-                    assert '%' not in zreplace
-                    newformat.append(zreplace)
-                elif ch == 'Z':
-                    if Zreplace is None:
-                        Zreplace = ""
-                        if hasattr(object, "tzname"):
-                            s = object.tzname()
-                            if s is not None:
-                                # strftime is going to have at this: escape %
-                                Zreplace = s.replace('%', '%%')
-                    newformat.append(Zreplace)
-                else:
-                    push('%')
-                    push(ch)
-            else:
-                push('%')
-        else:
-            push(ch)
-    newformat = "".join(newformat)
-    return _time.strftime(newformat, timetuple)
-
-def _call_tzinfo_method(tzinfo, methname, tzinfoarg):
-    if tzinfo is None:
-        return None
-    return getattr(tzinfo, methname)(tzinfoarg)
-
-# Just raise TypeError if the arg isn't None or a string.
-def _check_tzname(name):
-    if name is not None and not isinstance(name, str):
-        raise TypeError("tzinfo.tzname() must return None or string, "
-                        "not '%s'" % type(name))
-
-# name is the offset-producing method, "utcoffset" or "dst".
-# offset is what it returned.
-# If offset isn't None or timedelta, raises TypeError.
-# If offset is None, returns None.
-# Else offset is checked for being in range, and a whole # of minutes.
-# If it is, its integer value is returned.  Else ValueError is raised.
-def _check_utc_offset(name, offset):
-    assert name in ("utcoffset", "dst")
-    if offset is None:
-        return
-    if not isinstance(offset, timedelta):
-        raise TypeError("tzinfo.%s() must return None "
-                        "or timedelta, not '%s'" % (name, type(offset)))
-    if offset % timedelta(minutes=1) or offset.microseconds:
-        raise ValueError("tzinfo.%s() must return a whole number "
-                         "of minutes, got %s" % (name, offset))
-    if not -timedelta(1) < offset < timedelta(1):
-        raise ValueError("%s()=%s, must be must be strictly between"
-                         " -timedelta(hours=24) and timedelta(hours=24)"
-                         % (name, offset))
-
-def _check_date_fields(year, month, day):
-    if not isinstance(year, int):
-        raise TypeError('int expected')
-    if not MINYEAR <= year <= MAXYEAR:
-        raise ValueError('year must be in %d..%d' % (MINYEAR, MAXYEAR), year)
-    if not 1 <= month <= 12:
-        raise ValueError('month must be in 1..12', month)
-    dim = _days_in_month(year, month)
-    if not 1 <= day <= dim:
-        raise ValueError('day must be in 1..%d' % dim, day)
-
-def _check_time_fields(hour, minute, second, microsecond):
-    if not isinstance(hour, int):
-        raise TypeError('int expected')
-    if not 0 <= hour <= 23:
-        raise ValueError('hour must be in 0..23', hour)
-    if not 0 <= minute <= 59:
-        raise ValueError('minute must be in 0..59', minute)
-    if not 0 <= second <= 59:
-        raise ValueError('second must be in 0..59', second)
-    if not 0 <= microsecond <= 999999:
-        raise ValueError('microsecond must be in 0..999999', microsecond)
-
-def _check_tzinfo_arg(tz):
-    if tz is not None and not isinstance(tz, tzinfo):
-        raise TypeError("tzinfo argument must be None or of a tzinfo subclass")
-
-def _cmperror(x, y):
-    raise TypeError("can't compare '%s' to '%s'" % (
-                    type(x).__name__, type(y).__name__))
-
-class timedelta(object):
-    """Represent the difference between two datetime objects.
-
-    Supported operators:
-
-    - add, subtract timedelta
-    - unary plus, minus, abs
-    - compare to timedelta
-    - multiply, divide by int
-
-    In addition, datetime supports subtraction of two datetime objects
-    returning a timedelta, and addition or subtraction of a datetime
-    and a timedelta giving a datetime.
-
-    Representation: (days, seconds, microseconds).  Why?  Because I
-    felt like it.
-    """
-    __slots__ = '_days', '_seconds', '_microseconds'
-
-    def __new__(cls, days=0, seconds=0, microseconds=0,
-                milliseconds=0, minutes=0, hours=0, weeks=0):
-        # Doing this efficiently and accurately in C is going to be difficult
-        # and error-prone, due to ubiquitous overflow possibilities, and that
-        # C double doesn't have enough bits of precision to represent
-        # microseconds over 10K years faithfully.  The code here tries to make
-        # explicit where go-fast assumptions can be relied on, in order to
-        # guide the C implementation; it's way more convoluted than speed-
-        # ignoring auto-overflow-to-long idiomatic Python could be.
-
-        # XXX Check that all inputs are ints or floats.
-
-        # Final values, all integer.
-        # s and us fit in 32-bit signed ints; d isn't bounded.
-        d = s = us = 0
-
-        # Normalize everything to days, seconds, microseconds.
-        days += weeks*7
-        seconds += minutes*60 + hours*3600
-        microseconds += milliseconds*1000
-
-        # Get rid of all fractions, and normalize s and us.
-        # Take a deep breath <wink>.
-        if isinstance(days, float):
-            dayfrac, days = _math.modf(days)
-            daysecondsfrac, daysecondswhole = _math.modf(dayfrac * (24.*3600.))
-            assert daysecondswhole == int(daysecondswhole)  # can't overflow
-            s = int(daysecondswhole)
-            assert days == int(days)
-            d = int(days)
-        else:
-            daysecondsfrac = 0.0
-            d = days
-        assert isinstance(daysecondsfrac, float)
-        assert abs(daysecondsfrac) <= 1.0
-        assert isinstance(d, int)
-        assert abs(s) <= 24 * 3600
-        # days isn't referenced again before redefinition
-
-        if isinstance(seconds, float):
-            secondsfrac, seconds = _math.modf(seconds)
-            assert seconds == int(seconds)
-            seconds = int(seconds)
-            secondsfrac += daysecondsfrac
-            assert abs(secondsfrac) <= 2.0
-        else:
-            secondsfrac = daysecondsfrac
-        # daysecondsfrac isn't referenced again
-        assert isinstance(secondsfrac, float)
-        assert abs(secondsfrac) <= 2.0
-
-        assert isinstance(seconds, int)
-        days, seconds = divmod(seconds, 24*3600)
-        d += days
-        s += int(seconds)    # can't overflow
-        assert isinstance(s, int)
-        assert abs(s) <= 2 * 24 * 3600
-        # seconds isn't referenced again before redefinition
-
-        usdouble = secondsfrac * 1e6
-        assert abs(usdouble) < 2.1e6    # exact value not critical
-        # secondsfrac isn't referenced again
-
-        if isinstance(microseconds, float):
-            microseconds += usdouble
-            microseconds = round(microseconds, 0)
-            seconds, microseconds = divmod(microseconds, 1e6)
-            assert microseconds == int(microseconds)
-            assert seconds == int(seconds)
-            days, seconds = divmod(seconds, 24.*3600.)
-            assert days == int(days)
-            assert seconds == int(seconds)
-            d += int(days)
-            s += int(seconds)   # can't overflow
-            assert isinstance(s, int)
-            assert abs(s) <= 3 * 24 * 3600
-        else:
-            seconds, microseconds = divmod(microseconds, 1000000)
-            days, seconds = divmod(seconds, 24*3600)
-            d += days
-            s += int(seconds)    # can't overflow
-            assert isinstance(s, int)
-            assert abs(s) <= 3 * 24 * 3600
-            microseconds = float(microseconds)
-            microseconds += usdouble
-            microseconds = round(microseconds, 0)
-        assert abs(s) <= 3 * 24 * 3600
-        assert abs(microseconds) < 3.1e6
-
-        # Just a little bit of carrying possible for microseconds and seconds.
-        assert isinstance(microseconds, float)
-        assert int(microseconds) == microseconds
-        us = int(microseconds)
-        seconds, us = divmod(us, 1000000)
-        s += seconds    # cant't overflow
-        assert isinstance(s, int)
-        days, s = divmod(s, 24*3600)
-        d += days
-
-        assert isinstance(d, int)
-        assert isinstance(s, int) and 0 <= s < 24*3600
-        assert isinstance(us, int) and 0 <= us < 1000000
-
-        self = object.__new__(cls)
-
-        self._days = d
-        self._seconds = s
-        self._microseconds = us
-        if abs(d) > 999999999:
-            raise OverflowError("timedelta # of days is too large: %d" % d)
-
-        return self
-
-    def __repr__(self):
-        if self._microseconds:
-            return "%s(%d, %d, %d)" % ('datetime.' + self.__class__.__name__,
-                                       self._days,
-                                       self._seconds,
-                                       self._microseconds)
-        if self._seconds:
-            return "%s(%d, %d)" % ('datetime.' + self.__class__.__name__,
-                                   self._days,
-                                   self._seconds)
-        return "%s(%d)" % ('datetime.' + self.__class__.__name__, self._days)
-
-    def __str__(self):
-        mm, ss = divmod(self._seconds, 60)
-        hh, mm = divmod(mm, 60)
-        s = "%d:%02d:%02d" % (hh, mm, ss)
-        if self._days:
-            def plural(n):
-                return n, abs(n) != 1 and "s" or ""
-            s = ("%d day%s, " % plural(self._days)) + s
-        if self._microseconds:
-            s = s + ".%06d" % self._microseconds
-        return s
-
-    def total_seconds(self):
-        """Total seconds in the duration."""
-        return ((self.days * 86400 + self.seconds)*10**6 +
-                self.microseconds) / 10**6
-
-    # Read-only field accessors
-    @property
-    def days(self):
-        """days"""
-        return self._days
-
-    @property
-    def seconds(self):
-        """seconds"""
-        return self._seconds
-
-    @property
-    def microseconds(self):
-        """microseconds"""
-        return self._microseconds
-
-    def __add__(self, other):
-        if isinstance(other, timedelta):
-            # for CPython compatibility, we cannot use
-            # our __class__ here, but need a real timedelta
-            return timedelta(self._days + other._days,
-                             self._seconds + other._seconds,
-                             self._microseconds + other._microseconds)
-        return NotImplemented
-
-    __radd__ = __add__
-
-    def __sub__(self, other):
-        if isinstance(other, timedelta):
-            # for CPython compatibility, we cannot use
-            # our __class__ here, but need a real timedelta
-            return timedelta(self._days - other._days,
-                             self._seconds - other._seconds,
-                             self._microseconds - other._microseconds)
-        return NotImplemented
-
-    def __rsub__(self, other):
-        if isinstance(other, timedelta):
-            return -self + other
-        return NotImplemented
-
-    def __neg__(self):
-        # for CPython compatibility, we cannot use
-        # our __class__ here, but need a real timedelta
-        return timedelta(-self._days,
-                         -self._seconds,
-                         -self._microseconds)
-
-    def __pos__(self):
-        return self
-
-    def __abs__(self):
-        if self._days < 0:
-            return -self
-        else:
-            return self
-
-    def __mul__(self, other):
-        if isinstance(other, int):
-            # for CPython compatibility, we cannot use
-            # our __class__ here, but need a real timedelta
-            return timedelta(self._days * other,
-                             self._seconds * other,
-                             self._microseconds * other)
-        if isinstance(other, float):
-            a, b = other.as_integer_ratio()
-            return self * a / b
-        return NotImplemented
-
-    __rmul__ = __mul__
-
-    def _to_microseconds(self):
-        return ((self._days * (24*3600) + self._seconds) * 1000000 +
-                self._microseconds)
-
-    def __floordiv__(self, other):
-        if not isinstance(other, (int, timedelta)):
-            return NotImplemented
-        usec = self._to_microseconds()
-        if isinstance(other, timedelta):
-            return usec // other._to_microseconds()
-        if isinstance(other, int):
-            return timedelta(0, 0, usec // other)
-
-    def __truediv__(self, other):
-        if not isinstance(other, (int, float, timedelta)):
-            return NotImplemented
-        usec = self._to_microseconds()
-        if isinstance(other, timedelta):
-            return usec / other._to_microseconds()
-        if isinstance(other, int):
-            return timedelta(0, 0, usec / other)
-        if isinstance(other, float):
-            a, b = other.as_integer_ratio()
-            return timedelta(0, 0, b * usec / a)
-
-    def __mod__(self, other):
-        if isinstance(other, timedelta):
-            r = self._to_microseconds() % other._to_microseconds()
-            return timedelta(0, 0, r)
-        return NotImplemented
-
-    def __divmod__(self, other):
-        if isinstance(other, timedelta):
-            q, r = divmod(self._to_microseconds(),
-                          other._to_microseconds())
-            return q, timedelta(0, 0, r)
-        return NotImplemented
-
-    # Comparisons of timedelta objects with other.
-
-    def __eq__(self, other):
-        if isinstance(other, timedelta):
-            return self._cmp(other) == 0
-        else:
-            return False
-
-    def __ne__(self, other):
-        if isinstance(other, timedelta):
-            return self._cmp(other) != 0
-        else:
-            return True
-
-    def __le__(self, other):
-        if isinstance(other, timedelta):
-            return self._cmp(other) <= 0
-        else:
-            _cmperror(self, other)
-
-    def __lt__(self, other):
-        if isinstance(other, timedelta):
-            return self._cmp(other) < 0
-        else:
-            _cmperror(self, other)
-
-    def __ge__(self, other):
-        if isinstance(other, timedelta):
-            return self._cmp(other) >= 0
-        else:
-            _cmperror(self, other)
-
-    def __gt__(self, other):
-        if isinstance(other, timedelta):
-            return self._cmp(other) > 0
-        else:
-            _cmperror(self, other)
-
-    def _cmp(self, other):
-        assert isinstance(other, timedelta)
-        return _cmp(self._getstate(), other._getstate())
-
-    def __hash__(self):
-        return hash(self._getstate())
-
-    def __bool__(self):
-        return (self._days != 0 or
-                self._seconds != 0 or
-                self._microseconds != 0)
-
-    # Pickle support.
-
-    def _getstate(self):
-        return (self._days, self._seconds, self._microseconds)
-
-    def __reduce__(self):
-        return (self.__class__, self._getstate())
-
-timedelta.min = timedelta(-999999999)
-timedelta.max = timedelta(days=999999999, hours=23, minutes=59, seconds=59,
-                          microseconds=999999)
-timedelta.resolution = timedelta(microseconds=1)
-
-class date(object):
-    """Concrete date type.
-
-    Constructors:
-
-    __new__()
-    fromtimestamp()
-    today()
-    fromordinal()
-
-    Operators:
-
-    __repr__, __str__
-    __cmp__, __hash__
-    __add__, __radd__, __sub__ (add/radd only with timedelta arg)
-
-    Methods:
-
-    timetuple()
-    toordinal()
-    weekday()
-    isoweekday(), isocalendar(), isoformat()
-    ctime()
-    strftime()
-
-    Properties (readonly):
-    year, month, day
-    """
-    __slots__ = '_year', '_month', '_day'
-
-    def __new__(cls, year, month=None, day=None):
-        """Constructor.
-
-        Arguments:
-
-        year, month, day (required, base 1)
-        """
-        if (isinstance(year, bytes) and len(year) == 4 and
-            1 <= year[2] <= 12 and month is None):  # Month is sane
-            # Pickle support
-            self = object.__new__(cls)
-            self.__setstate(year)
-            return self
-        _check_date_fields(year, month, day)
-        self = object.__new__(cls)
-        self._year = year
-        self._month = month
-        self._day = day
-        return self
-
-    # Additional constructors
-
-    @classmethod
-    def fromtimestamp(cls, t):
-        "Construct a date from a POSIX timestamp (like time.time())."
-        y, m, d, hh, mm, ss, weekday, jday, dst = _time.localtime(t)
-        return cls(y, m, d)
-
-    @classmethod
-    def today(cls):
-        "Construct a date from time.time()."
-        t = _time.time()
-        return cls.fromtimestamp(t)
-
-    @classmethod
-    def fromordinal(cls, n):
-        """Construct a date from a proleptic Gregorian ordinal.
-
-        January 1 of year 1 is day 1.  Only the year, month and day are
-        non-zero in the result.
-        """
-        y, m, d = _ord2ymd(n)
-        return cls(y, m, d)
-
-    # Conversions to string
-
-    def __repr__(self):
-        """Convert to formal string, for repr().
-
-        >>> dt = datetime(2010, 1, 1)
-        >>> repr(dt)
-        'datetime.datetime(2010, 1, 1, 0, 0)'
-
-        >>> dt = datetime(2010, 1, 1, tzinfo=timezone.utc)
-        >>> repr(dt)
-        'datetime.datetime(2010, 1, 1, 0, 0, tzinfo=datetime.timezone.utc)'
-        """
-        return "%s(%d, %d, %d)" % ('datetime.' + self.__class__.__name__,
-                                   self._year,
-                                   self._month,
-                                   self._day)
-    # XXX These shouldn't depend on time.localtime(), because that
-    # clips the usable dates to [1970 .. 2038).  At least ctime() is
-    # easily done without using strftime() -- that's better too because
-    # strftime("%c", ...) is locale specific.
-
-
-    def ctime(self):
-        "Return ctime() style string."
-        weekday = self.toordinal() % 7 or 7
-        return "%s %s %2d 00:00:00 %04d" % (
-            _DAYNAMES[weekday],
-            _MONTHNAMES[self._month],
-            self._day, self._year)
-
-    def strftime(self, fmt):
-        "Format using strftime()."
-        return _wrap_strftime(self, fmt, self.timetuple())
-
-    def __format__(self, fmt):
-        if len(fmt) != 0:
-            return self.strftime(fmt)
-        return str(self)
-
-    def isoformat(self):
-        """Return the date formatted according to ISO.
-
-        This is 'YYYY-MM-DD'.
-
-        References:
-        - http://www.w3.org/TR/NOTE-datetime
-        - http://www.cl.cam.ac.uk/~mgk25/iso-time.html
-        """
-        return "%04d-%02d-%02d" % (self._year, self._month, self._day)
-
-    __str__ = isoformat
-
-    # Read-only field accessors
-    @property
-    def year(self):
-        """year (1-9999)"""
-        return self._year
-
-    @property
-    def month(self):
-        """month (1-12)"""
-        return self._month
-
-    @property
-    def day(self):
-        """day (1-31)"""
-        return self._day
-
-    # Standard conversions, __cmp__, __hash__ (and helpers)
-
-    def timetuple(self):
-        "Return local time tuple compatible with time.localtime()."
-        return _build_struct_time(self._year, self._month, self._day,
-                                  0, 0, 0, -1)
-
-    def toordinal(self):
-        """Return proleptic Gregorian ordinal for the year, month and day.
-
-        January 1 of year 1 is day 1.  Only the year, month and day values
-        contribute to the result.
-        """
-        return _ymd2ord(self._year, self._month, self._day)
-
-    def replace(self, year=None, month=None, day=None):
-        """Return a new date with new values for the specified fields."""
-        if year is None:
-            year = self._year
-        if month is None:
-            month = self._month
-        if day is None:
-            day = self._day
-        _check_date_fields(year, month, day)
-        return date(year, month, day)
-
-    # Comparisons of date objects with other.
-
-    def __eq__(self, other):
-        if isinstance(other, date):
-            return self._cmp(other) == 0
-        return NotImplemented
-
-    def __ne__(self, other):
-        if isinstance(other, date):
-            return self._cmp(other) != 0
-        return NotImplemented
-
-    def __le__(self, other):
-        if isinstance(other, date):
-            return self._cmp(other) <= 0
-        return NotImplemented
-
-    def __lt__(self, other):
-        if isinstance(other, date):
-            return self._cmp(other) < 0
-        return NotImplemented
-
-    def __ge__(self, other):
-        if isinstance(other, date):
-            return self._cmp(other) >= 0
-        return NotImplemented
-
-    def __gt__(self, other):
-        if isinstance(other, date):
-            return self._cmp(other) > 0
-        return NotImplemented
-
-    def _cmp(self, other):
-        assert isinstance(other, date)
-        y, m, d = self._year, self._month, self._day
-        y2, m2, d2 = other._year, other._month, other._day
-        return _cmp((y, m, d), (y2, m2, d2))
-
-    def __hash__(self):
-        "Hash."
-        return hash(self._getstate())
-
-    # Computations
-
-    def __add__(self, other):
-        "Add a date to a timedelta."
-        if isinstance(other, timedelta):
-            o = self.toordinal() + other.days
-            if 0 < o <= _MAXORDINAL:
-                return date.fromordinal(o)
-            raise OverflowError("result out of range")
-        return NotImplemented
-
-    __radd__ = __add__
-
-    def __sub__(self, other):
-        """Subtract two dates, or a date and a timedelta."""
-        if isinstance(other, timedelta):
-            return self + timedelta(-other.days)
-        if isinstance(other, date):
-            days1 = self.toordinal()
-            days2 = other.toordinal()
-            return timedelta(days1 - days2)
-        return NotImplemented
-
-    def weekday(self):
-        "Return day of the week, where Monday == 0 ... Sunday == 6."
-        return (self.toordinal() + 6) % 7
-
-    # Day-of-the-week and week-of-the-year, according to ISO
-
-    def isoweekday(self):
-        "Return day of the week, where Monday == 1 ... Sunday == 7."
-        # 1-Jan-0001 is a Monday
-        return self.toordinal() % 7 or 7
-
-    def isocalendar(self):
-        """Return a 3-tuple containing ISO year, week number, and weekday.
-
-        The first ISO week of the year is the (Mon-Sun) week
-        containing the year's first Thursday; everything else derives
-        from that.
-
-        The first week is 1; Monday is 1 ... Sunday is 7.
-
-        ISO calendar algorithm taken from
-        http://www.phys.uu.nl/~vgent/calendar/isocalendar.htm
-        """
-        year = self._year
-        week1monday = _isoweek1monday(year)
-        today = _ymd2ord(self._year, self._month, self._day)
-        # Internally, week and day have origin 0
-        week, day = divmod(today - week1monday, 7)
-        if week < 0:
-            year -= 1
-            week1monday = _isoweek1monday(year)
-            week, day = divmod(today - week1monday, 7)
-        elif week >= 52:
-            if today >= _isoweek1monday(year+1):
-                year += 1
-                week = 0
-        return year, week+1, day+1
-
-    # Pickle support.
-
-    def _getstate(self):
-        yhi, ylo = divmod(self._year, 256)
-        return bytes([yhi, ylo, self._month, self._day]),
-
-    def __setstate(self, string):
-        if len(string) != 4 or not (1 <= string[2] <= 12):
-            raise TypeError("not enough arguments")
-        yhi, ylo, self._month, self._day = string
-        self._year = yhi * 256 + ylo
-
-    def __reduce__(self):
-        return (self.__class__, self._getstate())
-
-_date_class = date  # so functions w/ args named "date" can get at the class
-
-date.min = date(1, 1, 1)
-date.max = date(9999, 12, 31)
-date.resolution = timedelta(days=1)
-
-class tzinfo(object):
-    """Abstract base class for time zone info classes.
-
-    Subclasses must override the name(), utcoffset() and dst() methods.
-    """
-    __slots__ = ()
-    def tzname(self, dt):
-        "datetime -> string name of time zone."
-        raise NotImplementedError("tzinfo subclass must override tzname()")
-
-    def utcoffset(self, dt):
-        "datetime -> minutes east of UTC (negative for west of UTC)"
-        raise NotImplementedError("tzinfo subclass must override utcoffset()")
-
-    def dst(self, dt):
-        """datetime -> DST offset in minutes east of UTC.
-
-        Return 0 if DST not in effect.  utcoffset() must include the DST
-        offset.
-        """
-        raise NotImplementedError("tzinfo subclass must override dst()")
-
-    def fromutc(self, dt):
-        "datetime in UTC -> datetime in local time."
-
-        if not isinstance(dt, datetime):
-            raise TypeError("fromutc() requires a datetime argument")
-        if dt.tzinfo is not self:
-            raise ValueError("dt.tzinfo is not self")
-
-        dtoff = dt.utcoffset()
-        if dtoff is None:
-            raise ValueError("fromutc() requires a non-None utcoffset() "
-                             "result")
-
-        # See the long comment block at the end of this file for an
-        # explanation of this algorithm.
-        dtdst = dt.dst()
-        if dtdst is None:
-            raise ValueError("fromutc() requires a non-None dst() result")
-        delta = dtoff - dtdst
-        if delta:
-            dt += delta
-            dtdst = dt.dst()
-            if dtdst is None:
-                raise ValueError("fromutc(): dt.dst gave inconsistent "
-                                 "results; cannot convert")
-        return dt + dtdst
-
-    # Pickle support.
-
-    def __reduce__(self):
-        getinitargs = getattr(self, "__getinitargs__", None)
-        if getinitargs:
-            args = getinitargs()
-        else:
-            args = ()
-        getstate = getattr(self, "__getstate__", None)
-        if getstate:
-            state = getstate()
-        else:
-            state = getattr(self, "__dict__", None) or None
-        if state is None:
-            return (self.__class__, args)
-        else:
-            return (self.__class__, args, state)
-
-_tzinfo_class = tzinfo
-
-class time(object):
-    """Time with time zone.
-
-    Constructors:
-
-    __new__()
-
-    Operators:
-
-    __repr__, __str__
-    __cmp__, __hash__
-
-    Methods:
-
-    strftime()
-    isoformat()
-    utcoffset()
-    tzname()
-    dst()
-
-    Properties (readonly):
-    hour, minute, second, microsecond, tzinfo
-    """
-
-    def __new__(cls, hour=0, minute=0, second=0, microsecond=0, tzinfo=None):
-        """Constructor.
-
-        Arguments:
-
-        hour, minute (required)
-        second, microsecond (default to zero)
-        tzinfo (default to None)
-        """
-        self = object.__new__(cls)
-        if isinstance(hour, bytes) and len(hour) == 6:
-            # Pickle support
-            self.__setstate(hour, minute or None)
-            return self
-        _check_tzinfo_arg(tzinfo)
-        _check_time_fields(hour, minute, second, microsecond)
-        self._hour = hour
-        self._minute = minute
-        self._second = second
-        self._microsecond = microsecond
-        self._tzinfo = tzinfo
-        return self
-
-    # Read-only field accessors
-    @property
-    def hour(self):
-        """hour (0-23)"""
-        return self._hour
-
-    @property
-    def minute(self):
-        """minute (0-59)"""
-        return self._minute
-
-    @property
-    def second(self):
-        """second (0-59)"""
-        return self._second
-
-    @property
-    def microsecond(self):
-        """microsecond (0-999999)"""
-        return self._microsecond
-
-    @property
-    def tzinfo(self):
-        """timezone info object"""
-        return self._tzinfo
-
-    # Standard conversions, __hash__ (and helpers)
-
-    # Comparisons of time objects with other.
-
-    def __eq__(self, other):
-        if isinstance(other, time):
-            return self._cmp(other, allow_mixed=True) == 0
-        else:
-            return False
-
-    def __ne__(self, other):
-        if isinstance(other, time):
-            return self._cmp(other, allow_mixed=True) != 0
-        else:
-            return True
-
-    def __le__(self, other):
-        if isinstance(other, time):
-            return self._cmp(other) <= 0
-        else:
-            _cmperror(self, other)
-
-    def __lt__(self, other):
-        if isinstance(other, time):
-            return self._cmp(other) < 0
-        else:
-            _cmperror(self, other)
-
-    def __ge__(self, other):
-        if isinstance(other, time):
-            return self._cmp(other) >= 0
-        else:
-            _cmperror(self, other)
-
-    def __gt__(self, other):
-        if isinstance(other, time):
-            return self._cmp(other) > 0
-        else:
-            _cmperror(self, other)
-
-    def _cmp(self, other, allow_mixed=False):
-        assert isinstance(other, time)
-        mytz = self._tzinfo
-        ottz = other._tzinfo
-        myoff = otoff = None
-
-        if mytz is ottz:
-            base_compare = True
-        else:
-            myoff = self.utcoffset()
-            otoff = other.utcoffset()
-            base_compare = myoff == otoff
-
-        if base_compare:
-            return _cmp((self._hour, self._minute, self._second,
-                         self._microsecond),
-                       (other._hour, other._minute, other._second,
-                        other._microsecond))
-        if myoff is None or otoff is None:
-            if allow_mixed:
-                return 2 # arbitrary non-zero value
-            else:
-                raise TypeError("cannot compare naive and aware times")
-        myhhmm = self._hour * 60 + self._minute - myoff//timedelta(minutes=1)
-        othhmm = other._hour * 60 + other._minute - otoff//timedelta(minutes=1)
-        return _cmp((myhhmm, self._second, self._microsecond),
-                    (othhmm, other._second, other._microsecond))
-
-    def __hash__(self):
-        """Hash."""
-        tzoff = self.utcoffset()
-        if not tzoff: # zero or None
-            return hash(self._getstate()[0])
-        h, m = divmod(timedelta(hours=self.hour, minutes=self.minute) - tzoff,
-                      timedelta(hours=1))
-        assert not m % timedelta(minutes=1), "whole minute"
-        m //= timedelta(minutes=1)
-        if 0 <= h < 24:
-            return hash(time(h, m, self.second, self.microsecond))
-        return hash((h, m, self.second, self.microsecond))
-
-    # Conversion to string
-
-    def _tzstr(self, sep=":"):
-        """Return formatted timezone offset (+xx:xx) or None."""
-        off = self.utcoffset()
-        if off is not None:
-            if off.days < 0:
-                sign = "-"
-                off = -off
-            else:
-                sign = "+"
-            hh, mm = divmod(off, timedelta(hours=1))
-            assert not mm % timedelta(minutes=1), "whole minute"
-            mm //= timedelta(minutes=1)
-            assert 0 <= hh < 24
-            off = "%s%02d%s%02d" % (sign, hh, sep, mm)
-        return off
-
-    def __repr__(self):
-        """Convert to formal string, for repr()."""
-        if self._microsecond != 0:
-            s = ", %d, %d" % (self._second, self._microsecond)
-        elif self._second != 0:
-            s = ", %d" % self._second
-        else:
-            s = ""
-        s= "%s(%d, %d%s)" % ('datetime.' + self.__class__.__name__,
-                             self._hour, self._minute, s)
-        if self._tzinfo is not None:
-            assert s[-1:] == ")"
-            s = s[:-1] + ", tzinfo=%r" % self._tzinfo + ")"
-        return s
-
-    def isoformat(self):
-        """Return the time formatted according to ISO.
-
-        This is 'HH:MM:SS.mmmmmm+zz:zz', or 'HH:MM:SS+zz:zz' if
-        self.microsecond == 0.
-        """
-        s = _format_time(self._hour, self._minute, self._second,
-                         self._microsecond)
-        tz = self._tzstr()
-        if tz:
-            s += tz
-        return s
-
-    __str__ = isoformat
-
-    def strftime(self, fmt):
-        """Format using strftime().  The date part of the timestamp passed
-        to underlying strftime should not be used.
-        """
-        # The year must be >= 1000 else Python's strftime implementation
-        # can raise a bogus exception.
-        timetuple = (1900, 1, 1,
-                     self._hour, self._minute, self._second,
-                     0, 1, -1)
-        return _wrap_strftime(self, fmt, timetuple)
-
-    def __format__(self, fmt):
-        if len(fmt) != 0:
-            return self.strftime(fmt)
-        return str(self)
-
-    # Timezone functions
-
-    def utcoffset(self):
-        """Return the timezone offset in minutes east of UTC (negative west of
-        UTC)."""
-        if self._tzinfo is None:
-            return None
-        offset = self._tzinfo.utcoffset(None)
-        _check_utc_offset("utcoffset", offset)
-        return offset
-
-    def tzname(self):
-        """Return the timezone name.
-
-        Note that the name is 100% informational -- there's no requirement that
-        it mean anything in particular. For example, "GMT", "UTC", "-500",
-        "-5:00", "EDT", "US/Eastern", "America/New York" are all valid replies.
-        """
-        if self._tzinfo is None:
-            return None
-        name = self._tzinfo.tzname(None)
-        _check_tzname(name)
-        return name
-
-    def dst(self):
-        """Return 0 if DST is not in effect, or the DST offset (in minutes
-        eastward) if DST is in effect.
-
-        This is purely informational; the DST offset has already been added to
-        the UTC offset returned by utcoffset() if applicable, so there's no
-        need to consult dst() unless you're interested in displaying the DST
-        info.
-        """
-        if self._tzinfo is None:
-            return None
-        offset = self._tzinfo.dst(None)
-        _check_utc_offset("dst", offset)
-        return offset
-
-    def replace(self, hour=None, minute=None, second=None, microsecond=None,
-                tzinfo=True):
-        """Return a new time with new values for the specified fields."""
-        if hour is None:
-            hour = self.hour
-        if minute is None:
-            minute = self.minute
-        if second is None:
-            second = self.second
-        if microsecond is None:
-            microsecond = self.microsecond
-        if tzinfo is True:
-            tzinfo = self.tzinfo
-        _check_time_fields(hour, minute, second, microsecond)
-        _check_tzinfo_arg(tzinfo)
-        return time(hour, minute, second, microsecond, tzinfo)
-
-    def __bool__(self):
-        if self.second or self.microsecond:
-            return True
-        offset = self.utcoffset() or timedelta(0)
-        return timedelta(hours=self.hour, minutes=self.minute) != offset
-
-    # Pickle support.
-
-    def _getstate(self):
-        us2, us3 = divmod(self._microsecond, 256)
-        us1, us2 = divmod(us2, 256)
-        basestate = bytes([self._hour, self._minute, self._second,
-                           us1, us2, us3])
-        if self._tzinfo is None:
-            return (basestate,)
-        else:
-            return (basestate, self._tzinfo)
-
-    def __setstate(self, string, tzinfo):
-        if len(string) != 6 or string[0] >= 24:
-            raise TypeError("an integer is required")
-        (self._hour, self._minute, self._second,
-         us1, us2, us3) = string
-        self._microsecond = (((us1 << 8) | us2) << 8) | us3
-        if tzinfo is None or isinstance(tzinfo, _tzinfo_class):
-            self._tzinfo = tzinfo
-        else:
-            raise TypeError("bad tzinfo state arg %r" % tzinfo)
-
-    def __reduce__(self):
-        return (time, self._getstate())
-
-_time_class = time  # so functions w/ args named "time" can get at the class
-
-time.min = time(0, 0, 0)
-time.max = time(23, 59, 59, 999999)
-time.resolution = timedelta(microseconds=1)
-
-class datetime(date):
-    """datetime(year, month, day[, hour[, minute[, second[, microsecond[,tzinfo]]]]])
-
-    The year, month and day arguments are required. tzinfo may be None, or an
-    instance of a tzinfo subclass. The remaining arguments may be ints.
-    """
-
-    __slots__ = date.__slots__ + (
-        '_hour', '_minute', '_second',
-        '_microsecond', '_tzinfo')
-    def __new__(cls, year, month=None, day=None, hour=0, minute=0, second=0,
-                microsecond=0, tzinfo=None):
-        if isinstance(year, bytes) and len(year) == 10:
-            # Pickle support
-            self = date.__new__(cls, year[:4])
-            self.__setstate(year, month)
-            return self
-        _check_tzinfo_arg(tzinfo)
-        _check_time_fields(hour, minute, second, microsecond)
-        self = date.__new__(cls, year, month, day)
-        self._hour = hour
-        self._minute = minute
-        self._second = second
-        self._microsecond = microsecond
-        self._tzinfo = tzinfo
-        return self
-
-    # Read-only field accessors
-    @property
-    def hour(self):
-        """hour (0-23)"""
-        return self._hour
-
-    @property
-    def minute(self):
-        """minute (0-59)"""
-        return self._minute
-
-    @property
-    def second(self):
-        """second (0-59)"""
-        return self._second
-
-    @property
-    def microsecond(self):
-        """microsecond (0-999999)"""
-        return self._microsecond
-
-    @property
-    def tzinfo(self):
-        """timezone info object"""
-        return self._tzinfo
-
-    @classmethod
-    def fromtimestamp(cls, t, tz=None):
-        """Construct a datetime from a POSIX timestamp (like time.time()).
-
-        A timezone info object may be passed in as well.
-        """
-
-        _check_tzinfo_arg(tz)
-
-        converter = _time.localtime if tz is None else _time.gmtime
-
-        t, frac = divmod(t, 1.0)
-        us = int(frac * 1e6)
-
-        # If timestamp is less than one microsecond smaller than a
-        # full second, us can be rounded up to 1000000.  In this case,
-        # roll over to seconds, otherwise, ValueError is raised
-        # by the constructor.
-        if us == 1000000:
-            t += 1
-            us = 0
-        y, m, d, hh, mm, ss, weekday, jday, dst = converter(t)
-        ss = min(ss, 59)    # clamp out leap seconds if the platform has them
-        result = cls(y, m, d, hh, mm, ss, us, tz)
-        if tz is not None:
-            result = tz.fromutc(result)
-        return result
-
-    @classmethod
-    def utcfromtimestamp(cls, t):
-        "Construct a UTC datetime from a POSIX timestamp (like time.time())."
-        t, frac = divmod(t, 1.0)
-        us = int(frac * 1e6)
-
-        # If timestamp is less than one microsecond smaller than a
-        # full second, us can be rounded up to 1000000.  In this case,
-        # roll over to seconds, otherwise, ValueError is raised
-        # by the constructor.
-        if us == 1000000:
-            t += 1
-            us = 0
-        y, m, d, hh, mm, ss, weekday, jday, dst = _time.gmtime(t)
-        ss = min(ss, 59)    # clamp out leap seconds if the platform has them
-        return cls(y, m, d, hh, mm, ss, us)
-
-    # XXX This is supposed to do better than we *can* do by using time.time(),
-    # XXX if the platform supports a more accurate way.  The C implementation
-    # XXX uses gettimeofday on platforms that have it, but that isn't
-    # XXX available from Python.  So now() may return different results
-    # XXX across the implementations.
-    @classmethod
-    def now(cls, tz=None):
-        "Construct a datetime from time.time() and optional time zone info."
-        t = _time.time()
-        return cls.fromtimestamp(t, tz)
-
-    @classmethod
-    def utcnow(cls):
-        "Construct a UTC datetime from time.time()."
-        t = _time.time()
-        return cls.utcfromtimestamp(t)
-
-    @classmethod
-    def combine(cls, date, time):
-        "Construct a datetime from a given date and a given time."
-        if not isinstance(date, _date_class):
-            raise TypeError("date argument must be a date instance")
-        if not isinstance(time, _time_class):
-            raise TypeError("time argument must be a time instance")
-        return cls(date.year, date.month, date.day,
-                   time.hour, time.minute, time.second, time.microsecond,
-                   time.tzinfo)
-
-    def timetuple(self):
-        "Return local time tuple compatible with time.localtime()."
-        dst = self.dst()
-        if dst is None:
-            dst = -1
-        elif dst:
-            dst = 1
-        else:
-            dst = 0
-        return _build_struct_time(self.year, self.month, self.day,
-                                  self.hour, self.minute, self.second,
-                                  dst)
-
-    def timestamp(self):
-        "Return POSIX timestamp as float"
-        if self._tzinfo is None:
-            return _time.mktime((self.year, self.month, self.day,
-                                 self.hour, self.minute, self.second,
-                                 -1, -1, -1)) + self.microsecond / 1e6
-        else:
-            return (self - _EPOCH).total_seconds()
-
-    def utctimetuple(self):
-        "Return UTC time tuple compatible with time.gmtime()."
-        offset = self.utcoffset()
-        if offset:
-            self -= offset
-        y, m, d = self.year, self.month, self.day
-        hh, mm, ss = self.hour, self.minute, self.second
-        return _build_struct_time(y, m, d, hh, mm, ss, 0)
-
-    def date(self):
-        "Return the date part."
-        return date(self._year, self._month, self._day)
-
-    def time(self):
-        "Return the time part, with tzinfo None."
-        return time(self.hour, self.minute, self.second, self.microsecond)
-
-    def timetz(self):
-        "Return the time part, with same tzinfo."
-        return time(self.hour, self.minute, self.second, self.microsecond,
-                    self._tzinfo)
-
-    def replace(self, year=None, month=None, day=None, hour=None,
-                minute=None, second=None, microsecond=None, tzinfo=True):
-        """Return a new datetime with new values for the specified fields."""
-        if year is None:
-            year = self.year
-        if month is None:
-            month = self.month
-        if day is None:
-            day = self.day
-        if hour is None:
-            hour = self.hour
-        if minute is None:
-            minute = self.minute
-        if second is None:
-            second = self.second
-        if microsecond is None:
-            microsecond = self.microsecond
-        if tzinfo is True:
-            tzinfo = self.tzinfo
-        _check_date_fields(year, month, day)
-        _check_time_fields(hour, minute, second, microsecond)
-        _check_tzinfo_arg(tzinfo)
-        return datetime(year, month, day, hour, minute, second,
-                          microsecond, tzinfo)
-
-    def astimezone(self, tz=None):
-        if tz is None:
-            if self.tzinfo is None:
-                raise ValueError("astimezone() requires an aware datetime")
-            ts = (self - _EPOCH) // timedelta(seconds=1)
-            localtm = _time.localtime(ts)
-            local = datetime(*localtm[:6])
-            try:
-                # Extract TZ data if available
-                gmtoff = localtm.tm_gmtoff
-                zone = localtm.tm_zone
-            except AttributeError:
-                # Compute UTC offset and compare with the value implied
-                # by tm_isdst.  If the values match, use the zone name
-                # implied by tm_isdst.
-                delta = local - datetime(*_time.gmtime(ts)[:6])
-                dst = _time.daylight and localtm.tm_isdst > 0
-                gmtoff = -(_time.altzone if dst else _time.timezone)
-                if delta == timedelta(seconds=gmtoff):
-                    tz = timezone(delta, _time.tzname[dst])
-                else:
-                    tz = timezone(delta)
-            else:
-                tz = timezone(timedelta(seconds=gmtoff), zone)
-
-        elif not isinstance(tz, tzinfo):
-            raise TypeError("tz argument must be an instance of tzinfo")
-
-        mytz = self.tzinfo
-        if mytz is None:
-            raise ValueError("astimezone() requires an aware datetime")
-
-        if tz is mytz:
-            return self
-
-        # Convert self to UTC, and attach the new time zone object.
-        myoffset = self.utcoffset()
-        if myoffset is None:
-            raise ValueError("astimezone() requires an aware datetime")
-        utc = (self - myoffset).replace(tzinfo=tz)
-
-        # Convert from UTC to tz's local time.
-        return tz.fromutc(utc)
-
-    # Ways to produce a string.
-
-    def ctime(self):
-        "Return ctime() style string."
-        weekday = self.toordinal() % 7 or 7
-        return "%s %s %2d %02d:%02d:%02d %04d" % (
-            _DAYNAMES[weekday],
-            _MONTHNAMES[self._month],
-            self._day,
-            self._hour, self._minute, self._second,
-            self._year)
-
-    def isoformat(self, sep='T'):
-        """Return the time formatted according to ISO.
-
-        This is 'YYYY-MM-DD HH:MM:SS.mmmmmm', or 'YYYY-MM-DD HH:MM:SS' if
-        self.microsecond == 0.
-
-        If self.tzinfo is not None, the UTC offset is also attached, giving
-        'YYYY-MM-DD HH:MM:SS.mmmmmm+HH:MM' or 'YYYY-MM-DD HH:MM:SS+HH:MM'.
-
-        Optional argument sep specifies the separator between date and
-        time, default 'T'.
-        """
-        s = ("%04d-%02d-%02d%c" % (self._year, self._month, self._day,
-                                  sep) +
-                _format_time(self._hour, self._minute, self._second,
-                             self._microsecond))
-        off = self.utcoffset()
-        if off is not None:
-            if off.days < 0:
-                sign = "-"
-                off = -off
-            else:
-                sign = "+"
-            hh, mm = divmod(off, timedelta(hours=1))
-            assert not mm % timedelta(minutes=1), "whole minute"
-            mm //= timedelta(minutes=1)
-            s += "%s%02d:%02d" % (sign, hh, mm)
-        return s
-
-    def __repr__(self):
-        """Convert to formal string, for repr()."""
-        L = [self._year, self._month, self._day, # These are never zero
-             self._hour, self._minute, self._second, self._microsecond]
-        if L[-1] == 0:
-            del L[-1]
-        if L[-1] == 0:
-            del L[-1]
-        s = ", ".join(map(str, L))
-        s = "%s(%s)" % ('datetime.' + self.__class__.__name__, s)
-        if self._tzinfo is not None:
-            assert s[-1:] == ")"
-            s = s[:-1] + ", tzinfo=%r" % self._tzinfo + ")"
-        return s
-
-    def __str__(self):
-        "Convert to string, for str()."
-        return self.isoformat(sep=' ')
-
-    @classmethod
-    def strptime(cls, date_string, format):
-        'string, format -> new datetime parsed from a string (like time.strptime()).'
-        import _strptime
-        return _strptime._strptime_datetime(cls, date_string, format)
-
-    def utcoffset(self):
-        """Return the timezone offset in minutes east of UTC (negative west of
-        UTC)."""
-        if self._tzinfo is None:
-            return None
-        offset = self._tzinfo.utcoffset(self)
-        _check_utc_offset("utcoffset", offset)
-        return offset
-
-    def tzname(self):
-        """Return the timezone name.
-
-        Note that the name is 100% informational -- there's no requirement that
-        it mean anything in particular. For example, "GMT", "UTC", "-500",
-        "-5:00", "EDT", "US/Eastern", "America/New York" are all valid replies.
-        """
-        name = _call_tzinfo_method(self._tzinfo, "tzname", self)
-        _check_tzname(name)
-        return name
-
-    def dst(self):
-        """Return 0 if DST is not in effect, or the DST offset (in minutes
-        eastward) if DST is in effect.
-
-        This is purely informational; the DST offset has already been added to
-        the UTC offset returned by utcoffset() if applicable, so there's no
-        need to consult dst() unless you're interested in displaying the DST
-        info.
-        """
-        if self._tzinfo is None:
-            return None
-        offset = self._tzinfo.dst(self)
-        _check_utc_offset("dst", offset)
-        return offset
-
-    # Comparisons of datetime objects with other.
-
-    def __eq__(self, other):
-        if isinstance(other, datetime):
-            return self._cmp(other, allow_mixed=True) == 0
-        elif not isinstance(other, date):
-            return NotImplemented
-        else:
-            return False
-
-    def __ne__(self, other):
-        if isinstance(other, datetime):
-            return self._cmp(other, allow_mixed=True) != 0
-        elif not isinstance(other, date):
-            return NotImplemented
-        else:
-            return True
-
-    def __le__(self, other):
-        if isinstance(other, datetime):
-            return self._cmp(other) <= 0
-        elif not isinstance(other, date):
-            return NotImplemented
-        else:
-            _cmperror(self, other)
-
-    def __lt__(self, other):
-        if isinstance(other, datetime):
-            return self._cmp(other) < 0
-        elif not isinstance(other, date):
-            return NotImplemented
-        else:
-            _cmperror(self, other)
-
-    def __ge__(self, other):
-        if isinstance(other, datetime):
-            return self._cmp(other) >= 0
-        elif not isinstance(other, date):
-            return NotImplemented
-        else:
-            _cmperror(self, other)
-
-    def __gt__(self, other):
-        if isinstance(other, datetime):
-            return self._cmp(other) > 0
-        elif not isinstance(other, date):
-            return NotImplemented
-        else:
-            _cmperror(self, other)
-
-    def _cmp(self, other, allow_mixed=False):
-        assert isinstance(other, datetime)
-        mytz = self._tzinfo
-        ottz = other._tzinfo
-        myoff = otoff = None
-
-        if mytz is ottz:
-            base_compare = True
-        else:
-            myoff = self.utcoffset()
-            otoff = other.utcoffset()
-            base_compare = myoff == otoff
-
-        if base_compare:
-            return _cmp((self._year, self._month, self._day,
-                         self._hour, self._minute, self._second,
-                         self._microsecond),
-                       (other._year, other._month, other._day,
-                        other._hour, other._minute, other._second,
-                        other._microsecond))
-        if myoff is None or otoff is None:
-            if allow_mixed:
-                return 2 # arbitrary non-zero value
-            else:
-                raise TypeError("cannot compare naive and aware datetimes")
-        # XXX What follows could be done more efficiently...
-        diff = self - other     # this will take offsets into account
-        if diff.days < 0:
-            return -1
-        return diff and 1 or 0
-
-    def __add__(self, other):
-        "Add a datetime and a timedelta."
-        if not isinstance(other, timedelta):
-            return NotImplemented
-        delta = timedelta(self.toordinal(),
-                          hours=self._hour,
-                          minutes=self._minute,
-                          seconds=self._second,
-                          microseconds=self._microsecond)
-        delta += other
-        hour, rem = divmod(delta.seconds, 3600)
-        minute, second = divmod(rem, 60)
-        if 0 < delta.days <= _MAXORDINAL:
-            return datetime.combine(date.fromordinal(delta.days),
-                                    time(hour, minute, second,
-                                         delta.microseconds,
-                                         tzinfo=self._tzinfo))
-        raise OverflowError("result out of range")
-
-    __radd__ = __add__
-
-    def __sub__(self, other):
-        "Subtract two datetimes, or a datetime and a timedelta."
-        if not isinstance(other, datetime):
-            if isinstance(other, timedelta):
-                return self + -other
-            return NotImplemented
-
-        days1 = self.toordinal()
-        days2 = other.toordinal()
-        secs1 = self._second + self._minute * 60 + self._hour * 3600
-        secs2 = other._second + other._minute * 60 + other._hour * 3600
-        base = timedelta(days1 - days2,
-                         secs1 - secs2,
-                         self._microsecond - other._microsecond)
-        if self._tzinfo is other._tzinfo:
-            return base
-        myoff = self.utcoffset()
-        otoff = other.utcoffset()
-        if myoff == otoff:
-            return base
-        if myoff is None or otoff is None:
-            raise TypeError("cannot mix naive and timezone-aware time")
-        return base + otoff - myoff
-
-    def __hash__(self):
-        tzoff = self.utcoffset()
-        if tzoff is None:
-            return hash(self._getstate()[0])
-        days = _ymd2ord(self.year, self.month, self.day)
-        seconds = self.hour * 3600 + self.minute * 60 + self.second
-        return hash(timedelta(days, seconds, self.microsecond) - tzoff)
-
-    # Pickle support.
-
-    def _getstate(self):
-        yhi, ylo = divmod(self._year, 256)
-        us2, us3 = divmod(self._microsecond, 256)
-        us1, us2 = divmod(us2, 256)
-        basestate = bytes([yhi, ylo, self._month, self._day,
-                           self._hour, self._minute, self._second,
-                           us1, us2, us3])
-        if self._tzinfo is None:
-            return (basestate,)
-        else:
-            return (basestate, self._tzinfo)
-
-    def __setstate(self, string, tzinfo):
-        (yhi, ylo, self._month, self._day, self._hour,
-         self._minute, self._second, us1, us2, us3) = string
-        self._year = yhi * 256 + ylo
-        self._microsecond = (((us1 << 8) | us2) << 8) | us3
-        if tzinfo is None or isinstance(tzinfo, _tzinfo_class):
-            self._tzinfo = tzinfo
-        else:
-            raise TypeError("bad tzinfo state arg %r" % tzinfo)
-
-    def __reduce__(self):
-        return (self.__class__, self._getstate())
-
-
-datetime.min = datetime(1, 1, 1)
-datetime.max = datetime(9999, 12, 31, 23, 59, 59, 999999)
-datetime.resolution = timedelta(microseconds=1)
-
-
-def _isoweek1monday(year):
-    # Helper to calculate the day number of the Monday starting week 1
-    # XXX This could be done more efficiently
-    THURSDAY = 3
-    firstday = _ymd2ord(year, 1, 1)
-    firstweekday = (firstday + 6) % 7 # See weekday() above
-    week1monday = firstday - firstweekday
-    if firstweekday > THURSDAY:
-        week1monday += 7
-    return week1monday
-
-class timezone(tzinfo):
-    __slots__ = '_offset', '_name'
-
-    # Sentinel value to disallow None
-    _Omitted = object()
-    def __new__(cls, offset, name=_Omitted):
-        if not isinstance(offset, timedelta):
-            raise TypeError("offset must be a timedelta")
-        if name is cls._Omitted:
-            if not offset:
-                return cls.utc
-            name = None
-        elif not isinstance(name, str):
-            ###
-            # For Python-Future:
-            if PY2 and isinstance(name, native_str):
-                name = name.decode()
-            else:
-                raise TypeError("name must be a string")
-            ###
-        if not cls._minoffset <= offset <= cls._maxoffset:
-            raise ValueError("offset must be a timedelta"
-                             " strictly between -timedelta(hours=24) and"
-                             " timedelta(hours=24).")
-        if (offset.microseconds != 0 or
-            offset.seconds % 60 != 0):
-            raise ValueError("offset must be a timedelta"
-                             " representing a whole number of minutes")
-        return cls._create(offset, name)
-
-    @classmethod
-    def _create(cls, offset, name=None):
-        self = tzinfo.__new__(cls)
-        self._offset = offset
-        self._name = name
-        return self
-
-    def __getinitargs__(self):
-        """pickle support"""
-        if self._name is None:
-            return (self._offset,)
-        return (self._offset, self._name)
-
-    def __eq__(self, other):
-        if type(other) != timezone:
-            return False
-        return self._offset == other._offset
-
-    def __hash__(self):
-        return hash(self._offset)
-
-    def __repr__(self):
-        """Convert to formal string, for repr().
-
-        >>> tz = timezone.utc
-        >>> repr(tz)
-        'datetime.timezone.utc'
-        >>> tz = timezone(timedelta(hours=-5), 'EST')
-        >>> repr(tz)
-        "datetime.timezone(datetime.timedelta(-1, 68400), 'EST')"
-        """
-        if self is self.utc:
-            return 'datetime.timezone.utc'
-        if self._name is None:
-            return "%s(%r)" % ('datetime.' + self.__class__.__name__,
-                               self._offset)
-        return "%s(%r, %r)" % ('datetime.' + self.__class__.__name__,
-                               self._offset, self._name)
-
-    def __str__(self):
-        return self.tzname(None)
-
-    def utcoffset(self, dt):
-        if isinstance(dt, datetime) or dt is None:
-            return self._offset
-        raise TypeError("utcoffset() argument must be a datetime instance"
-                        " or None")
-
-    def tzname(self, dt):
-        if isinstance(dt, datetime) or dt is None:
-            if self._name is None:
-                return self._name_from_offset(self._offset)
-            return self._name
-        raise TypeError("tzname() argument must be a datetime instance"
-                        " or None")
-
-    def dst(self, dt):
-        if isinstance(dt, datetime) or dt is None:
-            return None
-        raise TypeError("dst() argument must be a datetime instance"
-                        " or None")
-
-    def fromutc(self, dt):
-        if isinstance(dt, datetime):
-            if dt.tzinfo is not self:
-                raise ValueError("fromutc: dt.tzinfo "
-                                 "is not self")
-            return dt + self._offset
-        raise TypeError("fromutc() argument must be a datetime instance"
-                        " or None")
-
-    _maxoffset = timedelta(hours=23, minutes=59)
-    _minoffset = -_maxoffset
-
-    @staticmethod
-    def _name_from_offset(delta):
-        if delta < timedelta(0):
-            sign = '-'
-            delta = -delta
-        else:
-            sign = '+'
-        hours, rest = divmod(delta, timedelta(hours=1))
-        minutes = rest // timedelta(minutes=1)
-        return 'UTC{}{:02d}:{:02d}'.format(sign, hours, minutes)
-
-timezone.utc = timezone._create(timedelta(0))
-timezone.min = timezone._create(timezone._minoffset)
-timezone.max = timezone._create(timezone._maxoffset)
-_EPOCH = datetime(1970, 1, 1, tzinfo=timezone.utc)
-"""
-Some time zone algebra.  For a datetime x, let
-    x.n = x stripped of its timezone -- its naive time.
-    x.o = x.utcoffset(), and assuming that doesn't raise an exception or
-          return None
-    x.d = x.dst(), and assuming that doesn't raise an exception or
-          return None
-    x.s = x's standard offset, x.o - x.d
-
-Now some derived rules, where k is a duration (timedelta).
-
-1. x.o = x.s + x.d
-   This follows from the definition of x.s.
-
-2. If x and y have the same tzinfo member, x.s = y.s.
-   This is actually a requirement, an assumption we need to make about
-   sane tzinfo classes.
-
-3. The naive UTC time corresponding to x is x.n - x.o.
-   This is again a requirement for a sane tzinfo class.
-
-4. (x+k).s = x.s
-   This follows from #2, and that datimetimetz+timedelta preserves tzinfo.
-
-5. (x+k).n = x.n + k
-   Again follows from how arithmetic is defined.
-
-Now we can explain tz.fromutc(x).  Let's assume it's an interesting case
-(meaning that the various tzinfo methods exist, and don't blow up or return
-None when called).
-
-The function wants to return a datetime y with timezone tz, equivalent to x.
-x is already in UTC.
-
-By #3, we want
-
-    y.n - y.o = x.n                             [1]
-
-The algorithm starts by attaching tz to x.n, and calling that y.  So
-x.n = y.n at the start.  Then it wants to add a duration k to y, so that [1]
-becomes true; in effect, we want to solve [2] for k:
-
-   (y+k).n - (y+k).o = x.n                      [2]
-
-By #1, this is the same as
-
-   (y+k).n - ((y+k).s + (y+k).d) = x.n          [3]
-
-By #5, (y+k).n = y.n + k, which equals x.n + k because x.n=y.n at the start.
-Substituting that into [3],
-
-   x.n + k - (y+k).s - (y+k).d = x.n; the x.n terms cancel, leaving
-   k - (y+k).s - (y+k).d = 0; rearranging,
-   k = (y+k).s - (y+k).d; by #4, (y+k).s == y.s, so
-   k = y.s - (y+k).d
-
-On the RHS, (y+k).d can't be computed directly, but y.s can be, and we
-approximate k by ignoring the (y+k).d term at first.  Note that k can't be
-very large, since all offset-returning methods return a duration of magnitude
-less than 24 hours.  For that reason, if y is firmly in std time, (y+k).d must
-be 0, so ignoring it has no consequence then.
-
-In any case, the new value is
-
-    z = y + y.s                                 [4]
-
-It's helpful to step back at look at [4] from a higher level:  it's simply
-mapping from UTC to tz's standard time.
-
-At this point, if
-
-    z.n - z.o = x.n                             [5]
-
-we have an equivalent time, and are almost done.  The insecurity here is
-at the start of daylight time.  Picture US Eastern for concreteness.  The wall
-time jumps from 1:59 to 3:00, and wall hours of the form 2:MM don't make good
-sense then.  The docs ask that an Eastern tzinfo class consider such a time to
-be EDT (because it's "after 2"), which is a redundant spelling of 1:MM EST
-on the day DST starts.  We want to return the 1:MM EST spelling because that's
-the only spelling that makes sense on the local wall clock.
-
-In fact, if [5] holds at this point, we do have the standard-time spelling,
-but that takes a bit of proof.  We first prove a stronger result.  What's the
-difference between the LHS and RHS of [5]?  Let
-
-    diff = x.n - (z.n - z.o)                    [6]
-
-Now
-    z.n =                       by [4]
-    (y + y.s).n =               by #5
-    y.n + y.s =                 since y.n = x.n
-    x.n + y.s =                 since z and y are have the same tzinfo member,
-                                    y.s = z.s by #2
-    x.n + z.s
-
-Plugging that back into [6] gives
-
-    diff =
-    x.n - ((x.n + z.s) - z.o) =     expanding
-    x.n - x.n - z.s + z.o =         cancelling
-    - z.s + z.o =                   by #2
-    z.d
-
-So diff = z.d.
-
-If [5] is true now, diff = 0, so z.d = 0 too, and we have the standard-time
-spelling we wanted in the endcase described above.  We're done.  Contrarily,
-if z.d = 0, then we have a UTC equivalent, and are also done.
-
-If [5] is not true now, diff = z.d != 0, and z.d is the offset we need to
-add to z (in effect, z is in tz's standard time, and we need to shift the
-local clock into tz's daylight time).
-
-Let
-
-    z' = z + z.d = z + diff                     [7]
-
-and we can again ask whether
-
-    z'.n - z'.o = x.n                           [8]
-
-If so, we're done.  If not, the tzinfo class is insane, according to the
-assumptions we've made.  This also requires a bit of proof.  As before, let's
-compute the difference between the LHS and RHS of [8] (and skipping some of
-the justifications for the kinds of substitutions we've done several times
-already):
-
-    diff' = x.n - (z'.n - z'.o) =           replacing z'.n via [7]
-            x.n  - (z.n + diff - z'.o) =    replacing diff via [6]
-            x.n - (z.n + x.n - (z.n - z.o) - z'.o) =
-            x.n - z.n - x.n + z.n - z.o + z'.o =    cancel x.n
-            - z.n + z.n - z.o + z'.o =              cancel z.n
-            - z.o + z'.o =                      #1 twice
-            -z.s - z.d + z'.s + z'.d =          z and z' have same tzinfo
-            z'.d - z.d
-
-So z' is UTC-equivalent to x iff z'.d = z.d at this point.  If they are equal,
-we've found the UTC-equivalent so are done.  In fact, we stop with [7] and
-return z', not bothering to compute z'.d.
-
-How could z.d and z'd differ?  z' = z + z.d [7], so merely moving z' by
-a dst() offset, and starting *from* a time already in DST (we know z.d != 0),
-would have to change the result dst() returns:  we start in DST, and moving
-a little further into it takes us out of DST.
-
-There isn't a sane case where this can happen.  The closest it gets is at
-the end of DST, where there's an hour in UTC with no spelling in a hybrid
-tzinfo class.  In US Eastern, that's 5:MM UTC = 0:MM EST = 1:MM EDT.  During
-that hour, on an Eastern clock 1:MM is taken as being in standard time (6:MM
-UTC) because the docs insist on that, but 0:MM is taken as being in daylight
-time (4:MM UTC).  There is no local time mapping to 5:MM UTC.  The local
-clock jumps from 1:59 back to 1:00 again, and repeats the 1:MM hour in
-standard time.  Since that's what the local clock *does*, we want to map both
-UTC hours 5:MM and 6:MM to 1:MM Eastern.  The result is ambiguous
-in local time, but so it goes -- it's the way the local clock works.
-
-When x = 5:MM UTC is the input to this algorithm, x.o=0, y.o=-5 and y.d=0,
-so z=0:MM.  z.d=60 (minutes) then, so [5] doesn't hold and we keep going.
-z' = z + z.d = 1:MM then, and z'.d=0, and z'.d - z.d = -60 != 0 so [8]
-(correctly) concludes that z' is not UTC-equivalent to x.
-
-Because we know z.d said z was in daylight time (else [5] would have held and
-we would have stopped then), and we know z.d != z'.d (else [8] would have held
-and we have stopped then), and there are only 2 possible values dst() can
-return in Eastern, it follows that z'.d must be 0 (which it is in the example,
-but the reasoning doesn't depend on the example -- it depends on there being
-two possible dst() outcomes, one zero and the other non-zero).  Therefore
-z' must be in standard time, and is the spelling we want in this case.
-
-Note again that z' is not UTC-equivalent as far as the hybrid tzinfo class is
-concerned (because it takes z' as being in standard time rather than the
-daylight time we intend here), but returning it gives the real-life "local
-clock repeats an hour" behavior when mapping the "unspellable" UTC hour into
-tz.
-
-When the input is 6:MM, z=1:MM and z.d=0, and we stop at once, again with
-the 1:MM standard time spelling we want.
-
-So how can this break?  One of the assumptions must be violated.  Two
-possibilities:
-
-1) [2] effectively says that y.s is invariant across all y belong to a given
-   time zone.  This isn't true if, for political reasons or continental drift,
-   a region decides to change its base offset from UTC.
-
-2) There may be versions of "double daylight" time where the tail end of
-   the analysis gives up a step too early.  I haven't thought about that
-   enough to say.
-
-In any case, it's clear that the default fromutc() is strong enough to handle
-"almost all" time zones:  so long as the standard offset is invariant, it
-doesn't matter if daylight time transition points change from year to year, or
-if daylight time is skipped in some years; it doesn't matter how large or
-small dst() may get within its bounds; and it doesn't even matter if some
-perverse time zone returns a negative dst()).  So a breaking case must be
-pretty bizarre, and a tzinfo subclass can override fromutc() if it is.
-"""
-try:
-    from _datetime import *
-except ImportError:
-    pass
-else:
-    # Clean up unused names
-    del (_DAYNAMES, _DAYS_BEFORE_MONTH, _DAYS_IN_MONTH,
-         _DI100Y, _DI400Y, _DI4Y, _MAXORDINAL, _MONTHNAMES,
-         _build_struct_time, _call_tzinfo_method, _check_date_fields,
-         _check_time_fields, _check_tzinfo_arg, _check_tzname,
-         _check_utc_offset, _cmp, _cmperror, _date_class, _days_before_month,
-         _days_before_year, _days_in_month, _format_time, _is_leap,
-         _isoweek1monday, _math, _ord2ymd, _time, _time_class, _tzinfo_class,
-         _wrap_strftime, _ymd2ord)
-    # XXX Since import * above excludes names that start with _,
-    # docstring does not get overwritten. In the future, it may be
-    # appropriate to maintain a single module level docstring and
-    # remove the following line.
-    from _datetime import __doc__
diff --git a/lib/future/backports/email/__init__.py b/lib/future/backports/email/__init__.py
deleted file mode 100644
index f9523bc1..00000000
--- a/lib/future/backports/email/__init__.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright (C) 2001-2007 Python Software Foundation
-# Author: Barry Warsaw
-# Contact: email-sig@python.org
-
-"""
-Backport of the Python 3.3 email package for Python-Future.
-
-A package for parsing, handling, and generating email messages.
-"""
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-
-# Install the surrogate escape handler here because this is used by many
-# modules in the email package.
-from future.utils import surrogateescape
-surrogateescape.register_surrogateescape()
-# (Should this be done globally by ``future``?)
-
-
-__version__ = '5.1.0'
-
-__all__ = [
-    'base64mime',
-    'charset',
-    'encoders',
-    'errors',
-    'feedparser',
-    'generator',
-    'header',
-    'iterators',
-    'message',
-    'message_from_file',
-    'message_from_binary_file',
-    'message_from_string',
-    'message_from_bytes',
-    'mime',
-    'parser',
-    'quoprimime',
-    'utils',
-    ]
-
-
-
-# Some convenience routines.  Don't import Parser and Message as side-effects
-# of importing email since those cascadingly import most of the rest of the
-# email package.
-def message_from_string(s, *args, **kws):
-    """Parse a string into a Message object model.
-
-    Optional _class and strict are passed to the Parser constructor.
-    """
-    from future.backports.email.parser import Parser
-    return Parser(*args, **kws).parsestr(s)
-
-def message_from_bytes(s, *args, **kws):
-    """Parse a bytes string into a Message object model.
-
-    Optional _class and strict are passed to the Parser constructor.
-    """
-    from future.backports.email.parser import BytesParser
-    return BytesParser(*args, **kws).parsebytes(s)
-
-def message_from_file(fp, *args, **kws):
-    """Read a file and parse its contents into a Message object model.
-
-    Optional _class and strict are passed to the Parser constructor.
-    """
-    from future.backports.email.parser import Parser
-    return Parser(*args, **kws).parse(fp)
-
-def message_from_binary_file(fp, *args, **kws):
-    """Read a binary file and parse its contents into a Message object model.
-
-    Optional _class and strict are passed to the Parser constructor.
-    """
-    from future.backports.email.parser import BytesParser
-    return BytesParser(*args, **kws).parse(fp)
diff --git a/lib/future/backports/email/_encoded_words.py b/lib/future/backports/email/_encoded_words.py
deleted file mode 100644
index 7c4a5291..00000000
--- a/lib/future/backports/email/_encoded_words.py
+++ /dev/null
@@ -1,232 +0,0 @@
-""" Routines for manipulating RFC2047 encoded words.
-
-This is currently a package-private API, but will be considered for promotion
-to a public API if there is demand.
-
-"""
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from future.builtins import bytes
-from future.builtins import chr
-from future.builtins import int
-from future.builtins import str
-
-# An ecoded word looks like this:
-#
-#        =?charset[*lang]?cte?encoded_string?=
-#
-# for more information about charset see the charset module.  Here it is one
-# of the preferred MIME charset names (hopefully; you never know when parsing).
-# cte (Content Transfer Encoding) is either 'q' or 'b' (ignoring case).  In
-# theory other letters could be used for other encodings, but in practice this
-# (almost?) never happens.  There could be a public API for adding entries
-# to the CTE tables, but YAGNI for now.  'q' is Quoted Printable, 'b' is
-# Base64.  The meaning of encoded_string should be obvious.  'lang' is optional
-# as indicated by the brackets (they are not part of the syntax) but is almost
-# never encountered in practice.
-#
-# The general interface for a CTE decoder is that it takes the encoded_string
-# as its argument, and returns a tuple (cte_decoded_string, defects).  The
-# cte_decoded_string is the original binary that was encoded using the
-# specified cte.  'defects' is a list of MessageDefect instances indicating any
-# problems encountered during conversion.  'charset' and 'lang' are the
-# corresponding strings extracted from the EW, case preserved.
-#
-# The general interface for a CTE encoder is that it takes a binary sequence
-# as input and returns the cte_encoded_string, which is an ascii-only string.
-#
-# Each decoder must also supply a length function that takes the binary
-# sequence as its argument and returns the length of the resulting encoded
-# string.
-#
-# The main API functions for the module are decode, which calls the decoder
-# referenced by the cte specifier, and encode, which adds the appropriate
-# RFC 2047 "chrome" to the encoded string, and can optionally automatically
-# select the shortest possible encoding.  See their docstrings below for
-# details.
-
-import re
-import base64
-import binascii
-import functools
-from string import ascii_letters, digits
-from future.backports.email import errors
-
-__all__ = ['decode_q',
-           'encode_q',
-           'decode_b',
-           'encode_b',
-           'len_q',
-           'len_b',
-           'decode',
-           'encode',
-           ]
-
-#
-# Quoted Printable
-#
-
-# regex based decoder.
-_q_byte_subber = functools.partial(re.compile(br'=([a-fA-F0-9]{2})').sub,
-        lambda m: bytes([int(m.group(1), 16)]))
-
-def decode_q(encoded):
-    encoded = bytes(encoded.replace(b'_', b' '))
-    return _q_byte_subber(encoded), []
-
-
-# dict mapping bytes to their encoded form
-class _QByteMap(dict):
-
-    safe = bytes(b'-!*+/' + ascii_letters.encode('ascii') + digits.encode('ascii'))
-
-    def __missing__(self, key):
-        if key in self.safe:
-            self[key] = chr(key)
-        else:
-            self[key] = "={:02X}".format(key)
-        return self[key]
-
-_q_byte_map = _QByteMap()
-
-# In headers spaces are mapped to '_'.
-_q_byte_map[ord(' ')] = '_'
-
-def encode_q(bstring):
-    return str(''.join(_q_byte_map[x] for x in bytes(bstring)))
-
-def len_q(bstring):
-    return sum(len(_q_byte_map[x]) for x in bytes(bstring))
-
-
-#
-# Base64
-#
-
-def decode_b(encoded):
-    defects = []
-    pad_err = len(encoded) % 4
-    if pad_err:
-        defects.append(errors.InvalidBase64PaddingDefect())
-        padded_encoded = encoded + b'==='[:4-pad_err]
-    else:
-        padded_encoded = encoded
-    try:
-        # The validate kwarg to b64decode is not supported in Py2.x
-        if not re.match(b'^[A-Za-z0-9+/]*={0,2}$', padded_encoded):
-            raise binascii.Error('Non-base64 digit found')
-        return base64.b64decode(padded_encoded), defects
-    except binascii.Error:
-        # Since we had correct padding, this must an invalid char error.
-        defects = [errors.InvalidBase64CharactersDefect()]
-        # The non-alphabet characters are ignored as far as padding
-        # goes, but we don't know how many there are.  So we'll just
-        # try various padding lengths until something works.
-        for i in 0, 1, 2, 3:
-            try:
-                return base64.b64decode(encoded+b'='*i), defects
-            except (binascii.Error, TypeError):    # Py2 raises a TypeError
-                if i==0:
-                    defects.append(errors.InvalidBase64PaddingDefect())
-        else:
-            # This should never happen.
-            raise AssertionError("unexpected binascii.Error")
-
-def encode_b(bstring):
-    return base64.b64encode(bstring).decode('ascii')
-
-def len_b(bstring):
-    groups_of_3, leftover = divmod(len(bstring), 3)
-    # 4 bytes out for each 3 bytes (or nonzero fraction thereof) in.
-    return groups_of_3 * 4 + (4 if leftover else 0)
-
-
-_cte_decoders = {
-    'q': decode_q,
-    'b': decode_b,
-    }
-
-def decode(ew):
-    """Decode encoded word and return (string, charset, lang, defects) tuple.
-
-    An RFC 2047/2243 encoded word has the form:
-
-        =?charset*lang?cte?encoded_string?=
-
-    where '*lang' may be omitted but the other parts may not be.
-
-    This function expects exactly such a string (that is, it does not check the
-    syntax and may raise errors if the string is not well formed), and returns
-    the encoded_string decoded first from its Content Transfer Encoding and
-    then from the resulting bytes into unicode using the specified charset.  If
-    the cte-decoded string does not successfully decode using the specified
-    character set, a defect is added to the defects list and the unknown octets
-    are replaced by the unicode 'unknown' character \uFDFF.
-
-    The specified charset and language are returned.  The default for language,
-    which is rarely if ever encountered, is the empty string.
-
-    """
-    _, charset, cte, cte_string, _ = str(ew).split('?')
-    charset, _, lang = charset.partition('*')
-    cte = cte.lower()
-    # Recover the original bytes and do CTE decoding.
-    bstring = cte_string.encode('ascii', 'surrogateescape')
-    bstring, defects = _cte_decoders[cte](bstring)
-    # Turn the CTE decoded bytes into unicode.
-    try:
-        string = bstring.decode(charset)
-    except UnicodeError:
-        defects.append(errors.UndecodableBytesDefect("Encoded word "
-            "contains bytes not decodable using {} charset".format(charset)))
-        string = bstring.decode(charset, 'surrogateescape')
-    except LookupError:
-        string = bstring.decode('ascii', 'surrogateescape')
-        if charset.lower() != 'unknown-8bit':
-            defects.append(errors.CharsetError("Unknown charset {} "
-                "in encoded word; decoded as unknown bytes".format(charset)))
-    return string, charset, lang, defects
-
-
-_cte_encoders = {
-    'q': encode_q,
-    'b': encode_b,
-    }
-
-_cte_encode_length = {
-    'q': len_q,
-    'b': len_b,
-    }
-
-def encode(string, charset='utf-8', encoding=None, lang=''):
-    """Encode string using the CTE encoding that produces the shorter result.
-
-    Produces an RFC 2047/2243 encoded word of the form:
-
-        =?charset*lang?cte?encoded_string?=
-
-    where '*lang' is omitted unless the 'lang' parameter is given a value.
-    Optional argument charset (defaults to utf-8) specifies the charset to use
-    to encode the string to binary before CTE encoding it.  Optional argument
-    'encoding' is the cte specifier for the encoding that should be used ('q'
-    or 'b'); if it is None (the default) the encoding which produces the
-    shortest encoded sequence is used, except that 'q' is preferred if it is up
-    to five characters longer.  Optional argument 'lang' (default '') gives the
-    RFC 2243 language string to specify in the encoded word.
-
-    """
-    string = str(string)
-    if charset == 'unknown-8bit':
-        bstring = string.encode('ascii', 'surrogateescape')
-    else:
-        bstring = string.encode(charset)
-    if encoding is None:
-        qlen = _cte_encode_length['q'](bstring)
-        blen = _cte_encode_length['b'](bstring)
-        # Bias toward q.  5 is arbitrary.
-        encoding = 'q' if qlen - blen < 5 else 'b'
-    encoded = _cte_encoders[encoding](bstring)
-    if lang:
-        lang = '*' + lang
-    return "=?{0}{1}?{2}?{3}?=".format(charset, lang, encoding, encoded)
diff --git a/lib/future/backports/email/_header_value_parser.py b/lib/future/backports/email/_header_value_parser.py
deleted file mode 100644
index 59b1b318..00000000
--- a/lib/future/backports/email/_header_value_parser.py
+++ /dev/null
@@ -1,2965 +0,0 @@
-"""Header value parser implementing various email-related RFC parsing rules.
-
-The parsing methods defined in this module implement various email related
-parsing rules.  Principal among them is RFC 5322, which is the followon
-to RFC 2822 and primarily a clarification of the former.  It also implements
-RFC 2047 encoded word decoding.
-
-RFC 5322 goes to considerable trouble to maintain backward compatibility with
-RFC 822 in the parse phase, while cleaning up the structure on the generation
-phase.  This parser supports correct RFC 5322 generation by tagging white space
-as folding white space only when folding is allowed in the non-obsolete rule
-sets.  Actually, the parser is even more generous when accepting input than RFC
-5322 mandates, following the spirit of Postel's Law, which RFC 5322 encourages.
-Where possible deviations from the standard are annotated on the 'defects'
-attribute of tokens that deviate.
-
-The general structure of the parser follows RFC 5322, and uses its terminology
-where there is a direct correspondence.  Where the implementation requires a
-somewhat different structure than that used by the formal grammar, new terms
-that mimic the closest existing terms are used.  Thus, it really helps to have
-a copy of RFC 5322 handy when studying this code.
-
-Input to the parser is a string that has already been unfolded according to
-RFC 5322 rules.  According to the RFC this unfolding is the very first step, and
-this parser leaves the unfolding step to a higher level message parser, which
-will have already detected the line breaks that need unfolding while
-determining the beginning and end of each header.
-
-The output of the parser is a TokenList object, which is a list subclass.  A
-TokenList is a recursive data structure.  The terminal nodes of the structure
-are Terminal objects, which are subclasses of str.  These do not correspond
-directly to terminal objects in the formal grammar, but are instead more
-practical higher level combinations of true terminals.
-
-All TokenList and Terminal objects have a 'value' attribute, which produces the
-semantically meaningful value of that part of the parse subtree.  The value of
-all whitespace tokens (no matter how many sub-tokens they may contain) is a
-single space, as per the RFC rules.  This includes 'CFWS', which is herein
-included in the general class of whitespace tokens.  There is one exception to
-the rule that whitespace tokens are collapsed into single spaces in values: in
-the value of a 'bare-quoted-string' (a quoted-string with no leading or
-trailing whitespace), any whitespace that appeared between the quotation marks
-is preserved in the returned value.  Note that in all Terminal strings quoted
-pairs are turned into their unquoted values.
-
-All TokenList and Terminal objects also have a string value, which attempts to
-be a "canonical" representation of the RFC-compliant form of the substring that
-produced the parsed subtree, including minimal use of quoted pair quoting.
-Whitespace runs are not collapsed.
-
-Comment tokens also have a 'content' attribute providing the string found
-between the parens (including any nested comments) with whitespace preserved.
-
-All TokenList and Terminal objects have a 'defects' attribute which is a
-possibly empty list all of the defects found while creating the token.  Defects
-may appear on any token in the tree, and a composite list of all defects in the
-subtree is available through the 'all_defects' attribute of any node.  (For
-Terminal notes x.defects == x.all_defects.)
-
-Each object in a parse tree is called a 'token', and each has a 'token_type'
-attribute that gives the name from the RFC 5322 grammar that it represents.
-Not all RFC 5322 nodes are produced, and there is one non-RFC 5322 node that
-may be produced: 'ptext'.  A 'ptext' is a string of printable ascii characters.
-It is returned in place of lists of (ctext/quoted-pair) and
-(qtext/quoted-pair).
-
-XXX: provide complete list of token types.
-"""
-from __future__ import print_function
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from future.builtins import int, range, str, super, list
-
-import re
-from collections import namedtuple, OrderedDict
-
-from future.backports.urllib.parse import (unquote, unquote_to_bytes)
-from future.backports.email import _encoded_words as _ew
-from future.backports.email import errors
-from future.backports.email import utils
-
-#
-# Useful constants and functions
-#
-
-WSP = set(' \t')
-CFWS_LEADER = WSP | set('(')
-SPECIALS = set(r'()<>@,:;.\"[]')
-ATOM_ENDS = SPECIALS | WSP
-DOT_ATOM_ENDS = ATOM_ENDS - set('.')
-# '.', '"', and '(' do not end phrases in order to support obs-phrase
-PHRASE_ENDS = SPECIALS - set('."(')
-TSPECIALS = (SPECIALS | set('/?=')) - set('.')
-TOKEN_ENDS = TSPECIALS | WSP
-ASPECIALS = TSPECIALS | set("*'%")
-ATTRIBUTE_ENDS = ASPECIALS | WSP
-EXTENDED_ATTRIBUTE_ENDS = ATTRIBUTE_ENDS - set('%')
-
-def quote_string(value):
-    return '"'+str(value).replace('\\', '\\\\').replace('"', r'\"')+'"'
-
-#
-# Accumulator for header folding
-#
-
-class _Folded(object):
-
-    def __init__(self, maxlen, policy):
-        self.maxlen = maxlen
-        self.policy = policy
-        self.lastlen = 0
-        self.stickyspace = None
-        self.firstline = True
-        self.done = []
-        self.current = list()    # uses l.clear()
-
-    def newline(self):
-        self.done.extend(self.current)
-        self.done.append(self.policy.linesep)
-        self.current.clear()
-        self.lastlen = 0
-
-    def finalize(self):
-        if self.current:
-            self.newline()
-
-    def __str__(self):
-        return ''.join(self.done)
-
-    def append(self, stoken):
-        self.current.append(stoken)
-
-    def append_if_fits(self, token, stoken=None):
-        if stoken is None:
-            stoken = str(token)
-        l = len(stoken)
-        if self.stickyspace is not None:
-            stickyspace_len = len(self.stickyspace)
-            if self.lastlen + stickyspace_len + l <= self.maxlen:
-                self.current.append(self.stickyspace)
-                self.lastlen += stickyspace_len
-                self.current.append(stoken)
-                self.lastlen += l
-                self.stickyspace = None
-                self.firstline = False
-                return True
-            if token.has_fws:
-                ws = token.pop_leading_fws()
-                if ws is not None:
-                    self.stickyspace += str(ws)
-                    stickyspace_len += len(ws)
-                token._fold(self)
-                return True
-            if stickyspace_len and l + 1 <= self.maxlen:
-                margin = self.maxlen - l
-                if 0 < margin < stickyspace_len:
-                    trim = stickyspace_len - margin
-                    self.current.append(self.stickyspace[:trim])
-                    self.stickyspace = self.stickyspace[trim:]
-                    stickyspace_len = trim
-                self.newline()
-                self.current.append(self.stickyspace)
-                self.current.append(stoken)
-                self.lastlen = l + stickyspace_len
-                self.stickyspace = None
-                self.firstline = False
-                return True
-            if not self.firstline:
-                self.newline()
-            self.current.append(self.stickyspace)
-            self.current.append(stoken)
-            self.stickyspace = None
-            self.firstline = False
-            return True
-        if self.lastlen + l <= self.maxlen:
-            self.current.append(stoken)
-            self.lastlen += l
-            return True
-        if l < self.maxlen:
-            self.newline()
-            self.current.append(stoken)
-            self.lastlen = l
-            return True
-        return False
-
-#
-# TokenList and its subclasses
-#
-
-class TokenList(list):
-
-    token_type = None
-
-    def __init__(self, *args, **kw):
-        super(TokenList, self).__init__(*args, **kw)
-        self.defects = []
-
-    def __str__(self):
-        return ''.join(str(x) for x in self)
-
-    def __repr__(self):
-        return '{}({})'.format(self.__class__.__name__,
-                               super(TokenList, self).__repr__())
-
-    @property
-    def value(self):
-        return ''.join(x.value for x in self if x.value)
-
-    @property
-    def all_defects(self):
-        return sum((x.all_defects for x in self), self.defects)
-
-    #
-    # Folding API
-    #
-    # parts():
-    #
-    # return a list of objects that constitute the "higher level syntactic
-    # objects" specified by the RFC as the best places to fold a header line.
-    # The returned objects must include leading folding white space, even if
-    # this means mutating the underlying parse tree of the object.  Each object
-    # is only responsible for returning *its* parts, and should not drill down
-    # to any lower level except as required to meet the leading folding white
-    # space constraint.
-    #
-    # _fold(folded):
-    #
-    #   folded: the result accumulator.  This is an instance of _Folded.
-    #       (XXX: I haven't finished factoring this out yet, the folding code
-    #       pretty much uses this as a state object.) When the folded.current
-    #       contains as much text as will fit, the _fold method should call
-    #       folded.newline.
-    #  folded.lastlen: the current length of the test stored in folded.current.
-    #  folded.maxlen: The maximum number of characters that may appear on a
-    #       folded line.  Differs from the policy setting in that "no limit" is
-    #       represented by +inf, which means it can be used in the trivially
-    #       logical fashion in comparisons.
-    #
-    # Currently no subclasses implement parts, and I think this will remain
-    # true.  A subclass only needs to implement _fold when the generic version
-    # isn't sufficient.  _fold will need to be implemented primarily when it is
-    # possible for encoded words to appear in the specialized token-list, since
-    # there is no generic algorithm that can know where exactly the encoded
-    # words are allowed.  A _fold implementation is responsible for filling
-    # lines in the same general way that the top level _fold does. It may, and
-    # should, call the _fold method of sub-objects in a similar fashion to that
-    # of the top level _fold.
-    #
-    # XXX: I'm hoping it will be possible to factor the existing code further
-    # to reduce redundancy and make the logic clearer.
-
-    @property
-    def parts(self):
-        klass = self.__class__
-        this = list()
-        for token in self:
-            if token.startswith_fws():
-                if this:
-                    yield this[0] if len(this)==1 else klass(this)
-                    this.clear()
-            end_ws = token.pop_trailing_ws()
-            this.append(token)
-            if end_ws:
-                yield klass(this)
-                this = [end_ws]
-        if this:
-            yield this[0] if len(this)==1 else klass(this)
-
-    def startswith_fws(self):
-        return self[0].startswith_fws()
-
-    def pop_leading_fws(self):
-        if self[0].token_type == 'fws':
-            return self.pop(0)
-        return self[0].pop_leading_fws()
-
-    def pop_trailing_ws(self):
-        if self[-1].token_type == 'cfws':
-            return self.pop(-1)
-        return self[-1].pop_trailing_ws()
-
-    @property
-    def has_fws(self):
-        for part in self:
-            if part.has_fws:
-                return True
-        return False
-
-    def has_leading_comment(self):
-        return self[0].has_leading_comment()
-
-    @property
-    def comments(self):
-        comments = []
-        for token in self:
-            comments.extend(token.comments)
-        return comments
-
-    def fold(self, **_3to2kwargs):
-        # max_line_length 0/None means no limit, ie: infinitely long.
-        policy = _3to2kwargs['policy']; del _3to2kwargs['policy']
-        maxlen = policy.max_line_length or float("+inf")
-        folded = _Folded(maxlen, policy)
-        self._fold(folded)
-        folded.finalize()
-        return str(folded)
-
-    def as_encoded_word(self, charset):
-        # This works only for things returned by 'parts', which include
-        # the leading fws, if any, that should be used.
-        res = []
-        ws = self.pop_leading_fws()
-        if ws:
-            res.append(ws)
-        trailer = self.pop(-1) if self[-1].token_type=='fws' else ''
-        res.append(_ew.encode(str(self), charset))
-        res.append(trailer)
-        return ''.join(res)
-
-    def cte_encode(self, charset, policy):
-        res = []
-        for part in self:
-            res.append(part.cte_encode(charset, policy))
-        return ''.join(res)
-
-    def _fold(self, folded):
-        for part in self.parts:
-            tstr = str(part)
-            tlen = len(tstr)
-            try:
-                str(part).encode('us-ascii')
-            except UnicodeEncodeError:
-                if any(isinstance(x, errors.UndecodableBytesDefect)
-                        for x in part.all_defects):
-                    charset = 'unknown-8bit'
-                else:
-                    # XXX: this should be a policy setting
-                    charset = 'utf-8'
-                tstr = part.cte_encode(charset, folded.policy)
-                tlen = len(tstr)
-            if folded.append_if_fits(part, tstr):
-                continue
-            # Peel off the leading whitespace if any and make it sticky, to
-            # avoid infinite recursion.
-            ws = part.pop_leading_fws()
-            if ws is not None:
-                # Peel off the leading whitespace and make it sticky, to
-                # avoid infinite recursion.
-                folded.stickyspace = str(part.pop(0))
-                if folded.append_if_fits(part):
-                    continue
-            if part.has_fws:
-                part._fold(folded)
-                continue
-            # There are no fold points in this one; it is too long for a single
-            # line and can't be split...we just have to put it on its own line.
-            folded.append(tstr)
-            folded.newline()
-
-    def pprint(self, indent=''):
-        print('\n'.join(self._pp(indent='')))
-
-    def ppstr(self, indent=''):
-        return '\n'.join(self._pp(indent=''))
-
-    def _pp(self, indent=''):
-        yield '{}{}/{}('.format(
-            indent,
-            self.__class__.__name__,
-            self.token_type)
-        for token in self:
-            if not hasattr(token, '_pp'):
-                yield (indent + '    !! invalid element in token '
-                                        'list: {!r}'.format(token))
-            else:
-                for line in token._pp(indent+'    '):
-                    yield line
-        if self.defects:
-            extra = ' Defects: {}'.format(self.defects)
-        else:
-            extra = ''
-        yield '{}){}'.format(indent, extra)
-
-
-class WhiteSpaceTokenList(TokenList):
-
-    @property
-    def value(self):
-        return ' '
-
-    @property
-    def comments(self):
-        return [x.content for x in self if x.token_type=='comment']
-
-
-class UnstructuredTokenList(TokenList):
-
-    token_type = 'unstructured'
-
-    def _fold(self, folded):
-        if any(x.token_type=='encoded-word' for x in self):
-            return self._fold_encoded(folded)
-        # Here we can have either a pure ASCII string that may or may not
-        # have surrogateescape encoded bytes, or a unicode string.
-        last_ew = None
-        for part in self.parts:
-            tstr = str(part)
-            is_ew = False
-            try:
-                str(part).encode('us-ascii')
-            except UnicodeEncodeError:
-                if any(isinstance(x, errors.UndecodableBytesDefect)
-                       for x in part.all_defects):
-                    charset = 'unknown-8bit'
-                else:
-                    charset = 'utf-8'
-                if last_ew is not None:
-                    # We've already done an EW, combine this one with it
-                    # if there's room.
-                    chunk = get_unstructured(
-                        ''.join(folded.current[last_ew:]+[tstr])).as_encoded_word(charset)
-                    oldlastlen = sum(len(x) for x in folded.current[:last_ew])
-                    schunk = str(chunk)
-                    lchunk = len(schunk)
-                    if oldlastlen + lchunk <= folded.maxlen:
-                        del folded.current[last_ew:]
-                        folded.append(schunk)
-                        folded.lastlen = oldlastlen + lchunk
-                        continue
-                tstr = part.as_encoded_word(charset)
-                is_ew = True
-            if folded.append_if_fits(part, tstr):
-                if is_ew:
-                    last_ew = len(folded.current) - 1
-                continue
-            if is_ew or last_ew:
-                # It's too big to fit on the line, but since we've
-                # got encoded words we can use encoded word folding.
-                part._fold_as_ew(folded)
-                continue
-            # Peel off the leading whitespace if any and make it sticky, to
-            # avoid infinite recursion.
-            ws = part.pop_leading_fws()
-            if ws is not None:
-                folded.stickyspace = str(ws)
-                if folded.append_if_fits(part):
-                    continue
-            if part.has_fws:
-                part.fold(folded)
-                continue
-            # It can't be split...we just have to put it on its own line.
-            folded.append(tstr)
-            folded.newline()
-            last_ew = None
-
-    def cte_encode(self, charset, policy):
-        res = []
-        last_ew = None
-        for part in self:
-            spart = str(part)
-            try:
-                spart.encode('us-ascii')
-                res.append(spart)
-            except UnicodeEncodeError:
-                if last_ew is None:
-                    res.append(part.cte_encode(charset, policy))
-                    last_ew = len(res)
-                else:
-                    tl = get_unstructured(''.join(res[last_ew:] + [spart]))
-                    res.append(tl.as_encoded_word())
-        return ''.join(res)
-
-
-class Phrase(TokenList):
-
-    token_type = 'phrase'
-
-    def _fold(self, folded):
-        # As with Unstructured, we can have pure ASCII with or without
-        # surrogateescape encoded bytes, or we could have unicode.  But this
-        # case is more complicated, since we have to deal with the various
-        # sub-token types and how they can be composed in the face of
-        # unicode-that-needs-CTE-encoding, and the fact that if a token a
-        # comment that becomes a barrier across which we can't compose encoded
-        # words.
-        last_ew = None
-        for part in self.parts:
-            tstr = str(part)
-            tlen = len(tstr)
-            has_ew = False
-            try:
-                str(part).encode('us-ascii')
-            except UnicodeEncodeError:
-                if any(isinstance(x, errors.UndecodableBytesDefect)
-                        for x in part.all_defects):
-                    charset = 'unknown-8bit'
-                else:
-                    charset = 'utf-8'
-                if last_ew is not None and not part.has_leading_comment():
-                    # We've already done an EW, let's see if we can combine
-                    # this one with it.  The last_ew logic ensures that all we
-                    # have at this point is atoms, no comments or quoted
-                    # strings.  So we can treat the text between the last
-                    # encoded word and the content of this token as
-                    # unstructured text, and things will work correctly.  But
-                    # we have to strip off any trailing comment on this token
-                    # first, and if it is a quoted string we have to pull out
-                    # the content (we're encoding it, so it no longer needs to
-                    # be quoted).
-                    if part[-1].token_type == 'cfws' and part.comments:
-                        remainder = part.pop(-1)
-                    else:
-                        remainder = ''
-                    for i, token in enumerate(part):
-                        if token.token_type == 'bare-quoted-string':
-                            part[i] = UnstructuredTokenList(token[:])
-                    chunk = get_unstructured(
-                        ''.join(folded.current[last_ew:]+[tstr])).as_encoded_word(charset)
-                    schunk = str(chunk)
-                    lchunk = len(schunk)
-                    if last_ew + lchunk <= folded.maxlen:
-                        del folded.current[last_ew:]
-                        folded.append(schunk)
-                        folded.lastlen = sum(len(x) for x in folded.current)
-                        continue
-                tstr = part.as_encoded_word(charset)
-                tlen = len(tstr)
-                has_ew = True
-            if folded.append_if_fits(part, tstr):
-                if has_ew and not part.comments:
-                    last_ew = len(folded.current) - 1
-                elif part.comments or part.token_type == 'quoted-string':
-                    # If a comment is involved we can't combine EWs.  And if a
-                    # quoted string is involved, it's not worth the effort to
-                    # try to combine them.
-                    last_ew = None
-                continue
-            part._fold(folded)
-
-    def cte_encode(self, charset, policy):
-        res = []
-        last_ew = None
-        is_ew = False
-        for part in self:
-            spart = str(part)
-            try:
-                spart.encode('us-ascii')
-                res.append(spart)
-            except UnicodeEncodeError:
-                is_ew = True
-                if last_ew is None:
-                    if not part.comments:
-                        last_ew = len(res)
-                    res.append(part.cte_encode(charset, policy))
-                elif not part.has_leading_comment():
-                    if part[-1].token_type == 'cfws' and part.comments:
-                        remainder = part.pop(-1)
-                    else:
-                        remainder = ''
-                    for i, token in enumerate(part):
-                        if token.token_type == 'bare-quoted-string':
-                            part[i] = UnstructuredTokenList(token[:])
-                    tl = get_unstructured(''.join(res[last_ew:] + [spart]))
-                    res[last_ew:] = [tl.as_encoded_word(charset)]
-            if part.comments or (not is_ew and part.token_type == 'quoted-string'):
-                last_ew = None
-        return ''.join(res)
-
-class Word(TokenList):
-
-    token_type = 'word'
-
-
-class CFWSList(WhiteSpaceTokenList):
-
-    token_type = 'cfws'
-
-    def has_leading_comment(self):
-        return bool(self.comments)
-
-
-class Atom(TokenList):
-
-    token_type = 'atom'
-
-
-class Token(TokenList):
-
-    token_type = 'token'
-
-
-class EncodedWord(TokenList):
-
-    token_type = 'encoded-word'
-    cte = None
-    charset = None
-    lang = None
-
-    @property
-    def encoded(self):
-        if self.cte is not None:
-            return self.cte
-        _ew.encode(str(self), self.charset)
-
-
-
-class QuotedString(TokenList):
-
-    token_type = 'quoted-string'
-
-    @property
-    def content(self):
-        for x in self:
-            if x.token_type == 'bare-quoted-string':
-                return x.value
-
-    @property
-    def quoted_value(self):
-        res = []
-        for x in self:
-            if x.token_type == 'bare-quoted-string':
-                res.append(str(x))
-            else:
-                res.append(x.value)
-        return ''.join(res)
-
-    @property
-    def stripped_value(self):
-        for token in self:
-            if token.token_type == 'bare-quoted-string':
-                return token.value
-
-
-class BareQuotedString(QuotedString):
-
-    token_type = 'bare-quoted-string'
-
-    def __str__(self):
-        return quote_string(''.join(str(x) for x in self))
-
-    @property
-    def value(self):
-        return ''.join(str(x) for x in self)
-
-
-class Comment(WhiteSpaceTokenList):
-
-    token_type = 'comment'
-
-    def __str__(self):
-        return ''.join(sum([
-                            ["("],
-                            [self.quote(x) for x in self],
-                            [")"],
-                            ], []))
-
-    def quote(self, value):
-        if value.token_type == 'comment':
-            return str(value)
-        return str(value).replace('\\', '\\\\').replace(
-                                  '(', '\(').replace(
-                                  ')', '\)')
-
-    @property
-    def content(self):
-        return ''.join(str(x) for x in self)
-
-    @property
-    def comments(self):
-        return [self.content]
-
-class AddressList(TokenList):
-
-    token_type = 'address-list'
-
-    @property
-    def addresses(self):
-        return [x for x in self if x.token_type=='address']
-
-    @property
-    def mailboxes(self):
-        return sum((x.mailboxes
-                    for x in self if x.token_type=='address'), [])
-
-    @property
-    def all_mailboxes(self):
-        return sum((x.all_mailboxes
-                    for x in self if x.token_type=='address'), [])
-
-
-class Address(TokenList):
-
-    token_type = 'address'
-
-    @property
-    def display_name(self):
-        if self[0].token_type == 'group':
-            return self[0].display_name
-
-    @property
-    def mailboxes(self):
-        if self[0].token_type == 'mailbox':
-            return [self[0]]
-        elif self[0].token_type == 'invalid-mailbox':
-            return []
-        return self[0].mailboxes
-
-    @property
-    def all_mailboxes(self):
-        if self[0].token_type == 'mailbox':
-            return [self[0]]
-        elif self[0].token_type == 'invalid-mailbox':
-            return [self[0]]
-        return self[0].all_mailboxes
-
-class MailboxList(TokenList):
-
-    token_type = 'mailbox-list'
-
-    @property
-    def mailboxes(self):
-        return [x for x in self if x.token_type=='mailbox']
-
-    @property
-    def all_mailboxes(self):
-        return [x for x in self
-            if x.token_type in ('mailbox', 'invalid-mailbox')]
-
-
-class GroupList(TokenList):
-
-    token_type = 'group-list'
-
-    @property
-    def mailboxes(self):
-        if not self or self[0].token_type != 'mailbox-list':
-            return []
-        return self[0].mailboxes
-
-    @property
-    def all_mailboxes(self):
-        if not self or self[0].token_type != 'mailbox-list':
-            return []
-        return self[0].all_mailboxes
-
-
-class Group(TokenList):
-
-    token_type = "group"
-
-    @property
-    def mailboxes(self):
-        if self[2].token_type != 'group-list':
-            return []
-        return self[2].mailboxes
-
-    @property
-    def all_mailboxes(self):
-        if self[2].token_type != 'group-list':
-            return []
-        return self[2].all_mailboxes
-
-    @property
-    def display_name(self):
-        return self[0].display_name
-
-
-class NameAddr(TokenList):
-
-    token_type = 'name-addr'
-
-    @property
-    def display_name(self):
-        if len(self) == 1:
-            return None
-        return self[0].display_name
-
-    @property
-    def local_part(self):
-        return self[-1].local_part
-
-    @property
-    def domain(self):
-        return self[-1].domain
-
-    @property
-    def route(self):
-        return self[-1].route
-
-    @property
-    def addr_spec(self):
-        return self[-1].addr_spec
-
-
-class AngleAddr(TokenList):
-
-    token_type = 'angle-addr'
-
-    @property
-    def local_part(self):
-        for x in self:
-            if x.token_type == 'addr-spec':
-                return x.local_part
-
-    @property
-    def domain(self):
-        for x in self:
-            if x.token_type == 'addr-spec':
-                return x.domain
-
-    @property
-    def route(self):
-        for x in self:
-            if x.token_type == 'obs-route':
-                return x.domains
-
-    @property
-    def addr_spec(self):
-        for x in self:
-            if x.token_type == 'addr-spec':
-                return x.addr_spec
-        else:
-            return '<>'
-
-
-class ObsRoute(TokenList):
-
-    token_type = 'obs-route'
-
-    @property
-    def domains(self):
-        return [x.domain for x in self if x.token_type == 'domain']
-
-
-class Mailbox(TokenList):
-
-    token_type = 'mailbox'
-
-    @property
-    def display_name(self):
-        if self[0].token_type == 'name-addr':
-            return self[0].display_name
-
-    @property
-    def local_part(self):
-        return self[0].local_part
-
-    @property
-    def domain(self):
-        return self[0].domain
-
-    @property
-    def route(self):
-        if self[0].token_type == 'name-addr':
-            return self[0].route
-
-    @property
-    def addr_spec(self):
-        return self[0].addr_spec
-
-
-class InvalidMailbox(TokenList):
-
-    token_type = 'invalid-mailbox'
-
-    @property
-    def display_name(self):
-        return None
-
-    local_part = domain = route = addr_spec = display_name
-
-
-class Domain(TokenList):
-
-    token_type = 'domain'
-
-    @property
-    def domain(self):
-        return ''.join(super(Domain, self).value.split())
-
-
-class DotAtom(TokenList):
-
-    token_type = 'dot-atom'
-
-
-class DotAtomText(TokenList):
-
-    token_type = 'dot-atom-text'
-
-
-class AddrSpec(TokenList):
-
-    token_type = 'addr-spec'
-
-    @property
-    def local_part(self):
-        return self[0].local_part
-
-    @property
-    def domain(self):
-        if len(self) < 3:
-            return None
-        return self[-1].domain
-
-    @property
-    def value(self):
-        if len(self) < 3:
-            return self[0].value
-        return self[0].value.rstrip()+self[1].value+self[2].value.lstrip()
-
-    @property
-    def addr_spec(self):
-        nameset = set(self.local_part)
-        if len(nameset) > len(nameset-DOT_ATOM_ENDS):
-            lp = quote_string(self.local_part)
-        else:
-            lp = self.local_part
-        if self.domain is not None:
-            return lp + '@' + self.domain
-        return lp
-
-
-class ObsLocalPart(TokenList):
-
-    token_type = 'obs-local-part'
-
-
-class DisplayName(Phrase):
-
-    token_type = 'display-name'
-
-    @property
-    def display_name(self):
-        res = TokenList(self)
-        if res[0].token_type == 'cfws':
-            res.pop(0)
-        else:
-            if res[0][0].token_type == 'cfws':
-                res[0] = TokenList(res[0][1:])
-        if res[-1].token_type == 'cfws':
-            res.pop()
-        else:
-            if res[-1][-1].token_type == 'cfws':
-                res[-1] = TokenList(res[-1][:-1])
-        return res.value
-
-    @property
-    def value(self):
-        quote = False
-        if self.defects:
-            quote = True
-        else:
-            for x in self:
-                if x.token_type == 'quoted-string':
-                    quote = True
-        if quote:
-            pre = post = ''
-            if self[0].token_type=='cfws' or self[0][0].token_type=='cfws':
-                pre = ' '
-            if self[-1].token_type=='cfws' or self[-1][-1].token_type=='cfws':
-                post = ' '
-            return pre+quote_string(self.display_name)+post
-        else:
-            return super(DisplayName, self).value
-
-
-class LocalPart(TokenList):
-
-    token_type = 'local-part'
-
-    @property
-    def value(self):
-        if self[0].token_type == "quoted-string":
-            return self[0].quoted_value
-        else:
-            return self[0].value
-
-    @property
-    def local_part(self):
-        # Strip whitespace from front, back, and around dots.
-        res = [DOT]
-        last = DOT
-        last_is_tl = False
-        for tok in self[0] + [DOT]:
-            if tok.token_type == 'cfws':
-                continue
-            if (last_is_tl and tok.token_type == 'dot' and
-                    last[-1].token_type == 'cfws'):
-                res[-1] = TokenList(last[:-1])
-            is_tl = isinstance(tok, TokenList)
-            if (is_tl and last.token_type == 'dot' and
-                    tok[0].token_type == 'cfws'):
-                res.append(TokenList(tok[1:]))
-            else:
-                res.append(tok)
-            last = res[-1]
-            last_is_tl = is_tl
-        res = TokenList(res[1:-1])
-        return res.value
-
-
-class DomainLiteral(TokenList):
-
-    token_type = 'domain-literal'
-
-    @property
-    def domain(self):
-        return ''.join(super(DomainLiteral, self).value.split())
-
-    @property
-    def ip(self):
-        for x in self:
-            if x.token_type == 'ptext':
-                return x.value
-
-
-class MIMEVersion(TokenList):
-
-    token_type = 'mime-version'
-    major = None
-    minor = None
-
-
-class Parameter(TokenList):
-
-    token_type = 'parameter'
-    sectioned = False
-    extended = False
-    charset = 'us-ascii'
-
-    @property
-    def section_number(self):
-        # Because the first token, the attribute (name) eats CFWS, the second
-        # token is always the section if there is one.
-        return self[1].number if self.sectioned else 0
-
-    @property
-    def param_value(self):
-        # This is part of the "handle quoted extended parameters" hack.
-        for token in self:
-            if token.token_type == 'value':
-                return token.stripped_value
-            if token.token_type == 'quoted-string':
-                for token in token:
-                    if token.token_type == 'bare-quoted-string':
-                        for token in token:
-                            if token.token_type == 'value':
-                                return token.stripped_value
-        return ''
-
-
-class InvalidParameter(Parameter):
-
-    token_type = 'invalid-parameter'
-
-
-class Attribute(TokenList):
-
-    token_type = 'attribute'
-
-    @property
-    def stripped_value(self):
-        for token in self:
-            if token.token_type.endswith('attrtext'):
-                return token.value
-
-class Section(TokenList):
-
-    token_type = 'section'
-    number = None
-
-
-class Value(TokenList):
-
-    token_type = 'value'
-
-    @property
-    def stripped_value(self):
-        token = self[0]
-        if token.token_type == 'cfws':
-            token = self[1]
-        if token.token_type.endswith(
-                ('quoted-string', 'attribute', 'extended-attribute')):
-            return token.stripped_value
-        return self.value
-
-
-class MimeParameters(TokenList):
-
-    token_type = 'mime-parameters'
-
-    @property
-    def params(self):
-        # The RFC specifically states that the ordering of parameters is not
-        # guaranteed and may be reordered by the transport layer.  So we have
-        # to assume the RFC 2231 pieces can come in any order.  However, we
-        # output them in the order that we first see a given name, which gives
-        # us a stable __str__.
-        params = OrderedDict()
-        for token in self:
-            if not token.token_type.endswith('parameter'):
-                continue
-            if token[0].token_type != 'attribute':
-                continue
-            name = token[0].value.strip()
-            if name not in params:
-                params[name] = []
-            params[name].append((token.section_number, token))
-        for name, parts in params.items():
-            parts = sorted(parts)
-            # XXX: there might be more recovery we could do here if, for
-            # example, this is really a case of a duplicate attribute name.
-            value_parts = []
-            charset = parts[0][1].charset
-            for i, (section_number, param) in enumerate(parts):
-                if section_number != i:
-                    param.defects.append(errors.InvalidHeaderDefect(
-                        "inconsistent multipart parameter numbering"))
-                value = param.param_value
-                if param.extended:
-                    try:
-                        value = unquote_to_bytes(value)
-                    except UnicodeEncodeError:
-                        # source had surrogate escaped bytes.  What we do now
-                        # is a bit of an open question.  I'm not sure this is
-                        # the best choice, but it is what the old algorithm did
-                        value = unquote(value, encoding='latin-1')
-                    else:
-                        try:
-                            value = value.decode(charset, 'surrogateescape')
-                        except LookupError:
-                            # XXX: there should really be a custom defect for
-                            # unknown character set to make it easy to find,
-                            # because otherwise unknown charset is a silent
-                            # failure.
-                            value = value.decode('us-ascii', 'surrogateescape')
-                        if utils._has_surrogates(value):
-                            param.defects.append(errors.UndecodableBytesDefect())
-                value_parts.append(value)
-            value = ''.join(value_parts)
-            yield name, value
-
-    def __str__(self):
-        params = []
-        for name, value in self.params:
-            if value:
-                params.append('{}={}'.format(name, quote_string(value)))
-            else:
-                params.append(name)
-        params = '; '.join(params)
-        return ' ' + params if params else ''
-
-
-class ParameterizedHeaderValue(TokenList):
-
-    @property
-    def params(self):
-        for token in reversed(self):
-            if token.token_type == 'mime-parameters':
-                return token.params
-        return {}
-
-    @property
-    def parts(self):
-        if self and self[-1].token_type == 'mime-parameters':
-            # We don't want to start a new line if all of the params don't fit
-            # after the value, so unwrap the parameter list.
-            return TokenList(self[:-1] + self[-1])
-        return TokenList(self).parts
-
-
-class ContentType(ParameterizedHeaderValue):
-
-    token_type = 'content-type'
-    maintype = 'text'
-    subtype = 'plain'
-
-
-class ContentDisposition(ParameterizedHeaderValue):
-
-    token_type = 'content-disposition'
-    content_disposition = None
-
-
-class ContentTransferEncoding(TokenList):
-
-    token_type = 'content-transfer-encoding'
-    cte = '7bit'
-
-
-class HeaderLabel(TokenList):
-
-    token_type = 'header-label'
-
-
-class Header(TokenList):
-
-    token_type = 'header'
-
-    def _fold(self, folded):
-        folded.append(str(self.pop(0)))
-        folded.lastlen = len(folded.current[0])
-        # The first line of the header is different from all others: we don't
-        # want to start a new object on a new line if it has any fold points in
-        # it that would allow part of it to be on the first header line.
-        # Further, if the first fold point would fit on the new line, we want
-        # to do that, but if it doesn't we want to put it on the first line.
-        # Folded supports this via the stickyspace attribute.  If this
-        # attribute is not None, it does the special handling.
-        folded.stickyspace = str(self.pop(0)) if self[0].token_type == 'cfws' else ''
-        rest = self.pop(0)
-        if self:
-            raise ValueError("Malformed Header token list")
-        rest._fold(folded)
-
-
-#
-# Terminal classes and instances
-#
-
-class Terminal(str):
-
-    def __new__(cls, value, token_type):
-        self = super(Terminal, cls).__new__(cls, value)
-        self.token_type = token_type
-        self.defects = []
-        return self
-
-    def __repr__(self):
-        return "{}({})".format(self.__class__.__name__, super(Terminal, self).__repr__())
-
-    @property
-    def all_defects(self):
-        return list(self.defects)
-
-    def _pp(self, indent=''):
-        return ["{}{}/{}({}){}".format(
-            indent,
-            self.__class__.__name__,
-            self.token_type,
-            super(Terminal, self).__repr__(),
-            '' if not self.defects else ' {}'.format(self.defects),
-            )]
-
-    def cte_encode(self, charset, policy):
-        value = str(self)
-        try:
-            value.encode('us-ascii')
-            return value
-        except UnicodeEncodeError:
-            return _ew.encode(value, charset)
-
-    def pop_trailing_ws(self):
-        # This terminates the recursion.
-        return None
-
-    def pop_leading_fws(self):
-        # This terminates the recursion.
-        return None
-
-    @property
-    def comments(self):
-        return []
-
-    def has_leading_comment(self):
-        return False
-
-    def __getnewargs__(self):
-        return(str(self), self.token_type)
-
-
-class WhiteSpaceTerminal(Terminal):
-
-    @property
-    def value(self):
-        return ' '
-
-    def startswith_fws(self):
-        return True
-
-    has_fws = True
-
-
-class ValueTerminal(Terminal):
-
-    @property
-    def value(self):
-        return self
-
-    def startswith_fws(self):
-        return False
-
-    has_fws = False
-
-    def as_encoded_word(self, charset):
-        return _ew.encode(str(self), charset)
-
-
-class EWWhiteSpaceTerminal(WhiteSpaceTerminal):
-
-    @property
-    def value(self):
-        return ''
-
-    @property
-    def encoded(self):
-        return self[:]
-
-    def __str__(self):
-        return ''
-
-    has_fws = True
-
-
-# XXX these need to become classes and used as instances so
-# that a program can't change them in a parse tree and screw
-# up other parse trees.  Maybe should have  tests for that, too.
-DOT = ValueTerminal('.', 'dot')
-ListSeparator = ValueTerminal(',', 'list-separator')
-RouteComponentMarker = ValueTerminal('@', 'route-component-marker')
-
-#
-# Parser
-#
-
-"""Parse strings according to RFC822/2047/2822/5322 rules.
-
-This is a stateless parser.  Each get_XXX function accepts a string and
-returns either a Terminal or a TokenList representing the RFC object named
-by the method and a string containing the remaining unparsed characters
-from the input.  Thus a parser method consumes the next syntactic construct
-of a given type and returns a token representing the construct plus the
-unparsed remainder of the input string.
-
-For example, if the first element of a structured header is a 'phrase',
-then:
-
-    phrase, value = get_phrase(value)
-
-returns the complete phrase from the start of the string value, plus any
-characters left in the string after the phrase is removed.
-
-"""
-
-_wsp_splitter = re.compile(r'([{}]+)'.format(''.join(WSP))).split
-_non_atom_end_matcher = re.compile(r"[^{}]+".format(
-    ''.join(ATOM_ENDS).replace('\\','\\\\').replace(']','\]'))).match
-_non_printable_finder = re.compile(r"[\x00-\x20\x7F]").findall
-_non_token_end_matcher = re.compile(r"[^{}]+".format(
-    ''.join(TOKEN_ENDS).replace('\\','\\\\').replace(']','\]'))).match
-_non_attribute_end_matcher = re.compile(r"[^{}]+".format(
-    ''.join(ATTRIBUTE_ENDS).replace('\\','\\\\').replace(']','\]'))).match
-_non_extended_attribute_end_matcher = re.compile(r"[^{}]+".format(
-    ''.join(EXTENDED_ATTRIBUTE_ENDS).replace(
-                                    '\\','\\\\').replace(']','\]'))).match
-
-def _validate_xtext(xtext):
-    """If input token contains ASCII non-printables, register a defect."""
-
-    non_printables = _non_printable_finder(xtext)
-    if non_printables:
-        xtext.defects.append(errors.NonPrintableDefect(non_printables))
-    if utils._has_surrogates(xtext):
-        xtext.defects.append(errors.UndecodableBytesDefect(
-            "Non-ASCII characters found in header token"))
-
-def _get_ptext_to_endchars(value, endchars):
-    """Scan printables/quoted-pairs until endchars and return unquoted ptext.
-
-    This function turns a run of qcontent, ccontent-without-comments, or
-    dtext-with-quoted-printables into a single string by unquoting any
-    quoted printables.  It returns the string, the remaining value, and
-    a flag that is True iff there were any quoted printables decoded.
-
-    """
-    _3to2list = list(_wsp_splitter(value, 1))
-    fragment, remainder, = _3to2list[:1] + [_3to2list[1:]]
-    vchars = []
-    escape = False
-    had_qp = False
-    for pos in range(len(fragment)):
-        if fragment[pos] == '\\':
-            if escape:
-                escape = False
-                had_qp = True
-            else:
-                escape = True
-                continue
-        if escape:
-            escape = False
-        elif fragment[pos] in endchars:
-            break
-        vchars.append(fragment[pos])
-    else:
-        pos = pos + 1
-    return ''.join(vchars), ''.join([fragment[pos:]] + remainder), had_qp
-
-def _decode_ew_run(value):
-    """ Decode a run of RFC2047 encoded words.
-
-        _decode_ew_run(value) -> (text, value, defects)
-
-    Scans the supplied value for a run of tokens that look like they are RFC
-    2047 encoded words, decodes those words into text according to RFC 2047
-    rules (whitespace between encoded words is discarded), and returns the text
-    and the remaining value (including any leading whitespace on the remaining
-    value), as well as a list of any defects encountered while decoding.  The
-    input value may not have any leading whitespace.
-
-    """
-    res = []
-    defects = []
-    last_ws = ''
-    while value:
-        try:
-            tok, ws, value = _wsp_splitter(value, 1)
-        except ValueError:
-            tok, ws, value = value, '', ''
-        if not (tok.startswith('=?') and tok.endswith('?=')):
-            return ''.join(res), last_ws + tok + ws + value, defects
-        text, charset, lang, new_defects = _ew.decode(tok)
-        res.append(text)
-        defects.extend(new_defects)
-        last_ws = ws
-    return ''.join(res), last_ws, defects
-
-def get_fws(value):
-    """FWS = 1*WSP
-
-    This isn't the RFC definition.  We're using fws to represent tokens where
-    folding can be done, but when we are parsing the *un*folding has already
-    been done so we don't need to watch out for CRLF.
-
-    """
-    newvalue = value.lstrip()
-    fws = WhiteSpaceTerminal(value[:len(value)-len(newvalue)], 'fws')
-    return fws, newvalue
-
-def get_encoded_word(value):
-    """ encoded-word = "=?" charset "?" encoding "?" encoded-text "?="
-
-    """
-    ew = EncodedWord()
-    if not value.startswith('=?'):
-        raise errors.HeaderParseError(
-            "expected encoded word but found {}".format(value))
-    _3to2list1 = list(value[2:].split('?=', 1))
-    tok, remainder, = _3to2list1[:1] + [_3to2list1[1:]]
-    if tok == value[2:]:
-        raise errors.HeaderParseError(
-            "expected encoded word but found {}".format(value))
-    remstr = ''.join(remainder)
-    if remstr[:2].isdigit():
-        _3to2list3 = list(remstr.split('?=', 1))
-        rest, remainder, = _3to2list3[:1] + [_3to2list3[1:]]
-        tok = tok + '?=' + rest
-    if len(tok.split()) > 1:
-        ew.defects.append(errors.InvalidHeaderDefect(
-            "whitespace inside encoded word"))
-    ew.cte = value
-    value = ''.join(remainder)
-    try:
-        text, charset, lang, defects = _ew.decode('=?' + tok + '?=')
-    except ValueError:
-        raise errors.HeaderParseError(
-            "encoded word format invalid: '{}'".format(ew.cte))
-    ew.charset = charset
-    ew.lang = lang
-    ew.defects.extend(defects)
-    while text:
-        if text[0] in WSP:
-            token, text = get_fws(text)
-            ew.append(token)
-            continue
-        _3to2list5 = list(_wsp_splitter(text, 1))
-        chars, remainder, = _3to2list5[:1] + [_3to2list5[1:]]
-        vtext = ValueTerminal(chars, 'vtext')
-        _validate_xtext(vtext)
-        ew.append(vtext)
-        text = ''.join(remainder)
-    return ew, value
-
-def get_unstructured(value):
-    """unstructured = (*([FWS] vchar) *WSP) / obs-unstruct
-       obs-unstruct = *((*LF *CR *(obs-utext) *LF *CR)) / FWS)
-       obs-utext = %d0 / obs-NO-WS-CTL / LF / CR
-
-       obs-NO-WS-CTL is control characters except WSP/CR/LF.
-
-    So, basically, we have printable runs, plus control characters or nulls in
-    the obsolete syntax, separated by whitespace.  Since RFC 2047 uses the
-    obsolete syntax in its specification, but requires whitespace on either
-    side of the encoded words, I can see no reason to need to separate the
-    non-printable-non-whitespace from the printable runs if they occur, so we
-    parse this into xtext tokens separated by WSP tokens.
-
-    Because an 'unstructured' value must by definition constitute the entire
-    value, this 'get' routine does not return a remaining value, only the
-    parsed TokenList.
-
-    """
-    # XXX: but what about bare CR and LF?  They might signal the start or
-    # end of an encoded word.  YAGNI for now, since out current parsers
-    # will never send us strings with bard CR or LF.
-
-    unstructured = UnstructuredTokenList()
-    while value:
-        if value[0] in WSP:
-            token, value = get_fws(value)
-            unstructured.append(token)
-            continue
-        if value.startswith('=?'):
-            try:
-                token, value = get_encoded_word(value)
-            except errors.HeaderParseError:
-                pass
-            else:
-                have_ws = True
-                if len(unstructured) > 0:
-                    if unstructured[-1].token_type != 'fws':
-                        unstructured.defects.append(errors.InvalidHeaderDefect(
-                            "missing whitespace before encoded word"))
-                        have_ws = False
-                if have_ws and len(unstructured) > 1:
-                    if unstructured[-2].token_type == 'encoded-word':
-                        unstructured[-1] = EWWhiteSpaceTerminal(
-                            unstructured[-1], 'fws')
-                unstructured.append(token)
-                continue
-        _3to2list7 = list(_wsp_splitter(value, 1))
-        tok, remainder, = _3to2list7[:1] + [_3to2list7[1:]]
-        vtext = ValueTerminal(tok, 'vtext')
-        _validate_xtext(vtext)
-        unstructured.append(vtext)
-        value = ''.join(remainder)
-    return unstructured
-
-def get_qp_ctext(value):
-    """ctext = <printable ascii except \ ( )>
-
-    This is not the RFC ctext, since we are handling nested comments in comment
-    and unquoting quoted-pairs here.  We allow anything except the '()'
-    characters, but if we find any ASCII other than the RFC defined printable
-    ASCII an NonPrintableDefect is added to the token's defects list.  Since
-    quoted pairs are converted to their unquoted values, what is returned is
-    a 'ptext' token.  In this case it is a WhiteSpaceTerminal, so it's value
-    is ' '.
-
-    """
-    ptext, value, _ = _get_ptext_to_endchars(value, '()')
-    ptext = WhiteSpaceTerminal(ptext, 'ptext')
-    _validate_xtext(ptext)
-    return ptext, value
-
-def get_qcontent(value):
-    """qcontent = qtext / quoted-pair
-
-    We allow anything except the DQUOTE character, but if we find any ASCII
-    other than the RFC defined printable ASCII an NonPrintableDefect is
-    added to the token's defects list.  Any quoted pairs are converted to their
-    unquoted values, so what is returned is a 'ptext' token.  In this case it
-    is a ValueTerminal.
-
-    """
-    ptext, value, _ = _get_ptext_to_endchars(value, '"')
-    ptext = ValueTerminal(ptext, 'ptext')
-    _validate_xtext(ptext)
-    return ptext, value
-
-def get_atext(value):
-    """atext = <matches _atext_matcher>
-
-    We allow any non-ATOM_ENDS in atext, but add an InvalidATextDefect to
-    the token's defects list if we find non-atext characters.
-    """
-    m = _non_atom_end_matcher(value)
-    if not m:
-        raise errors.HeaderParseError(
-            "expected atext but found '{}'".format(value))
-    atext = m.group()
-    value = value[len(atext):]
-    atext = ValueTerminal(atext, 'atext')
-    _validate_xtext(atext)
-    return atext, value
-
-def get_bare_quoted_string(value):
-    """bare-quoted-string = DQUOTE *([FWS] qcontent) [FWS] DQUOTE
-
-    A quoted-string without the leading or trailing white space.  Its
-    value is the text between the quote marks, with whitespace
-    preserved and quoted pairs decoded.
-    """
-    if value[0] != '"':
-        raise errors.HeaderParseError(
-            "expected '\"' but found '{}'".format(value))
-    bare_quoted_string = BareQuotedString()
-    value = value[1:]
-    while value and value[0] != '"':
-        if value[0] in WSP:
-            token, value = get_fws(value)
-        else:
-            token, value = get_qcontent(value)
-        bare_quoted_string.append(token)
-    if not value:
-        bare_quoted_string.defects.append(errors.InvalidHeaderDefect(
-            "end of header inside quoted string"))
-        return bare_quoted_string, value
-    return bare_quoted_string, value[1:]
-
-def get_comment(value):
-    """comment = "(" *([FWS] ccontent) [FWS] ")"
-       ccontent = ctext / quoted-pair / comment
-
-    We handle nested comments here, and quoted-pair in our qp-ctext routine.
-    """
-    if value and value[0] != '(':
-        raise errors.HeaderParseError(
-            "expected '(' but found '{}'".format(value))
-    comment = Comment()
-    value = value[1:]
-    while value and value[0] != ")":
-        if value[0] in WSP:
-            token, value = get_fws(value)
-        elif value[0] == '(':
-            token, value = get_comment(value)
-        else:
-            token, value = get_qp_ctext(value)
-        comment.append(token)
-    if not value:
-        comment.defects.append(errors.InvalidHeaderDefect(
-            "end of header inside comment"))
-        return comment, value
-    return comment, value[1:]
-
-def get_cfws(value):
-    """CFWS = (1*([FWS] comment) [FWS]) / FWS
-
-    """
-    cfws = CFWSList()
-    while value and value[0] in CFWS_LEADER:
-        if value[0] in WSP:
-            token, value = get_fws(value)
-        else:
-            token, value = get_comment(value)
-        cfws.append(token)
-    return cfws, value
-
-def get_quoted_string(value):
-    """quoted-string = [CFWS] <bare-quoted-string> [CFWS]
-
-    'bare-quoted-string' is an intermediate class defined by this
-    parser and not by the RFC grammar.  It is the quoted string
-    without any attached CFWS.
-    """
-    quoted_string = QuotedString()
-    if value and value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        quoted_string.append(token)
-    token, value = get_bare_quoted_string(value)
-    quoted_string.append(token)
-    if value and value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        quoted_string.append(token)
-    return quoted_string, value
-
-def get_atom(value):
-    """atom = [CFWS] 1*atext [CFWS]
-
-    """
-    atom = Atom()
-    if value and value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        atom.append(token)
-    if value and value[0] in ATOM_ENDS:
-        raise errors.HeaderParseError(
-            "expected atom but found '{}'".format(value))
-    token, value = get_atext(value)
-    atom.append(token)
-    if value and value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        atom.append(token)
-    return atom, value
-
-def get_dot_atom_text(value):
-    """ dot-text = 1*atext *("." 1*atext)
-
-    """
-    dot_atom_text = DotAtomText()
-    if not value or value[0] in ATOM_ENDS:
-        raise errors.HeaderParseError("expected atom at a start of "
-            "dot-atom-text but found '{}'".format(value))
-    while value and value[0] not in ATOM_ENDS:
-        token, value = get_atext(value)
-        dot_atom_text.append(token)
-        if value and value[0] == '.':
-            dot_atom_text.append(DOT)
-            value = value[1:]
-    if dot_atom_text[-1] is DOT:
-        raise errors.HeaderParseError("expected atom at end of dot-atom-text "
-            "but found '{}'".format('.'+value))
-    return dot_atom_text, value
-
-def get_dot_atom(value):
-    """ dot-atom = [CFWS] dot-atom-text [CFWS]
-
-    """
-    dot_atom = DotAtom()
-    if value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        dot_atom.append(token)
-    token, value = get_dot_atom_text(value)
-    dot_atom.append(token)
-    if value and value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        dot_atom.append(token)
-    return dot_atom, value
-
-def get_word(value):
-    """word = atom / quoted-string
-
-    Either atom or quoted-string may start with CFWS.  We have to peel off this
-    CFWS first to determine which type of word to parse.  Afterward we splice
-    the leading CFWS, if any, into the parsed sub-token.
-
-    If neither an atom or a quoted-string is found before the next special, a
-    HeaderParseError is raised.
-
-    The token returned is either an Atom or a QuotedString, as appropriate.
-    This means the 'word' level of the formal grammar is not represented in the
-    parse tree; this is because having that extra layer when manipulating the
-    parse tree is more confusing than it is helpful.
-
-    """
-    if value[0] in CFWS_LEADER:
-        leader, value = get_cfws(value)
-    else:
-        leader = None
-    if value[0]=='"':
-        token, value = get_quoted_string(value)
-    elif value[0] in SPECIALS:
-        raise errors.HeaderParseError("Expected 'atom' or 'quoted-string' "
-                                      "but found '{}'".format(value))
-    else:
-        token, value = get_atom(value)
-    if leader is not None:
-        token[:0] = [leader]
-    return token, value
-
-def get_phrase(value):
-    """ phrase = 1*word / obs-phrase
-        obs-phrase = word *(word / "." / CFWS)
-
-    This means a phrase can be a sequence of words, periods, and CFWS in any
-    order as long as it starts with at least one word.  If anything other than
-    words is detected, an ObsoleteHeaderDefect is added to the token's defect
-    list.  We also accept a phrase that starts with CFWS followed by a dot;
-    this is registered as an InvalidHeaderDefect, since it is not supported by
-    even the obsolete grammar.
-
-    """
-    phrase = Phrase()
-    try:
-        token, value = get_word(value)
-        phrase.append(token)
-    except errors.HeaderParseError:
-        phrase.defects.append(errors.InvalidHeaderDefect(
-            "phrase does not start with word"))
-    while value and value[0] not in PHRASE_ENDS:
-        if value[0]=='.':
-            phrase.append(DOT)
-            phrase.defects.append(errors.ObsoleteHeaderDefect(
-                "period in 'phrase'"))
-            value = value[1:]
-        else:
-            try:
-                token, value = get_word(value)
-            except errors.HeaderParseError:
-                if value[0] in CFWS_LEADER:
-                    token, value = get_cfws(value)
-                    phrase.defects.append(errors.ObsoleteHeaderDefect(
-                        "comment found without atom"))
-                else:
-                    raise
-            phrase.append(token)
-    return phrase, value
-
-def get_local_part(value):
-    """ local-part = dot-atom / quoted-string / obs-local-part
-
-    """
-    local_part = LocalPart()
-    leader = None
-    if value[0] in CFWS_LEADER:
-        leader, value = get_cfws(value)
-    if not value:
-        raise errors.HeaderParseError(
-            "expected local-part but found '{}'".format(value))
-    try:
-        token, value = get_dot_atom(value)
-    except errors.HeaderParseError:
-        try:
-            token, value = get_word(value)
-        except errors.HeaderParseError:
-            if value[0] != '\\' and value[0] in PHRASE_ENDS:
-                raise
-            token = TokenList()
-    if leader is not None:
-        token[:0] = [leader]
-    local_part.append(token)
-    if value and (value[0]=='\\' or value[0] not in PHRASE_ENDS):
-        obs_local_part, value = get_obs_local_part(str(local_part) + value)
-        if obs_local_part.token_type == 'invalid-obs-local-part':
-            local_part.defects.append(errors.InvalidHeaderDefect(
-                "local-part is not dot-atom, quoted-string, or obs-local-part"))
-        else:
-            local_part.defects.append(errors.ObsoleteHeaderDefect(
-                "local-part is not a dot-atom (contains CFWS)"))
-        local_part[0] = obs_local_part
-    try:
-        local_part.value.encode('ascii')
-    except UnicodeEncodeError:
-        local_part.defects.append(errors.NonASCIILocalPartDefect(
-                "local-part contains non-ASCII characters)"))
-    return local_part, value
-
-def get_obs_local_part(value):
-    """ obs-local-part = word *("." word)
-    """
-    obs_local_part = ObsLocalPart()
-    last_non_ws_was_dot = False
-    while value and (value[0]=='\\' or value[0] not in PHRASE_ENDS):
-        if value[0] == '.':
-            if last_non_ws_was_dot:
-                obs_local_part.defects.append(errors.InvalidHeaderDefect(
-                    "invalid repeated '.'"))
-            obs_local_part.append(DOT)
-            last_non_ws_was_dot = True
-            value = value[1:]
-            continue
-        elif value[0]=='\\':
-            obs_local_part.append(ValueTerminal(value[0],
-                                                'misplaced-special'))
-            value = value[1:]
-            obs_local_part.defects.append(errors.InvalidHeaderDefect(
-                "'\\' character outside of quoted-string/ccontent"))
-            last_non_ws_was_dot = False
-            continue
-        if obs_local_part and obs_local_part[-1].token_type != 'dot':
-            obs_local_part.defects.append(errors.InvalidHeaderDefect(
-                "missing '.' between words"))
-        try:
-            token, value = get_word(value)
-            last_non_ws_was_dot = False
-        except errors.HeaderParseError:
-            if value[0] not in CFWS_LEADER:
-                raise
-            token, value = get_cfws(value)
-        obs_local_part.append(token)
-    if (obs_local_part[0].token_type == 'dot' or
-            obs_local_part[0].token_type=='cfws' and
-            obs_local_part[1].token_type=='dot'):
-        obs_local_part.defects.append(errors.InvalidHeaderDefect(
-            "Invalid leading '.' in local part"))
-    if (obs_local_part[-1].token_type == 'dot' or
-            obs_local_part[-1].token_type=='cfws' and
-            obs_local_part[-2].token_type=='dot'):
-        obs_local_part.defects.append(errors.InvalidHeaderDefect(
-            "Invalid trailing '.' in local part"))
-    if obs_local_part.defects:
-        obs_local_part.token_type = 'invalid-obs-local-part'
-    return obs_local_part, value
-
-def get_dtext(value):
-    """ dtext = <printable ascii except \ [ ]> / obs-dtext
-        obs-dtext = obs-NO-WS-CTL / quoted-pair
-
-    We allow anything except the excluded characters, but if we find any
-    ASCII other than the RFC defined printable ASCII an NonPrintableDefect is
-    added to the token's defects list.  Quoted pairs are converted to their
-    unquoted values, so what is returned is a ptext token, in this case a
-    ValueTerminal.  If there were quoted-printables, an ObsoleteHeaderDefect is
-    added to the returned token's defect list.
-
-    """
-    ptext, value, had_qp = _get_ptext_to_endchars(value, '[]')
-    ptext = ValueTerminal(ptext, 'ptext')
-    if had_qp:
-        ptext.defects.append(errors.ObsoleteHeaderDefect(
-            "quoted printable found in domain-literal"))
-    _validate_xtext(ptext)
-    return ptext, value
-
-def _check_for_early_dl_end(value, domain_literal):
-    if value:
-        return False
-    domain_literal.append(errors.InvalidHeaderDefect(
-        "end of input inside domain-literal"))
-    domain_literal.append(ValueTerminal(']', 'domain-literal-end'))
-    return True
-
-def get_domain_literal(value):
-    """ domain-literal = [CFWS] "[" *([FWS] dtext) [FWS] "]" [CFWS]
-
-    """
-    domain_literal = DomainLiteral()
-    if value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        domain_literal.append(token)
-    if not value:
-        raise errors.HeaderParseError("expected domain-literal")
-    if value[0] != '[':
-        raise errors.HeaderParseError("expected '[' at start of domain-literal "
-                "but found '{}'".format(value))
-    value = value[1:]
-    if _check_for_early_dl_end(value, domain_literal):
-        return domain_literal, value
-    domain_literal.append(ValueTerminal('[', 'domain-literal-start'))
-    if value[0] in WSP:
-        token, value = get_fws(value)
-        domain_literal.append(token)
-    token, value = get_dtext(value)
-    domain_literal.append(token)
-    if _check_for_early_dl_end(value, domain_literal):
-        return domain_literal, value
-    if value[0] in WSP:
-        token, value = get_fws(value)
-        domain_literal.append(token)
-    if _check_for_early_dl_end(value, domain_literal):
-        return domain_literal, value
-    if value[0] != ']':
-        raise errors.HeaderParseError("expected ']' at end of domain-literal "
-                "but found '{}'".format(value))
-    domain_literal.append(ValueTerminal(']', 'domain-literal-end'))
-    value = value[1:]
-    if value and value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        domain_literal.append(token)
-    return domain_literal, value
-
-def get_domain(value):
-    """ domain = dot-atom / domain-literal / obs-domain
-        obs-domain = atom *("." atom))
-
-    """
-    domain = Domain()
-    leader = None
-    if value[0] in CFWS_LEADER:
-        leader, value = get_cfws(value)
-    if not value:
-        raise errors.HeaderParseError(
-            "expected domain but found '{}'".format(value))
-    if value[0] == '[':
-        token, value = get_domain_literal(value)
-        if leader is not None:
-            token[:0] = [leader]
-        domain.append(token)
-        return domain, value
-    try:
-        token, value = get_dot_atom(value)
-    except errors.HeaderParseError:
-        token, value = get_atom(value)
-    if leader is not None:
-        token[:0] = [leader]
-    domain.append(token)
-    if value and value[0] == '.':
-        domain.defects.append(errors.ObsoleteHeaderDefect(
-            "domain is not a dot-atom (contains CFWS)"))
-        if domain[0].token_type == 'dot-atom':
-            domain[:] = domain[0]
-        while value and value[0] == '.':
-            domain.append(DOT)
-            token, value = get_atom(value[1:])
-            domain.append(token)
-    return domain, value
-
-def get_addr_spec(value):
-    """ addr-spec = local-part "@" domain
-
-    """
-    addr_spec = AddrSpec()
-    token, value = get_local_part(value)
-    addr_spec.append(token)
-    if not value or value[0] != '@':
-        addr_spec.defects.append(errors.InvalidHeaderDefect(
-            "add-spec local part with no domain"))
-        return addr_spec, value
-    addr_spec.append(ValueTerminal('@', 'address-at-symbol'))
-    token, value = get_domain(value[1:])
-    addr_spec.append(token)
-    return addr_spec, value
-
-def get_obs_route(value):
-    """ obs-route = obs-domain-list ":"
-        obs-domain-list = *(CFWS / ",") "@" domain *("," [CFWS] ["@" domain])
-
-        Returns an obs-route token with the appropriate sub-tokens (that is,
-        there is no obs-domain-list in the parse tree).
-    """
-    obs_route = ObsRoute()
-    while value and (value[0]==',' or value[0] in CFWS_LEADER):
-        if value[0] in CFWS_LEADER:
-            token, value = get_cfws(value)
-            obs_route.append(token)
-        elif value[0] == ',':
-            obs_route.append(ListSeparator)
-            value = value[1:]
-    if not value or value[0] != '@':
-        raise errors.HeaderParseError(
-            "expected obs-route domain but found '{}'".format(value))
-    obs_route.append(RouteComponentMarker)
-    token, value = get_domain(value[1:])
-    obs_route.append(token)
-    while value and value[0]==',':
-        obs_route.append(ListSeparator)
-        value = value[1:]
-        if not value:
-            break
-        if value[0] in CFWS_LEADER:
-            token, value = get_cfws(value)
-            obs_route.append(token)
-        if value[0] == '@':
-            obs_route.append(RouteComponentMarker)
-            token, value = get_domain(value[1:])
-            obs_route.append(token)
-    if not value:
-        raise errors.HeaderParseError("end of header while parsing obs-route")
-    if value[0] != ':':
-        raise errors.HeaderParseError( "expected ':' marking end of "
-            "obs-route but found '{}'".format(value))
-    obs_route.append(ValueTerminal(':', 'end-of-obs-route-marker'))
-    return obs_route, value[1:]
-
-def get_angle_addr(value):
-    """ angle-addr = [CFWS] "<" addr-spec ">" [CFWS] / obs-angle-addr
-        obs-angle-addr = [CFWS] "<" obs-route addr-spec ">" [CFWS]
-
-    """
-    angle_addr = AngleAddr()
-    if value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        angle_addr.append(token)
-    if not value or value[0] != '<':
-        raise errors.HeaderParseError(
-            "expected angle-addr but found '{}'".format(value))
-    angle_addr.append(ValueTerminal('<', 'angle-addr-start'))
-    value = value[1:]
-    # Although it is not legal per RFC5322, SMTP uses '<>' in certain
-    # circumstances.
-    if value[0] == '>':
-        angle_addr.append(ValueTerminal('>', 'angle-addr-end'))
-        angle_addr.defects.append(errors.InvalidHeaderDefect(
-            "null addr-spec in angle-addr"))
-        value = value[1:]
-        return angle_addr, value
-    try:
-        token, value = get_addr_spec(value)
-    except errors.HeaderParseError:
-        try:
-            token, value = get_obs_route(value)
-            angle_addr.defects.append(errors.ObsoleteHeaderDefect(
-                "obsolete route specification in angle-addr"))
-        except errors.HeaderParseError:
-            raise errors.HeaderParseError(
-                "expected addr-spec or obs-route but found '{}'".format(value))
-        angle_addr.append(token)
-        token, value = get_addr_spec(value)
-    angle_addr.append(token)
-    if value and value[0] == '>':
-        value = value[1:]
-    else:
-        angle_addr.defects.append(errors.InvalidHeaderDefect(
-            "missing trailing '>' on angle-addr"))
-    angle_addr.append(ValueTerminal('>', 'angle-addr-end'))
-    if value and value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        angle_addr.append(token)
-    return angle_addr, value
-
-def get_display_name(value):
-    """ display-name = phrase
-
-    Because this is simply a name-rule, we don't return a display-name
-    token containing a phrase, but rather a display-name token with
-    the content of the phrase.
-
-    """
-    display_name = DisplayName()
-    token, value = get_phrase(value)
-    display_name.extend(token[:])
-    display_name.defects = token.defects[:]
-    return display_name, value
-
-
-def get_name_addr(value):
-    """ name-addr = [display-name] angle-addr
-
-    """
-    name_addr = NameAddr()
-    # Both the optional display name and the angle-addr can start with cfws.
-    leader = None
-    if value[0] in CFWS_LEADER:
-        leader, value = get_cfws(value)
-        if not value:
-            raise errors.HeaderParseError(
-                "expected name-addr but found '{}'".format(leader))
-    if value[0] != '<':
-        if value[0] in PHRASE_ENDS:
-            raise errors.HeaderParseError(
-                "expected name-addr but found '{}'".format(value))
-        token, value = get_display_name(value)
-        if not value:
-            raise errors.HeaderParseError(
-                "expected name-addr but found '{}'".format(token))
-        if leader is not None:
-            token[0][:0] = [leader]
-            leader = None
-        name_addr.append(token)
-    token, value = get_angle_addr(value)
-    if leader is not None:
-        token[:0] = [leader]
-    name_addr.append(token)
-    return name_addr, value
-
-def get_mailbox(value):
-    """ mailbox = name-addr / addr-spec
-
-    """
-    # The only way to figure out if we are dealing with a name-addr or an
-    # addr-spec is to try parsing each one.
-    mailbox = Mailbox()
-    try:
-        token, value = get_name_addr(value)
-    except errors.HeaderParseError:
-        try:
-            token, value = get_addr_spec(value)
-        except errors.HeaderParseError:
-            raise errors.HeaderParseError(
-                "expected mailbox but found '{}'".format(value))
-    if any(isinstance(x, errors.InvalidHeaderDefect)
-                       for x in token.all_defects):
-        mailbox.token_type = 'invalid-mailbox'
-    mailbox.append(token)
-    return mailbox, value
-
-def get_invalid_mailbox(value, endchars):
-    """ Read everything up to one of the chars in endchars.
-
-    This is outside the formal grammar.  The InvalidMailbox TokenList that is
-    returned acts like a Mailbox, but the data attributes are None.
-
-    """
-    invalid_mailbox = InvalidMailbox()
-    while value and value[0] not in endchars:
-        if value[0] in PHRASE_ENDS:
-            invalid_mailbox.append(ValueTerminal(value[0],
-                                                 'misplaced-special'))
-            value = value[1:]
-        else:
-            token, value = get_phrase(value)
-            invalid_mailbox.append(token)
-    return invalid_mailbox, value
-
-def get_mailbox_list(value):
-    """ mailbox-list = (mailbox *("," mailbox)) / obs-mbox-list
-        obs-mbox-list = *([CFWS] ",") mailbox *("," [mailbox / CFWS])
-
-    For this routine we go outside the formal grammar in order to improve error
-    handling.  We recognize the end of the mailbox list only at the end of the
-    value or at a ';' (the group terminator).  This is so that we can turn
-    invalid mailboxes into InvalidMailbox tokens and continue parsing any
-    remaining valid mailboxes.  We also allow all mailbox entries to be null,
-    and this condition is handled appropriately at a higher level.
-
-    """
-    mailbox_list = MailboxList()
-    while value and value[0] != ';':
-        try:
-            token, value = get_mailbox(value)
-            mailbox_list.append(token)
-        except errors.HeaderParseError:
-            leader = None
-            if value[0] in CFWS_LEADER:
-                leader, value = get_cfws(value)
-                if not value or value[0] in ',;':
-                    mailbox_list.append(leader)
-                    mailbox_list.defects.append(errors.ObsoleteHeaderDefect(
-                        "empty element in mailbox-list"))
-                else:
-                    token, value = get_invalid_mailbox(value, ',;')
-                    if leader is not None:
-                        token[:0] = [leader]
-                    mailbox_list.append(token)
-                    mailbox_list.defects.append(errors.InvalidHeaderDefect(
-                        "invalid mailbox in mailbox-list"))
-            elif value[0] == ',':
-                mailbox_list.defects.append(errors.ObsoleteHeaderDefect(
-                    "empty element in mailbox-list"))
-            else:
-                token, value = get_invalid_mailbox(value, ',;')
-                if leader is not None:
-                    token[:0] = [leader]
-                mailbox_list.append(token)
-                mailbox_list.defects.append(errors.InvalidHeaderDefect(
-                    "invalid mailbox in mailbox-list"))
-        if value and value[0] not in ',;':
-            # Crap after mailbox; treat it as an invalid mailbox.
-            # The mailbox info will still be available.
-            mailbox = mailbox_list[-1]
-            mailbox.token_type = 'invalid-mailbox'
-            token, value = get_invalid_mailbox(value, ',;')
-            mailbox.extend(token)
-            mailbox_list.defects.append(errors.InvalidHeaderDefect(
-                "invalid mailbox in mailbox-list"))
-        if value and value[0] == ',':
-            mailbox_list.append(ListSeparator)
-            value = value[1:]
-    return mailbox_list, value
-
-
-def get_group_list(value):
-    """ group-list = mailbox-list / CFWS / obs-group-list
-        obs-group-list = 1*([CFWS] ",") [CFWS]
-
-    """
-    group_list = GroupList()
-    if not value:
-        group_list.defects.append(errors.InvalidHeaderDefect(
-            "end of header before group-list"))
-        return group_list, value
-    leader = None
-    if value and value[0] in CFWS_LEADER:
-        leader, value = get_cfws(value)
-        if not value:
-            # This should never happen in email parsing, since CFWS-only is a
-            # legal alternative to group-list in a group, which is the only
-            # place group-list appears.
-            group_list.defects.append(errors.InvalidHeaderDefect(
-                "end of header in group-list"))
-            group_list.append(leader)
-            return group_list, value
-        if value[0] == ';':
-            group_list.append(leader)
-            return group_list, value
-    token, value = get_mailbox_list(value)
-    if len(token.all_mailboxes)==0:
-        if leader is not None:
-            group_list.append(leader)
-        group_list.extend(token)
-        group_list.defects.append(errors.ObsoleteHeaderDefect(
-            "group-list with empty entries"))
-        return group_list, value
-    if leader is not None:
-        token[:0] = [leader]
-    group_list.append(token)
-    return group_list, value
-
-def get_group(value):
-    """ group = display-name ":" [group-list] ";" [CFWS]
-
-    """
-    group = Group()
-    token, value = get_display_name(value)
-    if not value or value[0] != ':':
-        raise errors.HeaderParseError("expected ':' at end of group "
-            "display name but found '{}'".format(value))
-    group.append(token)
-    group.append(ValueTerminal(':', 'group-display-name-terminator'))
-    value = value[1:]
-    if value and value[0] == ';':
-        group.append(ValueTerminal(';', 'group-terminator'))
-        return group, value[1:]
-    token, value = get_group_list(value)
-    group.append(token)
-    if not value:
-        group.defects.append(errors.InvalidHeaderDefect(
-            "end of header in group"))
-    if value[0] != ';':
-        raise errors.HeaderParseError(
-            "expected ';' at end of group but found {}".format(value))
-    group.append(ValueTerminal(';', 'group-terminator'))
-    value = value[1:]
-    if value and value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        group.append(token)
-    return group, value
-
-def get_address(value):
-    """ address = mailbox / group
-
-    Note that counter-intuitively, an address can be either a single address or
-    a list of addresses (a group).  This is why the returned Address object has
-    a 'mailboxes' attribute which treats a single address as a list of length
-    one.  When you need to differentiate between to two cases, extract the single
-    element, which is either a mailbox or a group token.
-
-    """
-    # The formal grammar isn't very helpful when parsing an address.  mailbox
-    # and group, especially when allowing for obsolete forms, start off very
-    # similarly.  It is only when you reach one of @, <, or : that you know
-    # what you've got.  So, we try each one in turn, starting with the more
-    # likely of the two.  We could perhaps make this more efficient by looking
-    # for a phrase and then branching based on the next character, but that
-    # would be a premature optimization.
-    address = Address()
-    try:
-        token, value = get_group(value)
-    except errors.HeaderParseError:
-        try:
-            token, value = get_mailbox(value)
-        except errors.HeaderParseError:
-            raise errors.HeaderParseError(
-                "expected address but found '{}'".format(value))
-    address.append(token)
-    return address, value
-
-def get_address_list(value):
-    """ address_list = (address *("," address)) / obs-addr-list
-        obs-addr-list = *([CFWS] ",") address *("," [address / CFWS])
-
-    We depart from the formal grammar here by continuing to parse until the end
-    of the input, assuming the input to be entirely composed of an
-    address-list.  This is always true in email parsing, and allows us
-    to skip invalid addresses to parse additional valid ones.
-
-    """
-    address_list = AddressList()
-    while value:
-        try:
-            token, value = get_address(value)
-            address_list.append(token)
-        except errors.HeaderParseError as err:
-            leader = None
-            if value[0] in CFWS_LEADER:
-                leader, value = get_cfws(value)
-                if not value or value[0] == ',':
-                    address_list.append(leader)
-                    address_list.defects.append(errors.ObsoleteHeaderDefect(
-                        "address-list entry with no content"))
-                else:
-                    token, value = get_invalid_mailbox(value, ',')
-                    if leader is not None:
-                        token[:0] = [leader]
-                    address_list.append(Address([token]))
-                    address_list.defects.append(errors.InvalidHeaderDefect(
-                        "invalid address in address-list"))
-            elif value[0] == ',':
-                address_list.defects.append(errors.ObsoleteHeaderDefect(
-                    "empty element in address-list"))
-            else:
-                token, value = get_invalid_mailbox(value, ',')
-                if leader is not None:
-                    token[:0] = [leader]
-                address_list.append(Address([token]))
-                address_list.defects.append(errors.InvalidHeaderDefect(
-                    "invalid address in address-list"))
-        if value and value[0] != ',':
-            # Crap after address; treat it as an invalid mailbox.
-            # The mailbox info will still be available.
-            mailbox = address_list[-1][0]
-            mailbox.token_type = 'invalid-mailbox'
-            token, value = get_invalid_mailbox(value, ',')
-            mailbox.extend(token)
-            address_list.defects.append(errors.InvalidHeaderDefect(
-                "invalid address in address-list"))
-        if value:  # Must be a , at this point.
-            address_list.append(ValueTerminal(',', 'list-separator'))
-            value = value[1:]
-    return address_list, value
-
-#
-# XXX: As I begin to add additional header parsers, I'm realizing we probably
-# have two level of parser routines: the get_XXX methods that get a token in
-# the grammar, and parse_XXX methods that parse an entire field value.  So
-# get_address_list above should really be a parse_ method, as probably should
-# be get_unstructured.
-#
-
-def parse_mime_version(value):
-    """ mime-version = [CFWS] 1*digit [CFWS] "." [CFWS] 1*digit [CFWS]
-
-    """
-    # The [CFWS] is implicit in the RFC 2045 BNF.
-    # XXX: This routine is a bit verbose, should factor out a get_int method.
-    mime_version = MIMEVersion()
-    if not value:
-        mime_version.defects.append(errors.HeaderMissingRequiredValue(
-            "Missing MIME version number (eg: 1.0)"))
-        return mime_version
-    if value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        mime_version.append(token)
-        if not value:
-            mime_version.defects.append(errors.HeaderMissingRequiredValue(
-                "Expected MIME version number but found only CFWS"))
-    digits = ''
-    while value and value[0] != '.' and value[0] not in CFWS_LEADER:
-        digits += value[0]
-        value = value[1:]
-    if not digits.isdigit():
-        mime_version.defects.append(errors.InvalidHeaderDefect(
-            "Expected MIME major version number but found {!r}".format(digits)))
-        mime_version.append(ValueTerminal(digits, 'xtext'))
-    else:
-        mime_version.major = int(digits)
-        mime_version.append(ValueTerminal(digits, 'digits'))
-    if value and value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        mime_version.append(token)
-    if not value or value[0] != '.':
-        if mime_version.major is not None:
-            mime_version.defects.append(errors.InvalidHeaderDefect(
-                "Incomplete MIME version; found only major number"))
-        if value:
-            mime_version.append(ValueTerminal(value, 'xtext'))
-        return mime_version
-    mime_version.append(ValueTerminal('.', 'version-separator'))
-    value = value[1:]
-    if value and value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        mime_version.append(token)
-    if not value:
-        if mime_version.major is not None:
-            mime_version.defects.append(errors.InvalidHeaderDefect(
-                "Incomplete MIME version; found only major number"))
-        return mime_version
-    digits = ''
-    while value and value[0] not in CFWS_LEADER:
-        digits += value[0]
-        value = value[1:]
-    if not digits.isdigit():
-        mime_version.defects.append(errors.InvalidHeaderDefect(
-            "Expected MIME minor version number but found {!r}".format(digits)))
-        mime_version.append(ValueTerminal(digits, 'xtext'))
-    else:
-        mime_version.minor = int(digits)
-        mime_version.append(ValueTerminal(digits, 'digits'))
-    if value and value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        mime_version.append(token)
-    if value:
-        mime_version.defects.append(errors.InvalidHeaderDefect(
-            "Excess non-CFWS text after MIME version"))
-        mime_version.append(ValueTerminal(value, 'xtext'))
-    return mime_version
-
-def get_invalid_parameter(value):
-    """ Read everything up to the next ';'.
-
-    This is outside the formal grammar.  The InvalidParameter TokenList that is
-    returned acts like a Parameter, but the data attributes are None.
-
-    """
-    invalid_parameter = InvalidParameter()
-    while value and value[0] != ';':
-        if value[0] in PHRASE_ENDS:
-            invalid_parameter.append(ValueTerminal(value[0],
-                                                   'misplaced-special'))
-            value = value[1:]
-        else:
-            token, value = get_phrase(value)
-            invalid_parameter.append(token)
-    return invalid_parameter, value
-
-def get_ttext(value):
-    """ttext = <matches _ttext_matcher>
-
-    We allow any non-TOKEN_ENDS in ttext, but add defects to the token's
-    defects list if we find non-ttext characters.  We also register defects for
-    *any* non-printables even though the RFC doesn't exclude all of them,
-    because we follow the spirit of RFC 5322.
-
-    """
-    m = _non_token_end_matcher(value)
-    if not m:
-        raise errors.HeaderParseError(
-            "expected ttext but found '{}'".format(value))
-    ttext = m.group()
-    value = value[len(ttext):]
-    ttext = ValueTerminal(ttext, 'ttext')
-    _validate_xtext(ttext)
-    return ttext, value
-
-def get_token(value):
-    """token = [CFWS] 1*ttext [CFWS]
-
-    The RFC equivalent of ttext is any US-ASCII chars except space, ctls, or
-    tspecials.  We also exclude tabs even though the RFC doesn't.
-
-    The RFC implies the CFWS but is not explicit about it in the BNF.
-
-    """
-    mtoken = Token()
-    if value and value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        mtoken.append(token)
-    if value and value[0] in TOKEN_ENDS:
-        raise errors.HeaderParseError(
-            "expected token but found '{}'".format(value))
-    token, value = get_ttext(value)
-    mtoken.append(token)
-    if value and value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        mtoken.append(token)
-    return mtoken, value
-
-def get_attrtext(value):
-    """attrtext = 1*(any non-ATTRIBUTE_ENDS character)
-
-    We allow any non-ATTRIBUTE_ENDS in attrtext, but add defects to the
-    token's defects list if we find non-attrtext characters.  We also register
-    defects for *any* non-printables even though the RFC doesn't exclude all of
-    them, because we follow the spirit of RFC 5322.
-
-    """
-    m = _non_attribute_end_matcher(value)
-    if not m:
-        raise errors.HeaderParseError(
-            "expected attrtext but found {!r}".format(value))
-    attrtext = m.group()
-    value = value[len(attrtext):]
-    attrtext = ValueTerminal(attrtext, 'attrtext')
-    _validate_xtext(attrtext)
-    return attrtext, value
-
-def get_attribute(value):
-    """ [CFWS] 1*attrtext [CFWS]
-
-    This version of the BNF makes the CFWS explicit, and as usual we use a
-    value terminal for the actual run of characters.  The RFC equivalent of
-    attrtext is the token characters, with the subtraction of '*', "'", and '%'.
-    We include tab in the excluded set just as we do for token.
-
-    """
-    attribute = Attribute()
-    if value and value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        attribute.append(token)
-    if value and value[0] in ATTRIBUTE_ENDS:
-        raise errors.HeaderParseError(
-            "expected token but found '{}'".format(value))
-    token, value = get_attrtext(value)
-    attribute.append(token)
-    if value and value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        attribute.append(token)
-    return attribute, value
-
-def get_extended_attrtext(value):
-    """attrtext = 1*(any non-ATTRIBUTE_ENDS character plus '%')
-
-    This is a special parsing routine so that we get a value that
-    includes % escapes as a single string (which we decode as a single
-    string later).
-
-    """
-    m = _non_extended_attribute_end_matcher(value)
-    if not m:
-        raise errors.HeaderParseError(
-            "expected extended attrtext but found {!r}".format(value))
-    attrtext = m.group()
-    value = value[len(attrtext):]
-    attrtext = ValueTerminal(attrtext, 'extended-attrtext')
-    _validate_xtext(attrtext)
-    return attrtext, value
-
-def get_extended_attribute(value):
-    """ [CFWS] 1*extended_attrtext [CFWS]
-
-    This is like the non-extended version except we allow % characters, so that
-    we can pick up an encoded value as a single string.
-
-    """
-    # XXX: should we have an ExtendedAttribute TokenList?
-    attribute = Attribute()
-    if value and value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        attribute.append(token)
-    if value and value[0] in EXTENDED_ATTRIBUTE_ENDS:
-        raise errors.HeaderParseError(
-            "expected token but found '{}'".format(value))
-    token, value = get_extended_attrtext(value)
-    attribute.append(token)
-    if value and value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        attribute.append(token)
-    return attribute, value
-
-def get_section(value):
-    """ '*' digits
-
-    The formal BNF is more complicated because leading 0s are not allowed.  We
-    check for that and add a defect.  We also assume no CFWS is allowed between
-    the '*' and the digits, though the RFC is not crystal clear on that.
-    The caller should already have dealt with leading CFWS.
-
-    """
-    section = Section()
-    if not value or value[0] != '*':
-        raise errors.HeaderParseError("Expected section but found {}".format(
-                                        value))
-    section.append(ValueTerminal('*', 'section-marker'))
-    value = value[1:]
-    if not value or not value[0].isdigit():
-        raise errors.HeaderParseError("Expected section number but "
-                                      "found {}".format(value))
-    digits = ''
-    while value and value[0].isdigit():
-        digits += value[0]
-        value = value[1:]
-    if digits[0] == '0' and digits != '0':
-        section.defects.append(errors.InvalidHeaderError("section number"
-            "has an invalid leading 0"))
-    section.number = int(digits)
-    section.append(ValueTerminal(digits, 'digits'))
-    return section, value
-
-
-def get_value(value):
-    """ quoted-string / attribute
-
-    """
-    v = Value()
-    if not value:
-        raise errors.HeaderParseError("Expected value but found end of string")
-    leader = None
-    if value[0] in CFWS_LEADER:
-        leader, value = get_cfws(value)
-    if not value:
-        raise errors.HeaderParseError("Expected value but found "
-                                      "only {}".format(leader))
-    if value[0] == '"':
-        token, value = get_quoted_string(value)
-    else:
-        token, value = get_extended_attribute(value)
-    if leader is not None:
-        token[:0] = [leader]
-    v.append(token)
-    return v, value
-
-def get_parameter(value):
-    """ attribute [section] ["*"] [CFWS] "=" value
-
-    The CFWS is implied by the RFC but not made explicit in the BNF.  This
-    simplified form of the BNF from the RFC is made to conform with the RFC BNF
-    through some extra checks.  We do it this way because it makes both error
-    recovery and working with the resulting parse tree easier.
-    """
-    # It is possible CFWS would also be implicitly allowed between the section
-    # and the 'extended-attribute' marker (the '*') , but we've never seen that
-    # in the wild and we will therefore ignore the possibility.
-    param = Parameter()
-    token, value = get_attribute(value)
-    param.append(token)
-    if not value or value[0] == ';':
-        param.defects.append(errors.InvalidHeaderDefect("Parameter contains "
-            "name ({}) but no value".format(token)))
-        return param, value
-    if value[0] == '*':
-        try:
-            token, value = get_section(value)
-            param.sectioned = True
-            param.append(token)
-        except errors.HeaderParseError:
-            pass
-        if not value:
-            raise errors.HeaderParseError("Incomplete parameter")
-        if value[0] == '*':
-            param.append(ValueTerminal('*', 'extended-parameter-marker'))
-            value = value[1:]
-            param.extended = True
-    if value[0] != '=':
-        raise errors.HeaderParseError("Parameter not followed by '='")
-    param.append(ValueTerminal('=', 'parameter-separator'))
-    value = value[1:]
-    leader = None
-    if value and value[0] in CFWS_LEADER:
-        token, value = get_cfws(value)
-        param.append(token)
-    remainder = None
-    appendto = param
-    if param.extended and value and value[0] == '"':
-        # Now for some serious hackery to handle the common invalid case of
-        # double quotes around an extended value.  We also accept (with defect)
-        # a value marked as encoded that isn't really.
-        qstring, remainder = get_quoted_string(value)
-        inner_value = qstring.stripped_value
-        semi_valid = False
-        if param.section_number == 0:
-            if inner_value and inner_value[0] == "'":
-                semi_valid = True
-            else:
-                token, rest = get_attrtext(inner_value)
-                if rest and rest[0] == "'":
-                    semi_valid = True
-        else:
-            try:
-                token, rest = get_extended_attrtext(inner_value)
-            except:
-                pass
-            else:
-                if not rest:
-                    semi_valid = True
-        if semi_valid:
-            param.defects.append(errors.InvalidHeaderDefect(
-                "Quoted string value for extended parameter is invalid"))
-            param.append(qstring)
-            for t in qstring:
-                if t.token_type == 'bare-quoted-string':
-                    t[:] = []
-                    appendto = t
-                    break
-            value = inner_value
-        else:
-            remainder = None
-            param.defects.append(errors.InvalidHeaderDefect(
-                "Parameter marked as extended but appears to have a "
-                "quoted string value that is non-encoded"))
-    if value and value[0] == "'":
-        token = None
-    else:
-        token, value = get_value(value)
-    if not param.extended or param.section_number > 0:
-        if not value or value[0] != "'":
-            appendto.append(token)
-            if remainder is not None:
-                assert not value, value
-                value = remainder
-            return param, value
-        param.defects.append(errors.InvalidHeaderDefect(
-            "Apparent initial-extended-value but attribute "
-            "was not marked as extended or was not initial section"))
-    if not value:
-        # Assume the charset/lang is missing and the token is the value.
-        param.defects.append(errors.InvalidHeaderDefect(
-            "Missing required charset/lang delimiters"))
-        appendto.append(token)
-        if remainder is None:
-            return param, value
-    else:
-        if token is not None:
-            for t in token:
-                if t.token_type == 'extended-attrtext':
-                    break
-            t.token_type == 'attrtext'
-            appendto.append(t)
-            param.charset = t.value
-        if value[0] != "'":
-            raise errors.HeaderParseError("Expected RFC2231 char/lang encoding "
-                                          "delimiter, but found {!r}".format(value))
-        appendto.append(ValueTerminal("'", 'RFC2231 delimiter'))
-        value = value[1:]
-        if value and value[0] != "'":
-            token, value = get_attrtext(value)
-            appendto.append(token)
-            param.lang = token.value
-            if not value or value[0] != "'":
-                raise errors.HeaderParseError("Expected RFC2231 char/lang encoding "
-                                  "delimiter, but found {}".format(value))
-        appendto.append(ValueTerminal("'", 'RFC2231 delimiter'))
-        value = value[1:]
-    if remainder is not None:
-        # Treat the rest of value as bare quoted string content.
-        v = Value()
-        while value:
-            if value[0] in WSP:
-                token, value = get_fws(value)
-            else:
-                token, value = get_qcontent(value)
-            v.append(token)
-        token = v
-    else:
-        token, value = get_value(value)
-    appendto.append(token)
-    if remainder is not None:
-        assert not value, value
-        value = remainder
-    return param, value
-
-def parse_mime_parameters(value):
-    """ parameter *( ";" parameter )
-
-    That BNF is meant to indicate this routine should only be called after
-    finding and handling the leading ';'.  There is no corresponding rule in
-    the formal RFC grammar, but it is more convenient for us for the set of
-    parameters to be treated as its own TokenList.
-
-    This is 'parse' routine because it consumes the reminaing value, but it
-    would never be called to parse a full header.  Instead it is called to
-    parse everything after the non-parameter value of a specific MIME header.
-
-    """
-    mime_parameters = MimeParameters()
-    while value:
-        try:
-            token, value = get_parameter(value)
-            mime_parameters.append(token)
-        except errors.HeaderParseError as err:
-            leader = None
-            if value[0] in CFWS_LEADER:
-                leader, value = get_cfws(value)
-            if not value:
-                mime_parameters.append(leader)
-                return mime_parameters
-            if value[0] == ';':
-                if leader is not None:
-                    mime_parameters.append(leader)
-                mime_parameters.defects.append(errors.InvalidHeaderDefect(
-                    "parameter entry with no content"))
-            else:
-                token, value = get_invalid_parameter(value)
-                if leader:
-                    token[:0] = [leader]
-                mime_parameters.append(token)
-                mime_parameters.defects.append(errors.InvalidHeaderDefect(
-                    "invalid parameter {!r}".format(token)))
-        if value and value[0] != ';':
-            # Junk after the otherwise valid parameter.  Mark it as
-            # invalid, but it will have a value.
-            param = mime_parameters[-1]
-            param.token_type = 'invalid-parameter'
-            token, value = get_invalid_parameter(value)
-            param.extend(token)
-            mime_parameters.defects.append(errors.InvalidHeaderDefect(
-                "parameter with invalid trailing text {!r}".format(token)))
-        if value:
-            # Must be a ';' at this point.
-            mime_parameters.append(ValueTerminal(';', 'parameter-separator'))
-            value = value[1:]
-    return mime_parameters
-
-def _find_mime_parameters(tokenlist, value):
-    """Do our best to find the parameters in an invalid MIME header
-
-    """
-    while value and value[0] != ';':
-        if value[0] in PHRASE_ENDS:
-            tokenlist.append(ValueTerminal(value[0], 'misplaced-special'))
-            value = value[1:]
-        else:
-            token, value = get_phrase(value)
-            tokenlist.append(token)
-    if not value:
-        return
-    tokenlist.append(ValueTerminal(';', 'parameter-separator'))
-    tokenlist.append(parse_mime_parameters(value[1:]))
-
-def parse_content_type_header(value):
-    """ maintype "/" subtype *( ";" parameter )
-
-    The maintype and substype are tokens.  Theoretically they could
-    be checked against the official IANA list + x-token, but we
-    don't do that.
-    """
-    ctype = ContentType()
-    recover = False
-    if not value:
-        ctype.defects.append(errors.HeaderMissingRequiredValue(
-            "Missing content type specification"))
-        return ctype
-    try:
-        token, value = get_token(value)
-    except errors.HeaderParseError:
-        ctype.defects.append(errors.InvalidHeaderDefect(
-            "Expected content maintype but found {!r}".format(value)))
-        _find_mime_parameters(ctype, value)
-        return ctype
-    ctype.append(token)
-    # XXX: If we really want to follow the formal grammar we should make
-    # mantype and subtype specialized TokenLists here.  Probably not worth it.
-    if not value or value[0] != '/':
-        ctype.defects.append(errors.InvalidHeaderDefect(
-            "Invalid content type"))
-        if value:
-            _find_mime_parameters(ctype, value)
-        return ctype
-    ctype.maintype = token.value.strip().lower()
-    ctype.append(ValueTerminal('/', 'content-type-separator'))
-    value = value[1:]
-    try:
-        token, value = get_token(value)
-    except errors.HeaderParseError:
-        ctype.defects.append(errors.InvalidHeaderDefect(
-            "Expected content subtype but found {!r}".format(value)))
-        _find_mime_parameters(ctype, value)
-        return ctype
-    ctype.append(token)
-    ctype.subtype = token.value.strip().lower()
-    if not value:
-        return ctype
-    if value[0] != ';':
-        ctype.defects.append(errors.InvalidHeaderDefect(
-            "Only parameters are valid after content type, but "
-            "found {!r}".format(value)))
-        # The RFC requires that a syntactically invalid content-type be treated
-        # as text/plain.  Perhaps we should postel this, but we should probably
-        # only do that if we were checking the subtype value against IANA.
-        del ctype.maintype, ctype.subtype
-        _find_mime_parameters(ctype, value)
-        return ctype
-    ctype.append(ValueTerminal(';', 'parameter-separator'))
-    ctype.append(parse_mime_parameters(value[1:]))
-    return ctype
-
-def parse_content_disposition_header(value):
-    """ disposition-type *( ";" parameter )
-
-    """
-    disp_header = ContentDisposition()
-    if not value:
-        disp_header.defects.append(errors.HeaderMissingRequiredValue(
-            "Missing content disposition"))
-        return disp_header
-    try:
-        token, value = get_token(value)
-    except errors.HeaderParseError:
-        ctype.defects.append(errors.InvalidHeaderDefect(
-            "Expected content disposition but found {!r}".format(value)))
-        _find_mime_parameters(disp_header, value)
-        return disp_header
-    disp_header.append(token)
-    disp_header.content_disposition = token.value.strip().lower()
-    if not value:
-        return disp_header
-    if value[0] != ';':
-        disp_header.defects.append(errors.InvalidHeaderDefect(
-            "Only parameters are valid after content disposition, but "
-            "found {!r}".format(value)))
-        _find_mime_parameters(disp_header, value)
-        return disp_header
-    disp_header.append(ValueTerminal(';', 'parameter-separator'))
-    disp_header.append(parse_mime_parameters(value[1:]))
-    return disp_header
-
-def parse_content_transfer_encoding_header(value):
-    """ mechanism
-
-    """
-    # We should probably validate the values, since the list is fixed.
-    cte_header = ContentTransferEncoding()
-    if not value:
-        cte_header.defects.append(errors.HeaderMissingRequiredValue(
-            "Missing content transfer encoding"))
-        return cte_header
-    try:
-        token, value = get_token(value)
-    except errors.HeaderParseError:
-        ctype.defects.append(errors.InvalidHeaderDefect(
-            "Expected content trnasfer encoding but found {!r}".format(value)))
-    else:
-        cte_header.append(token)
-        cte_header.cte = token.value.strip().lower()
-    if not value:
-        return cte_header
-    while value:
-        cte_header.defects.append(errors.InvalidHeaderDefect(
-            "Extra text after content transfer encoding"))
-        if value[0] in PHRASE_ENDS:
-            cte_header.append(ValueTerminal(value[0], 'misplaced-special'))
-            value = value[1:]
-        else:
-            token, value = get_phrase(value)
-            cte_header.append(token)
-    return cte_header
diff --git a/lib/future/backports/email/_parseaddr.py b/lib/future/backports/email/_parseaddr.py
deleted file mode 100644
index 5b50cc6b..00000000
--- a/lib/future/backports/email/_parseaddr.py
+++ /dev/null
@@ -1,546 +0,0 @@
-# Copyright (C) 2002-2007 Python Software Foundation
-# Contact: email-sig@python.org
-
-"""Email address parsing code.
-
-Lifted directly from rfc822.py.  This should eventually be rewritten.
-"""
-
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-from future.builtins import int
-
-__all__ = [
-    'mktime_tz',
-    'parsedate',
-    'parsedate_tz',
-    'quote',
-    ]
-
-import time, calendar
-
-SPACE = ' '
-EMPTYSTRING = ''
-COMMASPACE = ', '
-
-# Parse a date field
-_monthnames = ['jan', 'feb', 'mar', 'apr', 'may', 'jun', 'jul',
-               'aug', 'sep', 'oct', 'nov', 'dec',
-               'january', 'february', 'march', 'april', 'may', 'june', 'july',
-               'august', 'september', 'october', 'november', 'december']
-
-_daynames = ['mon', 'tue', 'wed', 'thu', 'fri', 'sat', 'sun']
-
-# The timezone table does not include the military time zones defined
-# in RFC822, other than Z.  According to RFC1123, the description in
-# RFC822 gets the signs wrong, so we can't rely on any such time
-# zones.  RFC1123 recommends that numeric timezone indicators be used
-# instead of timezone names.
-
-_timezones = {'UT':0, 'UTC':0, 'GMT':0, 'Z':0,
-              'AST': -400, 'ADT': -300,  # Atlantic (used in Canada)
-              'EST': -500, 'EDT': -400,  # Eastern
-              'CST': -600, 'CDT': -500,  # Central
-              'MST': -700, 'MDT': -600,  # Mountain
-              'PST': -800, 'PDT': -700   # Pacific
-              }
-
-
-def parsedate_tz(data):
-    """Convert a date string to a time tuple.
-
-    Accounts for military timezones.
-    """
-    res = _parsedate_tz(data)
-    if not res:
-        return
-    if res[9] is None:
-        res[9] = 0
-    return tuple(res)
-
-def _parsedate_tz(data):
-    """Convert date to extended time tuple.
-
-    The last (additional) element is the time zone offset in seconds, except if
-    the timezone was specified as -0000.  In that case the last element is
-    None.  This indicates a UTC timestamp that explicitly declaims knowledge of
-    the source timezone, as opposed to a +0000 timestamp that indicates the
-    source timezone really was UTC.
-
-    """
-    if not data:
-        return
-    data = data.split()
-    # The FWS after the comma after the day-of-week is optional, so search and
-    # adjust for this.
-    if data[0].endswith(',') or data[0].lower() in _daynames:
-        # There's a dayname here. Skip it
-        del data[0]
-    else:
-        i = data[0].rfind(',')
-        if i >= 0:
-            data[0] = data[0][i+1:]
-    if len(data) == 3: # RFC 850 date, deprecated
-        stuff = data[0].split('-')
-        if len(stuff) == 3:
-            data = stuff + data[1:]
-    if len(data) == 4:
-        s = data[3]
-        i = s.find('+')
-        if i == -1:
-            i = s.find('-')
-        if i > 0:
-            data[3:] = [s[:i], s[i:]]
-        else:
-            data.append('') # Dummy tz
-    if len(data) < 5:
-        return None
-    data = data[:5]
-    [dd, mm, yy, tm, tz] = data
-    mm = mm.lower()
-    if mm not in _monthnames:
-        dd, mm = mm, dd.lower()
-        if mm not in _monthnames:
-            return None
-    mm = _monthnames.index(mm) + 1
-    if mm > 12:
-        mm -= 12
-    if dd[-1] == ',':
-        dd = dd[:-1]
-    i = yy.find(':')
-    if i > 0:
-        yy, tm = tm, yy
-    if yy[-1] == ',':
-        yy = yy[:-1]
-    if not yy[0].isdigit():
-        yy, tz = tz, yy
-    if tm[-1] == ',':
-        tm = tm[:-1]
-    tm = tm.split(':')
-    if len(tm) == 2:
-        [thh, tmm] = tm
-        tss = '0'
-    elif len(tm) == 3:
-        [thh, tmm, tss] = tm
-    elif len(tm) == 1 and '.' in tm[0]:
-        # Some non-compliant MUAs use '.' to separate time elements.
-        tm = tm[0].split('.')
-        if len(tm) == 2:
-            [thh, tmm] = tm
-            tss = 0
-        elif len(tm) == 3:
-            [thh, tmm, tss] = tm
-    else:
-        return None
-    try:
-        yy = int(yy)
-        dd = int(dd)
-        thh = int(thh)
-        tmm = int(tmm)
-        tss = int(tss)
-    except ValueError:
-        return None
-    # Check for a yy specified in two-digit format, then convert it to the
-    # appropriate four-digit format, according to the POSIX standard. RFC 822
-    # calls for a two-digit yy, but RFC 2822 (which obsoletes RFC 822)
-    # mandates a 4-digit yy. For more information, see the documentation for
-    # the time module.
-    if yy < 100:
-        # The year is between 1969 and 1999 (inclusive).
-        if yy > 68:
-            yy += 1900
-        # The year is between 2000 and 2068 (inclusive).
-        else:
-            yy += 2000
-    tzoffset = None
-    tz = tz.upper()
-    if tz in _timezones:
-        tzoffset = _timezones[tz]
-    else:
-        try:
-            tzoffset = int(tz)
-        except ValueError:
-            pass
-        if tzoffset==0 and tz.startswith('-'):
-            tzoffset = None
-    # Convert a timezone offset into seconds ; -0500 -> -18000
-    if tzoffset:
-        if tzoffset < 0:
-            tzsign = -1
-            tzoffset = -tzoffset
-        else:
-            tzsign = 1
-        tzoffset = tzsign * ( (tzoffset//100)*3600 + (tzoffset % 100)*60)
-    # Daylight Saving Time flag is set to -1, since DST is unknown.
-    return [yy, mm, dd, thh, tmm, tss, 0, 1, -1, tzoffset]
-
-
-def parsedate(data):
-    """Convert a time string to a time tuple."""
-    t = parsedate_tz(data)
-    if isinstance(t, tuple):
-        return t[:9]
-    else:
-        return t
-
-
-def mktime_tz(data):
-    """Turn a 10-tuple as returned by parsedate_tz() into a POSIX timestamp."""
-    if data[9] is None:
-        # No zone info, so localtime is better assumption than GMT
-        return time.mktime(data[:8] + (-1,))
-    else:
-        t = calendar.timegm(data)
-        return t - data[9]
-
-
-def quote(str):
-    """Prepare string to be used in a quoted string.
-
-    Turns backslash and double quote characters into quoted pairs.  These
-    are the only characters that need to be quoted inside a quoted string.
-    Does not add the surrounding double quotes.
-    """
-    return str.replace('\\', '\\\\').replace('"', '\\"')
-
-
-class AddrlistClass(object):
-    """Address parser class by Ben Escoto.
-
-    To understand what this class does, it helps to have a copy of RFC 2822 in
-    front of you.
-
-    Note: this class interface is deprecated and may be removed in the future.
-    Use email.utils.AddressList instead.
-    """
-
-    def __init__(self, field):
-        """Initialize a new instance.
-
-        `field' is an unparsed address header field, containing
-        one or more addresses.
-        """
-        self.specials = '()<>@,:;.\"[]'
-        self.pos = 0
-        self.LWS = ' \t'
-        self.CR = '\r\n'
-        self.FWS = self.LWS + self.CR
-        self.atomends = self.specials + self.LWS + self.CR
-        # Note that RFC 2822 now specifies `.' as obs-phrase, meaning that it
-        # is obsolete syntax.  RFC 2822 requires that we recognize obsolete
-        # syntax, so allow dots in phrases.
-        self.phraseends = self.atomends.replace('.', '')
-        self.field = field
-        self.commentlist = []
-
-    def gotonext(self):
-        """Skip white space and extract comments."""
-        wslist = []
-        while self.pos < len(self.field):
-            if self.field[self.pos] in self.LWS + '\n\r':
-                if self.field[self.pos] not in '\n\r':
-                    wslist.append(self.field[self.pos])
-                self.pos += 1
-            elif self.field[self.pos] == '(':
-                self.commentlist.append(self.getcomment())
-            else:
-                break
-        return EMPTYSTRING.join(wslist)
-
-    def getaddrlist(self):
-        """Parse all addresses.
-
-        Returns a list containing all of the addresses.
-        """
-        result = []
-        while self.pos < len(self.field):
-            ad = self.getaddress()
-            if ad:
-                result += ad
-            else:
-                result.append(('', ''))
-        return result
-
-    def getaddress(self):
-        """Parse the next address."""
-        self.commentlist = []
-        self.gotonext()
-
-        oldpos = self.pos
-        oldcl = self.commentlist
-        plist = self.getphraselist()
-
-        self.gotonext()
-        returnlist = []
-
-        if self.pos >= len(self.field):
-            # Bad email address technically, no domain.
-            if plist:
-                returnlist = [(SPACE.join(self.commentlist), plist[0])]
-
-        elif self.field[self.pos] in '.@':
-            # email address is just an addrspec
-            # this isn't very efficient since we start over
-            self.pos = oldpos
-            self.commentlist = oldcl
-            addrspec = self.getaddrspec()
-            returnlist = [(SPACE.join(self.commentlist), addrspec)]
-
-        elif self.field[self.pos] == ':':
-            # address is a group
-            returnlist = []
-
-            fieldlen = len(self.field)
-            self.pos += 1
-            while self.pos < len(self.field):
-                self.gotonext()
-                if self.pos < fieldlen and self.field[self.pos] == ';':
-                    self.pos += 1
-                    break
-                returnlist = returnlist + self.getaddress()
-
-        elif self.field[self.pos] == '<':
-            # Address is a phrase then a route addr
-            routeaddr = self.getrouteaddr()
-
-            if self.commentlist:
-                returnlist = [(SPACE.join(plist) + ' (' +
-                               ' '.join(self.commentlist) + ')', routeaddr)]
-            else:
-                returnlist = [(SPACE.join(plist), routeaddr)]
-
-        else:
-            if plist:
-                returnlist = [(SPACE.join(self.commentlist), plist[0])]
-            elif self.field[self.pos] in self.specials:
-                self.pos += 1
-
-        self.gotonext()
-        if self.pos < len(self.field) and self.field[self.pos] == ',':
-            self.pos += 1
-        return returnlist
-
-    def getrouteaddr(self):
-        """Parse a route address (Return-path value).
-
-        This method just skips all the route stuff and returns the addrspec.
-        """
-        if self.field[self.pos] != '<':
-            return
-
-        expectroute = False
-        self.pos += 1
-        self.gotonext()
-        adlist = ''
-        while self.pos < len(self.field):
-            if expectroute:
-                self.getdomain()
-                expectroute = False
-            elif self.field[self.pos] == '>':
-                self.pos += 1
-                break
-            elif self.field[self.pos] == '@':
-                self.pos += 1
-                expectroute = True
-            elif self.field[self.pos] == ':':
-                self.pos += 1
-            else:
-                adlist = self.getaddrspec()
-                self.pos += 1
-                break
-            self.gotonext()
-
-        return adlist
-
-    def getaddrspec(self):
-        """Parse an RFC 2822 addr-spec."""
-        aslist = []
-
-        self.gotonext()
-        while self.pos < len(self.field):
-            preserve_ws = True
-            if self.field[self.pos] == '.':
-                if aslist and not aslist[-1].strip():
-                    aslist.pop()
-                aslist.append('.')
-                self.pos += 1
-                preserve_ws = False
-            elif self.field[self.pos] == '"':
-                aslist.append('"%s"' % quote(self.getquote()))
-            elif self.field[self.pos] in self.atomends:
-                if aslist and not aslist[-1].strip():
-                    aslist.pop()
-                break
-            else:
-                aslist.append(self.getatom())
-            ws = self.gotonext()
-            if preserve_ws and ws:
-                aslist.append(ws)
-
-        if self.pos >= len(self.field) or self.field[self.pos] != '@':
-            return EMPTYSTRING.join(aslist)
-
-        aslist.append('@')
-        self.pos += 1
-        self.gotonext()
-        return EMPTYSTRING.join(aslist) + self.getdomain()
-
-    def getdomain(self):
-        """Get the complete domain name from an address."""
-        sdlist = []
-        while self.pos < len(self.field):
-            if self.field[self.pos] in self.LWS:
-                self.pos += 1
-            elif self.field[self.pos] == '(':
-                self.commentlist.append(self.getcomment())
-            elif self.field[self.pos] == '[':
-                sdlist.append(self.getdomainliteral())
-            elif self.field[self.pos] == '.':
-                self.pos += 1
-                sdlist.append('.')
-            elif self.field[self.pos] in self.atomends:
-                break
-            else:
-                sdlist.append(self.getatom())
-        return EMPTYSTRING.join(sdlist)
-
-    def getdelimited(self, beginchar, endchars, allowcomments=True):
-        """Parse a header fragment delimited by special characters.
-
-        `beginchar' is the start character for the fragment.
-        If self is not looking at an instance of `beginchar' then
-        getdelimited returns the empty string.
-
-        `endchars' is a sequence of allowable end-delimiting characters.
-        Parsing stops when one of these is encountered.
-
-        If `allowcomments' is non-zero, embedded RFC 2822 comments are allowed
-        within the parsed fragment.
-        """
-        if self.field[self.pos] != beginchar:
-            return ''
-
-        slist = ['']
-        quote = False
-        self.pos += 1
-        while self.pos < len(self.field):
-            if quote:
-                slist.append(self.field[self.pos])
-                quote = False
-            elif self.field[self.pos] in endchars:
-                self.pos += 1
-                break
-            elif allowcomments and self.field[self.pos] == '(':
-                slist.append(self.getcomment())
-                continue        # have already advanced pos from getcomment
-            elif self.field[self.pos] == '\\':
-                quote = True
-            else:
-                slist.append(self.field[self.pos])
-            self.pos += 1
-
-        return EMPTYSTRING.join(slist)
-
-    def getquote(self):
-        """Get a quote-delimited fragment from self's field."""
-        return self.getdelimited('"', '"\r', False)
-
-    def getcomment(self):
-        """Get a parenthesis-delimited fragment from self's field."""
-        return self.getdelimited('(', ')\r', True)
-
-    def getdomainliteral(self):
-        """Parse an RFC 2822 domain-literal."""
-        return '[%s]' % self.getdelimited('[', ']\r', False)
-
-    def getatom(self, atomends=None):
-        """Parse an RFC 2822 atom.
-
-        Optional atomends specifies a different set of end token delimiters
-        (the default is to use self.atomends).  This is used e.g. in
-        getphraselist() since phrase endings must not include the `.' (which
-        is legal in phrases)."""
-        atomlist = ['']
-        if atomends is None:
-            atomends = self.atomends
-
-        while self.pos < len(self.field):
-            if self.field[self.pos] in atomends:
-                break
-            else:
-                atomlist.append(self.field[self.pos])
-            self.pos += 1
-
-        return EMPTYSTRING.join(atomlist)
-
-    def getphraselist(self):
-        """Parse a sequence of RFC 2822 phrases.
-
-        A phrase is a sequence of words, which are in turn either RFC 2822
-        atoms or quoted-strings.  Phrases are canonicalized by squeezing all
-        runs of continuous whitespace into one space.
-        """
-        plist = []
-
-        while self.pos < len(self.field):
-            if self.field[self.pos] in self.FWS:
-                self.pos += 1
-            elif self.field[self.pos] == '"':
-                plist.append(self.getquote())
-            elif self.field[self.pos] == '(':
-                self.commentlist.append(self.getcomment())
-            elif self.field[self.pos] in self.phraseends:
-                break
-            else:
-                plist.append(self.getatom(self.phraseends))
-
-        return plist
-
-class AddressList(AddrlistClass):
-    """An AddressList encapsulates a list of parsed RFC 2822 addresses."""
-    def __init__(self, field):
-        AddrlistClass.__init__(self, field)
-        if field:
-            self.addresslist = self.getaddrlist()
-        else:
-            self.addresslist = []
-
-    def __len__(self):
-        return len(self.addresslist)
-
-    def __add__(self, other):
-        # Set union
-        newaddr = AddressList(None)
-        newaddr.addresslist = self.addresslist[:]
-        for x in other.addresslist:
-            if not x in self.addresslist:
-                newaddr.addresslist.append(x)
-        return newaddr
-
-    def __iadd__(self, other):
-        # Set union, in-place
-        for x in other.addresslist:
-            if not x in self.addresslist:
-                self.addresslist.append(x)
-        return self
-
-    def __sub__(self, other):
-        # Set difference
-        newaddr = AddressList(None)
-        for x in self.addresslist:
-            if not x in other.addresslist:
-                newaddr.addresslist.append(x)
-        return newaddr
-
-    def __isub__(self, other):
-        # Set difference, in-place
-        for x in other.addresslist:
-            if x in self.addresslist:
-                self.addresslist.remove(x)
-        return self
-
-    def __getitem__(self, index):
-        # Make indexing, slices, and 'in' work
-        return self.addresslist[index]
diff --git a/lib/future/backports/email/_policybase.py b/lib/future/backports/email/_policybase.py
deleted file mode 100644
index c66aea90..00000000
--- a/lib/future/backports/email/_policybase.py
+++ /dev/null
@@ -1,365 +0,0 @@
-"""Policy framework for the email package.
-
-Allows fine grained feature control of how the package parses and emits data.
-"""
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-from future.builtins import super
-from future.builtins import str
-from future.utils import with_metaclass
-
-import abc
-from future.backports.email import header
-from future.backports.email import charset as _charset
-from future.backports.email.utils import _has_surrogates
-
-__all__ = [
-    'Policy',
-    'Compat32',
-    'compat32',
-    ]
-
-
-class _PolicyBase(object):
-
-    """Policy Object basic framework.
-
-    This class is useless unless subclassed.  A subclass should define
-    class attributes with defaults for any values that are to be
-    managed by the Policy object.  The constructor will then allow
-    non-default values to be set for these attributes at instance
-    creation time.  The instance will be callable, taking these same
-    attributes keyword arguments, and returning a new instance
-    identical to the called instance except for those values changed
-    by the keyword arguments.  Instances may be added, yielding new
-    instances with any non-default values from the right hand
-    operand overriding those in the left hand operand.  That is,
-
-        A + B == A(<non-default values of B>)
-
-    The repr of an instance can be used to reconstruct the object
-    if and only if the repr of the values can be used to reconstruct
-    those values.
-
-    """
-
-    def __init__(self, **kw):
-        """Create new Policy, possibly overriding some defaults.
-
-        See class docstring for a list of overridable attributes.
-
-        """
-        for name, value in kw.items():
-            if hasattr(self, name):
-                super(_PolicyBase,self).__setattr__(name, value)
-            else:
-                raise TypeError(
-                    "{!r} is an invalid keyword argument for {}".format(
-                        name, self.__class__.__name__))
-
-    def __repr__(self):
-        args = [ "{}={!r}".format(name, value)
-                 for name, value in self.__dict__.items() ]
-        return "{}({})".format(self.__class__.__name__, ', '.join(args))
-
-    def clone(self, **kw):
-        """Return a new instance with specified attributes changed.
-
-        The new instance has the same attribute values as the current object,
-        except for the changes passed in as keyword arguments.
-
-        """
-        newpolicy = self.__class__.__new__(self.__class__)
-        for attr, value in self.__dict__.items():
-            object.__setattr__(newpolicy, attr, value)
-        for attr, value in kw.items():
-            if not hasattr(self, attr):
-                raise TypeError(
-                    "{!r} is an invalid keyword argument for {}".format(
-                        attr, self.__class__.__name__))
-            object.__setattr__(newpolicy, attr, value)
-        return newpolicy
-
-    def __setattr__(self, name, value):
-        if hasattr(self, name):
-            msg = "{!r} object attribute {!r} is read-only"
-        else:
-            msg = "{!r} object has no attribute {!r}"
-        raise AttributeError(msg.format(self.__class__.__name__, name))
-
-    def __add__(self, other):
-        """Non-default values from right operand override those from left.
-
-        The object returned is a new instance of the subclass.
-
-        """
-        return self.clone(**other.__dict__)
-
-
-def _append_doc(doc, added_doc):
-    doc = doc.rsplit('\n', 1)[0]
-    added_doc = added_doc.split('\n', 1)[1]
-    return doc + '\n' + added_doc
-
-def _extend_docstrings(cls):
-    if cls.__doc__ and cls.__doc__.startswith('+'):
-        cls.__doc__ = _append_doc(cls.__bases__[0].__doc__, cls.__doc__)
-    for name, attr in cls.__dict__.items():
-        if attr.__doc__ and attr.__doc__.startswith('+'):
-            for c in (c for base in cls.__bases__ for c in base.mro()):
-                doc = getattr(getattr(c, name), '__doc__')
-                if doc:
-                    attr.__doc__ = _append_doc(doc, attr.__doc__)
-                    break
-    return cls
-
-
-class Policy(with_metaclass(abc.ABCMeta, _PolicyBase)):
-
-    r"""Controls for how messages are interpreted and formatted.
-
-    Most of the classes and many of the methods in the email package accept
-    Policy objects as parameters.  A Policy object contains a set of values and
-    functions that control how input is interpreted and how output is rendered.
-    For example, the parameter 'raise_on_defect' controls whether or not an RFC
-    violation results in an error being raised or not, while 'max_line_length'
-    controls the maximum length of output lines when a Message is serialized.
-
-    Any valid attribute may be overridden when a Policy is created by passing
-    it as a keyword argument to the constructor.  Policy objects are immutable,
-    but a new Policy object can be created with only certain values changed by
-    calling the Policy instance with keyword arguments.  Policy objects can
-    also be added, producing a new Policy object in which the non-default
-    attributes set in the right hand operand overwrite those specified in the
-    left operand.
-
-    Settable attributes:
-
-    raise_on_defect     -- If true, then defects should be raised as errors.
-                           Default: False.
-
-    linesep             -- string containing the value to use as separation
-                           between output lines.  Default '\n'.
-
-    cte_type            -- Type of allowed content transfer encodings
-
-                           7bit  -- ASCII only
-                           8bit  -- Content-Transfer-Encoding: 8bit is allowed
-
-                           Default: 8bit.  Also controls the disposition of
-                           (RFC invalid) binary data in headers; see the
-                           documentation of the binary_fold method.
-
-    max_line_length     -- maximum length of lines, excluding 'linesep',
-                           during serialization.  None or 0 means no line
-                           wrapping is done.  Default is 78.
-
-    """
-
-    raise_on_defect = False
-    linesep = '\n'
-    cte_type = '8bit'
-    max_line_length = 78
-
-    def handle_defect(self, obj, defect):
-        """Based on policy, either raise defect or call register_defect.
-
-            handle_defect(obj, defect)
-
-        defect should be a Defect subclass, but in any case must be an
-        Exception subclass.  obj is the object on which the defect should be
-        registered if it is not raised.  If the raise_on_defect is True, the
-        defect is raised as an error, otherwise the object and the defect are
-        passed to register_defect.
-
-        This method is intended to be called by parsers that discover defects.
-        The email package parsers always call it with Defect instances.
-
-        """
-        if self.raise_on_defect:
-            raise defect
-        self.register_defect(obj, defect)
-
-    def register_defect(self, obj, defect):
-        """Record 'defect' on 'obj'.
-
-        Called by handle_defect if raise_on_defect is False.  This method is
-        part of the Policy API so that Policy subclasses can implement custom
-        defect handling.  The default implementation calls the append method of
-        the defects attribute of obj.  The objects used by the email package by
-        default that get passed to this method will always have a defects
-        attribute with an append method.
-
-        """
-        obj.defects.append(defect)
-
-    def header_max_count(self, name):
-        """Return the maximum allowed number of headers named 'name'.
-
-        Called when a header is added to a Message object.  If the returned
-        value is not 0 or None, and there are already a number of headers with
-        the name 'name' equal to the value returned, a ValueError is raised.
-
-        Because the default behavior of Message's __setitem__ is to append the
-        value to the list of headers, it is easy to create duplicate headers
-        without realizing it.  This method allows certain headers to be limited
-        in the number of instances of that header that may be added to a
-        Message programmatically.  (The limit is not observed by the parser,
-        which will faithfully produce as many headers as exist in the message
-        being parsed.)
-
-        The default implementation returns None for all header names.
-        """
-        return None
-
-    @abc.abstractmethod
-    def header_source_parse(self, sourcelines):
-        """Given a list of linesep terminated strings constituting the lines of
-        a single header, return the (name, value) tuple that should be stored
-        in the model.  The input lines should retain their terminating linesep
-        characters.  The lines passed in by the email package may contain
-        surrogateescaped binary data.
-        """
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def header_store_parse(self, name, value):
-        """Given the header name and the value provided by the application
-        program, return the (name, value) that should be stored in the model.
-        """
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def header_fetch_parse(self, name, value):
-        """Given the header name and the value from the model, return the value
-        to be returned to the application program that is requesting that
-        header.  The value passed in by the email package may contain
-        surrogateescaped binary data if the lines were parsed by a BytesParser.
-        The returned value should not contain any surrogateescaped data.
-
-        """
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def fold(self, name, value):
-        """Given the header name and the value from the model, return a string
-        containing linesep characters that implement the folding of the header
-        according to the policy controls.  The value passed in by the email
-        package may contain surrogateescaped binary data if the lines were
-        parsed by a BytesParser.  The returned value should not contain any
-        surrogateescaped data.
-
-        """
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def fold_binary(self, name, value):
-        """Given the header name and the value from the model, return binary
-        data containing linesep characters that implement the folding of the
-        header according to the policy controls.  The value passed in by the
-        email package may contain surrogateescaped binary data.
-
-        """
-        raise NotImplementedError
-
-
-@_extend_docstrings
-class Compat32(Policy):
-
-    """+
-    This particular policy is the backward compatibility Policy.  It
-    replicates the behavior of the email package version 5.1.
-    """
-
-    def _sanitize_header(self, name, value):
-        # If the header value contains surrogates, return a Header using
-        # the unknown-8bit charset to encode the bytes as encoded words.
-        if not isinstance(value, str):
-            # Assume it is already a header object
-            return value
-        if _has_surrogates(value):
-            return header.Header(value, charset=_charset.UNKNOWN8BIT,
-                                 header_name=name)
-        else:
-            return value
-
-    def header_source_parse(self, sourcelines):
-        """+
-        The name is parsed as everything up to the ':' and returned unmodified.
-        The value is determined by stripping leading whitespace off the
-        remainder of the first line, joining all subsequent lines together, and
-        stripping any trailing carriage return or linefeed characters.
-
-        """
-        name, value = sourcelines[0].split(':', 1)
-        value = value.lstrip(' \t') + ''.join(sourcelines[1:])
-        return (name, value.rstrip('\r\n'))
-
-    def header_store_parse(self, name, value):
-        """+
-        The name and value are returned unmodified.
-        """
-        return (name, value)
-
-    def header_fetch_parse(self, name, value):
-        """+
-        If the value contains binary data, it is converted into a Header object
-        using the unknown-8bit charset.  Otherwise it is returned unmodified.
-        """
-        return self._sanitize_header(name, value)
-
-    def fold(self, name, value):
-        """+
-        Headers are folded using the Header folding algorithm, which preserves
-        existing line breaks in the value, and wraps each resulting line to the
-        max_line_length.  Non-ASCII binary data are CTE encoded using the
-        unknown-8bit charset.
-
-        """
-        return self._fold(name, value, sanitize=True)
-
-    def fold_binary(self, name, value):
-        """+
-        Headers are folded using the Header folding algorithm, which preserves
-        existing line breaks in the value, and wraps each resulting line to the
-        max_line_length.  If cte_type is 7bit, non-ascii binary data is CTE
-        encoded using the unknown-8bit charset.  Otherwise the original source
-        header is used, with its existing line breaks and/or binary data.
-
-        """
-        folded = self._fold(name, value, sanitize=self.cte_type=='7bit')
-        return folded.encode('ascii', 'surrogateescape')
-
-    def _fold(self, name, value, sanitize):
-        parts = []
-        parts.append('%s: ' % name)
-        if isinstance(value, str):
-            if _has_surrogates(value):
-                if sanitize:
-                    h = header.Header(value,
-                                      charset=_charset.UNKNOWN8BIT,
-                                      header_name=name)
-                else:
-                    # If we have raw 8bit data in a byte string, we have no idea
-                    # what the encoding is.  There is no safe way to split this
-                    # string.  If it's ascii-subset, then we could do a normal
-                    # ascii split, but if it's multibyte then we could break the
-                    # string.  There's no way to know so the least harm seems to
-                    # be to not split the string and risk it being too long.
-                    parts.append(value)
-                    h = None
-            else:
-                h = header.Header(value, header_name=name)
-        else:
-            # Assume it is a Header-like object.
-            h = value
-        if h is not None:
-            parts.append(h.encode(linesep=self.linesep,
-                                  maxlinelen=self.max_line_length))
-        parts.append(self.linesep)
-        return ''.join(parts)
-
-
-compat32 = Compat32()
diff --git a/lib/future/backports/email/base64mime.py b/lib/future/backports/email/base64mime.py
deleted file mode 100644
index 296392a6..00000000
--- a/lib/future/backports/email/base64mime.py
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright (C) 2002-2007 Python Software Foundation
-# Author: Ben Gertzfield
-# Contact: email-sig@python.org
-
-"""Base64 content transfer encoding per RFCs 2045-2047.
-
-This module handles the content transfer encoding method defined in RFC 2045
-to encode arbitrary 8-bit data using the three 8-bit bytes in four 7-bit
-characters encoding known as Base64.
-
-It is used in the MIME standards for email to attach images, audio, and text
-using some 8-bit character sets to messages.
-
-This module provides an interface to encode and decode both headers and bodies
-with Base64 encoding.
-
-RFC 2045 defines a method for including character set information in an
-`encoded-word' in a header.  This method is commonly used for 8-bit real names
-in To:, From:, Cc:, etc. fields, as well as Subject: lines.
-
-This module does not do the line wrapping or end-of-line character conversion
-necessary for proper internationalized headers; it only does dumb encoding and
-decoding.  To deal with the various line wrapping issues, use the email.header
-module.
-"""
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from future.builtins import range
-from future.builtins import bytes
-from future.builtins import str
-
-__all__ = [
-    'body_decode',
-    'body_encode',
-    'decode',
-    'decodestring',
-    'header_encode',
-    'header_length',
-    ]
-
-
-from base64 import b64encode
-from binascii import b2a_base64, a2b_base64
-
-CRLF = '\r\n'
-NL = '\n'
-EMPTYSTRING = ''
-
-# See also Charset.py
-MISC_LEN = 7
-
-
-# Helpers
-def header_length(bytearray):
-    """Return the length of s when it is encoded with base64."""
-    groups_of_3, leftover = divmod(len(bytearray), 3)
-    # 4 bytes out for each 3 bytes (or nonzero fraction thereof) in.
-    n = groups_of_3 * 4
-    if leftover:
-        n += 4
-    return n
-
-
-def header_encode(header_bytes, charset='iso-8859-1'):
-    """Encode a single header line with Base64 encoding in a given charset.
-
-    charset names the character set to use to encode the header.  It defaults
-    to iso-8859-1.  Base64 encoding is defined in RFC 2045.
-    """
-    if not header_bytes:
-        return ""
-    if isinstance(header_bytes, str):
-        header_bytes = header_bytes.encode(charset)
-    encoded = b64encode(header_bytes).decode("ascii")
-    return '=?%s?b?%s?=' % (charset, encoded)
-
-
-def body_encode(s, maxlinelen=76, eol=NL):
-    r"""Encode a string with base64.
-
-    Each line will be wrapped at, at most, maxlinelen characters (defaults to
-    76 characters).
-
-    Each line of encoded text will end with eol, which defaults to "\n".  Set
-    this to "\r\n" if you will be using the result of this function directly
-    in an email.
-    """
-    if not s:
-        return s
-
-    encvec = []
-    max_unencoded = maxlinelen * 3 // 4
-    for i in range(0, len(s), max_unencoded):
-        # BAW: should encode() inherit b2a_base64()'s dubious behavior in
-        # adding a newline to the encoded string?
-        enc = b2a_base64(s[i:i + max_unencoded]).decode("ascii")
-        if enc.endswith(NL) and eol != NL:
-            enc = enc[:-1] + eol
-        encvec.append(enc)
-    return EMPTYSTRING.join(encvec)
-
-
-def decode(string):
-    """Decode a raw base64 string, returning a bytes object.
-
-    This function does not parse a full MIME header value encoded with
-    base64 (like =?iso-8895-1?b?bmloISBuaWgh?=) -- please use the high
-    level email.header class for that functionality.
-    """
-    if not string:
-        return bytes()
-    elif isinstance(string, str):
-        return a2b_base64(string.encode('raw-unicode-escape'))
-    else:
-        return a2b_base64(string)
-
-
-# For convenience and backwards compatibility w/ standard base64 module
-body_decode = decode
-decodestring = decode
diff --git a/lib/future/backports/email/charset.py b/lib/future/backports/email/charset.py
deleted file mode 100644
index 2385ce68..00000000
--- a/lib/future/backports/email/charset.py
+++ /dev/null
@@ -1,409 +0,0 @@
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from future.builtins import str
-from future.builtins import next
-
-# Copyright (C) 2001-2007 Python Software Foundation
-# Author: Ben Gertzfield, Barry Warsaw
-# Contact: email-sig@python.org
-
-__all__ = [
-    'Charset',
-    'add_alias',
-    'add_charset',
-    'add_codec',
-    ]
-
-from functools import partial
-
-from future.backports import email
-from future.backports.email import errors
-from future.backports.email.encoders import encode_7or8bit
-
-
-# Flags for types of header encodings
-QP          = 1 # Quoted-Printable
-BASE64      = 2 # Base64
-SHORTEST    = 3 # the shorter of QP and base64, but only for headers
-
-# In "=?charset?q?hello_world?=", the =?, ?q?, and ?= add up to 7
-RFC2047_CHROME_LEN = 7
-
-DEFAULT_CHARSET = 'us-ascii'
-UNKNOWN8BIT = 'unknown-8bit'
-EMPTYSTRING = ''
-
-
-# Defaults
-CHARSETS = {
-    # input        header enc  body enc output conv
-    'iso-8859-1':  (QP,        QP,      None),
-    'iso-8859-2':  (QP,        QP,      None),
-    'iso-8859-3':  (QP,        QP,      None),
-    'iso-8859-4':  (QP,        QP,      None),
-    # iso-8859-5 is Cyrillic, and not especially used
-    # iso-8859-6 is Arabic, also not particularly used
-    # iso-8859-7 is Greek, QP will not make it readable
-    # iso-8859-8 is Hebrew, QP will not make it readable
-    'iso-8859-9':  (QP,        QP,      None),
-    'iso-8859-10': (QP,        QP,      None),
-    # iso-8859-11 is Thai, QP will not make it readable
-    'iso-8859-13': (QP,        QP,      None),
-    'iso-8859-14': (QP,        QP,      None),
-    'iso-8859-15': (QP,        QP,      None),
-    'iso-8859-16': (QP,        QP,      None),
-    'windows-1252':(QP,        QP,      None),
-    'viscii':      (QP,        QP,      None),
-    'us-ascii':    (None,      None,    None),
-    'big5':        (BASE64,    BASE64,  None),
-    'gb2312':      (BASE64,    BASE64,  None),
-    'euc-jp':      (BASE64,    None,    'iso-2022-jp'),
-    'shift_jis':   (BASE64,    None,    'iso-2022-jp'),
-    'iso-2022-jp': (BASE64,    None,    None),
-    'koi8-r':      (BASE64,    BASE64,  None),
-    'utf-8':       (SHORTEST,  BASE64, 'utf-8'),
-    }
-
-# Aliases for other commonly-used names for character sets.  Map
-# them to the real ones used in email.
-ALIASES = {
-    'latin_1': 'iso-8859-1',
-    'latin-1': 'iso-8859-1',
-    'latin_2': 'iso-8859-2',
-    'latin-2': 'iso-8859-2',
-    'latin_3': 'iso-8859-3',
-    'latin-3': 'iso-8859-3',
-    'latin_4': 'iso-8859-4',
-    'latin-4': 'iso-8859-4',
-    'latin_5': 'iso-8859-9',
-    'latin-5': 'iso-8859-9',
-    'latin_6': 'iso-8859-10',
-    'latin-6': 'iso-8859-10',
-    'latin_7': 'iso-8859-13',
-    'latin-7': 'iso-8859-13',
-    'latin_8': 'iso-8859-14',
-    'latin-8': 'iso-8859-14',
-    'latin_9': 'iso-8859-15',
-    'latin-9': 'iso-8859-15',
-    'latin_10':'iso-8859-16',
-    'latin-10':'iso-8859-16',
-    'cp949':   'ks_c_5601-1987',
-    'euc_jp':  'euc-jp',
-    'euc_kr':  'euc-kr',
-    'ascii':   'us-ascii',
-    }
-
-
-# Map charsets to their Unicode codec strings.
-CODEC_MAP = {
-    'gb2312':      'eucgb2312_cn',
-    'big5':        'big5_tw',
-    # Hack: We don't want *any* conversion for stuff marked us-ascii, as all
-    # sorts of garbage might be sent to us in the guise of 7-bit us-ascii.
-    # Let that stuff pass through without conversion to/from Unicode.
-    'us-ascii':    None,
-    }
-
-
-# Convenience functions for extending the above mappings
-def add_charset(charset, header_enc=None, body_enc=None, output_charset=None):
-    """Add character set properties to the global registry.
-
-    charset is the input character set, and must be the canonical name of a
-    character set.
-
-    Optional header_enc and body_enc is either Charset.QP for
-    quoted-printable, Charset.BASE64 for base64 encoding, Charset.SHORTEST for
-    the shortest of qp or base64 encoding, or None for no encoding.  SHORTEST
-    is only valid for header_enc.  It describes how message headers and
-    message bodies in the input charset are to be encoded.  Default is no
-    encoding.
-
-    Optional output_charset is the character set that the output should be
-    in.  Conversions will proceed from input charset, to Unicode, to the
-    output charset when the method Charset.convert() is called.  The default
-    is to output in the same character set as the input.
-
-    Both input_charset and output_charset must have Unicode codec entries in
-    the module's charset-to-codec mapping; use add_codec(charset, codecname)
-    to add codecs the module does not know about.  See the codecs module's
-    documentation for more information.
-    """
-    if body_enc == SHORTEST:
-        raise ValueError('SHORTEST not allowed for body_enc')
-    CHARSETS[charset] = (header_enc, body_enc, output_charset)
-
-
-def add_alias(alias, canonical):
-    """Add a character set alias.
-
-    alias is the alias name, e.g. latin-1
-    canonical is the character set's canonical name, e.g. iso-8859-1
-    """
-    ALIASES[alias] = canonical
-
-
-def add_codec(charset, codecname):
-    """Add a codec that map characters in the given charset to/from Unicode.
-
-    charset is the canonical name of a character set.  codecname is the name
-    of a Python codec, as appropriate for the second argument to the unicode()
-    built-in, or to the encode() method of a Unicode string.
-    """
-    CODEC_MAP[charset] = codecname
-
-
-# Convenience function for encoding strings, taking into account
-# that they might be unknown-8bit (ie: have surrogate-escaped bytes)
-def _encode(string, codec):
-    string = str(string)
-    if codec == UNKNOWN8BIT:
-        return string.encode('ascii', 'surrogateescape')
-    else:
-        return string.encode(codec)
-
-
-class Charset(object):
-    """Map character sets to their email properties.
-
-    This class provides information about the requirements imposed on email
-    for a specific character set.  It also provides convenience routines for
-    converting between character sets, given the availability of the
-    applicable codecs.  Given a character set, it will do its best to provide
-    information on how to use that character set in an email in an
-    RFC-compliant way.
-
-    Certain character sets must be encoded with quoted-printable or base64
-    when used in email headers or bodies.  Certain character sets must be
-    converted outright, and are not allowed in email.  Instances of this
-    module expose the following information about a character set:
-
-    input_charset: The initial character set specified.  Common aliases
-                   are converted to their `official' email names (e.g. latin_1
-                   is converted to iso-8859-1).  Defaults to 7-bit us-ascii.
-
-    header_encoding: If the character set must be encoded before it can be
-                     used in an email header, this attribute will be set to
-                     Charset.QP (for quoted-printable), Charset.BASE64 (for
-                     base64 encoding), or Charset.SHORTEST for the shortest of
-                     QP or BASE64 encoding.  Otherwise, it will be None.
-
-    body_encoding: Same as header_encoding, but describes the encoding for the
-                   mail message's body, which indeed may be different than the
-                   header encoding.  Charset.SHORTEST is not allowed for
-                   body_encoding.
-
-    output_charset: Some character sets must be converted before they can be
-                    used in email headers or bodies.  If the input_charset is
-                    one of them, this attribute will contain the name of the
-                    charset output will be converted to.  Otherwise, it will
-                    be None.
-
-    input_codec: The name of the Python codec used to convert the
-                 input_charset to Unicode.  If no conversion codec is
-                 necessary, this attribute will be None.
-
-    output_codec: The name of the Python codec used to convert Unicode
-                  to the output_charset.  If no conversion codec is necessary,
-                  this attribute will have the same value as the input_codec.
-    """
-    def __init__(self, input_charset=DEFAULT_CHARSET):
-        # RFC 2046, $4.1.2 says charsets are not case sensitive.  We coerce to
-        # unicode because its .lower() is locale insensitive.  If the argument
-        # is already a unicode, we leave it at that, but ensure that the
-        # charset is ASCII, as the standard (RFC XXX) requires.
-        try:
-            if isinstance(input_charset, str):
-                input_charset.encode('ascii')
-            else:
-                input_charset = str(input_charset, 'ascii')
-        except UnicodeError:
-            raise errors.CharsetError(input_charset)
-        input_charset = input_charset.lower()
-        # Set the input charset after filtering through the aliases
-        self.input_charset = ALIASES.get(input_charset, input_charset)
-        # We can try to guess which encoding and conversion to use by the
-        # charset_map dictionary.  Try that first, but let the user override
-        # it.
-        henc, benc, conv = CHARSETS.get(self.input_charset,
-                                        (SHORTEST, BASE64, None))
-        if not conv:
-            conv = self.input_charset
-        # Set the attributes, allowing the arguments to override the default.
-        self.header_encoding = henc
-        self.body_encoding = benc
-        self.output_charset = ALIASES.get(conv, conv)
-        # Now set the codecs.  If one isn't defined for input_charset,
-        # guess and try a Unicode codec with the same name as input_codec.
-        self.input_codec = CODEC_MAP.get(self.input_charset,
-                                         self.input_charset)
-        self.output_codec = CODEC_MAP.get(self.output_charset,
-                                          self.output_charset)
-
-    def __str__(self):
-        return self.input_charset.lower()
-
-    __repr__ = __str__
-
-    def __eq__(self, other):
-        return str(self) == str(other).lower()
-
-    def __ne__(self, other):
-        return not self.__eq__(other)
-
-    def get_body_encoding(self):
-        """Return the content-transfer-encoding used for body encoding.
-
-        This is either the string `quoted-printable' or `base64' depending on
-        the encoding used, or it is a function in which case you should call
-        the function with a single argument, the Message object being
-        encoded.  The function should then set the Content-Transfer-Encoding
-        header itself to whatever is appropriate.
-
-        Returns "quoted-printable" if self.body_encoding is QP.
-        Returns "base64" if self.body_encoding is BASE64.
-        Returns conversion function otherwise.
-        """
-        assert self.body_encoding != SHORTEST
-        if self.body_encoding == QP:
-            return 'quoted-printable'
-        elif self.body_encoding == BASE64:
-            return 'base64'
-        else:
-            return encode_7or8bit
-
-    def get_output_charset(self):
-        """Return the output character set.
-
-        This is self.output_charset if that is not None, otherwise it is
-        self.input_charset.
-        """
-        return self.output_charset or self.input_charset
-
-    def header_encode(self, string):
-        """Header-encode a string by converting it first to bytes.
-
-        The type of encoding (base64 or quoted-printable) will be based on
-        this charset's `header_encoding`.
-
-        :param string: A unicode string for the header.  It must be possible
-            to encode this string to bytes using the character set's
-            output codec.
-        :return: The encoded string, with RFC 2047 chrome.
-        """
-        codec = self.output_codec or 'us-ascii'
-        header_bytes = _encode(string, codec)
-        # 7bit/8bit encodings return the string unchanged (modulo conversions)
-        encoder_module = self._get_encoder(header_bytes)
-        if encoder_module is None:
-            return string
-        return encoder_module.header_encode(header_bytes, codec)
-
-    def header_encode_lines(self, string, maxlengths):
-        """Header-encode a string by converting it first to bytes.
-
-        This is similar to `header_encode()` except that the string is fit
-        into maximum line lengths as given by the argument.
-
-        :param string: A unicode string for the header.  It must be possible
-            to encode this string to bytes using the character set's
-            output codec.
-        :param maxlengths: Maximum line length iterator.  Each element
-            returned from this iterator will provide the next maximum line
-            length.  This parameter is used as an argument to built-in next()
-            and should never be exhausted.  The maximum line lengths should
-            not count the RFC 2047 chrome.  These line lengths are only a
-            hint; the splitter does the best it can.
-        :return: Lines of encoded strings, each with RFC 2047 chrome.
-        """
-        # See which encoding we should use.
-        codec = self.output_codec or 'us-ascii'
-        header_bytes = _encode(string, codec)
-        encoder_module = self._get_encoder(header_bytes)
-        encoder = partial(encoder_module.header_encode, charset=codec)
-        # Calculate the number of characters that the RFC 2047 chrome will
-        # contribute to each line.
-        charset = self.get_output_charset()
-        extra = len(charset) + RFC2047_CHROME_LEN
-        # Now comes the hard part.  We must encode bytes but we can't split on
-        # bytes because some character sets are variable length and each
-        # encoded word must stand on its own.  So the problem is you have to
-        # encode to bytes to figure out this word's length, but you must split
-        # on characters.  This causes two problems: first, we don't know how
-        # many octets a specific substring of unicode characters will get
-        # encoded to, and second, we don't know how many ASCII characters
-        # those octets will get encoded to.  Unless we try it.  Which seems
-        # inefficient.  In the interest of being correct rather than fast (and
-        # in the hope that there will be few encoded headers in any such
-        # message), brute force it. :(
-        lines = []
-        current_line = []
-        maxlen = next(maxlengths) - extra
-        for character in string:
-            current_line.append(character)
-            this_line = EMPTYSTRING.join(current_line)
-            length = encoder_module.header_length(_encode(this_line, charset))
-            if length > maxlen:
-                # This last character doesn't fit so pop it off.
-                current_line.pop()
-                # Does nothing fit on the first line?
-                if not lines and not current_line:
-                    lines.append(None)
-                else:
-                    separator = (' ' if lines else '')
-                    joined_line = EMPTYSTRING.join(current_line)
-                    header_bytes = _encode(joined_line, codec)
-                    lines.append(encoder(header_bytes))
-                current_line = [character]
-                maxlen = next(maxlengths) - extra
-        joined_line = EMPTYSTRING.join(current_line)
-        header_bytes = _encode(joined_line, codec)
-        lines.append(encoder(header_bytes))
-        return lines
-
-    def _get_encoder(self, header_bytes):
-        if self.header_encoding == BASE64:
-            return email.base64mime
-        elif self.header_encoding == QP:
-            return email.quoprimime
-        elif self.header_encoding == SHORTEST:
-            len64 = email.base64mime.header_length(header_bytes)
-            lenqp = email.quoprimime.header_length(header_bytes)
-            if len64 < lenqp:
-                return email.base64mime
-            else:
-                return email.quoprimime
-        else:
-            return None
-
-    def body_encode(self, string):
-        """Body-encode a string by converting it first to bytes.
-
-        The type of encoding (base64 or quoted-printable) will be based on
-        self.body_encoding.  If body_encoding is None, we assume the
-        output charset is a 7bit encoding, so re-encoding the decoded
-        string using the ascii codec produces the correct string version
-        of the content.
-        """
-        if not string:
-            return string
-        if self.body_encoding is BASE64:
-            if isinstance(string, str):
-                string = string.encode(self.output_charset)
-            return email.base64mime.body_encode(string)
-        elif self.body_encoding is QP:
-            # quopromime.body_encode takes a string, but operates on it as if
-            # it were a list of byte codes.  For a (minimal) history on why
-            # this is so, see changeset 0cf700464177.  To correctly encode a
-            # character set, then, we must turn it into pseudo bytes via the
-            # latin1 charset, which will encode any byte as a single code point
-            # between 0 and 255, which is what body_encode is expecting.
-            if isinstance(string, str):
-                string = string.encode(self.output_charset)
-            string = string.decode('latin1')
-            return email.quoprimime.body_encode(string)
-        else:
-            if isinstance(string, str):
-                string = string.encode(self.output_charset).decode('ascii')
-            return string
diff --git a/lib/future/backports/email/encoders.py b/lib/future/backports/email/encoders.py
deleted file mode 100644
index 15d2eb46..00000000
--- a/lib/future/backports/email/encoders.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright (C) 2001-2006 Python Software Foundation
-# Author: Barry Warsaw
-# Contact: email-sig@python.org
-
-"""Encodings and related functions."""
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from future.builtins import str
-
-__all__ = [
-    'encode_7or8bit',
-    'encode_base64',
-    'encode_noop',
-    'encode_quopri',
-    ]
-
-
-try:
-    from base64 import encodebytes as _bencode
-except ImportError:
-    # Py2 compatibility. TODO: test this!
-    from base64 import encodestring as _bencode
-from quopri import encodestring as _encodestring
-
-
-def _qencode(s):
-    enc = _encodestring(s, quotetabs=True)
-    # Must encode spaces, which quopri.encodestring() doesn't do
-    return enc.replace(' ', '=20')
-
-
-def encode_base64(msg):
-    """Encode the message's payload in Base64.
-
-    Also, add an appropriate Content-Transfer-Encoding header.
-    """
-    orig = msg.get_payload()
-    encdata = str(_bencode(orig), 'ascii')
-    msg.set_payload(encdata)
-    msg['Content-Transfer-Encoding'] = 'base64'
-
-
-def encode_quopri(msg):
-    """Encode the message's payload in quoted-printable.
-
-    Also, add an appropriate Content-Transfer-Encoding header.
-    """
-    orig = msg.get_payload()
-    encdata = _qencode(orig)
-    msg.set_payload(encdata)
-    msg['Content-Transfer-Encoding'] = 'quoted-printable'
-
-
-def encode_7or8bit(msg):
-    """Set the Content-Transfer-Encoding header to 7bit or 8bit."""
-    orig = msg.get_payload()
-    if orig is None:
-        # There's no payload.  For backwards compatibility we use 7bit
-        msg['Content-Transfer-Encoding'] = '7bit'
-        return
-    # We play a trick to make this go fast.  If encoding/decode to ASCII
-    # succeeds, we know the data must be 7bit, otherwise treat it as 8bit.
-    try:
-        if isinstance(orig, str):
-            orig.encode('ascii')
-        else:
-            orig.decode('ascii')
-    except UnicodeError:
-        charset = msg.get_charset()
-        output_cset = charset and charset.output_charset
-        # iso-2022-* is non-ASCII but encodes to a 7-bit representation
-        if output_cset and output_cset.lower().startswith('iso-2022-'):
-            msg['Content-Transfer-Encoding'] = '7bit'
-        else:
-            msg['Content-Transfer-Encoding'] = '8bit'
-    else:
-        msg['Content-Transfer-Encoding'] = '7bit'
-    if not isinstance(orig, str):
-        msg.set_payload(orig.decode('ascii', 'surrogateescape'))
-
-
-def encode_noop(msg):
-    """Do nothing."""
-    # Well, not quite *nothing*: in Python3 we have to turn bytes into a string
-    # in our internal surrogateescaped form in order to keep the model
-    # consistent.
-    orig = msg.get_payload()
-    if not isinstance(orig, str):
-        msg.set_payload(orig.decode('ascii', 'surrogateescape'))
diff --git a/lib/future/backports/email/errors.py b/lib/future/backports/email/errors.py
deleted file mode 100644
index 0fe599cf..00000000
--- a/lib/future/backports/email/errors.py
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright (C) 2001-2006 Python Software Foundation
-# Author: Barry Warsaw
-# Contact: email-sig@python.org
-
-"""email package exception classes."""
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from future.builtins import super
-
-
-class MessageError(Exception):
-    """Base class for errors in the email package."""
-
-
-class MessageParseError(MessageError):
-    """Base class for message parsing errors."""
-
-
-class HeaderParseError(MessageParseError):
-    """Error while parsing headers."""
-
-
-class BoundaryError(MessageParseError):
-    """Couldn't find terminating boundary."""
-
-
-class MultipartConversionError(MessageError, TypeError):
-    """Conversion to a multipart is prohibited."""
-
-
-class CharsetError(MessageError):
-    """An illegal charset was given."""
-
-
-# These are parsing defects which the parser was able to work around.
-class MessageDefect(ValueError):
-    """Base class for a message defect."""
-
-    def __init__(self, line=None):
-        if line is not None:
-            super().__init__(line)
-        self.line = line
-
-class NoBoundaryInMultipartDefect(MessageDefect):
-    """A message claimed to be a multipart but had no boundary parameter."""
-
-class StartBoundaryNotFoundDefect(MessageDefect):
-    """The claimed start boundary was never found."""
-
-class CloseBoundaryNotFoundDefect(MessageDefect):
-    """A start boundary was found, but not the corresponding close boundary."""
-
-class FirstHeaderLineIsContinuationDefect(MessageDefect):
-    """A message had a continuation line as its first header line."""
-
-class MisplacedEnvelopeHeaderDefect(MessageDefect):
-    """A 'Unix-from' header was found in the middle of a header block."""
-
-class MissingHeaderBodySeparatorDefect(MessageDefect):
-    """Found line with no leading whitespace and no colon before blank line."""
-# XXX: backward compatibility, just in case (it was never emitted).
-MalformedHeaderDefect = MissingHeaderBodySeparatorDefect
-
-class MultipartInvariantViolationDefect(MessageDefect):
-    """A message claimed to be a multipart but no subparts were found."""
-
-class InvalidMultipartContentTransferEncodingDefect(MessageDefect):
-    """An invalid content transfer encoding was set on the multipart itself."""
-
-class UndecodableBytesDefect(MessageDefect):
-    """Header contained bytes that could not be decoded"""
-
-class InvalidBase64PaddingDefect(MessageDefect):
-    """base64 encoded sequence had an incorrect length"""
-
-class InvalidBase64CharactersDefect(MessageDefect):
-    """base64 encoded sequence had characters not in base64 alphabet"""
-
-# These errors are specific to header parsing.
-
-class HeaderDefect(MessageDefect):
-    """Base class for a header defect."""
-
-    def __init__(self, *args, **kw):
-        super().__init__(*args, **kw)
-
-class InvalidHeaderDefect(HeaderDefect):
-    """Header is not valid, message gives details."""
-
-class HeaderMissingRequiredValue(HeaderDefect):
-    """A header that must have a value had none"""
-
-class NonPrintableDefect(HeaderDefect):
-    """ASCII characters outside the ascii-printable range found"""
-
-    def __init__(self, non_printables):
-        super().__init__(non_printables)
-        self.non_printables = non_printables
-
-    def __str__(self):
-        return ("the following ASCII non-printables found in header: "
-            "{}".format(self.non_printables))
-
-class ObsoleteHeaderDefect(HeaderDefect):
-    """Header uses syntax declared obsolete by RFC 5322"""
-
-class NonASCIILocalPartDefect(HeaderDefect):
-    """local_part contains non-ASCII characters"""
-    # This defect only occurs during unicode parsing, not when
-    # parsing messages decoded from binary.
diff --git a/lib/future/backports/email/feedparser.py b/lib/future/backports/email/feedparser.py
deleted file mode 100644
index 935c26e3..00000000
--- a/lib/future/backports/email/feedparser.py
+++ /dev/null
@@ -1,525 +0,0 @@
-# Copyright (C) 2004-2006 Python Software Foundation
-# Authors: Baxter, Wouters and Warsaw
-# Contact: email-sig@python.org
-
-"""FeedParser - An email feed parser.
-
-The feed parser implements an interface for incrementally parsing an email
-message, line by line.  This has advantages for certain applications, such as
-those reading email messages off a socket.
-
-FeedParser.feed() is the primary interface for pushing new data into the
-parser.  It returns when there's nothing more it can do with the available
-data.  When you have no more data to push into the parser, call .close().
-This completes the parsing and returns the root message object.
-
-The other advantage of this parser is that it will never raise a parsing
-exception.  Instead, when it finds something unexpected, it adds a 'defect' to
-the current message.  Defects are just instances that live on the message
-object's .defects attribute.
-"""
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from future.builtins import object, range, super
-from future.utils import implements_iterator, PY3
-
-__all__ = ['FeedParser', 'BytesFeedParser']
-
-import re
-
-from future.backports.email import errors
-from future.backports.email import message
-from future.backports.email._policybase import compat32
-
-NLCRE = re.compile('\r\n|\r|\n')
-NLCRE_bol = re.compile('(\r\n|\r|\n)')
-NLCRE_eol = re.compile('(\r\n|\r|\n)\Z')
-NLCRE_crack = re.compile('(\r\n|\r|\n)')
-# RFC 2822 $3.6.8 Optional fields.  ftext is %d33-57 / %d59-126, Any character
-# except controls, SP, and ":".
-headerRE = re.compile(r'^(From |[\041-\071\073-\176]{1,}:|[\t ])')
-EMPTYSTRING = ''
-NL = '\n'
-
-NeedMoreData = object()
-
-
-# @implements_iterator
-class BufferedSubFile(object):
-    """A file-ish object that can have new data loaded into it.
-
-    You can also push and pop line-matching predicates onto a stack.  When the
-    current predicate matches the current line, a false EOF response
-    (i.e. empty string) is returned instead.  This lets the parser adhere to a
-    simple abstraction -- it parses until EOF closes the current message.
-    """
-    def __init__(self):
-        # The last partial line pushed into this object.
-        self._partial = ''
-        # The list of full, pushed lines, in reverse order
-        self._lines = []
-        # The stack of false-EOF checking predicates.
-        self._eofstack = []
-        # A flag indicating whether the file has been closed or not.
-        self._closed = False
-
-    def push_eof_matcher(self, pred):
-        self._eofstack.append(pred)
-
-    def pop_eof_matcher(self):
-        return self._eofstack.pop()
-
-    def close(self):
-        # Don't forget any trailing partial line.
-        self._lines.append(self._partial)
-        self._partial = ''
-        self._closed = True
-
-    def readline(self):
-        if not self._lines:
-            if self._closed:
-                return ''
-            return NeedMoreData
-        # Pop the line off the stack and see if it matches the current
-        # false-EOF predicate.
-        line = self._lines.pop()
-        # RFC 2046, section 5.1.2 requires us to recognize outer level
-        # boundaries at any level of inner nesting.  Do this, but be sure it's
-        # in the order of most to least nested.
-        for ateof in self._eofstack[::-1]:
-            if ateof(line):
-                # We're at the false EOF.  But push the last line back first.
-                self._lines.append(line)
-                return ''
-        return line
-
-    def unreadline(self, line):
-        # Let the consumer push a line back into the buffer.
-        assert line is not NeedMoreData
-        self._lines.append(line)
-
-    def push(self, data):
-        """Push some new data into this object."""
-        # Handle any previous leftovers
-        data, self._partial = self._partial + data, ''
-        # Crack into lines, but preserve the newlines on the end of each
-        parts = NLCRE_crack.split(data)
-        # The *ahem* interesting behaviour of re.split when supplied grouping
-        # parentheses is that the last element of the resulting list is the
-        # data after the final RE.  In the case of a NL/CR terminated string,
-        # this is the empty string.
-        self._partial = parts.pop()
-        #GAN 29Mar09  bugs 1555570, 1721862  Confusion at 8K boundary ending with \r:
-        # is there a \n to follow later?
-        if not self._partial and parts and parts[-1].endswith('\r'):
-            self._partial = parts.pop(-2)+parts.pop()
-        # parts is a list of strings, alternating between the line contents
-        # and the eol character(s).  Gather up a list of lines after
-        # re-attaching the newlines.
-        lines = []
-        for i in range(len(parts) // 2):
-            lines.append(parts[i*2] + parts[i*2+1])
-        self.pushlines(lines)
-
-    def pushlines(self, lines):
-        # Reverse and insert at the front of the lines.
-        self._lines[:0] = lines[::-1]
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        line = self.readline()
-        if line == '':
-            raise StopIteration
-        return line
-
-
-class FeedParser(object):
-    """A feed-style parser of email."""
-
-    def __init__(self, _factory=message.Message, **_3to2kwargs):
-        if 'policy' in _3to2kwargs: policy = _3to2kwargs['policy']; del _3to2kwargs['policy']
-        else: policy = compat32
-        """_factory is called with no arguments to create a new message obj
-
-        The policy keyword specifies a policy object that controls a number of
-        aspects of the parser's operation.  The default policy maintains
-        backward compatibility.
-
-        """
-        self._factory = _factory
-        self.policy = policy
-        try:
-            _factory(policy=self.policy)
-            self._factory_kwds = lambda: {'policy': self.policy}
-        except TypeError:
-            # Assume this is an old-style factory
-            self._factory_kwds = lambda: {}
-        self._input = BufferedSubFile()
-        self._msgstack = []
-        if PY3:
-            self._parse = self._parsegen().__next__
-        else:
-            self._parse = self._parsegen().next
-        self._cur = None
-        self._last = None
-        self._headersonly = False
-
-    # Non-public interface for supporting Parser's headersonly flag
-    def _set_headersonly(self):
-        self._headersonly = True
-
-    def feed(self, data):
-        """Push more data into the parser."""
-        self._input.push(data)
-        self._call_parse()
-
-    def _call_parse(self):
-        try:
-            self._parse()
-        except StopIteration:
-            pass
-
-    def close(self):
-        """Parse all remaining data and return the root message object."""
-        self._input.close()
-        self._call_parse()
-        root = self._pop_message()
-        assert not self._msgstack
-        # Look for final set of defects
-        if root.get_content_maintype() == 'multipart' \
-               and not root.is_multipart():
-            defect = errors.MultipartInvariantViolationDefect()
-            self.policy.handle_defect(root, defect)
-        return root
-
-    def _new_message(self):
-        msg = self._factory(**self._factory_kwds())
-        if self._cur and self._cur.get_content_type() == 'multipart/digest':
-            msg.set_default_type('message/rfc822')
-        if self._msgstack:
-            self._msgstack[-1].attach(msg)
-        self._msgstack.append(msg)
-        self._cur = msg
-        self._last = msg
-
-    def _pop_message(self):
-        retval = self._msgstack.pop()
-        if self._msgstack:
-            self._cur = self._msgstack[-1]
-        else:
-            self._cur = None
-        return retval
-
-    def _parsegen(self):
-        # Create a new message and start by parsing headers.
-        self._new_message()
-        headers = []
-        # Collect the headers, searching for a line that doesn't match the RFC
-        # 2822 header or continuation pattern (including an empty line).
-        for line in self._input:
-            if line is NeedMoreData:
-                yield NeedMoreData
-                continue
-            if not headerRE.match(line):
-                # If we saw the RFC defined header/body separator
-                # (i.e. newline), just throw it away. Otherwise the line is
-                # part of the body so push it back.
-                if not NLCRE.match(line):
-                    defect = errors.MissingHeaderBodySeparatorDefect()
-                    self.policy.handle_defect(self._cur, defect)
-                    self._input.unreadline(line)
-                break
-            headers.append(line)
-        # Done with the headers, so parse them and figure out what we're
-        # supposed to see in the body of the message.
-        self._parse_headers(headers)
-        # Headers-only parsing is a backwards compatibility hack, which was
-        # necessary in the older parser, which could raise errors.  All
-        # remaining lines in the input are thrown into the message body.
-        if self._headersonly:
-            lines = []
-            while True:
-                line = self._input.readline()
-                if line is NeedMoreData:
-                    yield NeedMoreData
-                    continue
-                if line == '':
-                    break
-                lines.append(line)
-            self._cur.set_payload(EMPTYSTRING.join(lines))
-            return
-        if self._cur.get_content_type() == 'message/delivery-status':
-            # message/delivery-status contains blocks of headers separated by
-            # a blank line.  We'll represent each header block as a separate
-            # nested message object, but the processing is a bit different
-            # than standard message/* types because there is no body for the
-            # nested messages.  A blank line separates the subparts.
-            while True:
-                self._input.push_eof_matcher(NLCRE.match)
-                for retval in self._parsegen():
-                    if retval is NeedMoreData:
-                        yield NeedMoreData
-                        continue
-                    break
-                msg = self._pop_message()
-                # We need to pop the EOF matcher in order to tell if we're at
-                # the end of the current file, not the end of the last block
-                # of message headers.
-                self._input.pop_eof_matcher()
-                # The input stream must be sitting at the newline or at the
-                # EOF.  We want to see if we're at the end of this subpart, so
-                # first consume the blank line, then test the next line to see
-                # if we're at this subpart's EOF.
-                while True:
-                    line = self._input.readline()
-                    if line is NeedMoreData:
-                        yield NeedMoreData
-                        continue
-                    break
-                while True:
-                    line = self._input.readline()
-                    if line is NeedMoreData:
-                        yield NeedMoreData
-                        continue
-                    break
-                if line == '':
-                    break
-                # Not at EOF so this is a line we're going to need.
-                self._input.unreadline(line)
-            return
-        if self._cur.get_content_maintype() == 'message':
-            # The message claims to be a message/* type, then what follows is
-            # another RFC 2822 message.
-            for retval in self._parsegen():
-                if retval is NeedMoreData:
-                    yield NeedMoreData
-                    continue
-                break
-            self._pop_message()
-            return
-        if self._cur.get_content_maintype() == 'multipart':
-            boundary = self._cur.get_boundary()
-            if boundary is None:
-                # The message /claims/ to be a multipart but it has not
-                # defined a boundary.  That's a problem which we'll handle by
-                # reading everything until the EOF and marking the message as
-                # defective.
-                defect = errors.NoBoundaryInMultipartDefect()
-                self.policy.handle_defect(self._cur, defect)
-                lines = []
-                for line in self._input:
-                    if line is NeedMoreData:
-                        yield NeedMoreData
-                        continue
-                    lines.append(line)
-                self._cur.set_payload(EMPTYSTRING.join(lines))
-                return
-            # Make sure a valid content type was specified per RFC 2045:6.4.
-            if (self._cur.get('content-transfer-encoding', '8bit').lower()
-                    not in ('7bit', '8bit', 'binary')):
-                defect = errors.InvalidMultipartContentTransferEncodingDefect()
-                self.policy.handle_defect(self._cur, defect)
-            # Create a line match predicate which matches the inter-part
-            # boundary as well as the end-of-multipart boundary.  Don't push
-            # this onto the input stream until we've scanned past the
-            # preamble.
-            separator = '--' + boundary
-            boundaryre = re.compile(
-                '(?P<sep>' + re.escape(separator) +
-                r')(?P<end>--)?(?P<ws>[ \t]*)(?P<linesep>\r\n|\r|\n)?$')
-            capturing_preamble = True
-            preamble = []
-            linesep = False
-            close_boundary_seen = False
-            while True:
-                line = self._input.readline()
-                if line is NeedMoreData:
-                    yield NeedMoreData
-                    continue
-                if line == '':
-                    break
-                mo = boundaryre.match(line)
-                if mo:
-                    # If we're looking at the end boundary, we're done with
-                    # this multipart.  If there was a newline at the end of
-                    # the closing boundary, then we need to initialize the
-                    # epilogue with the empty string (see below).
-                    if mo.group('end'):
-                        close_boundary_seen = True
-                        linesep = mo.group('linesep')
-                        break
-                    # We saw an inter-part boundary.  Were we in the preamble?
-                    if capturing_preamble:
-                        if preamble:
-                            # According to RFC 2046, the last newline belongs
-                            # to the boundary.
-                            lastline = preamble[-1]
-                            eolmo = NLCRE_eol.search(lastline)
-                            if eolmo:
-                                preamble[-1] = lastline[:-len(eolmo.group(0))]
-                            self._cur.preamble = EMPTYSTRING.join(preamble)
-                        capturing_preamble = False
-                        self._input.unreadline(line)
-                        continue
-                    # We saw a boundary separating two parts.  Consume any
-                    # multiple boundary lines that may be following.  Our
-                    # interpretation of RFC 2046 BNF grammar does not produce
-                    # body parts within such double boundaries.
-                    while True:
-                        line = self._input.readline()
-                        if line is NeedMoreData:
-                            yield NeedMoreData
-                            continue
-                        mo = boundaryre.match(line)
-                        if not mo:
-                            self._input.unreadline(line)
-                            break
-                    # Recurse to parse this subpart; the input stream points
-                    # at the subpart's first line.
-                    self._input.push_eof_matcher(boundaryre.match)
-                    for retval in self._parsegen():
-                        if retval is NeedMoreData:
-                            yield NeedMoreData
-                            continue
-                        break
-                    # Because of RFC 2046, the newline preceding the boundary
-                    # separator actually belongs to the boundary, not the
-                    # previous subpart's payload (or epilogue if the previous
-                    # part is a multipart).
-                    if self._last.get_content_maintype() == 'multipart':
-                        epilogue = self._last.epilogue
-                        if epilogue == '':
-                            self._last.epilogue = None
-                        elif epilogue is not None:
-                            mo = NLCRE_eol.search(epilogue)
-                            if mo:
-                                end = len(mo.group(0))
-                                self._last.epilogue = epilogue[:-end]
-                    else:
-                        payload = self._last._payload
-                        if isinstance(payload, str):
-                            mo = NLCRE_eol.search(payload)
-                            if mo:
-                                payload = payload[:-len(mo.group(0))]
-                                self._last._payload = payload
-                    self._input.pop_eof_matcher()
-                    self._pop_message()
-                    # Set the multipart up for newline cleansing, which will
-                    # happen if we're in a nested multipart.
-                    self._last = self._cur
-                else:
-                    # I think we must be in the preamble
-                    assert capturing_preamble
-                    preamble.append(line)
-            # We've seen either the EOF or the end boundary.  If we're still
-            # capturing the preamble, we never saw the start boundary.  Note
-            # that as a defect and store the captured text as the payload.
-            if capturing_preamble:
-                defect = errors.StartBoundaryNotFoundDefect()
-                self.policy.handle_defect(self._cur, defect)
-                self._cur.set_payload(EMPTYSTRING.join(preamble))
-                epilogue = []
-                for line in self._input:
-                    if line is NeedMoreData:
-                        yield NeedMoreData
-                        continue
-                self._cur.epilogue = EMPTYSTRING.join(epilogue)
-                return
-            # If we're not processing the preamble, then we might have seen
-            # EOF without seeing that end boundary...that is also a defect.
-            if not close_boundary_seen:
-                defect = errors.CloseBoundaryNotFoundDefect()
-                self.policy.handle_defect(self._cur, defect)
-                return
-            # Everything from here to the EOF is epilogue.  If the end boundary
-            # ended in a newline, we'll need to make sure the epilogue isn't
-            # None
-            if linesep:
-                epilogue = ['']
-            else:
-                epilogue = []
-            for line in self._input:
-                if line is NeedMoreData:
-                    yield NeedMoreData
-                    continue
-                epilogue.append(line)
-            # Any CRLF at the front of the epilogue is not technically part of
-            # the epilogue.  Also, watch out for an empty string epilogue,
-            # which means a single newline.
-            if epilogue:
-                firstline = epilogue[0]
-                bolmo = NLCRE_bol.match(firstline)
-                if bolmo:
-                    epilogue[0] = firstline[len(bolmo.group(0)):]
-            self._cur.epilogue = EMPTYSTRING.join(epilogue)
-            return
-        # Otherwise, it's some non-multipart type, so the entire rest of the
-        # file contents becomes the payload.
-        lines = []
-        for line in self._input:
-            if line is NeedMoreData:
-                yield NeedMoreData
-                continue
-            lines.append(line)
-        self._cur.set_payload(EMPTYSTRING.join(lines))
-
-    def _parse_headers(self, lines):
-        # Passed a list of lines that make up the headers for the current msg
-        lastheader = ''
-        lastvalue = []
-        for lineno, line in enumerate(lines):
-            # Check for continuation
-            if line[0] in ' \t':
-                if not lastheader:
-                    # The first line of the headers was a continuation.  This
-                    # is illegal, so let's note the defect, store the illegal
-                    # line, and ignore it for purposes of headers.
-                    defect = errors.FirstHeaderLineIsContinuationDefect(line)
-                    self.policy.handle_defect(self._cur, defect)
-                    continue
-                lastvalue.append(line)
-                continue
-            if lastheader:
-                self._cur.set_raw(*self.policy.header_source_parse(lastvalue))
-                lastheader, lastvalue = '', []
-            # Check for envelope header, i.e. unix-from
-            if line.startswith('From '):
-                if lineno == 0:
-                    # Strip off the trailing newline
-                    mo = NLCRE_eol.search(line)
-                    if mo:
-                        line = line[:-len(mo.group(0))]
-                    self._cur.set_unixfrom(line)
-                    continue
-                elif lineno == len(lines) - 1:
-                    # Something looking like a unix-from at the end - it's
-                    # probably the first line of the body, so push back the
-                    # line and stop.
-                    self._input.unreadline(line)
-                    return
-                else:
-                    # Weirdly placed unix-from line.  Note this as a defect
-                    # and ignore it.
-                    defect = errors.MisplacedEnvelopeHeaderDefect(line)
-                    self._cur.defects.append(defect)
-                    continue
-            # Split the line on the colon separating field name from value.
-            # There will always be a colon, because if there wasn't the part of
-            # the parser that calls us would have started parsing the body.
-            i = line.find(':')
-            assert i>0, "_parse_headers fed line with no : and no leading WS"
-            lastheader = line[:i]
-            lastvalue = [line]
-        # Done with all the lines, so handle the last header.
-        if lastheader:
-            self._cur.set_raw(*self.policy.header_source_parse(lastvalue))
-
-
-class BytesFeedParser(FeedParser):
-    """Like FeedParser, but feed accepts bytes."""
-
-    def feed(self, data):
-        super().feed(data.decode('ascii', 'surrogateescape'))
diff --git a/lib/future/backports/email/generator.py b/lib/future/backports/email/generator.py
deleted file mode 100644
index 53493d0a..00000000
--- a/lib/future/backports/email/generator.py
+++ /dev/null
@@ -1,498 +0,0 @@
-# Copyright (C) 2001-2010 Python Software Foundation
-# Author: Barry Warsaw
-# Contact: email-sig@python.org
-
-"""Classes to generate plain text from a message object tree."""
-from __future__ import print_function
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from future.builtins import super
-from future.builtins import str
-
-__all__ = ['Generator', 'DecodedGenerator', 'BytesGenerator']
-
-import re
-import sys
-import time
-import random
-import warnings
-
-from io import StringIO, BytesIO
-from future.backports.email._policybase import compat32
-from future.backports.email.header import Header
-from future.backports.email.utils import _has_surrogates
-import future.backports.email.charset as _charset
-
-UNDERSCORE = '_'
-NL = '\n'  # XXX: no longer used by the code below.
-
-fcre = re.compile(r'^From ', re.MULTILINE)
-
-
-class Generator(object):
-    """Generates output from a Message object tree.
-
-    This basic generator writes the message to the given file object as plain
-    text.
-    """
-    #
-    # Public interface
-    #
-
-    def __init__(self, outfp, mangle_from_=True, maxheaderlen=None, **_3to2kwargs):
-        if 'policy' in _3to2kwargs: policy = _3to2kwargs['policy']; del _3to2kwargs['policy']
-        else: policy = None
-        """Create the generator for message flattening.
-
-        outfp is the output file-like object for writing the message to.  It
-        must have a write() method.
-
-        Optional mangle_from_ is a flag that, when True (the default), escapes
-        From_ lines in the body of the message by putting a `>' in front of
-        them.
-
-        Optional maxheaderlen specifies the longest length for a non-continued
-        header.  When a header line is longer (in characters, with tabs
-        expanded to 8 spaces) than maxheaderlen, the header will split as
-        defined in the Header class.  Set maxheaderlen to zero to disable
-        header wrapping.  The default is 78, as recommended (but not required)
-        by RFC 2822.
-
-        The policy keyword specifies a policy object that controls a number of
-        aspects of the generator's operation.  The default policy maintains
-        backward compatibility.
-
-        """
-        self._fp = outfp
-        self._mangle_from_ = mangle_from_
-        self.maxheaderlen = maxheaderlen
-        self.policy = policy
-
-    def write(self, s):
-        # Just delegate to the file object
-        self._fp.write(s)
-
-    def flatten(self, msg, unixfrom=False, linesep=None):
-        r"""Print the message object tree rooted at msg to the output file
-        specified when the Generator instance was created.
-
-        unixfrom is a flag that forces the printing of a Unix From_ delimiter
-        before the first object in the message tree.  If the original message
-        has no From_ delimiter, a `standard' one is crafted.  By default, this
-        is False to inhibit the printing of any From_ delimiter.
-
-        Note that for subobjects, no From_ line is printed.
-
-        linesep specifies the characters used to indicate a new line in
-        the output.  The default value is determined by the policy.
-
-        """
-        # We use the _XXX constants for operating on data that comes directly
-        # from the msg, and _encoded_XXX constants for operating on data that
-        # has already been converted (to bytes in the BytesGenerator) and
-        # inserted into a temporary buffer.
-        policy = msg.policy if self.policy is None else self.policy
-        if linesep is not None:
-            policy = policy.clone(linesep=linesep)
-        if self.maxheaderlen is not None:
-            policy = policy.clone(max_line_length=self.maxheaderlen)
-        self._NL = policy.linesep
-        self._encoded_NL = self._encode(self._NL)
-        self._EMPTY = ''
-        self._encoded_EMTPY = self._encode('')
-        # Because we use clone (below) when we recursively process message
-        # subparts, and because clone uses the computed policy (not None),
-        # submessages will automatically get set to the computed policy when
-        # they are processed by this code.
-        old_gen_policy = self.policy
-        old_msg_policy = msg.policy
-        try:
-            self.policy = policy
-            msg.policy = policy
-            if unixfrom:
-                ufrom = msg.get_unixfrom()
-                if not ufrom:
-                    ufrom = 'From nobody ' + time.ctime(time.time())
-                self.write(ufrom + self._NL)
-            self._write(msg)
-        finally:
-            self.policy = old_gen_policy
-            msg.policy = old_msg_policy
-
-    def clone(self, fp):
-        """Clone this generator with the exact same options."""
-        return self.__class__(fp,
-                              self._mangle_from_,
-                              None, # Use policy setting, which we've adjusted
-                              policy=self.policy)
-
-    #
-    # Protected interface - undocumented ;/
-    #
-
-    # Note that we use 'self.write' when what we are writing is coming from
-    # the source, and self._fp.write when what we are writing is coming from a
-    # buffer (because the Bytes subclass has already had a chance to transform
-    # the data in its write method in that case).  This is an entirely
-    # pragmatic split determined by experiment; we could be more general by
-    # always using write and having the Bytes subclass write method detect when
-    # it has already transformed the input; but, since this whole thing is a
-    # hack anyway this seems good enough.
-
-    # Similarly, we have _XXX and _encoded_XXX attributes that are used on
-    # source and buffer data, respectively.
-    _encoded_EMPTY = ''
-
-    def _new_buffer(self):
-        # BytesGenerator overrides this to return BytesIO.
-        return StringIO()
-
-    def _encode(self, s):
-        # BytesGenerator overrides this to encode strings to bytes.
-        return s
-
-    def _write_lines(self, lines):
-        # We have to transform the line endings.
-        if not lines:
-            return
-        lines = lines.splitlines(True)
-        for line in lines[:-1]:
-            self.write(line.rstrip('\r\n'))
-            self.write(self._NL)
-        laststripped = lines[-1].rstrip('\r\n')
-        self.write(laststripped)
-        if len(lines[-1]) != len(laststripped):
-            self.write(self._NL)
-
-    def _write(self, msg):
-        # We can't write the headers yet because of the following scenario:
-        # say a multipart message includes the boundary string somewhere in
-        # its body.  We'd have to calculate the new boundary /before/ we write
-        # the headers so that we can write the correct Content-Type:
-        # parameter.
-        #
-        # The way we do this, so as to make the _handle_*() methods simpler,
-        # is to cache any subpart writes into a buffer.  The we write the
-        # headers and the buffer contents.  That way, subpart handlers can
-        # Do The Right Thing, and can still modify the Content-Type: header if
-        # necessary.
-        oldfp = self._fp
-        try:
-            self._fp = sfp = self._new_buffer()
-            self._dispatch(msg)
-        finally:
-            self._fp = oldfp
-        # Write the headers.  First we see if the message object wants to
-        # handle that itself.  If not, we'll do it generically.
-        meth = getattr(msg, '_write_headers', None)
-        if meth is None:
-            self._write_headers(msg)
-        else:
-            meth(self)
-        self._fp.write(sfp.getvalue())
-
-    def _dispatch(self, msg):
-        # Get the Content-Type: for the message, then try to dispatch to
-        # self._handle_<maintype>_<subtype>().  If there's no handler for the
-        # full MIME type, then dispatch to self._handle_<maintype>().  If
-        # that's missing too, then dispatch to self._writeBody().
-        main = msg.get_content_maintype()
-        sub = msg.get_content_subtype()
-        specific = UNDERSCORE.join((main, sub)).replace('-', '_')
-        meth = getattr(self, '_handle_' + specific, None)
-        if meth is None:
-            generic = main.replace('-', '_')
-            meth = getattr(self, '_handle_' + generic, None)
-            if meth is None:
-                meth = self._writeBody
-        meth(msg)
-
-    #
-    # Default handlers
-    #
-
-    def _write_headers(self, msg):
-        for h, v in msg.raw_items():
-            self.write(self.policy.fold(h, v))
-        # A blank line always separates headers from body
-        self.write(self._NL)
-
-    #
-    # Handlers for writing types and subtypes
-    #
-
-    def _handle_text(self, msg):
-        payload = msg.get_payload()
-        if payload is None:
-            return
-        if not isinstance(payload, str):
-            raise TypeError('string payload expected: %s' % type(payload))
-        if _has_surrogates(msg._payload):
-            charset = msg.get_param('charset')
-            if charset is not None:
-                del msg['content-transfer-encoding']
-                msg.set_payload(payload, charset)
-                payload = msg.get_payload()
-        if self._mangle_from_:
-            payload = fcre.sub('>From ', payload)
-        self._write_lines(payload)
-
-    # Default body handler
-    _writeBody = _handle_text
-
-    def _handle_multipart(self, msg):
-        # The trick here is to write out each part separately, merge them all
-        # together, and then make sure that the boundary we've chosen isn't
-        # present in the payload.
-        msgtexts = []
-        subparts = msg.get_payload()
-        if subparts is None:
-            subparts = []
-        elif isinstance(subparts, str):
-            # e.g. a non-strict parse of a message with no starting boundary.
-            self.write(subparts)
-            return
-        elif not isinstance(subparts, list):
-            # Scalar payload
-            subparts = [subparts]
-        for part in subparts:
-            s = self._new_buffer()
-            g = self.clone(s)
-            g.flatten(part, unixfrom=False, linesep=self._NL)
-            msgtexts.append(s.getvalue())
-        # BAW: What about boundaries that are wrapped in double-quotes?
-        boundary = msg.get_boundary()
-        if not boundary:
-            # Create a boundary that doesn't appear in any of the
-            # message texts.
-            alltext = self._encoded_NL.join(msgtexts)
-            boundary = self._make_boundary(alltext)
-            msg.set_boundary(boundary)
-        # If there's a preamble, write it out, with a trailing CRLF
-        if msg.preamble is not None:
-            if self._mangle_from_:
-                preamble = fcre.sub('>From ', msg.preamble)
-            else:
-                preamble = msg.preamble
-            self._write_lines(preamble)
-            self.write(self._NL)
-        # dash-boundary transport-padding CRLF
-        self.write('--' + boundary + self._NL)
-        # body-part
-        if msgtexts:
-            self._fp.write(msgtexts.pop(0))
-        # *encapsulation
-        # --> delimiter transport-padding
-        # --> CRLF body-part
-        for body_part in msgtexts:
-            # delimiter transport-padding CRLF
-            self.write(self._NL + '--' + boundary + self._NL)
-            # body-part
-            self._fp.write(body_part)
-        # close-delimiter transport-padding
-        self.write(self._NL + '--' + boundary + '--')
-        if msg.epilogue is not None:
-            self.write(self._NL)
-            if self._mangle_from_:
-                epilogue = fcre.sub('>From ', msg.epilogue)
-            else:
-                epilogue = msg.epilogue
-            self._write_lines(epilogue)
-
-    def _handle_multipart_signed(self, msg):
-        # The contents of signed parts has to stay unmodified in order to keep
-        # the signature intact per RFC1847 2.1, so we disable header wrapping.
-        # RDM: This isn't enough to completely preserve the part, but it helps.
-        p = self.policy
-        self.policy = p.clone(max_line_length=0)
-        try:
-            self._handle_multipart(msg)
-        finally:
-            self.policy = p
-
-    def _handle_message_delivery_status(self, msg):
-        # We can't just write the headers directly to self's file object
-        # because this will leave an extra newline between the last header
-        # block and the boundary.  Sigh.
-        blocks = []
-        for part in msg.get_payload():
-            s = self._new_buffer()
-            g = self.clone(s)
-            g.flatten(part, unixfrom=False, linesep=self._NL)
-            text = s.getvalue()
-            lines = text.split(self._encoded_NL)
-            # Strip off the unnecessary trailing empty line
-            if lines and lines[-1] == self._encoded_EMPTY:
-                blocks.append(self._encoded_NL.join(lines[:-1]))
-            else:
-                blocks.append(text)
-        # Now join all the blocks with an empty line.  This has the lovely
-        # effect of separating each block with an empty line, but not adding
-        # an extra one after the last one.
-        self._fp.write(self._encoded_NL.join(blocks))
-
-    def _handle_message(self, msg):
-        s = self._new_buffer()
-        g = self.clone(s)
-        # The payload of a message/rfc822 part should be a multipart sequence
-        # of length 1.  The zeroth element of the list should be the Message
-        # object for the subpart.  Extract that object, stringify it, and
-        # write it out.
-        # Except, it turns out, when it's a string instead, which happens when
-        # and only when HeaderParser is used on a message of mime type
-        # message/rfc822.  Such messages are generated by, for example,
-        # Groupwise when forwarding unadorned messages.  (Issue 7970.)  So
-        # in that case we just emit the string body.
-        payload = msg._payload
-        if isinstance(payload, list):
-            g.flatten(msg.get_payload(0), unixfrom=False, linesep=self._NL)
-            payload = s.getvalue()
-        else:
-            payload = self._encode(payload)
-        self._fp.write(payload)
-
-    # This used to be a module level function; we use a classmethod for this
-    # and _compile_re so we can continue to provide the module level function
-    # for backward compatibility by doing
-    #   _make_boudary = Generator._make_boundary
-    # at the end of the module.  It *is* internal, so we could drop that...
-    @classmethod
-    def _make_boundary(cls, text=None):
-        # Craft a random boundary.  If text is given, ensure that the chosen
-        # boundary doesn't appear in the text.
-        token = random.randrange(sys.maxsize)
-        boundary = ('=' * 15) + (_fmt % token) + '=='
-        if text is None:
-            return boundary
-        b = boundary
-        counter = 0
-        while True:
-            cre = cls._compile_re('^--' + re.escape(b) + '(--)?$', re.MULTILINE)
-            if not cre.search(text):
-                break
-            b = boundary + '.' + str(counter)
-            counter += 1
-        return b
-
-    @classmethod
-    def _compile_re(cls, s, flags):
-        return re.compile(s, flags)
-
-class BytesGenerator(Generator):
-    """Generates a bytes version of a Message object tree.
-
-    Functionally identical to the base Generator except that the output is
-    bytes and not string.  When surrogates were used in the input to encode
-    bytes, these are decoded back to bytes for output.  If the policy has
-    cte_type set to 7bit, then the message is transformed such that the
-    non-ASCII bytes are properly content transfer encoded, using the charset
-    unknown-8bit.
-
-    The outfp object must accept bytes in its write method.
-    """
-
-    # Bytes versions of this constant for use in manipulating data from
-    # the BytesIO buffer.
-    _encoded_EMPTY = b''
-
-    def write(self, s):
-        self._fp.write(str(s).encode('ascii', 'surrogateescape'))
-
-    def _new_buffer(self):
-        return BytesIO()
-
-    def _encode(self, s):
-        return s.encode('ascii')
-
-    def _write_headers(self, msg):
-        # This is almost the same as the string version, except for handling
-        # strings with 8bit bytes.
-        for h, v in msg.raw_items():
-            self._fp.write(self.policy.fold_binary(h, v))
-        # A blank line always separates headers from body
-        self.write(self._NL)
-
-    def _handle_text(self, msg):
-        # If the string has surrogates the original source was bytes, so
-        # just write it back out.
-        if msg._payload is None:
-            return
-        if _has_surrogates(msg._payload) and not self.policy.cte_type=='7bit':
-            if self._mangle_from_:
-                msg._payload = fcre.sub(">From ", msg._payload)
-            self._write_lines(msg._payload)
-        else:
-            super(BytesGenerator,self)._handle_text(msg)
-
-    # Default body handler
-    _writeBody = _handle_text
-
-    @classmethod
-    def _compile_re(cls, s, flags):
-        return re.compile(s.encode('ascii'), flags)
-
-
-_FMT = '[Non-text (%(type)s) part of message omitted, filename %(filename)s]'
-
-class DecodedGenerator(Generator):
-    """Generates a text representation of a message.
-
-    Like the Generator base class, except that non-text parts are substituted
-    with a format string representing the part.
-    """
-    def __init__(self, outfp, mangle_from_=True, maxheaderlen=78, fmt=None):
-        """Like Generator.__init__() except that an additional optional
-        argument is allowed.
-
-        Walks through all subparts of a message.  If the subpart is of main
-        type `text', then it prints the decoded payload of the subpart.
-
-        Otherwise, fmt is a format string that is used instead of the message
-        payload.  fmt is expanded with the following keywords (in
-        %(keyword)s format):
-
-        type       : Full MIME type of the non-text part
-        maintype   : Main MIME type of the non-text part
-        subtype    : Sub-MIME type of the non-text part
-        filename   : Filename of the non-text part
-        description: Description associated with the non-text part
-        encoding   : Content transfer encoding of the non-text part
-
-        The default value for fmt is None, meaning
-
-        [Non-text (%(type)s) part of message omitted, filename %(filename)s]
-        """
-        Generator.__init__(self, outfp, mangle_from_, maxheaderlen)
-        if fmt is None:
-            self._fmt = _FMT
-        else:
-            self._fmt = fmt
-
-    def _dispatch(self, msg):
-        for part in msg.walk():
-            maintype = part.get_content_maintype()
-            if maintype == 'text':
-                print(part.get_payload(decode=False), file=self)
-            elif maintype == 'multipart':
-                # Just skip this
-                pass
-            else:
-                print(self._fmt % {
-                    'type'       : part.get_content_type(),
-                    'maintype'   : part.get_content_maintype(),
-                    'subtype'    : part.get_content_subtype(),
-                    'filename'   : part.get_filename('[no filename]'),
-                    'description': part.get('Content-Description',
-                                            '[no description]'),
-                    'encoding'   : part.get('Content-Transfer-Encoding',
-                                            '[no encoding]'),
-                    }, file=self)
-
-
-# Helper used by Generator._make_boundary
-_width = len(repr(sys.maxsize-1))
-_fmt = '%%0%dd' % _width
-
-# Backward compatibility
-_make_boundary = Generator._make_boundary
diff --git a/lib/future/backports/email/header.py b/lib/future/backports/email/header.py
deleted file mode 100644
index 63bf038c..00000000
--- a/lib/future/backports/email/header.py
+++ /dev/null
@@ -1,581 +0,0 @@
-# Copyright (C) 2002-2007 Python Software Foundation
-# Author: Ben Gertzfield, Barry Warsaw
-# Contact: email-sig@python.org
-
-"""Header encoding and decoding functionality."""
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from future.builtins import bytes, range, str, super, zip
-
-__all__ = [
-    'Header',
-    'decode_header',
-    'make_header',
-    ]
-
-import re
-import binascii
-
-from future.backports import email
-from future.backports.email import base64mime
-from future.backports.email.errors import HeaderParseError
-import future.backports.email.charset as _charset
-
-# Helpers
-from future.backports.email.quoprimime import _max_append, header_decode
-
-Charset = _charset.Charset
-
-NL = '\n'
-SPACE = ' '
-BSPACE = b' '
-SPACE8 = ' ' * 8
-EMPTYSTRING = ''
-MAXLINELEN = 78
-FWS = ' \t'
-
-USASCII = Charset('us-ascii')
-UTF8 = Charset('utf-8')
-
-# Match encoded-word strings in the form =?charset?q?Hello_World?=
-ecre = re.compile(r'''
-  =\?                   # literal =?
-  (?P<charset>[^?]*?)   # non-greedy up to the next ? is the charset
-  \?                    # literal ?
-  (?P<encoding>[qb])    # either a "q" or a "b", case insensitive
-  \?                    # literal ?
-  (?P<encoded>.*?)      # non-greedy up to the next ?= is the encoded string
-  \?=                   # literal ?=
-  ''', re.VERBOSE | re.IGNORECASE | re.MULTILINE)
-
-# Field name regexp, including trailing colon, but not separating whitespace,
-# according to RFC 2822.  Character range is from tilde to exclamation mark.
-# For use with .match()
-fcre = re.compile(r'[\041-\176]+:$')
-
-# Find a header embedded in a putative header value.  Used to check for
-# header injection attack.
-_embeded_header = re.compile(r'\n[^ \t]+:')
-
-
-def decode_header(header):
-    """Decode a message header value without converting charset.
-
-    Returns a list of (string, charset) pairs containing each of the decoded
-    parts of the header.  Charset is None for non-encoded parts of the header,
-    otherwise a lower-case string containing the name of the character set
-    specified in the encoded string.
-
-    header may be a string that may or may not contain RFC2047 encoded words,
-    or it may be a Header object.
-
-    An email.errors.HeaderParseError may be raised when certain decoding error
-    occurs (e.g. a base64 decoding exception).
-    """
-    # If it is a Header object, we can just return the encoded chunks.
-    if hasattr(header, '_chunks'):
-        return [(_charset._encode(string, str(charset)), str(charset))
-                    for string, charset in header._chunks]
-    # If no encoding, just return the header with no charset.
-    if not ecre.search(header):
-        return [(header, None)]
-    # First step is to parse all the encoded parts into triplets of the form
-    # (encoded_string, encoding, charset).  For unencoded strings, the last
-    # two parts will be None.
-    words = []
-    for line in header.splitlines():
-        parts = ecre.split(line)
-        first = True
-        while parts:
-            unencoded = parts.pop(0)
-            if first:
-                unencoded = unencoded.lstrip()
-                first = False
-            if unencoded:
-                words.append((unencoded, None, None))
-            if parts:
-                charset = parts.pop(0).lower()
-                encoding = parts.pop(0).lower()
-                encoded = parts.pop(0)
-                words.append((encoded, encoding, charset))
-    # Now loop over words and remove words that consist of whitespace
-    # between two encoded strings.
-    import sys
-    droplist = []
-    for n, w in enumerate(words):
-        if n>1 and w[1] and words[n-2][1] and words[n-1][0].isspace():
-            droplist.append(n-1)
-    for d in reversed(droplist):
-        del words[d]
-
-    # The next step is to decode each encoded word by applying the reverse
-    # base64 or quopri transformation.  decoded_words is now a list of the
-    # form (decoded_word, charset).
-    decoded_words = []
-    for encoded_string, encoding, charset in words:
-        if encoding is None:
-            # This is an unencoded word.
-            decoded_words.append((encoded_string, charset))
-        elif encoding == 'q':
-            word = header_decode(encoded_string)
-            decoded_words.append((word, charset))
-        elif encoding == 'b':
-            paderr = len(encoded_string) % 4   # Postel's law: add missing padding
-            if paderr:
-                encoded_string += '==='[:4 - paderr]
-            try:
-                word = base64mime.decode(encoded_string)
-            except binascii.Error:
-                raise HeaderParseError('Base64 decoding error')
-            else:
-                decoded_words.append((word, charset))
-        else:
-            raise AssertionError('Unexpected encoding: ' + encoding)
-    # Now convert all words to bytes and collapse consecutive runs of
-    # similarly encoded words.
-    collapsed = []
-    last_word = last_charset = None
-    for word, charset in decoded_words:
-        if isinstance(word, str):
-            word = bytes(word, 'raw-unicode-escape')
-        if last_word is None:
-            last_word = word
-            last_charset = charset
-        elif charset != last_charset:
-            collapsed.append((last_word, last_charset))
-            last_word = word
-            last_charset = charset
-        elif last_charset is None:
-            last_word += BSPACE + word
-        else:
-            last_word += word
-    collapsed.append((last_word, last_charset))
-    return collapsed
-
-
-def make_header(decoded_seq, maxlinelen=None, header_name=None,
-                continuation_ws=' '):
-    """Create a Header from a sequence of pairs as returned by decode_header()
-
-    decode_header() takes a header value string and returns a sequence of
-    pairs of the format (decoded_string, charset) where charset is the string
-    name of the character set.
-
-    This function takes one of those sequence of pairs and returns a Header
-    instance.  Optional maxlinelen, header_name, and continuation_ws are as in
-    the Header constructor.
-    """
-    h = Header(maxlinelen=maxlinelen, header_name=header_name,
-               continuation_ws=continuation_ws)
-    for s, charset in decoded_seq:
-        # None means us-ascii but we can simply pass it on to h.append()
-        if charset is not None and not isinstance(charset, Charset):
-            charset = Charset(charset)
-        h.append(s, charset)
-    return h
-
-
-class Header(object):
-    def __init__(self, s=None, charset=None,
-                 maxlinelen=None, header_name=None,
-                 continuation_ws=' ', errors='strict'):
-        """Create a MIME-compliant header that can contain many character sets.
-
-        Optional s is the initial header value.  If None, the initial header
-        value is not set.  You can later append to the header with .append()
-        method calls.  s may be a byte string or a Unicode string, but see the
-        .append() documentation for semantics.
-
-        Optional charset serves two purposes: it has the same meaning as the
-        charset argument to the .append() method.  It also sets the default
-        character set for all subsequent .append() calls that omit the charset
-        argument.  If charset is not provided in the constructor, the us-ascii
-        charset is used both as s's initial charset and as the default for
-        subsequent .append() calls.
-
-        The maximum line length can be specified explicitly via maxlinelen. For
-        splitting the first line to a shorter value (to account for the field
-        header which isn't included in s, e.g. `Subject') pass in the name of
-        the field in header_name.  The default maxlinelen is 78 as recommended
-        by RFC 2822.
-
-        continuation_ws must be RFC 2822 compliant folding whitespace (usually
-        either a space or a hard tab) which will be prepended to continuation
-        lines.
-
-        errors is passed through to the .append() call.
-        """
-        if charset is None:
-            charset = USASCII
-        elif not isinstance(charset, Charset):
-            charset = Charset(charset)
-        self._charset = charset
-        self._continuation_ws = continuation_ws
-        self._chunks = []
-        if s is not None:
-            self.append(s, charset, errors)
-        if maxlinelen is None:
-            maxlinelen = MAXLINELEN
-        self._maxlinelen = maxlinelen
-        if header_name is None:
-            self._headerlen = 0
-        else:
-            # Take the separating colon and space into account.
-            self._headerlen = len(header_name) + 2
-
-    def __str__(self):
-        """Return the string value of the header."""
-        self._normalize()
-        uchunks = []
-        lastcs = None
-        lastspace = None
-        for string, charset in self._chunks:
-            # We must preserve spaces between encoded and non-encoded word
-            # boundaries, which means for us we need to add a space when we go
-            # from a charset to None/us-ascii, or from None/us-ascii to a
-            # charset.  Only do this for the second and subsequent chunks.
-            # Don't add a space if the None/us-ascii string already has
-            # a space (trailing or leading depending on transition)
-            nextcs = charset
-            if nextcs == _charset.UNKNOWN8BIT:
-                original_bytes = string.encode('ascii', 'surrogateescape')
-                string = original_bytes.decode('ascii', 'replace')
-            if uchunks:
-                hasspace = string and self._nonctext(string[0])
-                if lastcs not in (None, 'us-ascii'):
-                    if nextcs in (None, 'us-ascii') and not hasspace:
-                        uchunks.append(SPACE)
-                        nextcs = None
-                elif nextcs not in (None, 'us-ascii') and not lastspace:
-                    uchunks.append(SPACE)
-            lastspace = string and self._nonctext(string[-1])
-            lastcs = nextcs
-            uchunks.append(string)
-        return EMPTYSTRING.join(uchunks)
-
-    # Rich comparison operators for equality only.  BAW: does it make sense to
-    # have or explicitly disable <, <=, >, >= operators?
-    def __eq__(self, other):
-        # other may be a Header or a string.  Both are fine so coerce
-        # ourselves to a unicode (of the unencoded header value), swap the
-        # args and do another comparison.
-        return other == str(self)
-
-    def __ne__(self, other):
-        return not self == other
-
-    def append(self, s, charset=None, errors='strict'):
-        """Append a string to the MIME header.
-
-        Optional charset, if given, should be a Charset instance or the name
-        of a character set (which will be converted to a Charset instance).  A
-        value of None (the default) means that the charset given in the
-        constructor is used.
-
-        s may be a byte string or a Unicode string.  If it is a byte string
-        (i.e. isinstance(s, str) is false), then charset is the encoding of
-        that byte string, and a UnicodeError will be raised if the string
-        cannot be decoded with that charset.  If s is a Unicode string, then
-        charset is a hint specifying the character set of the characters in
-        the string.  In either case, when producing an RFC 2822 compliant
-        header using RFC 2047 rules, the string will be encoded using the
-        output codec of the charset.  If the string cannot be encoded to the
-        output codec, a UnicodeError will be raised.
-
-        Optional `errors' is passed as the errors argument to the decode
-        call if s is a byte string.
-        """
-        if charset is None:
-            charset = self._charset
-        elif not isinstance(charset, Charset):
-            charset = Charset(charset)
-        if not isinstance(s, str):
-            input_charset = charset.input_codec or 'us-ascii'
-            if input_charset == _charset.UNKNOWN8BIT:
-                s = s.decode('us-ascii', 'surrogateescape')
-            else:
-                s = s.decode(input_charset, errors)
-        # Ensure that the bytes we're storing can be decoded to the output
-        # character set, otherwise an early error is raised.
-        output_charset = charset.output_codec or 'us-ascii'
-        if output_charset != _charset.UNKNOWN8BIT:
-            try:
-                s.encode(output_charset, errors)
-            except UnicodeEncodeError:
-                if output_charset!='us-ascii':
-                    raise
-                charset = UTF8
-        self._chunks.append((s, charset))
-
-    def _nonctext(self, s):
-        """True if string s is not a ctext character of RFC822.
-        """
-        return s.isspace() or s in ('(', ')', '\\')
-
-    def encode(self, splitchars=';, \t', maxlinelen=None, linesep='\n'):
-        r"""Encode a message header into an RFC-compliant format.
-
-        There are many issues involved in converting a given string for use in
-        an email header.  Only certain character sets are readable in most
-        email clients, and as header strings can only contain a subset of
-        7-bit ASCII, care must be taken to properly convert and encode (with
-        Base64 or quoted-printable) header strings.  In addition, there is a
-        75-character length limit on any given encoded header field, so
-        line-wrapping must be performed, even with double-byte character sets.
-
-        Optional maxlinelen specifies the maximum length of each generated
-        line, exclusive of the linesep string.  Individual lines may be longer
-        than maxlinelen if a folding point cannot be found.  The first line
-        will be shorter by the length of the header name plus ": " if a header
-        name was specified at Header construction time.  The default value for
-        maxlinelen is determined at header construction time.
-
-        Optional splitchars is a string containing characters which should be
-        given extra weight by the splitting algorithm during normal header
-        wrapping.  This is in very rough support of RFC 2822's `higher level
-        syntactic breaks':  split points preceded by a splitchar are preferred
-        during line splitting, with the characters preferred in the order in
-        which they appear in the string.  Space and tab may be included in the
-        string to indicate whether preference should be given to one over the
-        other as a split point when other split chars do not appear in the line
-        being split.  Splitchars does not affect RFC 2047 encoded lines.
-
-        Optional linesep is a string to be used to separate the lines of
-        the value.  The default value is the most useful for typical
-        Python applications, but it can be set to \r\n to produce RFC-compliant
-        line separators when needed.
-        """
-        self._normalize()
-        if maxlinelen is None:
-            maxlinelen = self._maxlinelen
-        # A maxlinelen of 0 means don't wrap.  For all practical purposes,
-        # choosing a huge number here accomplishes that and makes the
-        # _ValueFormatter algorithm much simpler.
-        if maxlinelen == 0:
-            maxlinelen = 1000000
-        formatter = _ValueFormatter(self._headerlen, maxlinelen,
-                                    self._continuation_ws, splitchars)
-        lastcs = None
-        hasspace = lastspace = None
-        for string, charset in self._chunks:
-            if hasspace is not None:
-                hasspace = string and self._nonctext(string[0])
-                import sys
-                if lastcs not in (None, 'us-ascii'):
-                    if not hasspace or charset not in (None, 'us-ascii'):
-                        formatter.add_transition()
-                elif charset not in (None, 'us-ascii') and not lastspace:
-                    formatter.add_transition()
-            lastspace = string and self._nonctext(string[-1])
-            lastcs = charset
-            hasspace = False
-            lines = string.splitlines()
-            if lines:
-                formatter.feed('', lines[0], charset)
-            else:
-                formatter.feed('', '', charset)
-            for line in lines[1:]:
-                formatter.newline()
-                if charset.header_encoding is not None:
-                    formatter.feed(self._continuation_ws, ' ' + line.lstrip(),
-                                   charset)
-                else:
-                    sline = line.lstrip()
-                    fws = line[:len(line)-len(sline)]
-                    formatter.feed(fws, sline, charset)
-            if len(lines) > 1:
-                formatter.newline()
-        if self._chunks:
-            formatter.add_transition()
-        value = formatter._str(linesep)
-        if _embeded_header.search(value):
-            raise HeaderParseError("header value appears to contain "
-                "an embedded header: {!r}".format(value))
-        return value
-
-    def _normalize(self):
-        # Step 1: Normalize the chunks so that all runs of identical charsets
-        # get collapsed into a single unicode string.
-        chunks = []
-        last_charset = None
-        last_chunk = []
-        for string, charset in self._chunks:
-            if charset == last_charset:
-                last_chunk.append(string)
-            else:
-                if last_charset is not None:
-                    chunks.append((SPACE.join(last_chunk), last_charset))
-                last_chunk = [string]
-                last_charset = charset
-        if last_chunk:
-            chunks.append((SPACE.join(last_chunk), last_charset))
-        self._chunks = chunks
-
-
-class _ValueFormatter(object):
-    def __init__(self, headerlen, maxlen, continuation_ws, splitchars):
-        self._maxlen = maxlen
-        self._continuation_ws = continuation_ws
-        self._continuation_ws_len = len(continuation_ws)
-        self._splitchars = splitchars
-        self._lines = []
-        self._current_line = _Accumulator(headerlen)
-
-    def _str(self, linesep):
-        self.newline()
-        return linesep.join(self._lines)
-
-    def __str__(self):
-        return self._str(NL)
-
-    def newline(self):
-        end_of_line = self._current_line.pop()
-        if end_of_line != (' ', ''):
-            self._current_line.push(*end_of_line)
-        if len(self._current_line) > 0:
-            if self._current_line.is_onlyws():
-                self._lines[-1] += str(self._current_line)
-            else:
-                self._lines.append(str(self._current_line))
-        self._current_line.reset()
-
-    def add_transition(self):
-        self._current_line.push(' ', '')
-
-    def feed(self, fws, string, charset):
-        # If the charset has no header encoding (i.e. it is an ASCII encoding)
-        # then we must split the header at the "highest level syntactic break"
-        # possible. Note that we don't have a lot of smarts about field
-        # syntax; we just try to break on semi-colons, then commas, then
-        # whitespace.  Eventually, this should be pluggable.
-        if charset.header_encoding is None:
-            self._ascii_split(fws, string, self._splitchars)
-            return
-        # Otherwise, we're doing either a Base64 or a quoted-printable
-        # encoding which means we don't need to split the line on syntactic
-        # breaks.  We can basically just find enough characters to fit on the
-        # current line, minus the RFC 2047 chrome.  What makes this trickier
-        # though is that we have to split at octet boundaries, not character
-        # boundaries but it's only safe to split at character boundaries so at
-        # best we can only get close.
-        encoded_lines = charset.header_encode_lines(string, self._maxlengths())
-        # The first element extends the current line, but if it's None then
-        # nothing more fit on the current line so start a new line.
-        try:
-            first_line = encoded_lines.pop(0)
-        except IndexError:
-            # There are no encoded lines, so we're done.
-            return
-        if first_line is not None:
-            self._append_chunk(fws, first_line)
-        try:
-            last_line = encoded_lines.pop()
-        except IndexError:
-            # There was only one line.
-            return
-        self.newline()
-        self._current_line.push(self._continuation_ws, last_line)
-        # Everything else are full lines in themselves.
-        for line in encoded_lines:
-            self._lines.append(self._continuation_ws + line)
-
-    def _maxlengths(self):
-        # The first line's length.
-        yield self._maxlen - len(self._current_line)
-        while True:
-            yield self._maxlen - self._continuation_ws_len
-
-    def _ascii_split(self, fws, string, splitchars):
-        # The RFC 2822 header folding algorithm is simple in principle but
-        # complex in practice.  Lines may be folded any place where "folding
-        # white space" appears by inserting a linesep character in front of the
-        # FWS.  The complication is that not all spaces or tabs qualify as FWS,
-        # and we are also supposed to prefer to break at "higher level
-        # syntactic breaks".  We can't do either of these without intimate
-        # knowledge of the structure of structured headers, which we don't have
-        # here.  So the best we can do here is prefer to break at the specified
-        # splitchars, and hope that we don't choose any spaces or tabs that
-        # aren't legal FWS.  (This is at least better than the old algorithm,
-        # where we would sometimes *introduce* FWS after a splitchar, or the
-        # algorithm before that, where we would turn all white space runs into
-        # single spaces or tabs.)
-        parts = re.split("(["+FWS+"]+)", fws+string)
-        if parts[0]:
-            parts[:0] = ['']
-        else:
-            parts.pop(0)
-        for fws, part in zip(*[iter(parts)]*2):
-            self._append_chunk(fws, part)
-
-    def _append_chunk(self, fws, string):
-        self._current_line.push(fws, string)
-        if len(self._current_line) > self._maxlen:
-            # Find the best split point, working backward from the end.
-            # There might be none, on a long first line.
-            for ch in self._splitchars:
-                for i in range(self._current_line.part_count()-1, 0, -1):
-                    if ch.isspace():
-                        fws = self._current_line[i][0]
-                        if fws and fws[0]==ch:
-                            break
-                    prevpart = self._current_line[i-1][1]
-                    if prevpart and prevpart[-1]==ch:
-                        break
-                else:
-                    continue
-                break
-            else:
-                fws, part = self._current_line.pop()
-                if self._current_line._initial_size > 0:
-                    # There will be a header, so leave it on a line by itself.
-                    self.newline()
-                    if not fws:
-                        # We don't use continuation_ws here because the whitespace
-                        # after a header should always be a space.
-                        fws = ' '
-                self._current_line.push(fws, part)
-                return
-            remainder = self._current_line.pop_from(i)
-            self._lines.append(str(self._current_line))
-            self._current_line.reset(remainder)
-
-
-class _Accumulator(list):
-
-    def __init__(self, initial_size=0):
-        self._initial_size = initial_size
-        super().__init__()
-
-    def push(self, fws, string):
-        self.append((fws, string))
-
-    def pop_from(self, i=0):
-        popped = self[i:]
-        self[i:] = []
-        return popped
-
-    def pop(self):
-        if self.part_count()==0:
-            return ('', '')
-        return super().pop()
-
-    def __len__(self):
-        return sum((len(fws)+len(part) for fws, part in self),
-                   self._initial_size)
-
-    def __str__(self):
-        return EMPTYSTRING.join((EMPTYSTRING.join((fws, part))
-                                for fws, part in self))
-
-    def reset(self, startval=None):
-        if startval is None:
-            startval = []
-        self[:] = startval
-        self._initial_size = 0
-
-    def is_onlyws(self):
-        return self._initial_size==0 and (not self or str(self).isspace())
-
-    def part_count(self):
-        return super().__len__()
diff --git a/lib/future/backports/email/headerregistry.py b/lib/future/backports/email/headerregistry.py
deleted file mode 100644
index 9aaad65a..00000000
--- a/lib/future/backports/email/headerregistry.py
+++ /dev/null
@@ -1,592 +0,0 @@
-"""Representing and manipulating email headers via custom objects.
-
-This module provides an implementation of the HeaderRegistry API.
-The implementation is designed to flexibly follow RFC5322 rules.
-
-Eventually HeaderRegistry will be a public API, but it isn't yet,
-and will probably change some before that happens.
-
-"""
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-
-from future.builtins import super
-from future.builtins import str
-from future.utils import text_to_native_str
-from future.backports.email import utils
-from future.backports.email import errors
-from future.backports.email import _header_value_parser as parser
-
-class Address(object):
-
-    def __init__(self, display_name='', username='', domain='', addr_spec=None):
-        """Create an object represeting a full email address.
-
-        An address can have a 'display_name', a 'username', and a 'domain'.  In
-        addition to specifying the username and domain separately, they may be
-        specified together by using the addr_spec keyword *instead of* the
-        username and domain keywords.  If an addr_spec string is specified it
-        must be properly quoted according to RFC 5322 rules; an error will be
-        raised if it is not.
-
-        An Address object has display_name, username, domain, and addr_spec
-        attributes, all of which are read-only.  The addr_spec and the string
-        value of the object are both quoted according to RFC5322 rules, but
-        without any Content Transfer Encoding.
-
-        """
-        # This clause with its potential 'raise' may only happen when an
-        # application program creates an Address object using an addr_spec
-        # keyword.  The email library code itself must always supply username
-        # and domain.
-        if addr_spec is not None:
-            if username or domain:
-                raise TypeError("addrspec specified when username and/or "
-                                "domain also specified")
-            a_s, rest = parser.get_addr_spec(addr_spec)
-            if rest:
-                raise ValueError("Invalid addr_spec; only '{}' "
-                                 "could be parsed from '{}'".format(
-                                    a_s, addr_spec))
-            if a_s.all_defects:
-                raise a_s.all_defects[0]
-            username = a_s.local_part
-            domain = a_s.domain
-        self._display_name = display_name
-        self._username = username
-        self._domain = domain
-
-    @property
-    def display_name(self):
-        return self._display_name
-
-    @property
-    def username(self):
-        return self._username
-
-    @property
-    def domain(self):
-        return self._domain
-
-    @property
-    def addr_spec(self):
-        """The addr_spec (username@domain) portion of the address, quoted
-        according to RFC 5322 rules, but with no Content Transfer Encoding.
-        """
-        nameset = set(self.username)
-        if len(nameset) > len(nameset-parser.DOT_ATOM_ENDS):
-            lp = parser.quote_string(self.username)
-        else:
-            lp = self.username
-        if self.domain:
-            return lp + '@' + self.domain
-        if not lp:
-            return '<>'
-        return lp
-
-    def __repr__(self):
-        return "Address(display_name={!r}, username={!r}, domain={!r})".format(
-                        self.display_name, self.username, self.domain)
-
-    def __str__(self):
-        nameset = set(self.display_name)
-        if len(nameset) > len(nameset-parser.SPECIALS):
-            disp = parser.quote_string(self.display_name)
-        else:
-            disp = self.display_name
-        if disp:
-            addr_spec = '' if self.addr_spec=='<>' else self.addr_spec
-            return "{} <{}>".format(disp, addr_spec)
-        return self.addr_spec
-
-    def __eq__(self, other):
-        if type(other) != type(self):
-            return False
-        return (self.display_name == other.display_name and
-                self.username == other.username and
-                self.domain == other.domain)
-
-
-class Group(object):
-
-    def __init__(self, display_name=None, addresses=None):
-        """Create an object representing an address group.
-
-        An address group consists of a display_name followed by colon and an
-        list of addresses (see Address) terminated by a semi-colon.  The Group
-        is created by specifying a display_name and a possibly empty list of
-        Address objects.  A Group can also be used to represent a single
-        address that is not in a group, which is convenient when manipulating
-        lists that are a combination of Groups and individual Addresses.  In
-        this case the display_name should be set to None.  In particular, the
-        string representation of a Group whose display_name is None is the same
-        as the Address object, if there is one and only one Address object in
-        the addresses list.
-
-        """
-        self._display_name = display_name
-        self._addresses = tuple(addresses) if addresses else tuple()
-
-    @property
-    def display_name(self):
-        return self._display_name
-
-    @property
-    def addresses(self):
-        return self._addresses
-
-    def __repr__(self):
-        return "Group(display_name={!r}, addresses={!r}".format(
-                 self.display_name, self.addresses)
-
-    def __str__(self):
-        if self.display_name is None and len(self.addresses)==1:
-            return str(self.addresses[0])
-        disp = self.display_name
-        if disp is not None:
-            nameset = set(disp)
-            if len(nameset) > len(nameset-parser.SPECIALS):
-                disp = parser.quote_string(disp)
-        adrstr = ", ".join(str(x) for x in self.addresses)
-        adrstr = ' ' + adrstr if adrstr else adrstr
-        return "{}:{};".format(disp, adrstr)
-
-    def __eq__(self, other):
-        if type(other) != type(self):
-            return False
-        return (self.display_name == other.display_name and
-                self.addresses == other.addresses)
-
-
-# Header Classes #
-
-class BaseHeader(str):
-
-    """Base class for message headers.
-
-    Implements generic behavior and provides tools for subclasses.
-
-    A subclass must define a classmethod named 'parse' that takes an unfolded
-    value string and a dictionary as its arguments.  The dictionary will
-    contain one key, 'defects', initialized to an empty list.  After the call
-    the dictionary must contain two additional keys: parse_tree, set to the
-    parse tree obtained from parsing the header, and 'decoded', set to the
-    string value of the idealized representation of the data from the value.
-    (That is, encoded words are decoded, and values that have canonical
-    representations are so represented.)
-
-    The defects key is intended to collect parsing defects, which the message
-    parser will subsequently dispose of as appropriate.  The parser should not,
-    insofar as practical, raise any errors.  Defects should be added to the
-    list instead.  The standard header parsers register defects for RFC
-    compliance issues, for obsolete RFC syntax, and for unrecoverable parsing
-    errors.
-
-    The parse method may add additional keys to the dictionary.  In this case
-    the subclass must define an 'init' method, which will be passed the
-    dictionary as its keyword arguments.  The method should use (usually by
-    setting them as the value of similarly named attributes) and remove all the
-    extra keys added by its parse method, and then use super to call its parent
-    class with the remaining arguments and keywords.
-
-    The subclass should also make sure that a 'max_count' attribute is defined
-    that is either None or 1. XXX: need to better define this API.
-
-    """
-
-    def __new__(cls, name, value):
-        kwds = {'defects': []}
-        cls.parse(value, kwds)
-        if utils._has_surrogates(kwds['decoded']):
-            kwds['decoded'] = utils._sanitize(kwds['decoded'])
-        self = str.__new__(cls, kwds['decoded'])
-        # del kwds['decoded']
-        self.init(name, **kwds)
-        return self
-
-    def init(self, name, **_3to2kwargs):
-        defects = _3to2kwargs['defects']; del _3to2kwargs['defects']
-        parse_tree = _3to2kwargs['parse_tree']; del _3to2kwargs['parse_tree']
-        self._name = name
-        self._parse_tree = parse_tree
-        self._defects = defects
-
-    @property
-    def name(self):
-        return self._name
-
-    @property
-    def defects(self):
-        return tuple(self._defects)
-
-    def __reduce__(self):
-        return (
-            _reconstruct_header,
-            (
-                self.__class__.__name__,
-                self.__class__.__bases__,
-                str(self),
-            ),
-            self.__dict__)
-
-    @classmethod
-    def _reconstruct(cls, value):
-        return str.__new__(cls, value)
-
-    def fold(self, **_3to2kwargs):
-        policy = _3to2kwargs['policy']; del _3to2kwargs['policy']
-        """Fold header according to policy.
-
-        The parsed representation of the header is folded according to
-        RFC5322 rules, as modified by the policy.  If the parse tree
-        contains surrogateescaped bytes, the bytes are CTE encoded using
-        the charset 'unknown-8bit".
-
-        Any non-ASCII characters in the parse tree are CTE encoded using
-        charset utf-8. XXX: make this a policy setting.
-
-        The returned value is an ASCII-only string possibly containing linesep
-        characters, and ending with a linesep character.  The string includes
-        the header name and the ': ' separator.
-
-        """
-        # At some point we need to only put fws here if it was in the source.
-        header = parser.Header([
-            parser.HeaderLabel([
-                parser.ValueTerminal(self.name, 'header-name'),
-                parser.ValueTerminal(':', 'header-sep')]),
-            parser.CFWSList([parser.WhiteSpaceTerminal(' ', 'fws')]),
-                             self._parse_tree])
-        return header.fold(policy=policy)
-
-
-def _reconstruct_header(cls_name, bases, value):
-    return type(text_to_native_str(cls_name), bases, {})._reconstruct(value)
-
-
-class UnstructuredHeader(object):
-
-    max_count = None
-    value_parser = staticmethod(parser.get_unstructured)
-
-    @classmethod
-    def parse(cls, value, kwds):
-        kwds['parse_tree'] = cls.value_parser(value)
-        kwds['decoded'] = str(kwds['parse_tree'])
-
-
-class UniqueUnstructuredHeader(UnstructuredHeader):
-
-    max_count = 1
-
-
-class DateHeader(object):
-
-    """Header whose value consists of a single timestamp.
-
-    Provides an additional attribute, datetime, which is either an aware
-    datetime using a timezone, or a naive datetime if the timezone
-    in the input string is -0000.  Also accepts a datetime as input.
-    The 'value' attribute is the normalized form of the timestamp,
-    which means it is the output of format_datetime on the datetime.
-    """
-
-    max_count = None
-
-    # This is used only for folding, not for creating 'decoded'.
-    value_parser = staticmethod(parser.get_unstructured)
-
-    @classmethod
-    def parse(cls, value, kwds):
-        if not value:
-            kwds['defects'].append(errors.HeaderMissingRequiredValue())
-            kwds['datetime'] = None
-            kwds['decoded'] = ''
-            kwds['parse_tree'] = parser.TokenList()
-            return
-        if isinstance(value, str):
-            value = utils.parsedate_to_datetime(value)
-        kwds['datetime'] = value
-        kwds['decoded'] = utils.format_datetime(kwds['datetime'])
-        kwds['parse_tree'] = cls.value_parser(kwds['decoded'])
-
-    def init(self, *args, **kw):
-        self._datetime = kw.pop('datetime')
-        super().init(*args, **kw)
-
-    @property
-    def datetime(self):
-        return self._datetime
-
-
-class UniqueDateHeader(DateHeader):
-
-    max_count = 1
-
-
-class AddressHeader(object):
-
-    max_count = None
-
-    @staticmethod
-    def value_parser(value):
-        address_list, value = parser.get_address_list(value)
-        assert not value, 'this should not happen'
-        return address_list
-
-    @classmethod
-    def parse(cls, value, kwds):
-        if isinstance(value, str):
-            # We are translating here from the RFC language (address/mailbox)
-            # to our API language (group/address).
-            kwds['parse_tree'] = address_list = cls.value_parser(value)
-            groups = []
-            for addr in address_list.addresses:
-                groups.append(Group(addr.display_name,
-                                    [Address(mb.display_name or '',
-                                             mb.local_part or '',
-                                             mb.domain or '')
-                                     for mb in addr.all_mailboxes]))
-            defects = list(address_list.all_defects)
-        else:
-            # Assume it is Address/Group stuff
-            if not hasattr(value, '__iter__'):
-                value = [value]
-            groups = [Group(None, [item]) if not hasattr(item, 'addresses')
-                                          else item
-                                    for item in value]
-            defects = []
-        kwds['groups'] = groups
-        kwds['defects'] = defects
-        kwds['decoded'] = ', '.join([str(item) for item in groups])
-        if 'parse_tree' not in kwds:
-            kwds['parse_tree'] = cls.value_parser(kwds['decoded'])
-
-    def init(self, *args, **kw):
-        self._groups = tuple(kw.pop('groups'))
-        self._addresses = None
-        super().init(*args, **kw)
-
-    @property
-    def groups(self):
-        return self._groups
-
-    @property
-    def addresses(self):
-        if self._addresses is None:
-            self._addresses = tuple([address for group in self._groups
-                                             for address in group.addresses])
-        return self._addresses
-
-
-class UniqueAddressHeader(AddressHeader):
-
-    max_count = 1
-
-
-class SingleAddressHeader(AddressHeader):
-
-    @property
-    def address(self):
-        if len(self.addresses)!=1:
-            raise ValueError(("value of single address header {} is not "
-                "a single address").format(self.name))
-        return self.addresses[0]
-
-
-class UniqueSingleAddressHeader(SingleAddressHeader):
-
-    max_count = 1
-
-
-class MIMEVersionHeader(object):
-
-    max_count = 1
-
-    value_parser = staticmethod(parser.parse_mime_version)
-
-    @classmethod
-    def parse(cls, value, kwds):
-        kwds['parse_tree'] = parse_tree = cls.value_parser(value)
-        kwds['decoded'] = str(parse_tree)
-        kwds['defects'].extend(parse_tree.all_defects)
-        kwds['major'] = None if parse_tree.minor is None else parse_tree.major
-        kwds['minor'] = parse_tree.minor
-        if parse_tree.minor is not None:
-            kwds['version'] = '{}.{}'.format(kwds['major'], kwds['minor'])
-        else:
-            kwds['version'] = None
-
-    def init(self, *args, **kw):
-        self._version = kw.pop('version')
-        self._major = kw.pop('major')
-        self._minor = kw.pop('minor')
-        super().init(*args, **kw)
-
-    @property
-    def major(self):
-        return self._major
-
-    @property
-    def minor(self):
-        return self._minor
-
-    @property
-    def version(self):
-        return self._version
-
-
-class ParameterizedMIMEHeader(object):
-
-    # Mixin that handles the params dict.  Must be subclassed and
-    # a property value_parser for the specific header provided.
-
-    max_count = 1
-
-    @classmethod
-    def parse(cls, value, kwds):
-        kwds['parse_tree'] = parse_tree = cls.value_parser(value)
-        kwds['decoded'] = str(parse_tree)
-        kwds['defects'].extend(parse_tree.all_defects)
-        if parse_tree.params is None:
-            kwds['params'] = {}
-        else:
-            # The MIME RFCs specify that parameter ordering is arbitrary.
-            kwds['params'] = dict((utils._sanitize(name).lower(),
-                                   utils._sanitize(value))
-                                  for name, value in parse_tree.params)
-
-    def init(self, *args, **kw):
-        self._params = kw.pop('params')
-        super().init(*args, **kw)
-
-    @property
-    def params(self):
-        return self._params.copy()
-
-
-class ContentTypeHeader(ParameterizedMIMEHeader):
-
-    value_parser = staticmethod(parser.parse_content_type_header)
-
-    def init(self, *args, **kw):
-        super().init(*args, **kw)
-        self._maintype = utils._sanitize(self._parse_tree.maintype)
-        self._subtype = utils._sanitize(self._parse_tree.subtype)
-
-    @property
-    def maintype(self):
-        return self._maintype
-
-    @property
-    def subtype(self):
-        return self._subtype
-
-    @property
-    def content_type(self):
-        return self.maintype + '/' + self.subtype
-
-
-class ContentDispositionHeader(ParameterizedMIMEHeader):
-
-    value_parser = staticmethod(parser.parse_content_disposition_header)
-
-    def init(self, *args, **kw):
-        super().init(*args, **kw)
-        cd = self._parse_tree.content_disposition
-        self._content_disposition = cd if cd is None else utils._sanitize(cd)
-
-    @property
-    def content_disposition(self):
-        return self._content_disposition
-
-
-class ContentTransferEncodingHeader(object):
-
-    max_count = 1
-
-    value_parser = staticmethod(parser.parse_content_transfer_encoding_header)
-
-    @classmethod
-    def parse(cls, value, kwds):
-        kwds['parse_tree'] = parse_tree = cls.value_parser(value)
-        kwds['decoded'] = str(parse_tree)
-        kwds['defects'].extend(parse_tree.all_defects)
-
-    def init(self, *args, **kw):
-        super().init(*args, **kw)
-        self._cte = utils._sanitize(self._parse_tree.cte)
-
-    @property
-    def cte(self):
-        return self._cte
-
-
-# The header factory #
-
-_default_header_map = {
-    'subject':                      UniqueUnstructuredHeader,
-    'date':                         UniqueDateHeader,
-    'resent-date':                  DateHeader,
-    'orig-date':                    UniqueDateHeader,
-    'sender':                       UniqueSingleAddressHeader,
-    'resent-sender':                SingleAddressHeader,
-    'to':                           UniqueAddressHeader,
-    'resent-to':                    AddressHeader,
-    'cc':                           UniqueAddressHeader,
-    'resent-cc':                    AddressHeader,
-    'bcc':                          UniqueAddressHeader,
-    'resent-bcc':                   AddressHeader,
-    'from':                         UniqueAddressHeader,
-    'resent-from':                  AddressHeader,
-    'reply-to':                     UniqueAddressHeader,
-    'mime-version':                 MIMEVersionHeader,
-    'content-type':                 ContentTypeHeader,
-    'content-disposition':          ContentDispositionHeader,
-    'content-transfer-encoding':    ContentTransferEncodingHeader,
-    }
-
-class HeaderRegistry(object):
-
-    """A header_factory and header registry."""
-
-    def __init__(self, base_class=BaseHeader, default_class=UnstructuredHeader,
-                       use_default_map=True):
-        """Create a header_factory that works with the Policy API.
-
-        base_class is the class that will be the last class in the created
-        header class's __bases__ list.  default_class is the class that will be
-        used if "name" (see __call__) does not appear in the registry.
-        use_default_map controls whether or not the default mapping of names to
-        specialized classes is copied in to the registry when the factory is
-        created.  The default is True.
-
-        """
-        self.registry = {}
-        self.base_class = base_class
-        self.default_class = default_class
-        if use_default_map:
-            self.registry.update(_default_header_map)
-
-    def map_to_type(self, name, cls):
-        """Register cls as the specialized class for handling "name" headers.
-
-        """
-        self.registry[name.lower()] = cls
-
-    def __getitem__(self, name):
-        cls = self.registry.get(name.lower(), self.default_class)
-        return type(text_to_native_str('_'+cls.__name__), (cls, self.base_class), {})
-
-    def __call__(self, name, value):
-        """Create a header instance for header 'name' from 'value'.
-
-        Creates a header instance by creating a specialized class for parsing
-        and representing the specified header by combining the factory
-        base_class with a specialized class from the registry or the
-        default_class, and passing the name and value to the constructed
-        class's constructor.
-
-        """
-        return self[name](name, value)
diff --git a/lib/future/backports/email/iterators.py b/lib/future/backports/email/iterators.py
deleted file mode 100644
index 82d320f8..00000000
--- a/lib/future/backports/email/iterators.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright (C) 2001-2006 Python Software Foundation
-# Author: Barry Warsaw
-# Contact: email-sig@python.org
-
-"""Various types of useful iterators and generators."""
-from __future__ import print_function
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-
-__all__ = [
-    'body_line_iterator',
-    'typed_subpart_iterator',
-    'walk',
-    # Do not include _structure() since it's part of the debugging API.
-    ]
-
-import sys
-from io import StringIO
-
-
-# This function will become a method of the Message class
-def walk(self):
-    """Walk over the message tree, yielding each subpart.
-
-    The walk is performed in depth-first order.  This method is a
-    generator.
-    """
-    yield self
-    if self.is_multipart():
-        for subpart in self.get_payload():
-            for subsubpart in subpart.walk():
-                yield subsubpart
-
-
-# These two functions are imported into the Iterators.py interface module.
-def body_line_iterator(msg, decode=False):
-    """Iterate over the parts, returning string payloads line-by-line.
-
-    Optional decode (default False) is passed through to .get_payload().
-    """
-    for subpart in msg.walk():
-        payload = subpart.get_payload(decode=decode)
-        if isinstance(payload, str):
-            for line in StringIO(payload):
-                yield line
-
-
-def typed_subpart_iterator(msg, maintype='text', subtype=None):
-    """Iterate over the subparts with a given MIME type.
-
-    Use `maintype' as the main MIME type to match against; this defaults to
-    "text".  Optional `subtype' is the MIME subtype to match against; if
-    omitted, only the main type is matched.
-    """
-    for subpart in msg.walk():
-        if subpart.get_content_maintype() == maintype:
-            if subtype is None or subpart.get_content_subtype() == subtype:
-                yield subpart
-
-
-def _structure(msg, fp=None, level=0, include_default=False):
-    """A handy debugging aid"""
-    if fp is None:
-        fp = sys.stdout
-    tab = ' ' * (level * 4)
-    print(tab + msg.get_content_type(), end='', file=fp)
-    if include_default:
-        print(' [%s]' % msg.get_default_type(), file=fp)
-    else:
-        print(file=fp)
-    if msg.is_multipart():
-        for subpart in msg.get_payload():
-            _structure(subpart, fp, level+1, include_default)
diff --git a/lib/future/backports/email/message.py b/lib/future/backports/email/message.py
deleted file mode 100644
index d8d9615d..00000000
--- a/lib/future/backports/email/message.py
+++ /dev/null
@@ -1,882 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2001-2007 Python Software Foundation
-# Author: Barry Warsaw
-# Contact: email-sig@python.org
-
-"""Basic message object for the email package object model."""
-from __future__ import absolute_import, division, unicode_literals
-from future.builtins import list, range, str, zip
-
-__all__ = ['Message']
-
-import re
-import uu
-import base64
-import binascii
-from io import BytesIO, StringIO
-
-# Intrapackage imports
-from future.utils import as_native_str
-from future.backports.email import utils
-from future.backports.email import errors
-from future.backports.email._policybase import compat32
-from future.backports.email import charset as _charset
-from future.backports.email._encoded_words import decode_b
-Charset = _charset.Charset
-
-SEMISPACE = '; '
-
-# Regular expression that matches `special' characters in parameters, the
-# existence of which force quoting of the parameter value.
-tspecials = re.compile(r'[ \(\)<>@,;:\\"/\[\]\?=]')
-
-
-def _splitparam(param):
-    # Split header parameters.  BAW: this may be too simple.  It isn't
-    # strictly RFC 2045 (section 5.1) compliant, but it catches most headers
-    # found in the wild.  We may eventually need a full fledged parser.
-    # RDM: we might have a Header here; for now just stringify it.
-    a, sep, b = str(param).partition(';')
-    if not sep:
-        return a.strip(), None
-    return a.strip(), b.strip()
-
-def _formatparam(param, value=None, quote=True):
-    """Convenience function to format and return a key=value pair.
-
-    This will quote the value if needed or if quote is true.  If value is a
-    three tuple (charset, language, value), it will be encoded according
-    to RFC2231 rules.  If it contains non-ascii characters it will likewise
-    be encoded according to RFC2231 rules, using the utf-8 charset and
-    a null language.
-    """
-    if value is not None and len(value) > 0:
-        # A tuple is used for RFC 2231 encoded parameter values where items
-        # are (charset, language, value).  charset is a string, not a Charset
-        # instance.  RFC 2231 encoded values are never quoted, per RFC.
-        if isinstance(value, tuple):
-            # Encode as per RFC 2231
-            param += '*'
-            value = utils.encode_rfc2231(value[2], value[0], value[1])
-            return '%s=%s' % (param, value)
-        else:
-            try:
-                value.encode('ascii')
-            except UnicodeEncodeError:
-                param += '*'
-                value = utils.encode_rfc2231(value, 'utf-8', '')
-                return '%s=%s' % (param, value)
-        # BAW: Please check this.  I think that if quote is set it should
-        # force quoting even if not necessary.
-        if quote or tspecials.search(value):
-            return '%s="%s"' % (param, utils.quote(value))
-        else:
-            return '%s=%s' % (param, value)
-    else:
-        return param
-
-def _parseparam(s):
-    # RDM This might be a Header, so for now stringify it.
-    s = ';' + str(s)
-    plist = []
-    while s[:1] == ';':
-        s = s[1:]
-        end = s.find(';')
-        while end > 0 and (s.count('"', 0, end) - s.count('\\"', 0, end)) % 2:
-            end = s.find(';', end + 1)
-        if end < 0:
-            end = len(s)
-        f = s[:end]
-        if '=' in f:
-            i = f.index('=')
-            f = f[:i].strip().lower() + '=' + f[i+1:].strip()
-        plist.append(f.strip())
-        s = s[end:]
-    return plist
-
-
-def _unquotevalue(value):
-    # This is different than utils.collapse_rfc2231_value() because it doesn't
-    # try to convert the value to a unicode.  Message.get_param() and
-    # Message.get_params() are both currently defined to return the tuple in
-    # the face of RFC 2231 parameters.
-    if isinstance(value, tuple):
-        return value[0], value[1], utils.unquote(value[2])
-    else:
-        return utils.unquote(value)
-
-
-class Message(object):
-    """Basic message object.
-
-    A message object is defined as something that has a bunch of RFC 2822
-    headers and a payload.  It may optionally have an envelope header
-    (a.k.a. Unix-From or From_ header).  If the message is a container (i.e. a
-    multipart or a message/rfc822), then the payload is a list of Message
-    objects, otherwise it is a string.
-
-    Message objects implement part of the `mapping' interface, which assumes
-    there is exactly one occurrence of the header per message.  Some headers
-    do in fact appear multiple times (e.g. Received) and for those headers,
-    you must use the explicit API to set or get all the headers.  Not all of
-    the mapping methods are implemented.
-    """
-    def __init__(self, policy=compat32):
-        self.policy = policy
-        self._headers = list()
-        self._unixfrom = None
-        self._payload = None
-        self._charset = None
-        # Defaults for multipart messages
-        self.preamble = self.epilogue = None
-        self.defects = []
-        # Default content type
-        self._default_type = 'text/plain'
-
-    @as_native_str(encoding='utf-8')
-    def __str__(self):
-        """Return the entire formatted message as a string.
-        This includes the headers, body, and envelope header.
-        """
-        return self.as_string()
-
-    def as_string(self, unixfrom=False, maxheaderlen=0):
-        """Return the entire formatted message as a (unicode) string.
-        Optional `unixfrom' when True, means include the Unix From_ envelope
-        header.
-
-        This is a convenience method and may not generate the message exactly
-        as you intend.  For more flexibility, use the flatten() method of a
-        Generator instance.
-        """
-        from future.backports.email.generator import Generator
-        fp = StringIO()
-        g = Generator(fp, mangle_from_=False, maxheaderlen=maxheaderlen)
-        g.flatten(self, unixfrom=unixfrom)
-        return fp.getvalue()
-
-    def is_multipart(self):
-        """Return True if the message consists of multiple parts."""
-        return isinstance(self._payload, list)
-
-    #
-    # Unix From_ line
-    #
-    def set_unixfrom(self, unixfrom):
-        self._unixfrom = unixfrom
-
-    def get_unixfrom(self):
-        return self._unixfrom
-
-    #
-    # Payload manipulation.
-    #
-    def attach(self, payload):
-        """Add the given payload to the current payload.
-
-        The current payload will always be a list of objects after this method
-        is called.  If you want to set the payload to a scalar object, use
-        set_payload() instead.
-        """
-        if self._payload is None:
-            self._payload = [payload]
-        else:
-            self._payload.append(payload)
-
-    def get_payload(self, i=None, decode=False):
-        """Return a reference to the payload.
-
-        The payload will either be a list object or a string.  If you mutate
-        the list object, you modify the message's payload in place.  Optional
-        i returns that index into the payload.
-
-        Optional decode is a flag indicating whether the payload should be
-        decoded or not, according to the Content-Transfer-Encoding header
-        (default is False).
-
-        When True and the message is not a multipart, the payload will be
-        decoded if this header's value is `quoted-printable' or `base64'.  If
-        some other encoding is used, or the header is missing, or if the
-        payload has bogus data (i.e. bogus base64 or uuencoded data), the
-        payload is returned as-is.
-
-        If the message is a multipart and the decode flag is True, then None
-        is returned.
-        """
-        # Here is the logic table for this code, based on the email5.0.0 code:
-        #   i     decode  is_multipart  result
-        # ------  ------  ------------  ------------------------------
-        #  None   True    True          None
-        #   i     True    True          None
-        #  None   False   True          _payload (a list)
-        #   i     False   True          _payload element i (a Message)
-        #   i     False   False         error (not a list)
-        #   i     True    False         error (not a list)
-        #  None   False   False         _payload
-        #  None   True    False         _payload decoded (bytes)
-        # Note that Barry planned to factor out the 'decode' case, but that
-        # isn't so easy now that we handle the 8 bit data, which needs to be
-        # converted in both the decode and non-decode path.
-        if self.is_multipart():
-            if decode:
-                return None
-            if i is None:
-                return self._payload
-            else:
-                return self._payload[i]
-        # For backward compatibility, Use isinstance and this error message
-        # instead of the more logical is_multipart test.
-        if i is not None and not isinstance(self._payload, list):
-            raise TypeError('Expected list, got %s' % type(self._payload))
-        payload = self._payload
-        # cte might be a Header, so for now stringify it.
-        cte = str(self.get('content-transfer-encoding', '')).lower()
-        # payload may be bytes here.
-        if isinstance(payload, str):
-            payload = str(payload)    # for Python-Future, so surrogateescape works
-            if utils._has_surrogates(payload):
-                bpayload = payload.encode('ascii', 'surrogateescape')
-                if not decode:
-                    try:
-                        payload = bpayload.decode(self.get_param('charset', 'ascii'), 'replace')
-                    except LookupError:
-                        payload = bpayload.decode('ascii', 'replace')
-            elif decode:
-                try:
-                    bpayload = payload.encode('ascii')
-                except UnicodeError:
-                    # This won't happen for RFC compliant messages (messages
-                    # containing only ASCII codepoints in the unicode input).
-                    # If it does happen, turn the string into bytes in a way
-                    # guaranteed not to fail.
-                    bpayload = payload.encode('raw-unicode-escape')
-        if not decode:
-            return payload
-        if cte == 'quoted-printable':
-            return utils._qdecode(bpayload)
-        elif cte == 'base64':
-            # XXX: this is a bit of a hack; decode_b should probably be factored
-            # out somewhere, but I haven't figured out where yet.
-            value, defects = decode_b(b''.join(bpayload.splitlines()))
-            for defect in defects:
-                self.policy.handle_defect(self, defect)
-            return value
-        elif cte in ('x-uuencode', 'uuencode', 'uue', 'x-uue'):
-            in_file = BytesIO(bpayload)
-            out_file = BytesIO()
-            try:
-                uu.decode(in_file, out_file, quiet=True)
-                return out_file.getvalue()
-            except uu.Error:
-                # Some decoding problem
-                return bpayload
-        if isinstance(payload, str):
-            return bpayload
-        return payload
-
-    def set_payload(self, payload, charset=None):
-        """Set the payload to the given value.
-
-        Optional charset sets the message's default character set.  See
-        set_charset() for details.
-        """
-        self._payload = payload
-        if charset is not None:
-            self.set_charset(charset)
-
-    def set_charset(self, charset):
-        """Set the charset of the payload to a given character set.
-
-        charset can be a Charset instance, a string naming a character set, or
-        None.  If it is a string it will be converted to a Charset instance.
-        If charset is None, the charset parameter will be removed from the
-        Content-Type field.  Anything else will generate a TypeError.
-
-        The message will be assumed to be of type text/* encoded with
-        charset.input_charset.  It will be converted to charset.output_charset
-        and encoded properly, if needed, when generating the plain text
-        representation of the message.  MIME headers (MIME-Version,
-        Content-Type, Content-Transfer-Encoding) will be added as needed.
-        """
-        if charset is None:
-            self.del_param('charset')
-            self._charset = None
-            return
-        if not isinstance(charset, Charset):
-            charset = Charset(charset)
-        self._charset = charset
-        if 'MIME-Version' not in self:
-            self.add_header('MIME-Version', '1.0')
-        if 'Content-Type' not in self:
-            self.add_header('Content-Type', 'text/plain',
-                            charset=charset.get_output_charset())
-        else:
-            self.set_param('charset', charset.get_output_charset())
-        if charset != charset.get_output_charset():
-            self._payload = charset.body_encode(self._payload)
-        if 'Content-Transfer-Encoding' not in self:
-            cte = charset.get_body_encoding()
-            try:
-                cte(self)
-            except TypeError:
-                self._payload = charset.body_encode(self._payload)
-                self.add_header('Content-Transfer-Encoding', cte)
-
-    def get_charset(self):
-        """Return the Charset instance associated with the message's payload.
-        """
-        return self._charset
-
-    #
-    # MAPPING INTERFACE (partial)
-    #
-    def __len__(self):
-        """Return the total number of headers, including duplicates."""
-        return len(self._headers)
-
-    def __getitem__(self, name):
-        """Get a header value.
-
-        Return None if the header is missing instead of raising an exception.
-
-        Note that if the header appeared multiple times, exactly which
-        occurrence gets returned is undefined.  Use get_all() to get all
-        the values matching a header field name.
-        """
-        return self.get(name)
-
-    def __setitem__(self, name, val):
-        """Set the value of a header.
-
-        Note: this does not overwrite an existing header with the same field
-        name.  Use __delitem__() first to delete any existing headers.
-        """
-        max_count = self.policy.header_max_count(name)
-        if max_count:
-            lname = name.lower()
-            found = 0
-            for k, v in self._headers:
-                if k.lower() == lname:
-                    found += 1
-                    if found >= max_count:
-                        raise ValueError("There may be at most {} {} headers "
-                                         "in a message".format(max_count, name))
-        self._headers.append(self.policy.header_store_parse(name, val))
-
-    def __delitem__(self, name):
-        """Delete all occurrences of a header, if present.
-
-        Does not raise an exception if the header is missing.
-        """
-        name = name.lower()
-        newheaders = list()
-        for k, v in self._headers:
-            if k.lower() != name:
-                newheaders.append((k, v))
-        self._headers = newheaders
-
-    def __contains__(self, name):
-        return name.lower() in [k.lower() for k, v in self._headers]
-
-    def __iter__(self):
-        for field, value in self._headers:
-            yield field
-
-    def keys(self):
-        """Return a list of all the message's header field names.
-
-        These will be sorted in the order they appeared in the original
-        message, or were added to the message, and may contain duplicates.
-        Any fields deleted and re-inserted are always appended to the header
-        list.
-        """
-        return [k for k, v in self._headers]
-
-    def values(self):
-        """Return a list of all the message's header values.
-
-        These will be sorted in the order they appeared in the original
-        message, or were added to the message, and may contain duplicates.
-        Any fields deleted and re-inserted are always appended to the header
-        list.
-        """
-        return [self.policy.header_fetch_parse(k, v)
-                for k, v in self._headers]
-
-    def items(self):
-        """Get all the message's header fields and values.
-
-        These will be sorted in the order they appeared in the original
-        message, or were added to the message, and may contain duplicates.
-        Any fields deleted and re-inserted are always appended to the header
-        list.
-        """
-        return [(k, self.policy.header_fetch_parse(k, v))
-                for k, v in self._headers]
-
-    def get(self, name, failobj=None):
-        """Get a header value.
-
-        Like __getitem__() but return failobj instead of None when the field
-        is missing.
-        """
-        name = name.lower()
-        for k, v in self._headers:
-            if k.lower() == name:
-                return self.policy.header_fetch_parse(k, v)
-        return failobj
-
-    #
-    # "Internal" methods (public API, but only intended for use by a parser
-    # or generator, not normal application code.
-    #
-
-    def set_raw(self, name, value):
-        """Store name and value in the model without modification.
-
-        This is an "internal" API, intended only for use by a parser.
-        """
-        self._headers.append((name, value))
-
-    def raw_items(self):
-        """Return the (name, value) header pairs without modification.
-
-        This is an "internal" API, intended only for use by a generator.
-        """
-        return iter(self._headers.copy())
-
-    #
-    # Additional useful stuff
-    #
-
-    def get_all(self, name, failobj=None):
-        """Return a list of all the values for the named field.
-
-        These will be sorted in the order they appeared in the original
-        message, and may contain duplicates.  Any fields deleted and
-        re-inserted are always appended to the header list.
-
-        If no such fields exist, failobj is returned (defaults to None).
-        """
-        values = []
-        name = name.lower()
-        for k, v in self._headers:
-            if k.lower() == name:
-                values.append(self.policy.header_fetch_parse(k, v))
-        if not values:
-            return failobj
-        return values
-
-    def add_header(self, _name, _value, **_params):
-        """Extended header setting.
-
-        name is the header field to add.  keyword arguments can be used to set
-        additional parameters for the header field, with underscores converted
-        to dashes.  Normally the parameter will be added as key="value" unless
-        value is None, in which case only the key will be added.  If a
-        parameter value contains non-ASCII characters it can be specified as a
-        three-tuple of (charset, language, value), in which case it will be
-        encoded according to RFC2231 rules.  Otherwise it will be encoded using
-        the utf-8 charset and a language of ''.
-
-        Examples:
-
-        msg.add_header('content-disposition', 'attachment', filename='bud.gif')
-        msg.add_header('content-disposition', 'attachment',
-                       filename=('utf-8', '', 'Fußballer.ppt'))
-        msg.add_header('content-disposition', 'attachment',
-                       filename='Fußballer.ppt'))
-        """
-        parts = []
-        for k, v in _params.items():
-            if v is None:
-                parts.append(k.replace('_', '-'))
-            else:
-                parts.append(_formatparam(k.replace('_', '-'), v))
-        if _value is not None:
-            parts.insert(0, _value)
-        self[_name] = SEMISPACE.join(parts)
-
-    def replace_header(self, _name, _value):
-        """Replace a header.
-
-        Replace the first matching header found in the message, retaining
-        header order and case.  If no matching header was found, a KeyError is
-        raised.
-        """
-        _name = _name.lower()
-        for i, (k, v) in zip(range(len(self._headers)), self._headers):
-            if k.lower() == _name:
-                self._headers[i] = self.policy.header_store_parse(k, _value)
-                break
-        else:
-            raise KeyError(_name)
-
-    #
-    # Use these three methods instead of the three above.
-    #
-
-    def get_content_type(self):
-        """Return the message's content type.
-
-        The returned string is coerced to lower case of the form
-        `maintype/subtype'.  If there was no Content-Type header in the
-        message, the default type as given by get_default_type() will be
-        returned.  Since according to RFC 2045, messages always have a default
-        type this will always return a value.
-
-        RFC 2045 defines a message's default type to be text/plain unless it
-        appears inside a multipart/digest container, in which case it would be
-        message/rfc822.
-        """
-        missing = object()
-        value = self.get('content-type', missing)
-        if value is missing:
-            # This should have no parameters
-            return self.get_default_type()
-        ctype = _splitparam(value)[0].lower()
-        # RFC 2045, section 5.2 says if its invalid, use text/plain
-        if ctype.count('/') != 1:
-            return 'text/plain'
-        return ctype
-
-    def get_content_maintype(self):
-        """Return the message's main content type.
-
-        This is the `maintype' part of the string returned by
-        get_content_type().
-        """
-        ctype = self.get_content_type()
-        return ctype.split('/')[0]
-
-    def get_content_subtype(self):
-        """Returns the message's sub-content type.
-
-        This is the `subtype' part of the string returned by
-        get_content_type().
-        """
-        ctype = self.get_content_type()
-        return ctype.split('/')[1]
-
-    def get_default_type(self):
-        """Return the `default' content type.
-
-        Most messages have a default content type of text/plain, except for
-        messages that are subparts of multipart/digest containers.  Such
-        subparts have a default content type of message/rfc822.
-        """
-        return self._default_type
-
-    def set_default_type(self, ctype):
-        """Set the `default' content type.
-
-        ctype should be either "text/plain" or "message/rfc822", although this
-        is not enforced.  The default content type is not stored in the
-        Content-Type header.
-        """
-        self._default_type = ctype
-
-    def _get_params_preserve(self, failobj, header):
-        # Like get_params() but preserves the quoting of values.  BAW:
-        # should this be part of the public interface?
-        missing = object()
-        value = self.get(header, missing)
-        if value is missing:
-            return failobj
-        params = []
-        for p in _parseparam(value):
-            try:
-                name, val = p.split('=', 1)
-                name = name.strip()
-                val = val.strip()
-            except ValueError:
-                # Must have been a bare attribute
-                name = p.strip()
-                val = ''
-            params.append((name, val))
-        params = utils.decode_params(params)
-        return params
-
-    def get_params(self, failobj=None, header='content-type', unquote=True):
-        """Return the message's Content-Type parameters, as a list.
-
-        The elements of the returned list are 2-tuples of key/value pairs, as
-        split on the `=' sign.  The left hand side of the `=' is the key,
-        while the right hand side is the value.  If there is no `=' sign in
-        the parameter the value is the empty string.  The value is as
-        described in the get_param() method.
-
-        Optional failobj is the object to return if there is no Content-Type
-        header.  Optional header is the header to search instead of
-        Content-Type.  If unquote is True, the value is unquoted.
-        """
-        missing = object()
-        params = self._get_params_preserve(missing, header)
-        if params is missing:
-            return failobj
-        if unquote:
-            return [(k, _unquotevalue(v)) for k, v in params]
-        else:
-            return params
-
-    def get_param(self, param, failobj=None, header='content-type',
-                  unquote=True):
-        """Return the parameter value if found in the Content-Type header.
-
-        Optional failobj is the object to return if there is no Content-Type
-        header, or the Content-Type header has no such parameter.  Optional
-        header is the header to search instead of Content-Type.
-
-        Parameter keys are always compared case insensitively.  The return
-        value can either be a string, or a 3-tuple if the parameter was RFC
-        2231 encoded.  When it's a 3-tuple, the elements of the value are of
-        the form (CHARSET, LANGUAGE, VALUE).  Note that both CHARSET and
-        LANGUAGE can be None, in which case you should consider VALUE to be
-        encoded in the us-ascii charset.  You can usually ignore LANGUAGE.
-        The parameter value (either the returned string, or the VALUE item in
-        the 3-tuple) is always unquoted, unless unquote is set to False.
-
-        If your application doesn't care whether the parameter was RFC 2231
-        encoded, it can turn the return value into a string as follows:
-
-            param = msg.get_param('foo')
-            param = email.utils.collapse_rfc2231_value(rawparam)
-
-        """
-        if header not in self:
-            return failobj
-        for k, v in self._get_params_preserve(failobj, header):
-            if k.lower() == param.lower():
-                if unquote:
-                    return _unquotevalue(v)
-                else:
-                    return v
-        return failobj
-
-    def set_param(self, param, value, header='Content-Type', requote=True,
-                  charset=None, language=''):
-        """Set a parameter in the Content-Type header.
-
-        If the parameter already exists in the header, its value will be
-        replaced with the new value.
-
-        If header is Content-Type and has not yet been defined for this
-        message, it will be set to "text/plain" and the new parameter and
-        value will be appended as per RFC 2045.
-
-        An alternate header can specified in the header argument, and all
-        parameters will be quoted as necessary unless requote is False.
-
-        If charset is specified, the parameter will be encoded according to RFC
-        2231.  Optional language specifies the RFC 2231 language, defaulting
-        to the empty string.  Both charset and language should be strings.
-        """
-        if not isinstance(value, tuple) and charset:
-            value = (charset, language, value)
-
-        if header not in self and header.lower() == 'content-type':
-            ctype = 'text/plain'
-        else:
-            ctype = self.get(header)
-        if not self.get_param(param, header=header):
-            if not ctype:
-                ctype = _formatparam(param, value, requote)
-            else:
-                ctype = SEMISPACE.join(
-                    [ctype, _formatparam(param, value, requote)])
-        else:
-            ctype = ''
-            for old_param, old_value in self.get_params(header=header,
-                                                        unquote=requote):
-                append_param = ''
-                if old_param.lower() == param.lower():
-                    append_param = _formatparam(param, value, requote)
-                else:
-                    append_param = _formatparam(old_param, old_value, requote)
-                if not ctype:
-                    ctype = append_param
-                else:
-                    ctype = SEMISPACE.join([ctype, append_param])
-        if ctype != self.get(header):
-            del self[header]
-            self[header] = ctype
-
-    def del_param(self, param, header='content-type', requote=True):
-        """Remove the given parameter completely from the Content-Type header.
-
-        The header will be re-written in place without the parameter or its
-        value. All values will be quoted as necessary unless requote is
-        False.  Optional header specifies an alternative to the Content-Type
-        header.
-        """
-        if header not in self:
-            return
-        new_ctype = ''
-        for p, v in self.get_params(header=header, unquote=requote):
-            if p.lower() != param.lower():
-                if not new_ctype:
-                    new_ctype = _formatparam(p, v, requote)
-                else:
-                    new_ctype = SEMISPACE.join([new_ctype,
-                                                _formatparam(p, v, requote)])
-        if new_ctype != self.get(header):
-            del self[header]
-            self[header] = new_ctype
-
-    def set_type(self, type, header='Content-Type', requote=True):
-        """Set the main type and subtype for the Content-Type header.
-
-        type must be a string in the form "maintype/subtype", otherwise a
-        ValueError is raised.
-
-        This method replaces the Content-Type header, keeping all the
-        parameters in place.  If requote is False, this leaves the existing
-        header's quoting as is.  Otherwise, the parameters will be quoted (the
-        default).
-
-        An alternative header can be specified in the header argument.  When
-        the Content-Type header is set, we'll always also add a MIME-Version
-        header.
-        """
-        # BAW: should we be strict?
-        if not type.count('/') == 1:
-            raise ValueError
-        # Set the Content-Type, you get a MIME-Version
-        if header.lower() == 'content-type':
-            del self['mime-version']
-            self['MIME-Version'] = '1.0'
-        if header not in self:
-            self[header] = type
-            return
-        params = self.get_params(header=header, unquote=requote)
-        del self[header]
-        self[header] = type
-        # Skip the first param; it's the old type.
-        for p, v in params[1:]:
-            self.set_param(p, v, header, requote)
-
-    def get_filename(self, failobj=None):
-        """Return the filename associated with the payload if present.
-
-        The filename is extracted from the Content-Disposition header's
-        `filename' parameter, and it is unquoted.  If that header is missing
-        the `filename' parameter, this method falls back to looking for the
-        `name' parameter.
-        """
-        missing = object()
-        filename = self.get_param('filename', missing, 'content-disposition')
-        if filename is missing:
-            filename = self.get_param('name', missing, 'content-type')
-        if filename is missing:
-            return failobj
-        return utils.collapse_rfc2231_value(filename).strip()
-
-    def get_boundary(self, failobj=None):
-        """Return the boundary associated with the payload if present.
-
-        The boundary is extracted from the Content-Type header's `boundary'
-        parameter, and it is unquoted.
-        """
-        missing = object()
-        boundary = self.get_param('boundary', missing)
-        if boundary is missing:
-            return failobj
-        # RFC 2046 says that boundaries may begin but not end in w/s
-        return utils.collapse_rfc2231_value(boundary).rstrip()
-
-    def set_boundary(self, boundary):
-        """Set the boundary parameter in Content-Type to 'boundary'.
-
-        This is subtly different than deleting the Content-Type header and
-        adding a new one with a new boundary parameter via add_header().  The
-        main difference is that using the set_boundary() method preserves the
-        order of the Content-Type header in the original message.
-
-        HeaderParseError is raised if the message has no Content-Type header.
-        """
-        missing = object()
-        params = self._get_params_preserve(missing, 'content-type')
-        if params is missing:
-            # There was no Content-Type header, and we don't know what type
-            # to set it to, so raise an exception.
-            raise errors.HeaderParseError('No Content-Type header found')
-        newparams = list()
-        foundp = False
-        for pk, pv in params:
-            if pk.lower() == 'boundary':
-                newparams.append(('boundary', '"%s"' % boundary))
-                foundp = True
-            else:
-                newparams.append((pk, pv))
-        if not foundp:
-            # The original Content-Type header had no boundary attribute.
-            # Tack one on the end.  BAW: should we raise an exception
-            # instead???
-            newparams.append(('boundary', '"%s"' % boundary))
-        # Replace the existing Content-Type header with the new value
-        newheaders = list()
-        for h, v in self._headers:
-            if h.lower() == 'content-type':
-                parts = list()
-                for k, v in newparams:
-                    if v == '':
-                        parts.append(k)
-                    else:
-                        parts.append('%s=%s' % (k, v))
-                val = SEMISPACE.join(parts)
-                newheaders.append(self.policy.header_store_parse(h, val))
-
-            else:
-                newheaders.append((h, v))
-        self._headers = newheaders
-
-    def get_content_charset(self, failobj=None):
-        """Return the charset parameter of the Content-Type header.
-
-        The returned string is always coerced to lower case.  If there is no
-        Content-Type header, or if that header has no charset parameter,
-        failobj is returned.
-        """
-        missing = object()
-        charset = self.get_param('charset', missing)
-        if charset is missing:
-            return failobj
-        if isinstance(charset, tuple):
-            # RFC 2231 encoded, so decode it, and it better end up as ascii.
-            pcharset = charset[0] or 'us-ascii'
-            try:
-                # LookupError will be raised if the charset isn't known to
-                # Python.  UnicodeError will be raised if the encoded text
-                # contains a character not in the charset.
-                as_bytes = charset[2].encode('raw-unicode-escape')
-                charset = str(as_bytes, pcharset)
-            except (LookupError, UnicodeError):
-                charset = charset[2]
-        # charset characters must be in us-ascii range
-        try:
-            charset.encode('us-ascii')
-        except UnicodeError:
-            return failobj
-        # RFC 2046, $4.1.2 says charsets are not case sensitive
-        return charset.lower()
-
-    def get_charsets(self, failobj=None):
-        """Return a list containing the charset(s) used in this message.
-
-        The returned list of items describes the Content-Type headers'
-        charset parameter for this message and all the subparts in its
-        payload.
-
-        Each item will either be a string (the value of the charset parameter
-        in the Content-Type header of that part) or the value of the
-        'failobj' parameter (defaults to None), if the part does not have a
-        main MIME type of "text", or the charset is not defined.
-
-        The list will contain one string for each part of the message, plus
-        one for the container message (i.e. self), so that a non-multipart
-        message will still return a list of length 1.
-        """
-        return [part.get_content_charset(failobj) for part in self.walk()]
-
-    # I.e. def walk(self): ...
-    from future.backports.email.iterators import walk
diff --git a/lib/future/backports/email/mime/__init__.py b/lib/future/backports/email/mime/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/future/backports/email/mime/application.py b/lib/future/backports/email/mime/application.py
deleted file mode 100644
index 5cbfb174..00000000
--- a/lib/future/backports/email/mime/application.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (C) 2001-2006 Python Software Foundation
-# Author: Keith Dart
-# Contact: email-sig@python.org
-
-"""Class representing application/* type MIME documents."""
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-
-from future.backports.email import encoders
-from future.backports.email.mime.nonmultipart import MIMENonMultipart
-
-__all__ = ["MIMEApplication"]
-
-
-class MIMEApplication(MIMENonMultipart):
-    """Class for generating application/* MIME documents."""
-
-    def __init__(self, _data, _subtype='octet-stream',
-                 _encoder=encoders.encode_base64, **_params):
-        """Create an application/* type MIME document.
-
-        _data is a string containing the raw application data.
-
-        _subtype is the MIME content type subtype, defaulting to
-        'octet-stream'.
-
-        _encoder is a function which will perform the actual encoding for
-        transport of the application data, defaulting to base64 encoding.
-
-        Any additional keyword arguments are passed to the base class
-        constructor, which turns them into parameters on the Content-Type
-        header.
-        """
-        if _subtype is None:
-            raise TypeError('Invalid application MIME subtype')
-        MIMENonMultipart.__init__(self, 'application', _subtype, **_params)
-        self.set_payload(_data)
-        _encoder(self)
diff --git a/lib/future/backports/email/mime/audio.py b/lib/future/backports/email/mime/audio.py
deleted file mode 100644
index 4989c114..00000000
--- a/lib/future/backports/email/mime/audio.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright (C) 2001-2007 Python Software Foundation
-# Author: Anthony Baxter
-# Contact: email-sig@python.org
-
-"""Class representing audio/* type MIME documents."""
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-
-__all__ = ['MIMEAudio']
-
-import sndhdr
-
-from io import BytesIO
-from future.backports.email import encoders
-from future.backports.email.mime.nonmultipart import MIMENonMultipart
-
-
-_sndhdr_MIMEmap = {'au'  : 'basic',
-                   'wav' :'x-wav',
-                   'aiff':'x-aiff',
-                   'aifc':'x-aiff',
-                   }
-
-# There are others in sndhdr that don't have MIME types. :(
-# Additional ones to be added to sndhdr? midi, mp3, realaudio, wma??
-def _whatsnd(data):
-    """Try to identify a sound file type.
-
-    sndhdr.what() has a pretty cruddy interface, unfortunately.  This is why
-    we re-do it here.  It would be easier to reverse engineer the Unix 'file'
-    command and use the standard 'magic' file, as shipped with a modern Unix.
-    """
-    hdr = data[:512]
-    fakefile = BytesIO(hdr)
-    for testfn in sndhdr.tests:
-        res = testfn(hdr, fakefile)
-        if res is not None:
-            return _sndhdr_MIMEmap.get(res[0])
-    return None
-
-
-class MIMEAudio(MIMENonMultipart):
-    """Class for generating audio/* MIME documents."""
-
-    def __init__(self, _audiodata, _subtype=None,
-                 _encoder=encoders.encode_base64, **_params):
-        """Create an audio/* type MIME document.
-
-        _audiodata is a string containing the raw audio data.  If this data
-        can be decoded by the standard Python `sndhdr' module, then the
-        subtype will be automatically included in the Content-Type header.
-        Otherwise, you can specify  the specific audio subtype via the
-        _subtype parameter.  If _subtype is not given, and no subtype can be
-        guessed, a TypeError is raised.
-
-        _encoder is a function which will perform the actual encoding for
-        transport of the image data.  It takes one argument, which is this
-        Image instance.  It should use get_payload() and set_payload() to
-        change the payload to the encoded form.  It should also add any
-        Content-Transfer-Encoding or other headers to the message as
-        necessary.  The default encoding is Base64.
-
-        Any additional keyword arguments are passed to the base class
-        constructor, which turns them into parameters on the Content-Type
-        header.
-        """
-        if _subtype is None:
-            _subtype = _whatsnd(_audiodata)
-        if _subtype is None:
-            raise TypeError('Could not find audio MIME subtype')
-        MIMENonMultipart.__init__(self, 'audio', _subtype, **_params)
-        self.set_payload(_audiodata)
-        _encoder(self)
diff --git a/lib/future/backports/email/mime/base.py b/lib/future/backports/email/mime/base.py
deleted file mode 100644
index e77f3ca4..00000000
--- a/lib/future/backports/email/mime/base.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (C) 2001-2006 Python Software Foundation
-# Author: Barry Warsaw
-# Contact: email-sig@python.org
-
-"""Base class for MIME specializations."""
-from __future__ import absolute_import, division, unicode_literals
-from future.backports.email import message
-
-__all__ = ['MIMEBase']
-
-
-class MIMEBase(message.Message):
-    """Base class for MIME specializations."""
-
-    def __init__(self, _maintype, _subtype, **_params):
-        """This constructor adds a Content-Type: and a MIME-Version: header.
-
-        The Content-Type: header is taken from the _maintype and _subtype
-        arguments.  Additional parameters for this header are taken from the
-        keyword arguments.
-        """
-        message.Message.__init__(self)
-        ctype = '%s/%s' % (_maintype, _subtype)
-        self.add_header('Content-Type', ctype, **_params)
-        self['MIME-Version'] = '1.0'
diff --git a/lib/future/backports/email/mime/image.py b/lib/future/backports/email/mime/image.py
deleted file mode 100644
index a0360246..00000000
--- a/lib/future/backports/email/mime/image.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (C) 2001-2006 Python Software Foundation
-# Author: Barry Warsaw
-# Contact: email-sig@python.org
-
-"""Class representing image/* type MIME documents."""
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-
-__all__ = ['MIMEImage']
-
-import imghdr
-
-from future.backports.email import encoders
-from future.backports.email.mime.nonmultipart import MIMENonMultipart
-
-
-class MIMEImage(MIMENonMultipart):
-    """Class for generating image/* type MIME documents."""
-
-    def __init__(self, _imagedata, _subtype=None,
-                 _encoder=encoders.encode_base64, **_params):
-        """Create an image/* type MIME document.
-
-        _imagedata is a string containing the raw image data.  If this data
-        can be decoded by the standard Python `imghdr' module, then the
-        subtype will be automatically included in the Content-Type header.
-        Otherwise, you can specify the specific image subtype via the _subtype
-        parameter.
-
-        _encoder is a function which will perform the actual encoding for
-        transport of the image data.  It takes one argument, which is this
-        Image instance.  It should use get_payload() and set_payload() to
-        change the payload to the encoded form.  It should also add any
-        Content-Transfer-Encoding or other headers to the message as
-        necessary.  The default encoding is Base64.
-
-        Any additional keyword arguments are passed to the base class
-        constructor, which turns them into parameters on the Content-Type
-        header.
-        """
-        if _subtype is None:
-            _subtype = imghdr.what(None, _imagedata)
-        if _subtype is None:
-            raise TypeError('Could not guess image MIME subtype')
-        MIMENonMultipart.__init__(self, 'image', _subtype, **_params)
-        self.set_payload(_imagedata)
-        _encoder(self)
diff --git a/lib/future/backports/email/mime/message.py b/lib/future/backports/email/mime/message.py
deleted file mode 100644
index 7f920751..00000000
--- a/lib/future/backports/email/mime/message.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (C) 2001-2006 Python Software Foundation
-# Author: Barry Warsaw
-# Contact: email-sig@python.org
-
-"""Class representing message/* MIME documents."""
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-
-__all__ = ['MIMEMessage']
-
-from future.backports.email import message
-from future.backports.email.mime.nonmultipart import MIMENonMultipart
-
-
-class MIMEMessage(MIMENonMultipart):
-    """Class representing message/* MIME documents."""
-
-    def __init__(self, _msg, _subtype='rfc822'):
-        """Create a message/* type MIME document.
-
-        _msg is a message object and must be an instance of Message, or a
-        derived class of Message, otherwise a TypeError is raised.
-
-        Optional _subtype defines the subtype of the contained message.  The
-        default is "rfc822" (this is defined by the MIME standard, even though
-        the term "rfc822" is technically outdated by RFC 2822).
-        """
-        MIMENonMultipart.__init__(self, 'message', _subtype)
-        if not isinstance(_msg, message.Message):
-            raise TypeError('Argument is not an instance of Message')
-        # It's convenient to use this base class method.  We need to do it
-        # this way or we'll get an exception
-        message.Message.attach(self, _msg)
-        # And be sure our default type is set correctly
-        self.set_default_type('message/rfc822')
diff --git a/lib/future/backports/email/mime/multipart.py b/lib/future/backports/email/mime/multipart.py
deleted file mode 100644
index 6d7ed3dc..00000000
--- a/lib/future/backports/email/mime/multipart.py
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright (C) 2002-2006 Python Software Foundation
-# Author: Barry Warsaw
-# Contact: email-sig@python.org
-
-"""Base class for MIME multipart/* type messages."""
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-
-__all__ = ['MIMEMultipart']
-
-from future.backports.email.mime.base import MIMEBase
-
-
-class MIMEMultipart(MIMEBase):
-    """Base class for MIME multipart/* type messages."""
-
-    def __init__(self, _subtype='mixed', boundary=None, _subparts=None,
-                 **_params):
-        """Creates a multipart/* type message.
-
-        By default, creates a multipart/mixed message, with proper
-        Content-Type and MIME-Version headers.
-
-        _subtype is the subtype of the multipart content type, defaulting to
-        `mixed'.
-
-        boundary is the multipart boundary string.  By default it is
-        calculated as needed.
-
-        _subparts is a sequence of initial subparts for the payload.  It
-        must be an iterable object, such as a list.  You can always
-        attach new subparts to the message by using the attach() method.
-
-        Additional parameters for the Content-Type header are taken from the
-        keyword arguments (or passed into the _params argument).
-        """
-        MIMEBase.__init__(self, 'multipart', _subtype, **_params)
-
-        # Initialise _payload to an empty list as the Message superclass's
-        # implementation of is_multipart assumes that _payload is a list for
-        # multipart messages.
-        self._payload = []
-
-        if _subparts:
-            for p in _subparts:
-                self.attach(p)
-        if boundary:
-            self.set_boundary(boundary)
diff --git a/lib/future/backports/email/mime/nonmultipart.py b/lib/future/backports/email/mime/nonmultipart.py
deleted file mode 100644
index 08c37c36..00000000
--- a/lib/future/backports/email/mime/nonmultipart.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2002-2006 Python Software Foundation
-# Author: Barry Warsaw
-# Contact: email-sig@python.org
-
-"""Base class for MIME type messages that are not multipart."""
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-
-__all__ = ['MIMENonMultipart']
-
-from future.backports.email import errors
-from future.backports.email.mime.base import MIMEBase
-
-
-class MIMENonMultipart(MIMEBase):
-    """Base class for MIME multipart/* type messages."""
-
-    def attach(self, payload):
-        # The public API prohibits attaching multiple subparts to MIMEBase
-        # derived subtypes since none of them are, by definition, of content
-        # type multipart/*
-        raise errors.MultipartConversionError(
-            'Cannot attach additional subparts to non-multipart/*')
diff --git a/lib/future/backports/email/mime/text.py b/lib/future/backports/email/mime/text.py
deleted file mode 100644
index 6269f4a6..00000000
--- a/lib/future/backports/email/mime/text.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (C) 2001-2006 Python Software Foundation
-# Author: Barry Warsaw
-# Contact: email-sig@python.org
-
-"""Class representing text/* type MIME documents."""
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-
-__all__ = ['MIMEText']
-
-from future.backports.email.encoders import encode_7or8bit
-from future.backports.email.mime.nonmultipart import MIMENonMultipart
-
-
-class MIMEText(MIMENonMultipart):
-    """Class for generating text/* type MIME documents."""
-
-    def __init__(self, _text, _subtype='plain', _charset=None):
-        """Create a text/* type MIME document.
-
-        _text is the string for this message object.
-
-        _subtype is the MIME sub content type, defaulting to "plain".
-
-        _charset is the character set parameter added to the Content-Type
-        header.  This defaults to "us-ascii".  Note that as a side-effect, the
-        Content-Transfer-Encoding header will also be set.
-        """
-
-        # If no _charset was specified, check to see if there are non-ascii
-        # characters present. If not, use 'us-ascii', otherwise use utf-8.
-        # XXX: This can be removed once #7304 is fixed.
-        if _charset is None:
-            try:
-                _text.encode('us-ascii')
-                _charset = 'us-ascii'
-            except UnicodeEncodeError:
-                _charset = 'utf-8'
-
-        MIMENonMultipart.__init__(self, 'text', _subtype,
-                                  **{'charset': _charset})
-
-        self.set_payload(_text, _charset)
diff --git a/lib/future/backports/email/parser.py b/lib/future/backports/email/parser.py
deleted file mode 100644
index 79f0e5a3..00000000
--- a/lib/future/backports/email/parser.py
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright (C) 2001-2007 Python Software Foundation
-# Author: Barry Warsaw, Thomas Wouters, Anthony Baxter
-# Contact: email-sig@python.org
-
-"""A parser of RFC 2822 and MIME email messages."""
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-
-__all__ = ['Parser', 'HeaderParser', 'BytesParser', 'BytesHeaderParser']
-
-import warnings
-from io import StringIO, TextIOWrapper
-
-from future.backports.email.feedparser import FeedParser, BytesFeedParser
-from future.backports.email.message import Message
-from future.backports.email._policybase import compat32
-
-
-class Parser(object):
-    def __init__(self, _class=Message, **_3to2kwargs):
-        """Parser of RFC 2822 and MIME email messages.
-
-        Creates an in-memory object tree representing the email message, which
-        can then be manipulated and turned over to a Generator to return the
-        textual representation of the message.
-
-        The string must be formatted as a block of RFC 2822 headers and header
-        continuation lines, optionally preceded by a `Unix-from' header.  The
-        header block is terminated either by the end of the string or by a
-        blank line.
-
-        _class is the class to instantiate for new message objects when they
-        must be created.  This class must have a constructor that can take
-        zero arguments.  Default is Message.Message.
-
-        The policy keyword specifies a policy object that controls a number of
-        aspects of the parser's operation.  The default policy maintains
-        backward compatibility.
-
-        """
-        if 'policy' in _3to2kwargs: policy = _3to2kwargs['policy']; del _3to2kwargs['policy']
-        else: policy = compat32
-        self._class = _class
-        self.policy = policy
-
-    def parse(self, fp, headersonly=False):
-        """Create a message structure from the data in a file.
-
-        Reads all the data from the file and returns the root of the message
-        structure.  Optional headersonly is a flag specifying whether to stop
-        parsing after reading the headers or not.  The default is False,
-        meaning it parses the entire contents of the file.
-        """
-        feedparser = FeedParser(self._class, policy=self.policy)
-        if headersonly:
-            feedparser._set_headersonly()
-        while True:
-            data = fp.read(8192)
-            if not data:
-                break
-            feedparser.feed(data)
-        return feedparser.close()
-
-    def parsestr(self, text, headersonly=False):
-        """Create a message structure from a string.
-
-        Returns the root of the message structure.  Optional headersonly is a
-        flag specifying whether to stop parsing after reading the headers or
-        not.  The default is False, meaning it parses the entire contents of
-        the file.
-        """
-        return self.parse(StringIO(text), headersonly=headersonly)
-
-
-
-class HeaderParser(Parser):
-    def parse(self, fp, headersonly=True):
-        return Parser.parse(self, fp, True)
-
-    def parsestr(self, text, headersonly=True):
-        return Parser.parsestr(self, text, True)
-
-
-class BytesParser(object):
-
-    def __init__(self, *args, **kw):
-        """Parser of binary RFC 2822 and MIME email messages.
-
-        Creates an in-memory object tree representing the email message, which
-        can then be manipulated and turned over to a Generator to return the
-        textual representation of the message.
-
-        The input must be formatted as a block of RFC 2822 headers and header
-        continuation lines, optionally preceded by a `Unix-from' header.  The
-        header block is terminated either by the end of the input or by a
-        blank line.
-
-        _class is the class to instantiate for new message objects when they
-        must be created.  This class must have a constructor that can take
-        zero arguments.  Default is Message.Message.
-        """
-        self.parser = Parser(*args, **kw)
-
-    def parse(self, fp, headersonly=False):
-        """Create a message structure from the data in a binary file.
-
-        Reads all the data from the file and returns the root of the message
-        structure.  Optional headersonly is a flag specifying whether to stop
-        parsing after reading the headers or not.  The default is False,
-        meaning it parses the entire contents of the file.
-        """
-        fp = TextIOWrapper(fp, encoding='ascii', errors='surrogateescape')
-        with fp:
-            return self.parser.parse(fp, headersonly)
-
-
-    def parsebytes(self, text, headersonly=False):
-        """Create a message structure from a byte string.
-
-        Returns the root of the message structure.  Optional headersonly is a
-        flag specifying whether to stop parsing after reading the headers or
-        not.  The default is False, meaning it parses the entire contents of
-        the file.
-        """
-        text = text.decode('ASCII', errors='surrogateescape')
-        return self.parser.parsestr(text, headersonly)
-
-
-class BytesHeaderParser(BytesParser):
-    def parse(self, fp, headersonly=True):
-        return BytesParser.parse(self, fp, headersonly=True)
-
-    def parsebytes(self, text, headersonly=True):
-        return BytesParser.parsebytes(self, text, headersonly=True)
diff --git a/lib/future/backports/email/policy.py b/lib/future/backports/email/policy.py
deleted file mode 100644
index 2f609a23..00000000
--- a/lib/future/backports/email/policy.py
+++ /dev/null
@@ -1,193 +0,0 @@
-"""This will be the home for the policy that hooks in the new
-code that adds all the email6 features.
-"""
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from future.builtins import super
-
-from future.standard_library.email._policybase import (Policy, Compat32,
-                                                  compat32, _extend_docstrings)
-from future.standard_library.email.utils import _has_surrogates
-from future.standard_library.email.headerregistry import HeaderRegistry as HeaderRegistry
-
-__all__ = [
-    'Compat32',
-    'compat32',
-    'Policy',
-    'EmailPolicy',
-    'default',
-    'strict',
-    'SMTP',
-    'HTTP',
-    ]
-
-@_extend_docstrings
-class EmailPolicy(Policy):
-
-    """+
-    PROVISIONAL
-
-    The API extensions enabled by this policy are currently provisional.
-    Refer to the documentation for details.
-
-    This policy adds new header parsing and folding algorithms.  Instead of
-    simple strings, headers are custom objects with custom attributes
-    depending on the type of the field.  The folding algorithm fully
-    implements RFCs 2047 and 5322.
-
-    In addition to the settable attributes listed above that apply to
-    all Policies, this policy adds the following additional attributes:
-
-    refold_source       -- if the value for a header in the Message object
-                           came from the parsing of some source, this attribute
-                           indicates whether or not a generator should refold
-                           that value when transforming the message back into
-                           stream form.  The possible values are:
-
-                           none  -- all source values use original folding
-                           long  -- source values that have any line that is
-                                    longer than max_line_length will be
-                                    refolded
-                           all  -- all values are refolded.
-
-                           The default is 'long'.
-
-    header_factory      -- a callable that takes two arguments, 'name' and
-                           'value', where 'name' is a header field name and
-                           'value' is an unfolded header field value, and
-                           returns a string-like object that represents that
-                           header.  A default header_factory is provided that
-                           understands some of the RFC5322 header field types.
-                           (Currently address fields and date fields have
-                           special treatment, while all other fields are
-                           treated as unstructured.  This list will be
-                           completed before the extension is marked stable.)
-    """
-
-    refold_source = 'long'
-    header_factory = HeaderRegistry()
-
-    def __init__(self, **kw):
-        # Ensure that each new instance gets a unique header factory
-        # (as opposed to clones, which share the factory).
-        if 'header_factory' not in kw:
-            object.__setattr__(self, 'header_factory', HeaderRegistry())
-        super().__init__(**kw)
-
-    def header_max_count(self, name):
-        """+
-        The implementation for this class returns the max_count attribute from
-        the specialized header class that would be used to construct a header
-        of type 'name'.
-        """
-        return self.header_factory[name].max_count
-
-    # The logic of the next three methods is chosen such that it is possible to
-    # switch a Message object between a Compat32 policy and a policy derived
-    # from this class and have the results stay consistent.  This allows a
-    # Message object constructed with this policy to be passed to a library
-    # that only handles Compat32 objects, or to receive such an object and
-    # convert it to use the newer style by just changing its policy.  It is
-    # also chosen because it postpones the relatively expensive full rfc5322
-    # parse until as late as possible when parsing from source, since in many
-    # applications only a few headers will actually be inspected.
-
-    def header_source_parse(self, sourcelines):
-        """+
-        The name is parsed as everything up to the ':' and returned unmodified.
-        The value is determined by stripping leading whitespace off the
-        remainder of the first line, joining all subsequent lines together, and
-        stripping any trailing carriage return or linefeed characters.  (This
-        is the same as Compat32).
-
-        """
-        name, value = sourcelines[0].split(':', 1)
-        value = value.lstrip(' \t') + ''.join(sourcelines[1:])
-        return (name, value.rstrip('\r\n'))
-
-    def header_store_parse(self, name, value):
-        """+
-        The name is returned unchanged.  If the input value has a 'name'
-        attribute and it matches the name ignoring case, the value is returned
-        unchanged.  Otherwise the name and value are passed to header_factory
-        method, and the resulting custom header object is returned as the
-        value.  In this case a ValueError is raised if the input value contains
-        CR or LF characters.
-
-        """
-        if hasattr(value, 'name') and value.name.lower() == name.lower():
-            return (name, value)
-        if isinstance(value, str) and len(value.splitlines())>1:
-            raise ValueError("Header values may not contain linefeed "
-                             "or carriage return characters")
-        return (name, self.header_factory(name, value))
-
-    def header_fetch_parse(self, name, value):
-        """+
-        If the value has a 'name' attribute, it is returned to unmodified.
-        Otherwise the name and the value with any linesep characters removed
-        are passed to the header_factory method, and the resulting custom
-        header object is returned.  Any surrogateescaped bytes get turned
-        into the unicode unknown-character glyph.
-
-        """
-        if hasattr(value, 'name'):
-            return value
-        return self.header_factory(name, ''.join(value.splitlines()))
-
-    def fold(self, name, value):
-        """+
-        Header folding is controlled by the refold_source policy setting.  A
-        value is considered to be a 'source value' if and only if it does not
-        have a 'name' attribute (having a 'name' attribute means it is a header
-        object of some sort).  If a source value needs to be refolded according
-        to the policy, it is converted into a custom header object by passing
-        the name and the value with any linesep characters removed to the
-        header_factory method.  Folding of a custom header object is done by
-        calling its fold method with the current policy.
-
-        Source values are split into lines using splitlines.  If the value is
-        not to be refolded, the lines are rejoined using the linesep from the
-        policy and returned.  The exception is lines containing non-ascii
-        binary data.  In that case the value is refolded regardless of the
-        refold_source setting, which causes the binary data to be CTE encoded
-        using the unknown-8bit charset.
-
-        """
-        return self._fold(name, value, refold_binary=True)
-
-    def fold_binary(self, name, value):
-        """+
-        The same as fold if cte_type is 7bit, except that the returned value is
-        bytes.
-
-        If cte_type is 8bit, non-ASCII binary data is converted back into
-        bytes.  Headers with binary data are not refolded, regardless of the
-        refold_header setting, since there is no way to know whether the binary
-        data consists of single byte characters or multibyte characters.
-
-        """
-        folded = self._fold(name, value, refold_binary=self.cte_type=='7bit')
-        return folded.encode('ascii', 'surrogateescape')
-
-    def _fold(self, name, value, refold_binary=False):
-        if hasattr(value, 'name'):
-            return value.fold(policy=self)
-        maxlen = self.max_line_length if self.max_line_length else float('inf')
-        lines = value.splitlines()
-        refold = (self.refold_source == 'all' or
-                  self.refold_source == 'long' and
-                    (lines and len(lines[0])+len(name)+2 > maxlen or
-                     any(len(x) > maxlen for x in lines[1:])))
-        if refold or refold_binary and _has_surrogates(value):
-            return self.header_factory(name, ''.join(lines)).fold(policy=self)
-        return name + ': ' + self.linesep.join(lines) + self.linesep
-
-
-default = EmailPolicy()
-# Make the default policy use the class default header_factory
-del default.header_factory
-strict = default.clone(raise_on_defect=True)
-SMTP = default.clone(linesep='\r\n')
-HTTP = default.clone(linesep='\r\n', max_line_length=None)
diff --git a/lib/future/backports/email/quoprimime.py b/lib/future/backports/email/quoprimime.py
deleted file mode 100644
index b69d158b..00000000
--- a/lib/future/backports/email/quoprimime.py
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright (C) 2001-2006 Python Software Foundation
-# Author: Ben Gertzfield
-# Contact: email-sig@python.org
-
-"""Quoted-printable content transfer encoding per RFCs 2045-2047.
-
-This module handles the content transfer encoding method defined in RFC 2045
-to encode US ASCII-like 8-bit data called `quoted-printable'.  It is used to
-safely encode text that is in a character set similar to the 7-bit US ASCII
-character set, but that includes some 8-bit characters that are normally not
-allowed in email bodies or headers.
-
-Quoted-printable is very space-inefficient for encoding binary files; use the
-email.base64mime module for that instead.
-
-This module provides an interface to encode and decode both headers and bodies
-with quoted-printable encoding.
-
-RFC 2045 defines a method for including character set information in an
-`encoded-word' in a header.  This method is commonly used for 8-bit real names
-in To:/From:/Cc: etc. fields, as well as Subject: lines.
-
-This module does not do the line wrapping or end-of-line character
-conversion necessary for proper internationalized headers; it only
-does dumb encoding and decoding.  To deal with the various line
-wrapping issues, use the email.header module.
-"""
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from future.builtins import bytes, chr, dict, int, range, super
-
-__all__ = [
-    'body_decode',
-    'body_encode',
-    'body_length',
-    'decode',
-    'decodestring',
-    'header_decode',
-    'header_encode',
-    'header_length',
-    'quote',
-    'unquote',
-    ]
-
-import re
-import io
-
-from string import ascii_letters, digits, hexdigits
-
-CRLF = '\r\n'
-NL = '\n'
-EMPTYSTRING = ''
-
-# Build a mapping of octets to the expansion of that octet.  Since we're only
-# going to have 256 of these things, this isn't terribly inefficient
-# space-wise.  Remember that headers and bodies have different sets of safe
-# characters.  Initialize both maps with the full expansion, and then override
-# the safe bytes with the more compact form.
-_QUOPRI_HEADER_MAP = dict((c, '=%02X' % c) for c in range(256))
-_QUOPRI_BODY_MAP = _QUOPRI_HEADER_MAP.copy()
-
-# Safe header bytes which need no encoding.
-for c in bytes(b'-!*+/' + ascii_letters.encode('ascii') + digits.encode('ascii')):
-    _QUOPRI_HEADER_MAP[c] = chr(c)
-# Headers have one other special encoding; spaces become underscores.
-_QUOPRI_HEADER_MAP[ord(' ')] = '_'
-
-# Safe body bytes which need no encoding.
-for c in bytes(b' !"#$%&\'()*+,-./0123456789:;<>'
-               b'?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`'
-               b'abcdefghijklmnopqrstuvwxyz{|}~\t'):
-    _QUOPRI_BODY_MAP[c] = chr(c)
-
-
-
-# Helpers
-def header_check(octet):
-    """Return True if the octet should be escaped with header quopri."""
-    return chr(octet) != _QUOPRI_HEADER_MAP[octet]
-
-
-def body_check(octet):
-    """Return True if the octet should be escaped with body quopri."""
-    return chr(octet) != _QUOPRI_BODY_MAP[octet]
-
-
-def header_length(bytearray):
-    """Return a header quoted-printable encoding length.
-
-    Note that this does not include any RFC 2047 chrome added by
-    `header_encode()`.
-
-    :param bytearray: An array of bytes (a.k.a. octets).
-    :return: The length in bytes of the byte array when it is encoded with
-        quoted-printable for headers.
-    """
-    return sum(len(_QUOPRI_HEADER_MAP[octet]) for octet in bytearray)
-
-
-def body_length(bytearray):
-    """Return a body quoted-printable encoding length.
-
-    :param bytearray: An array of bytes (a.k.a. octets).
-    :return: The length in bytes of the byte array when it is encoded with
-        quoted-printable for bodies.
-    """
-    return sum(len(_QUOPRI_BODY_MAP[octet]) for octet in bytearray)
-
-
-def _max_append(L, s, maxlen, extra=''):
-    if not isinstance(s, str):
-        s = chr(s)
-    if not L:
-        L.append(s.lstrip())
-    elif len(L[-1]) + len(s) <= maxlen:
-        L[-1] += extra + s
-    else:
-        L.append(s.lstrip())
-
-
-def unquote(s):
-    """Turn a string in the form =AB to the ASCII character with value 0xab"""
-    return chr(int(s[1:3], 16))
-
-
-def quote(c):
-    return '=%02X' % ord(c)
-
-
-
-def header_encode(header_bytes, charset='iso-8859-1'):
-    """Encode a single header line with quoted-printable (like) encoding.
-
-    Defined in RFC 2045, this `Q' encoding is similar to quoted-printable, but
-    used specifically for email header fields to allow charsets with mostly 7
-    bit characters (and some 8 bit) to remain more or less readable in non-RFC
-    2045 aware mail clients.
-
-    charset names the character set to use in the RFC 2046 header.  It
-    defaults to iso-8859-1.
-    """
-    # Return empty headers as an empty string.
-    if not header_bytes:
-        return ''
-    # Iterate over every byte, encoding if necessary.
-    encoded = []
-    for octet in header_bytes:
-        encoded.append(_QUOPRI_HEADER_MAP[octet])
-    # Now add the RFC chrome to each encoded chunk and glue the chunks
-    # together.
-    return '=?%s?q?%s?=' % (charset, EMPTYSTRING.join(encoded))
-
-
-class _body_accumulator(io.StringIO):
-
-    def __init__(self, maxlinelen, eol, *args, **kw):
-        super().__init__(*args, **kw)
-        self.eol = eol
-        self.maxlinelen = self.room = maxlinelen
-
-    def write_str(self, s):
-        """Add string s to the accumulated body."""
-        self.write(s)
-        self.room -= len(s)
-
-    def newline(self):
-        """Write eol, then start new line."""
-        self.write_str(self.eol)
-        self.room = self.maxlinelen
-
-    def write_soft_break(self):
-        """Write a soft break, then start a new line."""
-        self.write_str('=')
-        self.newline()
-
-    def write_wrapped(self, s, extra_room=0):
-        """Add a soft line break if needed, then write s."""
-        if self.room < len(s) + extra_room:
-            self.write_soft_break()
-        self.write_str(s)
-
-    def write_char(self, c, is_last_char):
-        if not is_last_char:
-            # Another character follows on this line, so we must leave
-            # extra room, either for it or a soft break, and whitespace
-            # need not be quoted.
-            self.write_wrapped(c, extra_room=1)
-        elif c not in ' \t':
-            # For this and remaining cases, no more characters follow,
-            # so there is no need to reserve extra room (since a hard
-            # break will immediately follow).
-            self.write_wrapped(c)
-        elif self.room >= 3:
-            # It's a whitespace character at end-of-line, and we have room
-            # for the three-character quoted encoding.
-            self.write(quote(c))
-        elif self.room == 2:
-            # There's room for the whitespace character and a soft break.
-            self.write(c)
-            self.write_soft_break()
-        else:
-            # There's room only for a soft break.  The quoted whitespace
-            # will be the only content on the subsequent line.
-            self.write_soft_break()
-            self.write(quote(c))
-
-
-def body_encode(body, maxlinelen=76, eol=NL):
-    """Encode with quoted-printable, wrapping at maxlinelen characters.
-
-    Each line of encoded text will end with eol, which defaults to "\\n".  Set
-    this to "\\r\\n" if you will be using the result of this function directly
-    in an email.
-
-    Each line will be wrapped at, at most, maxlinelen characters before the
-    eol string (maxlinelen defaults to 76 characters, the maximum value
-    permitted by RFC 2045).  Long lines will have the 'soft line break'
-    quoted-printable character "=" appended to them, so the decoded text will
-    be identical to the original text.
-
-    The minimum maxlinelen is 4 to have room for a quoted character ("=XX")
-    followed by a soft line break.  Smaller values will generate a
-    ValueError.
-
-    """
-
-    if maxlinelen < 4:
-        raise ValueError("maxlinelen must be at least 4")
-    if not body:
-        return body
-
-    # The last line may or may not end in eol, but all other lines do.
-    last_has_eol = (body[-1] in '\r\n')
-
-    # This accumulator will make it easier to build the encoded body.
-    encoded_body = _body_accumulator(maxlinelen, eol)
-
-    lines = body.splitlines()
-    last_line_no = len(lines) - 1
-    for line_no, line in enumerate(lines):
-        last_char_index = len(line) - 1
-        for i, c in enumerate(line):
-            if body_check(ord(c)):
-                c = quote(c)
-            encoded_body.write_char(c, i==last_char_index)
-        # Add an eol if input line had eol.  All input lines have eol except
-        # possibly the last one.
-        if line_no < last_line_no or last_has_eol:
-            encoded_body.newline()
-
-    return encoded_body.getvalue()
-
-
-
-# BAW: I'm not sure if the intent was for the signature of this function to be
-# the same as base64MIME.decode() or not...
-def decode(encoded, eol=NL):
-    """Decode a quoted-printable string.
-
-    Lines are separated with eol, which defaults to \\n.
-    """
-    if not encoded:
-        return encoded
-    # BAW: see comment in encode() above.  Again, we're building up the
-    # decoded string with string concatenation, which could be done much more
-    # efficiently.
-    decoded = ''
-
-    for line in encoded.splitlines():
-        line = line.rstrip()
-        if not line:
-            decoded += eol
-            continue
-
-        i = 0
-        n = len(line)
-        while i < n:
-            c = line[i]
-            if c != '=':
-                decoded += c
-                i += 1
-            # Otherwise, c == "=".  Are we at the end of the line?  If so, add
-            # a soft line break.
-            elif i+1 == n:
-                i += 1
-                continue
-            # Decode if in form =AB
-            elif i+2 < n and line[i+1] in hexdigits and line[i+2] in hexdigits:
-                decoded += unquote(line[i:i+3])
-                i += 3
-            # Otherwise, not in form =AB, pass literally
-            else:
-                decoded += c
-                i += 1
-
-            if i == n:
-                decoded += eol
-    # Special case if original string did not end with eol
-    if encoded[-1] not in '\r\n' and decoded.endswith(eol):
-        decoded = decoded[:-1]
-    return decoded
-
-
-# For convenience and backwards compatibility w/ standard base64 module
-body_decode = decode
-decodestring = decode
-
-
-
-def _unquote_match(match):
-    """Turn a match in the form =AB to the ASCII character with value 0xab"""
-    s = match.group(0)
-    return unquote(s)
-
-
-# Header decoding is done a bit differently
-def header_decode(s):
-    """Decode a string encoded with RFC 2045 MIME header `Q' encoding.
-
-    This function does not parse a full MIME header value encoded with
-    quoted-printable (like =?iso-8895-1?q?Hello_World?=) -- please use
-    the high level email.header class for that functionality.
-    """
-    s = s.replace('_', ' ')
-    return re.sub(r'=[a-fA-F0-9]{2}', _unquote_match, s, re.ASCII)
diff --git a/lib/future/backports/email/utils.py b/lib/future/backports/email/utils.py
deleted file mode 100644
index 4abebf7c..00000000
--- a/lib/future/backports/email/utils.py
+++ /dev/null
@@ -1,400 +0,0 @@
-# Copyright (C) 2001-2010 Python Software Foundation
-# Author: Barry Warsaw
-# Contact: email-sig@python.org
-
-"""Miscellaneous utilities."""
-
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-from future import utils
-from future.builtins import bytes, int, str
-
-__all__ = [
-    'collapse_rfc2231_value',
-    'decode_params',
-    'decode_rfc2231',
-    'encode_rfc2231',
-    'formataddr',
-    'formatdate',
-    'format_datetime',
-    'getaddresses',
-    'make_msgid',
-    'mktime_tz',
-    'parseaddr',
-    'parsedate',
-    'parsedate_tz',
-    'parsedate_to_datetime',
-    'unquote',
-    ]
-
-import os
-import re
-if utils.PY2:
-    re.ASCII = 0
-import time
-import base64
-import random
-import socket
-from future.backports import datetime
-from future.backports.urllib.parse import quote as url_quote, unquote as url_unquote
-import warnings
-from io import StringIO
-
-from future.backports.email._parseaddr import quote
-from future.backports.email._parseaddr import AddressList as _AddressList
-from future.backports.email._parseaddr import mktime_tz
-
-from future.backports.email._parseaddr import parsedate, parsedate_tz, _parsedate_tz
-
-from quopri import decodestring as _qdecode
-
-# Intrapackage imports
-from future.backports.email.encoders import _bencode, _qencode
-from future.backports.email.charset import Charset
-
-COMMASPACE = ', '
-EMPTYSTRING = ''
-UEMPTYSTRING = ''
-CRLF = '\r\n'
-TICK = "'"
-
-specialsre = re.compile(r'[][\\()<>@,:;".]')
-escapesre = re.compile(r'[\\"]')
-
-# How to figure out if we are processing strings that come from a byte
-# source with undecodable characters.
-_has_surrogates = re.compile(
-    '([^\ud800-\udbff]|\A)[\udc00-\udfff]([^\udc00-\udfff]|\Z)').search
-
-# How to deal with a string containing bytes before handing it to the
-# application through the 'normal' interface.
-def _sanitize(string):
-    # Turn any escaped bytes into unicode 'unknown' char.
-    original_bytes = string.encode('ascii', 'surrogateescape')
-    return original_bytes.decode('ascii', 'replace')
-
-
-# Helpers
-
-def formataddr(pair, charset='utf-8'):
-    """The inverse of parseaddr(), this takes a 2-tuple of the form
-    (realname, email_address) and returns the string value suitable
-    for an RFC 2822 From, To or Cc header.
-
-    If the first element of pair is false, then the second element is
-    returned unmodified.
-
-    Optional charset if given is the character set that is used to encode
-    realname in case realname is not ASCII safe.  Can be an instance of str or
-    a Charset-like object which has a header_encode method.  Default is
-    'utf-8'.
-    """
-    name, address = pair
-    # The address MUST (per RFC) be ascii, so raise an UnicodeError if it isn't.
-    address.encode('ascii')
-    if name:
-        try:
-            name.encode('ascii')
-        except UnicodeEncodeError:
-            if isinstance(charset, str):
-                charset = Charset(charset)
-            encoded_name = charset.header_encode(name)
-            return "%s <%s>" % (encoded_name, address)
-        else:
-            quotes = ''
-            if specialsre.search(name):
-                quotes = '"'
-            name = escapesre.sub(r'\\\g<0>', name)
-            return '%s%s%s <%s>' % (quotes, name, quotes, address)
-    return address
-
-
-
-def getaddresses(fieldvalues):
-    """Return a list of (REALNAME, EMAIL) for each fieldvalue."""
-    all = COMMASPACE.join(fieldvalues)
-    a = _AddressList(all)
-    return a.addresslist
-
-
-
-ecre = re.compile(r'''
-  =\?                   # literal =?
-  (?P<charset>[^?]*?)   # non-greedy up to the next ? is the charset
-  \?                    # literal ?
-  (?P<encoding>[qb])    # either a "q" or a "b", case insensitive
-  \?                    # literal ?
-  (?P<atom>.*?)         # non-greedy up to the next ?= is the atom
-  \?=                   # literal ?=
-  ''', re.VERBOSE | re.IGNORECASE)
-
-
-def _format_timetuple_and_zone(timetuple, zone):
-    return '%s, %02d %s %04d %02d:%02d:%02d %s' % (
-        ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'][timetuple[6]],
-        timetuple[2],
-        ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-         'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'][timetuple[1] - 1],
-        timetuple[0], timetuple[3], timetuple[4], timetuple[5],
-        zone)
-
-def formatdate(timeval=None, localtime=False, usegmt=False):
-    """Returns a date string as specified by RFC 2822, e.g.:
-
-    Fri, 09 Nov 2001 01:08:47 -0000
-
-    Optional timeval if given is a floating point time value as accepted by
-    gmtime() and localtime(), otherwise the current time is used.
-
-    Optional localtime is a flag that when True, interprets timeval, and
-    returns a date relative to the local timezone instead of UTC, properly
-    taking daylight savings time into account.
-
-    Optional argument usegmt means that the timezone is written out as
-    an ascii string, not numeric one (so "GMT" instead of "+0000"). This
-    is needed for HTTP, and is only used when localtime==False.
-    """
-    # Note: we cannot use strftime() because that honors the locale and RFC
-    # 2822 requires that day and month names be the English abbreviations.
-    if timeval is None:
-        timeval = time.time()
-    if localtime:
-        now = time.localtime(timeval)
-        # Calculate timezone offset, based on whether the local zone has
-        # daylight savings time, and whether DST is in effect.
-        if time.daylight and now[-1]:
-            offset = time.altzone
-        else:
-            offset = time.timezone
-        hours, minutes = divmod(abs(offset), 3600)
-        # Remember offset is in seconds west of UTC, but the timezone is in
-        # minutes east of UTC, so the signs differ.
-        if offset > 0:
-            sign = '-'
-        else:
-            sign = '+'
-        zone = '%s%02d%02d' % (sign, hours, minutes // 60)
-    else:
-        now = time.gmtime(timeval)
-        # Timezone offset is always -0000
-        if usegmt:
-            zone = 'GMT'
-        else:
-            zone = '-0000'
-    return _format_timetuple_and_zone(now, zone)
-
-def format_datetime(dt, usegmt=False):
-    """Turn a datetime into a date string as specified in RFC 2822.
-
-    If usegmt is True, dt must be an aware datetime with an offset of zero.  In
-    this case 'GMT' will be rendered instead of the normal +0000 required by
-    RFC2822.  This is to support HTTP headers involving date stamps.
-    """
-    now = dt.timetuple()
-    if usegmt:
-        if dt.tzinfo is None or dt.tzinfo != datetime.timezone.utc:
-            raise ValueError("usegmt option requires a UTC datetime")
-        zone = 'GMT'
-    elif dt.tzinfo is None:
-        zone = '-0000'
-    else:
-        zone = dt.strftime("%z")
-    return _format_timetuple_and_zone(now, zone)
-
-
-def make_msgid(idstring=None, domain=None):
-    """Returns a string suitable for RFC 2822 compliant Message-ID, e.g:
-
-    <20020201195627.33539.96671@nightshade.la.mastaler.com>
-
-    Optional idstring if given is a string used to strengthen the
-    uniqueness of the message id.  Optional domain if given provides the
-    portion of the message id after the '@'.  It defaults to the locally
-    defined hostname.
-    """
-    timeval = time.time()
-    utcdate = time.strftime('%Y%m%d%H%M%S', time.gmtime(timeval))
-    pid = os.getpid()
-    randint = random.randrange(100000)
-    if idstring is None:
-        idstring = ''
-    else:
-        idstring = '.' + idstring
-    if domain is None:
-        domain = socket.getfqdn()
-    msgid = '<%s.%s.%s%s@%s>' % (utcdate, pid, randint, idstring, domain)
-    return msgid
-
-
-def parsedate_to_datetime(data):
-    _3to2list = list(_parsedate_tz(data))
-    dtuple, tz, = [_3to2list[:-1]] + _3to2list[-1:]
-    if tz is None:
-        return datetime.datetime(*dtuple[:6])
-    return datetime.datetime(*dtuple[:6],
-            tzinfo=datetime.timezone(datetime.timedelta(seconds=tz)))
-
-
-def parseaddr(addr):
-    addrs = _AddressList(addr).addresslist
-    if not addrs:
-        return '', ''
-    return addrs[0]
-
-
-# rfc822.unquote() doesn't properly de-backslash-ify in Python pre-2.3.
-def unquote(str):
-    """Remove quotes from a string."""
-    if len(str) > 1:
-        if str.startswith('"') and str.endswith('"'):
-            return str[1:-1].replace('\\\\', '\\').replace('\\"', '"')
-        if str.startswith('<') and str.endswith('>'):
-            return str[1:-1]
-    return str
-
-
-
-# RFC2231-related functions - parameter encoding and decoding
-def decode_rfc2231(s):
-    """Decode string according to RFC 2231"""
-    parts = s.split(TICK, 2)
-    if len(parts) <= 2:
-        return None, None, s
-    return parts
-
-
-def encode_rfc2231(s, charset=None, language=None):
-    """Encode string according to RFC 2231.
-
-    If neither charset nor language is given, then s is returned as-is.  If
-    charset is given but not language, the string is encoded using the empty
-    string for language.
-    """
-    s = url_quote(s, safe='', encoding=charset or 'ascii')
-    if charset is None and language is None:
-        return s
-    if language is None:
-        language = ''
-    return "%s'%s'%s" % (charset, language, s)
-
-
-rfc2231_continuation = re.compile(r'^(?P<name>\w+)\*((?P<num>[0-9]+)\*?)?$',
-    re.ASCII)
-
-def decode_params(params):
-    """Decode parameters list according to RFC 2231.
-
-    params is a sequence of 2-tuples containing (param name, string value).
-    """
-    # Copy params so we don't mess with the original
-    params = params[:]
-    new_params = []
-    # Map parameter's name to a list of continuations.  The values are a
-    # 3-tuple of the continuation number, the string value, and a flag
-    # specifying whether a particular segment is %-encoded.
-    rfc2231_params = {}
-    name, value = params.pop(0)
-    new_params.append((name, value))
-    while params:
-        name, value = params.pop(0)
-        if name.endswith('*'):
-            encoded = True
-        else:
-            encoded = False
-        value = unquote(value)
-        mo = rfc2231_continuation.match(name)
-        if mo:
-            name, num = mo.group('name', 'num')
-            if num is not None:
-                num = int(num)
-            rfc2231_params.setdefault(name, []).append((num, value, encoded))
-        else:
-            new_params.append((name, '"%s"' % quote(value)))
-    if rfc2231_params:
-        for name, continuations in rfc2231_params.items():
-            value = []
-            extended = False
-            # Sort by number
-            continuations.sort()
-            # And now append all values in numerical order, converting
-            # %-encodings for the encoded segments.  If any of the
-            # continuation names ends in a *, then the entire string, after
-            # decoding segments and concatenating, must have the charset and
-            # language specifiers at the beginning of the string.
-            for num, s, encoded in continuations:
-                if encoded:
-                    # Decode as "latin-1", so the characters in s directly
-                    # represent the percent-encoded octet values.
-                    # collapse_rfc2231_value treats this as an octet sequence.
-                    s = url_unquote(s, encoding="latin-1")
-                    extended = True
-                value.append(s)
-            value = quote(EMPTYSTRING.join(value))
-            if extended:
-                charset, language, value = decode_rfc2231(value)
-                new_params.append((name, (charset, language, '"%s"' % value)))
-            else:
-                new_params.append((name, '"%s"' % value))
-    return new_params
-
-def collapse_rfc2231_value(value, errors='replace',
-                           fallback_charset='us-ascii'):
-    if not isinstance(value, tuple) or len(value) != 3:
-        return unquote(value)
-    # While value comes to us as a unicode string, we need it to be a bytes
-    # object.  We do not want bytes() normal utf-8 decoder, we want a straight
-    # interpretation of the string as character bytes.
-    charset, language, text = value
-    rawbytes = bytes(text, 'raw-unicode-escape')
-    try:
-        return str(rawbytes, charset, errors)
-    except LookupError:
-        # charset is not a known codec.
-        return unquote(text)
-
-
-#
-# datetime doesn't provide a localtime function yet, so provide one.  Code
-# adapted from the patch in issue 9527.  This may not be perfect, but it is
-# better than not having it.
-#
-
-def localtime(dt=None, isdst=-1):
-    """Return local time as an aware datetime object.
-
-    If called without arguments, return current time.  Otherwise *dt*
-    argument should be a datetime instance, and it is converted to the
-    local time zone according to the system time zone database.  If *dt* is
-    naive (that is, dt.tzinfo is None), it is assumed to be in local time.
-    In this case, a positive or zero value for *isdst* causes localtime to
-    presume initially that summer time (for example, Daylight Saving Time)
-    is or is not (respectively) in effect for the specified time.  A
-    negative value for *isdst* causes the localtime() function to attempt
-    to divine whether summer time is in effect for the specified time.
-
-    """
-    if dt is None:
-        return datetime.datetime.now(datetime.timezone.utc).astimezone()
-    if dt.tzinfo is not None:
-        return dt.astimezone()
-    # We have a naive datetime.  Convert to a (localtime) timetuple and pass to
-    # system mktime together with the isdst hint.  System mktime will return
-    # seconds since epoch.
-    tm = dt.timetuple()[:-1] + (isdst,)
-    seconds = time.mktime(tm)
-    localtm = time.localtime(seconds)
-    try:
-        delta = datetime.timedelta(seconds=localtm.tm_gmtoff)
-        tz = datetime.timezone(delta, localtm.tm_zone)
-    except AttributeError:
-        # Compute UTC offset and compare with the value implied by tm_isdst.
-        # If the values match, use the zone name implied by tm_isdst.
-        delta = dt - datetime.datetime(*time.gmtime(seconds)[:6])
-        dst = time.daylight and localtm.tm_isdst > 0
-        gmtoff = -(time.altzone if dst else time.timezone)
-        if delta == datetime.timedelta(seconds=gmtoff):
-            tz = datetime.timezone(delta, time.tzname[dst])
-        else:
-            tz = datetime.timezone(delta)
-    return dt.replace(tzinfo=tz)
diff --git a/lib/future/backports/html/__init__.py b/lib/future/backports/html/__init__.py
deleted file mode 100644
index 58e133fd..00000000
--- a/lib/future/backports/html/__init__.py
+++ /dev/null
@@ -1,27 +0,0 @@
-"""
-General functions for HTML manipulation, backported from Py3.
-
-Note that this uses Python 2.7 code with the corresponding Python 3
-module names and locations.
-"""
-
-from __future__ import unicode_literals
-
-
-_escape_map = {ord('&'): '&amp;', ord('<'): '&lt;', ord('>'): '&gt;'}
-_escape_map_full = {ord('&'): '&amp;', ord('<'): '&lt;', ord('>'): '&gt;',
-                    ord('"'): '&quot;', ord('\''): '&#x27;'}
-
-# NB: this is a candidate for a bytes/string polymorphic interface
-
-def escape(s, quote=True):
-    """
-    Replace special characters "&", "<" and ">" to HTML-safe sequences.
-    If the optional flag quote is true (the default), the quotation mark
-    characters, both double quote (") and single quote (') characters are also
-    translated.
-    """
-    assert not isinstance(s, bytes), 'Pass a unicode string'
-    if quote:
-        return s.translate(_escape_map_full)
-    return s.translate(_escape_map)
diff --git a/lib/future/backports/html/entities.py b/lib/future/backports/html/entities.py
deleted file mode 100644
index 5c73f692..00000000
--- a/lib/future/backports/html/entities.py
+++ /dev/null
@@ -1,2514 +0,0 @@
-"""HTML character entity references.
-
-Backported for python-future from Python 3.3
-"""
-
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from future.builtins import *
-
-
-# maps the HTML entity name to the Unicode codepoint
-name2codepoint = {
-    'AElig':    0x00c6, # latin capital letter AE = latin capital ligature AE, U+00C6 ISOlat1
-    'Aacute':   0x00c1, # latin capital letter A with acute, U+00C1 ISOlat1
-    'Acirc':    0x00c2, # latin capital letter A with circumflex, U+00C2 ISOlat1
-    'Agrave':   0x00c0, # latin capital letter A with grave = latin capital letter A grave, U+00C0 ISOlat1
-    'Alpha':    0x0391, # greek capital letter alpha, U+0391
-    'Aring':    0x00c5, # latin capital letter A with ring above = latin capital letter A ring, U+00C5 ISOlat1
-    'Atilde':   0x00c3, # latin capital letter A with tilde, U+00C3 ISOlat1
-    'Auml':     0x00c4, # latin capital letter A with diaeresis, U+00C4 ISOlat1
-    'Beta':     0x0392, # greek capital letter beta, U+0392
-    'Ccedil':   0x00c7, # latin capital letter C with cedilla, U+00C7 ISOlat1
-    'Chi':      0x03a7, # greek capital letter chi, U+03A7
-    'Dagger':   0x2021, # double dagger, U+2021 ISOpub
-    'Delta':    0x0394, # greek capital letter delta, U+0394 ISOgrk3
-    'ETH':      0x00d0, # latin capital letter ETH, U+00D0 ISOlat1
-    'Eacute':   0x00c9, # latin capital letter E with acute, U+00C9 ISOlat1
-    'Ecirc':    0x00ca, # latin capital letter E with circumflex, U+00CA ISOlat1
-    'Egrave':   0x00c8, # latin capital letter E with grave, U+00C8 ISOlat1
-    'Epsilon':  0x0395, # greek capital letter epsilon, U+0395
-    'Eta':      0x0397, # greek capital letter eta, U+0397
-    'Euml':     0x00cb, # latin capital letter E with diaeresis, U+00CB ISOlat1
-    'Gamma':    0x0393, # greek capital letter gamma, U+0393 ISOgrk3
-    'Iacute':   0x00cd, # latin capital letter I with acute, U+00CD ISOlat1
-    'Icirc':    0x00ce, # latin capital letter I with circumflex, U+00CE ISOlat1
-    'Igrave':   0x00cc, # latin capital letter I with grave, U+00CC ISOlat1
-    'Iota':     0x0399, # greek capital letter iota, U+0399
-    'Iuml':     0x00cf, # latin capital letter I with diaeresis, U+00CF ISOlat1
-    'Kappa':    0x039a, # greek capital letter kappa, U+039A
-    'Lambda':   0x039b, # greek capital letter lambda, U+039B ISOgrk3
-    'Mu':       0x039c, # greek capital letter mu, U+039C
-    'Ntilde':   0x00d1, # latin capital letter N with tilde, U+00D1 ISOlat1
-    'Nu':       0x039d, # greek capital letter nu, U+039D
-    'OElig':    0x0152, # latin capital ligature OE, U+0152 ISOlat2
-    'Oacute':   0x00d3, # latin capital letter O with acute, U+00D3 ISOlat1
-    'Ocirc':    0x00d4, # latin capital letter O with circumflex, U+00D4 ISOlat1
-    'Ograve':   0x00d2, # latin capital letter O with grave, U+00D2 ISOlat1
-    'Omega':    0x03a9, # greek capital letter omega, U+03A9 ISOgrk3
-    'Omicron':  0x039f, # greek capital letter omicron, U+039F
-    'Oslash':   0x00d8, # latin capital letter O with stroke = latin capital letter O slash, U+00D8 ISOlat1
-    'Otilde':   0x00d5, # latin capital letter O with tilde, U+00D5 ISOlat1
-    'Ouml':     0x00d6, # latin capital letter O with diaeresis, U+00D6 ISOlat1
-    'Phi':      0x03a6, # greek capital letter phi, U+03A6 ISOgrk3
-    'Pi':       0x03a0, # greek capital letter pi, U+03A0 ISOgrk3
-    'Prime':    0x2033, # double prime = seconds = inches, U+2033 ISOtech
-    'Psi':      0x03a8, # greek capital letter psi, U+03A8 ISOgrk3
-    'Rho':      0x03a1, # greek capital letter rho, U+03A1
-    'Scaron':   0x0160, # latin capital letter S with caron, U+0160 ISOlat2
-    'Sigma':    0x03a3, # greek capital letter sigma, U+03A3 ISOgrk3
-    'THORN':    0x00de, # latin capital letter THORN, U+00DE ISOlat1
-    'Tau':      0x03a4, # greek capital letter tau, U+03A4
-    'Theta':    0x0398, # greek capital letter theta, U+0398 ISOgrk3
-    'Uacute':   0x00da, # latin capital letter U with acute, U+00DA ISOlat1
-    'Ucirc':    0x00db, # latin capital letter U with circumflex, U+00DB ISOlat1
-    'Ugrave':   0x00d9, # latin capital letter U with grave, U+00D9 ISOlat1
-    'Upsilon':  0x03a5, # greek capital letter upsilon, U+03A5 ISOgrk3
-    'Uuml':     0x00dc, # latin capital letter U with diaeresis, U+00DC ISOlat1
-    'Xi':       0x039e, # greek capital letter xi, U+039E ISOgrk3
-    'Yacute':   0x00dd, # latin capital letter Y with acute, U+00DD ISOlat1
-    'Yuml':     0x0178, # latin capital letter Y with diaeresis, U+0178 ISOlat2
-    'Zeta':     0x0396, # greek capital letter zeta, U+0396
-    'aacute':   0x00e1, # latin small letter a with acute, U+00E1 ISOlat1
-    'acirc':    0x00e2, # latin small letter a with circumflex, U+00E2 ISOlat1
-    'acute':    0x00b4, # acute accent = spacing acute, U+00B4 ISOdia
-    'aelig':    0x00e6, # latin small letter ae = latin small ligature ae, U+00E6 ISOlat1
-    'agrave':   0x00e0, # latin small letter a with grave = latin small letter a grave, U+00E0 ISOlat1
-    'alefsym':  0x2135, # alef symbol = first transfinite cardinal, U+2135 NEW
-    'alpha':    0x03b1, # greek small letter alpha, U+03B1 ISOgrk3
-    'amp':      0x0026, # ampersand, U+0026 ISOnum
-    'and':      0x2227, # logical and = wedge, U+2227 ISOtech
-    'ang':      0x2220, # angle, U+2220 ISOamso
-    'aring':    0x00e5, # latin small letter a with ring above = latin small letter a ring, U+00E5 ISOlat1
-    'asymp':    0x2248, # almost equal to = asymptotic to, U+2248 ISOamsr
-    'atilde':   0x00e3, # latin small letter a with tilde, U+00E3 ISOlat1
-    'auml':     0x00e4, # latin small letter a with diaeresis, U+00E4 ISOlat1
-    'bdquo':    0x201e, # double low-9 quotation mark, U+201E NEW
-    'beta':     0x03b2, # greek small letter beta, U+03B2 ISOgrk3
-    'brvbar':   0x00a6, # broken bar = broken vertical bar, U+00A6 ISOnum
-    'bull':     0x2022, # bullet = black small circle, U+2022 ISOpub
-    'cap':      0x2229, # intersection = cap, U+2229 ISOtech
-    'ccedil':   0x00e7, # latin small letter c with cedilla, U+00E7 ISOlat1
-    'cedil':    0x00b8, # cedilla = spacing cedilla, U+00B8 ISOdia
-    'cent':     0x00a2, # cent sign, U+00A2 ISOnum
-    'chi':      0x03c7, # greek small letter chi, U+03C7 ISOgrk3
-    'circ':     0x02c6, # modifier letter circumflex accent, U+02C6 ISOpub
-    'clubs':    0x2663, # black club suit = shamrock, U+2663 ISOpub
-    'cong':     0x2245, # approximately equal to, U+2245 ISOtech
-    'copy':     0x00a9, # copyright sign, U+00A9 ISOnum
-    'crarr':    0x21b5, # downwards arrow with corner leftwards = carriage return, U+21B5 NEW
-    'cup':      0x222a, # union = cup, U+222A ISOtech
-    'curren':   0x00a4, # currency sign, U+00A4 ISOnum
-    'dArr':     0x21d3, # downwards double arrow, U+21D3 ISOamsa
-    'dagger':   0x2020, # dagger, U+2020 ISOpub
-    'darr':     0x2193, # downwards arrow, U+2193 ISOnum
-    'deg':      0x00b0, # degree sign, U+00B0 ISOnum
-    'delta':    0x03b4, # greek small letter delta, U+03B4 ISOgrk3
-    'diams':    0x2666, # black diamond suit, U+2666 ISOpub
-    'divide':   0x00f7, # division sign, U+00F7 ISOnum
-    'eacute':   0x00e9, # latin small letter e with acute, U+00E9 ISOlat1
-    'ecirc':    0x00ea, # latin small letter e with circumflex, U+00EA ISOlat1
-    'egrave':   0x00e8, # latin small letter e with grave, U+00E8 ISOlat1
-    'empty':    0x2205, # empty set = null set = diameter, U+2205 ISOamso
-    'emsp':     0x2003, # em space, U+2003 ISOpub
-    'ensp':     0x2002, # en space, U+2002 ISOpub
-    'epsilon':  0x03b5, # greek small letter epsilon, U+03B5 ISOgrk3
-    'equiv':    0x2261, # identical to, U+2261 ISOtech
-    'eta':      0x03b7, # greek small letter eta, U+03B7 ISOgrk3
-    'eth':      0x00f0, # latin small letter eth, U+00F0 ISOlat1
-    'euml':     0x00eb, # latin small letter e with diaeresis, U+00EB ISOlat1
-    'euro':     0x20ac, # euro sign, U+20AC NEW
-    'exist':    0x2203, # there exists, U+2203 ISOtech
-    'fnof':     0x0192, # latin small f with hook = function = florin, U+0192 ISOtech
-    'forall':   0x2200, # for all, U+2200 ISOtech
-    'frac12':   0x00bd, # vulgar fraction one half = fraction one half, U+00BD ISOnum
-    'frac14':   0x00bc, # vulgar fraction one quarter = fraction one quarter, U+00BC ISOnum
-    'frac34':   0x00be, # vulgar fraction three quarters = fraction three quarters, U+00BE ISOnum
-    'frasl':    0x2044, # fraction slash, U+2044 NEW
-    'gamma':    0x03b3, # greek small letter gamma, U+03B3 ISOgrk3
-    'ge':       0x2265, # greater-than or equal to, U+2265 ISOtech
-    'gt':       0x003e, # greater-than sign, U+003E ISOnum
-    'hArr':     0x21d4, # left right double arrow, U+21D4 ISOamsa
-    'harr':     0x2194, # left right arrow, U+2194 ISOamsa
-    'hearts':   0x2665, # black heart suit = valentine, U+2665 ISOpub
-    'hellip':   0x2026, # horizontal ellipsis = three dot leader, U+2026 ISOpub
-    'iacute':   0x00ed, # latin small letter i with acute, U+00ED ISOlat1
-    'icirc':    0x00ee, # latin small letter i with circumflex, U+00EE ISOlat1
-    'iexcl':    0x00a1, # inverted exclamation mark, U+00A1 ISOnum
-    'igrave':   0x00ec, # latin small letter i with grave, U+00EC ISOlat1
-    'image':    0x2111, # blackletter capital I = imaginary part, U+2111 ISOamso
-    'infin':    0x221e, # infinity, U+221E ISOtech
-    'int':      0x222b, # integral, U+222B ISOtech
-    'iota':     0x03b9, # greek small letter iota, U+03B9 ISOgrk3
-    'iquest':   0x00bf, # inverted question mark = turned question mark, U+00BF ISOnum
-    'isin':     0x2208, # element of, U+2208 ISOtech
-    'iuml':     0x00ef, # latin small letter i with diaeresis, U+00EF ISOlat1
-    'kappa':    0x03ba, # greek small letter kappa, U+03BA ISOgrk3
-    'lArr':     0x21d0, # leftwards double arrow, U+21D0 ISOtech
-    'lambda':   0x03bb, # greek small letter lambda, U+03BB ISOgrk3
-    'lang':     0x2329, # left-pointing angle bracket = bra, U+2329 ISOtech
-    'laquo':    0x00ab, # left-pointing double angle quotation mark = left pointing guillemet, U+00AB ISOnum
-    'larr':     0x2190, # leftwards arrow, U+2190 ISOnum
-    'lceil':    0x2308, # left ceiling = apl upstile, U+2308 ISOamsc
-    'ldquo':    0x201c, # left double quotation mark, U+201C ISOnum
-    'le':       0x2264, # less-than or equal to, U+2264 ISOtech
-    'lfloor':   0x230a, # left floor = apl downstile, U+230A ISOamsc
-    'lowast':   0x2217, # asterisk operator, U+2217 ISOtech
-    'loz':      0x25ca, # lozenge, U+25CA ISOpub
-    'lrm':      0x200e, # left-to-right mark, U+200E NEW RFC 2070
-    'lsaquo':   0x2039, # single left-pointing angle quotation mark, U+2039 ISO proposed
-    'lsquo':    0x2018, # left single quotation mark, U+2018 ISOnum
-    'lt':       0x003c, # less-than sign, U+003C ISOnum
-    'macr':     0x00af, # macron = spacing macron = overline = APL overbar, U+00AF ISOdia
-    'mdash':    0x2014, # em dash, U+2014 ISOpub
-    'micro':    0x00b5, # micro sign, U+00B5 ISOnum
-    'middot':   0x00b7, # middle dot = Georgian comma = Greek middle dot, U+00B7 ISOnum
-    'minus':    0x2212, # minus sign, U+2212 ISOtech
-    'mu':       0x03bc, # greek small letter mu, U+03BC ISOgrk3
-    'nabla':    0x2207, # nabla = backward difference, U+2207 ISOtech
-    'nbsp':     0x00a0, # no-break space = non-breaking space, U+00A0 ISOnum
-    'ndash':    0x2013, # en dash, U+2013 ISOpub
-    'ne':       0x2260, # not equal to, U+2260 ISOtech
-    'ni':       0x220b, # contains as member, U+220B ISOtech
-    'not':      0x00ac, # not sign, U+00AC ISOnum
-    'notin':    0x2209, # not an element of, U+2209 ISOtech
-    'nsub':     0x2284, # not a subset of, U+2284 ISOamsn
-    'ntilde':   0x00f1, # latin small letter n with tilde, U+00F1 ISOlat1
-    'nu':       0x03bd, # greek small letter nu, U+03BD ISOgrk3
-    'oacute':   0x00f3, # latin small letter o with acute, U+00F3 ISOlat1
-    'ocirc':    0x00f4, # latin small letter o with circumflex, U+00F4 ISOlat1
-    'oelig':    0x0153, # latin small ligature oe, U+0153 ISOlat2
-    'ograve':   0x00f2, # latin small letter o with grave, U+00F2 ISOlat1
-    'oline':    0x203e, # overline = spacing overscore, U+203E NEW
-    'omega':    0x03c9, # greek small letter omega, U+03C9 ISOgrk3
-    'omicron':  0x03bf, # greek small letter omicron, U+03BF NEW
-    'oplus':    0x2295, # circled plus = direct sum, U+2295 ISOamsb
-    'or':       0x2228, # logical or = vee, U+2228 ISOtech
-    'ordf':     0x00aa, # feminine ordinal indicator, U+00AA ISOnum
-    'ordm':     0x00ba, # masculine ordinal indicator, U+00BA ISOnum
-    'oslash':   0x00f8, # latin small letter o with stroke, = latin small letter o slash, U+00F8 ISOlat1
-    'otilde':   0x00f5, # latin small letter o with tilde, U+00F5 ISOlat1
-    'otimes':   0x2297, # circled times = vector product, U+2297 ISOamsb
-    'ouml':     0x00f6, # latin small letter o with diaeresis, U+00F6 ISOlat1
-    'para':     0x00b6, # pilcrow sign = paragraph sign, U+00B6 ISOnum
-    'part':     0x2202, # partial differential, U+2202 ISOtech
-    'permil':   0x2030, # per mille sign, U+2030 ISOtech
-    'perp':     0x22a5, # up tack = orthogonal to = perpendicular, U+22A5 ISOtech
-    'phi':      0x03c6, # greek small letter phi, U+03C6 ISOgrk3
-    'pi':       0x03c0, # greek small letter pi, U+03C0 ISOgrk3
-    'piv':      0x03d6, # greek pi symbol, U+03D6 ISOgrk3
-    'plusmn':   0x00b1, # plus-minus sign = plus-or-minus sign, U+00B1 ISOnum
-    'pound':    0x00a3, # pound sign, U+00A3 ISOnum
-    'prime':    0x2032, # prime = minutes = feet, U+2032 ISOtech
-    'prod':     0x220f, # n-ary product = product sign, U+220F ISOamsb
-    'prop':     0x221d, # proportional to, U+221D ISOtech
-    'psi':      0x03c8, # greek small letter psi, U+03C8 ISOgrk3
-    'quot':     0x0022, # quotation mark = APL quote, U+0022 ISOnum
-    'rArr':     0x21d2, # rightwards double arrow, U+21D2 ISOtech
-    'radic':    0x221a, # square root = radical sign, U+221A ISOtech
-    'rang':     0x232a, # right-pointing angle bracket = ket, U+232A ISOtech
-    'raquo':    0x00bb, # right-pointing double angle quotation mark = right pointing guillemet, U+00BB ISOnum
-    'rarr':     0x2192, # rightwards arrow, U+2192 ISOnum
-    'rceil':    0x2309, # right ceiling, U+2309 ISOamsc
-    'rdquo':    0x201d, # right double quotation mark, U+201D ISOnum
-    'real':     0x211c, # blackletter capital R = real part symbol, U+211C ISOamso
-    'reg':      0x00ae, # registered sign = registered trade mark sign, U+00AE ISOnum
-    'rfloor':   0x230b, # right floor, U+230B ISOamsc
-    'rho':      0x03c1, # greek small letter rho, U+03C1 ISOgrk3
-    'rlm':      0x200f, # right-to-left mark, U+200F NEW RFC 2070
-    'rsaquo':   0x203a, # single right-pointing angle quotation mark, U+203A ISO proposed
-    'rsquo':    0x2019, # right single quotation mark, U+2019 ISOnum
-    'sbquo':    0x201a, # single low-9 quotation mark, U+201A NEW
-    'scaron':   0x0161, # latin small letter s with caron, U+0161 ISOlat2
-    'sdot':     0x22c5, # dot operator, U+22C5 ISOamsb
-    'sect':     0x00a7, # section sign, U+00A7 ISOnum
-    'shy':      0x00ad, # soft hyphen = discretionary hyphen, U+00AD ISOnum
-    'sigma':    0x03c3, # greek small letter sigma, U+03C3 ISOgrk3
-    'sigmaf':   0x03c2, # greek small letter final sigma, U+03C2 ISOgrk3
-    'sim':      0x223c, # tilde operator = varies with = similar to, U+223C ISOtech
-    'spades':   0x2660, # black spade suit, U+2660 ISOpub
-    'sub':      0x2282, # subset of, U+2282 ISOtech
-    'sube':     0x2286, # subset of or equal to, U+2286 ISOtech
-    'sum':      0x2211, # n-ary sumation, U+2211 ISOamsb
-    'sup':      0x2283, # superset of, U+2283 ISOtech
-    'sup1':     0x00b9, # superscript one = superscript digit one, U+00B9 ISOnum
-    'sup2':     0x00b2, # superscript two = superscript digit two = squared, U+00B2 ISOnum
-    'sup3':     0x00b3, # superscript three = superscript digit three = cubed, U+00B3 ISOnum
-    'supe':     0x2287, # superset of or equal to, U+2287 ISOtech
-    'szlig':    0x00df, # latin small letter sharp s = ess-zed, U+00DF ISOlat1
-    'tau':      0x03c4, # greek small letter tau, U+03C4 ISOgrk3
-    'there4':   0x2234, # therefore, U+2234 ISOtech
-    'theta':    0x03b8, # greek small letter theta, U+03B8 ISOgrk3
-    'thetasym': 0x03d1, # greek small letter theta symbol, U+03D1 NEW
-    'thinsp':   0x2009, # thin space, U+2009 ISOpub
-    'thorn':    0x00fe, # latin small letter thorn with, U+00FE ISOlat1
-    'tilde':    0x02dc, # small tilde, U+02DC ISOdia
-    'times':    0x00d7, # multiplication sign, U+00D7 ISOnum
-    'trade':    0x2122, # trade mark sign, U+2122 ISOnum
-    'uArr':     0x21d1, # upwards double arrow, U+21D1 ISOamsa
-    'uacute':   0x00fa, # latin small letter u with acute, U+00FA ISOlat1
-    'uarr':     0x2191, # upwards arrow, U+2191 ISOnum
-    'ucirc':    0x00fb, # latin small letter u with circumflex, U+00FB ISOlat1
-    'ugrave':   0x00f9, # latin small letter u with grave, U+00F9 ISOlat1
-    'uml':      0x00a8, # diaeresis = spacing diaeresis, U+00A8 ISOdia
-    'upsih':    0x03d2, # greek upsilon with hook symbol, U+03D2 NEW
-    'upsilon':  0x03c5, # greek small letter upsilon, U+03C5 ISOgrk3
-    'uuml':     0x00fc, # latin small letter u with diaeresis, U+00FC ISOlat1
-    'weierp':   0x2118, # script capital P = power set = Weierstrass p, U+2118 ISOamso
-    'xi':       0x03be, # greek small letter xi, U+03BE ISOgrk3
-    'yacute':   0x00fd, # latin small letter y with acute, U+00FD ISOlat1
-    'yen':      0x00a5, # yen sign = yuan sign, U+00A5 ISOnum
-    'yuml':     0x00ff, # latin small letter y with diaeresis, U+00FF ISOlat1
-    'zeta':     0x03b6, # greek small letter zeta, U+03B6 ISOgrk3
-    'zwj':      0x200d, # zero width joiner, U+200D NEW RFC 2070
-    'zwnj':     0x200c, # zero width non-joiner, U+200C NEW RFC 2070
-}
-
-
-# maps the HTML5 named character references to the equivalent Unicode character(s)
-html5 = {
-    'Aacute': '\xc1',
-    'aacute': '\xe1',
-    'Aacute;': '\xc1',
-    'aacute;': '\xe1',
-    'Abreve;': '\u0102',
-    'abreve;': '\u0103',
-    'ac;': '\u223e',
-    'acd;': '\u223f',
-    'acE;': '\u223e\u0333',
-    'Acirc': '\xc2',
-    'acirc': '\xe2',
-    'Acirc;': '\xc2',
-    'acirc;': '\xe2',
-    'acute': '\xb4',
-    'acute;': '\xb4',
-    'Acy;': '\u0410',
-    'acy;': '\u0430',
-    'AElig': '\xc6',
-    'aelig': '\xe6',
-    'AElig;': '\xc6',
-    'aelig;': '\xe6',
-    'af;': '\u2061',
-    'Afr;': '\U0001d504',
-    'afr;': '\U0001d51e',
-    'Agrave': '\xc0',
-    'agrave': '\xe0',
-    'Agrave;': '\xc0',
-    'agrave;': '\xe0',
-    'alefsym;': '\u2135',
-    'aleph;': '\u2135',
-    'Alpha;': '\u0391',
-    'alpha;': '\u03b1',
-    'Amacr;': '\u0100',
-    'amacr;': '\u0101',
-    'amalg;': '\u2a3f',
-    'AMP': '&',
-    'amp': '&',
-    'AMP;': '&',
-    'amp;': '&',
-    'And;': '\u2a53',
-    'and;': '\u2227',
-    'andand;': '\u2a55',
-    'andd;': '\u2a5c',
-    'andslope;': '\u2a58',
-    'andv;': '\u2a5a',
-    'ang;': '\u2220',
-    'ange;': '\u29a4',
-    'angle;': '\u2220',
-    'angmsd;': '\u2221',
-    'angmsdaa;': '\u29a8',
-    'angmsdab;': '\u29a9',
-    'angmsdac;': '\u29aa',
-    'angmsdad;': '\u29ab',
-    'angmsdae;': '\u29ac',
-    'angmsdaf;': '\u29ad',
-    'angmsdag;': '\u29ae',
-    'angmsdah;': '\u29af',
-    'angrt;': '\u221f',
-    'angrtvb;': '\u22be',
-    'angrtvbd;': '\u299d',
-    'angsph;': '\u2222',
-    'angst;': '\xc5',
-    'angzarr;': '\u237c',
-    'Aogon;': '\u0104',
-    'aogon;': '\u0105',
-    'Aopf;': '\U0001d538',
-    'aopf;': '\U0001d552',
-    'ap;': '\u2248',
-    'apacir;': '\u2a6f',
-    'apE;': '\u2a70',
-    'ape;': '\u224a',
-    'apid;': '\u224b',
-    'apos;': "'",
-    'ApplyFunction;': '\u2061',
-    'approx;': '\u2248',
-    'approxeq;': '\u224a',
-    'Aring': '\xc5',
-    'aring': '\xe5',
-    'Aring;': '\xc5',
-    'aring;': '\xe5',
-    'Ascr;': '\U0001d49c',
-    'ascr;': '\U0001d4b6',
-    'Assign;': '\u2254',
-    'ast;': '*',
-    'asymp;': '\u2248',
-    'asympeq;': '\u224d',
-    'Atilde': '\xc3',
-    'atilde': '\xe3',
-    'Atilde;': '\xc3',
-    'atilde;': '\xe3',
-    'Auml': '\xc4',
-    'auml': '\xe4',
-    'Auml;': '\xc4',
-    'auml;': '\xe4',
-    'awconint;': '\u2233',
-    'awint;': '\u2a11',
-    'backcong;': '\u224c',
-    'backepsilon;': '\u03f6',
-    'backprime;': '\u2035',
-    'backsim;': '\u223d',
-    'backsimeq;': '\u22cd',
-    'Backslash;': '\u2216',
-    'Barv;': '\u2ae7',
-    'barvee;': '\u22bd',
-    'Barwed;': '\u2306',
-    'barwed;': '\u2305',
-    'barwedge;': '\u2305',
-    'bbrk;': '\u23b5',
-    'bbrktbrk;': '\u23b6',
-    'bcong;': '\u224c',
-    'Bcy;': '\u0411',
-    'bcy;': '\u0431',
-    'bdquo;': '\u201e',
-    'becaus;': '\u2235',
-    'Because;': '\u2235',
-    'because;': '\u2235',
-    'bemptyv;': '\u29b0',
-    'bepsi;': '\u03f6',
-    'bernou;': '\u212c',
-    'Bernoullis;': '\u212c',
-    'Beta;': '\u0392',
-    'beta;': '\u03b2',
-    'beth;': '\u2136',
-    'between;': '\u226c',
-    'Bfr;': '\U0001d505',
-    'bfr;': '\U0001d51f',
-    'bigcap;': '\u22c2',
-    'bigcirc;': '\u25ef',
-    'bigcup;': '\u22c3',
-    'bigodot;': '\u2a00',
-    'bigoplus;': '\u2a01',
-    'bigotimes;': '\u2a02',
-    'bigsqcup;': '\u2a06',
-    'bigstar;': '\u2605',
-    'bigtriangledown;': '\u25bd',
-    'bigtriangleup;': '\u25b3',
-    'biguplus;': '\u2a04',
-    'bigvee;': '\u22c1',
-    'bigwedge;': '\u22c0',
-    'bkarow;': '\u290d',
-    'blacklozenge;': '\u29eb',
-    'blacksquare;': '\u25aa',
-    'blacktriangle;': '\u25b4',
-    'blacktriangledown;': '\u25be',
-    'blacktriangleleft;': '\u25c2',
-    'blacktriangleright;': '\u25b8',
-    'blank;': '\u2423',
-    'blk12;': '\u2592',
-    'blk14;': '\u2591',
-    'blk34;': '\u2593',
-    'block;': '\u2588',
-    'bne;': '=\u20e5',
-    'bnequiv;': '\u2261\u20e5',
-    'bNot;': '\u2aed',
-    'bnot;': '\u2310',
-    'Bopf;': '\U0001d539',
-    'bopf;': '\U0001d553',
-    'bot;': '\u22a5',
-    'bottom;': '\u22a5',
-    'bowtie;': '\u22c8',
-    'boxbox;': '\u29c9',
-    'boxDL;': '\u2557',
-    'boxDl;': '\u2556',
-    'boxdL;': '\u2555',
-    'boxdl;': '\u2510',
-    'boxDR;': '\u2554',
-    'boxDr;': '\u2553',
-    'boxdR;': '\u2552',
-    'boxdr;': '\u250c',
-    'boxH;': '\u2550',
-    'boxh;': '\u2500',
-    'boxHD;': '\u2566',
-    'boxHd;': '\u2564',
-    'boxhD;': '\u2565',
-    'boxhd;': '\u252c',
-    'boxHU;': '\u2569',
-    'boxHu;': '\u2567',
-    'boxhU;': '\u2568',
-    'boxhu;': '\u2534',
-    'boxminus;': '\u229f',
-    'boxplus;': '\u229e',
-    'boxtimes;': '\u22a0',
-    'boxUL;': '\u255d',
-    'boxUl;': '\u255c',
-    'boxuL;': '\u255b',
-    'boxul;': '\u2518',
-    'boxUR;': '\u255a',
-    'boxUr;': '\u2559',
-    'boxuR;': '\u2558',
-    'boxur;': '\u2514',
-    'boxV;': '\u2551',
-    'boxv;': '\u2502',
-    'boxVH;': '\u256c',
-    'boxVh;': '\u256b',
-    'boxvH;': '\u256a',
-    'boxvh;': '\u253c',
-    'boxVL;': '\u2563',
-    'boxVl;': '\u2562',
-    'boxvL;': '\u2561',
-    'boxvl;': '\u2524',
-    'boxVR;': '\u2560',
-    'boxVr;': '\u255f',
-    'boxvR;': '\u255e',
-    'boxvr;': '\u251c',
-    'bprime;': '\u2035',
-    'Breve;': '\u02d8',
-    'breve;': '\u02d8',
-    'brvbar': '\xa6',
-    'brvbar;': '\xa6',
-    'Bscr;': '\u212c',
-    'bscr;': '\U0001d4b7',
-    'bsemi;': '\u204f',
-    'bsim;': '\u223d',
-    'bsime;': '\u22cd',
-    'bsol;': '\\',
-    'bsolb;': '\u29c5',
-    'bsolhsub;': '\u27c8',
-    'bull;': '\u2022',
-    'bullet;': '\u2022',
-    'bump;': '\u224e',
-    'bumpE;': '\u2aae',
-    'bumpe;': '\u224f',
-    'Bumpeq;': '\u224e',
-    'bumpeq;': '\u224f',
-    'Cacute;': '\u0106',
-    'cacute;': '\u0107',
-    'Cap;': '\u22d2',
-    'cap;': '\u2229',
-    'capand;': '\u2a44',
-    'capbrcup;': '\u2a49',
-    'capcap;': '\u2a4b',
-    'capcup;': '\u2a47',
-    'capdot;': '\u2a40',
-    'CapitalDifferentialD;': '\u2145',
-    'caps;': '\u2229\ufe00',
-    'caret;': '\u2041',
-    'caron;': '\u02c7',
-    'Cayleys;': '\u212d',
-    'ccaps;': '\u2a4d',
-    'Ccaron;': '\u010c',
-    'ccaron;': '\u010d',
-    'Ccedil': '\xc7',
-    'ccedil': '\xe7',
-    'Ccedil;': '\xc7',
-    'ccedil;': '\xe7',
-    'Ccirc;': '\u0108',
-    'ccirc;': '\u0109',
-    'Cconint;': '\u2230',
-    'ccups;': '\u2a4c',
-    'ccupssm;': '\u2a50',
-    'Cdot;': '\u010a',
-    'cdot;': '\u010b',
-    'cedil': '\xb8',
-    'cedil;': '\xb8',
-    'Cedilla;': '\xb8',
-    'cemptyv;': '\u29b2',
-    'cent': '\xa2',
-    'cent;': '\xa2',
-    'CenterDot;': '\xb7',
-    'centerdot;': '\xb7',
-    'Cfr;': '\u212d',
-    'cfr;': '\U0001d520',
-    'CHcy;': '\u0427',
-    'chcy;': '\u0447',
-    'check;': '\u2713',
-    'checkmark;': '\u2713',
-    'Chi;': '\u03a7',
-    'chi;': '\u03c7',
-    'cir;': '\u25cb',
-    'circ;': '\u02c6',
-    'circeq;': '\u2257',
-    'circlearrowleft;': '\u21ba',
-    'circlearrowright;': '\u21bb',
-    'circledast;': '\u229b',
-    'circledcirc;': '\u229a',
-    'circleddash;': '\u229d',
-    'CircleDot;': '\u2299',
-    'circledR;': '\xae',
-    'circledS;': '\u24c8',
-    'CircleMinus;': '\u2296',
-    'CirclePlus;': '\u2295',
-    'CircleTimes;': '\u2297',
-    'cirE;': '\u29c3',
-    'cire;': '\u2257',
-    'cirfnint;': '\u2a10',
-    'cirmid;': '\u2aef',
-    'cirscir;': '\u29c2',
-    'ClockwiseContourIntegral;': '\u2232',
-    'CloseCurlyDoubleQuote;': '\u201d',
-    'CloseCurlyQuote;': '\u2019',
-    'clubs;': '\u2663',
-    'clubsuit;': '\u2663',
-    'Colon;': '\u2237',
-    'colon;': ':',
-    'Colone;': '\u2a74',
-    'colone;': '\u2254',
-    'coloneq;': '\u2254',
-    'comma;': ',',
-    'commat;': '@',
-    'comp;': '\u2201',
-    'compfn;': '\u2218',
-    'complement;': '\u2201',
-    'complexes;': '\u2102',
-    'cong;': '\u2245',
-    'congdot;': '\u2a6d',
-    'Congruent;': '\u2261',
-    'Conint;': '\u222f',
-    'conint;': '\u222e',
-    'ContourIntegral;': '\u222e',
-    'Copf;': '\u2102',
-    'copf;': '\U0001d554',
-    'coprod;': '\u2210',
-    'Coproduct;': '\u2210',
-    'COPY': '\xa9',
-    'copy': '\xa9',
-    'COPY;': '\xa9',
-    'copy;': '\xa9',
-    'copysr;': '\u2117',
-    'CounterClockwiseContourIntegral;': '\u2233',
-    'crarr;': '\u21b5',
-    'Cross;': '\u2a2f',
-    'cross;': '\u2717',
-    'Cscr;': '\U0001d49e',
-    'cscr;': '\U0001d4b8',
-    'csub;': '\u2acf',
-    'csube;': '\u2ad1',
-    'csup;': '\u2ad0',
-    'csupe;': '\u2ad2',
-    'ctdot;': '\u22ef',
-    'cudarrl;': '\u2938',
-    'cudarrr;': '\u2935',
-    'cuepr;': '\u22de',
-    'cuesc;': '\u22df',
-    'cularr;': '\u21b6',
-    'cularrp;': '\u293d',
-    'Cup;': '\u22d3',
-    'cup;': '\u222a',
-    'cupbrcap;': '\u2a48',
-    'CupCap;': '\u224d',
-    'cupcap;': '\u2a46',
-    'cupcup;': '\u2a4a',
-    'cupdot;': '\u228d',
-    'cupor;': '\u2a45',
-    'cups;': '\u222a\ufe00',
-    'curarr;': '\u21b7',
-    'curarrm;': '\u293c',
-    'curlyeqprec;': '\u22de',
-    'curlyeqsucc;': '\u22df',
-    'curlyvee;': '\u22ce',
-    'curlywedge;': '\u22cf',
-    'curren': '\xa4',
-    'curren;': '\xa4',
-    'curvearrowleft;': '\u21b6',
-    'curvearrowright;': '\u21b7',
-    'cuvee;': '\u22ce',
-    'cuwed;': '\u22cf',
-    'cwconint;': '\u2232',
-    'cwint;': '\u2231',
-    'cylcty;': '\u232d',
-    'Dagger;': '\u2021',
-    'dagger;': '\u2020',
-    'daleth;': '\u2138',
-    'Darr;': '\u21a1',
-    'dArr;': '\u21d3',
-    'darr;': '\u2193',
-    'dash;': '\u2010',
-    'Dashv;': '\u2ae4',
-    'dashv;': '\u22a3',
-    'dbkarow;': '\u290f',
-    'dblac;': '\u02dd',
-    'Dcaron;': '\u010e',
-    'dcaron;': '\u010f',
-    'Dcy;': '\u0414',
-    'dcy;': '\u0434',
-    'DD;': '\u2145',
-    'dd;': '\u2146',
-    'ddagger;': '\u2021',
-    'ddarr;': '\u21ca',
-    'DDotrahd;': '\u2911',
-    'ddotseq;': '\u2a77',
-    'deg': '\xb0',
-    'deg;': '\xb0',
-    'Del;': '\u2207',
-    'Delta;': '\u0394',
-    'delta;': '\u03b4',
-    'demptyv;': '\u29b1',
-    'dfisht;': '\u297f',
-    'Dfr;': '\U0001d507',
-    'dfr;': '\U0001d521',
-    'dHar;': '\u2965',
-    'dharl;': '\u21c3',
-    'dharr;': '\u21c2',
-    'DiacriticalAcute;': '\xb4',
-    'DiacriticalDot;': '\u02d9',
-    'DiacriticalDoubleAcute;': '\u02dd',
-    'DiacriticalGrave;': '`',
-    'DiacriticalTilde;': '\u02dc',
-    'diam;': '\u22c4',
-    'Diamond;': '\u22c4',
-    'diamond;': '\u22c4',
-    'diamondsuit;': '\u2666',
-    'diams;': '\u2666',
-    'die;': '\xa8',
-    'DifferentialD;': '\u2146',
-    'digamma;': '\u03dd',
-    'disin;': '\u22f2',
-    'div;': '\xf7',
-    'divide': '\xf7',
-    'divide;': '\xf7',
-    'divideontimes;': '\u22c7',
-    'divonx;': '\u22c7',
-    'DJcy;': '\u0402',
-    'djcy;': '\u0452',
-    'dlcorn;': '\u231e',
-    'dlcrop;': '\u230d',
-    'dollar;': '$',
-    'Dopf;': '\U0001d53b',
-    'dopf;': '\U0001d555',
-    'Dot;': '\xa8',
-    'dot;': '\u02d9',
-    'DotDot;': '\u20dc',
-    'doteq;': '\u2250',
-    'doteqdot;': '\u2251',
-    'DotEqual;': '\u2250',
-    'dotminus;': '\u2238',
-    'dotplus;': '\u2214',
-    'dotsquare;': '\u22a1',
-    'doublebarwedge;': '\u2306',
-    'DoubleContourIntegral;': '\u222f',
-    'DoubleDot;': '\xa8',
-    'DoubleDownArrow;': '\u21d3',
-    'DoubleLeftArrow;': '\u21d0',
-    'DoubleLeftRightArrow;': '\u21d4',
-    'DoubleLeftTee;': '\u2ae4',
-    'DoubleLongLeftArrow;': '\u27f8',
-    'DoubleLongLeftRightArrow;': '\u27fa',
-    'DoubleLongRightArrow;': '\u27f9',
-    'DoubleRightArrow;': '\u21d2',
-    'DoubleRightTee;': '\u22a8',
-    'DoubleUpArrow;': '\u21d1',
-    'DoubleUpDownArrow;': '\u21d5',
-    'DoubleVerticalBar;': '\u2225',
-    'DownArrow;': '\u2193',
-    'Downarrow;': '\u21d3',
-    'downarrow;': '\u2193',
-    'DownArrowBar;': '\u2913',
-    'DownArrowUpArrow;': '\u21f5',
-    'DownBreve;': '\u0311',
-    'downdownarrows;': '\u21ca',
-    'downharpoonleft;': '\u21c3',
-    'downharpoonright;': '\u21c2',
-    'DownLeftRightVector;': '\u2950',
-    'DownLeftTeeVector;': '\u295e',
-    'DownLeftVector;': '\u21bd',
-    'DownLeftVectorBar;': '\u2956',
-    'DownRightTeeVector;': '\u295f',
-    'DownRightVector;': '\u21c1',
-    'DownRightVectorBar;': '\u2957',
-    'DownTee;': '\u22a4',
-    'DownTeeArrow;': '\u21a7',
-    'drbkarow;': '\u2910',
-    'drcorn;': '\u231f',
-    'drcrop;': '\u230c',
-    'Dscr;': '\U0001d49f',
-    'dscr;': '\U0001d4b9',
-    'DScy;': '\u0405',
-    'dscy;': '\u0455',
-    'dsol;': '\u29f6',
-    'Dstrok;': '\u0110',
-    'dstrok;': '\u0111',
-    'dtdot;': '\u22f1',
-    'dtri;': '\u25bf',
-    'dtrif;': '\u25be',
-    'duarr;': '\u21f5',
-    'duhar;': '\u296f',
-    'dwangle;': '\u29a6',
-    'DZcy;': '\u040f',
-    'dzcy;': '\u045f',
-    'dzigrarr;': '\u27ff',
-    'Eacute': '\xc9',
-    'eacute': '\xe9',
-    'Eacute;': '\xc9',
-    'eacute;': '\xe9',
-    'easter;': '\u2a6e',
-    'Ecaron;': '\u011a',
-    'ecaron;': '\u011b',
-    'ecir;': '\u2256',
-    'Ecirc': '\xca',
-    'ecirc': '\xea',
-    'Ecirc;': '\xca',
-    'ecirc;': '\xea',
-    'ecolon;': '\u2255',
-    'Ecy;': '\u042d',
-    'ecy;': '\u044d',
-    'eDDot;': '\u2a77',
-    'Edot;': '\u0116',
-    'eDot;': '\u2251',
-    'edot;': '\u0117',
-    'ee;': '\u2147',
-    'efDot;': '\u2252',
-    'Efr;': '\U0001d508',
-    'efr;': '\U0001d522',
-    'eg;': '\u2a9a',
-    'Egrave': '\xc8',
-    'egrave': '\xe8',
-    'Egrave;': '\xc8',
-    'egrave;': '\xe8',
-    'egs;': '\u2a96',
-    'egsdot;': '\u2a98',
-    'el;': '\u2a99',
-    'Element;': '\u2208',
-    'elinters;': '\u23e7',
-    'ell;': '\u2113',
-    'els;': '\u2a95',
-    'elsdot;': '\u2a97',
-    'Emacr;': '\u0112',
-    'emacr;': '\u0113',
-    'empty;': '\u2205',
-    'emptyset;': '\u2205',
-    'EmptySmallSquare;': '\u25fb',
-    'emptyv;': '\u2205',
-    'EmptyVerySmallSquare;': '\u25ab',
-    'emsp13;': '\u2004',
-    'emsp14;': '\u2005',
-    'emsp;': '\u2003',
-    'ENG;': '\u014a',
-    'eng;': '\u014b',
-    'ensp;': '\u2002',
-    'Eogon;': '\u0118',
-    'eogon;': '\u0119',
-    'Eopf;': '\U0001d53c',
-    'eopf;': '\U0001d556',
-    'epar;': '\u22d5',
-    'eparsl;': '\u29e3',
-    'eplus;': '\u2a71',
-    'epsi;': '\u03b5',
-    'Epsilon;': '\u0395',
-    'epsilon;': '\u03b5',
-    'epsiv;': '\u03f5',
-    'eqcirc;': '\u2256',
-    'eqcolon;': '\u2255',
-    'eqsim;': '\u2242',
-    'eqslantgtr;': '\u2a96',
-    'eqslantless;': '\u2a95',
-    'Equal;': '\u2a75',
-    'equals;': '=',
-    'EqualTilde;': '\u2242',
-    'equest;': '\u225f',
-    'Equilibrium;': '\u21cc',
-    'equiv;': '\u2261',
-    'equivDD;': '\u2a78',
-    'eqvparsl;': '\u29e5',
-    'erarr;': '\u2971',
-    'erDot;': '\u2253',
-    'Escr;': '\u2130',
-    'escr;': '\u212f',
-    'esdot;': '\u2250',
-    'Esim;': '\u2a73',
-    'esim;': '\u2242',
-    'Eta;': '\u0397',
-    'eta;': '\u03b7',
-    'ETH': '\xd0',
-    'eth': '\xf0',
-    'ETH;': '\xd0',
-    'eth;': '\xf0',
-    'Euml': '\xcb',
-    'euml': '\xeb',
-    'Euml;': '\xcb',
-    'euml;': '\xeb',
-    'euro;': '\u20ac',
-    'excl;': '!',
-    'exist;': '\u2203',
-    'Exists;': '\u2203',
-    'expectation;': '\u2130',
-    'ExponentialE;': '\u2147',
-    'exponentiale;': '\u2147',
-    'fallingdotseq;': '\u2252',
-    'Fcy;': '\u0424',
-    'fcy;': '\u0444',
-    'female;': '\u2640',
-    'ffilig;': '\ufb03',
-    'fflig;': '\ufb00',
-    'ffllig;': '\ufb04',
-    'Ffr;': '\U0001d509',
-    'ffr;': '\U0001d523',
-    'filig;': '\ufb01',
-    'FilledSmallSquare;': '\u25fc',
-    'FilledVerySmallSquare;': '\u25aa',
-    'fjlig;': 'fj',
-    'flat;': '\u266d',
-    'fllig;': '\ufb02',
-    'fltns;': '\u25b1',
-    'fnof;': '\u0192',
-    'Fopf;': '\U0001d53d',
-    'fopf;': '\U0001d557',
-    'ForAll;': '\u2200',
-    'forall;': '\u2200',
-    'fork;': '\u22d4',
-    'forkv;': '\u2ad9',
-    'Fouriertrf;': '\u2131',
-    'fpartint;': '\u2a0d',
-    'frac12': '\xbd',
-    'frac12;': '\xbd',
-    'frac13;': '\u2153',
-    'frac14': '\xbc',
-    'frac14;': '\xbc',
-    'frac15;': '\u2155',
-    'frac16;': '\u2159',
-    'frac18;': '\u215b',
-    'frac23;': '\u2154',
-    'frac25;': '\u2156',
-    'frac34': '\xbe',
-    'frac34;': '\xbe',
-    'frac35;': '\u2157',
-    'frac38;': '\u215c',
-    'frac45;': '\u2158',
-    'frac56;': '\u215a',
-    'frac58;': '\u215d',
-    'frac78;': '\u215e',
-    'frasl;': '\u2044',
-    'frown;': '\u2322',
-    'Fscr;': '\u2131',
-    'fscr;': '\U0001d4bb',
-    'gacute;': '\u01f5',
-    'Gamma;': '\u0393',
-    'gamma;': '\u03b3',
-    'Gammad;': '\u03dc',
-    'gammad;': '\u03dd',
-    'gap;': '\u2a86',
-    'Gbreve;': '\u011e',
-    'gbreve;': '\u011f',
-    'Gcedil;': '\u0122',
-    'Gcirc;': '\u011c',
-    'gcirc;': '\u011d',
-    'Gcy;': '\u0413',
-    'gcy;': '\u0433',
-    'Gdot;': '\u0120',
-    'gdot;': '\u0121',
-    'gE;': '\u2267',
-    'ge;': '\u2265',
-    'gEl;': '\u2a8c',
-    'gel;': '\u22db',
-    'geq;': '\u2265',
-    'geqq;': '\u2267',
-    'geqslant;': '\u2a7e',
-    'ges;': '\u2a7e',
-    'gescc;': '\u2aa9',
-    'gesdot;': '\u2a80',
-    'gesdoto;': '\u2a82',
-    'gesdotol;': '\u2a84',
-    'gesl;': '\u22db\ufe00',
-    'gesles;': '\u2a94',
-    'Gfr;': '\U0001d50a',
-    'gfr;': '\U0001d524',
-    'Gg;': '\u22d9',
-    'gg;': '\u226b',
-    'ggg;': '\u22d9',
-    'gimel;': '\u2137',
-    'GJcy;': '\u0403',
-    'gjcy;': '\u0453',
-    'gl;': '\u2277',
-    'gla;': '\u2aa5',
-    'glE;': '\u2a92',
-    'glj;': '\u2aa4',
-    'gnap;': '\u2a8a',
-    'gnapprox;': '\u2a8a',
-    'gnE;': '\u2269',
-    'gne;': '\u2a88',
-    'gneq;': '\u2a88',
-    'gneqq;': '\u2269',
-    'gnsim;': '\u22e7',
-    'Gopf;': '\U0001d53e',
-    'gopf;': '\U0001d558',
-    'grave;': '`',
-    'GreaterEqual;': '\u2265',
-    'GreaterEqualLess;': '\u22db',
-    'GreaterFullEqual;': '\u2267',
-    'GreaterGreater;': '\u2aa2',
-    'GreaterLess;': '\u2277',
-    'GreaterSlantEqual;': '\u2a7e',
-    'GreaterTilde;': '\u2273',
-    'Gscr;': '\U0001d4a2',
-    'gscr;': '\u210a',
-    'gsim;': '\u2273',
-    'gsime;': '\u2a8e',
-    'gsiml;': '\u2a90',
-    'GT': '>',
-    'gt': '>',
-    'GT;': '>',
-    'Gt;': '\u226b',
-    'gt;': '>',
-    'gtcc;': '\u2aa7',
-    'gtcir;': '\u2a7a',
-    'gtdot;': '\u22d7',
-    'gtlPar;': '\u2995',
-    'gtquest;': '\u2a7c',
-    'gtrapprox;': '\u2a86',
-    'gtrarr;': '\u2978',
-    'gtrdot;': '\u22d7',
-    'gtreqless;': '\u22db',
-    'gtreqqless;': '\u2a8c',
-    'gtrless;': '\u2277',
-    'gtrsim;': '\u2273',
-    'gvertneqq;': '\u2269\ufe00',
-    'gvnE;': '\u2269\ufe00',
-    'Hacek;': '\u02c7',
-    'hairsp;': '\u200a',
-    'half;': '\xbd',
-    'hamilt;': '\u210b',
-    'HARDcy;': '\u042a',
-    'hardcy;': '\u044a',
-    'hArr;': '\u21d4',
-    'harr;': '\u2194',
-    'harrcir;': '\u2948',
-    'harrw;': '\u21ad',
-    'Hat;': '^',
-    'hbar;': '\u210f',
-    'Hcirc;': '\u0124',
-    'hcirc;': '\u0125',
-    'hearts;': '\u2665',
-    'heartsuit;': '\u2665',
-    'hellip;': '\u2026',
-    'hercon;': '\u22b9',
-    'Hfr;': '\u210c',
-    'hfr;': '\U0001d525',
-    'HilbertSpace;': '\u210b',
-    'hksearow;': '\u2925',
-    'hkswarow;': '\u2926',
-    'hoarr;': '\u21ff',
-    'homtht;': '\u223b',
-    'hookleftarrow;': '\u21a9',
-    'hookrightarrow;': '\u21aa',
-    'Hopf;': '\u210d',
-    'hopf;': '\U0001d559',
-    'horbar;': '\u2015',
-    'HorizontalLine;': '\u2500',
-    'Hscr;': '\u210b',
-    'hscr;': '\U0001d4bd',
-    'hslash;': '\u210f',
-    'Hstrok;': '\u0126',
-    'hstrok;': '\u0127',
-    'HumpDownHump;': '\u224e',
-    'HumpEqual;': '\u224f',
-    'hybull;': '\u2043',
-    'hyphen;': '\u2010',
-    'Iacute': '\xcd',
-    'iacute': '\xed',
-    'Iacute;': '\xcd',
-    'iacute;': '\xed',
-    'ic;': '\u2063',
-    'Icirc': '\xce',
-    'icirc': '\xee',
-    'Icirc;': '\xce',
-    'icirc;': '\xee',
-    'Icy;': '\u0418',
-    'icy;': '\u0438',
-    'Idot;': '\u0130',
-    'IEcy;': '\u0415',
-    'iecy;': '\u0435',
-    'iexcl': '\xa1',
-    'iexcl;': '\xa1',
-    'iff;': '\u21d4',
-    'Ifr;': '\u2111',
-    'ifr;': '\U0001d526',
-    'Igrave': '\xcc',
-    'igrave': '\xec',
-    'Igrave;': '\xcc',
-    'igrave;': '\xec',
-    'ii;': '\u2148',
-    'iiiint;': '\u2a0c',
-    'iiint;': '\u222d',
-    'iinfin;': '\u29dc',
-    'iiota;': '\u2129',
-    'IJlig;': '\u0132',
-    'ijlig;': '\u0133',
-    'Im;': '\u2111',
-    'Imacr;': '\u012a',
-    'imacr;': '\u012b',
-    'image;': '\u2111',
-    'ImaginaryI;': '\u2148',
-    'imagline;': '\u2110',
-    'imagpart;': '\u2111',
-    'imath;': '\u0131',
-    'imof;': '\u22b7',
-    'imped;': '\u01b5',
-    'Implies;': '\u21d2',
-    'in;': '\u2208',
-    'incare;': '\u2105',
-    'infin;': '\u221e',
-    'infintie;': '\u29dd',
-    'inodot;': '\u0131',
-    'Int;': '\u222c',
-    'int;': '\u222b',
-    'intcal;': '\u22ba',
-    'integers;': '\u2124',
-    'Integral;': '\u222b',
-    'intercal;': '\u22ba',
-    'Intersection;': '\u22c2',
-    'intlarhk;': '\u2a17',
-    'intprod;': '\u2a3c',
-    'InvisibleComma;': '\u2063',
-    'InvisibleTimes;': '\u2062',
-    'IOcy;': '\u0401',
-    'iocy;': '\u0451',
-    'Iogon;': '\u012e',
-    'iogon;': '\u012f',
-    'Iopf;': '\U0001d540',
-    'iopf;': '\U0001d55a',
-    'Iota;': '\u0399',
-    'iota;': '\u03b9',
-    'iprod;': '\u2a3c',
-    'iquest': '\xbf',
-    'iquest;': '\xbf',
-    'Iscr;': '\u2110',
-    'iscr;': '\U0001d4be',
-    'isin;': '\u2208',
-    'isindot;': '\u22f5',
-    'isinE;': '\u22f9',
-    'isins;': '\u22f4',
-    'isinsv;': '\u22f3',
-    'isinv;': '\u2208',
-    'it;': '\u2062',
-    'Itilde;': '\u0128',
-    'itilde;': '\u0129',
-    'Iukcy;': '\u0406',
-    'iukcy;': '\u0456',
-    'Iuml': '\xcf',
-    'iuml': '\xef',
-    'Iuml;': '\xcf',
-    'iuml;': '\xef',
-    'Jcirc;': '\u0134',
-    'jcirc;': '\u0135',
-    'Jcy;': '\u0419',
-    'jcy;': '\u0439',
-    'Jfr;': '\U0001d50d',
-    'jfr;': '\U0001d527',
-    'jmath;': '\u0237',
-    'Jopf;': '\U0001d541',
-    'jopf;': '\U0001d55b',
-    'Jscr;': '\U0001d4a5',
-    'jscr;': '\U0001d4bf',
-    'Jsercy;': '\u0408',
-    'jsercy;': '\u0458',
-    'Jukcy;': '\u0404',
-    'jukcy;': '\u0454',
-    'Kappa;': '\u039a',
-    'kappa;': '\u03ba',
-    'kappav;': '\u03f0',
-    'Kcedil;': '\u0136',
-    'kcedil;': '\u0137',
-    'Kcy;': '\u041a',
-    'kcy;': '\u043a',
-    'Kfr;': '\U0001d50e',
-    'kfr;': '\U0001d528',
-    'kgreen;': '\u0138',
-    'KHcy;': '\u0425',
-    'khcy;': '\u0445',
-    'KJcy;': '\u040c',
-    'kjcy;': '\u045c',
-    'Kopf;': '\U0001d542',
-    'kopf;': '\U0001d55c',
-    'Kscr;': '\U0001d4a6',
-    'kscr;': '\U0001d4c0',
-    'lAarr;': '\u21da',
-    'Lacute;': '\u0139',
-    'lacute;': '\u013a',
-    'laemptyv;': '\u29b4',
-    'lagran;': '\u2112',
-    'Lambda;': '\u039b',
-    'lambda;': '\u03bb',
-    'Lang;': '\u27ea',
-    'lang;': '\u27e8',
-    'langd;': '\u2991',
-    'langle;': '\u27e8',
-    'lap;': '\u2a85',
-    'Laplacetrf;': '\u2112',
-    'laquo': '\xab',
-    'laquo;': '\xab',
-    'Larr;': '\u219e',
-    'lArr;': '\u21d0',
-    'larr;': '\u2190',
-    'larrb;': '\u21e4',
-    'larrbfs;': '\u291f',
-    'larrfs;': '\u291d',
-    'larrhk;': '\u21a9',
-    'larrlp;': '\u21ab',
-    'larrpl;': '\u2939',
-    'larrsim;': '\u2973',
-    'larrtl;': '\u21a2',
-    'lat;': '\u2aab',
-    'lAtail;': '\u291b',
-    'latail;': '\u2919',
-    'late;': '\u2aad',
-    'lates;': '\u2aad\ufe00',
-    'lBarr;': '\u290e',
-    'lbarr;': '\u290c',
-    'lbbrk;': '\u2772',
-    'lbrace;': '{',
-    'lbrack;': '[',
-    'lbrke;': '\u298b',
-    'lbrksld;': '\u298f',
-    'lbrkslu;': '\u298d',
-    'Lcaron;': '\u013d',
-    'lcaron;': '\u013e',
-    'Lcedil;': '\u013b',
-    'lcedil;': '\u013c',
-    'lceil;': '\u2308',
-    'lcub;': '{',
-    'Lcy;': '\u041b',
-    'lcy;': '\u043b',
-    'ldca;': '\u2936',
-    'ldquo;': '\u201c',
-    'ldquor;': '\u201e',
-    'ldrdhar;': '\u2967',
-    'ldrushar;': '\u294b',
-    'ldsh;': '\u21b2',
-    'lE;': '\u2266',
-    'le;': '\u2264',
-    'LeftAngleBracket;': '\u27e8',
-    'LeftArrow;': '\u2190',
-    'Leftarrow;': '\u21d0',
-    'leftarrow;': '\u2190',
-    'LeftArrowBar;': '\u21e4',
-    'LeftArrowRightArrow;': '\u21c6',
-    'leftarrowtail;': '\u21a2',
-    'LeftCeiling;': '\u2308',
-    'LeftDoubleBracket;': '\u27e6',
-    'LeftDownTeeVector;': '\u2961',
-    'LeftDownVector;': '\u21c3',
-    'LeftDownVectorBar;': '\u2959',
-    'LeftFloor;': '\u230a',
-    'leftharpoondown;': '\u21bd',
-    'leftharpoonup;': '\u21bc',
-    'leftleftarrows;': '\u21c7',
-    'LeftRightArrow;': '\u2194',
-    'Leftrightarrow;': '\u21d4',
-    'leftrightarrow;': '\u2194',
-    'leftrightarrows;': '\u21c6',
-    'leftrightharpoons;': '\u21cb',
-    'leftrightsquigarrow;': '\u21ad',
-    'LeftRightVector;': '\u294e',
-    'LeftTee;': '\u22a3',
-    'LeftTeeArrow;': '\u21a4',
-    'LeftTeeVector;': '\u295a',
-    'leftthreetimes;': '\u22cb',
-    'LeftTriangle;': '\u22b2',
-    'LeftTriangleBar;': '\u29cf',
-    'LeftTriangleEqual;': '\u22b4',
-    'LeftUpDownVector;': '\u2951',
-    'LeftUpTeeVector;': '\u2960',
-    'LeftUpVector;': '\u21bf',
-    'LeftUpVectorBar;': '\u2958',
-    'LeftVector;': '\u21bc',
-    'LeftVectorBar;': '\u2952',
-    'lEg;': '\u2a8b',
-    'leg;': '\u22da',
-    'leq;': '\u2264',
-    'leqq;': '\u2266',
-    'leqslant;': '\u2a7d',
-    'les;': '\u2a7d',
-    'lescc;': '\u2aa8',
-    'lesdot;': '\u2a7f',
-    'lesdoto;': '\u2a81',
-    'lesdotor;': '\u2a83',
-    'lesg;': '\u22da\ufe00',
-    'lesges;': '\u2a93',
-    'lessapprox;': '\u2a85',
-    'lessdot;': '\u22d6',
-    'lesseqgtr;': '\u22da',
-    'lesseqqgtr;': '\u2a8b',
-    'LessEqualGreater;': '\u22da',
-    'LessFullEqual;': '\u2266',
-    'LessGreater;': '\u2276',
-    'lessgtr;': '\u2276',
-    'LessLess;': '\u2aa1',
-    'lesssim;': '\u2272',
-    'LessSlantEqual;': '\u2a7d',
-    'LessTilde;': '\u2272',
-    'lfisht;': '\u297c',
-    'lfloor;': '\u230a',
-    'Lfr;': '\U0001d50f',
-    'lfr;': '\U0001d529',
-    'lg;': '\u2276',
-    'lgE;': '\u2a91',
-    'lHar;': '\u2962',
-    'lhard;': '\u21bd',
-    'lharu;': '\u21bc',
-    'lharul;': '\u296a',
-    'lhblk;': '\u2584',
-    'LJcy;': '\u0409',
-    'ljcy;': '\u0459',
-    'Ll;': '\u22d8',
-    'll;': '\u226a',
-    'llarr;': '\u21c7',
-    'llcorner;': '\u231e',
-    'Lleftarrow;': '\u21da',
-    'llhard;': '\u296b',
-    'lltri;': '\u25fa',
-    'Lmidot;': '\u013f',
-    'lmidot;': '\u0140',
-    'lmoust;': '\u23b0',
-    'lmoustache;': '\u23b0',
-    'lnap;': '\u2a89',
-    'lnapprox;': '\u2a89',
-    'lnE;': '\u2268',
-    'lne;': '\u2a87',
-    'lneq;': '\u2a87',
-    'lneqq;': '\u2268',
-    'lnsim;': '\u22e6',
-    'loang;': '\u27ec',
-    'loarr;': '\u21fd',
-    'lobrk;': '\u27e6',
-    'LongLeftArrow;': '\u27f5',
-    'Longleftarrow;': '\u27f8',
-    'longleftarrow;': '\u27f5',
-    'LongLeftRightArrow;': '\u27f7',
-    'Longleftrightarrow;': '\u27fa',
-    'longleftrightarrow;': '\u27f7',
-    'longmapsto;': '\u27fc',
-    'LongRightArrow;': '\u27f6',
-    'Longrightarrow;': '\u27f9',
-    'longrightarrow;': '\u27f6',
-    'looparrowleft;': '\u21ab',
-    'looparrowright;': '\u21ac',
-    'lopar;': '\u2985',
-    'Lopf;': '\U0001d543',
-    'lopf;': '\U0001d55d',
-    'loplus;': '\u2a2d',
-    'lotimes;': '\u2a34',
-    'lowast;': '\u2217',
-    'lowbar;': '_',
-    'LowerLeftArrow;': '\u2199',
-    'LowerRightArrow;': '\u2198',
-    'loz;': '\u25ca',
-    'lozenge;': '\u25ca',
-    'lozf;': '\u29eb',
-    'lpar;': '(',
-    'lparlt;': '\u2993',
-    'lrarr;': '\u21c6',
-    'lrcorner;': '\u231f',
-    'lrhar;': '\u21cb',
-    'lrhard;': '\u296d',
-    'lrm;': '\u200e',
-    'lrtri;': '\u22bf',
-    'lsaquo;': '\u2039',
-    'Lscr;': '\u2112',
-    'lscr;': '\U0001d4c1',
-    'Lsh;': '\u21b0',
-    'lsh;': '\u21b0',
-    'lsim;': '\u2272',
-    'lsime;': '\u2a8d',
-    'lsimg;': '\u2a8f',
-    'lsqb;': '[',
-    'lsquo;': '\u2018',
-    'lsquor;': '\u201a',
-    'Lstrok;': '\u0141',
-    'lstrok;': '\u0142',
-    'LT': '<',
-    'lt': '<',
-    'LT;': '<',
-    'Lt;': '\u226a',
-    'lt;': '<',
-    'ltcc;': '\u2aa6',
-    'ltcir;': '\u2a79',
-    'ltdot;': '\u22d6',
-    'lthree;': '\u22cb',
-    'ltimes;': '\u22c9',
-    'ltlarr;': '\u2976',
-    'ltquest;': '\u2a7b',
-    'ltri;': '\u25c3',
-    'ltrie;': '\u22b4',
-    'ltrif;': '\u25c2',
-    'ltrPar;': '\u2996',
-    'lurdshar;': '\u294a',
-    'luruhar;': '\u2966',
-    'lvertneqq;': '\u2268\ufe00',
-    'lvnE;': '\u2268\ufe00',
-    'macr': '\xaf',
-    'macr;': '\xaf',
-    'male;': '\u2642',
-    'malt;': '\u2720',
-    'maltese;': '\u2720',
-    'Map;': '\u2905',
-    'map;': '\u21a6',
-    'mapsto;': '\u21a6',
-    'mapstodown;': '\u21a7',
-    'mapstoleft;': '\u21a4',
-    'mapstoup;': '\u21a5',
-    'marker;': '\u25ae',
-    'mcomma;': '\u2a29',
-    'Mcy;': '\u041c',
-    'mcy;': '\u043c',
-    'mdash;': '\u2014',
-    'mDDot;': '\u223a',
-    'measuredangle;': '\u2221',
-    'MediumSpace;': '\u205f',
-    'Mellintrf;': '\u2133',
-    'Mfr;': '\U0001d510',
-    'mfr;': '\U0001d52a',
-    'mho;': '\u2127',
-    'micro': '\xb5',
-    'micro;': '\xb5',
-    'mid;': '\u2223',
-    'midast;': '*',
-    'midcir;': '\u2af0',
-    'middot': '\xb7',
-    'middot;': '\xb7',
-    'minus;': '\u2212',
-    'minusb;': '\u229f',
-    'minusd;': '\u2238',
-    'minusdu;': '\u2a2a',
-    'MinusPlus;': '\u2213',
-    'mlcp;': '\u2adb',
-    'mldr;': '\u2026',
-    'mnplus;': '\u2213',
-    'models;': '\u22a7',
-    'Mopf;': '\U0001d544',
-    'mopf;': '\U0001d55e',
-    'mp;': '\u2213',
-    'Mscr;': '\u2133',
-    'mscr;': '\U0001d4c2',
-    'mstpos;': '\u223e',
-    'Mu;': '\u039c',
-    'mu;': '\u03bc',
-    'multimap;': '\u22b8',
-    'mumap;': '\u22b8',
-    'nabla;': '\u2207',
-    'Nacute;': '\u0143',
-    'nacute;': '\u0144',
-    'nang;': '\u2220\u20d2',
-    'nap;': '\u2249',
-    'napE;': '\u2a70\u0338',
-    'napid;': '\u224b\u0338',
-    'napos;': '\u0149',
-    'napprox;': '\u2249',
-    'natur;': '\u266e',
-    'natural;': '\u266e',
-    'naturals;': '\u2115',
-    'nbsp': '\xa0',
-    'nbsp;': '\xa0',
-    'nbump;': '\u224e\u0338',
-    'nbumpe;': '\u224f\u0338',
-    'ncap;': '\u2a43',
-    'Ncaron;': '\u0147',
-    'ncaron;': '\u0148',
-    'Ncedil;': '\u0145',
-    'ncedil;': '\u0146',
-    'ncong;': '\u2247',
-    'ncongdot;': '\u2a6d\u0338',
-    'ncup;': '\u2a42',
-    'Ncy;': '\u041d',
-    'ncy;': '\u043d',
-    'ndash;': '\u2013',
-    'ne;': '\u2260',
-    'nearhk;': '\u2924',
-    'neArr;': '\u21d7',
-    'nearr;': '\u2197',
-    'nearrow;': '\u2197',
-    'nedot;': '\u2250\u0338',
-    'NegativeMediumSpace;': '\u200b',
-    'NegativeThickSpace;': '\u200b',
-    'NegativeThinSpace;': '\u200b',
-    'NegativeVeryThinSpace;': '\u200b',
-    'nequiv;': '\u2262',
-    'nesear;': '\u2928',
-    'nesim;': '\u2242\u0338',
-    'NestedGreaterGreater;': '\u226b',
-    'NestedLessLess;': '\u226a',
-    'NewLine;': '\n',
-    'nexist;': '\u2204',
-    'nexists;': '\u2204',
-    'Nfr;': '\U0001d511',
-    'nfr;': '\U0001d52b',
-    'ngE;': '\u2267\u0338',
-    'nge;': '\u2271',
-    'ngeq;': '\u2271',
-    'ngeqq;': '\u2267\u0338',
-    'ngeqslant;': '\u2a7e\u0338',
-    'nges;': '\u2a7e\u0338',
-    'nGg;': '\u22d9\u0338',
-    'ngsim;': '\u2275',
-    'nGt;': '\u226b\u20d2',
-    'ngt;': '\u226f',
-    'ngtr;': '\u226f',
-    'nGtv;': '\u226b\u0338',
-    'nhArr;': '\u21ce',
-    'nharr;': '\u21ae',
-    'nhpar;': '\u2af2',
-    'ni;': '\u220b',
-    'nis;': '\u22fc',
-    'nisd;': '\u22fa',
-    'niv;': '\u220b',
-    'NJcy;': '\u040a',
-    'njcy;': '\u045a',
-    'nlArr;': '\u21cd',
-    'nlarr;': '\u219a',
-    'nldr;': '\u2025',
-    'nlE;': '\u2266\u0338',
-    'nle;': '\u2270',
-    'nLeftarrow;': '\u21cd',
-    'nleftarrow;': '\u219a',
-    'nLeftrightarrow;': '\u21ce',
-    'nleftrightarrow;': '\u21ae',
-    'nleq;': '\u2270',
-    'nleqq;': '\u2266\u0338',
-    'nleqslant;': '\u2a7d\u0338',
-    'nles;': '\u2a7d\u0338',
-    'nless;': '\u226e',
-    'nLl;': '\u22d8\u0338',
-    'nlsim;': '\u2274',
-    'nLt;': '\u226a\u20d2',
-    'nlt;': '\u226e',
-    'nltri;': '\u22ea',
-    'nltrie;': '\u22ec',
-    'nLtv;': '\u226a\u0338',
-    'nmid;': '\u2224',
-    'NoBreak;': '\u2060',
-    'NonBreakingSpace;': '\xa0',
-    'Nopf;': '\u2115',
-    'nopf;': '\U0001d55f',
-    'not': '\xac',
-    'Not;': '\u2aec',
-    'not;': '\xac',
-    'NotCongruent;': '\u2262',
-    'NotCupCap;': '\u226d',
-    'NotDoubleVerticalBar;': '\u2226',
-    'NotElement;': '\u2209',
-    'NotEqual;': '\u2260',
-    'NotEqualTilde;': '\u2242\u0338',
-    'NotExists;': '\u2204',
-    'NotGreater;': '\u226f',
-    'NotGreaterEqual;': '\u2271',
-    'NotGreaterFullEqual;': '\u2267\u0338',
-    'NotGreaterGreater;': '\u226b\u0338',
-    'NotGreaterLess;': '\u2279',
-    'NotGreaterSlantEqual;': '\u2a7e\u0338',
-    'NotGreaterTilde;': '\u2275',
-    'NotHumpDownHump;': '\u224e\u0338',
-    'NotHumpEqual;': '\u224f\u0338',
-    'notin;': '\u2209',
-    'notindot;': '\u22f5\u0338',
-    'notinE;': '\u22f9\u0338',
-    'notinva;': '\u2209',
-    'notinvb;': '\u22f7',
-    'notinvc;': '\u22f6',
-    'NotLeftTriangle;': '\u22ea',
-    'NotLeftTriangleBar;': '\u29cf\u0338',
-    'NotLeftTriangleEqual;': '\u22ec',
-    'NotLess;': '\u226e',
-    'NotLessEqual;': '\u2270',
-    'NotLessGreater;': '\u2278',
-    'NotLessLess;': '\u226a\u0338',
-    'NotLessSlantEqual;': '\u2a7d\u0338',
-    'NotLessTilde;': '\u2274',
-    'NotNestedGreaterGreater;': '\u2aa2\u0338',
-    'NotNestedLessLess;': '\u2aa1\u0338',
-    'notni;': '\u220c',
-    'notniva;': '\u220c',
-    'notnivb;': '\u22fe',
-    'notnivc;': '\u22fd',
-    'NotPrecedes;': '\u2280',
-    'NotPrecedesEqual;': '\u2aaf\u0338',
-    'NotPrecedesSlantEqual;': '\u22e0',
-    'NotReverseElement;': '\u220c',
-    'NotRightTriangle;': '\u22eb',
-    'NotRightTriangleBar;': '\u29d0\u0338',
-    'NotRightTriangleEqual;': '\u22ed',
-    'NotSquareSubset;': '\u228f\u0338',
-    'NotSquareSubsetEqual;': '\u22e2',
-    'NotSquareSuperset;': '\u2290\u0338',
-    'NotSquareSupersetEqual;': '\u22e3',
-    'NotSubset;': '\u2282\u20d2',
-    'NotSubsetEqual;': '\u2288',
-    'NotSucceeds;': '\u2281',
-    'NotSucceedsEqual;': '\u2ab0\u0338',
-    'NotSucceedsSlantEqual;': '\u22e1',
-    'NotSucceedsTilde;': '\u227f\u0338',
-    'NotSuperset;': '\u2283\u20d2',
-    'NotSupersetEqual;': '\u2289',
-    'NotTilde;': '\u2241',
-    'NotTildeEqual;': '\u2244',
-    'NotTildeFullEqual;': '\u2247',
-    'NotTildeTilde;': '\u2249',
-    'NotVerticalBar;': '\u2224',
-    'npar;': '\u2226',
-    'nparallel;': '\u2226',
-    'nparsl;': '\u2afd\u20e5',
-    'npart;': '\u2202\u0338',
-    'npolint;': '\u2a14',
-    'npr;': '\u2280',
-    'nprcue;': '\u22e0',
-    'npre;': '\u2aaf\u0338',
-    'nprec;': '\u2280',
-    'npreceq;': '\u2aaf\u0338',
-    'nrArr;': '\u21cf',
-    'nrarr;': '\u219b',
-    'nrarrc;': '\u2933\u0338',
-    'nrarrw;': '\u219d\u0338',
-    'nRightarrow;': '\u21cf',
-    'nrightarrow;': '\u219b',
-    'nrtri;': '\u22eb',
-    'nrtrie;': '\u22ed',
-    'nsc;': '\u2281',
-    'nsccue;': '\u22e1',
-    'nsce;': '\u2ab0\u0338',
-    'Nscr;': '\U0001d4a9',
-    'nscr;': '\U0001d4c3',
-    'nshortmid;': '\u2224',
-    'nshortparallel;': '\u2226',
-    'nsim;': '\u2241',
-    'nsime;': '\u2244',
-    'nsimeq;': '\u2244',
-    'nsmid;': '\u2224',
-    'nspar;': '\u2226',
-    'nsqsube;': '\u22e2',
-    'nsqsupe;': '\u22e3',
-    'nsub;': '\u2284',
-    'nsubE;': '\u2ac5\u0338',
-    'nsube;': '\u2288',
-    'nsubset;': '\u2282\u20d2',
-    'nsubseteq;': '\u2288',
-    'nsubseteqq;': '\u2ac5\u0338',
-    'nsucc;': '\u2281',
-    'nsucceq;': '\u2ab0\u0338',
-    'nsup;': '\u2285',
-    'nsupE;': '\u2ac6\u0338',
-    'nsupe;': '\u2289',
-    'nsupset;': '\u2283\u20d2',
-    'nsupseteq;': '\u2289',
-    'nsupseteqq;': '\u2ac6\u0338',
-    'ntgl;': '\u2279',
-    'Ntilde': '\xd1',
-    'ntilde': '\xf1',
-    'Ntilde;': '\xd1',
-    'ntilde;': '\xf1',
-    'ntlg;': '\u2278',
-    'ntriangleleft;': '\u22ea',
-    'ntrianglelefteq;': '\u22ec',
-    'ntriangleright;': '\u22eb',
-    'ntrianglerighteq;': '\u22ed',
-    'Nu;': '\u039d',
-    'nu;': '\u03bd',
-    'num;': '#',
-    'numero;': '\u2116',
-    'numsp;': '\u2007',
-    'nvap;': '\u224d\u20d2',
-    'nVDash;': '\u22af',
-    'nVdash;': '\u22ae',
-    'nvDash;': '\u22ad',
-    'nvdash;': '\u22ac',
-    'nvge;': '\u2265\u20d2',
-    'nvgt;': '>\u20d2',
-    'nvHarr;': '\u2904',
-    'nvinfin;': '\u29de',
-    'nvlArr;': '\u2902',
-    'nvle;': '\u2264\u20d2',
-    'nvlt;': '<\u20d2',
-    'nvltrie;': '\u22b4\u20d2',
-    'nvrArr;': '\u2903',
-    'nvrtrie;': '\u22b5\u20d2',
-    'nvsim;': '\u223c\u20d2',
-    'nwarhk;': '\u2923',
-    'nwArr;': '\u21d6',
-    'nwarr;': '\u2196',
-    'nwarrow;': '\u2196',
-    'nwnear;': '\u2927',
-    'Oacute': '\xd3',
-    'oacute': '\xf3',
-    'Oacute;': '\xd3',
-    'oacute;': '\xf3',
-    'oast;': '\u229b',
-    'ocir;': '\u229a',
-    'Ocirc': '\xd4',
-    'ocirc': '\xf4',
-    'Ocirc;': '\xd4',
-    'ocirc;': '\xf4',
-    'Ocy;': '\u041e',
-    'ocy;': '\u043e',
-    'odash;': '\u229d',
-    'Odblac;': '\u0150',
-    'odblac;': '\u0151',
-    'odiv;': '\u2a38',
-    'odot;': '\u2299',
-    'odsold;': '\u29bc',
-    'OElig;': '\u0152',
-    'oelig;': '\u0153',
-    'ofcir;': '\u29bf',
-    'Ofr;': '\U0001d512',
-    'ofr;': '\U0001d52c',
-    'ogon;': '\u02db',
-    'Ograve': '\xd2',
-    'ograve': '\xf2',
-    'Ograve;': '\xd2',
-    'ograve;': '\xf2',
-    'ogt;': '\u29c1',
-    'ohbar;': '\u29b5',
-    'ohm;': '\u03a9',
-    'oint;': '\u222e',
-    'olarr;': '\u21ba',
-    'olcir;': '\u29be',
-    'olcross;': '\u29bb',
-    'oline;': '\u203e',
-    'olt;': '\u29c0',
-    'Omacr;': '\u014c',
-    'omacr;': '\u014d',
-    'Omega;': '\u03a9',
-    'omega;': '\u03c9',
-    'Omicron;': '\u039f',
-    'omicron;': '\u03bf',
-    'omid;': '\u29b6',
-    'ominus;': '\u2296',
-    'Oopf;': '\U0001d546',
-    'oopf;': '\U0001d560',
-    'opar;': '\u29b7',
-    'OpenCurlyDoubleQuote;': '\u201c',
-    'OpenCurlyQuote;': '\u2018',
-    'operp;': '\u29b9',
-    'oplus;': '\u2295',
-    'Or;': '\u2a54',
-    'or;': '\u2228',
-    'orarr;': '\u21bb',
-    'ord;': '\u2a5d',
-    'order;': '\u2134',
-    'orderof;': '\u2134',
-    'ordf': '\xaa',
-    'ordf;': '\xaa',
-    'ordm': '\xba',
-    'ordm;': '\xba',
-    'origof;': '\u22b6',
-    'oror;': '\u2a56',
-    'orslope;': '\u2a57',
-    'orv;': '\u2a5b',
-    'oS;': '\u24c8',
-    'Oscr;': '\U0001d4aa',
-    'oscr;': '\u2134',
-    'Oslash': '\xd8',
-    'oslash': '\xf8',
-    'Oslash;': '\xd8',
-    'oslash;': '\xf8',
-    'osol;': '\u2298',
-    'Otilde': '\xd5',
-    'otilde': '\xf5',
-    'Otilde;': '\xd5',
-    'otilde;': '\xf5',
-    'Otimes;': '\u2a37',
-    'otimes;': '\u2297',
-    'otimesas;': '\u2a36',
-    'Ouml': '\xd6',
-    'ouml': '\xf6',
-    'Ouml;': '\xd6',
-    'ouml;': '\xf6',
-    'ovbar;': '\u233d',
-    'OverBar;': '\u203e',
-    'OverBrace;': '\u23de',
-    'OverBracket;': '\u23b4',
-    'OverParenthesis;': '\u23dc',
-    'par;': '\u2225',
-    'para': '\xb6',
-    'para;': '\xb6',
-    'parallel;': '\u2225',
-    'parsim;': '\u2af3',
-    'parsl;': '\u2afd',
-    'part;': '\u2202',
-    'PartialD;': '\u2202',
-    'Pcy;': '\u041f',
-    'pcy;': '\u043f',
-    'percnt;': '%',
-    'period;': '.',
-    'permil;': '\u2030',
-    'perp;': '\u22a5',
-    'pertenk;': '\u2031',
-    'Pfr;': '\U0001d513',
-    'pfr;': '\U0001d52d',
-    'Phi;': '\u03a6',
-    'phi;': '\u03c6',
-    'phiv;': '\u03d5',
-    'phmmat;': '\u2133',
-    'phone;': '\u260e',
-    'Pi;': '\u03a0',
-    'pi;': '\u03c0',
-    'pitchfork;': '\u22d4',
-    'piv;': '\u03d6',
-    'planck;': '\u210f',
-    'planckh;': '\u210e',
-    'plankv;': '\u210f',
-    'plus;': '+',
-    'plusacir;': '\u2a23',
-    'plusb;': '\u229e',
-    'pluscir;': '\u2a22',
-    'plusdo;': '\u2214',
-    'plusdu;': '\u2a25',
-    'pluse;': '\u2a72',
-    'PlusMinus;': '\xb1',
-    'plusmn': '\xb1',
-    'plusmn;': '\xb1',
-    'plussim;': '\u2a26',
-    'plustwo;': '\u2a27',
-    'pm;': '\xb1',
-    'Poincareplane;': '\u210c',
-    'pointint;': '\u2a15',
-    'Popf;': '\u2119',
-    'popf;': '\U0001d561',
-    'pound': '\xa3',
-    'pound;': '\xa3',
-    'Pr;': '\u2abb',
-    'pr;': '\u227a',
-    'prap;': '\u2ab7',
-    'prcue;': '\u227c',
-    'prE;': '\u2ab3',
-    'pre;': '\u2aaf',
-    'prec;': '\u227a',
-    'precapprox;': '\u2ab7',
-    'preccurlyeq;': '\u227c',
-    'Precedes;': '\u227a',
-    'PrecedesEqual;': '\u2aaf',
-    'PrecedesSlantEqual;': '\u227c',
-    'PrecedesTilde;': '\u227e',
-    'preceq;': '\u2aaf',
-    'precnapprox;': '\u2ab9',
-    'precneqq;': '\u2ab5',
-    'precnsim;': '\u22e8',
-    'precsim;': '\u227e',
-    'Prime;': '\u2033',
-    'prime;': '\u2032',
-    'primes;': '\u2119',
-    'prnap;': '\u2ab9',
-    'prnE;': '\u2ab5',
-    'prnsim;': '\u22e8',
-    'prod;': '\u220f',
-    'Product;': '\u220f',
-    'profalar;': '\u232e',
-    'profline;': '\u2312',
-    'profsurf;': '\u2313',
-    'prop;': '\u221d',
-    'Proportion;': '\u2237',
-    'Proportional;': '\u221d',
-    'propto;': '\u221d',
-    'prsim;': '\u227e',
-    'prurel;': '\u22b0',
-    'Pscr;': '\U0001d4ab',
-    'pscr;': '\U0001d4c5',
-    'Psi;': '\u03a8',
-    'psi;': '\u03c8',
-    'puncsp;': '\u2008',
-    'Qfr;': '\U0001d514',
-    'qfr;': '\U0001d52e',
-    'qint;': '\u2a0c',
-    'Qopf;': '\u211a',
-    'qopf;': '\U0001d562',
-    'qprime;': '\u2057',
-    'Qscr;': '\U0001d4ac',
-    'qscr;': '\U0001d4c6',
-    'quaternions;': '\u210d',
-    'quatint;': '\u2a16',
-    'quest;': '?',
-    'questeq;': '\u225f',
-    'QUOT': '"',
-    'quot': '"',
-    'QUOT;': '"',
-    'quot;': '"',
-    'rAarr;': '\u21db',
-    'race;': '\u223d\u0331',
-    'Racute;': '\u0154',
-    'racute;': '\u0155',
-    'radic;': '\u221a',
-    'raemptyv;': '\u29b3',
-    'Rang;': '\u27eb',
-    'rang;': '\u27e9',
-    'rangd;': '\u2992',
-    'range;': '\u29a5',
-    'rangle;': '\u27e9',
-    'raquo': '\xbb',
-    'raquo;': '\xbb',
-    'Rarr;': '\u21a0',
-    'rArr;': '\u21d2',
-    'rarr;': '\u2192',
-    'rarrap;': '\u2975',
-    'rarrb;': '\u21e5',
-    'rarrbfs;': '\u2920',
-    'rarrc;': '\u2933',
-    'rarrfs;': '\u291e',
-    'rarrhk;': '\u21aa',
-    'rarrlp;': '\u21ac',
-    'rarrpl;': '\u2945',
-    'rarrsim;': '\u2974',
-    'Rarrtl;': '\u2916',
-    'rarrtl;': '\u21a3',
-    'rarrw;': '\u219d',
-    'rAtail;': '\u291c',
-    'ratail;': '\u291a',
-    'ratio;': '\u2236',
-    'rationals;': '\u211a',
-    'RBarr;': '\u2910',
-    'rBarr;': '\u290f',
-    'rbarr;': '\u290d',
-    'rbbrk;': '\u2773',
-    'rbrace;': '}',
-    'rbrack;': ']',
-    'rbrke;': '\u298c',
-    'rbrksld;': '\u298e',
-    'rbrkslu;': '\u2990',
-    'Rcaron;': '\u0158',
-    'rcaron;': '\u0159',
-    'Rcedil;': '\u0156',
-    'rcedil;': '\u0157',
-    'rceil;': '\u2309',
-    'rcub;': '}',
-    'Rcy;': '\u0420',
-    'rcy;': '\u0440',
-    'rdca;': '\u2937',
-    'rdldhar;': '\u2969',
-    'rdquo;': '\u201d',
-    'rdquor;': '\u201d',
-    'rdsh;': '\u21b3',
-    'Re;': '\u211c',
-    'real;': '\u211c',
-    'realine;': '\u211b',
-    'realpart;': '\u211c',
-    'reals;': '\u211d',
-    'rect;': '\u25ad',
-    'REG': '\xae',
-    'reg': '\xae',
-    'REG;': '\xae',
-    'reg;': '\xae',
-    'ReverseElement;': '\u220b',
-    'ReverseEquilibrium;': '\u21cb',
-    'ReverseUpEquilibrium;': '\u296f',
-    'rfisht;': '\u297d',
-    'rfloor;': '\u230b',
-    'Rfr;': '\u211c',
-    'rfr;': '\U0001d52f',
-    'rHar;': '\u2964',
-    'rhard;': '\u21c1',
-    'rharu;': '\u21c0',
-    'rharul;': '\u296c',
-    'Rho;': '\u03a1',
-    'rho;': '\u03c1',
-    'rhov;': '\u03f1',
-    'RightAngleBracket;': '\u27e9',
-    'RightArrow;': '\u2192',
-    'Rightarrow;': '\u21d2',
-    'rightarrow;': '\u2192',
-    'RightArrowBar;': '\u21e5',
-    'RightArrowLeftArrow;': '\u21c4',
-    'rightarrowtail;': '\u21a3',
-    'RightCeiling;': '\u2309',
-    'RightDoubleBracket;': '\u27e7',
-    'RightDownTeeVector;': '\u295d',
-    'RightDownVector;': '\u21c2',
-    'RightDownVectorBar;': '\u2955',
-    'RightFloor;': '\u230b',
-    'rightharpoondown;': '\u21c1',
-    'rightharpoonup;': '\u21c0',
-    'rightleftarrows;': '\u21c4',
-    'rightleftharpoons;': '\u21cc',
-    'rightrightarrows;': '\u21c9',
-    'rightsquigarrow;': '\u219d',
-    'RightTee;': '\u22a2',
-    'RightTeeArrow;': '\u21a6',
-    'RightTeeVector;': '\u295b',
-    'rightthreetimes;': '\u22cc',
-    'RightTriangle;': '\u22b3',
-    'RightTriangleBar;': '\u29d0',
-    'RightTriangleEqual;': '\u22b5',
-    'RightUpDownVector;': '\u294f',
-    'RightUpTeeVector;': '\u295c',
-    'RightUpVector;': '\u21be',
-    'RightUpVectorBar;': '\u2954',
-    'RightVector;': '\u21c0',
-    'RightVectorBar;': '\u2953',
-    'ring;': '\u02da',
-    'risingdotseq;': '\u2253',
-    'rlarr;': '\u21c4',
-    'rlhar;': '\u21cc',
-    'rlm;': '\u200f',
-    'rmoust;': '\u23b1',
-    'rmoustache;': '\u23b1',
-    'rnmid;': '\u2aee',
-    'roang;': '\u27ed',
-    'roarr;': '\u21fe',
-    'robrk;': '\u27e7',
-    'ropar;': '\u2986',
-    'Ropf;': '\u211d',
-    'ropf;': '\U0001d563',
-    'roplus;': '\u2a2e',
-    'rotimes;': '\u2a35',
-    'RoundImplies;': '\u2970',
-    'rpar;': ')',
-    'rpargt;': '\u2994',
-    'rppolint;': '\u2a12',
-    'rrarr;': '\u21c9',
-    'Rrightarrow;': '\u21db',
-    'rsaquo;': '\u203a',
-    'Rscr;': '\u211b',
-    'rscr;': '\U0001d4c7',
-    'Rsh;': '\u21b1',
-    'rsh;': '\u21b1',
-    'rsqb;': ']',
-    'rsquo;': '\u2019',
-    'rsquor;': '\u2019',
-    'rthree;': '\u22cc',
-    'rtimes;': '\u22ca',
-    'rtri;': '\u25b9',
-    'rtrie;': '\u22b5',
-    'rtrif;': '\u25b8',
-    'rtriltri;': '\u29ce',
-    'RuleDelayed;': '\u29f4',
-    'ruluhar;': '\u2968',
-    'rx;': '\u211e',
-    'Sacute;': '\u015a',
-    'sacute;': '\u015b',
-    'sbquo;': '\u201a',
-    'Sc;': '\u2abc',
-    'sc;': '\u227b',
-    'scap;': '\u2ab8',
-    'Scaron;': '\u0160',
-    'scaron;': '\u0161',
-    'sccue;': '\u227d',
-    'scE;': '\u2ab4',
-    'sce;': '\u2ab0',
-    'Scedil;': '\u015e',
-    'scedil;': '\u015f',
-    'Scirc;': '\u015c',
-    'scirc;': '\u015d',
-    'scnap;': '\u2aba',
-    'scnE;': '\u2ab6',
-    'scnsim;': '\u22e9',
-    'scpolint;': '\u2a13',
-    'scsim;': '\u227f',
-    'Scy;': '\u0421',
-    'scy;': '\u0441',
-    'sdot;': '\u22c5',
-    'sdotb;': '\u22a1',
-    'sdote;': '\u2a66',
-    'searhk;': '\u2925',
-    'seArr;': '\u21d8',
-    'searr;': '\u2198',
-    'searrow;': '\u2198',
-    'sect': '\xa7',
-    'sect;': '\xa7',
-    'semi;': ';',
-    'seswar;': '\u2929',
-    'setminus;': '\u2216',
-    'setmn;': '\u2216',
-    'sext;': '\u2736',
-    'Sfr;': '\U0001d516',
-    'sfr;': '\U0001d530',
-    'sfrown;': '\u2322',
-    'sharp;': '\u266f',
-    'SHCHcy;': '\u0429',
-    'shchcy;': '\u0449',
-    'SHcy;': '\u0428',
-    'shcy;': '\u0448',
-    'ShortDownArrow;': '\u2193',
-    'ShortLeftArrow;': '\u2190',
-    'shortmid;': '\u2223',
-    'shortparallel;': '\u2225',
-    'ShortRightArrow;': '\u2192',
-    'ShortUpArrow;': '\u2191',
-    'shy': '\xad',
-    'shy;': '\xad',
-    'Sigma;': '\u03a3',
-    'sigma;': '\u03c3',
-    'sigmaf;': '\u03c2',
-    'sigmav;': '\u03c2',
-    'sim;': '\u223c',
-    'simdot;': '\u2a6a',
-    'sime;': '\u2243',
-    'simeq;': '\u2243',
-    'simg;': '\u2a9e',
-    'simgE;': '\u2aa0',
-    'siml;': '\u2a9d',
-    'simlE;': '\u2a9f',
-    'simne;': '\u2246',
-    'simplus;': '\u2a24',
-    'simrarr;': '\u2972',
-    'slarr;': '\u2190',
-    'SmallCircle;': '\u2218',
-    'smallsetminus;': '\u2216',
-    'smashp;': '\u2a33',
-    'smeparsl;': '\u29e4',
-    'smid;': '\u2223',
-    'smile;': '\u2323',
-    'smt;': '\u2aaa',
-    'smte;': '\u2aac',
-    'smtes;': '\u2aac\ufe00',
-    'SOFTcy;': '\u042c',
-    'softcy;': '\u044c',
-    'sol;': '/',
-    'solb;': '\u29c4',
-    'solbar;': '\u233f',
-    'Sopf;': '\U0001d54a',
-    'sopf;': '\U0001d564',
-    'spades;': '\u2660',
-    'spadesuit;': '\u2660',
-    'spar;': '\u2225',
-    'sqcap;': '\u2293',
-    'sqcaps;': '\u2293\ufe00',
-    'sqcup;': '\u2294',
-    'sqcups;': '\u2294\ufe00',
-    'Sqrt;': '\u221a',
-    'sqsub;': '\u228f',
-    'sqsube;': '\u2291',
-    'sqsubset;': '\u228f',
-    'sqsubseteq;': '\u2291',
-    'sqsup;': '\u2290',
-    'sqsupe;': '\u2292',
-    'sqsupset;': '\u2290',
-    'sqsupseteq;': '\u2292',
-    'squ;': '\u25a1',
-    'Square;': '\u25a1',
-    'square;': '\u25a1',
-    'SquareIntersection;': '\u2293',
-    'SquareSubset;': '\u228f',
-    'SquareSubsetEqual;': '\u2291',
-    'SquareSuperset;': '\u2290',
-    'SquareSupersetEqual;': '\u2292',
-    'SquareUnion;': '\u2294',
-    'squarf;': '\u25aa',
-    'squf;': '\u25aa',
-    'srarr;': '\u2192',
-    'Sscr;': '\U0001d4ae',
-    'sscr;': '\U0001d4c8',
-    'ssetmn;': '\u2216',
-    'ssmile;': '\u2323',
-    'sstarf;': '\u22c6',
-    'Star;': '\u22c6',
-    'star;': '\u2606',
-    'starf;': '\u2605',
-    'straightepsilon;': '\u03f5',
-    'straightphi;': '\u03d5',
-    'strns;': '\xaf',
-    'Sub;': '\u22d0',
-    'sub;': '\u2282',
-    'subdot;': '\u2abd',
-    'subE;': '\u2ac5',
-    'sube;': '\u2286',
-    'subedot;': '\u2ac3',
-    'submult;': '\u2ac1',
-    'subnE;': '\u2acb',
-    'subne;': '\u228a',
-    'subplus;': '\u2abf',
-    'subrarr;': '\u2979',
-    'Subset;': '\u22d0',
-    'subset;': '\u2282',
-    'subseteq;': '\u2286',
-    'subseteqq;': '\u2ac5',
-    'SubsetEqual;': '\u2286',
-    'subsetneq;': '\u228a',
-    'subsetneqq;': '\u2acb',
-    'subsim;': '\u2ac7',
-    'subsub;': '\u2ad5',
-    'subsup;': '\u2ad3',
-    'succ;': '\u227b',
-    'succapprox;': '\u2ab8',
-    'succcurlyeq;': '\u227d',
-    'Succeeds;': '\u227b',
-    'SucceedsEqual;': '\u2ab0',
-    'SucceedsSlantEqual;': '\u227d',
-    'SucceedsTilde;': '\u227f',
-    'succeq;': '\u2ab0',
-    'succnapprox;': '\u2aba',
-    'succneqq;': '\u2ab6',
-    'succnsim;': '\u22e9',
-    'succsim;': '\u227f',
-    'SuchThat;': '\u220b',
-    'Sum;': '\u2211',
-    'sum;': '\u2211',
-    'sung;': '\u266a',
-    'sup1': '\xb9',
-    'sup1;': '\xb9',
-    'sup2': '\xb2',
-    'sup2;': '\xb2',
-    'sup3': '\xb3',
-    'sup3;': '\xb3',
-    'Sup;': '\u22d1',
-    'sup;': '\u2283',
-    'supdot;': '\u2abe',
-    'supdsub;': '\u2ad8',
-    'supE;': '\u2ac6',
-    'supe;': '\u2287',
-    'supedot;': '\u2ac4',
-    'Superset;': '\u2283',
-    'SupersetEqual;': '\u2287',
-    'suphsol;': '\u27c9',
-    'suphsub;': '\u2ad7',
-    'suplarr;': '\u297b',
-    'supmult;': '\u2ac2',
-    'supnE;': '\u2acc',
-    'supne;': '\u228b',
-    'supplus;': '\u2ac0',
-    'Supset;': '\u22d1',
-    'supset;': '\u2283',
-    'supseteq;': '\u2287',
-    'supseteqq;': '\u2ac6',
-    'supsetneq;': '\u228b',
-    'supsetneqq;': '\u2acc',
-    'supsim;': '\u2ac8',
-    'supsub;': '\u2ad4',
-    'supsup;': '\u2ad6',
-    'swarhk;': '\u2926',
-    'swArr;': '\u21d9',
-    'swarr;': '\u2199',
-    'swarrow;': '\u2199',
-    'swnwar;': '\u292a',
-    'szlig': '\xdf',
-    'szlig;': '\xdf',
-    'Tab;': '\t',
-    'target;': '\u2316',
-    'Tau;': '\u03a4',
-    'tau;': '\u03c4',
-    'tbrk;': '\u23b4',
-    'Tcaron;': '\u0164',
-    'tcaron;': '\u0165',
-    'Tcedil;': '\u0162',
-    'tcedil;': '\u0163',
-    'Tcy;': '\u0422',
-    'tcy;': '\u0442',
-    'tdot;': '\u20db',
-    'telrec;': '\u2315',
-    'Tfr;': '\U0001d517',
-    'tfr;': '\U0001d531',
-    'there4;': '\u2234',
-    'Therefore;': '\u2234',
-    'therefore;': '\u2234',
-    'Theta;': '\u0398',
-    'theta;': '\u03b8',
-    'thetasym;': '\u03d1',
-    'thetav;': '\u03d1',
-    'thickapprox;': '\u2248',
-    'thicksim;': '\u223c',
-    'ThickSpace;': '\u205f\u200a',
-    'thinsp;': '\u2009',
-    'ThinSpace;': '\u2009',
-    'thkap;': '\u2248',
-    'thksim;': '\u223c',
-    'THORN': '\xde',
-    'thorn': '\xfe',
-    'THORN;': '\xde',
-    'thorn;': '\xfe',
-    'Tilde;': '\u223c',
-    'tilde;': '\u02dc',
-    'TildeEqual;': '\u2243',
-    'TildeFullEqual;': '\u2245',
-    'TildeTilde;': '\u2248',
-    'times': '\xd7',
-    'times;': '\xd7',
-    'timesb;': '\u22a0',
-    'timesbar;': '\u2a31',
-    'timesd;': '\u2a30',
-    'tint;': '\u222d',
-    'toea;': '\u2928',
-    'top;': '\u22a4',
-    'topbot;': '\u2336',
-    'topcir;': '\u2af1',
-    'Topf;': '\U0001d54b',
-    'topf;': '\U0001d565',
-    'topfork;': '\u2ada',
-    'tosa;': '\u2929',
-    'tprime;': '\u2034',
-    'TRADE;': '\u2122',
-    'trade;': '\u2122',
-    'triangle;': '\u25b5',
-    'triangledown;': '\u25bf',
-    'triangleleft;': '\u25c3',
-    'trianglelefteq;': '\u22b4',
-    'triangleq;': '\u225c',
-    'triangleright;': '\u25b9',
-    'trianglerighteq;': '\u22b5',
-    'tridot;': '\u25ec',
-    'trie;': '\u225c',
-    'triminus;': '\u2a3a',
-    'TripleDot;': '\u20db',
-    'triplus;': '\u2a39',
-    'trisb;': '\u29cd',
-    'tritime;': '\u2a3b',
-    'trpezium;': '\u23e2',
-    'Tscr;': '\U0001d4af',
-    'tscr;': '\U0001d4c9',
-    'TScy;': '\u0426',
-    'tscy;': '\u0446',
-    'TSHcy;': '\u040b',
-    'tshcy;': '\u045b',
-    'Tstrok;': '\u0166',
-    'tstrok;': '\u0167',
-    'twixt;': '\u226c',
-    'twoheadleftarrow;': '\u219e',
-    'twoheadrightarrow;': '\u21a0',
-    'Uacute': '\xda',
-    'uacute': '\xfa',
-    'Uacute;': '\xda',
-    'uacute;': '\xfa',
-    'Uarr;': '\u219f',
-    'uArr;': '\u21d1',
-    'uarr;': '\u2191',
-    'Uarrocir;': '\u2949',
-    'Ubrcy;': '\u040e',
-    'ubrcy;': '\u045e',
-    'Ubreve;': '\u016c',
-    'ubreve;': '\u016d',
-    'Ucirc': '\xdb',
-    'ucirc': '\xfb',
-    'Ucirc;': '\xdb',
-    'ucirc;': '\xfb',
-    'Ucy;': '\u0423',
-    'ucy;': '\u0443',
-    'udarr;': '\u21c5',
-    'Udblac;': '\u0170',
-    'udblac;': '\u0171',
-    'udhar;': '\u296e',
-    'ufisht;': '\u297e',
-    'Ufr;': '\U0001d518',
-    'ufr;': '\U0001d532',
-    'Ugrave': '\xd9',
-    'ugrave': '\xf9',
-    'Ugrave;': '\xd9',
-    'ugrave;': '\xf9',
-    'uHar;': '\u2963',
-    'uharl;': '\u21bf',
-    'uharr;': '\u21be',
-    'uhblk;': '\u2580',
-    'ulcorn;': '\u231c',
-    'ulcorner;': '\u231c',
-    'ulcrop;': '\u230f',
-    'ultri;': '\u25f8',
-    'Umacr;': '\u016a',
-    'umacr;': '\u016b',
-    'uml': '\xa8',
-    'uml;': '\xa8',
-    'UnderBar;': '_',
-    'UnderBrace;': '\u23df',
-    'UnderBracket;': '\u23b5',
-    'UnderParenthesis;': '\u23dd',
-    'Union;': '\u22c3',
-    'UnionPlus;': '\u228e',
-    'Uogon;': '\u0172',
-    'uogon;': '\u0173',
-    'Uopf;': '\U0001d54c',
-    'uopf;': '\U0001d566',
-    'UpArrow;': '\u2191',
-    'Uparrow;': '\u21d1',
-    'uparrow;': '\u2191',
-    'UpArrowBar;': '\u2912',
-    'UpArrowDownArrow;': '\u21c5',
-    'UpDownArrow;': '\u2195',
-    'Updownarrow;': '\u21d5',
-    'updownarrow;': '\u2195',
-    'UpEquilibrium;': '\u296e',
-    'upharpoonleft;': '\u21bf',
-    'upharpoonright;': '\u21be',
-    'uplus;': '\u228e',
-    'UpperLeftArrow;': '\u2196',
-    'UpperRightArrow;': '\u2197',
-    'Upsi;': '\u03d2',
-    'upsi;': '\u03c5',
-    'upsih;': '\u03d2',
-    'Upsilon;': '\u03a5',
-    'upsilon;': '\u03c5',
-    'UpTee;': '\u22a5',
-    'UpTeeArrow;': '\u21a5',
-    'upuparrows;': '\u21c8',
-    'urcorn;': '\u231d',
-    'urcorner;': '\u231d',
-    'urcrop;': '\u230e',
-    'Uring;': '\u016e',
-    'uring;': '\u016f',
-    'urtri;': '\u25f9',
-    'Uscr;': '\U0001d4b0',
-    'uscr;': '\U0001d4ca',
-    'utdot;': '\u22f0',
-    'Utilde;': '\u0168',
-    'utilde;': '\u0169',
-    'utri;': '\u25b5',
-    'utrif;': '\u25b4',
-    'uuarr;': '\u21c8',
-    'Uuml': '\xdc',
-    'uuml': '\xfc',
-    'Uuml;': '\xdc',
-    'uuml;': '\xfc',
-    'uwangle;': '\u29a7',
-    'vangrt;': '\u299c',
-    'varepsilon;': '\u03f5',
-    'varkappa;': '\u03f0',
-    'varnothing;': '\u2205',
-    'varphi;': '\u03d5',
-    'varpi;': '\u03d6',
-    'varpropto;': '\u221d',
-    'vArr;': '\u21d5',
-    'varr;': '\u2195',
-    'varrho;': '\u03f1',
-    'varsigma;': '\u03c2',
-    'varsubsetneq;': '\u228a\ufe00',
-    'varsubsetneqq;': '\u2acb\ufe00',
-    'varsupsetneq;': '\u228b\ufe00',
-    'varsupsetneqq;': '\u2acc\ufe00',
-    'vartheta;': '\u03d1',
-    'vartriangleleft;': '\u22b2',
-    'vartriangleright;': '\u22b3',
-    'Vbar;': '\u2aeb',
-    'vBar;': '\u2ae8',
-    'vBarv;': '\u2ae9',
-    'Vcy;': '\u0412',
-    'vcy;': '\u0432',
-    'VDash;': '\u22ab',
-    'Vdash;': '\u22a9',
-    'vDash;': '\u22a8',
-    'vdash;': '\u22a2',
-    'Vdashl;': '\u2ae6',
-    'Vee;': '\u22c1',
-    'vee;': '\u2228',
-    'veebar;': '\u22bb',
-    'veeeq;': '\u225a',
-    'vellip;': '\u22ee',
-    'Verbar;': '\u2016',
-    'verbar;': '|',
-    'Vert;': '\u2016',
-    'vert;': '|',
-    'VerticalBar;': '\u2223',
-    'VerticalLine;': '|',
-    'VerticalSeparator;': '\u2758',
-    'VerticalTilde;': '\u2240',
-    'VeryThinSpace;': '\u200a',
-    'Vfr;': '\U0001d519',
-    'vfr;': '\U0001d533',
-    'vltri;': '\u22b2',
-    'vnsub;': '\u2282\u20d2',
-    'vnsup;': '\u2283\u20d2',
-    'Vopf;': '\U0001d54d',
-    'vopf;': '\U0001d567',
-    'vprop;': '\u221d',
-    'vrtri;': '\u22b3',
-    'Vscr;': '\U0001d4b1',
-    'vscr;': '\U0001d4cb',
-    'vsubnE;': '\u2acb\ufe00',
-    'vsubne;': '\u228a\ufe00',
-    'vsupnE;': '\u2acc\ufe00',
-    'vsupne;': '\u228b\ufe00',
-    'Vvdash;': '\u22aa',
-    'vzigzag;': '\u299a',
-    'Wcirc;': '\u0174',
-    'wcirc;': '\u0175',
-    'wedbar;': '\u2a5f',
-    'Wedge;': '\u22c0',
-    'wedge;': '\u2227',
-    'wedgeq;': '\u2259',
-    'weierp;': '\u2118',
-    'Wfr;': '\U0001d51a',
-    'wfr;': '\U0001d534',
-    'Wopf;': '\U0001d54e',
-    'wopf;': '\U0001d568',
-    'wp;': '\u2118',
-    'wr;': '\u2240',
-    'wreath;': '\u2240',
-    'Wscr;': '\U0001d4b2',
-    'wscr;': '\U0001d4cc',
-    'xcap;': '\u22c2',
-    'xcirc;': '\u25ef',
-    'xcup;': '\u22c3',
-    'xdtri;': '\u25bd',
-    'Xfr;': '\U0001d51b',
-    'xfr;': '\U0001d535',
-    'xhArr;': '\u27fa',
-    'xharr;': '\u27f7',
-    'Xi;': '\u039e',
-    'xi;': '\u03be',
-    'xlArr;': '\u27f8',
-    'xlarr;': '\u27f5',
-    'xmap;': '\u27fc',
-    'xnis;': '\u22fb',
-    'xodot;': '\u2a00',
-    'Xopf;': '\U0001d54f',
-    'xopf;': '\U0001d569',
-    'xoplus;': '\u2a01',
-    'xotime;': '\u2a02',
-    'xrArr;': '\u27f9',
-    'xrarr;': '\u27f6',
-    'Xscr;': '\U0001d4b3',
-    'xscr;': '\U0001d4cd',
-    'xsqcup;': '\u2a06',
-    'xuplus;': '\u2a04',
-    'xutri;': '\u25b3',
-    'xvee;': '\u22c1',
-    'xwedge;': '\u22c0',
-    'Yacute': '\xdd',
-    'yacute': '\xfd',
-    'Yacute;': '\xdd',
-    'yacute;': '\xfd',
-    'YAcy;': '\u042f',
-    'yacy;': '\u044f',
-    'Ycirc;': '\u0176',
-    'ycirc;': '\u0177',
-    'Ycy;': '\u042b',
-    'ycy;': '\u044b',
-    'yen': '\xa5',
-    'yen;': '\xa5',
-    'Yfr;': '\U0001d51c',
-    'yfr;': '\U0001d536',
-    'YIcy;': '\u0407',
-    'yicy;': '\u0457',
-    'Yopf;': '\U0001d550',
-    'yopf;': '\U0001d56a',
-    'Yscr;': '\U0001d4b4',
-    'yscr;': '\U0001d4ce',
-    'YUcy;': '\u042e',
-    'yucy;': '\u044e',
-    'yuml': '\xff',
-    'Yuml;': '\u0178',
-    'yuml;': '\xff',
-    'Zacute;': '\u0179',
-    'zacute;': '\u017a',
-    'Zcaron;': '\u017d',
-    'zcaron;': '\u017e',
-    'Zcy;': '\u0417',
-    'zcy;': '\u0437',
-    'Zdot;': '\u017b',
-    'zdot;': '\u017c',
-    'zeetrf;': '\u2128',
-    'ZeroWidthSpace;': '\u200b',
-    'Zeta;': '\u0396',
-    'zeta;': '\u03b6',
-    'Zfr;': '\u2128',
-    'zfr;': '\U0001d537',
-    'ZHcy;': '\u0416',
-    'zhcy;': '\u0436',
-    'zigrarr;': '\u21dd',
-    'Zopf;': '\u2124',
-    'zopf;': '\U0001d56b',
-    'Zscr;': '\U0001d4b5',
-    'zscr;': '\U0001d4cf',
-    'zwj;': '\u200d',
-    'zwnj;': '\u200c',
-}
-
-# maps the Unicode codepoint to the HTML entity name
-codepoint2name = {}
-
-# maps the HTML entity name to the character
-# (or a character reference if the character is outside the Latin-1 range)
-entitydefs = {}
-
-for (name, codepoint) in name2codepoint.items():
-    codepoint2name[codepoint] = name
-    entitydefs[name] = chr(codepoint)
-
-del name, codepoint
diff --git a/lib/future/backports/html/parser.py b/lib/future/backports/html/parser.py
deleted file mode 100644
index fb652636..00000000
--- a/lib/future/backports/html/parser.py
+++ /dev/null
@@ -1,536 +0,0 @@
-"""A parser for HTML and XHTML.
-
-Backported for python-future from Python 3.3.
-"""
-
-# This file is based on sgmllib.py, but the API is slightly different.
-
-# XXX There should be a way to distinguish between PCDATA (parsed
-# character data -- the normal case), RCDATA (replaceable character
-# data -- only char and entity references and end tags are special)
-# and CDATA (character data -- only end tags are special).
-
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from future.builtins import *
-from future.backports import _markupbase
-import re
-import warnings
-
-# Regular expressions used for parsing
-
-interesting_normal = re.compile('[&<]')
-incomplete = re.compile('&[a-zA-Z#]')
-
-entityref = re.compile('&([a-zA-Z][-.a-zA-Z0-9]*)[^a-zA-Z0-9]')
-charref = re.compile('&#(?:[0-9]+|[xX][0-9a-fA-F]+)[^0-9a-fA-F]')
-
-starttagopen = re.compile('<[a-zA-Z]')
-piclose = re.compile('>')
-commentclose = re.compile(r'--\s*>')
-tagfind = re.compile('([a-zA-Z][-.a-zA-Z0-9:_]*)(?:\s|/(?!>))*')
-# see http://www.w3.org/TR/html5/tokenization.html#tag-open-state
-# and http://www.w3.org/TR/html5/tokenization.html#tag-name-state
-tagfind_tolerant = re.compile('[a-zA-Z][^\t\n\r\f />\x00]*')
-# Note:
-#  1) the strict attrfind isn't really strict, but we can't make it
-#     correctly strict without breaking backward compatibility;
-#  2) if you change attrfind remember to update locatestarttagend too;
-#  3) if you change attrfind and/or locatestarttagend the parser will
-#     explode, so don't do it.
-attrfind = re.compile(
-    r'\s*([a-zA-Z_][-.:a-zA-Z_0-9]*)(\s*=\s*'
-    r'(\'[^\']*\'|"[^"]*"|[^\s"\'=<>`]*))?')
-attrfind_tolerant = re.compile(
-    r'((?<=[\'"\s/])[^\s/>][^\s/=>]*)(\s*=+\s*'
-    r'(\'[^\']*\'|"[^"]*"|(?![\'"])[^>\s]*))?(?:\s|/(?!>))*')
-locatestarttagend = re.compile(r"""
-  <[a-zA-Z][-.a-zA-Z0-9:_]*          # tag name
-  (?:\s+                             # whitespace before attribute name
-    (?:[a-zA-Z_][-.:a-zA-Z0-9_]*     # attribute name
-      (?:\s*=\s*                     # value indicator
-        (?:'[^']*'                   # LITA-enclosed value
-          |\"[^\"]*\"                # LIT-enclosed value
-          |[^'\">\s]+                # bare value
-         )
-       )?
-     )
-   )*
-  \s*                                # trailing whitespace
-""", re.VERBOSE)
-locatestarttagend_tolerant = re.compile(r"""
-  <[a-zA-Z][-.a-zA-Z0-9:_]*          # tag name
-  (?:[\s/]*                          # optional whitespace before attribute name
-    (?:(?<=['"\s/])[^\s/>][^\s/=>]*  # attribute name
-      (?:\s*=+\s*                    # value indicator
-        (?:'[^']*'                   # LITA-enclosed value
-          |"[^"]*"                   # LIT-enclosed value
-          |(?!['"])[^>\s]*           # bare value
-         )
-         (?:\s*,)*                   # possibly followed by a comma
-       )?(?:\s|/(?!>))*
-     )*
-   )?
-  \s*                                # trailing whitespace
-""", re.VERBOSE)
-endendtag = re.compile('>')
-# the HTML 5 spec, section 8.1.2.2, doesn't allow spaces between
-# </ and the tag name, so maybe this should be fixed
-endtagfind = re.compile('</\s*([a-zA-Z][-.a-zA-Z0-9:_]*)\s*>')
-
-
-class HTMLParseError(Exception):
-    """Exception raised for all parse errors."""
-
-    def __init__(self, msg, position=(None, None)):
-        assert msg
-        self.msg = msg
-        self.lineno = position[0]
-        self.offset = position[1]
-
-    def __str__(self):
-        result = self.msg
-        if self.lineno is not None:
-            result = result + ", at line %d" % self.lineno
-        if self.offset is not None:
-            result = result + ", column %d" % (self.offset + 1)
-        return result
-
-
-class HTMLParser(_markupbase.ParserBase):
-    """Find tags and other markup and call handler functions.
-
-    Usage:
-        p = HTMLParser()
-        p.feed(data)
-        ...
-        p.close()
-
-    Start tags are handled by calling self.handle_starttag() or
-    self.handle_startendtag(); end tags by self.handle_endtag().  The
-    data between tags is passed from the parser to the derived class
-    by calling self.handle_data() with the data as argument (the data
-    may be split up in arbitrary chunks).  Entity references are
-    passed by calling self.handle_entityref() with the entity
-    reference as the argument.  Numeric character references are
-    passed to self.handle_charref() with the string containing the
-    reference as the argument.
-    """
-
-    CDATA_CONTENT_ELEMENTS = ("script", "style")
-
-    def __init__(self, strict=False):
-        """Initialize and reset this instance.
-
-        If strict is set to False (the default) the parser will parse invalid
-        markup, otherwise it will raise an error.  Note that the strict mode
-        is deprecated.
-        """
-        if strict:
-            warnings.warn("The strict mode is deprecated.",
-                          DeprecationWarning, stacklevel=2)
-        self.strict = strict
-        self.reset()
-
-    def reset(self):
-        """Reset this instance.  Loses all unprocessed data."""
-        self.rawdata = ''
-        self.lasttag = '???'
-        self.interesting = interesting_normal
-        self.cdata_elem = None
-        _markupbase.ParserBase.reset(self)
-
-    def feed(self, data):
-        r"""Feed data to the parser.
-
-        Call this as often as you want, with as little or as much text
-        as you want (may include '\n').
-        """
-        self.rawdata = self.rawdata + data
-        self.goahead(0)
-
-    def close(self):
-        """Handle any buffered data."""
-        self.goahead(1)
-
-    def error(self, message):
-        raise HTMLParseError(message, self.getpos())
-
-    __starttag_text = None
-
-    def get_starttag_text(self):
-        """Return full source of start tag: '<...>'."""
-        return self.__starttag_text
-
-    def set_cdata_mode(self, elem):
-        self.cdata_elem = elem.lower()
-        self.interesting = re.compile(r'</\s*%s\s*>' % self.cdata_elem, re.I)
-
-    def clear_cdata_mode(self):
-        self.interesting = interesting_normal
-        self.cdata_elem = None
-
-    # Internal -- handle data as far as reasonable.  May leave state
-    # and data to be processed by a subsequent call.  If 'end' is
-    # true, force handling all data as if followed by EOF marker.
-    def goahead(self, end):
-        rawdata = self.rawdata
-        i = 0
-        n = len(rawdata)
-        while i < n:
-            match = self.interesting.search(rawdata, i) # < or &
-            if match:
-                j = match.start()
-            else:
-                if self.cdata_elem:
-                    break
-                j = n
-            if i < j: self.handle_data(rawdata[i:j])
-            i = self.updatepos(i, j)
-            if i == n: break
-            startswith = rawdata.startswith
-            if startswith('<', i):
-                if starttagopen.match(rawdata, i): # < + letter
-                    k = self.parse_starttag(i)
-                elif startswith("</", i):
-                    k = self.parse_endtag(i)
-                elif startswith("<!--", i):
-                    k = self.parse_comment(i)
-                elif startswith("<?", i):
-                    k = self.parse_pi(i)
-                elif startswith("<!", i):
-                    if self.strict:
-                        k = self.parse_declaration(i)
-                    else:
-                        k = self.parse_html_declaration(i)
-                elif (i + 1) < n:
-                    self.handle_data("<")
-                    k = i + 1
-                else:
-                    break
-                if k < 0:
-                    if not end:
-                        break
-                    if self.strict:
-                        self.error("EOF in middle of construct")
-                    k = rawdata.find('>', i + 1)
-                    if k < 0:
-                        k = rawdata.find('<', i + 1)
-                        if k < 0:
-                            k = i + 1
-                    else:
-                        k += 1
-                    self.handle_data(rawdata[i:k])
-                i = self.updatepos(i, k)
-            elif startswith("&#", i):
-                match = charref.match(rawdata, i)
-                if match:
-                    name = match.group()[2:-1]
-                    self.handle_charref(name)
-                    k = match.end()
-                    if not startswith(';', k-1):
-                        k = k - 1
-                    i = self.updatepos(i, k)
-                    continue
-                else:
-                    if ";" in rawdata[i:]: #bail by consuming &#
-                        self.handle_data(rawdata[0:2])
-                        i = self.updatepos(i, 2)
-                    break
-            elif startswith('&', i):
-                match = entityref.match(rawdata, i)
-                if match:
-                    name = match.group(1)
-                    self.handle_entityref(name)
-                    k = match.end()
-                    if not startswith(';', k-1):
-                        k = k - 1
-                    i = self.updatepos(i, k)
-                    continue
-                match = incomplete.match(rawdata, i)
-                if match:
-                    # match.group() will contain at least 2 chars
-                    if end and match.group() == rawdata[i:]:
-                        if self.strict:
-                            self.error("EOF in middle of entity or char ref")
-                        else:
-                            if k <= i:
-                                k = n
-                            i = self.updatepos(i, i + 1)
-                    # incomplete
-                    break
-                elif (i + 1) < n:
-                    # not the end of the buffer, and can't be confused
-                    # with some other construct
-                    self.handle_data("&")
-                    i = self.updatepos(i, i + 1)
-                else:
-                    break
-            else:
-                assert 0, "interesting.search() lied"
-        # end while
-        if end and i < n and not self.cdata_elem:
-            self.handle_data(rawdata[i:n])
-            i = self.updatepos(i, n)
-        self.rawdata = rawdata[i:]
-
-    # Internal -- parse html declarations, return length or -1 if not terminated
-    # See w3.org/TR/html5/tokenization.html#markup-declaration-open-state
-    # See also parse_declaration in _markupbase
-    def parse_html_declaration(self, i):
-        rawdata = self.rawdata
-        assert rawdata[i:i+2] == '<!', ('unexpected call to '
-                                        'parse_html_declaration()')
-        if rawdata[i:i+4] == '<!--':
-            # this case is actually already handled in goahead()
-            return self.parse_comment(i)
-        elif rawdata[i:i+3] == '<![':
-            return self.parse_marked_section(i)
-        elif rawdata[i:i+9].lower() == '<!doctype':
-            # find the closing >
-            gtpos = rawdata.find('>', i+9)
-            if gtpos == -1:
-                return -1
-            self.handle_decl(rawdata[i+2:gtpos])
-            return gtpos+1
-        else:
-            return self.parse_bogus_comment(i)
-
-    # Internal -- parse bogus comment, return length or -1 if not terminated
-    # see http://www.w3.org/TR/html5/tokenization.html#bogus-comment-state
-    def parse_bogus_comment(self, i, report=1):
-        rawdata = self.rawdata
-        assert rawdata[i:i+2] in ('<!', '</'), ('unexpected call to '
-                                                'parse_comment()')
-        pos = rawdata.find('>', i+2)
-        if pos == -1:
-            return -1
-        if report:
-            self.handle_comment(rawdata[i+2:pos])
-        return pos + 1
-
-    # Internal -- parse processing instr, return end or -1 if not terminated
-    def parse_pi(self, i):
-        rawdata = self.rawdata
-        assert rawdata[i:i+2] == '<?', 'unexpected call to parse_pi()'
-        match = piclose.search(rawdata, i+2) # >
-        if not match:
-            return -1
-        j = match.start()
-        self.handle_pi(rawdata[i+2: j])
-        j = match.end()
-        return j
-
-    # Internal -- handle starttag, return end or -1 if not terminated
-    def parse_starttag(self, i):
-        self.__starttag_text = None
-        endpos = self.check_for_whole_start_tag(i)
-        if endpos < 0:
-            return endpos
-        rawdata = self.rawdata
-        self.__starttag_text = rawdata[i:endpos]
-
-        # Now parse the data between i+1 and j into a tag and attrs
-        attrs = []
-        match = tagfind.match(rawdata, i+1)
-        assert match, 'unexpected call to parse_starttag()'
-        k = match.end()
-        self.lasttag = tag = match.group(1).lower()
-        while k < endpos:
-            if self.strict:
-                m = attrfind.match(rawdata, k)
-            else:
-                m = attrfind_tolerant.match(rawdata, k)
-            if not m:
-                break
-            attrname, rest, attrvalue = m.group(1, 2, 3)
-            if not rest:
-                attrvalue = None
-            elif attrvalue[:1] == '\'' == attrvalue[-1:] or \
-                 attrvalue[:1] == '"' == attrvalue[-1:]:
-                attrvalue = attrvalue[1:-1]
-            if attrvalue:
-                attrvalue = self.unescape(attrvalue)
-            attrs.append((attrname.lower(), attrvalue))
-            k = m.end()
-
-        end = rawdata[k:endpos].strip()
-        if end not in (">", "/>"):
-            lineno, offset = self.getpos()
-            if "\n" in self.__starttag_text:
-                lineno = lineno + self.__starttag_text.count("\n")
-                offset = len(self.__starttag_text) \
-                         - self.__starttag_text.rfind("\n")
-            else:
-                offset = offset + len(self.__starttag_text)
-            if self.strict:
-                self.error("junk characters in start tag: %r"
-                           % (rawdata[k:endpos][:20],))
-            self.handle_data(rawdata[i:endpos])
-            return endpos
-        if end.endswith('/>'):
-            # XHTML-style empty tag: <span attr="value" />
-            self.handle_startendtag(tag, attrs)
-        else:
-            self.handle_starttag(tag, attrs)
-            if tag in self.CDATA_CONTENT_ELEMENTS:
-                self.set_cdata_mode(tag)
-        return endpos
-
-    # Internal -- check to see if we have a complete starttag; return end
-    # or -1 if incomplete.
-    def check_for_whole_start_tag(self, i):
-        rawdata = self.rawdata
-        if self.strict:
-            m = locatestarttagend.match(rawdata, i)
-        else:
-            m = locatestarttagend_tolerant.match(rawdata, i)
-        if m:
-            j = m.end()
-            next = rawdata[j:j+1]
-            if next == ">":
-                return j + 1
-            if next == "/":
-                if rawdata.startswith("/>", j):
-                    return j + 2
-                if rawdata.startswith("/", j):
-                    # buffer boundary
-                    return -1
-                # else bogus input
-                if self.strict:
-                    self.updatepos(i, j + 1)
-                    self.error("malformed empty start tag")
-                if j > i:
-                    return j
-                else:
-                    return i + 1
-            if next == "":
-                # end of input
-                return -1
-            if next in ("abcdefghijklmnopqrstuvwxyz=/"
-                        "ABCDEFGHIJKLMNOPQRSTUVWXYZ"):
-                # end of input in or before attribute value, or we have the
-                # '/' from a '/>' ending
-                return -1
-            if self.strict:
-                self.updatepos(i, j)
-                self.error("malformed start tag")
-            if j > i:
-                return j
-            else:
-                return i + 1
-        raise AssertionError("we should not get here!")
-
-    # Internal -- parse endtag, return end or -1 if incomplete
-    def parse_endtag(self, i):
-        rawdata = self.rawdata
-        assert rawdata[i:i+2] == "</", "unexpected call to parse_endtag"
-        match = endendtag.search(rawdata, i+1) # >
-        if not match:
-            return -1
-        gtpos = match.end()
-        match = endtagfind.match(rawdata, i) # </ + tag + >
-        if not match:
-            if self.cdata_elem is not None:
-                self.handle_data(rawdata[i:gtpos])
-                return gtpos
-            if self.strict:
-                self.error("bad end tag: %r" % (rawdata[i:gtpos],))
-            # find the name: w3.org/TR/html5/tokenization.html#tag-name-state
-            namematch = tagfind_tolerant.match(rawdata, i+2)
-            if not namematch:
-                # w3.org/TR/html5/tokenization.html#end-tag-open-state
-                if rawdata[i:i+3] == '</>':
-                    return i+3
-                else:
-                    return self.parse_bogus_comment(i)
-            tagname = namematch.group().lower()
-            # consume and ignore other stuff between the name and the >
-            # Note: this is not 100% correct, since we might have things like
-            # </tag attr=">">, but looking for > after tha name should cover
-            # most of the cases and is much simpler
-            gtpos = rawdata.find('>', namematch.end())
-            self.handle_endtag(tagname)
-            return gtpos+1
-
-        elem = match.group(1).lower() # script or style
-        if self.cdata_elem is not None:
-            if elem != self.cdata_elem:
-                self.handle_data(rawdata[i:gtpos])
-                return gtpos
-
-        self.handle_endtag(elem.lower())
-        self.clear_cdata_mode()
-        return gtpos
-
-    # Overridable -- finish processing of start+end tag: <tag.../>
-    def handle_startendtag(self, tag, attrs):
-        self.handle_starttag(tag, attrs)
-        self.handle_endtag(tag)
-
-    # Overridable -- handle start tag
-    def handle_starttag(self, tag, attrs):
-        pass
-
-    # Overridable -- handle end tag
-    def handle_endtag(self, tag):
-        pass
-
-    # Overridable -- handle character reference
-    def handle_charref(self, name):
-        pass
-
-    # Overridable -- handle entity reference
-    def handle_entityref(self, name):
-        pass
-
-    # Overridable -- handle data
-    def handle_data(self, data):
-        pass
-
-    # Overridable -- handle comment
-    def handle_comment(self, data):
-        pass
-
-    # Overridable -- handle declaration
-    def handle_decl(self, decl):
-        pass
-
-    # Overridable -- handle processing instruction
-    def handle_pi(self, data):
-        pass
-
-    def unknown_decl(self, data):
-        if self.strict:
-            self.error("unknown declaration: %r" % (data,))
-
-    # Internal -- helper to remove special character quoting
-    def unescape(self, s):
-        if '&' not in s:
-            return s
-        def replaceEntities(s):
-            s = s.groups()[0]
-            try:
-                if s[0] == "#":
-                    s = s[1:]
-                    if s[0] in ['x','X']:
-                        c = int(s[1:].rstrip(';'), 16)
-                    else:
-                        c = int(s.rstrip(';'))
-                    return chr(c)
-            except ValueError:
-                return '&#' + s
-            else:
-                from future.backports.html.entities import html5
-                if s in html5:
-                    return html5[s]
-                elif s.endswith(';'):
-                    return '&' + s
-                for x in range(2, len(s)):
-                    if s[:x] in html5:
-                        return html5[s[:x]] + s[x:]
-                else:
-                    return '&' + s
-
-        return re.sub(r"&(#?[xX]?(?:[0-9a-fA-F]+;|\w{1,32};?))",
-                      replaceEntities, s)
diff --git a/lib/future/backports/http/__init__.py b/lib/future/backports/http/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/future/backports/http/client.py b/lib/future/backports/http/client.py
deleted file mode 100644
index e663d125..00000000
--- a/lib/future/backports/http/client.py
+++ /dev/null
@@ -1,1346 +0,0 @@
-"""HTTP/1.1 client library
-
-A backport of the Python 3.3 http/client.py module for python-future.
-
-<intro stuff goes here>
-<other stuff, too>
-
-HTTPConnection goes through a number of "states", which define when a client
-may legally make another request or fetch the response for a particular
-request. This diagram details these state transitions:
-
-    (null)
-      |
-      | HTTPConnection()
-      v
-    Idle
-      |
-      | putrequest()
-      v
-    Request-started
-      |
-      | ( putheader() )*  endheaders()
-      v
-    Request-sent
-      |
-      | response = getresponse()
-      v
-    Unread-response   [Response-headers-read]
-      |\____________________
-      |                     |
-      | response.read()     | putrequest()
-      v                     v
-    Idle                  Req-started-unread-response
-                     ______/|
-                   /        |
-   response.read() |        | ( putheader() )*  endheaders()
-                   v        v
-       Request-started    Req-sent-unread-response
-                            |
-                            | response.read()
-                            v
-                          Request-sent
-
-This diagram presents the following rules:
-  -- a second request may not be started until {response-headers-read}
-  -- a response [object] cannot be retrieved until {request-sent}
-  -- there is no differentiation between an unread response body and a
-     partially read response body
-
-Note: this enforcement is applied by the HTTPConnection class. The
-      HTTPResponse class does not enforce this state machine, which
-      implies sophisticated clients may accelerate the request/response
-      pipeline. Caution should be taken, though: accelerating the states
-      beyond the above pattern may imply knowledge of the server's
-      connection-close behavior for certain requests. For example, it
-      is impossible to tell whether the server will close the connection
-      UNTIL the response headers have been read; this means that further
-      requests cannot be placed into the pipeline until it is known that
-      the server will NOT be closing the connection.
-
-Logical State                  __state            __response
--------------                  -------            ----------
-Idle                           _CS_IDLE           None
-Request-started                _CS_REQ_STARTED    None
-Request-sent                   _CS_REQ_SENT       None
-Unread-response                _CS_IDLE           <response_class>
-Req-started-unread-response    _CS_REQ_STARTED    <response_class>
-Req-sent-unread-response       _CS_REQ_SENT       <response_class>
-"""
-
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from future.builtins import bytes, int, str, super
-from future.utils import PY2
-
-from future.backports.email import parser as email_parser
-from future.backports.email import message as email_message
-from future.backports.misc import create_connection as socket_create_connection
-import io
-import os
-import socket
-from future.backports.urllib.parse import urlsplit
-import warnings
-from array import array
-
-if PY2:
-    from collections import Iterable
-else:
-    from collections.abc import Iterable
-
-__all__ = ["HTTPResponse", "HTTPConnection",
-           "HTTPException", "NotConnected", "UnknownProtocol",
-           "UnknownTransferEncoding", "UnimplementedFileMode",
-           "IncompleteRead", "InvalidURL", "ImproperConnectionState",
-           "CannotSendRequest", "CannotSendHeader", "ResponseNotReady",
-           "BadStatusLine", "error", "responses"]
-
-HTTP_PORT = 80
-HTTPS_PORT = 443
-
-_UNKNOWN = 'UNKNOWN'
-
-# connection states
-_CS_IDLE = 'Idle'
-_CS_REQ_STARTED = 'Request-started'
-_CS_REQ_SENT = 'Request-sent'
-
-# status codes
-# informational
-CONTINUE = 100
-SWITCHING_PROTOCOLS = 101
-PROCESSING = 102
-
-# successful
-OK = 200
-CREATED = 201
-ACCEPTED = 202
-NON_AUTHORITATIVE_INFORMATION = 203
-NO_CONTENT = 204
-RESET_CONTENT = 205
-PARTIAL_CONTENT = 206
-MULTI_STATUS = 207
-IM_USED = 226
-
-# redirection
-MULTIPLE_CHOICES = 300
-MOVED_PERMANENTLY = 301
-FOUND = 302
-SEE_OTHER = 303
-NOT_MODIFIED = 304
-USE_PROXY = 305
-TEMPORARY_REDIRECT = 307
-
-# client error
-BAD_REQUEST = 400
-UNAUTHORIZED = 401
-PAYMENT_REQUIRED = 402
-FORBIDDEN = 403
-NOT_FOUND = 404
-METHOD_NOT_ALLOWED = 405
-NOT_ACCEPTABLE = 406
-PROXY_AUTHENTICATION_REQUIRED = 407
-REQUEST_TIMEOUT = 408
-CONFLICT = 409
-GONE = 410
-LENGTH_REQUIRED = 411
-PRECONDITION_FAILED = 412
-REQUEST_ENTITY_TOO_LARGE = 413
-REQUEST_URI_TOO_LONG = 414
-UNSUPPORTED_MEDIA_TYPE = 415
-REQUESTED_RANGE_NOT_SATISFIABLE = 416
-EXPECTATION_FAILED = 417
-UNPROCESSABLE_ENTITY = 422
-LOCKED = 423
-FAILED_DEPENDENCY = 424
-UPGRADE_REQUIRED = 426
-PRECONDITION_REQUIRED = 428
-TOO_MANY_REQUESTS = 429
-REQUEST_HEADER_FIELDS_TOO_LARGE = 431
-
-# server error
-INTERNAL_SERVER_ERROR = 500
-NOT_IMPLEMENTED = 501
-BAD_GATEWAY = 502
-SERVICE_UNAVAILABLE = 503
-GATEWAY_TIMEOUT = 504
-HTTP_VERSION_NOT_SUPPORTED = 505
-INSUFFICIENT_STORAGE = 507
-NOT_EXTENDED = 510
-NETWORK_AUTHENTICATION_REQUIRED = 511
-
-# Mapping status codes to official W3C names
-responses = {
-    100: 'Continue',
-    101: 'Switching Protocols',
-
-    200: 'OK',
-    201: 'Created',
-    202: 'Accepted',
-    203: 'Non-Authoritative Information',
-    204: 'No Content',
-    205: 'Reset Content',
-    206: 'Partial Content',
-
-    300: 'Multiple Choices',
-    301: 'Moved Permanently',
-    302: 'Found',
-    303: 'See Other',
-    304: 'Not Modified',
-    305: 'Use Proxy',
-    306: '(Unused)',
-    307: 'Temporary Redirect',
-
-    400: 'Bad Request',
-    401: 'Unauthorized',
-    402: 'Payment Required',
-    403: 'Forbidden',
-    404: 'Not Found',
-    405: 'Method Not Allowed',
-    406: 'Not Acceptable',
-    407: 'Proxy Authentication Required',
-    408: 'Request Timeout',
-    409: 'Conflict',
-    410: 'Gone',
-    411: 'Length Required',
-    412: 'Precondition Failed',
-    413: 'Request Entity Too Large',
-    414: 'Request-URI Too Long',
-    415: 'Unsupported Media Type',
-    416: 'Requested Range Not Satisfiable',
-    417: 'Expectation Failed',
-    428: 'Precondition Required',
-    429: 'Too Many Requests',
-    431: 'Request Header Fields Too Large',
-
-    500: 'Internal Server Error',
-    501: 'Not Implemented',
-    502: 'Bad Gateway',
-    503: 'Service Unavailable',
-    504: 'Gateway Timeout',
-    505: 'HTTP Version Not Supported',
-    511: 'Network Authentication Required',
-}
-
-# maximal amount of data to read at one time in _safe_read
-MAXAMOUNT = 1048576
-
-# maximal line length when calling readline().
-_MAXLINE = 65536
-_MAXHEADERS = 100
-
-
-class HTTPMessage(email_message.Message):
-    # XXX The only usage of this method is in
-    # http.server.CGIHTTPRequestHandler.  Maybe move the code there so
-    # that it doesn't need to be part of the public API.  The API has
-    # never been defined so this could cause backwards compatibility
-    # issues.
-
-    def getallmatchingheaders(self, name):
-        """Find all header lines matching a given header name.
-
-        Look through the list of headers and find all lines matching a given
-        header name (and their continuation lines).  A list of the lines is
-        returned, without interpretation.  If the header does not occur, an
-        empty list is returned.  If the header occurs multiple times, all
-        occurrences are returned.  Case is not important in the header name.
-
-        """
-        name = name.lower() + ':'
-        n = len(name)
-        lst = []
-        hit = 0
-        for line in self.keys():
-            if line[:n].lower() == name:
-                hit = 1
-            elif not line[:1].isspace():
-                hit = 0
-            if hit:
-                lst.append(line)
-        return lst
-
-def parse_headers(fp, _class=HTTPMessage):
-    """Parses only RFC2822 headers from a file pointer.
-
-    email Parser wants to see strings rather than bytes.
-    But a TextIOWrapper around self.rfile would buffer too many bytes
-    from the stream, bytes which we later need to read as bytes.
-    So we read the correct bytes here, as bytes, for email Parser
-    to parse.
-
-    """
-    headers = []
-    while True:
-        line = fp.readline(_MAXLINE + 1)
-        if len(line) > _MAXLINE:
-            raise LineTooLong("header line")
-        headers.append(line)
-        if len(headers) > _MAXHEADERS:
-            raise HTTPException("got more than %d headers" % _MAXHEADERS)
-        if line in (b'\r\n', b'\n', b''):
-            break
-    hstring = bytes(b'').join(headers).decode('iso-8859-1')
-    return email_parser.Parser(_class=_class).parsestr(hstring)
-
-
-_strict_sentinel = object()
-
-class HTTPResponse(io.RawIOBase):
-
-    # See RFC 2616 sec 19.6 and RFC 1945 sec 6 for details.
-
-    # The bytes from the socket object are iso-8859-1 strings.
-    # See RFC 2616 sec 2.2 which notes an exception for MIME-encoded
-    # text following RFC 2047.  The basic status line parsing only
-    # accepts iso-8859-1.
-
-    def __init__(self, sock, debuglevel=0, strict=_strict_sentinel, method=None, url=None):
-        # If the response includes a content-length header, we need to
-        # make sure that the client doesn't read more than the
-        # specified number of bytes.  If it does, it will block until
-        # the server times out and closes the connection.  This will
-        # happen if a self.fp.read() is done (without a size) whether
-        # self.fp is buffered or not.  So, no self.fp.read() by
-        # clients unless they know what they are doing.
-        self.fp = sock.makefile("rb")
-        self.debuglevel = debuglevel
-        if strict is not _strict_sentinel:
-            warnings.warn("the 'strict' argument isn't supported anymore; "
-                "http.client now always assumes HTTP/1.x compliant servers.",
-                DeprecationWarning, 2)
-        self._method = method
-
-        # The HTTPResponse object is returned via urllib.  The clients
-        # of http and urllib expect different attributes for the
-        # headers.  headers is used here and supports urllib.  msg is
-        # provided as a backwards compatibility layer for http
-        # clients.
-
-        self.headers = self.msg = None
-
-        # from the Status-Line of the response
-        self.version = _UNKNOWN # HTTP-Version
-        self.status = _UNKNOWN  # Status-Code
-        self.reason = _UNKNOWN  # Reason-Phrase
-
-        self.chunked = _UNKNOWN         # is "chunked" being used?
-        self.chunk_left = _UNKNOWN      # bytes left to read in current chunk
-        self.length = _UNKNOWN          # number of bytes left in response
-        self.will_close = _UNKNOWN      # conn will close at end of response
-
-    def _read_status(self):
-        line = str(self.fp.readline(_MAXLINE + 1), "iso-8859-1")
-        if len(line) > _MAXLINE:
-            raise LineTooLong("status line")
-        if self.debuglevel > 0:
-            print("reply:", repr(line))
-        if not line:
-            # Presumably, the server closed the connection before
-            # sending a valid response.
-            raise BadStatusLine(line)
-        try:
-            version, status, reason = line.split(None, 2)
-        except ValueError:
-            try:
-                version, status = line.split(None, 1)
-                reason = ""
-            except ValueError:
-                # empty version will cause next test to fail.
-                version = ""
-        if not version.startswith("HTTP/"):
-            self._close_conn()
-            raise BadStatusLine(line)
-
-        # The status code is a three-digit number
-        try:
-            status = int(status)
-            if status < 100 or status > 999:
-                raise BadStatusLine(line)
-        except ValueError:
-            raise BadStatusLine(line)
-        return version, status, reason
-
-    def begin(self):
-        if self.headers is not None:
-            # we've already started reading the response
-            return
-
-        # read until we get a non-100 response
-        while True:
-            version, status, reason = self._read_status()
-            if status != CONTINUE:
-                break
-            # skip the header from the 100 response
-            while True:
-                skip = self.fp.readline(_MAXLINE + 1)
-                if len(skip) > _MAXLINE:
-                    raise LineTooLong("header line")
-                skip = skip.strip()
-                if not skip:
-                    break
-                if self.debuglevel > 0:
-                    print("header:", skip)
-
-        self.code = self.status = status
-        self.reason = reason.strip()
-        if version in ("HTTP/1.0", "HTTP/0.9"):
-            # Some servers might still return "0.9", treat it as 1.0 anyway
-            self.version = 10
-        elif version.startswith("HTTP/1."):
-            self.version = 11   # use HTTP/1.1 code for HTTP/1.x where x>=1
-        else:
-            raise UnknownProtocol(version)
-
-        self.headers = self.msg = parse_headers(self.fp)
-
-        if self.debuglevel > 0:
-            for hdr in self.headers:
-                print("header:", hdr, end=" ")
-
-        # are we using the chunked-style of transfer encoding?
-        tr_enc = self.headers.get("transfer-encoding")
-        if tr_enc and tr_enc.lower() == "chunked":
-            self.chunked = True
-            self.chunk_left = None
-        else:
-            self.chunked = False
-
-        # will the connection close at the end of the response?
-        self.will_close = self._check_close()
-
-        # do we have a Content-Length?
-        # NOTE: RFC 2616, S4.4, #3 says we ignore this if tr_enc is "chunked"
-        self.length = None
-        length = self.headers.get("content-length")
-
-         # are we using the chunked-style of transfer encoding?
-        tr_enc = self.headers.get("transfer-encoding")
-        if length and not self.chunked:
-            try:
-                self.length = int(length)
-            except ValueError:
-                self.length = None
-            else:
-                if self.length < 0:  # ignore nonsensical negative lengths
-                    self.length = None
-        else:
-            self.length = None
-
-        # does the body have a fixed length? (of zero)
-        if (status == NO_CONTENT or status == NOT_MODIFIED or
-            100 <= status < 200 or      # 1xx codes
-            self._method == "HEAD"):
-            self.length = 0
-
-        # if the connection remains open, and we aren't using chunked, and
-        # a content-length was not provided, then assume that the connection
-        # WILL close.
-        if (not self.will_close and
-            not self.chunked and
-            self.length is None):
-            self.will_close = True
-
-    def _check_close(self):
-        conn = self.headers.get("connection")
-        if self.version == 11:
-            # An HTTP/1.1 proxy is assumed to stay open unless
-            # explicitly closed.
-            conn = self.headers.get("connection")
-            if conn and "close" in conn.lower():
-                return True
-            return False
-
-        # Some HTTP/1.0 implementations have support for persistent
-        # connections, using rules different than HTTP/1.1.
-
-        # For older HTTP, Keep-Alive indicates persistent connection.
-        if self.headers.get("keep-alive"):
-            return False
-
-        # At least Akamai returns a "Connection: Keep-Alive" header,
-        # which was supposed to be sent by the client.
-        if conn and "keep-alive" in conn.lower():
-            return False
-
-        # Proxy-Connection is a netscape hack.
-        pconn = self.headers.get("proxy-connection")
-        if pconn and "keep-alive" in pconn.lower():
-            return False
-
-        # otherwise, assume it will close
-        return True
-
-    def _close_conn(self):
-        fp = self.fp
-        self.fp = None
-        fp.close()
-
-    def close(self):
-        super().close() # set "closed" flag
-        if self.fp:
-            self._close_conn()
-
-    # These implementations are for the benefit of io.BufferedReader.
-
-    # XXX This class should probably be revised to act more like
-    # the "raw stream" that BufferedReader expects.
-
-    def flush(self):
-        super().flush()
-        if self.fp:
-            self.fp.flush()
-
-    def readable(self):
-        return True
-
-    # End of "raw stream" methods
-
-    def isclosed(self):
-        """True if the connection is closed."""
-        # NOTE: it is possible that we will not ever call self.close(). This
-        #       case occurs when will_close is TRUE, length is None, and we
-        #       read up to the last byte, but NOT past it.
-        #
-        # IMPLIES: if will_close is FALSE, then self.close() will ALWAYS be
-        #          called, meaning self.isclosed() is meaningful.
-        return self.fp is None
-
-    def read(self, amt=None):
-        if self.fp is None:
-            return bytes(b"")
-
-        if self._method == "HEAD":
-            self._close_conn()
-            return bytes(b"")
-
-        if amt is not None:
-            # Amount is given, so call base class version
-            # (which is implemented in terms of self.readinto)
-            return bytes(super(HTTPResponse, self).read(amt))
-        else:
-            # Amount is not given (unbounded read) so we must check self.length
-            # and self.chunked
-
-            if self.chunked:
-                return self._readall_chunked()
-
-            if self.length is None:
-                s = self.fp.read()
-            else:
-                try:
-                    s = self._safe_read(self.length)
-                except IncompleteRead:
-                    self._close_conn()
-                    raise
-                self.length = 0
-            self._close_conn()        # we read everything
-            return bytes(s)
-
-    def readinto(self, b):
-        if self.fp is None:
-            return 0
-
-        if self._method == "HEAD":
-            self._close_conn()
-            return 0
-
-        if self.chunked:
-            return self._readinto_chunked(b)
-
-        if self.length is not None:
-            if len(b) > self.length:
-                # clip the read to the "end of response"
-                b = memoryview(b)[0:self.length]
-
-        # we do not use _safe_read() here because this may be a .will_close
-        # connection, and the user is reading more bytes than will be provided
-        # (for example, reading in 1k chunks)
-
-        if PY2:
-            data = self.fp.read(len(b))
-            n = len(data)
-            b[:n] = data
-        else:
-            n = self.fp.readinto(b)
-
-        if not n and b:
-            # Ideally, we would raise IncompleteRead if the content-length
-            # wasn't satisfied, but it might break compatibility.
-            self._close_conn()
-        elif self.length is not None:
-            self.length -= n
-            if not self.length:
-                self._close_conn()
-        return n
-
-    def _read_next_chunk_size(self):
-        # Read the next chunk size from the file
-        line = self.fp.readline(_MAXLINE + 1)
-        if len(line) > _MAXLINE:
-            raise LineTooLong("chunk size")
-        i = line.find(b";")
-        if i >= 0:
-            line = line[:i] # strip chunk-extensions
-        try:
-            return int(line, 16)
-        except ValueError:
-            # close the connection as protocol synchronisation is
-            # probably lost
-            self._close_conn()
-            raise
-
-    def _read_and_discard_trailer(self):
-        # read and discard trailer up to the CRLF terminator
-        ### note: we shouldn't have any trailers!
-        while True:
-            line = self.fp.readline(_MAXLINE + 1)
-            if len(line) > _MAXLINE:
-                raise LineTooLong("trailer line")
-            if not line:
-                # a vanishingly small number of sites EOF without
-                # sending the trailer
-                break
-            if line in (b'\r\n', b'\n', b''):
-                break
-
-    def _readall_chunked(self):
-        assert self.chunked != _UNKNOWN
-        chunk_left = self.chunk_left
-        value = []
-        while True:
-            if chunk_left is None:
-                try:
-                    chunk_left = self._read_next_chunk_size()
-                    if chunk_left == 0:
-                        break
-                except ValueError:
-                    raise IncompleteRead(bytes(b'').join(value))
-            value.append(self._safe_read(chunk_left))
-
-            # we read the whole chunk, get another
-            self._safe_read(2)      # toss the CRLF at the end of the chunk
-            chunk_left = None
-
-        self._read_and_discard_trailer()
-
-        # we read everything; close the "file"
-        self._close_conn()
-
-        return bytes(b'').join(value)
-
-    def _readinto_chunked(self, b):
-        assert self.chunked != _UNKNOWN
-        chunk_left = self.chunk_left
-
-        total_bytes = 0
-        mvb = memoryview(b)
-        while True:
-            if chunk_left is None:
-                try:
-                    chunk_left = self._read_next_chunk_size()
-                    if chunk_left == 0:
-                        break
-                except ValueError:
-                    raise IncompleteRead(bytes(b[0:total_bytes]))
-
-            if len(mvb) < chunk_left:
-                n = self._safe_readinto(mvb)
-                self.chunk_left = chunk_left - n
-                return total_bytes + n
-            elif len(mvb) == chunk_left:
-                n = self._safe_readinto(mvb)
-                self._safe_read(2)  # toss the CRLF at the end of the chunk
-                self.chunk_left = None
-                return total_bytes + n
-            else:
-                temp_mvb = mvb[0:chunk_left]
-                n = self._safe_readinto(temp_mvb)
-                mvb = mvb[n:]
-                total_bytes += n
-
-            # we read the whole chunk, get another
-            self._safe_read(2)      # toss the CRLF at the end of the chunk
-            chunk_left = None
-
-        self._read_and_discard_trailer()
-
-        # we read everything; close the "file"
-        self._close_conn()
-
-        return total_bytes
-
-    def _safe_read(self, amt):
-        """Read the number of bytes requested, compensating for partial reads.
-
-        Normally, we have a blocking socket, but a read() can be interrupted
-        by a signal (resulting in a partial read).
-
-        Note that we cannot distinguish between EOF and an interrupt when zero
-        bytes have been read. IncompleteRead() will be raised in this
-        situation.
-
-        This function should be used when <amt> bytes "should" be present for
-        reading. If the bytes are truly not available (due to EOF), then the
-        IncompleteRead exception can be used to detect the problem.
-        """
-        s = []
-        while amt > 0:
-            chunk = self.fp.read(min(amt, MAXAMOUNT))
-            if not chunk:
-                raise IncompleteRead(bytes(b'').join(s), amt)
-            s.append(chunk)
-            amt -= len(chunk)
-        return bytes(b"").join(s)
-
-    def _safe_readinto(self, b):
-        """Same as _safe_read, but for reading into a buffer."""
-        total_bytes = 0
-        mvb = memoryview(b)
-        while total_bytes < len(b):
-            if MAXAMOUNT < len(mvb):
-                temp_mvb = mvb[0:MAXAMOUNT]
-                if PY2:
-                    data = self.fp.read(len(temp_mvb))
-                    n = len(data)
-                    temp_mvb[:n] = data
-                else:
-                    n = self.fp.readinto(temp_mvb)
-            else:
-                if PY2:
-                    data = self.fp.read(len(mvb))
-                    n = len(data)
-                    mvb[:n] = data
-                else:
-                    n = self.fp.readinto(mvb)
-            if not n:
-                raise IncompleteRead(bytes(mvb[0:total_bytes]), len(b))
-            mvb = mvb[n:]
-            total_bytes += n
-        return total_bytes
-
-    def fileno(self):
-        return self.fp.fileno()
-
-    def getheader(self, name, default=None):
-        if self.headers is None:
-            raise ResponseNotReady()
-        headers = self.headers.get_all(name) or default
-        if isinstance(headers, str) or not hasattr(headers, '__iter__'):
-            return headers
-        else:
-            return ', '.join(headers)
-
-    def getheaders(self):
-        """Return list of (header, value) tuples."""
-        if self.headers is None:
-            raise ResponseNotReady()
-        return list(self.headers.items())
-
-    # We override IOBase.__iter__ so that it doesn't check for closed-ness
-
-    def __iter__(self):
-        return self
-
-    # For compatibility with old-style urllib responses.
-
-    def info(self):
-        return self.headers
-
-    def geturl(self):
-        return self.url
-
-    def getcode(self):
-        return self.status
-
-class HTTPConnection(object):
-
-    _http_vsn = 11
-    _http_vsn_str = 'HTTP/1.1'
-
-    response_class = HTTPResponse
-    default_port = HTTP_PORT
-    auto_open = 1
-    debuglevel = 0
-
-    def __init__(self, host, port=None, strict=_strict_sentinel,
-                 timeout=socket._GLOBAL_DEFAULT_TIMEOUT, source_address=None):
-        if strict is not _strict_sentinel:
-            warnings.warn("the 'strict' argument isn't supported anymore; "
-                "http.client now always assumes HTTP/1.x compliant servers.",
-                DeprecationWarning, 2)
-        self.timeout = timeout
-        self.source_address = source_address
-        self.sock = None
-        self._buffer = []
-        self.__response = None
-        self.__state = _CS_IDLE
-        self._method = None
-        self._tunnel_host = None
-        self._tunnel_port = None
-        self._tunnel_headers = {}
-
-        self._set_hostport(host, port)
-
-    def set_tunnel(self, host, port=None, headers=None):
-        """ Sets up the host and the port for the HTTP CONNECT Tunnelling.
-
-        The headers argument should be a mapping of extra HTTP headers
-        to send with the CONNECT request.
-        """
-        self._tunnel_host = host
-        self._tunnel_port = port
-        if headers:
-            self._tunnel_headers = headers
-        else:
-            self._tunnel_headers.clear()
-
-    def _set_hostport(self, host, port):
-        if port is None:
-            i = host.rfind(':')
-            j = host.rfind(']')         # ipv6 addresses have [...]
-            if i > j:
-                try:
-                    port = int(host[i+1:])
-                except ValueError:
-                    if host[i+1:] == "": # http://foo.com:/ == http://foo.com/
-                        port = self.default_port
-                    else:
-                        raise InvalidURL("nonnumeric port: '%s'" % host[i+1:])
-                host = host[:i]
-            else:
-                port = self.default_port
-            if host and host[0] == '[' and host[-1] == ']':
-                host = host[1:-1]
-        self.host = host
-        self.port = port
-
-    def set_debuglevel(self, level):
-        self.debuglevel = level
-
-    def _tunnel(self):
-        self._set_hostport(self._tunnel_host, self._tunnel_port)
-        connect_str = "CONNECT %s:%d HTTP/1.0\r\n" % (self.host, self.port)
-        connect_bytes = connect_str.encode("ascii")
-        self.send(connect_bytes)
-        for header, value in self._tunnel_headers.items():
-            header_str = "%s: %s\r\n" % (header, value)
-            header_bytes = header_str.encode("latin-1")
-            self.send(header_bytes)
-        self.send(bytes(b'\r\n'))
-
-        response = self.response_class(self.sock, method=self._method)
-        (version, code, message) = response._read_status()
-
-        if code != 200:
-            self.close()
-            raise socket.error("Tunnel connection failed: %d %s" % (code,
-                                                                    message.strip()))
-        while True:
-            line = response.fp.readline(_MAXLINE + 1)
-            if len(line) > _MAXLINE:
-                raise LineTooLong("header line")
-            if not line:
-                # for sites which EOF without sending a trailer
-                break
-            if line in (b'\r\n', b'\n', b''):
-                break
-
-    def connect(self):
-        """Connect to the host and port specified in __init__."""
-        self.sock = socket_create_connection((self.host,self.port),
-                                             self.timeout, self.source_address)
-        if self._tunnel_host:
-            self._tunnel()
-
-    def close(self):
-        """Close the connection to the HTTP server."""
-        if self.sock:
-            self.sock.close()   # close it manually... there may be other refs
-            self.sock = None
-        if self.__response:
-            self.__response.close()
-            self.__response = None
-        self.__state = _CS_IDLE
-
-    def send(self, data):
-        """Send `data' to the server.
-        ``data`` can be a string object, a bytes object, an array object, a
-        file-like object that supports a .read() method, or an iterable object.
-        """
-
-        if self.sock is None:
-            if self.auto_open:
-                self.connect()
-            else:
-                raise NotConnected()
-
-        if self.debuglevel > 0:
-            print("send:", repr(data))
-        blocksize = 8192
-        # Python 2.7 array objects have a read method which is incompatible
-        # with the 2-arg calling syntax below.
-        if hasattr(data, "read") and not isinstance(data, array):
-            if self.debuglevel > 0:
-                print("sendIng a read()able")
-            encode = False
-            try:
-                mode = data.mode
-            except AttributeError:
-                # io.BytesIO and other file-like objects don't have a `mode`
-                # attribute.
-                pass
-            else:
-                if "b" not in mode:
-                    encode = True
-                    if self.debuglevel > 0:
-                        print("encoding file using iso-8859-1")
-            while 1:
-                datablock = data.read(blocksize)
-                if not datablock:
-                    break
-                if encode:
-                    datablock = datablock.encode("iso-8859-1")
-                self.sock.sendall(datablock)
-            return
-        try:
-            self.sock.sendall(data)
-        except TypeError:
-            if isinstance(data, Iterable):
-                for d in data:
-                    self.sock.sendall(d)
-            else:
-                raise TypeError("data should be a bytes-like object "
-                                "or an iterable, got %r" % type(data))
-
-    def _output(self, s):
-        """Add a line of output to the current request buffer.
-
-        Assumes that the line does *not* end with \\r\\n.
-        """
-        self._buffer.append(s)
-
-    def _send_output(self, message_body=None):
-        """Send the currently buffered request and clear the buffer.
-
-        Appends an extra \\r\\n to the buffer.
-        A message_body may be specified, to be appended to the request.
-        """
-        self._buffer.extend((bytes(b""), bytes(b"")))
-        msg = bytes(b"\r\n").join(self._buffer)
-        del self._buffer[:]
-        # If msg and message_body are sent in a single send() call,
-        # it will avoid performance problems caused by the interaction
-        # between delayed ack and the Nagle algorithm.
-        if isinstance(message_body, bytes):
-            msg += message_body
-            message_body = None
-        self.send(msg)
-        if message_body is not None:
-            # message_body was not a string (i.e. it is a file), and
-            # we must run the risk of Nagle.
-            self.send(message_body)
-
-    def putrequest(self, method, url, skip_host=0, skip_accept_encoding=0):
-        """Send a request to the server.
-
-        `method' specifies an HTTP request method, e.g. 'GET'.
-        `url' specifies the object being requested, e.g. '/index.html'.
-        `skip_host' if True does not add automatically a 'Host:' header
-        `skip_accept_encoding' if True does not add automatically an
-           'Accept-Encoding:' header
-        """
-
-        # if a prior response has been completed, then forget about it.
-        if self.__response and self.__response.isclosed():
-            self.__response = None
-
-
-        # in certain cases, we cannot issue another request on this connection.
-        # this occurs when:
-        #   1) we are in the process of sending a request.   (_CS_REQ_STARTED)
-        #   2) a response to a previous request has signalled that it is going
-        #      to close the connection upon completion.
-        #   3) the headers for the previous response have not been read, thus
-        #      we cannot determine whether point (2) is true.   (_CS_REQ_SENT)
-        #
-        # if there is no prior response, then we can request at will.
-        #
-        # if point (2) is true, then we will have passed the socket to the
-        # response (effectively meaning, "there is no prior response"), and
-        # will open a new one when a new request is made.
-        #
-        # Note: if a prior response exists, then we *can* start a new request.
-        #       We are not allowed to begin fetching the response to this new
-        #       request, however, until that prior response is complete.
-        #
-        if self.__state == _CS_IDLE:
-            self.__state = _CS_REQ_STARTED
-        else:
-            raise CannotSendRequest(self.__state)
-
-        # Save the method we use, we need it later in the response phase
-        self._method = method
-        if not url:
-            url = '/'
-        request = '%s %s %s' % (method, url, self._http_vsn_str)
-
-        # Non-ASCII characters should have been eliminated earlier
-        self._output(request.encode('ascii'))
-
-        if self._http_vsn == 11:
-            # Issue some standard headers for better HTTP/1.1 compliance
-
-            if not skip_host:
-                # this header is issued *only* for HTTP/1.1
-                # connections. more specifically, this means it is
-                # only issued when the client uses the new
-                # HTTPConnection() class. backwards-compat clients
-                # will be using HTTP/1.0 and those clients may be
-                # issuing this header themselves. we should NOT issue
-                # it twice; some web servers (such as Apache) barf
-                # when they see two Host: headers
-
-                # If we need a non-standard port,include it in the
-                # header.  If the request is going through a proxy,
-                # but the host of the actual URL, not the host of the
-                # proxy.
-
-                netloc = ''
-                if url.startswith('http'):
-                    nil, netloc, nil, nil, nil = urlsplit(url)
-
-                if netloc:
-                    try:
-                        netloc_enc = netloc.encode("ascii")
-                    except UnicodeEncodeError:
-                        netloc_enc = netloc.encode("idna")
-                    self.putheader('Host', netloc_enc)
-                else:
-                    try:
-                        host_enc = self.host.encode("ascii")
-                    except UnicodeEncodeError:
-                        host_enc = self.host.encode("idna")
-
-                    # As per RFC 273, IPv6 address should be wrapped with []
-                    # when used as Host header
-
-                    if self.host.find(':') >= 0:
-                        host_enc = bytes(b'[' + host_enc + b']')
-
-                    if self.port == self.default_port:
-                        self.putheader('Host', host_enc)
-                    else:
-                        host_enc = host_enc.decode("ascii")
-                        self.putheader('Host', "%s:%s" % (host_enc, self.port))
-
-            # note: we are assuming that clients will not attempt to set these
-            #       headers since *this* library must deal with the
-            #       consequences. this also means that when the supporting
-            #       libraries are updated to recognize other forms, then this
-            #       code should be changed (removed or updated).
-
-            # we only want a Content-Encoding of "identity" since we don't
-            # support encodings such as x-gzip or x-deflate.
-            if not skip_accept_encoding:
-                self.putheader('Accept-Encoding', 'identity')
-
-            # we can accept "chunked" Transfer-Encodings, but no others
-            # NOTE: no TE header implies *only* "chunked"
-            #self.putheader('TE', 'chunked')
-
-            # if TE is supplied in the header, then it must appear in a
-            # Connection header.
-            #self.putheader('Connection', 'TE')
-
-        else:
-            # For HTTP/1.0, the server will assume "not chunked"
-            pass
-
-    def putheader(self, header, *values):
-        """Send a request header line to the server.
-
-        For example: h.putheader('Accept', 'text/html')
-        """
-        if self.__state != _CS_REQ_STARTED:
-            raise CannotSendHeader()
-
-        if hasattr(header, 'encode'):
-            header = header.encode('ascii')
-        values = list(values)
-        for i, one_value in enumerate(values):
-            if hasattr(one_value, 'encode'):
-                values[i] = one_value.encode('latin-1')
-            elif isinstance(one_value, int):
-                values[i] = str(one_value).encode('ascii')
-        value = bytes(b'\r\n\t').join(values)
-        header = header + bytes(b': ') + value
-        self._output(header)
-
-    def endheaders(self, message_body=None):
-        """Indicate that the last header line has been sent to the server.
-
-        This method sends the request to the server.  The optional message_body
-        argument can be used to pass a message body associated with the
-        request.  The message body will be sent in the same packet as the
-        message headers if it is a string, otherwise it is sent as a separate
-        packet.
-        """
-        if self.__state == _CS_REQ_STARTED:
-            self.__state = _CS_REQ_SENT
-        else:
-            raise CannotSendHeader()
-        self._send_output(message_body)
-
-    def request(self, method, url, body=None, headers={}):
-        """Send a complete request to the server."""
-        self._send_request(method, url, body, headers)
-
-    def _set_content_length(self, body):
-        # Set the content-length based on the body.
-        thelen = None
-        try:
-            thelen = str(len(body))
-        except TypeError as te:
-            # If this is a file-like object, try to
-            # fstat its file descriptor
-            try:
-                thelen = str(os.fstat(body.fileno()).st_size)
-            except (AttributeError, OSError):
-                # Don't send a length if this failed
-                if self.debuglevel > 0: print("Cannot stat!!")
-
-        if thelen is not None:
-            self.putheader('Content-Length', thelen)
-
-    def _send_request(self, method, url, body, headers):
-        # Honor explicitly requested Host: and Accept-Encoding: headers.
-        header_names = dict.fromkeys([k.lower() for k in headers])
-        skips = {}
-        if 'host' in header_names:
-            skips['skip_host'] = 1
-        if 'accept-encoding' in header_names:
-            skips['skip_accept_encoding'] = 1
-
-        self.putrequest(method, url, **skips)
-
-        if body is not None and ('content-length' not in header_names):
-            self._set_content_length(body)
-        for hdr, value in headers.items():
-            self.putheader(hdr, value)
-        if isinstance(body, str):
-            # RFC 2616 Section 3.7.1 says that text default has a
-            # default charset of iso-8859-1.
-            body = body.encode('iso-8859-1')
-        self.endheaders(body)
-
-    def getresponse(self):
-        """Get the response from the server.
-
-        If the HTTPConnection is in the correct state, returns an
-        instance of HTTPResponse or of whatever object is returned by
-        class the response_class variable.
-
-        If a request has not been sent or if a previous response has
-        not be handled, ResponseNotReady is raised.  If the HTTP
-        response indicates that the connection should be closed, then
-        it will be closed before the response is returned.  When the
-        connection is closed, the underlying socket is closed.
-        """
-
-        # if a prior response has been completed, then forget about it.
-        if self.__response and self.__response.isclosed():
-            self.__response = None
-
-        # if a prior response exists, then it must be completed (otherwise, we
-        # cannot read this response's header to determine the connection-close
-        # behavior)
-        #
-        # note: if a prior response existed, but was connection-close, then the
-        # socket and response were made independent of this HTTPConnection
-        # object since a new request requires that we open a whole new
-        # connection
-        #
-        # this means the prior response had one of two states:
-        #   1) will_close: this connection was reset and the prior socket and
-        #                  response operate independently
-        #   2) persistent: the response was retained and we await its
-        #                  isclosed() status to become true.
-        #
-        if self.__state != _CS_REQ_SENT or self.__response:
-            raise ResponseNotReady(self.__state)
-
-        if self.debuglevel > 0:
-            response = self.response_class(self.sock, self.debuglevel,
-                                           method=self._method)
-        else:
-            response = self.response_class(self.sock, method=self._method)
-
-        response.begin()
-        assert response.will_close != _UNKNOWN
-        self.__state = _CS_IDLE
-
-        if response.will_close:
-            # this effectively passes the connection to the response
-            self.close()
-        else:
-            # remember this, so we can tell when it is complete
-            self.__response = response
-
-        return response
-
-try:
-    import ssl
-    from ssl import SSLContext
-except ImportError:
-    pass
-else:
-    class HTTPSConnection(HTTPConnection):
-        "This class allows communication via SSL."
-
-        default_port = HTTPS_PORT
-
-        # XXX Should key_file and cert_file be deprecated in favour of context?
-
-        def __init__(self, host, port=None, key_file=None, cert_file=None,
-                     strict=_strict_sentinel, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
-                     source_address=None, **_3to2kwargs):
-            if 'check_hostname' in _3to2kwargs: check_hostname = _3to2kwargs['check_hostname']; del _3to2kwargs['check_hostname']
-            else: check_hostname = None
-            if 'context' in _3to2kwargs: context = _3to2kwargs['context']; del _3to2kwargs['context']
-            else: context = None
-            super(HTTPSConnection, self).__init__(host, port, strict, timeout,
-                                                  source_address)
-            self.key_file = key_file
-            self.cert_file = cert_file
-            if context is None:
-                # Some reasonable defaults
-                context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
-                context.options |= ssl.OP_NO_SSLv2
-            will_verify = context.verify_mode != ssl.CERT_NONE
-            if check_hostname is None:
-                check_hostname = will_verify
-            elif check_hostname and not will_verify:
-                raise ValueError("check_hostname needs a SSL context with "
-                                 "either CERT_OPTIONAL or CERT_REQUIRED")
-            if key_file or cert_file:
-                context.load_cert_chain(cert_file, key_file)
-            self._context = context
-            self._check_hostname = check_hostname
-
-        def connect(self):
-            "Connect to a host on a given (SSL) port."
-
-            sock = socket_create_connection((self.host, self.port),
-                                            self.timeout, self.source_address)
-
-            if self._tunnel_host:
-                self.sock = sock
-                self._tunnel()
-
-            server_hostname = self.host if ssl.HAS_SNI else None
-            self.sock = self._context.wrap_socket(sock,
-                                                  server_hostname=server_hostname)
-            try:
-                if self._check_hostname:
-                    ssl.match_hostname(self.sock.getpeercert(), self.host)
-            except Exception:
-                self.sock.shutdown(socket.SHUT_RDWR)
-                self.sock.close()
-                raise
-
-    __all__.append("HTTPSConnection")
-
-
-    # ######################################
-    # # We use the old HTTPSConnection class from Py2.7, because ssl.SSLContext
-    # # doesn't exist in the Py2.7 stdlib
-    # class HTTPSConnection(HTTPConnection):
-    #     "This class allows communication via SSL."
-
-    #     default_port = HTTPS_PORT
-
-    #     def __init__(self, host, port=None, key_file=None, cert_file=None,
-    #                  strict=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
-    #                  source_address=None):
-    #         HTTPConnection.__init__(self, host, port, strict, timeout,
-    #                                 source_address)
-    #         self.key_file = key_file
-    #         self.cert_file = cert_file
-
-    #     def connect(self):
-    #         "Connect to a host on a given (SSL) port."
-
-    #         sock = socket_create_connection((self.host, self.port),
-    #                                         self.timeout, self.source_address)
-    #         if self._tunnel_host:
-    #             self.sock = sock
-    #             self._tunnel()
-    #         self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file)
-
-    # __all__.append("HTTPSConnection")
-    # ######################################
-
-
-class HTTPException(Exception):
-    # Subclasses that define an __init__ must call Exception.__init__
-    # or define self.args.  Otherwise, str() will fail.
-    pass
-
-class NotConnected(HTTPException):
-    pass
-
-class InvalidURL(HTTPException):
-    pass
-
-class UnknownProtocol(HTTPException):
-    def __init__(self, version):
-        self.args = version,
-        self.version = version
-
-class UnknownTransferEncoding(HTTPException):
-    pass
-
-class UnimplementedFileMode(HTTPException):
-    pass
-
-class IncompleteRead(HTTPException):
-    def __init__(self, partial, expected=None):
-        self.args = partial,
-        self.partial = partial
-        self.expected = expected
-    def __repr__(self):
-        if self.expected is not None:
-            e = ', %i more expected' % self.expected
-        else:
-            e = ''
-        return 'IncompleteRead(%i bytes read%s)' % (len(self.partial), e)
-    def __str__(self):
-        return repr(self)
-
-class ImproperConnectionState(HTTPException):
-    pass
-
-class CannotSendRequest(ImproperConnectionState):
-    pass
-
-class CannotSendHeader(ImproperConnectionState):
-    pass
-
-class ResponseNotReady(ImproperConnectionState):
-    pass
-
-class BadStatusLine(HTTPException):
-    def __init__(self, line):
-        if not line:
-            line = repr(line)
-        self.args = line,
-        self.line = line
-
-class LineTooLong(HTTPException):
-    def __init__(self, line_type):
-        HTTPException.__init__(self, "got more than %d bytes when reading %s"
-                                     % (_MAXLINE, line_type))
-
-# for backwards compatibility
-error = HTTPException
diff --git a/lib/future/backports/http/cookiejar.py b/lib/future/backports/http/cookiejar.py
deleted file mode 100644
index a39242c0..00000000
--- a/lib/future/backports/http/cookiejar.py
+++ /dev/null
@@ -1,2116 +0,0 @@
-r"""HTTP cookie handling for web clients.
-
-This is a backport of the Py3.3 ``http.cookiejar`` module for
-python-future.
-
-This module has (now fairly distant) origins in Gisle Aas' Perl module
-HTTP::Cookies, from the libwww-perl library.
-
-Docstrings, comments and debug strings in this code refer to the
-attributes of the HTTP cookie system as cookie-attributes, to distinguish
-them clearly from Python attributes.
-
-Class diagram (note that BSDDBCookieJar and the MSIE* classes are not
-distributed with the Python standard library, but are available from
-http://wwwsearch.sf.net/):
-
-                        CookieJar____
-                        /     \      \
-            FileCookieJar      \      \
-             /    |   \         \      \
- MozillaCookieJar | LWPCookieJar \      \
-                  |               |      \
-                  |   ---MSIEBase |       \
-                  |  /      |     |        \
-                  | /   MSIEDBCookieJar BSDDBCookieJar
-                  |/
-               MSIECookieJar
-
-"""
-
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-from future.builtins import filter, int, map, open, str
-from future.utils import as_native_str, PY2
-
-__all__ = ['Cookie', 'CookieJar', 'CookiePolicy', 'DefaultCookiePolicy',
-           'FileCookieJar', 'LWPCookieJar', 'LoadError', 'MozillaCookieJar']
-
-import copy
-import datetime
-import re
-if PY2:
-    re.ASCII = 0
-import time
-from future.backports.urllib.parse import urlparse, urlsplit, quote
-from future.backports.http.client import HTTP_PORT
-try:
-    import threading as _threading
-except ImportError:
-    import dummy_threading as _threading
-from calendar import timegm
-
-debug = False   # set to True to enable debugging via the logging module
-logger = None
-
-def _debug(*args):
-    if not debug:
-        return
-    global logger
-    if not logger:
-        import logging
-        logger = logging.getLogger("http.cookiejar")
-    return logger.debug(*args)
-
-
-DEFAULT_HTTP_PORT = str(HTTP_PORT)
-MISSING_FILENAME_TEXT = ("a filename was not supplied (nor was the CookieJar "
-                         "instance initialised with one)")
-
-def _warn_unhandled_exception():
-    # There are a few catch-all except: statements in this module, for
-    # catching input that's bad in unexpected ways.  Warn if any
-    # exceptions are caught there.
-    import io, warnings, traceback
-    f = io.StringIO()
-    traceback.print_exc(None, f)
-    msg = f.getvalue()
-    warnings.warn("http.cookiejar bug!\n%s" % msg, stacklevel=2)
-
-
-# Date/time conversion
-# -----------------------------------------------------------------------------
-
-EPOCH_YEAR = 1970
-def _timegm(tt):
-    year, month, mday, hour, min, sec = tt[:6]
-    if ((year >= EPOCH_YEAR) and (1 <= month <= 12) and (1 <= mday <= 31) and
-        (0 <= hour <= 24) and (0 <= min <= 59) and (0 <= sec <= 61)):
-        return timegm(tt)
-    else:
-        return None
-
-DAYS = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]
-MONTHS = ["Jan", "Feb", "Mar", "Apr", "May", "Jun",
-          "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
-MONTHS_LOWER = []
-for month in MONTHS: MONTHS_LOWER.append(month.lower())
-
-def time2isoz(t=None):
-    """Return a string representing time in seconds since epoch, t.
-
-    If the function is called without an argument, it will use the current
-    time.
-
-    The format of the returned string is like "YYYY-MM-DD hh:mm:ssZ",
-    representing Universal Time (UTC, aka GMT).  An example of this format is:
-
-    1994-11-24 08:49:37Z
-
-    """
-    if t is None:
-        dt = datetime.datetime.utcnow()
-    else:
-        dt = datetime.datetime.utcfromtimestamp(t)
-    return "%04d-%02d-%02d %02d:%02d:%02dZ" % (
-        dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second)
-
-def time2netscape(t=None):
-    """Return a string representing time in seconds since epoch, t.
-
-    If the function is called without an argument, it will use the current
-    time.
-
-    The format of the returned string is like this:
-
-    Wed, DD-Mon-YYYY HH:MM:SS GMT
-
-    """
-    if t is None:
-        dt = datetime.datetime.utcnow()
-    else:
-        dt = datetime.datetime.utcfromtimestamp(t)
-    return "%s %02d-%s-%04d %02d:%02d:%02d GMT" % (
-        DAYS[dt.weekday()], dt.day, MONTHS[dt.month-1],
-        dt.year, dt.hour, dt.minute, dt.second)
-
-
-UTC_ZONES = {"GMT": None, "UTC": None, "UT": None, "Z": None}
-
-TIMEZONE_RE = re.compile(r"^([-+])?(\d\d?):?(\d\d)?$", re.ASCII)
-def offset_from_tz_string(tz):
-    offset = None
-    if tz in UTC_ZONES:
-        offset = 0
-    else:
-        m = TIMEZONE_RE.search(tz)
-        if m:
-            offset = 3600 * int(m.group(2))
-            if m.group(3):
-                offset = offset + 60 * int(m.group(3))
-            if m.group(1) == '-':
-                offset = -offset
-    return offset
-
-def _str2time(day, mon, yr, hr, min, sec, tz):
-    # translate month name to number
-    # month numbers start with 1 (January)
-    try:
-        mon = MONTHS_LOWER.index(mon.lower())+1
-    except ValueError:
-        # maybe it's already a number
-        try:
-            imon = int(mon)
-        except ValueError:
-            return None
-        if 1 <= imon <= 12:
-            mon = imon
-        else:
-            return None
-
-    # make sure clock elements are defined
-    if hr is None: hr = 0
-    if min is None: min = 0
-    if sec is None: sec = 0
-
-    yr = int(yr)
-    day = int(day)
-    hr = int(hr)
-    min = int(min)
-    sec = int(sec)
-
-    if yr < 1000:
-        # find "obvious" year
-        cur_yr = time.localtime(time.time())[0]
-        m = cur_yr % 100
-        tmp = yr
-        yr = yr + cur_yr - m
-        m = m - tmp
-        if abs(m) > 50:
-            if m > 0: yr = yr + 100
-            else: yr = yr - 100
-
-    # convert UTC time tuple to seconds since epoch (not timezone-adjusted)
-    t = _timegm((yr, mon, day, hr, min, sec, tz))
-
-    if t is not None:
-        # adjust time using timezone string, to get absolute time since epoch
-        if tz is None:
-            tz = "UTC"
-        tz = tz.upper()
-        offset = offset_from_tz_string(tz)
-        if offset is None:
-            return None
-        t = t - offset
-
-    return t
-
-STRICT_DATE_RE = re.compile(
-    r"^[SMTWF][a-z][a-z], (\d\d) ([JFMASOND][a-z][a-z]) "
-    "(\d\d\d\d) (\d\d):(\d\d):(\d\d) GMT$", re.ASCII)
-WEEKDAY_RE = re.compile(
-    r"^(?:Sun|Mon|Tue|Wed|Thu|Fri|Sat)[a-z]*,?\s*", re.I | re.ASCII)
-LOOSE_HTTP_DATE_RE = re.compile(
-    r"""^
-    (\d\d?)            # day
-       (?:\s+|[-\/])
-    (\w+)              # month
-        (?:\s+|[-\/])
-    (\d+)              # year
-    (?:
-          (?:\s+|:)    # separator before clock
-       (\d\d?):(\d\d)  # hour:min
-       (?::(\d\d))?    # optional seconds
-    )?                 # optional clock
-       \s*
-    (?:
-       ([-+]?\d{2,4}|(?![APap][Mm]\b)[A-Za-z]+) # timezone
-       \s*
-    )?
-    (?:
-       \(\w+\)         # ASCII representation of timezone in parens.
-       \s*
-    )?$""", re.X | re.ASCII)
-def http2time(text):
-    """Returns time in seconds since epoch of time represented by a string.
-
-    Return value is an integer.
-
-    None is returned if the format of str is unrecognized, the time is outside
-    the representable range, or the timezone string is not recognized.  If the
-    string contains no timezone, UTC is assumed.
-
-    The timezone in the string may be numerical (like "-0800" or "+0100") or a
-    string timezone (like "UTC", "GMT", "BST" or "EST").  Currently, only the
-    timezone strings equivalent to UTC (zero offset) are known to the function.
-
-    The function loosely parses the following formats:
-
-    Wed, 09 Feb 1994 22:23:32 GMT       -- HTTP format
-    Tuesday, 08-Feb-94 14:15:29 GMT     -- old rfc850 HTTP format
-    Tuesday, 08-Feb-1994 14:15:29 GMT   -- broken rfc850 HTTP format
-    09 Feb 1994 22:23:32 GMT            -- HTTP format (no weekday)
-    08-Feb-94 14:15:29 GMT              -- rfc850 format (no weekday)
-    08-Feb-1994 14:15:29 GMT            -- broken rfc850 format (no weekday)
-
-    The parser ignores leading and trailing whitespace.  The time may be
-    absent.
-
-    If the year is given with only 2 digits, the function will select the
-    century that makes the year closest to the current date.
-
-    """
-    # fast exit for strictly conforming string
-    m = STRICT_DATE_RE.search(text)
-    if m:
-        g = m.groups()
-        mon = MONTHS_LOWER.index(g[1].lower()) + 1
-        tt = (int(g[2]), mon, int(g[0]),
-              int(g[3]), int(g[4]), float(g[5]))
-        return _timegm(tt)
-
-    # No, we need some messy parsing...
-
-    # clean up
-    text = text.lstrip()
-    text = WEEKDAY_RE.sub("", text, 1)  # Useless weekday
-
-    # tz is time zone specifier string
-    day, mon, yr, hr, min, sec, tz = [None]*7
-
-    # loose regexp parse
-    m = LOOSE_HTTP_DATE_RE.search(text)
-    if m is not None:
-        day, mon, yr, hr, min, sec, tz = m.groups()
-    else:
-        return None  # bad format
-
-    return _str2time(day, mon, yr, hr, min, sec, tz)
-
-ISO_DATE_RE = re.compile(
-    """^
-    (\d{4})              # year
-       [-\/]?
-    (\d\d?)              # numerical month
-       [-\/]?
-    (\d\d?)              # day
-   (?:
-         (?:\s+|[-:Tt])  # separator before clock
-      (\d\d?):?(\d\d)    # hour:min
-      (?::?(\d\d(?:\.\d*)?))?  # optional seconds (and fractional)
-   )?                    # optional clock
-      \s*
-   (?:
-      ([-+]?\d\d?:?(:?\d\d)?
-       |Z|z)             # timezone  (Z is "zero meridian", i.e. GMT)
-      \s*
-   )?$""", re.X | re. ASCII)
-def iso2time(text):
-    """
-    As for http2time, but parses the ISO 8601 formats:
-
-    1994-02-03 14:15:29 -0100    -- ISO 8601 format
-    1994-02-03 14:15:29          -- zone is optional
-    1994-02-03                   -- only date
-    1994-02-03T14:15:29          -- Use T as separator
-    19940203T141529Z             -- ISO 8601 compact format
-    19940203                     -- only date
-
-    """
-    # clean up
-    text = text.lstrip()
-
-    # tz is time zone specifier string
-    day, mon, yr, hr, min, sec, tz = [None]*7
-
-    # loose regexp parse
-    m = ISO_DATE_RE.search(text)
-    if m is not None:
-        # XXX there's an extra bit of the timezone I'm ignoring here: is
-        #   this the right thing to do?
-        yr, mon, day, hr, min, sec, tz, _ = m.groups()
-    else:
-        return None  # bad format
-
-    return _str2time(day, mon, yr, hr, min, sec, tz)
-
-
-# Header parsing
-# -----------------------------------------------------------------------------
-
-def unmatched(match):
-    """Return unmatched part of re.Match object."""
-    start, end = match.span(0)
-    return match.string[:start]+match.string[end:]
-
-HEADER_TOKEN_RE =        re.compile(r"^\s*([^=\s;,]+)")
-HEADER_QUOTED_VALUE_RE = re.compile(r"^\s*=\s*\"([^\"\\]*(?:\\.[^\"\\]*)*)\"")
-HEADER_VALUE_RE =        re.compile(r"^\s*=\s*([^\s;,]*)")
-HEADER_ESCAPE_RE = re.compile(r"\\(.)")
-def split_header_words(header_values):
-    r"""Parse header values into a list of lists containing key,value pairs.
-
-    The function knows how to deal with ",", ";" and "=" as well as quoted
-    values after "=".  A list of space separated tokens are parsed as if they
-    were separated by ";".
-
-    If the header_values passed as argument contains multiple values, then they
-    are treated as if they were a single value separated by comma ",".
-
-    This means that this function is useful for parsing header fields that
-    follow this syntax (BNF as from the HTTP/1.1 specification, but we relax
-    the requirement for tokens).
-
-      headers           = #header
-      header            = (token | parameter) *( [";"] (token | parameter))
-
-      token             = 1*<any CHAR except CTLs or separators>
-      separators        = "(" | ")" | "<" | ">" | "@"
-                        | "," | ";" | ":" | "\" | <">
-                        | "/" | "[" | "]" | "?" | "="
-                        | "{" | "}" | SP | HT
-
-      quoted-string     = ( <"> *(qdtext | quoted-pair ) <"> )
-      qdtext            = <any TEXT except <">>
-      quoted-pair       = "\" CHAR
-
-      parameter         = attribute "=" value
-      attribute         = token
-      value             = token | quoted-string
-
-    Each header is represented by a list of key/value pairs.  The value for a
-    simple token (not part of a parameter) is None.  Syntactically incorrect
-    headers will not necessarily be parsed as you would want.
-
-    This is easier to describe with some examples:
-
-    >>> split_header_words(['foo="bar"; port="80,81"; discard, bar=baz'])
-    [[('foo', 'bar'), ('port', '80,81'), ('discard', None)], [('bar', 'baz')]]
-    >>> split_header_words(['text/html; charset="iso-8859-1"'])
-    [[('text/html', None), ('charset', 'iso-8859-1')]]
-    >>> split_header_words([r'Basic realm="\"foo\bar\""'])
-    [[('Basic', None), ('realm', '"foobar"')]]
-
-    """
-    assert not isinstance(header_values, str)
-    result = []
-    for text in header_values:
-        orig_text = text
-        pairs = []
-        while text:
-            m = HEADER_TOKEN_RE.search(text)
-            if m:
-                text = unmatched(m)
-                name = m.group(1)
-                m = HEADER_QUOTED_VALUE_RE.search(text)
-                if m:  # quoted value
-                    text = unmatched(m)
-                    value = m.group(1)
-                    value = HEADER_ESCAPE_RE.sub(r"\1", value)
-                else:
-                    m = HEADER_VALUE_RE.search(text)
-                    if m:  # unquoted value
-                        text = unmatched(m)
-                        value = m.group(1)
-                        value = value.rstrip()
-                    else:
-                        # no value, a lone token
-                        value = None
-                pairs.append((name, value))
-            elif text.lstrip().startswith(","):
-                # concatenated headers, as per RFC 2616 section 4.2
-                text = text.lstrip()[1:]
-                if pairs: result.append(pairs)
-                pairs = []
-            else:
-                # skip junk
-                non_junk, nr_junk_chars = re.subn("^[=\s;]*", "", text)
-                assert nr_junk_chars > 0, (
-                    "split_header_words bug: '%s', '%s', %s" %
-                    (orig_text, text, pairs))
-                text = non_junk
-        if pairs: result.append(pairs)
-    return result
-
-HEADER_JOIN_ESCAPE_RE = re.compile(r"([\"\\])")
-def join_header_words(lists):
-    """Do the inverse (almost) of the conversion done by split_header_words.
-
-    Takes a list of lists of (key, value) pairs and produces a single header
-    value.  Attribute values are quoted if needed.
-
-    >>> join_header_words([[("text/plain", None), ("charset", "iso-8859/1")]])
-    'text/plain; charset="iso-8859/1"'
-    >>> join_header_words([[("text/plain", None)], [("charset", "iso-8859/1")]])
-    'text/plain, charset="iso-8859/1"'
-
-    """
-    headers = []
-    for pairs in lists:
-        attr = []
-        for k, v in pairs:
-            if v is not None:
-                if not re.search(r"^\w+$", v):
-                    v = HEADER_JOIN_ESCAPE_RE.sub(r"\\\1", v)  # escape " and \
-                    v = '"%s"' % v
-                k = "%s=%s" % (k, v)
-            attr.append(k)
-        if attr: headers.append("; ".join(attr))
-    return ", ".join(headers)
-
-def strip_quotes(text):
-    if text.startswith('"'):
-        text = text[1:]
-    if text.endswith('"'):
-        text = text[:-1]
-    return text
-
-def parse_ns_headers(ns_headers):
-    """Ad-hoc parser for Netscape protocol cookie-attributes.
-
-    The old Netscape cookie format for Set-Cookie can for instance contain
-    an unquoted "," in the expires field, so we have to use this ad-hoc
-    parser instead of split_header_words.
-
-    XXX This may not make the best possible effort to parse all the crap
-    that Netscape Cookie headers contain.  Ronald Tschalar's HTTPClient
-    parser is probably better, so could do worse than following that if
-    this ever gives any trouble.
-
-    Currently, this is also used for parsing RFC 2109 cookies.
-
-    """
-    known_attrs = ("expires", "domain", "path", "secure",
-                   # RFC 2109 attrs (may turn up in Netscape cookies, too)
-                   "version", "port", "max-age")
-
-    result = []
-    for ns_header in ns_headers:
-        pairs = []
-        version_set = False
-        for ii, param in enumerate(re.split(r";\s*", ns_header)):
-            param = param.rstrip()
-            if param == "": continue
-            if "=" not in param:
-                k, v = param, None
-            else:
-                k, v = re.split(r"\s*=\s*", param, 1)
-                k = k.lstrip()
-            if ii != 0:
-                lc = k.lower()
-                if lc in known_attrs:
-                    k = lc
-                if k == "version":
-                    # This is an RFC 2109 cookie.
-                    v = strip_quotes(v)
-                    version_set = True
-                if k == "expires":
-                    # convert expires date to seconds since epoch
-                    v = http2time(strip_quotes(v))  # None if invalid
-            pairs.append((k, v))
-
-        if pairs:
-            if not version_set:
-                pairs.append(("version", "0"))
-            result.append(pairs)
-
-    return result
-
-
-IPV4_RE = re.compile(r"\.\d+$", re.ASCII)
-def is_HDN(text):
-    """Return True if text is a host domain name."""
-    # XXX
-    # This may well be wrong.  Which RFC is HDN defined in, if any (for
-    #  the purposes of RFC 2965)?
-    # For the current implementation, what about IPv6?  Remember to look
-    #  at other uses of IPV4_RE also, if change this.
-    if IPV4_RE.search(text):
-        return False
-    if text == "":
-        return False
-    if text[0] == "." or text[-1] == ".":
-        return False
-    return True
-
-def domain_match(A, B):
-    """Return True if domain A domain-matches domain B, according to RFC 2965.
-
-    A and B may be host domain names or IP addresses.
-
-    RFC 2965, section 1:
-
-    Host names can be specified either as an IP address or a HDN string.
-    Sometimes we compare one host name with another.  (Such comparisons SHALL
-    be case-insensitive.)  Host A's name domain-matches host B's if
-
-         *  their host name strings string-compare equal; or
-
-         * A is a HDN string and has the form NB, where N is a non-empty
-            name string, B has the form .B', and B' is a HDN string.  (So,
-            x.y.com domain-matches .Y.com but not Y.com.)
-
-    Note that domain-match is not a commutative operation: a.b.c.com
-    domain-matches .c.com, but not the reverse.
-
-    """
-    # Note that, if A or B are IP addresses, the only relevant part of the
-    # definition of the domain-match algorithm is the direct string-compare.
-    A = A.lower()
-    B = B.lower()
-    if A == B:
-        return True
-    if not is_HDN(A):
-        return False
-    i = A.rfind(B)
-    if i == -1 or i == 0:
-        # A does not have form NB, or N is the empty string
-        return False
-    if not B.startswith("."):
-        return False
-    if not is_HDN(B[1:]):
-        return False
-    return True
-
-def liberal_is_HDN(text):
-    """Return True if text is a sort-of-like a host domain name.
-
-    For accepting/blocking domains.
-
-    """
-    if IPV4_RE.search(text):
-        return False
-    return True
-
-def user_domain_match(A, B):
-    """For blocking/accepting domains.
-
-    A and B may be host domain names or IP addresses.
-
-    """
-    A = A.lower()
-    B = B.lower()
-    if not (liberal_is_HDN(A) and liberal_is_HDN(B)):
-        if A == B:
-            # equal IP addresses
-            return True
-        return False
-    initial_dot = B.startswith(".")
-    if initial_dot and A.endswith(B):
-        return True
-    if not initial_dot and A == B:
-        return True
-    return False
-
-cut_port_re = re.compile(r":\d+$", re.ASCII)
-def request_host(request):
-    """Return request-host, as defined by RFC 2965.
-
-    Variation from RFC: returned value is lowercased, for convenient
-    comparison.
-
-    """
-    url = request.get_full_url()
-    host = urlparse(url)[1]
-    if host == "":
-        host = request.get_header("Host", "")
-
-    # remove port, if present
-    host = cut_port_re.sub("", host, 1)
-    return host.lower()
-
-def eff_request_host(request):
-    """Return a tuple (request-host, effective request-host name).
-
-    As defined by RFC 2965, except both are lowercased.
-
-    """
-    erhn = req_host = request_host(request)
-    if req_host.find(".") == -1 and not IPV4_RE.search(req_host):
-        erhn = req_host + ".local"
-    return req_host, erhn
-
-def request_path(request):
-    """Path component of request-URI, as defined by RFC 2965."""
-    url = request.get_full_url()
-    parts = urlsplit(url)
-    path = escape_path(parts.path)
-    if not path.startswith("/"):
-        # fix bad RFC 2396 absoluteURI
-        path = "/" + path
-    return path
-
-def request_port(request):
-    host = request.host
-    i = host.find(':')
-    if i >= 0:
-        port = host[i+1:]
-        try:
-            int(port)
-        except ValueError:
-            _debug("nonnumeric port: '%s'", port)
-            return None
-    else:
-        port = DEFAULT_HTTP_PORT
-    return port
-
-# Characters in addition to A-Z, a-z, 0-9, '_', '.', and '-' that don't
-# need to be escaped to form a valid HTTP URL (RFCs 2396 and 1738).
-HTTP_PATH_SAFE = "%/;:@&=+$,!~*'()"
-ESCAPED_CHAR_RE = re.compile(r"%([0-9a-fA-F][0-9a-fA-F])")
-def uppercase_escaped_char(match):
-    return "%%%s" % match.group(1).upper()
-def escape_path(path):
-    """Escape any invalid characters in HTTP URL, and uppercase all escapes."""
-    # There's no knowing what character encoding was used to create URLs
-    # containing %-escapes, but since we have to pick one to escape invalid
-    # path characters, we pick UTF-8, as recommended in the HTML 4.0
-    # specification:
-    # http://www.w3.org/TR/REC-html40/appendix/notes.html#h-B.2.1
-    # And here, kind of: draft-fielding-uri-rfc2396bis-03
-    # (And in draft IRI specification: draft-duerst-iri-05)
-    # (And here, for new URI schemes: RFC 2718)
-    path = quote(path, HTTP_PATH_SAFE)
-    path = ESCAPED_CHAR_RE.sub(uppercase_escaped_char, path)
-    return path
-
-def reach(h):
-    """Return reach of host h, as defined by RFC 2965, section 1.
-
-    The reach R of a host name H is defined as follows:
-
-       *  If
-
-          -  H is the host domain name of a host; and,
-
-          -  H has the form A.B; and
-
-          -  A has no embedded (that is, interior) dots; and
-
-          -  B has at least one embedded dot, or B is the string "local".
-             then the reach of H is .B.
-
-       *  Otherwise, the reach of H is H.
-
-    >>> reach("www.acme.com")
-    '.acme.com'
-    >>> reach("acme.com")
-    'acme.com'
-    >>> reach("acme.local")
-    '.local'
-
-    """
-    i = h.find(".")
-    if i >= 0:
-        #a = h[:i]  # this line is only here to show what a is
-        b = h[i+1:]
-        i = b.find(".")
-        if is_HDN(h) and (i >= 0 or b == "local"):
-            return "."+b
-    return h
-
-def is_third_party(request):
-    """
-
-    RFC 2965, section 3.3.6:
-
-        An unverifiable transaction is to a third-party host if its request-
-        host U does not domain-match the reach R of the request-host O in the
-        origin transaction.
-
-    """
-    req_host = request_host(request)
-    if not domain_match(req_host, reach(request.get_origin_req_host())):
-        return True
-    else:
-        return False
-
-
-class Cookie(object):
-    """HTTP Cookie.
-
-    This class represents both Netscape and RFC 2965 cookies.
-
-    This is deliberately a very simple class.  It just holds attributes.  It's
-    possible to construct Cookie instances that don't comply with the cookie
-    standards.  CookieJar.make_cookies is the factory function for Cookie
-    objects -- it deals with cookie parsing, supplying defaults, and
-    normalising to the representation used in this class.  CookiePolicy is
-    responsible for checking them to see whether they should be accepted from
-    and returned to the server.
-
-    Note that the port may be present in the headers, but unspecified ("Port"
-    rather than"Port=80", for example); if this is the case, port is None.
-
-    """
-
-    def __init__(self, version, name, value,
-                 port, port_specified,
-                 domain, domain_specified, domain_initial_dot,
-                 path, path_specified,
-                 secure,
-                 expires,
-                 discard,
-                 comment,
-                 comment_url,
-                 rest,
-                 rfc2109=False,
-                 ):
-
-        if version is not None: version = int(version)
-        if expires is not None: expires = int(expires)
-        if port is None and port_specified is True:
-            raise ValueError("if port is None, port_specified must be false")
-
-        self.version = version
-        self.name = name
-        self.value = value
-        self.port = port
-        self.port_specified = port_specified
-        # normalise case, as per RFC 2965 section 3.3.3
-        self.domain = domain.lower()
-        self.domain_specified = domain_specified
-        # Sigh.  We need to know whether the domain given in the
-        # cookie-attribute had an initial dot, in order to follow RFC 2965
-        # (as clarified in draft errata).  Needed for the returned $Domain
-        # value.
-        self.domain_initial_dot = domain_initial_dot
-        self.path = path
-        self.path_specified = path_specified
-        self.secure = secure
-        self.expires = expires
-        self.discard = discard
-        self.comment = comment
-        self.comment_url = comment_url
-        self.rfc2109 = rfc2109
-
-        self._rest = copy.copy(rest)
-
-    def has_nonstandard_attr(self, name):
-        return name in self._rest
-    def get_nonstandard_attr(self, name, default=None):
-        return self._rest.get(name, default)
-    def set_nonstandard_attr(self, name, value):
-        self._rest[name] = value
-
-    def is_expired(self, now=None):
-        if now is None: now = time.time()
-        if (self.expires is not None) and (self.expires <= now):
-            return True
-        return False
-
-    def __str__(self):
-        if self.port is None: p = ""
-        else: p = ":"+self.port
-        limit = self.domain + p + self.path
-        if self.value is not None:
-            namevalue = "%s=%s" % (self.name, self.value)
-        else:
-            namevalue = self.name
-        return "<Cookie %s for %s>" % (namevalue, limit)
-
-    @as_native_str()
-    def __repr__(self):
-        args = []
-        for name in ("version", "name", "value",
-                     "port", "port_specified",
-                     "domain", "domain_specified", "domain_initial_dot",
-                     "path", "path_specified",
-                     "secure", "expires", "discard", "comment", "comment_url",
-                     ):
-            attr = getattr(self, name)
-            ### Python-Future:
-            # Avoid u'...' prefixes for unicode strings:
-            if isinstance(attr, str):
-                attr = str(attr)
-            ###
-            args.append(str("%s=%s") % (name, repr(attr)))
-        args.append("rest=%s" % repr(self._rest))
-        args.append("rfc2109=%s" % repr(self.rfc2109))
-        return "Cookie(%s)" % ", ".join(args)
-
-
-class CookiePolicy(object):
-    """Defines which cookies get accepted from and returned to server.
-
-    May also modify cookies, though this is probably a bad idea.
-
-    The subclass DefaultCookiePolicy defines the standard rules for Netscape
-    and RFC 2965 cookies -- override that if you want a customised policy.
-
-    """
-    def set_ok(self, cookie, request):
-        """Return true if (and only if) cookie should be accepted from server.
-
-        Currently, pre-expired cookies never get this far -- the CookieJar
-        class deletes such cookies itself.
-
-        """
-        raise NotImplementedError()
-
-    def return_ok(self, cookie, request):
-        """Return true if (and only if) cookie should be returned to server."""
-        raise NotImplementedError()
-
-    def domain_return_ok(self, domain, request):
-        """Return false if cookies should not be returned, given cookie domain.
-        """
-        return True
-
-    def path_return_ok(self, path, request):
-        """Return false if cookies should not be returned, given cookie path.
-        """
-        return True
-
-
-class DefaultCookiePolicy(CookiePolicy):
-    """Implements the standard rules for accepting and returning cookies."""
-
-    DomainStrictNoDots = 1
-    DomainStrictNonDomain = 2
-    DomainRFC2965Match = 4
-
-    DomainLiberal = 0
-    DomainStrict = DomainStrictNoDots|DomainStrictNonDomain
-
-    def __init__(self,
-                 blocked_domains=None, allowed_domains=None,
-                 netscape=True, rfc2965=False,
-                 rfc2109_as_netscape=None,
-                 hide_cookie2=False,
-                 strict_domain=False,
-                 strict_rfc2965_unverifiable=True,
-                 strict_ns_unverifiable=False,
-                 strict_ns_domain=DomainLiberal,
-                 strict_ns_set_initial_dollar=False,
-                 strict_ns_set_path=False,
-                 ):
-        """Constructor arguments should be passed as keyword arguments only."""
-        self.netscape = netscape
-        self.rfc2965 = rfc2965
-        self.rfc2109_as_netscape = rfc2109_as_netscape
-        self.hide_cookie2 = hide_cookie2
-        self.strict_domain = strict_domain
-        self.strict_rfc2965_unverifiable = strict_rfc2965_unverifiable
-        self.strict_ns_unverifiable = strict_ns_unverifiable
-        self.strict_ns_domain = strict_ns_domain
-        self.strict_ns_set_initial_dollar = strict_ns_set_initial_dollar
-        self.strict_ns_set_path = strict_ns_set_path
-
-        if blocked_domains is not None:
-            self._blocked_domains = tuple(blocked_domains)
-        else:
-            self._blocked_domains = ()
-
-        if allowed_domains is not None:
-            allowed_domains = tuple(allowed_domains)
-        self._allowed_domains = allowed_domains
-
-    def blocked_domains(self):
-        """Return the sequence of blocked domains (as a tuple)."""
-        return self._blocked_domains
-    def set_blocked_domains(self, blocked_domains):
-        """Set the sequence of blocked domains."""
-        self._blocked_domains = tuple(blocked_domains)
-
-    def is_blocked(self, domain):
-        for blocked_domain in self._blocked_domains:
-            if user_domain_match(domain, blocked_domain):
-                return True
-        return False
-
-    def allowed_domains(self):
-        """Return None, or the sequence of allowed domains (as a tuple)."""
-        return self._allowed_domains
-    def set_allowed_domains(self, allowed_domains):
-        """Set the sequence of allowed domains, or None."""
-        if allowed_domains is not None:
-            allowed_domains = tuple(allowed_domains)
-        self._allowed_domains = allowed_domains
-
-    def is_not_allowed(self, domain):
-        if self._allowed_domains is None:
-            return False
-        for allowed_domain in self._allowed_domains:
-            if user_domain_match(domain, allowed_domain):
-                return False
-        return True
-
-    def set_ok(self, cookie, request):
-        """
-        If you override .set_ok(), be sure to call this method.  If it returns
-        false, so should your subclass (assuming your subclass wants to be more
-        strict about which cookies to accept).
-
-        """
-        _debug(" - checking cookie %s=%s", cookie.name, cookie.value)
-
-        assert cookie.name is not None
-
-        for n in "version", "verifiability", "name", "path", "domain", "port":
-            fn_name = "set_ok_"+n
-            fn = getattr(self, fn_name)
-            if not fn(cookie, request):
-                return False
-
-        return True
-
-    def set_ok_version(self, cookie, request):
-        if cookie.version is None:
-            # Version is always set to 0 by parse_ns_headers if it's a Netscape
-            # cookie, so this must be an invalid RFC 2965 cookie.
-            _debug("   Set-Cookie2 without version attribute (%s=%s)",
-                   cookie.name, cookie.value)
-            return False
-        if cookie.version > 0 and not self.rfc2965:
-            _debug("   RFC 2965 cookies are switched off")
-            return False
-        elif cookie.version == 0 and not self.netscape:
-            _debug("   Netscape cookies are switched off")
-            return False
-        return True
-
-    def set_ok_verifiability(self, cookie, request):
-        if request.unverifiable and is_third_party(request):
-            if cookie.version > 0 and self.strict_rfc2965_unverifiable:
-                _debug("   third-party RFC 2965 cookie during "
-                             "unverifiable transaction")
-                return False
-            elif cookie.version == 0 and self.strict_ns_unverifiable:
-                _debug("   third-party Netscape cookie during "
-                             "unverifiable transaction")
-                return False
-        return True
-
-    def set_ok_name(self, cookie, request):
-        # Try and stop servers setting V0 cookies designed to hack other
-        # servers that know both V0 and V1 protocols.
-        if (cookie.version == 0 and self.strict_ns_set_initial_dollar and
-            cookie.name.startswith("$")):
-            _debug("   illegal name (starts with '$'): '%s'", cookie.name)
-            return False
-        return True
-
-    def set_ok_path(self, cookie, request):
-        if cookie.path_specified:
-            req_path = request_path(request)
-            if ((cookie.version > 0 or
-                 (cookie.version == 0 and self.strict_ns_set_path)) and
-                not req_path.startswith(cookie.path)):
-                _debug("   path attribute %s is not a prefix of request "
-                       "path %s", cookie.path, req_path)
-                return False
-        return True
-
-    def set_ok_domain(self, cookie, request):
-        if self.is_blocked(cookie.domain):
-            _debug("   domain %s is in user block-list", cookie.domain)
-            return False
-        if self.is_not_allowed(cookie.domain):
-            _debug("   domain %s is not in user allow-list", cookie.domain)
-            return False
-        if cookie.domain_specified:
-            req_host, erhn = eff_request_host(request)
-            domain = cookie.domain
-            if self.strict_domain and (domain.count(".") >= 2):
-                # XXX This should probably be compared with the Konqueror
-                # (kcookiejar.cpp) and Mozilla implementations, but it's a
-                # losing battle.
-                i = domain.rfind(".")
-                j = domain.rfind(".", 0, i)
-                if j == 0:  # domain like .foo.bar
-                    tld = domain[i+1:]
-                    sld = domain[j+1:i]
-                    if sld.lower() in ("co", "ac", "com", "edu", "org", "net",
-                       "gov", "mil", "int", "aero", "biz", "cat", "coop",
-                       "info", "jobs", "mobi", "museum", "name", "pro",
-                       "travel", "eu") and len(tld) == 2:
-                        # domain like .co.uk
-                        _debug("   country-code second level domain %s", domain)
-                        return False
-            if domain.startswith("."):
-                undotted_domain = domain[1:]
-            else:
-                undotted_domain = domain
-            embedded_dots = (undotted_domain.find(".") >= 0)
-            if not embedded_dots and domain != ".local":
-                _debug("   non-local domain %s contains no embedded dot",
-                       domain)
-                return False
-            if cookie.version == 0:
-                if (not erhn.endswith(domain) and
-                    (not erhn.startswith(".") and
-                     not ("."+erhn).endswith(domain))):
-                    _debug("   effective request-host %s (even with added "
-                           "initial dot) does not end with %s",
-                           erhn, domain)
-                    return False
-            if (cookie.version > 0 or
-                (self.strict_ns_domain & self.DomainRFC2965Match)):
-                if not domain_match(erhn, domain):
-                    _debug("   effective request-host %s does not domain-match "
-                           "%s", erhn, domain)
-                    return False
-            if (cookie.version > 0 or
-                (self.strict_ns_domain & self.DomainStrictNoDots)):
-                host_prefix = req_host[:-len(domain)]
-                if (host_prefix.find(".") >= 0 and
-                    not IPV4_RE.search(req_host)):
-                    _debug("   host prefix %s for domain %s contains a dot",
-                           host_prefix, domain)
-                    return False
-        return True
-
-    def set_ok_port(self, cookie, request):
-        if cookie.port_specified:
-            req_port = request_port(request)
-            if req_port is None:
-                req_port = "80"
-            else:
-                req_port = str(req_port)
-            for p in cookie.port.split(","):
-                try:
-                    int(p)
-                except ValueError:
-                    _debug("   bad port %s (not numeric)", p)
-                    return False
-                if p == req_port:
-                    break
-            else:
-                _debug("   request port (%s) not found in %s",
-                       req_port, cookie.port)
-                return False
-        return True
-
-    def return_ok(self, cookie, request):
-        """
-        If you override .return_ok(), be sure to call this method.  If it
-        returns false, so should your subclass (assuming your subclass wants to
-        be more strict about which cookies to return).
-
-        """
-        # Path has already been checked by .path_return_ok(), and domain
-        # blocking done by .domain_return_ok().
-        _debug(" - checking cookie %s=%s", cookie.name, cookie.value)
-
-        for n in "version", "verifiability", "secure", "expires", "port", "domain":
-            fn_name = "return_ok_"+n
-            fn = getattr(self, fn_name)
-            if not fn(cookie, request):
-                return False
-        return True
-
-    def return_ok_version(self, cookie, request):
-        if cookie.version > 0 and not self.rfc2965:
-            _debug("   RFC 2965 cookies are switched off")
-            return False
-        elif cookie.version == 0 and not self.netscape:
-            _debug("   Netscape cookies are switched off")
-            return False
-        return True
-
-    def return_ok_verifiability(self, cookie, request):
-        if request.unverifiable and is_third_party(request):
-            if cookie.version > 0 and self.strict_rfc2965_unverifiable:
-                _debug("   third-party RFC 2965 cookie during unverifiable "
-                       "transaction")
-                return False
-            elif cookie.version == 0 and self.strict_ns_unverifiable:
-                _debug("   third-party Netscape cookie during unverifiable "
-                       "transaction")
-                return False
-        return True
-
-    def return_ok_secure(self, cookie, request):
-        if cookie.secure and request.type != "https":
-            _debug("   secure cookie with non-secure request")
-            return False
-        return True
-
-    def return_ok_expires(self, cookie, request):
-        if cookie.is_expired(self._now):
-            _debug("   cookie expired")
-            return False
-        return True
-
-    def return_ok_port(self, cookie, request):
-        if cookie.port:
-            req_port = request_port(request)
-            if req_port is None:
-                req_port = "80"
-            for p in cookie.port.split(","):
-                if p == req_port:
-                    break
-            else:
-                _debug("   request port %s does not match cookie port %s",
-                       req_port, cookie.port)
-                return False
-        return True
-
-    def return_ok_domain(self, cookie, request):
-        req_host, erhn = eff_request_host(request)
-        domain = cookie.domain
-
-        # strict check of non-domain cookies: Mozilla does this, MSIE5 doesn't
-        if (cookie.version == 0 and
-            (self.strict_ns_domain & self.DomainStrictNonDomain) and
-            not cookie.domain_specified and domain != erhn):
-            _debug("   cookie with unspecified domain does not string-compare "
-                   "equal to request domain")
-            return False
-
-        if cookie.version > 0 and not domain_match(erhn, domain):
-            _debug("   effective request-host name %s does not domain-match "
-                   "RFC 2965 cookie domain %s", erhn, domain)
-            return False
-        if cookie.version == 0 and not ("."+erhn).endswith(domain):
-            _debug("   request-host %s does not match Netscape cookie domain "
-                   "%s", req_host, domain)
-            return False
-        return True
-
-    def domain_return_ok(self, domain, request):
-        # Liberal check of.  This is here as an optimization to avoid
-        # having to load lots of MSIE cookie files unless necessary.
-        req_host, erhn = eff_request_host(request)
-        if not req_host.startswith("."):
-            req_host = "."+req_host
-        if not erhn.startswith("."):
-            erhn = "."+erhn
-        if not (req_host.endswith(domain) or erhn.endswith(domain)):
-            #_debug("   request domain %s does not match cookie domain %s",
-            #       req_host, domain)
-            return False
-
-        if self.is_blocked(domain):
-            _debug("   domain %s is in user block-list", domain)
-            return False
-        if self.is_not_allowed(domain):
-            _debug("   domain %s is not in user allow-list", domain)
-            return False
-
-        return True
-
-    def path_return_ok(self, path, request):
-        _debug("- checking cookie path=%s", path)
-        req_path = request_path(request)
-        if not req_path.startswith(path):
-            _debug("  %s does not path-match %s", req_path, path)
-            return False
-        return True
-
-
-def vals_sorted_by_key(adict):
-    keys = sorted(adict.keys())
-    return map(adict.get, keys)
-
-def deepvalues(mapping):
-    """Iterates over nested mapping, depth-first, in sorted order by key."""
-    values = vals_sorted_by_key(mapping)
-    for obj in values:
-        mapping = False
-        try:
-            obj.items
-        except AttributeError:
-            pass
-        else:
-            mapping = True
-            for subobj in deepvalues(obj):
-                yield subobj
-        if not mapping:
-            yield obj
-
-
-# Used as second parameter to dict.get() method, to distinguish absent
-# dict key from one with a None value.
-class Absent(object): pass
-
-class CookieJar(object):
-    """Collection of HTTP cookies.
-
-    You may not need to know about this class: try
-    urllib.request.build_opener(HTTPCookieProcessor).open(url).
-    """
-
-    non_word_re = re.compile(r"\W")
-    quote_re = re.compile(r"([\"\\])")
-    strict_domain_re = re.compile(r"\.?[^.]*")
-    domain_re = re.compile(r"[^.]*")
-    dots_re = re.compile(r"^\.+")
-
-    magic_re = re.compile(r"^\#LWP-Cookies-(\d+\.\d+)", re.ASCII)
-
-    def __init__(self, policy=None):
-        if policy is None:
-            policy = DefaultCookiePolicy()
-        self._policy = policy
-
-        self._cookies_lock = _threading.RLock()
-        self._cookies = {}
-
-    def set_policy(self, policy):
-        self._policy = policy
-
-    def _cookies_for_domain(self, domain, request):
-        cookies = []
-        if not self._policy.domain_return_ok(domain, request):
-            return []
-        _debug("Checking %s for cookies to return", domain)
-        cookies_by_path = self._cookies[domain]
-        for path in cookies_by_path.keys():
-            if not self._policy.path_return_ok(path, request):
-                continue
-            cookies_by_name = cookies_by_path[path]
-            for cookie in cookies_by_name.values():
-                if not self._policy.return_ok(cookie, request):
-                    _debug("   not returning cookie")
-                    continue
-                _debug("   it's a match")
-                cookies.append(cookie)
-        return cookies
-
-    def _cookies_for_request(self, request):
-        """Return a list of cookies to be returned to server."""
-        cookies = []
-        for domain in self._cookies.keys():
-            cookies.extend(self._cookies_for_domain(domain, request))
-        return cookies
-
-    def _cookie_attrs(self, cookies):
-        """Return a list of cookie-attributes to be returned to server.
-
-        like ['foo="bar"; $Path="/"', ...]
-
-        The $Version attribute is also added when appropriate (currently only
-        once per request).
-
-        """
-        # add cookies in order of most specific (ie. longest) path first
-        cookies.sort(key=lambda a: len(a.path), reverse=True)
-
-        version_set = False
-
-        attrs = []
-        for cookie in cookies:
-            # set version of Cookie header
-            # XXX
-            # What should it be if multiple matching Set-Cookie headers have
-            #  different versions themselves?
-            # Answer: there is no answer; was supposed to be settled by
-            #  RFC 2965 errata, but that may never appear...
-            version = cookie.version
-            if not version_set:
-                version_set = True
-                if version > 0:
-                    attrs.append("$Version=%s" % version)
-
-            # quote cookie value if necessary
-            # (not for Netscape protocol, which already has any quotes
-            #  intact, due to the poorly-specified Netscape Cookie: syntax)
-            if ((cookie.value is not None) and
-                self.non_word_re.search(cookie.value) and version > 0):
-                value = self.quote_re.sub(r"\\\1", cookie.value)
-            else:
-                value = cookie.value
-
-            # add cookie-attributes to be returned in Cookie header
-            if cookie.value is None:
-                attrs.append(cookie.name)
-            else:
-                attrs.append("%s=%s" % (cookie.name, value))
-            if version > 0:
-                if cookie.path_specified:
-                    attrs.append('$Path="%s"' % cookie.path)
-                if cookie.domain.startswith("."):
-                    domain = cookie.domain
-                    if (not cookie.domain_initial_dot and
-                        domain.startswith(".")):
-                        domain = domain[1:]
-                    attrs.append('$Domain="%s"' % domain)
-                if cookie.port is not None:
-                    p = "$Port"
-                    if cookie.port_specified:
-                        p = p + ('="%s"' % cookie.port)
-                    attrs.append(p)
-
-        return attrs
-
-    def add_cookie_header(self, request):
-        """Add correct Cookie: header to request (urllib.request.Request object).
-
-        The Cookie2 header is also added unless policy.hide_cookie2 is true.
-
-        """
-        _debug("add_cookie_header")
-        self._cookies_lock.acquire()
-        try:
-
-            self._policy._now = self._now = int(time.time())
-
-            cookies = self._cookies_for_request(request)
-
-            attrs = self._cookie_attrs(cookies)
-            if attrs:
-                if not request.has_header("Cookie"):
-                    request.add_unredirected_header(
-                        "Cookie", "; ".join(attrs))
-
-            # if necessary, advertise that we know RFC 2965
-            if (self._policy.rfc2965 and not self._policy.hide_cookie2 and
-                not request.has_header("Cookie2")):
-                for cookie in cookies:
-                    if cookie.version != 1:
-                        request.add_unredirected_header("Cookie2", '$Version="1"')
-                        break
-
-        finally:
-            self._cookies_lock.release()
-
-        self.clear_expired_cookies()
-
-    def _normalized_cookie_tuples(self, attrs_set):
-        """Return list of tuples containing normalised cookie information.
-
-        attrs_set is the list of lists of key,value pairs extracted from
-        the Set-Cookie or Set-Cookie2 headers.
-
-        Tuples are name, value, standard, rest, where name and value are the
-        cookie name and value, standard is a dictionary containing the standard
-        cookie-attributes (discard, secure, version, expires or max-age,
-        domain, path and port) and rest is a dictionary containing the rest of
-        the cookie-attributes.
-
-        """
-        cookie_tuples = []
-
-        boolean_attrs = "discard", "secure"
-        value_attrs = ("version",
-                       "expires", "max-age",
-                       "domain", "path", "port",
-                       "comment", "commenturl")
-
-        for cookie_attrs in attrs_set:
-            name, value = cookie_attrs[0]
-
-            # Build dictionary of standard cookie-attributes (standard) and
-            # dictionary of other cookie-attributes (rest).
-
-            # Note: expiry time is normalised to seconds since epoch.  V0
-            # cookies should have the Expires cookie-attribute, and V1 cookies
-            # should have Max-Age, but since V1 includes RFC 2109 cookies (and
-            # since V0 cookies may be a mish-mash of Netscape and RFC 2109), we
-            # accept either (but prefer Max-Age).
-            max_age_set = False
-
-            bad_cookie = False
-
-            standard = {}
-            rest = {}
-            for k, v in cookie_attrs[1:]:
-                lc = k.lower()
-                # don't lose case distinction for unknown fields
-                if lc in value_attrs or lc in boolean_attrs:
-                    k = lc
-                if k in boolean_attrs and v is None:
-                    # boolean cookie-attribute is present, but has no value
-                    # (like "discard", rather than "port=80")
-                    v = True
-                if k in standard:
-                    # only first value is significant
-                    continue
-                if k == "domain":
-                    if v is None:
-                        _debug("   missing value for domain attribute")
-                        bad_cookie = True
-                        break
-                    # RFC 2965 section 3.3.3
-                    v = v.lower()
-                if k == "expires":
-                    if max_age_set:
-                        # Prefer max-age to expires (like Mozilla)
-                        continue
-                    if v is None:
-                        _debug("   missing or invalid value for expires "
-                              "attribute: treating as session cookie")
-                        continue
-                if k == "max-age":
-                    max_age_set = True
-                    try:
-                        v = int(v)
-                    except ValueError:
-                        _debug("   missing or invalid (non-numeric) value for "
-                              "max-age attribute")
-                        bad_cookie = True
-                        break
-                    # convert RFC 2965 Max-Age to seconds since epoch
-                    # XXX Strictly you're supposed to follow RFC 2616
-                    #   age-calculation rules.  Remember that zero Max-Age is a
-                    #   is a request to discard (old and new) cookie, though.
-                    k = "expires"
-                    v = self._now + v
-                if (k in value_attrs) or (k in boolean_attrs):
-                    if (v is None and
-                        k not in ("port", "comment", "commenturl")):
-                        _debug("   missing value for %s attribute" % k)
-                        bad_cookie = True
-                        break
-                    standard[k] = v
-                else:
-                    rest[k] = v
-
-            if bad_cookie:
-                continue
-
-            cookie_tuples.append((name, value, standard, rest))
-
-        return cookie_tuples
-
-    def _cookie_from_cookie_tuple(self, tup, request):
-        # standard is dict of standard cookie-attributes, rest is dict of the
-        # rest of them
-        name, value, standard, rest = tup
-
-        domain = standard.get("domain", Absent)
-        path = standard.get("path", Absent)
-        port = standard.get("port", Absent)
-        expires = standard.get("expires", Absent)
-
-        # set the easy defaults
-        version = standard.get("version", None)
-        if version is not None:
-            try:
-                version = int(version)
-            except ValueError:
-                return None  # invalid version, ignore cookie
-        secure = standard.get("secure", False)
-        # (discard is also set if expires is Absent)
-        discard = standard.get("discard", False)
-        comment = standard.get("comment", None)
-        comment_url = standard.get("commenturl", None)
-
-        # set default path
-        if path is not Absent and path != "":
-            path_specified = True
-            path = escape_path(path)
-        else:
-            path_specified = False
-            path = request_path(request)
-            i = path.rfind("/")
-            if i != -1:
-                if version == 0:
-                    # Netscape spec parts company from reality here
-                    path = path[:i]
-                else:
-                    path = path[:i+1]
-            if len(path) == 0: path = "/"
-
-        # set default domain
-        domain_specified = domain is not Absent
-        # but first we have to remember whether it starts with a dot
-        domain_initial_dot = False
-        if domain_specified:
-            domain_initial_dot = bool(domain.startswith("."))
-        if domain is Absent:
-            req_host, erhn = eff_request_host(request)
-            domain = erhn
-        elif not domain.startswith("."):
-            domain = "."+domain
-
-        # set default port
-        port_specified = False
-        if port is not Absent:
-            if port is None:
-                # Port attr present, but has no value: default to request port.
-                # Cookie should then only be sent back on that port.
-                port = request_port(request)
-            else:
-                port_specified = True
-                port = re.sub(r"\s+", "", port)
-        else:
-            # No port attr present.  Cookie can be sent back on any port.
-            port = None
-
-        # set default expires and discard
-        if expires is Absent:
-            expires = None
-            discard = True
-        elif expires <= self._now:
-            # Expiry date in past is request to delete cookie.  This can't be
-            # in DefaultCookiePolicy, because can't delete cookies there.
-            try:
-                self.clear(domain, path, name)
-            except KeyError:
-                pass
-            _debug("Expiring cookie, domain='%s', path='%s', name='%s'",
-                   domain, path, name)
-            return None
-
-        return Cookie(version,
-                      name, value,
-                      port, port_specified,
-                      domain, domain_specified, domain_initial_dot,
-                      path, path_specified,
-                      secure,
-                      expires,
-                      discard,
-                      comment,
-                      comment_url,
-                      rest)
-
-    def _cookies_from_attrs_set(self, attrs_set, request):
-        cookie_tuples = self._normalized_cookie_tuples(attrs_set)
-
-        cookies = []
-        for tup in cookie_tuples:
-            cookie = self._cookie_from_cookie_tuple(tup, request)
-            if cookie: cookies.append(cookie)
-        return cookies
-
-    def _process_rfc2109_cookies(self, cookies):
-        rfc2109_as_ns = getattr(self._policy, 'rfc2109_as_netscape', None)
-        if rfc2109_as_ns is None:
-            rfc2109_as_ns = not self._policy.rfc2965
-        for cookie in cookies:
-            if cookie.version == 1:
-                cookie.rfc2109 = True
-                if rfc2109_as_ns:
-                    # treat 2109 cookies as Netscape cookies rather than
-                    # as RFC2965 cookies
-                    cookie.version = 0
-
-    def make_cookies(self, response, request):
-        """Return sequence of Cookie objects extracted from response object."""
-        # get cookie-attributes for RFC 2965 and Netscape protocols
-        headers = response.info()
-        rfc2965_hdrs = headers.get_all("Set-Cookie2", [])
-        ns_hdrs = headers.get_all("Set-Cookie", [])
-
-        rfc2965 = self._policy.rfc2965
-        netscape = self._policy.netscape
-
-        if ((not rfc2965_hdrs and not ns_hdrs) or
-            (not ns_hdrs and not rfc2965) or
-            (not rfc2965_hdrs and not netscape) or
-            (not netscape and not rfc2965)):
-            return []  # no relevant cookie headers: quick exit
-
-        try:
-            cookies = self._cookies_from_attrs_set(
-                split_header_words(rfc2965_hdrs), request)
-        except Exception:
-            _warn_unhandled_exception()
-            cookies = []
-
-        if ns_hdrs and netscape:
-            try:
-                # RFC 2109 and Netscape cookies
-                ns_cookies = self._cookies_from_attrs_set(
-                    parse_ns_headers(ns_hdrs), request)
-            except Exception:
-                _warn_unhandled_exception()
-                ns_cookies = []
-            self._process_rfc2109_cookies(ns_cookies)
-
-            # Look for Netscape cookies (from Set-Cookie headers) that match
-            # corresponding RFC 2965 cookies (from Set-Cookie2 headers).
-            # For each match, keep the RFC 2965 cookie and ignore the Netscape
-            # cookie (RFC 2965 section 9.1).  Actually, RFC 2109 cookies are
-            # bundled in with the Netscape cookies for this purpose, which is
-            # reasonable behaviour.
-            if rfc2965:
-                lookup = {}
-                for cookie in cookies:
-                    lookup[(cookie.domain, cookie.path, cookie.name)] = None
-
-                def no_matching_rfc2965(ns_cookie, lookup=lookup):
-                    key = ns_cookie.domain, ns_cookie.path, ns_cookie.name
-                    return key not in lookup
-                ns_cookies = filter(no_matching_rfc2965, ns_cookies)
-
-            if ns_cookies:
-                cookies.extend(ns_cookies)
-
-        return cookies
-
-    def set_cookie_if_ok(self, cookie, request):
-        """Set a cookie if policy says it's OK to do so."""
-        self._cookies_lock.acquire()
-        try:
-            self._policy._now = self._now = int(time.time())
-
-            if self._policy.set_ok(cookie, request):
-                self.set_cookie(cookie)
-
-
-        finally:
-            self._cookies_lock.release()
-
-    def set_cookie(self, cookie):
-        """Set a cookie, without checking whether or not it should be set."""
-        c = self._cookies
-        self._cookies_lock.acquire()
-        try:
-            if cookie.domain not in c: c[cookie.domain] = {}
-            c2 = c[cookie.domain]
-            if cookie.path not in c2: c2[cookie.path] = {}
-            c3 = c2[cookie.path]
-            c3[cookie.name] = cookie
-        finally:
-            self._cookies_lock.release()
-
-    def extract_cookies(self, response, request):
-        """Extract cookies from response, where allowable given the request."""
-        _debug("extract_cookies: %s", response.info())
-        self._cookies_lock.acquire()
-        try:
-            self._policy._now = self._now = int(time.time())
-
-            for cookie in self.make_cookies(response, request):
-                if self._policy.set_ok(cookie, request):
-                    _debug(" setting cookie: %s", cookie)
-                    self.set_cookie(cookie)
-        finally:
-            self._cookies_lock.release()
-
-    def clear(self, domain=None, path=None, name=None):
-        """Clear some cookies.
-
-        Invoking this method without arguments will clear all cookies.  If
-        given a single argument, only cookies belonging to that domain will be
-        removed.  If given two arguments, cookies belonging to the specified
-        path within that domain are removed.  If given three arguments, then
-        the cookie with the specified name, path and domain is removed.
-
-        Raises KeyError if no matching cookie exists.
-
-        """
-        if name is not None:
-            if (domain is None) or (path is None):
-                raise ValueError(
-                    "domain and path must be given to remove a cookie by name")
-            del self._cookies[domain][path][name]
-        elif path is not None:
-            if domain is None:
-                raise ValueError(
-                    "domain must be given to remove cookies by path")
-            del self._cookies[domain][path]
-        elif domain is not None:
-            del self._cookies[domain]
-        else:
-            self._cookies = {}
-
-    def clear_session_cookies(self):
-        """Discard all session cookies.
-
-        Note that the .save() method won't save session cookies anyway, unless
-        you ask otherwise by passing a true ignore_discard argument.
-
-        """
-        self._cookies_lock.acquire()
-        try:
-            for cookie in self:
-                if cookie.discard:
-                    self.clear(cookie.domain, cookie.path, cookie.name)
-        finally:
-            self._cookies_lock.release()
-
-    def clear_expired_cookies(self):
-        """Discard all expired cookies.
-
-        You probably don't need to call this method: expired cookies are never
-        sent back to the server (provided you're using DefaultCookiePolicy),
-        this method is called by CookieJar itself every so often, and the
-        .save() method won't save expired cookies anyway (unless you ask
-        otherwise by passing a true ignore_expires argument).
-
-        """
-        self._cookies_lock.acquire()
-        try:
-            now = time.time()
-            for cookie in self:
-                if cookie.is_expired(now):
-                    self.clear(cookie.domain, cookie.path, cookie.name)
-        finally:
-            self._cookies_lock.release()
-
-    def __iter__(self):
-        return deepvalues(self._cookies)
-
-    def __len__(self):
-        """Return number of contained cookies."""
-        i = 0
-        for cookie in self: i = i + 1
-        return i
-
-    @as_native_str()
-    def __repr__(self):
-        r = []
-        for cookie in self: r.append(repr(cookie))
-        return "<%s[%s]>" % (self.__class__, ", ".join(r))
-
-    def __str__(self):
-        r = []
-        for cookie in self: r.append(str(cookie))
-        return "<%s[%s]>" % (self.__class__, ", ".join(r))
-
-
-# derives from IOError for backwards-compatibility with Python 2.4.0
-class LoadError(IOError): pass
-
-class FileCookieJar(CookieJar):
-    """CookieJar that can be loaded from and saved to a file."""
-
-    def __init__(self, filename=None, delayload=False, policy=None):
-        """
-        Cookies are NOT loaded from the named file until either the .load() or
-        .revert() method is called.
-
-        """
-        CookieJar.__init__(self, policy)
-        if filename is not None:
-            try:
-                filename+""
-            except:
-                raise ValueError("filename must be string-like")
-        self.filename = filename
-        self.delayload = bool(delayload)
-
-    def save(self, filename=None, ignore_discard=False, ignore_expires=False):
-        """Save cookies to a file."""
-        raise NotImplementedError()
-
-    def load(self, filename=None, ignore_discard=False, ignore_expires=False):
-        """Load cookies from a file."""
-        if filename is None:
-            if self.filename is not None: filename = self.filename
-            else: raise ValueError(MISSING_FILENAME_TEXT)
-
-        f = open(filename)
-        try:
-            self._really_load(f, filename, ignore_discard, ignore_expires)
-        finally:
-            f.close()
-
-    def revert(self, filename=None,
-               ignore_discard=False, ignore_expires=False):
-        """Clear all cookies and reload cookies from a saved file.
-
-        Raises LoadError (or IOError) if reversion is not successful; the
-        object's state will not be altered if this happens.
-
-        """
-        if filename is None:
-            if self.filename is not None: filename = self.filename
-            else: raise ValueError(MISSING_FILENAME_TEXT)
-
-        self._cookies_lock.acquire()
-        try:
-
-            old_state = copy.deepcopy(self._cookies)
-            self._cookies = {}
-            try:
-                self.load(filename, ignore_discard, ignore_expires)
-            except (LoadError, IOError):
-                self._cookies = old_state
-                raise
-
-        finally:
-            self._cookies_lock.release()
-
-
-def lwp_cookie_str(cookie):
-    """Return string representation of Cookie in an the LWP cookie file format.
-
-    Actually, the format is extended a bit -- see module docstring.
-
-    """
-    h = [(cookie.name, cookie.value),
-         ("path", cookie.path),
-         ("domain", cookie.domain)]
-    if cookie.port is not None: h.append(("port", cookie.port))
-    if cookie.path_specified: h.append(("path_spec", None))
-    if cookie.port_specified: h.append(("port_spec", None))
-    if cookie.domain_initial_dot: h.append(("domain_dot", None))
-    if cookie.secure: h.append(("secure", None))
-    if cookie.expires: h.append(("expires",
-                               time2isoz(float(cookie.expires))))
-    if cookie.discard: h.append(("discard", None))
-    if cookie.comment: h.append(("comment", cookie.comment))
-    if cookie.comment_url: h.append(("commenturl", cookie.comment_url))
-
-    keys = sorted(cookie._rest.keys())
-    for k in keys:
-        h.append((k, str(cookie._rest[k])))
-
-    h.append(("version", str(cookie.version)))
-
-    return join_header_words([h])
-
-class LWPCookieJar(FileCookieJar):
-    """
-    The LWPCookieJar saves a sequence of "Set-Cookie3" lines.
-    "Set-Cookie3" is the format used by the libwww-perl library, not known
-    to be compatible with any browser, but which is easy to read and
-    doesn't lose information about RFC 2965 cookies.
-
-    Additional methods
-
-    as_lwp_str(ignore_discard=True, ignore_expired=True)
-
-    """
-
-    def as_lwp_str(self, ignore_discard=True, ignore_expires=True):
-        """Return cookies as a string of "\\n"-separated "Set-Cookie3" headers.
-
-        ignore_discard and ignore_expires: see docstring for FileCookieJar.save
-
-        """
-        now = time.time()
-        r = []
-        for cookie in self:
-            if not ignore_discard and cookie.discard:
-                continue
-            if not ignore_expires and cookie.is_expired(now):
-                continue
-            r.append("Set-Cookie3: %s" % lwp_cookie_str(cookie))
-        return "\n".join(r+[""])
-
-    def save(self, filename=None, ignore_discard=False, ignore_expires=False):
-        if filename is None:
-            if self.filename is not None: filename = self.filename
-            else: raise ValueError(MISSING_FILENAME_TEXT)
-
-        f = open(filename, "w")
-        try:
-            # There really isn't an LWP Cookies 2.0 format, but this indicates
-            # that there is extra information in here (domain_dot and
-            # port_spec) while still being compatible with libwww-perl, I hope.
-            f.write("#LWP-Cookies-2.0\n")
-            f.write(self.as_lwp_str(ignore_discard, ignore_expires))
-        finally:
-            f.close()
-
-    def _really_load(self, f, filename, ignore_discard, ignore_expires):
-        magic = f.readline()
-        if not self.magic_re.search(magic):
-            msg = ("%r does not look like a Set-Cookie3 (LWP) format "
-                   "file" % filename)
-            raise LoadError(msg)
-
-        now = time.time()
-
-        header = "Set-Cookie3:"
-        boolean_attrs = ("port_spec", "path_spec", "domain_dot",
-                         "secure", "discard")
-        value_attrs = ("version",
-                       "port", "path", "domain",
-                       "expires",
-                       "comment", "commenturl")
-
-        try:
-            while 1:
-                line = f.readline()
-                if line == "": break
-                if not line.startswith(header):
-                    continue
-                line = line[len(header):].strip()
-
-                for data in split_header_words([line]):
-                    name, value = data[0]
-                    standard = {}
-                    rest = {}
-                    for k in boolean_attrs:
-                        standard[k] = False
-                    for k, v in data[1:]:
-                        if k is not None:
-                            lc = k.lower()
-                        else:
-                            lc = None
-                        # don't lose case distinction for unknown fields
-                        if (lc in value_attrs) or (lc in boolean_attrs):
-                            k = lc
-                        if k in boolean_attrs:
-                            if v is None: v = True
-                            standard[k] = v
-                        elif k in value_attrs:
-                            standard[k] = v
-                        else:
-                            rest[k] = v
-
-                    h = standard.get
-                    expires = h("expires")
-                    discard = h("discard")
-                    if expires is not None:
-                        expires = iso2time(expires)
-                    if expires is None:
-                        discard = True
-                    domain = h("domain")
-                    domain_specified = domain.startswith(".")
-                    c = Cookie(h("version"), name, value,
-                               h("port"), h("port_spec"),
-                               domain, domain_specified, h("domain_dot"),
-                               h("path"), h("path_spec"),
-                               h("secure"),
-                               expires,
-                               discard,
-                               h("comment"),
-                               h("commenturl"),
-                               rest)
-                    if not ignore_discard and c.discard:
-                        continue
-                    if not ignore_expires and c.is_expired(now):
-                        continue
-                    self.set_cookie(c)
-
-        except IOError:
-            raise
-        except Exception:
-            _warn_unhandled_exception()
-            raise LoadError("invalid Set-Cookie3 format file %r: %r" %
-                            (filename, line))
-
-
-class MozillaCookieJar(FileCookieJar):
-    """
-
-    WARNING: you may want to backup your browser's cookies file if you use
-    this class to save cookies.  I *think* it works, but there have been
-    bugs in the past!
-
-    This class differs from CookieJar only in the format it uses to save and
-    load cookies to and from a file.  This class uses the Mozilla/Netscape
-    `cookies.txt' format.  lynx uses this file format, too.
-
-    Don't expect cookies saved while the browser is running to be noticed by
-    the browser (in fact, Mozilla on unix will overwrite your saved cookies if
-    you change them on disk while it's running; on Windows, you probably can't
-    save at all while the browser is running).
-
-    Note that the Mozilla/Netscape format will downgrade RFC2965 cookies to
-    Netscape cookies on saving.
-
-    In particular, the cookie version and port number information is lost,
-    together with information about whether or not Path, Port and Discard were
-    specified by the Set-Cookie2 (or Set-Cookie) header, and whether or not the
-    domain as set in the HTTP header started with a dot (yes, I'm aware some
-    domains in Netscape files start with a dot and some don't -- trust me, you
-    really don't want to know any more about this).
-
-    Note that though Mozilla and Netscape use the same format, they use
-    slightly different headers.  The class saves cookies using the Netscape
-    header by default (Mozilla can cope with that).
-
-    """
-    magic_re = re.compile("#( Netscape)? HTTP Cookie File")
-    header = """\
-# Netscape HTTP Cookie File
-# http://www.netscape.com/newsref/std/cookie_spec.html
-# This is a generated file!  Do not edit.
-
-"""
-
-    def _really_load(self, f, filename, ignore_discard, ignore_expires):
-        now = time.time()
-
-        magic = f.readline()
-        if not self.magic_re.search(magic):
-            f.close()
-            raise LoadError(
-                "%r does not look like a Netscape format cookies file" %
-                filename)
-
-        try:
-            while 1:
-                line = f.readline()
-                if line == "": break
-
-                # last field may be absent, so keep any trailing tab
-                if line.endswith("\n"): line = line[:-1]
-
-                # skip comments and blank lines XXX what is $ for?
-                if (line.strip().startswith(("#", "$")) or
-                    line.strip() == ""):
-                    continue
-
-                domain, domain_specified, path, secure, expires, name, value = \
-                        line.split("\t")
-                secure = (secure == "TRUE")
-                domain_specified = (domain_specified == "TRUE")
-                if name == "":
-                    # cookies.txt regards 'Set-Cookie: foo' as a cookie
-                    # with no name, whereas http.cookiejar regards it as a
-                    # cookie with no value.
-                    name = value
-                    value = None
-
-                initial_dot = domain.startswith(".")
-                assert domain_specified == initial_dot
-
-                discard = False
-                if expires == "":
-                    expires = None
-                    discard = True
-
-                # assume path_specified is false
-                c = Cookie(0, name, value,
-                           None, False,
-                           domain, domain_specified, initial_dot,
-                           path, False,
-                           secure,
-                           expires,
-                           discard,
-                           None,
-                           None,
-                           {})
-                if not ignore_discard and c.discard:
-                    continue
-                if not ignore_expires and c.is_expired(now):
-                    continue
-                self.set_cookie(c)
-
-        except IOError:
-            raise
-        except Exception:
-            _warn_unhandled_exception()
-            raise LoadError("invalid Netscape format cookies file %r: %r" %
-                            (filename, line))
-
-    def save(self, filename=None, ignore_discard=False, ignore_expires=False):
-        if filename is None:
-            if self.filename is not None: filename = self.filename
-            else: raise ValueError(MISSING_FILENAME_TEXT)
-
-        f = open(filename, "w")
-        try:
-            f.write(self.header)
-            now = time.time()
-            for cookie in self:
-                if not ignore_discard and cookie.discard:
-                    continue
-                if not ignore_expires and cookie.is_expired(now):
-                    continue
-                if cookie.secure: secure = "TRUE"
-                else: secure = "FALSE"
-                if cookie.domain.startswith("."): initial_dot = "TRUE"
-                else: initial_dot = "FALSE"
-                if cookie.expires is not None:
-                    expires = str(cookie.expires)
-                else:
-                    expires = ""
-                if cookie.value is None:
-                    # cookies.txt regards 'Set-Cookie: foo' as a cookie
-                    # with no name, whereas http.cookiejar regards it as a
-                    # cookie with no value.
-                    name = ""
-                    value = cookie.name
-                else:
-                    name = cookie.name
-                    value = cookie.value
-                f.write(
-                    "\t".join([cookie.domain, initial_dot, cookie.path,
-                               secure, expires, name, value])+
-                    "\n")
-        finally:
-            f.close()
diff --git a/lib/future/backports/http/cookies.py b/lib/future/backports/http/cookies.py
deleted file mode 100644
index 8bb61e22..00000000
--- a/lib/future/backports/http/cookies.py
+++ /dev/null
@@ -1,598 +0,0 @@
-####
-# Copyright 2000 by Timothy O'Malley <timo@alum.mit.edu>
-#
-#                All Rights Reserved
-#
-# Permission to use, copy, modify, and distribute this software
-# and its documentation for any purpose and without fee is hereby
-# granted, provided that the above copyright notice appear in all
-# copies and that both that copyright notice and this permission
-# notice appear in supporting documentation, and that the name of
-# Timothy O'Malley  not be used in advertising or publicity
-# pertaining to distribution of the software without specific, written
-# prior permission.
-#
-# Timothy O'Malley DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-# SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS, IN NO EVENT SHALL Timothy O'Malley BE LIABLE FOR
-# ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-# ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-#
-####
-#
-# Id: Cookie.py,v 2.29 2000/08/23 05:28:49 timo Exp
-#   by Timothy O'Malley <timo@alum.mit.edu>
-#
-#  Cookie.py is a Python module for the handling of HTTP
-#  cookies as a Python dictionary.  See RFC 2109 for more
-#  information on cookies.
-#
-#  The original idea to treat Cookies as a dictionary came from
-#  Dave Mitchell (davem@magnet.com) in 1995, when he released the
-#  first version of nscookie.py.
-#
-####
-
-r"""
-http.cookies module ported to python-future from Py3.3
-
-Here's a sample session to show how to use this module.
-At the moment, this is the only documentation.
-
-The Basics
-----------
-
-Importing is easy...
-
-   >>> from http import cookies
-
-Most of the time you start by creating a cookie.
-
-   >>> C = cookies.SimpleCookie()
-
-Once you've created your Cookie, you can add values just as if it were
-a dictionary.
-
-   >>> C = cookies.SimpleCookie()
-   >>> C["fig"] = "newton"
-   >>> C["sugar"] = "wafer"
-   >>> C.output()
-   'Set-Cookie: fig=newton\r\nSet-Cookie: sugar=wafer'
-
-Notice that the printable representation of a Cookie is the
-appropriate format for a Set-Cookie: header.  This is the
-default behavior.  You can change the header and printed
-attributes by using the .output() function
-
-   >>> C = cookies.SimpleCookie()
-   >>> C["rocky"] = "road"
-   >>> C["rocky"]["path"] = "/cookie"
-   >>> print(C.output(header="Cookie:"))
-   Cookie: rocky=road; Path=/cookie
-   >>> print(C.output(attrs=[], header="Cookie:"))
-   Cookie: rocky=road
-
-The load() method of a Cookie extracts cookies from a string.  In a
-CGI script, you would use this method to extract the cookies from the
-HTTP_COOKIE environment variable.
-
-   >>> C = cookies.SimpleCookie()
-   >>> C.load("chips=ahoy; vienna=finger")
-   >>> C.output()
-   'Set-Cookie: chips=ahoy\r\nSet-Cookie: vienna=finger'
-
-The load() method is darn-tootin smart about identifying cookies
-within a string.  Escaped quotation marks, nested semicolons, and other
-such trickeries do not confuse it.
-
-   >>> C = cookies.SimpleCookie()
-   >>> C.load('keebler="E=everybody; L=\\"Loves\\"; fudge=\\012;";')
-   >>> print(C)
-   Set-Cookie: keebler="E=everybody; L=\"Loves\"; fudge=\012;"
-
-Each element of the Cookie also supports all of the RFC 2109
-Cookie attributes.  Here's an example which sets the Path
-attribute.
-
-   >>> C = cookies.SimpleCookie()
-   >>> C["oreo"] = "doublestuff"
-   >>> C["oreo"]["path"] = "/"
-   >>> print(C)
-   Set-Cookie: oreo=doublestuff; Path=/
-
-Each dictionary element has a 'value' attribute, which gives you
-back the value associated with the key.
-
-   >>> C = cookies.SimpleCookie()
-   >>> C["twix"] = "none for you"
-   >>> C["twix"].value
-   'none for you'
-
-The SimpleCookie expects that all values should be standard strings.
-Just to be sure, SimpleCookie invokes the str() builtin to convert
-the value to a string, when the values are set dictionary-style.
-
-   >>> C = cookies.SimpleCookie()
-   >>> C["number"] = 7
-   >>> C["string"] = "seven"
-   >>> C["number"].value
-   '7'
-   >>> C["string"].value
-   'seven'
-   >>> C.output()
-   'Set-Cookie: number=7\r\nSet-Cookie: string=seven'
-
-Finis.
-"""
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-from future.builtins import chr, dict, int, str
-from future.utils import PY2, as_native_str
-
-#
-# Import our required modules
-#
-import re
-if PY2:
-    re.ASCII = 0    # for py2 compatibility
-import string
-
-__all__ = ["CookieError", "BaseCookie", "SimpleCookie"]
-
-_nulljoin = ''.join
-_semispacejoin = '; '.join
-_spacejoin = ' '.join
-
-#
-# Define an exception visible to External modules
-#
-class CookieError(Exception):
-    pass
-
-
-# These quoting routines conform to the RFC2109 specification, which in
-# turn references the character definitions from RFC2068.  They provide
-# a two-way quoting algorithm.  Any non-text character is translated
-# into a 4 character sequence: a forward-slash followed by the
-# three-digit octal equivalent of the character.  Any '\' or '"' is
-# quoted with a preceeding '\' slash.
-#
-# These are taken from RFC2068 and RFC2109.
-#       _LegalChars       is the list of chars which don't require "'s
-#       _Translator       hash-table for fast quoting
-#
-_LegalChars       = string.ascii_letters + string.digits + "!#$%&'*+-.^_`|~:"
-_Translator       = {
-    '\000' : '\\000',  '\001' : '\\001',  '\002' : '\\002',
-    '\003' : '\\003',  '\004' : '\\004',  '\005' : '\\005',
-    '\006' : '\\006',  '\007' : '\\007',  '\010' : '\\010',
-    '\011' : '\\011',  '\012' : '\\012',  '\013' : '\\013',
-    '\014' : '\\014',  '\015' : '\\015',  '\016' : '\\016',
-    '\017' : '\\017',  '\020' : '\\020',  '\021' : '\\021',
-    '\022' : '\\022',  '\023' : '\\023',  '\024' : '\\024',
-    '\025' : '\\025',  '\026' : '\\026',  '\027' : '\\027',
-    '\030' : '\\030',  '\031' : '\\031',  '\032' : '\\032',
-    '\033' : '\\033',  '\034' : '\\034',  '\035' : '\\035',
-    '\036' : '\\036',  '\037' : '\\037',
-
-    # Because of the way browsers really handle cookies (as opposed
-    # to what the RFC says) we also encode , and ;
-
-    ',' : '\\054', ';' : '\\073',
-
-    '"' : '\\"',       '\\' : '\\\\',
-
-    '\177' : '\\177',  '\200' : '\\200',  '\201' : '\\201',
-    '\202' : '\\202',  '\203' : '\\203',  '\204' : '\\204',
-    '\205' : '\\205',  '\206' : '\\206',  '\207' : '\\207',
-    '\210' : '\\210',  '\211' : '\\211',  '\212' : '\\212',
-    '\213' : '\\213',  '\214' : '\\214',  '\215' : '\\215',
-    '\216' : '\\216',  '\217' : '\\217',  '\220' : '\\220',
-    '\221' : '\\221',  '\222' : '\\222',  '\223' : '\\223',
-    '\224' : '\\224',  '\225' : '\\225',  '\226' : '\\226',
-    '\227' : '\\227',  '\230' : '\\230',  '\231' : '\\231',
-    '\232' : '\\232',  '\233' : '\\233',  '\234' : '\\234',
-    '\235' : '\\235',  '\236' : '\\236',  '\237' : '\\237',
-    '\240' : '\\240',  '\241' : '\\241',  '\242' : '\\242',
-    '\243' : '\\243',  '\244' : '\\244',  '\245' : '\\245',
-    '\246' : '\\246',  '\247' : '\\247',  '\250' : '\\250',
-    '\251' : '\\251',  '\252' : '\\252',  '\253' : '\\253',
-    '\254' : '\\254',  '\255' : '\\255',  '\256' : '\\256',
-    '\257' : '\\257',  '\260' : '\\260',  '\261' : '\\261',
-    '\262' : '\\262',  '\263' : '\\263',  '\264' : '\\264',
-    '\265' : '\\265',  '\266' : '\\266',  '\267' : '\\267',
-    '\270' : '\\270',  '\271' : '\\271',  '\272' : '\\272',
-    '\273' : '\\273',  '\274' : '\\274',  '\275' : '\\275',
-    '\276' : '\\276',  '\277' : '\\277',  '\300' : '\\300',
-    '\301' : '\\301',  '\302' : '\\302',  '\303' : '\\303',
-    '\304' : '\\304',  '\305' : '\\305',  '\306' : '\\306',
-    '\307' : '\\307',  '\310' : '\\310',  '\311' : '\\311',
-    '\312' : '\\312',  '\313' : '\\313',  '\314' : '\\314',
-    '\315' : '\\315',  '\316' : '\\316',  '\317' : '\\317',
-    '\320' : '\\320',  '\321' : '\\321',  '\322' : '\\322',
-    '\323' : '\\323',  '\324' : '\\324',  '\325' : '\\325',
-    '\326' : '\\326',  '\327' : '\\327',  '\330' : '\\330',
-    '\331' : '\\331',  '\332' : '\\332',  '\333' : '\\333',
-    '\334' : '\\334',  '\335' : '\\335',  '\336' : '\\336',
-    '\337' : '\\337',  '\340' : '\\340',  '\341' : '\\341',
-    '\342' : '\\342',  '\343' : '\\343',  '\344' : '\\344',
-    '\345' : '\\345',  '\346' : '\\346',  '\347' : '\\347',
-    '\350' : '\\350',  '\351' : '\\351',  '\352' : '\\352',
-    '\353' : '\\353',  '\354' : '\\354',  '\355' : '\\355',
-    '\356' : '\\356',  '\357' : '\\357',  '\360' : '\\360',
-    '\361' : '\\361',  '\362' : '\\362',  '\363' : '\\363',
-    '\364' : '\\364',  '\365' : '\\365',  '\366' : '\\366',
-    '\367' : '\\367',  '\370' : '\\370',  '\371' : '\\371',
-    '\372' : '\\372',  '\373' : '\\373',  '\374' : '\\374',
-    '\375' : '\\375',  '\376' : '\\376',  '\377' : '\\377'
-    }
-
-def _quote(str, LegalChars=_LegalChars):
-    r"""Quote a string for use in a cookie header.
-
-    If the string does not need to be double-quoted, then just return the
-    string.  Otherwise, surround the string in doublequotes and quote
-    (with a \) special characters.
-    """
-    if all(c in LegalChars for c in str):
-        return str
-    else:
-        return '"' + _nulljoin(_Translator.get(s, s) for s in str) + '"'
-
-
-_OctalPatt = re.compile(r"\\[0-3][0-7][0-7]")
-_QuotePatt = re.compile(r"[\\].")
-
-def _unquote(mystr):
-    # If there aren't any doublequotes,
-    # then there can't be any special characters.  See RFC 2109.
-    if len(mystr) < 2:
-        return mystr
-    if mystr[0] != '"' or mystr[-1] != '"':
-        return mystr
-
-    # We have to assume that we must decode this string.
-    # Down to work.
-
-    # Remove the "s
-    mystr = mystr[1:-1]
-
-    # Check for special sequences.  Examples:
-    #    \012 --> \n
-    #    \"   --> "
-    #
-    i = 0
-    n = len(mystr)
-    res = []
-    while 0 <= i < n:
-        o_match = _OctalPatt.search(mystr, i)
-        q_match = _QuotePatt.search(mystr, i)
-        if not o_match and not q_match:              # Neither matched
-            res.append(mystr[i:])
-            break
-        # else:
-        j = k = -1
-        if o_match:
-            j = o_match.start(0)
-        if q_match:
-            k = q_match.start(0)
-        if q_match and (not o_match or k < j):     # QuotePatt matched
-            res.append(mystr[i:k])
-            res.append(mystr[k+1])
-            i = k + 2
-        else:                                      # OctalPatt matched
-            res.append(mystr[i:j])
-            res.append(chr(int(mystr[j+1:j+4], 8)))
-            i = j + 4
-    return _nulljoin(res)
-
-# The _getdate() routine is used to set the expiration time in the cookie's HTTP
-# header.  By default, _getdate() returns the current time in the appropriate
-# "expires" format for a Set-Cookie header.  The one optional argument is an
-# offset from now, in seconds.  For example, an offset of -3600 means "one hour
-# ago".  The offset may be a floating point number.
-#
-
-_weekdayname = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-
-_monthname = [None,
-              'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-              'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
-
-def _getdate(future=0, weekdayname=_weekdayname, monthname=_monthname):
-    from time import gmtime, time
-    now = time()
-    year, month, day, hh, mm, ss, wd, y, z = gmtime(now + future)
-    return "%s, %02d %3s %4d %02d:%02d:%02d GMT" % \
-           (weekdayname[wd], day, monthname[month], year, hh, mm, ss)
-
-
-class Morsel(dict):
-    """A class to hold ONE (key, value) pair.
-
-    In a cookie, each such pair may have several attributes, so this class is
-    used to keep the attributes associated with the appropriate key,value pair.
-    This class also includes a coded_value attribute, which is used to hold
-    the network representation of the value.  This is most useful when Python
-    objects are pickled for network transit.
-    """
-    # RFC 2109 lists these attributes as reserved:
-    #   path       comment         domain
-    #   max-age    secure      version
-    #
-    # For historical reasons, these attributes are also reserved:
-    #   expires
-    #
-    # This is an extension from Microsoft:
-    #   httponly
-    #
-    # This dictionary provides a mapping from the lowercase
-    # variant on the left to the appropriate traditional
-    # formatting on the right.
-    _reserved = {
-        "expires"  : "expires",
-        "path"     : "Path",
-        "comment"  : "Comment",
-        "domain"   : "Domain",
-        "max-age"  : "Max-Age",
-        "secure"   : "secure",
-        "httponly" : "httponly",
-        "version"  : "Version",
-    }
-
-    _flags = set(['secure', 'httponly'])
-
-    def __init__(self):
-        # Set defaults
-        self.key = self.value = self.coded_value = None
-
-        # Set default attributes
-        for key in self._reserved:
-            dict.__setitem__(self, key, "")
-
-    def __setitem__(self, K, V):
-        K = K.lower()
-        if not K in self._reserved:
-            raise CookieError("Invalid Attribute %s" % K)
-        dict.__setitem__(self, K, V)
-
-    def isReservedKey(self, K):
-        return K.lower() in self._reserved
-
-    def set(self, key, val, coded_val, LegalChars=_LegalChars):
-        # First we verify that the key isn't a reserved word
-        # Second we make sure it only contains legal characters
-        if key.lower() in self._reserved:
-            raise CookieError("Attempt to set a reserved key: %s" % key)
-        if any(c not in LegalChars for c in key):
-            raise CookieError("Illegal key value: %s" % key)
-
-        # It's a good key, so save it.
-        self.key = key
-        self.value = val
-        self.coded_value = coded_val
-
-    def output(self, attrs=None, header="Set-Cookie:"):
-        return "%s %s" % (header, self.OutputString(attrs))
-
-    __str__ = output
-
-    @as_native_str()
-    def __repr__(self):
-        if PY2 and isinstance(self.value, unicode):
-            val = str(self.value)    # make it a newstr to remove the u prefix
-        else:
-            val = self.value
-        return '<%s: %s=%s>' % (self.__class__.__name__,
-                                str(self.key), repr(val))
-
-    def js_output(self, attrs=None):
-        # Print javascript
-        return """
-        <script type="text/javascript">
-        <!-- begin hiding
-        document.cookie = \"%s\";
-        // end hiding -->
-        </script>
-        """ % (self.OutputString(attrs).replace('"', r'\"'))
-
-    def OutputString(self, attrs=None):
-        # Build up our result
-        #
-        result = []
-        append = result.append
-
-        # First, the key=value pair
-        append("%s=%s" % (self.key, self.coded_value))
-
-        # Now add any defined attributes
-        if attrs is None:
-            attrs = self._reserved
-        items = sorted(self.items())
-        for key, value in items:
-            if value == "":
-                continue
-            if key not in attrs:
-                continue
-            if key == "expires" and isinstance(value, int):
-                append("%s=%s" % (self._reserved[key], _getdate(value)))
-            elif key == "max-age" and isinstance(value, int):
-                append("%s=%d" % (self._reserved[key], value))
-            elif key == "secure":
-                append(str(self._reserved[key]))
-            elif key == "httponly":
-                append(str(self._reserved[key]))
-            else:
-                append("%s=%s" % (self._reserved[key], value))
-
-        # Return the result
-        return _semispacejoin(result)
-
-
-#
-# Pattern for finding cookie
-#
-# This used to be strict parsing based on the RFC2109 and RFC2068
-# specifications.  I have since discovered that MSIE 3.0x doesn't
-# follow the character rules outlined in those specs.  As a
-# result, the parsing rules here are less strict.
-#
-
-_LegalCharsPatt  = r"[\w\d!#%&'~_`><@,:/\$\*\+\-\.\^\|\)\(\?\}\{\=]"
-_CookiePattern = re.compile(r"""
-    (?x)                           # This is a verbose pattern
-    (?P<key>                       # Start of group 'key'
-    """ + _LegalCharsPatt + r"""+?   # Any word of at least one letter
-    )                              # End of group 'key'
-    (                              # Optional group: there may not be a value.
-    \s*=\s*                          # Equal Sign
-    (?P<val>                         # Start of group 'val'
-    "(?:[^\\"]|\\.)*"                  # Any doublequoted string
-    |                                  # or
-    \w{3},\s[\w\d\s-]{9,11}\s[\d:]{8}\sGMT  # Special case for "expires" attr
-    |                                  # or
-    """ + _LegalCharsPatt + r"""*      # Any word or empty string
-    )                                # End of group 'val'
-    )?                             # End of optional value group
-    \s*                            # Any number of spaces.
-    (\s+|;|$)                      # Ending either at space, semicolon, or EOS.
-    """, re.ASCII)                 # May be removed if safe.
-
-
-# At long last, here is the cookie class.  Using this class is almost just like
-# using a dictionary.  See this module's docstring for example usage.
-#
-class BaseCookie(dict):
-    """A container class for a set of Morsels."""
-
-    def value_decode(self, val):
-        """real_value, coded_value = value_decode(STRING)
-        Called prior to setting a cookie's value from the network
-        representation.  The VALUE is the value read from HTTP
-        header.
-        Override this function to modify the behavior of cookies.
-        """
-        return val, val
-
-    def value_encode(self, val):
-        """real_value, coded_value = value_encode(VALUE)
-        Called prior to setting a cookie's value from the dictionary
-        representation.  The VALUE is the value being assigned.
-        Override this function to modify the behavior of cookies.
-        """
-        strval = str(val)
-        return strval, strval
-
-    def __init__(self, input=None):
-        if input:
-            self.load(input)
-
-    def __set(self, key, real_value, coded_value):
-        """Private method for setting a cookie's value"""
-        M = self.get(key, Morsel())
-        M.set(key, real_value, coded_value)
-        dict.__setitem__(self, key, M)
-
-    def __setitem__(self, key, value):
-        """Dictionary style assignment."""
-        rval, cval = self.value_encode(value)
-        self.__set(key, rval, cval)
-
-    def output(self, attrs=None, header="Set-Cookie:", sep="\015\012"):
-        """Return a string suitable for HTTP."""
-        result = []
-        items = sorted(self.items())
-        for key, value in items:
-            result.append(value.output(attrs, header))
-        return sep.join(result)
-
-    __str__ = output
-
-    @as_native_str()
-    def __repr__(self):
-        l = []
-        items = sorted(self.items())
-        for key, value in items:
-            if PY2 and isinstance(value.value, unicode):
-                val = str(value.value)    # make it a newstr to remove the u prefix
-            else:
-                val = value.value
-            l.append('%s=%s' % (str(key), repr(val)))
-        return '<%s: %s>' % (self.__class__.__name__, _spacejoin(l))
-
-    def js_output(self, attrs=None):
-        """Return a string suitable for JavaScript."""
-        result = []
-        items = sorted(self.items())
-        for key, value in items:
-            result.append(value.js_output(attrs))
-        return _nulljoin(result)
-
-    def load(self, rawdata):
-        """Load cookies from a string (presumably HTTP_COOKIE) or
-        from a dictionary.  Loading cookies from a dictionary 'd'
-        is equivalent to calling:
-            map(Cookie.__setitem__, d.keys(), d.values())
-        """
-        if isinstance(rawdata, str):
-            self.__parse_string(rawdata)
-        else:
-            # self.update() wouldn't call our custom __setitem__
-            for key, value in rawdata.items():
-                self[key] = value
-        return
-
-    def __parse_string(self, mystr, patt=_CookiePattern):
-        i = 0            # Our starting point
-        n = len(mystr)     # Length of string
-        M = None         # current morsel
-
-        while 0 <= i < n:
-            # Start looking for a cookie
-            match = patt.search(mystr, i)
-            if not match:
-                # No more cookies
-                break
-
-            key, value = match.group("key"), match.group("val")
-
-            i = match.end(0)
-
-            # Parse the key, value in case it's metainfo
-            if key[0] == "$":
-                # We ignore attributes which pertain to the cookie
-                # mechanism as a whole.  See RFC 2109.
-                # (Does anyone care?)
-                if M:
-                    M[key[1:]] = value
-            elif key.lower() in Morsel._reserved:
-                if M:
-                    if value is None:
-                        if key.lower() in Morsel._flags:
-                            M[key] = True
-                    else:
-                        M[key] = _unquote(value)
-            elif value is not None:
-                rval, cval = self.value_decode(value)
-                self.__set(key, rval, cval)
-                M = self[key]
-
-
-class SimpleCookie(BaseCookie):
-    """
-    SimpleCookie supports strings as cookie values.  When setting
-    the value using the dictionary assignment notation, SimpleCookie
-    calls the builtin str() to convert the value to a string.  Values
-    received from HTTP are kept as strings.
-    """
-    def value_decode(self, val):
-        return _unquote(val), val
-
-    def value_encode(self, val):
-        strval = str(val)
-        return strval, _quote(strval)
diff --git a/lib/future/backports/http/server.py b/lib/future/backports/http/server.py
deleted file mode 100644
index b1c11e0c..00000000
--- a/lib/future/backports/http/server.py
+++ /dev/null
@@ -1,1226 +0,0 @@
-"""HTTP server classes.
-
-From Python 3.3
-
-Note: BaseHTTPRequestHandler doesn't implement any HTTP request; see
-SimpleHTTPRequestHandler for simple implementations of GET, HEAD and POST,
-and CGIHTTPRequestHandler for CGI scripts.
-
-It does, however, optionally implement HTTP/1.1 persistent connections,
-as of version 0.3.
-
-Notes on CGIHTTPRequestHandler
-------------------------------
-
-This class implements GET and POST requests to cgi-bin scripts.
-
-If the os.fork() function is not present (e.g. on Windows),
-subprocess.Popen() is used as a fallback, with slightly altered semantics.
-
-In all cases, the implementation is intentionally naive -- all
-requests are executed synchronously.
-
-SECURITY WARNING: DON'T USE THIS CODE UNLESS YOU ARE INSIDE A FIREWALL
--- it may execute arbitrary Python code or external programs.
-
-Note that status code 200 is sent prior to execution of a CGI script, so
-scripts cannot send other status codes such as 302 (redirect).
-
-XXX To do:
-
-- log requests even later (to capture byte count)
-- log user-agent header and other interesting goodies
-- send error log to separate file
-"""
-
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from future import utils
-from future.builtins import *
-
-
-# See also:
-#
-# HTTP Working Group                                        T. Berners-Lee
-# INTERNET-DRAFT                                            R. T. Fielding
-# <draft-ietf-http-v10-spec-00.txt>                     H. Frystyk Nielsen
-# Expires September 8, 1995                                  March 8, 1995
-#
-# URL: http://www.ics.uci.edu/pub/ietf/http/draft-ietf-http-v10-spec-00.txt
-#
-# and
-#
-# Network Working Group                                      R. Fielding
-# Request for Comments: 2616                                       et al
-# Obsoletes: 2068                                              June 1999
-# Category: Standards Track
-#
-# URL: http://www.faqs.org/rfcs/rfc2616.html
-
-# Log files
-# ---------
-#
-# Here's a quote from the NCSA httpd docs about log file format.
-#
-# | The logfile format is as follows. Each line consists of:
-# |
-# | host rfc931 authuser [DD/Mon/YYYY:hh:mm:ss] "request" ddd bbbb
-# |
-# |        host: Either the DNS name or the IP number of the remote client
-# |        rfc931: Any information returned by identd for this person,
-# |                - otherwise.
-# |        authuser: If user sent a userid for authentication, the user name,
-# |                  - otherwise.
-# |        DD: Day
-# |        Mon: Month (calendar name)
-# |        YYYY: Year
-# |        hh: hour (24-hour format, the machine's timezone)
-# |        mm: minutes
-# |        ss: seconds
-# |        request: The first line of the HTTP request as sent by the client.
-# |        ddd: the status code returned by the server, - if not available.
-# |        bbbb: the total number of bytes sent,
-# |              *not including the HTTP/1.0 header*, - if not available
-# |
-# | You can determine the name of the file accessed through request.
-#
-# (Actually, the latter is only true if you know the server configuration
-# at the time the request was made!)
-
-__version__ = "0.6"
-
-__all__ = ["HTTPServer", "BaseHTTPRequestHandler"]
-
-from future.backports import html
-from future.backports.http import client as http_client
-from future.backports.urllib import parse as urllib_parse
-from future.backports import socketserver
-
-import io
-import mimetypes
-import os
-import posixpath
-import select
-import shutil
-import socket # For gethostbyaddr()
-import sys
-import time
-import copy
-import argparse
-
-
-# Default error message template
-DEFAULT_ERROR_MESSAGE = """\
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-        <title>Error response</title>
-    </head>
-    <body>
-        <h1>Error response</h1>
-        <p>Error code: %(code)d</p>
-        <p>Message: %(message)s.</p>
-        <p>Error code explanation: %(code)s - %(explain)s.</p>
-    </body>
-</html>
-"""
-
-DEFAULT_ERROR_CONTENT_TYPE = "text/html;charset=utf-8"
-
-def _quote_html(html):
-    return html.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
-
-class HTTPServer(socketserver.TCPServer):
-
-    allow_reuse_address = 1    # Seems to make sense in testing environment
-
-    def server_bind(self):
-        """Override server_bind to store the server name."""
-        socketserver.TCPServer.server_bind(self)
-        host, port = self.socket.getsockname()[:2]
-        self.server_name = socket.getfqdn(host)
-        self.server_port = port
-
-
-class BaseHTTPRequestHandler(socketserver.StreamRequestHandler):
-
-    """HTTP request handler base class.
-
-    The following explanation of HTTP serves to guide you through the
-    code as well as to expose any misunderstandings I may have about
-    HTTP (so you don't need to read the code to figure out I'm wrong
-    :-).
-
-    HTTP (HyperText Transfer Protocol) is an extensible protocol on
-    top of a reliable stream transport (e.g. TCP/IP).  The protocol
-    recognizes three parts to a request:
-
-    1. One line identifying the request type and path
-    2. An optional set of RFC-822-style headers
-    3. An optional data part
-
-    The headers and data are separated by a blank line.
-
-    The first line of the request has the form
-
-    <command> <path> <version>
-
-    where <command> is a (case-sensitive) keyword such as GET or POST,
-    <path> is a string containing path information for the request,
-    and <version> should be the string "HTTP/1.0" or "HTTP/1.1".
-    <path> is encoded using the URL encoding scheme (using %xx to signify
-    the ASCII character with hex code xx).
-
-    The specification specifies that lines are separated by CRLF but
-    for compatibility with the widest range of clients recommends
-    servers also handle LF.  Similarly, whitespace in the request line
-    is treated sensibly (allowing multiple spaces between components
-    and allowing trailing whitespace).
-
-    Similarly, for output, lines ought to be separated by CRLF pairs
-    but most clients grok LF characters just fine.
-
-    If the first line of the request has the form
-
-    <command> <path>
-
-    (i.e. <version> is left out) then this is assumed to be an HTTP
-    0.9 request; this form has no optional headers and data part and
-    the reply consists of just the data.
-
-    The reply form of the HTTP 1.x protocol again has three parts:
-
-    1. One line giving the response code
-    2. An optional set of RFC-822-style headers
-    3. The data
-
-    Again, the headers and data are separated by a blank line.
-
-    The response code line has the form
-
-    <version> <responsecode> <responsestring>
-
-    where <version> is the protocol version ("HTTP/1.0" or "HTTP/1.1"),
-    <responsecode> is a 3-digit response code indicating success or
-    failure of the request, and <responsestring> is an optional
-    human-readable string explaining what the response code means.
-
-    This server parses the request and the headers, and then calls a
-    function specific to the request type (<command>).  Specifically,
-    a request SPAM will be handled by a method do_SPAM().  If no
-    such method exists the server sends an error response to the
-    client.  If it exists, it is called with no arguments:
-
-    do_SPAM()
-
-    Note that the request name is case sensitive (i.e. SPAM and spam
-    are different requests).
-
-    The various request details are stored in instance variables:
-
-    - client_address is the client IP address in the form (host,
-    port);
-
-    - command, path and version are the broken-down request line;
-
-    - headers is an instance of email.message.Message (or a derived
-    class) containing the header information;
-
-    - rfile is a file object open for reading positioned at the
-    start of the optional input data part;
-
-    - wfile is a file object open for writing.
-
-    IT IS IMPORTANT TO ADHERE TO THE PROTOCOL FOR WRITING!
-
-    The first thing to be written must be the response line.  Then
-    follow 0 or more header lines, then a blank line, and then the
-    actual data (if any).  The meaning of the header lines depends on
-    the command executed by the server; in most cases, when data is
-    returned, there should be at least one header line of the form
-
-    Content-type: <type>/<subtype>
-
-    where <type> and <subtype> should be registered MIME types,
-    e.g. "text/html" or "text/plain".
-
-    """
-
-    # The Python system version, truncated to its first component.
-    sys_version = "Python/" + sys.version.split()[0]
-
-    # The server software version.  You may want to override this.
-    # The format is multiple whitespace-separated strings,
-    # where each string is of the form name[/version].
-    server_version = "BaseHTTP/" + __version__
-
-    error_message_format = DEFAULT_ERROR_MESSAGE
-    error_content_type = DEFAULT_ERROR_CONTENT_TYPE
-
-    # The default request version.  This only affects responses up until
-    # the point where the request line is parsed, so it mainly decides what
-    # the client gets back when sending a malformed request line.
-    # Most web servers default to HTTP 0.9, i.e. don't send a status line.
-    default_request_version = "HTTP/0.9"
-
-    def parse_request(self):
-        """Parse a request (internal).
-
-        The request should be stored in self.raw_requestline; the results
-        are in self.command, self.path, self.request_version and
-        self.headers.
-
-        Return True for success, False for failure; on failure, an
-        error is sent back.
-
-        """
-        self.command = None  # set in case of error on the first line
-        self.request_version = version = self.default_request_version
-        self.close_connection = 1
-        requestline = str(self.raw_requestline, 'iso-8859-1')
-        requestline = requestline.rstrip('\r\n')
-        self.requestline = requestline
-        words = requestline.split()
-        if len(words) == 3:
-            command, path, version = words
-            if version[:5] != 'HTTP/':
-                self.send_error(400, "Bad request version (%r)" % version)
-                return False
-            try:
-                base_version_number = version.split('/', 1)[1]
-                version_number = base_version_number.split(".")
-                # RFC 2145 section 3.1 says there can be only one "." and
-                #   - major and minor numbers MUST be treated as
-                #      separate integers;
-                #   - HTTP/2.4 is a lower version than HTTP/2.13, which in
-                #      turn is lower than HTTP/12.3;
-                #   - Leading zeros MUST be ignored by recipients.
-                if len(version_number) != 2:
-                    raise ValueError
-                version_number = int(version_number[0]), int(version_number[1])
-            except (ValueError, IndexError):
-                self.send_error(400, "Bad request version (%r)" % version)
-                return False
-            if version_number >= (1, 1) and self.protocol_version >= "HTTP/1.1":
-                self.close_connection = 0
-            if version_number >= (2, 0):
-                self.send_error(505,
-                          "Invalid HTTP Version (%s)" % base_version_number)
-                return False
-        elif len(words) == 2:
-            command, path = words
-            self.close_connection = 1
-            if command != 'GET':
-                self.send_error(400,
-                                "Bad HTTP/0.9 request type (%r)" % command)
-                return False
-        elif not words:
-            return False
-        else:
-            self.send_error(400, "Bad request syntax (%r)" % requestline)
-            return False
-        self.command, self.path, self.request_version = command, path, version
-
-        # Examine the headers and look for a Connection directive.
-        try:
-            self.headers = http_client.parse_headers(self.rfile,
-                                                     _class=self.MessageClass)
-        except http_client.LineTooLong:
-            self.send_error(400, "Line too long")
-            return False
-
-        conntype = self.headers.get('Connection', "")
-        if conntype.lower() == 'close':
-            self.close_connection = 1
-        elif (conntype.lower() == 'keep-alive' and
-              self.protocol_version >= "HTTP/1.1"):
-            self.close_connection = 0
-        # Examine the headers and look for an Expect directive
-        expect = self.headers.get('Expect', "")
-        if (expect.lower() == "100-continue" and
-                self.protocol_version >= "HTTP/1.1" and
-                self.request_version >= "HTTP/1.1"):
-            if not self.handle_expect_100():
-                return False
-        return True
-
-    def handle_expect_100(self):
-        """Decide what to do with an "Expect: 100-continue" header.
-
-        If the client is expecting a 100 Continue response, we must
-        respond with either a 100 Continue or a final response before
-        waiting for the request body. The default is to always respond
-        with a 100 Continue. You can behave differently (for example,
-        reject unauthorized requests) by overriding this method.
-
-        This method should either return True (possibly after sending
-        a 100 Continue response) or send an error response and return
-        False.
-
-        """
-        self.send_response_only(100)
-        self.flush_headers()
-        return True
-
-    def handle_one_request(self):
-        """Handle a single HTTP request.
-
-        You normally don't need to override this method; see the class
-        __doc__ string for information on how to handle specific HTTP
-        commands such as GET and POST.
-
-        """
-        try:
-            self.raw_requestline = self.rfile.readline(65537)
-            if len(self.raw_requestline) > 65536:
-                self.requestline = ''
-                self.request_version = ''
-                self.command = ''
-                self.send_error(414)
-                return
-            if not self.raw_requestline:
-                self.close_connection = 1
-                return
-            if not self.parse_request():
-                # An error code has been sent, just exit
-                return
-            mname = 'do_' + self.command
-            if not hasattr(self, mname):
-                self.send_error(501, "Unsupported method (%r)" % self.command)
-                return
-            method = getattr(self, mname)
-            method()
-            self.wfile.flush() #actually send the response if not already done.
-        except socket.timeout as e:
-            #a read or a write timed out.  Discard this connection
-            self.log_error("Request timed out: %r", e)
-            self.close_connection = 1
-            return
-
-    def handle(self):
-        """Handle multiple requests if necessary."""
-        self.close_connection = 1
-
-        self.handle_one_request()
-        while not self.close_connection:
-            self.handle_one_request()
-
-    def send_error(self, code, message=None):
-        """Send and log an error reply.
-
-        Arguments are the error code, and a detailed message.
-        The detailed message defaults to the short entry matching the
-        response code.
-
-        This sends an error response (so it must be called before any
-        output has been generated), logs the error, and finally sends
-        a piece of HTML explaining the error to the user.
-
-        """
-
-        try:
-            shortmsg, longmsg = self.responses[code]
-        except KeyError:
-            shortmsg, longmsg = '???', '???'
-        if message is None:
-            message = shortmsg
-        explain = longmsg
-        self.log_error("code %d, message %s", code, message)
-        # using _quote_html to prevent Cross Site Scripting attacks (see bug #1100201)
-        content = (self.error_message_format %
-                   {'code': code, 'message': _quote_html(message), 'explain': explain})
-        self.send_response(code, message)
-        self.send_header("Content-Type", self.error_content_type)
-        self.send_header('Connection', 'close')
-        self.end_headers()
-        if self.command != 'HEAD' and code >= 200 and code not in (204, 304):
-            self.wfile.write(content.encode('UTF-8', 'replace'))
-
-    def send_response(self, code, message=None):
-        """Add the response header to the headers buffer and log the
-        response code.
-
-        Also send two standard headers with the server software
-        version and the current date.
-
-        """
-        self.log_request(code)
-        self.send_response_only(code, message)
-        self.send_header('Server', self.version_string())
-        self.send_header('Date', self.date_time_string())
-
-    def send_response_only(self, code, message=None):
-        """Send the response header only."""
-        if message is None:
-            if code in self.responses:
-                message = self.responses[code][0]
-            else:
-                message = ''
-        if self.request_version != 'HTTP/0.9':
-            if not hasattr(self, '_headers_buffer'):
-                self._headers_buffer = []
-            self._headers_buffer.append(("%s %d %s\r\n" %
-                    (self.protocol_version, code, message)).encode(
-                        'latin-1', 'strict'))
-
-    def send_header(self, keyword, value):
-        """Send a MIME header to the headers buffer."""
-        if self.request_version != 'HTTP/0.9':
-            if not hasattr(self, '_headers_buffer'):
-                self._headers_buffer = []
-            self._headers_buffer.append(
-                ("%s: %s\r\n" % (keyword, value)).encode('latin-1', 'strict'))
-
-        if keyword.lower() == 'connection':
-            if value.lower() == 'close':
-                self.close_connection = 1
-            elif value.lower() == 'keep-alive':
-                self.close_connection = 0
-
-    def end_headers(self):
-        """Send the blank line ending the MIME headers."""
-        if self.request_version != 'HTTP/0.9':
-            self._headers_buffer.append(b"\r\n")
-            self.flush_headers()
-
-    def flush_headers(self):
-        if hasattr(self, '_headers_buffer'):
-            self.wfile.write(b"".join(self._headers_buffer))
-            self._headers_buffer = []
-
-    def log_request(self, code='-', size='-'):
-        """Log an accepted request.
-
-        This is called by send_response().
-
-        """
-
-        self.log_message('"%s" %s %s',
-                         self.requestline, str(code), str(size))
-
-    def log_error(self, format, *args):
-        """Log an error.
-
-        This is called when a request cannot be fulfilled.  By
-        default it passes the message on to log_message().
-
-        Arguments are the same as for log_message().
-
-        XXX This should go to the separate error log.
-
-        """
-
-        self.log_message(format, *args)
-
-    def log_message(self, format, *args):
-        """Log an arbitrary message.
-
-        This is used by all other logging functions.  Override
-        it if you have specific logging wishes.
-
-        The first argument, FORMAT, is a format string for the
-        message to be logged.  If the format string contains
-        any % escapes requiring parameters, they should be
-        specified as subsequent arguments (it's just like
-        printf!).
-
-        The client ip and current date/time are prefixed to
-        every message.
-
-        """
-
-        sys.stderr.write("%s - - [%s] %s\n" %
-                         (self.address_string(),
-                          self.log_date_time_string(),
-                          format%args))
-
-    def version_string(self):
-        """Return the server software version string."""
-        return self.server_version + ' ' + self.sys_version
-
-    def date_time_string(self, timestamp=None):
-        """Return the current date and time formatted for a message header."""
-        if timestamp is None:
-            timestamp = time.time()
-        year, month, day, hh, mm, ss, wd, y, z = time.gmtime(timestamp)
-        s = "%s, %02d %3s %4d %02d:%02d:%02d GMT" % (
-                self.weekdayname[wd],
-                day, self.monthname[month], year,
-                hh, mm, ss)
-        return s
-
-    def log_date_time_string(self):
-        """Return the current time formatted for logging."""
-        now = time.time()
-        year, month, day, hh, mm, ss, x, y, z = time.localtime(now)
-        s = "%02d/%3s/%04d %02d:%02d:%02d" % (
-                day, self.monthname[month], year, hh, mm, ss)
-        return s
-
-    weekdayname = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-
-    monthname = [None,
-                 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-                 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
-
-    def address_string(self):
-        """Return the client address."""
-
-        return self.client_address[0]
-
-    # Essentially static class variables
-
-    # The version of the HTTP protocol we support.
-    # Set this to HTTP/1.1 to enable automatic keepalive
-    protocol_version = "HTTP/1.0"
-
-    # MessageClass used to parse headers
-    MessageClass = http_client.HTTPMessage
-
-    # Table mapping response codes to messages; entries have the
-    # form {code: (shortmessage, longmessage)}.
-    # See RFC 2616 and 6585.
-    responses = {
-        100: ('Continue', 'Request received, please continue'),
-        101: ('Switching Protocols',
-              'Switching to new protocol; obey Upgrade header'),
-
-        200: ('OK', 'Request fulfilled, document follows'),
-        201: ('Created', 'Document created, URL follows'),
-        202: ('Accepted',
-              'Request accepted, processing continues off-line'),
-        203: ('Non-Authoritative Information', 'Request fulfilled from cache'),
-        204: ('No Content', 'Request fulfilled, nothing follows'),
-        205: ('Reset Content', 'Clear input form for further input.'),
-        206: ('Partial Content', 'Partial content follows.'),
-
-        300: ('Multiple Choices',
-              'Object has several resources -- see URI list'),
-        301: ('Moved Permanently', 'Object moved permanently -- see URI list'),
-        302: ('Found', 'Object moved temporarily -- see URI list'),
-        303: ('See Other', 'Object moved -- see Method and URL list'),
-        304: ('Not Modified',
-              'Document has not changed since given time'),
-        305: ('Use Proxy',
-              'You must use proxy specified in Location to access this '
-              'resource.'),
-        307: ('Temporary Redirect',
-              'Object moved temporarily -- see URI list'),
-
-        400: ('Bad Request',
-              'Bad request syntax or unsupported method'),
-        401: ('Unauthorized',
-              'No permission -- see authorization schemes'),
-        402: ('Payment Required',
-              'No payment -- see charging schemes'),
-        403: ('Forbidden',
-              'Request forbidden -- authorization will not help'),
-        404: ('Not Found', 'Nothing matches the given URI'),
-        405: ('Method Not Allowed',
-              'Specified method is invalid for this resource.'),
-        406: ('Not Acceptable', 'URI not available in preferred format.'),
-        407: ('Proxy Authentication Required', 'You must authenticate with '
-              'this proxy before proceeding.'),
-        408: ('Request Timeout', 'Request timed out; try again later.'),
-        409: ('Conflict', 'Request conflict.'),
-        410: ('Gone',
-              'URI no longer exists and has been permanently removed.'),
-        411: ('Length Required', 'Client must specify Content-Length.'),
-        412: ('Precondition Failed', 'Precondition in headers is false.'),
-        413: ('Request Entity Too Large', 'Entity is too large.'),
-        414: ('Request-URI Too Long', 'URI is too long.'),
-        415: ('Unsupported Media Type', 'Entity body in unsupported format.'),
-        416: ('Requested Range Not Satisfiable',
-              'Cannot satisfy request range.'),
-        417: ('Expectation Failed',
-              'Expect condition could not be satisfied.'),
-        428: ('Precondition Required',
-              'The origin server requires the request to be conditional.'),
-        429: ('Too Many Requests', 'The user has sent too many requests '
-              'in a given amount of time ("rate limiting").'),
-        431: ('Request Header Fields Too Large', 'The server is unwilling to '
-              'process the request because its header fields are too large.'),
-
-        500: ('Internal Server Error', 'Server got itself in trouble'),
-        501: ('Not Implemented',
-              'Server does not support this operation'),
-        502: ('Bad Gateway', 'Invalid responses from another server/proxy.'),
-        503: ('Service Unavailable',
-              'The server cannot process the request due to a high load'),
-        504: ('Gateway Timeout',
-              'The gateway server did not receive a timely response'),
-        505: ('HTTP Version Not Supported', 'Cannot fulfill request.'),
-        511: ('Network Authentication Required',
-              'The client needs to authenticate to gain network access.'),
-        }
-
-
-class SimpleHTTPRequestHandler(BaseHTTPRequestHandler):
-
-    """Simple HTTP request handler with GET and HEAD commands.
-
-    This serves files from the current directory and any of its
-    subdirectories.  The MIME type for files is determined by
-    calling the .guess_type() method.
-
-    The GET and HEAD requests are identical except that the HEAD
-    request omits the actual contents of the file.
-
-    """
-
-    server_version = "SimpleHTTP/" + __version__
-
-    def do_GET(self):
-        """Serve a GET request."""
-        f = self.send_head()
-        if f:
-            self.copyfile(f, self.wfile)
-            f.close()
-
-    def do_HEAD(self):
-        """Serve a HEAD request."""
-        f = self.send_head()
-        if f:
-            f.close()
-
-    def send_head(self):
-        """Common code for GET and HEAD commands.
-
-        This sends the response code and MIME headers.
-
-        Return value is either a file object (which has to be copied
-        to the outputfile by the caller unless the command was HEAD,
-        and must be closed by the caller under all circumstances), or
-        None, in which case the caller has nothing further to do.
-
-        """
-        path = self.translate_path(self.path)
-        f = None
-        if os.path.isdir(path):
-            if not self.path.endswith('/'):
-                # redirect browser - doing basically what apache does
-                self.send_response(301)
-                self.send_header("Location", self.path + "/")
-                self.end_headers()
-                return None
-            for index in "index.html", "index.htm":
-                index = os.path.join(path, index)
-                if os.path.exists(index):
-                    path = index
-                    break
-            else:
-                return self.list_directory(path)
-        ctype = self.guess_type(path)
-        try:
-            f = open(path, 'rb')
-        except IOError:
-            self.send_error(404, "File not found")
-            return None
-        self.send_response(200)
-        self.send_header("Content-type", ctype)
-        fs = os.fstat(f.fileno())
-        self.send_header("Content-Length", str(fs[6]))
-        self.send_header("Last-Modified", self.date_time_string(fs.st_mtime))
-        self.end_headers()
-        return f
-
-    def list_directory(self, path):
-        """Helper to produce a directory listing (absent index.html).
-
-        Return value is either a file object, or None (indicating an
-        error).  In either case, the headers are sent, making the
-        interface the same as for send_head().
-
-        """
-        try:
-            list = os.listdir(path)
-        except os.error:
-            self.send_error(404, "No permission to list directory")
-            return None
-        list.sort(key=lambda a: a.lower())
-        r = []
-        displaypath = html.escape(urllib_parse.unquote(self.path))
-        enc = sys.getfilesystemencoding()
-        title = 'Directory listing for %s' % displaypath
-        r.append('<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" '
-                 '"http://www.w3.org/TR/html4/strict.dtd">')
-        r.append('<html>\n<head>')
-        r.append('<meta http-equiv="Content-Type" '
-                 'content="text/html; charset=%s">' % enc)
-        r.append('<title>%s</title>\n</head>' % title)
-        r.append('<body>\n<h1>%s</h1>' % title)
-        r.append('<hr>\n<ul>')
-        for name in list:
-            fullname = os.path.join(path, name)
-            displayname = linkname = name
-            # Append / for directories or @ for symbolic links
-            if os.path.isdir(fullname):
-                displayname = name + "/"
-                linkname = name + "/"
-            if os.path.islink(fullname):
-                displayname = name + "@"
-                # Note: a link to a directory displays with @ and links with /
-            r.append('<li><a href="%s">%s</a></li>'
-                    % (urllib_parse.quote(linkname), html.escape(displayname)))
-            # # Use this instead:
-            # r.append('<li><a href="%s">%s</a></li>'
-            #         % (urllib.quote(linkname), cgi.escape(displayname)))
-        r.append('</ul>\n<hr>\n</body>\n</html>\n')
-        encoded = '\n'.join(r).encode(enc)
-        f = io.BytesIO()
-        f.write(encoded)
-        f.seek(0)
-        self.send_response(200)
-        self.send_header("Content-type", "text/html; charset=%s" % enc)
-        self.send_header("Content-Length", str(len(encoded)))
-        self.end_headers()
-        return f
-
-    def translate_path(self, path):
-        """Translate a /-separated PATH to the local filename syntax.
-
-        Components that mean special things to the local file system
-        (e.g. drive or directory names) are ignored.  (XXX They should
-        probably be diagnosed.)
-
-        """
-        # abandon query parameters
-        path = path.split('?',1)[0]
-        path = path.split('#',1)[0]
-        path = posixpath.normpath(urllib_parse.unquote(path))
-        words = path.split('/')
-        words = filter(None, words)
-        path = os.getcwd()
-        for word in words:
-            drive, word = os.path.splitdrive(word)
-            head, word = os.path.split(word)
-            if word in (os.curdir, os.pardir): continue
-            path = os.path.join(path, word)
-        return path
-
-    def copyfile(self, source, outputfile):
-        """Copy all data between two file objects.
-
-        The SOURCE argument is a file object open for reading
-        (or anything with a read() method) and the DESTINATION
-        argument is a file object open for writing (or
-        anything with a write() method).
-
-        The only reason for overriding this would be to change
-        the block size or perhaps to replace newlines by CRLF
-        -- note however that this the default server uses this
-        to copy binary data as well.
-
-        """
-        shutil.copyfileobj(source, outputfile)
-
-    def guess_type(self, path):
-        """Guess the type of a file.
-
-        Argument is a PATH (a filename).
-
-        Return value is a string of the form type/subtype,
-        usable for a MIME Content-type header.
-
-        The default implementation looks the file's extension
-        up in the table self.extensions_map, using application/octet-stream
-        as a default; however it would be permissible (if
-        slow) to look inside the data to make a better guess.
-
-        """
-
-        base, ext = posixpath.splitext(path)
-        if ext in self.extensions_map:
-            return self.extensions_map[ext]
-        ext = ext.lower()
-        if ext in self.extensions_map:
-            return self.extensions_map[ext]
-        else:
-            return self.extensions_map['']
-
-    if not mimetypes.inited:
-        mimetypes.init() # try to read system mime.types
-    extensions_map = mimetypes.types_map.copy()
-    extensions_map.update({
-        '': 'application/octet-stream', # Default
-        '.py': 'text/plain',
-        '.c': 'text/plain',
-        '.h': 'text/plain',
-        })
-
-
-# Utilities for CGIHTTPRequestHandler
-
-def _url_collapse_path(path):
-    """
-    Given a URL path, remove extra '/'s and '.' path elements and collapse
-    any '..' references and returns a colllapsed path.
-
-    Implements something akin to RFC-2396 5.2 step 6 to parse relative paths.
-    The utility of this function is limited to is_cgi method and helps
-    preventing some security attacks.
-
-    Returns: A tuple of (head, tail) where tail is everything after the final /
-    and head is everything before it.  Head will always start with a '/' and,
-    if it contains anything else, never have a trailing '/'.
-
-    Raises: IndexError if too many '..' occur within the path.
-
-    """
-    # Similar to os.path.split(os.path.normpath(path)) but specific to URL
-    # path semantics rather than local operating system semantics.
-    path_parts = path.split('/')
-    head_parts = []
-    for part in path_parts[:-1]:
-        if part == '..':
-            head_parts.pop() # IndexError if more '..' than prior parts
-        elif part and part != '.':
-            head_parts.append( part )
-    if path_parts:
-        tail_part = path_parts.pop()
-        if tail_part:
-            if tail_part == '..':
-                head_parts.pop()
-                tail_part = ''
-            elif tail_part == '.':
-                tail_part = ''
-    else:
-        tail_part = ''
-
-    splitpath = ('/' + '/'.join(head_parts), tail_part)
-    collapsed_path = "/".join(splitpath)
-
-    return collapsed_path
-
-
-
-nobody = None
-
-def nobody_uid():
-    """Internal routine to get nobody's uid"""
-    global nobody
-    if nobody:
-        return nobody
-    try:
-        import pwd
-    except ImportError:
-        return -1
-    try:
-        nobody = pwd.getpwnam('nobody')[2]
-    except KeyError:
-        nobody = 1 + max(x[2] for x in pwd.getpwall())
-    return nobody
-
-
-def executable(path):
-    """Test for executable file."""
-    return os.access(path, os.X_OK)
-
-
-class CGIHTTPRequestHandler(SimpleHTTPRequestHandler):
-
-    """Complete HTTP server with GET, HEAD and POST commands.
-
-    GET and HEAD also support running CGI scripts.
-
-    The POST command is *only* implemented for CGI scripts.
-
-    """
-
-    # Determine platform specifics
-    have_fork = hasattr(os, 'fork')
-
-    # Make rfile unbuffered -- we need to read one line and then pass
-    # the rest to a subprocess, so we can't use buffered input.
-    rbufsize = 0
-
-    def do_POST(self):
-        """Serve a POST request.
-
-        This is only implemented for CGI scripts.
-
-        """
-
-        if self.is_cgi():
-            self.run_cgi()
-        else:
-            self.send_error(501, "Can only POST to CGI scripts")
-
-    def send_head(self):
-        """Version of send_head that support CGI scripts"""
-        if self.is_cgi():
-            return self.run_cgi()
-        else:
-            return SimpleHTTPRequestHandler.send_head(self)
-
-    def is_cgi(self):
-        """Test whether self.path corresponds to a CGI script.
-
-        Returns True and updates the cgi_info attribute to the tuple
-        (dir, rest) if self.path requires running a CGI script.
-        Returns False otherwise.
-
-        If any exception is raised, the caller should assume that
-        self.path was rejected as invalid and act accordingly.
-
-        The default implementation tests whether the normalized url
-        path begins with one of the strings in self.cgi_directories
-        (and the next character is a '/' or the end of the string).
-
-        """
-        collapsed_path = _url_collapse_path(self.path)
-        dir_sep = collapsed_path.find('/', 1)
-        head, tail = collapsed_path[:dir_sep], collapsed_path[dir_sep+1:]
-        if head in self.cgi_directories:
-            self.cgi_info = head, tail
-            return True
-        return False
-
-
-    cgi_directories = ['/cgi-bin', '/htbin']
-
-    def is_executable(self, path):
-        """Test whether argument path is an executable file."""
-        return executable(path)
-
-    def is_python(self, path):
-        """Test whether argument path is a Python script."""
-        head, tail = os.path.splitext(path)
-        return tail.lower() in (".py", ".pyw")
-
-    def run_cgi(self):
-        """Execute a CGI script."""
-        path = self.path
-        dir, rest = self.cgi_info
-
-        i = path.find('/', len(dir) + 1)
-        while i >= 0:
-            nextdir = path[:i]
-            nextrest = path[i+1:]
-
-            scriptdir = self.translate_path(nextdir)
-            if os.path.isdir(scriptdir):
-                dir, rest = nextdir, nextrest
-                i = path.find('/', len(dir) + 1)
-            else:
-                break
-
-        # find an explicit query string, if present.
-        i = rest.rfind('?')
-        if i >= 0:
-            rest, query = rest[:i], rest[i+1:]
-        else:
-            query = ''
-
-        # dissect the part after the directory name into a script name &
-        # a possible additional path, to be stored in PATH_INFO.
-        i = rest.find('/')
-        if i >= 0:
-            script, rest = rest[:i], rest[i:]
-        else:
-            script, rest = rest, ''
-
-        scriptname = dir + '/' + script
-        scriptfile = self.translate_path(scriptname)
-        if not os.path.exists(scriptfile):
-            self.send_error(404, "No such CGI script (%r)" % scriptname)
-            return
-        if not os.path.isfile(scriptfile):
-            self.send_error(403, "CGI script is not a plain file (%r)" %
-                            scriptname)
-            return
-        ispy = self.is_python(scriptname)
-        if self.have_fork or not ispy:
-            if not self.is_executable(scriptfile):
-                self.send_error(403, "CGI script is not executable (%r)" %
-                                scriptname)
-                return
-
-        # Reference: http://hoohoo.ncsa.uiuc.edu/cgi/env.html
-        # XXX Much of the following could be prepared ahead of time!
-        env = copy.deepcopy(os.environ)
-        env['SERVER_SOFTWARE'] = self.version_string()
-        env['SERVER_NAME'] = self.server.server_name
-        env['GATEWAY_INTERFACE'] = 'CGI/1.1'
-        env['SERVER_PROTOCOL'] = self.protocol_version
-        env['SERVER_PORT'] = str(self.server.server_port)
-        env['REQUEST_METHOD'] = self.command
-        uqrest = urllib_parse.unquote(rest)
-        env['PATH_INFO'] = uqrest
-        env['PATH_TRANSLATED'] = self.translate_path(uqrest)
-        env['SCRIPT_NAME'] = scriptname
-        if query:
-            env['QUERY_STRING'] = query
-        env['REMOTE_ADDR'] = self.client_address[0]
-        authorization = self.headers.get("authorization")
-        if authorization:
-            authorization = authorization.split()
-            if len(authorization) == 2:
-                import base64, binascii
-                env['AUTH_TYPE'] = authorization[0]
-                if authorization[0].lower() == "basic":
-                    try:
-                        authorization = authorization[1].encode('ascii')
-                        if utils.PY3:
-                            # In Py3.3, was:
-                            authorization = base64.decodebytes(authorization).\
-                                            decode('ascii')
-                        else:
-                            # Backport to Py2.7:
-                            authorization = base64.decodestring(authorization).\
-                                            decode('ascii')
-                    except (binascii.Error, UnicodeError):
-                        pass
-                    else:
-                        authorization = authorization.split(':')
-                        if len(authorization) == 2:
-                            env['REMOTE_USER'] = authorization[0]
-        # XXX REMOTE_IDENT
-        if self.headers.get('content-type') is None:
-            env['CONTENT_TYPE'] = self.headers.get_content_type()
-        else:
-            env['CONTENT_TYPE'] = self.headers['content-type']
-        length = self.headers.get('content-length')
-        if length:
-            env['CONTENT_LENGTH'] = length
-        referer = self.headers.get('referer')
-        if referer:
-            env['HTTP_REFERER'] = referer
-        accept = []
-        for line in self.headers.getallmatchingheaders('accept'):
-            if line[:1] in "\t\n\r ":
-                accept.append(line.strip())
-            else:
-                accept = accept + line[7:].split(',')
-        env['HTTP_ACCEPT'] = ','.join(accept)
-        ua = self.headers.get('user-agent')
-        if ua:
-            env['HTTP_USER_AGENT'] = ua
-        co = filter(None, self.headers.get_all('cookie', []))
-        cookie_str = ', '.join(co)
-        if cookie_str:
-            env['HTTP_COOKIE'] = cookie_str
-        # XXX Other HTTP_* headers
-        # Since we're setting the env in the parent, provide empty
-        # values to override previously set values
-        for k in ('QUERY_STRING', 'REMOTE_HOST', 'CONTENT_LENGTH',
-                  'HTTP_USER_AGENT', 'HTTP_COOKIE', 'HTTP_REFERER'):
-            env.setdefault(k, "")
-
-        self.send_response(200, "Script output follows")
-        self.flush_headers()
-
-        decoded_query = query.replace('+', ' ')
-
-        if self.have_fork:
-            # Unix -- fork as we should
-            args = [script]
-            if '=' not in decoded_query:
-                args.append(decoded_query)
-            nobody = nobody_uid()
-            self.wfile.flush() # Always flush before forking
-            pid = os.fork()
-            if pid != 0:
-                # Parent
-                pid, sts = os.waitpid(pid, 0)
-                # throw away additional data [see bug #427345]
-                while select.select([self.rfile], [], [], 0)[0]:
-                    if not self.rfile.read(1):
-                        break
-                if sts:
-                    self.log_error("CGI script exit status %#x", sts)
-                return
-            # Child
-            try:
-                try:
-                    os.setuid(nobody)
-                except os.error:
-                    pass
-                os.dup2(self.rfile.fileno(), 0)
-                os.dup2(self.wfile.fileno(), 1)
-                os.execve(scriptfile, args, env)
-            except:
-                self.server.handle_error(self.request, self.client_address)
-                os._exit(127)
-
-        else:
-            # Non-Unix -- use subprocess
-            import subprocess
-            cmdline = [scriptfile]
-            if self.is_python(scriptfile):
-                interp = sys.executable
-                if interp.lower().endswith("w.exe"):
-                    # On Windows, use python.exe, not pythonw.exe
-                    interp = interp[:-5] + interp[-4:]
-                cmdline = [interp, '-u'] + cmdline
-            if '=' not in query:
-                cmdline.append(query)
-            self.log_message("command: %s", subprocess.list2cmdline(cmdline))
-            try:
-                nbytes = int(length)
-            except (TypeError, ValueError):
-                nbytes = 0
-            p = subprocess.Popen(cmdline,
-                                 stdin=subprocess.PIPE,
-                                 stdout=subprocess.PIPE,
-                                 stderr=subprocess.PIPE,
-                                 env = env
-                                 )
-            if self.command.lower() == "post" and nbytes > 0:
-                data = self.rfile.read(nbytes)
-            else:
-                data = None
-            # throw away additional data [see bug #427345]
-            while select.select([self.rfile._sock], [], [], 0)[0]:
-                if not self.rfile._sock.recv(1):
-                    break
-            stdout, stderr = p.communicate(data)
-            self.wfile.write(stdout)
-            if stderr:
-                self.log_error('%s', stderr)
-            p.stderr.close()
-            p.stdout.close()
-            status = p.returncode
-            if status:
-                self.log_error("CGI script exit status %#x", status)
-            else:
-                self.log_message("CGI script exited OK")
-
-
-def test(HandlerClass = BaseHTTPRequestHandler,
-         ServerClass = HTTPServer, protocol="HTTP/1.0", port=8000):
-    """Test the HTTP request handler class.
-
-    This runs an HTTP server on port 8000 (or the first command line
-    argument).
-
-    """
-    server_address = ('', port)
-
-    HandlerClass.protocol_version = protocol
-    httpd = ServerClass(server_address, HandlerClass)
-
-    sa = httpd.socket.getsockname()
-    print("Serving HTTP on", sa[0], "port", sa[1], "...")
-    try:
-        httpd.serve_forever()
-    except KeyboardInterrupt:
-        print("\nKeyboard interrupt received, exiting.")
-        httpd.server_close()
-        sys.exit(0)
-
-if __name__ == '__main__':
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--cgi', action='store_true',
-                       help='Run as CGI Server')
-    parser.add_argument('port', action='store',
-                        default=8000, type=int,
-                        nargs='?',
-                        help='Specify alternate port [default: 8000]')
-    args = parser.parse_args()
-    if args.cgi:
-        test(HandlerClass=CGIHTTPRequestHandler, port=args.port)
-    else:
-        test(HandlerClass=SimpleHTTPRequestHandler, port=args.port)
diff --git a/lib/future/backports/misc.py b/lib/future/backports/misc.py
deleted file mode 100644
index 992b978f..00000000
--- a/lib/future/backports/misc.py
+++ /dev/null
@@ -1,958 +0,0 @@
-"""
-Miscellaneous function (re)definitions from the Py3.4+ standard library
-for Python 2.6/2.7.
-
-- math.ceil                (for Python 2.7)
-- collections.OrderedDict  (for Python 2.6)
-- collections.Counter      (for Python 2.6)
-- collections.ChainMap     (for all versions prior to Python 3.3)
-- itertools.count          (for Python 2.6, with step parameter)
-- subprocess.check_output  (for Python 2.6)
-- reprlib.recursive_repr   (for Python 2.6+)
-- functools.cmp_to_key     (for Python 2.6)
-"""
-
-from __future__ import absolute_import
-
-import subprocess
-from math import ceil as oldceil
-
-from operator import itemgetter as _itemgetter, eq as _eq
-import sys
-import heapq as _heapq
-from _weakref import proxy as _proxy
-from itertools import repeat as _repeat, chain as _chain, starmap as _starmap
-from socket import getaddrinfo, SOCK_STREAM, error, socket
-
-from future.utils import iteritems, itervalues, PY2, PY26, PY3
-
-if PY2:
-    from collections import Mapping, MutableMapping
-else:
-    from collections.abc import Mapping, MutableMapping
-
-
-def ceil(x):
-    """
-    Return the ceiling of x as an int.
-    This is the smallest integral value >= x.
-    """
-    return int(oldceil(x))
-
-
-########################################################################
-###  reprlib.recursive_repr decorator from Py3.4
-########################################################################
-
-from itertools import islice
-
-if PY26:
-    # itertools.count in Py 2.6 doesn't accept a step parameter
-    def count(start=0, step=1):
-        while True:
-            yield start
-            start += step
-else:
-    from itertools import count
-
-
-if PY3:
-    try:
-        from _thread import get_ident
-    except ImportError:
-        from _dummy_thread import get_ident
-else:
-    try:
-        from thread import get_ident
-    except ImportError:
-        from dummy_thread import get_ident
-
-
-def recursive_repr(fillvalue='...'):
-    'Decorator to make a repr function return fillvalue for a recursive call'
-
-    def decorating_function(user_function):
-        repr_running = set()
-
-        def wrapper(self):
-            key = id(self), get_ident()
-            if key in repr_running:
-                return fillvalue
-            repr_running.add(key)
-            try:
-                result = user_function(self)
-            finally:
-                repr_running.discard(key)
-            return result
-
-        # Can't use functools.wraps() here because of bootstrap issues
-        wrapper.__module__ = getattr(user_function, '__module__')
-        wrapper.__doc__ = getattr(user_function, '__doc__')
-        wrapper.__name__ = getattr(user_function, '__name__')
-        wrapper.__annotations__ = getattr(user_function, '__annotations__', {})
-        return wrapper
-
-    return decorating_function
-
-
-# OrderedDict Shim from  Raymond Hettinger, python core dev
-# http://code.activestate.com/recipes/576693-ordered-dictionary-for-py24/
-# here to support version 2.6.
-
-################################################################################
-### OrderedDict
-################################################################################
-
-class _Link(object):
-    __slots__ = 'prev', 'next', 'key', '__weakref__'
-
-class OrderedDict(dict):
-    'Dictionary that remembers insertion order'
-    # An inherited dict maps keys to values.
-    # The inherited dict provides __getitem__, __len__, __contains__, and get.
-    # The remaining methods are order-aware.
-    # Big-O running times for all methods are the same as regular dictionaries.
-
-    # The internal self.__map dict maps keys to links in a doubly linked list.
-    # The circular doubly linked list starts and ends with a sentinel element.
-    # The sentinel element never gets deleted (this simplifies the algorithm).
-    # The sentinel is in self.__hardroot with a weakref proxy in self.__root.
-    # The prev links are weakref proxies (to prevent circular references).
-    # Individual links are kept alive by the hard reference in self.__map.
-    # Those hard references disappear when a key is deleted from an OrderedDict.
-
-    def __init__(*args, **kwds):
-        '''Initialize an ordered dictionary.  The signature is the same as
-        regular dictionaries, but keyword arguments are not recommended because
-        their insertion order is arbitrary.
-
-        '''
-        if not args:
-            raise TypeError("descriptor '__init__' of 'OrderedDict' object "
-                            "needs an argument")
-        self = args[0]
-        args = args[1:]
-        if len(args) > 1:
-            raise TypeError('expected at most 1 arguments, got %d' % len(args))
-        try:
-            self.__root
-        except AttributeError:
-            self.__hardroot = _Link()
-            self.__root = root = _proxy(self.__hardroot)
-            root.prev = root.next = root
-            self.__map = {}
-        self.__update(*args, **kwds)
-
-    def __setitem__(self, key, value,
-                    dict_setitem=dict.__setitem__, proxy=_proxy, Link=_Link):
-        'od.__setitem__(i, y) <==> od[i]=y'
-        # Setting a new item creates a new link at the end of the linked list,
-        # and the inherited dictionary is updated with the new key/value pair.
-        if key not in self:
-            self.__map[key] = link = Link()
-            root = self.__root
-            last = root.prev
-            link.prev, link.next, link.key = last, root, key
-            last.next = link
-            root.prev = proxy(link)
-        dict_setitem(self, key, value)
-
-    def __delitem__(self, key, dict_delitem=dict.__delitem__):
-        'od.__delitem__(y) <==> del od[y]'
-        # Deleting an existing item uses self.__map to find the link which gets
-        # removed by updating the links in the predecessor and successor nodes.
-        dict_delitem(self, key)
-        link = self.__map.pop(key)
-        link_prev = link.prev
-        link_next = link.next
-        link_prev.next = link_next
-        link_next.prev = link_prev
-
-    def __iter__(self):
-        'od.__iter__() <==> iter(od)'
-        # Traverse the linked list in order.
-        root = self.__root
-        curr = root.next
-        while curr is not root:
-            yield curr.key
-            curr = curr.next
-
-    def __reversed__(self):
-        'od.__reversed__() <==> reversed(od)'
-        # Traverse the linked list in reverse order.
-        root = self.__root
-        curr = root.prev
-        while curr is not root:
-            yield curr.key
-            curr = curr.prev
-
-    def clear(self):
-        'od.clear() -> None.  Remove all items from od.'
-        root = self.__root
-        root.prev = root.next = root
-        self.__map.clear()
-        dict.clear(self)
-
-    def popitem(self, last=True):
-        '''od.popitem() -> (k, v), return and remove a (key, value) pair.
-        Pairs are returned in LIFO order if last is true or FIFO order if false.
-
-        '''
-        if not self:
-            raise KeyError('dictionary is empty')
-        root = self.__root
-        if last:
-            link = root.prev
-            link_prev = link.prev
-            link_prev.next = root
-            root.prev = link_prev
-        else:
-            link = root.next
-            link_next = link.next
-            root.next = link_next
-            link_next.prev = root
-        key = link.key
-        del self.__map[key]
-        value = dict.pop(self, key)
-        return key, value
-
-    def move_to_end(self, key, last=True):
-        '''Move an existing element to the end (or beginning if last==False).
-
-        Raises KeyError if the element does not exist.
-        When last=True, acts like a fast version of self[key]=self.pop(key).
-
-        '''
-        link = self.__map[key]
-        link_prev = link.prev
-        link_next = link.next
-        link_prev.next = link_next
-        link_next.prev = link_prev
-        root = self.__root
-        if last:
-            last = root.prev
-            link.prev = last
-            link.next = root
-            last.next = root.prev = link
-        else:
-            first = root.next
-            link.prev = root
-            link.next = first
-            root.next = first.prev = link
-
-    def __sizeof__(self):
-        sizeof = sys.getsizeof
-        n = len(self) + 1                       # number of links including root
-        size = sizeof(self.__dict__)            # instance dictionary
-        size += sizeof(self.__map) * 2          # internal dict and inherited dict
-        size += sizeof(self.__hardroot) * n     # link objects
-        size += sizeof(self.__root) * n         # proxy objects
-        return size
-
-    update = __update = MutableMapping.update
-    keys = MutableMapping.keys
-    values = MutableMapping.values
-    items = MutableMapping.items
-    __ne__ = MutableMapping.__ne__
-
-    __marker = object()
-
-    def pop(self, key, default=__marker):
-        '''od.pop(k[,d]) -> v, remove specified key and return the corresponding
-        value.  If key is not found, d is returned if given, otherwise KeyError
-        is raised.
-
-        '''
-        if key in self:
-            result = self[key]
-            del self[key]
-            return result
-        if default is self.__marker:
-            raise KeyError(key)
-        return default
-
-    def setdefault(self, key, default=None):
-        'od.setdefault(k[,d]) -> od.get(k,d), also set od[k]=d if k not in od'
-        if key in self:
-            return self[key]
-        self[key] = default
-        return default
-
-    @recursive_repr()
-    def __repr__(self):
-        'od.__repr__() <==> repr(od)'
-        if not self:
-            return '%s()' % (self.__class__.__name__,)
-        return '%s(%r)' % (self.__class__.__name__, list(self.items()))
-
-    def __reduce__(self):
-        'Return state information for pickling'
-        inst_dict = vars(self).copy()
-        for k in vars(OrderedDict()):
-            inst_dict.pop(k, None)
-        return self.__class__, (), inst_dict or None, None, iter(self.items())
-
-    def copy(self):
-        'od.copy() -> a shallow copy of od'
-        return self.__class__(self)
-
-    @classmethod
-    def fromkeys(cls, iterable, value=None):
-        '''OD.fromkeys(S[, v]) -> New ordered dictionary with keys from S.
-        If not specified, the value defaults to None.
-
-        '''
-        self = cls()
-        for key in iterable:
-            self[key] = value
-        return self
-
-    def __eq__(self, other):
-        '''od.__eq__(y) <==> od==y.  Comparison to another OD is order-sensitive
-        while comparison to a regular mapping is order-insensitive.
-
-        '''
-        if isinstance(other, OrderedDict):
-            return dict.__eq__(self, other) and all(map(_eq, self, other))
-        return dict.__eq__(self, other)
-
-
-# {{{ http://code.activestate.com/recipes/576611/ (r11)
-
-try:
-    from operator import itemgetter
-    from heapq import nlargest
-except ImportError:
-    pass
-
-########################################################################
-###  Counter
-########################################################################
-
-def _count_elements(mapping, iterable):
-    'Tally elements from the iterable.'
-    mapping_get = mapping.get
-    for elem in iterable:
-        mapping[elem] = mapping_get(elem, 0) + 1
-
-class Counter(dict):
-    '''Dict subclass for counting hashable items.  Sometimes called a bag
-    or multiset.  Elements are stored as dictionary keys and their counts
-    are stored as dictionary values.
-
-    >>> c = Counter('abcdeabcdabcaba')  # count elements from a string
-
-    >>> c.most_common(3)                # three most common elements
-    [('a', 5), ('b', 4), ('c', 3)]
-    >>> sorted(c)                       # list all unique elements
-    ['a', 'b', 'c', 'd', 'e']
-    >>> ''.join(sorted(c.elements()))   # list elements with repetitions
-    'aaaaabbbbcccdde'
-    >>> sum(c.values())                 # total of all counts
-    15
-
-    >>> c['a']                          # count of letter 'a'
-    5
-    >>> for elem in 'shazam':           # update counts from an iterable
-    ...     c[elem] += 1                # by adding 1 to each element's count
-    >>> c['a']                          # now there are seven 'a'
-    7
-    >>> del c['b']                      # remove all 'b'
-    >>> c['b']                          # now there are zero 'b'
-    0
-
-    >>> d = Counter('simsalabim')       # make another counter
-    >>> c.update(d)                     # add in the second counter
-    >>> c['a']                          # now there are nine 'a'
-    9
-
-    >>> c.clear()                       # empty the counter
-    >>> c
-    Counter()
-
-    Note:  If a count is set to zero or reduced to zero, it will remain
-    in the counter until the entry is deleted or the counter is cleared:
-
-    >>> c = Counter('aaabbc')
-    >>> c['b'] -= 2                     # reduce the count of 'b' by two
-    >>> c.most_common()                 # 'b' is still in, but its count is zero
-    [('a', 3), ('c', 1), ('b', 0)]
-
-    '''
-    # References:
-    #   http://en.wikipedia.org/wiki/Multiset
-    #   http://www.gnu.org/software/smalltalk/manual-base/html_node/Bag.html
-    #   http://www.demo2s.com/Tutorial/Cpp/0380__set-multiset/Catalog0380__set-multiset.htm
-    #   http://code.activestate.com/recipes/259174/
-    #   Knuth, TAOCP Vol. II section 4.6.3
-
-    def __init__(*args, **kwds):
-        '''Create a new, empty Counter object.  And if given, count elements
-        from an input iterable.  Or, initialize the count from another mapping
-        of elements to their counts.
-
-        >>> c = Counter()                           # a new, empty counter
-        >>> c = Counter('gallahad')                 # a new counter from an iterable
-        >>> c = Counter({'a': 4, 'b': 2})           # a new counter from a mapping
-        >>> c = Counter(a=4, b=2)                   # a new counter from keyword args
-
-        '''
-        if not args:
-            raise TypeError("descriptor '__init__' of 'Counter' object "
-                            "needs an argument")
-        self = args[0]
-        args = args[1:]
-        if len(args) > 1:
-            raise TypeError('expected at most 1 arguments, got %d' % len(args))
-        super(Counter, self).__init__()
-        self.update(*args, **kwds)
-
-    def __missing__(self, key):
-        'The count of elements not in the Counter is zero.'
-        # Needed so that self[missing_item] does not raise KeyError
-        return 0
-
-    def most_common(self, n=None):
-        '''List the n most common elements and their counts from the most
-        common to the least.  If n is None, then list all element counts.
-
-        >>> Counter('abcdeabcdabcaba').most_common(3)
-        [('a', 5), ('b', 4), ('c', 3)]
-
-        '''
-        # Emulate Bag.sortedByCount from Smalltalk
-        if n is None:
-            return sorted(self.items(), key=_itemgetter(1), reverse=True)
-        return _heapq.nlargest(n, self.items(), key=_itemgetter(1))
-
-    def elements(self):
-        '''Iterator over elements repeating each as many times as its count.
-
-        >>> c = Counter('ABCABC')
-        >>> sorted(c.elements())
-        ['A', 'A', 'B', 'B', 'C', 'C']
-
-        # Knuth's example for prime factors of 1836:  2**2 * 3**3 * 17**1
-        >>> prime_factors = Counter({2: 2, 3: 3, 17: 1})
-        >>> product = 1
-        >>> for factor in prime_factors.elements():     # loop over factors
-        ...     product *= factor                       # and multiply them
-        >>> product
-        1836
-
-        Note, if an element's count has been set to zero or is a negative
-        number, elements() will ignore it.
-
-        '''
-        # Emulate Bag.do from Smalltalk and Multiset.begin from C++.
-        return _chain.from_iterable(_starmap(_repeat, self.items()))
-
-    # Override dict methods where necessary
-
-    @classmethod
-    def fromkeys(cls, iterable, v=None):
-        # There is no equivalent method for counters because setting v=1
-        # means that no element can have a count greater than one.
-        raise NotImplementedError(
-            'Counter.fromkeys() is undefined.  Use Counter(iterable) instead.')
-
-    def update(*args, **kwds):
-        '''Like dict.update() but add counts instead of replacing them.
-
-        Source can be an iterable, a dictionary, or another Counter instance.
-
-        >>> c = Counter('which')
-        >>> c.update('witch')           # add elements from another iterable
-        >>> d = Counter('watch')
-        >>> c.update(d)                 # add elements from another counter
-        >>> c['h']                      # four 'h' in which, witch, and watch
-        4
-
-        '''
-        # The regular dict.update() operation makes no sense here because the
-        # replace behavior results in the some of original untouched counts
-        # being mixed-in with all of the other counts for a mismash that
-        # doesn't have a straight-forward interpretation in most counting
-        # contexts.  Instead, we implement straight-addition.  Both the inputs
-        # and outputs are allowed to contain zero and negative counts.
-
-        if not args:
-            raise TypeError("descriptor 'update' of 'Counter' object "
-                            "needs an argument")
-        self = args[0]
-        args = args[1:]
-        if len(args) > 1:
-            raise TypeError('expected at most 1 arguments, got %d' % len(args))
-        iterable = args[0] if args else None
-        if iterable is not None:
-            if isinstance(iterable, Mapping):
-                if self:
-                    self_get = self.get
-                    for elem, count in iterable.items():
-                        self[elem] = count + self_get(elem, 0)
-                else:
-                    super(Counter, self).update(iterable) # fast path when counter is empty
-            else:
-                _count_elements(self, iterable)
-        if kwds:
-            self.update(kwds)
-
-    def subtract(*args, **kwds):
-        '''Like dict.update() but subtracts counts instead of replacing them.
-        Counts can be reduced below zero.  Both the inputs and outputs are
-        allowed to contain zero and negative counts.
-
-        Source can be an iterable, a dictionary, or another Counter instance.
-
-        >>> c = Counter('which')
-        >>> c.subtract('witch')             # subtract elements from another iterable
-        >>> c.subtract(Counter('watch'))    # subtract elements from another counter
-        >>> c['h']                          # 2 in which, minus 1 in witch, minus 1 in watch
-        0
-        >>> c['w']                          # 1 in which, minus 1 in witch, minus 1 in watch
-        -1
-
-        '''
-        if not args:
-            raise TypeError("descriptor 'subtract' of 'Counter' object "
-                            "needs an argument")
-        self = args[0]
-        args = args[1:]
-        if len(args) > 1:
-            raise TypeError('expected at most 1 arguments, got %d' % len(args))
-        iterable = args[0] if args else None
-        if iterable is not None:
-            self_get = self.get
-            if isinstance(iterable, Mapping):
-                for elem, count in iterable.items():
-                    self[elem] = self_get(elem, 0) - count
-            else:
-                for elem in iterable:
-                    self[elem] = self_get(elem, 0) - 1
-        if kwds:
-            self.subtract(kwds)
-
-    def copy(self):
-        'Return a shallow copy.'
-        return self.__class__(self)
-
-    def __reduce__(self):
-        return self.__class__, (dict(self),)
-
-    def __delitem__(self, elem):
-        'Like dict.__delitem__() but does not raise KeyError for missing values.'
-        if elem in self:
-            super(Counter, self).__delitem__(elem)
-
-    def __repr__(self):
-        if not self:
-            return '%s()' % self.__class__.__name__
-        try:
-            items = ', '.join(map('%r: %r'.__mod__, self.most_common()))
-            return '%s({%s})' % (self.__class__.__name__, items)
-        except TypeError:
-            # handle case where values are not orderable
-            return '{0}({1!r})'.format(self.__class__.__name__, dict(self))
-
-    # Multiset-style mathematical operations discussed in:
-    #       Knuth TAOCP Volume II section 4.6.3 exercise 19
-    #       and at http://en.wikipedia.org/wiki/Multiset
-    #
-    # Outputs guaranteed to only include positive counts.
-    #
-    # To strip negative and zero counts, add-in an empty counter:
-    #       c += Counter()
-
-    def __add__(self, other):
-        '''Add counts from two counters.
-
-        >>> Counter('abbb') + Counter('bcc')
-        Counter({'b': 4, 'c': 2, 'a': 1})
-
-        '''
-        if not isinstance(other, Counter):
-            return NotImplemented
-        result = Counter()
-        for elem, count in self.items():
-            newcount = count + other[elem]
-            if newcount > 0:
-                result[elem] = newcount
-        for elem, count in other.items():
-            if elem not in self and count > 0:
-                result[elem] = count
-        return result
-
-    def __sub__(self, other):
-        ''' Subtract count, but keep only results with positive counts.
-
-        >>> Counter('abbbc') - Counter('bccd')
-        Counter({'b': 2, 'a': 1})
-
-        '''
-        if not isinstance(other, Counter):
-            return NotImplemented
-        result = Counter()
-        for elem, count in self.items():
-            newcount = count - other[elem]
-            if newcount > 0:
-                result[elem] = newcount
-        for elem, count in other.items():
-            if elem not in self and count < 0:
-                result[elem] = 0 - count
-        return result
-
-    def __or__(self, other):
-        '''Union is the maximum of value in either of the input counters.
-
-        >>> Counter('abbb') | Counter('bcc')
-        Counter({'b': 3, 'c': 2, 'a': 1})
-
-        '''
-        if not isinstance(other, Counter):
-            return NotImplemented
-        result = Counter()
-        for elem, count in self.items():
-            other_count = other[elem]
-            newcount = other_count if count < other_count else count
-            if newcount > 0:
-                result[elem] = newcount
-        for elem, count in other.items():
-            if elem not in self and count > 0:
-                result[elem] = count
-        return result
-
-    def __and__(self, other):
-        ''' Intersection is the minimum of corresponding counts.
-
-        >>> Counter('abbb') & Counter('bcc')
-        Counter({'b': 1})
-
-        '''
-        if not isinstance(other, Counter):
-            return NotImplemented
-        result = Counter()
-        for elem, count in self.items():
-            other_count = other[elem]
-            newcount = count if count < other_count else other_count
-            if newcount > 0:
-                result[elem] = newcount
-        return result
-
-    def __pos__(self):
-        'Adds an empty counter, effectively stripping negative and zero counts'
-        return self + Counter()
-
-    def __neg__(self):
-        '''Subtracts from an empty counter.  Strips positive and zero counts,
-        and flips the sign on negative counts.
-
-        '''
-        return Counter() - self
-
-    def _keep_positive(self):
-        '''Internal method to strip elements with a negative or zero count'''
-        nonpositive = [elem for elem, count in self.items() if not count > 0]
-        for elem in nonpositive:
-            del self[elem]
-        return self
-
-    def __iadd__(self, other):
-        '''Inplace add from another counter, keeping only positive counts.
-
-        >>> c = Counter('abbb')
-        >>> c += Counter('bcc')
-        >>> c
-        Counter({'b': 4, 'c': 2, 'a': 1})
-
-        '''
-        for elem, count in other.items():
-            self[elem] += count
-        return self._keep_positive()
-
-    def __isub__(self, other):
-        '''Inplace subtract counter, but keep only results with positive counts.
-
-        >>> c = Counter('abbbc')
-        >>> c -= Counter('bccd')
-        >>> c
-        Counter({'b': 2, 'a': 1})
-
-        '''
-        for elem, count in other.items():
-            self[elem] -= count
-        return self._keep_positive()
-
-    def __ior__(self, other):
-        '''Inplace union is the maximum of value from either counter.
-
-        >>> c = Counter('abbb')
-        >>> c |= Counter('bcc')
-        >>> c
-        Counter({'b': 3, 'c': 2, 'a': 1})
-
-        '''
-        for elem, other_count in other.items():
-            count = self[elem]
-            if other_count > count:
-                self[elem] = other_count
-        return self._keep_positive()
-
-    def __iand__(self, other):
-        '''Inplace intersection is the minimum of corresponding counts.
-
-        >>> c = Counter('abbb')
-        >>> c &= Counter('bcc')
-        >>> c
-        Counter({'b': 1})
-
-        '''
-        for elem, count in self.items():
-            other_count = other[elem]
-            if other_count < count:
-                self[elem] = other_count
-        return self._keep_positive()
-
-
-def check_output(*popenargs, **kwargs):
-    """
-    For Python 2.6 compatibility: see
-    http://stackoverflow.com/questions/4814970/
-    """
-
-    if 'stdout' in kwargs:
-        raise ValueError('stdout argument not allowed, it will be overridden.')
-    process = subprocess.Popen(stdout=subprocess.PIPE, *popenargs, **kwargs)
-    output, unused_err = process.communicate()
-    retcode = process.poll()
-    if retcode:
-        cmd = kwargs.get("args")
-        if cmd is None:
-            cmd = popenargs[0]
-        raise subprocess.CalledProcessError(retcode, cmd)
-    return output
-
-
-def count(start=0, step=1):
-    """
-    ``itertools.count`` in Py 2.6 doesn't accept a step
-    parameter. This is an enhanced version of ``itertools.count``
-    for Py2.6 equivalent to ``itertools.count`` in Python 2.7+.
-    """
-    while True:
-        yield start
-        start += step
-
-
-########################################################################
-###  ChainMap (helper for configparser and string.Template)
-###  From the Py3.4 source code. See also:
-###    https://github.com/kkxue/Py2ChainMap/blob/master/py2chainmap.py
-########################################################################
-
-class ChainMap(MutableMapping):
-    ''' A ChainMap groups multiple dicts (or other mappings) together
-    to create a single, updateable view.
-
-    The underlying mappings are stored in a list.  That list is public and can
-    accessed or updated using the *maps* attribute.  There is no other state.
-
-    Lookups search the underlying mappings successively until a key is found.
-    In contrast, writes, updates, and deletions only operate on the first
-    mapping.
-
-    '''
-
-    def __init__(self, *maps):
-        '''Initialize a ChainMap by setting *maps* to the given mappings.
-        If no mappings are provided, a single empty dictionary is used.
-
-        '''
-        self.maps = list(maps) or [{}]          # always at least one map
-
-    def __missing__(self, key):
-        raise KeyError(key)
-
-    def __getitem__(self, key):
-        for mapping in self.maps:
-            try:
-                return mapping[key]             # can't use 'key in mapping' with defaultdict
-            except KeyError:
-                pass
-        return self.__missing__(key)            # support subclasses that define __missing__
-
-    def get(self, key, default=None):
-        return self[key] if key in self else default
-
-    def __len__(self):
-        return len(set().union(*self.maps))     # reuses stored hash values if possible
-
-    def __iter__(self):
-        return iter(set().union(*self.maps))
-
-    def __contains__(self, key):
-        return any(key in m for m in self.maps)
-
-    def __bool__(self):
-        return any(self.maps)
-
-    # Py2 compatibility:
-    __nonzero__ = __bool__
-
-    @recursive_repr()
-    def __repr__(self):
-        return '{0.__class__.__name__}({1})'.format(
-            self, ', '.join(map(repr, self.maps)))
-
-    @classmethod
-    def fromkeys(cls, iterable, *args):
-        'Create a ChainMap with a single dict created from the iterable.'
-        return cls(dict.fromkeys(iterable, *args))
-
-    def copy(self):
-        'New ChainMap or subclass with a new copy of maps[0] and refs to maps[1:]'
-        return self.__class__(self.maps[0].copy(), *self.maps[1:])
-
-    __copy__ = copy
-
-    def new_child(self, m=None):                # like Django's Context.push()
-        '''
-        New ChainMap with a new map followed by all previous maps. If no
-        map is provided, an empty dict is used.
-        '''
-        if m is None:
-            m = {}
-        return self.__class__(m, *self.maps)
-
-    @property
-    def parents(self):                          # like Django's Context.pop()
-        'New ChainMap from maps[1:].'
-        return self.__class__(*self.maps[1:])
-
-    def __setitem__(self, key, value):
-        self.maps[0][key] = value
-
-    def __delitem__(self, key):
-        try:
-            del self.maps[0][key]
-        except KeyError:
-            raise KeyError('Key not found in the first mapping: {0!r}'.format(key))
-
-    def popitem(self):
-        'Remove and return an item pair from maps[0]. Raise KeyError is maps[0] is empty.'
-        try:
-            return self.maps[0].popitem()
-        except KeyError:
-            raise KeyError('No keys found in the first mapping.')
-
-    def pop(self, key, *args):
-        'Remove *key* from maps[0] and return its value. Raise KeyError if *key* not in maps[0].'
-        try:
-            return self.maps[0].pop(key, *args)
-        except KeyError:
-            raise KeyError('Key not found in the first mapping: {0!r}'.format(key))
-
-    def clear(self):
-        'Clear maps[0], leaving maps[1:] intact.'
-        self.maps[0].clear()
-
-
-# Re-use the same sentinel as in the Python stdlib socket module:
-from socket import _GLOBAL_DEFAULT_TIMEOUT
-# Was: _GLOBAL_DEFAULT_TIMEOUT = object()
-
-
-def create_connection(address, timeout=_GLOBAL_DEFAULT_TIMEOUT,
-                      source_address=None):
-    """Backport of 3-argument create_connection() for Py2.6.
-
-    Connect to *address* and return the socket object.
-
-    Convenience function.  Connect to *address* (a 2-tuple ``(host,
-    port)``) and return the socket object.  Passing the optional
-    *timeout* parameter will set the timeout on the socket instance
-    before attempting to connect.  If no *timeout* is supplied, the
-    global default timeout setting returned by :func:`getdefaulttimeout`
-    is used.  If *source_address* is set it must be a tuple of (host, port)
-    for the socket to bind as a source address before making the connection.
-    An host of '' or port 0 tells the OS to use the default.
-    """
-
-    host, port = address
-    err = None
-    for res in getaddrinfo(host, port, 0, SOCK_STREAM):
-        af, socktype, proto, canonname, sa = res
-        sock = None
-        try:
-            sock = socket(af, socktype, proto)
-            if timeout is not _GLOBAL_DEFAULT_TIMEOUT:
-                sock.settimeout(timeout)
-            if source_address:
-                sock.bind(source_address)
-            sock.connect(sa)
-            return sock
-
-        except error as _:
-            err = _
-            if sock is not None:
-                sock.close()
-
-    if err is not None:
-        raise err
-    else:
-        raise error("getaddrinfo returns an empty list")
-
-# Backport from Py2.7 for Py2.6:
-def cmp_to_key(mycmp):
-    """Convert a cmp= function into a key= function"""
-    class K(object):
-        __slots__ = ['obj']
-        def __init__(self, obj, *args):
-            self.obj = obj
-        def __lt__(self, other):
-            return mycmp(self.obj, other.obj) < 0
-        def __gt__(self, other):
-            return mycmp(self.obj, other.obj) > 0
-        def __eq__(self, other):
-            return mycmp(self.obj, other.obj) == 0
-        def __le__(self, other):
-            return mycmp(self.obj, other.obj) <= 0
-        def __ge__(self, other):
-            return mycmp(self.obj, other.obj) >= 0
-        def __ne__(self, other):
-            return mycmp(self.obj, other.obj) != 0
-        def __hash__(self):
-            raise TypeError('hash not implemented')
-    return K
-
-# Back up our definitions above in case they're useful
-_OrderedDict = OrderedDict
-_Counter = Counter
-_check_output = check_output
-_count = count
-_ceil = ceil
-__count_elements = _count_elements
-_recursive_repr = recursive_repr
-_ChainMap = ChainMap
-_create_connection = create_connection
-_cmp_to_key = cmp_to_key
-
-# Overwrite the definitions above with the usual ones
-# from the standard library:
-if sys.version_info >= (2, 7):
-    from collections import OrderedDict, Counter
-    from itertools import count
-    from functools import cmp_to_key
-    try:
-        from subprocess import check_output
-    except ImportError:
-        # Not available. This happens with Google App Engine: see issue #231
-        pass
-    from socket import create_connection
-
-if sys.version_info >= (3, 0):
-    from math import ceil
-    from collections import _count_elements
-
-if sys.version_info >= (3, 3):
-    from reprlib import recursive_repr
-    from collections import ChainMap
diff --git a/lib/future/backports/socket.py b/lib/future/backports/socket.py
deleted file mode 100644
index 930e1dae..00000000
--- a/lib/future/backports/socket.py
+++ /dev/null
@@ -1,454 +0,0 @@
-# Wrapper module for _socket, providing some additional facilities
-# implemented in Python.
-
-"""\
-This module provides socket operations and some related functions.
-On Unix, it supports IP (Internet Protocol) and Unix domain sockets.
-On other systems, it only supports IP. Functions specific for a
-socket are available as methods of the socket object.
-
-Functions:
-
-socket() -- create a new socket object
-socketpair() -- create a pair of new socket objects [*]
-fromfd() -- create a socket object from an open file descriptor [*]
-fromshare() -- create a socket object from data received from socket.share() [*]
-gethostname() -- return the current hostname
-gethostbyname() -- map a hostname to its IP number
-gethostbyaddr() -- map an IP number or hostname to DNS info
-getservbyname() -- map a service name and a protocol name to a port number
-getprotobyname() -- map a protocol name (e.g. 'tcp') to a number
-ntohs(), ntohl() -- convert 16, 32 bit int from network to host byte order
-htons(), htonl() -- convert 16, 32 bit int from host to network byte order
-inet_aton() -- convert IP addr string (123.45.67.89) to 32-bit packed format
-inet_ntoa() -- convert 32-bit packed format IP to string (123.45.67.89)
-socket.getdefaulttimeout() -- get the default timeout value
-socket.setdefaulttimeout() -- set the default timeout value
-create_connection() -- connects to an address, with an optional timeout and
-                       optional source address.
-
- [*] not available on all platforms!
-
-Special objects:
-
-SocketType -- type object for socket objects
-error -- exception raised for I/O errors
-has_ipv6 -- boolean value indicating if IPv6 is supported
-
-Integer constants:
-
-AF_INET, AF_UNIX -- socket domains (first argument to socket() call)
-SOCK_STREAM, SOCK_DGRAM, SOCK_RAW -- socket types (second argument)
-
-Many other constants may be defined; these may be used in calls to
-the setsockopt() and getsockopt() methods.
-"""
-
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-from future.builtins import super
-
-import _socket
-from _socket import *
-
-import os, sys, io
-
-try:
-    import errno
-except ImportError:
-    errno = None
-EBADF = getattr(errno, 'EBADF', 9)
-EAGAIN = getattr(errno, 'EAGAIN', 11)
-EWOULDBLOCK = getattr(errno, 'EWOULDBLOCK', 11)
-
-__all__ = ["getfqdn", "create_connection"]
-__all__.extend(os._get_exports_list(_socket))
-
-
-_realsocket = socket
-
-# WSA error codes
-if sys.platform.lower().startswith("win"):
-    errorTab = {}
-    errorTab[10004] = "The operation was interrupted."
-    errorTab[10009] = "A bad file handle was passed."
-    errorTab[10013] = "Permission denied."
-    errorTab[10014] = "A fault occurred on the network??" # WSAEFAULT
-    errorTab[10022] = "An invalid operation was attempted."
-    errorTab[10035] = "The socket operation would block"
-    errorTab[10036] = "A blocking operation is already in progress."
-    errorTab[10048] = "The network address is in use."
-    errorTab[10054] = "The connection has been reset."
-    errorTab[10058] = "The network has been shut down."
-    errorTab[10060] = "The operation timed out."
-    errorTab[10061] = "Connection refused."
-    errorTab[10063] = "The name is too long."
-    errorTab[10064] = "The host is down."
-    errorTab[10065] = "The host is unreachable."
-    __all__.append("errorTab")
-
-
-class socket(_socket.socket):
-
-    """A subclass of _socket.socket adding the makefile() method."""
-
-    __slots__ = ["__weakref__", "_io_refs", "_closed"]
-
-    def __init__(self, family=AF_INET, type=SOCK_STREAM, proto=0, fileno=None):
-        if fileno is None:
-            _socket.socket.__init__(self, family, type, proto)
-        else:
-            _socket.socket.__init__(self, family, type, proto, fileno)
-        self._io_refs = 0
-        self._closed = False
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, *args):
-        if not self._closed:
-            self.close()
-
-    def __repr__(self):
-        """Wrap __repr__() to reveal the real class name."""
-        s = _socket.socket.__repr__(self)
-        if s.startswith("<socket object"):
-            s = "<%s.%s%s%s" % (self.__class__.__module__,
-                                self.__class__.__name__,
-                                getattr(self, '_closed', False) and " [closed] " or "",
-                                s[7:])
-        return s
-
-    def __getstate__(self):
-        raise TypeError("Cannot serialize socket object")
-
-    def dup(self):
-        """dup() -> socket object
-
-        Return a new socket object connected to the same system resource.
-        """
-        fd = dup(self.fileno())
-        sock = self.__class__(self.family, self.type, self.proto, fileno=fd)
-        sock.settimeout(self.gettimeout())
-        return sock
-
-    def accept(self):
-        """accept() -> (socket object, address info)
-
-        Wait for an incoming connection.  Return a new socket
-        representing the connection, and the address of the client.
-        For IP sockets, the address info is a pair (hostaddr, port).
-        """
-        fd, addr = self._accept()
-        sock = socket(self.family, self.type, self.proto, fileno=fd)
-        # Issue #7995: if no default timeout is set and the listening
-        # socket had a (non-zero) timeout, force the new socket in blocking
-        # mode to override platform-specific socket flags inheritance.
-        if getdefaulttimeout() is None and self.gettimeout():
-            sock.setblocking(True)
-        return sock, addr
-
-    def makefile(self, mode="r", buffering=None, **_3to2kwargs):
-        """makefile(...) -> an I/O stream connected to the socket
-
-        The arguments are as for io.open() after the filename,
-        except the only mode characters supported are 'r', 'w' and 'b'.
-        The semantics are similar too.  (XXX refactor to share code?)
-        """
-        if 'newline' in _3to2kwargs: newline = _3to2kwargs['newline']; del _3to2kwargs['newline']
-        else: newline = None
-        if 'errors' in _3to2kwargs: errors = _3to2kwargs['errors']; del _3to2kwargs['errors']
-        else: errors = None
-        if 'encoding' in _3to2kwargs: encoding = _3to2kwargs['encoding']; del _3to2kwargs['encoding']
-        else: encoding = None
-        for c in mode:
-            if c not in ("r", "w", "b"):
-                raise ValueError("invalid mode %r (only r, w, b allowed)")
-        writing = "w" in mode
-        reading = "r" in mode or not writing
-        assert reading or writing
-        binary = "b" in mode
-        rawmode = ""
-        if reading:
-            rawmode += "r"
-        if writing:
-            rawmode += "w"
-        raw = SocketIO(self, rawmode)
-        self._io_refs += 1
-        if buffering is None:
-            buffering = -1
-        if buffering < 0:
-            buffering = io.DEFAULT_BUFFER_SIZE
-        if buffering == 0:
-            if not binary:
-                raise ValueError("unbuffered streams must be binary")
-            return raw
-        if reading and writing:
-            buffer = io.BufferedRWPair(raw, raw, buffering)
-        elif reading:
-            buffer = io.BufferedReader(raw, buffering)
-        else:
-            assert writing
-            buffer = io.BufferedWriter(raw, buffering)
-        if binary:
-            return buffer
-        text = io.TextIOWrapper(buffer, encoding, errors, newline)
-        text.mode = mode
-        return text
-
-    def _decref_socketios(self):
-        if self._io_refs > 0:
-            self._io_refs -= 1
-        if self._closed:
-            self.close()
-
-    def _real_close(self, _ss=_socket.socket):
-        # This function should not reference any globals. See issue #808164.
-        _ss.close(self)
-
-    def close(self):
-        # This function should not reference any globals. See issue #808164.
-        self._closed = True
-        if self._io_refs <= 0:
-            self._real_close()
-
-    def detach(self):
-        """detach() -> file descriptor
-
-        Close the socket object without closing the underlying file descriptor.
-        The object cannot be used after this call, but the file descriptor
-        can be reused for other purposes.  The file descriptor is returned.
-        """
-        self._closed = True
-        return super().detach()
-
-def fromfd(fd, family, type, proto=0):
-    """ fromfd(fd, family, type[, proto]) -> socket object
-
-    Create a socket object from a duplicate of the given file
-    descriptor.  The remaining arguments are the same as for socket().
-    """
-    nfd = dup(fd)
-    return socket(family, type, proto, nfd)
-
-if hasattr(_socket.socket, "share"):
-    def fromshare(info):
-        """ fromshare(info) -> socket object
-
-        Create a socket object from a the bytes object returned by
-        socket.share(pid).
-        """
-        return socket(0, 0, 0, info)
-
-if hasattr(_socket, "socketpair"):
-
-    def socketpair(family=None, type=SOCK_STREAM, proto=0):
-        """socketpair([family[, type[, proto]]]) -> (socket object, socket object)
-
-        Create a pair of socket objects from the sockets returned by the platform
-        socketpair() function.
-        The arguments are the same as for socket() except the default family is
-        AF_UNIX if defined on the platform; otherwise, the default is AF_INET.
-        """
-        if family is None:
-            try:
-                family = AF_UNIX
-            except NameError:
-                family = AF_INET
-        a, b = _socket.socketpair(family, type, proto)
-        a = socket(family, type, proto, a.detach())
-        b = socket(family, type, proto, b.detach())
-        return a, b
-
-
-_blocking_errnos = set([EAGAIN, EWOULDBLOCK])
-
-class SocketIO(io.RawIOBase):
-
-    """Raw I/O implementation for stream sockets.
-
-    This class supports the makefile() method on sockets.  It provides
-    the raw I/O interface on top of a socket object.
-    """
-
-    # One might wonder why not let FileIO do the job instead.  There are two
-    # main reasons why FileIO is not adapted:
-    # - it wouldn't work under Windows (where you can't used read() and
-    #   write() on a socket handle)
-    # - it wouldn't work with socket timeouts (FileIO would ignore the
-    #   timeout and consider the socket non-blocking)
-
-    # XXX More docs
-
-    def __init__(self, sock, mode):
-        if mode not in ("r", "w", "rw", "rb", "wb", "rwb"):
-            raise ValueError("invalid mode: %r" % mode)
-        io.RawIOBase.__init__(self)
-        self._sock = sock
-        if "b" not in mode:
-            mode += "b"
-        self._mode = mode
-        self._reading = "r" in mode
-        self._writing = "w" in mode
-        self._timeout_occurred = False
-
-    def readinto(self, b):
-        """Read up to len(b) bytes into the writable buffer *b* and return
-        the number of bytes read.  If the socket is non-blocking and no bytes
-        are available, None is returned.
-
-        If *b* is non-empty, a 0 return value indicates that the connection
-        was shutdown at the other end.
-        """
-        self._checkClosed()
-        self._checkReadable()
-        if self._timeout_occurred:
-            raise IOError("cannot read from timed out object")
-        while True:
-            try:
-                return self._sock.recv_into(b)
-            except timeout:
-                self._timeout_occurred = True
-                raise
-            # except InterruptedError:
-            #     continue
-            except error as e:
-                if e.args[0] in _blocking_errnos:
-                    return None
-                raise
-
-    def write(self, b):
-        """Write the given bytes or bytearray object *b* to the socket
-        and return the number of bytes written.  This can be less than
-        len(b) if not all data could be written.  If the socket is
-        non-blocking and no bytes could be written None is returned.
-        """
-        self._checkClosed()
-        self._checkWritable()
-        try:
-            return self._sock.send(b)
-        except error as e:
-            # XXX what about EINTR?
-            if e.args[0] in _blocking_errnos:
-                return None
-            raise
-
-    def readable(self):
-        """True if the SocketIO is open for reading.
-        """
-        if self.closed:
-            raise ValueError("I/O operation on closed socket.")
-        return self._reading
-
-    def writable(self):
-        """True if the SocketIO is open for writing.
-        """
-        if self.closed:
-            raise ValueError("I/O operation on closed socket.")
-        return self._writing
-
-    def seekable(self):
-        """True if the SocketIO is open for seeking.
-        """
-        if self.closed:
-            raise ValueError("I/O operation on closed socket.")
-        return super().seekable()
-
-    def fileno(self):
-        """Return the file descriptor of the underlying socket.
-        """
-        self._checkClosed()
-        return self._sock.fileno()
-
-    @property
-    def name(self):
-        if not self.closed:
-            return self.fileno()
-        else:
-            return -1
-
-    @property
-    def mode(self):
-        return self._mode
-
-    def close(self):
-        """Close the SocketIO object.  This doesn't close the underlying
-        socket, except if all references to it have disappeared.
-        """
-        if self.closed:
-            return
-        io.RawIOBase.close(self)
-        self._sock._decref_socketios()
-        self._sock = None
-
-
-def getfqdn(name=''):
-    """Get fully qualified domain name from name.
-
-    An empty argument is interpreted as meaning the local host.
-
-    First the hostname returned by gethostbyaddr() is checked, then
-    possibly existing aliases. In case no FQDN is available, hostname
-    from gethostname() is returned.
-    """
-    name = name.strip()
-    if not name or name == '0.0.0.0':
-        name = gethostname()
-    try:
-        hostname, aliases, ipaddrs = gethostbyaddr(name)
-    except error:
-        pass
-    else:
-        aliases.insert(0, hostname)
-        for name in aliases:
-            if '.' in name:
-                break
-        else:
-            name = hostname
-    return name
-
-
-# Re-use the same sentinel as in the Python stdlib socket module:
-from socket import _GLOBAL_DEFAULT_TIMEOUT
-# Was: _GLOBAL_DEFAULT_TIMEOUT = object()
-
-
-def create_connection(address, timeout=_GLOBAL_DEFAULT_TIMEOUT,
-                      source_address=None):
-    """Connect to *address* and return the socket object.
-
-    Convenience function.  Connect to *address* (a 2-tuple ``(host,
-    port)``) and return the socket object.  Passing the optional
-    *timeout* parameter will set the timeout on the socket instance
-    before attempting to connect.  If no *timeout* is supplied, the
-    global default timeout setting returned by :func:`getdefaulttimeout`
-    is used.  If *source_address* is set it must be a tuple of (host, port)
-    for the socket to bind as a source address before making the connection.
-    An host of '' or port 0 tells the OS to use the default.
-    """
-
-    host, port = address
-    err = None
-    for res in getaddrinfo(host, port, 0, SOCK_STREAM):
-        af, socktype, proto, canonname, sa = res
-        sock = None
-        try:
-            sock = socket(af, socktype, proto)
-            if timeout is not _GLOBAL_DEFAULT_TIMEOUT:
-                sock.settimeout(timeout)
-            if source_address:
-                sock.bind(source_address)
-            sock.connect(sa)
-            return sock
-
-        except error as _:
-            err = _
-            if sock is not None:
-                sock.close()
-
-    if err is not None:
-        raise err
-    else:
-        raise error("getaddrinfo returns an empty list")
diff --git a/lib/future/backports/socketserver.py b/lib/future/backports/socketserver.py
deleted file mode 100644
index d1e24a6d..00000000
--- a/lib/future/backports/socketserver.py
+++ /dev/null
@@ -1,747 +0,0 @@
-"""Generic socket server classes.
-
-This module tries to capture the various aspects of defining a server:
-
-For socket-based servers:
-
-- address family:
-        - AF_INET{,6}: IP (Internet Protocol) sockets (default)
-        - AF_UNIX: Unix domain sockets
-        - others, e.g. AF_DECNET are conceivable (see <socket.h>
-- socket type:
-        - SOCK_STREAM (reliable stream, e.g. TCP)
-        - SOCK_DGRAM (datagrams, e.g. UDP)
-
-For request-based servers (including socket-based):
-
-- client address verification before further looking at the request
-        (This is actually a hook for any processing that needs to look
-         at the request before anything else, e.g. logging)
-- how to handle multiple requests:
-        - synchronous (one request is handled at a time)
-        - forking (each request is handled by a new process)
-        - threading (each request is handled by a new thread)
-
-The classes in this module favor the server type that is simplest to
-write: a synchronous TCP/IP server.  This is bad class design, but
-save some typing.  (There's also the issue that a deep class hierarchy
-slows down method lookups.)
-
-There are five classes in an inheritance diagram, four of which represent
-synchronous servers of four types:
-
-        +------------+
-        | BaseServer |
-        +------------+
-              |
-              v
-        +-----------+        +------------------+
-        | TCPServer |------->| UnixStreamServer |
-        +-----------+        +------------------+
-              |
-              v
-        +-----------+        +--------------------+
-        | UDPServer |------->| UnixDatagramServer |
-        +-----------+        +--------------------+
-
-Note that UnixDatagramServer derives from UDPServer, not from
-UnixStreamServer -- the only difference between an IP and a Unix
-stream server is the address family, which is simply repeated in both
-unix server classes.
-
-Forking and threading versions of each type of server can be created
-using the ForkingMixIn and ThreadingMixIn mix-in classes.  For
-instance, a threading UDP server class is created as follows:
-
-        class ThreadingUDPServer(ThreadingMixIn, UDPServer): pass
-
-The Mix-in class must come first, since it overrides a method defined
-in UDPServer! Setting the various member variables also changes
-the behavior of the underlying server mechanism.
-
-To implement a service, you must derive a class from
-BaseRequestHandler and redefine its handle() method.  You can then run
-various versions of the service by combining one of the server classes
-with your request handler class.
-
-The request handler class must be different for datagram or stream
-services.  This can be hidden by using the request handler
-subclasses StreamRequestHandler or DatagramRequestHandler.
-
-Of course, you still have to use your head!
-
-For instance, it makes no sense to use a forking server if the service
-contains state in memory that can be modified by requests (since the
-modifications in the child process would never reach the initial state
-kept in the parent process and passed to each child).  In this case,
-you can use a threading server, but you will probably have to use
-locks to avoid two requests that come in nearly simultaneous to apply
-conflicting changes to the server state.
-
-On the other hand, if you are building e.g. an HTTP server, where all
-data is stored externally (e.g. in the file system), a synchronous
-class will essentially render the service "deaf" while one request is
-being handled -- which may be for a very long time if a client is slow
-to read all the data it has requested.  Here a threading or forking
-server is appropriate.
-
-In some cases, it may be appropriate to process part of a request
-synchronously, but to finish processing in a forked child depending on
-the request data.  This can be implemented by using a synchronous
-server and doing an explicit fork in the request handler class
-handle() method.
-
-Another approach to handling multiple simultaneous requests in an
-environment that supports neither threads nor fork (or where these are
-too expensive or inappropriate for the service) is to maintain an
-explicit table of partially finished requests and to use select() to
-decide which request to work on next (or whether to handle a new
-incoming request).  This is particularly important for stream services
-where each client can potentially be connected for a long time (if
-threads or subprocesses cannot be used).
-
-Future work:
-- Standard classes for Sun RPC (which uses either UDP or TCP)
-- Standard mix-in classes to implement various authentication
-  and encryption schemes
-- Standard framework for select-based multiplexing
-
-XXX Open problems:
-- What to do with out-of-band data?
-
-BaseServer:
-- split generic "request" functionality out into BaseServer class.
-  Copyright (C) 2000  Luke Kenneth Casson Leighton <lkcl@samba.org>
-
-  example: read entries from a SQL database (requires overriding
-  get_request() to return a table entry from the database).
-  entry is processed by a RequestHandlerClass.
-
-"""
-
-# Author of the BaseServer patch: Luke Kenneth Casson Leighton
-
-# XXX Warning!
-# There is a test suite for this module, but it cannot be run by the
-# standard regression test.
-# To run it manually, run Lib/test/test_socketserver.py.
-
-from __future__ import (absolute_import, print_function)
-
-__version__ = "0.4"
-
-
-import socket
-import select
-import sys
-import os
-import errno
-try:
-    import threading
-except ImportError:
-    import dummy_threading as threading
-
-__all__ = ["TCPServer","UDPServer","ForkingUDPServer","ForkingTCPServer",
-           "ThreadingUDPServer","ThreadingTCPServer","BaseRequestHandler",
-           "StreamRequestHandler","DatagramRequestHandler",
-           "ThreadingMixIn", "ForkingMixIn"]
-if hasattr(socket, "AF_UNIX"):
-    __all__.extend(["UnixStreamServer","UnixDatagramServer",
-                    "ThreadingUnixStreamServer",
-                    "ThreadingUnixDatagramServer"])
-
-def _eintr_retry(func, *args):
-    """restart a system call interrupted by EINTR"""
-    while True:
-        try:
-            return func(*args)
-        except OSError as e:
-            if e.errno != errno.EINTR:
-                raise
-
-class BaseServer(object):
-
-    """Base class for server classes.
-
-    Methods for the caller:
-
-    - __init__(server_address, RequestHandlerClass)
-    - serve_forever(poll_interval=0.5)
-    - shutdown()
-    - handle_request()  # if you do not use serve_forever()
-    - fileno() -> int   # for select()
-
-    Methods that may be overridden:
-
-    - server_bind()
-    - server_activate()
-    - get_request() -> request, client_address
-    - handle_timeout()
-    - verify_request(request, client_address)
-    - server_close()
-    - process_request(request, client_address)
-    - shutdown_request(request)
-    - close_request(request)
-    - service_actions()
-    - handle_error()
-
-    Methods for derived classes:
-
-    - finish_request(request, client_address)
-
-    Class variables that may be overridden by derived classes or
-    instances:
-
-    - timeout
-    - address_family
-    - socket_type
-    - allow_reuse_address
-
-    Instance variables:
-
-    - RequestHandlerClass
-    - socket
-
-    """
-
-    timeout = None
-
-    def __init__(self, server_address, RequestHandlerClass):
-        """Constructor.  May be extended, do not override."""
-        self.server_address = server_address
-        self.RequestHandlerClass = RequestHandlerClass
-        self.__is_shut_down = threading.Event()
-        self.__shutdown_request = False
-
-    def server_activate(self):
-        """Called by constructor to activate the server.
-
-        May be overridden.
-
-        """
-        pass
-
-    def serve_forever(self, poll_interval=0.5):
-        """Handle one request at a time until shutdown.
-
-        Polls for shutdown every poll_interval seconds. Ignores
-        self.timeout. If you need to do periodic tasks, do them in
-        another thread.
-        """
-        self.__is_shut_down.clear()
-        try:
-            while not self.__shutdown_request:
-                # XXX: Consider using another file descriptor or
-                # connecting to the socket to wake this up instead of
-                # polling. Polling reduces our responsiveness to a
-                # shutdown request and wastes cpu at all other times.
-                r, w, e = _eintr_retry(select.select, [self], [], [],
-                                       poll_interval)
-                if self in r:
-                    self._handle_request_noblock()
-
-                self.service_actions()
-        finally:
-            self.__shutdown_request = False
-            self.__is_shut_down.set()
-
-    def shutdown(self):
-        """Stops the serve_forever loop.
-
-        Blocks until the loop has finished. This must be called while
-        serve_forever() is running in another thread, or it will
-        deadlock.
-        """
-        self.__shutdown_request = True
-        self.__is_shut_down.wait()
-
-    def service_actions(self):
-        """Called by the serve_forever() loop.
-
-        May be overridden by a subclass / Mixin to implement any code that
-        needs to be run during the loop.
-        """
-        pass
-
-    # The distinction between handling, getting, processing and
-    # finishing a request is fairly arbitrary.  Remember:
-    #
-    # - handle_request() is the top-level call.  It calls
-    #   select, get_request(), verify_request() and process_request()
-    # - get_request() is different for stream or datagram sockets
-    # - process_request() is the place that may fork a new process
-    #   or create a new thread to finish the request
-    # - finish_request() instantiates the request handler class;
-    #   this constructor will handle the request all by itself
-
-    def handle_request(self):
-        """Handle one request, possibly blocking.
-
-        Respects self.timeout.
-        """
-        # Support people who used socket.settimeout() to escape
-        # handle_request before self.timeout was available.
-        timeout = self.socket.gettimeout()
-        if timeout is None:
-            timeout = self.timeout
-        elif self.timeout is not None:
-            timeout = min(timeout, self.timeout)
-        fd_sets = _eintr_retry(select.select, [self], [], [], timeout)
-        if not fd_sets[0]:
-            self.handle_timeout()
-            return
-        self._handle_request_noblock()
-
-    def _handle_request_noblock(self):
-        """Handle one request, without blocking.
-
-        I assume that select.select has returned that the socket is
-        readable before this function was called, so there should be
-        no risk of blocking in get_request().
-        """
-        try:
-            request, client_address = self.get_request()
-        except socket.error:
-            return
-        if self.verify_request(request, client_address):
-            try:
-                self.process_request(request, client_address)
-            except:
-                self.handle_error(request, client_address)
-                self.shutdown_request(request)
-
-    def handle_timeout(self):
-        """Called if no new request arrives within self.timeout.
-
-        Overridden by ForkingMixIn.
-        """
-        pass
-
-    def verify_request(self, request, client_address):
-        """Verify the request.  May be overridden.
-
-        Return True if we should proceed with this request.
-
-        """
-        return True
-
-    def process_request(self, request, client_address):
-        """Call finish_request.
-
-        Overridden by ForkingMixIn and ThreadingMixIn.
-
-        """
-        self.finish_request(request, client_address)
-        self.shutdown_request(request)
-
-    def server_close(self):
-        """Called to clean-up the server.
-
-        May be overridden.
-
-        """
-        pass
-
-    def finish_request(self, request, client_address):
-        """Finish one request by instantiating RequestHandlerClass."""
-        self.RequestHandlerClass(request, client_address, self)
-
-    def shutdown_request(self, request):
-        """Called to shutdown and close an individual request."""
-        self.close_request(request)
-
-    def close_request(self, request):
-        """Called to clean up an individual request."""
-        pass
-
-    def handle_error(self, request, client_address):
-        """Handle an error gracefully.  May be overridden.
-
-        The default is to print a traceback and continue.
-
-        """
-        print('-'*40)
-        print('Exception happened during processing of request from', end=' ')
-        print(client_address)
-        import traceback
-        traceback.print_exc() # XXX But this goes to stderr!
-        print('-'*40)
-
-
-class TCPServer(BaseServer):
-
-    """Base class for various socket-based server classes.
-
-    Defaults to synchronous IP stream (i.e., TCP).
-
-    Methods for the caller:
-
-    - __init__(server_address, RequestHandlerClass, bind_and_activate=True)
-    - serve_forever(poll_interval=0.5)
-    - shutdown()
-    - handle_request()  # if you don't use serve_forever()
-    - fileno() -> int   # for select()
-
-    Methods that may be overridden:
-
-    - server_bind()
-    - server_activate()
-    - get_request() -> request, client_address
-    - handle_timeout()
-    - verify_request(request, client_address)
-    - process_request(request, client_address)
-    - shutdown_request(request)
-    - close_request(request)
-    - handle_error()
-
-    Methods for derived classes:
-
-    - finish_request(request, client_address)
-
-    Class variables that may be overridden by derived classes or
-    instances:
-
-    - timeout
-    - address_family
-    - socket_type
-    - request_queue_size (only for stream sockets)
-    - allow_reuse_address
-
-    Instance variables:
-
-    - server_address
-    - RequestHandlerClass
-    - socket
-
-    """
-
-    address_family = socket.AF_INET
-
-    socket_type = socket.SOCK_STREAM
-
-    request_queue_size = 5
-
-    allow_reuse_address = False
-
-    def __init__(self, server_address, RequestHandlerClass, bind_and_activate=True):
-        """Constructor.  May be extended, do not override."""
-        BaseServer.__init__(self, server_address, RequestHandlerClass)
-        self.socket = socket.socket(self.address_family,
-                                    self.socket_type)
-        if bind_and_activate:
-            self.server_bind()
-            self.server_activate()
-
-    def server_bind(self):
-        """Called by constructor to bind the socket.
-
-        May be overridden.
-
-        """
-        if self.allow_reuse_address:
-            self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        self.socket.bind(self.server_address)
-        self.server_address = self.socket.getsockname()
-
-    def server_activate(self):
-        """Called by constructor to activate the server.
-
-        May be overridden.
-
-        """
-        self.socket.listen(self.request_queue_size)
-
-    def server_close(self):
-        """Called to clean-up the server.
-
-        May be overridden.
-
-        """
-        self.socket.close()
-
-    def fileno(self):
-        """Return socket file number.
-
-        Interface required by select().
-
-        """
-        return self.socket.fileno()
-
-    def get_request(self):
-        """Get the request and client address from the socket.
-
-        May be overridden.
-
-        """
-        return self.socket.accept()
-
-    def shutdown_request(self, request):
-        """Called to shutdown and close an individual request."""
-        try:
-            #explicitly shutdown.  socket.close() merely releases
-            #the socket and waits for GC to perform the actual close.
-            request.shutdown(socket.SHUT_WR)
-        except socket.error:
-            pass #some platforms may raise ENOTCONN here
-        self.close_request(request)
-
-    def close_request(self, request):
-        """Called to clean up an individual request."""
-        request.close()
-
-
-class UDPServer(TCPServer):
-
-    """UDP server class."""
-
-    allow_reuse_address = False
-
-    socket_type = socket.SOCK_DGRAM
-
-    max_packet_size = 8192
-
-    def get_request(self):
-        data, client_addr = self.socket.recvfrom(self.max_packet_size)
-        return (data, self.socket), client_addr
-
-    def server_activate(self):
-        # No need to call listen() for UDP.
-        pass
-
-    def shutdown_request(self, request):
-        # No need to shutdown anything.
-        self.close_request(request)
-
-    def close_request(self, request):
-        # No need to close anything.
-        pass
-
-class ForkingMixIn(object):
-
-    """Mix-in class to handle each request in a new process."""
-
-    timeout = 300
-    active_children = None
-    max_children = 40
-
-    def collect_children(self):
-        """Internal routine to wait for children that have exited."""
-        if self.active_children is None: return
-        while len(self.active_children) >= self.max_children:
-            # XXX: This will wait for any child process, not just ones
-            # spawned by this library. This could confuse other
-            # libraries that expect to be able to wait for their own
-            # children.
-            try:
-                pid, status = os.waitpid(0, 0)
-            except os.error:
-                pid = None
-            if pid not in self.active_children: continue
-            self.active_children.remove(pid)
-
-        # XXX: This loop runs more system calls than it ought
-        # to. There should be a way to put the active_children into a
-        # process group and then use os.waitpid(-pgid) to wait for any
-        # of that set, but I couldn't find a way to allocate pgids
-        # that couldn't collide.
-        for child in self.active_children:
-            try:
-                pid, status = os.waitpid(child, os.WNOHANG)
-            except os.error:
-                pid = None
-            if not pid: continue
-            try:
-                self.active_children.remove(pid)
-            except ValueError as e:
-                raise ValueError('%s. x=%d and list=%r' % (e.message, pid,
-                                                           self.active_children))
-
-    def handle_timeout(self):
-        """Wait for zombies after self.timeout seconds of inactivity.
-
-        May be extended, do not override.
-        """
-        self.collect_children()
-
-    def service_actions(self):
-        """Collect the zombie child processes regularly in the ForkingMixIn.
-
-        service_actions is called in the BaseServer's serve_forver loop.
-        """
-        self.collect_children()
-
-    def process_request(self, request, client_address):
-        """Fork a new subprocess to process the request."""
-        pid = os.fork()
-        if pid:
-            # Parent process
-            if self.active_children is None:
-                self.active_children = []
-            self.active_children.append(pid)
-            self.close_request(request)
-            return
-        else:
-            # Child process.
-            # This must never return, hence os._exit()!
-            try:
-                self.finish_request(request, client_address)
-                self.shutdown_request(request)
-                os._exit(0)
-            except:
-                try:
-                    self.handle_error(request, client_address)
-                    self.shutdown_request(request)
-                finally:
-                    os._exit(1)
-
-
-class ThreadingMixIn(object):
-    """Mix-in class to handle each request in a new thread."""
-
-    # Decides how threads will act upon termination of the
-    # main process
-    daemon_threads = False
-
-    def process_request_thread(self, request, client_address):
-        """Same as in BaseServer but as a thread.
-
-        In addition, exception handling is done here.
-
-        """
-        try:
-            self.finish_request(request, client_address)
-            self.shutdown_request(request)
-        except:
-            self.handle_error(request, client_address)
-            self.shutdown_request(request)
-
-    def process_request(self, request, client_address):
-        """Start a new thread to process the request."""
-        t = threading.Thread(target = self.process_request_thread,
-                             args = (request, client_address))
-        t.daemon = self.daemon_threads
-        t.start()
-
-
-class ForkingUDPServer(ForkingMixIn, UDPServer): pass
-class ForkingTCPServer(ForkingMixIn, TCPServer): pass
-
-class ThreadingUDPServer(ThreadingMixIn, UDPServer): pass
-class ThreadingTCPServer(ThreadingMixIn, TCPServer): pass
-
-if hasattr(socket, 'AF_UNIX'):
-
-    class UnixStreamServer(TCPServer):
-        address_family = socket.AF_UNIX
-
-    class UnixDatagramServer(UDPServer):
-        address_family = socket.AF_UNIX
-
-    class ThreadingUnixStreamServer(ThreadingMixIn, UnixStreamServer): pass
-
-    class ThreadingUnixDatagramServer(ThreadingMixIn, UnixDatagramServer): pass
-
-class BaseRequestHandler(object):
-
-    """Base class for request handler classes.
-
-    This class is instantiated for each request to be handled.  The
-    constructor sets the instance variables request, client_address
-    and server, and then calls the handle() method.  To implement a
-    specific service, all you need to do is to derive a class which
-    defines a handle() method.
-
-    The handle() method can find the request as self.request, the
-    client address as self.client_address, and the server (in case it
-    needs access to per-server information) as self.server.  Since a
-    separate instance is created for each request, the handle() method
-    can define arbitrary other instance variariables.
-
-    """
-
-    def __init__(self, request, client_address, server):
-        self.request = request
-        self.client_address = client_address
-        self.server = server
-        self.setup()
-        try:
-            self.handle()
-        finally:
-            self.finish()
-
-    def setup(self):
-        pass
-
-    def handle(self):
-        pass
-
-    def finish(self):
-        pass
-
-
-# The following two classes make it possible to use the same service
-# class for stream or datagram servers.
-# Each class sets up these instance variables:
-# - rfile: a file object from which receives the request is read
-# - wfile: a file object to which the reply is written
-# When the handle() method returns, wfile is flushed properly
-
-
-class StreamRequestHandler(BaseRequestHandler):
-
-    """Define self.rfile and self.wfile for stream sockets."""
-
-    # Default buffer sizes for rfile, wfile.
-    # We default rfile to buffered because otherwise it could be
-    # really slow for large data (a getc() call per byte); we make
-    # wfile unbuffered because (a) often after a write() we want to
-    # read and we need to flush the line; (b) big writes to unbuffered
-    # files are typically optimized by stdio even when big reads
-    # aren't.
-    rbufsize = -1
-    wbufsize = 0
-
-    # A timeout to apply to the request socket, if not None.
-    timeout = None
-
-    # Disable nagle algorithm for this socket, if True.
-    # Use only when wbufsize != 0, to avoid small packets.
-    disable_nagle_algorithm = False
-
-    def setup(self):
-        self.connection = self.request
-        if self.timeout is not None:
-            self.connection.settimeout(self.timeout)
-        if self.disable_nagle_algorithm:
-            self.connection.setsockopt(socket.IPPROTO_TCP,
-                                       socket.TCP_NODELAY, True)
-        self.rfile = self.connection.makefile('rb', self.rbufsize)
-        self.wfile = self.connection.makefile('wb', self.wbufsize)
-
-    def finish(self):
-        if not self.wfile.closed:
-            try:
-                self.wfile.flush()
-            except socket.error:
-                # An final socket error may have occurred here, such as
-                # the local error ECONNABORTED.
-                pass
-        self.wfile.close()
-        self.rfile.close()
-
-
-class DatagramRequestHandler(BaseRequestHandler):
-
-    # XXX Regrettably, I cannot get this working on Linux;
-    # s.recvfrom() doesn't return a meaningful client address.
-
-    """Define self.rfile and self.wfile for datagram sockets."""
-
-    def setup(self):
-        from io import BytesIO
-        self.packet, self.socket = self.request
-        self.rfile = BytesIO(self.packet)
-        self.wfile = BytesIO()
-
-    def finish(self):
-        self.socket.sendto(self.wfile.getvalue(), self.client_address)
diff --git a/lib/future/backports/test/__init__.py b/lib/future/backports/test/__init__.py
deleted file mode 100644
index 0bba5e69..00000000
--- a/lib/future/backports/test/__init__.py
+++ /dev/null
@@ -1,9 +0,0 @@
-"""
-test package backported for python-future.
-
-Its primary purpose is to allow use of "import test.support" for running
-the Python standard library unit tests using the new Python 3 stdlib
-import location.
-
-Python 3 renamed test.test_support to test.support.
-"""
diff --git a/lib/future/backports/test/badcert.pem b/lib/future/backports/test/badcert.pem
deleted file mode 100644
index c4191460..00000000
--- a/lib/future/backports/test/badcert.pem
+++ /dev/null
@@ -1,36 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXwIBAAKBgQC8ddrhm+LutBvjYcQlnH21PPIseJ1JVG2HMmN2CmZk2YukO+9L
-opdJhTvbGfEj0DQs1IE8M+kTUyOmuKfVrFMKwtVeCJphrAnhoz7TYOuLBSqt7lVH
-fhi/VwovESJlaBOp+WMnfhcduPEYHYx/6cnVapIkZnLt30zu2um+DzA9jQIDAQAB
-AoGBAK0FZpaKj6WnJZN0RqhhK+ggtBWwBnc0U/ozgKz2j1s3fsShYeiGtW6CK5nU
-D1dZ5wzhbGThI7LiOXDvRucc9n7vUgi0alqPQ/PFodPxAN/eEYkmXQ7W2k7zwsDA
-IUK0KUhktQbLu8qF/m8qM86ba9y9/9YkXuQbZ3COl5ahTZrhAkEA301P08RKv3KM
-oXnGU2UHTuJ1MAD2hOrPxjD4/wxA/39EWG9bZczbJyggB4RHu0I3NOSFjAm3HQm0
-ANOu5QK9owJBANgOeLfNNcF4pp+UikRFqxk5hULqRAWzVxVrWe85FlPm0VVmHbb/
-loif7mqjU8o1jTd/LM7RD9f2usZyE2psaw8CQQCNLhkpX3KO5kKJmS9N7JMZSc4j
-oog58yeYO8BBqKKzpug0LXuQultYv2K4veaIO04iL9VLe5z9S/Q1jaCHBBuXAkEA
-z8gjGoi1AOp6PBBLZNsncCvcV/0aC+1se4HxTNo2+duKSDnbq+ljqOM+E7odU+Nq
-ewvIWOG//e8fssd0mq3HywJBAJ8l/c8GVmrpFTx8r/nZ2Pyyjt3dH1widooDXYSV
-q6Gbf41Llo5sYAtmxdndTLASuHKecacTgZVhy0FryZpLKrU=
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-Just bad cert data
------END CERTIFICATE-----
------BEGIN RSA PRIVATE KEY-----
-MIICXwIBAAKBgQC8ddrhm+LutBvjYcQlnH21PPIseJ1JVG2HMmN2CmZk2YukO+9L
-opdJhTvbGfEj0DQs1IE8M+kTUyOmuKfVrFMKwtVeCJphrAnhoz7TYOuLBSqt7lVH
-fhi/VwovESJlaBOp+WMnfhcduPEYHYx/6cnVapIkZnLt30zu2um+DzA9jQIDAQAB
-AoGBAK0FZpaKj6WnJZN0RqhhK+ggtBWwBnc0U/ozgKz2j1s3fsShYeiGtW6CK5nU
-D1dZ5wzhbGThI7LiOXDvRucc9n7vUgi0alqPQ/PFodPxAN/eEYkmXQ7W2k7zwsDA
-IUK0KUhktQbLu8qF/m8qM86ba9y9/9YkXuQbZ3COl5ahTZrhAkEA301P08RKv3KM
-oXnGU2UHTuJ1MAD2hOrPxjD4/wxA/39EWG9bZczbJyggB4RHu0I3NOSFjAm3HQm0
-ANOu5QK9owJBANgOeLfNNcF4pp+UikRFqxk5hULqRAWzVxVrWe85FlPm0VVmHbb/
-loif7mqjU8o1jTd/LM7RD9f2usZyE2psaw8CQQCNLhkpX3KO5kKJmS9N7JMZSc4j
-oog58yeYO8BBqKKzpug0LXuQultYv2K4veaIO04iL9VLe5z9S/Q1jaCHBBuXAkEA
-z8gjGoi1AOp6PBBLZNsncCvcV/0aC+1se4HxTNo2+duKSDnbq+ljqOM+E7odU+Nq
-ewvIWOG//e8fssd0mq3HywJBAJ8l/c8GVmrpFTx8r/nZ2Pyyjt3dH1widooDXYSV
-q6Gbf41Llo5sYAtmxdndTLASuHKecacTgZVhy0FryZpLKrU=
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-Just bad cert data
------END CERTIFICATE-----
diff --git a/lib/future/backports/test/badkey.pem b/lib/future/backports/test/badkey.pem
deleted file mode 100644
index 1c8a9557..00000000
--- a/lib/future/backports/test/badkey.pem
+++ /dev/null
@@ -1,40 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Bad Key, though the cert should be OK
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIICpzCCAhCgAwIBAgIJAP+qStv1cIGNMA0GCSqGSIb3DQEBBQUAMIGJMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMIRGVsYXdhcmUxEzARBgNVBAcTCldpbG1pbmd0b24x
-IzAhBgNVBAoTGlB5dGhvbiBTb2Z0d2FyZSBGb3VuZGF0aW9uMQwwCgYDVQQLEwNT
-U0wxHzAdBgNVBAMTFnNvbWVtYWNoaW5lLnB5dGhvbi5vcmcwHhcNMDcwODI3MTY1
-NDUwWhcNMTMwMjE2MTY1NDUwWjCBiTELMAkGA1UEBhMCVVMxETAPBgNVBAgTCERl
-bGF3YXJlMRMwEQYDVQQHEwpXaWxtaW5ndG9uMSMwIQYDVQQKExpQeXRob24gU29m
-dHdhcmUgRm91bmRhdGlvbjEMMAoGA1UECxMDU1NMMR8wHQYDVQQDExZzb21lbWFj
-aGluZS5weXRob24ub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8ddrh
-m+LutBvjYcQlnH21PPIseJ1JVG2HMmN2CmZk2YukO+9LopdJhTvbGfEj0DQs1IE8
-M+kTUyOmuKfVrFMKwtVeCJphrAnhoz7TYOuLBSqt7lVHfhi/VwovESJlaBOp+WMn
-fhcduPEYHYx/6cnVapIkZnLt30zu2um+DzA9jQIDAQABoxUwEzARBglghkgBhvhC
-AQEEBAMCBkAwDQYJKoZIhvcNAQEFBQADgYEAF4Q5BVqmCOLv1n8je/Jw9K669VXb
-08hyGzQhkemEBYQd6fzQ9A/1ZzHkJKb1P6yreOLSEh4KcxYPyrLRC1ll8nr5OlCx
-CMhKkTnR6qBsdNV0XtdU2+N25hqW+Ma4ZeqsN/iiJVCGNOZGnvQuvCAGWF8+J/f/
-iHkC6gGdBJhogs4=
------END CERTIFICATE-----
------BEGIN RSA PRIVATE KEY-----
-Bad Key, though the cert should be OK
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIICpzCCAhCgAwIBAgIJAP+qStv1cIGNMA0GCSqGSIb3DQEBBQUAMIGJMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMIRGVsYXdhcmUxEzARBgNVBAcTCldpbG1pbmd0b24x
-IzAhBgNVBAoTGlB5dGhvbiBTb2Z0d2FyZSBGb3VuZGF0aW9uMQwwCgYDVQQLEwNT
-U0wxHzAdBgNVBAMTFnNvbWVtYWNoaW5lLnB5dGhvbi5vcmcwHhcNMDcwODI3MTY1
-NDUwWhcNMTMwMjE2MTY1NDUwWjCBiTELMAkGA1UEBhMCVVMxETAPBgNVBAgTCERl
-bGF3YXJlMRMwEQYDVQQHEwpXaWxtaW5ndG9uMSMwIQYDVQQKExpQeXRob24gU29m
-dHdhcmUgRm91bmRhdGlvbjEMMAoGA1UECxMDU1NMMR8wHQYDVQQDExZzb21lbWFj
-aGluZS5weXRob24ub3JnMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8ddrh
-m+LutBvjYcQlnH21PPIseJ1JVG2HMmN2CmZk2YukO+9LopdJhTvbGfEj0DQs1IE8
-M+kTUyOmuKfVrFMKwtVeCJphrAnhoz7TYOuLBSqt7lVHfhi/VwovESJlaBOp+WMn
-fhcduPEYHYx/6cnVapIkZnLt30zu2um+DzA9jQIDAQABoxUwEzARBglghkgBhvhC
-AQEEBAMCBkAwDQYJKoZIhvcNAQEFBQADgYEAF4Q5BVqmCOLv1n8je/Jw9K669VXb
-08hyGzQhkemEBYQd6fzQ9A/1ZzHkJKb1P6yreOLSEh4KcxYPyrLRC1ll8nr5OlCx
-CMhKkTnR6qBsdNV0XtdU2+N25hqW+Ma4ZeqsN/iiJVCGNOZGnvQuvCAGWF8+J/f/
-iHkC6gGdBJhogs4=
------END CERTIFICATE-----
diff --git a/lib/future/backports/test/dh512.pem b/lib/future/backports/test/dh512.pem
deleted file mode 100644
index 200d16cd..00000000
--- a/lib/future/backports/test/dh512.pem
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN DH PARAMETERS-----
-MEYCQQD1Kv884bEpQBgRjXyEpwpy1obEAxnIByl6ypUM2Zafq9AKUJsCRtMIPWak
-XUGfnHy9iUsiGSa6q6Jew1XpKgVfAgEC
------END DH PARAMETERS-----
-
-These are the 512 bit DH parameters from "Assigned Number for SKIP Protocols"
-(http://www.skip-vpn.org/spec/numbers.html).
-See there for how they were generated.
-Note that g is not a generator, but this is not a problem since p is a safe prime.
diff --git a/lib/future/backports/test/https_svn_python_org_root.pem b/lib/future/backports/test/https_svn_python_org_root.pem
deleted file mode 100644
index e7dfc829..00000000
--- a/lib/future/backports/test/https_svn_python_org_root.pem
+++ /dev/null
@@ -1,41 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290
-IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB
-IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA
-Y2FjZXJ0Lm9yZzAeFw0wMzAzMzAxMjI5NDlaFw0zMzAzMjkxMjI5NDlaMHkxEDAO
-BgNVBAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEi
-MCAGA1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJ
-ARYSc3VwcG9ydEBjYWNlcnQub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
-CgKCAgEAziLA4kZ97DYoB1CW8qAzQIxL8TtmPzHlawI229Z89vGIj053NgVBlfkJ
-8BLPRoZzYLdufujAWGSuzbCtRRcMY/pnCujW0r8+55jE8Ez64AO7NV1sId6eINm6
-zWYyN3L69wj1x81YyY7nDl7qPv4coRQKFWyGhFtkZip6qUtTefWIonvuLwphK42y
-fk1WpRPs6tqSnqxEQR5YYGUFZvjARL3LlPdCfgv3ZWiYUQXw8wWRBB0bF4LsyFe7
-w2t6iPGwcswlWyCR7BYCEo8y6RcYSNDHBS4CMEK4JZwFaz+qOqfrU0j36NK2B5jc
-G8Y0f3/JHIJ6BVgrCFvzOKKrF11myZjXnhCLotLddJr3cQxyYN/Nb5gznZY0dj4k
-epKwDpUeb+agRThHqtdB7Uq3EvbXG4OKDy7YCbZZ16oE/9KTfWgu3YtLq1i6L43q
-laegw1SJpfvbi1EinbLDvhG+LJGGi5Z4rSDTii8aP8bQUWWHIbEZAWV/RRyH9XzQ
-QUxPKZgh/TMfdQwEUfoZd9vUFBzugcMd9Zi3aQaRIt0AUMyBMawSB3s42mhb5ivU
-fslfrejrckzzAeVLIL+aplfKkQABi6F1ITe1Yw1nPkZPcCBnzsXWWdsC4PDSy826
-YreQQejdIOQpvGQpQsgi3Hia/0PsmBsJUUtaWsJx8cTLc6nloQsCAwEAAaOCAc4w
-ggHKMB0GA1UdDgQWBBQWtTIb1Mfz4OaO873SsDrusjkY0TCBowYDVR0jBIGbMIGY
-gBQWtTIb1Mfz4OaO873SsDrusjkY0aF9pHsweTEQMA4GA1UEChMHUm9vdCBDQTEe
-MBwGA1UECxMVaHR0cDovL3d3dy5jYWNlcnQub3JnMSIwIAYDVQQDExlDQSBDZXJ0
-IFNpZ25pbmcgQXV0aG9yaXR5MSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGNhY2Vy
-dC5vcmeCAQAwDwYDVR0TAQH/BAUwAwEB/zAyBgNVHR8EKzApMCegJaAjhiFodHRw
-czovL3d3dy5jYWNlcnQub3JnL3Jldm9rZS5jcmwwMAYJYIZIAYb4QgEEBCMWIWh0
-dHBzOi8vd3d3LmNhY2VydC5vcmcvcmV2b2tlLmNybDA0BglghkgBhvhCAQgEJxYl
-aHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4LnBocD9pZD0xMDBWBglghkgBhvhC
-AQ0ESRZHVG8gZ2V0IHlvdXIgb3duIGNlcnRpZmljYXRlIGZvciBGUkVFIGhlYWQg
-b3ZlciB0byBodHRwOi8vd3d3LmNhY2VydC5vcmcwDQYJKoZIhvcNAQEEBQADggIB
-ACjH7pyCArpcgBLKNQodgW+JapnM8mgPf6fhjViVPr3yBsOQWqy1YPaZQwGjiHCc
-nWKdpIevZ1gNMDY75q1I08t0AoZxPuIrA2jxNGJARjtT6ij0rPtmlVOKTV39O9lg
-18p5aTuxZZKmxoGCXJzN600BiqXfEVWqFcofN8CCmHBh22p8lqOOLlQ+TyGpkO/c
-gr/c6EWtTZBzCDyUZbAEmXZ/4rzCahWqlwQ3JNgelE5tDlG+1sSPypZt90Pf6DBl
-Jzt7u0NDY8RD97LsaMzhGY4i+5jhe1o+ATc7iwiwovOVThrLm82asduycPAtStvY
-sONvRUgzEv/+PDIqVPfE94rwiCPCR/5kenHA0R6mY7AHfqQv0wGP3J8rtsYIqQ+T
-SCX8Ev2fQtzzxD72V7DX3WnRBnc0CkvSyqD/HMaMyRa+xMwyN2hzXwj7UfdJUzYF
-CpUCTPJ5GhD22Dp1nPMd8aINcGeGG7MW9S/lpOt5hvk9C8JzC6WZrG/8Z7jlLwum
-GCSNe9FINSkYQKyTYOGWhlC0elnYjyELn8+CkcY7v2vcB5G5l1YjqrZslMZIBjzk
-zk6q5PYvCdxTby78dOs6Y5nCpqyJvKeyRKANihDjbPIky/qbn3BHLt4Ui9SyIAmW
-omTxJBzcoTWcFbLUvFUufQb1nA5V9FrWk9p2rSVzTMVD
------END CERTIFICATE-----
diff --git a/lib/future/backports/test/keycert.passwd.pem b/lib/future/backports/test/keycert.passwd.pem
deleted file mode 100644
index e9057488..00000000
--- a/lib/future/backports/test/keycert.passwd.pem
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,1A8D9D2A02EC698A
-
-kJYbfZ8L0sfe9Oty3gw0aloNnY5E8fegRfQLZlNoxTl6jNt0nIwI8kDJ36CZgR9c
-u3FDJm/KqrfUoz8vW+qEnWhSG7QPX2wWGPHd4K94Yz/FgrRzZ0DoK7XxXq9gOtVA
-AVGQhnz32p+6WhfGsCr9ArXEwRZrTk/FvzEPaU5fHcoSkrNVAGX8IpSVkSDwEDQr
-Gv17+cfk99UV1OCza6yKHoFkTtrC+PZU71LomBabivS2Oc4B9hYuSR2hF01wTHP+
-YlWNagZOOVtNz4oKK9x9eNQpmfQXQvPPTfusexKIbKfZrMvJoxcm1gfcZ0H/wK6P
-6wmXSG35qMOOztCZNtperjs1wzEBXznyK8QmLcAJBjkfarABJX9vBEzZV0OUKhy+
-noORFwHTllphbmydLhu6ehLUZMHPhzAS5UN7srtpSN81eerDMy0RMUAwA7/PofX1
-94Me85Q8jP0PC9ETdsJcPqLzAPETEYu0ELewKRcrdyWi+tlLFrpE5KT/s5ecbl9l
-7B61U4Kfd1PIXc/siINhU3A3bYK+845YyUArUOnKf1kEox7p1RpD7yFqVT04lRTo
-cibNKATBusXSuBrp2G6GNuhWEOSafWCKJQAzgCYIp6ZTV2khhMUGppc/2H3CF6cO
-zX0KtlPVZC7hLkB6HT8SxYUwF1zqWY7+/XPPdc37MeEZ87Q3UuZwqORLY+Z0hpgt
-L5JXBCoklZhCAaN2GqwFLXtGiRSRFGY7xXIhbDTlE65Wv1WGGgDLMKGE1gOz3yAo
-2jjG1+yAHJUdE69XTFHSqSkvaloA1W03LdMXZ9VuQJ/ySXCie6ABAQ==
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIICVDCCAb2gAwIBAgIJANfHOBkZr8JOMA0GCSqGSIb3DQEBBQUAMF8xCzAJBgNV
-BAYTAlhZMRcwFQYDVQQHEw5DYXN0bGUgQW50aHJheDEjMCEGA1UEChMaUHl0aG9u
-IFNvZnR3YXJlIEZvdW5kYXRpb24xEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xMDEw
-MDgyMzAxNTZaFw0yMDEwMDUyMzAxNTZaMF8xCzAJBgNVBAYTAlhZMRcwFQYDVQQH
-Ew5DYXN0bGUgQW50aHJheDEjMCEGA1UEChMaUHl0aG9uIFNvZnR3YXJlIEZvdW5k
-YXRpb24xEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
-gYkCgYEA21vT5isq7F68amYuuNpSFlKDPrMUCa4YWYqZRt2OZ+/3NKaZ2xAiSwr7
-6MrQF70t5nLbSPpqE5+5VrS58SY+g/sXLiFd6AplH1wJZwh78DofbFYXUggktFMt
-pTyiX8jtP66bkcPkDADA089RI1TQR6Ca+n7HFa7c1fabVV6i3zkCAwEAAaMYMBYw
-FAYDVR0RBA0wC4IJbG9jYWxob3N0MA0GCSqGSIb3DQEBBQUAA4GBAHPctQBEQ4wd
-BJ6+JcpIraopLn8BGhbjNWj40mmRqWB/NAWF6M5ne7KpGAu7tLeG4hb1zLaldK8G
-lxy2GPSRF6LFS48dpEj2HbMv2nvv6xxalDMJ9+DicWgAKTQ6bcX2j3GUkCR0g/T1
-CRlNBAAlvhKzO7Clpf9l0YKBEfraJByX
------END CERTIFICATE-----
diff --git a/lib/future/backports/test/keycert.pem b/lib/future/backports/test/keycert.pem
deleted file mode 100644
index 64318aa2..00000000
--- a/lib/future/backports/test/keycert.pem
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBANtb0+YrKuxevGpm
-LrjaUhZSgz6zFAmuGFmKmUbdjmfv9zSmmdsQIksK++jK0Be9LeZy20j6ahOfuVa0
-ufEmPoP7Fy4hXegKZR9cCWcIe/A6H2xWF1IIJLRTLaU8ol/I7T+um5HD5AwAwNPP
-USNU0Eegmvp+xxWu3NX2m1Veot85AgMBAAECgYA3ZdZ673X0oexFlq7AAmrutkHt
-CL7LvwrpOiaBjhyTxTeSNWzvtQBkIU8DOI0bIazA4UreAFffwtvEuPmonDb3F+Iq
-SMAu42XcGyVZEl+gHlTPU9XRX7nTOXVt+MlRRRxL6t9GkGfUAXI3XxJDXW3c0vBK
-UL9xqD8cORXOfE06rQJBAP8mEX1ERkR64Ptsoe4281vjTlNfIbs7NMPkUnrn9N/Y
-BLhjNIfQ3HFZG8BTMLfX7kCS9D593DW5tV4Z9BP/c6cCQQDcFzCcVArNh2JSywOQ
-ZfTfRbJg/Z5Lt9Fkngv1meeGNPgIMLN8Sg679pAOOWmzdMO3V706rNPzSVMME7E5
-oPIfAkEA8pDddarP5tCvTTgUpmTFbakm0KoTZm2+FzHcnA4jRh+XNTjTOv98Y6Ik
-eO5d1ZnKXseWvkZncQgxfdnMqqpj5wJAcNq/RVne1DbYlwWchT2Si65MYmmJ8t+F
-0mcsULqjOnEMwf5e+ptq5LzwbyrHZYq5FNk7ocufPv/ZQrcSSC+cFwJBAKvOJByS
-x56qyGeZLOQlWS2JS3KJo59XuLFGqcbgN9Om9xFa41Yb4N9NvplFivsvZdw3m1Q/
-SPIXQuT8RMPDVNQ=
------END PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIICVDCCAb2gAwIBAgIJANfHOBkZr8JOMA0GCSqGSIb3DQEBBQUAMF8xCzAJBgNV
-BAYTAlhZMRcwFQYDVQQHEw5DYXN0bGUgQW50aHJheDEjMCEGA1UEChMaUHl0aG9u
-IFNvZnR3YXJlIEZvdW5kYXRpb24xEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xMDEw
-MDgyMzAxNTZaFw0yMDEwMDUyMzAxNTZaMF8xCzAJBgNVBAYTAlhZMRcwFQYDVQQH
-Ew5DYXN0bGUgQW50aHJheDEjMCEGA1UEChMaUHl0aG9uIFNvZnR3YXJlIEZvdW5k
-YXRpb24xEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
-gYkCgYEA21vT5isq7F68amYuuNpSFlKDPrMUCa4YWYqZRt2OZ+/3NKaZ2xAiSwr7
-6MrQF70t5nLbSPpqE5+5VrS58SY+g/sXLiFd6AplH1wJZwh78DofbFYXUggktFMt
-pTyiX8jtP66bkcPkDADA089RI1TQR6Ca+n7HFa7c1fabVV6i3zkCAwEAAaMYMBYw
-FAYDVR0RBA0wC4IJbG9jYWxob3N0MA0GCSqGSIb3DQEBBQUAA4GBAHPctQBEQ4wd
-BJ6+JcpIraopLn8BGhbjNWj40mmRqWB/NAWF6M5ne7KpGAu7tLeG4hb1zLaldK8G
-lxy2GPSRF6LFS48dpEj2HbMv2nvv6xxalDMJ9+DicWgAKTQ6bcX2j3GUkCR0g/T1
-CRlNBAAlvhKzO7Clpf9l0YKBEfraJByX
------END CERTIFICATE-----
diff --git a/lib/future/backports/test/keycert2.pem b/lib/future/backports/test/keycert2.pem
deleted file mode 100644
index e8a9e082..00000000
--- a/lib/future/backports/test/keycert2.pem
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJnsJZVrppL+W5I9
-zGQrrawWwE5QJpBK9nWw17mXrZ03R1cD9BamLGivVISbPlRlAVnZBEyh1ATpsB7d
-CUQ+WHEvALquvx4+Yw5l+fXeiYRjrLRBYZuVy8yNtXzU3iWcGObcYRkUdiXdOyP7
-sLF2YZHRvQZpzgDBKkrraeQ81w21AgMBAAECgYBEm7n07FMHWlE+0kT0sXNsLYfy
-YE+QKZnJw9WkaDN+zFEEPELkhZVt5BjsMraJr6v2fIEqF0gGGJPkbenffVq2B5dC
-lWUOxvJHufMK4sM3Cp6s/gOp3LP+QkzVnvJSfAyZU6l+4PGX5pLdUsXYjPxgzjzL
-S36tF7/2Uv1WePyLUQJBAMsPhYzUXOPRgmbhcJiqi9A9c3GO8kvSDYTCKt3VMnqz
-HBn6MQ4VQasCD1F+7jWTI0FU/3vdw8non/Fj8hhYqZcCQQDCDRdvmZqDiZnpMqDq
-L6ZSrLTVtMvZXZbgwForaAD9uHj51TME7+eYT7EG2YCgJTXJ4YvRJEnPNyskwdKt
-vTSTAkEAtaaN/vyemEJ82BIGStwONNw0ILsSr5cZ9tBHzqiA/tipY+e36HRFiXhP
-QcU9zXlxyWkDH8iz9DSAmE2jbfoqwwJANlMJ65E543cjIlitGcKLMnvtCCLcKpb7
-xSG0XJB6Lo11OKPJ66jp0gcFTSCY1Lx2CXVd+gfJrfwI1Pp562+bhwJBAJ9IfDPU
-R8OpO9v1SGd8x33Owm7uXOpB9d63/T70AD1QOXjKUC4eXYbt0WWfWuny/RNPRuyh
-w7DXSfUF+kPKolU=
------END PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIICXTCCAcagAwIBAgIJAIO3upAG445fMA0GCSqGSIb3DQEBBQUAMGIxCzAJBgNV
-BAYTAlhZMRcwFQYDVQQHEw5DYXN0bGUgQW50aHJheDEjMCEGA1UEChMaUHl0aG9u
-IFNvZnR3YXJlIEZvdW5kYXRpb24xFTATBgNVBAMTDGZha2Vob3N0bmFtZTAeFw0x
-MDEwMDkxNTAxMDBaFw0yMDEwMDYxNTAxMDBaMGIxCzAJBgNVBAYTAlhZMRcwFQYD
-VQQHEw5DYXN0bGUgQW50aHJheDEjMCEGA1UEChMaUHl0aG9uIFNvZnR3YXJlIEZv
-dW5kYXRpb24xFTATBgNVBAMTDGZha2Vob3N0bmFtZTCBnzANBgkqhkiG9w0BAQEF
-AAOBjQAwgYkCgYEAmewllWumkv5bkj3MZCutrBbATlAmkEr2dbDXuZetnTdHVwP0
-FqYsaK9UhJs+VGUBWdkETKHUBOmwHt0JRD5YcS8Auq6/Hj5jDmX59d6JhGOstEFh
-m5XLzI21fNTeJZwY5txhGRR2Jd07I/uwsXZhkdG9BmnOAMEqSutp5DzXDbUCAwEA
-AaMbMBkwFwYDVR0RBBAwDoIMZmFrZWhvc3RuYW1lMA0GCSqGSIb3DQEBBQUAA4GB
-AH+iMClLLGSaKWgwXsmdVo4FhTZZHo8Uprrtg3N9FxEeE50btpDVQysgRt5ias3K
-m+bME9zbKwvbVWD5zZdjus4pDgzwF/iHyccL8JyYhxOvS/9zmvAtFXj/APIIbZFp
-IT75d9f88ScIGEtknZQejnrdhB64tYki/EqluiuKBqKD
------END CERTIFICATE-----
diff --git a/lib/future/backports/test/nokia.pem b/lib/future/backports/test/nokia.pem
deleted file mode 100644
index 0d044df4..00000000
--- a/lib/future/backports/test/nokia.pem
+++ /dev/null
@@ -1,31 +0,0 @@
-# Certificate for projects.developer.nokia.com:443 (see issue 13034)
------BEGIN CERTIFICATE-----
-MIIFLDCCBBSgAwIBAgIQLubqdkCgdc7lAF9NfHlUmjANBgkqhkiG9w0BAQUFADCB
-vDELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
-YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDE2MDQGA1UEAxMt
-VmVyaVNpZ24gQ2xhc3MgMyBJbnRlcm5hdGlvbmFsIFNlcnZlciBDQSAtIEczMB4X
-DTExMDkyMTAwMDAwMFoXDTEyMDkyMDIzNTk1OVowcTELMAkGA1UEBhMCRkkxDjAM
-BgNVBAgTBUVzcG9vMQ4wDAYDVQQHFAVFc3BvbzEOMAwGA1UEChQFTm9raWExCzAJ
-BgNVBAsUAkJJMSUwIwYDVQQDFBxwcm9qZWN0cy5kZXZlbG9wZXIubm9raWEuY29t
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCr92w1bpHYSYxUEx8N/8Iddda2
-lYi+aXNtQfV/l2Fw9Ykv3Ipw4nLeGTj18FFlAZgMdPRlgrzF/NNXGw/9l3/qKdow
-CypkQf8lLaxb9Ze1E/KKmkRJa48QTOqvo6GqKuTI6HCeGlG1RxDb8YSKcQWLiytn
-yj3Wp4MgRQO266xmMQIDAQABo4IB9jCCAfIwQQYDVR0RBDowOIIccHJvamVjdHMu
-ZGV2ZWxvcGVyLm5va2lhLmNvbYIYcHJvamVjdHMuZm9ydW0ubm9raWEuY29tMAkG
-A1UdEwQCMAAwCwYDVR0PBAQDAgWgMEEGA1UdHwQ6MDgwNqA0oDKGMGh0dHA6Ly9T
-VlJJbnRsLUczLWNybC52ZXJpc2lnbi5jb20vU1ZSSW50bEczLmNybDBEBgNVHSAE
-PTA7MDkGC2CGSAGG+EUBBxcDMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LnZl
-cmlzaWduLmNvbS9ycGEwKAYDVR0lBCEwHwYJYIZIAYb4QgQBBggrBgEFBQcDAQYI
-KwYBBQUHAwIwcgYIKwYBBQUHAQEEZjBkMCQGCCsGAQUFBzABhhhodHRwOi8vb2Nz
-cC52ZXJpc2lnbi5jb20wPAYIKwYBBQUHMAKGMGh0dHA6Ly9TVlJJbnRsLUczLWFp
-YS52ZXJpc2lnbi5jb20vU1ZSSW50bEczLmNlcjBuBggrBgEFBQcBDARiMGChXqBc
-MFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIaBBRLa7kolgYMu9BSOJsprEsH
-iyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5jb20vdnNsb2dvMS5naWYwDQYJ
-KoZIhvcNAQEFBQADggEBACQuPyIJqXwUyFRWw9x5yDXgMW4zYFopQYOw/ItRY522
-O5BsySTh56BWS6mQB07XVfxmYUGAvRQDA5QHpmY8jIlNwSmN3s8RKo+fAtiNRlcL
-x/mWSfuMs3D/S6ev3D6+dpEMZtjrhOdctsarMKp8n/hPbwhAbg5hVjpkW5n8vz2y
-0KxvvkA1AxpLwpVv7OlK17ttzIHw8bp9HTlHBU5s8bKz4a565V/a5HI0CSEv/+0y
-ko4/ghTnZc1CkmUngKKeFMSah/mT/xAh8XnE2l1AazFa8UKuYki1e+ArHaGZc4ix
-UYOtiRphwfuYQhRZ7qX9q2MMkCMI65XNK/SaFrAbbG0=
------END CERTIFICATE-----
diff --git a/lib/future/backports/test/nullbytecert.pem b/lib/future/backports/test/nullbytecert.pem
deleted file mode 100644
index 447186c9..00000000
--- a/lib/future/backports/test/nullbytecert.pem
+++ /dev/null
@@ -1,90 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 0 (0x0)
-    Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org
-        Validity
-            Not Before: Aug  7 13:11:52 2013 GMT
-            Not After : Aug  7 13:12:52 2013 GMT
-        Subject: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:b5:ea:ed:c9:fb:46:7d:6f:3b:76:80:dd:3a:f3:
-                    03:94:0b:a7:a6:db:ec:1d:df:ff:23:74:08:9d:97:
-                    16:3f:a3:a4:7b:3e:1b:0e:96:59:25:03:a7:26:e2:
-                    88:a9:cf:79:cd:f7:04:56:b0:ab:79:32:6e:59:c1:
-                    32:30:54:eb:58:a8:cb:91:f0:42:a5:64:27:cb:d4:
-                    56:31:88:52:ad:cf:bd:7f:f0:06:64:1f:cc:27:b8:
-                    a3:8b:8c:f3:d8:29:1f:25:0b:f5:46:06:1b:ca:02:
-                    45:ad:7b:76:0a:9c:bf:bb:b9:ae:0d:16:ab:60:75:
-                    ae:06:3e:9c:7c:31:dc:92:2f:29:1a:e0:4b:0c:91:
-                    90:6c:e9:37:c5:90:d7:2a:d7:97:15:a3:80:8f:5d:
-                    7b:49:8f:54:30:d4:97:2c:1c:5b:37:b5:ab:69:30:
-                    68:43:d3:33:78:4b:02:60:f5:3c:44:80:a1:8f:e7:
-                    f0:0f:d1:5e:87:9e:46:cf:62:fc:f9:bf:0c:65:12:
-                    f1:93:c8:35:79:3f:c8:ec:ec:47:f5:ef:be:44:d5:
-                    ae:82:1e:2d:9a:9f:98:5a:67:65:e1:74:70:7c:cb:
-                    d3:c2:ce:0e:45:49:27:dc:e3:2d:d4:fb:48:0e:2f:
-                    9e:77:b8:14:46:c0:c4:36:ca:02:ae:6a:91:8c:da:
-                    2f:85
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:FALSE
-            X509v3 Subject Key Identifier:
-                88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C
-            X509v3 Key Usage:
-                Digital Signature, Non Repudiation, Key Encipherment
-            X509v3 Subject Alternative Name:
-                *************************************************************
-                WARNING: The values for DNS, email and URI are WRONG. OpenSSL
-                         doesn't print the text after a NULL byte.
-                *************************************************************
-                DNS:altnull.python.org, email:null@python.org, URI:http://null.python.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1
-    Signature Algorithm: sha1WithRSAEncryption
-         ac:4f:45:ef:7d:49:a8:21:70:8e:88:59:3e:d4:36:42:70:f5:
-         a3:bd:8b:d7:a8:d0:58:f6:31:4a:b1:a4:a6:dd:6f:d9:e8:44:
-         3c:b6:0a:71:d6:7f:b1:08:61:9d:60:ce:75:cf:77:0c:d2:37:
-         86:02:8d:5e:5d:f9:0f:71:b4:16:a8:c1:3d:23:1c:f1:11:b3:
-         56:6e:ca:d0:8d:34:94:e6:87:2a:99:f2:ae:ae:cc:c2:e8:86:
-         de:08:a8:7f:c5:05:fa:6f:81:a7:82:e6:d0:53:9d:34:f4:ac:
-         3e:40:fe:89:57:7a:29:a4:91:7e:0b:c6:51:31:e5:10:2f:a4:
-         60:76:cd:95:51:1a:be:8b:a1:b0:fd:ad:52:bd:d7:1b:87:60:
-         d2:31:c7:17:c4:18:4f:2d:08:25:a3:a7:4f:b7:92:ca:e2:f5:
-         25:f1:54:75:81:9d:b3:3d:61:a2:f7:da:ed:e1:c6:6f:2c:60:
-         1f:d8:6f:c5:92:05:ab:c9:09:62:49:a9:14:ad:55:11:cc:d6:
-         4a:19:94:99:97:37:1d:81:5f:8b:cf:a3:a8:96:44:51:08:3d:
-         0b:05:65:12:eb:b6:70:80:88:48:72:4f:c6:c2:da:cf:cd:8e:
-         5b:ba:97:2f:60:b4:96:56:49:5e:3a:43:76:63:04:be:2a:f6:
-         c1:ca:a9:94
------BEGIN CERTIFICATE-----
-MIIE2DCCA8CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxTELMAkGA1UEBhMCVVMx
-DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMSMwIQYDVQQKDBpQ
-eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEgMB4GA1UECwwXUHl0aG9uIENvcmUg
-RGV2ZWxvcG1lbnQxJDAiBgNVBAMMG251bGwucHl0aG9uLm9yZwBleGFtcGxlLm9y
-ZzEkMCIGCSqGSIb3DQEJARYVcHl0aG9uLWRldkBweXRob24ub3JnMB4XDTEzMDgw
-NzEzMTE1MloXDTEzMDgwNzEzMTI1MlowgcUxCzAJBgNVBAYTAlVTMQ8wDQYDVQQI
-DAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEjMCEGA1UECgwaUHl0aG9uIFNv
-ZnR3YXJlIEZvdW5kYXRpb24xIDAeBgNVBAsMF1B5dGhvbiBDb3JlIERldmVsb3Bt
-ZW50MSQwIgYDVQQDDBtudWxsLnB5dGhvbi5vcmcAZXhhbXBsZS5vcmcxJDAiBgkq
-hkiG9w0BCQEWFXB5dGhvbi1kZXZAcHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBALXq7cn7Rn1vO3aA3TrzA5QLp6bb7B3f/yN0CJ2XFj+j
-pHs+Gw6WWSUDpybiiKnPec33BFawq3kyblnBMjBU61ioy5HwQqVkJ8vUVjGIUq3P
-vX/wBmQfzCe4o4uM89gpHyUL9UYGG8oCRa17dgqcv7u5rg0Wq2B1rgY+nHwx3JIv
-KRrgSwyRkGzpN8WQ1yrXlxWjgI9de0mPVDDUlywcWze1q2kwaEPTM3hLAmD1PESA
-oY/n8A/RXoeeRs9i/Pm/DGUS8ZPINXk/yOzsR/XvvkTVroIeLZqfmFpnZeF0cHzL
-08LODkVJJ9zjLdT7SA4vnne4FEbAxDbKAq5qkYzaL4UCAwEAAaOB0DCBzTAMBgNV
-HRMBAf8EAjAAMB0GA1UdDgQWBBSIWlXAUv9hzVKjNQ/qWpwkOCL3XDALBgNVHQ8E
-BAMCBeAwgZAGA1UdEQSBiDCBhYIeYWx0bnVsbC5weXRob24ub3JnAGV4YW1wbGUu
-Y29tgSBudWxsQHB5dGhvbi5vcmcAdXNlckBleGFtcGxlLm9yZ4YpaHR0cDovL251
-bGwucHl0aG9uLm9yZwBodHRwOi8vZXhhbXBsZS5vcmeHBMAAAgGHECABDbgAAAAA
-AAAAAAAAAAEwDQYJKoZIhvcNAQEFBQADggEBAKxPRe99SaghcI6IWT7UNkJw9aO9
-i9eo0Fj2MUqxpKbdb9noRDy2CnHWf7EIYZ1gznXPdwzSN4YCjV5d+Q9xtBaowT0j
-HPERs1ZuytCNNJTmhyqZ8q6uzMLoht4IqH/FBfpvgaeC5tBTnTT0rD5A/olXeimk
-kX4LxlEx5RAvpGB2zZVRGr6LobD9rVK91xuHYNIxxxfEGE8tCCWjp0+3ksri9SXx
-VHWBnbM9YaL32u3hxm8sYB/Yb8WSBavJCWJJqRStVRHM1koZlJmXNx2BX4vPo6iW
-RFEIPQsFZRLrtnCAiEhyT8bC2s/Njlu6ly9gtJZWSV46Q3ZjBL4q9sHKqZQ=
------END CERTIFICATE-----
diff --git a/lib/future/backports/test/nullcert.pem b/lib/future/backports/test/nullcert.pem
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/future/backports/test/pystone.py b/lib/future/backports/test/pystone.py
deleted file mode 100644
index 7652027b..00000000
--- a/lib/future/backports/test/pystone.py
+++ /dev/null
@@ -1,272 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-"PYSTONE" Benchmark Program
-
-Version:        Python/1.1 (corresponds to C/1.1 plus 2 Pystone fixes)
-
-Author:         Reinhold P. Weicker,  CACM Vol 27, No 10, 10/84 pg. 1013.
-
-                Translated from ADA to C by Rick Richardson.
-                Every method to preserve ADA-likeness has been used,
-                at the expense of C-ness.
-
-                Translated from C to Python by Guido van Rossum.
-
-Version History:
-
-                Version 1.1 corrects two bugs in version 1.0:
-
-                First, it leaked memory: in Proc1(), NextRecord ends
-                up having a pointer to itself.  I have corrected this
-                by zapping NextRecord.PtrComp at the end of Proc1().
-
-                Second, Proc3() used the operator != to compare a
-                record to None.  This is rather inefficient and not
-                true to the intention of the original benchmark (where
-                a pointer comparison to None is intended; the !=
-                operator attempts to find a method __cmp__ to do value
-                comparison of the record).  Version 1.1 runs 5-10
-                percent faster than version 1.0, so benchmark figures
-                of different versions can't be compared directly.
-
-"""
-
-from __future__ import print_function
-
-from time import clock
-
-LOOPS = 50000
-
-__version__ = "1.1"
-
-[Ident1, Ident2, Ident3, Ident4, Ident5] = range(1, 6)
-
-class Record(object):
-
-    def __init__(self, PtrComp = None, Discr = 0, EnumComp = 0,
-                       IntComp = 0, StringComp = 0):
-        self.PtrComp = PtrComp
-        self.Discr = Discr
-        self.EnumComp = EnumComp
-        self.IntComp = IntComp
-        self.StringComp = StringComp
-
-    def copy(self):
-        return Record(self.PtrComp, self.Discr, self.EnumComp,
-                      self.IntComp, self.StringComp)
-
-TRUE = 1
-FALSE = 0
-
-def main(loops=LOOPS):
-    benchtime, stones = pystones(loops)
-    print("Pystone(%s) time for %d passes = %g" % \
-          (__version__, loops, benchtime))
-    print("This machine benchmarks at %g pystones/second" % stones)
-
-
-def pystones(loops=LOOPS):
-    return Proc0(loops)
-
-IntGlob = 0
-BoolGlob = FALSE
-Char1Glob = '\0'
-Char2Glob = '\0'
-Array1Glob = [0]*51
-Array2Glob = [x[:] for x in [Array1Glob]*51]
-PtrGlb = None
-PtrGlbNext = None
-
-def Proc0(loops=LOOPS):
-    global IntGlob
-    global BoolGlob
-    global Char1Glob
-    global Char2Glob
-    global Array1Glob
-    global Array2Glob
-    global PtrGlb
-    global PtrGlbNext
-
-    starttime = clock()
-    for i in range(loops):
-        pass
-    nulltime = clock() - starttime
-
-    PtrGlbNext = Record()
-    PtrGlb = Record()
-    PtrGlb.PtrComp = PtrGlbNext
-    PtrGlb.Discr = Ident1
-    PtrGlb.EnumComp = Ident3
-    PtrGlb.IntComp = 40
-    PtrGlb.StringComp = "DHRYSTONE PROGRAM, SOME STRING"
-    String1Loc = "DHRYSTONE PROGRAM, 1'ST STRING"
-    Array2Glob[8][7] = 10
-
-    starttime = clock()
-
-    for i in range(loops):
-        Proc5()
-        Proc4()
-        IntLoc1 = 2
-        IntLoc2 = 3
-        String2Loc = "DHRYSTONE PROGRAM, 2'ND STRING"
-        EnumLoc = Ident2
-        BoolGlob = not Func2(String1Loc, String2Loc)
-        while IntLoc1 < IntLoc2:
-            IntLoc3 = 5 * IntLoc1 - IntLoc2
-            IntLoc3 = Proc7(IntLoc1, IntLoc2)
-            IntLoc1 = IntLoc1 + 1
-        Proc8(Array1Glob, Array2Glob, IntLoc1, IntLoc3)
-        PtrGlb = Proc1(PtrGlb)
-        CharIndex = 'A'
-        while CharIndex <= Char2Glob:
-            if EnumLoc == Func1(CharIndex, 'C'):
-                EnumLoc = Proc6(Ident1)
-            CharIndex = chr(ord(CharIndex)+1)
-        IntLoc3 = IntLoc2 * IntLoc1
-        IntLoc2 = IntLoc3 / IntLoc1
-        IntLoc2 = 7 * (IntLoc3 - IntLoc2) - IntLoc1
-        IntLoc1 = Proc2(IntLoc1)
-
-    benchtime = clock() - starttime - nulltime
-    if benchtime == 0.0:
-        loopsPerBenchtime = 0.0
-    else:
-        loopsPerBenchtime = (loops / benchtime)
-    return benchtime, loopsPerBenchtime
-
-def Proc1(PtrParIn):
-    PtrParIn.PtrComp = NextRecord = PtrGlb.copy()
-    PtrParIn.IntComp = 5
-    NextRecord.IntComp = PtrParIn.IntComp
-    NextRecord.PtrComp = PtrParIn.PtrComp
-    NextRecord.PtrComp = Proc3(NextRecord.PtrComp)
-    if NextRecord.Discr == Ident1:
-        NextRecord.IntComp = 6
-        NextRecord.EnumComp = Proc6(PtrParIn.EnumComp)
-        NextRecord.PtrComp = PtrGlb.PtrComp
-        NextRecord.IntComp = Proc7(NextRecord.IntComp, 10)
-    else:
-        PtrParIn = NextRecord.copy()
-    NextRecord.PtrComp = None
-    return PtrParIn
-
-def Proc2(IntParIO):
-    IntLoc = IntParIO + 10
-    while 1:
-        if Char1Glob == 'A':
-            IntLoc = IntLoc - 1
-            IntParIO = IntLoc - IntGlob
-            EnumLoc = Ident1
-        if EnumLoc == Ident1:
-            break
-    return IntParIO
-
-def Proc3(PtrParOut):
-    global IntGlob
-
-    if PtrGlb is not None:
-        PtrParOut = PtrGlb.PtrComp
-    else:
-        IntGlob = 100
-    PtrGlb.IntComp = Proc7(10, IntGlob)
-    return PtrParOut
-
-def Proc4():
-    global Char2Glob
-
-    BoolLoc = Char1Glob == 'A'
-    BoolLoc = BoolLoc or BoolGlob
-    Char2Glob = 'B'
-
-def Proc5():
-    global Char1Glob
-    global BoolGlob
-
-    Char1Glob = 'A'
-    BoolGlob = FALSE
-
-def Proc6(EnumParIn):
-    EnumParOut = EnumParIn
-    if not Func3(EnumParIn):
-        EnumParOut = Ident4
-    if EnumParIn == Ident1:
-        EnumParOut = Ident1
-    elif EnumParIn == Ident2:
-        if IntGlob > 100:
-            EnumParOut = Ident1
-        else:
-            EnumParOut = Ident4
-    elif EnumParIn == Ident3:
-        EnumParOut = Ident2
-    elif EnumParIn == Ident4:
-        pass
-    elif EnumParIn == Ident5:
-        EnumParOut = Ident3
-    return EnumParOut
-
-def Proc7(IntParI1, IntParI2):
-    IntLoc = IntParI1 + 2
-    IntParOut = IntParI2 + IntLoc
-    return IntParOut
-
-def Proc8(Array1Par, Array2Par, IntParI1, IntParI2):
-    global IntGlob
-
-    IntLoc = IntParI1 + 5
-    Array1Par[IntLoc] = IntParI2
-    Array1Par[IntLoc+1] = Array1Par[IntLoc]
-    Array1Par[IntLoc+30] = IntLoc
-    for IntIndex in range(IntLoc, IntLoc+2):
-        Array2Par[IntLoc][IntIndex] = IntLoc
-    Array2Par[IntLoc][IntLoc-1] = Array2Par[IntLoc][IntLoc-1] + 1
-    Array2Par[IntLoc+20][IntLoc] = Array1Par[IntLoc]
-    IntGlob = 5
-
-def Func1(CharPar1, CharPar2):
-    CharLoc1 = CharPar1
-    CharLoc2 = CharLoc1
-    if CharLoc2 != CharPar2:
-        return Ident1
-    else:
-        return Ident2
-
-def Func2(StrParI1, StrParI2):
-    IntLoc = 1
-    while IntLoc <= 1:
-        if Func1(StrParI1[IntLoc], StrParI2[IntLoc+1]) == Ident1:
-            CharLoc = 'A'
-            IntLoc = IntLoc + 1
-    if CharLoc >= 'W' and CharLoc <= 'Z':
-        IntLoc = 7
-    if CharLoc == 'X':
-        return TRUE
-    else:
-        if StrParI1 > StrParI2:
-            IntLoc = IntLoc + 7
-            return TRUE
-        else:
-            return FALSE
-
-def Func3(EnumParIn):
-    EnumLoc = EnumParIn
-    if EnumLoc == Ident3: return TRUE
-    return FALSE
-
-if __name__ == '__main__':
-    import sys
-    def error(msg):
-        print(msg, end=' ', file=sys.stderr)
-        print("usage: %s [number_of_loops]" % sys.argv[0], file=sys.stderr)
-        sys.exit(100)
-    nargs = len(sys.argv) - 1
-    if nargs > 1:
-        error("%d arguments are too many;" % nargs)
-    elif nargs == 1:
-        try: loops = int(sys.argv[1])
-        except ValueError:
-            error("Invalid argument %r;" % sys.argv[1])
-    else:
-        loops = LOOPS
-    main(loops)
diff --git a/lib/future/backports/test/sha256.pem b/lib/future/backports/test/sha256.pem
deleted file mode 100644
index d3db4b85..00000000
--- a/lib/future/backports/test/sha256.pem
+++ /dev/null
@@ -1,128 +0,0 @@
-# Certificate chain for https://sha256.tbs-internet.com
- 0 s:/C=FR/postalCode=14000/ST=Calvados/L=CAEN/street=22 rue de Bretagne/O=TBS INTERNET/OU=0002 440443810/OU=sha-256 production/CN=sha256.tbs-internet.com
-   i:/C=FR/ST=Calvados/L=Caen/O=TBS INTERNET/OU=Terms and Conditions: http://www.tbs-internet.com/CA/repository/OU=TBS INTERNET CA/CN=TBS X509 CA SGC
------BEGIN CERTIFICATE-----
-MIIGXDCCBUSgAwIBAgIRAKpVmHgg9nfCodAVwcP4siwwDQYJKoZIhvcNAQELBQAw
-gcQxCzAJBgNVBAYTAkZSMREwDwYDVQQIEwhDYWx2YWRvczENMAsGA1UEBxMEQ2Fl
-bjEVMBMGA1UEChMMVEJTIElOVEVSTkVUMUgwRgYDVQQLEz9UZXJtcyBhbmQgQ29u
-ZGl0aW9uczogaHR0cDovL3d3dy50YnMtaW50ZXJuZXQuY29tL0NBL3JlcG9zaXRv
-cnkxGDAWBgNVBAsTD1RCUyBJTlRFUk5FVCBDQTEYMBYGA1UEAxMPVEJTIFg1MDkg
-Q0EgU0dDMB4XDTEyMDEwNDAwMDAwMFoXDTE0MDIxNzIzNTk1OVowgcsxCzAJBgNV
-BAYTAkZSMQ4wDAYDVQQREwUxNDAwMDERMA8GA1UECBMIQ2FsdmFkb3MxDTALBgNV
-BAcTBENBRU4xGzAZBgNVBAkTEjIyIHJ1ZSBkZSBCcmV0YWduZTEVMBMGA1UEChMM
-VEJTIElOVEVSTkVUMRcwFQYDVQQLEw4wMDAyIDQ0MDQ0MzgxMDEbMBkGA1UECxMS
-c2hhLTI1NiBwcm9kdWN0aW9uMSAwHgYDVQQDExdzaGEyNTYudGJzLWludGVybmV0
-LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKQIX/zdJcyxty0m
-PM1XQSoSSifueS3AVcgqMsaIKS/u+rYzsv4hQ/qA6vLn5m5/ewUcZDj7zdi6rBVf
-PaVNXJ6YinLX0tkaW8TEjeVuZG5yksGZlhCt1CJ1Ho9XLiLaP4uJ7MCoNUntpJ+E
-LfrOdgsIj91kPmwjDJeztVcQCvKzhjVJA/KxdInc0JvOATn7rpaSmQI5bvIjufgo
-qVsTPwVFzuUYULXBk7KxRT7MiEqnd5HvviNh0285QC478zl3v0I0Fb5El4yD3p49
-IthcRnxzMKc0UhU5ogi0SbONyBfm/mzONVfSxpM+MlyvZmJqrbuuLoEDzJD+t8PU
-xSuzgbcCAwEAAaOCAj4wggI6MB8GA1UdIwQYMBaAFAdEdoWTKLx/bXjSCuv6TEvf
-2YIfMB0GA1UdDgQWBBT/qTGYdaj+f61c2IRFL/B1eEsM8DAOBgNVHQ8BAf8EBAMC
-BaAwDAYDVR0TAQH/BAIwADA0BgNVHSUELTArBggrBgEFBQcDAQYIKwYBBQUHAwIG
-CisGAQQBgjcKAwMGCWCGSAGG+EIEATBLBgNVHSAERDBCMEAGCisGAQQB5TcCBAEw
-MjAwBggrBgEFBQcCARYkaHR0cHM6Ly93d3cudGJzLWludGVybmV0LmNvbS9DQS9D
-UFM0MG0GA1UdHwRmMGQwMqAwoC6GLGh0dHA6Ly9jcmwudGJzLWludGVybmV0LmNv
-bS9UQlNYNTA5Q0FTR0MuY3JsMC6gLKAqhihodHRwOi8vY3JsLnRicy14NTA5LmNv
-bS9UQlNYNTA5Q0FTR0MuY3JsMIGmBggrBgEFBQcBAQSBmTCBljA4BggrBgEFBQcw
-AoYsaHR0cDovL2NydC50YnMtaW50ZXJuZXQuY29tL1RCU1g1MDlDQVNHQy5jcnQw
-NAYIKwYBBQUHMAKGKGh0dHA6Ly9jcnQudGJzLXg1MDkuY29tL1RCU1g1MDlDQVNH
-Qy5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnRicy14NTA5LmNvbTA/BgNV
-HREEODA2ghdzaGEyNTYudGJzLWludGVybmV0LmNvbYIbd3d3LnNoYTI1Ni50YnMt
-aW50ZXJuZXQuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQA0pOuL8QvAa5yksTbGShzX
-ABApagunUGoEydv4YJT1MXy9tTp7DrWaozZSlsqBxrYAXP1d9r2fuKbEniYHxaQ0
-UYaf1VSIlDo1yuC8wE7wxbHDIpQ/E5KAyxiaJ8obtDhFstWAPAH+UoGXq0kj2teN
-21sFQ5dXgA95nldvVFsFhrRUNB6xXAcaj0VZFhttI0ZfQZmQwEI/P+N9Jr40OGun
-aa+Dn0TMeUH4U20YntfLbu2nDcJcYfyurm+8/0Tr4HznLnedXu9pCPYj0TaddrgT
-XO0oFiyy7qGaY6+qKh71yD64Y3ycCJ/HR9Wm39mjZYc9ezYwT4noP6r7Lk8YO7/q
------END CERTIFICATE-----
- 1 s:/C=FR/ST=Calvados/L=Caen/O=TBS INTERNET/OU=Terms and Conditions: http://www.tbs-internet.com/CA/repository/OU=TBS INTERNET CA/CN=TBS X509 CA SGC
-   i:/C=SE/O=AddTrust AB/OU=AddTrust External TTP Network/CN=AddTrust External CA Root
------BEGIN CERTIFICATE-----
-MIIFVjCCBD6gAwIBAgIQXpDZ0ETJMV02WTx3GTnhhTANBgkqhkiG9w0BAQUFADBv
-MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFk
-ZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBF
-eHRlcm5hbCBDQSBSb290MB4XDTA1MTIwMTAwMDAwMFoXDTE5MDYyNDE5MDYzMFow
-gcQxCzAJBgNVBAYTAkZSMREwDwYDVQQIEwhDYWx2YWRvczENMAsGA1UEBxMEQ2Fl
-bjEVMBMGA1UEChMMVEJTIElOVEVSTkVUMUgwRgYDVQQLEz9UZXJtcyBhbmQgQ29u
-ZGl0aW9uczogaHR0cDovL3d3dy50YnMtaW50ZXJuZXQuY29tL0NBL3JlcG9zaXRv
-cnkxGDAWBgNVBAsTD1RCUyBJTlRFUk5FVCBDQTEYMBYGA1UEAxMPVEJTIFg1MDkg
-Q0EgU0dDMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsgOkO3f7wzN6
-rOjg45tR5vjBfzK7qmV9IBxb/QW9EEXxG+E7FNhZqQLtwGBKoSsHTnQqV75wWMk0
-9tinWvftBkSpj5sTi/8cbzJfUvTSVYh3Qxv6AVVjMMH/ruLjE6y+4PoaPs8WoYAQ
-ts5R4Z1g8c/WnTepLst2x0/Wv7GmuoQi+gXvHU6YrBiu7XkeYhzc95QdviWSJRDk
-owhb5K43qhcvjRmBfO/paGlCliDGZp8mHwrI21mwobWpVjTxZRwYO3bd4+TGcI4G
-Ie5wmHwE8F7SK1tgSqbBacKjDa93j7txKkfz/Yd2n7TGqOXiHPsJpG655vrKtnXk
-9vs1zoDeJQIDAQABo4IBljCCAZIwHQYDVR0OBBYEFAdEdoWTKLx/bXjSCuv6TEvf
-2YIfMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMCAGA1UdJQQZ
-MBcGCisGAQQBgjcKAwMGCWCGSAGG+EIEATAYBgNVHSAEETAPMA0GCysGAQQBgOU3
-AgQBMHsGA1UdHwR0MHIwOKA2oDSGMmh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0Fk
-ZFRydXN0RXh0ZXJuYWxDQVJvb3QuY3JsMDagNKAyhjBodHRwOi8vY3JsLmNvbW9k
-by5uZXQvQWRkVHJ1c3RFeHRlcm5hbENBUm9vdC5jcmwwgYAGCCsGAQUFBwEBBHQw
-cjA4BggrBgEFBQcwAoYsaHR0cDovL2NydC5jb21vZG9jYS5jb20vQWRkVHJ1c3RV
-VE5TR0NDQS5jcnQwNgYIKwYBBQUHMAKGKmh0dHA6Ly9jcnQuY29tb2RvLm5ldC9B
-ZGRUcnVzdFVUTlNHQ0NBLmNydDARBglghkgBhvhCAQEEBAMCAgQwDQYJKoZIhvcN
-AQEFBQADggEBAK2zEzs+jcIrVK9oDkdDZNvhuBYTdCfpxfFs+OAujW0bIfJAy232
-euVsnJm6u/+OrqKudD2tad2BbejLLXhMZViaCmK7D9nrXHx4te5EP8rL19SUVqLY
-1pTnv5dhNgEgvA7n5lIzDSYs7yRLsr7HJsYPr6SeYSuZizyX1SNz7ooJ32/F3X98
-RB0Mlc/E0OyOrkQ9/y5IrnpnaSora8CnUrV5XNOg+kyCz9edCyx4D5wXYcwZPVWz
-8aDqquESrezPyjtfi4WRO4s/VD3HLZvOxzMrWAVYCDG9FxaOhF0QGuuG1F7F3GKV
-v6prNyCl016kRl2j1UT+a7gLd8fA25A4C9E=
------END CERTIFICATE-----
- 2 s:/C=SE/O=AddTrust AB/OU=AddTrust External TTP Network/CN=AddTrust External CA Root
-   i:/C=US/ST=UT/L=Salt Lake City/O=The USERTRUST Network/OU=http://www.usertrust.com/CN=UTN - DATACorp SGC
------BEGIN CERTIFICATE-----
-MIIEZjCCA06gAwIBAgIQUSYKkxzif5zDpV954HKugjANBgkqhkiG9w0BAQUFADCB
-kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
-Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
-dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw
-IFNHQzAeFw0wNTA2MDcwODA5MTBaFw0xOTA2MjQxOTA2MzBaMG8xCzAJBgNVBAYT
-AlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0
-ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB
-IFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC39xoz5vIABC05
-4E5b7R+8bA/Ntfojts7emxEzl6QpTH2Tn71KvJPtAxrjj8/lbVBa1pcplFqAsEl6
-2y6V/bjKvzc4LR4+kUGtcFbH8E8/6DKedMrIkFTpxl8PeJ2aQDwOrGGqXhSPnoeh
-alDc15pOrwWzpnGUnHGzUGAKxxOdOAeGAqjpqGkmGJCrTLBPI6s6T4TY386f4Wlv
-u9dC12tE5Met7m1BX3JacQg3s3llpFmglDf3AC8NwpJy2tA4ctsUqEXEXSp9t7TW
-xO6szRNEt8kr3UMAJfphuWlqWCMRt6czj1Z1WfXNKddGtworZbbTQm8Vsrh7++/p
-XVPVNFonAgMBAAGjgdgwgdUwHwYDVR0jBBgwFoAUUzLRs89/+uDxoF2FTpLSnkUd
-tE8wHQYDVR0OBBYEFK29mHo0tCb3+sQmVO8DveAky1QaMA4GA1UdDwEB/wQEAwIB
-BjAPBgNVHRMBAf8EBTADAQH/MBEGCWCGSAGG+EIBAQQEAwIBAjAgBgNVHSUEGTAX
-BgorBgEEAYI3CgMDBglghkgBhvhCBAEwPQYDVR0fBDYwNDAyoDCgLoYsaHR0cDov
-L2NybC51c2VydHJ1c3QuY29tL1VUTi1EQVRBQ29ycFNHQy5jcmwwDQYJKoZIhvcN
-AQEFBQADggEBAMbuUxdoFLJRIh6QWA2U/b3xcOWGLcM2MY9USEbnLQg3vGwKYOEO
-rVE04BKT6b64q7gmtOmWPSiPrmQH/uAB7MXjkesYoPF1ftsK5p+R26+udd8jkWjd
-FwBaS/9kbHDrARrQkNnHptZt9hPk/7XJ0h4qy7ElQyZ42TCbTg0evmnv3+r+LbPM
-+bDdtRTKkdSytaX7ARmjR3mfnYyVhzT4HziS2jamEfpr62vp3EV4FTkG101B5CHI
-3C+H0be/SGB1pWLLJN47YaApIKa+xWycxOkKaSLvkTr6Jq/RW0GnOuL4OAdCq8Fb
-+M5tug8EPzI0rNwEKNdwMBQmBsTkm5jVz3g=
------END CERTIFICATE-----
- 3 s:/C=US/ST=UT/L=Salt Lake City/O=The USERTRUST Network/OU=http://www.usertrust.com/CN=UTN - DATACorp SGC
-   i:/C=US/ST=UT/L=Salt Lake City/O=The USERTRUST Network/OU=http://www.usertrust.com/CN=UTN - DATACorp SGC
------BEGIN CERTIFICATE-----
-MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCB
-kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
-Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
-dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw
-IFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBaMIGTMQswCQYDVQQG
-EwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYD
-VQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cu
-dXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6
-E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZ
-D0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK
-4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykq
-lXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulW
-bfXv33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQAB
-o4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRT
-MtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3Js
-LnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUEIzAhBggr
-BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IB
-AQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft
-Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyj
-j98C5OBxOvG0I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVH
-KWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv
-2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3
-mfnGV/TJVTl4uix5yaaIK/QI
------END CERTIFICATE-----
diff --git a/lib/future/backports/test/ssl_cert.pem b/lib/future/backports/test/ssl_cert.pem
deleted file mode 100644
index 47a7d7e3..00000000
--- a/lib/future/backports/test/ssl_cert.pem
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICVDCCAb2gAwIBAgIJANfHOBkZr8JOMA0GCSqGSIb3DQEBBQUAMF8xCzAJBgNV
-BAYTAlhZMRcwFQYDVQQHEw5DYXN0bGUgQW50aHJheDEjMCEGA1UEChMaUHl0aG9u
-IFNvZnR3YXJlIEZvdW5kYXRpb24xEjAQBgNVBAMTCWxvY2FsaG9zdDAeFw0xMDEw
-MDgyMzAxNTZaFw0yMDEwMDUyMzAxNTZaMF8xCzAJBgNVBAYTAlhZMRcwFQYDVQQH
-Ew5DYXN0bGUgQW50aHJheDEjMCEGA1UEChMaUHl0aG9uIFNvZnR3YXJlIEZvdW5k
-YXRpb24xEjAQBgNVBAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
-gYkCgYEA21vT5isq7F68amYuuNpSFlKDPrMUCa4YWYqZRt2OZ+/3NKaZ2xAiSwr7
-6MrQF70t5nLbSPpqE5+5VrS58SY+g/sXLiFd6AplH1wJZwh78DofbFYXUggktFMt
-pTyiX8jtP66bkcPkDADA089RI1TQR6Ca+n7HFa7c1fabVV6i3zkCAwEAAaMYMBYw
-FAYDVR0RBA0wC4IJbG9jYWxob3N0MA0GCSqGSIb3DQEBBQUAA4GBAHPctQBEQ4wd
-BJ6+JcpIraopLn8BGhbjNWj40mmRqWB/NAWF6M5ne7KpGAu7tLeG4hb1zLaldK8G
-lxy2GPSRF6LFS48dpEj2HbMv2nvv6xxalDMJ9+DicWgAKTQ6bcX2j3GUkCR0g/T1
-CRlNBAAlvhKzO7Clpf9l0YKBEfraJByX
------END CERTIFICATE-----
diff --git a/lib/future/backports/test/ssl_key.passwd.pem b/lib/future/backports/test/ssl_key.passwd.pem
deleted file mode 100644
index 2524672e..00000000
--- a/lib/future/backports/test/ssl_key.passwd.pem
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,1A8D9D2A02EC698A
-
-kJYbfZ8L0sfe9Oty3gw0aloNnY5E8fegRfQLZlNoxTl6jNt0nIwI8kDJ36CZgR9c
-u3FDJm/KqrfUoz8vW+qEnWhSG7QPX2wWGPHd4K94Yz/FgrRzZ0DoK7XxXq9gOtVA
-AVGQhnz32p+6WhfGsCr9ArXEwRZrTk/FvzEPaU5fHcoSkrNVAGX8IpSVkSDwEDQr
-Gv17+cfk99UV1OCza6yKHoFkTtrC+PZU71LomBabivS2Oc4B9hYuSR2hF01wTHP+
-YlWNagZOOVtNz4oKK9x9eNQpmfQXQvPPTfusexKIbKfZrMvJoxcm1gfcZ0H/wK6P
-6wmXSG35qMOOztCZNtperjs1wzEBXznyK8QmLcAJBjkfarABJX9vBEzZV0OUKhy+
-noORFwHTllphbmydLhu6ehLUZMHPhzAS5UN7srtpSN81eerDMy0RMUAwA7/PofX1
-94Me85Q8jP0PC9ETdsJcPqLzAPETEYu0ELewKRcrdyWi+tlLFrpE5KT/s5ecbl9l
-7B61U4Kfd1PIXc/siINhU3A3bYK+845YyUArUOnKf1kEox7p1RpD7yFqVT04lRTo
-cibNKATBusXSuBrp2G6GNuhWEOSafWCKJQAzgCYIp6ZTV2khhMUGppc/2H3CF6cO
-zX0KtlPVZC7hLkB6HT8SxYUwF1zqWY7+/XPPdc37MeEZ87Q3UuZwqORLY+Z0hpgt
-L5JXBCoklZhCAaN2GqwFLXtGiRSRFGY7xXIhbDTlE65Wv1WGGgDLMKGE1gOz3yAo
-2jjG1+yAHJUdE69XTFHSqSkvaloA1W03LdMXZ9VuQJ/ySXCie6ABAQ==
------END RSA PRIVATE KEY-----
diff --git a/lib/future/backports/test/ssl_key.pem b/lib/future/backports/test/ssl_key.pem
deleted file mode 100644
index 3fd3bbd5..00000000
--- a/lib/future/backports/test/ssl_key.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBANtb0+YrKuxevGpm
-LrjaUhZSgz6zFAmuGFmKmUbdjmfv9zSmmdsQIksK++jK0Be9LeZy20j6ahOfuVa0
-ufEmPoP7Fy4hXegKZR9cCWcIe/A6H2xWF1IIJLRTLaU8ol/I7T+um5HD5AwAwNPP
-USNU0Eegmvp+xxWu3NX2m1Veot85AgMBAAECgYA3ZdZ673X0oexFlq7AAmrutkHt
-CL7LvwrpOiaBjhyTxTeSNWzvtQBkIU8DOI0bIazA4UreAFffwtvEuPmonDb3F+Iq
-SMAu42XcGyVZEl+gHlTPU9XRX7nTOXVt+MlRRRxL6t9GkGfUAXI3XxJDXW3c0vBK
-UL9xqD8cORXOfE06rQJBAP8mEX1ERkR64Ptsoe4281vjTlNfIbs7NMPkUnrn9N/Y
-BLhjNIfQ3HFZG8BTMLfX7kCS9D593DW5tV4Z9BP/c6cCQQDcFzCcVArNh2JSywOQ
-ZfTfRbJg/Z5Lt9Fkngv1meeGNPgIMLN8Sg679pAOOWmzdMO3V706rNPzSVMME7E5
-oPIfAkEA8pDddarP5tCvTTgUpmTFbakm0KoTZm2+FzHcnA4jRh+XNTjTOv98Y6Ik
-eO5d1ZnKXseWvkZncQgxfdnMqqpj5wJAcNq/RVne1DbYlwWchT2Si65MYmmJ8t+F
-0mcsULqjOnEMwf5e+ptq5LzwbyrHZYq5FNk7ocufPv/ZQrcSSC+cFwJBAKvOJByS
-x56qyGeZLOQlWS2JS3KJo59XuLFGqcbgN9Om9xFa41Yb4N9NvplFivsvZdw3m1Q/
-SPIXQuT8RMPDVNQ=
------END PRIVATE KEY-----
diff --git a/lib/future/backports/test/ssl_servers.py b/lib/future/backports/test/ssl_servers.py
deleted file mode 100644
index 87a3fb85..00000000
--- a/lib/future/backports/test/ssl_servers.py
+++ /dev/null
@@ -1,207 +0,0 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-from future.builtins import filter, str
-from future import utils
-import os
-import sys
-import ssl
-import pprint
-import socket
-from future.backports.urllib import parse as urllib_parse
-from future.backports.http.server import (HTTPServer as _HTTPServer,
-    SimpleHTTPRequestHandler, BaseHTTPRequestHandler)
-from future.backports.test import support
-threading = support.import_module("threading")
-
-here = os.path.dirname(__file__)
-
-HOST = support.HOST
-CERTFILE = os.path.join(here, 'keycert.pem')
-
-# This one's based on HTTPServer, which is based on SocketServer
-
-class HTTPSServer(_HTTPServer):
-
-    def __init__(self, server_address, handler_class, context):
-        _HTTPServer.__init__(self, server_address, handler_class)
-        self.context = context
-
-    def __str__(self):
-        return ('<%s %s:%s>' %
-                (self.__class__.__name__,
-                 self.server_name,
-                 self.server_port))
-
-    def get_request(self):
-        # override this to wrap socket with SSL
-        try:
-            sock, addr = self.socket.accept()
-            sslconn = self.context.wrap_socket(sock, server_side=True)
-        except socket.error as e:
-            # socket errors are silenced by the caller, print them here
-            if support.verbose:
-                sys.stderr.write("Got an error:\n%s\n" % e)
-            raise
-        return sslconn, addr
-
-class RootedHTTPRequestHandler(SimpleHTTPRequestHandler):
-    # need to override translate_path to get a known root,
-    # instead of using os.curdir, since the test could be
-    # run from anywhere
-
-    server_version = "TestHTTPS/1.0"
-    root = here
-    # Avoid hanging when a request gets interrupted by the client
-    timeout = 5
-
-    def translate_path(self, path):
-        """Translate a /-separated PATH to the local filename syntax.
-
-        Components that mean special things to the local file system
-        (e.g. drive or directory names) are ignored.  (XXX They should
-        probably be diagnosed.)
-
-        """
-        # abandon query parameters
-        path = urllib.parse.urlparse(path)[2]
-        path = os.path.normpath(urllib.parse.unquote(path))
-        words = path.split('/')
-        words = filter(None, words)
-        path = self.root
-        for word in words:
-            drive, word = os.path.splitdrive(word)
-            head, word = os.path.split(word)
-            path = os.path.join(path, word)
-        return path
-
-    def log_message(self, format, *args):
-        # we override this to suppress logging unless "verbose"
-        if support.verbose:
-            sys.stdout.write(" server (%s:%d %s):\n   [%s] %s\n" %
-                             (self.server.server_address,
-                              self.server.server_port,
-                              self.request.cipher(),
-                              self.log_date_time_string(),
-                              format%args))
-
-
-class StatsRequestHandler(BaseHTTPRequestHandler):
-    """Example HTTP request handler which returns SSL statistics on GET
-    requests.
-    """
-
-    server_version = "StatsHTTPS/1.0"
-
-    def do_GET(self, send_body=True):
-        """Serve a GET request."""
-        sock = self.rfile.raw._sock
-        context = sock.context
-        stats = {
-            'session_cache': context.session_stats(),
-            'cipher': sock.cipher(),
-            'compression': sock.compression(),
-            }
-        body = pprint.pformat(stats)
-        body = body.encode('utf-8')
-        self.send_response(200)
-        self.send_header("Content-type", "text/plain; charset=utf-8")
-        self.send_header("Content-Length", str(len(body)))
-        self.end_headers()
-        if send_body:
-            self.wfile.write(body)
-
-    def do_HEAD(self):
-        """Serve a HEAD request."""
-        self.do_GET(send_body=False)
-
-    def log_request(self, format, *args):
-        if support.verbose:
-            BaseHTTPRequestHandler.log_request(self, format, *args)
-
-
-class HTTPSServerThread(threading.Thread):
-
-    def __init__(self, context, host=HOST, handler_class=None):
-        self.flag = None
-        self.server = HTTPSServer((host, 0),
-                                  handler_class or RootedHTTPRequestHandler,
-                                  context)
-        self.port = self.server.server_port
-        threading.Thread.__init__(self)
-        self.daemon = True
-
-    def __str__(self):
-        return "<%s %s>" % (self.__class__.__name__, self.server)
-
-    def start(self, flag=None):
-        self.flag = flag
-        threading.Thread.start(self)
-
-    def run(self):
-        if self.flag:
-            self.flag.set()
-        try:
-            self.server.serve_forever(0.05)
-        finally:
-            self.server.server_close()
-
-    def stop(self):
-        self.server.shutdown()
-
-
-def make_https_server(case, certfile=CERTFILE, host=HOST, handler_class=None):
-    # we assume the certfile contains both private key and certificate
-    context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
-    context.load_cert_chain(certfile)
-    server = HTTPSServerThread(context, host, handler_class)
-    flag = threading.Event()
-    server.start(flag)
-    flag.wait()
-    def cleanup():
-        if support.verbose:
-            sys.stdout.write('stopping HTTPS server\n')
-        server.stop()
-        if support.verbose:
-            sys.stdout.write('joining HTTPS thread\n')
-        server.join()
-    case.addCleanup(cleanup)
-    return server
-
-
-if __name__ == "__main__":
-    import argparse
-    parser = argparse.ArgumentParser(
-        description='Run a test HTTPS server. '
-                    'By default, the current directory is served.')
-    parser.add_argument('-p', '--port', type=int, default=4433,
-                        help='port to listen on (default: %(default)s)')
-    parser.add_argument('-q', '--quiet', dest='verbose', default=True,
-                        action='store_false', help='be less verbose')
-    parser.add_argument('-s', '--stats', dest='use_stats_handler', default=False,
-                        action='store_true', help='always return stats page')
-    parser.add_argument('--curve-name', dest='curve_name', type=str,
-                        action='store',
-                        help='curve name for EC-based Diffie-Hellman')
-    parser.add_argument('--dh', dest='dh_file', type=str, action='store',
-                        help='PEM file containing DH parameters')
-    args = parser.parse_args()
-
-    support.verbose = args.verbose
-    if args.use_stats_handler:
-        handler_class = StatsRequestHandler
-    else:
-        handler_class = RootedHTTPRequestHandler
-        if utils.PY2:
-            handler_class.root = os.getcwdu()
-        else:
-            handler_class.root = os.getcwd()
-    context = ssl.SSLContext(ssl.PROTOCOL_TLSv1)
-    context.load_cert_chain(CERTFILE)
-    if args.curve_name:
-        context.set_ecdh_curve(args.curve_name)
-    if args.dh_file:
-        context.load_dh_params(args.dh_file)
-
-    server = HTTPSServer(("", args.port), handler_class, context)
-    if args.verbose:
-        print("Listening on https://localhost:{0.port}".format(args))
-    server.serve_forever(0.1)
diff --git a/lib/future/backports/test/support.py b/lib/future/backports/test/support.py
deleted file mode 100644
index 6639372b..00000000
--- a/lib/future/backports/test/support.py
+++ /dev/null
@@ -1,2016 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Supporting definitions for the Python regression tests.
-
-Backported for python-future from Python 3.3 test/support.py.
-"""
-
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-from future import utils
-from future.builtins import str, range, open, int, map, list
-
-import contextlib
-import errno
-import functools
-import gc
-import socket
-import sys
-import os
-import platform
-import shutil
-import warnings
-import unittest
-# For Python 2.6 compatibility:
-if not hasattr(unittest, 'skip'):
-    import unittest2 as unittest
-
-import importlib
-# import collections.abc    # not present on Py2.7
-import re
-import subprocess
-import time
-try:
-    import sysconfig
-except ImportError:
-    # sysconfig is not available on Python 2.6. Try using distutils.sysconfig instead:
-    from distutils import sysconfig
-import fnmatch
-import logging.handlers
-import struct
-import tempfile
-
-try:
-    if utils.PY3:
-        import _thread, threading
-    else:
-        import thread as _thread, threading
-except ImportError:
-    _thread = None
-    threading = None
-try:
-    import multiprocessing.process
-except ImportError:
-    multiprocessing = None
-
-try:
-    import zlib
-except ImportError:
-    zlib = None
-
-try:
-    import gzip
-except ImportError:
-    gzip = None
-
-try:
-    import bz2
-except ImportError:
-    bz2 = None
-
-try:
-    import lzma
-except ImportError:
-    lzma = None
-
-__all__ = [
-    "Error", "TestFailed", "ResourceDenied", "import_module", "verbose",
-    "use_resources", "max_memuse", "record_original_stdout",
-    "get_original_stdout", "unload", "unlink", "rmtree", "forget",
-    "is_resource_enabled", "requires", "requires_freebsd_version",
-    "requires_linux_version", "requires_mac_ver", "find_unused_port",
-    "bind_port", "IPV6_ENABLED", "is_jython", "TESTFN", "HOST", "SAVEDCWD",
-    "temp_cwd", "findfile", "create_empty_file", "sortdict",
-    "check_syntax_error", "open_urlresource", "check_warnings", "CleanImport",
-    "EnvironmentVarGuard", "TransientResource", "captured_stdout",
-    "captured_stdin", "captured_stderr", "time_out", "socket_peer_reset",
-    "ioerror_peer_reset", "run_with_locale", 'temp_umask',
-    "transient_internet", "set_memlimit", "bigmemtest", "bigaddrspacetest",
-    "BasicTestRunner", "run_unittest", "run_doctest", "threading_setup",
-    "threading_cleanup", "reap_children", "cpython_only", "check_impl_detail",
-    "get_attribute", "swap_item", "swap_attr", "requires_IEEE_754",
-    "TestHandler", "Matcher", "can_symlink", "skip_unless_symlink",
-    "skip_unless_xattr", "import_fresh_module", "requires_zlib",
-    "PIPE_MAX_SIZE", "failfast", "anticipate_failure", "run_with_tz",
-    "requires_gzip", "requires_bz2", "requires_lzma", "suppress_crash_popup",
-    ]
-
-class Error(Exception):
-    """Base class for regression test exceptions."""
-
-class TestFailed(Error):
-    """Test failed."""
-
-class ResourceDenied(unittest.SkipTest):
-    """Test skipped because it requested a disallowed resource.
-
-    This is raised when a test calls requires() for a resource that
-    has not be enabled.  It is used to distinguish between expected
-    and unexpected skips.
-    """
-
-@contextlib.contextmanager
-def _ignore_deprecated_imports(ignore=True):
-    """Context manager to suppress package and module deprecation
-    warnings when importing them.
-
-    If ignore is False, this context manager has no effect."""
-    if ignore:
-        with warnings.catch_warnings():
-            warnings.filterwarnings("ignore", ".+ (module|package)",
-                                    DeprecationWarning)
-            yield
-    else:
-        yield
-
-
-def import_module(name, deprecated=False):
-    """Import and return the module to be tested, raising SkipTest if
-    it is not available.
-
-    If deprecated is True, any module or package deprecation messages
-    will be suppressed."""
-    with _ignore_deprecated_imports(deprecated):
-        try:
-            return importlib.import_module(name)
-        except ImportError as msg:
-            raise unittest.SkipTest(str(msg))
-
-
-def _save_and_remove_module(name, orig_modules):
-    """Helper function to save and remove a module from sys.modules
-
-    Raise ImportError if the module can't be imported.
-    """
-    # try to import the module and raise an error if it can't be imported
-    if name not in sys.modules:
-        __import__(name)
-        del sys.modules[name]
-    for modname in list(sys.modules):
-        if modname == name or modname.startswith(name + '.'):
-            orig_modules[modname] = sys.modules[modname]
-            del sys.modules[modname]
-
-def _save_and_block_module(name, orig_modules):
-    """Helper function to save and block a module in sys.modules
-
-    Return True if the module was in sys.modules, False otherwise.
-    """
-    saved = True
-    try:
-        orig_modules[name] = sys.modules[name]
-    except KeyError:
-        saved = False
-    sys.modules[name] = None
-    return saved
-
-
-def anticipate_failure(condition):
-    """Decorator to mark a test that is known to be broken in some cases
-
-       Any use of this decorator should have a comment identifying the
-       associated tracker issue.
-    """
-    if condition:
-        return unittest.expectedFailure
-    return lambda f: f
-
-
-def import_fresh_module(name, fresh=(), blocked=(), deprecated=False):
-    """Import and return a module, deliberately bypassing sys.modules.
-    This function imports and returns a fresh copy of the named Python module
-    by removing the named module from sys.modules before doing the import.
-    Note that unlike reload, the original module is not affected by
-    this operation.
-
-    *fresh* is an iterable of additional module names that are also removed
-    from the sys.modules cache before doing the import.
-
-    *blocked* is an iterable of module names that are replaced with None
-    in the module cache during the import to ensure that attempts to import
-    them raise ImportError.
-
-    The named module and any modules named in the *fresh* and *blocked*
-    parameters are saved before starting the import and then reinserted into
-    sys.modules when the fresh import is complete.
-
-    Module and package deprecation messages are suppressed during this import
-    if *deprecated* is True.
-
-    This function will raise ImportError if the named module cannot be
-    imported.
-
-    If deprecated is True, any module or package deprecation messages
-    will be suppressed.
-    """
-    # NOTE: test_heapq, test_json and test_warnings include extra sanity checks
-    # to make sure that this utility function is working as expected
-    with _ignore_deprecated_imports(deprecated):
-        # Keep track of modules saved for later restoration as well
-        # as those which just need a blocking entry removed
-        orig_modules = {}
-        names_to_remove = []
-        _save_and_remove_module(name, orig_modules)
-        try:
-            for fresh_name in fresh:
-                _save_and_remove_module(fresh_name, orig_modules)
-            for blocked_name in blocked:
-                if not _save_and_block_module(blocked_name, orig_modules):
-                    names_to_remove.append(blocked_name)
-            fresh_module = importlib.import_module(name)
-        except ImportError:
-            fresh_module = None
-        finally:
-            for orig_name, module in orig_modules.items():
-                sys.modules[orig_name] = module
-            for name_to_remove in names_to_remove:
-                del sys.modules[name_to_remove]
-        return fresh_module
-
-
-def get_attribute(obj, name):
-    """Get an attribute, raising SkipTest if AttributeError is raised."""
-    try:
-        attribute = getattr(obj, name)
-    except AttributeError:
-        raise unittest.SkipTest("object %r has no attribute %r" % (obj, name))
-    else:
-        return attribute
-
-verbose = 1              # Flag set to 0 by regrtest.py
-use_resources = None     # Flag set to [] by regrtest.py
-max_memuse = 0           # Disable bigmem tests (they will still be run with
-                         # small sizes, to make sure they work.)
-real_max_memuse = 0
-failfast = False
-match_tests = None
-
-# _original_stdout is meant to hold stdout at the time regrtest began.
-# This may be "the real" stdout, or IDLE's emulation of stdout, or whatever.
-# The point is to have some flavor of stdout the user can actually see.
-_original_stdout = None
-def record_original_stdout(stdout):
-    global _original_stdout
-    _original_stdout = stdout
-
-def get_original_stdout():
-    return _original_stdout or sys.stdout
-
-def unload(name):
-    try:
-        del sys.modules[name]
-    except KeyError:
-        pass
-
-if sys.platform.startswith("win"):
-    def _waitfor(func, pathname, waitall=False):
-        # Perform the operation
-        func(pathname)
-        # Now setup the wait loop
-        if waitall:
-            dirname = pathname
-        else:
-            dirname, name = os.path.split(pathname)
-            dirname = dirname or '.'
-        # Check for `pathname` to be removed from the filesystem.
-        # The exponential backoff of the timeout amounts to a total
-        # of ~1 second after which the deletion is probably an error
-        # anyway.
-        # Testing on a i7@4.3GHz shows that usually only 1 iteration is
-        # required when contention occurs.
-        timeout = 0.001
-        while timeout < 1.0:
-            # Note we are only testing for the existence of the file(s) in
-            # the contents of the directory regardless of any security or
-            # access rights.  If we have made it this far, we have sufficient
-            # permissions to do that much using Python's equivalent of the
-            # Windows API FindFirstFile.
-            # Other Windows APIs can fail or give incorrect results when
-            # dealing with files that are pending deletion.
-            L = os.listdir(dirname)
-            if not (L if waitall else name in L):
-                return
-            # Increase the timeout and try again
-            time.sleep(timeout)
-            timeout *= 2
-        warnings.warn('tests may fail, delete still pending for ' + pathname,
-                      RuntimeWarning, stacklevel=4)
-
-    def _unlink(filename):
-        _waitfor(os.unlink, filename)
-
-    def _rmdir(dirname):
-        _waitfor(os.rmdir, dirname)
-
-    def _rmtree(path):
-        def _rmtree_inner(path):
-            for name in os.listdir(path):
-                fullname = os.path.join(path, name)
-                if os.path.isdir(fullname):
-                    _waitfor(_rmtree_inner, fullname, waitall=True)
-                    os.rmdir(fullname)
-                else:
-                    os.unlink(fullname)
-        _waitfor(_rmtree_inner, path, waitall=True)
-        _waitfor(os.rmdir, path)
-else:
-    _unlink = os.unlink
-    _rmdir = os.rmdir
-    _rmtree = shutil.rmtree
-
-def unlink(filename):
-    try:
-        _unlink(filename)
-    except OSError as error:
-        # The filename need not exist.
-        if error.errno not in (errno.ENOENT, errno.ENOTDIR):
-            raise
-
-def rmdir(dirname):
-    try:
-        _rmdir(dirname)
-    except OSError as error:
-        # The directory need not exist.
-        if error.errno != errno.ENOENT:
-            raise
-
-def rmtree(path):
-    try:
-        _rmtree(path)
-    except OSError as error:
-        if error.errno != errno.ENOENT:
-            raise
-
-
-# On some platforms, should not run gui test even if it is allowed
-# in `use_resources'.
-if sys.platform.startswith('win'):
-    import ctypes
-    import ctypes.wintypes
-    def _is_gui_available():
-        UOI_FLAGS = 1
-        WSF_VISIBLE = 0x0001
-        class USEROBJECTFLAGS(ctypes.Structure):
-            _fields_ = [("fInherit", ctypes.wintypes.BOOL),
-                        ("fReserved", ctypes.wintypes.BOOL),
-                        ("dwFlags", ctypes.wintypes.DWORD)]
-        dll = ctypes.windll.user32
-        h = dll.GetProcessWindowStation()
-        if not h:
-            raise ctypes.WinError()
-        uof = USEROBJECTFLAGS()
-        needed = ctypes.wintypes.DWORD()
-        res = dll.GetUserObjectInformationW(h,
-            UOI_FLAGS,
-            ctypes.byref(uof),
-            ctypes.sizeof(uof),
-            ctypes.byref(needed))
-        if not res:
-            raise ctypes.WinError()
-        return bool(uof.dwFlags & WSF_VISIBLE)
-else:
-    def _is_gui_available():
-        return True
-
-def is_resource_enabled(resource):
-    """Test whether a resource is enabled.  Known resources are set by
-    regrtest.py."""
-    return use_resources is not None and resource in use_resources
-
-def requires(resource, msg=None):
-    """Raise ResourceDenied if the specified resource is not available.
-
-    If the caller's module is __main__ then automatically return True.  The
-    possibility of False being returned occurs when regrtest.py is
-    executing.
-    """
-    if resource == 'gui' and not _is_gui_available():
-        raise unittest.SkipTest("Cannot use the 'gui' resource")
-    # see if the caller's module is __main__ - if so, treat as if
-    # the resource was set
-    if sys._getframe(1).f_globals.get("__name__") == "__main__":
-        return
-    if not is_resource_enabled(resource):
-        if msg is None:
-            msg = "Use of the %r resource not enabled" % resource
-        raise ResourceDenied(msg)
-
-def _requires_unix_version(sysname, min_version):
-    """Decorator raising SkipTest if the OS is `sysname` and the version is less
-    than `min_version`.
-
-    For example, @_requires_unix_version('FreeBSD', (7, 2)) raises SkipTest if
-    the FreeBSD version is less than 7.2.
-    """
-    def decorator(func):
-        @functools.wraps(func)
-        def wrapper(*args, **kw):
-            if platform.system() == sysname:
-                version_txt = platform.release().split('-', 1)[0]
-                try:
-                    version = tuple(map(int, version_txt.split('.')))
-                except ValueError:
-                    pass
-                else:
-                    if version < min_version:
-                        min_version_txt = '.'.join(map(str, min_version))
-                        raise unittest.SkipTest(
-                            "%s version %s or higher required, not %s"
-                            % (sysname, min_version_txt, version_txt))
-            return func(*args, **kw)
-        wrapper.min_version = min_version
-        return wrapper
-    return decorator
-
-def requires_freebsd_version(*min_version):
-    """Decorator raising SkipTest if the OS is FreeBSD and the FreeBSD version is
-    less than `min_version`.
-
-    For example, @requires_freebsd_version(7, 2) raises SkipTest if the FreeBSD
-    version is less than 7.2.
-    """
-    return _requires_unix_version('FreeBSD', min_version)
-
-def requires_linux_version(*min_version):
-    """Decorator raising SkipTest if the OS is Linux and the Linux version is
-    less than `min_version`.
-
-    For example, @requires_linux_version(2, 6, 32) raises SkipTest if the Linux
-    version is less than 2.6.32.
-    """
-    return _requires_unix_version('Linux', min_version)
-
-def requires_mac_ver(*min_version):
-    """Decorator raising SkipTest if the OS is Mac OS X and the OS X
-    version if less than min_version.
-
-    For example, @requires_mac_ver(10, 5) raises SkipTest if the OS X version
-    is lesser than 10.5.
-    """
-    def decorator(func):
-        @functools.wraps(func)
-        def wrapper(*args, **kw):
-            if sys.platform == 'darwin':
-                version_txt = platform.mac_ver()[0]
-                try:
-                    version = tuple(map(int, version_txt.split('.')))
-                except ValueError:
-                    pass
-                else:
-                    if version < min_version:
-                        min_version_txt = '.'.join(map(str, min_version))
-                        raise unittest.SkipTest(
-                            "Mac OS X %s or higher required, not %s"
-                            % (min_version_txt, version_txt))
-            return func(*args, **kw)
-        wrapper.min_version = min_version
-        return wrapper
-    return decorator
-
-# Don't use "localhost", since resolving it uses the DNS under recent
-# Windows versions (see issue #18792).
-HOST = "127.0.0.1"
-HOSTv6 = "::1"
-
-
-def find_unused_port(family=socket.AF_INET, socktype=socket.SOCK_STREAM):
-    """Returns an unused port that should be suitable for binding.  This is
-    achieved by creating a temporary socket with the same family and type as
-    the 'sock' parameter (default is AF_INET, SOCK_STREAM), and binding it to
-    the specified host address (defaults to 0.0.0.0) with the port set to 0,
-    eliciting an unused ephemeral port from the OS.  The temporary socket is
-    then closed and deleted, and the ephemeral port is returned.
-
-    Either this method or bind_port() should be used for any tests where a
-    server socket needs to be bound to a particular port for the duration of
-    the test.  Which one to use depends on whether the calling code is creating
-    a python socket, or if an unused port needs to be provided in a constructor
-    or passed to an external program (i.e. the -accept argument to openssl's
-    s_server mode).  Always prefer bind_port() over find_unused_port() where
-    possible.  Hard coded ports should *NEVER* be used.  As soon as a server
-    socket is bound to a hard coded port, the ability to run multiple instances
-    of the test simultaneously on the same host is compromised, which makes the
-    test a ticking time bomb in a buildbot environment. On Unix buildbots, this
-    may simply manifest as a failed test, which can be recovered from without
-    intervention in most cases, but on Windows, the entire python process can
-    completely and utterly wedge, requiring someone to log in to the buildbot
-    and manually kill the affected process.
-
-    (This is easy to reproduce on Windows, unfortunately, and can be traced to
-    the SO_REUSEADDR socket option having different semantics on Windows versus
-    Unix/Linux.  On Unix, you can't have two AF_INET SOCK_STREAM sockets bind,
-    listen and then accept connections on identical host/ports.  An EADDRINUSE
-    socket.error will be raised at some point (depending on the platform and
-    the order bind and listen were called on each socket).
-
-    However, on Windows, if SO_REUSEADDR is set on the sockets, no EADDRINUSE
-    will ever be raised when attempting to bind two identical host/ports. When
-    accept() is called on each socket, the second caller's process will steal
-    the port from the first caller, leaving them both in an awkwardly wedged
-    state where they'll no longer respond to any signals or graceful kills, and
-    must be forcibly killed via OpenProcess()/TerminateProcess().
-
-    The solution on Windows is to use the SO_EXCLUSIVEADDRUSE socket option
-    instead of SO_REUSEADDR, which effectively affords the same semantics as
-    SO_REUSEADDR on Unix.  Given the propensity of Unix developers in the Open
-    Source world compared to Windows ones, this is a common mistake.  A quick
-    look over OpenSSL's 0.9.8g source shows that they use SO_REUSEADDR when
-    openssl.exe is called with the 's_server' option, for example. See
-    http://bugs.python.org/issue2550 for more info.  The following site also
-    has a very thorough description about the implications of both REUSEADDR
-    and EXCLUSIVEADDRUSE on Windows:
-    http://msdn2.microsoft.com/en-us/library/ms740621(VS.85).aspx)
-
-    XXX: although this approach is a vast improvement on previous attempts to
-    elicit unused ports, it rests heavily on the assumption that the ephemeral
-    port returned to us by the OS won't immediately be dished back out to some
-    other process when we close and delete our temporary socket but before our
-    calling code has a chance to bind the returned port.  We can deal with this
-    issue if/when we come across it.
-    """
-
-    tempsock = socket.socket(family, socktype)
-    port = bind_port(tempsock)
-    tempsock.close()
-    del tempsock
-    return port
-
-def bind_port(sock, host=HOST):
-    """Bind the socket to a free port and return the port number.  Relies on
-    ephemeral ports in order to ensure we are using an unbound port.  This is
-    important as many tests may be running simultaneously, especially in a
-    buildbot environment.  This method raises an exception if the sock.family
-    is AF_INET and sock.type is SOCK_STREAM, *and* the socket has SO_REUSEADDR
-    or SO_REUSEPORT set on it.  Tests should *never* set these socket options
-    for TCP/IP sockets.  The only case for setting these options is testing
-    multicasting via multiple UDP sockets.
-
-    Additionally, if the SO_EXCLUSIVEADDRUSE socket option is available (i.e.
-    on Windows), it will be set on the socket.  This will prevent anyone else
-    from bind()'ing to our host/port for the duration of the test.
-    """
-
-    if sock.family == socket.AF_INET and sock.type == socket.SOCK_STREAM:
-        if hasattr(socket, 'SO_REUSEADDR'):
-            if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR) == 1:
-                raise TestFailed("tests should never set the SO_REUSEADDR "   \
-                                 "socket option on TCP/IP sockets!")
-        if hasattr(socket, 'SO_REUSEPORT'):
-            try:
-                if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT) == 1:
-                    raise TestFailed("tests should never set the SO_REUSEPORT "   \
-                                     "socket option on TCP/IP sockets!")
-            except socket.error:
-                # Python's socket module was compiled using modern headers
-                # thus defining SO_REUSEPORT but this process is running
-                # under an older kernel that does not support SO_REUSEPORT.
-                pass
-        if hasattr(socket, 'SO_EXCLUSIVEADDRUSE'):
-            sock.setsockopt(socket.SOL_SOCKET, socket.SO_EXCLUSIVEADDRUSE, 1)
-
-    sock.bind((host, 0))
-    port = sock.getsockname()[1]
-    return port
-
-def _is_ipv6_enabled():
-    """Check whether IPv6 is enabled on this host."""
-    if socket.has_ipv6:
-        sock = None
-        try:
-            sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
-            sock.bind(('::1', 0))
-            return True
-        except (socket.error, socket.gaierror):
-            pass
-        finally:
-            if sock:
-                sock.close()
-    return False
-
-IPV6_ENABLED = _is_ipv6_enabled()
-
-
-# A constant likely larger than the underlying OS pipe buffer size, to
-# make writes blocking.
-# Windows limit seems to be around 512 B, and many Unix kernels have a
-# 64 KiB pipe buffer size or 16 * PAGE_SIZE: take a few megs to be sure.
-# (see issue #17835 for a discussion of this number).
-PIPE_MAX_SIZE = 4 * 1024 * 1024 + 1
-
-# A constant likely larger than the underlying OS socket buffer size, to make
-# writes blocking.
-# The socket buffer sizes can usually be tuned system-wide (e.g. through sysctl
-# on Linux), or on a per-socket basis (SO_SNDBUF/SO_RCVBUF). See issue #18643
-# for a discussion of this number).
-SOCK_MAX_SIZE = 16 * 1024 * 1024 + 1
-
-# # decorator for skipping tests on non-IEEE 754 platforms
-# requires_IEEE_754 = unittest.skipUnless(
-#     float.__getformat__("double").startswith("IEEE"),
-#     "test requires IEEE 754 doubles")
-
-requires_zlib = unittest.skipUnless(zlib, 'requires zlib')
-
-requires_bz2 = unittest.skipUnless(bz2, 'requires bz2')
-
-requires_lzma = unittest.skipUnless(lzma, 'requires lzma')
-
-is_jython = sys.platform.startswith('java')
-
-# Filename used for testing
-if os.name == 'java':
-    # Jython disallows @ in module names
-    TESTFN = '$test'
-else:
-    TESTFN = '@test'
-
-# Disambiguate TESTFN for parallel testing, while letting it remain a valid
-# module name.
-TESTFN = "{0}_{1}_tmp".format(TESTFN, os.getpid())
-
-# # FS_NONASCII: non-ASCII character encodable by os.fsencode(),
-# # or None if there is no such character.
-# FS_NONASCII = None
-# for character in (
-#     # First try printable and common characters to have a readable filename.
-#     # For each character, the encoding list are just example of encodings able
-#     # to encode the character (the list is not exhaustive).
-#
-#     # U+00E6 (Latin Small Letter Ae): cp1252, iso-8859-1
-#     '\u00E6',
-#     # U+0130 (Latin Capital Letter I With Dot Above): cp1254, iso8859_3
-#     '\u0130',
-#     # U+0141 (Latin Capital Letter L With Stroke): cp1250, cp1257
-#     '\u0141',
-#     # U+03C6 (Greek Small Letter Phi): cp1253
-#     '\u03C6',
-#     # U+041A (Cyrillic Capital Letter Ka): cp1251
-#     '\u041A',
-#     # U+05D0 (Hebrew Letter Alef): Encodable to cp424
-#     '\u05D0',
-#     # U+060C (Arabic Comma): cp864, cp1006, iso8859_6, mac_arabic
-#     '\u060C',
-#     # U+062A (Arabic Letter Teh): cp720
-#     '\u062A',
-#     # U+0E01 (Thai Character Ko Kai): cp874
-#     '\u0E01',
-#
-#     # Then try more "special" characters. "special" because they may be
-#     # interpreted or displayed differently depending on the exact locale
-#     # encoding and the font.
-#
-#     # U+00A0 (No-Break Space)
-#     '\u00A0',
-#     # U+20AC (Euro Sign)
-#     '\u20AC',
-# ):
-#     try:
-#         os.fsdecode(os.fsencode(character))
-#     except UnicodeError:
-#         pass
-#     else:
-#         FS_NONASCII = character
-#         break
-#
-# # TESTFN_UNICODE is a non-ascii filename
-# TESTFN_UNICODE = TESTFN + "-\xe0\xf2\u0258\u0141\u011f"
-# if sys.platform == 'darwin':
-#     # In Mac OS X's VFS API file names are, by definition, canonically
-#     # decomposed Unicode, encoded using UTF-8. See QA1173:
-#     # http://developer.apple.com/mac/library/qa/qa2001/qa1173.html
-#     import unicodedata
-#     TESTFN_UNICODE = unicodedata.normalize('NFD', TESTFN_UNICODE)
-# TESTFN_ENCODING = sys.getfilesystemencoding()
-#
-# # TESTFN_UNENCODABLE is a filename (str type) that should *not* be able to be
-# # encoded by the filesystem encoding (in strict mode). It can be None if we
-# # cannot generate such filename.
-# TESTFN_UNENCODABLE = None
-# if os.name in ('nt', 'ce'):
-#     # skip win32s (0) or Windows 9x/ME (1)
-#     if sys.getwindowsversion().platform >= 2:
-#         # Different kinds of characters from various languages to minimize the
-#         # probability that the whole name is encodable to MBCS (issue #9819)
-#         TESTFN_UNENCODABLE = TESTFN + "-\u5171\u0141\u2661\u0363\uDC80"
-#         try:
-#             TESTFN_UNENCODABLE.encode(TESTFN_ENCODING)
-#         except UnicodeEncodeError:
-#             pass
-#         else:
-#             print('WARNING: The filename %r CAN be encoded by the filesystem encoding (%s). '
-#                   'Unicode filename tests may not be effective'
-#                   % (TESTFN_UNENCODABLE, TESTFN_ENCODING))
-#             TESTFN_UNENCODABLE = None
-# # Mac OS X denies unencodable filenames (invalid utf-8)
-# elif sys.platform != 'darwin':
-#     try:
-#         # ascii and utf-8 cannot encode the byte 0xff
-#         b'\xff'.decode(TESTFN_ENCODING)
-#     except UnicodeDecodeError:
-#         # 0xff will be encoded using the surrogate character u+DCFF
-#         TESTFN_UNENCODABLE = TESTFN \
-#             + b'-\xff'.decode(TESTFN_ENCODING, 'surrogateescape')
-#     else:
-#         # File system encoding (eg. ISO-8859-* encodings) can encode
-#         # the byte 0xff. Skip some unicode filename tests.
-#         pass
-#
-# # TESTFN_UNDECODABLE is a filename (bytes type) that should *not* be able to be
-# # decoded from the filesystem encoding (in strict mode). It can be None if we
-# # cannot generate such filename (ex: the latin1 encoding can decode any byte
-# # sequence). On UNIX, TESTFN_UNDECODABLE can be decoded by os.fsdecode() thanks
-# # to the surrogateescape error handler (PEP 383), but not from the filesystem
-# # encoding in strict mode.
-# TESTFN_UNDECODABLE = None
-# for name in (
-#     # b'\xff' is not decodable by os.fsdecode() with code page 932. Windows
-#     # accepts it to create a file or a directory, or don't accept to enter to
-#     # such directory (when the bytes name is used). So test b'\xe7' first: it is
-#     # not decodable from cp932.
-#     b'\xe7w\xf0',
-#     # undecodable from ASCII, UTF-8
-#     b'\xff',
-#     # undecodable from iso8859-3, iso8859-6, iso8859-7, cp424, iso8859-8, cp856
-#     # and cp857
-#     b'\xae\xd5'
-#     # undecodable from UTF-8 (UNIX and Mac OS X)
-#     b'\xed\xb2\x80', b'\xed\xb4\x80',
-#     # undecodable from shift_jis, cp869, cp874, cp932, cp1250, cp1251, cp1252,
-#     # cp1253, cp1254, cp1255, cp1257, cp1258
-#     b'\x81\x98',
-# ):
-#     try:
-#         name.decode(TESTFN_ENCODING)
-#     except UnicodeDecodeError:
-#         TESTFN_UNDECODABLE = os.fsencode(TESTFN) + name
-#         break
-#
-# if FS_NONASCII:
-#     TESTFN_NONASCII = TESTFN + '-' + FS_NONASCII
-# else:
-#     TESTFN_NONASCII = None
-
-# Save the initial cwd
-SAVEDCWD = os.getcwd()
-
-@contextlib.contextmanager
-def temp_cwd(name='tempcwd', quiet=False, path=None):
-    """
-    Context manager that temporarily changes the CWD.
-
-    An existing path may be provided as *path*, in which case this
-    function makes no changes to the file system.
-
-    Otherwise, the new CWD is created in the current directory and it's
-    named *name*. If *quiet* is False (default) and it's not possible to
-    create or change the CWD, an error is raised.  If it's True, only a
-    warning is raised and the original CWD is used.
-    """
-    saved_dir = os.getcwd()
-    is_temporary = False
-    if path is None:
-        path = name
-        try:
-            os.mkdir(name)
-            is_temporary = True
-        except OSError:
-            if not quiet:
-                raise
-            warnings.warn('tests may fail, unable to create temp CWD ' + name,
-                          RuntimeWarning, stacklevel=3)
-    try:
-        os.chdir(path)
-    except OSError:
-        if not quiet:
-            raise
-        warnings.warn('tests may fail, unable to change the CWD to ' + path,
-                      RuntimeWarning, stacklevel=3)
-    try:
-        yield os.getcwd()
-    finally:
-        os.chdir(saved_dir)
-        if is_temporary:
-            rmtree(name)
-
-
-if hasattr(os, "umask"):
-    @contextlib.contextmanager
-    def temp_umask(umask):
-        """Context manager that temporarily sets the process umask."""
-        oldmask = os.umask(umask)
-        try:
-            yield
-        finally:
-            os.umask(oldmask)
-
-
-def findfile(file, here=__file__, subdir=None):
-    """Try to find a file on sys.path and the working directory.  If it is not
-    found the argument passed to the function is returned (this does not
-    necessarily signal failure; could still be the legitimate path)."""
-    if os.path.isabs(file):
-        return file
-    if subdir is not None:
-        file = os.path.join(subdir, file)
-    path = sys.path
-    path = [os.path.dirname(here)] + path
-    for dn in path:
-        fn = os.path.join(dn, file)
-        if os.path.exists(fn): return fn
-    return file
-
-def create_empty_file(filename):
-    """Create an empty file. If the file already exists, truncate it."""
-    fd = os.open(filename, os.O_WRONLY | os.O_CREAT | os.O_TRUNC)
-    os.close(fd)
-
-def sortdict(dict):
-    "Like repr(dict), but in sorted order."
-    items = sorted(dict.items())
-    reprpairs = ["%r: %r" % pair for pair in items]
-    withcommas = ", ".join(reprpairs)
-    return "{%s}" % withcommas
-
-def make_bad_fd():
-    """
-    Create an invalid file descriptor by opening and closing a file and return
-    its fd.
-    """
-    file = open(TESTFN, "wb")
-    try:
-        return file.fileno()
-    finally:
-        file.close()
-        unlink(TESTFN)
-
-def check_syntax_error(testcase, statement):
-    testcase.assertRaises(SyntaxError, compile, statement,
-                          '<test string>', 'exec')
-
-def open_urlresource(url, *args, **kw):
-    from future.backports.urllib import (request as urllib_request,
-                                         parse as urllib_parse)
-
-    check = kw.pop('check', None)
-
-    filename = urllib_parse.urlparse(url)[2].split('/')[-1] # '/': it's URL!
-
-    fn = os.path.join(os.path.dirname(__file__), "data", filename)
-
-    def check_valid_file(fn):
-        f = open(fn, *args, **kw)
-        if check is None:
-            return f
-        elif check(f):
-            f.seek(0)
-            return f
-        f.close()
-
-    if os.path.exists(fn):
-        f = check_valid_file(fn)
-        if f is not None:
-            return f
-        unlink(fn)
-
-    # Verify the requirement before downloading the file
-    requires('urlfetch')
-
-    print('\tfetching %s ...' % url, file=get_original_stdout())
-    f = urllib_request.urlopen(url, timeout=15)
-    try:
-        with open(fn, "wb") as out:
-            s = f.read()
-            while s:
-                out.write(s)
-                s = f.read()
-    finally:
-        f.close()
-
-    f = check_valid_file(fn)
-    if f is not None:
-        return f
-    raise TestFailed('invalid resource %r' % fn)
-
-
-class WarningsRecorder(object):
-    """Convenience wrapper for the warnings list returned on
-       entry to the warnings.catch_warnings() context manager.
-    """
-    def __init__(self, warnings_list):
-        self._warnings = warnings_list
-        self._last = 0
-
-    def __getattr__(self, attr):
-        if len(self._warnings) > self._last:
-            return getattr(self._warnings[-1], attr)
-        elif attr in warnings.WarningMessage._WARNING_DETAILS:
-            return None
-        raise AttributeError("%r has no attribute %r" % (self, attr))
-
-    @property
-    def warnings(self):
-        return self._warnings[self._last:]
-
-    def reset(self):
-        self._last = len(self._warnings)
-
-
-def _filterwarnings(filters, quiet=False):
-    """Catch the warnings, then check if all the expected
-    warnings have been raised and re-raise unexpected warnings.
-    If 'quiet' is True, only re-raise the unexpected warnings.
-    """
-    # Clear the warning registry of the calling module
-    # in order to re-raise the warnings.
-    frame = sys._getframe(2)
-    registry = frame.f_globals.get('__warningregistry__')
-    if registry:
-        if utils.PY3:
-            registry.clear()
-        else:
-            # Py2-compatible:
-            for i in range(len(registry)):
-                registry.pop()
-    with warnings.catch_warnings(record=True) as w:
-        # Set filter "always" to record all warnings.  Because
-        # test_warnings swap the module, we need to look up in
-        # the sys.modules dictionary.
-        sys.modules['warnings'].simplefilter("always")
-        yield WarningsRecorder(w)
-    # Filter the recorded warnings
-    reraise = list(w)
-    missing = []
-    for msg, cat in filters:
-        seen = False
-        for w in reraise[:]:
-            warning = w.message
-            # Filter out the matching messages
-            if (re.match(msg, str(warning), re.I) and
-                issubclass(warning.__class__, cat)):
-                seen = True
-                reraise.remove(w)
-        if not seen and not quiet:
-            # This filter caught nothing
-            missing.append((msg, cat.__name__))
-    if reraise:
-        raise AssertionError("unhandled warning %s" % reraise[0])
-    if missing:
-        raise AssertionError("filter (%r, %s) did not catch any warning" %
-                             missing[0])
-
-
-@contextlib.contextmanager
-def check_warnings(*filters, **kwargs):
-    """Context manager to silence warnings.
-
-    Accept 2-tuples as positional arguments:
-        ("message regexp", WarningCategory)
-
-    Optional argument:
-     - if 'quiet' is True, it does not fail if a filter catches nothing
-        (default True without argument,
-         default False if some filters are defined)
-
-    Without argument, it defaults to:
-        check_warnings(("", Warning), quiet=True)
-    """
-    quiet = kwargs.get('quiet')
-    if not filters:
-        filters = (("", Warning),)
-        # Preserve backward compatibility
-        if quiet is None:
-            quiet = True
-    return _filterwarnings(filters, quiet)
-
-
-class CleanImport(object):
-    """Context manager to force import to return a new module reference.
-
-    This is useful for testing module-level behaviours, such as
-    the emission of a DeprecationWarning on import.
-
-    Use like this:
-
-        with CleanImport("foo"):
-            importlib.import_module("foo") # new reference
-    """
-
-    def __init__(self, *module_names):
-        self.original_modules = sys.modules.copy()
-        for module_name in module_names:
-            if module_name in sys.modules:
-                module = sys.modules[module_name]
-                # It is possible that module_name is just an alias for
-                # another module (e.g. stub for modules renamed in 3.x).
-                # In that case, we also need delete the real module to clear
-                # the import cache.
-                if module.__name__ != module_name:
-                    del sys.modules[module.__name__]
-                del sys.modules[module_name]
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, *ignore_exc):
-        sys.modules.update(self.original_modules)
-
-### Added for python-future:
-if utils.PY3:
-    import collections.abc
-    mybase = collections.abc.MutableMapping
-else:
-    import UserDict
-    mybase = UserDict.DictMixin
-###
-
-class EnvironmentVarGuard(mybase):
-
-    """Class to help protect the environment variable properly.  Can be used as
-    a context manager."""
-
-    def __init__(self):
-        self._environ = os.environ
-        self._changed = {}
-
-    def __getitem__(self, envvar):
-        return self._environ[envvar]
-
-    def __setitem__(self, envvar, value):
-        # Remember the initial value on the first access
-        if envvar not in self._changed:
-            self._changed[envvar] = self._environ.get(envvar)
-        self._environ[envvar] = value
-
-    def __delitem__(self, envvar):
-        # Remember the initial value on the first access
-        if envvar not in self._changed:
-            self._changed[envvar] = self._environ.get(envvar)
-        if envvar in self._environ:
-            del self._environ[envvar]
-
-    def keys(self):
-        return self._environ.keys()
-
-    def __iter__(self):
-        return iter(self._environ)
-
-    def __len__(self):
-        return len(self._environ)
-
-    def set(self, envvar, value):
-        self[envvar] = value
-
-    def unset(self, envvar):
-        del self[envvar]
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, *ignore_exc):
-        for (k, v) in self._changed.items():
-            if v is None:
-                if k in self._environ:
-                    del self._environ[k]
-            else:
-                self._environ[k] = v
-        os.environ = self._environ
-
-
-class DirsOnSysPath(object):
-    """Context manager to temporarily add directories to sys.path.
-
-    This makes a copy of sys.path, appends any directories given
-    as positional arguments, then reverts sys.path to the copied
-    settings when the context ends.
-
-    Note that *all* sys.path modifications in the body of the
-    context manager, including replacement of the object,
-    will be reverted at the end of the block.
-    """
-
-    def __init__(self, *paths):
-        self.original_value = sys.path[:]
-        self.original_object = sys.path
-        sys.path.extend(paths)
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, *ignore_exc):
-        sys.path = self.original_object
-        sys.path[:] = self.original_value
-
-
-class TransientResource(object):
-
-    """Raise ResourceDenied if an exception is raised while the context manager
-    is in effect that matches the specified exception and attributes."""
-
-    def __init__(self, exc, **kwargs):
-        self.exc = exc
-        self.attrs = kwargs
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, type_=None, value=None, traceback=None):
-        """If type_ is a subclass of self.exc and value has attributes matching
-        self.attrs, raise ResourceDenied.  Otherwise let the exception
-        propagate (if any)."""
-        if type_ is not None and issubclass(self.exc, type_):
-            for attr, attr_value in self.attrs.items():
-                if not hasattr(value, attr):
-                    break
-                if getattr(value, attr) != attr_value:
-                    break
-            else:
-                raise ResourceDenied("an optional resource is not available")
-
-# Context managers that raise ResourceDenied when various issues
-# with the Internet connection manifest themselves as exceptions.
-# XXX deprecate these and use transient_internet() instead
-time_out = TransientResource(IOError, errno=errno.ETIMEDOUT)
-socket_peer_reset = TransientResource(socket.error, errno=errno.ECONNRESET)
-ioerror_peer_reset = TransientResource(IOError, errno=errno.ECONNRESET)
-
-
-@contextlib.contextmanager
-def transient_internet(resource_name, timeout=30.0, errnos=()):
-    """Return a context manager that raises ResourceDenied when various issues
-    with the Internet connection manifest themselves as exceptions."""
-    default_errnos = [
-        ('ECONNREFUSED', 111),
-        ('ECONNRESET', 104),
-        ('EHOSTUNREACH', 113),
-        ('ENETUNREACH', 101),
-        ('ETIMEDOUT', 110),
-    ]
-    default_gai_errnos = [
-        ('EAI_AGAIN', -3),
-        ('EAI_FAIL', -4),
-        ('EAI_NONAME', -2),
-        ('EAI_NODATA', -5),
-        # Encountered when trying to resolve IPv6-only hostnames
-        ('WSANO_DATA', 11004),
-    ]
-
-    denied = ResourceDenied("Resource %r is not available" % resource_name)
-    captured_errnos = errnos
-    gai_errnos = []
-    if not captured_errnos:
-        captured_errnos = [getattr(errno, name, num)
-                           for (name, num) in default_errnos]
-        gai_errnos = [getattr(socket, name, num)
-                      for (name, num) in default_gai_errnos]
-
-    def filter_error(err):
-        n = getattr(err, 'errno', None)
-        if (isinstance(err, socket.timeout) or
-            (isinstance(err, socket.gaierror) and n in gai_errnos) or
-            n in captured_errnos):
-            if not verbose:
-                sys.stderr.write(denied.args[0] + "\n")
-            # Was: raise denied from err
-            # For Python-Future:
-            exc = denied
-            exc.__cause__ = err
-            raise exc
-
-    old_timeout = socket.getdefaulttimeout()
-    try:
-        if timeout is not None:
-            socket.setdefaulttimeout(timeout)
-        yield
-    except IOError as err:
-        # urllib can wrap original socket errors multiple times (!), we must
-        # unwrap to get at the original error.
-        while True:
-            a = err.args
-            if len(a) >= 1 and isinstance(a[0], IOError):
-                err = a[0]
-            # The error can also be wrapped as args[1]:
-            #    except socket.error as msg:
-            #        raise IOError('socket error', msg).with_traceback(sys.exc_info()[2])
-            elif len(a) >= 2 and isinstance(a[1], IOError):
-                err = a[1]
-            else:
-                break
-        filter_error(err)
-        raise
-    # XXX should we catch generic exceptions and look for their
-    # __cause__ or __context__?
-    finally:
-        socket.setdefaulttimeout(old_timeout)
-
-
-@contextlib.contextmanager
-def captured_output(stream_name):
-    """Return a context manager used by captured_stdout/stdin/stderr
-    that temporarily replaces the sys stream *stream_name* with a StringIO."""
-    import io
-    orig_stdout = getattr(sys, stream_name)
-    setattr(sys, stream_name, io.StringIO())
-    try:
-        yield getattr(sys, stream_name)
-    finally:
-        setattr(sys, stream_name, orig_stdout)
-
-def captured_stdout():
-    """Capture the output of sys.stdout:
-
-       with captured_stdout() as s:
-           print("hello")
-       self.assertEqual(s.getvalue(), "hello")
-    """
-    return captured_output("stdout")
-
-def captured_stderr():
-    return captured_output("stderr")
-
-def captured_stdin():
-    return captured_output("stdin")
-
-
-def gc_collect():
-    """Force as many objects as possible to be collected.
-
-    In non-CPython implementations of Python, this is needed because timely
-    deallocation is not guaranteed by the garbage collector.  (Even in CPython
-    this can be the case in case of reference cycles.)  This means that __del__
-    methods may be called later than expected and weakrefs may remain alive for
-    longer than expected.  This function tries its best to force all garbage
-    objects to disappear.
-    """
-    gc.collect()
-    if is_jython:
-        time.sleep(0.1)
-    gc.collect()
-    gc.collect()
-
-@contextlib.contextmanager
-def disable_gc():
-    have_gc = gc.isenabled()
-    gc.disable()
-    try:
-        yield
-    finally:
-        if have_gc:
-            gc.enable()
-
-
-def python_is_optimized():
-    """Find if Python was built with optimizations."""
-    # We don't have sysconfig on Py2.6:
-    import sysconfig
-    cflags = sysconfig.get_config_var('PY_CFLAGS') or ''
-    final_opt = ""
-    for opt in cflags.split():
-        if opt.startswith('-O'):
-            final_opt = opt
-    return final_opt != '' and final_opt != '-O0'
-
-
-_header = 'nP'
-_align = '0n'
-if hasattr(sys, "gettotalrefcount"):
-    _header = '2P' + _header
-    _align = '0P'
-_vheader = _header + 'n'
-
-def calcobjsize(fmt):
-    return struct.calcsize(_header + fmt + _align)
-
-def calcvobjsize(fmt):
-    return struct.calcsize(_vheader + fmt + _align)
-
-
-_TPFLAGS_HAVE_GC = 1<<14
-_TPFLAGS_HEAPTYPE = 1<<9
-
-def check_sizeof(test, o, size):
-    result = sys.getsizeof(o)
-    # add GC header size
-    if ((type(o) == type) and (o.__flags__ & _TPFLAGS_HEAPTYPE) or\
-        ((type(o) != type) and (type(o).__flags__ & _TPFLAGS_HAVE_GC))):
-        size += _testcapi.SIZEOF_PYGC_HEAD
-    msg = 'wrong size for %s: got %d, expected %d' \
-            % (type(o), result, size)
-    test.assertEqual(result, size, msg)
-
-#=======================================================================
-# Decorator for running a function in a different locale, correctly resetting
-# it afterwards.
-
-def run_with_locale(catstr, *locales):
-    def decorator(func):
-        def inner(*args, **kwds):
-            try:
-                import locale
-                category = getattr(locale, catstr)
-                orig_locale = locale.setlocale(category)
-            except AttributeError:
-                # if the test author gives us an invalid category string
-                raise
-            except:
-                # cannot retrieve original locale, so do nothing
-                locale = orig_locale = None
-            else:
-                for loc in locales:
-                    try:
-                        locale.setlocale(category, loc)
-                        break
-                    except:
-                        pass
-
-            # now run the function, resetting the locale on exceptions
-            try:
-                return func(*args, **kwds)
-            finally:
-                if locale and orig_locale:
-                    locale.setlocale(category, orig_locale)
-        inner.__name__ = func.__name__
-        inner.__doc__ = func.__doc__
-        return inner
-    return decorator
-
-#=======================================================================
-# Decorator for running a function in a specific timezone, correctly
-# resetting it afterwards.
-
-def run_with_tz(tz):
-    def decorator(func):
-        def inner(*args, **kwds):
-            try:
-                tzset = time.tzset
-            except AttributeError:
-                raise unittest.SkipTest("tzset required")
-            if 'TZ' in os.environ:
-                orig_tz = os.environ['TZ']
-            else:
-                orig_tz = None
-            os.environ['TZ'] = tz
-            tzset()
-
-            # now run the function, resetting the tz on exceptions
-            try:
-                return func(*args, **kwds)
-            finally:
-                if orig_tz is None:
-                    del os.environ['TZ']
-                else:
-                    os.environ['TZ'] = orig_tz
-                time.tzset()
-
-        inner.__name__ = func.__name__
-        inner.__doc__ = func.__doc__
-        return inner
-    return decorator
-
-#=======================================================================
-# Big-memory-test support. Separate from 'resources' because memory use
-# should be configurable.
-
-# Some handy shorthands. Note that these are used for byte-limits as well
-# as size-limits, in the various bigmem tests
-_1M = 1024*1024
-_1G = 1024 * _1M
-_2G = 2 * _1G
-_4G = 4 * _1G
-
-MAX_Py_ssize_t = sys.maxsize
-
-def set_memlimit(limit):
-    global max_memuse
-    global real_max_memuse
-    sizes = {
-        'k': 1024,
-        'm': _1M,
-        'g': _1G,
-        't': 1024*_1G,
-    }
-    m = re.match(r'(\d+(\.\d+)?) (K|M|G|T)b?$', limit,
-                 re.IGNORECASE | re.VERBOSE)
-    if m is None:
-        raise ValueError('Invalid memory limit %r' % (limit,))
-    memlimit = int(float(m.group(1)) * sizes[m.group(3).lower()])
-    real_max_memuse = memlimit
-    if memlimit > MAX_Py_ssize_t:
-        memlimit = MAX_Py_ssize_t
-    if memlimit < _2G - 1:
-        raise ValueError('Memory limit %r too low to be useful' % (limit,))
-    max_memuse = memlimit
-
-class _MemoryWatchdog(object):
-    """An object which periodically watches the process' memory consumption
-    and prints it out.
-    """
-
-    def __init__(self):
-        self.procfile = '/proc/{pid}/statm'.format(pid=os.getpid())
-        self.started = False
-
-    def start(self):
-        try:
-            f = open(self.procfile, 'r')
-        except OSError as e:
-            warnings.warn('/proc not available for stats: {0}'.format(e),
-                          RuntimeWarning)
-            sys.stderr.flush()
-            return
-
-        watchdog_script = findfile("memory_watchdog.py")
-        self.mem_watchdog = subprocess.Popen([sys.executable, watchdog_script],
-                                             stdin=f, stderr=subprocess.DEVNULL)
-        f.close()
-        self.started = True
-
-    def stop(self):
-        if self.started:
-            self.mem_watchdog.terminate()
-            self.mem_watchdog.wait()
-
-
-def bigmemtest(size, memuse, dry_run=True):
-    """Decorator for bigmem tests.
-
-    'minsize' is the minimum useful size for the test (in arbitrary,
-    test-interpreted units.) 'memuse' is the number of 'bytes per size' for
-    the test, or a good estimate of it.
-
-    if 'dry_run' is False, it means the test doesn't support dummy runs
-    when -M is not specified.
-    """
-    def decorator(f):
-        def wrapper(self):
-            size = wrapper.size
-            memuse = wrapper.memuse
-            if not real_max_memuse:
-                maxsize = 5147
-            else:
-                maxsize = size
-
-            if ((real_max_memuse or not dry_run)
-                and real_max_memuse < maxsize * memuse):
-                raise unittest.SkipTest(
-                    "not enough memory: %.1fG minimum needed"
-                    % (size * memuse / (1024 ** 3)))
-
-            if real_max_memuse and verbose:
-                print()
-                print(" ... expected peak memory use: {peak:.1f}G"
-                      .format(peak=size * memuse / (1024 ** 3)))
-                watchdog = _MemoryWatchdog()
-                watchdog.start()
-            else:
-                watchdog = None
-
-            try:
-                return f(self, maxsize)
-            finally:
-                if watchdog:
-                    watchdog.stop()
-
-        wrapper.size = size
-        wrapper.memuse = memuse
-        return wrapper
-    return decorator
-
-def bigaddrspacetest(f):
-    """Decorator for tests that fill the address space."""
-    def wrapper(self):
-        if max_memuse < MAX_Py_ssize_t:
-            if MAX_Py_ssize_t >= 2**63 - 1 and max_memuse >= 2**31:
-                raise unittest.SkipTest(
-                    "not enough memory: try a 32-bit build instead")
-            else:
-                raise unittest.SkipTest(
-                    "not enough memory: %.1fG minimum needed"
-                    % (MAX_Py_ssize_t / (1024 ** 3)))
-        else:
-            return f(self)
-    return wrapper
-
-#=======================================================================
-# unittest integration.
-
-class BasicTestRunner(object):
-    def run(self, test):
-        result = unittest.TestResult()
-        test(result)
-        return result
-
-def _id(obj):
-    return obj
-
-def requires_resource(resource):
-    if resource == 'gui' and not _is_gui_available():
-        return unittest.skip("resource 'gui' is not available")
-    if is_resource_enabled(resource):
-        return _id
-    else:
-        return unittest.skip("resource {0!r} is not enabled".format(resource))
-
-def cpython_only(test):
-    """
-    Decorator for tests only applicable on CPython.
-    """
-    return impl_detail(cpython=True)(test)
-
-def impl_detail(msg=None, **guards):
-    if check_impl_detail(**guards):
-        return _id
-    if msg is None:
-        guardnames, default = _parse_guards(guards)
-        if default:
-            msg = "implementation detail not available on {0}"
-        else:
-            msg = "implementation detail specific to {0}"
-        guardnames = sorted(guardnames.keys())
-        msg = msg.format(' or '.join(guardnames))
-    return unittest.skip(msg)
-
-def _parse_guards(guards):
-    # Returns a tuple ({platform_name: run_me}, default_value)
-    if not guards:
-        return ({'cpython': True}, False)
-    is_true = list(guards.values())[0]
-    assert list(guards.values()) == [is_true] * len(guards)   # all True or all False
-    return (guards, not is_true)
-
-# Use the following check to guard CPython's implementation-specific tests --
-# or to run them only on the implementation(s) guarded by the arguments.
-def check_impl_detail(**guards):
-    """This function returns True or False depending on the host platform.
-       Examples:
-          if check_impl_detail():               # only on CPython (default)
-          if check_impl_detail(jython=True):    # only on Jython
-          if check_impl_detail(cpython=False):  # everywhere except on CPython
-    """
-    guards, default = _parse_guards(guards)
-    return guards.get(platform.python_implementation().lower(), default)
-
-
-def no_tracing(func):
-    """Decorator to temporarily turn off tracing for the duration of a test."""
-    if not hasattr(sys, 'gettrace'):
-        return func
-    else:
-        @functools.wraps(func)
-        def wrapper(*args, **kwargs):
-            original_trace = sys.gettrace()
-            try:
-                sys.settrace(None)
-                return func(*args, **kwargs)
-            finally:
-                sys.settrace(original_trace)
-        return wrapper
-
-
-def refcount_test(test):
-    """Decorator for tests which involve reference counting.
-
-    To start, the decorator does not run the test if is not run by CPython.
-    After that, any trace function is unset during the test to prevent
-    unexpected refcounts caused by the trace function.
-
-    """
-    return no_tracing(cpython_only(test))
-
-
-def _filter_suite(suite, pred):
-    """Recursively filter test cases in a suite based on a predicate."""
-    newtests = []
-    for test in suite._tests:
-        if isinstance(test, unittest.TestSuite):
-            _filter_suite(test, pred)
-            newtests.append(test)
-        else:
-            if pred(test):
-                newtests.append(test)
-    suite._tests = newtests
-
-def _run_suite(suite):
-    """Run tests from a unittest.TestSuite-derived class."""
-    if verbose:
-        runner = unittest.TextTestRunner(sys.stdout, verbosity=2,
-                                         failfast=failfast)
-    else:
-        runner = BasicTestRunner()
-
-    result = runner.run(suite)
-    if not result.wasSuccessful():
-        if len(result.errors) == 1 and not result.failures:
-            err = result.errors[0][1]
-        elif len(result.failures) == 1 and not result.errors:
-            err = result.failures[0][1]
-        else:
-            err = "multiple errors occurred"
-            if not verbose: err += "; run in verbose mode for details"
-        raise TestFailed(err)
-
-
-def run_unittest(*classes):
-    """Run tests from unittest.TestCase-derived classes."""
-    valid_types = (unittest.TestSuite, unittest.TestCase)
-    suite = unittest.TestSuite()
-    for cls in classes:
-        if isinstance(cls, str):
-            if cls in sys.modules:
-                suite.addTest(unittest.findTestCases(sys.modules[cls]))
-            else:
-                raise ValueError("str arguments must be keys in sys.modules")
-        elif isinstance(cls, valid_types):
-            suite.addTest(cls)
-        else:
-            suite.addTest(unittest.makeSuite(cls))
-    def case_pred(test):
-        if match_tests is None:
-            return True
-        for name in test.id().split("."):
-            if fnmatch.fnmatchcase(name, match_tests):
-                return True
-        return False
-    _filter_suite(suite, case_pred)
-    _run_suite(suite)
-
-# We don't have sysconfig on Py2.6:
-# #=======================================================================
-# # Check for the presence of docstrings.
-#
-# HAVE_DOCSTRINGS = (check_impl_detail(cpython=False) or
-#                    sys.platform == 'win32' or
-#                    sysconfig.get_config_var('WITH_DOC_STRINGS'))
-#
-# requires_docstrings = unittest.skipUnless(HAVE_DOCSTRINGS,
-#                                           "test requires docstrings")
-#
-#
-# #=======================================================================
-# doctest driver.
-
-def run_doctest(module, verbosity=None, optionflags=0):
-    """Run doctest on the given module.  Return (#failures, #tests).
-
-    If optional argument verbosity is not specified (or is None), pass
-    support's belief about verbosity on to doctest.  Else doctest's
-    usual behavior is used (it searches sys.argv for -v).
-    """
-
-    import doctest
-
-    if verbosity is None:
-        verbosity = verbose
-    else:
-        verbosity = None
-
-    f, t = doctest.testmod(module, verbose=verbosity, optionflags=optionflags)
-    if f:
-        raise TestFailed("%d of %d doctests failed" % (f, t))
-    if verbose:
-        print('doctest (%s) ... %d tests with zero failures' %
-              (module.__name__, t))
-    return f, t
-
-
-#=======================================================================
-# Support for saving and restoring the imported modules.
-
-def modules_setup():
-    return sys.modules.copy(),
-
-def modules_cleanup(oldmodules):
-    # Encoders/decoders are registered permanently within the internal
-    # codec cache. If we destroy the corresponding modules their
-    # globals will be set to None which will trip up the cached functions.
-    encodings = [(k, v) for k, v in sys.modules.items()
-                 if k.startswith('encodings.')]
-    # Was:
-    # sys.modules.clear()
-    # Py2-compatible:
-    for i in range(len(sys.modules)):
-        sys.modules.pop()
-
-    sys.modules.update(encodings)
-    # XXX: This kind of problem can affect more than just encodings. In particular
-    # extension modules (such as _ssl) don't cope with reloading properly.
-    # Really, test modules should be cleaning out the test specific modules they
-    # know they added (ala test_runpy) rather than relying on this function (as
-    # test_importhooks and test_pkg do currently).
-    # Implicitly imported *real* modules should be left alone (see issue 10556).
-    sys.modules.update(oldmodules)
-
-#=======================================================================
-# Backported versions of threading_setup() and threading_cleanup() which don't refer
-# to threading._dangling (not available on Py2.7).
-
-# Threading support to prevent reporting refleaks when running regrtest.py -R
-
-# NOTE: we use thread._count() rather than threading.enumerate() (or the
-# moral equivalent thereof) because a threading.Thread object is still alive
-# until its __bootstrap() method has returned, even after it has been
-# unregistered from the threading module.
-# thread._count(), on the other hand, only gets decremented *after* the
-# __bootstrap() method has returned, which gives us reliable reference counts
-# at the end of a test run.
-
-def threading_setup():
-    if _thread:
-        return _thread._count(),
-    else:
-        return 1,
-
-def threading_cleanup(nb_threads):
-    if not _thread:
-        return
-
-    _MAX_COUNT = 10
-    for count in range(_MAX_COUNT):
-        n = _thread._count()
-        if n == nb_threads:
-            break
-        time.sleep(0.1)
-    # XXX print a warning in case of failure?
-
-def reap_threads(func):
-    """Use this function when threads are being used.  This will
-    ensure that the threads are cleaned up even when the test fails.
-    If threading is unavailable this function does nothing.
-    """
-    if not _thread:
-        return func
-
-    @functools.wraps(func)
-    def decorator(*args):
-        key = threading_setup()
-        try:
-            return func(*args)
-        finally:
-            threading_cleanup(*key)
-    return decorator
-
-def reap_children():
-    """Use this function at the end of test_main() whenever sub-processes
-    are started.  This will help ensure that no extra children (zombies)
-    stick around to hog resources and create problems when looking
-    for refleaks.
-    """
-
-    # Reap all our dead child processes so we don't leave zombies around.
-    # These hog resources and might be causing some of the buildbots to die.
-    if hasattr(os, 'waitpid'):
-        any_process = -1
-        while True:
-            try:
-                # This will raise an exception on Windows.  That's ok.
-                pid, status = os.waitpid(any_process, os.WNOHANG)
-                if pid == 0:
-                    break
-            except:
-                break
-
-@contextlib.contextmanager
-def swap_attr(obj, attr, new_val):
-    """Temporary swap out an attribute with a new object.
-
-    Usage:
-        with swap_attr(obj, "attr", 5):
-            ...
-
-        This will set obj.attr to 5 for the duration of the with: block,
-        restoring the old value at the end of the block. If `attr` doesn't
-        exist on `obj`, it will be created and then deleted at the end of the
-        block.
-    """
-    if hasattr(obj, attr):
-        real_val = getattr(obj, attr)
-        setattr(obj, attr, new_val)
-        try:
-            yield
-        finally:
-            setattr(obj, attr, real_val)
-    else:
-        setattr(obj, attr, new_val)
-        try:
-            yield
-        finally:
-            delattr(obj, attr)
-
-@contextlib.contextmanager
-def swap_item(obj, item, new_val):
-    """Temporary swap out an item with a new object.
-
-    Usage:
-        with swap_item(obj, "item", 5):
-            ...
-
-        This will set obj["item"] to 5 for the duration of the with: block,
-        restoring the old value at the end of the block. If `item` doesn't
-        exist on `obj`, it will be created and then deleted at the end of the
-        block.
-    """
-    if item in obj:
-        real_val = obj[item]
-        obj[item] = new_val
-        try:
-            yield
-        finally:
-            obj[item] = real_val
-    else:
-        obj[item] = new_val
-        try:
-            yield
-        finally:
-            del obj[item]
-
-def strip_python_stderr(stderr):
-    """Strip the stderr of a Python process from potential debug output
-    emitted by the interpreter.
-
-    This will typically be run on the result of the communicate() method
-    of a subprocess.Popen object.
-    """
-    stderr = re.sub(br"\[\d+ refs\]\r?\n?", b"", stderr).strip()
-    return stderr
-
-def args_from_interpreter_flags():
-    """Return a list of command-line arguments reproducing the current
-    settings in sys.flags and sys.warnoptions."""
-    return subprocess._args_from_interpreter_flags()
-
-#============================================================
-# Support for assertions about logging.
-#============================================================
-
-class TestHandler(logging.handlers.BufferingHandler):
-    def __init__(self, matcher):
-        # BufferingHandler takes a "capacity" argument
-        # so as to know when to flush. As we're overriding
-        # shouldFlush anyway, we can set a capacity of zero.
-        # You can call flush() manually to clear out the
-        # buffer.
-        logging.handlers.BufferingHandler.__init__(self, 0)
-        self.matcher = matcher
-
-    def shouldFlush(self):
-        return False
-
-    def emit(self, record):
-        self.format(record)
-        self.buffer.append(record.__dict__)
-
-    def matches(self, **kwargs):
-        """
-        Look for a saved dict whose keys/values match the supplied arguments.
-        """
-        result = False
-        for d in self.buffer:
-            if self.matcher.matches(d, **kwargs):
-                result = True
-                break
-        return result
-
-class Matcher(object):
-
-    _partial_matches = ('msg', 'message')
-
-    def matches(self, d, **kwargs):
-        """
-        Try to match a single dict with the supplied arguments.
-
-        Keys whose values are strings and which are in self._partial_matches
-        will be checked for partial (i.e. substring) matches. You can extend
-        this scheme to (for example) do regular expression matching, etc.
-        """
-        result = True
-        for k in kwargs:
-            v = kwargs[k]
-            dv = d.get(k)
-            if not self.match_value(k, dv, v):
-                result = False
-                break
-        return result
-
-    def match_value(self, k, dv, v):
-        """
-        Try to match a single stored value (dv) with a supplied value (v).
-        """
-        if type(v) != type(dv):
-            result = False
-        elif type(dv) is not str or k not in self._partial_matches:
-            result = (v == dv)
-        else:
-            result = dv.find(v) >= 0
-        return result
-
-
-_can_symlink = None
-def can_symlink():
-    global _can_symlink
-    if _can_symlink is not None:
-        return _can_symlink
-    symlink_path = TESTFN + "can_symlink"
-    try:
-        os.symlink(TESTFN, symlink_path)
-        can = True
-    except (OSError, NotImplementedError, AttributeError):
-        can = False
-    else:
-        os.remove(symlink_path)
-    _can_symlink = can
-    return can
-
-def skip_unless_symlink(test):
-    """Skip decorator for tests that require functional symlink"""
-    ok = can_symlink()
-    msg = "Requires functional symlink implementation"
-    return test if ok else unittest.skip(msg)(test)
-
-_can_xattr = None
-def can_xattr():
-    global _can_xattr
-    if _can_xattr is not None:
-        return _can_xattr
-    if not hasattr(os, "setxattr"):
-        can = False
-    else:
-        tmp_fp, tmp_name = tempfile.mkstemp()
-        try:
-            with open(TESTFN, "wb") as fp:
-                try:
-                    # TESTFN & tempfile may use different file systems with
-                    # different capabilities
-                    os.setxattr(tmp_fp, b"user.test", b"")
-                    os.setxattr(fp.fileno(), b"user.test", b"")
-                    # Kernels < 2.6.39 don't respect setxattr flags.
-                    kernel_version = platform.release()
-                    m = re.match("2.6.(\d{1,2})", kernel_version)
-                    can = m is None or int(m.group(1)) >= 39
-                except OSError:
-                    can = False
-        finally:
-            unlink(TESTFN)
-            unlink(tmp_name)
-    _can_xattr = can
-    return can
-
-def skip_unless_xattr(test):
-    """Skip decorator for tests that require functional extended attributes"""
-    ok = can_xattr()
-    msg = "no non-broken extended attribute support"
-    return test if ok else unittest.skip(msg)(test)
-
-
-if sys.platform.startswith('win'):
-    @contextlib.contextmanager
-    def suppress_crash_popup():
-        """Disable Windows Error Reporting dialogs using SetErrorMode."""
-        # see http://msdn.microsoft.com/en-us/library/windows/desktop/ms680621%28v=vs.85%29.aspx
-        # GetErrorMode is not available on Windows XP and Windows Server 2003,
-        # but SetErrorMode returns the previous value, so we can use that
-        import ctypes
-        k32 = ctypes.windll.kernel32
-        SEM_NOGPFAULTERRORBOX = 0x02
-        old_error_mode = k32.SetErrorMode(SEM_NOGPFAULTERRORBOX)
-        k32.SetErrorMode(old_error_mode | SEM_NOGPFAULTERRORBOX)
-        try:
-            yield
-        finally:
-            k32.SetErrorMode(old_error_mode)
-else:
-    # this is a no-op for other platforms
-    @contextlib.contextmanager
-    def suppress_crash_popup():
-        yield
-
-
-def patch(test_instance, object_to_patch, attr_name, new_value):
-    """Override 'object_to_patch'.'attr_name' with 'new_value'.
-
-    Also, add a cleanup procedure to 'test_instance' to restore
-    'object_to_patch' value for 'attr_name'.
-    The 'attr_name' should be a valid attribute for 'object_to_patch'.
-
-    """
-    # check that 'attr_name' is a real attribute for 'object_to_patch'
-    # will raise AttributeError if it does not exist
-    getattr(object_to_patch, attr_name)
-
-    # keep a copy of the old value
-    attr_is_local = False
-    try:
-        old_value = object_to_patch.__dict__[attr_name]
-    except (AttributeError, KeyError):
-        old_value = getattr(object_to_patch, attr_name, None)
-    else:
-        attr_is_local = True
-
-    # restore the value when the test is done
-    def cleanup():
-        if attr_is_local:
-            setattr(object_to_patch, attr_name, old_value)
-        else:
-            delattr(object_to_patch, attr_name)
-
-    test_instance.addCleanup(cleanup)
-
-    # actually override the attribute
-    setattr(object_to_patch, attr_name, new_value)
diff --git a/lib/future/backports/total_ordering.py b/lib/future/backports/total_ordering.py
deleted file mode 100644
index 760f06d6..00000000
--- a/lib/future/backports/total_ordering.py
+++ /dev/null
@@ -1,38 +0,0 @@
-"""
-For Python < 2.7.2. total_ordering in versions prior to 2.7.2 is buggy.
-See http://bugs.python.org/issue10042 for details. For these versions use
-code borrowed from Python 2.7.3.
-
-From django.utils.
-"""
-
-import sys
-if sys.version_info >= (2, 7, 2):
-    from functools import total_ordering
-else:
-    def total_ordering(cls):
-        """Class decorator that fills in missing ordering methods"""
-        convert = {
-            '__lt__': [('__gt__', lambda self, other: not (self < other or self == other)),
-                       ('__le__', lambda self, other: self < other or self == other),
-                       ('__ge__', lambda self, other: not self < other)],
-            '__le__': [('__ge__', lambda self, other: not self <= other or self == other),
-                       ('__lt__', lambda self, other: self <= other and not self == other),
-                       ('__gt__', lambda self, other: not self <= other)],
-            '__gt__': [('__lt__', lambda self, other: not (self > other or self == other)),
-                       ('__ge__', lambda self, other: self > other or self == other),
-                       ('__le__', lambda self, other: not self > other)],
-            '__ge__': [('__le__', lambda self, other: (not self >= other) or self == other),
-                       ('__gt__', lambda self, other: self >= other and not self == other),
-                       ('__lt__', lambda self, other: not self >= other)]
-        }
-        roots = set(dir(cls)) & set(convert)
-        if not roots:
-            raise ValueError('must define at least one ordering operation: < > <= >=')
-        root = max(roots)       # prefer __lt__ to __le__ to __gt__ to __ge__
-        for opname, opfunc in convert[root]:
-            if opname not in roots:
-                opfunc.__name__ = opname
-                opfunc.__doc__ = getattr(int, opname).__doc__
-                setattr(cls, opname, opfunc)
-        return cls
diff --git a/lib/future/backports/urllib/__init__.py b/lib/future/backports/urllib/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/future/backports/urllib/error.py b/lib/future/backports/urllib/error.py
deleted file mode 100644
index a473e445..00000000
--- a/lib/future/backports/urllib/error.py
+++ /dev/null
@@ -1,75 +0,0 @@
-"""Exception classes raised by urllib.
-
-The base exception class is URLError, which inherits from IOError.  It
-doesn't define any behavior of its own, but is the base class for all
-exceptions defined in this package.
-
-HTTPError is an exception class that is also a valid HTTP response
-instance.  It behaves this way because HTTP protocol errors are valid
-responses, with a status code, headers, and a body.  In some contexts,
-an application may want to handle an exception like a regular
-response.
-"""
-from __future__ import absolute_import, division, unicode_literals
-from future import standard_library
-
-from future.backports.urllib import response as urllib_response
-
-
-__all__ = ['URLError', 'HTTPError', 'ContentTooShortError']
-
-
-# do these error classes make sense?
-# make sure all of the IOError stuff is overridden.  we just want to be
-# subtypes.
-
-class URLError(IOError):
-    # URLError is a sub-type of IOError, but it doesn't share any of
-    # the implementation.  need to override __init__ and __str__.
-    # It sets self.args for compatibility with other EnvironmentError
-    # subclasses, but args doesn't have the typical format with errno in
-    # slot 0 and strerror in slot 1.  This may be better than nothing.
-    def __init__(self, reason, filename=None):
-        self.args = reason,
-        self.reason = reason
-        if filename is not None:
-            self.filename = filename
-
-    def __str__(self):
-        return '<urlopen error %s>' % self.reason
-
-class HTTPError(URLError, urllib_response.addinfourl):
-    """Raised when HTTP error occurs, but also acts like non-error return"""
-    __super_init = urllib_response.addinfourl.__init__
-
-    def __init__(self, url, code, msg, hdrs, fp):
-        self.code = code
-        self.msg = msg
-        self.hdrs = hdrs
-        self.fp = fp
-        self.filename = url
-        # The addinfourl classes depend on fp being a valid file
-        # object.  In some cases, the HTTPError may not have a valid
-        # file object.  If this happens, the simplest workaround is to
-        # not initialize the base classes.
-        if fp is not None:
-            self.__super_init(fp, hdrs, url, code)
-
-    def __str__(self):
-        return 'HTTP Error %s: %s' % (self.code, self.msg)
-
-    # since URLError specifies a .reason attribute, HTTPError should also
-    #  provide this attribute. See issue13211 for discussion.
-    @property
-    def reason(self):
-        return self.msg
-
-    def info(self):
-        return self.hdrs
-
-
-# exception raised when downloaded size does not match content-length
-class ContentTooShortError(URLError):
-    def __init__(self, message, content):
-        URLError.__init__(self, message)
-        self.content = content
diff --git a/lib/future/backports/urllib/parse.py b/lib/future/backports/urllib/parse.py
deleted file mode 100644
index 04e52d49..00000000
--- a/lib/future/backports/urllib/parse.py
+++ /dev/null
@@ -1,991 +0,0 @@
-"""
-Ported using Python-Future from the Python 3.3 standard library.
-
-Parse (absolute and relative) URLs.
-
-urlparse module is based upon the following RFC specifications.
-
-RFC 3986 (STD66): "Uniform Resource Identifiers" by T. Berners-Lee, R. Fielding
-and L.  Masinter, January 2005.
-
-RFC 2732 : "Format for Literal IPv6 Addresses in URL's by R.Hinden, B.Carpenter
-and L.Masinter, December 1999.
-
-RFC 2396:  "Uniform Resource Identifiers (URI)": Generic Syntax by T.
-Berners-Lee, R. Fielding, and L. Masinter, August 1998.
-
-RFC 2368: "The mailto URL scheme", by P.Hoffman , L Masinter, J. Zawinski, July 1998.
-
-RFC 1808: "Relative Uniform Resource Locators", by R. Fielding, UC Irvine, June
-1995.
-
-RFC 1738: "Uniform Resource Locators (URL)" by T. Berners-Lee, L. Masinter, M.
-McCahill, December 1994
-
-RFC 3986 is considered the current standard and any future changes to
-urlparse module should conform with it.  The urlparse module is
-currently not entirely compliant with this RFC due to defacto
-scenarios for parsing, and for backward compatibility purposes, some
-parsing quirks from older RFCs are retained. The testcases in
-test_urlparse.py provides a good indicator of parsing behavior.
-"""
-from __future__ import absolute_import, division, unicode_literals
-from future.builtins import bytes, chr, dict, int, range, str
-from future.utils import raise_with_traceback
-
-import re
-import sys
-import collections
-
-__all__ = ["urlparse", "urlunparse", "urljoin", "urldefrag",
-           "urlsplit", "urlunsplit", "urlencode", "parse_qs",
-           "parse_qsl", "quote", "quote_plus", "quote_from_bytes",
-           "unquote", "unquote_plus", "unquote_to_bytes"]
-
-# A classification of schemes ('' means apply by default)
-uses_relative = ['ftp', 'http', 'gopher', 'nntp', 'imap',
-                 'wais', 'file', 'https', 'shttp', 'mms',
-                 'prospero', 'rtsp', 'rtspu', '', 'sftp',
-                 'svn', 'svn+ssh']
-uses_netloc = ['ftp', 'http', 'gopher', 'nntp', 'telnet',
-               'imap', 'wais', 'file', 'mms', 'https', 'shttp',
-               'snews', 'prospero', 'rtsp', 'rtspu', 'rsync', '',
-               'svn', 'svn+ssh', 'sftp', 'nfs', 'git', 'git+ssh']
-uses_params = ['ftp', 'hdl', 'prospero', 'http', 'imap',
-               'https', 'shttp', 'rtsp', 'rtspu', 'sip', 'sips',
-               'mms', '', 'sftp', 'tel']
-
-# These are not actually used anymore, but should stay for backwards
-# compatibility.  (They are undocumented, but have a public-looking name.)
-non_hierarchical = ['gopher', 'hdl', 'mailto', 'news',
-                    'telnet', 'wais', 'imap', 'snews', 'sip', 'sips']
-uses_query = ['http', 'wais', 'imap', 'https', 'shttp', 'mms',
-              'gopher', 'rtsp', 'rtspu', 'sip', 'sips', '']
-uses_fragment = ['ftp', 'hdl', 'http', 'gopher', 'news',
-                 'nntp', 'wais', 'https', 'shttp', 'snews',
-                 'file', 'prospero', '']
-
-# Characters valid in scheme names
-scheme_chars = ('abcdefghijklmnopqrstuvwxyz'
-                'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-                '0123456789'
-                '+-.')
-
-# XXX: Consider replacing with functools.lru_cache
-MAX_CACHE_SIZE = 20
-_parse_cache = {}
-
-def clear_cache():
-    """Clear the parse cache and the quoters cache."""
-    _parse_cache.clear()
-    _safe_quoters.clear()
-
-
-# Helpers for bytes handling
-# For 3.2, we deliberately require applications that
-# handle improperly quoted URLs to do their own
-# decoding and encoding. If valid use cases are
-# presented, we may relax this by using latin-1
-# decoding internally for 3.3
-_implicit_encoding = 'ascii'
-_implicit_errors = 'strict'
-
-def _noop(obj):
-    return obj
-
-def _encode_result(obj, encoding=_implicit_encoding,
-                        errors=_implicit_errors):
-    return obj.encode(encoding, errors)
-
-def _decode_args(args, encoding=_implicit_encoding,
-                       errors=_implicit_errors):
-    return tuple(x.decode(encoding, errors) if x else '' for x in args)
-
-def _coerce_args(*args):
-    # Invokes decode if necessary to create str args
-    # and returns the coerced inputs along with
-    # an appropriate result coercion function
-    #   - noop for str inputs
-    #   - encoding function otherwise
-    str_input = isinstance(args[0], str)
-    for arg in args[1:]:
-        # We special-case the empty string to support the
-        # "scheme=''" default argument to some functions
-        if arg and isinstance(arg, str) != str_input:
-            raise TypeError("Cannot mix str and non-str arguments")
-    if str_input:
-        return args + (_noop,)
-    return _decode_args(args) + (_encode_result,)
-
-# Result objects are more helpful than simple tuples
-class _ResultMixinStr(object):
-    """Standard approach to encoding parsed results from str to bytes"""
-    __slots__ = ()
-
-    def encode(self, encoding='ascii', errors='strict'):
-        return self._encoded_counterpart(*(x.encode(encoding, errors) for x in self))
-
-
-class _ResultMixinBytes(object):
-    """Standard approach to decoding parsed results from bytes to str"""
-    __slots__ = ()
-
-    def decode(self, encoding='ascii', errors='strict'):
-        return self._decoded_counterpart(*(x.decode(encoding, errors) for x in self))
-
-
-class _NetlocResultMixinBase(object):
-    """Shared methods for the parsed result objects containing a netloc element"""
-    __slots__ = ()
-
-    @property
-    def username(self):
-        return self._userinfo[0]
-
-    @property
-    def password(self):
-        return self._userinfo[1]
-
-    @property
-    def hostname(self):
-        hostname = self._hostinfo[0]
-        if not hostname:
-            hostname = None
-        elif hostname is not None:
-            hostname = hostname.lower()
-        return hostname
-
-    @property
-    def port(self):
-        port = self._hostinfo[1]
-        if port is not None:
-            port = int(port, 10)
-            # Return None on an illegal port
-            if not ( 0 <= port <= 65535):
-                return None
-        return port
-
-
-class _NetlocResultMixinStr(_NetlocResultMixinBase, _ResultMixinStr):
-    __slots__ = ()
-
-    @property
-    def _userinfo(self):
-        netloc = self.netloc
-        userinfo, have_info, hostinfo = netloc.rpartition('@')
-        if have_info:
-            username, have_password, password = userinfo.partition(':')
-            if not have_password:
-                password = None
-        else:
-            username = password = None
-        return username, password
-
-    @property
-    def _hostinfo(self):
-        netloc = self.netloc
-        _, _, hostinfo = netloc.rpartition('@')
-        _, have_open_br, bracketed = hostinfo.partition('[')
-        if have_open_br:
-            hostname, _, port = bracketed.partition(']')
-            _, have_port, port = port.partition(':')
-        else:
-            hostname, have_port, port = hostinfo.partition(':')
-        if not have_port:
-            port = None
-        return hostname, port
-
-
-class _NetlocResultMixinBytes(_NetlocResultMixinBase, _ResultMixinBytes):
-    __slots__ = ()
-
-    @property
-    def _userinfo(self):
-        netloc = self.netloc
-        userinfo, have_info, hostinfo = netloc.rpartition(b'@')
-        if have_info:
-            username, have_password, password = userinfo.partition(b':')
-            if not have_password:
-                password = None
-        else:
-            username = password = None
-        return username, password
-
-    @property
-    def _hostinfo(self):
-        netloc = self.netloc
-        _, _, hostinfo = netloc.rpartition(b'@')
-        _, have_open_br, bracketed = hostinfo.partition(b'[')
-        if have_open_br:
-            hostname, _, port = bracketed.partition(b']')
-            _, have_port, port = port.partition(b':')
-        else:
-            hostname, have_port, port = hostinfo.partition(b':')
-        if not have_port:
-            port = None
-        return hostname, port
-
-
-from collections import namedtuple
-
-_DefragResultBase = namedtuple('DefragResult', 'url fragment')
-_SplitResultBase = namedtuple('SplitResult', 'scheme netloc path query fragment')
-_ParseResultBase = namedtuple('ParseResult', 'scheme netloc path params query fragment')
-
-# For backwards compatibility, alias _NetlocResultMixinStr
-# ResultBase is no longer part of the documented API, but it is
-# retained since deprecating it isn't worth the hassle
-ResultBase = _NetlocResultMixinStr
-
-# Structured result objects for string data
-class DefragResult(_DefragResultBase, _ResultMixinStr):
-    __slots__ = ()
-    def geturl(self):
-        if self.fragment:
-            return self.url + '#' + self.fragment
-        else:
-            return self.url
-
-class SplitResult(_SplitResultBase, _NetlocResultMixinStr):
-    __slots__ = ()
-    def geturl(self):
-        return urlunsplit(self)
-
-class ParseResult(_ParseResultBase, _NetlocResultMixinStr):
-    __slots__ = ()
-    def geturl(self):
-        return urlunparse(self)
-
-# Structured result objects for bytes data
-class DefragResultBytes(_DefragResultBase, _ResultMixinBytes):
-    __slots__ = ()
-    def geturl(self):
-        if self.fragment:
-            return self.url + b'#' + self.fragment
-        else:
-            return self.url
-
-class SplitResultBytes(_SplitResultBase, _NetlocResultMixinBytes):
-    __slots__ = ()
-    def geturl(self):
-        return urlunsplit(self)
-
-class ParseResultBytes(_ParseResultBase, _NetlocResultMixinBytes):
-    __slots__ = ()
-    def geturl(self):
-        return urlunparse(self)
-
-# Set up the encode/decode result pairs
-def _fix_result_transcoding():
-    _result_pairs = (
-        (DefragResult, DefragResultBytes),
-        (SplitResult, SplitResultBytes),
-        (ParseResult, ParseResultBytes),
-    )
-    for _decoded, _encoded in _result_pairs:
-        _decoded._encoded_counterpart = _encoded
-        _encoded._decoded_counterpart = _decoded
-
-_fix_result_transcoding()
-del _fix_result_transcoding
-
-def urlparse(url, scheme='', allow_fragments=True):
-    """Parse a URL into 6 components:
-    <scheme>://<netloc>/<path>;<params>?<query>#<fragment>
-    Return a 6-tuple: (scheme, netloc, path, params, query, fragment).
-    Note that we don't break the components up in smaller bits
-    (e.g. netloc is a single string) and we don't expand % escapes."""
-    url, scheme, _coerce_result = _coerce_args(url, scheme)
-    splitresult = urlsplit(url, scheme, allow_fragments)
-    scheme, netloc, url, query, fragment = splitresult
-    if scheme in uses_params and ';' in url:
-        url, params = _splitparams(url)
-    else:
-        params = ''
-    result = ParseResult(scheme, netloc, url, params, query, fragment)
-    return _coerce_result(result)
-
-def _splitparams(url):
-    if '/'  in url:
-        i = url.find(';', url.rfind('/'))
-        if i < 0:
-            return url, ''
-    else:
-        i = url.find(';')
-    return url[:i], url[i+1:]
-
-def _splitnetloc(url, start=0):
-    delim = len(url)   # position of end of domain part of url, default is end
-    for c in '/?#':    # look for delimiters; the order is NOT important
-        wdelim = url.find(c, start)        # find first of this delim
-        if wdelim >= 0:                    # if found
-            delim = min(delim, wdelim)     # use earliest delim position
-    return url[start:delim], url[delim:]   # return (domain, rest)
-
-def urlsplit(url, scheme='', allow_fragments=True):
-    """Parse a URL into 5 components:
-    <scheme>://<netloc>/<path>?<query>#<fragment>
-    Return a 5-tuple: (scheme, netloc, path, query, fragment).
-    Note that we don't break the components up in smaller bits
-    (e.g. netloc is a single string) and we don't expand % escapes."""
-    url, scheme, _coerce_result = _coerce_args(url, scheme)
-    allow_fragments = bool(allow_fragments)
-    key = url, scheme, allow_fragments, type(url), type(scheme)
-    cached = _parse_cache.get(key, None)
-    if cached:
-        return _coerce_result(cached)
-    if len(_parse_cache) >= MAX_CACHE_SIZE: # avoid runaway growth
-        clear_cache()
-    netloc = query = fragment = ''
-    i = url.find(':')
-    if i > 0:
-        if url[:i] == 'http': # optimize the common case
-            scheme = url[:i].lower()
-            url = url[i+1:]
-            if url[:2] == '//':
-                netloc, url = _splitnetloc(url, 2)
-                if (('[' in netloc and ']' not in netloc) or
-                        (']' in netloc and '[' not in netloc)):
-                    raise ValueError("Invalid IPv6 URL")
-            if allow_fragments and '#' in url:
-                url, fragment = url.split('#', 1)
-            if '?' in url:
-                url, query = url.split('?', 1)
-            v = SplitResult(scheme, netloc, url, query, fragment)
-            _parse_cache[key] = v
-            return _coerce_result(v)
-        for c in url[:i]:
-            if c not in scheme_chars:
-                break
-        else:
-            # make sure "url" is not actually a port number (in which case
-            # "scheme" is really part of the path)
-            rest = url[i+1:]
-            if not rest or any(c not in '0123456789' for c in rest):
-                # not a port number
-                scheme, url = url[:i].lower(), rest
-
-    if url[:2] == '//':
-        netloc, url = _splitnetloc(url, 2)
-        if (('[' in netloc and ']' not in netloc) or
-                (']' in netloc and '[' not in netloc)):
-            raise ValueError("Invalid IPv6 URL")
-    if allow_fragments and '#' in url:
-        url, fragment = url.split('#', 1)
-    if '?' in url:
-        url, query = url.split('?', 1)
-    v = SplitResult(scheme, netloc, url, query, fragment)
-    _parse_cache[key] = v
-    return _coerce_result(v)
-
-def urlunparse(components):
-    """Put a parsed URL back together again.  This may result in a
-    slightly different, but equivalent URL, if the URL that was parsed
-    originally had redundant delimiters, e.g. a ? with an empty query
-    (the draft states that these are equivalent)."""
-    scheme, netloc, url, params, query, fragment, _coerce_result = (
-                                                  _coerce_args(*components))
-    if params:
-        url = "%s;%s" % (url, params)
-    return _coerce_result(urlunsplit((scheme, netloc, url, query, fragment)))
-
-def urlunsplit(components):
-    """Combine the elements of a tuple as returned by urlsplit() into a
-    complete URL as a string. The data argument can be any five-item iterable.
-    This may result in a slightly different, but equivalent URL, if the URL that
-    was parsed originally had unnecessary delimiters (for example, a ? with an
-    empty query; the RFC states that these are equivalent)."""
-    scheme, netloc, url, query, fragment, _coerce_result = (
-                                          _coerce_args(*components))
-    if netloc or (scheme and scheme in uses_netloc and url[:2] != '//'):
-        if url and url[:1] != '/': url = '/' + url
-        url = '//' + (netloc or '') + url
-    if scheme:
-        url = scheme + ':' + url
-    if query:
-        url = url + '?' + query
-    if fragment:
-        url = url + '#' + fragment
-    return _coerce_result(url)
-
-def urljoin(base, url, allow_fragments=True):
-    """Join a base URL and a possibly relative URL to form an absolute
-    interpretation of the latter."""
-    if not base:
-        return url
-    if not url:
-        return base
-    base, url, _coerce_result = _coerce_args(base, url)
-    bscheme, bnetloc, bpath, bparams, bquery, bfragment = \
-            urlparse(base, '', allow_fragments)
-    scheme, netloc, path, params, query, fragment = \
-            urlparse(url, bscheme, allow_fragments)
-    if scheme != bscheme or scheme not in uses_relative:
-        return _coerce_result(url)
-    if scheme in uses_netloc:
-        if netloc:
-            return _coerce_result(urlunparse((scheme, netloc, path,
-                                              params, query, fragment)))
-        netloc = bnetloc
-    if path[:1] == '/':
-        return _coerce_result(urlunparse((scheme, netloc, path,
-                                          params, query, fragment)))
-    if not path and not params:
-        path = bpath
-        params = bparams
-        if not query:
-            query = bquery
-        return _coerce_result(urlunparse((scheme, netloc, path,
-                                          params, query, fragment)))
-    segments = bpath.split('/')[:-1] + path.split('/')
-    # XXX The stuff below is bogus in various ways...
-    if segments[-1] == '.':
-        segments[-1] = ''
-    while '.' in segments:
-        segments.remove('.')
-    while 1:
-        i = 1
-        n = len(segments) - 1
-        while i < n:
-            if (segments[i] == '..'
-                and segments[i-1] not in ('', '..')):
-                del segments[i-1:i+1]
-                break
-            i = i+1
-        else:
-            break
-    if segments == ['', '..']:
-        segments[-1] = ''
-    elif len(segments) >= 2 and segments[-1] == '..':
-        segments[-2:] = ['']
-    return _coerce_result(urlunparse((scheme, netloc, '/'.join(segments),
-                                      params, query, fragment)))
-
-def urldefrag(url):
-    """Removes any existing fragment from URL.
-
-    Returns a tuple of the defragmented URL and the fragment.  If
-    the URL contained no fragments, the second element is the
-    empty string.
-    """
-    url, _coerce_result = _coerce_args(url)
-    if '#' in url:
-        s, n, p, a, q, frag = urlparse(url)
-        defrag = urlunparse((s, n, p, a, q, ''))
-    else:
-        frag = ''
-        defrag = url
-    return _coerce_result(DefragResult(defrag, frag))
-
-_hexdig = '0123456789ABCDEFabcdef'
-_hextobyte = dict(((a + b).encode(), bytes([int(a + b, 16)]))
-                  for a in _hexdig for b in _hexdig)
-
-def unquote_to_bytes(string):
-    """unquote_to_bytes('abc%20def') -> b'abc def'."""
-    # Note: strings are encoded as UTF-8. This is only an issue if it contains
-    # unescaped non-ASCII characters, which URIs should not.
-    if not string:
-        # Is it a string-like object?
-        string.split
-        return bytes(b'')
-    if isinstance(string, str):
-        string = string.encode('utf-8')
-    ### For Python-Future:
-    # It is already a byte-string object, but force it to be newbytes here on
-    # Py2:
-    string = bytes(string)
-    ###
-    bits = string.split(b'%')
-    if len(bits) == 1:
-        return string
-    res = [bits[0]]
-    append = res.append
-    for item in bits[1:]:
-        try:
-            append(_hextobyte[item[:2]])
-            append(item[2:])
-        except KeyError:
-            append(b'%')
-            append(item)
-    return bytes(b'').join(res)
-
-_asciire = re.compile('([\x00-\x7f]+)')
-
-def unquote(string, encoding='utf-8', errors='replace'):
-    """Replace %xx escapes by their single-character equivalent. The optional
-    encoding and errors parameters specify how to decode percent-encoded
-    sequences into Unicode characters, as accepted by the bytes.decode()
-    method.
-    By default, percent-encoded sequences are decoded with UTF-8, and invalid
-    sequences are replaced by a placeholder character.
-
-    unquote('abc%20def') -> 'abc def'.
-    """
-    if '%' not in string:
-        string.split
-        return string
-    if encoding is None:
-        encoding = 'utf-8'
-    if errors is None:
-        errors = 'replace'
-    bits = _asciire.split(string)
-    res = [bits[0]]
-    append = res.append
-    for i in range(1, len(bits), 2):
-        append(unquote_to_bytes(bits[i]).decode(encoding, errors))
-        append(bits[i + 1])
-    return ''.join(res)
-
-def parse_qs(qs, keep_blank_values=False, strict_parsing=False,
-             encoding='utf-8', errors='replace'):
-    """Parse a query given as a string argument.
-
-        Arguments:
-
-        qs: percent-encoded query string to be parsed
-
-        keep_blank_values: flag indicating whether blank values in
-            percent-encoded queries should be treated as blank strings.
-            A true value indicates that blanks should be retained as
-            blank strings.  The default false value indicates that
-            blank values are to be ignored and treated as if they were
-            not included.
-
-        strict_parsing: flag indicating what to do with parsing errors.
-            If false (the default), errors are silently ignored.
-            If true, errors raise a ValueError exception.
-
-        encoding and errors: specify how to decode percent-encoded sequences
-            into Unicode characters, as accepted by the bytes.decode() method.
-    """
-    parsed_result = {}
-    pairs = parse_qsl(qs, keep_blank_values, strict_parsing,
-                      encoding=encoding, errors=errors)
-    for name, value in pairs:
-        if name in parsed_result:
-            parsed_result[name].append(value)
-        else:
-            parsed_result[name] = [value]
-    return parsed_result
-
-def parse_qsl(qs, keep_blank_values=False, strict_parsing=False,
-              encoding='utf-8', errors='replace'):
-    """Parse a query given as a string argument.
-
-    Arguments:
-
-    qs: percent-encoded query string to be parsed
-
-    keep_blank_values: flag indicating whether blank values in
-        percent-encoded queries should be treated as blank strings.  A
-        true value indicates that blanks should be retained as blank
-        strings.  The default false value indicates that blank values
-        are to be ignored and treated as if they were  not included.
-
-    strict_parsing: flag indicating what to do with parsing errors. If
-        false (the default), errors are silently ignored. If true,
-        errors raise a ValueError exception.
-
-    encoding and errors: specify how to decode percent-encoded sequences
-        into Unicode characters, as accepted by the bytes.decode() method.
-
-    Returns a list, as G-d intended.
-    """
-    qs, _coerce_result = _coerce_args(qs)
-    pairs = [s2 for s1 in qs.split('&') for s2 in s1.split(';')]
-    r = []
-    for name_value in pairs:
-        if not name_value and not strict_parsing:
-            continue
-        nv = name_value.split('=', 1)
-        if len(nv) != 2:
-            if strict_parsing:
-                raise ValueError("bad query field: %r" % (name_value,))
-            # Handle case of a control-name with no equal sign
-            if keep_blank_values:
-                nv.append('')
-            else:
-                continue
-        if len(nv[1]) or keep_blank_values:
-            name = nv[0].replace('+', ' ')
-            name = unquote(name, encoding=encoding, errors=errors)
-            name = _coerce_result(name)
-            value = nv[1].replace('+', ' ')
-            value = unquote(value, encoding=encoding, errors=errors)
-            value = _coerce_result(value)
-            r.append((name, value))
-    return r
-
-def unquote_plus(string, encoding='utf-8', errors='replace'):
-    """Like unquote(), but also replace plus signs by spaces, as required for
-    unquoting HTML form values.
-
-    unquote_plus('%7e/abc+def') -> '~/abc def'
-    """
-    string = string.replace('+', ' ')
-    return unquote(string, encoding, errors)
-
-_ALWAYS_SAFE = frozenset(bytes(b'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-                               b'abcdefghijklmnopqrstuvwxyz'
-                               b'0123456789'
-                               b'_.-'))
-_ALWAYS_SAFE_BYTES = bytes(_ALWAYS_SAFE)
-_safe_quoters = {}
-
-class Quoter(collections.defaultdict):
-    """A mapping from bytes (in range(0,256)) to strings.
-
-    String values are percent-encoded byte values, unless the key < 128, and
-    in the "safe" set (either the specified safe set, or default set).
-    """
-    # Keeps a cache internally, using defaultdict, for efficiency (lookups
-    # of cached keys don't call Python code at all).
-    def __init__(self, safe):
-        """safe: bytes object."""
-        self.safe = _ALWAYS_SAFE.union(bytes(safe))
-
-    def __repr__(self):
-        # Without this, will just display as a defaultdict
-        return "<Quoter %r>" % dict(self)
-
-    def __missing__(self, b):
-        # Handle a cache miss. Store quoted string in cache and return.
-        res = chr(b) if b in self.safe else '%{0:02X}'.format(b)
-        self[b] = res
-        return res
-
-def quote(string, safe='/', encoding=None, errors=None):
-    """quote('abc def') -> 'abc%20def'
-
-    Each part of a URL, e.g. the path info, the query, etc., has a
-    different set of reserved characters that must be quoted.
-
-    RFC 2396 Uniform Resource Identifiers (URI): Generic Syntax lists
-    the following reserved characters.
-
-    reserved    = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
-                  "$" | ","
-
-    Each of these characters is reserved in some component of a URL,
-    but not necessarily in all of them.
-
-    By default, the quote function is intended for quoting the path
-    section of a URL.  Thus, it will not encode '/'.  This character
-    is reserved, but in typical usage the quote function is being
-    called on a path where the existing slash characters are used as
-    reserved characters.
-
-    string and safe may be either str or bytes objects. encoding must
-    not be specified if string is a str.
-
-    The optional encoding and errors parameters specify how to deal with
-    non-ASCII characters, as accepted by the str.encode method.
-    By default, encoding='utf-8' (characters are encoded with UTF-8), and
-    errors='strict' (unsupported characters raise a UnicodeEncodeError).
-    """
-    if isinstance(string, str):
-        if not string:
-            return string
-        if encoding is None:
-            encoding = 'utf-8'
-        if errors is None:
-            errors = 'strict'
-        string = string.encode(encoding, errors)
-    else:
-        if encoding is not None:
-            raise TypeError("quote() doesn't support 'encoding' for bytes")
-        if errors is not None:
-            raise TypeError("quote() doesn't support 'errors' for bytes")
-    return quote_from_bytes(string, safe)
-
-def quote_plus(string, safe='', encoding=None, errors=None):
-    """Like quote(), but also replace ' ' with '+', as required for quoting
-    HTML form values. Plus signs in the original string are escaped unless
-    they are included in safe. It also does not have safe default to '/'.
-    """
-    # Check if ' ' in string, where string may either be a str or bytes.  If
-    # there are no spaces, the regular quote will produce the right answer.
-    if ((isinstance(string, str) and ' ' not in string) or
-        (isinstance(string, bytes) and b' ' not in string)):
-        return quote(string, safe, encoding, errors)
-    if isinstance(safe, str):
-        space = str(' ')
-    else:
-        space = bytes(b' ')
-    string = quote(string, safe + space, encoding, errors)
-    return string.replace(' ', '+')
-
-def quote_from_bytes(bs, safe='/'):
-    """Like quote(), but accepts a bytes object rather than a str, and does
-    not perform string-to-bytes encoding.  It always returns an ASCII string.
-    quote_from_bytes(b'abc def\x3f') -> 'abc%20def%3f'
-    """
-    if not isinstance(bs, (bytes, bytearray)):
-        raise TypeError("quote_from_bytes() expected bytes")
-    if not bs:
-        return str('')
-    ### For Python-Future:
-    bs = bytes(bs)
-    ###
-    if isinstance(safe, str):
-        # Normalize 'safe' by converting to bytes and removing non-ASCII chars
-        safe = str(safe).encode('ascii', 'ignore')
-    else:
-        ### For Python-Future:
-        safe = bytes(safe)
-        ###
-        safe = bytes([c for c in safe if c < 128])
-    if not bs.rstrip(_ALWAYS_SAFE_BYTES + safe):
-        return bs.decode()
-    try:
-        quoter = _safe_quoters[safe]
-    except KeyError:
-        _safe_quoters[safe] = quoter = Quoter(safe).__getitem__
-    return str('').join([quoter(char) for char in bs])
-
-def urlencode(query, doseq=False, safe='', encoding=None, errors=None):
-    """Encode a sequence of two-element tuples or dictionary into a URL query string.
-
-    If any values in the query arg are sequences and doseq is true, each
-    sequence element is converted to a separate parameter.
-
-    If the query arg is a sequence of two-element tuples, the order of the
-    parameters in the output will match the order of parameters in the
-    input.
-
-    The query arg may be either a string or a bytes type. When query arg is a
-    string, the safe, encoding and error parameters are sent the quote_plus for
-    encoding.
-    """
-
-    if hasattr(query, "items"):
-        query = query.items()
-    else:
-        # It's a bother at times that strings and string-like objects are
-        # sequences.
-        try:
-            # non-sequence items should not work with len()
-            # non-empty strings will fail this
-            if len(query) and not isinstance(query[0], tuple):
-                raise TypeError
-            # Zero-length sequences of all types will get here and succeed,
-            # but that's a minor nit.  Since the original implementation
-            # allowed empty dicts that type of behavior probably should be
-            # preserved for consistency
-        except TypeError:
-            ty, va, tb = sys.exc_info()
-            raise_with_traceback(TypeError("not a valid non-string sequence "
-                                           "or mapping object"), tb)
-
-    l = []
-    if not doseq:
-        for k, v in query:
-            if isinstance(k, bytes):
-                k = quote_plus(k, safe)
-            else:
-                k = quote_plus(str(k), safe, encoding, errors)
-
-            if isinstance(v, bytes):
-                v = quote_plus(v, safe)
-            else:
-                v = quote_plus(str(v), safe, encoding, errors)
-            l.append(k + '=' + v)
-    else:
-        for k, v in query:
-            if isinstance(k, bytes):
-                k = quote_plus(k, safe)
-            else:
-                k = quote_plus(str(k), safe, encoding, errors)
-
-            if isinstance(v, bytes):
-                v = quote_plus(v, safe)
-                l.append(k + '=' + v)
-            elif isinstance(v, str):
-                v = quote_plus(v, safe, encoding, errors)
-                l.append(k + '=' + v)
-            else:
-                try:
-                    # Is this a sufficient test for sequence-ness?
-                    x = len(v)
-                except TypeError:
-                    # not a sequence
-                    v = quote_plus(str(v), safe, encoding, errors)
-                    l.append(k + '=' + v)
-                else:
-                    # loop over the sequence
-                    for elt in v:
-                        if isinstance(elt, bytes):
-                            elt = quote_plus(elt, safe)
-                        else:
-                            elt = quote_plus(str(elt), safe, encoding, errors)
-                        l.append(k + '=' + elt)
-    return str('&').join(l)
-
-# Utilities to parse URLs (most of these return None for missing parts):
-# unwrap('<URL:type://host/path>') --> 'type://host/path'
-# splittype('type:opaquestring') --> 'type', 'opaquestring'
-# splithost('//host[:port]/path') --> 'host[:port]', '/path'
-# splituser('user[:passwd]@host[:port]') --> 'user[:passwd]', 'host[:port]'
-# splitpasswd('user:passwd') -> 'user', 'passwd'
-# splitport('host:port') --> 'host', 'port'
-# splitquery('/path?query') --> '/path', 'query'
-# splittag('/path#tag') --> '/path', 'tag'
-# splitattr('/path;attr1=value1;attr2=value2;...') ->
-#   '/path', ['attr1=value1', 'attr2=value2', ...]
-# splitvalue('attr=value') --> 'attr', 'value'
-# urllib.parse.unquote('abc%20def') -> 'abc def'
-# quote('abc def') -> 'abc%20def')
-
-def to_bytes(url):
-    """to_bytes(u"URL") --> 'URL'."""
-    # Most URL schemes require ASCII. If that changes, the conversion
-    # can be relaxed.
-    # XXX get rid of to_bytes()
-    if isinstance(url, str):
-        try:
-            url = url.encode("ASCII").decode()
-        except UnicodeError:
-            raise UnicodeError("URL " + repr(url) +
-                               " contains non-ASCII characters")
-    return url
-
-def unwrap(url):
-    """unwrap('<URL:type://host/path>') --> 'type://host/path'."""
-    url = str(url).strip()
-    if url[:1] == '<' and url[-1:] == '>':
-        url = url[1:-1].strip()
-    if url[:4] == 'URL:': url = url[4:].strip()
-    return url
-
-_typeprog = None
-def splittype(url):
-    """splittype('type:opaquestring') --> 'type', 'opaquestring'."""
-    global _typeprog
-    if _typeprog is None:
-        import re
-        _typeprog = re.compile('^([^/:]+):')
-
-    match = _typeprog.match(url)
-    if match:
-        scheme = match.group(1)
-        return scheme.lower(), url[len(scheme) + 1:]
-    return None, url
-
-_hostprog = None
-def splithost(url):
-    """splithost('//host[:port]/path') --> 'host[:port]', '/path'."""
-    global _hostprog
-    if _hostprog is None:
-        import re
-        _hostprog = re.compile('^//([^/?]*)(.*)$')
-
-    match = _hostprog.match(url)
-    if match:
-        host_port = match.group(1)
-        path = match.group(2)
-        if path and not path.startswith('/'):
-            path = '/' + path
-        return host_port, path
-    return None, url
-
-_userprog = None
-def splituser(host):
-    """splituser('user[:passwd]@host[:port]') --> 'user[:passwd]', 'host[:port]'."""
-    global _userprog
-    if _userprog is None:
-        import re
-        _userprog = re.compile('^(.*)@(.*)$')
-
-    match = _userprog.match(host)
-    if match: return match.group(1, 2)
-    return None, host
-
-_passwdprog = None
-def splitpasswd(user):
-    """splitpasswd('user:passwd') -> 'user', 'passwd'."""
-    global _passwdprog
-    if _passwdprog is None:
-        import re
-        _passwdprog = re.compile('^([^:]*):(.*)$',re.S)
-
-    match = _passwdprog.match(user)
-    if match: return match.group(1, 2)
-    return user, None
-
-# splittag('/path#tag') --> '/path', 'tag'
-_portprog = None
-def splitport(host):
-    """splitport('host:port') --> 'host', 'port'."""
-    global _portprog
-    if _portprog is None:
-        import re
-        _portprog = re.compile('^(.*):([0-9]+)$')
-
-    match = _portprog.match(host)
-    if match: return match.group(1, 2)
-    return host, None
-
-_nportprog = None
-def splitnport(host, defport=-1):
-    """Split host and port, returning numeric port.
-    Return given default port if no ':' found; defaults to -1.
-    Return numerical port if a valid number are found after ':'.
-    Return None if ':' but not a valid number."""
-    global _nportprog
-    if _nportprog is None:
-        import re
-        _nportprog = re.compile('^(.*):(.*)$')
-
-    match = _nportprog.match(host)
-    if match:
-        host, port = match.group(1, 2)
-        try:
-            if not port: raise ValueError("no digits")
-            nport = int(port)
-        except ValueError:
-            nport = None
-        return host, nport
-    return host, defport
-
-_queryprog = None
-def splitquery(url):
-    """splitquery('/path?query') --> '/path', 'query'."""
-    global _queryprog
-    if _queryprog is None:
-        import re
-        _queryprog = re.compile('^(.*)\?([^?]*)$')
-
-    match = _queryprog.match(url)
-    if match: return match.group(1, 2)
-    return url, None
-
-_tagprog = None
-def splittag(url):
-    """splittag('/path#tag') --> '/path', 'tag'."""
-    global _tagprog
-    if _tagprog is None:
-        import re
-        _tagprog = re.compile('^(.*)#([^#]*)$')
-
-    match = _tagprog.match(url)
-    if match: return match.group(1, 2)
-    return url, None
-
-def splitattr(url):
-    """splitattr('/path;attr1=value1;attr2=value2;...') ->
-        '/path', ['attr1=value1', 'attr2=value2', ...]."""
-    words = url.split(';')
-    return words[0], words[1:]
-
-_valueprog = None
-def splitvalue(attr):
-    """splitvalue('attr=value') --> 'attr', 'value'."""
-    global _valueprog
-    if _valueprog is None:
-        import re
-        _valueprog = re.compile('^([^=]*)=(.*)$')
-
-    match = _valueprog.match(attr)
-    if match: return match.group(1, 2)
-    return attr, None
diff --git a/lib/future/backports/urllib/request.py b/lib/future/backports/urllib/request.py
deleted file mode 100644
index baee5401..00000000
--- a/lib/future/backports/urllib/request.py
+++ /dev/null
@@ -1,2647 +0,0 @@
-"""
-Ported using Python-Future from the Python 3.3 standard library.
-
-An extensible library for opening URLs using a variety of protocols
-
-The simplest way to use this module is to call the urlopen function,
-which accepts a string containing a URL or a Request object (described
-below).  It opens the URL and returns the results as file-like
-object; the returned object has some extra methods described below.
-
-The OpenerDirector manages a collection of Handler objects that do
-all the actual work.  Each Handler implements a particular protocol or
-option.  The OpenerDirector is a composite object that invokes the
-Handlers needed to open the requested URL.  For example, the
-HTTPHandler performs HTTP GET and POST requests and deals with
-non-error returns.  The HTTPRedirectHandler automatically deals with
-HTTP 301, 302, 303 and 307 redirect errors, and the HTTPDigestAuthHandler
-deals with digest authentication.
-
-urlopen(url, data=None) -- Basic usage is the same as original
-urllib.  pass the url and optionally data to post to an HTTP URL, and
-get a file-like object back.  One difference is that you can also pass
-a Request instance instead of URL.  Raises a URLError (subclass of
-IOError); for HTTP errors, raises an HTTPError, which can also be
-treated as a valid response.
-
-build_opener -- Function that creates a new OpenerDirector instance.
-Will install the default handlers.  Accepts one or more Handlers as
-arguments, either instances or Handler classes that it will
-instantiate.  If one of the argument is a subclass of the default
-handler, the argument will be installed instead of the default.
-
-install_opener -- Installs a new opener as the default opener.
-
-objects of interest:
-
-OpenerDirector -- Sets up the User Agent as the Python-urllib client and manages
-the Handler classes, while dealing with requests and responses.
-
-Request -- An object that encapsulates the state of a request.  The
-state can be as simple as the URL.  It can also include extra HTTP
-headers, e.g. a User-Agent.
-
-BaseHandler --
-
-internals:
-BaseHandler and parent
-_call_chain conventions
-
-Example usage:
-
-import urllib.request
-
-# set up authentication info
-authinfo = urllib.request.HTTPBasicAuthHandler()
-authinfo.add_password(realm='PDQ Application',
-                      uri='https://mahler:8092/site-updates.py',
-                      user='klem',
-                      passwd='geheim$parole')
-
-proxy_support = urllib.request.ProxyHandler({"http" : "http://ahad-haam:3128"})
-
-# build a new opener that adds authentication and caching FTP handlers
-opener = urllib.request.build_opener(proxy_support, authinfo,
-                                     urllib.request.CacheFTPHandler)
-
-# install it
-urllib.request.install_opener(opener)
-
-f = urllib.request.urlopen('http://www.python.org/')
-"""
-
-# XXX issues:
-# If an authentication error handler that tries to perform
-# authentication for some reason but fails, how should the error be
-# signalled?  The client needs to know the HTTP error code.  But if
-# the handler knows that the problem was, e.g., that it didn't know
-# that hash algo that requested in the challenge, it would be good to
-# pass that information along to the client, too.
-# ftp errors aren't handled cleanly
-# check digest against correct (i.e. non-apache) implementation
-
-# Possible extensions:
-# complex proxies  XXX not sure what exactly was meant by this
-# abstract factory for opener
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-from future.builtins import bytes, dict, filter, input, int, map, open, str
-from future.utils import PY2, PY3, raise_with_traceback
-
-import base64
-import bisect
-import hashlib
-import array
-
-from future.backports import email
-from future.backports.http import client as http_client
-from .error import URLError, HTTPError, ContentTooShortError
-from .parse import (
-    urlparse, urlsplit, urljoin, unwrap, quote, unquote,
-    splittype, splithost, splitport, splituser, splitpasswd,
-    splitattr, splitquery, splitvalue, splittag, to_bytes, urlunparse)
-from .response import addinfourl, addclosehook
-
-import io
-import os
-import posixpath
-import re
-import socket
-import sys
-import time
-import tempfile
-import contextlib
-import warnings
-
-from future.utils import PY2
-
-if PY2:
-    from collections import Iterable
-else:
-    from collections.abc import Iterable
-
-# check for SSL
-try:
-    import ssl
-    # Not available in the SSL module in Py2:
-    from ssl import SSLContext
-except ImportError:
-    _have_ssl = False
-else:
-    _have_ssl = True
-
-__all__ = [
-    # Classes
-    'Request', 'OpenerDirector', 'BaseHandler', 'HTTPDefaultErrorHandler',
-    'HTTPRedirectHandler', 'HTTPCookieProcessor', 'ProxyHandler',
-    'HTTPPasswordMgr', 'HTTPPasswordMgrWithDefaultRealm',
-    'AbstractBasicAuthHandler', 'HTTPBasicAuthHandler', 'ProxyBasicAuthHandler',
-    'AbstractDigestAuthHandler', 'HTTPDigestAuthHandler', 'ProxyDigestAuthHandler',
-    'HTTPHandler', 'FileHandler', 'FTPHandler', 'CacheFTPHandler',
-    'UnknownHandler', 'HTTPErrorProcessor',
-    # Functions
-    'urlopen', 'install_opener', 'build_opener',
-    'pathname2url', 'url2pathname', 'getproxies',
-    # Legacy interface
-    'urlretrieve', 'urlcleanup', 'URLopener', 'FancyURLopener',
-]
-
-# used in User-Agent header sent
-__version__ = sys.version[:3]
-
-_opener = None
-def urlopen(url, data=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT, **_3to2kwargs):
-    if 'cadefault' in _3to2kwargs: cadefault = _3to2kwargs['cadefault']; del _3to2kwargs['cadefault']
-    else: cadefault = False
-    if 'capath' in _3to2kwargs: capath = _3to2kwargs['capath']; del _3to2kwargs['capath']
-    else: capath = None
-    if 'cafile' in _3to2kwargs: cafile = _3to2kwargs['cafile']; del _3to2kwargs['cafile']
-    else: cafile = None
-    global _opener
-    if cafile or capath or cadefault:
-        if not _have_ssl:
-            raise ValueError('SSL support not available')
-        context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
-        context.options |= ssl.OP_NO_SSLv2
-        context.verify_mode = ssl.CERT_REQUIRED
-        if cafile or capath:
-            context.load_verify_locations(cafile, capath)
-        else:
-            context.set_default_verify_paths()
-        https_handler = HTTPSHandler(context=context, check_hostname=True)
-        opener = build_opener(https_handler)
-    elif _opener is None:
-        _opener = opener = build_opener()
-    else:
-        opener = _opener
-    return opener.open(url, data, timeout)
-
-def install_opener(opener):
-    global _opener
-    _opener = opener
-
-_url_tempfiles = []
-def urlretrieve(url, filename=None, reporthook=None, data=None):
-    """
-    Retrieve a URL into a temporary location on disk.
-
-    Requires a URL argument. If a filename is passed, it is used as
-    the temporary file location. The reporthook argument should be
-    a callable that accepts a block number, a read size, and the
-    total file size of the URL target. The data argument should be
-    valid URL encoded data.
-
-    If a filename is passed and the URL points to a local resource,
-    the result is a copy from local file to new file.
-
-    Returns a tuple containing the path to the newly created
-    data file as well as the resulting HTTPMessage object.
-    """
-    url_type, path = splittype(url)
-
-    with contextlib.closing(urlopen(url, data)) as fp:
-        headers = fp.info()
-
-        # Just return the local path and the "headers" for file://
-        # URLs. No sense in performing a copy unless requested.
-        if url_type == "file" and not filename:
-            return os.path.normpath(path), headers
-
-        # Handle temporary file setup.
-        if filename:
-            tfp = open(filename, 'wb')
-        else:
-            tfp = tempfile.NamedTemporaryFile(delete=False)
-            filename = tfp.name
-            _url_tempfiles.append(filename)
-
-        with tfp:
-            result = filename, headers
-            bs = 1024*8
-            size = -1
-            read = 0
-            blocknum = 0
-            if "content-length" in headers:
-                size = int(headers["Content-Length"])
-
-            if reporthook:
-                reporthook(blocknum, bs, size)
-
-            while True:
-                block = fp.read(bs)
-                if not block:
-                    break
-                read += len(block)
-                tfp.write(block)
-                blocknum += 1
-                if reporthook:
-                    reporthook(blocknum, bs, size)
-
-    if size >= 0 and read < size:
-        raise ContentTooShortError(
-            "retrieval incomplete: got only %i out of %i bytes"
-            % (read, size), result)
-
-    return result
-
-def urlcleanup():
-    for temp_file in _url_tempfiles:
-        try:
-            os.unlink(temp_file)
-        except EnvironmentError:
-            pass
-
-    del _url_tempfiles[:]
-    global _opener
-    if _opener:
-        _opener = None
-
-if PY3:
-    _cut_port_re = re.compile(r":\d+$", re.ASCII)
-else:
-    _cut_port_re = re.compile(r":\d+$")
-
-def request_host(request):
-
-    """Return request-host, as defined by RFC 2965.
-
-    Variation from RFC: returned value is lowercased, for convenient
-    comparison.
-
-    """
-    url = request.full_url
-    host = urlparse(url)[1]
-    if host == "":
-        host = request.get_header("Host", "")
-
-    # remove port, if present
-    host = _cut_port_re.sub("", host, 1)
-    return host.lower()
-
-class Request(object):
-
-    def __init__(self, url, data=None, headers={},
-                 origin_req_host=None, unverifiable=False,
-                 method=None):
-        # unwrap('<URL:type://host/path>') --> 'type://host/path'
-        self.full_url = unwrap(url)
-        self.full_url, self.fragment = splittag(self.full_url)
-        self.data = data
-        self.headers = {}
-        self._tunnel_host = None
-        for key, value in headers.items():
-            self.add_header(key, value)
-        self.unredirected_hdrs = {}
-        if origin_req_host is None:
-            origin_req_host = request_host(self)
-        self.origin_req_host = origin_req_host
-        self.unverifiable = unverifiable
-        self.method = method
-        self._parse()
-
-    def _parse(self):
-        self.type, rest = splittype(self.full_url)
-        if self.type is None:
-            raise ValueError("unknown url type: %r" % self.full_url)
-        self.host, self.selector = splithost(rest)
-        if self.host:
-            self.host = unquote(self.host)
-
-    def get_method(self):
-        """Return a string indicating the HTTP request method."""
-        if self.method is not None:
-            return self.method
-        elif self.data is not None:
-            return "POST"
-        else:
-            return "GET"
-
-    def get_full_url(self):
-        if self.fragment:
-            return '%s#%s' % (self.full_url, self.fragment)
-        else:
-            return self.full_url
-
-    # Begin deprecated methods
-
-    def add_data(self, data):
-        msg = "Request.add_data method is deprecated."
-        warnings.warn(msg, DeprecationWarning, stacklevel=1)
-        self.data = data
-
-    def has_data(self):
-        msg = "Request.has_data method is deprecated."
-        warnings.warn(msg, DeprecationWarning, stacklevel=1)
-        return self.data is not None
-
-    def get_data(self):
-        msg = "Request.get_data method is deprecated."
-        warnings.warn(msg, DeprecationWarning, stacklevel=1)
-        return self.data
-
-    def get_type(self):
-        msg = "Request.get_type method is deprecated."
-        warnings.warn(msg, DeprecationWarning, stacklevel=1)
-        return self.type
-
-    def get_host(self):
-        msg = "Request.get_host method is deprecated."
-        warnings.warn(msg, DeprecationWarning, stacklevel=1)
-        return self.host
-
-    def get_selector(self):
-        msg = "Request.get_selector method is deprecated."
-        warnings.warn(msg, DeprecationWarning, stacklevel=1)
-        return self.selector
-
-    def is_unverifiable(self):
-        msg = "Request.is_unverifiable method is deprecated."
-        warnings.warn(msg, DeprecationWarning, stacklevel=1)
-        return self.unverifiable
-
-    def get_origin_req_host(self):
-        msg = "Request.get_origin_req_host method is deprecated."
-        warnings.warn(msg, DeprecationWarning, stacklevel=1)
-        return self.origin_req_host
-
-    # End deprecated methods
-
-    def set_proxy(self, host, type):
-        if self.type == 'https' and not self._tunnel_host:
-            self._tunnel_host = self.host
-        else:
-            self.type= type
-            self.selector = self.full_url
-        self.host = host
-
-    def has_proxy(self):
-        return self.selector == self.full_url
-
-    def add_header(self, key, val):
-        # useful for something like authentication
-        self.headers[key.capitalize()] = val
-
-    def add_unredirected_header(self, key, val):
-        # will not be added to a redirected request
-        self.unredirected_hdrs[key.capitalize()] = val
-
-    def has_header(self, header_name):
-        return (header_name in self.headers or
-                header_name in self.unredirected_hdrs)
-
-    def get_header(self, header_name, default=None):
-        return self.headers.get(
-            header_name,
-            self.unredirected_hdrs.get(header_name, default))
-
-    def header_items(self):
-        hdrs = self.unredirected_hdrs.copy()
-        hdrs.update(self.headers)
-        return list(hdrs.items())
-
-class OpenerDirector(object):
-    def __init__(self):
-        client_version = "Python-urllib/%s" % __version__
-        self.addheaders = [('User-agent', client_version)]
-        # self.handlers is retained only for backward compatibility
-        self.handlers = []
-        # manage the individual handlers
-        self.handle_open = {}
-        self.handle_error = {}
-        self.process_response = {}
-        self.process_request = {}
-
-    def add_handler(self, handler):
-        if not hasattr(handler, "add_parent"):
-            raise TypeError("expected BaseHandler instance, got %r" %
-                            type(handler))
-
-        added = False
-        for meth in dir(handler):
-            if meth in ["redirect_request", "do_open", "proxy_open"]:
-                # oops, coincidental match
-                continue
-
-            i = meth.find("_")
-            protocol = meth[:i]
-            condition = meth[i+1:]
-
-            if condition.startswith("error"):
-                j = condition.find("_") + i + 1
-                kind = meth[j+1:]
-                try:
-                    kind = int(kind)
-                except ValueError:
-                    pass
-                lookup = self.handle_error.get(protocol, {})
-                self.handle_error[protocol] = lookup
-            elif condition == "open":
-                kind = protocol
-                lookup = self.handle_open
-            elif condition == "response":
-                kind = protocol
-                lookup = self.process_response
-            elif condition == "request":
-                kind = protocol
-                lookup = self.process_request
-            else:
-                continue
-
-            handlers = lookup.setdefault(kind, [])
-            if handlers:
-                bisect.insort(handlers, handler)
-            else:
-                handlers.append(handler)
-            added = True
-
-        if added:
-            bisect.insort(self.handlers, handler)
-            handler.add_parent(self)
-
-    def close(self):
-        # Only exists for backwards compatibility.
-        pass
-
-    def _call_chain(self, chain, kind, meth_name, *args):
-        # Handlers raise an exception if no one else should try to handle
-        # the request, or return None if they can't but another handler
-        # could.  Otherwise, they return the response.
-        handlers = chain.get(kind, ())
-        for handler in handlers:
-            func = getattr(handler, meth_name)
-            result = func(*args)
-            if result is not None:
-                return result
-
-    def open(self, fullurl, data=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT):
-        """
-        Accept a URL or a Request object
-
-        Python-Future: if the URL is passed as a byte-string, decode it first.
-        """
-        if isinstance(fullurl, bytes):
-            fullurl = fullurl.decode()
-        if isinstance(fullurl, str):
-            req = Request(fullurl, data)
-        else:
-            req = fullurl
-            if data is not None:
-                req.data = data
-
-        req.timeout = timeout
-        protocol = req.type
-
-        # pre-process request
-        meth_name = protocol+"_request"
-        for processor in self.process_request.get(protocol, []):
-            meth = getattr(processor, meth_name)
-            req = meth(req)
-
-        response = self._open(req, data)
-
-        # post-process response
-        meth_name = protocol+"_response"
-        for processor in self.process_response.get(protocol, []):
-            meth = getattr(processor, meth_name)
-            response = meth(req, response)
-
-        return response
-
-    def _open(self, req, data=None):
-        result = self._call_chain(self.handle_open, 'default',
-                                  'default_open', req)
-        if result:
-            return result
-
-        protocol = req.type
-        result = self._call_chain(self.handle_open, protocol, protocol +
-                                  '_open', req)
-        if result:
-            return result
-
-        return self._call_chain(self.handle_open, 'unknown',
-                                'unknown_open', req)
-
-    def error(self, proto, *args):
-        if proto in ('http', 'https'):
-            # XXX http[s] protocols are special-cased
-            dict = self.handle_error['http'] # https is not different than http
-            proto = args[2]  # YUCK!
-            meth_name = 'http_error_%s' % proto
-            http_err = 1
-            orig_args = args
-        else:
-            dict = self.handle_error
-            meth_name = proto + '_error'
-            http_err = 0
-        args = (dict, proto, meth_name) + args
-        result = self._call_chain(*args)
-        if result:
-            return result
-
-        if http_err:
-            args = (dict, 'default', 'http_error_default') + orig_args
-            return self._call_chain(*args)
-
-# XXX probably also want an abstract factory that knows when it makes
-# sense to skip a superclass in favor of a subclass and when it might
-# make sense to include both
-
-def build_opener(*handlers):
-    """Create an opener object from a list of handlers.
-
-    The opener will use several default handlers, including support
-    for HTTP, FTP and when applicable HTTPS.
-
-    If any of the handlers passed as arguments are subclasses of the
-    default handlers, the default handlers will not be used.
-    """
-    def isclass(obj):
-        return isinstance(obj, type) or hasattr(obj, "__bases__")
-
-    opener = OpenerDirector()
-    default_classes = [ProxyHandler, UnknownHandler, HTTPHandler,
-                       HTTPDefaultErrorHandler, HTTPRedirectHandler,
-                       FTPHandler, FileHandler, HTTPErrorProcessor]
-    if hasattr(http_client, "HTTPSConnection"):
-        default_classes.append(HTTPSHandler)
-    skip = set()
-    for klass in default_classes:
-        for check in handlers:
-            if isclass(check):
-                if issubclass(check, klass):
-                    skip.add(klass)
-            elif isinstance(check, klass):
-                skip.add(klass)
-    for klass in skip:
-        default_classes.remove(klass)
-
-    for klass in default_classes:
-        opener.add_handler(klass())
-
-    for h in handlers:
-        if isclass(h):
-            h = h()
-        opener.add_handler(h)
-    return opener
-
-class BaseHandler(object):
-    handler_order = 500
-
-    def add_parent(self, parent):
-        self.parent = parent
-
-    def close(self):
-        # Only exists for backwards compatibility
-        pass
-
-    def __lt__(self, other):
-        if not hasattr(other, "handler_order"):
-            # Try to preserve the old behavior of having custom classes
-            # inserted after default ones (works only for custom user
-            # classes which are not aware of handler_order).
-            return True
-        return self.handler_order < other.handler_order
-
-
-class HTTPErrorProcessor(BaseHandler):
-    """Process HTTP error responses."""
-    handler_order = 1000  # after all other processing
-
-    def http_response(self, request, response):
-        code, msg, hdrs = response.code, response.msg, response.info()
-
-        # According to RFC 2616, "2xx" code indicates that the client's
-        # request was successfully received, understood, and accepted.
-        if not (200 <= code < 300):
-            response = self.parent.error(
-                'http', request, response, code, msg, hdrs)
-
-        return response
-
-    https_response = http_response
-
-class HTTPDefaultErrorHandler(BaseHandler):
-    def http_error_default(self, req, fp, code, msg, hdrs):
-        raise HTTPError(req.full_url, code, msg, hdrs, fp)
-
-class HTTPRedirectHandler(BaseHandler):
-    # maximum number of redirections to any single URL
-    # this is needed because of the state that cookies introduce
-    max_repeats = 4
-    # maximum total number of redirections (regardless of URL) before
-    # assuming we're in a loop
-    max_redirections = 10
-
-    def redirect_request(self, req, fp, code, msg, headers, newurl):
-        """Return a Request or None in response to a redirect.
-
-        This is called by the http_error_30x methods when a
-        redirection response is received.  If a redirection should
-        take place, return a new Request to allow http_error_30x to
-        perform the redirect.  Otherwise, raise HTTPError if no-one
-        else should try to handle this url.  Return None if you can't
-        but another Handler might.
-        """
-        m = req.get_method()
-        if (not (code in (301, 302, 303, 307) and m in ("GET", "HEAD")
-            or code in (301, 302, 303) and m == "POST")):
-            raise HTTPError(req.full_url, code, msg, headers, fp)
-
-        # Strictly (according to RFC 2616), 301 or 302 in response to
-        # a POST MUST NOT cause a redirection without confirmation
-        # from the user (of urllib.request, in this case).  In practice,
-        # essentially all clients do redirect in this case, so we do
-        # the same.
-        # be conciliant with URIs containing a space
-        newurl = newurl.replace(' ', '%20')
-        CONTENT_HEADERS = ("content-length", "content-type")
-        newheaders = dict((k, v) for k, v in req.headers.items()
-                          if k.lower() not in CONTENT_HEADERS)
-        return Request(newurl,
-                       headers=newheaders,
-                       origin_req_host=req.origin_req_host,
-                       unverifiable=True)
-
-    # Implementation note: To avoid the server sending us into an
-    # infinite loop, the request object needs to track what URLs we
-    # have already seen.  Do this by adding a handler-specific
-    # attribute to the Request object.
-    def http_error_302(self, req, fp, code, msg, headers):
-        # Some servers (incorrectly) return multiple Location headers
-        # (so probably same goes for URI).  Use first header.
-        if "location" in headers:
-            newurl = headers["location"]
-        elif "uri" in headers:
-            newurl = headers["uri"]
-        else:
-            return
-
-        # fix a possible malformed URL
-        urlparts = urlparse(newurl)
-
-        # For security reasons we don't allow redirection to anything other
-        # than http, https or ftp.
-
-        if urlparts.scheme not in ('http', 'https', 'ftp', ''):
-            raise HTTPError(
-                newurl, code,
-                "%s - Redirection to url '%s' is not allowed" % (msg, newurl),
-                headers, fp)
-
-        if not urlparts.path:
-            urlparts = list(urlparts)
-            urlparts[2] = "/"
-        newurl = urlunparse(urlparts)
-
-        newurl = urljoin(req.full_url, newurl)
-
-        # XXX Probably want to forget about the state of the current
-        # request, although that might interact poorly with other
-        # handlers that also use handler-specific request attributes
-        new = self.redirect_request(req, fp, code, msg, headers, newurl)
-        if new is None:
-            return
-
-        # loop detection
-        # .redirect_dict has a key url if url was previously visited.
-        if hasattr(req, 'redirect_dict'):
-            visited = new.redirect_dict = req.redirect_dict
-            if (visited.get(newurl, 0) >= self.max_repeats or
-                len(visited) >= self.max_redirections):
-                raise HTTPError(req.full_url, code,
-                                self.inf_msg + msg, headers, fp)
-        else:
-            visited = new.redirect_dict = req.redirect_dict = {}
-        visited[newurl] = visited.get(newurl, 0) + 1
-
-        # Don't close the fp until we are sure that we won't use it
-        # with HTTPError.
-        fp.read()
-        fp.close()
-
-        return self.parent.open(new, timeout=req.timeout)
-
-    http_error_301 = http_error_303 = http_error_307 = http_error_302
-
-    inf_msg = "The HTTP server returned a redirect error that would " \
-              "lead to an infinite loop.\n" \
-              "The last 30x error message was:\n"
-
-
-def _parse_proxy(proxy):
-    """Return (scheme, user, password, host/port) given a URL or an authority.
-
-    If a URL is supplied, it must have an authority (host:port) component.
-    According to RFC 3986, having an authority component means the URL must
-    have two slashes after the scheme:
-
-    >>> _parse_proxy('file:/ftp.example.com/')
-    Traceback (most recent call last):
-    ValueError: proxy URL with no authority: 'file:/ftp.example.com/'
-
-    The first three items of the returned tuple may be None.
-
-    Examples of authority parsing:
-
-    >>> _parse_proxy('proxy.example.com')
-    (None, None, None, 'proxy.example.com')
-    >>> _parse_proxy('proxy.example.com:3128')
-    (None, None, None, 'proxy.example.com:3128')
-
-    The authority component may optionally include userinfo (assumed to be
-    username:password):
-
-    >>> _parse_proxy('joe:password@proxy.example.com')
-    (None, 'joe', 'password', 'proxy.example.com')
-    >>> _parse_proxy('joe:password@proxy.example.com:3128')
-    (None, 'joe', 'password', 'proxy.example.com:3128')
-
-    Same examples, but with URLs instead:
-
-    >>> _parse_proxy('http://proxy.example.com/')
-    ('http', None, None, 'proxy.example.com')
-    >>> _parse_proxy('http://proxy.example.com:3128/')
-    ('http', None, None, 'proxy.example.com:3128')
-    >>> _parse_proxy('http://joe:password@proxy.example.com/')
-    ('http', 'joe', 'password', 'proxy.example.com')
-    >>> _parse_proxy('http://joe:password@proxy.example.com:3128')
-    ('http', 'joe', 'password', 'proxy.example.com:3128')
-
-    Everything after the authority is ignored:
-
-    >>> _parse_proxy('ftp://joe:password@proxy.example.com/rubbish:3128')
-    ('ftp', 'joe', 'password', 'proxy.example.com')
-
-    Test for no trailing '/' case:
-
-    >>> _parse_proxy('http://joe:password@proxy.example.com')
-    ('http', 'joe', 'password', 'proxy.example.com')
-
-    """
-    scheme, r_scheme = splittype(proxy)
-    if not r_scheme.startswith("/"):
-        # authority
-        scheme = None
-        authority = proxy
-    else:
-        # URL
-        if not r_scheme.startswith("//"):
-            raise ValueError("proxy URL with no authority: %r" % proxy)
-        # We have an authority, so for RFC 3986-compliant URLs (by ss 3.
-        # and 3.3.), path is empty or starts with '/'
-        end = r_scheme.find("/", 2)
-        if end == -1:
-            end = None
-        authority = r_scheme[2:end]
-    userinfo, hostport = splituser(authority)
-    if userinfo is not None:
-        user, password = splitpasswd(userinfo)
-    else:
-        user = password = None
-    return scheme, user, password, hostport
-
-class ProxyHandler(BaseHandler):
-    # Proxies must be in front
-    handler_order = 100
-
-    def __init__(self, proxies=None):
-        if proxies is None:
-            proxies = getproxies()
-        assert hasattr(proxies, 'keys'), "proxies must be a mapping"
-        self.proxies = proxies
-        for type, url in proxies.items():
-            setattr(self, '%s_open' % type,
-                    lambda r, proxy=url, type=type, meth=self.proxy_open:
-                        meth(r, proxy, type))
-
-    def proxy_open(self, req, proxy, type):
-        orig_type = req.type
-        proxy_type, user, password, hostport = _parse_proxy(proxy)
-        if proxy_type is None:
-            proxy_type = orig_type
-
-        if req.host and proxy_bypass(req.host):
-            return None
-
-        if user and password:
-            user_pass = '%s:%s' % (unquote(user),
-                                   unquote(password))
-            creds = base64.b64encode(user_pass.encode()).decode("ascii")
-            req.add_header('Proxy-authorization', 'Basic ' + creds)
-        hostport = unquote(hostport)
-        req.set_proxy(hostport, proxy_type)
-        if orig_type == proxy_type or orig_type == 'https':
-            # let other handlers take care of it
-            return None
-        else:
-            # need to start over, because the other handlers don't
-            # grok the proxy's URL type
-            # e.g. if we have a constructor arg proxies like so:
-            # {'http': 'ftp://proxy.example.com'}, we may end up turning
-            # a request for http://acme.example.com/a into one for
-            # ftp://proxy.example.com/a
-            return self.parent.open(req, timeout=req.timeout)
-
-class HTTPPasswordMgr(object):
-
-    def __init__(self):
-        self.passwd = {}
-
-    def add_password(self, realm, uri, user, passwd):
-        # uri could be a single URI or a sequence
-        if isinstance(uri, str):
-            uri = [uri]
-        if realm not in self.passwd:
-            self.passwd[realm] = {}
-        for default_port in True, False:
-            reduced_uri = tuple(
-                [self.reduce_uri(u, default_port) for u in uri])
-            self.passwd[realm][reduced_uri] = (user, passwd)
-
-    def find_user_password(self, realm, authuri):
-        domains = self.passwd.get(realm, {})
-        for default_port in True, False:
-            reduced_authuri = self.reduce_uri(authuri, default_port)
-            for uris, authinfo in domains.items():
-                for uri in uris:
-                    if self.is_suburi(uri, reduced_authuri):
-                        return authinfo
-        return None, None
-
-    def reduce_uri(self, uri, default_port=True):
-        """Accept authority or URI and extract only the authority and path."""
-        # note HTTP URLs do not have a userinfo component
-        parts = urlsplit(uri)
-        if parts[1]:
-            # URI
-            scheme = parts[0]
-            authority = parts[1]
-            path = parts[2] or '/'
-        else:
-            # host or host:port
-            scheme = None
-            authority = uri
-            path = '/'
-        host, port = splitport(authority)
-        if default_port and port is None and scheme is not None:
-            dport = {"http": 80,
-                     "https": 443,
-                     }.get(scheme)
-            if dport is not None:
-                authority = "%s:%d" % (host, dport)
-        return authority, path
-
-    def is_suburi(self, base, test):
-        """Check if test is below base in a URI tree
-
-        Both args must be URIs in reduced form.
-        """
-        if base == test:
-            return True
-        if base[0] != test[0]:
-            return False
-        common = posixpath.commonprefix((base[1], test[1]))
-        if len(common) == len(base[1]):
-            return True
-        return False
-
-
-class HTTPPasswordMgrWithDefaultRealm(HTTPPasswordMgr):
-
-    def find_user_password(self, realm, authuri):
-        user, password = HTTPPasswordMgr.find_user_password(self, realm,
-                                                            authuri)
-        if user is not None:
-            return user, password
-        return HTTPPasswordMgr.find_user_password(self, None, authuri)
-
-
-class AbstractBasicAuthHandler(object):
-
-    # XXX this allows for multiple auth-schemes, but will stupidly pick
-    # the last one with a realm specified.
-
-    # allow for double- and single-quoted realm values
-    # (single quotes are a violation of the RFC, but appear in the wild)
-    rx = re.compile('(?:.*,)*[ \t]*([^ \t]+)[ \t]+'
-                    'realm=(["\']?)([^"\']*)\\2', re.I)
-
-    # XXX could pre-emptively send auth info already accepted (RFC 2617,
-    # end of section 2, and section 1.2 immediately after "credentials"
-    # production).
-
-    def __init__(self, password_mgr=None):
-        if password_mgr is None:
-            password_mgr = HTTPPasswordMgr()
-        self.passwd = password_mgr
-        self.add_password = self.passwd.add_password
-        self.retried = 0
-
-    def reset_retry_count(self):
-        self.retried = 0
-
-    def http_error_auth_reqed(self, authreq, host, req, headers):
-        # host may be an authority (without userinfo) or a URL with an
-        # authority
-        # XXX could be multiple headers
-        authreq = headers.get(authreq, None)
-
-        if self.retried > 5:
-            # retry sending the username:password 5 times before failing.
-            raise HTTPError(req.get_full_url(), 401, "basic auth failed",
-                    headers, None)
-        else:
-            self.retried += 1
-
-        if authreq:
-            scheme = authreq.split()[0]
-            if scheme.lower() != 'basic':
-                raise ValueError("AbstractBasicAuthHandler does not"
-                                 " support the following scheme: '%s'" %
-                                 scheme)
-            else:
-                mo = AbstractBasicAuthHandler.rx.search(authreq)
-                if mo:
-                    scheme, quote, realm = mo.groups()
-                    if quote not in ['"',"'"]:
-                        warnings.warn("Basic Auth Realm was unquoted",
-                                      UserWarning, 2)
-                    if scheme.lower() == 'basic':
-                        response = self.retry_http_basic_auth(host, req, realm)
-                        if response and response.code != 401:
-                            self.retried = 0
-                        return response
-
-    def retry_http_basic_auth(self, host, req, realm):
-        user, pw = self.passwd.find_user_password(realm, host)
-        if pw is not None:
-            raw = "%s:%s" % (user, pw)
-            auth = "Basic " + base64.b64encode(raw.encode()).decode("ascii")
-            if req.headers.get(self.auth_header, None) == auth:
-                return None
-            req.add_unredirected_header(self.auth_header, auth)
-            return self.parent.open(req, timeout=req.timeout)
-        else:
-            return None
-
-
-class HTTPBasicAuthHandler(AbstractBasicAuthHandler, BaseHandler):
-
-    auth_header = 'Authorization'
-
-    def http_error_401(self, req, fp, code, msg, headers):
-        url = req.full_url
-        response = self.http_error_auth_reqed('www-authenticate',
-                                          url, req, headers)
-        self.reset_retry_count()
-        return response
-
-
-class ProxyBasicAuthHandler(AbstractBasicAuthHandler, BaseHandler):
-
-    auth_header = 'Proxy-authorization'
-
-    def http_error_407(self, req, fp, code, msg, headers):
-        # http_error_auth_reqed requires that there is no userinfo component in
-        # authority.  Assume there isn't one, since urllib.request does not (and
-        # should not, RFC 3986 s. 3.2.1) support requests for URLs containing
-        # userinfo.
-        authority = req.host
-        response = self.http_error_auth_reqed('proxy-authenticate',
-                                          authority, req, headers)
-        self.reset_retry_count()
-        return response
-
-
-# Return n random bytes.
-_randombytes = os.urandom
-
-
-class AbstractDigestAuthHandler(object):
-    # Digest authentication is specified in RFC 2617.
-
-    # XXX The client does not inspect the Authentication-Info header
-    # in a successful response.
-
-    # XXX It should be possible to test this implementation against
-    # a mock server that just generates a static set of challenges.
-
-    # XXX qop="auth-int" supports is shaky
-
-    def __init__(self, passwd=None):
-        if passwd is None:
-            passwd = HTTPPasswordMgr()
-        self.passwd = passwd
-        self.add_password = self.passwd.add_password
-        self.retried = 0
-        self.nonce_count = 0
-        self.last_nonce = None
-
-    def reset_retry_count(self):
-        self.retried = 0
-
-    def http_error_auth_reqed(self, auth_header, host, req, headers):
-        authreq = headers.get(auth_header, None)
-        if self.retried > 5:
-            # Don't fail endlessly - if we failed once, we'll probably
-            # fail a second time. Hm. Unless the Password Manager is
-            # prompting for the information. Crap. This isn't great
-            # but it's better than the current 'repeat until recursion
-            # depth exceeded' approach <wink>
-            raise HTTPError(req.full_url, 401, "digest auth failed",
-                            headers, None)
-        else:
-            self.retried += 1
-        if authreq:
-            scheme = authreq.split()[0]
-            if scheme.lower() == 'digest':
-                return self.retry_http_digest_auth(req, authreq)
-            elif scheme.lower() != 'basic':
-                raise ValueError("AbstractDigestAuthHandler does not support"
-                                 " the following scheme: '%s'" % scheme)
-
-    def retry_http_digest_auth(self, req, auth):
-        token, challenge = auth.split(' ', 1)
-        chal = parse_keqv_list(filter(None, parse_http_list(challenge)))
-        auth = self.get_authorization(req, chal)
-        if auth:
-            auth_val = 'Digest %s' % auth
-            if req.headers.get(self.auth_header, None) == auth_val:
-                return None
-            req.add_unredirected_header(self.auth_header, auth_val)
-            resp = self.parent.open(req, timeout=req.timeout)
-            return resp
-
-    def get_cnonce(self, nonce):
-        # The cnonce-value is an opaque
-        # quoted string value provided by the client and used by both client
-        # and server to avoid chosen plaintext attacks, to provide mutual
-        # authentication, and to provide some message integrity protection.
-        # This isn't a fabulous effort, but it's probably Good Enough.
-        s = "%s:%s:%s:" % (self.nonce_count, nonce, time.ctime())
-        b = s.encode("ascii") + _randombytes(8)
-        dig = hashlib.sha1(b).hexdigest()
-        return dig[:16]
-
-    def get_authorization(self, req, chal):
-        try:
-            realm = chal['realm']
-            nonce = chal['nonce']
-            qop = chal.get('qop')
-            algorithm = chal.get('algorithm', 'MD5')
-            # mod_digest doesn't send an opaque, even though it isn't
-            # supposed to be optional
-            opaque = chal.get('opaque', None)
-        except KeyError:
-            return None
-
-        H, KD = self.get_algorithm_impls(algorithm)
-        if H is None:
-            return None
-
-        user, pw = self.passwd.find_user_password(realm, req.full_url)
-        if user is None:
-            return None
-
-        # XXX not implemented yet
-        if req.data is not None:
-            entdig = self.get_entity_digest(req.data, chal)
-        else:
-            entdig = None
-
-        A1 = "%s:%s:%s" % (user, realm, pw)
-        A2 = "%s:%s" % (req.get_method(),
-                        # XXX selector: what about proxies and full urls
-                        req.selector)
-        if qop == 'auth':
-            if nonce == self.last_nonce:
-                self.nonce_count += 1
-            else:
-                self.nonce_count = 1
-                self.last_nonce = nonce
-            ncvalue = '%08x' % self.nonce_count
-            cnonce = self.get_cnonce(nonce)
-            noncebit = "%s:%s:%s:%s:%s" % (nonce, ncvalue, cnonce, qop, H(A2))
-            respdig = KD(H(A1), noncebit)
-        elif qop is None:
-            respdig = KD(H(A1), "%s:%s" % (nonce, H(A2)))
-        else:
-            # XXX handle auth-int.
-            raise URLError("qop '%s' is not supported." % qop)
-
-        # XXX should the partial digests be encoded too?
-
-        base = 'username="%s", realm="%s", nonce="%s", uri="%s", ' \
-               'response="%s"' % (user, realm, nonce, req.selector,
-                                  respdig)
-        if opaque:
-            base += ', opaque="%s"' % opaque
-        if entdig:
-            base += ', digest="%s"' % entdig
-        base += ', algorithm="%s"' % algorithm
-        if qop:
-            base += ', qop=auth, nc=%s, cnonce="%s"' % (ncvalue, cnonce)
-        return base
-
-    def get_algorithm_impls(self, algorithm):
-        # lambdas assume digest modules are imported at the top level
-        if algorithm == 'MD5':
-            H = lambda x: hashlib.md5(x.encode("ascii")).hexdigest()
-        elif algorithm == 'SHA':
-            H = lambda x: hashlib.sha1(x.encode("ascii")).hexdigest()
-        # XXX MD5-sess
-        KD = lambda s, d: H("%s:%s" % (s, d))
-        return H, KD
-
-    def get_entity_digest(self, data, chal):
-        # XXX not implemented yet
-        return None
-
-
-class HTTPDigestAuthHandler(BaseHandler, AbstractDigestAuthHandler):
-    """An authentication protocol defined by RFC 2069
-
-    Digest authentication improves on basic authentication because it
-    does not transmit passwords in the clear.
-    """
-
-    auth_header = 'Authorization'
-    handler_order = 490  # before Basic auth
-
-    def http_error_401(self, req, fp, code, msg, headers):
-        host = urlparse(req.full_url)[1]
-        retry = self.http_error_auth_reqed('www-authenticate',
-                                           host, req, headers)
-        self.reset_retry_count()
-        return retry
-
-
-class ProxyDigestAuthHandler(BaseHandler, AbstractDigestAuthHandler):
-
-    auth_header = 'Proxy-Authorization'
-    handler_order = 490  # before Basic auth
-
-    def http_error_407(self, req, fp, code, msg, headers):
-        host = req.host
-        retry = self.http_error_auth_reqed('proxy-authenticate',
-                                           host, req, headers)
-        self.reset_retry_count()
-        return retry
-
-class AbstractHTTPHandler(BaseHandler):
-
-    def __init__(self, debuglevel=0):
-        self._debuglevel = debuglevel
-
-    def set_http_debuglevel(self, level):
-        self._debuglevel = level
-
-    def do_request_(self, request):
-        host = request.host
-        if not host:
-            raise URLError('no host given')
-
-        if request.data is not None:  # POST
-            data = request.data
-            if isinstance(data, str):
-                msg = "POST data should be bytes or an iterable of bytes. " \
-                      "It cannot be of type str."
-                raise TypeError(msg)
-            if not request.has_header('Content-type'):
-                request.add_unredirected_header(
-                    'Content-type',
-                    'application/x-www-form-urlencoded')
-            if not request.has_header('Content-length'):
-                size = None
-                try:
-                    ### For Python-Future:
-                    if PY2 and isinstance(data, array.array):
-                        # memoryviews of arrays aren't supported
-                        # in Py2.7. (e.g. memoryview(array.array('I',
-                        # [1, 2, 3, 4])) raises a TypeError.)
-                        # So we calculate the size manually instead:
-                        size = len(data) * data.itemsize
-                    ###
-                    else:
-                        mv = memoryview(data)
-                        size = len(mv) * mv.itemsize
-                except TypeError:
-                    if isinstance(data, Iterable):
-                        raise ValueError("Content-Length should be specified "
-                                "for iterable data of type %r %r" % (type(data),
-                                data))
-                else:
-                    request.add_unredirected_header(
-                            'Content-length', '%d' % size)
-
-        sel_host = host
-        if request.has_proxy():
-            scheme, sel = splittype(request.selector)
-            sel_host, sel_path = splithost(sel)
-        if not request.has_header('Host'):
-            request.add_unredirected_header('Host', sel_host)
-        for name, value in self.parent.addheaders:
-            name = name.capitalize()
-            if not request.has_header(name):
-                request.add_unredirected_header(name, value)
-
-        return request
-
-    def do_open(self, http_class, req, **http_conn_args):
-        """Return an HTTPResponse object for the request, using http_class.
-
-        http_class must implement the HTTPConnection API from http.client.
-        """
-        host = req.host
-        if not host:
-            raise URLError('no host given')
-
-        # will parse host:port
-        h = http_class(host, timeout=req.timeout, **http_conn_args)
-
-        headers = dict(req.unredirected_hdrs)
-        headers.update(dict((k, v) for k, v in req.headers.items()
-                            if k not in headers))
-
-        # TODO(jhylton): Should this be redesigned to handle
-        # persistent connections?
-
-        # We want to make an HTTP/1.1 request, but the addinfourl
-        # class isn't prepared to deal with a persistent connection.
-        # It will try to read all remaining data from the socket,
-        # which will block while the server waits for the next request.
-        # So make sure the connection gets closed after the (only)
-        # request.
-        headers["Connection"] = "close"
-        headers = dict((name.title(), val) for name, val in headers.items())
-
-        if req._tunnel_host:
-            tunnel_headers = {}
-            proxy_auth_hdr = "Proxy-Authorization"
-            if proxy_auth_hdr in headers:
-                tunnel_headers[proxy_auth_hdr] = headers[proxy_auth_hdr]
-                # Proxy-Authorization should not be sent to origin
-                # server.
-                del headers[proxy_auth_hdr]
-            h.set_tunnel(req._tunnel_host, headers=tunnel_headers)
-
-        try:
-            h.request(req.get_method(), req.selector, req.data, headers)
-        except socket.error as err: # timeout error
-            h.close()
-            raise URLError(err)
-        else:
-            r = h.getresponse()
-            # If the server does not send us a 'Connection: close' header,
-            # HTTPConnection assumes the socket should be left open. Manually
-            # mark the socket to be closed when this response object goes away.
-            if h.sock:
-                h.sock.close()
-                h.sock = None
-
-
-        r.url = req.get_full_url()
-        # This line replaces the .msg attribute of the HTTPResponse
-        # with .headers, because urllib clients expect the response to
-        # have the reason in .msg.  It would be good to mark this
-        # attribute is deprecated and get then to use info() or
-        # .headers.
-        r.msg = r.reason
-        return r
-
-
-class HTTPHandler(AbstractHTTPHandler):
-
-    def http_open(self, req):
-        return self.do_open(http_client.HTTPConnection, req)
-
-    http_request = AbstractHTTPHandler.do_request_
-
-if hasattr(http_client, 'HTTPSConnection'):
-
-    class HTTPSHandler(AbstractHTTPHandler):
-
-        def __init__(self, debuglevel=0, context=None, check_hostname=None):
-            AbstractHTTPHandler.__init__(self, debuglevel)
-            self._context = context
-            self._check_hostname = check_hostname
-
-        def https_open(self, req):
-            return self.do_open(http_client.HTTPSConnection, req,
-                context=self._context, check_hostname=self._check_hostname)
-
-        https_request = AbstractHTTPHandler.do_request_
-
-    __all__.append('HTTPSHandler')
-
-class HTTPCookieProcessor(BaseHandler):
-    def __init__(self, cookiejar=None):
-        import future.backports.http.cookiejar as http_cookiejar
-        if cookiejar is None:
-            cookiejar = http_cookiejar.CookieJar()
-        self.cookiejar = cookiejar
-
-    def http_request(self, request):
-        self.cookiejar.add_cookie_header(request)
-        return request
-
-    def http_response(self, request, response):
-        self.cookiejar.extract_cookies(response, request)
-        return response
-
-    https_request = http_request
-    https_response = http_response
-
-class UnknownHandler(BaseHandler):
-    def unknown_open(self, req):
-        type = req.type
-        raise URLError('unknown url type: %s' % type)
-
-def parse_keqv_list(l):
-    """Parse list of key=value strings where keys are not duplicated."""
-    parsed = {}
-    for elt in l:
-        k, v = elt.split('=', 1)
-        if v[0] == '"' and v[-1] == '"':
-            v = v[1:-1]
-        parsed[k] = v
-    return parsed
-
-def parse_http_list(s):
-    """Parse lists as described by RFC 2068 Section 2.
-
-    In particular, parse comma-separated lists where the elements of
-    the list may include quoted-strings.  A quoted-string could
-    contain a comma.  A non-quoted string could have quotes in the
-    middle.  Neither commas nor quotes count if they are escaped.
-    Only double-quotes count, not single-quotes.
-    """
-    res = []
-    part = ''
-
-    escape = quote = False
-    for cur in s:
-        if escape:
-            part += cur
-            escape = False
-            continue
-        if quote:
-            if cur == '\\':
-                escape = True
-                continue
-            elif cur == '"':
-                quote = False
-            part += cur
-            continue
-
-        if cur == ',':
-            res.append(part)
-            part = ''
-            continue
-
-        if cur == '"':
-            quote = True
-
-        part += cur
-
-    # append last part
-    if part:
-        res.append(part)
-
-    return [part.strip() for part in res]
-
-class FileHandler(BaseHandler):
-    # Use local file or FTP depending on form of URL
-    def file_open(self, req):
-        url = req.selector
-        if url[:2] == '//' and url[2:3] != '/' and (req.host and
-                req.host != 'localhost'):
-            if not req.host is self.get_names():
-                raise URLError("file:// scheme is supported only on localhost")
-        else:
-            return self.open_local_file(req)
-
-    # names for the localhost
-    names = None
-    def get_names(self):
-        if FileHandler.names is None:
-            try:
-                FileHandler.names = tuple(
-                    socket.gethostbyname_ex('localhost')[2] +
-                    socket.gethostbyname_ex(socket.gethostname())[2])
-            except socket.gaierror:
-                FileHandler.names = (socket.gethostbyname('localhost'),)
-        return FileHandler.names
-
-    # not entirely sure what the rules are here
-    def open_local_file(self, req):
-        import future.backports.email.utils as email_utils
-        import mimetypes
-        host = req.host
-        filename = req.selector
-        localfile = url2pathname(filename)
-        try:
-            stats = os.stat(localfile)
-            size = stats.st_size
-            modified = email_utils.formatdate(stats.st_mtime, usegmt=True)
-            mtype = mimetypes.guess_type(filename)[0]
-            headers = email.message_from_string(
-                'Content-type: %s\nContent-length: %d\nLast-modified: %s\n' %
-                (mtype or 'text/plain', size, modified))
-            if host:
-                host, port = splitport(host)
-            if not host or \
-                (not port and _safe_gethostbyname(host) in self.get_names()):
-                if host:
-                    origurl = 'file://' + host + filename
-                else:
-                    origurl = 'file://' + filename
-                return addinfourl(open(localfile, 'rb'), headers, origurl)
-        except OSError as exp:
-            # users shouldn't expect OSErrors coming from urlopen()
-            raise URLError(exp)
-        raise URLError('file not on local host')
-
-def _safe_gethostbyname(host):
-    try:
-        return socket.gethostbyname(host)
-    except socket.gaierror:
-        return None
-
-class FTPHandler(BaseHandler):
-    def ftp_open(self, req):
-        import ftplib
-        import mimetypes
-        host = req.host
-        if not host:
-            raise URLError('ftp error: no host given')
-        host, port = splitport(host)
-        if port is None:
-            port = ftplib.FTP_PORT
-        else:
-            port = int(port)
-
-        # username/password handling
-        user, host = splituser(host)
-        if user:
-            user, passwd = splitpasswd(user)
-        else:
-            passwd = None
-        host = unquote(host)
-        user = user or ''
-        passwd = passwd or ''
-
-        try:
-            host = socket.gethostbyname(host)
-        except socket.error as msg:
-            raise URLError(msg)
-        path, attrs = splitattr(req.selector)
-        dirs = path.split('/')
-        dirs = list(map(unquote, dirs))
-        dirs, file = dirs[:-1], dirs[-1]
-        if dirs and not dirs[0]:
-            dirs = dirs[1:]
-        try:
-            fw = self.connect_ftp(user, passwd, host, port, dirs, req.timeout)
-            type = file and 'I' or 'D'
-            for attr in attrs:
-                attr, value = splitvalue(attr)
-                if attr.lower() == 'type' and \
-                   value in ('a', 'A', 'i', 'I', 'd', 'D'):
-                    type = value.upper()
-            fp, retrlen = fw.retrfile(file, type)
-            headers = ""
-            mtype = mimetypes.guess_type(req.full_url)[0]
-            if mtype:
-                headers += "Content-type: %s\n" % mtype
-            if retrlen is not None and retrlen >= 0:
-                headers += "Content-length: %d\n" % retrlen
-            headers = email.message_from_string(headers)
-            return addinfourl(fp, headers, req.full_url)
-        except ftplib.all_errors as exp:
-            exc = URLError('ftp error: %r' % exp)
-            raise_with_traceback(exc)
-
-    def connect_ftp(self, user, passwd, host, port, dirs, timeout):
-        return ftpwrapper(user, passwd, host, port, dirs, timeout,
-                          persistent=False)
-
-class CacheFTPHandler(FTPHandler):
-    # XXX would be nice to have pluggable cache strategies
-    # XXX this stuff is definitely not thread safe
-    def __init__(self):
-        self.cache = {}
-        self.timeout = {}
-        self.soonest = 0
-        self.delay = 60
-        self.max_conns = 16
-
-    def setTimeout(self, t):
-        self.delay = t
-
-    def setMaxConns(self, m):
-        self.max_conns = m
-
-    def connect_ftp(self, user, passwd, host, port, dirs, timeout):
-        key = user, host, port, '/'.join(dirs), timeout
-        if key in self.cache:
-            self.timeout[key] = time.time() + self.delay
-        else:
-            self.cache[key] = ftpwrapper(user, passwd, host, port,
-                                         dirs, timeout)
-            self.timeout[key] = time.time() + self.delay
-        self.check_cache()
-        return self.cache[key]
-
-    def check_cache(self):
-        # first check for old ones
-        t = time.time()
-        if self.soonest <= t:
-            for k, v in list(self.timeout.items()):
-                if v < t:
-                    self.cache[k].close()
-                    del self.cache[k]
-                    del self.timeout[k]
-        self.soonest = min(list(self.timeout.values()))
-
-        # then check the size
-        if len(self.cache) == self.max_conns:
-            for k, v in list(self.timeout.items()):
-                if v == self.soonest:
-                    del self.cache[k]
-                    del self.timeout[k]
-                    break
-            self.soonest = min(list(self.timeout.values()))
-
-    def clear_cache(self):
-        for conn in self.cache.values():
-            conn.close()
-        self.cache.clear()
-        self.timeout.clear()
-
-
-# Code move from the old urllib module
-
-MAXFTPCACHE = 10        # Trim the ftp cache beyond this size
-
-# Helper for non-unix systems
-if os.name == 'nt':
-    from nturl2path import url2pathname, pathname2url
-else:
-    def url2pathname(pathname):
-        """OS-specific conversion from a relative URL of the 'file' scheme
-        to a file system path; not recommended for general use."""
-        return unquote(pathname)
-
-    def pathname2url(pathname):
-        """OS-specific conversion from a file system path to a relative URL
-        of the 'file' scheme; not recommended for general use."""
-        return quote(pathname)
-
-# This really consists of two pieces:
-# (1) a class which handles opening of all sorts of URLs
-#     (plus assorted utilities etc.)
-# (2) a set of functions for parsing URLs
-# XXX Should these be separated out into different modules?
-
-
-ftpcache = {}
-class URLopener(object):
-    """Class to open URLs.
-    This is a class rather than just a subroutine because we may need
-    more than one set of global protocol-specific options.
-    Note -- this is a base class for those who don't want the
-    automatic handling of errors type 302 (relocated) and 401
-    (authorization needed)."""
-
-    __tempfiles = None
-
-    version = "Python-urllib/%s" % __version__
-
-    # Constructor
-    def __init__(self, proxies=None, **x509):
-        msg = "%(class)s style of invoking requests is deprecated. " \
-              "Use newer urlopen functions/methods" % {'class': self.__class__.__name__}
-        warnings.warn(msg, DeprecationWarning, stacklevel=3)
-        if proxies is None:
-            proxies = getproxies()
-        assert hasattr(proxies, 'keys'), "proxies must be a mapping"
-        self.proxies = proxies
-        self.key_file = x509.get('key_file')
-        self.cert_file = x509.get('cert_file')
-        self.addheaders = [('User-Agent', self.version)]
-        self.__tempfiles = []
-        self.__unlink = os.unlink # See cleanup()
-        self.tempcache = None
-        # Undocumented feature: if you assign {} to tempcache,
-        # it is used to cache files retrieved with
-        # self.retrieve().  This is not enabled by default
-        # since it does not work for changing documents (and I
-        # haven't got the logic to check expiration headers
-        # yet).
-        self.ftpcache = ftpcache
-        # Undocumented feature: you can use a different
-        # ftp cache by assigning to the .ftpcache member;
-        # in case you want logically independent URL openers
-        # XXX This is not threadsafe.  Bah.
-
-    def __del__(self):
-        self.close()
-
-    def close(self):
-        self.cleanup()
-
-    def cleanup(self):
-        # This code sometimes runs when the rest of this module
-        # has already been deleted, so it can't use any globals
-        # or import anything.
-        if self.__tempfiles:
-            for file in self.__tempfiles:
-                try:
-                    self.__unlink(file)
-                except OSError:
-                    pass
-            del self.__tempfiles[:]
-        if self.tempcache:
-            self.tempcache.clear()
-
-    def addheader(self, *args):
-        """Add a header to be used by the HTTP interface only
-        e.g. u.addheader('Accept', 'sound/basic')"""
-        self.addheaders.append(args)
-
-    # External interface
-    def open(self, fullurl, data=None):
-        """Use URLopener().open(file) instead of open(file, 'r')."""
-        fullurl = unwrap(to_bytes(fullurl))
-        fullurl = quote(fullurl, safe="%/:=&?~#+!$,;'@()*[]|")
-        if self.tempcache and fullurl in self.tempcache:
-            filename, headers = self.tempcache[fullurl]
-            fp = open(filename, 'rb')
-            return addinfourl(fp, headers, fullurl)
-        urltype, url = splittype(fullurl)
-        if not urltype:
-            urltype = 'file'
-        if urltype in self.proxies:
-            proxy = self.proxies[urltype]
-            urltype, proxyhost = splittype(proxy)
-            host, selector = splithost(proxyhost)
-            url = (host, fullurl) # Signal special case to open_*()
-        else:
-            proxy = None
-        name = 'open_' + urltype
-        self.type = urltype
-        name = name.replace('-', '_')
-        if not hasattr(self, name):
-            if proxy:
-                return self.open_unknown_proxy(proxy, fullurl, data)
-            else:
-                return self.open_unknown(fullurl, data)
-        try:
-            if data is None:
-                return getattr(self, name)(url)
-            else:
-                return getattr(self, name)(url, data)
-        except HTTPError:
-            raise
-        except socket.error as msg:
-            raise_with_traceback(IOError('socket error', msg))
-
-    def open_unknown(self, fullurl, data=None):
-        """Overridable interface to open unknown URL type."""
-        type, url = splittype(fullurl)
-        raise IOError('url error', 'unknown url type', type)
-
-    def open_unknown_proxy(self, proxy, fullurl, data=None):
-        """Overridable interface to open unknown URL type."""
-        type, url = splittype(fullurl)
-        raise IOError('url error', 'invalid proxy for %s' % type, proxy)
-
-    # External interface
-    def retrieve(self, url, filename=None, reporthook=None, data=None):
-        """retrieve(url) returns (filename, headers) for a local object
-        or (tempfilename, headers) for a remote object."""
-        url = unwrap(to_bytes(url))
-        if self.tempcache and url in self.tempcache:
-            return self.tempcache[url]
-        type, url1 = splittype(url)
-        if filename is None and (not type or type == 'file'):
-            try:
-                fp = self.open_local_file(url1)
-                hdrs = fp.info()
-                fp.close()
-                return url2pathname(splithost(url1)[1]), hdrs
-            except IOError as msg:
-                pass
-        fp = self.open(url, data)
-        try:
-            headers = fp.info()
-            if filename:
-                tfp = open(filename, 'wb')
-            else:
-                import tempfile
-                garbage, path = splittype(url)
-                garbage, path = splithost(path or "")
-                path, garbage = splitquery(path or "")
-                path, garbage = splitattr(path or "")
-                suffix = os.path.splitext(path)[1]
-                (fd, filename) = tempfile.mkstemp(suffix)
-                self.__tempfiles.append(filename)
-                tfp = os.fdopen(fd, 'wb')
-            try:
-                result = filename, headers
-                if self.tempcache is not None:
-                    self.tempcache[url] = result
-                bs = 1024*8
-                size = -1
-                read = 0
-                blocknum = 0
-                if "content-length" in headers:
-                    size = int(headers["Content-Length"])
-                if reporthook:
-                    reporthook(blocknum, bs, size)
-                while 1:
-                    block = fp.read(bs)
-                    if not block:
-                        break
-                    read += len(block)
-                    tfp.write(block)
-                    blocknum += 1
-                    if reporthook:
-                        reporthook(blocknum, bs, size)
-            finally:
-                tfp.close()
-        finally:
-            fp.close()
-
-        # raise exception if actual size does not match content-length header
-        if size >= 0 and read < size:
-            raise ContentTooShortError(
-                "retrieval incomplete: got only %i out of %i bytes"
-                % (read, size), result)
-
-        return result
-
-    # Each method named open_<type> knows how to open that type of URL
-
-    def _open_generic_http(self, connection_factory, url, data):
-        """Make an HTTP connection using connection_class.
-
-        This is an internal method that should be called from
-        open_http() or open_https().
-
-        Arguments:
-        - connection_factory should take a host name and return an
-          HTTPConnection instance.
-        - url is the url to retrieval or a host, relative-path pair.
-        - data is payload for a POST request or None.
-        """
-
-        user_passwd = None
-        proxy_passwd= None
-        if isinstance(url, str):
-            host, selector = splithost(url)
-            if host:
-                user_passwd, host = splituser(host)
-                host = unquote(host)
-            realhost = host
-        else:
-            host, selector = url
-            # check whether the proxy contains authorization information
-            proxy_passwd, host = splituser(host)
-            # now we proceed with the url we want to obtain
-            urltype, rest = splittype(selector)
-            url = rest
-            user_passwd = None
-            if urltype.lower() != 'http':
-                realhost = None
-            else:
-                realhost, rest = splithost(rest)
-                if realhost:
-                    user_passwd, realhost = splituser(realhost)
-                if user_passwd:
-                    selector = "%s://%s%s" % (urltype, realhost, rest)
-                if proxy_bypass(realhost):
-                    host = realhost
-
-        if not host: raise IOError('http error', 'no host given')
-
-        if proxy_passwd:
-            proxy_passwd = unquote(proxy_passwd)
-            proxy_auth = base64.b64encode(proxy_passwd.encode()).decode('ascii')
-        else:
-            proxy_auth = None
-
-        if user_passwd:
-            user_passwd = unquote(user_passwd)
-            auth = base64.b64encode(user_passwd.encode()).decode('ascii')
-        else:
-            auth = None
-        http_conn = connection_factory(host)
-        headers = {}
-        if proxy_auth:
-            headers["Proxy-Authorization"] = "Basic %s" % proxy_auth
-        if auth:
-            headers["Authorization"] =  "Basic %s" % auth
-        if realhost:
-            headers["Host"] = realhost
-
-        # Add Connection:close as we don't support persistent connections yet.
-        # This helps in closing the socket and avoiding ResourceWarning
-
-        headers["Connection"] = "close"
-
-        for header, value in self.addheaders:
-            headers[header] = value
-
-        if data is not None:
-            headers["Content-Type"] = "application/x-www-form-urlencoded"
-            http_conn.request("POST", selector, data, headers)
-        else:
-            http_conn.request("GET", selector, headers=headers)
-
-        try:
-            response = http_conn.getresponse()
-        except http_client.BadStatusLine:
-            # something went wrong with the HTTP status line
-            raise URLError("http protocol error: bad status line")
-
-        # According to RFC 2616, "2xx" code indicates that the client's
-        # request was successfully received, understood, and accepted.
-        if 200 <= response.status < 300:
-            return addinfourl(response, response.msg, "http:" + url,
-                              response.status)
-        else:
-            return self.http_error(
-                url, response.fp,
-                response.status, response.reason, response.msg, data)
-
-    def open_http(self, url, data=None):
-        """Use HTTP protocol."""
-        return self._open_generic_http(http_client.HTTPConnection, url, data)
-
-    def http_error(self, url, fp, errcode, errmsg, headers, data=None):
-        """Handle http errors.
-
-        Derived class can override this, or provide specific handlers
-        named http_error_DDD where DDD is the 3-digit error code."""
-        # First check if there's a specific handler for this error
-        name = 'http_error_%d' % errcode
-        if hasattr(self, name):
-            method = getattr(self, name)
-            if data is None:
-                result = method(url, fp, errcode, errmsg, headers)
-            else:
-                result = method(url, fp, errcode, errmsg, headers, data)
-            if result: return result
-        return self.http_error_default(url, fp, errcode, errmsg, headers)
-
-    def http_error_default(self, url, fp, errcode, errmsg, headers):
-        """Default error handler: close the connection and raise IOError."""
-        fp.close()
-        raise HTTPError(url, errcode, errmsg, headers, None)
-
-    if _have_ssl:
-        def _https_connection(self, host):
-            return http_client.HTTPSConnection(host,
-                                           key_file=self.key_file,
-                                           cert_file=self.cert_file)
-
-        def open_https(self, url, data=None):
-            """Use HTTPS protocol."""
-            return self._open_generic_http(self._https_connection, url, data)
-
-    def open_file(self, url):
-        """Use local file or FTP depending on form of URL."""
-        if not isinstance(url, str):
-            raise URLError('file error: proxy support for file protocol currently not implemented')
-        if url[:2] == '//' and url[2:3] != '/' and url[2:12].lower() != 'localhost/':
-            raise ValueError("file:// scheme is supported only on localhost")
-        else:
-            return self.open_local_file(url)
-
-    def open_local_file(self, url):
-        """Use local file."""
-        import future.backports.email.utils as email_utils
-        import mimetypes
-        host, file = splithost(url)
-        localname = url2pathname(file)
-        try:
-            stats = os.stat(localname)
-        except OSError as e:
-            raise URLError(e.strerror, e.filename)
-        size = stats.st_size
-        modified = email_utils.formatdate(stats.st_mtime, usegmt=True)
-        mtype = mimetypes.guess_type(url)[0]
-        headers = email.message_from_string(
-            'Content-Type: %s\nContent-Length: %d\nLast-modified: %s\n' %
-            (mtype or 'text/plain', size, modified))
-        if not host:
-            urlfile = file
-            if file[:1] == '/':
-                urlfile = 'file://' + file
-            return addinfourl(open(localname, 'rb'), headers, urlfile)
-        host, port = splitport(host)
-        if (not port
-           and socket.gethostbyname(host) in ((localhost(),) + thishost())):
-            urlfile = file
-            if file[:1] == '/':
-                urlfile = 'file://' + file
-            elif file[:2] == './':
-                raise ValueError("local file url may start with / or file:. Unknown url of type: %s" % url)
-            return addinfourl(open(localname, 'rb'), headers, urlfile)
-        raise URLError('local file error: not on local host')
-
-    def open_ftp(self, url):
-        """Use FTP protocol."""
-        if not isinstance(url, str):
-            raise URLError('ftp error: proxy support for ftp protocol currently not implemented')
-        import mimetypes
-        host, path = splithost(url)
-        if not host: raise URLError('ftp error: no host given')
-        host, port = splitport(host)
-        user, host = splituser(host)
-        if user: user, passwd = splitpasswd(user)
-        else: passwd = None
-        host = unquote(host)
-        user = unquote(user or '')
-        passwd = unquote(passwd or '')
-        host = socket.gethostbyname(host)
-        if not port:
-            import ftplib
-            port = ftplib.FTP_PORT
-        else:
-            port = int(port)
-        path, attrs = splitattr(path)
-        path = unquote(path)
-        dirs = path.split('/')
-        dirs, file = dirs[:-1], dirs[-1]
-        if dirs and not dirs[0]: dirs = dirs[1:]
-        if dirs and not dirs[0]: dirs[0] = '/'
-        key = user, host, port, '/'.join(dirs)
-        # XXX thread unsafe!
-        if len(self.ftpcache) > MAXFTPCACHE:
-            # Prune the cache, rather arbitrarily
-            for k in self.ftpcache.keys():
-                if k != key:
-                    v = self.ftpcache[k]
-                    del self.ftpcache[k]
-                    v.close()
-        try:
-            if key not in self.ftpcache:
-                self.ftpcache[key] = \
-                    ftpwrapper(user, passwd, host, port, dirs)
-            if not file: type = 'D'
-            else: type = 'I'
-            for attr in attrs:
-                attr, value = splitvalue(attr)
-                if attr.lower() == 'type' and \
-                   value in ('a', 'A', 'i', 'I', 'd', 'D'):
-                    type = value.upper()
-            (fp, retrlen) = self.ftpcache[key].retrfile(file, type)
-            mtype = mimetypes.guess_type("ftp:" + url)[0]
-            headers = ""
-            if mtype:
-                headers += "Content-Type: %s\n" % mtype
-            if retrlen is not None and retrlen >= 0:
-                headers += "Content-Length: %d\n" % retrlen
-            headers = email.message_from_string(headers)
-            return addinfourl(fp, headers, "ftp:" + url)
-        except ftperrors() as exp:
-            raise_with_traceback(URLError('ftp error %r' % exp))
-
-    def open_data(self, url, data=None):
-        """Use "data" URL."""
-        if not isinstance(url, str):
-            raise URLError('data error: proxy support for data protocol currently not implemented')
-        # ignore POSTed data
-        #
-        # syntax of data URLs:
-        # dataurl   := "data:" [ mediatype ] [ ";base64" ] "," data
-        # mediatype := [ type "/" subtype ] *( ";" parameter )
-        # data      := *urlchar
-        # parameter := attribute "=" value
-        try:
-            [type, data] = url.split(',', 1)
-        except ValueError:
-            raise IOError('data error', 'bad data URL')
-        if not type:
-            type = 'text/plain;charset=US-ASCII'
-        semi = type.rfind(';')
-        if semi >= 0 and '=' not in type[semi:]:
-            encoding = type[semi+1:]
-            type = type[:semi]
-        else:
-            encoding = ''
-        msg = []
-        msg.append('Date: %s'%time.strftime('%a, %d %b %Y %H:%M:%S GMT',
-                                            time.gmtime(time.time())))
-        msg.append('Content-type: %s' % type)
-        if encoding == 'base64':
-            # XXX is this encoding/decoding ok?
-            data = base64.decodebytes(data.encode('ascii')).decode('latin-1')
-        else:
-            data = unquote(data)
-        msg.append('Content-Length: %d' % len(data))
-        msg.append('')
-        msg.append(data)
-        msg = '\n'.join(msg)
-        headers = email.message_from_string(msg)
-        f = io.StringIO(msg)
-        #f.fileno = None     # needed for addinfourl
-        return addinfourl(f, headers, url)
-
-
-class FancyURLopener(URLopener):
-    """Derived class with handlers for errors we can handle (perhaps)."""
-
-    def __init__(self, *args, **kwargs):
-        URLopener.__init__(self, *args, **kwargs)
-        self.auth_cache = {}
-        self.tries = 0
-        self.maxtries = 10
-
-    def http_error_default(self, url, fp, errcode, errmsg, headers):
-        """Default error handling -- don't raise an exception."""
-        return addinfourl(fp, headers, "http:" + url, errcode)
-
-    def http_error_302(self, url, fp, errcode, errmsg, headers, data=None):
-        """Error 302 -- relocated (temporarily)."""
-        self.tries += 1
-        if self.maxtries and self.tries >= self.maxtries:
-            if hasattr(self, "http_error_500"):
-                meth = self.http_error_500
-            else:
-                meth = self.http_error_default
-            self.tries = 0
-            return meth(url, fp, 500,
-                        "Internal Server Error: Redirect Recursion", headers)
-        result = self.redirect_internal(url, fp, errcode, errmsg, headers,
-                                        data)
-        self.tries = 0
-        return result
-
-    def redirect_internal(self, url, fp, errcode, errmsg, headers, data):
-        if 'location' in headers:
-            newurl = headers['location']
-        elif 'uri' in headers:
-            newurl = headers['uri']
-        else:
-            return
-        fp.close()
-
-        # In case the server sent a relative URL, join with original:
-        newurl = urljoin(self.type + ":" + url, newurl)
-
-        urlparts = urlparse(newurl)
-
-        # For security reasons, we don't allow redirection to anything other
-        # than http, https and ftp.
-
-        # We are using newer HTTPError with older redirect_internal method
-        # This older method will get deprecated in 3.3
-
-        if urlparts.scheme not in ('http', 'https', 'ftp', ''):
-            raise HTTPError(newurl, errcode,
-                            errmsg +
-                            " Redirection to url '%s' is not allowed." % newurl,
-                            headers, fp)
-
-        return self.open(newurl)
-
-    def http_error_301(self, url, fp, errcode, errmsg, headers, data=None):
-        """Error 301 -- also relocated (permanently)."""
-        return self.http_error_302(url, fp, errcode, errmsg, headers, data)
-
-    def http_error_303(self, url, fp, errcode, errmsg, headers, data=None):
-        """Error 303 -- also relocated (essentially identical to 302)."""
-        return self.http_error_302(url, fp, errcode, errmsg, headers, data)
-
-    def http_error_307(self, url, fp, errcode, errmsg, headers, data=None):
-        """Error 307 -- relocated, but turn POST into error."""
-        if data is None:
-            return self.http_error_302(url, fp, errcode, errmsg, headers, data)
-        else:
-            return self.http_error_default(url, fp, errcode, errmsg, headers)
-
-    def http_error_401(self, url, fp, errcode, errmsg, headers, data=None,
-            retry=False):
-        """Error 401 -- authentication required.
-        This function supports Basic authentication only."""
-        if 'www-authenticate' not in headers:
-            URLopener.http_error_default(self, url, fp,
-                                         errcode, errmsg, headers)
-        stuff = headers['www-authenticate']
-        match = re.match('[ \t]*([^ \t]+)[ \t]+realm="([^"]*)"', stuff)
-        if not match:
-            URLopener.http_error_default(self, url, fp,
-                                         errcode, errmsg, headers)
-        scheme, realm = match.groups()
-        if scheme.lower() != 'basic':
-            URLopener.http_error_default(self, url, fp,
-                                         errcode, errmsg, headers)
-        if not retry:
-            URLopener.http_error_default(self, url, fp, errcode, errmsg,
-                    headers)
-        name = 'retry_' + self.type + '_basic_auth'
-        if data is None:
-            return getattr(self,name)(url, realm)
-        else:
-            return getattr(self,name)(url, realm, data)
-
-    def http_error_407(self, url, fp, errcode, errmsg, headers, data=None,
-            retry=False):
-        """Error 407 -- proxy authentication required.
-        This function supports Basic authentication only."""
-        if 'proxy-authenticate' not in headers:
-            URLopener.http_error_default(self, url, fp,
-                                         errcode, errmsg, headers)
-        stuff = headers['proxy-authenticate']
-        match = re.match('[ \t]*([^ \t]+)[ \t]+realm="([^"]*)"', stuff)
-        if not match:
-            URLopener.http_error_default(self, url, fp,
-                                         errcode, errmsg, headers)
-        scheme, realm = match.groups()
-        if scheme.lower() != 'basic':
-            URLopener.http_error_default(self, url, fp,
-                                         errcode, errmsg, headers)
-        if not retry:
-            URLopener.http_error_default(self, url, fp, errcode, errmsg,
-                    headers)
-        name = 'retry_proxy_' + self.type + '_basic_auth'
-        if data is None:
-            return getattr(self,name)(url, realm)
-        else:
-            return getattr(self,name)(url, realm, data)
-
-    def retry_proxy_http_basic_auth(self, url, realm, data=None):
-        host, selector = splithost(url)
-        newurl = 'http://' + host + selector
-        proxy = self.proxies['http']
-        urltype, proxyhost = splittype(proxy)
-        proxyhost, proxyselector = splithost(proxyhost)
-        i = proxyhost.find('@') + 1
-        proxyhost = proxyhost[i:]
-        user, passwd = self.get_user_passwd(proxyhost, realm, i)
-        if not (user or passwd): return None
-        proxyhost = "%s:%s@%s" % (quote(user, safe=''),
-                                  quote(passwd, safe=''), proxyhost)
-        self.proxies['http'] = 'http://' + proxyhost + proxyselector
-        if data is None:
-            return self.open(newurl)
-        else:
-            return self.open(newurl, data)
-
-    def retry_proxy_https_basic_auth(self, url, realm, data=None):
-        host, selector = splithost(url)
-        newurl = 'https://' + host + selector
-        proxy = self.proxies['https']
-        urltype, proxyhost = splittype(proxy)
-        proxyhost, proxyselector = splithost(proxyhost)
-        i = proxyhost.find('@') + 1
-        proxyhost = proxyhost[i:]
-        user, passwd = self.get_user_passwd(proxyhost, realm, i)
-        if not (user or passwd): return None
-        proxyhost = "%s:%s@%s" % (quote(user, safe=''),
-                                  quote(passwd, safe=''), proxyhost)
-        self.proxies['https'] = 'https://' + proxyhost + proxyselector
-        if data is None:
-            return self.open(newurl)
-        else:
-            return self.open(newurl, data)
-
-    def retry_http_basic_auth(self, url, realm, data=None):
-        host, selector = splithost(url)
-        i = host.find('@') + 1
-        host = host[i:]
-        user, passwd = self.get_user_passwd(host, realm, i)
-        if not (user or passwd): return None
-        host = "%s:%s@%s" % (quote(user, safe=''),
-                             quote(passwd, safe=''), host)
-        newurl = 'http://' + host + selector
-        if data is None:
-            return self.open(newurl)
-        else:
-            return self.open(newurl, data)
-
-    def retry_https_basic_auth(self, url, realm, data=None):
-        host, selector = splithost(url)
-        i = host.find('@') + 1
-        host = host[i:]
-        user, passwd = self.get_user_passwd(host, realm, i)
-        if not (user or passwd): return None
-        host = "%s:%s@%s" % (quote(user, safe=''),
-                             quote(passwd, safe=''), host)
-        newurl = 'https://' + host + selector
-        if data is None:
-            return self.open(newurl)
-        else:
-            return self.open(newurl, data)
-
-    def get_user_passwd(self, host, realm, clear_cache=0):
-        key = realm + '@' + host.lower()
-        if key in self.auth_cache:
-            if clear_cache:
-                del self.auth_cache[key]
-            else:
-                return self.auth_cache[key]
-        user, passwd = self.prompt_user_passwd(host, realm)
-        if user or passwd: self.auth_cache[key] = (user, passwd)
-        return user, passwd
-
-    def prompt_user_passwd(self, host, realm):
-        """Override this in a GUI environment!"""
-        import getpass
-        try:
-            user = input("Enter username for %s at %s: " % (realm, host))
-            passwd = getpass.getpass("Enter password for %s in %s at %s: " %
-                (user, realm, host))
-            return user, passwd
-        except KeyboardInterrupt:
-            print()
-            return None, None
-
-
-# Utility functions
-
-_localhost = None
-def localhost():
-    """Return the IP address of the magic hostname 'localhost'."""
-    global _localhost
-    if _localhost is None:
-        _localhost = socket.gethostbyname('localhost')
-    return _localhost
-
-_thishost = None
-def thishost():
-    """Return the IP addresses of the current host."""
-    global _thishost
-    if _thishost is None:
-        try:
-            _thishost = tuple(socket.gethostbyname_ex(socket.gethostname())[2])
-        except socket.gaierror:
-            _thishost = tuple(socket.gethostbyname_ex('localhost')[2])
-    return _thishost
-
-_ftperrors = None
-def ftperrors():
-    """Return the set of errors raised by the FTP class."""
-    global _ftperrors
-    if _ftperrors is None:
-        import ftplib
-        _ftperrors = ftplib.all_errors
-    return _ftperrors
-
-_noheaders = None
-def noheaders():
-    """Return an empty email Message object."""
-    global _noheaders
-    if _noheaders is None:
-        _noheaders = email.message_from_string("")
-    return _noheaders
-
-
-# Utility classes
-
-class ftpwrapper(object):
-    """Class used by open_ftp() for cache of open FTP connections."""
-
-    def __init__(self, user, passwd, host, port, dirs, timeout=None,
-                 persistent=True):
-        self.user = user
-        self.passwd = passwd
-        self.host = host
-        self.port = port
-        self.dirs = dirs
-        self.timeout = timeout
-        self.refcount = 0
-        self.keepalive = persistent
-        self.init()
-
-    def init(self):
-        import ftplib
-        self.busy = 0
-        self.ftp = ftplib.FTP()
-        self.ftp.connect(self.host, self.port, self.timeout)
-        self.ftp.login(self.user, self.passwd)
-        _target = '/'.join(self.dirs)
-        self.ftp.cwd(_target)
-
-    def retrfile(self, file, type):
-        import ftplib
-        self.endtransfer()
-        if type in ('d', 'D'): cmd = 'TYPE A'; isdir = 1
-        else: cmd = 'TYPE ' + type; isdir = 0
-        try:
-            self.ftp.voidcmd(cmd)
-        except ftplib.all_errors:
-            self.init()
-            self.ftp.voidcmd(cmd)
-        conn = None
-        if file and not isdir:
-            # Try to retrieve as a file
-            try:
-                cmd = 'RETR ' + file
-                conn, retrlen = self.ftp.ntransfercmd(cmd)
-            except ftplib.error_perm as reason:
-                if str(reason)[:3] != '550':
-                    raise_with_traceback(URLError('ftp error: %r' % reason))
-        if not conn:
-            # Set transfer mode to ASCII!
-            self.ftp.voidcmd('TYPE A')
-            # Try a directory listing. Verify that directory exists.
-            if file:
-                pwd = self.ftp.pwd()
-                try:
-                    try:
-                        self.ftp.cwd(file)
-                    except ftplib.error_perm as reason:
-                        ### Was:
-                        # raise URLError('ftp error: %r' % reason) from reason
-                        exc = URLError('ftp error: %r' % reason)
-                        exc.__cause__ = reason
-                        raise exc
-                finally:
-                    self.ftp.cwd(pwd)
-                cmd = 'LIST ' + file
-            else:
-                cmd = 'LIST'
-            conn, retrlen = self.ftp.ntransfercmd(cmd)
-        self.busy = 1
-
-        ftpobj = addclosehook(conn.makefile('rb'), self.file_close)
-        self.refcount += 1
-        conn.close()
-        # Pass back both a suitably decorated object and a retrieval length
-        return (ftpobj, retrlen)
-
-    def endtransfer(self):
-        self.busy = 0
-
-    def close(self):
-        self.keepalive = False
-        if self.refcount <= 0:
-            self.real_close()
-
-    def file_close(self):
-        self.endtransfer()
-        self.refcount -= 1
-        if self.refcount <= 0 and not self.keepalive:
-            self.real_close()
-
-    def real_close(self):
-        self.endtransfer()
-        try:
-            self.ftp.close()
-        except ftperrors():
-            pass
-
-# Proxy handling
-def getproxies_environment():
-    """Return a dictionary of scheme -> proxy server URL mappings.
-
-    Scan the environment for variables named <scheme>_proxy;
-    this seems to be the standard convention.  If you need a
-    different way, you can pass a proxies dictionary to the
-    [Fancy]URLopener constructor.
-
-    """
-    proxies = {}
-    for name, value in os.environ.items():
-        name = name.lower()
-        if value and name[-6:] == '_proxy':
-            proxies[name[:-6]] = value
-    return proxies
-
-def proxy_bypass_environment(host):
-    """Test if proxies should not be used for a particular host.
-
-    Checks the environment for a variable named no_proxy, which should
-    be a list of DNS suffixes separated by commas, or '*' for all hosts.
-    """
-    no_proxy = os.environ.get('no_proxy', '') or os.environ.get('NO_PROXY', '')
-    # '*' is special case for always bypass
-    if no_proxy == '*':
-        return 1
-    # strip port off host
-    hostonly, port = splitport(host)
-    # check if the host ends with any of the DNS suffixes
-    no_proxy_list = [proxy.strip() for proxy in no_proxy.split(',')]
-    for name in no_proxy_list:
-        if name and (hostonly.endswith(name) or host.endswith(name)):
-            return 1
-    # otherwise, don't bypass
-    return 0
-
-
-# This code tests an OSX specific data structure but is testable on all
-# platforms
-def _proxy_bypass_macosx_sysconf(host, proxy_settings):
-    """
-    Return True iff this host shouldn't be accessed using a proxy
-
-    This function uses the MacOSX framework SystemConfiguration
-    to fetch the proxy information.
-
-    proxy_settings come from _scproxy._get_proxy_settings or get mocked ie:
-    { 'exclude_simple': bool,
-      'exceptions': ['foo.bar', '*.bar.com', '127.0.0.1', '10.1', '10.0/16']
-    }
-    """
-    from fnmatch import fnmatch
-
-    hostonly, port = splitport(host)
-
-    def ip2num(ipAddr):
-        parts = ipAddr.split('.')
-        parts = list(map(int, parts))
-        if len(parts) != 4:
-            parts = (parts + [0, 0, 0, 0])[:4]
-        return (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8) | parts[3]
-
-    # Check for simple host names:
-    if '.' not in host:
-        if proxy_settings['exclude_simple']:
-            return True
-
-    hostIP = None
-
-    for value in proxy_settings.get('exceptions', ()):
-        # Items in the list are strings like these: *.local, 169.254/16
-        if not value: continue
-
-        m = re.match(r"(\d+(?:\.\d+)*)(/\d+)?", value)
-        if m is not None:
-            if hostIP is None:
-                try:
-                    hostIP = socket.gethostbyname(hostonly)
-                    hostIP = ip2num(hostIP)
-                except socket.error:
-                    continue
-
-            base = ip2num(m.group(1))
-            mask = m.group(2)
-            if mask is None:
-                mask = 8 * (m.group(1).count('.') + 1)
-            else:
-                mask = int(mask[1:])
-            mask = 32 - mask
-
-            if (hostIP >> mask) == (base >> mask):
-                return True
-
-        elif fnmatch(host, value):
-            return True
-
-    return False
-
-
-if sys.platform == 'darwin':
-    from _scproxy import _get_proxy_settings, _get_proxies
-
-    def proxy_bypass_macosx_sysconf(host):
-        proxy_settings = _get_proxy_settings()
-        return _proxy_bypass_macosx_sysconf(host, proxy_settings)
-
-    def getproxies_macosx_sysconf():
-        """Return a dictionary of scheme -> proxy server URL mappings.
-
-        This function uses the MacOSX framework SystemConfiguration
-        to fetch the proxy information.
-        """
-        return _get_proxies()
-
-
-
-    def proxy_bypass(host):
-        if getproxies_environment():
-            return proxy_bypass_environment(host)
-        else:
-            return proxy_bypass_macosx_sysconf(host)
-
-    def getproxies():
-        return getproxies_environment() or getproxies_macosx_sysconf()
-
-
-elif os.name == 'nt':
-    def getproxies_registry():
-        """Return a dictionary of scheme -> proxy server URL mappings.
-
-        Win32 uses the registry to store proxies.
-
-        """
-        proxies = {}
-        try:
-            import winreg
-        except ImportError:
-            # Std module, so should be around - but you never know!
-            return proxies
-        try:
-            internetSettings = winreg.OpenKey(winreg.HKEY_CURRENT_USER,
-                r'Software\Microsoft\Windows\CurrentVersion\Internet Settings')
-            proxyEnable = winreg.QueryValueEx(internetSettings,
-                                               'ProxyEnable')[0]
-            if proxyEnable:
-                # Returned as Unicode but problems if not converted to ASCII
-                proxyServer = str(winreg.QueryValueEx(internetSettings,
-                                                       'ProxyServer')[0])
-                if '=' in proxyServer:
-                    # Per-protocol settings
-                    for p in proxyServer.split(';'):
-                        protocol, address = p.split('=', 1)
-                        # See if address has a type:// prefix
-                        if not re.match('^([^/:]+)://', address):
-                            address = '%s://%s' % (protocol, address)
-                        proxies[protocol] = address
-                else:
-                    # Use one setting for all protocols
-                    if proxyServer[:5] == 'http:':
-                        proxies['http'] = proxyServer
-                    else:
-                        proxies['http'] = 'http://%s' % proxyServer
-                        proxies['https'] = 'https://%s' % proxyServer
-                        proxies['ftp'] = 'ftp://%s' % proxyServer
-            internetSettings.Close()
-        except (WindowsError, ValueError, TypeError):
-            # Either registry key not found etc, or the value in an
-            # unexpected format.
-            # proxies already set up to be empty so nothing to do
-            pass
-        return proxies
-
-    def getproxies():
-        """Return a dictionary of scheme -> proxy server URL mappings.
-
-        Returns settings gathered from the environment, if specified,
-        or the registry.
-
-        """
-        return getproxies_environment() or getproxies_registry()
-
-    def proxy_bypass_registry(host):
-        try:
-            import winreg
-        except ImportError:
-            # Std modules, so should be around - but you never know!
-            return 0
-        try:
-            internetSettings = winreg.OpenKey(winreg.HKEY_CURRENT_USER,
-                r'Software\Microsoft\Windows\CurrentVersion\Internet Settings')
-            proxyEnable = winreg.QueryValueEx(internetSettings,
-                                               'ProxyEnable')[0]
-            proxyOverride = str(winreg.QueryValueEx(internetSettings,
-                                                     'ProxyOverride')[0])
-            # ^^^^ Returned as Unicode but problems if not converted to ASCII
-        except WindowsError:
-            return 0
-        if not proxyEnable or not proxyOverride:
-            return 0
-        # try to make a host list from name and IP address.
-        rawHost, port = splitport(host)
-        host = [rawHost]
-        try:
-            addr = socket.gethostbyname(rawHost)
-            if addr != rawHost:
-                host.append(addr)
-        except socket.error:
-            pass
-        try:
-            fqdn = socket.getfqdn(rawHost)
-            if fqdn != rawHost:
-                host.append(fqdn)
-        except socket.error:
-            pass
-        # make a check value list from the registry entry: replace the
-        # '<local>' string by the localhost entry and the corresponding
-        # canonical entry.
-        proxyOverride = proxyOverride.split(';')
-        # now check if we match one of the registry values.
-        for test in proxyOverride:
-            if test == '<local>':
-                if '.' not in rawHost:
-                    return 1
-            test = test.replace(".", r"\.")     # mask dots
-            test = test.replace("*", r".*")     # change glob sequence
-            test = test.replace("?", r".")      # change glob char
-            for val in host:
-                if re.match(test, val, re.I):
-                    return 1
-        return 0
-
-    def proxy_bypass(host):
-        """Return a dictionary of scheme -> proxy server URL mappings.
-
-        Returns settings gathered from the environment, if specified,
-        or the registry.
-
-        """
-        if getproxies_environment():
-            return proxy_bypass_environment(host)
-        else:
-            return proxy_bypass_registry(host)
-
-else:
-    # By default use environment variables
-    getproxies = getproxies_environment
-    proxy_bypass = proxy_bypass_environment
diff --git a/lib/future/backports/urllib/response.py b/lib/future/backports/urllib/response.py
deleted file mode 100644
index adbf6e5a..00000000
--- a/lib/future/backports/urllib/response.py
+++ /dev/null
@@ -1,103 +0,0 @@
-"""Response classes used by urllib.
-
-The base class, addbase, defines a minimal file-like interface,
-including read() and readline().  The typical response object is an
-addinfourl instance, which defines an info() method that returns
-headers and a geturl() method that returns the url.
-"""
-from __future__ import absolute_import, division, unicode_literals
-from future.builtins import object
-
-class addbase(object):
-    """Base class for addinfo and addclosehook."""
-
-    # XXX Add a method to expose the timeout on the underlying socket?
-
-    def __init__(self, fp):
-        # TODO(jhylton): Is there a better way to delegate using io?
-        self.fp = fp
-        self.read = self.fp.read
-        self.readline = self.fp.readline
-        # TODO(jhylton): Make sure an object with readlines() is also iterable
-        if hasattr(self.fp, "readlines"):
-            self.readlines = self.fp.readlines
-        if hasattr(self.fp, "fileno"):
-            self.fileno = self.fp.fileno
-        else:
-            self.fileno = lambda: None
-
-    def __iter__(self):
-        # Assigning `__iter__` to the instance doesn't work as intended
-        # because the iter builtin does something like `cls.__iter__(obj)`
-        # and thus fails to find the _bound_ method `obj.__iter__`.
-        # Returning just `self.fp` works for built-in file objects but
-        # might not work for general file-like objects.
-        return iter(self.fp)
-
-    def __repr__(self):
-        return '<%s at %r whose fp = %r>' % (self.__class__.__name__,
-                                             id(self), self.fp)
-
-    def close(self):
-        if self.fp:
-            self.fp.close()
-        self.fp = None
-        self.read = None
-        self.readline = None
-        self.readlines = None
-        self.fileno = None
-        self.__iter__ = None
-        self.__next__ = None
-
-    def __enter__(self):
-        if self.fp is None:
-            raise ValueError("I/O operation on closed file")
-        return self
-
-    def __exit__(self, type, value, traceback):
-        self.close()
-
-class addclosehook(addbase):
-    """Class to add a close hook to an open file."""
-
-    def __init__(self, fp, closehook, *hookargs):
-        addbase.__init__(self, fp)
-        self.closehook = closehook
-        self.hookargs = hookargs
-
-    def close(self):
-        if self.closehook:
-            self.closehook(*self.hookargs)
-            self.closehook = None
-            self.hookargs = None
-        addbase.close(self)
-
-class addinfo(addbase):
-    """class to add an info() method to an open file."""
-
-    def __init__(self, fp, headers):
-        addbase.__init__(self, fp)
-        self.headers = headers
-
-    def info(self):
-        return self.headers
-
-class addinfourl(addbase):
-    """class to add info() and geturl() methods to an open file."""
-
-    def __init__(self, fp, headers, url, code=None):
-        addbase.__init__(self, fp)
-        self.headers = headers
-        self.url = url
-        self.code = code
-
-    def info(self):
-        return self.headers
-
-    def getcode(self):
-        return self.code
-
-    def geturl(self):
-        return self.url
-
-del absolute_import, division, unicode_literals, object
diff --git a/lib/future/backports/urllib/robotparser.py b/lib/future/backports/urllib/robotparser.py
deleted file mode 100644
index a0f36511..00000000
--- a/lib/future/backports/urllib/robotparser.py
+++ /dev/null
@@ -1,211 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-from future.builtins import str
-""" robotparser.py
-
-    Copyright (C) 2000  Bastian Kleineidam
-
-    You can choose between two licenses when using this package:
-    1) GNU GPLv2
-    2) PSF license for Python 2.2
-
-    The robots.txt Exclusion Protocol is implemented as specified in
-    http://info.webcrawler.com/mak/projects/robots/norobots-rfc.html
-"""
-
-# Was: import urllib.parse, urllib.request
-from future.backports import urllib
-from future.backports.urllib import parse as _parse, request as _request
-urllib.parse = _parse
-urllib.request = _request
-
-
-__all__ = ["RobotFileParser"]
-
-class RobotFileParser(object):
-    """ This class provides a set of methods to read, parse and answer
-    questions about a single robots.txt file.
-
-    """
-
-    def __init__(self, url=''):
-        self.entries = []
-        self.default_entry = None
-        self.disallow_all = False
-        self.allow_all = False
-        self.set_url(url)
-        self.last_checked = 0
-
-    def mtime(self):
-        """Returns the time the robots.txt file was last fetched.
-
-        This is useful for long-running web spiders that need to
-        check for new robots.txt files periodically.
-
-        """
-        return self.last_checked
-
-    def modified(self):
-        """Sets the time the robots.txt file was last fetched to the
-        current time.
-
-        """
-        import time
-        self.last_checked = time.time()
-
-    def set_url(self, url):
-        """Sets the URL referring to a robots.txt file."""
-        self.url = url
-        self.host, self.path = urllib.parse.urlparse(url)[1:3]
-
-    def read(self):
-        """Reads the robots.txt URL and feeds it to the parser."""
-        try:
-            f = urllib.request.urlopen(self.url)
-        except urllib.error.HTTPError as err:
-            if err.code in (401, 403):
-                self.disallow_all = True
-            elif err.code >= 400:
-                self.allow_all = True
-        else:
-            raw = f.read()
-            self.parse(raw.decode("utf-8").splitlines())
-
-    def _add_entry(self, entry):
-        if "*" in entry.useragents:
-            # the default entry is considered last
-            if self.default_entry is None:
-                # the first default entry wins
-                self.default_entry = entry
-        else:
-            self.entries.append(entry)
-
-    def parse(self, lines):
-        """Parse the input lines from a robots.txt file.
-
-        We allow that a user-agent: line is not preceded by
-        one or more blank lines.
-        """
-        # states:
-        #   0: start state
-        #   1: saw user-agent line
-        #   2: saw an allow or disallow line
-        state = 0
-        entry = Entry()
-
-        for line in lines:
-            if not line:
-                if state == 1:
-                    entry = Entry()
-                    state = 0
-                elif state == 2:
-                    self._add_entry(entry)
-                    entry = Entry()
-                    state = 0
-            # remove optional comment and strip line
-            i = line.find('#')
-            if i >= 0:
-                line = line[:i]
-            line = line.strip()
-            if not line:
-                continue
-            line = line.split(':', 1)
-            if len(line) == 2:
-                line[0] = line[0].strip().lower()
-                line[1] = urllib.parse.unquote(line[1].strip())
-                if line[0] == "user-agent":
-                    if state == 2:
-                        self._add_entry(entry)
-                        entry = Entry()
-                    entry.useragents.append(line[1])
-                    state = 1
-                elif line[0] == "disallow":
-                    if state != 0:
-                        entry.rulelines.append(RuleLine(line[1], False))
-                        state = 2
-                elif line[0] == "allow":
-                    if state != 0:
-                        entry.rulelines.append(RuleLine(line[1], True))
-                        state = 2
-        if state == 2:
-            self._add_entry(entry)
-
-
-    def can_fetch(self, useragent, url):
-        """using the parsed robots.txt decide if useragent can fetch url"""
-        if self.disallow_all:
-            return False
-        if self.allow_all:
-            return True
-        # search for given user agent matches
-        # the first match counts
-        parsed_url = urllib.parse.urlparse(urllib.parse.unquote(url))
-        url = urllib.parse.urlunparse(('','',parsed_url.path,
-            parsed_url.params,parsed_url.query, parsed_url.fragment))
-        url = urllib.parse.quote(url)
-        if not url:
-            url = "/"
-        for entry in self.entries:
-            if entry.applies_to(useragent):
-                return entry.allowance(url)
-        # try the default entry last
-        if self.default_entry:
-            return self.default_entry.allowance(url)
-        # agent not found ==> access granted
-        return True
-
-    def __str__(self):
-        return ''.join([str(entry) + "\n" for entry in self.entries])
-
-
-class RuleLine(object):
-    """A rule line is a single "Allow:" (allowance==True) or "Disallow:"
-       (allowance==False) followed by a path."""
-    def __init__(self, path, allowance):
-        if path == '' and not allowance:
-            # an empty value means allow all
-            allowance = True
-        self.path = urllib.parse.quote(path)
-        self.allowance = allowance
-
-    def applies_to(self, filename):
-        return self.path == "*" or filename.startswith(self.path)
-
-    def __str__(self):
-        return (self.allowance and "Allow" or "Disallow") + ": " + self.path
-
-
-class Entry(object):
-    """An entry has one or more user-agents and zero or more rulelines"""
-    def __init__(self):
-        self.useragents = []
-        self.rulelines = []
-
-    def __str__(self):
-        ret = []
-        for agent in self.useragents:
-            ret.extend(["User-agent: ", agent, "\n"])
-        for line in self.rulelines:
-            ret.extend([str(line), "\n"])
-        return ''.join(ret)
-
-    def applies_to(self, useragent):
-        """check if this entry applies to the specified agent"""
-        # split the name token and make it lower case
-        useragent = useragent.split("/")[0].lower()
-        for agent in self.useragents:
-            if agent == '*':
-                # we have the catch-all agent
-                return True
-            agent = agent.lower()
-            if agent in useragent:
-                return True
-        return False
-
-    def allowance(self, filename):
-        """Preconditions:
-        - our agent applies to this entry
-        - filename is URL decoded"""
-        for line in self.rulelines:
-            if line.applies_to(filename):
-                return line.allowance
-        return True
diff --git a/lib/future/backports/xmlrpc/__init__.py b/lib/future/backports/xmlrpc/__init__.py
deleted file mode 100644
index 196d3788..00000000
--- a/lib/future/backports/xmlrpc/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# This directory is a Python package.
diff --git a/lib/future/backports/xmlrpc/client.py b/lib/future/backports/xmlrpc/client.py
deleted file mode 100644
index 0838f61a..00000000
--- a/lib/future/backports/xmlrpc/client.py
+++ /dev/null
@@ -1,1497 +0,0 @@
-#
-# XML-RPC CLIENT LIBRARY
-# $Id$
-#
-# an XML-RPC client interface for Python.
-#
-# the marshalling and response parser code can also be used to
-# implement XML-RPC servers.
-#
-# Notes:
-# this version is designed to work with Python 2.1 or newer.
-#
-# History:
-# 1999-01-14 fl  Created
-# 1999-01-15 fl  Changed dateTime to use localtime
-# 1999-01-16 fl  Added Binary/base64 element, default to RPC2 service
-# 1999-01-19 fl  Fixed array data element (from Skip Montanaro)
-# 1999-01-21 fl  Fixed dateTime constructor, etc.
-# 1999-02-02 fl  Added fault handling, handle empty sequences, etc.
-# 1999-02-10 fl  Fixed problem with empty responses (from Skip Montanaro)
-# 1999-06-20 fl  Speed improvements, pluggable parsers/transports (0.9.8)
-# 2000-11-28 fl  Changed boolean to check the truth value of its argument
-# 2001-02-24 fl  Added encoding/Unicode/SafeTransport patches
-# 2001-02-26 fl  Added compare support to wrappers (0.9.9/1.0b1)
-# 2001-03-28 fl  Make sure response tuple is a singleton
-# 2001-03-29 fl  Don't require empty params element (from Nicholas Riley)
-# 2001-06-10 fl  Folded in _xmlrpclib accelerator support (1.0b2)
-# 2001-08-20 fl  Base xmlrpclib.Error on built-in Exception (from Paul Prescod)
-# 2001-09-03 fl  Allow Transport subclass to override getparser
-# 2001-09-10 fl  Lazy import of urllib, cgi, xmllib (20x import speedup)
-# 2001-10-01 fl  Remove containers from memo cache when done with them
-# 2001-10-01 fl  Use faster escape method (80% dumps speedup)
-# 2001-10-02 fl  More dumps microtuning
-# 2001-10-04 fl  Make sure import expat gets a parser (from Guido van Rossum)
-# 2001-10-10 sm  Allow long ints to be passed as ints if they don't overflow
-# 2001-10-17 sm  Test for int and long overflow (allows use on 64-bit systems)
-# 2001-11-12 fl  Use repr() to marshal doubles (from Paul Felix)
-# 2002-03-17 fl  Avoid buffered read when possible (from James Rucker)
-# 2002-04-07 fl  Added pythondoc comments
-# 2002-04-16 fl  Added __str__ methods to datetime/binary wrappers
-# 2002-05-15 fl  Added error constants (from Andrew Kuchling)
-# 2002-06-27 fl  Merged with Python CVS version
-# 2002-10-22 fl  Added basic authentication (based on code from Phillip Eby)
-# 2003-01-22 sm  Add support for the bool type
-# 2003-02-27 gvr Remove apply calls
-# 2003-04-24 sm  Use cStringIO if available
-# 2003-04-25 ak  Add support for nil
-# 2003-06-15 gn  Add support for time.struct_time
-# 2003-07-12 gp  Correct marshalling of Faults
-# 2003-10-31 mvl Add multicall support
-# 2004-08-20 mvl Bump minimum supported Python version to 2.1
-#
-# Copyright (c) 1999-2002 by Secret Labs AB.
-# Copyright (c) 1999-2002 by Fredrik Lundh.
-#
-# info@pythonware.com
-# http://www.pythonware.com
-#
-# --------------------------------------------------------------------
-# The XML-RPC client interface is
-#
-# Copyright (c) 1999-2002 by Secret Labs AB
-# Copyright (c) 1999-2002 by Fredrik Lundh
-#
-# By obtaining, using, and/or copying this software and/or its
-# associated documentation, you agree that you have read, understood,
-# and will comply with the following terms and conditions:
-#
-# Permission to use, copy, modify, and distribute this software and
-# its associated documentation for any purpose and without fee is
-# hereby granted, provided that the above copyright notice appears in
-# all copies, and that both that copyright notice and this permission
-# notice appear in supporting documentation, and that the name of
-# Secret Labs AB or the author not be used in advertising or publicity
-# pertaining to distribution of the software without specific, written
-# prior permission.
-#
-# SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
-# TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT-
-# ABILITY AND FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR
-# BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
-# DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-# ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
-# OF THIS SOFTWARE.
-# --------------------------------------------------------------------
-
-"""
-Ported using Python-Future from the Python 3.3 standard library.
-
-An XML-RPC client interface for Python.
-
-The marshalling and response parser code can also be used to
-implement XML-RPC servers.
-
-Exported exceptions:
-
-  Error          Base class for client errors
-  ProtocolError  Indicates an HTTP protocol error
-  ResponseError  Indicates a broken response package
-  Fault          Indicates an XML-RPC fault package
-
-Exported classes:
-
-  ServerProxy    Represents a logical connection to an XML-RPC server
-
-  MultiCall      Executor of boxcared xmlrpc requests
-  DateTime       dateTime wrapper for an ISO 8601 string or time tuple or
-                 localtime integer value to generate a "dateTime.iso8601"
-                 XML-RPC value
-  Binary         binary data wrapper
-
-  Marshaller     Generate an XML-RPC params chunk from a Python data structure
-  Unmarshaller   Unmarshal an XML-RPC response from incoming XML event message
-  Transport      Handles an HTTP transaction to an XML-RPC server
-  SafeTransport  Handles an HTTPS transaction to an XML-RPC server
-
-Exported constants:
-
-  (none)
-
-Exported functions:
-
-  getparser      Create instance of the fastest available parser & attach
-                 to an unmarshalling object
-  dumps          Convert an argument tuple or a Fault instance to an XML-RPC
-                 request (or response, if the methodresponse option is used).
-  loads          Convert an XML-RPC packet to unmarshalled data plus a method
-                 name (None if not present).
-"""
-
-from __future__ import (absolute_import, division, print_function,
-                        unicode_literals)
-from future.builtins import bytes, dict, int, range, str
-
-import base64
-import sys
-if sys.version_info < (3, 9):
-    # Py2.7 compatibility hack
-    base64.encodebytes = base64.encodestring
-    base64.decodebytes = base64.decodestring
-import time
-from datetime import datetime
-from future.backports.http import client as http_client
-from future.backports.urllib import parse as urllib_parse
-from future.utils import ensure_new_type
-from xml.parsers import expat
-import socket
-import errno
-from io import BytesIO
-try:
-    import gzip
-except ImportError:
-    gzip = None #python can be built without zlib/gzip support
-
-# --------------------------------------------------------------------
-# Internal stuff
-
-def escape(s):
-    s = s.replace("&", "&amp;")
-    s = s.replace("<", "&lt;")
-    return s.replace(">", "&gt;",)
-
-# used in User-Agent header sent
-__version__ = sys.version[:3]
-
-# xmlrpc integer limits
-MAXINT =  2**31-1
-MININT = -2**31
-
-# --------------------------------------------------------------------
-# Error constants (from Dan Libby's specification at
-# http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php)
-
-# Ranges of errors
-PARSE_ERROR       = -32700
-SERVER_ERROR      = -32600
-APPLICATION_ERROR = -32500
-SYSTEM_ERROR      = -32400
-TRANSPORT_ERROR   = -32300
-
-# Specific errors
-NOT_WELLFORMED_ERROR  = -32700
-UNSUPPORTED_ENCODING  = -32701
-INVALID_ENCODING_CHAR = -32702
-INVALID_XMLRPC        = -32600
-METHOD_NOT_FOUND      = -32601
-INVALID_METHOD_PARAMS = -32602
-INTERNAL_ERROR        = -32603
-
-# --------------------------------------------------------------------
-# Exceptions
-
-##
-# Base class for all kinds of client-side errors.
-
-class Error(Exception):
-    """Base class for client errors."""
-    def __str__(self):
-        return repr(self)
-
-##
-# Indicates an HTTP-level protocol error.  This is raised by the HTTP
-# transport layer, if the server returns an error code other than 200
-# (OK).
-#
-# @param url The target URL.
-# @param errcode The HTTP error code.
-# @param errmsg The HTTP error message.
-# @param headers The HTTP header dictionary.
-
-class ProtocolError(Error):
-    """Indicates an HTTP protocol error."""
-    def __init__(self, url, errcode, errmsg, headers):
-        Error.__init__(self)
-        self.url = url
-        self.errcode = errcode
-        self.errmsg = errmsg
-        self.headers = headers
-    def __repr__(self):
-        return (
-            "<ProtocolError for %s: %s %s>" %
-            (self.url, self.errcode, self.errmsg)
-            )
-
-##
-# Indicates a broken XML-RPC response package.  This exception is
-# raised by the unmarshalling layer, if the XML-RPC response is
-# malformed.
-
-class ResponseError(Error):
-    """Indicates a broken response package."""
-    pass
-
-##
-# Indicates an XML-RPC fault response package.  This exception is
-# raised by the unmarshalling layer, if the XML-RPC response contains
-# a fault string.  This exception can also be used as a class, to
-# generate a fault XML-RPC message.
-#
-# @param faultCode The XML-RPC fault code.
-# @param faultString The XML-RPC fault string.
-
-class Fault(Error):
-    """Indicates an XML-RPC fault package."""
-    def __init__(self, faultCode, faultString, **extra):
-        Error.__init__(self)
-        self.faultCode = faultCode
-        self.faultString = faultString
-    def __repr__(self):
-        return "<Fault %s: %r>" % (ensure_new_type(self.faultCode),
-                                   ensure_new_type(self.faultString))
-
-# --------------------------------------------------------------------
-# Special values
-
-##
-# Backwards compatibility
-
-boolean = Boolean = bool
-
-##
-# Wrapper for XML-RPC DateTime values.  This converts a time value to
-# the format used by XML-RPC.
-# <p>
-# The value can be given as a datetime object, as a string in the
-# format "yyyymmddThh:mm:ss", as a 9-item time tuple (as returned by
-# time.localtime()), or an integer value (as returned by time.time()).
-# The wrapper uses time.localtime() to convert an integer to a time
-# tuple.
-#
-# @param value The time, given as a datetime object, an ISO 8601 string,
-#              a time tuple, or an integer time value.
-
-
-### For Python-Future:
-def _iso8601_format(value):
-    return "%04d%02d%02dT%02d:%02d:%02d" % (
-                value.year, value.month, value.day,
-                value.hour, value.minute, value.second)
-###
-# Issue #13305: different format codes across platforms
-# _day0 = datetime(1, 1, 1)
-# if _day0.strftime('%Y') == '0001':      # Mac OS X
-#     def _iso8601_format(value):
-#         return value.strftime("%Y%m%dT%H:%M:%S")
-# elif _day0.strftime('%4Y') == '0001':   # Linux
-#     def _iso8601_format(value):
-#         return value.strftime("%4Y%m%dT%H:%M:%S")
-# else:
-#     def _iso8601_format(value):
-#         return value.strftime("%Y%m%dT%H:%M:%S").zfill(17)
-# del _day0
-
-
-def _strftime(value):
-    if isinstance(value, datetime):
-        return _iso8601_format(value)
-
-    if not isinstance(value, (tuple, time.struct_time)):
-        if value == 0:
-            value = time.time()
-        value = time.localtime(value)
-
-    return "%04d%02d%02dT%02d:%02d:%02d" % value[:6]
-
-class DateTime(object):
-    """DateTime wrapper for an ISO 8601 string or time tuple or
-    localtime integer value to generate 'dateTime.iso8601' XML-RPC
-    value.
-    """
-
-    def __init__(self, value=0):
-        if isinstance(value, str):
-            self.value = value
-        else:
-            self.value = _strftime(value)
-
-    def make_comparable(self, other):
-        if isinstance(other, DateTime):
-            s = self.value
-            o = other.value
-        elif isinstance(other, datetime):
-            s = self.value
-            o = _iso8601_format(other)
-        elif isinstance(other, str):
-            s = self.value
-            o = other
-        elif hasattr(other, "timetuple"):
-            s = self.timetuple()
-            o = other.timetuple()
-        else:
-            otype = (hasattr(other, "__class__")
-                     and other.__class__.__name__
-                     or type(other))
-            raise TypeError("Can't compare %s and %s" %
-                            (self.__class__.__name__, otype))
-        return s, o
-
-    def __lt__(self, other):
-        s, o = self.make_comparable(other)
-        return s < o
-
-    def __le__(self, other):
-        s, o = self.make_comparable(other)
-        return s <= o
-
-    def __gt__(self, other):
-        s, o = self.make_comparable(other)
-        return s > o
-
-    def __ge__(self, other):
-        s, o = self.make_comparable(other)
-        return s >= o
-
-    def __eq__(self, other):
-        s, o = self.make_comparable(other)
-        return s == o
-
-    def __ne__(self, other):
-        s, o = self.make_comparable(other)
-        return s != o
-
-    def timetuple(self):
-        return time.strptime(self.value, "%Y%m%dT%H:%M:%S")
-
-    ##
-    # Get date/time value.
-    #
-    # @return Date/time value, as an ISO 8601 string.
-
-    def __str__(self):
-        return self.value
-
-    def __repr__(self):
-        return "<DateTime %r at %x>" % (ensure_new_type(self.value), id(self))
-
-    def decode(self, data):
-        self.value = str(data).strip()
-
-    def encode(self, out):
-        out.write("<value><dateTime.iso8601>")
-        out.write(self.value)
-        out.write("</dateTime.iso8601></value>\n")
-
-def _datetime(data):
-    # decode xml element contents into a DateTime structure.
-    value = DateTime()
-    value.decode(data)
-    return value
-
-def _datetime_type(data):
-    return datetime.strptime(data, "%Y%m%dT%H:%M:%S")
-
-##
-# Wrapper for binary data.  This can be used to transport any kind
-# of binary data over XML-RPC, using BASE64 encoding.
-#
-# @param data An 8-bit string containing arbitrary data.
-
-class Binary(object):
-    """Wrapper for binary data."""
-
-    def __init__(self, data=None):
-        if data is None:
-            data = b""
-        else:
-            if not isinstance(data, (bytes, bytearray)):
-                raise TypeError("expected bytes or bytearray, not %s" %
-                                data.__class__.__name__)
-            data = bytes(data)  # Make a copy of the bytes!
-        self.data = data
-
-    ##
-    # Get buffer contents.
-    #
-    # @return Buffer contents, as an 8-bit string.
-
-    def __str__(self):
-        return str(self.data, "latin-1")  # XXX encoding?!
-
-    def __eq__(self, other):
-        if isinstance(other, Binary):
-            other = other.data
-        return self.data == other
-
-    def __ne__(self, other):
-        if isinstance(other, Binary):
-            other = other.data
-        return self.data != other
-
-    def decode(self, data):
-        self.data = base64.decodebytes(data)
-
-    def encode(self, out):
-        out.write("<value><base64>\n")
-        encoded = base64.encodebytes(self.data)
-        out.write(encoded.decode('ascii'))
-        out.write("</base64></value>\n")
-
-def _binary(data):
-    # decode xml element contents into a Binary structure
-    value = Binary()
-    value.decode(data)
-    return value
-
-WRAPPERS = (DateTime, Binary)
-
-# --------------------------------------------------------------------
-# XML parsers
-
-class ExpatParser(object):
-    # fast expat parser for Python 2.0 and later.
-    def __init__(self, target):
-        self._parser = parser = expat.ParserCreate(None, None)
-        self._target = target
-        parser.StartElementHandler = target.start
-        parser.EndElementHandler = target.end
-        parser.CharacterDataHandler = target.data
-        encoding = None
-        target.xml(encoding, None)
-
-    def feed(self, data):
-        self._parser.Parse(data, 0)
-
-    def close(self):
-        self._parser.Parse("", 1) # end of data
-        del self._target, self._parser # get rid of circular references
-
-# --------------------------------------------------------------------
-# XML-RPC marshalling and unmarshalling code
-
-##
-# XML-RPC marshaller.
-#
-# @param encoding Default encoding for 8-bit strings.  The default
-#     value is None (interpreted as UTF-8).
-# @see dumps
-
-class Marshaller(object):
-    """Generate an XML-RPC params chunk from a Python data structure.
-
-    Create a Marshaller instance for each set of parameters, and use
-    the "dumps" method to convert your data (represented as a tuple)
-    to an XML-RPC params chunk.  To write a fault response, pass a
-    Fault instance instead.  You may prefer to use the "dumps" module
-    function for this purpose.
-    """
-
-    # by the way, if you don't understand what's going on in here,
-    # that's perfectly ok.
-
-    def __init__(self, encoding=None, allow_none=False):
-        self.memo = {}
-        self.data = None
-        self.encoding = encoding
-        self.allow_none = allow_none
-
-    dispatch = {}
-
-    def dumps(self, values):
-        out = []
-        write = out.append
-        dump = self.__dump
-        if isinstance(values, Fault):
-            # fault instance
-            write("<fault>\n")
-            dump({'faultCode': values.faultCode,
-                  'faultString': values.faultString},
-                 write)
-            write("</fault>\n")
-        else:
-            # parameter block
-            # FIXME: the xml-rpc specification allows us to leave out
-            # the entire <params> block if there are no parameters.
-            # however, changing this may break older code (including
-            # old versions of xmlrpclib.py), so this is better left as
-            # is for now.  See @XMLRPC3 for more information. /F
-            write("<params>\n")
-            for v in values:
-                write("<param>\n")
-                dump(v, write)
-                write("</param>\n")
-            write("</params>\n")
-        result = "".join(out)
-        return str(result)
-
-    def __dump(self, value, write):
-        try:
-            f = self.dispatch[type(ensure_new_type(value))]
-        except KeyError:
-            # check if this object can be marshalled as a structure
-            if not hasattr(value, '__dict__'):
-                raise TypeError("cannot marshal %s objects" % type(value))
-            # check if this class is a sub-class of a basic type,
-            # because we don't know how to marshal these types
-            # (e.g. a string sub-class)
-            for type_ in type(value).__mro__:
-                if type_ in self.dispatch.keys():
-                    raise TypeError("cannot marshal %s objects" % type(value))
-            # XXX(twouters): using "_arbitrary_instance" as key as a quick-fix
-            # for the p3yk merge, this should probably be fixed more neatly.
-            f = self.dispatch["_arbitrary_instance"]
-        f(self, value, write)
-
-    def dump_nil (self, value, write):
-        if not self.allow_none:
-            raise TypeError("cannot marshal None unless allow_none is enabled")
-        write("<value><nil/></value>")
-    dispatch[type(None)] = dump_nil
-
-    def dump_bool(self, value, write):
-        write("<value><boolean>")
-        write(value and "1" or "0")
-        write("</boolean></value>\n")
-    dispatch[bool] = dump_bool
-
-    def dump_long(self, value, write):
-        if value > MAXINT or value < MININT:
-            raise OverflowError("long int exceeds XML-RPC limits")
-        write("<value><int>")
-        write(str(int(value)))
-        write("</int></value>\n")
-    dispatch[int] = dump_long
-
-    # backward compatible
-    dump_int = dump_long
-
-    def dump_double(self, value, write):
-        write("<value><double>")
-        write(repr(ensure_new_type(value)))
-        write("</double></value>\n")
-    dispatch[float] = dump_double
-
-    def dump_unicode(self, value, write, escape=escape):
-        write("<value><string>")
-        write(escape(value))
-        write("</string></value>\n")
-    dispatch[str] = dump_unicode
-
-    def dump_bytes(self, value, write):
-        write("<value><base64>\n")
-        encoded = base64.encodebytes(value)
-        write(encoded.decode('ascii'))
-        write("</base64></value>\n")
-    dispatch[bytes] = dump_bytes
-    dispatch[bytearray] = dump_bytes
-
-    def dump_array(self, value, write):
-        i = id(value)
-        if i in self.memo:
-            raise TypeError("cannot marshal recursive sequences")
-        self.memo[i] = None
-        dump = self.__dump
-        write("<value><array><data>\n")
-        for v in value:
-            dump(v, write)
-        write("</data></array></value>\n")
-        del self.memo[i]
-    dispatch[tuple] = dump_array
-    dispatch[list] = dump_array
-
-    def dump_struct(self, value, write, escape=escape):
-        i = id(value)
-        if i in self.memo:
-            raise TypeError("cannot marshal recursive dictionaries")
-        self.memo[i] = None
-        dump = self.__dump
-        write("<value><struct>\n")
-        for k, v in value.items():
-            write("<member>\n")
-            if not isinstance(k, str):
-                raise TypeError("dictionary key must be string")
-            write("<name>%s</name>\n" % escape(k))
-            dump(v, write)
-            write("</member>\n")
-        write("</struct></value>\n")
-        del self.memo[i]
-    dispatch[dict] = dump_struct
-
-    def dump_datetime(self, value, write):
-        write("<value><dateTime.iso8601>")
-        write(_strftime(value))
-        write("</dateTime.iso8601></value>\n")
-    dispatch[datetime] = dump_datetime
-
-    def dump_instance(self, value, write):
-        # check for special wrappers
-        if value.__class__ in WRAPPERS:
-            self.write = write
-            value.encode(self)
-            del self.write
-        else:
-            # store instance attributes as a struct (really?)
-            self.dump_struct(value.__dict__, write)
-    dispatch[DateTime] = dump_instance
-    dispatch[Binary] = dump_instance
-    # XXX(twouters): using "_arbitrary_instance" as key as a quick-fix
-    # for the p3yk merge, this should probably be fixed more neatly.
-    dispatch["_arbitrary_instance"] = dump_instance
-
-##
-# XML-RPC unmarshaller.
-#
-# @see loads
-
-class Unmarshaller(object):
-    """Unmarshal an XML-RPC response, based on incoming XML event
-    messages (start, data, end).  Call close() to get the resulting
-    data structure.
-
-    Note that this reader is fairly tolerant, and gladly accepts bogus
-    XML-RPC data without complaining (but not bogus XML).
-    """
-
-    # and again, if you don't understand what's going on in here,
-    # that's perfectly ok.
-
-    def __init__(self, use_datetime=False, use_builtin_types=False):
-        self._type = None
-        self._stack = []
-        self._marks = []
-        self._data = []
-        self._methodname = None
-        self._encoding = "utf-8"
-        self.append = self._stack.append
-        self._use_datetime = use_builtin_types or use_datetime
-        self._use_bytes = use_builtin_types
-
-    def close(self):
-        # return response tuple and target method
-        if self._type is None or self._marks:
-            raise ResponseError()
-        if self._type == "fault":
-            raise Fault(**self._stack[0])
-        return tuple(self._stack)
-
-    def getmethodname(self):
-        return self._methodname
-
-    #
-    # event handlers
-
-    def xml(self, encoding, standalone):
-        self._encoding = encoding
-        # FIXME: assert standalone == 1 ???
-
-    def start(self, tag, attrs):
-        # prepare to handle this element
-        if tag == "array" or tag == "struct":
-            self._marks.append(len(self._stack))
-        self._data = []
-        self._value = (tag == "value")
-
-    def data(self, text):
-        self._data.append(text)
-
-    def end(self, tag):
-        # call the appropriate end tag handler
-        try:
-            f = self.dispatch[tag]
-        except KeyError:
-            pass # unknown tag ?
-        else:
-            return f(self, "".join(self._data))
-
-    #
-    # accelerator support
-
-    def end_dispatch(self, tag, data):
-        # dispatch data
-        try:
-            f = self.dispatch[tag]
-        except KeyError:
-            pass # unknown tag ?
-        else:
-            return f(self, data)
-
-    #
-    # element decoders
-
-    dispatch = {}
-
-    def end_nil (self, data):
-        self.append(None)
-        self._value = 0
-    dispatch["nil"] = end_nil
-
-    def end_boolean(self, data):
-        if data == "0":
-            self.append(False)
-        elif data == "1":
-            self.append(True)
-        else:
-            raise TypeError("bad boolean value")
-        self._value = 0
-    dispatch["boolean"] = end_boolean
-
-    def end_int(self, data):
-        self.append(int(data))
-        self._value = 0
-    dispatch["i4"] = end_int
-    dispatch["i8"] = end_int
-    dispatch["int"] = end_int
-
-    def end_double(self, data):
-        self.append(float(data))
-        self._value = 0
-    dispatch["double"] = end_double
-
-    def end_string(self, data):
-        if self._encoding:
-            data = data.decode(self._encoding)
-        self.append(data)
-        self._value = 0
-    dispatch["string"] = end_string
-    dispatch["name"] = end_string # struct keys are always strings
-
-    def end_array(self, data):
-        mark = self._marks.pop()
-        # map arrays to Python lists
-        self._stack[mark:] = [self._stack[mark:]]
-        self._value = 0
-    dispatch["array"] = end_array
-
-    def end_struct(self, data):
-        mark = self._marks.pop()
-        # map structs to Python dictionaries
-        dict = {}
-        items = self._stack[mark:]
-        for i in range(0, len(items), 2):
-            dict[items[i]] = items[i+1]
-        self._stack[mark:] = [dict]
-        self._value = 0
-    dispatch["struct"] = end_struct
-
-    def end_base64(self, data):
-        value = Binary()
-        value.decode(data.encode("ascii"))
-        if self._use_bytes:
-            value = value.data
-        self.append(value)
-        self._value = 0
-    dispatch["base64"] = end_base64
-
-    def end_dateTime(self, data):
-        value = DateTime()
-        value.decode(data)
-        if self._use_datetime:
-            value = _datetime_type(data)
-        self.append(value)
-    dispatch["dateTime.iso8601"] = end_dateTime
-
-    def end_value(self, data):
-        # if we stumble upon a value element with no internal
-        # elements, treat it as a string element
-        if self._value:
-            self.end_string(data)
-    dispatch["value"] = end_value
-
-    def end_params(self, data):
-        self._type = "params"
-    dispatch["params"] = end_params
-
-    def end_fault(self, data):
-        self._type = "fault"
-    dispatch["fault"] = end_fault
-
-    def end_methodName(self, data):
-        if self._encoding:
-            data = data.decode(self._encoding)
-        self._methodname = data
-        self._type = "methodName" # no params
-    dispatch["methodName"] = end_methodName
-
-## Multicall support
-#
-
-class _MultiCallMethod(object):
-    # some lesser magic to store calls made to a MultiCall object
-    # for batch execution
-    def __init__(self, call_list, name):
-        self.__call_list = call_list
-        self.__name = name
-    def __getattr__(self, name):
-        return _MultiCallMethod(self.__call_list, "%s.%s" % (self.__name, name))
-    def __call__(self, *args):
-        self.__call_list.append((self.__name, args))
-
-class MultiCallIterator(object):
-    """Iterates over the results of a multicall. Exceptions are
-    raised in response to xmlrpc faults."""
-
-    def __init__(self, results):
-        self.results = results
-
-    def __getitem__(self, i):
-        item = self.results[i]
-        if isinstance(type(item), dict):
-            raise Fault(item['faultCode'], item['faultString'])
-        elif type(item) == type([]):
-            return item[0]
-        else:
-            raise ValueError("unexpected type in multicall result")
-
-class MultiCall(object):
-    """server -> a object used to boxcar method calls
-
-    server should be a ServerProxy object.
-
-    Methods can be added to the MultiCall using normal
-    method call syntax e.g.:
-
-    multicall = MultiCall(server_proxy)
-    multicall.add(2,3)
-    multicall.get_address("Guido")
-
-    To execute the multicall, call the MultiCall object e.g.:
-
-    add_result, address = multicall()
-    """
-
-    def __init__(self, server):
-        self.__server = server
-        self.__call_list = []
-
-    def __repr__(self):
-        return "<MultiCall at %x>" % id(self)
-
-    __str__ = __repr__
-
-    def __getattr__(self, name):
-        return _MultiCallMethod(self.__call_list, name)
-
-    def __call__(self):
-        marshalled_list = []
-        for name, args in self.__call_list:
-            marshalled_list.append({'methodName' : name, 'params' : args})
-
-        return MultiCallIterator(self.__server.system.multicall(marshalled_list))
-
-# --------------------------------------------------------------------
-# convenience functions
-
-FastMarshaller = FastParser = FastUnmarshaller = None
-
-##
-# Create a parser object, and connect it to an unmarshalling instance.
-# This function picks the fastest available XML parser.
-#
-# return A (parser, unmarshaller) tuple.
-
-def getparser(use_datetime=False, use_builtin_types=False):
-    """getparser() -> parser, unmarshaller
-
-    Create an instance of the fastest available parser, and attach it
-    to an unmarshalling object.  Return both objects.
-    """
-    if FastParser and FastUnmarshaller:
-        if use_builtin_types:
-            mkdatetime = _datetime_type
-            mkbytes = base64.decodebytes
-        elif use_datetime:
-            mkdatetime = _datetime_type
-            mkbytes = _binary
-        else:
-            mkdatetime = _datetime
-            mkbytes = _binary
-        target = FastUnmarshaller(True, False, mkbytes, mkdatetime, Fault)
-        parser = FastParser(target)
-    else:
-        target = Unmarshaller(use_datetime=use_datetime, use_builtin_types=use_builtin_types)
-        if FastParser:
-            parser = FastParser(target)
-        else:
-            parser = ExpatParser(target)
-    return parser, target
-
-##
-# Convert a Python tuple or a Fault instance to an XML-RPC packet.
-#
-# @def dumps(params, **options)
-# @param params A tuple or Fault instance.
-# @keyparam methodname If given, create a methodCall request for
-#     this method name.
-# @keyparam methodresponse If given, create a methodResponse packet.
-#     If used with a tuple, the tuple must be a singleton (that is,
-#     it must contain exactly one element).
-# @keyparam encoding The packet encoding.
-# @return A string containing marshalled data.
-
-def dumps(params, methodname=None, methodresponse=None, encoding=None,
-          allow_none=False):
-    """data [,options] -> marshalled data
-
-    Convert an argument tuple or a Fault instance to an XML-RPC
-    request (or response, if the methodresponse option is used).
-
-    In addition to the data object, the following options can be given
-    as keyword arguments:
-
-        methodname: the method name for a methodCall packet
-
-        methodresponse: true to create a methodResponse packet.
-        If this option is used with a tuple, the tuple must be
-        a singleton (i.e. it can contain only one element).
-
-        encoding: the packet encoding (default is UTF-8)
-
-    All byte strings in the data structure are assumed to use the
-    packet encoding.  Unicode strings are automatically converted,
-    where necessary.
-    """
-
-    assert isinstance(params, (tuple, Fault)), "argument must be tuple or Fault instance"
-    if isinstance(params, Fault):
-        methodresponse = 1
-    elif methodresponse and isinstance(params, tuple):
-        assert len(params) == 1, "response tuple must be a singleton"
-
-    if not encoding:
-        encoding = "utf-8"
-
-    if FastMarshaller:
-        m = FastMarshaller(encoding)
-    else:
-        m = Marshaller(encoding, allow_none)
-
-    data = m.dumps(params)
-
-    if encoding != "utf-8":
-        xmlheader = "<?xml version='1.0' encoding='%s'?>\n" % str(encoding)
-    else:
-        xmlheader = "<?xml version='1.0'?>\n" # utf-8 is default
-
-    # standard XML-RPC wrappings
-    if methodname:
-        # a method call
-        if not isinstance(methodname, str):
-            methodname = methodname.encode(encoding)
-        data = (
-            xmlheader,
-            "<methodCall>\n"
-            "<methodName>", methodname, "</methodName>\n",
-            data,
-            "</methodCall>\n"
-            )
-    elif methodresponse:
-        # a method response, or a fault structure
-        data = (
-            xmlheader,
-            "<methodResponse>\n",
-            data,
-            "</methodResponse>\n"
-            )
-    else:
-        return data # return as is
-    return str("").join(data)
-
-##
-# Convert an XML-RPC packet to a Python object.  If the XML-RPC packet
-# represents a fault condition, this function raises a Fault exception.
-#
-# @param data An XML-RPC packet, given as an 8-bit string.
-# @return A tuple containing the unpacked data, and the method name
-#     (None if not present).
-# @see Fault
-
-def loads(data, use_datetime=False, use_builtin_types=False):
-    """data -> unmarshalled data, method name
-
-    Convert an XML-RPC packet to unmarshalled data plus a method
-    name (None if not present).
-
-    If the XML-RPC packet represents a fault condition, this function
-    raises a Fault exception.
-    """
-    p, u = getparser(use_datetime=use_datetime, use_builtin_types=use_builtin_types)
-    p.feed(data)
-    p.close()
-    return u.close(), u.getmethodname()
-
-##
-# Encode a string using the gzip content encoding such as specified by the
-# Content-Encoding: gzip
-# in the HTTP header, as described in RFC 1952
-#
-# @param data the unencoded data
-# @return the encoded data
-
-def gzip_encode(data):
-    """data -> gzip encoded data
-
-    Encode data using the gzip content encoding as described in RFC 1952
-    """
-    if not gzip:
-        raise NotImplementedError
-    f = BytesIO()
-    gzf = gzip.GzipFile(mode="wb", fileobj=f, compresslevel=1)
-    gzf.write(data)
-    gzf.close()
-    encoded = f.getvalue()
-    f.close()
-    return encoded
-
-##
-# Decode a string using the gzip content encoding such as specified by the
-# Content-Encoding: gzip
-# in the HTTP header, as described in RFC 1952
-#
-# @param data The encoded data
-# @return the unencoded data
-# @raises ValueError if data is not correctly coded.
-
-def gzip_decode(data):
-    """gzip encoded data -> unencoded data
-
-    Decode data using the gzip content encoding as described in RFC 1952
-    """
-    if not gzip:
-        raise NotImplementedError
-    f = BytesIO(data)
-    gzf = gzip.GzipFile(mode="rb", fileobj=f)
-    try:
-        decoded = gzf.read()
-    except IOError:
-        raise ValueError("invalid data")
-    f.close()
-    gzf.close()
-    return decoded
-
-##
-# Return a decoded file-like object for the gzip encoding
-# as described in RFC 1952.
-#
-# @param response A stream supporting a read() method
-# @return a file-like object that the decoded data can be read() from
-
-class GzipDecodedResponse(gzip.GzipFile if gzip else object):
-    """a file-like object to decode a response encoded with the gzip
-    method, as described in RFC 1952.
-    """
-    def __init__(self, response):
-        #response doesn't support tell() and read(), required by
-        #GzipFile
-        if not gzip:
-            raise NotImplementedError
-        self.io = BytesIO(response.read())
-        gzip.GzipFile.__init__(self, mode="rb", fileobj=self.io)
-
-    def close(self):
-        gzip.GzipFile.close(self)
-        self.io.close()
-
-
-# --------------------------------------------------------------------
-# request dispatcher
-
-class _Method(object):
-    # some magic to bind an XML-RPC method to an RPC server.
-    # supports "nested" methods (e.g. examples.getStateName)
-    def __init__(self, send, name):
-        self.__send = send
-        self.__name = name
-    def __getattr__(self, name):
-        return _Method(self.__send, "%s.%s" % (self.__name, name))
-    def __call__(self, *args):
-        return self.__send(self.__name, args)
-
-##
-# Standard transport class for XML-RPC over HTTP.
-# <p>
-# You can create custom transports by subclassing this method, and
-# overriding selected methods.
-
-class Transport(object):
-    """Handles an HTTP transaction to an XML-RPC server."""
-
-    # client identifier (may be overridden)
-    user_agent = "Python-xmlrpc/%s" % __version__
-
-    #if true, we'll request gzip encoding
-    accept_gzip_encoding = True
-
-    # if positive, encode request using gzip if it exceeds this threshold
-    # note that many server will get confused, so only use it if you know
-    # that they can decode such a request
-    encode_threshold = None #None = don't encode
-
-    def __init__(self, use_datetime=False, use_builtin_types=False):
-        self._use_datetime = use_datetime
-        self._use_builtin_types = use_builtin_types
-        self._connection = (None, None)
-        self._extra_headers = []
-
-    ##
-    # Send a complete request, and parse the response.
-    # Retry request if a cached connection has disconnected.
-    #
-    # @param host Target host.
-    # @param handler Target PRC handler.
-    # @param request_body XML-RPC request body.
-    # @param verbose Debugging flag.
-    # @return Parsed response.
-
-    def request(self, host, handler, request_body, verbose=False):
-        #retry request once if cached connection has gone cold
-        for i in (0, 1):
-            try:
-                return self.single_request(host, handler, request_body, verbose)
-            except socket.error as e:
-                if i or e.errno not in (errno.ECONNRESET, errno.ECONNABORTED, errno.EPIPE):
-                    raise
-            except http_client.BadStatusLine: #close after we sent request
-                if i:
-                    raise
-
-    def single_request(self, host, handler, request_body, verbose=False):
-        # issue XML-RPC request
-        try:
-            http_conn = self.send_request(host, handler, request_body, verbose)
-            resp = http_conn.getresponse()
-            if resp.status == 200:
-                self.verbose = verbose
-                return self.parse_response(resp)
-
-        except Fault:
-            raise
-        except Exception:
-            #All unexpected errors leave connection in
-            # a strange state, so we clear it.
-            self.close()
-            raise
-
-        #We got an error response.
-        #Discard any response data and raise exception
-        if resp.getheader("content-length", ""):
-            resp.read()
-        raise ProtocolError(
-            host + handler,
-            resp.status, resp.reason,
-            dict(resp.getheaders())
-            )
-
-
-    ##
-    # Create parser.
-    #
-    # @return A 2-tuple containing a parser and a unmarshaller.
-
-    def getparser(self):
-        # get parser and unmarshaller
-        return getparser(use_datetime=self._use_datetime,
-                         use_builtin_types=self._use_builtin_types)
-
-    ##
-    # Get authorization info from host parameter
-    # Host may be a string, or a (host, x509-dict) tuple; if a string,
-    # it is checked for a "user:pw@host" format, and a "Basic
-    # Authentication" header is added if appropriate.
-    #
-    # @param host Host descriptor (URL or (URL, x509 info) tuple).
-    # @return A 3-tuple containing (actual host, extra headers,
-    #     x509 info).  The header and x509 fields may be None.
-
-    def get_host_info(self, host):
-
-        x509 = {}
-        if isinstance(host, tuple):
-            host, x509 = host
-
-        auth, host = urllib_parse.splituser(host)
-
-        if auth:
-            auth = urllib_parse.unquote_to_bytes(auth)
-            auth = base64.encodebytes(auth).decode("utf-8")
-            auth = "".join(auth.split()) # get rid of whitespace
-            extra_headers = [
-                ("Authorization", "Basic " + auth)
-                ]
-        else:
-            extra_headers = []
-
-        return host, extra_headers, x509
-
-    ##
-    # Connect to server.
-    #
-    # @param host Target host.
-    # @return An HTTPConnection object
-
-    def make_connection(self, host):
-        #return an existing connection if possible.  This allows
-        #HTTP/1.1 keep-alive.
-        if self._connection and host == self._connection[0]:
-            return self._connection[1]
-        # create a HTTP connection object from a host descriptor
-        chost, self._extra_headers, x509 = self.get_host_info(host)
-        self._connection = host, http_client.HTTPConnection(chost)
-        return self._connection[1]
-
-    ##
-    # Clear any cached connection object.
-    # Used in the event of socket errors.
-    #
-    def close(self):
-        if self._connection[1]:
-            self._connection[1].close()
-            self._connection = (None, None)
-
-    ##
-    # Send HTTP request.
-    #
-    # @param host Host descriptor (URL or (URL, x509 info) tuple).
-    # @param handler Target RPC handler (a path relative to host)
-    # @param request_body The XML-RPC request body
-    # @param debug Enable debugging if debug is true.
-    # @return An HTTPConnection.
-
-    def send_request(self, host, handler, request_body, debug):
-        connection = self.make_connection(host)
-        headers = self._extra_headers[:]
-        if debug:
-            connection.set_debuglevel(1)
-        if self.accept_gzip_encoding and gzip:
-            connection.putrequest("POST", handler, skip_accept_encoding=True)
-            headers.append(("Accept-Encoding", "gzip"))
-        else:
-            connection.putrequest("POST", handler)
-        headers.append(("Content-Type", "text/xml"))
-        headers.append(("User-Agent", self.user_agent))
-        self.send_headers(connection, headers)
-        self.send_content(connection, request_body)
-        return connection
-
-    ##
-    # Send request headers.
-    # This function provides a useful hook for subclassing
-    #
-    # @param connection httpConnection.
-    # @param headers list of key,value pairs for HTTP headers
-
-    def send_headers(self, connection, headers):
-        for key, val in headers:
-            connection.putheader(key, val)
-
-    ##
-    # Send request body.
-    # This function provides a useful hook for subclassing
-    #
-    # @param connection httpConnection.
-    # @param request_body XML-RPC request body.
-
-    def send_content(self, connection, request_body):
-        #optionally encode the request
-        if (self.encode_threshold is not None and
-            self.encode_threshold < len(request_body) and
-            gzip):
-            connection.putheader("Content-Encoding", "gzip")
-            request_body = gzip_encode(request_body)
-
-        connection.putheader("Content-Length", str(len(request_body)))
-        connection.endheaders(request_body)
-
-    ##
-    # Parse response.
-    #
-    # @param file Stream.
-    # @return Response tuple and target method.
-
-    def parse_response(self, response):
-        # read response data from httpresponse, and parse it
-        # Check for new http response object, otherwise it is a file object.
-        if hasattr(response, 'getheader'):
-            if response.getheader("Content-Encoding", "") == "gzip":
-                stream = GzipDecodedResponse(response)
-            else:
-                stream = response
-        else:
-            stream = response
-
-        p, u = self.getparser()
-
-        while 1:
-            data = stream.read(1024)
-            if not data:
-                break
-            if self.verbose:
-                print("body:", repr(data))
-            p.feed(data)
-
-        if stream is not response:
-            stream.close()
-        p.close()
-
-        return u.close()
-
-##
-# Standard transport class for XML-RPC over HTTPS.
-
-class SafeTransport(Transport):
-    """Handles an HTTPS transaction to an XML-RPC server."""
-
-    # FIXME: mostly untested
-
-    def make_connection(self, host):
-        if self._connection and host == self._connection[0]:
-            return self._connection[1]
-
-        if not hasattr(http_client, "HTTPSConnection"):
-            raise NotImplementedError(
-            "your version of http.client doesn't support HTTPS")
-        # create a HTTPS connection object from a host descriptor
-        # host may be a string, or a (host, x509-dict) tuple
-        chost, self._extra_headers, x509 = self.get_host_info(host)
-        self._connection = host, http_client.HTTPSConnection(chost,
-            None, **(x509 or {}))
-        return self._connection[1]
-
-##
-# Standard server proxy.  This class establishes a virtual connection
-# to an XML-RPC server.
-# <p>
-# This class is available as ServerProxy and Server.  New code should
-# use ServerProxy, to avoid confusion.
-#
-# @def ServerProxy(uri, **options)
-# @param uri The connection point on the server.
-# @keyparam transport A transport factory, compatible with the
-#    standard transport class.
-# @keyparam encoding The default encoding used for 8-bit strings
-#    (default is UTF-8).
-# @keyparam verbose Use a true value to enable debugging output.
-#    (printed to standard output).
-# @see Transport
-
-class ServerProxy(object):
-    """uri [,options] -> a logical connection to an XML-RPC server
-
-    uri is the connection point on the server, given as
-    scheme://host/target.
-
-    The standard implementation always supports the "http" scheme.  If
-    SSL socket support is available (Python 2.0), it also supports
-    "https".
-
-    If the target part and the slash preceding it are both omitted,
-    "/RPC2" is assumed.
-
-    The following options can be given as keyword arguments:
-
-        transport: a transport factory
-        encoding: the request encoding (default is UTF-8)
-
-    All 8-bit strings passed to the server proxy are assumed to use
-    the given encoding.
-    """
-
-    def __init__(self, uri, transport=None, encoding=None, verbose=False,
-                 allow_none=False, use_datetime=False, use_builtin_types=False):
-        # establish a "logical" server connection
-
-        # get the url
-        type, uri = urllib_parse.splittype(uri)
-        if type not in ("http", "https"):
-            raise IOError("unsupported XML-RPC protocol")
-        self.__host, self.__handler = urllib_parse.splithost(uri)
-        if not self.__handler:
-            self.__handler = "/RPC2"
-
-        if transport is None:
-            if type == "https":
-                handler = SafeTransport
-            else:
-                handler = Transport
-            transport = handler(use_datetime=use_datetime,
-                                use_builtin_types=use_builtin_types)
-        self.__transport = transport
-
-        self.__encoding = encoding or 'utf-8'
-        self.__verbose = verbose
-        self.__allow_none = allow_none
-
-    def __close(self):
-        self.__transport.close()
-
-    def __request(self, methodname, params):
-        # call a method on the remote server
-
-        request = dumps(params, methodname, encoding=self.__encoding,
-                        allow_none=self.__allow_none).encode(self.__encoding)
-
-        response = self.__transport.request(
-            self.__host,
-            self.__handler,
-            request,
-            verbose=self.__verbose
-            )
-
-        if len(response) == 1:
-            response = response[0]
-
-        return response
-
-    def __repr__(self):
-        return (
-            "<ServerProxy for %s%s>" %
-            (self.__host, self.__handler)
-            )
-
-    __str__ = __repr__
-
-    def __getattr__(self, name):
-        # magic method dispatcher
-        return _Method(self.__request, name)
-
-    # note: to call a remote object with an non-standard name, use
-    # result getattr(server, "strange-python-name")(args)
-
-    def __call__(self, attr):
-        """A workaround to get special attributes on the ServerProxy
-           without interfering with the magic __getattr__
-        """
-        if attr == "close":
-            return self.__close
-        elif attr == "transport":
-            return self.__transport
-        raise AttributeError("Attribute %r not found" % (attr,))
-
-# compatibility
-
-Server = ServerProxy
-
-# --------------------------------------------------------------------
-# test code
-
-if __name__ == "__main__":
-
-    # simple test program (from the XML-RPC specification)
-
-    # local server, available from Lib/xmlrpc/server.py
-    server = ServerProxy("http://localhost:8000")
-
-    try:
-        print(server.currentTime.getCurrentTime())
-    except Error as v:
-        print("ERROR", v)
-
-    multi = MultiCall(server)
-    multi.getData()
-    multi.pow(2,9)
-    multi.add(1,2)
-    try:
-        for response in multi():
-            print(response)
-    except Error as v:
-        print("ERROR", v)
diff --git a/lib/future/backports/xmlrpc/server.py b/lib/future/backports/xmlrpc/server.py
deleted file mode 100644
index 28072bfe..00000000
--- a/lib/future/backports/xmlrpc/server.py
+++ /dev/null
@@ -1,999 +0,0 @@
-r"""
-Ported using Python-Future from the Python 3.3 standard library.
-
-XML-RPC Servers.
-
-This module can be used to create simple XML-RPC servers
-by creating a server and either installing functions, a
-class instance, or by extending the SimpleXMLRPCServer
-class.
-
-It can also be used to handle XML-RPC requests in a CGI
-environment using CGIXMLRPCRequestHandler.
-
-The Doc* classes can be used to create XML-RPC servers that
-serve pydoc-style documentation in response to HTTP
-GET requests. This documentation is dynamically generated
-based on the functions and methods registered with the
-server.
-
-A list of possible usage patterns follows:
-
-1. Install functions:
-
-server = SimpleXMLRPCServer(("localhost", 8000))
-server.register_function(pow)
-server.register_function(lambda x,y: x+y, 'add')
-server.serve_forever()
-
-2. Install an instance:
-
-class MyFuncs:
-    def __init__(self):
-        # make all of the sys functions available through sys.func_name
-        import sys
-        self.sys = sys
-    def _listMethods(self):
-        # implement this method so that system.listMethods
-        # knows to advertise the sys methods
-        return list_public_methods(self) + \
-                ['sys.' + method for method in list_public_methods(self.sys)]
-    def pow(self, x, y): return pow(x, y)
-    def add(self, x, y) : return x + y
-
-server = SimpleXMLRPCServer(("localhost", 8000))
-server.register_introspection_functions()
-server.register_instance(MyFuncs())
-server.serve_forever()
-
-3. Install an instance with custom dispatch method:
-
-class Math:
-    def _listMethods(self):
-        # this method must be present for system.listMethods
-        # to work
-        return ['add', 'pow']
-    def _methodHelp(self, method):
-        # this method must be present for system.methodHelp
-        # to work
-        if method == 'add':
-            return "add(2,3) => 5"
-        elif method == 'pow':
-            return "pow(x, y[, z]) => number"
-        else:
-            # By convention, return empty
-            # string if no help is available
-            return ""
-    def _dispatch(self, method, params):
-        if method == 'pow':
-            return pow(*params)
-        elif method == 'add':
-            return params[0] + params[1]
-        else:
-            raise ValueError('bad method')
-
-server = SimpleXMLRPCServer(("localhost", 8000))
-server.register_introspection_functions()
-server.register_instance(Math())
-server.serve_forever()
-
-4. Subclass SimpleXMLRPCServer:
-
-class MathServer(SimpleXMLRPCServer):
-    def _dispatch(self, method, params):
-        try:
-            # We are forcing the 'export_' prefix on methods that are
-            # callable through XML-RPC to prevent potential security
-            # problems
-            func = getattr(self, 'export_' + method)
-        except AttributeError:
-            raise Exception('method "%s" is not supported' % method)
-        else:
-            return func(*params)
-
-    def export_add(self, x, y):
-        return x + y
-
-server = MathServer(("localhost", 8000))
-server.serve_forever()
-
-5. CGI script:
-
-server = CGIXMLRPCRequestHandler()
-server.register_function(pow)
-server.handle_request()
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-from future.builtins import int, str
-
-# Written by Brian Quinlan (brian@sweetapp.com).
-# Based on code written by Fredrik Lundh.
-
-from future.backports.xmlrpc.client import Fault, dumps, loads, gzip_encode, gzip_decode
-from future.backports.http.server import BaseHTTPRequestHandler
-import future.backports.http.server as http_server
-from future.backports import socketserver
-import sys
-import os
-import re
-import pydoc
-import inspect
-import traceback
-try:
-    import fcntl
-except ImportError:
-    fcntl = None
-
-def resolve_dotted_attribute(obj, attr, allow_dotted_names=True):
-    """resolve_dotted_attribute(a, 'b.c.d') => a.b.c.d
-
-    Resolves a dotted attribute name to an object.  Raises
-    an AttributeError if any attribute in the chain starts with a '_'.
-
-    If the optional allow_dotted_names argument is false, dots are not
-    supported and this function operates similar to getattr(obj, attr).
-    """
-
-    if allow_dotted_names:
-        attrs = attr.split('.')
-    else:
-        attrs = [attr]
-
-    for i in attrs:
-        if i.startswith('_'):
-            raise AttributeError(
-                'attempt to access private attribute "%s"' % i
-                )
-        else:
-            obj = getattr(obj,i)
-    return obj
-
-def list_public_methods(obj):
-    """Returns a list of attribute strings, found in the specified
-    object, which represent callable attributes"""
-
-    return [member for member in dir(obj)
-                if not member.startswith('_') and
-                    callable(getattr(obj, member))]
-
-class SimpleXMLRPCDispatcher(object):
-    """Mix-in class that dispatches XML-RPC requests.
-
-    This class is used to register XML-RPC method handlers
-    and then to dispatch them. This class doesn't need to be
-    instanced directly when used by SimpleXMLRPCServer but it
-    can be instanced when used by the MultiPathXMLRPCServer
-    """
-
-    def __init__(self, allow_none=False, encoding=None,
-                 use_builtin_types=False):
-        self.funcs = {}
-        self.instance = None
-        self.allow_none = allow_none
-        self.encoding = encoding or 'utf-8'
-        self.use_builtin_types = use_builtin_types
-
-    def register_instance(self, instance, allow_dotted_names=False):
-        """Registers an instance to respond to XML-RPC requests.
-
-        Only one instance can be installed at a time.
-
-        If the registered instance has a _dispatch method then that
-        method will be called with the name of the XML-RPC method and
-        its parameters as a tuple
-        e.g. instance._dispatch('add',(2,3))
-
-        If the registered instance does not have a _dispatch method
-        then the instance will be searched to find a matching method
-        and, if found, will be called. Methods beginning with an '_'
-        are considered private and will not be called by
-        SimpleXMLRPCServer.
-
-        If a registered function matches a XML-RPC request, then it
-        will be called instead of the registered instance.
-
-        If the optional allow_dotted_names argument is true and the
-        instance does not have a _dispatch method, method names
-        containing dots are supported and resolved, as long as none of
-        the name segments start with an '_'.
-
-            *** SECURITY WARNING: ***
-
-            Enabling the allow_dotted_names options allows intruders
-            to access your module's global variables and may allow
-            intruders to execute arbitrary code on your machine.  Only
-            use this option on a secure, closed network.
-
-        """
-
-        self.instance = instance
-        self.allow_dotted_names = allow_dotted_names
-
-    def register_function(self, function, name=None):
-        """Registers a function to respond to XML-RPC requests.
-
-        The optional name argument can be used to set a Unicode name
-        for the function.
-        """
-
-        if name is None:
-            name = function.__name__
-        self.funcs[name] = function
-
-    def register_introspection_functions(self):
-        """Registers the XML-RPC introspection methods in the system
-        namespace.
-
-        see http://xmlrpc.usefulinc.com/doc/reserved.html
-        """
-
-        self.funcs.update({'system.listMethods' : self.system_listMethods,
-                      'system.methodSignature' : self.system_methodSignature,
-                      'system.methodHelp' : self.system_methodHelp})
-
-    def register_multicall_functions(self):
-        """Registers the XML-RPC multicall method in the system
-        namespace.
-
-        see http://www.xmlrpc.com/discuss/msgReader$1208"""
-
-        self.funcs.update({'system.multicall' : self.system_multicall})
-
-    def _marshaled_dispatch(self, data, dispatch_method = None, path = None):
-        """Dispatches an XML-RPC method from marshalled (XML) data.
-
-        XML-RPC methods are dispatched from the marshalled (XML) data
-        using the _dispatch method and the result is returned as
-        marshalled data. For backwards compatibility, a dispatch
-        function can be provided as an argument (see comment in
-        SimpleXMLRPCRequestHandler.do_POST) but overriding the
-        existing method through subclassing is the preferred means
-        of changing method dispatch behavior.
-        """
-
-        try:
-            params, method = loads(data, use_builtin_types=self.use_builtin_types)
-
-            # generate response
-            if dispatch_method is not None:
-                response = dispatch_method(method, params)
-            else:
-                response = self._dispatch(method, params)
-            # wrap response in a singleton tuple
-            response = (response,)
-            response = dumps(response, methodresponse=1,
-                             allow_none=self.allow_none, encoding=self.encoding)
-        except Fault as fault:
-            response = dumps(fault, allow_none=self.allow_none,
-                             encoding=self.encoding)
-        except:
-            # report exception back to server
-            exc_type, exc_value, exc_tb = sys.exc_info()
-            response = dumps(
-                Fault(1, "%s:%s" % (exc_type, exc_value)),
-                encoding=self.encoding, allow_none=self.allow_none,
-                )
-
-        return response.encode(self.encoding)
-
-    def system_listMethods(self):
-        """system.listMethods() => ['add', 'subtract', 'multiple']
-
-        Returns a list of the methods supported by the server."""
-
-        methods = set(self.funcs.keys())
-        if self.instance is not None:
-            # Instance can implement _listMethod to return a list of
-            # methods
-            if hasattr(self.instance, '_listMethods'):
-                methods |= set(self.instance._listMethods())
-            # if the instance has a _dispatch method then we
-            # don't have enough information to provide a list
-            # of methods
-            elif not hasattr(self.instance, '_dispatch'):
-                methods |= set(list_public_methods(self.instance))
-        return sorted(methods)
-
-    def system_methodSignature(self, method_name):
-        """system.methodSignature('add') => [double, int, int]
-
-        Returns a list describing the signature of the method. In the
-        above example, the add method takes two integers as arguments
-        and returns a double result.
-
-        This server does NOT support system.methodSignature."""
-
-        # See http://xmlrpc.usefulinc.com/doc/sysmethodsig.html
-
-        return 'signatures not supported'
-
-    def system_methodHelp(self, method_name):
-        """system.methodHelp('add') => "Adds two integers together"
-
-        Returns a string containing documentation for the specified method."""
-
-        method = None
-        if method_name in self.funcs:
-            method = self.funcs[method_name]
-        elif self.instance is not None:
-            # Instance can implement _methodHelp to return help for a method
-            if hasattr(self.instance, '_methodHelp'):
-                return self.instance._methodHelp(method_name)
-            # if the instance has a _dispatch method then we
-            # don't have enough information to provide help
-            elif not hasattr(self.instance, '_dispatch'):
-                try:
-                    method = resolve_dotted_attribute(
-                                self.instance,
-                                method_name,
-                                self.allow_dotted_names
-                                )
-                except AttributeError:
-                    pass
-
-        # Note that we aren't checking that the method actually
-        # be a callable object of some kind
-        if method is None:
-            return ""
-        else:
-            return pydoc.getdoc(method)
-
-    def system_multicall(self, call_list):
-        """system.multicall([{'methodName': 'add', 'params': [2, 2]}, ...]) => \
-[[4], ...]
-
-        Allows the caller to package multiple XML-RPC calls into a single
-        request.
-
-        See http://www.xmlrpc.com/discuss/msgReader$1208
-        """
-
-        results = []
-        for call in call_list:
-            method_name = call['methodName']
-            params = call['params']
-
-            try:
-                # XXX A marshalling error in any response will fail the entire
-                # multicall. If someone cares they should fix this.
-                results.append([self._dispatch(method_name, params)])
-            except Fault as fault:
-                results.append(
-                    {'faultCode' : fault.faultCode,
-                     'faultString' : fault.faultString}
-                    )
-            except:
-                exc_type, exc_value, exc_tb = sys.exc_info()
-                results.append(
-                    {'faultCode' : 1,
-                     'faultString' : "%s:%s" % (exc_type, exc_value)}
-                    )
-        return results
-
-    def _dispatch(self, method, params):
-        """Dispatches the XML-RPC method.
-
-        XML-RPC calls are forwarded to a registered function that
-        matches the called XML-RPC method name. If no such function
-        exists then the call is forwarded to the registered instance,
-        if available.
-
-        If the registered instance has a _dispatch method then that
-        method will be called with the name of the XML-RPC method and
-        its parameters as a tuple
-        e.g. instance._dispatch('add',(2,3))
-
-        If the registered instance does not have a _dispatch method
-        then the instance will be searched to find a matching method
-        and, if found, will be called.
-
-        Methods beginning with an '_' are considered private and will
-        not be called.
-        """
-
-        func = None
-        try:
-            # check to see if a matching function has been registered
-            func = self.funcs[method]
-        except KeyError:
-            if self.instance is not None:
-                # check for a _dispatch method
-                if hasattr(self.instance, '_dispatch'):
-                    return self.instance._dispatch(method, params)
-                else:
-                    # call instance method directly
-                    try:
-                        func = resolve_dotted_attribute(
-                            self.instance,
-                            method,
-                            self.allow_dotted_names
-                            )
-                    except AttributeError:
-                        pass
-
-        if func is not None:
-            return func(*params)
-        else:
-            raise Exception('method "%s" is not supported' % method)
-
-class SimpleXMLRPCRequestHandler(BaseHTTPRequestHandler):
-    """Simple XML-RPC request handler class.
-
-    Handles all HTTP POST requests and attempts to decode them as
-    XML-RPC requests.
-    """
-
-    # Class attribute listing the accessible path components;
-    # paths not on this list will result in a 404 error.
-    rpc_paths = ('/', '/RPC2')
-
-    #if not None, encode responses larger than this, if possible
-    encode_threshold = 1400 #a common MTU
-
-    #Override form StreamRequestHandler: full buffering of output
-    #and no Nagle.
-    wbufsize = -1
-    disable_nagle_algorithm = True
-
-    # a re to match a gzip Accept-Encoding
-    aepattern = re.compile(r"""
-                            \s* ([^\s;]+) \s*            #content-coding
-                            (;\s* q \s*=\s* ([0-9\.]+))? #q
-                            """, re.VERBOSE | re.IGNORECASE)
-
-    def accept_encodings(self):
-        r = {}
-        ae = self.headers.get("Accept-Encoding", "")
-        for e in ae.split(","):
-            match = self.aepattern.match(e)
-            if match:
-                v = match.group(3)
-                v = float(v) if v else 1.0
-                r[match.group(1)] = v
-        return r
-
-    def is_rpc_path_valid(self):
-        if self.rpc_paths:
-            return self.path in self.rpc_paths
-        else:
-            # If .rpc_paths is empty, just assume all paths are legal
-            return True
-
-    def do_POST(self):
-        """Handles the HTTP POST request.
-
-        Attempts to interpret all HTTP POST requests as XML-RPC calls,
-        which are forwarded to the server's _dispatch method for handling.
-        """
-
-        # Check that the path is legal
-        if not self.is_rpc_path_valid():
-            self.report_404()
-            return
-
-        try:
-            # Get arguments by reading body of request.
-            # We read this in chunks to avoid straining
-            # socket.read(); around the 10 or 15Mb mark, some platforms
-            # begin to have problems (bug #792570).
-            max_chunk_size = 10*1024*1024
-            size_remaining = int(self.headers["content-length"])
-            L = []
-            while size_remaining:
-                chunk_size = min(size_remaining, max_chunk_size)
-                chunk = self.rfile.read(chunk_size)
-                if not chunk:
-                    break
-                L.append(chunk)
-                size_remaining -= len(L[-1])
-            data = b''.join(L)
-
-            data = self.decode_request_content(data)
-            if data is None:
-                return #response has been sent
-
-            # In previous versions of SimpleXMLRPCServer, _dispatch
-            # could be overridden in this class, instead of in
-            # SimpleXMLRPCDispatcher. To maintain backwards compatibility,
-            # check to see if a subclass implements _dispatch and dispatch
-            # using that method if present.
-            response = self.server._marshaled_dispatch(
-                    data, getattr(self, '_dispatch', None), self.path
-                )
-        except Exception as e: # This should only happen if the module is buggy
-            # internal error, report as HTTP server error
-            self.send_response(500)
-
-            # Send information about the exception if requested
-            if hasattr(self.server, '_send_traceback_header') and \
-                    self.server._send_traceback_header:
-                self.send_header("X-exception", str(e))
-                trace = traceback.format_exc()
-                trace = str(trace.encode('ASCII', 'backslashreplace'), 'ASCII')
-                self.send_header("X-traceback", trace)
-
-            self.send_header("Content-length", "0")
-            self.end_headers()
-        else:
-            self.send_response(200)
-            self.send_header("Content-type", "text/xml")
-            if self.encode_threshold is not None:
-                if len(response) > self.encode_threshold:
-                    q = self.accept_encodings().get("gzip", 0)
-                    if q:
-                        try:
-                            response = gzip_encode(response)
-                            self.send_header("Content-Encoding", "gzip")
-                        except NotImplementedError:
-                            pass
-            self.send_header("Content-length", str(len(response)))
-            self.end_headers()
-            self.wfile.write(response)
-
-    def decode_request_content(self, data):
-        #support gzip encoding of request
-        encoding = self.headers.get("content-encoding", "identity").lower()
-        if encoding == "identity":
-            return data
-        if encoding == "gzip":
-            try:
-                return gzip_decode(data)
-            except NotImplementedError:
-                self.send_response(501, "encoding %r not supported" % encoding)
-            except ValueError:
-                self.send_response(400, "error decoding gzip content")
-        else:
-            self.send_response(501, "encoding %r not supported" % encoding)
-        self.send_header("Content-length", "0")
-        self.end_headers()
-
-    def report_404 (self):
-            # Report a 404 error
-        self.send_response(404)
-        response = b'No such page'
-        self.send_header("Content-type", "text/plain")
-        self.send_header("Content-length", str(len(response)))
-        self.end_headers()
-        self.wfile.write(response)
-
-    def log_request(self, code='-', size='-'):
-        """Selectively log an accepted request."""
-
-        if self.server.logRequests:
-            BaseHTTPRequestHandler.log_request(self, code, size)
-
-class SimpleXMLRPCServer(socketserver.TCPServer,
-                         SimpleXMLRPCDispatcher):
-    """Simple XML-RPC server.
-
-    Simple XML-RPC server that allows functions and a single instance
-    to be installed to handle requests. The default implementation
-    attempts to dispatch XML-RPC calls to the functions or instance
-    installed in the server. Override the _dispatch method inherited
-    from SimpleXMLRPCDispatcher to change this behavior.
-    """
-
-    allow_reuse_address = True
-
-    # Warning: this is for debugging purposes only! Never set this to True in
-    # production code, as will be sending out sensitive information (exception
-    # and stack trace details) when exceptions are raised inside
-    # SimpleXMLRPCRequestHandler.do_POST
-    _send_traceback_header = False
-
-    def __init__(self, addr, requestHandler=SimpleXMLRPCRequestHandler,
-                 logRequests=True, allow_none=False, encoding=None,
-                 bind_and_activate=True, use_builtin_types=False):
-        self.logRequests = logRequests
-
-        SimpleXMLRPCDispatcher.__init__(self, allow_none, encoding, use_builtin_types)
-        socketserver.TCPServer.__init__(self, addr, requestHandler, bind_and_activate)
-
-        # [Bug #1222790] If possible, set close-on-exec flag; if a
-        # method spawns a subprocess, the subprocess shouldn't have
-        # the listening socket open.
-        if fcntl is not None and hasattr(fcntl, 'FD_CLOEXEC'):
-            flags = fcntl.fcntl(self.fileno(), fcntl.F_GETFD)
-            flags |= fcntl.FD_CLOEXEC
-            fcntl.fcntl(self.fileno(), fcntl.F_SETFD, flags)
-
-class MultiPathXMLRPCServer(SimpleXMLRPCServer):
-    """Multipath XML-RPC Server
-    This specialization of SimpleXMLRPCServer allows the user to create
-    multiple Dispatcher instances and assign them to different
-    HTTP request paths.  This makes it possible to run two or more
-    'virtual XML-RPC servers' at the same port.
-    Make sure that the requestHandler accepts the paths in question.
-    """
-    def __init__(self, addr, requestHandler=SimpleXMLRPCRequestHandler,
-                 logRequests=True, allow_none=False, encoding=None,
-                 bind_and_activate=True, use_builtin_types=False):
-
-        SimpleXMLRPCServer.__init__(self, addr, requestHandler, logRequests, allow_none,
-                                    encoding, bind_and_activate, use_builtin_types)
-        self.dispatchers = {}
-        self.allow_none = allow_none
-        self.encoding = encoding or 'utf-8'
-
-    def add_dispatcher(self, path, dispatcher):
-        self.dispatchers[path] = dispatcher
-        return dispatcher
-
-    def get_dispatcher(self, path):
-        return self.dispatchers[path]
-
-    def _marshaled_dispatch(self, data, dispatch_method = None, path = None):
-        try:
-            response = self.dispatchers[path]._marshaled_dispatch(
-               data, dispatch_method, path)
-        except:
-            # report low level exception back to server
-            # (each dispatcher should have handled their own
-            # exceptions)
-            exc_type, exc_value = sys.exc_info()[:2]
-            response = dumps(
-                Fault(1, "%s:%s" % (exc_type, exc_value)),
-                encoding=self.encoding, allow_none=self.allow_none)
-            response = response.encode(self.encoding)
-        return response
-
-class CGIXMLRPCRequestHandler(SimpleXMLRPCDispatcher):
-    """Simple handler for XML-RPC data passed through CGI."""
-
-    def __init__(self, allow_none=False, encoding=None, use_builtin_types=False):
-        SimpleXMLRPCDispatcher.__init__(self, allow_none, encoding, use_builtin_types)
-
-    def handle_xmlrpc(self, request_text):
-        """Handle a single XML-RPC request"""
-
-        response = self._marshaled_dispatch(request_text)
-
-        print('Content-Type: text/xml')
-        print('Content-Length: %d' % len(response))
-        print()
-        sys.stdout.flush()
-        sys.stdout.buffer.write(response)
-        sys.stdout.buffer.flush()
-
-    def handle_get(self):
-        """Handle a single HTTP GET request.
-
-        Default implementation indicates an error because
-        XML-RPC uses the POST method.
-        """
-
-        code = 400
-        message, explain = BaseHTTPRequestHandler.responses[code]
-
-        response = http_server.DEFAULT_ERROR_MESSAGE % \
-            {
-             'code' : code,
-             'message' : message,
-             'explain' : explain
-            }
-        response = response.encode('utf-8')
-        print('Status: %d %s' % (code, message))
-        print('Content-Type: %s' % http_server.DEFAULT_ERROR_CONTENT_TYPE)
-        print('Content-Length: %d' % len(response))
-        print()
-        sys.stdout.flush()
-        sys.stdout.buffer.write(response)
-        sys.stdout.buffer.flush()
-
-    def handle_request(self, request_text=None):
-        """Handle a single XML-RPC request passed through a CGI post method.
-
-        If no XML data is given then it is read from stdin. The resulting
-        XML-RPC response is printed to stdout along with the correct HTTP
-        headers.
-        """
-
-        if request_text is None and \
-            os.environ.get('REQUEST_METHOD', None) == 'GET':
-            self.handle_get()
-        else:
-            # POST data is normally available through stdin
-            try:
-                length = int(os.environ.get('CONTENT_LENGTH', None))
-            except (ValueError, TypeError):
-                length = -1
-            if request_text is None:
-                request_text = sys.stdin.read(length)
-
-            self.handle_xmlrpc(request_text)
-
-
-# -----------------------------------------------------------------------------
-# Self documenting XML-RPC Server.
-
-class ServerHTMLDoc(pydoc.HTMLDoc):
-    """Class used to generate pydoc HTML document for a server"""
-
-    def markup(self, text, escape=None, funcs={}, classes={}, methods={}):
-        """Mark up some plain text, given a context of symbols to look for.
-        Each context dictionary maps object names to anchor names."""
-        escape = escape or self.escape
-        results = []
-        here = 0
-
-        # XXX Note that this regular expression does not allow for the
-        # hyperlinking of arbitrary strings being used as method
-        # names. Only methods with names consisting of word characters
-        # and '.'s are hyperlinked.
-        pattern = re.compile(r'\b((http|ftp)://\S+[\w/]|'
-                                r'RFC[- ]?(\d+)|'
-                                r'PEP[- ]?(\d+)|'
-                                r'(self\.)?((?:\w|\.)+))\b')
-        while 1:
-            match = pattern.search(text, here)
-            if not match: break
-            start, end = match.span()
-            results.append(escape(text[here:start]))
-
-            all, scheme, rfc, pep, selfdot, name = match.groups()
-            if scheme:
-                url = escape(all).replace('"', '&quot;')
-                results.append('<a href="%s">%s</a>' % (url, url))
-            elif rfc:
-                url = 'http://www.rfc-editor.org/rfc/rfc%d.txt' % int(rfc)
-                results.append('<a href="%s">%s</a>' % (url, escape(all)))
-            elif pep:
-                url = 'http://www.python.org/dev/peps/pep-%04d/' % int(pep)
-                results.append('<a href="%s">%s</a>' % (url, escape(all)))
-            elif text[end:end+1] == '(':
-                results.append(self.namelink(name, methods, funcs, classes))
-            elif selfdot:
-                results.append('self.<strong>%s</strong>' % name)
-            else:
-                results.append(self.namelink(name, classes))
-            here = end
-        results.append(escape(text[here:]))
-        return ''.join(results)
-
-    def docroutine(self, object, name, mod=None,
-                   funcs={}, classes={}, methods={}, cl=None):
-        """Produce HTML documentation for a function or method object."""
-
-        anchor = (cl and cl.__name__ or '') + '-' + name
-        note = ''
-
-        title = '<a name="%s"><strong>%s</strong></a>' % (
-            self.escape(anchor), self.escape(name))
-
-        if inspect.ismethod(object):
-            args = inspect.getfullargspec(object)
-            # exclude the argument bound to the instance, it will be
-            # confusing to the non-Python user
-            argspec = inspect.formatargspec (
-                    args.args[1:],
-                    args.varargs,
-                    args.varkw,
-                    args.defaults,
-                    annotations=args.annotations,
-                    formatvalue=self.formatvalue
-                )
-        elif inspect.isfunction(object):
-            args = inspect.getfullargspec(object)
-            argspec = inspect.formatargspec(
-                args.args, args.varargs, args.varkw, args.defaults,
-                annotations=args.annotations,
-                formatvalue=self.formatvalue)
-        else:
-            argspec = '(...)'
-
-        if isinstance(object, tuple):
-            argspec = object[0] or argspec
-            docstring = object[1] or ""
-        else:
-            docstring = pydoc.getdoc(object)
-
-        decl = title + argspec + (note and self.grey(
-               '<font face="helvetica, arial">%s</font>' % note))
-
-        doc = self.markup(
-            docstring, self.preformat, funcs, classes, methods)
-        doc = doc and '<dd><tt>%s</tt></dd>' % doc
-        return '<dl><dt>%s</dt>%s</dl>\n' % (decl, doc)
-
-    def docserver(self, server_name, package_documentation, methods):
-        """Produce HTML documentation for an XML-RPC server."""
-
-        fdict = {}
-        for key, value in methods.items():
-            fdict[key] = '#-' + key
-            fdict[value] = fdict[key]
-
-        server_name = self.escape(server_name)
-        head = '<big><big><strong>%s</strong></big></big>' % server_name
-        result = self.heading(head, '#ffffff', '#7799ee')
-
-        doc = self.markup(package_documentation, self.preformat, fdict)
-        doc = doc and '<tt>%s</tt>' % doc
-        result = result + '<p>%s</p>\n' % doc
-
-        contents = []
-        method_items = sorted(methods.items())
-        for key, value in method_items:
-            contents.append(self.docroutine(value, key, funcs=fdict))
-        result = result + self.bigsection(
-            'Methods', '#ffffff', '#eeaa77', ''.join(contents))
-
-        return result
-
-class XMLRPCDocGenerator(object):
-    """Generates documentation for an XML-RPC server.
-
-    This class is designed as mix-in and should not
-    be constructed directly.
-    """
-
-    def __init__(self):
-        # setup variables used for HTML documentation
-        self.server_name = 'XML-RPC Server Documentation'
-        self.server_documentation = \
-            "This server exports the following methods through the XML-RPC "\
-            "protocol."
-        self.server_title = 'XML-RPC Server Documentation'
-
-    def set_server_title(self, server_title):
-        """Set the HTML title of the generated server documentation"""
-
-        self.server_title = server_title
-
-    def set_server_name(self, server_name):
-        """Set the name of the generated HTML server documentation"""
-
-        self.server_name = server_name
-
-    def set_server_documentation(self, server_documentation):
-        """Set the documentation string for the entire server."""
-
-        self.server_documentation = server_documentation
-
-    def generate_html_documentation(self):
-        """generate_html_documentation() => html documentation for the server
-
-        Generates HTML documentation for the server using introspection for
-        installed functions and instances that do not implement the
-        _dispatch method. Alternatively, instances can choose to implement
-        the _get_method_argstring(method_name) method to provide the
-        argument string used in the documentation and the
-        _methodHelp(method_name) method to provide the help text used
-        in the documentation."""
-
-        methods = {}
-
-        for method_name in self.system_listMethods():
-            if method_name in self.funcs:
-                method = self.funcs[method_name]
-            elif self.instance is not None:
-                method_info = [None, None] # argspec, documentation
-                if hasattr(self.instance, '_get_method_argstring'):
-                    method_info[0] = self.instance._get_method_argstring(method_name)
-                if hasattr(self.instance, '_methodHelp'):
-                    method_info[1] = self.instance._methodHelp(method_name)
-
-                method_info = tuple(method_info)
-                if method_info != (None, None):
-                    method = method_info
-                elif not hasattr(self.instance, '_dispatch'):
-                    try:
-                        method = resolve_dotted_attribute(
-                                    self.instance,
-                                    method_name
-                                    )
-                    except AttributeError:
-                        method = method_info
-                else:
-                    method = method_info
-            else:
-                assert 0, "Could not find method in self.functions and no "\
-                          "instance installed"
-
-            methods[method_name] = method
-
-        documenter = ServerHTMLDoc()
-        documentation = documenter.docserver(
-                                self.server_name,
-                                self.server_documentation,
-                                methods
-                            )
-
-        return documenter.page(self.server_title, documentation)
-
-class DocXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
-    """XML-RPC and documentation request handler class.
-
-    Handles all HTTP POST requests and attempts to decode them as
-    XML-RPC requests.
-
-    Handles all HTTP GET requests and interprets them as requests
-    for documentation.
-    """
-
-    def do_GET(self):
-        """Handles the HTTP GET request.
-
-        Interpret all HTTP GET requests as requests for server
-        documentation.
-        """
-        # Check that the path is legal
-        if not self.is_rpc_path_valid():
-            self.report_404()
-            return
-
-        response = self.server.generate_html_documentation().encode('utf-8')
-        self.send_response(200)
-        self.send_header("Content-type", "text/html")
-        self.send_header("Content-length", str(len(response)))
-        self.end_headers()
-        self.wfile.write(response)
-
-class DocXMLRPCServer(  SimpleXMLRPCServer,
-                        XMLRPCDocGenerator):
-    """XML-RPC and HTML documentation server.
-
-    Adds the ability to serve server documentation to the capabilities
-    of SimpleXMLRPCServer.
-    """
-
-    def __init__(self, addr, requestHandler=DocXMLRPCRequestHandler,
-                 logRequests=True, allow_none=False, encoding=None,
-                 bind_and_activate=True, use_builtin_types=False):
-        SimpleXMLRPCServer.__init__(self, addr, requestHandler, logRequests,
-                                    allow_none, encoding, bind_and_activate,
-                                    use_builtin_types)
-        XMLRPCDocGenerator.__init__(self)
-
-class DocCGIXMLRPCRequestHandler(   CGIXMLRPCRequestHandler,
-                                    XMLRPCDocGenerator):
-    """Handler for XML-RPC data and documentation requests passed through
-    CGI"""
-
-    def handle_get(self):
-        """Handles the HTTP GET request.
-
-        Interpret all HTTP GET requests as requests for server
-        documentation.
-        """
-
-        response = self.generate_html_documentation().encode('utf-8')
-
-        print('Content-Type: text/html')
-        print('Content-Length: %d' % len(response))
-        print()
-        sys.stdout.flush()
-        sys.stdout.buffer.write(response)
-        sys.stdout.buffer.flush()
-
-    def __init__(self):
-        CGIXMLRPCRequestHandler.__init__(self)
-        XMLRPCDocGenerator.__init__(self)
-
-
-if __name__ == '__main__':
-    import datetime
-
-    class ExampleService:
-        def getData(self):
-            return '42'
-
-        class currentTime:
-            @staticmethod
-            def getCurrentTime():
-                return datetime.datetime.now()
-
-    server = SimpleXMLRPCServer(("localhost", 8000))
-    server.register_function(pow)
-    server.register_function(lambda x,y: x+y, 'add')
-    server.register_instance(ExampleService(), allow_dotted_names=True)
-    server.register_multicall_functions()
-    print('Serving XML-RPC on localhost port 8000')
-    print('It is advisable to run this example server within a secure, closed network.')
-    try:
-        server.serve_forever()
-    except KeyboardInterrupt:
-        print("\nKeyboard interrupt received, exiting.")
-        server.server_close()
-        sys.exit(0)
diff --git a/lib/future/builtins/__init__.py b/lib/future/builtins/__init__.py
deleted file mode 100644
index 1734cd45..00000000
--- a/lib/future/builtins/__init__.py
+++ /dev/null
@@ -1,51 +0,0 @@
-"""
-A module that brings in equivalents of the new and modified Python 3
-builtins into Py2. Has no effect on Py3.
-
-See the docs `here <https://python-future.org/what-else.html>`_
-(``docs/what-else.rst``) for more information.
-
-"""
-
-from future.builtins.iterators import (filter, map, zip)
-# The isinstance import is no longer needed. We provide it only for
-# backward-compatibility with future v0.8.2. It will be removed in future v1.0.
-from future.builtins.misc import (ascii, chr, hex, input, isinstance, next,
-                                  oct, open, pow, round, super, max, min)
-from future.utils import PY3
-
-if PY3:
-    import builtins
-    bytes = builtins.bytes
-    dict = builtins.dict
-    int = builtins.int
-    list = builtins.list
-    object = builtins.object
-    range = builtins.range
-    str = builtins.str
-    __all__ = []
-else:
-    from future.types import (newbytes as bytes,
-                              newdict as dict,
-                              newint as int,
-                              newlist as list,
-                              newobject as object,
-                              newrange as range,
-                              newstr as str)
-from future import utils
-
-
-if not utils.PY3:
-    # We only import names that shadow the builtins on Py2. No other namespace
-    # pollution on Py2.
-
-    # Only shadow builtins on Py2; no new names
-    __all__ = ['filter', 'map', 'zip',
-               'ascii', 'chr', 'hex', 'input', 'next', 'oct', 'open', 'pow',
-               'round', 'super',
-               'bytes', 'dict', 'int', 'list', 'object', 'range', 'str', 'max', 'min'
-              ]
-
-else:
-    # No namespace pollution on Py3
-    __all__ = []
diff --git a/lib/future/builtins/disabled.py b/lib/future/builtins/disabled.py
deleted file mode 100644
index f6d6ea9b..00000000
--- a/lib/future/builtins/disabled.py
+++ /dev/null
@@ -1,66 +0,0 @@
-"""
-This disables builtin functions (and one exception class) which are
-removed from Python 3.3.
-
-This module is designed to be used like this::
-
-    from future.builtins.disabled import *
-
-This disables the following obsolete Py2 builtin functions::
-
-    apply, cmp, coerce, execfile, file, input, long,
-    raw_input, reduce, reload, unicode, xrange
-
-We don't hack __builtin__, which is very fragile because it contaminates
-imported modules too. Instead, we just create new functions with
-the same names as the obsolete builtins from Python 2 which raise
-NameError exceptions when called.
-
-Note that both ``input()`` and ``raw_input()`` are among the disabled
-functions (in this module). Although ``input()`` exists as a builtin in
-Python 3, the Python 2 ``input()`` builtin is unsafe to use because it
-can lead to shell injection. Therefore we shadow it by default upon ``from
-future.builtins.disabled import *``, in case someone forgets to import our
-replacement ``input()`` somehow and expects Python 3 semantics.
-
-See the ``future.builtins.misc`` module for a working version of
-``input`` with Python 3 semantics.
-
-(Note that callable() is not among the functions disabled; this was
-reintroduced into Python 3.2.)
-
-This exception class is also disabled:
-
-    StandardError
-
-"""
-
-from __future__ import division, absolute_import, print_function
-
-from future import utils
-
-
-OBSOLETE_BUILTINS = ['apply', 'chr', 'cmp', 'coerce', 'execfile', 'file',
-                     'input', 'long', 'raw_input', 'reduce', 'reload',
-                     'unicode', 'xrange', 'StandardError']
-
-
-def disabled_function(name):
-    '''
-    Returns a function that cannot be called
-    '''
-    def disabled(*args, **kwargs):
-        '''
-        A function disabled by the ``future`` module. This function is
-        no longer a builtin in Python 3.
-        '''
-        raise NameError('obsolete Python 2 builtin {0} is disabled'.format(name))
-    return disabled
-
-
-if not utils.PY3:
-    for fname in OBSOLETE_BUILTINS:
-        locals()[fname] = disabled_function(fname)
-    __all__ = OBSOLETE_BUILTINS
-else:
-    __all__ = []
diff --git a/lib/future/builtins/iterators.py b/lib/future/builtins/iterators.py
deleted file mode 100644
index dff651e0..00000000
--- a/lib/future/builtins/iterators.py
+++ /dev/null
@@ -1,52 +0,0 @@
-"""
-This module is designed to be used as follows::
-
-    from future.builtins.iterators import *
-
-And then, for example::
-
-    for i in range(10**15):
-        pass
-
-    for (a, b) in zip(range(10**15), range(-10**15, 0)):
-        pass
-
-Note that this is standard Python 3 code, plus some imports that do
-nothing on Python 3.
-
-The iterators this brings in are::
-
-- ``range``
-- ``filter``
-- ``map``
-- ``zip``
-
-On Python 2, ``range`` is a pure-Python backport of Python 3's ``range``
-iterator with slicing support. The other iterators (``filter``, ``map``,
-``zip``) are from the ``itertools`` module on Python 2. On Python 3 these
-are available in the module namespace but not exported for * imports via
-__all__ (zero no namespace pollution).
-
-Note that these are also available in the standard library
-``future_builtins`` module on Python 2 -- but not Python 3, so using
-the standard library version is not portable, nor anywhere near complete.
-"""
-
-from __future__ import division, absolute_import, print_function
-
-import itertools
-from future import utils
-
-if not utils.PY3:
-    filter = itertools.ifilter
-    map = itertools.imap
-    from future.types import newrange as range
-    zip = itertools.izip
-    __all__ = ['filter', 'map', 'range', 'zip']
-else:
-    import builtins
-    filter = builtins.filter
-    map = builtins.map
-    range = builtins.range
-    zip = builtins.zip
-    __all__ = []
diff --git a/lib/future/builtins/misc.py b/lib/future/builtins/misc.py
deleted file mode 100644
index f86ce5f3..00000000
--- a/lib/future/builtins/misc.py
+++ /dev/null
@@ -1,135 +0,0 @@
-"""
-A module that brings in equivalents of various modified Python 3 builtins
-into Py2. Has no effect on Py3.
-
-The builtin functions are:
-
-- ``ascii`` (from Py2's future_builtins module)
-- ``hex`` (from Py2's future_builtins module)
-- ``oct`` (from Py2's future_builtins module)
-- ``chr`` (equivalent to ``unichr`` on Py2)
-- ``input`` (equivalent to ``raw_input`` on Py2)
-- ``next`` (calls ``__next__`` if it exists, else ``next`` method)
-- ``open`` (equivalent to io.open on Py2)
-- ``super`` (backport of Py3's magic zero-argument super() function
-- ``round`` (new "Banker's Rounding" behaviour from Py3)
-- ``max`` (new default option from Py3.4)
-- ``min`` (new default option from Py3.4)
-
-``isinstance`` is also currently exported for backwards compatibility
-with v0.8.2, although this has been deprecated since v0.9.
-
-
-input()
--------
-Like the new ``input()`` function from Python 3 (without eval()), except
-that it returns bytes. Equivalent to Python 2's ``raw_input()``.
-
-Warning: By default, importing this module *removes* the old Python 2
-input() function entirely from ``__builtin__`` for safety. This is
-because forgetting to import the new ``input`` from ``future`` might
-otherwise lead to a security vulnerability (shell injection) on Python 2.
-
-To restore it, you can retrieve it yourself from
-``__builtin__._old_input``.
-
-Fortunately, ``input()`` seems to be seldom used in the wild in Python
-2...
-
-"""
-
-from future import utils
-
-
-if utils.PY2:
-    from io import open
-    from future_builtins import ascii, oct, hex
-    from __builtin__ import unichr as chr, pow as _builtin_pow
-    import __builtin__
-
-    # Only for backward compatibility with future v0.8.2:
-    isinstance = __builtin__.isinstance
-
-    # Warning: Python 2's input() is unsafe and MUST not be able to be used
-    # accidentally by someone who expects Python 3 semantics but forgets
-    # to import it on Python 2. Versions of ``future`` prior to 0.11
-    # deleted it from __builtin__.  Now we keep in __builtin__ but shadow
-    # the name like all others. Just be sure to import ``input``.
-
-    input = raw_input
-
-    from future.builtins.newnext import newnext as next
-    from future.builtins.newround import newround as round
-    from future.builtins.newsuper import newsuper as super
-    from future.builtins.new_min_max import newmax as max
-    from future.builtins.new_min_max import newmin as min
-    from future.types.newint import newint
-
-    _SENTINEL = object()
-
-    def pow(x, y, z=_SENTINEL):
-        """
-        pow(x, y[, z]) -> number
-
-        With two arguments, equivalent to x**y.  With three arguments,
-        equivalent to (x**y) % z, but may be more efficient (e.g. for ints).
-        """
-        # Handle newints
-        if isinstance(x, newint):
-            x = long(x)
-        if isinstance(y, newint):
-            y = long(y)
-        if isinstance(z, newint):
-            z = long(z)
-
-        try:
-            if z == _SENTINEL:
-                return _builtin_pow(x, y)
-            else:
-                return _builtin_pow(x, y, z)
-        except ValueError:
-            if z == _SENTINEL:
-                return _builtin_pow(x+0j, y)
-            else:
-                return _builtin_pow(x+0j, y, z)
-
-
-    # ``future`` doesn't support Py3.0/3.1. If we ever did, we'd add this:
-    #     callable = __builtin__.callable
-
-    __all__ = ['ascii', 'chr', 'hex', 'input', 'isinstance', 'next', 'oct',
-               'open', 'pow', 'round', 'super', 'max', 'min']
-
-else:
-    import builtins
-    ascii = builtins.ascii
-    chr = builtins.chr
-    hex = builtins.hex
-    input = builtins.input
-    next = builtins.next
-    # Only for backward compatibility with future v0.8.2:
-    isinstance = builtins.isinstance
-    oct = builtins.oct
-    open = builtins.open
-    pow = builtins.pow
-    round = builtins.round
-    super = builtins.super
-    if utils.PY34_PLUS:
-        max = builtins.max
-        min = builtins.min
-        __all__ = []
-    else:
-        from future.builtins.new_min_max import newmax as max
-        from future.builtins.new_min_max import newmin as min
-        __all__ = ['min', 'max']
-
-    # The callable() function was removed from Py3.0 and 3.1 and
-    # reintroduced into Py3.2+. ``future`` doesn't support Py3.0/3.1. If we ever
-    # did, we'd add this:
-    # try:
-    #     callable = builtins.callable
-    # except AttributeError:
-    #     # Definition from Pandas
-    #     def callable(obj):
-    #         return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
-    #     __all__.append('callable')
diff --git a/lib/future/builtins/new_min_max.py b/lib/future/builtins/new_min_max.py
deleted file mode 100644
index 6f0c2a86..00000000
--- a/lib/future/builtins/new_min_max.py
+++ /dev/null
@@ -1,59 +0,0 @@
-import itertools
-
-from future import utils
-if utils.PY2:
-    from __builtin__ import max as _builtin_max, min as _builtin_min
-else:
-    from builtins import max as _builtin_max, min as _builtin_min
-
-_SENTINEL = object()
-
-
-def newmin(*args, **kwargs):
-    return new_min_max(_builtin_min, *args, **kwargs)
-
-
-def newmax(*args, **kwargs):
-    return new_min_max(_builtin_max, *args, **kwargs)
-
-
-def new_min_max(_builtin_func, *args, **kwargs):
-    """
-    To support the argument "default" introduced in python 3.4 for min and max
-    :param _builtin_func: builtin min or builtin max
-    :param args:
-    :param kwargs:
-    :return: returns the min or max based on the arguments passed
-    """
-
-    for key, _ in kwargs.items():
-        if key not in set(['key', 'default']):
-            raise TypeError('Illegal argument %s', key)
-
-    if len(args) == 0:
-        raise TypeError
-
-    if len(args) != 1 and kwargs.get('default', _SENTINEL) is not _SENTINEL:
-        raise TypeError
-
-    if len(args) == 1:
-        iterator = iter(args[0])
-        try:
-            first = next(iterator)
-        except StopIteration:
-            if kwargs.get('default', _SENTINEL) is not _SENTINEL:
-                return kwargs.get('default')
-            else:
-                raise ValueError('{}() arg is an empty sequence'.format(_builtin_func.__name__))
-        else:
-            iterator = itertools.chain([first], iterator)
-        if kwargs.get('key') is not None:
-            return _builtin_func(iterator, key=kwargs.get('key'))
-        else:
-            return _builtin_func(iterator)
-
-    if len(args) > 1:
-        if kwargs.get('key') is not None:
-            return _builtin_func(args, key=kwargs.get('key'))
-        else:
-            return _builtin_func(args)
diff --git a/lib/future/builtins/newnext.py b/lib/future/builtins/newnext.py
deleted file mode 100644
index 097638ac..00000000
--- a/lib/future/builtins/newnext.py
+++ /dev/null
@@ -1,70 +0,0 @@
-'''
-This module provides a newnext() function in Python 2 that mimics the
-behaviour of ``next()`` in Python 3, falling back to Python 2's behaviour for
-compatibility if this fails.
-
-``newnext(iterator)`` calls the iterator's ``__next__()`` method if it exists. If this
-doesn't exist, it falls back to calling a ``next()`` method.
-
-For example:
-
-    >>> class Odds(object):
-    ...     def __init__(self, start=1):
-    ...         self.value = start - 2
-    ...     def __next__(self):                 # note the Py3 interface
-    ...         self.value += 2
-    ...         return self.value
-    ...     def __iter__(self):
-    ...         return self
-    ...
-    >>> iterator = Odds()
-    >>> next(iterator)
-    1
-    >>> next(iterator)
-    3
-
-If you are defining your own custom iterator class as above, it is preferable
-to explicitly decorate the class with the @implements_iterator decorator from
-``future.utils`` as follows:
-
-    >>> @implements_iterator
-    ... class Odds(object):
-    ...     # etc
-    ...     pass
-
-This next() function is primarily for consuming iterators defined in Python 3
-code elsewhere that we would like to run on Python 2 or 3.
-'''
-
-_builtin_next = next
-
-_SENTINEL = object()
-
-def newnext(iterator, default=_SENTINEL):
-    """
-    next(iterator[, default])
-
-    Return the next item from the iterator. If default is given and the iterator
-    is exhausted, it is returned instead of raising StopIteration.
-    """
-
-    # args = []
-    # if default is not _SENTINEL:
-    #     args.append(default)
-    try:
-        try:
-            return iterator.__next__()
-        except AttributeError:
-            try:
-                return iterator.next()
-            except AttributeError:
-                raise TypeError("'{0}' object is not an iterator".format(
-                                           iterator.__class__.__name__))
-    except StopIteration as e:
-        if default is _SENTINEL:
-            raise e
-        else:
-            return default
-
-
-__all__ = ['newnext']
diff --git a/lib/future/builtins/newround.py b/lib/future/builtins/newround.py
deleted file mode 100644
index b06c1169..00000000
--- a/lib/future/builtins/newround.py
+++ /dev/null
@@ -1,105 +0,0 @@
-"""
-``python-future``: pure Python implementation of Python 3 round().
-"""
-
-from __future__ import division
-from future.utils import PYPY, PY26, bind_method
-
-# Use the decimal module for simplicity of implementation (and
-# hopefully correctness).
-from decimal import Decimal, ROUND_HALF_EVEN
-
-
-def newround(number, ndigits=None):
-    """
-    See Python 3 documentation: uses Banker's Rounding.
-
-    Delegates to the __round__ method if for some reason this exists.
-
-    If not, rounds a number to a given precision in decimal digits (default
-    0 digits). This returns an int when called with one argument,
-    otherwise the same type as the number. ndigits may be negative.
-
-    See the test_round method in future/tests/test_builtins.py for
-    examples.
-    """
-    return_int = False
-    if ndigits is None:
-        return_int = True
-        ndigits = 0
-    if hasattr(number, '__round__'):
-        return number.__round__(ndigits)
-
-    exponent = Decimal('10') ** (-ndigits)
-
-    # Work around issue #24: round() breaks on PyPy with NumPy's types
-    # Also breaks on CPython with NumPy's specialized int types like uint64
-    if 'numpy' in repr(type(number)):
-        number = float(number)
-
-    if isinstance(number, Decimal):
-        d = number
-    else:
-        if not PY26:
-            d = Decimal.from_float(number)
-        else:
-            d = from_float_26(number)
-
-    if ndigits < 0:
-        result = newround(d / exponent) * exponent
-    else:
-        result = d.quantize(exponent, rounding=ROUND_HALF_EVEN)
-
-    if return_int:
-        return int(result)
-    else:
-        return float(result)
-
-
-### From Python 2.7's decimal.py. Only needed to support Py2.6:
-
-def from_float_26(f):
-    """Converts a float to a decimal number, exactly.
-
-    Note that Decimal.from_float(0.1) is not the same as Decimal('0.1').
-    Since 0.1 is not exactly representable in binary floating point, the
-    value is stored as the nearest representable value which is
-    0x1.999999999999ap-4.  The exact equivalent of the value in decimal
-    is 0.1000000000000000055511151231257827021181583404541015625.
-
-    >>> Decimal.from_float(0.1)
-    Decimal('0.1000000000000000055511151231257827021181583404541015625')
-    >>> Decimal.from_float(float('nan'))
-    Decimal('NaN')
-    >>> Decimal.from_float(float('inf'))
-    Decimal('Infinity')
-    >>> Decimal.from_float(-float('inf'))
-    Decimal('-Infinity')
-    >>> Decimal.from_float(-0.0)
-    Decimal('-0')
-
-    """
-    import math as _math
-    from decimal import _dec_from_triple    # only available on Py2.6 and Py2.7 (not 3.3)
-
-    if isinstance(f, (int, long)):        # handle integer inputs
-        return Decimal(f)
-    if _math.isinf(f) or _math.isnan(f):  # raises TypeError if not a float
-        return Decimal(repr(f))
-    if _math.copysign(1.0, f) == 1.0:
-        sign = 0
-    else:
-        sign = 1
-    n, d = abs(f).as_integer_ratio()
-    # int.bit_length() method doesn't exist on Py2.6:
-    def bit_length(d):
-        if d != 0:
-            return len(bin(abs(d))) - 2
-        else:
-            return 0
-    k = bit_length(d) - 1
-    result = _dec_from_triple(sign, str(n*5**k), -k)
-    return result
-
-
-__all__ = ['newround']
diff --git a/lib/future/builtins/newsuper.py b/lib/future/builtins/newsuper.py
deleted file mode 100644
index 3e8cc80f..00000000
--- a/lib/future/builtins/newsuper.py
+++ /dev/null
@@ -1,113 +0,0 @@
-'''
-This module provides a newsuper() function in Python 2 that mimics the
-behaviour of super() in Python 3. It is designed to be used as follows:
-
-    from __future__ import division, absolute_import, print_function
-    from future.builtins import super
-
-And then, for example:
-
-    class VerboseList(list):
-        def append(self, item):
-            print('Adding an item')
-            super().append(item)        # new simpler super() function
-
-Importing this module on Python 3 has no effect.
-
-This is based on (i.e. almost identical to) Ryan Kelly's magicsuper
-module here:
-
-    https://github.com/rfk/magicsuper.git
-
-Excerpts from Ryan's docstring:
-
-  "Of course, you can still explicitly pass in the arguments if you want
-  to do something strange.  Sometimes you really do want that, e.g. to
-  skip over some classes in the method resolution order.
-
-  "How does it work?  By inspecting the calling frame to determine the
-  function object being executed and the object on which it's being
-  called, and then walking the object's __mro__ chain to find out where
-  that function was defined.  Yuck, but it seems to work..."
-'''
-
-from __future__ import absolute_import
-import sys
-from types import FunctionType
-
-from future.utils import PY3, PY26
-
-
-_builtin_super = super
-
-_SENTINEL = object()
-
-def newsuper(typ=_SENTINEL, type_or_obj=_SENTINEL, framedepth=1):
-    '''Like builtin super(), but capable of magic.
-
-    This acts just like the builtin super() function, but if called
-    without any arguments it attempts to infer them at runtime.
-    '''
-    #  Infer the correct call if used without arguments.
-    if typ is _SENTINEL:
-        # We'll need to do some frame hacking.
-        f = sys._getframe(framedepth)
-
-        try:
-            # Get the function's first positional argument.
-            type_or_obj = f.f_locals[f.f_code.co_varnames[0]]
-        except (IndexError, KeyError,):
-            raise RuntimeError('super() used in a function with no args')
-
-        try:
-            typ = find_owner(type_or_obj, f.f_code)
-        except (AttributeError, RuntimeError, TypeError):
-            # see issues #160, #267
-            try:
-                typ = find_owner(type_or_obj.__class__, f.f_code)
-            except AttributeError:
-                raise RuntimeError('super() used with an old-style class')
-            except TypeError:
-                raise RuntimeError('super() called outside a method')
-
-    #  Dispatch to builtin super().
-    if type_or_obj is not _SENTINEL:
-        return _builtin_super(typ, type_or_obj)
-    return _builtin_super(typ)
-
-
-def find_owner(cls, code):
-    '''Find the class that owns the currently-executing method.
-    '''
-    for typ in cls.__mro__:
-        for meth in typ.__dict__.values():
-            # Drill down through any wrappers to the underlying func.
-            # This handles e.g. classmethod() and staticmethod().
-            try:
-                while not isinstance(meth,FunctionType):
-                    if isinstance(meth, property):
-                        # Calling __get__ on the property will invoke
-                        # user code which might throw exceptions or have
-                        # side effects
-                        meth = meth.fget
-                    else:
-                        try:
-                            meth = meth.__func__
-                        except AttributeError:
-                            meth = meth.__get__(cls, typ)
-            except (AttributeError, TypeError):
-                continue
-            if meth.func_code is code:
-                return typ   # Aha!  Found you.
-        #  Not found! Move onto the next class in MRO.
-
-    raise TypeError
-
-
-def superm(*args, **kwds):
-    f = sys._getframe(1)
-    nm = f.f_code.co_name
-    return getattr(newsuper(framedepth=2),nm)(*args, **kwds)
-
-
-__all__ = ['newsuper']
diff --git a/lib/future/moves/__init__.py b/lib/future/moves/__init__.py
deleted file mode 100644
index 0cd60d3d..00000000
--- a/lib/future/moves/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# future.moves package
-from __future__ import absolute_import
-import sys
-__future_module__ = True
-from future.standard_library import import_top_level_modules
-
-if sys.version_info[0] >= 3:
-    import_top_level_modules()
diff --git a/lib/future/moves/_dummy_thread.py b/lib/future/moves/_dummy_thread.py
deleted file mode 100644
index 6633f42e..00000000
--- a/lib/future/moves/_dummy_thread.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3, PY39_PLUS
-
-
-if PY39_PLUS:
-    # _dummy_thread and dummy_threading modules were both deprecated in
-    # Python 3.7 and removed in Python 3.9
-    from _thread import *
-elif PY3:
-        from _dummy_thread import *
-else:
-    __future_module__ = True
-    from dummy_thread import *
diff --git a/lib/future/moves/_markupbase.py b/lib/future/moves/_markupbase.py
deleted file mode 100644
index f9fb4bbf..00000000
--- a/lib/future/moves/_markupbase.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3
-
-if PY3:
-    from _markupbase import *
-else:
-    __future_module__ = True
-    from markupbase import *
diff --git a/lib/future/moves/_thread.py b/lib/future/moves/_thread.py
deleted file mode 100644
index c68018bb..00000000
--- a/lib/future/moves/_thread.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3
-
-if PY3:
-    from _thread import *
-else:
-    __future_module__ = True
-    from thread import *
diff --git a/lib/future/moves/builtins.py b/lib/future/moves/builtins.py
deleted file mode 100644
index e4b6221d..00000000
--- a/lib/future/moves/builtins.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3
-
-if PY3:
-    from builtins import *
-else:
-    __future_module__ = True
-    from __builtin__ import *
-    # Overwrite any old definitions with the equivalent future.builtins ones:
-    from future.builtins import *
diff --git a/lib/future/moves/collections.py b/lib/future/moves/collections.py
deleted file mode 100644
index 664ee6a3..00000000
--- a/lib/future/moves/collections.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from __future__ import absolute_import
-import sys
-
-from future.utils import PY2, PY26
-__future_module__ = True
-
-from collections import *
-
-if PY2:
-    from UserDict import UserDict
-    from UserList import UserList
-    from UserString import UserString
-
-if PY26:
-    from future.backports.misc import OrderedDict, Counter
-
-if sys.version_info < (3, 3):
-    from future.backports.misc import ChainMap, _count_elements
diff --git a/lib/future/moves/configparser.py b/lib/future/moves/configparser.py
deleted file mode 100644
index 33d9cf95..00000000
--- a/lib/future/moves/configparser.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import absolute_import
-
-from future.utils import PY2
-
-if PY2:
-    from ConfigParser import *
-else:
-    from configparser import *
diff --git a/lib/future/moves/copyreg.py b/lib/future/moves/copyreg.py
deleted file mode 100644
index 9d08cdc5..00000000
--- a/lib/future/moves/copyreg.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3
-
-if PY3:
-    import copyreg, sys
-    # A "*" import uses Python 3's copyreg.__all__ which does not include
-    # all public names in the API surface for copyreg, this avoids that
-    # problem by just making our module _be_ a reference to the actual module.
-    sys.modules['future.moves.copyreg'] = copyreg
-else:
-    __future_module__ = True
-    from copy_reg import *
diff --git a/lib/future/moves/dbm/__init__.py b/lib/future/moves/dbm/__init__.py
deleted file mode 100644
index 626b406f..00000000
--- a/lib/future/moves/dbm/__init__.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3
-
-if PY3:
-    from dbm import *
-else:
-    __future_module__ = True
-    from whichdb import *
-    from anydbm import *
-
-# Py3.3's dbm/__init__.py imports ndbm but doesn't expose it via __all__.
-# In case some (badly written) code depends on dbm.ndbm after import dbm,
-# we simulate this:
-if PY3:
-    from dbm import ndbm
-else:
-    try:
-        from future.moves.dbm import ndbm
-    except ImportError:
-        ndbm = None
diff --git a/lib/future/moves/dbm/dumb.py b/lib/future/moves/dbm/dumb.py
deleted file mode 100644
index 528383f6..00000000
--- a/lib/future/moves/dbm/dumb.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from __future__ import absolute_import
-
-from future.utils import PY3
-
-if PY3:
-    from dbm.dumb import *
-else:
-    __future_module__ = True
-    from dumbdbm import *
diff --git a/lib/future/moves/dbm/gnu.py b/lib/future/moves/dbm/gnu.py
deleted file mode 100644
index 68ccf67b..00000000
--- a/lib/future/moves/dbm/gnu.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from __future__ import absolute_import
-
-from future.utils import PY3
-
-if PY3:
-    from dbm.gnu import *
-else:
-    __future_module__ = True
-    from gdbm import *
diff --git a/lib/future/moves/dbm/ndbm.py b/lib/future/moves/dbm/ndbm.py
deleted file mode 100644
index 8c6fff8a..00000000
--- a/lib/future/moves/dbm/ndbm.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from __future__ import absolute_import
-
-from future.utils import PY3
-
-if PY3:
-    from dbm.ndbm import *
-else:
-    __future_module__ = True
-    from dbm import *
diff --git a/lib/future/moves/html/__init__.py b/lib/future/moves/html/__init__.py
deleted file mode 100644
index 22ed6e7d..00000000
--- a/lib/future/moves/html/__init__.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3
-__future_module__ = True
-
-if PY3:
-    from html import *
-else:
-    # cgi.escape isn't good enough for the single Py3.3 html test to pass.
-    # Define it inline here instead. From the Py3.4 stdlib. Note that the
-    # html.escape() function from the Py3.3 stdlib is not suitable for use on
-    # Py2.x.
-    """
-    General functions for HTML manipulation.
-    """
-
-    def escape(s, quote=True):
-        """
-        Replace special characters "&", "<" and ">" to HTML-safe sequences.
-        If the optional flag quote is true (the default), the quotation mark
-        characters, both double quote (") and single quote (') characters are also
-        translated.
-        """
-        s = s.replace("&", "&amp;") # Must be done first!
-        s = s.replace("<", "&lt;")
-        s = s.replace(">", "&gt;")
-        if quote:
-            s = s.replace('"', "&quot;")
-            s = s.replace('\'', "&#x27;")
-        return s
-
-    __all__ = ['escape']
diff --git a/lib/future/moves/html/entities.py b/lib/future/moves/html/entities.py
deleted file mode 100644
index 56a88609..00000000
--- a/lib/future/moves/html/entities.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3
-
-if PY3:
-    from html.entities import *
-else:
-    __future_module__ = True
-    from htmlentitydefs import *
diff --git a/lib/future/moves/html/parser.py b/lib/future/moves/html/parser.py
deleted file mode 100644
index a6115b59..00000000
--- a/lib/future/moves/html/parser.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3
-__future_module__ = True
-
-if PY3:
-    from html.parser import *
-else:
-    from HTMLParser import *
diff --git a/lib/future/moves/http/__init__.py b/lib/future/moves/http/__init__.py
deleted file mode 100644
index 917b3d71..00000000
--- a/lib/future/moves/http/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from future.utils import PY3
-
-if not PY3:
-    __future_module__ = True
diff --git a/lib/future/moves/http/client.py b/lib/future/moves/http/client.py
deleted file mode 100644
index 55f9c9c1..00000000
--- a/lib/future/moves/http/client.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from future.utils import PY3
-
-if PY3:
-    from http.client import *
-else:
-    from httplib import *
-    from httplib import HTTPMessage
-    __future_module__ = True
diff --git a/lib/future/moves/http/cookiejar.py b/lib/future/moves/http/cookiejar.py
deleted file mode 100644
index ea00df77..00000000
--- a/lib/future/moves/http/cookiejar.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3
-
-if PY3:
-    from http.cookiejar import *
-else:
-    __future_module__ = True
-    from cookielib import *
diff --git a/lib/future/moves/http/cookies.py b/lib/future/moves/http/cookies.py
deleted file mode 100644
index 1b74fe2d..00000000
--- a/lib/future/moves/http/cookies.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3
-
-if PY3:
-    from http.cookies import *
-else:
-    __future_module__ = True
-    from Cookie import *
-    from Cookie import Morsel    # left out of __all__ on Py2.7!
diff --git a/lib/future/moves/http/server.py b/lib/future/moves/http/server.py
deleted file mode 100644
index 4e75cc1d..00000000
--- a/lib/future/moves/http/server.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3
-
-if PY3:
-    from http.server import *
-else:
-    __future_module__ = True
-    from BaseHTTPServer import *
-    from CGIHTTPServer import *
-    from SimpleHTTPServer import *
-    try:
-        from CGIHTTPServer import _url_collapse_path     # needed for a test
-    except ImportError:
-        try:
-            # Python 2.7.0 to 2.7.3
-            from CGIHTTPServer import (
-                _url_collapse_path_split as _url_collapse_path)
-        except ImportError:
-            # Doesn't exist on Python 2.6.x. Ignore it.
-            pass
diff --git a/lib/future/moves/itertools.py b/lib/future/moves/itertools.py
deleted file mode 100644
index e5eb20d5..00000000
--- a/lib/future/moves/itertools.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import absolute_import
-
-from itertools import *
-try:
-    zip_longest = izip_longest
-    filterfalse = ifilterfalse
-except NameError:
-    pass
diff --git a/lib/future/moves/multiprocessing.py b/lib/future/moves/multiprocessing.py
deleted file mode 100644
index a871b676..00000000
--- a/lib/future/moves/multiprocessing.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3
-
-from multiprocessing import *
-if not PY3:
-    __future_module__ = True
-    from multiprocessing.queues import SimpleQueue
diff --git a/lib/future/moves/pickle.py b/lib/future/moves/pickle.py
deleted file mode 100644
index c53d6939..00000000
--- a/lib/future/moves/pickle.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3
-
-if PY3:
-    from pickle import *
-else:
-    __future_module__ = True
-    try:
-        from cPickle import *
-    except ImportError:
-        from pickle import *
diff --git a/lib/future/moves/queue.py b/lib/future/moves/queue.py
deleted file mode 100644
index 1cb1437d..00000000
--- a/lib/future/moves/queue.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3
-
-if PY3:
-    from queue import *
-else:
-    __future_module__ = True
-    from Queue import *
diff --git a/lib/future/moves/reprlib.py b/lib/future/moves/reprlib.py
deleted file mode 100644
index a313a13a..00000000
--- a/lib/future/moves/reprlib.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3
-
-if PY3:
-    from reprlib import *
-else:
-    __future_module__ = True
-    from repr import *
diff --git a/lib/future/moves/socketserver.py b/lib/future/moves/socketserver.py
deleted file mode 100644
index 062e0848..00000000
--- a/lib/future/moves/socketserver.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3
-
-if PY3:
-    from socketserver import *
-else:
-    __future_module__ = True
-    from SocketServer import *
diff --git a/lib/future/moves/subprocess.py b/lib/future/moves/subprocess.py
deleted file mode 100644
index 43ffd2ac..00000000
--- a/lib/future/moves/subprocess.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY2, PY26
-
-from subprocess import *
-
-if PY2:
-    __future_module__ = True
-    from commands import getoutput, getstatusoutput
-
-if PY26:
-    from future.backports.misc import check_output
diff --git a/lib/future/moves/sys.py b/lib/future/moves/sys.py
deleted file mode 100644
index 1293bcb0..00000000
--- a/lib/future/moves/sys.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import absolute_import
-
-from future.utils import PY2
-
-from sys import *
-
-if PY2:
-    from __builtin__ import intern
diff --git a/lib/future/moves/test/__init__.py b/lib/future/moves/test/__init__.py
deleted file mode 100644
index 5cf428b6..00000000
--- a/lib/future/moves/test/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3
-
-if not PY3:
-    __future_module__ = True
diff --git a/lib/future/moves/test/support.py b/lib/future/moves/test/support.py
deleted file mode 100644
index f70c9d7d..00000000
--- a/lib/future/moves/test/support.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from __future__ import absolute_import
-
-import sys
-
-from future.standard_library import suspend_hooks
-from future.utils import PY3
-
-if PY3:
-    from test.support import *
-    if sys.version_info[:2] >= (3, 10):
-        from test.support.os_helper import (
-            EnvironmentVarGuard,
-            TESTFN,
-        )
-        from test.support.warnings_helper import check_warnings
-else:
-    __future_module__ = True
-    with suspend_hooks():
-        from test.test_support import *
diff --git a/lib/future/moves/tkinter/__init__.py b/lib/future/moves/tkinter/__init__.py
deleted file mode 100644
index e4082966..00000000
--- a/lib/future/moves/tkinter/__init__.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3
-__future_module__ = True
-
-if not PY3:
-    from Tkinter import *
-    from Tkinter import (_cnfmerge, _default_root, _flatten,
-                          _support_default_root, _test,
-                         _tkinter, _setit)
-
-    try: # >= 2.7.4
-        from Tkinter import (_join) 
-    except ImportError: 
-        pass
-
-    try: # >= 2.7.4
-        from Tkinter import (_stringify)
-    except ImportError: 
-        pass
-
-    try: # >= 2.7.9
-        from Tkinter import (_splitdict)
-    except ImportError:
-        pass
-
-else:
-    from tkinter import *
diff --git a/lib/future/moves/tkinter/colorchooser.py b/lib/future/moves/tkinter/colorchooser.py
deleted file mode 100644
index 6dde6e8d..00000000
--- a/lib/future/moves/tkinter/colorchooser.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from __future__ import absolute_import
-
-from future.utils import PY3
-
-if PY3:
-    from tkinter.colorchooser import *
-else:
-    try:
-        from tkColorChooser import *
-    except ImportError:
-        raise ImportError('The tkColorChooser module is missing. Does your Py2 '
-                          'installation include tkinter?')
diff --git a/lib/future/moves/tkinter/commondialog.py b/lib/future/moves/tkinter/commondialog.py
deleted file mode 100644
index eb7ae8d6..00000000
--- a/lib/future/moves/tkinter/commondialog.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from __future__ import absolute_import
-
-from future.utils import PY3
-
-if PY3:
-    from tkinter.commondialog import *
-else:
-    try:
-        from tkCommonDialog import *
-    except ImportError:
-        raise ImportError('The tkCommonDialog module is missing. Does your Py2 '
-                          'installation include tkinter?')
diff --git a/lib/future/moves/tkinter/constants.py b/lib/future/moves/tkinter/constants.py
deleted file mode 100644
index ffe09815..00000000
--- a/lib/future/moves/tkinter/constants.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from __future__ import absolute_import
-
-from future.utils import PY3
-
-if PY3:
-    from tkinter.constants import *
-else:
-    try:
-        from Tkconstants import *
-    except ImportError:
-        raise ImportError('The Tkconstants module is missing. Does your Py2 '
-                          'installation include tkinter?')
diff --git a/lib/future/moves/tkinter/dialog.py b/lib/future/moves/tkinter/dialog.py
deleted file mode 100644
index 113370ca..00000000
--- a/lib/future/moves/tkinter/dialog.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from __future__ import absolute_import
-
-from future.utils import PY3
-
-if PY3:
-    from tkinter.dialog import *
-else:
-    try:
-        from Dialog import *
-    except ImportError:
-        raise ImportError('The Dialog module is missing. Does your Py2 '
-                          'installation include tkinter?')
diff --git a/lib/future/moves/tkinter/dnd.py b/lib/future/moves/tkinter/dnd.py
deleted file mode 100644
index 1ab43791..00000000
--- a/lib/future/moves/tkinter/dnd.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from __future__ import absolute_import
-
-from future.utils import PY3
-
-if PY3:
-    from tkinter.dnd import *
-else:
-    try:
-        from Tkdnd import *
-    except ImportError:
-        raise ImportError('The Tkdnd module is missing. Does your Py2 '
-                          'installation include tkinter?')
diff --git a/lib/future/moves/tkinter/filedialog.py b/lib/future/moves/tkinter/filedialog.py
deleted file mode 100644
index 6a6f03ca..00000000
--- a/lib/future/moves/tkinter/filedialog.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from __future__ import absolute_import
-
-from future.utils import PY3
-
-if PY3:
-    from tkinter.filedialog import *
-else:
-    try:
-        from FileDialog import *
-    except ImportError:
-        raise ImportError('The FileDialog module is missing. Does your Py2 '
-                          'installation include tkinter?')
-    
-    try:
-        from tkFileDialog import *
-    except ImportError:
-        raise ImportError('The tkFileDialog module is missing. Does your Py2 '
-                          'installation include tkinter?')
diff --git a/lib/future/moves/tkinter/font.py b/lib/future/moves/tkinter/font.py
deleted file mode 100644
index 628f399a..00000000
--- a/lib/future/moves/tkinter/font.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from __future__ import absolute_import
-
-from future.utils import PY3
-
-if PY3:
-    from tkinter.font import *
-else:
-    try:
-        from tkFont import *
-    except ImportError:
-        raise ImportError('The tkFont module is missing. Does your Py2 '
-                          'installation include tkinter?')
diff --git a/lib/future/moves/tkinter/messagebox.py b/lib/future/moves/tkinter/messagebox.py
deleted file mode 100644
index b43d8702..00000000
--- a/lib/future/moves/tkinter/messagebox.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from __future__ import absolute_import
-
-from future.utils import PY3
-
-if PY3:
-    from tkinter.messagebox import *
-else:
-    try:
-        from tkMessageBox import *
-    except ImportError:
-        raise ImportError('The tkMessageBox module is missing. Does your Py2 '
-                          'installation include tkinter?')
diff --git a/lib/future/moves/tkinter/scrolledtext.py b/lib/future/moves/tkinter/scrolledtext.py
deleted file mode 100644
index 1c69db60..00000000
--- a/lib/future/moves/tkinter/scrolledtext.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from __future__ import absolute_import
-
-from future.utils import PY3
-
-if PY3:
-    from tkinter.scrolledtext import *
-else:
-    try:
-        from ScrolledText import *
-    except ImportError:
-        raise ImportError('The ScrolledText module is missing. Does your Py2 '
-                          'installation include tkinter?')
diff --git a/lib/future/moves/tkinter/simpledialog.py b/lib/future/moves/tkinter/simpledialog.py
deleted file mode 100644
index dba93fbf..00000000
--- a/lib/future/moves/tkinter/simpledialog.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from __future__ import absolute_import
-
-from future.utils import PY3
-
-if PY3:
-    from tkinter.simpledialog import *
-else:
-    try:
-        from SimpleDialog import *
-    except ImportError:
-        raise ImportError('The SimpleDialog module is missing. Does your Py2 '
-                          'installation include tkinter?')
diff --git a/lib/future/moves/tkinter/tix.py b/lib/future/moves/tkinter/tix.py
deleted file mode 100644
index 8d1718ad..00000000
--- a/lib/future/moves/tkinter/tix.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from __future__ import absolute_import
-
-from future.utils import PY3
-
-if PY3:
-    from tkinter.tix import *
-else:
-    try:
-        from Tix import *
-    except ImportError:
-        raise ImportError('The Tix module is missing. Does your Py2 '
-                          'installation include tkinter?')
diff --git a/lib/future/moves/tkinter/ttk.py b/lib/future/moves/tkinter/ttk.py
deleted file mode 100644
index 081c1b49..00000000
--- a/lib/future/moves/tkinter/ttk.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from __future__ import absolute_import
-
-from future.utils import PY3
-
-if PY3:
-    from tkinter.ttk import *
-else:
-    try:
-        from ttk import *
-    except ImportError:
-        raise ImportError('The ttk module is missing. Does your Py2 '
-                          'installation include tkinter?')
diff --git a/lib/future/moves/urllib/__init__.py b/lib/future/moves/urllib/__init__.py
deleted file mode 100644
index 5cf428b6..00000000
--- a/lib/future/moves/urllib/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3
-
-if not PY3:
-    __future_module__ = True
diff --git a/lib/future/moves/urllib/error.py b/lib/future/moves/urllib/error.py
deleted file mode 100644
index 7d8ada73..00000000
--- a/lib/future/moves/urllib/error.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from __future__ import absolute_import
-from future.standard_library import suspend_hooks
-
-from future.utils import PY3
-
-if PY3:
-    from urllib.error import *
-else:
-    __future_module__ = True
-
-    # We use this method to get at the original Py2 urllib before any renaming magic
-    # ContentTooShortError = sys.py2_modules['urllib'].ContentTooShortError
-
-    with suspend_hooks():
-        from urllib import ContentTooShortError
-        from urllib2 import URLError, HTTPError
diff --git a/lib/future/moves/urllib/parse.py b/lib/future/moves/urllib/parse.py
deleted file mode 100644
index 9074b816..00000000
--- a/lib/future/moves/urllib/parse.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from __future__ import absolute_import
-from future.standard_library import suspend_hooks
-
-from future.utils import PY3
-
-if PY3:
-    from urllib.parse import *
-else:
-    __future_module__ = True
-    from urlparse import (ParseResult, SplitResult, parse_qs, parse_qsl,
-                          urldefrag, urljoin, urlparse, urlsplit,
-                          urlunparse, urlunsplit)
-
-    # we use this method to get at the original py2 urllib before any renaming
-    # quote = sys.py2_modules['urllib'].quote
-    # quote_plus = sys.py2_modules['urllib'].quote_plus
-    # unquote = sys.py2_modules['urllib'].unquote
-    # unquote_plus = sys.py2_modules['urllib'].unquote_plus
-    # urlencode = sys.py2_modules['urllib'].urlencode
-    # splitquery = sys.py2_modules['urllib'].splitquery
-
-    with suspend_hooks():
-        from urllib import (quote,
-                            quote_plus,
-                            unquote,
-                            unquote_plus,
-                            urlencode,
-                            splitquery)
diff --git a/lib/future/moves/urllib/request.py b/lib/future/moves/urllib/request.py
deleted file mode 100644
index 972aa4ab..00000000
--- a/lib/future/moves/urllib/request.py
+++ /dev/null
@@ -1,94 +0,0 @@
-from __future__ import absolute_import
-
-from future.standard_library import suspend_hooks
-from future.utils import PY3
-
-if PY3:
-    from urllib.request import *
-    # This aren't in __all__:
-    from urllib.request import (getproxies,
-                                pathname2url,
-                                proxy_bypass,
-                                quote,
-                                request_host,
-                                thishost,
-                                unquote,
-                                url2pathname,
-                                urlcleanup,
-                                urljoin,
-                                urlopen,
-                                urlparse,
-                                urlretrieve,
-                                urlsplit,
-                                urlunparse)
-
-    from urllib.parse import (splitattr,
-                              splithost,
-                              splitpasswd,
-                              splitport,
-                              splitquery,
-                              splittag,
-                              splittype,
-                              splituser,
-                              splitvalue,
-                              to_bytes,
-                              unwrap)
-else:
-    __future_module__ = True
-    with suspend_hooks():
-        from urllib import *
-        from urllib2 import *
-        from urlparse import *
-
-        # Rename:
-        from urllib import toBytes    # missing from __all__ on Py2.6
-        to_bytes = toBytes
-
-        # from urllib import (pathname2url,
-        #                     url2pathname,
-        #                     getproxies,
-        #                     urlretrieve,
-        #                     urlcleanup,
-        #                     URLopener,
-        #                     FancyURLopener,
-        #                     proxy_bypass)
-
-        # from urllib2 import (
-        #                  AbstractBasicAuthHandler,
-        #                  AbstractDigestAuthHandler,
-        #                  BaseHandler,
-        #                  CacheFTPHandler,
-        #                  FileHandler,
-        #                  FTPHandler,
-        #                  HTTPBasicAuthHandler,
-        #                  HTTPCookieProcessor,
-        #                  HTTPDefaultErrorHandler,
-        #                  HTTPDigestAuthHandler,
-        #                  HTTPErrorProcessor,
-        #                  HTTPHandler,
-        #                  HTTPPasswordMgr,
-        #                  HTTPPasswordMgrWithDefaultRealm,
-        #                  HTTPRedirectHandler,
-        #                  HTTPSHandler,
-        #                  URLError,
-        #                  build_opener,
-        #                  install_opener,
-        #                  OpenerDirector,
-        #                  ProxyBasicAuthHandler,
-        #                  ProxyDigestAuthHandler,
-        #                  ProxyHandler,
-        #                  Request,
-        #                  UnknownHandler,
-        #                  urlopen,
-        #                 )
-
-        # from urlparse import (
-        #                  urldefrag
-        #                  urljoin,
-        #                  urlparse,
-        #                  urlunparse,
-        #                  urlsplit,
-        #                  urlunsplit,
-        #                  parse_qs,
-        #                  parse_q"
-        #                 )
diff --git a/lib/future/moves/urllib/response.py b/lib/future/moves/urllib/response.py
deleted file mode 100644
index a287ae28..00000000
--- a/lib/future/moves/urllib/response.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from future import standard_library
-from future.utils import PY3
-
-if PY3:
-    from urllib.response import *
-else:
-    __future_module__ = True
-    with standard_library.suspend_hooks():
-        from urllib import (addbase,
-                            addclosehook,
-                            addinfo,
-                            addinfourl)
diff --git a/lib/future/moves/urllib/robotparser.py b/lib/future/moves/urllib/robotparser.py
deleted file mode 100644
index 0dc8f571..00000000
--- a/lib/future/moves/urllib/robotparser.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3
-
-if PY3:
-    from urllib.robotparser import *
-else:
-    __future_module__ = True
-    from robotparser import *
diff --git a/lib/future/moves/winreg.py b/lib/future/moves/winreg.py
deleted file mode 100644
index c8b14756..00000000
--- a/lib/future/moves/winreg.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3
-
-if PY3:
-    from winreg import *
-else:
-    __future_module__ = True
-    from _winreg import *
diff --git a/lib/future/moves/xmlrpc/__init__.py b/lib/future/moves/xmlrpc/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/future/moves/xmlrpc/client.py b/lib/future/moves/xmlrpc/client.py
deleted file mode 100644
index 4708cf89..00000000
--- a/lib/future/moves/xmlrpc/client.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3
-
-if PY3:
-    from xmlrpc.client import *
-else:
-    from xmlrpclib import *
diff --git a/lib/future/moves/xmlrpc/server.py b/lib/future/moves/xmlrpc/server.py
deleted file mode 100644
index 1a8af345..00000000
--- a/lib/future/moves/xmlrpc/server.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from __future__ import absolute_import
-from future.utils import PY3
-
-if PY3:
-    from xmlrpc.server import *
-else:
-    from xmlrpclib import *
diff --git a/lib/future/standard_library/__init__.py b/lib/future/standard_library/__init__.py
deleted file mode 100644
index d467aaf4..00000000
--- a/lib/future/standard_library/__init__.py
+++ /dev/null
@@ -1,821 +0,0 @@
-"""
-Python 3 reorganized the standard library (PEP 3108). This module exposes
-several standard library modules to Python 2 under their new Python 3
-names.
-
-It is designed to be used as follows::
-
-    from future import standard_library
-    standard_library.install_aliases()
-
-And then these normal Py3 imports work on both Py3 and Py2::
-
-    import builtins
-    import copyreg
-    import queue
-    import reprlib
-    import socketserver
-    import winreg    # on Windows only
-    import test.support
-    import html, html.parser, html.entities
-    import http, http.client, http.server
-    import http.cookies, http.cookiejar
-    import urllib.parse, urllib.request, urllib.response, urllib.error, urllib.robotparser
-    import xmlrpc.client, xmlrpc.server
-
-    import _thread
-    import _dummy_thread
-    import _markupbase
-
-    from itertools import filterfalse, zip_longest
-    from sys import intern
-    from collections import UserDict, UserList, UserString
-    from collections import OrderedDict, Counter, ChainMap     # even on Py2.6
-    from subprocess import getoutput, getstatusoutput
-    from subprocess import check_output              # even on Py2.6
-    from multiprocessing import SimpleQueue
-
-(The renamed modules and functions are still available under their old
-names on Python 2.)
-
-This is a cleaner alternative to this idiom (see
-http://docs.pythonsprints.com/python3_porting/py-porting.html)::
-
-    try:
-        import queue
-    except ImportError:
-        import Queue as queue
-
-
-Limitations
------------
-We don't currently support these modules, but would like to::
-
-    import dbm
-    import dbm.dumb
-    import dbm.gnu
-    import collections.abc  # on Py33
-    import pickle     # should (optionally) bring in cPickle on Python 2
-
-"""
-
-from __future__ import absolute_import, division, print_function
-
-import sys
-import logging
-# imp was deprecated in python 3.6
-if sys.version_info >= (3, 6):
-    import importlib as imp
-else:
-    import imp
-import contextlib
-import copy
-import os
-
-# Make a dedicated logger; leave the root logger to be configured
-# by the application.
-flog = logging.getLogger('future_stdlib')
-_formatter = logging.Formatter(logging.BASIC_FORMAT)
-_handler = logging.StreamHandler()
-_handler.setFormatter(_formatter)
-flog.addHandler(_handler)
-flog.setLevel(logging.WARN)
-
-from future.utils import PY2, PY3
-
-# The modules that are defined under the same names on Py3 but with
-# different contents in a significant way (e.g. submodules) are:
-#   pickle (fast one)
-#   dbm
-#   urllib
-#   test
-#   email
-
-REPLACED_MODULES = set(['test', 'urllib', 'pickle', 'dbm'])  # add email and dbm when we support it
-
-# The following module names are not present in Python 2.x, so they cause no
-# potential clashes between the old and new names:
-#   http
-#   html
-#   tkinter
-#   xmlrpc
-# Keys: Py2 / real module names
-# Values: Py3 / simulated module names
-RENAMES = {
-           # 'cStringIO': 'io',  # there's a new io module in Python 2.6
-                                 # that provides StringIO and BytesIO
-           # 'StringIO': 'io',   # ditto
-           # 'cPickle': 'pickle',
-           '__builtin__': 'builtins',
-           'copy_reg': 'copyreg',
-           'Queue': 'queue',
-           'future.moves.socketserver': 'socketserver',
-           'ConfigParser': 'configparser',
-           'repr': 'reprlib',
-           'multiprocessing.queues': 'multiprocessing',
-           # 'FileDialog': 'tkinter.filedialog',
-           # 'tkFileDialog': 'tkinter.filedialog',
-           # 'SimpleDialog': 'tkinter.simpledialog',
-           # 'tkSimpleDialog': 'tkinter.simpledialog',
-           # 'tkColorChooser': 'tkinter.colorchooser',
-           # 'tkCommonDialog': 'tkinter.commondialog',
-           # 'Dialog': 'tkinter.dialog',
-           # 'Tkdnd': 'tkinter.dnd',
-           # 'tkFont': 'tkinter.font',
-           # 'tkMessageBox': 'tkinter.messagebox',
-           # 'ScrolledText': 'tkinter.scrolledtext',
-           # 'Tkconstants': 'tkinter.constants',
-           # 'Tix': 'tkinter.tix',
-           # 'ttk': 'tkinter.ttk',
-           # 'Tkinter': 'tkinter',
-           '_winreg': 'winreg',
-           'thread': '_thread',
-           'dummy_thread': '_dummy_thread' if sys.version_info < (3, 9) else '_thread',
-           # 'anydbm': 'dbm',   # causes infinite import loop
-           # 'whichdb': 'dbm',  # causes infinite import loop
-           # anydbm and whichdb are handled by fix_imports2
-           # 'dbhash': 'dbm.bsd',
-           # 'dumbdbm': 'dbm.dumb',
-           # 'dbm': 'dbm.ndbm',
-           # 'gdbm': 'dbm.gnu',
-           'future.moves.xmlrpc': 'xmlrpc',
-           # 'future.backports.email': 'email',    # for use by urllib
-           # 'DocXMLRPCServer': 'xmlrpc.server',
-           # 'SimpleXMLRPCServer': 'xmlrpc.server',
-           # 'httplib': 'http.client',
-           # 'htmlentitydefs' : 'html.entities',
-           # 'HTMLParser' : 'html.parser',
-           # 'Cookie': 'http.cookies',
-           # 'cookielib': 'http.cookiejar',
-           # 'BaseHTTPServer': 'http.server',
-           # 'SimpleHTTPServer': 'http.server',
-           # 'CGIHTTPServer': 'http.server',
-           # 'future.backports.test': 'test',  # primarily for renaming test_support to support
-           # 'commands': 'subprocess',
-           # 'urlparse' : 'urllib.parse',
-           # 'robotparser' : 'urllib.robotparser',
-           # 'abc': 'collections.abc',   # for Py33
-           # 'future.utils.six.moves.html': 'html',
-           # 'future.utils.six.moves.http': 'http',
-           'future.moves.html': 'html',
-           'future.moves.http': 'http',
-           # 'future.backports.urllib': 'urllib',
-           # 'future.utils.six.moves.urllib': 'urllib',
-           'future.moves._markupbase': '_markupbase',
-          }
-
-
-# It is complicated and apparently brittle to mess around with the
-# ``sys.modules`` cache in order to support "import urllib" meaning two
-# different things (Py2.7 urllib and backported Py3.3-like urllib) in different
-# contexts. So we require explicit imports for these modules.
-assert len(set(RENAMES.values()) & set(REPLACED_MODULES)) == 0
-
-
-# Harmless renames that we can insert.
-# These modules need names from elsewhere being added to them:
-#   subprocess: should provide getoutput and other fns from commands
-#               module but these fns are missing: getstatus, mk2arg,
-#               mkarg
-#   re:         needs an ASCII constant that works compatibly with Py3
-
-# etc: see lib2to3/fixes/fix_imports.py
-
-# (New module name, new object name, old module name, old object name)
-MOVES = [('collections', 'UserList', 'UserList', 'UserList'),
-         ('collections', 'UserDict', 'UserDict', 'UserDict'),
-         ('collections', 'UserString','UserString', 'UserString'),
-         ('collections', 'ChainMap', 'future.backports.misc', 'ChainMap'),
-         ('itertools', 'filterfalse','itertools', 'ifilterfalse'),
-         ('itertools', 'zip_longest','itertools', 'izip_longest'),
-         ('sys', 'intern','__builtin__', 'intern'),
-         ('multiprocessing', 'SimpleQueue', 'multiprocessing.queues', 'SimpleQueue'),
-         # The re module has no ASCII flag in Py2, but this is the default.
-         # Set re.ASCII to a zero constant. stat.ST_MODE just happens to be one
-         # (and it exists on Py2.6+).
-         ('re', 'ASCII','stat', 'ST_MODE'),
-         ('base64', 'encodebytes','base64', 'encodestring'),
-         ('base64', 'decodebytes','base64', 'decodestring'),
-         ('subprocess', 'getoutput', 'commands', 'getoutput'),
-         ('subprocess', 'getstatusoutput', 'commands', 'getstatusoutput'),
-         ('subprocess', 'check_output', 'future.backports.misc', 'check_output'),
-         ('math', 'ceil', 'future.backports.misc', 'ceil'),
-         ('collections', 'OrderedDict', 'future.backports.misc', 'OrderedDict'),
-         ('collections', 'Counter', 'future.backports.misc', 'Counter'),
-         ('collections', 'ChainMap', 'future.backports.misc', 'ChainMap'),
-         ('itertools', 'count', 'future.backports.misc', 'count'),
-         ('reprlib', 'recursive_repr', 'future.backports.misc', 'recursive_repr'),
-         ('functools', 'cmp_to_key', 'future.backports.misc', 'cmp_to_key'),
-
-# This is no use, since "import urllib.request" etc. still fails:
-#          ('urllib', 'error', 'future.moves.urllib', 'error'),
-#          ('urllib', 'parse', 'future.moves.urllib', 'parse'),
-#          ('urllib', 'request', 'future.moves.urllib', 'request'),
-#          ('urllib', 'response', 'future.moves.urllib', 'response'),
-#          ('urllib', 'robotparser', 'future.moves.urllib', 'robotparser'),
-        ]
-
-
-# A minimal example of an import hook:
-# class WarnOnImport(object):
-#     def __init__(self, *args):
-#         self.module_names = args
-#
-#     def find_module(self, fullname, path=None):
-#         if fullname in self.module_names:
-#             self.path = path
-#             return self
-#         return None
-#
-#     def load_module(self, name):
-#         if name in sys.modules:
-#             return sys.modules[name]
-#         module_info = imp.find_module(name, self.path)
-#         module = imp.load_module(name, *module_info)
-#         sys.modules[name] = module
-#         flog.warning("Imported deprecated module %s", name)
-#         return module
-
-
-class RenameImport(object):
-    """
-    A class for import hooks mapping Py3 module names etc. to the Py2 equivalents.
-    """
-    # Different RenameImport classes are created when importing this module from
-    # different source files. This causes isinstance(hook, RenameImport) checks
-    # to produce inconsistent results. We add this RENAMER attribute here so
-    # remove_hooks() and install_hooks() can find instances of these classes
-    # easily:
-    RENAMER = True
-
-    def __init__(self, old_to_new):
-        '''
-        Pass in a dictionary-like object mapping from old names to new
-        names. E.g. {'ConfigParser': 'configparser', 'cPickle': 'pickle'}
-        '''
-        self.old_to_new = old_to_new
-        both = set(old_to_new.keys()) & set(old_to_new.values())
-        assert (len(both) == 0 and
-                len(set(old_to_new.values())) == len(old_to_new.values())), \
-               'Ambiguity in renaming (handler not implemented)'
-        self.new_to_old = dict((new, old) for (old, new) in old_to_new.items())
-
-    def find_module(self, fullname, path=None):
-        # Handles hierarchical importing: package.module.module2
-        new_base_names = set([s.split('.')[0] for s in self.new_to_old])
-        # Before v0.12: Was: if fullname in set(self.old_to_new) | new_base_names:
-        if fullname in new_base_names:
-            return self
-        return None
-
-    def load_module(self, name):
-        path = None
-        if name in sys.modules:
-            return sys.modules[name]
-        elif name in self.new_to_old:
-            # New name. Look up the corresponding old (Py2) name:
-            oldname = self.new_to_old[name]
-            module = self._find_and_load_module(oldname)
-            # module.__future_module__ = True
-        else:
-            module = self._find_and_load_module(name)
-        # In any case, make it available under the requested (Py3) name
-        sys.modules[name] = module
-        return module
-
-    def _find_and_load_module(self, name, path=None):
-        """
-        Finds and loads it. But if there's a . in the name, handles it
-        properly.
-        """
-        bits = name.split('.')
-        while len(bits) > 1:
-            # Treat the first bit as a package
-            packagename = bits.pop(0)
-            package = self._find_and_load_module(packagename, path)
-            try:
-                path = package.__path__
-            except AttributeError:
-                # This could be e.g. moves.
-                flog.debug('Package {0} has no __path__.'.format(package))
-                if name in sys.modules:
-                    return sys.modules[name]
-                flog.debug('What to do here?')
-
-        name = bits[0]
-        module_info = imp.find_module(name, path)
-        return imp.load_module(name, *module_info)
-
-
-class hooks(object):
-    """
-    Acts as a context manager. Saves the state of sys.modules and restores it
-    after the 'with' block.
-
-    Use like this:
-
-    >>> from future import standard_library
-    >>> with standard_library.hooks():
-    ...     import http.client
-    >>> import requests
-
-    For this to work, http.client will be scrubbed from sys.modules after the
-    'with' block. That way the modules imported in the 'with' block will
-    continue to be accessible in the current namespace but not from any
-    imported modules (like requests).
-    """
-    def __enter__(self):
-        # flog.debug('Entering hooks context manager')
-        self.old_sys_modules = copy.copy(sys.modules)
-        self.hooks_were_installed = detect_hooks()
-        # self.scrubbed = scrub_py2_sys_modules()
-        install_hooks()
-        return self
-
-    def __exit__(self, *args):
-        # flog.debug('Exiting hooks context manager')
-        # restore_sys_modules(self.scrubbed)
-        if not self.hooks_were_installed:
-            remove_hooks()
-        # scrub_future_sys_modules()
-
-# Sanity check for is_py2_stdlib_module(): We aren't replacing any
-# builtin modules names:
-if PY2:
-    assert len(set(RENAMES.values()) & set(sys.builtin_module_names)) == 0
-
-
-def is_py2_stdlib_module(m):
-    """
-    Tries to infer whether the module m is from the Python 2 standard library.
-    This may not be reliable on all systems.
-    """
-    if PY3:
-        return False
-    if not 'stdlib_path' in is_py2_stdlib_module.__dict__:
-        stdlib_files = [contextlib.__file__, os.__file__, copy.__file__]
-        stdlib_paths = [os.path.split(f)[0] for f in stdlib_files]
-        if not len(set(stdlib_paths)) == 1:
-            # This seems to happen on travis-ci.org. Very strange. We'll try to
-            # ignore it.
-            flog.warn('Multiple locations found for the Python standard '
-                         'library: %s' % stdlib_paths)
-        # Choose the first one arbitrarily
-        is_py2_stdlib_module.stdlib_path = stdlib_paths[0]
-
-    if m.__name__ in sys.builtin_module_names:
-        return True
-
-    if hasattr(m, '__file__'):
-        modpath = os.path.split(m.__file__)
-        if (modpath[0].startswith(is_py2_stdlib_module.stdlib_path) and
-            'site-packages' not in modpath[0]):
-            return True
-
-    return False
-
-
-def scrub_py2_sys_modules():
-    """
-    Removes any Python 2 standard library modules from ``sys.modules`` that
-    would interfere with Py3-style imports using import hooks. Examples are
-    modules with the same names (like urllib or email).
-
-    (Note that currently import hooks are disabled for modules like these
-    with ambiguous names anyway ...)
-    """
-    if PY3:
-        return {}
-    scrubbed = {}
-    for modulename in REPLACED_MODULES & set(RENAMES.keys()):
-        if not modulename in sys.modules:
-            continue
-
-        module = sys.modules[modulename]
-
-        if is_py2_stdlib_module(module):
-            flog.debug('Deleting (Py2) {} from sys.modules'.format(modulename))
-            scrubbed[modulename] = sys.modules[modulename]
-            del sys.modules[modulename]
-    return scrubbed
-
-
-def scrub_future_sys_modules():
-    """
-    Deprecated.
-    """
-    return {}
-
-class suspend_hooks(object):
-    """
-    Acts as a context manager. Use like this:
-
-    >>> from future import standard_library
-    >>> standard_library.install_hooks()
-    >>> import http.client
-    >>> # ...
-    >>> with standard_library.suspend_hooks():
-    >>>     import requests     # incompatible with ``future``'s standard library hooks
-
-    If the hooks were disabled before the context, they are not installed when
-    the context is left.
-    """
-    def __enter__(self):
-        self.hooks_were_installed = detect_hooks()
-        remove_hooks()
-        # self.scrubbed = scrub_future_sys_modules()
-        return self
-
-    def __exit__(self, *args):
-        if self.hooks_were_installed:
-            install_hooks()
-        # restore_sys_modules(self.scrubbed)
-
-
-def restore_sys_modules(scrubbed):
-    """
-    Add any previously scrubbed modules back to the sys.modules cache,
-    but only if it's safe to do so.
-    """
-    clash = set(sys.modules) & set(scrubbed)
-    if len(clash) != 0:
-        # If several, choose one arbitrarily to raise an exception about
-        first = list(clash)[0]
-        raise ImportError('future module {} clashes with Py2 module'
-                          .format(first))
-    sys.modules.update(scrubbed)
-
-
-def install_aliases():
-    """
-    Monkey-patches the standard library in Py2.6/7 to provide
-    aliases for better Py3 compatibility.
-    """
-    if PY3:
-        return
-    # if hasattr(install_aliases, 'run_already'):
-    #     return
-    for (newmodname, newobjname, oldmodname, oldobjname) in MOVES:
-        __import__(newmodname)
-        # We look up the module in sys.modules because __import__ just returns the
-        # top-level package:
-        newmod = sys.modules[newmodname]
-        # newmod.__future_module__ = True
-
-        __import__(oldmodname)
-        oldmod = sys.modules[oldmodname]
-
-        obj = getattr(oldmod, oldobjname)
-        setattr(newmod, newobjname, obj)
-
-    # Hack for urllib so it appears to have the same structure on Py2 as on Py3
-    import urllib
-    from future.backports.urllib import request
-    from future.backports.urllib import response
-    from future.backports.urllib import parse
-    from future.backports.urllib import error
-    from future.backports.urllib import robotparser
-    urllib.request = request
-    urllib.response = response
-    urllib.parse = parse
-    urllib.error = error
-    urllib.robotparser = robotparser
-    sys.modules['urllib.request'] = request
-    sys.modules['urllib.response'] = response
-    sys.modules['urllib.parse'] = parse
-    sys.modules['urllib.error'] = error
-    sys.modules['urllib.robotparser'] = robotparser
-
-    # Patch the test module so it appears to have the same structure on Py2 as on Py3
-    try:
-        import test
-    except ImportError:
-        pass
-    try:
-        from future.moves.test import support
-    except ImportError:
-        pass
-    else:
-        test.support = support
-        sys.modules['test.support'] = support
-
-    # Patch the dbm module so it appears to have the same structure on Py2 as on Py3
-    try:
-        import dbm
-    except ImportError:
-        pass
-    else:
-        from future.moves.dbm import dumb
-        dbm.dumb = dumb
-        sys.modules['dbm.dumb'] = dumb
-        try:
-            from future.moves.dbm import gnu
-        except ImportError:
-            pass
-        else:
-            dbm.gnu = gnu
-            sys.modules['dbm.gnu'] = gnu
-        try:
-            from future.moves.dbm import ndbm
-        except ImportError:
-            pass
-        else:
-            dbm.ndbm = ndbm
-            sys.modules['dbm.ndbm'] = ndbm
-
-    # install_aliases.run_already = True
-
-
-def install_hooks():
-    """
-    This function installs the future.standard_library import hook into
-    sys.meta_path.
-    """
-    if PY3:
-        return
-
-    install_aliases()
-
-    flog.debug('sys.meta_path was: {0}'.format(sys.meta_path))
-    flog.debug('Installing hooks ...')
-
-    # Add it unless it's there already
-    newhook = RenameImport(RENAMES)
-    if not detect_hooks():
-        sys.meta_path.append(newhook)
-    flog.debug('sys.meta_path is now: {0}'.format(sys.meta_path))
-
-
-def enable_hooks():
-    """
-    Deprecated. Use install_hooks() instead. This will be removed by
-    ``future`` v1.0.
-    """
-    install_hooks()
-
-
-def remove_hooks(scrub_sys_modules=False):
-    """
-    This function removes the import hook from sys.meta_path.
-    """
-    if PY3:
-        return
-    flog.debug('Uninstalling hooks ...')
-    # Loop backwards, so deleting items keeps the ordering:
-    for i, hook in list(enumerate(sys.meta_path))[::-1]:
-        if hasattr(hook, 'RENAMER'):
-            del sys.meta_path[i]
-
-    # Explicit is better than implicit. In the future the interface should
-    # probably change so that scrubbing the import hooks requires a separate
-    # function call. Left as is for now for backward compatibility with
-    # v0.11.x.
-    if scrub_sys_modules:
-        scrub_future_sys_modules()
-
-
-def disable_hooks():
-    """
-    Deprecated. Use remove_hooks() instead. This will be removed by
-    ``future`` v1.0.
-    """
-    remove_hooks()
-
-
-def detect_hooks():
-    """
-    Returns True if the import hooks are installed, False if not.
-    """
-    flog.debug('Detecting hooks ...')
-    present = any([hasattr(hook, 'RENAMER') for hook in sys.meta_path])
-    if present:
-        flog.debug('Detected.')
-    else:
-        flog.debug('Not detected.')
-    return present
-
-
-# As of v0.12, this no longer happens implicitly:
-# if not PY3:
-#     install_hooks()
-
-
-if not hasattr(sys, 'py2_modules'):
-    sys.py2_modules = {}
-
-def cache_py2_modules():
-    """
-    Currently this function is unneeded, as we are not attempting to provide import hooks
-    for modules with ambiguous names: email, urllib, pickle.
-    """
-    if len(sys.py2_modules) != 0:
-        return
-    assert not detect_hooks()
-    import urllib
-    sys.py2_modules['urllib'] = urllib
-
-    import email
-    sys.py2_modules['email'] = email
-
-    import pickle
-    sys.py2_modules['pickle'] = pickle
-
-    # Not all Python installations have test module. (Anaconda doesn't, for example.)
-    # try:
-    #     import test
-    # except ImportError:
-    #     sys.py2_modules['test'] = None
-    # sys.py2_modules['test'] = test
-
-    # import dbm
-    # sys.py2_modules['dbm'] = dbm
-
-
-def import_(module_name, backport=False):
-    """
-    Pass a (potentially dotted) module name of a Python 3 standard library
-    module. This function imports the module compatibly on Py2 and Py3 and
-    returns the top-level module.
-
-    Example use:
-        >>> http = import_('http.client')
-        >>> http = import_('http.server')
-        >>> urllib = import_('urllib.request')
-
-    Then:
-        >>> conn = http.client.HTTPConnection(...)
-        >>> response = urllib.request.urlopen('http://mywebsite.com')
-        >>> # etc.
-
-    Use as follows:
-        >>> package_name = import_(module_name)
-
-    On Py3, equivalent to this:
-
-        >>> import module_name
-
-    On Py2, equivalent to this if backport=False:
-
-        >>> from future.moves import module_name
-
-    or to this if backport=True:
-
-        >>> from future.backports import module_name
-
-    except that it also handles dotted module names such as ``http.client``
-    The effect then is like this:
-
-        >>> from future.backports import module
-        >>> from future.backports.module import submodule
-        >>> module.submodule = submodule
-
-    Note that this would be a SyntaxError in Python:
-
-        >>> from future.backports import http.client
-
-    """
-    # Python 2.6 doesn't have importlib in the stdlib, so it requires
-    # the backported ``importlib`` package from PyPI as a dependency to use
-    # this function:
-    import importlib
-
-    if PY3:
-        return __import__(module_name)
-    else:
-        # client.blah = blah
-        # Then http.client = client
-        # etc.
-        if backport:
-            prefix = 'future.backports'
-        else:
-            prefix = 'future.moves'
-        parts = prefix.split('.') + module_name.split('.')
-
-        modules = []
-        for i, part in enumerate(parts):
-            sofar = '.'.join(parts[:i+1])
-            modules.append(importlib.import_module(sofar))
-        for i, part in reversed(list(enumerate(parts))):
-            if i == 0:
-                break
-            setattr(modules[i-1], part, modules[i])
-
-        # Return the next-most top-level module after future.backports / future.moves:
-        return modules[2]
-
-
-def from_import(module_name, *symbol_names, **kwargs):
-    """
-    Example use:
-        >>> HTTPConnection = from_import('http.client', 'HTTPConnection')
-        >>> HTTPServer = from_import('http.server', 'HTTPServer')
-        >>> urlopen, urlparse = from_import('urllib.request', 'urlopen', 'urlparse')
-
-    Equivalent to this on Py3:
-
-        >>> from module_name import symbol_names[0], symbol_names[1], ...
-
-    and this on Py2:
-
-        >>> from future.moves.module_name import symbol_names[0], ...
-
-    or:
-
-        >>> from future.backports.module_name import symbol_names[0], ...
-
-    except that it also handles dotted module names such as ``http.client``.
-    """
-
-    if PY3:
-        return __import__(module_name)
-    else:
-        if 'backport' in kwargs and bool(kwargs['backport']):
-            prefix = 'future.backports'
-        else:
-            prefix = 'future.moves'
-        parts = prefix.split('.') + module_name.split('.')
-        module = importlib.import_module(prefix + '.' + module_name)
-        output = [getattr(module, name) for name in symbol_names]
-        if len(output) == 1:
-            return output[0]
-        else:
-            return output
-
-
-class exclude_local_folder_imports(object):
-    """
-    A context-manager that prevents standard library modules like configparser
-    from being imported from the local python-future source folder on Py3.
-
-    (This was need prior to v0.16.0 because the presence of a configparser
-    folder would otherwise have prevented setuptools from running on Py3. Maybe
-    it's not needed any more?)
-    """
-    def __init__(self, *args):
-        assert len(args) > 0
-        self.module_names = args
-        # Disallow dotted module names like http.client:
-        if any(['.' in m for m in self.module_names]):
-            raise NotImplementedError('Dotted module names are not supported')
-
-    def __enter__(self):
-        self.old_sys_path = copy.copy(sys.path)
-        self.old_sys_modules = copy.copy(sys.modules)
-        if sys.version_info[0] < 3:
-            return
-        # The presence of all these indicates we've found our source folder,
-        # because `builtins` won't have been installed in site-packages by setup.py:
-        FUTURE_SOURCE_SUBFOLDERS = ['future', 'past', 'libfuturize', 'libpasteurize', 'builtins']
-
-        # Look for the future source folder:
-        for folder in self.old_sys_path:
-            if all([os.path.exists(os.path.join(folder, subfolder))
-                    for subfolder in FUTURE_SOURCE_SUBFOLDERS]):
-                # Found it. Remove it.
-                sys.path.remove(folder)
-
-        # Ensure we import the system module:
-        for m in self.module_names:
-            # Delete the module and any submodules from sys.modules:
-            # for key in list(sys.modules):
-            #     if key == m or key.startswith(m + '.'):
-            #         try:
-            #             del sys.modules[key]
-            #         except KeyError:
-            #             pass
-            try:
-                module = __import__(m, level=0)
-            except ImportError:
-                # There's a problem importing the system module. E.g. the
-                # winreg module is not available except on Windows.
-                pass
-
-    def __exit__(self, *args):
-        # Restore sys.path and sys.modules:
-        sys.path = self.old_sys_path
-        for m in set(self.old_sys_modules.keys()) - set(sys.modules.keys()):
-            sys.modules[m] = self.old_sys_modules[m]
-
-TOP_LEVEL_MODULES = ['builtins',
-                     'copyreg',
-                     'html',
-                     'http',
-                     'queue',
-                     'reprlib',
-                     'socketserver',
-                     'test',
-                     'tkinter',
-                     'winreg',
-                     'xmlrpc',
-                     '_dummy_thread',
-                     '_markupbase',
-                     '_thread',
-                    ]
-
-def import_top_level_modules():
-    with exclude_local_folder_imports(*TOP_LEVEL_MODULES):
-        for m in TOP_LEVEL_MODULES:
-            try:
-                __import__(m)
-            except ImportError:     # e.g. winreg
-                pass
diff --git a/lib/future/tests/__init__.py b/lib/future/tests/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/future/tests/base.py b/lib/future/tests/base.py
deleted file mode 100644
index 4ef437ba..00000000
--- a/lib/future/tests/base.py
+++ /dev/null
@@ -1,539 +0,0 @@
-from __future__ import print_function, absolute_import
-import os
-import tempfile
-import unittest
-import sys
-import re
-import warnings
-import io
-from textwrap import dedent
-
-from future.utils import bind_method, PY26, PY3, PY2, PY27
-from future.moves.subprocess import check_output, STDOUT, CalledProcessError
-
-if PY26:
-    import unittest2 as unittest
-
-
-def reformat_code(code):
-    """
-    Removes any leading \n and dedents.
-    """
-    if code.startswith('\n'):
-        code = code[1:]
-    return dedent(code)
-
-
-def order_future_lines(code):
-    """
-    Returns the code block with any ``__future__`` import lines sorted, and
-    then any ``future`` import lines sorted, then any ``builtins`` import lines
-    sorted.
-
-    This only sorts the lines within the expected blocks.
-
-    See test_order_future_lines() for an example.
-    """
-
-    # We need .splitlines(keepends=True), which doesn't exist on Py2,
-    # so we use this instead:
-    lines = code.split('\n')
-
-    uufuture_line_numbers = [i for i, line in enumerate(lines)
-                               if line.startswith('from __future__ import ')]
-
-    future_line_numbers = [i for i, line in enumerate(lines)
-                             if line.startswith('from future')
-                             or line.startswith('from past')]
-
-    builtins_line_numbers = [i for i, line in enumerate(lines)
-                             if line.startswith('from builtins')]
-
-    assert code.lstrip() == code, ('internal usage error: '
-            'dedent the code before calling order_future_lines()')
-
-    def mymax(numbers):
-        return max(numbers) if len(numbers) > 0 else 0
-
-    def mymin(numbers):
-        return min(numbers) if len(numbers) > 0 else float('inf')
-
-    assert mymax(uufuture_line_numbers) <= mymin(future_line_numbers), \
-            'the __future__ and future imports are out of order'
-
-    # assert mymax(future_line_numbers) <= mymin(builtins_line_numbers), \
-    #         'the future and builtins imports are out of order'
-
-    uul = sorted([lines[i] for i in uufuture_line_numbers])
-    sorted_uufuture_lines = dict(zip(uufuture_line_numbers, uul))
-
-    fl = sorted([lines[i] for i in future_line_numbers])
-    sorted_future_lines = dict(zip(future_line_numbers, fl))
-
-    bl = sorted([lines[i] for i in builtins_line_numbers])
-    sorted_builtins_lines = dict(zip(builtins_line_numbers, bl))
-
-    # Replace the old unsorted "from __future__ import ..." lines with the
-    # new sorted ones:
-    new_lines = []
-    for i in range(len(lines)):
-        if i in uufuture_line_numbers:
-            new_lines.append(sorted_uufuture_lines[i])
-        elif i in future_line_numbers:
-            new_lines.append(sorted_future_lines[i])
-        elif i in builtins_line_numbers:
-            new_lines.append(sorted_builtins_lines[i])
-        else:
-            new_lines.append(lines[i])
-    return '\n'.join(new_lines)
-
-
-class VerboseCalledProcessError(CalledProcessError):
-    """
-    Like CalledProcessError, but it displays more information (message and
-    script output) for diagnosing test failures etc.
-    """
-    def __init__(self, msg, returncode, cmd, output=None):
-        self.msg = msg
-        self.returncode = returncode
-        self.cmd = cmd
-        self.output = output
-
-    def __str__(self):
-        return ("Command '%s' failed with exit status %d\nMessage: %s\nOutput: %s"
-                % (self.cmd, self.returncode, self.msg, self.output))
-
-class FuturizeError(VerboseCalledProcessError):
-    pass
-
-class PasteurizeError(VerboseCalledProcessError):
-    pass
-
-
-class CodeHandler(unittest.TestCase):
-    """
-    Handy mixin for test classes for writing / reading / futurizing /
-    running .py files in the test suite.
-    """
-    def setUp(self):
-        """
-        The outputs from the various futurize stages should have the
-        following headers:
-        """
-        # After stage1:
-        # TODO: use this form after implementing a fixer to consolidate
-        #       __future__ imports into a single line:
-        # self.headers1 = """
-        # from __future__ import absolute_import, division, print_function
-        # """
-        self.headers1 = reformat_code("""
-        from __future__ import absolute_import
-        from __future__ import division
-        from __future__ import print_function
-        """)
-
-        # After stage2 --all-imports:
-        # TODO: use this form after implementing a fixer to consolidate
-        #       __future__ imports into a single line:
-        # self.headers2 = """
-        # from __future__ import (absolute_import, division,
-        #                         print_function, unicode_literals)
-        # from future import standard_library
-        # from future.builtins import *
-        # """
-        self.headers2 = reformat_code("""
-        from __future__ import absolute_import
-        from __future__ import division
-        from __future__ import print_function
-        from __future__ import unicode_literals
-        from future import standard_library
-        standard_library.install_aliases()
-        from builtins import *
-        """)
-        self.interpreters = [sys.executable]
-        self.tempdir = tempfile.mkdtemp() + os.path.sep
-        pypath = os.getenv('PYTHONPATH')
-        if pypath:
-            self.env = {'PYTHONPATH': os.getcwd() + os.pathsep + pypath}
-        else:
-            self.env = {'PYTHONPATH': os.getcwd()}
-
-    def convert(self, code, stages=(1, 2), all_imports=False, from3=False,
-                reformat=True, run=True, conservative=False):
-        """
-        Converts the code block using ``futurize`` and returns the
-        resulting code.
-
-        Passing stages=[1] or stages=[2] passes the flag ``--stage1`` or
-        ``stage2`` to ``futurize``. Passing both stages runs ``futurize``
-        with both stages by default.
-
-        If from3 is False, runs ``futurize``, converting from Python 2 to
-        both 2 and 3. If from3 is True, runs ``pasteurize`` to convert
-        from Python 3 to both 2 and 3.
-
-        Optionally reformats the code block first using the reformat() function.
-
-        If run is True, runs the resulting code under all Python
-        interpreters in self.interpreters.
-        """
-        if reformat:
-            code = reformat_code(code)
-        self._write_test_script(code)
-        self._futurize_test_script(stages=stages, all_imports=all_imports,
-                                   from3=from3, conservative=conservative)
-        output = self._read_test_script()
-        if run:
-            for interpreter in self.interpreters:
-                _ = self._run_test_script(interpreter=interpreter)
-        return output
-
-    def compare(self, output, expected, ignore_imports=True):
-        """
-        Compares whether the code blocks are equal. If not, raises an
-        exception so the test fails. Ignores any trailing whitespace like
-        blank lines.
-
-        If ignore_imports is True, passes the code blocks into the
-        strip_future_imports method.
-
-        If one code block is a unicode string and the other a
-        byte-string, it assumes the byte-string is encoded as utf-8.
-        """
-        if ignore_imports:
-            output = self.strip_future_imports(output)
-            expected = self.strip_future_imports(expected)
-        if isinstance(output, bytes) and not isinstance(expected, bytes):
-            output = output.decode('utf-8')
-        if isinstance(expected, bytes) and not isinstance(output, bytes):
-            expected = expected.decode('utf-8')
-        self.assertEqual(order_future_lines(output.rstrip()),
-                         expected.rstrip())
-
-    def strip_future_imports(self, code):
-        """
-        Strips any of these import lines:
-
-            from __future__ import <anything>
-            from future <anything>
-            from future.<anything>
-            from builtins <anything>
-
-        or any line containing:
-            install_hooks()
-        or:
-            install_aliases()
-
-        Limitation: doesn't handle imports split across multiple lines like
-        this:
-
-            from __future__ import (absolute_import, division, print_function,
-                                    unicode_literals)
-        """
-        output = []
-        # We need .splitlines(keepends=True), which doesn't exist on Py2,
-        # so we use this instead:
-        for line in code.split('\n'):
-            if not (line.startswith('from __future__ import ')
-                    or line.startswith('from future ')
-                    or line.startswith('from builtins ')
-                    or 'install_hooks()' in line
-                    or 'install_aliases()' in line
-                    # but don't match "from future_builtins" :)
-                    or line.startswith('from future.')):
-                output.append(line)
-        return '\n'.join(output)
-
-    def convert_check(self, before, expected, stages=(1, 2), all_imports=False,
-                      ignore_imports=True, from3=False, run=True,
-                      conservative=False):
-        """
-        Convenience method that calls convert() and compare().
-
-        Reformats the code blocks automatically using the reformat_code()
-        function.
-
-        If all_imports is passed, we add the appropriate import headers
-        for the stage(s) selected to the ``expected`` code-block, so they
-        needn't appear repeatedly in the test code.
-
-        If ignore_imports is True, ignores the presence of any lines
-        beginning:
-
-            from __future__ import ...
-            from future import ...
-
-        for the purpose of the comparison.
-        """
-        output = self.convert(before, stages=stages, all_imports=all_imports,
-                              from3=from3, run=run, conservative=conservative)
-        if all_imports:
-            headers = self.headers2 if 2 in stages else self.headers1
-        else:
-            headers = ''
-
-        reformatted = reformat_code(expected)
-        if headers in reformatted:
-            headers = ''
-
-        self.compare(output, headers + reformatted,
-                     ignore_imports=ignore_imports)
-
-    def unchanged(self, code, **kwargs):
-        """
-        Convenience method to ensure the code is unchanged by the
-        futurize process.
-        """
-        self.convert_check(code, code, **kwargs)
-
-    def _write_test_script(self, code, filename='mytestscript.py'):
-        """
-        Dedents the given code (a multiline string) and writes it out to
-        a file in a temporary folder like /tmp/tmpUDCn7x/mytestscript.py.
-        """
-        if isinstance(code, bytes):
-            code = code.decode('utf-8')
-        # Be explicit about encoding the temp file as UTF-8 (issue #63):
-        with io.open(self.tempdir + filename, 'wt', encoding='utf-8') as f:
-            f.write(dedent(code))
-
-    def _read_test_script(self, filename='mytestscript.py'):
-        with io.open(self.tempdir + filename, 'rt', encoding='utf-8') as f:
-            newsource = f.read()
-        return newsource
-
-    def _futurize_test_script(self, filename='mytestscript.py', stages=(1, 2),
-                              all_imports=False, from3=False,
-                              conservative=False):
-        params = []
-        stages = list(stages)
-        if all_imports:
-            params.append('--all-imports')
-        if from3:
-            script = 'pasteurize.py'
-        else:
-            script = 'futurize.py'
-            if stages == [1]:
-                params.append('--stage1')
-            elif stages == [2]:
-                params.append('--stage2')
-            else:
-                assert stages == [1, 2]
-            if conservative:
-                params.append('--conservative')
-            # No extra params needed
-
-        # Absolute file path:
-        fn = self.tempdir + filename
-        call_args = [sys.executable, script] + params + ['-w', fn]
-        try:
-            output = check_output(call_args, stderr=STDOUT, env=self.env)
-        except CalledProcessError as e:
-            with open(fn) as f:
-                msg = (
-                    'Error running the command %s\n'
-                    '%s\n'
-                    'Contents of file %s:\n'
-                    '\n'
-                    '%s') % (
-                        ' '.join(call_args),
-                        'env=%s' % self.env,
-                        fn,
-                        '----\n%s\n----' % f.read(),
-                    )
-            ErrorClass = (FuturizeError if 'futurize' in script else PasteurizeError)
-
-            if not hasattr(e, 'output'):
-                # The attribute CalledProcessError.output doesn't exist on Py2.6
-                e.output = None
-            raise ErrorClass(msg, e.returncode, e.cmd, output=e.output)
-        return output
-
-    def _run_test_script(self, filename='mytestscript.py',
-                         interpreter=sys.executable):
-        # Absolute file path:
-        fn = self.tempdir + filename
-        try:
-            output = check_output([interpreter, fn],
-                                  env=self.env, stderr=STDOUT)
-        except CalledProcessError as e:
-            with open(fn) as f:
-                msg = (
-                    'Error running the command %s\n'
-                    '%s\n'
-                    'Contents of file %s:\n'
-                    '\n'
-                    '%s') % (
-                        ' '.join([interpreter, fn]),
-                        'env=%s' % self.env,
-                        fn,
-                        '----\n%s\n----' % f.read(),
-                    )
-            if not hasattr(e, 'output'):
-                # The attribute CalledProcessError.output doesn't exist on Py2.6
-                e.output = None
-            raise VerboseCalledProcessError(msg, e.returncode, e.cmd, output=e.output)
-        return output
-
-
-# Decorator to skip some tests on Python 2.6 ...
-skip26 = unittest.skipIf(PY26, "this test is known to fail on Py2.6")
-
-
-def expectedFailurePY3(func):
-    if not PY3:
-        return func
-    return unittest.expectedFailure(func)
-
-def expectedFailurePY26(func):
-    if not PY26:
-        return func
-    return unittest.expectedFailure(func)
-
-
-def expectedFailurePY27(func):
-    if not PY27:
-        return func
-    return unittest.expectedFailure(func)
-
-
-def expectedFailurePY2(func):
-    if not PY2:
-        return func
-    return unittest.expectedFailure(func)
-
-
-# Renamed in Py3.3:
-if not hasattr(unittest.TestCase, 'assertRaisesRegex'):
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-# From Py3.3:
-def assertRegex(self, text, expected_regex, msg=None):
-    """Fail the test unless the text matches the regular expression."""
-    if isinstance(expected_regex, (str, unicode)):
-        assert expected_regex, "expected_regex must not be empty."
-        expected_regex = re.compile(expected_regex)
-    if not expected_regex.search(text):
-        msg = msg or "Regex didn't match"
-        msg = '%s: %r not found in %r' % (msg, expected_regex.pattern, text)
-        raise self.failureException(msg)
-
-if not hasattr(unittest.TestCase, 'assertRegex'):
-    bind_method(unittest.TestCase, 'assertRegex', assertRegex)
-
-class _AssertRaisesBaseContext(object):
-
-    def __init__(self, expected, test_case, callable_obj=None,
-                 expected_regex=None):
-        self.expected = expected
-        self.test_case = test_case
-        if callable_obj is not None:
-            try:
-                self.obj_name = callable_obj.__name__
-            except AttributeError:
-                self.obj_name = str(callable_obj)
-        else:
-            self.obj_name = None
-        if isinstance(expected_regex, (bytes, str)):
-            expected_regex = re.compile(expected_regex)
-        self.expected_regex = expected_regex
-        self.msg = None
-
-    def _raiseFailure(self, standardMsg):
-        msg = self.test_case._formatMessage(self.msg, standardMsg)
-        raise self.test_case.failureException(msg)
-
-    def handle(self, name, callable_obj, args, kwargs):
-        """
-        If callable_obj is None, assertRaises/Warns is being used as a
-        context manager, so check for a 'msg' kwarg and return self.
-        If callable_obj is not None, call it passing args and kwargs.
-        """
-        if callable_obj is None:
-            self.msg = kwargs.pop('msg', None)
-            return self
-        with self:
-            callable_obj(*args, **kwargs)
-
-class _AssertWarnsContext(_AssertRaisesBaseContext):
-    """A context manager used to implement TestCase.assertWarns* methods."""
-
-    def __enter__(self):
-        # The __warningregistry__'s need to be in a pristine state for tests
-        # to work properly.
-        for v in sys.modules.values():
-            if getattr(v, '__warningregistry__', None):
-                v.__warningregistry__ = {}
-        self.warnings_manager = warnings.catch_warnings(record=True)
-        self.warnings = self.warnings_manager.__enter__()
-        warnings.simplefilter("always", self.expected)
-        return self
-
-    def __exit__(self, exc_type, exc_value, tb):
-        self.warnings_manager.__exit__(exc_type, exc_value, tb)
-        if exc_type is not None:
-            # let unexpected exceptions pass through
-            return
-        try:
-            exc_name = self.expected.__name__
-        except AttributeError:
-            exc_name = str(self.expected)
-        first_matching = None
-        for m in self.warnings:
-            w = m.message
-            if not isinstance(w, self.expected):
-                continue
-            if first_matching is None:
-                first_matching = w
-            if (self.expected_regex is not None and
-                not self.expected_regex.search(str(w))):
-                continue
-            # store warning for later retrieval
-            self.warning = w
-            self.filename = m.filename
-            self.lineno = m.lineno
-            return
-        # Now we simply try to choose a helpful failure message
-        if first_matching is not None:
-            self._raiseFailure('"{}" does not match "{}"'.format(
-                     self.expected_regex.pattern, str(first_matching)))
-        if self.obj_name:
-            self._raiseFailure("{} not triggered by {}".format(exc_name,
-                                                               self.obj_name))
-        else:
-            self._raiseFailure("{} not triggered".format(exc_name))
-
-
-def assertWarns(self, expected_warning, callable_obj=None, *args, **kwargs):
-    """Fail unless a warning of class warnClass is triggered
-       by callable_obj when invoked with arguments args and keyword
-       arguments kwargs.  If a different type of warning is
-       triggered, it will not be handled: depending on the other
-       warning filtering rules in effect, it might be silenced, printed
-       out, or raised as an exception.
-
-       If called with callable_obj omitted or None, will return a
-       context object used like this::
-
-            with self.assertWarns(SomeWarning):
-                do_something()
-
-       An optional keyword argument 'msg' can be provided when assertWarns
-       is used as a context object.
-
-       The context manager keeps a reference to the first matching
-       warning as the 'warning' attribute; similarly, the 'filename'
-       and 'lineno' attributes give you information about the line
-       of Python code from which the warning was triggered.
-       This allows you to inspect the warning after the assertion::
-
-           with self.assertWarns(SomeWarning) as cm:
-               do_something()
-           the_warning = cm.warning
-           self.assertEqual(the_warning.some_attribute, 147)
-    """
-    context = _AssertWarnsContext(expected_warning, self, callable_obj)
-    return context.handle('assertWarns', callable_obj, args, kwargs)
-
-if not hasattr(unittest.TestCase, 'assertWarns'):
-    bind_method(unittest.TestCase, 'assertWarns', assertWarns)
diff --git a/lib/future/types/__init__.py b/lib/future/types/__init__.py
deleted file mode 100644
index 06250770..00000000
--- a/lib/future/types/__init__.py
+++ /dev/null
@@ -1,257 +0,0 @@
-"""
-This module contains backports the data types that were significantly changed
-in the transition from Python 2 to Python 3.
-
-- an implementation of Python 3's bytes object (pure Python subclass of
-  Python 2's builtin 8-bit str type)
-- an implementation of Python 3's str object (pure Python subclass of
-  Python 2's builtin unicode type)
-- a backport of the range iterator from Py3 with slicing support
-
-It is used as follows::
-
-    from __future__ import division, absolute_import, print_function
-    from builtins import bytes, dict, int, range, str
-
-to bring in the new semantics for these functions from Python 3. And
-then, for example::
-
-    b = bytes(b'ABCD')
-    assert list(b) == [65, 66, 67, 68]
-    assert repr(b) == "b'ABCD'"
-    assert [65, 66] in b
-
-    # These raise TypeErrors:
-    # b + u'EFGH'
-    # b.split(u'B')
-    # bytes(b',').join([u'Fred', u'Bill'])
-
-
-    s = str(u'ABCD')
-
-    # These raise TypeErrors:
-    # s.join([b'Fred', b'Bill'])
-    # s.startswith(b'A')
-    # b'B' in s
-    # s.find(b'A')
-    # s.replace(u'A', b'a')
-
-    # This raises an AttributeError:
-    # s.decode('utf-8')
-
-    assert repr(s) == 'ABCD'      # consistent repr with Py3 (no u prefix)
-
-
-    for i in range(10**11)[:10]:
-        pass
-
-and::
-
-    class VerboseList(list):
-        def append(self, item):
-            print('Adding an item')
-            super().append(item)        # new simpler super() function
-
-For more information:
----------------------
-
-- future.types.newbytes
-- future.types.newdict
-- future.types.newint
-- future.types.newobject
-- future.types.newrange
-- future.types.newstr
-
-
-Notes
-=====
-
-range()
--------
-``range`` is a custom class that backports the slicing behaviour from
-Python 3 (based on the ``xrange`` module by Dan Crosta). See the
-``newrange`` module docstring for more details.
-
-
-super()
--------
-``super()`` is based on Ryan Kelly's ``magicsuper`` module. See the
-``newsuper`` module docstring for more details.
-
-
-round()
--------
-Python 3 modifies the behaviour of ``round()`` to use "Banker's Rounding".
-See http://stackoverflow.com/a/10825998. See the ``newround`` module
-docstring for more details.
-
-"""
-
-from __future__ import absolute_import, division, print_function
-
-import functools
-from numbers import Integral
-
-from future import utils
-
-
-# Some utility functions to enforce strict type-separation of unicode str and
-# bytes:
-def disallow_types(argnums, disallowed_types):
-    """
-    A decorator that raises a TypeError if any of the given numbered
-    arguments is of the corresponding given type (e.g. bytes or unicode
-    string).
-
-    For example:
-
-        @disallow_types([0, 1], [unicode, bytes])
-        def f(a, b):
-            pass
-
-    raises a TypeError when f is called if a unicode object is passed as
-    `a` or a bytes object is passed as `b`.
-
-    This also skips over keyword arguments, so
-
-        @disallow_types([0, 1], [unicode, bytes])
-        def g(a, b=None):
-            pass
-
-    doesn't raise an exception if g is called with only one argument a,
-    e.g.:
-
-        g(b'Byte string')
-
-    Example use:
-
-    >>> class newbytes(object):
-    ...     @disallow_types([1], [unicode])
-    ...     def __add__(self, other):
-    ...          pass
-
-    >>> newbytes('1234') + u'1234'      #doctest: +IGNORE_EXCEPTION_DETAIL
-    Traceback (most recent call last):
-      ...
-    TypeError: can't concat 'bytes' to (unicode) str
-    """
-
-    def decorator(function):
-
-        @functools.wraps(function)
-        def wrapper(*args, **kwargs):
-            # These imports are just for this decorator, and are defined here
-            # to prevent circular imports:
-            from .newbytes import newbytes
-            from .newint import newint
-            from .newstr import newstr
-
-            errmsg = "argument can't be {0}"
-            for (argnum, mytype) in zip(argnums, disallowed_types):
-                # Handle the case where the type is passed as a string like 'newbytes'.
-                if isinstance(mytype, str) or isinstance(mytype, bytes):
-                    mytype = locals()[mytype]
-
-                # Only restrict kw args only if they are passed:
-                if len(args) <= argnum:
-                    break
-
-                # Here we use type() rather than isinstance() because
-                # __instancecheck__ is being overridden. E.g.
-                # isinstance(b'abc', newbytes) is True on Py2.
-                if type(args[argnum]) == mytype:
-                    raise TypeError(errmsg.format(mytype))
-
-            return function(*args, **kwargs)
-        return wrapper
-    return decorator
-
-
-def no(mytype, argnums=(1,)):
-    """
-    A shortcut for the disallow_types decorator that disallows only one type
-    (in any position in argnums).
-
-    Example use:
-
-    >>> class newstr(object):
-    ...     @no('bytes')
-    ...     def __add__(self, other):
-    ...          pass
-
-    >>> newstr(u'1234') + b'1234'     #doctest: +IGNORE_EXCEPTION_DETAIL
-    Traceback (most recent call last):
-      ...
-    TypeError: argument can't be bytes
-
-    The object can also be passed directly, but passing the string helps
-    to prevent circular import problems.
-    """
-    if isinstance(argnums, Integral):
-        argnums = (argnums,)
-    disallowed_types = [mytype] * len(argnums)
-    return disallow_types(argnums, disallowed_types)
-
-
-def issubset(list1, list2):
-    """
-    Examples:
-
-    >>> issubset([], [65, 66, 67])
-    True
-    >>> issubset([65], [65, 66, 67])
-    True
-    >>> issubset([65, 66], [65, 66, 67])
-    True
-    >>> issubset([65, 67], [65, 66, 67])
-    False
-    """
-    n = len(list1)
-    for startpos in range(len(list2) - n + 1):
-        if list2[startpos:startpos+n] == list1:
-            return True
-    return False
-
-
-if utils.PY3:
-    import builtins
-    bytes = builtins.bytes
-    dict = builtins.dict
-    int = builtins.int
-    list = builtins.list
-    object = builtins.object
-    range = builtins.range
-    str = builtins.str
-
-    # The identity mapping
-    newtypes = {bytes: bytes,
-                dict: dict,
-                int: int,
-                list: list,
-                object: object,
-                range: range,
-                str: str}
-
-    __all__ = ['newtypes']
-
-else:
-
-    from .newbytes import newbytes
-    from .newdict import newdict
-    from .newint import newint
-    from .newlist import newlist
-    from .newrange import newrange
-    from .newobject import newobject
-    from .newstr import newstr
-
-    newtypes = {bytes: newbytes,
-                dict: newdict,
-                int: newint,
-                long: newint,
-                list: newlist,
-                object: newobject,
-                range: newrange,
-                str: newbytes,
-                unicode: newstr}
-
-    __all__ = ['newbytes', 'newdict', 'newint', 'newlist', 'newrange', 'newstr', 'newtypes']
diff --git a/lib/future/types/newbytes.py b/lib/future/types/newbytes.py
deleted file mode 100644
index c9d584a7..00000000
--- a/lib/future/types/newbytes.py
+++ /dev/null
@@ -1,460 +0,0 @@
-"""
-Pure-Python implementation of a Python 3-like bytes object for Python 2.
-
-Why do this? Without it, the Python 2 bytes object is a very, very
-different beast to the Python 3 bytes object.
-"""
-
-from numbers import Integral
-import string
-import copy
-
-from future.utils import istext, isbytes, PY2, PY3, with_metaclass
-from future.types import no, issubset
-from future.types.newobject import newobject
-
-if PY2:
-    from collections import Iterable
-else:
-    from collections.abc import Iterable
-
-
-_builtin_bytes = bytes
-
-if PY3:
-    # We'll probably never use newstr on Py3 anyway...
-    unicode = str
-
-
-class BaseNewBytes(type):
-    def __instancecheck__(cls, instance):
-        if cls == newbytes:
-            return isinstance(instance, _builtin_bytes)
-        else:
-            return issubclass(instance.__class__, cls)
-
-
-def _newchr(x):
-    if isinstance(x, str):  # this happens on pypy
-        return x.encode('ascii')
-    else:
-        return chr(x)
-
-
-class newbytes(with_metaclass(BaseNewBytes, _builtin_bytes)):
-    """
-    A backport of the Python 3 bytes object to Py2
-    """
-    def __new__(cls, *args, **kwargs):
-        """
-        From the Py3 bytes docstring:
-
-        bytes(iterable_of_ints) -> bytes
-        bytes(string, encoding[, errors]) -> bytes
-        bytes(bytes_or_buffer) -> immutable copy of bytes_or_buffer
-        bytes(int) -> bytes object of size given by the parameter initialized with null bytes
-        bytes() -> empty bytes object
-
-        Construct an immutable array of bytes from:
-          - an iterable yielding integers in range(256)
-          - a text string encoded using the specified encoding
-          - any object implementing the buffer API.
-          - an integer
-        """
-
-        encoding = None
-        errors = None
-
-        if len(args) == 0:
-            return super(newbytes, cls).__new__(cls)
-        elif len(args) >= 2:
-            args = list(args)
-            if len(args) == 3:
-                errors = args.pop()
-            encoding=args.pop()
-        # Was: elif isinstance(args[0], newbytes):
-        # We use type() instead of the above because we're redefining
-        # this to be True for all unicode string subclasses. Warning:
-        # This may render newstr un-subclassable.
-        if type(args[0]) == newbytes:
-            # Special-case: for consistency with Py3.3, we return the same object
-            # (with the same id) if a newbytes object is passed into the
-            # newbytes constructor.
-            return args[0]
-        elif isinstance(args[0], _builtin_bytes):
-            value = args[0]
-        elif isinstance(args[0], unicode):
-            try:
-                if 'encoding' in kwargs:
-                    assert encoding is None
-                    encoding = kwargs['encoding']
-                if 'errors' in kwargs:
-                    assert errors is None
-                    errors = kwargs['errors']
-            except AssertionError:
-                raise TypeError('Argument given by name and position')
-            if encoding is None:
-                raise TypeError('unicode string argument without an encoding')
-            ###
-            # Was:   value = args[0].encode(**kwargs)
-            # Python 2.6 string encode() method doesn't take kwargs:
-            # Use this instead:
-            newargs = [encoding]
-            if errors is not None:
-                newargs.append(errors)
-            value = args[0].encode(*newargs)
-            ###
-        elif hasattr(args[0], '__bytes__'):
-            value = args[0].__bytes__()
-        elif isinstance(args[0], Iterable):
-            if len(args[0]) == 0:
-                # This could be an empty list or tuple. Return b'' as on Py3.
-                value = b''
-            else:
-                # Was: elif len(args[0])>0 and isinstance(args[0][0], Integral):
-                #      # It's a list of integers
-                # But then we can't index into e.g. frozensets. Try to proceed
-                # anyway.
-                try:
-                    value = bytearray([_newchr(x) for x in args[0]])
-                except:
-                    raise ValueError('bytes must be in range(0, 256)')
-        elif isinstance(args[0], Integral):
-            if args[0] < 0:
-                raise ValueError('negative count')
-            value = b'\x00' * args[0]
-        else:
-            value = args[0]
-        if type(value) == newbytes:
-            # Above we use type(...) rather than isinstance(...) because the
-            # newbytes metaclass overrides __instancecheck__.
-            # oldbytes(value) gives the wrong thing on Py2: the same
-            # result as str(value) on Py3, e.g. "b'abc'". (Issue #193).
-            # So we handle this case separately:
-            return copy.copy(value)
-        else:
-            return super(newbytes, cls).__new__(cls, value)
-
-    def __repr__(self):
-        return 'b' + super(newbytes, self).__repr__()
-
-    def __str__(self):
-        return 'b' + "'{0}'".format(super(newbytes, self).__str__())
-
-    def __getitem__(self, y):
-        value = super(newbytes, self).__getitem__(y)
-        if isinstance(y, Integral):
-            return ord(value)
-        else:
-            return newbytes(value)
-
-    def __getslice__(self, *args):
-        return self.__getitem__(slice(*args))
-
-    def __contains__(self, key):
-        if isinstance(key, int):
-            newbyteskey = newbytes([key])
-        # Don't use isinstance() here because we only want to catch
-        # newbytes, not Python 2 str:
-        elif type(key) == newbytes:
-            newbyteskey = key
-        else:
-            newbyteskey = newbytes(key)
-        return issubset(list(newbyteskey), list(self))
-
-    @no(unicode)
-    def __add__(self, other):
-        return newbytes(super(newbytes, self).__add__(other))
-
-    @no(unicode)
-    def __radd__(self, left):
-        return newbytes(left) + self
-
-    @no(unicode)
-    def __mul__(self, other):
-        return newbytes(super(newbytes, self).__mul__(other))
-
-    @no(unicode)
-    def __rmul__(self, other):
-        return newbytes(super(newbytes, self).__rmul__(other))
-
-    def __mod__(self, vals):
-        if isinstance(vals, newbytes):
-            vals = _builtin_bytes.__str__(vals)
-
-        elif isinstance(vals, tuple):
-            newvals = []
-            for v in vals:
-                if isinstance(v, newbytes):
-                    v = _builtin_bytes.__str__(v)
-                newvals.append(v)
-            vals = tuple(newvals)
-
-        elif (hasattr(vals.__class__, '__getitem__') and
-                hasattr(vals.__class__, 'iteritems')):
-            for k, v in vals.iteritems():
-                if isinstance(v, newbytes):
-                    vals[k] = _builtin_bytes.__str__(v)
-
-        return _builtin_bytes.__mod__(self, vals)
-
-    def __imod__(self, other):
-        return self.__mod__(other)
-
-    def join(self, iterable_of_bytes):
-        errmsg = 'sequence item {0}: expected bytes, {1} found'
-        if isbytes(iterable_of_bytes) or istext(iterable_of_bytes):
-            raise TypeError(errmsg.format(0, type(iterable_of_bytes)))
-        for i, item in enumerate(iterable_of_bytes):
-            if istext(item):
-                raise TypeError(errmsg.format(i, type(item)))
-        return newbytes(super(newbytes, self).join(iterable_of_bytes))
-
-    @classmethod
-    def fromhex(cls, string):
-        # Only on Py2:
-        return cls(string.replace(' ', '').decode('hex'))
-
-    @no(unicode)
-    def find(self, sub, *args):
-        return super(newbytes, self).find(sub, *args)
-
-    @no(unicode)
-    def rfind(self, sub, *args):
-        return super(newbytes, self).rfind(sub, *args)
-
-    @no(unicode, (1, 2))
-    def replace(self, old, new, *args):
-        return newbytes(super(newbytes, self).replace(old, new, *args))
-
-    def encode(self, *args):
-        raise AttributeError("encode method has been disabled in newbytes")
-
-    def decode(self, encoding='utf-8', errors='strict'):
-        """
-        Returns a newstr (i.e. unicode subclass)
-
-        Decode B using the codec registered for encoding. Default encoding
-        is 'utf-8'. errors may be given to set a different error
-        handling scheme.  Default is 'strict' meaning that encoding errors raise
-        a UnicodeDecodeError.  Other possible values are 'ignore' and 'replace'
-        as well as any other name registered with codecs.register_error that is
-        able to handle UnicodeDecodeErrors.
-        """
-        # Py2 str.encode() takes encoding and errors as optional parameter,
-        # not keyword arguments as in Python 3 str.
-
-        from future.types.newstr import newstr
-
-        if errors == 'surrogateescape':
-            from future.utils.surrogateescape import register_surrogateescape
-            register_surrogateescape()
-
-        return newstr(super(newbytes, self).decode(encoding, errors))
-
-        # This is currently broken:
-        # # We implement surrogateescape error handling here in addition rather
-        # # than relying on the custom error handler from
-        # # future.utils.surrogateescape to be registered globally, even though
-        # # that is fine in the case of decoding. (But not encoding: see the
-        # # comments in newstr.encode()``.)
-        #
-        # if errors == 'surrogateescape':
-        #     # Decode char by char
-        #     mybytes = []
-        #     for code in self:
-        #         # Code is an int
-        #         if 0x80 <= code <= 0xFF:
-        #             b = 0xDC00 + code
-        #         elif code <= 0x7F:
-        #             b = _unichr(c).decode(encoding=encoding)
-        #         else:
-        #             # # It may be a bad byte
-        #             # FIXME: What to do in this case? See the Py3 docs / tests.
-        #             # # Try swallowing it.
-        #             # continue
-        #             # print("RAISE!")
-        #             raise NotASurrogateError
-        #         mybytes.append(b)
-        #     return newbytes(mybytes)
-        # return newbytes(super(newstr, self).decode(encoding, errors))
-
-    @no(unicode)
-    def startswith(self, prefix, *args):
-        return super(newbytes, self).startswith(prefix, *args)
-
-    @no(unicode)
-    def endswith(self, prefix, *args):
-        return super(newbytes, self).endswith(prefix, *args)
-
-    @no(unicode)
-    def split(self, sep=None, maxsplit=-1):
-        # Py2 str.split() takes maxsplit as an optional parameter, not as a
-        # keyword argument as in Python 3 bytes.
-        parts = super(newbytes, self).split(sep, maxsplit)
-        return [newbytes(part) for part in parts]
-
-    def splitlines(self, keepends=False):
-        """
-        B.splitlines([keepends]) -> list of lines
-
-        Return a list of the lines in B, breaking at line boundaries.
-        Line breaks are not included in the resulting list unless keepends
-        is given and true.
-        """
-        # Py2 str.splitlines() takes keepends as an optional parameter,
-        # not as a keyword argument as in Python 3 bytes.
-        parts = super(newbytes, self).splitlines(keepends)
-        return [newbytes(part) for part in parts]
-
-    @no(unicode)
-    def rsplit(self, sep=None, maxsplit=-1):
-        # Py2 str.rsplit() takes maxsplit as an optional parameter, not as a
-        # keyword argument as in Python 3 bytes.
-        parts = super(newbytes, self).rsplit(sep, maxsplit)
-        return [newbytes(part) for part in parts]
-
-    @no(unicode)
-    def partition(self, sep):
-        parts = super(newbytes, self).partition(sep)
-        return tuple(newbytes(part) for part in parts)
-
-    @no(unicode)
-    def rpartition(self, sep):
-        parts = super(newbytes, self).rpartition(sep)
-        return tuple(newbytes(part) for part in parts)
-
-    @no(unicode, (1,))
-    def rindex(self, sub, *args):
-        '''
-        S.rindex(sub [,start [,end]]) -> int
-
-        Like S.rfind() but raise ValueError when the substring is not found.
-        '''
-        pos = self.rfind(sub, *args)
-        if pos == -1:
-            raise ValueError('substring not found')
-
-    @no(unicode)
-    def index(self, sub, *args):
-        '''
-        Returns index of sub in bytes.
-        Raises ValueError if byte is not in bytes and TypeError if can't
-        be converted bytes or its length is not 1.
-        '''
-        if isinstance(sub, int):
-            if len(args) == 0:
-                start, end = 0, len(self)
-            elif len(args) == 1:
-                start = args[0]
-            elif len(args) == 2:
-                start, end = args
-            else:
-                raise TypeError('takes at most 3 arguments')
-            return list(self)[start:end].index(sub)
-        if not isinstance(sub, bytes):
-            try:
-                sub = self.__class__(sub)
-            except (TypeError, ValueError):
-                raise TypeError("can't convert sub to bytes")
-        try:
-            return super(newbytes, self).index(sub, *args)
-        except ValueError:
-            raise ValueError('substring not found')
-
-    def __eq__(self, other):
-        if isinstance(other, (_builtin_bytes, bytearray)):
-            return super(newbytes, self).__eq__(other)
-        else:
-            return False
-
-    def __ne__(self, other):
-        if isinstance(other, _builtin_bytes):
-            return super(newbytes, self).__ne__(other)
-        else:
-            return True
-
-    unorderable_err = 'unorderable types: bytes() and {0}'
-
-    def __lt__(self, other):
-        if isinstance(other, _builtin_bytes):
-            return super(newbytes, self).__lt__(other)
-        raise TypeError(self.unorderable_err.format(type(other)))
-
-    def __le__(self, other):
-        if isinstance(other, _builtin_bytes):
-            return super(newbytes, self).__le__(other)
-        raise TypeError(self.unorderable_err.format(type(other)))
-
-    def __gt__(self, other):
-        if isinstance(other, _builtin_bytes):
-            return super(newbytes, self).__gt__(other)
-        raise TypeError(self.unorderable_err.format(type(other)))
-
-    def __ge__(self, other):
-        if isinstance(other, _builtin_bytes):
-            return super(newbytes, self).__ge__(other)
-        raise TypeError(self.unorderable_err.format(type(other)))
-
-    def __native__(self):
-        # We can't just feed a newbytes object into str(), because
-        # newbytes.__str__() returns e.g. "b'blah'", consistent with Py3 bytes.
-        return super(newbytes, self).__str__()
-
-    def __getattribute__(self, name):
-        """
-        A trick to cause the ``hasattr`` builtin-fn to return False for
-        the 'encode' method on Py2.
-        """
-        if name in ['encode', u'encode']:
-            raise AttributeError("encode method has been disabled in newbytes")
-        return super(newbytes, self).__getattribute__(name)
-
-    @no(unicode)
-    def rstrip(self, bytes_to_strip=None):
-        """
-        Strip trailing bytes contained in the argument.
-        If the argument is omitted, strip trailing ASCII whitespace.
-        """
-        return newbytes(super(newbytes, self).rstrip(bytes_to_strip))
-
-    @no(unicode)
-    def strip(self, bytes_to_strip=None):
-        """
-        Strip leading and trailing bytes contained in the argument.
-        If the argument is omitted, strip trailing ASCII whitespace.
-        """
-        return newbytes(super(newbytes, self).strip(bytes_to_strip))
-
-    def lower(self):
-        """
-        b.lower() -> copy of b
-
-        Return a copy of b with all ASCII characters converted to lowercase.
-        """
-        return newbytes(super(newbytes, self).lower())
-
-    @no(unicode)
-    def upper(self):
-        """
-        b.upper() -> copy of b
-
-        Return a copy of b with all ASCII characters converted to uppercase.
-        """
-        return newbytes(super(newbytes, self).upper())
-
-    @classmethod
-    @no(unicode)
-    def maketrans(cls, frm, to):
-        """
-        B.maketrans(frm, to) -> translation table
-
-        Return a translation table (a bytes object of length 256) suitable
-        for use in the bytes or bytearray translate method where each byte
-        in frm is mapped to the byte at the same position in to.
-        The bytes objects frm and to must be of the same length.
-        """
-        return newbytes(string.maketrans(frm, to))
-
-
-__all__ = ['newbytes']
diff --git a/lib/future/types/newdict.py b/lib/future/types/newdict.py
deleted file mode 100644
index d90316cb..00000000
--- a/lib/future/types/newdict.py
+++ /dev/null
@@ -1,76 +0,0 @@
-"""
-A dict subclass for Python 2 that behaves like Python 3's dict
-
-Example use:
-
->>> from builtins import dict
->>> d1 = dict()    # instead of {} for an empty dict
->>> d2 = dict(key1='value1', key2='value2')
-
-The keys, values and items methods now return iterators on Python 2.x
-(with set-like behaviour on Python 2.7).
-
->>> for d in (d1, d2):
-...     assert not isinstance(d.keys(), list)
-...     assert not isinstance(d.values(), list)
-...     assert not isinstance(d.items(), list)
-"""
-
-import sys
-
-from future.utils import with_metaclass
-from future.types.newobject import newobject
-
-
-_builtin_dict = dict
-ver = sys.version_info
-
-
-class BaseNewDict(type):
-    def __instancecheck__(cls, instance):
-        if cls == newdict:
-            return isinstance(instance, _builtin_dict)
-        else:
-            return issubclass(instance.__class__, cls)
-
-
-class newdict(with_metaclass(BaseNewDict, _builtin_dict)):
-    """
-    A backport of the Python 3 dict object to Py2
-    """
-
-    if ver >= (3,):
-        # Inherit items, keys and values from `dict` in 3.x
-        pass
-    elif ver >= (2, 7):
-        items = dict.viewitems
-        keys = dict.viewkeys
-        values = dict.viewvalues
-    else:
-        items = dict.iteritems
-        keys = dict.iterkeys
-        values = dict.itervalues
-
-    def __new__(cls, *args, **kwargs):
-        """
-        dict() -> new empty dictionary
-        dict(mapping) -> new dictionary initialized from a mapping object's
-            (key, value) pairs
-        dict(iterable) -> new dictionary initialized as if via:
-            d = {}
-            for k, v in iterable:
-                d[k] = v
-        dict(**kwargs) -> new dictionary initialized with the name=value pairs
-            in the keyword argument list.  For example:  dict(one=1, two=2)
-        """
-
-        return super(newdict, cls).__new__(cls, *args)
-
-    def __native__(self):
-        """
-        Hook for the future.utils.native() function
-        """
-        return dict(self)
-
-
-__all__ = ['newdict']
diff --git a/lib/future/types/newint.py b/lib/future/types/newint.py
deleted file mode 100644
index ebc5715e..00000000
--- a/lib/future/types/newint.py
+++ /dev/null
@@ -1,386 +0,0 @@
-"""
-Backport of Python 3's int, based on Py2's long.
-
-They are very similar. The most notable difference is:
-
-- representation: trailing L in Python 2 removed in Python 3
-"""
-from __future__ import division
-
-import struct
-
-from future.types.newbytes import newbytes
-from future.types.newobject import newobject
-from future.utils import PY3, isint, istext, isbytes, with_metaclass, native
-
-
-if PY3:
-    long = int
-    from collections.abc import Iterable
-else:
-    from collections import Iterable
-
-
-class BaseNewInt(type):
-    def __instancecheck__(cls, instance):
-        if cls == newint:
-            # Special case for Py2 short or long int
-            return isinstance(instance, (int, long))
-        else:
-            return issubclass(instance.__class__, cls)
-
-
-class newint(with_metaclass(BaseNewInt, long)):
-    """
-    A backport of the Python 3 int object to Py2
-    """
-    def __new__(cls, x=0, base=10):
-        """
-        From the Py3 int docstring:
-
-        |  int(x=0) -> integer
-        |  int(x, base=10) -> integer
-        |
-        |  Convert a number or string to an integer, or return 0 if no
-        |  arguments are given.  If x is a number, return x.__int__().  For
-        |  floating point numbers, this truncates towards zero.
-        |
-        |  If x is not a number or if base is given, then x must be a string,
-        |  bytes, or bytearray instance representing an integer literal in the
-        |  given base.  The literal can be preceded by '+' or '-' and be
-        |  surrounded by whitespace.  The base defaults to 10.  Valid bases are
-        |  0 and 2-36. Base 0 means to interpret the base from the string as an
-        |  integer literal.
-        |  >>> int('0b100', base=0)
-        |  4
-
-        """
-        try:
-            val = x.__int__()
-        except AttributeError:
-            val = x
-        else:
-            if not isint(val):
-                raise TypeError('__int__ returned non-int ({0})'.format(
-                    type(val)))
-
-        if base != 10:
-            # Explicit base
-            if not (istext(val) or isbytes(val) or isinstance(val, bytearray)):
-                raise TypeError(
-                    "int() can't convert non-string with explicit base")
-            try:
-                return super(newint, cls).__new__(cls, val, base)
-            except TypeError:
-                return super(newint, cls).__new__(cls, newbytes(val), base)
-        # After here, base is 10
-        try:
-            return super(newint, cls).__new__(cls, val)
-        except TypeError:
-            # Py2 long doesn't handle bytearray input with an explicit base, so
-            # handle this here.
-            # Py3: int(bytearray(b'10'), 2) == 2
-            # Py2: int(bytearray(b'10'), 2) == 2 raises TypeError
-            # Py2: long(bytearray(b'10'), 2) == 2 raises TypeError
-            try:
-                return super(newint, cls).__new__(cls, newbytes(val))
-            except:
-                raise TypeError("newint argument must be a string or a number,"
-                                "not '{0}'".format(type(val)))
-
-    def __repr__(self):
-        """
-        Without the L suffix
-        """
-        value = super(newint, self).__repr__()
-        assert value[-1] == 'L'
-        return value[:-1]
-
-    def __add__(self, other):
-        value = super(newint, self).__add__(other)
-        if value is NotImplemented:
-            return long(self) + other
-        return newint(value)
-
-    def __radd__(self, other):
-        value = super(newint, self).__radd__(other)
-        if value is NotImplemented:
-            return other + long(self)
-        return newint(value)
-
-    def __sub__(self, other):
-        value = super(newint, self).__sub__(other)
-        if value is NotImplemented:
-            return long(self) - other
-        return newint(value)
-
-    def __rsub__(self, other):
-        value = super(newint, self).__rsub__(other)
-        if value is NotImplemented:
-            return other - long(self)
-        return newint(value)
-
-    def __mul__(self, other):
-        value = super(newint, self).__mul__(other)
-        if isint(value):
-            return newint(value)
-        elif value is NotImplemented:
-            return long(self) * other
-        return value
-
-    def __rmul__(self, other):
-        value = super(newint, self).__rmul__(other)
-        if isint(value):
-            return newint(value)
-        elif value is NotImplemented:
-            return other * long(self)
-        return value
-
-    def __div__(self, other):
-        # We override this rather than e.g. relying on object.__div__ or
-        # long.__div__ because we want to wrap the value in a newint()
-        # call if other is another int
-        value = long(self) / other
-        if isinstance(other, (int, long)):
-            return newint(value)
-        else:
-            return value
-
-    def __rdiv__(self, other):
-        value = other / long(self)
-        if isinstance(other, (int, long)):
-            return newint(value)
-        else:
-            return value
-
-    def __idiv__(self, other):
-        # long has no __idiv__ method. Use __itruediv__ and cast back to
-        # newint:
-        value = self.__itruediv__(other)
-        if isinstance(other, (int, long)):
-            return newint(value)
-        else:
-            return value
-
-    def __truediv__(self, other):
-        value = super(newint, self).__truediv__(other)
-        if value is NotImplemented:
-            value = long(self) / other
-        return value
-
-    def __rtruediv__(self, other):
-        return super(newint, self).__rtruediv__(other)
-
-    def __itruediv__(self, other):
-        # long has no __itruediv__ method
-        mylong = long(self)
-        mylong /= other
-        return mylong
-
-    def __floordiv__(self, other):
-        return newint(super(newint, self).__floordiv__(other))
-
-    def __rfloordiv__(self, other):
-        return newint(super(newint, self).__rfloordiv__(other))
-
-    def __ifloordiv__(self, other):
-        # long has no __ifloordiv__ method
-        mylong = long(self)
-        mylong //= other
-        return newint(mylong)
-
-    def __mod__(self, other):
-        value = super(newint, self).__mod__(other)
-        if value is NotImplemented:
-            return long(self) % other
-        return newint(value)
-
-    def __rmod__(self, other):
-        value = super(newint, self).__rmod__(other)
-        if value is NotImplemented:
-            return other % long(self)
-        return newint(value)
-
-    def __divmod__(self, other):
-        value = super(newint, self).__divmod__(other)
-        if value is NotImplemented:
-            mylong = long(self)
-            return (mylong // other, mylong % other)
-        return (newint(value[0]), newint(value[1]))
-
-    def __rdivmod__(self, other):
-        value = super(newint, self).__rdivmod__(other)
-        if value is NotImplemented:
-            mylong = long(self)
-            return (other // mylong, other % mylong)
-        return (newint(value[0]), newint(value[1]))
-
-    def __pow__(self, other):
-        value = super(newint, self).__pow__(other)
-        if value is NotImplemented:
-            return long(self) ** other
-        return newint(value)
-
-    def __rpow__(self, other):
-        value = super(newint, self).__rpow__(other)
-        if isint(value):
-            return newint(value)
-        elif value is NotImplemented:
-            return other ** long(self)
-        return value
-
-    def __lshift__(self, other):
-        if not isint(other):
-            raise TypeError(
-                "unsupported operand type(s) for <<: '%s' and '%s'" %
-                (type(self).__name__, type(other).__name__))
-        return newint(super(newint, self).__lshift__(other))
-
-    def __rshift__(self, other):
-        if not isint(other):
-            raise TypeError(
-                "unsupported operand type(s) for >>: '%s' and '%s'" %
-                (type(self).__name__, type(other).__name__))
-        return newint(super(newint, self).__rshift__(other))
-
-    def __and__(self, other):
-        if not isint(other):
-            raise TypeError(
-                "unsupported operand type(s) for &: '%s' and '%s'" %
-                (type(self).__name__, type(other).__name__))
-        return newint(super(newint, self).__and__(other))
-
-    def __or__(self, other):
-        if not isint(other):
-            raise TypeError(
-                "unsupported operand type(s) for |: '%s' and '%s'" %
-                (type(self).__name__, type(other).__name__))
-        return newint(super(newint, self).__or__(other))
-
-    def __xor__(self, other):
-        if not isint(other):
-            raise TypeError(
-                "unsupported operand type(s) for ^: '%s' and '%s'" %
-                (type(self).__name__, type(other).__name__))
-        return newint(super(newint, self).__xor__(other))
-
-    def __neg__(self):
-        return newint(super(newint, self).__neg__())
-
-    def __pos__(self):
-        return newint(super(newint, self).__pos__())
-
-    def __abs__(self):
-        return newint(super(newint, self).__abs__())
-
-    def __invert__(self):
-        return newint(super(newint, self).__invert__())
-
-    def __int__(self):
-        return self
-
-    def __nonzero__(self):
-        return self.__bool__()
-
-    def __bool__(self):
-        """
-        So subclasses can override this, Py3-style
-        """
-        if PY3:
-            return super(newint, self).__bool__()
-
-        return super(newint, self).__nonzero__()
-
-    def __native__(self):
-        return long(self)
-
-    def to_bytes(self, length, byteorder='big', signed=False):
-        """
-        Return an array of bytes representing an integer.
-
-        The integer is represented using length bytes.  An OverflowError is
-        raised if the integer is not representable with the given number of
-        bytes.
-
-        The byteorder argument determines the byte order used to represent the
-        integer.  If byteorder is 'big', the most significant byte is at the
-        beginning of the byte array.  If byteorder is 'little', the most
-        significant byte is at the end of the byte array.  To request the native
-        byte order of the host system, use `sys.byteorder' as the byte order value.
-
-        The signed keyword-only argument determines whether two's complement is
-        used to represent the integer.  If signed is False and a negative integer
-        is given, an OverflowError is raised.
-        """
-        if length < 0:
-            raise ValueError("length argument must be non-negative")
-        if length == 0 and self == 0:
-            return newbytes()
-        if signed and self < 0:
-            bits = length * 8
-            num = (2**bits) + self
-            if num <= 0:
-                raise OverflowError("int too small to convert")
-        else:
-            if self < 0:
-                raise OverflowError("can't convert negative int to unsigned")
-            num = self
-        if byteorder not in ('little', 'big'):
-            raise ValueError("byteorder must be either 'little' or 'big'")
-        h = b'%x' % num
-        s = newbytes((b'0'*(len(h) % 2) + h).zfill(length*2).decode('hex'))
-        if signed:
-            high_set = s[0] & 0x80
-            if self > 0 and high_set:
-                raise OverflowError("int too big to convert")
-            if self < 0 and not high_set:
-                raise OverflowError("int too small to convert")
-        if len(s) > length:
-            raise OverflowError("int too big to convert")
-        return s if byteorder == 'big' else s[::-1]
-
-    @classmethod
-    def from_bytes(cls, mybytes, byteorder='big', signed=False):
-        """
-        Return the integer represented by the given array of bytes.
-
-        The mybytes argument must either support the buffer protocol or be an
-        iterable object producing bytes.  Bytes and bytearray are examples of
-        built-in objects that support the buffer protocol.
-
-        The byteorder argument determines the byte order used to represent the
-        integer.  If byteorder is 'big', the most significant byte is at the
-        beginning of the byte array.  If byteorder is 'little', the most
-        significant byte is at the end of the byte array.  To request the native
-        byte order of the host system, use `sys.byteorder' as the byte order value.
-
-        The signed keyword-only argument indicates whether two's complement is
-        used to represent the integer.
-        """
-        if byteorder not in ('little', 'big'):
-            raise ValueError("byteorder must be either 'little' or 'big'")
-        if isinstance(mybytes, unicode):
-            raise TypeError("cannot convert unicode objects to bytes")
-        # mybytes can also be passed as a sequence of integers on Py3.
-        # Test for this:
-        elif isinstance(mybytes, Iterable):
-            mybytes = newbytes(mybytes)
-        b = mybytes if byteorder == 'big' else mybytes[::-1]
-        if len(b) == 0:
-            b = b'\x00'
-        # The encode() method has been disabled by newbytes, but Py2's
-        # str has it:
-        num = int(native(b).encode('hex'), 16)
-        if signed and (b[0] & 0x80):
-            num = num - (2 ** (len(b)*8))
-        return cls(num)
-
-
-# def _twos_comp(val, bits):
-#     """compute the 2's compliment of int value val"""
-#     if( (val&(1<<(bits-1))) != 0 ):
-#         val = val - (1<<bits)
-#     return val
-
-
-__all__ = ['newint']
diff --git a/lib/future/types/newlist.py b/lib/future/types/newlist.py
deleted file mode 100644
index 74d8f6ce..00000000
--- a/lib/future/types/newlist.py
+++ /dev/null
@@ -1,95 +0,0 @@
-"""
-A list subclass for Python 2 that behaves like Python 3's list.
-
-The primary difference is that lists have a .copy() method in Py3.
-
-Example use:
-
->>> from builtins import list
->>> l1 = list()    # instead of {} for an empty list
->>> l1.append('hello')
->>> l2 = l1.copy()
-
-"""
-
-import sys
-import copy
-
-from future.utils import with_metaclass
-from future.types.newobject import newobject
-
-
-_builtin_list = list
-ver = sys.version_info[:2]
-
-
-class BaseNewList(type):
-    def __instancecheck__(cls, instance):
-        if cls == newlist:
-            return isinstance(instance, _builtin_list)
-        else:
-            return issubclass(instance.__class__, cls)
-
-
-class newlist(with_metaclass(BaseNewList, _builtin_list)):
-    """
-    A backport of the Python 3 list object to Py2
-    """
-    def copy(self):
-        """
-        L.copy() -> list -- a shallow copy of L
-        """
-        return copy.copy(self)
-
-    def clear(self):
-        """L.clear() -> None -- remove all items from L"""
-        for i in range(len(self)):
-            self.pop()
-
-    def __new__(cls, *args, **kwargs):
-        """
-        list() -> new empty list
-        list(iterable) -> new list initialized from iterable's items
-        """
-
-        if len(args) == 0:
-            return super(newlist, cls).__new__(cls)
-        elif type(args[0]) == newlist:
-            value = args[0]
-        else:
-            value = args[0]
-        return super(newlist, cls).__new__(cls, value)
-
-    def __add__(self, value):
-        return newlist(super(newlist, self).__add__(value))
-
-    def __radd__(self, left):
-        " left + self "
-        try:
-            return newlist(left) + self
-        except:
-            return NotImplemented
-
-    def __getitem__(self, y):
-        """
-        x.__getitem__(y) <==> x[y]
-
-        Warning: a bug in Python 2.x prevents indexing via a slice from
-        returning a newlist object.
-        """
-        if isinstance(y, slice):
-            return newlist(super(newlist, self).__getitem__(y))
-        else:
-            return super(newlist, self).__getitem__(y)
-
-    def __native__(self):
-        """
-        Hook for the future.utils.native() function
-        """
-        return list(self)
-
-    def __nonzero__(self):
-        return len(self) > 0
-
-
-__all__ = ['newlist']
diff --git a/lib/future/types/newmemoryview.py b/lib/future/types/newmemoryview.py
deleted file mode 100644
index 09f804dc..00000000
--- a/lib/future/types/newmemoryview.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""
-A pretty lame implementation of a memoryview object for Python 2.6.
-"""
-from numbers import Integral
-import string
-
-from future.utils import istext, isbytes, PY2, with_metaclass
-from future.types import no, issubset
-
-if PY2:
-    from collections import Iterable
-else:
-    from collections.abc import Iterable
-
-# class BaseNewBytes(type):
-#     def __instancecheck__(cls, instance):
-#         return isinstance(instance, _builtin_bytes)
-
-
-class newmemoryview(object):   # with_metaclass(BaseNewBytes, _builtin_bytes)):
-    """
-    A pretty lame backport of the Python 2.7 and Python 3.x
-    memoryviewview object to Py2.6.
-    """
-    def __init__(self, obj):
-        return obj
-
-
-__all__ = ['newmemoryview']
diff --git a/lib/future/types/newobject.py b/lib/future/types/newobject.py
deleted file mode 100644
index 31b84fc1..00000000
--- a/lib/future/types/newobject.py
+++ /dev/null
@@ -1,117 +0,0 @@
-"""
-An object subclass for Python 2 that gives new-style classes written in the
-style of Python 3 (with ``__next__`` and unicode-returning ``__str__`` methods)
-the appropriate Python 2-style ``next`` and ``__unicode__`` methods for compatible.
-
-Example use::
-
-    from builtins import object
-
-    my_unicode_str = u'Unicode string: \u5b54\u5b50'
-
-    class A(object):
-        def __str__(self):
-            return my_unicode_str
-
-    a = A()
-    print(str(a))
-
-    # On Python 2, these relations hold:
-    assert unicode(a) == my_unicode_string
-    assert str(a) == my_unicode_string.encode('utf-8')
-
-
-Another example::
-
-    from builtins import object
-
-    class Upper(object):
-        def __init__(self, iterable):
-            self._iter = iter(iterable)
-        def __next__(self):                 # note the Py3 interface
-            return next(self._iter).upper()
-        def __iter__(self):
-            return self
-
-    assert list(Upper('hello')) == list('HELLO')
-
-"""
-
-
-class newobject(object):
-    """
-    A magical object class that provides Python 2 compatibility methods::
-        next
-        __unicode__
-        __nonzero__
-
-    Subclasses of this class can merely define the Python 3 methods (__next__,
-    __str__, and __bool__).
-    """
-    def next(self):
-        if hasattr(self, '__next__'):
-            return type(self).__next__(self)
-        raise TypeError('newobject is not an iterator')
-
-    def __unicode__(self):
-        # All subclasses of the builtin object should have __str__ defined.
-        # Note that old-style classes do not have __str__ defined.
-        if hasattr(self, '__str__'):
-            s = type(self).__str__(self)
-        else:
-            s = str(self)
-        if isinstance(s, unicode):
-            return s
-        else:
-            return s.decode('utf-8')
-
-    def __nonzero__(self):
-        if hasattr(self, '__bool__'):
-            return type(self).__bool__(self)
-        if hasattr(self, '__len__'):
-            return type(self).__len__(self)
-        # object has no __nonzero__ method
-        return True
-
-    # Are these ever needed?
-    # def __div__(self):
-    #     return self.__truediv__()
-
-    # def __idiv__(self, other):
-    #     return self.__itruediv__(other)
-
-    def __long__(self):
-        if not hasattr(self, '__int__'):
-            return NotImplemented
-        return self.__int__()  # not type(self).__int__(self)
-
-    # def __new__(cls, *args, **kwargs):
-    #     """
-    #     dict() -> new empty dictionary
-    #     dict(mapping) -> new dictionary initialized from a mapping object's
-    #         (key, value) pairs
-    #     dict(iterable) -> new dictionary initialized as if via:
-    #         d = {}
-    #         for k, v in iterable:
-    #             d[k] = v
-    #     dict(**kwargs) -> new dictionary initialized with the name=value pairs
-    #         in the keyword argument list.  For example:  dict(one=1, two=2)
-    #     """
-
-    #     if len(args) == 0:
-    #         return super(newdict, cls).__new__(cls)
-    #     elif type(args[0]) == newdict:
-    #         return args[0]
-    #     else:
-    #         value = args[0]
-    #     return super(newdict, cls).__new__(cls, value)
-
-    def __native__(self):
-        """
-        Hook for the future.utils.native() function
-        """
-        return object(self)
-
-    __slots__ = []
-
-__all__ = ['newobject']
diff --git a/lib/future/types/newopen.py b/lib/future/types/newopen.py
deleted file mode 100644
index b75d45af..00000000
--- a/lib/future/types/newopen.py
+++ /dev/null
@@ -1,32 +0,0 @@
-"""
-A substitute for the Python 3 open() function.
-
-Note that io.open() is more complete but maybe slower. Even so, the
-completeness may be a better default. TODO: compare these
-"""
-
-_builtin_open = open
-
-class newopen(object):
-    """Wrapper providing key part of Python 3 open() interface.
-
-    From IPython's py3compat.py module. License: BSD.
-    """
-    def __init__(self, fname, mode="r", encoding="utf-8"):
-        self.f = _builtin_open(fname, mode)
-        self.enc = encoding
-
-    def write(self, s):
-        return self.f.write(s.encode(self.enc))
-
-    def read(self, size=-1):
-        return self.f.read(size).decode(self.enc)
-
-    def close(self):
-        return self.f.close()
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, etype, value, traceback):
-        self.f.close()
diff --git a/lib/future/types/newrange.py b/lib/future/types/newrange.py
deleted file mode 100644
index dc5eb802..00000000
--- a/lib/future/types/newrange.py
+++ /dev/null
@@ -1,170 +0,0 @@
-"""
-Nearly identical to xrange.py, by Dan Crosta, from
-
-    https://github.com/dcrosta/xrange.git
-
-This is included here in the ``future`` package rather than pointed to as
-a dependency because there is no package for ``xrange`` on PyPI. It is
-also tweaked to appear like a regular Python 3 ``range`` object rather
-than a Python 2 xrange.
-
-From Dan Crosta's README:
-
-    "A pure-Python implementation of Python 2.7's xrange built-in, with
-    some features backported from the Python 3.x range built-in (which
-    replaced xrange) in that version."
-
-    Read more at
-        https://late.am/post/2012/06/18/what-the-heck-is-an-xrange
-"""
-from __future__ import absolute_import
-
-from future.utils import PY2
-
-if PY2:
-    from collections import Sequence, Iterator
-else:
-    from collections.abc import Sequence, Iterator
-from itertools import islice
-
-from future.backports.misc import count   # with step parameter on Py2.6
-# For backward compatibility with python-future versions < 0.14.4:
-_count = count
-
-
-class newrange(Sequence):
-    """
-    Pure-Python backport of Python 3's range object.  See `the CPython
-    documentation for details:
-    <http://docs.python.org/py3k/library/functions.html#range>`_
-    """
-
-    def __init__(self, *args):
-        if len(args) == 1:
-            start, stop, step = 0, args[0], 1
-        elif len(args) == 2:
-            start, stop, step = args[0], args[1], 1
-        elif len(args) == 3:
-            start, stop, step = args
-        else:
-            raise TypeError('range() requires 1-3 int arguments')
-
-        try:
-            start, stop, step = int(start), int(stop), int(step)
-        except ValueError:
-            raise TypeError('an integer is required')
-
-        if step == 0:
-            raise ValueError('range() arg 3 must not be zero')
-        elif step < 0:
-            stop = min(stop, start)
-        else:
-            stop = max(stop, start)
-
-        self._start = start
-        self._stop = stop
-        self._step = step
-        self._len = (stop - start) // step + bool((stop - start) % step)
-
-    @property
-    def start(self):
-        return self._start
-
-    @property
-    def stop(self):
-        return self._stop
-
-    @property
-    def step(self):
-        return self._step
-
-    def __repr__(self):
-        if self._step == 1:
-            return 'range(%d, %d)' % (self._start, self._stop)
-        return 'range(%d, %d, %d)' % (self._start, self._stop, self._step)
-
-    def __eq__(self, other):
-        return (isinstance(other, newrange) and
-                (self._len == 0 == other._len or
-                 (self._start, self._step, self._len) ==
-                 (other._start, other._step, other._len)))
-
-    def __len__(self):
-        return self._len
-
-    def index(self, value):
-        """Return the 0-based position of integer `value` in
-        the sequence this range represents."""
-        try:
-            diff = value - self._start
-        except TypeError:
-            raise ValueError('%r is not in range' % value)
-        quotient, remainder = divmod(diff, self._step)
-        if remainder == 0 and 0 <= quotient < self._len:
-            return abs(quotient)
-        raise ValueError('%r is not in range' % value)
-
-    def count(self, value):
-        """Return the number of occurrences of integer `value`
-        in the sequence this range represents."""
-        # a value can occur exactly zero or one times
-        return int(value in self)
-
-    def __contains__(self, value):
-        """Return ``True`` if the integer `value` occurs in
-        the sequence this range represents."""
-        try:
-            self.index(value)
-            return True
-        except ValueError:
-            return False
-
-    def __reversed__(self):
-        return iter(self[::-1])
-
-    def __getitem__(self, index):
-        """Return the element at position ``index`` in the sequence
-        this range represents, or raise :class:`IndexError` if the
-        position is out of range."""
-        if isinstance(index, slice):
-            return self.__getitem_slice(index)
-        if index < 0:
-            # negative indexes access from the end
-            index = self._len + index
-        if index < 0 or index >= self._len:
-            raise IndexError('range object index out of range')
-        return self._start + index * self._step
-
-    def __getitem_slice(self, slce):
-        """Return a range which represents the requested slce
-        of the sequence represented by this range.
-        """
-        scaled_indices = (self._step * n for n in slce.indices(self._len))
-        start_offset, stop_offset, new_step = scaled_indices
-        return newrange(self._start + start_offset,
-                        self._start + stop_offset,
-                        new_step)
-
-    def __iter__(self):
-        """Return an iterator which enumerates the elements of the
-        sequence this range represents."""
-        return range_iterator(self)
-
-
-class range_iterator(Iterator):
-    """An iterator for a :class:`range`.
-    """
-    def __init__(self, range_):
-        self._stepper = islice(count(range_.start, range_.step), len(range_))
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        return next(self._stepper)
-
-    def next(self):
-        return next(self._stepper)
-
-
-__all__ = ['newrange']
diff --git a/lib/future/types/newstr.py b/lib/future/types/newstr.py
deleted file mode 100644
index 8ca191f9..00000000
--- a/lib/future/types/newstr.py
+++ /dev/null
@@ -1,426 +0,0 @@
-"""
-This module redefines ``str`` on Python 2.x to be a subclass of the Py2
-``unicode`` type that behaves like the Python 3.x ``str``.
-
-The main differences between ``newstr`` and Python 2.x's ``unicode`` type are
-the stricter type-checking and absence of a `u''` prefix in the representation.
-
-It is designed to be used together with the ``unicode_literals`` import
-as follows:
-
-    >>> from __future__ import unicode_literals
-    >>> from builtins import str, isinstance
-
-On Python 3.x and normally on Python 2.x, these expressions hold
-
-    >>> str('blah') is 'blah'
-    True
-    >>> isinstance('blah', str)
-    True
-
-However, on Python 2.x, with this import:
-
-    >>> from __future__ import unicode_literals
-
-the same expressions are False:
-
-    >>> str('blah') is 'blah'
-    False
-    >>> isinstance('blah', str)
-    False
-
-This module is designed to be imported together with ``unicode_literals`` on
-Python 2 to bring the meaning of ``str`` back into alignment with unprefixed
-string literals (i.e. ``unicode`` subclasses).
-
-Note that ``str()`` (and ``print()``) would then normally call the
-``__unicode__`` method on objects in Python 2. To define string
-representations of your objects portably across Py3 and Py2, use the
-:func:`python_2_unicode_compatible` decorator in  :mod:`future.utils`.
-
-"""
-
-from numbers import Number
-
-from future.utils import PY3, istext, with_metaclass, isnewbytes
-from future.types import no, issubset
-from future.types.newobject import newobject
-
-
-if PY3:
-    # We'll probably never use newstr on Py3 anyway...
-    unicode = str
-    from collections.abc import Iterable
-else:
-    from collections import Iterable
-
-
-class BaseNewStr(type):
-    def __instancecheck__(cls, instance):
-        if cls == newstr:
-            return isinstance(instance, unicode)
-        else:
-            return issubclass(instance.__class__, cls)
-
-
-class newstr(with_metaclass(BaseNewStr, unicode)):
-    """
-    A backport of the Python 3 str object to Py2
-    """
-    no_convert_msg = "Can't convert '{0}' object to str implicitly"
-
-    def __new__(cls, *args, **kwargs):
-        """
-        From the Py3 str docstring:
-
-          str(object='') -> str
-          str(bytes_or_buffer[, encoding[, errors]]) -> str
-
-          Create a new string object from the given object. If encoding or
-          errors is specified, then the object must expose a data buffer
-          that will be decoded using the given encoding and error handler.
-          Otherwise, returns the result of object.__str__() (if defined)
-          or repr(object).
-          encoding defaults to sys.getdefaultencoding().
-          errors defaults to 'strict'.
-
-        """
-        if len(args) == 0:
-            return super(newstr, cls).__new__(cls)
-        # Special case: If someone requests str(str(u'abc')), return the same
-        # object (same id) for consistency with Py3.3. This is not true for
-        # other objects like list or dict.
-        elif type(args[0]) == newstr and cls == newstr:
-            return args[0]
-        elif isinstance(args[0], unicode):
-            value = args[0]
-        elif isinstance(args[0], bytes):   # i.e. Py2 bytes or newbytes
-            if 'encoding' in kwargs or len(args) > 1:
-                value = args[0].decode(*args[1:], **kwargs)
-            else:
-                value = args[0].__str__()
-        else:
-            value = args[0]
-        return super(newstr, cls).__new__(cls, value)
-
-    def __repr__(self):
-        """
-        Without the u prefix
-        """
-
-        value = super(newstr, self).__repr__()
-        # assert value[0] == u'u'
-        return value[1:]
-
-    def __getitem__(self, y):
-        """
-        Warning: Python <= 2.7.6 has a bug that causes this method never to be called
-        when y is a slice object. Therefore the type of newstr()[:2] is wrong
-        (unicode instead of newstr).
-        """
-        return newstr(super(newstr, self).__getitem__(y))
-
-    def __contains__(self, key):
-        errmsg = "'in <string>' requires string as left operand, not {0}"
-        # Don't use isinstance() here because we only want to catch
-        # newstr, not Python 2 unicode:
-        if type(key) == newstr:
-            newkey = key
-        elif isinstance(key, unicode) or isinstance(key, bytes) and not isnewbytes(key):
-            newkey = newstr(key)
-        else:
-            raise TypeError(errmsg.format(type(key)))
-        return issubset(list(newkey), list(self))
-
-    @no('newbytes')
-    def __add__(self, other):
-        return newstr(super(newstr, self).__add__(other))
-
-    @no('newbytes')
-    def __radd__(self, left):
-        " left + self "
-        try:
-            return newstr(left) + self
-        except:
-            return NotImplemented
-
-    def __mul__(self, other):
-        return newstr(super(newstr, self).__mul__(other))
-
-    def __rmul__(self, other):
-        return newstr(super(newstr, self).__rmul__(other))
-
-    def join(self, iterable):
-        errmsg = 'sequence item {0}: expected unicode string, found bytes'
-        for i, item in enumerate(iterable):
-            # Here we use type() rather than isinstance() because
-            # __instancecheck__ is being overridden. E.g.
-            # isinstance(b'abc', newbytes) is True on Py2.
-            if isnewbytes(item):
-                raise TypeError(errmsg.format(i))
-        # Support use as a staticmethod: str.join('-', ['a', 'b'])
-        if type(self) == newstr:
-            return newstr(super(newstr, self).join(iterable))
-        else:
-            return newstr(super(newstr, newstr(self)).join(iterable))
-
-    @no('newbytes')
-    def find(self, sub, *args):
-        return super(newstr, self).find(sub, *args)
-
-    @no('newbytes')
-    def rfind(self, sub, *args):
-        return super(newstr, self).rfind(sub, *args)
-
-    @no('newbytes', (1, 2))
-    def replace(self, old, new, *args):
-        return newstr(super(newstr, self).replace(old, new, *args))
-
-    def decode(self, *args):
-        raise AttributeError("decode method has been disabled in newstr")
-
-    def encode(self, encoding='utf-8', errors='strict'):
-        """
-        Returns bytes
-
-        Encode S using the codec registered for encoding. Default encoding
-        is 'utf-8'. errors may be given to set a different error
-        handling scheme. Default is 'strict' meaning that encoding errors raise
-        a UnicodeEncodeError. Other possible values are 'ignore', 'replace' and
-        'xmlcharrefreplace' as well as any other name registered with
-        codecs.register_error that can handle UnicodeEncodeErrors.
-        """
-        from future.types.newbytes import newbytes
-        # Py2 unicode.encode() takes encoding and errors as optional parameter,
-        # not keyword arguments as in Python 3 str.
-
-        # For the surrogateescape error handling mechanism, the
-        # codecs.register_error() function seems to be inadequate for an
-        # implementation of it when encoding. (Decoding seems fine, however.)
-        # For example, in the case of
-        #     u'\udcc3'.encode('ascii', 'surrogateescape_handler')
-        # after registering the ``surrogateescape_handler`` function in
-        # future.utils.surrogateescape, both Python 2.x and 3.x raise an
-        # exception anyway after the function is called because the unicode
-        # string it has to return isn't encodable strictly as ASCII.
-
-        if errors == 'surrogateescape':
-            if encoding == 'utf-16':
-                # Known to fail here. See test_encoding_works_normally()
-                raise NotImplementedError('FIXME: surrogateescape handling is '
-                                          'not yet implemented properly')
-            # Encode char by char, building up list of byte-strings
-            mybytes = []
-            for c in self:
-                code = ord(c)
-                if 0xD800 <= code <= 0xDCFF:
-                    mybytes.append(newbytes([code - 0xDC00]))
-                else:
-                    mybytes.append(c.encode(encoding=encoding))
-            return newbytes(b'').join(mybytes)
-        return newbytes(super(newstr, self).encode(encoding, errors))
-
-    @no('newbytes', 1)
-    def startswith(self, prefix, *args):
-        if isinstance(prefix, Iterable):
-            for thing in prefix:
-                if isnewbytes(thing):
-                    raise TypeError(self.no_convert_msg.format(type(thing)))
-        return super(newstr, self).startswith(prefix, *args)
-
-    @no('newbytes', 1)
-    def endswith(self, prefix, *args):
-        # Note we need the decorator above as well as the isnewbytes()
-        # check because prefix can be either a bytes object or e.g. a
-        # tuple of possible prefixes. (If it's a bytes object, each item
-        # in it is an int.)
-        if isinstance(prefix, Iterable):
-            for thing in prefix:
-                if isnewbytes(thing):
-                    raise TypeError(self.no_convert_msg.format(type(thing)))
-        return super(newstr, self).endswith(prefix, *args)
-
-    @no('newbytes', 1)
-    def split(self, sep=None, maxsplit=-1):
-        # Py2 unicode.split() takes maxsplit as an optional parameter,
-        # not as a keyword argument as in Python 3 str.
-        parts = super(newstr, self).split(sep, maxsplit)
-        return [newstr(part) for part in parts]
-
-    @no('newbytes', 1)
-    def rsplit(self, sep=None, maxsplit=-1):
-        # Py2 unicode.rsplit() takes maxsplit as an optional parameter,
-        # not as a keyword argument as in Python 3 str.
-        parts = super(newstr, self).rsplit(sep, maxsplit)
-        return [newstr(part) for part in parts]
-
-    @no('newbytes', 1)
-    def partition(self, sep):
-        parts = super(newstr, self).partition(sep)
-        return tuple(newstr(part) for part in parts)
-
-    @no('newbytes', 1)
-    def rpartition(self, sep):
-        parts = super(newstr, self).rpartition(sep)
-        return tuple(newstr(part) for part in parts)
-
-    @no('newbytes', 1)
-    def index(self, sub, *args):
-        """
-        Like newstr.find() but raise ValueError when the substring is not
-        found.
-        """
-        pos = self.find(sub, *args)
-        if pos == -1:
-            raise ValueError('substring not found')
-        return pos
-
-    def splitlines(self, keepends=False):
-        """
-        S.splitlines(keepends=False) -> list of strings
-
-        Return a list of the lines in S, breaking at line boundaries.
-        Line breaks are not included in the resulting list unless keepends
-        is given and true.
-        """
-        # Py2 unicode.splitlines() takes keepends as an optional parameter,
-        # not as a keyword argument as in Python 3 str.
-        parts = super(newstr, self).splitlines(keepends)
-        return [newstr(part) for part in parts]
-
-    def __eq__(self, other):
-        if (isinstance(other, unicode) or
-            isinstance(other, bytes) and not isnewbytes(other)):
-            return super(newstr, self).__eq__(other)
-        else:
-            return NotImplemented
-
-    def __hash__(self):
-        if (isinstance(self, unicode) or
-            isinstance(self, bytes) and not isnewbytes(self)):
-            return super(newstr, self).__hash__()
-        else:
-            raise NotImplementedError()
-
-    def __ne__(self, other):
-        if (isinstance(other, unicode) or
-            isinstance(other, bytes) and not isnewbytes(other)):
-            return super(newstr, self).__ne__(other)
-        else:
-            return True
-
-    unorderable_err = 'unorderable types: str() and {0}'
-
-    def __lt__(self, other):
-        if (isinstance(other, unicode) or
-            isinstance(other, bytes) and not isnewbytes(other)):
-            return super(newstr, self).__lt__(other)
-        raise TypeError(self.unorderable_err.format(type(other)))
-
-    def __le__(self, other):
-        if (isinstance(other, unicode) or
-            isinstance(other, bytes) and not isnewbytes(other)):
-            return super(newstr, self).__le__(other)
-        raise TypeError(self.unorderable_err.format(type(other)))
-
-    def __gt__(self, other):
-        if (isinstance(other, unicode) or
-            isinstance(other, bytes) and not isnewbytes(other)):
-            return super(newstr, self).__gt__(other)
-        raise TypeError(self.unorderable_err.format(type(other)))
-
-    def __ge__(self, other):
-        if (isinstance(other, unicode) or
-            isinstance(other, bytes) and not isnewbytes(other)):
-            return super(newstr, self).__ge__(other)
-        raise TypeError(self.unorderable_err.format(type(other)))
-
-    def __getattribute__(self, name):
-        """
-        A trick to cause the ``hasattr`` builtin-fn to return False for
-        the 'decode' method on Py2.
-        """
-        if name in ['decode', u'decode']:
-            raise AttributeError("decode method has been disabled in newstr")
-        return super(newstr, self).__getattribute__(name)
-
-    def __native__(self):
-        """
-        A hook for the future.utils.native() function.
-        """
-        return unicode(self)
-
-    @staticmethod
-    def maketrans(x, y=None, z=None):
-        """
-        Return a translation table usable for str.translate().
-
-        If there is only one argument, it must be a dictionary mapping Unicode
-        ordinals (integers) or characters to Unicode ordinals, strings or None.
-        Character keys will be then converted to ordinals.
-        If there are two arguments, they must be strings of equal length, and
-        in the resulting dictionary, each character in x will be mapped to the
-        character at the same position in y. If there is a third argument, it
-        must be a string, whose characters will be mapped to None in the result.
-        """
-
-        if y is None:
-            assert z is None
-            if not isinstance(x, dict):
-                raise TypeError('if you give only one argument to maketrans it must be a dict')
-            result = {}
-            for (key, value) in x.items():
-                if len(key) > 1:
-                    raise ValueError('keys in translate table must be strings or integers')
-                result[ord(key)] = value
-        else:
-            if not isinstance(x, unicode) and isinstance(y, unicode):
-                raise TypeError('x and y must be unicode strings')
-            if not len(x) == len(y):
-                raise ValueError('the first two maketrans arguments must have equal length')
-            result = {}
-            for (xi, yi) in zip(x, y):
-                if len(xi) > 1:
-                    raise ValueError('keys in translate table must be strings or integers')
-                result[ord(xi)] = ord(yi)
-
-        if z is not None:
-            for char in z:
-                result[ord(char)] = None
-        return result
-
-    def translate(self, table):
-        """
-        S.translate(table) -> str
-
-        Return a copy of the string S, where all characters have been mapped
-        through the given translation table, which must be a mapping of
-        Unicode ordinals to Unicode ordinals, strings, or None.
-        Unmapped characters are left untouched. Characters mapped to None
-        are deleted.
-        """
-        l = []
-        for c in self:
-            if ord(c) in table:
-                val = table[ord(c)]
-                if val is None:
-                    continue
-                elif isinstance(val, unicode):
-                    l.append(val)
-                else:
-                    l.append(chr(val))
-            else:
-                l.append(c)
-        return ''.join(l)
-
-    def isprintable(self):
-        raise NotImplementedError('fixme')
-
-    def isidentifier(self):
-        raise NotImplementedError('fixme')
-
-    def format_map(self):
-        raise NotImplementedError('fixme')
-
-
-__all__ = ['newstr']
diff --git a/lib/future/utils/__init__.py b/lib/future/utils/__init__.py
deleted file mode 100644
index ec1b1027..00000000
--- a/lib/future/utils/__init__.py
+++ /dev/null
@@ -1,770 +0,0 @@
-"""
-A selection of cross-compatible functions for Python 2 and 3.
-
-This module exports useful functions for 2/3 compatible code:
-
-    * bind_method: binds functions to classes
-    * ``native_str_to_bytes`` and ``bytes_to_native_str``
-    * ``native_str``: always equal to the native platform string object (because
-      this may be shadowed by imports from future.builtins)
-    * lists: lrange(), lmap(), lzip(), lfilter()
-    * iterable method compatibility:
-        - iteritems, iterkeys, itervalues
-        - viewitems, viewkeys, viewvalues
-
-        These use the original method if available, otherwise they use items,
-        keys, values.
-
-    * types:
-
-        * text_type: unicode in Python 2, str in Python 3
-        * string_types: basestring in Python 2, str in Python 3
-        * binary_type: str in Python 2, bytes in Python 3
-        * integer_types: (int, long) in Python 2, int in Python 3
-        * class_types: (type, types.ClassType) in Python 2, type in Python 3
-
-    * bchr(c):
-        Take an integer and make a 1-character byte string
-    * bord(c)
-        Take the result of indexing on a byte string and make an integer
-    * tobytes(s)
-        Take a text string, a byte string, or a sequence of characters taken
-        from a byte string, and make a byte string.
-
-    * raise_from()
-    * raise_with_traceback()
-
-This module also defines these decorators:
-
-    * ``python_2_unicode_compatible``
-    * ``with_metaclass``
-    * ``implements_iterator``
-
-Some of the functions in this module come from the following sources:
-
-    * Jinja2 (BSD licensed: see
-      https://github.com/mitsuhiko/jinja2/blob/master/LICENSE)
-    * Pandas compatibility module pandas.compat
-    * six.py by Benjamin Peterson
-    * Django
-"""
-
-import types
-import sys
-import numbers
-import functools
-import copy
-import inspect
-
-
-PY3 = sys.version_info[0] >= 3
-PY34_PLUS = sys.version_info[0:2] >= (3, 4)
-PY35_PLUS = sys.version_info[0:2] >= (3, 5)
-PY36_PLUS = sys.version_info[0:2] >= (3, 6)
-PY37_PLUS = sys.version_info[0:2] >= (3, 7)
-PY38_PLUS = sys.version_info[0:2] >= (3, 8)
-PY39_PLUS = sys.version_info[0:2] >= (3, 9)
-PY2 = sys.version_info[0] == 2
-PY26 = sys.version_info[0:2] == (2, 6)
-PY27 = sys.version_info[0:2] == (2, 7)
-PYPY = hasattr(sys, 'pypy_translation_info')
-
-
-def python_2_unicode_compatible(cls):
-    """
-    A decorator that defines __unicode__ and __str__ methods under Python
-    2. Under Python 3, this decorator is a no-op.
-
-    To support Python 2 and 3 with a single code base, define a __str__
-    method returning unicode text and apply this decorator to the class, like
-    this::
-
-    >>> from future.utils import python_2_unicode_compatible
-
-    >>> @python_2_unicode_compatible
-    ... class MyClass(object):
-    ...     def __str__(self):
-    ...         return u'Unicode string: \u5b54\u5b50'
-
-    >>> a = MyClass()
-
-    Then, after this import:
-
-    >>> from future.builtins import str
-
-    the following is ``True`` on both Python 3 and 2::
-
-    >>> str(a) == a.encode('utf-8').decode('utf-8')
-    True
-
-    and, on a Unicode-enabled terminal with the right fonts, these both print the
-    Chinese characters for Confucius::
-
-    >>> print(a)
-    >>> print(str(a))
-
-    The implementation comes from django.utils.encoding.
-    """
-    if not PY3:
-        cls.__unicode__ = cls.__str__
-        cls.__str__ = lambda self: self.__unicode__().encode('utf-8')
-    return cls
-
-
-def with_metaclass(meta, *bases):
-    """
-    Function from jinja2/_compat.py. License: BSD.
-
-    Use it like this::
-
-        class BaseForm(object):
-            pass
-
-        class FormType(type):
-            pass
-
-        class Form(with_metaclass(FormType, BaseForm)):
-            pass
-
-    This requires a bit of explanation: the basic idea is to make a
-    dummy metaclass for one level of class instantiation that replaces
-    itself with the actual metaclass.  Because of internal type checks
-    we also need to make sure that we downgrade the custom metaclass
-    for one level to something closer to type (that's why __call__ and
-    __init__ comes back from type etc.).
-
-    This has the advantage over six.with_metaclass of not introducing
-    dummy classes into the final MRO.
-    """
-    class metaclass(meta):
-        __call__ = type.__call__
-        __init__ = type.__init__
-        def __new__(cls, name, this_bases, d):
-            if this_bases is None:
-                return type.__new__(cls, name, (), d)
-            return meta(name, bases, d)
-    return metaclass('temporary_class', None, {})
-
-
-# Definitions from pandas.compat and six.py follow:
-if PY3:
-    def bchr(s):
-        return bytes([s])
-    def bstr(s):
-        if isinstance(s, str):
-            return bytes(s, 'latin-1')
-        else:
-            return bytes(s)
-    def bord(s):
-        return s
-
-    string_types = str,
-    integer_types = int,
-    class_types = type,
-    text_type = str
-    binary_type = bytes
-
-else:
-    # Python 2
-    def bchr(s):
-        return chr(s)
-    def bstr(s):
-        return str(s)
-    def bord(s):
-        return ord(s)
-
-    string_types = basestring,
-    integer_types = (int, long)
-    class_types = (type, types.ClassType)
-    text_type = unicode
-    binary_type = str
-
-###
-
-if PY3:
-    def tobytes(s):
-        if isinstance(s, bytes):
-            return s
-        else:
-            if isinstance(s, str):
-                return s.encode('latin-1')
-            else:
-                return bytes(s)
-else:
-    # Python 2
-    def tobytes(s):
-        if isinstance(s, unicode):
-            return s.encode('latin-1')
-        else:
-            return ''.join(s)
-
-tobytes.__doc__ = """
-    Encodes to latin-1 (where the first 256 chars are the same as
-    ASCII.)
-    """
-
-if PY3:
-    def native_str_to_bytes(s, encoding='utf-8'):
-        return s.encode(encoding)
-
-    def bytes_to_native_str(b, encoding='utf-8'):
-        return b.decode(encoding)
-
-    def text_to_native_str(t, encoding=None):
-        return t
-else:
-    # Python 2
-    def native_str_to_bytes(s, encoding=None):
-        from future.types import newbytes    # to avoid a circular import
-        return newbytes(s)
-
-    def bytes_to_native_str(b, encoding=None):
-        return native(b)
-
-    def text_to_native_str(t, encoding='ascii'):
-        """
-        Use this to create a Py2 native string when "from __future__ import
-        unicode_literals" is in effect.
-        """
-        return unicode(t).encode(encoding)
-
-native_str_to_bytes.__doc__ = """
-    On Py3, returns an encoded string.
-    On Py2, returns a newbytes type, ignoring the ``encoding`` argument.
-    """
-
-if PY3:
-    # list-producing versions of the major Python iterating functions
-    def lrange(*args, **kwargs):
-        return list(range(*args, **kwargs))
-
-    def lzip(*args, **kwargs):
-        return list(zip(*args, **kwargs))
-
-    def lmap(*args, **kwargs):
-        return list(map(*args, **kwargs))
-
-    def lfilter(*args, **kwargs):
-        return list(filter(*args, **kwargs))
-else:
-    import __builtin__
-    # Python 2-builtin ranges produce lists
-    lrange = __builtin__.range
-    lzip = __builtin__.zip
-    lmap = __builtin__.map
-    lfilter = __builtin__.filter
-
-
-def isidentifier(s, dotted=False):
-    '''
-    A function equivalent to the str.isidentifier method on Py3
-    '''
-    if dotted:
-        return all(isidentifier(a) for a in s.split('.'))
-    if PY3:
-        return s.isidentifier()
-    else:
-        import re
-        _name_re = re.compile(r"[a-zA-Z_][a-zA-Z0-9_]*$")
-        return bool(_name_re.match(s))
-
-
-def viewitems(obj, **kwargs):
-    """
-    Function for iterating over dictionary items with the same set-like
-    behaviour on Py2.7 as on Py3.
-
-    Passes kwargs to method."""
-    func = getattr(obj, "viewitems", None)
-    if not func:
-        func = obj.items
-    return func(**kwargs)
-
-
-def viewkeys(obj, **kwargs):
-    """
-    Function for iterating over dictionary keys with the same set-like
-    behaviour on Py2.7 as on Py3.
-
-    Passes kwargs to method."""
-    func = getattr(obj, "viewkeys", None)
-    if not func:
-        func = obj.keys
-    return func(**kwargs)
-
-
-def viewvalues(obj, **kwargs):
-    """
-    Function for iterating over dictionary values with the same set-like
-    behaviour on Py2.7 as on Py3.
-
-    Passes kwargs to method."""
-    func = getattr(obj, "viewvalues", None)
-    if not func:
-        func = obj.values
-    return func(**kwargs)
-
-
-def iteritems(obj, **kwargs):
-    """Use this only if compatibility with Python versions before 2.7 is
-    required. Otherwise, prefer viewitems().
-    """
-    func = getattr(obj, "iteritems", None)
-    if not func:
-        func = obj.items
-    return func(**kwargs)
-
-
-def iterkeys(obj, **kwargs):
-    """Use this only if compatibility with Python versions before 2.7 is
-    required. Otherwise, prefer viewkeys().
-    """
-    func = getattr(obj, "iterkeys", None)
-    if not func:
-        func = obj.keys
-    return func(**kwargs)
-
-
-def itervalues(obj, **kwargs):
-    """Use this only if compatibility with Python versions before 2.7 is
-    required. Otherwise, prefer viewvalues().
-    """
-    func = getattr(obj, "itervalues", None)
-    if not func:
-        func = obj.values
-    return func(**kwargs)
-
-
-def bind_method(cls, name, func):
-    """Bind a method to class, python 2 and python 3 compatible.
-
-    Parameters
-    ----------
-
-    cls : type
-        class to receive bound method
-    name : basestring
-        name of method on class instance
-    func : function
-        function to be bound as method
-
-    Returns
-    -------
-    None
-    """
-    # only python 2 has an issue with bound/unbound methods
-    if not PY3:
-        setattr(cls, name, types.MethodType(func, None, cls))
-    else:
-        setattr(cls, name, func)
-
-
-def getexception():
-    return sys.exc_info()[1]
-
-
-def _get_caller_globals_and_locals():
-    """
-    Returns the globals and locals of the calling frame.
-
-    Is there an alternative to frame hacking here?
-    """
-    caller_frame = inspect.stack()[2]
-    myglobals = caller_frame[0].f_globals
-    mylocals = caller_frame[0].f_locals
-    return myglobals, mylocals
-
-
-def _repr_strip(mystring):
-    """
-    Returns the string without any initial or final quotes.
-    """
-    r = repr(mystring)
-    if r.startswith("'") and r.endswith("'"):
-        return r[1:-1]
-    else:
-        return r
-
-
-if PY3:
-    def raise_from(exc, cause):
-        """
-        Equivalent to:
-
-            raise EXCEPTION from CAUSE
-
-        on Python 3. (See PEP 3134).
-        """
-        myglobals, mylocals = _get_caller_globals_and_locals()
-
-        # We pass the exception and cause along with other globals
-        # when we exec():
-        myglobals = myglobals.copy()
-        myglobals['__python_future_raise_from_exc'] = exc
-        myglobals['__python_future_raise_from_cause'] = cause
-        execstr = "raise __python_future_raise_from_exc from __python_future_raise_from_cause"
-        exec(execstr, myglobals, mylocals)
-
-    def raise_(tp, value=None, tb=None):
-        """
-        A function that matches the Python 2.x ``raise`` statement. This
-        allows re-raising exceptions with the cls value and traceback on
-        Python 2 and 3.
-        """
-        if isinstance(tp, BaseException):
-            # If the first object is an instance, the type of the exception
-            # is the class of the instance, the instance itself is the value,
-            # and the second object must be None.
-            if value is not None:
-                raise TypeError("instance exception may not have a separate value")
-            exc = tp
-        elif isinstance(tp, type) and not issubclass(tp, BaseException):
-            # If the first object is a class, it becomes the type of the
-            # exception.
-            raise TypeError("class must derive from BaseException, not %s" % tp.__name__)
-        else:
-            # The second object is used to determine the exception value: If it
-            # is an instance of the class, the instance becomes the exception
-            # value. If the second object is a tuple, it is used as the argument
-            # list for the class constructor; if it is None, an empty argument
-            # list is used, and any other object is treated as a single argument
-            # to the constructor. The instance so created by calling the
-            # constructor is used as the exception value.
-            if isinstance(value, tp):
-                exc = value
-            elif isinstance(value, tuple):
-                exc = tp(*value)
-            elif value is None:
-                exc = tp()
-            else:
-                exc = tp(value)
-
-        if exc.__traceback__ is not tb:
-            raise exc.with_traceback(tb)
-        raise exc
-
-    def raise_with_traceback(exc, traceback=Ellipsis):
-        if traceback == Ellipsis:
-            _, _, traceback = sys.exc_info()
-        raise exc.with_traceback(traceback)
-
-else:
-    def raise_from(exc, cause):
-        """
-        Equivalent to:
-
-            raise EXCEPTION from CAUSE
-
-        on Python 3. (See PEP 3134).
-        """
-        # Is either arg an exception class (e.g. IndexError) rather than
-        # instance (e.g. IndexError('my message here')? If so, pass the
-        # name of the class undisturbed through to "raise ... from ...".
-        if isinstance(exc, type) and issubclass(exc, Exception):
-            e = exc()
-            # exc = exc.__name__
-            # execstr = "e = " + _repr_strip(exc) + "()"
-            # myglobals, mylocals = _get_caller_globals_and_locals()
-            # exec(execstr, myglobals, mylocals)
-        else:
-            e = exc
-        e.__suppress_context__ = False
-        if isinstance(cause, type) and issubclass(cause, Exception):
-            e.__cause__ = cause()
-            e.__cause__.__traceback__ = sys.exc_info()[2]
-            e.__suppress_context__ = True
-        elif cause is None:
-            e.__cause__ = None
-            e.__suppress_context__ = True
-        elif isinstance(cause, BaseException):
-            e.__cause__ = cause
-            object.__setattr__(e.__cause__,  '__traceback__', sys.exc_info()[2])
-            e.__suppress_context__ = True
-        else:
-            raise TypeError("exception causes must derive from BaseException")
-        e.__context__ = sys.exc_info()[1]
-        raise e
-
-    exec('''
-def raise_(tp, value=None, tb=None):
-    raise tp, value, tb
-
-def raise_with_traceback(exc, traceback=Ellipsis):
-    if traceback == Ellipsis:
-        _, _, traceback = sys.exc_info()
-    raise exc, None, traceback
-'''.strip())
-
-
-raise_with_traceback.__doc__ = (
-"""Raise exception with existing traceback.
-If traceback is not passed, uses sys.exc_info() to get traceback."""
-)
-
-
-# Deprecated alias for backward compatibility with ``future`` versions < 0.11:
-reraise = raise_
-
-
-def implements_iterator(cls):
-    '''
-    From jinja2/_compat.py. License: BSD.
-
-    Use as a decorator like this::
-
-        @implements_iterator
-        class UppercasingIterator(object):
-            def __init__(self, iterable):
-                self._iter = iter(iterable)
-            def __iter__(self):
-                return self
-            def __next__(self):
-                return next(self._iter).upper()
-
-    '''
-    if PY3:
-        return cls
-    else:
-        cls.next = cls.__next__
-        del cls.__next__
-        return cls
-
-if PY3:
-    get_next = lambda x: x.__next__
-else:
-    get_next = lambda x: x.next
-
-
-def encode_filename(filename):
-    if PY3:
-        return filename
-    else:
-        if isinstance(filename, unicode):
-            return filename.encode('utf-8')
-        return filename
-
-
-def is_new_style(cls):
-    """
-    Python 2.7 has both new-style and old-style classes. Old-style classes can
-    be pesky in some circumstances, such as when using inheritance.  Use this
-    function to test for whether a class is new-style. (Python 3 only has
-    new-style classes.)
-    """
-    return hasattr(cls, '__class__') and ('__dict__' in dir(cls)
-                                          or hasattr(cls, '__slots__'))
-
-# The native platform string and bytes types. Useful because ``str`` and
-# ``bytes`` are redefined on Py2 by ``from future.builtins import *``.
-native_str = str
-native_bytes = bytes
-
-
-def istext(obj):
-    """
-    Deprecated. Use::
-        >>> isinstance(obj, str)
-    after this import:
-        >>> from future.builtins import str
-    """
-    return isinstance(obj, type(u''))
-
-
-def isbytes(obj):
-    """
-    Deprecated. Use::
-        >>> isinstance(obj, bytes)
-    after this import:
-        >>> from future.builtins import bytes
-    """
-    return isinstance(obj, type(b''))
-
-
-def isnewbytes(obj):
-    """
-    Equivalent to the result of ``type(obj)  == type(newbytes)``
-    in other words, it is REALLY a newbytes instance, not a Py2 native str
-    object?
-
-    Note that this does not cover subclasses of newbytes, and it is not
-    equivalent to ininstance(obj, newbytes)
-    """
-    return type(obj).__name__ == 'newbytes'
-
-
-def isint(obj):
-    """
-    Deprecated. Tests whether an object is a Py3 ``int`` or either a Py2 ``int`` or
-    ``long``.
-
-    Instead of using this function, you can use:
-
-        >>> from future.builtins import int
-        >>> isinstance(obj, int)
-
-    The following idiom is equivalent:
-
-        >>> from numbers import Integral
-        >>> isinstance(obj, Integral)
-    """
-
-    return isinstance(obj, numbers.Integral)
-
-
-def native(obj):
-    """
-    On Py3, this is a no-op: native(obj) -> obj
-
-    On Py2, returns the corresponding native Py2 types that are
-    superclasses for backported objects from Py3:
-
-    >>> from builtins import str, bytes, int
-
-    >>> native(str(u'ABC'))
-    u'ABC'
-    >>> type(native(str(u'ABC')))
-    unicode
-
-    >>> native(bytes(b'ABC'))
-    b'ABC'
-    >>> type(native(bytes(b'ABC')))
-    bytes
-
-    >>> native(int(10**20))
-    100000000000000000000L
-    >>> type(native(int(10**20)))
-    long
-
-    Existing native types on Py2 will be returned unchanged:
-
-    >>> type(native(u'ABC'))
-    unicode
-    """
-    if hasattr(obj, '__native__'):
-        return obj.__native__()
-    else:
-        return obj
-
-
-# Implementation of exec_ is from ``six``:
-if PY3:
-    import builtins
-    exec_ = getattr(builtins, "exec")
-else:
-    def exec_(code, globs=None, locs=None):
-        """Execute code in a namespace."""
-        if globs is None:
-            frame = sys._getframe(1)
-            globs = frame.f_globals
-            if locs is None:
-                locs = frame.f_locals
-            del frame
-        elif locs is None:
-            locs = globs
-        exec("""exec code in globs, locs""")
-
-
-# Defined here for backward compatibility:
-def old_div(a, b):
-    """
-    DEPRECATED: import ``old_div`` from ``past.utils`` instead.
-
-    Equivalent to ``a / b`` on Python 2 without ``from __future__ import
-    division``.
-
-    TODO: generalize this to other objects (like arrays etc.)
-    """
-    if isinstance(a, numbers.Integral) and isinstance(b, numbers.Integral):
-        return a // b
-    else:
-        return a / b
-
-
-def as_native_str(encoding='utf-8'):
-    '''
-    A decorator to turn a function or method call that returns text, i.e.
-    unicode, into one that returns a native platform str.
-
-    Use it as a decorator like this::
-
-        from __future__ import unicode_literals
-
-        class MyClass(object):
-            @as_native_str(encoding='ascii')
-            def __repr__(self):
-                return next(self._iter).upper()
-    '''
-    if PY3:
-        return lambda f: f
-    else:
-        def encoder(f):
-            @functools.wraps(f)
-            def wrapper(*args, **kwargs):
-                return f(*args, **kwargs).encode(encoding=encoding)
-            return wrapper
-        return encoder
-
-# listvalues and listitems definitions from Nick Coghlan's (withdrawn)
-# PEP 496:
-try:
-    dict.iteritems
-except AttributeError:
-    # Python 3
-    def listvalues(d):
-        return list(d.values())
-    def listitems(d):
-        return list(d.items())
-else:
-    # Python 2
-    def listvalues(d):
-        return d.values()
-    def listitems(d):
-        return d.items()
-
-if PY3:
-    def ensure_new_type(obj):
-        return obj
-else:
-    def ensure_new_type(obj):
-        from future.types.newbytes import newbytes
-        from future.types.newstr import newstr
-        from future.types.newint import newint
-        from future.types.newdict import newdict
-
-        native_type = type(native(obj))
-
-        # Upcast only if the type is already a native (non-future) type
-        if issubclass(native_type, type(obj)):
-            # Upcast
-            if native_type == str:  # i.e. Py2 8-bit str
-                return newbytes(obj)
-            elif native_type == unicode:
-                return newstr(obj)
-            elif native_type == int:
-                return newint(obj)
-            elif native_type == long:
-                return newint(obj)
-            elif native_type == dict:
-                return newdict(obj)
-            else:
-                return obj
-        else:
-            # Already a new type
-            assert type(obj) in [newbytes, newstr]
-            return obj
-
-
-__all__ = ['PY2', 'PY26', 'PY3', 'PYPY',
-           'as_native_str', 'binary_type', 'bind_method', 'bord', 'bstr',
-           'bytes_to_native_str', 'class_types', 'encode_filename',
-           'ensure_new_type', 'exec_', 'get_next', 'getexception',
-           'implements_iterator', 'integer_types', 'is_new_style', 'isbytes',
-           'isidentifier', 'isint', 'isnewbytes', 'istext', 'iteritems',
-           'iterkeys', 'itervalues', 'lfilter', 'listitems', 'listvalues',
-           'lmap', 'lrange', 'lzip', 'native', 'native_bytes', 'native_str',
-           'native_str_to_bytes', 'old_div',
-           'python_2_unicode_compatible', 'raise_',
-           'raise_with_traceback', 'reraise', 'string_types',
-           'text_to_native_str', 'text_type', 'tobytes', 'viewitems',
-           'viewkeys', 'viewvalues', 'with_metaclass'
-           ]
diff --git a/lib/future/utils/surrogateescape.py b/lib/future/utils/surrogateescape.py
deleted file mode 100644
index 0dcc9fa6..00000000
--- a/lib/future/utils/surrogateescape.py
+++ /dev/null
@@ -1,198 +0,0 @@
-"""
-This is Victor Stinner's pure-Python implementation of PEP 383: the "surrogateescape" error
-handler of Python 3.
-
-Source: misc/python/surrogateescape.py in https://bitbucket.org/haypo/misc
-"""
-
-# This code is released under the Python license and the BSD 2-clause license
-
-import codecs
-import sys
-
-from future import utils
-
-
-FS_ERRORS = 'surrogateescape'
-
-#     # -- Python 2/3 compatibility -------------------------------------
-#     FS_ERRORS = 'my_surrogateescape'
-
-def u(text):
-    if utils.PY3:
-        return text
-    else:
-        return text.decode('unicode_escape')
-
-def b(data):
-    if utils.PY3:
-        return data.encode('latin1')
-    else:
-        return data
-
-if utils.PY3:
-    _unichr = chr
-    bytes_chr = lambda code: bytes((code,))
-else:
-    _unichr = unichr
-    bytes_chr = chr
-
-def surrogateescape_handler(exc):
-    """
-    Pure Python implementation of the PEP 383: the "surrogateescape" error
-    handler of Python 3. Undecodable bytes will be replaced by a Unicode
-    character U+DCxx on decoding, and these are translated into the
-    original bytes on encoding.
-    """
-    mystring = exc.object[exc.start:exc.end]
-
-    try:
-        if isinstance(exc, UnicodeDecodeError):
-            # mystring is a byte-string in this case
-            decoded = replace_surrogate_decode(mystring)
-        elif isinstance(exc, UnicodeEncodeError):
-            # In the case of u'\udcc3'.encode('ascii',
-            # 'this_surrogateescape_handler'), both Python 2.x and 3.x raise an
-            # exception anyway after this function is called, even though I think
-            # it's doing what it should. It seems that the strict encoder is called
-            # to encode the unicode string that this function returns ...
-            decoded = replace_surrogate_encode(mystring)
-        else:
-            raise exc
-    except NotASurrogateError:
-        raise exc
-    return (decoded, exc.end)
-
-
-class NotASurrogateError(Exception):
-    pass
-
-
-def replace_surrogate_encode(mystring):
-    """
-    Returns a (unicode) string, not the more logical bytes, because the codecs
-    register_error functionality expects this.
-    """
-    decoded = []
-    for ch in mystring:
-        # if utils.PY3:
-        #     code = ch
-        # else:
-        code = ord(ch)
-
-        # The following magic comes from Py3.3's Python/codecs.c file:
-        if not 0xD800 <= code <= 0xDCFF:
-            # Not a surrogate. Fail with the original exception.
-            raise NotASurrogateError
-        # mybytes = [0xe0 | (code >> 12),
-        #            0x80 | ((code >> 6) & 0x3f),
-        #            0x80 | (code & 0x3f)]
-        # Is this a good idea?
-        if 0xDC00 <= code <= 0xDC7F:
-            decoded.append(_unichr(code - 0xDC00))
-        elif code <= 0xDCFF:
-            decoded.append(_unichr(code - 0xDC00))
-        else:
-            raise NotASurrogateError
-    return str().join(decoded)
-
-
-def replace_surrogate_decode(mybytes):
-    """
-    Returns a (unicode) string
-    """
-    decoded = []
-    for ch in mybytes:
-        # We may be parsing newbytes (in which case ch is an int) or a native
-        # str on Py2
-        if isinstance(ch, int):
-            code = ch
-        else:
-            code = ord(ch)
-        if 0x80 <= code <= 0xFF:
-            decoded.append(_unichr(0xDC00 + code))
-        elif code <= 0x7F:
-            decoded.append(_unichr(code))
-        else:
-            # # It may be a bad byte
-            # # Try swallowing it.
-            # continue
-            # print("RAISE!")
-            raise NotASurrogateError
-    return str().join(decoded)
-
-
-def encodefilename(fn):
-    if FS_ENCODING == 'ascii':
-        # ASCII encoder of Python 2 expects that the error handler returns a
-        # Unicode string encodable to ASCII, whereas our surrogateescape error
-        # handler has to return bytes in 0x80-0xFF range.
-        encoded = []
-        for index, ch in enumerate(fn):
-            code = ord(ch)
-            if code < 128:
-                ch = bytes_chr(code)
-            elif 0xDC80 <= code <= 0xDCFF:
-                ch = bytes_chr(code - 0xDC00)
-            else:
-                raise UnicodeEncodeError(FS_ENCODING,
-                    fn, index, index+1,
-                    'ordinal not in range(128)')
-            encoded.append(ch)
-        return bytes().join(encoded)
-    elif FS_ENCODING == 'utf-8':
-        # UTF-8 encoder of Python 2 encodes surrogates, so U+DC80-U+DCFF
-        # doesn't go through our error handler
-        encoded = []
-        for index, ch in enumerate(fn):
-            code = ord(ch)
-            if 0xD800 <= code <= 0xDFFF:
-                if 0xDC80 <= code <= 0xDCFF:
-                    ch = bytes_chr(code - 0xDC00)
-                    encoded.append(ch)
-                else:
-                    raise UnicodeEncodeError(
-                        FS_ENCODING,
-                        fn, index, index+1, 'surrogates not allowed')
-            else:
-                ch_utf8 = ch.encode('utf-8')
-                encoded.append(ch_utf8)
-        return bytes().join(encoded)
-    else:
-        return fn.encode(FS_ENCODING, FS_ERRORS)
-
-def decodefilename(fn):
-    return fn.decode(FS_ENCODING, FS_ERRORS)
-
-FS_ENCODING = 'ascii'; fn = b('[abc\xff]'); encoded = u('[abc\udcff]')
-# FS_ENCODING = 'cp932'; fn = b('[abc\x81\x00]'); encoded = u('[abc\udc81\x00]')
-# FS_ENCODING = 'UTF-8'; fn = b('[abc\xff]'); encoded = u('[abc\udcff]')
-
-
-# normalize the filesystem encoding name.
-# For example, we expect "utf-8", not "UTF8".
-FS_ENCODING = codecs.lookup(FS_ENCODING).name
-
-
-def register_surrogateescape():
-    """
-    Registers the surrogateescape error handler on Python 2 (only)
-    """
-    if utils.PY3:
-        return
-    try:
-        codecs.lookup_error(FS_ERRORS)
-    except LookupError:
-        codecs.register_error(FS_ERRORS, surrogateescape_handler)
-
-
-if __name__ == '__main__':
-    pass
-    # # Tests:
-    # register_surrogateescape()
-
-    # b = decodefilename(fn)
-    # assert b == encoded, "%r != %r" % (b, encoded)
-    # c = encodefilename(b)
-    # assert c == fn, '%r != %r' % (c, fn)
-    # # print("ok")
diff --git a/lib/ga4mp/__init__.py b/lib/ga4mp/__init__.py
deleted file mode 100644
index 9a817b94..00000000
--- a/lib/ga4mp/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from ga4mp.ga4mp import GtagMP, FirebaseMP
-
-__all__ = ['GtagMP','FirebaseMP']
\ No newline at end of file
diff --git a/lib/ga4mp/event.py b/lib/ga4mp/event.py
deleted file mode 100644
index 12f65a10..00000000
--- a/lib/ga4mp/event.py
+++ /dev/null
@@ -1,44 +0,0 @@
-from ga4mp.item import Item
-
-class Event(dict):
-    def __init__(self, name):
-        self.set_event_name(name)
-
-    def set_event_name(self, name):
-        if len(name) > 40:
-            raise ValueError("Event name cannot exceed 40 characters.")
-        self["name"] = name
-
-    def get_event_name(self):
-        return self.get("name")
-
-    def set_event_param(self, name, value):
-        # Series of checks to comply with GA4 event collection limits: https://support.google.com/analytics/answer/9267744
-        if len(name) > 40:
-            raise ValueError("Event parameter name cannot exceed 40 characters.")
-        if name in ["page_location", "page_referrer", "page_title"] and len(str(value)) > 300:
-            raise ValueError("Event parameter value for page info cannot exceed 300 characters.")
-        if name not in ["page_location", "page_referrer", "page_title"] and len(str(value)) > 100:
-            raise ValueError("Event parameter value cannot exceed 100 characters.")
-        if "params" not in self.keys():
-            self["params"] = {}
-        if len(self["params"]) >= 100:
-            raise RuntimeError("Event cannot contain more than 100 parameters.")
-        self["params"][name] = value
-
-    def get_event_params(self):
-        return self.get("params")
-
-    def delete_event_param(self, name):
-        # Since only 25 event parameters are allowed, this will allow the user to delete a parameter if necessary.
-        self["params"].pop(name, None)
-
-    def create_new_item(self, item_id=None, item_name=None):
-        return Item(item_id=item_id, item_name=item_name)
-
-    def add_item_to_event(self, item):
-        if not isinstance(item, dict):
-            raise ValueError("'item' must be an instance of a dictionary.")
-        if "items" not in self["params"].keys():
-            self.set_event_param("items", [])
-        self["params"]["items"].append(item)
\ No newline at end of file
diff --git a/lib/ga4mp/ga4mp.py b/lib/ga4mp/ga4mp.py
deleted file mode 100644
index 45fdc842..00000000
--- a/lib/ga4mp/ga4mp.py
+++ /dev/null
@@ -1,416 +0,0 @@
-###############################################################################
-# Google Analytics 4 Measurement Protocol for Python
-# Copyright (c) 2022, Adswerve
-#
-# This project is free software, distributed under the BSD license.
-# Adswerve offers consulting and integration services if your firm needs
-# assistance in strategy, implementation, or auditing existing work.
-###############################################################################
-
-import json
-import logging
-import urllib.request
-import time
-import datetime
-import random
-from ga4mp.utils import params_dict
-from ga4mp.event import Event
-from ga4mp.store import BaseStore, DictStore
-
-import os, sys
-sys.path.append(
-    os.path.normpath(os.path.join(os.path.dirname(__file__), ".."))
-)
-
-logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
-
-class BaseGa4mp(object):
-    """
-    Parent class that provides an interface for sending data to Google Analytics, supporting the GA4 Measurement Protocol.
-
-    Parameters
-    ----------
-    api_secret : string
-        Generated through the Google Analytics UI. To create a new secret, navigate in the Google Analytics UI to: Admin > Data Streams >
-        [choose your stream] > Measurement Protocol API Secrets > Create
-
-    See Also
-    --------
-
-    * Measurement Protocol (Google Analytics 4): https://developers.google.com/analytics/devguides/collection/protocol/ga4
-
-    Examples
-    --------
-    # Initialize tracking object for gtag usage
-    >>> ga = gtagMP(api_secret = "API_SECRET", measurement_id = "MEASUREMENT_ID", client_id="CLIENT_ID")
-
-    # Initialize tracking object for Firebase usage
-    >>> ga = firebaseMP(api_secret = "API_SECRET", firebase_app_id = "FIREBASE_APP_ID", app_instance_id="APP_INSTANCE_ID")
-
-    # Build an event
-    >>> event_type = 'new_custom_event'
-    >>> event_parameters = {'parameter_key_1': 'parameter_1', 'parameter_key_2': 'parameter_2'}
-    >>> event = {'name': event_type, 'params': event_parameters }
-    >>> events = [event]
-
-    # Send a custom event to GA4 immediately
-    >>> ga.send(events)
-
-    # Postponed send of a custom event to GA4
-    >>> ga.send(events, postpone=True)
-    >>> ga.postponed_send()
-    """
-
-    def __init__(self, api_secret, store: BaseStore = None):
-        self._initialization_time = time.time() # used for both session_id and calculating engagement time
-        self.api_secret = api_secret
-        self._event_list = []
-        assert store is None or isinstance(store, BaseStore), "if supplied, store must be an instance of BaseStore"
-        self.store = store or DictStore()
-        self._check_store_requirements()
-        self._base_domain = "https://www.google-analytics.com/mp/collect"
-        self._validation_domain = "https://www.google-analytics.com/debug/mp/collect"
-
-    def _check_store_requirements(self):
-        # Store must contain "session_id" and "last_interaction_time_msec" in order for tracking to work properly.
-        if self.store.get_session_parameter("session_id") is None:
-            self.store.set_session_parameter(name="session_id", value=int(self._initialization_time))
-        # Note: "last_interaction_time_msec" factors into the required "engagement_time_msec" event parameter.
-        self.store.set_session_parameter(name="last_interaction_time_msec", value=int(self._initialization_time * 1000))
-
-    def create_new_event(self, name):
-        return Event(name=name)
-
-    def send(self, events, validation_hit=False, postpone=False, date=None):
-        """
-        Method to send an http post request to google analytics with the specified events.
-
-        Parameters
-        ----------
-        events : List[Dict]
-            A list of dictionaries of the events to be sent to Google Analytics. The list of dictionaries should adhere
-            to the following format:
-
-            [{'name': 'level_end',
-            'params' : {'level_name': 'First',
-                        'success': 'True'}
-            },
-            {'name': 'level_up',
-            'params': {'character': 'John Madden',
-                        'level': 'First'}
-            }]
-
-        validation_hit : bool, optional
-            Boolean to depict if events should be tested against the Measurement Protocol Validation Server, by default False
-        postpone : bool, optional
-            Boolean to depict if provided event list should be postponed, by default False
-        date : datetime
-            Python datetime object for sending a historical event at the given date. Date cannot be in the future.
-        """
-
-        # check for any missing or invalid parameters among automatically collected and recommended event types
-        self._check_params(events)
-        self._check_date_not_in_future(date)
-        self._add_session_id_and_engagement_time(events)
-
-        if postpone is True:
-            # build event list to send later
-            for event in events:
-                event["_timestamp_micros"] = self._get_timestamp(time.time())
-                self._event_list.append(event)
-        else:
-            # batch events into sets of 25 events, the maximum allowed.
-            batched_event_list = [
-                events[event : event + 25] for event in range(0, len(events), 25)
-            ]
-            # send http post request
-            self._http_post(
-                batched_event_list, validation_hit=validation_hit, date=date
-            )
-
-    def postponed_send(self):
-        """
-        Method to send the events provided to Ga4mp.send(events,postpone=True)
-        """
-
-        for event in self._event_list:
-            self._http_post([event], postpone=True)
-
-        # clear event_list for future use
-        self._event_list = []
-
-    def append_event_to_params_dict(self, new_name_and_parameters):
-
-        """
-        Method to append event name and parameters key-value pairing(s) to parameters dictionary.
-
-        Parameters
-        ----------
-        new_name_and_parameters : Dict
-            A dictionary with one key-value pair representing a new type of event to be sent to Google Analytics.
-            The dictionary should adhere to the following format:
-
-            {'new_name': ['new_param_1', 'new_param_2', 'new_param_3']}
-        """
-
-        params_dict.update(new_name_and_parameters)
-
-    def _http_post(self, batched_event_list, validation_hit=False, postpone=False, date=None):
-        """
-        Method to send http POST request to google-analytics.
-
-        Parameters
-        ----------
-        batched_event_list : List[List[Dict]]
-            List of List of events. Places initial event payload into a list to send http POST in batches.
-        validation_hit : bool, optional
-            Boolean to depict if events should be tested against the Measurement Protocol Validation Server, by default False
-        postpone : bool, optional
-            Boolean to depict if provided event list should be postponed, by default False
-        date : datetime
-            Python datetime object for sending a historical event at the given date. Date cannot be in the future.
-            Timestamp micros supports up to 48 hours of backdating.
-            If date is specified, postpone must be False or an assertion will be thrown.
-        """
-        self._check_date_not_in_future(date)
-        status_code = None  # Default set to know if batch loop does not work and to bound status_code
-
-        # set domain
-        domain = self._base_domain
-        if validation_hit is True:
-            domain = self._validation_domain
-        logger.info(f"Sending POST to: {domain}")
-
-        # loop through events in batches of 25
-        batch_number = 1
-        for batch in batched_event_list:
-            # url and request slightly differ by subclass
-            url = self._build_url(domain=domain)
-            request = self._build_request(batch=batch)
-            self._add_user_props_to_hit(request)
-
-            # make adjustments for postponed hit
-            request["events"] = (
-                {"name": batch["name"], "params": batch["params"]}
-                if (postpone)
-                else batch
-            )
-
-            if date is not None:
-                logger.info(f"Setting event timestamp to: {date}")
-                assert (
-                    postpone is False
-                ), "Cannot send postponed historical hit, ensure postpone=False"
-
-                ts = self._datetime_to_timestamp(date)
-                ts_micro = self._get_timestamp(ts)
-                request["timestamp_micros"] = int(ts_micro)
-                logger.info(f"Timestamp of request is: {request['timestamp_micros']}")
-
-            if postpone:
-                # add timestamp to hit
-                request["timestamp_micros"] = batch["_timestamp_micros"]
-
-            req = urllib.request.Request(url)
-            req.add_header("Content-Type", "application/json; charset=utf-8")
-            jsondata = json.dumps(request)
-            json_data_as_bytes = jsondata.encode("utf-8")  # needs to be bytes
-            req.add_header("Content-Length", len(json_data_as_bytes))
-            result = urllib.request.urlopen(req, json_data_as_bytes)
-
-            status_code = result.status
-            logger.info(f"Batch Number: {batch_number}")
-            logger.info(f"Status code: {status_code}")
-            batch_number += 1
-
-        return status_code
-
-    def _check_params(self, events):
-
-        """
-        Method to check whether the provided event payload parameters align with supported parameters.
-
-        Parameters
-        ----------
-        events : List[Dict]
-            A list of dictionaries of the events to be sent to Google Analytics. The list of dictionaries should adhere
-            to the following format:
-
-            [{'name': 'level_end',
-            'params' : {'level_name': 'First',
-                        'success': 'True'}
-            },
-            {'name': 'level_up',
-            'params': {'character': 'John Madden',
-                        'level': 'First'}
-            }]
-        """
-
-        # check to make sure it's a list of dictionaries with the right keys
-
-        assert type(events) == list, "events should be a list"
-
-        for event in events:
-
-            assert isinstance(event, dict), "each event should be an instance of a dictionary"
-
-            assert "name" in event, 'each event should have a "name" key'
-
-            assert "params" in event, 'each event should have a "params" key'
-
-        # check for any missing or invalid parameters
-
-        for e in events:
-            event_name = e["name"]
-            event_params = e["params"]
-            if event_name in params_dict.keys():
-                for parameter in params_dict[event_name]:
-                    if parameter not in event_params.keys():
-                        logger.warning(
-                            f"WARNING: Event parameters do not match event type.\nFor {event_name} event type, the correct parameter(s) are {params_dict[event_name]}.\nThe parameter '{parameter}' triggered this warning.\nFor a breakdown of currently supported event types and their parameters go here: https://support.google.com/analytics/answer/9267735\n"
-                        )
-
-    def _add_session_id_and_engagement_time(self, events):
-        """
-        Method to add the session_id and engagement_time_msec parameter to all events.
-        """
-        for event in events:
-            current_time_in_milliseconds = int(time.time() * 1000)
-
-            event_params = event["params"]
-            if "session_id" not in event_params.keys():
-                event_params["session_id"] = self.store.get_session_parameter("session_id")
-            if "engagement_time_msec" not in event_params.keys():
-                last_interaction_time = self.store.get_session_parameter("last_interaction_time_msec")
-                event_params["engagement_time_msec"] = current_time_in_milliseconds - last_interaction_time if current_time_in_milliseconds > last_interaction_time else 0
-                self.store.set_session_parameter(name="last_interaction_time_msec", value=current_time_in_milliseconds)
-
-    def _add_user_props_to_hit(self, hit):
-
-        """
-        Method is a helper function to add user properties to outgoing hits.
-
-        Parameters
-        ----------
-        hit : dict
-        """
-
-        for key in self.store.get_all_user_properties():
-            try:
-                if key in ["user_id", "non_personalized_ads"]:
-                    hit.update({key: self.store.get_user_property(key)})
-                else:
-                    if "user_properties" not in hit.keys():
-                        hit.update({"user_properties": {}})
-                    hit["user_properties"].update(
-                        {key: {"value": self.store.get_user_property(key)}}
-                    )
-            except:
-                logger.info(f"Failed to add user property to outgoing hit: {key}")
-
-    def _get_timestamp(self, timestamp):
-        """
-        Method returns UNIX timestamp in microseconds for postponed hits.
-
-        Parameters
-        ----------
-        None
-        """
-        return int(timestamp * 1e6)
-
-    def _datetime_to_timestamp(self, dt):
-        """
-        Private method to convert a datetime object into a timestamp
-
-        Parameters
-        ----------
-        dt : datetime
-            A datetime object in any format
-
-        Returns
-        -------
-        timestamp
-            A UNIX timestamp in milliseconds
-        """
-        return time.mktime(dt.timetuple())
-
-    def _check_date_not_in_future(self, date):
-        """
-        Method to check that provided date is not in the future.
-
-        Parameters
-        ----------
-        date : datetime
-            Python datetime object
-        """
-        if date is None:
-            pass
-        else:
-            assert (
-                date <= datetime.datetime.now()
-            ), "Provided date cannot be in the future"
-
-    def _build_url(self, domain):
-        raise NotImplementedError("Subclass should be using this function, but it was called through the base class instead.")
-
-    def _build_request(self, batch):
-        raise NotImplementedError("Subclass should be using this function, but it was called through the base class instead.")
-
-class GtagMP(BaseGa4mp):
-    """
-    Subclass for users of gtag. See `Ga4mp` parent class for examples.
-
-    Parameters
-    ----------
-    measurement_id : string
-        The identifier for a Data Stream. Found in the Google Analytics UI under: Admin > Data Streams > [choose your stream] > Measurement ID (top-right)
-    client_id : string
-        A unique identifier for a client, representing a specific browser/device.
-    """
-
-    def __init__(self, api_secret, measurement_id, client_id,):
-        super().__init__(api_secret)
-        self.measurement_id = measurement_id
-        self.client_id = client_id
-
-    def _build_url(self, domain):
-        return f"{domain}?measurement_id={self.measurement_id}&api_secret={self.api_secret}"
-
-    def _build_request(self, batch):
-        return {"client_id": self.client_id, "events": batch}
-
-    def random_client_id(self):
-        """
-        Utility function for generating a new client ID matching the typical format of 10 random digits and the UNIX timestamp in seconds, joined by a period.
-        """
-        return "%0.10d" % random.randint(0,9999999999) + "." + str(int(time.time()))
-
-class FirebaseMP(BaseGa4mp):
-    """
-    Subclass for users of Firebase. See `Ga4mp` parent class for examples.
-
-    Parameters
-    ----------
-    firebase_app_id : string
-        The identifier for a Firebase app. Found in the Firebase console under: Project Settings > General > Your Apps > App ID.
-    app_instance_id : string
-        A unique identifier for a Firebase app instance.
-            * Android - getAppInstanceId() - https://firebase.google.com/docs/reference/android/com/google/firebase/analytics/FirebaseAnalytics#public-taskstring-getappinstanceid
-            * Kotlin - getAppInstanceId() - https://firebase.google.com/docs/reference/kotlin/com/google/firebase/analytics/FirebaseAnalytics#getappinstanceid
-            * Swift - appInstanceID() - https://firebase.google.com/docs/reference/swift/firebaseanalytics/api/reference/Classes/Analytics#appinstanceid
-            * Objective-C - appInstanceID - https://firebase.google.com/docs/reference/ios/firebaseanalytics/api/reference/Classes/FIRAnalytics#+appinstanceid
-            * C++ - GetAnalyticsInstanceId() - https://firebase.google.com/docs/reference/cpp/namespace/firebase/analytics#getanalyticsinstanceid
-            * Unity - GetAnalyticsInstanceIdAsync() - https://firebase.google.com/docs/reference/unity/class/firebase/analytics/firebase-analytics#getanalyticsinstanceidasync
-    """
-
-    def __init__(self, api_secret, firebase_app_id, app_instance_id):
-        super().__init__(api_secret)
-        self.firebase_app_id = firebase_app_id
-        self.app_instance_id = app_instance_id
-
-    def _build_url(self, domain):
-        return f"{domain}?firebase_app_id={self.firebase_app_id}&api_secret={self.api_secret}"
-
-    def _build_request(self, batch):
-        return {"app_instance_id": self.app_instance_id, "events": batch}
\ No newline at end of file
diff --git a/lib/ga4mp/item.py b/lib/ga4mp/item.py
deleted file mode 100644
index 9c5ee9cd..00000000
--- a/lib/ga4mp/item.py
+++ /dev/null
@@ -1,11 +0,0 @@
-class Item(dict):
-    def __init__(self, item_id=None, item_name=None):
-        if item_id is None and item_name is None:
-            raise ValueError("At least one of 'item_id' and 'item_name' is required.")
-        if item_id is not None:
-            self.set_parameter("item_id", str(item_id))
-        if item_name is not None:
-            self.set_parameter("item_name", item_name)
-
-    def set_parameter(self, name, value):
-        self[name] = value
\ No newline at end of file
diff --git a/lib/ga4mp/store.py b/lib/ga4mp/store.py
deleted file mode 100644
index d85bc0c2..00000000
--- a/lib/ga4mp/store.py
+++ /dev/null
@@ -1,116 +0,0 @@
-import json
-import logging
-from pathlib import Path
-
-logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
-
-class BaseStore(dict):
-    def __init__(self):
-        self.update([("user_properties", {}),("session_parameters", {})])
-
-    def save(self):
-        raise NotImplementedError("Subclass should be using this function, but it was called through the base class instead.")
-
-    def _check_exists(self, key):
-        # Helper function to make sure a key exists before trying to work with values within it.
-        if key not in self.keys():
-            self[key] = {}
-
-    def _set(self, param_type, name, value):
-        # Helper function to set a single parameter (user or session or other).
-        self._check_exists(key=param_type)
-        self[param_type][name] = value
-
-    def _get_one(self, param_type, name):
-        # Helper function to get a single parameter value (user or session).
-        self._check_exists(key=param_type)
-        return self[param_type].get(name, None)
-
-    def _get_all(self, param_type=None):
-        # Helper function to get all user or session parameters - or the entire dictionary if not specified.
-        if param_type is not None:
-            return self[param_type]
-        else:
-            return self
-
-    # While redundant, the following make sure the distinction between session and user items is easier for the end user.
-    def set_user_property(self, name, value):
-        self._set(param_type="user_properties", name=name, value=value)
-
-    def get_user_property(self, name):
-        return self._get_one(param_type="user_properties", name=name)
-
-    def get_all_user_properties(self):
-        return self._get_all(param_type="user_properties")
-
-    def clear_user_properties(self):
-        self["user_properties"] = {}
-
-    def set_session_parameter(self, name, value):
-        self._set(param_type="session_parameters", name=name, value=value)
-
-    def get_session_parameter(self, name):
-        return self._get_one(param_type="session_parameters", name=name)
-
-    def get_all_session_parameters(self):
-        return self._get_all(param_type="session_parameters")
-
-    def clear_session_parameters(self):
-        self["session_parameters"] = {}
-
-    # Similar functions for other items the user wants to store that don't fit the other two categories.
-    def set_other_parameter(self, name, value):
-        self._set(param_type="other", name=name, value=value)
-
-    def get_other_parameter(self, name):
-        return self._get_one(param_type="other", name=name)
-
-    def get_all_other_parameters(self):
-        return self._get_all(param_type="other")
-
-    def clear_other_parameters(self):
-        self["other"] = {}
-
-class DictStore(BaseStore):
-    # Class for working with dictionaries that persist for the life of the class.
-    def __init__(self, data: dict = None):
-        super().__init__()
-        if data:
-            self.update(data)
-
-    def save(self):
-        # Give the user back what's in the dictionary so they can decide how to save it.
-        self._get_all()
-
-class FileStore(BaseStore):
-    # Class for working with dictionaries that get saved to a JSON file.
-    def __init__(self, data_location: str = None):
-        super().__init__()
-        self.data_location = data_location
-        try:
-            self._load_file(data_location)
-        except:
-            logger.info(f"Failed to find file at location: {data_location}")
-
-    def _load_file(self):
-        # Function to get data from the object's initialized location.
-        # If the provided or stored data_location exists, read the file and overwrite the object's contents.
-        if Path(self.data_location).exists():
-            with open(self.data_location, "r") as json_file:
-                self = json.load(json_file)
-        # If the data_location doesn't exist, try to create a new starter JSON file at the location given.
-        else:
-            starter_dict = '{"user_properties":{}, "session_parameters":{}}'
-            starter_json = json.loads(starter_dict)
-            Path(self.data_location).touch()
-            with open(self.data_location, "w") as json_file:
-                json.dumps(starter_json, json_file)
-
-    def save(self):
-        # Function to save the current dictionary to a JSON file at the object's initialized location.
-        try:
-            with open(self.data_location, "w") as outfile:
-                json.dump(self, outfile)
-        except:
-            logger.info(f"Failed to save file at location: {self.data_location}")
\ No newline at end of file
diff --git a/lib/ga4mp/utils.py b/lib/ga4mp/utils.py
deleted file mode 100644
index 27fbca86..00000000
--- a/lib/ga4mp/utils.py
+++ /dev/null
@@ -1,392 +0,0 @@
-# all automatically collected and recommended event types
-params_dict = {
-    "ad_click": [
-        "ad_event_id"
-    ],
-    "ad_exposure": [
-        "firebase_screen",
-        "firebase_screen_id",
-        "firebase_screen_class",
-        "exposure_time",
-    ],
-    "ad_impression": [
-        "ad_event_id"
-    ],
-    "ad_query": [
-        "ad_event_id"
-    ],
-    "ad_reward": [
-        "ad_unit_id",
-        "reward_type",
-        "reward_value"
-    ],
-    "add_payment_info": [
-        "coupon",
-        "currency",
-        "items",
-        "payment_type",
-        "value"
-    ],
-    "add_shipping_info": [
-        "coupon",
-        "currency",
-        "items",
-        "shipping_tier",
-        "value"
-    ],
-    "add_to_cart": [
-        "currency",
-        "items",
-        "value"
-    ],
-    "add_to_wishlist": [
-        "currency",
-        "items",
-        "value"
-    ],
-    "adunit_exposure": [
-        "firebase_screen",
-        "firebase_screen_id",
-        "firebase_screen_class",
-        "exposure_time",
-    ],
-    "app_clear_data": [],
-    "app_exception": [
-        "fatal",
-        "timestamp",
-        "engagement_time_msec"
-    ],
-    "app_remove": [],
-    "app_store_refund": [
-        "product_id",
-        "value",
-        "currency",
-        "quantity"
-    ],
-    "app_store_subscription_cancel": [
-        "product_id",
-        "price",
-        "value",
-        "currency",
-        "cancellation_reason",
-    ],
-    "app_store_subscription_convert": [
-        "product_id",
-        "price",
-        "value",
-        "currency",
-        "quantity",
-    ],
-    "app_store_subscription_renew": [
-        "product_id",
-        "price",
-        "value",
-        "currency",
-        "quantity",
-        "renewal_count",
-    ],
-    "app_update": [
-        "previous_app_version"
-    ],
-    "begin_checkout": [
-        "coupon",
-        "currency",
-        "items",
-        "value"
-    ],
-    "click": [],
-    "dynamic_link_app_open": [
-        "source",
-        "medium",
-        "campaign",
-        "link_id",
-        "accept_time"
-    ],
-    "dynamic_link_app_update": [
-        "source",
-        "medium",
-        "campaign",
-        "link_id",
-        "accept_time",
-    ],
-    "dynamic_link_first_open": [
-        "source",
-        "medium",
-        "campaign",
-        "link_id",
-        "accept_time",
-    ],
-    "earn_virtual_currency": [
-        "virtual_currency_name",
-        "value"
-    ],
-    "error": [
-        "firebase_error",
-        "firebase_error_value"
-    ],
-    "file_download": [
-        "file_extension",
-        "file_name",
-        "link_classes",
-        "link_domain",
-        "link_id",
-        "link_text",
-        "link_url",
-    ],
-    "firebase_campaign": [
-        "source",
-        "medium",
-        "campaign",
-        "term",
-        "content",
-        "gclid",
-        "aclid",
-        "cp1",
-        "anid",
-        "click_timestamp",
-        "campaign_info_source",
-    ],
-    "firebase_in_app_message_action": [
-        "message_name",
-        "message_device_time",
-        "message_id",
-    ],
-    "firebase_in_app_message_dismiss": [
-        "message_name",
-        "message_device_time",
-        "message_id",
-    ],
-    "firebase_in_app_message_impression": [
-        "message_name",
-        "message_device_time",
-        "message_id",
-    ],
-    "first_open": [
-        "previous_gmp_app_id",
-        "updated_with_analytics",
-        "previous_first_open_count",
-        "system_app",
-        "system_app_update",
-        "deferred_analytics_collection",
-        "reset_analytics_cause",
-        "engagement_time_msec",
-    ],
-    "first_visit": [],
-    "generate_lead": [
-        "value",
-        "currency"
-    ],
-    "in_app_purchase": [
-        "product_id",
-        "price",
-        "value",
-        "currency",
-        "quantity",
-        "subscription",
-        "free_trial",
-        "introductory_price",
-    ],
-    "join_group": [
-        "group_id"
-    ],
-    "level_end": [
-        "level_name",
-        "success"
-    ],
-    "level_start": [
-        "level_name"
-    ],
-    "level_up": [
-        "character",
-        "level"
-    ],
-    "login": [
-        "method"
-    ],
-    "notification_dismiss": [
-        "message_name",
-        "message_time",
-        "message_device_time",
-        "message_id",
-        "topic",
-        "label",
-        "message_channel",
-    ],
-    "notification_foreground": [
-        "message_name",
-        "message_time",
-        "message_device_time",
-        "message_id",
-        "topic",
-        "label",
-        "message_channel",
-        "message_type",
-    ],
-    "notification_open": [
-        "message_name",
-        "message_time",
-        "message_device_time",
-        "message_id",
-        "topic",
-        "label",
-        "message_channel",
-    ],
-    "notification_receive": [
-        "message_name",
-        "message_time",
-        "message_device_time",
-        "message_id",
-        "topic",
-        "label",
-        "message_channel",
-        "message_type",
-    ],
-    "notification_send": [
-        "message_name",
-        "message_time",
-        "message_device_time",
-        "message_id",
-        "topic",
-        "label",
-        "message_channel",
-    ],
-    "os_update": [
-        "previous_os_version"
-    ],
-    "page_view": [
-        "page_location",
-        "page_referrer"
-    ],
-    "post_score": [
-        "level",
-        "character",
-        "score"
-    ],
-    "purchase": [
-        "affiliation",
-        "coupon",
-        "currency",
-        "items",
-        "transaction_id",
-        "shipping",
-        "tax",
-        "value",
-    ],
-    "refund": [
-        "transaction_id",
-        "value",
-        "currency",
-        "tax",
-        "shipping",
-        "items"
-    ],
-    "remove_from_cart": [
-        "currency",
-        "items",
-        "value"
-    ],
-    "screen_view": [
-        "firebase_screen",
-        "firebase_screen_class",
-        "firebase_screen_id",
-        "firebase_previous_screen",
-        "firebase_previous_class",
-        "firebase_previous_id",
-        "engagement_time_msec",
-    ],
-    "scroll": [],
-    "search": [
-        "search_term"
-    ],
-    "select_content": [
-        "content_type",
-        "item_id"
-    ],
-    "select_item": [
-        "items",
-        "item_list_name",
-        "item_list_id"
-    ],
-    "select_promotion": [
-        "items",
-        "promotion_id",
-        "promotion_name",
-        "creative_name",
-        "creative_slot",
-        "location_id",
-    ],
-    "session_start": [],
-    "share": [
-        "content_type",
-        "item_id"
-    ],
-    "sign_up": [
-        "method"
-    ],
-    "view_search_results": [
-        "search_term"
-    ],
-    "spend_virtual_currency": [
-        "item_name",
-        "virtual_currency_name",
-        "value"
-    ],
-    "tutorial_begin": [],
-    "tutorial_complete": [],
-    "unlock_achievement": [
-        "achievement_id"
-    ],
-    "user_engagement": [
-        "engagement_time_msec"
-    ],
-    "video_start": [
-        "video_current_time",
-        "video_duration",
-        "video_percent",
-        "video_provider",
-        "video_title",
-        "video_url",
-        "visible",
-    ],
-    "video_progress": [
-        "video_current_time",
-        "video_duration",
-        "video_percent",
-        "video_provider",
-        "video_title",
-        "video_url",
-        "visible",
-    ],
-    "video_complete": [
-        "video_current_time",
-        "video_duration",
-        "video_percent",
-        "video_provider",
-        "video_title",
-        "video_url",
-        "visible",
-    ],
-    "view_cart": [
-        "currency",
-        "items",
-        "value"
-    ],
-    "view_item": [
-        "currency",
-        "items",
-        "value"
-    ],
-    "view_item_list": [
-        "items",
-        "item_list_name",
-        "item_list_id"
-    ],
-    "view_promotion": [
-        "items",
-        "promotion_id",
-        "promotion_name",
-        "creative_name",
-        "creative_slot",
-        "location_id",
-    ],
-}
\ No newline at end of file
diff --git a/lib/gntp/LICENSE b/lib/gntp/LICENSE
new file mode 100644
index 00000000..c274a5a2
--- /dev/null
+++ b/lib/gntp/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2013 Paul Traylor
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lib/gntp/cli.py b/lib/gntp/cli.py
index 97e74af7..bc083062 100644
--- a/lib/gntp/cli.py
+++ b/lib/gntp/cli.py
@@ -118,9 +118,9 @@ def main():
 
 	# This would likely be better placed within the growl notifier
 	# class but until I make _checkIcon smarter this is "easier"
-	if options.icon and growl._checkIcon(options.icon) is False:
+	if options.icon is not None and not options.icon.startswith('http'):
 		logging.info('Loading image %s', options.icon)
-		f = open(options.icon, 'rb')
+		f = open(options.icon)
 		options.icon = f.read()
 		f.close()
 
diff --git a/lib/gntp/core.py b/lib/gntp/core.py
index 6492c6f3..957b5270 100644
--- a/lib/gntp/core.py
+++ b/lib/gntp/core.py
@@ -74,15 +74,8 @@ class _GNTPBase(object):
 		self.headers = {}
 		self.resources = {}
 
-	# For Python2 we can just return the bytes as is without worry
-	# but on Python3 we want to make sure we return the packet as
-	# a unicode string so that things like logging won't get confused
-	if gntp.shim.PY2:
-		def __str__(self):
-			return self.encode()
-	else:
-		def __str__(self):
-			return gntp.shim.u(self.encode())
+	def __str__(self):
+		return self.encode()
 
 	def _parse_info(self, data):
 		"""Parse the first line of a GNTP message to get security and other info values
diff --git a/lib/gntp/notifier.py b/lib/gntp/notifier.py
index fb923568..1719ecdf 100644
--- a/lib/gntp/notifier.py
+++ b/lib/gntp/notifier.py
@@ -69,8 +69,7 @@ class GrowlNotifier(object):
 		then we return False
 		'''
 		logger.info('Checking icon')
-
-		return gntp.shim.u(data)[:4] in ['http', 'file']
+		return gntp.shim.u(data).startswith('http')
 
 	def register(self):
 		"""Send GNTP Registration
diff --git a/lib/gntp/shim.py b/lib/gntp/shim.py
index 2d6b6d73..3a387828 100644
--- a/lib/gntp/shim.py
+++ b/lib/gntp/shim.py
@@ -10,7 +10,6 @@ https://pypi.python.org/pypi/six
 
 import sys
 
-PY2 = sys.version_info[0] == 2
 PY3 = sys.version_info[0] == 3
 
 if PY3:
diff --git a/lib/gntp/version.py b/lib/gntp/version.py
index 4268a538..2166aaca 100644
--- a/lib/gntp/version.py
+++ b/lib/gntp/version.py
@@ -1,4 +1,4 @@
 # Copyright: 2013 Paul Traylor
 # These sources are released under the terms of the MIT license: see LICENSE
 
-__version__ = '1.0.3'
+__version__ = '1.0.2'
diff --git a/lib/hashing_passwords.py b/lib/hashing_passwords.py
deleted file mode 100644
index beea1e85..00000000
--- a/lib/hashing_passwords.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# coding: utf8
-"""
-
-    Securely hash and check passwords using PBKDF2.
-
-    Use random salts to protect againt rainbow tables, many iterations against
-    brute-force, and constant-time comparaison againt timing attacks.
-
-    Keep parameters to the algorithm together with the hash so that we can
-    change the parameters and keep older hashes working.
-
-    See more details at http://exyr.org/2011/hashing-passwords/
-
-    Author: Simon Sapin
-    License: BSD
-
-"""
-
-from os import urandom
-from base64 import b64encode, b64decode
-from hashlib import pbkdf2_hmac
-from hmac import compare_digest
-
-
-# Parameters to PBKDF2. Only affect new passwords.
-SALT_LENGTH = 16
-KEY_LENGTH = 24
-HASH_FUNCTION = 'sha256'  # Must be in hashlib.
-# Linear to the hashing time. Adjust to be high but take a reasonable
-# amount of time on your server. Measure with:
-# python -m timeit -s 'import passwords as p' 'p.make_hash("something")'
-COST_FACTOR = 600000
-
-
-def make_hash(password):
-    """Generate a random salt and return a new hash for the password."""
-    if isinstance(password, str):
-        password = password.encode('utf-8')
-    salt = b64encode(urandom(SALT_LENGTH))
-    return 'PBKDF2${}${}${}${}'.format(
-        HASH_FUNCTION,
-        COST_FACTOR,
-        salt.decode('utf-8'),
-        b64encode(pbkdf2_hmac(HASH_FUNCTION, password, salt, COST_FACTOR, KEY_LENGTH)).decode('utf-8'))
-
-
-def check_hash(password, hash_):
-    """Check a password against an existing hash."""
-    if isinstance(password, str):
-        password = password.encode('utf-8')
-    algorithm, hash_function, cost_factor, salt, hash_a = hash_.split('$')
-    assert algorithm == 'PBKDF2'
-    hash_a = b64decode(hash_a.encode('utf-8'))
-    hash_b = pbkdf2_hmac(hash_function, password, salt.encode('utf-8'), int(cost_factor), len(hash_a))
-    assert len(hash_a) == len(hash_b)  # we requested this from pbkdf2_bin()
-    return compare_digest(hash_a, hash_b)
diff --git a/lib/html5lib/__init__.py b/lib/html5lib/__init__.py
index 320e0c3b..19a4b7d6 100644
--- a/lib/html5lib/__init__.py
+++ b/lib/html5lib/__init__.py
@@ -1,23 +1,14 @@
 """
-HTML parsing library based on the `WHATWG HTML specification
-<https://whatwg.org/html>`_. The parser is designed to be compatible with
-existing HTML found in the wild and implements well-defined error recovery that
+HTML parsing library based on the WHATWG "HTML5"
+specification. The parser is designed to be compatible with existing
+HTML found in the wild and implements well-defined error recovery that
 is largely compatible with modern desktop web browsers.
 
-Example usage::
+Example usage:
 
-    import html5lib
-    with open("my_document.html", "rb") as f:
-        tree = html5lib.parse(f)
-
-For convenience, this module re-exports the following names:
-
-* :func:`~.html5parser.parse`
-* :func:`~.html5parser.parseFragment`
-* :class:`~.html5parser.HTMLParser`
-* :func:`~.treebuilders.getTreeBuilder`
-* :func:`~.treewalkers.getTreeWalker`
-* :func:`~.serializer.serialize`
+import html5lib
+f = open("my_document.html")
+tree = html5lib.parse(f)
 """
 
 from __future__ import absolute_import, division, unicode_literals
@@ -29,7 +20,4 @@ from .serializer import serialize
 
 __all__ = ["HTMLParser", "parse", "parseFragment", "getTreeBuilder",
            "getTreeWalker", "serialize"]
-
-# this has to be at the top level, see how setup.py parses this
-#: Distribution version number.
-__version__ = "1.1"
+__version__ = "0.999"
diff --git a/lib/html5lib/_ihatexml.py b/lib/html5lib/_ihatexml.py
deleted file mode 100644
index 3ff803c1..00000000
--- a/lib/html5lib/_ihatexml.py
+++ /dev/null
@@ -1,289 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-import re
-import warnings
-
-from .constants import DataLossWarning
-
-baseChar = """
-[#x0041-#x005A] | [#x0061-#x007A] | [#x00C0-#x00D6] | [#x00D8-#x00F6] |
-[#x00F8-#x00FF] | [#x0100-#x0131] | [#x0134-#x013E] | [#x0141-#x0148] |
-[#x014A-#x017E] | [#x0180-#x01C3] | [#x01CD-#x01F0] | [#x01F4-#x01F5] |
-[#x01FA-#x0217] | [#x0250-#x02A8] | [#x02BB-#x02C1] | #x0386 |
-[#x0388-#x038A] | #x038C | [#x038E-#x03A1] | [#x03A3-#x03CE] |
-[#x03D0-#x03D6] | #x03DA | #x03DC | #x03DE | #x03E0 | [#x03E2-#x03F3] |
-[#x0401-#x040C] | [#x040E-#x044F] | [#x0451-#x045C] | [#x045E-#x0481] |
-[#x0490-#x04C4] | [#x04C7-#x04C8] | [#x04CB-#x04CC] | [#x04D0-#x04EB] |
-[#x04EE-#x04F5] | [#x04F8-#x04F9] | [#x0531-#x0556] | #x0559 |
-[#x0561-#x0586] | [#x05D0-#x05EA] | [#x05F0-#x05F2] | [#x0621-#x063A] |
-[#x0641-#x064A] | [#x0671-#x06B7] | [#x06BA-#x06BE] | [#x06C0-#x06CE] |
-[#x06D0-#x06D3] | #x06D5 | [#x06E5-#x06E6] | [#x0905-#x0939] | #x093D |
-[#x0958-#x0961] | [#x0985-#x098C] | [#x098F-#x0990] | [#x0993-#x09A8] |
-[#x09AA-#x09B0] | #x09B2 | [#x09B6-#x09B9] | [#x09DC-#x09DD] |
-[#x09DF-#x09E1] | [#x09F0-#x09F1] | [#x0A05-#x0A0A] | [#x0A0F-#x0A10] |
-[#x0A13-#x0A28] | [#x0A2A-#x0A30] | [#x0A32-#x0A33] | [#x0A35-#x0A36] |
-[#x0A38-#x0A39] | [#x0A59-#x0A5C] | #x0A5E | [#x0A72-#x0A74] |
-[#x0A85-#x0A8B] | #x0A8D | [#x0A8F-#x0A91] | [#x0A93-#x0AA8] |
-[#x0AAA-#x0AB0] | [#x0AB2-#x0AB3] | [#x0AB5-#x0AB9] | #x0ABD | #x0AE0 |
-[#x0B05-#x0B0C] | [#x0B0F-#x0B10] | [#x0B13-#x0B28] | [#x0B2A-#x0B30] |
-[#x0B32-#x0B33] | [#x0B36-#x0B39] | #x0B3D | [#x0B5C-#x0B5D] |
-[#x0B5F-#x0B61] | [#x0B85-#x0B8A] | [#x0B8E-#x0B90] | [#x0B92-#x0B95] |
-[#x0B99-#x0B9A] | #x0B9C | [#x0B9E-#x0B9F] | [#x0BA3-#x0BA4] |
-[#x0BA8-#x0BAA] | [#x0BAE-#x0BB5] | [#x0BB7-#x0BB9] | [#x0C05-#x0C0C] |
-[#x0C0E-#x0C10] | [#x0C12-#x0C28] | [#x0C2A-#x0C33] | [#x0C35-#x0C39] |
-[#x0C60-#x0C61] | [#x0C85-#x0C8C] | [#x0C8E-#x0C90] | [#x0C92-#x0CA8] |
-[#x0CAA-#x0CB3] | [#x0CB5-#x0CB9] | #x0CDE | [#x0CE0-#x0CE1] |
-[#x0D05-#x0D0C] | [#x0D0E-#x0D10] | [#x0D12-#x0D28] | [#x0D2A-#x0D39] |
-[#x0D60-#x0D61] | [#x0E01-#x0E2E] | #x0E30 | [#x0E32-#x0E33] |
-[#x0E40-#x0E45] | [#x0E81-#x0E82] | #x0E84 | [#x0E87-#x0E88] | #x0E8A |
-#x0E8D | [#x0E94-#x0E97] | [#x0E99-#x0E9F] | [#x0EA1-#x0EA3] | #x0EA5 |
-#x0EA7 | [#x0EAA-#x0EAB] | [#x0EAD-#x0EAE] | #x0EB0 | [#x0EB2-#x0EB3] |
-#x0EBD | [#x0EC0-#x0EC4] | [#x0F40-#x0F47] | [#x0F49-#x0F69] |
-[#x10A0-#x10C5] | [#x10D0-#x10F6] | #x1100 | [#x1102-#x1103] |
-[#x1105-#x1107] | #x1109 | [#x110B-#x110C] | [#x110E-#x1112] | #x113C |
-#x113E | #x1140 | #x114C | #x114E | #x1150 | [#x1154-#x1155] | #x1159 |
-[#x115F-#x1161] | #x1163 | #x1165 | #x1167 | #x1169 | [#x116D-#x116E] |
-[#x1172-#x1173] | #x1175 | #x119E | #x11A8 | #x11AB | [#x11AE-#x11AF] |
-[#x11B7-#x11B8] | #x11BA | [#x11BC-#x11C2] | #x11EB | #x11F0 | #x11F9 |
-[#x1E00-#x1E9B] | [#x1EA0-#x1EF9] | [#x1F00-#x1F15] | [#x1F18-#x1F1D] |
-[#x1F20-#x1F45] | [#x1F48-#x1F4D] | [#x1F50-#x1F57] | #x1F59 | #x1F5B |
-#x1F5D | [#x1F5F-#x1F7D] | [#x1F80-#x1FB4] | [#x1FB6-#x1FBC] | #x1FBE |
-[#x1FC2-#x1FC4] | [#x1FC6-#x1FCC] | [#x1FD0-#x1FD3] | [#x1FD6-#x1FDB] |
-[#x1FE0-#x1FEC] | [#x1FF2-#x1FF4] | [#x1FF6-#x1FFC] | #x2126 |
-[#x212A-#x212B] | #x212E | [#x2180-#x2182] | [#x3041-#x3094] |
-[#x30A1-#x30FA] | [#x3105-#x312C] | [#xAC00-#xD7A3]"""
-
-ideographic = """[#x4E00-#x9FA5] | #x3007 | [#x3021-#x3029]"""
-
-combiningCharacter = """
-[#x0300-#x0345] | [#x0360-#x0361] | [#x0483-#x0486] | [#x0591-#x05A1] |
-[#x05A3-#x05B9] | [#x05BB-#x05BD] | #x05BF | [#x05C1-#x05C2] | #x05C4 |
-[#x064B-#x0652] | #x0670 | [#x06D6-#x06DC] | [#x06DD-#x06DF] |
-[#x06E0-#x06E4] | [#x06E7-#x06E8] | [#x06EA-#x06ED] | [#x0901-#x0903] |
-#x093C | [#x093E-#x094C] | #x094D | [#x0951-#x0954] | [#x0962-#x0963] |
-[#x0981-#x0983] | #x09BC | #x09BE | #x09BF | [#x09C0-#x09C4] |
-[#x09C7-#x09C8] | [#x09CB-#x09CD] | #x09D7 | [#x09E2-#x09E3] | #x0A02 |
-#x0A3C | #x0A3E | #x0A3F | [#x0A40-#x0A42] | [#x0A47-#x0A48] |
-[#x0A4B-#x0A4D] | [#x0A70-#x0A71] | [#x0A81-#x0A83] | #x0ABC |
-[#x0ABE-#x0AC5] | [#x0AC7-#x0AC9] | [#x0ACB-#x0ACD] | [#x0B01-#x0B03] |
-#x0B3C | [#x0B3E-#x0B43] | [#x0B47-#x0B48] | [#x0B4B-#x0B4D] |
-[#x0B56-#x0B57] | [#x0B82-#x0B83] | [#x0BBE-#x0BC2] | [#x0BC6-#x0BC8] |
-[#x0BCA-#x0BCD] | #x0BD7 | [#x0C01-#x0C03] | [#x0C3E-#x0C44] |
-[#x0C46-#x0C48] | [#x0C4A-#x0C4D] | [#x0C55-#x0C56] | [#x0C82-#x0C83] |
-[#x0CBE-#x0CC4] | [#x0CC6-#x0CC8] | [#x0CCA-#x0CCD] | [#x0CD5-#x0CD6] |
-[#x0D02-#x0D03] | [#x0D3E-#x0D43] | [#x0D46-#x0D48] | [#x0D4A-#x0D4D] |
-#x0D57 | #x0E31 | [#x0E34-#x0E3A] | [#x0E47-#x0E4E] | #x0EB1 |
-[#x0EB4-#x0EB9] | [#x0EBB-#x0EBC] | [#x0EC8-#x0ECD] | [#x0F18-#x0F19] |
-#x0F35 | #x0F37 | #x0F39 | #x0F3E | #x0F3F | [#x0F71-#x0F84] |
-[#x0F86-#x0F8B] | [#x0F90-#x0F95] | #x0F97 | [#x0F99-#x0FAD] |
-[#x0FB1-#x0FB7] | #x0FB9 | [#x20D0-#x20DC] | #x20E1 | [#x302A-#x302F] |
-#x3099 | #x309A"""
-
-digit = """
-[#x0030-#x0039] | [#x0660-#x0669] | [#x06F0-#x06F9] | [#x0966-#x096F] |
-[#x09E6-#x09EF] | [#x0A66-#x0A6F] | [#x0AE6-#x0AEF] | [#x0B66-#x0B6F] |
-[#x0BE7-#x0BEF] | [#x0C66-#x0C6F] | [#x0CE6-#x0CEF] | [#x0D66-#x0D6F] |
-[#x0E50-#x0E59] | [#x0ED0-#x0ED9] | [#x0F20-#x0F29]"""
-
-extender = """
-#x00B7 | #x02D0 | #x02D1 | #x0387 | #x0640 | #x0E46 | #x0EC6 | #x3005 |
-#[#x3031-#x3035] | [#x309D-#x309E] | [#x30FC-#x30FE]"""
-
-letter = " | ".join([baseChar, ideographic])
-
-# Without the
-name = " | ".join([letter, digit, ".", "-", "_", combiningCharacter,
-                   extender])
-nameFirst = " | ".join([letter, "_"])
-
-reChar = re.compile(r"#x([\d|A-F]{4,4})")
-reCharRange = re.compile(r"\[#x([\d|A-F]{4,4})-#x([\d|A-F]{4,4})\]")
-
-
-def charStringToList(chars):
-    charRanges = [item.strip() for item in chars.split(" | ")]
-    rv = []
-    for item in charRanges:
-        foundMatch = False
-        for regexp in (reChar, reCharRange):
-            match = regexp.match(item)
-            if match is not None:
-                rv.append([hexToInt(item) for item in match.groups()])
-                if len(rv[-1]) == 1:
-                    rv[-1] = rv[-1] * 2
-                foundMatch = True
-                break
-        if not foundMatch:
-            assert len(item) == 1
-
-            rv.append([ord(item)] * 2)
-    rv = normaliseCharList(rv)
-    return rv
-
-
-def normaliseCharList(charList):
-    charList = sorted(charList)
-    for item in charList:
-        assert item[1] >= item[0]
-    rv = []
-    i = 0
-    while i < len(charList):
-        j = 1
-        rv.append(charList[i])
-        while i + j < len(charList) and charList[i + j][0] <= rv[-1][1] + 1:
-            rv[-1][1] = charList[i + j][1]
-            j += 1
-        i += j
-    return rv
-
-
-# We don't really support characters above the BMP :(
-max_unicode = int("FFFF", 16)
-
-
-def missingRanges(charList):
-    rv = []
-    if charList[0] != 0:
-        rv.append([0, charList[0][0] - 1])
-    for i, item in enumerate(charList[:-1]):
-        rv.append([item[1] + 1, charList[i + 1][0] - 1])
-    if charList[-1][1] != max_unicode:
-        rv.append([charList[-1][1] + 1, max_unicode])
-    return rv
-
-
-def listToRegexpStr(charList):
-    rv = []
-    for item in charList:
-        if item[0] == item[1]:
-            rv.append(escapeRegexp(chr(item[0])))
-        else:
-            rv.append(escapeRegexp(chr(item[0])) + "-" +
-                      escapeRegexp(chr(item[1])))
-    return "[%s]" % "".join(rv)
-
-
-def hexToInt(hex_str):
-    return int(hex_str, 16)
-
-
-def escapeRegexp(string):
-    specialCharacters = (".", "^", "$", "*", "+", "?", "{", "}",
-                         "[", "]", "|", "(", ")", "-")
-    for char in specialCharacters:
-        string = string.replace(char, "\\" + char)
-
-    return string
-
-# output from the above
-nonXmlNameBMPRegexp = re.compile('[\x00-,/:-@\\[-\\^`\\{-\xb6\xb8-\xbf\xd7\xf7\u0132-\u0133\u013f-\u0140\u0149\u017f\u01c4-\u01cc\u01f1-\u01f3\u01f6-\u01f9\u0218-\u024f\u02a9-\u02ba\u02c2-\u02cf\u02d2-\u02ff\u0346-\u035f\u0362-\u0385\u038b\u038d\u03a2\u03cf\u03d7-\u03d9\u03db\u03dd\u03df\u03e1\u03f4-\u0400\u040d\u0450\u045d\u0482\u0487-\u048f\u04c5-\u04c6\u04c9-\u04ca\u04cd-\u04cf\u04ec-\u04ed\u04f6-\u04f7\u04fa-\u0530\u0557-\u0558\u055a-\u0560\u0587-\u0590\u05a2\u05ba\u05be\u05c0\u05c3\u05c5-\u05cf\u05eb-\u05ef\u05f3-\u0620\u063b-\u063f\u0653-\u065f\u066a-\u066f\u06b8-\u06b9\u06bf\u06cf\u06d4\u06e9\u06ee-\u06ef\u06fa-\u0900\u0904\u093a-\u093b\u094e-\u0950\u0955-\u0957\u0964-\u0965\u0970-\u0980\u0984\u098d-\u098e\u0991-\u0992\u09a9\u09b1\u09b3-\u09b5\u09ba-\u09bb\u09bd\u09c5-\u09c6\u09c9-\u09ca\u09ce-\u09d6\u09d8-\u09db\u09de\u09e4-\u09e5\u09f2-\u0a01\u0a03-\u0a04\u0a0b-\u0a0e\u0a11-\u0a12\u0a29\u0a31\u0a34\u0a37\u0a3a-\u0a3b\u0a3d\u0a43-\u0a46\u0a49-\u0a4a\u0a4e-\u0a58\u0a5d\u0a5f-\u0a65\u0a75-\u0a80\u0a84\u0a8c\u0a8e\u0a92\u0aa9\u0ab1\u0ab4\u0aba-\u0abb\u0ac6\u0aca\u0ace-\u0adf\u0ae1-\u0ae5\u0af0-\u0b00\u0b04\u0b0d-\u0b0e\u0b11-\u0b12\u0b29\u0b31\u0b34-\u0b35\u0b3a-\u0b3b\u0b44-\u0b46\u0b49-\u0b4a\u0b4e-\u0b55\u0b58-\u0b5b\u0b5e\u0b62-\u0b65\u0b70-\u0b81\u0b84\u0b8b-\u0b8d\u0b91\u0b96-\u0b98\u0b9b\u0b9d\u0ba0-\u0ba2\u0ba5-\u0ba7\u0bab-\u0bad\u0bb6\u0bba-\u0bbd\u0bc3-\u0bc5\u0bc9\u0bce-\u0bd6\u0bd8-\u0be6\u0bf0-\u0c00\u0c04\u0c0d\u0c11\u0c29\u0c34\u0c3a-\u0c3d\u0c45\u0c49\u0c4e-\u0c54\u0c57-\u0c5f\u0c62-\u0c65\u0c70-\u0c81\u0c84\u0c8d\u0c91\u0ca9\u0cb4\u0cba-\u0cbd\u0cc5\u0cc9\u0cce-\u0cd4\u0cd7-\u0cdd\u0cdf\u0ce2-\u0ce5\u0cf0-\u0d01\u0d04\u0d0d\u0d11\u0d29\u0d3a-\u0d3d\u0d44-\u0d45\u0d49\u0d4e-\u0d56\u0d58-\u0d5f\u0d62-\u0d65\u0d70-\u0e00\u0e2f\u0e3b-\u0e3f\u0e4f\u0e5a-\u0e80\u0e83\u0e85-\u0e86\u0e89\u0e8b-\u0e8c\u0e8e-\u0e93\u0e98\u0ea0\u0ea4\u0ea6\u0ea8-\u0ea9\u0eac\u0eaf\u0eba\u0ebe-\u0ebf\u0ec5\u0ec7\u0ece-\u0ecf\u0eda-\u0f17\u0f1a-\u0f1f\u0f2a-\u0f34\u0f36\u0f38\u0f3a-\u0f3d\u0f48\u0f6a-\u0f70\u0f85\u0f8c-\u0f8f\u0f96\u0f98\u0fae-\u0fb0\u0fb8\u0fba-\u109f\u10c6-\u10cf\u10f7-\u10ff\u1101\u1104\u1108\u110a\u110d\u1113-\u113b\u113d\u113f\u1141-\u114b\u114d\u114f\u1151-\u1153\u1156-\u1158\u115a-\u115e\u1162\u1164\u1166\u1168\u116a-\u116c\u116f-\u1171\u1174\u1176-\u119d\u119f-\u11a7\u11a9-\u11aa\u11ac-\u11ad\u11b0-\u11b6\u11b9\u11bb\u11c3-\u11ea\u11ec-\u11ef\u11f1-\u11f8\u11fa-\u1dff\u1e9c-\u1e9f\u1efa-\u1eff\u1f16-\u1f17\u1f1e-\u1f1f\u1f46-\u1f47\u1f4e-\u1f4f\u1f58\u1f5a\u1f5c\u1f5e\u1f7e-\u1f7f\u1fb5\u1fbd\u1fbf-\u1fc1\u1fc5\u1fcd-\u1fcf\u1fd4-\u1fd5\u1fdc-\u1fdf\u1fed-\u1ff1\u1ff5\u1ffd-\u20cf\u20dd-\u20e0\u20e2-\u2125\u2127-\u2129\u212c-\u212d\u212f-\u217f\u2183-\u3004\u3006\u3008-\u3020\u3030\u3036-\u3040\u3095-\u3098\u309b-\u309c\u309f-\u30a0\u30fb\u30ff-\u3104\u312d-\u4dff\u9fa6-\uabff\ud7a4-\uffff]')  # noqa
-
-nonXmlNameFirstBMPRegexp = re.compile('[\x00-@\\[-\\^`\\{-\xbf\xd7\xf7\u0132-\u0133\u013f-\u0140\u0149\u017f\u01c4-\u01cc\u01f1-\u01f3\u01f6-\u01f9\u0218-\u024f\u02a9-\u02ba\u02c2-\u0385\u0387\u038b\u038d\u03a2\u03cf\u03d7-\u03d9\u03db\u03dd\u03df\u03e1\u03f4-\u0400\u040d\u0450\u045d\u0482-\u048f\u04c5-\u04c6\u04c9-\u04ca\u04cd-\u04cf\u04ec-\u04ed\u04f6-\u04f7\u04fa-\u0530\u0557-\u0558\u055a-\u0560\u0587-\u05cf\u05eb-\u05ef\u05f3-\u0620\u063b-\u0640\u064b-\u0670\u06b8-\u06b9\u06bf\u06cf\u06d4\u06d6-\u06e4\u06e7-\u0904\u093a-\u093c\u093e-\u0957\u0962-\u0984\u098d-\u098e\u0991-\u0992\u09a9\u09b1\u09b3-\u09b5\u09ba-\u09db\u09de\u09e2-\u09ef\u09f2-\u0a04\u0a0b-\u0a0e\u0a11-\u0a12\u0a29\u0a31\u0a34\u0a37\u0a3a-\u0a58\u0a5d\u0a5f-\u0a71\u0a75-\u0a84\u0a8c\u0a8e\u0a92\u0aa9\u0ab1\u0ab4\u0aba-\u0abc\u0abe-\u0adf\u0ae1-\u0b04\u0b0d-\u0b0e\u0b11-\u0b12\u0b29\u0b31\u0b34-\u0b35\u0b3a-\u0b3c\u0b3e-\u0b5b\u0b5e\u0b62-\u0b84\u0b8b-\u0b8d\u0b91\u0b96-\u0b98\u0b9b\u0b9d\u0ba0-\u0ba2\u0ba5-\u0ba7\u0bab-\u0bad\u0bb6\u0bba-\u0c04\u0c0d\u0c11\u0c29\u0c34\u0c3a-\u0c5f\u0c62-\u0c84\u0c8d\u0c91\u0ca9\u0cb4\u0cba-\u0cdd\u0cdf\u0ce2-\u0d04\u0d0d\u0d11\u0d29\u0d3a-\u0d5f\u0d62-\u0e00\u0e2f\u0e31\u0e34-\u0e3f\u0e46-\u0e80\u0e83\u0e85-\u0e86\u0e89\u0e8b-\u0e8c\u0e8e-\u0e93\u0e98\u0ea0\u0ea4\u0ea6\u0ea8-\u0ea9\u0eac\u0eaf\u0eb1\u0eb4-\u0ebc\u0ebe-\u0ebf\u0ec5-\u0f3f\u0f48\u0f6a-\u109f\u10c6-\u10cf\u10f7-\u10ff\u1101\u1104\u1108\u110a\u110d\u1113-\u113b\u113d\u113f\u1141-\u114b\u114d\u114f\u1151-\u1153\u1156-\u1158\u115a-\u115e\u1162\u1164\u1166\u1168\u116a-\u116c\u116f-\u1171\u1174\u1176-\u119d\u119f-\u11a7\u11a9-\u11aa\u11ac-\u11ad\u11b0-\u11b6\u11b9\u11bb\u11c3-\u11ea\u11ec-\u11ef\u11f1-\u11f8\u11fa-\u1dff\u1e9c-\u1e9f\u1efa-\u1eff\u1f16-\u1f17\u1f1e-\u1f1f\u1f46-\u1f47\u1f4e-\u1f4f\u1f58\u1f5a\u1f5c\u1f5e\u1f7e-\u1f7f\u1fb5\u1fbd\u1fbf-\u1fc1\u1fc5\u1fcd-\u1fcf\u1fd4-\u1fd5\u1fdc-\u1fdf\u1fed-\u1ff1\u1ff5\u1ffd-\u2125\u2127-\u2129\u212c-\u212d\u212f-\u217f\u2183-\u3006\u3008-\u3020\u302a-\u3040\u3095-\u30a0\u30fb-\u3104\u312d-\u4dff\u9fa6-\uabff\ud7a4-\uffff]')  # noqa
-
-# Simpler things
-nonPubidCharRegexp = re.compile("[^\x20\x0D\x0Aa-zA-Z0-9\\-'()+,./:=?;!*#@$_%]")
-
-
-class InfosetFilter(object):
-    replacementRegexp = re.compile(r"U[\dA-F]{5,5}")
-
-    def __init__(self,
-                 dropXmlnsLocalName=False,
-                 dropXmlnsAttrNs=False,
-                 preventDoubleDashComments=False,
-                 preventDashAtCommentEnd=False,
-                 replaceFormFeedCharacters=True,
-                 preventSingleQuotePubid=False):
-
-        self.dropXmlnsLocalName = dropXmlnsLocalName
-        self.dropXmlnsAttrNs = dropXmlnsAttrNs
-
-        self.preventDoubleDashComments = preventDoubleDashComments
-        self.preventDashAtCommentEnd = preventDashAtCommentEnd
-
-        self.replaceFormFeedCharacters = replaceFormFeedCharacters
-
-        self.preventSingleQuotePubid = preventSingleQuotePubid
-
-        self.replaceCache = {}
-
-    def coerceAttribute(self, name, namespace=None):
-        if self.dropXmlnsLocalName and name.startswith("xmlns:"):
-            warnings.warn("Attributes cannot begin with xmlns", DataLossWarning)
-            return None
-        elif (self.dropXmlnsAttrNs and
-              namespace == "http://www.w3.org/2000/xmlns/"):
-            warnings.warn("Attributes cannot be in the xml namespace", DataLossWarning)
-            return None
-        else:
-            return self.toXmlName(name)
-
-    def coerceElement(self, name):
-        return self.toXmlName(name)
-
-    def coerceComment(self, data):
-        if self.preventDoubleDashComments:
-            while "--" in data:
-                warnings.warn("Comments cannot contain adjacent dashes", DataLossWarning)
-                data = data.replace("--", "- -")
-            if data.endswith("-"):
-                warnings.warn("Comments cannot end in a dash", DataLossWarning)
-                data += " "
-        return data
-
-    def coerceCharacters(self, data):
-        if self.replaceFormFeedCharacters:
-            for _ in range(data.count("\x0C")):
-                warnings.warn("Text cannot contain U+000C", DataLossWarning)
-            data = data.replace("\x0C", " ")
-        # Other non-xml characters
-        return data
-
-    def coercePubid(self, data):
-        dataOutput = data
-        for char in nonPubidCharRegexp.findall(data):
-            warnings.warn("Coercing non-XML pubid", DataLossWarning)
-            replacement = self.getReplacementCharacter(char)
-            dataOutput = dataOutput.replace(char, replacement)
-        if self.preventSingleQuotePubid and dataOutput.find("'") >= 0:
-            warnings.warn("Pubid cannot contain single quote", DataLossWarning)
-            dataOutput = dataOutput.replace("'", self.getReplacementCharacter("'"))
-        return dataOutput
-
-    def toXmlName(self, name):
-        nameFirst = name[0]
-        nameRest = name[1:]
-        m = nonXmlNameFirstBMPRegexp.match(nameFirst)
-        if m:
-            warnings.warn("Coercing non-XML name: %s" % name, DataLossWarning)
-            nameFirstOutput = self.getReplacementCharacter(nameFirst)
-        else:
-            nameFirstOutput = nameFirst
-
-        nameRestOutput = nameRest
-        replaceChars = set(nonXmlNameBMPRegexp.findall(nameRest))
-        for char in replaceChars:
-            warnings.warn("Coercing non-XML name: %s" % name, DataLossWarning)
-            replacement = self.getReplacementCharacter(char)
-            nameRestOutput = nameRestOutput.replace(char, replacement)
-        return nameFirstOutput + nameRestOutput
-
-    def getReplacementCharacter(self, char):
-        if char in self.replaceCache:
-            replacement = self.replaceCache[char]
-        else:
-            replacement = self.escapeChar(char)
-        return replacement
-
-    def fromXmlName(self, name):
-        for item in set(self.replacementRegexp.findall(name)):
-            name = name.replace(item, self.unescapeChar(item))
-        return name
-
-    def escapeChar(self, char):
-        replacement = "U%05X" % ord(char)
-        self.replaceCache[char] = replacement
-        return replacement
-
-    def unescapeChar(self, charcode):
-        return chr(int(charcode[1:], 16))
diff --git a/lib/html5lib/_inputstream.py b/lib/html5lib/_inputstream.py
deleted file mode 100644
index 0207dd21..00000000
--- a/lib/html5lib/_inputstream.py
+++ /dev/null
@@ -1,918 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-from six import text_type
-from six.moves import http_client, urllib
-
-import codecs
-import re
-from io import BytesIO, StringIO
-
-import webencodings
-
-from .constants import EOF, spaceCharacters, asciiLetters, asciiUppercase
-from .constants import _ReparseException
-from . import _utils
-
-# Non-unicode versions of constants for use in the pre-parser
-spaceCharactersBytes = frozenset([item.encode("ascii") for item in spaceCharacters])
-asciiLettersBytes = frozenset([item.encode("ascii") for item in asciiLetters])
-asciiUppercaseBytes = frozenset([item.encode("ascii") for item in asciiUppercase])
-spacesAngleBrackets = spaceCharactersBytes | frozenset([b">", b"<"])
-
-
-invalid_unicode_no_surrogate = "[\u0001-\u0008\u000B\u000E-\u001F\u007F-\u009F\uFDD0-\uFDEF\uFFFE\uFFFF\U0001FFFE\U0001FFFF\U0002FFFE\U0002FFFF\U0003FFFE\U0003FFFF\U0004FFFE\U0004FFFF\U0005FFFE\U0005FFFF\U0006FFFE\U0006FFFF\U0007FFFE\U0007FFFF\U0008FFFE\U0008FFFF\U0009FFFE\U0009FFFF\U000AFFFE\U000AFFFF\U000BFFFE\U000BFFFF\U000CFFFE\U000CFFFF\U000DFFFE\U000DFFFF\U000EFFFE\U000EFFFF\U000FFFFE\U000FFFFF\U0010FFFE\U0010FFFF]"  # noqa
-
-if _utils.supports_lone_surrogates:
-    # Use one extra step of indirection and create surrogates with
-    # eval. Not using this indirection would introduce an illegal
-    # unicode literal on platforms not supporting such lone
-    # surrogates.
-    assert invalid_unicode_no_surrogate[-1] == "]" and invalid_unicode_no_surrogate.count("]") == 1
-    invalid_unicode_re = re.compile(invalid_unicode_no_surrogate[:-1] +
-                                    eval('"\\uD800-\\uDFFF"') +  # pylint:disable=eval-used
-                                    "]")
-else:
-    invalid_unicode_re = re.compile(invalid_unicode_no_surrogate)
-
-non_bmp_invalid_codepoints = {0x1FFFE, 0x1FFFF, 0x2FFFE, 0x2FFFF, 0x3FFFE,
-                              0x3FFFF, 0x4FFFE, 0x4FFFF, 0x5FFFE, 0x5FFFF,
-                              0x6FFFE, 0x6FFFF, 0x7FFFE, 0x7FFFF, 0x8FFFE,
-                              0x8FFFF, 0x9FFFE, 0x9FFFF, 0xAFFFE, 0xAFFFF,
-                              0xBFFFE, 0xBFFFF, 0xCFFFE, 0xCFFFF, 0xDFFFE,
-                              0xDFFFF, 0xEFFFE, 0xEFFFF, 0xFFFFE, 0xFFFFF,
-                              0x10FFFE, 0x10FFFF}
-
-ascii_punctuation_re = re.compile("[\u0009-\u000D\u0020-\u002F\u003A-\u0040\u005C\u005B-\u0060\u007B-\u007E]")
-
-# Cache for charsUntil()
-charsUntilRegEx = {}
-
-
-class BufferedStream(object):
-    """Buffering for streams that do not have buffering of their own
-
-    The buffer is implemented as a list of chunks on the assumption that
-    joining many strings will be slow since it is O(n**2)
-    """
-
-    def __init__(self, stream):
-        self.stream = stream
-        self.buffer = []
-        self.position = [-1, 0]  # chunk number, offset
-
-    def tell(self):
-        pos = 0
-        for chunk in self.buffer[:self.position[0]]:
-            pos += len(chunk)
-        pos += self.position[1]
-        return pos
-
-    def seek(self, pos):
-        assert pos <= self._bufferedBytes()
-        offset = pos
-        i = 0
-        while len(self.buffer[i]) < offset:
-            offset -= len(self.buffer[i])
-            i += 1
-        self.position = [i, offset]
-
-    def read(self, bytes):
-        if not self.buffer:
-            return self._readStream(bytes)
-        elif (self.position[0] == len(self.buffer) and
-              self.position[1] == len(self.buffer[-1])):
-            return self._readStream(bytes)
-        else:
-            return self._readFromBuffer(bytes)
-
-    def _bufferedBytes(self):
-        return sum([len(item) for item in self.buffer])
-
-    def _readStream(self, bytes):
-        data = self.stream.read(bytes)
-        self.buffer.append(data)
-        self.position[0] += 1
-        self.position[1] = len(data)
-        return data
-
-    def _readFromBuffer(self, bytes):
-        remainingBytes = bytes
-        rv = []
-        bufferIndex = self.position[0]
-        bufferOffset = self.position[1]
-        while bufferIndex < len(self.buffer) and remainingBytes != 0:
-            assert remainingBytes > 0
-            bufferedData = self.buffer[bufferIndex]
-
-            if remainingBytes <= len(bufferedData) - bufferOffset:
-                bytesToRead = remainingBytes
-                self.position = [bufferIndex, bufferOffset + bytesToRead]
-            else:
-                bytesToRead = len(bufferedData) - bufferOffset
-                self.position = [bufferIndex, len(bufferedData)]
-                bufferIndex += 1
-            rv.append(bufferedData[bufferOffset:bufferOffset + bytesToRead])
-            remainingBytes -= bytesToRead
-
-            bufferOffset = 0
-
-        if remainingBytes:
-            rv.append(self._readStream(remainingBytes))
-
-        return b"".join(rv)
-
-
-def HTMLInputStream(source, **kwargs):
-    # Work around Python bug #20007: read(0) closes the connection.
-    # http://bugs.python.org/issue20007
-    if (isinstance(source, http_client.HTTPResponse) or
-        # Also check for addinfourl wrapping HTTPResponse
-        (isinstance(source, urllib.response.addbase) and
-         isinstance(source.fp, http_client.HTTPResponse))):
-        isUnicode = False
-    elif hasattr(source, "read"):
-        isUnicode = isinstance(source.read(0), text_type)
-    else:
-        isUnicode = isinstance(source, text_type)
-
-    if isUnicode:
-        encodings = [x for x in kwargs if x.endswith("_encoding")]
-        if encodings:
-            raise TypeError("Cannot set an encoding with a unicode input, set %r" % encodings)
-
-        return HTMLUnicodeInputStream(source, **kwargs)
-    else:
-        return HTMLBinaryInputStream(source, **kwargs)
-
-
-class HTMLUnicodeInputStream(object):
-    """Provides a unicode stream of characters to the HTMLTokenizer.
-
-    This class takes care of character encoding and removing or replacing
-    incorrect byte-sequences and also provides column and line tracking.
-
-    """
-
-    _defaultChunkSize = 10240
-
-    def __init__(self, source):
-        """Initialises the HTMLInputStream.
-
-        HTMLInputStream(source, [encoding]) -> Normalized stream from source
-        for use by html5lib.
-
-        source can be either a file-object, local filename or a string.
-
-        The optional encoding parameter must be a string that indicates
-        the encoding.  If specified, that encoding will be used,
-        regardless of any BOM or later declaration (such as in a meta
-        element)
-
-        """
-
-        if not _utils.supports_lone_surrogates:
-            # Such platforms will have already checked for such
-            # surrogate errors, so no need to do this checking.
-            self.reportCharacterErrors = None
-        elif len("\U0010FFFF") == 1:
-            self.reportCharacterErrors = self.characterErrorsUCS4
-        else:
-            self.reportCharacterErrors = self.characterErrorsUCS2
-
-        # List of where new lines occur
-        self.newLines = [0]
-
-        self.charEncoding = (lookupEncoding("utf-8"), "certain")
-        self.dataStream = self.openStream(source)
-
-        self.reset()
-
-    def reset(self):
-        self.chunk = ""
-        self.chunkSize = 0
-        self.chunkOffset = 0
-        self.errors = []
-
-        # number of (complete) lines in previous chunks
-        self.prevNumLines = 0
-        # number of columns in the last line of the previous chunk
-        self.prevNumCols = 0
-
-        # Deal with CR LF and surrogates split over chunk boundaries
-        self._bufferedCharacter = None
-
-    def openStream(self, source):
-        """Produces a file object from source.
-
-        source can be either a file object, local filename or a string.
-
-        """
-        # Already a file object
-        if hasattr(source, 'read'):
-            stream = source
-        else:
-            stream = StringIO(source)
-
-        return stream
-
-    def _position(self, offset):
-        chunk = self.chunk
-        nLines = chunk.count('\n', 0, offset)
-        positionLine = self.prevNumLines + nLines
-        lastLinePos = chunk.rfind('\n', 0, offset)
-        if lastLinePos == -1:
-            positionColumn = self.prevNumCols + offset
-        else:
-            positionColumn = offset - (lastLinePos + 1)
-        return (positionLine, positionColumn)
-
-    def position(self):
-        """Returns (line, col) of the current position in the stream."""
-        line, col = self._position(self.chunkOffset)
-        return (line + 1, col)
-
-    def char(self):
-        """ Read one character from the stream or queue if available. Return
-            EOF when EOF is reached.
-        """
-        # Read a new chunk from the input stream if necessary
-        if self.chunkOffset >= self.chunkSize:
-            if not self.readChunk():
-                return EOF
-
-        chunkOffset = self.chunkOffset
-        char = self.chunk[chunkOffset]
-        self.chunkOffset = chunkOffset + 1
-
-        return char
-
-    def readChunk(self, chunkSize=None):
-        if chunkSize is None:
-            chunkSize = self._defaultChunkSize
-
-        self.prevNumLines, self.prevNumCols = self._position(self.chunkSize)
-
-        self.chunk = ""
-        self.chunkSize = 0
-        self.chunkOffset = 0
-
-        data = self.dataStream.read(chunkSize)
-
-        # Deal with CR LF and surrogates broken across chunks
-        if self._bufferedCharacter:
-            data = self._bufferedCharacter + data
-            self._bufferedCharacter = None
-        elif not data:
-            # We have no more data, bye-bye stream
-            return False
-
-        if len(data) > 1:
-            lastv = ord(data[-1])
-            if lastv == 0x0D or 0xD800 <= lastv <= 0xDBFF:
-                self._bufferedCharacter = data[-1]
-                data = data[:-1]
-
-        if self.reportCharacterErrors:
-            self.reportCharacterErrors(data)
-
-        # Replace invalid characters
-        data = data.replace("\r\n", "\n")
-        data = data.replace("\r", "\n")
-
-        self.chunk = data
-        self.chunkSize = len(data)
-
-        return True
-
-    def characterErrorsUCS4(self, data):
-        for _ in range(len(invalid_unicode_re.findall(data))):
-            self.errors.append("invalid-codepoint")
-
-    def characterErrorsUCS2(self, data):
-        # Someone picked the wrong compile option
-        # You lose
-        skip = False
-        for match in invalid_unicode_re.finditer(data):
-            if skip:
-                continue
-            codepoint = ord(match.group())
-            pos = match.start()
-            # Pretty sure there should be endianness issues here
-            if _utils.isSurrogatePair(data[pos:pos + 2]):
-                # We have a surrogate pair!
-                char_val = _utils.surrogatePairToCodepoint(data[pos:pos + 2])
-                if char_val in non_bmp_invalid_codepoints:
-                    self.errors.append("invalid-codepoint")
-                skip = True
-            elif (codepoint >= 0xD800 and codepoint <= 0xDFFF and
-                  pos == len(data) - 1):
-                self.errors.append("invalid-codepoint")
-            else:
-                skip = False
-                self.errors.append("invalid-codepoint")
-
-    def charsUntil(self, characters, opposite=False):
-        """ Returns a string of characters from the stream up to but not
-        including any character in 'characters' or EOF. 'characters' must be
-        a container that supports the 'in' method and iteration over its
-        characters.
-        """
-
-        # Use a cache of regexps to find the required characters
-        try:
-            chars = charsUntilRegEx[(characters, opposite)]
-        except KeyError:
-            if __debug__:
-                for c in characters:
-                    assert(ord(c) < 128)
-            regex = "".join(["\\x%02x" % ord(c) for c in characters])
-            if not opposite:
-                regex = "^%s" % regex
-            chars = charsUntilRegEx[(characters, opposite)] = re.compile("[%s]+" % regex)
-
-        rv = []
-
-        while True:
-            # Find the longest matching prefix
-            m = chars.match(self.chunk, self.chunkOffset)
-            if m is None:
-                # If nothing matched, and it wasn't because we ran out of chunk,
-                # then stop
-                if self.chunkOffset != self.chunkSize:
-                    break
-            else:
-                end = m.end()
-                # If not the whole chunk matched, return everything
-                # up to the part that didn't match
-                if end != self.chunkSize:
-                    rv.append(self.chunk[self.chunkOffset:end])
-                    self.chunkOffset = end
-                    break
-            # If the whole remainder of the chunk matched,
-            # use it all and read the next chunk
-            rv.append(self.chunk[self.chunkOffset:])
-            if not self.readChunk():
-                # Reached EOF
-                break
-
-        r = "".join(rv)
-        return r
-
-    def unget(self, char):
-        # Only one character is allowed to be ungotten at once - it must
-        # be consumed again before any further call to unget
-        if char is not EOF:
-            if self.chunkOffset == 0:
-                # unget is called quite rarely, so it's a good idea to do
-                # more work here if it saves a bit of work in the frequently
-                # called char and charsUntil.
-                # So, just prepend the ungotten character onto the current
-                # chunk:
-                self.chunk = char + self.chunk
-                self.chunkSize += 1
-            else:
-                self.chunkOffset -= 1
-                assert self.chunk[self.chunkOffset] == char
-
-
-class HTMLBinaryInputStream(HTMLUnicodeInputStream):
-    """Provides a unicode stream of characters to the HTMLTokenizer.
-
-    This class takes care of character encoding and removing or replacing
-    incorrect byte-sequences and also provides column and line tracking.
-
-    """
-
-    def __init__(self, source, override_encoding=None, transport_encoding=None,
-                 same_origin_parent_encoding=None, likely_encoding=None,
-                 default_encoding="windows-1252", useChardet=True):
-        """Initialises the HTMLInputStream.
-
-        HTMLInputStream(source, [encoding]) -> Normalized stream from source
-        for use by html5lib.
-
-        source can be either a file-object, local filename or a string.
-
-        The optional encoding parameter must be a string that indicates
-        the encoding.  If specified, that encoding will be used,
-        regardless of any BOM or later declaration (such as in a meta
-        element)
-
-        """
-        # Raw Stream - for unicode objects this will encode to utf-8 and set
-        #              self.charEncoding as appropriate
-        self.rawStream = self.openStream(source)
-
-        HTMLUnicodeInputStream.__init__(self, self.rawStream)
-
-        # Encoding Information
-        # Number of bytes to use when looking for a meta element with
-        # encoding information
-        self.numBytesMeta = 1024
-        # Number of bytes to use when using detecting encoding using chardet
-        self.numBytesChardet = 100
-        # Things from args
-        self.override_encoding = override_encoding
-        self.transport_encoding = transport_encoding
-        self.same_origin_parent_encoding = same_origin_parent_encoding
-        self.likely_encoding = likely_encoding
-        self.default_encoding = default_encoding
-
-        # Determine encoding
-        self.charEncoding = self.determineEncoding(useChardet)
-        assert self.charEncoding[0] is not None
-
-        # Call superclass
-        self.reset()
-
-    def reset(self):
-        self.dataStream = self.charEncoding[0].codec_info.streamreader(self.rawStream, 'replace')
-        HTMLUnicodeInputStream.reset(self)
-
-    def openStream(self, source):
-        """Produces a file object from source.
-
-        source can be either a file object, local filename or a string.
-
-        """
-        # Already a file object
-        if hasattr(source, 'read'):
-            stream = source
-        else:
-            stream = BytesIO(source)
-
-        try:
-            stream.seek(stream.tell())
-        except Exception:
-            stream = BufferedStream(stream)
-
-        return stream
-
-    def determineEncoding(self, chardet=True):
-        # BOMs take precedence over everything
-        # This will also read past the BOM if present
-        charEncoding = self.detectBOM(), "certain"
-        if charEncoding[0] is not None:
-            return charEncoding
-
-        # If we've been overridden, we've been overridden
-        charEncoding = lookupEncoding(self.override_encoding), "certain"
-        if charEncoding[0] is not None:
-            return charEncoding
-
-        # Now check the transport layer
-        charEncoding = lookupEncoding(self.transport_encoding), "certain"
-        if charEncoding[0] is not None:
-            return charEncoding
-
-        # Look for meta elements with encoding information
-        charEncoding = self.detectEncodingMeta(), "tentative"
-        if charEncoding[0] is not None:
-            return charEncoding
-
-        # Parent document encoding
-        charEncoding = lookupEncoding(self.same_origin_parent_encoding), "tentative"
-        if charEncoding[0] is not None and not charEncoding[0].name.startswith("utf-16"):
-            return charEncoding
-
-        # "likely" encoding
-        charEncoding = lookupEncoding(self.likely_encoding), "tentative"
-        if charEncoding[0] is not None:
-            return charEncoding
-
-        # Guess with chardet, if available
-        if chardet:
-            try:
-                from chardet.universaldetector import UniversalDetector
-            except ImportError:
-                pass
-            else:
-                buffers = []
-                detector = UniversalDetector()
-                while not detector.done:
-                    buffer = self.rawStream.read(self.numBytesChardet)
-                    assert isinstance(buffer, bytes)
-                    if not buffer:
-                        break
-                    buffers.append(buffer)
-                    detector.feed(buffer)
-                detector.close()
-                encoding = lookupEncoding(detector.result['encoding'])
-                self.rawStream.seek(0)
-                if encoding is not None:
-                    return encoding, "tentative"
-
-        # Try the default encoding
-        charEncoding = lookupEncoding(self.default_encoding), "tentative"
-        if charEncoding[0] is not None:
-            return charEncoding
-
-        # Fallback to html5lib's default if even that hasn't worked
-        return lookupEncoding("windows-1252"), "tentative"
-
-    def changeEncoding(self, newEncoding):
-        assert self.charEncoding[1] != "certain"
-        newEncoding = lookupEncoding(newEncoding)
-        if newEncoding is None:
-            return
-        if newEncoding.name in ("utf-16be", "utf-16le"):
-            newEncoding = lookupEncoding("utf-8")
-            assert newEncoding is not None
-        elif newEncoding == self.charEncoding[0]:
-            self.charEncoding = (self.charEncoding[0], "certain")
-        else:
-            self.rawStream.seek(0)
-            self.charEncoding = (newEncoding, "certain")
-            self.reset()
-            raise _ReparseException("Encoding changed from %s to %s" % (self.charEncoding[0], newEncoding))
-
-    def detectBOM(self):
-        """Attempts to detect at BOM at the start of the stream. If
-        an encoding can be determined from the BOM return the name of the
-        encoding otherwise return None"""
-        bomDict = {
-            codecs.BOM_UTF8: 'utf-8',
-            codecs.BOM_UTF16_LE: 'utf-16le', codecs.BOM_UTF16_BE: 'utf-16be',
-            codecs.BOM_UTF32_LE: 'utf-32le', codecs.BOM_UTF32_BE: 'utf-32be'
-        }
-
-        # Go to beginning of file and read in 4 bytes
-        string = self.rawStream.read(4)
-        assert isinstance(string, bytes)
-
-        # Try detecting the BOM using bytes from the string
-        encoding = bomDict.get(string[:3])         # UTF-8
-        seek = 3
-        if not encoding:
-            # Need to detect UTF-32 before UTF-16
-            encoding = bomDict.get(string)         # UTF-32
-            seek = 4
-            if not encoding:
-                encoding = bomDict.get(string[:2])  # UTF-16
-                seek = 2
-
-        # Set the read position past the BOM if one was found, otherwise
-        # set it to the start of the stream
-        if encoding:
-            self.rawStream.seek(seek)
-            return lookupEncoding(encoding)
-        else:
-            self.rawStream.seek(0)
-            return None
-
-    def detectEncodingMeta(self):
-        """Report the encoding declared by the meta element
-        """
-        buffer = self.rawStream.read(self.numBytesMeta)
-        assert isinstance(buffer, bytes)
-        parser = EncodingParser(buffer)
-        self.rawStream.seek(0)
-        encoding = parser.getEncoding()
-
-        if encoding is not None and encoding.name in ("utf-16be", "utf-16le"):
-            encoding = lookupEncoding("utf-8")
-
-        return encoding
-
-
-class EncodingBytes(bytes):
-    """String-like object with an associated position and various extra methods
-    If the position is ever greater than the string length then an exception is
-    raised"""
-    def __new__(self, value):
-        assert isinstance(value, bytes)
-        return bytes.__new__(self, value.lower())
-
-    def __init__(self, value):
-        # pylint:disable=unused-argument
-        self._position = -1
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        p = self._position = self._position + 1
-        if p >= len(self):
-            raise StopIteration
-        elif p < 0:
-            raise TypeError
-        return self[p:p + 1]
-
-    def next(self):
-        # Py2 compat
-        return self.__next__()
-
-    def previous(self):
-        p = self._position
-        if p >= len(self):
-            raise StopIteration
-        elif p < 0:
-            raise TypeError
-        self._position = p = p - 1
-        return self[p:p + 1]
-
-    def setPosition(self, position):
-        if self._position >= len(self):
-            raise StopIteration
-        self._position = position
-
-    def getPosition(self):
-        if self._position >= len(self):
-            raise StopIteration
-        if self._position >= 0:
-            return self._position
-        else:
-            return None
-
-    position = property(getPosition, setPosition)
-
-    def getCurrentByte(self):
-        return self[self.position:self.position + 1]
-
-    currentByte = property(getCurrentByte)
-
-    def skip(self, chars=spaceCharactersBytes):
-        """Skip past a list of characters"""
-        p = self.position               # use property for the error-checking
-        while p < len(self):
-            c = self[p:p + 1]
-            if c not in chars:
-                self._position = p
-                return c
-            p += 1
-        self._position = p
-        return None
-
-    def skipUntil(self, chars):
-        p = self.position
-        while p < len(self):
-            c = self[p:p + 1]
-            if c in chars:
-                self._position = p
-                return c
-            p += 1
-        self._position = p
-        return None
-
-    def matchBytes(self, bytes):
-        """Look for a sequence of bytes at the start of a string. If the bytes
-        are found return True and advance the position to the byte after the
-        match. Otherwise return False and leave the position alone"""
-        rv = self.startswith(bytes, self.position)
-        if rv:
-            self.position += len(bytes)
-        return rv
-
-    def jumpTo(self, bytes):
-        """Look for the next sequence of bytes matching a given sequence. If
-        a match is found advance the position to the last byte of the match"""
-        try:
-            self._position = self.index(bytes, self.position) + len(bytes) - 1
-        except ValueError:
-            raise StopIteration
-        return True
-
-
-class EncodingParser(object):
-    """Mini parser for detecting character encoding from meta elements"""
-
-    def __init__(self, data):
-        """string - the data to work on for encoding detection"""
-        self.data = EncodingBytes(data)
-        self.encoding = None
-
-    def getEncoding(self):
-        if b"<meta" not in self.data:
-            return None
-
-        methodDispatch = (
-            (b"<!--", self.handleComment),
-            (b"<meta", self.handleMeta),
-            (b"</", self.handlePossibleEndTag),
-            (b"<!", self.handleOther),
-            (b"<?", self.handleOther),
-            (b"<", self.handlePossibleStartTag))
-        for _ in self.data:
-            keepParsing = True
-            try:
-                self.data.jumpTo(b"<")
-            except StopIteration:
-                break
-            for key, method in methodDispatch:
-                if self.data.matchBytes(key):
-                    try:
-                        keepParsing = method()
-                        break
-                    except StopIteration:
-                        keepParsing = False
-                        break
-            if not keepParsing:
-                break
-
-        return self.encoding
-
-    def handleComment(self):
-        """Skip over comments"""
-        return self.data.jumpTo(b"-->")
-
-    def handleMeta(self):
-        if self.data.currentByte not in spaceCharactersBytes:
-            # if we have <meta not followed by a space so just keep going
-            return True
-        # We have a valid meta element we want to search for attributes
-        hasPragma = False
-        pendingEncoding = None
-        while True:
-            # Try to find the next attribute after the current position
-            attr = self.getAttribute()
-            if attr is None:
-                return True
-            else:
-                if attr[0] == b"http-equiv":
-                    hasPragma = attr[1] == b"content-type"
-                    if hasPragma and pendingEncoding is not None:
-                        self.encoding = pendingEncoding
-                        return False
-                elif attr[0] == b"charset":
-                    tentativeEncoding = attr[1]
-                    codec = lookupEncoding(tentativeEncoding)
-                    if codec is not None:
-                        self.encoding = codec
-                        return False
-                elif attr[0] == b"content":
-                    contentParser = ContentAttrParser(EncodingBytes(attr[1]))
-                    tentativeEncoding = contentParser.parse()
-                    if tentativeEncoding is not None:
-                        codec = lookupEncoding(tentativeEncoding)
-                        if codec is not None:
-                            if hasPragma:
-                                self.encoding = codec
-                                return False
-                            else:
-                                pendingEncoding = codec
-
-    def handlePossibleStartTag(self):
-        return self.handlePossibleTag(False)
-
-    def handlePossibleEndTag(self):
-        next(self.data)
-        return self.handlePossibleTag(True)
-
-    def handlePossibleTag(self, endTag):
-        data = self.data
-        if data.currentByte not in asciiLettersBytes:
-            # If the next byte is not an ascii letter either ignore this
-            # fragment (possible start tag case) or treat it according to
-            # handleOther
-            if endTag:
-                data.previous()
-                self.handleOther()
-            return True
-
-        c = data.skipUntil(spacesAngleBrackets)
-        if c == b"<":
-            # return to the first step in the overall "two step" algorithm
-            # reprocessing the < byte
-            data.previous()
-        else:
-            # Read all attributes
-            attr = self.getAttribute()
-            while attr is not None:
-                attr = self.getAttribute()
-        return True
-
-    def handleOther(self):
-        return self.data.jumpTo(b">")
-
-    def getAttribute(self):
-        """Return a name,value pair for the next attribute in the stream,
-        if one is found, or None"""
-        data = self.data
-        # Step 1 (skip chars)
-        c = data.skip(spaceCharactersBytes | frozenset([b"/"]))
-        assert c is None or len(c) == 1
-        # Step 2
-        if c in (b">", None):
-            return None
-        # Step 3
-        attrName = []
-        attrValue = []
-        # Step 4 attribute name
-        while True:
-            if c == b"=" and attrName:
-                break
-            elif c in spaceCharactersBytes:
-                # Step 6!
-                c = data.skip()
-                break
-            elif c in (b"/", b">"):
-                return b"".join(attrName), b""
-            elif c in asciiUppercaseBytes:
-                attrName.append(c.lower())
-            elif c is None:
-                return None
-            else:
-                attrName.append(c)
-            # Step 5
-            c = next(data)
-        # Step 7
-        if c != b"=":
-            data.previous()
-            return b"".join(attrName), b""
-        # Step 8
-        next(data)
-        # Step 9
-        c = data.skip()
-        # Step 10
-        if c in (b"'", b'"'):
-            # 10.1
-            quoteChar = c
-            while True:
-                # 10.2
-                c = next(data)
-                # 10.3
-                if c == quoteChar:
-                    next(data)
-                    return b"".join(attrName), b"".join(attrValue)
-                # 10.4
-                elif c in asciiUppercaseBytes:
-                    attrValue.append(c.lower())
-                # 10.5
-                else:
-                    attrValue.append(c)
-        elif c == b">":
-            return b"".join(attrName), b""
-        elif c in asciiUppercaseBytes:
-            attrValue.append(c.lower())
-        elif c is None:
-            return None
-        else:
-            attrValue.append(c)
-        # Step 11
-        while True:
-            c = next(data)
-            if c in spacesAngleBrackets:
-                return b"".join(attrName), b"".join(attrValue)
-            elif c in asciiUppercaseBytes:
-                attrValue.append(c.lower())
-            elif c is None:
-                return None
-            else:
-                attrValue.append(c)
-
-
-class ContentAttrParser(object):
-    def __init__(self, data):
-        assert isinstance(data, bytes)
-        self.data = data
-
-    def parse(self):
-        try:
-            # Check if the attr name is charset
-            # otherwise return
-            self.data.jumpTo(b"charset")
-            self.data.position += 1
-            self.data.skip()
-            if not self.data.currentByte == b"=":
-                # If there is no = sign keep looking for attrs
-                return None
-            self.data.position += 1
-            self.data.skip()
-            # Look for an encoding between matching quote marks
-            if self.data.currentByte in (b'"', b"'"):
-                quoteMark = self.data.currentByte
-                self.data.position += 1
-                oldPosition = self.data.position
-                if self.data.jumpTo(quoteMark):
-                    return self.data[oldPosition:self.data.position]
-                else:
-                    return None
-            else:
-                # Unquoted value
-                oldPosition = self.data.position
-                try:
-                    self.data.skipUntil(spaceCharactersBytes)
-                    return self.data[oldPosition:self.data.position]
-                except StopIteration:
-                    # Return the whole remaining value
-                    return self.data[oldPosition:]
-        except StopIteration:
-            return None
-
-
-def lookupEncoding(encoding):
-    """Return the python codec name corresponding to an encoding or None if the
-    string doesn't correspond to a valid encoding."""
-    if isinstance(encoding, bytes):
-        try:
-            encoding = encoding.decode("ascii")
-        except UnicodeDecodeError:
-            return None
-
-    if encoding is not None:
-        try:
-            return webencodings.lookup(encoding)
-        except AttributeError:
-            return None
-    else:
-        return None
diff --git a/lib/html5lib/_tokenizer.py b/lib/html5lib/_tokenizer.py
deleted file mode 100644
index 4748a197..00000000
--- a/lib/html5lib/_tokenizer.py
+++ /dev/null
@@ -1,1735 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-from six import unichr as chr
-
-from collections import deque, OrderedDict
-from sys import version_info
-
-from .constants import spaceCharacters
-from .constants import entities
-from .constants import asciiLetters, asciiUpper2Lower
-from .constants import digits, hexDigits, EOF
-from .constants import tokenTypes, tagTokenTypes
-from .constants import replacementCharacters
-
-from ._inputstream import HTMLInputStream
-
-from ._trie import Trie
-
-entitiesTrie = Trie(entities)
-
-if version_info >= (3, 7):
-    attributeMap = dict
-else:
-    attributeMap = OrderedDict
-
-
-class HTMLTokenizer(object):
-    """ This class takes care of tokenizing HTML.
-
-    * self.currentToken
-      Holds the token that is currently being processed.
-
-    * self.state
-      Holds a reference to the method to be invoked... XXX
-
-    * self.stream
-      Points to HTMLInputStream object.
-    """
-
-    def __init__(self, stream, parser=None, **kwargs):
-
-        self.stream = HTMLInputStream(stream, **kwargs)
-        self.parser = parser
-
-        # Setup the initial tokenizer state
-        self.escapeFlag = False
-        self.lastFourChars = []
-        self.state = self.dataState
-        self.escape = False
-
-        # The current token being created
-        self.currentToken = None
-        super(HTMLTokenizer, self).__init__()
-
-    def __iter__(self):
-        """ This is where the magic happens.
-
-        We do our usually processing through the states and when we have a token
-        to return we yield the token which pauses processing until the next token
-        is requested.
-        """
-        self.tokenQueue = deque([])
-        # Start processing. When EOF is reached self.state will return False
-        # instead of True and the loop will terminate.
-        while self.state():
-            while self.stream.errors:
-                yield {"type": tokenTypes["ParseError"], "data": self.stream.errors.pop(0)}
-            while self.tokenQueue:
-                yield self.tokenQueue.popleft()
-
-    def consumeNumberEntity(self, isHex):
-        """This function returns either U+FFFD or the character based on the
-        decimal or hexadecimal representation. It also discards ";" if present.
-        If not present self.tokenQueue.append({"type": tokenTypes["ParseError"]}) is invoked.
-        """
-
-        allowed = digits
-        radix = 10
-        if isHex:
-            allowed = hexDigits
-            radix = 16
-
-        charStack = []
-
-        # Consume all the characters that are in range while making sure we
-        # don't hit an EOF.
-        c = self.stream.char()
-        while c in allowed and c is not EOF:
-            charStack.append(c)
-            c = self.stream.char()
-
-        # Convert the set of characters consumed to an int.
-        charAsInt = int("".join(charStack), radix)
-
-        # Certain characters get replaced with others
-        if charAsInt in replacementCharacters:
-            char = replacementCharacters[charAsInt]
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "illegal-codepoint-for-numeric-entity",
-                                    "datavars": {"charAsInt": charAsInt}})
-        elif ((0xD800 <= charAsInt <= 0xDFFF) or
-              (charAsInt > 0x10FFFF)):
-            char = "\uFFFD"
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "illegal-codepoint-for-numeric-entity",
-                                    "datavars": {"charAsInt": charAsInt}})
-        else:
-            # Should speed up this check somehow (e.g. move the set to a constant)
-            if ((0x0001 <= charAsInt <= 0x0008) or
-                (0x000E <= charAsInt <= 0x001F) or
-                (0x007F <= charAsInt <= 0x009F) or
-                (0xFDD0 <= charAsInt <= 0xFDEF) or
-                charAsInt in frozenset([0x000B, 0xFFFE, 0xFFFF, 0x1FFFE,
-                                        0x1FFFF, 0x2FFFE, 0x2FFFF, 0x3FFFE,
-                                        0x3FFFF, 0x4FFFE, 0x4FFFF, 0x5FFFE,
-                                        0x5FFFF, 0x6FFFE, 0x6FFFF, 0x7FFFE,
-                                        0x7FFFF, 0x8FFFE, 0x8FFFF, 0x9FFFE,
-                                        0x9FFFF, 0xAFFFE, 0xAFFFF, 0xBFFFE,
-                                        0xBFFFF, 0xCFFFE, 0xCFFFF, 0xDFFFE,
-                                        0xDFFFF, 0xEFFFE, 0xEFFFF, 0xFFFFE,
-                                        0xFFFFF, 0x10FFFE, 0x10FFFF])):
-                self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                        "data":
-                                        "illegal-codepoint-for-numeric-entity",
-                                        "datavars": {"charAsInt": charAsInt}})
-            try:
-                # Try/except needed as UCS-2 Python builds' unichar only works
-                # within the BMP.
-                char = chr(charAsInt)
-            except ValueError:
-                v = charAsInt - 0x10000
-                char = chr(0xD800 | (v >> 10)) + chr(0xDC00 | (v & 0x3FF))
-
-        # Discard the ; if present. Otherwise, put it back on the queue and
-        # invoke parseError on parser.
-        if c != ";":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "numeric-entity-without-semicolon"})
-            self.stream.unget(c)
-
-        return char
-
-    def consumeEntity(self, allowedChar=None, fromAttribute=False):
-        # Initialise to the default output for when no entity is matched
-        output = "&"
-
-        charStack = [self.stream.char()]
-        if (charStack[0] in spaceCharacters or charStack[0] in (EOF, "<", "&") or
-                (allowedChar is not None and allowedChar == charStack[0])):
-            self.stream.unget(charStack[0])
-
-        elif charStack[0] == "#":
-            # Read the next character to see if it's hex or decimal
-            hex = False
-            charStack.append(self.stream.char())
-            if charStack[-1] in ("x", "X"):
-                hex = True
-                charStack.append(self.stream.char())
-
-            # charStack[-1] should be the first digit
-            if (hex and charStack[-1] in hexDigits) \
-                    or (not hex and charStack[-1] in digits):
-                # At least one digit found, so consume the whole number
-                self.stream.unget(charStack[-1])
-                output = self.consumeNumberEntity(hex)
-            else:
-                # No digits found
-                self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                        "data": "expected-numeric-entity"})
-                self.stream.unget(charStack.pop())
-                output = "&" + "".join(charStack)
-
-        else:
-            # At this point in the process might have named entity. Entities
-            # are stored in the global variable "entities".
-            #
-            # Consume characters and compare to these to a substring of the
-            # entity names in the list until the substring no longer matches.
-            while (charStack[-1] is not EOF):
-                if not entitiesTrie.has_keys_with_prefix("".join(charStack)):
-                    break
-                charStack.append(self.stream.char())
-
-            # At this point we have a string that starts with some characters
-            # that may match an entity
-            # Try to find the longest entity the string will match to take care
-            # of &noti for instance.
-            try:
-                entityName = entitiesTrie.longest_prefix("".join(charStack[:-1]))
-                entityLength = len(entityName)
-            except KeyError:
-                entityName = None
-
-            if entityName is not None:
-                if entityName[-1] != ";":
-                    self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                            "named-entity-without-semicolon"})
-                if (entityName[-1] != ";" and fromAttribute and
-                    (charStack[entityLength] in asciiLetters or
-                     charStack[entityLength] in digits or
-                     charStack[entityLength] == "=")):
-                    self.stream.unget(charStack.pop())
-                    output = "&" + "".join(charStack)
-                else:
-                    output = entities[entityName]
-                    self.stream.unget(charStack.pop())
-                    output += "".join(charStack[entityLength:])
-            else:
-                self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                        "expected-named-entity"})
-                self.stream.unget(charStack.pop())
-                output = "&" + "".join(charStack)
-
-        if fromAttribute:
-            self.currentToken["data"][-1][1] += output
-        else:
-            if output in spaceCharacters:
-                tokenType = "SpaceCharacters"
-            else:
-                tokenType = "Characters"
-            self.tokenQueue.append({"type": tokenTypes[tokenType], "data": output})
-
-    def processEntityInAttribute(self, allowedChar):
-        """This method replaces the need for "entityInAttributeValueState".
-        """
-        self.consumeEntity(allowedChar=allowedChar, fromAttribute=True)
-
-    def emitCurrentToken(self):
-        """This method is a generic handler for emitting the tags. It also sets
-        the state to "data" because that's what's needed after a token has been
-        emitted.
-        """
-        token = self.currentToken
-        # Add token to the queue to be yielded
-        if (token["type"] in tagTokenTypes):
-            token["name"] = token["name"].translate(asciiUpper2Lower)
-            if token["type"] == tokenTypes["StartTag"]:
-                raw = token["data"]
-                data = attributeMap(raw)
-                if len(raw) > len(data):
-                    # we had some duplicated attribute, fix so first wins
-                    data.update(raw[::-1])
-                token["data"] = data
-
-            if token["type"] == tokenTypes["EndTag"]:
-                if token["data"]:
-                    self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                            "data": "attributes-in-end-tag"})
-                if token["selfClosing"]:
-                    self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                            "data": "self-closing-flag-on-end-tag"})
-        self.tokenQueue.append(token)
-        self.state = self.dataState
-
-    # Below are the various tokenizer states worked out.
-    def dataState(self):
-        data = self.stream.char()
-        if data == "&":
-            self.state = self.entityDataState
-        elif data == "<":
-            self.state = self.tagOpenState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "\u0000"})
-        elif data is EOF:
-            # Tokenization ends.
-            return False
-        elif data in spaceCharacters:
-            # Directly after emitting a token you switch back to the "data
-            # state". At that point spaceCharacters are important so they are
-            # emitted separately.
-            self.tokenQueue.append({"type": tokenTypes["SpaceCharacters"], "data":
-                                    data + self.stream.charsUntil(spaceCharacters, True)})
-            # No need to update lastFourChars here, since the first space will
-            # have already been appended to lastFourChars and will have broken
-            # any <!-- or --> sequences
-        else:
-            chars = self.stream.charsUntil(("&", "<", "\u0000"))
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
-                                    data + chars})
-        return True
-
-    def entityDataState(self):
-        self.consumeEntity()
-        self.state = self.dataState
-        return True
-
-    def rcdataState(self):
-        data = self.stream.char()
-        if data == "&":
-            self.state = self.characterReferenceInRcdata
-        elif data == "<":
-            self.state = self.rcdataLessThanSignState
-        elif data == EOF:
-            # Tokenization ends.
-            return False
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "\uFFFD"})
-        elif data in spaceCharacters:
-            # Directly after emitting a token you switch back to the "data
-            # state". At that point spaceCharacters are important so they are
-            # emitted separately.
-            self.tokenQueue.append({"type": tokenTypes["SpaceCharacters"], "data":
-                                    data + self.stream.charsUntil(spaceCharacters, True)})
-            # No need to update lastFourChars here, since the first space will
-            # have already been appended to lastFourChars and will have broken
-            # any <!-- or --> sequences
-        else:
-            chars = self.stream.charsUntil(("&", "<", "\u0000"))
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
-                                    data + chars})
-        return True
-
-    def characterReferenceInRcdata(self):
-        self.consumeEntity()
-        self.state = self.rcdataState
-        return True
-
-    def rawtextState(self):
-        data = self.stream.char()
-        if data == "<":
-            self.state = self.rawtextLessThanSignState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "\uFFFD"})
-        elif data == EOF:
-            # Tokenization ends.
-            return False
-        else:
-            chars = self.stream.charsUntil(("<", "\u0000"))
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
-                                    data + chars})
-        return True
-
-    def scriptDataState(self):
-        data = self.stream.char()
-        if data == "<":
-            self.state = self.scriptDataLessThanSignState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "\uFFFD"})
-        elif data == EOF:
-            # Tokenization ends.
-            return False
-        else:
-            chars = self.stream.charsUntil(("<", "\u0000"))
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
-                                    data + chars})
-        return True
-
-    def plaintextState(self):
-        data = self.stream.char()
-        if data == EOF:
-            # Tokenization ends.
-            return False
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "\uFFFD"})
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
-                                    data + self.stream.charsUntil("\u0000")})
-        return True
-
-    def tagOpenState(self):
-        data = self.stream.char()
-        if data == "!":
-            self.state = self.markupDeclarationOpenState
-        elif data == "/":
-            self.state = self.closeTagOpenState
-        elif data in asciiLetters:
-            self.currentToken = {"type": tokenTypes["StartTag"],
-                                 "name": data, "data": [],
-                                 "selfClosing": False,
-                                 "selfClosingAcknowledged": False}
-            self.state = self.tagNameState
-        elif data == ">":
-            # XXX In theory it could be something besides a tag name. But
-            # do we really care?
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-tag-name-but-got-right-bracket"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<>"})
-            self.state = self.dataState
-        elif data == "?":
-            # XXX In theory it could be something besides a tag name. But
-            # do we really care?
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-tag-name-but-got-question-mark"})
-            self.stream.unget(data)
-            self.state = self.bogusCommentState
-        else:
-            # XXX
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-tag-name"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
-            self.stream.unget(data)
-            self.state = self.dataState
-        return True
-
-    def closeTagOpenState(self):
-        data = self.stream.char()
-        if data in asciiLetters:
-            self.currentToken = {"type": tokenTypes["EndTag"], "name": data,
-                                 "data": [], "selfClosing": False}
-            self.state = self.tagNameState
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-closing-tag-but-got-right-bracket"})
-            self.state = self.dataState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-closing-tag-but-got-eof"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "</"})
-            self.state = self.dataState
-        else:
-            # XXX data can be _'_...
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-closing-tag-but-got-char",
-                                    "datavars": {"data": data}})
-            self.stream.unget(data)
-            self.state = self.bogusCommentState
-        return True
-
-    def tagNameState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.state = self.beforeAttributeNameState
-        elif data == ">":
-            self.emitCurrentToken()
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-tag-name"})
-            self.state = self.dataState
-        elif data == "/":
-            self.state = self.selfClosingStartTagState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["name"] += "\uFFFD"
-        else:
-            self.currentToken["name"] += data
-            # (Don't use charsUntil here, because tag names are
-            # very short and it's faster to not do anything fancy)
-        return True
-
-    def rcdataLessThanSignState(self):
-        data = self.stream.char()
-        if data == "/":
-            self.temporaryBuffer = ""
-            self.state = self.rcdataEndTagOpenState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
-            self.stream.unget(data)
-            self.state = self.rcdataState
-        return True
-
-    def rcdataEndTagOpenState(self):
-        data = self.stream.char()
-        if data in asciiLetters:
-            self.temporaryBuffer += data
-            self.state = self.rcdataEndTagNameState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "</"})
-            self.stream.unget(data)
-            self.state = self.rcdataState
-        return True
-
-    def rcdataEndTagNameState(self):
-        appropriate = self.currentToken and self.currentToken["name"].lower() == self.temporaryBuffer.lower()
-        data = self.stream.char()
-        if data in spaceCharacters and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.state = self.beforeAttributeNameState
-        elif data == "/" and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.state = self.selfClosingStartTagState
-        elif data == ">" and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.emitCurrentToken()
-            self.state = self.dataState
-        elif data in asciiLetters:
-            self.temporaryBuffer += data
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "</" + self.temporaryBuffer})
-            self.stream.unget(data)
-            self.state = self.rcdataState
-        return True
-
-    def rawtextLessThanSignState(self):
-        data = self.stream.char()
-        if data == "/":
-            self.temporaryBuffer = ""
-            self.state = self.rawtextEndTagOpenState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
-            self.stream.unget(data)
-            self.state = self.rawtextState
-        return True
-
-    def rawtextEndTagOpenState(self):
-        data = self.stream.char()
-        if data in asciiLetters:
-            self.temporaryBuffer += data
-            self.state = self.rawtextEndTagNameState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "</"})
-            self.stream.unget(data)
-            self.state = self.rawtextState
-        return True
-
-    def rawtextEndTagNameState(self):
-        appropriate = self.currentToken and self.currentToken["name"].lower() == self.temporaryBuffer.lower()
-        data = self.stream.char()
-        if data in spaceCharacters and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.state = self.beforeAttributeNameState
-        elif data == "/" and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.state = self.selfClosingStartTagState
-        elif data == ">" and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.emitCurrentToken()
-            self.state = self.dataState
-        elif data in asciiLetters:
-            self.temporaryBuffer += data
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "</" + self.temporaryBuffer})
-            self.stream.unget(data)
-            self.state = self.rawtextState
-        return True
-
-    def scriptDataLessThanSignState(self):
-        data = self.stream.char()
-        if data == "/":
-            self.temporaryBuffer = ""
-            self.state = self.scriptDataEndTagOpenState
-        elif data == "!":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<!"})
-            self.state = self.scriptDataEscapeStartState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
-            self.stream.unget(data)
-            self.state = self.scriptDataState
-        return True
-
-    def scriptDataEndTagOpenState(self):
-        data = self.stream.char()
-        if data in asciiLetters:
-            self.temporaryBuffer += data
-            self.state = self.scriptDataEndTagNameState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "</"})
-            self.stream.unget(data)
-            self.state = self.scriptDataState
-        return True
-
-    def scriptDataEndTagNameState(self):
-        appropriate = self.currentToken and self.currentToken["name"].lower() == self.temporaryBuffer.lower()
-        data = self.stream.char()
-        if data in spaceCharacters and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.state = self.beforeAttributeNameState
-        elif data == "/" and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.state = self.selfClosingStartTagState
-        elif data == ">" and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.emitCurrentToken()
-            self.state = self.dataState
-        elif data in asciiLetters:
-            self.temporaryBuffer += data
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "</" + self.temporaryBuffer})
-            self.stream.unget(data)
-            self.state = self.scriptDataState
-        return True
-
-    def scriptDataEscapeStartState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
-            self.state = self.scriptDataEscapeStartDashState
-        else:
-            self.stream.unget(data)
-            self.state = self.scriptDataState
-        return True
-
-    def scriptDataEscapeStartDashState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
-            self.state = self.scriptDataEscapedDashDashState
-        else:
-            self.stream.unget(data)
-            self.state = self.scriptDataState
-        return True
-
-    def scriptDataEscapedState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
-            self.state = self.scriptDataEscapedDashState
-        elif data == "<":
-            self.state = self.scriptDataEscapedLessThanSignState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "\uFFFD"})
-        elif data == EOF:
-            self.state = self.dataState
-        else:
-            chars = self.stream.charsUntil(("<", "-", "\u0000"))
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
-                                    data + chars})
-        return True
-
-    def scriptDataEscapedDashState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
-            self.state = self.scriptDataEscapedDashDashState
-        elif data == "<":
-            self.state = self.scriptDataEscapedLessThanSignState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "\uFFFD"})
-            self.state = self.scriptDataEscapedState
-        elif data == EOF:
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
-            self.state = self.scriptDataEscapedState
-        return True
-
-    def scriptDataEscapedDashDashState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
-        elif data == "<":
-            self.state = self.scriptDataEscapedLessThanSignState
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": ">"})
-            self.state = self.scriptDataState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "\uFFFD"})
-            self.state = self.scriptDataEscapedState
-        elif data == EOF:
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
-            self.state = self.scriptDataEscapedState
-        return True
-
-    def scriptDataEscapedLessThanSignState(self):
-        data = self.stream.char()
-        if data == "/":
-            self.temporaryBuffer = ""
-            self.state = self.scriptDataEscapedEndTagOpenState
-        elif data in asciiLetters:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<" + data})
-            self.temporaryBuffer = data
-            self.state = self.scriptDataDoubleEscapeStartState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
-            self.stream.unget(data)
-            self.state = self.scriptDataEscapedState
-        return True
-
-    def scriptDataEscapedEndTagOpenState(self):
-        data = self.stream.char()
-        if data in asciiLetters:
-            self.temporaryBuffer = data
-            self.state = self.scriptDataEscapedEndTagNameState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "</"})
-            self.stream.unget(data)
-            self.state = self.scriptDataEscapedState
-        return True
-
-    def scriptDataEscapedEndTagNameState(self):
-        appropriate = self.currentToken and self.currentToken["name"].lower() == self.temporaryBuffer.lower()
-        data = self.stream.char()
-        if data in spaceCharacters and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.state = self.beforeAttributeNameState
-        elif data == "/" and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.state = self.selfClosingStartTagState
-        elif data == ">" and appropriate:
-            self.currentToken = {"type": tokenTypes["EndTag"],
-                                 "name": self.temporaryBuffer,
-                                 "data": [], "selfClosing": False}
-            self.emitCurrentToken()
-            self.state = self.dataState
-        elif data in asciiLetters:
-            self.temporaryBuffer += data
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "</" + self.temporaryBuffer})
-            self.stream.unget(data)
-            self.state = self.scriptDataEscapedState
-        return True
-
-    def scriptDataDoubleEscapeStartState(self):
-        data = self.stream.char()
-        if data in (spaceCharacters | frozenset(("/", ">"))):
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
-            if self.temporaryBuffer.lower() == "script":
-                self.state = self.scriptDataDoubleEscapedState
-            else:
-                self.state = self.scriptDataEscapedState
-        elif data in asciiLetters:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
-            self.temporaryBuffer += data
-        else:
-            self.stream.unget(data)
-            self.state = self.scriptDataEscapedState
-        return True
-
-    def scriptDataDoubleEscapedState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
-            self.state = self.scriptDataDoubleEscapedDashState
-        elif data == "<":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
-            self.state = self.scriptDataDoubleEscapedLessThanSignState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "\uFFFD"})
-        elif data == EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-script-in-script"})
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
-        return True
-
-    def scriptDataDoubleEscapedDashState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
-            self.state = self.scriptDataDoubleEscapedDashDashState
-        elif data == "<":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
-            self.state = self.scriptDataDoubleEscapedLessThanSignState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "\uFFFD"})
-            self.state = self.scriptDataDoubleEscapedState
-        elif data == EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-script-in-script"})
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
-            self.state = self.scriptDataDoubleEscapedState
-        return True
-
-    def scriptDataDoubleEscapedDashDashState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
-        elif data == "<":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
-            self.state = self.scriptDataDoubleEscapedLessThanSignState
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": ">"})
-            self.state = self.scriptDataState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": "\uFFFD"})
-            self.state = self.scriptDataDoubleEscapedState
-        elif data == EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-script-in-script"})
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
-            self.state = self.scriptDataDoubleEscapedState
-        return True
-
-    def scriptDataDoubleEscapedLessThanSignState(self):
-        data = self.stream.char()
-        if data == "/":
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "/"})
-            self.temporaryBuffer = ""
-            self.state = self.scriptDataDoubleEscapeEndState
-        else:
-            self.stream.unget(data)
-            self.state = self.scriptDataDoubleEscapedState
-        return True
-
-    def scriptDataDoubleEscapeEndState(self):
-        data = self.stream.char()
-        if data in (spaceCharacters | frozenset(("/", ">"))):
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
-            if self.temporaryBuffer.lower() == "script":
-                self.state = self.scriptDataEscapedState
-            else:
-                self.state = self.scriptDataDoubleEscapedState
-        elif data in asciiLetters:
-            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
-            self.temporaryBuffer += data
-        else:
-            self.stream.unget(data)
-            self.state = self.scriptDataDoubleEscapedState
-        return True
-
-    def beforeAttributeNameState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.stream.charsUntil(spaceCharacters, True)
-        elif data in asciiLetters:
-            self.currentToken["data"].append([data, ""])
-            self.state = self.attributeNameState
-        elif data == ">":
-            self.emitCurrentToken()
-        elif data == "/":
-            self.state = self.selfClosingStartTagState
-        elif data in ("'", '"', "=", "<"):
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "invalid-character-in-attribute-name"})
-            self.currentToken["data"].append([data, ""])
-            self.state = self.attributeNameState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"].append(["\uFFFD", ""])
-            self.state = self.attributeNameState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-attribute-name-but-got-eof"})
-            self.state = self.dataState
-        else:
-            self.currentToken["data"].append([data, ""])
-            self.state = self.attributeNameState
-        return True
-
-    def attributeNameState(self):
-        data = self.stream.char()
-        leavingThisState = True
-        emitToken = False
-        if data == "=":
-            self.state = self.beforeAttributeValueState
-        elif data in asciiLetters:
-            self.currentToken["data"][-1][0] += data +\
-                self.stream.charsUntil(asciiLetters, True)
-            leavingThisState = False
-        elif data == ">":
-            # XXX If we emit here the attributes are converted to a dict
-            # without being checked and when the code below runs we error
-            # because data is a dict not a list
-            emitToken = True
-        elif data in spaceCharacters:
-            self.state = self.afterAttributeNameState
-        elif data == "/":
-            self.state = self.selfClosingStartTagState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"][-1][0] += "\uFFFD"
-            leavingThisState = False
-        elif data in ("'", '"', "<"):
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data":
-                                    "invalid-character-in-attribute-name"})
-            self.currentToken["data"][-1][0] += data
-            leavingThisState = False
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "eof-in-attribute-name"})
-            self.state = self.dataState
-        else:
-            self.currentToken["data"][-1][0] += data
-            leavingThisState = False
-
-        if leavingThisState:
-            # Attributes are not dropped at this stage. That happens when the
-            # start tag token is emitted so values can still be safely appended
-            # to attributes, but we do want to report the parse error in time.
-            self.currentToken["data"][-1][0] = (
-                self.currentToken["data"][-1][0].translate(asciiUpper2Lower))
-            for name, _ in self.currentToken["data"][:-1]:
-                if self.currentToken["data"][-1][0] == name:
-                    self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                            "duplicate-attribute"})
-                    break
-            # XXX Fix for above XXX
-            if emitToken:
-                self.emitCurrentToken()
-        return True
-
-    def afterAttributeNameState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.stream.charsUntil(spaceCharacters, True)
-        elif data == "=":
-            self.state = self.beforeAttributeValueState
-        elif data == ">":
-            self.emitCurrentToken()
-        elif data in asciiLetters:
-            self.currentToken["data"].append([data, ""])
-            self.state = self.attributeNameState
-        elif data == "/":
-            self.state = self.selfClosingStartTagState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"].append(["\uFFFD", ""])
-            self.state = self.attributeNameState
-        elif data in ("'", '"', "<"):
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "invalid-character-after-attribute-name"})
-            self.currentToken["data"].append([data, ""])
-            self.state = self.attributeNameState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-end-of-tag-but-got-eof"})
-            self.state = self.dataState
-        else:
-            self.currentToken["data"].append([data, ""])
-            self.state = self.attributeNameState
-        return True
-
-    def beforeAttributeValueState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.stream.charsUntil(spaceCharacters, True)
-        elif data == "\"":
-            self.state = self.attributeValueDoubleQuotedState
-        elif data == "&":
-            self.state = self.attributeValueUnQuotedState
-            self.stream.unget(data)
-        elif data == "'":
-            self.state = self.attributeValueSingleQuotedState
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-attribute-value-but-got-right-bracket"})
-            self.emitCurrentToken()
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"][-1][1] += "\uFFFD"
-            self.state = self.attributeValueUnQuotedState
-        elif data in ("=", "<", "`"):
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "equals-in-unquoted-attribute-value"})
-            self.currentToken["data"][-1][1] += data
-            self.state = self.attributeValueUnQuotedState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-attribute-value-but-got-eof"})
-            self.state = self.dataState
-        else:
-            self.currentToken["data"][-1][1] += data
-            self.state = self.attributeValueUnQuotedState
-        return True
-
-    def attributeValueDoubleQuotedState(self):
-        data = self.stream.char()
-        if data == "\"":
-            self.state = self.afterAttributeValueState
-        elif data == "&":
-            self.processEntityInAttribute('"')
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"][-1][1] += "\uFFFD"
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-attribute-value-double-quote"})
-            self.state = self.dataState
-        else:
-            self.currentToken["data"][-1][1] += data +\
-                self.stream.charsUntil(("\"", "&", "\u0000"))
-        return True
-
-    def attributeValueSingleQuotedState(self):
-        data = self.stream.char()
-        if data == "'":
-            self.state = self.afterAttributeValueState
-        elif data == "&":
-            self.processEntityInAttribute("'")
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"][-1][1] += "\uFFFD"
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-attribute-value-single-quote"})
-            self.state = self.dataState
-        else:
-            self.currentToken["data"][-1][1] += data +\
-                self.stream.charsUntil(("'", "&", "\u0000"))
-        return True
-
-    def attributeValueUnQuotedState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.state = self.beforeAttributeNameState
-        elif data == "&":
-            self.processEntityInAttribute(">")
-        elif data == ">":
-            self.emitCurrentToken()
-        elif data in ('"', "'", "=", "<", "`"):
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-character-in-unquoted-attribute-value"})
-            self.currentToken["data"][-1][1] += data
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"][-1][1] += "\uFFFD"
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-attribute-value-no-quotes"})
-            self.state = self.dataState
-        else:
-            self.currentToken["data"][-1][1] += data + self.stream.charsUntil(
-                frozenset(("&", ">", '"', "'", "=", "<", "`", "\u0000")) | spaceCharacters)
-        return True
-
-    def afterAttributeValueState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.state = self.beforeAttributeNameState
-        elif data == ">":
-            self.emitCurrentToken()
-        elif data == "/":
-            self.state = self.selfClosingStartTagState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-EOF-after-attribute-value"})
-            self.stream.unget(data)
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-character-after-attribute-value"})
-            self.stream.unget(data)
-            self.state = self.beforeAttributeNameState
-        return True
-
-    def selfClosingStartTagState(self):
-        data = self.stream.char()
-        if data == ">":
-            self.currentToken["selfClosing"] = True
-            self.emitCurrentToken()
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data":
-                                    "unexpected-EOF-after-solidus-in-tag"})
-            self.stream.unget(data)
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-character-after-solidus-in-tag"})
-            self.stream.unget(data)
-            self.state = self.beforeAttributeNameState
-        return True
-
-    def bogusCommentState(self):
-        # Make a new comment token and give it as value all the characters
-        # until the first > or EOF (charsUntil checks for EOF automatically)
-        # and emit it.
-        data = self.stream.charsUntil(">")
-        data = data.replace("\u0000", "\uFFFD")
-        self.tokenQueue.append(
-            {"type": tokenTypes["Comment"], "data": data})
-
-        # Eat the character directly after the bogus comment which is either a
-        # ">" or an EOF.
-        self.stream.char()
-        self.state = self.dataState
-        return True
-
-    def markupDeclarationOpenState(self):
-        charStack = [self.stream.char()]
-        if charStack[-1] == "-":
-            charStack.append(self.stream.char())
-            if charStack[-1] == "-":
-                self.currentToken = {"type": tokenTypes["Comment"], "data": ""}
-                self.state = self.commentStartState
-                return True
-        elif charStack[-1] in ('d', 'D'):
-            matched = True
-            for expected in (('o', 'O'), ('c', 'C'), ('t', 'T'),
-                             ('y', 'Y'), ('p', 'P'), ('e', 'E')):
-                charStack.append(self.stream.char())
-                if charStack[-1] not in expected:
-                    matched = False
-                    break
-            if matched:
-                self.currentToken = {"type": tokenTypes["Doctype"],
-                                     "name": "",
-                                     "publicId": None, "systemId": None,
-                                     "correct": True}
-                self.state = self.doctypeState
-                return True
-        elif (charStack[-1] == "[" and
-              self.parser is not None and
-              self.parser.tree.openElements and
-              self.parser.tree.openElements[-1].namespace != self.parser.tree.defaultNamespace):
-            matched = True
-            for expected in ["C", "D", "A", "T", "A", "["]:
-                charStack.append(self.stream.char())
-                if charStack[-1] != expected:
-                    matched = False
-                    break
-            if matched:
-                self.state = self.cdataSectionState
-                return True
-
-        self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                "expected-dashes-or-doctype"})
-
-        while charStack:
-            self.stream.unget(charStack.pop())
-        self.state = self.bogusCommentState
-        return True
-
-    def commentStartState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.state = self.commentStartDashState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"] += "\uFFFD"
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "incorrect-comment"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-comment"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.currentToken["data"] += data
-            self.state = self.commentState
-        return True
-
-    def commentStartDashState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.state = self.commentEndState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"] += "-\uFFFD"
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "incorrect-comment"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-comment"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.currentToken["data"] += "-" + data
-            self.state = self.commentState
-        return True
-
-    def commentState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.state = self.commentEndDashState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"] += "\uFFFD"
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "eof-in-comment"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.currentToken["data"] += data + \
-                self.stream.charsUntil(("-", "\u0000"))
-        return True
-
-    def commentEndDashState(self):
-        data = self.stream.char()
-        if data == "-":
-            self.state = self.commentEndState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"] += "-\uFFFD"
-            self.state = self.commentState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-comment-end-dash"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.currentToken["data"] += "-" + data
-            self.state = self.commentState
-        return True
-
-    def commentEndState(self):
-        data = self.stream.char()
-        if data == ">":
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"] += "--\uFFFD"
-            self.state = self.commentState
-        elif data == "!":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-bang-after-double-dash-in-comment"})
-            self.state = self.commentEndBangState
-        elif data == "-":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-dash-after-double-dash-in-comment"})
-            self.currentToken["data"] += data
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-comment-double-dash"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            # XXX
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-char-in-comment"})
-            self.currentToken["data"] += "--" + data
-            self.state = self.commentState
-        return True
-
-    def commentEndBangState(self):
-        data = self.stream.char()
-        if data == ">":
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data == "-":
-            self.currentToken["data"] += "--!"
-            self.state = self.commentEndDashState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["data"] += "--!\uFFFD"
-            self.state = self.commentState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-comment-end-bang-state"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.currentToken["data"] += "--!" + data
-            self.state = self.commentState
-        return True
-
-    def doctypeState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.state = self.beforeDoctypeNameState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-doctype-name-but-got-eof"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "need-space-after-doctype"})
-            self.stream.unget(data)
-            self.state = self.beforeDoctypeNameState
-        return True
-
-    def beforeDoctypeNameState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            pass
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-doctype-name-but-got-right-bracket"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["name"] = "\uFFFD"
-            self.state = self.doctypeNameState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-doctype-name-but-got-eof"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.currentToken["name"] = data
-            self.state = self.doctypeNameState
-        return True
-
-    def doctypeNameState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.currentToken["name"] = self.currentToken["name"].translate(asciiUpper2Lower)
-            self.state = self.afterDoctypeNameState
-        elif data == ">":
-            self.currentToken["name"] = self.currentToken["name"].translate(asciiUpper2Lower)
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["name"] += "\uFFFD"
-            self.state = self.doctypeNameState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype-name"})
-            self.currentToken["correct"] = False
-            self.currentToken["name"] = self.currentToken["name"].translate(asciiUpper2Lower)
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.currentToken["name"] += data
-        return True
-
-    def afterDoctypeNameState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            pass
-        elif data == ">":
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data is EOF:
-            self.currentToken["correct"] = False
-            self.stream.unget(data)
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            if data in ("p", "P"):
-                matched = True
-                for expected in (("u", "U"), ("b", "B"), ("l", "L"),
-                                 ("i", "I"), ("c", "C")):
-                    data = self.stream.char()
-                    if data not in expected:
-                        matched = False
-                        break
-                if matched:
-                    self.state = self.afterDoctypePublicKeywordState
-                    return True
-            elif data in ("s", "S"):
-                matched = True
-                for expected in (("y", "Y"), ("s", "S"), ("t", "T"),
-                                 ("e", "E"), ("m", "M")):
-                    data = self.stream.char()
-                    if data not in expected:
-                        matched = False
-                        break
-                if matched:
-                    self.state = self.afterDoctypeSystemKeywordState
-                    return True
-
-            # All the characters read before the current 'data' will be
-            # [a-zA-Z], so they're garbage in the bogus doctype and can be
-            # discarded; only the latest character might be '>' or EOF
-            # and needs to be ungetted
-            self.stream.unget(data)
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "expected-space-or-right-bracket-in-doctype", "datavars":
-                                    {"data": data}})
-            self.currentToken["correct"] = False
-            self.state = self.bogusDoctypeState
-
-        return True
-
-    def afterDoctypePublicKeywordState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.state = self.beforeDoctypePublicIdentifierState
-        elif data in ("'", '"'):
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-char-in-doctype"})
-            self.stream.unget(data)
-            self.state = self.beforeDoctypePublicIdentifierState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.stream.unget(data)
-            self.state = self.beforeDoctypePublicIdentifierState
-        return True
-
-    def beforeDoctypePublicIdentifierState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            pass
-        elif data == "\"":
-            self.currentToken["publicId"] = ""
-            self.state = self.doctypePublicIdentifierDoubleQuotedState
-        elif data == "'":
-            self.currentToken["publicId"] = ""
-            self.state = self.doctypePublicIdentifierSingleQuotedState
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-end-of-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-char-in-doctype"})
-            self.currentToken["correct"] = False
-            self.state = self.bogusDoctypeState
-        return True
-
-    def doctypePublicIdentifierDoubleQuotedState(self):
-        data = self.stream.char()
-        if data == "\"":
-            self.state = self.afterDoctypePublicIdentifierState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["publicId"] += "\uFFFD"
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-end-of-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.currentToken["publicId"] += data
-        return True
-
-    def doctypePublicIdentifierSingleQuotedState(self):
-        data = self.stream.char()
-        if data == "'":
-            self.state = self.afterDoctypePublicIdentifierState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["publicId"] += "\uFFFD"
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-end-of-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.currentToken["publicId"] += data
-        return True
-
-    def afterDoctypePublicIdentifierState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.state = self.betweenDoctypePublicAndSystemIdentifiersState
-        elif data == ">":
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data == '"':
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-char-in-doctype"})
-            self.currentToken["systemId"] = ""
-            self.state = self.doctypeSystemIdentifierDoubleQuotedState
-        elif data == "'":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-char-in-doctype"})
-            self.currentToken["systemId"] = ""
-            self.state = self.doctypeSystemIdentifierSingleQuotedState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-char-in-doctype"})
-            self.currentToken["correct"] = False
-            self.state = self.bogusDoctypeState
-        return True
-
-    def betweenDoctypePublicAndSystemIdentifiersState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            pass
-        elif data == ">":
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data == '"':
-            self.currentToken["systemId"] = ""
-            self.state = self.doctypeSystemIdentifierDoubleQuotedState
-        elif data == "'":
-            self.currentToken["systemId"] = ""
-            self.state = self.doctypeSystemIdentifierSingleQuotedState
-        elif data == EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-char-in-doctype"})
-            self.currentToken["correct"] = False
-            self.state = self.bogusDoctypeState
-        return True
-
-    def afterDoctypeSystemKeywordState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            self.state = self.beforeDoctypeSystemIdentifierState
-        elif data in ("'", '"'):
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-char-in-doctype"})
-            self.stream.unget(data)
-            self.state = self.beforeDoctypeSystemIdentifierState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.stream.unget(data)
-            self.state = self.beforeDoctypeSystemIdentifierState
-        return True
-
-    def beforeDoctypeSystemIdentifierState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            pass
-        elif data == "\"":
-            self.currentToken["systemId"] = ""
-            self.state = self.doctypeSystemIdentifierDoubleQuotedState
-        elif data == "'":
-            self.currentToken["systemId"] = ""
-            self.state = self.doctypeSystemIdentifierSingleQuotedState
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-char-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-char-in-doctype"})
-            self.currentToken["correct"] = False
-            self.state = self.bogusDoctypeState
-        return True
-
-    def doctypeSystemIdentifierDoubleQuotedState(self):
-        data = self.stream.char()
-        if data == "\"":
-            self.state = self.afterDoctypeSystemIdentifierState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["systemId"] += "\uFFFD"
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-end-of-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.currentToken["systemId"] += data
-        return True
-
-    def doctypeSystemIdentifierSingleQuotedState(self):
-        data = self.stream.char()
-        if data == "'":
-            self.state = self.afterDoctypeSystemIdentifierState
-        elif data == "\u0000":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                    "data": "invalid-codepoint"})
-            self.currentToken["systemId"] += "\uFFFD"
-        elif data == ">":
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-end-of-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.currentToken["systemId"] += data
-        return True
-
-    def afterDoctypeSystemIdentifierState(self):
-        data = self.stream.char()
-        if data in spaceCharacters:
-            pass
-        elif data == ">":
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data is EOF:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "eof-in-doctype"})
-            self.currentToken["correct"] = False
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
-                                    "unexpected-char-in-doctype"})
-            self.state = self.bogusDoctypeState
-        return True
-
-    def bogusDoctypeState(self):
-        data = self.stream.char()
-        if data == ">":
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        elif data is EOF:
-            # XXX EMIT
-            self.stream.unget(data)
-            self.tokenQueue.append(self.currentToken)
-            self.state = self.dataState
-        else:
-            pass
-        return True
-
-    def cdataSectionState(self):
-        data = []
-        while True:
-            data.append(self.stream.charsUntil("]"))
-            data.append(self.stream.charsUntil(">"))
-            char = self.stream.char()
-            if char == EOF:
-                break
-            else:
-                assert char == ">"
-                if data[-1][-2:] == "]]":
-                    data[-1] = data[-1][:-2]
-                    break
-                else:
-                    data.append(char)
-
-        data = "".join(data)  # pylint:disable=redefined-variable-type
-        # Deal with null here rather than in the parser
-        nullCount = data.count("\u0000")
-        if nullCount > 0:
-            for _ in range(nullCount):
-                self.tokenQueue.append({"type": tokenTypes["ParseError"],
-                                        "data": "invalid-codepoint"})
-            data = data.replace("\u0000", "\uFFFD")
-        if data:
-            self.tokenQueue.append({"type": tokenTypes["Characters"],
-                                    "data": data})
-        self.state = self.dataState
-        return True
diff --git a/lib/html5lib/_trie/__init__.py b/lib/html5lib/_trie/__init__.py
deleted file mode 100644
index 07bad5d3..00000000
--- a/lib/html5lib/_trie/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-from .py import Trie
-
-__all__ = ["Trie"]
diff --git a/lib/html5lib/_trie/_base.py b/lib/html5lib/_trie/_base.py
deleted file mode 100644
index 6b71975f..00000000
--- a/lib/html5lib/_trie/_base.py
+++ /dev/null
@@ -1,40 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-try:
-    from collections.abc import Mapping
-except ImportError:  # Python 2.7
-    from collections import Mapping
-
-
-class Trie(Mapping):
-    """Abstract base class for tries"""
-
-    def keys(self, prefix=None):
-        # pylint:disable=arguments-differ
-        keys = super(Trie, self).keys()
-
-        if prefix is None:
-            return set(keys)
-
-        return {x for x in keys if x.startswith(prefix)}
-
-    def has_keys_with_prefix(self, prefix):
-        for key in self.keys():
-            if key.startswith(prefix):
-                return True
-
-        return False
-
-    def longest_prefix(self, prefix):
-        if prefix in self:
-            return prefix
-
-        for i in range(1, len(prefix) + 1):
-            if prefix[:-i] in self:
-                return prefix[:-i]
-
-        raise KeyError(prefix)
-
-    def longest_prefix_item(self, prefix):
-        lprefix = self.longest_prefix(prefix)
-        return (lprefix, self[lprefix])
diff --git a/lib/html5lib/_utils.py b/lib/html5lib/_utils.py
deleted file mode 100644
index 9ea57942..00000000
--- a/lib/html5lib/_utils.py
+++ /dev/null
@@ -1,159 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-from types import ModuleType
-
-try:
-    from collections.abc import Mapping
-except ImportError:
-    from collections import Mapping
-
-from six import text_type, PY3
-
-if PY3:
-    import xml.etree.ElementTree as default_etree
-else:
-    try:
-        import xml.etree.cElementTree as default_etree
-    except ImportError:
-        import xml.etree.ElementTree as default_etree
-
-
-__all__ = ["default_etree", "MethodDispatcher", "isSurrogatePair",
-           "surrogatePairToCodepoint", "moduleFactoryFactory",
-           "supports_lone_surrogates"]
-
-
-# Platforms not supporting lone surrogates (\uD800-\uDFFF) should be
-# caught by the below test. In general this would be any platform
-# using UTF-16 as its encoding of unicode strings, such as
-# Jython. This is because UTF-16 itself is based on the use of such
-# surrogates, and there is no mechanism to further escape such
-# escapes.
-try:
-    _x = eval('"\\uD800"')  # pylint:disable=eval-used
-    if not isinstance(_x, text_type):
-        # We need this with u"" because of http://bugs.jython.org/issue2039
-        _x = eval('u"\\uD800"')  # pylint:disable=eval-used
-        assert isinstance(_x, text_type)
-except Exception:
-    supports_lone_surrogates = False
-else:
-    supports_lone_surrogates = True
-
-
-class MethodDispatcher(dict):
-    """Dict with 2 special properties:
-
-    On initiation, keys that are lists, sets or tuples are converted to
-    multiple keys so accessing any one of the items in the original
-    list-like object returns the matching value
-
-    md = MethodDispatcher({("foo", "bar"):"baz"})
-    md["foo"] == "baz"
-
-    A default value which can be set through the default attribute.
-    """
-
-    def __init__(self, items=()):
-        _dictEntries = []
-        for name, value in items:
-            if isinstance(name, (list, tuple, frozenset, set)):
-                for item in name:
-                    _dictEntries.append((item, value))
-            else:
-                _dictEntries.append((name, value))
-        dict.__init__(self, _dictEntries)
-        assert len(self) == len(_dictEntries)
-        self.default = None
-
-    def __getitem__(self, key):
-        return dict.get(self, key, self.default)
-
-    def __get__(self, instance, owner=None):
-        return BoundMethodDispatcher(instance, self)
-
-
-class BoundMethodDispatcher(Mapping):
-    """Wraps a MethodDispatcher, binding its return values to `instance`"""
-    def __init__(self, instance, dispatcher):
-        self.instance = instance
-        self.dispatcher = dispatcher
-
-    def __getitem__(self, key):
-        # see https://docs.python.org/3/reference/datamodel.html#object.__get__
-        # on a function, __get__ is used to bind a function to an instance as a bound method
-        return self.dispatcher[key].__get__(self.instance)
-
-    def get(self, key, default):
-        if key in self.dispatcher:
-            return self[key]
-        else:
-            return default
-
-    def __iter__(self):
-        return iter(self.dispatcher)
-
-    def __len__(self):
-        return len(self.dispatcher)
-
-    def __contains__(self, key):
-        return key in self.dispatcher
-
-
-# Some utility functions to deal with weirdness around UCS2 vs UCS4
-# python builds
-
-def isSurrogatePair(data):
-    return (len(data) == 2 and
-            ord(data[0]) >= 0xD800 and ord(data[0]) <= 0xDBFF and
-            ord(data[1]) >= 0xDC00 and ord(data[1]) <= 0xDFFF)
-
-
-def surrogatePairToCodepoint(data):
-    char_val = (0x10000 + (ord(data[0]) - 0xD800) * 0x400 +
-                (ord(data[1]) - 0xDC00))
-    return char_val
-
-# Module Factory Factory (no, this isn't Java, I know)
-# Here to stop this being duplicated all over the place.
-
-
-def moduleFactoryFactory(factory):
-    moduleCache = {}
-
-    def moduleFactory(baseModule, *args, **kwargs):
-        if isinstance(ModuleType.__name__, type("")):
-            name = "_%s_factory" % baseModule.__name__
-        else:
-            name = b"_%s_factory" % baseModule.__name__
-
-        kwargs_tuple = tuple(kwargs.items())
-
-        try:
-            return moduleCache[name][args][kwargs_tuple]
-        except KeyError:
-            mod = ModuleType(name)
-            objs = factory(baseModule, *args, **kwargs)
-            mod.__dict__.update(objs)
-            if "name" not in moduleCache:
-                moduleCache[name] = {}
-            if "args" not in moduleCache[name]:
-                moduleCache[name][args] = {}
-            if "kwargs" not in moduleCache[name][args]:
-                moduleCache[name][args][kwargs_tuple] = {}
-            moduleCache[name][args][kwargs_tuple] = mod
-            return mod
-
-    return moduleFactory
-
-
-def memoize(func):
-    cache = {}
-
-    def wrapped(*args, **kwargs):
-        key = (tuple(args), tuple(kwargs.items()))
-        if key not in cache:
-            cache[key] = func(*args, **kwargs)
-        return cache[key]
-
-    return wrapped
diff --git a/lib/html5lib/constants.py b/lib/html5lib/constants.py
index fe3e237c..e7089846 100644
--- a/lib/html5lib/constants.py
+++ b/lib/html5lib/constants.py
@@ -1,296 +1,292 @@
 from __future__ import absolute_import, division, unicode_literals
 
 import string
+import gettext
+_ = gettext.gettext
 
 EOF = None
 
 E = {
     "null-character":
-        "Null character in input stream, replaced with U+FFFD.",
+        _("Null character in input stream, replaced with U+FFFD."),
     "invalid-codepoint":
-        "Invalid codepoint in stream.",
+        _("Invalid codepoint in stream."),
     "incorrectly-placed-solidus":
-        "Solidus (/) incorrectly placed in tag.",
+        _("Solidus (/) incorrectly placed in tag."),
     "incorrect-cr-newline-entity":
-        "Incorrect CR newline entity, replaced with LF.",
+        _("Incorrect CR newline entity, replaced with LF."),
     "illegal-windows-1252-entity":
-        "Entity used with illegal number (windows-1252 reference).",
+        _("Entity used with illegal number (windows-1252 reference)."),
     "cant-convert-numeric-entity":
-        "Numeric entity couldn't be converted to character "
-        "(codepoint U+%(charAsInt)08x).",
+        _("Numeric entity couldn't be converted to character "
+          "(codepoint U+%(charAsInt)08x)."),
     "illegal-codepoint-for-numeric-entity":
-        "Numeric entity represents an illegal codepoint: "
-        "U+%(charAsInt)08x.",
+        _("Numeric entity represents an illegal codepoint: "
+          "U+%(charAsInt)08x."),
     "numeric-entity-without-semicolon":
-        "Numeric entity didn't end with ';'.",
+        _("Numeric entity didn't end with ';'."),
     "expected-numeric-entity-but-got-eof":
-        "Numeric entity expected. Got end of file instead.",
+        _("Numeric entity expected. Got end of file instead."),
     "expected-numeric-entity":
-        "Numeric entity expected but none found.",
+        _("Numeric entity expected but none found."),
     "named-entity-without-semicolon":
-        "Named entity didn't end with ';'.",
+        _("Named entity didn't end with ';'."),
     "expected-named-entity":
-        "Named entity expected. Got none.",
+        _("Named entity expected. Got none."),
     "attributes-in-end-tag":
-        "End tag contains unexpected attributes.",
+        _("End tag contains unexpected attributes."),
     'self-closing-flag-on-end-tag':
-        "End tag contains unexpected self-closing flag.",
+        _("End tag contains unexpected self-closing flag."),
     "expected-tag-name-but-got-right-bracket":
-        "Expected tag name. Got '>' instead.",
+        _("Expected tag name. Got '>' instead."),
     "expected-tag-name-but-got-question-mark":
-        "Expected tag name. Got '?' instead. (HTML doesn't "
-        "support processing instructions.)",
+        _("Expected tag name. Got '?' instead. (HTML doesn't "
+          "support processing instructions.)"),
     "expected-tag-name":
-        "Expected tag name. Got something else instead",
+        _("Expected tag name. Got something else instead"),
     "expected-closing-tag-but-got-right-bracket":
-        "Expected closing tag. Got '>' instead. Ignoring '</>'.",
+        _("Expected closing tag. Got '>' instead. Ignoring '</>'."),
     "expected-closing-tag-but-got-eof":
-        "Expected closing tag. Unexpected end of file.",
+        _("Expected closing tag. Unexpected end of file."),
     "expected-closing-tag-but-got-char":
-        "Expected closing tag. Unexpected character '%(data)s' found.",
+        _("Expected closing tag. Unexpected character '%(data)s' found."),
     "eof-in-tag-name":
-        "Unexpected end of file in the tag name.",
+        _("Unexpected end of file in the tag name."),
     "expected-attribute-name-but-got-eof":
-        "Unexpected end of file. Expected attribute name instead.",
+        _("Unexpected end of file. Expected attribute name instead."),
     "eof-in-attribute-name":
-        "Unexpected end of file in attribute name.",
+        _("Unexpected end of file in attribute name."),
     "invalid-character-in-attribute-name":
-        "Invalid character in attribute name",
+        _("Invalid character in attribute name"),
     "duplicate-attribute":
-        "Dropped duplicate attribute on tag.",
+        _("Dropped duplicate attribute on tag."),
     "expected-end-of-tag-name-but-got-eof":
-        "Unexpected end of file. Expected = or end of tag.",
+        _("Unexpected end of file. Expected = or end of tag."),
     "expected-attribute-value-but-got-eof":
-        "Unexpected end of file. Expected attribute value.",
+        _("Unexpected end of file. Expected attribute value."),
     "expected-attribute-value-but-got-right-bracket":
-        "Expected attribute value. Got '>' instead.",
+        _("Expected attribute value. Got '>' instead."),
     'equals-in-unquoted-attribute-value':
-        "Unexpected = in unquoted attribute",
+        _("Unexpected = in unquoted attribute"),
     'unexpected-character-in-unquoted-attribute-value':
-        "Unexpected character in unquoted attribute",
+        _("Unexpected character in unquoted attribute"),
     "invalid-character-after-attribute-name":
-        "Unexpected character after attribute name.",
+        _("Unexpected character after attribute name."),
     "unexpected-character-after-attribute-value":
-        "Unexpected character after attribute value.",
+        _("Unexpected character after attribute value."),
     "eof-in-attribute-value-double-quote":
-        "Unexpected end of file in attribute value (\").",
+        _("Unexpected end of file in attribute value (\")."),
     "eof-in-attribute-value-single-quote":
-        "Unexpected end of file in attribute value (').",
+        _("Unexpected end of file in attribute value (')."),
     "eof-in-attribute-value-no-quotes":
-        "Unexpected end of file in attribute value.",
+        _("Unexpected end of file in attribute value."),
     "unexpected-EOF-after-solidus-in-tag":
-        "Unexpected end of file in tag. Expected >",
+        _("Unexpected end of file in tag. Expected >"),
     "unexpected-character-after-solidus-in-tag":
-        "Unexpected character after / in tag. Expected >",
+        _("Unexpected character after / in tag. Expected >"),
     "expected-dashes-or-doctype":
-        "Expected '--' or 'DOCTYPE'. Not found.",
+        _("Expected '--' or 'DOCTYPE'. Not found."),
     "unexpected-bang-after-double-dash-in-comment":
-        "Unexpected ! after -- in comment",
+        _("Unexpected ! after -- in comment"),
     "unexpected-space-after-double-dash-in-comment":
-        "Unexpected space after -- in comment",
+        _("Unexpected space after -- in comment"),
     "incorrect-comment":
-        "Incorrect comment.",
+        _("Incorrect comment."),
     "eof-in-comment":
-        "Unexpected end of file in comment.",
+        _("Unexpected end of file in comment."),
     "eof-in-comment-end-dash":
-        "Unexpected end of file in comment (-)",
+        _("Unexpected end of file in comment (-)"),
     "unexpected-dash-after-double-dash-in-comment":
-        "Unexpected '-' after '--' found in comment.",
+        _("Unexpected '-' after '--' found in comment."),
     "eof-in-comment-double-dash":
-        "Unexpected end of file in comment (--).",
+        _("Unexpected end of file in comment (--)."),
     "eof-in-comment-end-space-state":
-        "Unexpected end of file in comment.",
+        _("Unexpected end of file in comment."),
     "eof-in-comment-end-bang-state":
-        "Unexpected end of file in comment.",
+        _("Unexpected end of file in comment."),
     "unexpected-char-in-comment":
-        "Unexpected character in comment found.",
+        _("Unexpected character in comment found."),
     "need-space-after-doctype":
-        "No space after literal string 'DOCTYPE'.",
+        _("No space after literal string 'DOCTYPE'."),
     "expected-doctype-name-but-got-right-bracket":
-        "Unexpected > character. Expected DOCTYPE name.",
+        _("Unexpected > character. Expected DOCTYPE name."),
     "expected-doctype-name-but-got-eof":
-        "Unexpected end of file. Expected DOCTYPE name.",
+        _("Unexpected end of file. Expected DOCTYPE name."),
     "eof-in-doctype-name":
-        "Unexpected end of file in DOCTYPE name.",
+        _("Unexpected end of file in DOCTYPE name."),
     "eof-in-doctype":
-        "Unexpected end of file in DOCTYPE.",
+        _("Unexpected end of file in DOCTYPE."),
     "expected-space-or-right-bracket-in-doctype":
-        "Expected space or '>'. Got '%(data)s'",
+        _("Expected space or '>'. Got '%(data)s'"),
     "unexpected-end-of-doctype":
-        "Unexpected end of DOCTYPE.",
+        _("Unexpected end of DOCTYPE."),
     "unexpected-char-in-doctype":
-        "Unexpected character in DOCTYPE.",
+        _("Unexpected character in DOCTYPE."),
     "eof-in-innerhtml":
-        "XXX innerHTML EOF",
+        _("XXX innerHTML EOF"),
     "unexpected-doctype":
-        "Unexpected DOCTYPE. Ignored.",
+        _("Unexpected DOCTYPE. Ignored."),
     "non-html-root":
-        "html needs to be the first start tag.",
+        _("html needs to be the first start tag."),
     "expected-doctype-but-got-eof":
-        "Unexpected End of file. Expected DOCTYPE.",
+        _("Unexpected End of file. Expected DOCTYPE."),
     "unknown-doctype":
-        "Erroneous DOCTYPE.",
+        _("Erroneous DOCTYPE."),
     "expected-doctype-but-got-chars":
-        "Unexpected non-space characters. Expected DOCTYPE.",
+        _("Unexpected non-space characters. Expected DOCTYPE."),
     "expected-doctype-but-got-start-tag":
-        "Unexpected start tag (%(name)s). Expected DOCTYPE.",
+        _("Unexpected start tag (%(name)s). Expected DOCTYPE."),
     "expected-doctype-but-got-end-tag":
-        "Unexpected end tag (%(name)s). Expected DOCTYPE.",
+        _("Unexpected end tag (%(name)s). Expected DOCTYPE."),
     "end-tag-after-implied-root":
-        "Unexpected end tag (%(name)s) after the (implied) root element.",
+        _("Unexpected end tag (%(name)s) after the (implied) root element."),
     "expected-named-closing-tag-but-got-eof":
-        "Unexpected end of file. Expected end tag (%(name)s).",
+        _("Unexpected end of file. Expected end tag (%(name)s)."),
     "two-heads-are-not-better-than-one":
-        "Unexpected start tag head in existing head. Ignored.",
+        _("Unexpected start tag head in existing head. Ignored."),
     "unexpected-end-tag":
-        "Unexpected end tag (%(name)s). Ignored.",
+        _("Unexpected end tag (%(name)s). Ignored."),
     "unexpected-start-tag-out-of-my-head":
-        "Unexpected start tag (%(name)s) that can be in head. Moved.",
+        _("Unexpected start tag (%(name)s) that can be in head. Moved."),
     "unexpected-start-tag":
-        "Unexpected start tag (%(name)s).",
+        _("Unexpected start tag (%(name)s)."),
     "missing-end-tag":
-        "Missing end tag (%(name)s).",
+        _("Missing end tag (%(name)s)."),
     "missing-end-tags":
-        "Missing end tags (%(name)s).",
+        _("Missing end tags (%(name)s)."),
     "unexpected-start-tag-implies-end-tag":
-        "Unexpected start tag (%(startName)s) "
-        "implies end tag (%(endName)s).",
+        _("Unexpected start tag (%(startName)s) "
+          "implies end tag (%(endName)s)."),
     "unexpected-start-tag-treated-as":
-        "Unexpected start tag (%(originalName)s). Treated as %(newName)s.",
+        _("Unexpected start tag (%(originalName)s). Treated as %(newName)s."),
     "deprecated-tag":
-        "Unexpected start tag %(name)s. Don't use it!",
+        _("Unexpected start tag %(name)s. Don't use it!"),
     "unexpected-start-tag-ignored":
-        "Unexpected start tag %(name)s. Ignored.",
+        _("Unexpected start tag %(name)s. Ignored."),
     "expected-one-end-tag-but-got-another":
-        "Unexpected end tag (%(gotName)s). "
-        "Missing end tag (%(expectedName)s).",
+        _("Unexpected end tag (%(gotName)s). "
+          "Missing end tag (%(expectedName)s)."),
     "end-tag-too-early":
-        "End tag (%(name)s) seen too early. Expected other end tag.",
+        _("End tag (%(name)s) seen too early. Expected other end tag."),
     "end-tag-too-early-named":
-        "Unexpected end tag (%(gotName)s). Expected end tag (%(expectedName)s).",
+        _("Unexpected end tag (%(gotName)s). Expected end tag (%(expectedName)s)."),
     "end-tag-too-early-ignored":
-        "End tag (%(name)s) seen too early. Ignored.",
+        _("End tag (%(name)s) seen too early. Ignored."),
     "adoption-agency-1.1":
-        "End tag (%(name)s) violates step 1, "
-        "paragraph 1 of the adoption agency algorithm.",
+        _("End tag (%(name)s) violates step 1, "
+          "paragraph 1 of the adoption agency algorithm."),
     "adoption-agency-1.2":
-        "End tag (%(name)s) violates step 1, "
-        "paragraph 2 of the adoption agency algorithm.",
+        _("End tag (%(name)s) violates step 1, "
+          "paragraph 2 of the adoption agency algorithm."),
     "adoption-agency-1.3":
-        "End tag (%(name)s) violates step 1, "
-        "paragraph 3 of the adoption agency algorithm.",
+        _("End tag (%(name)s) violates step 1, "
+          "paragraph 3 of the adoption agency algorithm."),
     "adoption-agency-4.4":
-        "End tag (%(name)s) violates step 4, "
-        "paragraph 4 of the adoption agency algorithm.",
+        _("End tag (%(name)s) violates step 4, "
+          "paragraph 4 of the adoption agency algorithm."),
     "unexpected-end-tag-treated-as":
-        "Unexpected end tag (%(originalName)s). Treated as %(newName)s.",
+        _("Unexpected end tag (%(originalName)s). Treated as %(newName)s."),
     "no-end-tag":
-        "This element (%(name)s) has no end tag.",
+        _("This element (%(name)s) has no end tag."),
     "unexpected-implied-end-tag-in-table":
-        "Unexpected implied end tag (%(name)s) in the table phase.",
+        _("Unexpected implied end tag (%(name)s) in the table phase."),
     "unexpected-implied-end-tag-in-table-body":
-        "Unexpected implied end tag (%(name)s) in the table body phase.",
+        _("Unexpected implied end tag (%(name)s) in the table body phase."),
     "unexpected-char-implies-table-voodoo":
-        "Unexpected non-space characters in "
-        "table context caused voodoo mode.",
+        _("Unexpected non-space characters in "
+          "table context caused voodoo mode."),
     "unexpected-hidden-input-in-table":
-        "Unexpected input with type hidden in table context.",
+        _("Unexpected input with type hidden in table context."),
     "unexpected-form-in-table":
-        "Unexpected form in table context.",
+        _("Unexpected form in table context."),
     "unexpected-start-tag-implies-table-voodoo":
-        "Unexpected start tag (%(name)s) in "
-        "table context caused voodoo mode.",
+        _("Unexpected start tag (%(name)s) in "
+          "table context caused voodoo mode."),
     "unexpected-end-tag-implies-table-voodoo":
-        "Unexpected end tag (%(name)s) in "
-        "table context caused voodoo mode.",
+        _("Unexpected end tag (%(name)s) in "
+          "table context caused voodoo mode."),
     "unexpected-cell-in-table-body":
-        "Unexpected table cell start tag (%(name)s) "
-        "in the table body phase.",
+        _("Unexpected table cell start tag (%(name)s) "
+          "in the table body phase."),
     "unexpected-cell-end-tag":
-        "Got table cell end tag (%(name)s) "
-        "while required end tags are missing.",
+        _("Got table cell end tag (%(name)s) "
+          "while required end tags are missing."),
     "unexpected-end-tag-in-table-body":
-        "Unexpected end tag (%(name)s) in the table body phase. Ignored.",
+        _("Unexpected end tag (%(name)s) in the table body phase. Ignored."),
     "unexpected-implied-end-tag-in-table-row":
-        "Unexpected implied end tag (%(name)s) in the table row phase.",
+        _("Unexpected implied end tag (%(name)s) in the table row phase."),
     "unexpected-end-tag-in-table-row":
-        "Unexpected end tag (%(name)s) in the table row phase. Ignored.",
+        _("Unexpected end tag (%(name)s) in the table row phase. Ignored."),
     "unexpected-select-in-select":
-        "Unexpected select start tag in the select phase "
-        "treated as select end tag.",
+        _("Unexpected select start tag in the select phase "
+          "treated as select end tag."),
     "unexpected-input-in-select":
-        "Unexpected input start tag in the select phase.",
+        _("Unexpected input start tag in the select phase."),
     "unexpected-start-tag-in-select":
-        "Unexpected start tag token (%(name)s in the select phase. "
-        "Ignored.",
+        _("Unexpected start tag token (%(name)s in the select phase. "
+          "Ignored."),
     "unexpected-end-tag-in-select":
-        "Unexpected end tag (%(name)s) in the select phase. Ignored.",
+        _("Unexpected end tag (%(name)s) in the select phase. Ignored."),
     "unexpected-table-element-start-tag-in-select-in-table":
-        "Unexpected table element start tag (%(name)s) in the select in table phase.",
+        _("Unexpected table element start tag (%(name)s) in the select in table phase."),
     "unexpected-table-element-end-tag-in-select-in-table":
-        "Unexpected table element end tag (%(name)s) in the select in table phase.",
+        _("Unexpected table element end tag (%(name)s) in the select in table phase."),
     "unexpected-char-after-body":
-        "Unexpected non-space characters in the after body phase.",
+        _("Unexpected non-space characters in the after body phase."),
     "unexpected-start-tag-after-body":
-        "Unexpected start tag token (%(name)s)"
-        " in the after body phase.",
+        _("Unexpected start tag token (%(name)s)"
+          " in the after body phase."),
     "unexpected-end-tag-after-body":
-        "Unexpected end tag token (%(name)s)"
-        " in the after body phase.",
+        _("Unexpected end tag token (%(name)s)"
+          " in the after body phase."),
     "unexpected-char-in-frameset":
-        "Unexpected characters in the frameset phase. Characters ignored.",
+        _("Unexpected characters in the frameset phase. Characters ignored."),
     "unexpected-start-tag-in-frameset":
-        "Unexpected start tag token (%(name)s)"
-        " in the frameset phase. Ignored.",
+        _("Unexpected start tag token (%(name)s)"
+          " in the frameset phase. Ignored."),
     "unexpected-frameset-in-frameset-innerhtml":
-        "Unexpected end tag token (frameset) "
-        "in the frameset phase (innerHTML).",
+        _("Unexpected end tag token (frameset) "
+          "in the frameset phase (innerHTML)."),
     "unexpected-end-tag-in-frameset":
-        "Unexpected end tag token (%(name)s)"
-        " in the frameset phase. Ignored.",
+        _("Unexpected end tag token (%(name)s)"
+          " in the frameset phase. Ignored."),
     "unexpected-char-after-frameset":
-        "Unexpected non-space characters in the "
-        "after frameset phase. Ignored.",
+        _("Unexpected non-space characters in the "
+          "after frameset phase. Ignored."),
     "unexpected-start-tag-after-frameset":
-        "Unexpected start tag (%(name)s)"
-        " in the after frameset phase. Ignored.",
+        _("Unexpected start tag (%(name)s)"
+          " in the after frameset phase. Ignored."),
     "unexpected-end-tag-after-frameset":
-        "Unexpected end tag (%(name)s)"
-        " in the after frameset phase. Ignored.",
+        _("Unexpected end tag (%(name)s)"
+          " in the after frameset phase. Ignored."),
     "unexpected-end-tag-after-body-innerhtml":
-        "Unexpected end tag after body(innerHtml)",
+        _("Unexpected end tag after body(innerHtml)"),
     "expected-eof-but-got-char":
-        "Unexpected non-space characters. Expected end of file.",
+        _("Unexpected non-space characters. Expected end of file."),
     "expected-eof-but-got-start-tag":
-        "Unexpected start tag (%(name)s)"
-        ". Expected end of file.",
+        _("Unexpected start tag (%(name)s)"
+          ". Expected end of file."),
     "expected-eof-but-got-end-tag":
-        "Unexpected end tag (%(name)s)"
-        ". Expected end of file.",
+        _("Unexpected end tag (%(name)s)"
+          ". Expected end of file."),
     "eof-in-table":
-        "Unexpected end of file. Expected table content.",
+        _("Unexpected end of file. Expected table content."),
     "eof-in-select":
-        "Unexpected end of file. Expected select content.",
+        _("Unexpected end of file. Expected select content."),
     "eof-in-frameset":
-        "Unexpected end of file. Expected frameset content.",
+        _("Unexpected end of file. Expected frameset content."),
     "eof-in-script-in-script":
-        "Unexpected end of file. Expected script content.",
+        _("Unexpected end of file. Expected script content."),
     "eof-in-foreign-lands":
-        "Unexpected end of file. Expected foreign content",
+        _("Unexpected end of file. Expected foreign content"),
     "non-void-element-with-trailing-solidus":
-        "Trailing solidus not allowed on element %(name)s",
+        _("Trailing solidus not allowed on element %(name)s"),
     "unexpected-html-element-in-foreign-content":
-        "Element %(name)s not allowed in a non-html context",
+        _("Element %(name)s not allowed in a non-html context"),
     "unexpected-end-tag-before-html":
-        "Unexpected end tag (%(name)s) before html.",
-    "unexpected-inhead-noscript-tag":
-        "Element %(name)s not allowed in a inhead-noscript context",
-    "eof-in-head-noscript":
-        "Unexpected end of file. Expected inhead-noscript content",
-    "char-in-head-noscript":
-        "Unexpected non-space character. Expected inhead-noscript content",
+        _("Unexpected end tag (%(name)s) before html."),
     "XXX-undefined-error":
-        "Undefined error (this sucks and should be fixed)",
+        _("Undefined error (this sucks and should be fixed)"),
 }
 
 namespaces = {
@@ -302,7 +298,7 @@ namespaces = {
     "xmlns": "http://www.w3.org/2000/xmlns/"
 }
 
-scopingElements = frozenset([
+scopingElements = frozenset((
     (namespaces["html"], "applet"),
     (namespaces["html"], "caption"),
     (namespaces["html"], "html"),
@@ -320,9 +316,9 @@ scopingElements = frozenset([
     (namespaces["svg"], "foreignObject"),
     (namespaces["svg"], "desc"),
     (namespaces["svg"], "title"),
-])
+))
 
-formattingElements = frozenset([
+formattingElements = frozenset((
     (namespaces["html"], "a"),
     (namespaces["html"], "b"),
     (namespaces["html"], "big"),
@@ -337,9 +333,9 @@ formattingElements = frozenset([
     (namespaces["html"], "strong"),
     (namespaces["html"], "tt"),
     (namespaces["html"], "u")
-])
+))
 
-specialElements = frozenset([
+specialElements = frozenset((
     (namespaces["html"], "address"),
     (namespaces["html"], "applet"),
     (namespaces["html"], "area"),
@@ -420,89 +416,22 @@ specialElements = frozenset([
     (namespaces["html"], "wbr"),
     (namespaces["html"], "xmp"),
     (namespaces["svg"], "foreignObject")
-])
+))
 
-htmlIntegrationPointElements = frozenset([
-    (namespaces["mathml"], "annotation-xml"),
+htmlIntegrationPointElements = frozenset((
+    (namespaces["mathml"], "annotaion-xml"),
     (namespaces["svg"], "foreignObject"),
     (namespaces["svg"], "desc"),
     (namespaces["svg"], "title")
-])
+))
 
-mathmlTextIntegrationPointElements = frozenset([
+mathmlTextIntegrationPointElements = frozenset((
     (namespaces["mathml"], "mi"),
     (namespaces["mathml"], "mo"),
     (namespaces["mathml"], "mn"),
     (namespaces["mathml"], "ms"),
     (namespaces["mathml"], "mtext")
-])
-
-adjustSVGAttributes = {
-    "attributename": "attributeName",
-    "attributetype": "attributeType",
-    "basefrequency": "baseFrequency",
-    "baseprofile": "baseProfile",
-    "calcmode": "calcMode",
-    "clippathunits": "clipPathUnits",
-    "contentscripttype": "contentScriptType",
-    "contentstyletype": "contentStyleType",
-    "diffuseconstant": "diffuseConstant",
-    "edgemode": "edgeMode",
-    "externalresourcesrequired": "externalResourcesRequired",
-    "filterres": "filterRes",
-    "filterunits": "filterUnits",
-    "glyphref": "glyphRef",
-    "gradienttransform": "gradientTransform",
-    "gradientunits": "gradientUnits",
-    "kernelmatrix": "kernelMatrix",
-    "kernelunitlength": "kernelUnitLength",
-    "keypoints": "keyPoints",
-    "keysplines": "keySplines",
-    "keytimes": "keyTimes",
-    "lengthadjust": "lengthAdjust",
-    "limitingconeangle": "limitingConeAngle",
-    "markerheight": "markerHeight",
-    "markerunits": "markerUnits",
-    "markerwidth": "markerWidth",
-    "maskcontentunits": "maskContentUnits",
-    "maskunits": "maskUnits",
-    "numoctaves": "numOctaves",
-    "pathlength": "pathLength",
-    "patterncontentunits": "patternContentUnits",
-    "patterntransform": "patternTransform",
-    "patternunits": "patternUnits",
-    "pointsatx": "pointsAtX",
-    "pointsaty": "pointsAtY",
-    "pointsatz": "pointsAtZ",
-    "preservealpha": "preserveAlpha",
-    "preserveaspectratio": "preserveAspectRatio",
-    "primitiveunits": "primitiveUnits",
-    "refx": "refX",
-    "refy": "refY",
-    "repeatcount": "repeatCount",
-    "repeatdur": "repeatDur",
-    "requiredextensions": "requiredExtensions",
-    "requiredfeatures": "requiredFeatures",
-    "specularconstant": "specularConstant",
-    "specularexponent": "specularExponent",
-    "spreadmethod": "spreadMethod",
-    "startoffset": "startOffset",
-    "stddeviation": "stdDeviation",
-    "stitchtiles": "stitchTiles",
-    "surfacescale": "surfaceScale",
-    "systemlanguage": "systemLanguage",
-    "tablevalues": "tableValues",
-    "targetx": "targetX",
-    "targety": "targetY",
-    "textlength": "textLength",
-    "viewbox": "viewBox",
-    "viewtarget": "viewTarget",
-    "xchannelselector": "xChannelSelector",
-    "ychannelselector": "yChannelSelector",
-    "zoomandpan": "zoomAndPan"
-}
-
-adjustMathMLAttributes = {"definitionurl": "definitionURL"}
+))
 
 adjustForeignAttributes = {
     "xlink:actuate": ("xlink", "actuate", namespaces["xlink"]),
@@ -519,24 +448,24 @@ adjustForeignAttributes = {
     "xmlns:xlink": ("xmlns", "xlink", namespaces["xmlns"])
 }
 
-unadjustForeignAttributes = {(ns, local): qname for qname, (prefix, local, ns) in
-                             adjustForeignAttributes.items()}
+unadjustForeignAttributes = dict([((ns, local), qname) for qname, (prefix, local, ns) in
+                                  adjustForeignAttributes.items()])
 
-spaceCharacters = frozenset([
+spaceCharacters = frozenset((
     "\t",
     "\n",
     "\u000C",
     " ",
     "\r"
-])
+))
 
-tableInsertModeElements = frozenset([
+tableInsertModeElements = frozenset((
     "table",
     "tbody",
     "tfoot",
     "thead",
     "tr"
-])
+))
 
 asciiLowercase = frozenset(string.ascii_lowercase)
 asciiUppercase = frozenset(string.ascii_uppercase)
@@ -544,7 +473,8 @@ asciiLetters = frozenset(string.ascii_letters)
 digits = frozenset(string.digits)
 hexDigits = frozenset(string.hexdigits)
 
-asciiUpper2Lower = {ord(c): ord(c.lower()) for c in string.ascii_uppercase}
+asciiUpper2Lower = dict([(ord(c), ord(c.lower()))
+                         for c in string.ascii_uppercase])
 
 # Heading elements need to be ordered
 headingElements = (
@@ -556,7 +486,7 @@ headingElements = (
     "h6"
 )
 
-voidElements = frozenset([
+voidElements = frozenset((
     "base",
     "command",
     "event-source",
@@ -572,11 +502,11 @@ voidElements = frozenset([
     "input",
     "source",
     "track"
-])
+))
 
-cdataElements = frozenset(['title', 'textarea'])
+cdataElements = frozenset(('title', 'textarea'))
 
-rcdataElements = frozenset([
+rcdataElements = frozenset((
     'style',
     'script',
     'xmp',
@@ -584,28 +514,27 @@ rcdataElements = frozenset([
     'noembed',
     'noframes',
     'noscript'
-])
+))
 
 booleanAttributes = {
-    "": frozenset(["irrelevant", "itemscope"]),
-    "style": frozenset(["scoped"]),
-    "img": frozenset(["ismap"]),
-    "audio": frozenset(["autoplay", "controls"]),
-    "video": frozenset(["autoplay", "controls"]),
-    "script": frozenset(["defer", "async"]),
-    "details": frozenset(["open"]),
-    "datagrid": frozenset(["multiple", "disabled"]),
-    "command": frozenset(["hidden", "disabled", "checked", "default"]),
-    "hr": frozenset(["noshade"]),
-    "menu": frozenset(["autosubmit"]),
-    "fieldset": frozenset(["disabled", "readonly"]),
-    "option": frozenset(["disabled", "readonly", "selected"]),
-    "optgroup": frozenset(["disabled", "readonly"]),
-    "button": frozenset(["disabled", "autofocus"]),
-    "input": frozenset(["disabled", "readonly", "required", "autofocus", "checked", "ismap"]),
-    "select": frozenset(["disabled", "readonly", "autofocus", "multiple"]),
-    "output": frozenset(["disabled", "readonly"]),
-    "iframe": frozenset(["seamless"]),
+    "": frozenset(("irrelevant",)),
+    "style": frozenset(("scoped",)),
+    "img": frozenset(("ismap",)),
+    "audio": frozenset(("autoplay", "controls")),
+    "video": frozenset(("autoplay", "controls")),
+    "script": frozenset(("defer", "async")),
+    "details": frozenset(("open",)),
+    "datagrid": frozenset(("multiple", "disabled")),
+    "command": frozenset(("hidden", "disabled", "checked", "default")),
+    "hr": frozenset(("noshade")),
+    "menu": frozenset(("autosubmit",)),
+    "fieldset": frozenset(("disabled", "readonly")),
+    "option": frozenset(("disabled", "readonly", "selected")),
+    "optgroup": frozenset(("disabled", "readonly")),
+    "button": frozenset(("disabled", "autofocus")),
+    "input": frozenset(("disabled", "readonly", "required", "autofocus", "checked", "ismap")),
+    "select": frozenset(("disabled", "readonly", "autofocus", "multiple")),
+    "output": frozenset(("disabled", "readonly")),
 }
 
 # entitiesWindows1252 has to be _ordered_ and needs to have an index. It
@@ -645,7 +574,7 @@ entitiesWindows1252 = (
     376     # 0x9F  0x0178  LATIN CAPITAL LETTER Y WITH DIAERESIS
 )
 
-xmlEntities = frozenset(['lt;', 'gt;', 'amp;', 'apos;', 'quot;'])
+xmlEntities = frozenset(('lt;', 'gt;', 'amp;', 'apos;', 'quot;'))
 
 entities = {
     "AElig": "\xc6",
@@ -2886,6 +2815,7 @@ replacementCharacters = {
     0x0d: "\u000D",
     0x80: "\u20AC",
     0x81: "\u0081",
+    0x81: "\u0081",
     0x82: "\u201A",
     0x83: "\u0192",
     0x84: "\u201E",
@@ -2918,6 +2848,235 @@ replacementCharacters = {
     0x9F: "\u0178",
 }
 
+encodings = {
+    '437': 'cp437',
+    '850': 'cp850',
+    '852': 'cp852',
+    '855': 'cp855',
+    '857': 'cp857',
+    '860': 'cp860',
+    '861': 'cp861',
+    '862': 'cp862',
+    '863': 'cp863',
+    '865': 'cp865',
+    '866': 'cp866',
+    '869': 'cp869',
+    'ansix341968': 'ascii',
+    'ansix341986': 'ascii',
+    'arabic': 'iso8859-6',
+    'ascii': 'ascii',
+    'asmo708': 'iso8859-6',
+    'big5': 'big5',
+    'big5hkscs': 'big5hkscs',
+    'chinese': 'gbk',
+    'cp037': 'cp037',
+    'cp1026': 'cp1026',
+    'cp154': 'ptcp154',
+    'cp367': 'ascii',
+    'cp424': 'cp424',
+    'cp437': 'cp437',
+    'cp500': 'cp500',
+    'cp775': 'cp775',
+    'cp819': 'windows-1252',
+    'cp850': 'cp850',
+    'cp852': 'cp852',
+    'cp855': 'cp855',
+    'cp857': 'cp857',
+    'cp860': 'cp860',
+    'cp861': 'cp861',
+    'cp862': 'cp862',
+    'cp863': 'cp863',
+    'cp864': 'cp864',
+    'cp865': 'cp865',
+    'cp866': 'cp866',
+    'cp869': 'cp869',
+    'cp936': 'gbk',
+    'cpgr': 'cp869',
+    'cpis': 'cp861',
+    'csascii': 'ascii',
+    'csbig5': 'big5',
+    'cseuckr': 'cp949',
+    'cseucpkdfmtjapanese': 'euc_jp',
+    'csgb2312': 'gbk',
+    'cshproman8': 'hp-roman8',
+    'csibm037': 'cp037',
+    'csibm1026': 'cp1026',
+    'csibm424': 'cp424',
+    'csibm500': 'cp500',
+    'csibm855': 'cp855',
+    'csibm857': 'cp857',
+    'csibm860': 'cp860',
+    'csibm861': 'cp861',
+    'csibm863': 'cp863',
+    'csibm864': 'cp864',
+    'csibm865': 'cp865',
+    'csibm866': 'cp866',
+    'csibm869': 'cp869',
+    'csiso2022jp': 'iso2022_jp',
+    'csiso2022jp2': 'iso2022_jp_2',
+    'csiso2022kr': 'iso2022_kr',
+    'csiso58gb231280': 'gbk',
+    'csisolatin1': 'windows-1252',
+    'csisolatin2': 'iso8859-2',
+    'csisolatin3': 'iso8859-3',
+    'csisolatin4': 'iso8859-4',
+    'csisolatin5': 'windows-1254',
+    'csisolatin6': 'iso8859-10',
+    'csisolatinarabic': 'iso8859-6',
+    'csisolatincyrillic': 'iso8859-5',
+    'csisolatingreek': 'iso8859-7',
+    'csisolatinhebrew': 'iso8859-8',
+    'cskoi8r': 'koi8-r',
+    'csksc56011987': 'cp949',
+    'cspc775baltic': 'cp775',
+    'cspc850multilingual': 'cp850',
+    'cspc862latinhebrew': 'cp862',
+    'cspc8codepage437': 'cp437',
+    'cspcp852': 'cp852',
+    'csptcp154': 'ptcp154',
+    'csshiftjis': 'shift_jis',
+    'csunicode11utf7': 'utf-7',
+    'cyrillic': 'iso8859-5',
+    'cyrillicasian': 'ptcp154',
+    'ebcdiccpbe': 'cp500',
+    'ebcdiccpca': 'cp037',
+    'ebcdiccpch': 'cp500',
+    'ebcdiccphe': 'cp424',
+    'ebcdiccpnl': 'cp037',
+    'ebcdiccpus': 'cp037',
+    'ebcdiccpwt': 'cp037',
+    'ecma114': 'iso8859-6',
+    'ecma118': 'iso8859-7',
+    'elot928': 'iso8859-7',
+    'eucjp': 'euc_jp',
+    'euckr': 'cp949',
+    'extendedunixcodepackedformatforjapanese': 'euc_jp',
+    'gb18030': 'gb18030',
+    'gb2312': 'gbk',
+    'gb231280': 'gbk',
+    'gbk': 'gbk',
+    'greek': 'iso8859-7',
+    'greek8': 'iso8859-7',
+    'hebrew': 'iso8859-8',
+    'hproman8': 'hp-roman8',
+    'hzgb2312': 'hz',
+    'ibm037': 'cp037',
+    'ibm1026': 'cp1026',
+    'ibm367': 'ascii',
+    'ibm424': 'cp424',
+    'ibm437': 'cp437',
+    'ibm500': 'cp500',
+    'ibm775': 'cp775',
+    'ibm819': 'windows-1252',
+    'ibm850': 'cp850',
+    'ibm852': 'cp852',
+    'ibm855': 'cp855',
+    'ibm857': 'cp857',
+    'ibm860': 'cp860',
+    'ibm861': 'cp861',
+    'ibm862': 'cp862',
+    'ibm863': 'cp863',
+    'ibm864': 'cp864',
+    'ibm865': 'cp865',
+    'ibm866': 'cp866',
+    'ibm869': 'cp869',
+    'iso2022jp': 'iso2022_jp',
+    'iso2022jp2': 'iso2022_jp_2',
+    'iso2022kr': 'iso2022_kr',
+    'iso646irv1991': 'ascii',
+    'iso646us': 'ascii',
+    'iso88591': 'windows-1252',
+    'iso885910': 'iso8859-10',
+    'iso8859101992': 'iso8859-10',
+    'iso885911987': 'windows-1252',
+    'iso885913': 'iso8859-13',
+    'iso885914': 'iso8859-14',
+    'iso8859141998': 'iso8859-14',
+    'iso885915': 'iso8859-15',
+    'iso885916': 'iso8859-16',
+    'iso8859162001': 'iso8859-16',
+    'iso88592': 'iso8859-2',
+    'iso885921987': 'iso8859-2',
+    'iso88593': 'iso8859-3',
+    'iso885931988': 'iso8859-3',
+    'iso88594': 'iso8859-4',
+    'iso885941988': 'iso8859-4',
+    'iso88595': 'iso8859-5',
+    'iso885951988': 'iso8859-5',
+    'iso88596': 'iso8859-6',
+    'iso885961987': 'iso8859-6',
+    'iso88597': 'iso8859-7',
+    'iso885971987': 'iso8859-7',
+    'iso88598': 'iso8859-8',
+    'iso885981988': 'iso8859-8',
+    'iso88599': 'windows-1254',
+    'iso885991989': 'windows-1254',
+    'isoceltic': 'iso8859-14',
+    'isoir100': 'windows-1252',
+    'isoir101': 'iso8859-2',
+    'isoir109': 'iso8859-3',
+    'isoir110': 'iso8859-4',
+    'isoir126': 'iso8859-7',
+    'isoir127': 'iso8859-6',
+    'isoir138': 'iso8859-8',
+    'isoir144': 'iso8859-5',
+    'isoir148': 'windows-1254',
+    'isoir149': 'cp949',
+    'isoir157': 'iso8859-10',
+    'isoir199': 'iso8859-14',
+    'isoir226': 'iso8859-16',
+    'isoir58': 'gbk',
+    'isoir6': 'ascii',
+    'koi8r': 'koi8-r',
+    'koi8u': 'koi8-u',
+    'korean': 'cp949',
+    'ksc5601': 'cp949',
+    'ksc56011987': 'cp949',
+    'ksc56011989': 'cp949',
+    'l1': 'windows-1252',
+    'l10': 'iso8859-16',
+    'l2': 'iso8859-2',
+    'l3': 'iso8859-3',
+    'l4': 'iso8859-4',
+    'l5': 'windows-1254',
+    'l6': 'iso8859-10',
+    'l8': 'iso8859-14',
+    'latin1': 'windows-1252',
+    'latin10': 'iso8859-16',
+    'latin2': 'iso8859-2',
+    'latin3': 'iso8859-3',
+    'latin4': 'iso8859-4',
+    'latin5': 'windows-1254',
+    'latin6': 'iso8859-10',
+    'latin8': 'iso8859-14',
+    'latin9': 'iso8859-15',
+    'ms936': 'gbk',
+    'mskanji': 'shift_jis',
+    'pt154': 'ptcp154',
+    'ptcp154': 'ptcp154',
+    'r8': 'hp-roman8',
+    'roman8': 'hp-roman8',
+    'shiftjis': 'shift_jis',
+    'tis620': 'cp874',
+    'unicode11utf7': 'utf-7',
+    'us': 'ascii',
+    'usascii': 'ascii',
+    'utf16': 'utf-16',
+    'utf16be': 'utf-16-be',
+    'utf16le': 'utf-16-le',
+    'utf8': 'utf-8',
+    'windows1250': 'cp1250',
+    'windows1251': 'cp1251',
+    'windows1252': 'cp1252',
+    'windows1253': 'cp1253',
+    'windows1254': 'cp1254',
+    'windows1255': 'cp1255',
+    'windows1256': 'cp1256',
+    'windows1257': 'cp1257',
+    'windows1258': 'cp1258',
+    'windows936': 'gbk',
+    'x-x-big5': 'big5'}
+
 tokenTypes = {
     "Doctype": 0,
     "Characters": 1,
@@ -2929,18 +3088,17 @@ tokenTypes = {
     "ParseError": 7
 }
 
-tagTokenTypes = frozenset([tokenTypes["StartTag"], tokenTypes["EndTag"],
-                           tokenTypes["EmptyTag"]])
+tagTokenTypes = frozenset((tokenTypes["StartTag"], tokenTypes["EndTag"],
+                           tokenTypes["EmptyTag"]))
 
 
-prefixes = {v: k for k, v in namespaces.items()}
+prefixes = dict([(v, k) for k, v in namespaces.items()])
 prefixes["http://www.w3.org/1998/Math/MathML"] = "math"
 
 
 class DataLossWarning(UserWarning):
-    """Raised when the current tree is unable to represent the input data"""
     pass
 
 
-class _ReparseException(Exception):
+class ReparseException(Exception):
     pass
diff --git a/lib/bleach/_vendor/html5lib/filters/base.py b/lib/html5lib/filters/_base.py
similarity index 100%
rename from lib/bleach/_vendor/html5lib/filters/base.py
rename to lib/html5lib/filters/_base.py
diff --git a/lib/html5lib/filters/alphabeticalattributes.py b/lib/html5lib/filters/alphabeticalattributes.py
index 5ba926e3..fed6996c 100644
--- a/lib/html5lib/filters/alphabeticalattributes.py
+++ b/lib/html5lib/filters/alphabeticalattributes.py
@@ -1,29 +1,20 @@
 from __future__ import absolute_import, division, unicode_literals
 
-from . import base
+from . import _base
 
-from collections import OrderedDict
+try:
+    from collections import OrderedDict
+except ImportError:
+    from ordereddict import OrderedDict
 
 
-def _attr_key(attr):
-    """Return an appropriate key for an attribute for sorting
-
-    Attributes have a namespace that can be either ``None`` or a string. We
-    can't compare the two because they're different types, so we convert
-    ``None`` to an empty string first.
-
-    """
-    return (attr[0][0] or ''), attr[0][1]
-
-
-class Filter(base.Filter):
-    """Alphabetizes attributes for elements"""
+class Filter(_base.Filter):
     def __iter__(self):
-        for token in base.Filter.__iter__(self):
+        for token in _base.Filter.__iter__(self):
             if token["type"] in ("StartTag", "EmptyTag"):
                 attrs = OrderedDict()
                 for name, value in sorted(token["data"].items(),
-                                          key=_attr_key):
+                                          key=lambda x: x[0]):
                     attrs[name] = value
                 token["data"] = attrs
             yield token
diff --git a/lib/html5lib/filters/base.py b/lib/html5lib/filters/base.py
deleted file mode 100644
index c7dbaed0..00000000
--- a/lib/html5lib/filters/base.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-
-class Filter(object):
-    def __init__(self, source):
-        self.source = source
-
-    def __iter__(self):
-        return iter(self.source)
-
-    def __getattr__(self, name):
-        return getattr(self.source, name)
diff --git a/lib/html5lib/filters/inject_meta_charset.py b/lib/html5lib/filters/inject_meta_charset.py
index aefb5c84..ca33b70b 100644
--- a/lib/html5lib/filters/inject_meta_charset.py
+++ b/lib/html5lib/filters/inject_meta_charset.py
@@ -1,19 +1,11 @@
 from __future__ import absolute_import, division, unicode_literals
 
-from . import base
+from . import _base
 
 
-class Filter(base.Filter):
-    """Injects ``<meta charset=ENCODING>`` tag into head of document"""
+class Filter(_base.Filter):
     def __init__(self, source, encoding):
-        """Creates a Filter
-
-        :arg source: the source token stream
-
-        :arg encoding: the encoding to set
-
-        """
-        base.Filter.__init__(self, source)
+        _base.Filter.__init__(self, source)
         self.encoding = encoding
 
     def __iter__(self):
@@ -21,7 +13,7 @@ class Filter(base.Filter):
         meta_found = (self.encoding is None)
         pending = []
 
-        for token in base.Filter.__iter__(self):
+        for token in _base.Filter.__iter__(self):
             type = token["type"]
             if type == "StartTag":
                 if token["name"].lower() == "head":
diff --git a/lib/html5lib/filters/lint.py b/lib/html5lib/filters/lint.py
index acd4d7a2..7cc99a4b 100644
--- a/lib/html5lib/filters/lint.py
+++ b/lib/html5lib/filters/lint.py
@@ -1,93 +1,93 @@
 from __future__ import absolute_import, division, unicode_literals
 
-from six import text_type
+from gettext import gettext
+_ = gettext
 
-from . import base
-from ..constants import namespaces, voidElements
+from . import _base
+from ..constants import cdataElements, rcdataElements, voidElements
 
 from ..constants import spaceCharacters
 spaceCharacters = "".join(spaceCharacters)
 
 
-class Filter(base.Filter):
-    """Lints the token stream for errors
+class LintError(Exception):
+    pass
 
-    If it finds any errors, it'll raise an ``AssertionError``.
-
-    """
-    def __init__(self, source, require_matching_tags=True):
-        """Creates a Filter
-
-        :arg source: the source token stream
-
-        :arg require_matching_tags: whether or not to require matching tags
-
-        """
-        super(Filter, self).__init__(source)
-        self.require_matching_tags = require_matching_tags
 
+class Filter(_base.Filter):
     def __iter__(self):
         open_elements = []
-        for token in base.Filter.__iter__(self):
+        contentModelFlag = "PCDATA"
+        for token in _base.Filter.__iter__(self):
             type = token["type"]
             if type in ("StartTag", "EmptyTag"):
-                namespace = token["namespace"]
                 name = token["name"]
-                assert namespace is None or isinstance(namespace, text_type)
-                assert namespace != ""
-                assert isinstance(name, text_type)
-                assert name != ""
-                assert isinstance(token["data"], dict)
-                if (not namespace or namespace == namespaces["html"]) and name in voidElements:
-                    assert type == "EmptyTag"
-                else:
-                    assert type == "StartTag"
-                if type == "StartTag" and self.require_matching_tags:
-                    open_elements.append((namespace, name))
-                for (namespace, name), value in token["data"].items():
-                    assert namespace is None or isinstance(namespace, text_type)
-                    assert namespace != ""
-                    assert isinstance(name, text_type)
-                    assert name != ""
-                    assert isinstance(value, text_type)
+                if contentModelFlag != "PCDATA":
+                    raise LintError(_("StartTag not in PCDATA content model flag: %(tag)s") % {"tag": name})
+                if not isinstance(name, str):
+                    raise LintError(_("Tag name is not a string: %(tag)r") % {"tag": name})
+                if not name:
+                    raise LintError(_("Empty tag name"))
+                if type == "StartTag" and name in voidElements:
+                    raise LintError(_("Void element reported as StartTag token: %(tag)s") % {"tag": name})
+                elif type == "EmptyTag" and name not in voidElements:
+                    raise LintError(_("Non-void element reported as EmptyTag token: %(tag)s") % {"tag": token["name"]})
+                if type == "StartTag":
+                    open_elements.append(name)
+                for name, value in token["data"]:
+                    if not isinstance(name, str):
+                        raise LintError(_("Attribute name is not a string: %(name)r") % {"name": name})
+                    if not name:
+                        raise LintError(_("Empty attribute name"))
+                    if not isinstance(value, str):
+                        raise LintError(_("Attribute value is not a string: %(value)r") % {"value": value})
+                if name in cdataElements:
+                    contentModelFlag = "CDATA"
+                elif name in rcdataElements:
+                    contentModelFlag = "RCDATA"
+                elif name == "plaintext":
+                    contentModelFlag = "PLAINTEXT"
 
             elif type == "EndTag":
-                namespace = token["namespace"]
                 name = token["name"]
-                assert namespace is None or isinstance(namespace, text_type)
-                assert namespace != ""
-                assert isinstance(name, text_type)
-                assert name != ""
-                if (not namespace or namespace == namespaces["html"]) and name in voidElements:
-                    assert False, "Void element reported as EndTag token: %(tag)s" % {"tag": name}
-                elif self.require_matching_tags:
-                    start = open_elements.pop()
-                    assert start == (namespace, name)
+                if not isinstance(name, str):
+                    raise LintError(_("Tag name is not a string: %(tag)r") % {"tag": name})
+                if not name:
+                    raise LintError(_("Empty tag name"))
+                if name in voidElements:
+                    raise LintError(_("Void element reported as EndTag token: %(tag)s") % {"tag": name})
+                start_name = open_elements.pop()
+                if start_name != name:
+                    raise LintError(_("EndTag (%(end)s) does not match StartTag (%(start)s)") % {"end": name, "start": start_name})
+                contentModelFlag = "PCDATA"
 
             elif type == "Comment":
-                data = token["data"]
-                assert isinstance(data, text_type)
+                if contentModelFlag != "PCDATA":
+                    raise LintError(_("Comment not in PCDATA content model flag"))
 
             elif type in ("Characters", "SpaceCharacters"):
                 data = token["data"]
-                assert isinstance(data, text_type)
-                assert data != ""
+                if not isinstance(data, str):
+                    raise LintError(_("Attribute name is not a string: %(name)r") % {"name": data})
+                if not data:
+                    raise LintError(_("%(type)s token with empty data") % {"type": type})
                 if type == "SpaceCharacters":
-                    assert data.strip(spaceCharacters) == ""
+                    data = data.strip(spaceCharacters)
+                    if data:
+                        raise LintError(_("Non-space character(s) found in SpaceCharacters token: %(token)r") % {"token": data})
 
             elif type == "Doctype":
                 name = token["name"]
-                assert name is None or isinstance(name, text_type)
-                assert token["publicId"] is None or isinstance(name, text_type)
-                assert token["systemId"] is None or isinstance(name, text_type)
+                if contentModelFlag != "PCDATA":
+                    raise LintError(_("Doctype not in PCDATA content model flag: %(name)s") % {"name": name})
+                if not isinstance(name, str):
+                    raise LintError(_("Tag name is not a string: %(tag)r") % {"tag": name})
+                # XXX: what to do with token["data"] ?
 
-            elif type == "Entity":
-                assert isinstance(token["name"], text_type)
-
-            elif type == "SerializerError":
-                assert isinstance(token["data"], text_type)
+            elif type in ("ParseError", "SerializeError"):
+                pass
 
             else:
-                assert False, "Unknown token type: %(type)s" % {"type": type}
+                raise LintError(_("Unknown token type: %(type)s") % {"type": type})
 
             yield token
diff --git a/lib/html5lib/filters/optionaltags.py b/lib/html5lib/filters/optionaltags.py
index 4a865012..fefe0b30 100644
--- a/lib/html5lib/filters/optionaltags.py
+++ b/lib/html5lib/filters/optionaltags.py
@@ -1,10 +1,9 @@
 from __future__ import absolute_import, division, unicode_literals
 
-from . import base
+from . import _base
 
 
-class Filter(base.Filter):
-    """Removes optional tags from the token stream"""
+class Filter(_base.Filter):
     def slider(self):
         previous1 = previous2 = None
         for token in self.source:
@@ -12,8 +11,7 @@ class Filter(base.Filter):
                 yield previous2, previous1, token
             previous2 = previous1
             previous1 = token
-        if previous1 is not None:
-            yield previous2, previous1, None
+        yield previous2, previous1, None
 
     def __iter__(self):
         for previous, token, next in self.slider():
@@ -60,7 +58,7 @@ class Filter(base.Filter):
         elif tagname == 'colgroup':
             # A colgroup element's start tag may be omitted if the first thing
             # inside the colgroup element is a col element, and if the element
-            # is not immediately preceded by another colgroup element whose
+            # is not immediately preceeded by another colgroup element whose
             # end tag has been omitted.
             if type in ("StartTag", "EmptyTag"):
                 # XXX: we do not look at the preceding event, so instead we never
@@ -72,7 +70,7 @@ class Filter(base.Filter):
         elif tagname == 'tbody':
             # A tbody element's start tag may be omitted if the first thing
             # inside the tbody element is a tr element, and if the element is
-            # not immediately preceded by a tbody, thead, or tfoot element
+            # not immediately preceeded by a tbody, thead, or tfoot element
             # whose end tag has been omitted.
             if type == "StartTag":
                 # omit the thead and tfoot elements' end tag when they are
diff --git a/lib/html5lib/filters/sanitizer.py b/lib/html5lib/filters/sanitizer.py
index 70ef9066..b206b54e 100644
--- a/lib/html5lib/filters/sanitizer.py
+++ b/lib/html5lib/filters/sanitizer.py
@@ -1,916 +1,12 @@
-"""Deprecated from html5lib 1.1.
-
-See `here <https://github.com/html5lib/html5lib-python/issues/443>`_ for
-information about its deprecation; `Bleach <https://github.com/mozilla/bleach>`_
-is recommended as a replacement. Please let us know in the aforementioned issue
-if Bleach is unsuitable for your needs.
-
-"""
 from __future__ import absolute_import, division, unicode_literals
 
-import re
-import warnings
-from xml.sax.saxutils import escape, unescape
-
-from six.moves import urllib_parse as urlparse
-
-from . import base
-from ..constants import namespaces, prefixes
-
-__all__ = ["Filter"]
+from . import _base
+from ..sanitizer import HTMLSanitizerMixin
 
 
-_deprecation_msg = (
-    "html5lib's sanitizer is deprecated; see " +
-    "https://github.com/html5lib/html5lib-python/issues/443 and please let " +
-    "us know if Bleach is unsuitable for your needs"
-)
-
-warnings.warn(_deprecation_msg, DeprecationWarning)
-
-allowed_elements = frozenset((
-    (namespaces['html'], 'a'),
-    (namespaces['html'], 'abbr'),
-    (namespaces['html'], 'acronym'),
-    (namespaces['html'], 'address'),
-    (namespaces['html'], 'area'),
-    (namespaces['html'], 'article'),
-    (namespaces['html'], 'aside'),
-    (namespaces['html'], 'audio'),
-    (namespaces['html'], 'b'),
-    (namespaces['html'], 'big'),
-    (namespaces['html'], 'blockquote'),
-    (namespaces['html'], 'br'),
-    (namespaces['html'], 'button'),
-    (namespaces['html'], 'canvas'),
-    (namespaces['html'], 'caption'),
-    (namespaces['html'], 'center'),
-    (namespaces['html'], 'cite'),
-    (namespaces['html'], 'code'),
-    (namespaces['html'], 'col'),
-    (namespaces['html'], 'colgroup'),
-    (namespaces['html'], 'command'),
-    (namespaces['html'], 'datagrid'),
-    (namespaces['html'], 'datalist'),
-    (namespaces['html'], 'dd'),
-    (namespaces['html'], 'del'),
-    (namespaces['html'], 'details'),
-    (namespaces['html'], 'dfn'),
-    (namespaces['html'], 'dialog'),
-    (namespaces['html'], 'dir'),
-    (namespaces['html'], 'div'),
-    (namespaces['html'], 'dl'),
-    (namespaces['html'], 'dt'),
-    (namespaces['html'], 'em'),
-    (namespaces['html'], 'event-source'),
-    (namespaces['html'], 'fieldset'),
-    (namespaces['html'], 'figcaption'),
-    (namespaces['html'], 'figure'),
-    (namespaces['html'], 'footer'),
-    (namespaces['html'], 'font'),
-    (namespaces['html'], 'form'),
-    (namespaces['html'], 'header'),
-    (namespaces['html'], 'h1'),
-    (namespaces['html'], 'h2'),
-    (namespaces['html'], 'h3'),
-    (namespaces['html'], 'h4'),
-    (namespaces['html'], 'h5'),
-    (namespaces['html'], 'h6'),
-    (namespaces['html'], 'hr'),
-    (namespaces['html'], 'i'),
-    (namespaces['html'], 'img'),
-    (namespaces['html'], 'input'),
-    (namespaces['html'], 'ins'),
-    (namespaces['html'], 'keygen'),
-    (namespaces['html'], 'kbd'),
-    (namespaces['html'], 'label'),
-    (namespaces['html'], 'legend'),
-    (namespaces['html'], 'li'),
-    (namespaces['html'], 'm'),
-    (namespaces['html'], 'map'),
-    (namespaces['html'], 'menu'),
-    (namespaces['html'], 'meter'),
-    (namespaces['html'], 'multicol'),
-    (namespaces['html'], 'nav'),
-    (namespaces['html'], 'nextid'),
-    (namespaces['html'], 'ol'),
-    (namespaces['html'], 'output'),
-    (namespaces['html'], 'optgroup'),
-    (namespaces['html'], 'option'),
-    (namespaces['html'], 'p'),
-    (namespaces['html'], 'pre'),
-    (namespaces['html'], 'progress'),
-    (namespaces['html'], 'q'),
-    (namespaces['html'], 's'),
-    (namespaces['html'], 'samp'),
-    (namespaces['html'], 'section'),
-    (namespaces['html'], 'select'),
-    (namespaces['html'], 'small'),
-    (namespaces['html'], 'sound'),
-    (namespaces['html'], 'source'),
-    (namespaces['html'], 'spacer'),
-    (namespaces['html'], 'span'),
-    (namespaces['html'], 'strike'),
-    (namespaces['html'], 'strong'),
-    (namespaces['html'], 'sub'),
-    (namespaces['html'], 'sup'),
-    (namespaces['html'], 'table'),
-    (namespaces['html'], 'tbody'),
-    (namespaces['html'], 'td'),
-    (namespaces['html'], 'textarea'),
-    (namespaces['html'], 'time'),
-    (namespaces['html'], 'tfoot'),
-    (namespaces['html'], 'th'),
-    (namespaces['html'], 'thead'),
-    (namespaces['html'], 'tr'),
-    (namespaces['html'], 'tt'),
-    (namespaces['html'], 'u'),
-    (namespaces['html'], 'ul'),
-    (namespaces['html'], 'var'),
-    (namespaces['html'], 'video'),
-    (namespaces['mathml'], 'maction'),
-    (namespaces['mathml'], 'math'),
-    (namespaces['mathml'], 'merror'),
-    (namespaces['mathml'], 'mfrac'),
-    (namespaces['mathml'], 'mi'),
-    (namespaces['mathml'], 'mmultiscripts'),
-    (namespaces['mathml'], 'mn'),
-    (namespaces['mathml'], 'mo'),
-    (namespaces['mathml'], 'mover'),
-    (namespaces['mathml'], 'mpadded'),
-    (namespaces['mathml'], 'mphantom'),
-    (namespaces['mathml'], 'mprescripts'),
-    (namespaces['mathml'], 'mroot'),
-    (namespaces['mathml'], 'mrow'),
-    (namespaces['mathml'], 'mspace'),
-    (namespaces['mathml'], 'msqrt'),
-    (namespaces['mathml'], 'mstyle'),
-    (namespaces['mathml'], 'msub'),
-    (namespaces['mathml'], 'msubsup'),
-    (namespaces['mathml'], 'msup'),
-    (namespaces['mathml'], 'mtable'),
-    (namespaces['mathml'], 'mtd'),
-    (namespaces['mathml'], 'mtext'),
-    (namespaces['mathml'], 'mtr'),
-    (namespaces['mathml'], 'munder'),
-    (namespaces['mathml'], 'munderover'),
-    (namespaces['mathml'], 'none'),
-    (namespaces['svg'], 'a'),
-    (namespaces['svg'], 'animate'),
-    (namespaces['svg'], 'animateColor'),
-    (namespaces['svg'], 'animateMotion'),
-    (namespaces['svg'], 'animateTransform'),
-    (namespaces['svg'], 'clipPath'),
-    (namespaces['svg'], 'circle'),
-    (namespaces['svg'], 'defs'),
-    (namespaces['svg'], 'desc'),
-    (namespaces['svg'], 'ellipse'),
-    (namespaces['svg'], 'font-face'),
-    (namespaces['svg'], 'font-face-name'),
-    (namespaces['svg'], 'font-face-src'),
-    (namespaces['svg'], 'g'),
-    (namespaces['svg'], 'glyph'),
-    (namespaces['svg'], 'hkern'),
-    (namespaces['svg'], 'linearGradient'),
-    (namespaces['svg'], 'line'),
-    (namespaces['svg'], 'marker'),
-    (namespaces['svg'], 'metadata'),
-    (namespaces['svg'], 'missing-glyph'),
-    (namespaces['svg'], 'mpath'),
-    (namespaces['svg'], 'path'),
-    (namespaces['svg'], 'polygon'),
-    (namespaces['svg'], 'polyline'),
-    (namespaces['svg'], 'radialGradient'),
-    (namespaces['svg'], 'rect'),
-    (namespaces['svg'], 'set'),
-    (namespaces['svg'], 'stop'),
-    (namespaces['svg'], 'svg'),
-    (namespaces['svg'], 'switch'),
-    (namespaces['svg'], 'text'),
-    (namespaces['svg'], 'title'),
-    (namespaces['svg'], 'tspan'),
-    (namespaces['svg'], 'use'),
-))
-
-allowed_attributes = frozenset((
-    # HTML attributes
-    (None, 'abbr'),
-    (None, 'accept'),
-    (None, 'accept-charset'),
-    (None, 'accesskey'),
-    (None, 'action'),
-    (None, 'align'),
-    (None, 'alt'),
-    (None, 'autocomplete'),
-    (None, 'autofocus'),
-    (None, 'axis'),
-    (None, 'background'),
-    (None, 'balance'),
-    (None, 'bgcolor'),
-    (None, 'bgproperties'),
-    (None, 'border'),
-    (None, 'bordercolor'),
-    (None, 'bordercolordark'),
-    (None, 'bordercolorlight'),
-    (None, 'bottompadding'),
-    (None, 'cellpadding'),
-    (None, 'cellspacing'),
-    (None, 'ch'),
-    (None, 'challenge'),
-    (None, 'char'),
-    (None, 'charoff'),
-    (None, 'choff'),
-    (None, 'charset'),
-    (None, 'checked'),
-    (None, 'cite'),
-    (None, 'class'),
-    (None, 'clear'),
-    (None, 'color'),
-    (None, 'cols'),
-    (None, 'colspan'),
-    (None, 'compact'),
-    (None, 'contenteditable'),
-    (None, 'controls'),
-    (None, 'coords'),
-    (None, 'data'),
-    (None, 'datafld'),
-    (None, 'datapagesize'),
-    (None, 'datasrc'),
-    (None, 'datetime'),
-    (None, 'default'),
-    (None, 'delay'),
-    (None, 'dir'),
-    (None, 'disabled'),
-    (None, 'draggable'),
-    (None, 'dynsrc'),
-    (None, 'enctype'),
-    (None, 'end'),
-    (None, 'face'),
-    (None, 'for'),
-    (None, 'form'),
-    (None, 'frame'),
-    (None, 'galleryimg'),
-    (None, 'gutter'),
-    (None, 'headers'),
-    (None, 'height'),
-    (None, 'hidefocus'),
-    (None, 'hidden'),
-    (None, 'high'),
-    (None, 'href'),
-    (None, 'hreflang'),
-    (None, 'hspace'),
-    (None, 'icon'),
-    (None, 'id'),
-    (None, 'inputmode'),
-    (None, 'ismap'),
-    (None, 'keytype'),
-    (None, 'label'),
-    (None, 'leftspacing'),
-    (None, 'lang'),
-    (None, 'list'),
-    (None, 'longdesc'),
-    (None, 'loop'),
-    (None, 'loopcount'),
-    (None, 'loopend'),
-    (None, 'loopstart'),
-    (None, 'low'),
-    (None, 'lowsrc'),
-    (None, 'max'),
-    (None, 'maxlength'),
-    (None, 'media'),
-    (None, 'method'),
-    (None, 'min'),
-    (None, 'multiple'),
-    (None, 'name'),
-    (None, 'nohref'),
-    (None, 'noshade'),
-    (None, 'nowrap'),
-    (None, 'open'),
-    (None, 'optimum'),
-    (None, 'pattern'),
-    (None, 'ping'),
-    (None, 'point-size'),
-    (None, 'poster'),
-    (None, 'pqg'),
-    (None, 'preload'),
-    (None, 'prompt'),
-    (None, 'radiogroup'),
-    (None, 'readonly'),
-    (None, 'rel'),
-    (None, 'repeat-max'),
-    (None, 'repeat-min'),
-    (None, 'replace'),
-    (None, 'required'),
-    (None, 'rev'),
-    (None, 'rightspacing'),
-    (None, 'rows'),
-    (None, 'rowspan'),
-    (None, 'rules'),
-    (None, 'scope'),
-    (None, 'selected'),
-    (None, 'shape'),
-    (None, 'size'),
-    (None, 'span'),
-    (None, 'src'),
-    (None, 'start'),
-    (None, 'step'),
-    (None, 'style'),
-    (None, 'summary'),
-    (None, 'suppress'),
-    (None, 'tabindex'),
-    (None, 'target'),
-    (None, 'template'),
-    (None, 'title'),
-    (None, 'toppadding'),
-    (None, 'type'),
-    (None, 'unselectable'),
-    (None, 'usemap'),
-    (None, 'urn'),
-    (None, 'valign'),
-    (None, 'value'),
-    (None, 'variable'),
-    (None, 'volume'),
-    (None, 'vspace'),
-    (None, 'vrml'),
-    (None, 'width'),
-    (None, 'wrap'),
-    (namespaces['xml'], 'lang'),
-    # MathML attributes
-    (None, 'actiontype'),
-    (None, 'align'),
-    (None, 'columnalign'),
-    (None, 'columnalign'),
-    (None, 'columnalign'),
-    (None, 'columnlines'),
-    (None, 'columnspacing'),
-    (None, 'columnspan'),
-    (None, 'depth'),
-    (None, 'display'),
-    (None, 'displaystyle'),
-    (None, 'equalcolumns'),
-    (None, 'equalrows'),
-    (None, 'fence'),
-    (None, 'fontstyle'),
-    (None, 'fontweight'),
-    (None, 'frame'),
-    (None, 'height'),
-    (None, 'linethickness'),
-    (None, 'lspace'),
-    (None, 'mathbackground'),
-    (None, 'mathcolor'),
-    (None, 'mathvariant'),
-    (None, 'mathvariant'),
-    (None, 'maxsize'),
-    (None, 'minsize'),
-    (None, 'other'),
-    (None, 'rowalign'),
-    (None, 'rowalign'),
-    (None, 'rowalign'),
-    (None, 'rowlines'),
-    (None, 'rowspacing'),
-    (None, 'rowspan'),
-    (None, 'rspace'),
-    (None, 'scriptlevel'),
-    (None, 'selection'),
-    (None, 'separator'),
-    (None, 'stretchy'),
-    (None, 'width'),
-    (None, 'width'),
-    (namespaces['xlink'], 'href'),
-    (namespaces['xlink'], 'show'),
-    (namespaces['xlink'], 'type'),
-    # SVG attributes
-    (None, 'accent-height'),
-    (None, 'accumulate'),
-    (None, 'additive'),
-    (None, 'alphabetic'),
-    (None, 'arabic-form'),
-    (None, 'ascent'),
-    (None, 'attributeName'),
-    (None, 'attributeType'),
-    (None, 'baseProfile'),
-    (None, 'bbox'),
-    (None, 'begin'),
-    (None, 'by'),
-    (None, 'calcMode'),
-    (None, 'cap-height'),
-    (None, 'class'),
-    (None, 'clip-path'),
-    (None, 'color'),
-    (None, 'color-rendering'),
-    (None, 'content'),
-    (None, 'cx'),
-    (None, 'cy'),
-    (None, 'd'),
-    (None, 'dx'),
-    (None, 'dy'),
-    (None, 'descent'),
-    (None, 'display'),
-    (None, 'dur'),
-    (None, 'end'),
-    (None, 'fill'),
-    (None, 'fill-opacity'),
-    (None, 'fill-rule'),
-    (None, 'font-family'),
-    (None, 'font-size'),
-    (None, 'font-stretch'),
-    (None, 'font-style'),
-    (None, 'font-variant'),
-    (None, 'font-weight'),
-    (None, 'from'),
-    (None, 'fx'),
-    (None, 'fy'),
-    (None, 'g1'),
-    (None, 'g2'),
-    (None, 'glyph-name'),
-    (None, 'gradientUnits'),
-    (None, 'hanging'),
-    (None, 'height'),
-    (None, 'horiz-adv-x'),
-    (None, 'horiz-origin-x'),
-    (None, 'id'),
-    (None, 'ideographic'),
-    (None, 'k'),
-    (None, 'keyPoints'),
-    (None, 'keySplines'),
-    (None, 'keyTimes'),
-    (None, 'lang'),
-    (None, 'marker-end'),
-    (None, 'marker-mid'),
-    (None, 'marker-start'),
-    (None, 'markerHeight'),
-    (None, 'markerUnits'),
-    (None, 'markerWidth'),
-    (None, 'mathematical'),
-    (None, 'max'),
-    (None, 'min'),
-    (None, 'name'),
-    (None, 'offset'),
-    (None, 'opacity'),
-    (None, 'orient'),
-    (None, 'origin'),
-    (None, 'overline-position'),
-    (None, 'overline-thickness'),
-    (None, 'panose-1'),
-    (None, 'path'),
-    (None, 'pathLength'),
-    (None, 'points'),
-    (None, 'preserveAspectRatio'),
-    (None, 'r'),
-    (None, 'refX'),
-    (None, 'refY'),
-    (None, 'repeatCount'),
-    (None, 'repeatDur'),
-    (None, 'requiredExtensions'),
-    (None, 'requiredFeatures'),
-    (None, 'restart'),
-    (None, 'rotate'),
-    (None, 'rx'),
-    (None, 'ry'),
-    (None, 'slope'),
-    (None, 'stemh'),
-    (None, 'stemv'),
-    (None, 'stop-color'),
-    (None, 'stop-opacity'),
-    (None, 'strikethrough-position'),
-    (None, 'strikethrough-thickness'),
-    (None, 'stroke'),
-    (None, 'stroke-dasharray'),
-    (None, 'stroke-dashoffset'),
-    (None, 'stroke-linecap'),
-    (None, 'stroke-linejoin'),
-    (None, 'stroke-miterlimit'),
-    (None, 'stroke-opacity'),
-    (None, 'stroke-width'),
-    (None, 'systemLanguage'),
-    (None, 'target'),
-    (None, 'text-anchor'),
-    (None, 'to'),
-    (None, 'transform'),
-    (None, 'type'),
-    (None, 'u1'),
-    (None, 'u2'),
-    (None, 'underline-position'),
-    (None, 'underline-thickness'),
-    (None, 'unicode'),
-    (None, 'unicode-range'),
-    (None, 'units-per-em'),
-    (None, 'values'),
-    (None, 'version'),
-    (None, 'viewBox'),
-    (None, 'visibility'),
-    (None, 'width'),
-    (None, 'widths'),
-    (None, 'x'),
-    (None, 'x-height'),
-    (None, 'x1'),
-    (None, 'x2'),
-    (namespaces['xlink'], 'actuate'),
-    (namespaces['xlink'], 'arcrole'),
-    (namespaces['xlink'], 'href'),
-    (namespaces['xlink'], 'role'),
-    (namespaces['xlink'], 'show'),
-    (namespaces['xlink'], 'title'),
-    (namespaces['xlink'], 'type'),
-    (namespaces['xml'], 'base'),
-    (namespaces['xml'], 'lang'),
-    (namespaces['xml'], 'space'),
-    (None, 'y'),
-    (None, 'y1'),
-    (None, 'y2'),
-    (None, 'zoomAndPan'),
-))
-
-attr_val_is_uri = frozenset((
-    (None, 'href'),
-    (None, 'src'),
-    (None, 'cite'),
-    (None, 'action'),
-    (None, 'longdesc'),
-    (None, 'poster'),
-    (None, 'background'),
-    (None, 'datasrc'),
-    (None, 'dynsrc'),
-    (None, 'lowsrc'),
-    (None, 'ping'),
-    (namespaces['xlink'], 'href'),
-    (namespaces['xml'], 'base'),
-))
-
-svg_attr_val_allows_ref = frozenset((
-    (None, 'clip-path'),
-    (None, 'color-profile'),
-    (None, 'cursor'),
-    (None, 'fill'),
-    (None, 'filter'),
-    (None, 'marker'),
-    (None, 'marker-start'),
-    (None, 'marker-mid'),
-    (None, 'marker-end'),
-    (None, 'mask'),
-    (None, 'stroke'),
-))
-
-svg_allow_local_href = frozenset((
-    (None, 'altGlyph'),
-    (None, 'animate'),
-    (None, 'animateColor'),
-    (None, 'animateMotion'),
-    (None, 'animateTransform'),
-    (None, 'cursor'),
-    (None, 'feImage'),
-    (None, 'filter'),
-    (None, 'linearGradient'),
-    (None, 'pattern'),
-    (None, 'radialGradient'),
-    (None, 'textpath'),
-    (None, 'tref'),
-    (None, 'set'),
-    (None, 'use')
-))
-
-allowed_css_properties = frozenset((
-    'azimuth',
-    'background-color',
-    'border-bottom-color',
-    'border-collapse',
-    'border-color',
-    'border-left-color',
-    'border-right-color',
-    'border-top-color',
-    'clear',
-    'color',
-    'cursor',
-    'direction',
-    'display',
-    'elevation',
-    'float',
-    'font',
-    'font-family',
-    'font-size',
-    'font-style',
-    'font-variant',
-    'font-weight',
-    'height',
-    'letter-spacing',
-    'line-height',
-    'overflow',
-    'pause',
-    'pause-after',
-    'pause-before',
-    'pitch',
-    'pitch-range',
-    'richness',
-    'speak',
-    'speak-header',
-    'speak-numeral',
-    'speak-punctuation',
-    'speech-rate',
-    'stress',
-    'text-align',
-    'text-decoration',
-    'text-indent',
-    'unicode-bidi',
-    'vertical-align',
-    'voice-family',
-    'volume',
-    'white-space',
-    'width',
-))
-
-allowed_css_keywords = frozenset((
-    'auto',
-    'aqua',
-    'black',
-    'block',
-    'blue',
-    'bold',
-    'both',
-    'bottom',
-    'brown',
-    'center',
-    'collapse',
-    'dashed',
-    'dotted',
-    'fuchsia',
-    'gray',
-    'green',
-    '!important',
-    'italic',
-    'left',
-    'lime',
-    'maroon',
-    'medium',
-    'none',
-    'navy',
-    'normal',
-    'nowrap',
-    'olive',
-    'pointer',
-    'purple',
-    'red',
-    'right',
-    'solid',
-    'silver',
-    'teal',
-    'top',
-    'transparent',
-    'underline',
-    'white',
-    'yellow',
-))
-
-allowed_svg_properties = frozenset((
-    'fill',
-    'fill-opacity',
-    'fill-rule',
-    'stroke',
-    'stroke-width',
-    'stroke-linecap',
-    'stroke-linejoin',
-    'stroke-opacity',
-))
-
-allowed_protocols = frozenset((
-    'ed2k',
-    'ftp',
-    'http',
-    'https',
-    'irc',
-    'mailto',
-    'news',
-    'gopher',
-    'nntp',
-    'telnet',
-    'webcal',
-    'xmpp',
-    'callto',
-    'feed',
-    'urn',
-    'aim',
-    'rsync',
-    'tag',
-    'ssh',
-    'sftp',
-    'rtsp',
-    'afs',
-    'data',
-))
-
-allowed_content_types = frozenset((
-    'image/png',
-    'image/jpeg',
-    'image/gif',
-    'image/webp',
-    'image/bmp',
-    'text/plain',
-))
-
-
-data_content_type = re.compile(r'''
-                                ^
-                                # Match a content type <application>/<type>
-                                (?P<content_type>[-a-zA-Z0-9.]+/[-a-zA-Z0-9.]+)
-                                # Match any character set and encoding
-                                (?:(?:;charset=(?:[-a-zA-Z0-9]+)(?:;(?:base64))?)
-                                  |(?:;(?:base64))?(?:;charset=(?:[-a-zA-Z0-9]+))?)
-                                # Assume the rest is data
-                                ,.*
-                                $
-                                ''',
-                               re.VERBOSE)
-
-
-class Filter(base.Filter):
-    """Sanitizes token stream of XHTML+MathML+SVG and of inline style attributes"""
-    def __init__(self,
-                 source,
-                 allowed_elements=allowed_elements,
-                 allowed_attributes=allowed_attributes,
-                 allowed_css_properties=allowed_css_properties,
-                 allowed_css_keywords=allowed_css_keywords,
-                 allowed_svg_properties=allowed_svg_properties,
-                 allowed_protocols=allowed_protocols,
-                 allowed_content_types=allowed_content_types,
-                 attr_val_is_uri=attr_val_is_uri,
-                 svg_attr_val_allows_ref=svg_attr_val_allows_ref,
-                 svg_allow_local_href=svg_allow_local_href):
-        """Creates a Filter
-
-        :arg allowed_elements: set of elements to allow--everything else will
-            be escaped
-
-        :arg allowed_attributes: set of attributes to allow in
-            elements--everything else will be stripped
-
-        :arg allowed_css_properties: set of CSS properties to allow--everything
-            else will be stripped
-
-        :arg allowed_css_keywords: set of CSS keywords to allow--everything
-            else will be stripped
-
-        :arg allowed_svg_properties: set of SVG properties to allow--everything
-            else will be removed
-
-        :arg allowed_protocols: set of allowed protocols for URIs
-
-        :arg allowed_content_types: set of allowed content types for ``data`` URIs.
-
-        :arg attr_val_is_uri: set of attributes that have URI values--values
-            that have a scheme not listed in ``allowed_protocols`` are removed
-
-        :arg svg_attr_val_allows_ref: set of SVG attributes that can have
-            references
-
-        :arg svg_allow_local_href: set of SVG elements that can have local
-            hrefs--these are removed
-
-        """
-        super(Filter, self).__init__(source)
-
-        warnings.warn(_deprecation_msg, DeprecationWarning)
-
-        self.allowed_elements = allowed_elements
-        self.allowed_attributes = allowed_attributes
-        self.allowed_css_properties = allowed_css_properties
-        self.allowed_css_keywords = allowed_css_keywords
-        self.allowed_svg_properties = allowed_svg_properties
-        self.allowed_protocols = allowed_protocols
-        self.allowed_content_types = allowed_content_types
-        self.attr_val_is_uri = attr_val_is_uri
-        self.svg_attr_val_allows_ref = svg_attr_val_allows_ref
-        self.svg_allow_local_href = svg_allow_local_href
-
+class Filter(_base.Filter, HTMLSanitizerMixin):
     def __iter__(self):
-        for token in base.Filter.__iter__(self):
+        for token in _base.Filter.__iter__(self):
             token = self.sanitize_token(token)
             if token:
                 yield token
-
-    # Sanitize the +html+, escaping all elements not in ALLOWED_ELEMENTS, and
-    # stripping out all attributes not in ALLOWED_ATTRIBUTES. Style attributes
-    # are parsed, and a restricted set, specified by ALLOWED_CSS_PROPERTIES and
-    # ALLOWED_CSS_KEYWORDS, are allowed through. attributes in ATTR_VAL_IS_URI
-    # are scanned, and only URI schemes specified in ALLOWED_PROTOCOLS are
-    # allowed.
-    #
-    #   sanitize_html('<script> do_nasty_stuff() </script>')
-    #    => &lt;script> do_nasty_stuff() &lt;/script>
-    #   sanitize_html('<a href="javascript: sucker();">Click here for $100</a>')
-    #    => <a>Click here for $100</a>
-    def sanitize_token(self, token):
-
-        # accommodate filters which use token_type differently
-        token_type = token["type"]
-        if token_type in ("StartTag", "EndTag", "EmptyTag"):
-            name = token["name"]
-            namespace = token["namespace"]
-            if ((namespace, name) in self.allowed_elements or
-                (namespace is None and
-                 (namespaces["html"], name) in self.allowed_elements)):
-                return self.allowed_token(token)
-            else:
-                return self.disallowed_token(token)
-        elif token_type == "Comment":
-            pass
-        else:
-            return token
-
-    def allowed_token(self, token):
-        if "data" in token:
-            attrs = token["data"]
-            attr_names = set(attrs.keys())
-
-            # Remove forbidden attributes
-            for to_remove in (attr_names - self.allowed_attributes):
-                del token["data"][to_remove]
-                attr_names.remove(to_remove)
-
-            # Remove attributes with disallowed URL values
-            for attr in (attr_names & self.attr_val_is_uri):
-                assert attr in attrs
-                # I don't have a clue where this regexp comes from or why it matches those
-                # characters, nor why we call unescape. I just know it's always been here.
-                # Should you be worried by this comment in a sanitizer? Yes. On the other hand, all
-                # this will do is remove *more* than it otherwise would.
-                val_unescaped = re.sub("[`\x00-\x20\x7f-\xa0\\s]+", '',
-                                       unescape(attrs[attr])).lower()
-                # remove replacement characters from unescaped characters
-                val_unescaped = val_unescaped.replace("\ufffd", "")
-                try:
-                    uri = urlparse.urlparse(val_unescaped)
-                except ValueError:
-                    uri = None
-                    del attrs[attr]
-                if uri and uri.scheme:
-                    if uri.scheme not in self.allowed_protocols:
-                        del attrs[attr]
-                    if uri.scheme == 'data':
-                        m = data_content_type.match(uri.path)
-                        if not m:
-                            del attrs[attr]
-                        elif m.group('content_type') not in self.allowed_content_types:
-                            del attrs[attr]
-
-            for attr in self.svg_attr_val_allows_ref:
-                if attr in attrs:
-                    attrs[attr] = re.sub(r'url\s*\(\s*[^#\s][^)]+?\)',
-                                         ' ',
-                                         unescape(attrs[attr]))
-            if (token["name"] in self.svg_allow_local_href and
-                (namespaces['xlink'], 'href') in attrs and re.search(r'^\s*[^#\s].*',
-                                                                     attrs[(namespaces['xlink'], 'href')])):
-                del attrs[(namespaces['xlink'], 'href')]
-            if (None, 'style') in attrs:
-                attrs[(None, 'style')] = self.sanitize_css(attrs[(None, 'style')])
-            token["data"] = attrs
-        return token
-
-    def disallowed_token(self, token):
-        token_type = token["type"]
-        if token_type == "EndTag":
-            token["data"] = "</%s>" % token["name"]
-        elif token["data"]:
-            assert token_type in ("StartTag", "EmptyTag")
-            attrs = []
-            for (ns, name), v in token["data"].items():
-                attrs.append(' %s="%s"' % (name if ns is None else "%s:%s" % (prefixes[ns], name), escape(v)))
-            token["data"] = "<%s%s>" % (token["name"], ''.join(attrs))
-        else:
-            token["data"] = "<%s>" % token["name"]
-        if token.get("selfClosing"):
-            token["data"] = token["data"][:-1] + "/>"
-
-        token["type"] = "Characters"
-
-        del token["name"]
-        return token
-
-    def sanitize_css(self, style):
-        # disallow urls
-        style = re.compile(r'url\s*\(\s*[^\s)]+?\s*\)\s*').sub(' ', style)
-
-        # gauntlet
-        if not re.match(r"""^([:,;#%.\sa-zA-Z0-9!]|\w-\w|'[\s\w]+'|"[\s\w]+"|\([\d,\s]+\))*$""", style):
-            return ''
-        if not re.match(r"^\s*([-\w]+\s*:[^:;]*(;\s*|$))*$", style):
-            return ''
-
-        clean = []
-        for prop, value in re.findall(r"([-\w]+)\s*:\s*([^:;]*)", style):
-            if not value:
-                continue
-            if prop.lower() in self.allowed_css_properties:
-                clean.append(prop + ': ' + value + ';')
-            elif prop.split('-')[0].lower() in ['background', 'border', 'margin',
-                                                'padding']:
-                for keyword in value.split():
-                    if keyword not in self.allowed_css_keywords and \
-                            not re.match(r"^(#[0-9a-fA-F]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|\d{0,2}\.?\d{0,2}(cm|em|ex|in|mm|pc|pt|px|%|,|\))?)$", keyword):  # noqa
-                        break
-                else:
-                    clean.append(prop + ': ' + value + ';')
-            elif prop.lower() in self.allowed_svg_properties:
-                clean.append(prop + ': ' + value + ';')
-
-        return ' '.join(clean)
diff --git a/lib/html5lib/filters/whitespace.py b/lib/html5lib/filters/whitespace.py
index 0d12584b..dfc60eeb 100644
--- a/lib/html5lib/filters/whitespace.py
+++ b/lib/html5lib/filters/whitespace.py
@@ -2,20 +2,20 @@ from __future__ import absolute_import, division, unicode_literals
 
 import re
 
-from . import base
+from . import _base
 from ..constants import rcdataElements, spaceCharacters
 spaceCharacters = "".join(spaceCharacters)
 
 SPACES_REGEX = re.compile("[%s]+" % spaceCharacters)
 
 
-class Filter(base.Filter):
-    """Collapses whitespace except in pre, textarea, and script elements"""
+class Filter(_base.Filter):
+
     spacePreserveElements = frozenset(["pre", "textarea"] + list(rcdataElements))
 
     def __iter__(self):
         preserve = 0
-        for token in base.Filter.__iter__(self):
+        for token in _base.Filter.__iter__(self):
             type = token["type"]
             if type == "StartTag" \
                     and (preserve or token["name"] in self.spacePreserveElements):
diff --git a/lib/html5lib/html5parser.py b/lib/html5lib/html5parser.py
index 74d829d9..b0f14f39 100644
--- a/lib/html5lib/html5parser.py
+++ b/lib/html5lib/html5parser.py
@@ -1,74 +1,38 @@
 from __future__ import absolute_import, division, unicode_literals
-from six import with_metaclass, viewkeys
+from six import with_metaclass
 
 import types
 
-from . import _inputstream
-from . import _tokenizer
+from . import inputstream
+from . import tokenizer
 
 from . import treebuilders
-from .treebuilders.base import Marker
+from .treebuilders._base import Marker
 
-from . import _utils
-from .constants import (
-    spaceCharacters, asciiUpper2Lower,
-    specialElements, headingElements, cdataElements, rcdataElements,
-    tokenTypes, tagTokenTypes,
-    namespaces,
-    htmlIntegrationPointElements, mathmlTextIntegrationPointElements,
-    adjustForeignAttributes as adjustForeignAttributesMap,
-    adjustMathMLAttributes, adjustSVGAttributes,
-    E,
-    _ReparseException
-)
+from . import utils
+from . import constants
+from .constants import spaceCharacters, asciiUpper2Lower
+from .constants import specialElements
+from .constants import headingElements
+from .constants import cdataElements, rcdataElements
+from .constants import tokenTypes, ReparseException, namespaces
+from .constants import htmlIntegrationPointElements, mathmlTextIntegrationPointElements
+from .constants import adjustForeignAttributes as adjustForeignAttributesMap
 
 
-def parse(doc, treebuilder="etree", namespaceHTMLElements=True, **kwargs):
-    """Parse an HTML document as a string or file-like object into a tree
-
-    :arg doc: the document to parse as a string or file-like object
-
-    :arg treebuilder: the treebuilder to use when parsing
-
-    :arg namespaceHTMLElements: whether or not to namespace HTML elements
-
-    :returns: parsed tree
-
-    Example:
-
-    >>> from html5lib.html5parser import parse
-    >>> parse('<html><body><p>This is a doc</p></body></html>')
-    <Element u'{http://www.w3.org/1999/xhtml}html' at 0x7feac4909db0>
-
-    """
+def parse(doc, treebuilder="etree", encoding=None,
+          namespaceHTMLElements=True):
+    """Parse a string or file-like object into a tree"""
     tb = treebuilders.getTreeBuilder(treebuilder)
     p = HTMLParser(tb, namespaceHTMLElements=namespaceHTMLElements)
-    return p.parse(doc, **kwargs)
+    return p.parse(doc, encoding=encoding)
 
 
-def parseFragment(doc, container="div", treebuilder="etree", namespaceHTMLElements=True, **kwargs):
-    """Parse an HTML fragment as a string or file-like object into a tree
-
-    :arg doc: the fragment to parse as a string or file-like object
-
-    :arg container: the container context to parse the fragment in
-
-    :arg treebuilder: the treebuilder to use when parsing
-
-    :arg namespaceHTMLElements: whether or not to namespace HTML elements
-
-    :returns: parsed tree
-
-    Example:
-
-    >>> from html5lib.html5libparser import parseFragment
-    >>> parseFragment('<b>this is a fragment</b>')
-    <Element u'DOCUMENT_FRAGMENT' at 0x7feac484b090>
-
-    """
+def parseFragment(doc, container="div", treebuilder="etree", encoding=None,
+                  namespaceHTMLElements=True):
     tb = treebuilders.getTreeBuilder(treebuilder)
     p = HTMLParser(tb, namespaceHTMLElements=namespaceHTMLElements)
-    return p.parseFragment(doc, container=container, **kwargs)
+    return p.parseFragment(doc, container=container, encoding=encoding)
 
 
 def method_decorator_metaclass(function):
@@ -84,30 +48,21 @@ def method_decorator_metaclass(function):
 
 
 class HTMLParser(object):
-    """HTML parser
+    """HTML parser. Generates a tree structure from a stream of (possibly
+        malformed) HTML"""
 
-    Generates a tree structure from a stream of (possibly malformed) HTML.
-
-    """
-
-    def __init__(self, tree=None, strict=False, namespaceHTMLElements=True, debug=False):
+    def __init__(self, tree=None, tokenizer=tokenizer.HTMLTokenizer,
+                 strict=False, namespaceHTMLElements=True, debug=False):
         """
-        :arg tree: a treebuilder class controlling the type of tree that will be
-            returned. Built in treebuilders can be accessed through
-            html5lib.treebuilders.getTreeBuilder(treeType)
+        strict - raise an exception when a parse error is encountered
 
-        :arg strict: raise an exception when a parse error is encountered
-
-        :arg namespaceHTMLElements: whether or not to namespace HTML elements
-
-        :arg debug: whether or not to enable debug mode which logs things
-
-        Example:
-
-        >>> from html5lib.html5parser import HTMLParser
-        >>> parser = HTMLParser()                     # generates parser with etree builder
-        >>> parser = HTMLParser('lxml', strict=True)  # generates parser with lxml builder which is strict
+        tree - a treebuilder class controlling the type of tree that will be
+        returned. Built in treebuilders can be accessed through
+        html5lib.treebuilders.getTreeBuilder(treeType)
 
+        tokenizer - a class that provides a stream of tokens to the treebuilder.
+        This may be replaced for e.g. a sanitizer which converts some tags to
+        text
         """
 
         # Raise an exception on the first error encountered
@@ -116,24 +71,29 @@ class HTMLParser(object):
         if tree is None:
             tree = treebuilders.getTreeBuilder("etree")
         self.tree = tree(namespaceHTMLElements)
+        self.tokenizer_class = tokenizer
         self.errors = []
 
-        self.phases = {name: cls(self, self.tree) for name, cls in
-                       getPhases(debug).items()}
+        self.phases = dict([(name, cls(self, self.tree)) for name, cls in
+                            getPhases(debug).items()])
 
-    def _parse(self, stream, innerHTML=False, container="div", scripting=False, **kwargs):
+    def _parse(self, stream, innerHTML=False, container="div",
+               encoding=None, parseMeta=True, useChardet=True, **kwargs):
 
         self.innerHTMLMode = innerHTML
         self.container = container
-        self.scripting = scripting
-        self.tokenizer = _tokenizer.HTMLTokenizer(stream, parser=self, **kwargs)
+        self.tokenizer = self.tokenizer_class(stream, encoding=encoding,
+                                              parseMeta=parseMeta,
+                                              useChardet=useChardet,
+                                              parser=self, **kwargs)
         self.reset()
 
-        try:
-            self.mainLoop()
-        except _ReparseException:
-            self.reset()
-            self.mainLoop()
+        while True:
+            try:
+                self.mainLoop()
+                break
+            except ReparseException:
+                self.reset()
 
     def reset(self):
         self.tree.reset()
@@ -160,7 +120,7 @@ class HTMLParser(object):
             self.phase.insertHtmlElement()
             self.resetInsertionMode()
         else:
-            self.innerHTML = False  # pylint:disable=redefined-variable-type
+            self.innerHTML = False
             self.phase = self.phases["initial"]
 
         self.lastPhase = None
@@ -169,16 +129,6 @@ class HTMLParser(object):
 
         self.framesetOK = True
 
-    @property
-    def documentEncoding(self):
-        """Name of the character encoding that was used to decode the input stream, or
-        :obj:`None` if that is not determined yet
-
-        """
-        if not hasattr(self, 'tokenizer'):
-            return None
-        return self.tokenizer.stream.charEncoding[0].name
-
     def isHTMLIntegrationPoint(self, element):
         if (element.name == "annotation-xml" and
                 element.namespace == namespaces["mathml"]):
@@ -201,11 +151,9 @@ class HTMLParser(object):
         DoctypeToken = tokenTypes["Doctype"]
         ParseErrorToken = tokenTypes["ParseError"]
 
-        for token in self.tokenizer:
-            prev_token = None
+        for token in self.normalizedTokens():
             new_token = token
             while new_token is not None:
-                prev_token = new_token
                 currentNode = self.tree.openElements[-1] if self.tree.openElements else None
                 currentNodeNamespace = currentNode.namespace if currentNode else None
                 currentNodeName = currentNode.name if currentNode else None
@@ -224,7 +172,6 @@ class HTMLParser(object):
                           type in (CharactersToken, SpaceCharactersToken))) or
                         (currentNodeNamespace == namespaces["mathml"] and
                          currentNodeName == "annotation-xml" and
-                         type == StartTagToken and
                          token["name"] == "svg") or
                         (self.isHTMLIntegrationPoint(currentNode) and
                          type in (StartTagToken, CharactersToken, SpaceCharactersToken))):
@@ -245,10 +192,10 @@ class HTMLParser(object):
                     elif type == DoctypeToken:
                         new_token = phase.processDoctype(new_token)
 
-            if (type == StartTagToken and prev_token["selfClosing"] and
-                    not prev_token["selfClosingAcknowledged"]):
+            if (type == StartTagToken and token["selfClosing"]
+                    and not token["selfClosingAcknowledged"]):
                 self.parseError("non-void-element-with-trailing-solidus",
-                                {"name": prev_token["name"]})
+                                {"name": token["name"]})
 
         # When the loop finishes it's EOF
         reprocess = True
@@ -259,78 +206,143 @@ class HTMLParser(object):
             if reprocess:
                 assert self.phase not in phases
 
-    def parse(self, stream, *args, **kwargs):
+    def normalizedTokens(self):
+        for token in self.tokenizer:
+            yield self.normalizeToken(token)
+
+    def parse(self, stream, encoding=None, parseMeta=True, useChardet=True):
         """Parse a HTML document into a well-formed tree
 
-        :arg stream: a file-like object or string containing the HTML to be parsed
-
-            The optional encoding parameter must be a string that indicates
-            the encoding.  If specified, that encoding will be used,
-            regardless of any BOM or later declaration (such as in a meta
-            element).
-
-        :arg scripting: treat noscript elements as if JavaScript was turned on
-
-        :returns: parsed tree
-
-        Example:
-
-        >>> from html5lib.html5parser import HTMLParser
-        >>> parser = HTMLParser()
-        >>> parser.parse('<html><body><p>This is a doc</p></body></html>')
-        <Element u'{http://www.w3.org/1999/xhtml}html' at 0x7feac4909db0>
+        stream - a filelike object or string containing the HTML to be parsed
 
+        The optional encoding parameter must be a string that indicates
+        the encoding.  If specified, that encoding will be used,
+        regardless of any BOM or later declaration (such as in a meta
+        element)
         """
-        self._parse(stream, False, None, *args, **kwargs)
+        self._parse(stream, innerHTML=False, encoding=encoding,
+                    parseMeta=parseMeta, useChardet=useChardet)
         return self.tree.getDocument()
 
-    def parseFragment(self, stream, *args, **kwargs):
+    def parseFragment(self, stream, container="div", encoding=None,
+                      parseMeta=False, useChardet=True):
         """Parse a HTML fragment into a well-formed tree fragment
 
-        :arg container: name of the element we're setting the innerHTML
-            property if set to None, default to 'div'
+        container - name of the element we're setting the innerHTML property
+        if set to None, default to 'div'
 
-        :arg stream: a file-like object or string containing the HTML to be parsed
-
-            The optional encoding parameter must be a string that indicates
-            the encoding.  If specified, that encoding will be used,
-            regardless of any BOM or later declaration (such as in a meta
-            element)
-
-        :arg scripting: treat noscript elements as if JavaScript was turned on
-
-        :returns: parsed tree
-
-        Example:
-
-        >>> from html5lib.html5libparser import HTMLParser
-        >>> parser = HTMLParser()
-        >>> parser.parseFragment('<b>this is a fragment</b>')
-        <Element u'DOCUMENT_FRAGMENT' at 0x7feac484b090>
+        stream - a filelike object or string containing the HTML to be parsed
 
+        The optional encoding parameter must be a string that indicates
+        the encoding.  If specified, that encoding will be used,
+        regardless of any BOM or later declaration (such as in a meta
+        element)
         """
-        self._parse(stream, True, *args, **kwargs)
+        self._parse(stream, True, container=container, encoding=encoding)
         return self.tree.getFragment()
 
-    def parseError(self, errorcode="XXX-undefined-error", datavars=None):
+    def parseError(self, errorcode="XXX-undefined-error", datavars={}):
         # XXX The idea is to make errorcode mandatory.
-        if datavars is None:
-            datavars = {}
         self.errors.append((self.tokenizer.stream.position(), errorcode, datavars))
         if self.strict:
-            raise ParseError(E[errorcode] % datavars)
+            raise ParseError
+
+    def normalizeToken(self, token):
+        """ HTML5 specific normalizations to the token stream """
+
+        if token["type"] == tokenTypes["StartTag"]:
+            token["data"] = dict(token["data"][::-1])
+
+        return token
 
     def adjustMathMLAttributes(self, token):
-        adjust_attributes(token, adjustMathMLAttributes)
+        replacements = {"definitionurl": "definitionURL"}
+        for k, v in replacements.items():
+            if k in token["data"]:
+                token["data"][v] = token["data"][k]
+                del token["data"][k]
 
     def adjustSVGAttributes(self, token):
-        adjust_attributes(token, adjustSVGAttributes)
+        replacements = {
+            "attributename": "attributeName",
+            "attributetype": "attributeType",
+            "basefrequency": "baseFrequency",
+            "baseprofile": "baseProfile",
+            "calcmode": "calcMode",
+            "clippathunits": "clipPathUnits",
+            "contentscripttype": "contentScriptType",
+            "contentstyletype": "contentStyleType",
+            "diffuseconstant": "diffuseConstant",
+            "edgemode": "edgeMode",
+            "externalresourcesrequired": "externalResourcesRequired",
+            "filterres": "filterRes",
+            "filterunits": "filterUnits",
+            "glyphref": "glyphRef",
+            "gradienttransform": "gradientTransform",
+            "gradientunits": "gradientUnits",
+            "kernelmatrix": "kernelMatrix",
+            "kernelunitlength": "kernelUnitLength",
+            "keypoints": "keyPoints",
+            "keysplines": "keySplines",
+            "keytimes": "keyTimes",
+            "lengthadjust": "lengthAdjust",
+            "limitingconeangle": "limitingConeAngle",
+            "markerheight": "markerHeight",
+            "markerunits": "markerUnits",
+            "markerwidth": "markerWidth",
+            "maskcontentunits": "maskContentUnits",
+            "maskunits": "maskUnits",
+            "numoctaves": "numOctaves",
+            "pathlength": "pathLength",
+            "patterncontentunits": "patternContentUnits",
+            "patterntransform": "patternTransform",
+            "patternunits": "patternUnits",
+            "pointsatx": "pointsAtX",
+            "pointsaty": "pointsAtY",
+            "pointsatz": "pointsAtZ",
+            "preservealpha": "preserveAlpha",
+            "preserveaspectratio": "preserveAspectRatio",
+            "primitiveunits": "primitiveUnits",
+            "refx": "refX",
+            "refy": "refY",
+            "repeatcount": "repeatCount",
+            "repeatdur": "repeatDur",
+            "requiredextensions": "requiredExtensions",
+            "requiredfeatures": "requiredFeatures",
+            "specularconstant": "specularConstant",
+            "specularexponent": "specularExponent",
+            "spreadmethod": "spreadMethod",
+            "startoffset": "startOffset",
+            "stddeviation": "stdDeviation",
+            "stitchtiles": "stitchTiles",
+            "surfacescale": "surfaceScale",
+            "systemlanguage": "systemLanguage",
+            "tablevalues": "tableValues",
+            "targetx": "targetX",
+            "targety": "targetY",
+            "textlength": "textLength",
+            "viewbox": "viewBox",
+            "viewtarget": "viewTarget",
+            "xchannelselector": "xChannelSelector",
+            "ychannelselector": "yChannelSelector",
+            "zoomandpan": "zoomAndPan"
+        }
+        for originalName in list(token["data"].keys()):
+            if originalName in replacements:
+                svgName = replacements[originalName]
+                token["data"][svgName] = token["data"][originalName]
+                del token["data"][originalName]
 
     def adjustForeignAttributes(self, token):
-        adjust_attributes(token, adjustForeignAttributesMap)
+        replacements = adjustForeignAttributesMap
+
+        for originalName in token["data"].keys():
+            if originalName in replacements:
+                foreignName = replacements[originalName]
+                token["data"][foreignName] = token["data"][originalName]
+                del token["data"][originalName]
 
     def reparseTokenNormal(self, token):
-        # pylint:disable=unused-argument
         self.parser.phase()
 
     def resetInsertionMode(self):
@@ -378,7 +390,9 @@ class HTMLParser(object):
         self.phase = new_phase
 
     def parseRCDataRawtext(self, token, contentType):
-        # Generic RCDATA/RAWTEXT Parsing algorithm
+        """Generic RCDATA/RAWTEXT Parsing algorithm
+        contentType - RCDATA or RAWTEXT
+        """
         assert contentType in ("RAWTEXT", "RCDATA")
 
         self.tree.insertElement(token)
@@ -393,17 +407,20 @@ class HTMLParser(object):
         self.phase = self.phases["text"]
 
 
-@_utils.memoize
 def getPhases(debug):
     def log(function):
         """Logger that records which phase processes each token"""
-        type_names = {value: key for key, value in tokenTypes.items()}
+        type_names = dict((value, key) for key, value in
+                          constants.tokenTypes.items())
 
         def wrapped(self, *args, **kwargs):
             if function.__name__.startswith("process") and len(args) > 0:
                 token = args[0]
-                info = {"type": type_names[token['type']]}
-                if token['type'] in tagTokenTypes:
+                try:
+                    info = {"type": type_names[token['type']]}
+                except:
+                    raise
+                if token['type'] in constants.tagTokenTypes:
                     info["name"] = token['name']
 
                 self.parser.log.append((self.parser.tokenizer.state.__name__,
@@ -422,17 +439,13 @@ def getPhases(debug):
         else:
             return type
 
-    # pylint:disable=unused-argument
     class Phase(with_metaclass(getMetaclass(debug, log))):
         """Base class for helper object that implements each phase of processing
         """
-        __slots__ = ("parser", "tree", "__startTagCache", "__endTagCache")
 
         def __init__(self, parser, tree):
             self.parser = parser
             self.tree = tree
-            self.__startTagCache = {}
-            self.__endTagCache = {}
 
         def processEOF(self):
             raise NotImplementedError
@@ -452,21 +465,7 @@ def getPhases(debug):
             self.tree.insertText(token["data"])
 
         def processStartTag(self, token):
-            # Note the caching is done here rather than BoundMethodDispatcher as doing it there
-            # requires a circular reference to the Phase, and this ends up with a significant
-            # (CPython 2.7, 3.8) GC cost when parsing many short inputs
-            name = token["name"]
-            # In Py2, using `in` is quicker in general than try/except KeyError
-            # In Py3, `in` is quicker when there are few cache hits (typically short inputs)
-            if name in self.__startTagCache:
-                func = self.__startTagCache[name]
-            else:
-                func = self.__startTagCache[name] = self.startTagHandler[name]
-                # bound the cache size in case we get loads of unknown tags
-                while len(self.__startTagCache) > len(self.startTagHandler) * 1.1:
-                    # this makes the eviction policy random on Py < 3.7 and FIFO >= 3.7
-                    self.__startTagCache.pop(next(iter(self.__startTagCache)))
-            return func(token)
+            return self.startTagHandler[token["name"]](token)
 
         def startTagHtml(self, token):
             if not self.parser.firstStartTag and token["name"] == "html":
@@ -479,25 +478,9 @@ def getPhases(debug):
             self.parser.firstStartTag = False
 
         def processEndTag(self, token):
-            # Note the caching is done here rather than BoundMethodDispatcher as doing it there
-            # requires a circular reference to the Phase, and this ends up with a significant
-            # (CPython 2.7, 3.8) GC cost when parsing many short inputs
-            name = token["name"]
-            # In Py2, using `in` is quicker in general than try/except KeyError
-            # In Py3, `in` is quicker when there are few cache hits (typically short inputs)
-            if name in self.__endTagCache:
-                func = self.__endTagCache[name]
-            else:
-                func = self.__endTagCache[name] = self.endTagHandler[name]
-                # bound the cache size in case we get loads of unknown tags
-                while len(self.__endTagCache) > len(self.endTagHandler) * 1.1:
-                    # this makes the eviction policy random on Py < 3.7 and FIFO >= 3.7
-                    self.__endTagCache.pop(next(iter(self.__endTagCache)))
-            return func(token)
+            return self.endTagHandler[token["name"]](token)
 
     class InitialPhase(Phase):
-        __slots__ = tuple()
-
         def processSpaceCharacters(self, token):
             pass
 
@@ -522,76 +505,77 @@ def getPhases(debug):
             if publicId != "":
                 publicId = publicId.translate(asciiUpper2Lower)
 
-            if (not correct or token["name"] != "html" or
-                    publicId.startswith(
-                        ("+//silmaril//dtd html pro v0r11 19970101//",
-                         "-//advasoft ltd//dtd html 3.0 aswedit + extensions//",
-                         "-//as//dtd html 3.0 aswedit + extensions//",
-                         "-//ietf//dtd html 2.0 level 1//",
-                         "-//ietf//dtd html 2.0 level 2//",
-                         "-//ietf//dtd html 2.0 strict level 1//",
-                         "-//ietf//dtd html 2.0 strict level 2//",
-                         "-//ietf//dtd html 2.0 strict//",
-                         "-//ietf//dtd html 2.0//",
-                         "-//ietf//dtd html 2.1e//",
-                         "-//ietf//dtd html 3.0//",
-                         "-//ietf//dtd html 3.2 final//",
-                         "-//ietf//dtd html 3.2//",
-                         "-//ietf//dtd html 3//",
-                         "-//ietf//dtd html level 0//",
-                         "-//ietf//dtd html level 1//",
-                         "-//ietf//dtd html level 2//",
-                         "-//ietf//dtd html level 3//",
-                         "-//ietf//dtd html strict level 0//",
-                         "-//ietf//dtd html strict level 1//",
-                         "-//ietf//dtd html strict level 2//",
-                         "-//ietf//dtd html strict level 3//",
-                         "-//ietf//dtd html strict//",
-                         "-//ietf//dtd html//",
-                         "-//metrius//dtd metrius presentational//",
-                         "-//microsoft//dtd internet explorer 2.0 html strict//",
-                         "-//microsoft//dtd internet explorer 2.0 html//",
-                         "-//microsoft//dtd internet explorer 2.0 tables//",
-                         "-//microsoft//dtd internet explorer 3.0 html strict//",
-                         "-//microsoft//dtd internet explorer 3.0 html//",
-                         "-//microsoft//dtd internet explorer 3.0 tables//",
-                         "-//netscape comm. corp.//dtd html//",
-                         "-//netscape comm. corp.//dtd strict html//",
-                         "-//o'reilly and associates//dtd html 2.0//",
-                         "-//o'reilly and associates//dtd html extended 1.0//",
-                         "-//o'reilly and associates//dtd html extended relaxed 1.0//",
-                         "-//softquad software//dtd hotmetal pro 6.0::19990601::extensions to html 4.0//",
-                         "-//softquad//dtd hotmetal pro 4.0::19971010::extensions to html 4.0//",
-                         "-//spyglass//dtd html 2.0 extended//",
-                         "-//sq//dtd html 2.0 hotmetal + extensions//",
-                         "-//sun microsystems corp.//dtd hotjava html//",
-                         "-//sun microsystems corp.//dtd hotjava strict html//",
-                         "-//w3c//dtd html 3 1995-03-24//",
-                         "-//w3c//dtd html 3.2 draft//",
-                         "-//w3c//dtd html 3.2 final//",
-                         "-//w3c//dtd html 3.2//",
-                         "-//w3c//dtd html 3.2s draft//",
-                         "-//w3c//dtd html 4.0 frameset//",
-                         "-//w3c//dtd html 4.0 transitional//",
-                         "-//w3c//dtd html experimental 19960712//",
-                         "-//w3c//dtd html experimental 970421//",
-                         "-//w3c//dtd w3 html//",
-                         "-//w3o//dtd w3 html 3.0//",
-                         "-//webtechs//dtd mozilla html 2.0//",
-                         "-//webtechs//dtd mozilla html//")) or
-                    publicId in ("-//w3o//dtd w3 html strict 3.0//en//",
-                                 "-/w3c/dtd html 4.0 transitional/en",
-                                 "html") or
-                    publicId.startswith(
-                        ("-//w3c//dtd html 4.01 frameset//",
-                         "-//w3c//dtd html 4.01 transitional//")) and
-                    systemId is None or
-                    systemId and systemId.lower() == "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd"):
+            if (not correct or token["name"] != "html"
+                or publicId.startswith(
+                    ("+//silmaril//dtd html pro v0r11 19970101//",
+                     "-//advasoft ltd//dtd html 3.0 aswedit + extensions//",
+                     "-//as//dtd html 3.0 aswedit + extensions//",
+                     "-//ietf//dtd html 2.0 level 1//",
+                     "-//ietf//dtd html 2.0 level 2//",
+                     "-//ietf//dtd html 2.0 strict level 1//",
+                     "-//ietf//dtd html 2.0 strict level 2//",
+                     "-//ietf//dtd html 2.0 strict//",
+                     "-//ietf//dtd html 2.0//",
+                     "-//ietf//dtd html 2.1e//",
+                     "-//ietf//dtd html 3.0//",
+                     "-//ietf//dtd html 3.2 final//",
+                     "-//ietf//dtd html 3.2//",
+                     "-//ietf//dtd html 3//",
+                     "-//ietf//dtd html level 0//",
+                     "-//ietf//dtd html level 1//",
+                     "-//ietf//dtd html level 2//",
+                     "-//ietf//dtd html level 3//",
+                     "-//ietf//dtd html strict level 0//",
+                     "-//ietf//dtd html strict level 1//",
+                     "-//ietf//dtd html strict level 2//",
+                     "-//ietf//dtd html strict level 3//",
+                     "-//ietf//dtd html strict//",
+                     "-//ietf//dtd html//",
+                     "-//metrius//dtd metrius presentational//",
+                     "-//microsoft//dtd internet explorer 2.0 html strict//",
+                     "-//microsoft//dtd internet explorer 2.0 html//",
+                     "-//microsoft//dtd internet explorer 2.0 tables//",
+                     "-//microsoft//dtd internet explorer 3.0 html strict//",
+                     "-//microsoft//dtd internet explorer 3.0 html//",
+                     "-//microsoft//dtd internet explorer 3.0 tables//",
+                     "-//netscape comm. corp.//dtd html//",
+                     "-//netscape comm. corp.//dtd strict html//",
+                     "-//o'reilly and associates//dtd html 2.0//",
+                     "-//o'reilly and associates//dtd html extended 1.0//",
+                     "-//o'reilly and associates//dtd html extended relaxed 1.0//",
+                     "-//softquad software//dtd hotmetal pro 6.0::19990601::extensions to html 4.0//",
+                     "-//softquad//dtd hotmetal pro 4.0::19971010::extensions to html 4.0//",
+                     "-//spyglass//dtd html 2.0 extended//",
+                     "-//sq//dtd html 2.0 hotmetal + extensions//",
+                     "-//sun microsystems corp.//dtd hotjava html//",
+                     "-//sun microsystems corp.//dtd hotjava strict html//",
+                     "-//w3c//dtd html 3 1995-03-24//",
+                     "-//w3c//dtd html 3.2 draft//",
+                     "-//w3c//dtd html 3.2 final//",
+                     "-//w3c//dtd html 3.2//",
+                     "-//w3c//dtd html 3.2s draft//",
+                     "-//w3c//dtd html 4.0 frameset//",
+                     "-//w3c//dtd html 4.0 transitional//",
+                     "-//w3c//dtd html experimental 19960712//",
+                     "-//w3c//dtd html experimental 970421//",
+                     "-//w3c//dtd w3 html//",
+                     "-//w3o//dtd w3 html 3.0//",
+                     "-//webtechs//dtd mozilla html 2.0//",
+                     "-//webtechs//dtd mozilla html//"))
+                or publicId in
+                    ("-//w3o//dtd w3 html strict 3.0//en//",
+                     "-/w3c/dtd html 4.0 transitional/en",
+                     "html")
+                or publicId.startswith(
+                    ("-//w3c//dtd html 4.01 frameset//",
+                     "-//w3c//dtd html 4.01 transitional//")) and
+                    systemId is None
+                    or systemId and systemId.lower() == "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd"):
                 self.parser.compatMode = "quirks"
             elif (publicId.startswith(
                     ("-//w3c//dtd xhtml 1.0 frameset//",
-                     "-//w3c//dtd xhtml 1.0 transitional//")) or
-                  publicId.startswith(
+                     "-//w3c//dtd xhtml 1.0 transitional//"))
+                  or publicId.startswith(
                       ("-//w3c//dtd html 4.01 frameset//",
                        "-//w3c//dtd html 4.01 transitional//")) and
                   systemId is not None):
@@ -626,8 +610,6 @@ def getPhases(debug):
             return True
 
     class BeforeHtmlPhase(Phase):
-        __slots__ = tuple()
-
         # helper methods
         def insertHtmlElement(self):
             self.tree.insertRoot(impliedTagToken("html", "StartTag"))
@@ -663,7 +645,19 @@ def getPhases(debug):
                 return token
 
     class BeforeHeadPhase(Phase):
-        __slots__ = tuple()
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                ("head", self.startTagHead)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                (("head", "body", "html", "br"), self.endTagImplyHead)
+            ])
+            self.endTagHandler.default = self.endTagOther
 
         def processEOF(self):
             self.startTagHead(impliedTagToken("head", "StartTag"))
@@ -696,19 +690,27 @@ def getPhases(debug):
             self.parser.parseError("end-tag-after-implied-root",
                                    {"name": token["name"]})
 
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", startTagHtml),
-            ("head", startTagHead)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            (("head", "body", "html", "br"), endTagImplyHead)
-        ])
-        endTagHandler.default = endTagOther
-
     class InHeadPhase(Phase):
-        __slots__ = tuple()
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                ("title", self.startTagTitle),
+                (("noscript", "noframes", "style"), self.startTagNoScriptNoFramesStyle),
+                ("script", self.startTagScript),
+                (("base", "basefont", "bgsound", "command", "link"),
+                 self.startTagBaseLinkCommand),
+                ("meta", self.startTagMeta),
+                ("head", self.startTagHead)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self. endTagHandler = utils.MethodDispatcher([
+                ("head", self.endTagHead),
+                (("br", "html", "body"), self.endTagHtmlBodyBr)
+            ])
+            self.endTagHandler.default = self.endTagOther
 
         # the real thing
         def processEOF(self):
@@ -746,25 +748,18 @@ def getPhases(debug):
                     # the abstract Unicode string, and just use the
                     # ContentAttrParser on that, but using UTF-8 allows all chars
                     # to be encoded and as a ASCII-superset works.
-                    data = _inputstream.EncodingBytes(attributes["content"].encode("utf-8"))
-                    parser = _inputstream.ContentAttrParser(data)
+                    data = inputstream.EncodingBytes(attributes["content"].encode("utf-8"))
+                    parser = inputstream.ContentAttrParser(data)
                     codec = parser.parse()
                     self.parser.tokenizer.stream.changeEncoding(codec)
 
         def startTagTitle(self, token):
             self.parser.parseRCDataRawtext(token, "RCDATA")
 
-        def startTagNoFramesStyle(self, token):
+        def startTagNoScriptNoFramesStyle(self, token):
             # Need to decide whether to implement the scripting-disabled case
             self.parser.parseRCDataRawtext(token, "RAWTEXT")
 
-        def startTagNoscript(self, token):
-            if self.parser.scripting:
-                self.parser.parseRCDataRawtext(token, "RAWTEXT")
-            else:
-                self.tree.insertElement(token)
-                self.parser.phase = self.parser.phases["inHeadNoscript"]
-
         def startTagScript(self, token):
             self.tree.insertElement(token)
             self.parser.tokenizer.state = self.parser.tokenizer.scriptDataState
@@ -790,90 +785,27 @@ def getPhases(debug):
         def anythingElse(self):
             self.endTagHead(impliedTagToken("head"))
 
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", startTagHtml),
-            ("title", startTagTitle),
-            (("noframes", "style"), startTagNoFramesStyle),
-            ("noscript", startTagNoscript),
-            ("script", startTagScript),
-            (("base", "basefont", "bgsound", "command", "link"),
-             startTagBaseLinkCommand),
-            ("meta", startTagMeta),
-            ("head", startTagHead)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            ("head", endTagHead),
-            (("br", "html", "body"), endTagHtmlBodyBr)
-        ])
-        endTagHandler.default = endTagOther
-
-    class InHeadNoscriptPhase(Phase):
-        __slots__ = tuple()
-
-        def processEOF(self):
-            self.parser.parseError("eof-in-head-noscript")
-            self.anythingElse()
-            return True
-
-        def processComment(self, token):
-            return self.parser.phases["inHead"].processComment(token)
-
-        def processCharacters(self, token):
-            self.parser.parseError("char-in-head-noscript")
-            self.anythingElse()
-            return token
-
-        def processSpaceCharacters(self, token):
-            return self.parser.phases["inHead"].processSpaceCharacters(token)
-
-        def startTagHtml(self, token):
-            return self.parser.phases["inBody"].processStartTag(token)
-
-        def startTagBaseLinkCommand(self, token):
-            return self.parser.phases["inHead"].processStartTag(token)
-
-        def startTagHeadNoscript(self, token):
-            self.parser.parseError("unexpected-start-tag", {"name": token["name"]})
-
-        def startTagOther(self, token):
-            self.parser.parseError("unexpected-inhead-noscript-tag", {"name": token["name"]})
-            self.anythingElse()
-            return token
-
-        def endTagNoscript(self, token):
-            node = self.parser.tree.openElements.pop()
-            assert node.name == "noscript", "Expected noscript got %s" % node.name
-            self.parser.phase = self.parser.phases["inHead"]
-
-        def endTagBr(self, token):
-            self.parser.parseError("unexpected-inhead-noscript-tag", {"name": token["name"]})
-            self.anythingElse()
-            return token
-
-        def endTagOther(self, token):
-            self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
-
-        def anythingElse(self):
-            # Caller must raise parse error first!
-            self.endTagNoscript(impliedTagToken("noscript"))
-
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", startTagHtml),
-            (("basefont", "bgsound", "link", "meta", "noframes", "style"), startTagBaseLinkCommand),
-            (("head", "noscript"), startTagHeadNoscript),
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            ("noscript", endTagNoscript),
-            ("br", endTagBr),
-        ])
-        endTagHandler.default = endTagOther
-
+    # XXX If we implement a parser for which scripting is disabled we need to
+    # implement this phase.
+    #
+    # class InHeadNoScriptPhase(Phase):
     class AfterHeadPhase(Phase):
-        __slots__ = tuple()
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                ("body", self.startTagBody),
+                ("frameset", self.startTagFrameset),
+                (("base", "basefont", "bgsound", "link", "meta", "noframes", "script",
+                  "style", "title"),
+                 self.startTagFromHead),
+                ("head", self.startTagHead)
+            ])
+            self.startTagHandler.default = self.startTagOther
+            self.endTagHandler = utils.MethodDispatcher([(("body", "html", "br"),
+                                                          self.endTagHtmlBodyBr)])
+            self.endTagHandler.default = self.endTagOther
 
         def processEOF(self):
             self.anythingElse()
@@ -924,34 +856,91 @@ def getPhases(debug):
             self.parser.phase = self.parser.phases["inBody"]
             self.parser.framesetOK = True
 
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", startTagHtml),
-            ("body", startTagBody),
-            ("frameset", startTagFrameset),
-            (("base", "basefont", "bgsound", "link", "meta", "noframes", "script",
-              "style", "title"),
-             startTagFromHead),
-            ("head", startTagHead)
-        ])
-        startTagHandler.default = startTagOther
-        endTagHandler = _utils.MethodDispatcher([(("body", "html", "br"),
-                                                  endTagHtmlBodyBr)])
-        endTagHandler.default = endTagOther
-
     class InBodyPhase(Phase):
         # http://www.whatwg.org/specs/web-apps/current-work/#parsing-main-inbody
         # the really-really-really-very crazy mode
-        __slots__ = ("processSpaceCharacters",)
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
 
-        def __init__(self, *args, **kwargs):
-            super(InBodyPhase, self).__init__(*args, **kwargs)
-            # Set this to the default handler
-            self.processSpaceCharacters = self.processSpaceCharactersNonPre
+            # Keep a ref to this for special handling of whitespace in <pre>
+            self.processSpaceCharactersNonPre = self.processSpaceCharacters
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                (("base", "basefont", "bgsound", "command", "link", "meta",
+                  "noframes", "script", "style", "title"),
+                 self.startTagProcessInHead),
+                ("body", self.startTagBody),
+                ("frameset", self.startTagFrameset),
+                (("address", "article", "aside", "blockquote", "center", "details",
+                  "details", "dir", "div", "dl", "fieldset", "figcaption", "figure",
+                  "footer", "header", "hgroup", "main", "menu", "nav", "ol", "p",
+                  "section", "summary", "ul"),
+                 self.startTagCloseP),
+                (headingElements, self.startTagHeading),
+                (("pre", "listing"), self.startTagPreListing),
+                ("form", self.startTagForm),
+                (("li", "dd", "dt"), self.startTagListItem),
+                ("plaintext", self.startTagPlaintext),
+                ("a", self.startTagA),
+                (("b", "big", "code", "em", "font", "i", "s", "small", "strike",
+                  "strong", "tt", "u"), self.startTagFormatting),
+                ("nobr", self.startTagNobr),
+                ("button", self.startTagButton),
+                (("applet", "marquee", "object"), self.startTagAppletMarqueeObject),
+                ("xmp", self.startTagXmp),
+                ("table", self.startTagTable),
+                (("area", "br", "embed", "img", "keygen", "wbr"),
+                 self.startTagVoidFormatting),
+                (("param", "source", "track"), self.startTagParamSource),
+                ("input", self.startTagInput),
+                ("hr", self.startTagHr),
+                ("image", self.startTagImage),
+                ("isindex", self.startTagIsIndex),
+                ("textarea", self.startTagTextarea),
+                ("iframe", self.startTagIFrame),
+                (("noembed", "noframes", "noscript"), self.startTagRawtext),
+                ("select", self.startTagSelect),
+                (("rp", "rt"), self.startTagRpRt),
+                (("option", "optgroup"), self.startTagOpt),
+                (("math"), self.startTagMath),
+                (("svg"), self.startTagSvg),
+                (("caption", "col", "colgroup", "frame", "head",
+                  "tbody", "td", "tfoot", "th", "thead",
+                  "tr"), self.startTagMisplaced)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                ("body", self.endTagBody),
+                ("html", self.endTagHtml),
+                (("address", "article", "aside", "blockquote", "button", "center",
+                  "details", "dialog", "dir", "div", "dl", "fieldset", "figcaption", "figure",
+                  "footer", "header", "hgroup", "listing", "main", "menu", "nav", "ol", "pre",
+                  "section", "summary", "ul"), self.endTagBlock),
+                ("form", self.endTagForm),
+                ("p", self.endTagP),
+                (("dd", "dt", "li"), self.endTagListItem),
+                (headingElements, self.endTagHeading),
+                (("a", "b", "big", "code", "em", "font", "i", "nobr", "s", "small",
+                  "strike", "strong", "tt", "u"), self.endTagFormatting),
+                (("applet", "marquee", "object"), self.endTagAppletMarqueeObject),
+                ("br", self.endTagBr),
+            ])
+            self.endTagHandler.default = self.endTagOther
 
         def isMatchingFormattingElement(self, node1, node2):
-            return (node1.name == node2.name and
-                    node1.namespace == node2.namespace and
-                    node1.attributes == node2.attributes)
+            if node1.name != node2.name or node1.namespace != node2.namespace:
+                return False
+            elif len(node1.attributes) != len(node2.attributes):
+                return False
+            else:
+                attributes1 = sorted(node1.attributes.items())
+                attributes2 = sorted(node2.attributes.items())
+                for attr1, attr2 in zip(attributes1, attributes2):
+                    if attr1 != attr2:
+                        return False
+            return True
 
         # helper
         def addFormattingElement(self, token):
@@ -987,8 +976,8 @@ def getPhases(debug):
             data = token["data"]
             self.processSpaceCharacters = self.processSpaceCharactersNonPre
             if (data.startswith("\n") and
-                self.tree.openElements[-1].name in ("pre", "listing", "textarea") and
-                    not self.tree.openElements[-1].hasContent()):
+                self.tree.openElements[-1].name in ("pre", "listing", "textarea")
+                    and not self.tree.openElements[-1].hasContent()):
                 data = data[1:]
             if data:
                 self.tree.reconstructActiveFormattingElements()
@@ -1006,7 +995,7 @@ def getPhases(debug):
                      for char in token["data"]])):
                 self.parser.framesetOK = False
 
-        def processSpaceCharactersNonPre(self, token):
+        def processSpaceCharacters(self, token):
             self.tree.reconstructActiveFormattingElements()
             self.tree.insertText(token["data"])
 
@@ -1015,8 +1004,8 @@ def getPhases(debug):
 
         def startTagBody(self, token):
             self.parser.parseError("unexpected-start-tag", {"name": "body"})
-            if (len(self.tree.openElements) == 1 or
-                    self.tree.openElements[1].name != "body"):
+            if (len(self.tree.openElements) == 1
+                    or self.tree.openElements[1].name != "body"):
                 assert self.parser.innerHTML
             else:
                 self.parser.framesetOK = False
@@ -1216,7 +1205,8 @@ def getPhases(debug):
             attributes["name"] = "isindex"
             self.processStartTag(impliedTagToken("input", "StartTag",
                                                  attributes=attributes,
-                                                 selfClosing=token["selfClosing"]))
+                                                 selfClosing=
+                                                 token["selfClosing"]))
             self.processEndTag(impliedTagToken("label"))
             self.processStartTag(impliedTagToken("hr", "StartTag"))
             self.processEndTag(impliedTagToken("form"))
@@ -1231,12 +1221,6 @@ def getPhases(debug):
             self.parser.framesetOK = False
             self.startTagRawtext(token)
 
-        def startTagNoscript(self, token):
-            if self.parser.scripting:
-                self.startTagRawtext(token)
-            else:
-                self.startTagOther(token)
-
         def startTagRawtext(self, token):
             """iframe, noembed noframes, noscript(if scripting enabled)"""
             self.parser.parseRCDataRawtext(token, "RAWTEXT")
@@ -1332,7 +1316,7 @@ def getPhases(debug):
                         # Not sure this is the correct name for the parse error
                         self.parser.parseError(
                             "expected-one-end-tag-but-got-another",
-                            {"gotName": "body", "expectedName": node.name})
+                            {"expectedName": "body", "gotName": node.name})
                         break
             self.parser.phase = self.parser.phases["afterBody"]
 
@@ -1597,73 +1581,14 @@ def getPhases(debug):
                         self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
                         break
 
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", Phase.startTagHtml),
-            (("base", "basefont", "bgsound", "command", "link", "meta",
-              "script", "style", "title"),
-             startTagProcessInHead),
-            ("body", startTagBody),
-            ("frameset", startTagFrameset),
-            (("address", "article", "aside", "blockquote", "center", "details",
-              "dir", "div", "dl", "fieldset", "figcaption", "figure",
-              "footer", "header", "hgroup", "main", "menu", "nav", "ol", "p",
-              "section", "summary", "ul"),
-             startTagCloseP),
-            (headingElements, startTagHeading),
-            (("pre", "listing"), startTagPreListing),
-            ("form", startTagForm),
-            (("li", "dd", "dt"), startTagListItem),
-            ("plaintext", startTagPlaintext),
-            ("a", startTagA),
-            (("b", "big", "code", "em", "font", "i", "s", "small", "strike",
-              "strong", "tt", "u"), startTagFormatting),
-            ("nobr", startTagNobr),
-            ("button", startTagButton),
-            (("applet", "marquee", "object"), startTagAppletMarqueeObject),
-            ("xmp", startTagXmp),
-            ("table", startTagTable),
-            (("area", "br", "embed", "img", "keygen", "wbr"),
-             startTagVoidFormatting),
-            (("param", "source", "track"), startTagParamSource),
-            ("input", startTagInput),
-            ("hr", startTagHr),
-            ("image", startTagImage),
-            ("isindex", startTagIsIndex),
-            ("textarea", startTagTextarea),
-            ("iframe", startTagIFrame),
-            ("noscript", startTagNoscript),
-            (("noembed", "noframes"), startTagRawtext),
-            ("select", startTagSelect),
-            (("rp", "rt"), startTagRpRt),
-            (("option", "optgroup"), startTagOpt),
-            (("math"), startTagMath),
-            (("svg"), startTagSvg),
-            (("caption", "col", "colgroup", "frame", "head",
-              "tbody", "td", "tfoot", "th", "thead",
-              "tr"), startTagMisplaced)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            ("body", endTagBody),
-            ("html", endTagHtml),
-            (("address", "article", "aside", "blockquote", "button", "center",
-              "details", "dialog", "dir", "div", "dl", "fieldset", "figcaption", "figure",
-              "footer", "header", "hgroup", "listing", "main", "menu", "nav", "ol", "pre",
-              "section", "summary", "ul"), endTagBlock),
-            ("form", endTagForm),
-            ("p", endTagP),
-            (("dd", "dt", "li"), endTagListItem),
-            (headingElements, endTagHeading),
-            (("a", "b", "big", "code", "em", "font", "i", "nobr", "s", "small",
-              "strike", "strong", "tt", "u"), endTagFormatting),
-            (("applet", "marquee", "object"), endTagAppletMarqueeObject),
-            ("br", endTagBr),
-        ])
-        endTagHandler.default = endTagOther
-
     class TextPhase(Phase):
-        __slots__ = tuple()
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+            self.startTagHandler = utils.MethodDispatcher([])
+            self.startTagHandler.default = self.startTagOther
+            self.endTagHandler = utils.MethodDispatcher([
+                ("script", self.endTagScript)])
+            self.endTagHandler.default = self.endTagOther
 
         def processCharacters(self, token):
             self.tree.insertText(token["data"])
@@ -1689,15 +1614,30 @@ def getPhases(debug):
             self.tree.openElements.pop()
             self.parser.phase = self.parser.originalPhase
 
-        startTagHandler = _utils.MethodDispatcher([])
-        startTagHandler.default = startTagOther
-        endTagHandler = _utils.MethodDispatcher([
-            ("script", endTagScript)])
-        endTagHandler.default = endTagOther
-
     class InTablePhase(Phase):
         # http://www.whatwg.org/specs/web-apps/current-work/#in-table
-        __slots__ = tuple()
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                ("caption", self.startTagCaption),
+                ("colgroup", self.startTagColgroup),
+                ("col", self.startTagCol),
+                (("tbody", "tfoot", "thead"), self.startTagRowGroup),
+                (("td", "th", "tr"), self.startTagImplyTbody),
+                ("table", self.startTagTable),
+                (("style", "script"), self.startTagStyleScript),
+                ("input", self.startTagInput),
+                ("form", self.startTagForm)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                ("table", self.endTagTable),
+                (("body", "caption", "col", "colgroup", "html", "tbody", "td",
+                  "tfoot", "th", "thead", "tr"), self.endTagIgnore)
+            ])
+            self.endTagHandler.default = self.endTagOther
 
         # helper methods
         def clearStackToTableContext(self):
@@ -1819,32 +1759,9 @@ def getPhases(debug):
             self.parser.phases["inBody"].processEndTag(token)
             self.tree.insertFromTable = False
 
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", Phase.startTagHtml),
-            ("caption", startTagCaption),
-            ("colgroup", startTagColgroup),
-            ("col", startTagCol),
-            (("tbody", "tfoot", "thead"), startTagRowGroup),
-            (("td", "th", "tr"), startTagImplyTbody),
-            ("table", startTagTable),
-            (("style", "script"), startTagStyleScript),
-            ("input", startTagInput),
-            ("form", startTagForm)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            ("table", endTagTable),
-            (("body", "caption", "col", "colgroup", "html", "tbody", "td",
-              "tfoot", "th", "thead", "tr"), endTagIgnore)
-        ])
-        endTagHandler.default = endTagOther
-
     class InTableTextPhase(Phase):
-        __slots__ = ("originalPhase", "characterTokens")
-
-        def __init__(self, *args, **kwargs):
-            super(InTableTextPhase, self).__init__(*args, **kwargs)
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
             self.originalPhase = None
             self.characterTokens = []
 
@@ -1889,7 +1806,23 @@ def getPhases(debug):
 
     class InCaptionPhase(Phase):
         # http://www.whatwg.org/specs/web-apps/current-work/#in-caption
-        __slots__ = tuple()
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                (("caption", "col", "colgroup", "tbody", "td", "tfoot", "th",
+                  "thead", "tr"), self.startTagTableElement)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                ("caption", self.endTagCaption),
+                ("table", self.endTagTable),
+                (("body", "col", "colgroup", "html", "tbody", "td", "tfoot", "th",
+                  "thead", "tr"), self.endTagIgnore)
+            ])
+            self.endTagHandler.default = self.endTagOther
 
         def ignoreEndTagCaption(self):
             return not self.tree.elementInScope("caption", variant="table")
@@ -1942,24 +1875,23 @@ def getPhases(debug):
         def endTagOther(self, token):
             return self.parser.phases["inBody"].processEndTag(token)
 
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", Phase.startTagHtml),
-            (("caption", "col", "colgroup", "tbody", "td", "tfoot", "th",
-              "thead", "tr"), startTagTableElement)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            ("caption", endTagCaption),
-            ("table", endTagTable),
-            (("body", "col", "colgroup", "html", "tbody", "td", "tfoot", "th",
-              "thead", "tr"), endTagIgnore)
-        ])
-        endTagHandler.default = endTagOther
-
     class InColumnGroupPhase(Phase):
         # http://www.whatwg.org/specs/web-apps/current-work/#in-column
-        __slots__ = tuple()
+
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                ("col", self.startTagCol)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                ("colgroup", self.endTagColgroup),
+                ("col", self.endTagCol)
+            ])
+            self.endTagHandler.default = self.endTagOther
 
         def ignoreEndTagColgroup(self):
             return self.tree.openElements[-1].name == "html"
@@ -1983,7 +1915,6 @@ def getPhases(debug):
         def startTagCol(self, token):
             self.tree.insertElement(token)
             self.tree.openElements.pop()
-            token["selfClosingAcknowledged"] = True
 
         def startTagOther(self, token):
             ignoreEndTag = self.ignoreEndTagColgroup()
@@ -2009,21 +1940,26 @@ def getPhases(debug):
             if not ignoreEndTag:
                 return token
 
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", Phase.startTagHtml),
-            ("col", startTagCol)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            ("colgroup", endTagColgroup),
-            ("col", endTagCol)
-        ])
-        endTagHandler.default = endTagOther
-
     class InTableBodyPhase(Phase):
         # http://www.whatwg.org/specs/web-apps/current-work/#in-table0
-        __slots__ = tuple()
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                ("tr", self.startTagTr),
+                (("td", "th"), self.startTagTableCell),
+                (("caption", "col", "colgroup", "tbody", "tfoot", "thead"),
+                 self.startTagTableOther)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                (("tbody", "tfoot", "thead"), self.endTagTableRowGroup),
+                ("table", self.endTagTable),
+                (("body", "caption", "col", "colgroup", "html", "td", "th",
+                  "tr"), self.endTagIgnore)
+            ])
+            self.endTagHandler.default = self.endTagOther
 
         # helper methods
         def clearStackToTableBodyContext(self):
@@ -2102,26 +2038,26 @@ def getPhases(debug):
         def endTagOther(self, token):
             return self.parser.phases["inTable"].processEndTag(token)
 
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", Phase.startTagHtml),
-            ("tr", startTagTr),
-            (("td", "th"), startTagTableCell),
-            (("caption", "col", "colgroup", "tbody", "tfoot", "thead"),
-             startTagTableOther)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            (("tbody", "tfoot", "thead"), endTagTableRowGroup),
-            ("table", endTagTable),
-            (("body", "caption", "col", "colgroup", "html", "td", "th",
-              "tr"), endTagIgnore)
-        ])
-        endTagHandler.default = endTagOther
-
     class InRowPhase(Phase):
         # http://www.whatwg.org/specs/web-apps/current-work/#in-row
-        __slots__ = tuple()
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                (("td", "th"), self.startTagTableCell),
+                (("caption", "col", "colgroup", "tbody", "tfoot", "thead",
+                  "tr"), self.startTagTableOther)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                ("tr", self.endTagTr),
+                ("table", self.endTagTable),
+                (("tbody", "tfoot", "thead"), self.endTagTableRowGroup),
+                (("body", "caption", "col", "colgroup", "html", "td", "th"),
+                 self.endTagIgnore)
+            ])
+            self.endTagHandler.default = self.endTagOther
 
         # helper methods (XXX unify this with other table helper methods)
         def clearStackToTableRowContext(self):
@@ -2191,26 +2127,23 @@ def getPhases(debug):
         def endTagOther(self, token):
             return self.parser.phases["inTable"].processEndTag(token)
 
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", Phase.startTagHtml),
-            (("td", "th"), startTagTableCell),
-            (("caption", "col", "colgroup", "tbody", "tfoot", "thead",
-              "tr"), startTagTableOther)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            ("tr", endTagTr),
-            ("table", endTagTable),
-            (("tbody", "tfoot", "thead"), endTagTableRowGroup),
-            (("body", "caption", "col", "colgroup", "html", "td", "th"),
-             endTagIgnore)
-        ])
-        endTagHandler.default = endTagOther
-
     class InCellPhase(Phase):
         # http://www.whatwg.org/specs/web-apps/current-work/#in-cell
-        __slots__ = tuple()
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                (("caption", "col", "colgroup", "tbody", "td", "tfoot", "th",
+                  "thead", "tr"), self.startTagTableOther)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                (("td", "th"), self.endTagTableCell),
+                (("body", "caption", "col", "colgroup", "html"), self.endTagIgnore),
+                (("table", "tbody", "tfoot", "thead", "tr"), self.endTagImply)
+            ])
+            self.endTagHandler.default = self.endTagOther
 
         # helper
         def closeCell(self):
@@ -2270,22 +2203,26 @@ def getPhases(debug):
         def endTagOther(self, token):
             return self.parser.phases["inBody"].processEndTag(token)
 
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", Phase.startTagHtml),
-            (("caption", "col", "colgroup", "tbody", "td", "tfoot", "th",
-              "thead", "tr"), startTagTableOther)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            (("td", "th"), endTagTableCell),
-            (("body", "caption", "col", "colgroup", "html"), endTagIgnore),
-            (("table", "tbody", "tfoot", "thead", "tr"), endTagImply)
-        ])
-        endTagHandler.default = endTagOther
-
     class InSelectPhase(Phase):
-        __slots__ = tuple()
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                ("option", self.startTagOption),
+                ("optgroup", self.startTagOptgroup),
+                ("select", self.startTagSelect),
+                (("input", "keygen", "textarea"), self.startTagInput),
+                ("script", self.startTagScript)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                ("option", self.endTagOption),
+                ("optgroup", self.endTagOptgroup),
+                ("select", self.endTagSelect)
+            ])
+            self.endTagHandler.default = self.endTagOther
 
         # http://www.whatwg.org/specs/web-apps/current-work/#in-select
         def processEOF(self):
@@ -2366,25 +2303,21 @@ def getPhases(debug):
             self.parser.parseError("unexpected-end-tag-in-select",
                                    {"name": token["name"]})
 
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", Phase.startTagHtml),
-            ("option", startTagOption),
-            ("optgroup", startTagOptgroup),
-            ("select", startTagSelect),
-            (("input", "keygen", "textarea"), startTagInput),
-            ("script", startTagScript)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            ("option", endTagOption),
-            ("optgroup", endTagOptgroup),
-            ("select", endTagSelect)
-        ])
-        endTagHandler.default = endTagOther
-
     class InSelectInTablePhase(Phase):
-        __slots__ = tuple()
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                (("caption", "table", "tbody", "tfoot", "thead", "tr", "td", "th"),
+                 self.startTagTable)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                (("caption", "table", "tbody", "tfoot", "thead", "tr", "td", "th"),
+                 self.endTagTable)
+            ])
+            self.endTagHandler.default = self.endTagOther
 
         def processEOF(self):
             self.parser.phases["inSelect"].processEOF()
@@ -2409,21 +2342,7 @@ def getPhases(debug):
         def endTagOther(self, token):
             return self.parser.phases["inSelect"].processEndTag(token)
 
-        startTagHandler = _utils.MethodDispatcher([
-            (("caption", "table", "tbody", "tfoot", "thead", "tr", "td", "th"),
-             startTagTable)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            (("caption", "table", "tbody", "tfoot", "thead", "tr", "td", "th"),
-             endTagTable)
-        ])
-        endTagHandler.default = endTagOther
-
     class InForeignContentPhase(Phase):
-        __slots__ = tuple()
-
         breakoutElements = frozenset(["b", "big", "blockquote", "body", "br",
                                       "center", "code", "dd", "div", "dl", "dt",
                                       "em", "embed", "h1", "h2", "h3",
@@ -2433,6 +2352,9 @@ def getPhases(debug):
                                       "span", "strong", "strike", "sub", "sup",
                                       "table", "tt", "u", "ul", "var"])
 
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
         def adjustSVGTagNames(self, token):
             replacements = {"altglyph": "altGlyph",
                             "altglyphdef": "altGlyphDef",
@@ -2486,7 +2408,7 @@ def getPhases(debug):
             currentNode = self.tree.openElements[-1]
             if (token["name"] in self.breakoutElements or
                 (token["name"] == "font" and
-                 set(token["data"].keys()) & {"color", "face", "size"})):
+                 set(token["data"].keys()) & set(["color", "face", "size"]))):
                 self.parser.parseError("unexpected-html-element-in-foreign-content",
                                        {"name": token["name"]})
                 while (self.tree.openElements[-1].namespace !=
@@ -2512,7 +2434,7 @@ def getPhases(debug):
         def processEndTag(self, token):
             nodeIndex = len(self.tree.openElements) - 1
             node = self.tree.openElements[-1]
-            if node.name.translate(asciiUpper2Lower) != token["name"]:
+            if node.name != token["name"]:
                 self.parser.parseError("unexpected-end-tag", {"name": token["name"]})
 
             while True:
@@ -2536,7 +2458,16 @@ def getPhases(debug):
             return new_token
 
     class AfterBodyPhase(Phase):
-        __slots__ = tuple()
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([("html", self.endTagHtml)])
+            self.endTagHandler.default = self.endTagOther
 
         def processEOF(self):
             # Stop parsing
@@ -2573,17 +2504,23 @@ def getPhases(debug):
             self.parser.phase = self.parser.phases["inBody"]
             return token
 
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", startTagHtml)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([("html", endTagHtml)])
-        endTagHandler.default = endTagOther
-
     class InFramesetPhase(Phase):
         # http://www.whatwg.org/specs/web-apps/current-work/#in-frameset
-        __slots__ = tuple()
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                ("frameset", self.startTagFrameset),
+                ("frame", self.startTagFrame),
+                ("noframes", self.startTagNoframes)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                ("frameset", self.endTagFrameset)
+            ])
+            self.endTagHandler.default = self.endTagOther
 
         def processEOF(self):
             if self.tree.openElements[-1].name != "html":
@@ -2616,7 +2553,7 @@ def getPhases(debug):
                 self.tree.openElements.pop()
             if (not self.parser.innerHTML and
                     self.tree.openElements[-1].name != "frameset"):
-                # If we're not in innerHTML mode and the current node is not a
+                # If we're not in innerHTML mode and the the current node is not a
                 # "frameset" element (anymore) then switch.
                 self.parser.phase = self.parser.phases["afterFrameset"]
 
@@ -2624,22 +2561,21 @@ def getPhases(debug):
             self.parser.parseError("unexpected-end-tag-in-frameset",
                                    {"name": token["name"]})
 
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", Phase.startTagHtml),
-            ("frameset", startTagFrameset),
-            ("frame", startTagFrame),
-            ("noframes", startTagNoframes)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            ("frameset", endTagFrameset)
-        ])
-        endTagHandler.default = endTagOther
-
     class AfterFramesetPhase(Phase):
         # http://www.whatwg.org/specs/web-apps/current-work/#after3
-        __slots__ = tuple()
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                ("noframes", self.startTagNoframes)
+            ])
+            self.startTagHandler.default = self.startTagOther
+
+            self.endTagHandler = utils.MethodDispatcher([
+                ("html", self.endTagHtml)
+            ])
+            self.endTagHandler.default = self.endTagOther
 
         def processEOF(self):
             # Stop parsing
@@ -2662,19 +2598,14 @@ def getPhases(debug):
             self.parser.parseError("unexpected-end-tag-after-frameset",
                                    {"name": token["name"]})
 
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", Phase.startTagHtml),
-            ("noframes", startTagNoframes)
-        ])
-        startTagHandler.default = startTagOther
-
-        endTagHandler = _utils.MethodDispatcher([
-            ("html", endTagHtml)
-        ])
-        endTagHandler.default = endTagOther
-
     class AfterAfterBodyPhase(Phase):
-        __slots__ = tuple()
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml)
+            ])
+            self.startTagHandler.default = self.startTagOther
 
         def processEOF(self):
             pass
@@ -2705,13 +2636,15 @@ def getPhases(debug):
             self.parser.phase = self.parser.phases["inBody"]
             return token
 
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", startTagHtml)
-        ])
-        startTagHandler.default = startTagOther
-
     class AfterAfterFramesetPhase(Phase):
-        __slots__ = tuple()
+        def __init__(self, parser, tree):
+            Phase.__init__(self, parser, tree)
+
+            self.startTagHandler = utils.MethodDispatcher([
+                ("html", self.startTagHtml),
+                ("noframes", self.startTagNoFrames)
+            ])
+            self.startTagHandler.default = self.startTagOther
 
         def processEOF(self):
             pass
@@ -2739,20 +2672,12 @@ def getPhases(debug):
             self.parser.parseError("expected-eof-but-got-end-tag",
                                    {"name": token["name"]})
 
-        startTagHandler = _utils.MethodDispatcher([
-            ("html", startTagHtml),
-            ("noframes", startTagNoFrames)
-        ])
-        startTagHandler.default = startTagOther
-
-    # pylint:enable=unused-argument
-
     return {
         "initial": InitialPhase,
         "beforeHtml": BeforeHtmlPhase,
         "beforeHead": BeforeHeadPhase,
         "inHead": InHeadPhase,
-        "inHeadNoscript": InHeadNoscriptPhase,
+        # XXX "inHeadNoscript": InHeadNoScriptPhase,
         "afterHead": AfterHeadPhase,
         "inBody": InBodyPhase,
         "text": TextPhase,
@@ -2775,13 +2700,6 @@ def getPhases(debug):
     }
 
 
-def adjust_attributes(token, replacements):
-    needs_adjustment = viewkeys(token['data']) & viewkeys(replacements)
-    if needs_adjustment:
-        token['data'] = type(token['data'])((replacements.get(k, k), v)
-                                            for k, v in token['data'].items())
-
-
 def impliedTagToken(name, type="EndTag", attributes=None,
                     selfClosing=False):
     if attributes is None:
diff --git a/lib/html5lib/ihatexml.py b/lib/html5lib/ihatexml.py
new file mode 100644
index 00000000..0fc79308
--- /dev/null
+++ b/lib/html5lib/ihatexml.py
@@ -0,0 +1,285 @@
+from __future__ import absolute_import, division, unicode_literals
+
+import re
+import warnings
+
+from .constants import DataLossWarning
+
+baseChar = """
+[#x0041-#x005A] | [#x0061-#x007A] | [#x00C0-#x00D6] | [#x00D8-#x00F6] |
+[#x00F8-#x00FF] | [#x0100-#x0131] | [#x0134-#x013E] | [#x0141-#x0148] |
+[#x014A-#x017E] | [#x0180-#x01C3] | [#x01CD-#x01F0] | [#x01F4-#x01F5] |
+[#x01FA-#x0217] | [#x0250-#x02A8] | [#x02BB-#x02C1] | #x0386 |
+[#x0388-#x038A] | #x038C | [#x038E-#x03A1] | [#x03A3-#x03CE] |
+[#x03D0-#x03D6] | #x03DA | #x03DC | #x03DE | #x03E0 | [#x03E2-#x03F3] |
+[#x0401-#x040C] | [#x040E-#x044F] | [#x0451-#x045C] | [#x045E-#x0481] |
+[#x0490-#x04C4] | [#x04C7-#x04C8] | [#x04CB-#x04CC] | [#x04D0-#x04EB] |
+[#x04EE-#x04F5] | [#x04F8-#x04F9] | [#x0531-#x0556] | #x0559 |
+[#x0561-#x0586] | [#x05D0-#x05EA] | [#x05F0-#x05F2] | [#x0621-#x063A] |
+[#x0641-#x064A] | [#x0671-#x06B7] | [#x06BA-#x06BE] | [#x06C0-#x06CE] |
+[#x06D0-#x06D3] | #x06D5 | [#x06E5-#x06E6] | [#x0905-#x0939] | #x093D |
+[#x0958-#x0961] | [#x0985-#x098C] | [#x098F-#x0990] | [#x0993-#x09A8] |
+[#x09AA-#x09B0] | #x09B2 | [#x09B6-#x09B9] | [#x09DC-#x09DD] |
+[#x09DF-#x09E1] | [#x09F0-#x09F1] | [#x0A05-#x0A0A] | [#x0A0F-#x0A10] |
+[#x0A13-#x0A28] | [#x0A2A-#x0A30] | [#x0A32-#x0A33] | [#x0A35-#x0A36] |
+[#x0A38-#x0A39] | [#x0A59-#x0A5C] | #x0A5E | [#x0A72-#x0A74] |
+[#x0A85-#x0A8B] | #x0A8D | [#x0A8F-#x0A91] | [#x0A93-#x0AA8] |
+[#x0AAA-#x0AB0] | [#x0AB2-#x0AB3] | [#x0AB5-#x0AB9] | #x0ABD | #x0AE0 |
+[#x0B05-#x0B0C] | [#x0B0F-#x0B10] | [#x0B13-#x0B28] | [#x0B2A-#x0B30] |
+[#x0B32-#x0B33] | [#x0B36-#x0B39] | #x0B3D | [#x0B5C-#x0B5D] |
+[#x0B5F-#x0B61] | [#x0B85-#x0B8A] | [#x0B8E-#x0B90] | [#x0B92-#x0B95] |
+[#x0B99-#x0B9A] | #x0B9C | [#x0B9E-#x0B9F] | [#x0BA3-#x0BA4] |
+[#x0BA8-#x0BAA] | [#x0BAE-#x0BB5] | [#x0BB7-#x0BB9] | [#x0C05-#x0C0C] |
+[#x0C0E-#x0C10] | [#x0C12-#x0C28] | [#x0C2A-#x0C33] | [#x0C35-#x0C39] |
+[#x0C60-#x0C61] | [#x0C85-#x0C8C] | [#x0C8E-#x0C90] | [#x0C92-#x0CA8] |
+[#x0CAA-#x0CB3] | [#x0CB5-#x0CB9] | #x0CDE | [#x0CE0-#x0CE1] |
+[#x0D05-#x0D0C] | [#x0D0E-#x0D10] | [#x0D12-#x0D28] | [#x0D2A-#x0D39] |
+[#x0D60-#x0D61] | [#x0E01-#x0E2E] | #x0E30 | [#x0E32-#x0E33] |
+[#x0E40-#x0E45] | [#x0E81-#x0E82] | #x0E84 | [#x0E87-#x0E88] | #x0E8A |
+#x0E8D | [#x0E94-#x0E97] | [#x0E99-#x0E9F] | [#x0EA1-#x0EA3] | #x0EA5 |
+#x0EA7 | [#x0EAA-#x0EAB] | [#x0EAD-#x0EAE] | #x0EB0 | [#x0EB2-#x0EB3] |
+#x0EBD | [#x0EC0-#x0EC4] | [#x0F40-#x0F47] | [#x0F49-#x0F69] |
+[#x10A0-#x10C5] | [#x10D0-#x10F6] | #x1100 | [#x1102-#x1103] |
+[#x1105-#x1107] | #x1109 | [#x110B-#x110C] | [#x110E-#x1112] | #x113C |
+#x113E | #x1140 | #x114C | #x114E | #x1150 | [#x1154-#x1155] | #x1159 |
+[#x115F-#x1161] | #x1163 | #x1165 | #x1167 | #x1169 | [#x116D-#x116E] |
+[#x1172-#x1173] | #x1175 | #x119E | #x11A8 | #x11AB | [#x11AE-#x11AF] |
+[#x11B7-#x11B8] | #x11BA | [#x11BC-#x11C2] | #x11EB | #x11F0 | #x11F9 |
+[#x1E00-#x1E9B] | [#x1EA0-#x1EF9] | [#x1F00-#x1F15] | [#x1F18-#x1F1D] |
+[#x1F20-#x1F45] | [#x1F48-#x1F4D] | [#x1F50-#x1F57] | #x1F59 | #x1F5B |
+#x1F5D | [#x1F5F-#x1F7D] | [#x1F80-#x1FB4] | [#x1FB6-#x1FBC] | #x1FBE |
+[#x1FC2-#x1FC4] | [#x1FC6-#x1FCC] | [#x1FD0-#x1FD3] | [#x1FD6-#x1FDB] |
+[#x1FE0-#x1FEC] | [#x1FF2-#x1FF4] | [#x1FF6-#x1FFC] | #x2126 |
+[#x212A-#x212B] | #x212E | [#x2180-#x2182] | [#x3041-#x3094] |
+[#x30A1-#x30FA] | [#x3105-#x312C] | [#xAC00-#xD7A3]"""
+
+ideographic = """[#x4E00-#x9FA5] | #x3007 | [#x3021-#x3029]"""
+
+combiningCharacter = """
+[#x0300-#x0345] | [#x0360-#x0361] | [#x0483-#x0486] | [#x0591-#x05A1] |
+[#x05A3-#x05B9] | [#x05BB-#x05BD] | #x05BF | [#x05C1-#x05C2] | #x05C4 |
+[#x064B-#x0652] | #x0670 | [#x06D6-#x06DC] | [#x06DD-#x06DF] |
+[#x06E0-#x06E4] | [#x06E7-#x06E8] | [#x06EA-#x06ED] | [#x0901-#x0903] |
+#x093C | [#x093E-#x094C] | #x094D | [#x0951-#x0954] | [#x0962-#x0963] |
+[#x0981-#x0983] | #x09BC | #x09BE | #x09BF | [#x09C0-#x09C4] |
+[#x09C7-#x09C8] | [#x09CB-#x09CD] | #x09D7 | [#x09E2-#x09E3] | #x0A02 |
+#x0A3C | #x0A3E | #x0A3F | [#x0A40-#x0A42] | [#x0A47-#x0A48] |
+[#x0A4B-#x0A4D] | [#x0A70-#x0A71] | [#x0A81-#x0A83] | #x0ABC |
+[#x0ABE-#x0AC5] | [#x0AC7-#x0AC9] | [#x0ACB-#x0ACD] | [#x0B01-#x0B03] |
+#x0B3C | [#x0B3E-#x0B43] | [#x0B47-#x0B48] | [#x0B4B-#x0B4D] |
+[#x0B56-#x0B57] | [#x0B82-#x0B83] | [#x0BBE-#x0BC2] | [#x0BC6-#x0BC8] |
+[#x0BCA-#x0BCD] | #x0BD7 | [#x0C01-#x0C03] | [#x0C3E-#x0C44] |
+[#x0C46-#x0C48] | [#x0C4A-#x0C4D] | [#x0C55-#x0C56] | [#x0C82-#x0C83] |
+[#x0CBE-#x0CC4] | [#x0CC6-#x0CC8] | [#x0CCA-#x0CCD] | [#x0CD5-#x0CD6] |
+[#x0D02-#x0D03] | [#x0D3E-#x0D43] | [#x0D46-#x0D48] | [#x0D4A-#x0D4D] |
+#x0D57 | #x0E31 | [#x0E34-#x0E3A] | [#x0E47-#x0E4E] | #x0EB1 |
+[#x0EB4-#x0EB9] | [#x0EBB-#x0EBC] | [#x0EC8-#x0ECD] | [#x0F18-#x0F19] |
+#x0F35 | #x0F37 | #x0F39 | #x0F3E | #x0F3F | [#x0F71-#x0F84] |
+[#x0F86-#x0F8B] | [#x0F90-#x0F95] | #x0F97 | [#x0F99-#x0FAD] |
+[#x0FB1-#x0FB7] | #x0FB9 | [#x20D0-#x20DC] | #x20E1 | [#x302A-#x302F] |
+#x3099 | #x309A"""
+
+digit = """
+[#x0030-#x0039] | [#x0660-#x0669] | [#x06F0-#x06F9] | [#x0966-#x096F] |
+[#x09E6-#x09EF] | [#x0A66-#x0A6F] | [#x0AE6-#x0AEF] | [#x0B66-#x0B6F] |
+[#x0BE7-#x0BEF] | [#x0C66-#x0C6F] | [#x0CE6-#x0CEF] | [#x0D66-#x0D6F] |
+[#x0E50-#x0E59] | [#x0ED0-#x0ED9] | [#x0F20-#x0F29]"""
+
+extender = """
+#x00B7 | #x02D0 | #x02D1 | #x0387 | #x0640 | #x0E46 | #x0EC6 | #x3005 |
+#[#x3031-#x3035] | [#x309D-#x309E] | [#x30FC-#x30FE]"""
+
+letter = " | ".join([baseChar, ideographic])
+
+# Without the
+name = " | ".join([letter, digit, ".", "-", "_", combiningCharacter,
+                   extender])
+nameFirst = " | ".join([letter, "_"])
+
+reChar = re.compile(r"#x([\d|A-F]{4,4})")
+reCharRange = re.compile(r"\[#x([\d|A-F]{4,4})-#x([\d|A-F]{4,4})\]")
+
+
+def charStringToList(chars):
+    charRanges = [item.strip() for item in chars.split(" | ")]
+    rv = []
+    for item in charRanges:
+        foundMatch = False
+        for regexp in (reChar, reCharRange):
+            match = regexp.match(item)
+            if match is not None:
+                rv.append([hexToInt(item) for item in match.groups()])
+                if len(rv[-1]) == 1:
+                    rv[-1] = rv[-1] * 2
+                foundMatch = True
+                break
+        if not foundMatch:
+            assert len(item) == 1
+
+            rv.append([ord(item)] * 2)
+    rv = normaliseCharList(rv)
+    return rv
+
+
+def normaliseCharList(charList):
+    charList = sorted(charList)
+    for item in charList:
+        assert item[1] >= item[0]
+    rv = []
+    i = 0
+    while i < len(charList):
+        j = 1
+        rv.append(charList[i])
+        while i + j < len(charList) and charList[i + j][0] <= rv[-1][1] + 1:
+            rv[-1][1] = charList[i + j][1]
+            j += 1
+        i += j
+    return rv
+
+# We don't really support characters above the BMP :(
+max_unicode = int("FFFF", 16)
+
+
+def missingRanges(charList):
+    rv = []
+    if charList[0] != 0:
+        rv.append([0, charList[0][0] - 1])
+    for i, item in enumerate(charList[:-1]):
+        rv.append([item[1] + 1, charList[i + 1][0] - 1])
+    if charList[-1][1] != max_unicode:
+        rv.append([charList[-1][1] + 1, max_unicode])
+    return rv
+
+
+def listToRegexpStr(charList):
+    rv = []
+    for item in charList:
+        if item[0] == item[1]:
+            rv.append(escapeRegexp(chr(item[0])))
+        else:
+            rv.append(escapeRegexp(chr(item[0])) + "-" +
+                      escapeRegexp(chr(item[1])))
+    return "[%s]" % "".join(rv)
+
+
+def hexToInt(hex_str):
+    return int(hex_str, 16)
+
+
+def escapeRegexp(string):
+    specialCharacters = (".", "^", "$", "*", "+", "?", "{", "}",
+                         "[", "]", "|", "(", ")", "-")
+    for char in specialCharacters:
+        string = string.replace(char, "\\" + char)
+
+    return string
+
+# output from the above
+nonXmlNameBMPRegexp = re.compile('[\x00-,/:-@\\[-\\^`\\{-\xb6\xb8-\xbf\xd7\xf7\u0132-\u0133\u013f-\u0140\u0149\u017f\u01c4-\u01cc\u01f1-\u01f3\u01f6-\u01f9\u0218-\u024f\u02a9-\u02ba\u02c2-\u02cf\u02d2-\u02ff\u0346-\u035f\u0362-\u0385\u038b\u038d\u03a2\u03cf\u03d7-\u03d9\u03db\u03dd\u03df\u03e1\u03f4-\u0400\u040d\u0450\u045d\u0482\u0487-\u048f\u04c5-\u04c6\u04c9-\u04ca\u04cd-\u04cf\u04ec-\u04ed\u04f6-\u04f7\u04fa-\u0530\u0557-\u0558\u055a-\u0560\u0587-\u0590\u05a2\u05ba\u05be\u05c0\u05c3\u05c5-\u05cf\u05eb-\u05ef\u05f3-\u0620\u063b-\u063f\u0653-\u065f\u066a-\u066f\u06b8-\u06b9\u06bf\u06cf\u06d4\u06e9\u06ee-\u06ef\u06fa-\u0900\u0904\u093a-\u093b\u094e-\u0950\u0955-\u0957\u0964-\u0965\u0970-\u0980\u0984\u098d-\u098e\u0991-\u0992\u09a9\u09b1\u09b3-\u09b5\u09ba-\u09bb\u09bd\u09c5-\u09c6\u09c9-\u09ca\u09ce-\u09d6\u09d8-\u09db\u09de\u09e4-\u09e5\u09f2-\u0a01\u0a03-\u0a04\u0a0b-\u0a0e\u0a11-\u0a12\u0a29\u0a31\u0a34\u0a37\u0a3a-\u0a3b\u0a3d\u0a43-\u0a46\u0a49-\u0a4a\u0a4e-\u0a58\u0a5d\u0a5f-\u0a65\u0a75-\u0a80\u0a84\u0a8c\u0a8e\u0a92\u0aa9\u0ab1\u0ab4\u0aba-\u0abb\u0ac6\u0aca\u0ace-\u0adf\u0ae1-\u0ae5\u0af0-\u0b00\u0b04\u0b0d-\u0b0e\u0b11-\u0b12\u0b29\u0b31\u0b34-\u0b35\u0b3a-\u0b3b\u0b44-\u0b46\u0b49-\u0b4a\u0b4e-\u0b55\u0b58-\u0b5b\u0b5e\u0b62-\u0b65\u0b70-\u0b81\u0b84\u0b8b-\u0b8d\u0b91\u0b96-\u0b98\u0b9b\u0b9d\u0ba0-\u0ba2\u0ba5-\u0ba7\u0bab-\u0bad\u0bb6\u0bba-\u0bbd\u0bc3-\u0bc5\u0bc9\u0bce-\u0bd6\u0bd8-\u0be6\u0bf0-\u0c00\u0c04\u0c0d\u0c11\u0c29\u0c34\u0c3a-\u0c3d\u0c45\u0c49\u0c4e-\u0c54\u0c57-\u0c5f\u0c62-\u0c65\u0c70-\u0c81\u0c84\u0c8d\u0c91\u0ca9\u0cb4\u0cba-\u0cbd\u0cc5\u0cc9\u0cce-\u0cd4\u0cd7-\u0cdd\u0cdf\u0ce2-\u0ce5\u0cf0-\u0d01\u0d04\u0d0d\u0d11\u0d29\u0d3a-\u0d3d\u0d44-\u0d45\u0d49\u0d4e-\u0d56\u0d58-\u0d5f\u0d62-\u0d65\u0d70-\u0e00\u0e2f\u0e3b-\u0e3f\u0e4f\u0e5a-\u0e80\u0e83\u0e85-\u0e86\u0e89\u0e8b-\u0e8c\u0e8e-\u0e93\u0e98\u0ea0\u0ea4\u0ea6\u0ea8-\u0ea9\u0eac\u0eaf\u0eba\u0ebe-\u0ebf\u0ec5\u0ec7\u0ece-\u0ecf\u0eda-\u0f17\u0f1a-\u0f1f\u0f2a-\u0f34\u0f36\u0f38\u0f3a-\u0f3d\u0f48\u0f6a-\u0f70\u0f85\u0f8c-\u0f8f\u0f96\u0f98\u0fae-\u0fb0\u0fb8\u0fba-\u109f\u10c6-\u10cf\u10f7-\u10ff\u1101\u1104\u1108\u110a\u110d\u1113-\u113b\u113d\u113f\u1141-\u114b\u114d\u114f\u1151-\u1153\u1156-\u1158\u115a-\u115e\u1162\u1164\u1166\u1168\u116a-\u116c\u116f-\u1171\u1174\u1176-\u119d\u119f-\u11a7\u11a9-\u11aa\u11ac-\u11ad\u11b0-\u11b6\u11b9\u11bb\u11c3-\u11ea\u11ec-\u11ef\u11f1-\u11f8\u11fa-\u1dff\u1e9c-\u1e9f\u1efa-\u1eff\u1f16-\u1f17\u1f1e-\u1f1f\u1f46-\u1f47\u1f4e-\u1f4f\u1f58\u1f5a\u1f5c\u1f5e\u1f7e-\u1f7f\u1fb5\u1fbd\u1fbf-\u1fc1\u1fc5\u1fcd-\u1fcf\u1fd4-\u1fd5\u1fdc-\u1fdf\u1fed-\u1ff1\u1ff5\u1ffd-\u20cf\u20dd-\u20e0\u20e2-\u2125\u2127-\u2129\u212c-\u212d\u212f-\u217f\u2183-\u3004\u3006\u3008-\u3020\u3030\u3036-\u3040\u3095-\u3098\u309b-\u309c\u309f-\u30a0\u30fb\u30ff-\u3104\u312d-\u4dff\u9fa6-\uabff\ud7a4-\uffff]')
+
+nonXmlNameFirstBMPRegexp = re.compile('[\x00-@\\[-\\^`\\{-\xbf\xd7\xf7\u0132-\u0133\u013f-\u0140\u0149\u017f\u01c4-\u01cc\u01f1-\u01f3\u01f6-\u01f9\u0218-\u024f\u02a9-\u02ba\u02c2-\u0385\u0387\u038b\u038d\u03a2\u03cf\u03d7-\u03d9\u03db\u03dd\u03df\u03e1\u03f4-\u0400\u040d\u0450\u045d\u0482-\u048f\u04c5-\u04c6\u04c9-\u04ca\u04cd-\u04cf\u04ec-\u04ed\u04f6-\u04f7\u04fa-\u0530\u0557-\u0558\u055a-\u0560\u0587-\u05cf\u05eb-\u05ef\u05f3-\u0620\u063b-\u0640\u064b-\u0670\u06b8-\u06b9\u06bf\u06cf\u06d4\u06d6-\u06e4\u06e7-\u0904\u093a-\u093c\u093e-\u0957\u0962-\u0984\u098d-\u098e\u0991-\u0992\u09a9\u09b1\u09b3-\u09b5\u09ba-\u09db\u09de\u09e2-\u09ef\u09f2-\u0a04\u0a0b-\u0a0e\u0a11-\u0a12\u0a29\u0a31\u0a34\u0a37\u0a3a-\u0a58\u0a5d\u0a5f-\u0a71\u0a75-\u0a84\u0a8c\u0a8e\u0a92\u0aa9\u0ab1\u0ab4\u0aba-\u0abc\u0abe-\u0adf\u0ae1-\u0b04\u0b0d-\u0b0e\u0b11-\u0b12\u0b29\u0b31\u0b34-\u0b35\u0b3a-\u0b3c\u0b3e-\u0b5b\u0b5e\u0b62-\u0b84\u0b8b-\u0b8d\u0b91\u0b96-\u0b98\u0b9b\u0b9d\u0ba0-\u0ba2\u0ba5-\u0ba7\u0bab-\u0bad\u0bb6\u0bba-\u0c04\u0c0d\u0c11\u0c29\u0c34\u0c3a-\u0c5f\u0c62-\u0c84\u0c8d\u0c91\u0ca9\u0cb4\u0cba-\u0cdd\u0cdf\u0ce2-\u0d04\u0d0d\u0d11\u0d29\u0d3a-\u0d5f\u0d62-\u0e00\u0e2f\u0e31\u0e34-\u0e3f\u0e46-\u0e80\u0e83\u0e85-\u0e86\u0e89\u0e8b-\u0e8c\u0e8e-\u0e93\u0e98\u0ea0\u0ea4\u0ea6\u0ea8-\u0ea9\u0eac\u0eaf\u0eb1\u0eb4-\u0ebc\u0ebe-\u0ebf\u0ec5-\u0f3f\u0f48\u0f6a-\u109f\u10c6-\u10cf\u10f7-\u10ff\u1101\u1104\u1108\u110a\u110d\u1113-\u113b\u113d\u113f\u1141-\u114b\u114d\u114f\u1151-\u1153\u1156-\u1158\u115a-\u115e\u1162\u1164\u1166\u1168\u116a-\u116c\u116f-\u1171\u1174\u1176-\u119d\u119f-\u11a7\u11a9-\u11aa\u11ac-\u11ad\u11b0-\u11b6\u11b9\u11bb\u11c3-\u11ea\u11ec-\u11ef\u11f1-\u11f8\u11fa-\u1dff\u1e9c-\u1e9f\u1efa-\u1eff\u1f16-\u1f17\u1f1e-\u1f1f\u1f46-\u1f47\u1f4e-\u1f4f\u1f58\u1f5a\u1f5c\u1f5e\u1f7e-\u1f7f\u1fb5\u1fbd\u1fbf-\u1fc1\u1fc5\u1fcd-\u1fcf\u1fd4-\u1fd5\u1fdc-\u1fdf\u1fed-\u1ff1\u1ff5\u1ffd-\u2125\u2127-\u2129\u212c-\u212d\u212f-\u217f\u2183-\u3006\u3008-\u3020\u302a-\u3040\u3095-\u30a0\u30fb-\u3104\u312d-\u4dff\u9fa6-\uabff\ud7a4-\uffff]')
+
+# Simpler things
+nonPubidCharRegexp = re.compile("[^\x20\x0D\x0Aa-zA-Z0-9\-\'()+,./:=?;!*#@$_%]")
+
+
+class InfosetFilter(object):
+    replacementRegexp = re.compile(r"U[\dA-F]{5,5}")
+
+    def __init__(self, replaceChars=None,
+                 dropXmlnsLocalName=False,
+                 dropXmlnsAttrNs=False,
+                 preventDoubleDashComments=False,
+                 preventDashAtCommentEnd=False,
+                 replaceFormFeedCharacters=True,
+                 preventSingleQuotePubid=False):
+
+        self.dropXmlnsLocalName = dropXmlnsLocalName
+        self.dropXmlnsAttrNs = dropXmlnsAttrNs
+
+        self.preventDoubleDashComments = preventDoubleDashComments
+        self.preventDashAtCommentEnd = preventDashAtCommentEnd
+
+        self.replaceFormFeedCharacters = replaceFormFeedCharacters
+
+        self.preventSingleQuotePubid = preventSingleQuotePubid
+
+        self.replaceCache = {}
+
+    def coerceAttribute(self, name, namespace=None):
+        if self.dropXmlnsLocalName and name.startswith("xmlns:"):
+            warnings.warn("Attributes cannot begin with xmlns", DataLossWarning)
+            return None
+        elif (self.dropXmlnsAttrNs and
+              namespace == "http://www.w3.org/2000/xmlns/"):
+            warnings.warn("Attributes cannot be in the xml namespace", DataLossWarning)
+            return None
+        else:
+            return self.toXmlName(name)
+
+    def coerceElement(self, name, namespace=None):
+        return self.toXmlName(name)
+
+    def coerceComment(self, data):
+        if self.preventDoubleDashComments:
+            while "--" in data:
+                warnings.warn("Comments cannot contain adjacent dashes", DataLossWarning)
+                data = data.replace("--", "- -")
+        return data
+
+    def coerceCharacters(self, data):
+        if self.replaceFormFeedCharacters:
+            for i in range(data.count("\x0C")):
+                warnings.warn("Text cannot contain U+000C", DataLossWarning)
+            data = data.replace("\x0C", " ")
+        # Other non-xml characters
+        return data
+
+    def coercePubid(self, data):
+        dataOutput = data
+        for char in nonPubidCharRegexp.findall(data):
+            warnings.warn("Coercing non-XML pubid", DataLossWarning)
+            replacement = self.getReplacementCharacter(char)
+            dataOutput = dataOutput.replace(char, replacement)
+        if self.preventSingleQuotePubid and dataOutput.find("'") >= 0:
+            warnings.warn("Pubid cannot contain single quote", DataLossWarning)
+            dataOutput = dataOutput.replace("'", self.getReplacementCharacter("'"))
+        return dataOutput
+
+    def toXmlName(self, name):
+        nameFirst = name[0]
+        nameRest = name[1:]
+        m = nonXmlNameFirstBMPRegexp.match(nameFirst)
+        if m:
+            warnings.warn("Coercing non-XML name", DataLossWarning)
+            nameFirstOutput = self.getReplacementCharacter(nameFirst)
+        else:
+            nameFirstOutput = nameFirst
+
+        nameRestOutput = nameRest
+        replaceChars = set(nonXmlNameBMPRegexp.findall(nameRest))
+        for char in replaceChars:
+            warnings.warn("Coercing non-XML name", DataLossWarning)
+            replacement = self.getReplacementCharacter(char)
+            nameRestOutput = nameRestOutput.replace(char, replacement)
+        return nameFirstOutput + nameRestOutput
+
+    def getReplacementCharacter(self, char):
+        if char in self.replaceCache:
+            replacement = self.replaceCache[char]
+        else:
+            replacement = self.escapeChar(char)
+        return replacement
+
+    def fromXmlName(self, name):
+        for item in set(self.replacementRegexp.findall(name)):
+            name = name.replace(item, self.unescapeChar(item))
+        return name
+
+    def escapeChar(self, char):
+        replacement = "U%05X" % ord(char)
+        self.replaceCache[char] = replacement
+        return replacement
+
+    def unescapeChar(self, charcode):
+        return chr(int(charcode[1:], 16))
diff --git a/lib/html5lib/inputstream.py b/lib/html5lib/inputstream.py
new file mode 100644
index 00000000..9e03b931
--- /dev/null
+++ b/lib/html5lib/inputstream.py
@@ -0,0 +1,886 @@
+from __future__ import absolute_import, division, unicode_literals
+from six import text_type
+from six.moves import http_client
+
+import codecs
+import re
+
+from .constants import EOF, spaceCharacters, asciiLetters, asciiUppercase
+from .constants import encodings, ReparseException
+from . import utils
+
+from io import StringIO
+
+try:
+    from io import BytesIO
+except ImportError:
+    BytesIO = StringIO
+
+try:
+    from io import BufferedIOBase
+except ImportError:
+    class BufferedIOBase(object):
+        pass
+
+# Non-unicode versions of constants for use in the pre-parser
+spaceCharactersBytes = frozenset([item.encode("ascii") for item in spaceCharacters])
+asciiLettersBytes = frozenset([item.encode("ascii") for item in asciiLetters])
+asciiUppercaseBytes = frozenset([item.encode("ascii") for item in asciiUppercase])
+spacesAngleBrackets = spaceCharactersBytes | frozenset([b">", b"<"])
+
+invalid_unicode_re = re.compile("[\u0001-\u0008\u000B\u000E-\u001F\u007F-\u009F\uD800-\uDFFF\uFDD0-\uFDEF\uFFFE\uFFFF\U0001FFFE\U0001FFFF\U0002FFFE\U0002FFFF\U0003FFFE\U0003FFFF\U0004FFFE\U0004FFFF\U0005FFFE\U0005FFFF\U0006FFFE\U0006FFFF\U0007FFFE\U0007FFFF\U0008FFFE\U0008FFFF\U0009FFFE\U0009FFFF\U000AFFFE\U000AFFFF\U000BFFFE\U000BFFFF\U000CFFFE\U000CFFFF\U000DFFFE\U000DFFFF\U000EFFFE\U000EFFFF\U000FFFFE\U000FFFFF\U0010FFFE\U0010FFFF]")
+
+non_bmp_invalid_codepoints = set([0x1FFFE, 0x1FFFF, 0x2FFFE, 0x2FFFF, 0x3FFFE,
+                                  0x3FFFF, 0x4FFFE, 0x4FFFF, 0x5FFFE, 0x5FFFF,
+                                  0x6FFFE, 0x6FFFF, 0x7FFFE, 0x7FFFF, 0x8FFFE,
+                                  0x8FFFF, 0x9FFFE, 0x9FFFF, 0xAFFFE, 0xAFFFF,
+                                  0xBFFFE, 0xBFFFF, 0xCFFFE, 0xCFFFF, 0xDFFFE,
+                                  0xDFFFF, 0xEFFFE, 0xEFFFF, 0xFFFFE, 0xFFFFF,
+                                  0x10FFFE, 0x10FFFF])
+
+ascii_punctuation_re = re.compile("[\u0009-\u000D\u0020-\u002F\u003A-\u0040\u005B-\u0060\u007B-\u007E]")
+
+# Cache for charsUntil()
+charsUntilRegEx = {}
+
+
+class BufferedStream(object):
+    """Buffering for streams that do not have buffering of their own
+
+    The buffer is implemented as a list of chunks on the assumption that
+    joining many strings will be slow since it is O(n**2)
+    """
+
+    def __init__(self, stream):
+        self.stream = stream
+        self.buffer = []
+        self.position = [-1, 0]  # chunk number, offset
+
+    def tell(self):
+        pos = 0
+        for chunk in self.buffer[:self.position[0]]:
+            pos += len(chunk)
+        pos += self.position[1]
+        return pos
+
+    def seek(self, pos):
+        assert pos <= self._bufferedBytes()
+        offset = pos
+        i = 0
+        while len(self.buffer[i]) < offset:
+            offset -= len(self.buffer[i])
+            i += 1
+        self.position = [i, offset]
+
+    def read(self, bytes):
+        if not self.buffer:
+            return self._readStream(bytes)
+        elif (self.position[0] == len(self.buffer) and
+              self.position[1] == len(self.buffer[-1])):
+            return self._readStream(bytes)
+        else:
+            return self._readFromBuffer(bytes)
+
+    def _bufferedBytes(self):
+        return sum([len(item) for item in self.buffer])
+
+    def _readStream(self, bytes):
+        data = self.stream.read(bytes)
+        self.buffer.append(data)
+        self.position[0] += 1
+        self.position[1] = len(data)
+        return data
+
+    def _readFromBuffer(self, bytes):
+        remainingBytes = bytes
+        rv = []
+        bufferIndex = self.position[0]
+        bufferOffset = self.position[1]
+        while bufferIndex < len(self.buffer) and remainingBytes != 0:
+            assert remainingBytes > 0
+            bufferedData = self.buffer[bufferIndex]
+
+            if remainingBytes <= len(bufferedData) - bufferOffset:
+                bytesToRead = remainingBytes
+                self.position = [bufferIndex, bufferOffset + bytesToRead]
+            else:
+                bytesToRead = len(bufferedData) - bufferOffset
+                self.position = [bufferIndex, len(bufferedData)]
+                bufferIndex += 1
+            rv.append(bufferedData[bufferOffset:bufferOffset + bytesToRead])
+            remainingBytes -= bytesToRead
+
+            bufferOffset = 0
+
+        if remainingBytes:
+            rv.append(self._readStream(remainingBytes))
+
+        return b"".join(rv)
+
+
+def HTMLInputStream(source, encoding=None, parseMeta=True, chardet=True):
+    if isinstance(source, http_client.HTTPResponse):
+        # Work around Python bug #20007: read(0) closes the connection.
+        # http://bugs.python.org/issue20007
+        isUnicode = False
+    elif hasattr(source, "read"):
+        isUnicode = isinstance(source.read(0), text_type)
+    else:
+        isUnicode = isinstance(source, text_type)
+
+    if isUnicode:
+        if encoding is not None:
+            raise TypeError("Cannot explicitly set an encoding with a unicode string")
+
+        return HTMLUnicodeInputStream(source)
+    else:
+        return HTMLBinaryInputStream(source, encoding, parseMeta, chardet)
+
+
+class HTMLUnicodeInputStream(object):
+    """Provides a unicode stream of characters to the HTMLTokenizer.
+
+    This class takes care of character encoding and removing or replacing
+    incorrect byte-sequences and also provides column and line tracking.
+
+    """
+
+    _defaultChunkSize = 10240
+
+    def __init__(self, source):
+        """Initialises the HTMLInputStream.
+
+        HTMLInputStream(source, [encoding]) -> Normalized stream from source
+        for use by html5lib.
+
+        source can be either a file-object, local filename or a string.
+
+        The optional encoding parameter must be a string that indicates
+        the encoding.  If specified, that encoding will be used,
+        regardless of any BOM or later declaration (such as in a meta
+        element)
+
+        parseMeta - Look for a <meta> element containing encoding information
+
+        """
+
+        # Craziness
+        if len("\U0010FFFF") == 1:
+            self.reportCharacterErrors = self.characterErrorsUCS4
+            self.replaceCharactersRegexp = re.compile("[\uD800-\uDFFF]")
+        else:
+            self.reportCharacterErrors = self.characterErrorsUCS2
+            self.replaceCharactersRegexp = re.compile("([\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF])")
+
+        # List of where new lines occur
+        self.newLines = [0]
+
+        self.charEncoding = ("utf-8", "certain")
+        self.dataStream = self.openStream(source)
+
+        self.reset()
+
+    def reset(self):
+        self.chunk = ""
+        self.chunkSize = 0
+        self.chunkOffset = 0
+        self.errors = []
+
+        # number of (complete) lines in previous chunks
+        self.prevNumLines = 0
+        # number of columns in the last line of the previous chunk
+        self.prevNumCols = 0
+
+        # Deal with CR LF and surrogates split over chunk boundaries
+        self._bufferedCharacter = None
+
+    def openStream(self, source):
+        """Produces a file object from source.
+
+        source can be either a file object, local filename or a string.
+
+        """
+        # Already a file object
+        if hasattr(source, 'read'):
+            stream = source
+        else:
+            stream = StringIO(source)
+
+        return stream
+
+    def _position(self, offset):
+        chunk = self.chunk
+        nLines = chunk.count('\n', 0, offset)
+        positionLine = self.prevNumLines + nLines
+        lastLinePos = chunk.rfind('\n', 0, offset)
+        if lastLinePos == -1:
+            positionColumn = self.prevNumCols + offset
+        else:
+            positionColumn = offset - (lastLinePos + 1)
+        return (positionLine, positionColumn)
+
+    def position(self):
+        """Returns (line, col) of the current position in the stream."""
+        line, col = self._position(self.chunkOffset)
+        return (line + 1, col)
+
+    def char(self):
+        """ Read one character from the stream or queue if available. Return
+            EOF when EOF is reached.
+        """
+        # Read a new chunk from the input stream if necessary
+        if self.chunkOffset >= self.chunkSize:
+            if not self.readChunk():
+                return EOF
+
+        chunkOffset = self.chunkOffset
+        char = self.chunk[chunkOffset]
+        self.chunkOffset = chunkOffset + 1
+
+        return char
+
+    def readChunk(self, chunkSize=None):
+        if chunkSize is None:
+            chunkSize = self._defaultChunkSize
+
+        self.prevNumLines, self.prevNumCols = self._position(self.chunkSize)
+
+        self.chunk = ""
+        self.chunkSize = 0
+        self.chunkOffset = 0
+
+        data = self.dataStream.read(chunkSize)
+
+        # Deal with CR LF and surrogates broken across chunks
+        if self._bufferedCharacter:
+            data = self._bufferedCharacter + data
+            self._bufferedCharacter = None
+        elif not data:
+            # We have no more data, bye-bye stream
+            return False
+
+        if len(data) > 1:
+            lastv = ord(data[-1])
+            if lastv == 0x0D or 0xD800 <= lastv <= 0xDBFF:
+                self._bufferedCharacter = data[-1]
+                data = data[:-1]
+
+        self.reportCharacterErrors(data)
+
+        # Replace invalid characters
+        # Note U+0000 is dealt with in the tokenizer
+        data = self.replaceCharactersRegexp.sub("\ufffd", data)
+
+        data = data.replace("\r\n", "\n")
+        data = data.replace("\r", "\n")
+
+        self.chunk = data
+        self.chunkSize = len(data)
+
+        return True
+
+    def characterErrorsUCS4(self, data):
+        for i in range(len(invalid_unicode_re.findall(data))):
+            self.errors.append("invalid-codepoint")
+
+    def characterErrorsUCS2(self, data):
+        # Someone picked the wrong compile option
+        # You lose
+        skip = False
+        for match in invalid_unicode_re.finditer(data):
+            if skip:
+                continue
+            codepoint = ord(match.group())
+            pos = match.start()
+            # Pretty sure there should be endianness issues here
+            if utils.isSurrogatePair(data[pos:pos + 2]):
+                # We have a surrogate pair!
+                char_val = utils.surrogatePairToCodepoint(data[pos:pos + 2])
+                if char_val in non_bmp_invalid_codepoints:
+                    self.errors.append("invalid-codepoint")
+                skip = True
+            elif (codepoint >= 0xD800 and codepoint <= 0xDFFF and
+                  pos == len(data) - 1):
+                self.errors.append("invalid-codepoint")
+            else:
+                skip = False
+                self.errors.append("invalid-codepoint")
+
+    def charsUntil(self, characters, opposite=False):
+        """ Returns a string of characters from the stream up to but not
+        including any character in 'characters' or EOF. 'characters' must be
+        a container that supports the 'in' method and iteration over its
+        characters.
+        """
+
+        # Use a cache of regexps to find the required characters
+        try:
+            chars = charsUntilRegEx[(characters, opposite)]
+        except KeyError:
+            if __debug__:
+                for c in characters:
+                    assert(ord(c) < 128)
+            regex = "".join(["\\x%02x" % ord(c) for c in characters])
+            if not opposite:
+                regex = "^%s" % regex
+            chars = charsUntilRegEx[(characters, opposite)] = re.compile("[%s]+" % regex)
+
+        rv = []
+
+        while True:
+            # Find the longest matching prefix
+            m = chars.match(self.chunk, self.chunkOffset)
+            if m is None:
+                # If nothing matched, and it wasn't because we ran out of chunk,
+                # then stop
+                if self.chunkOffset != self.chunkSize:
+                    break
+            else:
+                end = m.end()
+                # If not the whole chunk matched, return everything
+                # up to the part that didn't match
+                if end != self.chunkSize:
+                    rv.append(self.chunk[self.chunkOffset:end])
+                    self.chunkOffset = end
+                    break
+            # If the whole remainder of the chunk matched,
+            # use it all and read the next chunk
+            rv.append(self.chunk[self.chunkOffset:])
+            if not self.readChunk():
+                # Reached EOF
+                break
+
+        r = "".join(rv)
+        return r
+
+    def unget(self, char):
+        # Only one character is allowed to be ungotten at once - it must
+        # be consumed again before any further call to unget
+        if char is not None:
+            if self.chunkOffset == 0:
+                # unget is called quite rarely, so it's a good idea to do
+                # more work here if it saves a bit of work in the frequently
+                # called char and charsUntil.
+                # So, just prepend the ungotten character onto the current
+                # chunk:
+                self.chunk = char + self.chunk
+                self.chunkSize += 1
+            else:
+                self.chunkOffset -= 1
+                assert self.chunk[self.chunkOffset] == char
+
+
+class HTMLBinaryInputStream(HTMLUnicodeInputStream):
+    """Provides a unicode stream of characters to the HTMLTokenizer.
+
+    This class takes care of character encoding and removing or replacing
+    incorrect byte-sequences and also provides column and line tracking.
+
+    """
+
+    def __init__(self, source, encoding=None, parseMeta=True, chardet=True):
+        """Initialises the HTMLInputStream.
+
+        HTMLInputStream(source, [encoding]) -> Normalized stream from source
+        for use by html5lib.
+
+        source can be either a file-object, local filename or a string.
+
+        The optional encoding parameter must be a string that indicates
+        the encoding.  If specified, that encoding will be used,
+        regardless of any BOM or later declaration (such as in a meta
+        element)
+
+        parseMeta - Look for a <meta> element containing encoding information
+
+        """
+        # Raw Stream - for unicode objects this will encode to utf-8 and set
+        #              self.charEncoding as appropriate
+        self.rawStream = self.openStream(source)
+
+        HTMLUnicodeInputStream.__init__(self, self.rawStream)
+
+        self.charEncoding = (codecName(encoding), "certain")
+
+        # Encoding Information
+        # Number of bytes to use when looking for a meta element with
+        # encoding information
+        self.numBytesMeta = 512
+        # Number of bytes to use when using detecting encoding using chardet
+        self.numBytesChardet = 100
+        # Encoding to use if no other information can be found
+        self.defaultEncoding = "windows-1252"
+
+        # Detect encoding iff no explicit "transport level" encoding is supplied
+        if (self.charEncoding[0] is None):
+            self.charEncoding = self.detectEncoding(parseMeta, chardet)
+
+        # Call superclass
+        self.reset()
+
+    def reset(self):
+        self.dataStream = codecs.getreader(self.charEncoding[0])(self.rawStream,
+                                                                 'replace')
+        HTMLUnicodeInputStream.reset(self)
+
+    def openStream(self, source):
+        """Produces a file object from source.
+
+        source can be either a file object, local filename or a string.
+
+        """
+        # Already a file object
+        if hasattr(source, 'read'):
+            stream = source
+        else:
+            stream = BytesIO(source)
+
+        try:
+            stream.seek(stream.tell())
+        except:
+            stream = BufferedStream(stream)
+
+        return stream
+
+    def detectEncoding(self, parseMeta=True, chardet=True):
+        # First look for a BOM
+        # This will also read past the BOM if present
+        encoding = self.detectBOM()
+        confidence = "certain"
+        # If there is no BOM need to look for meta elements with encoding
+        # information
+        if encoding is None and parseMeta:
+            encoding = self.detectEncodingMeta()
+            confidence = "tentative"
+        # Guess with chardet, if avaliable
+        if encoding is None and chardet:
+            confidence = "tentative"
+            try:
+                try:
+                    from charade.universaldetector import UniversalDetector
+                except ImportError:
+                    from chardet.universaldetector import UniversalDetector
+                buffers = []
+                detector = UniversalDetector()
+                while not detector.done:
+                    buffer = self.rawStream.read(self.numBytesChardet)
+                    assert isinstance(buffer, bytes)
+                    if not buffer:
+                        break
+                    buffers.append(buffer)
+                    detector.feed(buffer)
+                detector.close()
+                encoding = detector.result['encoding']
+                self.rawStream.seek(0)
+            except ImportError:
+                pass
+        # If all else fails use the default encoding
+        if encoding is None:
+            confidence = "tentative"
+            encoding = self.defaultEncoding
+
+        # Substitute for equivalent encodings:
+        encodingSub = {"iso-8859-1": "windows-1252"}
+
+        if encoding.lower() in encodingSub:
+            encoding = encodingSub[encoding.lower()]
+
+        return encoding, confidence
+
+    def changeEncoding(self, newEncoding):
+        assert self.charEncoding[1] != "certain"
+        newEncoding = codecName(newEncoding)
+        if newEncoding in ("utf-16", "utf-16-be", "utf-16-le"):
+            newEncoding = "utf-8"
+        if newEncoding is None:
+            return
+        elif newEncoding == self.charEncoding[0]:
+            self.charEncoding = (self.charEncoding[0], "certain")
+        else:
+            self.rawStream.seek(0)
+            self.reset()
+            self.charEncoding = (newEncoding, "certain")
+            raise ReparseException("Encoding changed from %s to %s" % (self.charEncoding[0], newEncoding))
+
+    def detectBOM(self):
+        """Attempts to detect at BOM at the start of the stream. If
+        an encoding can be determined from the BOM return the name of the
+        encoding otherwise return None"""
+        bomDict = {
+            codecs.BOM_UTF8: 'utf-8',
+            codecs.BOM_UTF16_LE: 'utf-16-le', codecs.BOM_UTF16_BE: 'utf-16-be',
+            codecs.BOM_UTF32_LE: 'utf-32-le', codecs.BOM_UTF32_BE: 'utf-32-be'
+        }
+
+        # Go to beginning of file and read in 4 bytes
+        string = self.rawStream.read(4)
+        assert isinstance(string, bytes)
+
+        # Try detecting the BOM using bytes from the string
+        encoding = bomDict.get(string[:3])         # UTF-8
+        seek = 3
+        if not encoding:
+            # Need to detect UTF-32 before UTF-16
+            encoding = bomDict.get(string)         # UTF-32
+            seek = 4
+            if not encoding:
+                encoding = bomDict.get(string[:2])  # UTF-16
+                seek = 2
+
+        # Set the read position past the BOM if one was found, otherwise
+        # set it to the start of the stream
+        self.rawStream.seek(encoding and seek or 0)
+
+        return encoding
+
+    def detectEncodingMeta(self):
+        """Report the encoding declared by the meta element
+        """
+        buffer = self.rawStream.read(self.numBytesMeta)
+        assert isinstance(buffer, bytes)
+        parser = EncodingParser(buffer)
+        self.rawStream.seek(0)
+        encoding = parser.getEncoding()
+
+        if encoding in ("utf-16", "utf-16-be", "utf-16-le"):
+            encoding = "utf-8"
+
+        return encoding
+
+
+class EncodingBytes(bytes):
+    """String-like object with an associated position and various extra methods
+    If the position is ever greater than the string length then an exception is
+    raised"""
+    def __new__(self, value):
+        assert isinstance(value, bytes)
+        return bytes.__new__(self, value.lower())
+
+    def __init__(self, value):
+        self._position = -1
+
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        p = self._position = self._position + 1
+        if p >= len(self):
+            raise StopIteration
+        elif p < 0:
+            raise TypeError
+        return self[p:p + 1]
+
+    def next(self):
+        # Py2 compat
+        return self.__next__()
+
+    def previous(self):
+        p = self._position
+        if p >= len(self):
+            raise StopIteration
+        elif p < 0:
+            raise TypeError
+        self._position = p = p - 1
+        return self[p:p + 1]
+
+    def setPosition(self, position):
+        if self._position >= len(self):
+            raise StopIteration
+        self._position = position
+
+    def getPosition(self):
+        if self._position >= len(self):
+            raise StopIteration
+        if self._position >= 0:
+            return self._position
+        else:
+            return None
+
+    position = property(getPosition, setPosition)
+
+    def getCurrentByte(self):
+        return self[self.position:self.position + 1]
+
+    currentByte = property(getCurrentByte)
+
+    def skip(self, chars=spaceCharactersBytes):
+        """Skip past a list of characters"""
+        p = self.position               # use property for the error-checking
+        while p < len(self):
+            c = self[p:p + 1]
+            if c not in chars:
+                self._position = p
+                return c
+            p += 1
+        self._position = p
+        return None
+
+    def skipUntil(self, chars):
+        p = self.position
+        while p < len(self):
+            c = self[p:p + 1]
+            if c in chars:
+                self._position = p
+                return c
+            p += 1
+        self._position = p
+        return None
+
+    def matchBytes(self, bytes):
+        """Look for a sequence of bytes at the start of a string. If the bytes
+        are found return True and advance the position to the byte after the
+        match. Otherwise return False and leave the position alone"""
+        p = self.position
+        data = self[p:p + len(bytes)]
+        rv = data.startswith(bytes)
+        if rv:
+            self.position += len(bytes)
+        return rv
+
+    def jumpTo(self, bytes):
+        """Look for the next sequence of bytes matching a given sequence. If
+        a match is found advance the position to the last byte of the match"""
+        newPosition = self[self.position:].find(bytes)
+        if newPosition > -1:
+            # XXX: This is ugly, but I can't see a nicer way to fix this.
+            if self._position == -1:
+                self._position = 0
+            self._position += (newPosition + len(bytes) - 1)
+            return True
+        else:
+            raise StopIteration
+
+
+class EncodingParser(object):
+    """Mini parser for detecting character encoding from meta elements"""
+
+    def __init__(self, data):
+        """string - the data to work on for encoding detection"""
+        self.data = EncodingBytes(data)
+        self.encoding = None
+
+    def getEncoding(self):
+        methodDispatch = (
+            (b"<!--", self.handleComment),
+            (b"<meta", self.handleMeta),
+            (b"</", self.handlePossibleEndTag),
+            (b"<!", self.handleOther),
+            (b"<?", self.handleOther),
+            (b"<", self.handlePossibleStartTag))
+        for byte in self.data:
+            keepParsing = True
+            for key, method in methodDispatch:
+                if self.data.matchBytes(key):
+                    try:
+                        keepParsing = method()
+                        break
+                    except StopIteration:
+                        keepParsing = False
+                        break
+            if not keepParsing:
+                break
+
+        return self.encoding
+
+    def handleComment(self):
+        """Skip over comments"""
+        return self.data.jumpTo(b"-->")
+
+    def handleMeta(self):
+        if self.data.currentByte not in spaceCharactersBytes:
+            # if we have <meta not followed by a space so just keep going
+            return True
+        # We have a valid meta element we want to search for attributes
+        hasPragma = False
+        pendingEncoding = None
+        while True:
+            # Try to find the next attribute after the current position
+            attr = self.getAttribute()
+            if attr is None:
+                return True
+            else:
+                if attr[0] == b"http-equiv":
+                    hasPragma = attr[1] == b"content-type"
+                    if hasPragma and pendingEncoding is not None:
+                        self.encoding = pendingEncoding
+                        return False
+                elif attr[0] == b"charset":
+                    tentativeEncoding = attr[1]
+                    codec = codecName(tentativeEncoding)
+                    if codec is not None:
+                        self.encoding = codec
+                        return False
+                elif attr[0] == b"content":
+                    contentParser = ContentAttrParser(EncodingBytes(attr[1]))
+                    tentativeEncoding = contentParser.parse()
+                    if tentativeEncoding is not None:
+                        codec = codecName(tentativeEncoding)
+                        if codec is not None:
+                            if hasPragma:
+                                self.encoding = codec
+                                return False
+                            else:
+                                pendingEncoding = codec
+
+    def handlePossibleStartTag(self):
+        return self.handlePossibleTag(False)
+
+    def handlePossibleEndTag(self):
+        next(self.data)
+        return self.handlePossibleTag(True)
+
+    def handlePossibleTag(self, endTag):
+        data = self.data
+        if data.currentByte not in asciiLettersBytes:
+            # If the next byte is not an ascii letter either ignore this
+            # fragment (possible start tag case) or treat it according to
+            # handleOther
+            if endTag:
+                data.previous()
+                self.handleOther()
+            return True
+
+        c = data.skipUntil(spacesAngleBrackets)
+        if c == b"<":
+            # return to the first step in the overall "two step" algorithm
+            # reprocessing the < byte
+            data.previous()
+        else:
+            # Read all attributes
+            attr = self.getAttribute()
+            while attr is not None:
+                attr = self.getAttribute()
+        return True
+
+    def handleOther(self):
+        return self.data.jumpTo(b">")
+
+    def getAttribute(self):
+        """Return a name,value pair for the next attribute in the stream,
+        if one is found, or None"""
+        data = self.data
+        # Step 1 (skip chars)
+        c = data.skip(spaceCharactersBytes | frozenset([b"/"]))
+        assert c is None or len(c) == 1
+        # Step 2
+        if c in (b">", None):
+            return None
+        # Step 3
+        attrName = []
+        attrValue = []
+        # Step 4 attribute name
+        while True:
+            if c == b"=" and attrName:
+                break
+            elif c in spaceCharactersBytes:
+                # Step 6!
+                c = data.skip()
+                break
+            elif c in (b"/", b">"):
+                return b"".join(attrName), b""
+            elif c in asciiUppercaseBytes:
+                attrName.append(c.lower())
+            elif c is None:
+                return None
+            else:
+                attrName.append(c)
+            # Step 5
+            c = next(data)
+        # Step 7
+        if c != b"=":
+            data.previous()
+            return b"".join(attrName), b""
+        # Step 8
+        next(data)
+        # Step 9
+        c = data.skip()
+        # Step 10
+        if c in (b"'", b'"'):
+            # 10.1
+            quoteChar = c
+            while True:
+                # 10.2
+                c = next(data)
+                # 10.3
+                if c == quoteChar:
+                    next(data)
+                    return b"".join(attrName), b"".join(attrValue)
+                # 10.4
+                elif c in asciiUppercaseBytes:
+                    attrValue.append(c.lower())
+                # 10.5
+                else:
+                    attrValue.append(c)
+        elif c == b">":
+            return b"".join(attrName), b""
+        elif c in asciiUppercaseBytes:
+            attrValue.append(c.lower())
+        elif c is None:
+            return None
+        else:
+            attrValue.append(c)
+        # Step 11
+        while True:
+            c = next(data)
+            if c in spacesAngleBrackets:
+                return b"".join(attrName), b"".join(attrValue)
+            elif c in asciiUppercaseBytes:
+                attrValue.append(c.lower())
+            elif c is None:
+                return None
+            else:
+                attrValue.append(c)
+
+
+class ContentAttrParser(object):
+    def __init__(self, data):
+        assert isinstance(data, bytes)
+        self.data = data
+
+    def parse(self):
+        try:
+            # Check if the attr name is charset
+            # otherwise return
+            self.data.jumpTo(b"charset")
+            self.data.position += 1
+            self.data.skip()
+            if not self.data.currentByte == b"=":
+                # If there is no = sign keep looking for attrs
+                return None
+            self.data.position += 1
+            self.data.skip()
+            # Look for an encoding between matching quote marks
+            if self.data.currentByte in (b'"', b"'"):
+                quoteMark = self.data.currentByte
+                self.data.position += 1
+                oldPosition = self.data.position
+                if self.data.jumpTo(quoteMark):
+                    return self.data[oldPosition:self.data.position]
+                else:
+                    return None
+            else:
+                # Unquoted value
+                oldPosition = self.data.position
+                try:
+                    self.data.skipUntil(spaceCharactersBytes)
+                    return self.data[oldPosition:self.data.position]
+                except StopIteration:
+                    # Return the whole remaining value
+                    return self.data[oldPosition:]
+        except StopIteration:
+            return None
+
+
+def codecName(encoding):
+    """Return the python codec name corresponding to an encoding or None if the
+    string doesn't correspond to a valid encoding."""
+    if isinstance(encoding, bytes):
+        try:
+            encoding = encoding.decode("ascii")
+        except UnicodeDecodeError:
+            return None
+    if encoding:
+        canonicalName = ascii_punctuation_re.sub("", encoding).lower()
+        return encodings.get(canonicalName, None)
+    else:
+        return None
diff --git a/lib/html5lib/sanitizer.py b/lib/html5lib/sanitizer.py
new file mode 100644
index 00000000..71dc5212
--- /dev/null
+++ b/lib/html5lib/sanitizer.py
@@ -0,0 +1,271 @@
+from __future__ import absolute_import, division, unicode_literals
+
+import re
+from xml.sax.saxutils import escape, unescape
+
+from .tokenizer import HTMLTokenizer
+from .constants import tokenTypes
+
+
+class HTMLSanitizerMixin(object):
+    """ sanitization of XHTML+MathML+SVG and of inline style attributes."""
+
+    acceptable_elements = ['a', 'abbr', 'acronym', 'address', 'area',
+                           'article', 'aside', 'audio', 'b', 'big', 'blockquote', 'br', 'button',
+                           'canvas', 'caption', 'center', 'cite', 'code', 'col', 'colgroup',
+                           'command', 'datagrid', 'datalist', 'dd', 'del', 'details', 'dfn',
+                           'dialog', 'dir', 'div', 'dl', 'dt', 'em', 'event-source', 'fieldset',
+                           'figcaption', 'figure', 'footer', 'font', 'form', 'header', 'h1',
+                           'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'img', 'input', 'ins',
+                           'keygen', 'kbd', 'label', 'legend', 'li', 'm', 'map', 'menu', 'meter',
+                           'multicol', 'nav', 'nextid', 'ol', 'output', 'optgroup', 'option',
+                           'p', 'pre', 'progress', 'q', 's', 'samp', 'section', 'select',
+                           'small', 'sound', 'source', 'spacer', 'span', 'strike', 'strong',
+                           'sub', 'sup', 'table', 'tbody', 'td', 'textarea', 'time', 'tfoot',
+                           'th', 'thead', 'tr', 'tt', 'u', 'ul', 'var', 'video']
+
+    mathml_elements = ['maction', 'math', 'merror', 'mfrac', 'mi',
+                       'mmultiscripts', 'mn', 'mo', 'mover', 'mpadded', 'mphantom',
+                       'mprescripts', 'mroot', 'mrow', 'mspace', 'msqrt', 'mstyle', 'msub',
+                       'msubsup', 'msup', 'mtable', 'mtd', 'mtext', 'mtr', 'munder',
+                       'munderover', 'none']
+
+    svg_elements = ['a', 'animate', 'animateColor', 'animateMotion',
+                    'animateTransform', 'clipPath', 'circle', 'defs', 'desc', 'ellipse',
+                    'font-face', 'font-face-name', 'font-face-src', 'g', 'glyph', 'hkern',
+                    'linearGradient', 'line', 'marker', 'metadata', 'missing-glyph',
+                    'mpath', 'path', 'polygon', 'polyline', 'radialGradient', 'rect',
+                    'set', 'stop', 'svg', 'switch', 'text', 'title', 'tspan', 'use']
+
+    acceptable_attributes = ['abbr', 'accept', 'accept-charset', 'accesskey',
+                             'action', 'align', 'alt', 'autocomplete', 'autofocus', 'axis',
+                             'background', 'balance', 'bgcolor', 'bgproperties', 'border',
+                             'bordercolor', 'bordercolordark', 'bordercolorlight', 'bottompadding',
+                             'cellpadding', 'cellspacing', 'ch', 'challenge', 'char', 'charoff',
+                             'choff', 'charset', 'checked', 'cite', 'class', 'clear', 'color',
+                             'cols', 'colspan', 'compact', 'contenteditable', 'controls', 'coords',
+                             'data', 'datafld', 'datapagesize', 'datasrc', 'datetime', 'default',
+                             'delay', 'dir', 'disabled', 'draggable', 'dynsrc', 'enctype', 'end',
+                             'face', 'for', 'form', 'frame', 'galleryimg', 'gutter', 'headers',
+                             'height', 'hidefocus', 'hidden', 'high', 'href', 'hreflang', 'hspace',
+                             'icon', 'id', 'inputmode', 'ismap', 'keytype', 'label', 'leftspacing',
+                             'lang', 'list', 'longdesc', 'loop', 'loopcount', 'loopend',
+                             'loopstart', 'low', 'lowsrc', 'max', 'maxlength', 'media', 'method',
+                             'min', 'multiple', 'name', 'nohref', 'noshade', 'nowrap', 'open',
+                             'optimum', 'pattern', 'ping', 'point-size', 'poster', 'pqg', 'preload',
+                             'prompt', 'radiogroup', 'readonly', 'rel', 'repeat-max', 'repeat-min',
+                             'replace', 'required', 'rev', 'rightspacing', 'rows', 'rowspan',
+                             'rules', 'scope', 'selected', 'shape', 'size', 'span', 'src', 'start',
+                             'step', 'style', 'summary', 'suppress', 'tabindex', 'target',
+                             'template', 'title', 'toppadding', 'type', 'unselectable', 'usemap',
+                             'urn', 'valign', 'value', 'variable', 'volume', 'vspace', 'vrml',
+                             'width', 'wrap', 'xml:lang']
+
+    mathml_attributes = ['actiontype', 'align', 'columnalign', 'columnalign',
+                         'columnalign', 'columnlines', 'columnspacing', 'columnspan', 'depth',
+                         'display', 'displaystyle', 'equalcolumns', 'equalrows', 'fence',
+                         'fontstyle', 'fontweight', 'frame', 'height', 'linethickness', 'lspace',
+                         'mathbackground', 'mathcolor', 'mathvariant', 'mathvariant', 'maxsize',
+                         'minsize', 'other', 'rowalign', 'rowalign', 'rowalign', 'rowlines',
+                         'rowspacing', 'rowspan', 'rspace', 'scriptlevel', 'selection',
+                         'separator', 'stretchy', 'width', 'width', 'xlink:href', 'xlink:show',
+                         'xlink:type', 'xmlns', 'xmlns:xlink']
+
+    svg_attributes = ['accent-height', 'accumulate', 'additive', 'alphabetic',
+                      'arabic-form', 'ascent', 'attributeName', 'attributeType',
+                      'baseProfile', 'bbox', 'begin', 'by', 'calcMode', 'cap-height',
+                      'class', 'clip-path', 'color', 'color-rendering', 'content', 'cx',
+                      'cy', 'd', 'dx', 'dy', 'descent', 'display', 'dur', 'end', 'fill',
+                      'fill-opacity', 'fill-rule', 'font-family', 'font-size',
+                      'font-stretch', 'font-style', 'font-variant', 'font-weight', 'from',
+                      'fx', 'fy', 'g1', 'g2', 'glyph-name', 'gradientUnits', 'hanging',
+                      'height', 'horiz-adv-x', 'horiz-origin-x', 'id', 'ideographic', 'k',
+                      'keyPoints', 'keySplines', 'keyTimes', 'lang', 'marker-end',
+                      'marker-mid', 'marker-start', 'markerHeight', 'markerUnits',
+                      'markerWidth', 'mathematical', 'max', 'min', 'name', 'offset',
+                      'opacity', 'orient', 'origin', 'overline-position',
+                      'overline-thickness', 'panose-1', 'path', 'pathLength', 'points',
+                      'preserveAspectRatio', 'r', 'refX', 'refY', 'repeatCount',
+                      'repeatDur', 'requiredExtensions', 'requiredFeatures', 'restart',
+                      'rotate', 'rx', 'ry', 'slope', 'stemh', 'stemv', 'stop-color',
+                      'stop-opacity', 'strikethrough-position', 'strikethrough-thickness',
+                      'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap',
+                      'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity',
+                      'stroke-width', 'systemLanguage', 'target', 'text-anchor', 'to',
+                      'transform', 'type', 'u1', 'u2', 'underline-position',
+                      'underline-thickness', 'unicode', 'unicode-range', 'units-per-em',
+                      'values', 'version', 'viewBox', 'visibility', 'width', 'widths', 'x',
+                      'x-height', 'x1', 'x2', 'xlink:actuate', 'xlink:arcrole',
+                      'xlink:href', 'xlink:role', 'xlink:show', 'xlink:title', 'xlink:type',
+                      'xml:base', 'xml:lang', 'xml:space', 'xmlns', 'xmlns:xlink', 'y',
+                      'y1', 'y2', 'zoomAndPan']
+
+    attr_val_is_uri = ['href', 'src', 'cite', 'action', 'longdesc', 'poster',
+                       'xlink:href', 'xml:base']
+
+    svg_attr_val_allows_ref = ['clip-path', 'color-profile', 'cursor', 'fill',
+                               'filter', 'marker', 'marker-start', 'marker-mid', 'marker-end',
+                               'mask', 'stroke']
+
+    svg_allow_local_href = ['altGlyph', 'animate', 'animateColor',
+                            'animateMotion', 'animateTransform', 'cursor', 'feImage', 'filter',
+                            'linearGradient', 'pattern', 'radialGradient', 'textpath', 'tref',
+                            'set', 'use']
+
+    acceptable_css_properties = ['azimuth', 'background-color',
+                                 'border-bottom-color', 'border-collapse', 'border-color',
+                                 'border-left-color', 'border-right-color', 'border-top-color', 'clear',
+                                 'color', 'cursor', 'direction', 'display', 'elevation', 'float', 'font',
+                                 'font-family', 'font-size', 'font-style', 'font-variant', 'font-weight',
+                                 'height', 'letter-spacing', 'line-height', 'overflow', 'pause',
+                                 'pause-after', 'pause-before', 'pitch', 'pitch-range', 'richness',
+                                 'speak', 'speak-header', 'speak-numeral', 'speak-punctuation',
+                                 'speech-rate', 'stress', 'text-align', 'text-decoration', 'text-indent',
+                                 'unicode-bidi', 'vertical-align', 'voice-family', 'volume',
+                                 'white-space', 'width']
+
+    acceptable_css_keywords = ['auto', 'aqua', 'black', 'block', 'blue',
+                               'bold', 'both', 'bottom', 'brown', 'center', 'collapse', 'dashed',
+                               'dotted', 'fuchsia', 'gray', 'green', '!important', 'italic', 'left',
+                               'lime', 'maroon', 'medium', 'none', 'navy', 'normal', 'nowrap', 'olive',
+                               'pointer', 'purple', 'red', 'right', 'solid', 'silver', 'teal', 'top',
+                               'transparent', 'underline', 'white', 'yellow']
+
+    acceptable_svg_properties = ['fill', 'fill-opacity', 'fill-rule',
+                                 'stroke', 'stroke-width', 'stroke-linecap', 'stroke-linejoin',
+                                 'stroke-opacity']
+
+    acceptable_protocols = ['ed2k', 'ftp', 'http', 'https', 'irc',
+                            'mailto', 'news', 'gopher', 'nntp', 'telnet', 'webcal',
+                            'xmpp', 'callto', 'feed', 'urn', 'aim', 'rsync', 'tag',
+                            'ssh', 'sftp', 'rtsp', 'afs']
+
+    # subclasses may define their own versions of these constants
+    allowed_elements = acceptable_elements + mathml_elements + svg_elements
+    allowed_attributes = acceptable_attributes + mathml_attributes + svg_attributes
+    allowed_css_properties = acceptable_css_properties
+    allowed_css_keywords = acceptable_css_keywords
+    allowed_svg_properties = acceptable_svg_properties
+    allowed_protocols = acceptable_protocols
+
+    # Sanitize the +html+, escaping all elements not in ALLOWED_ELEMENTS, and
+    # stripping out all # attributes not in ALLOWED_ATTRIBUTES. Style
+    # attributes are parsed, and a restricted set, # specified by
+    # ALLOWED_CSS_PROPERTIES and ALLOWED_CSS_KEYWORDS, are allowed through.
+    # attributes in ATTR_VAL_IS_URI are scanned, and only URI schemes specified
+    # in ALLOWED_PROTOCOLS are allowed.
+    #
+    #   sanitize_html('<script> do_nasty_stuff() </script>')
+    #    => &lt;script> do_nasty_stuff() &lt;/script>
+    #   sanitize_html('<a href="javascript: sucker();">Click here for $100</a>')
+    #    => <a>Click here for $100</a>
+    def sanitize_token(self, token):
+
+        # accommodate filters which use token_type differently
+        token_type = token["type"]
+        if token_type in list(tokenTypes.keys()):
+            token_type = tokenTypes[token_type]
+
+        if token_type in (tokenTypes["StartTag"], tokenTypes["EndTag"],
+                          tokenTypes["EmptyTag"]):
+            if token["name"] in self.allowed_elements:
+                return self.allowed_token(token, token_type)
+            else:
+                return self.disallowed_token(token, token_type)
+        elif token_type == tokenTypes["Comment"]:
+            pass
+        else:
+            return token
+
+    def allowed_token(self, token, token_type):
+        if "data" in token:
+            attrs = dict([(name, val) for name, val in
+                          token["data"][::-1]
+                          if name in self.allowed_attributes])
+            for attr in self.attr_val_is_uri:
+                if attr not in attrs:
+                    continue
+                val_unescaped = re.sub("[`\000-\040\177-\240\s]+", '',
+                                       unescape(attrs[attr])).lower()
+                # remove replacement characters from unescaped characters
+                val_unescaped = val_unescaped.replace("\ufffd", "")
+                if (re.match("^[a-z0-9][-+.a-z0-9]*:", val_unescaped) and
+                    (val_unescaped.split(':')[0] not in
+                     self.allowed_protocols)):
+                    del attrs[attr]
+            for attr in self.svg_attr_val_allows_ref:
+                if attr in attrs:
+                    attrs[attr] = re.sub(r'url\s*\(\s*[^#\s][^)]+?\)',
+                                         ' ',
+                                         unescape(attrs[attr]))
+            if (token["name"] in self.svg_allow_local_href and
+                'xlink:href' in attrs and re.search('^\s*[^#\s].*',
+                                                    attrs['xlink:href'])):
+                del attrs['xlink:href']
+            if 'style' in attrs:
+                attrs['style'] = self.sanitize_css(attrs['style'])
+            token["data"] = [[name, val] for name, val in list(attrs.items())]
+        return token
+
+    def disallowed_token(self, token, token_type):
+        if token_type == tokenTypes["EndTag"]:
+            token["data"] = "</%s>" % token["name"]
+        elif token["data"]:
+            attrs = ''.join([' %s="%s"' % (k, escape(v)) for k, v in token["data"]])
+            token["data"] = "<%s%s>" % (token["name"], attrs)
+        else:
+            token["data"] = "<%s>" % token["name"]
+        if token.get("selfClosing"):
+            token["data"] = token["data"][:-1] + "/>"
+
+        if token["type"] in list(tokenTypes.keys()):
+            token["type"] = "Characters"
+        else:
+            token["type"] = tokenTypes["Characters"]
+
+        del token["name"]
+        return token
+
+    def sanitize_css(self, style):
+        # disallow urls
+        style = re.compile('url\s*\(\s*[^\s)]+?\s*\)\s*').sub(' ', style)
+
+        # gauntlet
+        if not re.match("""^([:,;#%.\sa-zA-Z0-9!]|\w-\w|'[\s\w]+'|"[\s\w]+"|\([\d,\s]+\))*$""", style):
+            return ''
+        if not re.match("^\s*([-\w]+\s*:[^:;]*(;\s*|$))*$", style):
+            return ''
+
+        clean = []
+        for prop, value in re.findall("([-\w]+)\s*:\s*([^:;]*)", style):
+            if not value:
+                continue
+            if prop.lower() in self.allowed_css_properties:
+                clean.append(prop + ': ' + value + ';')
+            elif prop.split('-')[0].lower() in ['background', 'border', 'margin',
+                                                'padding']:
+                for keyword in value.split():
+                    if not keyword in self.acceptable_css_keywords and \
+                            not re.match("^(#[0-9a-f]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|\d{0,2}\.?\d{0,2}(cm|em|ex|in|mm|pc|pt|px|%|,|\))?)$", keyword):
+                        break
+                else:
+                    clean.append(prop + ': ' + value + ';')
+            elif prop.lower() in self.allowed_svg_properties:
+                clean.append(prop + ': ' + value + ';')
+
+        return ' '.join(clean)
+
+
+class HTMLSanitizer(HTMLTokenizer, HTMLSanitizerMixin):
+    def __init__(self, stream, encoding=None, parseMeta=True, useChardet=True,
+                 lowercaseElementName=False, lowercaseAttrName=False, parser=None):
+        # Change case matching defaults as we only output lowercase html anyway
+        # This solution doesn't seem ideal...
+        HTMLTokenizer.__init__(self, stream, encoding, parseMeta, useChardet,
+                               lowercaseElementName, lowercaseAttrName, parser=parser)
+
+    def __iter__(self):
+        for token in HTMLTokenizer.__iter__(self):
+            token = self.sanitize_token(token)
+            if token:
+                yield token
diff --git a/lib/html5lib/serializer.py b/lib/html5lib/serializer.py
deleted file mode 100644
index c66df683..00000000
--- a/lib/html5lib/serializer.py
+++ /dev/null
@@ -1,409 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-from six import text_type
-
-import re
-
-from codecs import register_error, xmlcharrefreplace_errors
-
-from .constants import voidElements, booleanAttributes, spaceCharacters
-from .constants import rcdataElements, entities, xmlEntities
-from . import treewalkers, _utils
-from xml.sax.saxutils import escape
-
-_quoteAttributeSpecChars = "".join(spaceCharacters) + "\"'=<>`"
-_quoteAttributeSpec = re.compile("[" + _quoteAttributeSpecChars + "]")
-_quoteAttributeLegacy = re.compile("[" + _quoteAttributeSpecChars +
-                                   "\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n"
-                                   "\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15"
-                                   "\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
-                                   "\x20\x2f\x60\xa0\u1680\u180e\u180f\u2000"
-                                   "\u2001\u2002\u2003\u2004\u2005\u2006\u2007"
-                                   "\u2008\u2009\u200a\u2028\u2029\u202f\u205f"
-                                   "\u3000]")
-
-
-_encode_entity_map = {}
-_is_ucs4 = len("\U0010FFFF") == 1
-for k, v in list(entities.items()):
-    # skip multi-character entities
-    if ((_is_ucs4 and len(v) > 1) or
-            (not _is_ucs4 and len(v) > 2)):
-        continue
-    if v != "&":
-        if len(v) == 2:
-            v = _utils.surrogatePairToCodepoint(v)
-        else:
-            v = ord(v)
-        if v not in _encode_entity_map or k.islower():
-            # prefer &lt; over &LT; and similarly for &amp;, &gt;, etc.
-            _encode_entity_map[v] = k
-
-
-def htmlentityreplace_errors(exc):
-    if isinstance(exc, (UnicodeEncodeError, UnicodeTranslateError)):
-        res = []
-        codepoints = []
-        skip = False
-        for i, c in enumerate(exc.object[exc.start:exc.end]):
-            if skip:
-                skip = False
-                continue
-            index = i + exc.start
-            if _utils.isSurrogatePair(exc.object[index:min([exc.end, index + 2])]):
-                codepoint = _utils.surrogatePairToCodepoint(exc.object[index:index + 2])
-                skip = True
-            else:
-                codepoint = ord(c)
-            codepoints.append(codepoint)
-        for cp in codepoints:
-            e = _encode_entity_map.get(cp)
-            if e:
-                res.append("&")
-                res.append(e)
-                if not e.endswith(";"):
-                    res.append(";")
-            else:
-                res.append("&#x%s;" % (hex(cp)[2:]))
-        return ("".join(res), exc.end)
-    else:
-        return xmlcharrefreplace_errors(exc)
-
-
-register_error("htmlentityreplace", htmlentityreplace_errors)
-
-
-def serialize(input, tree="etree", encoding=None, **serializer_opts):
-    """Serializes the input token stream using the specified treewalker
-
-    :arg input: the token stream to serialize
-
-    :arg tree: the treewalker to use
-
-    :arg encoding: the encoding to use
-
-    :arg serializer_opts: any options to pass to the
-        :py:class:`html5lib.serializer.HTMLSerializer` that gets created
-
-    :returns: the tree serialized as a string
-
-    Example:
-
-    >>> from html5lib.html5parser import parse
-    >>> from html5lib.serializer import serialize
-    >>> token_stream = parse('<html><body><p>Hi!</p></body></html>')
-    >>> serialize(token_stream, omit_optional_tags=False)
-    '<html><head></head><body><p>Hi!</p></body></html>'
-
-    """
-    # XXX: Should we cache this?
-    walker = treewalkers.getTreeWalker(tree)
-    s = HTMLSerializer(**serializer_opts)
-    return s.render(walker(input), encoding)
-
-
-class HTMLSerializer(object):
-
-    # attribute quoting options
-    quote_attr_values = "legacy"  # be secure by default
-    quote_char = '"'
-    use_best_quote_char = True
-
-    # tag syntax options
-    omit_optional_tags = True
-    minimize_boolean_attributes = True
-    use_trailing_solidus = False
-    space_before_trailing_solidus = True
-
-    # escaping options
-    escape_lt_in_attrs = False
-    escape_rcdata = False
-    resolve_entities = True
-
-    # miscellaneous options
-    alphabetical_attributes = False
-    inject_meta_charset = True
-    strip_whitespace = False
-    sanitize = False
-
-    options = ("quote_attr_values", "quote_char", "use_best_quote_char",
-               "omit_optional_tags", "minimize_boolean_attributes",
-               "use_trailing_solidus", "space_before_trailing_solidus",
-               "escape_lt_in_attrs", "escape_rcdata", "resolve_entities",
-               "alphabetical_attributes", "inject_meta_charset",
-               "strip_whitespace", "sanitize")
-
-    def __init__(self, **kwargs):
-        """Initialize HTMLSerializer
-
-        :arg inject_meta_charset: Whether or not to inject the meta charset.
-
-            Defaults to ``True``.
-
-        :arg quote_attr_values: Whether to quote attribute values that don't
-            require quoting per legacy browser behavior (``"legacy"``), when
-            required by the standard (``"spec"``), or always (``"always"``).
-
-            Defaults to ``"legacy"``.
-
-        :arg quote_char: Use given quote character for attribute quoting.
-
-            Defaults to ``"`` which will use double quotes unless attribute
-            value contains a double quote, in which case single quotes are
-            used.
-
-        :arg escape_lt_in_attrs: Whether or not to escape ``<`` in attribute
-            values.
-
-            Defaults to ``False``.
-
-        :arg escape_rcdata: Whether to escape characters that need to be
-            escaped within normal elements within rcdata elements such as
-            style.
-
-            Defaults to ``False``.
-
-        :arg resolve_entities: Whether to resolve named character entities that
-            appear in the source tree. The XML predefined entities &lt; &gt;
-            &amp; &quot; &apos; are unaffected by this setting.
-
-            Defaults to ``True``.
-
-        :arg strip_whitespace: Whether to remove semantically meaningless
-            whitespace. (This compresses all whitespace to a single space
-            except within ``pre``.)
-
-            Defaults to ``False``.
-
-        :arg minimize_boolean_attributes: Shortens boolean attributes to give
-            just the attribute value, for example::
-
-              <input disabled="disabled">
-
-            becomes::
-
-              <input disabled>
-
-            Defaults to ``True``.
-
-        :arg use_trailing_solidus: Includes a close-tag slash at the end of the
-            start tag of void elements (empty elements whose end tag is
-            forbidden). E.g. ``<hr/>``.
-
-            Defaults to ``False``.
-
-        :arg space_before_trailing_solidus: Places a space immediately before
-            the closing slash in a tag using a trailing solidus. E.g.
-            ``<hr />``. Requires ``use_trailing_solidus=True``.
-
-            Defaults to ``True``.
-
-        :arg sanitize: Strip all unsafe or unknown constructs from output.
-            See :py:class:`html5lib.filters.sanitizer.Filter`.
-
-            Defaults to ``False``.
-
-        :arg omit_optional_tags: Omit start/end tags that are optional.
-
-            Defaults to ``True``.
-
-        :arg alphabetical_attributes: Reorder attributes to be in alphabetical order.
-
-            Defaults to ``False``.
-
-        """
-        unexpected_args = frozenset(kwargs) - frozenset(self.options)
-        if len(unexpected_args) > 0:
-            raise TypeError("__init__() got an unexpected keyword argument '%s'" % next(iter(unexpected_args)))
-        if 'quote_char' in kwargs:
-            self.use_best_quote_char = False
-        for attr in self.options:
-            setattr(self, attr, kwargs.get(attr, getattr(self, attr)))
-        self.errors = []
-        self.strict = False
-
-    def encode(self, string):
-        assert(isinstance(string, text_type))
-        if self.encoding:
-            return string.encode(self.encoding, "htmlentityreplace")
-        else:
-            return string
-
-    def encodeStrict(self, string):
-        assert(isinstance(string, text_type))
-        if self.encoding:
-            return string.encode(self.encoding, "strict")
-        else:
-            return string
-
-    def serialize(self, treewalker, encoding=None):
-        # pylint:disable=too-many-nested-blocks
-        self.encoding = encoding
-        in_cdata = False
-        self.errors = []
-
-        if encoding and self.inject_meta_charset:
-            from .filters.inject_meta_charset import Filter
-            treewalker = Filter(treewalker, encoding)
-        # Alphabetical attributes is here under the assumption that none of
-        # the later filters add or change order of attributes; it needs to be
-        # before the sanitizer so escaped elements come out correctly
-        if self.alphabetical_attributes:
-            from .filters.alphabeticalattributes import Filter
-            treewalker = Filter(treewalker)
-        # WhitespaceFilter should be used before OptionalTagFilter
-        # for maximum efficiently of this latter filter
-        if self.strip_whitespace:
-            from .filters.whitespace import Filter
-            treewalker = Filter(treewalker)
-        if self.sanitize:
-            from .filters.sanitizer import Filter
-            treewalker = Filter(treewalker)
-        if self.omit_optional_tags:
-            from .filters.optionaltags import Filter
-            treewalker = Filter(treewalker)
-
-        for token in treewalker:
-            type = token["type"]
-            if type == "Doctype":
-                doctype = "<!DOCTYPE %s" % token["name"]
-
-                if token["publicId"]:
-                    doctype += ' PUBLIC "%s"' % token["publicId"]
-                elif token["systemId"]:
-                    doctype += " SYSTEM"
-                if token["systemId"]:
-                    if token["systemId"].find('"') >= 0:
-                        if token["systemId"].find("'") >= 0:
-                            self.serializeError("System identifier contains both single and double quote characters")
-                        quote_char = "'"
-                    else:
-                        quote_char = '"'
-                    doctype += " %s%s%s" % (quote_char, token["systemId"], quote_char)
-
-                doctype += ">"
-                yield self.encodeStrict(doctype)
-
-            elif type in ("Characters", "SpaceCharacters"):
-                if type == "SpaceCharacters" or in_cdata:
-                    if in_cdata and token["data"].find("</") >= 0:
-                        self.serializeError("Unexpected </ in CDATA")
-                    yield self.encode(token["data"])
-                else:
-                    yield self.encode(escape(token["data"]))
-
-            elif type in ("StartTag", "EmptyTag"):
-                name = token["name"]
-                yield self.encodeStrict("<%s" % name)
-                if name in rcdataElements and not self.escape_rcdata:
-                    in_cdata = True
-                elif in_cdata:
-                    self.serializeError("Unexpected child element of a CDATA element")
-                for (_, attr_name), attr_value in token["data"].items():
-                    # TODO: Add namespace support here
-                    k = attr_name
-                    v = attr_value
-                    yield self.encodeStrict(' ')
-
-                    yield self.encodeStrict(k)
-                    if not self.minimize_boolean_attributes or \
-                        (k not in booleanAttributes.get(name, tuple()) and
-                         k not in booleanAttributes.get("", tuple())):
-                        yield self.encodeStrict("=")
-                        if self.quote_attr_values == "always" or len(v) == 0:
-                            quote_attr = True
-                        elif self.quote_attr_values == "spec":
-                            quote_attr = _quoteAttributeSpec.search(v) is not None
-                        elif self.quote_attr_values == "legacy":
-                            quote_attr = _quoteAttributeLegacy.search(v) is not None
-                        else:
-                            raise ValueError("quote_attr_values must be one of: "
-                                             "'always', 'spec', or 'legacy'")
-                        v = v.replace("&", "&amp;")
-                        if self.escape_lt_in_attrs:
-                            v = v.replace("<", "&lt;")
-                        if quote_attr:
-                            quote_char = self.quote_char
-                            if self.use_best_quote_char:
-                                if "'" in v and '"' not in v:
-                                    quote_char = '"'
-                                elif '"' in v and "'" not in v:
-                                    quote_char = "'"
-                            if quote_char == "'":
-                                v = v.replace("'", "&#39;")
-                            else:
-                                v = v.replace('"', "&quot;")
-                            yield self.encodeStrict(quote_char)
-                            yield self.encode(v)
-                            yield self.encodeStrict(quote_char)
-                        else:
-                            yield self.encode(v)
-                if name in voidElements and self.use_trailing_solidus:
-                    if self.space_before_trailing_solidus:
-                        yield self.encodeStrict(" /")
-                    else:
-                        yield self.encodeStrict("/")
-                yield self.encode(">")
-
-            elif type == "EndTag":
-                name = token["name"]
-                if name in rcdataElements:
-                    in_cdata = False
-                elif in_cdata:
-                    self.serializeError("Unexpected child element of a CDATA element")
-                yield self.encodeStrict("</%s>" % name)
-
-            elif type == "Comment":
-                data = token["data"]
-                if data.find("--") >= 0:
-                    self.serializeError("Comment contains --")
-                yield self.encodeStrict("<!--%s-->" % token["data"])
-
-            elif type == "Entity":
-                name = token["name"]
-                key = name + ";"
-                if key not in entities:
-                    self.serializeError("Entity %s not recognized" % name)
-                if self.resolve_entities and key not in xmlEntities:
-                    data = entities[key]
-                else:
-                    data = "&%s;" % name
-                yield self.encodeStrict(data)
-
-            else:
-                self.serializeError(token["data"])
-
-    def render(self, treewalker, encoding=None):
-        """Serializes the stream from the treewalker into a string
-
-        :arg treewalker: the treewalker to serialize
-
-        :arg encoding: the string encoding to use
-
-        :returns: the serialized tree
-
-        Example:
-
-        >>> from html5lib import parse, getTreeWalker
-        >>> from html5lib.serializer import HTMLSerializer
-        >>> token_stream = parse('<html><body>Hi!</body></html>')
-        >>> walker = getTreeWalker('etree')
-        >>> serializer = HTMLSerializer(omit_optional_tags=False)
-        >>> serializer.render(walker(token_stream))
-        '<html><head></head><body>Hi!</body></html>'
-
-        """
-        if encoding:
-            return b"".join(list(self.serialize(treewalker, encoding)))
-        else:
-            return "".join(list(self.serialize(treewalker)))
-
-    def serializeError(self, data="XXX ERROR MESSAGE NEEDED"):
-        # XXX The idea is to make data mandatory.
-        self.errors.append(data)
-        if self.strict:
-            raise SerializeError
-
-
-class SerializeError(Exception):
-    """Error in serialized tree"""
-    pass
diff --git a/lib/html5lib/serializer/__init__.py b/lib/html5lib/serializer/__init__.py
new file mode 100644
index 00000000..8380839a
--- /dev/null
+++ b/lib/html5lib/serializer/__init__.py
@@ -0,0 +1,16 @@
+from __future__ import absolute_import, division, unicode_literals
+
+from .. import treewalkers
+
+from .htmlserializer import HTMLSerializer
+
+
+def serialize(input, tree="etree", format="html", encoding=None,
+              **serializer_opts):
+    # XXX: Should we cache this?
+    walker = treewalkers.getTreeWalker(tree)
+    if format == "html":
+        s = HTMLSerializer(**serializer_opts)
+    else:
+        raise ValueError("type must be html")
+    return s.render(walker(input), encoding)
diff --git a/lib/html5lib/serializer/htmlserializer.py b/lib/html5lib/serializer/htmlserializer.py
new file mode 100644
index 00000000..412a5a22
--- /dev/null
+++ b/lib/html5lib/serializer/htmlserializer.py
@@ -0,0 +1,320 @@
+from __future__ import absolute_import, division, unicode_literals
+from six import text_type
+
+import gettext
+_ = gettext.gettext
+
+try:
+    from functools import reduce
+except ImportError:
+    pass
+
+from ..constants import voidElements, booleanAttributes, spaceCharacters
+from ..constants import rcdataElements, entities, xmlEntities
+from .. import utils
+from xml.sax.saxutils import escape
+
+spaceCharacters = "".join(spaceCharacters)
+
+try:
+    from codecs import register_error, xmlcharrefreplace_errors
+except ImportError:
+    unicode_encode_errors = "strict"
+else:
+    unicode_encode_errors = "htmlentityreplace"
+
+    encode_entity_map = {}
+    is_ucs4 = len("\U0010FFFF") == 1
+    for k, v in list(entities.items()):
+        # skip multi-character entities
+        if ((is_ucs4 and len(v) > 1) or
+                (not is_ucs4 and len(v) > 2)):
+            continue
+        if v != "&":
+            if len(v) == 2:
+                v = utils.surrogatePairToCodepoint(v)
+            else:
+                v = ord(v)
+            if not v in encode_entity_map or k.islower():
+                # prefer &lt; over &LT; and similarly for &amp;, &gt;, etc.
+                encode_entity_map[v] = k
+
+    def htmlentityreplace_errors(exc):
+        if isinstance(exc, (UnicodeEncodeError, UnicodeTranslateError)):
+            res = []
+            codepoints = []
+            skip = False
+            for i, c in enumerate(exc.object[exc.start:exc.end]):
+                if skip:
+                    skip = False
+                    continue
+                index = i + exc.start
+                if utils.isSurrogatePair(exc.object[index:min([exc.end, index + 2])]):
+                    codepoint = utils.surrogatePairToCodepoint(exc.object[index:index + 2])
+                    skip = True
+                else:
+                    codepoint = ord(c)
+                codepoints.append(codepoint)
+            for cp in codepoints:
+                e = encode_entity_map.get(cp)
+                if e:
+                    res.append("&")
+                    res.append(e)
+                    if not e.endswith(";"):
+                        res.append(";")
+                else:
+                    res.append("&#x%s;" % (hex(cp)[2:]))
+            return ("".join(res), exc.end)
+        else:
+            return xmlcharrefreplace_errors(exc)
+
+    register_error(unicode_encode_errors, htmlentityreplace_errors)
+
+    del register_error
+
+
+class HTMLSerializer(object):
+
+    # attribute quoting options
+    quote_attr_values = False
+    quote_char = '"'
+    use_best_quote_char = True
+
+    # tag syntax options
+    omit_optional_tags = True
+    minimize_boolean_attributes = True
+    use_trailing_solidus = False
+    space_before_trailing_solidus = True
+
+    # escaping options
+    escape_lt_in_attrs = False
+    escape_rcdata = False
+    resolve_entities = True
+
+    # miscellaneous options
+    alphabetical_attributes = False
+    inject_meta_charset = True
+    strip_whitespace = False
+    sanitize = False
+
+    options = ("quote_attr_values", "quote_char", "use_best_quote_char",
+               "omit_optional_tags", "minimize_boolean_attributes",
+               "use_trailing_solidus", "space_before_trailing_solidus",
+               "escape_lt_in_attrs", "escape_rcdata", "resolve_entities",
+               "alphabetical_attributes", "inject_meta_charset",
+               "strip_whitespace", "sanitize")
+
+    def __init__(self, **kwargs):
+        """Initialize HTMLSerializer.
+
+        Keyword options (default given first unless specified) include:
+
+        inject_meta_charset=True|False
+          Whether it insert a meta element to define the character set of the
+          document.
+        quote_attr_values=True|False
+          Whether to quote attribute values that don't require quoting
+          per HTML5 parsing rules.
+        quote_char=u'"'|u"'"
+          Use given quote character for attribute quoting. Default is to
+          use double quote unless attribute value contains a double quote,
+          in which case single quotes are used instead.
+        escape_lt_in_attrs=False|True
+          Whether to escape < in attribute values.
+        escape_rcdata=False|True
+          Whether to escape characters that need to be escaped within normal
+          elements within rcdata elements such as style.
+        resolve_entities=True|False
+          Whether to resolve named character entities that appear in the
+          source tree. The XML predefined entities &lt; &gt; &amp; &quot; &apos;
+          are unaffected by this setting.
+        strip_whitespace=False|True
+          Whether to remove semantically meaningless whitespace. (This
+          compresses all whitespace to a single space except within pre.)
+        minimize_boolean_attributes=True|False
+          Shortens boolean attributes to give just the attribute value,
+          for example <input disabled="disabled"> becomes <input disabled>.
+        use_trailing_solidus=False|True
+          Includes a close-tag slash at the end of the start tag of void
+          elements (empty elements whose end tag is forbidden). E.g. <hr/>.
+        space_before_trailing_solidus=True|False
+          Places a space immediately before the closing slash in a tag
+          using a trailing solidus. E.g. <hr />. Requires use_trailing_solidus.
+        sanitize=False|True
+          Strip all unsafe or unknown constructs from output.
+          See `html5lib user documentation`_
+        omit_optional_tags=True|False
+          Omit start/end tags that are optional.
+        alphabetical_attributes=False|True
+          Reorder attributes to be in alphabetical order.
+
+        .. _html5lib user documentation: http://code.google.com/p/html5lib/wiki/UserDocumentation
+        """
+        if 'quote_char' in kwargs:
+            self.use_best_quote_char = False
+        for attr in self.options:
+            setattr(self, attr, kwargs.get(attr, getattr(self, attr)))
+        self.errors = []
+        self.strict = False
+
+    def encode(self, string):
+        assert(isinstance(string, text_type))
+        if self.encoding:
+            return string.encode(self.encoding, unicode_encode_errors)
+        else:
+            return string
+
+    def encodeStrict(self, string):
+        assert(isinstance(string, text_type))
+        if self.encoding:
+            return string.encode(self.encoding, "strict")
+        else:
+            return string
+
+    def serialize(self, treewalker, encoding=None):
+        self.encoding = encoding
+        in_cdata = False
+        self.errors = []
+
+        if encoding and self.inject_meta_charset:
+            from ..filters.inject_meta_charset import Filter
+            treewalker = Filter(treewalker, encoding)
+        # WhitespaceFilter should be used before OptionalTagFilter
+        # for maximum efficiently of this latter filter
+        if self.strip_whitespace:
+            from ..filters.whitespace import Filter
+            treewalker = Filter(treewalker)
+        if self.sanitize:
+            from ..filters.sanitizer import Filter
+            treewalker = Filter(treewalker)
+        if self.omit_optional_tags:
+            from ..filters.optionaltags import Filter
+            treewalker = Filter(treewalker)
+        # Alphabetical attributes must be last, as other filters
+        # could add attributes and alter the order
+        if self.alphabetical_attributes:
+            from ..filters.alphabeticalattributes import Filter
+            treewalker = Filter(treewalker)
+
+        for token in treewalker:
+            type = token["type"]
+            if type == "Doctype":
+                doctype = "<!DOCTYPE %s" % token["name"]
+
+                if token["publicId"]:
+                    doctype += ' PUBLIC "%s"' % token["publicId"]
+                elif token["systemId"]:
+                    doctype += " SYSTEM"
+                if token["systemId"]:
+                    if token["systemId"].find('"') >= 0:
+                        if token["systemId"].find("'") >= 0:
+                            self.serializeError(_("System identifer contains both single and double quote characters"))
+                        quote_char = "'"
+                    else:
+                        quote_char = '"'
+                    doctype += " %s%s%s" % (quote_char, token["systemId"], quote_char)
+
+                doctype += ">"
+                yield self.encodeStrict(doctype)
+
+            elif type in ("Characters", "SpaceCharacters"):
+                if type == "SpaceCharacters" or in_cdata:
+                    if in_cdata and token["data"].find("</") >= 0:
+                        self.serializeError(_("Unexpected </ in CDATA"))
+                    yield self.encode(token["data"])
+                else:
+                    yield self.encode(escape(token["data"]))
+
+            elif type in ("StartTag", "EmptyTag"):
+                name = token["name"]
+                yield self.encodeStrict("<%s" % name)
+                if name in rcdataElements and not self.escape_rcdata:
+                    in_cdata = True
+                elif in_cdata:
+                    self.serializeError(_("Unexpected child element of a CDATA element"))
+                for (attr_namespace, attr_name), attr_value in token["data"].items():
+                    # TODO: Add namespace support here
+                    k = attr_name
+                    v = attr_value
+                    yield self.encodeStrict(' ')
+
+                    yield self.encodeStrict(k)
+                    if not self.minimize_boolean_attributes or \
+                        (k not in booleanAttributes.get(name, tuple())
+                         and k not in booleanAttributes.get("", tuple())):
+                        yield self.encodeStrict("=")
+                        if self.quote_attr_values or not v:
+                            quote_attr = True
+                        else:
+                            quote_attr = reduce(lambda x, y: x or (y in v),
+                                                spaceCharacters + ">\"'=", False)
+                        v = v.replace("&", "&amp;")
+                        if self.escape_lt_in_attrs:
+                            v = v.replace("<", "&lt;")
+                        if quote_attr:
+                            quote_char = self.quote_char
+                            if self.use_best_quote_char:
+                                if "'" in v and '"' not in v:
+                                    quote_char = '"'
+                                elif '"' in v and "'" not in v:
+                                    quote_char = "'"
+                            if quote_char == "'":
+                                v = v.replace("'", "&#39;")
+                            else:
+                                v = v.replace('"', "&quot;")
+                            yield self.encodeStrict(quote_char)
+                            yield self.encode(v)
+                            yield self.encodeStrict(quote_char)
+                        else:
+                            yield self.encode(v)
+                if name in voidElements and self.use_trailing_solidus:
+                    if self.space_before_trailing_solidus:
+                        yield self.encodeStrict(" /")
+                    else:
+                        yield self.encodeStrict("/")
+                yield self.encode(">")
+
+            elif type == "EndTag":
+                name = token["name"]
+                if name in rcdataElements:
+                    in_cdata = False
+                elif in_cdata:
+                    self.serializeError(_("Unexpected child element of a CDATA element"))
+                yield self.encodeStrict("</%s>" % name)
+
+            elif type == "Comment":
+                data = token["data"]
+                if data.find("--") >= 0:
+                    self.serializeError(_("Comment contains --"))
+                yield self.encodeStrict("<!--%s-->" % token["data"])
+
+            elif type == "Entity":
+                name = token["name"]
+                key = name + ";"
+                if not key in entities:
+                    self.serializeError(_("Entity %s not recognized" % name))
+                if self.resolve_entities and key not in xmlEntities:
+                    data = entities[key]
+                else:
+                    data = "&%s;" % name
+                yield self.encodeStrict(data)
+
+            else:
+                self.serializeError(token["data"])
+
+    def render(self, treewalker, encoding=None):
+        if encoding:
+            return b"".join(list(self.serialize(treewalker, encoding)))
+        else:
+            return "".join(list(self.serialize(treewalker)))
+
+    def serializeError(self, data="XXX ERROR MESSAGE NEEDED"):
+        # XXX The idea is to make data mandatory.
+        self.errors.append(data)
+        if self.strict:
+            raise SerializeError
+
+
+def SerializeError(Exception):
+    """Error in serialized tree"""
+    pass
diff --git a/lib/html5lib/tokenizer.py b/lib/html5lib/tokenizer.py
new file mode 100644
index 00000000..79774578
--- /dev/null
+++ b/lib/html5lib/tokenizer.py
@@ -0,0 +1,1731 @@
+from __future__ import absolute_import, division, unicode_literals
+
+try:
+    chr = unichr # flake8: noqa
+except NameError:
+    pass
+
+from collections import deque
+
+from .constants import spaceCharacters
+from .constants import entities
+from .constants import asciiLetters, asciiUpper2Lower
+from .constants import digits, hexDigits, EOF
+from .constants import tokenTypes, tagTokenTypes
+from .constants import replacementCharacters
+
+from .inputstream import HTMLInputStream
+
+from .trie import Trie
+
+entitiesTrie = Trie(entities)
+
+
+class HTMLTokenizer(object):
+    """ This class takes care of tokenizing HTML.
+
+    * self.currentToken
+      Holds the token that is currently being processed.
+
+    * self.state
+      Holds a reference to the method to be invoked... XXX
+
+    * self.stream
+      Points to HTMLInputStream object.
+    """
+
+    def __init__(self, stream, encoding=None, parseMeta=True, useChardet=True,
+                 lowercaseElementName=True, lowercaseAttrName=True, parser=None):
+
+        self.stream = HTMLInputStream(stream, encoding, parseMeta, useChardet)
+        self.parser = parser
+
+        # Perform case conversions?
+        self.lowercaseElementName = lowercaseElementName
+        self.lowercaseAttrName = lowercaseAttrName
+
+        # Setup the initial tokenizer state
+        self.escapeFlag = False
+        self.lastFourChars = []
+        self.state = self.dataState
+        self.escape = False
+
+        # The current token being created
+        self.currentToken = None
+        super(HTMLTokenizer, self).__init__()
+
+    def __iter__(self):
+        """ This is where the magic happens.
+
+        We do our usually processing through the states and when we have a token
+        to return we yield the token which pauses processing until the next token
+        is requested.
+        """
+        self.tokenQueue = deque([])
+        # Start processing. When EOF is reached self.state will return False
+        # instead of True and the loop will terminate.
+        while self.state():
+            while self.stream.errors:
+                yield {"type": tokenTypes["ParseError"], "data": self.stream.errors.pop(0)}
+            while self.tokenQueue:
+                yield self.tokenQueue.popleft()
+
+    def consumeNumberEntity(self, isHex):
+        """This function returns either U+FFFD or the character based on the
+        decimal or hexadecimal representation. It also discards ";" if present.
+        If not present self.tokenQueue.append({"type": tokenTypes["ParseError"]}) is invoked.
+        """
+
+        allowed = digits
+        radix = 10
+        if isHex:
+            allowed = hexDigits
+            radix = 16
+
+        charStack = []
+
+        # Consume all the characters that are in range while making sure we
+        # don't hit an EOF.
+        c = self.stream.char()
+        while c in allowed and c is not EOF:
+            charStack.append(c)
+            c = self.stream.char()
+
+        # Convert the set of characters consumed to an int.
+        charAsInt = int("".join(charStack), radix)
+
+        # Certain characters get replaced with others
+        if charAsInt in replacementCharacters:
+            char = replacementCharacters[charAsInt]
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "illegal-codepoint-for-numeric-entity",
+                                    "datavars": {"charAsInt": charAsInt}})
+        elif ((0xD800 <= charAsInt <= 0xDFFF) or
+              (charAsInt > 0x10FFFF)):
+            char = "\uFFFD"
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "illegal-codepoint-for-numeric-entity",
+                                    "datavars": {"charAsInt": charAsInt}})
+        else:
+            # Should speed up this check somehow (e.g. move the set to a constant)
+            if ((0x0001 <= charAsInt <= 0x0008) or
+                (0x000E <= charAsInt <= 0x001F) or
+                (0x007F <= charAsInt <= 0x009F) or
+                (0xFDD0 <= charAsInt <= 0xFDEF) or
+                charAsInt in frozenset([0x000B, 0xFFFE, 0xFFFF, 0x1FFFE,
+                                        0x1FFFF, 0x2FFFE, 0x2FFFF, 0x3FFFE,
+                                        0x3FFFF, 0x4FFFE, 0x4FFFF, 0x5FFFE,
+                                        0x5FFFF, 0x6FFFE, 0x6FFFF, 0x7FFFE,
+                                        0x7FFFF, 0x8FFFE, 0x8FFFF, 0x9FFFE,
+                                        0x9FFFF, 0xAFFFE, 0xAFFFF, 0xBFFFE,
+                                        0xBFFFF, 0xCFFFE, 0xCFFFF, 0xDFFFE,
+                                        0xDFFFF, 0xEFFFE, 0xEFFFF, 0xFFFFE,
+                                        0xFFFFF, 0x10FFFE, 0x10FFFF])):
+                self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                        "data":
+                                        "illegal-codepoint-for-numeric-entity",
+                                        "datavars": {"charAsInt": charAsInt}})
+            try:
+                # Try/except needed as UCS-2 Python builds' unichar only works
+                # within the BMP.
+                char = chr(charAsInt)
+            except ValueError:
+                v = charAsInt - 0x10000
+                char = chr(0xD800 | (v >> 10)) + chr(0xDC00 | (v & 0x3FF))
+
+        # Discard the ; if present. Otherwise, put it back on the queue and
+        # invoke parseError on parser.
+        if c != ";":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "numeric-entity-without-semicolon"})
+            self.stream.unget(c)
+
+        return char
+
+    def consumeEntity(self, allowedChar=None, fromAttribute=False):
+        # Initialise to the default output for when no entity is matched
+        output = "&"
+
+        charStack = [self.stream.char()]
+        if (charStack[0] in spaceCharacters or charStack[0] in (EOF, "<", "&")
+                or (allowedChar is not None and allowedChar == charStack[0])):
+            self.stream.unget(charStack[0])
+
+        elif charStack[0] == "#":
+            # Read the next character to see if it's hex or decimal
+            hex = False
+            charStack.append(self.stream.char())
+            if charStack[-1] in ("x", "X"):
+                hex = True
+                charStack.append(self.stream.char())
+
+            # charStack[-1] should be the first digit
+            if (hex and charStack[-1] in hexDigits) \
+                    or (not hex and charStack[-1] in digits):
+                # At least one digit found, so consume the whole number
+                self.stream.unget(charStack[-1])
+                output = self.consumeNumberEntity(hex)
+            else:
+                # No digits found
+                self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                        "data": "expected-numeric-entity"})
+                self.stream.unget(charStack.pop())
+                output = "&" + "".join(charStack)
+
+        else:
+            # At this point in the process might have named entity. Entities
+            # are stored in the global variable "entities".
+            #
+            # Consume characters and compare to these to a substring of the
+            # entity names in the list until the substring no longer matches.
+            while (charStack[-1] is not EOF):
+                if not entitiesTrie.has_keys_with_prefix("".join(charStack)):
+                    break
+                charStack.append(self.stream.char())
+
+            # At this point we have a string that starts with some characters
+            # that may match an entity
+            # Try to find the longest entity the string will match to take care
+            # of &noti for instance.
+            try:
+                entityName = entitiesTrie.longest_prefix("".join(charStack[:-1]))
+                entityLength = len(entityName)
+            except KeyError:
+                entityName = None
+
+            if entityName is not None:
+                if entityName[-1] != ";":
+                    self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                            "named-entity-without-semicolon"})
+                if (entityName[-1] != ";" and fromAttribute and
+                    (charStack[entityLength] in asciiLetters or
+                     charStack[entityLength] in digits or
+                     charStack[entityLength] == "=")):
+                    self.stream.unget(charStack.pop())
+                    output = "&" + "".join(charStack)
+                else:
+                    output = entities[entityName]
+                    self.stream.unget(charStack.pop())
+                    output += "".join(charStack[entityLength:])
+            else:
+                self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                        "expected-named-entity"})
+                self.stream.unget(charStack.pop())
+                output = "&" + "".join(charStack)
+
+        if fromAttribute:
+            self.currentToken["data"][-1][1] += output
+        else:
+            if output in spaceCharacters:
+                tokenType = "SpaceCharacters"
+            else:
+                tokenType = "Characters"
+            self.tokenQueue.append({"type": tokenTypes[tokenType], "data": output})
+
+    def processEntityInAttribute(self, allowedChar):
+        """This method replaces the need for "entityInAttributeValueState".
+        """
+        self.consumeEntity(allowedChar=allowedChar, fromAttribute=True)
+
+    def emitCurrentToken(self):
+        """This method is a generic handler for emitting the tags. It also sets
+        the state to "data" because that's what's needed after a token has been
+        emitted.
+        """
+        token = self.currentToken
+        # Add token to the queue to be yielded
+        if (token["type"] in tagTokenTypes):
+            if self.lowercaseElementName:
+                token["name"] = token["name"].translate(asciiUpper2Lower)
+            if token["type"] == tokenTypes["EndTag"]:
+                if token["data"]:
+                    self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                            "data": "attributes-in-end-tag"})
+                if token["selfClosing"]:
+                    self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                            "data": "self-closing-flag-on-end-tag"})
+        self.tokenQueue.append(token)
+        self.state = self.dataState
+
+    # Below are the various tokenizer states worked out.
+    def dataState(self):
+        data = self.stream.char()
+        if data == "&":
+            self.state = self.entityDataState
+        elif data == "<":
+            self.state = self.tagOpenState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "\u0000"})
+        elif data is EOF:
+            # Tokenization ends.
+            return False
+        elif data in spaceCharacters:
+            # Directly after emitting a token you switch back to the "data
+            # state". At that point spaceCharacters are important so they are
+            # emitted separately.
+            self.tokenQueue.append({"type": tokenTypes["SpaceCharacters"], "data":
+                                    data + self.stream.charsUntil(spaceCharacters, True)})
+            # No need to update lastFourChars here, since the first space will
+            # have already been appended to lastFourChars and will have broken
+            # any <!-- or --> sequences
+        else:
+            chars = self.stream.charsUntil(("&", "<", "\u0000"))
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
+                                    data + chars})
+        return True
+
+    def entityDataState(self):
+        self.consumeEntity()
+        self.state = self.dataState
+        return True
+
+    def rcdataState(self):
+        data = self.stream.char()
+        if data == "&":
+            self.state = self.characterReferenceInRcdata
+        elif data == "<":
+            self.state = self.rcdataLessThanSignState
+        elif data == EOF:
+            # Tokenization ends.
+            return False
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "\uFFFD"})
+        elif data in spaceCharacters:
+            # Directly after emitting a token you switch back to the "data
+            # state". At that point spaceCharacters are important so they are
+            # emitted separately.
+            self.tokenQueue.append({"type": tokenTypes["SpaceCharacters"], "data":
+                                    data + self.stream.charsUntil(spaceCharacters, True)})
+            # No need to update lastFourChars here, since the first space will
+            # have already been appended to lastFourChars and will have broken
+            # any <!-- or --> sequences
+        else:
+            chars = self.stream.charsUntil(("&", "<", "\u0000"))
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
+                                    data + chars})
+        return True
+
+    def characterReferenceInRcdata(self):
+        self.consumeEntity()
+        self.state = self.rcdataState
+        return True
+
+    def rawtextState(self):
+        data = self.stream.char()
+        if data == "<":
+            self.state = self.rawtextLessThanSignState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "\uFFFD"})
+        elif data == EOF:
+            # Tokenization ends.
+            return False
+        else:
+            chars = self.stream.charsUntil(("<", "\u0000"))
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
+                                    data + chars})
+        return True
+
+    def scriptDataState(self):
+        data = self.stream.char()
+        if data == "<":
+            self.state = self.scriptDataLessThanSignState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "\uFFFD"})
+        elif data == EOF:
+            # Tokenization ends.
+            return False
+        else:
+            chars = self.stream.charsUntil(("<", "\u0000"))
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
+                                    data + chars})
+        return True
+
+    def plaintextState(self):
+        data = self.stream.char()
+        if data == EOF:
+            # Tokenization ends.
+            return False
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "\uFFFD"})
+        else:
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
+                                    data + self.stream.charsUntil("\u0000")})
+        return True
+
+    def tagOpenState(self):
+        data = self.stream.char()
+        if data == "!":
+            self.state = self.markupDeclarationOpenState
+        elif data == "/":
+            self.state = self.closeTagOpenState
+        elif data in asciiLetters:
+            self.currentToken = {"type": tokenTypes["StartTag"],
+                                 "name": data, "data": [],
+                                 "selfClosing": False,
+                                 "selfClosingAcknowledged": False}
+            self.state = self.tagNameState
+        elif data == ">":
+            # XXX In theory it could be something besides a tag name. But
+            # do we really care?
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "expected-tag-name-but-got-right-bracket"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<>"})
+            self.state = self.dataState
+        elif data == "?":
+            # XXX In theory it could be something besides a tag name. But
+            # do we really care?
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "expected-tag-name-but-got-question-mark"})
+            self.stream.unget(data)
+            self.state = self.bogusCommentState
+        else:
+            # XXX
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "expected-tag-name"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
+            self.stream.unget(data)
+            self.state = self.dataState
+        return True
+
+    def closeTagOpenState(self):
+        data = self.stream.char()
+        if data in asciiLetters:
+            self.currentToken = {"type": tokenTypes["EndTag"], "name": data,
+                                 "data": [], "selfClosing": False}
+            self.state = self.tagNameState
+        elif data == ">":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "expected-closing-tag-but-got-right-bracket"})
+            self.state = self.dataState
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "expected-closing-tag-but-got-eof"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "</"})
+            self.state = self.dataState
+        else:
+            # XXX data can be _'_...
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "expected-closing-tag-but-got-char",
+                                    "datavars": {"data": data}})
+            self.stream.unget(data)
+            self.state = self.bogusCommentState
+        return True
+
+    def tagNameState(self):
+        data = self.stream.char()
+        if data in spaceCharacters:
+            self.state = self.beforeAttributeNameState
+        elif data == ">":
+            self.emitCurrentToken()
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-tag-name"})
+            self.state = self.dataState
+        elif data == "/":
+            self.state = self.selfClosingStartTagState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["name"] += "\uFFFD"
+        else:
+            self.currentToken["name"] += data
+            # (Don't use charsUntil here, because tag names are
+            # very short and it's faster to not do anything fancy)
+        return True
+
+    def rcdataLessThanSignState(self):
+        data = self.stream.char()
+        if data == "/":
+            self.temporaryBuffer = ""
+            self.state = self.rcdataEndTagOpenState
+        else:
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
+            self.stream.unget(data)
+            self.state = self.rcdataState
+        return True
+
+    def rcdataEndTagOpenState(self):
+        data = self.stream.char()
+        if data in asciiLetters:
+            self.temporaryBuffer += data
+            self.state = self.rcdataEndTagNameState
+        else:
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "</"})
+            self.stream.unget(data)
+            self.state = self.rcdataState
+        return True
+
+    def rcdataEndTagNameState(self):
+        appropriate = self.currentToken and self.currentToken["name"].lower() == self.temporaryBuffer.lower()
+        data = self.stream.char()
+        if data in spaceCharacters and appropriate:
+            self.currentToken = {"type": tokenTypes["EndTag"],
+                                 "name": self.temporaryBuffer,
+                                 "data": [], "selfClosing": False}
+            self.state = self.beforeAttributeNameState
+        elif data == "/" and appropriate:
+            self.currentToken = {"type": tokenTypes["EndTag"],
+                                 "name": self.temporaryBuffer,
+                                 "data": [], "selfClosing": False}
+            self.state = self.selfClosingStartTagState
+        elif data == ">" and appropriate:
+            self.currentToken = {"type": tokenTypes["EndTag"],
+                                 "name": self.temporaryBuffer,
+                                 "data": [], "selfClosing": False}
+            self.emitCurrentToken()
+            self.state = self.dataState
+        elif data in asciiLetters:
+            self.temporaryBuffer += data
+        else:
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "</" + self.temporaryBuffer})
+            self.stream.unget(data)
+            self.state = self.rcdataState
+        return True
+
+    def rawtextLessThanSignState(self):
+        data = self.stream.char()
+        if data == "/":
+            self.temporaryBuffer = ""
+            self.state = self.rawtextEndTagOpenState
+        else:
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
+            self.stream.unget(data)
+            self.state = self.rawtextState
+        return True
+
+    def rawtextEndTagOpenState(self):
+        data = self.stream.char()
+        if data in asciiLetters:
+            self.temporaryBuffer += data
+            self.state = self.rawtextEndTagNameState
+        else:
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "</"})
+            self.stream.unget(data)
+            self.state = self.rawtextState
+        return True
+
+    def rawtextEndTagNameState(self):
+        appropriate = self.currentToken and self.currentToken["name"].lower() == self.temporaryBuffer.lower()
+        data = self.stream.char()
+        if data in spaceCharacters and appropriate:
+            self.currentToken = {"type": tokenTypes["EndTag"],
+                                 "name": self.temporaryBuffer,
+                                 "data": [], "selfClosing": False}
+            self.state = self.beforeAttributeNameState
+        elif data == "/" and appropriate:
+            self.currentToken = {"type": tokenTypes["EndTag"],
+                                 "name": self.temporaryBuffer,
+                                 "data": [], "selfClosing": False}
+            self.state = self.selfClosingStartTagState
+        elif data == ">" and appropriate:
+            self.currentToken = {"type": tokenTypes["EndTag"],
+                                 "name": self.temporaryBuffer,
+                                 "data": [], "selfClosing": False}
+            self.emitCurrentToken()
+            self.state = self.dataState
+        elif data in asciiLetters:
+            self.temporaryBuffer += data
+        else:
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "</" + self.temporaryBuffer})
+            self.stream.unget(data)
+            self.state = self.rawtextState
+        return True
+
+    def scriptDataLessThanSignState(self):
+        data = self.stream.char()
+        if data == "/":
+            self.temporaryBuffer = ""
+            self.state = self.scriptDataEndTagOpenState
+        elif data == "!":
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<!"})
+            self.state = self.scriptDataEscapeStartState
+        else:
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
+            self.stream.unget(data)
+            self.state = self.scriptDataState
+        return True
+
+    def scriptDataEndTagOpenState(self):
+        data = self.stream.char()
+        if data in asciiLetters:
+            self.temporaryBuffer += data
+            self.state = self.scriptDataEndTagNameState
+        else:
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "</"})
+            self.stream.unget(data)
+            self.state = self.scriptDataState
+        return True
+
+    def scriptDataEndTagNameState(self):
+        appropriate = self.currentToken and self.currentToken["name"].lower() == self.temporaryBuffer.lower()
+        data = self.stream.char()
+        if data in spaceCharacters and appropriate:
+            self.currentToken = {"type": tokenTypes["EndTag"],
+                                 "name": self.temporaryBuffer,
+                                 "data": [], "selfClosing": False}
+            self.state = self.beforeAttributeNameState
+        elif data == "/" and appropriate:
+            self.currentToken = {"type": tokenTypes["EndTag"],
+                                 "name": self.temporaryBuffer,
+                                 "data": [], "selfClosing": False}
+            self.state = self.selfClosingStartTagState
+        elif data == ">" and appropriate:
+            self.currentToken = {"type": tokenTypes["EndTag"],
+                                 "name": self.temporaryBuffer,
+                                 "data": [], "selfClosing": False}
+            self.emitCurrentToken()
+            self.state = self.dataState
+        elif data in asciiLetters:
+            self.temporaryBuffer += data
+        else:
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "</" + self.temporaryBuffer})
+            self.stream.unget(data)
+            self.state = self.scriptDataState
+        return True
+
+    def scriptDataEscapeStartState(self):
+        data = self.stream.char()
+        if data == "-":
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
+            self.state = self.scriptDataEscapeStartDashState
+        else:
+            self.stream.unget(data)
+            self.state = self.scriptDataState
+        return True
+
+    def scriptDataEscapeStartDashState(self):
+        data = self.stream.char()
+        if data == "-":
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
+            self.state = self.scriptDataEscapedDashDashState
+        else:
+            self.stream.unget(data)
+            self.state = self.scriptDataState
+        return True
+
+    def scriptDataEscapedState(self):
+        data = self.stream.char()
+        if data == "-":
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
+            self.state = self.scriptDataEscapedDashState
+        elif data == "<":
+            self.state = self.scriptDataEscapedLessThanSignState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "\uFFFD"})
+        elif data == EOF:
+            self.state = self.dataState
+        else:
+            chars = self.stream.charsUntil(("<", "-", "\u0000"))
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data":
+                                    data + chars})
+        return True
+
+    def scriptDataEscapedDashState(self):
+        data = self.stream.char()
+        if data == "-":
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
+            self.state = self.scriptDataEscapedDashDashState
+        elif data == "<":
+            self.state = self.scriptDataEscapedLessThanSignState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "\uFFFD"})
+            self.state = self.scriptDataEscapedState
+        elif data == EOF:
+            self.state = self.dataState
+        else:
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
+            self.state = self.scriptDataEscapedState
+        return True
+
+    def scriptDataEscapedDashDashState(self):
+        data = self.stream.char()
+        if data == "-":
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
+        elif data == "<":
+            self.state = self.scriptDataEscapedLessThanSignState
+        elif data == ">":
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": ">"})
+            self.state = self.scriptDataState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "\uFFFD"})
+            self.state = self.scriptDataEscapedState
+        elif data == EOF:
+            self.state = self.dataState
+        else:
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
+            self.state = self.scriptDataEscapedState
+        return True
+
+    def scriptDataEscapedLessThanSignState(self):
+        data = self.stream.char()
+        if data == "/":
+            self.temporaryBuffer = ""
+            self.state = self.scriptDataEscapedEndTagOpenState
+        elif data in asciiLetters:
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<" + data})
+            self.temporaryBuffer = data
+            self.state = self.scriptDataDoubleEscapeStartState
+        else:
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
+            self.stream.unget(data)
+            self.state = self.scriptDataEscapedState
+        return True
+
+    def scriptDataEscapedEndTagOpenState(self):
+        data = self.stream.char()
+        if data in asciiLetters:
+            self.temporaryBuffer = data
+            self.state = self.scriptDataEscapedEndTagNameState
+        else:
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "</"})
+            self.stream.unget(data)
+            self.state = self.scriptDataEscapedState
+        return True
+
+    def scriptDataEscapedEndTagNameState(self):
+        appropriate = self.currentToken and self.currentToken["name"].lower() == self.temporaryBuffer.lower()
+        data = self.stream.char()
+        if data in spaceCharacters and appropriate:
+            self.currentToken = {"type": tokenTypes["EndTag"],
+                                 "name": self.temporaryBuffer,
+                                 "data": [], "selfClosing": False}
+            self.state = self.beforeAttributeNameState
+        elif data == "/" and appropriate:
+            self.currentToken = {"type": tokenTypes["EndTag"],
+                                 "name": self.temporaryBuffer,
+                                 "data": [], "selfClosing": False}
+            self.state = self.selfClosingStartTagState
+        elif data == ">" and appropriate:
+            self.currentToken = {"type": tokenTypes["EndTag"],
+                                 "name": self.temporaryBuffer,
+                                 "data": [], "selfClosing": False}
+            self.emitCurrentToken()
+            self.state = self.dataState
+        elif data in asciiLetters:
+            self.temporaryBuffer += data
+        else:
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "</" + self.temporaryBuffer})
+            self.stream.unget(data)
+            self.state = self.scriptDataEscapedState
+        return True
+
+    def scriptDataDoubleEscapeStartState(self):
+        data = self.stream.char()
+        if data in (spaceCharacters | frozenset(("/", ">"))):
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
+            if self.temporaryBuffer.lower() == "script":
+                self.state = self.scriptDataDoubleEscapedState
+            else:
+                self.state = self.scriptDataEscapedState
+        elif data in asciiLetters:
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
+            self.temporaryBuffer += data
+        else:
+            self.stream.unget(data)
+            self.state = self.scriptDataEscapedState
+        return True
+
+    def scriptDataDoubleEscapedState(self):
+        data = self.stream.char()
+        if data == "-":
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
+            self.state = self.scriptDataDoubleEscapedDashState
+        elif data == "<":
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
+            self.state = self.scriptDataDoubleEscapedLessThanSignState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "\uFFFD"})
+        elif data == EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-script-in-script"})
+            self.state = self.dataState
+        else:
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
+        return True
+
+    def scriptDataDoubleEscapedDashState(self):
+        data = self.stream.char()
+        if data == "-":
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
+            self.state = self.scriptDataDoubleEscapedDashDashState
+        elif data == "<":
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
+            self.state = self.scriptDataDoubleEscapedLessThanSignState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "\uFFFD"})
+            self.state = self.scriptDataDoubleEscapedState
+        elif data == EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-script-in-script"})
+            self.state = self.dataState
+        else:
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
+            self.state = self.scriptDataDoubleEscapedState
+        return True
+
+    def scriptDataDoubleEscapedDashDashState(self):
+        data = self.stream.char()
+        if data == "-":
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "-"})
+        elif data == "<":
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "<"})
+            self.state = self.scriptDataDoubleEscapedLessThanSignState
+        elif data == ">":
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": ">"})
+            self.state = self.scriptDataState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": "\uFFFD"})
+            self.state = self.scriptDataDoubleEscapedState
+        elif data == EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-script-in-script"})
+            self.state = self.dataState
+        else:
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
+            self.state = self.scriptDataDoubleEscapedState
+        return True
+
+    def scriptDataDoubleEscapedLessThanSignState(self):
+        data = self.stream.char()
+        if data == "/":
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": "/"})
+            self.temporaryBuffer = ""
+            self.state = self.scriptDataDoubleEscapeEndState
+        else:
+            self.stream.unget(data)
+            self.state = self.scriptDataDoubleEscapedState
+        return True
+
+    def scriptDataDoubleEscapeEndState(self):
+        data = self.stream.char()
+        if data in (spaceCharacters | frozenset(("/", ">"))):
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
+            if self.temporaryBuffer.lower() == "script":
+                self.state = self.scriptDataEscapedState
+            else:
+                self.state = self.scriptDataDoubleEscapedState
+        elif data in asciiLetters:
+            self.tokenQueue.append({"type": tokenTypes["Characters"], "data": data})
+            self.temporaryBuffer += data
+        else:
+            self.stream.unget(data)
+            self.state = self.scriptDataDoubleEscapedState
+        return True
+
+    def beforeAttributeNameState(self):
+        data = self.stream.char()
+        if data in spaceCharacters:
+            self.stream.charsUntil(spaceCharacters, True)
+        elif data in asciiLetters:
+            self.currentToken["data"].append([data, ""])
+            self.state = self.attributeNameState
+        elif data == ">":
+            self.emitCurrentToken()
+        elif data == "/":
+            self.state = self.selfClosingStartTagState
+        elif data in ("'", '"', "=", "<"):
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "invalid-character-in-attribute-name"})
+            self.currentToken["data"].append([data, ""])
+            self.state = self.attributeNameState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"].append(["\uFFFD", ""])
+            self.state = self.attributeNameState
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "expected-attribute-name-but-got-eof"})
+            self.state = self.dataState
+        else:
+            self.currentToken["data"].append([data, ""])
+            self.state = self.attributeNameState
+        return True
+
+    def attributeNameState(self):
+        data = self.stream.char()
+        leavingThisState = True
+        emitToken = False
+        if data == "=":
+            self.state = self.beforeAttributeValueState
+        elif data in asciiLetters:
+            self.currentToken["data"][-1][0] += data +\
+                self.stream.charsUntil(asciiLetters, True)
+            leavingThisState = False
+        elif data == ">":
+            # XXX If we emit here the attributes are converted to a dict
+            # without being checked and when the code below runs we error
+            # because data is a dict not a list
+            emitToken = True
+        elif data in spaceCharacters:
+            self.state = self.afterAttributeNameState
+        elif data == "/":
+            self.state = self.selfClosingStartTagState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"][-1][0] += "\uFFFD"
+            leavingThisState = False
+        elif data in ("'", '"', "<"):
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data":
+                                    "invalid-character-in-attribute-name"})
+            self.currentToken["data"][-1][0] += data
+            leavingThisState = False
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "eof-in-attribute-name"})
+            self.state = self.dataState
+        else:
+            self.currentToken["data"][-1][0] += data
+            leavingThisState = False
+
+        if leavingThisState:
+            # Attributes are not dropped at this stage. That happens when the
+            # start tag token is emitted so values can still be safely appended
+            # to attributes, but we do want to report the parse error in time.
+            if self.lowercaseAttrName:
+                self.currentToken["data"][-1][0] = (
+                    self.currentToken["data"][-1][0].translate(asciiUpper2Lower))
+            for name, value in self.currentToken["data"][:-1]:
+                if self.currentToken["data"][-1][0] == name:
+                    self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                            "duplicate-attribute"})
+                    break
+            # XXX Fix for above XXX
+            if emitToken:
+                self.emitCurrentToken()
+        return True
+
+    def afterAttributeNameState(self):
+        data = self.stream.char()
+        if data in spaceCharacters:
+            self.stream.charsUntil(spaceCharacters, True)
+        elif data == "=":
+            self.state = self.beforeAttributeValueState
+        elif data == ">":
+            self.emitCurrentToken()
+        elif data in asciiLetters:
+            self.currentToken["data"].append([data, ""])
+            self.state = self.attributeNameState
+        elif data == "/":
+            self.state = self.selfClosingStartTagState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"].append(["\uFFFD", ""])
+            self.state = self.attributeNameState
+        elif data in ("'", '"', "<"):
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "invalid-character-after-attribute-name"})
+            self.currentToken["data"].append([data, ""])
+            self.state = self.attributeNameState
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "expected-end-of-tag-but-got-eof"})
+            self.state = self.dataState
+        else:
+            self.currentToken["data"].append([data, ""])
+            self.state = self.attributeNameState
+        return True
+
+    def beforeAttributeValueState(self):
+        data = self.stream.char()
+        if data in spaceCharacters:
+            self.stream.charsUntil(spaceCharacters, True)
+        elif data == "\"":
+            self.state = self.attributeValueDoubleQuotedState
+        elif data == "&":
+            self.state = self.attributeValueUnQuotedState
+            self.stream.unget(data)
+        elif data == "'":
+            self.state = self.attributeValueSingleQuotedState
+        elif data == ">":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "expected-attribute-value-but-got-right-bracket"})
+            self.emitCurrentToken()
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"][-1][1] += "\uFFFD"
+            self.state = self.attributeValueUnQuotedState
+        elif data in ("=", "<", "`"):
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "equals-in-unquoted-attribute-value"})
+            self.currentToken["data"][-1][1] += data
+            self.state = self.attributeValueUnQuotedState
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "expected-attribute-value-but-got-eof"})
+            self.state = self.dataState
+        else:
+            self.currentToken["data"][-1][1] += data
+            self.state = self.attributeValueUnQuotedState
+        return True
+
+    def attributeValueDoubleQuotedState(self):
+        data = self.stream.char()
+        if data == "\"":
+            self.state = self.afterAttributeValueState
+        elif data == "&":
+            self.processEntityInAttribute('"')
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"][-1][1] += "\uFFFD"
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-attribute-value-double-quote"})
+            self.state = self.dataState
+        else:
+            self.currentToken["data"][-1][1] += data +\
+                self.stream.charsUntil(("\"", "&", "\u0000"))
+        return True
+
+    def attributeValueSingleQuotedState(self):
+        data = self.stream.char()
+        if data == "'":
+            self.state = self.afterAttributeValueState
+        elif data == "&":
+            self.processEntityInAttribute("'")
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"][-1][1] += "\uFFFD"
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-attribute-value-single-quote"})
+            self.state = self.dataState
+        else:
+            self.currentToken["data"][-1][1] += data +\
+                self.stream.charsUntil(("'", "&", "\u0000"))
+        return True
+
+    def attributeValueUnQuotedState(self):
+        data = self.stream.char()
+        if data in spaceCharacters:
+            self.state = self.beforeAttributeNameState
+        elif data == "&":
+            self.processEntityInAttribute(">")
+        elif data == ">":
+            self.emitCurrentToken()
+        elif data in ('"', "'", "=", "<", "`"):
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "unexpected-character-in-unquoted-attribute-value"})
+            self.currentToken["data"][-1][1] += data
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"][-1][1] += "\uFFFD"
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-attribute-value-no-quotes"})
+            self.state = self.dataState
+        else:
+            self.currentToken["data"][-1][1] += data + self.stream.charsUntil(
+                frozenset(("&", ">", '"', "'", "=", "<", "`", "\u0000")) | spaceCharacters)
+        return True
+
+    def afterAttributeValueState(self):
+        data = self.stream.char()
+        if data in spaceCharacters:
+            self.state = self.beforeAttributeNameState
+        elif data == ">":
+            self.emitCurrentToken()
+        elif data == "/":
+            self.state = self.selfClosingStartTagState
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "unexpected-EOF-after-attribute-value"})
+            self.stream.unget(data)
+            self.state = self.dataState
+        else:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "unexpected-character-after-attribute-value"})
+            self.stream.unget(data)
+            self.state = self.beforeAttributeNameState
+        return True
+
+    def selfClosingStartTagState(self):
+        data = self.stream.char()
+        if data == ">":
+            self.currentToken["selfClosing"] = True
+            self.emitCurrentToken()
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data":
+                                    "unexpected-EOF-after-solidus-in-tag"})
+            self.stream.unget(data)
+            self.state = self.dataState
+        else:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "unexpected-character-after-solidus-in-tag"})
+            self.stream.unget(data)
+            self.state = self.beforeAttributeNameState
+        return True
+
+    def bogusCommentState(self):
+        # Make a new comment token and give it as value all the characters
+        # until the first > or EOF (charsUntil checks for EOF automatically)
+        # and emit it.
+        data = self.stream.charsUntil(">")
+        data = data.replace("\u0000", "\uFFFD")
+        self.tokenQueue.append(
+            {"type": tokenTypes["Comment"], "data": data})
+
+        # Eat the character directly after the bogus comment which is either a
+        # ">" or an EOF.
+        self.stream.char()
+        self.state = self.dataState
+        return True
+
+    def markupDeclarationOpenState(self):
+        charStack = [self.stream.char()]
+        if charStack[-1] == "-":
+            charStack.append(self.stream.char())
+            if charStack[-1] == "-":
+                self.currentToken = {"type": tokenTypes["Comment"], "data": ""}
+                self.state = self.commentStartState
+                return True
+        elif charStack[-1] in ('d', 'D'):
+            matched = True
+            for expected in (('o', 'O'), ('c', 'C'), ('t', 'T'),
+                             ('y', 'Y'), ('p', 'P'), ('e', 'E')):
+                charStack.append(self.stream.char())
+                if charStack[-1] not in expected:
+                    matched = False
+                    break
+            if matched:
+                self.currentToken = {"type": tokenTypes["Doctype"],
+                                     "name": "",
+                                     "publicId": None, "systemId": None,
+                                     "correct": True}
+                self.state = self.doctypeState
+                return True
+        elif (charStack[-1] == "[" and
+              self.parser is not None and
+              self.parser.tree.openElements and
+              self.parser.tree.openElements[-1].namespace != self.parser.tree.defaultNamespace):
+            matched = True
+            for expected in ["C", "D", "A", "T", "A", "["]:
+                charStack.append(self.stream.char())
+                if charStack[-1] != expected:
+                    matched = False
+                    break
+            if matched:
+                self.state = self.cdataSectionState
+                return True
+
+        self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                "expected-dashes-or-doctype"})
+
+        while charStack:
+            self.stream.unget(charStack.pop())
+        self.state = self.bogusCommentState
+        return True
+
+    def commentStartState(self):
+        data = self.stream.char()
+        if data == "-":
+            self.state = self.commentStartDashState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"] += "\uFFFD"
+        elif data == ">":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "incorrect-comment"})
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-comment"})
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        else:
+            self.currentToken["data"] += data
+            self.state = self.commentState
+        return True
+
+    def commentStartDashState(self):
+        data = self.stream.char()
+        if data == "-":
+            self.state = self.commentEndState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"] += "-\uFFFD"
+        elif data == ">":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "incorrect-comment"})
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-comment"})
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        else:
+            self.currentToken["data"] += "-" + data
+            self.state = self.commentState
+        return True
+
+    def commentState(self):
+        data = self.stream.char()
+        if data == "-":
+            self.state = self.commentEndDashState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"] += "\uFFFD"
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "eof-in-comment"})
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        else:
+            self.currentToken["data"] += data + \
+                self.stream.charsUntil(("-", "\u0000"))
+        return True
+
+    def commentEndDashState(self):
+        data = self.stream.char()
+        if data == "-":
+            self.state = self.commentEndState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"] += "-\uFFFD"
+            self.state = self.commentState
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-comment-end-dash"})
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        else:
+            self.currentToken["data"] += "-" + data
+            self.state = self.commentState
+        return True
+
+    def commentEndState(self):
+        data = self.stream.char()
+        if data == ">":
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"] += "--\uFFFD"
+            self.state = self.commentState
+        elif data == "!":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "unexpected-bang-after-double-dash-in-comment"})
+            self.state = self.commentEndBangState
+        elif data == "-":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "unexpected-dash-after-double-dash-in-comment"})
+            self.currentToken["data"] += data
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-comment-double-dash"})
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        else:
+            # XXX
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "unexpected-char-in-comment"})
+            self.currentToken["data"] += "--" + data
+            self.state = self.commentState
+        return True
+
+    def commentEndBangState(self):
+        data = self.stream.char()
+        if data == ">":
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        elif data == "-":
+            self.currentToken["data"] += "--!"
+            self.state = self.commentEndDashState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["data"] += "--!\uFFFD"
+            self.state = self.commentState
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-comment-end-bang-state"})
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        else:
+            self.currentToken["data"] += "--!" + data
+            self.state = self.commentState
+        return True
+
+    def doctypeState(self):
+        data = self.stream.char()
+        if data in spaceCharacters:
+            self.state = self.beforeDoctypeNameState
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "expected-doctype-name-but-got-eof"})
+            self.currentToken["correct"] = False
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        else:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "need-space-after-doctype"})
+            self.stream.unget(data)
+            self.state = self.beforeDoctypeNameState
+        return True
+
+    def beforeDoctypeNameState(self):
+        data = self.stream.char()
+        if data in spaceCharacters:
+            pass
+        elif data == ">":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "expected-doctype-name-but-got-right-bracket"})
+            self.currentToken["correct"] = False
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["name"] = "\uFFFD"
+            self.state = self.doctypeNameState
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "expected-doctype-name-but-got-eof"})
+            self.currentToken["correct"] = False
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        else:
+            self.currentToken["name"] = data
+            self.state = self.doctypeNameState
+        return True
+
+    def doctypeNameState(self):
+        data = self.stream.char()
+        if data in spaceCharacters:
+            self.currentToken["name"] = self.currentToken["name"].translate(asciiUpper2Lower)
+            self.state = self.afterDoctypeNameState
+        elif data == ">":
+            self.currentToken["name"] = self.currentToken["name"].translate(asciiUpper2Lower)
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["name"] += "\uFFFD"
+            self.state = self.doctypeNameState
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-doctype-name"})
+            self.currentToken["correct"] = False
+            self.currentToken["name"] = self.currentToken["name"].translate(asciiUpper2Lower)
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        else:
+            self.currentToken["name"] += data
+        return True
+
+    def afterDoctypeNameState(self):
+        data = self.stream.char()
+        if data in spaceCharacters:
+            pass
+        elif data == ">":
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        elif data is EOF:
+            self.currentToken["correct"] = False
+            self.stream.unget(data)
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-doctype"})
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        else:
+            if data in ("p", "P"):
+                matched = True
+                for expected in (("u", "U"), ("b", "B"), ("l", "L"),
+                                 ("i", "I"), ("c", "C")):
+                    data = self.stream.char()
+                    if data not in expected:
+                        matched = False
+                        break
+                if matched:
+                    self.state = self.afterDoctypePublicKeywordState
+                    return True
+            elif data in ("s", "S"):
+                matched = True
+                for expected in (("y", "Y"), ("s", "S"), ("t", "T"),
+                                 ("e", "E"), ("m", "M")):
+                    data = self.stream.char()
+                    if data not in expected:
+                        matched = False
+                        break
+                if matched:
+                    self.state = self.afterDoctypeSystemKeywordState
+                    return True
+
+            # All the characters read before the current 'data' will be
+            # [a-zA-Z], so they're garbage in the bogus doctype and can be
+            # discarded; only the latest character might be '>' or EOF
+            # and needs to be ungetted
+            self.stream.unget(data)
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "expected-space-or-right-bracket-in-doctype", "datavars":
+                                    {"data": data}})
+            self.currentToken["correct"] = False
+            self.state = self.bogusDoctypeState
+
+        return True
+
+    def afterDoctypePublicKeywordState(self):
+        data = self.stream.char()
+        if data in spaceCharacters:
+            self.state = self.beforeDoctypePublicIdentifierState
+        elif data in ("'", '"'):
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "unexpected-char-in-doctype"})
+            self.stream.unget(data)
+            self.state = self.beforeDoctypePublicIdentifierState
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-doctype"})
+            self.currentToken["correct"] = False
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        else:
+            self.stream.unget(data)
+            self.state = self.beforeDoctypePublicIdentifierState
+        return True
+
+    def beforeDoctypePublicIdentifierState(self):
+        data = self.stream.char()
+        if data in spaceCharacters:
+            pass
+        elif data == "\"":
+            self.currentToken["publicId"] = ""
+            self.state = self.doctypePublicIdentifierDoubleQuotedState
+        elif data == "'":
+            self.currentToken["publicId"] = ""
+            self.state = self.doctypePublicIdentifierSingleQuotedState
+        elif data == ">":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "unexpected-end-of-doctype"})
+            self.currentToken["correct"] = False
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-doctype"})
+            self.currentToken["correct"] = False
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        else:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "unexpected-char-in-doctype"})
+            self.currentToken["correct"] = False
+            self.state = self.bogusDoctypeState
+        return True
+
+    def doctypePublicIdentifierDoubleQuotedState(self):
+        data = self.stream.char()
+        if data == "\"":
+            self.state = self.afterDoctypePublicIdentifierState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["publicId"] += "\uFFFD"
+        elif data == ">":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "unexpected-end-of-doctype"})
+            self.currentToken["correct"] = False
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-doctype"})
+            self.currentToken["correct"] = False
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        else:
+            self.currentToken["publicId"] += data
+        return True
+
+    def doctypePublicIdentifierSingleQuotedState(self):
+        data = self.stream.char()
+        if data == "'":
+            self.state = self.afterDoctypePublicIdentifierState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["publicId"] += "\uFFFD"
+        elif data == ">":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "unexpected-end-of-doctype"})
+            self.currentToken["correct"] = False
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-doctype"})
+            self.currentToken["correct"] = False
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        else:
+            self.currentToken["publicId"] += data
+        return True
+
+    def afterDoctypePublicIdentifierState(self):
+        data = self.stream.char()
+        if data in spaceCharacters:
+            self.state = self.betweenDoctypePublicAndSystemIdentifiersState
+        elif data == ">":
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        elif data == '"':
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "unexpected-char-in-doctype"})
+            self.currentToken["systemId"] = ""
+            self.state = self.doctypeSystemIdentifierDoubleQuotedState
+        elif data == "'":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "unexpected-char-in-doctype"})
+            self.currentToken["systemId"] = ""
+            self.state = self.doctypeSystemIdentifierSingleQuotedState
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-doctype"})
+            self.currentToken["correct"] = False
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        else:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "unexpected-char-in-doctype"})
+            self.currentToken["correct"] = False
+            self.state = self.bogusDoctypeState
+        return True
+
+    def betweenDoctypePublicAndSystemIdentifiersState(self):
+        data = self.stream.char()
+        if data in spaceCharacters:
+            pass
+        elif data == ">":
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        elif data == '"':
+            self.currentToken["systemId"] = ""
+            self.state = self.doctypeSystemIdentifierDoubleQuotedState
+        elif data == "'":
+            self.currentToken["systemId"] = ""
+            self.state = self.doctypeSystemIdentifierSingleQuotedState
+        elif data == EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-doctype"})
+            self.currentToken["correct"] = False
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        else:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "unexpected-char-in-doctype"})
+            self.currentToken["correct"] = False
+            self.state = self.bogusDoctypeState
+        return True
+
+    def afterDoctypeSystemKeywordState(self):
+        data = self.stream.char()
+        if data in spaceCharacters:
+            self.state = self.beforeDoctypeSystemIdentifierState
+        elif data in ("'", '"'):
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "unexpected-char-in-doctype"})
+            self.stream.unget(data)
+            self.state = self.beforeDoctypeSystemIdentifierState
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-doctype"})
+            self.currentToken["correct"] = False
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        else:
+            self.stream.unget(data)
+            self.state = self.beforeDoctypeSystemIdentifierState
+        return True
+
+    def beforeDoctypeSystemIdentifierState(self):
+        data = self.stream.char()
+        if data in spaceCharacters:
+            pass
+        elif data == "\"":
+            self.currentToken["systemId"] = ""
+            self.state = self.doctypeSystemIdentifierDoubleQuotedState
+        elif data == "'":
+            self.currentToken["systemId"] = ""
+            self.state = self.doctypeSystemIdentifierSingleQuotedState
+        elif data == ">":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "unexpected-char-in-doctype"})
+            self.currentToken["correct"] = False
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-doctype"})
+            self.currentToken["correct"] = False
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        else:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "unexpected-char-in-doctype"})
+            self.currentToken["correct"] = False
+            self.state = self.bogusDoctypeState
+        return True
+
+    def doctypeSystemIdentifierDoubleQuotedState(self):
+        data = self.stream.char()
+        if data == "\"":
+            self.state = self.afterDoctypeSystemIdentifierState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["systemId"] += "\uFFFD"
+        elif data == ">":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "unexpected-end-of-doctype"})
+            self.currentToken["correct"] = False
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-doctype"})
+            self.currentToken["correct"] = False
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        else:
+            self.currentToken["systemId"] += data
+        return True
+
+    def doctypeSystemIdentifierSingleQuotedState(self):
+        data = self.stream.char()
+        if data == "'":
+            self.state = self.afterDoctypeSystemIdentifierState
+        elif data == "\u0000":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                    "data": "invalid-codepoint"})
+            self.currentToken["systemId"] += "\uFFFD"
+        elif data == ">":
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "unexpected-end-of-doctype"})
+            self.currentToken["correct"] = False
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-doctype"})
+            self.currentToken["correct"] = False
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        else:
+            self.currentToken["systemId"] += data
+        return True
+
+    def afterDoctypeSystemIdentifierState(self):
+        data = self.stream.char()
+        if data in spaceCharacters:
+            pass
+        elif data == ">":
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        elif data is EOF:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "eof-in-doctype"})
+            self.currentToken["correct"] = False
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        else:
+            self.tokenQueue.append({"type": tokenTypes["ParseError"], "data":
+                                    "unexpected-char-in-doctype"})
+            self.state = self.bogusDoctypeState
+        return True
+
+    def bogusDoctypeState(self):
+        data = self.stream.char()
+        if data == ">":
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        elif data is EOF:
+            # XXX EMIT
+            self.stream.unget(data)
+            self.tokenQueue.append(self.currentToken)
+            self.state = self.dataState
+        else:
+            pass
+        return True
+
+    def cdataSectionState(self):
+        data = []
+        while True:
+            data.append(self.stream.charsUntil("]"))
+            data.append(self.stream.charsUntil(">"))
+            char = self.stream.char()
+            if char == EOF:
+                break
+            else:
+                assert char == ">"
+                if data[-1][-2:] == "]]":
+                    data[-1] = data[-1][:-2]
+                    break
+                else:
+                    data.append(char)
+
+        data = "".join(data)
+        # Deal with null here rather than in the parser
+        nullCount = data.count("\u0000")
+        if nullCount > 0:
+            for i in range(nullCount):
+                self.tokenQueue.append({"type": tokenTypes["ParseError"],
+                                        "data": "invalid-codepoint"})
+            data = data.replace("\u0000", "\uFFFD")
+        if data:
+            self.tokenQueue.append({"type": tokenTypes["Characters"],
+                                    "data": data})
+        self.state = self.dataState
+        return True
diff --git a/lib/html5lib/treeadapters/__init__.py b/lib/html5lib/treeadapters/__init__.py
index dfeb0ba5..e69de29b 100644
--- a/lib/html5lib/treeadapters/__init__.py
+++ b/lib/html5lib/treeadapters/__init__.py
@@ -1,30 +0,0 @@
-"""Tree adapters let you convert from one tree structure to another
-
-Example:
-
-.. code-block:: python
-
-   import html5lib
-   from html5lib.treeadapters import genshi
-
-   doc = '<html><body>Hi!</body></html>'
-   treebuilder = html5lib.getTreeBuilder('etree')
-   parser = html5lib.HTMLParser(tree=treebuilder)
-   tree = parser.parse(doc)
-   TreeWalker = html5lib.getTreeWalker('etree')
-
-   genshi_tree = genshi.to_genshi(TreeWalker(tree))
-
-"""
-from __future__ import absolute_import, division, unicode_literals
-
-from . import sax
-
-__all__ = ["sax"]
-
-try:
-    from . import genshi  # noqa
-except ImportError:
-    pass
-else:
-    __all__.append("genshi")
diff --git a/lib/html5lib/treeadapters/genshi.py b/lib/html5lib/treeadapters/genshi.py
deleted file mode 100644
index 61d5fb6a..00000000
--- a/lib/html5lib/treeadapters/genshi.py
+++ /dev/null
@@ -1,54 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-from genshi.core import QName, Attrs
-from genshi.core import START, END, TEXT, COMMENT, DOCTYPE
-
-
-def to_genshi(walker):
-    """Convert a tree to a genshi tree
-
-    :arg walker: the treewalker to use to walk the tree to convert it
-
-    :returns: generator of genshi nodes
-
-    """
-    text = []
-    for token in walker:
-        type = token["type"]
-        if type in ("Characters", "SpaceCharacters"):
-            text.append(token["data"])
-        elif text:
-            yield TEXT, "".join(text), (None, -1, -1)
-            text = []
-
-        if type in ("StartTag", "EmptyTag"):
-            if token["namespace"]:
-                name = "{%s}%s" % (token["namespace"], token["name"])
-            else:
-                name = token["name"]
-            attrs = Attrs([(QName("{%s}%s" % attr if attr[0] is not None else attr[1]), value)
-                           for attr, value in token["data"].items()])
-            yield (START, (QName(name), attrs), (None, -1, -1))
-            if type == "EmptyTag":
-                type = "EndTag"
-
-        if type == "EndTag":
-            if token["namespace"]:
-                name = "{%s}%s" % (token["namespace"], token["name"])
-            else:
-                name = token["name"]
-
-            yield END, QName(name), (None, -1, -1)
-
-        elif type == "Comment":
-            yield COMMENT, token["data"], (None, -1, -1)
-
-        elif type == "Doctype":
-            yield DOCTYPE, (token["name"], token["publicId"],
-                            token["systemId"]), (None, -1, -1)
-
-        else:
-            pass  # FIXME: What to do?
-
-    if text:
-        yield TEXT, "".join(text), (None, -1, -1)
diff --git a/lib/html5lib/treeadapters/sax.py b/lib/html5lib/treeadapters/sax.py
index f4ccea5a..ad47df95 100644
--- a/lib/html5lib/treeadapters/sax.py
+++ b/lib/html5lib/treeadapters/sax.py
@@ -11,13 +11,7 @@ for prefix, localName, namespace in adjustForeignAttributes.values():
 
 
 def to_sax(walker, handler):
-    """Call SAX-like content handler based on treewalker walker
-
-    :arg walker: the treewalker to use to walk the tree to convert it
-
-    :arg handler: SAX handler to use
-
-    """
+    """Call SAX-like content handler based on treewalker walker"""
     handler.startDocument()
     for prefix, namespace in prefix_mapping.items():
         handler.startPrefixMapping(prefix, namespace)
diff --git a/lib/html5lib/treebuilders/__init__.py b/lib/html5lib/treebuilders/__init__.py
index d44447ea..6a6b2a4c 100644
--- a/lib/html5lib/treebuilders/__init__.py
+++ b/lib/html5lib/treebuilders/__init__.py
@@ -1,68 +1,56 @@
-"""A collection of modules for building different kinds of trees from HTML
-documents.
+"""A collection of modules for building different kinds of tree from
+HTML documents.
 
 To create a treebuilder for a new type of tree, you need to do
 implement several things:
 
-1. A set of classes for various types of elements: Document, Doctype, Comment,
-   Element. These must implement the interface of ``base.treebuilders.Node``
-   (although comment nodes have a different signature for their constructor,
-   see ``treebuilders.etree.Comment``) Textual content may also be implemented
-   as another node type, or not, as your tree implementation requires.
+1) A set of classes for various types of elements: Document, Doctype,
+Comment, Element. These must implement the interface of
+_base.treebuilders.Node (although comment nodes have a different
+signature for their constructor, see treebuilders.etree.Comment)
+Textual content may also be implemented as another node type, or not, as
+your tree implementation requires.
 
-2. A treebuilder object (called ``TreeBuilder`` by convention) that inherits
-   from ``treebuilders.base.TreeBuilder``. This has 4 required attributes:
-
-   * ``documentClass`` - the class to use for the bottommost node of a document
-   * ``elementClass`` - the class to use for HTML Elements
-   * ``commentClass`` - the class to use for comments
-   * ``doctypeClass`` - the class to use for doctypes
-
-   It also has one required method:
-
-   * ``getDocument`` - Returns the root node of the complete document tree
-
-3. If you wish to run the unit tests, you must also create a ``testSerializer``
-   method on your treebuilder which accepts a node and returns a string
-   containing Node and its children serialized according to the format used in
-   the unittests
+2) A treebuilder object (called TreeBuilder by convention) that
+inherits from treebuilders._base.TreeBuilder. This has 4 required attributes:
+documentClass - the class to use for the bottommost node of a document
+elementClass - the class to use for HTML Elements
+commentClass - the class to use for comments
+doctypeClass - the class to use for doctypes
+It also has one required method:
+getDocument - Returns the root node of the complete document tree
 
+3) If you wish to run the unit tests, you must also create a
+testSerializer method on your treebuilder which accepts a node and
+returns a string containing Node and its children serialized according
+to the format used in the unittests
 """
 
 from __future__ import absolute_import, division, unicode_literals
 
-from .._utils import default_etree
+from ..utils import default_etree
 
 treeBuilderCache = {}
 
 
 def getTreeBuilder(treeType, implementation=None, **kwargs):
-    """Get a TreeBuilder class for various types of trees with built-in support
+    """Get a TreeBuilder class for various types of tree with built-in support
 
-    :arg treeType: the name of the tree type required (case-insensitive). Supported
-        values are:
+    treeType - the name of the tree type required (case-insensitive). Supported
+               values are:
 
-        * "dom" - A generic builder for DOM implementations, defaulting to a
-          xml.dom.minidom based implementation.
-        * "etree" - A generic builder for tree implementations exposing an
-          ElementTree-like interface, defaulting to xml.etree.cElementTree if
-          available and xml.etree.ElementTree if not.
-        * "lxml" - A etree-based builder for lxml.etree, handling limitations
-          of lxml's implementation.
+               "dom" - A generic builder for DOM implementations, defaulting to
+                       a xml.dom.minidom based implementation.
+               "etree" - A generic builder for tree implementations exposing an
+                         ElementTree-like interface, defaulting to
+                         xml.etree.cElementTree if available and
+                         xml.etree.ElementTree if not.
+               "lxml" - A etree-based builder for lxml.etree, handling
+                        limitations of lxml's implementation.
 
-    :arg implementation: (Currently applies to the "etree" and "dom" tree
-        types). A module implementing the tree type e.g. xml.etree.ElementTree
-        or xml.etree.cElementTree.
-
-    :arg kwargs: Any additional options to pass to the TreeBuilder when
-        creating it.
-
-    Example:
-
-    >>> from html5lib.treebuilders import getTreeBuilder
-    >>> builder = getTreeBuilder('etree')
-
-    """
+    implementation - (Currently applies to the "etree" and "dom" tree types). A
+                      module implementing the tree type e.g.
+                      xml.etree.ElementTree or xml.etree.cElementTree."""
 
     treeType = treeType.lower()
     if treeType not in treeBuilderCache:
diff --git a/lib/html5lib/treebuilders/_base.py b/lib/html5lib/treebuilders/_base.py
new file mode 100644
index 00000000..8b97cc11
--- /dev/null
+++ b/lib/html5lib/treebuilders/_base.py
@@ -0,0 +1,377 @@
+from __future__ import absolute_import, division, unicode_literals
+from six import text_type
+
+from ..constants import scopingElements, tableInsertModeElements, namespaces
+
+# The scope markers are inserted when entering object elements,
+# marquees, table cells, and table captions, and are used to prevent formatting
+# from "leaking" into tables, object elements, and marquees.
+Marker = None
+
+listElementsMap = {
+    None: (frozenset(scopingElements), False),
+    "button": (frozenset(scopingElements | set([(namespaces["html"], "button")])), False),
+    "list": (frozenset(scopingElements | set([(namespaces["html"], "ol"),
+                                              (namespaces["html"], "ul")])), False),
+    "table": (frozenset([(namespaces["html"], "html"),
+                         (namespaces["html"], "table")]), False),
+    "select": (frozenset([(namespaces["html"], "optgroup"),
+                          (namespaces["html"], "option")]), True)
+}
+
+
+class Node(object):
+    def __init__(self, name):
+        """Node representing an item in the tree.
+        name - The tag name associated with the node
+        parent - The parent of the current node (or None for the document node)
+        value - The value of the current node (applies to text nodes and
+        comments
+        attributes - a dict holding name, value pairs for attributes of the node
+        childNodes - a list of child nodes of the current node. This must
+        include all elements but not necessarily other node types
+        _flags - A list of miscellaneous flags that can be set on the node
+        """
+        self.name = name
+        self.parent = None
+        self.value = None
+        self.attributes = {}
+        self.childNodes = []
+        self._flags = []
+
+    def __str__(self):
+        attributesStr = " ".join(["%s=\"%s\"" % (name, value)
+                                  for name, value in
+                                  self.attributes.items()])
+        if attributesStr:
+            return "<%s %s>" % (self.name, attributesStr)
+        else:
+            return "<%s>" % (self.name)
+
+    def __repr__(self):
+        return "<%s>" % (self.name)
+
+    def appendChild(self, node):
+        """Insert node as a child of the current node
+        """
+        raise NotImplementedError
+
+    def insertText(self, data, insertBefore=None):
+        """Insert data as text in the current node, positioned before the
+        start of node insertBefore or to the end of the node's text.
+        """
+        raise NotImplementedError
+
+    def insertBefore(self, node, refNode):
+        """Insert node as a child of the current node, before refNode in the
+        list of child nodes. Raises ValueError if refNode is not a child of
+        the current node"""
+        raise NotImplementedError
+
+    def removeChild(self, node):
+        """Remove node from the children of the current node
+        """
+        raise NotImplementedError
+
+    def reparentChildren(self, newParent):
+        """Move all the children of the current node to newParent.
+        This is needed so that trees that don't store text as nodes move the
+        text in the correct way
+        """
+        # XXX - should this method be made more general?
+        for child in self.childNodes:
+            newParent.appendChild(child)
+        self.childNodes = []
+
+    def cloneNode(self):
+        """Return a shallow copy of the current node i.e. a node with the same
+        name and attributes but with no parent or child nodes
+        """
+        raise NotImplementedError
+
+    def hasContent(self):
+        """Return true if the node has children or text, false otherwise
+        """
+        raise NotImplementedError
+
+
+class ActiveFormattingElements(list):
+    def append(self, node):
+        equalCount = 0
+        if node != Marker:
+            for element in self[::-1]:
+                if element == Marker:
+                    break
+                if self.nodesEqual(element, node):
+                    equalCount += 1
+                if equalCount == 3:
+                    self.remove(element)
+                    break
+        list.append(self, node)
+
+    def nodesEqual(self, node1, node2):
+        if not node1.nameTuple == node2.nameTuple:
+            return False
+
+        if not node1.attributes == node2.attributes:
+            return False
+
+        return True
+
+
+class TreeBuilder(object):
+    """Base treebuilder implementation
+    documentClass - the class to use for the bottommost node of a document
+    elementClass - the class to use for HTML Elements
+    commentClass - the class to use for comments
+    doctypeClass - the class to use for doctypes
+    """
+
+    # Document class
+    documentClass = None
+
+    # The class to use for creating a node
+    elementClass = None
+
+    # The class to use for creating comments
+    commentClass = None
+
+    # The class to use for creating doctypes
+    doctypeClass = None
+
+    # Fragment class
+    fragmentClass = None
+
+    def __init__(self, namespaceHTMLElements):
+        if namespaceHTMLElements:
+            self.defaultNamespace = "http://www.w3.org/1999/xhtml"
+        else:
+            self.defaultNamespace = None
+        self.reset()
+
+    def reset(self):
+        self.openElements = []
+        self.activeFormattingElements = ActiveFormattingElements()
+
+        # XXX - rename these to headElement, formElement
+        self.headPointer = None
+        self.formPointer = None
+
+        self.insertFromTable = False
+
+        self.document = self.documentClass()
+
+    def elementInScope(self, target, variant=None):
+
+        # If we pass a node in we match that. if we pass a string
+        # match any node with that name
+        exactNode = hasattr(target, "nameTuple")
+
+        listElements, invert = listElementsMap[variant]
+
+        for node in reversed(self.openElements):
+            if (node.name == target and not exactNode or
+                    node == target and exactNode):
+                return True
+            elif (invert ^ (node.nameTuple in listElements)):
+                return False
+
+        assert False  # We should never reach this point
+
+    def reconstructActiveFormattingElements(self):
+        # Within this algorithm the order of steps described in the
+        # specification is not quite the same as the order of steps in the
+        # code. It should still do the same though.
+
+        # Step 1: stop the algorithm when there's nothing to do.
+        if not self.activeFormattingElements:
+            return
+
+        # Step 2 and step 3: we start with the last element. So i is -1.
+        i = len(self.activeFormattingElements) - 1
+        entry = self.activeFormattingElements[i]
+        if entry == Marker or entry in self.openElements:
+            return
+
+        # Step 6
+        while entry != Marker and entry not in self.openElements:
+            if i == 0:
+                # This will be reset to 0 below
+                i = -1
+                break
+            i -= 1
+            # Step 5: let entry be one earlier in the list.
+            entry = self.activeFormattingElements[i]
+
+        while True:
+            # Step 7
+            i += 1
+
+            # Step 8
+            entry = self.activeFormattingElements[i]
+            clone = entry.cloneNode()  # Mainly to get a new copy of the attributes
+
+            # Step 9
+            element = self.insertElement({"type": "StartTag",
+                                          "name": clone.name,
+                                          "namespace": clone.namespace,
+                                          "data": clone.attributes})
+
+            # Step 10
+            self.activeFormattingElements[i] = element
+
+            # Step 11
+            if element == self.activeFormattingElements[-1]:
+                break
+
+    def clearActiveFormattingElements(self):
+        entry = self.activeFormattingElements.pop()
+        while self.activeFormattingElements and entry != Marker:
+            entry = self.activeFormattingElements.pop()
+
+    def elementInActiveFormattingElements(self, name):
+        """Check if an element exists between the end of the active
+        formatting elements and the last marker. If it does, return it, else
+        return false"""
+
+        for item in self.activeFormattingElements[::-1]:
+            # Check for Marker first because if it's a Marker it doesn't have a
+            # name attribute.
+            if item == Marker:
+                break
+            elif item.name == name:
+                return item
+        return False
+
+    def insertRoot(self, token):
+        element = self.createElement(token)
+        self.openElements.append(element)
+        self.document.appendChild(element)
+
+    def insertDoctype(self, token):
+        name = token["name"]
+        publicId = token["publicId"]
+        systemId = token["systemId"]
+
+        doctype = self.doctypeClass(name, publicId, systemId)
+        self.document.appendChild(doctype)
+
+    def insertComment(self, token, parent=None):
+        if parent is None:
+            parent = self.openElements[-1]
+        parent.appendChild(self.commentClass(token["data"]))
+
+    def createElement(self, token):
+        """Create an element but don't insert it anywhere"""
+        name = token["name"]
+        namespace = token.get("namespace", self.defaultNamespace)
+        element = self.elementClass(name, namespace)
+        element.attributes = token["data"]
+        return element
+
+    def _getInsertFromTable(self):
+        return self._insertFromTable
+
+    def _setInsertFromTable(self, value):
+        """Switch the function used to insert an element from the
+        normal one to the misnested table one and back again"""
+        self._insertFromTable = value
+        if value:
+            self.insertElement = self.insertElementTable
+        else:
+            self.insertElement = self.insertElementNormal
+
+    insertFromTable = property(_getInsertFromTable, _setInsertFromTable)
+
+    def insertElementNormal(self, token):
+        name = token["name"]
+        assert isinstance(name, text_type), "Element %s not unicode" % name
+        namespace = token.get("namespace", self.defaultNamespace)
+        element = self.elementClass(name, namespace)
+        element.attributes = token["data"]
+        self.openElements[-1].appendChild(element)
+        self.openElements.append(element)
+        return element
+
+    def insertElementTable(self, token):
+        """Create an element and insert it into the tree"""
+        element = self.createElement(token)
+        if self.openElements[-1].name not in tableInsertModeElements:
+            return self.insertElementNormal(token)
+        else:
+            # We should be in the InTable mode. This means we want to do
+            # special magic element rearranging
+            parent, insertBefore = self.getTableMisnestedNodePosition()
+            if insertBefore is None:
+                parent.appendChild(element)
+            else:
+                parent.insertBefore(element, insertBefore)
+            self.openElements.append(element)
+        return element
+
+    def insertText(self, data, parent=None):
+        """Insert text data."""
+        if parent is None:
+            parent = self.openElements[-1]
+
+        if (not self.insertFromTable or (self.insertFromTable and
+                                         self.openElements[-1].name
+                                         not in tableInsertModeElements)):
+            parent.insertText(data)
+        else:
+            # We should be in the InTable mode. This means we want to do
+            # special magic element rearranging
+            parent, insertBefore = self.getTableMisnestedNodePosition()
+            parent.insertText(data, insertBefore)
+
+    def getTableMisnestedNodePosition(self):
+        """Get the foster parent element, and sibling to insert before
+        (or None) when inserting a misnested table node"""
+        # The foster parent element is the one which comes before the most
+        # recently opened table element
+        # XXX - this is really inelegant
+        lastTable = None
+        fosterParent = None
+        insertBefore = None
+        for elm in self.openElements[::-1]:
+            if elm.name == "table":
+                lastTable = elm
+                break
+        if lastTable:
+            # XXX - we should really check that this parent is actually a
+            # node here
+            if lastTable.parent:
+                fosterParent = lastTable.parent
+                insertBefore = lastTable
+            else:
+                fosterParent = self.openElements[
+                    self.openElements.index(lastTable) - 1]
+        else:
+            fosterParent = self.openElements[0]
+        return fosterParent, insertBefore
+
+    def generateImpliedEndTags(self, exclude=None):
+        name = self.openElements[-1].name
+        # XXX td, th and tr are not actually needed
+        if (name in frozenset(("dd", "dt", "li", "option", "optgroup", "p", "rp", "rt"))
+                and name != exclude):
+            self.openElements.pop()
+            # XXX This is not entirely what the specification says. We should
+            # investigate it more closely.
+            self.generateImpliedEndTags(exclude)
+
+    def getDocument(self):
+        "Return the final tree"
+        return self.document
+
+    def getFragment(self):
+        "Return the final fragment"
+        # assert self.innerHTML
+        fragment = self.fragmentClass()
+        self.openElements[0].reparentChildren(fragment)
+        return fragment
+
+    def testSerializer(self, node):
+        """Serialize the subtree of node in the format required by unit tests
+        node - the node from which to start serializing"""
+        raise NotImplementedError
diff --git a/lib/html5lib/treebuilders/base.py b/lib/html5lib/treebuilders/base.py
deleted file mode 100644
index e4a3d710..00000000
--- a/lib/html5lib/treebuilders/base.py
+++ /dev/null
@@ -1,417 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-from six import text_type
-
-from ..constants import scopingElements, tableInsertModeElements, namespaces
-
-# The scope markers are inserted when entering object elements,
-# marquees, table cells, and table captions, and are used to prevent formatting
-# from "leaking" into tables, object elements, and marquees.
-Marker = None
-
-listElementsMap = {
-    None: (frozenset(scopingElements), False),
-    "button": (frozenset(scopingElements | {(namespaces["html"], "button")}), False),
-    "list": (frozenset(scopingElements | {(namespaces["html"], "ol"),
-                                          (namespaces["html"], "ul")}), False),
-    "table": (frozenset([(namespaces["html"], "html"),
-                         (namespaces["html"], "table")]), False),
-    "select": (frozenset([(namespaces["html"], "optgroup"),
-                          (namespaces["html"], "option")]), True)
-}
-
-
-class Node(object):
-    """Represents an item in the tree"""
-    def __init__(self, name):
-        """Creates a Node
-
-        :arg name: The tag name associated with the node
-
-        """
-        # The tag name associated with the node
-        self.name = name
-        # The parent of the current node (or None for the document node)
-        self.parent = None
-        # The value of the current node (applies to text nodes and comments)
-        self.value = None
-        # A dict holding name -> value pairs for attributes of the node
-        self.attributes = {}
-        # A list of child nodes of the current node. This must include all
-        # elements but not necessarily other node types.
-        self.childNodes = []
-        # A list of miscellaneous flags that can be set on the node.
-        self._flags = []
-
-    def __str__(self):
-        attributesStr = " ".join(["%s=\"%s\"" % (name, value)
-                                  for name, value in
-                                  self.attributes.items()])
-        if attributesStr:
-            return "<%s %s>" % (self.name, attributesStr)
-        else:
-            return "<%s>" % (self.name)
-
-    def __repr__(self):
-        return "<%s>" % (self.name)
-
-    def appendChild(self, node):
-        """Insert node as a child of the current node
-
-        :arg node: the node to insert
-
-        """
-        raise NotImplementedError
-
-    def insertText(self, data, insertBefore=None):
-        """Insert data as text in the current node, positioned before the
-        start of node insertBefore or to the end of the node's text.
-
-        :arg data: the data to insert
-
-        :arg insertBefore: True if you want to insert the text before the node
-            and False if you want to insert it after the node
-
-        """
-        raise NotImplementedError
-
-    def insertBefore(self, node, refNode):
-        """Insert node as a child of the current node, before refNode in the
-        list of child nodes. Raises ValueError if refNode is not a child of
-        the current node
-
-        :arg node: the node to insert
-
-        :arg refNode: the child node to insert the node before
-
-        """
-        raise NotImplementedError
-
-    def removeChild(self, node):
-        """Remove node from the children of the current node
-
-        :arg node: the child node to remove
-
-        """
-        raise NotImplementedError
-
-    def reparentChildren(self, newParent):
-        """Move all the children of the current node to newParent.
-        This is needed so that trees that don't store text as nodes move the
-        text in the correct way
-
-        :arg newParent: the node to move all this node's children to
-
-        """
-        # XXX - should this method be made more general?
-        for child in self.childNodes:
-            newParent.appendChild(child)
-        self.childNodes = []
-
-    def cloneNode(self):
-        """Return a shallow copy of the current node i.e. a node with the same
-        name and attributes but with no parent or child nodes
-        """
-        raise NotImplementedError
-
-    def hasContent(self):
-        """Return true if the node has children or text, false otherwise
-        """
-        raise NotImplementedError
-
-
-class ActiveFormattingElements(list):
-    def append(self, node):
-        equalCount = 0
-        if node != Marker:
-            for element in self[::-1]:
-                if element == Marker:
-                    break
-                if self.nodesEqual(element, node):
-                    equalCount += 1
-                if equalCount == 3:
-                    self.remove(element)
-                    break
-        list.append(self, node)
-
-    def nodesEqual(self, node1, node2):
-        if not node1.nameTuple == node2.nameTuple:
-            return False
-
-        if not node1.attributes == node2.attributes:
-            return False
-
-        return True
-
-
-class TreeBuilder(object):
-    """Base treebuilder implementation
-
-    * documentClass - the class to use for the bottommost node of a document
-    * elementClass - the class to use for HTML Elements
-    * commentClass - the class to use for comments
-    * doctypeClass - the class to use for doctypes
-
-    """
-    # pylint:disable=not-callable
-
-    # Document class
-    documentClass = None
-
-    # The class to use for creating a node
-    elementClass = None
-
-    # The class to use for creating comments
-    commentClass = None
-
-    # The class to use for creating doctypes
-    doctypeClass = None
-
-    # Fragment class
-    fragmentClass = None
-
-    def __init__(self, namespaceHTMLElements):
-        """Create a TreeBuilder
-
-        :arg namespaceHTMLElements: whether or not to namespace HTML elements
-
-        """
-        if namespaceHTMLElements:
-            self.defaultNamespace = "http://www.w3.org/1999/xhtml"
-        else:
-            self.defaultNamespace = None
-        self.reset()
-
-    def reset(self):
-        self.openElements = []
-        self.activeFormattingElements = ActiveFormattingElements()
-
-        # XXX - rename these to headElement, formElement
-        self.headPointer = None
-        self.formPointer = None
-
-        self.insertFromTable = False
-
-        self.document = self.documentClass()
-
-    def elementInScope(self, target, variant=None):
-
-        # If we pass a node in we match that. if we pass a string
-        # match any node with that name
-        exactNode = hasattr(target, "nameTuple")
-        if not exactNode:
-            if isinstance(target, text_type):
-                target = (namespaces["html"], target)
-            assert isinstance(target, tuple)
-
-        listElements, invert = listElementsMap[variant]
-
-        for node in reversed(self.openElements):
-            if exactNode and node == target:
-                return True
-            elif not exactNode and node.nameTuple == target:
-                return True
-            elif (invert ^ (node.nameTuple in listElements)):
-                return False
-
-        assert False  # We should never reach this point
-
-    def reconstructActiveFormattingElements(self):
-        # Within this algorithm the order of steps described in the
-        # specification is not quite the same as the order of steps in the
-        # code. It should still do the same though.
-
-        # Step 1: stop the algorithm when there's nothing to do.
-        if not self.activeFormattingElements:
-            return
-
-        # Step 2 and step 3: we start with the last element. So i is -1.
-        i = len(self.activeFormattingElements) - 1
-        entry = self.activeFormattingElements[i]
-        if entry == Marker or entry in self.openElements:
-            return
-
-        # Step 6
-        while entry != Marker and entry not in self.openElements:
-            if i == 0:
-                # This will be reset to 0 below
-                i = -1
-                break
-            i -= 1
-            # Step 5: let entry be one earlier in the list.
-            entry = self.activeFormattingElements[i]
-
-        while True:
-            # Step 7
-            i += 1
-
-            # Step 8
-            entry = self.activeFormattingElements[i]
-            clone = entry.cloneNode()  # Mainly to get a new copy of the attributes
-
-            # Step 9
-            element = self.insertElement({"type": "StartTag",
-                                          "name": clone.name,
-                                          "namespace": clone.namespace,
-                                          "data": clone.attributes})
-
-            # Step 10
-            self.activeFormattingElements[i] = element
-
-            # Step 11
-            if element == self.activeFormattingElements[-1]:
-                break
-
-    def clearActiveFormattingElements(self):
-        entry = self.activeFormattingElements.pop()
-        while self.activeFormattingElements and entry != Marker:
-            entry = self.activeFormattingElements.pop()
-
-    def elementInActiveFormattingElements(self, name):
-        """Check if an element exists between the end of the active
-        formatting elements and the last marker. If it does, return it, else
-        return false"""
-
-        for item in self.activeFormattingElements[::-1]:
-            # Check for Marker first because if it's a Marker it doesn't have a
-            # name attribute.
-            if item == Marker:
-                break
-            elif item.name == name:
-                return item
-        return False
-
-    def insertRoot(self, token):
-        element = self.createElement(token)
-        self.openElements.append(element)
-        self.document.appendChild(element)
-
-    def insertDoctype(self, token):
-        name = token["name"]
-        publicId = token["publicId"]
-        systemId = token["systemId"]
-
-        doctype = self.doctypeClass(name, publicId, systemId)
-        self.document.appendChild(doctype)
-
-    def insertComment(self, token, parent=None):
-        if parent is None:
-            parent = self.openElements[-1]
-        parent.appendChild(self.commentClass(token["data"]))
-
-    def createElement(self, token):
-        """Create an element but don't insert it anywhere"""
-        name = token["name"]
-        namespace = token.get("namespace", self.defaultNamespace)
-        element = self.elementClass(name, namespace)
-        element.attributes = token["data"]
-        return element
-
-    def _getInsertFromTable(self):
-        return self._insertFromTable
-
-    def _setInsertFromTable(self, value):
-        """Switch the function used to insert an element from the
-        normal one to the misnested table one and back again"""
-        self._insertFromTable = value
-        if value:
-            self.insertElement = self.insertElementTable
-        else:
-            self.insertElement = self.insertElementNormal
-
-    insertFromTable = property(_getInsertFromTable, _setInsertFromTable)
-
-    def insertElementNormal(self, token):
-        name = token["name"]
-        assert isinstance(name, text_type), "Element %s not unicode" % name
-        namespace = token.get("namespace", self.defaultNamespace)
-        element = self.elementClass(name, namespace)
-        element.attributes = token["data"]
-        self.openElements[-1].appendChild(element)
-        self.openElements.append(element)
-        return element
-
-    def insertElementTable(self, token):
-        """Create an element and insert it into the tree"""
-        element = self.createElement(token)
-        if self.openElements[-1].name not in tableInsertModeElements:
-            return self.insertElementNormal(token)
-        else:
-            # We should be in the InTable mode. This means we want to do
-            # special magic element rearranging
-            parent, insertBefore = self.getTableMisnestedNodePosition()
-            if insertBefore is None:
-                parent.appendChild(element)
-            else:
-                parent.insertBefore(element, insertBefore)
-            self.openElements.append(element)
-        return element
-
-    def insertText(self, data, parent=None):
-        """Insert text data."""
-        if parent is None:
-            parent = self.openElements[-1]
-
-        if (not self.insertFromTable or (self.insertFromTable and
-                                         self.openElements[-1].name
-                                         not in tableInsertModeElements)):
-            parent.insertText(data)
-        else:
-            # We should be in the InTable mode. This means we want to do
-            # special magic element rearranging
-            parent, insertBefore = self.getTableMisnestedNodePosition()
-            parent.insertText(data, insertBefore)
-
-    def getTableMisnestedNodePosition(self):
-        """Get the foster parent element, and sibling to insert before
-        (or None) when inserting a misnested table node"""
-        # The foster parent element is the one which comes before the most
-        # recently opened table element
-        # XXX - this is really inelegant
-        lastTable = None
-        fosterParent = None
-        insertBefore = None
-        for elm in self.openElements[::-1]:
-            if elm.name == "table":
-                lastTable = elm
-                break
-        if lastTable:
-            # XXX - we should really check that this parent is actually a
-            # node here
-            if lastTable.parent:
-                fosterParent = lastTable.parent
-                insertBefore = lastTable
-            else:
-                fosterParent = self.openElements[
-                    self.openElements.index(lastTable) - 1]
-        else:
-            fosterParent = self.openElements[0]
-        return fosterParent, insertBefore
-
-    def generateImpliedEndTags(self, exclude=None):
-        name = self.openElements[-1].name
-        # XXX td, th and tr are not actually needed
-        if (name in frozenset(("dd", "dt", "li", "option", "optgroup", "p", "rp", "rt")) and
-                name != exclude):
-            self.openElements.pop()
-            # XXX This is not entirely what the specification says. We should
-            # investigate it more closely.
-            self.generateImpliedEndTags(exclude)
-
-    def getDocument(self):
-        """Return the final tree"""
-        return self.document
-
-    def getFragment(self):
-        """Return the final fragment"""
-        # assert self.innerHTML
-        fragment = self.fragmentClass()
-        self.openElements[0].reparentChildren(fragment)
-        return fragment
-
-    def testSerializer(self, node):
-        """Serialize the subtree of node in the format required by unit tests
-
-        :arg node: the node from which to start serializing
-
-        """
-        raise NotImplementedError
diff --git a/lib/html5lib/treebuilders/dom.py b/lib/html5lib/treebuilders/dom.py
index d8b53004..61e5ed79 100644
--- a/lib/html5lib/treebuilders/dom.py
+++ b/lib/html5lib/treebuilders/dom.py
@@ -1,65 +1,54 @@
 from __future__ import absolute_import, division, unicode_literals
 
 
-try:
-    from collections.abc import MutableMapping
-except ImportError:  # Python 2.7
-    from collections import MutableMapping
 from xml.dom import minidom, Node
 import weakref
 
-from . import base
+from . import _base
 from .. import constants
 from ..constants import namespaces
-from .._utils import moduleFactoryFactory
+from ..utils import moduleFactoryFactory
 
 
 def getDomBuilder(DomImplementation):
     Dom = DomImplementation
 
-    class AttrList(MutableMapping):
+    class AttrList(object):
         def __init__(self, element):
             self.element = element
 
         def __iter__(self):
-            return iter(self.element.attributes.keys())
+            return list(self.element.attributes.items()).__iter__()
 
         def __setitem__(self, name, value):
-            if isinstance(name, tuple):
-                raise NotImplementedError
-            else:
-                attr = self.element.ownerDocument.createAttribute(name)
-                attr.value = value
-                self.element.attributes[name] = attr
+            self.element.setAttribute(name, value)
 
         def __len__(self):
-            return len(self.element.attributes)
+            return len(list(self.element.attributes.items()))
 
         def items(self):
-            return list(self.element.attributes.items())
+            return [(item[0], item[1]) for item in
+                    list(self.element.attributes.items())]
 
-        def values(self):
-            return list(self.element.attributes.values())
+        def keys(self):
+            return list(self.element.attributes.keys())
 
         def __getitem__(self, name):
+            return self.element.getAttribute(name)
+
+        def __contains__(self, name):
             if isinstance(name, tuple):
                 raise NotImplementedError
             else:
-                return self.element.attributes[name].value
+                return self.element.hasAttribute(name)
 
-        def __delitem__(self, name):
-            if isinstance(name, tuple):
-                raise NotImplementedError
-            else:
-                del self.element.attributes[name]
-
-    class NodeBuilder(base.Node):
+    class NodeBuilder(_base.Node):
         def __init__(self, element):
-            base.Node.__init__(self, element.nodeName)
+            _base.Node.__init__(self, element.nodeName)
             self.element = element
 
-        namespace = property(lambda self: hasattr(self.element, "namespaceURI") and
-                             self.element.namespaceURI or None)
+        namespace = property(lambda self: hasattr(self.element, "namespaceURI")
+                             and self.element.namespaceURI or None)
 
         def appendChild(self, node):
             node.parent = self
@@ -120,7 +109,7 @@ def getDomBuilder(DomImplementation):
 
         nameTuple = property(getNameTuple)
 
-    class TreeBuilder(base.TreeBuilder):  # pylint:disable=unused-variable
+    class TreeBuilder(_base.TreeBuilder):
         def documentClass(self):
             self.dom = Dom.getDOMImplementation().createDocument(None, None, None)
             return weakref.proxy(self)
@@ -160,17 +149,16 @@ def getDomBuilder(DomImplementation):
             return self.dom
 
         def getFragment(self):
-            return base.TreeBuilder.getFragment(self).element
+            return _base.TreeBuilder.getFragment(self).element
 
         def insertText(self, data, parent=None):
             data = data
             if parent != self:
-                base.TreeBuilder.insertText(self, data, parent)
+                _base.TreeBuilder.insertText(self, data, parent)
             else:
                 # HACK: allow text nodes as children of the document node
                 if hasattr(self.dom, '_child_node_types'):
-                    # pylint:disable=protected-access
-                    if Node.TEXT_NODE not in self.dom._child_node_types:
+                    if not Node.TEXT_NODE in self.dom._child_node_types:
                         self.dom._child_node_types = list(self.dom._child_node_types)
                         self.dom._child_node_types.append(Node.TEXT_NODE)
                 self.dom.appendChild(self.dom.createTextNode(data))
diff --git a/lib/html5lib/treebuilders/etree.py b/lib/html5lib/treebuilders/etree.py
index 086bed4e..2c8ed19f 100644
--- a/lib/html5lib/treebuilders/etree.py
+++ b/lib/html5lib/treebuilders/etree.py
@@ -1,17 +1,13 @@
 from __future__ import absolute_import, division, unicode_literals
-# pylint:disable=protected-access
-
 from six import text_type
 
 import re
 
-from copy import copy
-
-from . import base
-from .. import _ihatexml
+from . import _base
+from .. import ihatexml
 from .. import constants
 from ..constants import namespaces
-from .._utils import moduleFactoryFactory
+from ..utils import moduleFactoryFactory
 
 tag_regexp = re.compile("{([^}]*)}(.*)")
 
@@ -20,7 +16,7 @@ def getETreeBuilder(ElementTreeImplementation, fullTree=False):
     ElementTree = ElementTreeImplementation
     ElementTreeCommentType = ElementTree.Comment("asd").tag
 
-    class Element(base.Node):
+    class Element(_base.Node):
         def __init__(self, name, namespace=None):
             self._name = name
             self._namespace = namespace
@@ -63,17 +59,16 @@ def getETreeBuilder(ElementTreeImplementation, fullTree=False):
             return self._element.attrib
 
         def _setAttributes(self, attributes):
-            el_attrib = self._element.attrib
-            el_attrib.clear()
-            if attributes:
-                # calling .items _always_ allocates, and the above truthy check is cheaper than the
-                # allocation on average
-                for key, value in attributes.items():
-                    if isinstance(key, tuple):
-                        name = "{%s}%s" % (key[2], key[1])
-                    else:
-                        name = key
-                    el_attrib[name] = value
+            # Delete existing attributes first
+            # XXX - there may be a better way to do this...
+            for key in list(self._element.attrib.keys()):
+                del self._element.attrib[key]
+            for key, value in attributes.items():
+                if isinstance(key, tuple):
+                    name = "{%s}%s" % (key[2], key[1])
+                else:
+                    name = key
+                self._element.set(name, value)
 
         attributes = property(_getAttributes, _setAttributes)
 
@@ -103,7 +98,6 @@ def getETreeBuilder(ElementTreeImplementation, fullTree=False):
             node.parent = self
 
         def removeChild(self, node):
-            self._childNodes.remove(node)
             self._element.remove(node._element)
             node.parent = None
 
@@ -132,8 +126,8 @@ def getETreeBuilder(ElementTreeImplementation, fullTree=False):
 
         def cloneNode(self):
             element = type(self)(self.name, self.namespace)
-            if self._element.attrib:
-                element._element.attrib = copy(self._element.attrib)
+            for name, value in self.attributes.items():
+                element.attributes[name] = value
             return element
 
         def reparentChildren(self, newParent):
@@ -145,7 +139,7 @@ def getETreeBuilder(ElementTreeImplementation, fullTree=False):
                 if self._element.text is not None:
                     newParent._element.text += self._element.text
             self._element.text = ""
-            base.Node.reparentChildren(self, newParent)
+            _base.Node.reparentChildren(self, newParent)
 
     class Comment(Element):
         def __init__(self, data):
@@ -259,10 +253,10 @@ def getETreeBuilder(ElementTreeImplementation, fullTree=False):
 
         return "\n".join(rv)
 
-    def tostring(element):  # pylint:disable=unused-variable
+    def tostring(element):
         """Serialize an element and its child nodes to a string"""
         rv = []
-        filter = _ihatexml.InfosetFilter()
+        filter = ihatexml.InfosetFilter()
 
         def serializeElement(element):
             if isinstance(element, ElementTree.ElementTree):
@@ -313,7 +307,7 @@ def getETreeBuilder(ElementTreeImplementation, fullTree=False):
 
         return "".join(rv)
 
-    class TreeBuilder(base.TreeBuilder):  # pylint:disable=unused-variable
+    class TreeBuilder(_base.TreeBuilder):
         documentClass = Document
         doctypeClass = DocumentType
         elementClass = Element
@@ -335,7 +329,7 @@ def getETreeBuilder(ElementTreeImplementation, fullTree=False):
                     return self.document._element.find("html")
 
         def getFragment(self):
-            return base.TreeBuilder.getFragment(self)._element
+            return _base.TreeBuilder.getFragment(self)._element
 
     return locals()
 
diff --git a/lib/html5lib/treebuilders/etree_lxml.py b/lib/html5lib/treebuilders/etree_lxml.py
index e73de61a..35d08efa 100644
--- a/lib/html5lib/treebuilders/etree_lxml.py
+++ b/lib/html5lib/treebuilders/etree_lxml.py
@@ -10,25 +10,18 @@ When any of these things occur, we emit a DataLossWarning
 """
 
 from __future__ import absolute_import, division, unicode_literals
-# pylint:disable=protected-access
 
 import warnings
 import re
 import sys
 
-try:
-    from collections.abc import MutableMapping
-except ImportError:
-    from collections import MutableMapping
-
-from . import base
+from . import _base
 from ..constants import DataLossWarning
 from .. import constants
 from . import etree as etree_builders
-from .. import _ihatexml
+from .. import ihatexml
 
 import lxml.etree as etree
-from six import PY3, binary_type
 
 
 fullTree = True
@@ -50,11 +43,7 @@ class Document(object):
         self._childNodes = []
 
     def appendChild(self, element):
-        last = self._elementTree.getroot()
-        for last in self._elementTree.getroot().itersiblings():
-            pass
-
-        last.addnext(element._element)
+        self._elementTree.getroot().addnext(element._element)
 
     def _getChildNodes(self):
         return self._childNodes
@@ -64,7 +53,8 @@ class Document(object):
 
 def testSerializer(element):
     rv = []
-    infosetFilter = _ihatexml.InfosetFilter(preventDoubleDashComments=True)
+    finalText = None
+    infosetFilter = ihatexml.InfosetFilter()
 
     def serializeElement(element, indent=0):
         if not hasattr(element, "tag"):
@@ -89,7 +79,7 @@ def testSerializer(element):
                     next_element = next_element.getnext()
             elif isinstance(element, str) or isinstance(element, bytes):
                 # Text in a fragment
-                assert isinstance(element, str) or sys.version_info[0] == 2
+                assert isinstance(element, str) or sys.version_info.major == 2
                 rv.append("|%s\"%s\"" % (' ' * indent, element))
             else:
                 # Fragment case
@@ -138,12 +128,16 @@ def testSerializer(element):
                 rv.append("|%s\"%s\"" % (' ' * (indent - 2), element.tail))
     serializeElement(element, 0)
 
+    if finalText is not None:
+        rv.append("|%s\"%s\"" % (' ' * 2, finalText))
+
     return "\n".join(rv)
 
 
 def tostring(element):
     """Serialize an element and its child nodes to a string"""
     rv = []
+    finalText = None
 
     def serializeElement(element):
         if not hasattr(element, "tag"):
@@ -179,10 +173,13 @@ def tostring(element):
 
     serializeElement(element)
 
+    if finalText is not None:
+        rv.append("%s\"" % (' ' * 2, finalText))
+
     return "".join(rv)
 
 
-class TreeBuilder(base.TreeBuilder):
+class TreeBuilder(_base.TreeBuilder):
     documentClass = Document
     doctypeClass = DocumentType
     elementClass = None
@@ -192,40 +189,27 @@ class TreeBuilder(base.TreeBuilder):
 
     def __init__(self, namespaceHTMLElements, fullTree=False):
         builder = etree_builders.getETreeModule(etree, fullTree=fullTree)
-        infosetFilter = self.infosetFilter = _ihatexml.InfosetFilter(preventDoubleDashComments=True)
+        infosetFilter = self.infosetFilter = ihatexml.InfosetFilter()
         self.namespaceHTMLElements = namespaceHTMLElements
 
-        class Attributes(MutableMapping):
-            def __init__(self, element):
+        class Attributes(dict):
+            def __init__(self, element, value={}):
                 self._element = element
+                dict.__init__(self, value)
+                for key, value in self.items():
+                    if isinstance(key, tuple):
+                        name = "{%s}%s" % (key[2], infosetFilter.coerceAttribute(key[1]))
+                    else:
+                        name = infosetFilter.coerceAttribute(key)
+                    self._element._element.attrib[name] = value
 
-            def _coerceKey(self, key):
+            def __setitem__(self, key, value):
+                dict.__setitem__(self, key, value)
                 if isinstance(key, tuple):
                     name = "{%s}%s" % (key[2], infosetFilter.coerceAttribute(key[1]))
                 else:
                     name = infosetFilter.coerceAttribute(key)
-                return name
-
-            def __getitem__(self, key):
-                value = self._element._element.attrib[self._coerceKey(key)]
-                if not PY3 and isinstance(value, binary_type):
-                    value = value.decode("ascii")
-                return value
-
-            def __setitem__(self, key, value):
-                self._element._element.attrib[self._coerceKey(key)] = value
-
-            def __delitem__(self, key):
-                del self._element._element.attrib[self._coerceKey(key)]
-
-            def __iter__(self):
-                return iter(self._element._element.attrib)
-
-            def __len__(self):
-                return len(self._element._element.attrib)
-
-            def clear(self):
-                return self._element._element.attrib.clear()
+                self._element._element.attrib[name] = value
 
         class Element(builder.Element):
             def __init__(self, name, namespace):
@@ -246,10 +230,8 @@ class TreeBuilder(base.TreeBuilder):
             def _getAttributes(self):
                 return self._attributes
 
-            def _setAttributes(self, value):
-                attributes = self.attributes
-                attributes.clear()
-                attributes.update(value)
+            def _setAttributes(self, attributes):
+                self._attributes = Attributes(self, attributes)
 
             attributes = property(_getAttributes, _setAttributes)
 
@@ -257,11 +239,8 @@ class TreeBuilder(base.TreeBuilder):
                 data = infosetFilter.coerceCharacters(data)
                 builder.Element.insertText(self, data, insertBefore)
 
-            def cloneNode(self):
-                element = type(self)(self.name, self.namespace)
-                if self._element.attrib:
-                    element._element.attrib.update(self._element.attrib)
-                return element
+            def appendChild(self, child):
+                builder.Element.appendChild(self, child)
 
         class Comment(builder.Comment):
             def __init__(self, data):
@@ -278,12 +257,12 @@ class TreeBuilder(base.TreeBuilder):
             data = property(_getData, _setData)
 
         self.elementClass = Element
-        self.commentClass = Comment
+        self.commentClass = builder.Comment
         # self.fragmentClass = builder.DocumentFragment
-        base.TreeBuilder.__init__(self, namespaceHTMLElements)
+        _base.TreeBuilder.__init__(self, namespaceHTMLElements)
 
     def reset(self):
-        base.TreeBuilder.reset(self)
+        _base.TreeBuilder.reset(self)
         self.insertComment = self.insertCommentInitial
         self.initial_comments = []
         self.doctype = None
@@ -324,20 +303,19 @@ class TreeBuilder(base.TreeBuilder):
             self.doctype = doctype
 
     def insertCommentInitial(self, data, parent=None):
-        assert parent is None or parent is self.document
-        assert self.document._elementTree is None
         self.initial_comments.append(data)
 
     def insertCommentMain(self, data, parent=None):
         if (parent == self.document and
                 self.document._elementTree.getroot()[-1].tag == comment_type):
-            warnings.warn("lxml cannot represent adjacent comments beyond the root elements", DataLossWarning)
+                warnings.warn("lxml cannot represent adjacent comments beyond the root elements", DataLossWarning)
         super(TreeBuilder, self).insertComment(data, parent)
 
     def insertRoot(self, token):
+        """Create the document root"""
         # Because of the way libxml2 works, it doesn't seem to be possible to
         # alter information like the doctype after the tree has been parsed.
-        # Therefore we need to use the built-in parser to create our initial
+        # Therefore we need to use the built-in parser to create our iniial
         # tree, after which we can add elements like normal
         docStr = ""
         if self.doctype:
@@ -366,8 +344,7 @@ class TreeBuilder(base.TreeBuilder):
 
         # Append the initial comments:
         for comment_token in self.initial_comments:
-            comment = self.commentClass(comment_token["data"])
-            root.addprevious(comment._element)
+            root.addprevious(etree.Comment(comment_token["data"]))
 
         # Create the root document and add the ElementTree to it
         self.document = self.documentClass()
diff --git a/lib/html5lib/treewalkers/__init__.py b/lib/html5lib/treewalkers/__init__.py
index b2d3aac3..18124e75 100644
--- a/lib/html5lib/treewalkers/__init__.py
+++ b/lib/html5lib/treewalkers/__init__.py
@@ -2,18 +2,17 @@
 tree, generating tokens identical to those produced by the tokenizer
 module.
 
-To create a tree walker for a new type of tree, you need to
+To create a tree walker for a new type of tree, you need to do
 implement a tree walker object (called TreeWalker by convention) that
-implements a 'serialize' method which takes a tree as sole argument and
-returns an iterator which generates tokens.
+implements a 'serialize' method taking a tree as sole argument and
+returning an iterator generating tokens.
 """
 
 from __future__ import absolute_import, division, unicode_literals
 
-from .. import constants
-from .._utils import default_etree
+import sys
 
-__all__ = ["getTreeWalker", "pprint"]
+from ..utils import default_etree
 
 treeWalkerCache = {}
 
@@ -21,38 +20,34 @@ treeWalkerCache = {}
 def getTreeWalker(treeType, implementation=None, **kwargs):
     """Get a TreeWalker class for various types of tree with built-in support
 
-    :arg str treeType: the name of the tree type required (case-insensitive).
-        Supported values are:
+    treeType - the name of the tree type required (case-insensitive). Supported
+               values are:
 
-        * "dom": The xml.dom.minidom DOM implementation
-        * "etree": A generic walker for tree implementations exposing an
-          elementtree-like interface (known to work with ElementTree,
-          cElementTree and lxml.etree).
-        * "lxml": Optimized walker for lxml.etree
-        * "genshi": a Genshi stream
+                "dom" - The xml.dom.minidom DOM implementation
+                "pulldom" - The xml.dom.pulldom event stream
+                "etree" - A generic walker for tree implementations exposing an
+                          elementtree-like interface (known to work with
+                          ElementTree, cElementTree and lxml.etree).
+                "lxml" - Optimized walker for lxml.etree
+                "genshi" - a Genshi stream
 
-    :arg implementation: A module implementing the tree type e.g.
-        xml.etree.ElementTree or cElementTree (Currently applies to the "etree"
-        tree type only).
-
-    :arg kwargs: keyword arguments passed to the etree walker--for other
-        walkers, this has no effect
-
-    :returns: a TreeWalker class
-
-    """
+    implementation - (Currently applies to the "etree" tree type only). A module
+                      implementing the tree type e.g. xml.etree.ElementTree or
+                      cElementTree."""
 
     treeType = treeType.lower()
     if treeType not in treeWalkerCache:
-        if treeType == "dom":
-            from . import dom
-            treeWalkerCache[treeType] = dom.TreeWalker
+        if treeType in ("dom", "pulldom"):
+            name = "%s.%s" % (__name__, treeType)
+            __import__(name)
+            mod = sys.modules[name]
+            treeWalkerCache[treeType] = mod.TreeWalker
         elif treeType == "genshi":
-            from . import genshi
-            treeWalkerCache[treeType] = genshi.TreeWalker
+            from . import genshistream
+            treeWalkerCache[treeType] = genshistream.TreeWalker
         elif treeType == "lxml":
-            from . import etree_lxml
-            treeWalkerCache[treeType] = etree_lxml.TreeWalker
+            from . import lxmletree
+            treeWalkerCache[treeType] = lxmletree.TreeWalker
         elif treeType == "etree":
             from . import etree
             if implementation is None:
@@ -60,95 +55,3 @@ def getTreeWalker(treeType, implementation=None, **kwargs):
             # XXX: NEVER cache here, caching is done in the etree submodule
             return etree.getETreeModule(implementation, **kwargs).TreeWalker
     return treeWalkerCache.get(treeType)
-
-
-def concatenateCharacterTokens(tokens):
-    pendingCharacters = []
-    for token in tokens:
-        type = token["type"]
-        if type in ("Characters", "SpaceCharacters"):
-            pendingCharacters.append(token["data"])
-        else:
-            if pendingCharacters:
-                yield {"type": "Characters", "data": "".join(pendingCharacters)}
-                pendingCharacters = []
-            yield token
-    if pendingCharacters:
-        yield {"type": "Characters", "data": "".join(pendingCharacters)}
-
-
-def pprint(walker):
-    """Pretty printer for tree walkers
-
-    Takes a TreeWalker instance and pretty prints the output of walking the tree.
-
-    :arg walker: a TreeWalker instance
-
-    """
-    output = []
-    indent = 0
-    for token in concatenateCharacterTokens(walker):
-        type = token["type"]
-        if type in ("StartTag", "EmptyTag"):
-            # tag name
-            if token["namespace"] and token["namespace"] != constants.namespaces["html"]:
-                if token["namespace"] in constants.prefixes:
-                    ns = constants.prefixes[token["namespace"]]
-                else:
-                    ns = token["namespace"]
-                name = "%s %s" % (ns, token["name"])
-            else:
-                name = token["name"]
-            output.append("%s<%s>" % (" " * indent, name))
-            indent += 2
-            # attributes (sorted for consistent ordering)
-            attrs = token["data"]
-            for (namespace, localname), value in sorted(attrs.items()):
-                if namespace:
-                    if namespace in constants.prefixes:
-                        ns = constants.prefixes[namespace]
-                    else:
-                        ns = namespace
-                    name = "%s %s" % (ns, localname)
-                else:
-                    name = localname
-                output.append("%s%s=\"%s\"" % (" " * indent, name, value))
-            # self-closing
-            if type == "EmptyTag":
-                indent -= 2
-
-        elif type == "EndTag":
-            indent -= 2
-
-        elif type == "Comment":
-            output.append("%s<!-- %s -->" % (" " * indent, token["data"]))
-
-        elif type == "Doctype":
-            if token["name"]:
-                if token["publicId"]:
-                    output.append("""%s<!DOCTYPE %s "%s" "%s">""" %
-                                  (" " * indent,
-                                   token["name"],
-                                   token["publicId"],
-                                   token["systemId"] if token["systemId"] else ""))
-                elif token["systemId"]:
-                    output.append("""%s<!DOCTYPE %s "" "%s">""" %
-                                  (" " * indent,
-                                   token["name"],
-                                   token["systemId"]))
-                else:
-                    output.append("%s<!DOCTYPE %s>" % (" " * indent,
-                                                       token["name"]))
-            else:
-                output.append("%s<!DOCTYPE >" % (" " * indent,))
-
-        elif type == "Characters":
-            output.append("%s\"%s\"" % (" " * indent, token["data"]))
-
-        elif type == "SpaceCharacters":
-            assert False, "concatenateCharacterTokens should have got rid of all Space tokens"
-
-        else:
-            raise ValueError("Unknown token type, %s" % type)
-
-    return "\n".join(output)
diff --git a/lib/html5lib/treewalkers/_base.py b/lib/html5lib/treewalkers/_base.py
new file mode 100644
index 00000000..34252e50
--- /dev/null
+++ b/lib/html5lib/treewalkers/_base.py
@@ -0,0 +1,200 @@
+from __future__ import absolute_import, division, unicode_literals
+from six import text_type, string_types
+
+import gettext
+_ = gettext.gettext
+
+from xml.dom import Node
+
+DOCUMENT = Node.DOCUMENT_NODE
+DOCTYPE = Node.DOCUMENT_TYPE_NODE
+TEXT = Node.TEXT_NODE
+ELEMENT = Node.ELEMENT_NODE
+COMMENT = Node.COMMENT_NODE
+ENTITY = Node.ENTITY_NODE
+UNKNOWN = "<#UNKNOWN#>"
+
+from ..constants import voidElements, spaceCharacters
+spaceCharacters = "".join(spaceCharacters)
+
+
+def to_text(s, blank_if_none=True):
+    """Wrapper around six.text_type to convert None to empty string"""
+    if s is None:
+        if blank_if_none:
+            return ""
+        else:
+            return None
+    elif isinstance(s, text_type):
+        return s
+    else:
+        return text_type(s)
+
+
+def is_text_or_none(string):
+    """Wrapper around isinstance(string_types) or is None"""
+    return string is None or isinstance(string, string_types)
+
+
+class TreeWalker(object):
+    def __init__(self, tree):
+        self.tree = tree
+
+    def __iter__(self):
+        raise NotImplementedError
+
+    def error(self, msg):
+        return {"type": "SerializeError", "data": msg}
+
+    def emptyTag(self, namespace, name, attrs, hasChildren=False):
+        assert namespace is None or isinstance(namespace, string_types), type(namespace)
+        assert isinstance(name, string_types), type(name)
+        assert all((namespace is None or isinstance(namespace, string_types)) and
+                   isinstance(name, string_types) and
+                   isinstance(value, string_types)
+                   for (namespace, name), value in attrs.items())
+
+        yield {"type": "EmptyTag", "name": to_text(name, False),
+               "namespace": to_text(namespace),
+               "data": attrs}
+        if hasChildren:
+            yield self.error(_("Void element has children"))
+
+    def startTag(self, namespace, name, attrs):
+        assert namespace is None or isinstance(namespace, string_types), type(namespace)
+        assert isinstance(name, string_types), type(name)
+        assert all((namespace is None or isinstance(namespace, string_types)) and
+                   isinstance(name, string_types) and
+                   isinstance(value, string_types)
+                   for (namespace, name), value in attrs.items())
+
+        return {"type": "StartTag",
+                "name": text_type(name),
+                "namespace": to_text(namespace),
+                "data": dict(((to_text(namespace, False), to_text(name)),
+                              to_text(value, False))
+                             for (namespace, name), value in attrs.items())}
+
+    def endTag(self, namespace, name):
+        assert namespace is None or isinstance(namespace, string_types), type(namespace)
+        assert isinstance(name, string_types), type(namespace)
+
+        return {"type": "EndTag",
+                "name": to_text(name, False),
+                "namespace": to_text(namespace),
+                "data": {}}
+
+    def text(self, data):
+        assert isinstance(data, string_types), type(data)
+
+        data = to_text(data)
+        middle = data.lstrip(spaceCharacters)
+        left = data[:len(data) - len(middle)]
+        if left:
+            yield {"type": "SpaceCharacters", "data": left}
+        data = middle
+        middle = data.rstrip(spaceCharacters)
+        right = data[len(middle):]
+        if middle:
+            yield {"type": "Characters", "data": middle}
+        if right:
+            yield {"type": "SpaceCharacters", "data": right}
+
+    def comment(self, data):
+        assert isinstance(data, string_types), type(data)
+
+        return {"type": "Comment", "data": text_type(data)}
+
+    def doctype(self, name, publicId=None, systemId=None, correct=True):
+        assert is_text_or_none(name), type(name)
+        assert is_text_or_none(publicId), type(publicId)
+        assert is_text_or_none(systemId), type(systemId)
+
+        return {"type": "Doctype",
+                "name": to_text(name),
+                "publicId": to_text(publicId),
+                "systemId": to_text(systemId),
+                "correct": to_text(correct)}
+
+    def entity(self, name):
+        assert isinstance(name, string_types), type(name)
+
+        return {"type": "Entity", "name": text_type(name)}
+
+    def unknown(self, nodeType):
+        return self.error(_("Unknown node type: ") + nodeType)
+
+
+class NonRecursiveTreeWalker(TreeWalker):
+    def getNodeDetails(self, node):
+        raise NotImplementedError
+
+    def getFirstChild(self, node):
+        raise NotImplementedError
+
+    def getNextSibling(self, node):
+        raise NotImplementedError
+
+    def getParentNode(self, node):
+        raise NotImplementedError
+
+    def __iter__(self):
+        currentNode = self.tree
+        while currentNode is not None:
+            details = self.getNodeDetails(currentNode)
+            type, details = details[0], details[1:]
+            hasChildren = False
+
+            if type == DOCTYPE:
+                yield self.doctype(*details)
+
+            elif type == TEXT:
+                for token in self.text(*details):
+                    yield token
+
+            elif type == ELEMENT:
+                namespace, name, attributes, hasChildren = details
+                if name in voidElements:
+                    for token in self.emptyTag(namespace, name, attributes,
+                                               hasChildren):
+                        yield token
+                    hasChildren = False
+                else:
+                    yield self.startTag(namespace, name, attributes)
+
+            elif type == COMMENT:
+                yield self.comment(details[0])
+
+            elif type == ENTITY:
+                yield self.entity(details[0])
+
+            elif type == DOCUMENT:
+                hasChildren = True
+
+            else:
+                yield self.unknown(details[0])
+
+            if hasChildren:
+                firstChild = self.getFirstChild(currentNode)
+            else:
+                firstChild = None
+
+            if firstChild is not None:
+                currentNode = firstChild
+            else:
+                while currentNode is not None:
+                    details = self.getNodeDetails(currentNode)
+                    type, details = details[0], details[1:]
+                    if type == ELEMENT:
+                        namespace, name, attributes, hasChildren = details
+                        if name not in voidElements:
+                            yield self.endTag(namespace, name)
+                    if self.tree is currentNode:
+                        currentNode = None
+                        break
+                    nextSibling = self.getNextSibling(currentNode)
+                    if nextSibling is not None:
+                        currentNode = nextSibling
+                        break
+                    else:
+                        currentNode = self.getParentNode(currentNode)
diff --git a/lib/html5lib/treewalkers/base.py b/lib/html5lib/treewalkers/base.py
deleted file mode 100644
index 80c474c4..00000000
--- a/lib/html5lib/treewalkers/base.py
+++ /dev/null
@@ -1,252 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-from xml.dom import Node
-from ..constants import namespaces, voidElements, spaceCharacters
-
-__all__ = ["DOCUMENT", "DOCTYPE", "TEXT", "ELEMENT", "COMMENT", "ENTITY", "UNKNOWN",
-           "TreeWalker", "NonRecursiveTreeWalker"]
-
-DOCUMENT = Node.DOCUMENT_NODE
-DOCTYPE = Node.DOCUMENT_TYPE_NODE
-TEXT = Node.TEXT_NODE
-ELEMENT = Node.ELEMENT_NODE
-COMMENT = Node.COMMENT_NODE
-ENTITY = Node.ENTITY_NODE
-UNKNOWN = "<#UNKNOWN#>"
-
-spaceCharacters = "".join(spaceCharacters)
-
-
-class TreeWalker(object):
-    """Walks a tree yielding tokens
-
-    Tokens are dicts that all have a ``type`` field specifying the type of the
-    token.
-
-    """
-    def __init__(self, tree):
-        """Creates a TreeWalker
-
-        :arg tree: the tree to walk
-
-        """
-        self.tree = tree
-
-    def __iter__(self):
-        raise NotImplementedError
-
-    def error(self, msg):
-        """Generates an error token with the given message
-
-        :arg msg: the error message
-
-        :returns: SerializeError token
-
-        """
-        return {"type": "SerializeError", "data": msg}
-
-    def emptyTag(self, namespace, name, attrs, hasChildren=False):
-        """Generates an EmptyTag token
-
-        :arg namespace: the namespace of the token--can be ``None``
-
-        :arg name: the name of the element
-
-        :arg attrs: the attributes of the element as a dict
-
-        :arg hasChildren: whether or not to yield a SerializationError because
-            this tag shouldn't have children
-
-        :returns: EmptyTag token
-
-        """
-        yield {"type": "EmptyTag", "name": name,
-               "namespace": namespace,
-               "data": attrs}
-        if hasChildren:
-            yield self.error("Void element has children")
-
-    def startTag(self, namespace, name, attrs):
-        """Generates a StartTag token
-
-        :arg namespace: the namespace of the token--can be ``None``
-
-        :arg name: the name of the element
-
-        :arg attrs: the attributes of the element as a dict
-
-        :returns: StartTag token
-
-        """
-        return {"type": "StartTag",
-                "name": name,
-                "namespace": namespace,
-                "data": attrs}
-
-    def endTag(self, namespace, name):
-        """Generates an EndTag token
-
-        :arg namespace: the namespace of the token--can be ``None``
-
-        :arg name: the name of the element
-
-        :returns: EndTag token
-
-        """
-        return {"type": "EndTag",
-                "name": name,
-                "namespace": namespace}
-
-    def text(self, data):
-        """Generates SpaceCharacters and Characters tokens
-
-        Depending on what's in the data, this generates one or more
-        ``SpaceCharacters`` and ``Characters`` tokens.
-
-        For example:
-
-            >>> from html5lib.treewalkers.base import TreeWalker
-            >>> # Give it an empty tree just so it instantiates
-            >>> walker = TreeWalker([])
-            >>> list(walker.text(''))
-            []
-            >>> list(walker.text('  '))
-            [{u'data': '  ', u'type': u'SpaceCharacters'}]
-            >>> list(walker.text(' abc '))  # doctest: +NORMALIZE_WHITESPACE
-            [{u'data': ' ', u'type': u'SpaceCharacters'},
-            {u'data': u'abc', u'type': u'Characters'},
-            {u'data': u' ', u'type': u'SpaceCharacters'}]
-
-        :arg data: the text data
-
-        :returns: one or more ``SpaceCharacters`` and ``Characters`` tokens
-
-        """
-        data = data
-        middle = data.lstrip(spaceCharacters)
-        left = data[:len(data) - len(middle)]
-        if left:
-            yield {"type": "SpaceCharacters", "data": left}
-        data = middle
-        middle = data.rstrip(spaceCharacters)
-        right = data[len(middle):]
-        if middle:
-            yield {"type": "Characters", "data": middle}
-        if right:
-            yield {"type": "SpaceCharacters", "data": right}
-
-    def comment(self, data):
-        """Generates a Comment token
-
-        :arg data: the comment
-
-        :returns: Comment token
-
-        """
-        return {"type": "Comment", "data": data}
-
-    def doctype(self, name, publicId=None, systemId=None):
-        """Generates a Doctype token
-
-        :arg name:
-
-        :arg publicId:
-
-        :arg systemId:
-
-        :returns: the Doctype token
-
-        """
-        return {"type": "Doctype",
-                "name": name,
-                "publicId": publicId,
-                "systemId": systemId}
-
-    def entity(self, name):
-        """Generates an Entity token
-
-        :arg name: the entity name
-
-        :returns: an Entity token
-
-        """
-        return {"type": "Entity", "name": name}
-
-    def unknown(self, nodeType):
-        """Handles unknown node types"""
-        return self.error("Unknown node type: " + nodeType)
-
-
-class NonRecursiveTreeWalker(TreeWalker):
-    def getNodeDetails(self, node):
-        raise NotImplementedError
-
-    def getFirstChild(self, node):
-        raise NotImplementedError
-
-    def getNextSibling(self, node):
-        raise NotImplementedError
-
-    def getParentNode(self, node):
-        raise NotImplementedError
-
-    def __iter__(self):
-        currentNode = self.tree
-        while currentNode is not None:
-            details = self.getNodeDetails(currentNode)
-            type, details = details[0], details[1:]
-            hasChildren = False
-
-            if type == DOCTYPE:
-                yield self.doctype(*details)
-
-            elif type == TEXT:
-                for token in self.text(*details):
-                    yield token
-
-            elif type == ELEMENT:
-                namespace, name, attributes, hasChildren = details
-                if (not namespace or namespace == namespaces["html"]) and name in voidElements:
-                    for token in self.emptyTag(namespace, name, attributes,
-                                               hasChildren):
-                        yield token
-                    hasChildren = False
-                else:
-                    yield self.startTag(namespace, name, attributes)
-
-            elif type == COMMENT:
-                yield self.comment(details[0])
-
-            elif type == ENTITY:
-                yield self.entity(details[0])
-
-            elif type == DOCUMENT:
-                hasChildren = True
-
-            else:
-                yield self.unknown(details[0])
-
-            if hasChildren:
-                firstChild = self.getFirstChild(currentNode)
-            else:
-                firstChild = None
-
-            if firstChild is not None:
-                currentNode = firstChild
-            else:
-                while currentNode is not None:
-                    details = self.getNodeDetails(currentNode)
-                    type, details = details[0], details[1:]
-                    if type == ELEMENT:
-                        namespace, name, attributes, hasChildren = details
-                        if (namespace and namespace != namespaces["html"]) or name not in voidElements:
-                            yield self.endTag(namespace, name)
-                    if self.tree is currentNode:
-                        currentNode = None
-                        break
-                    nextSibling = self.getNextSibling(currentNode)
-                    if nextSibling is not None:
-                        currentNode = nextSibling
-                        break
-                    else:
-                        currentNode = self.getParentNode(currentNode)
diff --git a/lib/html5lib/treewalkers/dom.py b/lib/html5lib/treewalkers/dom.py
index b0c89b00..a01287a9 100644
--- a/lib/html5lib/treewalkers/dom.py
+++ b/lib/html5lib/treewalkers/dom.py
@@ -2,16 +2,19 @@ from __future__ import absolute_import, division, unicode_literals
 
 from xml.dom import Node
 
-from . import base
+import gettext
+_ = gettext.gettext
+
+from . import _base
 
 
-class TreeWalker(base.NonRecursiveTreeWalker):
+class TreeWalker(_base.NonRecursiveTreeWalker):
     def getNodeDetails(self, node):
         if node.nodeType == Node.DOCUMENT_TYPE_NODE:
-            return base.DOCTYPE, node.name, node.publicId, node.systemId
+            return _base.DOCTYPE, node.name, node.publicId, node.systemId
 
         elif node.nodeType in (Node.TEXT_NODE, Node.CDATA_SECTION_NODE):
-            return base.TEXT, node.nodeValue
+            return _base.TEXT, node.nodeValue
 
         elif node.nodeType == Node.ELEMENT_NODE:
             attrs = {}
@@ -21,17 +24,17 @@ class TreeWalker(base.NonRecursiveTreeWalker):
                     attrs[(attr.namespaceURI, attr.localName)] = attr.value
                 else:
                     attrs[(None, attr.name)] = attr.value
-            return (base.ELEMENT, node.namespaceURI, node.nodeName,
+            return (_base.ELEMENT, node.namespaceURI, node.nodeName,
                     attrs, node.hasChildNodes())
 
         elif node.nodeType == Node.COMMENT_NODE:
-            return base.COMMENT, node.nodeValue
+            return _base.COMMENT, node.nodeValue
 
         elif node.nodeType in (Node.DOCUMENT_NODE, Node.DOCUMENT_FRAGMENT_NODE):
-            return (base.DOCUMENT,)
+            return (_base.DOCUMENT,)
 
         else:
-            return base.UNKNOWN, node.nodeType
+            return _base.UNKNOWN, node.nodeType
 
     def getFirstChild(self, node):
         return node.firstChild
diff --git a/lib/html5lib/treewalkers/etree.py b/lib/html5lib/treewalkers/etree.py
index 44653372..fd8a9cc9 100644
--- a/lib/html5lib/treewalkers/etree.py
+++ b/lib/html5lib/treewalkers/etree.py
@@ -1,12 +1,21 @@
 from __future__ import absolute_import, division, unicode_literals
 
-from collections import OrderedDict
+try:
+    from collections import OrderedDict
+except ImportError:
+    try:
+        from ordereddict import OrderedDict
+    except ImportError:
+        OrderedDict = dict
+import gettext
+_ = gettext.gettext
+
 import re
 
-from six import string_types
+from six import text_type
 
-from . import base
-from .._utils import moduleFactoryFactory
+from . import _base
+from ..utils import moduleFactoryFactory
 
 tag_regexp = re.compile("{([^}]*)}(.*)")
 
@@ -15,7 +24,7 @@ def getETreeBuilder(ElementTreeImplementation):
     ElementTree = ElementTreeImplementation
     ElementTreeCommentType = ElementTree.Comment("asd").tag
 
-    class TreeWalker(base.NonRecursiveTreeWalker):  # pylint:disable=unused-variable
+    class TreeWalker(_base.NonRecursiveTreeWalker):
         """Given the particular ElementTree representation, this implementation,
         to avoid using recursion, returns "nodes" as tuples with the following
         content:
@@ -31,9 +40,9 @@ def getETreeBuilder(ElementTreeImplementation):
         """
         def getNodeDetails(self, node):
             if isinstance(node, tuple):  # It might be the root Element
-                elt, _, _, flag = node
+                elt, key, parents, flag = node
                 if flag in ("text", "tail"):
-                    return base.TEXT, getattr(elt, flag)
+                    return _base.TEXT, getattr(elt, flag)
                 else:
                     node = elt
 
@@ -41,17 +50,17 @@ def getETreeBuilder(ElementTreeImplementation):
                 node = node.getroot()
 
             if node.tag in ("DOCUMENT_ROOT", "DOCUMENT_FRAGMENT"):
-                return (base.DOCUMENT,)
+                return (_base.DOCUMENT,)
 
             elif node.tag == "<!DOCTYPE>":
-                return (base.DOCTYPE, node.text,
+                return (_base.DOCTYPE, node.text,
                         node.get("publicId"), node.get("systemId"))
 
             elif node.tag == ElementTreeCommentType:
-                return base.COMMENT, node.text
+                return _base.COMMENT, node.text
 
             else:
-                assert isinstance(node.tag, string_types), type(node.tag)
+                assert type(node.tag) == text_type, type(node.tag)
                 # This is assumed to be an ordinary element
                 match = tag_regexp.match(node.tag)
                 if match:
@@ -66,7 +75,7 @@ def getETreeBuilder(ElementTreeImplementation):
                         attrs[(match.group(1), match.group(2))] = value
                     else:
                         attrs[(None, name)] = value
-                return (base.ELEMENT, namespace, tag,
+                return (_base.ELEMENT, namespace, tag,
                         attrs, len(node) or node.text)
 
         def getFirstChild(self, node):
@@ -122,10 +131,8 @@ def getETreeBuilder(ElementTreeImplementation):
                 if not parents:
                     return parent
                 else:
-                    assert list(parents[-1]).count(parent) == 1
                     return parent, list(parents[-1]).index(parent), parents, None
 
     return locals()
 
-
 getETreeModule = moduleFactoryFactory(getETreeBuilder)
diff --git a/lib/html5lib/treewalkers/etree_lxml.py b/lib/html5lib/treewalkers/etree_lxml.py
deleted file mode 100644
index a614ac5b..00000000
--- a/lib/html5lib/treewalkers/etree_lxml.py
+++ /dev/null
@@ -1,215 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-from six import text_type
-
-from collections import OrderedDict
-
-from lxml import etree
-from ..treebuilders.etree import tag_regexp
-
-from . import base
-
-from .. import _ihatexml
-
-
-def ensure_str(s):
-    if s is None:
-        return None
-    elif isinstance(s, text_type):
-        return s
-    else:
-        return s.decode("ascii", "strict")
-
-
-class Root(object):
-    def __init__(self, et):
-        self.elementtree = et
-        self.children = []
-
-        try:
-            if et.docinfo.internalDTD:
-                self.children.append(Doctype(self,
-                                             ensure_str(et.docinfo.root_name),
-                                             ensure_str(et.docinfo.public_id),
-                                             ensure_str(et.docinfo.system_url)))
-        except AttributeError:
-            pass
-
-        try:
-            node = et.getroot()
-        except AttributeError:
-            node = et
-
-        while node.getprevious() is not None:
-            node = node.getprevious()
-        while node is not None:
-            self.children.append(node)
-            node = node.getnext()
-
-        self.text = None
-        self.tail = None
-
-    def __getitem__(self, key):
-        return self.children[key]
-
-    def getnext(self):
-        return None
-
-    def __len__(self):
-        return 1
-
-
-class Doctype(object):
-    def __init__(self, root_node, name, public_id, system_id):
-        self.root_node = root_node
-        self.name = name
-        self.public_id = public_id
-        self.system_id = system_id
-
-        self.text = None
-        self.tail = None
-
-    def getnext(self):
-        return self.root_node.children[1]
-
-
-class FragmentRoot(Root):
-    def __init__(self, children):
-        self.children = [FragmentWrapper(self, child) for child in children]
-        self.text = self.tail = None
-
-    def getnext(self):
-        return None
-
-
-class FragmentWrapper(object):
-    def __init__(self, fragment_root, obj):
-        self.root_node = fragment_root
-        self.obj = obj
-        if hasattr(self.obj, 'text'):
-            self.text = ensure_str(self.obj.text)
-        else:
-            self.text = None
-        if hasattr(self.obj, 'tail'):
-            self.tail = ensure_str(self.obj.tail)
-        else:
-            self.tail = None
-
-    def __getattr__(self, name):
-        return getattr(self.obj, name)
-
-    def getnext(self):
-        siblings = self.root_node.children
-        idx = siblings.index(self)
-        if idx < len(siblings) - 1:
-            return siblings[idx + 1]
-        else:
-            return None
-
-    def __getitem__(self, key):
-        return self.obj[key]
-
-    def __bool__(self):
-        return bool(self.obj)
-
-    def getparent(self):
-        return None
-
-    def __str__(self):
-        return str(self.obj)
-
-    def __unicode__(self):
-        return str(self.obj)
-
-    def __len__(self):
-        return len(self.obj)
-
-
-class TreeWalker(base.NonRecursiveTreeWalker):
-    def __init__(self, tree):
-        # pylint:disable=redefined-variable-type
-        if isinstance(tree, list):
-            self.fragmentChildren = set(tree)
-            tree = FragmentRoot(tree)
-        else:
-            self.fragmentChildren = set()
-            tree = Root(tree)
-        base.NonRecursiveTreeWalker.__init__(self, tree)
-        self.filter = _ihatexml.InfosetFilter()
-
-    def getNodeDetails(self, node):
-        if isinstance(node, tuple):  # Text node
-            node, key = node
-            assert key in ("text", "tail"), "Text nodes are text or tail, found %s" % key
-            return base.TEXT, ensure_str(getattr(node, key))
-
-        elif isinstance(node, Root):
-            return (base.DOCUMENT,)
-
-        elif isinstance(node, Doctype):
-            return base.DOCTYPE, node.name, node.public_id, node.system_id
-
-        elif isinstance(node, FragmentWrapper) and not hasattr(node, "tag"):
-            return base.TEXT, ensure_str(node.obj)
-
-        elif node.tag == etree.Comment:
-            return base.COMMENT, ensure_str(node.text)
-
-        elif node.tag == etree.Entity:
-            return base.ENTITY, ensure_str(node.text)[1:-1]  # strip &;
-
-        else:
-            # This is assumed to be an ordinary element
-            match = tag_regexp.match(ensure_str(node.tag))
-            if match:
-                namespace, tag = match.groups()
-            else:
-                namespace = None
-                tag = ensure_str(node.tag)
-            attrs = OrderedDict()
-            for name, value in list(node.attrib.items()):
-                name = ensure_str(name)
-                value = ensure_str(value)
-                match = tag_regexp.match(name)
-                if match:
-                    attrs[(match.group(1), match.group(2))] = value
-                else:
-                    attrs[(None, name)] = value
-            return (base.ELEMENT, namespace, self.filter.fromXmlName(tag),
-                    attrs, len(node) > 0 or node.text)
-
-    def getFirstChild(self, node):
-        assert not isinstance(node, tuple), "Text nodes have no children"
-
-        assert len(node) or node.text, "Node has no children"
-        if node.text:
-            return (node, "text")
-        else:
-            return node[0]
-
-    def getNextSibling(self, node):
-        if isinstance(node, tuple):  # Text node
-            node, key = node
-            assert key in ("text", "tail"), "Text nodes are text or tail, found %s" % key
-            if key == "text":
-                # XXX: we cannot use a "bool(node) and node[0] or None" construct here
-                # because node[0] might evaluate to False if it has no child element
-                if len(node):
-                    return node[0]
-                else:
-                    return None
-            else:  # tail
-                return node.getnext()
-
-        return (node, "tail") if node.tail else node.getnext()
-
-    def getParentNode(self, node):
-        if isinstance(node, tuple):  # Text node
-            node, key = node
-            assert key in ("text", "tail"), "Text nodes are text or tail, found %s" % key
-            if key == "text":
-                return node
-            # else: fallback to "normal" processing
-        elif node in self.fragmentChildren:
-            return None
-
-        return node.getparent()
diff --git a/lib/html5lib/treewalkers/genshi.py b/lib/html5lib/treewalkers/genshi.py
deleted file mode 100644
index 7483be27..00000000
--- a/lib/html5lib/treewalkers/genshi.py
+++ /dev/null
@@ -1,69 +0,0 @@
-from __future__ import absolute_import, division, unicode_literals
-
-from genshi.core import QName
-from genshi.core import START, END, XML_NAMESPACE, DOCTYPE, TEXT
-from genshi.core import START_NS, END_NS, START_CDATA, END_CDATA, PI, COMMENT
-
-from . import base
-
-from ..constants import voidElements, namespaces
-
-
-class TreeWalker(base.TreeWalker):
-    def __iter__(self):
-        # Buffer the events so we can pass in the following one
-        previous = None
-        for event in self.tree:
-            if previous is not None:
-                for token in self.tokens(previous, event):
-                    yield token
-            previous = event
-
-        # Don't forget the final event!
-        if previous is not None:
-            for token in self.tokens(previous, None):
-                yield token
-
-    def tokens(self, event, next):
-        kind, data, _ = event
-        if kind == START:
-            tag, attribs = data
-            name = tag.localname
-            namespace = tag.namespace
-            converted_attribs = {}
-            for k, v in attribs:
-                if isinstance(k, QName):
-                    converted_attribs[(k.namespace, k.localname)] = v
-                else:
-                    converted_attribs[(None, k)] = v
-
-            if namespace == namespaces["html"] and name in voidElements:
-                for token in self.emptyTag(namespace, name, converted_attribs,
-                                           not next or next[0] != END or
-                                           next[1] != tag):
-                    yield token
-            else:
-                yield self.startTag(namespace, name, converted_attribs)
-
-        elif kind == END:
-            name = data.localname
-            namespace = data.namespace
-            if namespace != namespaces["html"] or name not in voidElements:
-                yield self.endTag(namespace, name)
-
-        elif kind == COMMENT:
-            yield self.comment(data)
-
-        elif kind == TEXT:
-            for token in self.text(data):
-                yield token
-
-        elif kind == DOCTYPE:
-            yield self.doctype(*data)
-
-        elif kind in (XML_NAMESPACE, DOCTYPE, START_NS, END_NS,
-                      START_CDATA, END_CDATA, PI):
-            pass
-
-        else:
-            yield self.unknown(kind)
diff --git a/lib/html5lib/treewalkers/genshistream.py b/lib/html5lib/treewalkers/genshistream.py
new file mode 100644
index 00000000..f559c45d
--- /dev/null
+++ b/lib/html5lib/treewalkers/genshistream.py
@@ -0,0 +1,69 @@
+from __future__ import absolute_import, division, unicode_literals
+
+from genshi.core import QName
+from genshi.core import START, END, XML_NAMESPACE, DOCTYPE, TEXT
+from genshi.core import START_NS, END_NS, START_CDATA, END_CDATA, PI, COMMENT
+
+from . import _base
+
+from ..constants import voidElements, namespaces
+
+
+class TreeWalker(_base.TreeWalker):
+    def __iter__(self):
+        # Buffer the events so we can pass in the following one
+        previous = None
+        for event in self.tree:
+            if previous is not None:
+                for token in self.tokens(previous, event):
+                    yield token
+            previous = event
+
+        # Don't forget the final event!
+        if previous is not None:
+            for token in self.tokens(previous, None):
+                yield token
+
+    def tokens(self, event, next):
+        kind, data, pos = event
+        if kind == START:
+            tag, attribs = data
+            name = tag.localname
+            namespace = tag.namespace
+            converted_attribs = {}
+            for k, v in attribs:
+                if isinstance(k, QName):
+                    converted_attribs[(k.namespace, k.localname)] = v
+                else:
+                    converted_attribs[(None, k)] = v
+
+            if namespace == namespaces["html"] and name in voidElements:
+                for token in self.emptyTag(namespace, name, converted_attribs,
+                                           not next or next[0] != END
+                                           or next[1] != tag):
+                    yield token
+            else:
+                yield self.startTag(namespace, name, converted_attribs)
+
+        elif kind == END:
+            name = data.localname
+            namespace = data.namespace
+            if name not in voidElements:
+                yield self.endTag(namespace, name)
+
+        elif kind == COMMENT:
+            yield self.comment(data)
+
+        elif kind == TEXT:
+            for token in self.text(data):
+                yield token
+
+        elif kind == DOCTYPE:
+            yield self.doctype(*data)
+
+        elif kind in (XML_NAMESPACE, DOCTYPE, START_NS, END_NS,
+                      START_CDATA, END_CDATA, PI):
+            pass
+
+        else:
+            yield self.unknown(kind)
diff --git a/lib/html5lib/treewalkers/lxmletree.py b/lib/html5lib/treewalkers/lxmletree.py
new file mode 100644
index 00000000..bc934ac0
--- /dev/null
+++ b/lib/html5lib/treewalkers/lxmletree.py
@@ -0,0 +1,204 @@
+from __future__ import absolute_import, division, unicode_literals
+from six import text_type
+
+from lxml import etree
+from ..treebuilders.etree import tag_regexp
+
+from gettext import gettext
+_ = gettext
+
+from . import _base
+
+from .. import ihatexml
+
+
+def ensure_str(s):
+    if s is None:
+        return None
+    elif isinstance(s, text_type):
+        return s
+    else:
+        return s.decode("utf-8", "strict")
+
+
+class Root(object):
+    def __init__(self, et):
+        self.elementtree = et
+        self.children = []
+        if et.docinfo.internalDTD:
+            self.children.append(Doctype(self,
+                                         ensure_str(et.docinfo.root_name),
+                                         ensure_str(et.docinfo.public_id),
+                                         ensure_str(et.docinfo.system_url)))
+        root = et.getroot()
+        node = root
+
+        while node.getprevious() is not None:
+            node = node.getprevious()
+        while node is not None:
+            self.children.append(node)
+            node = node.getnext()
+
+        self.text = None
+        self.tail = None
+
+    def __getitem__(self, key):
+        return self.children[key]
+
+    def getnext(self):
+        return None
+
+    def __len__(self):
+        return 1
+
+
+class Doctype(object):
+    def __init__(self, root_node, name, public_id, system_id):
+        self.root_node = root_node
+        self.name = name
+        self.public_id = public_id
+        self.system_id = system_id
+
+        self.text = None
+        self.tail = None
+
+    def getnext(self):
+        return self.root_node.children[1]
+
+
+class FragmentRoot(Root):
+    def __init__(self, children):
+        self.children = [FragmentWrapper(self, child) for child in children]
+        self.text = self.tail = None
+
+    def getnext(self):
+        return None
+
+
+class FragmentWrapper(object):
+    def __init__(self, fragment_root, obj):
+        self.root_node = fragment_root
+        self.obj = obj
+        if hasattr(self.obj, 'text'):
+            self.text = ensure_str(self.obj.text)
+        else:
+            self.text = None
+        if hasattr(self.obj, 'tail'):
+            self.tail = ensure_str(self.obj.tail)
+        else:
+            self.tail = None
+
+    def __getattr__(self, name):
+        return getattr(self.obj, name)
+
+    def getnext(self):
+        siblings = self.root_node.children
+        idx = siblings.index(self)
+        if idx < len(siblings) - 1:
+            return siblings[idx + 1]
+        else:
+            return None
+
+    def __getitem__(self, key):
+        return self.obj[key]
+
+    def __bool__(self):
+        return bool(self.obj)
+
+    def getparent(self):
+        return None
+
+    def __str__(self):
+        return str(self.obj)
+
+    def __unicode__(self):
+        return str(self.obj)
+
+    def __len__(self):
+        return len(self.obj)
+
+
+class TreeWalker(_base.NonRecursiveTreeWalker):
+    def __init__(self, tree):
+        if hasattr(tree, "getroot"):
+            tree = Root(tree)
+        elif isinstance(tree, list):
+            tree = FragmentRoot(tree)
+        _base.NonRecursiveTreeWalker.__init__(self, tree)
+        self.filter = ihatexml.InfosetFilter()
+
+    def getNodeDetails(self, node):
+        if isinstance(node, tuple):  # Text node
+            node, key = node
+            assert key in ("text", "tail"), _("Text nodes are text or tail, found %s") % key
+            return _base.TEXT, ensure_str(getattr(node, key))
+
+        elif isinstance(node, Root):
+            return (_base.DOCUMENT,)
+
+        elif isinstance(node, Doctype):
+            return _base.DOCTYPE, node.name, node.public_id, node.system_id
+
+        elif isinstance(node, FragmentWrapper) and not hasattr(node, "tag"):
+            return _base.TEXT, node.obj
+
+        elif node.tag == etree.Comment:
+            return _base.COMMENT, ensure_str(node.text)
+
+        elif node.tag == etree.Entity:
+            return _base.ENTITY, ensure_str(node.text)[1:-1]  # strip &;
+
+        else:
+            # This is assumed to be an ordinary element
+            match = tag_regexp.match(ensure_str(node.tag))
+            if match:
+                namespace, tag = match.groups()
+            else:
+                namespace = None
+                tag = ensure_str(node.tag)
+            attrs = {}
+            for name, value in list(node.attrib.items()):
+                name = ensure_str(name)
+                value = ensure_str(value)
+                match = tag_regexp.match(name)
+                if match:
+                    attrs[(match.group(1), match.group(2))] = value
+                else:
+                    attrs[(None, name)] = value
+            return (_base.ELEMENT, namespace, self.filter.fromXmlName(tag),
+                    attrs, len(node) > 0 or node.text)
+
+    def getFirstChild(self, node):
+        assert not isinstance(node, tuple), _("Text nodes have no children")
+
+        assert len(node) or node.text, "Node has no children"
+        if node.text:
+            return (node, "text")
+        else:
+            return node[0]
+
+    def getNextSibling(self, node):
+        if isinstance(node, tuple):  # Text node
+            node, key = node
+            assert key in ("text", "tail"), _("Text nodes are text or tail, found %s") % key
+            if key == "text":
+                # XXX: we cannot use a "bool(node) and node[0] or None" construct here
+                # because node[0] might evaluate to False if it has no child element
+                if len(node):
+                    return node[0]
+                else:
+                    return None
+            else:  # tail
+                return node.getnext()
+
+        return (node, "tail") if node.tail else node.getnext()
+
+    def getParentNode(self, node):
+        if isinstance(node, tuple):  # Text node
+            node, key = node
+            assert key in ("text", "tail"), _("Text nodes are text or tail, found %s") % key
+            if key == "text":
+                return node
+            # else: fallback to "normal" processing
+
+        return node.getparent()
diff --git a/lib/html5lib/treewalkers/pulldom.py b/lib/html5lib/treewalkers/pulldom.py
new file mode 100644
index 00000000..0b0f515f
--- /dev/null
+++ b/lib/html5lib/treewalkers/pulldom.py
@@ -0,0 +1,63 @@
+from __future__ import absolute_import, division, unicode_literals
+
+from xml.dom.pulldom import START_ELEMENT, END_ELEMENT, \
+    COMMENT, IGNORABLE_WHITESPACE, CHARACTERS
+
+from . import _base
+
+from ..constants import voidElements
+
+
+class TreeWalker(_base.TreeWalker):
+    def __iter__(self):
+        ignore_until = None
+        previous = None
+        for event in self.tree:
+            if previous is not None and \
+                    (ignore_until is None or previous[1] is ignore_until):
+                if previous[1] is ignore_until:
+                    ignore_until = None
+                for token in self.tokens(previous, event):
+                    yield token
+                    if token["type"] == "EmptyTag":
+                        ignore_until = previous[1]
+            previous = event
+        if ignore_until is None or previous[1] is ignore_until:
+            for token in self.tokens(previous, None):
+                yield token
+        elif ignore_until is not None:
+            raise ValueError("Illformed DOM event stream: void element without END_ELEMENT")
+
+    def tokens(self, event, next):
+        type, node = event
+        if type == START_ELEMENT:
+            name = node.nodeName
+            namespace = node.namespaceURI
+            attrs = {}
+            for attr in list(node.attributes.keys()):
+                attr = node.getAttributeNode(attr)
+                attrs[(attr.namespaceURI, attr.localName)] = attr.value
+            if name in voidElements:
+                for token in self.emptyTag(namespace,
+                                           name,
+                                           attrs,
+                                           not next or next[1] is not node):
+                    yield token
+            else:
+                yield self.startTag(namespace, name, attrs)
+
+        elif type == END_ELEMENT:
+            name = node.nodeName
+            namespace = node.namespaceURI
+            if name not in voidElements:
+                yield self.endTag(namespace, name)
+
+        elif type == COMMENT:
+            yield self.comment(node.nodeValue)
+
+        elif type in (IGNORABLE_WHITESPACE, CHARACTERS):
+            for token in self.text(node.nodeValue):
+                yield token
+
+        else:
+            yield self.unknown(type)
diff --git a/lib/html5lib/trie/__init__.py b/lib/html5lib/trie/__init__.py
new file mode 100644
index 00000000..a8cca8a9
--- /dev/null
+++ b/lib/html5lib/trie/__init__.py
@@ -0,0 +1,12 @@
+from __future__ import absolute_import, division, unicode_literals
+
+from .py import Trie as PyTrie
+
+Trie = PyTrie
+
+try:
+    from .datrie import Trie as DATrie
+except ImportError:
+    pass
+else:
+    Trie = DATrie
diff --git a/lib/html5lib/trie/_base.py b/lib/html5lib/trie/_base.py
new file mode 100644
index 00000000..724486b1
--- /dev/null
+++ b/lib/html5lib/trie/_base.py
@@ -0,0 +1,37 @@
+from __future__ import absolute_import, division, unicode_literals
+
+from collections import Mapping
+
+
+class Trie(Mapping):
+    """Abstract base class for tries"""
+
+    def keys(self, prefix=None):
+        keys = super().keys()
+
+        if prefix is None:
+            return set(keys)
+
+        # Python 2.6: no set comprehensions
+        return set([x for x in keys if x.startswith(prefix)])
+
+    def has_keys_with_prefix(self, prefix):
+        for key in self.keys():
+            if key.startswith(prefix):
+                return True
+
+        return False
+
+    def longest_prefix(self, prefix):
+        if prefix in self:
+            return prefix
+
+        for i in range(1, len(prefix) + 1):
+            if prefix[:-i] in self:
+                return prefix[:-i]
+
+        raise KeyError(prefix)
+
+    def longest_prefix_item(self, prefix):
+        lprefix = self.longest_prefix(prefix)
+        return (lprefix, self[lprefix])
diff --git a/lib/html5lib/trie/datrie.py b/lib/html5lib/trie/datrie.py
new file mode 100644
index 00000000..51f3d046
--- /dev/null
+++ b/lib/html5lib/trie/datrie.py
@@ -0,0 +1,44 @@
+from __future__ import absolute_import, division, unicode_literals
+
+from datrie import Trie as DATrie
+from six import text_type
+
+from ._base import Trie as ABCTrie
+
+
+class Trie(ABCTrie):
+    def __init__(self, data):
+        chars = set()
+        for key in data.keys():
+            if not isinstance(key, text_type):
+                raise TypeError("All keys must be strings")
+            for char in key:
+                chars.add(char)
+
+        self._data = DATrie("".join(chars))
+        for key, value in data.items():
+            self._data[key] = value
+
+    def __contains__(self, key):
+        return key in self._data
+
+    def __len__(self):
+        return len(self._data)
+
+    def __iter__(self):
+        raise NotImplementedError()
+
+    def __getitem__(self, key):
+        return self._data[key]
+
+    def keys(self, prefix=None):
+        return self._data.keys(prefix)
+
+    def has_keys_with_prefix(self, prefix):
+        return self._data.has_keys_with_prefix(prefix)
+
+    def longest_prefix(self, prefix):
+        return self._data.longest_prefix(prefix)
+
+    def longest_prefix_item(self, prefix):
+        return self._data.longest_prefix_item(prefix)
diff --git a/lib/html5lib/_trie/py.py b/lib/html5lib/trie/py.py
similarity index 100%
rename from lib/html5lib/_trie/py.py
rename to lib/html5lib/trie/py.py
diff --git a/lib/html5lib/utils.py b/lib/html5lib/utils.py
new file mode 100644
index 00000000..2f41f4df
--- /dev/null
+++ b/lib/html5lib/utils.py
@@ -0,0 +1,82 @@
+from __future__ import absolute_import, division, unicode_literals
+
+from types import ModuleType
+
+try:
+    import xml.etree.cElementTree as default_etree
+except ImportError:
+    import xml.etree.ElementTree as default_etree
+
+
+__all__ = ["default_etree", "MethodDispatcher", "isSurrogatePair",
+           "surrogatePairToCodepoint", "moduleFactoryFactory"]
+
+
+class MethodDispatcher(dict):
+    """Dict with 2 special properties:
+
+    On initiation, keys that are lists, sets or tuples are converted to
+    multiple keys so accessing any one of the items in the original
+    list-like object returns the matching value
+
+    md = MethodDispatcher({("foo", "bar"):"baz"})
+    md["foo"] == "baz"
+
+    A default value which can be set through the default attribute.
+    """
+
+    def __init__(self, items=()):
+        # Using _dictEntries instead of directly assigning to self is about
+        # twice as fast. Please do careful performance testing before changing
+        # anything here.
+        _dictEntries = []
+        for name, value in items:
+            if type(name) in (list, tuple, frozenset, set):
+                for item in name:
+                    _dictEntries.append((item, value))
+            else:
+                _dictEntries.append((name, value))
+        dict.__init__(self, _dictEntries)
+        self.default = None
+
+    def __getitem__(self, key):
+        return dict.get(self, key, self.default)
+
+
+# Some utility functions to dal with weirdness around UCS2 vs UCS4
+# python builds
+
+def isSurrogatePair(data):
+    return (len(data) == 2 and
+            ord(data[0]) >= 0xD800 and ord(data[0]) <= 0xDBFF and
+            ord(data[1]) >= 0xDC00 and ord(data[1]) <= 0xDFFF)
+
+
+def surrogatePairToCodepoint(data):
+    char_val = (0x10000 + (ord(data[0]) - 0xD800) * 0x400 +
+                (ord(data[1]) - 0xDC00))
+    return char_val
+
+# Module Factory Factory (no, this isn't Java, I know)
+# Here to stop this being duplicated all over the place.
+
+
+def moduleFactoryFactory(factory):
+    moduleCache = {}
+
+    def moduleFactory(baseModule, *args, **kwargs):
+        if isinstance(ModuleType.__name__, type("")):
+            name = "_%s_factory" % baseModule.__name__
+        else:
+            name = b"_%s_factory" % baseModule.__name__
+
+        if name in moduleCache:
+            return moduleCache[name]
+        else:
+            mod = ModuleType(name)
+            objs = factory(baseModule, *args, **kwargs)
+            mod.__dict__.update(objs)
+            moduleCache[name] = mod
+            return mod
+
+    return moduleFactory
diff --git a/lib/httpagentparser/__init__.py b/lib/httpagentparser/__init__.py
deleted file mode 100644
index 7338e197..00000000
--- a/lib/httpagentparser/__init__.py
+++ /dev/null
@@ -1,721 +0,0 @@
-"""
-Extract client information from http user agent
-The module does not try to detect all capabilities of browser in current form (it can easily be extended though).
-Tries to
-    * be fast
-    * very easy to extend
-    * reliable enough for practical purposes
-    * assist python web apps to detect clients.
-"""
-
-__version__ = '1.9.5'
-
-
-class DetectorsHub(dict):
-    _known_types = ['os', 'dist', 'flavor', 'browser']
-
-    def __init__(self, *args, **kw):
-        dict.__init__(self, *args, **kw)
-        for typ in self._known_types:
-            self.setdefault(typ, [])
-        self.registerDetectors()
-
-    def register(self, detector):
-        if detector.info_type not in self._known_types:
-            self[detector.info_type] = [detector]
-            self._known_types.insert(detector.order, detector.info_type)
-        else:
-            self[detector.info_type].append(detector)
-
-    def __iter__(self):
-        return iter(self._known_types)
-
-    def registerDetectors(self):
-        detectors = [v() for v in list(globals().values()) if DetectorBase in getattr(v, '__mro__', [])]
-        for d in detectors:
-            if d.can_register:
-                self.register(d)
-
-
-class DetectorBase(object):
-    name = ""  # "to perform match in DetectorsHub object"
-    info_type = "override me"
-    result_key = "override me"
-    order = 10  # 0 is highest
-    look_for = "string to look for"
-    skip_if_found = []  # strings if present stop processin
-    can_register = False
-    version_markers = [("/", " ")]
-    allow_space_in_version = False
-    _suggested_detectors = None
-    platform = None
-    bot = False
-
-    def __init__(self):
-        if not self.name:
-            self.name = self.__class__.__name__
-        self.can_register = (self.__class__.__dict__.get('can_register', True))
-
-    def detect(self, agent, result):
-        # -> True/None
-        word = self.checkWords(agent)
-        if word:
-            result[self.info_type] = dict(name=self.name)
-            result['bot'] = self.bot
-            version = self.getVersion(agent, word)
-            if version:
-                result[self.info_type]['version'] = version
-            if self.platform:
-                result['platform'] = {'name': self.platform, 'version': version}
-            return True
-
-    def checkWords(self, agent):
-        # -> True/None
-        for w in self.skip_if_found:
-            if w in agent:
-                return False
-        if isinstance(self.look_for, (tuple, list)):
-            for word in self.look_for:
-                if word in agent:
-                    return word
-        elif self.look_for in agent:
-            return self.look_for
-
-    def getVersion(self, agent, word):
-        """
-        => version string /None
-        """
-        version_markers = self.version_markers if \
-            isinstance(self.version_markers[0], (list, tuple)) else [self.version_markers]
-        version_part = agent.split(word, 1)[-1]
-        for start, end in version_markers:
-            if version_part.startswith(start) and end in version_part:
-                version = version_part[1:]
-                if end:  # end could be empty string
-                    version = version.split(end)[0]
-                if not self.allow_space_in_version:
-                    version = version.split()[0]
-                return version
-
-
-class OS(DetectorBase):
-    info_type = "os"
-    can_register = False
-    version_markers = [";", " "]
-    allow_space_in_version = True
-    platform = None
-
-
-class Dist(DetectorBase):
-    info_type = "dist"
-    can_register = False
-    platform = None
-
-
-class Flavor(DetectorBase):
-    info_type = "flavor"
-    can_register = False
-    platform = None
-
-
-class Browser(DetectorBase):
-    info_type = "browser"
-    can_register = False
-
-
-class Konqueror(Browser):
-    look_for = "Konqueror"
-    version_markers = ["/", ";"]
-
-
-class OperaMobile(Browser):
-    look_for = "Opera Mobi"
-    name = "Opera Mobile"
-
-    def getVersion(self, agent, word):
-        try:
-            look_for = "Version"
-            return agent.split(look_for)[1][1:].split(' ')[0]
-        except IndexError:
-            look_for = "Opera"
-            return agent.split(look_for)[1][1:].split(' ')[0]
-
-
-class Opera(Browser):
-    look_for = "Opera"
-    skip_if_found = ['Opera Mobi']
-
-    def getVersion(self, agent, word):
-        try:
-            look_for = "Version"
-            return agent.split(look_for)[1][1:].split(' ')[0]
-        except IndexError:
-            look_for = "Opera"
-            version = agent.split(look_for)[1][1:].split(' ')[0]
-            return version.split('(')[0]
-
-
-class OperaNew(Browser):
-    """
-    Opera after version 15
-    """
-    name = "Opera"
-    look_for = "OPR"
-    skip_if_found = ["Build/OPR"]
-    version_markers = [('/', '')]
-
-
-class Netscape(Browser):
-    look_for = "Netscape"
-    version_markers = [("/", '')]
-
-
-class Trident(Browser):
-    look_for = "Trident"
-    skip_if_found = ["MSIE", "Opera"]
-    name = "Microsoft Internet Explorer"
-    version_markers = ["/", ";"]
-    trident_to_ie_versions = {
-        '4.0': '8.0',
-        '5.0': '9.0',
-        '6.0': '10.0',
-        '7.0': '11.0',
-    }
-
-    def getVersion(self, agent, word):
-        return self.trident_to_ie_versions.get(super(Trident, self).getVersion(agent, word))
-
-
-class MSIE(Browser):
-    look_for = "MSIE"
-    skip_if_found = ["Opera"]
-    name = "Microsoft Internet Explorer"
-    version_markers = [" ", ";"]
-
-class MSEdge(Browser):
-    look_for = "Edge"
-    skip_if_found = ["MSIE"]
-    version_markers = ["/", ""]
-
-class ChromiumEdge(Browser):
-    look_for = "Edg/"
-
-    def getVersion(self, agent, word):
-        if "Edg/" in agent:
-            return agent.split('Edg/')[-1].strip()
-
-
-class Galeon(Browser):
-    look_for = "Galeon"
-
-
-class WOSBrowser(Browser):
-    look_for = "wOSBrowser"
-
-    def getVersion(self, agent, word):
-        pass
-
-
-class Safari(Browser):
-    look_for = "Safari"
-    skip_if_found = ["Edge", "YaBrowser", "FxiOS"]
-
-    def checkWords(self, agent):
-        unless_list = ["Chrome", "OmniWeb", "wOSBrowser", "Android", "CriOS"]
-        if self.look_for in agent:
-            for word in unless_list:
-                if word in agent:
-                    return False
-            return self.look_for
-
-    def getVersion(self, agent, word):
-        if "Version/" in agent:
-            return agent.split('Version/')[-1].split(' ')[0].strip()
-        if "Safari/" in agent:
-            return agent.split('Safari/')[-1].split(' ')[0].strip()
-        else:
-            return agent.split('Safari ')[-1].split(' ')[0].strip()  # Mobile Safari
-
-class GoogleBot(Browser):
-    # https://support.google.com/webmasters/answer/1061943
-    look_for = ["Googlebot", "Googlebot-News", "Googlebot-Image",
-                "Googlebot-Video", "Googlebot-Mobile", "Mediapartners-Google",
-                "Mediapartners", "AdsBot-Google", "web/snippet"]
-    bot = True
-    version_markers = [('/', ';'), ('/', ' ')]
-
-class GoogleFeedFetcher(Browser):
-    look_for = "Feedfetcher-Google"
-    bot = True
-
-    def get_version(self, agent):
-        pass
-
-class RunscopeRadar(Browser):
-    look_for = "runscope-radar"
-    bot = True
-
-class GoogleAppEngine(Browser):
-    look_for = "AppEngine-Google"
-    bot = True
-
-    def get_version(self, agent):
-        pass
-
-class GoogleApps(Browser):
-    look_for = "GoogleApps script"
-    bot = True
-
-    def get_version(self, agent):
-        pass
-
-class TwitterBot(Browser):
-    look_for = "Twitterbot"
-    bot = True
-
-class TelegramBot(Browser):
-    look_for = "TelegramBot"
-    bot = True
-
-class MJ12Bot(Browser):
-    look_for = "MJ12bot"
-    bot = True
-
-class YandexBot(Browser):
-    # http://help.yandex.com/search/robots/agent.xml
-    look_for = "Yandex"
-    bot = True
-
-    def getVersion(self, agent, word):
-        return agent[agent.index('Yandex'):].split('/')[-1].split(')')[0].strip()
-
-class BingBot(Browser):
-    look_for = "bingbot"
-    version_markers = ["/", ";"]
-    bot = True
-
-
-class BaiduBot(Browser):
-    # http://help.baidu.com/question?prod_en=master&class=1&id=1000973
-    look_for = ["Baiduspider", "Baiduspider-image", "Baiduspider-video",
-                "Baiduspider-news", "Baiduspider-favo", "Baiduspider-cpro",
-                "Baiduspider-ads"]
-    bot = True
-    version_markers = ('/', ';')
-
-
-class LinkedInBot(Browser):
-    look_for = "LinkedInBot"
-    bot = True
-
-class ArchiveDotOrgBot(Browser):
-    look_for = "archive.org_bot"
-    bot = True
-
-class YoudaoBot(Browser):
-    look_for = "YoudaoBot"
-    bot = True
-
-class YoudaoBotImage(Browser):
-    look_for = "YodaoBot-Image"
-    bot = True
-
-class RogerBot(Browser):
-    look_for = "rogerbot"
-    bot = True
-
-class TweetmemeBot(Browser):
-    look_for = "TweetmemeBot"
-    bot = True
-
-class WebshotBot(Browser):
-    look_for = "WebshotBot"
-    bot = True
-
-class SensikaBot(Browser):
-    look_for = "SensikaBot"
-    bot = True
-
-class YesupBot(Browser):
-    look_for = "YesupBot"
-    bot = True
-
-class DotBot(Browser):
-    look_for = "DotBot"
-    bot = True
-
-class PhantomJS(Browser):
-    look_for = "Browser/Phantom"
-    bot = True
-
-class FacebookExternalHit(Browser):
-    look_for = 'facebookexternalhit'
-    bot = True
-
-
-class NokiaOvi(Browser):
-    look_for = "S40OviBrowser"
-
-class UCBrowser(Browser):
-    look_for = "UCBrowser"
-
-class BrowserNG(Browser):
-    look_for = "BrowserNG"
-
-class Dolfin(Browser):
-    look_for = 'Dolfin'
-
-class NetFront(Browser):
-    look_for = 'NetFront'
-
-class Jasmine(Browser):
-    look_for = 'Jasmine'
-
-class Openwave(Browser):
-    look_for = 'Openwave'
-
-class UPBrowser(Browser):
-    look_for = 'UP.Browser'
-
-class OneBrowser(Browser):
-    look_for = 'OneBrowser'
-
-class ObigoInternetBrowser(Browser):
-    look_for = 'ObigoInternetBrowser'
-
-class TelecaBrowser(Browser):
-    look_for = 'TelecaBrowser'
-
-class MAUI(Browser):
-    look_for = 'Browser/MAUI'
-
-    def getVersion(self, agent, word):
-        version = agent.split("Release/")[-1][:10]
-        return version
-
-
-class NintendoBrowser(Browser):
-    look_for = 'NintendoBrowser'
-
-
-class AndroidBrowser(Browser):
-    look_for = "Android"
-    skip_if_found = ['Chrome', 'Windows Phone', 'Opera', 'Firefox']
-
-    # http://decadecity.net/blog/2013/11/21/android-browser-versions
-    def getVersion(self, agent, word):
-        pass
-
-
-class Firefox(Browser):
-    look_for = ["Firefox", "FxiOS"]
-    version_markers = [('/', '')]
-    skip_if_found = ["SeaMonkey", "web/snippet"]
-
-
-class SeaMonkey(Browser):
-    look_for = "SeaMonkey"
-    version_markers = [('/', '')]
-
-
-class Linux(OS):
-    look_for = 'Linux'
-    platform = 'Linux'
-
-    def getVersion(self, agent, word):
-        pass
-
-
-class Blackberry(OS):
-    look_for = 'BlackBerry'
-    platform = 'BlackBerry'
-
-    def getVersion(self, agent, word):
-        pass
-
-
-class BlackberryPlaybook(Dist):
-    look_for = 'PlayBook'
-    platform = 'BlackBerry'
-
-    def getVersion(self, agent, word):
-        pass
-
-
-class WindowsPhone(OS):
-    name = "Windows Phone"
-    platform = 'Windows'
-    look_for = ["Windows Phone OS", "Windows Phone"]
-    version_markers = [(" ", ";"), (" ", ")")]
-
-
-class iOS(OS):
-    look_for = ('iPhone', 'iPad')
-    skip_if_found = ['like iPhone']
-
-
-class iPhone(Dist):
-    look_for = 'iPhone'
-    platform = 'iOS'
-    skip_if_found = ['like iPhone']
-
-    def getVersion(self, agent, word):
-        version_end_chars = [' ']
-        if not "iPhone OS" in agent:
-            return None
-        part = agent.split('iPhone OS')[-1].strip()
-        for c in version_end_chars:
-            if c in part:
-                version = part.split(c)[0]
-                return version.replace('_', '.')
-        return None
-
-
-class IPad(Dist):
-    look_for = 'iPad;'
-    platform = 'iOS'
-
-    def getVersion(self, agent, word):
-        version_end_chars = [' ']
-        if not "CPU OS " in agent:
-            return None
-        part = agent.split('CPU OS ')[-1].strip()
-        for c in version_end_chars:
-            if c in part:
-                version = part.split(c)[0]
-                return version.replace('_', '.')
-        return None
-
-
-class Macintosh(OS):
-    look_for = 'Macintosh'
-
-    def getVersion(self, agent, word):
-        pass
-
-
-class MacOS(Flavor):
-    look_for = 'Mac OS'
-    platform = 'Mac OS'
-    skip_if_found = ['iPhone', 'iPad']
-
-    def getVersion(self, agent, word):
-        version_end_chars = [';', ')']
-        part = agent.split('Mac OS')[-1].strip()
-        for c in version_end_chars:
-            if c in part:
-                version = part.split(c)[0]
-                return version.replace('_', '.')
-        return ''
-
-
-class Windows(Dist):
-    look_for = 'Windows'
-    platform = 'Windows'
-
-
-class Windows(OS):
-    look_for = 'Windows'
-    platform = 'Windows'
-    skip_if_found = ["Windows Phone"]
-    win_versions = {
-                    "NT 10.0": "10",
-                    "NT 6.3": "8.1",
-                    "NT 6.2": "8",
-                    "NT 6.1": "7",
-                    "NT 6.0": "Vista",
-                    "NT 5.2": "Server 2003 / XP x64",
-                    "NT 5.1": "XP",
-                    "NT 5.01": "2000 SP1",
-                    "NT 5.0": "2000",
-                    "98; Win 9x 4.90": "Me"
-    }
-
-    def getVersion(self, agent, word):
-        v = agent.split('Windows')[-1].split(';')[0].strip()
-        if ')' in v:
-            v = v.split(')')[0]
-        v = self.win_versions.get(v, v)
-        return v
-
-
-class Ubuntu(Dist):
-    look_for = 'Ubuntu'
-    version_markers = ["/", " "]
-
-
-class Debian(Dist):
-    look_for = 'Debian'
-    version_markers = ["/", " "]
-
-class Chrome(Browser):
-    look_for = "Chrome"
-    version_markers = ["/", " "]
-    skip_if_found = [" OPR", "Edge", "YaBrowser", "Edg/"]
-
-    def getVersion(self, agent, word):
-        part = agent.split(word + self.version_markers[0])[-1]
-        version = part.split(self.version_markers[1])[0]
-        if '+' in version:
-            version = version.split('+')[0]
-        return version.strip()
-
-class YaBrowser(Browser):
-    look_for = "YaBrowser"
-    name = "Yandex.Browser"
-    version_markers = ["/", " "]
-
-    def getVersion(self, agent, word):
-        part = agent.split(word + self.version_markers[0])[-1]
-        version = part.split(self.version_markers[1])[0]
-        if '+' in version:
-            version = version.split('+')[0]
-        return version.strip()
-
-class ChromeiOS(Browser):
-    look_for = "CriOS"
-    version_markers = ["/", " "]
-
-
-class ChromeOS(OS):
-    look_for = "CrOS"
-    platform = ' ChromeOS'
-    version_markers = [" ", " "]
-
-    def getVersion(self, agent, word):
-        version_markers = self.version_markers
-        if word + '+' in agent:
-            version_markers = ['+', '+']
-        return agent.split(word + version_markers[0])[-1].split(version_markers[1])[1].strip()[:-1]
-
-
-class Android(Dist):
-    look_for = 'Android'
-    platform = 'Android'
-    skip_if_found = ['Windows Phone']
-
-    def getVersion(self, agent, word):
-        return agent.split(word)[-1].replace(')', ';').split(';')[0].strip()
-
-
-class WebOS(Dist):
-    look_for = 'hpwOS'
-
-    def getVersion(self, agent, word):
-        return agent.split('hpwOS/')[-1].split(';')[0].strip()
-
-
-class NokiaS40(OS):
-    look_for = 'Series40'
-    platform = 'Nokia S40'
-
-    def getVersion(self, agent, word):
-        pass
-
-
-class Symbian(OS):
-    look_for = ['Symbian', 'SymbianOS']
-    platform = 'Symbian'
-
-
-class PlayStation(OS):
-    look_for = ['PlayStation', 'PLAYSTATION']
-    platform = 'PlayStation'
-    version_markers = [" ", ")"]
-
-
-class prefs:  # experimental
-    os = dict(
-        Linux=dict(dict(browser=[Firefox, Chrome], dist=[Ubuntu, Android])),
-        BlackBerry=dict(dist=[BlackberryPlaybook]),
-        Macintosh=dict(flavor=[MacOS]),
-        Windows=dict(browser=[MSIE, Firefox]),
-        ChromeOS=dict(browser=[Chrome]),
-        Debian=dict(browser=[Firefox])
-    )
-    dist = dict(
-        Ubuntu=dict(browser=[Firefox]),
-        Android=dict(browser=[Safari]),
-        IPhone=dict(browser=[Safari]),
-        IPad=dict(browser=[Safari]),
-    )
-    flavor = dict(
-        MacOS=dict(browser=[Opera, Chrome, Firefox, MSIE])
-    )
-
-
-detectorshub = DetectorsHub()
-
-
-def detect(agent, fill_none=False):
-    """
-    fill_none: if name/version is not detected respective key is still added to the result with value None
-    """
-    result = dict(platform=dict(name=None, version=None))
-    _suggested_detectors = []
-
-    for info_type in detectorshub:
-        detectors = _suggested_detectors or detectorshub[info_type]
-        for detector in detectors:
-            try:
-                detector.detect(agent, result)
-            except Exception as _err:
-                pass
-
-    if fill_none:
-        for outer_key in ('os', 'browser'):
-            outer_value = result.setdefault(outer_key, dict())
-            for inner_key in ('name', 'version'):
-                outer_value.setdefault(inner_key, None)
-
-    return result
-
-
-UNKNOWN_OS_NAME = 'Unknown OS'
-UNKNOWN_BROWSER_NAME = 'Unknown Browser'
-
-
-def simple_detect_tuple(agent, parsed_agent=None):
-    """
-    @params:
-        agent::str
-        parsed_agent::dict
-            The result of detect, used to save calculations
-
-    @return:
-        (os_name, os_version, browser_name, browser_version)::Tuple(str)
-    """
-    result = parsed_agent or detect(agent)
-    os_list = []
-    if 'flavor' in result:
-        os_list.append(result['flavor']['name'])
-    if 'dist' in result:
-        os_list.append(result['dist']['name'])
-    if 'os' in result:
-        os_list.append(result['os']['name'])
-
-    os = os_list and " ".join(os_list) or UNKNOWN_OS_NAME
-    os_version = os_list and (result.get('flavor') and result['flavor'].get('version')) or \
-        (result.get('dist') and result['dist'].get('version')) or (result.get('os') and result['os'].get('version')) or ""
-    browser = 'browser' in result and result['browser'].get('name') or UNKNOWN_BROWSER_NAME
-    browser_version = 'browser' in result and result['browser'].get('version') or ""
-
-    return os, os_version, browser, browser_version
-
-
-def simple_detect(agent, parsed_agent=None):
-    """
-    @params:
-        agent::str
-        parsed_agent::dict
-            The result of detect, used to save calculations
-
-    @return:
-        (os_name_version, browser_name_version)::Tuple(str)
-    """
-    os, os_version, browser, browser_version = simple_detect_tuple(agent, parsed_agent=parsed_agent)
-    if browser_version:
-        browser = " ".join((browser, browser_version))
-    if os_version:
-        os = " ".join((os, os_version))
-    return os, browser
diff --git a/lib/httpagentparser/more.py b/lib/httpagentparser/more.py
deleted file mode 100644
index 46f0a1a0..00000000
--- a/lib/httpagentparser/more.py
+++ /dev/null
@@ -1,29 +0,0 @@
-import httpagentparser as hap
-
-class JakartaHTTPClinet(hap.Browser):
-    name = 'Jakarta Commons-HttpClient'
-    look_for = name
-    version_splitters = ['/']
-
-class PythonRequests(hap.Browser):
-    name = 'Python Requests'
-    look_for = 'python-requests'
-
-# Registering new UAs
-
-hap.detectorshub.register(JakartaHTTPClinet())
-hap.detectorshub.register(PythonRequests())
-
-# Tests
-
-if __name__ == '__main__':
-
-    s = 'Jakarta Commons-HttpClient/3.1'
-
-    print(hap.detect(s))
-    print(hap.simple_detect(s))
-
-    s = 'python-requests/1.2.3 CPython/2.7.4 Linux/3.8.0-29-generic'
-
-    print(hap.detect(s))
-    print(hap.simple_detect(s))
diff --git a/lib/httplib2/__init__.py b/lib/httplib2/__init__.py
new file mode 100755
index 00000000..3652df61
--- /dev/null
+++ b/lib/httplib2/__init__.py
@@ -0,0 +1,1215 @@
+from __future__ import generators
+"""
+httplib2
+
+A caching http interface that supports ETags and gzip
+to conserve bandwidth.
+
+Requires Python 2.3 or later
+
+Changelog:
+2007-08-18, Rick: Modified so it's able to use a socks proxy if needed.
+
+"""
+
+__author__ = "Joe Gregorio (joe@bitworking.org)"
+__copyright__ = "Copyright 2006, Joe Gregorio"
+__contributors__ = ["Thomas Broyer (t.broyer@ltgt.net)",
+    "James Antill",
+    "Xavier Verges Farrero",
+    "Jonathan Feinberg",
+    "Blair Zajac",
+    "Sam Ruby",
+    "Louis Nyffenegger"]
+__license__ = "MIT"
+__version__ = "$Rev$"
+
+import re
+import sys
+import email
+import email.Utils
+import email.Message
+import email.FeedParser
+import StringIO
+import gzip
+import zlib
+import httplib
+import urlparse
+import base64
+import os
+import copy
+import calendar
+import time
+import random
+import errno
+# remove depracated warning in python2.6
+try:
+    from hashlib import sha1 as _sha, md5 as _md5
+except ImportError:
+    import sha
+    import md5
+    _sha = sha.new
+    _md5 = md5.new
+import hmac
+from gettext import gettext as _
+import socket
+
+# Try using local version, followed by system, and none if neither are found
+try:
+    import socks as socks
+except ImportError:
+    try:
+        import socks as socks
+    except ImportError:
+        socks = None
+
+# Build the appropriate socket wrapper for ssl
+try:
+    import ssl # python 2.6
+    _ssl_wrap_socket = ssl.wrap_socket
+except ImportError:
+    def _ssl_wrap_socket(sock, key_file, cert_file):
+        ssl_sock = socket.ssl(sock, key_file, cert_file)
+        return httplib.FakeSocket(sock, ssl_sock)
+
+
+if sys.version_info >= (2,3):
+    from iri2uri import iri2uri
+else:
+    def iri2uri(uri):
+        return uri
+
+def has_timeout(timeout): # python 2.6
+    if hasattr(socket, '_GLOBAL_DEFAULT_TIMEOUT'):
+        return (timeout is not None and timeout is not socket._GLOBAL_DEFAULT_TIMEOUT)
+    return (timeout is not None)
+
+__all__ = ['Http', 'Response', 'ProxyInfo', 'HttpLib2Error',
+  'RedirectMissingLocation', 'RedirectLimit', 'FailedToDecompressContent',
+  'UnimplementedDigestAuthOptionError', 'UnimplementedHmacDigestAuthOptionError',
+  'debuglevel']
+
+
+# The httplib debug level, set to a non-zero value to get debug output
+debuglevel = 0
+
+
+# Python 2.3 support
+if sys.version_info < (2,4):
+    def sorted(seq):
+        seq.sort()
+        return seq
+
+# Python 2.3 support
+def HTTPResponse__getheaders(self):
+    """Return list of (header, value) tuples."""
+    if self.msg is None:
+        raise httplib.ResponseNotReady()
+    return self.msg.items()
+
+if not hasattr(httplib.HTTPResponse, 'getheaders'):
+    httplib.HTTPResponse.getheaders = HTTPResponse__getheaders
+
+# All exceptions raised here derive from HttpLib2Error
+class HttpLib2Error(Exception): pass
+
+# Some exceptions can be caught and optionally
+# be turned back into responses.
+class HttpLib2ErrorWithResponse(HttpLib2Error):
+    def __init__(self, desc, response, content):
+        self.response = response
+        self.content = content
+        HttpLib2Error.__init__(self, desc)
+
+class RedirectMissingLocation(HttpLib2ErrorWithResponse): pass
+class RedirectLimit(HttpLib2ErrorWithResponse): pass
+class FailedToDecompressContent(HttpLib2ErrorWithResponse): pass
+class UnimplementedDigestAuthOptionError(HttpLib2ErrorWithResponse): pass
+class UnimplementedHmacDigestAuthOptionError(HttpLib2ErrorWithResponse): pass
+
+class RelativeURIError(HttpLib2Error): pass
+class ServerNotFoundError(HttpLib2Error): pass
+
+# Open Items:
+# -----------
+# Proxy support
+
+# Are we removing the cached content too soon on PUT (only delete on 200 Maybe?)
+
+# Pluggable cache storage (supports storing the cache in
+#   flat files by default. We need a plug-in architecture
+#   that can support Berkeley DB and Squid)
+
+# == Known Issues ==
+# Does not handle a resource that uses conneg and Last-Modified but no ETag as a cache validator.
+# Does not handle Cache-Control: max-stale
+# Does not use Age: headers when calculating cache freshness.
+
+
+# The number of redirections to follow before giving up.
+# Note that only GET redirects are automatically followed.
+# Will also honor 301 requests by saving that info and never
+# requesting that URI again.
+DEFAULT_MAX_REDIRECTS = 5
+
+# Which headers are hop-by-hop headers by default
+HOP_BY_HOP = ['connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization', 'te', 'trailers', 'transfer-encoding', 'upgrade']
+
+def _get_end2end_headers(response):
+    hopbyhop = list(HOP_BY_HOP)
+    hopbyhop.extend([x.strip() for x in response.get('connection', '').split(',')])
+    return [header for header in response.keys() if header not in hopbyhop]
+
+URI = re.compile(r"^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?")
+
+def parse_uri(uri):
+    """Parses a URI using the regex given in Appendix B of RFC 3986.
+
+        (scheme, authority, path, query, fragment) = parse_uri(uri)
+    """
+    groups = URI.match(uri).groups()
+    return (groups[1], groups[3], groups[4], groups[6], groups[8])
+
+def urlnorm(uri):
+    (scheme, authority, path, query, fragment) = parse_uri(uri)
+    if not scheme or not authority:
+        raise RelativeURIError("Only absolute URIs are allowed. uri = %s" % uri)
+    authority = authority.lower()
+    scheme = scheme.lower()
+    if not path:
+        path = "/"
+    # Could do syntax based normalization of the URI before
+    # computing the digest. See Section 6.2.2 of Std 66.
+    request_uri = query and "?".join([path, query]) or path
+    scheme = scheme.lower()
+    defrag_uri = scheme + "://" + authority + request_uri
+    return scheme, authority, request_uri, defrag_uri
+
+
+# Cache filename construction (original borrowed from Venus http://intertwingly.net/code/venus/)
+re_url_scheme    = re.compile(r'^\w+://')
+re_slash         = re.compile(r'[?/:|]+')
+
+def safename(filename):
+    """Return a filename suitable for the cache.
+
+    Strips dangerous and common characters to create a filename we
+    can use to store the cache in.
+    """
+
+    try:
+        if re_url_scheme.match(filename):
+            if isinstance(filename,str):
+                filename = filename.decode('utf-8')
+                filename = filename.encode('idna')
+            else:
+                filename = filename.encode('idna')
+    except UnicodeError:
+        pass
+    if isinstance(filename,unicode):
+        filename=filename.encode('utf-8')
+    filemd5 = _md5(filename).hexdigest()
+    filename = re_url_scheme.sub("", filename)
+    filename = re_slash.sub(",", filename)
+
+    # limit length of filename
+    if len(filename)>200:
+        filename=filename[:200]
+    return ",".join((filename, filemd5))
+
+NORMALIZE_SPACE = re.compile(r'(?:\r\n)?[ \t]+')
+def _normalize_headers(headers):
+    return dict([ (key.lower(), NORMALIZE_SPACE.sub(value, ' ').strip())  for (key, value) in headers.iteritems()])
+
+def _parse_cache_control(headers):
+    retval = {}
+    if headers.has_key('cache-control'):
+        parts =  headers['cache-control'].split(',')
+        parts_with_args = [tuple([x.strip().lower() for x in part.split("=", 1)]) for part in parts if -1 != part.find("=")]
+        parts_wo_args = [(name.strip().lower(), 1) for name in parts if -1 == name.find("=")]
+        retval = dict(parts_with_args + parts_wo_args)
+    return retval
+
+# Whether to use a strict mode to parse WWW-Authenticate headers
+# Might lead to bad results in case of ill-formed header value,
+# so disabled by default, falling back to relaxed parsing.
+# Set to true to turn on, usefull for testing servers.
+USE_WWW_AUTH_STRICT_PARSING = 0
+
+# In regex below:
+#    [^\0-\x1f\x7f-\xff()<>@,;:\\\"/[\]?={} \t]+             matches a "token" as defined by HTTP
+#    "(?:[^\0-\x08\x0A-\x1f\x7f-\xff\\\"]|\\[\0-\x7f])*?"    matches a "quoted-string" as defined by HTTP, when LWS have already been replaced by a single space
+# Actually, as an auth-param value can be either a token or a quoted-string, they are combined in a single pattern which matches both:
+#    \"?((?<=\")(?:[^\0-\x1f\x7f-\xff\\\"]|\\[\0-\x7f])*?(?=\")|(?<!\")[^\0-\x08\x0A-\x1f\x7f-\xff()<>@,;:\\\"/[\]?={} \t]+(?!\"))\"?
+WWW_AUTH_STRICT = re.compile(r"^(?:\s*(?:,\s*)?([^\0-\x1f\x7f-\xff()<>@,;:\\\"/[\]?={} \t]+)\s*=\s*\"?((?<=\")(?:[^\0-\x08\x0A-\x1f\x7f-\xff\\\"]|\\[\0-\x7f])*?(?=\")|(?<!\")[^\0-\x1f\x7f-\xff()<>@,;:\\\"/[\]?={} \t]+(?!\"))\"?)(.*)$")
+WWW_AUTH_RELAXED = re.compile(r"^(?:\s*(?:,\s*)?([^ \t\r\n=]+)\s*=\s*\"?((?<=\")(?:[^\\\"]|\\.)*?(?=\")|(?<!\")[^ \t\r\n,]+(?!\"))\"?)(.*)$")
+UNQUOTE_PAIRS = re.compile(r'\\(.)')
+def _parse_www_authenticate(headers, headername='www-authenticate'):
+    """Returns a dictionary of dictionaries, one dict
+    per auth_scheme."""
+    retval = {}
+    if headers.has_key(headername):
+        authenticate = headers[headername].strip()
+        www_auth = USE_WWW_AUTH_STRICT_PARSING and WWW_AUTH_STRICT or WWW_AUTH_RELAXED
+        while authenticate:
+            # Break off the scheme at the beginning of the line
+            if headername == 'authentication-info':
+                (auth_scheme, the_rest) = ('digest', authenticate)
+            else:
+                (auth_scheme, the_rest) = authenticate.split(" ", 1)
+            # Now loop over all the key value pairs that come after the scheme,
+            # being careful not to roll into the next scheme
+            match = www_auth.search(the_rest)
+            auth_params = {}
+            while match:
+                if match and len(match.groups()) == 3:
+                    (key, value, the_rest) = match.groups()
+                    auth_params[key.lower()] = UNQUOTE_PAIRS.sub(r'\1', value) # '\\'.join([x.replace('\\', '') for x in value.split('\\\\')])
+                match = www_auth.search(the_rest)
+            retval[auth_scheme.lower()] = auth_params
+            authenticate = the_rest.strip()
+    return retval
+
+
+def _entry_disposition(response_headers, request_headers):
+    """Determine freshness from the Date, Expires and Cache-Control headers.
+
+    We don't handle the following:
+
+    1. Cache-Control: max-stale
+    2. Age: headers are not used in the calculations.
+
+    Not that this algorithm is simpler than you might think
+    because we are operating as a private (non-shared) cache.
+    This lets us ignore 's-maxage'. We can also ignore
+    'proxy-invalidate' since we aren't a proxy.
+    We will never return a stale document as
+    fresh as a design decision, and thus the non-implementation
+    of 'max-stale'. This also lets us safely ignore 'must-revalidate'
+    since we operate as if every server has sent 'must-revalidate'.
+    Since we are private we get to ignore both 'public' and
+    'private' parameters. We also ignore 'no-transform' since
+    we don't do any transformations.
+    The 'no-store' parameter is handled at a higher level.
+    So the only Cache-Control parameters we look at are:
+
+    no-cache
+    only-if-cached
+    max-age
+    min-fresh
+    """
+
+    retval = "STALE"
+    cc = _parse_cache_control(request_headers)
+    cc_response = _parse_cache_control(response_headers)
+
+    if request_headers.has_key('pragma') and request_headers['pragma'].lower().find('no-cache') != -1:
+        retval = "TRANSPARENT"
+        if 'cache-control' not in request_headers:
+            request_headers['cache-control'] = 'no-cache'
+    elif cc.has_key('no-cache'):
+        retval = "TRANSPARENT"
+    elif cc_response.has_key('no-cache'):
+        retval = "STALE"
+    elif cc.has_key('only-if-cached'):
+        retval = "FRESH"
+    elif response_headers.has_key('date'):
+        date = calendar.timegm(email.Utils.parsedate_tz(response_headers['date']))
+        now = time.time()
+        current_age = max(0, now - date)
+        if cc_response.has_key('max-age'):
+            try:
+                freshness_lifetime = int(cc_response['max-age'])
+            except ValueError:
+                freshness_lifetime = 0
+        elif response_headers.has_key('expires'):
+            expires = email.Utils.parsedate_tz(response_headers['expires'])
+            if None == expires:
+                freshness_lifetime = 0
+            else:
+                freshness_lifetime = max(0, calendar.timegm(expires) - date)
+        else:
+            freshness_lifetime = 0
+        if cc.has_key('max-age'):
+            try:
+                freshness_lifetime = int(cc['max-age'])
+            except ValueError:
+                freshness_lifetime = 0
+        if cc.has_key('min-fresh'):
+            try:
+                min_fresh = int(cc['min-fresh'])
+            except ValueError:
+                min_fresh = 0
+            current_age += min_fresh
+        if freshness_lifetime > current_age:
+            retval = "FRESH"
+    return retval
+
+def _decompressContent(response, new_content):
+    content = new_content
+    try:
+        encoding = response.get('content-encoding', None)
+        if encoding in ['gzip', 'deflate']:
+            if encoding == 'gzip':
+                content = gzip.GzipFile(fileobj=StringIO.StringIO(new_content)).read()
+            if encoding == 'deflate':
+                content = zlib.decompress(content)
+            response['content-length'] = str(len(content))
+            # Record the historical presence of the encoding in a way the won't interfere.
+            response['-content-encoding'] = response['content-encoding']
+            del response['content-encoding']
+    except IOError:
+        content = ""
+        raise FailedToDecompressContent(_("Content purported to be compressed with %s but failed to decompress.") % response.get('content-encoding'), response, content)
+    return content
+
+def _updateCache(request_headers, response_headers, content, cache, cachekey):
+    if cachekey:
+        cc = _parse_cache_control(request_headers)
+        cc_response = _parse_cache_control(response_headers)
+        if cc.has_key('no-store') or cc_response.has_key('no-store'):
+            cache.delete(cachekey)
+        else:
+            info = email.Message.Message()
+            for key, value in response_headers.iteritems():
+                if key not in ['status','content-encoding','transfer-encoding']:
+                    info[key] = value
+
+            # Add annotations to the cache to indicate what headers
+            # are variant for this request.
+            vary = response_headers.get('vary', None)
+            if vary:
+                vary_headers = vary.lower().replace(' ', '').split(',')
+                for header in vary_headers:
+                    key = '-varied-%s' % header
+                    try:
+                        info[key] = request_headers[header]
+                    except KeyError:
+                        pass
+
+            status = response_headers.status
+            if status == 304:
+                status = 200
+
+            status_header = 'status: %d\r\n' % response_headers.status
+
+            header_str = info.as_string()
+
+            header_str = re.sub("\r(?!\n)|(?<!\r)\n", "\r\n", header_str)
+            text = "".join([status_header, header_str, content])
+
+            cache.set(cachekey, text)
+
+def _cnonce():
+    dig = _md5("%s:%s" % (time.ctime(), ["0123456789"[random.randrange(0, 9)] for i in range(20)])).hexdigest()
+    return dig[:16]
+
+def _wsse_username_token(cnonce, iso_now, password):
+    return base64.b64encode(_sha("%s%s%s" % (cnonce, iso_now, password)).digest()).strip()
+
+
+# For credentials we need two things, first
+# a pool of credential to try (not necesarily tied to BAsic, Digest, etc.)
+# Then we also need a list of URIs that have already demanded authentication
+# That list is tricky since sub-URIs can take the same auth, or the
+# auth scheme may change as you descend the tree.
+# So we also need each Auth instance to be able to tell us
+# how close to the 'top' it is.
+
+class Authentication(object):
+    def __init__(self, credentials, host, request_uri, headers, response, content, http):
+        (scheme, authority, path, query, fragment) = parse_uri(request_uri)
+        self.path = path
+        self.host = host
+        self.credentials = credentials
+        self.http = http
+
+    def depth(self, request_uri):
+        (scheme, authority, path, query, fragment) = parse_uri(request_uri)
+        return request_uri[len(self.path):].count("/")
+
+    def inscope(self, host, request_uri):
+        # XXX Should we normalize the request_uri?
+        (scheme, authority, path, query, fragment) = parse_uri(request_uri)
+        return (host == self.host) and path.startswith(self.path)
+
+    def request(self, method, request_uri, headers, content):
+        """Modify the request headers to add the appropriate
+        Authorization header. Over-rise this in sub-classes."""
+        pass
+
+    def response(self, response, content):
+        """Gives us a chance to update with new nonces
+        or such returned from the last authorized response.
+        Over-rise this in sub-classes if necessary.
+
+        Return TRUE is the request is to be retried, for
+        example Digest may return stale=true.
+        """
+        return False
+
+
+
+class BasicAuthentication(Authentication):
+    def __init__(self, credentials, host, request_uri, headers, response, content, http):
+        Authentication.__init__(self, credentials, host, request_uri, headers, response, content, http)
+
+    def request(self, method, request_uri, headers, content):
+        """Modify the request headers to add the appropriate
+        Authorization header."""
+        headers['authorization'] = 'Basic ' + base64.b64encode("%s:%s" % self.credentials).strip()
+
+
+class DigestAuthentication(Authentication):
+    """Only do qop='auth' and MD5, since that
+    is all Apache currently implements"""
+    def __init__(self, credentials, host, request_uri, headers, response, content, http):
+        Authentication.__init__(self, credentials, host, request_uri, headers, response, content, http)
+        challenge = _parse_www_authenticate(response, 'www-authenticate')
+        self.challenge = challenge['digest']
+        qop = self.challenge.get('qop', 'auth')
+        self.challenge['qop'] = ('auth' in [x.strip() for x in qop.split()]) and 'auth' or None
+        if self.challenge['qop'] is None:
+            raise UnimplementedDigestAuthOptionError( _("Unsupported value for qop: %s." % qop))
+        self.challenge['algorithm'] = self.challenge.get('algorithm', 'MD5').upper()
+        if self.challenge['algorithm'] != 'MD5':
+            raise UnimplementedDigestAuthOptionError( _("Unsupported value for algorithm: %s." % self.challenge['algorithm']))
+        self.A1 = "".join([self.credentials[0], ":", self.challenge['realm'], ":", self.credentials[1]])
+        self.challenge['nc'] = 1
+
+    def request(self, method, request_uri, headers, content, cnonce = None):
+        """Modify the request headers"""
+        H = lambda x: _md5(x).hexdigest()
+        KD = lambda s, d: H("%s:%s" % (s, d))
+        A2 = "".join([method, ":", request_uri])
+        self.challenge['cnonce'] = cnonce or _cnonce()
+        request_digest  = '"%s"' % KD(H(self.A1), "%s:%s:%s:%s:%s" % (self.challenge['nonce'],
+                    '%08x' % self.challenge['nc'],
+                    self.challenge['cnonce'],
+                    self.challenge['qop'], H(A2)
+                    ))
+        headers['Authorization'] = 'Digest username="%s", realm="%s", nonce="%s", uri="%s", algorithm=%s, response=%s, qop=%s, nc=%08x, cnonce="%s"' % (
+                self.credentials[0],
+                self.challenge['realm'],
+                self.challenge['nonce'],
+                request_uri,
+                self.challenge['algorithm'],
+                request_digest,
+                self.challenge['qop'],
+                self.challenge['nc'],
+                self.challenge['cnonce'],
+                )
+        self.challenge['nc'] += 1
+
+    def response(self, response, content):
+        if not response.has_key('authentication-info'):
+            challenge = _parse_www_authenticate(response, 'www-authenticate').get('digest', {})
+            if 'true' == challenge.get('stale'):
+                self.challenge['nonce'] = challenge['nonce']
+                self.challenge['nc'] = 1
+                return True
+        else:
+            updated_challenge = _parse_www_authenticate(response, 'authentication-info').get('digest', {})
+
+            if updated_challenge.has_key('nextnonce'):
+                self.challenge['nonce'] = updated_challenge['nextnonce']
+                self.challenge['nc'] = 1
+        return False
+
+
+class HmacDigestAuthentication(Authentication):
+    """Adapted from Robert Sayre's code and DigestAuthentication above."""
+    __author__ = "Thomas Broyer (t.broyer@ltgt.net)"
+
+    def __init__(self, credentials, host, request_uri, headers, response, content, http):
+        Authentication.__init__(self, credentials, host, request_uri, headers, response, content, http)
+        challenge = _parse_www_authenticate(response, 'www-authenticate')
+        self.challenge = challenge['hmacdigest']
+        # TODO: self.challenge['domain']
+        self.challenge['reason'] = self.challenge.get('reason', 'unauthorized')
+        if self.challenge['reason'] not in ['unauthorized', 'integrity']:
+            self.challenge['reason'] = 'unauthorized'
+        self.challenge['salt'] = self.challenge.get('salt', '')
+        if not self.challenge.get('snonce'):
+            raise UnimplementedHmacDigestAuthOptionError( _("The challenge doesn't contain a server nonce, or this one is empty."))
+        self.challenge['algorithm'] = self.challenge.get('algorithm', 'HMAC-SHA-1')
+        if self.challenge['algorithm'] not in ['HMAC-SHA-1', 'HMAC-MD5']:
+            raise UnimplementedHmacDigestAuthOptionError( _("Unsupported value for algorithm: %s." % self.challenge['algorithm']))
+        self.challenge['pw-algorithm'] = self.challenge.get('pw-algorithm', 'SHA-1')
+        if self.challenge['pw-algorithm'] not in ['SHA-1', 'MD5']:
+            raise UnimplementedHmacDigestAuthOptionError( _("Unsupported value for pw-algorithm: %s." % self.challenge['pw-algorithm']))
+        if self.challenge['algorithm'] == 'HMAC-MD5':
+            self.hashmod = _md5
+        else:
+            self.hashmod = _sha
+        if self.challenge['pw-algorithm'] == 'MD5':
+            self.pwhashmod = _md5
+        else:
+            self.pwhashmod = _sha
+        self.key = "".join([self.credentials[0], ":",
+                    self.pwhashmod.new("".join([self.credentials[1], self.challenge['salt']])).hexdigest().lower(),
+                    ":", self.challenge['realm']
+                    ])
+        self.key = self.pwhashmod.new(self.key).hexdigest().lower()
+
+    def request(self, method, request_uri, headers, content):
+        """Modify the request headers"""
+        keys = _get_end2end_headers(headers)
+        keylist = "".join(["%s " % k for k in keys])
+        headers_val = "".join([headers[k] for k in keys])
+        created = time.strftime('%Y-%m-%dT%H:%M:%SZ',time.gmtime())
+        cnonce = _cnonce()
+        request_digest = "%s:%s:%s:%s:%s" % (method, request_uri, cnonce, self.challenge['snonce'], headers_val)
+        request_digest  = hmac.new(self.key, request_digest, self.hashmod).hexdigest().lower()
+        headers['Authorization'] = 'HMACDigest username="%s", realm="%s", snonce="%s", cnonce="%s", uri="%s", created="%s", response="%s", headers="%s"' % (
+                self.credentials[0],
+                self.challenge['realm'],
+                self.challenge['snonce'],
+                cnonce,
+                request_uri,
+                created,
+                request_digest,
+                keylist,
+                )
+
+    def response(self, response, content):
+        challenge = _parse_www_authenticate(response, 'www-authenticate').get('hmacdigest', {})
+        if challenge.get('reason') in ['integrity', 'stale']:
+            return True
+        return False
+
+
+class WsseAuthentication(Authentication):
+    """This is thinly tested and should not be relied upon.
+    At this time there isn't any third party server to test against.
+    Blogger and TypePad implemented this algorithm at one point
+    but Blogger has since switched to Basic over HTTPS and
+    TypePad has implemented it wrong, by never issuing a 401
+    challenge but instead requiring your client to telepathically know that
+    their endpoint is expecting WSSE profile="UsernameToken"."""
+    def __init__(self, credentials, host, request_uri, headers, response, content, http):
+        Authentication.__init__(self, credentials, host, request_uri, headers, response, content, http)
+
+    def request(self, method, request_uri, headers, content):
+        """Modify the request headers to add the appropriate
+        Authorization header."""
+        headers['Authorization'] = 'WSSE profile="UsernameToken"'
+        iso_now = time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime())
+        cnonce = _cnonce()
+        password_digest = _wsse_username_token(cnonce, iso_now, self.credentials[1])
+        headers['X-WSSE'] = 'UsernameToken Username="%s", PasswordDigest="%s", Nonce="%s", Created="%s"' % (
+                self.credentials[0],
+                password_digest,
+                cnonce,
+                iso_now)
+
+class GoogleLoginAuthentication(Authentication):
+    def __init__(self, credentials, host, request_uri, headers, response, content, http):
+        from urllib import urlencode
+        Authentication.__init__(self, credentials, host, request_uri, headers, response, content, http)
+        challenge = _parse_www_authenticate(response, 'www-authenticate')
+        service = challenge['googlelogin'].get('service', 'xapi')
+        # Bloggger actually returns the service in the challenge
+        # For the rest we guess based on the URI
+        if service == 'xapi' and  request_uri.find("calendar") > 0:
+            service = "cl"
+        # No point in guessing Base or Spreadsheet
+        #elif request_uri.find("spreadsheets") > 0:
+        #    service = "wise"
+
+        auth = dict(Email=credentials[0], Passwd=credentials[1], service=service, source=headers['user-agent'])
+        resp, content = self.http.request("https://www.google.com/accounts/ClientLogin", method="POST", body=urlencode(auth), headers={'Content-Type': 'application/x-www-form-urlencoded'})
+        lines = content.split('\n')
+        d = dict([tuple(line.split("=", 1)) for line in lines if line])
+        if resp.status == 403:
+            self.Auth = ""
+        else:
+            self.Auth = d['Auth']
+
+    def request(self, method, request_uri, headers, content):
+        """Modify the request headers to add the appropriate
+        Authorization header."""
+        headers['authorization'] = 'GoogleLogin Auth=' + self.Auth
+
+
+AUTH_SCHEME_CLASSES = {
+    "basic": BasicAuthentication,
+    "wsse": WsseAuthentication,
+    "digest": DigestAuthentication,
+    "hmacdigest": HmacDigestAuthentication,
+    "googlelogin": GoogleLoginAuthentication
+}
+
+AUTH_SCHEME_ORDER = ["hmacdigest", "googlelogin", "digest", "wsse", "basic"]
+
+class FileCache(object):
+    """Uses a local directory as a store for cached files.
+    Not really safe to use if multiple threads or processes are going to
+    be running on the same cache.
+    """
+    def __init__(self, cache, safe=safename): # use safe=lambda x: md5.new(x).hexdigest() for the old behavior
+        self.cache = cache
+        self.safe = safe
+        if not os.path.exists(cache):
+            os.makedirs(self.cache)
+
+    def get(self, key):
+        retval = None
+        cacheFullPath = os.path.join(self.cache, self.safe(key))
+        try:
+            f = file(cacheFullPath, "rb")
+            retval = f.read()
+            f.close()
+        except IOError, e:
+            pass
+        return retval
+
+    def set(self, key, value):
+        cacheFullPath = os.path.join(self.cache, self.safe(key))
+        f = file(cacheFullPath, "wb")
+        f.write(value)
+        f.close()
+
+    def delete(self, key):
+        cacheFullPath = os.path.join(self.cache, self.safe(key))
+        if os.path.exists(cacheFullPath):
+            os.remove(cacheFullPath)
+
+class Credentials(object):
+    def __init__(self):
+        self.credentials = []
+
+    def add(self, name, password, domain=""):
+        self.credentials.append((domain.lower(), name, password))
+
+    def clear(self):
+        self.credentials = []
+
+    def iter(self, domain):
+        for (cdomain, name, password) in self.credentials:
+            if cdomain == "" or domain == cdomain:
+                yield (name, password)
+
+class KeyCerts(Credentials):
+    """Identical to Credentials except that
+    name/password are mapped to key/cert."""
+    pass
+
+
+class ProxyInfo(object):
+  """Collect information required to use a proxy."""
+  def __init__(self, proxy_type, proxy_host, proxy_port, proxy_rdns=None, proxy_user=None, proxy_pass=None):
+      """The parameter proxy_type must be set to one of socks.PROXY_TYPE_XXX
+      constants. For example:
+
+p = ProxyInfo(proxy_type=socks.PROXY_TYPE_HTTP, proxy_host='localhost', proxy_port=8000)
+      """
+      self.proxy_type, self.proxy_host, self.proxy_port, self.proxy_rdns, self.proxy_user, self.proxy_pass = proxy_type, proxy_host, proxy_port, proxy_rdns, proxy_user, proxy_pass
+
+  def astuple(self):
+    return (self.proxy_type, self.proxy_host, self.proxy_port, self.proxy_rdns,
+        self.proxy_user, self.proxy_pass)
+
+  def isgood(self):
+    return socks and (self.proxy_host != None) and (self.proxy_port != None)
+
+
+class HTTPConnectionWithTimeout(httplib.HTTPConnection):
+    """HTTPConnection subclass that supports timeouts"""
+
+    def __init__(self, host, port=None, strict=None, timeout=None, proxy_info=None):
+        httplib.HTTPConnection.__init__(self, host, port, strict)
+        self.timeout = timeout
+        self.proxy_info = proxy_info
+
+    def connect(self):
+        """Connect to the host and port specified in __init__."""
+        # Mostly verbatim from httplib.py.
+        msg = "getaddrinfo returns an empty list"
+        for res in socket.getaddrinfo(self.host, self.port, 0,
+                socket.SOCK_STREAM):
+            af, socktype, proto, canonname, sa = res
+            try:
+                if self.proxy_info and self.proxy_info.isgood():
+                    self.sock = socks.socksocket(af, socktype, proto)
+                    self.sock.setproxy(*self.proxy_info.astuple())
+                else:
+                    self.sock = socket.socket(af, socktype, proto)
+                # Different from httplib: support timeouts.
+                if has_timeout(self.timeout):
+                    self.sock.settimeout(self.timeout)
+                    # End of difference from httplib.
+                if self.debuglevel > 0:
+                    print "connect: (%s, %s)" % (self.host, self.port)
+
+                self.sock.connect(sa)
+            except socket.error, msg:
+                if self.debuglevel > 0:
+                    print 'connect fail:', (self.host, self.port)
+                if self.sock:
+                    self.sock.close()
+                self.sock = None
+                continue
+            break
+        if not self.sock:
+            raise socket.error, msg
+
+class HTTPSConnectionWithTimeout(httplib.HTTPSConnection):
+    "This class allows communication via SSL."
+
+    def __init__(self, host, port=None, key_file=None, cert_file=None,
+                 strict=None, timeout=None, proxy_info=None):
+        httplib.HTTPSConnection.__init__(self, host, port=port, key_file=key_file,
+                cert_file=cert_file, strict=strict)
+        self.timeout = timeout
+        self.proxy_info = proxy_info
+
+    def connect(self):
+        "Connect to a host on a given (SSL) port."
+
+        if self.proxy_info and self.proxy_info.isgood():
+            sock = socks.socksocket(socket.AF_INET, socket.SOCK_STREAM)
+            sock.setproxy(*self.proxy_info.astuple())
+        else:
+            sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+
+        if has_timeout(self.timeout):
+            sock.settimeout(self.timeout)
+        sock.connect((self.host, self.port))
+        self.sock =_ssl_wrap_socket(sock, self.key_file, self.cert_file)
+
+
+
+class Http(object):
+    """An HTTP client that handles:
+- all methods
+- caching
+- ETags
+- compression,
+- HTTPS
+- Basic
+- Digest
+- WSSE
+
+and more.
+    """
+    def __init__(self, cache=None, timeout=None, proxy_info=None):
+        """The value of proxy_info is a ProxyInfo instance.
+
+If 'cache' is a string then it is used as a directory name
+for a disk cache. Otherwise it must be an object that supports
+the same interface as FileCache."""
+        self.proxy_info = proxy_info
+        # Map domain name to an httplib connection
+        self.connections = {}
+        # The location of the cache, for now a directory
+        # where cached responses are held.
+        if cache and isinstance(cache, str):
+            self.cache = FileCache(cache)
+        else:
+            self.cache = cache
+
+        # Name/password
+        self.credentials = Credentials()
+
+        # Key/cert
+        self.certificates = KeyCerts()
+
+        # authorization objects
+        self.authorizations = []
+
+        # If set to False then no redirects are followed, even safe ones.
+        self.follow_redirects = True
+
+        # Which HTTP methods do we apply optimistic concurrency to, i.e.
+        # which methods get an "if-match:" etag header added to them.
+        self.optimistic_concurrency_methods = ["PUT"]
+
+        # If 'follow_redirects' is True, and this is set to True then
+        # all redirecs are followed, including unsafe ones.
+        self.follow_all_redirects = False
+
+        self.ignore_etag = False
+
+        self.force_exception_to_status_code = False
+
+        self.timeout = timeout
+
+    def _auth_from_challenge(self, host, request_uri, headers, response, content):
+        """A generator that creates Authorization objects
+           that can be applied to requests.
+        """
+        challenges = _parse_www_authenticate(response, 'www-authenticate')
+        for cred in self.credentials.iter(host):
+            for scheme in AUTH_SCHEME_ORDER:
+                if challenges.has_key(scheme):
+                    yield AUTH_SCHEME_CLASSES[scheme](cred, host, request_uri, headers, response, content, self)
+
+    def add_credentials(self, name, password, domain=""):
+        """Add a name and password that will be used
+        any time a request requires authentication."""
+        self.credentials.add(name, password, domain)
+
+    def add_certificate(self, key, cert, domain):
+        """Add a key and cert that will be used
+        any time a request requires authentication."""
+        self.certificates.add(key, cert, domain)
+
+    def clear_credentials(self):
+        """Remove all the names and passwords
+        that are used for authentication"""
+        self.credentials.clear()
+        self.authorizations = []
+
+    def _conn_request(self, conn, request_uri, method, body, headers):
+        for i in range(2):
+            try:
+                conn.request(method, request_uri, body, headers)
+            except socket.gaierror:
+                conn.close()
+                raise ServerNotFoundError("Unable to find the server at %s" % conn.host)
+            except socket.error, e:
+                if not hasattr(e, 'errno'): # I don't know what this is so lets raise it if it happens
+                    raise
+                elif e.errno == errno.ECONNREFUSED: # Connection refused
+                    raise
+                # Just because the server closed the connection doesn't apparently mean
+                # that the server didn't send a response.
+                pass
+            except httplib.HTTPException:
+                # Just because the server closed the connection doesn't apparently mean
+                # that the server didn't send a response.
+                pass
+            try:
+                response = conn.getresponse()
+            except (socket.error, httplib.HTTPException):
+                if i == 0:
+                    conn.close()
+                    conn.connect()
+                    continue
+                else:
+                    raise
+            else:
+                content = ""
+                if method == "HEAD":
+                    response.close()
+                else:
+                    content = response.read()
+                response = Response(response)
+                if method != "HEAD":
+                    content = _decompressContent(response, content)
+            break
+        return (response, content)
+
+
+    def _request(self, conn, host, absolute_uri, request_uri, method, body, headers, redirections, cachekey):
+        """Do the actual request using the connection object
+        and also follow one level of redirects if necessary"""
+
+        auths = [(auth.depth(request_uri), auth) for auth in self.authorizations if auth.inscope(host, request_uri)]
+        auth = auths and sorted(auths)[0][1] or None
+        if auth:
+            auth.request(method, request_uri, headers, body)
+
+        (response, content) = self._conn_request(conn, request_uri, method, body, headers)
+
+        if auth:
+            if auth.response(response, body):
+                auth.request(method, request_uri, headers, body)
+                (response, content) = self._conn_request(conn, request_uri, method, body, headers )
+                response._stale_digest = 1
+
+        if response.status == 401:
+            for authorization in self._auth_from_challenge(host, request_uri, headers, response, content):
+                authorization.request(method, request_uri, headers, body)
+                (response, content) = self._conn_request(conn, request_uri, method, body, headers, )
+                if response.status != 401:
+                    self.authorizations.append(authorization)
+                    authorization.response(response, body)
+                    break
+
+        if (self.follow_all_redirects or (method in ["GET", "HEAD"]) or response.status == 303):
+            if self.follow_redirects and response.status in [300, 301, 302, 303, 307]:
+                # Pick out the location header and basically start from the beginning
+                # remembering first to strip the ETag header and decrement our 'depth'
+                if redirections:
+                    if not response.has_key('location') and response.status != 300:
+                        raise RedirectMissingLocation( _("Redirected but the response is missing a Location: header."), response, content)
+                    # Fix-up relative redirects (which violate an RFC 2616 MUST)
+                    if response.has_key('location'):
+                        location = response['location']
+                        (scheme, authority, path, query, fragment) = parse_uri(location)
+                        if authority is None:
+                            response['location'] = urlparse.urljoin(absolute_uri, location)
+                    if response.status == 301 and method in ["GET", "HEAD"]:
+                        response['-x-permanent-redirect-url'] = response['location']
+                        if not response.has_key('content-location'):
+                            response['content-location'] = absolute_uri
+                        _updateCache(headers, response, content, self.cache, cachekey)
+                    if headers.has_key('if-none-match'):
+                        del headers['if-none-match']
+                    if headers.has_key('if-modified-since'):
+                        del headers['if-modified-since']
+                    if response.has_key('location'):
+                        location = response['location']
+                        old_response = copy.deepcopy(response)
+                        if not old_response.has_key('content-location'):
+                            old_response['content-location'] = absolute_uri
+                        redirect_method = ((response.status == 303) and (method not in ["GET", "HEAD"])) and "GET" or method
+                        (response, content) = self.request(location, redirect_method, body=body, headers = headers, redirections = redirections - 1)
+                        response.previous = old_response
+                else:
+                    raise RedirectLimit( _("Redirected more times than rediection_limit allows."), response, content)
+            elif response.status in [200, 203] and method == "GET":
+                # Don't cache 206's since we aren't going to handle byte range requests
+                if not response.has_key('content-location'):
+                    response['content-location'] = absolute_uri
+                _updateCache(headers, response, content, self.cache, cachekey)
+
+        return (response, content)
+
+    def _normalize_headers(self, headers):
+        return _normalize_headers(headers)
+
+# Need to catch and rebrand some exceptions
+# Then need to optionally turn all exceptions into status codes
+# including all socket.* and httplib.* exceptions.
+
+
+    def request(self, uri, method="GET", body=None, headers=None, redirections=DEFAULT_MAX_REDIRECTS, connection_type=None):
+        """ Performs a single HTTP request.
+The 'uri' is the URI of the HTTP resource and can begin
+with either 'http' or 'https'. The value of 'uri' must be an absolute URI.
+
+The 'method' is the HTTP method to perform, such as GET, POST, DELETE, etc.
+There is no restriction on the methods allowed.
+
+The 'body' is the entity body to be sent with the request. It is a string
+object.
+
+Any extra headers that are to be sent with the request should be provided in the
+'headers' dictionary.
+
+The maximum number of redirect to follow before raising an
+exception is 'redirections. The default is 5.
+
+The return value is a tuple of (response, content), the first
+being and instance of the 'Response' class, the second being
+a string that contains the response entity body.
+        """
+        try:
+            if headers is None:
+                headers = {}
+            else:
+                headers = self._normalize_headers(headers)
+
+            if not headers.has_key('user-agent'):
+                headers['user-agent'] = "Python-httplib2/%s" % __version__
+
+            uri = iri2uri(uri)
+
+            (scheme, authority, request_uri, defrag_uri) = urlnorm(uri)
+            domain_port = authority.split(":")[0:2]
+            if len(domain_port) == 2 and domain_port[1] == '443' and scheme == 'http':
+                scheme = 'https'
+                authority = domain_port[0]
+
+            conn_key = scheme+":"+authority
+            if conn_key in self.connections:
+                conn = self.connections[conn_key]
+            else:
+                if not connection_type:
+                    connection_type = (scheme == 'https') and HTTPSConnectionWithTimeout or HTTPConnectionWithTimeout
+                certs = list(self.certificates.iter(authority))
+                if scheme == 'https' and certs:
+                    conn = self.connections[conn_key] = connection_type(authority, key_file=certs[0][0],
+                        cert_file=certs[0][1], timeout=self.timeout, proxy_info=self.proxy_info)
+                else:
+                    conn = self.connections[conn_key] = connection_type(authority, timeout=self.timeout, proxy_info=self.proxy_info)
+                conn.set_debuglevel(debuglevel)
+
+            if method in ["GET", "HEAD"] and 'range' not in headers and 'accept-encoding' not in headers:
+                headers['accept-encoding'] = 'gzip, deflate'
+
+            info = email.Message.Message()
+            cached_value = None
+            if self.cache:
+                cachekey = defrag_uri
+                cached_value = self.cache.get(cachekey)
+                if cached_value:
+                    # info = email.message_from_string(cached_value)
+                    #
+                    # Need to replace the line above with the kludge below
+                    # to fix the non-existent bug not fixed in this
+                    # bug report: http://mail.python.org/pipermail/python-bugs-list/2005-September/030289.html
+                    try:
+                        info, content = cached_value.split('\r\n\r\n', 1)
+                        feedparser = email.FeedParser.FeedParser()
+                        feedparser.feed(info)
+                        info = feedparser.close()
+                        feedparser._parse = None
+                    except IndexError, ValueError:
+                        self.cache.delete(cachekey)
+                        cachekey = None
+                        cached_value = None
+            else:
+                cachekey = None
+
+            if method in self.optimistic_concurrency_methods and self.cache and info.has_key('etag') and not self.ignore_etag and 'if-match' not in headers:
+                # http://www.w3.org/1999/04/Editing/
+                headers['if-match'] = info['etag']
+
+            if method not in ["GET", "HEAD"] and self.cache and cachekey:
+                # RFC 2616 Section 13.10
+                self.cache.delete(cachekey)
+
+            # Check the vary header in the cache to see if this request
+            # matches what varies in the cache.
+            if method in ['GET', 'HEAD'] and 'vary' in info:
+                vary = info['vary']
+                vary_headers = vary.lower().replace(' ', '').split(',')
+                for header in vary_headers:
+                    key = '-varied-%s' % header
+                    value = info[key]
+                    if headers.get(header, '') != value:
+                            cached_value = None
+                            break
+
+            if cached_value and method in ["GET", "HEAD"] and self.cache and 'range' not in headers:
+                if info.has_key('-x-permanent-redirect-url'):
+                    # Should cached permanent redirects be counted in our redirection count? For now, yes.
+                    (response, new_content) = self.request(info['-x-permanent-redirect-url'], "GET", headers = headers, redirections = redirections - 1)
+                    response.previous = Response(info)
+                    response.previous.fromcache = True
+                else:
+                    # Determine our course of action:
+                    #   Is the cached entry fresh or stale?
+                    #   Has the client requested a non-cached response?
+                    #
+                    # There seems to be three possible answers:
+                    # 1. [FRESH] Return the cache entry w/o doing a GET
+                    # 2. [STALE] Do the GET (but add in cache validators if available)
+                    # 3. [TRANSPARENT] Do a GET w/o any cache validators (Cache-Control: no-cache) on the request
+                    entry_disposition = _entry_disposition(info, headers)
+
+                    if entry_disposition == "FRESH":
+                        if not cached_value:
+                            info['status'] = '504'
+                            content = ""
+                        response = Response(info)
+                        if cached_value:
+                            response.fromcache = True
+                        return (response, content)
+
+                    if entry_disposition == "STALE":
+                        if info.has_key('etag') and not self.ignore_etag and not 'if-none-match' in headers:
+                            headers['if-none-match'] = info['etag']
+                        if info.has_key('last-modified') and not 'last-modified' in headers:
+                            headers['if-modified-since'] = info['last-modified']
+                    elif entry_disposition == "TRANSPARENT":
+                        pass
+
+                    (response, new_content) = self._request(conn, authority, uri, request_uri, method, body, headers, redirections, cachekey)
+
+                if response.status == 304 and method == "GET":
+                    # Rewrite the cache entry with the new end-to-end headers
+                    # Take all headers that are in response
+                    # and overwrite their values in info.
+                    # unless they are hop-by-hop, or are listed in the connection header.
+
+                    for key in _get_end2end_headers(response):
+                        info[key] = response[key]
+                    merged_response = Response(info)
+                    if hasattr(response, "_stale_digest"):
+                        merged_response._stale_digest = response._stale_digest
+                    _updateCache(headers, merged_response, content, self.cache, cachekey)
+                    response = merged_response
+                    response.status = 200
+                    response.fromcache = True
+
+                elif response.status == 200:
+                    content = new_content
+                else:
+                    self.cache.delete(cachekey)
+                    content = new_content
+            else:
+                cc = _parse_cache_control(headers)
+                if cc.has_key('only-if-cached'):
+                    info['status'] = '504'
+                    response = Response(info)
+                    content = ""
+                else:
+                    (response, content) = self._request(conn, authority, uri, request_uri, method, body, headers, redirections, cachekey)
+        except Exception, e:
+            if self.force_exception_to_status_code:
+                if isinstance(e, HttpLib2ErrorWithResponse):
+                    response = e.response
+                    content = e.content
+                    response.status = 500
+                    response.reason = str(e)
+                elif isinstance(e, socket.timeout) or (isinstance(e, socket.error) and 'timed out' in str(e)):
+                    content = "Request Timeout"
+                    response = Response( {
+                            "content-type": "text/plain",
+                            "status": "408",
+                            "content-length": len(content)
+                            })
+                    response.reason = "Request Timeout"
+                else:
+                    content = str(e)
+                    response = Response( {
+                            "content-type": "text/plain",
+                            "status": "400",
+                            "content-length": len(content)
+                            })
+                    response.reason = "Bad Request"
+            else:
+                raise
+
+
+        return (response, content)
+
+
+
+class Response(dict):
+    """An object more like email.Message than httplib.HTTPResponse."""
+
+    """Is this response from our local cache"""
+    fromcache = False
+
+    """HTTP protocol version used by server. 10 for HTTP/1.0, 11 for HTTP/1.1. """
+    version = 11
+
+    "Status code returned by server. "
+    status = 200
+
+    """Reason phrase returned by server."""
+    reason = "Ok"
+
+    previous = None
+
+    def __init__(self, info):
+        # info is either an email.Message or
+        # an httplib.HTTPResponse object.
+        if isinstance(info, httplib.HTTPResponse):
+            for key, value in info.getheaders():
+                self[key.lower()] = value
+            self.status = info.status
+            self['status'] = str(self.status)
+            self.reason = info.reason
+            self.version = info.version
+        elif isinstance(info, email.Message.Message):
+            for key, value in info.items():
+                self[key] = value
+            self.status = int(self['status'])
+        else:
+            for key, value in info.iteritems():
+                self[key] = value
+            self.status = int(self.get('status', self.status))
+
+
+    def __getattr__(self, name):
+        if name == 'dict':
+            return self
+        else:
+            raise AttributeError, name
diff --git a/lib/httplib2/iri2uri.py b/lib/httplib2/iri2uri.py
new file mode 100755
index 00000000..e4cda1d7
--- /dev/null
+++ b/lib/httplib2/iri2uri.py
@@ -0,0 +1,110 @@
+"""
+iri2uri
+
+Converts an IRI to a URI.
+
+"""
+__author__ = "Joe Gregorio (joe@bitworking.org)"
+__copyright__ = "Copyright 2006, Joe Gregorio"
+__contributors__ = []
+__version__ = "1.0.0"
+__license__ = "MIT"
+__history__ = """
+"""
+
+import urlparse
+
+
+# Convert an IRI to a URI following the rules in RFC 3987
+#
+# The characters we need to enocde and escape are defined in the spec:
+#
+# iprivate =  %xE000-F8FF / %xF0000-FFFFD / %x100000-10FFFD
+# ucschar = %xA0-D7FF / %xF900-FDCF / %xFDF0-FFEF
+#         / %x10000-1FFFD / %x20000-2FFFD / %x30000-3FFFD
+#         / %x40000-4FFFD / %x50000-5FFFD / %x60000-6FFFD
+#         / %x70000-7FFFD / %x80000-8FFFD / %x90000-9FFFD
+#         / %xA0000-AFFFD / %xB0000-BFFFD / %xC0000-CFFFD
+#         / %xD0000-DFFFD / %xE1000-EFFFD
+
+escape_range = [
+   (0xA0, 0xD7FF ),
+   (0xE000, 0xF8FF ),
+   (0xF900, 0xFDCF ),
+   (0xFDF0, 0xFFEF),
+   (0x10000, 0x1FFFD ),
+   (0x20000, 0x2FFFD ),
+   (0x30000, 0x3FFFD),
+   (0x40000, 0x4FFFD ),
+   (0x50000, 0x5FFFD ),
+   (0x60000, 0x6FFFD),
+   (0x70000, 0x7FFFD ),
+   (0x80000, 0x8FFFD ),
+   (0x90000, 0x9FFFD),
+   (0xA0000, 0xAFFFD ),
+   (0xB0000, 0xBFFFD ),
+   (0xC0000, 0xCFFFD),
+   (0xD0000, 0xDFFFD ),
+   (0xE1000, 0xEFFFD),
+   (0xF0000, 0xFFFFD ),
+   (0x100000, 0x10FFFD)
+]
+
+def encode(c):
+    retval = c
+    i = ord(c)
+    for low, high in escape_range:
+        if i < low:
+            break
+        if i >= low and i <= high:
+            retval = "".join(["%%%2X" % ord(o) for o in c.encode('utf-8')])
+            break
+    return retval
+
+
+def iri2uri(uri):
+    """Convert an IRI to a URI. Note that IRIs must be
+    passed in a unicode strings. That is, do not utf-8 encode
+    the IRI before passing it into the function."""
+    if isinstance(uri ,unicode):
+        (scheme, authority, path, query, fragment) = urlparse.urlsplit(uri)
+        authority = authority.encode('idna')
+        # For each character in 'ucschar' or 'iprivate'
+        #  1. encode as utf-8
+        #  2. then %-encode each octet of that utf-8
+        uri = urlparse.urlunsplit((scheme, authority, path, query, fragment))
+        uri = "".join([encode(c) for c in uri])
+    return uri
+
+if __name__ == "__main__":
+    import unittest
+
+    class Test(unittest.TestCase):
+
+        def test_uris(self):
+            """Test that URIs are invariant under the transformation."""
+            invariant = [
+                u"ftp://ftp.is.co.za/rfc/rfc1808.txt",
+                u"http://www.ietf.org/rfc/rfc2396.txt",
+                u"ldap://[2001:db8::7]/c=GB?objectClass?one",
+                u"mailto:John.Doe@example.com",
+                u"news:comp.infosystems.www.servers.unix",
+                u"tel:+1-816-555-1212",
+                u"telnet://192.0.2.16:80/",
+                u"urn:oasis:names:specification:docbook:dtd:xml:4.1.2" ]
+            for uri in invariant:
+                self.assertEqual(uri, iri2uri(uri))
+
+        def test_iri(self):
+            """ Test that the right type of escaping is done for each part of the URI."""
+            self.assertEqual("http://xn--o3h.com/%E2%98%84", iri2uri(u"http://\N{COMET}.com/\N{COMET}"))
+            self.assertEqual("http://bitworking.org/?fred=%E2%98%84", iri2uri(u"http://bitworking.org/?fred=\N{COMET}"))
+            self.assertEqual("http://bitworking.org/#%E2%98%84", iri2uri(u"http://bitworking.org/#\N{COMET}"))
+            self.assertEqual("#%E2%98%84", iri2uri(u"#\N{COMET}"))
+            self.assertEqual("/fred?bar=%E2%98%9A#%E2%98%84", iri2uri(u"/fred?bar=\N{BLACK LEFT POINTING INDEX}#\N{COMET}"))
+            self.assertEqual("/fred?bar=%E2%98%9A#%E2%98%84", iri2uri(iri2uri(u"/fred?bar=\N{BLACK LEFT POINTING INDEX}#\N{COMET}")))
+            self.assertNotEqual("/fred?bar=%E2%98%9A#%E2%98%84", iri2uri(u"/fred?bar=\N{BLACK LEFT POINTING INDEX}#\N{COMET}".encode('utf-8')))
+
+    unittest.main()
+
+
diff --git a/lib/idna/__init__.py b/lib/idna/__init__.py
deleted file mode 100644
index cfdc030a..00000000
--- a/lib/idna/__init__.py
+++ /dev/null
@@ -1,45 +0,0 @@
-from .core import (
-    IDNABidiError,
-    IDNAError,
-    InvalidCodepoint,
-    InvalidCodepointContext,
-    alabel,
-    check_bidi,
-    check_hyphen_ok,
-    check_initial_combiner,
-    check_label,
-    check_nfc,
-    decode,
-    encode,
-    ulabel,
-    uts46_remap,
-    valid_contextj,
-    valid_contexto,
-    valid_label_length,
-    valid_string_length,
-)
-from .intranges import intranges_contain
-from .package_data import __version__
-
-__all__ = [
-    "__version__",
-    "IDNABidiError",
-    "IDNAError",
-    "InvalidCodepoint",
-    "InvalidCodepointContext",
-    "alabel",
-    "check_bidi",
-    "check_hyphen_ok",
-    "check_initial_combiner",
-    "check_label",
-    "check_nfc",
-    "decode",
-    "encode",
-    "intranges_contain",
-    "ulabel",
-    "uts46_remap",
-    "valid_contextj",
-    "valid_contexto",
-    "valid_label_length",
-    "valid_string_length",
-]
diff --git a/lib/idna/codec.py b/lib/idna/codec.py
deleted file mode 100644
index 913abfd6..00000000
--- a/lib/idna/codec.py
+++ /dev/null
@@ -1,122 +0,0 @@
-import codecs
-import re
-from typing import Any, Optional, Tuple
-
-from .core import IDNAError, alabel, decode, encode, ulabel
-
-_unicode_dots_re = re.compile("[\u002e\u3002\uff0e\uff61]")
-
-
-class Codec(codecs.Codec):
-    def encode(self, data: str, errors: str = "strict") -> Tuple[bytes, int]:
-        if errors != "strict":
-            raise IDNAError('Unsupported error handling "{}"'.format(errors))
-
-        if not data:
-            return b"", 0
-
-        return encode(data), len(data)
-
-    def decode(self, data: bytes, errors: str = "strict") -> Tuple[str, int]:
-        if errors != "strict":
-            raise IDNAError('Unsupported error handling "{}"'.format(errors))
-
-        if not data:
-            return "", 0
-
-        return decode(data), len(data)
-
-
-class IncrementalEncoder(codecs.BufferedIncrementalEncoder):
-    def _buffer_encode(self, data: str, errors: str, final: bool) -> Tuple[bytes, int]:
-        if errors != "strict":
-            raise IDNAError('Unsupported error handling "{}"'.format(errors))
-
-        if not data:
-            return b"", 0
-
-        labels = _unicode_dots_re.split(data)
-        trailing_dot = b""
-        if labels:
-            if not labels[-1]:
-                trailing_dot = b"."
-                del labels[-1]
-            elif not final:
-                # Keep potentially unfinished label until the next call
-                del labels[-1]
-                if labels:
-                    trailing_dot = b"."
-
-        result = []
-        size = 0
-        for label in labels:
-            result.append(alabel(label))
-            if size:
-                size += 1
-            size += len(label)
-
-        # Join with U+002E
-        result_bytes = b".".join(result) + trailing_dot
-        size += len(trailing_dot)
-        return result_bytes, size
-
-
-class IncrementalDecoder(codecs.BufferedIncrementalDecoder):
-    def _buffer_decode(self, data: Any, errors: str, final: bool) -> Tuple[str, int]:
-        if errors != "strict":
-            raise IDNAError('Unsupported error handling "{}"'.format(errors))
-
-        if not data:
-            return ("", 0)
-
-        if not isinstance(data, str):
-            data = str(data, "ascii")
-
-        labels = _unicode_dots_re.split(data)
-        trailing_dot = ""
-        if labels:
-            if not labels[-1]:
-                trailing_dot = "."
-                del labels[-1]
-            elif not final:
-                # Keep potentially unfinished label until the next call
-                del labels[-1]
-                if labels:
-                    trailing_dot = "."
-
-        result = []
-        size = 0
-        for label in labels:
-            result.append(ulabel(label))
-            if size:
-                size += 1
-            size += len(label)
-
-        result_str = ".".join(result) + trailing_dot
-        size += len(trailing_dot)
-        return (result_str, size)
-
-
-class StreamWriter(Codec, codecs.StreamWriter):
-    pass
-
-
-class StreamReader(Codec, codecs.StreamReader):
-    pass
-
-
-def search_function(name: str) -> Optional[codecs.CodecInfo]:
-    if name != "idna2008":
-        return None
-    return codecs.CodecInfo(
-        name=name,
-        encode=Codec().encode,
-        decode=Codec().decode,
-        incrementalencoder=IncrementalEncoder,
-        incrementaldecoder=IncrementalDecoder,
-        streamwriter=StreamWriter,
-        streamreader=StreamReader,
-    )
-
-
-codecs.register(search_function)
diff --git a/lib/idna/compat.py b/lib/idna/compat.py
deleted file mode 100644
index 1df9f2a7..00000000
--- a/lib/idna/compat.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from typing import Any, Union
-
-from .core import decode, encode
-
-
-def ToASCII(label: str) -> bytes:
-    return encode(label)
-
-
-def ToUnicode(label: Union[bytes, bytearray]) -> str:
-    return decode(label)
-
-
-def nameprep(s: Any) -> None:
-    raise NotImplementedError("IDNA 2008 does not utilise nameprep protocol")
diff --git a/lib/idna/core.py b/lib/idna/core.py
deleted file mode 100644
index 9115f123..00000000
--- a/lib/idna/core.py
+++ /dev/null
@@ -1,437 +0,0 @@
-import bisect
-import re
-import unicodedata
-from typing import Optional, Union
-
-from . import idnadata
-from .intranges import intranges_contain
-
-_virama_combining_class = 9
-_alabel_prefix = b"xn--"
-_unicode_dots_re = re.compile("[\u002e\u3002\uff0e\uff61]")
-
-
-class IDNAError(UnicodeError):
-    """Base exception for all IDNA-encoding related problems"""
-
-    pass
-
-
-class IDNABidiError(IDNAError):
-    """Exception when bidirectional requirements are not satisfied"""
-
-    pass
-
-
-class InvalidCodepoint(IDNAError):
-    """Exception when a disallowed or unallocated codepoint is used"""
-
-    pass
-
-
-class InvalidCodepointContext(IDNAError):
-    """Exception when the codepoint is not valid in the context it is used"""
-
-    pass
-
-
-def _combining_class(cp: int) -> int:
-    v = unicodedata.combining(chr(cp))
-    if v == 0:
-        if not unicodedata.name(chr(cp)):
-            raise ValueError("Unknown character in unicodedata")
-    return v
-
-
-def _is_script(cp: str, script: str) -> bool:
-    return intranges_contain(ord(cp), idnadata.scripts[script])
-
-
-def _punycode(s: str) -> bytes:
-    return s.encode("punycode")
-
-
-def _unot(s: int) -> str:
-    return "U+{:04X}".format(s)
-
-
-def valid_label_length(label: Union[bytes, str]) -> bool:
-    if len(label) > 63:
-        return False
-    return True
-
-
-def valid_string_length(label: Union[bytes, str], trailing_dot: bool) -> bool:
-    if len(label) > (254 if trailing_dot else 253):
-        return False
-    return True
-
-
-def check_bidi(label: str, check_ltr: bool = False) -> bool:
-    # Bidi rules should only be applied if string contains RTL characters
-    bidi_label = False
-    for idx, cp in enumerate(label, 1):
-        direction = unicodedata.bidirectional(cp)
-        if direction == "":
-            # String likely comes from a newer version of Unicode
-            raise IDNABidiError("Unknown directionality in label {} at position {}".format(repr(label), idx))
-        if direction in ["R", "AL", "AN"]:
-            bidi_label = True
-    if not bidi_label and not check_ltr:
-        return True
-
-    # Bidi rule 1
-    direction = unicodedata.bidirectional(label[0])
-    if direction in ["R", "AL"]:
-        rtl = True
-    elif direction == "L":
-        rtl = False
-    else:
-        raise IDNABidiError("First codepoint in label {} must be directionality L, R or AL".format(repr(label)))
-
-    valid_ending = False
-    number_type: Optional[str] = None
-    for idx, cp in enumerate(label, 1):
-        direction = unicodedata.bidirectional(cp)
-
-        if rtl:
-            # Bidi rule 2
-            if direction not in [
-                "R",
-                "AL",
-                "AN",
-                "EN",
-                "ES",
-                "CS",
-                "ET",
-                "ON",
-                "BN",
-                "NSM",
-            ]:
-                raise IDNABidiError("Invalid direction for codepoint at position {} in a right-to-left label".format(idx))
-            # Bidi rule 3
-            if direction in ["R", "AL", "EN", "AN"]:
-                valid_ending = True
-            elif direction != "NSM":
-                valid_ending = False
-            # Bidi rule 4
-            if direction in ["AN", "EN"]:
-                if not number_type:
-                    number_type = direction
-                else:
-                    if number_type != direction:
-                        raise IDNABidiError("Can not mix numeral types in a right-to-left label")
-        else:
-            # Bidi rule 5
-            if direction not in ["L", "EN", "ES", "CS", "ET", "ON", "BN", "NSM"]:
-                raise IDNABidiError("Invalid direction for codepoint at position {} in a left-to-right label".format(idx))
-            # Bidi rule 6
-            if direction in ["L", "EN"]:
-                valid_ending = True
-            elif direction != "NSM":
-                valid_ending = False
-
-    if not valid_ending:
-        raise IDNABidiError("Label ends with illegal codepoint directionality")
-
-    return True
-
-
-def check_initial_combiner(label: str) -> bool:
-    if unicodedata.category(label[0])[0] == "M":
-        raise IDNAError("Label begins with an illegal combining character")
-    return True
-
-
-def check_hyphen_ok(label: str) -> bool:
-    if label[2:4] == "--":
-        raise IDNAError("Label has disallowed hyphens in 3rd and 4th position")
-    if label[0] == "-" or label[-1] == "-":
-        raise IDNAError("Label must not start or end with a hyphen")
-    return True
-
-
-def check_nfc(label: str) -> None:
-    if unicodedata.normalize("NFC", label) != label:
-        raise IDNAError("Label must be in Normalization Form C")
-
-
-def valid_contextj(label: str, pos: int) -> bool:
-    cp_value = ord(label[pos])
-
-    if cp_value == 0x200C:
-        if pos > 0:
-            if _combining_class(ord(label[pos - 1])) == _virama_combining_class:
-                return True
-
-        ok = False
-        for i in range(pos - 1, -1, -1):
-            joining_type = idnadata.joining_types.get(ord(label[i]))
-            if joining_type == ord("T"):
-                continue
-            elif joining_type in [ord("L"), ord("D")]:
-                ok = True
-                break
-            else:
-                break
-
-        if not ok:
-            return False
-
-        ok = False
-        for i in range(pos + 1, len(label)):
-            joining_type = idnadata.joining_types.get(ord(label[i]))
-            if joining_type == ord("T"):
-                continue
-            elif joining_type in [ord("R"), ord("D")]:
-                ok = True
-                break
-            else:
-                break
-        return ok
-
-    if cp_value == 0x200D:
-        if pos > 0:
-            if _combining_class(ord(label[pos - 1])) == _virama_combining_class:
-                return True
-        return False
-
-    else:
-        return False
-
-
-def valid_contexto(label: str, pos: int, exception: bool = False) -> bool:
-    cp_value = ord(label[pos])
-
-    if cp_value == 0x00B7:
-        if 0 < pos < len(label) - 1:
-            if ord(label[pos - 1]) == 0x006C and ord(label[pos + 1]) == 0x006C:
-                return True
-        return False
-
-    elif cp_value == 0x0375:
-        if pos < len(label) - 1 and len(label) > 1:
-            return _is_script(label[pos + 1], "Greek")
-        return False
-
-    elif cp_value == 0x05F3 or cp_value == 0x05F4:
-        if pos > 0:
-            return _is_script(label[pos - 1], "Hebrew")
-        return False
-
-    elif cp_value == 0x30FB:
-        for cp in label:
-            if cp == "\u30fb":
-                continue
-            if _is_script(cp, "Hiragana") or _is_script(cp, "Katakana") or _is_script(cp, "Han"):
-                return True
-        return False
-
-    elif 0x660 <= cp_value <= 0x669:
-        for cp in label:
-            if 0x6F0 <= ord(cp) <= 0x06F9:
-                return False
-        return True
-
-    elif 0x6F0 <= cp_value <= 0x6F9:
-        for cp in label:
-            if 0x660 <= ord(cp) <= 0x0669:
-                return False
-        return True
-
-    return False
-
-
-def check_label(label: Union[str, bytes, bytearray]) -> None:
-    if isinstance(label, (bytes, bytearray)):
-        label = label.decode("utf-8")
-    if len(label) == 0:
-        raise IDNAError("Empty Label")
-
-    check_nfc(label)
-    check_hyphen_ok(label)
-    check_initial_combiner(label)
-
-    for pos, cp in enumerate(label):
-        cp_value = ord(cp)
-        if intranges_contain(cp_value, idnadata.codepoint_classes["PVALID"]):
-            continue
-        elif intranges_contain(cp_value, idnadata.codepoint_classes["CONTEXTJ"]):
-            try:
-                if not valid_contextj(label, pos):
-                    raise InvalidCodepointContext(
-                        "Joiner {} not allowed at position {} in {}".format(_unot(cp_value), pos + 1, repr(label))
-                    )
-            except ValueError:
-                raise IDNAError(
-                    "Unknown codepoint adjacent to joiner {} at position {} in {}".format(
-                        _unot(cp_value), pos + 1, repr(label)
-                    )
-                )
-        elif intranges_contain(cp_value, idnadata.codepoint_classes["CONTEXTO"]):
-            if not valid_contexto(label, pos):
-                raise InvalidCodepointContext(
-                    "Codepoint {} not allowed at position {} in {}".format(_unot(cp_value), pos + 1, repr(label))
-                )
-        else:
-            raise InvalidCodepoint(
-                "Codepoint {} at position {} of {} not allowed".format(_unot(cp_value), pos + 1, repr(label))
-            )
-
-    check_bidi(label)
-
-
-def alabel(label: str) -> bytes:
-    try:
-        label_bytes = label.encode("ascii")
-        ulabel(label_bytes)
-        if not valid_label_length(label_bytes):
-            raise IDNAError("Label too long")
-        return label_bytes
-    except UnicodeEncodeError:
-        pass
-
-    check_label(label)
-    label_bytes = _alabel_prefix + _punycode(label)
-
-    if not valid_label_length(label_bytes):
-        raise IDNAError("Label too long")
-
-    return label_bytes
-
-
-def ulabel(label: Union[str, bytes, bytearray]) -> str:
-    if not isinstance(label, (bytes, bytearray)):
-        try:
-            label_bytes = label.encode("ascii")
-        except UnicodeEncodeError:
-            check_label(label)
-            return label
-    else:
-        label_bytes = label
-
-    label_bytes = label_bytes.lower()
-    if label_bytes.startswith(_alabel_prefix):
-        label_bytes = label_bytes[len(_alabel_prefix) :]
-        if not label_bytes:
-            raise IDNAError("Malformed A-label, no Punycode eligible content found")
-        if label_bytes.decode("ascii")[-1] == "-":
-            raise IDNAError("A-label must not end with a hyphen")
-    else:
-        check_label(label_bytes)
-        return label_bytes.decode("ascii")
-
-    try:
-        label = label_bytes.decode("punycode")
-    except UnicodeError:
-        raise IDNAError("Invalid A-label")
-    check_label(label)
-    return label
-
-
-def uts46_remap(domain: str, std3_rules: bool = True, transitional: bool = False) -> str:
-    """Re-map the characters in the string according to UTS46 processing."""
-    from .uts46data import uts46data
-
-    output = ""
-
-    for pos, char in enumerate(domain):
-        code_point = ord(char)
-        try:
-            uts46row = uts46data[code_point if code_point < 256 else bisect.bisect_left(uts46data, (code_point, "Z")) - 1]
-            status = uts46row[1]
-            replacement: Optional[str] = None
-            if len(uts46row) == 3:
-                replacement = uts46row[2]
-            if (
-                status == "V"
-                or (status == "D" and not transitional)
-                or (status == "3" and not std3_rules and replacement is None)
-            ):
-                output += char
-            elif replacement is not None and (
-                status == "M" or (status == "3" and not std3_rules) or (status == "D" and transitional)
-            ):
-                output += replacement
-            elif status != "I":
-                raise IndexError()
-        except IndexError:
-            raise InvalidCodepoint(
-                "Codepoint {} not allowed at position {} in {}".format(_unot(code_point), pos + 1, repr(domain))
-            )
-
-    return unicodedata.normalize("NFC", output)
-
-
-def encode(
-    s: Union[str, bytes, bytearray],
-    strict: bool = False,
-    uts46: bool = False,
-    std3_rules: bool = False,
-    transitional: bool = False,
-) -> bytes:
-    if not isinstance(s, str):
-        try:
-            s = str(s, "ascii")
-        except UnicodeDecodeError:
-            raise IDNAError("should pass a unicode string to the function rather than a byte string.")
-    if uts46:
-        s = uts46_remap(s, std3_rules, transitional)
-    trailing_dot = False
-    result = []
-    if strict:
-        labels = s.split(".")
-    else:
-        labels = _unicode_dots_re.split(s)
-    if not labels or labels == [""]:
-        raise IDNAError("Empty domain")
-    if labels[-1] == "":
-        del labels[-1]
-        trailing_dot = True
-    for label in labels:
-        s = alabel(label)
-        if s:
-            result.append(s)
-        else:
-            raise IDNAError("Empty label")
-    if trailing_dot:
-        result.append(b"")
-    s = b".".join(result)
-    if not valid_string_length(s, trailing_dot):
-        raise IDNAError("Domain too long")
-    return s
-
-
-def decode(
-    s: Union[str, bytes, bytearray],
-    strict: bool = False,
-    uts46: bool = False,
-    std3_rules: bool = False,
-) -> str:
-    try:
-        if not isinstance(s, str):
-            s = str(s, "ascii")
-    except UnicodeDecodeError:
-        raise IDNAError("Invalid ASCII in A-label")
-    if uts46:
-        s = uts46_remap(s, std3_rules, False)
-    trailing_dot = False
-    result = []
-    if not strict:
-        labels = _unicode_dots_re.split(s)
-    else:
-        labels = s.split(".")
-    if not labels or labels == [""]:
-        raise IDNAError("Empty domain")
-    if not labels[-1]:
-        del labels[-1]
-        trailing_dot = True
-    for label in labels:
-        s = ulabel(label)
-        if s:
-            result.append(s)
-        else:
-            raise IDNAError("Empty label")
-    if trailing_dot:
-        result.append("")
-    return ".".join(result)
diff --git a/lib/idna/idnadata.py b/lib/idna/idnadata.py
deleted file mode 100644
index 4be60046..00000000
--- a/lib/idna/idnadata.py
+++ /dev/null
@@ -1,4243 +0,0 @@
-# This file is automatically generated by tools/idna-data
-
-__version__ = "15.1.0"
-scripts = {
-    "Greek": (
-        0x37000000374,
-        0x37500000378,
-        0x37A0000037E,
-        0x37F00000380,
-        0x38400000385,
-        0x38600000387,
-        0x3880000038B,
-        0x38C0000038D,
-        0x38E000003A2,
-        0x3A3000003E2,
-        0x3F000000400,
-        0x1D2600001D2B,
-        0x1D5D00001D62,
-        0x1D6600001D6B,
-        0x1DBF00001DC0,
-        0x1F0000001F16,
-        0x1F1800001F1E,
-        0x1F2000001F46,
-        0x1F4800001F4E,
-        0x1F5000001F58,
-        0x1F5900001F5A,
-        0x1F5B00001F5C,
-        0x1F5D00001F5E,
-        0x1F5F00001F7E,
-        0x1F8000001FB5,
-        0x1FB600001FC5,
-        0x1FC600001FD4,
-        0x1FD600001FDC,
-        0x1FDD00001FF0,
-        0x1FF200001FF5,
-        0x1FF600001FFF,
-        0x212600002127,
-        0xAB650000AB66,
-        0x101400001018F,
-        0x101A0000101A1,
-        0x1D2000001D246,
-    ),
-    "Han": (
-        0x2E8000002E9A,
-        0x2E9B00002EF4,
-        0x2F0000002FD6,
-        0x300500003006,
-        0x300700003008,
-        0x30210000302A,
-        0x30380000303C,
-        0x340000004DC0,
-        0x4E000000A000,
-        0xF9000000FA6E,
-        0xFA700000FADA,
-        0x16FE200016FE4,
-        0x16FF000016FF2,
-        0x200000002A6E0,
-        0x2A7000002B73A,
-        0x2B7400002B81E,
-        0x2B8200002CEA2,
-        0x2CEB00002EBE1,
-        0x2EBF00002EE5E,
-        0x2F8000002FA1E,
-        0x300000003134B,
-        0x31350000323B0,
-    ),
-    "Hebrew": (
-        0x591000005C8,
-        0x5D0000005EB,
-        0x5EF000005F5,
-        0xFB1D0000FB37,
-        0xFB380000FB3D,
-        0xFB3E0000FB3F,
-        0xFB400000FB42,
-        0xFB430000FB45,
-        0xFB460000FB50,
-    ),
-    "Hiragana": (
-        0x304100003097,
-        0x309D000030A0,
-        0x1B0010001B120,
-        0x1B1320001B133,
-        0x1B1500001B153,
-        0x1F2000001F201,
-    ),
-    "Katakana": (
-        0x30A1000030FB,
-        0x30FD00003100,
-        0x31F000003200,
-        0x32D0000032FF,
-        0x330000003358,
-        0xFF660000FF70,
-        0xFF710000FF9E,
-        0x1AFF00001AFF4,
-        0x1AFF50001AFFC,
-        0x1AFFD0001AFFF,
-        0x1B0000001B001,
-        0x1B1200001B123,
-        0x1B1550001B156,
-        0x1B1640001B168,
-    ),
-}
-joining_types = {
-    0xAD: 84,
-    0x300: 84,
-    0x301: 84,
-    0x302: 84,
-    0x303: 84,
-    0x304: 84,
-    0x305: 84,
-    0x306: 84,
-    0x307: 84,
-    0x308: 84,
-    0x309: 84,
-    0x30A: 84,
-    0x30B: 84,
-    0x30C: 84,
-    0x30D: 84,
-    0x30E: 84,
-    0x30F: 84,
-    0x310: 84,
-    0x311: 84,
-    0x312: 84,
-    0x313: 84,
-    0x314: 84,
-    0x315: 84,
-    0x316: 84,
-    0x317: 84,
-    0x318: 84,
-    0x319: 84,
-    0x31A: 84,
-    0x31B: 84,
-    0x31C: 84,
-    0x31D: 84,
-    0x31E: 84,
-    0x31F: 84,
-    0x320: 84,
-    0x321: 84,
-    0x322: 84,
-    0x323: 84,
-    0x324: 84,
-    0x325: 84,
-    0x326: 84,
-    0x327: 84,
-    0x328: 84,
-    0x329: 84,
-    0x32A: 84,
-    0x32B: 84,
-    0x32C: 84,
-    0x32D: 84,
-    0x32E: 84,
-    0x32F: 84,
-    0x330: 84,
-    0x331: 84,
-    0x332: 84,
-    0x333: 84,
-    0x334: 84,
-    0x335: 84,
-    0x336: 84,
-    0x337: 84,
-    0x338: 84,
-    0x339: 84,
-    0x33A: 84,
-    0x33B: 84,
-    0x33C: 84,
-    0x33D: 84,
-    0x33E: 84,
-    0x33F: 84,
-    0x340: 84,
-    0x341: 84,
-    0x342: 84,
-    0x343: 84,
-    0x344: 84,
-    0x345: 84,
-    0x346: 84,
-    0x347: 84,
-    0x348: 84,
-    0x349: 84,
-    0x34A: 84,
-    0x34B: 84,
-    0x34C: 84,
-    0x34D: 84,
-    0x34E: 84,
-    0x34F: 84,
-    0x350: 84,
-    0x351: 84,
-    0x352: 84,
-    0x353: 84,
-    0x354: 84,
-    0x355: 84,
-    0x356: 84,
-    0x357: 84,
-    0x358: 84,
-    0x359: 84,
-    0x35A: 84,
-    0x35B: 84,
-    0x35C: 84,
-    0x35D: 84,
-    0x35E: 84,
-    0x35F: 84,
-    0x360: 84,
-    0x361: 84,
-    0x362: 84,
-    0x363: 84,
-    0x364: 84,
-    0x365: 84,
-    0x366: 84,
-    0x367: 84,
-    0x368: 84,
-    0x369: 84,
-    0x36A: 84,
-    0x36B: 84,
-    0x36C: 84,
-    0x36D: 84,
-    0x36E: 84,
-    0x36F: 84,
-    0x483: 84,
-    0x484: 84,
-    0x485: 84,
-    0x486: 84,
-    0x487: 84,
-    0x488: 84,
-    0x489: 84,
-    0x591: 84,
-    0x592: 84,
-    0x593: 84,
-    0x594: 84,
-    0x595: 84,
-    0x596: 84,
-    0x597: 84,
-    0x598: 84,
-    0x599: 84,
-    0x59A: 84,
-    0x59B: 84,
-    0x59C: 84,
-    0x59D: 84,
-    0x59E: 84,
-    0x59F: 84,
-    0x5A0: 84,
-    0x5A1: 84,
-    0x5A2: 84,
-    0x5A3: 84,
-    0x5A4: 84,
-    0x5A5: 84,
-    0x5A6: 84,
-    0x5A7: 84,
-    0x5A8: 84,
-    0x5A9: 84,
-    0x5AA: 84,
-    0x5AB: 84,
-    0x5AC: 84,
-    0x5AD: 84,
-    0x5AE: 84,
-    0x5AF: 84,
-    0x5B0: 84,
-    0x5B1: 84,
-    0x5B2: 84,
-    0x5B3: 84,
-    0x5B4: 84,
-    0x5B5: 84,
-    0x5B6: 84,
-    0x5B7: 84,
-    0x5B8: 84,
-    0x5B9: 84,
-    0x5BA: 84,
-    0x5BB: 84,
-    0x5BC: 84,
-    0x5BD: 84,
-    0x5BF: 84,
-    0x5C1: 84,
-    0x5C2: 84,
-    0x5C4: 84,
-    0x5C5: 84,
-    0x5C7: 84,
-    0x610: 84,
-    0x611: 84,
-    0x612: 84,
-    0x613: 84,
-    0x614: 84,
-    0x615: 84,
-    0x616: 84,
-    0x617: 84,
-    0x618: 84,
-    0x619: 84,
-    0x61A: 84,
-    0x61C: 84,
-    0x620: 68,
-    0x622: 82,
-    0x623: 82,
-    0x624: 82,
-    0x625: 82,
-    0x626: 68,
-    0x627: 82,
-    0x628: 68,
-    0x629: 82,
-    0x62A: 68,
-    0x62B: 68,
-    0x62C: 68,
-    0x62D: 68,
-    0x62E: 68,
-    0x62F: 82,
-    0x630: 82,
-    0x631: 82,
-    0x632: 82,
-    0x633: 68,
-    0x634: 68,
-    0x635: 68,
-    0x636: 68,
-    0x637: 68,
-    0x638: 68,
-    0x639: 68,
-    0x63A: 68,
-    0x63B: 68,
-    0x63C: 68,
-    0x63D: 68,
-    0x63E: 68,
-    0x63F: 68,
-    0x640: 67,
-    0x641: 68,
-    0x642: 68,
-    0x643: 68,
-    0x644: 68,
-    0x645: 68,
-    0x646: 68,
-    0x647: 68,
-    0x648: 82,
-    0x649: 68,
-    0x64A: 68,
-    0x64B: 84,
-    0x64C: 84,
-    0x64D: 84,
-    0x64E: 84,
-    0x64F: 84,
-    0x650: 84,
-    0x651: 84,
-    0x652: 84,
-    0x653: 84,
-    0x654: 84,
-    0x655: 84,
-    0x656: 84,
-    0x657: 84,
-    0x658: 84,
-    0x659: 84,
-    0x65A: 84,
-    0x65B: 84,
-    0x65C: 84,
-    0x65D: 84,
-    0x65E: 84,
-    0x65F: 84,
-    0x66E: 68,
-    0x66F: 68,
-    0x670: 84,
-    0x671: 82,
-    0x672: 82,
-    0x673: 82,
-    0x675: 82,
-    0x676: 82,
-    0x677: 82,
-    0x678: 68,
-    0x679: 68,
-    0x67A: 68,
-    0x67B: 68,
-    0x67C: 68,
-    0x67D: 68,
-    0x67E: 68,
-    0x67F: 68,
-    0x680: 68,
-    0x681: 68,
-    0x682: 68,
-    0x683: 68,
-    0x684: 68,
-    0x685: 68,
-    0x686: 68,
-    0x687: 68,
-    0x688: 82,
-    0x689: 82,
-    0x68A: 82,
-    0x68B: 82,
-    0x68C: 82,
-    0x68D: 82,
-    0x68E: 82,
-    0x68F: 82,
-    0x690: 82,
-    0x691: 82,
-    0x692: 82,
-    0x693: 82,
-    0x694: 82,
-    0x695: 82,
-    0x696: 82,
-    0x697: 82,
-    0x698: 82,
-    0x699: 82,
-    0x69A: 68,
-    0x69B: 68,
-    0x69C: 68,
-    0x69D: 68,
-    0x69E: 68,
-    0x69F: 68,
-    0x6A0: 68,
-    0x6A1: 68,
-    0x6A2: 68,
-    0x6A3: 68,
-    0x6A4: 68,
-    0x6A5: 68,
-    0x6A6: 68,
-    0x6A7: 68,
-    0x6A8: 68,
-    0x6A9: 68,
-    0x6AA: 68,
-    0x6AB: 68,
-    0x6AC: 68,
-    0x6AD: 68,
-    0x6AE: 68,
-    0x6AF: 68,
-    0x6B0: 68,
-    0x6B1: 68,
-    0x6B2: 68,
-    0x6B3: 68,
-    0x6B4: 68,
-    0x6B5: 68,
-    0x6B6: 68,
-    0x6B7: 68,
-    0x6B8: 68,
-    0x6B9: 68,
-    0x6BA: 68,
-    0x6BB: 68,
-    0x6BC: 68,
-    0x6BD: 68,
-    0x6BE: 68,
-    0x6BF: 68,
-    0x6C0: 82,
-    0x6C1: 68,
-    0x6C2: 68,
-    0x6C3: 82,
-    0x6C4: 82,
-    0x6C5: 82,
-    0x6C6: 82,
-    0x6C7: 82,
-    0x6C8: 82,
-    0x6C9: 82,
-    0x6CA: 82,
-    0x6CB: 82,
-    0x6CC: 68,
-    0x6CD: 82,
-    0x6CE: 68,
-    0x6CF: 82,
-    0x6D0: 68,
-    0x6D1: 68,
-    0x6D2: 82,
-    0x6D3: 82,
-    0x6D5: 82,
-    0x6D6: 84,
-    0x6D7: 84,
-    0x6D8: 84,
-    0x6D9: 84,
-    0x6DA: 84,
-    0x6DB: 84,
-    0x6DC: 84,
-    0x6DF: 84,
-    0x6E0: 84,
-    0x6E1: 84,
-    0x6E2: 84,
-    0x6E3: 84,
-    0x6E4: 84,
-    0x6E7: 84,
-    0x6E8: 84,
-    0x6EA: 84,
-    0x6EB: 84,
-    0x6EC: 84,
-    0x6ED: 84,
-    0x6EE: 82,
-    0x6EF: 82,
-    0x6FA: 68,
-    0x6FB: 68,
-    0x6FC: 68,
-    0x6FF: 68,
-    0x70F: 84,
-    0x710: 82,
-    0x711: 84,
-    0x712: 68,
-    0x713: 68,
-    0x714: 68,
-    0x715: 82,
-    0x716: 82,
-    0x717: 82,
-    0x718: 82,
-    0x719: 82,
-    0x71A: 68,
-    0x71B: 68,
-    0x71C: 68,
-    0x71D: 68,
-    0x71E: 82,
-    0x71F: 68,
-    0x720: 68,
-    0x721: 68,
-    0x722: 68,
-    0x723: 68,
-    0x724: 68,
-    0x725: 68,
-    0x726: 68,
-    0x727: 68,
-    0x728: 82,
-    0x729: 68,
-    0x72A: 82,
-    0x72B: 68,
-    0x72C: 82,
-    0x72D: 68,
-    0x72E: 68,
-    0x72F: 82,
-    0x730: 84,
-    0x731: 84,
-    0x732: 84,
-    0x733: 84,
-    0x734: 84,
-    0x735: 84,
-    0x736: 84,
-    0x737: 84,
-    0x738: 84,
-    0x739: 84,
-    0x73A: 84,
-    0x73B: 84,
-    0x73C: 84,
-    0x73D: 84,
-    0x73E: 84,
-    0x73F: 84,
-    0x740: 84,
-    0x741: 84,
-    0x742: 84,
-    0x743: 84,
-    0x744: 84,
-    0x745: 84,
-    0x746: 84,
-    0x747: 84,
-    0x748: 84,
-    0x749: 84,
-    0x74A: 84,
-    0x74D: 82,
-    0x74E: 68,
-    0x74F: 68,
-    0x750: 68,
-    0x751: 68,
-    0x752: 68,
-    0x753: 68,
-    0x754: 68,
-    0x755: 68,
-    0x756: 68,
-    0x757: 68,
-    0x758: 68,
-    0x759: 82,
-    0x75A: 82,
-    0x75B: 82,
-    0x75C: 68,
-    0x75D: 68,
-    0x75E: 68,
-    0x75F: 68,
-    0x760: 68,
-    0x761: 68,
-    0x762: 68,
-    0x763: 68,
-    0x764: 68,
-    0x765: 68,
-    0x766: 68,
-    0x767: 68,
-    0x768: 68,
-    0x769: 68,
-    0x76A: 68,
-    0x76B: 82,
-    0x76C: 82,
-    0x76D: 68,
-    0x76E: 68,
-    0x76F: 68,
-    0x770: 68,
-    0x771: 82,
-    0x772: 68,
-    0x773: 82,
-    0x774: 82,
-    0x775: 68,
-    0x776: 68,
-    0x777: 68,
-    0x778: 82,
-    0x779: 82,
-    0x77A: 68,
-    0x77B: 68,
-    0x77C: 68,
-    0x77D: 68,
-    0x77E: 68,
-    0x77F: 68,
-    0x7A6: 84,
-    0x7A7: 84,
-    0x7A8: 84,
-    0x7A9: 84,
-    0x7AA: 84,
-    0x7AB: 84,
-    0x7AC: 84,
-    0x7AD: 84,
-    0x7AE: 84,
-    0x7AF: 84,
-    0x7B0: 84,
-    0x7CA: 68,
-    0x7CB: 68,
-    0x7CC: 68,
-    0x7CD: 68,
-    0x7CE: 68,
-    0x7CF: 68,
-    0x7D0: 68,
-    0x7D1: 68,
-    0x7D2: 68,
-    0x7D3: 68,
-    0x7D4: 68,
-    0x7D5: 68,
-    0x7D6: 68,
-    0x7D7: 68,
-    0x7D8: 68,
-    0x7D9: 68,
-    0x7DA: 68,
-    0x7DB: 68,
-    0x7DC: 68,
-    0x7DD: 68,
-    0x7DE: 68,
-    0x7DF: 68,
-    0x7E0: 68,
-    0x7E1: 68,
-    0x7E2: 68,
-    0x7E3: 68,
-    0x7E4: 68,
-    0x7E5: 68,
-    0x7E6: 68,
-    0x7E7: 68,
-    0x7E8: 68,
-    0x7E9: 68,
-    0x7EA: 68,
-    0x7EB: 84,
-    0x7EC: 84,
-    0x7ED: 84,
-    0x7EE: 84,
-    0x7EF: 84,
-    0x7F0: 84,
-    0x7F1: 84,
-    0x7F2: 84,
-    0x7F3: 84,
-    0x7FA: 67,
-    0x7FD: 84,
-    0x816: 84,
-    0x817: 84,
-    0x818: 84,
-    0x819: 84,
-    0x81B: 84,
-    0x81C: 84,
-    0x81D: 84,
-    0x81E: 84,
-    0x81F: 84,
-    0x820: 84,
-    0x821: 84,
-    0x822: 84,
-    0x823: 84,
-    0x825: 84,
-    0x826: 84,
-    0x827: 84,
-    0x829: 84,
-    0x82A: 84,
-    0x82B: 84,
-    0x82C: 84,
-    0x82D: 84,
-    0x840: 82,
-    0x841: 68,
-    0x842: 68,
-    0x843: 68,
-    0x844: 68,
-    0x845: 68,
-    0x846: 82,
-    0x847: 82,
-    0x848: 68,
-    0x849: 82,
-    0x84A: 68,
-    0x84B: 68,
-    0x84C: 68,
-    0x84D: 68,
-    0x84E: 68,
-    0x84F: 68,
-    0x850: 68,
-    0x851: 68,
-    0x852: 68,
-    0x853: 68,
-    0x854: 82,
-    0x855: 68,
-    0x856: 82,
-    0x857: 82,
-    0x858: 82,
-    0x859: 84,
-    0x85A: 84,
-    0x85B: 84,
-    0x860: 68,
-    0x862: 68,
-    0x863: 68,
-    0x864: 68,
-    0x865: 68,
-    0x867: 82,
-    0x868: 68,
-    0x869: 82,
-    0x86A: 82,
-    0x870: 82,
-    0x871: 82,
-    0x872: 82,
-    0x873: 82,
-    0x874: 82,
-    0x875: 82,
-    0x876: 82,
-    0x877: 82,
-    0x878: 82,
-    0x879: 82,
-    0x87A: 82,
-    0x87B: 82,
-    0x87C: 82,
-    0x87D: 82,
-    0x87E: 82,
-    0x87F: 82,
-    0x880: 82,
-    0x881: 82,
-    0x882: 82,
-    0x883: 67,
-    0x884: 67,
-    0x885: 67,
-    0x886: 68,
-    0x889: 68,
-    0x88A: 68,
-    0x88B: 68,
-    0x88C: 68,
-    0x88D: 68,
-    0x88E: 82,
-    0x898: 84,
-    0x899: 84,
-    0x89A: 84,
-    0x89B: 84,
-    0x89C: 84,
-    0x89D: 84,
-    0x89E: 84,
-    0x89F: 84,
-    0x8A0: 68,
-    0x8A1: 68,
-    0x8A2: 68,
-    0x8A3: 68,
-    0x8A4: 68,
-    0x8A5: 68,
-    0x8A6: 68,
-    0x8A7: 68,
-    0x8A8: 68,
-    0x8A9: 68,
-    0x8AA: 82,
-    0x8AB: 82,
-    0x8AC: 82,
-    0x8AE: 82,
-    0x8AF: 68,
-    0x8B0: 68,
-    0x8B1: 82,
-    0x8B2: 82,
-    0x8B3: 68,
-    0x8B4: 68,
-    0x8B5: 68,
-    0x8B6: 68,
-    0x8B7: 68,
-    0x8B8: 68,
-    0x8B9: 82,
-    0x8BA: 68,
-    0x8BB: 68,
-    0x8BC: 68,
-    0x8BD: 68,
-    0x8BE: 68,
-    0x8BF: 68,
-    0x8C0: 68,
-    0x8C1: 68,
-    0x8C2: 68,
-    0x8C3: 68,
-    0x8C4: 68,
-    0x8C5: 68,
-    0x8C6: 68,
-    0x8C7: 68,
-    0x8C8: 68,
-    0x8CA: 84,
-    0x8CB: 84,
-    0x8CC: 84,
-    0x8CD: 84,
-    0x8CE: 84,
-    0x8CF: 84,
-    0x8D0: 84,
-    0x8D1: 84,
-    0x8D2: 84,
-    0x8D3: 84,
-    0x8D4: 84,
-    0x8D5: 84,
-    0x8D6: 84,
-    0x8D7: 84,
-    0x8D8: 84,
-    0x8D9: 84,
-    0x8DA: 84,
-    0x8DB: 84,
-    0x8DC: 84,
-    0x8DD: 84,
-    0x8DE: 84,
-    0x8DF: 84,
-    0x8E0: 84,
-    0x8E1: 84,
-    0x8E3: 84,
-    0x8E4: 84,
-    0x8E5: 84,
-    0x8E6: 84,
-    0x8E7: 84,
-    0x8E8: 84,
-    0x8E9: 84,
-    0x8EA: 84,
-    0x8EB: 84,
-    0x8EC: 84,
-    0x8ED: 84,
-    0x8EE: 84,
-    0x8EF: 84,
-    0x8F0: 84,
-    0x8F1: 84,
-    0x8F2: 84,
-    0x8F3: 84,
-    0x8F4: 84,
-    0x8F5: 84,
-    0x8F6: 84,
-    0x8F7: 84,
-    0x8F8: 84,
-    0x8F9: 84,
-    0x8FA: 84,
-    0x8FB: 84,
-    0x8FC: 84,
-    0x8FD: 84,
-    0x8FE: 84,
-    0x8FF: 84,
-    0x900: 84,
-    0x901: 84,
-    0x902: 84,
-    0x93A: 84,
-    0x93C: 84,
-    0x941: 84,
-    0x942: 84,
-    0x943: 84,
-    0x944: 84,
-    0x945: 84,
-    0x946: 84,
-    0x947: 84,
-    0x948: 84,
-    0x94D: 84,
-    0x951: 84,
-    0x952: 84,
-    0x953: 84,
-    0x954: 84,
-    0x955: 84,
-    0x956: 84,
-    0x957: 84,
-    0x962: 84,
-    0x963: 84,
-    0x981: 84,
-    0x9BC: 84,
-    0x9C1: 84,
-    0x9C2: 84,
-    0x9C3: 84,
-    0x9C4: 84,
-    0x9CD: 84,
-    0x9E2: 84,
-    0x9E3: 84,
-    0x9FE: 84,
-    0xA01: 84,
-    0xA02: 84,
-    0xA3C: 84,
-    0xA41: 84,
-    0xA42: 84,
-    0xA47: 84,
-    0xA48: 84,
-    0xA4B: 84,
-    0xA4C: 84,
-    0xA4D: 84,
-    0xA51: 84,
-    0xA70: 84,
-    0xA71: 84,
-    0xA75: 84,
-    0xA81: 84,
-    0xA82: 84,
-    0xABC: 84,
-    0xAC1: 84,
-    0xAC2: 84,
-    0xAC3: 84,
-    0xAC4: 84,
-    0xAC5: 84,
-    0xAC7: 84,
-    0xAC8: 84,
-    0xACD: 84,
-    0xAE2: 84,
-    0xAE3: 84,
-    0xAFA: 84,
-    0xAFB: 84,
-    0xAFC: 84,
-    0xAFD: 84,
-    0xAFE: 84,
-    0xAFF: 84,
-    0xB01: 84,
-    0xB3C: 84,
-    0xB3F: 84,
-    0xB41: 84,
-    0xB42: 84,
-    0xB43: 84,
-    0xB44: 84,
-    0xB4D: 84,
-    0xB55: 84,
-    0xB56: 84,
-    0xB62: 84,
-    0xB63: 84,
-    0xB82: 84,
-    0xBC0: 84,
-    0xBCD: 84,
-    0xC00: 84,
-    0xC04: 84,
-    0xC3C: 84,
-    0xC3E: 84,
-    0xC3F: 84,
-    0xC40: 84,
-    0xC46: 84,
-    0xC47: 84,
-    0xC48: 84,
-    0xC4A: 84,
-    0xC4B: 84,
-    0xC4C: 84,
-    0xC4D: 84,
-    0xC55: 84,
-    0xC56: 84,
-    0xC62: 84,
-    0xC63: 84,
-    0xC81: 84,
-    0xCBC: 84,
-    0xCBF: 84,
-    0xCC6: 84,
-    0xCCC: 84,
-    0xCCD: 84,
-    0xCE2: 84,
-    0xCE3: 84,
-    0xD00: 84,
-    0xD01: 84,
-    0xD3B: 84,
-    0xD3C: 84,
-    0xD41: 84,
-    0xD42: 84,
-    0xD43: 84,
-    0xD44: 84,
-    0xD4D: 84,
-    0xD62: 84,
-    0xD63: 84,
-    0xD81: 84,
-    0xDCA: 84,
-    0xDD2: 84,
-    0xDD3: 84,
-    0xDD4: 84,
-    0xDD6: 84,
-    0xE31: 84,
-    0xE34: 84,
-    0xE35: 84,
-    0xE36: 84,
-    0xE37: 84,
-    0xE38: 84,
-    0xE39: 84,
-    0xE3A: 84,
-    0xE47: 84,
-    0xE48: 84,
-    0xE49: 84,
-    0xE4A: 84,
-    0xE4B: 84,
-    0xE4C: 84,
-    0xE4D: 84,
-    0xE4E: 84,
-    0xEB1: 84,
-    0xEB4: 84,
-    0xEB5: 84,
-    0xEB6: 84,
-    0xEB7: 84,
-    0xEB8: 84,
-    0xEB9: 84,
-    0xEBA: 84,
-    0xEBB: 84,
-    0xEBC: 84,
-    0xEC8: 84,
-    0xEC9: 84,
-    0xECA: 84,
-    0xECB: 84,
-    0xECC: 84,
-    0xECD: 84,
-    0xECE: 84,
-    0xF18: 84,
-    0xF19: 84,
-    0xF35: 84,
-    0xF37: 84,
-    0xF39: 84,
-    0xF71: 84,
-    0xF72: 84,
-    0xF73: 84,
-    0xF74: 84,
-    0xF75: 84,
-    0xF76: 84,
-    0xF77: 84,
-    0xF78: 84,
-    0xF79: 84,
-    0xF7A: 84,
-    0xF7B: 84,
-    0xF7C: 84,
-    0xF7D: 84,
-    0xF7E: 84,
-    0xF80: 84,
-    0xF81: 84,
-    0xF82: 84,
-    0xF83: 84,
-    0xF84: 84,
-    0xF86: 84,
-    0xF87: 84,
-    0xF8D: 84,
-    0xF8E: 84,
-    0xF8F: 84,
-    0xF90: 84,
-    0xF91: 84,
-    0xF92: 84,
-    0xF93: 84,
-    0xF94: 84,
-    0xF95: 84,
-    0xF96: 84,
-    0xF97: 84,
-    0xF99: 84,
-    0xF9A: 84,
-    0xF9B: 84,
-    0xF9C: 84,
-    0xF9D: 84,
-    0xF9E: 84,
-    0xF9F: 84,
-    0xFA0: 84,
-    0xFA1: 84,
-    0xFA2: 84,
-    0xFA3: 84,
-    0xFA4: 84,
-    0xFA5: 84,
-    0xFA6: 84,
-    0xFA7: 84,
-    0xFA8: 84,
-    0xFA9: 84,
-    0xFAA: 84,
-    0xFAB: 84,
-    0xFAC: 84,
-    0xFAD: 84,
-    0xFAE: 84,
-    0xFAF: 84,
-    0xFB0: 84,
-    0xFB1: 84,
-    0xFB2: 84,
-    0xFB3: 84,
-    0xFB4: 84,
-    0xFB5: 84,
-    0xFB6: 84,
-    0xFB7: 84,
-    0xFB8: 84,
-    0xFB9: 84,
-    0xFBA: 84,
-    0xFBB: 84,
-    0xFBC: 84,
-    0xFC6: 84,
-    0x102D: 84,
-    0x102E: 84,
-    0x102F: 84,
-    0x1030: 84,
-    0x1032: 84,
-    0x1033: 84,
-    0x1034: 84,
-    0x1035: 84,
-    0x1036: 84,
-    0x1037: 84,
-    0x1039: 84,
-    0x103A: 84,
-    0x103D: 84,
-    0x103E: 84,
-    0x1058: 84,
-    0x1059: 84,
-    0x105E: 84,
-    0x105F: 84,
-    0x1060: 84,
-    0x1071: 84,
-    0x1072: 84,
-    0x1073: 84,
-    0x1074: 84,
-    0x1082: 84,
-    0x1085: 84,
-    0x1086: 84,
-    0x108D: 84,
-    0x109D: 84,
-    0x135D: 84,
-    0x135E: 84,
-    0x135F: 84,
-    0x1712: 84,
-    0x1713: 84,
-    0x1714: 84,
-    0x1732: 84,
-    0x1733: 84,
-    0x1752: 84,
-    0x1753: 84,
-    0x1772: 84,
-    0x1773: 84,
-    0x17B4: 84,
-    0x17B5: 84,
-    0x17B7: 84,
-    0x17B8: 84,
-    0x17B9: 84,
-    0x17BA: 84,
-    0x17BB: 84,
-    0x17BC: 84,
-    0x17BD: 84,
-    0x17C6: 84,
-    0x17C9: 84,
-    0x17CA: 84,
-    0x17CB: 84,
-    0x17CC: 84,
-    0x17CD: 84,
-    0x17CE: 84,
-    0x17CF: 84,
-    0x17D0: 84,
-    0x17D1: 84,
-    0x17D2: 84,
-    0x17D3: 84,
-    0x17DD: 84,
-    0x1807: 68,
-    0x180A: 67,
-    0x180B: 84,
-    0x180C: 84,
-    0x180D: 84,
-    0x180F: 84,
-    0x1820: 68,
-    0x1821: 68,
-    0x1822: 68,
-    0x1823: 68,
-    0x1824: 68,
-    0x1825: 68,
-    0x1826: 68,
-    0x1827: 68,
-    0x1828: 68,
-    0x1829: 68,
-    0x182A: 68,
-    0x182B: 68,
-    0x182C: 68,
-    0x182D: 68,
-    0x182E: 68,
-    0x182F: 68,
-    0x1830: 68,
-    0x1831: 68,
-    0x1832: 68,
-    0x1833: 68,
-    0x1834: 68,
-    0x1835: 68,
-    0x1836: 68,
-    0x1837: 68,
-    0x1838: 68,
-    0x1839: 68,
-    0x183A: 68,
-    0x183B: 68,
-    0x183C: 68,
-    0x183D: 68,
-    0x183E: 68,
-    0x183F: 68,
-    0x1840: 68,
-    0x1841: 68,
-    0x1842: 68,
-    0x1843: 68,
-    0x1844: 68,
-    0x1845: 68,
-    0x1846: 68,
-    0x1847: 68,
-    0x1848: 68,
-    0x1849: 68,
-    0x184A: 68,
-    0x184B: 68,
-    0x184C: 68,
-    0x184D: 68,
-    0x184E: 68,
-    0x184F: 68,
-    0x1850: 68,
-    0x1851: 68,
-    0x1852: 68,
-    0x1853: 68,
-    0x1854: 68,
-    0x1855: 68,
-    0x1856: 68,
-    0x1857: 68,
-    0x1858: 68,
-    0x1859: 68,
-    0x185A: 68,
-    0x185B: 68,
-    0x185C: 68,
-    0x185D: 68,
-    0x185E: 68,
-    0x185F: 68,
-    0x1860: 68,
-    0x1861: 68,
-    0x1862: 68,
-    0x1863: 68,
-    0x1864: 68,
-    0x1865: 68,
-    0x1866: 68,
-    0x1867: 68,
-    0x1868: 68,
-    0x1869: 68,
-    0x186A: 68,
-    0x186B: 68,
-    0x186C: 68,
-    0x186D: 68,
-    0x186E: 68,
-    0x186F: 68,
-    0x1870: 68,
-    0x1871: 68,
-    0x1872: 68,
-    0x1873: 68,
-    0x1874: 68,
-    0x1875: 68,
-    0x1876: 68,
-    0x1877: 68,
-    0x1878: 68,
-    0x1885: 84,
-    0x1886: 84,
-    0x1887: 68,
-    0x1888: 68,
-    0x1889: 68,
-    0x188A: 68,
-    0x188B: 68,
-    0x188C: 68,
-    0x188D: 68,
-    0x188E: 68,
-    0x188F: 68,
-    0x1890: 68,
-    0x1891: 68,
-    0x1892: 68,
-    0x1893: 68,
-    0x1894: 68,
-    0x1895: 68,
-    0x1896: 68,
-    0x1897: 68,
-    0x1898: 68,
-    0x1899: 68,
-    0x189A: 68,
-    0x189B: 68,
-    0x189C: 68,
-    0x189D: 68,
-    0x189E: 68,
-    0x189F: 68,
-    0x18A0: 68,
-    0x18A1: 68,
-    0x18A2: 68,
-    0x18A3: 68,
-    0x18A4: 68,
-    0x18A5: 68,
-    0x18A6: 68,
-    0x18A7: 68,
-    0x18A8: 68,
-    0x18A9: 84,
-    0x18AA: 68,
-    0x1920: 84,
-    0x1921: 84,
-    0x1922: 84,
-    0x1927: 84,
-    0x1928: 84,
-    0x1932: 84,
-    0x1939: 84,
-    0x193A: 84,
-    0x193B: 84,
-    0x1A17: 84,
-    0x1A18: 84,
-    0x1A1B: 84,
-    0x1A56: 84,
-    0x1A58: 84,
-    0x1A59: 84,
-    0x1A5A: 84,
-    0x1A5B: 84,
-    0x1A5C: 84,
-    0x1A5D: 84,
-    0x1A5E: 84,
-    0x1A60: 84,
-    0x1A62: 84,
-    0x1A65: 84,
-    0x1A66: 84,
-    0x1A67: 84,
-    0x1A68: 84,
-    0x1A69: 84,
-    0x1A6A: 84,
-    0x1A6B: 84,
-    0x1A6C: 84,
-    0x1A73: 84,
-    0x1A74: 84,
-    0x1A75: 84,
-    0x1A76: 84,
-    0x1A77: 84,
-    0x1A78: 84,
-    0x1A79: 84,
-    0x1A7A: 84,
-    0x1A7B: 84,
-    0x1A7C: 84,
-    0x1A7F: 84,
-    0x1AB0: 84,
-    0x1AB1: 84,
-    0x1AB2: 84,
-    0x1AB3: 84,
-    0x1AB4: 84,
-    0x1AB5: 84,
-    0x1AB6: 84,
-    0x1AB7: 84,
-    0x1AB8: 84,
-    0x1AB9: 84,
-    0x1ABA: 84,
-    0x1ABB: 84,
-    0x1ABC: 84,
-    0x1ABD: 84,
-    0x1ABE: 84,
-    0x1ABF: 84,
-    0x1AC0: 84,
-    0x1AC1: 84,
-    0x1AC2: 84,
-    0x1AC3: 84,
-    0x1AC4: 84,
-    0x1AC5: 84,
-    0x1AC6: 84,
-    0x1AC7: 84,
-    0x1AC8: 84,
-    0x1AC9: 84,
-    0x1ACA: 84,
-    0x1ACB: 84,
-    0x1ACC: 84,
-    0x1ACD: 84,
-    0x1ACE: 84,
-    0x1B00: 84,
-    0x1B01: 84,
-    0x1B02: 84,
-    0x1B03: 84,
-    0x1B34: 84,
-    0x1B36: 84,
-    0x1B37: 84,
-    0x1B38: 84,
-    0x1B39: 84,
-    0x1B3A: 84,
-    0x1B3C: 84,
-    0x1B42: 84,
-    0x1B6B: 84,
-    0x1B6C: 84,
-    0x1B6D: 84,
-    0x1B6E: 84,
-    0x1B6F: 84,
-    0x1B70: 84,
-    0x1B71: 84,
-    0x1B72: 84,
-    0x1B73: 84,
-    0x1B80: 84,
-    0x1B81: 84,
-    0x1BA2: 84,
-    0x1BA3: 84,
-    0x1BA4: 84,
-    0x1BA5: 84,
-    0x1BA8: 84,
-    0x1BA9: 84,
-    0x1BAB: 84,
-    0x1BAC: 84,
-    0x1BAD: 84,
-    0x1BE6: 84,
-    0x1BE8: 84,
-    0x1BE9: 84,
-    0x1BED: 84,
-    0x1BEF: 84,
-    0x1BF0: 84,
-    0x1BF1: 84,
-    0x1C2C: 84,
-    0x1C2D: 84,
-    0x1C2E: 84,
-    0x1C2F: 84,
-    0x1C30: 84,
-    0x1C31: 84,
-    0x1C32: 84,
-    0x1C33: 84,
-    0x1C36: 84,
-    0x1C37: 84,
-    0x1CD0: 84,
-    0x1CD1: 84,
-    0x1CD2: 84,
-    0x1CD4: 84,
-    0x1CD5: 84,
-    0x1CD6: 84,
-    0x1CD7: 84,
-    0x1CD8: 84,
-    0x1CD9: 84,
-    0x1CDA: 84,
-    0x1CDB: 84,
-    0x1CDC: 84,
-    0x1CDD: 84,
-    0x1CDE: 84,
-    0x1CDF: 84,
-    0x1CE0: 84,
-    0x1CE2: 84,
-    0x1CE3: 84,
-    0x1CE4: 84,
-    0x1CE5: 84,
-    0x1CE6: 84,
-    0x1CE7: 84,
-    0x1CE8: 84,
-    0x1CED: 84,
-    0x1CF4: 84,
-    0x1CF8: 84,
-    0x1CF9: 84,
-    0x1DC0: 84,
-    0x1DC1: 84,
-    0x1DC2: 84,
-    0x1DC3: 84,
-    0x1DC4: 84,
-    0x1DC5: 84,
-    0x1DC6: 84,
-    0x1DC7: 84,
-    0x1DC8: 84,
-    0x1DC9: 84,
-    0x1DCA: 84,
-    0x1DCB: 84,
-    0x1DCC: 84,
-    0x1DCD: 84,
-    0x1DCE: 84,
-    0x1DCF: 84,
-    0x1DD0: 84,
-    0x1DD1: 84,
-    0x1DD2: 84,
-    0x1DD3: 84,
-    0x1DD4: 84,
-    0x1DD5: 84,
-    0x1DD6: 84,
-    0x1DD7: 84,
-    0x1DD8: 84,
-    0x1DD9: 84,
-    0x1DDA: 84,
-    0x1DDB: 84,
-    0x1DDC: 84,
-    0x1DDD: 84,
-    0x1DDE: 84,
-    0x1DDF: 84,
-    0x1DE0: 84,
-    0x1DE1: 84,
-    0x1DE2: 84,
-    0x1DE3: 84,
-    0x1DE4: 84,
-    0x1DE5: 84,
-    0x1DE6: 84,
-    0x1DE7: 84,
-    0x1DE8: 84,
-    0x1DE9: 84,
-    0x1DEA: 84,
-    0x1DEB: 84,
-    0x1DEC: 84,
-    0x1DED: 84,
-    0x1DEE: 84,
-    0x1DEF: 84,
-    0x1DF0: 84,
-    0x1DF1: 84,
-    0x1DF2: 84,
-    0x1DF3: 84,
-    0x1DF4: 84,
-    0x1DF5: 84,
-    0x1DF6: 84,
-    0x1DF7: 84,
-    0x1DF8: 84,
-    0x1DF9: 84,
-    0x1DFA: 84,
-    0x1DFB: 84,
-    0x1DFC: 84,
-    0x1DFD: 84,
-    0x1DFE: 84,
-    0x1DFF: 84,
-    0x200B: 84,
-    0x200D: 67,
-    0x200E: 84,
-    0x200F: 84,
-    0x202A: 84,
-    0x202B: 84,
-    0x202C: 84,
-    0x202D: 84,
-    0x202E: 84,
-    0x2060: 84,
-    0x2061: 84,
-    0x2062: 84,
-    0x2063: 84,
-    0x2064: 84,
-    0x206A: 84,
-    0x206B: 84,
-    0x206C: 84,
-    0x206D: 84,
-    0x206E: 84,
-    0x206F: 84,
-    0x20D0: 84,
-    0x20D1: 84,
-    0x20D2: 84,
-    0x20D3: 84,
-    0x20D4: 84,
-    0x20D5: 84,
-    0x20D6: 84,
-    0x20D7: 84,
-    0x20D8: 84,
-    0x20D9: 84,
-    0x20DA: 84,
-    0x20DB: 84,
-    0x20DC: 84,
-    0x20DD: 84,
-    0x20DE: 84,
-    0x20DF: 84,
-    0x20E0: 84,
-    0x20E1: 84,
-    0x20E2: 84,
-    0x20E3: 84,
-    0x20E4: 84,
-    0x20E5: 84,
-    0x20E6: 84,
-    0x20E7: 84,
-    0x20E8: 84,
-    0x20E9: 84,
-    0x20EA: 84,
-    0x20EB: 84,
-    0x20EC: 84,
-    0x20ED: 84,
-    0x20EE: 84,
-    0x20EF: 84,
-    0x20F0: 84,
-    0x2CEF: 84,
-    0x2CF0: 84,
-    0x2CF1: 84,
-    0x2D7F: 84,
-    0x2DE0: 84,
-    0x2DE1: 84,
-    0x2DE2: 84,
-    0x2DE3: 84,
-    0x2DE4: 84,
-    0x2DE5: 84,
-    0x2DE6: 84,
-    0x2DE7: 84,
-    0x2DE8: 84,
-    0x2DE9: 84,
-    0x2DEA: 84,
-    0x2DEB: 84,
-    0x2DEC: 84,
-    0x2DED: 84,
-    0x2DEE: 84,
-    0x2DEF: 84,
-    0x2DF0: 84,
-    0x2DF1: 84,
-    0x2DF2: 84,
-    0x2DF3: 84,
-    0x2DF4: 84,
-    0x2DF5: 84,
-    0x2DF6: 84,
-    0x2DF7: 84,
-    0x2DF8: 84,
-    0x2DF9: 84,
-    0x2DFA: 84,
-    0x2DFB: 84,
-    0x2DFC: 84,
-    0x2DFD: 84,
-    0x2DFE: 84,
-    0x2DFF: 84,
-    0x302A: 84,
-    0x302B: 84,
-    0x302C: 84,
-    0x302D: 84,
-    0x3099: 84,
-    0x309A: 84,
-    0xA66F: 84,
-    0xA670: 84,
-    0xA671: 84,
-    0xA672: 84,
-    0xA674: 84,
-    0xA675: 84,
-    0xA676: 84,
-    0xA677: 84,
-    0xA678: 84,
-    0xA679: 84,
-    0xA67A: 84,
-    0xA67B: 84,
-    0xA67C: 84,
-    0xA67D: 84,
-    0xA69E: 84,
-    0xA69F: 84,
-    0xA6F0: 84,
-    0xA6F1: 84,
-    0xA802: 84,
-    0xA806: 84,
-    0xA80B: 84,
-    0xA825: 84,
-    0xA826: 84,
-    0xA82C: 84,
-    0xA840: 68,
-    0xA841: 68,
-    0xA842: 68,
-    0xA843: 68,
-    0xA844: 68,
-    0xA845: 68,
-    0xA846: 68,
-    0xA847: 68,
-    0xA848: 68,
-    0xA849: 68,
-    0xA84A: 68,
-    0xA84B: 68,
-    0xA84C: 68,
-    0xA84D: 68,
-    0xA84E: 68,
-    0xA84F: 68,
-    0xA850: 68,
-    0xA851: 68,
-    0xA852: 68,
-    0xA853: 68,
-    0xA854: 68,
-    0xA855: 68,
-    0xA856: 68,
-    0xA857: 68,
-    0xA858: 68,
-    0xA859: 68,
-    0xA85A: 68,
-    0xA85B: 68,
-    0xA85C: 68,
-    0xA85D: 68,
-    0xA85E: 68,
-    0xA85F: 68,
-    0xA860: 68,
-    0xA861: 68,
-    0xA862: 68,
-    0xA863: 68,
-    0xA864: 68,
-    0xA865: 68,
-    0xA866: 68,
-    0xA867: 68,
-    0xA868: 68,
-    0xA869: 68,
-    0xA86A: 68,
-    0xA86B: 68,
-    0xA86C: 68,
-    0xA86D: 68,
-    0xA86E: 68,
-    0xA86F: 68,
-    0xA870: 68,
-    0xA871: 68,
-    0xA872: 76,
-    0xA8C4: 84,
-    0xA8C5: 84,
-    0xA8E0: 84,
-    0xA8E1: 84,
-    0xA8E2: 84,
-    0xA8E3: 84,
-    0xA8E4: 84,
-    0xA8E5: 84,
-    0xA8E6: 84,
-    0xA8E7: 84,
-    0xA8E8: 84,
-    0xA8E9: 84,
-    0xA8EA: 84,
-    0xA8EB: 84,
-    0xA8EC: 84,
-    0xA8ED: 84,
-    0xA8EE: 84,
-    0xA8EF: 84,
-    0xA8F0: 84,
-    0xA8F1: 84,
-    0xA8FF: 84,
-    0xA926: 84,
-    0xA927: 84,
-    0xA928: 84,
-    0xA929: 84,
-    0xA92A: 84,
-    0xA92B: 84,
-    0xA92C: 84,
-    0xA92D: 84,
-    0xA947: 84,
-    0xA948: 84,
-    0xA949: 84,
-    0xA94A: 84,
-    0xA94B: 84,
-    0xA94C: 84,
-    0xA94D: 84,
-    0xA94E: 84,
-    0xA94F: 84,
-    0xA950: 84,
-    0xA951: 84,
-    0xA980: 84,
-    0xA981: 84,
-    0xA982: 84,
-    0xA9B3: 84,
-    0xA9B6: 84,
-    0xA9B7: 84,
-    0xA9B8: 84,
-    0xA9B9: 84,
-    0xA9BC: 84,
-    0xA9BD: 84,
-    0xA9E5: 84,
-    0xAA29: 84,
-    0xAA2A: 84,
-    0xAA2B: 84,
-    0xAA2C: 84,
-    0xAA2D: 84,
-    0xAA2E: 84,
-    0xAA31: 84,
-    0xAA32: 84,
-    0xAA35: 84,
-    0xAA36: 84,
-    0xAA43: 84,
-    0xAA4C: 84,
-    0xAA7C: 84,
-    0xAAB0: 84,
-    0xAAB2: 84,
-    0xAAB3: 84,
-    0xAAB4: 84,
-    0xAAB7: 84,
-    0xAAB8: 84,
-    0xAABE: 84,
-    0xAABF: 84,
-    0xAAC1: 84,
-    0xAAEC: 84,
-    0xAAED: 84,
-    0xAAF6: 84,
-    0xABE5: 84,
-    0xABE8: 84,
-    0xABED: 84,
-    0xFB1E: 84,
-    0xFE00: 84,
-    0xFE01: 84,
-    0xFE02: 84,
-    0xFE03: 84,
-    0xFE04: 84,
-    0xFE05: 84,
-    0xFE06: 84,
-    0xFE07: 84,
-    0xFE08: 84,
-    0xFE09: 84,
-    0xFE0A: 84,
-    0xFE0B: 84,
-    0xFE0C: 84,
-    0xFE0D: 84,
-    0xFE0E: 84,
-    0xFE0F: 84,
-    0xFE20: 84,
-    0xFE21: 84,
-    0xFE22: 84,
-    0xFE23: 84,
-    0xFE24: 84,
-    0xFE25: 84,
-    0xFE26: 84,
-    0xFE27: 84,
-    0xFE28: 84,
-    0xFE29: 84,
-    0xFE2A: 84,
-    0xFE2B: 84,
-    0xFE2C: 84,
-    0xFE2D: 84,
-    0xFE2E: 84,
-    0xFE2F: 84,
-    0xFEFF: 84,
-    0xFFF9: 84,
-    0xFFFA: 84,
-    0xFFFB: 84,
-    0x101FD: 84,
-    0x102E0: 84,
-    0x10376: 84,
-    0x10377: 84,
-    0x10378: 84,
-    0x10379: 84,
-    0x1037A: 84,
-    0x10A01: 84,
-    0x10A02: 84,
-    0x10A03: 84,
-    0x10A05: 84,
-    0x10A06: 84,
-    0x10A0C: 84,
-    0x10A0D: 84,
-    0x10A0E: 84,
-    0x10A0F: 84,
-    0x10A38: 84,
-    0x10A39: 84,
-    0x10A3A: 84,
-    0x10A3F: 84,
-    0x10AC0: 68,
-    0x10AC1: 68,
-    0x10AC2: 68,
-    0x10AC3: 68,
-    0x10AC4: 68,
-    0x10AC5: 82,
-    0x10AC7: 82,
-    0x10AC9: 82,
-    0x10ACA: 82,
-    0x10ACD: 76,
-    0x10ACE: 82,
-    0x10ACF: 82,
-    0x10AD0: 82,
-    0x10AD1: 82,
-    0x10AD2: 82,
-    0x10AD3: 68,
-    0x10AD4: 68,
-    0x10AD5: 68,
-    0x10AD6: 68,
-    0x10AD7: 76,
-    0x10AD8: 68,
-    0x10AD9: 68,
-    0x10ADA: 68,
-    0x10ADB: 68,
-    0x10ADC: 68,
-    0x10ADD: 82,
-    0x10ADE: 68,
-    0x10ADF: 68,
-    0x10AE0: 68,
-    0x10AE1: 82,
-    0x10AE4: 82,
-    0x10AE5: 84,
-    0x10AE6: 84,
-    0x10AEB: 68,
-    0x10AEC: 68,
-    0x10AED: 68,
-    0x10AEE: 68,
-    0x10AEF: 82,
-    0x10B80: 68,
-    0x10B81: 82,
-    0x10B82: 68,
-    0x10B83: 82,
-    0x10B84: 82,
-    0x10B85: 82,
-    0x10B86: 68,
-    0x10B87: 68,
-    0x10B88: 68,
-    0x10B89: 82,
-    0x10B8A: 68,
-    0x10B8B: 68,
-    0x10B8C: 82,
-    0x10B8D: 68,
-    0x10B8E: 82,
-    0x10B8F: 82,
-    0x10B90: 68,
-    0x10B91: 82,
-    0x10BA9: 82,
-    0x10BAA: 82,
-    0x10BAB: 82,
-    0x10BAC: 82,
-    0x10BAD: 68,
-    0x10BAE: 68,
-    0x10D00: 76,
-    0x10D01: 68,
-    0x10D02: 68,
-    0x10D03: 68,
-    0x10D04: 68,
-    0x10D05: 68,
-    0x10D06: 68,
-    0x10D07: 68,
-    0x10D08: 68,
-    0x10D09: 68,
-    0x10D0A: 68,
-    0x10D0B: 68,
-    0x10D0C: 68,
-    0x10D0D: 68,
-    0x10D0E: 68,
-    0x10D0F: 68,
-    0x10D10: 68,
-    0x10D11: 68,
-    0x10D12: 68,
-    0x10D13: 68,
-    0x10D14: 68,
-    0x10D15: 68,
-    0x10D16: 68,
-    0x10D17: 68,
-    0x10D18: 68,
-    0x10D19: 68,
-    0x10D1A: 68,
-    0x10D1B: 68,
-    0x10D1C: 68,
-    0x10D1D: 68,
-    0x10D1E: 68,
-    0x10D1F: 68,
-    0x10D20: 68,
-    0x10D21: 68,
-    0x10D22: 82,
-    0x10D23: 68,
-    0x10D24: 84,
-    0x10D25: 84,
-    0x10D26: 84,
-    0x10D27: 84,
-    0x10EAB: 84,
-    0x10EAC: 84,
-    0x10EFD: 84,
-    0x10EFE: 84,
-    0x10EFF: 84,
-    0x10F30: 68,
-    0x10F31: 68,
-    0x10F32: 68,
-    0x10F33: 82,
-    0x10F34: 68,
-    0x10F35: 68,
-    0x10F36: 68,
-    0x10F37: 68,
-    0x10F38: 68,
-    0x10F39: 68,
-    0x10F3A: 68,
-    0x10F3B: 68,
-    0x10F3C: 68,
-    0x10F3D: 68,
-    0x10F3E: 68,
-    0x10F3F: 68,
-    0x10F40: 68,
-    0x10F41: 68,
-    0x10F42: 68,
-    0x10F43: 68,
-    0x10F44: 68,
-    0x10F46: 84,
-    0x10F47: 84,
-    0x10F48: 84,
-    0x10F49: 84,
-    0x10F4A: 84,
-    0x10F4B: 84,
-    0x10F4C: 84,
-    0x10F4D: 84,
-    0x10F4E: 84,
-    0x10F4F: 84,
-    0x10F50: 84,
-    0x10F51: 68,
-    0x10F52: 68,
-    0x10F53: 68,
-    0x10F54: 82,
-    0x10F70: 68,
-    0x10F71: 68,
-    0x10F72: 68,
-    0x10F73: 68,
-    0x10F74: 82,
-    0x10F75: 82,
-    0x10F76: 68,
-    0x10F77: 68,
-    0x10F78: 68,
-    0x10F79: 68,
-    0x10F7A: 68,
-    0x10F7B: 68,
-    0x10F7C: 68,
-    0x10F7D: 68,
-    0x10F7E: 68,
-    0x10F7F: 68,
-    0x10F80: 68,
-    0x10F81: 68,
-    0x10F82: 84,
-    0x10F83: 84,
-    0x10F84: 84,
-    0x10F85: 84,
-    0x10FB0: 68,
-    0x10FB2: 68,
-    0x10FB3: 68,
-    0x10FB4: 82,
-    0x10FB5: 82,
-    0x10FB6: 82,
-    0x10FB8: 68,
-    0x10FB9: 82,
-    0x10FBA: 82,
-    0x10FBB: 68,
-    0x10FBC: 68,
-    0x10FBD: 82,
-    0x10FBE: 68,
-    0x10FBF: 68,
-    0x10FC1: 68,
-    0x10FC2: 82,
-    0x10FC3: 82,
-    0x10FC4: 68,
-    0x10FC9: 82,
-    0x10FCA: 68,
-    0x10FCB: 76,
-    0x11001: 84,
-    0x11038: 84,
-    0x11039: 84,
-    0x1103A: 84,
-    0x1103B: 84,
-    0x1103C: 84,
-    0x1103D: 84,
-    0x1103E: 84,
-    0x1103F: 84,
-    0x11040: 84,
-    0x11041: 84,
-    0x11042: 84,
-    0x11043: 84,
-    0x11044: 84,
-    0x11045: 84,
-    0x11046: 84,
-    0x11070: 84,
-    0x11073: 84,
-    0x11074: 84,
-    0x1107F: 84,
-    0x11080: 84,
-    0x11081: 84,
-    0x110B3: 84,
-    0x110B4: 84,
-    0x110B5: 84,
-    0x110B6: 84,
-    0x110B9: 84,
-    0x110BA: 84,
-    0x110C2: 84,
-    0x11100: 84,
-    0x11101: 84,
-    0x11102: 84,
-    0x11127: 84,
-    0x11128: 84,
-    0x11129: 84,
-    0x1112A: 84,
-    0x1112B: 84,
-    0x1112D: 84,
-    0x1112E: 84,
-    0x1112F: 84,
-    0x11130: 84,
-    0x11131: 84,
-    0x11132: 84,
-    0x11133: 84,
-    0x11134: 84,
-    0x11173: 84,
-    0x11180: 84,
-    0x11181: 84,
-    0x111B6: 84,
-    0x111B7: 84,
-    0x111B8: 84,
-    0x111B9: 84,
-    0x111BA: 84,
-    0x111BB: 84,
-    0x111BC: 84,
-    0x111BD: 84,
-    0x111BE: 84,
-    0x111C9: 84,
-    0x111CA: 84,
-    0x111CB: 84,
-    0x111CC: 84,
-    0x111CF: 84,
-    0x1122F: 84,
-    0x11230: 84,
-    0x11231: 84,
-    0x11234: 84,
-    0x11236: 84,
-    0x11237: 84,
-    0x1123E: 84,
-    0x11241: 84,
-    0x112DF: 84,
-    0x112E3: 84,
-    0x112E4: 84,
-    0x112E5: 84,
-    0x112E6: 84,
-    0x112E7: 84,
-    0x112E8: 84,
-    0x112E9: 84,
-    0x112EA: 84,
-    0x11300: 84,
-    0x11301: 84,
-    0x1133B: 84,
-    0x1133C: 84,
-    0x11340: 84,
-    0x11366: 84,
-    0x11367: 84,
-    0x11368: 84,
-    0x11369: 84,
-    0x1136A: 84,
-    0x1136B: 84,
-    0x1136C: 84,
-    0x11370: 84,
-    0x11371: 84,
-    0x11372: 84,
-    0x11373: 84,
-    0x11374: 84,
-    0x11438: 84,
-    0x11439: 84,
-    0x1143A: 84,
-    0x1143B: 84,
-    0x1143C: 84,
-    0x1143D: 84,
-    0x1143E: 84,
-    0x1143F: 84,
-    0x11442: 84,
-    0x11443: 84,
-    0x11444: 84,
-    0x11446: 84,
-    0x1145E: 84,
-    0x114B3: 84,
-    0x114B4: 84,
-    0x114B5: 84,
-    0x114B6: 84,
-    0x114B7: 84,
-    0x114B8: 84,
-    0x114BA: 84,
-    0x114BF: 84,
-    0x114C0: 84,
-    0x114C2: 84,
-    0x114C3: 84,
-    0x115B2: 84,
-    0x115B3: 84,
-    0x115B4: 84,
-    0x115B5: 84,
-    0x115BC: 84,
-    0x115BD: 84,
-    0x115BF: 84,
-    0x115C0: 84,
-    0x115DC: 84,
-    0x115DD: 84,
-    0x11633: 84,
-    0x11634: 84,
-    0x11635: 84,
-    0x11636: 84,
-    0x11637: 84,
-    0x11638: 84,
-    0x11639: 84,
-    0x1163A: 84,
-    0x1163D: 84,
-    0x1163F: 84,
-    0x11640: 84,
-    0x116AB: 84,
-    0x116AD: 84,
-    0x116B0: 84,
-    0x116B1: 84,
-    0x116B2: 84,
-    0x116B3: 84,
-    0x116B4: 84,
-    0x116B5: 84,
-    0x116B7: 84,
-    0x1171D: 84,
-    0x1171E: 84,
-    0x1171F: 84,
-    0x11722: 84,
-    0x11723: 84,
-    0x11724: 84,
-    0x11725: 84,
-    0x11727: 84,
-    0x11728: 84,
-    0x11729: 84,
-    0x1172A: 84,
-    0x1172B: 84,
-    0x1182F: 84,
-    0x11830: 84,
-    0x11831: 84,
-    0x11832: 84,
-    0x11833: 84,
-    0x11834: 84,
-    0x11835: 84,
-    0x11836: 84,
-    0x11837: 84,
-    0x11839: 84,
-    0x1183A: 84,
-    0x1193B: 84,
-    0x1193C: 84,
-    0x1193E: 84,
-    0x11943: 84,
-    0x119D4: 84,
-    0x119D5: 84,
-    0x119D6: 84,
-    0x119D7: 84,
-    0x119DA: 84,
-    0x119DB: 84,
-    0x119E0: 84,
-    0x11A01: 84,
-    0x11A02: 84,
-    0x11A03: 84,
-    0x11A04: 84,
-    0x11A05: 84,
-    0x11A06: 84,
-    0x11A07: 84,
-    0x11A08: 84,
-    0x11A09: 84,
-    0x11A0A: 84,
-    0x11A33: 84,
-    0x11A34: 84,
-    0x11A35: 84,
-    0x11A36: 84,
-    0x11A37: 84,
-    0x11A38: 84,
-    0x11A3B: 84,
-    0x11A3C: 84,
-    0x11A3D: 84,
-    0x11A3E: 84,
-    0x11A47: 84,
-    0x11A51: 84,
-    0x11A52: 84,
-    0x11A53: 84,
-    0x11A54: 84,
-    0x11A55: 84,
-    0x11A56: 84,
-    0x11A59: 84,
-    0x11A5A: 84,
-    0x11A5B: 84,
-    0x11A8A: 84,
-    0x11A8B: 84,
-    0x11A8C: 84,
-    0x11A8D: 84,
-    0x11A8E: 84,
-    0x11A8F: 84,
-    0x11A90: 84,
-    0x11A91: 84,
-    0x11A92: 84,
-    0x11A93: 84,
-    0x11A94: 84,
-    0x11A95: 84,
-    0x11A96: 84,
-    0x11A98: 84,
-    0x11A99: 84,
-    0x11C30: 84,
-    0x11C31: 84,
-    0x11C32: 84,
-    0x11C33: 84,
-    0x11C34: 84,
-    0x11C35: 84,
-    0x11C36: 84,
-    0x11C38: 84,
-    0x11C39: 84,
-    0x11C3A: 84,
-    0x11C3B: 84,
-    0x11C3C: 84,
-    0x11C3D: 84,
-    0x11C3F: 84,
-    0x11C92: 84,
-    0x11C93: 84,
-    0x11C94: 84,
-    0x11C95: 84,
-    0x11C96: 84,
-    0x11C97: 84,
-    0x11C98: 84,
-    0x11C99: 84,
-    0x11C9A: 84,
-    0x11C9B: 84,
-    0x11C9C: 84,
-    0x11C9D: 84,
-    0x11C9E: 84,
-    0x11C9F: 84,
-    0x11CA0: 84,
-    0x11CA1: 84,
-    0x11CA2: 84,
-    0x11CA3: 84,
-    0x11CA4: 84,
-    0x11CA5: 84,
-    0x11CA6: 84,
-    0x11CA7: 84,
-    0x11CAA: 84,
-    0x11CAB: 84,
-    0x11CAC: 84,
-    0x11CAD: 84,
-    0x11CAE: 84,
-    0x11CAF: 84,
-    0x11CB0: 84,
-    0x11CB2: 84,
-    0x11CB3: 84,
-    0x11CB5: 84,
-    0x11CB6: 84,
-    0x11D31: 84,
-    0x11D32: 84,
-    0x11D33: 84,
-    0x11D34: 84,
-    0x11D35: 84,
-    0x11D36: 84,
-    0x11D3A: 84,
-    0x11D3C: 84,
-    0x11D3D: 84,
-    0x11D3F: 84,
-    0x11D40: 84,
-    0x11D41: 84,
-    0x11D42: 84,
-    0x11D43: 84,
-    0x11D44: 84,
-    0x11D45: 84,
-    0x11D47: 84,
-    0x11D90: 84,
-    0x11D91: 84,
-    0x11D95: 84,
-    0x11D97: 84,
-    0x11EF3: 84,
-    0x11EF4: 84,
-    0x11F00: 84,
-    0x11F01: 84,
-    0x11F36: 84,
-    0x11F37: 84,
-    0x11F38: 84,
-    0x11F39: 84,
-    0x11F3A: 84,
-    0x11F40: 84,
-    0x11F42: 84,
-    0x13430: 84,
-    0x13431: 84,
-    0x13432: 84,
-    0x13433: 84,
-    0x13434: 84,
-    0x13435: 84,
-    0x13436: 84,
-    0x13437: 84,
-    0x13438: 84,
-    0x13439: 84,
-    0x1343A: 84,
-    0x1343B: 84,
-    0x1343C: 84,
-    0x1343D: 84,
-    0x1343E: 84,
-    0x1343F: 84,
-    0x13440: 84,
-    0x13447: 84,
-    0x13448: 84,
-    0x13449: 84,
-    0x1344A: 84,
-    0x1344B: 84,
-    0x1344C: 84,
-    0x1344D: 84,
-    0x1344E: 84,
-    0x1344F: 84,
-    0x13450: 84,
-    0x13451: 84,
-    0x13452: 84,
-    0x13453: 84,
-    0x13454: 84,
-    0x13455: 84,
-    0x16AF0: 84,
-    0x16AF1: 84,
-    0x16AF2: 84,
-    0x16AF3: 84,
-    0x16AF4: 84,
-    0x16B30: 84,
-    0x16B31: 84,
-    0x16B32: 84,
-    0x16B33: 84,
-    0x16B34: 84,
-    0x16B35: 84,
-    0x16B36: 84,
-    0x16F4F: 84,
-    0x16F8F: 84,
-    0x16F90: 84,
-    0x16F91: 84,
-    0x16F92: 84,
-    0x16FE4: 84,
-    0x1BC9D: 84,
-    0x1BC9E: 84,
-    0x1BCA0: 84,
-    0x1BCA1: 84,
-    0x1BCA2: 84,
-    0x1BCA3: 84,
-    0x1CF00: 84,
-    0x1CF01: 84,
-    0x1CF02: 84,
-    0x1CF03: 84,
-    0x1CF04: 84,
-    0x1CF05: 84,
-    0x1CF06: 84,
-    0x1CF07: 84,
-    0x1CF08: 84,
-    0x1CF09: 84,
-    0x1CF0A: 84,
-    0x1CF0B: 84,
-    0x1CF0C: 84,
-    0x1CF0D: 84,
-    0x1CF0E: 84,
-    0x1CF0F: 84,
-    0x1CF10: 84,
-    0x1CF11: 84,
-    0x1CF12: 84,
-    0x1CF13: 84,
-    0x1CF14: 84,
-    0x1CF15: 84,
-    0x1CF16: 84,
-    0x1CF17: 84,
-    0x1CF18: 84,
-    0x1CF19: 84,
-    0x1CF1A: 84,
-    0x1CF1B: 84,
-    0x1CF1C: 84,
-    0x1CF1D: 84,
-    0x1CF1E: 84,
-    0x1CF1F: 84,
-    0x1CF20: 84,
-    0x1CF21: 84,
-    0x1CF22: 84,
-    0x1CF23: 84,
-    0x1CF24: 84,
-    0x1CF25: 84,
-    0x1CF26: 84,
-    0x1CF27: 84,
-    0x1CF28: 84,
-    0x1CF29: 84,
-    0x1CF2A: 84,
-    0x1CF2B: 84,
-    0x1CF2C: 84,
-    0x1CF2D: 84,
-    0x1CF30: 84,
-    0x1CF31: 84,
-    0x1CF32: 84,
-    0x1CF33: 84,
-    0x1CF34: 84,
-    0x1CF35: 84,
-    0x1CF36: 84,
-    0x1CF37: 84,
-    0x1CF38: 84,
-    0x1CF39: 84,
-    0x1CF3A: 84,
-    0x1CF3B: 84,
-    0x1CF3C: 84,
-    0x1CF3D: 84,
-    0x1CF3E: 84,
-    0x1CF3F: 84,
-    0x1CF40: 84,
-    0x1CF41: 84,
-    0x1CF42: 84,
-    0x1CF43: 84,
-    0x1CF44: 84,
-    0x1CF45: 84,
-    0x1CF46: 84,
-    0x1D167: 84,
-    0x1D168: 84,
-    0x1D169: 84,
-    0x1D173: 84,
-    0x1D174: 84,
-    0x1D175: 84,
-    0x1D176: 84,
-    0x1D177: 84,
-    0x1D178: 84,
-    0x1D179: 84,
-    0x1D17A: 84,
-    0x1D17B: 84,
-    0x1D17C: 84,
-    0x1D17D: 84,
-    0x1D17E: 84,
-    0x1D17F: 84,
-    0x1D180: 84,
-    0x1D181: 84,
-    0x1D182: 84,
-    0x1D185: 84,
-    0x1D186: 84,
-    0x1D187: 84,
-    0x1D188: 84,
-    0x1D189: 84,
-    0x1D18A: 84,
-    0x1D18B: 84,
-    0x1D1AA: 84,
-    0x1D1AB: 84,
-    0x1D1AC: 84,
-    0x1D1AD: 84,
-    0x1D242: 84,
-    0x1D243: 84,
-    0x1D244: 84,
-    0x1DA00: 84,
-    0x1DA01: 84,
-    0x1DA02: 84,
-    0x1DA03: 84,
-    0x1DA04: 84,
-    0x1DA05: 84,
-    0x1DA06: 84,
-    0x1DA07: 84,
-    0x1DA08: 84,
-    0x1DA09: 84,
-    0x1DA0A: 84,
-    0x1DA0B: 84,
-    0x1DA0C: 84,
-    0x1DA0D: 84,
-    0x1DA0E: 84,
-    0x1DA0F: 84,
-    0x1DA10: 84,
-    0x1DA11: 84,
-    0x1DA12: 84,
-    0x1DA13: 84,
-    0x1DA14: 84,
-    0x1DA15: 84,
-    0x1DA16: 84,
-    0x1DA17: 84,
-    0x1DA18: 84,
-    0x1DA19: 84,
-    0x1DA1A: 84,
-    0x1DA1B: 84,
-    0x1DA1C: 84,
-    0x1DA1D: 84,
-    0x1DA1E: 84,
-    0x1DA1F: 84,
-    0x1DA20: 84,
-    0x1DA21: 84,
-    0x1DA22: 84,
-    0x1DA23: 84,
-    0x1DA24: 84,
-    0x1DA25: 84,
-    0x1DA26: 84,
-    0x1DA27: 84,
-    0x1DA28: 84,
-    0x1DA29: 84,
-    0x1DA2A: 84,
-    0x1DA2B: 84,
-    0x1DA2C: 84,
-    0x1DA2D: 84,
-    0x1DA2E: 84,
-    0x1DA2F: 84,
-    0x1DA30: 84,
-    0x1DA31: 84,
-    0x1DA32: 84,
-    0x1DA33: 84,
-    0x1DA34: 84,
-    0x1DA35: 84,
-    0x1DA36: 84,
-    0x1DA3B: 84,
-    0x1DA3C: 84,
-    0x1DA3D: 84,
-    0x1DA3E: 84,
-    0x1DA3F: 84,
-    0x1DA40: 84,
-    0x1DA41: 84,
-    0x1DA42: 84,
-    0x1DA43: 84,
-    0x1DA44: 84,
-    0x1DA45: 84,
-    0x1DA46: 84,
-    0x1DA47: 84,
-    0x1DA48: 84,
-    0x1DA49: 84,
-    0x1DA4A: 84,
-    0x1DA4B: 84,
-    0x1DA4C: 84,
-    0x1DA4D: 84,
-    0x1DA4E: 84,
-    0x1DA4F: 84,
-    0x1DA50: 84,
-    0x1DA51: 84,
-    0x1DA52: 84,
-    0x1DA53: 84,
-    0x1DA54: 84,
-    0x1DA55: 84,
-    0x1DA56: 84,
-    0x1DA57: 84,
-    0x1DA58: 84,
-    0x1DA59: 84,
-    0x1DA5A: 84,
-    0x1DA5B: 84,
-    0x1DA5C: 84,
-    0x1DA5D: 84,
-    0x1DA5E: 84,
-    0x1DA5F: 84,
-    0x1DA60: 84,
-    0x1DA61: 84,
-    0x1DA62: 84,
-    0x1DA63: 84,
-    0x1DA64: 84,
-    0x1DA65: 84,
-    0x1DA66: 84,
-    0x1DA67: 84,
-    0x1DA68: 84,
-    0x1DA69: 84,
-    0x1DA6A: 84,
-    0x1DA6B: 84,
-    0x1DA6C: 84,
-    0x1DA75: 84,
-    0x1DA84: 84,
-    0x1DA9B: 84,
-    0x1DA9C: 84,
-    0x1DA9D: 84,
-    0x1DA9E: 84,
-    0x1DA9F: 84,
-    0x1DAA1: 84,
-    0x1DAA2: 84,
-    0x1DAA3: 84,
-    0x1DAA4: 84,
-    0x1DAA5: 84,
-    0x1DAA6: 84,
-    0x1DAA7: 84,
-    0x1DAA8: 84,
-    0x1DAA9: 84,
-    0x1DAAA: 84,
-    0x1DAAB: 84,
-    0x1DAAC: 84,
-    0x1DAAD: 84,
-    0x1DAAE: 84,
-    0x1DAAF: 84,
-    0x1E000: 84,
-    0x1E001: 84,
-    0x1E002: 84,
-    0x1E003: 84,
-    0x1E004: 84,
-    0x1E005: 84,
-    0x1E006: 84,
-    0x1E008: 84,
-    0x1E009: 84,
-    0x1E00A: 84,
-    0x1E00B: 84,
-    0x1E00C: 84,
-    0x1E00D: 84,
-    0x1E00E: 84,
-    0x1E00F: 84,
-    0x1E010: 84,
-    0x1E011: 84,
-    0x1E012: 84,
-    0x1E013: 84,
-    0x1E014: 84,
-    0x1E015: 84,
-    0x1E016: 84,
-    0x1E017: 84,
-    0x1E018: 84,
-    0x1E01B: 84,
-    0x1E01C: 84,
-    0x1E01D: 84,
-    0x1E01E: 84,
-    0x1E01F: 84,
-    0x1E020: 84,
-    0x1E021: 84,
-    0x1E023: 84,
-    0x1E024: 84,
-    0x1E026: 84,
-    0x1E027: 84,
-    0x1E028: 84,
-    0x1E029: 84,
-    0x1E02A: 84,
-    0x1E08F: 84,
-    0x1E130: 84,
-    0x1E131: 84,
-    0x1E132: 84,
-    0x1E133: 84,
-    0x1E134: 84,
-    0x1E135: 84,
-    0x1E136: 84,
-    0x1E2AE: 84,
-    0x1E2EC: 84,
-    0x1E2ED: 84,
-    0x1E2EE: 84,
-    0x1E2EF: 84,
-    0x1E4EC: 84,
-    0x1E4ED: 84,
-    0x1E4EE: 84,
-    0x1E4EF: 84,
-    0x1E8D0: 84,
-    0x1E8D1: 84,
-    0x1E8D2: 84,
-    0x1E8D3: 84,
-    0x1E8D4: 84,
-    0x1E8D5: 84,
-    0x1E8D6: 84,
-    0x1E900: 68,
-    0x1E901: 68,
-    0x1E902: 68,
-    0x1E903: 68,
-    0x1E904: 68,
-    0x1E905: 68,
-    0x1E906: 68,
-    0x1E907: 68,
-    0x1E908: 68,
-    0x1E909: 68,
-    0x1E90A: 68,
-    0x1E90B: 68,
-    0x1E90C: 68,
-    0x1E90D: 68,
-    0x1E90E: 68,
-    0x1E90F: 68,
-    0x1E910: 68,
-    0x1E911: 68,
-    0x1E912: 68,
-    0x1E913: 68,
-    0x1E914: 68,
-    0x1E915: 68,
-    0x1E916: 68,
-    0x1E917: 68,
-    0x1E918: 68,
-    0x1E919: 68,
-    0x1E91A: 68,
-    0x1E91B: 68,
-    0x1E91C: 68,
-    0x1E91D: 68,
-    0x1E91E: 68,
-    0x1E91F: 68,
-    0x1E920: 68,
-    0x1E921: 68,
-    0x1E922: 68,
-    0x1E923: 68,
-    0x1E924: 68,
-    0x1E925: 68,
-    0x1E926: 68,
-    0x1E927: 68,
-    0x1E928: 68,
-    0x1E929: 68,
-    0x1E92A: 68,
-    0x1E92B: 68,
-    0x1E92C: 68,
-    0x1E92D: 68,
-    0x1E92E: 68,
-    0x1E92F: 68,
-    0x1E930: 68,
-    0x1E931: 68,
-    0x1E932: 68,
-    0x1E933: 68,
-    0x1E934: 68,
-    0x1E935: 68,
-    0x1E936: 68,
-    0x1E937: 68,
-    0x1E938: 68,
-    0x1E939: 68,
-    0x1E93A: 68,
-    0x1E93B: 68,
-    0x1E93C: 68,
-    0x1E93D: 68,
-    0x1E93E: 68,
-    0x1E93F: 68,
-    0x1E940: 68,
-    0x1E941: 68,
-    0x1E942: 68,
-    0x1E943: 68,
-    0x1E944: 84,
-    0x1E945: 84,
-    0x1E946: 84,
-    0x1E947: 84,
-    0x1E948: 84,
-    0x1E949: 84,
-    0x1E94A: 84,
-    0x1E94B: 84,
-    0xE0001: 84,
-    0xE0020: 84,
-    0xE0021: 84,
-    0xE0022: 84,
-    0xE0023: 84,
-    0xE0024: 84,
-    0xE0025: 84,
-    0xE0026: 84,
-    0xE0027: 84,
-    0xE0028: 84,
-    0xE0029: 84,
-    0xE002A: 84,
-    0xE002B: 84,
-    0xE002C: 84,
-    0xE002D: 84,
-    0xE002E: 84,
-    0xE002F: 84,
-    0xE0030: 84,
-    0xE0031: 84,
-    0xE0032: 84,
-    0xE0033: 84,
-    0xE0034: 84,
-    0xE0035: 84,
-    0xE0036: 84,
-    0xE0037: 84,
-    0xE0038: 84,
-    0xE0039: 84,
-    0xE003A: 84,
-    0xE003B: 84,
-    0xE003C: 84,
-    0xE003D: 84,
-    0xE003E: 84,
-    0xE003F: 84,
-    0xE0040: 84,
-    0xE0041: 84,
-    0xE0042: 84,
-    0xE0043: 84,
-    0xE0044: 84,
-    0xE0045: 84,
-    0xE0046: 84,
-    0xE0047: 84,
-    0xE0048: 84,
-    0xE0049: 84,
-    0xE004A: 84,
-    0xE004B: 84,
-    0xE004C: 84,
-    0xE004D: 84,
-    0xE004E: 84,
-    0xE004F: 84,
-    0xE0050: 84,
-    0xE0051: 84,
-    0xE0052: 84,
-    0xE0053: 84,
-    0xE0054: 84,
-    0xE0055: 84,
-    0xE0056: 84,
-    0xE0057: 84,
-    0xE0058: 84,
-    0xE0059: 84,
-    0xE005A: 84,
-    0xE005B: 84,
-    0xE005C: 84,
-    0xE005D: 84,
-    0xE005E: 84,
-    0xE005F: 84,
-    0xE0060: 84,
-    0xE0061: 84,
-    0xE0062: 84,
-    0xE0063: 84,
-    0xE0064: 84,
-    0xE0065: 84,
-    0xE0066: 84,
-    0xE0067: 84,
-    0xE0068: 84,
-    0xE0069: 84,
-    0xE006A: 84,
-    0xE006B: 84,
-    0xE006C: 84,
-    0xE006D: 84,
-    0xE006E: 84,
-    0xE006F: 84,
-    0xE0070: 84,
-    0xE0071: 84,
-    0xE0072: 84,
-    0xE0073: 84,
-    0xE0074: 84,
-    0xE0075: 84,
-    0xE0076: 84,
-    0xE0077: 84,
-    0xE0078: 84,
-    0xE0079: 84,
-    0xE007A: 84,
-    0xE007B: 84,
-    0xE007C: 84,
-    0xE007D: 84,
-    0xE007E: 84,
-    0xE007F: 84,
-    0xE0100: 84,
-    0xE0101: 84,
-    0xE0102: 84,
-    0xE0103: 84,
-    0xE0104: 84,
-    0xE0105: 84,
-    0xE0106: 84,
-    0xE0107: 84,
-    0xE0108: 84,
-    0xE0109: 84,
-    0xE010A: 84,
-    0xE010B: 84,
-    0xE010C: 84,
-    0xE010D: 84,
-    0xE010E: 84,
-    0xE010F: 84,
-    0xE0110: 84,
-    0xE0111: 84,
-    0xE0112: 84,
-    0xE0113: 84,
-    0xE0114: 84,
-    0xE0115: 84,
-    0xE0116: 84,
-    0xE0117: 84,
-    0xE0118: 84,
-    0xE0119: 84,
-    0xE011A: 84,
-    0xE011B: 84,
-    0xE011C: 84,
-    0xE011D: 84,
-    0xE011E: 84,
-    0xE011F: 84,
-    0xE0120: 84,
-    0xE0121: 84,
-    0xE0122: 84,
-    0xE0123: 84,
-    0xE0124: 84,
-    0xE0125: 84,
-    0xE0126: 84,
-    0xE0127: 84,
-    0xE0128: 84,
-    0xE0129: 84,
-    0xE012A: 84,
-    0xE012B: 84,
-    0xE012C: 84,
-    0xE012D: 84,
-    0xE012E: 84,
-    0xE012F: 84,
-    0xE0130: 84,
-    0xE0131: 84,
-    0xE0132: 84,
-    0xE0133: 84,
-    0xE0134: 84,
-    0xE0135: 84,
-    0xE0136: 84,
-    0xE0137: 84,
-    0xE0138: 84,
-    0xE0139: 84,
-    0xE013A: 84,
-    0xE013B: 84,
-    0xE013C: 84,
-    0xE013D: 84,
-    0xE013E: 84,
-    0xE013F: 84,
-    0xE0140: 84,
-    0xE0141: 84,
-    0xE0142: 84,
-    0xE0143: 84,
-    0xE0144: 84,
-    0xE0145: 84,
-    0xE0146: 84,
-    0xE0147: 84,
-    0xE0148: 84,
-    0xE0149: 84,
-    0xE014A: 84,
-    0xE014B: 84,
-    0xE014C: 84,
-    0xE014D: 84,
-    0xE014E: 84,
-    0xE014F: 84,
-    0xE0150: 84,
-    0xE0151: 84,
-    0xE0152: 84,
-    0xE0153: 84,
-    0xE0154: 84,
-    0xE0155: 84,
-    0xE0156: 84,
-    0xE0157: 84,
-    0xE0158: 84,
-    0xE0159: 84,
-    0xE015A: 84,
-    0xE015B: 84,
-    0xE015C: 84,
-    0xE015D: 84,
-    0xE015E: 84,
-    0xE015F: 84,
-    0xE0160: 84,
-    0xE0161: 84,
-    0xE0162: 84,
-    0xE0163: 84,
-    0xE0164: 84,
-    0xE0165: 84,
-    0xE0166: 84,
-    0xE0167: 84,
-    0xE0168: 84,
-    0xE0169: 84,
-    0xE016A: 84,
-    0xE016B: 84,
-    0xE016C: 84,
-    0xE016D: 84,
-    0xE016E: 84,
-    0xE016F: 84,
-    0xE0170: 84,
-    0xE0171: 84,
-    0xE0172: 84,
-    0xE0173: 84,
-    0xE0174: 84,
-    0xE0175: 84,
-    0xE0176: 84,
-    0xE0177: 84,
-    0xE0178: 84,
-    0xE0179: 84,
-    0xE017A: 84,
-    0xE017B: 84,
-    0xE017C: 84,
-    0xE017D: 84,
-    0xE017E: 84,
-    0xE017F: 84,
-    0xE0180: 84,
-    0xE0181: 84,
-    0xE0182: 84,
-    0xE0183: 84,
-    0xE0184: 84,
-    0xE0185: 84,
-    0xE0186: 84,
-    0xE0187: 84,
-    0xE0188: 84,
-    0xE0189: 84,
-    0xE018A: 84,
-    0xE018B: 84,
-    0xE018C: 84,
-    0xE018D: 84,
-    0xE018E: 84,
-    0xE018F: 84,
-    0xE0190: 84,
-    0xE0191: 84,
-    0xE0192: 84,
-    0xE0193: 84,
-    0xE0194: 84,
-    0xE0195: 84,
-    0xE0196: 84,
-    0xE0197: 84,
-    0xE0198: 84,
-    0xE0199: 84,
-    0xE019A: 84,
-    0xE019B: 84,
-    0xE019C: 84,
-    0xE019D: 84,
-    0xE019E: 84,
-    0xE019F: 84,
-    0xE01A0: 84,
-    0xE01A1: 84,
-    0xE01A2: 84,
-    0xE01A3: 84,
-    0xE01A4: 84,
-    0xE01A5: 84,
-    0xE01A6: 84,
-    0xE01A7: 84,
-    0xE01A8: 84,
-    0xE01A9: 84,
-    0xE01AA: 84,
-    0xE01AB: 84,
-    0xE01AC: 84,
-    0xE01AD: 84,
-    0xE01AE: 84,
-    0xE01AF: 84,
-    0xE01B0: 84,
-    0xE01B1: 84,
-    0xE01B2: 84,
-    0xE01B3: 84,
-    0xE01B4: 84,
-    0xE01B5: 84,
-    0xE01B6: 84,
-    0xE01B7: 84,
-    0xE01B8: 84,
-    0xE01B9: 84,
-    0xE01BA: 84,
-    0xE01BB: 84,
-    0xE01BC: 84,
-    0xE01BD: 84,
-    0xE01BE: 84,
-    0xE01BF: 84,
-    0xE01C0: 84,
-    0xE01C1: 84,
-    0xE01C2: 84,
-    0xE01C3: 84,
-    0xE01C4: 84,
-    0xE01C5: 84,
-    0xE01C6: 84,
-    0xE01C7: 84,
-    0xE01C8: 84,
-    0xE01C9: 84,
-    0xE01CA: 84,
-    0xE01CB: 84,
-    0xE01CC: 84,
-    0xE01CD: 84,
-    0xE01CE: 84,
-    0xE01CF: 84,
-    0xE01D0: 84,
-    0xE01D1: 84,
-    0xE01D2: 84,
-    0xE01D3: 84,
-    0xE01D4: 84,
-    0xE01D5: 84,
-    0xE01D6: 84,
-    0xE01D7: 84,
-    0xE01D8: 84,
-    0xE01D9: 84,
-    0xE01DA: 84,
-    0xE01DB: 84,
-    0xE01DC: 84,
-    0xE01DD: 84,
-    0xE01DE: 84,
-    0xE01DF: 84,
-    0xE01E0: 84,
-    0xE01E1: 84,
-    0xE01E2: 84,
-    0xE01E3: 84,
-    0xE01E4: 84,
-    0xE01E5: 84,
-    0xE01E6: 84,
-    0xE01E7: 84,
-    0xE01E8: 84,
-    0xE01E9: 84,
-    0xE01EA: 84,
-    0xE01EB: 84,
-    0xE01EC: 84,
-    0xE01ED: 84,
-    0xE01EE: 84,
-    0xE01EF: 84,
-}
-codepoint_classes = {
-    "PVALID": (
-        0x2D0000002E,
-        0x300000003A,
-        0x610000007B,
-        0xDF000000F7,
-        0xF800000100,
-        0x10100000102,
-        0x10300000104,
-        0x10500000106,
-        0x10700000108,
-        0x1090000010A,
-        0x10B0000010C,
-        0x10D0000010E,
-        0x10F00000110,
-        0x11100000112,
-        0x11300000114,
-        0x11500000116,
-        0x11700000118,
-        0x1190000011A,
-        0x11B0000011C,
-        0x11D0000011E,
-        0x11F00000120,
-        0x12100000122,
-        0x12300000124,
-        0x12500000126,
-        0x12700000128,
-        0x1290000012A,
-        0x12B0000012C,
-        0x12D0000012E,
-        0x12F00000130,
-        0x13100000132,
-        0x13500000136,
-        0x13700000139,
-        0x13A0000013B,
-        0x13C0000013D,
-        0x13E0000013F,
-        0x14200000143,
-        0x14400000145,
-        0x14600000147,
-        0x14800000149,
-        0x14B0000014C,
-        0x14D0000014E,
-        0x14F00000150,
-        0x15100000152,
-        0x15300000154,
-        0x15500000156,
-        0x15700000158,
-        0x1590000015A,
-        0x15B0000015C,
-        0x15D0000015E,
-        0x15F00000160,
-        0x16100000162,
-        0x16300000164,
-        0x16500000166,
-        0x16700000168,
-        0x1690000016A,
-        0x16B0000016C,
-        0x16D0000016E,
-        0x16F00000170,
-        0x17100000172,
-        0x17300000174,
-        0x17500000176,
-        0x17700000178,
-        0x17A0000017B,
-        0x17C0000017D,
-        0x17E0000017F,
-        0x18000000181,
-        0x18300000184,
-        0x18500000186,
-        0x18800000189,
-        0x18C0000018E,
-        0x19200000193,
-        0x19500000196,
-        0x1990000019C,
-        0x19E0000019F,
-        0x1A1000001A2,
-        0x1A3000001A4,
-        0x1A5000001A6,
-        0x1A8000001A9,
-        0x1AA000001AC,
-        0x1AD000001AE,
-        0x1B0000001B1,
-        0x1B4000001B5,
-        0x1B6000001B7,
-        0x1B9000001BC,
-        0x1BD000001C4,
-        0x1CE000001CF,
-        0x1D0000001D1,
-        0x1D2000001D3,
-        0x1D4000001D5,
-        0x1D6000001D7,
-        0x1D8000001D9,
-        0x1DA000001DB,
-        0x1DC000001DE,
-        0x1DF000001E0,
-        0x1E1000001E2,
-        0x1E3000001E4,
-        0x1E5000001E6,
-        0x1E7000001E8,
-        0x1E9000001EA,
-        0x1EB000001EC,
-        0x1ED000001EE,
-        0x1EF000001F1,
-        0x1F5000001F6,
-        0x1F9000001FA,
-        0x1FB000001FC,
-        0x1FD000001FE,
-        0x1FF00000200,
-        0x20100000202,
-        0x20300000204,
-        0x20500000206,
-        0x20700000208,
-        0x2090000020A,
-        0x20B0000020C,
-        0x20D0000020E,
-        0x20F00000210,
-        0x21100000212,
-        0x21300000214,
-        0x21500000216,
-        0x21700000218,
-        0x2190000021A,
-        0x21B0000021C,
-        0x21D0000021E,
-        0x21F00000220,
-        0x22100000222,
-        0x22300000224,
-        0x22500000226,
-        0x22700000228,
-        0x2290000022A,
-        0x22B0000022C,
-        0x22D0000022E,
-        0x22F00000230,
-        0x23100000232,
-        0x2330000023A,
-        0x23C0000023D,
-        0x23F00000241,
-        0x24200000243,
-        0x24700000248,
-        0x2490000024A,
-        0x24B0000024C,
-        0x24D0000024E,
-        0x24F000002B0,
-        0x2B9000002C2,
-        0x2C6000002D2,
-        0x2EC000002ED,
-        0x2EE000002EF,
-        0x30000000340,
-        0x34200000343,
-        0x3460000034F,
-        0x35000000370,
-        0x37100000372,
-        0x37300000374,
-        0x37700000378,
-        0x37B0000037E,
-        0x39000000391,
-        0x3AC000003CF,
-        0x3D7000003D8,
-        0x3D9000003DA,
-        0x3DB000003DC,
-        0x3DD000003DE,
-        0x3DF000003E0,
-        0x3E1000003E2,
-        0x3E3000003E4,
-        0x3E5000003E6,
-        0x3E7000003E8,
-        0x3E9000003EA,
-        0x3EB000003EC,
-        0x3ED000003EE,
-        0x3EF000003F0,
-        0x3F3000003F4,
-        0x3F8000003F9,
-        0x3FB000003FD,
-        0x43000000460,
-        0x46100000462,
-        0x46300000464,
-        0x46500000466,
-        0x46700000468,
-        0x4690000046A,
-        0x46B0000046C,
-        0x46D0000046E,
-        0x46F00000470,
-        0x47100000472,
-        0x47300000474,
-        0x47500000476,
-        0x47700000478,
-        0x4790000047A,
-        0x47B0000047C,
-        0x47D0000047E,
-        0x47F00000480,
-        0x48100000482,
-        0x48300000488,
-        0x48B0000048C,
-        0x48D0000048E,
-        0x48F00000490,
-        0x49100000492,
-        0x49300000494,
-        0x49500000496,
-        0x49700000498,
-        0x4990000049A,
-        0x49B0000049C,
-        0x49D0000049E,
-        0x49F000004A0,
-        0x4A1000004A2,
-        0x4A3000004A4,
-        0x4A5000004A6,
-        0x4A7000004A8,
-        0x4A9000004AA,
-        0x4AB000004AC,
-        0x4AD000004AE,
-        0x4AF000004B0,
-        0x4B1000004B2,
-        0x4B3000004B4,
-        0x4B5000004B6,
-        0x4B7000004B8,
-        0x4B9000004BA,
-        0x4BB000004BC,
-        0x4BD000004BE,
-        0x4BF000004C0,
-        0x4C2000004C3,
-        0x4C4000004C5,
-        0x4C6000004C7,
-        0x4C8000004C9,
-        0x4CA000004CB,
-        0x4CC000004CD,
-        0x4CE000004D0,
-        0x4D1000004D2,
-        0x4D3000004D4,
-        0x4D5000004D6,
-        0x4D7000004D8,
-        0x4D9000004DA,
-        0x4DB000004DC,
-        0x4DD000004DE,
-        0x4DF000004E0,
-        0x4E1000004E2,
-        0x4E3000004E4,
-        0x4E5000004E6,
-        0x4E7000004E8,
-        0x4E9000004EA,
-        0x4EB000004EC,
-        0x4ED000004EE,
-        0x4EF000004F0,
-        0x4F1000004F2,
-        0x4F3000004F4,
-        0x4F5000004F6,
-        0x4F7000004F8,
-        0x4F9000004FA,
-        0x4FB000004FC,
-        0x4FD000004FE,
-        0x4FF00000500,
-        0x50100000502,
-        0x50300000504,
-        0x50500000506,
-        0x50700000508,
-        0x5090000050A,
-        0x50B0000050C,
-        0x50D0000050E,
-        0x50F00000510,
-        0x51100000512,
-        0x51300000514,
-        0x51500000516,
-        0x51700000518,
-        0x5190000051A,
-        0x51B0000051C,
-        0x51D0000051E,
-        0x51F00000520,
-        0x52100000522,
-        0x52300000524,
-        0x52500000526,
-        0x52700000528,
-        0x5290000052A,
-        0x52B0000052C,
-        0x52D0000052E,
-        0x52F00000530,
-        0x5590000055A,
-        0x56000000587,
-        0x58800000589,
-        0x591000005BE,
-        0x5BF000005C0,
-        0x5C1000005C3,
-        0x5C4000005C6,
-        0x5C7000005C8,
-        0x5D0000005EB,
-        0x5EF000005F3,
-        0x6100000061B,
-        0x62000000640,
-        0x64100000660,
-        0x66E00000675,
-        0x679000006D4,
-        0x6D5000006DD,
-        0x6DF000006E9,
-        0x6EA000006F0,
-        0x6FA00000700,
-        0x7100000074B,
-        0x74D000007B2,
-        0x7C0000007F6,
-        0x7FD000007FE,
-        0x8000000082E,
-        0x8400000085C,
-        0x8600000086B,
-        0x87000000888,
-        0x8890000088F,
-        0x898000008E2,
-        0x8E300000958,
-        0x96000000964,
-        0x96600000970,
-        0x97100000984,
-        0x9850000098D,
-        0x98F00000991,
-        0x993000009A9,
-        0x9AA000009B1,
-        0x9B2000009B3,
-        0x9B6000009BA,
-        0x9BC000009C5,
-        0x9C7000009C9,
-        0x9CB000009CF,
-        0x9D7000009D8,
-        0x9E0000009E4,
-        0x9E6000009F2,
-        0x9FC000009FD,
-        0x9FE000009FF,
-        0xA0100000A04,
-        0xA0500000A0B,
-        0xA0F00000A11,
-        0xA1300000A29,
-        0xA2A00000A31,
-        0xA3200000A33,
-        0xA3500000A36,
-        0xA3800000A3A,
-        0xA3C00000A3D,
-        0xA3E00000A43,
-        0xA4700000A49,
-        0xA4B00000A4E,
-        0xA5100000A52,
-        0xA5C00000A5D,
-        0xA6600000A76,
-        0xA8100000A84,
-        0xA8500000A8E,
-        0xA8F00000A92,
-        0xA9300000AA9,
-        0xAAA00000AB1,
-        0xAB200000AB4,
-        0xAB500000ABA,
-        0xABC00000AC6,
-        0xAC700000ACA,
-        0xACB00000ACE,
-        0xAD000000AD1,
-        0xAE000000AE4,
-        0xAE600000AF0,
-        0xAF900000B00,
-        0xB0100000B04,
-        0xB0500000B0D,
-        0xB0F00000B11,
-        0xB1300000B29,
-        0xB2A00000B31,
-        0xB3200000B34,
-        0xB3500000B3A,
-        0xB3C00000B45,
-        0xB4700000B49,
-        0xB4B00000B4E,
-        0xB5500000B58,
-        0xB5F00000B64,
-        0xB6600000B70,
-        0xB7100000B72,
-        0xB8200000B84,
-        0xB8500000B8B,
-        0xB8E00000B91,
-        0xB9200000B96,
-        0xB9900000B9B,
-        0xB9C00000B9D,
-        0xB9E00000BA0,
-        0xBA300000BA5,
-        0xBA800000BAB,
-        0xBAE00000BBA,
-        0xBBE00000BC3,
-        0xBC600000BC9,
-        0xBCA00000BCE,
-        0xBD000000BD1,
-        0xBD700000BD8,
-        0xBE600000BF0,
-        0xC0000000C0D,
-        0xC0E00000C11,
-        0xC1200000C29,
-        0xC2A00000C3A,
-        0xC3C00000C45,
-        0xC4600000C49,
-        0xC4A00000C4E,
-        0xC5500000C57,
-        0xC5800000C5B,
-        0xC5D00000C5E,
-        0xC6000000C64,
-        0xC6600000C70,
-        0xC8000000C84,
-        0xC8500000C8D,
-        0xC8E00000C91,
-        0xC9200000CA9,
-        0xCAA00000CB4,
-        0xCB500000CBA,
-        0xCBC00000CC5,
-        0xCC600000CC9,
-        0xCCA00000CCE,
-        0xCD500000CD7,
-        0xCDD00000CDF,
-        0xCE000000CE4,
-        0xCE600000CF0,
-        0xCF100000CF4,
-        0xD0000000D0D,
-        0xD0E00000D11,
-        0xD1200000D45,
-        0xD4600000D49,
-        0xD4A00000D4F,
-        0xD5400000D58,
-        0xD5F00000D64,
-        0xD6600000D70,
-        0xD7A00000D80,
-        0xD8100000D84,
-        0xD8500000D97,
-        0xD9A00000DB2,
-        0xDB300000DBC,
-        0xDBD00000DBE,
-        0xDC000000DC7,
-        0xDCA00000DCB,
-        0xDCF00000DD5,
-        0xDD600000DD7,
-        0xDD800000DE0,
-        0xDE600000DF0,
-        0xDF200000DF4,
-        0xE0100000E33,
-        0xE3400000E3B,
-        0xE4000000E4F,
-        0xE5000000E5A,
-        0xE8100000E83,
-        0xE8400000E85,
-        0xE8600000E8B,
-        0xE8C00000EA4,
-        0xEA500000EA6,
-        0xEA700000EB3,
-        0xEB400000EBE,
-        0xEC000000EC5,
-        0xEC600000EC7,
-        0xEC800000ECF,
-        0xED000000EDA,
-        0xEDE00000EE0,
-        0xF0000000F01,
-        0xF0B00000F0C,
-        0xF1800000F1A,
-        0xF2000000F2A,
-        0xF3500000F36,
-        0xF3700000F38,
-        0xF3900000F3A,
-        0xF3E00000F43,
-        0xF4400000F48,
-        0xF4900000F4D,
-        0xF4E00000F52,
-        0xF5300000F57,
-        0xF5800000F5C,
-        0xF5D00000F69,
-        0xF6A00000F6D,
-        0xF7100000F73,
-        0xF7400000F75,
-        0xF7A00000F81,
-        0xF8200000F85,
-        0xF8600000F93,
-        0xF9400000F98,
-        0xF9900000F9D,
-        0xF9E00000FA2,
-        0xFA300000FA7,
-        0xFA800000FAC,
-        0xFAD00000FB9,
-        0xFBA00000FBD,
-        0xFC600000FC7,
-        0x10000000104A,
-        0x10500000109E,
-        0x10D0000010FB,
-        0x10FD00001100,
-        0x120000001249,
-        0x124A0000124E,
-        0x125000001257,
-        0x125800001259,
-        0x125A0000125E,
-        0x126000001289,
-        0x128A0000128E,
-        0x1290000012B1,
-        0x12B2000012B6,
-        0x12B8000012BF,
-        0x12C0000012C1,
-        0x12C2000012C6,
-        0x12C8000012D7,
-        0x12D800001311,
-        0x131200001316,
-        0x13180000135B,
-        0x135D00001360,
-        0x138000001390,
-        0x13A0000013F6,
-        0x14010000166D,
-        0x166F00001680,
-        0x16810000169B,
-        0x16A0000016EB,
-        0x16F1000016F9,
-        0x170000001716,
-        0x171F00001735,
-        0x174000001754,
-        0x17600000176D,
-        0x176E00001771,
-        0x177200001774,
-        0x1780000017B4,
-        0x17B6000017D4,
-        0x17D7000017D8,
-        0x17DC000017DE,
-        0x17E0000017EA,
-        0x18100000181A,
-        0x182000001879,
-        0x1880000018AB,
-        0x18B0000018F6,
-        0x19000000191F,
-        0x19200000192C,
-        0x19300000193C,
-        0x19460000196E,
-        0x197000001975,
-        0x1980000019AC,
-        0x19B0000019CA,
-        0x19D0000019DA,
-        0x1A0000001A1C,
-        0x1A2000001A5F,
-        0x1A6000001A7D,
-        0x1A7F00001A8A,
-        0x1A9000001A9A,
-        0x1AA700001AA8,
-        0x1AB000001ABE,
-        0x1ABF00001ACF,
-        0x1B0000001B4D,
-        0x1B5000001B5A,
-        0x1B6B00001B74,
-        0x1B8000001BF4,
-        0x1C0000001C38,
-        0x1C4000001C4A,
-        0x1C4D00001C7E,
-        0x1CD000001CD3,
-        0x1CD400001CFB,
-        0x1D0000001D2C,
-        0x1D2F00001D30,
-        0x1D3B00001D3C,
-        0x1D4E00001D4F,
-        0x1D6B00001D78,
-        0x1D7900001D9B,
-        0x1DC000001E00,
-        0x1E0100001E02,
-        0x1E0300001E04,
-        0x1E0500001E06,
-        0x1E0700001E08,
-        0x1E0900001E0A,
-        0x1E0B00001E0C,
-        0x1E0D00001E0E,
-        0x1E0F00001E10,
-        0x1E1100001E12,
-        0x1E1300001E14,
-        0x1E1500001E16,
-        0x1E1700001E18,
-        0x1E1900001E1A,
-        0x1E1B00001E1C,
-        0x1E1D00001E1E,
-        0x1E1F00001E20,
-        0x1E2100001E22,
-        0x1E2300001E24,
-        0x1E2500001E26,
-        0x1E2700001E28,
-        0x1E2900001E2A,
-        0x1E2B00001E2C,
-        0x1E2D00001E2E,
-        0x1E2F00001E30,
-        0x1E3100001E32,
-        0x1E3300001E34,
-        0x1E3500001E36,
-        0x1E3700001E38,
-        0x1E3900001E3A,
-        0x1E3B00001E3C,
-        0x1E3D00001E3E,
-        0x1E3F00001E40,
-        0x1E4100001E42,
-        0x1E4300001E44,
-        0x1E4500001E46,
-        0x1E4700001E48,
-        0x1E4900001E4A,
-        0x1E4B00001E4C,
-        0x1E4D00001E4E,
-        0x1E4F00001E50,
-        0x1E5100001E52,
-        0x1E5300001E54,
-        0x1E5500001E56,
-        0x1E5700001E58,
-        0x1E5900001E5A,
-        0x1E5B00001E5C,
-        0x1E5D00001E5E,
-        0x1E5F00001E60,
-        0x1E6100001E62,
-        0x1E6300001E64,
-        0x1E6500001E66,
-        0x1E6700001E68,
-        0x1E6900001E6A,
-        0x1E6B00001E6C,
-        0x1E6D00001E6E,
-        0x1E6F00001E70,
-        0x1E7100001E72,
-        0x1E7300001E74,
-        0x1E7500001E76,
-        0x1E7700001E78,
-        0x1E7900001E7A,
-        0x1E7B00001E7C,
-        0x1E7D00001E7E,
-        0x1E7F00001E80,
-        0x1E8100001E82,
-        0x1E8300001E84,
-        0x1E8500001E86,
-        0x1E8700001E88,
-        0x1E8900001E8A,
-        0x1E8B00001E8C,
-        0x1E8D00001E8E,
-        0x1E8F00001E90,
-        0x1E9100001E92,
-        0x1E9300001E94,
-        0x1E9500001E9A,
-        0x1E9C00001E9E,
-        0x1E9F00001EA0,
-        0x1EA100001EA2,
-        0x1EA300001EA4,
-        0x1EA500001EA6,
-        0x1EA700001EA8,
-        0x1EA900001EAA,
-        0x1EAB00001EAC,
-        0x1EAD00001EAE,
-        0x1EAF00001EB0,
-        0x1EB100001EB2,
-        0x1EB300001EB4,
-        0x1EB500001EB6,
-        0x1EB700001EB8,
-        0x1EB900001EBA,
-        0x1EBB00001EBC,
-        0x1EBD00001EBE,
-        0x1EBF00001EC0,
-        0x1EC100001EC2,
-        0x1EC300001EC4,
-        0x1EC500001EC6,
-        0x1EC700001EC8,
-        0x1EC900001ECA,
-        0x1ECB00001ECC,
-        0x1ECD00001ECE,
-        0x1ECF00001ED0,
-        0x1ED100001ED2,
-        0x1ED300001ED4,
-        0x1ED500001ED6,
-        0x1ED700001ED8,
-        0x1ED900001EDA,
-        0x1EDB00001EDC,
-        0x1EDD00001EDE,
-        0x1EDF00001EE0,
-        0x1EE100001EE2,
-        0x1EE300001EE4,
-        0x1EE500001EE6,
-        0x1EE700001EE8,
-        0x1EE900001EEA,
-        0x1EEB00001EEC,
-        0x1EED00001EEE,
-        0x1EEF00001EF0,
-        0x1EF100001EF2,
-        0x1EF300001EF4,
-        0x1EF500001EF6,
-        0x1EF700001EF8,
-        0x1EF900001EFA,
-        0x1EFB00001EFC,
-        0x1EFD00001EFE,
-        0x1EFF00001F08,
-        0x1F1000001F16,
-        0x1F2000001F28,
-        0x1F3000001F38,
-        0x1F4000001F46,
-        0x1F5000001F58,
-        0x1F6000001F68,
-        0x1F7000001F71,
-        0x1F7200001F73,
-        0x1F7400001F75,
-        0x1F7600001F77,
-        0x1F7800001F79,
-        0x1F7A00001F7B,
-        0x1F7C00001F7D,
-        0x1FB000001FB2,
-        0x1FB600001FB7,
-        0x1FC600001FC7,
-        0x1FD000001FD3,
-        0x1FD600001FD8,
-        0x1FE000001FE3,
-        0x1FE400001FE8,
-        0x1FF600001FF7,
-        0x214E0000214F,
-        0x218400002185,
-        0x2C3000002C60,
-        0x2C6100002C62,
-        0x2C6500002C67,
-        0x2C6800002C69,
-        0x2C6A00002C6B,
-        0x2C6C00002C6D,
-        0x2C7100002C72,
-        0x2C7300002C75,
-        0x2C7600002C7C,
-        0x2C8100002C82,
-        0x2C8300002C84,
-        0x2C8500002C86,
-        0x2C8700002C88,
-        0x2C8900002C8A,
-        0x2C8B00002C8C,
-        0x2C8D00002C8E,
-        0x2C8F00002C90,
-        0x2C9100002C92,
-        0x2C9300002C94,
-        0x2C9500002C96,
-        0x2C9700002C98,
-        0x2C9900002C9A,
-        0x2C9B00002C9C,
-        0x2C9D00002C9E,
-        0x2C9F00002CA0,
-        0x2CA100002CA2,
-        0x2CA300002CA4,
-        0x2CA500002CA6,
-        0x2CA700002CA8,
-        0x2CA900002CAA,
-        0x2CAB00002CAC,
-        0x2CAD00002CAE,
-        0x2CAF00002CB0,
-        0x2CB100002CB2,
-        0x2CB300002CB4,
-        0x2CB500002CB6,
-        0x2CB700002CB8,
-        0x2CB900002CBA,
-        0x2CBB00002CBC,
-        0x2CBD00002CBE,
-        0x2CBF00002CC0,
-        0x2CC100002CC2,
-        0x2CC300002CC4,
-        0x2CC500002CC6,
-        0x2CC700002CC8,
-        0x2CC900002CCA,
-        0x2CCB00002CCC,
-        0x2CCD00002CCE,
-        0x2CCF00002CD0,
-        0x2CD100002CD2,
-        0x2CD300002CD4,
-        0x2CD500002CD6,
-        0x2CD700002CD8,
-        0x2CD900002CDA,
-        0x2CDB00002CDC,
-        0x2CDD00002CDE,
-        0x2CDF00002CE0,
-        0x2CE100002CE2,
-        0x2CE300002CE5,
-        0x2CEC00002CED,
-        0x2CEE00002CF2,
-        0x2CF300002CF4,
-        0x2D0000002D26,
-        0x2D2700002D28,
-        0x2D2D00002D2E,
-        0x2D3000002D68,
-        0x2D7F00002D97,
-        0x2DA000002DA7,
-        0x2DA800002DAF,
-        0x2DB000002DB7,
-        0x2DB800002DBF,
-        0x2DC000002DC7,
-        0x2DC800002DCF,
-        0x2DD000002DD7,
-        0x2DD800002DDF,
-        0x2DE000002E00,
-        0x2E2F00002E30,
-        0x300500003008,
-        0x302A0000302E,
-        0x303C0000303D,
-        0x304100003097,
-        0x30990000309B,
-        0x309D0000309F,
-        0x30A1000030FB,
-        0x30FC000030FF,
-        0x310500003130,
-        0x31A0000031C0,
-        0x31F000003200,
-        0x340000004DC0,
-        0x4E000000A48D,
-        0xA4D00000A4FE,
-        0xA5000000A60D,
-        0xA6100000A62C,
-        0xA6410000A642,
-        0xA6430000A644,
-        0xA6450000A646,
-        0xA6470000A648,
-        0xA6490000A64A,
-        0xA64B0000A64C,
-        0xA64D0000A64E,
-        0xA64F0000A650,
-        0xA6510000A652,
-        0xA6530000A654,
-        0xA6550000A656,
-        0xA6570000A658,
-        0xA6590000A65A,
-        0xA65B0000A65C,
-        0xA65D0000A65E,
-        0xA65F0000A660,
-        0xA6610000A662,
-        0xA6630000A664,
-        0xA6650000A666,
-        0xA6670000A668,
-        0xA6690000A66A,
-        0xA66B0000A66C,
-        0xA66D0000A670,
-        0xA6740000A67E,
-        0xA67F0000A680,
-        0xA6810000A682,
-        0xA6830000A684,
-        0xA6850000A686,
-        0xA6870000A688,
-        0xA6890000A68A,
-        0xA68B0000A68C,
-        0xA68D0000A68E,
-        0xA68F0000A690,
-        0xA6910000A692,
-        0xA6930000A694,
-        0xA6950000A696,
-        0xA6970000A698,
-        0xA6990000A69A,
-        0xA69B0000A69C,
-        0xA69E0000A6E6,
-        0xA6F00000A6F2,
-        0xA7170000A720,
-        0xA7230000A724,
-        0xA7250000A726,
-        0xA7270000A728,
-        0xA7290000A72A,
-        0xA72B0000A72C,
-        0xA72D0000A72E,
-        0xA72F0000A732,
-        0xA7330000A734,
-        0xA7350000A736,
-        0xA7370000A738,
-        0xA7390000A73A,
-        0xA73B0000A73C,
-        0xA73D0000A73E,
-        0xA73F0000A740,
-        0xA7410000A742,
-        0xA7430000A744,
-        0xA7450000A746,
-        0xA7470000A748,
-        0xA7490000A74A,
-        0xA74B0000A74C,
-        0xA74D0000A74E,
-        0xA74F0000A750,
-        0xA7510000A752,
-        0xA7530000A754,
-        0xA7550000A756,
-        0xA7570000A758,
-        0xA7590000A75A,
-        0xA75B0000A75C,
-        0xA75D0000A75E,
-        0xA75F0000A760,
-        0xA7610000A762,
-        0xA7630000A764,
-        0xA7650000A766,
-        0xA7670000A768,
-        0xA7690000A76A,
-        0xA76B0000A76C,
-        0xA76D0000A76E,
-        0xA76F0000A770,
-        0xA7710000A779,
-        0xA77A0000A77B,
-        0xA77C0000A77D,
-        0xA77F0000A780,
-        0xA7810000A782,
-        0xA7830000A784,
-        0xA7850000A786,
-        0xA7870000A789,
-        0xA78C0000A78D,
-        0xA78E0000A790,
-        0xA7910000A792,
-        0xA7930000A796,
-        0xA7970000A798,
-        0xA7990000A79A,
-        0xA79B0000A79C,
-        0xA79D0000A79E,
-        0xA79F0000A7A0,
-        0xA7A10000A7A2,
-        0xA7A30000A7A4,
-        0xA7A50000A7A6,
-        0xA7A70000A7A8,
-        0xA7A90000A7AA,
-        0xA7AF0000A7B0,
-        0xA7B50000A7B6,
-        0xA7B70000A7B8,
-        0xA7B90000A7BA,
-        0xA7BB0000A7BC,
-        0xA7BD0000A7BE,
-        0xA7BF0000A7C0,
-        0xA7C10000A7C2,
-        0xA7C30000A7C4,
-        0xA7C80000A7C9,
-        0xA7CA0000A7CB,
-        0xA7D10000A7D2,
-        0xA7D30000A7D4,
-        0xA7D50000A7D6,
-        0xA7D70000A7D8,
-        0xA7D90000A7DA,
-        0xA7F60000A7F8,
-        0xA7FA0000A828,
-        0xA82C0000A82D,
-        0xA8400000A874,
-        0xA8800000A8C6,
-        0xA8D00000A8DA,
-        0xA8E00000A8F8,
-        0xA8FB0000A8FC,
-        0xA8FD0000A92E,
-        0xA9300000A954,
-        0xA9800000A9C1,
-        0xA9CF0000A9DA,
-        0xA9E00000A9FF,
-        0xAA000000AA37,
-        0xAA400000AA4E,
-        0xAA500000AA5A,
-        0xAA600000AA77,
-        0xAA7A0000AAC3,
-        0xAADB0000AADE,
-        0xAAE00000AAF0,
-        0xAAF20000AAF7,
-        0xAB010000AB07,
-        0xAB090000AB0F,
-        0xAB110000AB17,
-        0xAB200000AB27,
-        0xAB280000AB2F,
-        0xAB300000AB5B,
-        0xAB600000AB69,
-        0xABC00000ABEB,
-        0xABEC0000ABEE,
-        0xABF00000ABFA,
-        0xAC000000D7A4,
-        0xFA0E0000FA10,
-        0xFA110000FA12,
-        0xFA130000FA15,
-        0xFA1F0000FA20,
-        0xFA210000FA22,
-        0xFA230000FA25,
-        0xFA270000FA2A,
-        0xFB1E0000FB1F,
-        0xFE200000FE30,
-        0xFE730000FE74,
-        0x100000001000C,
-        0x1000D00010027,
-        0x100280001003B,
-        0x1003C0001003E,
-        0x1003F0001004E,
-        0x100500001005E,
-        0x10080000100FB,
-        0x101FD000101FE,
-        0x102800001029D,
-        0x102A0000102D1,
-        0x102E0000102E1,
-        0x1030000010320,
-        0x1032D00010341,
-        0x103420001034A,
-        0x103500001037B,
-        0x103800001039E,
-        0x103A0000103C4,
-        0x103C8000103D0,
-        0x104280001049E,
-        0x104A0000104AA,
-        0x104D8000104FC,
-        0x1050000010528,
-        0x1053000010564,
-        0x10597000105A2,
-        0x105A3000105B2,
-        0x105B3000105BA,
-        0x105BB000105BD,
-        0x1060000010737,
-        0x1074000010756,
-        0x1076000010768,
-        0x1078000010781,
-        0x1080000010806,
-        0x1080800010809,
-        0x1080A00010836,
-        0x1083700010839,
-        0x1083C0001083D,
-        0x1083F00010856,
-        0x1086000010877,
-        0x108800001089F,
-        0x108E0000108F3,
-        0x108F4000108F6,
-        0x1090000010916,
-        0x109200001093A,
-        0x10980000109B8,
-        0x109BE000109C0,
-        0x10A0000010A04,
-        0x10A0500010A07,
-        0x10A0C00010A14,
-        0x10A1500010A18,
-        0x10A1900010A36,
-        0x10A3800010A3B,
-        0x10A3F00010A40,
-        0x10A6000010A7D,
-        0x10A8000010A9D,
-        0x10AC000010AC8,
-        0x10AC900010AE7,
-        0x10B0000010B36,
-        0x10B4000010B56,
-        0x10B6000010B73,
-        0x10B8000010B92,
-        0x10C0000010C49,
-        0x10CC000010CF3,
-        0x10D0000010D28,
-        0x10D3000010D3A,
-        0x10E8000010EAA,
-        0x10EAB00010EAD,
-        0x10EB000010EB2,
-        0x10EFD00010F1D,
-        0x10F2700010F28,
-        0x10F3000010F51,
-        0x10F7000010F86,
-        0x10FB000010FC5,
-        0x10FE000010FF7,
-        0x1100000011047,
-        0x1106600011076,
-        0x1107F000110BB,
-        0x110C2000110C3,
-        0x110D0000110E9,
-        0x110F0000110FA,
-        0x1110000011135,
-        0x1113600011140,
-        0x1114400011148,
-        0x1115000011174,
-        0x1117600011177,
-        0x11180000111C5,
-        0x111C9000111CD,
-        0x111CE000111DB,
-        0x111DC000111DD,
-        0x1120000011212,
-        0x1121300011238,
-        0x1123E00011242,
-        0x1128000011287,
-        0x1128800011289,
-        0x1128A0001128E,
-        0x1128F0001129E,
-        0x1129F000112A9,
-        0x112B0000112EB,
-        0x112F0000112FA,
-        0x1130000011304,
-        0x113050001130D,
-        0x1130F00011311,
-        0x1131300011329,
-        0x1132A00011331,
-        0x1133200011334,
-        0x113350001133A,
-        0x1133B00011345,
-        0x1134700011349,
-        0x1134B0001134E,
-        0x1135000011351,
-        0x1135700011358,
-        0x1135D00011364,
-        0x113660001136D,
-        0x1137000011375,
-        0x114000001144B,
-        0x114500001145A,
-        0x1145E00011462,
-        0x11480000114C6,
-        0x114C7000114C8,
-        0x114D0000114DA,
-        0x11580000115B6,
-        0x115B8000115C1,
-        0x115D8000115DE,
-        0x1160000011641,
-        0x1164400011645,
-        0x116500001165A,
-        0x11680000116B9,
-        0x116C0000116CA,
-        0x117000001171B,
-        0x1171D0001172C,
-        0x117300001173A,
-        0x1174000011747,
-        0x118000001183B,
-        0x118C0000118EA,
-        0x118FF00011907,
-        0x119090001190A,
-        0x1190C00011914,
-        0x1191500011917,
-        0x1191800011936,
-        0x1193700011939,
-        0x1193B00011944,
-        0x119500001195A,
-        0x119A0000119A8,
-        0x119AA000119D8,
-        0x119DA000119E2,
-        0x119E3000119E5,
-        0x11A0000011A3F,
-        0x11A4700011A48,
-        0x11A5000011A9A,
-        0x11A9D00011A9E,
-        0x11AB000011AF9,
-        0x11C0000011C09,
-        0x11C0A00011C37,
-        0x11C3800011C41,
-        0x11C5000011C5A,
-        0x11C7200011C90,
-        0x11C9200011CA8,
-        0x11CA900011CB7,
-        0x11D0000011D07,
-        0x11D0800011D0A,
-        0x11D0B00011D37,
-        0x11D3A00011D3B,
-        0x11D3C00011D3E,
-        0x11D3F00011D48,
-        0x11D5000011D5A,
-        0x11D6000011D66,
-        0x11D6700011D69,
-        0x11D6A00011D8F,
-        0x11D9000011D92,
-        0x11D9300011D99,
-        0x11DA000011DAA,
-        0x11EE000011EF7,
-        0x11F0000011F11,
-        0x11F1200011F3B,
-        0x11F3E00011F43,
-        0x11F5000011F5A,
-        0x11FB000011FB1,
-        0x120000001239A,
-        0x1248000012544,
-        0x12F9000012FF1,
-        0x1300000013430,
-        0x1344000013456,
-        0x1440000014647,
-        0x1680000016A39,
-        0x16A4000016A5F,
-        0x16A6000016A6A,
-        0x16A7000016ABF,
-        0x16AC000016ACA,
-        0x16AD000016AEE,
-        0x16AF000016AF5,
-        0x16B0000016B37,
-        0x16B4000016B44,
-        0x16B5000016B5A,
-        0x16B6300016B78,
-        0x16B7D00016B90,
-        0x16E6000016E80,
-        0x16F0000016F4B,
-        0x16F4F00016F88,
-        0x16F8F00016FA0,
-        0x16FE000016FE2,
-        0x16FE300016FE5,
-        0x16FF000016FF2,
-        0x17000000187F8,
-        0x1880000018CD6,
-        0x18D0000018D09,
-        0x1AFF00001AFF4,
-        0x1AFF50001AFFC,
-        0x1AFFD0001AFFF,
-        0x1B0000001B123,
-        0x1B1320001B133,
-        0x1B1500001B153,
-        0x1B1550001B156,
-        0x1B1640001B168,
-        0x1B1700001B2FC,
-        0x1BC000001BC6B,
-        0x1BC700001BC7D,
-        0x1BC800001BC89,
-        0x1BC900001BC9A,
-        0x1BC9D0001BC9F,
-        0x1CF000001CF2E,
-        0x1CF300001CF47,
-        0x1DA000001DA37,
-        0x1DA3B0001DA6D,
-        0x1DA750001DA76,
-        0x1DA840001DA85,
-        0x1DA9B0001DAA0,
-        0x1DAA10001DAB0,
-        0x1DF000001DF1F,
-        0x1DF250001DF2B,
-        0x1E0000001E007,
-        0x1E0080001E019,
-        0x1E01B0001E022,
-        0x1E0230001E025,
-        0x1E0260001E02B,
-        0x1E08F0001E090,
-        0x1E1000001E12D,
-        0x1E1300001E13E,
-        0x1E1400001E14A,
-        0x1E14E0001E14F,
-        0x1E2900001E2AF,
-        0x1E2C00001E2FA,
-        0x1E4D00001E4FA,
-        0x1E7E00001E7E7,
-        0x1E7E80001E7EC,
-        0x1E7ED0001E7EF,
-        0x1E7F00001E7FF,
-        0x1E8000001E8C5,
-        0x1E8D00001E8D7,
-        0x1E9220001E94C,
-        0x1E9500001E95A,
-        0x200000002A6E0,
-        0x2A7000002B73A,
-        0x2B7400002B81E,
-        0x2B8200002CEA2,
-        0x2CEB00002EBE1,
-        0x2EBF00002EE5E,
-        0x300000003134B,
-        0x31350000323B0,
-    ),
-    "CONTEXTJ": (0x200C0000200E,),
-    "CONTEXTO": (
-        0xB7000000B8,
-        0x37500000376,
-        0x5F3000005F5,
-        0x6600000066A,
-        0x6F0000006FA,
-        0x30FB000030FC,
-    ),
-}
diff --git a/lib/idna/intranges.py b/lib/idna/intranges.py
deleted file mode 100644
index 7bfaa8d8..00000000
--- a/lib/idna/intranges.py
+++ /dev/null
@@ -1,57 +0,0 @@
-"""
-Given a list of integers, made up of (hopefully) a small number of long runs
-of consecutive integers, compute a representation of the form
-((start1, end1), (start2, end2) ...). Then answer the question "was x present
-in the original list?" in time O(log(# runs)).
-"""
-
-import bisect
-from typing import List, Tuple
-
-
-def intranges_from_list(list_: List[int]) -> Tuple[int, ...]:
-    """Represent a list of integers as a sequence of ranges:
-    ((start_0, end_0), (start_1, end_1), ...), such that the original
-    integers are exactly those x such that start_i <= x < end_i for some i.
-
-    Ranges are encoded as single integers (start << 32 | end), not as tuples.
-    """
-
-    sorted_list = sorted(list_)
-    ranges = []
-    last_write = -1
-    for i in range(len(sorted_list)):
-        if i + 1 < len(sorted_list):
-            if sorted_list[i] == sorted_list[i + 1] - 1:
-                continue
-        current_range = sorted_list[last_write + 1 : i + 1]
-        ranges.append(_encode_range(current_range[0], current_range[-1] + 1))
-        last_write = i
-
-    return tuple(ranges)
-
-
-def _encode_range(start: int, end: int) -> int:
-    return (start << 32) | end
-
-
-def _decode_range(r: int) -> Tuple[int, int]:
-    return (r >> 32), (r & ((1 << 32) - 1))
-
-
-def intranges_contain(int_: int, ranges: Tuple[int, ...]) -> bool:
-    """Determine if `int_` falls into one of the ranges in `ranges`."""
-    tuple_ = _encode_range(int_, 0)
-    pos = bisect.bisect_left(ranges, tuple_)
-    # we could be immediately ahead of a tuple (start, end)
-    # with start < int_ <= end
-    if pos > 0:
-        left, right = _decode_range(ranges[pos - 1])
-        if left <= int_ < right:
-            return True
-    # or we could be immediately behind a tuple (int_, end)
-    if pos < len(ranges):
-        left, _ = _decode_range(ranges[pos])
-        if left == int_:
-            return True
-    return False
diff --git a/lib/idna/package_data.py b/lib/idna/package_data.py
deleted file mode 100644
index 514ff7e2..00000000
--- a/lib/idna/package_data.py
+++ /dev/null
@@ -1 +0,0 @@
-__version__ = "3.10"
diff --git a/lib/idna/py.typed b/lib/idna/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/idna/uts46data.py b/lib/idna/uts46data.py
deleted file mode 100644
index eb894327..00000000
--- a/lib/idna/uts46data.py
+++ /dev/null
@@ -1,8681 +0,0 @@
-# This file is automatically generated by tools/idna-data
-# vim: set fileencoding=utf-8 :
-
-from typing import List, Tuple, Union
-
-"""IDNA Mapping Table from UTS46."""
-
-
-__version__ = "15.1.0"
-
-
-def _seg_0() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x0, "3"),
-        (0x1, "3"),
-        (0x2, "3"),
-        (0x3, "3"),
-        (0x4, "3"),
-        (0x5, "3"),
-        (0x6, "3"),
-        (0x7, "3"),
-        (0x8, "3"),
-        (0x9, "3"),
-        (0xA, "3"),
-        (0xB, "3"),
-        (0xC, "3"),
-        (0xD, "3"),
-        (0xE, "3"),
-        (0xF, "3"),
-        (0x10, "3"),
-        (0x11, "3"),
-        (0x12, "3"),
-        (0x13, "3"),
-        (0x14, "3"),
-        (0x15, "3"),
-        (0x16, "3"),
-        (0x17, "3"),
-        (0x18, "3"),
-        (0x19, "3"),
-        (0x1A, "3"),
-        (0x1B, "3"),
-        (0x1C, "3"),
-        (0x1D, "3"),
-        (0x1E, "3"),
-        (0x1F, "3"),
-        (0x20, "3"),
-        (0x21, "3"),
-        (0x22, "3"),
-        (0x23, "3"),
-        (0x24, "3"),
-        (0x25, "3"),
-        (0x26, "3"),
-        (0x27, "3"),
-        (0x28, "3"),
-        (0x29, "3"),
-        (0x2A, "3"),
-        (0x2B, "3"),
-        (0x2C, "3"),
-        (0x2D, "V"),
-        (0x2E, "V"),
-        (0x2F, "3"),
-        (0x30, "V"),
-        (0x31, "V"),
-        (0x32, "V"),
-        (0x33, "V"),
-        (0x34, "V"),
-        (0x35, "V"),
-        (0x36, "V"),
-        (0x37, "V"),
-        (0x38, "V"),
-        (0x39, "V"),
-        (0x3A, "3"),
-        (0x3B, "3"),
-        (0x3C, "3"),
-        (0x3D, "3"),
-        (0x3E, "3"),
-        (0x3F, "3"),
-        (0x40, "3"),
-        (0x41, "M", "a"),
-        (0x42, "M", "b"),
-        (0x43, "M", "c"),
-        (0x44, "M", "d"),
-        (0x45, "M", "e"),
-        (0x46, "M", "f"),
-        (0x47, "M", "g"),
-        (0x48, "M", "h"),
-        (0x49, "M", "i"),
-        (0x4A, "M", "j"),
-        (0x4B, "M", "k"),
-        (0x4C, "M", "l"),
-        (0x4D, "M", "m"),
-        (0x4E, "M", "n"),
-        (0x4F, "M", "o"),
-        (0x50, "M", "p"),
-        (0x51, "M", "q"),
-        (0x52, "M", "r"),
-        (0x53, "M", "s"),
-        (0x54, "M", "t"),
-        (0x55, "M", "u"),
-        (0x56, "M", "v"),
-        (0x57, "M", "w"),
-        (0x58, "M", "x"),
-        (0x59, "M", "y"),
-        (0x5A, "M", "z"),
-        (0x5B, "3"),
-        (0x5C, "3"),
-        (0x5D, "3"),
-        (0x5E, "3"),
-        (0x5F, "3"),
-        (0x60, "3"),
-        (0x61, "V"),
-        (0x62, "V"),
-        (0x63, "V"),
-    ]
-
-
-def _seg_1() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x64, "V"),
-        (0x65, "V"),
-        (0x66, "V"),
-        (0x67, "V"),
-        (0x68, "V"),
-        (0x69, "V"),
-        (0x6A, "V"),
-        (0x6B, "V"),
-        (0x6C, "V"),
-        (0x6D, "V"),
-        (0x6E, "V"),
-        (0x6F, "V"),
-        (0x70, "V"),
-        (0x71, "V"),
-        (0x72, "V"),
-        (0x73, "V"),
-        (0x74, "V"),
-        (0x75, "V"),
-        (0x76, "V"),
-        (0x77, "V"),
-        (0x78, "V"),
-        (0x79, "V"),
-        (0x7A, "V"),
-        (0x7B, "3"),
-        (0x7C, "3"),
-        (0x7D, "3"),
-        (0x7E, "3"),
-        (0x7F, "3"),
-        (0x80, "X"),
-        (0x81, "X"),
-        (0x82, "X"),
-        (0x83, "X"),
-        (0x84, "X"),
-        (0x85, "X"),
-        (0x86, "X"),
-        (0x87, "X"),
-        (0x88, "X"),
-        (0x89, "X"),
-        (0x8A, "X"),
-        (0x8B, "X"),
-        (0x8C, "X"),
-        (0x8D, "X"),
-        (0x8E, "X"),
-        (0x8F, "X"),
-        (0x90, "X"),
-        (0x91, "X"),
-        (0x92, "X"),
-        (0x93, "X"),
-        (0x94, "X"),
-        (0x95, "X"),
-        (0x96, "X"),
-        (0x97, "X"),
-        (0x98, "X"),
-        (0x99, "X"),
-        (0x9A, "X"),
-        (0x9B, "X"),
-        (0x9C, "X"),
-        (0x9D, "X"),
-        (0x9E, "X"),
-        (0x9F, "X"),
-        (0xA0, "3", " "),
-        (0xA1, "V"),
-        (0xA2, "V"),
-        (0xA3, "V"),
-        (0xA4, "V"),
-        (0xA5, "V"),
-        (0xA6, "V"),
-        (0xA7, "V"),
-        (0xA8, "3", " ̈"),
-        (0xA9, "V"),
-        (0xAA, "M", "a"),
-        (0xAB, "V"),
-        (0xAC, "V"),
-        (0xAD, "I"),
-        (0xAE, "V"),
-        (0xAF, "3", " Ì„"),
-        (0xB0, "V"),
-        (0xB1, "V"),
-        (0xB2, "M", "2"),
-        (0xB3, "M", "3"),
-        (0xB4, "3", " �"),
-        (0xB5, "M", "μ"),
-        (0xB6, "V"),
-        (0xB7, "V"),
-        (0xB8, "3", " ̧"),
-        (0xB9, "M", "1"),
-        (0xBA, "M", "o"),
-        (0xBB, "V"),
-        (0xBC, "M", "1�4"),
-        (0xBD, "M", "1�2"),
-        (0xBE, "M", "3�4"),
-        (0xBF, "V"),
-        (0xC0, "M", "à"),
-        (0xC1, "M", "á"),
-        (0xC2, "M", "â"),
-        (0xC3, "M", "ã"),
-        (0xC4, "M", "ä"),
-        (0xC5, "M", "Ã¥"),
-        (0xC6, "M", "æ"),
-        (0xC7, "M", "ç"),
-    ]
-
-
-def _seg_2() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xC8, "M", "è"),
-        (0xC9, "M", "é"),
-        (0xCA, "M", "ê"),
-        (0xCB, "M", "ë"),
-        (0xCC, "M", "ì"),
-        (0xCD, "M", "í"),
-        (0xCE, "M", "î"),
-        (0xCF, "M", "ï"),
-        (0xD0, "M", "ð"),
-        (0xD1, "M", "ñ"),
-        (0xD2, "M", "ò"),
-        (0xD3, "M", "ó"),
-        (0xD4, "M", "ô"),
-        (0xD5, "M", "õ"),
-        (0xD6, "M", "ö"),
-        (0xD7, "V"),
-        (0xD8, "M", "ø"),
-        (0xD9, "M", "ù"),
-        (0xDA, "M", "ú"),
-        (0xDB, "M", "û"),
-        (0xDC, "M", "ü"),
-        (0xDD, "M", "ý"),
-        (0xDE, "M", "þ"),
-        (0xDF, "D", "ss"),
-        (0xE0, "V"),
-        (0xE1, "V"),
-        (0xE2, "V"),
-        (0xE3, "V"),
-        (0xE4, "V"),
-        (0xE5, "V"),
-        (0xE6, "V"),
-        (0xE7, "V"),
-        (0xE8, "V"),
-        (0xE9, "V"),
-        (0xEA, "V"),
-        (0xEB, "V"),
-        (0xEC, "V"),
-        (0xED, "V"),
-        (0xEE, "V"),
-        (0xEF, "V"),
-        (0xF0, "V"),
-        (0xF1, "V"),
-        (0xF2, "V"),
-        (0xF3, "V"),
-        (0xF4, "V"),
-        (0xF5, "V"),
-        (0xF6, "V"),
-        (0xF7, "V"),
-        (0xF8, "V"),
-        (0xF9, "V"),
-        (0xFA, "V"),
-        (0xFB, "V"),
-        (0xFC, "V"),
-        (0xFD, "V"),
-        (0xFE, "V"),
-        (0xFF, "V"),
-        (0x100, "M", "�"),
-        (0x101, "V"),
-        (0x102, "M", "ă"),
-        (0x103, "V"),
-        (0x104, "M", "Ä…"),
-        (0x105, "V"),
-        (0x106, "M", "ć"),
-        (0x107, "V"),
-        (0x108, "M", "ĉ"),
-        (0x109, "V"),
-        (0x10A, "M", "Ä‹"),
-        (0x10B, "V"),
-        (0x10C, "M", "�"),
-        (0x10D, "V"),
-        (0x10E, "M", "�"),
-        (0x10F, "V"),
-        (0x110, "M", "Ä‘"),
-        (0x111, "V"),
-        (0x112, "M", "Ä“"),
-        (0x113, "V"),
-        (0x114, "M", "Ä•"),
-        (0x115, "V"),
-        (0x116, "M", "Ä—"),
-        (0x117, "V"),
-        (0x118, "M", "Ä™"),
-        (0x119, "V"),
-        (0x11A, "M", "Ä›"),
-        (0x11B, "V"),
-        (0x11C, "M", "�"),
-        (0x11D, "V"),
-        (0x11E, "M", "ÄŸ"),
-        (0x11F, "V"),
-        (0x120, "M", "Ä¡"),
-        (0x121, "V"),
-        (0x122, "M", "Ä£"),
-        (0x123, "V"),
-        (0x124, "M", "Ä¥"),
-        (0x125, "V"),
-        (0x126, "M", "ħ"),
-        (0x127, "V"),
-        (0x128, "M", "Ä©"),
-        (0x129, "V"),
-        (0x12A, "M", "Ä«"),
-        (0x12B, "V"),
-    ]
-
-
-def _seg_3() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x12C, "M", "Ä­"),
-        (0x12D, "V"),
-        (0x12E, "M", "į"),
-        (0x12F, "V"),
-        (0x130, "M", "i̇"),
-        (0x131, "V"),
-        (0x132, "M", "ij"),
-        (0x134, "M", "ĵ"),
-        (0x135, "V"),
-        (0x136, "M", "Ä·"),
-        (0x137, "V"),
-        (0x139, "M", "ĺ"),
-        (0x13A, "V"),
-        (0x13B, "M", "ļ"),
-        (0x13C, "V"),
-        (0x13D, "M", "ľ"),
-        (0x13E, "V"),
-        (0x13F, "M", "l·"),
-        (0x141, "M", "Å‚"),
-        (0x142, "V"),
-        (0x143, "M", "Å„"),
-        (0x144, "V"),
-        (0x145, "M", "ņ"),
-        (0x146, "V"),
-        (0x147, "M", "ň"),
-        (0x148, "V"),
-        (0x149, "M", "ʼn"),
-        (0x14A, "M", "Å‹"),
-        (0x14B, "V"),
-        (0x14C, "M", "�"),
-        (0x14D, "V"),
-        (0x14E, "M", "�"),
-        (0x14F, "V"),
-        (0x150, "M", "Å‘"),
-        (0x151, "V"),
-        (0x152, "M", "Å“"),
-        (0x153, "V"),
-        (0x154, "M", "Å•"),
-        (0x155, "V"),
-        (0x156, "M", "Å—"),
-        (0x157, "V"),
-        (0x158, "M", "Å™"),
-        (0x159, "V"),
-        (0x15A, "M", "Å›"),
-        (0x15B, "V"),
-        (0x15C, "M", "�"),
-        (0x15D, "V"),
-        (0x15E, "M", "ÅŸ"),
-        (0x15F, "V"),
-        (0x160, "M", "Å¡"),
-        (0x161, "V"),
-        (0x162, "M", "Å£"),
-        (0x163, "V"),
-        (0x164, "M", "Å¥"),
-        (0x165, "V"),
-        (0x166, "M", "ŧ"),
-        (0x167, "V"),
-        (0x168, "M", "Å©"),
-        (0x169, "V"),
-        (0x16A, "M", "Å«"),
-        (0x16B, "V"),
-        (0x16C, "M", "Å­"),
-        (0x16D, "V"),
-        (0x16E, "M", "ů"),
-        (0x16F, "V"),
-        (0x170, "M", "ű"),
-        (0x171, "V"),
-        (0x172, "M", "ų"),
-        (0x173, "V"),
-        (0x174, "M", "ŵ"),
-        (0x175, "V"),
-        (0x176, "M", "Å·"),
-        (0x177, "V"),
-        (0x178, "M", "ÿ"),
-        (0x179, "M", "ź"),
-        (0x17A, "V"),
-        (0x17B, "M", "ż"),
-        (0x17C, "V"),
-        (0x17D, "M", "ž"),
-        (0x17E, "V"),
-        (0x17F, "M", "s"),
-        (0x180, "V"),
-        (0x181, "M", "É“"),
-        (0x182, "M", "ƃ"),
-        (0x183, "V"),
-        (0x184, "M", "Æ…"),
-        (0x185, "V"),
-        (0x186, "M", "É”"),
-        (0x187, "M", "ƈ"),
-        (0x188, "V"),
-        (0x189, "M", "É–"),
-        (0x18A, "M", "É—"),
-        (0x18B, "M", "ƌ"),
-        (0x18C, "V"),
-        (0x18E, "M", "�"),
-        (0x18F, "M", "É™"),
-        (0x190, "M", "É›"),
-        (0x191, "M", "Æ’"),
-        (0x192, "V"),
-        (0x193, "M", "É "),
-    ]
-
-
-def _seg_4() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x194, "M", "É£"),
-        (0x195, "V"),
-        (0x196, "M", "É©"),
-        (0x197, "M", "ɨ"),
-        (0x198, "M", "Æ™"),
-        (0x199, "V"),
-        (0x19C, "M", "ɯ"),
-        (0x19D, "M", "ɲ"),
-        (0x19E, "V"),
-        (0x19F, "M", "ɵ"),
-        (0x1A0, "M", "Æ¡"),
-        (0x1A1, "V"),
-        (0x1A2, "M", "Æ£"),
-        (0x1A3, "V"),
-        (0x1A4, "M", "Æ¥"),
-        (0x1A5, "V"),
-        (0x1A6, "M", "Ê€"),
-        (0x1A7, "M", "ƨ"),
-        (0x1A8, "V"),
-        (0x1A9, "M", "ʃ"),
-        (0x1AA, "V"),
-        (0x1AC, "M", "Æ­"),
-        (0x1AD, "V"),
-        (0x1AE, "M", "ʈ"),
-        (0x1AF, "M", "Æ°"),
-        (0x1B0, "V"),
-        (0x1B1, "M", "ÊŠ"),
-        (0x1B2, "M", "Ê‹"),
-        (0x1B3, "M", "Æ´"),
-        (0x1B4, "V"),
-        (0x1B5, "M", "ƶ"),
-        (0x1B6, "V"),
-        (0x1B7, "M", "Ê’"),
-        (0x1B8, "M", "ƹ"),
-        (0x1B9, "V"),
-        (0x1BC, "M", "ƽ"),
-        (0x1BD, "V"),
-        (0x1C4, "M", "dž"),
-        (0x1C7, "M", "lj"),
-        (0x1CA, "M", "nj"),
-        (0x1CD, "M", "ÇŽ"),
-        (0x1CE, "V"),
-        (0x1CF, "M", "�"),
-        (0x1D0, "V"),
-        (0x1D1, "M", "Ç’"),
-        (0x1D2, "V"),
-        (0x1D3, "M", "Ç”"),
-        (0x1D4, "V"),
-        (0x1D5, "M", "Ç–"),
-        (0x1D6, "V"),
-        (0x1D7, "M", "ǘ"),
-        (0x1D8, "V"),
-        (0x1D9, "M", "Çš"),
-        (0x1DA, "V"),
-        (0x1DB, "M", "ǜ"),
-        (0x1DC, "V"),
-        (0x1DE, "M", "ÇŸ"),
-        (0x1DF, "V"),
-        (0x1E0, "M", "Ç¡"),
-        (0x1E1, "V"),
-        (0x1E2, "M", "Ç£"),
-        (0x1E3, "V"),
-        (0x1E4, "M", "Ç¥"),
-        (0x1E5, "V"),
-        (0x1E6, "M", "ǧ"),
-        (0x1E7, "V"),
-        (0x1E8, "M", "Ç©"),
-        (0x1E9, "V"),
-        (0x1EA, "M", "Ç«"),
-        (0x1EB, "V"),
-        (0x1EC, "M", "Ç­"),
-        (0x1ED, "V"),
-        (0x1EE, "M", "ǯ"),
-        (0x1EF, "V"),
-        (0x1F1, "M", "dz"),
-        (0x1F4, "M", "ǵ"),
-        (0x1F5, "V"),
-        (0x1F6, "M", "Æ•"),
-        (0x1F7, "M", "Æ¿"),
-        (0x1F8, "M", "ǹ"),
-        (0x1F9, "V"),
-        (0x1FA, "M", "Ç»"),
-        (0x1FB, "V"),
-        (0x1FC, "M", "ǽ"),
-        (0x1FD, "V"),
-        (0x1FE, "M", "Ç¿"),
-        (0x1FF, "V"),
-        (0x200, "M", "�"),
-        (0x201, "V"),
-        (0x202, "M", "ȃ"),
-        (0x203, "V"),
-        (0x204, "M", "È…"),
-        (0x205, "V"),
-        (0x206, "M", "ȇ"),
-        (0x207, "V"),
-        (0x208, "M", "ȉ"),
-        (0x209, "V"),
-        (0x20A, "M", "È‹"),
-        (0x20B, "V"),
-        (0x20C, "M", "�"),
-    ]
-
-
-def _seg_5() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x20D, "V"),
-        (0x20E, "M", "�"),
-        (0x20F, "V"),
-        (0x210, "M", "È‘"),
-        (0x211, "V"),
-        (0x212, "M", "È“"),
-        (0x213, "V"),
-        (0x214, "M", "È•"),
-        (0x215, "V"),
-        (0x216, "M", "È—"),
-        (0x217, "V"),
-        (0x218, "M", "È™"),
-        (0x219, "V"),
-        (0x21A, "M", "È›"),
-        (0x21B, "V"),
-        (0x21C, "M", "�"),
-        (0x21D, "V"),
-        (0x21E, "M", "ÈŸ"),
-        (0x21F, "V"),
-        (0x220, "M", "Æž"),
-        (0x221, "V"),
-        (0x222, "M", "È£"),
-        (0x223, "V"),
-        (0x224, "M", "È¥"),
-        (0x225, "V"),
-        (0x226, "M", "ȧ"),
-        (0x227, "V"),
-        (0x228, "M", "È©"),
-        (0x229, "V"),
-        (0x22A, "M", "È«"),
-        (0x22B, "V"),
-        (0x22C, "M", "È­"),
-        (0x22D, "V"),
-        (0x22E, "M", "ȯ"),
-        (0x22F, "V"),
-        (0x230, "M", "ȱ"),
-        (0x231, "V"),
-        (0x232, "M", "ȳ"),
-        (0x233, "V"),
-        (0x23A, "M", "â±¥"),
-        (0x23B, "M", "ȼ"),
-        (0x23C, "V"),
-        (0x23D, "M", "Æš"),
-        (0x23E, "M", "ⱦ"),
-        (0x23F, "V"),
-        (0x241, "M", "É‚"),
-        (0x242, "V"),
-        (0x243, "M", "Æ€"),
-        (0x244, "M", "ʉ"),
-        (0x245, "M", "ʌ"),
-        (0x246, "M", "ɇ"),
-        (0x247, "V"),
-        (0x248, "M", "ɉ"),
-        (0x249, "V"),
-        (0x24A, "M", "É‹"),
-        (0x24B, "V"),
-        (0x24C, "M", "�"),
-        (0x24D, "V"),
-        (0x24E, "M", "�"),
-        (0x24F, "V"),
-        (0x2B0, "M", "h"),
-        (0x2B1, "M", "ɦ"),
-        (0x2B2, "M", "j"),
-        (0x2B3, "M", "r"),
-        (0x2B4, "M", "ɹ"),
-        (0x2B5, "M", "É»"),
-        (0x2B6, "M", "�"),
-        (0x2B7, "M", "w"),
-        (0x2B8, "M", "y"),
-        (0x2B9, "V"),
-        (0x2D8, "3", " ̆"),
-        (0x2D9, "3", " ̇"),
-        (0x2DA, "3", " ÌŠ"),
-        (0x2DB, "3", " ̨"),
-        (0x2DC, "3", " ̃"),
-        (0x2DD, "3", " Ì‹"),
-        (0x2DE, "V"),
-        (0x2E0, "M", "É£"),
-        (0x2E1, "M", "l"),
-        (0x2E2, "M", "s"),
-        (0x2E3, "M", "x"),
-        (0x2E4, "M", "Ê•"),
-        (0x2E5, "V"),
-        (0x340, "M", "Ì€"),
-        (0x341, "M", "�"),
-        (0x342, "V"),
-        (0x343, "M", "Ì“"),
-        (0x344, "M", "̈�"),
-        (0x345, "M", "ι"),
-        (0x346, "V"),
-        (0x34F, "I"),
-        (0x350, "V"),
-        (0x370, "M", "ͱ"),
-        (0x371, "V"),
-        (0x372, "M", "ͳ"),
-        (0x373, "V"),
-        (0x374, "M", "ʹ"),
-        (0x375, "V"),
-        (0x376, "M", "Í·"),
-        (0x377, "V"),
-    ]
-
-
-def _seg_6() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x378, "X"),
-        (0x37A, "3", " ι"),
-        (0x37B, "V"),
-        (0x37E, "3", ";"),
-        (0x37F, "M", "ϳ"),
-        (0x380, "X"),
-        (0x384, "3", " �"),
-        (0x385, "3", " ̈�"),
-        (0x386, "M", "ά"),
-        (0x387, "M", "·"),
-        (0x388, "M", "έ"),
-        (0x389, "M", "ή"),
-        (0x38A, "M", "ί"),
-        (0x38B, "X"),
-        (0x38C, "M", "ό"),
-        (0x38D, "X"),
-        (0x38E, "M", "�"),
-        (0x38F, "M", "ÏŽ"),
-        (0x390, "V"),
-        (0x391, "M", "α"),
-        (0x392, "M", "β"),
-        (0x393, "M", "γ"),
-        (0x394, "M", "δ"),
-        (0x395, "M", "ε"),
-        (0x396, "M", "ζ"),
-        (0x397, "M", "η"),
-        (0x398, "M", "θ"),
-        (0x399, "M", "ι"),
-        (0x39A, "M", "κ"),
-        (0x39B, "M", "λ"),
-        (0x39C, "M", "μ"),
-        (0x39D, "M", "ν"),
-        (0x39E, "M", "ξ"),
-        (0x39F, "M", "ο"),
-        (0x3A0, "M", "Ï€"),
-        (0x3A1, "M", "�"),
-        (0x3A2, "X"),
-        (0x3A3, "M", "σ"),
-        (0x3A4, "M", "Ï„"),
-        (0x3A5, "M", "Ï…"),
-        (0x3A6, "M", "φ"),
-        (0x3A7, "M", "χ"),
-        (0x3A8, "M", "ψ"),
-        (0x3A9, "M", "ω"),
-        (0x3AA, "M", "ÏŠ"),
-        (0x3AB, "M", "Ï‹"),
-        (0x3AC, "V"),
-        (0x3C2, "D", "σ"),
-        (0x3C3, "V"),
-        (0x3CF, "M", "Ï—"),
-        (0x3D0, "M", "β"),
-        (0x3D1, "M", "θ"),
-        (0x3D2, "M", "Ï…"),
-        (0x3D3, "M", "�"),
-        (0x3D4, "M", "Ï‹"),
-        (0x3D5, "M", "φ"),
-        (0x3D6, "M", "Ï€"),
-        (0x3D7, "V"),
-        (0x3D8, "M", "Ï™"),
-        (0x3D9, "V"),
-        (0x3DA, "M", "Ï›"),
-        (0x3DB, "V"),
-        (0x3DC, "M", "�"),
-        (0x3DD, "V"),
-        (0x3DE, "M", "ÏŸ"),
-        (0x3DF, "V"),
-        (0x3E0, "M", "Ï¡"),
-        (0x3E1, "V"),
-        (0x3E2, "M", "Ï£"),
-        (0x3E3, "V"),
-        (0x3E4, "M", "Ï¥"),
-        (0x3E5, "V"),
-        (0x3E6, "M", "ϧ"),
-        (0x3E7, "V"),
-        (0x3E8, "M", "Ï©"),
-        (0x3E9, "V"),
-        (0x3EA, "M", "Ï«"),
-        (0x3EB, "V"),
-        (0x3EC, "M", "Ï­"),
-        (0x3ED, "V"),
-        (0x3EE, "M", "ϯ"),
-        (0x3EF, "V"),
-        (0x3F0, "M", "κ"),
-        (0x3F1, "M", "�"),
-        (0x3F2, "M", "σ"),
-        (0x3F3, "V"),
-        (0x3F4, "M", "θ"),
-        (0x3F5, "M", "ε"),
-        (0x3F6, "V"),
-        (0x3F7, "M", "ϸ"),
-        (0x3F8, "V"),
-        (0x3F9, "M", "σ"),
-        (0x3FA, "M", "Ï»"),
-        (0x3FB, "V"),
-        (0x3FD, "M", "Í»"),
-        (0x3FE, "M", "ͼ"),
-        (0x3FF, "M", "ͽ"),
-        (0x400, "M", "�"),
-        (0x401, "M", "Ñ‘"),
-        (0x402, "M", "Ñ’"),
-    ]
-
-
-def _seg_7() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x403, "M", "Ñ“"),
-        (0x404, "M", "Ñ”"),
-        (0x405, "M", "Ñ•"),
-        (0x406, "M", "Ñ–"),
-        (0x407, "M", "Ñ—"),
-        (0x408, "M", "ј"),
-        (0x409, "M", "Ñ™"),
-        (0x40A, "M", "Ñš"),
-        (0x40B, "M", "Ñ›"),
-        (0x40C, "M", "ќ"),
-        (0x40D, "M", "�"),
-        (0x40E, "M", "Ñž"),
-        (0x40F, "M", "ÑŸ"),
-        (0x410, "M", "а"),
-        (0x411, "M", "б"),
-        (0x412, "M", "в"),
-        (0x413, "M", "г"),
-        (0x414, "M", "д"),
-        (0x415, "M", "е"),
-        (0x416, "M", "ж"),
-        (0x417, "M", "з"),
-        (0x418, "M", "и"),
-        (0x419, "M", "й"),
-        (0x41A, "M", "к"),
-        (0x41B, "M", "л"),
-        (0x41C, "M", "м"),
-        (0x41D, "M", "н"),
-        (0x41E, "M", "о"),
-        (0x41F, "M", "п"),
-        (0x420, "M", "Ñ€"),
-        (0x421, "M", "�"),
-        (0x422, "M", "Ñ‚"),
-        (0x423, "M", "у"),
-        (0x424, "M", "Ñ„"),
-        (0x425, "M", "Ñ…"),
-        (0x426, "M", "ц"),
-        (0x427, "M", "ч"),
-        (0x428, "M", "ш"),
-        (0x429, "M", "щ"),
-        (0x42A, "M", "ÑŠ"),
-        (0x42B, "M", "Ñ‹"),
-        (0x42C, "M", "ь"),
-        (0x42D, "M", "�"),
-        (0x42E, "M", "ÑŽ"),
-        (0x42F, "M", "�"),
-        (0x430, "V"),
-        (0x460, "M", "Ñ¡"),
-        (0x461, "V"),
-        (0x462, "M", "Ñ£"),
-        (0x463, "V"),
-        (0x464, "M", "Ñ¥"),
-        (0x465, "V"),
-        (0x466, "M", "ѧ"),
-        (0x467, "V"),
-        (0x468, "M", "Ñ©"),
-        (0x469, "V"),
-        (0x46A, "M", "Ñ«"),
-        (0x46B, "V"),
-        (0x46C, "M", "Ñ­"),
-        (0x46D, "V"),
-        (0x46E, "M", "ѯ"),
-        (0x46F, "V"),
-        (0x470, "M", "ѱ"),
-        (0x471, "V"),
-        (0x472, "M", "ѳ"),
-        (0x473, "V"),
-        (0x474, "M", "ѵ"),
-        (0x475, "V"),
-        (0x476, "M", "Ñ·"),
-        (0x477, "V"),
-        (0x478, "M", "ѹ"),
-        (0x479, "V"),
-        (0x47A, "M", "Ñ»"),
-        (0x47B, "V"),
-        (0x47C, "M", "ѽ"),
-        (0x47D, "V"),
-        (0x47E, "M", "Ñ¿"),
-        (0x47F, "V"),
-        (0x480, "M", "Ò�"),
-        (0x481, "V"),
-        (0x48A, "M", "Ò‹"),
-        (0x48B, "V"),
-        (0x48C, "M", "Ò�"),
-        (0x48D, "V"),
-        (0x48E, "M", "Ò�"),
-        (0x48F, "V"),
-        (0x490, "M", "Ò‘"),
-        (0x491, "V"),
-        (0x492, "M", "Ò“"),
-        (0x493, "V"),
-        (0x494, "M", "Ò•"),
-        (0x495, "V"),
-        (0x496, "M", "Ò—"),
-        (0x497, "V"),
-        (0x498, "M", "Ò™"),
-        (0x499, "V"),
-        (0x49A, "M", "Ò›"),
-        (0x49B, "V"),
-        (0x49C, "M", "Ò�"),
-        (0x49D, "V"),
-    ]
-
-
-def _seg_8() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x49E, "M", "ÒŸ"),
-        (0x49F, "V"),
-        (0x4A0, "M", "Ò¡"),
-        (0x4A1, "V"),
-        (0x4A2, "M", "Ò£"),
-        (0x4A3, "V"),
-        (0x4A4, "M", "Ò¥"),
-        (0x4A5, "V"),
-        (0x4A6, "M", "Ò§"),
-        (0x4A7, "V"),
-        (0x4A8, "M", "Ò©"),
-        (0x4A9, "V"),
-        (0x4AA, "M", "Ò«"),
-        (0x4AB, "V"),
-        (0x4AC, "M", "Ò­"),
-        (0x4AD, "V"),
-        (0x4AE, "M", "Ò¯"),
-        (0x4AF, "V"),
-        (0x4B0, "M", "Ò±"),
-        (0x4B1, "V"),
-        (0x4B2, "M", "Ò³"),
-        (0x4B3, "V"),
-        (0x4B4, "M", "Òµ"),
-        (0x4B5, "V"),
-        (0x4B6, "M", "Ò·"),
-        (0x4B7, "V"),
-        (0x4B8, "M", "Ò¹"),
-        (0x4B9, "V"),
-        (0x4BA, "M", "Ò»"),
-        (0x4BB, "V"),
-        (0x4BC, "M", "Ò½"),
-        (0x4BD, "V"),
-        (0x4BE, "M", "Ò¿"),
-        (0x4BF, "V"),
-        (0x4C0, "X"),
-        (0x4C1, "M", "Ó‚"),
-        (0x4C2, "V"),
-        (0x4C3, "M", "Ó„"),
-        (0x4C4, "V"),
-        (0x4C5, "M", "Ó†"),
-        (0x4C6, "V"),
-        (0x4C7, "M", "Óˆ"),
-        (0x4C8, "V"),
-        (0x4C9, "M", "ÓŠ"),
-        (0x4CA, "V"),
-        (0x4CB, "M", "ӌ"),
-        (0x4CC, "V"),
-        (0x4CD, "M", "ÓŽ"),
-        (0x4CE, "V"),
-        (0x4D0, "M", "Ó‘"),
-        (0x4D1, "V"),
-        (0x4D2, "M", "Ó“"),
-        (0x4D3, "V"),
-        (0x4D4, "M", "Ó•"),
-        (0x4D5, "V"),
-        (0x4D6, "M", "Ó—"),
-        (0x4D7, "V"),
-        (0x4D8, "M", "Ó™"),
-        (0x4D9, "V"),
-        (0x4DA, "M", "Ó›"),
-        (0x4DB, "V"),
-        (0x4DC, "M", "Ó�"),
-        (0x4DD, "V"),
-        (0x4DE, "M", "ÓŸ"),
-        (0x4DF, "V"),
-        (0x4E0, "M", "Ó¡"),
-        (0x4E1, "V"),
-        (0x4E2, "M", "Ó£"),
-        (0x4E3, "V"),
-        (0x4E4, "M", "Ó¥"),
-        (0x4E5, "V"),
-        (0x4E6, "M", "Ó§"),
-        (0x4E7, "V"),
-        (0x4E8, "M", "Ó©"),
-        (0x4E9, "V"),
-        (0x4EA, "M", "Ó«"),
-        (0x4EB, "V"),
-        (0x4EC, "M", "Ó­"),
-        (0x4ED, "V"),
-        (0x4EE, "M", "Ó¯"),
-        (0x4EF, "V"),
-        (0x4F0, "M", "Ó±"),
-        (0x4F1, "V"),
-        (0x4F2, "M", "Ó³"),
-        (0x4F3, "V"),
-        (0x4F4, "M", "Óµ"),
-        (0x4F5, "V"),
-        (0x4F6, "M", "Ó·"),
-        (0x4F7, "V"),
-        (0x4F8, "M", "Ó¹"),
-        (0x4F9, "V"),
-        (0x4FA, "M", "Ó»"),
-        (0x4FB, "V"),
-        (0x4FC, "M", "Ó½"),
-        (0x4FD, "V"),
-        (0x4FE, "M", "Ó¿"),
-        (0x4FF, "V"),
-        (0x500, "M", "Ô�"),
-        (0x501, "V"),
-        (0x502, "M", "Ôƒ"),
-    ]
-
-
-def _seg_9() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x503, "V"),
-        (0x504, "M", "Ô…"),
-        (0x505, "V"),
-        (0x506, "M", "Ô‡"),
-        (0x507, "V"),
-        (0x508, "M", "Ô‰"),
-        (0x509, "V"),
-        (0x50A, "M", "Ô‹"),
-        (0x50B, "V"),
-        (0x50C, "M", "Ô�"),
-        (0x50D, "V"),
-        (0x50E, "M", "Ô�"),
-        (0x50F, "V"),
-        (0x510, "M", "Ô‘"),
-        (0x511, "V"),
-        (0x512, "M", "Ô“"),
-        (0x513, "V"),
-        (0x514, "M", "Ô•"),
-        (0x515, "V"),
-        (0x516, "M", "Ô—"),
-        (0x517, "V"),
-        (0x518, "M", "Ô™"),
-        (0x519, "V"),
-        (0x51A, "M", "Ô›"),
-        (0x51B, "V"),
-        (0x51C, "M", "Ô�"),
-        (0x51D, "V"),
-        (0x51E, "M", "ÔŸ"),
-        (0x51F, "V"),
-        (0x520, "M", "Ô¡"),
-        (0x521, "V"),
-        (0x522, "M", "Ô£"),
-        (0x523, "V"),
-        (0x524, "M", "Ô¥"),
-        (0x525, "V"),
-        (0x526, "M", "Ô§"),
-        (0x527, "V"),
-        (0x528, "M", "Ô©"),
-        (0x529, "V"),
-        (0x52A, "M", "Ô«"),
-        (0x52B, "V"),
-        (0x52C, "M", "Ô­"),
-        (0x52D, "V"),
-        (0x52E, "M", "Ô¯"),
-        (0x52F, "V"),
-        (0x530, "X"),
-        (0x531, "M", "Õ¡"),
-        (0x532, "M", "Õ¢"),
-        (0x533, "M", "Õ£"),
-        (0x534, "M", "Õ¤"),
-        (0x535, "M", "Õ¥"),
-        (0x536, "M", "Õ¦"),
-        (0x537, "M", "Õ§"),
-        (0x538, "M", "Õ¨"),
-        (0x539, "M", "Õ©"),
-        (0x53A, "M", "Õª"),
-        (0x53B, "M", "Õ«"),
-        (0x53C, "M", "Õ¬"),
-        (0x53D, "M", "Õ­"),
-        (0x53E, "M", "Õ®"),
-        (0x53F, "M", "Õ¯"),
-        (0x540, "M", "Õ°"),
-        (0x541, "M", "Õ±"),
-        (0x542, "M", "Õ²"),
-        (0x543, "M", "Õ³"),
-        (0x544, "M", "Õ´"),
-        (0x545, "M", "Õµ"),
-        (0x546, "M", "Õ¶"),
-        (0x547, "M", "Õ·"),
-        (0x548, "M", "Õ¸"),
-        (0x549, "M", "Õ¹"),
-        (0x54A, "M", "Õº"),
-        (0x54B, "M", "Õ»"),
-        (0x54C, "M", "Õ¼"),
-        (0x54D, "M", "Õ½"),
-        (0x54E, "M", "Õ¾"),
-        (0x54F, "M", "Õ¿"),
-        (0x550, "M", "Ö€"),
-        (0x551, "M", "Ö�"),
-        (0x552, "M", "Ö‚"),
-        (0x553, "M", "Öƒ"),
-        (0x554, "M", "Ö„"),
-        (0x555, "M", "Ö…"),
-        (0x556, "M", "Ö†"),
-        (0x557, "X"),
-        (0x559, "V"),
-        (0x587, "M", "Õ¥Ö‚"),
-        (0x588, "V"),
-        (0x58B, "X"),
-        (0x58D, "V"),
-        (0x590, "X"),
-        (0x591, "V"),
-        (0x5C8, "X"),
-        (0x5D0, "V"),
-        (0x5EB, "X"),
-        (0x5EF, "V"),
-        (0x5F5, "X"),
-        (0x606, "V"),
-        (0x61C, "X"),
-        (0x61D, "V"),
-    ]
-
-
-def _seg_10() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x675, "M", "اٴ"),
-        (0x676, "M", "وٴ"),
-        (0x677, "M", "Û‡Ù´"),
-        (0x678, "M", "يٴ"),
-        (0x679, "V"),
-        (0x6DD, "X"),
-        (0x6DE, "V"),
-        (0x70E, "X"),
-        (0x710, "V"),
-        (0x74B, "X"),
-        (0x74D, "V"),
-        (0x7B2, "X"),
-        (0x7C0, "V"),
-        (0x7FB, "X"),
-        (0x7FD, "V"),
-        (0x82E, "X"),
-        (0x830, "V"),
-        (0x83F, "X"),
-        (0x840, "V"),
-        (0x85C, "X"),
-        (0x85E, "V"),
-        (0x85F, "X"),
-        (0x860, "V"),
-        (0x86B, "X"),
-        (0x870, "V"),
-        (0x88F, "X"),
-        (0x898, "V"),
-        (0x8E2, "X"),
-        (0x8E3, "V"),
-        (0x958, "M", "क़"),
-        (0x959, "M", "ख़"),
-        (0x95A, "M", "ग़"),
-        (0x95B, "M", "ज़"),
-        (0x95C, "M", "ड़"),
-        (0x95D, "M", "ढ़"),
-        (0x95E, "M", "फ़"),
-        (0x95F, "M", "य़"),
-        (0x960, "V"),
-        (0x984, "X"),
-        (0x985, "V"),
-        (0x98D, "X"),
-        (0x98F, "V"),
-        (0x991, "X"),
-        (0x993, "V"),
-        (0x9A9, "X"),
-        (0x9AA, "V"),
-        (0x9B1, "X"),
-        (0x9B2, "V"),
-        (0x9B3, "X"),
-        (0x9B6, "V"),
-        (0x9BA, "X"),
-        (0x9BC, "V"),
-        (0x9C5, "X"),
-        (0x9C7, "V"),
-        (0x9C9, "X"),
-        (0x9CB, "V"),
-        (0x9CF, "X"),
-        (0x9D7, "V"),
-        (0x9D8, "X"),
-        (0x9DC, "M", "ড়"),
-        (0x9DD, "M", "ঢ়"),
-        (0x9DE, "X"),
-        (0x9DF, "M", "য়"),
-        (0x9E0, "V"),
-        (0x9E4, "X"),
-        (0x9E6, "V"),
-        (0x9FF, "X"),
-        (0xA01, "V"),
-        (0xA04, "X"),
-        (0xA05, "V"),
-        (0xA0B, "X"),
-        (0xA0F, "V"),
-        (0xA11, "X"),
-        (0xA13, "V"),
-        (0xA29, "X"),
-        (0xA2A, "V"),
-        (0xA31, "X"),
-        (0xA32, "V"),
-        (0xA33, "M", "ਲ਼"),
-        (0xA34, "X"),
-        (0xA35, "V"),
-        (0xA36, "M", "ਸ਼"),
-        (0xA37, "X"),
-        (0xA38, "V"),
-        (0xA3A, "X"),
-        (0xA3C, "V"),
-        (0xA3D, "X"),
-        (0xA3E, "V"),
-        (0xA43, "X"),
-        (0xA47, "V"),
-        (0xA49, "X"),
-        (0xA4B, "V"),
-        (0xA4E, "X"),
-        (0xA51, "V"),
-        (0xA52, "X"),
-        (0xA59, "M", "ਖ਼"),
-        (0xA5A, "M", "ਗ਼"),
-        (0xA5B, "M", "ਜ਼"),
-        (0xA5C, "V"),
-        (0xA5D, "X"),
-    ]
-
-
-def _seg_11() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xA5E, "M", "ਫ਼"),
-        (0xA5F, "X"),
-        (0xA66, "V"),
-        (0xA77, "X"),
-        (0xA81, "V"),
-        (0xA84, "X"),
-        (0xA85, "V"),
-        (0xA8E, "X"),
-        (0xA8F, "V"),
-        (0xA92, "X"),
-        (0xA93, "V"),
-        (0xAA9, "X"),
-        (0xAAA, "V"),
-        (0xAB1, "X"),
-        (0xAB2, "V"),
-        (0xAB4, "X"),
-        (0xAB5, "V"),
-        (0xABA, "X"),
-        (0xABC, "V"),
-        (0xAC6, "X"),
-        (0xAC7, "V"),
-        (0xACA, "X"),
-        (0xACB, "V"),
-        (0xACE, "X"),
-        (0xAD0, "V"),
-        (0xAD1, "X"),
-        (0xAE0, "V"),
-        (0xAE4, "X"),
-        (0xAE6, "V"),
-        (0xAF2, "X"),
-        (0xAF9, "V"),
-        (0xB00, "X"),
-        (0xB01, "V"),
-        (0xB04, "X"),
-        (0xB05, "V"),
-        (0xB0D, "X"),
-        (0xB0F, "V"),
-        (0xB11, "X"),
-        (0xB13, "V"),
-        (0xB29, "X"),
-        (0xB2A, "V"),
-        (0xB31, "X"),
-        (0xB32, "V"),
-        (0xB34, "X"),
-        (0xB35, "V"),
-        (0xB3A, "X"),
-        (0xB3C, "V"),
-        (0xB45, "X"),
-        (0xB47, "V"),
-        (0xB49, "X"),
-        (0xB4B, "V"),
-        (0xB4E, "X"),
-        (0xB55, "V"),
-        (0xB58, "X"),
-        (0xB5C, "M", "ଡ଼"),
-        (0xB5D, "M", "ଢ଼"),
-        (0xB5E, "X"),
-        (0xB5F, "V"),
-        (0xB64, "X"),
-        (0xB66, "V"),
-        (0xB78, "X"),
-        (0xB82, "V"),
-        (0xB84, "X"),
-        (0xB85, "V"),
-        (0xB8B, "X"),
-        (0xB8E, "V"),
-        (0xB91, "X"),
-        (0xB92, "V"),
-        (0xB96, "X"),
-        (0xB99, "V"),
-        (0xB9B, "X"),
-        (0xB9C, "V"),
-        (0xB9D, "X"),
-        (0xB9E, "V"),
-        (0xBA0, "X"),
-        (0xBA3, "V"),
-        (0xBA5, "X"),
-        (0xBA8, "V"),
-        (0xBAB, "X"),
-        (0xBAE, "V"),
-        (0xBBA, "X"),
-        (0xBBE, "V"),
-        (0xBC3, "X"),
-        (0xBC6, "V"),
-        (0xBC9, "X"),
-        (0xBCA, "V"),
-        (0xBCE, "X"),
-        (0xBD0, "V"),
-        (0xBD1, "X"),
-        (0xBD7, "V"),
-        (0xBD8, "X"),
-        (0xBE6, "V"),
-        (0xBFB, "X"),
-        (0xC00, "V"),
-        (0xC0D, "X"),
-        (0xC0E, "V"),
-        (0xC11, "X"),
-        (0xC12, "V"),
-        (0xC29, "X"),
-        (0xC2A, "V"),
-    ]
-
-
-def _seg_12() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xC3A, "X"),
-        (0xC3C, "V"),
-        (0xC45, "X"),
-        (0xC46, "V"),
-        (0xC49, "X"),
-        (0xC4A, "V"),
-        (0xC4E, "X"),
-        (0xC55, "V"),
-        (0xC57, "X"),
-        (0xC58, "V"),
-        (0xC5B, "X"),
-        (0xC5D, "V"),
-        (0xC5E, "X"),
-        (0xC60, "V"),
-        (0xC64, "X"),
-        (0xC66, "V"),
-        (0xC70, "X"),
-        (0xC77, "V"),
-        (0xC8D, "X"),
-        (0xC8E, "V"),
-        (0xC91, "X"),
-        (0xC92, "V"),
-        (0xCA9, "X"),
-        (0xCAA, "V"),
-        (0xCB4, "X"),
-        (0xCB5, "V"),
-        (0xCBA, "X"),
-        (0xCBC, "V"),
-        (0xCC5, "X"),
-        (0xCC6, "V"),
-        (0xCC9, "X"),
-        (0xCCA, "V"),
-        (0xCCE, "X"),
-        (0xCD5, "V"),
-        (0xCD7, "X"),
-        (0xCDD, "V"),
-        (0xCDF, "X"),
-        (0xCE0, "V"),
-        (0xCE4, "X"),
-        (0xCE6, "V"),
-        (0xCF0, "X"),
-        (0xCF1, "V"),
-        (0xCF4, "X"),
-        (0xD00, "V"),
-        (0xD0D, "X"),
-        (0xD0E, "V"),
-        (0xD11, "X"),
-        (0xD12, "V"),
-        (0xD45, "X"),
-        (0xD46, "V"),
-        (0xD49, "X"),
-        (0xD4A, "V"),
-        (0xD50, "X"),
-        (0xD54, "V"),
-        (0xD64, "X"),
-        (0xD66, "V"),
-        (0xD80, "X"),
-        (0xD81, "V"),
-        (0xD84, "X"),
-        (0xD85, "V"),
-        (0xD97, "X"),
-        (0xD9A, "V"),
-        (0xDB2, "X"),
-        (0xDB3, "V"),
-        (0xDBC, "X"),
-        (0xDBD, "V"),
-        (0xDBE, "X"),
-        (0xDC0, "V"),
-        (0xDC7, "X"),
-        (0xDCA, "V"),
-        (0xDCB, "X"),
-        (0xDCF, "V"),
-        (0xDD5, "X"),
-        (0xDD6, "V"),
-        (0xDD7, "X"),
-        (0xDD8, "V"),
-        (0xDE0, "X"),
-        (0xDE6, "V"),
-        (0xDF0, "X"),
-        (0xDF2, "V"),
-        (0xDF5, "X"),
-        (0xE01, "V"),
-        (0xE33, "M", "�า"),
-        (0xE34, "V"),
-        (0xE3B, "X"),
-        (0xE3F, "V"),
-        (0xE5C, "X"),
-        (0xE81, "V"),
-        (0xE83, "X"),
-        (0xE84, "V"),
-        (0xE85, "X"),
-        (0xE86, "V"),
-        (0xE8B, "X"),
-        (0xE8C, "V"),
-        (0xEA4, "X"),
-        (0xEA5, "V"),
-        (0xEA6, "X"),
-        (0xEA7, "V"),
-        (0xEB3, "M", "�າ"),
-        (0xEB4, "V"),
-    ]
-
-
-def _seg_13() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xEBE, "X"),
-        (0xEC0, "V"),
-        (0xEC5, "X"),
-        (0xEC6, "V"),
-        (0xEC7, "X"),
-        (0xEC8, "V"),
-        (0xECF, "X"),
-        (0xED0, "V"),
-        (0xEDA, "X"),
-        (0xEDC, "M", "ຫນ"),
-        (0xEDD, "M", "ຫມ"),
-        (0xEDE, "V"),
-        (0xEE0, "X"),
-        (0xF00, "V"),
-        (0xF0C, "M", "་"),
-        (0xF0D, "V"),
-        (0xF43, "M", "གྷ"),
-        (0xF44, "V"),
-        (0xF48, "X"),
-        (0xF49, "V"),
-        (0xF4D, "M", "ཌྷ"),
-        (0xF4E, "V"),
-        (0xF52, "M", "དྷ"),
-        (0xF53, "V"),
-        (0xF57, "M", "བྷ"),
-        (0xF58, "V"),
-        (0xF5C, "M", "ཛྷ"),
-        (0xF5D, "V"),
-        (0xF69, "M", "ཀྵ"),
-        (0xF6A, "V"),
-        (0xF6D, "X"),
-        (0xF71, "V"),
-        (0xF73, "M", "ཱི"),
-        (0xF74, "V"),
-        (0xF75, "M", "ཱུ"),
-        (0xF76, "M", "ྲྀ"),
-        (0xF77, "M", "ྲཱྀ"),
-        (0xF78, "M", "ླྀ"),
-        (0xF79, "M", "ླཱྀ"),
-        (0xF7A, "V"),
-        (0xF81, "M", "ཱྀ"),
-        (0xF82, "V"),
-        (0xF93, "M", "ྒྷ"),
-        (0xF94, "V"),
-        (0xF98, "X"),
-        (0xF99, "V"),
-        (0xF9D, "M", "ྜྷ"),
-        (0xF9E, "V"),
-        (0xFA2, "M", "ྡྷ"),
-        (0xFA3, "V"),
-        (0xFA7, "M", "ྦྷ"),
-        (0xFA8, "V"),
-        (0xFAC, "M", "ྫྷ"),
-        (0xFAD, "V"),
-        (0xFB9, "M", "�ྵ"),
-        (0xFBA, "V"),
-        (0xFBD, "X"),
-        (0xFBE, "V"),
-        (0xFCD, "X"),
-        (0xFCE, "V"),
-        (0xFDB, "X"),
-        (0x1000, "V"),
-        (0x10A0, "X"),
-        (0x10C7, "M", "â´§"),
-        (0x10C8, "X"),
-        (0x10CD, "M", "â´­"),
-        (0x10CE, "X"),
-        (0x10D0, "V"),
-        (0x10FC, "M", "ნ"),
-        (0x10FD, "V"),
-        (0x115F, "X"),
-        (0x1161, "V"),
-        (0x1249, "X"),
-        (0x124A, "V"),
-        (0x124E, "X"),
-        (0x1250, "V"),
-        (0x1257, "X"),
-        (0x1258, "V"),
-        (0x1259, "X"),
-        (0x125A, "V"),
-        (0x125E, "X"),
-        (0x1260, "V"),
-        (0x1289, "X"),
-        (0x128A, "V"),
-        (0x128E, "X"),
-        (0x1290, "V"),
-        (0x12B1, "X"),
-        (0x12B2, "V"),
-        (0x12B6, "X"),
-        (0x12B8, "V"),
-        (0x12BF, "X"),
-        (0x12C0, "V"),
-        (0x12C1, "X"),
-        (0x12C2, "V"),
-        (0x12C6, "X"),
-        (0x12C8, "V"),
-        (0x12D7, "X"),
-        (0x12D8, "V"),
-        (0x1311, "X"),
-        (0x1312, "V"),
-    ]
-
-
-def _seg_14() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1316, "X"),
-        (0x1318, "V"),
-        (0x135B, "X"),
-        (0x135D, "V"),
-        (0x137D, "X"),
-        (0x1380, "V"),
-        (0x139A, "X"),
-        (0x13A0, "V"),
-        (0x13F6, "X"),
-        (0x13F8, "M", "�"),
-        (0x13F9, "M", "�"),
-        (0x13FA, "M", "�"),
-        (0x13FB, "M", "�"),
-        (0x13FC, "M", "�"),
-        (0x13FD, "M", "�"),
-        (0x13FE, "X"),
-        (0x1400, "V"),
-        (0x1680, "X"),
-        (0x1681, "V"),
-        (0x169D, "X"),
-        (0x16A0, "V"),
-        (0x16F9, "X"),
-        (0x1700, "V"),
-        (0x1716, "X"),
-        (0x171F, "V"),
-        (0x1737, "X"),
-        (0x1740, "V"),
-        (0x1754, "X"),
-        (0x1760, "V"),
-        (0x176D, "X"),
-        (0x176E, "V"),
-        (0x1771, "X"),
-        (0x1772, "V"),
-        (0x1774, "X"),
-        (0x1780, "V"),
-        (0x17B4, "X"),
-        (0x17B6, "V"),
-        (0x17DE, "X"),
-        (0x17E0, "V"),
-        (0x17EA, "X"),
-        (0x17F0, "V"),
-        (0x17FA, "X"),
-        (0x1800, "V"),
-        (0x1806, "X"),
-        (0x1807, "V"),
-        (0x180B, "I"),
-        (0x180E, "X"),
-        (0x180F, "I"),
-        (0x1810, "V"),
-        (0x181A, "X"),
-        (0x1820, "V"),
-        (0x1879, "X"),
-        (0x1880, "V"),
-        (0x18AB, "X"),
-        (0x18B0, "V"),
-        (0x18F6, "X"),
-        (0x1900, "V"),
-        (0x191F, "X"),
-        (0x1920, "V"),
-        (0x192C, "X"),
-        (0x1930, "V"),
-        (0x193C, "X"),
-        (0x1940, "V"),
-        (0x1941, "X"),
-        (0x1944, "V"),
-        (0x196E, "X"),
-        (0x1970, "V"),
-        (0x1975, "X"),
-        (0x1980, "V"),
-        (0x19AC, "X"),
-        (0x19B0, "V"),
-        (0x19CA, "X"),
-        (0x19D0, "V"),
-        (0x19DB, "X"),
-        (0x19DE, "V"),
-        (0x1A1C, "X"),
-        (0x1A1E, "V"),
-        (0x1A5F, "X"),
-        (0x1A60, "V"),
-        (0x1A7D, "X"),
-        (0x1A7F, "V"),
-        (0x1A8A, "X"),
-        (0x1A90, "V"),
-        (0x1A9A, "X"),
-        (0x1AA0, "V"),
-        (0x1AAE, "X"),
-        (0x1AB0, "V"),
-        (0x1ACF, "X"),
-        (0x1B00, "V"),
-        (0x1B4D, "X"),
-        (0x1B50, "V"),
-        (0x1B7F, "X"),
-        (0x1B80, "V"),
-        (0x1BF4, "X"),
-        (0x1BFC, "V"),
-        (0x1C38, "X"),
-        (0x1C3B, "V"),
-        (0x1C4A, "X"),
-        (0x1C4D, "V"),
-        (0x1C80, "M", "в"),
-    ]
-
-
-def _seg_15() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1C81, "M", "д"),
-        (0x1C82, "M", "о"),
-        (0x1C83, "M", "�"),
-        (0x1C84, "M", "Ñ‚"),
-        (0x1C86, "M", "ÑŠ"),
-        (0x1C87, "M", "Ñ£"),
-        (0x1C88, "M", "ꙋ"),
-        (0x1C89, "X"),
-        (0x1C90, "M", "�"),
-        (0x1C91, "M", "ბ"),
-        (0x1C92, "M", "გ"),
-        (0x1C93, "M", "დ"),
-        (0x1C94, "M", "ე"),
-        (0x1C95, "M", "ვ"),
-        (0x1C96, "M", "ზ"),
-        (0x1C97, "M", "თ"),
-        (0x1C98, "M", "ი"),
-        (0x1C99, "M", "კ"),
-        (0x1C9A, "M", "ლ"),
-        (0x1C9B, "M", "მ"),
-        (0x1C9C, "M", "ნ"),
-        (0x1C9D, "M", "�"),
-        (0x1C9E, "M", "პ"),
-        (0x1C9F, "M", "ჟ"),
-        (0x1CA0, "M", "რ"),
-        (0x1CA1, "M", "ს"),
-        (0x1CA2, "M", "ტ"),
-        (0x1CA3, "M", "უ"),
-        (0x1CA4, "M", "ფ"),
-        (0x1CA5, "M", "ქ"),
-        (0x1CA6, "M", "ღ"),
-        (0x1CA7, "M", "ყ"),
-        (0x1CA8, "M", "შ"),
-        (0x1CA9, "M", "ჩ"),
-        (0x1CAA, "M", "ც"),
-        (0x1CAB, "M", "ძ"),
-        (0x1CAC, "M", "წ"),
-        (0x1CAD, "M", "ჭ"),
-        (0x1CAE, "M", "ხ"),
-        (0x1CAF, "M", "ჯ"),
-        (0x1CB0, "M", "ჰ"),
-        (0x1CB1, "M", "ჱ"),
-        (0x1CB2, "M", "ჲ"),
-        (0x1CB3, "M", "ჳ"),
-        (0x1CB4, "M", "ჴ"),
-        (0x1CB5, "M", "ჵ"),
-        (0x1CB6, "M", "ჶ"),
-        (0x1CB7, "M", "ჷ"),
-        (0x1CB8, "M", "ჸ"),
-        (0x1CB9, "M", "ჹ"),
-        (0x1CBA, "M", "ჺ"),
-        (0x1CBB, "X"),
-        (0x1CBD, "M", "ჽ"),
-        (0x1CBE, "M", "ჾ"),
-        (0x1CBF, "M", "ჿ"),
-        (0x1CC0, "V"),
-        (0x1CC8, "X"),
-        (0x1CD0, "V"),
-        (0x1CFB, "X"),
-        (0x1D00, "V"),
-        (0x1D2C, "M", "a"),
-        (0x1D2D, "M", "æ"),
-        (0x1D2E, "M", "b"),
-        (0x1D2F, "V"),
-        (0x1D30, "M", "d"),
-        (0x1D31, "M", "e"),
-        (0x1D32, "M", "�"),
-        (0x1D33, "M", "g"),
-        (0x1D34, "M", "h"),
-        (0x1D35, "M", "i"),
-        (0x1D36, "M", "j"),
-        (0x1D37, "M", "k"),
-        (0x1D38, "M", "l"),
-        (0x1D39, "M", "m"),
-        (0x1D3A, "M", "n"),
-        (0x1D3B, "V"),
-        (0x1D3C, "M", "o"),
-        (0x1D3D, "M", "È£"),
-        (0x1D3E, "M", "p"),
-        (0x1D3F, "M", "r"),
-        (0x1D40, "M", "t"),
-        (0x1D41, "M", "u"),
-        (0x1D42, "M", "w"),
-        (0x1D43, "M", "a"),
-        (0x1D44, "M", "�"),
-        (0x1D45, "M", "É‘"),
-        (0x1D46, "M", "á´‚"),
-        (0x1D47, "M", "b"),
-        (0x1D48, "M", "d"),
-        (0x1D49, "M", "e"),
-        (0x1D4A, "M", "É™"),
-        (0x1D4B, "M", "É›"),
-        (0x1D4C, "M", "ɜ"),
-        (0x1D4D, "M", "g"),
-        (0x1D4E, "V"),
-        (0x1D4F, "M", "k"),
-        (0x1D50, "M", "m"),
-        (0x1D51, "M", "Å‹"),
-        (0x1D52, "M", "o"),
-        (0x1D53, "M", "É”"),
-    ]
-
-
-def _seg_16() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1D54, "M", "á´–"),
-        (0x1D55, "M", "á´—"),
-        (0x1D56, "M", "p"),
-        (0x1D57, "M", "t"),
-        (0x1D58, "M", "u"),
-        (0x1D59, "M", "á´�"),
-        (0x1D5A, "M", "ɯ"),
-        (0x1D5B, "M", "v"),
-        (0x1D5C, "M", "á´¥"),
-        (0x1D5D, "M", "β"),
-        (0x1D5E, "M", "γ"),
-        (0x1D5F, "M", "δ"),
-        (0x1D60, "M", "φ"),
-        (0x1D61, "M", "χ"),
-        (0x1D62, "M", "i"),
-        (0x1D63, "M", "r"),
-        (0x1D64, "M", "u"),
-        (0x1D65, "M", "v"),
-        (0x1D66, "M", "β"),
-        (0x1D67, "M", "γ"),
-        (0x1D68, "M", "�"),
-        (0x1D69, "M", "φ"),
-        (0x1D6A, "M", "χ"),
-        (0x1D6B, "V"),
-        (0x1D78, "M", "н"),
-        (0x1D79, "V"),
-        (0x1D9B, "M", "É’"),
-        (0x1D9C, "M", "c"),
-        (0x1D9D, "M", "É•"),
-        (0x1D9E, "M", "ð"),
-        (0x1D9F, "M", "ɜ"),
-        (0x1DA0, "M", "f"),
-        (0x1DA1, "M", "ÉŸ"),
-        (0x1DA2, "M", "É¡"),
-        (0x1DA3, "M", "É¥"),
-        (0x1DA4, "M", "ɨ"),
-        (0x1DA5, "M", "É©"),
-        (0x1DA6, "M", "ɪ"),
-        (0x1DA7, "M", "áµ»"),
-        (0x1DA8, "M", "�"),
-        (0x1DA9, "M", "É­"),
-        (0x1DAA, "M", "ᶅ"),
-        (0x1DAB, "M", "ÊŸ"),
-        (0x1DAC, "M", "ɱ"),
-        (0x1DAD, "M", "É°"),
-        (0x1DAE, "M", "ɲ"),
-        (0x1DAF, "M", "ɳ"),
-        (0x1DB0, "M", "É´"),
-        (0x1DB1, "M", "ɵ"),
-        (0x1DB2, "M", "ɸ"),
-        (0x1DB3, "M", "Ê‚"),
-        (0x1DB4, "M", "ʃ"),
-        (0x1DB5, "M", "Æ«"),
-        (0x1DB6, "M", "ʉ"),
-        (0x1DB7, "M", "ÊŠ"),
-        (0x1DB8, "M", "ᴜ"),
-        (0x1DB9, "M", "Ê‹"),
-        (0x1DBA, "M", "ʌ"),
-        (0x1DBB, "M", "z"),
-        (0x1DBC, "M", "�"),
-        (0x1DBD, "M", "Ê‘"),
-        (0x1DBE, "M", "Ê’"),
-        (0x1DBF, "M", "θ"),
-        (0x1DC0, "V"),
-        (0x1E00, "M", "�"),
-        (0x1E01, "V"),
-        (0x1E02, "M", "ḃ"),
-        (0x1E03, "V"),
-        (0x1E04, "M", "ḅ"),
-        (0x1E05, "V"),
-        (0x1E06, "M", "ḇ"),
-        (0x1E07, "V"),
-        (0x1E08, "M", "ḉ"),
-        (0x1E09, "V"),
-        (0x1E0A, "M", "ḋ"),
-        (0x1E0B, "V"),
-        (0x1E0C, "M", "�"),
-        (0x1E0D, "V"),
-        (0x1E0E, "M", "�"),
-        (0x1E0F, "V"),
-        (0x1E10, "M", "ḑ"),
-        (0x1E11, "V"),
-        (0x1E12, "M", "ḓ"),
-        (0x1E13, "V"),
-        (0x1E14, "M", "ḕ"),
-        (0x1E15, "V"),
-        (0x1E16, "M", "ḗ"),
-        (0x1E17, "V"),
-        (0x1E18, "M", "ḙ"),
-        (0x1E19, "V"),
-        (0x1E1A, "M", "ḛ"),
-        (0x1E1B, "V"),
-        (0x1E1C, "M", "�"),
-        (0x1E1D, "V"),
-        (0x1E1E, "M", "ḟ"),
-        (0x1E1F, "V"),
-        (0x1E20, "M", "ḡ"),
-        (0x1E21, "V"),
-        (0x1E22, "M", "ḣ"),
-        (0x1E23, "V"),
-    ]
-
-
-def _seg_17() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1E24, "M", "ḥ"),
-        (0x1E25, "V"),
-        (0x1E26, "M", "ḧ"),
-        (0x1E27, "V"),
-        (0x1E28, "M", "ḩ"),
-        (0x1E29, "V"),
-        (0x1E2A, "M", "ḫ"),
-        (0x1E2B, "V"),
-        (0x1E2C, "M", "ḭ"),
-        (0x1E2D, "V"),
-        (0x1E2E, "M", "ḯ"),
-        (0x1E2F, "V"),
-        (0x1E30, "M", "ḱ"),
-        (0x1E31, "V"),
-        (0x1E32, "M", "ḳ"),
-        (0x1E33, "V"),
-        (0x1E34, "M", "ḵ"),
-        (0x1E35, "V"),
-        (0x1E36, "M", "ḷ"),
-        (0x1E37, "V"),
-        (0x1E38, "M", "ḹ"),
-        (0x1E39, "V"),
-        (0x1E3A, "M", "ḻ"),
-        (0x1E3B, "V"),
-        (0x1E3C, "M", "ḽ"),
-        (0x1E3D, "V"),
-        (0x1E3E, "M", "ḿ"),
-        (0x1E3F, "V"),
-        (0x1E40, "M", "�"),
-        (0x1E41, "V"),
-        (0x1E42, "M", "ṃ"),
-        (0x1E43, "V"),
-        (0x1E44, "M", "á¹…"),
-        (0x1E45, "V"),
-        (0x1E46, "M", "ṇ"),
-        (0x1E47, "V"),
-        (0x1E48, "M", "ṉ"),
-        (0x1E49, "V"),
-        (0x1E4A, "M", "ṋ"),
-        (0x1E4B, "V"),
-        (0x1E4C, "M", "�"),
-        (0x1E4D, "V"),
-        (0x1E4E, "M", "�"),
-        (0x1E4F, "V"),
-        (0x1E50, "M", "ṑ"),
-        (0x1E51, "V"),
-        (0x1E52, "M", "ṓ"),
-        (0x1E53, "V"),
-        (0x1E54, "M", "ṕ"),
-        (0x1E55, "V"),
-        (0x1E56, "M", "á¹—"),
-        (0x1E57, "V"),
-        (0x1E58, "M", "á¹™"),
-        (0x1E59, "V"),
-        (0x1E5A, "M", "á¹›"),
-        (0x1E5B, "V"),
-        (0x1E5C, "M", "�"),
-        (0x1E5D, "V"),
-        (0x1E5E, "M", "ṟ"),
-        (0x1E5F, "V"),
-        (0x1E60, "M", "ṡ"),
-        (0x1E61, "V"),
-        (0x1E62, "M", "á¹£"),
-        (0x1E63, "V"),
-        (0x1E64, "M", "á¹¥"),
-        (0x1E65, "V"),
-        (0x1E66, "M", "ṧ"),
-        (0x1E67, "V"),
-        (0x1E68, "M", "ṩ"),
-        (0x1E69, "V"),
-        (0x1E6A, "M", "ṫ"),
-        (0x1E6B, "V"),
-        (0x1E6C, "M", "á¹­"),
-        (0x1E6D, "V"),
-        (0x1E6E, "M", "ṯ"),
-        (0x1E6F, "V"),
-        (0x1E70, "M", "á¹±"),
-        (0x1E71, "V"),
-        (0x1E72, "M", "á¹³"),
-        (0x1E73, "V"),
-        (0x1E74, "M", "á¹µ"),
-        (0x1E75, "V"),
-        (0x1E76, "M", "á¹·"),
-        (0x1E77, "V"),
-        (0x1E78, "M", "á¹¹"),
-        (0x1E79, "V"),
-        (0x1E7A, "M", "á¹»"),
-        (0x1E7B, "V"),
-        (0x1E7C, "M", "á¹½"),
-        (0x1E7D, "V"),
-        (0x1E7E, "M", "ṿ"),
-        (0x1E7F, "V"),
-        (0x1E80, "M", "�"),
-        (0x1E81, "V"),
-        (0x1E82, "M", "ẃ"),
-        (0x1E83, "V"),
-        (0x1E84, "M", "ẅ"),
-        (0x1E85, "V"),
-        (0x1E86, "M", "ẇ"),
-        (0x1E87, "V"),
-    ]
-
-
-def _seg_18() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1E88, "M", "ẉ"),
-        (0x1E89, "V"),
-        (0x1E8A, "M", "ẋ"),
-        (0x1E8B, "V"),
-        (0x1E8C, "M", "�"),
-        (0x1E8D, "V"),
-        (0x1E8E, "M", "�"),
-        (0x1E8F, "V"),
-        (0x1E90, "M", "ẑ"),
-        (0x1E91, "V"),
-        (0x1E92, "M", "ẓ"),
-        (0x1E93, "V"),
-        (0x1E94, "M", "ẕ"),
-        (0x1E95, "V"),
-        (0x1E9A, "M", "aʾ"),
-        (0x1E9B, "M", "ṡ"),
-        (0x1E9C, "V"),
-        (0x1E9E, "M", "ß"),
-        (0x1E9F, "V"),
-        (0x1EA0, "M", "ạ"),
-        (0x1EA1, "V"),
-        (0x1EA2, "M", "ả"),
-        (0x1EA3, "V"),
-        (0x1EA4, "M", "ấ"),
-        (0x1EA5, "V"),
-        (0x1EA6, "M", "ầ"),
-        (0x1EA7, "V"),
-        (0x1EA8, "M", "ẩ"),
-        (0x1EA9, "V"),
-        (0x1EAA, "M", "ẫ"),
-        (0x1EAB, "V"),
-        (0x1EAC, "M", "ậ"),
-        (0x1EAD, "V"),
-        (0x1EAE, "M", "ắ"),
-        (0x1EAF, "V"),
-        (0x1EB0, "M", "ằ"),
-        (0x1EB1, "V"),
-        (0x1EB2, "M", "ẳ"),
-        (0x1EB3, "V"),
-        (0x1EB4, "M", "ẵ"),
-        (0x1EB5, "V"),
-        (0x1EB6, "M", "ặ"),
-        (0x1EB7, "V"),
-        (0x1EB8, "M", "ẹ"),
-        (0x1EB9, "V"),
-        (0x1EBA, "M", "ẻ"),
-        (0x1EBB, "V"),
-        (0x1EBC, "M", "ẽ"),
-        (0x1EBD, "V"),
-        (0x1EBE, "M", "ế"),
-        (0x1EBF, "V"),
-        (0x1EC0, "M", "�"),
-        (0x1EC1, "V"),
-        (0x1EC2, "M", "ể"),
-        (0x1EC3, "V"),
-        (0x1EC4, "M", "á»…"),
-        (0x1EC5, "V"),
-        (0x1EC6, "M", "ệ"),
-        (0x1EC7, "V"),
-        (0x1EC8, "M", "ỉ"),
-        (0x1EC9, "V"),
-        (0x1ECA, "M", "ị"),
-        (0x1ECB, "V"),
-        (0x1ECC, "M", "�"),
-        (0x1ECD, "V"),
-        (0x1ECE, "M", "�"),
-        (0x1ECF, "V"),
-        (0x1ED0, "M", "ố"),
-        (0x1ED1, "V"),
-        (0x1ED2, "M", "ồ"),
-        (0x1ED3, "V"),
-        (0x1ED4, "M", "ổ"),
-        (0x1ED5, "V"),
-        (0x1ED6, "M", "á»—"),
-        (0x1ED7, "V"),
-        (0x1ED8, "M", "á»™"),
-        (0x1ED9, "V"),
-        (0x1EDA, "M", "á»›"),
-        (0x1EDB, "V"),
-        (0x1EDC, "M", "�"),
-        (0x1EDD, "V"),
-        (0x1EDE, "M", "ở"),
-        (0x1EDF, "V"),
-        (0x1EE0, "M", "ỡ"),
-        (0x1EE1, "V"),
-        (0x1EE2, "M", "ợ"),
-        (0x1EE3, "V"),
-        (0x1EE4, "M", "ụ"),
-        (0x1EE5, "V"),
-        (0x1EE6, "M", "ủ"),
-        (0x1EE7, "V"),
-        (0x1EE8, "M", "ứ"),
-        (0x1EE9, "V"),
-        (0x1EEA, "M", "ừ"),
-        (0x1EEB, "V"),
-        (0x1EEC, "M", "á»­"),
-        (0x1EED, "V"),
-        (0x1EEE, "M", "ữ"),
-        (0x1EEF, "V"),
-        (0x1EF0, "M", "á»±"),
-    ]
-
-
-def _seg_19() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1EF1, "V"),
-        (0x1EF2, "M", "ỳ"),
-        (0x1EF3, "V"),
-        (0x1EF4, "M", "ỵ"),
-        (0x1EF5, "V"),
-        (0x1EF6, "M", "á»·"),
-        (0x1EF7, "V"),
-        (0x1EF8, "M", "ỹ"),
-        (0x1EF9, "V"),
-        (0x1EFA, "M", "á»»"),
-        (0x1EFB, "V"),
-        (0x1EFC, "M", "ỽ"),
-        (0x1EFD, "V"),
-        (0x1EFE, "M", "ỿ"),
-        (0x1EFF, "V"),
-        (0x1F08, "M", "á¼€"),
-        (0x1F09, "M", "�"),
-        (0x1F0A, "M", "ἂ"),
-        (0x1F0B, "M", "ἃ"),
-        (0x1F0C, "M", "ἄ"),
-        (0x1F0D, "M", "á¼…"),
-        (0x1F0E, "M", "ἆ"),
-        (0x1F0F, "M", "ἇ"),
-        (0x1F10, "V"),
-        (0x1F16, "X"),
-        (0x1F18, "M", "�"),
-        (0x1F19, "M", "ἑ"),
-        (0x1F1A, "M", "á¼’"),
-        (0x1F1B, "M", "ἓ"),
-        (0x1F1C, "M", "á¼”"),
-        (0x1F1D, "M", "ἕ"),
-        (0x1F1E, "X"),
-        (0x1F20, "V"),
-        (0x1F28, "M", "á¼ "),
-        (0x1F29, "M", "ἡ"),
-        (0x1F2A, "M", "á¼¢"),
-        (0x1F2B, "M", "á¼£"),
-        (0x1F2C, "M", "ἤ"),
-        (0x1F2D, "M", "á¼¥"),
-        (0x1F2E, "M", "ἦ"),
-        (0x1F2F, "M", "ἧ"),
-        (0x1F30, "V"),
-        (0x1F38, "M", "á¼°"),
-        (0x1F39, "M", "á¼±"),
-        (0x1F3A, "M", "á¼²"),
-        (0x1F3B, "M", "á¼³"),
-        (0x1F3C, "M", "á¼´"),
-        (0x1F3D, "M", "á¼µ"),
-        (0x1F3E, "M", "ἶ"),
-        (0x1F3F, "M", "á¼·"),
-        (0x1F40, "V"),
-        (0x1F46, "X"),
-        (0x1F48, "M", "á½€"),
-        (0x1F49, "M", "�"),
-        (0x1F4A, "M", "ὂ"),
-        (0x1F4B, "M", "ὃ"),
-        (0x1F4C, "M", "ὄ"),
-        (0x1F4D, "M", "á½…"),
-        (0x1F4E, "X"),
-        (0x1F50, "V"),
-        (0x1F58, "X"),
-        (0x1F59, "M", "ὑ"),
-        (0x1F5A, "X"),
-        (0x1F5B, "M", "ὓ"),
-        (0x1F5C, "X"),
-        (0x1F5D, "M", "ὕ"),
-        (0x1F5E, "X"),
-        (0x1F5F, "M", "á½—"),
-        (0x1F60, "V"),
-        (0x1F68, "M", "á½ "),
-        (0x1F69, "M", "ὡ"),
-        (0x1F6A, "M", "á½¢"),
-        (0x1F6B, "M", "á½£"),
-        (0x1F6C, "M", "ὤ"),
-        (0x1F6D, "M", "á½¥"),
-        (0x1F6E, "M", "ὦ"),
-        (0x1F6F, "M", "ὧ"),
-        (0x1F70, "V"),
-        (0x1F71, "M", "ά"),
-        (0x1F72, "V"),
-        (0x1F73, "M", "έ"),
-        (0x1F74, "V"),
-        (0x1F75, "M", "ή"),
-        (0x1F76, "V"),
-        (0x1F77, "M", "ί"),
-        (0x1F78, "V"),
-        (0x1F79, "M", "ό"),
-        (0x1F7A, "V"),
-        (0x1F7B, "M", "�"),
-        (0x1F7C, "V"),
-        (0x1F7D, "M", "ÏŽ"),
-        (0x1F7E, "X"),
-        (0x1F80, "M", "ἀι"),
-        (0x1F81, "M", "�ι"),
-        (0x1F82, "M", "ἂι"),
-        (0x1F83, "M", "ἃι"),
-        (0x1F84, "M", "ἄι"),
-        (0x1F85, "M", "ἅι"),
-        (0x1F86, "M", "ἆι"),
-        (0x1F87, "M", "ἇι"),
-    ]
-
-
-def _seg_20() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1F88, "M", "ἀι"),
-        (0x1F89, "M", "�ι"),
-        (0x1F8A, "M", "ἂι"),
-        (0x1F8B, "M", "ἃι"),
-        (0x1F8C, "M", "ἄι"),
-        (0x1F8D, "M", "ἅι"),
-        (0x1F8E, "M", "ἆι"),
-        (0x1F8F, "M", "ἇι"),
-        (0x1F90, "M", "ἠι"),
-        (0x1F91, "M", "ἡι"),
-        (0x1F92, "M", "ἢι"),
-        (0x1F93, "M", "ἣι"),
-        (0x1F94, "M", "ἤι"),
-        (0x1F95, "M", "ἥι"),
-        (0x1F96, "M", "ἦι"),
-        (0x1F97, "M", "ἧι"),
-        (0x1F98, "M", "ἠι"),
-        (0x1F99, "M", "ἡι"),
-        (0x1F9A, "M", "ἢι"),
-        (0x1F9B, "M", "ἣι"),
-        (0x1F9C, "M", "ἤι"),
-        (0x1F9D, "M", "ἥι"),
-        (0x1F9E, "M", "ἦι"),
-        (0x1F9F, "M", "ἧι"),
-        (0x1FA0, "M", "ὠι"),
-        (0x1FA1, "M", "ὡι"),
-        (0x1FA2, "M", "ὢι"),
-        (0x1FA3, "M", "ὣι"),
-        (0x1FA4, "M", "ὤι"),
-        (0x1FA5, "M", "ὥι"),
-        (0x1FA6, "M", "ὦι"),
-        (0x1FA7, "M", "ὧι"),
-        (0x1FA8, "M", "ὠι"),
-        (0x1FA9, "M", "ὡι"),
-        (0x1FAA, "M", "ὢι"),
-        (0x1FAB, "M", "ὣι"),
-        (0x1FAC, "M", "ὤι"),
-        (0x1FAD, "M", "ὥι"),
-        (0x1FAE, "M", "ὦι"),
-        (0x1FAF, "M", "ὧι"),
-        (0x1FB0, "V"),
-        (0x1FB2, "M", "ὰι"),
-        (0x1FB3, "M", "αι"),
-        (0x1FB4, "M", "άι"),
-        (0x1FB5, "X"),
-        (0x1FB6, "V"),
-        (0x1FB7, "M", "ᾶι"),
-        (0x1FB8, "M", "á¾°"),
-        (0x1FB9, "M", "á¾±"),
-        (0x1FBA, "M", "á½°"),
-        (0x1FBB, "M", "ά"),
-        (0x1FBC, "M", "αι"),
-        (0x1FBD, "3", " Ì“"),
-        (0x1FBE, "M", "ι"),
-        (0x1FBF, "3", " Ì“"),
-        (0x1FC0, "3", " Í‚"),
-        (0x1FC1, "3", " ̈͂"),
-        (0x1FC2, "M", "ὴι"),
-        (0x1FC3, "M", "ηι"),
-        (0x1FC4, "M", "ήι"),
-        (0x1FC5, "X"),
-        (0x1FC6, "V"),
-        (0x1FC7, "M", "ῆι"),
-        (0x1FC8, "M", "á½²"),
-        (0x1FC9, "M", "έ"),
-        (0x1FCA, "M", "á½´"),
-        (0x1FCB, "M", "ή"),
-        (0x1FCC, "M", "ηι"),
-        (0x1FCD, "3", " Ì“Ì€"),
-        (0x1FCE, "3", " ̓�"),
-        (0x1FCF, "3", " Ì“Í‚"),
-        (0x1FD0, "V"),
-        (0x1FD3, "M", "�"),
-        (0x1FD4, "X"),
-        (0x1FD6, "V"),
-        (0x1FD8, "M", "�"),
-        (0x1FD9, "M", "á¿‘"),
-        (0x1FDA, "M", "ὶ"),
-        (0x1FDB, "M", "ί"),
-        (0x1FDC, "X"),
-        (0x1FDD, "3", " ̔̀"),
-        (0x1FDE, "3", " ̔�"),
-        (0x1FDF, "3", " ̔͂"),
-        (0x1FE0, "V"),
-        (0x1FE3, "M", "ΰ"),
-        (0x1FE4, "V"),
-        (0x1FE8, "M", "á¿ "),
-        (0x1FE9, "M", "á¿¡"),
-        (0x1FEA, "M", "ὺ"),
-        (0x1FEB, "M", "�"),
-        (0x1FEC, "M", "á¿¥"),
-        (0x1FED, "3", " ̈̀"),
-        (0x1FEE, "3", " ̈�"),
-        (0x1FEF, "3", "`"),
-        (0x1FF0, "X"),
-        (0x1FF2, "M", "ὼι"),
-        (0x1FF3, "M", "ωι"),
-        (0x1FF4, "M", "ώι"),
-        (0x1FF5, "X"),
-        (0x1FF6, "V"),
-    ]
-
-
-def _seg_21() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1FF7, "M", "ῶι"),
-        (0x1FF8, "M", "ὸ"),
-        (0x1FF9, "M", "ό"),
-        (0x1FFA, "M", "á½¼"),
-        (0x1FFB, "M", "ÏŽ"),
-        (0x1FFC, "M", "ωι"),
-        (0x1FFD, "3", " �"),
-        (0x1FFE, "3", " Ì”"),
-        (0x1FFF, "X"),
-        (0x2000, "3", " "),
-        (0x200B, "I"),
-        (0x200C, "D", ""),
-        (0x200E, "X"),
-        (0x2010, "V"),
-        (0x2011, "M", "�"),
-        (0x2012, "V"),
-        (0x2017, "3", " ̳"),
-        (0x2018, "V"),
-        (0x2024, "X"),
-        (0x2027, "V"),
-        (0x2028, "X"),
-        (0x202F, "3", " "),
-        (0x2030, "V"),
-        (0x2033, "M", "′′"),
-        (0x2034, "M", "′′′"),
-        (0x2035, "V"),
-        (0x2036, "M", "‵‵"),
-        (0x2037, "M", "‵‵‵"),
-        (0x2038, "V"),
-        (0x203C, "3", "!!"),
-        (0x203D, "V"),
-        (0x203E, "3", " Ì…"),
-        (0x203F, "V"),
-        (0x2047, "3", "??"),
-        (0x2048, "3", "?!"),
-        (0x2049, "3", "!?"),
-        (0x204A, "V"),
-        (0x2057, "M", "′′′′"),
-        (0x2058, "V"),
-        (0x205F, "3", " "),
-        (0x2060, "I"),
-        (0x2061, "X"),
-        (0x2064, "I"),
-        (0x2065, "X"),
-        (0x2070, "M", "0"),
-        (0x2071, "M", "i"),
-        (0x2072, "X"),
-        (0x2074, "M", "4"),
-        (0x2075, "M", "5"),
-        (0x2076, "M", "6"),
-        (0x2077, "M", "7"),
-        (0x2078, "M", "8"),
-        (0x2079, "M", "9"),
-        (0x207A, "3", "+"),
-        (0x207B, "M", "−"),
-        (0x207C, "3", "="),
-        (0x207D, "3", "("),
-        (0x207E, "3", ")"),
-        (0x207F, "M", "n"),
-        (0x2080, "M", "0"),
-        (0x2081, "M", "1"),
-        (0x2082, "M", "2"),
-        (0x2083, "M", "3"),
-        (0x2084, "M", "4"),
-        (0x2085, "M", "5"),
-        (0x2086, "M", "6"),
-        (0x2087, "M", "7"),
-        (0x2088, "M", "8"),
-        (0x2089, "M", "9"),
-        (0x208A, "3", "+"),
-        (0x208B, "M", "−"),
-        (0x208C, "3", "="),
-        (0x208D, "3", "("),
-        (0x208E, "3", ")"),
-        (0x208F, "X"),
-        (0x2090, "M", "a"),
-        (0x2091, "M", "e"),
-        (0x2092, "M", "o"),
-        (0x2093, "M", "x"),
-        (0x2094, "M", "É™"),
-        (0x2095, "M", "h"),
-        (0x2096, "M", "k"),
-        (0x2097, "M", "l"),
-        (0x2098, "M", "m"),
-        (0x2099, "M", "n"),
-        (0x209A, "M", "p"),
-        (0x209B, "M", "s"),
-        (0x209C, "M", "t"),
-        (0x209D, "X"),
-        (0x20A0, "V"),
-        (0x20A8, "M", "rs"),
-        (0x20A9, "V"),
-        (0x20C1, "X"),
-        (0x20D0, "V"),
-        (0x20F1, "X"),
-        (0x2100, "3", "a/c"),
-        (0x2101, "3", "a/s"),
-        (0x2102, "M", "c"),
-        (0x2103, "M", "°c"),
-        (0x2104, "V"),
-    ]
-
-
-def _seg_22() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x2105, "3", "c/o"),
-        (0x2106, "3", "c/u"),
-        (0x2107, "M", "É›"),
-        (0x2108, "V"),
-        (0x2109, "M", "°f"),
-        (0x210A, "M", "g"),
-        (0x210B, "M", "h"),
-        (0x210F, "M", "ħ"),
-        (0x2110, "M", "i"),
-        (0x2112, "M", "l"),
-        (0x2114, "V"),
-        (0x2115, "M", "n"),
-        (0x2116, "M", "no"),
-        (0x2117, "V"),
-        (0x2119, "M", "p"),
-        (0x211A, "M", "q"),
-        (0x211B, "M", "r"),
-        (0x211E, "V"),
-        (0x2120, "M", "sm"),
-        (0x2121, "M", "tel"),
-        (0x2122, "M", "tm"),
-        (0x2123, "V"),
-        (0x2124, "M", "z"),
-        (0x2125, "V"),
-        (0x2126, "M", "ω"),
-        (0x2127, "V"),
-        (0x2128, "M", "z"),
-        (0x2129, "V"),
-        (0x212A, "M", "k"),
-        (0x212B, "M", "Ã¥"),
-        (0x212C, "M", "b"),
-        (0x212D, "M", "c"),
-        (0x212E, "V"),
-        (0x212F, "M", "e"),
-        (0x2131, "M", "f"),
-        (0x2132, "X"),
-        (0x2133, "M", "m"),
-        (0x2134, "M", "o"),
-        (0x2135, "M", "�"),
-        (0x2136, "M", "ב"),
-        (0x2137, "M", "×’"),
-        (0x2138, "M", "ד"),
-        (0x2139, "M", "i"),
-        (0x213A, "V"),
-        (0x213B, "M", "fax"),
-        (0x213C, "M", "Ï€"),
-        (0x213D, "M", "γ"),
-        (0x213F, "M", "Ï€"),
-        (0x2140, "M", "∑"),
-        (0x2141, "V"),
-        (0x2145, "M", "d"),
-        (0x2147, "M", "e"),
-        (0x2148, "M", "i"),
-        (0x2149, "M", "j"),
-        (0x214A, "V"),
-        (0x2150, "M", "1�7"),
-        (0x2151, "M", "1�9"),
-        (0x2152, "M", "1�10"),
-        (0x2153, "M", "1�3"),
-        (0x2154, "M", "2�3"),
-        (0x2155, "M", "1�5"),
-        (0x2156, "M", "2�5"),
-        (0x2157, "M", "3�5"),
-        (0x2158, "M", "4�5"),
-        (0x2159, "M", "1�6"),
-        (0x215A, "M", "5�6"),
-        (0x215B, "M", "1�8"),
-        (0x215C, "M", "3�8"),
-        (0x215D, "M", "5�8"),
-        (0x215E, "M", "7�8"),
-        (0x215F, "M", "1�"),
-        (0x2160, "M", "i"),
-        (0x2161, "M", "ii"),
-        (0x2162, "M", "iii"),
-        (0x2163, "M", "iv"),
-        (0x2164, "M", "v"),
-        (0x2165, "M", "vi"),
-        (0x2166, "M", "vii"),
-        (0x2167, "M", "viii"),
-        (0x2168, "M", "ix"),
-        (0x2169, "M", "x"),
-        (0x216A, "M", "xi"),
-        (0x216B, "M", "xii"),
-        (0x216C, "M", "l"),
-        (0x216D, "M", "c"),
-        (0x216E, "M", "d"),
-        (0x216F, "M", "m"),
-        (0x2170, "M", "i"),
-        (0x2171, "M", "ii"),
-        (0x2172, "M", "iii"),
-        (0x2173, "M", "iv"),
-        (0x2174, "M", "v"),
-        (0x2175, "M", "vi"),
-        (0x2176, "M", "vii"),
-        (0x2177, "M", "viii"),
-        (0x2178, "M", "ix"),
-        (0x2179, "M", "x"),
-        (0x217A, "M", "xi"),
-        (0x217B, "M", "xii"),
-        (0x217C, "M", "l"),
-    ]
-
-
-def _seg_23() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x217D, "M", "c"),
-        (0x217E, "M", "d"),
-        (0x217F, "M", "m"),
-        (0x2180, "V"),
-        (0x2183, "X"),
-        (0x2184, "V"),
-        (0x2189, "M", "0�3"),
-        (0x218A, "V"),
-        (0x218C, "X"),
-        (0x2190, "V"),
-        (0x222C, "M", "∫∫"),
-        (0x222D, "M", "∫∫∫"),
-        (0x222E, "V"),
-        (0x222F, "M", "∮∮"),
-        (0x2230, "M", "∮∮∮"),
-        (0x2231, "V"),
-        (0x2329, "M", "〈"),
-        (0x232A, "M", "〉"),
-        (0x232B, "V"),
-        (0x2427, "X"),
-        (0x2440, "V"),
-        (0x244B, "X"),
-        (0x2460, "M", "1"),
-        (0x2461, "M", "2"),
-        (0x2462, "M", "3"),
-        (0x2463, "M", "4"),
-        (0x2464, "M", "5"),
-        (0x2465, "M", "6"),
-        (0x2466, "M", "7"),
-        (0x2467, "M", "8"),
-        (0x2468, "M", "9"),
-        (0x2469, "M", "10"),
-        (0x246A, "M", "11"),
-        (0x246B, "M", "12"),
-        (0x246C, "M", "13"),
-        (0x246D, "M", "14"),
-        (0x246E, "M", "15"),
-        (0x246F, "M", "16"),
-        (0x2470, "M", "17"),
-        (0x2471, "M", "18"),
-        (0x2472, "M", "19"),
-        (0x2473, "M", "20"),
-        (0x2474, "3", "(1)"),
-        (0x2475, "3", "(2)"),
-        (0x2476, "3", "(3)"),
-        (0x2477, "3", "(4)"),
-        (0x2478, "3", "(5)"),
-        (0x2479, "3", "(6)"),
-        (0x247A, "3", "(7)"),
-        (0x247B, "3", "(8)"),
-        (0x247C, "3", "(9)"),
-        (0x247D, "3", "(10)"),
-        (0x247E, "3", "(11)"),
-        (0x247F, "3", "(12)"),
-        (0x2480, "3", "(13)"),
-        (0x2481, "3", "(14)"),
-        (0x2482, "3", "(15)"),
-        (0x2483, "3", "(16)"),
-        (0x2484, "3", "(17)"),
-        (0x2485, "3", "(18)"),
-        (0x2486, "3", "(19)"),
-        (0x2487, "3", "(20)"),
-        (0x2488, "X"),
-        (0x249C, "3", "(a)"),
-        (0x249D, "3", "(b)"),
-        (0x249E, "3", "(c)"),
-        (0x249F, "3", "(d)"),
-        (0x24A0, "3", "(e)"),
-        (0x24A1, "3", "(f)"),
-        (0x24A2, "3", "(g)"),
-        (0x24A3, "3", "(h)"),
-        (0x24A4, "3", "(i)"),
-        (0x24A5, "3", "(j)"),
-        (0x24A6, "3", "(k)"),
-        (0x24A7, "3", "(l)"),
-        (0x24A8, "3", "(m)"),
-        (0x24A9, "3", "(n)"),
-        (0x24AA, "3", "(o)"),
-        (0x24AB, "3", "(p)"),
-        (0x24AC, "3", "(q)"),
-        (0x24AD, "3", "(r)"),
-        (0x24AE, "3", "(s)"),
-        (0x24AF, "3", "(t)"),
-        (0x24B0, "3", "(u)"),
-        (0x24B1, "3", "(v)"),
-        (0x24B2, "3", "(w)"),
-        (0x24B3, "3", "(x)"),
-        (0x24B4, "3", "(y)"),
-        (0x24B5, "3", "(z)"),
-        (0x24B6, "M", "a"),
-        (0x24B7, "M", "b"),
-        (0x24B8, "M", "c"),
-        (0x24B9, "M", "d"),
-        (0x24BA, "M", "e"),
-        (0x24BB, "M", "f"),
-        (0x24BC, "M", "g"),
-        (0x24BD, "M", "h"),
-        (0x24BE, "M", "i"),
-        (0x24BF, "M", "j"),
-        (0x24C0, "M", "k"),
-    ]
-
-
-def _seg_24() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x24C1, "M", "l"),
-        (0x24C2, "M", "m"),
-        (0x24C3, "M", "n"),
-        (0x24C4, "M", "o"),
-        (0x24C5, "M", "p"),
-        (0x24C6, "M", "q"),
-        (0x24C7, "M", "r"),
-        (0x24C8, "M", "s"),
-        (0x24C9, "M", "t"),
-        (0x24CA, "M", "u"),
-        (0x24CB, "M", "v"),
-        (0x24CC, "M", "w"),
-        (0x24CD, "M", "x"),
-        (0x24CE, "M", "y"),
-        (0x24CF, "M", "z"),
-        (0x24D0, "M", "a"),
-        (0x24D1, "M", "b"),
-        (0x24D2, "M", "c"),
-        (0x24D3, "M", "d"),
-        (0x24D4, "M", "e"),
-        (0x24D5, "M", "f"),
-        (0x24D6, "M", "g"),
-        (0x24D7, "M", "h"),
-        (0x24D8, "M", "i"),
-        (0x24D9, "M", "j"),
-        (0x24DA, "M", "k"),
-        (0x24DB, "M", "l"),
-        (0x24DC, "M", "m"),
-        (0x24DD, "M", "n"),
-        (0x24DE, "M", "o"),
-        (0x24DF, "M", "p"),
-        (0x24E0, "M", "q"),
-        (0x24E1, "M", "r"),
-        (0x24E2, "M", "s"),
-        (0x24E3, "M", "t"),
-        (0x24E4, "M", "u"),
-        (0x24E5, "M", "v"),
-        (0x24E6, "M", "w"),
-        (0x24E7, "M", "x"),
-        (0x24E8, "M", "y"),
-        (0x24E9, "M", "z"),
-        (0x24EA, "M", "0"),
-        (0x24EB, "V"),
-        (0x2A0C, "M", "∫∫∫∫"),
-        (0x2A0D, "V"),
-        (0x2A74, "3", "::="),
-        (0x2A75, "3", "=="),
-        (0x2A76, "3", "==="),
-        (0x2A77, "V"),
-        (0x2ADC, "M", "�̸"),
-        (0x2ADD, "V"),
-        (0x2B74, "X"),
-        (0x2B76, "V"),
-        (0x2B96, "X"),
-        (0x2B97, "V"),
-        (0x2C00, "M", "â°°"),
-        (0x2C01, "M", "â°±"),
-        (0x2C02, "M", "â°²"),
-        (0x2C03, "M", "â°³"),
-        (0x2C04, "M", "â°´"),
-        (0x2C05, "M", "â°µ"),
-        (0x2C06, "M", "â°¶"),
-        (0x2C07, "M", "â°·"),
-        (0x2C08, "M", "â°¸"),
-        (0x2C09, "M", "â°¹"),
-        (0x2C0A, "M", "â°º"),
-        (0x2C0B, "M", "â°»"),
-        (0x2C0C, "M", "â°¼"),
-        (0x2C0D, "M", "â°½"),
-        (0x2C0E, "M", "â°¾"),
-        (0x2C0F, "M", "â°¿"),
-        (0x2C10, "M", "â±€"),
-        (0x2C11, "M", "�"),
-        (0x2C12, "M", "ⱂ"),
-        (0x2C13, "M", "ⱃ"),
-        (0x2C14, "M", "ⱄ"),
-        (0x2C15, "M", "â±…"),
-        (0x2C16, "M", "ⱆ"),
-        (0x2C17, "M", "ⱇ"),
-        (0x2C18, "M", "ⱈ"),
-        (0x2C19, "M", "ⱉ"),
-        (0x2C1A, "M", "ⱊ"),
-        (0x2C1B, "M", "ⱋ"),
-        (0x2C1C, "M", "ⱌ"),
-        (0x2C1D, "M", "�"),
-        (0x2C1E, "M", "ⱎ"),
-        (0x2C1F, "M", "�"),
-        (0x2C20, "M", "�"),
-        (0x2C21, "M", "ⱑ"),
-        (0x2C22, "M", "â±’"),
-        (0x2C23, "M", "ⱓ"),
-        (0x2C24, "M", "â±”"),
-        (0x2C25, "M", "ⱕ"),
-        (0x2C26, "M", "â±–"),
-        (0x2C27, "M", "â±—"),
-        (0x2C28, "M", "ⱘ"),
-        (0x2C29, "M", "â±™"),
-        (0x2C2A, "M", "ⱚ"),
-        (0x2C2B, "M", "â±›"),
-        (0x2C2C, "M", "ⱜ"),
-    ]
-
-
-def _seg_25() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x2C2D, "M", "�"),
-        (0x2C2E, "M", "ⱞ"),
-        (0x2C2F, "M", "ⱟ"),
-        (0x2C30, "V"),
-        (0x2C60, "M", "ⱡ"),
-        (0x2C61, "V"),
-        (0x2C62, "M", "É«"),
-        (0x2C63, "M", "áµ½"),
-        (0x2C64, "M", "ɽ"),
-        (0x2C65, "V"),
-        (0x2C67, "M", "ⱨ"),
-        (0x2C68, "V"),
-        (0x2C69, "M", "ⱪ"),
-        (0x2C6A, "V"),
-        (0x2C6B, "M", "ⱬ"),
-        (0x2C6C, "V"),
-        (0x2C6D, "M", "É‘"),
-        (0x2C6E, "M", "ɱ"),
-        (0x2C6F, "M", "�"),
-        (0x2C70, "M", "É’"),
-        (0x2C71, "V"),
-        (0x2C72, "M", "â±³"),
-        (0x2C73, "V"),
-        (0x2C75, "M", "ⱶ"),
-        (0x2C76, "V"),
-        (0x2C7C, "M", "j"),
-        (0x2C7D, "M", "v"),
-        (0x2C7E, "M", "È¿"),
-        (0x2C7F, "M", "É€"),
-        (0x2C80, "M", "�"),
-        (0x2C81, "V"),
-        (0x2C82, "M", "ⲃ"),
-        (0x2C83, "V"),
-        (0x2C84, "M", "â²…"),
-        (0x2C85, "V"),
-        (0x2C86, "M", "ⲇ"),
-        (0x2C87, "V"),
-        (0x2C88, "M", "ⲉ"),
-        (0x2C89, "V"),
-        (0x2C8A, "M", "ⲋ"),
-        (0x2C8B, "V"),
-        (0x2C8C, "M", "�"),
-        (0x2C8D, "V"),
-        (0x2C8E, "M", "�"),
-        (0x2C8F, "V"),
-        (0x2C90, "M", "ⲑ"),
-        (0x2C91, "V"),
-        (0x2C92, "M", "ⲓ"),
-        (0x2C93, "V"),
-        (0x2C94, "M", "ⲕ"),
-        (0x2C95, "V"),
-        (0x2C96, "M", "â²—"),
-        (0x2C97, "V"),
-        (0x2C98, "M", "â²™"),
-        (0x2C99, "V"),
-        (0x2C9A, "M", "â²›"),
-        (0x2C9B, "V"),
-        (0x2C9C, "M", "�"),
-        (0x2C9D, "V"),
-        (0x2C9E, "M", "ⲟ"),
-        (0x2C9F, "V"),
-        (0x2CA0, "M", "ⲡ"),
-        (0x2CA1, "V"),
-        (0x2CA2, "M", "â²£"),
-        (0x2CA3, "V"),
-        (0x2CA4, "M", "â²¥"),
-        (0x2CA5, "V"),
-        (0x2CA6, "M", "ⲧ"),
-        (0x2CA7, "V"),
-        (0x2CA8, "M", "ⲩ"),
-        (0x2CA9, "V"),
-        (0x2CAA, "M", "ⲫ"),
-        (0x2CAB, "V"),
-        (0x2CAC, "M", "â²­"),
-        (0x2CAD, "V"),
-        (0x2CAE, "M", "ⲯ"),
-        (0x2CAF, "V"),
-        (0x2CB0, "M", "â²±"),
-        (0x2CB1, "V"),
-        (0x2CB2, "M", "â²³"),
-        (0x2CB3, "V"),
-        (0x2CB4, "M", "â²µ"),
-        (0x2CB5, "V"),
-        (0x2CB6, "M", "â²·"),
-        (0x2CB7, "V"),
-        (0x2CB8, "M", "â²¹"),
-        (0x2CB9, "V"),
-        (0x2CBA, "M", "â²»"),
-        (0x2CBB, "V"),
-        (0x2CBC, "M", "â²½"),
-        (0x2CBD, "V"),
-        (0x2CBE, "M", "ⲿ"),
-        (0x2CBF, "V"),
-        (0x2CC0, "M", "�"),
-        (0x2CC1, "V"),
-        (0x2CC2, "M", "ⳃ"),
-        (0x2CC3, "V"),
-        (0x2CC4, "M", "â³…"),
-        (0x2CC5, "V"),
-        (0x2CC6, "M", "ⳇ"),
-    ]
-
-
-def _seg_26() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x2CC7, "V"),
-        (0x2CC8, "M", "ⳉ"),
-        (0x2CC9, "V"),
-        (0x2CCA, "M", "ⳋ"),
-        (0x2CCB, "V"),
-        (0x2CCC, "M", "�"),
-        (0x2CCD, "V"),
-        (0x2CCE, "M", "�"),
-        (0x2CCF, "V"),
-        (0x2CD0, "M", "ⳑ"),
-        (0x2CD1, "V"),
-        (0x2CD2, "M", "ⳓ"),
-        (0x2CD3, "V"),
-        (0x2CD4, "M", "ⳕ"),
-        (0x2CD5, "V"),
-        (0x2CD6, "M", "â³—"),
-        (0x2CD7, "V"),
-        (0x2CD8, "M", "â³™"),
-        (0x2CD9, "V"),
-        (0x2CDA, "M", "â³›"),
-        (0x2CDB, "V"),
-        (0x2CDC, "M", "�"),
-        (0x2CDD, "V"),
-        (0x2CDE, "M", "ⳟ"),
-        (0x2CDF, "V"),
-        (0x2CE0, "M", "ⳡ"),
-        (0x2CE1, "V"),
-        (0x2CE2, "M", "â³£"),
-        (0x2CE3, "V"),
-        (0x2CEB, "M", "ⳬ"),
-        (0x2CEC, "V"),
-        (0x2CED, "M", "â³®"),
-        (0x2CEE, "V"),
-        (0x2CF2, "M", "â³³"),
-        (0x2CF3, "V"),
-        (0x2CF4, "X"),
-        (0x2CF9, "V"),
-        (0x2D26, "X"),
-        (0x2D27, "V"),
-        (0x2D28, "X"),
-        (0x2D2D, "V"),
-        (0x2D2E, "X"),
-        (0x2D30, "V"),
-        (0x2D68, "X"),
-        (0x2D6F, "M", "ⵡ"),
-        (0x2D70, "V"),
-        (0x2D71, "X"),
-        (0x2D7F, "V"),
-        (0x2D97, "X"),
-        (0x2DA0, "V"),
-        (0x2DA7, "X"),
-        (0x2DA8, "V"),
-        (0x2DAF, "X"),
-        (0x2DB0, "V"),
-        (0x2DB7, "X"),
-        (0x2DB8, "V"),
-        (0x2DBF, "X"),
-        (0x2DC0, "V"),
-        (0x2DC7, "X"),
-        (0x2DC8, "V"),
-        (0x2DCF, "X"),
-        (0x2DD0, "V"),
-        (0x2DD7, "X"),
-        (0x2DD8, "V"),
-        (0x2DDF, "X"),
-        (0x2DE0, "V"),
-        (0x2E5E, "X"),
-        (0x2E80, "V"),
-        (0x2E9A, "X"),
-        (0x2E9B, "V"),
-        (0x2E9F, "M", "�"),
-        (0x2EA0, "V"),
-        (0x2EF3, "M", "龟"),
-        (0x2EF4, "X"),
-        (0x2F00, "M", "一"),
-        (0x2F01, "M", "丨"),
-        (0x2F02, "M", "丶"),
-        (0x2F03, "M", "丿"),
-        (0x2F04, "M", "ä¹™"),
-        (0x2F05, "M", "亅"),
-        (0x2F06, "M", "二"),
-        (0x2F07, "M", "亠"),
-        (0x2F08, "M", "人"),
-        (0x2F09, "M", "å„¿"),
-        (0x2F0A, "M", "å…¥"),
-        (0x2F0B, "M", "å…«"),
-        (0x2F0C, "M", "冂"),
-        (0x2F0D, "M", "冖"),
-        (0x2F0E, "M", "冫"),
-        (0x2F0F, "M", "几"),
-        (0x2F10, "M", "凵"),
-        (0x2F11, "M", "刀"),
-        (0x2F12, "M", "力"),
-        (0x2F13, "M", "勹"),
-        (0x2F14, "M", "匕"),
-        (0x2F15, "M", "匚"),
-        (0x2F16, "M", "匸"),
-        (0x2F17, "M", "�"),
-        (0x2F18, "M", "�"),
-        (0x2F19, "M", "�"),
-    ]
-
-
-def _seg_27() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x2F1A, "M", "厂"),
-        (0x2F1B, "M", "厶"),
-        (0x2F1C, "M", "�"),
-        (0x2F1D, "M", "�"),
-        (0x2F1E, "M", "å›—"),
-        (0x2F1F, "M", "土"),
-        (0x2F20, "M", "士"),
-        (0x2F21, "M", "夂"),
-        (0x2F22, "M", "夊"),
-        (0x2F23, "M", "夕"),
-        (0x2F24, "M", "大"),
-        (0x2F25, "M", "女"),
-        (0x2F26, "M", "å­�"),
-        (0x2F27, "M", "宀"),
-        (0x2F28, "M", "寸"),
-        (0x2F29, "M", "å°�"),
-        (0x2F2A, "M", "å°¢"),
-        (0x2F2B, "M", "å°¸"),
-        (0x2F2C, "M", "å±®"),
-        (0x2F2D, "M", "å±±"),
-        (0x2F2E, "M", "å·›"),
-        (0x2F2F, "M", "å·¥"),
-        (0x2F30, "M", "å·±"),
-        (0x2F31, "M", "å·¾"),
-        (0x2F32, "M", "å¹²"),
-        (0x2F33, "M", "幺"),
-        (0x2F34, "M", "广"),
-        (0x2F35, "M", "å»´"),
-        (0x2F36, "M", "廾"),
-        (0x2F37, "M", "弋"),
-        (0x2F38, "M", "弓"),
-        (0x2F39, "M", "�"),
-        (0x2F3A, "M", "彡"),
-        (0x2F3B, "M", "å½³"),
-        (0x2F3C, "M", "心"),
-        (0x2F3D, "M", "戈"),
-        (0x2F3E, "M", "戶"),
-        (0x2F3F, "M", "手"),
-        (0x2F40, "M", "支"),
-        (0x2F41, "M", "æ”´"),
-        (0x2F42, "M", "æ–‡"),
-        (0x2F43, "M", "æ–—"),
-        (0x2F44, "M", "æ–¤"),
-        (0x2F45, "M", "æ–¹"),
-        (0x2F46, "M", "æ— "),
-        (0x2F47, "M", "æ—¥"),
-        (0x2F48, "M", "æ›°"),
-        (0x2F49, "M", "月"),
-        (0x2F4A, "M", "木"),
-        (0x2F4B, "M", "欠"),
-        (0x2F4C, "M", "æ­¢"),
-        (0x2F4D, "M", "æ­¹"),
-        (0x2F4E, "M", "殳"),
-        (0x2F4F, "M", "毋"),
-        (0x2F50, "M", "比"),
-        (0x2F51, "M", "毛"),
-        (0x2F52, "M", "æ°�"),
-        (0x2F53, "M", "æ°”"),
-        (0x2F54, "M", "æ°´"),
-        (0x2F55, "M", "�"),
-        (0x2F56, "M", "爪"),
-        (0x2F57, "M", "父"),
-        (0x2F58, "M", "爻"),
-        (0x2F59, "M", "爿"),
-        (0x2F5A, "M", "片"),
-        (0x2F5B, "M", "牙"),
-        (0x2F5C, "M", "牛"),
-        (0x2F5D, "M", "犬"),
-        (0x2F5E, "M", "玄"),
-        (0x2F5F, "M", "玉"),
-        (0x2F60, "M", "瓜"),
-        (0x2F61, "M", "瓦"),
-        (0x2F62, "M", "甘"),
-        (0x2F63, "M", "生"),
-        (0x2F64, "M", "用"),
-        (0x2F65, "M", "ç”°"),
-        (0x2F66, "M", "ç–‹"),
-        (0x2F67, "M", "ç–’"),
-        (0x2F68, "M", "癶"),
-        (0x2F69, "M", "白"),
-        (0x2F6A, "M", "çš®"),
-        (0x2F6B, "M", "çš¿"),
-        (0x2F6C, "M", "ç›®"),
-        (0x2F6D, "M", "矛"),
-        (0x2F6E, "M", "矢"),
-        (0x2F6F, "M", "石"),
-        (0x2F70, "M", "示"),
-        (0x2F71, "M", "禸"),
-        (0x2F72, "M", "禾"),
-        (0x2F73, "M", "ç©´"),
-        (0x2F74, "M", "ç«‹"),
-        (0x2F75, "M", "竹"),
-        (0x2F76, "M", "ç±³"),
-        (0x2F77, "M", "糸"),
-        (0x2F78, "M", "缶"),
-        (0x2F79, "M", "网"),
-        (0x2F7A, "M", "羊"),
-        (0x2F7B, "M", "ç¾½"),
-        (0x2F7C, "M", "�"),
-        (0x2F7D, "M", "而"),
-    ]
-
-
-def _seg_28() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x2F7E, "M", "耒"),
-        (0x2F7F, "M", "耳"),
-        (0x2F80, "M", "�"),
-        (0x2F81, "M", "肉"),
-        (0x2F82, "M", "臣"),
-        (0x2F83, "M", "自"),
-        (0x2F84, "M", "至"),
-        (0x2F85, "M", "臼"),
-        (0x2F86, "M", "舌"),
-        (0x2F87, "M", "舛"),
-        (0x2F88, "M", "舟"),
-        (0x2F89, "M", "艮"),
-        (0x2F8A, "M", "色"),
-        (0x2F8B, "M", "艸"),
-        (0x2F8C, "M", "�"),
-        (0x2F8D, "M", "虫"),
-        (0x2F8E, "M", "è¡€"),
-        (0x2F8F, "M", "行"),
-        (0x2F90, "M", "è¡£"),
-        (0x2F91, "M", "襾"),
-        (0x2F92, "M", "見"),
-        (0x2F93, "M", "角"),
-        (0x2F94, "M", "言"),
-        (0x2F95, "M", "è°·"),
-        (0x2F96, "M", "豆"),
-        (0x2F97, "M", "豕"),
-        (0x2F98, "M", "豸"),
-        (0x2F99, "M", "�"),
-        (0x2F9A, "M", "赤"),
-        (0x2F9B, "M", "èµ°"),
-        (0x2F9C, "M", "足"),
-        (0x2F9D, "M", "身"),
-        (0x2F9E, "M", "車"),
-        (0x2F9F, "M", "è¾›"),
-        (0x2FA0, "M", "è¾°"),
-        (0x2FA1, "M", "è¾µ"),
-        (0x2FA2, "M", "é‚‘"),
-        (0x2FA3, "M", "é…‰"),
-        (0x2FA4, "M", "釆"),
-        (0x2FA5, "M", "里"),
-        (0x2FA6, "M", "金"),
-        (0x2FA7, "M", "é•·"),
-        (0x2FA8, "M", "é–€"),
-        (0x2FA9, "M", "阜"),
-        (0x2FAA, "M", "隶"),
-        (0x2FAB, "M", "éš¹"),
-        (0x2FAC, "M", "雨"),
-        (0x2FAD, "M", "�"),
-        (0x2FAE, "M", "�"),
-        (0x2FAF, "M", "�"),
-        (0x2FB0, "M", "�"),
-        (0x2FB1, "M", "韋"),
-        (0x2FB2, "M", "韭"),
-        (0x2FB3, "M", "音"),
-        (0x2FB4, "M", "é �"),
-        (0x2FB5, "M", "風"),
-        (0x2FB6, "M", "飛"),
-        (0x2FB7, "M", "食"),
-        (0x2FB8, "M", "首"),
-        (0x2FB9, "M", "香"),
-        (0x2FBA, "M", "馬"),
-        (0x2FBB, "M", "骨"),
-        (0x2FBC, "M", "高"),
-        (0x2FBD, "M", "é«Ÿ"),
-        (0x2FBE, "M", "鬥"),
-        (0x2FBF, "M", "鬯"),
-        (0x2FC0, "M", "鬲"),
-        (0x2FC1, "M", "鬼"),
-        (0x2FC2, "M", "é­š"),
-        (0x2FC3, "M", "é³¥"),
-        (0x2FC4, "M", "é¹µ"),
-        (0x2FC5, "M", "鹿"),
-        (0x2FC6, "M", "麥"),
-        (0x2FC7, "M", "麻"),
-        (0x2FC8, "M", "黃"),
-        (0x2FC9, "M", "�"),
-        (0x2FCA, "M", "黑"),
-        (0x2FCB, "M", "黹"),
-        (0x2FCC, "M", "黽"),
-        (0x2FCD, "M", "鼎"),
-        (0x2FCE, "M", "鼓"),
-        (0x2FCF, "M", "é¼ "),
-        (0x2FD0, "M", "é¼»"),
-        (0x2FD1, "M", "齊"),
-        (0x2FD2, "M", "é½’"),
-        (0x2FD3, "M", "�"),
-        (0x2FD4, "M", "龜"),
-        (0x2FD5, "M", "é¾ "),
-        (0x2FD6, "X"),
-        (0x3000, "3", " "),
-        (0x3001, "V"),
-        (0x3002, "M", "."),
-        (0x3003, "V"),
-        (0x3036, "M", "〒"),
-        (0x3037, "V"),
-        (0x3038, "M", "�"),
-        (0x3039, "M", "�"),
-        (0x303A, "M", "�"),
-        (0x303B, "V"),
-        (0x3040, "X"),
-    ]
-
-
-def _seg_29() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x3041, "V"),
-        (0x3097, "X"),
-        (0x3099, "V"),
-        (0x309B, "3", " ã‚™"),
-        (0x309C, "3", " ã‚š"),
-        (0x309D, "V"),
-        (0x309F, "M", "より"),
-        (0x30A0, "V"),
-        (0x30FF, "M", "コト"),
-        (0x3100, "X"),
-        (0x3105, "V"),
-        (0x3130, "X"),
-        (0x3131, "M", "á„€"),
-        (0x3132, "M", "�"),
-        (0x3133, "M", "ᆪ"),
-        (0x3134, "M", "á„‚"),
-        (0x3135, "M", "ᆬ"),
-        (0x3136, "M", "ᆭ"),
-        (0x3137, "M", "ᄃ"),
-        (0x3138, "M", "á„„"),
-        (0x3139, "M", "á„…"),
-        (0x313A, "M", "ᆰ"),
-        (0x313B, "M", "ᆱ"),
-        (0x313C, "M", "ᆲ"),
-        (0x313D, "M", "ᆳ"),
-        (0x313E, "M", "ᆴ"),
-        (0x313F, "M", "ᆵ"),
-        (0x3140, "M", "á„š"),
-        (0x3141, "M", "ᄆ"),
-        (0x3142, "M", "ᄇ"),
-        (0x3143, "M", "ᄈ"),
-        (0x3144, "M", "á„¡"),
-        (0x3145, "M", "ᄉ"),
-        (0x3146, "M", "á„Š"),
-        (0x3147, "M", "á„‹"),
-        (0x3148, "M", "ᄌ"),
-        (0x3149, "M", "�"),
-        (0x314A, "M", "á„Ž"),
-        (0x314B, "M", "�"),
-        (0x314C, "M", "�"),
-        (0x314D, "M", "á„‘"),
-        (0x314E, "M", "á„’"),
-        (0x314F, "M", "á…¡"),
-        (0x3150, "M", "á…¢"),
-        (0x3151, "M", "á…£"),
-        (0x3152, "M", "á…¤"),
-        (0x3153, "M", "á…¥"),
-        (0x3154, "M", "á…¦"),
-        (0x3155, "M", "á…§"),
-        (0x3156, "M", "á…¨"),
-        (0x3157, "M", "á…©"),
-        (0x3158, "M", "á…ª"),
-        (0x3159, "M", "á…«"),
-        (0x315A, "M", "á…¬"),
-        (0x315B, "M", "á…­"),
-        (0x315C, "M", "á…®"),
-        (0x315D, "M", "á…¯"),
-        (0x315E, "M", "á…°"),
-        (0x315F, "M", "á…±"),
-        (0x3160, "M", "á…²"),
-        (0x3161, "M", "á…³"),
-        (0x3162, "M", "á…´"),
-        (0x3163, "M", "á…µ"),
-        (0x3164, "X"),
-        (0x3165, "M", "á„”"),
-        (0x3166, "M", "á„•"),
-        (0x3167, "M", "ᇇ"),
-        (0x3168, "M", "ᇈ"),
-        (0x3169, "M", "ᇌ"),
-        (0x316A, "M", "ᇎ"),
-        (0x316B, "M", "ᇓ"),
-        (0x316C, "M", "ᇗ"),
-        (0x316D, "M", "ᇙ"),
-        (0x316E, "M", "ᄜ"),
-        (0x316F, "M", "�"),
-        (0x3170, "M", "ᇟ"),
-        (0x3171, "M", "�"),
-        (0x3172, "M", "á„ž"),
-        (0x3173, "M", "á„ "),
-        (0x3174, "M", "á„¢"),
-        (0x3175, "M", "á„£"),
-        (0x3176, "M", "ᄧ"),
-        (0x3177, "M", "á„©"),
-        (0x3178, "M", "á„«"),
-        (0x3179, "M", "ᄬ"),
-        (0x317A, "M", "á„­"),
-        (0x317B, "M", "á„®"),
-        (0x317C, "M", "ᄯ"),
-        (0x317D, "M", "ᄲ"),
-        (0x317E, "M", "ᄶ"),
-        (0x317F, "M", "á…€"),
-        (0x3180, "M", "á…‡"),
-        (0x3181, "M", "ᅌ"),
-        (0x3182, "M", "ᇱ"),
-        (0x3183, "M", "ᇲ"),
-        (0x3184, "M", "á…—"),
-        (0x3185, "M", "á…˜"),
-        (0x3186, "M", "á…™"),
-        (0x3187, "M", "ᆄ"),
-        (0x3188, "M", "ᆅ"),
-    ]
-
-
-def _seg_30() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x3189, "M", "ᆈ"),
-        (0x318A, "M", "ᆑ"),
-        (0x318B, "M", "ᆒ"),
-        (0x318C, "M", "ᆔ"),
-        (0x318D, "M", "ᆞ"),
-        (0x318E, "M", "ᆡ"),
-        (0x318F, "X"),
-        (0x3190, "V"),
-        (0x3192, "M", "一"),
-        (0x3193, "M", "二"),
-        (0x3194, "M", "三"),
-        (0x3195, "M", "å››"),
-        (0x3196, "M", "上"),
-        (0x3197, "M", "中"),
-        (0x3198, "M", "下"),
-        (0x3199, "M", "甲"),
-        (0x319A, "M", "ä¹™"),
-        (0x319B, "M", "丙"),
-        (0x319C, "M", "�"),
-        (0x319D, "M", "天"),
-        (0x319E, "M", "地"),
-        (0x319F, "M", "人"),
-        (0x31A0, "V"),
-        (0x31E4, "X"),
-        (0x31F0, "V"),
-        (0x3200, "3", "(á„€)"),
-        (0x3201, "3", "(á„‚)"),
-        (0x3202, "3", "(ᄃ)"),
-        (0x3203, "3", "(á„…)"),
-        (0x3204, "3", "(ᄆ)"),
-        (0x3205, "3", "(ᄇ)"),
-        (0x3206, "3", "(ᄉ)"),
-        (0x3207, "3", "(á„‹)"),
-        (0x3208, "3", "(ᄌ)"),
-        (0x3209, "3", "(á„Ž)"),
-        (0x320A, "3", "(�)"),
-        (0x320B, "3", "(�)"),
-        (0x320C, "3", "(á„‘)"),
-        (0x320D, "3", "(á„’)"),
-        (0x320E, "3", "(ê°€)"),
-        (0x320F, "3", "(나)"),
-        (0x3210, "3", "(다)"),
-        (0x3211, "3", "(�)"),
-        (0x3212, "3", "(마)"),
-        (0x3213, "3", "(ë°”)"),
-        (0x3214, "3", "(사)"),
-        (0x3215, "3", "(ì•„)"),
-        (0x3216, "3", "(�)"),
-        (0x3217, "3", "(ì°¨)"),
-        (0x3218, "3", "(ì¹´)"),
-        (0x3219, "3", "(타)"),
-        (0x321A, "3", "(파)"),
-        (0x321B, "3", "(하)"),
-        (0x321C, "3", "(주)"),
-        (0x321D, "3", "(오전)"),
-        (0x321E, "3", "(오후)"),
-        (0x321F, "X"),
-        (0x3220, "3", "(一)"),
-        (0x3221, "3", "(二)"),
-        (0x3222, "3", "(三)"),
-        (0x3223, "3", "(å››)"),
-        (0x3224, "3", "(五)"),
-        (0x3225, "3", "(å…­)"),
-        (0x3226, "3", "(七)"),
-        (0x3227, "3", "(å…«)"),
-        (0x3228, "3", "(�)"),
-        (0x3229, "3", "(�)"),
-        (0x322A, "3", "(月)"),
-        (0x322B, "3", "(�)"),
-        (0x322C, "3", "(æ°´)"),
-        (0x322D, "3", "(木)"),
-        (0x322E, "3", "(金)"),
-        (0x322F, "3", "(土)"),
-        (0x3230, "3", "(æ—¥)"),
-        (0x3231, "3", "(æ ª)"),
-        (0x3232, "3", "(有)"),
-        (0x3233, "3", "(社)"),
-        (0x3234, "3", "(�)"),
-        (0x3235, "3", "(特)"),
-        (0x3236, "3", "(財)"),
-        (0x3237, "3", "(�)"),
-        (0x3238, "3", "(労)"),
-        (0x3239, "3", "(代)"),
-        (0x323A, "3", "(呼)"),
-        (0x323B, "3", "(å­¦)"),
-        (0x323C, "3", "(監)"),
-        (0x323D, "3", "(�)"),
-        (0x323E, "3", "(資)"),
-        (0x323F, "3", "(�)"),
-        (0x3240, "3", "(祭)"),
-        (0x3241, "3", "(休)"),
-        (0x3242, "3", "(自)"),
-        (0x3243, "3", "(至)"),
-        (0x3244, "M", "�"),
-        (0x3245, "M", "å¹¼"),
-        (0x3246, "M", "æ–‡"),
-        (0x3247, "M", "�"),
-        (0x3248, "V"),
-        (0x3250, "M", "pte"),
-        (0x3251, "M", "21"),
-    ]
-
-
-def _seg_31() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x3252, "M", "22"),
-        (0x3253, "M", "23"),
-        (0x3254, "M", "24"),
-        (0x3255, "M", "25"),
-        (0x3256, "M", "26"),
-        (0x3257, "M", "27"),
-        (0x3258, "M", "28"),
-        (0x3259, "M", "29"),
-        (0x325A, "M", "30"),
-        (0x325B, "M", "31"),
-        (0x325C, "M", "32"),
-        (0x325D, "M", "33"),
-        (0x325E, "M", "34"),
-        (0x325F, "M", "35"),
-        (0x3260, "M", "á„€"),
-        (0x3261, "M", "á„‚"),
-        (0x3262, "M", "ᄃ"),
-        (0x3263, "M", "á„…"),
-        (0x3264, "M", "ᄆ"),
-        (0x3265, "M", "ᄇ"),
-        (0x3266, "M", "ᄉ"),
-        (0x3267, "M", "á„‹"),
-        (0x3268, "M", "ᄌ"),
-        (0x3269, "M", "á„Ž"),
-        (0x326A, "M", "�"),
-        (0x326B, "M", "�"),
-        (0x326C, "M", "á„‘"),
-        (0x326D, "M", "á„’"),
-        (0x326E, "M", "ê°€"),
-        (0x326F, "M", "나"),
-        (0x3270, "M", "다"),
-        (0x3271, "M", "�"),
-        (0x3272, "M", "마"),
-        (0x3273, "M", "ë°”"),
-        (0x3274, "M", "사"),
-        (0x3275, "M", "ì•„"),
-        (0x3276, "M", "�"),
-        (0x3277, "M", "ì°¨"),
-        (0x3278, "M", "ì¹´"),
-        (0x3279, "M", "타"),
-        (0x327A, "M", "파"),
-        (0x327B, "M", "하"),
-        (0x327C, "M", "참고"),
-        (0x327D, "M", "주�"),
-        (0x327E, "M", "ìš°"),
-        (0x327F, "V"),
-        (0x3280, "M", "一"),
-        (0x3281, "M", "二"),
-        (0x3282, "M", "三"),
-        (0x3283, "M", "å››"),
-        (0x3284, "M", "五"),
-        (0x3285, "M", "å…­"),
-        (0x3286, "M", "七"),
-        (0x3287, "M", "å…«"),
-        (0x3288, "M", "�"),
-        (0x3289, "M", "�"),
-        (0x328A, "M", "月"),
-        (0x328B, "M", "�"),
-        (0x328C, "M", "æ°´"),
-        (0x328D, "M", "木"),
-        (0x328E, "M", "金"),
-        (0x328F, "M", "土"),
-        (0x3290, "M", "æ—¥"),
-        (0x3291, "M", "æ ª"),
-        (0x3292, "M", "有"),
-        (0x3293, "M", "社"),
-        (0x3294, "M", "�"),
-        (0x3295, "M", "特"),
-        (0x3296, "M", "財"),
-        (0x3297, "M", "�"),
-        (0x3298, "M", "労"),
-        (0x3299, "M", "秘"),
-        (0x329A, "M", "ç”·"),
-        (0x329B, "M", "女"),
-        (0x329C, "M", "�"),
-        (0x329D, "M", "優"),
-        (0x329E, "M", "�"),
-        (0x329F, "M", "注"),
-        (0x32A0, "M", "é …"),
-        (0x32A1, "M", "休"),
-        (0x32A2, "M", "写"),
-        (0x32A3, "M", "æ­£"),
-        (0x32A4, "M", "上"),
-        (0x32A5, "M", "中"),
-        (0x32A6, "M", "下"),
-        (0x32A7, "M", "å·¦"),
-        (0x32A8, "M", "�"),
-        (0x32A9, "M", "医"),
-        (0x32AA, "M", "å®—"),
-        (0x32AB, "M", "å­¦"),
-        (0x32AC, "M", "監"),
-        (0x32AD, "M", "�"),
-        (0x32AE, "M", "資"),
-        (0x32AF, "M", "�"),
-        (0x32B0, "M", "夜"),
-        (0x32B1, "M", "36"),
-        (0x32B2, "M", "37"),
-        (0x32B3, "M", "38"),
-        (0x32B4, "M", "39"),
-        (0x32B5, "M", "40"),
-    ]
-
-
-def _seg_32() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x32B6, "M", "41"),
-        (0x32B7, "M", "42"),
-        (0x32B8, "M", "43"),
-        (0x32B9, "M", "44"),
-        (0x32BA, "M", "45"),
-        (0x32BB, "M", "46"),
-        (0x32BC, "M", "47"),
-        (0x32BD, "M", "48"),
-        (0x32BE, "M", "49"),
-        (0x32BF, "M", "50"),
-        (0x32C0, "M", "1月"),
-        (0x32C1, "M", "2月"),
-        (0x32C2, "M", "3月"),
-        (0x32C3, "M", "4月"),
-        (0x32C4, "M", "5月"),
-        (0x32C5, "M", "6月"),
-        (0x32C6, "M", "7月"),
-        (0x32C7, "M", "8月"),
-        (0x32C8, "M", "9月"),
-        (0x32C9, "M", "10月"),
-        (0x32CA, "M", "11月"),
-        (0x32CB, "M", "12月"),
-        (0x32CC, "M", "hg"),
-        (0x32CD, "M", "erg"),
-        (0x32CE, "M", "ev"),
-        (0x32CF, "M", "ltd"),
-        (0x32D0, "M", "ã‚¢"),
-        (0x32D1, "M", "イ"),
-        (0x32D2, "M", "ウ"),
-        (0x32D3, "M", "エ"),
-        (0x32D4, "M", "オ"),
-        (0x32D5, "M", "ã‚«"),
-        (0x32D6, "M", "ã‚­"),
-        (0x32D7, "M", "ク"),
-        (0x32D8, "M", "ケ"),
-        (0x32D9, "M", "コ"),
-        (0x32DA, "M", "サ"),
-        (0x32DB, "M", "ã‚·"),
-        (0x32DC, "M", "ス"),
-        (0x32DD, "M", "ã‚»"),
-        (0x32DE, "M", "ソ"),
-        (0x32DF, "M", "ã‚¿"),
-        (0x32E0, "M", "�"),
-        (0x32E1, "M", "ツ"),
-        (0x32E2, "M", "テ"),
-        (0x32E3, "M", "ト"),
-        (0x32E4, "M", "ナ"),
-        (0x32E5, "M", "ニ"),
-        (0x32E6, "M", "ヌ"),
-        (0x32E7, "M", "�"),
-        (0x32E8, "M", "ノ"),
-        (0x32E9, "M", "�"),
-        (0x32EA, "M", "ヒ"),
-        (0x32EB, "M", "フ"),
-        (0x32EC, "M", "ヘ"),
-        (0x32ED, "M", "ホ"),
-        (0x32EE, "M", "マ"),
-        (0x32EF, "M", "ミ"),
-        (0x32F0, "M", "ム"),
-        (0x32F1, "M", "メ"),
-        (0x32F2, "M", "モ"),
-        (0x32F3, "M", "ヤ"),
-        (0x32F4, "M", "ユ"),
-        (0x32F5, "M", "ヨ"),
-        (0x32F6, "M", "ラ"),
-        (0x32F7, "M", "リ"),
-        (0x32F8, "M", "ル"),
-        (0x32F9, "M", "レ"),
-        (0x32FA, "M", "ロ"),
-        (0x32FB, "M", "ワ"),
-        (0x32FC, "M", "ヰ"),
-        (0x32FD, "M", "ヱ"),
-        (0x32FE, "M", "ヲ"),
-        (0x32FF, "M", "令和"),
-        (0x3300, "M", "アパート"),
-        (0x3301, "M", "アルファ"),
-        (0x3302, "M", "アンペア"),
-        (0x3303, "M", "アール"),
-        (0x3304, "M", "イニング"),
-        (0x3305, "M", "イン�"),
-        (0x3306, "M", "ウォン"),
-        (0x3307, "M", "エスクード"),
-        (0x3308, "M", "エーカー"),
-        (0x3309, "M", "オンス"),
-        (0x330A, "M", "オーム"),
-        (0x330B, "M", "カイリ"),
-        (0x330C, "M", "カラット"),
-        (0x330D, "M", "カロリー"),
-        (0x330E, "M", "ガロン"),
-        (0x330F, "M", "ガンマ"),
-        (0x3310, "M", "ギガ"),
-        (0x3311, "M", "ギニー"),
-        (0x3312, "M", "キュリー"),
-        (0x3313, "M", "ギルダー"),
-        (0x3314, "M", "キロ"),
-        (0x3315, "M", "キログラム"),
-        (0x3316, "M", "キロメートル"),
-        (0x3317, "M", "キロワット"),
-        (0x3318, "M", "グラム"),
-        (0x3319, "M", "グラムトン"),
-    ]
-
-
-def _seg_33() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x331A, "M", "クルゼイロ"),
-        (0x331B, "M", "クロー�"),
-        (0x331C, "M", "ケース"),
-        (0x331D, "M", "コルナ"),
-        (0x331E, "M", "コー�"),
-        (0x331F, "M", "サイクル"),
-        (0x3320, "M", "サン�ーム"),
-        (0x3321, "M", "シリング"),
-        (0x3322, "M", "セン�"),
-        (0x3323, "M", "セント"),
-        (0x3324, "M", "ダース"),
-        (0x3325, "M", "デシ"),
-        (0x3326, "M", "ドル"),
-        (0x3327, "M", "トン"),
-        (0x3328, "M", "ナノ"),
-        (0x3329, "M", "ノット"),
-        (0x332A, "M", "�イツ"),
-        (0x332B, "M", "パーセント"),
-        (0x332C, "M", "パーツ"),
-        (0x332D, "M", "�ーレル"),
-        (0x332E, "M", "ピアストル"),
-        (0x332F, "M", "ピクル"),
-        (0x3330, "M", "ピコ"),
-        (0x3331, "M", "ビル"),
-        (0x3332, "M", "ファラッド"),
-        (0x3333, "M", "フィート"),
-        (0x3334, "M", "ブッシェル"),
-        (0x3335, "M", "フラン"),
-        (0x3336, "M", "ヘクタール"),
-        (0x3337, "M", "ペソ"),
-        (0x3338, "M", "ペニヒ"),
-        (0x3339, "M", "ヘルツ"),
-        (0x333A, "M", "ペンス"),
-        (0x333B, "M", "ページ"),
-        (0x333C, "M", "ベータ"),
-        (0x333D, "M", "�イント"),
-        (0x333E, "M", "ボルト"),
-        (0x333F, "M", "ホン"),
-        (0x3340, "M", "�ンド"),
-        (0x3341, "M", "ホール"),
-        (0x3342, "M", "ホーン"),
-        (0x3343, "M", "マイクロ"),
-        (0x3344, "M", "マイル"),
-        (0x3345, "M", "マッ�"),
-        (0x3346, "M", "マルク"),
-        (0x3347, "M", "マンション"),
-        (0x3348, "M", "ミクロン"),
-        (0x3349, "M", "ミリ"),
-        (0x334A, "M", "ミリ�ール"),
-        (0x334B, "M", "メガ"),
-        (0x334C, "M", "メガトン"),
-        (0x334D, "M", "メートル"),
-        (0x334E, "M", "ヤード"),
-        (0x334F, "M", "ヤール"),
-        (0x3350, "M", "ユアン"),
-        (0x3351, "M", "リットル"),
-        (0x3352, "M", "リラ"),
-        (0x3353, "M", "ルピー"),
-        (0x3354, "M", "ルーブル"),
-        (0x3355, "M", "レム"),
-        (0x3356, "M", "レントゲン"),
-        (0x3357, "M", "ワット"),
-        (0x3358, "M", "0点"),
-        (0x3359, "M", "1点"),
-        (0x335A, "M", "2点"),
-        (0x335B, "M", "3点"),
-        (0x335C, "M", "4点"),
-        (0x335D, "M", "5点"),
-        (0x335E, "M", "6点"),
-        (0x335F, "M", "7点"),
-        (0x3360, "M", "8点"),
-        (0x3361, "M", "9点"),
-        (0x3362, "M", "10点"),
-        (0x3363, "M", "11点"),
-        (0x3364, "M", "12点"),
-        (0x3365, "M", "13点"),
-        (0x3366, "M", "14点"),
-        (0x3367, "M", "15点"),
-        (0x3368, "M", "16点"),
-        (0x3369, "M", "17点"),
-        (0x336A, "M", "18点"),
-        (0x336B, "M", "19点"),
-        (0x336C, "M", "20点"),
-        (0x336D, "M", "21点"),
-        (0x336E, "M", "22点"),
-        (0x336F, "M", "23点"),
-        (0x3370, "M", "24点"),
-        (0x3371, "M", "hpa"),
-        (0x3372, "M", "da"),
-        (0x3373, "M", "au"),
-        (0x3374, "M", "bar"),
-        (0x3375, "M", "ov"),
-        (0x3376, "M", "pc"),
-        (0x3377, "M", "dm"),
-        (0x3378, "M", "dm2"),
-        (0x3379, "M", "dm3"),
-        (0x337A, "M", "iu"),
-        (0x337B, "M", "平�"),
-        (0x337C, "M", "昭和"),
-        (0x337D, "M", "大正"),
-    ]
-
-
-def _seg_34() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x337E, "M", "明治"),
-        (0x337F, "M", "株�会社"),
-        (0x3380, "M", "pa"),
-        (0x3381, "M", "na"),
-        (0x3382, "M", "μa"),
-        (0x3383, "M", "ma"),
-        (0x3384, "M", "ka"),
-        (0x3385, "M", "kb"),
-        (0x3386, "M", "mb"),
-        (0x3387, "M", "gb"),
-        (0x3388, "M", "cal"),
-        (0x3389, "M", "kcal"),
-        (0x338A, "M", "pf"),
-        (0x338B, "M", "nf"),
-        (0x338C, "M", "μf"),
-        (0x338D, "M", "μg"),
-        (0x338E, "M", "mg"),
-        (0x338F, "M", "kg"),
-        (0x3390, "M", "hz"),
-        (0x3391, "M", "khz"),
-        (0x3392, "M", "mhz"),
-        (0x3393, "M", "ghz"),
-        (0x3394, "M", "thz"),
-        (0x3395, "M", "μl"),
-        (0x3396, "M", "ml"),
-        (0x3397, "M", "dl"),
-        (0x3398, "M", "kl"),
-        (0x3399, "M", "fm"),
-        (0x339A, "M", "nm"),
-        (0x339B, "M", "μm"),
-        (0x339C, "M", "mm"),
-        (0x339D, "M", "cm"),
-        (0x339E, "M", "km"),
-        (0x339F, "M", "mm2"),
-        (0x33A0, "M", "cm2"),
-        (0x33A1, "M", "m2"),
-        (0x33A2, "M", "km2"),
-        (0x33A3, "M", "mm3"),
-        (0x33A4, "M", "cm3"),
-        (0x33A5, "M", "m3"),
-        (0x33A6, "M", "km3"),
-        (0x33A7, "M", "m∕s"),
-        (0x33A8, "M", "m∕s2"),
-        (0x33A9, "M", "pa"),
-        (0x33AA, "M", "kpa"),
-        (0x33AB, "M", "mpa"),
-        (0x33AC, "M", "gpa"),
-        (0x33AD, "M", "rad"),
-        (0x33AE, "M", "rad∕s"),
-        (0x33AF, "M", "rad∕s2"),
-        (0x33B0, "M", "ps"),
-        (0x33B1, "M", "ns"),
-        (0x33B2, "M", "μs"),
-        (0x33B3, "M", "ms"),
-        (0x33B4, "M", "pv"),
-        (0x33B5, "M", "nv"),
-        (0x33B6, "M", "μv"),
-        (0x33B7, "M", "mv"),
-        (0x33B8, "M", "kv"),
-        (0x33B9, "M", "mv"),
-        (0x33BA, "M", "pw"),
-        (0x33BB, "M", "nw"),
-        (0x33BC, "M", "μw"),
-        (0x33BD, "M", "mw"),
-        (0x33BE, "M", "kw"),
-        (0x33BF, "M", "mw"),
-        (0x33C0, "M", "kω"),
-        (0x33C1, "M", "mω"),
-        (0x33C2, "X"),
-        (0x33C3, "M", "bq"),
-        (0x33C4, "M", "cc"),
-        (0x33C5, "M", "cd"),
-        (0x33C6, "M", "c∕kg"),
-        (0x33C7, "X"),
-        (0x33C8, "M", "db"),
-        (0x33C9, "M", "gy"),
-        (0x33CA, "M", "ha"),
-        (0x33CB, "M", "hp"),
-        (0x33CC, "M", "in"),
-        (0x33CD, "M", "kk"),
-        (0x33CE, "M", "km"),
-        (0x33CF, "M", "kt"),
-        (0x33D0, "M", "lm"),
-        (0x33D1, "M", "ln"),
-        (0x33D2, "M", "log"),
-        (0x33D3, "M", "lx"),
-        (0x33D4, "M", "mb"),
-        (0x33D5, "M", "mil"),
-        (0x33D6, "M", "mol"),
-        (0x33D7, "M", "ph"),
-        (0x33D8, "X"),
-        (0x33D9, "M", "ppm"),
-        (0x33DA, "M", "pr"),
-        (0x33DB, "M", "sr"),
-        (0x33DC, "M", "sv"),
-        (0x33DD, "M", "wb"),
-        (0x33DE, "M", "v∕m"),
-        (0x33DF, "M", "a∕m"),
-        (0x33E0, "M", "1æ—¥"),
-        (0x33E1, "M", "2æ—¥"),
-    ]
-
-
-def _seg_35() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x33E2, "M", "3æ—¥"),
-        (0x33E3, "M", "4æ—¥"),
-        (0x33E4, "M", "5æ—¥"),
-        (0x33E5, "M", "6æ—¥"),
-        (0x33E6, "M", "7æ—¥"),
-        (0x33E7, "M", "8æ—¥"),
-        (0x33E8, "M", "9æ—¥"),
-        (0x33E9, "M", "10æ—¥"),
-        (0x33EA, "M", "11æ—¥"),
-        (0x33EB, "M", "12æ—¥"),
-        (0x33EC, "M", "13æ—¥"),
-        (0x33ED, "M", "14æ—¥"),
-        (0x33EE, "M", "15æ—¥"),
-        (0x33EF, "M", "16æ—¥"),
-        (0x33F0, "M", "17æ—¥"),
-        (0x33F1, "M", "18æ—¥"),
-        (0x33F2, "M", "19æ—¥"),
-        (0x33F3, "M", "20æ—¥"),
-        (0x33F4, "M", "21æ—¥"),
-        (0x33F5, "M", "22æ—¥"),
-        (0x33F6, "M", "23æ—¥"),
-        (0x33F7, "M", "24æ—¥"),
-        (0x33F8, "M", "25æ—¥"),
-        (0x33F9, "M", "26æ—¥"),
-        (0x33FA, "M", "27æ—¥"),
-        (0x33FB, "M", "28æ—¥"),
-        (0x33FC, "M", "29æ—¥"),
-        (0x33FD, "M", "30æ—¥"),
-        (0x33FE, "M", "31æ—¥"),
-        (0x33FF, "M", "gal"),
-        (0x3400, "V"),
-        (0xA48D, "X"),
-        (0xA490, "V"),
-        (0xA4C7, "X"),
-        (0xA4D0, "V"),
-        (0xA62C, "X"),
-        (0xA640, "M", "�"),
-        (0xA641, "V"),
-        (0xA642, "M", "ꙃ"),
-        (0xA643, "V"),
-        (0xA644, "M", "ê™…"),
-        (0xA645, "V"),
-        (0xA646, "M", "ꙇ"),
-        (0xA647, "V"),
-        (0xA648, "M", "ꙉ"),
-        (0xA649, "V"),
-        (0xA64A, "M", "ꙋ"),
-        (0xA64B, "V"),
-        (0xA64C, "M", "�"),
-        (0xA64D, "V"),
-        (0xA64E, "M", "�"),
-        (0xA64F, "V"),
-        (0xA650, "M", "ꙑ"),
-        (0xA651, "V"),
-        (0xA652, "M", "ꙓ"),
-        (0xA653, "V"),
-        (0xA654, "M", "ꙕ"),
-        (0xA655, "V"),
-        (0xA656, "M", "ê™—"),
-        (0xA657, "V"),
-        (0xA658, "M", "ê™™"),
-        (0xA659, "V"),
-        (0xA65A, "M", "ê™›"),
-        (0xA65B, "V"),
-        (0xA65C, "M", "�"),
-        (0xA65D, "V"),
-        (0xA65E, "M", "ꙟ"),
-        (0xA65F, "V"),
-        (0xA660, "M", "ꙡ"),
-        (0xA661, "V"),
-        (0xA662, "M", "ꙣ"),
-        (0xA663, "V"),
-        (0xA664, "M", "ꙥ"),
-        (0xA665, "V"),
-        (0xA666, "M", "ꙧ"),
-        (0xA667, "V"),
-        (0xA668, "M", "ꙩ"),
-        (0xA669, "V"),
-        (0xA66A, "M", "ꙫ"),
-        (0xA66B, "V"),
-        (0xA66C, "M", "ê™­"),
-        (0xA66D, "V"),
-        (0xA680, "M", "�"),
-        (0xA681, "V"),
-        (0xA682, "M", "ꚃ"),
-        (0xA683, "V"),
-        (0xA684, "M", "êš…"),
-        (0xA685, "V"),
-        (0xA686, "M", "ꚇ"),
-        (0xA687, "V"),
-        (0xA688, "M", "ꚉ"),
-        (0xA689, "V"),
-        (0xA68A, "M", "êš‹"),
-        (0xA68B, "V"),
-        (0xA68C, "M", "�"),
-        (0xA68D, "V"),
-        (0xA68E, "M", "�"),
-        (0xA68F, "V"),
-        (0xA690, "M", "êš‘"),
-        (0xA691, "V"),
-    ]
-
-
-def _seg_36() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xA692, "M", "êš“"),
-        (0xA693, "V"),
-        (0xA694, "M", "êš•"),
-        (0xA695, "V"),
-        (0xA696, "M", "êš—"),
-        (0xA697, "V"),
-        (0xA698, "M", "êš™"),
-        (0xA699, "V"),
-        (0xA69A, "M", "êš›"),
-        (0xA69B, "V"),
-        (0xA69C, "M", "ÑŠ"),
-        (0xA69D, "M", "ь"),
-        (0xA69E, "V"),
-        (0xA6F8, "X"),
-        (0xA700, "V"),
-        (0xA722, "M", "ꜣ"),
-        (0xA723, "V"),
-        (0xA724, "M", "ꜥ"),
-        (0xA725, "V"),
-        (0xA726, "M", "ꜧ"),
-        (0xA727, "V"),
-        (0xA728, "M", "ꜩ"),
-        (0xA729, "V"),
-        (0xA72A, "M", "ꜫ"),
-        (0xA72B, "V"),
-        (0xA72C, "M", "ꜭ"),
-        (0xA72D, "V"),
-        (0xA72E, "M", "ꜯ"),
-        (0xA72F, "V"),
-        (0xA732, "M", "ꜳ"),
-        (0xA733, "V"),
-        (0xA734, "M", "ꜵ"),
-        (0xA735, "V"),
-        (0xA736, "M", "ꜷ"),
-        (0xA737, "V"),
-        (0xA738, "M", "ꜹ"),
-        (0xA739, "V"),
-        (0xA73A, "M", "ꜻ"),
-        (0xA73B, "V"),
-        (0xA73C, "M", "ꜽ"),
-        (0xA73D, "V"),
-        (0xA73E, "M", "ꜿ"),
-        (0xA73F, "V"),
-        (0xA740, "M", "�"),
-        (0xA741, "V"),
-        (0xA742, "M", "�"),
-        (0xA743, "V"),
-        (0xA744, "M", "�"),
-        (0xA745, "V"),
-        (0xA746, "M", "�"),
-        (0xA747, "V"),
-        (0xA748, "M", "�"),
-        (0xA749, "V"),
-        (0xA74A, "M", "�"),
-        (0xA74B, "V"),
-        (0xA74C, "M", "�"),
-        (0xA74D, "V"),
-        (0xA74E, "M", "�"),
-        (0xA74F, "V"),
-        (0xA750, "M", "�"),
-        (0xA751, "V"),
-        (0xA752, "M", "�"),
-        (0xA753, "V"),
-        (0xA754, "M", "�"),
-        (0xA755, "V"),
-        (0xA756, "M", "�"),
-        (0xA757, "V"),
-        (0xA758, "M", "�"),
-        (0xA759, "V"),
-        (0xA75A, "M", "�"),
-        (0xA75B, "V"),
-        (0xA75C, "M", "�"),
-        (0xA75D, "V"),
-        (0xA75E, "M", "�"),
-        (0xA75F, "V"),
-        (0xA760, "M", "�"),
-        (0xA761, "V"),
-        (0xA762, "M", "�"),
-        (0xA763, "V"),
-        (0xA764, "M", "�"),
-        (0xA765, "V"),
-        (0xA766, "M", "�"),
-        (0xA767, "V"),
-        (0xA768, "M", "�"),
-        (0xA769, "V"),
-        (0xA76A, "M", "�"),
-        (0xA76B, "V"),
-        (0xA76C, "M", "�"),
-        (0xA76D, "V"),
-        (0xA76E, "M", "�"),
-        (0xA76F, "V"),
-        (0xA770, "M", "�"),
-        (0xA771, "V"),
-        (0xA779, "M", "�"),
-        (0xA77A, "V"),
-        (0xA77B, "M", "�"),
-        (0xA77C, "V"),
-        (0xA77D, "M", "áµ¹"),
-        (0xA77E, "M", "�"),
-        (0xA77F, "V"),
-    ]
-
-
-def _seg_37() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xA780, "M", "�"),
-        (0xA781, "V"),
-        (0xA782, "M", "ꞃ"),
-        (0xA783, "V"),
-        (0xA784, "M", "êž…"),
-        (0xA785, "V"),
-        (0xA786, "M", "ꞇ"),
-        (0xA787, "V"),
-        (0xA78B, "M", "ꞌ"),
-        (0xA78C, "V"),
-        (0xA78D, "M", "É¥"),
-        (0xA78E, "V"),
-        (0xA790, "M", "êž‘"),
-        (0xA791, "V"),
-        (0xA792, "M", "êž“"),
-        (0xA793, "V"),
-        (0xA796, "M", "êž—"),
-        (0xA797, "V"),
-        (0xA798, "M", "êž™"),
-        (0xA799, "V"),
-        (0xA79A, "M", "êž›"),
-        (0xA79B, "V"),
-        (0xA79C, "M", "�"),
-        (0xA79D, "V"),
-        (0xA79E, "M", "ꞟ"),
-        (0xA79F, "V"),
-        (0xA7A0, "M", "êž¡"),
-        (0xA7A1, "V"),
-        (0xA7A2, "M", "ꞣ"),
-        (0xA7A3, "V"),
-        (0xA7A4, "M", "ꞥ"),
-        (0xA7A5, "V"),
-        (0xA7A6, "M", "ꞧ"),
-        (0xA7A7, "V"),
-        (0xA7A8, "M", "êž©"),
-        (0xA7A9, "V"),
-        (0xA7AA, "M", "ɦ"),
-        (0xA7AB, "M", "ɜ"),
-        (0xA7AC, "M", "É¡"),
-        (0xA7AD, "M", "ɬ"),
-        (0xA7AE, "M", "ɪ"),
-        (0xA7AF, "V"),
-        (0xA7B0, "M", "Êž"),
-        (0xA7B1, "M", "ʇ"),
-        (0xA7B2, "M", "�"),
-        (0xA7B3, "M", "ê­“"),
-        (0xA7B4, "M", "êžµ"),
-        (0xA7B5, "V"),
-        (0xA7B6, "M", "êž·"),
-        (0xA7B7, "V"),
-        (0xA7B8, "M", "êž¹"),
-        (0xA7B9, "V"),
-        (0xA7BA, "M", "êž»"),
-        (0xA7BB, "V"),
-        (0xA7BC, "M", "êž½"),
-        (0xA7BD, "V"),
-        (0xA7BE, "M", "êž¿"),
-        (0xA7BF, "V"),
-        (0xA7C0, "M", "�"),
-        (0xA7C1, "V"),
-        (0xA7C2, "M", "ꟃ"),
-        (0xA7C3, "V"),
-        (0xA7C4, "M", "êž”"),
-        (0xA7C5, "M", "Ê‚"),
-        (0xA7C6, "M", "ᶎ"),
-        (0xA7C7, "M", "ꟈ"),
-        (0xA7C8, "V"),
-        (0xA7C9, "M", "ꟊ"),
-        (0xA7CA, "V"),
-        (0xA7CB, "X"),
-        (0xA7D0, "M", "ꟑ"),
-        (0xA7D1, "V"),
-        (0xA7D2, "X"),
-        (0xA7D3, "V"),
-        (0xA7D4, "X"),
-        (0xA7D5, "V"),
-        (0xA7D6, "M", "ꟗ"),
-        (0xA7D7, "V"),
-        (0xA7D8, "M", "ꟙ"),
-        (0xA7D9, "V"),
-        (0xA7DA, "X"),
-        (0xA7F2, "M", "c"),
-        (0xA7F3, "M", "f"),
-        (0xA7F4, "M", "q"),
-        (0xA7F5, "M", "ꟶ"),
-        (0xA7F6, "V"),
-        (0xA7F8, "M", "ħ"),
-        (0xA7F9, "M", "Å“"),
-        (0xA7FA, "V"),
-        (0xA82D, "X"),
-        (0xA830, "V"),
-        (0xA83A, "X"),
-        (0xA840, "V"),
-        (0xA878, "X"),
-        (0xA880, "V"),
-        (0xA8C6, "X"),
-        (0xA8CE, "V"),
-        (0xA8DA, "X"),
-        (0xA8E0, "V"),
-        (0xA954, "X"),
-    ]
-
-
-def _seg_38() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xA95F, "V"),
-        (0xA97D, "X"),
-        (0xA980, "V"),
-        (0xA9CE, "X"),
-        (0xA9CF, "V"),
-        (0xA9DA, "X"),
-        (0xA9DE, "V"),
-        (0xA9FF, "X"),
-        (0xAA00, "V"),
-        (0xAA37, "X"),
-        (0xAA40, "V"),
-        (0xAA4E, "X"),
-        (0xAA50, "V"),
-        (0xAA5A, "X"),
-        (0xAA5C, "V"),
-        (0xAAC3, "X"),
-        (0xAADB, "V"),
-        (0xAAF7, "X"),
-        (0xAB01, "V"),
-        (0xAB07, "X"),
-        (0xAB09, "V"),
-        (0xAB0F, "X"),
-        (0xAB11, "V"),
-        (0xAB17, "X"),
-        (0xAB20, "V"),
-        (0xAB27, "X"),
-        (0xAB28, "V"),
-        (0xAB2F, "X"),
-        (0xAB30, "V"),
-        (0xAB5C, "M", "ꜧ"),
-        (0xAB5D, "M", "ꬷ"),
-        (0xAB5E, "M", "É«"),
-        (0xAB5F, "M", "ê­’"),
-        (0xAB60, "V"),
-        (0xAB69, "M", "�"),
-        (0xAB6A, "V"),
-        (0xAB6C, "X"),
-        (0xAB70, "M", "Ꭰ"),
-        (0xAB71, "M", "Ꭱ"),
-        (0xAB72, "M", "Ꭲ"),
-        (0xAB73, "M", "Ꭳ"),
-        (0xAB74, "M", "Ꭴ"),
-        (0xAB75, "M", "Ꭵ"),
-        (0xAB76, "M", "Ꭶ"),
-        (0xAB77, "M", "Ꭷ"),
-        (0xAB78, "M", "Ꭸ"),
-        (0xAB79, "M", "Ꭹ"),
-        (0xAB7A, "M", "Ꭺ"),
-        (0xAB7B, "M", "Ꭻ"),
-        (0xAB7C, "M", "Ꭼ"),
-        (0xAB7D, "M", "Ꭽ"),
-        (0xAB7E, "M", "Ꭾ"),
-        (0xAB7F, "M", "Ꭿ"),
-        (0xAB80, "M", "Ꮀ"),
-        (0xAB81, "M", "Ꮁ"),
-        (0xAB82, "M", "Ꮂ"),
-        (0xAB83, "M", "Ꮃ"),
-        (0xAB84, "M", "Ꮄ"),
-        (0xAB85, "M", "Ꮅ"),
-        (0xAB86, "M", "Ꮆ"),
-        (0xAB87, "M", "Ꮇ"),
-        (0xAB88, "M", "Ꮈ"),
-        (0xAB89, "M", "Ꮉ"),
-        (0xAB8A, "M", "Ꮊ"),
-        (0xAB8B, "M", "Ꮋ"),
-        (0xAB8C, "M", "Ꮌ"),
-        (0xAB8D, "M", "Ꮍ"),
-        (0xAB8E, "M", "Ꮎ"),
-        (0xAB8F, "M", "Ꮏ"),
-        (0xAB90, "M", "�"),
-        (0xAB91, "M", "�"),
-        (0xAB92, "M", "�"),
-        (0xAB93, "M", "�"),
-        (0xAB94, "M", "�"),
-        (0xAB95, "M", "�"),
-        (0xAB96, "M", "�"),
-        (0xAB97, "M", "�"),
-        (0xAB98, "M", "�"),
-        (0xAB99, "M", "�"),
-        (0xAB9A, "M", "�"),
-        (0xAB9B, "M", "�"),
-        (0xAB9C, "M", "�"),
-        (0xAB9D, "M", "�"),
-        (0xAB9E, "M", "�"),
-        (0xAB9F, "M", "�"),
-        (0xABA0, "M", "�"),
-        (0xABA1, "M", "�"),
-        (0xABA2, "M", "�"),
-        (0xABA3, "M", "�"),
-        (0xABA4, "M", "�"),
-        (0xABA5, "M", "�"),
-        (0xABA6, "M", "�"),
-        (0xABA7, "M", "�"),
-        (0xABA8, "M", "�"),
-        (0xABA9, "M", "�"),
-        (0xABAA, "M", "�"),
-        (0xABAB, "M", "�"),
-        (0xABAC, "M", "�"),
-        (0xABAD, "M", "�"),
-        (0xABAE, "M", "�"),
-    ]
-
-
-def _seg_39() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xABAF, "M", "�"),
-        (0xABB0, "M", "�"),
-        (0xABB1, "M", "�"),
-        (0xABB2, "M", "�"),
-        (0xABB3, "M", "�"),
-        (0xABB4, "M", "�"),
-        (0xABB5, "M", "�"),
-        (0xABB6, "M", "�"),
-        (0xABB7, "M", "�"),
-        (0xABB8, "M", "�"),
-        (0xABB9, "M", "�"),
-        (0xABBA, "M", "�"),
-        (0xABBB, "M", "�"),
-        (0xABBC, "M", "�"),
-        (0xABBD, "M", "�"),
-        (0xABBE, "M", "�"),
-        (0xABBF, "M", "�"),
-        (0xABC0, "V"),
-        (0xABEE, "X"),
-        (0xABF0, "V"),
-        (0xABFA, "X"),
-        (0xAC00, "V"),
-        (0xD7A4, "X"),
-        (0xD7B0, "V"),
-        (0xD7C7, "X"),
-        (0xD7CB, "V"),
-        (0xD7FC, "X"),
-        (0xF900, "M", "豈"),
-        (0xF901, "M", "æ›´"),
-        (0xF902, "M", "車"),
-        (0xF903, "M", "賈"),
-        (0xF904, "M", "滑"),
-        (0xF905, "M", "串"),
-        (0xF906, "M", "�"),
-        (0xF907, "M", "龜"),
-        (0xF909, "M", "契"),
-        (0xF90A, "M", "金"),
-        (0xF90B, "M", "å–‡"),
-        (0xF90C, "M", "奈"),
-        (0xF90D, "M", "懶"),
-        (0xF90E, "M", "癩"),
-        (0xF90F, "M", "ç¾…"),
-        (0xF910, "M", "蘿"),
-        (0xF911, "M", "螺"),
-        (0xF912, "M", "裸"),
-        (0xF913, "M", "�"),
-        (0xF914, "M", "樂"),
-        (0xF915, "M", "æ´›"),
-        (0xF916, "M", "烙"),
-        (0xF917, "M", "�"),
-        (0xF918, "M", "�"),
-        (0xF919, "M", "é…ª"),
-        (0xF91A, "M", "駱"),
-        (0xF91B, "M", "亂"),
-        (0xF91C, "M", "�"),
-        (0xF91D, "M", "欄"),
-        (0xF91E, "M", "爛"),
-        (0xF91F, "M", "蘭"),
-        (0xF920, "M", "鸞"),
-        (0xF921, "M", "�"),
-        (0xF922, "M", "æ¿«"),
-        (0xF923, "M", "è—�"),
-        (0xF924, "M", "襤"),
-        (0xF925, "M", "拉"),
-        (0xF926, "M", "臘"),
-        (0xF927, "M", "è Ÿ"),
-        (0xF928, "M", "廊"),
-        (0xF929, "M", "朗"),
-        (0xF92A, "M", "浪"),
-        (0xF92B, "M", "狼"),
-        (0xF92C, "M", "郎"),
-        (0xF92D, "M", "來"),
-        (0xF92E, "M", "冷"),
-        (0xF92F, "M", "å‹ž"),
-        (0xF930, "M", "æ“„"),
-        (0xF931, "M", "æ«“"),
-        (0xF932, "M", "�"),
-        (0xF933, "M", "盧"),
-        (0xF934, "M", "�"),
-        (0xF935, "M", "蘆"),
-        (0xF936, "M", "虜"),
-        (0xF937, "M", "è·¯"),
-        (0xF938, "M", "露"),
-        (0xF939, "M", "é­¯"),
-        (0xF93A, "M", "é·º"),
-        (0xF93B, "M", "碌"),
-        (0xF93C, "M", "祿"),
-        (0xF93D, "M", "綠"),
-        (0xF93E, "M", "�"),
-        (0xF93F, "M", "錄"),
-        (0xF940, "M", "鹿"),
-        (0xF941, "M", "è«–"),
-        (0xF942, "M", "壟"),
-        (0xF943, "M", "弄"),
-        (0xF944, "M", "ç± "),
-        (0xF945, "M", "�"),
-        (0xF946, "M", "牢"),
-        (0xF947, "M", "磊"),
-        (0xF948, "M", "賂"),
-        (0xF949, "M", "é›·"),
-    ]
-
-
-def _seg_40() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xF94A, "M", "壘"),
-        (0xF94B, "M", "å±¢"),
-        (0xF94C, "M", "樓"),
-        (0xF94D, "M", "æ·š"),
-        (0xF94E, "M", "�"),
-        (0xF94F, "M", "ç´¯"),
-        (0xF950, "M", "縷"),
-        (0xF951, "M", "陋"),
-        (0xF952, "M", "å‹’"),
-        (0xF953, "M", "è‚‹"),
-        (0xF954, "M", "凜"),
-        (0xF955, "M", "凌"),
-        (0xF956, "M", "稜"),
-        (0xF957, "M", "綾"),
-        (0xF958, "M", "�"),
-        (0xF959, "M", "陵"),
-        (0xF95A, "M", "讀"),
-        (0xF95B, "M", "�"),
-        (0xF95C, "M", "樂"),
-        (0xF95D, "M", "諾"),
-        (0xF95E, "M", "丹"),
-        (0xF95F, "M", "寧"),
-        (0xF960, "M", "怒"),
-        (0xF961, "M", "率"),
-        (0xF962, "M", "ç•°"),
-        (0xF963, "M", "北"),
-        (0xF964, "M", "磻"),
-        (0xF965, "M", "便"),
-        (0xF966, "M", "復"),
-        (0xF967, "M", "�"),
-        (0xF968, "M", "泌"),
-        (0xF969, "M", "數"),
-        (0xF96A, "M", "ç´¢"),
-        (0xF96B, "M", "�"),
-        (0xF96C, "M", "å¡ž"),
-        (0xF96D, "M", "�"),
-        (0xF96E, "M", "葉"),
-        (0xF96F, "M", "說"),
-        (0xF970, "M", "殺"),
-        (0xF971, "M", "è¾°"),
-        (0xF972, "M", "沈"),
-        (0xF973, "M", "拾"),
-        (0xF974, "M", "è‹¥"),
-        (0xF975, "M", "掠"),
-        (0xF976, "M", "ç•¥"),
-        (0xF977, "M", "亮"),
-        (0xF978, "M", "å…©"),
-        (0xF979, "M", "凉"),
-        (0xF97A, "M", "�"),
-        (0xF97B, "M", "糧"),
-        (0xF97C, "M", "良"),
-        (0xF97D, "M", "è«’"),
-        (0xF97E, "M", "�"),
-        (0xF97F, "M", "勵"),
-        (0xF980, "M", "å‘‚"),
-        (0xF981, "M", "女"),
-        (0xF982, "M", "廬"),
-        (0xF983, "M", "æ—…"),
-        (0xF984, "M", "濾"),
-        (0xF985, "M", "礪"),
-        (0xF986, "M", "é–­"),
-        (0xF987, "M", "驪"),
-        (0xF988, "M", "麗"),
-        (0xF989, "M", "黎"),
-        (0xF98A, "M", "力"),
-        (0xF98B, "M", "曆"),
-        (0xF98C, "M", "æ­·"),
-        (0xF98D, "M", "è½¢"),
-        (0xF98E, "M", "å¹´"),
-        (0xF98F, "M", "�"),
-        (0xF990, "M", "戀"),
-        (0xF991, "M", "æ’š"),
-        (0xF992, "M", "æ¼£"),
-        (0xF993, "M", "ç…‰"),
-        (0xF994, "M", "ç’‰"),
-        (0xF995, "M", "秊"),
-        (0xF996, "M", "ç·´"),
-        (0xF997, "M", "�"),
-        (0xF998, "M", "輦"),
-        (0xF999, "M", "è“®"),
-        (0xF99A, "M", "連"),
-        (0xF99B, "M", "�"),
-        (0xF99C, "M", "列"),
-        (0xF99D, "M", "劣"),
-        (0xF99E, "M", "å’½"),
-        (0xF99F, "M", "烈"),
-        (0xF9A0, "M", "裂"),
-        (0xF9A1, "M", "說"),
-        (0xF9A2, "M", "廉"),
-        (0xF9A3, "M", "念"),
-        (0xF9A4, "M", "�"),
-        (0xF9A5, "M", "æ®®"),
-        (0xF9A6, "M", "ç°¾"),
-        (0xF9A7, "M", "�"),
-        (0xF9A8, "M", "令"),
-        (0xF9A9, "M", "囹"),
-        (0xF9AA, "M", "寧"),
-        (0xF9AB, "M", "嶺"),
-        (0xF9AC, "M", "怜"),
-        (0xF9AD, "M", "玲"),
-    ]
-
-
-def _seg_41() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xF9AE, "M", "ç‘©"),
-        (0xF9AF, "M", "羚"),
-        (0xF9B0, "M", "�"),
-        (0xF9B1, "M", "鈴"),
-        (0xF9B2, "M", "零"),
-        (0xF9B3, "M", "�"),
-        (0xF9B4, "M", "é ˜"),
-        (0xF9B5, "M", "例"),
-        (0xF9B6, "M", "禮"),
-        (0xF9B7, "M", "醴"),
-        (0xF9B8, "M", "隸"),
-        (0xF9B9, "M", "惡"),
-        (0xF9BA, "M", "了"),
-        (0xF9BB, "M", "僚"),
-        (0xF9BC, "M", "寮"),
-        (0xF9BD, "M", "å°¿"),
-        (0xF9BE, "M", "æ–™"),
-        (0xF9BF, "M", "樂"),
-        (0xF9C0, "M", "燎"),
-        (0xF9C1, "M", "療"),
-        (0xF9C2, "M", "蓼"),
-        (0xF9C3, "M", "�"),
-        (0xF9C4, "M", "�"),
-        (0xF9C5, "M", "暈"),
-        (0xF9C6, "M", "阮"),
-        (0xF9C7, "M", "劉"),
-        (0xF9C8, "M", "�"),
-        (0xF9C9, "M", "柳"),
-        (0xF9CA, "M", "�"),
-        (0xF9CB, "M", "溜"),
-        (0xF9CC, "M", "�"),
-        (0xF9CD, "M", "ç•™"),
-        (0xF9CE, "M", "ç¡«"),
-        (0xF9CF, "M", "ç´�"),
-        (0xF9D0, "M", "é¡ž"),
-        (0xF9D1, "M", "å…­"),
-        (0xF9D2, "M", "戮"),
-        (0xF9D3, "M", "陸"),
-        (0xF9D4, "M", "倫"),
-        (0xF9D5, "M", "å´™"),
-        (0xF9D6, "M", "æ·ª"),
-        (0xF9D7, "M", "輪"),
-        (0xF9D8, "M", "律"),
-        (0xF9D9, "M", "æ…„"),
-        (0xF9DA, "M", "æ —"),
-        (0xF9DB, "M", "率"),
-        (0xF9DC, "M", "隆"),
-        (0xF9DD, "M", "利"),
-        (0xF9DE, "M", "�"),
-        (0xF9DF, "M", "å±¥"),
-        (0xF9E0, "M", "易"),
-        (0xF9E1, "M", "�"),
-        (0xF9E2, "M", "梨"),
-        (0xF9E3, "M", "æ³¥"),
-        (0xF9E4, "M", "�"),
-        (0xF9E5, "M", "ç—¢"),
-        (0xF9E6, "M", "ç½¹"),
-        (0xF9E7, "M", "�"),
-        (0xF9E8, "M", "裡"),
-        (0xF9E9, "M", "里"),
-        (0xF9EA, "M", "離"),
-        (0xF9EB, "M", "匿"),
-        (0xF9EC, "M", "溺"),
-        (0xF9ED, "M", "�"),
-        (0xF9EE, "M", "�"),
-        (0xF9EF, "M", "ç’˜"),
-        (0xF9F0, "M", "è—º"),
-        (0xF9F1, "M", "隣"),
-        (0xF9F2, "M", "é±—"),
-        (0xF9F3, "M", "麟"),
-        (0xF9F4, "M", "æž—"),
-        (0xF9F5, "M", "æ·‹"),
-        (0xF9F6, "M", "臨"),
-        (0xF9F7, "M", "ç«‹"),
-        (0xF9F8, "M", "笠"),
-        (0xF9F9, "M", "ç²’"),
-        (0xF9FA, "M", "ç‹€"),
-        (0xF9FB, "M", "ç‚™"),
-        (0xF9FC, "M", "è­˜"),
-        (0xF9FD, "M", "什"),
-        (0xF9FE, "M", "茶"),
-        (0xF9FF, "M", "刺"),
-        (0xFA00, "M", "切"),
-        (0xFA01, "M", "度"),
-        (0xFA02, "M", "æ‹“"),
-        (0xFA03, "M", "ç³–"),
-        (0xFA04, "M", "å®…"),
-        (0xFA05, "M", "æ´ž"),
-        (0xFA06, "M", "æš´"),
-        (0xFA07, "M", "è¼»"),
-        (0xFA08, "M", "行"),
-        (0xFA09, "M", "�"),
-        (0xFA0A, "M", "見"),
-        (0xFA0B, "M", "廓"),
-        (0xFA0C, "M", "å…€"),
-        (0xFA0D, "M", "å—€"),
-        (0xFA0E, "V"),
-        (0xFA10, "M", "å¡š"),
-        (0xFA11, "V"),
-        (0xFA12, "M", "æ™´"),
-    ]
-
-
-def _seg_42() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xFA13, "V"),
-        (0xFA15, "M", "凞"),
-        (0xFA16, "M", "猪"),
-        (0xFA17, "M", "益"),
-        (0xFA18, "M", "礼"),
-        (0xFA19, "M", "神"),
-        (0xFA1A, "M", "祥"),
-        (0xFA1B, "M", "�"),
-        (0xFA1C, "M", "�"),
-        (0xFA1D, "M", "ç²¾"),
-        (0xFA1E, "M", "ç¾½"),
-        (0xFA1F, "V"),
-        (0xFA20, "M", "蘒"),
-        (0xFA21, "V"),
-        (0xFA22, "M", "諸"),
-        (0xFA23, "V"),
-        (0xFA25, "M", "逸"),
-        (0xFA26, "M", "都"),
-        (0xFA27, "V"),
-        (0xFA2A, "M", "飯"),
-        (0xFA2B, "M", "飼"),
-        (0xFA2C, "M", "館"),
-        (0xFA2D, "M", "鶴"),
-        (0xFA2E, "M", "郞"),
-        (0xFA2F, "M", "éš·"),
-        (0xFA30, "M", "ä¾®"),
-        (0xFA31, "M", "僧"),
-        (0xFA32, "M", "å…�"),
-        (0xFA33, "M", "勉"),
-        (0xFA34, "M", "勤"),
-        (0xFA35, "M", "�"),
-        (0xFA36, "M", "å–�"),
-        (0xFA37, "M", "嘆"),
-        (0xFA38, "M", "器"),
-        (0xFA39, "M", "å¡€"),
-        (0xFA3A, "M", "墨"),
-        (0xFA3B, "M", "層"),
-        (0xFA3C, "M", "å±®"),
-        (0xFA3D, "M", "æ‚”"),
-        (0xFA3E, "M", "æ…¨"),
-        (0xFA3F, "M", "憎"),
-        (0xFA40, "M", "懲"),
-        (0xFA41, "M", "�"),
-        (0xFA42, "M", "æ—¢"),
-        (0xFA43, "M", "æš‘"),
-        (0xFA44, "M", "梅"),
-        (0xFA45, "M", "æµ·"),
-        (0xFA46, "M", "渚"),
-        (0xFA47, "M", "æ¼¢"),
-        (0xFA48, "M", "ç…®"),
-        (0xFA49, "M", "爫"),
-        (0xFA4A, "M", "�"),
-        (0xFA4B, "M", "碑"),
-        (0xFA4C, "M", "社"),
-        (0xFA4D, "M", "祉"),
-        (0xFA4E, "M", "祈"),
-        (0xFA4F, "M", "�"),
-        (0xFA50, "M", "祖"),
-        (0xFA51, "M", "�"),
-        (0xFA52, "M", "�"),
-        (0xFA53, "M", "禎"),
-        (0xFA54, "M", "ç©€"),
-        (0xFA55, "M", "�"),
-        (0xFA56, "M", "節"),
-        (0xFA57, "M", "ç·´"),
-        (0xFA58, "M", "縉"),
-        (0xFA59, "M", "�"),
-        (0xFA5A, "M", "ç½²"),
-        (0xFA5B, "M", "者"),
-        (0xFA5C, "M", "臭"),
-        (0xFA5D, "M", "艹"),
-        (0xFA5F, "M", "è‘—"),
-        (0xFA60, "M", "�"),
-        (0xFA61, "M", "視"),
-        (0xFA62, "M", "�"),
-        (0xFA63, "M", "謹"),
-        (0xFA64, "M", "賓"),
-        (0xFA65, "M", "è´ˆ"),
-        (0xFA66, "M", "辶"),
-        (0xFA67, "M", "逸"),
-        (0xFA68, "M", "難"),
-        (0xFA69, "M", "響"),
-        (0xFA6A, "M", "é »"),
-        (0xFA6B, "M", "�"),
-        (0xFA6C, "M", "𤋮"),
-        (0xFA6D, "M", "舘"),
-        (0xFA6E, "X"),
-        (0xFA70, "M", "並"),
-        (0xFA71, "M", "况"),
-        (0xFA72, "M", "å…¨"),
-        (0xFA73, "M", "ä¾€"),
-        (0xFA74, "M", "å……"),
-        (0xFA75, "M", "冀"),
-        (0xFA76, "M", "勇"),
-        (0xFA77, "M", "勺"),
-        (0xFA78, "M", "å–�"),
-        (0xFA79, "M", "å••"),
-        (0xFA7A, "M", "å–™"),
-        (0xFA7B, "M", "å—¢"),
-        (0xFA7C, "M", "å¡š"),
-    ]
-
-
-def _seg_43() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xFA7D, "M", "墳"),
-        (0xFA7E, "M", "奄"),
-        (0xFA7F, "M", "奔"),
-        (0xFA80, "M", "å©¢"),
-        (0xFA81, "M", "嬨"),
-        (0xFA82, "M", "å»’"),
-        (0xFA83, "M", "å»™"),
-        (0xFA84, "M", "彩"),
-        (0xFA85, "M", "å¾­"),
-        (0xFA86, "M", "惘"),
-        (0xFA87, "M", "æ…Ž"),
-        (0xFA88, "M", "愈"),
-        (0xFA89, "M", "憎"),
-        (0xFA8A, "M", "æ… "),
-        (0xFA8B, "M", "懲"),
-        (0xFA8C, "M", "戴"),
-        (0xFA8D, "M", "�"),
-        (0xFA8E, "M", "�"),
-        (0xFA8F, "M", "æ‘’"),
-        (0xFA90, "M", "æ•–"),
-        (0xFA91, "M", "æ™´"),
-        (0xFA92, "M", "朗"),
-        (0xFA93, "M", "望"),
-        (0xFA94, "M", "�"),
-        (0xFA95, "M", "æ­¹"),
-        (0xFA96, "M", "殺"),
-        (0xFA97, "M", "�"),
-        (0xFA98, "M", "æ»›"),
-        (0xFA99, "M", "滋"),
-        (0xFA9A, "M", "æ¼¢"),
-        (0xFA9B, "M", "瀞"),
-        (0xFA9C, "M", "ç…®"),
-        (0xFA9D, "M", "瞧"),
-        (0xFA9E, "M", "爵"),
-        (0xFA9F, "M", "犯"),
-        (0xFAA0, "M", "猪"),
-        (0xFAA1, "M", "瑱"),
-        (0xFAA2, "M", "甆"),
-        (0xFAA3, "M", "ç”»"),
-        (0xFAA4, "M", "�"),
-        (0xFAA5, "M", "瘟"),
-        (0xFAA6, "M", "益"),
-        (0xFAA7, "M", "ç››"),
-        (0xFAA8, "M", "ç›´"),
-        (0xFAA9, "M", "�"),
-        (0xFAAA, "M", "�"),
-        (0xFAAB, "M", "磌"),
-        (0xFAAC, "M", "窱"),
-        (0xFAAD, "M", "節"),
-        (0xFAAE, "M", "ç±»"),
-        (0xFAAF, "M", "çµ›"),
-        (0xFAB0, "M", "ç·´"),
-        (0xFAB1, "M", "ç¼¾"),
-        (0xFAB2, "M", "者"),
-        (0xFAB3, "M", "�"),
-        (0xFAB4, "M", "�"),
-        (0xFAB5, "M", "�"),
-        (0xFAB6, "M", "�"),
-        (0xFAB7, "M", "覆"),
-        (0xFAB8, "M", "視"),
-        (0xFAB9, "M", "調"),
-        (0xFABA, "M", "諸"),
-        (0xFABB, "M", "è«‹"),
-        (0xFABC, "M", "�"),
-        (0xFABD, "M", "諾"),
-        (0xFABE, "M", "è«­"),
-        (0xFABF, "M", "謹"),
-        (0xFAC0, "M", "變"),
-        (0xFAC1, "M", "è´ˆ"),
-        (0xFAC2, "M", "輸"),
-        (0xFAC3, "M", "�"),
-        (0xFAC4, "M", "醙"),
-        (0xFAC5, "M", "鉶"),
-        (0xFAC6, "M", "陼"),
-        (0xFAC7, "M", "難"),
-        (0xFAC8, "M", "�"),
-        (0xFAC9, "M", "韛"),
-        (0xFACA, "M", "響"),
-        (0xFACB, "M", "é ‹"),
-        (0xFACC, "M", "é »"),
-        (0xFACD, "M", "鬒"),
-        (0xFACE, "M", "龜"),
-        (0xFACF, "M", "𢡊"),
-        (0xFAD0, "M", "𢡄"),
-        (0xFAD1, "M", "�"),
-        (0xFAD2, "M", "�"),
-        (0xFAD3, "M", "䀘"),
-        (0xFAD4, "M", "䀹"),
-        (0xFAD5, "M", "𥉉"),
-        (0xFAD6, "M", "�"),
-        (0xFAD7, "M", "𧻓"),
-        (0xFAD8, "M", "齃"),
-        (0xFAD9, "M", "龎"),
-        (0xFADA, "X"),
-        (0xFB00, "M", "ff"),
-        (0xFB01, "M", "fi"),
-        (0xFB02, "M", "fl"),
-        (0xFB03, "M", "ffi"),
-        (0xFB04, "M", "ffl"),
-        (0xFB05, "M", "st"),
-    ]
-
-
-def _seg_44() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xFB07, "X"),
-        (0xFB13, "M", "Õ´Õ¶"),
-        (0xFB14, "M", "Õ´Õ¥"),
-        (0xFB15, "M", "Õ´Õ«"),
-        (0xFB16, "M", "Õ¾Õ¶"),
-        (0xFB17, "M", "Õ´Õ­"),
-        (0xFB18, "X"),
-        (0xFB1D, "M", "×™Ö´"),
-        (0xFB1E, "V"),
-        (0xFB1F, "M", "ײַ"),
-        (0xFB20, "M", "×¢"),
-        (0xFB21, "M", "�"),
-        (0xFB22, "M", "ד"),
-        (0xFB23, "M", "×”"),
-        (0xFB24, "M", "×›"),
-        (0xFB25, "M", "ל"),
-        (0xFB26, "M", "�"),
-        (0xFB27, "M", "ר"),
-        (0xFB28, "M", "ת"),
-        (0xFB29, "3", "+"),
-        (0xFB2A, "M", "ש�"),
-        (0xFB2B, "M", "שׂ"),
-        (0xFB2C, "M", "שּ�"),
-        (0xFB2D, "M", "שּׂ"),
-        (0xFB2E, "M", "�ַ"),
-        (0xFB2F, "M", "�ָ"),
-        (0xFB30, "M", "�ּ"),
-        (0xFB31, "M", "בּ"),
-        (0xFB32, "M", "×’Ö¼"),
-        (0xFB33, "M", "דּ"),
-        (0xFB34, "M", "×”Ö¼"),
-        (0xFB35, "M", "וּ"),
-        (0xFB36, "M", "×–Ö¼"),
-        (0xFB37, "X"),
-        (0xFB38, "M", "טּ"),
-        (0xFB39, "M", "×™Ö¼"),
-        (0xFB3A, "M", "ךּ"),
-        (0xFB3B, "M", "×›Ö¼"),
-        (0xFB3C, "M", "לּ"),
-        (0xFB3D, "X"),
-        (0xFB3E, "M", "מּ"),
-        (0xFB3F, "X"),
-        (0xFB40, "M", "× Ö¼"),
-        (0xFB41, "M", "סּ"),
-        (0xFB42, "X"),
-        (0xFB43, "M", "×£Ö¼"),
-        (0xFB44, "M", "פּ"),
-        (0xFB45, "X"),
-        (0xFB46, "M", "צּ"),
-        (0xFB47, "M", "קּ"),
-        (0xFB48, "M", "רּ"),
-        (0xFB49, "M", "שּ"),
-        (0xFB4A, "M", "תּ"),
-        (0xFB4B, "M", "וֹ"),
-        (0xFB4C, "M", "בֿ"),
-        (0xFB4D, "M", "×›Ö¿"),
-        (0xFB4E, "M", "פֿ"),
-        (0xFB4F, "M", "�ל"),
-        (0xFB50, "M", "Ù±"),
-        (0xFB52, "M", "Ù»"),
-        (0xFB56, "M", "Ù¾"),
-        (0xFB5A, "M", "Ú€"),
-        (0xFB5E, "M", "Ùº"),
-        (0xFB62, "M", "Ù¿"),
-        (0xFB66, "M", "Ù¹"),
-        (0xFB6A, "M", "Ú¤"),
-        (0xFB6E, "M", "Ú¦"),
-        (0xFB72, "M", "Ú„"),
-        (0xFB76, "M", "Úƒ"),
-        (0xFB7A, "M", "Ú†"),
-        (0xFB7E, "M", "Ú‡"),
-        (0xFB82, "M", "Ú�"),
-        (0xFB84, "M", "ڌ"),
-        (0xFB86, "M", "ÚŽ"),
-        (0xFB88, "M", "Úˆ"),
-        (0xFB8A, "M", "Ú˜"),
-        (0xFB8C, "M", "Ú‘"),
-        (0xFB8E, "M", "Ú©"),
-        (0xFB92, "M", "Ú¯"),
-        (0xFB96, "M", "Ú³"),
-        (0xFB9A, "M", "Ú±"),
-        (0xFB9E, "M", "Úº"),
-        (0xFBA0, "M", "Ú»"),
-        (0xFBA4, "M", "Û€"),
-        (0xFBA6, "M", "Û�"),
-        (0xFBAA, "M", "Ú¾"),
-        (0xFBAE, "M", "Û’"),
-        (0xFBB0, "M", "Û“"),
-        (0xFBB2, "V"),
-        (0xFBC3, "X"),
-        (0xFBD3, "M", "Ú­"),
-        (0xFBD7, "M", "Û‡"),
-        (0xFBD9, "M", "Û†"),
-        (0xFBDB, "M", "Ûˆ"),
-        (0xFBDD, "M", "Û‡Ù´"),
-        (0xFBDE, "M", "Û‹"),
-        (0xFBE0, "M", "Û…"),
-        (0xFBE2, "M", "Û‰"),
-        (0xFBE4, "M", "Û�"),
-        (0xFBE8, "M", "Ù‰"),
-    ]
-
-
-def _seg_45() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xFBEA, "M", "ئا"),
-        (0xFBEC, "M", "ئە"),
-        (0xFBEE, "M", "ئو"),
-        (0xFBF0, "M", "ئۇ"),
-        (0xFBF2, "M", "ئۆ"),
-        (0xFBF4, "M", "ئۈ"),
-        (0xFBF6, "M", "ئ�"),
-        (0xFBF9, "M", "ئى"),
-        (0xFBFC, "M", "ی"),
-        (0xFC00, "M", "ئج"),
-        (0xFC01, "M", "ئح"),
-        (0xFC02, "M", "ئم"),
-        (0xFC03, "M", "ئى"),
-        (0xFC04, "M", "ئي"),
-        (0xFC05, "M", "بج"),
-        (0xFC06, "M", "بح"),
-        (0xFC07, "M", "بخ"),
-        (0xFC08, "M", "بم"),
-        (0xFC09, "M", "بى"),
-        (0xFC0A, "M", "بي"),
-        (0xFC0B, "M", "تج"),
-        (0xFC0C, "M", "تح"),
-        (0xFC0D, "M", "تخ"),
-        (0xFC0E, "M", "تم"),
-        (0xFC0F, "M", "تى"),
-        (0xFC10, "M", "تي"),
-        (0xFC11, "M", "ثج"),
-        (0xFC12, "M", "ثم"),
-        (0xFC13, "M", "ثى"),
-        (0xFC14, "M", "ثي"),
-        (0xFC15, "M", "جح"),
-        (0xFC16, "M", "جم"),
-        (0xFC17, "M", "حج"),
-        (0xFC18, "M", "حم"),
-        (0xFC19, "M", "خج"),
-        (0xFC1A, "M", "خح"),
-        (0xFC1B, "M", "خم"),
-        (0xFC1C, "M", "سج"),
-        (0xFC1D, "M", "سح"),
-        (0xFC1E, "M", "سخ"),
-        (0xFC1F, "M", "سم"),
-        (0xFC20, "M", "صح"),
-        (0xFC21, "M", "صم"),
-        (0xFC22, "M", "ضج"),
-        (0xFC23, "M", "ضح"),
-        (0xFC24, "M", "ضخ"),
-        (0xFC25, "M", "ضم"),
-        (0xFC26, "M", "طح"),
-        (0xFC27, "M", "طم"),
-        (0xFC28, "M", "ظم"),
-        (0xFC29, "M", "عج"),
-        (0xFC2A, "M", "عم"),
-        (0xFC2B, "M", "غج"),
-        (0xFC2C, "M", "غم"),
-        (0xFC2D, "M", "�ج"),
-        (0xFC2E, "M", "�ح"),
-        (0xFC2F, "M", "�خ"),
-        (0xFC30, "M", "�م"),
-        (0xFC31, "M", "�ى"),
-        (0xFC32, "M", "�ي"),
-        (0xFC33, "M", "قح"),
-        (0xFC34, "M", "قم"),
-        (0xFC35, "M", "قى"),
-        (0xFC36, "M", "قي"),
-        (0xFC37, "M", "كا"),
-        (0xFC38, "M", "كج"),
-        (0xFC39, "M", "كح"),
-        (0xFC3A, "M", "كخ"),
-        (0xFC3B, "M", "كل"),
-        (0xFC3C, "M", "كم"),
-        (0xFC3D, "M", "كى"),
-        (0xFC3E, "M", "كي"),
-        (0xFC3F, "M", "لج"),
-        (0xFC40, "M", "لح"),
-        (0xFC41, "M", "لخ"),
-        (0xFC42, "M", "لم"),
-        (0xFC43, "M", "لى"),
-        (0xFC44, "M", "لي"),
-        (0xFC45, "M", "مج"),
-        (0xFC46, "M", "مح"),
-        (0xFC47, "M", "مخ"),
-        (0xFC48, "M", "مم"),
-        (0xFC49, "M", "مى"),
-        (0xFC4A, "M", "مي"),
-        (0xFC4B, "M", "نج"),
-        (0xFC4C, "M", "نح"),
-        (0xFC4D, "M", "نخ"),
-        (0xFC4E, "M", "نم"),
-        (0xFC4F, "M", "نى"),
-        (0xFC50, "M", "ني"),
-        (0xFC51, "M", "هج"),
-        (0xFC52, "M", "هم"),
-        (0xFC53, "M", "هى"),
-        (0xFC54, "M", "هي"),
-        (0xFC55, "M", "يج"),
-        (0xFC56, "M", "يح"),
-        (0xFC57, "M", "يخ"),
-        (0xFC58, "M", "يم"),
-        (0xFC59, "M", "يى"),
-        (0xFC5A, "M", "يي"),
-    ]
-
-
-def _seg_46() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xFC5B, "M", "ذٰ"),
-        (0xFC5C, "M", "رٰ"),
-        (0xFC5D, "M", "ىٰ"),
-        (0xFC5E, "3", " ٌّ"),
-        (0xFC5F, "3", " �ّ"),
-        (0xFC60, "3", " ÙŽÙ‘"),
-        (0xFC61, "3", " �ّ"),
-        (0xFC62, "3", " �ّ"),
-        (0xFC63, "3", " ّٰ"),
-        (0xFC64, "M", "ئر"),
-        (0xFC65, "M", "ئز"),
-        (0xFC66, "M", "ئم"),
-        (0xFC67, "M", "ئن"),
-        (0xFC68, "M", "ئى"),
-        (0xFC69, "M", "ئي"),
-        (0xFC6A, "M", "بر"),
-        (0xFC6B, "M", "بز"),
-        (0xFC6C, "M", "بم"),
-        (0xFC6D, "M", "بن"),
-        (0xFC6E, "M", "بى"),
-        (0xFC6F, "M", "بي"),
-        (0xFC70, "M", "تر"),
-        (0xFC71, "M", "تز"),
-        (0xFC72, "M", "تم"),
-        (0xFC73, "M", "تن"),
-        (0xFC74, "M", "تى"),
-        (0xFC75, "M", "تي"),
-        (0xFC76, "M", "ثر"),
-        (0xFC77, "M", "ثز"),
-        (0xFC78, "M", "ثم"),
-        (0xFC79, "M", "ثن"),
-        (0xFC7A, "M", "ثى"),
-        (0xFC7B, "M", "ثي"),
-        (0xFC7C, "M", "�ى"),
-        (0xFC7D, "M", "�ي"),
-        (0xFC7E, "M", "قى"),
-        (0xFC7F, "M", "قي"),
-        (0xFC80, "M", "كا"),
-        (0xFC81, "M", "كل"),
-        (0xFC82, "M", "كم"),
-        (0xFC83, "M", "كى"),
-        (0xFC84, "M", "كي"),
-        (0xFC85, "M", "لم"),
-        (0xFC86, "M", "لى"),
-        (0xFC87, "M", "لي"),
-        (0xFC88, "M", "ما"),
-        (0xFC89, "M", "مم"),
-        (0xFC8A, "M", "نر"),
-        (0xFC8B, "M", "نز"),
-        (0xFC8C, "M", "نم"),
-        (0xFC8D, "M", "نن"),
-        (0xFC8E, "M", "نى"),
-        (0xFC8F, "M", "ني"),
-        (0xFC90, "M", "ىٰ"),
-        (0xFC91, "M", "ير"),
-        (0xFC92, "M", "يز"),
-        (0xFC93, "M", "يم"),
-        (0xFC94, "M", "ين"),
-        (0xFC95, "M", "يى"),
-        (0xFC96, "M", "يي"),
-        (0xFC97, "M", "ئج"),
-        (0xFC98, "M", "ئح"),
-        (0xFC99, "M", "ئخ"),
-        (0xFC9A, "M", "ئم"),
-        (0xFC9B, "M", "ئه"),
-        (0xFC9C, "M", "بج"),
-        (0xFC9D, "M", "بح"),
-        (0xFC9E, "M", "بخ"),
-        (0xFC9F, "M", "بم"),
-        (0xFCA0, "M", "به"),
-        (0xFCA1, "M", "تج"),
-        (0xFCA2, "M", "تح"),
-        (0xFCA3, "M", "تخ"),
-        (0xFCA4, "M", "تم"),
-        (0xFCA5, "M", "ته"),
-        (0xFCA6, "M", "ثم"),
-        (0xFCA7, "M", "جح"),
-        (0xFCA8, "M", "جم"),
-        (0xFCA9, "M", "حج"),
-        (0xFCAA, "M", "حم"),
-        (0xFCAB, "M", "خج"),
-        (0xFCAC, "M", "خم"),
-        (0xFCAD, "M", "سج"),
-        (0xFCAE, "M", "سح"),
-        (0xFCAF, "M", "سخ"),
-        (0xFCB0, "M", "سم"),
-        (0xFCB1, "M", "صح"),
-        (0xFCB2, "M", "صخ"),
-        (0xFCB3, "M", "صم"),
-        (0xFCB4, "M", "ضج"),
-        (0xFCB5, "M", "ضح"),
-        (0xFCB6, "M", "ضخ"),
-        (0xFCB7, "M", "ضم"),
-        (0xFCB8, "M", "طح"),
-        (0xFCB9, "M", "ظم"),
-        (0xFCBA, "M", "عج"),
-        (0xFCBB, "M", "عم"),
-        (0xFCBC, "M", "غج"),
-        (0xFCBD, "M", "غم"),
-        (0xFCBE, "M", "�ج"),
-    ]
-
-
-def _seg_47() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xFCBF, "M", "�ح"),
-        (0xFCC0, "M", "�خ"),
-        (0xFCC1, "M", "�م"),
-        (0xFCC2, "M", "قح"),
-        (0xFCC3, "M", "قم"),
-        (0xFCC4, "M", "كج"),
-        (0xFCC5, "M", "كح"),
-        (0xFCC6, "M", "كخ"),
-        (0xFCC7, "M", "كل"),
-        (0xFCC8, "M", "كم"),
-        (0xFCC9, "M", "لج"),
-        (0xFCCA, "M", "لح"),
-        (0xFCCB, "M", "لخ"),
-        (0xFCCC, "M", "لم"),
-        (0xFCCD, "M", "له"),
-        (0xFCCE, "M", "مج"),
-        (0xFCCF, "M", "مح"),
-        (0xFCD0, "M", "مخ"),
-        (0xFCD1, "M", "مم"),
-        (0xFCD2, "M", "نج"),
-        (0xFCD3, "M", "نح"),
-        (0xFCD4, "M", "نخ"),
-        (0xFCD5, "M", "نم"),
-        (0xFCD6, "M", "نه"),
-        (0xFCD7, "M", "هج"),
-        (0xFCD8, "M", "هم"),
-        (0xFCD9, "M", "هٰ"),
-        (0xFCDA, "M", "يج"),
-        (0xFCDB, "M", "يح"),
-        (0xFCDC, "M", "يخ"),
-        (0xFCDD, "M", "يم"),
-        (0xFCDE, "M", "يه"),
-        (0xFCDF, "M", "ئم"),
-        (0xFCE0, "M", "ئه"),
-        (0xFCE1, "M", "بم"),
-        (0xFCE2, "M", "به"),
-        (0xFCE3, "M", "تم"),
-        (0xFCE4, "M", "ته"),
-        (0xFCE5, "M", "ثم"),
-        (0xFCE6, "M", "ثه"),
-        (0xFCE7, "M", "سم"),
-        (0xFCE8, "M", "سه"),
-        (0xFCE9, "M", "شم"),
-        (0xFCEA, "M", "شه"),
-        (0xFCEB, "M", "كل"),
-        (0xFCEC, "M", "كم"),
-        (0xFCED, "M", "لم"),
-        (0xFCEE, "M", "نم"),
-        (0xFCEF, "M", "نه"),
-        (0xFCF0, "M", "يم"),
-        (0xFCF1, "M", "يه"),
-        (0xFCF2, "M", "Ù€ÙŽÙ‘"),
-        (0xFCF3, "M", "ـ�ّ"),
-        (0xFCF4, "M", "ـ�ّ"),
-        (0xFCF5, "M", "طى"),
-        (0xFCF6, "M", "طي"),
-        (0xFCF7, "M", "عى"),
-        (0xFCF8, "M", "عي"),
-        (0xFCF9, "M", "غى"),
-        (0xFCFA, "M", "غي"),
-        (0xFCFB, "M", "سى"),
-        (0xFCFC, "M", "سي"),
-        (0xFCFD, "M", "شى"),
-        (0xFCFE, "M", "شي"),
-        (0xFCFF, "M", "حى"),
-        (0xFD00, "M", "حي"),
-        (0xFD01, "M", "جى"),
-        (0xFD02, "M", "جي"),
-        (0xFD03, "M", "خى"),
-        (0xFD04, "M", "خي"),
-        (0xFD05, "M", "صى"),
-        (0xFD06, "M", "صي"),
-        (0xFD07, "M", "ضى"),
-        (0xFD08, "M", "ضي"),
-        (0xFD09, "M", "شج"),
-        (0xFD0A, "M", "شح"),
-        (0xFD0B, "M", "شخ"),
-        (0xFD0C, "M", "شم"),
-        (0xFD0D, "M", "شر"),
-        (0xFD0E, "M", "سر"),
-        (0xFD0F, "M", "صر"),
-        (0xFD10, "M", "ضر"),
-        (0xFD11, "M", "طى"),
-        (0xFD12, "M", "طي"),
-        (0xFD13, "M", "عى"),
-        (0xFD14, "M", "عي"),
-        (0xFD15, "M", "غى"),
-        (0xFD16, "M", "غي"),
-        (0xFD17, "M", "سى"),
-        (0xFD18, "M", "سي"),
-        (0xFD19, "M", "شى"),
-        (0xFD1A, "M", "شي"),
-        (0xFD1B, "M", "حى"),
-        (0xFD1C, "M", "حي"),
-        (0xFD1D, "M", "جى"),
-        (0xFD1E, "M", "جي"),
-        (0xFD1F, "M", "خى"),
-        (0xFD20, "M", "خي"),
-        (0xFD21, "M", "صى"),
-        (0xFD22, "M", "صي"),
-    ]
-
-
-def _seg_48() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xFD23, "M", "ضى"),
-        (0xFD24, "M", "ضي"),
-        (0xFD25, "M", "شج"),
-        (0xFD26, "M", "شح"),
-        (0xFD27, "M", "شخ"),
-        (0xFD28, "M", "شم"),
-        (0xFD29, "M", "شر"),
-        (0xFD2A, "M", "سر"),
-        (0xFD2B, "M", "صر"),
-        (0xFD2C, "M", "ضر"),
-        (0xFD2D, "M", "شج"),
-        (0xFD2E, "M", "شح"),
-        (0xFD2F, "M", "شخ"),
-        (0xFD30, "M", "شم"),
-        (0xFD31, "M", "سه"),
-        (0xFD32, "M", "شه"),
-        (0xFD33, "M", "طم"),
-        (0xFD34, "M", "سج"),
-        (0xFD35, "M", "سح"),
-        (0xFD36, "M", "سخ"),
-        (0xFD37, "M", "شج"),
-        (0xFD38, "M", "شح"),
-        (0xFD39, "M", "شخ"),
-        (0xFD3A, "M", "طم"),
-        (0xFD3B, "M", "ظم"),
-        (0xFD3C, "M", "اً"),
-        (0xFD3E, "V"),
-        (0xFD50, "M", "تجم"),
-        (0xFD51, "M", "تحج"),
-        (0xFD53, "M", "تحم"),
-        (0xFD54, "M", "تخم"),
-        (0xFD55, "M", "تمج"),
-        (0xFD56, "M", "تمح"),
-        (0xFD57, "M", "تمخ"),
-        (0xFD58, "M", "جمح"),
-        (0xFD5A, "M", "حمي"),
-        (0xFD5B, "M", "حمى"),
-        (0xFD5C, "M", "سحج"),
-        (0xFD5D, "M", "سجح"),
-        (0xFD5E, "M", "سجى"),
-        (0xFD5F, "M", "سمح"),
-        (0xFD61, "M", "سمج"),
-        (0xFD62, "M", "سمم"),
-        (0xFD64, "M", "صحح"),
-        (0xFD66, "M", "صمم"),
-        (0xFD67, "M", "شحم"),
-        (0xFD69, "M", "شجي"),
-        (0xFD6A, "M", "شمخ"),
-        (0xFD6C, "M", "شمم"),
-        (0xFD6E, "M", "ضحى"),
-        (0xFD6F, "M", "ضخم"),
-        (0xFD71, "M", "طمح"),
-        (0xFD73, "M", "طمم"),
-        (0xFD74, "M", "طمي"),
-        (0xFD75, "M", "عجم"),
-        (0xFD76, "M", "عمم"),
-        (0xFD78, "M", "عمى"),
-        (0xFD79, "M", "غمم"),
-        (0xFD7A, "M", "غمي"),
-        (0xFD7B, "M", "غمى"),
-        (0xFD7C, "M", "�خم"),
-        (0xFD7E, "M", "قمح"),
-        (0xFD7F, "M", "قمم"),
-        (0xFD80, "M", "لحم"),
-        (0xFD81, "M", "لحي"),
-        (0xFD82, "M", "لحى"),
-        (0xFD83, "M", "لجج"),
-        (0xFD85, "M", "لخم"),
-        (0xFD87, "M", "لمح"),
-        (0xFD89, "M", "محج"),
-        (0xFD8A, "M", "محم"),
-        (0xFD8B, "M", "محي"),
-        (0xFD8C, "M", "مجح"),
-        (0xFD8D, "M", "مجم"),
-        (0xFD8E, "M", "مخج"),
-        (0xFD8F, "M", "مخم"),
-        (0xFD90, "X"),
-        (0xFD92, "M", "مجخ"),
-        (0xFD93, "M", "همج"),
-        (0xFD94, "M", "همم"),
-        (0xFD95, "M", "نحم"),
-        (0xFD96, "M", "نحى"),
-        (0xFD97, "M", "نجم"),
-        (0xFD99, "M", "نجى"),
-        (0xFD9A, "M", "نمي"),
-        (0xFD9B, "M", "نمى"),
-        (0xFD9C, "M", "يمم"),
-        (0xFD9E, "M", "بخي"),
-        (0xFD9F, "M", "تجي"),
-        (0xFDA0, "M", "تجى"),
-        (0xFDA1, "M", "تخي"),
-        (0xFDA2, "M", "تخى"),
-        (0xFDA3, "M", "تمي"),
-        (0xFDA4, "M", "تمى"),
-        (0xFDA5, "M", "جمي"),
-        (0xFDA6, "M", "جحى"),
-        (0xFDA7, "M", "جمى"),
-        (0xFDA8, "M", "سخى"),
-        (0xFDA9, "M", "صحي"),
-        (0xFDAA, "M", "شحي"),
-    ]
-
-
-def _seg_49() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xFDAB, "M", "ضحي"),
-        (0xFDAC, "M", "لجي"),
-        (0xFDAD, "M", "لمي"),
-        (0xFDAE, "M", "يحي"),
-        (0xFDAF, "M", "يجي"),
-        (0xFDB0, "M", "يمي"),
-        (0xFDB1, "M", "ممي"),
-        (0xFDB2, "M", "قمي"),
-        (0xFDB3, "M", "نحي"),
-        (0xFDB4, "M", "قمح"),
-        (0xFDB5, "M", "لحم"),
-        (0xFDB6, "M", "عمي"),
-        (0xFDB7, "M", "كمي"),
-        (0xFDB8, "M", "نجح"),
-        (0xFDB9, "M", "مخي"),
-        (0xFDBA, "M", "لجم"),
-        (0xFDBB, "M", "كمم"),
-        (0xFDBC, "M", "لجم"),
-        (0xFDBD, "M", "نجح"),
-        (0xFDBE, "M", "جحي"),
-        (0xFDBF, "M", "حجي"),
-        (0xFDC0, "M", "مجي"),
-        (0xFDC1, "M", "�مي"),
-        (0xFDC2, "M", "بحي"),
-        (0xFDC3, "M", "كمم"),
-        (0xFDC4, "M", "عجم"),
-        (0xFDC5, "M", "صمم"),
-        (0xFDC6, "M", "سخي"),
-        (0xFDC7, "M", "نجي"),
-        (0xFDC8, "X"),
-        (0xFDCF, "V"),
-        (0xFDD0, "X"),
-        (0xFDF0, "M", "صلے"),
-        (0xFDF1, "M", "قلے"),
-        (0xFDF2, "M", "الله"),
-        (0xFDF3, "M", "اكبر"),
-        (0xFDF4, "M", "محمد"),
-        (0xFDF5, "M", "صلعم"),
-        (0xFDF6, "M", "رسول"),
-        (0xFDF7, "M", "عليه"),
-        (0xFDF8, "M", "وسلم"),
-        (0xFDF9, "M", "صلى"),
-        (0xFDFA, "3", "صلى الله عليه وسلم"),
-        (0xFDFB, "3", "جل جلاله"),
-        (0xFDFC, "M", "ریال"),
-        (0xFDFD, "V"),
-        (0xFE00, "I"),
-        (0xFE10, "3", ","),
-        (0xFE11, "M", "�"),
-        (0xFE12, "X"),
-        (0xFE13, "3", ":"),
-        (0xFE14, "3", ";"),
-        (0xFE15, "3", "!"),
-        (0xFE16, "3", "?"),
-        (0xFE17, "M", "〖"),
-        (0xFE18, "M", "〗"),
-        (0xFE19, "X"),
-        (0xFE20, "V"),
-        (0xFE30, "X"),
-        (0xFE31, "M", "—"),
-        (0xFE32, "M", "–"),
-        (0xFE33, "3", "_"),
-        (0xFE35, "3", "("),
-        (0xFE36, "3", ")"),
-        (0xFE37, "3", "{"),
-        (0xFE38, "3", "}"),
-        (0xFE39, "M", "〔"),
-        (0xFE3A, "M", "〕"),
-        (0xFE3B, "M", "�"),
-        (0xFE3C, "M", "】"),
-        (0xFE3D, "M", "《"),
-        (0xFE3E, "M", "》"),
-        (0xFE3F, "M", "〈"),
-        (0xFE40, "M", "〉"),
-        (0xFE41, "M", "「"),
-        (0xFE42, "M", "�"),
-        (0xFE43, "M", "『"),
-        (0xFE44, "M", "�"),
-        (0xFE45, "V"),
-        (0xFE47, "3", "["),
-        (0xFE48, "3", "]"),
-        (0xFE49, "3", " Ì…"),
-        (0xFE4D, "3", "_"),
-        (0xFE50, "3", ","),
-        (0xFE51, "M", "�"),
-        (0xFE52, "X"),
-        (0xFE54, "3", ";"),
-        (0xFE55, "3", ":"),
-        (0xFE56, "3", "?"),
-        (0xFE57, "3", "!"),
-        (0xFE58, "M", "—"),
-        (0xFE59, "3", "("),
-        (0xFE5A, "3", ")"),
-        (0xFE5B, "3", "{"),
-        (0xFE5C, "3", "}"),
-        (0xFE5D, "M", "〔"),
-        (0xFE5E, "M", "〕"),
-        (0xFE5F, "3", "#"),
-        (0xFE60, "3", "&"),
-        (0xFE61, "3", "*"),
-    ]
-
-
-def _seg_50() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xFE62, "3", "+"),
-        (0xFE63, "M", "-"),
-        (0xFE64, "3", "<"),
-        (0xFE65, "3", ">"),
-        (0xFE66, "3", "="),
-        (0xFE67, "X"),
-        (0xFE68, "3", "\\"),
-        (0xFE69, "3", "$"),
-        (0xFE6A, "3", "%"),
-        (0xFE6B, "3", "@"),
-        (0xFE6C, "X"),
-        (0xFE70, "3", " Ù‹"),
-        (0xFE71, "M", "ـً"),
-        (0xFE72, "3", " ٌ"),
-        (0xFE73, "V"),
-        (0xFE74, "3", " Ù�"),
-        (0xFE75, "X"),
-        (0xFE76, "3", " ÙŽ"),
-        (0xFE77, "M", "Ù€ÙŽ"),
-        (0xFE78, "3", " Ù�"),
-        (0xFE79, "M", "ـ�"),
-        (0xFE7A, "3", " Ù�"),
-        (0xFE7B, "M", "ـ�"),
-        (0xFE7C, "3", " Ù‘"),
-        (0xFE7D, "M", "ـّ"),
-        (0xFE7E, "3", " Ù’"),
-        (0xFE7F, "M", "ـْ"),
-        (0xFE80, "M", "Ø¡"),
-        (0xFE81, "M", "Ø¢"),
-        (0xFE83, "M", "Ø£"),
-        (0xFE85, "M", "ؤ"),
-        (0xFE87, "M", "Ø¥"),
-        (0xFE89, "M", "ئ"),
-        (0xFE8D, "M", "ا"),
-        (0xFE8F, "M", "ب"),
-        (0xFE93, "M", "Ø©"),
-        (0xFE95, "M", "ت"),
-        (0xFE99, "M", "Ø«"),
-        (0xFE9D, "M", "ج"),
-        (0xFEA1, "M", "Ø­"),
-        (0xFEA5, "M", "Ø®"),
-        (0xFEA9, "M", "د"),
-        (0xFEAB, "M", "Ø°"),
-        (0xFEAD, "M", "ر"),
-        (0xFEAF, "M", "ز"),
-        (0xFEB1, "M", "س"),
-        (0xFEB5, "M", "Ø´"),
-        (0xFEB9, "M", "ص"),
-        (0xFEBD, "M", "ض"),
-        (0xFEC1, "M", "Ø·"),
-        (0xFEC5, "M", "ظ"),
-        (0xFEC9, "M", "ع"),
-        (0xFECD, "M", "غ"),
-        (0xFED1, "M", "Ù�"),
-        (0xFED5, "M", "Ù‚"),
-        (0xFED9, "M", "Ùƒ"),
-        (0xFEDD, "M", "Ù„"),
-        (0xFEE1, "M", "Ù…"),
-        (0xFEE5, "M", "Ù†"),
-        (0xFEE9, "M", "Ù‡"),
-        (0xFEED, "M", "Ùˆ"),
-        (0xFEEF, "M", "Ù‰"),
-        (0xFEF1, "M", "ÙŠ"),
-        (0xFEF5, "M", "لآ"),
-        (0xFEF7, "M", "لأ"),
-        (0xFEF9, "M", "لإ"),
-        (0xFEFB, "M", "لا"),
-        (0xFEFD, "X"),
-        (0xFEFF, "I"),
-        (0xFF00, "X"),
-        (0xFF01, "3", "!"),
-        (0xFF02, "3", '"'),
-        (0xFF03, "3", "#"),
-        (0xFF04, "3", "$"),
-        (0xFF05, "3", "%"),
-        (0xFF06, "3", "&"),
-        (0xFF07, "3", "'"),
-        (0xFF08, "3", "("),
-        (0xFF09, "3", ")"),
-        (0xFF0A, "3", "*"),
-        (0xFF0B, "3", "+"),
-        (0xFF0C, "3", ","),
-        (0xFF0D, "M", "-"),
-        (0xFF0E, "M", "."),
-        (0xFF0F, "3", "/"),
-        (0xFF10, "M", "0"),
-        (0xFF11, "M", "1"),
-        (0xFF12, "M", "2"),
-        (0xFF13, "M", "3"),
-        (0xFF14, "M", "4"),
-        (0xFF15, "M", "5"),
-        (0xFF16, "M", "6"),
-        (0xFF17, "M", "7"),
-        (0xFF18, "M", "8"),
-        (0xFF19, "M", "9"),
-        (0xFF1A, "3", ":"),
-        (0xFF1B, "3", ";"),
-        (0xFF1C, "3", "<"),
-        (0xFF1D, "3", "="),
-        (0xFF1E, "3", ">"),
-    ]
-
-
-def _seg_51() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xFF1F, "3", "?"),
-        (0xFF20, "3", "@"),
-        (0xFF21, "M", "a"),
-        (0xFF22, "M", "b"),
-        (0xFF23, "M", "c"),
-        (0xFF24, "M", "d"),
-        (0xFF25, "M", "e"),
-        (0xFF26, "M", "f"),
-        (0xFF27, "M", "g"),
-        (0xFF28, "M", "h"),
-        (0xFF29, "M", "i"),
-        (0xFF2A, "M", "j"),
-        (0xFF2B, "M", "k"),
-        (0xFF2C, "M", "l"),
-        (0xFF2D, "M", "m"),
-        (0xFF2E, "M", "n"),
-        (0xFF2F, "M", "o"),
-        (0xFF30, "M", "p"),
-        (0xFF31, "M", "q"),
-        (0xFF32, "M", "r"),
-        (0xFF33, "M", "s"),
-        (0xFF34, "M", "t"),
-        (0xFF35, "M", "u"),
-        (0xFF36, "M", "v"),
-        (0xFF37, "M", "w"),
-        (0xFF38, "M", "x"),
-        (0xFF39, "M", "y"),
-        (0xFF3A, "M", "z"),
-        (0xFF3B, "3", "["),
-        (0xFF3C, "3", "\\"),
-        (0xFF3D, "3", "]"),
-        (0xFF3E, "3", "^"),
-        (0xFF3F, "3", "_"),
-        (0xFF40, "3", "`"),
-        (0xFF41, "M", "a"),
-        (0xFF42, "M", "b"),
-        (0xFF43, "M", "c"),
-        (0xFF44, "M", "d"),
-        (0xFF45, "M", "e"),
-        (0xFF46, "M", "f"),
-        (0xFF47, "M", "g"),
-        (0xFF48, "M", "h"),
-        (0xFF49, "M", "i"),
-        (0xFF4A, "M", "j"),
-        (0xFF4B, "M", "k"),
-        (0xFF4C, "M", "l"),
-        (0xFF4D, "M", "m"),
-        (0xFF4E, "M", "n"),
-        (0xFF4F, "M", "o"),
-        (0xFF50, "M", "p"),
-        (0xFF51, "M", "q"),
-        (0xFF52, "M", "r"),
-        (0xFF53, "M", "s"),
-        (0xFF54, "M", "t"),
-        (0xFF55, "M", "u"),
-        (0xFF56, "M", "v"),
-        (0xFF57, "M", "w"),
-        (0xFF58, "M", "x"),
-        (0xFF59, "M", "y"),
-        (0xFF5A, "M", "z"),
-        (0xFF5B, "3", "{"),
-        (0xFF5C, "3", "|"),
-        (0xFF5D, "3", "}"),
-        (0xFF5E, "3", "~"),
-        (0xFF5F, "M", "⦅"),
-        (0xFF60, "M", "⦆"),
-        (0xFF61, "M", "."),
-        (0xFF62, "M", "「"),
-        (0xFF63, "M", "�"),
-        (0xFF64, "M", "�"),
-        (0xFF65, "M", "・"),
-        (0xFF66, "M", "ヲ"),
-        (0xFF67, "M", "ã‚¡"),
-        (0xFF68, "M", "ã‚£"),
-        (0xFF69, "M", "ã‚¥"),
-        (0xFF6A, "M", "ェ"),
-        (0xFF6B, "M", "ã‚©"),
-        (0xFF6C, "M", "ャ"),
-        (0xFF6D, "M", "ュ"),
-        (0xFF6E, "M", "ョ"),
-        (0xFF6F, "M", "ッ"),
-        (0xFF70, "M", "ー"),
-        (0xFF71, "M", "ã‚¢"),
-        (0xFF72, "M", "イ"),
-        (0xFF73, "M", "ウ"),
-        (0xFF74, "M", "エ"),
-        (0xFF75, "M", "オ"),
-        (0xFF76, "M", "ã‚«"),
-        (0xFF77, "M", "ã‚­"),
-        (0xFF78, "M", "ク"),
-        (0xFF79, "M", "ケ"),
-        (0xFF7A, "M", "コ"),
-        (0xFF7B, "M", "サ"),
-        (0xFF7C, "M", "ã‚·"),
-        (0xFF7D, "M", "ス"),
-        (0xFF7E, "M", "ã‚»"),
-        (0xFF7F, "M", "ソ"),
-        (0xFF80, "M", "ã‚¿"),
-        (0xFF81, "M", "�"),
-        (0xFF82, "M", "ツ"),
-    ]
-
-
-def _seg_52() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xFF83, "M", "テ"),
-        (0xFF84, "M", "ト"),
-        (0xFF85, "M", "ナ"),
-        (0xFF86, "M", "ニ"),
-        (0xFF87, "M", "ヌ"),
-        (0xFF88, "M", "�"),
-        (0xFF89, "M", "ノ"),
-        (0xFF8A, "M", "�"),
-        (0xFF8B, "M", "ヒ"),
-        (0xFF8C, "M", "フ"),
-        (0xFF8D, "M", "ヘ"),
-        (0xFF8E, "M", "ホ"),
-        (0xFF8F, "M", "マ"),
-        (0xFF90, "M", "ミ"),
-        (0xFF91, "M", "ム"),
-        (0xFF92, "M", "メ"),
-        (0xFF93, "M", "モ"),
-        (0xFF94, "M", "ヤ"),
-        (0xFF95, "M", "ユ"),
-        (0xFF96, "M", "ヨ"),
-        (0xFF97, "M", "ラ"),
-        (0xFF98, "M", "リ"),
-        (0xFF99, "M", "ル"),
-        (0xFF9A, "M", "レ"),
-        (0xFF9B, "M", "ロ"),
-        (0xFF9C, "M", "ワ"),
-        (0xFF9D, "M", "ン"),
-        (0xFF9E, "M", "ã‚™"),
-        (0xFF9F, "M", "ã‚š"),
-        (0xFFA0, "X"),
-        (0xFFA1, "M", "á„€"),
-        (0xFFA2, "M", "�"),
-        (0xFFA3, "M", "ᆪ"),
-        (0xFFA4, "M", "á„‚"),
-        (0xFFA5, "M", "ᆬ"),
-        (0xFFA6, "M", "ᆭ"),
-        (0xFFA7, "M", "ᄃ"),
-        (0xFFA8, "M", "á„„"),
-        (0xFFA9, "M", "á„…"),
-        (0xFFAA, "M", "ᆰ"),
-        (0xFFAB, "M", "ᆱ"),
-        (0xFFAC, "M", "ᆲ"),
-        (0xFFAD, "M", "ᆳ"),
-        (0xFFAE, "M", "ᆴ"),
-        (0xFFAF, "M", "ᆵ"),
-        (0xFFB0, "M", "á„š"),
-        (0xFFB1, "M", "ᄆ"),
-        (0xFFB2, "M", "ᄇ"),
-        (0xFFB3, "M", "ᄈ"),
-        (0xFFB4, "M", "á„¡"),
-        (0xFFB5, "M", "ᄉ"),
-        (0xFFB6, "M", "á„Š"),
-        (0xFFB7, "M", "á„‹"),
-        (0xFFB8, "M", "ᄌ"),
-        (0xFFB9, "M", "�"),
-        (0xFFBA, "M", "á„Ž"),
-        (0xFFBB, "M", "�"),
-        (0xFFBC, "M", "�"),
-        (0xFFBD, "M", "á„‘"),
-        (0xFFBE, "M", "á„’"),
-        (0xFFBF, "X"),
-        (0xFFC2, "M", "á…¡"),
-        (0xFFC3, "M", "á…¢"),
-        (0xFFC4, "M", "á…£"),
-        (0xFFC5, "M", "á…¤"),
-        (0xFFC6, "M", "á…¥"),
-        (0xFFC7, "M", "á…¦"),
-        (0xFFC8, "X"),
-        (0xFFCA, "M", "á…§"),
-        (0xFFCB, "M", "á…¨"),
-        (0xFFCC, "M", "á…©"),
-        (0xFFCD, "M", "á…ª"),
-        (0xFFCE, "M", "á…«"),
-        (0xFFCF, "M", "á…¬"),
-        (0xFFD0, "X"),
-        (0xFFD2, "M", "á…­"),
-        (0xFFD3, "M", "á…®"),
-        (0xFFD4, "M", "á…¯"),
-        (0xFFD5, "M", "á…°"),
-        (0xFFD6, "M", "á…±"),
-        (0xFFD7, "M", "á…²"),
-        (0xFFD8, "X"),
-        (0xFFDA, "M", "á…³"),
-        (0xFFDB, "M", "á…´"),
-        (0xFFDC, "M", "á…µ"),
-        (0xFFDD, "X"),
-        (0xFFE0, "M", "¢"),
-        (0xFFE1, "M", "£"),
-        (0xFFE2, "M", "¬"),
-        (0xFFE3, "3", " Ì„"),
-        (0xFFE4, "M", "¦"),
-        (0xFFE5, "M", "Â¥"),
-        (0xFFE6, "M", "â‚©"),
-        (0xFFE7, "X"),
-        (0xFFE8, "M", "│"),
-        (0xFFE9, "M", "�"),
-        (0xFFEA, "M", "↑"),
-        (0xFFEB, "M", "→"),
-        (0xFFEC, "M", "↓"),
-        (0xFFED, "M", "â– "),
-    ]
-
-
-def _seg_53() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0xFFEE, "M", "â—‹"),
-        (0xFFEF, "X"),
-        (0x10000, "V"),
-        (0x1000C, "X"),
-        (0x1000D, "V"),
-        (0x10027, "X"),
-        (0x10028, "V"),
-        (0x1003B, "X"),
-        (0x1003C, "V"),
-        (0x1003E, "X"),
-        (0x1003F, "V"),
-        (0x1004E, "X"),
-        (0x10050, "V"),
-        (0x1005E, "X"),
-        (0x10080, "V"),
-        (0x100FB, "X"),
-        (0x10100, "V"),
-        (0x10103, "X"),
-        (0x10107, "V"),
-        (0x10134, "X"),
-        (0x10137, "V"),
-        (0x1018F, "X"),
-        (0x10190, "V"),
-        (0x1019D, "X"),
-        (0x101A0, "V"),
-        (0x101A1, "X"),
-        (0x101D0, "V"),
-        (0x101FE, "X"),
-        (0x10280, "V"),
-        (0x1029D, "X"),
-        (0x102A0, "V"),
-        (0x102D1, "X"),
-        (0x102E0, "V"),
-        (0x102FC, "X"),
-        (0x10300, "V"),
-        (0x10324, "X"),
-        (0x1032D, "V"),
-        (0x1034B, "X"),
-        (0x10350, "V"),
-        (0x1037B, "X"),
-        (0x10380, "V"),
-        (0x1039E, "X"),
-        (0x1039F, "V"),
-        (0x103C4, "X"),
-        (0x103C8, "V"),
-        (0x103D6, "X"),
-        (0x10400, "M", "�"),
-        (0x10401, "M", "�"),
-        (0x10402, "M", "�"),
-        (0x10403, "M", "�"),
-        (0x10404, "M", "�"),
-        (0x10405, "M", "�"),
-        (0x10406, "M", "�"),
-        (0x10407, "M", "�"),
-        (0x10408, "M", "�"),
-        (0x10409, "M", "�"),
-        (0x1040A, "M", "�"),
-        (0x1040B, "M", "�"),
-        (0x1040C, "M", "�"),
-        (0x1040D, "M", "�"),
-        (0x1040E, "M", "�"),
-        (0x1040F, "M", "�"),
-        (0x10410, "M", "�"),
-        (0x10411, "M", "�"),
-        (0x10412, "M", "�"),
-        (0x10413, "M", "�"),
-        (0x10414, "M", "�"),
-        (0x10415, "M", "�"),
-        (0x10416, "M", "�"),
-        (0x10417, "M", "�"),
-        (0x10418, "M", "�"),
-        (0x10419, "M", "�"),
-        (0x1041A, "M", "�"),
-        (0x1041B, "M", "�"),
-        (0x1041C, "M", "�"),
-        (0x1041D, "M", "�"),
-        (0x1041E, "M", "�"),
-        (0x1041F, "M", "�"),
-        (0x10420, "M", "�"),
-        (0x10421, "M", "�"),
-        (0x10422, "M", "�"),
-        (0x10423, "M", "�"),
-        (0x10424, "M", "�"),
-        (0x10425, "M", "�"),
-        (0x10426, "M", "�"),
-        (0x10427, "M", "�"),
-        (0x10428, "V"),
-        (0x1049E, "X"),
-        (0x104A0, "V"),
-        (0x104AA, "X"),
-        (0x104B0, "M", "�"),
-        (0x104B1, "M", "�"),
-        (0x104B2, "M", "�"),
-        (0x104B3, "M", "�"),
-        (0x104B4, "M", "�"),
-        (0x104B5, "M", "�"),
-        (0x104B6, "M", "�"),
-        (0x104B7, "M", "�"),
-        (0x104B8, "M", "�"),
-        (0x104B9, "M", "�"),
-    ]
-
-
-def _seg_54() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x104BA, "M", "�"),
-        (0x104BB, "M", "�"),
-        (0x104BC, "M", "�"),
-        (0x104BD, "M", "�"),
-        (0x104BE, "M", "�"),
-        (0x104BF, "M", "�"),
-        (0x104C0, "M", "�"),
-        (0x104C1, "M", "�"),
-        (0x104C2, "M", "�"),
-        (0x104C3, "M", "�"),
-        (0x104C4, "M", "�"),
-        (0x104C5, "M", "�"),
-        (0x104C6, "M", "�"),
-        (0x104C7, "M", "�"),
-        (0x104C8, "M", "�"),
-        (0x104C9, "M", "�"),
-        (0x104CA, "M", "�"),
-        (0x104CB, "M", "�"),
-        (0x104CC, "M", "�"),
-        (0x104CD, "M", "�"),
-        (0x104CE, "M", "�"),
-        (0x104CF, "M", "�"),
-        (0x104D0, "M", "�"),
-        (0x104D1, "M", "�"),
-        (0x104D2, "M", "�"),
-        (0x104D3, "M", "�"),
-        (0x104D4, "X"),
-        (0x104D8, "V"),
-        (0x104FC, "X"),
-        (0x10500, "V"),
-        (0x10528, "X"),
-        (0x10530, "V"),
-        (0x10564, "X"),
-        (0x1056F, "V"),
-        (0x10570, "M", "�"),
-        (0x10571, "M", "�"),
-        (0x10572, "M", "�"),
-        (0x10573, "M", "�"),
-        (0x10574, "M", "�"),
-        (0x10575, "M", "�"),
-        (0x10576, "M", "�"),
-        (0x10577, "M", "�"),
-        (0x10578, "M", "�"),
-        (0x10579, "M", "�"),
-        (0x1057A, "M", "�"),
-        (0x1057B, "X"),
-        (0x1057C, "M", "�"),
-        (0x1057D, "M", "�"),
-        (0x1057E, "M", "�"),
-        (0x1057F, "M", "�"),
-        (0x10580, "M", "�"),
-        (0x10581, "M", "�"),
-        (0x10582, "M", "�"),
-        (0x10583, "M", "�"),
-        (0x10584, "M", "�"),
-        (0x10585, "M", "�"),
-        (0x10586, "M", "�"),
-        (0x10587, "M", "�"),
-        (0x10588, "M", "�"),
-        (0x10589, "M", "�"),
-        (0x1058A, "M", "�"),
-        (0x1058B, "X"),
-        (0x1058C, "M", "�"),
-        (0x1058D, "M", "�"),
-        (0x1058E, "M", "�"),
-        (0x1058F, "M", "�"),
-        (0x10590, "M", "�"),
-        (0x10591, "M", "�"),
-        (0x10592, "M", "�"),
-        (0x10593, "X"),
-        (0x10594, "M", "�"),
-        (0x10595, "M", "�"),
-        (0x10596, "X"),
-        (0x10597, "V"),
-        (0x105A2, "X"),
-        (0x105A3, "V"),
-        (0x105B2, "X"),
-        (0x105B3, "V"),
-        (0x105BA, "X"),
-        (0x105BB, "V"),
-        (0x105BD, "X"),
-        (0x10600, "V"),
-        (0x10737, "X"),
-        (0x10740, "V"),
-        (0x10756, "X"),
-        (0x10760, "V"),
-        (0x10768, "X"),
-        (0x10780, "V"),
-        (0x10781, "M", "�"),
-        (0x10782, "M", "Ë‘"),
-        (0x10783, "M", "æ"),
-        (0x10784, "M", "Ê™"),
-        (0x10785, "M", "É“"),
-        (0x10786, "X"),
-        (0x10787, "M", "Ê£"),
-        (0x10788, "M", "ê­¦"),
-        (0x10789, "M", "Ê¥"),
-        (0x1078A, "M", "ʤ"),
-        (0x1078B, "M", "É–"),
-        (0x1078C, "M", "É—"),
-    ]
-
-
-def _seg_55() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1078D, "M", "ᶑ"),
-        (0x1078E, "M", "ɘ"),
-        (0x1078F, "M", "Éž"),
-        (0x10790, "M", "Ê©"),
-        (0x10791, "M", "ɤ"),
-        (0x10792, "M", "É¢"),
-        (0x10793, "M", "É "),
-        (0x10794, "M", "Ê›"),
-        (0x10795, "M", "ħ"),
-        (0x10796, "M", "ʜ"),
-        (0x10797, "M", "ɧ"),
-        (0x10798, "M", "Ê„"),
-        (0x10799, "M", "ʪ"),
-        (0x1079A, "M", "Ê«"),
-        (0x1079B, "M", "ɬ"),
-        (0x1079C, "M", "�"),
-        (0x1079D, "M", "ꞎ"),
-        (0x1079E, "M", "É®"),
-        (0x1079F, "M", "�"),
-        (0x107A0, "M", "ÊŽ"),
-        (0x107A1, "M", "�"),
-        (0x107A2, "M", "ø"),
-        (0x107A3, "M", "ɶ"),
-        (0x107A4, "M", "É·"),
-        (0x107A5, "M", "q"),
-        (0x107A6, "M", "ɺ"),
-        (0x107A7, "M", "�"),
-        (0x107A8, "M", "ɽ"),
-        (0x107A9, "M", "ɾ"),
-        (0x107AA, "M", "Ê€"),
-        (0x107AB, "M", "ʨ"),
-        (0x107AC, "M", "ʦ"),
-        (0x107AD, "M", "ê­§"),
-        (0x107AE, "M", "ʧ"),
-        (0x107AF, "M", "ʈ"),
-        (0x107B0, "M", "â±±"),
-        (0x107B1, "X"),
-        (0x107B2, "M", "�"),
-        (0x107B3, "M", "Ê¡"),
-        (0x107B4, "M", "Ê¢"),
-        (0x107B5, "M", "ʘ"),
-        (0x107B6, "M", "Ç€"),
-        (0x107B7, "M", "�"),
-        (0x107B8, "M", "Ç‚"),
-        (0x107B9, "M", "�"),
-        (0x107BA, "M", "�"),
-        (0x107BB, "X"),
-        (0x10800, "V"),
-        (0x10806, "X"),
-        (0x10808, "V"),
-        (0x10809, "X"),
-        (0x1080A, "V"),
-        (0x10836, "X"),
-        (0x10837, "V"),
-        (0x10839, "X"),
-        (0x1083C, "V"),
-        (0x1083D, "X"),
-        (0x1083F, "V"),
-        (0x10856, "X"),
-        (0x10857, "V"),
-        (0x1089F, "X"),
-        (0x108A7, "V"),
-        (0x108B0, "X"),
-        (0x108E0, "V"),
-        (0x108F3, "X"),
-        (0x108F4, "V"),
-        (0x108F6, "X"),
-        (0x108FB, "V"),
-        (0x1091C, "X"),
-        (0x1091F, "V"),
-        (0x1093A, "X"),
-        (0x1093F, "V"),
-        (0x10940, "X"),
-        (0x10980, "V"),
-        (0x109B8, "X"),
-        (0x109BC, "V"),
-        (0x109D0, "X"),
-        (0x109D2, "V"),
-        (0x10A04, "X"),
-        (0x10A05, "V"),
-        (0x10A07, "X"),
-        (0x10A0C, "V"),
-        (0x10A14, "X"),
-        (0x10A15, "V"),
-        (0x10A18, "X"),
-        (0x10A19, "V"),
-        (0x10A36, "X"),
-        (0x10A38, "V"),
-        (0x10A3B, "X"),
-        (0x10A3F, "V"),
-        (0x10A49, "X"),
-        (0x10A50, "V"),
-        (0x10A59, "X"),
-        (0x10A60, "V"),
-        (0x10AA0, "X"),
-        (0x10AC0, "V"),
-        (0x10AE7, "X"),
-        (0x10AEB, "V"),
-        (0x10AF7, "X"),
-        (0x10B00, "V"),
-    ]
-
-
-def _seg_56() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x10B36, "X"),
-        (0x10B39, "V"),
-        (0x10B56, "X"),
-        (0x10B58, "V"),
-        (0x10B73, "X"),
-        (0x10B78, "V"),
-        (0x10B92, "X"),
-        (0x10B99, "V"),
-        (0x10B9D, "X"),
-        (0x10BA9, "V"),
-        (0x10BB0, "X"),
-        (0x10C00, "V"),
-        (0x10C49, "X"),
-        (0x10C80, "M", "�"),
-        (0x10C81, "M", "�"),
-        (0x10C82, "M", "�"),
-        (0x10C83, "M", "�"),
-        (0x10C84, "M", "�"),
-        (0x10C85, "M", "�"),
-        (0x10C86, "M", "�"),
-        (0x10C87, "M", "�"),
-        (0x10C88, "M", "�"),
-        (0x10C89, "M", "�"),
-        (0x10C8A, "M", "�"),
-        (0x10C8B, "M", "�"),
-        (0x10C8C, "M", "�"),
-        (0x10C8D, "M", "�"),
-        (0x10C8E, "M", "�"),
-        (0x10C8F, "M", "�"),
-        (0x10C90, "M", "�"),
-        (0x10C91, "M", "�"),
-        (0x10C92, "M", "�"),
-        (0x10C93, "M", "�"),
-        (0x10C94, "M", "�"),
-        (0x10C95, "M", "�"),
-        (0x10C96, "M", "�"),
-        (0x10C97, "M", "�"),
-        (0x10C98, "M", "�"),
-        (0x10C99, "M", "�"),
-        (0x10C9A, "M", "�"),
-        (0x10C9B, "M", "�"),
-        (0x10C9C, "M", "�"),
-        (0x10C9D, "M", "�"),
-        (0x10C9E, "M", "�"),
-        (0x10C9F, "M", "�"),
-        (0x10CA0, "M", "�"),
-        (0x10CA1, "M", "�"),
-        (0x10CA2, "M", "�"),
-        (0x10CA3, "M", "�"),
-        (0x10CA4, "M", "�"),
-        (0x10CA5, "M", "�"),
-        (0x10CA6, "M", "�"),
-        (0x10CA7, "M", "�"),
-        (0x10CA8, "M", "�"),
-        (0x10CA9, "M", "�"),
-        (0x10CAA, "M", "�"),
-        (0x10CAB, "M", "�"),
-        (0x10CAC, "M", "�"),
-        (0x10CAD, "M", "�"),
-        (0x10CAE, "M", "�"),
-        (0x10CAF, "M", "�"),
-        (0x10CB0, "M", "�"),
-        (0x10CB1, "M", "�"),
-        (0x10CB2, "M", "�"),
-        (0x10CB3, "X"),
-        (0x10CC0, "V"),
-        (0x10CF3, "X"),
-        (0x10CFA, "V"),
-        (0x10D28, "X"),
-        (0x10D30, "V"),
-        (0x10D3A, "X"),
-        (0x10E60, "V"),
-        (0x10E7F, "X"),
-        (0x10E80, "V"),
-        (0x10EAA, "X"),
-        (0x10EAB, "V"),
-        (0x10EAE, "X"),
-        (0x10EB0, "V"),
-        (0x10EB2, "X"),
-        (0x10EFD, "V"),
-        (0x10F28, "X"),
-        (0x10F30, "V"),
-        (0x10F5A, "X"),
-        (0x10F70, "V"),
-        (0x10F8A, "X"),
-        (0x10FB0, "V"),
-        (0x10FCC, "X"),
-        (0x10FE0, "V"),
-        (0x10FF7, "X"),
-        (0x11000, "V"),
-        (0x1104E, "X"),
-        (0x11052, "V"),
-        (0x11076, "X"),
-        (0x1107F, "V"),
-        (0x110BD, "X"),
-        (0x110BE, "V"),
-        (0x110C3, "X"),
-        (0x110D0, "V"),
-        (0x110E9, "X"),
-        (0x110F0, "V"),
-    ]
-
-
-def _seg_57() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x110FA, "X"),
-        (0x11100, "V"),
-        (0x11135, "X"),
-        (0x11136, "V"),
-        (0x11148, "X"),
-        (0x11150, "V"),
-        (0x11177, "X"),
-        (0x11180, "V"),
-        (0x111E0, "X"),
-        (0x111E1, "V"),
-        (0x111F5, "X"),
-        (0x11200, "V"),
-        (0x11212, "X"),
-        (0x11213, "V"),
-        (0x11242, "X"),
-        (0x11280, "V"),
-        (0x11287, "X"),
-        (0x11288, "V"),
-        (0x11289, "X"),
-        (0x1128A, "V"),
-        (0x1128E, "X"),
-        (0x1128F, "V"),
-        (0x1129E, "X"),
-        (0x1129F, "V"),
-        (0x112AA, "X"),
-        (0x112B0, "V"),
-        (0x112EB, "X"),
-        (0x112F0, "V"),
-        (0x112FA, "X"),
-        (0x11300, "V"),
-        (0x11304, "X"),
-        (0x11305, "V"),
-        (0x1130D, "X"),
-        (0x1130F, "V"),
-        (0x11311, "X"),
-        (0x11313, "V"),
-        (0x11329, "X"),
-        (0x1132A, "V"),
-        (0x11331, "X"),
-        (0x11332, "V"),
-        (0x11334, "X"),
-        (0x11335, "V"),
-        (0x1133A, "X"),
-        (0x1133B, "V"),
-        (0x11345, "X"),
-        (0x11347, "V"),
-        (0x11349, "X"),
-        (0x1134B, "V"),
-        (0x1134E, "X"),
-        (0x11350, "V"),
-        (0x11351, "X"),
-        (0x11357, "V"),
-        (0x11358, "X"),
-        (0x1135D, "V"),
-        (0x11364, "X"),
-        (0x11366, "V"),
-        (0x1136D, "X"),
-        (0x11370, "V"),
-        (0x11375, "X"),
-        (0x11400, "V"),
-        (0x1145C, "X"),
-        (0x1145D, "V"),
-        (0x11462, "X"),
-        (0x11480, "V"),
-        (0x114C8, "X"),
-        (0x114D0, "V"),
-        (0x114DA, "X"),
-        (0x11580, "V"),
-        (0x115B6, "X"),
-        (0x115B8, "V"),
-        (0x115DE, "X"),
-        (0x11600, "V"),
-        (0x11645, "X"),
-        (0x11650, "V"),
-        (0x1165A, "X"),
-        (0x11660, "V"),
-        (0x1166D, "X"),
-        (0x11680, "V"),
-        (0x116BA, "X"),
-        (0x116C0, "V"),
-        (0x116CA, "X"),
-        (0x11700, "V"),
-        (0x1171B, "X"),
-        (0x1171D, "V"),
-        (0x1172C, "X"),
-        (0x11730, "V"),
-        (0x11747, "X"),
-        (0x11800, "V"),
-        (0x1183C, "X"),
-        (0x118A0, "M", "ð‘£€"),
-        (0x118A1, "M", "�"),
-        (0x118A2, "M", "𑣂"),
-        (0x118A3, "M", "𑣃"),
-        (0x118A4, "M", "𑣄"),
-        (0x118A5, "M", "ð‘£…"),
-        (0x118A6, "M", "𑣆"),
-        (0x118A7, "M", "𑣇"),
-        (0x118A8, "M", "𑣈"),
-        (0x118A9, "M", "𑣉"),
-        (0x118AA, "M", "𑣊"),
-    ]
-
-
-def _seg_58() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x118AB, "M", "𑣋"),
-        (0x118AC, "M", "𑣌"),
-        (0x118AD, "M", "�"),
-        (0x118AE, "M", "𑣎"),
-        (0x118AF, "M", "�"),
-        (0x118B0, "M", "�"),
-        (0x118B1, "M", "𑣑"),
-        (0x118B2, "M", "ð‘£’"),
-        (0x118B3, "M", "𑣓"),
-        (0x118B4, "M", "ð‘£”"),
-        (0x118B5, "M", "𑣕"),
-        (0x118B6, "M", "ð‘£–"),
-        (0x118B7, "M", "ð‘£—"),
-        (0x118B8, "M", "𑣘"),
-        (0x118B9, "M", "ð‘£™"),
-        (0x118BA, "M", "𑣚"),
-        (0x118BB, "M", "ð‘£›"),
-        (0x118BC, "M", "𑣜"),
-        (0x118BD, "M", "�"),
-        (0x118BE, "M", "𑣞"),
-        (0x118BF, "M", "𑣟"),
-        (0x118C0, "V"),
-        (0x118F3, "X"),
-        (0x118FF, "V"),
-        (0x11907, "X"),
-        (0x11909, "V"),
-        (0x1190A, "X"),
-        (0x1190C, "V"),
-        (0x11914, "X"),
-        (0x11915, "V"),
-        (0x11917, "X"),
-        (0x11918, "V"),
-        (0x11936, "X"),
-        (0x11937, "V"),
-        (0x11939, "X"),
-        (0x1193B, "V"),
-        (0x11947, "X"),
-        (0x11950, "V"),
-        (0x1195A, "X"),
-        (0x119A0, "V"),
-        (0x119A8, "X"),
-        (0x119AA, "V"),
-        (0x119D8, "X"),
-        (0x119DA, "V"),
-        (0x119E5, "X"),
-        (0x11A00, "V"),
-        (0x11A48, "X"),
-        (0x11A50, "V"),
-        (0x11AA3, "X"),
-        (0x11AB0, "V"),
-        (0x11AF9, "X"),
-        (0x11B00, "V"),
-        (0x11B0A, "X"),
-        (0x11C00, "V"),
-        (0x11C09, "X"),
-        (0x11C0A, "V"),
-        (0x11C37, "X"),
-        (0x11C38, "V"),
-        (0x11C46, "X"),
-        (0x11C50, "V"),
-        (0x11C6D, "X"),
-        (0x11C70, "V"),
-        (0x11C90, "X"),
-        (0x11C92, "V"),
-        (0x11CA8, "X"),
-        (0x11CA9, "V"),
-        (0x11CB7, "X"),
-        (0x11D00, "V"),
-        (0x11D07, "X"),
-        (0x11D08, "V"),
-        (0x11D0A, "X"),
-        (0x11D0B, "V"),
-        (0x11D37, "X"),
-        (0x11D3A, "V"),
-        (0x11D3B, "X"),
-        (0x11D3C, "V"),
-        (0x11D3E, "X"),
-        (0x11D3F, "V"),
-        (0x11D48, "X"),
-        (0x11D50, "V"),
-        (0x11D5A, "X"),
-        (0x11D60, "V"),
-        (0x11D66, "X"),
-        (0x11D67, "V"),
-        (0x11D69, "X"),
-        (0x11D6A, "V"),
-        (0x11D8F, "X"),
-        (0x11D90, "V"),
-        (0x11D92, "X"),
-        (0x11D93, "V"),
-        (0x11D99, "X"),
-        (0x11DA0, "V"),
-        (0x11DAA, "X"),
-        (0x11EE0, "V"),
-        (0x11EF9, "X"),
-        (0x11F00, "V"),
-        (0x11F11, "X"),
-        (0x11F12, "V"),
-        (0x11F3B, "X"),
-        (0x11F3E, "V"),
-    ]
-
-
-def _seg_59() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x11F5A, "X"),
-        (0x11FB0, "V"),
-        (0x11FB1, "X"),
-        (0x11FC0, "V"),
-        (0x11FF2, "X"),
-        (0x11FFF, "V"),
-        (0x1239A, "X"),
-        (0x12400, "V"),
-        (0x1246F, "X"),
-        (0x12470, "V"),
-        (0x12475, "X"),
-        (0x12480, "V"),
-        (0x12544, "X"),
-        (0x12F90, "V"),
-        (0x12FF3, "X"),
-        (0x13000, "V"),
-        (0x13430, "X"),
-        (0x13440, "V"),
-        (0x13456, "X"),
-        (0x14400, "V"),
-        (0x14647, "X"),
-        (0x16800, "V"),
-        (0x16A39, "X"),
-        (0x16A40, "V"),
-        (0x16A5F, "X"),
-        (0x16A60, "V"),
-        (0x16A6A, "X"),
-        (0x16A6E, "V"),
-        (0x16ABF, "X"),
-        (0x16AC0, "V"),
-        (0x16ACA, "X"),
-        (0x16AD0, "V"),
-        (0x16AEE, "X"),
-        (0x16AF0, "V"),
-        (0x16AF6, "X"),
-        (0x16B00, "V"),
-        (0x16B46, "X"),
-        (0x16B50, "V"),
-        (0x16B5A, "X"),
-        (0x16B5B, "V"),
-        (0x16B62, "X"),
-        (0x16B63, "V"),
-        (0x16B78, "X"),
-        (0x16B7D, "V"),
-        (0x16B90, "X"),
-        (0x16E40, "M", "ð–¹ "),
-        (0x16E41, "M", "𖹡"),
-        (0x16E42, "M", "ð–¹¢"),
-        (0x16E43, "M", "ð–¹£"),
-        (0x16E44, "M", "𖹤"),
-        (0x16E45, "M", "ð–¹¥"),
-        (0x16E46, "M", "𖹦"),
-        (0x16E47, "M", "𖹧"),
-        (0x16E48, "M", "𖹨"),
-        (0x16E49, "M", "𖹩"),
-        (0x16E4A, "M", "𖹪"),
-        (0x16E4B, "M", "𖹫"),
-        (0x16E4C, "M", "𖹬"),
-        (0x16E4D, "M", "ð–¹­"),
-        (0x16E4E, "M", "ð–¹®"),
-        (0x16E4F, "M", "𖹯"),
-        (0x16E50, "M", "ð–¹°"),
-        (0x16E51, "M", "ð–¹±"),
-        (0x16E52, "M", "ð–¹²"),
-        (0x16E53, "M", "ð–¹³"),
-        (0x16E54, "M", "ð–¹´"),
-        (0x16E55, "M", "ð–¹µ"),
-        (0x16E56, "M", "𖹶"),
-        (0x16E57, "M", "ð–¹·"),
-        (0x16E58, "M", "𖹸"),
-        (0x16E59, "M", "ð–¹¹"),
-        (0x16E5A, "M", "𖹺"),
-        (0x16E5B, "M", "ð–¹»"),
-        (0x16E5C, "M", "ð–¹¼"),
-        (0x16E5D, "M", "ð–¹½"),
-        (0x16E5E, "M", "ð–¹¾"),
-        (0x16E5F, "M", "𖹿"),
-        (0x16E60, "V"),
-        (0x16E9B, "X"),
-        (0x16F00, "V"),
-        (0x16F4B, "X"),
-        (0x16F4F, "V"),
-        (0x16F88, "X"),
-        (0x16F8F, "V"),
-        (0x16FA0, "X"),
-        (0x16FE0, "V"),
-        (0x16FE5, "X"),
-        (0x16FF0, "V"),
-        (0x16FF2, "X"),
-        (0x17000, "V"),
-        (0x187F8, "X"),
-        (0x18800, "V"),
-        (0x18CD6, "X"),
-        (0x18D00, "V"),
-        (0x18D09, "X"),
-        (0x1AFF0, "V"),
-        (0x1AFF4, "X"),
-        (0x1AFF5, "V"),
-        (0x1AFFC, "X"),
-        (0x1AFFD, "V"),
-    ]
-
-
-def _seg_60() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1AFFF, "X"),
-        (0x1B000, "V"),
-        (0x1B123, "X"),
-        (0x1B132, "V"),
-        (0x1B133, "X"),
-        (0x1B150, "V"),
-        (0x1B153, "X"),
-        (0x1B155, "V"),
-        (0x1B156, "X"),
-        (0x1B164, "V"),
-        (0x1B168, "X"),
-        (0x1B170, "V"),
-        (0x1B2FC, "X"),
-        (0x1BC00, "V"),
-        (0x1BC6B, "X"),
-        (0x1BC70, "V"),
-        (0x1BC7D, "X"),
-        (0x1BC80, "V"),
-        (0x1BC89, "X"),
-        (0x1BC90, "V"),
-        (0x1BC9A, "X"),
-        (0x1BC9C, "V"),
-        (0x1BCA0, "I"),
-        (0x1BCA4, "X"),
-        (0x1CF00, "V"),
-        (0x1CF2E, "X"),
-        (0x1CF30, "V"),
-        (0x1CF47, "X"),
-        (0x1CF50, "V"),
-        (0x1CFC4, "X"),
-        (0x1D000, "V"),
-        (0x1D0F6, "X"),
-        (0x1D100, "V"),
-        (0x1D127, "X"),
-        (0x1D129, "V"),
-        (0x1D15E, "M", "��"),
-        (0x1D15F, "M", "��"),
-        (0x1D160, "M", "���"),
-        (0x1D161, "M", "���"),
-        (0x1D162, "M", "���"),
-        (0x1D163, "M", "���"),
-        (0x1D164, "M", "���"),
-        (0x1D165, "V"),
-        (0x1D173, "X"),
-        (0x1D17B, "V"),
-        (0x1D1BB, "M", "��"),
-        (0x1D1BC, "M", "��"),
-        (0x1D1BD, "M", "���"),
-        (0x1D1BE, "M", "���"),
-        (0x1D1BF, "M", "���"),
-        (0x1D1C0, "M", "���"),
-        (0x1D1C1, "V"),
-        (0x1D1EB, "X"),
-        (0x1D200, "V"),
-        (0x1D246, "X"),
-        (0x1D2C0, "V"),
-        (0x1D2D4, "X"),
-        (0x1D2E0, "V"),
-        (0x1D2F4, "X"),
-        (0x1D300, "V"),
-        (0x1D357, "X"),
-        (0x1D360, "V"),
-        (0x1D379, "X"),
-        (0x1D400, "M", "a"),
-        (0x1D401, "M", "b"),
-        (0x1D402, "M", "c"),
-        (0x1D403, "M", "d"),
-        (0x1D404, "M", "e"),
-        (0x1D405, "M", "f"),
-        (0x1D406, "M", "g"),
-        (0x1D407, "M", "h"),
-        (0x1D408, "M", "i"),
-        (0x1D409, "M", "j"),
-        (0x1D40A, "M", "k"),
-        (0x1D40B, "M", "l"),
-        (0x1D40C, "M", "m"),
-        (0x1D40D, "M", "n"),
-        (0x1D40E, "M", "o"),
-        (0x1D40F, "M", "p"),
-        (0x1D410, "M", "q"),
-        (0x1D411, "M", "r"),
-        (0x1D412, "M", "s"),
-        (0x1D413, "M", "t"),
-        (0x1D414, "M", "u"),
-        (0x1D415, "M", "v"),
-        (0x1D416, "M", "w"),
-        (0x1D417, "M", "x"),
-        (0x1D418, "M", "y"),
-        (0x1D419, "M", "z"),
-        (0x1D41A, "M", "a"),
-        (0x1D41B, "M", "b"),
-        (0x1D41C, "M", "c"),
-        (0x1D41D, "M", "d"),
-        (0x1D41E, "M", "e"),
-        (0x1D41F, "M", "f"),
-        (0x1D420, "M", "g"),
-        (0x1D421, "M", "h"),
-        (0x1D422, "M", "i"),
-        (0x1D423, "M", "j"),
-        (0x1D424, "M", "k"),
-    ]
-
-
-def _seg_61() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1D425, "M", "l"),
-        (0x1D426, "M", "m"),
-        (0x1D427, "M", "n"),
-        (0x1D428, "M", "o"),
-        (0x1D429, "M", "p"),
-        (0x1D42A, "M", "q"),
-        (0x1D42B, "M", "r"),
-        (0x1D42C, "M", "s"),
-        (0x1D42D, "M", "t"),
-        (0x1D42E, "M", "u"),
-        (0x1D42F, "M", "v"),
-        (0x1D430, "M", "w"),
-        (0x1D431, "M", "x"),
-        (0x1D432, "M", "y"),
-        (0x1D433, "M", "z"),
-        (0x1D434, "M", "a"),
-        (0x1D435, "M", "b"),
-        (0x1D436, "M", "c"),
-        (0x1D437, "M", "d"),
-        (0x1D438, "M", "e"),
-        (0x1D439, "M", "f"),
-        (0x1D43A, "M", "g"),
-        (0x1D43B, "M", "h"),
-        (0x1D43C, "M", "i"),
-        (0x1D43D, "M", "j"),
-        (0x1D43E, "M", "k"),
-        (0x1D43F, "M", "l"),
-        (0x1D440, "M", "m"),
-        (0x1D441, "M", "n"),
-        (0x1D442, "M", "o"),
-        (0x1D443, "M", "p"),
-        (0x1D444, "M", "q"),
-        (0x1D445, "M", "r"),
-        (0x1D446, "M", "s"),
-        (0x1D447, "M", "t"),
-        (0x1D448, "M", "u"),
-        (0x1D449, "M", "v"),
-        (0x1D44A, "M", "w"),
-        (0x1D44B, "M", "x"),
-        (0x1D44C, "M", "y"),
-        (0x1D44D, "M", "z"),
-        (0x1D44E, "M", "a"),
-        (0x1D44F, "M", "b"),
-        (0x1D450, "M", "c"),
-        (0x1D451, "M", "d"),
-        (0x1D452, "M", "e"),
-        (0x1D453, "M", "f"),
-        (0x1D454, "M", "g"),
-        (0x1D455, "X"),
-        (0x1D456, "M", "i"),
-        (0x1D457, "M", "j"),
-        (0x1D458, "M", "k"),
-        (0x1D459, "M", "l"),
-        (0x1D45A, "M", "m"),
-        (0x1D45B, "M", "n"),
-        (0x1D45C, "M", "o"),
-        (0x1D45D, "M", "p"),
-        (0x1D45E, "M", "q"),
-        (0x1D45F, "M", "r"),
-        (0x1D460, "M", "s"),
-        (0x1D461, "M", "t"),
-        (0x1D462, "M", "u"),
-        (0x1D463, "M", "v"),
-        (0x1D464, "M", "w"),
-        (0x1D465, "M", "x"),
-        (0x1D466, "M", "y"),
-        (0x1D467, "M", "z"),
-        (0x1D468, "M", "a"),
-        (0x1D469, "M", "b"),
-        (0x1D46A, "M", "c"),
-        (0x1D46B, "M", "d"),
-        (0x1D46C, "M", "e"),
-        (0x1D46D, "M", "f"),
-        (0x1D46E, "M", "g"),
-        (0x1D46F, "M", "h"),
-        (0x1D470, "M", "i"),
-        (0x1D471, "M", "j"),
-        (0x1D472, "M", "k"),
-        (0x1D473, "M", "l"),
-        (0x1D474, "M", "m"),
-        (0x1D475, "M", "n"),
-        (0x1D476, "M", "o"),
-        (0x1D477, "M", "p"),
-        (0x1D478, "M", "q"),
-        (0x1D479, "M", "r"),
-        (0x1D47A, "M", "s"),
-        (0x1D47B, "M", "t"),
-        (0x1D47C, "M", "u"),
-        (0x1D47D, "M", "v"),
-        (0x1D47E, "M", "w"),
-        (0x1D47F, "M", "x"),
-        (0x1D480, "M", "y"),
-        (0x1D481, "M", "z"),
-        (0x1D482, "M", "a"),
-        (0x1D483, "M", "b"),
-        (0x1D484, "M", "c"),
-        (0x1D485, "M", "d"),
-        (0x1D486, "M", "e"),
-        (0x1D487, "M", "f"),
-        (0x1D488, "M", "g"),
-    ]
-
-
-def _seg_62() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1D489, "M", "h"),
-        (0x1D48A, "M", "i"),
-        (0x1D48B, "M", "j"),
-        (0x1D48C, "M", "k"),
-        (0x1D48D, "M", "l"),
-        (0x1D48E, "M", "m"),
-        (0x1D48F, "M", "n"),
-        (0x1D490, "M", "o"),
-        (0x1D491, "M", "p"),
-        (0x1D492, "M", "q"),
-        (0x1D493, "M", "r"),
-        (0x1D494, "M", "s"),
-        (0x1D495, "M", "t"),
-        (0x1D496, "M", "u"),
-        (0x1D497, "M", "v"),
-        (0x1D498, "M", "w"),
-        (0x1D499, "M", "x"),
-        (0x1D49A, "M", "y"),
-        (0x1D49B, "M", "z"),
-        (0x1D49C, "M", "a"),
-        (0x1D49D, "X"),
-        (0x1D49E, "M", "c"),
-        (0x1D49F, "M", "d"),
-        (0x1D4A0, "X"),
-        (0x1D4A2, "M", "g"),
-        (0x1D4A3, "X"),
-        (0x1D4A5, "M", "j"),
-        (0x1D4A6, "M", "k"),
-        (0x1D4A7, "X"),
-        (0x1D4A9, "M", "n"),
-        (0x1D4AA, "M", "o"),
-        (0x1D4AB, "M", "p"),
-        (0x1D4AC, "M", "q"),
-        (0x1D4AD, "X"),
-        (0x1D4AE, "M", "s"),
-        (0x1D4AF, "M", "t"),
-        (0x1D4B0, "M", "u"),
-        (0x1D4B1, "M", "v"),
-        (0x1D4B2, "M", "w"),
-        (0x1D4B3, "M", "x"),
-        (0x1D4B4, "M", "y"),
-        (0x1D4B5, "M", "z"),
-        (0x1D4B6, "M", "a"),
-        (0x1D4B7, "M", "b"),
-        (0x1D4B8, "M", "c"),
-        (0x1D4B9, "M", "d"),
-        (0x1D4BA, "X"),
-        (0x1D4BB, "M", "f"),
-        (0x1D4BC, "X"),
-        (0x1D4BD, "M", "h"),
-        (0x1D4BE, "M", "i"),
-        (0x1D4BF, "M", "j"),
-        (0x1D4C0, "M", "k"),
-        (0x1D4C1, "M", "l"),
-        (0x1D4C2, "M", "m"),
-        (0x1D4C3, "M", "n"),
-        (0x1D4C4, "X"),
-        (0x1D4C5, "M", "p"),
-        (0x1D4C6, "M", "q"),
-        (0x1D4C7, "M", "r"),
-        (0x1D4C8, "M", "s"),
-        (0x1D4C9, "M", "t"),
-        (0x1D4CA, "M", "u"),
-        (0x1D4CB, "M", "v"),
-        (0x1D4CC, "M", "w"),
-        (0x1D4CD, "M", "x"),
-        (0x1D4CE, "M", "y"),
-        (0x1D4CF, "M", "z"),
-        (0x1D4D0, "M", "a"),
-        (0x1D4D1, "M", "b"),
-        (0x1D4D2, "M", "c"),
-        (0x1D4D3, "M", "d"),
-        (0x1D4D4, "M", "e"),
-        (0x1D4D5, "M", "f"),
-        (0x1D4D6, "M", "g"),
-        (0x1D4D7, "M", "h"),
-        (0x1D4D8, "M", "i"),
-        (0x1D4D9, "M", "j"),
-        (0x1D4DA, "M", "k"),
-        (0x1D4DB, "M", "l"),
-        (0x1D4DC, "M", "m"),
-        (0x1D4DD, "M", "n"),
-        (0x1D4DE, "M", "o"),
-        (0x1D4DF, "M", "p"),
-        (0x1D4E0, "M", "q"),
-        (0x1D4E1, "M", "r"),
-        (0x1D4E2, "M", "s"),
-        (0x1D4E3, "M", "t"),
-        (0x1D4E4, "M", "u"),
-        (0x1D4E5, "M", "v"),
-        (0x1D4E6, "M", "w"),
-        (0x1D4E7, "M", "x"),
-        (0x1D4E8, "M", "y"),
-        (0x1D4E9, "M", "z"),
-        (0x1D4EA, "M", "a"),
-        (0x1D4EB, "M", "b"),
-        (0x1D4EC, "M", "c"),
-        (0x1D4ED, "M", "d"),
-        (0x1D4EE, "M", "e"),
-        (0x1D4EF, "M", "f"),
-    ]
-
-
-def _seg_63() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1D4F0, "M", "g"),
-        (0x1D4F1, "M", "h"),
-        (0x1D4F2, "M", "i"),
-        (0x1D4F3, "M", "j"),
-        (0x1D4F4, "M", "k"),
-        (0x1D4F5, "M", "l"),
-        (0x1D4F6, "M", "m"),
-        (0x1D4F7, "M", "n"),
-        (0x1D4F8, "M", "o"),
-        (0x1D4F9, "M", "p"),
-        (0x1D4FA, "M", "q"),
-        (0x1D4FB, "M", "r"),
-        (0x1D4FC, "M", "s"),
-        (0x1D4FD, "M", "t"),
-        (0x1D4FE, "M", "u"),
-        (0x1D4FF, "M", "v"),
-        (0x1D500, "M", "w"),
-        (0x1D501, "M", "x"),
-        (0x1D502, "M", "y"),
-        (0x1D503, "M", "z"),
-        (0x1D504, "M", "a"),
-        (0x1D505, "M", "b"),
-        (0x1D506, "X"),
-        (0x1D507, "M", "d"),
-        (0x1D508, "M", "e"),
-        (0x1D509, "M", "f"),
-        (0x1D50A, "M", "g"),
-        (0x1D50B, "X"),
-        (0x1D50D, "M", "j"),
-        (0x1D50E, "M", "k"),
-        (0x1D50F, "M", "l"),
-        (0x1D510, "M", "m"),
-        (0x1D511, "M", "n"),
-        (0x1D512, "M", "o"),
-        (0x1D513, "M", "p"),
-        (0x1D514, "M", "q"),
-        (0x1D515, "X"),
-        (0x1D516, "M", "s"),
-        (0x1D517, "M", "t"),
-        (0x1D518, "M", "u"),
-        (0x1D519, "M", "v"),
-        (0x1D51A, "M", "w"),
-        (0x1D51B, "M", "x"),
-        (0x1D51C, "M", "y"),
-        (0x1D51D, "X"),
-        (0x1D51E, "M", "a"),
-        (0x1D51F, "M", "b"),
-        (0x1D520, "M", "c"),
-        (0x1D521, "M", "d"),
-        (0x1D522, "M", "e"),
-        (0x1D523, "M", "f"),
-        (0x1D524, "M", "g"),
-        (0x1D525, "M", "h"),
-        (0x1D526, "M", "i"),
-        (0x1D527, "M", "j"),
-        (0x1D528, "M", "k"),
-        (0x1D529, "M", "l"),
-        (0x1D52A, "M", "m"),
-        (0x1D52B, "M", "n"),
-        (0x1D52C, "M", "o"),
-        (0x1D52D, "M", "p"),
-        (0x1D52E, "M", "q"),
-        (0x1D52F, "M", "r"),
-        (0x1D530, "M", "s"),
-        (0x1D531, "M", "t"),
-        (0x1D532, "M", "u"),
-        (0x1D533, "M", "v"),
-        (0x1D534, "M", "w"),
-        (0x1D535, "M", "x"),
-        (0x1D536, "M", "y"),
-        (0x1D537, "M", "z"),
-        (0x1D538, "M", "a"),
-        (0x1D539, "M", "b"),
-        (0x1D53A, "X"),
-        (0x1D53B, "M", "d"),
-        (0x1D53C, "M", "e"),
-        (0x1D53D, "M", "f"),
-        (0x1D53E, "M", "g"),
-        (0x1D53F, "X"),
-        (0x1D540, "M", "i"),
-        (0x1D541, "M", "j"),
-        (0x1D542, "M", "k"),
-        (0x1D543, "M", "l"),
-        (0x1D544, "M", "m"),
-        (0x1D545, "X"),
-        (0x1D546, "M", "o"),
-        (0x1D547, "X"),
-        (0x1D54A, "M", "s"),
-        (0x1D54B, "M", "t"),
-        (0x1D54C, "M", "u"),
-        (0x1D54D, "M", "v"),
-        (0x1D54E, "M", "w"),
-        (0x1D54F, "M", "x"),
-        (0x1D550, "M", "y"),
-        (0x1D551, "X"),
-        (0x1D552, "M", "a"),
-        (0x1D553, "M", "b"),
-        (0x1D554, "M", "c"),
-        (0x1D555, "M", "d"),
-        (0x1D556, "M", "e"),
-    ]
-
-
-def _seg_64() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1D557, "M", "f"),
-        (0x1D558, "M", "g"),
-        (0x1D559, "M", "h"),
-        (0x1D55A, "M", "i"),
-        (0x1D55B, "M", "j"),
-        (0x1D55C, "M", "k"),
-        (0x1D55D, "M", "l"),
-        (0x1D55E, "M", "m"),
-        (0x1D55F, "M", "n"),
-        (0x1D560, "M", "o"),
-        (0x1D561, "M", "p"),
-        (0x1D562, "M", "q"),
-        (0x1D563, "M", "r"),
-        (0x1D564, "M", "s"),
-        (0x1D565, "M", "t"),
-        (0x1D566, "M", "u"),
-        (0x1D567, "M", "v"),
-        (0x1D568, "M", "w"),
-        (0x1D569, "M", "x"),
-        (0x1D56A, "M", "y"),
-        (0x1D56B, "M", "z"),
-        (0x1D56C, "M", "a"),
-        (0x1D56D, "M", "b"),
-        (0x1D56E, "M", "c"),
-        (0x1D56F, "M", "d"),
-        (0x1D570, "M", "e"),
-        (0x1D571, "M", "f"),
-        (0x1D572, "M", "g"),
-        (0x1D573, "M", "h"),
-        (0x1D574, "M", "i"),
-        (0x1D575, "M", "j"),
-        (0x1D576, "M", "k"),
-        (0x1D577, "M", "l"),
-        (0x1D578, "M", "m"),
-        (0x1D579, "M", "n"),
-        (0x1D57A, "M", "o"),
-        (0x1D57B, "M", "p"),
-        (0x1D57C, "M", "q"),
-        (0x1D57D, "M", "r"),
-        (0x1D57E, "M", "s"),
-        (0x1D57F, "M", "t"),
-        (0x1D580, "M", "u"),
-        (0x1D581, "M", "v"),
-        (0x1D582, "M", "w"),
-        (0x1D583, "M", "x"),
-        (0x1D584, "M", "y"),
-        (0x1D585, "M", "z"),
-        (0x1D586, "M", "a"),
-        (0x1D587, "M", "b"),
-        (0x1D588, "M", "c"),
-        (0x1D589, "M", "d"),
-        (0x1D58A, "M", "e"),
-        (0x1D58B, "M", "f"),
-        (0x1D58C, "M", "g"),
-        (0x1D58D, "M", "h"),
-        (0x1D58E, "M", "i"),
-        (0x1D58F, "M", "j"),
-        (0x1D590, "M", "k"),
-        (0x1D591, "M", "l"),
-        (0x1D592, "M", "m"),
-        (0x1D593, "M", "n"),
-        (0x1D594, "M", "o"),
-        (0x1D595, "M", "p"),
-        (0x1D596, "M", "q"),
-        (0x1D597, "M", "r"),
-        (0x1D598, "M", "s"),
-        (0x1D599, "M", "t"),
-        (0x1D59A, "M", "u"),
-        (0x1D59B, "M", "v"),
-        (0x1D59C, "M", "w"),
-        (0x1D59D, "M", "x"),
-        (0x1D59E, "M", "y"),
-        (0x1D59F, "M", "z"),
-        (0x1D5A0, "M", "a"),
-        (0x1D5A1, "M", "b"),
-        (0x1D5A2, "M", "c"),
-        (0x1D5A3, "M", "d"),
-        (0x1D5A4, "M", "e"),
-        (0x1D5A5, "M", "f"),
-        (0x1D5A6, "M", "g"),
-        (0x1D5A7, "M", "h"),
-        (0x1D5A8, "M", "i"),
-        (0x1D5A9, "M", "j"),
-        (0x1D5AA, "M", "k"),
-        (0x1D5AB, "M", "l"),
-        (0x1D5AC, "M", "m"),
-        (0x1D5AD, "M", "n"),
-        (0x1D5AE, "M", "o"),
-        (0x1D5AF, "M", "p"),
-        (0x1D5B0, "M", "q"),
-        (0x1D5B1, "M", "r"),
-        (0x1D5B2, "M", "s"),
-        (0x1D5B3, "M", "t"),
-        (0x1D5B4, "M", "u"),
-        (0x1D5B5, "M", "v"),
-        (0x1D5B6, "M", "w"),
-        (0x1D5B7, "M", "x"),
-        (0x1D5B8, "M", "y"),
-        (0x1D5B9, "M", "z"),
-        (0x1D5BA, "M", "a"),
-    ]
-
-
-def _seg_65() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1D5BB, "M", "b"),
-        (0x1D5BC, "M", "c"),
-        (0x1D5BD, "M", "d"),
-        (0x1D5BE, "M", "e"),
-        (0x1D5BF, "M", "f"),
-        (0x1D5C0, "M", "g"),
-        (0x1D5C1, "M", "h"),
-        (0x1D5C2, "M", "i"),
-        (0x1D5C3, "M", "j"),
-        (0x1D5C4, "M", "k"),
-        (0x1D5C5, "M", "l"),
-        (0x1D5C6, "M", "m"),
-        (0x1D5C7, "M", "n"),
-        (0x1D5C8, "M", "o"),
-        (0x1D5C9, "M", "p"),
-        (0x1D5CA, "M", "q"),
-        (0x1D5CB, "M", "r"),
-        (0x1D5CC, "M", "s"),
-        (0x1D5CD, "M", "t"),
-        (0x1D5CE, "M", "u"),
-        (0x1D5CF, "M", "v"),
-        (0x1D5D0, "M", "w"),
-        (0x1D5D1, "M", "x"),
-        (0x1D5D2, "M", "y"),
-        (0x1D5D3, "M", "z"),
-        (0x1D5D4, "M", "a"),
-        (0x1D5D5, "M", "b"),
-        (0x1D5D6, "M", "c"),
-        (0x1D5D7, "M", "d"),
-        (0x1D5D8, "M", "e"),
-        (0x1D5D9, "M", "f"),
-        (0x1D5DA, "M", "g"),
-        (0x1D5DB, "M", "h"),
-        (0x1D5DC, "M", "i"),
-        (0x1D5DD, "M", "j"),
-        (0x1D5DE, "M", "k"),
-        (0x1D5DF, "M", "l"),
-        (0x1D5E0, "M", "m"),
-        (0x1D5E1, "M", "n"),
-        (0x1D5E2, "M", "o"),
-        (0x1D5E3, "M", "p"),
-        (0x1D5E4, "M", "q"),
-        (0x1D5E5, "M", "r"),
-        (0x1D5E6, "M", "s"),
-        (0x1D5E7, "M", "t"),
-        (0x1D5E8, "M", "u"),
-        (0x1D5E9, "M", "v"),
-        (0x1D5EA, "M", "w"),
-        (0x1D5EB, "M", "x"),
-        (0x1D5EC, "M", "y"),
-        (0x1D5ED, "M", "z"),
-        (0x1D5EE, "M", "a"),
-        (0x1D5EF, "M", "b"),
-        (0x1D5F0, "M", "c"),
-        (0x1D5F1, "M", "d"),
-        (0x1D5F2, "M", "e"),
-        (0x1D5F3, "M", "f"),
-        (0x1D5F4, "M", "g"),
-        (0x1D5F5, "M", "h"),
-        (0x1D5F6, "M", "i"),
-        (0x1D5F7, "M", "j"),
-        (0x1D5F8, "M", "k"),
-        (0x1D5F9, "M", "l"),
-        (0x1D5FA, "M", "m"),
-        (0x1D5FB, "M", "n"),
-        (0x1D5FC, "M", "o"),
-        (0x1D5FD, "M", "p"),
-        (0x1D5FE, "M", "q"),
-        (0x1D5FF, "M", "r"),
-        (0x1D600, "M", "s"),
-        (0x1D601, "M", "t"),
-        (0x1D602, "M", "u"),
-        (0x1D603, "M", "v"),
-        (0x1D604, "M", "w"),
-        (0x1D605, "M", "x"),
-        (0x1D606, "M", "y"),
-        (0x1D607, "M", "z"),
-        (0x1D608, "M", "a"),
-        (0x1D609, "M", "b"),
-        (0x1D60A, "M", "c"),
-        (0x1D60B, "M", "d"),
-        (0x1D60C, "M", "e"),
-        (0x1D60D, "M", "f"),
-        (0x1D60E, "M", "g"),
-        (0x1D60F, "M", "h"),
-        (0x1D610, "M", "i"),
-        (0x1D611, "M", "j"),
-        (0x1D612, "M", "k"),
-        (0x1D613, "M", "l"),
-        (0x1D614, "M", "m"),
-        (0x1D615, "M", "n"),
-        (0x1D616, "M", "o"),
-        (0x1D617, "M", "p"),
-        (0x1D618, "M", "q"),
-        (0x1D619, "M", "r"),
-        (0x1D61A, "M", "s"),
-        (0x1D61B, "M", "t"),
-        (0x1D61C, "M", "u"),
-        (0x1D61D, "M", "v"),
-        (0x1D61E, "M", "w"),
-    ]
-
-
-def _seg_66() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1D61F, "M", "x"),
-        (0x1D620, "M", "y"),
-        (0x1D621, "M", "z"),
-        (0x1D622, "M", "a"),
-        (0x1D623, "M", "b"),
-        (0x1D624, "M", "c"),
-        (0x1D625, "M", "d"),
-        (0x1D626, "M", "e"),
-        (0x1D627, "M", "f"),
-        (0x1D628, "M", "g"),
-        (0x1D629, "M", "h"),
-        (0x1D62A, "M", "i"),
-        (0x1D62B, "M", "j"),
-        (0x1D62C, "M", "k"),
-        (0x1D62D, "M", "l"),
-        (0x1D62E, "M", "m"),
-        (0x1D62F, "M", "n"),
-        (0x1D630, "M", "o"),
-        (0x1D631, "M", "p"),
-        (0x1D632, "M", "q"),
-        (0x1D633, "M", "r"),
-        (0x1D634, "M", "s"),
-        (0x1D635, "M", "t"),
-        (0x1D636, "M", "u"),
-        (0x1D637, "M", "v"),
-        (0x1D638, "M", "w"),
-        (0x1D639, "M", "x"),
-        (0x1D63A, "M", "y"),
-        (0x1D63B, "M", "z"),
-        (0x1D63C, "M", "a"),
-        (0x1D63D, "M", "b"),
-        (0x1D63E, "M", "c"),
-        (0x1D63F, "M", "d"),
-        (0x1D640, "M", "e"),
-        (0x1D641, "M", "f"),
-        (0x1D642, "M", "g"),
-        (0x1D643, "M", "h"),
-        (0x1D644, "M", "i"),
-        (0x1D645, "M", "j"),
-        (0x1D646, "M", "k"),
-        (0x1D647, "M", "l"),
-        (0x1D648, "M", "m"),
-        (0x1D649, "M", "n"),
-        (0x1D64A, "M", "o"),
-        (0x1D64B, "M", "p"),
-        (0x1D64C, "M", "q"),
-        (0x1D64D, "M", "r"),
-        (0x1D64E, "M", "s"),
-        (0x1D64F, "M", "t"),
-        (0x1D650, "M", "u"),
-        (0x1D651, "M", "v"),
-        (0x1D652, "M", "w"),
-        (0x1D653, "M", "x"),
-        (0x1D654, "M", "y"),
-        (0x1D655, "M", "z"),
-        (0x1D656, "M", "a"),
-        (0x1D657, "M", "b"),
-        (0x1D658, "M", "c"),
-        (0x1D659, "M", "d"),
-        (0x1D65A, "M", "e"),
-        (0x1D65B, "M", "f"),
-        (0x1D65C, "M", "g"),
-        (0x1D65D, "M", "h"),
-        (0x1D65E, "M", "i"),
-        (0x1D65F, "M", "j"),
-        (0x1D660, "M", "k"),
-        (0x1D661, "M", "l"),
-        (0x1D662, "M", "m"),
-        (0x1D663, "M", "n"),
-        (0x1D664, "M", "o"),
-        (0x1D665, "M", "p"),
-        (0x1D666, "M", "q"),
-        (0x1D667, "M", "r"),
-        (0x1D668, "M", "s"),
-        (0x1D669, "M", "t"),
-        (0x1D66A, "M", "u"),
-        (0x1D66B, "M", "v"),
-        (0x1D66C, "M", "w"),
-        (0x1D66D, "M", "x"),
-        (0x1D66E, "M", "y"),
-        (0x1D66F, "M", "z"),
-        (0x1D670, "M", "a"),
-        (0x1D671, "M", "b"),
-        (0x1D672, "M", "c"),
-        (0x1D673, "M", "d"),
-        (0x1D674, "M", "e"),
-        (0x1D675, "M", "f"),
-        (0x1D676, "M", "g"),
-        (0x1D677, "M", "h"),
-        (0x1D678, "M", "i"),
-        (0x1D679, "M", "j"),
-        (0x1D67A, "M", "k"),
-        (0x1D67B, "M", "l"),
-        (0x1D67C, "M", "m"),
-        (0x1D67D, "M", "n"),
-        (0x1D67E, "M", "o"),
-        (0x1D67F, "M", "p"),
-        (0x1D680, "M", "q"),
-        (0x1D681, "M", "r"),
-        (0x1D682, "M", "s"),
-    ]
-
-
-def _seg_67() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1D683, "M", "t"),
-        (0x1D684, "M", "u"),
-        (0x1D685, "M", "v"),
-        (0x1D686, "M", "w"),
-        (0x1D687, "M", "x"),
-        (0x1D688, "M", "y"),
-        (0x1D689, "M", "z"),
-        (0x1D68A, "M", "a"),
-        (0x1D68B, "M", "b"),
-        (0x1D68C, "M", "c"),
-        (0x1D68D, "M", "d"),
-        (0x1D68E, "M", "e"),
-        (0x1D68F, "M", "f"),
-        (0x1D690, "M", "g"),
-        (0x1D691, "M", "h"),
-        (0x1D692, "M", "i"),
-        (0x1D693, "M", "j"),
-        (0x1D694, "M", "k"),
-        (0x1D695, "M", "l"),
-        (0x1D696, "M", "m"),
-        (0x1D697, "M", "n"),
-        (0x1D698, "M", "o"),
-        (0x1D699, "M", "p"),
-        (0x1D69A, "M", "q"),
-        (0x1D69B, "M", "r"),
-        (0x1D69C, "M", "s"),
-        (0x1D69D, "M", "t"),
-        (0x1D69E, "M", "u"),
-        (0x1D69F, "M", "v"),
-        (0x1D6A0, "M", "w"),
-        (0x1D6A1, "M", "x"),
-        (0x1D6A2, "M", "y"),
-        (0x1D6A3, "M", "z"),
-        (0x1D6A4, "M", "ı"),
-        (0x1D6A5, "M", "È·"),
-        (0x1D6A6, "X"),
-        (0x1D6A8, "M", "α"),
-        (0x1D6A9, "M", "β"),
-        (0x1D6AA, "M", "γ"),
-        (0x1D6AB, "M", "δ"),
-        (0x1D6AC, "M", "ε"),
-        (0x1D6AD, "M", "ζ"),
-        (0x1D6AE, "M", "η"),
-        (0x1D6AF, "M", "θ"),
-        (0x1D6B0, "M", "ι"),
-        (0x1D6B1, "M", "κ"),
-        (0x1D6B2, "M", "λ"),
-        (0x1D6B3, "M", "μ"),
-        (0x1D6B4, "M", "ν"),
-        (0x1D6B5, "M", "ξ"),
-        (0x1D6B6, "M", "ο"),
-        (0x1D6B7, "M", "Ï€"),
-        (0x1D6B8, "M", "�"),
-        (0x1D6B9, "M", "θ"),
-        (0x1D6BA, "M", "σ"),
-        (0x1D6BB, "M", "Ï„"),
-        (0x1D6BC, "M", "Ï…"),
-        (0x1D6BD, "M", "φ"),
-        (0x1D6BE, "M", "χ"),
-        (0x1D6BF, "M", "ψ"),
-        (0x1D6C0, "M", "ω"),
-        (0x1D6C1, "M", "∇"),
-        (0x1D6C2, "M", "α"),
-        (0x1D6C3, "M", "β"),
-        (0x1D6C4, "M", "γ"),
-        (0x1D6C5, "M", "δ"),
-        (0x1D6C6, "M", "ε"),
-        (0x1D6C7, "M", "ζ"),
-        (0x1D6C8, "M", "η"),
-        (0x1D6C9, "M", "θ"),
-        (0x1D6CA, "M", "ι"),
-        (0x1D6CB, "M", "κ"),
-        (0x1D6CC, "M", "λ"),
-        (0x1D6CD, "M", "μ"),
-        (0x1D6CE, "M", "ν"),
-        (0x1D6CF, "M", "ξ"),
-        (0x1D6D0, "M", "ο"),
-        (0x1D6D1, "M", "Ï€"),
-        (0x1D6D2, "M", "�"),
-        (0x1D6D3, "M", "σ"),
-        (0x1D6D5, "M", "Ï„"),
-        (0x1D6D6, "M", "Ï…"),
-        (0x1D6D7, "M", "φ"),
-        (0x1D6D8, "M", "χ"),
-        (0x1D6D9, "M", "ψ"),
-        (0x1D6DA, "M", "ω"),
-        (0x1D6DB, "M", "∂"),
-        (0x1D6DC, "M", "ε"),
-        (0x1D6DD, "M", "θ"),
-        (0x1D6DE, "M", "κ"),
-        (0x1D6DF, "M", "φ"),
-        (0x1D6E0, "M", "�"),
-        (0x1D6E1, "M", "Ï€"),
-        (0x1D6E2, "M", "α"),
-        (0x1D6E3, "M", "β"),
-        (0x1D6E4, "M", "γ"),
-        (0x1D6E5, "M", "δ"),
-        (0x1D6E6, "M", "ε"),
-        (0x1D6E7, "M", "ζ"),
-        (0x1D6E8, "M", "η"),
-    ]
-
-
-def _seg_68() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1D6E9, "M", "θ"),
-        (0x1D6EA, "M", "ι"),
-        (0x1D6EB, "M", "κ"),
-        (0x1D6EC, "M", "λ"),
-        (0x1D6ED, "M", "μ"),
-        (0x1D6EE, "M", "ν"),
-        (0x1D6EF, "M", "ξ"),
-        (0x1D6F0, "M", "ο"),
-        (0x1D6F1, "M", "Ï€"),
-        (0x1D6F2, "M", "�"),
-        (0x1D6F3, "M", "θ"),
-        (0x1D6F4, "M", "σ"),
-        (0x1D6F5, "M", "Ï„"),
-        (0x1D6F6, "M", "Ï…"),
-        (0x1D6F7, "M", "φ"),
-        (0x1D6F8, "M", "χ"),
-        (0x1D6F9, "M", "ψ"),
-        (0x1D6FA, "M", "ω"),
-        (0x1D6FB, "M", "∇"),
-        (0x1D6FC, "M", "α"),
-        (0x1D6FD, "M", "β"),
-        (0x1D6FE, "M", "γ"),
-        (0x1D6FF, "M", "δ"),
-        (0x1D700, "M", "ε"),
-        (0x1D701, "M", "ζ"),
-        (0x1D702, "M", "η"),
-        (0x1D703, "M", "θ"),
-        (0x1D704, "M", "ι"),
-        (0x1D705, "M", "κ"),
-        (0x1D706, "M", "λ"),
-        (0x1D707, "M", "μ"),
-        (0x1D708, "M", "ν"),
-        (0x1D709, "M", "ξ"),
-        (0x1D70A, "M", "ο"),
-        (0x1D70B, "M", "Ï€"),
-        (0x1D70C, "M", "�"),
-        (0x1D70D, "M", "σ"),
-        (0x1D70F, "M", "Ï„"),
-        (0x1D710, "M", "Ï…"),
-        (0x1D711, "M", "φ"),
-        (0x1D712, "M", "χ"),
-        (0x1D713, "M", "ψ"),
-        (0x1D714, "M", "ω"),
-        (0x1D715, "M", "∂"),
-        (0x1D716, "M", "ε"),
-        (0x1D717, "M", "θ"),
-        (0x1D718, "M", "κ"),
-        (0x1D719, "M", "φ"),
-        (0x1D71A, "M", "�"),
-        (0x1D71B, "M", "Ï€"),
-        (0x1D71C, "M", "α"),
-        (0x1D71D, "M", "β"),
-        (0x1D71E, "M", "γ"),
-        (0x1D71F, "M", "δ"),
-        (0x1D720, "M", "ε"),
-        (0x1D721, "M", "ζ"),
-        (0x1D722, "M", "η"),
-        (0x1D723, "M", "θ"),
-        (0x1D724, "M", "ι"),
-        (0x1D725, "M", "κ"),
-        (0x1D726, "M", "λ"),
-        (0x1D727, "M", "μ"),
-        (0x1D728, "M", "ν"),
-        (0x1D729, "M", "ξ"),
-        (0x1D72A, "M", "ο"),
-        (0x1D72B, "M", "Ï€"),
-        (0x1D72C, "M", "�"),
-        (0x1D72D, "M", "θ"),
-        (0x1D72E, "M", "σ"),
-        (0x1D72F, "M", "Ï„"),
-        (0x1D730, "M", "Ï…"),
-        (0x1D731, "M", "φ"),
-        (0x1D732, "M", "χ"),
-        (0x1D733, "M", "ψ"),
-        (0x1D734, "M", "ω"),
-        (0x1D735, "M", "∇"),
-        (0x1D736, "M", "α"),
-        (0x1D737, "M", "β"),
-        (0x1D738, "M", "γ"),
-        (0x1D739, "M", "δ"),
-        (0x1D73A, "M", "ε"),
-        (0x1D73B, "M", "ζ"),
-        (0x1D73C, "M", "η"),
-        (0x1D73D, "M", "θ"),
-        (0x1D73E, "M", "ι"),
-        (0x1D73F, "M", "κ"),
-        (0x1D740, "M", "λ"),
-        (0x1D741, "M", "μ"),
-        (0x1D742, "M", "ν"),
-        (0x1D743, "M", "ξ"),
-        (0x1D744, "M", "ο"),
-        (0x1D745, "M", "Ï€"),
-        (0x1D746, "M", "�"),
-        (0x1D747, "M", "σ"),
-        (0x1D749, "M", "Ï„"),
-        (0x1D74A, "M", "Ï…"),
-        (0x1D74B, "M", "φ"),
-        (0x1D74C, "M", "χ"),
-        (0x1D74D, "M", "ψ"),
-        (0x1D74E, "M", "ω"),
-    ]
-
-
-def _seg_69() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1D74F, "M", "∂"),
-        (0x1D750, "M", "ε"),
-        (0x1D751, "M", "θ"),
-        (0x1D752, "M", "κ"),
-        (0x1D753, "M", "φ"),
-        (0x1D754, "M", "�"),
-        (0x1D755, "M", "Ï€"),
-        (0x1D756, "M", "α"),
-        (0x1D757, "M", "β"),
-        (0x1D758, "M", "γ"),
-        (0x1D759, "M", "δ"),
-        (0x1D75A, "M", "ε"),
-        (0x1D75B, "M", "ζ"),
-        (0x1D75C, "M", "η"),
-        (0x1D75D, "M", "θ"),
-        (0x1D75E, "M", "ι"),
-        (0x1D75F, "M", "κ"),
-        (0x1D760, "M", "λ"),
-        (0x1D761, "M", "μ"),
-        (0x1D762, "M", "ν"),
-        (0x1D763, "M", "ξ"),
-        (0x1D764, "M", "ο"),
-        (0x1D765, "M", "Ï€"),
-        (0x1D766, "M", "�"),
-        (0x1D767, "M", "θ"),
-        (0x1D768, "M", "σ"),
-        (0x1D769, "M", "Ï„"),
-        (0x1D76A, "M", "Ï…"),
-        (0x1D76B, "M", "φ"),
-        (0x1D76C, "M", "χ"),
-        (0x1D76D, "M", "ψ"),
-        (0x1D76E, "M", "ω"),
-        (0x1D76F, "M", "∇"),
-        (0x1D770, "M", "α"),
-        (0x1D771, "M", "β"),
-        (0x1D772, "M", "γ"),
-        (0x1D773, "M", "δ"),
-        (0x1D774, "M", "ε"),
-        (0x1D775, "M", "ζ"),
-        (0x1D776, "M", "η"),
-        (0x1D777, "M", "θ"),
-        (0x1D778, "M", "ι"),
-        (0x1D779, "M", "κ"),
-        (0x1D77A, "M", "λ"),
-        (0x1D77B, "M", "μ"),
-        (0x1D77C, "M", "ν"),
-        (0x1D77D, "M", "ξ"),
-        (0x1D77E, "M", "ο"),
-        (0x1D77F, "M", "Ï€"),
-        (0x1D780, "M", "�"),
-        (0x1D781, "M", "σ"),
-        (0x1D783, "M", "Ï„"),
-        (0x1D784, "M", "Ï…"),
-        (0x1D785, "M", "φ"),
-        (0x1D786, "M", "χ"),
-        (0x1D787, "M", "ψ"),
-        (0x1D788, "M", "ω"),
-        (0x1D789, "M", "∂"),
-        (0x1D78A, "M", "ε"),
-        (0x1D78B, "M", "θ"),
-        (0x1D78C, "M", "κ"),
-        (0x1D78D, "M", "φ"),
-        (0x1D78E, "M", "�"),
-        (0x1D78F, "M", "Ï€"),
-        (0x1D790, "M", "α"),
-        (0x1D791, "M", "β"),
-        (0x1D792, "M", "γ"),
-        (0x1D793, "M", "δ"),
-        (0x1D794, "M", "ε"),
-        (0x1D795, "M", "ζ"),
-        (0x1D796, "M", "η"),
-        (0x1D797, "M", "θ"),
-        (0x1D798, "M", "ι"),
-        (0x1D799, "M", "κ"),
-        (0x1D79A, "M", "λ"),
-        (0x1D79B, "M", "μ"),
-        (0x1D79C, "M", "ν"),
-        (0x1D79D, "M", "ξ"),
-        (0x1D79E, "M", "ο"),
-        (0x1D79F, "M", "Ï€"),
-        (0x1D7A0, "M", "�"),
-        (0x1D7A1, "M", "θ"),
-        (0x1D7A2, "M", "σ"),
-        (0x1D7A3, "M", "Ï„"),
-        (0x1D7A4, "M", "Ï…"),
-        (0x1D7A5, "M", "φ"),
-        (0x1D7A6, "M", "χ"),
-        (0x1D7A7, "M", "ψ"),
-        (0x1D7A8, "M", "ω"),
-        (0x1D7A9, "M", "∇"),
-        (0x1D7AA, "M", "α"),
-        (0x1D7AB, "M", "β"),
-        (0x1D7AC, "M", "γ"),
-        (0x1D7AD, "M", "δ"),
-        (0x1D7AE, "M", "ε"),
-        (0x1D7AF, "M", "ζ"),
-        (0x1D7B0, "M", "η"),
-        (0x1D7B1, "M", "θ"),
-        (0x1D7B2, "M", "ι"),
-        (0x1D7B3, "M", "κ"),
-    ]
-
-
-def _seg_70() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1D7B4, "M", "λ"),
-        (0x1D7B5, "M", "μ"),
-        (0x1D7B6, "M", "ν"),
-        (0x1D7B7, "M", "ξ"),
-        (0x1D7B8, "M", "ο"),
-        (0x1D7B9, "M", "Ï€"),
-        (0x1D7BA, "M", "�"),
-        (0x1D7BB, "M", "σ"),
-        (0x1D7BD, "M", "Ï„"),
-        (0x1D7BE, "M", "Ï…"),
-        (0x1D7BF, "M", "φ"),
-        (0x1D7C0, "M", "χ"),
-        (0x1D7C1, "M", "ψ"),
-        (0x1D7C2, "M", "ω"),
-        (0x1D7C3, "M", "∂"),
-        (0x1D7C4, "M", "ε"),
-        (0x1D7C5, "M", "θ"),
-        (0x1D7C6, "M", "κ"),
-        (0x1D7C7, "M", "φ"),
-        (0x1D7C8, "M", "�"),
-        (0x1D7C9, "M", "Ï€"),
-        (0x1D7CA, "M", "�"),
-        (0x1D7CC, "X"),
-        (0x1D7CE, "M", "0"),
-        (0x1D7CF, "M", "1"),
-        (0x1D7D0, "M", "2"),
-        (0x1D7D1, "M", "3"),
-        (0x1D7D2, "M", "4"),
-        (0x1D7D3, "M", "5"),
-        (0x1D7D4, "M", "6"),
-        (0x1D7D5, "M", "7"),
-        (0x1D7D6, "M", "8"),
-        (0x1D7D7, "M", "9"),
-        (0x1D7D8, "M", "0"),
-        (0x1D7D9, "M", "1"),
-        (0x1D7DA, "M", "2"),
-        (0x1D7DB, "M", "3"),
-        (0x1D7DC, "M", "4"),
-        (0x1D7DD, "M", "5"),
-        (0x1D7DE, "M", "6"),
-        (0x1D7DF, "M", "7"),
-        (0x1D7E0, "M", "8"),
-        (0x1D7E1, "M", "9"),
-        (0x1D7E2, "M", "0"),
-        (0x1D7E3, "M", "1"),
-        (0x1D7E4, "M", "2"),
-        (0x1D7E5, "M", "3"),
-        (0x1D7E6, "M", "4"),
-        (0x1D7E7, "M", "5"),
-        (0x1D7E8, "M", "6"),
-        (0x1D7E9, "M", "7"),
-        (0x1D7EA, "M", "8"),
-        (0x1D7EB, "M", "9"),
-        (0x1D7EC, "M", "0"),
-        (0x1D7ED, "M", "1"),
-        (0x1D7EE, "M", "2"),
-        (0x1D7EF, "M", "3"),
-        (0x1D7F0, "M", "4"),
-        (0x1D7F1, "M", "5"),
-        (0x1D7F2, "M", "6"),
-        (0x1D7F3, "M", "7"),
-        (0x1D7F4, "M", "8"),
-        (0x1D7F5, "M", "9"),
-        (0x1D7F6, "M", "0"),
-        (0x1D7F7, "M", "1"),
-        (0x1D7F8, "M", "2"),
-        (0x1D7F9, "M", "3"),
-        (0x1D7FA, "M", "4"),
-        (0x1D7FB, "M", "5"),
-        (0x1D7FC, "M", "6"),
-        (0x1D7FD, "M", "7"),
-        (0x1D7FE, "M", "8"),
-        (0x1D7FF, "M", "9"),
-        (0x1D800, "V"),
-        (0x1DA8C, "X"),
-        (0x1DA9B, "V"),
-        (0x1DAA0, "X"),
-        (0x1DAA1, "V"),
-        (0x1DAB0, "X"),
-        (0x1DF00, "V"),
-        (0x1DF1F, "X"),
-        (0x1DF25, "V"),
-        (0x1DF2B, "X"),
-        (0x1E000, "V"),
-        (0x1E007, "X"),
-        (0x1E008, "V"),
-        (0x1E019, "X"),
-        (0x1E01B, "V"),
-        (0x1E022, "X"),
-        (0x1E023, "V"),
-        (0x1E025, "X"),
-        (0x1E026, "V"),
-        (0x1E02B, "X"),
-        (0x1E030, "M", "а"),
-        (0x1E031, "M", "б"),
-        (0x1E032, "M", "в"),
-        (0x1E033, "M", "г"),
-        (0x1E034, "M", "д"),
-        (0x1E035, "M", "е"),
-        (0x1E036, "M", "ж"),
-    ]
-
-
-def _seg_71() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1E037, "M", "з"),
-        (0x1E038, "M", "и"),
-        (0x1E039, "M", "к"),
-        (0x1E03A, "M", "л"),
-        (0x1E03B, "M", "м"),
-        (0x1E03C, "M", "о"),
-        (0x1E03D, "M", "п"),
-        (0x1E03E, "M", "Ñ€"),
-        (0x1E03F, "M", "�"),
-        (0x1E040, "M", "Ñ‚"),
-        (0x1E041, "M", "у"),
-        (0x1E042, "M", "Ñ„"),
-        (0x1E043, "M", "Ñ…"),
-        (0x1E044, "M", "ц"),
-        (0x1E045, "M", "ч"),
-        (0x1E046, "M", "ш"),
-        (0x1E047, "M", "Ñ‹"),
-        (0x1E048, "M", "�"),
-        (0x1E049, "M", "ÑŽ"),
-        (0x1E04A, "M", "ꚉ"),
-        (0x1E04B, "M", "Ó™"),
-        (0x1E04C, "M", "Ñ–"),
-        (0x1E04D, "M", "ј"),
-        (0x1E04E, "M", "Ó©"),
-        (0x1E04F, "M", "Ò¯"),
-        (0x1E050, "M", "Ó�"),
-        (0x1E051, "M", "а"),
-        (0x1E052, "M", "б"),
-        (0x1E053, "M", "в"),
-        (0x1E054, "M", "г"),
-        (0x1E055, "M", "д"),
-        (0x1E056, "M", "е"),
-        (0x1E057, "M", "ж"),
-        (0x1E058, "M", "з"),
-        (0x1E059, "M", "и"),
-        (0x1E05A, "M", "к"),
-        (0x1E05B, "M", "л"),
-        (0x1E05C, "M", "о"),
-        (0x1E05D, "M", "п"),
-        (0x1E05E, "M", "�"),
-        (0x1E05F, "M", "у"),
-        (0x1E060, "M", "Ñ„"),
-        (0x1E061, "M", "Ñ…"),
-        (0x1E062, "M", "ц"),
-        (0x1E063, "M", "ч"),
-        (0x1E064, "M", "ш"),
-        (0x1E065, "M", "ÑŠ"),
-        (0x1E066, "M", "Ñ‹"),
-        (0x1E067, "M", "Ò‘"),
-        (0x1E068, "M", "Ñ–"),
-        (0x1E069, "M", "Ñ•"),
-        (0x1E06A, "M", "ÑŸ"),
-        (0x1E06B, "M", "Ò«"),
-        (0x1E06C, "M", "ꙑ"),
-        (0x1E06D, "M", "Ò±"),
-        (0x1E06E, "X"),
-        (0x1E08F, "V"),
-        (0x1E090, "X"),
-        (0x1E100, "V"),
-        (0x1E12D, "X"),
-        (0x1E130, "V"),
-        (0x1E13E, "X"),
-        (0x1E140, "V"),
-        (0x1E14A, "X"),
-        (0x1E14E, "V"),
-        (0x1E150, "X"),
-        (0x1E290, "V"),
-        (0x1E2AF, "X"),
-        (0x1E2C0, "V"),
-        (0x1E2FA, "X"),
-        (0x1E2FF, "V"),
-        (0x1E300, "X"),
-        (0x1E4D0, "V"),
-        (0x1E4FA, "X"),
-        (0x1E7E0, "V"),
-        (0x1E7E7, "X"),
-        (0x1E7E8, "V"),
-        (0x1E7EC, "X"),
-        (0x1E7ED, "V"),
-        (0x1E7EF, "X"),
-        (0x1E7F0, "V"),
-        (0x1E7FF, "X"),
-        (0x1E800, "V"),
-        (0x1E8C5, "X"),
-        (0x1E8C7, "V"),
-        (0x1E8D7, "X"),
-        (0x1E900, "M", "𞤢"),
-        (0x1E901, "M", "𞤣"),
-        (0x1E902, "M", "𞤤"),
-        (0x1E903, "M", "𞤥"),
-        (0x1E904, "M", "𞤦"),
-        (0x1E905, "M", "𞤧"),
-        (0x1E906, "M", "𞤨"),
-        (0x1E907, "M", "𞤩"),
-        (0x1E908, "M", "𞤪"),
-        (0x1E909, "M", "𞤫"),
-        (0x1E90A, "M", "𞤬"),
-        (0x1E90B, "M", "𞤭"),
-        (0x1E90C, "M", "𞤮"),
-        (0x1E90D, "M", "𞤯"),
-    ]
-
-
-def _seg_72() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1E90E, "M", "𞤰"),
-        (0x1E90F, "M", "𞤱"),
-        (0x1E910, "M", "𞤲"),
-        (0x1E911, "M", "𞤳"),
-        (0x1E912, "M", "𞤴"),
-        (0x1E913, "M", "𞤵"),
-        (0x1E914, "M", "𞤶"),
-        (0x1E915, "M", "𞤷"),
-        (0x1E916, "M", "𞤸"),
-        (0x1E917, "M", "𞤹"),
-        (0x1E918, "M", "𞤺"),
-        (0x1E919, "M", "𞤻"),
-        (0x1E91A, "M", "𞤼"),
-        (0x1E91B, "M", "𞤽"),
-        (0x1E91C, "M", "𞤾"),
-        (0x1E91D, "M", "𞤿"),
-        (0x1E91E, "M", "𞥀"),
-        (0x1E91F, "M", "�"),
-        (0x1E920, "M", "𞥂"),
-        (0x1E921, "M", "𞥃"),
-        (0x1E922, "V"),
-        (0x1E94C, "X"),
-        (0x1E950, "V"),
-        (0x1E95A, "X"),
-        (0x1E95E, "V"),
-        (0x1E960, "X"),
-        (0x1EC71, "V"),
-        (0x1ECB5, "X"),
-        (0x1ED01, "V"),
-        (0x1ED3E, "X"),
-        (0x1EE00, "M", "ا"),
-        (0x1EE01, "M", "ب"),
-        (0x1EE02, "M", "ج"),
-        (0x1EE03, "M", "د"),
-        (0x1EE04, "X"),
-        (0x1EE05, "M", "Ùˆ"),
-        (0x1EE06, "M", "ز"),
-        (0x1EE07, "M", "Ø­"),
-        (0x1EE08, "M", "Ø·"),
-        (0x1EE09, "M", "ÙŠ"),
-        (0x1EE0A, "M", "Ùƒ"),
-        (0x1EE0B, "M", "Ù„"),
-        (0x1EE0C, "M", "Ù…"),
-        (0x1EE0D, "M", "Ù†"),
-        (0x1EE0E, "M", "س"),
-        (0x1EE0F, "M", "ع"),
-        (0x1EE10, "M", "Ù�"),
-        (0x1EE11, "M", "ص"),
-        (0x1EE12, "M", "Ù‚"),
-        (0x1EE13, "M", "ر"),
-        (0x1EE14, "M", "Ø´"),
-        (0x1EE15, "M", "ت"),
-        (0x1EE16, "M", "Ø«"),
-        (0x1EE17, "M", "Ø®"),
-        (0x1EE18, "M", "Ø°"),
-        (0x1EE19, "M", "ض"),
-        (0x1EE1A, "M", "ظ"),
-        (0x1EE1B, "M", "غ"),
-        (0x1EE1C, "M", "Ù®"),
-        (0x1EE1D, "M", "Úº"),
-        (0x1EE1E, "M", "Ú¡"),
-        (0x1EE1F, "M", "Ù¯"),
-        (0x1EE20, "X"),
-        (0x1EE21, "M", "ب"),
-        (0x1EE22, "M", "ج"),
-        (0x1EE23, "X"),
-        (0x1EE24, "M", "Ù‡"),
-        (0x1EE25, "X"),
-        (0x1EE27, "M", "Ø­"),
-        (0x1EE28, "X"),
-        (0x1EE29, "M", "ÙŠ"),
-        (0x1EE2A, "M", "Ùƒ"),
-        (0x1EE2B, "M", "Ù„"),
-        (0x1EE2C, "M", "Ù…"),
-        (0x1EE2D, "M", "Ù†"),
-        (0x1EE2E, "M", "س"),
-        (0x1EE2F, "M", "ع"),
-        (0x1EE30, "M", "Ù�"),
-        (0x1EE31, "M", "ص"),
-        (0x1EE32, "M", "Ù‚"),
-        (0x1EE33, "X"),
-        (0x1EE34, "M", "Ø´"),
-        (0x1EE35, "M", "ت"),
-        (0x1EE36, "M", "Ø«"),
-        (0x1EE37, "M", "Ø®"),
-        (0x1EE38, "X"),
-        (0x1EE39, "M", "ض"),
-        (0x1EE3A, "X"),
-        (0x1EE3B, "M", "غ"),
-        (0x1EE3C, "X"),
-        (0x1EE42, "M", "ج"),
-        (0x1EE43, "X"),
-        (0x1EE47, "M", "Ø­"),
-        (0x1EE48, "X"),
-        (0x1EE49, "M", "ÙŠ"),
-        (0x1EE4A, "X"),
-        (0x1EE4B, "M", "Ù„"),
-        (0x1EE4C, "X"),
-        (0x1EE4D, "M", "Ù†"),
-        (0x1EE4E, "M", "س"),
-    ]
-
-
-def _seg_73() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1EE4F, "M", "ع"),
-        (0x1EE50, "X"),
-        (0x1EE51, "M", "ص"),
-        (0x1EE52, "M", "Ù‚"),
-        (0x1EE53, "X"),
-        (0x1EE54, "M", "Ø´"),
-        (0x1EE55, "X"),
-        (0x1EE57, "M", "Ø®"),
-        (0x1EE58, "X"),
-        (0x1EE59, "M", "ض"),
-        (0x1EE5A, "X"),
-        (0x1EE5B, "M", "غ"),
-        (0x1EE5C, "X"),
-        (0x1EE5D, "M", "Úº"),
-        (0x1EE5E, "X"),
-        (0x1EE5F, "M", "Ù¯"),
-        (0x1EE60, "X"),
-        (0x1EE61, "M", "ب"),
-        (0x1EE62, "M", "ج"),
-        (0x1EE63, "X"),
-        (0x1EE64, "M", "Ù‡"),
-        (0x1EE65, "X"),
-        (0x1EE67, "M", "Ø­"),
-        (0x1EE68, "M", "Ø·"),
-        (0x1EE69, "M", "ÙŠ"),
-        (0x1EE6A, "M", "Ùƒ"),
-        (0x1EE6B, "X"),
-        (0x1EE6C, "M", "Ù…"),
-        (0x1EE6D, "M", "Ù†"),
-        (0x1EE6E, "M", "س"),
-        (0x1EE6F, "M", "ع"),
-        (0x1EE70, "M", "Ù�"),
-        (0x1EE71, "M", "ص"),
-        (0x1EE72, "M", "Ù‚"),
-        (0x1EE73, "X"),
-        (0x1EE74, "M", "Ø´"),
-        (0x1EE75, "M", "ت"),
-        (0x1EE76, "M", "Ø«"),
-        (0x1EE77, "M", "Ø®"),
-        (0x1EE78, "X"),
-        (0x1EE79, "M", "ض"),
-        (0x1EE7A, "M", "ظ"),
-        (0x1EE7B, "M", "غ"),
-        (0x1EE7C, "M", "Ù®"),
-        (0x1EE7D, "X"),
-        (0x1EE7E, "M", "Ú¡"),
-        (0x1EE7F, "X"),
-        (0x1EE80, "M", "ا"),
-        (0x1EE81, "M", "ب"),
-        (0x1EE82, "M", "ج"),
-        (0x1EE83, "M", "د"),
-        (0x1EE84, "M", "Ù‡"),
-        (0x1EE85, "M", "Ùˆ"),
-        (0x1EE86, "M", "ز"),
-        (0x1EE87, "M", "Ø­"),
-        (0x1EE88, "M", "Ø·"),
-        (0x1EE89, "M", "ÙŠ"),
-        (0x1EE8A, "X"),
-        (0x1EE8B, "M", "Ù„"),
-        (0x1EE8C, "M", "Ù…"),
-        (0x1EE8D, "M", "Ù†"),
-        (0x1EE8E, "M", "س"),
-        (0x1EE8F, "M", "ع"),
-        (0x1EE90, "M", "Ù�"),
-        (0x1EE91, "M", "ص"),
-        (0x1EE92, "M", "Ù‚"),
-        (0x1EE93, "M", "ر"),
-        (0x1EE94, "M", "Ø´"),
-        (0x1EE95, "M", "ت"),
-        (0x1EE96, "M", "Ø«"),
-        (0x1EE97, "M", "Ø®"),
-        (0x1EE98, "M", "Ø°"),
-        (0x1EE99, "M", "ض"),
-        (0x1EE9A, "M", "ظ"),
-        (0x1EE9B, "M", "غ"),
-        (0x1EE9C, "X"),
-        (0x1EEA1, "M", "ب"),
-        (0x1EEA2, "M", "ج"),
-        (0x1EEA3, "M", "د"),
-        (0x1EEA4, "X"),
-        (0x1EEA5, "M", "Ùˆ"),
-        (0x1EEA6, "M", "ز"),
-        (0x1EEA7, "M", "Ø­"),
-        (0x1EEA8, "M", "Ø·"),
-        (0x1EEA9, "M", "ÙŠ"),
-        (0x1EEAA, "X"),
-        (0x1EEAB, "M", "Ù„"),
-        (0x1EEAC, "M", "Ù…"),
-        (0x1EEAD, "M", "Ù†"),
-        (0x1EEAE, "M", "س"),
-        (0x1EEAF, "M", "ع"),
-        (0x1EEB0, "M", "Ù�"),
-        (0x1EEB1, "M", "ص"),
-        (0x1EEB2, "M", "Ù‚"),
-        (0x1EEB3, "M", "ر"),
-        (0x1EEB4, "M", "Ø´"),
-        (0x1EEB5, "M", "ت"),
-        (0x1EEB6, "M", "Ø«"),
-        (0x1EEB7, "M", "Ø®"),
-        (0x1EEB8, "M", "Ø°"),
-    ]
-
-
-def _seg_74() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1EEB9, "M", "ض"),
-        (0x1EEBA, "M", "ظ"),
-        (0x1EEBB, "M", "غ"),
-        (0x1EEBC, "X"),
-        (0x1EEF0, "V"),
-        (0x1EEF2, "X"),
-        (0x1F000, "V"),
-        (0x1F02C, "X"),
-        (0x1F030, "V"),
-        (0x1F094, "X"),
-        (0x1F0A0, "V"),
-        (0x1F0AF, "X"),
-        (0x1F0B1, "V"),
-        (0x1F0C0, "X"),
-        (0x1F0C1, "V"),
-        (0x1F0D0, "X"),
-        (0x1F0D1, "V"),
-        (0x1F0F6, "X"),
-        (0x1F101, "3", "0,"),
-        (0x1F102, "3", "1,"),
-        (0x1F103, "3", "2,"),
-        (0x1F104, "3", "3,"),
-        (0x1F105, "3", "4,"),
-        (0x1F106, "3", "5,"),
-        (0x1F107, "3", "6,"),
-        (0x1F108, "3", "7,"),
-        (0x1F109, "3", "8,"),
-        (0x1F10A, "3", "9,"),
-        (0x1F10B, "V"),
-        (0x1F110, "3", "(a)"),
-        (0x1F111, "3", "(b)"),
-        (0x1F112, "3", "(c)"),
-        (0x1F113, "3", "(d)"),
-        (0x1F114, "3", "(e)"),
-        (0x1F115, "3", "(f)"),
-        (0x1F116, "3", "(g)"),
-        (0x1F117, "3", "(h)"),
-        (0x1F118, "3", "(i)"),
-        (0x1F119, "3", "(j)"),
-        (0x1F11A, "3", "(k)"),
-        (0x1F11B, "3", "(l)"),
-        (0x1F11C, "3", "(m)"),
-        (0x1F11D, "3", "(n)"),
-        (0x1F11E, "3", "(o)"),
-        (0x1F11F, "3", "(p)"),
-        (0x1F120, "3", "(q)"),
-        (0x1F121, "3", "(r)"),
-        (0x1F122, "3", "(s)"),
-        (0x1F123, "3", "(t)"),
-        (0x1F124, "3", "(u)"),
-        (0x1F125, "3", "(v)"),
-        (0x1F126, "3", "(w)"),
-        (0x1F127, "3", "(x)"),
-        (0x1F128, "3", "(y)"),
-        (0x1F129, "3", "(z)"),
-        (0x1F12A, "M", "〔s〕"),
-        (0x1F12B, "M", "c"),
-        (0x1F12C, "M", "r"),
-        (0x1F12D, "M", "cd"),
-        (0x1F12E, "M", "wz"),
-        (0x1F12F, "V"),
-        (0x1F130, "M", "a"),
-        (0x1F131, "M", "b"),
-        (0x1F132, "M", "c"),
-        (0x1F133, "M", "d"),
-        (0x1F134, "M", "e"),
-        (0x1F135, "M", "f"),
-        (0x1F136, "M", "g"),
-        (0x1F137, "M", "h"),
-        (0x1F138, "M", "i"),
-        (0x1F139, "M", "j"),
-        (0x1F13A, "M", "k"),
-        (0x1F13B, "M", "l"),
-        (0x1F13C, "M", "m"),
-        (0x1F13D, "M", "n"),
-        (0x1F13E, "M", "o"),
-        (0x1F13F, "M", "p"),
-        (0x1F140, "M", "q"),
-        (0x1F141, "M", "r"),
-        (0x1F142, "M", "s"),
-        (0x1F143, "M", "t"),
-        (0x1F144, "M", "u"),
-        (0x1F145, "M", "v"),
-        (0x1F146, "M", "w"),
-        (0x1F147, "M", "x"),
-        (0x1F148, "M", "y"),
-        (0x1F149, "M", "z"),
-        (0x1F14A, "M", "hv"),
-        (0x1F14B, "M", "mv"),
-        (0x1F14C, "M", "sd"),
-        (0x1F14D, "M", "ss"),
-        (0x1F14E, "M", "ppv"),
-        (0x1F14F, "M", "wc"),
-        (0x1F150, "V"),
-        (0x1F16A, "M", "mc"),
-        (0x1F16B, "M", "md"),
-        (0x1F16C, "M", "mr"),
-        (0x1F16D, "V"),
-        (0x1F190, "M", "dj"),
-        (0x1F191, "V"),
-    ]
-
-
-def _seg_75() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1F1AE, "X"),
-        (0x1F1E6, "V"),
-        (0x1F200, "M", "��"),
-        (0x1F201, "M", "ココ"),
-        (0x1F202, "M", "サ"),
-        (0x1F203, "X"),
-        (0x1F210, "M", "手"),
-        (0x1F211, "M", "å­—"),
-        (0x1F212, "M", "�"),
-        (0x1F213, "M", "デ"),
-        (0x1F214, "M", "二"),
-        (0x1F215, "M", "多"),
-        (0x1F216, "M", "解"),
-        (0x1F217, "M", "天"),
-        (0x1F218, "M", "交"),
-        (0x1F219, "M", "映"),
-        (0x1F21A, "M", "ç„¡"),
-        (0x1F21B, "M", "æ–™"),
-        (0x1F21C, "M", "�"),
-        (0x1F21D, "M", "後"),
-        (0x1F21E, "M", "�"),
-        (0x1F21F, "M", "æ–°"),
-        (0x1F220, "M", "�"),
-        (0x1F221, "M", "終"),
-        (0x1F222, "M", "生"),
-        (0x1F223, "M", "販"),
-        (0x1F224, "M", "声"),
-        (0x1F225, "M", "�"),
-        (0x1F226, "M", "æ¼”"),
-        (0x1F227, "M", "投"),
-        (0x1F228, "M", "�"),
-        (0x1F229, "M", "一"),
-        (0x1F22A, "M", "三"),
-        (0x1F22B, "M", "�"),
-        (0x1F22C, "M", "å·¦"),
-        (0x1F22D, "M", "中"),
-        (0x1F22E, "M", "�"),
-        (0x1F22F, "M", "指"),
-        (0x1F230, "M", "èµ°"),
-        (0x1F231, "M", "打"),
-        (0x1F232, "M", "�"),
-        (0x1F233, "M", "空"),
-        (0x1F234, "M", "�"),
-        (0x1F235, "M", "満"),
-        (0x1F236, "M", "有"),
-        (0x1F237, "M", "月"),
-        (0x1F238, "M", "申"),
-        (0x1F239, "M", "割"),
-        (0x1F23A, "M", "å–¶"),
-        (0x1F23B, "M", "é…�"),
-        (0x1F23C, "X"),
-        (0x1F240, "M", "〔本〕"),
-        (0x1F241, "M", "〔三〕"),
-        (0x1F242, "M", "〔二〕"),
-        (0x1F243, "M", "〔安〕"),
-        (0x1F244, "M", "〔点〕"),
-        (0x1F245, "M", "〔打〕"),
-        (0x1F246, "M", "〔盗〕"),
-        (0x1F247, "M", "〔�〕"),
-        (0x1F248, "M", "〔敗〕"),
-        (0x1F249, "X"),
-        (0x1F250, "M", "å¾—"),
-        (0x1F251, "M", "�"),
-        (0x1F252, "X"),
-        (0x1F260, "V"),
-        (0x1F266, "X"),
-        (0x1F300, "V"),
-        (0x1F6D8, "X"),
-        (0x1F6DC, "V"),
-        (0x1F6ED, "X"),
-        (0x1F6F0, "V"),
-        (0x1F6FD, "X"),
-        (0x1F700, "V"),
-        (0x1F777, "X"),
-        (0x1F77B, "V"),
-        (0x1F7DA, "X"),
-        (0x1F7E0, "V"),
-        (0x1F7EC, "X"),
-        (0x1F7F0, "V"),
-        (0x1F7F1, "X"),
-        (0x1F800, "V"),
-        (0x1F80C, "X"),
-        (0x1F810, "V"),
-        (0x1F848, "X"),
-        (0x1F850, "V"),
-        (0x1F85A, "X"),
-        (0x1F860, "V"),
-        (0x1F888, "X"),
-        (0x1F890, "V"),
-        (0x1F8AE, "X"),
-        (0x1F8B0, "V"),
-        (0x1F8B2, "X"),
-        (0x1F900, "V"),
-        (0x1FA54, "X"),
-        (0x1FA60, "V"),
-        (0x1FA6E, "X"),
-        (0x1FA70, "V"),
-        (0x1FA7D, "X"),
-        (0x1FA80, "V"),
-        (0x1FA89, "X"),
-    ]
-
-
-def _seg_76() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x1FA90, "V"),
-        (0x1FABE, "X"),
-        (0x1FABF, "V"),
-        (0x1FAC6, "X"),
-        (0x1FACE, "V"),
-        (0x1FADC, "X"),
-        (0x1FAE0, "V"),
-        (0x1FAE9, "X"),
-        (0x1FAF0, "V"),
-        (0x1FAF9, "X"),
-        (0x1FB00, "V"),
-        (0x1FB93, "X"),
-        (0x1FB94, "V"),
-        (0x1FBCB, "X"),
-        (0x1FBF0, "M", "0"),
-        (0x1FBF1, "M", "1"),
-        (0x1FBF2, "M", "2"),
-        (0x1FBF3, "M", "3"),
-        (0x1FBF4, "M", "4"),
-        (0x1FBF5, "M", "5"),
-        (0x1FBF6, "M", "6"),
-        (0x1FBF7, "M", "7"),
-        (0x1FBF8, "M", "8"),
-        (0x1FBF9, "M", "9"),
-        (0x1FBFA, "X"),
-        (0x20000, "V"),
-        (0x2A6E0, "X"),
-        (0x2A700, "V"),
-        (0x2B73A, "X"),
-        (0x2B740, "V"),
-        (0x2B81E, "X"),
-        (0x2B820, "V"),
-        (0x2CEA2, "X"),
-        (0x2CEB0, "V"),
-        (0x2EBE1, "X"),
-        (0x2EBF0, "V"),
-        (0x2EE5E, "X"),
-        (0x2F800, "M", "丽"),
-        (0x2F801, "M", "丸"),
-        (0x2F802, "M", "�"),
-        (0x2F803, "M", "ð „¢"),
-        (0x2F804, "M", "ä½ "),
-        (0x2F805, "M", "ä¾®"),
-        (0x2F806, "M", "ä¾»"),
-        (0x2F807, "M", "倂"),
-        (0x2F808, "M", "�"),
-        (0x2F809, "M", "å‚™"),
-        (0x2F80A, "M", "僧"),
-        (0x2F80B, "M", "�"),
-        (0x2F80C, "M", "ã’ž"),
-        (0x2F80D, "M", "𠘺"),
-        (0x2F80E, "M", "å…�"),
-        (0x2F80F, "M", "å…”"),
-        (0x2F810, "M", "å…¤"),
-        (0x2F811, "M", "å…·"),
-        (0x2F812, "M", "𠔜"),
-        (0x2F813, "M", "ã’¹"),
-        (0x2F814, "M", "å…§"),
-        (0x2F815, "M", "�"),
-        (0x2F816, "M", "ð •‹"),
-        (0x2F817, "M", "冗"),
-        (0x2F818, "M", "冤"),
-        (0x2F819, "M", "仌"),
-        (0x2F81A, "M", "冬"),
-        (0x2F81B, "M", "况"),
-        (0x2F81C, "M", "𩇟"),
-        (0x2F81D, "M", "凵"),
-        (0x2F81E, "M", "刃"),
-        (0x2F81F, "M", "ã“Ÿ"),
-        (0x2F820, "M", "刻"),
-        (0x2F821, "M", "剆"),
-        (0x2F822, "M", "割"),
-        (0x2F823, "M", "剷"),
-        (0x2F824, "M", "㔕"),
-        (0x2F825, "M", "勇"),
-        (0x2F826, "M", "勉"),
-        (0x2F827, "M", "勤"),
-        (0x2F828, "M", "勺"),
-        (0x2F829, "M", "包"),
-        (0x2F82A, "M", "匆"),
-        (0x2F82B, "M", "北"),
-        (0x2F82C, "M", "�"),
-        (0x2F82D, "M", "�"),
-        (0x2F82E, "M", "�"),
-        (0x2F82F, "M", "�"),
-        (0x2F830, "M", "�"),
-        (0x2F831, "M", "�"),
-        (0x2F834, "M", "𠨬"),
-        (0x2F835, "M", "�"),
-        (0x2F836, "M", "�"),
-        (0x2F837, "M", "�"),
-        (0x2F838, "M", "ð ­£"),
-        (0x2F839, "M", "�"),
-        (0x2F83A, "M", "�"),
-        (0x2F83B, "M", "�"),
-        (0x2F83C, "M", "å’ž"),
-        (0x2F83D, "M", "�"),
-        (0x2F83E, "M", "呈"),
-        (0x2F83F, "M", "周"),
-        (0x2F840, "M", "å’¢"),
-    ]
-
-
-def _seg_77() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x2F841, "M", "哶"),
-        (0x2F842, "M", "�"),
-        (0x2F843, "M", "å•“"),
-        (0x2F844, "M", "å•£"),
-        (0x2F845, "M", "å–„"),
-        (0x2F847, "M", "å–™"),
-        (0x2F848, "M", "å–«"),
-        (0x2F849, "M", "å–³"),
-        (0x2F84A, "M", "å—‚"),
-        (0x2F84B, "M", "圖"),
-        (0x2F84C, "M", "嘆"),
-        (0x2F84D, "M", "圗"),
-        (0x2F84E, "M", "噑"),
-        (0x2F84F, "M", "å™´"),
-        (0x2F850, "M", "切"),
-        (0x2F851, "M", "壮"),
-        (0x2F852, "M", "城"),
-        (0x2F853, "M", "埴"),
-        (0x2F854, "M", "å �"),
-        (0x2F855, "M", "åž‹"),
-        (0x2F856, "M", "å ²"),
-        (0x2F857, "M", "å ±"),
-        (0x2F858, "M", "墬"),
-        (0x2F859, "M", "𡓤"),
-        (0x2F85A, "M", "売"),
-        (0x2F85B, "M", "壷"),
-        (0x2F85C, "M", "夆"),
-        (0x2F85D, "M", "多"),
-        (0x2F85E, "M", "夢"),
-        (0x2F85F, "M", "奢"),
-        (0x2F860, "M", "𡚨"),
-        (0x2F861, "M", "𡛪"),
-        (0x2F862, "M", "姬"),
-        (0x2F863, "M", "娛"),
-        (0x2F864, "M", "娧"),
-        (0x2F865, "M", "姘"),
-        (0x2F866, "M", "婦"),
-        (0x2F867, "M", "ã›®"),
-        (0x2F868, "X"),
-        (0x2F869, "M", "嬈"),
-        (0x2F86A, "M", "嬾"),
-        (0x2F86C, "M", "𡧈"),
-        (0x2F86D, "M", "寃"),
-        (0x2F86E, "M", "寘"),
-        (0x2F86F, "M", "寧"),
-        (0x2F870, "M", "寳"),
-        (0x2F871, "M", "𡬘"),
-        (0x2F872, "M", "寿"),
-        (0x2F873, "M", "å°†"),
-        (0x2F874, "X"),
-        (0x2F875, "M", "å°¢"),
-        (0x2F876, "M", "�"),
-        (0x2F877, "M", "å± "),
-        (0x2F878, "M", "å±®"),
-        (0x2F879, "M", "å³€"),
-        (0x2F87A, "M", "�"),
-        (0x2F87B, "M", "ð¡·¤"),
-        (0x2F87C, "M", "嵃"),
-        (0x2F87D, "M", "ð¡·¦"),
-        (0x2F87E, "M", "åµ®"),
-        (0x2F87F, "M", "嵫"),
-        (0x2F880, "M", "åµ¼"),
-        (0x2F881, "M", "å·¡"),
-        (0x2F882, "M", "å·¢"),
-        (0x2F883, "M", "ã ¯"),
-        (0x2F884, "M", "å·½"),
-        (0x2F885, "M", "帨"),
-        (0x2F886, "M", "帽"),
-        (0x2F887, "M", "幩"),
-        (0x2F888, "M", "ã¡¢"),
-        (0x2F889, "M", "𢆃"),
-        (0x2F88A, "M", "㡼"),
-        (0x2F88B, "M", "庰"),
-        (0x2F88C, "M", "庳"),
-        (0x2F88D, "M", "庶"),
-        (0x2F88E, "M", "廊"),
-        (0x2F88F, "M", "𪎒"),
-        (0x2F890, "M", "廾"),
-        (0x2F891, "M", "𢌱"),
-        (0x2F893, "M", "�"),
-        (0x2F894, "M", "å¼¢"),
-        (0x2F896, "M", "㣇"),
-        (0x2F897, "M", "𣊸"),
-        (0x2F898, "M", "𦇚"),
-        (0x2F899, "M", "å½¢"),
-        (0x2F89A, "M", "彫"),
-        (0x2F89B, "M", "㣣"),
-        (0x2F89C, "M", "徚"),
-        (0x2F89D, "M", "�"),
-        (0x2F89E, "M", "å¿—"),
-        (0x2F89F, "M", "忹"),
-        (0x2F8A0, "M", "�"),
-        (0x2F8A1, "M", "㤺"),
-        (0x2F8A2, "M", "㤜"),
-        (0x2F8A3, "M", "æ‚”"),
-        (0x2F8A4, "M", "𢛔"),
-        (0x2F8A5, "M", "惇"),
-        (0x2F8A6, "M", "æ…ˆ"),
-        (0x2F8A7, "M", "慌"),
-        (0x2F8A8, "M", "æ…Ž"),
-    ]
-
-
-def _seg_78() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x2F8A9, "M", "慌"),
-        (0x2F8AA, "M", "æ…º"),
-        (0x2F8AB, "M", "憎"),
-        (0x2F8AC, "M", "憲"),
-        (0x2F8AD, "M", "憤"),
-        (0x2F8AE, "M", "憯"),
-        (0x2F8AF, "M", "懞"),
-        (0x2F8B0, "M", "懲"),
-        (0x2F8B1, "M", "懶"),
-        (0x2F8B2, "M", "�"),
-        (0x2F8B3, "M", "戛"),
-        (0x2F8B4, "M", "�"),
-        (0x2F8B5, "M", "抱"),
-        (0x2F8B6, "M", "æ‹”"),
-        (0x2F8B7, "M", "�"),
-        (0x2F8B8, "M", "𢬌"),
-        (0x2F8B9, "M", "挽"),
-        (0x2F8BA, "M", "拼"),
-        (0x2F8BB, "M", "�"),
-        (0x2F8BC, "M", "掃"),
-        (0x2F8BD, "M", "�"),
-        (0x2F8BE, "M", "𢯱"),
-        (0x2F8BF, "M", "�"),
-        (0x2F8C0, "M", "�"),
-        (0x2F8C1, "M", "掩"),
-        (0x2F8C2, "M", "㨮"),
-        (0x2F8C3, "M", "æ‘©"),
-        (0x2F8C4, "M", "摾"),
-        (0x2F8C5, "M", "æ’�"),
-        (0x2F8C6, "M", "æ‘·"),
-        (0x2F8C7, "M", "㩬"),
-        (0x2F8C8, "M", "�"),
-        (0x2F8C9, "M", "敬"),
-        (0x2F8CA, "M", "𣀊"),
-        (0x2F8CB, "M", "æ—£"),
-        (0x2F8CC, "M", "書"),
-        (0x2F8CD, "M", "晉"),
-        (0x2F8CE, "M", "㬙"),
-        (0x2F8CF, "M", "æš‘"),
-        (0x2F8D0, "M", "㬈"),
-        (0x2F8D1, "M", "㫤"),
-        (0x2F8D2, "M", "冒"),
-        (0x2F8D3, "M", "冕"),
-        (0x2F8D4, "M", "最"),
-        (0x2F8D5, "M", "暜"),
-        (0x2F8D6, "M", "è‚­"),
-        (0x2F8D7, "M", "�"),
-        (0x2F8D8, "M", "朗"),
-        (0x2F8D9, "M", "望"),
-        (0x2F8DA, "M", "朡"),
-        (0x2F8DB, "M", "�"),
-        (0x2F8DC, "M", "�"),
-        (0x2F8DD, "M", "�"),
-        (0x2F8DE, "M", "ã­‰"),
-        (0x2F8DF, "M", "柺"),
-        (0x2F8E0, "M", "æž…"),
-        (0x2F8E1, "M", "æ¡’"),
-        (0x2F8E2, "M", "梅"),
-        (0x2F8E3, "M", "𣑭"),
-        (0x2F8E4, "M", "梎"),
-        (0x2F8E5, "M", "æ Ÿ"),
-        (0x2F8E6, "M", "椔"),
-        (0x2F8E7, "M", "�"),
-        (0x2F8E8, "M", "楂"),
-        (0x2F8E9, "M", "榣"),
-        (0x2F8EA, "M", "槪"),
-        (0x2F8EB, "M", "檨"),
-        (0x2F8EC, "M", "𣚣"),
-        (0x2F8ED, "M", "æ«›"),
-        (0x2F8EE, "M", "ã°˜"),
-        (0x2F8EF, "M", "次"),
-        (0x2F8F0, "M", "𣢧"),
-        (0x2F8F1, "M", "æ­”"),
-        (0x2F8F2, "M", "㱎"),
-        (0x2F8F3, "M", "æ­²"),
-        (0x2F8F4, "M", "殟"),
-        (0x2F8F5, "M", "殺"),
-        (0x2F8F6, "M", "æ®»"),
-        (0x2F8F7, "M", "�"),
-        (0x2F8F8, "M", "ð¡´‹"),
-        (0x2F8F9, "M", "𣫺"),
-        (0x2F8FA, "M", "汎"),
-        (0x2F8FB, "M", "𣲼"),
-        (0x2F8FC, "M", "沿"),
-        (0x2F8FD, "M", "�"),
-        (0x2F8FE, "M", "汧"),
-        (0x2F8FF, "M", "æ´–"),
-        (0x2F900, "M", "æ´¾"),
-        (0x2F901, "M", "æµ·"),
-        (0x2F902, "M", "�"),
-        (0x2F903, "M", "浩"),
-        (0x2F904, "M", "浸"),
-        (0x2F905, "M", "涅"),
-        (0x2F906, "M", "𣴞"),
-        (0x2F907, "M", "æ´´"),
-        (0x2F908, "M", "港"),
-        (0x2F909, "M", "æ¹®"),
-        (0x2F90A, "M", "ã´³"),
-        (0x2F90B, "M", "滋"),
-        (0x2F90C, "M", "滇"),
-    ]
-
-
-def _seg_79() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x2F90D, "M", "𣻑"),
-        (0x2F90E, "M", "æ·¹"),
-        (0x2F90F, "M", "æ½®"),
-        (0x2F910, "M", "𣽞"),
-        (0x2F911, "M", "𣾎"),
-        (0x2F912, "M", "濆"),
-        (0x2F913, "M", "瀹"),
-        (0x2F914, "M", "瀞"),
-        (0x2F915, "M", "瀛"),
-        (0x2F916, "M", "㶖"),
-        (0x2F917, "M", "�"),
-        (0x2F918, "M", "�"),
-        (0x2F919, "M", "�"),
-        (0x2F91A, "M", "ç‚­"),
-        (0x2F91B, "M", "𠔥"),
-        (0x2F91C, "M", "ç……"),
-        (0x2F91D, "M", "𤉣"),
-        (0x2F91E, "M", "熜"),
-        (0x2F91F, "X"),
-        (0x2F920, "M", "爨"),
-        (0x2F921, "M", "爵"),
-        (0x2F922, "M", "�"),
-        (0x2F923, "M", "𤘈"),
-        (0x2F924, "M", "犀"),
-        (0x2F925, "M", "犕"),
-        (0x2F926, "M", "𤜵"),
-        (0x2F927, "M", "𤠔"),
-        (0x2F928, "M", "�"),
-        (0x2F929, "M", "王"),
-        (0x2F92A, "M", "㺬"),
-        (0x2F92B, "M", "玥"),
-        (0x2F92C, "M", "㺸"),
-        (0x2F92E, "M", "瑇"),
-        (0x2F92F, "M", "瑜"),
-        (0x2F930, "M", "瑱"),
-        (0x2F931, "M", "ç’…"),
-        (0x2F932, "M", "ç“Š"),
-        (0x2F933, "M", "ã¼›"),
-        (0x2F934, "M", "甤"),
-        (0x2F935, "M", "𤰶"),
-        (0x2F936, "M", "甾"),
-        (0x2F937, "M", "𤲒"),
-        (0x2F938, "M", "ç•°"),
-        (0x2F939, "M", "𢆟"),
-        (0x2F93A, "M", "�"),
-        (0x2F93B, "M", "𤾡"),
-        (0x2F93C, "M", "𤾸"),
-        (0x2F93D, "M", "�"),
-        (0x2F93E, "M", "㿼"),
-        (0x2F93F, "M", "䀈"),
-        (0x2F940, "M", "ç›´"),
-        (0x2F941, "M", "𥃳"),
-        (0x2F942, "M", "𥃲"),
-        (0x2F943, "M", "𥄙"),
-        (0x2F944, "M", "𥄳"),
-        (0x2F945, "M", "眞"),
-        (0x2F946, "M", "真"),
-        (0x2F948, "M", "�"),
-        (0x2F949, "M", "䀹"),
-        (0x2F94A, "M", "çž‹"),
-        (0x2F94B, "M", "�"),
-        (0x2F94C, "M", "ä‚–"),
-        (0x2F94D, "M", "�"),
-        (0x2F94E, "M", "ç¡Ž"),
-        (0x2F94F, "M", "碌"),
-        (0x2F950, "M", "磌"),
-        (0x2F951, "M", "䃣"),
-        (0x2F952, "M", "𥘦"),
-        (0x2F953, "M", "祖"),
-        (0x2F954, "M", "𥚚"),
-        (0x2F955, "M", "𥛅"),
-        (0x2F956, "M", "�"),
-        (0x2F957, "M", "秫"),
-        (0x2F958, "M", "䄯"),
-        (0x2F959, "M", "ç©€"),
-        (0x2F95A, "M", "ç©Š"),
-        (0x2F95B, "M", "�"),
-        (0x2F95C, "M", "𥥼"),
-        (0x2F95D, "M", "𥪧"),
-        (0x2F95F, "X"),
-        (0x2F960, "M", "䈂"),
-        (0x2F961, "M", "𥮫"),
-        (0x2F962, "M", "篆"),
-        (0x2F963, "M", "築"),
-        (0x2F964, "M", "䈧"),
-        (0x2F965, "M", "𥲀"),
-        (0x2F966, "M", "ç³’"),
-        (0x2F967, "M", "䊠"),
-        (0x2F968, "M", "糨"),
-        (0x2F969, "M", "ç³£"),
-        (0x2F96A, "M", "ç´€"),
-        (0x2F96B, "M", "𥾆"),
-        (0x2F96C, "M", "çµ£"),
-        (0x2F96D, "M", "�"),
-        (0x2F96E, "M", "ç·‡"),
-        (0x2F96F, "M", "縂"),
-        (0x2F970, "M", "ç¹…"),
-        (0x2F971, "M", "䌴"),
-        (0x2F972, "M", "𦈨"),
-        (0x2F973, "M", "𦉇"),
-    ]
-
-
-def _seg_80() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x2F974, "M", "�"),
-        (0x2F975, "M", "𦋙"),
-        (0x2F976, "M", "罺"),
-        (0x2F977, "M", "𦌾"),
-        (0x2F978, "M", "羕"),
-        (0x2F979, "M", "翺"),
-        (0x2F97A, "M", "者"),
-        (0x2F97B, "M", "𦓚"),
-        (0x2F97C, "M", "𦔣"),
-        (0x2F97D, "M", "�"),
-        (0x2F97E, "M", "𦖨"),
-        (0x2F97F, "M", "�"),
-        (0x2F980, "M", "�"),
-        (0x2F981, "M", "�"),
-        (0x2F982, "M", "育"),
-        (0x2F983, "M", "脃"),
-        (0x2F984, "M", "�"),
-        (0x2F985, "M", "脾"),
-        (0x2F986, "M", "媵"),
-        (0x2F987, "M", "𦞧"),
-        (0x2F988, "M", "𦞵"),
-        (0x2F989, "M", "𣎓"),
-        (0x2F98A, "M", "𣎜"),
-        (0x2F98B, "M", "�"),
-        (0x2F98C, "M", "舄"),
-        (0x2F98D, "M", "辞"),
-        (0x2F98E, "M", "ä‘«"),
-        (0x2F98F, "M", "芑"),
-        (0x2F990, "M", "芋"),
-        (0x2F991, "M", "�"),
-        (0x2F992, "M", "劳"),
-        (0x2F993, "M", "花"),
-        (0x2F994, "M", "芳"),
-        (0x2F995, "M", "芽"),
-        (0x2F996, "M", "苦"),
-        (0x2F997, "M", "𦬼"),
-        (0x2F998, "M", "è‹¥"),
-        (0x2F999, "M", "�"),
-        (0x2F99A, "M", "�"),
-        (0x2F99B, "M", "莭"),
-        (0x2F99C, "M", "茣"),
-        (0x2F99D, "M", "莽"),
-        (0x2F99E, "M", "�"),
-        (0x2F99F, "M", "è‘—"),
-        (0x2F9A0, "M", "�"),
-        (0x2F9A1, "M", "�"),
-        (0x2F9A2, "M", "�"),
-        (0x2F9A3, "M", "�"),
-        (0x2F9A4, "M", "𦰶"),
-        (0x2F9A5, "M", "𦵫"),
-        (0x2F9A6, "M", "𦳕"),
-        (0x2F9A7, "M", "䔫"),
-        (0x2F9A8, "M", "蓱"),
-        (0x2F9A9, "M", "蓳"),
-        (0x2F9AA, "M", "è”–"),
-        (0x2F9AB, "M", "�"),
-        (0x2F9AC, "M", "蕤"),
-        (0x2F9AD, "M", "𦼬"),
-        (0x2F9AE, "M", "�"),
-        (0x2F9AF, "M", "ä•¡"),
-        (0x2F9B0, "M", "𦾱"),
-        (0x2F9B1, "M", "𧃒"),
-        (0x2F9B2, "M", "ä•«"),
-        (0x2F9B3, "M", "�"),
-        (0x2F9B4, "M", "虜"),
-        (0x2F9B5, "M", "虧"),
-        (0x2F9B6, "M", "虩"),
-        (0x2F9B7, "M", "èš©"),
-        (0x2F9B8, "M", "蚈"),
-        (0x2F9B9, "M", "蜎"),
-        (0x2F9BA, "M", "蛢"),
-        (0x2F9BB, "M", "�"),
-        (0x2F9BC, "M", "蜨"),
-        (0x2F9BD, "M", "�"),
-        (0x2F9BE, "M", "螆"),
-        (0x2F9BF, "X"),
-        (0x2F9C0, "M", "蟡"),
-        (0x2F9C1, "M", "è �"),
-        (0x2F9C2, "M", "ä—¹"),
-        (0x2F9C3, "M", "è¡ "),
-        (0x2F9C4, "M", "è¡£"),
-        (0x2F9C5, "M", "𧙧"),
-        (0x2F9C6, "M", "裗"),
-        (0x2F9C7, "M", "裞"),
-        (0x2F9C8, "M", "䘵"),
-        (0x2F9C9, "M", "裺"),
-        (0x2F9CA, "M", "ã’»"),
-        (0x2F9CB, "M", "𧢮"),
-        (0x2F9CC, "M", "𧥦"),
-        (0x2F9CD, "M", "äš¾"),
-        (0x2F9CE, "M", "䛇"),
-        (0x2F9CF, "M", "誠"),
-        (0x2F9D0, "M", "è«­"),
-        (0x2F9D1, "M", "變"),
-        (0x2F9D2, "M", "豕"),
-        (0x2F9D3, "M", "𧲨"),
-        (0x2F9D4, "M", "貫"),
-        (0x2F9D5, "M", "�"),
-        (0x2F9D6, "M", "è´›"),
-        (0x2F9D7, "M", "èµ·"),
-    ]
-
-
-def _seg_81() -> List[Union[Tuple[int, str], Tuple[int, str, str]]]:
-    return [
-        (0x2F9D8, "M", "𧼯"),
-        (0x2F9D9, "M", "ð  „"),
-        (0x2F9DA, "M", "è·‹"),
-        (0x2F9DB, "M", "趼"),
-        (0x2F9DC, "M", "è·°"),
-        (0x2F9DD, "M", "𠣞"),
-        (0x2F9DE, "M", "è»”"),
-        (0x2F9DF, "M", "輸"),
-        (0x2F9E0, "M", "𨗒"),
-        (0x2F9E1, "M", "𨗭"),
-        (0x2F9E2, "M", "é‚”"),
-        (0x2F9E3, "M", "郱"),
-        (0x2F9E4, "M", "é„‘"),
-        (0x2F9E5, "M", "𨜮"),
-        (0x2F9E6, "M", "é„›"),
-        (0x2F9E7, "M", "鈸"),
-        (0x2F9E8, "M", "é‹—"),
-        (0x2F9E9, "M", "鋘"),
-        (0x2F9EA, "M", "鉼"),
-        (0x2F9EB, "M", "�"),
-        (0x2F9EC, "M", "�"),
-        (0x2F9ED, "M", "𨯺"),
-        (0x2F9EE, "M", "é–‹"),
-        (0x2F9EF, "M", "䦕"),
-        (0x2F9F0, "M", "é–·"),
-        (0x2F9F1, "M", "𨵷"),
-        (0x2F9F2, "M", "䧦"),
-        (0x2F9F3, "M", "雃"),
-        (0x2F9F4, "M", "嶲"),
-        (0x2F9F5, "M", "霣"),
-        (0x2F9F6, "M", "ð©……"),
-        (0x2F9F7, "M", "𩈚"),
-        (0x2F9F8, "M", "ä©®"),
-        (0x2F9F9, "M", "䩶"),
-        (0x2F9FA, "M", "韠"),
-        (0x2F9FB, "M", "�"),
-        (0x2F9FC, "M", "䪲"),
-        (0x2F9FD, "M", "ð©’–"),
-        (0x2F9FE, "M", "é ‹"),
-        (0x2FA00, "M", "é ©"),
-        (0x2FA01, "M", "ð©–¶"),
-        (0x2FA02, "M", "飢"),
-        (0x2FA03, "M", "䬳"),
-        (0x2FA04, "M", "餩"),
-        (0x2FA05, "M", "馧"),
-        (0x2FA06, "M", "駂"),
-        (0x2FA07, "M", "駾"),
-        (0x2FA08, "M", "䯎"),
-        (0x2FA09, "M", "𩬰"),
-        (0x2FA0A, "M", "鬒"),
-        (0x2FA0B, "M", "é±€"),
-        (0x2FA0C, "M", "é³½"),
-        (0x2FA0D, "M", "䳎"),
-        (0x2FA0E, "M", "ä³­"),
-        (0x2FA0F, "M", "鵧"),
-        (0x2FA10, "M", "𪃎"),
-        (0x2FA11, "M", "䳸"),
-        (0x2FA12, "M", "𪄅"),
-        (0x2FA13, "M", "𪈎"),
-        (0x2FA14, "M", "𪊑"),
-        (0x2FA15, "M", "麻"),
-        (0x2FA16, "M", "äµ–"),
-        (0x2FA17, "M", "黹"),
-        (0x2FA18, "M", "黾"),
-        (0x2FA19, "M", "é¼…"),
-        (0x2FA1A, "M", "�"),
-        (0x2FA1B, "M", "é¼–"),
-        (0x2FA1C, "M", "é¼»"),
-        (0x2FA1D, "M", "𪘀"),
-        (0x2FA1E, "X"),
-        (0x30000, "V"),
-        (0x3134B, "X"),
-        (0x31350, "V"),
-        (0x323B0, "X"),
-        (0xE0100, "I"),
-        (0xE01F0, "X"),
-    ]
-
-
-uts46data = tuple(
-    _seg_0()
-    + _seg_1()
-    + _seg_2()
-    + _seg_3()
-    + _seg_4()
-    + _seg_5()
-    + _seg_6()
-    + _seg_7()
-    + _seg_8()
-    + _seg_9()
-    + _seg_10()
-    + _seg_11()
-    + _seg_12()
-    + _seg_13()
-    + _seg_14()
-    + _seg_15()
-    + _seg_16()
-    + _seg_17()
-    + _seg_18()
-    + _seg_19()
-    + _seg_20()
-    + _seg_21()
-    + _seg_22()
-    + _seg_23()
-    + _seg_24()
-    + _seg_25()
-    + _seg_26()
-    + _seg_27()
-    + _seg_28()
-    + _seg_29()
-    + _seg_30()
-    + _seg_31()
-    + _seg_32()
-    + _seg_33()
-    + _seg_34()
-    + _seg_35()
-    + _seg_36()
-    + _seg_37()
-    + _seg_38()
-    + _seg_39()
-    + _seg_40()
-    + _seg_41()
-    + _seg_42()
-    + _seg_43()
-    + _seg_44()
-    + _seg_45()
-    + _seg_46()
-    + _seg_47()
-    + _seg_48()
-    + _seg_49()
-    + _seg_50()
-    + _seg_51()
-    + _seg_52()
-    + _seg_53()
-    + _seg_54()
-    + _seg_55()
-    + _seg_56()
-    + _seg_57()
-    + _seg_58()
-    + _seg_59()
-    + _seg_60()
-    + _seg_61()
-    + _seg_62()
-    + _seg_63()
-    + _seg_64()
-    + _seg_65()
-    + _seg_66()
-    + _seg_67()
-    + _seg_68()
-    + _seg_69()
-    + _seg_70()
-    + _seg_71()
-    + _seg_72()
-    + _seg_73()
-    + _seg_74()
-    + _seg_75()
-    + _seg_76()
-    + _seg_77()
-    + _seg_78()
-    + _seg_79()
-    + _seg_80()
-    + _seg_81()
-)  # type: Tuple[Union[Tuple[int, str], Tuple[int, str, str]], ...]
diff --git a/lib/importlib_metadata/__init__.py b/lib/importlib_metadata/__init__.py
deleted file mode 100644
index 46a14e64..00000000
--- a/lib/importlib_metadata/__init__.py
+++ /dev/null
@@ -1,1132 +0,0 @@
-"""
-APIs exposing metadata from third-party Python packages.
-
-This codebase is shared between importlib.metadata in the stdlib
-and importlib_metadata in PyPI. See
-https://github.com/python/importlib_metadata/wiki/Development-Methodology
-for more detail.
-"""
-
-from __future__ import annotations
-
-import abc
-import collections
-import email
-import functools
-import itertools
-import operator
-import os
-import pathlib
-import posixpath
-import re
-import sys
-import textwrap
-import types
-from contextlib import suppress
-from importlib import import_module
-from importlib.abc import MetaPathFinder
-from itertools import starmap
-from typing import Any, Iterable, List, Mapping, Match, Optional, Set, cast
-
-from . import _meta
-from ._collections import FreezableDefaultDict, Pair
-from ._compat import (
-    NullFinder,
-    install,
-)
-from ._functools import method_cache, pass_none
-from ._itertools import always_iterable, bucket, unique_everseen
-from ._meta import PackageMetadata, SimplePath
-from .compat import py39, py311
-
-__all__ = [
-    'Distribution',
-    'DistributionFinder',
-    'PackageMetadata',
-    'PackageNotFoundError',
-    'SimplePath',
-    'distribution',
-    'distributions',
-    'entry_points',
-    'files',
-    'metadata',
-    'packages_distributions',
-    'requires',
-    'version',
-]
-
-
-class PackageNotFoundError(ModuleNotFoundError):
-    """The package was not found."""
-
-    def __str__(self) -> str:
-        return f"No package metadata was found for {self.name}"
-
-    @property
-    def name(self) -> str:  # type: ignore[override] # make readonly
-        (name,) = self.args
-        return name
-
-
-class Sectioned:
-    """
-    A simple entry point config parser for performance
-
-    >>> for item in Sectioned.read(Sectioned._sample):
-    ...     print(item)
-    Pair(name='sec1', value='# comments ignored')
-    Pair(name='sec1', value='a = 1')
-    Pair(name='sec1', value='b = 2')
-    Pair(name='sec2', value='a = 2')
-
-    >>> res = Sectioned.section_pairs(Sectioned._sample)
-    >>> item = next(res)
-    >>> item.name
-    'sec1'
-    >>> item.value
-    Pair(name='a', value='1')
-    >>> item = next(res)
-    >>> item.value
-    Pair(name='b', value='2')
-    >>> item = next(res)
-    >>> item.name
-    'sec2'
-    >>> item.value
-    Pair(name='a', value='2')
-    >>> list(res)
-    []
-    """
-
-    _sample = textwrap.dedent(
-        """
-        [sec1]
-        # comments ignored
-        a = 1
-        b = 2
-
-        [sec2]
-        a = 2
-        """
-    ).lstrip()
-
-    @classmethod
-    def section_pairs(cls, text):
-        return (
-            section._replace(value=Pair.parse(section.value))
-            for section in cls.read(text, filter_=cls.valid)
-            if section.name is not None
-        )
-
-    @staticmethod
-    def read(text, filter_=None):
-        lines = filter(filter_, map(str.strip, text.splitlines()))
-        name = None
-        for value in lines:
-            section_match = value.startswith('[') and value.endswith(']')
-            if section_match:
-                name = value.strip('[]')
-                continue
-            yield Pair(name, value)
-
-    @staticmethod
-    def valid(line: str):
-        return line and not line.startswith('#')
-
-
-class EntryPoint:
-    """An entry point as defined by Python packaging conventions.
-
-    See `the packaging docs on entry points
-    <https://packaging.python.org/specifications/entry-points/>`_
-    for more information.
-
-    >>> ep = EntryPoint(
-    ...     name=None, group=None, value='package.module:attr [extra1, extra2]')
-    >>> ep.module
-    'package.module'
-    >>> ep.attr
-    'attr'
-    >>> ep.extras
-    ['extra1', 'extra2']
-    """
-
-    pattern = re.compile(
-        r'(?P<module>[\w.]+)\s*'
-        r'(:\s*(?P<attr>[\w.]+)\s*)?'
-        r'((?P<extras>\[.*\])\s*)?$'
-    )
-    """
-    A regular expression describing the syntax for an entry point,
-    which might look like:
-
-        - module
-        - package.module
-        - package.module:attribute
-        - package.module:object.attribute
-        - package.module:attr [extra1, extra2]
-
-    Other combinations are possible as well.
-
-    The expression is lenient about whitespace around the ':',
-    following the attr, and following any extras.
-    """
-
-    name: str
-    value: str
-    group: str
-
-    dist: Optional[Distribution] = None
-
-    def __init__(self, name: str, value: str, group: str) -> None:
-        vars(self).update(name=name, value=value, group=group)
-
-    def load(self) -> Any:
-        """Load the entry point from its definition. If only a module
-        is indicated by the value, return that module. Otherwise,
-        return the named object.
-        """
-        match = cast(Match, self.pattern.match(self.value))
-        module = import_module(match.group('module'))
-        attrs = filter(None, (match.group('attr') or '').split('.'))
-        return functools.reduce(getattr, attrs, module)
-
-    @property
-    def module(self) -> str:
-        match = self.pattern.match(self.value)
-        assert match is not None
-        return match.group('module')
-
-    @property
-    def attr(self) -> str:
-        match = self.pattern.match(self.value)
-        assert match is not None
-        return match.group('attr')
-
-    @property
-    def extras(self) -> List[str]:
-        match = self.pattern.match(self.value)
-        assert match is not None
-        return re.findall(r'\w+', match.group('extras') or '')
-
-    def _for(self, dist):
-        vars(self).update(dist=dist)
-        return self
-
-    def matches(self, **params):
-        """
-        EntryPoint matches the given parameters.
-
-        >>> ep = EntryPoint(group='foo', name='bar', value='bing:bong [extra1, extra2]')
-        >>> ep.matches(group='foo')
-        True
-        >>> ep.matches(name='bar', value='bing:bong [extra1, extra2]')
-        True
-        >>> ep.matches(group='foo', name='other')
-        False
-        >>> ep.matches()
-        True
-        >>> ep.matches(extras=['extra1', 'extra2'])
-        True
-        >>> ep.matches(module='bing')
-        True
-        >>> ep.matches(attr='bong')
-        True
-        """
-        self._disallow_dist(params)
-        attrs = (getattr(self, param) for param in params)
-        return all(map(operator.eq, params.values(), attrs))
-
-    @staticmethod
-    def _disallow_dist(params):
-        """
-        Querying by dist is not allowed (dist objects are not comparable).
-        >>> EntryPoint(name='fan', value='fav', group='fag').matches(dist='foo')
-        Traceback (most recent call last):
-        ...
-        ValueError: "dist" is not suitable for matching...
-        """
-        if "dist" in params:
-            raise ValueError(
-                '"dist" is not suitable for matching. '
-                "Instead, use Distribution.entry_points.select() on a "
-                "located distribution."
-            )
-
-    def _key(self):
-        return self.name, self.value, self.group
-
-    def __lt__(self, other):
-        return self._key() < other._key()
-
-    def __eq__(self, other):
-        return self._key() == other._key()
-
-    def __setattr__(self, name, value):
-        raise AttributeError("EntryPoint objects are immutable.")
-
-    def __repr__(self):
-        return (
-            f'EntryPoint(name={self.name!r}, value={self.value!r}, '
-            f'group={self.group!r})'
-        )
-
-    def __hash__(self) -> int:
-        return hash(self._key())
-
-
-class EntryPoints(tuple):
-    """
-    An immutable collection of selectable EntryPoint objects.
-    """
-
-    __slots__ = ()
-
-    def __getitem__(self, name: str) -> EntryPoint:  # type: ignore[override] # Work with str instead of int
-        """
-        Get the EntryPoint in self matching name.
-        """
-        try:
-            return next(iter(self.select(name=name)))
-        except StopIteration:
-            raise KeyError(name)
-
-    def __repr__(self):
-        """
-        Repr with classname and tuple constructor to
-        signal that we deviate from regular tuple behavior.
-        """
-        return '%s(%r)' % (self.__class__.__name__, tuple(self))
-
-    def select(self, **params) -> EntryPoints:
-        """
-        Select entry points from self that match the
-        given parameters (typically group and/or name).
-        """
-        return EntryPoints(ep for ep in self if py39.ep_matches(ep, **params))
-
-    @property
-    def names(self) -> Set[str]:
-        """
-        Return the set of all names of all entry points.
-        """
-        return {ep.name for ep in self}
-
-    @property
-    def groups(self) -> Set[str]:
-        """
-        Return the set of all groups of all entry points.
-        """
-        return {ep.group for ep in self}
-
-    @classmethod
-    def _from_text_for(cls, text, dist):
-        return cls(ep._for(dist) for ep in cls._from_text(text))
-
-    @staticmethod
-    def _from_text(text):
-        return (
-            EntryPoint(name=item.value.name, value=item.value.value, group=item.name)
-            for item in Sectioned.section_pairs(text or '')
-        )
-
-
-class PackagePath(pathlib.PurePosixPath):
-    """A reference to a path in a package"""
-
-    hash: Optional[FileHash]
-    size: int
-    dist: Distribution
-
-    def read_text(self, encoding: str = 'utf-8') -> str:
-        return self.locate().read_text(encoding=encoding)
-
-    def read_binary(self) -> bytes:
-        return self.locate().read_bytes()
-
-    def locate(self) -> SimplePath:
-        """Return a path-like object for this path"""
-        return self.dist.locate_file(self)
-
-
-class FileHash:
-    def __init__(self, spec: str) -> None:
-        self.mode, _, self.value = spec.partition('=')
-
-    def __repr__(self) -> str:
-        return f'<FileHash mode: {self.mode} value: {self.value}>'
-
-
-class Distribution(metaclass=abc.ABCMeta):
-    """
-    An abstract Python distribution package.
-
-    Custom providers may derive from this class and define
-    the abstract methods to provide a concrete implementation
-    for their environment. Some providers may opt to override
-    the default implementation of some properties to bypass
-    the file-reading mechanism.
-    """
-
-    @abc.abstractmethod
-    def read_text(self, filename) -> Optional[str]:
-        """Attempt to load metadata file given by the name.
-
-        Python distribution metadata is organized by blobs of text
-        typically represented as "files" in the metadata directory
-        (e.g. package-1.0.dist-info). These files include things
-        like:
-
-        - METADATA: The distribution metadata including fields
-          like Name and Version and Description.
-        - entry_points.txt: A series of entry points as defined in
-          `the entry points spec <https://packaging.python.org/en/latest/specifications/entry-points/#file-format>`_.
-        - RECORD: A record of files according to
-          `this recording spec <https://packaging.python.org/en/latest/specifications/recording-installed-packages/#the-record-file>`_.
-
-        A package may provide any set of files, including those
-        not listed here or none at all.
-
-        :param filename: The name of the file in the distribution info.
-        :return: The text if found, otherwise None.
-        """
-
-    @abc.abstractmethod
-    def locate_file(self, path: str | os.PathLike[str]) -> SimplePath:
-        """
-        Given a path to a file in this distribution, return a SimplePath
-        to it.
-
-        This method is used by callers of ``Distribution.files()`` to
-        locate files within the distribution. If it's possible for a
-        Distribution to represent files in the distribution as
-        ``SimplePath`` objects, it should implement this method
-        to resolve such objects.
-
-        Some Distribution providers may elect not to resolve SimplePath
-        objects within the distribution by raising a
-        NotImplementedError, but consumers of such a Distribution would
-        be unable to invoke ``Distribution.files()``.
-        """
-
-    @classmethod
-    def from_name(cls, name: str) -> Distribution:
-        """Return the Distribution for the given package name.
-
-        :param name: The name of the distribution package to search for.
-        :return: The Distribution instance (or subclass thereof) for the named
-            package, if found.
-        :raises PackageNotFoundError: When the named package's distribution
-            metadata cannot be found.
-        :raises ValueError: When an invalid value is supplied for name.
-        """
-        if not name:
-            raise ValueError("A distribution name is required.")
-        try:
-            return next(iter(cls._prefer_valid(cls.discover(name=name))))
-        except StopIteration:
-            raise PackageNotFoundError(name)
-
-    @classmethod
-    def discover(
-        cls, *, context: Optional[DistributionFinder.Context] = None, **kwargs
-    ) -> Iterable[Distribution]:
-        """Return an iterable of Distribution objects for all packages.
-
-        Pass a ``context`` or pass keyword arguments for constructing
-        a context.
-
-        :context: A ``DistributionFinder.Context`` object.
-        :return: Iterable of Distribution objects for packages matching
-          the context.
-        """
-        if context and kwargs:
-            raise ValueError("cannot accept context and kwargs")
-        context = context or DistributionFinder.Context(**kwargs)
-        return itertools.chain.from_iterable(
-            resolver(context) for resolver in cls._discover_resolvers()
-        )
-
-    @staticmethod
-    def _prefer_valid(dists: Iterable[Distribution]) -> Iterable[Distribution]:
-        """
-        Prefer (move to the front) distributions that have metadata.
-
-        Ref python/importlib_resources#489.
-        """
-        buckets = bucket(dists, lambda dist: bool(dist.metadata))
-        return itertools.chain(buckets[True], buckets[False])
-
-    @staticmethod
-    def at(path: str | os.PathLike[str]) -> Distribution:
-        """Return a Distribution for the indicated metadata path.
-
-        :param path: a string or path-like object
-        :return: a concrete Distribution instance for the path
-        """
-        return PathDistribution(pathlib.Path(path))
-
-    @staticmethod
-    def _discover_resolvers():
-        """Search the meta_path for resolvers (MetadataPathFinders)."""
-        declared = (
-            getattr(finder, 'find_distributions', None) for finder in sys.meta_path
-        )
-        return filter(None, declared)
-
-    @property
-    def metadata(self) -> _meta.PackageMetadata:
-        """Return the parsed metadata for this Distribution.
-
-        The returned object will have keys that name the various bits of
-        metadata per the
-        `Core metadata specifications <https://packaging.python.org/en/latest/specifications/core-metadata/#core-metadata>`_.
-
-        Custom providers may provide the METADATA file or override this
-        property.
-        """
-        # deferred for performance (python/cpython#109829)
-        from . import _adapters
-
-        opt_text = (
-            self.read_text('METADATA')
-            or self.read_text('PKG-INFO')
-            # This last clause is here to support old egg-info files.  Its
-            # effect is to just end up using the PathDistribution's self._path
-            # (which points to the egg-info file) attribute unchanged.
-            or self.read_text('')
-        )
-        text = cast(str, opt_text)
-        return _adapters.Message(email.message_from_string(text))
-
-    @property
-    def name(self) -> str:
-        """Return the 'Name' metadata for the distribution package."""
-        return self.metadata['Name']
-
-    @property
-    def _normalized_name(self):
-        """Return a normalized version of the name."""
-        return Prepared.normalize(self.name)
-
-    @property
-    def version(self) -> str:
-        """Return the 'Version' metadata for the distribution package."""
-        return self.metadata['Version']
-
-    @property
-    def entry_points(self) -> EntryPoints:
-        """
-        Return EntryPoints for this distribution.
-
-        Custom providers may provide the ``entry_points.txt`` file
-        or override this property.
-        """
-        return EntryPoints._from_text_for(self.read_text('entry_points.txt'), self)
-
-    @property
-    def files(self) -> Optional[List[PackagePath]]:
-        """Files in this distribution.
-
-        :return: List of PackagePath for this distribution or None
-
-        Result is `None` if the metadata file that enumerates files
-        (i.e. RECORD for dist-info, or installed-files.txt or
-        SOURCES.txt for egg-info) is missing.
-        Result may be empty if the metadata exists but is empty.
-
-        Custom providers are recommended to provide a "RECORD" file (in
-        ``read_text``) or override this property to allow for callers to be
-        able to resolve filenames provided by the package.
-        """
-
-        def make_file(name, hash=None, size_str=None):
-            result = PackagePath(name)
-            result.hash = FileHash(hash) if hash else None
-            result.size = int(size_str) if size_str else None
-            result.dist = self
-            return result
-
-        @pass_none
-        def make_files(lines):
-            # Delay csv import, since Distribution.files is not as widely used
-            # as other parts of importlib.metadata
-            import csv
-
-            return starmap(make_file, csv.reader(lines))
-
-        @pass_none
-        def skip_missing_files(package_paths):
-            return list(filter(lambda path: path.locate().exists(), package_paths))
-
-        return skip_missing_files(
-            make_files(
-                self._read_files_distinfo()
-                or self._read_files_egginfo_installed()
-                or self._read_files_egginfo_sources()
-            )
-        )
-
-    def _read_files_distinfo(self):
-        """
-        Read the lines of RECORD.
-        """
-        text = self.read_text('RECORD')
-        return text and text.splitlines()
-
-    def _read_files_egginfo_installed(self):
-        """
-        Read installed-files.txt and return lines in a similar
-        CSV-parsable format as RECORD: each file must be placed
-        relative to the site-packages directory and must also be
-        quoted (since file names can contain literal commas).
-
-        This file is written when the package is installed by pip,
-        but it might not be written for other installation methods.
-        Assume the file is accurate if it exists.
-        """
-        text = self.read_text('installed-files.txt')
-        # Prepend the .egg-info/ subdir to the lines in this file.
-        # But this subdir is only available from PathDistribution's
-        # self._path.
-        subdir = getattr(self, '_path', None)
-        if not text or not subdir:
-            return
-
-        paths = (
-            py311.relative_fix((subdir / name).resolve())
-            .relative_to(self.locate_file('').resolve(), walk_up=True)
-            .as_posix()
-            for name in text.splitlines()
-        )
-        return map('"{}"'.format, paths)
-
-    def _read_files_egginfo_sources(self):
-        """
-        Read SOURCES.txt and return lines in a similar CSV-parsable
-        format as RECORD: each file name must be quoted (since it
-        might contain literal commas).
-
-        Note that SOURCES.txt is not a reliable source for what
-        files are installed by a package. This file is generated
-        for a source archive, and the files that are present
-        there (e.g. setup.py) may not correctly reflect the files
-        that are present after the package has been installed.
-        """
-        text = self.read_text('SOURCES.txt')
-        return text and map('"{}"'.format, text.splitlines())
-
-    @property
-    def requires(self) -> Optional[List[str]]:
-        """Generated requirements specified for this Distribution"""
-        reqs = self._read_dist_info_reqs() or self._read_egg_info_reqs()
-        return reqs and list(reqs)
-
-    def _read_dist_info_reqs(self):
-        return self.metadata.get_all('Requires-Dist')
-
-    def _read_egg_info_reqs(self):
-        source = self.read_text('requires.txt')
-        return pass_none(self._deps_from_requires_text)(source)
-
-    @classmethod
-    def _deps_from_requires_text(cls, source):
-        return cls._convert_egg_info_reqs_to_simple_reqs(Sectioned.read(source))
-
-    @staticmethod
-    def _convert_egg_info_reqs_to_simple_reqs(sections):
-        """
-        Historically, setuptools would solicit and store 'extra'
-        requirements, including those with environment markers,
-        in separate sections. More modern tools expect each
-        dependency to be defined separately, with any relevant
-        extras and environment markers attached directly to that
-        requirement. This method converts the former to the
-        latter. See _test_deps_from_requires_text for an example.
-        """
-
-        def make_condition(name):
-            return name and f'extra == "{name}"'
-
-        def quoted_marker(section):
-            section = section or ''
-            extra, sep, markers = section.partition(':')
-            if extra and markers:
-                markers = f'({markers})'
-            conditions = list(filter(None, [markers, make_condition(extra)]))
-            return '; ' + ' and '.join(conditions) if conditions else ''
-
-        def url_req_space(req):
-            """
-            PEP 508 requires a space between the url_spec and the quoted_marker.
-            Ref python/importlib_metadata#357.
-            """
-            # '@' is uniquely indicative of a url_req.
-            return ' ' * ('@' in req)
-
-        for section in sections:
-            space = url_req_space(section.value)
-            yield section.value + space + quoted_marker(section.name)
-
-    @property
-    def origin(self):
-        return self._load_json('direct_url.json')
-
-    def _load_json(self, filename):
-        # Deferred for performance (python/importlib_metadata#503)
-        import json
-
-        return pass_none(json.loads)(
-            self.read_text(filename),
-            object_hook=lambda data: types.SimpleNamespace(**data),
-        )
-
-
-class DistributionFinder(MetaPathFinder):
-    """
-    A MetaPathFinder capable of discovering installed distributions.
-
-    Custom providers should implement this interface in order to
-    supply metadata.
-    """
-
-    class Context:
-        """
-        Keyword arguments presented by the caller to
-        ``distributions()`` or ``Distribution.discover()``
-        to narrow the scope of a search for distributions
-        in all DistributionFinders.
-
-        Each DistributionFinder may expect any parameters
-        and should attempt to honor the canonical
-        parameters defined below when appropriate.
-
-        This mechanism gives a custom provider a means to
-        solicit additional details from the caller beyond
-        "name" and "path" when searching distributions.
-        For example, imagine a provider that exposes suites
-        of packages in either a "public" or "private" ``realm``.
-        A caller may wish to query only for distributions in
-        a particular realm and could call
-        ``distributions(realm="private")`` to signal to the
-        custom provider to only include distributions from that
-        realm.
-        """
-
-        name = None
-        """
-        Specific name for which a distribution finder should match.
-        A name of ``None`` matches all distributions.
-        """
-
-        def __init__(self, **kwargs):
-            vars(self).update(kwargs)
-
-        @property
-        def path(self) -> List[str]:
-            """
-            The sequence of directory path that a distribution finder
-            should search.
-
-            Typically refers to Python installed package paths such as
-            "site-packages" directories and defaults to ``sys.path``.
-            """
-            return vars(self).get('path', sys.path)
-
-    @abc.abstractmethod
-    def find_distributions(self, context=Context()) -> Iterable[Distribution]:
-        """
-        Find distributions.
-
-        Return an iterable of all Distribution instances capable of
-        loading the metadata for packages matching the ``context``,
-        a DistributionFinder.Context instance.
-        """
-
-
-class FastPath:
-    """
-    Micro-optimized class for searching a root for children.
-
-    Root is a path on the file system that may contain metadata
-    directories either as natural directories or within a zip file.
-
-    >>> FastPath('').children()
-    ['...']
-
-    FastPath objects are cached and recycled for any given root.
-
-    >>> FastPath('foobar') is FastPath('foobar')
-    True
-    """
-
-    @functools.lru_cache()  # type: ignore[misc]
-    def __new__(cls, root):
-        return super().__new__(cls)
-
-    def __init__(self, root):
-        self.root = root
-
-    def joinpath(self, child):
-        return pathlib.Path(self.root, child)
-
-    def children(self):
-        with suppress(Exception):
-            return os.listdir(self.root or '.')
-        with suppress(Exception):
-            return self.zip_children()
-        return []
-
-    def zip_children(self):
-        # deferred for performance (python/importlib_metadata#502)
-        from zipp.compat.overlay import zipfile
-
-        zip_path = zipfile.Path(self.root)
-        names = zip_path.root.namelist()
-        self.joinpath = zip_path.joinpath
-
-        return dict.fromkeys(child.split(posixpath.sep, 1)[0] for child in names)
-
-    def search(self, name):
-        return self.lookup(self.mtime).search(name)
-
-    @property
-    def mtime(self):
-        with suppress(OSError):
-            return os.stat(self.root).st_mtime
-        self.lookup.cache_clear()
-
-    @method_cache
-    def lookup(self, mtime):
-        return Lookup(self)
-
-
-class Lookup:
-    """
-    A micro-optimized class for searching a (fast) path for metadata.
-    """
-
-    def __init__(self, path: FastPath):
-        """
-        Calculate all of the children representing metadata.
-
-        From the children in the path, calculate early all of the
-        children that appear to represent metadata (infos) or legacy
-        metadata (eggs).
-        """
-
-        base = os.path.basename(path.root).lower()
-        base_is_egg = base.endswith(".egg")
-        self.infos = FreezableDefaultDict(list)
-        self.eggs = FreezableDefaultDict(list)
-
-        for child in path.children():
-            low = child.lower()
-            if low.endswith((".dist-info", ".egg-info")):
-                # rpartition is faster than splitext and suitable for this purpose.
-                name = low.rpartition(".")[0].partition("-")[0]
-                normalized = Prepared.normalize(name)
-                self.infos[normalized].append(path.joinpath(child))
-            elif base_is_egg and low == "egg-info":
-                name = base.rpartition(".")[0].partition("-")[0]
-                legacy_normalized = Prepared.legacy_normalize(name)
-                self.eggs[legacy_normalized].append(path.joinpath(child))
-
-        self.infos.freeze()
-        self.eggs.freeze()
-
-    def search(self, prepared: Prepared):
-        """
-        Yield all infos and eggs matching the Prepared query.
-        """
-        infos = (
-            self.infos[prepared.normalized]
-            if prepared
-            else itertools.chain.from_iterable(self.infos.values())
-        )
-        eggs = (
-            self.eggs[prepared.legacy_normalized]
-            if prepared
-            else itertools.chain.from_iterable(self.eggs.values())
-        )
-        return itertools.chain(infos, eggs)
-
-
-class Prepared:
-    """
-    A prepared search query for metadata on a possibly-named package.
-
-    Pre-calculates the normalization to prevent repeated operations.
-
-    >>> none = Prepared(None)
-    >>> none.normalized
-    >>> none.legacy_normalized
-    >>> bool(none)
-    False
-    >>> sample = Prepared('Sample__Pkg-name.foo')
-    >>> sample.normalized
-    'sample_pkg_name_foo'
-    >>> sample.legacy_normalized
-    'sample__pkg_name.foo'
-    >>> bool(sample)
-    True
-    """
-
-    normalized = None
-    legacy_normalized = None
-
-    def __init__(self, name: Optional[str]):
-        self.name = name
-        if name is None:
-            return
-        self.normalized = self.normalize(name)
-        self.legacy_normalized = self.legacy_normalize(name)
-
-    @staticmethod
-    def normalize(name):
-        """
-        PEP 503 normalization plus dashes as underscores.
-        """
-        return re.sub(r"[-_.]+", "-", name).lower().replace('-', '_')
-
-    @staticmethod
-    def legacy_normalize(name):
-        """
-        Normalize the package name as found in the convention in
-        older packaging tools versions and specs.
-        """
-        return name.lower().replace('-', '_')
-
-    def __bool__(self):
-        return bool(self.name)
-
-
-@install
-class MetadataPathFinder(NullFinder, DistributionFinder):
-    """A degenerate finder for distribution packages on the file system.
-
-    This finder supplies only a find_distributions() method for versions
-    of Python that do not have a PathFinder find_distributions().
-    """
-
-    @classmethod
-    def find_distributions(
-        cls, context=DistributionFinder.Context()
-    ) -> Iterable[PathDistribution]:
-        """
-        Find distributions.
-
-        Return an iterable of all Distribution instances capable of
-        loading the metadata for packages matching ``context.name``
-        (or all names if ``None`` indicated) along the paths in the list
-        of directories ``context.path``.
-        """
-        found = cls._search_paths(context.name, context.path)
-        return map(PathDistribution, found)
-
-    @classmethod
-    def _search_paths(cls, name, paths):
-        """Find metadata directories in paths heuristically."""
-        prepared = Prepared(name)
-        return itertools.chain.from_iterable(
-            path.search(prepared) for path in map(FastPath, paths)
-        )
-
-    @classmethod
-    def invalidate_caches(cls) -> None:
-        FastPath.__new__.cache_clear()
-
-
-class PathDistribution(Distribution):
-    def __init__(self, path: SimplePath) -> None:
-        """Construct a distribution.
-
-        :param path: SimplePath indicating the metadata directory.
-        """
-        self._path = path
-
-    def read_text(self, filename: str | os.PathLike[str]) -> Optional[str]:
-        with suppress(
-            FileNotFoundError,
-            IsADirectoryError,
-            KeyError,
-            NotADirectoryError,
-            PermissionError,
-        ):
-            return self._path.joinpath(filename).read_text(encoding='utf-8')
-
-        return None
-
-    read_text.__doc__ = Distribution.read_text.__doc__
-
-    def locate_file(self, path: str | os.PathLike[str]) -> SimplePath:
-        return self._path.parent / path
-
-    @property
-    def _normalized_name(self):
-        """
-        Performance optimization: where possible, resolve the
-        normalized name from the file system path.
-        """
-        stem = os.path.basename(str(self._path))
-        return (
-            pass_none(Prepared.normalize)(self._name_from_stem(stem))
-            or super()._normalized_name
-        )
-
-    @staticmethod
-    def _name_from_stem(stem):
-        """
-        >>> PathDistribution._name_from_stem('foo-3.0.egg-info')
-        'foo'
-        >>> PathDistribution._name_from_stem('CherryPy-3.0.dist-info')
-        'CherryPy'
-        >>> PathDistribution._name_from_stem('face.egg-info')
-        'face'
-        >>> PathDistribution._name_from_stem('foo.bar')
-        """
-        filename, ext = os.path.splitext(stem)
-        if ext not in ('.dist-info', '.egg-info'):
-            return
-        name, sep, rest = filename.partition('-')
-        return name
-
-
-def distribution(distribution_name: str) -> Distribution:
-    """Get the ``Distribution`` instance for the named package.
-
-    :param distribution_name: The name of the distribution package as a string.
-    :return: A ``Distribution`` instance (or subclass thereof).
-    """
-    return Distribution.from_name(distribution_name)
-
-
-def distributions(**kwargs) -> Iterable[Distribution]:
-    """Get all ``Distribution`` instances in the current environment.
-
-    :return: An iterable of ``Distribution`` instances.
-    """
-    return Distribution.discover(**kwargs)
-
-
-def metadata(distribution_name: str) -> _meta.PackageMetadata:
-    """Get the metadata for the named package.
-
-    :param distribution_name: The name of the distribution package to query.
-    :return: A PackageMetadata containing the parsed metadata.
-    """
-    return Distribution.from_name(distribution_name).metadata
-
-
-def version(distribution_name: str) -> str:
-    """Get the version string for the named package.
-
-    :param distribution_name: The name of the distribution package to query.
-    :return: The version string for the package as defined in the package's
-        "Version" metadata key.
-    """
-    return distribution(distribution_name).version
-
-
-_unique = functools.partial(
-    unique_everseen,
-    key=py39.normalized_name,
-)
-"""
-Wrapper for ``distributions`` to return unique distributions by name.
-"""
-
-
-def entry_points(**params) -> EntryPoints:
-    """Return EntryPoint objects for all installed packages.
-
-    Pass selection parameters (group or name) to filter the
-    result to entry points matching those properties (see
-    EntryPoints.select()).
-
-    :return: EntryPoints for all installed packages.
-    """
-    eps = itertools.chain.from_iterable(
-        dist.entry_points for dist in _unique(distributions())
-    )
-    return EntryPoints(eps).select(**params)
-
-
-def files(distribution_name: str) -> Optional[List[PackagePath]]:
-    """Return a list of files for the named package.
-
-    :param distribution_name: The name of the distribution package to query.
-    :return: List of files composing the distribution.
-    """
-    return distribution(distribution_name).files
-
-
-def requires(distribution_name: str) -> Optional[List[str]]:
-    """
-    Return a list of requirements for the named package.
-
-    :return: An iterable of requirements, suitable for
-        packaging.requirement.Requirement.
-    """
-    return distribution(distribution_name).requires
-
-
-def packages_distributions() -> Mapping[str, List[str]]:
-    """
-    Return a mapping of top-level packages to their
-    distributions.
-
-    >>> import collections.abc
-    >>> pkgs = packages_distributions()
-    >>> all(isinstance(dist, collections.abc.Sequence) for dist in pkgs.values())
-    True
-    """
-    pkg_to_dist = collections.defaultdict(list)
-    for dist in distributions():
-        for pkg in _top_level_declared(dist) or _top_level_inferred(dist):
-            pkg_to_dist[pkg].append(dist.metadata['Name'])
-    return dict(pkg_to_dist)
-
-
-def _top_level_declared(dist):
-    return (dist.read_text('top_level.txt') or '').split()
-
-
-def _topmost(name: PackagePath) -> Optional[str]:
-    """
-    Return the top-most parent as long as there is a parent.
-    """
-    top, *rest = name.parts
-    return top if rest else None
-
-
-def _get_toplevel_name(name: PackagePath) -> str:
-    """
-    Infer a possibly importable module name from a name presumed on
-    sys.path.
-
-    >>> _get_toplevel_name(PackagePath('foo.py'))
-    'foo'
-    >>> _get_toplevel_name(PackagePath('foo'))
-    'foo'
-    >>> _get_toplevel_name(PackagePath('foo.pyc'))
-    'foo'
-    >>> _get_toplevel_name(PackagePath('foo/__init__.py'))
-    'foo'
-    >>> _get_toplevel_name(PackagePath('foo.pth'))
-    'foo.pth'
-    >>> _get_toplevel_name(PackagePath('foo.dist-info'))
-    'foo.dist-info'
-    """
-    # Defer import of inspect for performance (python/cpython#118761)
-    import inspect
-
-    return _topmost(name) or inspect.getmodulename(name) or str(name)
-
-
-def _top_level_inferred(dist):
-    opt_names = set(map(_get_toplevel_name, always_iterable(dist.files)))
-
-    def importable_name(name):
-        return '.' not in name
-
-    return filter(importable_name, opt_names)
diff --git a/lib/importlib_metadata/_adapters.py b/lib/importlib_metadata/_adapters.py
deleted file mode 100644
index 3b516a2d..00000000
--- a/lib/importlib_metadata/_adapters.py
+++ /dev/null
@@ -1,83 +0,0 @@
-import email.message
-import re
-import textwrap
-
-from ._text import FoldedCase
-
-
-class Message(email.message.Message):
-    multiple_use_keys = set(
-        map(
-            FoldedCase,
-            [
-                'Classifier',
-                'Obsoletes-Dist',
-                'Platform',
-                'Project-URL',
-                'Provides-Dist',
-                'Provides-Extra',
-                'Requires-Dist',
-                'Requires-External',
-                'Supported-Platform',
-                'Dynamic',
-            ],
-        )
-    )
-    """
-    Keys that may be indicated multiple times per PEP 566.
-    """
-
-    def __new__(cls, orig: email.message.Message):
-        res = super().__new__(cls)
-        vars(res).update(vars(orig))
-        return res
-
-    def __init__(self, *args, **kwargs):
-        self._headers = self._repair_headers()
-
-    # suppress spurious error from mypy
-    def __iter__(self):
-        return super().__iter__()
-
-    def __getitem__(self, item):
-        """
-        Override parent behavior to typical dict behavior.
-
-        ``email.message.Message`` will emit None values for missing
-        keys. Typical mappings, including this ``Message``, will raise
-        a key error for missing keys.
-
-        Ref python/importlib_metadata#371.
-        """
-        res = super().__getitem__(item)
-        if res is None:
-            raise KeyError(item)
-        return res
-
-    def _repair_headers(self):
-        def redent(value):
-            "Correct for RFC822 indentation"
-            if not value or '\n' not in value:
-                return value
-            return textwrap.dedent(' ' * 8 + value)
-
-        headers = [(key, redent(value)) for key, value in vars(self)['_headers']]
-        if self._payload:
-            headers.append(('Description', self.get_payload()))
-        return headers
-
-    @property
-    def json(self):
-        """
-        Convert PackageMetadata to a JSON-compatible format
-        per PEP 0566.
-        """
-
-        def transform(key):
-            value = self.get_all(key) if key in self.multiple_use_keys else self[key]
-            if key == 'Keywords':
-                value = re.split(r'\s+', value)
-            tk = key.lower().replace('-', '_')
-            return tk, value
-
-        return dict(map(transform, map(FoldedCase, self)))
diff --git a/lib/importlib_metadata/_collections.py b/lib/importlib_metadata/_collections.py
deleted file mode 100644
index cf0954e1..00000000
--- a/lib/importlib_metadata/_collections.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import collections
-
-
-# from jaraco.collections 3.3
-class FreezableDefaultDict(collections.defaultdict):
-    """
-    Often it is desirable to prevent the mutation of
-    a default dict after its initial construction, such
-    as to prevent mutation during iteration.
-
-    >>> dd = FreezableDefaultDict(list)
-    >>> dd[0].append('1')
-    >>> dd.freeze()
-    >>> dd[1]
-    []
-    >>> len(dd)
-    1
-    """
-
-    def __missing__(self, key):
-        return getattr(self, '_frozen', super().__missing__)(key)
-
-    def freeze(self):
-        self._frozen = lambda key: self.default_factory()
-
-
-class Pair(collections.namedtuple('Pair', 'name value')):
-    @classmethod
-    def parse(cls, text):
-        return cls(*map(str.strip, text.split("=", 1)))
diff --git a/lib/importlib_metadata/_compat.py b/lib/importlib_metadata/_compat.py
deleted file mode 100644
index 01356d69..00000000
--- a/lib/importlib_metadata/_compat.py
+++ /dev/null
@@ -1,56 +0,0 @@
-import platform
-import sys
-
-__all__ = ['install', 'NullFinder']
-
-
-def install(cls):
-    """
-    Class decorator for installation on sys.meta_path.
-
-    Adds the backport DistributionFinder to sys.meta_path and
-    attempts to disable the finder functionality of the stdlib
-    DistributionFinder.
-    """
-    sys.meta_path.append(cls())
-    disable_stdlib_finder()
-    return cls
-
-
-def disable_stdlib_finder():
-    """
-    Give the backport primacy for discovering path-based distributions
-    by monkey-patching the stdlib O_O.
-
-    See #91 for more background for rationale on this sketchy
-    behavior.
-    """
-
-    def matches(finder):
-        return getattr(
-            finder, '__module__', None
-        ) == '_frozen_importlib_external' and hasattr(finder, 'find_distributions')
-
-    for finder in filter(matches, sys.meta_path):  # pragma: nocover
-        del finder.find_distributions
-
-
-class NullFinder:
-    """
-    A "Finder" (aka "MetaPathFinder") that never finds any modules,
-    but may find distributions.
-    """
-
-    @staticmethod
-    def find_spec(*args, **kwargs):
-        return None
-
-
-def pypy_partial(val):
-    """
-    Adjust for variable stacklevel on partial under PyPy.
-
-    Workaround for #327.
-    """
-    is_pypy = platform.python_implementation() == 'PyPy'
-    return val + is_pypy
diff --git a/lib/importlib_metadata/_functools.py b/lib/importlib_metadata/_functools.py
deleted file mode 100644
index 5dda6a21..00000000
--- a/lib/importlib_metadata/_functools.py
+++ /dev/null
@@ -1,104 +0,0 @@
-import functools
-import types
-
-
-# from jaraco.functools 3.3
-def method_cache(method, cache_wrapper=None):
-    """
-    Wrap lru_cache to support storing the cache data in the object instances.
-
-    Abstracts the common paradigm where the method explicitly saves an
-    underscore-prefixed protected property on first call and returns that
-    subsequently.
-
-    >>> class MyClass:
-    ...     calls = 0
-    ...
-    ...     @method_cache
-    ...     def method(self, value):
-    ...         self.calls += 1
-    ...         return value
-
-    >>> a = MyClass()
-    >>> a.method(3)
-    3
-    >>> for x in range(75):
-    ...     res = a.method(x)
-    >>> a.calls
-    75
-
-    Note that the apparent behavior will be exactly like that of lru_cache
-    except that the cache is stored on each instance, so values in one
-    instance will not flush values from another, and when an instance is
-    deleted, so are the cached values for that instance.
-
-    >>> b = MyClass()
-    >>> for x in range(35):
-    ...     res = b.method(x)
-    >>> b.calls
-    35
-    >>> a.method(0)
-    0
-    >>> a.calls
-    75
-
-    Note that if method had been decorated with ``functools.lru_cache()``,
-    a.calls would have been 76 (due to the cached value of 0 having been
-    flushed by the 'b' instance).
-
-    Clear the cache with ``.cache_clear()``
-
-    >>> a.method.cache_clear()
-
-    Same for a method that hasn't yet been called.
-
-    >>> c = MyClass()
-    >>> c.method.cache_clear()
-
-    Another cache wrapper may be supplied:
-
-    >>> cache = functools.lru_cache(maxsize=2)
-    >>> MyClass.method2 = method_cache(lambda self: 3, cache_wrapper=cache)
-    >>> a = MyClass()
-    >>> a.method2()
-    3
-
-    Caution - do not subsequently wrap the method with another decorator, such
-    as ``@property``, which changes the semantics of the function.
-
-    See also
-    http://code.activestate.com/recipes/577452-a-memoize-decorator-for-instance-methods/
-    for another implementation and additional justification.
-    """
-    cache_wrapper = cache_wrapper or functools.lru_cache()
-
-    def wrapper(self, *args, **kwargs):
-        # it's the first call, replace the method with a cached, bound method
-        bound_method = types.MethodType(method, self)
-        cached_method = cache_wrapper(bound_method)
-        setattr(self, method.__name__, cached_method)
-        return cached_method(*args, **kwargs)
-
-    # Support cache clear even before cache has been created.
-    wrapper.cache_clear = lambda: None
-
-    return wrapper
-
-
-# From jaraco.functools 3.3
-def pass_none(func):
-    """
-    Wrap func so it's not called if its first param is None
-
-    >>> print_text = pass_none(print)
-    >>> print_text('text')
-    text
-    >>> print_text(None)
-    """
-
-    @functools.wraps(func)
-    def wrapper(param, *args, **kwargs):
-        if param is not None:
-            return func(param, *args, **kwargs)
-
-    return wrapper
diff --git a/lib/importlib_metadata/_itertools.py b/lib/importlib_metadata/_itertools.py
deleted file mode 100644
index 79d37198..00000000
--- a/lib/importlib_metadata/_itertools.py
+++ /dev/null
@@ -1,171 +0,0 @@
-from collections import defaultdict, deque
-from itertools import filterfalse
-
-
-def unique_everseen(iterable, key=None):
-    "List unique elements, preserving order. Remember all elements ever seen."
-    # unique_everseen('AAAABBBCCDAABBB') --> A B C D
-    # unique_everseen('ABBCcAD', str.lower) --> A B C D
-    seen = set()
-    seen_add = seen.add
-    if key is None:
-        for element in filterfalse(seen.__contains__, iterable):
-            seen_add(element)
-            yield element
-    else:
-        for element in iterable:
-            k = key(element)
-            if k not in seen:
-                seen_add(k)
-                yield element
-
-
-# copied from more_itertools 8.8
-def always_iterable(obj, base_type=(str, bytes)):
-    """If *obj* is iterable, return an iterator over its items::
-
-        >>> obj = (1, 2, 3)
-        >>> list(always_iterable(obj))
-        [1, 2, 3]
-
-    If *obj* is not iterable, return a one-item iterable containing *obj*::
-
-        >>> obj = 1
-        >>> list(always_iterable(obj))
-        [1]
-
-    If *obj* is ``None``, return an empty iterable:
-
-        >>> obj = None
-        >>> list(always_iterable(None))
-        []
-
-    By default, binary and text strings are not considered iterable::
-
-        >>> obj = 'foo'
-        >>> list(always_iterable(obj))
-        ['foo']
-
-    If *base_type* is set, objects for which ``isinstance(obj, base_type)``
-    returns ``True`` won't be considered iterable.
-
-        >>> obj = {'a': 1}
-        >>> list(always_iterable(obj))  # Iterate over the dict's keys
-        ['a']
-        >>> list(always_iterable(obj, base_type=dict))  # Treat dicts as a unit
-        [{'a': 1}]
-
-    Set *base_type* to ``None`` to avoid any special handling and treat objects
-    Python considers iterable as iterable:
-
-        >>> obj = 'foo'
-        >>> list(always_iterable(obj, base_type=None))
-        ['f', 'o', 'o']
-    """
-    if obj is None:
-        return iter(())
-
-    if (base_type is not None) and isinstance(obj, base_type):
-        return iter((obj,))
-
-    try:
-        return iter(obj)
-    except TypeError:
-        return iter((obj,))
-
-
-# Copied from more_itertools 10.3
-class bucket:
-    """Wrap *iterable* and return an object that buckets the iterable into
-    child iterables based on a *key* function.
-
-        >>> iterable = ['a1', 'b1', 'c1', 'a2', 'b2', 'c2', 'b3']
-        >>> s = bucket(iterable, key=lambda x: x[0])  # Bucket by 1st character
-        >>> sorted(list(s))  # Get the keys
-        ['a', 'b', 'c']
-        >>> a_iterable = s['a']
-        >>> next(a_iterable)
-        'a1'
-        >>> next(a_iterable)
-        'a2'
-        >>> list(s['b'])
-        ['b1', 'b2', 'b3']
-
-    The original iterable will be advanced and its items will be cached until
-    they are used by the child iterables. This may require significant storage.
-
-    By default, attempting to select a bucket to which no items belong  will
-    exhaust the iterable and cache all values.
-    If you specify a *validator* function, selected buckets will instead be
-    checked against it.
-
-        >>> from itertools import count
-        >>> it = count(1, 2)  # Infinite sequence of odd numbers
-        >>> key = lambda x: x % 10  # Bucket by last digit
-        >>> validator = lambda x: x in {1, 3, 5, 7, 9}  # Odd digits only
-        >>> s = bucket(it, key=key, validator=validator)
-        >>> 2 in s
-        False
-        >>> list(s[2])
-        []
-
-    """
-
-    def __init__(self, iterable, key, validator=None):
-        self._it = iter(iterable)
-        self._key = key
-        self._cache = defaultdict(deque)
-        self._validator = validator or (lambda x: True)
-
-    def __contains__(self, value):
-        if not self._validator(value):
-            return False
-
-        try:
-            item = next(self[value])
-        except StopIteration:
-            return False
-        else:
-            self._cache[value].appendleft(item)
-
-        return True
-
-    def _get_values(self, value):
-        """
-        Helper to yield items from the parent iterator that match *value*.
-        Items that don't match are stored in the local cache as they
-        are encountered.
-        """
-        while True:
-            # If we've cached some items that match the target value, emit
-            # the first one and evict it from the cache.
-            if self._cache[value]:
-                yield self._cache[value].popleft()
-            # Otherwise we need to advance the parent iterator to search for
-            # a matching item, caching the rest.
-            else:
-                while True:
-                    try:
-                        item = next(self._it)
-                    except StopIteration:
-                        return
-                    item_value = self._key(item)
-                    if item_value == value:
-                        yield item
-                        break
-                    elif self._validator(item_value):
-                        self._cache[item_value].append(item)
-
-    def __iter__(self):
-        for item in self._it:
-            item_value = self._key(item)
-            if self._validator(item_value):
-                self._cache[item_value].append(item)
-
-        yield from self._cache.keys()
-
-    def __getitem__(self, value):
-        if not self._validator(value):
-            return iter(())
-
-        return self._get_values(value)
diff --git a/lib/importlib_metadata/_meta.py b/lib/importlib_metadata/_meta.py
deleted file mode 100644
index 0942bbd9..00000000
--- a/lib/importlib_metadata/_meta.py
+++ /dev/null
@@ -1,75 +0,0 @@
-from __future__ import annotations
-
-import os
-from typing import (
-    Any,
-    Dict,
-    Iterator,
-    List,
-    Optional,
-    Protocol,
-    TypeVar,
-    Union,
-    overload,
-)
-
-_T = TypeVar("_T")
-
-
-class PackageMetadata(Protocol):
-    def __len__(self) -> int: ...  # pragma: no cover
-
-    def __contains__(self, item: str) -> bool: ...  # pragma: no cover
-
-    def __getitem__(self, key: str) -> str: ...  # pragma: no cover
-
-    def __iter__(self) -> Iterator[str]: ...  # pragma: no cover
-
-    @overload
-    def get(
-        self, name: str, failobj: None = None
-    ) -> Optional[str]: ...  # pragma: no cover
-
-    @overload
-    def get(self, name: str, failobj: _T) -> Union[str, _T]: ...  # pragma: no cover
-
-    # overload per python/importlib_metadata#435
-    @overload
-    def get_all(
-        self, name: str, failobj: None = None
-    ) -> Optional[List[Any]]: ...  # pragma: no cover
-
-    @overload
-    def get_all(self, name: str, failobj: _T) -> Union[List[Any], _T]:
-        """
-        Return all values associated with a possibly multi-valued key.
-        """
-
-    @property
-    def json(self) -> Dict[str, Union[str, List[str]]]:
-        """
-        A JSON-compatible form of the metadata.
-        """
-
-
-class SimplePath(Protocol):
-    """
-    A minimal subset of pathlib.Path required by Distribution.
-    """
-
-    def joinpath(
-        self, other: Union[str, os.PathLike[str]]
-    ) -> SimplePath: ...  # pragma: no cover
-
-    def __truediv__(
-        self, other: Union[str, os.PathLike[str]]
-    ) -> SimplePath: ...  # pragma: no cover
-
-    @property
-    def parent(self) -> SimplePath: ...  # pragma: no cover
-
-    def read_text(self, encoding=None) -> str: ...  # pragma: no cover
-
-    def read_bytes(self) -> bytes: ...  # pragma: no cover
-
-    def exists(self) -> bool: ...  # pragma: no cover
diff --git a/lib/importlib_metadata/_text.py b/lib/importlib_metadata/_text.py
deleted file mode 100644
index c88cfbb2..00000000
--- a/lib/importlib_metadata/_text.py
+++ /dev/null
@@ -1,99 +0,0 @@
-import re
-
-from ._functools import method_cache
-
-
-# from jaraco.text 3.5
-class FoldedCase(str):
-    """
-    A case insensitive string class; behaves just like str
-    except compares equal when the only variation is case.
-
-    >>> s = FoldedCase('hello world')
-
-    >>> s == 'Hello World'
-    True
-
-    >>> 'Hello World' == s
-    True
-
-    >>> s != 'Hello World'
-    False
-
-    >>> s.index('O')
-    4
-
-    >>> s.split('O')
-    ['hell', ' w', 'rld']
-
-    >>> sorted(map(FoldedCase, ['GAMMA', 'alpha', 'Beta']))
-    ['alpha', 'Beta', 'GAMMA']
-
-    Sequence membership is straightforward.
-
-    >>> "Hello World" in [s]
-    True
-    >>> s in ["Hello World"]
-    True
-
-    You may test for set inclusion, but candidate and elements
-    must both be folded.
-
-    >>> FoldedCase("Hello World") in {s}
-    True
-    >>> s in {FoldedCase("Hello World")}
-    True
-
-    String inclusion works as long as the FoldedCase object
-    is on the right.
-
-    >>> "hello" in FoldedCase("Hello World")
-    True
-
-    But not if the FoldedCase object is on the left:
-
-    >>> FoldedCase('hello') in 'Hello World'
-    False
-
-    In that case, use in_:
-
-    >>> FoldedCase('hello').in_('Hello World')
-    True
-
-    >>> FoldedCase('hello') > FoldedCase('Hello')
-    False
-    """
-
-    def __lt__(self, other):
-        return self.lower() < other.lower()
-
-    def __gt__(self, other):
-        return self.lower() > other.lower()
-
-    def __eq__(self, other):
-        return self.lower() == other.lower()
-
-    def __ne__(self, other):
-        return self.lower() != other.lower()
-
-    def __hash__(self):
-        return hash(self.lower())
-
-    def __contains__(self, other):
-        return super().lower().__contains__(other.lower())
-
-    def in_(self, other):
-        "Does self appear in other?"
-        return self in FoldedCase(other)
-
-    # cache lower since it's likely to be called frequently.
-    @method_cache
-    def lower(self):
-        return super().lower()
-
-    def index(self, sub):
-        return self.lower().index(sub.lower())
-
-    def split(self, splitter=' ', maxsplit=0):
-        pattern = re.compile(re.escape(splitter), re.I)
-        return pattern.split(self, maxsplit)
diff --git a/lib/importlib_metadata/compat/__init__.py b/lib/importlib_metadata/compat/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/importlib_metadata/compat/py311.py b/lib/importlib_metadata/compat/py311.py
deleted file mode 100644
index 3a532743..00000000
--- a/lib/importlib_metadata/compat/py311.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import os
-import pathlib
-import sys
-import types
-
-
-def wrap(path):  # pragma: no cover
-    """
-    Workaround for https://github.com/python/cpython/issues/84538
-    to add backward compatibility for walk_up=True.
-    An example affected package is dask-labextension, which uses
-    jupyter-packaging to install JupyterLab javascript files outside
-    of site-packages.
-    """
-
-    def relative_to(root, *, walk_up=False):
-        return pathlib.Path(os.path.relpath(path, root))
-
-    return types.SimpleNamespace(relative_to=relative_to)
-
-
-relative_fix = wrap if sys.version_info < (3, 12) else lambda x: x
diff --git a/lib/importlib_metadata/compat/py39.py b/lib/importlib_metadata/compat/py39.py
deleted file mode 100644
index 1f15bd97..00000000
--- a/lib/importlib_metadata/compat/py39.py
+++ /dev/null
@@ -1,36 +0,0 @@
-"""
-Compatibility layer with Python 3.8/3.9
-"""
-
-from typing import TYPE_CHECKING, Any, Optional
-
-if TYPE_CHECKING:  # pragma: no cover
-    # Prevent circular imports on runtime.
-    from .. import Distribution, EntryPoint
-else:
-    Distribution = EntryPoint = Any
-
-
-def normalized_name(dist: Distribution) -> Optional[str]:
-    """
-    Honor name normalization for distributions that don't provide ``_normalized_name``.
-    """
-    try:
-        return dist._normalized_name
-    except AttributeError:
-        from .. import Prepared  # -> delay to prevent circular imports.
-
-        return Prepared.normalize(getattr(dist, "name", None) or dist.metadata['Name'])
-
-
-def ep_matches(ep: EntryPoint, **params) -> bool:
-    """
-    Workaround for ``EntryPoint`` objects without the ``matches`` method.
-    """
-    try:
-        return ep.matches(**params)
-    except AttributeError:
-        from .. import EntryPoint  # -> delay to prevent circular imports.
-
-        # Reconstruct the EntryPoint object to make sure it is compatible.
-        return EntryPoint(ep.name, ep.value, ep.group).matches(**params)
diff --git a/lib/importlib_metadata/diagnose.py b/lib/importlib_metadata/diagnose.py
deleted file mode 100644
index e405471a..00000000
--- a/lib/importlib_metadata/diagnose.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import sys
-
-from . import Distribution
-
-
-def inspect(path):
-    print("Inspecting", path)
-    dists = list(Distribution.discover(path=[path]))
-    if not dists:
-        return
-    print("Found", len(dists), "packages:", end=' ')
-    print(', '.join(dist.name for dist in dists))
-
-
-def run():
-    for path in sys.path:
-        inspect(path)
-
-
-if __name__ == '__main__':
-    run()
diff --git a/lib/importlib_metadata/py.typed b/lib/importlib_metadata/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/importlib_resources/__init__.py b/lib/importlib_resources/__init__.py
deleted file mode 100644
index 723c9f9e..00000000
--- a/lib/importlib_resources/__init__.py
+++ /dev/null
@@ -1,43 +0,0 @@
-"""
-Read resources contained within a package.
-
-This codebase is shared between importlib.resources in the stdlib
-and importlib_resources in PyPI. See
-https://github.com/python/importlib_metadata/wiki/Development-Methodology
-for more detail.
-"""
-
-from ._common import (
-    as_file,
-    files,
-    Package,
-    Anchor,
-)
-
-from ._functional import (
-    contents,
-    is_resource,
-    open_binary,
-    open_text,
-    path,
-    read_binary,
-    read_text,
-)
-
-from .abc import ResourceReader
-
-
-__all__ = [
-    'Package',
-    'Anchor',
-    'ResourceReader',
-    'as_file',
-    'files',
-    'contents',
-    'is_resource',
-    'open_binary',
-    'open_text',
-    'path',
-    'read_binary',
-    'read_text',
-]
diff --git a/lib/importlib_resources/_adapters.py b/lib/importlib_resources/_adapters.py
deleted file mode 100644
index 50688fbb..00000000
--- a/lib/importlib_resources/_adapters.py
+++ /dev/null
@@ -1,168 +0,0 @@
-from contextlib import suppress
-from io import TextIOWrapper
-
-from . import abc
-
-
-class SpecLoaderAdapter:
-    """
-    Adapt a package spec to adapt the underlying loader.
-    """
-
-    def __init__(self, spec, adapter=lambda spec: spec.loader):
-        self.spec = spec
-        self.loader = adapter(spec)
-
-    def __getattr__(self, name):
-        return getattr(self.spec, name)
-
-
-class TraversableResourcesLoader:
-    """
-    Adapt a loader to provide TraversableResources.
-    """
-
-    def __init__(self, spec):
-        self.spec = spec
-
-    def get_resource_reader(self, name):
-        return CompatibilityFiles(self.spec)._native()
-
-
-def _io_wrapper(file, mode='r', *args, **kwargs):
-    if mode == 'r':
-        return TextIOWrapper(file, *args, **kwargs)
-    elif mode == 'rb':
-        return file
-    raise ValueError(f"Invalid mode value '{mode}', only 'r' and 'rb' are supported")
-
-
-class CompatibilityFiles:
-    """
-    Adapter for an existing or non-existent resource reader
-    to provide a compatibility .files().
-    """
-
-    class SpecPath(abc.Traversable):
-        """
-        Path tied to a module spec.
-        Can be read and exposes the resource reader children.
-        """
-
-        def __init__(self, spec, reader):
-            self._spec = spec
-            self._reader = reader
-
-        def iterdir(self):
-            if not self._reader:
-                return iter(())
-            return iter(
-                CompatibilityFiles.ChildPath(self._reader, path)
-                for path in self._reader.contents()
-            )
-
-        def is_file(self):
-            return False
-
-        is_dir = is_file
-
-        def joinpath(self, other):
-            if not self._reader:
-                return CompatibilityFiles.OrphanPath(other)
-            return CompatibilityFiles.ChildPath(self._reader, other)
-
-        @property
-        def name(self):
-            return self._spec.name
-
-        def open(self, mode='r', *args, **kwargs):
-            return _io_wrapper(self._reader.open_resource(None), mode, *args, **kwargs)
-
-    class ChildPath(abc.Traversable):
-        """
-        Path tied to a resource reader child.
-        Can be read but doesn't expose any meaningful children.
-        """
-
-        def __init__(self, reader, name):
-            self._reader = reader
-            self._name = name
-
-        def iterdir(self):
-            return iter(())
-
-        def is_file(self):
-            return self._reader.is_resource(self.name)
-
-        def is_dir(self):
-            return not self.is_file()
-
-        def joinpath(self, other):
-            return CompatibilityFiles.OrphanPath(self.name, other)
-
-        @property
-        def name(self):
-            return self._name
-
-        def open(self, mode='r', *args, **kwargs):
-            return _io_wrapper(
-                self._reader.open_resource(self.name), mode, *args, **kwargs
-            )
-
-    class OrphanPath(abc.Traversable):
-        """
-        Orphan path, not tied to a module spec or resource reader.
-        Can't be read and doesn't expose any meaningful children.
-        """
-
-        def __init__(self, *path_parts):
-            if len(path_parts) < 1:
-                raise ValueError('Need at least one path part to construct a path')
-            self._path = path_parts
-
-        def iterdir(self):
-            return iter(())
-
-        def is_file(self):
-            return False
-
-        is_dir = is_file
-
-        def joinpath(self, other):
-            return CompatibilityFiles.OrphanPath(*self._path, other)
-
-        @property
-        def name(self):
-            return self._path[-1]
-
-        def open(self, mode='r', *args, **kwargs):
-            raise FileNotFoundError("Can't open orphan path")
-
-    def __init__(self, spec):
-        self.spec = spec
-
-    @property
-    def _reader(self):
-        with suppress(AttributeError):
-            return self.spec.loader.get_resource_reader(self.spec.name)
-
-    def _native(self):
-        """
-        Return the native reader if it supports files().
-        """
-        reader = self._reader
-        return reader if hasattr(reader, 'files') else self
-
-    def __getattr__(self, attr):
-        return getattr(self._reader, attr)
-
-    def files(self):
-        return CompatibilityFiles.SpecPath(self.spec, self._reader)
-
-
-def wrap_spec(package):
-    """
-    Construct a package spec with traversable compatibility
-    on the spec/loader/reader.
-    """
-    return SpecLoaderAdapter(package.__spec__, TraversableResourcesLoader)
diff --git a/lib/importlib_resources/_common.py b/lib/importlib_resources/_common.py
deleted file mode 100644
index f065d493..00000000
--- a/lib/importlib_resources/_common.py
+++ /dev/null
@@ -1,211 +0,0 @@
-import os
-import pathlib
-import tempfile
-import functools
-import contextlib
-import types
-import importlib
-import inspect
-import warnings
-import itertools
-
-from typing import Union, Optional, cast
-from .abc import ResourceReader, Traversable
-
-Package = Union[types.ModuleType, str]
-Anchor = Package
-
-
-def package_to_anchor(func):
-    """
-    Replace 'package' parameter as 'anchor' and warn about the change.
-
-    Other errors should fall through.
-
-    >>> files('a', 'b')
-    Traceback (most recent call last):
-    TypeError: files() takes from 0 to 1 positional arguments but 2 were given
-
-    Remove this compatibility in Python 3.14.
-    """
-    undefined = object()
-
-    @functools.wraps(func)
-    def wrapper(anchor=undefined, package=undefined):
-        if package is not undefined:
-            if anchor is not undefined:
-                return func(anchor, package)
-            warnings.warn(
-                "First parameter to files is renamed to 'anchor'",
-                DeprecationWarning,
-                stacklevel=2,
-            )
-            return func(package)
-        elif anchor is undefined:
-            return func()
-        return func(anchor)
-
-    return wrapper
-
-
-@package_to_anchor
-def files(anchor: Optional[Anchor] = None) -> Traversable:
-    """
-    Get a Traversable resource for an anchor.
-    """
-    return from_package(resolve(anchor))
-
-
-def get_resource_reader(package: types.ModuleType) -> Optional[ResourceReader]:
-    """
-    Return the package's loader if it's a ResourceReader.
-    """
-    # We can't use
-    # a issubclass() check here because apparently abc.'s __subclasscheck__()
-    # hook wants to create a weak reference to the object, but
-    # zipimport.zipimporter does not support weak references, resulting in a
-    # TypeError.  That seems terrible.
-    spec = package.__spec__
-    reader = getattr(spec.loader, 'get_resource_reader', None)  # type: ignore[union-attr]
-    if reader is None:
-        return None
-    return reader(spec.name)  # type: ignore[union-attr]
-
-
-@functools.singledispatch
-def resolve(cand: Optional[Anchor]) -> types.ModuleType:
-    return cast(types.ModuleType, cand)
-
-
-@resolve.register
-def _(cand: str) -> types.ModuleType:
-    return importlib.import_module(cand)
-
-
-@resolve.register
-def _(cand: None) -> types.ModuleType:
-    return resolve(_infer_caller().f_globals['__name__'])
-
-
-def _infer_caller():
-    """
-    Walk the stack and find the frame of the first caller not in this module.
-    """
-
-    def is_this_file(frame_info):
-        return frame_info.filename == stack[0].filename
-
-    def is_wrapper(frame_info):
-        return frame_info.function == 'wrapper'
-
-    stack = inspect.stack()
-    not_this_file = itertools.filterfalse(is_this_file, stack)
-    # also exclude 'wrapper' due to singledispatch in the call stack
-    callers = itertools.filterfalse(is_wrapper, not_this_file)
-    return next(callers).frame
-
-
-def from_package(package: types.ModuleType):
-    """
-    Return a Traversable object for the given package.
-
-    """
-    # deferred for performance (python/cpython#109829)
-    from .future.adapters import wrap_spec
-
-    spec = wrap_spec(package)
-    reader = spec.loader.get_resource_reader(spec.name)
-    return reader.files()
-
-
-@contextlib.contextmanager
-def _tempfile(
-    reader,
-    suffix='',
-    # gh-93353: Keep a reference to call os.remove() in late Python
-    # finalization.
-    *,
-    _os_remove=os.remove,
-):
-    # Not using tempfile.NamedTemporaryFile as it leads to deeper 'try'
-    # blocks due to the need to close the temporary file to work on Windows
-    # properly.
-    fd, raw_path = tempfile.mkstemp(suffix=suffix)
-    try:
-        try:
-            os.write(fd, reader())
-        finally:
-            os.close(fd)
-        del reader
-        yield pathlib.Path(raw_path)
-    finally:
-        try:
-            _os_remove(raw_path)
-        except FileNotFoundError:
-            pass
-
-
-def _temp_file(path):
-    return _tempfile(path.read_bytes, suffix=path.name)
-
-
-def _is_present_dir(path: Traversable) -> bool:
-    """
-    Some Traversables implement ``is_dir()`` to raise an
-    exception (i.e. ``FileNotFoundError``) when the
-    directory doesn't exist. This function wraps that call
-    to always return a boolean and only return True
-    if there's a dir and it exists.
-    """
-    with contextlib.suppress(FileNotFoundError):
-        return path.is_dir()
-    return False
-
-
-@functools.singledispatch
-def as_file(path):
-    """
-    Given a Traversable object, return that object as a
-    path on the local file system in a context manager.
-    """
-    return _temp_dir(path) if _is_present_dir(path) else _temp_file(path)
-
-
-@as_file.register(pathlib.Path)
-@contextlib.contextmanager
-def _(path):
-    """
-    Degenerate behavior for pathlib.Path objects.
-    """
-    yield path
-
-
-@contextlib.contextmanager
-def _temp_path(dir: tempfile.TemporaryDirectory):
-    """
-    Wrap tempfile.TemporaryDirectory to return a pathlib object.
-    """
-    with dir as result:
-        yield pathlib.Path(result)
-
-
-@contextlib.contextmanager
-def _temp_dir(path):
-    """
-    Given a traversable dir, recursively replicate the whole tree
-    to the file system in a context manager.
-    """
-    assert path.is_dir()
-    with _temp_path(tempfile.TemporaryDirectory()) as temp_dir:
-        yield _write_contents(temp_dir, path)
-
-
-def _write_contents(target, source):
-    child = target.joinpath(source.name)
-    if source.is_dir():
-        child.mkdir()
-        for item in source.iterdir():
-            _write_contents(child, item)
-    else:
-        child.write_bytes(source.read_bytes())
-    return child
diff --git a/lib/importlib_resources/_functional.py b/lib/importlib_resources/_functional.py
deleted file mode 100644
index f59416f2..00000000
--- a/lib/importlib_resources/_functional.py
+++ /dev/null
@@ -1,81 +0,0 @@
-"""Simplified function-based API for importlib.resources"""
-
-import warnings
-
-from ._common import files, as_file
-
-
-_MISSING = object()
-
-
-def open_binary(anchor, *path_names):
-    """Open for binary reading the *resource* within *package*."""
-    return _get_resource(anchor, path_names).open('rb')
-
-
-def open_text(anchor, *path_names, encoding=_MISSING, errors='strict'):
-    """Open for text reading the *resource* within *package*."""
-    encoding = _get_encoding_arg(path_names, encoding)
-    resource = _get_resource(anchor, path_names)
-    return resource.open('r', encoding=encoding, errors=errors)
-
-
-def read_binary(anchor, *path_names):
-    """Read and return contents of *resource* within *package* as bytes."""
-    return _get_resource(anchor, path_names).read_bytes()
-
-
-def read_text(anchor, *path_names, encoding=_MISSING, errors='strict'):
-    """Read and return contents of *resource* within *package* as str."""
-    encoding = _get_encoding_arg(path_names, encoding)
-    resource = _get_resource(anchor, path_names)
-    return resource.read_text(encoding=encoding, errors=errors)
-
-
-def path(anchor, *path_names):
-    """Return the path to the *resource* as an actual file system path."""
-    return as_file(_get_resource(anchor, path_names))
-
-
-def is_resource(anchor, *path_names):
-    """Return ``True`` if there is a resource named *name* in the package,
-
-    Otherwise returns ``False``.
-    """
-    return _get_resource(anchor, path_names).is_file()
-
-
-def contents(anchor, *path_names):
-    """Return an iterable over the named resources within the package.
-
-    The iterable returns :class:`str` resources (e.g. files).
-    The iterable does not recurse into subdirectories.
-    """
-    warnings.warn(
-        "importlib.resources.contents is deprecated. "
-        "Use files(anchor).iterdir() instead.",
-        DeprecationWarning,
-        stacklevel=1,
-    )
-    return (resource.name for resource in _get_resource(anchor, path_names).iterdir())
-
-
-def _get_encoding_arg(path_names, encoding):
-    # For compatibility with versions where *encoding* was a positional
-    # argument, it needs to be given explicitly when there are multiple
-    # *path_names*.
-    # This limitation can be removed in Python 3.15.
-    if encoding is _MISSING:
-        if len(path_names) > 1:
-            raise TypeError(
-                "'encoding' argument required with multiple path names",
-            )
-        else:
-            return 'utf-8'
-    return encoding
-
-
-def _get_resource(anchor, path_names):
-    if anchor is None:
-        raise TypeError("anchor must be module or string, got None")
-    return files(anchor).joinpath(*path_names)
diff --git a/lib/importlib_resources/_itertools.py b/lib/importlib_resources/_itertools.py
deleted file mode 100644
index 7b775ef5..00000000
--- a/lib/importlib_resources/_itertools.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# from more_itertools 9.0
-def only(iterable, default=None, too_long=None):
-    """If *iterable* has only one item, return it.
-    If it has zero items, return *default*.
-    If it has more than one item, raise the exception given by *too_long*,
-    which is ``ValueError`` by default.
-    >>> only([], default='missing')
-    'missing'
-    >>> only([1])
-    1
-    >>> only([1, 2])  # doctest: +IGNORE_EXCEPTION_DETAIL
-    Traceback (most recent call last):
-    ...
-    ValueError: Expected exactly one item in iterable, but got 1, 2,
-     and perhaps more.'
-    >>> only([1, 2], too_long=TypeError)  # doctest: +IGNORE_EXCEPTION_DETAIL
-    Traceback (most recent call last):
-    ...
-    TypeError
-    Note that :func:`only` attempts to advance *iterable* twice to ensure there
-    is only one item.  See :func:`spy` or :func:`peekable` to check
-    iterable contents less destructively.
-    """
-    it = iter(iterable)
-    first_value = next(it, default)
-
-    try:
-        second_value = next(it)
-    except StopIteration:
-        pass
-    else:
-        msg = (
-            'Expected exactly one item in iterable, but got {!r}, {!r}, '
-            'and perhaps more.'.format(first_value, second_value)
-        )
-        raise too_long or ValueError(msg)
-
-    return first_value
diff --git a/lib/importlib_resources/abc.py b/lib/importlib_resources/abc.py
deleted file mode 100644
index 7a58dd2f..00000000
--- a/lib/importlib_resources/abc.py
+++ /dev/null
@@ -1,171 +0,0 @@
-import abc
-import io
-import itertools
-import pathlib
-from typing import Any, BinaryIO, Iterable, Iterator, NoReturn, Text, Optional
-from typing import runtime_checkable, Protocol
-
-from .compat.py38 import StrPath
-
-
-__all__ = ["ResourceReader", "Traversable", "TraversableResources"]
-
-
-class ResourceReader(metaclass=abc.ABCMeta):
-    """Abstract base class for loaders to provide resource reading support."""
-
-    @abc.abstractmethod
-    def open_resource(self, resource: Text) -> BinaryIO:
-        """Return an opened, file-like object for binary reading.
-
-        The 'resource' argument is expected to represent only a file name.
-        If the resource cannot be found, FileNotFoundError is raised.
-        """
-        # This deliberately raises FileNotFoundError instead of
-        # NotImplementedError so that if this method is accidentally called,
-        # it'll still do the right thing.
-        raise FileNotFoundError
-
-    @abc.abstractmethod
-    def resource_path(self, resource: Text) -> Text:
-        """Return the file system path to the specified resource.
-
-        The 'resource' argument is expected to represent only a file name.
-        If the resource does not exist on the file system, raise
-        FileNotFoundError.
-        """
-        # This deliberately raises FileNotFoundError instead of
-        # NotImplementedError so that if this method is accidentally called,
-        # it'll still do the right thing.
-        raise FileNotFoundError
-
-    @abc.abstractmethod
-    def is_resource(self, path: Text) -> bool:
-        """Return True if the named 'path' is a resource.
-
-        Files are resources, directories are not.
-        """
-        raise FileNotFoundError
-
-    @abc.abstractmethod
-    def contents(self) -> Iterable[str]:
-        """Return an iterable of entries in `package`."""
-        raise FileNotFoundError
-
-
-class TraversalError(Exception):
-    pass
-
-
-@runtime_checkable
-class Traversable(Protocol):
-    """
-    An object with a subset of pathlib.Path methods suitable for
-    traversing directories and opening files.
-
-    Any exceptions that occur when accessing the backing resource
-    may propagate unaltered.
-    """
-
-    @abc.abstractmethod
-    def iterdir(self) -> Iterator["Traversable"]:
-        """
-        Yield Traversable objects in self
-        """
-
-    def read_bytes(self) -> bytes:
-        """
-        Read contents of self as bytes
-        """
-        with self.open('rb') as strm:
-            return strm.read()
-
-    def read_text(self, encoding: Optional[str] = None) -> str:
-        """
-        Read contents of self as text
-        """
-        with self.open(encoding=encoding) as strm:
-            return strm.read()
-
-    @abc.abstractmethod
-    def is_dir(self) -> bool:
-        """
-        Return True if self is a directory
-        """
-
-    @abc.abstractmethod
-    def is_file(self) -> bool:
-        """
-        Return True if self is a file
-        """
-
-    def joinpath(self, *descendants: StrPath) -> "Traversable":
-        """
-        Return Traversable resolved with any descendants applied.
-
-        Each descendant should be a path segment relative to self
-        and each may contain multiple levels separated by
-        ``posixpath.sep`` (``/``).
-        """
-        if not descendants:
-            return self
-        names = itertools.chain.from_iterable(
-            path.parts for path in map(pathlib.PurePosixPath, descendants)
-        )
-        target = next(names)
-        matches = (
-            traversable for traversable in self.iterdir() if traversable.name == target
-        )
-        try:
-            match = next(matches)
-        except StopIteration:
-            raise TraversalError(
-                "Target not found during traversal.", target, list(names)
-            )
-        return match.joinpath(*names)
-
-    def __truediv__(self, child: StrPath) -> "Traversable":
-        """
-        Return Traversable child in self
-        """
-        return self.joinpath(child)
-
-    @abc.abstractmethod
-    def open(self, mode='r', *args, **kwargs):
-        """
-        mode may be 'r' or 'rb' to open as text or binary. Return a handle
-        suitable for reading (same as pathlib.Path.open).
-
-        When opening as text, accepts encoding parameters such as those
-        accepted by io.TextIOWrapper.
-        """
-
-    @property
-    @abc.abstractmethod
-    def name(self) -> str:
-        """
-        The base name of this object without any parent references.
-        """
-
-
-class TraversableResources(ResourceReader):
-    """
-    The required interface for providing traversable
-    resources.
-    """
-
-    @abc.abstractmethod
-    def files(self) -> "Traversable":
-        """Return a Traversable object for the loaded package."""
-
-    def open_resource(self, resource: StrPath) -> io.BufferedReader:
-        return self.files().joinpath(resource).open('rb')
-
-    def resource_path(self, resource: Any) -> NoReturn:
-        raise FileNotFoundError(resource)
-
-    def is_resource(self, path: StrPath) -> bool:
-        return self.files().joinpath(path).is_file()
-
-    def contents(self) -> Iterator[str]:
-        return (item.name for item in self.files().iterdir())
diff --git a/lib/importlib_resources/compat/__init__.py b/lib/importlib_resources/compat/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/importlib_resources/compat/py38.py b/lib/importlib_resources/compat/py38.py
deleted file mode 100644
index 4d548257..00000000
--- a/lib/importlib_resources/compat/py38.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import os
-import sys
-
-from typing import Union
-
-
-if sys.version_info >= (3, 9):
-    StrPath = Union[str, os.PathLike[str]]
-else:
-    # PathLike is only subscriptable at runtime in 3.9+
-    StrPath = Union[str, "os.PathLike[str]"]
diff --git a/lib/importlib_resources/compat/py39.py b/lib/importlib_resources/compat/py39.py
deleted file mode 100644
index ed5abd5e..00000000
--- a/lib/importlib_resources/compat/py39.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import sys
-
-
-__all__ = ['ZipPath']
-
-
-if sys.version_info >= (3, 10):
-    from zipfile import Path as ZipPath
-else:
-    from zipp import Path as ZipPath
diff --git a/lib/importlib_resources/future/__init__.py b/lib/importlib_resources/future/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/importlib_resources/future/adapters.py b/lib/importlib_resources/future/adapters.py
deleted file mode 100644
index 0e9764ba..00000000
--- a/lib/importlib_resources/future/adapters.py
+++ /dev/null
@@ -1,95 +0,0 @@
-import functools
-import pathlib
-from contextlib import suppress
-from types import SimpleNamespace
-
-from .. import readers, _adapters
-
-
-def _block_standard(reader_getter):
-    """
-    Wrap _adapters.TraversableResourcesLoader.get_resource_reader
-    and intercept any standard library readers.
-    """
-
-    @functools.wraps(reader_getter)
-    def wrapper(*args, **kwargs):
-        """
-        If the reader is from the standard library, return None to allow
-        allow likely newer implementations in this library to take precedence.
-        """
-        try:
-            reader = reader_getter(*args, **kwargs)
-        except NotADirectoryError:
-            # MultiplexedPath may fail on zip subdirectory
-            return
-        # Python 3.10+
-        mod_name = reader.__class__.__module__
-        if mod_name.startswith('importlib.') and mod_name.endswith('readers'):
-            return
-        # Python 3.8, 3.9
-        if isinstance(reader, _adapters.CompatibilityFiles) and (
-            reader.spec.loader.__class__.__module__.startswith('zipimport')
-            or reader.spec.loader.__class__.__module__.startswith(
-                '_frozen_importlib_external'
-            )
-        ):
-            return
-        return reader
-
-    return wrapper
-
-
-def _skip_degenerate(reader):
-    """
-    Mask any degenerate reader. Ref #298.
-    """
-    is_degenerate = (
-        isinstance(reader, _adapters.CompatibilityFiles) and not reader._reader
-    )
-    return reader if not is_degenerate else None
-
-
-class TraversableResourcesLoader(_adapters.TraversableResourcesLoader):
-    """
-    Adapt loaders to provide TraversableResources and other
-    compatibility.
-
-    Ensures the readers from importlib_resources are preferred
-    over stdlib readers.
-    """
-
-    def get_resource_reader(self, name):
-        return (
-            _skip_degenerate(_block_standard(super().get_resource_reader)(name))
-            or self._standard_reader()
-            or super().get_resource_reader(name)
-        )
-
-    def _standard_reader(self):
-        return self._zip_reader() or self._namespace_reader() or self._file_reader()
-
-    def _zip_reader(self):
-        with suppress(AttributeError):
-            return readers.ZipReader(self.spec.loader, self.spec.name)
-
-    def _namespace_reader(self):
-        with suppress(AttributeError, ValueError):
-            return readers.NamespaceReader(self.spec.submodule_search_locations)
-
-    def _file_reader(self):
-        try:
-            path = pathlib.Path(self.spec.origin)
-        except TypeError:
-            return None
-        if path.exists():
-            return readers.FileReader(SimpleNamespace(path=path))
-
-
-def wrap_spec(package):
-    """
-    Override _adapters.wrap_spec to use TraversableResourcesLoader
-    from above. Ensures that future behavior is always available on older
-    Pythons.
-    """
-    return _adapters.SpecLoaderAdapter(package.__spec__, TraversableResourcesLoader)
diff --git a/lib/importlib_resources/py.typed b/lib/importlib_resources/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/importlib_resources/readers.py b/lib/importlib_resources/readers.py
deleted file mode 100644
index 4f761c64..00000000
--- a/lib/importlib_resources/readers.py
+++ /dev/null
@@ -1,203 +0,0 @@
-from __future__ import annotations
-
-import collections
-import contextlib
-import itertools
-import pathlib
-import operator
-import re
-import warnings
-from collections.abc import Iterator
-
-from . import abc
-
-from ._itertools import only
-from .compat.py39 import ZipPath
-
-
-def remove_duplicates(items):
-    return iter(collections.OrderedDict.fromkeys(items))
-
-
-class FileReader(abc.TraversableResources):
-    def __init__(self, loader):
-        self.path = pathlib.Path(loader.path).parent
-
-    def resource_path(self, resource):
-        """
-        Return the file system path to prevent
-        `resources.path()` from creating a temporary
-        copy.
-        """
-        return str(self.path.joinpath(resource))
-
-    def files(self):
-        return self.path
-
-
-class ZipReader(abc.TraversableResources):
-    def __init__(self, loader, module):
-        self.prefix = loader.prefix.replace('\\', '/')
-        if loader.is_package(module):
-            _, _, name = module.rpartition('.')
-            self.prefix += name + '/'
-        self.archive = loader.archive
-
-    def open_resource(self, resource):
-        try:
-            return super().open_resource(resource)
-        except KeyError as exc:
-            raise FileNotFoundError(exc.args[0])
-
-    def is_resource(self, path):
-        """
-        Workaround for `zipfile.Path.is_file` returning true
-        for non-existent paths.
-        """
-        target = self.files().joinpath(path)
-        return target.is_file() and target.exists()
-
-    def files(self):
-        return ZipPath(self.archive, self.prefix)
-
-
-class MultiplexedPath(abc.Traversable):
-    """
-    Given a series of Traversable objects, implement a merged
-    version of the interface across all objects. Useful for
-    namespace packages which may be multihomed at a single
-    name.
-    """
-
-    def __init__(self, *paths):
-        self._paths = list(map(_ensure_traversable, remove_duplicates(paths)))
-        if not self._paths:
-            message = 'MultiplexedPath must contain at least one path'
-            raise FileNotFoundError(message)
-        if not all(path.is_dir() for path in self._paths):
-            raise NotADirectoryError('MultiplexedPath only supports directories')
-
-    def iterdir(self):
-        children = (child for path in self._paths for child in path.iterdir())
-        by_name = operator.attrgetter('name')
-        groups = itertools.groupby(sorted(children, key=by_name), key=by_name)
-        return map(self._follow, (locs for name, locs in groups))
-
-    def read_bytes(self):
-        raise FileNotFoundError(f'{self} is not a file')
-
-    def read_text(self, *args, **kwargs):
-        raise FileNotFoundError(f'{self} is not a file')
-
-    def is_dir(self):
-        return True
-
-    def is_file(self):
-        return False
-
-    def joinpath(self, *descendants):
-        try:
-            return super().joinpath(*descendants)
-        except abc.TraversalError:
-            # One of the paths did not resolve (a directory does not exist).
-            # Just return something that will not exist.
-            return self._paths[0].joinpath(*descendants)
-
-    @classmethod
-    def _follow(cls, children):
-        """
-        Construct a MultiplexedPath if needed.
-
-        If children contains a sole element, return it.
-        Otherwise, return a MultiplexedPath of the items.
-        Unless one of the items is not a Directory, then return the first.
-        """
-        subdirs, one_dir, one_file = itertools.tee(children, 3)
-
-        try:
-            return only(one_dir)
-        except ValueError:
-            try:
-                return cls(*subdirs)
-            except NotADirectoryError:
-                return next(one_file)
-
-    def open(self, *args, **kwargs):
-        raise FileNotFoundError(f'{self} is not a file')
-
-    @property
-    def name(self):
-        return self._paths[0].name
-
-    def __repr__(self):
-        paths = ', '.join(f"'{path}'" for path in self._paths)
-        return f'MultiplexedPath({paths})'
-
-
-class NamespaceReader(abc.TraversableResources):
-    def __init__(self, namespace_path):
-        if 'NamespacePath' not in str(namespace_path):
-            raise ValueError('Invalid path')
-        self.path = MultiplexedPath(*filter(bool, map(self._resolve, namespace_path)))
-
-    @classmethod
-    def _resolve(cls, path_str) -> abc.Traversable | None:
-        r"""
-        Given an item from a namespace path, resolve it to a Traversable.
-
-        path_str might be a directory on the filesystem or a path to a
-        zipfile plus the path within the zipfile, e.g. ``/foo/bar`` or
-        ``/foo/baz.zip/inner_dir`` or ``foo\baz.zip\inner_dir\sub``.
-
-        path_str might also be a sentinel used by editable packages to
-        trigger other behaviors (see python/importlib_resources#311).
-        In that case, return None.
-        """
-        dirs = (cand for cand in cls._candidate_paths(path_str) if cand.is_dir())
-        return next(dirs, None)
-
-    @classmethod
-    def _candidate_paths(cls, path_str: str) -> Iterator[abc.Traversable]:
-        yield pathlib.Path(path_str)
-        yield from cls._resolve_zip_path(path_str)
-
-    @staticmethod
-    def _resolve_zip_path(path_str: str):
-        for match in reversed(list(re.finditer(r'[\\/]', path_str))):
-            with contextlib.suppress(
-                FileNotFoundError,
-                IsADirectoryError,
-                NotADirectoryError,
-                PermissionError,
-            ):
-                inner = path_str[match.end() :].replace('\\', '/') + '/'
-                yield ZipPath(path_str[: match.start()], inner.lstrip('/'))
-
-    def resource_path(self, resource):
-        """
-        Return the file system path to prevent
-        `resources.path()` from creating a temporary
-        copy.
-        """
-        return str(self.path.joinpath(resource))
-
-    def files(self):
-        return self.path
-
-
-def _ensure_traversable(path):
-    """
-    Convert deprecated string arguments to traversables (pathlib.Path).
-
-    Remove with Python 3.15.
-    """
-    if not isinstance(path, str):
-        return path
-
-    warnings.warn(
-        "String arguments are deprecated. Pass a Traversable instead.",
-        DeprecationWarning,
-        stacklevel=3,
-    )
-
-    return pathlib.Path(path)
diff --git a/lib/importlib_resources/simple.py b/lib/importlib_resources/simple.py
deleted file mode 100644
index 2e75299b..00000000
--- a/lib/importlib_resources/simple.py
+++ /dev/null
@@ -1,106 +0,0 @@
-"""
-Interface adapters for low-level readers.
-"""
-
-import abc
-import io
-import itertools
-from typing import BinaryIO, List
-
-from .abc import Traversable, TraversableResources
-
-
-class SimpleReader(abc.ABC):
-    """
-    The minimum, low-level interface required from a resource
-    provider.
-    """
-
-    @property
-    @abc.abstractmethod
-    def package(self) -> str:
-        """
-        The name of the package for which this reader loads resources.
-        """
-
-    @abc.abstractmethod
-    def children(self) -> List['SimpleReader']:
-        """
-        Obtain an iterable of SimpleReader for available
-        child containers (e.g. directories).
-        """
-
-    @abc.abstractmethod
-    def resources(self) -> List[str]:
-        """
-        Obtain available named resources for this virtual package.
-        """
-
-    @abc.abstractmethod
-    def open_binary(self, resource: str) -> BinaryIO:
-        """
-        Obtain a File-like for a named resource.
-        """
-
-    @property
-    def name(self):
-        return self.package.split('.')[-1]
-
-
-class ResourceContainer(Traversable):
-    """
-    Traversable container for a package's resources via its reader.
-    """
-
-    def __init__(self, reader: SimpleReader):
-        self.reader = reader
-
-    def is_dir(self):
-        return True
-
-    def is_file(self):
-        return False
-
-    def iterdir(self):
-        files = (ResourceHandle(self, name) for name in self.reader.resources)
-        dirs = map(ResourceContainer, self.reader.children())
-        return itertools.chain(files, dirs)
-
-    def open(self, *args, **kwargs):
-        raise IsADirectoryError()
-
-
-class ResourceHandle(Traversable):
-    """
-    Handle to a named resource in a ResourceReader.
-    """
-
-    def __init__(self, parent: ResourceContainer, name: str):
-        self.parent = parent
-        self.name = name  # type: ignore[misc]
-
-    def is_file(self):
-        return True
-
-    def is_dir(self):
-        return False
-
-    def open(self, mode='r', *args, **kwargs):
-        stream = self.parent.reader.open_binary(self.name)
-        if 'b' not in mode:
-            stream = io.TextIOWrapper(stream, *args, **kwargs)
-        return stream
-
-    def joinpath(self, name):
-        raise RuntimeError("Cannot traverse into a resource")
-
-
-class TraversableReader(TraversableResources, SimpleReader):
-    """
-    A TraversableResources based on SimpleReader. Resource providers
-    may derive from this class to provide the TraversableResources
-    interface by supplying the SimpleReader interface.
-    """
-
-    def files(self):
-        return ResourceContainer(self)
diff --git a/lib/importlib_resources/tests/__init__.py b/lib/importlib_resources/tests/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/importlib_resources/tests/_path.py b/lib/importlib_resources/tests/_path.py
deleted file mode 100644
index b144628c..00000000
--- a/lib/importlib_resources/tests/_path.py
+++ /dev/null
@@ -1,94 +0,0 @@
-import pathlib
-import functools
-
-from typing import Dict, Union
-from typing import runtime_checkable
-from typing import Protocol
-
-
-####
-# from jaraco.path 3.7.1
-
-
-class Symlink(str):
-    """
-    A string indicating the target of a symlink.
-    """
-
-
-FilesSpec = Dict[str, Union[str, bytes, Symlink, 'FilesSpec']]
-
-
-@runtime_checkable
-class TreeMaker(Protocol):
-    def __truediv__(self, *args, **kwargs): ...  # pragma: no cover
-
-    def mkdir(self, **kwargs): ...  # pragma: no cover
-
-    def write_text(self, content, **kwargs): ...  # pragma: no cover
-
-    def write_bytes(self, content): ...  # pragma: no cover
-
-    def symlink_to(self, target): ...  # pragma: no cover
-
-
-def _ensure_tree_maker(obj: Union[str, TreeMaker]) -> TreeMaker:
-    return obj if isinstance(obj, TreeMaker) else pathlib.Path(obj)  # type: ignore[return-value]
-
-
-def build(
-    spec: FilesSpec,
-    prefix: Union[str, TreeMaker] = pathlib.Path(),  # type: ignore[assignment]
-):
-    """
-    Build a set of files/directories, as described by the spec.
-
-    Each key represents a pathname, and the value represents
-    the content. Content may be a nested directory.
-
-    >>> spec = {
-    ...     'README.txt': "A README file",
-    ...     "foo": {
-    ...         "__init__.py": "",
-    ...         "bar": {
-    ...             "__init__.py": "",
-    ...         },
-    ...         "baz.py": "# Some code",
-    ...         "bar.py": Symlink("baz.py"),
-    ...     },
-    ...     "bing": Symlink("foo"),
-    ... }
-    >>> target = getfixture('tmp_path')
-    >>> build(spec, target)
-    >>> target.joinpath('foo/baz.py').read_text(encoding='utf-8')
-    '# Some code'
-    >>> target.joinpath('bing/bar.py').read_text(encoding='utf-8')
-    '# Some code'
-    """
-    for name, contents in spec.items():
-        create(contents, _ensure_tree_maker(prefix) / name)
-
-
-@functools.singledispatch
-def create(content: Union[str, bytes, FilesSpec], path):
-    path.mkdir(exist_ok=True)
-    build(content, prefix=path)  # type: ignore[arg-type]
-
-
-@create.register
-def _(content: bytes, path):
-    path.write_bytes(content)
-
-
-@create.register
-def _(content: str, path):
-    path.write_text(content, encoding='utf-8')
-
-
-@create.register
-def _(content: Symlink, path):
-    path.symlink_to(content)
-
-
-# end from jaraco.path
-####
diff --git a/lib/importlib_resources/tests/compat/__init__.py b/lib/importlib_resources/tests/compat/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/importlib_resources/tests/compat/py312.py b/lib/importlib_resources/tests/compat/py312.py
deleted file mode 100644
index ea9a58ba..00000000
--- a/lib/importlib_resources/tests/compat/py312.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import contextlib
-
-from .py39 import import_helper
-
-
-@contextlib.contextmanager
-def isolated_modules():
-    """
-    Save modules on entry and cleanup on exit.
-    """
-    (saved,) = import_helper.modules_setup()
-    try:
-        yield
-    finally:
-        import_helper.modules_cleanup(saved)
-
-
-vars(import_helper).setdefault('isolated_modules', isolated_modules)
diff --git a/lib/importlib_resources/tests/compat/py39.py b/lib/importlib_resources/tests/compat/py39.py
deleted file mode 100644
index e01d276b..00000000
--- a/lib/importlib_resources/tests/compat/py39.py
+++ /dev/null
@@ -1,13 +0,0 @@
-"""
-Backward-compatability shims to support Python 3.9 and earlier.
-"""
-
-from jaraco.test.cpython import from_test_support, try_import
-
-import_helper = try_import('import_helper') or from_test_support(
-    'modules_setup', 'modules_cleanup', 'DirsOnSysPath'
-)
-os_helper = try_import('os_helper') or from_test_support('temp_dir')
-warnings_helper = try_import('warnings_helper') or from_test_support(
-    'ignore_warnings', 'check_warnings'
-)
diff --git a/lib/importlib_resources/tests/test_compatibilty_files.py b/lib/importlib_resources/tests/test_compatibilty_files.py
deleted file mode 100644
index 13ad0dfb..00000000
--- a/lib/importlib_resources/tests/test_compatibilty_files.py
+++ /dev/null
@@ -1,104 +0,0 @@
-import io
-import unittest
-
-import importlib_resources as resources
-
-from importlib_resources._adapters import (
-    CompatibilityFiles,
-    wrap_spec,
-)
-
-from . import util
-
-
-class CompatibilityFilesTests(unittest.TestCase):
-    @property
-    def package(self):
-        bytes_data = io.BytesIO(b'Hello, world!')
-        return util.create_package(
-            file=bytes_data,
-            path='some_path',
-            contents=('a', 'b', 'c'),
-        )
-
-    @property
-    def files(self):
-        return resources.files(self.package)
-
-    def test_spec_path_iter(self):
-        self.assertEqual(
-            sorted(path.name for path in self.files.iterdir()),
-            ['a', 'b', 'c'],
-        )
-
-    def test_child_path_iter(self):
-        self.assertEqual(list((self.files / 'a').iterdir()), [])
-
-    def test_orphan_path_iter(self):
-        self.assertEqual(list((self.files / 'a' / 'a').iterdir()), [])
-        self.assertEqual(list((self.files / 'a' / 'a' / 'a').iterdir()), [])
-
-    def test_spec_path_is(self):
-        self.assertFalse(self.files.is_file())
-        self.assertFalse(self.files.is_dir())
-
-    def test_child_path_is(self):
-        self.assertTrue((self.files / 'a').is_file())
-        self.assertFalse((self.files / 'a').is_dir())
-
-    def test_orphan_path_is(self):
-        self.assertFalse((self.files / 'a' / 'a').is_file())
-        self.assertFalse((self.files / 'a' / 'a').is_dir())
-        self.assertFalse((self.files / 'a' / 'a' / 'a').is_file())
-        self.assertFalse((self.files / 'a' / 'a' / 'a').is_dir())
-
-    def test_spec_path_name(self):
-        self.assertEqual(self.files.name, 'testingpackage')
-
-    def test_child_path_name(self):
-        self.assertEqual((self.files / 'a').name, 'a')
-
-    def test_orphan_path_name(self):
-        self.assertEqual((self.files / 'a' / 'b').name, 'b')
-        self.assertEqual((self.files / 'a' / 'b' / 'c').name, 'c')
-
-    def test_spec_path_open(self):
-        self.assertEqual(self.files.read_bytes(), b'Hello, world!')
-        self.assertEqual(self.files.read_text(encoding='utf-8'), 'Hello, world!')
-
-    def test_child_path_open(self):
-        self.assertEqual((self.files / 'a').read_bytes(), b'Hello, world!')
-        self.assertEqual(
-            (self.files / 'a').read_text(encoding='utf-8'), 'Hello, world!'
-        )
-
-    def test_orphan_path_open(self):
-        with self.assertRaises(FileNotFoundError):
-            (self.files / 'a' / 'b').read_bytes()
-        with self.assertRaises(FileNotFoundError):
-            (self.files / 'a' / 'b' / 'c').read_bytes()
-
-    def test_open_invalid_mode(self):
-        with self.assertRaises(ValueError):
-            self.files.open('0')
-
-    def test_orphan_path_invalid(self):
-        with self.assertRaises(ValueError):
-            CompatibilityFiles.OrphanPath()
-
-    def test_wrap_spec(self):
-        spec = wrap_spec(self.package)
-        self.assertIsInstance(spec.loader.get_resource_reader(None), CompatibilityFiles)
-
-
-class CompatibilityFilesNoReaderTests(unittest.TestCase):
-    @property
-    def package(self):
-        return util.create_package_from_loader(None)
-
-    @property
-    def files(self):
-        return resources.files(self.package)
-
-    def test_spec_path_joinpath(self):
-        self.assertIsInstance(self.files / 'a', CompatibilityFiles.OrphanPath)
diff --git a/lib/importlib_resources/tests/test_contents.py b/lib/importlib_resources/tests/test_contents.py
deleted file mode 100644
index 741a7407..00000000
--- a/lib/importlib_resources/tests/test_contents.py
+++ /dev/null
@@ -1,38 +0,0 @@
-import unittest
-import importlib_resources as resources
-
-from . import util
-
-
-class ContentsTests:
-    expected = {
-        '__init__.py',
-        'binary.file',
-        'subdirectory',
-        'utf-16.file',
-        'utf-8.file',
-    }
-
-    def test_contents(self):
-        contents = {path.name for path in resources.files(self.data).iterdir()}
-        assert self.expected <= contents
-
-
-class ContentsDiskTests(ContentsTests, util.DiskSetup, unittest.TestCase):
-    pass
-
-
-class ContentsZipTests(ContentsTests, util.ZipSetup, unittest.TestCase):
-    pass
-
-
-class ContentsNamespaceTests(ContentsTests, util.DiskSetup, unittest.TestCase):
-    MODULE = 'namespacedata01'
-
-    expected = {
-        # no __init__ because of namespace design
-        'binary.file',
-        'subdirectory',
-        'utf-16.file',
-        'utf-8.file',
-    }
diff --git a/lib/importlib_resources/tests/test_custom.py b/lib/importlib_resources/tests/test_custom.py
deleted file mode 100644
index 86c65676..00000000
--- a/lib/importlib_resources/tests/test_custom.py
+++ /dev/null
@@ -1,47 +0,0 @@
-import unittest
-import contextlib
-import pathlib
-
-import importlib_resources as resources
-from .. import abc
-from ..abc import TraversableResources, ResourceReader
-from . import util
-from .compat.py39 import os_helper
-
-
-class SimpleLoader:
-    """
-    A simple loader that only implements a resource reader.
-    """
-
-    def __init__(self, reader: ResourceReader):
-        self.reader = reader
-
-    def get_resource_reader(self, package):
-        return self.reader
-
-
-class MagicResources(TraversableResources):
-    """
-    Magically returns the resources at path.
-    """
-
-    def __init__(self, path: pathlib.Path):
-        self.path = path
-
-    def files(self):
-        return self.path
-
-
-class CustomTraversableResourcesTests(unittest.TestCase):
-    def setUp(self):
-        self.fixtures = contextlib.ExitStack()
-        self.addCleanup(self.fixtures.close)
-
-    def test_custom_loader(self):
-        temp_dir = pathlib.Path(self.fixtures.enter_context(os_helper.temp_dir()))
-        loader = SimpleLoader(MagicResources(temp_dir))
-        pkg = util.create_package_from_loader(loader)
-        files = resources.files(pkg)
-        assert isinstance(files, abc.Traversable)
-        assert list(files.iterdir()) == []
diff --git a/lib/importlib_resources/tests/test_files.py b/lib/importlib_resources/tests/test_files.py
deleted file mode 100644
index f1fe2337..00000000
--- a/lib/importlib_resources/tests/test_files.py
+++ /dev/null
@@ -1,194 +0,0 @@
-import os
-import pathlib
-import py_compile
-import shutil
-import textwrap
-import unittest
-import warnings
-import importlib
-import contextlib
-
-import importlib_resources as resources
-from ..abc import Traversable
-from . import util
-from .compat.py39 import os_helper, import_helper
-
-
-@contextlib.contextmanager
-def suppress_known_deprecation():
-    with warnings.catch_warnings(record=True) as ctx:
-        warnings.simplefilter('default', category=DeprecationWarning)
-        yield ctx
-
-
-class FilesTests:
-    def test_read_bytes(self):
-        files = resources.files(self.data)
-        actual = files.joinpath('utf-8.file').read_bytes()
-        assert actual == b'Hello, UTF-8 world!\n'
-
-    def test_read_text(self):
-        files = resources.files(self.data)
-        actual = files.joinpath('utf-8.file').read_text(encoding='utf-8')
-        assert actual == 'Hello, UTF-8 world!\n'
-
-    def test_traversable(self):
-        assert isinstance(resources.files(self.data), Traversable)
-
-    def test_joinpath_with_multiple_args(self):
-        files = resources.files(self.data)
-        binfile = files.joinpath('subdirectory', 'binary.file')
-        self.assertTrue(binfile.is_file())
-
-    def test_old_parameter(self):
-        """
-        Files used to take a 'package' parameter. Make sure anyone
-        passing by name is still supported.
-        """
-        with suppress_known_deprecation():
-            resources.files(package=self.data)
-
-
-class OpenDiskTests(FilesTests, util.DiskSetup, unittest.TestCase):
-    pass
-
-
-class OpenZipTests(FilesTests, util.ZipSetup, unittest.TestCase):
-    pass
-
-
-class OpenNamespaceTests(FilesTests, util.DiskSetup, unittest.TestCase):
-    MODULE = 'namespacedata01'
-
-    def test_non_paths_in_dunder_path(self):
-        """
-        Non-path items in a namespace package's ``__path__`` are ignored.
-
-        As reported in python/importlib_resources#311, some tools
-        like Setuptools, when creating editable packages, will inject
-        non-paths into a namespace package's ``__path__``, a
-        sentinel like
-        ``__editable__.sample_namespace-1.0.finder.__path_hook__``
-        to cause the ``PathEntryFinder`` to be called when searching
-        for packages. In that case, resources should still be loadable.
-        """
-        import namespacedata01
-
-        namespacedata01.__path__.append(
-            '__editable__.sample_namespace-1.0.finder.__path_hook__'
-        )
-
-        resources.files(namespacedata01)
-
-
-class OpenNamespaceZipTests(FilesTests, util.ZipSetup, unittest.TestCase):
-    ZIP_MODULE = 'namespacedata01'
-
-
-class DirectSpec:
-    """
-    Override behavior of ModuleSetup to write a full spec directly.
-    """
-
-    MODULE = 'unused'
-
-    def load_fixture(self, name):
-        self.tree_on_path(self.spec)
-
-
-class ModulesFiles:
-    spec = {
-        'mod.py': '',
-        'res.txt': 'resources are the best',
-    }
-
-    def test_module_resources(self):
-        """
-        A module can have resources found adjacent to the module.
-        """
-        import mod  # type: ignore[import-not-found]
-
-        actual = resources.files(mod).joinpath('res.txt').read_text(encoding='utf-8')
-        assert actual == self.spec['res.txt']
-
-
-class ModuleFilesDiskTests(DirectSpec, util.DiskSetup, ModulesFiles, unittest.TestCase):
-    pass
-
-
-class ModuleFilesZipTests(DirectSpec, util.ZipSetup, ModulesFiles, unittest.TestCase):
-    pass
-
-
-class ImplicitContextFiles:
-    set_val = textwrap.dedent(
-        f"""
-        import {resources.__name__} as res
-        val = res.files().joinpath('res.txt').read_text(encoding='utf-8')
-        """
-    )
-    spec = {
-        'somepkg': {
-            '__init__.py': set_val,
-            'submod.py': set_val,
-            'res.txt': 'resources are the best',
-        },
-        'frozenpkg': {
-            '__init__.py': set_val.replace(resources.__name__, 'c_resources'),
-            'res.txt': 'resources are the best',
-        },
-    }
-
-    def test_implicit_files_package(self):
-        """
-        Without any parameter, files() will infer the location as the caller.
-        """
-        assert importlib.import_module('somepkg').val == 'resources are the best'
-
-    def test_implicit_files_submodule(self):
-        """
-        Without any parameter, files() will infer the location as the caller.
-        """
-        assert importlib.import_module('somepkg.submod').val == 'resources are the best'
-
-    def _compile_importlib(self):
-        """
-        Make a compiled-only copy of the importlib resources package.
-        """
-        bin_site = self.fixtures.enter_context(os_helper.temp_dir())
-        c_resources = pathlib.Path(bin_site, 'c_resources')
-        sources = pathlib.Path(resources.__file__).parent
-        shutil.copytree(sources, c_resources, ignore=lambda *_: ['__pycache__'])
-
-        for dirpath, _, filenames in os.walk(c_resources):
-            for filename in filenames:
-                source_path = pathlib.Path(dirpath) / filename
-                cfile = source_path.with_suffix('.pyc')
-                py_compile.compile(source_path, cfile)
-                pathlib.Path.unlink(source_path)
-        self.fixtures.enter_context(import_helper.DirsOnSysPath(bin_site))
-
-    def test_implicit_files_with_compiled_importlib(self):
-        """
-        Caller detection works for compiled-only resources module.
-
-        python/cpython#123085
-        """
-        self._compile_importlib()
-        assert importlib.import_module('frozenpkg').val == 'resources are the best'
-
-
-class ImplicitContextFilesDiskTests(
-    DirectSpec, util.DiskSetup, ImplicitContextFiles, unittest.TestCase
-):
-    pass
-
-
-class ImplicitContextFilesZipTests(
-    DirectSpec, util.ZipSetup, ImplicitContextFiles, unittest.TestCase
-):
-    pass
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/lib/importlib_resources/tests/test_functional.py b/lib/importlib_resources/tests/test_functional.py
deleted file mode 100644
index 1851edfb..00000000
--- a/lib/importlib_resources/tests/test_functional.py
+++ /dev/null
@@ -1,255 +0,0 @@
-import unittest
-import os
-import importlib
-
-from .compat.py39 import warnings_helper
-
-import importlib_resources as resources
-
-from . import util
-
-# Since the functional API forwards to Traversable, we only test
-# filesystem resources here -- not zip files, namespace packages etc.
-# We do test for two kinds of Anchor, though.
-
-
-class StringAnchorMixin:
-    anchor01 = 'data01'
-    anchor02 = 'data02'
-
-
-class ModuleAnchorMixin:
-    @property
-    def anchor01(self):
-        return importlib.import_module('data01')
-
-    @property
-    def anchor02(self):
-        return importlib.import_module('data02')
-
-
-class FunctionalAPIBase(util.DiskSetup):
-    def setUp(self):
-        super().setUp()
-        self.load_fixture('data02')
-
-    def _gen_resourcetxt_path_parts(self):
-        """Yield various names of a text file in anchor02, each in a subTest"""
-        for path_parts in (
-            ('subdirectory', 'subsubdir', 'resource.txt'),
-            ('subdirectory/subsubdir/resource.txt',),
-            ('subdirectory/subsubdir', 'resource.txt'),
-        ):
-            with self.subTest(path_parts=path_parts):
-                yield path_parts
-
-    def assertEndsWith(self, string, suffix):
-        """Assert that `string` ends with `suffix`.
-
-        Used to ignore an architecture-specific UTF-16 byte-order mark."""
-        self.assertEqual(string[-len(suffix) :], suffix)
-
-    def test_read_text(self):
-        self.assertEqual(
-            resources.read_text(self.anchor01, 'utf-8.file'),
-            'Hello, UTF-8 world!\n',
-        )
-        self.assertEqual(
-            resources.read_text(
-                self.anchor02,
-                'subdirectory',
-                'subsubdir',
-                'resource.txt',
-                encoding='utf-8',
-            ),
-            'a resource',
-        )
-        for path_parts in self._gen_resourcetxt_path_parts():
-            self.assertEqual(
-                resources.read_text(
-                    self.anchor02,
-                    *path_parts,
-                    encoding='utf-8',
-                ),
-                'a resource',
-            )
-        # Use generic OSError, since e.g. attempting to read a directory can
-        # fail with PermissionError rather than IsADirectoryError
-        with self.assertRaises(OSError):
-            resources.read_text(self.anchor01)
-        with self.assertRaises(OSError):
-            resources.read_text(self.anchor01, 'no-such-file')
-        with self.assertRaises(UnicodeDecodeError):
-            resources.read_text(self.anchor01, 'utf-16.file')
-        self.assertEqual(
-            resources.read_text(
-                self.anchor01,
-                'binary.file',
-                encoding='latin1',
-            ),
-            '\x00\x01\x02\x03',
-        )
-        self.assertEndsWith(  # ignore the BOM
-            resources.read_text(
-                self.anchor01,
-                'utf-16.file',
-                errors='backslashreplace',
-            ),
-            'Hello, UTF-16 world!\n'.encode('utf-16-le').decode(
-                errors='backslashreplace',
-            ),
-        )
-
-    def test_read_binary(self):
-        self.assertEqual(
-            resources.read_binary(self.anchor01, 'utf-8.file'),
-            b'Hello, UTF-8 world!\n',
-        )
-        for path_parts in self._gen_resourcetxt_path_parts():
-            self.assertEqual(
-                resources.read_binary(self.anchor02, *path_parts),
-                b'a resource',
-            )
-
-    def test_open_text(self):
-        with resources.open_text(self.anchor01, 'utf-8.file') as f:
-            self.assertEqual(f.read(), 'Hello, UTF-8 world!\n')
-        for path_parts in self._gen_resourcetxt_path_parts():
-            with resources.open_text(
-                self.anchor02,
-                *path_parts,
-                encoding='utf-8',
-            ) as f:
-                self.assertEqual(f.read(), 'a resource')
-        # Use generic OSError, since e.g. attempting to read a directory can
-        # fail with PermissionError rather than IsADirectoryError
-        with self.assertRaises(OSError):
-            resources.open_text(self.anchor01)
-        with self.assertRaises(OSError):
-            resources.open_text(self.anchor01, 'no-such-file')
-        with resources.open_text(self.anchor01, 'utf-16.file') as f:
-            with self.assertRaises(UnicodeDecodeError):
-                f.read()
-        with resources.open_text(
-            self.anchor01,
-            'binary.file',
-            encoding='latin1',
-        ) as f:
-            self.assertEqual(f.read(), '\x00\x01\x02\x03')
-        with resources.open_text(
-            self.anchor01,
-            'utf-16.file',
-            errors='backslashreplace',
-        ) as f:
-            self.assertEndsWith(  # ignore the BOM
-                f.read(),
-                'Hello, UTF-16 world!\n'.encode('utf-16-le').decode(
-                    errors='backslashreplace',
-                ),
-            )
-
-    def test_open_binary(self):
-        with resources.open_binary(self.anchor01, 'utf-8.file') as f:
-            self.assertEqual(f.read(), b'Hello, UTF-8 world!\n')
-        for path_parts in self._gen_resourcetxt_path_parts():
-            with resources.open_binary(
-                self.anchor02,
-                *path_parts,
-            ) as f:
-                self.assertEqual(f.read(), b'a resource')
-
-    def test_path(self):
-        with resources.path(self.anchor01, 'utf-8.file') as path:
-            with open(str(path), encoding='utf-8') as f:
-                self.assertEqual(f.read(), 'Hello, UTF-8 world!\n')
-        with resources.path(self.anchor01) as path:
-            with open(os.path.join(path, 'utf-8.file'), encoding='utf-8') as f:
-                self.assertEqual(f.read(), 'Hello, UTF-8 world!\n')
-
-    def test_is_resource(self):
-        is_resource = resources.is_resource
-        self.assertTrue(is_resource(self.anchor01, 'utf-8.file'))
-        self.assertFalse(is_resource(self.anchor01, 'no_such_file'))
-        self.assertFalse(is_resource(self.anchor01))
-        self.assertFalse(is_resource(self.anchor01, 'subdirectory'))
-        for path_parts in self._gen_resourcetxt_path_parts():
-            self.assertTrue(is_resource(self.anchor02, *path_parts))
-
-    def test_contents(self):
-        with warnings_helper.check_warnings((".*contents.*", DeprecationWarning)):
-            c = resources.contents(self.anchor01)
-        self.assertGreaterEqual(
-            set(c),
-            {'utf-8.file', 'utf-16.file', 'binary.file', 'subdirectory'},
-        )
-        with self.assertRaises(OSError), warnings_helper.check_warnings((
-            ".*contents.*",
-            DeprecationWarning,
-        )):
-            list(resources.contents(self.anchor01, 'utf-8.file'))
-
-        for path_parts in self._gen_resourcetxt_path_parts():
-            with self.assertRaises(OSError), warnings_helper.check_warnings((
-                ".*contents.*",
-                DeprecationWarning,
-            )):
-                list(resources.contents(self.anchor01, *path_parts))
-        with warnings_helper.check_warnings((".*contents.*", DeprecationWarning)):
-            c = resources.contents(self.anchor01, 'subdirectory')
-        self.assertGreaterEqual(
-            set(c),
-            {'binary.file'},
-        )
-
-    @warnings_helper.ignore_warnings(category=DeprecationWarning)
-    def test_common_errors(self):
-        for func in (
-            resources.read_text,
-            resources.read_binary,
-            resources.open_text,
-            resources.open_binary,
-            resources.path,
-            resources.is_resource,
-            resources.contents,
-        ):
-            with self.subTest(func=func):
-                # Rejecting None anchor
-                with self.assertRaises(TypeError):
-                    func(None)
-                # Rejecting invalid anchor type
-                with self.assertRaises((TypeError, AttributeError)):
-                    func(1234)
-                # Unknown module
-                with self.assertRaises(ModuleNotFoundError):
-                    func('$missing module$')
-
-    def test_text_errors(self):
-        for func in (
-            resources.read_text,
-            resources.open_text,
-        ):
-            with self.subTest(func=func):
-                # Multiple path arguments need explicit encoding argument.
-                with self.assertRaises(TypeError):
-                    func(
-                        self.anchor02,
-                        'subdirectory',
-                        'subsubdir',
-                        'resource.txt',
-                    )
-
-
-class FunctionalAPITest_StringAnchor(
-    StringAnchorMixin,
-    FunctionalAPIBase,
-    unittest.TestCase,
-):
-    pass
-
-
-class FunctionalAPITest_ModuleAnchor(
-    ModuleAnchorMixin,
-    FunctionalAPIBase,
-    unittest.TestCase,
-):
-    pass
diff --git a/lib/importlib_resources/tests/test_open.py b/lib/importlib_resources/tests/test_open.py
deleted file mode 100644
index c40bb8c6..00000000
--- a/lib/importlib_resources/tests/test_open.py
+++ /dev/null
@@ -1,84 +0,0 @@
-import unittest
-
-import importlib_resources as resources
-from . import util
-
-
-class CommonBinaryTests(util.CommonTests, unittest.TestCase):
-    def execute(self, package, path):
-        target = resources.files(package).joinpath(path)
-        with target.open('rb'):
-            pass
-
-
-class CommonTextTests(util.CommonTests, unittest.TestCase):
-    def execute(self, package, path):
-        target = resources.files(package).joinpath(path)
-        with target.open(encoding='utf-8'):
-            pass
-
-
-class OpenTests:
-    def test_open_binary(self):
-        target = resources.files(self.data) / 'binary.file'
-        with target.open('rb') as fp:
-            result = fp.read()
-            self.assertEqual(result, bytes(range(4)))
-
-    def test_open_text_default_encoding(self):
-        target = resources.files(self.data) / 'utf-8.file'
-        with target.open(encoding='utf-8') as fp:
-            result = fp.read()
-            self.assertEqual(result, 'Hello, UTF-8 world!\n')
-
-    def test_open_text_given_encoding(self):
-        target = resources.files(self.data) / 'utf-16.file'
-        with target.open(encoding='utf-16', errors='strict') as fp:
-            result = fp.read()
-        self.assertEqual(result, 'Hello, UTF-16 world!\n')
-
-    def test_open_text_with_errors(self):
-        """
-        Raises UnicodeError without the 'errors' argument.
-        """
-        target = resources.files(self.data) / 'utf-16.file'
-        with target.open(encoding='utf-8', errors='strict') as fp:
-            self.assertRaises(UnicodeError, fp.read)
-        with target.open(encoding='utf-8', errors='ignore') as fp:
-            result = fp.read()
-        self.assertEqual(
-            result,
-            'H\x00e\x00l\x00l\x00o\x00,\x00 '
-            '\x00U\x00T\x00F\x00-\x001\x006\x00 '
-            '\x00w\x00o\x00r\x00l\x00d\x00!\x00\n\x00',
-        )
-
-    def test_open_binary_FileNotFoundError(self):
-        target = resources.files(self.data) / 'does-not-exist'
-        with self.assertRaises(FileNotFoundError):
-            target.open('rb')
-
-    def test_open_text_FileNotFoundError(self):
-        target = resources.files(self.data) / 'does-not-exist'
-        with self.assertRaises(FileNotFoundError):
-            target.open(encoding='utf-8')
-
-
-class OpenDiskTests(OpenTests, util.DiskSetup, unittest.TestCase):
-    pass
-
-
-class OpenDiskNamespaceTests(OpenTests, util.DiskSetup, unittest.TestCase):
-    MODULE = 'namespacedata01'
-
-
-class OpenZipTests(OpenTests, util.ZipSetup, unittest.TestCase):
-    pass
-
-
-class OpenNamespaceZipTests(OpenTests, util.ZipSetup, unittest.TestCase):
-    MODULE = 'namespacedata01'
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/lib/importlib_resources/tests/test_path.py b/lib/importlib_resources/tests/test_path.py
deleted file mode 100644
index 1e30f2bc..00000000
--- a/lib/importlib_resources/tests/test_path.py
+++ /dev/null
@@ -1,62 +0,0 @@
-import io
-import pathlib
-import unittest
-
-import importlib_resources as resources
-from . import util
-
-
-class CommonTests(util.CommonTests, unittest.TestCase):
-    def execute(self, package, path):
-        with resources.as_file(resources.files(package).joinpath(path)):
-            pass
-
-
-class PathTests:
-    def test_reading(self):
-        """
-        Path should be readable and a pathlib.Path instance.
-        """
-        target = resources.files(self.data) / 'utf-8.file'
-        with resources.as_file(target) as path:
-            self.assertIsInstance(path, pathlib.Path)
-            self.assertTrue(path.name.endswith("utf-8.file"), repr(path))
-            self.assertEqual('Hello, UTF-8 world!\n', path.read_text(encoding='utf-8'))
-
-
-class PathDiskTests(PathTests, util.DiskSetup, unittest.TestCase):
-    def test_natural_path(self):
-        """
-        Guarantee the internal implementation detail that
-        file-system-backed resources do not get the tempdir
-        treatment.
-        """
-        target = resources.files(self.data) / 'utf-8.file'
-        with resources.as_file(target) as path:
-            assert 'data' in str(path)
-
-
-class PathMemoryTests(PathTests, unittest.TestCase):
-    def setUp(self):
-        file = io.BytesIO(b'Hello, UTF-8 world!\n')
-        self.addCleanup(file.close)
-        self.data = util.create_package(
-            file=file, path=FileNotFoundError("package exists only in memory")
-        )
-        self.data.__spec__.origin = None
-        self.data.__spec__.has_location = False
-
-
-class PathZipTests(PathTests, util.ZipSetup, unittest.TestCase):
-    def test_remove_in_context_manager(self):
-        """
-        It is not an error if the file that was temporarily stashed on the
-        file system is removed inside the `with` stanza.
-        """
-        target = resources.files(self.data) / 'utf-8.file'
-        with resources.as_file(target) as path:
-            path.unlink()
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/lib/importlib_resources/tests/test_read.py b/lib/importlib_resources/tests/test_read.py
deleted file mode 100644
index 6780a2d1..00000000
--- a/lib/importlib_resources/tests/test_read.py
+++ /dev/null
@@ -1,93 +0,0 @@
-import unittest
-import importlib_resources as resources
-
-from . import util
-from importlib import import_module
-
-
-class CommonBinaryTests(util.CommonTests, unittest.TestCase):
-    def execute(self, package, path):
-        resources.files(package).joinpath(path).read_bytes()
-
-
-class CommonTextTests(util.CommonTests, unittest.TestCase):
-    def execute(self, package, path):
-        resources.files(package).joinpath(path).read_text(encoding='utf-8')
-
-
-class ReadTests:
-    def test_read_bytes(self):
-        result = resources.files(self.data).joinpath('binary.file').read_bytes()
-        self.assertEqual(result, bytes(range(4)))
-
-    def test_read_text_default_encoding(self):
-        result = (
-            resources.files(self.data)
-            .joinpath('utf-8.file')
-            .read_text(encoding='utf-8')
-        )
-        self.assertEqual(result, 'Hello, UTF-8 world!\n')
-
-    def test_read_text_given_encoding(self):
-        result = (
-            resources.files(self.data)
-            .joinpath('utf-16.file')
-            .read_text(encoding='utf-16')
-        )
-        self.assertEqual(result, 'Hello, UTF-16 world!\n')
-
-    def test_read_text_with_errors(self):
-        """
-        Raises UnicodeError without the 'errors' argument.
-        """
-        target = resources.files(self.data) / 'utf-16.file'
-        self.assertRaises(UnicodeError, target.read_text, encoding='utf-8')
-        result = target.read_text(encoding='utf-8', errors='ignore')
-        self.assertEqual(
-            result,
-            'H\x00e\x00l\x00l\x00o\x00,\x00 '
-            '\x00U\x00T\x00F\x00-\x001\x006\x00 '
-            '\x00w\x00o\x00r\x00l\x00d\x00!\x00\n\x00',
-        )
-
-
-class ReadDiskTests(ReadTests, util.DiskSetup, unittest.TestCase):
-    pass
-
-
-class ReadZipTests(ReadTests, util.ZipSetup, unittest.TestCase):
-    def test_read_submodule_resource(self):
-        submodule = import_module('data01.subdirectory')
-        result = resources.files(submodule).joinpath('binary.file').read_bytes()
-        self.assertEqual(result, bytes(range(4, 8)))
-
-    def test_read_submodule_resource_by_name(self):
-        result = (
-            resources.files('data01.subdirectory').joinpath('binary.file').read_bytes()
-        )
-        self.assertEqual(result, bytes(range(4, 8)))
-
-
-class ReadNamespaceTests(ReadTests, util.DiskSetup, unittest.TestCase):
-    MODULE = 'namespacedata01'
-
-
-class ReadNamespaceZipTests(ReadTests, util.ZipSetup, unittest.TestCase):
-    MODULE = 'namespacedata01'
-
-    def test_read_submodule_resource(self):
-        submodule = import_module('namespacedata01.subdirectory')
-        result = resources.files(submodule).joinpath('binary.file').read_bytes()
-        self.assertEqual(result, bytes(range(12, 16)))
-
-    def test_read_submodule_resource_by_name(self):
-        result = (
-            resources.files('namespacedata01.subdirectory')
-            .joinpath('binary.file')
-            .read_bytes()
-        )
-        self.assertEqual(result, bytes(range(12, 16)))
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/lib/importlib_resources/tests/test_reader.py b/lib/importlib_resources/tests/test_reader.py
deleted file mode 100644
index 0a77eb40..00000000
--- a/lib/importlib_resources/tests/test_reader.py
+++ /dev/null
@@ -1,137 +0,0 @@
-import os.path
-import pathlib
-import unittest
-
-from importlib import import_module
-from importlib_resources.readers import MultiplexedPath, NamespaceReader
-
-from . import util
-
-
-class MultiplexedPathTest(util.DiskSetup, unittest.TestCase):
-    MODULE = 'namespacedata01'
-
-    def setUp(self):
-        super().setUp()
-        self.folder = pathlib.Path(self.data.__path__[0])
-        self.data01 = pathlib.Path(self.load_fixture('data01').__file__).parent
-        self.data02 = pathlib.Path(self.load_fixture('data02').__file__).parent
-
-    def test_init_no_paths(self):
-        with self.assertRaises(FileNotFoundError):
-            MultiplexedPath()
-
-    def test_init_file(self):
-        with self.assertRaises(NotADirectoryError):
-            MultiplexedPath(self.folder / 'binary.file')
-
-    def test_iterdir(self):
-        contents = {path.name for path in MultiplexedPath(self.folder).iterdir()}
-        try:
-            contents.remove('__pycache__')
-        except (KeyError, ValueError):
-            pass
-        self.assertEqual(
-            contents, {'subdirectory', 'binary.file', 'utf-16.file', 'utf-8.file'}
-        )
-
-    def test_iterdir_duplicate(self):
-        contents = {
-            path.name for path in MultiplexedPath(self.folder, self.data01).iterdir()
-        }
-        for remove in ('__pycache__', '__init__.pyc'):
-            try:
-                contents.remove(remove)
-            except (KeyError, ValueError):
-                pass
-        self.assertEqual(
-            contents,
-            {'__init__.py', 'binary.file', 'subdirectory', 'utf-16.file', 'utf-8.file'},
-        )
-
-    def test_is_dir(self):
-        self.assertEqual(MultiplexedPath(self.folder).is_dir(), True)
-
-    def test_is_file(self):
-        self.assertEqual(MultiplexedPath(self.folder).is_file(), False)
-
-    def test_open_file(self):
-        path = MultiplexedPath(self.folder)
-        with self.assertRaises(FileNotFoundError):
-            path.read_bytes()
-        with self.assertRaises(FileNotFoundError):
-            path.read_text()
-        with self.assertRaises(FileNotFoundError):
-            path.open()
-
-    def test_join_path(self):
-        prefix = str(self.folder.parent)
-        path = MultiplexedPath(self.folder, self.data01)
-        self.assertEqual(
-            str(path.joinpath('binary.file'))[len(prefix) + 1 :],
-            os.path.join('namespacedata01', 'binary.file'),
-        )
-        sub = path.joinpath('subdirectory')
-        assert isinstance(sub, MultiplexedPath)
-        assert 'namespacedata01' in str(sub)
-        assert 'data01' in str(sub)
-        self.assertEqual(
-            str(path.joinpath('imaginary'))[len(prefix) + 1 :],
-            os.path.join('namespacedata01', 'imaginary'),
-        )
-        self.assertEqual(path.joinpath(), path)
-
-    def test_join_path_compound(self):
-        path = MultiplexedPath(self.folder)
-        assert not path.joinpath('imaginary/foo.py').exists()
-
-    def test_join_path_common_subdir(self):
-        prefix = str(self.data02.parent)
-        path = MultiplexedPath(self.data01, self.data02)
-        self.assertIsInstance(path.joinpath('subdirectory'), MultiplexedPath)
-        self.assertEqual(
-            str(path.joinpath('subdirectory', 'subsubdir'))[len(prefix) + 1 :],
-            os.path.join('data02', 'subdirectory', 'subsubdir'),
-        )
-
-    def test_repr(self):
-        self.assertEqual(
-            repr(MultiplexedPath(self.folder)),
-            f"MultiplexedPath('{self.folder}')",
-        )
-
-    def test_name(self):
-        self.assertEqual(
-            MultiplexedPath(self.folder).name,
-            os.path.basename(self.folder),
-        )
-
-
-class NamespaceReaderTest(util.DiskSetup, unittest.TestCase):
-    MODULE = 'namespacedata01'
-
-    def test_init_error(self):
-        with self.assertRaises(ValueError):
-            NamespaceReader(['path1', 'path2'])
-
-    def test_resource_path(self):
-        namespacedata01 = import_module('namespacedata01')
-        reader = NamespaceReader(namespacedata01.__spec__.submodule_search_locations)
-
-        root = self.data.__path__[0]
-        self.assertEqual(
-            reader.resource_path('binary.file'), os.path.join(root, 'binary.file')
-        )
-        self.assertEqual(
-            reader.resource_path('imaginary'), os.path.join(root, 'imaginary')
-        )
-
-    def test_files(self):
-        reader = NamespaceReader(self.data.__spec__.submodule_search_locations)
-        root = self.data.__path__[0]
-        self.assertIsInstance(reader.files(), MultiplexedPath)
-        self.assertEqual(repr(reader.files()), f"MultiplexedPath('{root}')")
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/lib/importlib_resources/tests/test_resource.py b/lib/importlib_resources/tests/test_resource.py
deleted file mode 100644
index a0da6a35..00000000
--- a/lib/importlib_resources/tests/test_resource.py
+++ /dev/null
@@ -1,237 +0,0 @@
-import unittest
-import importlib_resources as resources
-
-from . import util
-from importlib import import_module
-
-
-class ResourceTests:
-    # Subclasses are expected to set the `data` attribute.
-
-    def test_is_file_exists(self):
-        target = resources.files(self.data) / 'binary.file'
-        self.assertTrue(target.is_file())
-
-    def test_is_file_missing(self):
-        target = resources.files(self.data) / 'not-a-file'
-        self.assertFalse(target.is_file())
-
-    def test_is_dir(self):
-        target = resources.files(self.data) / 'subdirectory'
-        self.assertFalse(target.is_file())
-        self.assertTrue(target.is_dir())
-
-
-class ResourceDiskTests(ResourceTests, util.DiskSetup, unittest.TestCase):
-    pass
-
-
-class ResourceZipTests(ResourceTests, util.ZipSetup, unittest.TestCase):
-    pass
-
-
-def names(traversable):
-    return {item.name for item in traversable.iterdir()}
-
-
-class ResourceLoaderTests(util.DiskSetup, unittest.TestCase):
-    def test_resource_contents(self):
-        package = util.create_package(
-            file=self.data, path=self.data.__file__, contents=['A', 'B', 'C']
-        )
-        self.assertEqual(names(resources.files(package)), {'A', 'B', 'C'})
-
-    def test_is_file(self):
-        package = util.create_package(
-            file=self.data,
-            path=self.data.__file__,
-            contents=['A', 'B', 'C', 'D/E', 'D/F'],
-        )
-        self.assertTrue(resources.files(package).joinpath('B').is_file())
-
-    def test_is_dir(self):
-        package = util.create_package(
-            file=self.data,
-            path=self.data.__file__,
-            contents=['A', 'B', 'C', 'D/E', 'D/F'],
-        )
-        self.assertTrue(resources.files(package).joinpath('D').is_dir())
-
-    def test_resource_missing(self):
-        package = util.create_package(
-            file=self.data,
-            path=self.data.__file__,
-            contents=['A', 'B', 'C', 'D/E', 'D/F'],
-        )
-        self.assertFalse(resources.files(package).joinpath('Z').is_file())
-
-
-class ResourceCornerCaseTests(util.DiskSetup, unittest.TestCase):
-    def test_package_has_no_reader_fallback(self):
-        """
-        Test odd ball packages which:
-        # 1. Do not have a ResourceReader as a loader
-        # 2. Are not on the file system
-        # 3. Are not in a zip file
-        """
-        module = util.create_package(
-            file=self.data, path=self.data.__file__, contents=['A', 'B', 'C']
-        )
-        # Give the module a dummy loader.
-        module.__loader__ = object()
-        # Give the module a dummy origin.
-        module.__file__ = '/path/which/shall/not/be/named'
-        module.__spec__.loader = module.__loader__
-        module.__spec__.origin = module.__file__
-        self.assertFalse(resources.files(module).joinpath('A').is_file())
-
-
-class ResourceFromZipsTest01(util.ZipSetup, unittest.TestCase):
-    def test_is_submodule_resource(self):
-        submodule = import_module('data01.subdirectory')
-        self.assertTrue(resources.files(submodule).joinpath('binary.file').is_file())
-
-    def test_read_submodule_resource_by_name(self):
-        self.assertTrue(
-            resources.files('data01.subdirectory').joinpath('binary.file').is_file()
-        )
-
-    def test_submodule_contents(self):
-        submodule = import_module('data01.subdirectory')
-        self.assertEqual(
-            names(resources.files(submodule)), {'__init__.py', 'binary.file'}
-        )
-
-    def test_submodule_contents_by_name(self):
-        self.assertEqual(
-            names(resources.files('data01.subdirectory')),
-            {'__init__.py', 'binary.file'},
-        )
-
-    def test_as_file_directory(self):
-        with resources.as_file(resources.files('data01')) as data:
-            assert data.name == 'data01'
-            assert data.is_dir()
-            assert data.joinpath('subdirectory').is_dir()
-            assert len(list(data.iterdir()))
-        assert not data.parent.exists()
-
-
-class ResourceFromZipsTest02(util.ZipSetup, unittest.TestCase):
-    MODULE = 'data02'
-
-    def test_unrelated_contents(self):
-        """
-        Test thata zip with two unrelated subpackages return
-        distinct resources. Ref python/importlib_resources#44.
-        """
-        self.assertEqual(
-            names(resources.files('data02.one')),
-            {'__init__.py', 'resource1.txt'},
-        )
-        self.assertEqual(
-            names(resources.files('data02.two')),
-            {'__init__.py', 'resource2.txt'},
-        )
-
-
-class DeletingZipsTest(util.ZipSetup, unittest.TestCase):
-    """Having accessed resources in a zip file should not keep an open
-    reference to the zip.
-    """
-
-    def test_iterdir_does_not_keep_open(self):
-        [item.name for item in resources.files('data01').iterdir()]
-
-    def test_is_file_does_not_keep_open(self):
-        resources.files('data01').joinpath('binary.file').is_file()
-
-    def test_is_file_failure_does_not_keep_open(self):
-        resources.files('data01').joinpath('not-present').is_file()
-
-    @unittest.skip("Desired but not supported.")
-    def test_as_file_does_not_keep_open(self):  # pragma: no cover
-        resources.as_file(resources.files('data01') / 'binary.file')
-
-    def test_entered_path_does_not_keep_open(self):
-        """
-        Mimic what certifi does on import to make its bundle
-        available for the process duration.
-        """
-        resources.as_file(resources.files('data01') / 'binary.file').__enter__()
-
-    def test_read_binary_does_not_keep_open(self):
-        resources.files('data01').joinpath('binary.file').read_bytes()
-
-    def test_read_text_does_not_keep_open(self):
-        resources.files('data01').joinpath('utf-8.file').read_text(encoding='utf-8')
-
-
-class ResourceFromNamespaceTests:
-    def test_is_submodule_resource(self):
-        self.assertTrue(
-            resources.files(import_module('namespacedata01'))
-            .joinpath('binary.file')
-            .is_file()
-        )
-
-    def test_read_submodule_resource_by_name(self):
-        self.assertTrue(
-            resources.files('namespacedata01').joinpath('binary.file').is_file()
-        )
-
-    def test_submodule_contents(self):
-        contents = names(resources.files(import_module('namespacedata01')))
-        try:
-            contents.remove('__pycache__')
-        except KeyError:
-            pass
-        self.assertEqual(
-            contents, {'subdirectory', 'binary.file', 'utf-8.file', 'utf-16.file'}
-        )
-
-    def test_submodule_contents_by_name(self):
-        contents = names(resources.files('namespacedata01'))
-        try:
-            contents.remove('__pycache__')
-        except KeyError:
-            pass
-        self.assertEqual(
-            contents, {'subdirectory', 'binary.file', 'utf-8.file', 'utf-16.file'}
-        )
-
-    def test_submodule_sub_contents(self):
-        contents = names(resources.files(import_module('namespacedata01.subdirectory')))
-        try:
-            contents.remove('__pycache__')
-        except KeyError:
-            pass
-        self.assertEqual(contents, {'binary.file'})
-
-    def test_submodule_sub_contents_by_name(self):
-        contents = names(resources.files('namespacedata01.subdirectory'))
-        try:
-            contents.remove('__pycache__')
-        except KeyError:
-            pass
-        self.assertEqual(contents, {'binary.file'})
-
-
-class ResourceFromNamespaceDiskTests(
-    util.DiskSetup,
-    ResourceFromNamespaceTests,
-    unittest.TestCase,
-):
-    MODULE = 'namespacedata01'
-
-
-class ResourceFromNamespaceZipTests(
-    util.ZipSetup,
-    ResourceFromNamespaceTests,
-    unittest.TestCase,
-):
-    MODULE = 'namespacedata01'
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/lib/importlib_resources/tests/util.py b/lib/importlib_resources/tests/util.py
deleted file mode 100644
index a4eafac3..00000000
--- a/lib/importlib_resources/tests/util.py
+++ /dev/null
@@ -1,206 +0,0 @@
-import abc
-import importlib
-import io
-import sys
-import types
-import pathlib
-import contextlib
-
-from ..abc import ResourceReader
-from .compat.py39 import import_helper, os_helper
-from . import zip as zip_
-from . import _path
-
-
-from importlib.machinery import ModuleSpec
-
-
-class Reader(ResourceReader):
-    def __init__(self, **kwargs):
-        vars(self).update(kwargs)
-
-    def get_resource_reader(self, package):
-        return self
-
-    def open_resource(self, path):
-        self._path = path
-        if isinstance(self.file, Exception):
-            raise self.file
-        return self.file
-
-    def resource_path(self, path_):
-        self._path = path_
-        if isinstance(self.path, Exception):
-            raise self.path
-        return self.path
-
-    def is_resource(self, path_):
-        self._path = path_
-        if isinstance(self.path, Exception):
-            raise self.path
-
-        def part(entry):
-            return entry.split('/')
-
-        return any(
-            len(parts) == 1 and parts[0] == path_ for parts in map(part, self._contents)
-        )
-
-    def contents(self):
-        if isinstance(self.path, Exception):
-            raise self.path
-        yield from self._contents
-
-
-def create_package_from_loader(loader, is_package=True):
-    name = 'testingpackage'
-    module = types.ModuleType(name)
-    spec = ModuleSpec(name, loader, origin='does-not-exist', is_package=is_package)
-    module.__spec__ = spec
-    module.__loader__ = loader
-    return module
-
-
-def create_package(file=None, path=None, is_package=True, contents=()):
-    return create_package_from_loader(
-        Reader(file=file, path=path, _contents=contents),
-        is_package,
-    )
-
-
-class CommonTestsBase(metaclass=abc.ABCMeta):
-    """
-    Tests shared by test_open, test_path, and test_read.
-    """
-
-    @abc.abstractmethod
-    def execute(self, package, path):
-        """
-        Call the pertinent legacy API function (e.g. open_text, path)
-        on package and path.
-        """
-
-    def test_package_name(self):
-        """
-        Passing in the package name should succeed.
-        """
-        self.execute(self.data.__name__, 'utf-8.file')
-
-    def test_package_object(self):
-        """
-        Passing in the package itself should succeed.
-        """
-        self.execute(self.data, 'utf-8.file')
-
-    def test_string_path(self):
-        """
-        Passing in a string for the path should succeed.
-        """
-        path = 'utf-8.file'
-        self.execute(self.data, path)
-
-    def test_pathlib_path(self):
-        """
-        Passing in a pathlib.PurePath object for the path should succeed.
-        """
-        path = pathlib.PurePath('utf-8.file')
-        self.execute(self.data, path)
-
-    def test_importing_module_as_side_effect(self):
-        """
-        The anchor package can already be imported.
-        """
-        del sys.modules[self.data.__name__]
-        self.execute(self.data.__name__, 'utf-8.file')
-
-    def test_missing_path(self):
-        """
-        Attempting to open or read or request the path for a
-        non-existent path should succeed if open_resource
-        can return a viable data stream.
-        """
-        bytes_data = io.BytesIO(b'Hello, world!')
-        package = create_package(file=bytes_data, path=FileNotFoundError())
-        self.execute(package, 'utf-8.file')
-        self.assertEqual(package.__loader__._path, 'utf-8.file')
-
-    def test_extant_path(self):
-        # Attempting to open or read or request the path when the
-        # path does exist should still succeed. Does not assert
-        # anything about the result.
-        bytes_data = io.BytesIO(b'Hello, world!')
-        # any path that exists
-        path = __file__
-        package = create_package(file=bytes_data, path=path)
-        self.execute(package, 'utf-8.file')
-        self.assertEqual(package.__loader__._path, 'utf-8.file')
-
-    def test_useless_loader(self):
-        package = create_package(file=FileNotFoundError(), path=FileNotFoundError())
-        with self.assertRaises(FileNotFoundError):
-            self.execute(package, 'utf-8.file')
-
-
-fixtures = dict(
-    data01={
-        '__init__.py': '',
-        'binary.file': bytes(range(4)),
-        'utf-16.file': 'Hello, UTF-16 world!\n'.encode('utf-16'),
-        'utf-8.file': 'Hello, UTF-8 world!\n'.encode('utf-8'),
-        'subdirectory': {
-            '__init__.py': '',
-            'binary.file': bytes(range(4, 8)),
-        },
-    },
-    data02={
-        '__init__.py': '',
-        'one': {'__init__.py': '', 'resource1.txt': 'one resource'},
-        'two': {'__init__.py': '', 'resource2.txt': 'two resource'},
-        'subdirectory': {'subsubdir': {'resource.txt': 'a resource'}},
-    },
-    namespacedata01={
-        'binary.file': bytes(range(4)),
-        'utf-16.file': 'Hello, UTF-16 world!\n'.encode('utf-16'),
-        'utf-8.file': 'Hello, UTF-8 world!\n'.encode('utf-8'),
-        'subdirectory': {
-            'binary.file': bytes(range(12, 16)),
-        },
-    },
-)
-
-
-class ModuleSetup:
-    def setUp(self):
-        self.fixtures = contextlib.ExitStack()
-        self.addCleanup(self.fixtures.close)
-
-        self.fixtures.enter_context(import_helper.isolated_modules())
-        self.data = self.load_fixture(self.MODULE)
-
-    def load_fixture(self, module):
-        self.tree_on_path({module: fixtures[module]})
-        return importlib.import_module(module)
-
-
-class ZipSetup(ModuleSetup):
-    MODULE = 'data01'
-
-    def tree_on_path(self, spec):
-        temp_dir = self.fixtures.enter_context(os_helper.temp_dir())
-        modules = pathlib.Path(temp_dir) / 'zipped modules.zip'
-        self.fixtures.enter_context(
-            import_helper.DirsOnSysPath(str(zip_.make_zip_file(spec, modules)))
-        )
-
-
-class DiskSetup(ModuleSetup):
-    MODULE = 'data01'
-
-    def tree_on_path(self, spec):
-        temp_dir = self.fixtures.enter_context(os_helper.temp_dir())
-        _path.build(spec, pathlib.Path(temp_dir))
-        self.fixtures.enter_context(import_helper.DirsOnSysPath(temp_dir))
-
-
-class CommonTests(DiskSetup, CommonTestsBase):
-    pass
diff --git a/lib/importlib_resources/tests/zip.py b/lib/importlib_resources/tests/zip.py
deleted file mode 100644
index 51ee5648..00000000
--- a/lib/importlib_resources/tests/zip.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""
-Generate zip test data files.
-"""
-
-import zipfile
-
-import zipp
-
-
-def make_zip_file(tree, dst):
-    """
-    Zip the files in tree into a new zipfile at dst.
-    """
-    with zipfile.ZipFile(dst, 'w') as zf:
-        for name, contents in walk(tree):
-            zf.writestr(name, contents)
-        zipp.CompleteDirs.inject(zf)
-    return dst
-
-
-def walk(tree, prefix=''):
-    for name, contents in tree.items():
-        if isinstance(contents, dict):
-            yield from walk(contents, prefix=f'{prefix}{name}/')
-        else:
-            yield f'{prefix}{name}', contents
diff --git a/lib/infi/__init__.py b/lib/infi/__init__.py
deleted file mode 100644
index 5284146e..00000000
--- a/lib/infi/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__import__("pkg_resources").declare_namespace(__name__)
diff --git a/lib/infi/systray/__init__.py b/lib/infi/systray/__init__.py
deleted file mode 100644
index 84cbf79a..00000000
--- a/lib/infi/systray/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-__import__("pkg_resources").declare_namespace(__name__)
-from .traybar import SysTrayIcon
diff --git a/lib/infi/systray/traybar.py b/lib/infi/systray/traybar.py
deleted file mode 100644
index 9dc588ca..00000000
--- a/lib/infi/systray/traybar.py
+++ /dev/null
@@ -1,323 +0,0 @@
-import os
-from .win32_adapter import *
-import threading
-import uuid
-
-class SysTrayIcon(object):
-    """
-    menu_options: tuple of tuples (menu text, menu icon path or None, function name)
-
-    menu text and tray hover text should be Unicode
-    hover_text length is limited to 128; longer text will be truncated
-
-    Can be used as context manager to enable automatic termination of tray
-    if parent thread is closed:
-
-        with SysTrayIcon(icon, hover_text) as systray:
-            for item in ['item1', 'item2', 'item3']:
-                systray.update(hover_text=item)
-                do_something(item)
-
-    """
-    QUIT = 'QUIT'
-    SPECIAL_ACTIONS = [QUIT]
-
-    FIRST_ID = 1023
-
-    def __init__(self,
-                 icon,
-                 hover_text,
-                 menu_options=None,
-                 on_quit=None,
-                 default_menu_index=None,
-                 window_class_name=None):
-
-        self._icon = icon
-        self._icon_shared = False
-        self._hover_text = hover_text
-        self._on_quit = on_quit
-
-        menu_options = menu_options or []
-        menu_options = menu_options + [['Quit', None, SysTrayIcon.QUIT, None]]
-        self._next_action_id = SysTrayIcon.FIRST_ID
-        self._menu_actions_by_id = set()
-        self._menu_options = self._add_ids_to_menu_options(list(menu_options))
-        self._menu_actions_by_id = dict(self._menu_actions_by_id)
-
-        window_class_name = window_class_name or ("SysTrayIconPy-%s" % (str(uuid.uuid4())))
-
-        self._default_menu_index = (default_menu_index or 0)
-        self._window_class_name = encode_for_locale(window_class_name)
-        self._message_dict = {RegisterWindowMessage("TaskbarCreated"): self._restart,
-                              WM_DESTROY: self._destroy,
-                              WM_CLOSE: self._destroy,
-                              WM_COMMAND: self._command,
-                              WM_USER+20: self._notify}
-        self._notify_id = None
-        self._message_loop_thread = None
-        self._hwnd = None
-        self._hicon = 0
-        self._hinst = None
-        self._window_class = None
-        self._menu = None
-        self._register_class()
-
-    def __enter__(self):
-        """Context manager so SysTray can automatically close"""
-        self.start()
-        return self
-
-    def __exit__(self, *args):
-        """Context manager so SysTray can automatically close"""
-        self.shutdown()
-
-    def WndProc(self, hwnd, msg, wparam, lparam):
-        hwnd = HANDLE(hwnd)
-        wparam = WPARAM(wparam)
-        lparam = LPARAM(lparam)
-        if msg in self._message_dict:
-            self._message_dict[msg](hwnd, msg, wparam.value, lparam.value)
-        return DefWindowProc(hwnd, msg, wparam, lparam)
-
-    def _register_class(self):
-        # Register the Window class.
-        self._window_class = WNDCLASS()
-        self._hinst = self._window_class.hInstance = GetModuleHandle(None)
-        self._window_class.lpszClassName = self._window_class_name
-        self._window_class.style = CS_VREDRAW | CS_HREDRAW
-        self._window_class.hCursor = LoadCursor(0, IDC_ARROW)
-        self._window_class.hbrBackground = COLOR_WINDOW
-        self._window_class.lpfnWndProc = LPFN_WNDPROC(self.WndProc)
-        RegisterClass(ctypes.byref(self._window_class))
-
-    def _create_window(self):
-        style = WS_OVERLAPPED | WS_SYSMENU
-        self._hwnd = CreateWindowEx(0, self._window_class_name,
-                                      self._window_class_name,
-                                      style,
-                                      0,
-                                      0,
-                                      CW_USEDEFAULT,
-                                      CW_USEDEFAULT,
-                                      0,
-                                      0,
-                                      self._hinst,
-                                      None)
-        UpdateWindow(self._hwnd)
-        self._refresh_icon()
-
-    def _message_loop_func(self):
-        self._create_window()
-        PumpMessages()
-
-    def start(self):
-        if self._hwnd:
-            return      # already started
-        self._message_loop_thread = threading.Thread(target=self._message_loop_func)
-        self._message_loop_thread.start()
-
-    def shutdown(self):
-        if not self._hwnd:
-            return      # not started
-        PostMessage(self._hwnd, WM_CLOSE, 0, 0)
-        self._message_loop_thread.join()
-
-    def update(self, icon=None, hover_text=None, menu_options=None):
-        """ update icon image and/or hover text and/or menu options"""
-        if icon:
-            self._icon = icon
-            self._load_icon()
-        if hover_text:
-            self._hover_text = hover_text
-        # "if menu_options" added to be allow the update of the menu options
-        if menu_options:
-            menu_options = menu_options + [['Quit', None, SysTrayIcon.QUIT, None]]
-            self._next_action_id = SysTrayIcon.FIRST_ID
-            self._menu_actions_by_id = set()
-            self._menu_options = self._add_ids_to_menu_options(list(menu_options))
-            self._menu_actions_by_id = dict(self._menu_actions_by_id)
-            self._menu = None  # detroy the old menu created by right clicking the icon
-        self._refresh_icon()
-
-    def _add_ids_to_menu_options(self, menu_options):
-        result = []
-        for menu_option in menu_options:
-            option_text, option_icon, option_action, option_state = menu_option
-            if callable(option_action) or option_action in SysTrayIcon.SPECIAL_ACTIONS:
-                self._menu_actions_by_id.add((self._next_action_id, option_action))
-                result.append(menu_option + [self._next_action_id])
-            elif option_action == 'separator':
-                result.append((option_text,
-                               option_icon,
-                               option_action,
-                               option_state,
-                               self._next_action_id))
-            elif non_string_iterable(option_action):
-                result.append((option_text,
-                               option_icon,
-                               option_state,
-                               self._add_ids_to_menu_options(option_action),
-                               self._next_action_id))
-            else:
-                raise Exception('Unknown item', option_text, option_icon, option_action)
-            self._next_action_id += 1
-        return result
-
-    def _load_icon(self):
-        # release previous icon, if a custom one was loaded
-        # note: it's important *not* to release the icon if we loaded the default system icon (with
-        # the LoadIcon function) - this is why we assign self._hicon only if it was loaded using LoadImage
-        if not self._icon_shared and self._hicon != 0:
-            DestroyIcon(self._hicon)
-            self._hicon = 0
-
-        # Try and find a custom icon
-        hicon = 0
-        if self._icon is not None and os.path.isfile(self._icon):
-            ico_x = GetSystemMetrics(SM_CXSMICON)
-            ico_y = GetSystemMetrics(SM_CYSMICON)
-            icon = encode_for_locale(self._icon)
-            hicon = self._hicon = LoadImage(0, icon, IMAGE_ICON, ico_x, ico_y, LR_LOADFROMFILE)
-            self._icon_shared = False
-
-        # Can't find icon file - using default shared icon
-        if hicon == 0:
-            self._hicon = LoadIcon(0, IDI_APPLICATION)
-            self._icon_shared = True
-            self._icon = None
-
-    def _refresh_icon(self):
-        if self._hwnd is None:
-            return
-        if self._hicon == 0:
-            self._load_icon()
-        if self._notify_id:
-            message = NIM_MODIFY
-        else:
-            message = NIM_ADD
-        self._notify_id = NotifyData(self._hwnd,
-                          0,
-                          NIF_ICON | NIF_MESSAGE | NIF_TIP,
-                          WM_USER+20,
-                          self._hicon,
-                          self._hover_text)
-        Shell_NotifyIcon(message, ctypes.byref(self._notify_id))
-
-    def _restart(self, hwnd, msg, wparam, lparam):
-        self._refresh_icon()
-
-    def _destroy(self, hwnd, msg, wparam, lparam):
-        if self._on_quit:
-            self._on_quit(self)
-        nid = NotifyData(self._hwnd, 0)
-        Shell_NotifyIcon(NIM_DELETE, ctypes.byref(nid))
-        PostQuitMessage(0)  # Terminate the app.
-        # TODO * release self._menu with DestroyMenu and reset the memeber
-        #      * release self._hicon with DestoryIcon and reset the member
-        #      * release loaded menu icons (loaded in _load_menu_icon) with DeleteObject
-        #        (we don't keep those objects anywhere now)
-        self._hwnd = None
-        self._notify_id = None
-
-    def _notify(self, hwnd, msg, wparam, lparam):
-        if lparam == WM_LBUTTONDBLCLK:
-            self._execute_menu_option(self._default_menu_index + SysTrayIcon.FIRST_ID)
-        elif lparam == WM_RBUTTONUP:
-            self._show_menu()
-        elif lparam == WM_LBUTTONUP:
-            pass
-        return True
-
-    def _show_menu(self):
-        if self._menu is None:
-            self._menu = CreatePopupMenu()
-            self._create_menu(self._menu, self._menu_options)
-            #SetMenuDefaultItem(self._menu, 1000, 0)
-
-        pos = POINT()
-        GetCursorPos(ctypes.byref(pos))
-        # See http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/menus_0hdi.asp
-        SetForegroundWindow(self._hwnd)
-        TrackPopupMenu(self._menu,
-                       TPM_LEFTALIGN,
-                       pos.x,
-                       pos.y,
-                       0,
-                       self._hwnd,
-                       None)
-        PostMessage(self._hwnd, WM_NULL, 0, 0)
-
-    def _create_menu(self, menu, menu_options):
-        for option_text, option_icon, option_action, option_state, option_id in menu_options[::-1]:
-            if option_icon:
-                option_icon = self._prep_menu_icon(option_icon)
-
-            mi_fstate = 0
-            mi_ftype = 0
-
-            if option_state == 'default':
-                mi_fstate = mi_fstate | MFS_DEFAULT
-            if option_state == 'highlight':
-                mi_fstate = mi_fstate | MFS_HILITE
-            if option_state == 'disabled':
-                mi_fstate = mi_fstate | MFS_DISABLED
-            if option_action == 'separator':
-                mi_ftype = mi_ftype | MFT_SEPARATOR
-
-            if isinstance(option_action, tuple):
-                submenu = CreatePopupMenu()
-                self._create_menu(submenu, option_action)
-                item = PackMENUITEMINFO(text=option_text,
-                                        hbmpItem=option_icon,
-                                        hSubMenu=submenu)
-                InsertMenuItem(menu, 0, 1,  ctypes.byref(item))
-            else:
-                item = PackMENUITEMINFO(text=option_text,
-                                        hbmpItem=option_icon,
-                                        wID=option_id,
-                                        fState=mi_fstate,
-                                        fType=mi_ftype)
-                InsertMenuItem(menu, 0, 1, ctypes.byref(item))
-
-    def _prep_menu_icon(self, icon):
-        icon = encode_for_locale(icon)
-        # First load the icon.
-        ico_x = GetSystemMetrics(SM_CXSMICON)
-        ico_y = GetSystemMetrics(SM_CYSMICON)
-        hicon = LoadImage(0, icon, IMAGE_ICON, ico_x, ico_y, LR_LOADFROMFILE)
-
-        hdcBitmap = CreateCompatibleDC(None)
-        hdcScreen = GetDC(None)
-        hbm = CreateCompatibleBitmap(hdcScreen, ico_x, ico_y)
-        hbmOld = SelectObject(hdcBitmap, hbm)
-        # Fill the background.
-        brush = GetSysColorBrush(COLOR_MENU)
-        FillRect(hdcBitmap, ctypes.byref(RECT(0, 0, 16, 16)), brush)
-        # draw the icon
-        DrawIconEx(hdcBitmap, 0, 0, hicon, ico_x, ico_y, 0, 0, DI_NORMAL)
-        SelectObject(hdcBitmap, hbmOld)
-
-        # No need to free the brush
-        DeleteDC(hdcBitmap)
-        DestroyIcon(hicon)
-
-        return hbm
-
-    def _command(self, hwnd, msg, wparam, lparam):
-        id = LOWORD(wparam)
-        self._execute_menu_option(id)
-
-    def _execute_menu_option(self, id):
-        menu_action = self._menu_actions_by_id[id]
-        if menu_action == SysTrayIcon.QUIT:
-            DestroyWindow(self._hwnd)
-        else:
-            menu_action(self)
-
-def non_string_iterable(obj):
-    try:
-        iter(obj)
-    except TypeError:
-        return False
-    else:
-        return not isinstance(obj, str)
diff --git a/lib/infi/systray/win32_adapter.py b/lib/infi/systray/win32_adapter.py
deleted file mode 100644
index 9da8152d..00000000
--- a/lib/infi/systray/win32_adapter.py
+++ /dev/null
@@ -1,199 +0,0 @@
-import ctypes
-import ctypes.wintypes
-import locale
-import sys
-
-RegisterWindowMessage = ctypes.windll.user32.RegisterWindowMessageA
-LoadCursor = ctypes.windll.user32.LoadCursorA
-LoadIcon = ctypes.windll.user32.LoadIconA
-LoadImage = ctypes.windll.user32.LoadImageA
-RegisterClass = ctypes.windll.user32.RegisterClassA
-CreateWindowEx = ctypes.windll.user32.CreateWindowExA
-UpdateWindow = ctypes.windll.user32.UpdateWindow
-DefWindowProc = ctypes.windll.user32.DefWindowProcA
-GetSystemMetrics = ctypes.windll.user32.GetSystemMetrics
-InsertMenuItem = ctypes.windll.user32.InsertMenuItemA
-PostMessage = ctypes.windll.user32.PostMessageA
-PostQuitMessage = ctypes.windll.user32.PostQuitMessage
-SetMenuDefaultItem = ctypes.windll.user32.SetMenuDefaultItem
-GetCursorPos = ctypes.windll.user32.GetCursorPos
-SetForegroundWindow = ctypes.windll.user32.SetForegroundWindow
-TrackPopupMenu = ctypes.windll.user32.TrackPopupMenu
-CreatePopupMenu = ctypes.windll.user32.CreatePopupMenu
-CreateCompatibleDC = ctypes.windll.gdi32.CreateCompatibleDC
-GetDC = ctypes.windll.user32.GetDC
-CreateCompatibleBitmap = ctypes.windll.gdi32.CreateCompatibleBitmap
-GetSysColorBrush = ctypes.windll.user32.GetSysColorBrush
-FillRect = ctypes.windll.user32.FillRect
-DrawIconEx = ctypes.windll.user32.DrawIconEx
-SelectObject = ctypes.windll.gdi32.SelectObject
-DeleteDC = ctypes.windll.gdi32.DeleteDC
-DestroyWindow = ctypes.windll.user32.DestroyWindow
-GetModuleHandle = ctypes.windll.kernel32.GetModuleHandleA
-GetMessage = ctypes.windll.user32.GetMessageA
-TranslateMessage = ctypes.windll.user32.TranslateMessage
-DispatchMessage = ctypes.windll.user32.DispatchMessageA
-Shell_NotifyIcon = ctypes.windll.shell32.Shell_NotifyIcon
-DestroyIcon = ctypes.windll.user32.DestroyIcon
-
-NIM_ADD = 0
-NIM_MODIFY = 1
-NIM_DELETE = 2
-NIF_ICON = 2
-NIF_MESSAGE = 1
-NIF_TIP = 4
-MIIM_ID = 2
-MIIM_STATE = 1
-MIIM_SUBMENU = 4
-MIIM_STRING = 64
-MIIM_BITMAP = 128
-MIIM_FTYPE = 256
-WM_DESTROY = 2
-WM_CLOSE = 16
-WM_COMMAND = 273
-WM_USER = 1024
-WM_LBUTTONDBLCLK = 515
-WM_RBUTTONUP = 517
-WM_LBUTTONUP = 514
-WM_NULL = 0
-CS_VREDRAW = 1
-CS_HREDRAW = 2
-IDC_ARROW = 32512
-COLOR_WINDOW = 5
-WS_OVERLAPPED = 0
-WS_SYSMENU = 524288
-CW_USEDEFAULT = -2147483648
-LR_LOADFROMFILE = 16
-LR_DEFAULTSIZE = 64
-IMAGE_ICON = 1
-IDI_APPLICATION = 32512
-TPM_LEFTALIGN = 0
-SM_CXSMICON = 49
-SM_CYSMICON = 50
-COLOR_MENU = 4
-DI_NORMAL = 3
-MFS_DISABLED = 3
-MFS_DEFAULT = 4096
-MFS_HILITE = 128
-MFT_SEPARATOR = 2048
-
-WPARAM = ctypes.wintypes.WPARAM
-LPARAM = ctypes.wintypes.LPARAM
-HANDLE = ctypes.wintypes.HANDLE
-if ctypes.sizeof(ctypes.c_long) == ctypes.sizeof(ctypes.c_void_p):
-    LRESULT = ctypes.c_long
-elif ctypes.sizeof(ctypes.c_longlong) == ctypes.sizeof(ctypes.c_void_p):
-    LRESULT = ctypes.c_longlong
-
-SZTIP_MAX_LENGTH = 128
-LOCALE_ENCODING = locale.getpreferredencoding()
-
-
-def encode_for_locale(s):
-    """
-    Encode text items for system locale. If encoding fails, fall back to ASCII.
-    """
-    try:
-        return s.encode(LOCALE_ENCODING, 'ignore')
-    except (AttributeError, UnicodeDecodeError):
-        return s.decode('ascii', 'ignore').encode(LOCALE_ENCODING)
-
-POINT = ctypes.wintypes.POINT
-RECT = ctypes.wintypes.RECT
-MSG = ctypes.wintypes.MSG
-
-LPFN_WNDPROC = ctypes.CFUNCTYPE(LRESULT, HANDLE, ctypes.c_uint, WPARAM, LPARAM)
-class WNDCLASS(ctypes.Structure):
-    _fields_ = [("style", ctypes.c_uint),
-                ("lpfnWndProc", LPFN_WNDPROC),
-                ("cbClsExtra", ctypes.c_int),
-                ("cbWndExtra", ctypes.c_int),
-                ("hInstance", HANDLE),
-                ("hIcon", HANDLE),
-                ("hCursor", HANDLE),
-                ("hbrBackground", HANDLE),
-                ("lpszMenuName", ctypes.c_char_p),
-                ("lpszClassName", ctypes.c_char_p),
-               ]
-
-class MENUITEMINFO(ctypes.Structure):
-    _fields_ = [("cbSize", ctypes.c_uint),
-                ("fMask", ctypes.c_uint),
-                ("fType", ctypes.c_uint),
-                ("fState", ctypes.c_uint),
-                ("wID", ctypes.c_uint),
-                ("hSubMenu", HANDLE),
-                ("hbmpChecked", HANDLE),
-                ("hbmpUnchecked", HANDLE),
-                ("dwItemData", ctypes.c_void_p),
-                ("dwTypeData", ctypes.c_char_p),
-                ("cch", ctypes.c_uint),
-                ("hbmpItem", HANDLE),
-               ]
-
-class NOTIFYICONDATA(ctypes.Structure):
-    _fields_ = [("cbSize", ctypes.c_uint),
-                ("hWnd", HANDLE),
-                ("uID", ctypes.c_uint),
-                ("uFlags", ctypes.c_uint),
-                ("uCallbackMessage", ctypes.c_uint),
-                ("hIcon", HANDLE),
-                ("szTip", ctypes.c_char * SZTIP_MAX_LENGTH),
-                ("dwState", ctypes.c_uint),
-                ("dwStateMask", ctypes.c_uint),
-                ("szInfo", ctypes.c_char * 256),
-                ("uTimeout", ctypes.c_uint),
-                ("szInfoTitle", ctypes.c_char * 64),
-                ("dwInfoFlags", ctypes.c_uint),
-                ("guidItem", ctypes.c_char * 16),
-               ]
-    if sys.getwindowsversion().major >= 5:
-        _fields_.append(("hBalloonIcon", HANDLE))
-
-
-def PackMENUITEMINFO(text=None, hbmpItem=None, wID=None, hSubMenu=None,
-                     fType=None, fState=None):
-    res = MENUITEMINFO()
-    res.cbSize = ctypes.sizeof(res)
-    res.fMask = 0
-    if hbmpItem is not None:
-        res.fMask |= MIIM_BITMAP
-        res.hbmpItem = hbmpItem
-    if wID is not None:
-        res.fMask |= MIIM_ID
-        res.wID = wID
-    if text is not None:
-        text = encode_for_locale(text)
-        res.fMask |= MIIM_STRING
-        res.dwTypeData = text
-    if hSubMenu is not None:
-        res.fMask |= MIIM_SUBMENU
-        res.hSubMenu = hSubMenu
-    if fType is not None:
-        res.fMask |= MIIM_FTYPE
-        res.fType = fType
-    if fState is not None:
-        res.fMask |= MIIM_STATE
-        res.fState = fState
-    return res
-
-def LOWORD(w):
-    return w & 0xFFFF
-
-def PumpMessages():
-    msg = MSG()
-    while GetMessage(ctypes.byref(msg), None, 0, 0) > 0:
-        TranslateMessage(ctypes.byref(msg))
-        DispatchMessage(ctypes.byref(msg))
-
-def NotifyData(hWnd=0, uID=0, uFlags=0, uCallbackMessage=0, hIcon=0, szTip=""):
-    szTip = encode_for_locale(szTip)[:SZTIP_MAX_LENGTH]
-    res = NOTIFYICONDATA()
-    res.cbSize = ctypes.sizeof(res)
-    res.hWnd = hWnd
-    res.uID = uID
-    res.uFlags = uFlags
-    res.uCallbackMessage = uCallbackMessage
-    res.hIcon = hIcon
-    res.szTip = szTip
-    return res
diff --git a/lib/inflect/__init__.py b/lib/inflect/__init__.py
deleted file mode 100644
index d0eded16..00000000
--- a/lib/inflect/__init__.py
+++ /dev/null
@@ -1,3984 +0,0 @@
-"""
-inflect: english language inflection
- - correctly generate plurals, ordinals, indefinite articles
- - convert numbers to words
-
-Copyright (C) 2010 Paul Dyson
-
-Based upon the Perl module
-`Lingua::EN::Inflect <https://metacpan.org/pod/Lingua::EN::Inflect>`_.
-
-methods:
-    classical inflect
-    plural plural_noun plural_verb plural_adj singular_noun no num a an
-    compare compare_nouns compare_verbs compare_adjs
-    present_participle
-    ordinal
-    number_to_words
-    join
-    defnoun defverb defadj defa defan
-
-INFLECTIONS:
-    classical inflect
-    plural plural_noun plural_verb plural_adj singular_noun compare
-    no num a an present_participle
-
-PLURALS:
-    classical inflect
-    plural plural_noun plural_verb plural_adj singular_noun no num
-    compare compare_nouns compare_verbs compare_adjs
-
-COMPARISONS:
-    classical
-    compare compare_nouns compare_verbs compare_adjs
-
-ARTICLES:
-    classical inflect num a an
-
-NUMERICAL:
-    ordinal number_to_words
-
-USER_DEFINED:
-    defnoun defverb defadj defa defan
-
-Exceptions:
- UnknownClassicalModeError
- BadNumValueError
- BadChunkingOptionError
- NumOutOfRangeError
- BadUserDefinedPatternError
- BadRcFileError
- BadGenderError
-
-"""
-
-from __future__ import annotations
-
-import ast
-import collections
-import contextlib
-import functools
-import itertools
-import re
-from numbers import Number
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Callable,
-    Dict,
-    Iterable,
-    List,
-    Match,
-    Optional,
-    Sequence,
-    Tuple,
-    Union,
-    cast,
-)
-
-from more_itertools import windowed_complete
-from typeguard import typechecked
-from typing_extensions import Annotated, Literal
-
-
-class UnknownClassicalModeError(Exception):
-    pass
-
-
-class BadNumValueError(Exception):
-    pass
-
-
-class BadChunkingOptionError(Exception):
-    pass
-
-
-class NumOutOfRangeError(Exception):
-    pass
-
-
-class BadUserDefinedPatternError(Exception):
-    pass
-
-
-class BadRcFileError(Exception):
-    pass
-
-
-class BadGenderError(Exception):
-    pass
-
-
-def enclose(s: str) -> str:
-    return f"(?:{s})"
-
-
-def joinstem(cutpoint: Optional[int] = 0, words: Optional[Iterable[str]] = None) -> str:
-    """
-    Join stem of each word in words into a string for regex.
-
-    Each word is truncated at cutpoint.
-
-    Cutpoint is usually negative indicating the number of letters to remove
-    from the end of each word.
-
-    >>> joinstem(-2, ["ephemeris", "iris", ".*itis"])
-    '(?:ephemer|ir|.*it)'
-
-    >>> joinstem(None, ["ephemeris"])
-    '(?:ephemeris)'
-
-    >>> joinstem(5, None)
-    '(?:)'
-    """
-    return enclose("|".join(w[:cutpoint] for w in words or []))
-
-
-def bysize(words: Iterable[str]) -> Dict[int, set]:
-    """
-    From a list of words, return a dict of sets sorted by word length.
-
-    >>> words = ['ant', 'cat', 'dog', 'pig', 'frog', 'goat', 'horse', 'elephant']
-    >>> ret = bysize(words)
-    >>> sorted(ret[3])
-    ['ant', 'cat', 'dog', 'pig']
-    >>> ret[5]
-    {'horse'}
-    """
-    res: Dict[int, set] = collections.defaultdict(set)
-    for w in words:
-        res[len(w)].add(w)
-    return res
-
-
-def make_pl_si_lists(
-    lst: Iterable[str],
-    plending: str,
-    siendingsize: Optional[int],
-    dojoinstem: bool = True,
-):
-    """
-    given a list of singular words: lst
-
-    an ending to append to make the plural: plending
-
-    the number of characters to remove from the singular
-    before appending plending: siendingsize
-
-    a flag whether to create a joinstem: dojoinstem
-
-    return:
-    a list of pluralised words: si_list (called si because this is what you need to
-    look for to make the singular)
-
-    the pluralised words as a dict of sets sorted by word length: si_bysize
-    the singular words as a dict of sets sorted by word length: pl_bysize
-    if dojoinstem is True: a regular expression that matches any of the stems: stem
-    """
-    if siendingsize is not None:
-        siendingsize = -siendingsize
-    si_list = [w[:siendingsize] + plending for w in lst]
-    pl_bysize = bysize(lst)
-    si_bysize = bysize(si_list)
-    if dojoinstem:
-        stem = joinstem(siendingsize, lst)
-        return si_list, si_bysize, pl_bysize, stem
-    else:
-        return si_list, si_bysize, pl_bysize
-
-
-# 1. PLURALS
-
-pl_sb_irregular_s = {
-    "corpus": "corpuses|corpora",
-    "opus": "opuses|opera",
-    "genus": "genera",
-    "mythos": "mythoi",
-    "penis": "penises|penes",
-    "testis": "testes",
-    "atlas": "atlases|atlantes",
-    "yes": "yeses",
-}
-
-pl_sb_irregular = {
-    "child": "children",
-    "chili": "chilis|chilies",
-    "brother": "brothers|brethren",
-    "infinity": "infinities|infinity",
-    "loaf": "loaves",
-    "lore": "lores|lore",
-    "hoof": "hoofs|hooves",
-    "beef": "beefs|beeves",
-    "thief": "thiefs|thieves",
-    "money": "monies",
-    "mongoose": "mongooses",
-    "ox": "oxen",
-    "cow": "cows|kine",
-    "graffito": "graffiti",
-    "octopus": "octopuses|octopodes",
-    "genie": "genies|genii",
-    "ganglion": "ganglions|ganglia",
-    "trilby": "trilbys",
-    "turf": "turfs|turves",
-    "numen": "numina",
-    "atman": "atmas",
-    "occiput": "occiputs|occipita",
-    "sabretooth": "sabretooths",
-    "sabertooth": "sabertooths",
-    "lowlife": "lowlifes",
-    "flatfoot": "flatfoots",
-    "tenderfoot": "tenderfoots",
-    "romany": "romanies",
-    "jerry": "jerries",
-    "mary": "maries",
-    "talouse": "talouses",
-    "rom": "roma",
-    "carmen": "carmina",
-}
-
-pl_sb_irregular.update(pl_sb_irregular_s)
-# pl_sb_irregular_keys = enclose('|'.join(pl_sb_irregular.keys()))
-
-pl_sb_irregular_caps = {
-    "Romany": "Romanies",
-    "Jerry": "Jerrys",
-    "Mary": "Marys",
-    "Rom": "Roma",
-}
-
-pl_sb_irregular_compound = {"prima donna": "prima donnas|prime donne"}
-
-si_sb_irregular = {v: k for (k, v) in pl_sb_irregular.items()}
-for k in list(si_sb_irregular):
-    if "|" in k:
-        k1, k2 = k.split("|")
-        si_sb_irregular[k1] = si_sb_irregular[k2] = si_sb_irregular[k]
-        del si_sb_irregular[k]
-si_sb_irregular_caps = {v: k for (k, v) in pl_sb_irregular_caps.items()}
-si_sb_irregular_compound = {v: k for (k, v) in pl_sb_irregular_compound.items()}
-for k in list(si_sb_irregular_compound):
-    if "|" in k:
-        k1, k2 = k.split("|")
-        si_sb_irregular_compound[k1] = si_sb_irregular_compound[k2] = (
-            si_sb_irregular_compound[k]
-        )
-        del si_sb_irregular_compound[k]
-
-# si_sb_irregular_keys = enclose('|'.join(si_sb_irregular.keys()))
-
-# Z's that don't double
-
-pl_sb_z_zes_list = ("quartz", "topaz")
-pl_sb_z_zes_bysize = bysize(pl_sb_z_zes_list)
-
-pl_sb_ze_zes_list = ("snooze",)
-pl_sb_ze_zes_bysize = bysize(pl_sb_ze_zes_list)
-
-
-# CLASSICAL "..is" -> "..ides"
-
-pl_sb_C_is_ides_complete = [
-    # GENERAL WORDS...
-    "ephemeris",
-    "iris",
-    "clitoris",
-    "chrysalis",
-    "epididymis",
-]
-
-pl_sb_C_is_ides_endings = [
-    # INFLAMATIONS...
-    "itis"
-]
-
-pl_sb_C_is_ides = joinstem(
-    -2, pl_sb_C_is_ides_complete + [f".*{w}" for w in pl_sb_C_is_ides_endings]
-)
-
-pl_sb_C_is_ides_list = pl_sb_C_is_ides_complete + pl_sb_C_is_ides_endings
-
-(
-    si_sb_C_is_ides_list,
-    si_sb_C_is_ides_bysize,
-    pl_sb_C_is_ides_bysize,
-) = make_pl_si_lists(pl_sb_C_is_ides_list, "ides", 2, dojoinstem=False)
-
-
-# CLASSICAL "..a" -> "..ata"
-
-pl_sb_C_a_ata_list = (
-    "anathema",
-    "bema",
-    "carcinoma",
-    "charisma",
-    "diploma",
-    "dogma",
-    "drama",
-    "edema",
-    "enema",
-    "enigma",
-    "lemma",
-    "lymphoma",
-    "magma",
-    "melisma",
-    "miasma",
-    "oedema",
-    "sarcoma",
-    "schema",
-    "soma",
-    "stigma",
-    "stoma",
-    "trauma",
-    "gumma",
-    "pragma",
-)
-
-(
-    si_sb_C_a_ata_list,
-    si_sb_C_a_ata_bysize,
-    pl_sb_C_a_ata_bysize,
-    pl_sb_C_a_ata,
-) = make_pl_si_lists(pl_sb_C_a_ata_list, "ata", 1)
-
-# UNCONDITIONAL "..a" -> "..ae"
-
-pl_sb_U_a_ae_list = (
-    "alumna",
-    "alga",
-    "vertebra",
-    "persona",
-    "vita",
-)
-(
-    si_sb_U_a_ae_list,
-    si_sb_U_a_ae_bysize,
-    pl_sb_U_a_ae_bysize,
-    pl_sb_U_a_ae,
-) = make_pl_si_lists(pl_sb_U_a_ae_list, "e", None)
-
-# CLASSICAL "..a" -> "..ae"
-
-pl_sb_C_a_ae_list = (
-    "amoeba",
-    "antenna",
-    "formula",
-    "hyperbola",
-    "medusa",
-    "nebula",
-    "parabola",
-    "abscissa",
-    "hydra",
-    "nova",
-    "lacuna",
-    "aurora",
-    "umbra",
-    "flora",
-    "fauna",
-)
-(
-    si_sb_C_a_ae_list,
-    si_sb_C_a_ae_bysize,
-    pl_sb_C_a_ae_bysize,
-    pl_sb_C_a_ae,
-) = make_pl_si_lists(pl_sb_C_a_ae_list, "e", None)
-
-
-# CLASSICAL "..en" -> "..ina"
-
-pl_sb_C_en_ina_list = ("stamen", "foramen", "lumen")
-
-(
-    si_sb_C_en_ina_list,
-    si_sb_C_en_ina_bysize,
-    pl_sb_C_en_ina_bysize,
-    pl_sb_C_en_ina,
-) = make_pl_si_lists(pl_sb_C_en_ina_list, "ina", 2)
-
-
-# UNCONDITIONAL "..um" -> "..a"
-
-pl_sb_U_um_a_list = (
-    "bacterium",
-    "agendum",
-    "desideratum",
-    "erratum",
-    "stratum",
-    "datum",
-    "ovum",
-    "extremum",
-    "candelabrum",
-)
-(
-    si_sb_U_um_a_list,
-    si_sb_U_um_a_bysize,
-    pl_sb_U_um_a_bysize,
-    pl_sb_U_um_a,
-) = make_pl_si_lists(pl_sb_U_um_a_list, "a", 2)
-
-# CLASSICAL "..um" -> "..a"
-
-pl_sb_C_um_a_list = (
-    "maximum",
-    "minimum",
-    "momentum",
-    "optimum",
-    "quantum",
-    "cranium",
-    "curriculum",
-    "dictum",
-    "phylum",
-    "aquarium",
-    "compendium",
-    "emporium",
-    "encomium",
-    "gymnasium",
-    "honorarium",
-    "interregnum",
-    "lustrum",
-    "memorandum",
-    "millennium",
-    "rostrum",
-    "spectrum",
-    "speculum",
-    "stadium",
-    "trapezium",
-    "ultimatum",
-    "medium",
-    "vacuum",
-    "velum",
-    "consortium",
-    "arboretum",
-)
-
-(
-    si_sb_C_um_a_list,
-    si_sb_C_um_a_bysize,
-    pl_sb_C_um_a_bysize,
-    pl_sb_C_um_a,
-) = make_pl_si_lists(pl_sb_C_um_a_list, "a", 2)
-
-
-# UNCONDITIONAL "..us" -> "i"
-
-pl_sb_U_us_i_list = (
-    "alumnus",
-    "alveolus",
-    "bacillus",
-    "bronchus",
-    "locus",
-    "nucleus",
-    "stimulus",
-    "meniscus",
-    "sarcophagus",
-)
-(
-    si_sb_U_us_i_list,
-    si_sb_U_us_i_bysize,
-    pl_sb_U_us_i_bysize,
-    pl_sb_U_us_i,
-) = make_pl_si_lists(pl_sb_U_us_i_list, "i", 2)
-
-# CLASSICAL "..us" -> "..i"
-
-pl_sb_C_us_i_list = (
-    "focus",
-    "radius",
-    "genius",
-    "incubus",
-    "succubus",
-    "nimbus",
-    "fungus",
-    "nucleolus",
-    "stylus",
-    "torus",
-    "umbilicus",
-    "uterus",
-    "hippopotamus",
-    "cactus",
-)
-
-(
-    si_sb_C_us_i_list,
-    si_sb_C_us_i_bysize,
-    pl_sb_C_us_i_bysize,
-    pl_sb_C_us_i,
-) = make_pl_si_lists(pl_sb_C_us_i_list, "i", 2)
-
-
-# CLASSICAL "..us" -> "..us"  (ASSIMILATED 4TH DECLENSION LATIN NOUNS)
-
-pl_sb_C_us_us = (
-    "status",
-    "apparatus",
-    "prospectus",
-    "sinus",
-    "hiatus",
-    "impetus",
-    "plexus",
-)
-pl_sb_C_us_us_bysize = bysize(pl_sb_C_us_us)
-
-# UNCONDITIONAL "..on" -> "a"
-
-pl_sb_U_on_a_list = (
-    "criterion",
-    "perihelion",
-    "aphelion",
-    "phenomenon",
-    "prolegomenon",
-    "noumenon",
-    "organon",
-    "asyndeton",
-    "hyperbaton",
-)
-(
-    si_sb_U_on_a_list,
-    si_sb_U_on_a_bysize,
-    pl_sb_U_on_a_bysize,
-    pl_sb_U_on_a,
-) = make_pl_si_lists(pl_sb_U_on_a_list, "a", 2)
-
-# CLASSICAL "..on" -> "..a"
-
-pl_sb_C_on_a_list = ("oxymoron",)
-
-(
-    si_sb_C_on_a_list,
-    si_sb_C_on_a_bysize,
-    pl_sb_C_on_a_bysize,
-    pl_sb_C_on_a,
-) = make_pl_si_lists(pl_sb_C_on_a_list, "a", 2)
-
-
-# CLASSICAL "..o" -> "..i"  (BUT NORMALLY -> "..os")
-
-pl_sb_C_o_i = [
-    "solo",
-    "soprano",
-    "basso",
-    "alto",
-    "contralto",
-    "tempo",
-    "piano",
-    "virtuoso",
-]  # list not tuple so can concat for pl_sb_U_o_os
-
-pl_sb_C_o_i_bysize = bysize(pl_sb_C_o_i)
-si_sb_C_o_i_bysize = bysize([f"{w[:-1]}i" for w in pl_sb_C_o_i])
-
-pl_sb_C_o_i_stems = joinstem(-1, pl_sb_C_o_i)
-
-# ALWAYS "..o" -> "..os"
-
-pl_sb_U_o_os_complete = {"ado", "ISO", "NATO", "NCO", "NGO", "oto"}
-si_sb_U_o_os_complete = {f"{w}s" for w in pl_sb_U_o_os_complete}
-
-
-pl_sb_U_o_os_endings = [
-    "aficionado",
-    "aggro",
-    "albino",
-    "allegro",
-    "ammo",
-    "Antananarivo",
-    "archipelago",
-    "armadillo",
-    "auto",
-    "avocado",
-    "Bamako",
-    "Barquisimeto",
-    "bimbo",
-    "bingo",
-    "Biro",
-    "bolero",
-    "Bolzano",
-    "bongo",
-    "Boto",
-    "burro",
-    "Cairo",
-    "canto",
-    "cappuccino",
-    "casino",
-    "cello",
-    "Chicago",
-    "Chimango",
-    "cilantro",
-    "cochito",
-    "coco",
-    "Colombo",
-    "Colorado",
-    "commando",
-    "concertino",
-    "contango",
-    "credo",
-    "crescendo",
-    "cyano",
-    "demo",
-    "ditto",
-    "Draco",
-    "dynamo",
-    "embryo",
-    "Esperanto",
-    "espresso",
-    "euro",
-    "falsetto",
-    "Faro",
-    "fiasco",
-    "Filipino",
-    "flamenco",
-    "furioso",
-    "generalissimo",
-    "Gestapo",
-    "ghetto",
-    "gigolo",
-    "gizmo",
-    "Greensboro",
-    "gringo",
-    "Guaiabero",
-    "guano",
-    "gumbo",
-    "gyro",
-    "hairdo",
-    "hippo",
-    "Idaho",
-    "impetigo",
-    "inferno",
-    "info",
-    "intermezzo",
-    "intertrigo",
-    "Iquico",
-    "jumbo",
-    "junto",
-    "Kakapo",
-    "kilo",
-    "Kinkimavo",
-    "Kokako",
-    "Kosovo",
-    "Lesotho",
-    "libero",
-    "libido",
-    "libretto",
-    "lido",
-    "Lilo",
-    "limbo",
-    "limo",
-    "lineno",
-    "lingo",
-    "lino",
-    "livedo",
-    "loco",
-    "logo",
-    "lumbago",
-    "macho",
-    "macro",
-    "mafioso",
-    "magneto",
-    "magnifico",
-    "Majuro",
-    "Malabo",
-    "manifesto",
-    "Maputo",
-    "Maracaibo",
-    "medico",
-    "memo",
-    "metro",
-    "Mexico",
-    "micro",
-    "Milano",
-    "Monaco",
-    "mono",
-    "Montenegro",
-    "Morocco",
-    "Muqdisho",
-    "myo",
-    "neutrino",
-    "Ningbo",
-    "octavo",
-    "oregano",
-    "Orinoco",
-    "Orlando",
-    "Oslo",
-    "panto",
-    "Paramaribo",
-    "Pardusco",
-    "pedalo",
-    "photo",
-    "pimento",
-    "pinto",
-    "pleco",
-    "Pluto",
-    "pogo",
-    "polo",
-    "poncho",
-    "Porto-Novo",
-    "Porto",
-    "pro",
-    "psycho",
-    "pueblo",
-    "quarto",
-    "Quito",
-    "repo",
-    "rhino",
-    "risotto",
-    "rococo",
-    "rondo",
-    "Sacramento",
-    "saddo",
-    "sago",
-    "salvo",
-    "Santiago",
-    "Sapporo",
-    "Sarajevo",
-    "scherzando",
-    "scherzo",
-    "silo",
-    "sirocco",
-    "sombrero",
-    "staccato",
-    "sterno",
-    "stucco",
-    "stylo",
-    "sumo",
-    "Taiko",
-    "techno",
-    "terrazzo",
-    "testudo",
-    "timpano",
-    "tiro",
-    "tobacco",
-    "Togo",
-    "Tokyo",
-    "torero",
-    "Torino",
-    "Toronto",
-    "torso",
-    "tremolo",
-    "typo",
-    "tyro",
-    "ufo",
-    "UNESCO",
-    "vaquero",
-    "vermicello",
-    "verso",
-    "vibrato",
-    "violoncello",
-    "Virgo",
-    "weirdo",
-    "WHO",
-    "WTO",
-    "Yamoussoukro",
-    "yo-yo",
-    "zero",
-    "Zibo",
-] + pl_sb_C_o_i
-
-pl_sb_U_o_os_bysize = bysize(pl_sb_U_o_os_endings)
-si_sb_U_o_os_bysize = bysize([f"{w}s" for w in pl_sb_U_o_os_endings])
-
-
-# UNCONDITIONAL "..ch" -> "..chs"
-
-pl_sb_U_ch_chs_list = ("czech", "eunuch", "stomach")
-
-(
-    si_sb_U_ch_chs_list,
-    si_sb_U_ch_chs_bysize,
-    pl_sb_U_ch_chs_bysize,
-    pl_sb_U_ch_chs,
-) = make_pl_si_lists(pl_sb_U_ch_chs_list, "s", None)
-
-
-# UNCONDITIONAL "..[ei]x" -> "..ices"
-
-pl_sb_U_ex_ices_list = ("codex", "murex", "silex")
-(
-    si_sb_U_ex_ices_list,
-    si_sb_U_ex_ices_bysize,
-    pl_sb_U_ex_ices_bysize,
-    pl_sb_U_ex_ices,
-) = make_pl_si_lists(pl_sb_U_ex_ices_list, "ices", 2)
-
-pl_sb_U_ix_ices_list = ("radix", "helix")
-(
-    si_sb_U_ix_ices_list,
-    si_sb_U_ix_ices_bysize,
-    pl_sb_U_ix_ices_bysize,
-    pl_sb_U_ix_ices,
-) = make_pl_si_lists(pl_sb_U_ix_ices_list, "ices", 2)
-
-# CLASSICAL "..[ei]x" -> "..ices"
-
-pl_sb_C_ex_ices_list = (
-    "vortex",
-    "vertex",
-    "cortex",
-    "latex",
-    "pontifex",
-    "apex",
-    "index",
-    "simplex",
-)
-
-(
-    si_sb_C_ex_ices_list,
-    si_sb_C_ex_ices_bysize,
-    pl_sb_C_ex_ices_bysize,
-    pl_sb_C_ex_ices,
-) = make_pl_si_lists(pl_sb_C_ex_ices_list, "ices", 2)
-
-
-pl_sb_C_ix_ices_list = ("appendix",)
-
-(
-    si_sb_C_ix_ices_list,
-    si_sb_C_ix_ices_bysize,
-    pl_sb_C_ix_ices_bysize,
-    pl_sb_C_ix_ices,
-) = make_pl_si_lists(pl_sb_C_ix_ices_list, "ices", 2)
-
-
-# ARABIC: ".." -> "..i"
-
-pl_sb_C_i_list = ("afrit", "afreet", "efreet")
-
-(si_sb_C_i_list, si_sb_C_i_bysize, pl_sb_C_i_bysize, pl_sb_C_i) = make_pl_si_lists(
-    pl_sb_C_i_list, "i", None
-)
-
-
-# HEBREW: ".." -> "..im"
-
-pl_sb_C_im_list = ("goy", "seraph", "cherub")
-
-(si_sb_C_im_list, si_sb_C_im_bysize, pl_sb_C_im_bysize, pl_sb_C_im) = make_pl_si_lists(
-    pl_sb_C_im_list, "im", None
-)
-
-
-# UNCONDITIONAL "..man" -> "..mans"
-
-pl_sb_U_man_mans_list = """
-    ataman caiman cayman ceriman
-    desman dolman farman harman hetman
-    human leman ottoman shaman talisman
-""".split()
-pl_sb_U_man_mans_caps_list = """
-    Alabaman Bahaman Burman German
-    Hiroshiman Liman Nakayaman Norman Oklahoman
-    Panaman Roman Selman Sonaman Tacoman Yakiman
-    Yokohaman Yuman
-""".split()
-
-(
-    si_sb_U_man_mans_list,
-    si_sb_U_man_mans_bysize,
-    pl_sb_U_man_mans_bysize,
-) = make_pl_si_lists(pl_sb_U_man_mans_list, "s", None, dojoinstem=False)
-(
-    si_sb_U_man_mans_caps_list,
-    si_sb_U_man_mans_caps_bysize,
-    pl_sb_U_man_mans_caps_bysize,
-) = make_pl_si_lists(pl_sb_U_man_mans_caps_list, "s", None, dojoinstem=False)
-
-# UNCONDITIONAL "..louse" -> "..lice"
-pl_sb_U_louse_lice_list = ("booklouse", "grapelouse", "louse", "woodlouse")
-
-(
-    si_sb_U_louse_lice_list,
-    si_sb_U_louse_lice_bysize,
-    pl_sb_U_louse_lice_bysize,
-) = make_pl_si_lists(pl_sb_U_louse_lice_list, "lice", 5, dojoinstem=False)
-
-pl_sb_uninflected_s_complete = [
-    # PAIRS OR GROUPS SUBSUMED TO A SINGULAR...
-    "breeches",
-    "britches",
-    "pajamas",
-    "pyjamas",
-    "clippers",
-    "gallows",
-    "hijinks",
-    "headquarters",
-    "pliers",
-    "scissors",
-    "testes",
-    "herpes",
-    "pincers",
-    "shears",
-    "proceedings",
-    "trousers",
-    # UNASSIMILATED LATIN 4th DECLENSION
-    "cantus",
-    "coitus",
-    "nexus",
-    # RECENT IMPORTS...
-    "contretemps",
-    "corps",
-    "debris",
-    "siemens",
-    # DISEASES
-    "mumps",
-    # MISCELLANEOUS OTHERS...
-    "diabetes",
-    "jackanapes",
-    "series",
-    "species",
-    "subspecies",
-    "rabies",
-    "chassis",
-    "innings",
-    "news",
-    "mews",
-    "haggis",
-]
-
-pl_sb_uninflected_s_endings = [
-    # RECENT IMPORTS...
-    "ois",
-    # DISEASES
-    "measles",
-]
-
-pl_sb_uninflected_s = pl_sb_uninflected_s_complete + [
-    f".*{w}" for w in pl_sb_uninflected_s_endings
-]
-
-pl_sb_uninflected_herd = (
-    # DON'T INFLECT IN CLASSICAL MODE, OTHERWISE NORMAL INFLECTION
-    "wildebeest",
-    "swine",
-    "eland",
-    "bison",
-    "buffalo",
-    "cattle",
-    "elk",
-    "rhinoceros",
-    "zucchini",
-    "caribou",
-    "dace",
-    "grouse",
-    "guinea fowl",
-    "guinea-fowl",
-    "haddock",
-    "hake",
-    "halibut",
-    "herring",
-    "mackerel",
-    "pickerel",
-    "pike",
-    "roe",
-    "seed",
-    "shad",
-    "snipe",
-    "teal",
-    "turbot",
-    "water fowl",
-    "water-fowl",
-)
-
-pl_sb_uninflected_complete = [
-    # SOME FISH AND HERD ANIMALS
-    "tuna",
-    "salmon",
-    "mackerel",
-    "trout",
-    "bream",
-    "sea-bass",
-    "sea bass",
-    "carp",
-    "cod",
-    "flounder",
-    "whiting",
-    "moose",
-    # OTHER ODDITIES
-    "graffiti",
-    "djinn",
-    "samuri",
-    "offspring",
-    "pence",
-    "quid",
-    "hertz",
-] + pl_sb_uninflected_s_complete
-# SOME WORDS ENDING IN ...s (OFTEN PAIRS TAKEN AS A WHOLE)
-
-pl_sb_uninflected_caps = [
-    # ALL NATIONALS ENDING IN -ese
-    "Portuguese",
-    "Amoyese",
-    "Borghese",
-    "Congoese",
-    "Faroese",
-    "Foochowese",
-    "Genevese",
-    "Genoese",
-    "Gilbertese",
-    "Hottentotese",
-    "Kiplingese",
-    "Kongoese",
-    "Lucchese",
-    "Maltese",
-    "Nankingese",
-    "Niasese",
-    "Pekingese",
-    "Piedmontese",
-    "Pistoiese",
-    "Sarawakese",
-    "Shavese",
-    "Vermontese",
-    "Wenchowese",
-    "Yengeese",
-]
-
-
-pl_sb_uninflected_endings = [
-    # UNCOUNTABLE NOUNS
-    "butter",
-    "cash",
-    "furniture",
-    "information",
-    # SOME FISH AND HERD ANIMALS
-    "fish",
-    "deer",
-    "sheep",
-    # ALL NATIONALS ENDING IN -ese
-    "nese",
-    "rese",
-    "lese",
-    "mese",
-    # DISEASES
-    "pox",
-    # OTHER ODDITIES
-    "craft",
-] + pl_sb_uninflected_s_endings
-# SOME WORDS ENDING IN ...s (OFTEN PAIRS TAKEN AS A WHOLE)
-
-
-pl_sb_uninflected_bysize = bysize(pl_sb_uninflected_endings)
-
-
-# SINGULAR WORDS ENDING IN ...s (ALL INFLECT WITH ...es)
-
-pl_sb_singular_s_complete = [
-    "acropolis",
-    "aegis",
-    "alias",
-    "asbestos",
-    "bathos",
-    "bias",
-    "bronchitis",
-    "bursitis",
-    "caddis",
-    "cannabis",
-    "canvas",
-    "chaos",
-    "cosmos",
-    "dais",
-    "digitalis",
-    "epidermis",
-    "ethos",
-    "eyas",
-    "gas",
-    "glottis",
-    "hubris",
-    "ibis",
-    "lens",
-    "mantis",
-    "marquis",
-    "metropolis",
-    "pathos",
-    "pelvis",
-    "polis",
-    "rhinoceros",
-    "sassafras",
-    "trellis",
-] + pl_sb_C_is_ides_complete
-
-
-pl_sb_singular_s_endings = ["ss", "us"] + pl_sb_C_is_ides_endings
-
-pl_sb_singular_s_bysize = bysize(pl_sb_singular_s_endings)
-
-si_sb_singular_s_complete = [f"{w}es" for w in pl_sb_singular_s_complete]
-si_sb_singular_s_endings = [f"{w}es" for w in pl_sb_singular_s_endings]
-si_sb_singular_s_bysize = bysize(si_sb_singular_s_endings)
-
-pl_sb_singular_s_es = ["[A-Z].*es"]
-
-pl_sb_singular_s = enclose(
-    "|".join(
-        pl_sb_singular_s_complete
-        + [f".*{w}" for w in pl_sb_singular_s_endings]
-        + pl_sb_singular_s_es
-    )
-)
-
-
-# PLURALS ENDING IN uses -> use
-
-
-si_sb_ois_oi_case = ("Bolshois", "Hanois")
-
-si_sb_uses_use_case = ("Betelgeuses", "Duses", "Meuses", "Syracuses", "Toulouses")
-
-si_sb_uses_use = (
-    "abuses",
-    "applauses",
-    "blouses",
-    "carouses",
-    "causes",
-    "chartreuses",
-    "clauses",
-    "contuses",
-    "douses",
-    "excuses",
-    "fuses",
-    "grouses",
-    "hypotenuses",
-    "masseuses",
-    "menopauses",
-    "misuses",
-    "muses",
-    "overuses",
-    "pauses",
-    "peruses",
-    "profuses",
-    "recluses",
-    "reuses",
-    "ruses",
-    "souses",
-    "spouses",
-    "suffuses",
-    "transfuses",
-    "uses",
-)
-
-si_sb_ies_ie_case = (
-    "Addies",
-    "Aggies",
-    "Allies",
-    "Amies",
-    "Angies",
-    "Annies",
-    "Annmaries",
-    "Archies",
-    "Arties",
-    "Aussies",
-    "Barbies",
-    "Barries",
-    "Basies",
-    "Bennies",
-    "Bernies",
-    "Berties",
-    "Bessies",
-    "Betties",
-    "Billies",
-    "Blondies",
-    "Bobbies",
-    "Bonnies",
-    "Bowies",
-    "Brandies",
-    "Bries",
-    "Brownies",
-    "Callies",
-    "Carnegies",
-    "Carries",
-    "Cassies",
-    "Charlies",
-    "Cheries",
-    "Christies",
-    "Connies",
-    "Curies",
-    "Dannies",
-    "Debbies",
-    "Dixies",
-    "Dollies",
-    "Donnies",
-    "Drambuies",
-    "Eddies",
-    "Effies",
-    "Ellies",
-    "Elsies",
-    "Eries",
-    "Ernies",
-    "Essies",
-    "Eugenies",
-    "Fannies",
-    "Flossies",
-    "Frankies",
-    "Freddies",
-    "Gillespies",
-    "Goldies",
-    "Gracies",
-    "Guthries",
-    "Hallies",
-    "Hatties",
-    "Hetties",
-    "Hollies",
-    "Jackies",
-    "Jamies",
-    "Janies",
-    "Jannies",
-    "Jeanies",
-    "Jeannies",
-    "Jennies",
-    "Jessies",
-    "Jimmies",
-    "Jodies",
-    "Johnies",
-    "Johnnies",
-    "Josies",
-    "Julies",
-    "Kalgoorlies",
-    "Kathies",
-    "Katies",
-    "Kellies",
-    "Kewpies",
-    "Kristies",
-    "Laramies",
-    "Lassies",
-    "Lauries",
-    "Leslies",
-    "Lessies",
-    "Lillies",
-    "Lizzies",
-    "Lonnies",
-    "Lories",
-    "Lorries",
-    "Lotties",
-    "Louies",
-    "Mackenzies",
-    "Maggies",
-    "Maisies",
-    "Mamies",
-    "Marcies",
-    "Margies",
-    "Maries",
-    "Marjories",
-    "Matties",
-    "McKenzies",
-    "Melanies",
-    "Mickies",
-    "Millies",
-    "Minnies",
-    "Mollies",
-    "Mounties",
-    "Nannies",
-    "Natalies",
-    "Nellies",
-    "Netties",
-    "Ollies",
-    "Ozzies",
-    "Pearlies",
-    "Pottawatomies",
-    "Reggies",
-    "Richies",
-    "Rickies",
-    "Robbies",
-    "Ronnies",
-    "Rosalies",
-    "Rosemaries",
-    "Rosies",
-    "Roxies",
-    "Rushdies",
-    "Ruthies",
-    "Sadies",
-    "Sallies",
-    "Sammies",
-    "Scotties",
-    "Selassies",
-    "Sherries",
-    "Sophies",
-    "Stacies",
-    "Stefanies",
-    "Stephanies",
-    "Stevies",
-    "Susies",
-    "Sylvies",
-    "Tammies",
-    "Terries",
-    "Tessies",
-    "Tommies",
-    "Tracies",
-    "Trekkies",
-    "Valaries",
-    "Valeries",
-    "Valkyries",
-    "Vickies",
-    "Virgies",
-    "Willies",
-    "Winnies",
-    "Wylies",
-    "Yorkies",
-)
-
-si_sb_ies_ie = (
-    "aeries",
-    "baggies",
-    "belies",
-    "biggies",
-    "birdies",
-    "bogies",
-    "bonnies",
-    "boogies",
-    "bookies",
-    "bourgeoisies",
-    "brownies",
-    "budgies",
-    "caddies",
-    "calories",
-    "camaraderies",
-    "cockamamies",
-    "collies",
-    "cookies",
-    "coolies",
-    "cooties",
-    "coteries",
-    "crappies",
-    "curies",
-    "cutesies",
-    "dogies",
-    "eyries",
-    "floozies",
-    "footsies",
-    "freebies",
-    "genies",
-    "goalies",
-    "groupies",
-    "hies",
-    "jalousies",
-    "junkies",
-    "kiddies",
-    "laddies",
-    "lassies",
-    "lies",
-    "lingeries",
-    "magpies",
-    "menageries",
-    "mommies",
-    "movies",
-    "neckties",
-    "newbies",
-    "nighties",
-    "oldies",
-    "organdies",
-    "overlies",
-    "pies",
-    "pinkies",
-    "pixies",
-    "potpies",
-    "prairies",
-    "quickies",
-    "reveries",
-    "rookies",
-    "rotisseries",
-    "softies",
-    "sorties",
-    "species",
-    "stymies",
-    "sweeties",
-    "ties",
-    "underlies",
-    "unties",
-    "veggies",
-    "vies",
-    "yuppies",
-    "zombies",
-)
-
-
-si_sb_oes_oe_case = (
-    "Chloes",
-    "Crusoes",
-    "Defoes",
-    "Faeroes",
-    "Ivanhoes",
-    "Joes",
-    "McEnroes",
-    "Moes",
-    "Monroes",
-    "Noes",
-    "Poes",
-    "Roscoes",
-    "Tahoes",
-    "Tippecanoes",
-    "Zoes",
-)
-
-si_sb_oes_oe = (
-    "aloes",
-    "backhoes",
-    "canoes",
-    "does",
-    "floes",
-    "foes",
-    "hoes",
-    "mistletoes",
-    "oboes",
-    "pekoes",
-    "roes",
-    "sloes",
-    "throes",
-    "tiptoes",
-    "toes",
-    "woes",
-)
-
-si_sb_z_zes = ("quartzes", "topazes")
-
-si_sb_zzes_zz = ("buzzes", "fizzes", "frizzes", "razzes")
-
-si_sb_ches_che_case = (
-    "Andromaches",
-    "Apaches",
-    "Blanches",
-    "Comanches",
-    "Nietzsches",
-    "Porsches",
-    "Roches",
-)
-
-si_sb_ches_che = (
-    "aches",
-    "avalanches",
-    "backaches",
-    "bellyaches",
-    "caches",
-    "cloches",
-    "creches",
-    "douches",
-    "earaches",
-    "fiches",
-    "headaches",
-    "heartaches",
-    "microfiches",
-    "niches",
-    "pastiches",
-    "psyches",
-    "quiches",
-    "stomachaches",
-    "toothaches",
-    "tranches",
-)
-
-si_sb_xes_xe = ("annexes", "axes", "deluxes", "pickaxes")
-
-si_sb_sses_sse_case = ("Hesses", "Jesses", "Larousses", "Matisses")
-si_sb_sses_sse = (
-    "bouillabaisses",
-    "crevasses",
-    "demitasses",
-    "impasses",
-    "mousses",
-    "posses",
-)
-
-si_sb_ves_ve_case = (
-    # *[nwl]ives -> [nwl]live
-    "Clives",
-    "Palmolives",
-)
-si_sb_ves_ve = (
-    # *[^d]eaves -> eave
-    "interweaves",
-    "weaves",
-    # *[nwl]ives -> [nwl]live
-    "olives",
-    # *[eoa]lves -> [eoa]lve
-    "bivalves",
-    "dissolves",
-    "resolves",
-    "salves",
-    "twelves",
-    "valves",
-)
-
-
-plverb_special_s = enclose(
-    "|".join(
-        [pl_sb_singular_s]
-        + pl_sb_uninflected_s
-        + list(pl_sb_irregular_s)
-        + ["(.*[csx])is", "(.*)ceps", "[A-Z].*s"]
-    )
-)
-
-_pl_sb_postfix_adj_defn = (
-    ("general", enclose(r"(?!major|lieutenant|brigadier|adjutant|.*star)\S+")),
-    ("martial", enclose("court")),
-    ("force", enclose("pound")),
-)
-
-pl_sb_postfix_adj: Iterable[str] = (
-    enclose(val + f"(?=(?:-|\\s+){key})") for key, val in _pl_sb_postfix_adj_defn
-)
-
-pl_sb_postfix_adj_stems = f"({'|'.join(pl_sb_postfix_adj)})(.*)"
-
-
-# PLURAL WORDS ENDING IS es GO TO SINGULAR is
-
-si_sb_es_is = (
-    "amanuenses",
-    "amniocenteses",
-    "analyses",
-    "antitheses",
-    "apotheoses",
-    "arterioscleroses",
-    "atheroscleroses",
-    "axes",
-    # 'bases', # bases -> basis
-    "catalyses",
-    "catharses",
-    "chasses",
-    "cirrhoses",
-    "cocces",
-    "crises",
-    "diagnoses",
-    "dialyses",
-    "diereses",
-    "electrolyses",
-    "emphases",
-    "exegeses",
-    "geneses",
-    "halitoses",
-    "hydrolyses",
-    "hypnoses",
-    "hypotheses",
-    "hystereses",
-    "metamorphoses",
-    "metastases",
-    "misdiagnoses",
-    "mitoses",
-    "mononucleoses",
-    "narcoses",
-    "necroses",
-    "nemeses",
-    "neuroses",
-    "oases",
-    "osmoses",
-    "osteoporoses",
-    "paralyses",
-    "parentheses",
-    "parthenogeneses",
-    "periphrases",
-    "photosyntheses",
-    "probosces",
-    "prognoses",
-    "prophylaxes",
-    "prostheses",
-    "preces",
-    "psoriases",
-    "psychoanalyses",
-    "psychokineses",
-    "psychoses",
-    "scleroses",
-    "scolioses",
-    "sepses",
-    "silicoses",
-    "symbioses",
-    "synopses",
-    "syntheses",
-    "taxes",
-    "telekineses",
-    "theses",
-    "thromboses",
-    "tuberculoses",
-    "urinalyses",
-)
-
-pl_prep_list = """
-    about above across after among around at athwart before behind
-    below beneath beside besides between betwixt beyond but by
-    during except for from in into near of off on onto out over
-    since till to under until unto upon with""".split()
-
-pl_prep_list_da = pl_prep_list + ["de", "du", "da"]
-
-pl_prep_bysize = bysize(pl_prep_list_da)
-
-pl_prep = enclose("|".join(pl_prep_list_da))
-
-pl_sb_prep_dual_compound = rf"(.*?)((?:-|\s+)(?:{pl_prep})(?:-|\s+))a(?:-|\s+)(.*)"
-
-
-singular_pronoun_genders = {
-    "neuter",
-    "feminine",
-    "masculine",
-    "gender-neutral",
-    "feminine or masculine",
-    "masculine or feminine",
-}
-
-pl_pron_nom = {
-    # NOMINATIVE    REFLEXIVE
-    "i": "we",
-    "myself": "ourselves",
-    "you": "you",
-    "yourself": "yourselves",
-    "she": "they",
-    "herself": "themselves",
-    "he": "they",
-    "himself": "themselves",
-    "it": "they",
-    "itself": "themselves",
-    "they": "they",
-    "themself": "themselves",
-    #   POSSESSIVE
-    "mine": "ours",
-    "yours": "yours",
-    "hers": "theirs",
-    "his": "theirs",
-    "its": "theirs",
-    "theirs": "theirs",
-}
-
-si_pron: Dict[str, Dict[str, Union[str, Dict[str, str]]]] = {
-    "nom": {v: k for (k, v) in pl_pron_nom.items()}
-}
-si_pron["nom"]["we"] = "I"
-
-
-pl_pron_acc = {
-    # ACCUSATIVE    REFLEXIVE
-    "me": "us",
-    "myself": "ourselves",
-    "you": "you",
-    "yourself": "yourselves",
-    "her": "them",
-    "herself": "themselves",
-    "him": "them",
-    "himself": "themselves",
-    "it": "them",
-    "itself": "themselves",
-    "them": "them",
-    "themself": "themselves",
-}
-
-pl_pron_acc_keys = enclose("|".join(pl_pron_acc))
-pl_pron_acc_keys_bysize = bysize(pl_pron_acc)
-
-si_pron["acc"] = {v: k for (k, v) in pl_pron_acc.items()}
-
-for _thecase, _plur, _gend, _sing in (
-    ("nom", "they", "neuter", "it"),
-    ("nom", "they", "feminine", "she"),
-    ("nom", "they", "masculine", "he"),
-    ("nom", "they", "gender-neutral", "they"),
-    ("nom", "they", "feminine or masculine", "she or he"),
-    ("nom", "they", "masculine or feminine", "he or she"),
-    ("nom", "themselves", "neuter", "itself"),
-    ("nom", "themselves", "feminine", "herself"),
-    ("nom", "themselves", "masculine", "himself"),
-    ("nom", "themselves", "gender-neutral", "themself"),
-    ("nom", "themselves", "feminine or masculine", "herself or himself"),
-    ("nom", "themselves", "masculine or feminine", "himself or herself"),
-    ("nom", "theirs", "neuter", "its"),
-    ("nom", "theirs", "feminine", "hers"),
-    ("nom", "theirs", "masculine", "his"),
-    ("nom", "theirs", "gender-neutral", "theirs"),
-    ("nom", "theirs", "feminine or masculine", "hers or his"),
-    ("nom", "theirs", "masculine or feminine", "his or hers"),
-    ("acc", "them", "neuter", "it"),
-    ("acc", "them", "feminine", "her"),
-    ("acc", "them", "masculine", "him"),
-    ("acc", "them", "gender-neutral", "them"),
-    ("acc", "them", "feminine or masculine", "her or him"),
-    ("acc", "them", "masculine or feminine", "him or her"),
-    ("acc", "themselves", "neuter", "itself"),
-    ("acc", "themselves", "feminine", "herself"),
-    ("acc", "themselves", "masculine", "himself"),
-    ("acc", "themselves", "gender-neutral", "themself"),
-    ("acc", "themselves", "feminine or masculine", "herself or himself"),
-    ("acc", "themselves", "masculine or feminine", "himself or herself"),
-):
-    try:
-        si_pron[_thecase][_plur][_gend] = _sing  # type: ignore
-    except TypeError:
-        si_pron[_thecase][_plur] = {}
-        si_pron[_thecase][_plur][_gend] = _sing  # type: ignore
-
-
-si_pron_acc_keys = enclose("|".join(si_pron["acc"]))
-si_pron_acc_keys_bysize = bysize(si_pron["acc"])
-
-
-def get_si_pron(thecase, word, gender) -> str:
-    try:
-        sing = si_pron[thecase][word]
-    except KeyError:
-        raise  # not a pronoun
-    try:
-        return sing[gender]  # has several types due to gender
-    except TypeError:
-        return cast(str, sing)  # answer independent of gender
-
-
-# These dictionaries group verbs by first, second and third person
-# conjugations.
-
-plverb_irregular_pres = {
-    "am": "are",
-    "are": "are",
-    "is": "are",
-    "was": "were",
-    "were": "were",
-    "have": "have",
-    "has": "have",
-    "do": "do",
-    "does": "do",
-}
-
-plverb_ambiguous_pres = {
-    "act": "act",
-    "acts": "act",
-    "blame": "blame",
-    "blames": "blame",
-    "can": "can",
-    "must": "must",
-    "fly": "fly",
-    "flies": "fly",
-    "copy": "copy",
-    "copies": "copy",
-    "drink": "drink",
-    "drinks": "drink",
-    "fight": "fight",
-    "fights": "fight",
-    "fire": "fire",
-    "fires": "fire",
-    "like": "like",
-    "likes": "like",
-    "look": "look",
-    "looks": "look",
-    "make": "make",
-    "makes": "make",
-    "reach": "reach",
-    "reaches": "reach",
-    "run": "run",
-    "runs": "run",
-    "sink": "sink",
-    "sinks": "sink",
-    "sleep": "sleep",
-    "sleeps": "sleep",
-    "view": "view",
-    "views": "view",
-}
-
-plverb_ambiguous_pres_keys = re.compile(
-    rf"^({enclose('|'.join(plverb_ambiguous_pres))})((\s.*)?)$", re.IGNORECASE
-)
-
-
-plverb_irregular_non_pres = (
-    "did",
-    "had",
-    "ate",
-    "made",
-    "put",
-    "spent",
-    "fought",
-    "sank",
-    "gave",
-    "sought",
-    "shall",
-    "could",
-    "ought",
-    "should",
-)
-
-plverb_ambiguous_non_pres = re.compile(
-    r"^((?:thought|saw|bent|will|might|cut))((\s.*)?)$", re.IGNORECASE
-)
-
-# "..oes" -> "..oe" (the rest are "..oes" -> "o")
-
-pl_v_oes_oe = ("canoes", "floes", "oboes", "roes", "throes", "woes")
-pl_v_oes_oe_endings_size4 = ("hoes", "toes")
-pl_v_oes_oe_endings_size5 = ("shoes",)
-
-
-pl_count_zero = ("0", "no", "zero", "nil")
-
-
-pl_count_one = ("1", "a", "an", "one", "each", "every", "this", "that")
-
-pl_adj_special = {"a": "some", "an": "some", "this": "these", "that": "those"}
-
-pl_adj_special_keys = re.compile(
-    rf"^({enclose('|'.join(pl_adj_special))})$", re.IGNORECASE
-)
-
-pl_adj_poss = {
-    "my": "our",
-    "your": "your",
-    "its": "their",
-    "her": "their",
-    "his": "their",
-    "their": "their",
-}
-
-pl_adj_poss_keys = re.compile(rf"^({enclose('|'.join(pl_adj_poss))})$", re.IGNORECASE)
-
-
-# 2. INDEFINITE ARTICLES
-
-# THIS PATTERN MATCHES STRINGS OF CAPITALS STARTING WITH A "VOWEL-SOUND"
-# CONSONANT FOLLOWED BY ANOTHER CONSONANT, AND WHICH ARE NOT LIKELY
-# TO BE REAL WORDS (OH, ALL RIGHT THEN, IT'S JUST MAGIC!)
-
-A_abbrev = re.compile(
-    r"""
-^(?! FJO | [HLMNS]Y.  | RY[EO] | SQU
-  | ( F[LR]? | [HL] | MN? | N | RH? | S[CHKLMNPTVW]? | X(YL)?) [AEIOU])
-[FHLMNRSX][A-Z]
-""",
-    re.VERBOSE,
-)
-
-# THIS PATTERN CODES THE BEGINNINGS OF ALL ENGLISH WORDS BEGINING WITH A
-# 'y' FOLLOWED BY A CONSONANT. ANY OTHER Y-CONSONANT PREFIX THEREFORE
-# IMPLIES AN ABBREVIATION.
-
-A_y_cons = re.compile(r"^(y(b[lor]|cl[ea]|fere|gg|p[ios]|rou|tt))", re.IGNORECASE)
-
-# EXCEPTIONS TO EXCEPTIONS
-
-A_explicit_a = re.compile(r"^((?:unabomber|unanimous|US))", re.IGNORECASE)
-
-A_explicit_an = re.compile(
-    r"^((?:euler|hour(?!i)|heir|honest|hono[ur]|mpeg))", re.IGNORECASE
-)
-
-A_ordinal_an = re.compile(r"^([aefhilmnorsx]-?th)", re.IGNORECASE)
-
-A_ordinal_a = re.compile(r"^([bcdgjkpqtuvwyz]-?th)", re.IGNORECASE)
-
-
-# NUMERICAL INFLECTIONS
-
-nth = {
-    0: "th",
-    1: "st",
-    2: "nd",
-    3: "rd",
-    4: "th",
-    5: "th",
-    6: "th",
-    7: "th",
-    8: "th",
-    9: "th",
-    11: "th",
-    12: "th",
-    13: "th",
-}
-nth_suff = set(nth.values())
-
-ordinal = dict(
-    ty="tieth",
-    one="first",
-    two="second",
-    three="third",
-    five="fifth",
-    eight="eighth",
-    nine="ninth",
-    twelve="twelfth",
-)
-
-ordinal_suff = re.compile(rf"({'|'.join(ordinal)})\Z")
-
-
-# NUMBERS
-
-unit = ["", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine"]
-teen = [
-    "ten",
-    "eleven",
-    "twelve",
-    "thirteen",
-    "fourteen",
-    "fifteen",
-    "sixteen",
-    "seventeen",
-    "eighteen",
-    "nineteen",
-]
-ten = [
-    "",
-    "",
-    "twenty",
-    "thirty",
-    "forty",
-    "fifty",
-    "sixty",
-    "seventy",
-    "eighty",
-    "ninety",
-]
-mill = [
-    " ",
-    " thousand",
-    " million",
-    " billion",
-    " trillion",
-    " quadrillion",
-    " quintillion",
-    " sextillion",
-    " septillion",
-    " octillion",
-    " nonillion",
-    " decillion",
-]
-
-
-# SUPPORT CLASSICAL PLURALIZATIONS
-
-def_classical = dict(
-    all=False, zero=False, herd=False, names=True, persons=False, ancient=False
-)
-
-all_classical = {k: True for k in def_classical}
-no_classical = {k: False for k in def_classical}
-
-
-# Maps strings to built-in constant types
-string_to_constant = {"True": True, "False": False, "None": None}
-
-
-# Pre-compiled regular expression objects
-DOLLAR_DIGITS = re.compile(r"\$(\d+)")
-FUNCTION_CALL = re.compile(r"((\w+)\([^)]*\)*)", re.IGNORECASE)
-PARTITION_WORD = re.compile(r"\A(\s*)(.+?)(\s*)\Z")
-PL_SB_POSTFIX_ADJ_STEMS_RE = re.compile(
-    rf"^(?:{pl_sb_postfix_adj_stems})$", re.IGNORECASE
-)
-PL_SB_PREP_DUAL_COMPOUND_RE = re.compile(
-    rf"^(?:{pl_sb_prep_dual_compound})$", re.IGNORECASE
-)
-DENOMINATOR = re.compile(r"(?P<denominator>.+)( (per|a) .+)")
-PLVERB_SPECIAL_S_RE = re.compile(rf"^({plverb_special_s})$")
-WHITESPACE = re.compile(r"\s")
-ENDS_WITH_S = re.compile(r"^(.*[^s])s$", re.IGNORECASE)
-ENDS_WITH_APOSTROPHE_S = re.compile(r"^(.*)'s?$")
-INDEFINITE_ARTICLE_TEST = re.compile(r"\A(\s*)(?:an?\s+)?(.+?)(\s*)\Z", re.IGNORECASE)
-SPECIAL_AN = re.compile(r"^[aefhilmnorsx]$", re.IGNORECASE)
-SPECIAL_A = re.compile(r"^[bcdgjkpqtuvwyz]$", re.IGNORECASE)
-SPECIAL_ABBREV_AN = re.compile(r"^[aefhilmnorsx][.-]", re.IGNORECASE)
-SPECIAL_ABBREV_A = re.compile(r"^[a-z][.-]", re.IGNORECASE)
-CONSONANTS = re.compile(r"^[^aeiouy]", re.IGNORECASE)
-ARTICLE_SPECIAL_EU = re.compile(r"^e[uw]", re.IGNORECASE)
-ARTICLE_SPECIAL_ONCE = re.compile(r"^onc?e\b", re.IGNORECASE)
-ARTICLE_SPECIAL_ONETIME = re.compile(r"^onetime\b", re.IGNORECASE)
-ARTICLE_SPECIAL_UNIT = re.compile(r"^uni([^nmd]|mo)", re.IGNORECASE)
-ARTICLE_SPECIAL_UBA = re.compile(r"^u[bcfghjkqrst][aeiou]", re.IGNORECASE)
-ARTICLE_SPECIAL_UKR = re.compile(r"^ukr", re.IGNORECASE)
-SPECIAL_CAPITALS = re.compile(r"^U[NK][AIEO]?")
-VOWELS = re.compile(r"^[aeiou]", re.IGNORECASE)
-
-DIGIT_GROUP = re.compile(r"(\d)")
-TWO_DIGITS = re.compile(r"(\d)(\d)")
-THREE_DIGITS = re.compile(r"(\d)(\d)(\d)")
-THREE_DIGITS_WORD = re.compile(r"(\d)(\d)(\d)(?=\D*\Z)")
-TWO_DIGITS_WORD = re.compile(r"(\d)(\d)(?=\D*\Z)")
-ONE_DIGIT_WORD = re.compile(r"(\d)(?=\D*\Z)")
-
-FOUR_DIGIT_COMMA = re.compile(r"(\d)(\d{3}(?:,|\Z))")
-NON_DIGIT = re.compile(r"\D")
-WHITESPACES_COMMA = re.compile(r"\s+,")
-COMMA_WORD = re.compile(r", (\S+)\s+\Z")
-WHITESPACES = re.compile(r"\s+")
-
-
-PRESENT_PARTICIPLE_REPLACEMENTS = (
-    (re.compile(r"ie$"), r"y"),
-    (
-        re.compile(r"ue$"),
-        r"u",
-    ),  # TODO: isn't ue$ -> u encompassed in the following rule?
-    (re.compile(r"([auy])e$"), r"\g<1>"),
-    (re.compile(r"ski$"), r"ski"),
-    (re.compile(r"[^b]i$"), r""),
-    (re.compile(r"^(are|were)$"), r"be"),
-    (re.compile(r"^(had)$"), r"hav"),
-    (re.compile(r"^(hoe)$"), r"\g<1>"),
-    (re.compile(r"([^e])e$"), r"\g<1>"),
-    (re.compile(r"er$"), r"er"),
-    (re.compile(r"([^aeiou][aeiouy]([bdgmnprst]))$"), r"\g<1>\g<2>"),
-)
-
-DIGIT = re.compile(r"\d")
-
-
-class Words(str):
-    lowered: str
-    split_: List[str]
-    first: str
-    last: str
-
-    def __init__(self, orig) -> None:
-        self.lowered = self.lower()
-        self.split_ = self.split()
-        self.first = self.split_[0]
-        self.last = self.split_[-1]
-
-
-Falsish = Any  # ideally, falsish would only validate on bool(value) is False
-
-
-_STATIC_TYPE_CHECKING = TYPE_CHECKING
-# ^-- Workaround for typeguard AST manipulation:
-#     https://github.com/agronholm/typeguard/issues/353#issuecomment-1556306554
-
-if _STATIC_TYPE_CHECKING:  # pragma: no cover
-    Word = Annotated[str, "String with at least 1 character"]
-else:
-
-    class _WordMeta(type):  # Too dynamic to be supported by mypy...
-        def __instancecheck__(self, instance: Any) -> bool:
-            return isinstance(instance, str) and len(instance) >= 1
-
-    class Word(metaclass=_WordMeta):  # type: ignore[no-redef]
-        """String with at least 1 character"""
-
-
-class engine:
-    def __init__(self) -> None:
-        self.classical_dict = def_classical.copy()
-        self.persistent_count: Optional[int] = None
-        self.mill_count = 0
-        self.pl_sb_user_defined: List[Optional[Word]] = []
-        self.pl_v_user_defined: List[Optional[Word]] = []
-        self.pl_adj_user_defined: List[Optional[Word]] = []
-        self.si_sb_user_defined: List[Optional[Word]] = []
-        self.A_a_user_defined: List[Optional[Word]] = []
-        self.thegender = "neuter"
-        self.__number_args: Optional[Dict[str, str]] = None
-
-    @property
-    def _number_args(self):
-        return cast(Dict[str, str], self.__number_args)
-
-    @_number_args.setter
-    def _number_args(self, val):
-        self.__number_args = val
-
-    @typechecked
-    def defnoun(self, singular: Optional[Word], plural: Optional[Word]) -> int:
-        """
-        Set the noun plural of singular to plural.
-
-        """
-        self.checkpat(singular)
-        self.checkpatplural(plural)
-        self.pl_sb_user_defined.extend((singular, plural))
-        self.si_sb_user_defined.extend((plural, singular))
-        return 1
-
-    @typechecked
-    def defverb(
-        self,
-        s1: Optional[Word],
-        p1: Optional[Word],
-        s2: Optional[Word],
-        p2: Optional[Word],
-        s3: Optional[Word],
-        p3: Optional[Word],
-    ) -> int:
-        """
-        Set the verb plurals for s1, s2 and s3 to p1, p2 and p3 respectively.
-
-        Where 1, 2 and 3 represent the 1st, 2nd and 3rd person forms of the verb.
-
-        """
-        self.checkpat(s1)
-        self.checkpat(s2)
-        self.checkpat(s3)
-        self.checkpatplural(p1)
-        self.checkpatplural(p2)
-        self.checkpatplural(p3)
-        self.pl_v_user_defined.extend((s1, p1, s2, p2, s3, p3))
-        return 1
-
-    @typechecked
-    def defadj(self, singular: Optional[Word], plural: Optional[Word]) -> int:
-        """
-        Set the adjective plural of singular to plural.
-
-        """
-        self.checkpat(singular)
-        self.checkpatplural(plural)
-        self.pl_adj_user_defined.extend((singular, plural))
-        return 1
-
-    @typechecked
-    def defa(self, pattern: Optional[Word]) -> int:
-        """
-        Define the indefinite article as 'a' for words matching pattern.
-
-        """
-        self.checkpat(pattern)
-        self.A_a_user_defined.extend((pattern, "a"))
-        return 1
-
-    @typechecked
-    def defan(self, pattern: Optional[Word]) -> int:
-        """
-        Define the indefinite article as 'an' for words matching pattern.
-
-        """
-        self.checkpat(pattern)
-        self.A_a_user_defined.extend((pattern, "an"))
-        return 1
-
-    def checkpat(self, pattern: Optional[Word]) -> None:
-        """
-        check for errors in a regex pattern
-        """
-        if pattern is None:
-            return
-        try:
-            re.match(pattern, "")
-        except re.error as err:
-            raise BadUserDefinedPatternError(pattern) from err
-
-    def checkpatplural(self, pattern: Optional[Word]) -> None:
-        """
-        check for errors in a regex replace pattern
-        """
-        return
-
-    @typechecked
-    def ud_match(self, word: Word, wordlist: Sequence[Optional[Word]]) -> Optional[str]:
-        for i in range(len(wordlist) - 2, -2, -2):  # backwards through even elements
-            mo = re.search(rf"^{wordlist[i]}$", word, re.IGNORECASE)
-            if mo:
-                if wordlist[i + 1] is None:
-                    return None
-                pl = DOLLAR_DIGITS.sub(
-                    r"\\1", cast(Word, wordlist[i + 1])
-                )  # change $n to \n for expand
-                return mo.expand(pl)
-        return None
-
-    def classical(self, **kwargs) -> None:
-        """
-        turn classical mode on and off for various categories
-
-        turn on all classical modes:
-        classical()
-        classical(all=True)
-
-        turn on or off specific claassical modes:
-        e.g.
-        classical(herd=True)
-        classical(names=False)
-
-        By default all classical modes are off except names.
-
-        unknown value in args or key in kwargs raises
-        exception: UnknownClasicalModeError
-
-        """
-        if not kwargs:
-            self.classical_dict = all_classical.copy()
-            return
-        if "all" in kwargs:
-            if kwargs["all"]:
-                self.classical_dict = all_classical.copy()
-            else:
-                self.classical_dict = no_classical.copy()
-
-        for k, v in kwargs.items():
-            if k in def_classical:
-                self.classical_dict[k] = v
-            else:
-                raise UnknownClassicalModeError
-
-    def num(
-        self, count: Optional[int] = None, show: Optional[int] = None
-    ) -> str:  # (;$count,$show)
-        """
-        Set the number to be used in other method calls.
-
-        Returns count.
-
-        Set show to False to return '' instead.
-
-        """
-        if count is not None:
-            try:
-                self.persistent_count = int(count)
-            except ValueError as err:
-                raise BadNumValueError from err
-            if (show is None) or show:
-                return str(count)
-        else:
-            self.persistent_count = None
-        return ""
-
-    def gender(self, gender: str) -> None:
-        """
-        set the gender for the singular of plural pronouns
-
-        can be one of:
-        'neuter'                ('they' -> 'it')
-        'feminine'              ('they' -> 'she')
-        'masculine'             ('they' -> 'he')
-        'gender-neutral'        ('they' -> 'they')
-        'feminine or masculine' ('they' -> 'she or he')
-        'masculine or feminine' ('they' -> 'he or she')
-        """
-        if gender in singular_pronoun_genders:
-            self.thegender = gender
-        else:
-            raise BadGenderError
-
-    def _get_value_from_ast(self, obj):
-        """
-        Return the value of the ast object.
-        """
-        if isinstance(obj, ast.Num):
-            return obj.n
-        elif isinstance(obj, ast.Str):
-            return obj.s
-        elif isinstance(obj, ast.List):
-            return [self._get_value_from_ast(e) for e in obj.elts]
-        elif isinstance(obj, ast.Tuple):
-            return tuple([self._get_value_from_ast(e) for e in obj.elts])
-
-        # None, True and False are NameConstants in Py3.4 and above.
-        elif isinstance(obj, ast.NameConstant):
-            return obj.value
-
-        # Probably passed a variable name.
-        # Or passed a single word without wrapping it in quotes as an argument
-        # ex: p.inflect("I plural(see)") instead of p.inflect("I plural('see')")
-        raise NameError(f"name '{obj.id}' is not defined")
-
-    def _string_to_substitute(
-        self, mo: Match, methods_dict: Dict[str, Callable]
-    ) -> str:
-        """
-        Return the string to be substituted for the match.
-        """
-        matched_text, f_name = mo.groups()
-        # matched_text is the complete match string. e.g. plural_noun(cat)
-        # f_name is the function name. e.g. plural_noun
-
-        # Return matched_text if function name is not in methods_dict
-        if f_name not in methods_dict:
-            return matched_text
-
-        # Parse the matched text
-        a_tree = ast.parse(matched_text)
-
-        # get the args and kwargs from ast objects
-        args_list = [
-            self._get_value_from_ast(a)
-            for a in a_tree.body[0].value.args  # type: ignore[attr-defined]
-        ]
-        kwargs_list = {
-            kw.arg: self._get_value_from_ast(kw.value)
-            for kw in a_tree.body[0].value.keywords  # type: ignore[attr-defined]
-        }
-
-        # Call the corresponding function
-        return methods_dict[f_name](*args_list, **kwargs_list)
-
-    # 0. PERFORM GENERAL INFLECTIONS IN A STRING
-
-    @typechecked
-    def inflect(self, text: Word) -> str:
-        """
-        Perform inflections in a string.
-
-        e.g. inflect('The plural of cat is plural(cat)') returns
-        'The plural of cat is cats'
-
-        can use plural, plural_noun, plural_verb, plural_adj,
-        singular_noun, a, an, no, ordinal, number_to_words,
-        and prespart
-
-        """
-        save_persistent_count = self.persistent_count
-
-        # Dictionary of allowed methods
-        methods_dict: Dict[str, Callable] = {
-            "plural": self.plural,
-            "plural_adj": self.plural_adj,
-            "plural_noun": self.plural_noun,
-            "plural_verb": self.plural_verb,
-            "singular_noun": self.singular_noun,
-            "a": self.a,
-            "an": self.a,
-            "no": self.no,
-            "ordinal": self.ordinal,
-            "number_to_words": self.number_to_words,
-            "present_participle": self.present_participle,
-            "num": self.num,
-        }
-
-        # Regular expression to find Python's function call syntax
-        output = FUNCTION_CALL.sub(
-            lambda mo: self._string_to_substitute(mo, methods_dict), text
-        )
-        self.persistent_count = save_persistent_count
-        return output
-
-    # ## PLURAL SUBROUTINES
-
-    def postprocess(self, orig: str, inflected) -> str:
-        inflected = str(inflected)
-        if "|" in inflected:
-            word_options = inflected.split("|")
-            # When two parts of a noun need to be pluralized
-            if len(word_options[0].split(" ")) == len(word_options[1].split(" ")):
-                result = inflected.split("|")[self.classical_dict["all"]].split(" ")
-            # When only the last part of the noun needs to be pluralized
-            else:
-                result = inflected.split(" ")
-                for index, word in enumerate(result):
-                    if "|" in word:
-                        result[index] = word.split("|")[self.classical_dict["all"]]
-        else:
-            result = inflected.split(" ")
-
-        # Try to fix word wise capitalization
-        for index, word in enumerate(orig.split(" ")):
-            if word == "I":
-                # Is this the only word for exceptions like this
-                # Where the original is fully capitalized
-                # without 'meaning' capitalization?
-                # Also this fails to handle a capitalizaion in context
-                continue
-            if word.capitalize() == word:
-                result[index] = result[index].capitalize()
-            if word == word.upper():
-                result[index] = result[index].upper()
-        return " ".join(result)
-
-    def partition_word(self, text: str) -> Tuple[str, str, str]:
-        mo = PARTITION_WORD.search(text)
-        if mo:
-            return mo.group(1), mo.group(2), mo.group(3)
-        else:
-            return "", "", ""
-
-    @typechecked
-    def plural(self, text: Word, count: Optional[Union[str, int, Any]] = None) -> str:
-        """
-        Return the plural of text.
-
-        If count supplied, then return text if count is one of:
-            1, a, an, one, each, every, this, that
-
-        otherwise return the plural.
-
-        Whitespace at the start and end is preserved.
-
-        """
-        pre, word, post = self.partition_word(text)
-        if not word:
-            return text
-        plural = self.postprocess(
-            word,
-            self._pl_special_adjective(word, count)
-            or self._pl_special_verb(word, count)
-            or self._plnoun(word, count),
-        )
-        return f"{pre}{plural}{post}"
-
-    @typechecked
-    def plural_noun(
-        self, text: Word, count: Optional[Union[str, int, Any]] = None
-    ) -> str:
-        """
-        Return the plural of text, where text is a noun.
-
-        If count supplied, then return text if count is one of:
-            1, a, an, one, each, every, this, that
-
-        otherwise return the plural.
-
-        Whitespace at the start and end is preserved.
-
-        """
-        pre, word, post = self.partition_word(text)
-        if not word:
-            return text
-        plural = self.postprocess(word, self._plnoun(word, count))
-        return f"{pre}{plural}{post}"
-
-    @typechecked
-    def plural_verb(
-        self, text: Word, count: Optional[Union[str, int, Any]] = None
-    ) -> str:
-        """
-        Return the plural of text, where text is a verb.
-
-        If count supplied, then return text if count is one of:
-            1, a, an, one, each, every, this, that
-
-        otherwise return the plural.
-
-        Whitespace at the start and end is preserved.
-
-        """
-        pre, word, post = self.partition_word(text)
-        if not word:
-            return text
-        plural = self.postprocess(
-            word,
-            self._pl_special_verb(word, count) or self._pl_general_verb(word, count),
-        )
-        return f"{pre}{plural}{post}"
-
-    @typechecked
-    def plural_adj(
-        self, text: Word, count: Optional[Union[str, int, Any]] = None
-    ) -> str:
-        """
-        Return the plural of text, where text is an adjective.
-
-        If count supplied, then return text if count is one of:
-            1, a, an, one, each, every, this, that
-
-        otherwise return the plural.
-
-        Whitespace at the start and end is preserved.
-
-        """
-        pre, word, post = self.partition_word(text)
-        if not word:
-            return text
-        plural = self.postprocess(word, self._pl_special_adjective(word, count) or word)
-        return f"{pre}{plural}{post}"
-
-    @typechecked
-    def compare(self, word1: Word, word2: Word) -> Union[str, bool]:
-        """
-        compare word1 and word2 for equality regardless of plurality
-
-        return values:
-        eq - the strings are equal
-        p:s - word1 is the plural of word2
-        s:p - word2 is the plural of word1
-        p:p - word1 and word2 are two different plural forms of the one word
-        False - otherwise
-
-        >>> compare = engine().compare
-        >>> compare("egg", "eggs")
-        's:p'
-        >>> compare('egg', 'egg')
-        'eq'
-
-        Words should not be empty.
-
-        >>> compare('egg', '')
-        Traceback (most recent call last):
-        ...
-        typeguard.TypeCheckError:...is not an instance of inflect.Word
-        """
-        norms = self.plural_noun, self.plural_verb, self.plural_adj
-        results = (self._plequal(word1, word2, norm) for norm in norms)
-        return next(filter(None, results), False)
-
-    @typechecked
-    def compare_nouns(self, word1: Word, word2: Word) -> Union[str, bool]:
-        """
-        compare word1 and word2 for equality regardless of plurality
-        word1 and word2 are to be treated as nouns
-
-        return values:
-        eq - the strings are equal
-        p:s - word1 is the plural of word2
-        s:p - word2 is the plural of word1
-        p:p - word1 and word2 are two different plural forms of the one word
-        False - otherwise
-
-        """
-        return self._plequal(word1, word2, self.plural_noun)
-
-    @typechecked
-    def compare_verbs(self, word1: Word, word2: Word) -> Union[str, bool]:
-        """
-        compare word1 and word2 for equality regardless of plurality
-        word1 and word2 are to be treated as verbs
-
-        return values:
-        eq - the strings are equal
-        p:s - word1 is the plural of word2
-        s:p - word2 is the plural of word1
-        p:p - word1 and word2 are two different plural forms of the one word
-        False - otherwise
-
-        """
-        return self._plequal(word1, word2, self.plural_verb)
-
-    @typechecked
-    def compare_adjs(self, word1: Word, word2: Word) -> Union[str, bool]:
-        """
-        compare word1 and word2 for equality regardless of plurality
-        word1 and word2 are to be treated as adjectives
-
-        return values:
-        eq - the strings are equal
-        p:s - word1 is the plural of word2
-        s:p - word2 is the plural of word1
-        p:p - word1 and word2 are two different plural forms of the one word
-        False - otherwise
-
-        """
-        return self._plequal(word1, word2, self.plural_adj)
-
-    @typechecked
-    def singular_noun(
-        self,
-        text: Word,
-        count: Optional[Union[int, str, Any]] = None,
-        gender: Optional[str] = None,
-    ) -> Union[str, Literal[False]]:
-        """
-        Return the singular of text, where text is a plural noun.
-
-        If count supplied, then return the singular if count is one of:
-            1, a, an, one, each, every, this, that or if count is None
-
-        otherwise return text unchanged.
-
-        Whitespace at the start and end is preserved.
-
-        >>> p = engine()
-        >>> p.singular_noun('horses')
-        'horse'
-        >>> p.singular_noun('knights')
-        'knight'
-
-        Returns False when a singular noun is passed.
-
-        >>> p.singular_noun('horse')
-        False
-        >>> p.singular_noun('knight')
-        False
-        >>> p.singular_noun('soldier')
-        False
-
-        """
-        pre, word, post = self.partition_word(text)
-        if not word:
-            return text
-        sing = self._sinoun(word, count=count, gender=gender)
-        if sing is not False:
-            plural = self.postprocess(word, sing)
-            return f"{pre}{plural}{post}"
-        return False
-
-    def _plequal(self, word1: str, word2: str, pl) -> Union[str, bool]:  # noqa: C901
-        classval = self.classical_dict.copy()
-        self.classical_dict = all_classical.copy()
-        if word1 == word2:
-            return "eq"
-        if word1 == pl(word2):
-            return "p:s"
-        if pl(word1) == word2:
-            return "s:p"
-        self.classical_dict = no_classical.copy()
-        if word1 == pl(word2):
-            return "p:s"
-        if pl(word1) == word2:
-            return "s:p"
-        self.classical_dict = classval.copy()
-
-        if pl == self.plural or pl == self.plural_noun:
-            if self._pl_check_plurals_N(word1, word2):
-                return "p:p"
-            if self._pl_check_plurals_N(word2, word1):
-                return "p:p"
-        if pl == self.plural or pl == self.plural_adj:
-            if self._pl_check_plurals_adj(word1, word2):
-                return "p:p"
-        return False
-
-    def _pl_reg_plurals(self, pair: str, stems: str, end1: str, end2: str) -> bool:
-        pattern = rf"({stems})({end1}\|\1{end2}|{end2}\|\1{end1})"
-        return bool(re.search(pattern, pair))
-
-    def _pl_check_plurals_N(self, word1: str, word2: str) -> bool:
-        stem_endings = (
-            (pl_sb_C_a_ata, "as", "ata"),
-            (pl_sb_C_is_ides, "is", "ides"),
-            (pl_sb_C_a_ae, "s", "e"),
-            (pl_sb_C_en_ina, "ens", "ina"),
-            (pl_sb_C_um_a, "ums", "a"),
-            (pl_sb_C_us_i, "uses", "i"),
-            (pl_sb_C_on_a, "ons", "a"),
-            (pl_sb_C_o_i_stems, "os", "i"),
-            (pl_sb_C_ex_ices, "exes", "ices"),
-            (pl_sb_C_ix_ices, "ixes", "ices"),
-            (pl_sb_C_i, "s", "i"),
-            (pl_sb_C_im, "s", "im"),
-            (".*eau", "s", "x"),
-            (".*ieu", "s", "x"),
-            (".*tri", "xes", "ces"),
-            (".{2,}[yia]n", "xes", "ges"),
-        )
-
-        words = map(Words, (word1, word2))
-        pair = "|".join(word.last for word in words)
-
-        return (
-            pair in pl_sb_irregular_s.values()
-            or pair in pl_sb_irregular.values()
-            or pair in pl_sb_irregular_caps.values()
-            or any(
-                self._pl_reg_plurals(pair, stems, end1, end2)
-                for stems, end1, end2 in stem_endings
-            )
-        )
-
-    def _pl_check_plurals_adj(self, word1: str, word2: str) -> bool:
-        word1a = word1[: word1.rfind("'")] if word1.endswith(("'s", "'")) else ""
-        word2a = word2[: word2.rfind("'")] if word2.endswith(("'s", "'")) else ""
-
-        return (
-            bool(word1a)
-            and bool(word2a)
-            and (
-                self._pl_check_plurals_N(word1a, word2a)
-                or self._pl_check_plurals_N(word2a, word1a)
-            )
-        )
-
-    def get_count(self, count: Optional[Union[str, int]] = None) -> Union[str, int]:
-        if count is None and self.persistent_count is not None:
-            count = self.persistent_count
-
-        if count is not None:
-            count = (
-                1
-                if (
-                    (str(count) in pl_count_one)
-                    or (
-                        self.classical_dict["zero"]
-                        and str(count).lower() in pl_count_zero
-                    )
-                )
-                else 2
-            )
-        else:
-            count = ""
-        return count
-
-    # @profile
-    def _plnoun(  # noqa: C901
-        self, word: str, count: Optional[Union[str, int]] = None
-    ) -> str:
-        count = self.get_count(count)
-
-        # DEFAULT TO PLURAL
-
-        if count == 1:
-            return word
-
-        # HANDLE USER-DEFINED NOUNS
-
-        value = self.ud_match(word, self.pl_sb_user_defined)
-        if value is not None:
-            return value
-
-        # HANDLE EMPTY WORD, SINGULAR COUNT AND UNINFLECTED PLURALS
-
-        if word == "":
-            return word
-
-        word = Words(word)
-
-        if word.last.lower() in pl_sb_uninflected_complete:
-            if len(word.split_) >= 3:
-                return self._handle_long_compounds(word, count=2) or word
-            return word
-
-        if word in pl_sb_uninflected_caps:
-            return word
-
-        for k, v in pl_sb_uninflected_bysize.items():
-            if word.lowered[-k:] in v:
-                return word
-
-        if self.classical_dict["herd"] and word.last.lower() in pl_sb_uninflected_herd:
-            return word
-
-        # HANDLE COMPOUNDS ("Governor General", "mother-in-law", "aide-de-camp", ETC.)
-
-        mo = PL_SB_POSTFIX_ADJ_STEMS_RE.search(word)
-        if mo and mo.group(2) != "":
-            return f"{self._plnoun(mo.group(1), 2)}{mo.group(2)}"
-
-        if " a " in word.lowered or "-a-" in word.lowered:
-            mo = PL_SB_PREP_DUAL_COMPOUND_RE.search(word)
-            if mo and mo.group(2) != "" and mo.group(3) != "":
-                return (
-                    f"{self._plnoun(mo.group(1), 2)}"
-                    f"{mo.group(2)}"
-                    f"{self._plnoun(mo.group(3))}"
-                )
-
-        if len(word.split_) >= 3:
-            handled_words = self._handle_long_compounds(word, count=2)
-            if handled_words is not None:
-                return handled_words
-
-        # only pluralize denominators in units
-        mo = DENOMINATOR.search(word.lowered)
-        if mo:
-            index = len(mo.group("denominator"))
-            return f"{self._plnoun(word[:index])}{word[index:]}"
-
-        # handle units given in degrees (only accept if
-        # there is no more than one word following)
-        # degree Celsius => degrees Celsius but degree
-        # fahrenheit hour => degree fahrenheit hours
-        if len(word.split_) >= 2 and word.split_[-2] == "degree":
-            return " ".join([self._plnoun(word.first)] + word.split_[1:])
-
-        with contextlib.suppress(ValueError):
-            return self._handle_prepositional_phrase(
-                word.lowered,
-                functools.partial(self._plnoun, count=2),
-                '-',
-            )
-
-        # HANDLE PRONOUNS
-
-        for k, v in pl_pron_acc_keys_bysize.items():
-            if word.lowered[-k:] in v:  # ends with accusative pronoun
-                for pk, pv in pl_prep_bysize.items():
-                    if word.lowered[:pk] in pv:  # starts with a prep
-                        if word.lowered.split() == [
-                            word.lowered[:pk],
-                            word.lowered[-k:],
-                        ]:
-                            # only whitespace in between
-                            return word.lowered[:-k] + pl_pron_acc[word.lowered[-k:]]
-
-        try:
-            return pl_pron_nom[word.lowered]
-        except KeyError:
-            pass
-
-        try:
-            return pl_pron_acc[word.lowered]
-        except KeyError:
-            pass
-
-        # HANDLE ISOLATED IRREGULAR PLURALS
-
-        if word.last in pl_sb_irregular_caps:
-            llen = len(word.last)
-            return f"{word[:-llen]}{pl_sb_irregular_caps[word.last]}"
-
-        lowered_last = word.last.lower()
-        if lowered_last in pl_sb_irregular:
-            llen = len(lowered_last)
-            return f"{word[:-llen]}{pl_sb_irregular[lowered_last]}"
-
-        dash_split = word.lowered.split('-')
-        if (" ".join(dash_split[-2:])).lower() in pl_sb_irregular_compound:
-            llen = len(
-                " ".join(dash_split[-2:])
-            )  # TODO: what if 2 spaces between these words?
-            return (
-                f"{word[:-llen]}"
-                f"{pl_sb_irregular_compound[(' '.join(dash_split[-2:])).lower()]}"
-            )
-
-        if word.lowered[-3:] == "quy":
-            return f"{word[:-1]}ies"
-
-        if word.lowered[-6:] == "person":
-            if self.classical_dict["persons"]:
-                return f"{word}s"
-            else:
-                return f"{word[:-4]}ople"
-
-        # HANDLE FAMILIES OF IRREGULAR PLURALS
-
-        if word.lowered[-3:] == "man":
-            for k, v in pl_sb_U_man_mans_bysize.items():
-                if word.lowered[-k:] in v:
-                    return f"{word}s"
-            for k, v in pl_sb_U_man_mans_caps_bysize.items():
-                if word[-k:] in v:
-                    return f"{word}s"
-            return f"{word[:-3]}men"
-        if word.lowered[-5:] == "mouse":
-            return f"{word[:-5]}mice"
-        if word.lowered[-5:] == "louse":
-            v = pl_sb_U_louse_lice_bysize.get(len(word))
-            if v and word.lowered in v:
-                return f"{word[:-5]}lice"
-            return f"{word}s"
-        if word.lowered[-5:] == "goose":
-            return f"{word[:-5]}geese"
-        if word.lowered[-5:] == "tooth":
-            return f"{word[:-5]}teeth"
-        if word.lowered[-4:] == "foot":
-            return f"{word[:-4]}feet"
-        if word.lowered[-4:] == "taco":
-            return f"{word[:-5]}tacos"
-
-        if word.lowered == "die":
-            return "dice"
-
-        # HANDLE UNASSIMILATED IMPORTS
-
-        if word.lowered[-4:] == "ceps":
-            return word
-        if word.lowered[-4:] == "zoon":
-            return f"{word[:-2]}a"
-        if word.lowered[-3:] in ("cis", "sis", "xis"):
-            return f"{word[:-2]}es"
-
-        for lastlet, d, numend, post in (
-            ("h", pl_sb_U_ch_chs_bysize, None, "s"),
-            ("x", pl_sb_U_ex_ices_bysize, -2, "ices"),
-            ("x", pl_sb_U_ix_ices_bysize, -2, "ices"),
-            ("m", pl_sb_U_um_a_bysize, -2, "a"),
-            ("s", pl_sb_U_us_i_bysize, -2, "i"),
-            ("n", pl_sb_U_on_a_bysize, -2, "a"),
-            ("a", pl_sb_U_a_ae_bysize, None, "e"),
-        ):
-            if word.lowered[-1] == lastlet:  # this test to add speed
-                for k, v in d.items():
-                    if word.lowered[-k:] in v:
-                        return word[:numend] + post
-
-        # HANDLE INCOMPLETELY ASSIMILATED IMPORTS
-
-        if self.classical_dict["ancient"]:
-            if word.lowered[-4:] == "trix":
-                return f"{word[:-1]}ces"
-            if word.lowered[-3:] in ("eau", "ieu"):
-                return f"{word}x"
-            if word.lowered[-3:] in ("ynx", "inx", "anx") and len(word) > 4:
-                return f"{word[:-1]}ges"
-
-            for lastlet, d, numend, post in (
-                ("n", pl_sb_C_en_ina_bysize, -2, "ina"),
-                ("x", pl_sb_C_ex_ices_bysize, -2, "ices"),
-                ("x", pl_sb_C_ix_ices_bysize, -2, "ices"),
-                ("m", pl_sb_C_um_a_bysize, -2, "a"),
-                ("s", pl_sb_C_us_i_bysize, -2, "i"),
-                ("s", pl_sb_C_us_us_bysize, None, ""),
-                ("a", pl_sb_C_a_ae_bysize, None, "e"),
-                ("a", pl_sb_C_a_ata_bysize, None, "ta"),
-                ("s", pl_sb_C_is_ides_bysize, -1, "des"),
-                ("o", pl_sb_C_o_i_bysize, -1, "i"),
-                ("n", pl_sb_C_on_a_bysize, -2, "a"),
-            ):
-                if word.lowered[-1] == lastlet:  # this test to add speed
-                    for k, v in d.items():
-                        if word.lowered[-k:] in v:
-                            return word[:numend] + post
-
-            for d, numend, post in (
-                (pl_sb_C_i_bysize, None, "i"),
-                (pl_sb_C_im_bysize, None, "im"),
-            ):
-                for k, v in d.items():
-                    if word.lowered[-k:] in v:
-                        return word[:numend] + post
-
-        # HANDLE SINGULAR NOUNS ENDING IN ...s OR OTHER SILIBANTS
-
-        if lowered_last in pl_sb_singular_s_complete:
-            return f"{word}es"
-
-        for k, v in pl_sb_singular_s_bysize.items():
-            if word.lowered[-k:] in v:
-                return f"{word}es"
-
-        if word.lowered[-2:] == "es" and word[0] == word[0].upper():
-            return f"{word}es"
-
-        if word.lowered[-1] == "z":
-            for k, v in pl_sb_z_zes_bysize.items():
-                if word.lowered[-k:] in v:
-                    return f"{word}es"
-
-            if word.lowered[-2:-1] != "z":
-                return f"{word}zes"
-
-        if word.lowered[-2:] == "ze":
-            for k, v in pl_sb_ze_zes_bysize.items():
-                if word.lowered[-k:] in v:
-                    return f"{word}s"
-
-        if word.lowered[-2:] in ("ch", "sh", "zz", "ss") or word.lowered[-1] == "x":
-            return f"{word}es"
-
-        # HANDLE ...f -> ...ves
-
-        if word.lowered[-3:] in ("elf", "alf", "olf"):
-            return f"{word[:-1]}ves"
-        if word.lowered[-3:] == "eaf" and word.lowered[-4:-3] != "d":
-            return f"{word[:-1]}ves"
-        if word.lowered[-4:] in ("nife", "life", "wife"):
-            return f"{word[:-2]}ves"
-        if word.lowered[-3:] == "arf":
-            return f"{word[:-1]}ves"
-
-        # HANDLE ...y
-
-        if word.lowered[-1] == "y":
-            if word.lowered[-2:-1] in "aeiou" or len(word) == 1:
-                return f"{word}s"
-
-            if self.classical_dict["names"]:
-                if word.lowered[-1] == "y" and word[0] == word[0].upper():
-                    return f"{word}s"
-
-            return f"{word[:-1]}ies"
-
-        # HANDLE ...o
-
-        if lowered_last in pl_sb_U_o_os_complete:
-            return f"{word}s"
-
-        for k, v in pl_sb_U_o_os_bysize.items():
-            if word.lowered[-k:] in v:
-                return f"{word}s"
-
-        if word.lowered[-2:] in ("ao", "eo", "io", "oo", "uo"):
-            return f"{word}s"
-
-        if word.lowered[-1] == "o":
-            return f"{word}es"
-
-        # OTHERWISE JUST ADD ...s
-
-        return f"{word}s"
-
-    @classmethod
-    def _handle_prepositional_phrase(cls, phrase, transform, sep):
-        """
-        Given a word or phrase possibly separated by sep, parse out
-        the prepositional phrase and apply the transform to the word
-        preceding the prepositional phrase.
-
-        Raise ValueError if the pivot is not found or if at least two
-        separators are not found.
-
-        >>> engine._handle_prepositional_phrase("man-of-war", str.upper, '-')
-        'MAN-of-war'
-        >>> engine._handle_prepositional_phrase("man of war", str.upper, ' ')
-        'MAN of war'
-        """
-        parts = phrase.split(sep)
-        if len(parts) < 3:
-            raise ValueError("Cannot handle words with fewer than two separators")
-
-        pivot = cls._find_pivot(parts, pl_prep_list_da)
-
-        transformed = transform(parts[pivot - 1]) or parts[pivot - 1]
-        return " ".join(
-            parts[: pivot - 1] + [sep.join([transformed, parts[pivot], ''])]
-        ) + " ".join(parts[(pivot + 1) :])
-
-    def _handle_long_compounds(self, word: Words, count: int) -> Union[str, None]:
-        """
-        Handles the plural and singular for compound `Words` that
-        have three or more words, based on the given count.
-
-        >>> engine()._handle_long_compounds(Words("pair of scissors"), 2)
-        'pairs of scissors'
-        >>> engine()._handle_long_compounds(Words("men beyond hills"), 1)
-        'man beyond hills'
-        """
-        inflection = self._sinoun if count == 1 else self._plnoun
-        solutions = (  # type: ignore
-            " ".join(
-                itertools.chain(
-                    leader,
-                    [inflection(cand, count), prep],  # type: ignore
-                    trailer,
-                )
-            )
-            for leader, (cand, prep), trailer in windowed_complete(word.split_, 2)
-            if prep in pl_prep_list_da  # type: ignore
-        )
-        return next(solutions, None)
-
-    @staticmethod
-    def _find_pivot(words, candidates):
-        pivots = (
-            index for index in range(1, len(words) - 1) if words[index] in candidates
-        )
-        try:
-            return next(pivots)
-        except StopIteration:
-            raise ValueError("No pivot found") from None
-
-    def _pl_special_verb(  # noqa: C901
-        self, word: str, count: Optional[Union[str, int]] = None
-    ) -> Union[str, bool]:
-        if self.classical_dict["zero"] and str(count).lower() in pl_count_zero:
-            return False
-        count = self.get_count(count)
-
-        if count == 1:
-            return word
-
-        # HANDLE USER-DEFINED VERBS
-
-        value = self.ud_match(word, self.pl_v_user_defined)
-        if value is not None:
-            return value
-
-        # HANDLE IRREGULAR PRESENT TENSE (SIMPLE AND COMPOUND)
-
-        try:
-            words = Words(word)
-        except IndexError:
-            return False  # word is ''
-
-        if words.first in plverb_irregular_pres:
-            return f"{plverb_irregular_pres[words.first]}{words[len(words.first) :]}"
-
-        # HANDLE IRREGULAR FUTURE, PRETERITE AND PERFECT TENSES
-
-        if words.first in plverb_irregular_non_pres:
-            return word
-
-        # HANDLE PRESENT NEGATIONS (SIMPLE AND COMPOUND)
-
-        if words.first.endswith("n't") and words.first[:-3] in plverb_irregular_pres:
-            return (
-                f"{plverb_irregular_pres[words.first[:-3]]}n't"
-                f"{words[len(words.first) :]}"
-            )
-
-        if words.first.endswith("n't"):
-            return word
-
-        # HANDLE SPECIAL CASES
-
-        mo = PLVERB_SPECIAL_S_RE.search(word)
-        if mo:
-            return False
-        if WHITESPACE.search(word):
-            return False
-
-        if words.lowered == "quizzes":
-            return "quiz"
-
-        # HANDLE STANDARD 3RD PERSON (CHOP THE ...(e)s OFF SINGLE WORDS)
-
-        if (
-            words.lowered[-4:] in ("ches", "shes", "zzes", "sses")
-            or words.lowered[-3:] == "xes"
-        ):
-            return words[:-2]
-
-        if words.lowered[-3:] == "ies" and len(words) > 3:
-            return words.lowered[:-3] + "y"
-
-        if (
-            words.last.lower() in pl_v_oes_oe
-            or words.lowered[-4:] in pl_v_oes_oe_endings_size4
-            or words.lowered[-5:] in pl_v_oes_oe_endings_size5
-        ):
-            return words[:-1]
-
-        if words.lowered.endswith("oes") and len(words) > 3:
-            return words.lowered[:-2]
-
-        mo = ENDS_WITH_S.search(words)
-        if mo:
-            return mo.group(1)
-
-        # OTHERWISE, A REGULAR VERB (HANDLE ELSEWHERE)
-
-        return False
-
-    def _pl_general_verb(
-        self, word: str, count: Optional[Union[str, int]] = None
-    ) -> str:
-        count = self.get_count(count)
-
-        if count == 1:
-            return word
-
-        # HANDLE AMBIGUOUS PRESENT TENSES  (SIMPLE AND COMPOUND)
-
-        mo = plverb_ambiguous_pres_keys.search(word)
-        if mo:
-            return f"{plverb_ambiguous_pres[mo.group(1).lower()]}{mo.group(2)}"
-
-        # HANDLE AMBIGUOUS PRETERITE AND PERFECT TENSES
-
-        mo = plverb_ambiguous_non_pres.search(word)
-        if mo:
-            return word
-
-        # OTHERWISE, 1st OR 2ND PERSON IS UNINFLECTED
-
-        return word
-
-    def _pl_special_adjective(
-        self, word: str, count: Optional[Union[str, int]] = None
-    ) -> Union[str, bool]:
-        count = self.get_count(count)
-
-        if count == 1:
-            return word
-
-        # HANDLE USER-DEFINED ADJECTIVES
-
-        value = self.ud_match(word, self.pl_adj_user_defined)
-        if value is not None:
-            return value
-
-        # HANDLE KNOWN CASES
-
-        mo = pl_adj_special_keys.search(word)
-        if mo:
-            return pl_adj_special[mo.group(1).lower()]
-
-        # HANDLE POSSESSIVES
-
-        mo = pl_adj_poss_keys.search(word)
-        if mo:
-            return pl_adj_poss[mo.group(1).lower()]
-
-        mo = ENDS_WITH_APOSTROPHE_S.search(word)
-        if mo:
-            pl = self.plural_noun(mo.group(1))
-            trailing_s = "" if pl[-1] == "s" else "s"
-            return f"{pl}'{trailing_s}"
-
-        # OTHERWISE, NO IDEA
-
-        return False
-
-    # @profile
-    def _sinoun(  # noqa: C901
-        self,
-        word: str,
-        count: Optional[Union[str, int]] = None,
-        gender: Optional[str] = None,
-    ) -> Union[str, bool]:
-        count = self.get_count(count)
-
-        # DEFAULT TO PLURAL
-
-        if count == 2:
-            return word
-
-        # SET THE GENDER
-
-        try:
-            if gender is None:
-                gender = self.thegender
-            elif gender not in singular_pronoun_genders:
-                raise BadGenderError
-        except (TypeError, IndexError) as err:
-            raise BadGenderError from err
-
-        # HANDLE USER-DEFINED NOUNS
-
-        value = self.ud_match(word, self.si_sb_user_defined)
-        if value is not None:
-            return value
-
-        # HANDLE EMPTY WORD, SINGULAR COUNT AND UNINFLECTED PLURALS
-
-        if word == "":
-            return word
-
-        if word in si_sb_ois_oi_case:
-            return word[:-1]
-
-        words = Words(word)
-
-        if words.last.lower() in pl_sb_uninflected_complete:
-            if len(words.split_) >= 3:
-                return self._handle_long_compounds(words, count=1) or word
-            return word
-
-        if word in pl_sb_uninflected_caps:
-            return word
-
-        for k, v in pl_sb_uninflected_bysize.items():
-            if words.lowered[-k:] in v:
-                return word
-
-        if self.classical_dict["herd"] and words.last.lower() in pl_sb_uninflected_herd:
-            return word
-
-        if words.last.lower() in pl_sb_C_us_us:
-            return word if self.classical_dict["ancient"] else False
-
-        # HANDLE COMPOUNDS ("Governor General", "mother-in-law", "aide-de-camp", ETC.)
-
-        mo = PL_SB_POSTFIX_ADJ_STEMS_RE.search(word)
-        if mo and mo.group(2) != "":
-            return f"{self._sinoun(mo.group(1), 1, gender=gender)}{mo.group(2)}"
-
-        with contextlib.suppress(ValueError):
-            return self._handle_prepositional_phrase(
-                words.lowered,
-                functools.partial(self._sinoun, count=1, gender=gender),
-                ' ',
-            )
-
-        with contextlib.suppress(ValueError):
-            return self._handle_prepositional_phrase(
-                words.lowered,
-                functools.partial(self._sinoun, count=1, gender=gender),
-                '-',
-            )
-
-        # HANDLE PRONOUNS
-
-        for k, v in si_pron_acc_keys_bysize.items():
-            if words.lowered[-k:] in v:  # ends with accusative pronoun
-                for pk, pv in pl_prep_bysize.items():
-                    if words.lowered[:pk] in pv:  # starts with a prep
-                        if words.lowered.split() == [
-                            words.lowered[:pk],
-                            words.lowered[-k:],
-                        ]:
-                            # only whitespace in between
-                            return words.lowered[:-k] + get_si_pron(
-                                "acc", words.lowered[-k:], gender
-                            )
-
-        try:
-            return get_si_pron("nom", words.lowered, gender)
-        except KeyError:
-            pass
-
-        try:
-            return get_si_pron("acc", words.lowered, gender)
-        except KeyError:
-            pass
-
-        # HANDLE ISOLATED IRREGULAR PLURALS
-
-        if words.last in si_sb_irregular_caps:
-            llen = len(words.last)
-            return f"{word[:-llen]}{si_sb_irregular_caps[words.last]}"
-
-        if words.last.lower() in si_sb_irregular:
-            llen = len(words.last.lower())
-            return f"{word[:-llen]}{si_sb_irregular[words.last.lower()]}"
-
-        dash_split = words.lowered.split("-")
-        if (" ".join(dash_split[-2:])).lower() in si_sb_irregular_compound:
-            llen = len(
-                " ".join(dash_split[-2:])
-            )  # TODO: what if 2 spaces between these words?
-            return "{}{}".format(
-                word[:-llen],
-                si_sb_irregular_compound[(" ".join(dash_split[-2:])).lower()],
-            )
-
-        if words.lowered[-5:] == "quies":
-            return word[:-3] + "y"
-
-        if words.lowered[-7:] == "persons":
-            return word[:-1]
-        if words.lowered[-6:] == "people":
-            return word[:-4] + "rson"
-
-        # HANDLE FAMILIES OF IRREGULAR PLURALS
-
-        if words.lowered[-4:] == "mans":
-            for k, v in si_sb_U_man_mans_bysize.items():
-                if words.lowered[-k:] in v:
-                    return word[:-1]
-            for k, v in si_sb_U_man_mans_caps_bysize.items():
-                if word[-k:] in v:
-                    return word[:-1]
-        if words.lowered[-3:] == "men":
-            return word[:-3] + "man"
-        if words.lowered[-4:] == "mice":
-            return word[:-4] + "mouse"
-        if words.lowered[-4:] == "lice":
-            v = si_sb_U_louse_lice_bysize.get(len(word))
-            if v and words.lowered in v:
-                return word[:-4] + "louse"
-        if words.lowered[-5:] == "geese":
-            return word[:-5] + "goose"
-        if words.lowered[-5:] == "teeth":
-            return word[:-5] + "tooth"
-        if words.lowered[-4:] == "feet":
-            return word[:-4] + "foot"
-
-        if words.lowered == "dice":
-            return "die"
-
-        # HANDLE UNASSIMILATED IMPORTS
-
-        if words.lowered[-4:] == "ceps":
-            return word
-        if words.lowered[-3:] == "zoa":
-            return word[:-1] + "on"
-
-        for lastlet, d, unass_numend, post in (
-            ("s", si_sb_U_ch_chs_bysize, -1, ""),
-            ("s", si_sb_U_ex_ices_bysize, -4, "ex"),
-            ("s", si_sb_U_ix_ices_bysize, -4, "ix"),
-            ("a", si_sb_U_um_a_bysize, -1, "um"),
-            ("i", si_sb_U_us_i_bysize, -1, "us"),
-            ("a", si_sb_U_on_a_bysize, -1, "on"),
-            ("e", si_sb_U_a_ae_bysize, -1, ""),
-        ):
-            if words.lowered[-1] == lastlet:  # this test to add speed
-                for k, v in d.items():
-                    if words.lowered[-k:] in v:
-                        return word[:unass_numend] + post
-
-        # HANDLE INCOMPLETELY ASSIMILATED IMPORTS
-
-        if self.classical_dict["ancient"]:
-            if words.lowered[-6:] == "trices":
-                return word[:-3] + "x"
-            if words.lowered[-4:] in ("eaux", "ieux"):
-                return word[:-1]
-            if words.lowered[-5:] in ("ynges", "inges", "anges") and len(word) > 6:
-                return word[:-3] + "x"
-
-            for lastlet, d, class_numend, post in (
-                ("a", si_sb_C_en_ina_bysize, -3, "en"),
-                ("s", si_sb_C_ex_ices_bysize, -4, "ex"),
-                ("s", si_sb_C_ix_ices_bysize, -4, "ix"),
-                ("a", si_sb_C_um_a_bysize, -1, "um"),
-                ("i", si_sb_C_us_i_bysize, -1, "us"),
-                ("s", pl_sb_C_us_us_bysize, None, ""),
-                ("e", si_sb_C_a_ae_bysize, -1, ""),
-                ("a", si_sb_C_a_ata_bysize, -2, ""),
-                ("s", si_sb_C_is_ides_bysize, -3, "s"),
-                ("i", si_sb_C_o_i_bysize, -1, "o"),
-                ("a", si_sb_C_on_a_bysize, -1, "on"),
-                ("m", si_sb_C_im_bysize, -2, ""),
-                ("i", si_sb_C_i_bysize, -1, ""),
-            ):
-                if words.lowered[-1] == lastlet:  # this test to add speed
-                    for k, v in d.items():
-                        if words.lowered[-k:] in v:
-                            return word[:class_numend] + post
-
-        # HANDLE PLURLS ENDING IN uses -> use
-
-        if (
-            words.lowered[-6:] == "houses"
-            or word in si_sb_uses_use_case
-            or words.last.lower() in si_sb_uses_use
-        ):
-            return word[:-1]
-
-        # HANDLE PLURLS ENDING IN ies -> ie
-
-        if word in si_sb_ies_ie_case or words.last.lower() in si_sb_ies_ie:
-            return word[:-1]
-
-        # HANDLE PLURLS ENDING IN oes -> oe
-
-        if (
-            words.lowered[-5:] == "shoes"
-            or word in si_sb_oes_oe_case
-            or words.last.lower() in si_sb_oes_oe
-        ):
-            return word[:-1]
-
-        # HANDLE SINGULAR NOUNS ENDING IN ...s OR OTHER SILIBANTS
-
-        if word in si_sb_sses_sse_case or words.last.lower() in si_sb_sses_sse:
-            return word[:-1]
-
-        if words.last.lower() in si_sb_singular_s_complete:
-            return word[:-2]
-
-        for k, v in si_sb_singular_s_bysize.items():
-            if words.lowered[-k:] in v:
-                return word[:-2]
-
-        if words.lowered[-4:] == "eses" and word[0] == word[0].upper():
-            return word[:-2]
-
-        if words.last.lower() in si_sb_z_zes:
-            return word[:-2]
-
-        if words.last.lower() in si_sb_zzes_zz:
-            return word[:-2]
-
-        if words.lowered[-4:] == "zzes":
-            return word[:-3]
-
-        if word in si_sb_ches_che_case or words.last.lower() in si_sb_ches_che:
-            return word[:-1]
-
-        if words.lowered[-4:] in ("ches", "shes"):
-            return word[:-2]
-
-        if words.last.lower() in si_sb_xes_xe:
-            return word[:-1]
-
-        if words.lowered[-3:] == "xes":
-            return word[:-2]
-
-        # HANDLE ...f -> ...ves
-
-        if word in si_sb_ves_ve_case or words.last.lower() in si_sb_ves_ve:
-            return word[:-1]
-
-        if words.lowered[-3:] == "ves":
-            if words.lowered[-5:-3] in ("el", "al", "ol"):
-                return word[:-3] + "f"
-            if words.lowered[-5:-3] == "ea" and word[-6:-5] != "d":
-                return word[:-3] + "f"
-            if words.lowered[-5:-3] in ("ni", "li", "wi"):
-                return word[:-3] + "fe"
-            if words.lowered[-5:-3] == "ar":
-                return word[:-3] + "f"
-
-        # HANDLE ...y
-
-        if words.lowered[-2:] == "ys":
-            if len(words.lowered) > 2 and words.lowered[-3] in "aeiou":
-                return word[:-1]
-
-            if self.classical_dict["names"]:
-                if words.lowered[-2:] == "ys" and word[0] == word[0].upper():
-                    return word[:-1]
-
-        if words.lowered[-3:] == "ies":
-            return word[:-3] + "y"
-
-        # HANDLE ...o
-
-        if words.lowered[-2:] == "os":
-            if words.last.lower() in si_sb_U_o_os_complete:
-                return word[:-1]
-
-            for k, v in si_sb_U_o_os_bysize.items():
-                if words.lowered[-k:] in v:
-                    return word[:-1]
-
-            if words.lowered[-3:] in ("aos", "eos", "ios", "oos", "uos"):
-                return word[:-1]
-
-        if words.lowered[-3:] == "oes":
-            return word[:-2]
-
-        # UNASSIMILATED IMPORTS FINAL RULE
-
-        if word in si_sb_es_is:
-            return word[:-2] + "is"
-
-        # OTHERWISE JUST REMOVE ...s
-
-        if words.lowered[-1] == "s":
-            return word[:-1]
-
-        # COULD NOT FIND SINGULAR
-
-        return False
-
-    # ADJECTIVES
-
-    @typechecked
-    def a(self, text: Word, count: Optional[Union[int, str, Any]] = 1) -> str:
-        """
-        Return the appropriate indefinite article followed by text.
-
-        The indefinite article is either 'a' or 'an'.
-
-        If count is not one, then return count followed by text
-        instead of 'a' or 'an'.
-
-        Whitespace at the start and end is preserved.
-
-        """
-        mo = INDEFINITE_ARTICLE_TEST.search(text)
-        if mo:
-            word = mo.group(2)
-            if not word:
-                return text
-            pre = mo.group(1)
-            post = mo.group(3)
-            result = self._indef_article(word, count)
-            return f"{pre}{result}{post}"
-        return ""
-
-    an = a
-
-    _indef_article_cases = (
-        # HANDLE ORDINAL FORMS
-        (A_ordinal_a, "a"),
-        (A_ordinal_an, "an"),
-        # HANDLE SPECIAL CASES
-        (A_explicit_an, "an"),
-        (SPECIAL_AN, "an"),
-        (SPECIAL_A, "a"),
-        # HANDLE ABBREVIATIONS
-        (A_abbrev, "an"),
-        (SPECIAL_ABBREV_AN, "an"),
-        (SPECIAL_ABBREV_A, "a"),
-        # HANDLE CONSONANTS
-        (CONSONANTS, "a"),
-        # HANDLE SPECIAL VOWEL-FORMS
-        (ARTICLE_SPECIAL_EU, "a"),
-        (ARTICLE_SPECIAL_ONCE, "a"),
-        (ARTICLE_SPECIAL_ONETIME, "a"),
-        (ARTICLE_SPECIAL_UNIT, "a"),
-        (ARTICLE_SPECIAL_UBA, "a"),
-        (ARTICLE_SPECIAL_UKR, "a"),
-        (A_explicit_a, "a"),
-        # HANDLE SPECIAL CAPITALS
-        (SPECIAL_CAPITALS, "a"),
-        # HANDLE VOWELS
-        (VOWELS, "an"),
-        # HANDLE y...
-        # (BEFORE CERTAIN CONSONANTS IMPLIES (UNNATURALIZED) "i.." SOUND)
-        (A_y_cons, "an"),
-    )
-
-    def _indef_article(self, word: str, count: Union[int, str, Any]) -> str:
-        mycount = self.get_count(count)
-
-        if mycount != 1:
-            return f"{count} {word}"
-
-        # HANDLE USER-DEFINED VARIANTS
-
-        value = self.ud_match(word, self.A_a_user_defined)
-        if value is not None:
-            return f"{value} {word}"
-
-        matches = (
-            f'{article} {word}'
-            for regexen, article in self._indef_article_cases
-            if regexen.search(word)
-        )
-
-        # OTHERWISE, GUESS "a"
-        fallback = f'a {word}'
-        return next(matches, fallback)
-
-    # 2. TRANSLATE ZERO-QUANTIFIED $word TO "no plural($word)"
-
-    @typechecked
-    def no(self, text: Word, count: Optional[Union[int, str]] = None) -> str:
-        """
-        If count is 0, no, zero or nil, return 'no' followed by the plural
-        of text.
-
-        If count is one of:
-            1, a, an, one, each, every, this, that
-            return count followed by text.
-
-        Otherwise return count follow by the plural of text.
-
-        In the return value count is always followed by a space.
-
-        Whitespace at the start and end is preserved.
-
-        """
-        if count is None and self.persistent_count is not None:
-            count = self.persistent_count
-
-        if count is None:
-            count = 0
-        mo = PARTITION_WORD.search(text)
-        if mo:
-            pre = mo.group(1)
-            word = mo.group(2)
-            post = mo.group(3)
-        else:
-            pre = ""
-            word = ""
-            post = ""
-
-        if str(count).lower() in pl_count_zero:
-            count = 'no'
-        return f"{pre}{count} {self.plural(word, count)}{post}"
-
-    # PARTICIPLES
-
-    @typechecked
-    def present_participle(self, word: Word) -> str:
-        """
-        Return the present participle for word.
-
-        word is the 3rd person singular verb.
-
-        """
-        plv = self.plural_verb(word, 2)
-        ans = plv
-
-        for regexen, repl in PRESENT_PARTICIPLE_REPLACEMENTS:
-            ans, num = regexen.subn(repl, plv)
-            if num:
-                return f"{ans}ing"
-        return f"{ans}ing"
-
-    # NUMERICAL INFLECTIONS
-
-    @typechecked
-    def ordinal(self, num: Union[Number, Word]) -> str:
-        """
-        Return the ordinal of num.
-
-        >>> ordinal = engine().ordinal
-        >>> ordinal(1)
-        '1st'
-        >>> ordinal('one')
-        'first'
-        """
-        if DIGIT.match(str(num)):
-            if isinstance(num, (float, int)) and int(num) == num:
-                n = int(num)
-            else:
-                if "." in str(num):
-                    try:
-                        # numbers after decimal,
-                        # so only need last one for ordinal
-                        n = int(str(num)[-1])
-
-                    except ValueError:  # ends with '.', so need to use whole string
-                        n = int(str(num)[:-1])
-                else:
-                    n = int(num)  # type: ignore
-            try:
-                post = nth[n % 100]
-            except KeyError:
-                post = nth[n % 10]
-            return f"{num}{post}"
-        else:
-            return self._sub_ord(num)
-
-    def millfn(self, ind: int = 0) -> str:
-        if ind > len(mill) - 1:
-            raise NumOutOfRangeError
-        return mill[ind]
-
-    def unitfn(self, units: int, mindex: int = 0) -> str:
-        return f"{unit[units]}{self.millfn(mindex)}"
-
-    def tenfn(self, tens, units, mindex=0) -> str:
-        if tens != 1:
-            tens_part = ten[tens]
-            if tens and units:
-                hyphen = "-"
-            else:
-                hyphen = ""
-            unit_part = unit[units]
-            mill_part = self.millfn(mindex)
-            return f"{tens_part}{hyphen}{unit_part}{mill_part}"
-        return f"{teen[units]}{mill[mindex]}"
-
-    def hundfn(self, hundreds: int, tens: int, units: int, mindex: int) -> str:
-        if hundreds:
-            andword = f" {self._number_args['andword']} " if tens or units else ""
-            # use unit not unitfn as simpler
-            return (
-                f"{unit[hundreds]} hundred{andword}"
-                f"{self.tenfn(tens, units)}{self.millfn(mindex)}, "
-            )
-        if tens or units:
-            return f"{self.tenfn(tens, units)}{self.millfn(mindex)}, "
-        return ""
-
-    def group1sub(self, mo: Match) -> str:
-        units = int(mo.group(1))
-        if units == 1:
-            return f" {self._number_args['one']}, "
-        elif units:
-            return f"{unit[units]}, "
-        else:
-            return f" {self._number_args['zero']}, "
-
-    def group1bsub(self, mo: Match) -> str:
-        units = int(mo.group(1))
-        if units:
-            return f"{unit[units]}, "
-        else:
-            return f" {self._number_args['zero']}, "
-
-    def group2sub(self, mo: Match) -> str:
-        tens = int(mo.group(1))
-        units = int(mo.group(2))
-        if tens:
-            return f"{self.tenfn(tens, units)}, "
-        if units:
-            return f" {self._number_args['zero']} {unit[units]}, "
-        return f" {self._number_args['zero']} {self._number_args['zero']}, "
-
-    def group3sub(self, mo: Match) -> str:
-        hundreds = int(mo.group(1))
-        tens = int(mo.group(2))
-        units = int(mo.group(3))
-        if hundreds == 1:
-            hunword = f" {self._number_args['one']}"
-        elif hundreds:
-            hunword = str(unit[hundreds])
-        else:
-            hunword = f" {self._number_args['zero']}"
-        if tens:
-            tenword = self.tenfn(tens, units)
-        elif units:
-            tenword = f" {self._number_args['zero']} {unit[units]}"
-        else:
-            tenword = f" {self._number_args['zero']} {self._number_args['zero']}"
-        return f"{hunword} {tenword}, "
-
-    def hundsub(self, mo: Match) -> str:
-        ret = self.hundfn(
-            int(mo.group(1)), int(mo.group(2)), int(mo.group(3)), self.mill_count
-        )
-        self.mill_count += 1
-        return ret
-
-    def tensub(self, mo: Match) -> str:
-        return f"{self.tenfn(int(mo.group(1)), int(mo.group(2)), self.mill_count)}, "
-
-    def unitsub(self, mo: Match) -> str:
-        return f"{self.unitfn(int(mo.group(1)), self.mill_count)}, "
-
-    def enword(self, num: str, group: int) -> str:
-        # import pdb
-        # pdb.set_trace()
-
-        if group == 1:
-            num = DIGIT_GROUP.sub(self.group1sub, num)
-        elif group == 2:
-            num = TWO_DIGITS.sub(self.group2sub, num)
-            num = DIGIT_GROUP.sub(self.group1bsub, num, 1)
-        elif group == 3:
-            num = THREE_DIGITS.sub(self.group3sub, num)
-            num = TWO_DIGITS.sub(self.group2sub, num, 1)
-            num = DIGIT_GROUP.sub(self.group1sub, num, 1)
-        elif int(num) == 0:
-            num = self._number_args["zero"]
-        elif int(num) == 1:
-            num = self._number_args["one"]
-        else:
-            num = num.lstrip().lstrip("0")
-            self.mill_count = 0
-            # surely there's a better way to do the next bit
-            mo = THREE_DIGITS_WORD.search(num)
-            while mo:
-                num = THREE_DIGITS_WORD.sub(self.hundsub, num, 1)
-                mo = THREE_DIGITS_WORD.search(num)
-            num = TWO_DIGITS_WORD.sub(self.tensub, num, 1)
-            num = ONE_DIGIT_WORD.sub(self.unitsub, num, 1)
-        return num
-
-    @staticmethod
-    def _sub_ord(val):
-        new = ordinal_suff.sub(lambda match: ordinal[match.group(1)], val)
-        return new + "th" * (new == val)
-
-    @classmethod
-    def _chunk_num(cls, num, decimal, group):
-        if decimal:
-            max_split = -1 if group != 0 else 1
-            chunks = num.split(".", max_split)
-        else:
-            chunks = [num]
-        return cls._remove_last_blank(chunks)
-
-    @staticmethod
-    def _remove_last_blank(chunks):
-        """
-        Remove the last item from chunks if it's a blank string.
-
-        Return the resultant chunks and whether the last item was removed.
-        """
-        removed = chunks[-1] == ""
-        result = chunks[:-1] if removed else chunks
-        return result, removed
-
-    @staticmethod
-    def _get_sign(num):
-        return {'+': 'plus', '-': 'minus'}.get(num.lstrip()[0], '')
-
-    @typechecked
-    def number_to_words(  # noqa: C901
-        self,
-        num: Union[Number, Word],
-        wantlist: bool = False,
-        group: int = 0,
-        comma: Union[Falsish, str] = ",",
-        andword: str = "and",
-        zero: str = "zero",
-        one: str = "one",
-        decimal: Union[Falsish, str] = "point",
-        threshold: Optional[int] = None,
-    ) -> Union[str, List[str]]:
-        """
-        Return a number in words.
-
-        group = 1, 2 or 3 to group numbers before turning into words
-        comma: define comma
-
-        andword:
-            word for 'and'. Can be set to ''.
-            e.g. "one hundred and one" vs "one hundred one"
-
-        zero: word for '0'
-        one: word for '1'
-        decimal: word for decimal point
-        threshold: numbers above threshold not turned into words
-
-        parameters not remembered from last call. Departure from Perl version.
-        """
-        self._number_args = {"andword": andword, "zero": zero, "one": one}
-        num = str(num)
-
-        # Handle "stylistic" conversions (up to a given threshold)...
-        if threshold is not None and float(num) > threshold:
-            spnum = num.split(".", 1)
-            while comma:
-                (spnum[0], n) = FOUR_DIGIT_COMMA.subn(r"\1,\2", spnum[0])
-                if n == 0:
-                    break
-            try:
-                return f"{spnum[0]}.{spnum[1]}"
-            except IndexError:
-                return str(spnum[0])
-
-        if group < 0 or group > 3:
-            raise BadChunkingOptionError
-
-        sign = self._get_sign(num)
-
-        if num in nth_suff:
-            num = zero
-
-        myord = num[-2:] in nth_suff
-        if myord:
-            num = num[:-2]
-
-        chunks, finalpoint = self._chunk_num(num, decimal, group)
-
-        loopstart = chunks[0] == ""
-        first: bool | None = not loopstart
-
-        def _handle_chunk(chunk):
-            nonlocal first
-
-            # remove all non numeric \D
-            chunk = NON_DIGIT.sub("", chunk)
-            if chunk == "":
-                chunk = "0"
-
-            if group == 0 and not first:
-                chunk = self.enword(chunk, 1)
-            else:
-                chunk = self.enword(chunk, group)
-
-            if chunk[-2:] == ", ":
-                chunk = chunk[:-2]
-            chunk = WHITESPACES_COMMA.sub(",", chunk)
-
-            if group == 0 and first:
-                chunk = COMMA_WORD.sub(f" {andword} \\1", chunk)
-            chunk = WHITESPACES.sub(" ", chunk)
-            # chunk = re.sub(r"(\A\s|\s\Z)", self.blankfn, chunk)
-            chunk = chunk.strip()
-            if first:
-                first = None
-            return chunk
-
-        chunks[loopstart:] = map(_handle_chunk, chunks[loopstart:])
-
-        numchunks = []
-        if first != 0:
-            numchunks = chunks[0].split(f"{comma} ")
-
-        if myord and numchunks:
-            numchunks[-1] = self._sub_ord(numchunks[-1])
-
-        for chunk in chunks[1:]:
-            numchunks.append(decimal)
-            numchunks.extend(chunk.split(f"{comma} "))
-
-        if finalpoint:
-            numchunks.append(decimal)
-
-        if wantlist:
-            return [sign] * bool(sign) + numchunks
-
-        signout = f"{sign} " if sign else ""
-        valout = (
-            ', '.join(numchunks)
-            if group
-            else ''.join(self._render(numchunks, decimal, comma))
-        )
-        return signout + valout
-
-    @staticmethod
-    def _render(chunks, decimal, comma):
-        first_item = chunks.pop(0)
-        yield first_item
-        first = decimal is None or not first_item.endswith(decimal)
-        for nc in chunks:
-            if nc == decimal:
-                first = False
-            elif first:
-                yield comma
-            yield f" {nc}"
-
-    @typechecked
-    def join(
-        self,
-        words: Optional[Sequence[Word]],
-        sep: Optional[str] = None,
-        sep_spaced: bool = True,
-        final_sep: Optional[str] = None,
-        conj: str = "and",
-        conj_spaced: bool = True,
-    ) -> str:
-        """
-        Join words into a list.
-
-        e.g. join(['ant', 'bee', 'fly']) returns 'ant, bee, and fly'
-
-        options:
-        conj: replacement for 'and'
-        sep: separator. default ',', unless ',' is in the list then ';'
-        final_sep: final separator. default ',', unless ',' is in the list then ';'
-        conj_spaced: boolean. Should conj have spaces around it
-
-        """
-        if not words:
-            return ""
-        if len(words) == 1:
-            return words[0]
-
-        if conj_spaced:
-            if conj == "":
-                conj = " "
-            else:
-                conj = f" {conj} "
-
-        if len(words) == 2:
-            return f"{words[0]}{conj}{words[1]}"
-
-        if sep is None:
-            if "," in "".join(words):
-                sep = ";"
-            else:
-                sep = ","
-        if final_sep is None:
-            final_sep = sep
-
-        final_sep = f"{final_sep}{conj}"
-
-        if sep_spaced:
-            sep += " "
-
-        return f"{sep.join(words[0:-1])}{final_sep}{words[-1]}"
diff --git a/lib/inflect/py.typed b/lib/inflect/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/ipwhois/__init__.py b/lib/ipwhois/__init__.py
deleted file mode 100644
index 2a1402bd..00000000
--- a/lib/ipwhois/__init__.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2013-2020 Philip Hane
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-from .exceptions import *
-from .net import Net
-from .ipwhois import IPWhois
-
-__version__ = '1.2.0'
diff --git a/lib/ipwhois/asn.py b/lib/ipwhois/asn.py
deleted file mode 100644
index 71b56758..00000000
--- a/lib/ipwhois/asn.py
+++ /dev/null
@@ -1,879 +0,0 @@
-# Copyright (c) 2013-2020 Philip Hane
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-import re
-import sys
-import copy
-import logging
-
-from .exceptions import (NetError, ASNRegistryError, ASNParseError,
-                         ASNLookupError, HTTPLookupError, WhoisLookupError,
-                         WhoisRateLimitError, ASNOriginLookupError)
-
-if sys.version_info >= (3, 3):  # pragma: no cover
-    from ipaddress import ip_network
-
-else:  # pragma: no cover
-    from ipaddr import IPNetwork as ip_network
-
-log = logging.getLogger(__name__)
-
-BASE_NET = {
-    'cidr': None,
-    'description': None,
-    'maintainer': None,
-    'updated': None,
-    'source': None
-}
-
-ASN_ORIGIN_WHOIS = {
-    'radb': {
-        'server': 'whois.radb.net',
-        'fields': {
-            'description': r'(descr):[^\S\n]+(?P<val>.+?)\n',
-            'maintainer': r'(mnt-by):[^\S\n]+(?P<val>.+?)\n',
-            'updated': r'(changed):[^\S\n]+(?P<val>.+?)\n',
-            'source': r'(source):[^\S\n]+(?P<val>.+?)\n',
-        }
-    },
-}
-
-ASN_ORIGIN_HTTP = {
-    'radb': {
-        'url': 'http://www.radb.net/query',
-        'form_data_asn_field': 'keywords',
-        'form_data': {
-            'advanced_query': '1',
-            'query': 'Query',
-            # '-T option': 'inet-rtr',
-            'ip_option': '',
-            '-i': '1',
-            '-i option': 'origin'
-        },
-        'fields': {
-            'description': r'(descr):[^\S\n]+(?P<val>.+?)\n',
-            'maintainer': r'(mnt-by):[^\S\n]+(?P<val>.+?)\n',
-            'updated': r'(changed):[^\S\n]+(?P<val>.+?)\n',
-            'source': r'(source):[^\S\n]+(?P<val>.+?)\<',
-        }
-    },
-}
-
-
-class IPASN:
-    """
-    The class for parsing ASN data for an IP address.
-
-    Args:
-        net (:obj:`ipwhois.net.Net`): A ipwhois.net.Net object.
-
-    Raises:
-        NetError: The parameter provided is not an instance of
-            ipwhois.net.Net
-    """
-
-    def __init__(self, net):
-
-        from .net import (Net, ORG_MAP)
-        from .whois import RIR_WHOIS
-
-        # ipwhois.net.Net validation
-        if isinstance(net, Net):
-
-            self._net = net
-
-        else:
-
-            raise NetError('The provided net parameter is not an instance of '
-                           'ipwhois.net.Net')
-
-        self.org_map = ORG_MAP
-        self.rir_whois = RIR_WHOIS
-
-    def parse_fields_dns(self, response):
-        """
-        The function for parsing ASN fields from a dns response.
-
-        Args:
-            response (:obj:`str`): The response from the ASN dns server.
-
-        Returns:
-            dict: The ASN lookup results
-
-            ::
-
-                {
-                    'asn' (str) - The Autonomous System Number
-                    'asn_date' (str) - The ASN Allocation date
-                    'asn_registry' (str) - The assigned ASN registry
-                    'asn_cidr' (str) - The assigned ASN CIDR
-                    'asn_country_code' (str) - The assigned ASN country code
-                    'asn_description' (None) - Cannot retrieve with this
-                        method.
-                }
-
-        Raises:
-            ASNRegistryError: The ASN registry is not known.
-            ASNParseError: ASN parsing failed.
-        """
-
-        try:
-
-            temp = response.split('|')
-
-            # Parse out the ASN information.
-            ret = {'asn_registry': temp[3].strip(' \n')}
-
-            if ret['asn_registry'] not in self.rir_whois.keys():
-
-                raise ASNRegistryError(
-                    'ASN registry {0} is not known.'.format(
-                        ret['asn_registry'])
-                )
-
-            ret['asn'] = temp[0].strip(' "\n')
-            ret['asn_cidr'] = temp[1].strip(' \n')
-            ret['asn_country_code'] = temp[2].strip(' \n').upper()
-            ret['asn_date'] = temp[4].strip(' "\n')
-            ret['asn_description'] = None
-
-        except ASNRegistryError:
-
-            raise
-
-        except Exception as e:
-
-            raise ASNParseError('Parsing failed for "{0}" with exception: {1}.'
-                                ''.format(response, e)[:100])
-
-        return ret
-
-    def parse_fields_verbose_dns(self, response):
-        """
-        The function for parsing ASN fields from a verbose dns response.
-
-        Args:
-            response (:obj:`str`): The response from the ASN dns server.
-
-        Returns:
-            dict: The ASN lookup results
-
-            ::
-
-                {
-                    'asn' (str) - The Autonomous System Number
-                    'asn_date' (str) - The ASN Allocation date
-                    'asn_registry' (str) - The assigned ASN registry
-                    'asn_cidr' (None) - Cannot retrieve with this method.
-                    'asn_country_code' (str) - The assigned ASN country code
-                    'asn_description' (str) - The ASN description
-                }
-
-        Raises:
-            ASNRegistryError: The ASN registry is not known.
-            ASNParseError: ASN parsing failed.
-        """
-
-        try:
-
-            temp = response.split('|')
-
-            # Parse out the ASN information.
-            ret = {'asn_registry': temp[2].strip(' \n')}
-
-            if ret['asn_registry'] not in self.rir_whois.keys():
-
-                raise ASNRegistryError(
-                    'ASN registry {0} is not known.'.format(
-                        ret['asn_registry'])
-                )
-
-            ret['asn'] = temp[0].strip(' "\n')
-            ret['asn_cidr'] = None
-            ret['asn_country_code'] = temp[1].strip(' \n').upper()
-            ret['asn_date'] = temp[3].strip(' \n')
-            ret['asn_description'] = temp[4].strip(' "\n')
-
-        except ASNRegistryError:
-
-            raise
-
-        except Exception as e:
-
-            raise ASNParseError('Parsing failed for "{0}" with exception: {1}.'
-                                ''.format(response, e)[:100])
-
-        return ret
-
-    def parse_fields_whois(self, response):
-        """
-        The function for parsing ASN fields from a whois response.
-
-        Args:
-            response (:obj:`str`): The response from the ASN whois server.
-
-        Returns:
-            dict: The ASN lookup results
-
-            ::
-
-                {
-                    'asn' (str) - The Autonomous System Number
-                    'asn_date' (str) - The ASN Allocation date
-                    'asn_registry' (str) - The assigned ASN registry
-                    'asn_cidr' (str) - The assigned ASN CIDR
-                    'asn_country_code' (str) - The assigned ASN country code
-                    'asn_description' (str) - The ASN description
-                }
-
-        Raises:
-            ASNRegistryError: The ASN registry is not known.
-            ASNParseError: ASN parsing failed.
-        """
-
-        try:
-
-            temp = response.split('|')
-
-            # Parse out the ASN information.
-            ret = {'asn_registry': temp[4].strip(' \n')}
-
-            if ret['asn_registry'] not in self.rir_whois.keys():
-
-                raise ASNRegistryError(
-                    'ASN registry {0} is not known.'.format(
-                        ret['asn_registry'])
-                )
-
-            ret['asn'] = temp[0].strip(' \n')
-            ret['asn_cidr'] = temp[2].strip(' \n')
-            ret['asn_country_code'] = temp[3].strip(' \n').upper()
-            ret['asn_date'] = temp[5].strip(' \n')
-            ret['asn_description'] = temp[6].strip(' \n')
-
-        except ASNRegistryError:
-
-            raise
-
-        except Exception as e:
-
-            raise ASNParseError('Parsing failed for "{0}" with exception: {1}.'
-                                ''.format(response, e)[:100])
-
-        return ret
-
-    def parse_fields_http(self, response, extra_org_map=None):
-        """
-        The function for parsing ASN fields from a http response.
-
-        Args:
-            response (:obj:`str`): The response from the ASN http server.
-            extra_org_map (:obj:`dict`): Dictionary mapping org handles to
-                RIRs. This is for limited cases where ARIN REST (ASN fallback
-                HTTP lookup) does not show an RIR as the org handle e.g., DNIC
-                (which is now the built in ORG_MAP) e.g., {'DNIC': 'arin'}.
-                Valid RIR values are (note the case-sensitive - this is meant
-                to match the REST result): 'ARIN', 'RIPE', 'apnic', 'lacnic',
-                'afrinic'. Defaults to None.
-
-        Returns:
-            dict: The ASN lookup results
-
-            ::
-
-                {
-                    'asn' (None) - Cannot retrieve with this method.
-                    'asn_date' (None) - Cannot retrieve with this method.
-                    'asn_registry' (str) - The assigned ASN registry
-                    'asn_cidr' (None) - Cannot retrieve with this method.
-                    'asn_country_code' (None) - Cannot retrieve with this
-                        method.
-                    'asn_description' (None) - Cannot retrieve with this
-                        method.
-                }
-
-        Raises:
-            ASNRegistryError: The ASN registry is not known.
-            ASNParseError: ASN parsing failed.
-        """
-
-        # Set the org_map. Map the orgRef handle to an RIR.
-        org_map = self.org_map.copy()
-        try:
-
-            org_map.update(extra_org_map)
-
-        except (TypeError, ValueError, IndexError, KeyError):
-
-            pass
-
-        try:
-
-            asn_data = {
-                'asn_registry': None,
-                'asn': None,
-                'asn_cidr': None,
-                'asn_country_code': None,
-                'asn_date': None,
-                'asn_description': None
-            }
-
-            try:
-
-                net_list = response['nets']['net']
-
-                if not isinstance(net_list, list):
-                    net_list = [net_list]
-
-            except (KeyError, TypeError):
-
-                log.debug('No networks found')
-                net_list = []
-
-            for n in reversed(net_list):
-
-                try:
-
-                    asn_data['asn_registry'] = (
-                        org_map[n['orgRef']['@handle'].upper()]
-                    )
-
-                except KeyError as e:
-
-                    log.debug('Could not parse ASN registry via HTTP: '
-                              '{0}'.format(str(e)))
-                    continue
-
-                break
-
-            if not asn_data['asn_registry']:
-
-                log.debug('Could not parse ASN registry via HTTP')
-                raise ASNRegistryError('ASN registry lookup failed.')
-
-        except ASNRegistryError:
-
-            raise
-
-        except Exception as e:  # pragma: no cover
-
-            raise ASNParseError('Parsing failed for "{0}" with exception: {1}.'
-                                ''.format(response, e)[:100])
-
-        return asn_data
-
-    def lookup(self, inc_raw=False, retry_count=3, extra_org_map=None,
-               asn_methods=None, get_asn_description=True):
-        """
-        The wrapper function for retrieving and parsing ASN information for an
-        IP address.
-
-        Args:
-            inc_raw (:obj:`bool`): Whether to include the raw results in the
-                returned dictionary. Defaults to False.
-            retry_count (:obj:`int`): The number of times to retry in case
-                socket errors, timeouts, connection resets, etc. are
-                encountered. Defaults to 3.
-            extra_org_map (:obj:`dict`): Mapping org handles to RIRs. This is
-                for limited cases where ARIN REST (ASN fallback HTTP lookup)
-                does not show an RIR as the org handle e.g., DNIC (which is
-                now the built in ORG_MAP) e.g., {'DNIC': 'arin'}. Valid RIR
-                values are (note the case-sensitive - this is meant to match
-                the REST result): 'ARIN', 'RIPE', 'apnic', 'lacnic', 'afrinic'
-                Defaults to None.
-            asn_methods (:obj:`list`): ASN lookup types to attempt, in order.
-                If None, defaults to all: ['dns', 'whois', 'http'].
-            get_asn_description (:obj:`bool`): Whether to run an additional
-                query when pulling ASN information via dns, in order to get
-                the ASN description. Defaults to True.
-
-        Returns:
-            dict: The ASN lookup results
-
-            ::
-
-                {
-                    'asn' (str) - The Autonomous System Number
-                    'asn_date' (str) - The ASN Allocation date
-                    'asn_registry' (str) - The assigned ASN registry
-                    'asn_cidr' (str) - The assigned ASN CIDR
-                    'asn_country_code' (str) - The assigned ASN country code
-                    'asn_description' (str) - The ASN description
-                    'raw' (str) - Raw ASN results if the inc_raw parameter is
-                        True.
-                }
-
-        Raises:
-            ValueError: methods argument requires one of dns, whois, http.
-            ASNRegistryError: ASN registry does not match.
-        """
-
-        if asn_methods is None:
-
-            lookups = ['dns', 'whois', 'http']
-
-        else:
-
-            if {'dns', 'whois', 'http'}.isdisjoint(asn_methods):
-
-                raise ValueError('methods argument requires at least one of '
-                                 'dns, whois, http.')
-
-            lookups = asn_methods
-
-        response = None
-        asn_data = None
-        dns_success = False
-        for index, lookup_method in enumerate(lookups):
-
-            if lookup_method == 'dns':
-
-                try:
-
-                    self._net.dns_resolver.lifetime = (
-                        self._net.dns_resolver.timeout * (
-                            retry_count and retry_count or 1
-                        )
-                    )
-                    response = self._net.get_asn_dns()
-                    asn_data_list = []
-                    for asn_entry in response:
-
-                        asn_data_list.append(self.parse_fields_dns(
-                            str(asn_entry)))
-
-                    # Iterate through the parsed ASN results to find the
-                    # smallest CIDR
-                    asn_data = asn_data_list.pop(0)
-                    try:
-
-                        prefix_len = ip_network(asn_data['asn_cidr']).prefixlen
-                        for asn_parsed in asn_data_list:
-                            prefix_len_comp = ip_network(
-                                asn_parsed['asn_cidr']).prefixlen
-                            if prefix_len_comp > prefix_len:
-                                asn_data = asn_parsed
-                                prefix_len = prefix_len_comp
-
-                    except (KeyError, ValueError):  # pragma: no cover
-
-                        pass
-
-                    dns_success = True
-                    break
-
-                except (ASNLookupError, ASNRegistryError) as e:
-
-                    log.debug('ASN DNS lookup failed: {0}'.format(e))
-                    pass
-
-            elif lookup_method == 'whois':
-
-                try:
-
-                    response = self._net.get_asn_whois(retry_count)
-                    asn_data = self.parse_fields_whois(
-                        response)  # pragma: no cover
-                    break
-
-                except (ASNLookupError, ASNRegistryError) as e:
-
-                    log.debug('ASN WHOIS lookup failed: {0}'.format(e))
-                    pass
-
-            elif lookup_method == 'http':
-
-                try:
-
-                    response = self._net.get_asn_http(
-                        retry_count=retry_count
-                    )
-                    asn_data = self.parse_fields_http(response,
-                                                       extra_org_map)
-                    break
-
-                except (ASNLookupError, ASNRegistryError) as e:
-
-                    log.debug('ASN HTTP lookup failed: {0}'.format(e))
-                    pass
-
-        if asn_data is None:
-
-            raise ASNRegistryError('ASN lookup failed with no more methods to '
-                                   'try.')
-
-        if get_asn_description and dns_success:
-
-            try:
-
-                response = self._net.get_asn_verbose_dns('AS{0}'.format(
-                    asn_data['asn']))
-                asn_verbose_data = self.parse_fields_verbose_dns(response)
-                asn_data['asn_description'] = asn_verbose_data[
-                    'asn_description']
-
-            except (ASNLookupError, ASNRegistryError) as e:  # pragma: no cover
-
-                log.debug('ASN DNS verbose lookup failed: {0}'.format(e))
-                pass
-
-        if inc_raw:
-
-            asn_data['raw'] = response
-
-        return asn_data
-
-
-class ASNOrigin:
-    """
-    The class for parsing ASN origin whois data
-
-    Args:
-        net (:obj:`ipwhois.net.Net`): A ipwhois.net.Net object.
-
-    Raises:
-        NetError: The parameter provided is not an instance of
-            ipwhois.net.Net
-    """
-
-    def __init__(self, net):
-
-        from .net import Net
-
-        # ipwhois.net.Net validation
-        if isinstance(net, Net):
-
-            self._net = net
-
-        else:
-
-            raise NetError('The provided net parameter is not an instance of '
-                           'ipwhois.net.Net')
-
-    def parse_fields(self, response, fields_dict, net_start=None,
-                     net_end=None, field_list=None):
-        """
-        The function for parsing ASN whois fields from a data input.
-
-        Args:
-            response (:obj:`str`): The response from the whois/rwhois server.
-            fields_dict (:obj:`dict`): Mapping of fields->regex search values.
-            net_start (:obj:`int`): The starting point of the network (if
-                parsing multiple networks). Defaults to None.
-            net_end (:obj:`int`): The ending point of the network (if parsing
-                multiple networks). Defaults to None.
-            field_list (:obj:`list`): If provided, a list of fields to parse:
-                ['description', 'maintainer', 'updated', 'source']
-                If None, defaults to all fields.
-
-        Returns:
-            dict: A dictionary of fields provided in fields_dict.
-        """
-
-        ret = {}
-
-        if not field_list:
-
-            field_list = ['description', 'maintainer', 'updated', 'source']
-
-        generate = ((field, pattern) for (field, pattern) in
-                    fields_dict.items() if field in field_list)
-
-        for field, pattern in generate:
-
-            pattern = re.compile(
-                str(pattern),
-                re.DOTALL
-            )
-
-            if net_start is not None:
-
-                match = pattern.finditer(response, net_end, net_start)
-
-            elif net_end is not None:
-
-                match = pattern.finditer(response, net_end)
-
-            else:
-
-                match = pattern.finditer(response)
-
-            values = []
-            sub_section_end = None
-            for m in match:
-
-                if sub_section_end:
-
-                    if sub_section_end != (m.start() - 1):
-                        break
-
-                try:
-
-                    values.append(m.group('val').strip())
-
-                except IndexError:  # pragma: no cover
-
-                    pass
-
-                sub_section_end = m.end()
-
-            if len(values) > 0:
-
-                value = None
-                try:
-
-                    value = values[0]
-
-                except ValueError as e:  # pragma: no cover
-
-                    log.debug('ASN origin Whois field parsing failed for {0}: '
-                              '{1}'.format(field, e))
-                    pass
-
-                ret[field] = value
-
-        return ret
-
-    def get_nets_radb(self, response, is_http=False):
-        """
-        The function for parsing network blocks from ASN origin data.
-
-        Args:
-            response (:obj:`str`): The response from the RADB whois/http
-                server.
-            is_http (:obj:`bool`): If the query is RADB HTTP instead of whois,
-                set to True. Defaults to False.
-
-        Returns:
-            list: A list of network block dictionaries
-
-            ::
-
-                [{
-                    'cidr' (str) - The assigned CIDR
-                    'start' (int) - The index for the start of the parsed
-                        network block
-                    'end' (int) - The index for the end of the parsed network
-                        block
-                }]
-        """
-
-        nets = []
-
-        if is_http:
-            regex = r'route(?:6)?:[^\S\n]+(?P<val>.+?)\n'
-        else:
-            regex = r'^route(?:6)?:[^\S\n]+(?P<val>.+|.+)$'
-
-        # Iterate through all of the networks found, storing the CIDR value
-        # and the start and end positions.
-        for match in re.finditer(
-                regex,
-                response,
-                re.MULTILINE
-        ):
-
-            try:
-
-                net = copy.deepcopy(BASE_NET)
-                net['cidr'] = match.group(1).strip()
-                net['start'] = match.start()
-                net['end'] = match.end()
-                nets.append(net)
-
-            except ValueError:  # pragma: no cover
-
-                pass
-
-        return nets
-
-    def lookup(self, asn=None, inc_raw=False, retry_count=3, response=None,
-               field_list=None, asn_methods=None):
-        """
-        The function for retrieving and parsing ASN origin whois information
-        via port 43/tcp (WHOIS).
-
-        Args:
-            asn (:obj:`str`): The ASN (required).
-            inc_raw (:obj:`bool`): Whether to include the raw results in the
-                returned dictionary. Defaults to False.
-            retry_count (:obj:`int`): The number of times to retry in case
-                socket errors, timeouts, connection resets, etc. are
-                encountered. Defaults to 3.
-            response (:obj:`str`): Optional response object, this bypasses the
-                Whois lookup. Defaults to None.
-            field_list (:obj:`list`): If provided, fields to parse:
-                ['description', 'maintainer', 'updated', 'source']
-                If None, defaults to all.
-            asn_methods (:obj:`list`): ASN lookup types to attempt, in order.
-                If None, defaults to all ['whois', 'http'].
-
-        Returns:
-            dict: The ASN origin lookup results
-
-            ::
-
-                {
-                    'query' (str) - The Autonomous System Number
-                    'nets' (list) - Dictionaries containing network
-                        information which consists of the fields listed in the
-                        ASN_ORIGIN_WHOIS dictionary.
-                    'raw' (str) - Raw ASN origin whois results if the inc_raw
-                        parameter is True.
-                }
-
-        Raises:
-            ValueError: methods argument requires one of whois, http.
-            ASNOriginLookupError: ASN origin lookup failed.
-        """
-
-        if asn[0:2] != 'AS':
-
-            asn = 'AS{0}'.format(asn)
-
-        if asn_methods is None:
-
-            lookups = ['whois', 'http']
-
-        else:
-
-            if {'whois', 'http'}.isdisjoint(asn_methods):
-
-                raise ValueError('methods argument requires at least one of '
-                                 'whois, http.')
-
-            lookups = asn_methods
-
-        # Create the return dictionary.
-        results = {
-            'query': asn,
-            'nets': [],
-            'raw': None
-        }
-
-        is_http = False
-
-        # Only fetch the response if we haven't already.
-        if response is None:
-
-            for index, lookup_method in enumerate(lookups):
-
-                if lookup_method == 'whois':
-
-                    try:
-
-                        log.debug('Response not given, perform ASN origin '
-                                  'WHOIS lookup for {0}'.format(asn))
-
-                        # Retrieve the whois data.
-                        response = self._net.get_asn_origin_whois(
-                            asn=asn, retry_count=retry_count
-                        )
-
-                        break
-
-                    except (WhoisLookupError, WhoisRateLimitError) as e:
-
-                        log.debug('ASN origin WHOIS lookup failed: {0}'
-                                  ''.format(e))
-                        pass
-
-                elif lookup_method == 'http':
-
-                    try:
-
-                        log.debug('Response not given, perform ASN origin '
-                                  'HTTP lookup for: {0}'.format(asn))
-
-                        # tmp = ASN_ORIGIN_HTTP['radb']['form_data']
-                        # tmp[str(
-                        # ASN_ORIGIN_HTTP['radb']['form_data_asn_field']
-                        # )] = asn
-                        response = self._net.get_http_raw(
-                            url=('{0}?advanced_query=1&keywords={1}&-T+option'
-                                 '=&ip_option=&-i=1&-i+option=origin'
-                                 ).format(ASN_ORIGIN_HTTP['radb']['url'], asn),
-                            retry_count=retry_count,
-                            request_type='GET',
-                            # form_data=tmp
-                        )
-                        is_http = True   # pragma: no cover
-
-                        break
-
-                    except HTTPLookupError as e:
-
-                        log.debug('ASN origin HTTP lookup failed: {0}'
-                                  ''.format(e))
-                        pass
-
-            if response is None:
-
-                raise ASNOriginLookupError('ASN origin lookup failed with no '
-                                           'more methods to try.')
-
-        # If inc_raw parameter is True, add the response to return dictionary.
-        if inc_raw:
-
-            results['raw'] = response
-
-        nets = []
-        nets_response = self.get_nets_radb(response, is_http)
-
-        nets.extend(nets_response)
-
-        if is_http:   # pragma: no cover
-            fields = ASN_ORIGIN_HTTP
-        else:
-            fields = ASN_ORIGIN_WHOIS
-
-        # Iterate through all of the network sections and parse out the
-        # appropriate fields for each.
-        log.debug('Parsing ASN origin data')
-
-        for index, net in enumerate(nets):
-
-            section_end = None
-            if index + 1 < len(nets):
-
-                section_end = nets[index + 1]['start']
-
-            temp_net = self.parse_fields(
-                response,
-                fields['radb']['fields'],
-                section_end,
-                net['end'],
-                field_list
-            )
-
-            # Merge the net dictionaries.
-            net.update(temp_net)
-
-            # The start and end values are no longer needed.
-            del net['start'], net['end']
-
-        # Add the networks to the return dictionary.
-        results['nets'] = nets
-
-        return results
diff --git a/lib/ipwhois/data/iso_3166-1.csv b/lib/ipwhois/data/iso_3166-1.csv
deleted file mode 100644
index 47a52f90..00000000
--- a/lib/ipwhois/data/iso_3166-1.csv
+++ /dev/null
@@ -1,252 +0,0 @@
-AD,Andorra,
-AE,United Arab Emirates,
-AF,Afghanistan,
-AG,Antigua and Barbuda,
-AI,Anguilla,
-AL,Albania,
-AM,Armenia,
-AN,Netherlands Antilles,
-AO,Angola,
-AP,"Asia/Pacific Region",
-AQ,Antarctica,
-AR,Argentina,
-AS,American Samoa,
-AT,Austria,
-AU,Australia,
-AW,Aruba,
-AX,Aland Islands,
-AZ,Azerbaijan,
-BA,Bosnia and Herzegovina,
-BB,Barbados,
-BD,Bangladesh,
-BE,Belgium,
-BF,Burkina Faso,
-BG,Bulgaria,
-BH,Bahrain,
-BI,Burundi,
-BJ,Benin,
-BL,Saint Bartelemey,
-BM,Bermuda,
-BN,Brunei Darussalam,
-BO,Bolivia,
-BQ,"Bonaire, Saint Eustatius and Saba",
-BR,Brazil,
-BS,Bahamas,
-BT,Bhutan,
-BV,Bouvet Island,
-BW,Botswana,
-BY,Belarus,
-BZ,Belize,
-CA,Canada,
-CC,Cocos (Keeling) Islands,
-CD,"Congo, The Democratic Republic of the",
-CF,Central African Republic,
-CG,Congo,
-CH,Switzerland,
-CI,Cote d'Ivoire,
-CK,Cook Islands,
-CL,Chile,
-CM,Cameroon,
-CN,China,
-CO,Colombia,
-CR,Costa Rica,
-CU,Cuba,
-CV,Cape Verde,
-CW,Curacao,
-CX,Christmas Island,
-CY,Cyprus,
-CZ,Czech Republic,
-DE,Germany,
-DJ,Djibouti,
-DK,Denmark,
-DM,Dominica,
-DO,Dominican Republic,
-DZ,Algeria,
-EC,Ecuador,
-EE,Estonia,
-EG,Egypt,
-EH,Western Sahara,
-ER,Eritrea,
-ES,Spain,
-ET,Ethiopia,
-EU,Europe,
-FI,Finland,
-FJ,Fiji,
-FK,Falkland Islands (Malvinas),
-FM,"Micronesia, Federated States of",
-FO,Faroe Islands,
-FR,France,
-GA,Gabon,
-GB,United Kingdom,
-GD,Grenada,
-GE,Georgia,
-GF,French Guiana,
-GG,Guernsey,
-GH,Ghana,
-GI,Gibraltar,
-GL,Greenland,
-GM,Gambia,
-GN,Guinea,
-GP,Guadeloupe,
-GQ,Equatorial Guinea,
-GR,Greece,
-GS,South Georgia and the South Sandwich Islands,
-GT,Guatemala,
-GU,Guam,
-GW,Guinea-Bissau,
-GY,Guyana,
-HK,Hong Kong,
-HM,Heard Island and McDonald Islands,
-HN,Honduras,
-HR,Croatia,
-HT,Haiti,
-HU,Hungary,
-ID,Indonesia,
-IE,Ireland,
-IL,Israel,
-IM,Isle of Man,
-IN,India,
-IO,British Indian Ocean Territory,
-IQ,Iraq,
-IR,"Iran, Islamic Republic of",
-IS,Iceland,
-IT,Italy,
-JE,Jersey,
-JM,Jamaica,
-JO,Jordan,
-JP,Japan,
-KE,Kenya,
-KG,Kyrgyzstan,
-KH,Cambodia,
-KI,Kiribati,
-KM,Comoros,
-KN,Saint Kitts and Nevis,
-KP,"Korea, Democratic People's Republic of",
-KR,"Korea, Republic of",
-KW,Kuwait,
-KY,Cayman Islands,
-KZ,Kazakhstan,
-LA,Lao People's Democratic Republic,
-LB,Lebanon,
-LC,Saint Lucia,
-LI,Liechtenstein,
-LK,Sri Lanka,
-LR,Liberia,
-LS,Lesotho,
-LT,Lithuania,
-LU,Luxembourg,
-LV,Latvia,
-LY,Libyan Arab Jamahiriya,
-MA,Morocco,
-MC,Monaco,
-MD,"Moldova, Republic of",
-ME,Montenegro,
-MF,Saint Martin,
-MG,Madagascar,
-MH,Marshall Islands,
-MK,Macedonia,
-ML,Mali,
-MM,Myanmar,
-MN,Mongolia,
-MO,Macao,
-MP,Northern Mariana Islands,
-MQ,Martinique,
-MR,Mauritania,
-MS,Montserrat,
-MT,Malta,
-MU,Mauritius,
-MV,Maldives,
-MW,Malawi,
-MX,Mexico,
-MY,Malaysia,
-MZ,Mozambique,
-NA,Namibia,
-NC,New Caledonia,
-NE,Niger,
-NF,Norfolk Island,
-NG,Nigeria,
-NI,Nicaragua,
-NL,Netherlands,
-NO,Norway,
-NP,Nepal,
-NR,Nauru,
-NU,Niue,
-NZ,New Zealand,
-OM,Oman,
-PA,Panama,
-PE,Peru,
-PF,French Polynesia,
-PG,Papua New Guinea,
-PH,Philippines,
-PK,Pakistan,
-PL,Poland,
-PM,Saint Pierre and Miquelon,
-PN,Pitcairn,
-PR,Puerto Rico,
-PS,Palestinian Territory,
-PT,Portugal,
-PW,Palau,
-PY,Paraguay,
-QA,Qatar,
-RE,Reunion,
-RO,Romania,
-RS,Serbia,
-RU,Russian Federation,
-RW,Rwanda,
-SA,Saudi Arabia,
-SB,Solomon Islands,
-SC,Seychelles,
-SD,Sudan,
-SE,Sweden,
-SG,Singapore,
-SH,Saint Helena,
-SI,Slovenia,
-SJ,Svalbard and Jan Mayen,
-SK,Slovakia,
-SL,Sierra Leone,
-SM,San Marino,
-SN,Senegal,
-SO,Somalia,
-SR,Suriname,
-SS,South Sudan,
-ST,Sao Tome and Principe,
-SV,El Salvador,
-SX,Sint Maarten,
-SY,Syrian Arab Republic,
-SZ,Swaziland,
-TC,Turks and Caicos Islands,
-TD,Chad,
-TF,French Southern Territories,
-TG,Togo,
-TH,Thailand,
-TJ,Tajikistan,
-TK,Tokelau,
-TL,Timor-Leste,
-TM,Turkmenistan,
-TN,Tunisia,
-TO,Tonga,
-TR,Turkey,
-TT,Trinidad and Tobago,
-TV,Tuvalu,
-TW,Taiwan,
-TZ,"Tanzania, United Republic of",
-UA,Ukraine,
-UG,Uganda,
-UM,United States Minor Outlying Islands,
-US,United States,
-UY,Uruguay,
-UZ,Uzbekistan,
-VA,Holy See (Vatican City State),
-VC,Saint Vincent and the Grenadines,
-VE,Venezuela,
-VG,"Virgin Islands, British",
-VI,"Virgin Islands, U.S.",
-VN,Vietnam,
-VU,Vanuatu,
-WF,Wallis and Futuna,
-WS,Samoa,
-YE,Yemen,
-YT,Mayotte,
-ZA,South Africa,
-ZM,Zambia,
-ZW,Zimbabwe,
\ No newline at end of file
diff --git a/lib/ipwhois/data/iso_3166-1_list_en.xml b/lib/ipwhois/data/iso_3166-1_list_en.xml
deleted file mode 100644
index 274171b1..00000000
--- a/lib/ipwhois/data/iso_3166-1_list_en.xml
+++ /dev/null
@@ -1,1003 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>
-<ISO_3166-1_List_en xml:lang="en">
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>AFGHANISTAN</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>AF</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>ALAND ISLANDS</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>AX</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>ALBANIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>AL</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>ALGERIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>DZ</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>AMERICAN SAMOA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>AS</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>ANDORRA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>AD</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>ANGOLA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>AO</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>ANGUILLA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>AI</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>ANTARCTICA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>AQ</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>ANTIGUA AND BARBUDA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>AG</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>NETHERLANDS ANTILLES</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>AN</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>ARGENTINA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>AR</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>ARMENIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>AM</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>ARUBA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>AW</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>AUSTRALIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>AU</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>AUSTRIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>AT</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>AZERBAIJAN</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>AZ</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>BAHAMAS</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>BS</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>BAHRAIN</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>BH</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>BANGLADESH</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>BD</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>BARBADOS</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>BB</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>BELARUS</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>BY</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>BELGIUM</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>BE</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>BELIZE</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>BZ</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>BENIN</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>BJ</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>BERMUDA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>BM</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>BHUTAN</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>BT</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>BOLIVIA, PLURINATIONAL STATE OF</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>BO</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>BONAIRE, SINT EUSTATIUS AND SABA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>BQ</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>BOSNIA AND HERZEGOVINA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>BA</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>BOTSWANA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>BW</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>BOUVET ISLAND</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>BV</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>BRAZIL</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>BR</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>BRITISH INDIAN OCEAN TERRITORY</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>IO</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>BRUNEI DARUSSALAM</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>BN</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>BULGARIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>BG</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>BURKINA FASO</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>BF</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>BURUNDI</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>BI</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>CAMBODIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>KH</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>CAMEROON</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>CM</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>CANADA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>CA</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>CAPE VERDE</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>CV</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>CAYMAN ISLANDS</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>KY</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>CENTRAL AFRICAN REPUBLIC</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>CF</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>CHAD</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>TD</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>CHILE</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>CL</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>CHINA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>CN</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>CHRISTMAS ISLAND</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>CX</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>COCOS (KEELING) ISLANDS</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>CC</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>COLOMBIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>CO</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>COMOROS</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>KM</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>CONGO</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>CG</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>CONGO, THE DEMOCRATIC REPUBLIC OF THE</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>CD</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>COOK ISLANDS</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>CK</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>COSTA RICA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>CR</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>COTE D'IVOIRE</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>CI</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>CROATIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>HR</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>CURACAO</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>CW</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>CUBA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>CU</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>CYPRUS</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>CY</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>CZECH REPUBLIC</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>CZ</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>DENMARK</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>DK</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>DJIBOUTI</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>DJ</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>DOMINICA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>DM</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>DOMINICAN REPUBLIC</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>DO</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>ECUADOR</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>EC</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>EGYPT</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>EG</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>EL SALVADOR</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>SV</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>EQUATORIAL GUINEA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>GQ</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>ERITREA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>ER</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>ESTONIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>EE</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>ETHIOPIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>ET</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>FALKLAND ISLANDS (MALVINAS)</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>FK</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>FAROE ISLANDS</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>FO</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>FIJI</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>FJ</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>FINLAND</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>FI</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>FRANCE</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>FR</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>FRENCH GUIANA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>GF</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>FRENCH POLYNESIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>PF</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>FRENCH SOUTHERN TERRITORIES</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>TF</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>GABON</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>GA</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>GAMBIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>GM</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>GEORGIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>GE</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>GERMANY</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>DE</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>GHANA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>GH</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>GIBRALTAR</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>GI</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>GREECE</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>GR</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>GREENLAND</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>GL</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>GRENADA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>GD</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>GUADELOUPE</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>GP</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>GUAM</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>GU</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>GUATEMALA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>GT</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-   <ISO_3166-1_Country_name>GUERNSEY</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>GG</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>GUINEA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>GN</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>GUINEA-BISSAU</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>GW</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>GUYANA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>GY</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>HAITI</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>HT</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>HEARD ISLAND AND MCDONALD ISLANDS</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>HM</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>HOLY SEE (VATICAN CITY STATE)</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>VA</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>HONDURAS</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>HN</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>HONG KONG</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>HK</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>HUNGARY</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>HU</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>ICELAND</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>IS</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>INDIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>IN</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>INDONESIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>ID</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>IRAN, ISLAMIC REPUBLIC OF</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>IR</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>IRAQ</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>IQ</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>IRELAND</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>IE</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-   <ISO_3166-1_Country_name>ISLE OF MAN</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>IM</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>ISRAEL</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>IL</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>ITALY</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>IT</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>JAMAICA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>JM</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>JAPAN</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>JP</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-   <ISO_3166-1_Country_name>JERSEY</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>JE</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>JORDAN</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>JO</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>KAZAKHSTAN</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>KZ</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>KENYA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>KE</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>KIRIBATI</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>KI</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>KP</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>KOREA, REPUBLIC OF</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>KR</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>KUWAIT</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>KW</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>KYRGYZSTAN</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>KG</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>LAO PEOPLE'S DEMOCRATIC REPUBLIC</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>LA</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>LATVIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>LV</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>LEBANON</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>LB</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>LESOTHO</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>LS</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>LIBERIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>LR</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>LIBYA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>LY</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>LIECHTENSTEIN</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>LI</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>LITHUANIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>LT</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>LUXEMBOURG</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>LU</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>MACAO</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>MO</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>MK</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>MADAGASCAR</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>MG</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>MALAWI</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>MW</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>MALAYSIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>MY</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>MALDIVES</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>MV</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>MALI</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>ML</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>MALTA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>MT</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>MARSHALL ISLANDS</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>MH</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>MARTINIQUE</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>MQ</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>MAURITANIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>MR</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>MAURITIUS</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>MU</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>MAYOTTE</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>YT</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>MEXICO</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>MX</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>MICRONESIA, FEDERATED STATES OF</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>FM</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>MOLDOVA, REPUBLIC OF</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>MD</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>MONACO</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>MC</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>MONGOLIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>MN</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-   <ISO_3166-1_Country_name>MONTENEGRO</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>ME</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>MONTSERRAT</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>MS</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>MOROCCO</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>MA</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>MOZAMBIQUE</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>MZ</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>MYANMAR</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>MM</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>NAMIBIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>NA</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>NAURU</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>NR</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>NEPAL</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>NP</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>NETHERLANDS</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>NL</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>NEW CALEDONIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>NC</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>NEW ZEALAND</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>NZ</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>NICARAGUA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>NI</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>NIGER</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>NE</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>NIGERIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>NG</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>NIUE</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>NU</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>NORFOLK ISLAND</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>NF</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>NORTHERN MARIANA ISLANDS</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>MP</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>NORWAY</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>NO</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>OMAN</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>OM</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>PAKISTAN</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>PK</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>PALAU</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>PW</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>PALESTINIAN TERRITORY, OCCUPIED</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>PS</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>PANAMA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>PA</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>PAPUA NEW GUINEA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>PG</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>PARAGUAY</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>PY</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>PERU</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>PE</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>PHILIPPINES</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>PH</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>PITCAIRN</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>PN</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>POLAND</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>PL</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>PORTUGAL</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>PT</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>PUERTO RICO</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>PR</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>QATAR</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>QA</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>REUNION</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>RE</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>ROMANIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>RO</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>RUSSIAN FEDERATION</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>RU</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>RWANDA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>RW</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SAINT BARTHELEMY</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>BL</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SAINT HELENA, ASCENSION AND TRISTAN DA CUNHA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>SH</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SAINT KITTS AND NEVIS</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>KN</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SAINT LUCIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>LC</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SAINT MARTIN (FRENCH PART)</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>MF</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SAINT PIERRE AND MIQUELON</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>PM</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SAINT VINCENT AND THE GRENADINES</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>VC</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SAMOA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>WS</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SAN MARINO</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>SM</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SAO TOME AND PRINCIPE</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>ST</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SAUDI ARABIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>SA</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SENEGAL</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>SN</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SERBIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>RS</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SEYCHELLES</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>SC</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SIERRA LEONE</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>SL</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SINGAPORE</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>SG</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SINT MAARTEN (DUTCH PART)</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>SX</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SLOVAKIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>SK</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SLOVENIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>SI</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SOLOMON ISLANDS</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>SB</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SOMALIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>SO</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SOUTH AFRICA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>ZA</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>GS</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SOUTH SUDAN</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>SS</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SPAIN</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>ES</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SRI LANKA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>LK</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SUDAN</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>SD</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SURINAME</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>SR</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SVALBARD AND JAN MAYEN</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>SJ</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SWAZILAND</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>SZ</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SWEDEN</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>SE</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SWITZERLAND</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>CH</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>SYRIAN ARAB REPUBLIC</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>SY</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>TAIWAN, PROVINCE OF CHINA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>TW</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>TAJIKISTAN</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>TJ</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>TANZANIA, UNITED REPUBLIC OF</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>TZ</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>THAILAND</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>TH</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>TIMOR-LESTE</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>TL</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>TOGO</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>TG</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>TOKELAU</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>TK</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>TONGA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>TO</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>TRINIDAD AND TOBAGO</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>TT</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>TUNISIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>TN</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>TURKEY</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>TR</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>TURKMENISTAN</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>TM</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>TURKS AND CAICOS ISLANDS</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>TC</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>TUVALU</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>TV</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>UGANDA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>UG</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>UKRAINE</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>UA</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>UNITED ARAB EMIRATES</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>AE</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>UNITED KINGDOM</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>GB</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>UNITED STATES</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>US</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>UNITED STATES MINOR OUTLYING ISLANDS</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>UM</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>URUGUAY</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>UY</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>UZBEKISTAN</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>UZ</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>VANUATU</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>VU</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>VENEZUELA, BOLIVARIAN REPUBLIC OF</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>VE</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>VIET NAM</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>VN</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>VIRGIN ISLANDS, BRITISH</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>VG</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>VIRGIN ISLANDS, U.S.</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>VI</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>WALLIS AND FUTUNA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>WF</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>WESTERN SAHARA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>EH</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>YEMEN</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>YE</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>ZAMBIA</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>ZM</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-   <ISO_3166-1_Entry>
-      <ISO_3166-1_Country_name>ZIMBABWE</ISO_3166-1_Country_name>
-      <ISO_3166-1_Alpha-2_Code_element>ZW</ISO_3166-1_Alpha-2_Code_element>
-   </ISO_3166-1_Entry>
-</ISO_3166-1_List_en>
diff --git a/lib/ipwhois/exceptions.py b/lib/ipwhois/exceptions.py
deleted file mode 100644
index 88251876..00000000
--- a/lib/ipwhois/exceptions.py
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright (c) 2013-2020 Philip Hane
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-
-class BaseIpwhoisException(Exception):
-    """
-    Base exception for all the ipwhois custom ones.
-    """
-
-
-class NetError(BaseIpwhoisException):
-    """
-    An Exception for when a parameter provided is not an instance of
-    ipwhois.net.Net.
-    """
-
-
-class IPDefinedError(BaseIpwhoisException):
-    """
-    An Exception for when the IP is defined (does not need to be resolved).
-    """
-
-
-class ASNLookupError(BaseIpwhoisException):
-    """
-    An Exception for when the ASN lookup failed.
-    """
-
-
-class ASNRegistryError(BaseIpwhoisException):
-    """
-    An Exception for when the ASN registry does not match one of the five
-    expected values (arin, ripencc, apnic, lacnic, afrinic).
-    """
-
-
-class ASNParseError(BaseIpwhoisException):
-    """
-    An Exception for when the ASN parsing failed.
-    """
-
-
-class ASNOriginLookupError(BaseIpwhoisException):
-    """
-    An Exception for when the ASN origin lookup failed.
-    """
-
-
-class HostLookupError(BaseIpwhoisException):
-    """
-    An Exception for when the host lookup failed.
-    """
-
-
-class BlacklistError(BaseIpwhoisException):
-    """
-    An Exception for when the server is in a blacklist.
-    """
-
-
-class WhoisLookupError(BaseIpwhoisException):
-    """
-    An Exception for when the whois lookup failed.
-    """
-
-
-class WhoisRateLimitError(BaseIpwhoisException):
-    """
-    An Exception for when Whois queries exceed the NIC's request limit and have
-    exhausted all retries.
-    """
-
-
-class HTTPLookupError(BaseIpwhoisException):
-    """
-    An Exception for when the RDAP lookup failed.
-    """
-
-
-class HTTPRateLimitError(BaseIpwhoisException):
-    """
-    An Exception for when HTTP queries exceed the NIC's request limit and have
-    exhausted all retries.
-    """
-
-
-class InvalidEntityContactObject(BaseIpwhoisException):
-    """
-    An Exception for when JSON output is not an RDAP entity contact information
-    object:
-    https://tools.ietf.org/html/rfc7483#section-5.4
-    """
-
-
-class InvalidNetworkObject(BaseIpwhoisException):
-    """
-    An Exception for when JSON output is not an RDAP network object:
-    https://tools.ietf.org/html/rfc7483#section-5.4
-    """
-
-
-class InvalidEntityObject(BaseIpwhoisException):
-    """
-    An Exception for when JSON output is not an RDAP entity object:
-    https://tools.ietf.org/html/rfc7483#section-5.1
-    """
diff --git a/lib/ipwhois/experimental.py b/lib/ipwhois/experimental.py
deleted file mode 100644
index 8f6ce230..00000000
--- a/lib/ipwhois/experimental.py
+++ /dev/null
@@ -1,464 +0,0 @@
-# Copyright (c) 2017-2019 Philip Hane
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-import socket
-import logging
-import time
-from collections import namedtuple
-
-from .exceptions import (ASNLookupError, HTTPLookupError, HTTPRateLimitError,
-                         ASNRegistryError)
-from .asn import IPASN
-from .net import (CYMRU_WHOIS, Net)
-from .rdap import RDAP
-from .utils import unique_everseen
-
-log = logging.getLogger(__name__)
-
-
-def get_bulk_asn_whois(addresses=None, retry_count=3, timeout=120):
-    """
-    The function for retrieving ASN information for multiple IP addresses from
-    Cymru via port 43/tcp (WHOIS).
-
-    Args:
-        addresses (:obj:`list` of :obj:`str`): IP addresses to lookup.
-        retry_count (:obj:`int`): The number of times to retry in case socket
-            errors, timeouts, connection resets, etc. are encountered.
-            Defaults to 3.
-        timeout (:obj:`int`): The default timeout for socket connections in
-            seconds. Defaults to 120.
-
-    Returns:
-        str: The raw ASN bulk data, new line separated.
-
-    Raises:
-        ValueError: addresses argument must be a list of IPv4/v6 address
-            strings.
-        ASNLookupError: The ASN bulk lookup failed.
-    """
-
-    if not isinstance(addresses, list):
-
-        raise ValueError('addresses argument must be a list of IPv4/v6 '
-                         'address strings.')
-
-    try:
-
-        # Create the connection for the Cymru whois query.
-        conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        conn.settimeout(timeout)
-        log.debug('ASN bulk query initiated.')
-        conn.connect((CYMRU_WHOIS, 43))
-
-        # Query the Cymru whois server, and store the results.
-        conn.sendall((
-            ' -r -a -c -p -f begin\n{0}\nend'.format(
-                '\n'.join(addresses))
-        ).encode())
-
-        data = ''
-        while True:
-
-            d = conn.recv(4096).decode()
-            data += d
-
-            if not d:
-
-                break
-
-        conn.close()
-
-        return str(data)
-
-    except (socket.timeout, socket.error) as e:  # pragma: no cover
-
-        log.debug('ASN bulk query socket error: {0}'.format(e))
-        if retry_count > 0:
-
-            log.debug('ASN bulk query retrying (count: {0})'.format(
-                str(retry_count)))
-            return get_bulk_asn_whois(addresses, retry_count - 1, timeout)
-
-        else:
-
-            raise ASNLookupError('ASN bulk lookup failed.')
-
-    except:  # pragma: no cover
-
-        raise ASNLookupError('ASN bulk lookup failed.')
-
-
-def bulk_lookup_rdap(addresses=None, inc_raw=False, retry_count=3, depth=0,
-                     excluded_entities=None, rate_limit_timeout=60,
-                     socket_timeout=10, asn_timeout=240, proxy_openers=None):
-    """
-    The function for bulk retrieving and parsing whois information for a list
-    of IP addresses via HTTP (RDAP). This bulk lookup method uses bulk
-    ASN Whois lookups first to retrieve the ASN for each IP. It then optimizes
-    RDAP queries to achieve the fastest overall time, accounting for
-    rate-limiting RIRs.
-
-    Args:
-        addresses (:obj:`list` of :obj:`str`): IP addresses to lookup.
-        inc_raw (:obj:`bool`, optional): Whether to include the raw whois
-            results in the returned dictionary. Defaults to False.
-        retry_count (:obj:`int`): The number of times to retry in case socket
-            errors, timeouts, connection resets, etc. are encountered.
-            Defaults to 3.
-        depth (:obj:`int`): How many levels deep to run queries when additional
-            referenced objects are found. Defaults to 0.
-        excluded_entities (:obj:`list` of :obj:`str`): Entity handles to not
-            perform lookups. Defaults to None.
-        rate_limit_timeout (:obj:`int`): The number of seconds to wait before
-            retrying when a rate limit notice is returned via rdap+json.
-            Defaults to 60.
-        socket_timeout (:obj:`int`): The default timeout for socket
-            connections in seconds. Defaults to 10.
-        asn_timeout (:obj:`int`): The default timeout for bulk ASN lookups in
-            seconds. Defaults to 240.
-        proxy_openers (:obj:`list` of :obj:`OpenerDirector`): Proxy openers
-            for single/rotating proxy support. Defaults to None.
-
-    Returns:
-        namedtuple:
-
-        :results (dict): IP address keys with the values as dictionaries
-            returned by IPWhois.lookup_rdap().
-        :stats (dict): Stats for the lookups:
-
-        ::
-
-            {
-                'ip_input_total' (int) - The total number of addresses
-                    originally provided for lookup via the addresses argument.
-                'ip_unique_total' (int) - The total number of unique addresses
-                    found in the addresses argument.
-                'ip_lookup_total' (int) - The total number of addresses that
-                    lookups were attempted for, excluding any that failed ASN
-                    registry checks.
-                'ip_failed_total' (int) - The total number of addresses that
-                    lookups failed for. Excludes any that failed initially, but
-                    succeeded after further retries.
-                'lacnic' (dict) -
-                {
-                    'failed' (list) - The addresses that failed to lookup.
-                        Excludes any that failed initially, but succeeded after
-                        further retries.
-                    'rate_limited' (list) - The addresses that encountered
-                        rate-limiting. Unless an address is also in 'failed',
-                        it eventually succeeded.
-                    'total' (int) - The total number of addresses belonging to
-                        this RIR that lookups were attempted for.
-                }
-                'ripencc' (dict) - Same as 'lacnic' above.
-                'apnic' (dict) - Same as 'lacnic' above.
-                'afrinic' (dict) - Same as 'lacnic' above.
-                'arin' (dict) - Same as 'lacnic' above.
-                'unallocated_addresses' (list) - The addresses that are
-                    unallocated/failed ASN lookups. These can be addresses that
-                    are not listed for one of the 5 RIRs (other). No attempt
-                    was made to perform an RDAP lookup for these.
-            }
-
-    Raises:
-        ASNLookupError: The ASN bulk lookup failed, cannot proceed with bulk
-            RDAP lookup.
-    """
-
-    if not isinstance(addresses, list):
-
-        raise ValueError('addresses must be a list of IP address strings')
-
-    # Initialize the dicts/lists
-    results = {}
-    failed_lookups_dict = {}
-    rated_lookups = []
-    stats = {
-        'ip_input_total': len(addresses),
-        'ip_unique_total': 0,
-        'ip_lookup_total': 0,
-        'ip_failed_total': 0,
-        'lacnic': {'failed': [], 'rate_limited': [], 'total': 0},
-        'ripencc': {'failed': [], 'rate_limited': [], 'total': 0},
-        'apnic': {'failed': [], 'rate_limited': [], 'total': 0},
-        'afrinic': {'failed': [], 'rate_limited': [], 'total': 0},
-        'arin': {'failed': [], 'rate_limited': [], 'total': 0},
-        'unallocated_addresses': []
-    }
-    asn_parsed_results = {}
-
-    if proxy_openers is None:
-
-        proxy_openers = [None]
-
-    proxy_openers_copy = iter(proxy_openers)
-
-    # Make sure addresses is unique
-    unique_ip_list = list(unique_everseen(addresses))
-
-    # Get the unique count to return
-    stats['ip_unique_total'] = len(unique_ip_list)
-
-    # This is needed for iteration order
-    rir_keys_ordered = ['lacnic', 'ripencc', 'apnic', 'afrinic', 'arin']
-
-    # First query the ASN data for all IPs, can raise ASNLookupError, no catch
-    bulk_asn = get_bulk_asn_whois(unique_ip_list, timeout=asn_timeout)
-
-    # ASN results are returned as string, parse lines to list and remove first
-    asn_result_list = bulk_asn.split('\n')
-    del asn_result_list[0]
-
-    # We need to instantiate IPASN, which currently needs a Net object,
-    # IP doesn't matter here
-    net = Net('1.2.3.4')
-    ipasn = IPASN(net)
-
-    # Iterate each IP ASN result, and add valid RIR results to
-    # asn_parsed_results for RDAP lookups
-    for asn_result in asn_result_list:
-
-        temp = asn_result.split('|')
-
-        # Not a valid entry, move on to next
-        if len(temp) == 1:
-
-            continue
-
-        ip = temp[1].strip()
-
-        # We need this since ASN bulk lookup is returning duplicates
-        # This is an issue on the Cymru end
-        if ip in asn_parsed_results.keys():  # pragma: no cover
-
-            continue
-
-        try:
-
-            asn_parsed = ipasn.parse_fields_whois(asn_result)
-
-        except ASNRegistryError:  # pragma: no cover
-
-            continue
-
-        # Add valid IP ASN result to asn_parsed_results for RDAP lookup
-        asn_parsed_results[ip] = asn_parsed
-        stats[asn_parsed['asn_registry']]['total'] += 1
-
-    # Set the list of IPs that are not allocated/failed ASN lookup
-    stats['unallocated_addresses'] = list(k for k in addresses if k not in
-                                          asn_parsed_results)
-
-    # Set the total lookup count after unique IP and ASN result filtering
-    stats['ip_lookup_total'] = len(asn_parsed_results)
-
-    # Track the total number of LACNIC queries left. This is tracked in order
-    # to ensure the 9 priority LACNIC queries/min don't go into infinite loop
-    lacnic_total_left = stats['lacnic']['total']
-
-    # Set the start time, this value is updated when the rate limit is reset
-    old_time = time.time()
-
-    # Rate limit tracking dict for all RIRs
-    rate_tracker = {
-        'lacnic': {'time': old_time, 'count': 0},
-        'ripencc': {'time': old_time, 'count': 0},
-        'apnic': {'time': old_time, 'count': 0},
-        'afrinic': {'time': old_time, 'count': 0},
-        'arin': {'time': old_time, 'count': 0}
-    }
-
-    # Iterate all of the IPs to perform RDAP lookups until none are left
-    while len(asn_parsed_results) > 0:
-
-        # Sequentially run through each RIR to minimize lookups in a row to
-        # the same RIR.
-        for rir in rir_keys_ordered:
-
-            # If there are still LACNIC IPs left to lookup and the rate limit
-            # hasn't been reached, skip to find a LACNIC IP to lookup
-            if (
-                rir != 'lacnic' and lacnic_total_left > 0 and
-                (rate_tracker['lacnic']['count'] != 9 or
-                    (time.time() - rate_tracker['lacnic']['time']
-                     ) >= rate_limit_timeout
-                 )
-               ):  # pragma: no cover
-
-                continue
-
-            # If the RIR rate limit has been reached and hasn't expired,
-            # move on to the next RIR
-            if (
-                rate_tracker[rir]['count'] == 9 and (
-                    (time.time() - rate_tracker[rir]['time']
-                     ) < rate_limit_timeout)
-               ):  # pragma: no cover
-
-                continue
-
-            # If the RIR rate limit has expired, reset the count/timer
-            # and perform the lookup
-            elif ((time.time() - rate_tracker[rir]['time']
-                   ) >= rate_limit_timeout):  # pragma: no cover
-
-                rate_tracker[rir]['count'] = 0
-                rate_tracker[rir]['time'] = time.time()
-
-            # Create a copy of the lookup IP dict so we can modify on
-            # successful/failed queries. Loop each IP until it matches the
-            # correct RIR in the parent loop, and attempt lookup
-            tmp_dict = asn_parsed_results.copy()
-
-            for ip, asn_data in tmp_dict.items():
-
-                # Check to see if IP matches parent loop RIR for lookup
-                if asn_data['asn_registry'] == rir:
-
-                    log.debug('Starting lookup for IP: {0} '
-                              'RIR: {1}'.format(ip, rir))
-
-                    # Add to count for rate-limit tracking only for LACNIC,
-                    # since we have not seen aggressive rate-limiting from the
-                    # other RIRs yet
-                    if rir == 'lacnic':
-
-                        rate_tracker[rir]['count'] += 1
-
-                    # Get the next proxy opener to use, or None
-                    try:
-
-                        opener = next(proxy_openers_copy)
-
-                    # Start at the beginning if all have been used
-                    except StopIteration:
-
-                        proxy_openers_copy = iter(proxy_openers)
-                        opener = next(proxy_openers_copy)
-
-                    # Instantiate the objects needed for the RDAP lookup
-                    net = Net(ip, timeout=socket_timeout, proxy_opener=opener)
-                    rdap = RDAP(net)
-
-                    try:
-
-                        # Perform the RDAP lookup. retry_count is set to 0
-                        # here since we handle that in this function
-                        rdap_result = rdap.lookup(
-                            inc_raw=inc_raw, retry_count=0, asn_data=asn_data,
-                            depth=depth, excluded_entities=excluded_entities
-                        )
-
-                        log.debug('Successful lookup for IP: {0} '
-                                  'RIR: {1}'.format(ip, rir))
-
-                        # Lookup was successful, add to result. Set the nir
-                        # key to None as this is not supported
-                        # (yet - requires more queries)
-                        results[ip] = asn_data
-                        results[ip].update(rdap_result)
-
-                        results[ip]['nir'] = None
-
-                        # Remove the IP from the lookup queue
-                        del asn_parsed_results[ip]
-
-                        # If this was LACNIC IP, reduce the total left count
-                        if rir == 'lacnic':
-
-                            lacnic_total_left -= 1
-
-                        log.debug(
-                            '{0} total lookups left, {1} LACNIC lookups left'
-                            ''.format(str(len(asn_parsed_results)),
-                                      str(lacnic_total_left))
-                        )
-
-                        # If this IP failed previously, remove it from the
-                        # failed return dict
-                        if (
-                            ip in failed_lookups_dict.keys()
-                        ):  # pragma: no cover
-
-                            del failed_lookups_dict[ip]
-
-                        # Break out of the IP list loop, we need to change to
-                        # the next RIR
-                        break
-
-                    except HTTPLookupError:  # pragma: no cover
-
-                        log.debug('Failed lookup for IP: {0} '
-                                  'RIR: {1}'.format(ip, rir))
-
-                        # Add the IP to the failed lookups dict if not there
-                        if ip not in failed_lookups_dict.keys():
-
-                            failed_lookups_dict[ip] = 1
-
-                        # This IP has already failed at least once, increment
-                        # the failure count until retry_count reached, then
-                        # stop trying
-                        else:
-
-                            failed_lookups_dict[ip] += 1
-
-                            if failed_lookups_dict[ip] == retry_count:
-
-                                del asn_parsed_results[ip]
-                                stats[rir]['failed'].append(ip)
-                                stats['ip_failed_total'] += 1
-
-                                if rir == 'lacnic':
-
-                                    lacnic_total_left -= 1
-
-                        # Since this IP failed, we don't break to move to next
-                        # RIR, we check the next IP for this RIR
-                        continue
-
-                    except HTTPRateLimitError:  # pragma: no cover
-
-                        # Add the IP to the rate-limited lookups dict if not
-                        # there
-                        if ip not in rated_lookups:
-
-                            rated_lookups.append(ip)
-                            stats[rir]['rate_limited'].append(ip)
-
-                        log.debug('Rate limiting triggered for IP: {0} '
-                                  'RIR: {1}'.format(ip, rir))
-
-                        # Since rate-limit was reached, reset the timer and
-                        # max out the count
-                        rate_tracker[rir]['time'] = time.time()
-                        rate_tracker[rir]['count'] = 9
-
-                        # Break out of the IP list loop, we need to change to
-                        # the next RIR
-                        break
-
-    return_tuple = namedtuple('return_tuple', ['results', 'stats'])
-    return return_tuple(results, stats)
diff --git a/lib/ipwhois/hr.py b/lib/ipwhois/hr.py
deleted file mode 100644
index 31383b7b..00000000
--- a/lib/ipwhois/hr.py
+++ /dev/null
@@ -1,509 +0,0 @@
-# Copyright (c) 2013-2020 Philip Hane
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-# TODO: Add '_links' for RFC/other references
-
-HR_ASN = {
-    'asn': {
-        '_short': 'ASN',
-        '_name': 'Autonomous System Number',
-        '_description': 'Globally unique identifier used for routing '
-                        'information exchange with Autonomous Systems.'
-    },
-    'asn_cidr': {
-        '_short': 'ASN CIDR Block',
-        '_name': 'ASN Classless Inter-Domain Routing Block',
-        '_description': 'Network routing block assigned to an ASN.'
-    },
-    'asn_country_code': {
-        '_short': 'ASN Country Code',
-        '_name': 'ASN Assigned Country Code',
-        '_description': 'ASN assigned country code in ISO 3166-1 format.'
-    },
-    'asn_date': {
-        '_short': 'ASN Date',
-        '_name': 'ASN Allocation Date',
-        '_description': 'ASN allocation date in ISO 8601 format.'
-    },
-    'asn_registry': {
-        '_short': 'ASN Registry',
-        '_name': 'ASN Assigned Registry',
-        '_description': 'ASN assigned regional internet registry.'
-    },
-    'asn_description': {
-        '_short': 'ASN Description',
-        '_name': 'ASN Description',
-        '_description': 'A brief description for the assigned ASN.'
-    }
-}
-
-HR_ASN_ORIGIN = {
-    'nets': {
-        '_short': 'Network',
-        '_name': 'ASN Network',
-        '_description': 'A network associated with an Autonomous System Number'
-                        ' (ASN)',
-        'cidr': {
-            '_short': 'CIDR',
-            '_name': 'Classless Inter-Domain Routing Block',
-            '_description': 'The network routing block.'
-        },
-        'description': {
-            '_short': 'Description',
-            '_name': 'Description',
-            '_description': 'Description for the registered network.'
-        },
-        'maintainer': {
-            '_short': 'Maintainer',
-            '_name': 'Maintainer',
-            '_description': 'The entity that maintains the network.'
-        },
-        'updated': {
-            '_short': 'Updated',
-            '_name': 'Updated Timestamp',
-            '_description': 'Network registration updated information.'
-        },
-        'source': {
-            '_short': 'Source',
-            '_name': 'ASN Network Information Source',
-            '_description': 'The source of the network information.'
-        }
-    }
-}
-
-HR_RDAP_COMMON = {
-    'entities': {
-        '_short': 'Entities',
-        '_name': 'RIR Object Entities',
-        '_description': 'List of object names referenced by an RIR object.'
-    },
-    'events': {
-        '_short': 'Events',
-        '_name': 'Events',
-        '_description': 'Events for an RIR object.',
-        'action': {
-            '_short': 'Action',
-            '_name': 'Event Action (Reason)',
-            '_description': 'The reason for an event.'
-        },
-        'timestamp': {
-            '_short': 'Timestamp',
-            '_name': 'Event Timestamp',
-            '_description': 'The date an event occured in ISO 8601 '
-                            'format.'
-        },
-        'actor': {
-            '_short': 'Actor',
-            '_name': 'Event Actor',
-            '_description': 'The identifier for an event initiator.'
-        }
-    },
-    'handle': {
-        '_short': 'Handle',
-        '_name': 'RIR Handle',
-        '_description': 'Unique identifier for a registered object.'
-    },
-    'links': {
-        '_short': 'Links',
-        '_name': 'Links',
-        '_description': 'HTTP/HTTPS links provided for an RIR object.'
-    },
-    'notices': {
-        '_short': 'Notices',
-        '_name': 'Notices',
-        '_description': 'Notices for an RIR object.',
-        'description': {
-            '_short': 'Description',
-            '_name': 'Notice Description',
-            '_description': 'The description/body of a notice.'
-        },
-        'title': {
-            '_short': 'Title',
-            '_name': 'Notice Title',
-            '_description': 'The title/header for a notice.'
-        },
-        'links': {
-            '_short': 'Links',
-            '_name': 'Notice Links',
-            '_description': 'HTTP/HTTPS links provided for a notice.'
-        }
-    },
-    'remarks': {
-        '_short': 'Remarks',
-        '_name': 'Remarks',
-        '_description': 'Remarks for an RIR object.',
-        'description': {
-            '_short': 'Description',
-            '_name': 'Remark Description',
-            '_description': 'The description/body of a remark.'
-        },
-        'title': {
-            '_short': 'Title',
-            '_name': 'Remark Title',
-            '_description': 'The title/header for a remark.'
-        },
-        'links': {
-            '_short': 'Links',
-            '_name': 'Remark Links',
-            '_description': 'HTTP/HTTPS links provided for a remark.'
-        }
-    },
-    'status': {
-        '_short': 'Status',
-        '_name': 'Object Status',
-        '_description': 'List indicating the state of a registered object.'
-    }
-}
-
-HR_RDAP = {
-    'network': {
-        '_short': 'Network',
-        '_name': 'RIR Network',
-        '_description': 'The assigned network for an IP address.',
-        'cidr': {
-            '_short': 'CIDR Block',
-            '_name': 'Classless Inter-Domain Routing Block',
-            '_description': 'Network routing block an IP address belongs to.'
-        },
-        'country': {
-            '_short': 'Country Code',
-            '_name': 'Country Code',
-            '_description': 'Country code registered with the RIR in '
-                            'ISO 3166-1 format.'
-        },
-        'end_address': {
-            '_short': 'End Address',
-            '_name': 'Ending IP Address',
-            '_description': 'The last IP address in a network block.'
-        },
-        'events': HR_RDAP_COMMON['events'],
-        'handle': HR_RDAP_COMMON['handle'],
-        'ip_version': {
-            '_short': 'IP Version',
-            '_name': 'IP Protocol Version',
-            '_description': 'The IP protocol version (v4 or v6) of an IP '
-                            'address.'
-        },
-        'links': HR_RDAP_COMMON['links'],
-        'name': {
-            '_short': 'Name',
-            '_name': 'RIR Network Name',
-            '_description': 'The identifier assigned to the network '
-                            'registration for an IP address.'
-        },
-        'notices': HR_RDAP_COMMON['notices'],
-        'parent_handle': {
-            '_short': 'Parent Handle',
-            '_name': 'RIR Parent Handle',
-            '_description': 'Unique identifier for the parent network of '
-                            'a registered network.'
-        },
-        'remarks': HR_RDAP_COMMON['remarks'],
-        'start_address': {
-            '_short': 'Start Address',
-            '_name': 'Starting IP Address',
-            '_description': 'The first IP address in a network block.'
-        },
-        'status': HR_RDAP_COMMON['status'],
-        'type': {
-            '_short': 'Type',
-            '_name': 'RIR Network Type',
-            '_description': 'The RIR classification of a registered network.'
-        }
-    },
-    'entities': HR_RDAP_COMMON['entities'],
-    'objects': {
-        '_short': 'Objects',
-        '_name': 'RIR Objects',
-        '_description': 'The objects (entities) referenced by an RIR network.',
-        'contact': {
-            '_short': 'Contact',
-            '_name': 'Contact Information',
-            '_description': 'Contact information registered with an RIR '
-                            'object.',
-            'address': {
-                '_short': 'Address',
-                '_name': 'Postal Address',
-                '_description': 'The contact postal address.'
-            },
-            'email': {
-                '_short': 'Email',
-                '_name': 'Email Address',
-                '_description': 'The contact email address.'
-            },
-            'kind': {
-                '_short': 'Kind',
-                '_name': 'Kind',
-                '_description': 'The contact information kind (individual, '
-                                'group, org, etc).'
-            },
-            'name': {
-                '_short': 'Name',
-                '_name': 'Name',
-                '_description': 'The contact name.'
-            },
-            'phone': {
-                '_short': 'Phone',
-                '_name': 'Phone Number',
-                '_description': 'The contact phone number.'
-            },
-            'role': {
-                '_short': 'Role',
-                '_name': 'Role',
-                '_description': 'The contact\'s role.'
-            },
-            'title': {
-                '_short': 'Title',
-                '_name': 'Title',
-                '_description': 'The contact\'s position or job title.'
-            }
-        },
-        'entities': HR_RDAP_COMMON['entities'],
-        'events': HR_RDAP_COMMON['events'],
-        'events_actor': {
-            '_short': 'Events Misc',
-            '_name': 'Events w/o Actor',
-            '_description': 'An event for an RIR object with no event actor.',
-            'action': {
-                '_short': 'Action',
-                '_name': 'Event Action (Reason)',
-                '_description': 'The reason for an event.'
-            },
-            'timestamp': {
-                '_short': 'Timestamp',
-                '_name': 'Event Timestamp',
-                '_description': 'The date an event occured in ISO 8601 '
-                                'format.'
-            }
-        },
-        'handle': HR_RDAP_COMMON['handle'],
-        'links': HR_RDAP_COMMON['links'],
-        'notices': HR_RDAP_COMMON['notices'],
-        'remarks': HR_RDAP_COMMON['remarks'],
-        'roles': {
-            '_short': 'Roles',
-            '_name': 'Roles',
-            '_description': 'List of roles assigned to a registered object.'
-        },
-        'status': HR_RDAP_COMMON['status'],
-    }
-}
-
-HR_WHOIS = {
-    'nets': {
-        '_short': 'Network',
-        '_name': 'RIR Network',
-        '_description': 'The assigned network for an IP address. May be a '
-                        'parent or child network.',
-        'address': {
-            '_short': 'Address',
-            '_name': 'Postal Address',
-            '_description': 'The contact postal address.'
-        },
-        'cidr': {
-            '_short': 'CIDR Blocks',
-            '_name': 'Classless Inter-Domain Routing Blocks',
-            '_description': 'Network routing blocks an IP address belongs to.'
-        },
-        'city': {
-            '_short': 'City',
-            '_name': 'City',
-            '_description': 'The city registered with a whois network.'
-        },
-        'country': {
-            '_short': 'Country Code',
-            '_name': 'Country Code',
-            '_description': 'Country code registered for the network in '
-                            'ISO 3166-1 format.'
-        },
-        'created': {
-            '_short': 'Created',
-            '_name': 'Created Timestamp',
-            '_description': 'The date the network was created in ISO 8601 '
-                            'format.'
-        },
-        'description': {
-            '_short': 'Description',
-            '_name': 'Description',
-            '_description': 'The description for the network.'
-        },
-        'emails': {
-            '_short': 'Emails',
-            '_name': 'Email Addresses',
-            '_description': 'The contact email addresses.'
-        },
-        'handle': {
-            '_short': 'Handle',
-            '_name': 'RIR Network Handle',
-            '_description': 'Unique identifier for a registered network.'
-        },
-        'name': {
-            '_short': 'Name',
-            '_name': 'RIR Network Name',
-            '_description': 'The identifier assigned to the network '
-                            'registration for an IP address.'
-        },
-        'postal_code': {
-            '_short': 'Postal',
-            '_name': 'Postal Code',
-            '_description': 'The postal code registered with a whois network.'
-        },
-        'range': {
-            '_short': 'Ranges',
-            '_name': 'CIDR Block Ranges',
-            '_description': 'Network routing blocks an IP address belongs to.'
-        },
-        'state': {
-            '_short': 'State',
-            '_name': 'State',
-            '_description': 'The state registered with a whois network.'
-        },
-        'updated': {
-            '_short': 'Updated',
-            '_name': 'Updated Timestamp',
-            '_description': 'The date the network was updated in ISO 8601 '
-                            'format.'
-        }
-    },
-    'referral': {
-        '_short': 'Referral',
-        '_name': 'Referral Whois',
-        '_description': 'The referral whois data if referenced and enabled.',
-    }
-}
-
-HR_WHOIS_NIR = {
-    'nets': {
-        '_short': 'NIR Network',
-        '_name': 'National Internet Registry Network',
-        '_description': 'The assigned NIR (JPNIC, KRNIC) network for an IP '
-                        'address. May be a parent or child network.',
-        'address': {
-            '_short': 'Address',
-            '_name': 'Postal Address',
-            '_description': 'The network contact postal address.'
-        },
-        'cidr': {
-            '_short': 'CIDR Blocks',
-            '_name': 'Classless Inter-Domain Routing Blocks',
-            '_description': 'Network routing blocks an IP address belongs to.'
-        },
-        'country': {
-            '_short': 'Country Code',
-            '_name': 'Country Code',
-            '_description': 'Country code registered for the network in '
-                            'ISO 3166-1 format.'
-        },
-        'handle': {
-            '_short': 'Handle',
-            '_name': 'NIR Network Handle',
-            '_description': 'Unique identifier for a registered NIR network.'
-        },
-        'name': {
-            '_short': 'Name',
-            '_name': 'NIR Network Name',
-            '_description': 'The identifier assigned to the network '
-                            'registration for an IP address.'
-        },
-        'postal_code': {
-            '_short': 'Postal',
-            '_name': 'Postal Code',
-            '_description': 'The postal code registered with a NIR network.'
-        },
-        'range': {
-            '_short': 'Ranges',
-            '_name': 'CIDR Block Ranges',
-            '_description': 'Network routing blocks an IP address belongs to.'
-        },
-        'nameservers': {
-            '_short': 'NS',
-            '_name': 'Nameservers',
-            '_description': 'Nameservers associated with a NIR network.'
-        },
-        'created': {
-            '_short': 'Created',
-            '_name': 'Created Timestamp',
-            '_description': 'The date the network was created in ISO 8601 '
-                            'format.'
-        },
-        'updated': {
-            '_short': 'Updated',
-            '_name': 'Updated Timestamp',
-            '_description': 'The date the network was updated in ISO 8601 '
-                            'format.'
-        },
-        'contacts': {
-            '_short': 'Contacts',
-            '_name': 'NIR Contacts',
-            '_description': 'The contacts (admin, tech) registered with a NIR '
-                            'network.',
-            'organization': {
-                '_short': 'Org',
-                '_name': 'Organization',
-                '_description': 'The contact organization.'
-            },
-            'division': {
-                '_short': 'Div',
-                '_name': 'Division',
-                '_description': 'The contact division of the organization.'
-            },
-            'name': {
-                '_short': 'Name',
-                '_name': 'Name',
-                '_description': 'The contact name.'
-            },
-            'title': {
-                '_short': 'Title',
-                '_name': 'Title',
-                '_description': 'The contact position or job title.'
-            },
-            'phone': {
-                '_short': 'Phone',
-                '_name': 'Phone Number',
-                '_description': 'The contact phone number.'
-            },
-            'fax': {
-                '_short': 'Fax',
-                '_name': 'Fax Number',
-                '_description': 'The contact fax number.'
-            },
-            'email': {
-                '_short': 'Email',
-                '_name': 'Email Address',
-                '_description': 'The contact email address.'
-            },
-            'reply_email': {
-                '_short': 'Reply Email',
-                '_name': 'Reply Email Address',
-                '_description': 'The contact reply email address.'
-            },
-            'updated': {
-                '_short': 'Updated',
-                '_name': 'Updated Timestamp',
-                '_description': 'The date the contact was updated in ISO 8601 '
-                                'format.'
-            }
-        }
-    }
-}
diff --git a/lib/ipwhois/ipwhois.py b/lib/ipwhois/ipwhois.py
deleted file mode 100644
index 946c64b5..00000000
--- a/lib/ipwhois/ipwhois.py
+++ /dev/null
@@ -1,337 +0,0 @@
-# Copyright (c) 2013-2020 Philip Hane
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-from . import Net
-from .asn import IPASN
-from .nir import NIRWhois
-import logging
-
-log = logging.getLogger(__name__)
-
-
-class IPWhois:
-    """
-    The wrapper class for performing whois/RDAP lookups and parsing for
-    IPv4 and IPv6 addresses.
-
-    Args:
-        address (:obj:`str`/:obj:`int`/:obj:`IPv4Address`/:obj:`IPv6Address`):
-            An IPv4 or IPv6 address
-        timeout (:obj:`int`): The default timeout for socket connections in
-            seconds. Defaults to 5.
-        proxy_opener (:obj:`urllib.request.OpenerDirector`): The request for
-            proxy support. Defaults to None.
-    """
-
-    def __init__(self, address, timeout=5, proxy_opener=None):
-
-        self.net = Net(
-            address=address, timeout=timeout, proxy_opener=proxy_opener
-        )
-        self.ipasn = IPASN(self.net)
-
-        self.address = self.net.address
-        self.timeout = self.net.timeout
-        self.address_str = self.net.address_str
-        self.version = self.net.version
-        self.reversed = self.net.reversed
-        self.dns_zone = self.net.dns_zone
-
-    def __repr__(self):
-
-        return 'IPWhois({0}, {1}, {2})'.format(
-            self.address_str, str(self.timeout), repr(self.net.opener)
-        )
-
-    def lookup_whois(self, inc_raw=False, retry_count=3, get_referral=False,
-                     extra_blacklist=None, ignore_referral_errors=False,
-                     field_list=None, extra_org_map=None,
-                     inc_nir=True, nir_field_list=None, asn_methods=None,
-                     get_asn_description=True):
-        """
-        The function for retrieving and parsing whois information for an IP
-        address via port 43 (WHOIS).
-
-        Args:
-            inc_raw (:obj:`bool`): Whether to include the raw whois results in
-                the returned dictionary. Defaults to False.
-            retry_count (:obj:`int`): The number of times to retry in case
-                socket errors, timeouts, connection resets, etc. are
-                encountered. Defaults to 3.
-            get_referral (:obj:`bool`): Whether to retrieve referral whois
-                information, if available. Defaults to False.
-            extra_blacklist (:obj:`list`): Blacklisted whois servers in
-                addition to the global BLACKLIST. Defaults to None.
-            ignore_referral_errors (:obj:`bool`): Whether to ignore and
-                continue when an exception is encountered on referral whois
-                lookups. Defaults to False.
-            field_list (:obj:`list`): If provided, a list of fields to parse:
-                ['name', 'handle', 'description', 'country', 'state', 'city',
-                'address', 'postal_code', 'emails', 'created', 'updated']
-                If None, defaults to all.
-            extra_org_map (:obj:`dict`): Dictionary mapping org handles to
-                RIRs. This is for limited cases where ARIN REST (ASN fallback
-                HTTP lookup) does not show an RIR as the org handle e.g., DNIC
-                (which is now the built in ORG_MAP) e.g., {'DNIC': 'arin'}.
-                Valid RIR values are (note the case-sensitive - this is meant
-                to match the REST result):
-                'ARIN', 'RIPE', 'apnic', 'lacnic', 'afrinic'
-                Defaults to None.
-            inc_nir (:obj:`bool`): Whether to retrieve NIR (National Internet
-                Registry) information, if registry is JPNIC (Japan) or KRNIC
-                (Korea). If True, extra network requests will be required.
-                If False, the information returned for JP or KR IPs is
-                severely restricted. Defaults to True.
-            nir_field_list (:obj:`list`): If provided and inc_nir, a list of
-                fields to parse:
-                ['name', 'handle', 'country', 'address', 'postal_code',
-                'nameservers', 'created', 'updated', 'contacts']
-                If None, defaults to all.
-            asn_methods (:obj:`list`): ASN lookup types to attempt, in order.
-                If None, defaults to all ['dns', 'whois', 'http'].
-            get_asn_description (:obj:`bool`): Whether to run an additional
-                query when pulling ASN information via dns, in order to get
-                the ASN description. Defaults to True.
-
-        Returns:
-            dict: The IP whois lookup results
-
-            ::
-
-                {
-                    'query' (str) - The IP address
-                    'asn' (str) - The Autonomous System Number
-                    'asn_date' (str) - The ASN Allocation date
-                    'asn_registry' (str) - The assigned ASN registry
-                    'asn_cidr' (str) - The assigned ASN CIDR
-                    'asn_country_code' (str) - The assigned ASN country code
-                    'asn_description' (str) - The ASN description
-                    'nets' (list) - Dictionaries containing network
-                        information which consists of the fields listed in the
-                        ipwhois.whois.RIR_WHOIS dictionary.
-                    'raw' (str) - Raw whois results if the inc_raw parameter
-                        is True.
-                    'referral' (dict) - Referral whois information if
-                        get_referral is True and the server is not blacklisted.
-                        Consists of fields listed in the ipwhois.whois.RWHOIS
-                        dictionary.
-                    'raw_referral' (str) - Raw referral whois results if the
-                        inc_raw parameter is True.
-                    'nir' (dict) - ipwhois.nir.NIRWhois() results if inc_nir
-                        is True.
-                }
-        """
-
-        from .whois import Whois
-
-        # Create the return dictionary.
-        results = {'nir': None}
-
-        # Retrieve the ASN information.
-        log.debug('ASN lookup for {0}'.format(self.address_str))
-
-        asn_data = self.ipasn.lookup(
-            inc_raw=inc_raw, retry_count=retry_count,
-            extra_org_map=extra_org_map, asn_methods=asn_methods,
-            get_asn_description=get_asn_description
-        )
-
-        # Add the ASN information to the return dictionary.
-        results.update(asn_data)
-
-        # Retrieve the whois data and parse.
-        whois = Whois(self.net)
-        log.debug('WHOIS lookup for {0}'.format(self.address_str))
-        whois_data = whois.lookup(
-            inc_raw=inc_raw, retry_count=retry_count, response=None,
-            get_referral=get_referral, extra_blacklist=extra_blacklist,
-            ignore_referral_errors=ignore_referral_errors, asn_data=asn_data,
-            field_list=field_list
-        )
-
-        # Add the WHOIS information to the return dictionary.
-        results.update(whois_data)
-
-        if inc_nir:
-
-            nir = None
-            if 'JP' == asn_data['asn_country_code']:
-                nir = 'jpnic'
-            elif 'KR' == asn_data['asn_country_code']:
-                nir = 'krnic'
-
-            if nir:
-
-                nir_whois = NIRWhois(self.net)
-                nir_data = nir_whois.lookup(
-                    nir=nir, inc_raw=inc_raw, retry_count=retry_count,
-                    response=None,
-                    field_list=nir_field_list, is_offline=False
-                )
-
-                # Add the NIR information to the return dictionary.
-                results['nir'] = nir_data
-
-        return results
-
-    def lookup_rdap(self, inc_raw=False, retry_count=3, depth=0,
-                    excluded_entities=None, bootstrap=False,
-                    rate_limit_timeout=120, extra_org_map=None,
-                    inc_nir=True, nir_field_list=None, asn_methods=None,
-                    get_asn_description=True, root_ent_check=True):
-        """
-        The function for retrieving and parsing whois information for an IP
-        address via HTTP (RDAP).
-
-        **This is now the recommended method, as RDAP contains much better
-        information to parse.**
-
-        Args:
-            inc_raw (:obj:`bool`): Whether to include the raw whois results in
-                the returned dictionary. Defaults to False.
-            retry_count (:obj:`int`): The number of times to retry in case
-                socket errors, timeouts, connection resets, etc. are
-                encountered. Defaults to 3.
-            depth (:obj:`int`): How many levels deep to run queries when
-                additional referenced objects are found. Defaults to 0.
-            excluded_entities (:obj:`list`): Entity handles to not perform
-                lookups. Defaults to None.
-            bootstrap (:obj:`bool`): If True, performs lookups via ARIN
-                bootstrap rather than lookups based on ASN data. ASN lookups
-                are not performed and no output for any of the asn* fields is
-                provided. Defaults to False.
-            rate_limit_timeout (:obj:`int`): The number of seconds to wait
-                before retrying when a rate limit notice is returned via
-                rdap+json. Defaults to 120.
-            extra_org_map (:obj:`dict`): Dictionary mapping org handles to
-                RIRs. This is for limited cases where ARIN REST (ASN fallback
-                HTTP lookup) does not show an RIR as the org handle e.g., DNIC
-                (which is now the built in ORG_MAP) e.g., {'DNIC': 'arin'}.
-                Valid RIR values are (note the case-sensitive - this is meant
-                to match the REST result):
-                'ARIN', 'RIPE', 'apnic', 'lacnic', 'afrinic'
-                Defaults to None.
-            inc_nir (:obj:`bool`): Whether to retrieve NIR (National Internet
-                Registry) information, if registry is JPNIC (Japan) or KRNIC
-                (Korea). If True, extra network requests will be required.
-                If False, the information returned for JP or KR IPs is
-                severely restricted. Defaults to True.
-            nir_field_list (:obj:`list`): If provided and inc_nir, a list of
-                fields to parse:
-                ['name', 'handle', 'country', 'address', 'postal_code',
-                'nameservers', 'created', 'updated', 'contacts']
-                If None, defaults to all.
-            asn_methods (:obj:`list`): ASN lookup types to attempt, in order.
-                If None, defaults to all ['dns', 'whois', 'http'].
-            get_asn_description (:obj:`bool`): Whether to run an additional
-                query when pulling ASN information via dns, in order to get
-                the ASN description. Defaults to True.
-            root_ent_check (:obj:`bool`): If True, will perform
-                additional RDAP HTTP queries for missing entity data at the
-                root level. Defaults to True.
-
-        Returns:
-            dict: The IP RDAP lookup results
-
-            ::
-
-                {
-                    'query' (str) - The IP address
-                    'asn' (str) - The Autonomous System Number
-                    'asn_date' (str) - The ASN Allocation date
-                    'asn_registry' (str) - The assigned ASN registry
-                    'asn_cidr' (str) - The assigned ASN CIDR
-                    'asn_country_code' (str) - The assigned ASN country code
-                    'asn_description' (str) - The ASN description
-                    'entities' (list) - Entity handles referred by the top
-                        level query.
-                    'network' (dict) - Network information which consists of
-                        the fields listed in the ipwhois.rdap._RDAPNetwork
-                        dict.
-                    'objects' (dict) - Mapping of entity handle->entity dict
-                        which consists of the fields listed in the
-                        ipwhois.rdap._RDAPEntity dict. The raw result is
-                        included for each object if the inc_raw parameter
-                        is True.
-                    'raw' (dict) - Whois results in json format if the inc_raw
-                        parameter is True.
-                    'nir' (dict) - ipwhois.nir.NIRWhois results if inc_nir is
-                        True.
-                }
-        """
-
-        from .rdap import RDAP
-
-        # Create the return dictionary.
-        results = {'nir': None}
-
-        asn_data = None
-        response = None
-        if not bootstrap:
-
-            # Retrieve the ASN information.
-            log.debug('ASN lookup for {0}'.format(self.address_str))
-            asn_data = self.ipasn.lookup(
-                inc_raw=inc_raw, retry_count=retry_count,
-                extra_org_map=extra_org_map, asn_methods=asn_methods,
-                get_asn_description=get_asn_description
-            )
-
-            # Add the ASN information to the return dictionary.
-            results.update(asn_data)
-
-        # Retrieve the RDAP data and parse.
-        rdap = RDAP(self.net)
-        log.debug('RDAP lookup for {0}'.format(self.address_str))
-        rdap_data = rdap.lookup(
-            inc_raw=inc_raw, retry_count=retry_count, asn_data=asn_data,
-            depth=depth, excluded_entities=excluded_entities,
-            response=response, bootstrap=bootstrap,
-            rate_limit_timeout=rate_limit_timeout,
-            root_ent_check=root_ent_check
-        )
-
-        # Add the RDAP information to the return dictionary.
-        results.update(rdap_data)
-
-        if inc_nir:
-
-            nir = None
-            if 'JP' == asn_data['asn_country_code']:
-                nir = 'jpnic'
-            elif 'KR' == asn_data['asn_country_code']:
-                nir = 'krnic'
-
-            if nir:
-                nir_whois = NIRWhois(self.net)
-                nir_data = nir_whois.lookup(
-                    nir=nir, inc_raw=inc_raw, retry_count=retry_count,
-                    response=None,
-                    field_list=nir_field_list, is_offline=False
-                )
-
-                # Add the NIR information to the return dictionary.
-                results['nir'] = nir_data
-
-        return results
diff --git a/lib/ipwhois/net.py b/lib/ipwhois/net.py
deleted file mode 100644
index 301bbab4..00000000
--- a/lib/ipwhois/net.py
+++ /dev/null
@@ -1,912 +0,0 @@
-# Copyright (c) 2013-2020 Philip Hane
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-import sys
-import socket
-import dns.resolver
-import json
-from collections import namedtuple
-import logging
-from time import sleep
-
-# Import the dnspython rdtypes to fix the dynamic import problem when frozen.
-import dns.rdtypes.ANY.TXT  # @UnusedImport
-
-from .exceptions import (IPDefinedError, ASNLookupError, BlacklistError,
-                         WhoisLookupError, HTTPLookupError, HostLookupError,
-                         HTTPRateLimitError, WhoisRateLimitError)
-from .whois import RIR_WHOIS
-from .asn import ASN_ORIGIN_WHOIS
-from .utils import ipv4_is_defined, ipv6_is_defined
-
-if sys.version_info >= (3, 3):  # pragma: no cover
-    from ipaddress import (ip_address,
-                           IPv4Address,
-                           IPv6Address)
-else:  # pragma: no cover
-    from ipaddr import (IPAddress as ip_address,
-                        IPv4Address,
-                        IPv6Address)
-
-try:  # pragma: no cover
-    from urllib.request import (OpenerDirector,
-                                ProxyHandler,
-                                build_opener,
-                                Request,
-                                URLError,
-                                HTTPError)
-    from urllib.parse import urlencode
-except ImportError:  # pragma: no cover
-    from urllib2 import (OpenerDirector,
-                         ProxyHandler,
-                         build_opener,
-                         Request,
-                         URLError,
-                         HTTPError)
-    from urllib import urlencode
-
-log = logging.getLogger(__name__)
-
-# POSSIBLY UPDATE TO USE RDAP
-ARIN = 'http://whois.arin.net/rest/nets;q={0}?showDetails=true&showARIN=true'
-
-CYMRU_WHOIS = 'whois.cymru.com'
-
-IPV4_DNS_ZONE = '{0}.origin.asn.cymru.com'
-
-IPV6_DNS_ZONE = '{0}.origin6.asn.cymru.com'
-
-BLACKLIST = [
-    'root.rwhois.net'
-]
-
-ORG_MAP = {
-    'ARIN': 'arin',
-    'VR-ARIN': 'arin',
-    'RIPE': 'ripencc',
-    'APNIC': 'apnic',
-    'LACNIC': 'lacnic',
-    'AFRINIC': 'afrinic',
-    'DNIC': 'arin'
-}
-
-
-class Net:
-    """
-    The class for performing network queries.
-
-    Args:
-        address (:obj:`str`/:obj:`int`/:obj:`IPv4Address`/:obj:`IPv6Address`):
-            An IPv4 or IPv6 address
-        timeout (:obj:`int`): The default timeout for socket connections in
-            seconds. Defaults to 5.
-        proxy_opener (:obj:`urllib.request.OpenerDirector`): The request for
-            proxy support. Defaults to None.
-
-    Raises:
-        IPDefinedError: The address provided is defined (does not need to be
-            resolved).
-    """
-
-    def __init__(self, address, timeout=5, proxy_opener=None):
-
-        # IPv4Address or IPv6Address
-        if isinstance(address, IPv4Address) or isinstance(
-                address, IPv6Address):
-
-            self.address = address
-
-        else:
-
-            # Use ipaddress package exception handling.
-            self.address = ip_address(address)
-
-        # Default timeout for socket connections.
-        self.timeout = timeout
-
-        self.dns_resolver = dns.resolver.Resolver()
-        if hasattr(self.dns_resolver, "resolve"):
-            self.dns_resolve = getattr(self.dns_resolver, "resolve")
-        else:
-            self.dns_resolve = getattr(self.dns_resolver, "query")
-        
-        self.dns_resolver.timeout = timeout
-        self.dns_resolver.lifetime = timeout
-
-        # Proxy opener.
-        if isinstance(proxy_opener, OpenerDirector):
-
-            self.opener = proxy_opener
-
-        else:
-
-            handler = ProxyHandler()
-            self.opener = build_opener(handler)
-
-        # IP address in string format for use in queries.
-        self.address_str = self.address.__str__()
-
-        # Determine the IP version, 4 or 6
-        self.version = self.address.version
-
-        if self.version == 4:
-
-            # Check if no ASN/whois resolution needs to occur.
-            is_defined = ipv4_is_defined(self.address_str)
-
-            if is_defined[0]:
-
-                raise IPDefinedError(
-                    'IPv4 address {0} is already defined as {1} via '
-                    '{2}.'.format(
-                        self.address_str, is_defined[1], is_defined[2]
-                    )
-                )
-
-            # Reverse the IPv4Address for the DNS ASN query.
-            split = self.address_str.split('.')
-            split.reverse()
-            self.reversed = '.'.join(split)
-
-            self.dns_zone = IPV4_DNS_ZONE.format(self.reversed)
-
-        else:
-
-            # Check if no ASN/whois resolution needs to occur.
-            is_defined = ipv6_is_defined(self.address_str)
-
-            if is_defined[0]:
-
-                raise IPDefinedError(
-                    'IPv6 address {0} is already defined as {1} via '
-                    '{2}.'.format(
-                        self.address_str, is_defined[1], is_defined[2]
-                    )
-                )
-
-            # Explode the IPv6Address to fill in any missing 0's.
-            exploded = self.address.exploded
-
-            # Cymru seems to timeout when the IPv6 address has trailing '0000'
-            # groups. Remove these groups.
-            groups = exploded.split(':')
-            for index, value in reversed(list(enumerate(groups))):
-
-                if value == '0000':
-
-                    del groups[index]
-
-                else:
-
-                    break
-
-            exploded = ':'.join(groups)
-
-            # Reverse the IPv6Address for the DNS ASN query.
-            val = str(exploded).replace(':', '')
-            val = val[::-1]
-            self.reversed = '.'.join(val)
-
-            self.dns_zone = IPV6_DNS_ZONE.format(self.reversed)
-
-    def get_asn_dns(self):
-        """
-        The function for retrieving ASN information for an IP address from
-        Cymru via port 53 (DNS).
-
-        Returns:
-            list: The raw ASN data.
-
-        Raises:
-            ASNLookupError: The ASN lookup failed.
-        """
-
-        try:
-
-            log.debug('ASN query for {0}'.format(self.dns_zone))
-            data = self.dns_resolve(self.dns_zone, 'TXT')
-            return list(data)
-
-        except (dns.resolver.NXDOMAIN, dns.resolver.NoNameservers,
-                dns.resolver.NoAnswer, dns.exception.Timeout) as e:
-
-            raise ASNLookupError(
-                'ASN lookup failed (DNS {0}) for {1}.'.format(
-                    e.__class__.__name__, self.address_str)
-            )
-
-        except:  # pragma: no cover
-
-            raise ASNLookupError(
-                'ASN lookup failed for {0}.'.format(self.address_str)
-            )
-
-    def get_asn_verbose_dns(self, asn=None):
-        """
-        The function for retrieving the information for an ASN from
-        Cymru via port 53 (DNS). This is needed since IP to ASN mapping via
-        Cymru DNS does not return the ASN Description like Cymru Whois does.
-
-        Args:
-            asn (:obj:`str`): The AS number (required).
-
-        Returns:
-            str: The raw ASN data.
-
-        Raises:
-            ASNLookupError: The ASN lookup failed.
-        """
-
-        if asn[0:2] != 'AS':
-
-            asn = 'AS{0}'.format(asn)
-
-        zone = '{0}.asn.cymru.com'.format(asn)
-
-        try:
-
-            log.debug('ASN verbose query for {0}'.format(zone))
-            data = self.dns_resolve(zone, 'TXT')
-            return str(data[0])
-
-        except (dns.resolver.NXDOMAIN, dns.resolver.NoNameservers,
-                dns.resolver.NoAnswer, dns.exception.Timeout) as e:
-
-            raise ASNLookupError(
-                'ASN lookup failed (DNS {0}) for {1}.'.format(
-                    e.__class__.__name__, asn)
-            )
-
-        except:  # pragma: no cover
-
-            raise ASNLookupError(
-                'ASN lookup failed for {0}.'.format(asn)
-            )
-
-    def get_asn_whois(self, retry_count=3):
-        """
-        The function for retrieving ASN information for an IP address from
-        Cymru via port 43/tcp (WHOIS).
-
-        Args:
-            retry_count (:obj:`int`): The number of times to retry in case
-                socket errors, timeouts, connection resets, etc. are
-                encountered. Defaults to 3.
-
-        Returns:
-            str: The raw ASN data.
-
-        Raises:
-            ASNLookupError: The ASN lookup failed.
-        """
-
-        try:
-
-            # Create the connection for the Cymru whois query.
-            conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            conn.settimeout(self.timeout)
-            log.debug('ASN query for {0}'.format(self.address_str))
-            conn.connect((CYMRU_WHOIS, 43))
-
-            # Query the Cymru whois server, and store the results.
-            conn.send((
-                ' -r -a -c -p -f {0}{1}'.format(
-                    self.address_str, '\r\n')
-            ).encode())
-
-            data = ''
-            while True:
-
-                d = conn.recv(4096).decode()
-                data += d
-
-                if not d:
-
-                    break
-
-            conn.close()
-
-            return str(data)
-
-        except (socket.timeout, socket.error) as e:  # pragma: no cover
-
-            log.debug('ASN query socket error: {0}'.format(e))
-            if retry_count > 0:
-
-                log.debug('ASN query retrying (count: {0})'.format(
-                    str(retry_count)))
-                return self.get_asn_whois(retry_count - 1)
-
-            else:
-
-                raise ASNLookupError(
-                    'ASN lookup failed for {0}.'.format(self.address_str)
-                )
-
-        except:  # pragma: no cover
-
-            raise ASNLookupError(
-                'ASN lookup failed for {0}.'.format(self.address_str)
-            )
-
-    def get_asn_http(self, retry_count=3):
-        """
-        The function for retrieving ASN information for an IP address from
-        Arin via port 80 (HTTP). Currently limited to fetching asn_registry
-        through a Arin whois (REST) lookup. The other values are returned as
-        None to keep a consistent dict output. This should be used as a last
-        chance fallback call behind ASN DNS & ASN Whois lookups.
-
-        Args:
-            retry_count (:obj:`int`): The number of times to retry in case
-                socket errors, timeouts, connection resets, etc. are
-                encountered. Defaults to 3.
-
-        Returns:
-            dict: The ASN data in json format.
-
-        Raises:
-            ASNLookupError: The ASN lookup failed.
-        """
-
-        try:
-
-            # Lets attempt to get the ASN registry information from
-            # ARIN.
-            log.debug('ASN query for {0}'.format(self.address_str))
-            response = self.get_http_json(
-                url=str(ARIN).format(self.address_str),
-                retry_count=retry_count,
-                headers={'Accept': 'application/json'}
-                )
-
-            return response
-
-        except (socket.timeout, socket.error) as e:  # pragma: no cover
-
-            log.debug('ASN query socket error: {0}'.format(e))
-            if retry_count > 0:
-
-                log.debug('ASN query retrying (count: {0})'.format(
-                    str(retry_count)))
-                return self.get_asn_http(retry_count=retry_count-1)
-
-            else:
-
-                raise ASNLookupError(
-                    'ASN lookup failed for {0}.'.format(self.address_str)
-                )
-
-        except:
-
-            raise ASNLookupError(
-                'ASN lookup failed for {0}.'.format(self.address_str)
-            )
-
-    def get_asn_origin_whois(self, asn_registry='radb', asn=None,
-                             retry_count=3, server=None, port=43):
-        """
-        The function for retrieving CIDR info for an ASN via whois.
-
-        Args:
-            asn_registry (:obj:`str`): The source to run the query against
-                (asn.ASN_ORIGIN_WHOIS).
-            asn (:obj:`str`): The AS number (required).
-            retry_count (:obj:`int`): The number of times to retry in case
-                socket errors, timeouts, connection resets, etc. are
-                encountered. Defaults to 3.
-            server (:obj:`str`): An optional server to connect to.
-            port (:obj:`int`): The network port to connect on. Defaults to 43.
-
-        Returns:
-            str: The raw ASN origin whois data.
-
-        Raises:
-            WhoisLookupError: The ASN origin whois lookup failed.
-            WhoisRateLimitError: The ASN origin Whois request rate limited and
-                retries were exhausted.
-        """
-
-        try:
-
-            if server is None:
-                server = ASN_ORIGIN_WHOIS[asn_registry]['server']
-
-            # Create the connection for the whois query.
-            conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            conn.settimeout(self.timeout)
-            log.debug('ASN origin WHOIS query for {0} at {1}:{2}'.format(
-                asn, server, port))
-            conn.connect((server, port))
-
-            # Prep the query.
-            query = ' -i origin {0}{1}'.format(asn, '\r\n')
-
-            # Query the whois server, and store the results.
-            conn.send(query.encode())
-
-            response = ''
-            while True:
-
-                d = conn.recv(4096).decode()
-
-                response += d
-
-                if not d:
-
-                    break
-
-            conn.close()
-
-            # TODO: this was taken from get_whois(). Need to test rate limiting
-            if 'Query rate limit exceeded' in response:  # pragma: no cover
-
-                if retry_count > 0:
-
-                    log.debug('ASN origin WHOIS query rate limit exceeded. '
-                              'Waiting...')
-                    sleep(1)
-                    return self.get_asn_origin_whois(
-                        asn_registry=asn_registry, asn=asn,
-                        retry_count=retry_count-1,
-                        server=server, port=port
-                    )
-
-                else:
-
-                    raise WhoisRateLimitError(
-                        'ASN origin Whois lookup failed for {0}. Rate limit '
-                        'exceeded, wait and try again (possibly a '
-                        'temporary block).'.format(asn))
-
-            elif ('error 501' in response or 'error 230' in response
-                  ):  # pragma: no cover
-
-                log.debug('ASN origin WHOIS query error: {0}'.format(response))
-                raise ValueError
-
-            return str(response)
-
-        except (socket.timeout, socket.error) as e:
-
-            log.debug('ASN origin WHOIS query socket error: {0}'.format(e))
-            if retry_count > 0:
-
-                log.debug('ASN origin WHOIS query retrying (count: {0})'
-                          ''.format(str(retry_count)))
-                return self.get_asn_origin_whois(
-                    asn_registry=asn_registry, asn=asn,
-                    retry_count=retry_count-1, server=server, port=port
-                )
-
-            else:
-
-                raise WhoisLookupError(
-                    'ASN origin WHOIS lookup failed for {0}.'.format(asn)
-                )
-
-        except WhoisRateLimitError:  # pragma: no cover
-
-            raise
-
-        except:  # pragma: no cover
-
-            raise WhoisLookupError(
-                'ASN origin WHOIS lookup failed for {0}.'.format(asn)
-            )
-
-    def get_whois(self, asn_registry='arin', retry_count=3, server=None,
-                  port=43, extra_blacklist=None):
-        """
-        The function for retrieving whois or rwhois information for an IP
-        address via any port. Defaults to port 43/tcp (WHOIS).
-
-        Args:
-            asn_registry (:obj:`str`): The NIC to run the query against.
-                Defaults to 'arin'.
-            retry_count (:obj:`int`): The number of times to retry in case
-                socket errors, timeouts, connection resets, etc. are
-                encountered. Defaults to 3.
-            server (:obj:`str`): An optional server to connect to. If
-                provided, asn_registry will be ignored.
-            port (:obj:`int`): The network port to connect on. Defaults to 43.
-            extra_blacklist (:obj:`list` of :obj:`str`): Blacklisted whois
-                servers in addition to the global BLACKLIST. Defaults to None.
-
-        Returns:
-            str: The raw whois data.
-
-        Raises:
-            BlacklistError: Raised if the whois server provided is in the
-                global BLACKLIST or extra_blacklist.
-            WhoisLookupError: The whois lookup failed.
-            WhoisRateLimitError: The Whois request rate limited and retries
-                were exhausted.
-        """
-
-        try:
-
-            extra_bl = extra_blacklist if extra_blacklist else []
-
-            if any(server in srv for srv in (BLACKLIST, extra_bl)):
-                raise BlacklistError(
-                    'The server {0} is blacklisted.'.format(server)
-                )
-
-            if server is None:
-                server = RIR_WHOIS[asn_registry]['server']
-
-            # Create the connection for the whois query.
-            conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            conn.settimeout(self.timeout)
-            log.debug('WHOIS query for {0} at {1}:{2}'.format(
-                self.address_str, server, port))
-            conn.connect((server, port))
-
-            # Prep the query.
-            query = self.address_str + '\r\n'
-            if asn_registry == 'arin':
-
-                query = 'n + {0}'.format(query)
-
-            # Query the whois server, and store the results.
-            conn.send(query.encode())
-
-            response = ''
-            while True:
-
-                d = conn.recv(4096).decode('ascii', 'ignore')
-
-                response += d
-
-                if not d:
-
-                    break
-
-            conn.close()
-
-            if 'Query rate limit exceeded' in response:  # pragma: no cover
-
-                if retry_count > 0:
-
-                    log.debug('WHOIS query rate limit exceeded. Waiting...')
-                    sleep(1)
-                    return self.get_whois(
-                        asn_registry=asn_registry, retry_count=retry_count-1,
-                        server=server, port=port,
-                        extra_blacklist=extra_blacklist
-                    )
-
-                else:
-
-                    raise WhoisRateLimitError(
-                        'Whois lookup failed for {0}. Rate limit '
-                        'exceeded, wait and try again (possibly a '
-                        'temporary block).'.format(self.address_str))
-
-            elif ('error 501' in response or 'error 230' in response
-                  ):  # pragma: no cover
-
-                log.debug('WHOIS query error: {0}'.format(response))
-                raise ValueError
-
-            return str(response)
-
-        except (socket.timeout, socket.error) as e:
-
-            log.debug('WHOIS query socket error: {0}'.format(e))
-            if retry_count > 0:
-
-                log.debug('WHOIS query retrying (count: {0})'.format(
-                    str(retry_count)))
-                return self.get_whois(
-                    asn_registry=asn_registry, retry_count=retry_count-1,
-                    server=server, port=port, extra_blacklist=extra_blacklist
-                )
-
-            else:
-
-                raise WhoisLookupError(
-                    'WHOIS lookup failed for {0}.'.format(self.address_str)
-                )
-
-        except WhoisRateLimitError:  # pragma: no cover
-
-            raise
-
-        except BlacklistError:
-
-            raise
-
-        except:  # pragma: no cover
-
-            raise WhoisLookupError(
-                'WHOIS lookup failed for {0}.'.format(self.address_str)
-            )
-
-    def get_http_json(self, url=None, retry_count=3, rate_limit_timeout=120,
-                      headers=None):
-        """
-        The function for retrieving a json result via HTTP.
-
-        Args:
-            url (:obj:`str`): The URL to retrieve (required).
-            retry_count (:obj:`int`): The number of times to retry in case
-                socket errors, timeouts, connection resets, etc. are
-                encountered. Defaults to 3.
-            rate_limit_timeout (:obj:`int`): The number of seconds to wait
-                before retrying when a rate limit notice is returned via
-                rdap+json or HTTP error 429. Defaults to 60.
-            headers (:obj:`dict`): The HTTP headers. The Accept header
-                defaults to 'application/rdap+json'.
-
-        Returns:
-            dict: The data in json format.
-
-        Raises:
-            HTTPLookupError: The HTTP lookup failed.
-            HTTPRateLimitError: The HTTP request rate limited and retries
-                were exhausted.
-        """
-
-        if headers is None:
-            headers = {'Accept': 'application/rdap+json'}
-
-        try:
-
-            # Create the connection for the whois query.
-            log.debug('HTTP query for {0} at {1}'.format(
-                self.address_str, url))
-            conn = Request(url, headers=headers)
-            data = self.opener.open(conn, timeout=self.timeout)
-            try:
-                d = json.loads(data.readall().decode('utf-8', 'ignore'))
-            except AttributeError:  # pragma: no cover
-                d = json.loads(data.read().decode('utf-8', 'ignore'))
-
-            try:
-                # Tests written but commented out. I do not want to send a
-                # flood of requests on every test.
-                for tmp in d['notices']:  # pragma: no cover
-                    if tmp['title'] == 'Rate Limit Notice':
-                        log.debug('RDAP query rate limit exceeded.')
-
-                        if retry_count > 0:
-                            log.debug('Waiting {0} seconds...'.format(
-                                str(rate_limit_timeout)))
-
-                            sleep(rate_limit_timeout)
-                            return self.get_http_json(
-                                url=url, retry_count=retry_count-1,
-                                rate_limit_timeout=rate_limit_timeout,
-                                headers=headers
-                            )
-                        else:
-                            raise HTTPRateLimitError(
-                                'HTTP lookup failed for {0}. Rate limit '
-                                'exceeded, wait and try again (possibly a '
-                                'temporary block).'.format(url))
-
-            except (KeyError, IndexError):  # pragma: no cover
-
-                pass
-
-            return d
-
-        except HTTPError as e:  # pragma: no cover
-
-            # RIPE is producing this HTTP error rather than a JSON error.
-            if e.code == 429:
-
-                log.debug('HTTP query rate limit exceeded.')
-
-                if retry_count > 0:
-                    log.debug('Waiting {0} seconds...'.format(
-                        str(rate_limit_timeout)))
-
-                    sleep(rate_limit_timeout)
-                    return self.get_http_json(
-                        url=url, retry_count=retry_count - 1,
-                        rate_limit_timeout=rate_limit_timeout,
-                        headers=headers
-                    )
-                else:
-                    raise HTTPRateLimitError(
-                        'HTTP lookup failed for {0}. Rate limit '
-                        'exceeded, wait and try again (possibly a '
-                        'temporary block).'.format(url))
-
-            else:
-
-                raise HTTPLookupError('HTTP lookup failed for {0} with error '
-                                      'code {1}.'.format(url, str(e.code)))
-
-        except (URLError, socket.timeout, socket.error) as e:
-
-            log.debug('HTTP query socket error: {0}'.format(e))
-            if retry_count > 0:
-
-                log.debug('HTTP query retrying (count: {0})'.format(
-                    str(retry_count)))
-
-                return self.get_http_json(
-                    url=url, retry_count=retry_count-1,
-                    rate_limit_timeout=rate_limit_timeout, headers=headers
-                )
-
-            else:
-
-                raise HTTPLookupError('HTTP lookup failed for {0}.'.format(
-                    url))
-
-        except (HTTPLookupError, HTTPRateLimitError) as e:  # pragma: no cover
-
-            raise e
-
-        except:  # pragma: no cover
-
-            raise HTTPLookupError('HTTP lookup failed for {0}.'.format(url))
-
-    def get_host(self, retry_count=3):
-        """
-        The function for retrieving host information for an IP address.
-
-        Args:
-            retry_count (:obj:`int`): The number of times to retry in case
-                socket errors, timeouts, connection resets, etc. are
-                encountered. Defaults to 3.
-
-        Returns:
-            namedtuple:
-
-            :hostname (str): The hostname returned mapped to the given IP
-                address.
-            :aliaslist (list): Alternate names for the given IP address.
-            :ipaddrlist (list): IPv4/v6 addresses mapped to the same hostname.
-
-        Raises:
-            HostLookupError: The host lookup failed.
-        """
-
-        try:
-
-            default_timeout_set = False
-            if not socket.getdefaulttimeout():
-
-                socket.setdefaulttimeout(self.timeout)
-                default_timeout_set = True
-
-            log.debug('Host query for {0}'.format(self.address_str))
-            ret = socket.gethostbyaddr(self.address_str)
-
-            if default_timeout_set:  # pragma: no cover
-
-                socket.setdefaulttimeout(None)
-
-            results = namedtuple('get_host_results', 'hostname, aliaslist, '
-                                                     'ipaddrlist')
-            return results(*ret)
-
-        except (socket.timeout, socket.error) as e:
-
-            log.debug('Host query socket error: {0}'.format(e))
-            if retry_count > 0:
-
-                log.debug('Host query retrying (count: {0})'.format(
-                    str(retry_count)))
-
-                return self.get_host(retry_count - 1)
-
-            else:
-
-                raise HostLookupError(
-                    'Host lookup failed for {0}.'.format(self.address_str)
-                )
-
-        except:  # pragma: no cover
-
-            raise HostLookupError(
-                'Host lookup failed for {0}.'.format(self.address_str)
-            )
-
-    def get_http_raw(self, url=None, retry_count=3, headers=None,
-                     request_type='GET', form_data=None):
-        """
-        The function for retrieving a raw HTML result via HTTP.
-
-        Args:
-            url (:obj:`str`): The URL to retrieve (required).
-            retry_count (:obj:`int`): The number of times to retry in case
-                socket errors, timeouts, connection resets, etc. are
-                encountered. Defaults to 3.
-            headers (:obj:`dict`): The HTTP headers. The Accept header
-                defaults to 'text/html'.
-            request_type (:obj:`str`): Request type 'GET' or 'POST'. Defaults
-                to 'GET'.
-            form_data (:obj:`dict`): Optional form POST data.
-
-        Returns:
-            str: The raw data.
-
-        Raises:
-            HTTPLookupError: The HTTP lookup failed.
-        """
-
-        if headers is None:
-            headers = {'Accept': 'text/html'}
-
-        enc_form_data = None
-        if form_data:
-            enc_form_data = urlencode(form_data)
-            try:
-                # Py 2 inspection will alert on the encoding arg, no harm done.
-                enc_form_data = bytes(enc_form_data, encoding='ascii')
-            except TypeError:  # pragma: no cover
-                pass
-
-        try:
-
-            # Create the connection for the HTTP query.
-            log.debug('HTTP query for {0} at {1}'.format(
-                self.address_str, url))
-            try:
-                # Py 2 inspection alert bypassed by using kwargs dict.
-                conn = Request(url=url, data=enc_form_data, headers=headers,
-                               **{'method': request_type})
-            except TypeError:  # pragma: no cover
-                conn = Request(url=url, data=enc_form_data, headers=headers)
-            data = self.opener.open(conn, timeout=self.timeout)
-
-            try:
-                d = data.readall().decode('ascii', 'ignore')
-            except AttributeError:  # pragma: no cover
-                d = data.read().decode('ascii', 'ignore')
-
-            return str(d)
-
-        except (URLError, socket.timeout, socket.error) as e:
-
-            log.debug('HTTP query socket error: {0}'.format(e))
-            if retry_count > 0:
-
-                log.debug('HTTP query retrying (count: {0})'.format(
-                    str(retry_count)))
-
-                return self.get_http_raw(
-                    url=url, retry_count=retry_count - 1, headers=headers,
-                    request_type=request_type, form_data=form_data
-                )
-
-            else:
-
-                raise HTTPLookupError('HTTP lookup failed for {0}.'.format(
-                    url))
-
-        except HTTPLookupError as e:  # pragma: no cover
-
-            raise e
-
-        except Exception:  # pragma: no cover
-
-            raise HTTPLookupError('HTTP lookup failed for {0}.'.format(url))
diff --git a/lib/ipwhois/nir.py b/lib/ipwhois/nir.py
deleted file mode 100644
index b3c79efb..00000000
--- a/lib/ipwhois/nir.py
+++ /dev/null
@@ -1,655 +0,0 @@
-# Copyright (c) 2013-2020 Philip Hane
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-from . import NetError
-from .utils import unique_everseen
-import logging
-import sys
-import re
-import copy
-from datetime import (datetime, timedelta)
-
-if sys.version_info >= (3, 3):  # pragma: no cover
-    from ipaddress import (ip_address,
-                           ip_network,
-                           summarize_address_range,
-                           collapse_addresses)
-else:  # pragma: no cover
-    from ipaddr import (IPAddress as ip_address,
-                        IPNetwork as ip_network,
-                        summarize_address_range,
-                        collapse_address_list as collapse_addresses)
-
-log = logging.getLogger(__name__)
-
-# Base NIR whois output dictionary.
-BASE_NET = {
-    'cidr': None,
-    'name': None,
-    'handle': None,
-    'range': None,
-    'country': None,
-    'address': None,
-    'postal_code': None,
-    'nameservers': None,
-    'created': None,
-    'updated': None,
-    'contacts': None
-}
-
-# Base NIR whois contact output dictionary.
-BASE_CONTACT = {
-    'name': None,
-    'email': None,
-    'reply_email': None,
-    'organization': None,
-    'division': None,
-    'title': None,
-    'phone': None,
-    'fax': None,
-    'updated': None
-}
-
-# National Internet Registry
-NIR_WHOIS = {
-    'jpnic': {
-        'country_code': 'JP',
-        'url': ('http://whois.nic.ad.jp/cgi-bin/whois_gw?lang=%2Fe&key={0}'
-                '&submit=query'),
-        'request_type': 'GET',
-        'request_headers': {'Accept': 'text/html'},
-        'form_data_ip_field': None,
-        'fields': {
-            'name': r'(\[Organization\])[^\S\n]+(?P<val>.*?)\n',
-            'handle': r'(\[Network Name\])[^\S\n]+(?P<val>.*?)\n',
-            'created': r'(\[Assigned Date\])[^\S\n]+(?P<val>.*?)\n',
-            'updated': r'(\[Last Update\])[^\S\n]+(?P<val>.*?)\n',
-            'nameservers': r'(\[Nameserver\])[^\S\n]+(?P<val>.*?)\n',
-            'contact_admin': r'(\[Administrative Contact\])[^\S\n]+.+?\>'
-                             '(?P<val>.+?)\\<\\/A\\>\n',
-            'contact_tech': r'(\[Technical Contact\])[^\S\n]+.+?\>'
-                             '(?P<val>.+?)\\<\\/A\\>\n'
-        },
-        'contact_fields': {
-            'name': r'(\[Last, First\])[^\S\n]+(?P<val>.*?)\n',
-            'email': r'(\[E-Mail\])[^\S\n]+(?P<val>.*?)\n',
-            'reply_email': r'(\[Reply Mail\])[^\S\n]+(?P<val>.*?)\n',
-            'organization': r'(\[Organization\])[^\S\n]+(?P<val>.*?)\n',
-            'division': r'(\[Division\])[^\S\n]+(?P<val>.*?)\n',
-            'title': r'(\[Title\])[^\S\n]+(?P<val>.*?)\n',
-            'phone': r'(\[TEL\])[^\S\n]+(?P<val>.*?)\n',
-            'fax': r'(\[FAX\])[^\S\n]+(?P<val>.*?)\n',
-            'updated': r'(\[Last Update\])[^\S\n]+(?P<val>.*?)\n'
-        },
-        'dt_format': '%Y/%m/%d %H:%M:%S(JST)',
-        'dt_hourdelta': 9,
-        'multi_net': False
-    },
-    'krnic': {
-        'country_code': 'KR',
-        'url': 'https://xn--c79as89aj0e29b77z.xn--3e0b707e/eng/whois.jsc',
-        'request_type': 'POST',
-        'request_headers': {
-            'Accept': 'text/html',
-            'Referer': (
-                'https://xn--c79as89aj0e29b77z.xn--3e0b707e/eng/whois.jsp'
-            ),
-        },
-        'form_data_ip_field': 'query',
-        'fields': {
-            'name': r'(Organization Name)[\s]+\:[^\S\n]+(?P<val>.+?)\n',
-            'handle': r'(Service Name|Network Type)[\s]+\:[^\S\n]+(?P<val>.+?)'
-                      '\n',
-            'address': r'(Address)[\s]+\:[^\S\n]+(?P<val>.+?)\n',
-            'postal_code': r'(Zip Code)[\s]+\:[^\S\n]+(?P<val>.+?)\n',
-            'created': r'(Registration Date)[\s]+\:[^\S\n]+(?P<val>.+?)\n',
-            'contact_admin': r'(id="eng_isp_contact").+?\>(?P<val>.*?)\<'
-                              '\\/div\\>\n',
-            'contact_tech': r'(id="eng_user_contact").+?\>(?P<val>.*?)\<'
-                             '\\/div\\>\n'
-        },
-        'contact_fields': {
-            'name': r'(Name)[^\S\n]+?:[^\S\n]+?(?P<val>.*?)\n',
-            'email': r'(E-Mail)[^\S\n]+?:[^\S\n]+?(?P<val>.*?)\n',
-            'phone': r'(Phone)[^\S\n]+?:[^\S\n]+?(?P<val>.*?)\n'
-        },
-        'dt_format': '%Y%m%d',
-        'dt_hourdelta': 0,
-        'multi_net': True
-    }
-}
-
-
-class NIRWhois:
-    """
-    The class for parsing whois data for NIRs (National Internet Registry).
-    JPNIC and KRNIC are currently the only NIRs supported. Output varies
-    based on NIR specific whois formatting.
-
-    Args:
-        net (:obj:`ipwhois.net.Net`): The network object.
-
-    Raises:
-        NetError: The parameter provided is not an instance of
-            ipwhois.net.Net
-        IPDefinedError: The address provided is defined (does not need to be
-            resolved).
-    """
-
-    def __init__(self, net):
-
-        from .net import Net
-
-        # ipwhois.net.Net validation
-        if isinstance(net, Net):
-
-            self._net = net
-
-        else:
-
-            raise NetError('The provided net parameter is not an instance of '
-                           'ipwhois.net.Net')
-
-    def parse_fields(self, response, fields_dict, net_start=None,
-                     net_end=None, dt_format=None, field_list=None,
-                     hourdelta=0, is_contact=False):
-        """
-        The function for parsing whois fields from a data input.
-
-        Args:
-            response (:obj:`str`): The response from the whois/rwhois server.
-            fields_dict (:obj:`dict`): The mapping of fields to regex search
-                values (required).
-            net_start (:obj:`int`): The starting point of the network (if
-                parsing multiple networks). Defaults to None.
-            net_end (:obj:`int`): The ending point of the network (if parsing
-                multiple networks). Defaults to None.
-            dt_format (:obj:`str`): The format of datetime fields if known.
-                Defaults to None.
-            field_list (:obj:`list` of :obj:`str`): If provided, fields to
-                parse. Defaults to :obj:`ipwhois.nir.BASE_NET` if is_contact
-                is False. Otherwise, defaults to
-                :obj:`ipwhois.nir.BASE_CONTACT`.
-            hourdelta (:obj:`int`): The timezone delta for created/updated
-                fields. Defaults to 0.
-            is_contact (:obj:`bool`): If True, uses contact information
-                field parsing. Defaults to False.
-
-        Returns:
-            dict: A dictionary of fields provided in fields_dict, mapping to
-                the results of the regex searches.
-        """
-
-        response = '{0}\n'.format(response)
-        if is_contact:
-
-            ret = {}
-
-            if not field_list:
-
-                field_list = list(BASE_CONTACT.keys())
-
-        else:
-
-            ret = {
-                'contacts': {'admin': None, 'tech': None},
-                'contact_admin': {},
-                'contact_tech': {}
-            }
-
-            if not field_list:
-
-                field_list = list(BASE_NET.keys())
-                field_list.remove('contacts')
-                field_list.append('contact_admin')
-                field_list.append('contact_tech')
-
-        generate = ((field, pattern) for (field, pattern) in
-                    fields_dict.items() if field in field_list)
-
-        for field, pattern in generate:
-
-            pattern = re.compile(
-                str(pattern),
-                re.DOTALL
-            )
-
-            if net_start is not None:
-
-                match = pattern.finditer(response, net_end, net_start)
-
-            elif net_end is not None:
-
-                match = pattern.finditer(response, net_end)
-
-            else:
-
-                match = pattern.finditer(response)
-
-            values = []
-            for m in match:
-
-                try:
-
-                    values.append(m.group('val').strip())
-
-                except IndexError:
-
-                    pass
-
-            if len(values) > 0:
-
-                value = None
-                try:
-
-                    if field in ['created', 'updated'] and dt_format:
-
-                        try:
-                            value = (
-                                datetime.strptime(
-                                    values[0],
-                                    str(dt_format)
-                                ) - timedelta(hours=hourdelta)
-                            ).isoformat('T')
-                        except ValueError:
-                            value = (
-                                datetime.strptime(
-                                    values[0],
-                                    '%Y/%m/%d'
-                                )
-                            ).isoformat('T')
-
-                    elif field in ['nameservers']:
-
-                        value = list(unique_everseen(values))
-
-                    else:
-
-                        values = unique_everseen(values)
-                        value = '\n'.join(values)
-
-                except ValueError as e:
-
-                    log.debug('NIR whois field parsing failed for {0}: {1}'
-                              ''.format(field, e))
-                    pass
-
-                ret[field] = value
-
-        return ret
-
-    def get_nets_jpnic(self, response):
-        """
-        The function for parsing network blocks from jpnic whois data.
-
-        Args:
-            response (:obj:`str`): The response from the jpnic server.
-
-        Returns:
-            list of dict: Mapping of networks with start and end positions.
-
-            ::
-
-                [{
-                    'cidr' (str) - The network routing block
-                    'start' (int) - The starting point of the network
-                    'end' (int) - The endpoint point of the network
-                }]
-        """
-
-        nets = []
-
-        # Iterate through all of the networks found, storing the CIDR value
-        # and the start and end positions.
-        for match in re.finditer(
-                r'^.*?(\[Network Number\])[^\S\n]+.+?>(?P<val>.+?)</A>$',
-                response,
-                re.MULTILINE
-        ):
-
-            try:
-
-                net = copy.deepcopy(BASE_NET)
-                tmp = ip_network(match.group(2))
-
-                try:  # pragma: no cover
-                    network_address = tmp.network_address
-                except AttributeError:  # pragma: no cover
-                    network_address = tmp.ip
-                    pass
-
-                try:  # pragma: no cover
-                    broadcast_address = tmp.broadcast_address
-                except AttributeError:  # pragma: no cover
-                    broadcast_address = tmp.broadcast
-                    pass
-
-                net['range'] = '{0} - {1}'.format(
-                    network_address + 1, broadcast_address
-                )
-
-                cidr = ip_network(match.group(2).strip()).__str__()
-
-                net['cidr'] = cidr
-                net['start'] = match.start()
-                net['end'] = match.end()
-                nets.append(net)
-
-            except (ValueError, TypeError):
-
-                pass
-
-        return nets
-
-    def get_nets_krnic(self, response):
-        """
-        The function for parsing network blocks from krnic whois data.
-
-        Args:
-            response (:obj:`str`): The response from the krnic server.
-
-        Returns:
-            list of dict: Mapping of networks with start and end positions.
-
-            ::
-
-                [{
-                    'cidr' (str) - The network routing block
-                    'start' (int) - The starting point of the network
-                    'end' (int) - The endpoint point of the network
-                }]
-        """
-
-        nets = []
-
-        # Iterate through all of the networks found, storing the CIDR value
-        # and the start and end positions.
-        for match in re.finditer(
-                r'^(IPv4 Address)[\s]+:[^\S\n]+((.+?)[^\S\n]-[^\S\n](.+?)'
-                '[^\\S\n]\\((.+?)\\)|.+)$',
-                response,
-                re.MULTILINE
-        ):
-
-            try:
-
-                net = copy.deepcopy(BASE_NET)
-                net['range'] = match.group(2)
-
-                if match.group(3) and match.group(4):
-
-                    addrs = []
-                    addrs.extend(summarize_address_range(
-                        ip_address(match.group(3).strip()),
-                        ip_address(match.group(4).strip())))
-
-                    cidr = ', '.join(
-                        [i.__str__() for i in collapse_addresses(addrs)]
-                    )
-
-                    net['range'] = '{0} - {1}'.format(
-                        match.group(3), match.group(4)
-                    )
-
-                else:
-
-                    cidr = ip_network(match.group(2).strip()).__str__()
-
-                net['cidr'] = cidr
-                net['start'] = match.start()
-                net['end'] = match.end()
-                nets.append(net)
-
-            except (ValueError, TypeError):
-
-                pass
-
-        return nets
-
-    def get_contact(self, response=None, nir=None, handle=None,
-                    retry_count=3, dt_format=None):
-        """
-        The function for retrieving and parsing NIR whois data based on
-        NIR_WHOIS contact_fields.
-
-        Args:
-            response (:obj:`str`): Optional response object, this bypasses the
-                lookup.
-            nir (:obj:`str`): The NIR to query ('jpnic' or 'krnic'). Required
-                if response is None.
-            handle (:obj:`str`): For NIRs that have separate contact queries
-                (JPNIC), this is the contact handle to use in the query.
-                Defaults to None.
-            retry_count (:obj:`int`): The number of times to retry in case
-                socket errors, timeouts, connection resets, etc. are
-                encountered. Defaults to 3.
-            dt_format (:obj:`str`): The format of datetime fields if known.
-                Defaults to None.
-
-        Returns:
-            dict: Mapping of the fields provided in contact_fields, to their
-                parsed results.
-        """
-
-        if response or nir == 'krnic':
-
-            contact_response = response
-
-        else:
-
-            # Retrieve the whois data.
-            contact_response = self._net.get_http_raw(
-                url=str(NIR_WHOIS[nir]['url']).format(handle),
-                retry_count=retry_count,
-                headers=NIR_WHOIS[nir]['request_headers'],
-                request_type=NIR_WHOIS[nir]['request_type']
-            )
-
-        return self.parse_fields(
-            response=contact_response,
-            fields_dict=NIR_WHOIS[nir]['contact_fields'],
-            dt_format=dt_format,
-            hourdelta=int(NIR_WHOIS[nir]['dt_hourdelta']),
-            is_contact=True
-        )
-
-    def lookup(self, nir=None, inc_raw=False, retry_count=3, response=None,
-               field_list=None, is_offline=False):
-        """
-        The function for retrieving and parsing NIR whois information for an IP
-        address via HTTP (HTML scraping).
-
-        Args:
-            nir (:obj:`str`): The NIR to query ('jpnic' or 'krnic'). Required
-                if response is None.
-            inc_raw (:obj:`bool`, optional): Whether to include the raw
-                results in the returned dictionary. Defaults to False.
-            retry_count (:obj:`int`): The number of times to retry in case
-                socket errors, timeouts, connection resets, etc. are
-                encountered. Defaults to 3.
-            response (:obj:`str`): Optional response object, this bypasses the
-                NIR lookup. Required when is_offline=True.
-            field_list (:obj:`list` of :obj:`str`): If provided, fields to
-                parse. Defaults to :obj:`ipwhois.nir.BASE_NET`.
-            is_offline (:obj:`bool`): Whether to perform lookups offline. If
-                True, response and asn_data must be provided. Primarily used
-                for testing.
-
-        Returns:
-            dict: The NIR whois results:
-
-            ::
-
-                {
-                    'query' (str) - The IP address.
-                    'nets' (list of dict) - Network information which consists
-                        of the fields listed in the ipwhois.nir.NIR_WHOIS
-                        dictionary.
-                    'raw' (str) - Raw NIR whois results if the inc_raw
-                        parameter is True.
-                }
-        """
-
-        if nir not in NIR_WHOIS.keys():
-
-            raise KeyError('Invalid arg for nir (National Internet Registry')
-
-        # Create the return dictionary.
-        results = {
-            'query': self._net.address_str,
-            'raw': None
-        }
-
-        # Only fetch the response if we haven't already.
-        if response is None:
-
-            if is_offline:
-
-                raise KeyError('response argument required when '
-                               'is_offline=True')
-
-            log.debug('Response not given, perform WHOIS lookup for {0}'
-                      .format(self._net.address_str))
-
-            form_data = None
-            if NIR_WHOIS[nir]['form_data_ip_field']:
-                form_data = {NIR_WHOIS[nir]['form_data_ip_field']:
-                             self._net.address_str}
-
-            # Retrieve the whois data.
-            response = self._net.get_http_raw(
-                url=str(NIR_WHOIS[nir]['url']).format(self._net.address_str),
-                retry_count=retry_count,
-                headers=NIR_WHOIS[nir]['request_headers'],
-                request_type=NIR_WHOIS[nir]['request_type'],
-                form_data=form_data
-            )
-
-        # If inc_raw parameter is True, add the response to return dictionary.
-        if inc_raw:
-
-            results['raw'] = response
-
-        nets = []
-        nets_response = None
-        if nir == 'jpnic':
-
-            nets_response = self.get_nets_jpnic(response)
-
-        elif nir == 'krnic':
-
-            nets_response = self.get_nets_krnic(response)
-
-        nets.extend(nets_response)
-
-        global_contacts = {}
-
-        # Iterate through all of the network sections and parse out the
-        # appropriate fields for each.
-        log.debug('Parsing NIR WHOIS data')
-        for index, net in enumerate(nets):
-
-            section_end = None
-            if index + 1 < len(nets):
-                section_end = nets[index + 1]['start']
-
-            try:
-
-                dt_format = NIR_WHOIS[nir]['dt_format']
-
-            except KeyError:  # pragma: no cover
-
-                dt_format = None
-
-            temp_net = self.parse_fields(
-                response=response,
-                fields_dict=NIR_WHOIS[nir]['fields'],
-                net_start=section_end,
-                net_end=net['end'],
-                dt_format=dt_format,
-                field_list=field_list,
-                hourdelta=int(NIR_WHOIS[nir]['dt_hourdelta'])
-            )
-            temp_net['country'] = NIR_WHOIS[nir]['country_code']
-            contacts = {
-                'admin': temp_net['contact_admin'],
-                'tech': temp_net['contact_tech']
-            }
-
-            del (
-                temp_net['contact_admin'],
-                temp_net['contact_tech']
-            )
-
-            if not is_offline:
-
-                for key, val in contacts.items():
-
-                    if len(val) > 0:
-
-                        if isinstance(val, str):
-
-                            val = val.splitlines()
-
-                        for contact in val:
-
-                            if contact in global_contacts.keys():
-
-                                temp_net['contacts'][key] = (
-                                    global_contacts[contact]
-                                )
-
-                            else:
-
-                                if nir == 'krnic':
-
-                                    tmp_response = contact
-                                    tmp_handle = None
-
-                                else:
-
-                                    tmp_response = None
-                                    tmp_handle = contact
-
-                                temp_net['contacts'][key] = self.get_contact(
-                                    response=tmp_response,
-                                    handle=tmp_handle,
-                                    nir=nir,
-                                    retry_count=retry_count,
-                                    dt_format=dt_format
-                                )
-                                global_contacts[contact] = (
-                                    temp_net['contacts'][key]
-                                )
-
-            # Merge the net dictionaries.
-            net.update(temp_net)
-
-            # The start and end values are no longer needed.
-            del net['start'], net['end']
-
-        # Add the networks to the return dictionary.
-        results['nets'] = nets
-
-        return results
diff --git a/lib/ipwhois/rdap.py b/lib/ipwhois/rdap.py
deleted file mode 100644
index 3a65aef2..00000000
--- a/lib/ipwhois/rdap.py
+++ /dev/null
@@ -1,962 +0,0 @@
-# Copyright (c) 2013-2020 Philip Hane
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-from . import (Net, NetError, InvalidEntityContactObject, InvalidNetworkObject,
-               InvalidEntityObject, HTTPLookupError)
-from .utils import ipv4_lstrip_zeros, calculate_cidr, unique_everseen
-from .net import ip_address
-import logging
-import json
-from collections import namedtuple
-
-log = logging.getLogger(__name__)
-
-BOOTSTRAP_URL = 'http://rdap.arin.net/bootstrap'
-
-RIR_RDAP = {
-    'arin': {
-        'ip_url': 'http://rdap.arin.net/registry/ip/{0}',
-        'entity_url': 'http://rdap.arin.net/registry/entity/{0}'
-    },
-    'ripencc': {
-        'ip_url': 'http://rdap.db.ripe.net/ip/{0}',
-        'entity_url': 'http://rdap.db.ripe.net/entity/{0}'
-    },
-    'apnic': {
-        'ip_url': 'http://rdap.apnic.net/ip/{0}',
-        'entity_url': 'http://rdap.apnic.net/entity/{0}'
-    },
-    'lacnic': {
-        'ip_url': 'http://rdap.lacnic.net/rdap/ip/{0}',
-        'entity_url': 'http://rdap.lacnic.net/rdap/entity/{0}'
-    },
-    'afrinic': {
-        'ip_url': 'http://rdap.afrinic.net/rdap/ip/{0}',
-        'entity_url': 'http://rdap.afrinic.net/rdap/entity/{0}'
-    }
-}
-
-
-class _RDAPContact:
-    """
-    The class for parsing RDAP entity contact information objects:
-    https://tools.ietf.org/html/rfc7483#section-5.1
-    https://tools.ietf.org/html/rfc7095
-
-    Args:
-        vcard (:obj:`list` of :obj:`list`): The vcard list from an RDAP IP
-            address query.
-
-    Raises:
-        InvalidEntityContactObject: vcard is not an RDAP entity contact
-            information object.
-    """
-
-    def __init__(self, vcard):
-
-        if not isinstance(vcard, list):
-
-            raise InvalidEntityContactObject('JSON result must be a list.')
-
-        self.vcard = vcard
-        self.vars = {
-            'name': None,
-            'kind': None,
-            'address': None,
-            'phone': None,
-            'email': None,
-            'role': None,
-            'title': None
-        }
-
-    def _parse_name(self, val):
-        """
-        The function for parsing the vcard name.
-
-        Args:
-            val (:obj:`list`): The value to parse.
-        """
-
-        self.vars['name'] = val[3].strip()
-
-    def _parse_kind(self, val):
-        """
-        The function for parsing the vcard kind.
-
-        Args:
-            val (:obj:`list`): The value to parse.
-        """
-
-        self.vars['kind'] = val[3].strip()
-
-    def _parse_address(self, val):
-        """
-        The function for parsing the vcard address.
-
-        Args:
-            val (:obj:`list`): The value to parse.
-        """
-
-        ret = {
-            'type': None,
-            'value': None
-        }
-
-        try:
-
-            ret['type'] = val[1]['type']
-
-        except (KeyError, ValueError, TypeError):
-
-                pass
-
-        try:
-
-            ret['value'] = val[1]['label']
-
-        except (KeyError, ValueError, TypeError):
-
-            ret['value'] = '\n'.join(val[3]).strip()
-
-        try:
-
-            self.vars['address'].append(ret)
-
-        except AttributeError:
-
-            self.vars['address'] = []
-            self.vars['address'].append(ret)
-
-    def _parse_phone(self, val):
-        """
-        The function for parsing the vcard phone numbers.
-
-        Args:
-            val (:obj:`list`): The value to parse.
-        """
-
-        ret = {
-            'type': None,
-            'value': None
-        }
-
-        try:
-
-            ret['type'] = val[1]['type']
-
-        except (IndexError, KeyError, ValueError, TypeError):
-
-                pass
-
-        ret['value'] = val[3].strip()
-
-        try:
-
-            self.vars['phone'].append(ret)
-
-        except AttributeError:
-
-            self.vars['phone'] = []
-            self.vars['phone'].append(ret)
-
-    def _parse_email(self, val):
-        """
-        The function for parsing the vcard email addresses.
-
-        Args:
-            val (:obj:`list`): The value to parse.
-        """
-
-        ret = {
-            'type': None,
-            'value': None
-        }
-
-        try:
-
-            ret['type'] = val[1]['type']
-
-        except (KeyError, ValueError, TypeError):
-
-                pass
-
-        ret['value'] = val[3].strip()
-
-        try:
-
-            self.vars['email'].append(ret)
-
-        except AttributeError:
-
-            self.vars['email'] = []
-            self.vars['email'].append(ret)
-
-    def _parse_role(self, val):
-        """
-        The function for parsing the vcard role.
-
-        Args:
-            val (:obj:`list`): The value to parse.
-        """
-
-        self.vars['role'] = val[3].strip()
-
-    def _parse_title(self, val):
-        """
-        The function for parsing the vcard title.
-
-        Args:
-            val (:obj:`list`): The value to parse.
-        """
-
-        self.vars['title'] = val[3].strip()
-
-    def parse(self):
-        """
-        The function for parsing the vcard to the vars dictionary.
-        """
-
-        keys = {
-            'fn': self._parse_name,
-            'kind': self._parse_kind,
-            'adr': self._parse_address,
-            'tel': self._parse_phone,
-            'email': self._parse_email,
-            'role': self._parse_role,
-            'title': self._parse_title
-        }
-
-        for val in self.vcard:
-
-            try:
-
-                parser = keys.get(val[0])
-                parser(val)
-
-            except (KeyError, ValueError, TypeError):
-
-                pass
-
-
-class _RDAPCommon:
-    """
-    The common class for parsing RDAP objects:
-    https://tools.ietf.org/html/rfc7483#section-5
-
-    Args:
-        json_result (:obj:`dict`): The JSON response from an RDAP query.
-
-    Raises:
-        ValueError: vcard is not a known RDAP object.
-    """
-
-    def __init__(self, json_result):
-
-        if not isinstance(json_result, dict):
-
-            raise ValueError
-
-        self.json = json_result
-        self.vars = {
-            'handle': None,
-            'status': None,
-            'remarks': None,
-            'notices': None,
-            'links': None,
-            'events': None,
-            'raw': None
-        }
-
-    def summarize_links(self, links_json):
-        """
-        The function for summarizing RDAP links in to a unique list.
-        https://tools.ietf.org/html/rfc7483#section-4.2
-
-        Args:
-            links_json (:obj:`dict`): A json mapping of links from RDAP
-                results.
-
-        Returns:
-            list of str: Unique RDAP links.
-        """
-
-        ret = []
-
-        for link_dict in links_json:
-
-            ret.append(link_dict['href'])
-
-        ret = list(unique_everseen(ret))
-
-        return ret
-
-    def summarize_notices(self, notices_json):
-        """
-        The function for summarizing RDAP notices in to a unique list.
-        https://tools.ietf.org/html/rfc7483#section-4.3
-
-        Args:
-            notices_json (:obj:`dict`): A json mapping of notices from RDAP
-                results.
-
-        Returns:
-            list of dict: Unique RDAP notices information:
-
-            ::
-
-                [{
-                    'title' (str) - The title/header of the notice.
-                    'description' (str) - The description/body of the notice.
-                    'links' (list) - Unique links returned by
-                        :obj:`ipwhois.rdap._RDAPCommon.summarize_links()`.
-               }]
-        """
-
-        ret = []
-
-        for notices_dict in notices_json:
-
-            tmp = {
-                'title': None,
-                'description': None,
-                'links': None
-            }
-
-            try:
-
-                tmp['title'] = notices_dict['title']
-
-            except (KeyError, ValueError, TypeError):
-
-                pass
-
-            try:
-
-                tmp['description'] = '\n'.join(notices_dict['description'])
-
-            except (KeyError, ValueError, TypeError):
-
-                pass
-
-            try:
-
-                tmp['links'] = self.summarize_links(notices_dict['links'])
-
-            except (KeyError, ValueError, TypeError):
-
-                pass
-
-            if any(tmp.values()):
-
-                ret.append(tmp)
-
-        return ret
-
-    def summarize_events(self, events_json):
-        """
-        The function for summarizing RDAP events in to a unique list.
-        https://tools.ietf.org/html/rfc7483#section-4.5
-
-        Args:
-            events_json (:obj:`dict`): A json mapping of events from RDAP
-                results.
-
-        Returns:
-            list of dict: Unique RDAP events information:
-
-            ::
-
-                [{
-                    'action' (str) - The reason for an event.
-                    'timestamp' (str) - The timestamp for when an event
-                        occured.
-                    'actor' (str) - The identifier for an event initiator.
-               }]
-        """
-
-        ret = []
-
-        for event in events_json:
-
-            event_dict = {
-                'action': event['eventAction'],
-                'timestamp': event['eventDate'],
-                'actor': None
-            }
-
-            try:
-
-                event_dict['actor'] = event['eventActor']
-
-            except (KeyError, ValueError, TypeError):
-
-                pass
-
-            ret.append(event_dict)
-
-        return ret
-
-    def _parse(self):
-        """
-        The function for parsing the JSON response to the vars dictionary.
-        """
-
-        try:
-
-            self.vars['status'] = self.json['status']
-
-        except (KeyError, ValueError, TypeError):
-
-            pass
-
-        for v in ['remarks', 'notices']:
-
-            try:
-
-                self.vars[v] = self.summarize_notices(self.json[v])
-
-            except (KeyError, ValueError, TypeError):
-
-                pass
-
-        try:
-
-            self.vars['links'] = self.summarize_links(self.json['links'])
-
-        except (KeyError, ValueError, TypeError):
-
-            pass
-
-        try:
-
-            self.vars['events'] = self.summarize_events(self.json['events'])
-
-        except (KeyError, ValueError, TypeError):
-
-            pass
-
-
-class _RDAPNetwork(_RDAPCommon):
-    """
-    The class for parsing RDAP network objects:
-    https://tools.ietf.org/html/rfc7483#section-5.4
-
-    Args:
-        json_result (:obj:`dict`): The JSON response from an RDAP IP address
-            query.
-
-    Raises:
-        InvalidNetworkObject: json_result is not an RDAP network object.
-    """
-
-    def __init__(self, json_result):
-
-        try:
-
-            _RDAPCommon.__init__(self, json_result)
-
-        except ValueError:
-
-            raise InvalidNetworkObject('JSON result must be a dict.')
-
-        self.vars.update({
-            'start_address': None,
-            'end_address': None,
-            'cidr': None,
-            'ip_version': None,
-            'type': None,
-            'name': None,
-            'country': None,
-            'parent_handle': None
-        })
-
-    def parse(self):
-        """
-        The function for parsing the JSON response to the vars dictionary.
-        """
-
-        try:
-
-            self.vars['handle'] = self.json['handle'].strip()
-
-        except (KeyError, ValueError):
-
-            log.debug('Handle missing, json_output: {0}'.format(json.dumps(
-                self.json)))
-            raise InvalidNetworkObject('Handle is missing for RDAP network '
-                                       'object')
-
-        try:
-
-            self.vars['ip_version'] = self.json['ipVersion'].strip()
-
-            # RDAP IPv4 addresses are padded to 3 digits per octet, remove
-            # the leading 0's.
-            if self.vars['ip_version'] == 'v4':
-
-                self.vars['start_address'] = ip_address(
-                    ipv4_lstrip_zeros(self.json['startAddress'])
-                ).__str__()
-
-                self.vars['end_address'] = ip_address(
-                    ipv4_lstrip_zeros(self.json['endAddress'])
-                ).__str__()
-
-            # No bugs found for IPv6 yet, proceed as normal.
-            else:
-
-                self.vars['start_address'] = self.json['startAddress'].strip()
-                self.vars['end_address'] = self.json['endAddress'].strip()
-
-        except (KeyError, ValueError, TypeError):
-
-            log.debug('IP address data incomplete. Data parsed prior to '
-                      'exception: {0}'.format(json.dumps(self.vars)))
-            raise InvalidNetworkObject('IP address data is missing for RDAP '
-                                       'network object.')
-
-        try:
-
-            self.vars['cidr'] = ', '.join(calculate_cidr(
-                self.vars['start_address'], self.vars['end_address']
-            ))
-
-        except (KeyError, ValueError, TypeError, AttributeError) as \
-                e:  # pragma: no cover
-
-            log.debug('CIDR calculation failed: {0}'.format(e))
-            pass
-
-        for v in ['name', 'type', 'country']:
-
-            try:
-
-                self.vars[v] = self.json[v].strip()
-
-            except (KeyError, ValueError, AttributeError):
-
-                pass
-
-        try:
-
-            self.vars['parent_handle'] = self.json['parentHandle'].strip()
-
-        except (KeyError, ValueError):
-
-            pass
-
-        self._parse()
-
-
-class _RDAPEntity(_RDAPCommon):
-    """
-    The class for parsing RDAP entity objects:
-    https://tools.ietf.org/html/rfc7483#section-5.1
-
-    Args:
-        json_result (:obj:`dict`): The JSON response from an RDAP query.
-
-    Raises:
-        InvalidEntityObject: json_result is not an RDAP entity object.
-    """
-
-    def __init__(self, json_result):
-
-        try:
-
-            _RDAPCommon.__init__(self, json_result)
-
-        except ValueError:
-
-            raise InvalidEntityObject('JSON result must be a dict.')
-
-        self.vars.update({
-            'roles': None,
-            'contact': None,
-            'events_actor': None,
-            'entities': []
-        })
-
-    def parse(self):
-        """
-        The function for parsing the JSON response to the vars dictionary.
-        """
-
-        try:
-
-            self.vars['handle'] = self.json['handle'].strip()
-
-        except (KeyError, ValueError, TypeError):
-
-            raise InvalidEntityObject('Handle is missing for RDAP entity')
-
-        for v in ['roles', 'country']:
-
-            try:
-
-                self.vars[v] = self.json[v]
-
-            except (KeyError, ValueError):
-
-                pass
-
-        try:
-
-            vcard = self.json['vcardArray'][1]
-            c = _RDAPContact(vcard)
-            c.parse()
-
-            self.vars['contact'] = c.vars
-
-        except (KeyError, ValueError, TypeError):
-
-            pass
-
-        try:
-
-            self.vars['events_actor'] = self.summarize_events(
-                self.json['asEventActor'])
-
-        except (KeyError, ValueError, TypeError):
-
-            pass
-
-        self.vars['entities'] = []
-        try:
-
-            for ent in self.json['entities']:
-
-                if ent['handle'] not in self.vars['entities']:
-
-                    self.vars['entities'].append(ent['handle'])
-
-        except (KeyError, ValueError, TypeError):
-
-            pass
-
-        if not self.vars['entities']:
-
-            self.vars['entities'] = None
-
-        self._parse()
-
-
-class RDAP:
-    """
-    The class for parsing IP address whois information via RDAP:
-    https://tools.ietf.org/html/rfc7483
-    https://www.arin.net/resources/rdap.html
-
-    Args:
-        net (:obj:`ipwhois.net.Net`): The network object.
-
-    Raises:
-        NetError: The parameter provided is not an instance of
-            ipwhois.net.Net
-        IPDefinedError: The address provided is defined (does not need to be
-            resolved).
-    """
-
-    def __init__(self, net):
-
-        if isinstance(net, Net):
-
-            self._net = net
-
-        else:
-
-            raise NetError('The provided net parameter is not an instance of '
-                           'ipwhois.net.Net')
-
-    def _get_entity(self, entity=None, roles=None, inc_raw=False, retry_count=3,
-                    asn_data=None, bootstrap=False, rate_limit_timeout=120):
-        """
-        The function for retrieving and parsing information for an entity via
-        RDAP (HTTP).
-
-        Args:
-            entity (:obj:`str`): The entity name to lookup.
-            roles (:obj:`dict`): The mapping of entity handles to roles.
-            inc_raw (:obj:`bool`, optional): Whether to include the raw
-                results in the returned dictionary. Defaults to False.
-            retry_count (:obj:`int`): The number of times to retry in case
-                socket errors, timeouts, connection resets, etc. are
-                encountered. Defaults to 3.
-            asn_data (:obj:`dict`): Result from
-                :obj:`ipwhois.asn.IPASN.lookup`. Optional if the bootstrap
-                parameter is True.
-            bootstrap (:obj:`bool`): If True, performs lookups via ARIN
-                bootstrap rather than lookups based on ASN data. Defaults to
-                False.
-            rate_limit_timeout (:obj:`int`): The number of seconds to wait
-                before retrying when a rate limit notice is returned via
-                rdap+json. Defaults to 120.
-
-        Returns:
-            namedtuple:
-
-            :result (dict): Consists of the fields listed in the
-                ipwhois.rdap._RDAPEntity dict. The raw result is included for
-                each object if the inc_raw parameter is True.
-            :roles (dict): The mapping of entity handles to roles.
-        """
-
-        result = {}
-
-        if bootstrap:
-            entity_url = '{0}/entity/{1}'.format(
-                BOOTSTRAP_URL, entity)
-        else:
-            tmp_reg = asn_data['asn_registry']
-            entity_url = RIR_RDAP[tmp_reg]['entity_url']
-            entity_url = str(entity_url).format(entity)
-
-        try:
-
-            # RDAP entity query
-            response = self._net.get_http_json(
-                url=entity_url, retry_count=retry_count,
-                rate_limit_timeout=rate_limit_timeout
-            )
-
-            # Parse the entity
-            result_ent = _RDAPEntity(response)
-            result_ent.parse()
-            result = result_ent.vars
-
-            result['roles'] = None
-            try:
-
-                result['roles'] = roles[entity]
-
-            except KeyError:  # pragma: no cover
-
-                pass
-
-            try:
-
-                for tmp in response['entities']:
-
-                    if tmp['handle'] not in roles:
-                        roles[tmp['handle']] = tmp['roles']
-
-            except (IndexError, KeyError):
-
-                pass
-
-            if inc_raw:
-                result['raw'] = response
-
-        except (HTTPLookupError, InvalidEntityObject):
-
-            pass
-
-        return_tuple = namedtuple('return_tuple', ['result', 'roles'])
-        return return_tuple(result, roles)
-
-    def lookup(self, inc_raw=False, retry_count=3, asn_data=None, depth=0,
-               excluded_entities=None, response=None, bootstrap=False,
-               rate_limit_timeout=120, root_ent_check=True):
-        """
-        The function for retrieving and parsing information for an IP
-        address via RDAP (HTTP).
-
-        Args:
-            inc_raw (:obj:`bool`, optional): Whether to include the raw
-                results in the returned dictionary. Defaults to False.
-            retry_count (:obj:`int`): The number of times to retry in case
-                socket errors, timeouts, connection resets, etc. are
-                encountered. Defaults to 3.
-            asn_data (:obj:`dict`): Result from
-                :obj:`ipwhois.asn.IPASN.lookup`. Optional if the bootstrap
-                parameter is True.
-            depth (:obj:`int`): How many levels deep to run queries when
-                additional referenced objects are found. Defaults to 0.
-            excluded_entities (:obj:`list`): Entity handles to not perform
-                lookups. Defaults to None.
-            response (:obj:`str`): Optional response object, this bypasses the
-                RDAP lookup.
-            bootstrap (:obj:`bool`): If True, performs lookups via ARIN
-                bootstrap rather than lookups based on ASN data. Defaults to
-                False.
-            rate_limit_timeout (:obj:`int`): The number of seconds to wait
-                before retrying when a rate limit notice is returned via
-                rdap+json. Defaults to 120.
-            root_ent_check (:obj:`bool`): If True, will perform
-                additional RDAP HTTP queries for missing entity data at the
-                root level. Defaults to True.
-
-        Returns:
-            dict: The IP RDAP lookup results
-
-            ::
-
-                {
-                    'query' (str) - The IP address
-                    'entities' (list) - Entity handles referred by the top
-                        level query.
-                    'network' (dict) - Network information which consists of
-                        the fields listed in the ipwhois.rdap._RDAPNetwork
-                        dict.
-                    'objects' (dict) - Mapping of entity handle->entity dict
-                        which consists of the fields listed in the
-                        ipwhois.rdap._RDAPEntity dict. The raw result is
-                        included for each object if the inc_raw parameter
-                        is True.
-                }
-        """
-
-        if not excluded_entities:
-
-            excluded_entities = []
-
-        # Create the return dictionary.
-        results = {
-            'query': self._net.address_str,
-            'network': None,
-            'entities': None,
-            'objects': None,
-            'raw': None
-        }
-
-        if bootstrap:
-
-            ip_url = '{0}/ip/{1}'.format(BOOTSTRAP_URL, self._net.address_str)
-
-        else:
-
-            ip_url = str(RIR_RDAP[asn_data['asn_registry']]['ip_url']).format(
-                self._net.address_str)
-
-        # Only fetch the response if we haven't already.
-        if response is None:
-
-            log.debug('Response not given, perform RDAP lookup for {0}'.format(
-                ip_url))
-
-            # Retrieve the whois data.
-            response = self._net.get_http_json(
-                url=ip_url, retry_count=retry_count,
-                rate_limit_timeout=rate_limit_timeout
-            )
-
-        if inc_raw:
-
-            results['raw'] = response
-
-        log.debug('Parsing RDAP network object')
-        result_net = _RDAPNetwork(response)
-        result_net.parse()
-        results['network'] = result_net.vars
-        results['entities'] = []
-        results['objects'] = {}
-        roles = {}
-
-        # Iterate through and parse the root level entities.
-        log.debug('Parsing RDAP root level entities')
-        try:
-
-            for ent in response['entities']:
-
-                if ent['handle'] not in [results['entities'],
-                                         excluded_entities]:
-
-                    if 'vcardArray' not in ent and root_ent_check:
-                        entity_object, roles = self._get_entity(
-                            entity=ent['handle'],
-                            roles=roles,
-                            inc_raw=inc_raw,
-                            retry_count=retry_count,
-                            asn_data=asn_data,
-                            bootstrap=bootstrap,
-                            rate_limit_timeout=rate_limit_timeout
-                        )
-                        results['objects'][ent['handle']] = entity_object
-
-                    else:
-                        result_ent = _RDAPEntity(ent)
-                        result_ent.parse()
-
-                        results['objects'][ent['handle']] = result_ent.vars
-
-                    results['entities'].append(ent['handle'])
-
-                    try:
-
-                        for tmp in ent['entities']:
-
-                            roles[tmp['handle']] = tmp['roles']
-
-                    except KeyError:
-
-                        pass
-
-        except KeyError:
-
-            pass
-
-        # Iterate through to the defined depth, retrieving and parsing all
-        # unique entities.
-        temp_objects = results['objects']
-
-        if depth > 0 and len(temp_objects) > 0:
-
-            log.debug('Parsing RDAP sub-entities to depth: {0}'.format(str(
-                depth)))
-
-        while depth > 0 and len(temp_objects) > 0:
-
-            new_objects = {}
-            for obj in temp_objects.values():
-
-                try:
-
-                    for ent in obj['entities']:
-
-                        if ent not in (list(results['objects'].keys()) +
-                                       list(new_objects.keys()) +
-                                       excluded_entities):
-
-                            entity_object, roles = self._get_entity(
-                                entity=ent,
-                                roles=roles,
-                                inc_raw=inc_raw,
-                                retry_count=retry_count,
-                                asn_data=asn_data,
-                                bootstrap=bootstrap,
-                                rate_limit_timeout=rate_limit_timeout
-                            )
-                            new_objects[ent] = entity_object
-
-                except (KeyError, TypeError):
-
-                    pass
-
-            # Update the result objects, and set the new temp object list to
-            # iterate for the next depth of entities.
-            results['objects'].update(new_objects)
-            temp_objects = new_objects
-            depth -= 1
-
-        return results
diff --git a/lib/ipwhois/utils.py b/lib/ipwhois/utils.py
deleted file mode 100644
index f3c0a76e..00000000
--- a/lib/ipwhois/utils.py
+++ /dev/null
@@ -1,635 +0,0 @@
-# Copyright (c) 2013-2020 Philip Hane
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-import sys
-from xml.dom.minidom import parseString
-from os import path
-import re
-import copy
-import io
-import csv
-import random
-from collections import namedtuple
-import logging
-
-if sys.version_info >= (3, 3):  # pragma: no cover
-    from ipaddress import (ip_address,
-                           ip_network,
-                           IPv4Address,
-                           IPv4Network,
-                           IPv6Address,
-                           summarize_address_range,
-                           collapse_addresses)
-else:  # pragma: no cover
-    from ipaddr import (IPAddress as ip_address,
-                        IPNetwork as ip_network,
-                        IPv4Address,
-                        IPv4Network,
-                        IPv6Address,
-                        summarize_address_range,
-                        collapse_address_list as collapse_addresses)
-
-try:  # pragma: no cover
-    from itertools import filterfalse
-
-except ImportError:  # pragma: no cover
-    from itertools import ifilterfalse as filterfalse
-
-log = logging.getLogger(__name__)
-
-IETF_RFC_REFERENCES = {
-    # IPv4
-    'RFC 1122, Section 3.2.1.3':
-    'http://tools.ietf.org/html/rfc1122#section-3.2.1.3',
-    'RFC 1918': 'http://tools.ietf.org/html/rfc1918',
-    'RFC 3927': 'http://tools.ietf.org/html/rfc3927',
-    'RFC 5736': 'http://tools.ietf.org/html/rfc5736',
-    'RFC 5737': 'http://tools.ietf.org/html/rfc5737',
-    'RFC 3068': 'http://tools.ietf.org/html/rfc3068',
-    'RFC 2544': 'http://tools.ietf.org/html/rfc2544',
-    'RFC 3171': 'http://tools.ietf.org/html/rfc3171',
-    'RFC 919, Section 7': 'http://tools.ietf.org/html/rfc919#section-7',
-    # IPv6
-    'RFC 4291, Section 2.7': 'http://tools.ietf.org/html/rfc4291#section-2.7',
-    'RFC 4291': 'http://tools.ietf.org/html/rfc4291',
-    'RFC 4291, Section 2.5.2':
-    'http://tools.ietf.org/html/rfc4291#section-2.5.2',
-    'RFC 4291, Section 2.5.3':
-    'http://tools.ietf.org/html/rfc4291#section-2.5.3',
-    'RFC 4291, Section 2.5.6':
-    'http://tools.ietf.org/html/rfc4291#section-2.5.6',
-    'RFC 4291, Section 2.5.7':
-    'http://tools.ietf.org/html/rfc4291#section-2.5.7',
-    'RFC 4193': 'https://tools.ietf.org/html/rfc4193'
-}
-
-IP_REGEX = (
-    r'(?P<ip>'
-    # IPv4
-    r'(((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\.)){3}'
-    r'(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)'
-    # IPv6
-    r'|\[?(((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:)'
-    r'{6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|'
-    r'2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]'
-    r'{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d'
-    r'\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|'
-    r'((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|'
-    r'2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]'
-    r'{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)'
-    r'(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(('
-    r'(:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1'
-    r'\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(('
-    r'[0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4})'
-    r'{0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]'
-    r'?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:(('
-    r'25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})'
-    r')|:)))(%.+)?))\]?'
-    # Optional IPv4 Port
-    r'((:(6553[0-5]|655[0-2]\d|65[0-4]\d{2}|6[0-4]\d{3}|[1-5]\d{4}|[1-9]\d{0,3}'
-    # Optional CIDR block
-    r'))|(\/(?:[012]\d?|3[012]?|[4-9])))?'
-    r')'
-)
-
-
-def ipv4_lstrip_zeros(address):
-    """
-    The function to strip leading zeros in each octet of an IPv4 address.
-
-    Args:
-        address (:obj:`str`): An IPv4 address.
-
-    Returns:
-        str: The modified IPv4 address.
-    """
-
-    # Split  the octets.
-    obj = address.strip().split('.')
-
-    for x, y in enumerate(obj):
-
-        # Strip leading zeros. Split / here in case CIDR is attached.
-        obj[x] = y.split('/')[0].lstrip('0')
-        if obj[x] in ['', None]:
-            obj[x] = '0'
-
-    return '.'.join(obj)
-
-
-def calculate_cidr(start_address, end_address):
-    """
-    The function to calculate a CIDR range(s) from a start and end IP address.
-
-    Args:
-        start_address (:obj:`str`): The starting IP address.
-        end_address (:obj:`str`): The ending IP address.
-
-    Returns:
-        list of str: The calculated CIDR ranges.
-    """
-
-    tmp_addrs = []
-
-    try:
-
-        tmp_addrs.extend(summarize_address_range(
-            ip_address(start_address),
-            ip_address(end_address)))
-
-    except (KeyError, ValueError, TypeError):  # pragma: no cover
-
-        try:
-
-            tmp_addrs.extend(summarize_address_range(
-                ip_network(start_address).network_address,
-                ip_network(end_address).network_address))
-
-        except AttributeError:  # pragma: no cover
-
-            tmp_addrs.extend(summarize_address_range(
-                ip_network(start_address).ip,
-                ip_network(end_address).ip))
-
-    return [i.__str__() for i in collapse_addresses(tmp_addrs)]
-
-
-def get_countries(is_legacy_xml=False):
-    """
-    The function to generate a dictionary containing ISO_3166-1 country codes
-    to names.
-
-    Args:
-        is_legacy_xml (:obj:`bool`): Whether to use the older country code
-            list (iso_3166-1_list_en.xml).
-
-    Returns:
-        dict: A mapping of country codes as the keys to the country names as
-            the values.
-    """
-
-    # Initialize the countries dictionary.
-    countries = {}
-
-    # Set the data directory based on if the script is a frozen executable.
-    if sys.platform == 'win32' and getattr(sys, 'frozen', False):
-
-        data_dir = path.dirname(sys.executable)  # pragma: no cover
-
-    else:
-
-        data_dir = path.dirname(__file__)
-
-    if is_legacy_xml:
-
-        log.debug('Opening country code legacy XML: {0}'.format(
-                str(data_dir) + '/data/iso_3166-1_list_en.xml'))
-
-        # Create the country codes file object.
-        f = io.open(str(data_dir) + '/data/iso_3166-1_list_en.xml', 'r',
-                    encoding='ISO-8859-1')
-
-        # Read the file.
-        data = f.read()
-        f.close()
-
-        # Check if there is data.
-        if not data:  # pragma: no cover
-
-            return {}
-
-        # Parse the data to get the DOM.
-        dom = parseString(data)
-
-        # Retrieve the country entries.
-        entries = dom.getElementsByTagName('ISO_3166-1_Entry')
-
-        # Iterate through the entries and add to the countries dictionary.
-        for entry in entries:
-
-            # Retrieve the country code and name from the DOM.
-            code = entry.getElementsByTagName(
-                'ISO_3166-1_Alpha-2_Code_element')[0].firstChild.data
-            name = entry.getElementsByTagName(
-                'ISO_3166-1_Country_name')[0].firstChild.data
-
-            # Add to the countries dictionary.
-            countries[code] = name.title()
-
-    else:
-
-        log.debug('Opening country code CSV: {0}'.format(
-                str(data_dir) + '/data/iso_3166-1_list_en.xml'))
-
-        # Create the country codes file object.
-        f = io.open(str(data_dir) + '/data/iso_3166-1.csv', 'r',
-                    encoding='utf-8')
-
-        # Create csv reader object.
-        csv_reader = csv.reader(f, delimiter=',', quotechar='"')
-
-        # Iterate through the rows and add to the countries dictionary.
-        for row in csv_reader:
-
-            # Retrieve the country code and name columns.
-            code = row[0]
-            name = row[1]
-
-            # Add to the countries dictionary.
-            countries[code] = name
-
-        f.close()
-
-    return countries
-
-
-def ipv4_is_defined(address):
-    """
-    The function for checking if an IPv4 address is defined (does not need to
-    be resolved).
-
-    Args:
-        address (:obj:`str`): An IPv4 address.
-
-    Returns:
-        namedtuple:
-
-        :is_defined (bool): True if given address is defined, otherwise
-            False
-        :ietf_name (str): IETF assignment name if given address is
-            defined, otherwise ''
-        :ietf_rfc (str): IETF assignment RFC if given address is defined,
-            otherwise ''
-    """
-
-    # Initialize the IP address object.
-    query_ip = IPv4Address(str(address))
-
-    # Initialize the results named tuple
-    results = namedtuple('ipv4_is_defined_results', 'is_defined, ietf_name, '
-                                                    'ietf_rfc')
-
-    # This Network
-    if query_ip in IPv4Network('0.0.0.0/8'):
-
-        return results(True, 'This Network', 'RFC 1122, Section 3.2.1.3')
-
-    # Loopback
-    elif query_ip.is_loopback:
-
-        return results(True, 'Loopback', 'RFC 1122, Section 3.2.1.3')
-
-    # Link Local
-    elif query_ip.is_link_local:
-
-        return results(True, 'Link Local', 'RFC 3927')
-
-    # IETF Protocol Assignments
-    elif query_ip in IPv4Network('192.0.0.0/24'):
-
-        return results(True, 'IETF Protocol Assignments', 'RFC 5736')
-
-    # TEST-NET-1
-    elif query_ip in IPv4Network('192.0.2.0/24'):
-
-        return results(True, 'TEST-NET-1', 'RFC 5737')
-
-    # 6to4 Relay Anycast
-    elif query_ip in IPv4Network('192.88.99.0/24'):
-
-        return results(True, '6to4 Relay Anycast', 'RFC 3068')
-
-    # Network Interconnect Device Benchmark Testing
-    elif query_ip in IPv4Network('198.18.0.0/15'):
-
-        return (results(True,
-                'Network Interconnect Device Benchmark Testing',
-                        'RFC 2544'))
-
-    # TEST-NET-2
-    elif query_ip in IPv4Network('198.51.100.0/24'):
-
-        return results(True, 'TEST-NET-2', 'RFC 5737')
-
-    # TEST-NET-3
-    elif query_ip in IPv4Network('203.0.113.0/24'):
-
-        return results(True, 'TEST-NET-3', 'RFC 5737')
-
-    # Multicast
-    elif query_ip.is_multicast:
-
-        return results(True, 'Multicast', 'RFC 3171')
-
-    # Limited Broadcast
-    elif query_ip in IPv4Network('255.255.255.255/32'):
-
-        return results(True, 'Limited Broadcast', 'RFC 919, Section 7')
-
-    # Private-Use Networks
-    elif query_ip.is_private:
-
-        return results(True, 'Private-Use Networks', 'RFC 1918')
-
-    # New IANA Reserved
-    # TODO: Someone needs to find the RFC for this
-    elif query_ip in IPv4Network('198.97.38.0/24'):
-
-        return results(True, 'IANA Reserved', '')
-
-    return results(False, '', '')
-
-
-def ipv6_is_defined(address):
-    """
-    The function for checking if an IPv6 address is defined (does not need to
-    be resolved).
-
-    Args:
-        address (:obj:`str`): An IPv6 address.
-
-    Returns:
-        namedtuple:
-
-        :is_defined (bool): True if given address is defined, otherwise
-            False
-        :ietf_name (str): IETF assignment name if given address is
-            defined, otherwise ''
-        :ietf_rfc (str): IETF assignment RFC if given address is defined,
-            otherwise ''
-    """
-
-    # Initialize the IP address object.
-    query_ip = IPv6Address(str(address))
-
-    # Initialize the results named tuple
-    results = namedtuple('ipv6_is_defined_results', 'is_defined, ietf_name, '
-                                                    'ietf_rfc')
-    # Multicast
-    if query_ip.is_multicast:
-
-        return results(True, 'Multicast', 'RFC 4291, Section 2.7')
-
-    # Unspecified
-    elif query_ip.is_unspecified:
-
-        return results(True, 'Unspecified', 'RFC 4291, Section 2.5.2')
-
-    # Loopback.
-    elif query_ip.is_loopback:
-
-        return results(True, 'Loopback', 'RFC 4291, Section 2.5.3')
-
-    # Reserved
-    elif query_ip.is_reserved:
-
-        return results(True, 'Reserved', 'RFC 4291')
-
-    # Link-Local
-    elif query_ip.is_link_local:
-
-        return results(True, 'Link-Local', 'RFC 4291, Section 2.5.6')
-
-    # Site-Local
-    elif query_ip.is_site_local:
-
-        return results(True, 'Site-Local', 'RFC 4291, Section 2.5.7')
-
-    # Unique Local Unicast
-    elif query_ip.is_private:
-
-        return results(True, 'Unique Local Unicast', 'RFC 4193')
-
-    return results(False, '', '')
-
-
-def unique_everseen(iterable, key=None):
-    """
-    The generator to list unique elements, preserving the order. Remember all
-    elements ever seen. This was taken from the itertools recipes.
-
-    Args:
-        iterable (:obj:`iter`): An iterable to process.
-        key (:obj:`callable`): Optional function to run when checking
-            elements (e.g., str.lower)
-
-    Yields:
-        The next unique element found.
-    """
-
-    seen = set()
-    seen_add = seen.add
-
-    if key is None:
-
-        for element in filterfalse(seen.__contains__, iterable):
-
-            seen_add(element)
-            yield element
-
-    else:
-
-        for element in iterable:
-
-            k = key(element)
-
-            if k not in seen:
-
-                seen_add(k)
-                yield element
-
-
-def unique_addresses(data=None, file_path=None):
-    """
-    The function to search an input string and/or file, extracting and
-    counting IPv4/IPv6 addresses/networks. Summarizes ports with sub-counts.
-    If both a string and file_path are provided, it will process them both.
-
-    Args:
-        data (:obj:`str`): The data to process.
-        file_path (:obj:`str`): An optional file path to process.
-
-    Returns:
-        dict: The addresses/networks mapped to ports and counts:
-
-        ::
-
-            {
-                '1.2.3.4' (dict) - Each address or network found is a
-                    dictionary:
-                    {
-                        'count' (int) - Total number of times seen.
-                        'ports' (dict) - Mapping of port numbers as keys and
-                            the number of times seen for this ip as values.
-                    }
-            }
-
-    Raises:
-        ValueError: Arguments provided are invalid.
-    """
-
-    if not data and not file_path:
-
-        raise ValueError('No data or file path provided.')
-
-    ret = {}
-    base = {
-        'count': 0,
-        'ports': {}
-    }
-
-    file_data = None
-    if file_path:
-
-        log.debug('Opening file for unique address analysis: {0}'.format(
-                str(file_path)))
-
-        f = open(str(file_path), 'r')
-
-        # Read the file.
-        file_data = f.read()
-        f.close()
-
-    pattern = re.compile(
-        str(IP_REGEX),
-        re.DOTALL
-    )
-
-    # Check if there is data.
-    log.debug('Analyzing input/file data'.format(
-                str(file_path)))
-    for input_data in [data, file_data]:
-
-        if input_data:
-
-            # Search for IPs.
-            for match in pattern.finditer(input_data):
-
-                is_net = False
-                port = None
-                try:
-
-                    found = match.group('ip')
-
-                    if '.' in found and ':' in found:
-
-                        split = found.split(':')
-                        ip_or_net = split[0]
-                        port = split[1]
-
-                    elif '[' in found:
-
-                        split = found.split(']:')
-                        ip_or_net = split[0][1:]
-                        port = split[1]
-
-                    elif '/' in found:
-
-                        is_net = True
-                        ip_or_net = found
-
-                    else:
-
-                        ip_or_net = found
-
-                    if is_net:
-
-                        ip_obj = ip_network(ip_or_net)
-
-                    else:
-                        ip_obj = ip_address(ip_or_net)
-
-                    obj_str = ip_obj.__str__()
-
-                    if obj_str not in ret.keys():
-
-                        ret[obj_str] = copy.deepcopy(base)
-
-                    ret[obj_str]['count'] += 1
-
-                    if port:
-
-                        try:
-
-                            ret[obj_str]['ports'][str(port)] += 1
-
-                        except KeyError:
-
-                            ret[obj_str]['ports'][str(port)] = 1
-
-                except (KeyError, ValueError):
-
-                    continue
-
-    return ret
-
-
-def ipv4_generate_random(total=100):
-    """
-    The generator to produce random, unique IPv4 addresses that are not
-    defined (can be looked up using ipwhois).
-
-    Args:
-        total (:obj:`int`): The total number of IPv4 addresses to generate.
-
-    Yields:
-        str: The next IPv4 address.
-    """
-
-    count = 0
-    yielded = set()
-    while count < total:
-
-        address = str(IPv4Address(random.randint(0, 2**32-1)))
-
-        if not ipv4_is_defined(address)[0] and address not in yielded:
-
-            count += 1
-            yielded.add(address)
-            yield address
-
-
-def ipv6_generate_random(total=100):
-    """
-    The generator to produce random, unique IPv6 addresses that are not
-    defined (can be looked up using ipwhois).
-
-    Args:
-        total (:obj:`int`): The total number of IPv6 addresses to generate.
-
-    Yields:
-        str: The next IPv6 address.
-    """
-
-    count = 0
-    yielded = set()
-    while count < total:
-
-        address = str(IPv6Address(random.randint(0, 2**128-1)))
-
-        if not ipv6_is_defined(address)[0] and address not in yielded:
-
-            count += 1
-            yielded.add(address)
-            yield address
diff --git a/lib/ipwhois/whois.py b/lib/ipwhois/whois.py
deleted file mode 100644
index 40c131d3..00000000
--- a/lib/ipwhois/whois.py
+++ /dev/null
@@ -1,769 +0,0 @@
-# Copyright (c) 2013-2020 Philip Hane
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-import sys
-import re
-import copy
-from datetime import datetime
-import logging
-from .utils import unique_everseen
-from . import (BlacklistError, WhoisLookupError, NetError)
-
-if sys.version_info >= (3, 3):  # pragma: no cover
-    from ipaddress import (ip_address,
-                           ip_network,
-                           summarize_address_range,
-                           collapse_addresses)
-else:  # pragma: no cover
-    from ipaddr import (IPAddress as ip_address,
-                        IPNetwork as ip_network,
-                        summarize_address_range,
-                        collapse_address_list as collapse_addresses)
-
-log = logging.getLogger(__name__)
-
-# Legacy base whois output dictionary.
-BASE_NET = {
-    'cidr': None,
-    'name': None,
-    'handle': None,
-    'range': None,
-    'description': None,
-    'country': None,
-    'state': None,
-    'city': None,
-    'address': None,
-    'postal_code': None,
-    'emails': None,
-    'created': None,
-    'updated': None
-}
-
-RIR_WHOIS = {
-    'arin': {
-        'server': 'whois.arin.net',
-        'fields': {
-            'name': r'(NetName):[^\S\n]+(?P<val>.+?)\n',
-            'handle': r'(NetHandle):[^\S\n]+(?P<val>.+?)\n',
-            'description': r'(OrgName|CustName):[^\S\n]+(?P<val>.+?)'
-                    '(?=(\n\\S):?)',
-            'country': r'(Country):[^\S\n]+(?P<val>.+?)\n',
-            'state': r'(StateProv):[^\S\n]+(?P<val>.+?)\n',
-            'city': r'(City):[^\S\n]+(?P<val>.+?)\n',
-            'address': r'(Address):[^\S\n]+(?P<val>.+?)(?=(\n\S):?)',
-            'postal_code': r'(PostalCode):[^\S\n]+(?P<val>.+?)\n',
-            'emails': (
-                r'.+?:.*?[^\S\n]+(?P<val>[\w\-\.]+?@[\w\-\.]+\.[\w\-]+)('
-                '[^\\S\n]+.*?)*?\n'
-            ),
-            'created': r'(RegDate):[^\S\n]+(?P<val>.+?)\n',
-            'updated': r'(Updated):[^\S\n]+(?P<val>.+?)\n',
-        },
-        'dt_format': '%Y-%m-%d'
-    },
-    'ripencc': {
-        'server': 'whois.ripe.net',
-        'fields': {
-            'name': r'(netname):[^\S\n]+(?P<val>.+?)\n',
-            'handle': r'(nic-hdl):[^\S\n]+(?P<val>.+?)\n',
-            'description': r'(descr):[^\S\n]+(?P<val>.+?)(?=(\n\S):?)',
-            'country': r'(country):[^\S\n]+(?P<val>.+?)\n',
-            'address': r'(address):[^\S\n]+(?P<val>.+?)(?=(\n\S):?)',
-            'emails': (
-                r'.+?:.*?[^\S\n]+(?P<val>[\w\-\.]+?@[\w\-\.]+\.[\w\-]+)('
-                '[^\\S\n]+.*?)*?\n'
-            ),
-            'created': (
-                r'(created):[^\S\n]+(?P<val>[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]'
-                '{2}:[0-9]{2}:[0-9]{2}Z).*?\n'
-            ),
-            'updated': (
-                r'(last-modified):[^\S\n]+(?P<val>[0-9]{4}-[0-9]{2}-[0-9]{2}T'
-                '[0-9]{2}:[0-9]{2}:[0-9]{2}Z).*?\n'
-            )
-        },
-        'dt_format': '%Y-%m-%dT%H:%M:%SZ'
-    },
-    'apnic': {
-        'server': 'whois.apnic.net',
-        'fields': {
-            'name': r'(netname):[^\S\n]+(?P<val>.+?)\n',
-            'handle': r'(nic-hdl):[^\S\n]+(?P<val>.+?)\n',
-            'description': r'(descr):[^\S\n]+(?P<val>.+?)(?=(\n\S):?)',
-            'country': r'(country):[^\S\n]+(?P<val>.+?)\n',
-            'address': r'(address):[^\S\n]+(?P<val>.+?)(?=(\n\S):?)',
-            'emails': (
-                r'.+?:.*?[^\S\n]+(?P<val>[\w\-\.]+?@[\w\-\.]+\.[\w\-]+)('
-                '[^\\S\n]+.*?)*?\n'
-            ),
-            'updated': r'(changed):[^\S\n]+.*(?P<val>[0-9]{8}).*?\n'
-        },
-        'dt_format': '%Y%m%d'
-    },
-    'lacnic': {
-        'server': 'whois.lacnic.net',
-        'fields': {
-            'handle': r'(nic-hdl):[^\S\n]+(?P<val>.+?)\n',
-            'description': r'(owner):[^\S\n]+(?P<val>.+?)(?=(\n\S):?)',
-            'country': r'(country):[^\S\n]+(?P<val>.+?)\n',
-            'emails': (
-                r'.+?:.*?[^\S\n]+(?P<val>[\w\-\.]+?@[\w\-\.]+\.[\w\-]+)('
-                '[^\\S\n]+.*?)*?\n'
-            ),
-            'created': r'(created):[^\S\n]+(?P<val>[0-9]{8}).*?\n',
-            'updated': r'(changed):[^\S\n]+(?P<val>[0-9]{8}).*?\n'
-        },
-        'dt_format': '%Y%m%d'
-    },
-    'afrinic': {
-        'server': 'whois.afrinic.net',
-        'fields': {
-            'name': r'(netname):[^\S\n]+(?P<val>.+?)\n',
-            'handle': r'(nic-hdl):[^\S\n]+(?P<val>.+?)\n',
-            'description': r'(descr):[^\S\n]+(?P<val>.+?)(?=(\n\S):?)',
-            'country': r'(country):[^\S\n]+(?P<val>.+?)\n',
-            'address': r'(address):[^\S\n]+(?P<val>.+?)(?=(\n\S):?)',
-            'emails': (
-                r'.+?:.*?[^\S\n]+(?P<val>[\w\-\.]+?@[\w\-\.]+\.[\w\-]+)('
-                '[^\\S\n]+.*?)*?\n'
-            ),
-        }
-    }
-}
-
-RWHOIS = {
-    'fields': {
-        'cidr': r'(network:IP-Network):(?P<val>.+?)\n',
-        'name': r'(network:ID):(?P<val>.+?)\n',
-        'description': (
-            r'(network:(Org-Name|Organization(;I)?)):(?P<val>.+?)\n'
-        ),
-        'country': r'(network:(Country|Country-Code)):(?P<val>.+?)\n',
-        'state': r'(network:State):(?P<val>.+?)\n',
-        'city': r'(network:City):(?P<val>.+?)\n',
-        'address': r'(network:Street-Address):(?P<val>.+?)\n',
-        'postal_code': r'(network:Postal-Code):(?P<val>.+?)\n',
-        'emails': (
-            r'.+?:.*?[^\S\n]+(?P<val>[\w\-\.]+?@[\w\-\.]+\.[\w\-]+)('
-            '[^\\S\n]+.*?)*?\n'
-        ),
-        'created': r'(network:Created):(?P<val>.+?)\n',
-        'updated': r'(network:Updated):(?P<val>.+?)\n'
-    }
-}
-
-ASN_REFERRALS = {
-    'whois://whois.ripe.net': 'ripencc',
-    'whois://whois.apnic.net': 'apnic',
-    'whois://whois.lacnic.net': 'lacnic',
-    'whois://whois.afrinic.net': 'afrinic',
-}
-
-
-class Whois:
-    """
-    The class for parsing via whois
-
-    Args:
-        net (:obj:`ipwhois.net.Net`): The network object.
-
-    Raises:
-        NetError: The parameter provided is not an instance of
-            ipwhois.net.Net
-        IPDefinedError: The address provided is defined (does not need to be
-            resolved).
-    """
-
-    def __init__(self, net):
-
-        from .net import Net
-
-        # ipwhois.net.Net validation
-        if isinstance(net, Net):
-
-            self._net = net
-
-        else:
-
-            raise NetError('The provided net parameter is not an instance of '
-                           'ipwhois.net.Net')
-
-    def parse_fields(self, response, fields_dict, net_start=None,
-                     net_end=None, dt_format=None, field_list=None):
-        """
-        The function for parsing whois fields from a data input.
-
-        Args:
-            response (:obj:`str`): The response from the whois/rwhois server.
-            fields_dict (:obj:`dict`): The mapping of fields to regex search
-                values (required).
-            net_start (:obj:`int`): The starting point of the network (if
-                parsing multiple networks). Defaults to None.
-            net_end (:obj:`int`): The ending point of the network (if parsing
-                multiple networks). Defaults to None.
-            dt_format (:obj:`str`): The format of datetime fields if known.
-                Defaults to None.
-            field_list (:obj:`list` of :obj:`str`): If provided, fields to
-                parse. Defaults to:
-
-                ::
-
-                    ['name', 'handle', 'description', 'country', 'state',
-                    'city', 'address', 'postal_code', 'emails', 'created',
-                    'updated']
-
-        Returns:
-            dict: A dictionary of fields provided in fields_dict, mapping to
-                the results of the regex searches.
-        """
-
-        ret = {}
-
-        if not field_list:
-
-            field_list = ['name', 'handle', 'description', 'country', 'state',
-                          'city', 'address', 'postal_code', 'emails',
-                          'created', 'updated']
-
-        generate = ((field, pattern) for (field, pattern) in
-                    fields_dict.items() if field in field_list)
-
-        for field, pattern in generate:
-
-            pattern = re.compile(
-                str(pattern),
-                re.DOTALL
-            )
-
-            if net_start is not None:
-
-                match = pattern.finditer(response, net_end, net_start)
-
-            elif net_end is not None:
-
-                match = pattern.finditer(response, net_end)
-
-            else:
-
-                match = pattern.finditer(response)
-
-            values = []
-            sub_section_end = None
-            for m in match:
-
-                if sub_section_end:
-
-                    if field not in (
-                        'emails'
-                    ) and (sub_section_end != (m.start() - 1)):
-
-                        break
-
-                try:
-
-                    values.append(m.group('val').strip())
-
-                except IndexError:
-
-                    pass
-
-                sub_section_end = m.end()
-
-            if len(values) > 0:
-
-                value = None
-                try:
-
-                    if field == 'country':
-
-                        value = values[0].upper()
-
-                    elif field in ['created', 'updated'] and dt_format:
-
-                        value = datetime.strptime(
-                            values[0],
-                            str(dt_format)).isoformat('T')
-
-                    elif field in ['emails']:
-
-                        value = list(unique_everseen(values))
-
-                    else:
-
-                        values = unique_everseen(values)
-                        value = '\n'.join(values).strip()
-
-                except ValueError as e:
-
-                    log.debug('Whois field parsing failed for {0}: {1}'.format(
-                        field, e))
-                    pass
-
-                ret[field] = value
-
-        return ret
-
-    def get_nets_arin(self, response):
-        """
-        The function for parsing network blocks from ARIN whois data.
-
-        Args:
-            response (:obj:`str`): The response from the ARIN whois server.
-
-        Returns:
-            list of dict: Mapping of networks with start and end positions.
-
-            ::
-
-                [{
-                    'cidr' (str) - The network routing block
-                    'start' (int) - The starting point of the network
-                    'end' (int) - The endpoint point of the network
-                }]
-        """
-
-        nets = []
-
-        # Find the first NetRange value.
-        pattern = re.compile(
-            r'^NetRange:[^\S\n]+(.+)$',
-            re.MULTILINE
-        )
-        temp = pattern.search(response)
-        net_range = None
-        net_range_start = None
-        if temp is not None:
-            net_range = temp.group(1).strip()
-            net_range_start = temp.start()
-
-        # Iterate through all of the networks found, storing the CIDR value
-        # and the start and end positions.
-        for match in re.finditer(
-            r'^CIDR:[^\S\n]+(.+?,[^\S\n].+|.+)$',
-            response,
-            re.MULTILINE
-        ):
-
-            try:
-
-                net = copy.deepcopy(BASE_NET)
-
-                if len(nets) > 0:
-                    temp = pattern.search(response, match.start())
-                    net_range = None
-                    net_range_start = None
-                    if temp is not None:
-                        net_range = temp.group(1).strip()
-                        net_range_start = temp.start()
-
-                if net_range is not None:
-                    if net_range_start < match.start() or len(nets) > 0:
-
-                        try:
-
-                            net['range'] = '{0} - {1}'.format(
-                                ip_network(net_range)[0].__str__(),
-                                ip_network(net_range)[-1].__str__()
-                            ) if '/' in net_range else net_range
-
-                        except ValueError:  # pragma: no cover
-
-                            net['range'] = net_range
-
-                net['cidr'] = ', '.join(
-                    [ip_network(c.strip()).__str__()
-                     for c in match.group(1).split(', ')]
-                )
-                net['start'] = match.start()
-                net['end'] = match.end()
-                nets.append(net)
-
-            except ValueError:
-
-                pass
-
-        return nets
-
-    def get_nets_lacnic(self, response):
-        """
-        The function for parsing network blocks from LACNIC whois data.
-
-        Args:
-            response (:obj:`str`): The response from the LACNIC whois server.
-
-        Returns:
-            list of dict: Mapping of networks with start and end positions.
-
-            ::
-
-                [{
-                    'cidr' (str) - The network routing block
-                    'start' (int) - The starting point of the network
-                    'end' (int) - The endpoint point of the network
-                }]
-        """
-
-        nets = []
-
-        # Iterate through all of the networks found, storing the CIDR value
-        # and the start and end positions.
-        for match in re.finditer(
-            r'^(inetnum|inet6num|route):[^\S\n]+(.+?,[^\S\n].+|.+)$',
-            response,
-            re.MULTILINE
-        ):
-
-            try:
-
-                net = copy.deepcopy(BASE_NET)
-                net_range = match.group(2).strip()
-
-                try:
-
-                    net['range'] = net['range'] = '{0} - {1}'.format(
-                        ip_network(net_range)[0].__str__(),
-                        ip_network(net_range)[-1].__str__()
-                    ) if '/' in net_range else net_range
-
-                except ValueError:  # pragma: no cover
-
-                    net['range'] = net_range
-
-                temp = []
-                for addr in net_range.split(', '):
-
-                    count = addr.count('.')
-                    if count != 0 and count < 4:
-
-                        addr_split = addr.strip().split('/')
-                        for i in range(count + 1, 4):
-                            addr_split[0] += '.0'
-
-                        addr = '/'.join(addr_split)
-
-                    temp.append(ip_network(addr.strip()).__str__())
-
-                net['cidr'] = ', '.join(temp)
-                net['start'] = match.start()
-                net['end'] = match.end()
-                nets.append(net)
-
-            except ValueError:
-
-                pass
-
-        return nets
-
-    def get_nets_other(self, response):
-        """
-        The function for parsing network blocks from generic whois data.
-
-        Args:
-            response (:obj:`str`): The response from the whois/rwhois server.
-
-        Returns:
-            list of dict: Mapping of networks with start and end positions.
-
-            ::
-
-                [{
-                    'cidr' (str) - The network routing block
-                    'start' (int) - The starting point of the network
-                    'end' (int) - The endpoint point of the network
-                }]
-        """
-
-        nets = []
-
-        # Iterate through all of the networks found, storing the CIDR value
-        # and the start and end positions.
-        for match in re.finditer(
-            r'^(inetnum|inet6num|route):[^\S\n]+((.+?)[^\S\n]-[^\S\n](.+)|'
-                '.+)$',
-            response,
-            re.MULTILINE
-        ):
-
-            try:
-
-                net = copy.deepcopy(BASE_NET)
-                net_range = match.group(2).strip()
-
-                try:
-
-                    net['range'] = net['range'] = '{0} - {1}'.format(
-                        ip_network(net_range)[0].__str__(),
-                        ip_network(net_range)[-1].__str__()
-                    ) if '/' in net_range else net_range
-
-                except ValueError:  # pragma: no cover
-
-                    net['range'] = net_range
-
-                if match.group(3) and match.group(4):
-
-                    addrs = []
-                    addrs.extend(summarize_address_range(
-                        ip_address(match.group(3).strip()),
-                        ip_address(match.group(4).strip())))
-
-                    cidr = ', '.join(
-                        [i.__str__() for i in collapse_addresses(addrs)]
-                    )
-
-                else:
-
-                    cidr = ip_network(net_range).__str__()
-
-                net['cidr'] = cidr
-                net['start'] = match.start()
-                net['end'] = match.end()
-                nets.append(net)
-
-            except (ValueError, TypeError):
-
-                pass
-
-        return nets
-
-    def lookup(self, inc_raw=False, retry_count=3, response=None,
-               get_referral=False, extra_blacklist=None,
-               ignore_referral_errors=False, asn_data=None,
-               field_list=None, is_offline=False):
-        """
-        The function for retrieving and parsing whois information for an IP
-        address via port 43/tcp (WHOIS).
-
-        Args:
-            inc_raw (:obj:`bool`, optional): Whether to include the raw
-                results in the returned dictionary. Defaults to False.
-            retry_count (:obj:`int`): The number of times to retry in case
-                socket errors, timeouts, connection resets, etc. are
-                encountered. Defaults to 3.
-            response (:obj:`str`): Optional response object, this bypasses the
-                NIR lookup. Required when is_offline=True.
-            get_referral (:obj:`bool`): Whether to retrieve referral whois
-                information, if available. Defaults to False.
-            extra_blacklist (:obj:`list`): Blacklisted whois servers in
-                addition to the global BLACKLIST. Defaults to None.
-            ignore_referral_errors (:obj:`bool`): Whether to ignore and
-                continue when an exception is encountered on referral whois
-                lookups. Defaults to False.
-            asn_data (:obj:`dict`): Result from
-                :obj:`ipwhois.asn.IPASN.lookup` (required).
-            field_list (:obj:`list` of :obj:`str`): If provided, fields to
-                parse. Defaults to:
-
-                ::
-
-                    ['name', 'handle', 'description', 'country', 'state',
-                    'city', 'address', 'postal_code', 'emails', 'created',
-                    'updated']
-
-            is_offline (:obj:`bool`): Whether to perform lookups offline. If
-                True, response and asn_data must be provided. Primarily used
-                for testing. Defaults to False.
-
-        Returns:
-            dict: The IP whois lookup results
-
-            ::
-
-                {
-                    'query' (str) - The IP address
-                    'asn' (str) - The Autonomous System Number
-                    'asn_date' (str) - The ASN Allocation date
-                    'asn_registry' (str) - The assigned ASN registry
-                    'asn_cidr' (str) - The assigned ASN CIDR
-                    'asn_country_code' (str) - The assigned ASN country code
-                    'asn_description' (str) - The ASN description
-                    'nets' (list) - Dictionaries containing network
-                        information which consists of the fields listed in the
-                        ipwhois.whois.RIR_WHOIS dictionary.
-                    'raw' (str) - Raw whois results if the inc_raw parameter
-                        is True.
-                    'referral' (dict) - Referral whois information if
-                        get_referral is True and the server is not blacklisted.
-                        Consists of fields listed in the ipwhois.whois.RWHOIS
-                        dictionary.
-                    'raw_referral' (str) - Raw referral whois results if the
-                        inc_raw parameter is True.
-                }
-        """
-
-        # Create the return dictionary.
-        results = {
-            'query': self._net.address_str,
-            'nets': [],
-            'raw': None,
-            'referral': None,
-            'raw_referral': None
-        }
-
-        # The referral server and port. Only used if get_referral is True.
-        referral_server = None
-        referral_port = 0
-
-        # Only fetch the response if we haven't already.
-        if response is None or (not is_offline and
-                                asn_data['asn_registry'] != 'arin'):
-
-            log.debug('Response not given, perform WHOIS lookup for {0}'
-                      .format(self._net.address_str))
-
-            # Retrieve the whois data.
-            response = self._net.get_whois(
-                asn_registry=asn_data['asn_registry'], retry_count=retry_count,
-                extra_blacklist=extra_blacklist
-            )
-
-            if get_referral:
-
-                # Search for a referral server.
-                for match in re.finditer(
-                    r'^ReferralServer:[^\S\n]+(.+:[0-9]+)$',
-                    response,
-                    re.MULTILINE
-                ):
-
-                    try:
-
-                        temp = match.group(1)
-                        if 'rwhois://' not in temp:  # pragma: no cover
-                            raise ValueError
-
-                        temp = temp.replace('rwhois://', '').split(':')
-
-                        if int(temp[1]) > 65535:  # pragma: no cover
-                            raise ValueError
-
-                        referral_server = temp[0]
-                        referral_port = int(temp[1])
-
-                    except (ValueError, KeyError):  # pragma: no cover
-
-                        continue
-
-                    break
-
-        # Retrieve the referral whois data.
-        if get_referral and referral_server:
-
-            log.debug('Perform referral WHOIS lookup')
-
-            response_ref = None
-
-            try:
-
-                response_ref = self._net.get_whois(
-                    asn_registry='', retry_count=retry_count,
-                    server=referral_server, port=referral_port,
-                    extra_blacklist=extra_blacklist
-                )
-
-            except (BlacklistError, WhoisLookupError):
-
-                if ignore_referral_errors:
-
-                    pass
-
-                else:
-
-                    raise
-
-            if response_ref:
-
-                log.debug('Parsing referral WHOIS data')
-
-                if inc_raw:
-
-                    results['raw_referral'] = response_ref
-
-                temp_rnet = self.parse_fields(
-                    response_ref,
-                    RWHOIS['fields'],
-                    field_list=field_list
-                )
-
-                # Add the networks to the return dictionary.
-                results['referral'] = temp_rnet
-
-        # If inc_raw parameter is True, add the response to return dictionary.
-        if inc_raw:
-
-            results['raw'] = response
-
-        nets = []
-
-        if asn_data['asn_registry'] == 'arin':
-
-            nets_response = self.get_nets_arin(response)
-
-        elif asn_data['asn_registry'] == 'lacnic':
-
-            nets_response = self.get_nets_lacnic(response)
-
-        else:
-
-            nets_response = self.get_nets_other(response)
-
-        nets.extend(nets_response)
-
-        # Iterate through all of the network sections and parse out the
-        # appropriate fields for each.
-        log.debug('Parsing WHOIS data')
-        for index, net in enumerate(nets):
-
-            section_end = None
-            if index + 1 < len(nets):
-
-                section_end = nets[index + 1]['start']
-
-            try:
-
-                dt_format = RIR_WHOIS[results['asn_registry']]['dt_format']
-
-            except KeyError:
-
-                dt_format = None
-
-            temp_net = self.parse_fields(
-                response,
-                RIR_WHOIS[asn_data['asn_registry']]['fields'],
-                section_end,
-                net['end'],
-                dt_format,
-                field_list
-            )
-
-            # Merge the net dictionaries.
-            net.update(temp_net)
-
-            # The start and end values are no longer needed.
-            del net['start'], net['end']
-
-        # Add the networks to the return dictionary.
-        results['nets'] = nets
-
-        return results
diff --git a/lib/jaraco/collections/__init__.py b/lib/jaraco/collections/__init__.py
deleted file mode 100644
index 5c276da9..00000000
--- a/lib/jaraco/collections/__init__.py
+++ /dev/null
@@ -1,1062 +0,0 @@
-from __future__ import annotations
-
-import collections.abc
-import copy
-import functools
-import itertools
-import operator
-import random
-import re
-from collections.abc import Container, Iterable, Mapping
-from typing import Any, Callable, Union
-
-import jaraco.text
-
-_Matchable = Union[Callable, Container, Iterable, re.Pattern]
-
-
-def _dispatch(obj: _Matchable) -> Callable:
-    # can't rely on singledispatch for Union[Container, Iterable]
-    # due to ambiguity
-    # (https://peps.python.org/pep-0443/#abstract-base-classes).
-    if isinstance(obj, re.Pattern):
-        return obj.fullmatch
-    if not isinstance(obj, Callable):  # type: ignore
-        if not isinstance(obj, Container):
-            obj = set(obj)  # type: ignore
-        obj = obj.__contains__
-    return obj  # type: ignore
-
-
-class Projection(collections.abc.Mapping):
-    """
-    Project a set of keys over a mapping
-
-    >>> sample = {'a': 1, 'b': 2, 'c': 3}
-    >>> prj = Projection(['a', 'c', 'd'], sample)
-    >>> dict(prj)
-    {'a': 1, 'c': 3}
-
-    Projection also accepts an iterable or callable or pattern.
-
-    >>> iter_prj = Projection(iter('acd'), sample)
-    >>> call_prj = Projection(lambda k: ord(k) in (97, 99, 100), sample)
-    >>> pat_prj = Projection(re.compile(r'[acd]'), sample)
-    >>> prj == iter_prj == call_prj == pat_prj
-    True
-
-    Keys should only appear if they were specified and exist in the space.
-    Order is retained.
-
-    >>> list(prj)
-    ['a', 'c']
-
-    Attempting to access a key not in the projection
-    results in a KeyError.
-
-    >>> prj['b']
-    Traceback (most recent call last):
-    ...
-    KeyError: 'b'
-
-    Use the projection to update another dict.
-
-    >>> target = {'a': 2, 'b': 2}
-    >>> target.update(prj)
-    >>> target
-    {'a': 1, 'b': 2, 'c': 3}
-
-    Projection keeps a reference to the original dict, so
-    modifying the original dict may modify the Projection.
-
-    >>> del sample['a']
-    >>> dict(prj)
-    {'c': 3}
-    """
-
-    def __init__(self, keys: _Matchable, space: Mapping):
-        self._match = _dispatch(keys)
-        self._space = space
-
-    def __getitem__(self, key):
-        if not self._match(key):
-            raise KeyError(key)
-        return self._space[key]
-
-    def _keys_resolved(self):
-        return filter(self._match, self._space)
-
-    def __iter__(self):
-        return self._keys_resolved()
-
-    def __len__(self):
-        return len(tuple(self._keys_resolved()))
-
-
-class Mask(Projection):
-    """
-    The inverse of a :class:`Projection`, masking out keys.
-
-    >>> sample = {'a': 1, 'b': 2, 'c': 3}
-    >>> msk = Mask(['a', 'c', 'd'], sample)
-    >>> dict(msk)
-    {'b': 2}
-    """
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        # self._match = compose(operator.not_, self._match)
-        self._match = lambda key, orig=self._match: not orig(key)
-
-
-def dict_map(function, dictionary):
-    """
-    Return a new dict with function applied to values of dictionary.
-
-    >>> dict_map(lambda x: x+1, dict(a=1, b=2))
-    {'a': 2, 'b': 3}
-    """
-    return dict((key, function(value)) for key, value in dictionary.items())
-
-
-class RangeMap(dict):
-    """
-    A dictionary-like object that uses the keys as bounds for a range.
-    Inclusion of the value for that range is determined by the
-    key_match_comparator, which defaults to less-than-or-equal.
-    A value is returned for a key if it is the first key that matches in
-    the sorted list of keys.
-
-    One may supply keyword parameters to be passed to the sort function used
-    to sort keys (i.e. key, reverse) as sort_params.
-
-    Create a map that maps 1-3 -> 'a', 4-6 -> 'b'
-
-    >>> r = RangeMap({3: 'a', 6: 'b'})  # boy, that was easy
-    >>> r[1], r[2], r[3], r[4], r[5], r[6]
-    ('a', 'a', 'a', 'b', 'b', 'b')
-
-    Even float values should work so long as the comparison operator
-    supports it.
-
-    >>> r[4.5]
-    'b'
-
-    Notice that the way rangemap is defined, it must be open-ended
-    on one side.
-
-    >>> r[0]
-    'a'
-    >>> r[-1]
-    'a'
-
-    One can close the open-end of the RangeMap by using undefined_value
-
-    >>> r = RangeMap({0: RangeMap.undefined_value, 3: 'a', 6: 'b'})
-    >>> r[0]
-    Traceback (most recent call last):
-    ...
-    KeyError: 0
-
-    One can get the first or last elements in the range by using RangeMap.Item
-
-    >>> last_item = RangeMap.Item(-1)
-    >>> r[last_item]
-    'b'
-
-    .last_item is a shortcut for Item(-1)
-
-    >>> r[RangeMap.last_item]
-    'b'
-
-    Sometimes it's useful to find the bounds for a RangeMap
-
-    >>> r.bounds()
-    (0, 6)
-
-    RangeMap supports .get(key, default)
-
-    >>> r.get(0, 'not found')
-    'not found'
-
-    >>> r.get(7, 'not found')
-    'not found'
-
-    One often wishes to define the ranges by their left-most values,
-    which requires use of sort params and a key_match_comparator.
-
-    >>> r = RangeMap({1: 'a', 4: 'b'},
-    ...     sort_params=dict(reverse=True),
-    ...     key_match_comparator=operator.ge)
-    >>> r[1], r[2], r[3], r[4], r[5], r[6]
-    ('a', 'a', 'a', 'b', 'b', 'b')
-
-    That wasn't nearly as easy as before, so an alternate constructor
-    is provided:
-
-    >>> r = RangeMap.left({1: 'a', 4: 'b', 7: RangeMap.undefined_value})
-    >>> r[1], r[2], r[3], r[4], r[5], r[6]
-    ('a', 'a', 'a', 'b', 'b', 'b')
-
-    """
-
-    def __init__(
-        self,
-        source,
-        sort_params: Mapping[str, Any] = {},
-        key_match_comparator=operator.le,
-    ):
-        dict.__init__(self, source)
-        self.sort_params = sort_params
-        self.match = key_match_comparator
-
-    @classmethod
-    def left(cls, source):
-        return cls(
-            source, sort_params=dict(reverse=True), key_match_comparator=operator.ge
-        )
-
-    def __getitem__(self, item):
-        sorted_keys = sorted(self.keys(), **self.sort_params)
-        if isinstance(item, RangeMap.Item):
-            result = self.__getitem__(sorted_keys[item])
-        else:
-            key = self._find_first_match_(sorted_keys, item)
-            result = dict.__getitem__(self, key)
-            if result is RangeMap.undefined_value:
-                raise KeyError(key)
-        return result
-
-    def get(self, key, default=None):
-        """
-        Return the value for key if key is in the dictionary, else default.
-        If default is not given, it defaults to None, so that this method
-        never raises a KeyError.
-        """
-        try:
-            return self[key]
-        except KeyError:
-            return default
-
-    def _find_first_match_(self, keys, item):
-        is_match = functools.partial(self.match, item)
-        matches = list(filter(is_match, keys))
-        if matches:
-            return matches[0]
-        raise KeyError(item)
-
-    def bounds(self):
-        sorted_keys = sorted(self.keys(), **self.sort_params)
-        return (sorted_keys[RangeMap.first_item], sorted_keys[RangeMap.last_item])
-
-    # some special values for the RangeMap
-    undefined_value = type('RangeValueUndefined', (), {})()
-
-    class Item(int):
-        "RangeMap Item"
-
-    first_item = Item(0)
-    last_item = Item(-1)
-
-
-def __identity(x):
-    return x
-
-
-def sorted_items(d, key=__identity, reverse=False):
-    """
-    Return the items of the dictionary sorted by the keys.
-
-    >>> sample = dict(foo=20, bar=42, baz=10)
-    >>> tuple(sorted_items(sample))
-    (('bar', 42), ('baz', 10), ('foo', 20))
-
-    >>> reverse_string = lambda s: ''.join(reversed(s))
-    >>> tuple(sorted_items(sample, key=reverse_string))
-    (('foo', 20), ('bar', 42), ('baz', 10))
-
-    >>> tuple(sorted_items(sample, reverse=True))
-    (('foo', 20), ('baz', 10), ('bar', 42))
-    """
-
-    # wrap the key func so it operates on the first element of each item
-    def pairkey_key(item):
-        return key(item[0])
-
-    return sorted(d.items(), key=pairkey_key, reverse=reverse)
-
-
-class KeyTransformingDict(dict):
-    """
-    A dict subclass that transforms the keys before they're used.
-    Subclasses may override the default transform_key to customize behavior.
-    """
-
-    @staticmethod
-    def transform_key(key):  # pragma: nocover
-        return key
-
-    def __init__(self, *args, **kargs):
-        super().__init__()
-        # build a dictionary using the default constructs
-        d = dict(*args, **kargs)
-        # build this dictionary using transformed keys.
-        for item in d.items():
-            self.__setitem__(*item)
-
-    def __setitem__(self, key, val):
-        key = self.transform_key(key)
-        super().__setitem__(key, val)
-
-    def __getitem__(self, key):
-        key = self.transform_key(key)
-        return super().__getitem__(key)
-
-    def __contains__(self, key):
-        key = self.transform_key(key)
-        return super().__contains__(key)
-
-    def __delitem__(self, key):
-        key = self.transform_key(key)
-        return super().__delitem__(key)
-
-    def get(self, key, *args, **kwargs):
-        key = self.transform_key(key)
-        return super().get(key, *args, **kwargs)
-
-    def setdefault(self, key, *args, **kwargs):
-        key = self.transform_key(key)
-        return super().setdefault(key, *args, **kwargs)
-
-    def pop(self, key, *args, **kwargs):
-        key = self.transform_key(key)
-        return super().pop(key, *args, **kwargs)
-
-    def matching_key_for(self, key):
-        """
-        Given a key, return the actual key stored in self that matches.
-        Raise KeyError if the key isn't found.
-        """
-        try:
-            return next(e_key for e_key in self.keys() if e_key == key)
-        except StopIteration as err:
-            raise KeyError(key) from err
-
-
-class FoldedCaseKeyedDict(KeyTransformingDict):
-    """
-    A case-insensitive dictionary (keys are compared as insensitive
-    if they are strings).
-
-    >>> d = FoldedCaseKeyedDict()
-    >>> d['heLlo'] = 'world'
-    >>> list(d.keys()) == ['heLlo']
-    True
-    >>> list(d.values()) == ['world']
-    True
-    >>> d['hello'] == 'world'
-    True
-    >>> 'hello' in d
-    True
-    >>> 'HELLO' in d
-    True
-    >>> print(repr(FoldedCaseKeyedDict({'heLlo': 'world'})))
-    {'heLlo': 'world'}
-    >>> d = FoldedCaseKeyedDict({'heLlo': 'world'})
-    >>> print(d['hello'])
-    world
-    >>> print(d['Hello'])
-    world
-    >>> list(d.keys())
-    ['heLlo']
-    >>> d = FoldedCaseKeyedDict({'heLlo': 'world', 'Hello': 'world'})
-    >>> list(d.values())
-    ['world']
-    >>> key, = d.keys()
-    >>> key in ['heLlo', 'Hello']
-    True
-    >>> del d['HELLO']
-    >>> d
-    {}
-
-    get should work
-
-    >>> d['Sumthin'] = 'else'
-    >>> d.get('SUMTHIN')
-    'else'
-    >>> d.get('OTHER', 'thing')
-    'thing'
-    >>> del d['sumthin']
-
-    setdefault should also work
-
-    >>> d['This'] = 'that'
-    >>> print(d.setdefault('this', 'other'))
-    that
-    >>> len(d)
-    1
-    >>> print(d['this'])
-    that
-    >>> print(d.setdefault('That', 'other'))
-    other
-    >>> print(d['THAT'])
-    other
-
-    Make it pop!
-
-    >>> print(d.pop('THAT'))
-    other
-
-    To retrieve the key in its originally-supplied form, use matching_key_for
-
-    >>> print(d.matching_key_for('this'))
-    This
-
-    >>> d.matching_key_for('missing')
-    Traceback (most recent call last):
-    ...
-    KeyError: 'missing'
-    """
-
-    @staticmethod
-    def transform_key(key):
-        return jaraco.text.FoldedCase(key)
-
-
-class DictAdapter:
-    """
-    Provide a getitem interface for attributes of an object.
-
-    Let's say you want to get at the string.lowercase property in a formatted
-    string. It's easy with DictAdapter.
-
-    >>> import string
-    >>> print("lowercase is %(ascii_lowercase)s" % DictAdapter(string))
-    lowercase is abcdefghijklmnopqrstuvwxyz
-    """
-
-    def __init__(self, wrapped_ob):
-        self.object = wrapped_ob
-
-    def __getitem__(self, name):
-        return getattr(self.object, name)
-
-
-class ItemsAsAttributes:
-    """
-    Mix-in class to enable a mapping object to provide items as
-    attributes.
-
-    >>> C = type('C', (dict, ItemsAsAttributes), dict())
-    >>> i = C()
-    >>> i['foo'] = 'bar'
-    >>> i.foo
-    'bar'
-
-    Natural attribute access takes precedence
-
-    >>> i.foo = 'henry'
-    >>> i.foo
-    'henry'
-
-    But as you might expect, the mapping functionality is preserved.
-
-    >>> i['foo']
-    'bar'
-
-    A normal attribute error should be raised if an attribute is
-    requested that doesn't exist.
-
-    >>> i.missing
-    Traceback (most recent call last):
-    ...
-    AttributeError: 'C' object has no attribute 'missing'
-
-    It also works on dicts that customize __getitem__
-
-    >>> missing_func = lambda self, key: 'missing item'
-    >>> C = type(
-    ...     'C',
-    ...     (dict, ItemsAsAttributes),
-    ...     dict(__missing__ = missing_func),
-    ... )
-    >>> i = C()
-    >>> i.missing
-    'missing item'
-    >>> i.foo
-    'missing item'
-    """
-
-    def __getattr__(self, key):
-        try:
-            return getattr(super(), key)
-        except AttributeError as e:
-            # attempt to get the value from the mapping (return self[key])
-            #  but be careful not to lose the original exception context.
-            noval = object()
-
-            def _safe_getitem(cont, key, missing_result):
-                try:
-                    return cont[key]
-                except KeyError:
-                    return missing_result
-
-            result = _safe_getitem(self, key, noval)
-            if result is not noval:
-                return result
-            # raise the original exception, but use the original class
-            #  name, not 'super'.
-            (message,) = e.args
-            message = message.replace('super', self.__class__.__name__, 1)
-            e.args = (message,)
-            raise
-
-
-def invert_map(map):
-    """
-    Given a dictionary, return another dictionary with keys and values
-    switched. If any of the values resolve to the same key, raises
-    a ValueError.
-
-    >>> numbers = dict(a=1, b=2, c=3)
-    >>> letters = invert_map(numbers)
-    >>> letters[1]
-    'a'
-    >>> numbers['d'] = 3
-    >>> invert_map(numbers)
-    Traceback (most recent call last):
-    ...
-    ValueError: Key conflict in inverted mapping
-    """
-    res = dict((v, k) for k, v in map.items())
-    if not len(res) == len(map):
-        raise ValueError('Key conflict in inverted mapping')
-    return res
-
-
-class IdentityOverrideMap(dict):
-    """
-    A dictionary that by default maps each key to itself, but otherwise
-    acts like a normal dictionary.
-
-    >>> d = IdentityOverrideMap()
-    >>> d[42]
-    42
-    >>> d['speed'] = 'speedo'
-    >>> print(d['speed'])
-    speedo
-    """
-
-    def __missing__(self, key):
-        return key
-
-
-class DictStack(list, collections.abc.MutableMapping):
-    """
-    A stack of dictionaries that behaves as a view on those dictionaries,
-    giving preference to the last.
-
-    >>> stack = DictStack([dict(a=1, c=2), dict(b=2, a=2)])
-    >>> stack['a']
-    2
-    >>> stack['b']
-    2
-    >>> stack['c']
-    2
-    >>> len(stack)
-    3
-    >>> stack.push(dict(a=3))
-    >>> stack['a']
-    3
-    >>> stack['a'] = 4
-    >>> set(stack.keys()) == set(['a', 'b', 'c'])
-    True
-    >>> set(stack.items()) == set([('a', 4), ('b', 2), ('c', 2)])
-    True
-    >>> dict(**stack) == dict(stack) == dict(a=4, c=2, b=2)
-    True
-    >>> d = stack.pop()
-    >>> stack['a']
-    2
-    >>> d = stack.pop()
-    >>> stack['a']
-    1
-    >>> stack.get('b', None)
-    >>> 'c' in stack
-    True
-    >>> del stack['c']
-    >>> dict(stack)
-    {'a': 1}
-    """
-
-    def __iter__(self):
-        dicts = list.__iter__(self)
-        return iter(set(itertools.chain.from_iterable(c.keys() for c in dicts)))
-
-    def __getitem__(self, key):
-        for scope in reversed(tuple(list.__iter__(self))):
-            if key in scope:
-                return scope[key]
-        raise KeyError(key)
-
-    push = list.append
-
-    def __contains__(self, other):
-        return collections.abc.Mapping.__contains__(self, other)
-
-    def __len__(self):
-        return len(list(iter(self)))
-
-    def __setitem__(self, key, item):
-        last = list.__getitem__(self, -1)
-        return last.__setitem__(key, item)
-
-    def __delitem__(self, key):
-        last = list.__getitem__(self, -1)
-        return last.__delitem__(key)
-
-    # workaround for mypy confusion
-    def pop(self, *args, **kwargs):
-        return list.pop(self, *args, **kwargs)
-
-
-class BijectiveMap(dict):
-    """
-    A Bijective Map (two-way mapping).
-
-    Implemented as a simple dictionary of 2x the size, mapping values back
-    to keys.
-
-    Note, this implementation may be incomplete. If there's not a test for
-    your use case below, it's likely to fail, so please test and send pull
-    requests or patches for additional functionality needed.
-
-
-    >>> m = BijectiveMap()
-    >>> m['a'] = 'b'
-    >>> m == {'a': 'b', 'b': 'a'}
-    True
-    >>> print(m['b'])
-    a
-
-    >>> m['c'] = 'd'
-    >>> len(m)
-    2
-
-    Some weird things happen if you map an item to itself or overwrite a
-    single key of a pair, so it's disallowed.
-
-    >>> m['e'] = 'e'
-    Traceback (most recent call last):
-    ValueError: Key cannot map to itself
-
-    >>> m['d'] = 'e'
-    Traceback (most recent call last):
-    ValueError: Key/Value pairs may not overlap
-
-    >>> m['e'] = 'd'
-    Traceback (most recent call last):
-    ValueError: Key/Value pairs may not overlap
-
-    >>> print(m.pop('d'))
-    c
-
-    >>> 'c' in m
-    False
-
-    >>> m = BijectiveMap(dict(a='b'))
-    >>> len(m)
-    1
-    >>> print(m['b'])
-    a
-
-    >>> m = BijectiveMap()
-    >>> m.update(a='b')
-    >>> m['b']
-    'a'
-
-    >>> del m['b']
-    >>> len(m)
-    0
-    >>> 'a' in m
-    False
-    """
-
-    def __init__(self, *args, **kwargs):
-        super().__init__()
-        self.update(*args, **kwargs)
-
-    def __setitem__(self, item, value):
-        if item == value:
-            raise ValueError("Key cannot map to itself")
-        overlap = (
-            item in self
-            and self[item] != value
-            or value in self
-            and self[value] != item
-        )
-        if overlap:
-            raise ValueError("Key/Value pairs may not overlap")
-        super().__setitem__(item, value)
-        super().__setitem__(value, item)
-
-    def __delitem__(self, item):
-        self.pop(item)
-
-    def __len__(self):
-        return super().__len__() // 2
-
-    def pop(self, key, *args, **kwargs):
-        mirror = self[key]
-        super().__delitem__(mirror)
-        return super().pop(key, *args, **kwargs)
-
-    def update(self, *args, **kwargs):
-        # build a dictionary using the default constructs
-        d = dict(*args, **kwargs)
-        # build this dictionary using transformed keys.
-        for item in d.items():
-            self.__setitem__(*item)
-
-
-class FrozenDict(collections.abc.Mapping, collections.abc.Hashable):
-    """
-    An immutable mapping.
-
-    >>> a = FrozenDict(a=1, b=2)
-    >>> b = FrozenDict(a=1, b=2)
-    >>> a == b
-    True
-
-    >>> a == dict(a=1, b=2)
-    True
-    >>> dict(a=1, b=2) == a
-    True
-    >>> 'a' in a
-    True
-    >>> type(hash(a)) is type(0)
-    True
-    >>> set(iter(a)) == {'a', 'b'}
-    True
-    >>> len(a)
-    2
-    >>> a['a'] == a.get('a') == 1
-    True
-
-    >>> a['c'] = 3
-    Traceback (most recent call last):
-    ...
-    TypeError: 'FrozenDict' object does not support item assignment
-
-    >>> a.update(y=3)
-    Traceback (most recent call last):
-    ...
-    AttributeError: 'FrozenDict' object has no attribute 'update'
-
-    Copies should compare equal
-
-    >>> copy.copy(a) == a
-    True
-
-    Copies should be the same type
-
-    >>> isinstance(copy.copy(a), FrozenDict)
-    True
-
-    FrozenDict supplies .copy(), even though
-    collections.abc.Mapping doesn't demand it.
-
-    >>> a.copy() == a
-    True
-    >>> a.copy() is not a
-    True
-    """
-
-    __slots__ = ['__data']
-
-    def __new__(cls, *args, **kwargs):
-        self = super().__new__(cls)
-        self.__data = dict(*args, **kwargs)
-        return self
-
-    # Container
-    def __contains__(self, key):
-        return key in self.__data
-
-    # Hashable
-    def __hash__(self):
-        return hash(tuple(sorted(self.__data.items())))
-
-    # Mapping
-    def __iter__(self):
-        return iter(self.__data)
-
-    def __len__(self):
-        return len(self.__data)
-
-    def __getitem__(self, key):
-        return self.__data[key]
-
-    # override get for efficiency provided by dict
-    def get(self, *args, **kwargs):
-        return self.__data.get(*args, **kwargs)
-
-    # override eq to recognize underlying implementation
-    def __eq__(self, other):
-        if isinstance(other, FrozenDict):
-            other = other.__data
-        return self.__data.__eq__(other)
-
-    def copy(self):
-        "Return a shallow copy of self"
-        return copy.copy(self)
-
-
-class Enumeration(ItemsAsAttributes, BijectiveMap):
-    """
-    A convenient way to provide enumerated values
-
-    >>> e = Enumeration('a b c')
-    >>> e['a']
-    0
-
-    >>> e.a
-    0
-
-    >>> e[1]
-    'b'
-
-    >>> set(e.names) == set('abc')
-    True
-
-    >>> set(e.codes) == set(range(3))
-    True
-
-    >>> e.get('d') is None
-    True
-
-    Codes need not start with 0
-
-    >>> e = Enumeration('a b c', range(1, 4))
-    >>> e['a']
-    1
-
-    >>> e[3]
-    'c'
-    """
-
-    def __init__(self, names, codes=None):
-        if isinstance(names, str):
-            names = names.split()
-        if codes is None:
-            codes = itertools.count()
-        super().__init__(zip(names, codes))
-
-    @property
-    def names(self):
-        return (key for key in self if isinstance(key, str))
-
-    @property
-    def codes(self):
-        return (self[name] for name in self.names)
-
-
-class Everything:
-    """
-    A collection "containing" every possible thing.
-
-    >>> 'foo' in Everything()
-    True
-
-    >>> import random
-    >>> random.randint(1, 999) in Everything()
-    True
-
-    >>> random.choice([None, 'foo', 42, ('a', 'b', 'c')]) in Everything()
-    True
-    """
-
-    def __contains__(self, other):
-        return True
-
-
-class InstrumentedDict(collections.UserDict):  # type: ignore  # buggy mypy
-    """
-    Instrument an existing dictionary with additional
-    functionality, but always reference and mutate
-    the original dictionary.
-
-    >>> orig = {'a': 1, 'b': 2}
-    >>> inst = InstrumentedDict(orig)
-    >>> inst['a']
-    1
-    >>> inst['c'] = 3
-    >>> orig['c']
-    3
-    >>> inst.keys() == orig.keys()
-    True
-    """
-
-    def __init__(self, data):
-        super().__init__()
-        self.data = data
-
-
-class Least:
-    """
-    A value that is always lesser than any other
-
-    >>> least = Least()
-    >>> 3 < least
-    False
-    >>> 3 > least
-    True
-    >>> least < 3
-    True
-    >>> least <= 3
-    True
-    >>> least > 3
-    False
-    >>> 'x' > least
-    True
-    >>> None > least
-    True
-    """
-
-    def __le__(self, other):
-        return True
-
-    __lt__ = __le__
-
-    def __ge__(self, other):
-        return False
-
-    __gt__ = __ge__
-
-
-class Greatest:
-    """
-    A value that is always greater than any other
-
-    >>> greatest = Greatest()
-    >>> 3 < greatest
-    True
-    >>> 3 > greatest
-    False
-    >>> greatest < 3
-    False
-    >>> greatest > 3
-    True
-    >>> greatest >= 3
-    True
-    >>> 'x' > greatest
-    False
-    >>> None > greatest
-    False
-    """
-
-    def __ge__(self, other):
-        return True
-
-    __gt__ = __ge__
-
-    def __le__(self, other):
-        return False
-
-    __lt__ = __le__
-
-
-def pop_all(items):
-    """
-    Clear items in place and return a copy of items.
-
-    >>> items = [1, 2, 3]
-    >>> popped = pop_all(items)
-    >>> popped is items
-    False
-    >>> popped
-    [1, 2, 3]
-    >>> items
-    []
-    """
-    result, items[:] = items[:], []
-    return result
-
-
-# mypy disabled for pytest-dev/pytest#8332
-class FreezableDefaultDict(collections.defaultdict):  # type: ignore
-    """
-    Often it is desirable to prevent the mutation of
-    a default dict after its initial construction, such
-    as to prevent mutation during iteration.
-
-    >>> dd = FreezableDefaultDict(list)
-    >>> dd[0].append('1')
-    >>> dd.freeze()
-    >>> dd[1]
-    []
-    >>> len(dd)
-    1
-    """
-
-    def __missing__(self, key):
-        return getattr(self, '_frozen', super().__missing__)(key)
-
-    def freeze(self):
-        self._frozen = lambda key: self.default_factory()
-
-
-class Accumulator:
-    def __init__(self, initial=0):
-        self.val = initial
-
-    def __call__(self, val):
-        self.val += val
-        return self.val
-
-
-class WeightedLookup(RangeMap):
-    """
-    Given parameters suitable for a dict representing keys
-    and a weighted proportion, return a RangeMap representing
-    spans of values proportial to the weights:
-
-    >>> even = WeightedLookup(a=1, b=1)
-
-    [0, 1) -> a
-    [1, 2) -> b
-
-    >>> lk = WeightedLookup(a=1, b=2)
-
-    [0, 1) -> a
-    [1, 3) -> b
-
-    >>> lk[.5]
-    'a'
-    >>> lk[1.5]
-    'b'
-
-    Adds ``.random()`` to select a random weighted value:
-
-    >>> lk.random() in ['a', 'b']
-    True
-
-    >>> choices = [lk.random() for x in range(1000)]
-
-    Statistically speaking, choices should be .5 a:b
-    >>> ratio = choices.count('a') / choices.count('b')
-    >>> .4 < ratio < .6
-    True
-    """
-
-    def __init__(self, *args, **kwargs):
-        raw = dict(*args, **kwargs)
-
-        # allocate keys by weight
-        indexes = map(Accumulator(), raw.values())
-        super().__init__(zip(indexes, raw.keys()), key_match_comparator=operator.lt)
-
-    def random(self):
-        lower, upper = self.bounds()
-        selector = random.random() * upper
-        return self[selector]
diff --git a/lib/jaraco/collections/py.typed b/lib/jaraco/collections/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/jaraco/context.py b/lib/jaraco/context.py
deleted file mode 100644
index 61b27135..00000000
--- a/lib/jaraco/context.py
+++ /dev/null
@@ -1,361 +0,0 @@
-from __future__ import annotations
-
-import contextlib
-import functools
-import operator
-import os
-import shutil
-import subprocess
-import sys
-import tempfile
-import urllib.request
-import warnings
-from typing import Iterator
-
-
-if sys.version_info < (3, 12):
-    from backports import tarfile
-else:
-    import tarfile
-
-
-@contextlib.contextmanager
-def pushd(dir: str | os.PathLike) -> Iterator[str | os.PathLike]:
-    """
-    >>> tmp_path = getfixture('tmp_path')
-    >>> with pushd(tmp_path):
-    ...     assert os.getcwd() == os.fspath(tmp_path)
-    >>> assert os.getcwd() != os.fspath(tmp_path)
-    """
-
-    orig = os.getcwd()
-    os.chdir(dir)
-    try:
-        yield dir
-    finally:
-        os.chdir(orig)
-
-
-@contextlib.contextmanager
-def tarball(
-    url, target_dir: str | os.PathLike | None = None
-) -> Iterator[str | os.PathLike]:
-    """
-    Get a tarball, extract it, yield, then clean up.
-
-    >>> import urllib.request
-    >>> url = getfixture('tarfile_served')
-    >>> target = getfixture('tmp_path') / 'out'
-    >>> tb = tarball(url, target_dir=target)
-    >>> import pathlib
-    >>> with tb as extracted:
-    ...     contents = pathlib.Path(extracted, 'contents.txt').read_text(encoding='utf-8')
-    >>> assert not os.path.exists(extracted)
-    """
-    if target_dir is None:
-        target_dir = os.path.basename(url).replace('.tar.gz', '').replace('.tgz', '')
-    # In the tar command, use --strip-components=1 to strip the first path and
-    #  then
-    #  use -C to cause the files to be extracted to {target_dir}. This ensures
-    #  that we always know where the files were extracted.
-    os.mkdir(target_dir)
-    try:
-        req = urllib.request.urlopen(url)
-        with tarfile.open(fileobj=req, mode='r|*') as tf:
-            tf.extractall(path=target_dir, filter=strip_first_component)
-        yield target_dir
-    finally:
-        shutil.rmtree(target_dir)
-
-
-def strip_first_component(
-    member: tarfile.TarInfo,
-    path,
-) -> tarfile.TarInfo:
-    _, member.name = member.name.split('/', 1)
-    return member
-
-
-def _compose(*cmgrs):
-    """
-    Compose any number of dependent context managers into a single one.
-
-    The last, innermost context manager may take arbitrary arguments, but
-    each successive context manager should accept the result from the
-    previous as a single parameter.
-
-    Like :func:`jaraco.functools.compose`, behavior works from right to
-    left, so the context manager should be indicated from outermost to
-    innermost.
-
-    Example, to create a context manager to change to a temporary
-    directory:
-
-    >>> temp_dir_as_cwd = _compose(pushd, temp_dir)
-    >>> with temp_dir_as_cwd() as dir:
-    ...     assert os.path.samefile(os.getcwd(), dir)
-    """
-
-    def compose_two(inner, outer):
-        def composed(*args, **kwargs):
-            with inner(*args, **kwargs) as saved, outer(saved) as res:
-                yield res
-
-        return contextlib.contextmanager(composed)
-
-    return functools.reduce(compose_two, reversed(cmgrs))
-
-
-tarball_cwd = _compose(pushd, tarball)
-
-
-@contextlib.contextmanager
-def tarball_context(*args, **kwargs):
-    warnings.warn(
-        "tarball_context is deprecated. Use tarball or tarball_cwd instead.",
-        DeprecationWarning,
-        stacklevel=2,
-    )
-    pushd_ctx = kwargs.pop('pushd', pushd)
-    with tarball(*args, **kwargs) as tball, pushd_ctx(tball) as dir:
-        yield dir
-
-
-def infer_compression(url):
-    """
-    Given a URL or filename, infer the compression code for tar.
-
-    >>> infer_compression('http://foo/bar.tar.gz')
-    'z'
-    >>> infer_compression('http://foo/bar.tgz')
-    'z'
-    >>> infer_compression('file.bz')
-    'j'
-    >>> infer_compression('file.xz')
-    'J'
-    """
-    warnings.warn(
-        "infer_compression is deprecated with no replacement",
-        DeprecationWarning,
-        stacklevel=2,
-    )
-    # cheat and just assume it's the last two characters
-    compression_indicator = url[-2:]
-    mapping = dict(gz='z', bz='j', xz='J')
-    # Assume 'z' (gzip) if no match
-    return mapping.get(compression_indicator, 'z')
-
-
-@contextlib.contextmanager
-def temp_dir(remover=shutil.rmtree):
-    """
-    Create a temporary directory context. Pass a custom remover
-    to override the removal behavior.
-
-    >>> import pathlib
-    >>> with temp_dir() as the_dir:
-    ...     assert os.path.isdir(the_dir)
-    ...     _ = pathlib.Path(the_dir).joinpath('somefile').write_text('contents', encoding='utf-8')
-    >>> assert not os.path.exists(the_dir)
-    """
-    temp_dir = tempfile.mkdtemp()
-    try:
-        yield temp_dir
-    finally:
-        remover(temp_dir)
-
-
-@contextlib.contextmanager
-def repo_context(url, branch=None, quiet=True, dest_ctx=temp_dir):
-    """
-    Check out the repo indicated by url.
-
-    If dest_ctx is supplied, it should be a context manager
-    to yield the target directory for the check out.
-    """
-    exe = 'git' if 'git' in url else 'hg'
-    with dest_ctx() as repo_dir:
-        cmd = [exe, 'clone', url, repo_dir]
-        if branch:
-            cmd.extend(['--branch', branch])
-        devnull = open(os.path.devnull, 'w')
-        stdout = devnull if quiet else None
-        subprocess.check_call(cmd, stdout=stdout)
-        yield repo_dir
-
-
-def null():
-    """
-    A null context suitable to stand in for a meaningful context.
-
-    >>> with null() as value:
-    ...     assert value is None
-
-    This context is most useful when dealing with two or more code
-    branches but only some need a context. Wrap the others in a null
-    context to provide symmetry across all options.
-    """
-    warnings.warn(
-        "null is deprecated. Use contextlib.nullcontext",
-        DeprecationWarning,
-        stacklevel=2,
-    )
-    return contextlib.nullcontext()
-
-
-class ExceptionTrap:
-    """
-    A context manager that will catch certain exceptions and provide an
-    indication they occurred.
-
-    >>> with ExceptionTrap() as trap:
-    ...     raise Exception()
-    >>> bool(trap)
-    True
-
-    >>> with ExceptionTrap() as trap:
-    ...     pass
-    >>> bool(trap)
-    False
-
-    >>> with ExceptionTrap(ValueError) as trap:
-    ...     raise ValueError("1 + 1 is not 3")
-    >>> bool(trap)
-    True
-    >>> trap.value
-    ValueError('1 + 1 is not 3')
-    >>> trap.tb
-    <traceback object at ...>
-
-    >>> with ExceptionTrap(ValueError) as trap:
-    ...     raise Exception()
-    Traceback (most recent call last):
-    ...
-    Exception
-
-    >>> bool(trap)
-    False
-    """
-
-    exc_info = None, None, None
-
-    def __init__(self, exceptions=(Exception,)):
-        self.exceptions = exceptions
-
-    def __enter__(self):
-        return self
-
-    @property
-    def type(self):
-        return self.exc_info[0]
-
-    @property
-    def value(self):
-        return self.exc_info[1]
-
-    @property
-    def tb(self):
-        return self.exc_info[2]
-
-    def __exit__(self, *exc_info):
-        type = exc_info[0]
-        matches = type and issubclass(type, self.exceptions)
-        if matches:
-            self.exc_info = exc_info
-        return matches
-
-    def __bool__(self):
-        return bool(self.type)
-
-    def raises(self, func, *, _test=bool):
-        """
-        Wrap func and replace the result with the truth
-        value of the trap (True if an exception occurred).
-
-        First, give the decorator an alias to support Python 3.8
-        Syntax.
-
-        >>> raises = ExceptionTrap(ValueError).raises
-
-        Now decorate a function that always fails.
-
-        >>> @raises
-        ... def fail():
-        ...     raise ValueError('failed')
-        >>> fail()
-        True
-        """
-
-        @functools.wraps(func)
-        def wrapper(*args, **kwargs):
-            with ExceptionTrap(self.exceptions) as trap:
-                func(*args, **kwargs)
-            return _test(trap)
-
-        return wrapper
-
-    def passes(self, func):
-        """
-        Wrap func and replace the result with the truth
-        value of the trap (True if no exception).
-
-        First, give the decorator an alias to support Python 3.8
-        Syntax.
-
-        >>> passes = ExceptionTrap(ValueError).passes
-
-        Now decorate a function that always fails.
-
-        >>> @passes
-        ... def fail():
-        ...     raise ValueError('failed')
-
-        >>> fail()
-        False
-        """
-        return self.raises(func, _test=operator.not_)
-
-
-class suppress(contextlib.suppress, contextlib.ContextDecorator):
-    """
-    A version of contextlib.suppress with decorator support.
-
-    >>> @suppress(KeyError)
-    ... def key_error():
-    ...     {}['']
-    >>> key_error()
-    """
-
-
-class on_interrupt(contextlib.ContextDecorator):
-    """
-    Replace a KeyboardInterrupt with SystemExit(1)
-
-    >>> def do_interrupt():
-    ...     raise KeyboardInterrupt()
-    >>> on_interrupt('error')(do_interrupt)()
-    Traceback (most recent call last):
-    ...
-    SystemExit: 1
-    >>> on_interrupt('error', code=255)(do_interrupt)()
-    Traceback (most recent call last):
-    ...
-    SystemExit: 255
-    >>> on_interrupt('suppress')(do_interrupt)()
-    >>> with __import__('pytest').raises(KeyboardInterrupt):
-    ...     on_interrupt('ignore')(do_interrupt)()
-    """
-
-    def __init__(self, action='error', /, code=1):
-        self.action = action
-        self.code = code
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, exctype, excinst, exctb):
-        if exctype is not KeyboardInterrupt or self.action == 'ignore':
-            return
-        elif self.action == 'error':
-            raise SystemExit(self.code) from excinst
-        return self.action == 'suppress'
diff --git a/lib/jaraco/functools/__init__.py b/lib/jaraco/functools/__init__.py
deleted file mode 100644
index d66f1af1..00000000
--- a/lib/jaraco/functools/__init__.py
+++ /dev/null
@@ -1,641 +0,0 @@
-import collections.abc
-import functools
-import inspect
-import itertools
-import operator
-import time
-import types
-import warnings
-
-import more_itertools
-
-
-def compose(*funcs):
-    """
-    Compose any number of unary functions into a single unary function.
-
-    Comparable to
-    `function composition <https://en.wikipedia.org/wiki/Function_composition>`_
-    in mathematics:
-
-    ``h = g ∘ f`` implies ``h(x) = g(f(x))``.
-
-    In Python, ``h = compose(g, f)``.
-
-    >>> import textwrap
-    >>> expected = str.strip(textwrap.dedent(compose.__doc__))
-    >>> strip_and_dedent = compose(str.strip, textwrap.dedent)
-    >>> strip_and_dedent(compose.__doc__) == expected
-    True
-
-    Compose also allows the innermost function to take arbitrary arguments.
-
-    >>> round_three = lambda x: round(x, ndigits=3)
-    >>> f = compose(round_three, int.__truediv__)
-    >>> [f(3*x, x+1) for x in range(1,10)]
-    [1.5, 2.0, 2.25, 2.4, 2.5, 2.571, 2.625, 2.667, 2.7]
-    """
-
-    def compose_two(f1, f2):
-        return lambda *args, **kwargs: f1(f2(*args, **kwargs))
-
-    return functools.reduce(compose_two, funcs)
-
-
-def once(func):
-    """
-    Decorate func so it's only ever called the first time.
-
-    This decorator can ensure that an expensive or non-idempotent function
-    will not be expensive on subsequent calls and is idempotent.
-
-    >>> add_three = once(lambda a: a+3)
-    >>> add_three(3)
-    6
-    >>> add_three(9)
-    6
-    >>> add_three('12')
-    6
-
-    To reset the stored value, simply clear the property ``saved_result``.
-
-    >>> del add_three.saved_result
-    >>> add_three(9)
-    12
-    >>> add_three(8)
-    12
-
-    Or invoke 'reset()' on it.
-
-    >>> add_three.reset()
-    >>> add_three(-3)
-    0
-    >>> add_three(0)
-    0
-    """
-
-    @functools.wraps(func)
-    def wrapper(*args, **kwargs):
-        if not hasattr(wrapper, 'saved_result'):
-            wrapper.saved_result = func(*args, **kwargs)
-        return wrapper.saved_result
-
-    wrapper.reset = lambda: vars(wrapper).__delitem__('saved_result')
-    return wrapper
-
-
-def method_cache(method, cache_wrapper=functools.lru_cache()):
-    """
-    Wrap lru_cache to support storing the cache data in the object instances.
-
-    Abstracts the common paradigm where the method explicitly saves an
-    underscore-prefixed protected property on first call and returns that
-    subsequently.
-
-    >>> class MyClass:
-    ...     calls = 0
-    ...
-    ...     @method_cache
-    ...     def method(self, value):
-    ...         self.calls += 1
-    ...         return value
-
-    >>> a = MyClass()
-    >>> a.method(3)
-    3
-    >>> for x in range(75):
-    ...     res = a.method(x)
-    >>> a.calls
-    75
-
-    Note that the apparent behavior will be exactly like that of lru_cache
-    except that the cache is stored on each instance, so values in one
-    instance will not flush values from another, and when an instance is
-    deleted, so are the cached values for that instance.
-
-    >>> b = MyClass()
-    >>> for x in range(35):
-    ...     res = b.method(x)
-    >>> b.calls
-    35
-    >>> a.method(0)
-    0
-    >>> a.calls
-    75
-
-    Note that if method had been decorated with ``functools.lru_cache()``,
-    a.calls would have been 76 (due to the cached value of 0 having been
-    flushed by the 'b' instance).
-
-    Clear the cache with ``.cache_clear()``
-
-    >>> a.method.cache_clear()
-
-    Same for a method that hasn't yet been called.
-
-    >>> c = MyClass()
-    >>> c.method.cache_clear()
-
-    Another cache wrapper may be supplied:
-
-    >>> cache = functools.lru_cache(maxsize=2)
-    >>> MyClass.method2 = method_cache(lambda self: 3, cache_wrapper=cache)
-    >>> a = MyClass()
-    >>> a.method2()
-    3
-
-    Caution - do not subsequently wrap the method with another decorator, such
-    as ``@property``, which changes the semantics of the function.
-
-    See also
-    http://code.activestate.com/recipes/577452-a-memoize-decorator-for-instance-methods/
-    for another implementation and additional justification.
-    """
-
-    def wrapper(self, *args, **kwargs):
-        # it's the first call, replace the method with a cached, bound method
-        bound_method = types.MethodType(method, self)
-        cached_method = cache_wrapper(bound_method)
-        setattr(self, method.__name__, cached_method)
-        return cached_method(*args, **kwargs)
-
-    # Support cache clear even before cache has been created.
-    wrapper.cache_clear = lambda: None
-
-    return _special_method_cache(method, cache_wrapper) or wrapper
-
-
-def _special_method_cache(method, cache_wrapper):
-    """
-    Because Python treats special methods differently, it's not
-    possible to use instance attributes to implement the cached
-    methods.
-
-    Instead, install the wrapper method under a different name
-    and return a simple proxy to that wrapper.
-
-    https://github.com/jaraco/jaraco.functools/issues/5
-    """
-    name = method.__name__
-    special_names = '__getattr__', '__getitem__'
-
-    if name not in special_names:
-        return None
-
-    wrapper_name = '__cached' + name
-
-    def proxy(self, /, *args, **kwargs):
-        if wrapper_name not in vars(self):
-            bound = types.MethodType(method, self)
-            cache = cache_wrapper(bound)
-            setattr(self, wrapper_name, cache)
-        else:
-            cache = getattr(self, wrapper_name)
-        return cache(*args, **kwargs)
-
-    return proxy
-
-
-def apply(transform):
-    """
-    Decorate a function with a transform function that is
-    invoked on results returned from the decorated function.
-
-    >>> @apply(reversed)
-    ... def get_numbers(start):
-    ...     "doc for get_numbers"
-    ...     return range(start, start+3)
-    >>> list(get_numbers(4))
-    [6, 5, 4]
-    >>> get_numbers.__doc__
-    'doc for get_numbers'
-    """
-
-    def wrap(func):
-        return functools.wraps(func)(compose(transform, func))
-
-    return wrap
-
-
-def result_invoke(action):
-    r"""
-    Decorate a function with an action function that is
-    invoked on the results returned from the decorated
-    function (for its side effect), then return the original
-    result.
-
-    >>> @result_invoke(print)
-    ... def add_two(a, b):
-    ...     return a + b
-    >>> x = add_two(2, 3)
-    5
-    >>> x
-    5
-    """
-
-    def wrap(func):
-        @functools.wraps(func)
-        def wrapper(*args, **kwargs):
-            result = func(*args, **kwargs)
-            action(result)
-            return result
-
-        return wrapper
-
-    return wrap
-
-
-def invoke(f, /, *args, **kwargs):
-    """
-    Call a function for its side effect after initialization.
-
-    The benefit of using the decorator instead of simply invoking a function
-    after defining it is that it makes explicit the author's intent for the
-    function to be called immediately. Whereas if one simply calls the
-    function immediately, it's less obvious if that was intentional or
-    incidental. It also avoids repeating the name - the two actions, defining
-    the function and calling it immediately are modeled separately, but linked
-    by the decorator construct.
-
-    The benefit of having a function construct (opposed to just invoking some
-    behavior inline) is to serve as a scope in which the behavior occurs. It
-    avoids polluting the global namespace with local variables, provides an
-    anchor on which to attach documentation (docstring), keeps the behavior
-    logically separated (instead of conceptually separated or not separated at
-    all), and provides potential to re-use the behavior for testing or other
-    purposes.
-
-    This function is named as a pithy way to communicate, "call this function
-    primarily for its side effect", or "while defining this function, also
-    take it aside and call it". It exists because there's no Python construct
-    for "define and call" (nor should there be, as decorators serve this need
-    just fine). The behavior happens immediately and synchronously.
-
-    >>> @invoke
-    ... def func(): print("called")
-    called
-    >>> func()
-    called
-
-    Use functools.partial to pass parameters to the initial call
-
-    >>> @functools.partial(invoke, name='bingo')
-    ... def func(name): print('called with', name)
-    called with bingo
-    """
-    f(*args, **kwargs)
-    return f
-
-
-class Throttler:
-    """Rate-limit a function (or other callable)."""
-
-    def __init__(self, func, max_rate=float('Inf')):
-        if isinstance(func, Throttler):
-            func = func.func
-        self.func = func
-        self.max_rate = max_rate
-        self.reset()
-
-    def reset(self):
-        self.last_called = 0
-
-    def __call__(self, *args, **kwargs):
-        self._wait()
-        return self.func(*args, **kwargs)
-
-    def _wait(self):
-        """Ensure at least 1/max_rate seconds from last call."""
-        elapsed = time.time() - self.last_called
-        must_wait = 1 / self.max_rate - elapsed
-        time.sleep(max(0, must_wait))
-        self.last_called = time.time()
-
-    def __get__(self, obj, owner=None):
-        return first_invoke(self._wait, functools.partial(self.func, obj))
-
-
-def first_invoke(func1, func2):
-    """
-    Return a function that when invoked will invoke func1 without
-    any parameters (for its side effect) and then invoke func2
-    with whatever parameters were passed, returning its result.
-    """
-
-    def wrapper(*args, **kwargs):
-        func1()
-        return func2(*args, **kwargs)
-
-    return wrapper
-
-
-method_caller = first_invoke(
-    lambda: warnings.warn(
-        '`jaraco.functools.method_caller` is deprecated, '
-        'use `operator.methodcaller` instead',
-        DeprecationWarning,
-        stacklevel=3,
-    ),
-    operator.methodcaller,
-)
-
-
-def retry_call(func, cleanup=lambda: None, retries=0, trap=()):
-    """
-    Given a callable func, trap the indicated exceptions
-    for up to 'retries' times, invoking cleanup on the
-    exception. On the final attempt, allow any exceptions
-    to propagate.
-    """
-    attempts = itertools.count() if retries == float('inf') else range(retries)
-    for _ in attempts:
-        try:
-            return func()
-        except trap:
-            cleanup()
-
-    return func()
-
-
-def retry(*r_args, **r_kwargs):
-    """
-    Decorator wrapper for retry_call. Accepts arguments to retry_call
-    except func and then returns a decorator for the decorated function.
-
-    Ex:
-
-    >>> @retry(retries=3)
-    ... def my_func(a, b):
-    ...     "this is my funk"
-    ...     print(a, b)
-    >>> my_func.__doc__
-    'this is my funk'
-    """
-
-    def decorate(func):
-        @functools.wraps(func)
-        def wrapper(*f_args, **f_kwargs):
-            bound = functools.partial(func, *f_args, **f_kwargs)
-            return retry_call(bound, *r_args, **r_kwargs)
-
-        return wrapper
-
-    return decorate
-
-
-def print_yielded(func):
-    """
-    Convert a generator into a function that prints all yielded elements.
-
-    >>> @print_yielded
-    ... def x():
-    ...     yield 3; yield None
-    >>> x()
-    3
-    None
-    """
-    print_all = functools.partial(map, print)
-    print_results = compose(more_itertools.consume, print_all, func)
-    return functools.wraps(func)(print_results)
-
-
-def pass_none(func):
-    """
-    Wrap func so it's not called if its first param is None.
-
-    >>> print_text = pass_none(print)
-    >>> print_text('text')
-    text
-    >>> print_text(None)
-    """
-
-    @functools.wraps(func)
-    def wrapper(param, /, *args, **kwargs):
-        if param is not None:
-            return func(param, *args, **kwargs)
-        return None
-
-    return wrapper
-
-
-def assign_params(func, namespace):
-    """
-    Assign parameters from namespace where func solicits.
-
-    >>> def func(x, y=3):
-    ...     print(x, y)
-    >>> assigned = assign_params(func, dict(x=2, z=4))
-    >>> assigned()
-    2 3
-
-    The usual errors are raised if a function doesn't receive
-    its required parameters:
-
-    >>> assigned = assign_params(func, dict(y=3, z=4))
-    >>> assigned()
-    Traceback (most recent call last):
-    TypeError: func() ...argument...
-
-    It even works on methods:
-
-    >>> class Handler:
-    ...     def meth(self, arg):
-    ...         print(arg)
-    >>> assign_params(Handler().meth, dict(arg='crystal', foo='clear'))()
-    crystal
-    """
-    sig = inspect.signature(func)
-    params = sig.parameters.keys()
-    call_ns = {k: namespace[k] for k in params if k in namespace}
-    return functools.partial(func, **call_ns)
-
-
-def save_method_args(method):
-    """
-    Wrap a method such that when it is called, the args and kwargs are
-    saved on the method.
-
-    >>> class MyClass:
-    ...     @save_method_args
-    ...     def method(self, a, b):
-    ...         print(a, b)
-    >>> my_ob = MyClass()
-    >>> my_ob.method(1, 2)
-    1 2
-    >>> my_ob._saved_method.args
-    (1, 2)
-    >>> my_ob._saved_method.kwargs
-    {}
-    >>> my_ob.method(a=3, b='foo')
-    3 foo
-    >>> my_ob._saved_method.args
-    ()
-    >>> my_ob._saved_method.kwargs == dict(a=3, b='foo')
-    True
-
-    The arguments are stored on the instance, allowing for
-    different instance to save different args.
-
-    >>> your_ob = MyClass()
-    >>> your_ob.method({str('x'): 3}, b=[4])
-    {'x': 3} [4]
-    >>> your_ob._saved_method.args
-    ({'x': 3},)
-    >>> my_ob._saved_method.args
-    ()
-    """
-    args_and_kwargs = collections.namedtuple('args_and_kwargs', 'args kwargs')
-
-    @functools.wraps(method)
-    def wrapper(self, /, *args, **kwargs):
-        attr_name = '_saved_' + method.__name__
-        attr = args_and_kwargs(args, kwargs)
-        setattr(self, attr_name, attr)
-        return method(self, *args, **kwargs)
-
-    return wrapper
-
-
-def except_(*exceptions, replace=None, use=None):
-    """
-    Replace the indicated exceptions, if raised, with the indicated
-    literal replacement or evaluated expression (if present).
-
-    >>> safe_int = except_(ValueError)(int)
-    >>> safe_int('five')
-    >>> safe_int('5')
-    5
-
-    Specify a literal replacement with ``replace``.
-
-    >>> safe_int_r = except_(ValueError, replace=0)(int)
-    >>> safe_int_r('five')
-    0
-
-    Provide an expression to ``use`` to pass through particular parameters.
-
-    >>> safe_int_pt = except_(ValueError, use='args[0]')(int)
-    >>> safe_int_pt('five')
-    'five'
-
-    """
-
-    def decorate(func):
-        @functools.wraps(func)
-        def wrapper(*args, **kwargs):
-            try:
-                return func(*args, **kwargs)
-            except exceptions:
-                try:
-                    return eval(use)
-                except TypeError:
-                    return replace
-
-        return wrapper
-
-    return decorate
-
-
-def identity(x):
-    """
-    Return the argument.
-
-    >>> o = object()
-    >>> identity(o) is o
-    True
-    """
-    return x
-
-
-def bypass_when(check, *, _op=identity):
-    """
-    Decorate a function to return its parameter when ``check``.
-
-    >>> bypassed = []  # False
-
-    >>> @bypass_when(bypassed)
-    ... def double(x):
-    ...     return x * 2
-    >>> double(2)
-    4
-    >>> bypassed[:] = [object()]  # True
-    >>> double(2)
-    2
-    """
-
-    def decorate(func):
-        @functools.wraps(func)
-        def wrapper(param, /):
-            return param if _op(check) else func(param)
-
-        return wrapper
-
-    return decorate
-
-
-def bypass_unless(check):
-    """
-    Decorate a function to return its parameter unless ``check``.
-
-    >>> enabled = [object()]  # True
-
-    >>> @bypass_unless(enabled)
-    ... def double(x):
-    ...     return x * 2
-    >>> double(2)
-    4
-    >>> del enabled[:]  # False
-    >>> double(2)
-    2
-    """
-    return bypass_when(check, _op=operator.not_)
-
-
-@functools.singledispatch
-def _splat_inner(args, func):
-    """Splat args to func."""
-    return func(*args)
-
-
-@_splat_inner.register
-def _(args: collections.abc.Mapping, func):
-    """Splat kargs to func as kwargs."""
-    return func(**args)
-
-
-def splat(func):
-    """
-    Wrap func to expect its parameters to be passed positionally in a tuple.
-
-    Has a similar effect to that of ``itertools.starmap`` over
-    simple ``map``.
-
-    >>> pairs = [(-1, 1), (0, 2)]
-    >>> more_itertools.consume(itertools.starmap(print, pairs))
-    -1 1
-    0 2
-    >>> more_itertools.consume(map(splat(print), pairs))
-    -1 1
-    0 2
-
-    The approach generalizes to other iterators that don't have a "star"
-    equivalent, such as a "starfilter".
-
-    >>> list(filter(splat(operator.add), pairs))
-    [(0, 2)]
-
-    Splat also accepts a mapping argument.
-
-    >>> def is_nice(msg, code):
-    ...     return "smile" in msg or code == 0
-    >>> msgs = [
-    ...     dict(msg='smile!', code=20),
-    ...     dict(msg='error :(', code=1),
-    ...     dict(msg='unknown', code=0),
-    ... ]
-    >>> for msg in filter(splat(is_nice), msgs):
-    ...     print(msg)
-    {'msg': 'smile!', 'code': 20}
-    {'msg': 'unknown', 'code': 0}
-    """
-    return functools.wraps(func)(functools.partial(_splat_inner, func=func))
diff --git a/lib/jaraco/functools/__init__.pyi b/lib/jaraco/functools/__init__.pyi
deleted file mode 100644
index 19191bf9..00000000
--- a/lib/jaraco/functools/__init__.pyi
+++ /dev/null
@@ -1,125 +0,0 @@
-from collections.abc import Callable, Hashable, Iterator
-from functools import partial
-from operator import methodcaller
-import sys
-from typing import (
-    Any,
-    Generic,
-    Protocol,
-    TypeVar,
-    overload,
-)
-
-if sys.version_info >= (3, 10):
-    from typing import Concatenate, ParamSpec
-else:
-    from typing_extensions import Concatenate, ParamSpec
-
-_P = ParamSpec('_P')
-_R = TypeVar('_R')
-_T = TypeVar('_T')
-_R1 = TypeVar('_R1')
-_R2 = TypeVar('_R2')
-_V = TypeVar('_V')
-_S = TypeVar('_S')
-_R_co = TypeVar('_R_co', covariant=True)
-
-class _OnceCallable(Protocol[_P, _R]):
-    saved_result: _R
-    reset: Callable[[], None]
-    def __call__(self, *args: _P.args, **kwargs: _P.kwargs) -> _R: ...
-
-class _ProxyMethodCacheWrapper(Protocol[_R_co]):
-    cache_clear: Callable[[], None]
-    def __call__(self, *args: Hashable, **kwargs: Hashable) -> _R_co: ...
-
-class _MethodCacheWrapper(Protocol[_R_co]):
-    def cache_clear(self) -> None: ...
-    def __call__(self, *args: Hashable, **kwargs: Hashable) -> _R_co: ...
-
-# `compose()` overloads below will cover most use cases.
-
-@overload
-def compose(
-    __func1: Callable[[_R], _T],
-    __func2: Callable[_P, _R],
-    /,
-) -> Callable[_P, _T]: ...
-@overload
-def compose(
-    __func1: Callable[[_R], _T],
-    __func2: Callable[[_R1], _R],
-    __func3: Callable[_P, _R1],
-    /,
-) -> Callable[_P, _T]: ...
-@overload
-def compose(
-    __func1: Callable[[_R], _T],
-    __func2: Callable[[_R2], _R],
-    __func3: Callable[[_R1], _R2],
-    __func4: Callable[_P, _R1],
-    /,
-) -> Callable[_P, _T]: ...
-def once(func: Callable[_P, _R]) -> _OnceCallable[_P, _R]: ...
-def method_cache(
-    method: Callable[..., _R],
-    cache_wrapper: Callable[[Callable[..., _R]], _MethodCacheWrapper[_R]] = ...,
-) -> _MethodCacheWrapper[_R] | _ProxyMethodCacheWrapper[_R]: ...
-def apply(
-    transform: Callable[[_R], _T]
-) -> Callable[[Callable[_P, _R]], Callable[_P, _T]]: ...
-def result_invoke(
-    action: Callable[[_R], Any]
-) -> Callable[[Callable[_P, _R]], Callable[_P, _R]]: ...
-def invoke(
-    f: Callable[_P, _R], /, *args: _P.args, **kwargs: _P.kwargs
-) -> Callable[_P, _R]: ...
-
-class Throttler(Generic[_R]):
-    last_called: float
-    func: Callable[..., _R]
-    max_rate: float
-    def __init__(
-        self, func: Callable[..., _R] | Throttler[_R], max_rate: float = ...
-    ) -> None: ...
-    def reset(self) -> None: ...
-    def __call__(self, *args: Any, **kwargs: Any) -> _R: ...
-    def __get__(self, obj: Any, owner: type[Any] | None = ...) -> Callable[..., _R]: ...
-
-def first_invoke(
-    func1: Callable[..., Any], func2: Callable[_P, _R]
-) -> Callable[_P, _R]: ...
-
-method_caller: Callable[..., methodcaller]
-
-def retry_call(
-    func: Callable[..., _R],
-    cleanup: Callable[..., None] = ...,
-    retries: int | float = ...,
-    trap: type[BaseException] | tuple[type[BaseException], ...] = ...,
-) -> _R: ...
-def retry(
-    cleanup: Callable[..., None] = ...,
-    retries: int | float = ...,
-    trap: type[BaseException] | tuple[type[BaseException], ...] = ...,
-) -> Callable[[Callable[..., _R]], Callable[..., _R]]: ...
-def print_yielded(func: Callable[_P, Iterator[Any]]) -> Callable[_P, None]: ...
-def pass_none(
-    func: Callable[Concatenate[_T, _P], _R]
-) -> Callable[Concatenate[_T, _P], _R]: ...
-def assign_params(
-    func: Callable[..., _R], namespace: dict[str, Any]
-) -> partial[_R]: ...
-def save_method_args(
-    method: Callable[Concatenate[_S, _P], _R]
-) -> Callable[Concatenate[_S, _P], _R]: ...
-def except_(
-    *exceptions: type[BaseException], replace: Any = ..., use: Any = ...
-) -> Callable[[Callable[_P, Any]], Callable[_P, Any]]: ...
-def identity(x: _T) -> _T: ...
-def bypass_when(
-    check: _V, *, _op: Callable[[_V], Any] = ...
-) -> Callable[[Callable[[_T], _R]], Callable[[_T], _T | _R]]: ...
-def bypass_unless(
-    check: Any,
-) -> Callable[[Callable[[_T], _R]], Callable[[_T], _T | _R]]: ...
diff --git a/lib/jaraco/functools/py.typed b/lib/jaraco/functools/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/jaraco/text/Lorem ipsum.txt b/lib/jaraco/text/Lorem ipsum.txt
deleted file mode 100644
index 986f944b..00000000
--- a/lib/jaraco/text/Lorem ipsum.txt	
+++ /dev/null
@@ -1,2 +0,0 @@
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam varius, turpis et commodo pharetra, est eros bibendum elit, nec luctus magna felis sollicitudin mauris. Integer in mauris eu nibh euismod gravida. Duis ac tellus et risus vulputate vehicula. Donec lobortis risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue, eros est euismod turpis, id tincidunt sapien risus a quam. Maecenas fermentum consequat mi. Donec fermentum. Pellentesque malesuada nulla a mi. Duis sapien sem, aliquet nec, commodo eget, consequat quis, neque. Aliquam faucibus, elit ut dictum aliquet, felis nisl adipiscing sapien, sed malesuada diam lacus eget erat. Cras mollis scelerisque nunc. Nullam arcu. Aliquam consequat. Curabitur augue lorem, dapibus quis, laoreet et, pretium ac, nisi. Aenean magna nisl, mollis quis, molestie eu, feugiat in, orci. In hac habitasse platea dictumst.
diff --git a/lib/jaraco/text/__init__.py b/lib/jaraco/text/__init__.py
deleted file mode 100644
index 0fabd0c3..00000000
--- a/lib/jaraco/text/__init__.py
+++ /dev/null
@@ -1,624 +0,0 @@
-import re
-import itertools
-import textwrap
-import functools
-
-try:
-    from importlib.resources import files  # type: ignore
-except ImportError:  # pragma: nocover
-    from importlib_resources import files  # type: ignore
-
-from jaraco.functools import compose, method_cache
-from jaraco.context import ExceptionTrap
-
-
-def substitution(old, new):
-    """
-    Return a function that will perform a substitution on a string
-    """
-    return lambda s: s.replace(old, new)
-
-
-def multi_substitution(*substitutions):
-    """
-    Take a sequence of pairs specifying substitutions, and create
-    a function that performs those substitutions.
-
-    >>> multi_substitution(('foo', 'bar'), ('bar', 'baz'))('foo')
-    'baz'
-    """
-    substitutions = itertools.starmap(substitution, substitutions)
-    # compose function applies last function first, so reverse the
-    #  substitutions to get the expected order.
-    substitutions = reversed(tuple(substitutions))
-    return compose(*substitutions)
-
-
-class FoldedCase(str):
-    """
-    A case insensitive string class; behaves just like str
-    except compares equal when the only variation is case.
-
-    >>> s = FoldedCase('hello world')
-
-    >>> s == 'Hello World'
-    True
-
-    >>> 'Hello World' == s
-    True
-
-    >>> s != 'Hello World'
-    False
-
-    >>> s.index('O')
-    4
-
-    >>> s.split('O')
-    ['hell', ' w', 'rld']
-
-    >>> sorted(map(FoldedCase, ['GAMMA', 'alpha', 'Beta']))
-    ['alpha', 'Beta', 'GAMMA']
-
-    Sequence membership is straightforward.
-
-    >>> "Hello World" in [s]
-    True
-    >>> s in ["Hello World"]
-    True
-
-    Allows testing for set inclusion, but candidate and elements
-    must both be folded.
-
-    >>> FoldedCase("Hello World") in {s}
-    True
-    >>> s in {FoldedCase("Hello World")}
-    True
-
-    String inclusion works as long as the FoldedCase object
-    is on the right.
-
-    >>> "hello" in FoldedCase("Hello World")
-    True
-
-    But not if the FoldedCase object is on the left:
-
-    >>> FoldedCase('hello') in 'Hello World'
-    False
-
-    In that case, use ``in_``:
-
-    >>> FoldedCase('hello').in_('Hello World')
-    True
-
-    >>> FoldedCase('hello') > FoldedCase('Hello')
-    False
-
-    >>> FoldedCase('ß') == FoldedCase('ss')
-    True
-    """
-
-    def __lt__(self, other):
-        return self.casefold() < other.casefold()
-
-    def __gt__(self, other):
-        return self.casefold() > other.casefold()
-
-    def __eq__(self, other):
-        return self.casefold() == other.casefold()
-
-    def __ne__(self, other):
-        return self.casefold() != other.casefold()
-
-    def __hash__(self):
-        return hash(self.casefold())
-
-    def __contains__(self, other):
-        return super().casefold().__contains__(other.casefold())
-
-    def in_(self, other):
-        "Does self appear in other?"
-        return self in FoldedCase(other)
-
-    # cache casefold since it's likely to be called frequently.
-    @method_cache
-    def casefold(self):
-        return super().casefold()
-
-    def index(self, sub):
-        return self.casefold().index(sub.casefold())
-
-    def split(self, splitter=' ', maxsplit=0):
-        pattern = re.compile(re.escape(splitter), re.I)
-        return pattern.split(self, maxsplit)
-
-
-# Python 3.8 compatibility
-_unicode_trap = ExceptionTrap(UnicodeDecodeError)
-
-
-@_unicode_trap.passes
-def is_decodable(value):
-    r"""
-    Return True if the supplied value is decodable (using the default
-    encoding).
-
-    >>> is_decodable(b'\xff')
-    False
-    >>> is_decodable(b'\x32')
-    True
-    """
-    value.decode()
-
-
-def is_binary(value):
-    r"""
-    Return True if the value appears to be binary (that is, it's a byte
-    string and isn't decodable).
-
-    >>> is_binary(b'\xff')
-    True
-    >>> is_binary('\xff')
-    False
-    """
-    return isinstance(value, bytes) and not is_decodable(value)
-
-
-def trim(s):
-    r"""
-    Trim something like a docstring to remove the whitespace that
-    is common due to indentation and formatting.
-
-    >>> trim("\n\tfoo = bar\n\t\tbar = baz\n")
-    'foo = bar\n\tbar = baz'
-    """
-    return textwrap.dedent(s).strip()
-
-
-def wrap(s):
-    """
-    Wrap lines of text, retaining existing newlines as
-    paragraph markers.
-
-    >>> print(wrap(lorem_ipsum))
-    Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do
-    eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad
-    minim veniam, quis nostrud exercitation ullamco laboris nisi ut
-    aliquip ex ea commodo consequat. Duis aute irure dolor in
-    reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
-    pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
-    culpa qui officia deserunt mollit anim id est laborum.
-    <BLANKLINE>
-    Curabitur pretium tincidunt lacus. Nulla gravida orci a odio. Nullam
-    varius, turpis et commodo pharetra, est eros bibendum elit, nec luctus
-    magna felis sollicitudin mauris. Integer in mauris eu nibh euismod
-    gravida. Duis ac tellus et risus vulputate vehicula. Donec lobortis
-    risus a elit. Etiam tempor. Ut ullamcorper, ligula eu tempor congue,
-    eros est euismod turpis, id tincidunt sapien risus a quam. Maecenas
-    fermentum consequat mi. Donec fermentum. Pellentesque malesuada nulla
-    a mi. Duis sapien sem, aliquet nec, commodo eget, consequat quis,
-    neque. Aliquam faucibus, elit ut dictum aliquet, felis nisl adipiscing
-    sapien, sed malesuada diam lacus eget erat. Cras mollis scelerisque
-    nunc. Nullam arcu. Aliquam consequat. Curabitur augue lorem, dapibus
-    quis, laoreet et, pretium ac, nisi. Aenean magna nisl, mollis quis,
-    molestie eu, feugiat in, orci. In hac habitasse platea dictumst.
-    """
-    paragraphs = s.splitlines()
-    wrapped = ('\n'.join(textwrap.wrap(para)) for para in paragraphs)
-    return '\n\n'.join(wrapped)
-
-
-def unwrap(s):
-    r"""
-    Given a multi-line string, return an unwrapped version.
-
-    >>> wrapped = wrap(lorem_ipsum)
-    >>> wrapped.count('\n')
-    20
-    >>> unwrapped = unwrap(wrapped)
-    >>> unwrapped.count('\n')
-    1
-    >>> print(unwrapped)
-    Lorem ipsum dolor sit amet, consectetur adipiscing ...
-    Curabitur pretium tincidunt lacus. Nulla gravida orci ...
-
-    """
-    paragraphs = re.split(r'\n\n+', s)
-    cleaned = (para.replace('\n', ' ') for para in paragraphs)
-    return '\n'.join(cleaned)
-
-
-lorem_ipsum: str = (
-    files(__name__).joinpath('Lorem ipsum.txt').read_text(encoding='utf-8')
-)
-
-
-class Splitter:
-    """object that will split a string with the given arguments for each call
-
-    >>> s = Splitter(',')
-    >>> s('hello, world, this is your, master calling')
-    ['hello', ' world', ' this is your', ' master calling']
-    """
-
-    def __init__(self, *args):
-        self.args = args
-
-    def __call__(self, s):
-        return s.split(*self.args)
-
-
-def indent(string, prefix=' ' * 4):
-    """
-    >>> indent('foo')
-    '    foo'
-    """
-    return prefix + string
-
-
-class WordSet(tuple):
-    """
-    Given an identifier, return the words that identifier represents,
-    whether in camel case, underscore-separated, etc.
-
-    >>> WordSet.parse("camelCase")
-    ('camel', 'Case')
-
-    >>> WordSet.parse("under_sep")
-    ('under', 'sep')
-
-    Acronyms should be retained
-
-    >>> WordSet.parse("firstSNL")
-    ('first', 'SNL')
-
-    >>> WordSet.parse("you_and_I")
-    ('you', 'and', 'I')
-
-    >>> WordSet.parse("A simple test")
-    ('A', 'simple', 'test')
-
-    Multiple caps should not interfere with the first cap of another word.
-
-    >>> WordSet.parse("myABCClass")
-    ('my', 'ABC', 'Class')
-
-    The result is a WordSet, providing access to other forms.
-
-    >>> WordSet.parse("myABCClass").underscore_separated()
-    'my_ABC_Class'
-
-    >>> WordSet.parse('a-command').camel_case()
-    'ACommand'
-
-    >>> WordSet.parse('someIdentifier').lowered().space_separated()
-    'some identifier'
-
-    Slices of the result should return another WordSet.
-
-    >>> WordSet.parse('taken-out-of-context')[1:].underscore_separated()
-    'out_of_context'
-
-    >>> WordSet.from_class_name(WordSet()).lowered().space_separated()
-    'word set'
-
-    >>> example = WordSet.parse('figured it out')
-    >>> example.headless_camel_case()
-    'figuredItOut'
-    >>> example.dash_separated()
-    'figured-it-out'
-
-    """
-
-    _pattern = re.compile('([A-Z]?[a-z]+)|([A-Z]+(?![a-z]))')
-
-    def capitalized(self):
-        return WordSet(word.capitalize() for word in self)
-
-    def lowered(self):
-        return WordSet(word.lower() for word in self)
-
-    def camel_case(self):
-        return ''.join(self.capitalized())
-
-    def headless_camel_case(self):
-        words = iter(self)
-        first = next(words).lower()
-        new_words = itertools.chain((first,), WordSet(words).camel_case())
-        return ''.join(new_words)
-
-    def underscore_separated(self):
-        return '_'.join(self)
-
-    def dash_separated(self):
-        return '-'.join(self)
-
-    def space_separated(self):
-        return ' '.join(self)
-
-    def trim_right(self, item):
-        """
-        Remove the item from the end of the set.
-
-        >>> WordSet.parse('foo bar').trim_right('foo')
-        ('foo', 'bar')
-        >>> WordSet.parse('foo bar').trim_right('bar')
-        ('foo',)
-        >>> WordSet.parse('').trim_right('bar')
-        ()
-        """
-        return self[:-1] if self and self[-1] == item else self
-
-    def trim_left(self, item):
-        """
-        Remove the item from the beginning of the set.
-
-        >>> WordSet.parse('foo bar').trim_left('foo')
-        ('bar',)
-        >>> WordSet.parse('foo bar').trim_left('bar')
-        ('foo', 'bar')
-        >>> WordSet.parse('').trim_left('bar')
-        ()
-        """
-        return self[1:] if self and self[0] == item else self
-
-    def trim(self, item):
-        """
-        >>> WordSet.parse('foo bar').trim('foo')
-        ('bar',)
-        """
-        return self.trim_left(item).trim_right(item)
-
-    def __getitem__(self, item):
-        result = super().__getitem__(item)
-        if isinstance(item, slice):
-            result = WordSet(result)
-        return result
-
-    @classmethod
-    def parse(cls, identifier):
-        matches = cls._pattern.finditer(identifier)
-        return WordSet(match.group(0) for match in matches)
-
-    @classmethod
-    def from_class_name(cls, subject):
-        return cls.parse(subject.__class__.__name__)
-
-
-# for backward compatibility
-words = WordSet.parse
-
-
-def simple_html_strip(s):
-    r"""
-    Remove HTML from the string `s`.
-
-    >>> str(simple_html_strip(''))
-    ''
-
-    >>> print(simple_html_strip('A <bold>stormy</bold> day in paradise'))
-    A stormy day in paradise
-
-    >>> print(simple_html_strip('Somebody <!-- do not --> tell the truth.'))
-    Somebody  tell the truth.
-
-    >>> print(simple_html_strip('What about<br/>\nmultiple lines?'))
-    What about
-    multiple lines?
-    """
-    html_stripper = re.compile('(<!--.*?-->)|(<[^>]*>)|([^<]+)', re.DOTALL)
-    texts = (match.group(3) or '' for match in html_stripper.finditer(s))
-    return ''.join(texts)
-
-
-class SeparatedValues(str):
-    """
-    A string separated by a separator. Overrides __iter__ for getting
-    the values.
-
-    >>> list(SeparatedValues('a,b,c'))
-    ['a', 'b', 'c']
-
-    Whitespace is stripped and empty values are discarded.
-
-    >>> list(SeparatedValues(' a,   b   , c,  '))
-    ['a', 'b', 'c']
-    """
-
-    separator = ','
-
-    def __iter__(self):
-        parts = self.split(self.separator)
-        return filter(None, (part.strip() for part in parts))
-
-
-class Stripper:
-    r"""
-    Given a series of lines, find the common prefix and strip it from them.
-
-    >>> lines = [
-    ...     'abcdefg\n',
-    ...     'abc\n',
-    ...     'abcde\n',
-    ... ]
-    >>> res = Stripper.strip_prefix(lines)
-    >>> res.prefix
-    'abc'
-    >>> list(res.lines)
-    ['defg\n', '\n', 'de\n']
-
-    If no prefix is common, nothing should be stripped.
-
-    >>> lines = [
-    ...     'abcd\n',
-    ...     '1234\n',
-    ... ]
-    >>> res = Stripper.strip_prefix(lines)
-    >>> res.prefix = ''
-    >>> list(res.lines)
-    ['abcd\n', '1234\n']
-    """
-
-    def __init__(self, prefix, lines):
-        self.prefix = prefix
-        self.lines = map(self, lines)
-
-    @classmethod
-    def strip_prefix(cls, lines):
-        prefix_lines, lines = itertools.tee(lines)
-        prefix = functools.reduce(cls.common_prefix, prefix_lines)
-        return cls(prefix, lines)
-
-    def __call__(self, line):
-        if not self.prefix:
-            return line
-        null, prefix, rest = line.partition(self.prefix)
-        return rest
-
-    @staticmethod
-    def common_prefix(s1, s2):
-        """
-        Return the common prefix of two lines.
-        """
-        index = min(len(s1), len(s2))
-        while s1[:index] != s2[:index]:
-            index -= 1
-        return s1[:index]
-
-
-def remove_prefix(text, prefix):
-    """
-    Remove the prefix from the text if it exists.
-
-    >>> remove_prefix('underwhelming performance', 'underwhelming ')
-    'performance'
-
-    >>> remove_prefix('something special', 'sample')
-    'something special'
-    """
-    null, prefix, rest = text.rpartition(prefix)
-    return rest
-
-
-def remove_suffix(text, suffix):
-    """
-    Remove the suffix from the text if it exists.
-
-    >>> remove_suffix('name.git', '.git')
-    'name'
-
-    >>> remove_suffix('something special', 'sample')
-    'something special'
-    """
-    rest, suffix, null = text.partition(suffix)
-    return rest
-
-
-def normalize_newlines(text):
-    r"""
-    Replace alternate newlines with the canonical newline.
-
-    >>> normalize_newlines('Lorem Ipsum\u2029')
-    'Lorem Ipsum\n'
-    >>> normalize_newlines('Lorem Ipsum\r\n')
-    'Lorem Ipsum\n'
-    >>> normalize_newlines('Lorem Ipsum\x85')
-    'Lorem Ipsum\n'
-    """
-    newlines = ['\r\n', '\r', '\n', '\u0085', '\u2028', '\u2029']
-    pattern = '|'.join(newlines)
-    return re.sub(pattern, '\n', text)
-
-
-def _nonblank(str):
-    return str and not str.startswith('#')
-
-
-@functools.singledispatch
-def yield_lines(iterable):
-    r"""
-    Yield valid lines of a string or iterable.
-
-    >>> list(yield_lines(''))
-    []
-    >>> list(yield_lines(['foo', 'bar']))
-    ['foo', 'bar']
-    >>> list(yield_lines('foo\nbar'))
-    ['foo', 'bar']
-    >>> list(yield_lines('\nfoo\n#bar\nbaz #comment'))
-    ['foo', 'baz #comment']
-    >>> list(yield_lines(['foo\nbar', 'baz', 'bing\n\n\n']))
-    ['foo', 'bar', 'baz', 'bing']
-    """
-    return itertools.chain.from_iterable(map(yield_lines, iterable))
-
-
-@yield_lines.register(str)
-def _(text):
-    return filter(_nonblank, map(str.strip, text.splitlines()))
-
-
-def drop_comment(line):
-    """
-    Drop comments.
-
-    >>> drop_comment('foo # bar')
-    'foo'
-
-    A hash without a space may be in a URL.
-
-    >>> drop_comment('http://example.com/foo#bar')
-    'http://example.com/foo#bar'
-    """
-    return line.partition(' #')[0]
-
-
-def join_continuation(lines):
-    r"""
-    Join lines continued by a trailing backslash.
-
-    >>> list(join_continuation(['foo \\', 'bar', 'baz']))
-    ['foobar', 'baz']
-    >>> list(join_continuation(['foo \\', 'bar', 'baz']))
-    ['foobar', 'baz']
-    >>> list(join_continuation(['foo \\', 'bar \\', 'baz']))
-    ['foobarbaz']
-
-    Not sure why, but...
-    The character preceding the backslash is also elided.
-
-    >>> list(join_continuation(['goo\\', 'dly']))
-    ['godly']
-
-    A terrible idea, but...
-    If no line is available to continue, suppress the lines.
-
-    >>> list(join_continuation(['foo', 'bar\\', 'baz\\']))
-    ['foo']
-    """
-    lines = iter(lines)
-    for item in lines:
-        while item.endswith('\\'):
-            try:
-                item = item[:-2].strip() + next(lines)
-            except StopIteration:
-                return
-        yield item
-
-
-def read_newlines(filename, limit=1024):
-    r"""
-    >>> tmp_path = getfixture('tmp_path')
-    >>> filename = tmp_path / 'out.txt'
-    >>> _ = filename.write_text('foo\n', newline='', encoding='utf-8')
-    >>> read_newlines(filename)
-    '\n'
-    >>> _ = filename.write_text('foo\r\n', newline='', encoding='utf-8')
-    >>> read_newlines(filename)
-    '\r\n'
-    >>> _ = filename.write_text('foo\r\nbar\nbing\r', newline='', encoding='utf-8')
-    >>> read_newlines(filename)
-    ('\r', '\n', '\r\n')
-    """
-    with open(filename, encoding='utf-8') as fp:
-        fp.read(limit)
-    return fp.newlines
diff --git a/lib/jaraco/text/layouts.py b/lib/jaraco/text/layouts.py
deleted file mode 100644
index 9636f0f7..00000000
--- a/lib/jaraco/text/layouts.py
+++ /dev/null
@@ -1,25 +0,0 @@
-qwerty = "-=qwertyuiop[]asdfghjkl;'zxcvbnm,./_+QWERTYUIOP{}ASDFGHJKL:\"ZXCVBNM<>?"
-dvorak = "[]',.pyfgcrl/=aoeuidhtns-;qjkxbmwvz{}\"<>PYFGCRL?+AOEUIDHTNS_:QJKXBMWVZ"
-
-
-to_dvorak = str.maketrans(qwerty, dvorak)
-to_qwerty = str.maketrans(dvorak, qwerty)
-
-
-def translate(input, translation):
-    """
-    >>> translate('dvorak', to_dvorak)
-    'ekrpat'
-    >>> translate('qwerty', to_qwerty)
-    'x,dokt'
-    """
-    return input.translate(translation)
-
-
-def _translate_stream(stream, translation):
-    """
-    >>> import io
-    >>> _translate_stream(io.StringIO('foo'), to_dvorak)
-    urr
-    """
-    print(translate(stream.read(), translation))
diff --git a/lib/jaraco/text/show-newlines.py b/lib/jaraco/text/show-newlines.py
deleted file mode 100644
index e11d1ba4..00000000
--- a/lib/jaraco/text/show-newlines.py
+++ /dev/null
@@ -1,33 +0,0 @@
-import autocommand
-import inflect
-
-from more_itertools import always_iterable
-
-import jaraco.text
-
-
-def report_newlines(filename):
-    r"""
-    Report the newlines in the indicated file.
-
-    >>> tmp_path = getfixture('tmp_path')
-    >>> filename = tmp_path / 'out.txt'
-    >>> _ = filename.write_text('foo\nbar\n', newline='', encoding='utf-8')
-    >>> report_newlines(filename)
-    newline is '\n'
-    >>> filename = tmp_path / 'out.txt'
-    >>> _ = filename.write_text('foo\nbar\r\n', newline='', encoding='utf-8')
-    >>> report_newlines(filename)
-    newlines are ('\n', '\r\n')
-    """
-    newlines = jaraco.text.read_newlines(filename)
-    count = len(tuple(always_iterable(newlines)))
-    engine = inflect.engine()
-    print(
-        engine.plural_noun("newline", count),
-        engine.plural_verb("is", count),
-        repr(newlines),
-    )
-
-
-autocommand.autocommand(__name__)(report_newlines)
diff --git a/lib/jaraco/text/strip-prefix.py b/lib/jaraco/text/strip-prefix.py
deleted file mode 100644
index 761717a9..00000000
--- a/lib/jaraco/text/strip-prefix.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import sys
-
-import autocommand
-
-from jaraco.text import Stripper
-
-
-def strip_prefix():
-    r"""
-    Strip any common prefix from stdin.
-
-    >>> import io, pytest
-    >>> getfixture('monkeypatch').setattr('sys.stdin', io.StringIO('abcdef\nabc123'))
-    >>> strip_prefix()
-    def
-    123
-    """
-    sys.stdout.writelines(Stripper.strip_prefix(sys.stdin).lines)
-
-
-autocommand.autocommand(__name__)(strip_prefix)
diff --git a/lib/jaraco/text/to-dvorak.py b/lib/jaraco/text/to-dvorak.py
deleted file mode 100644
index a6d5da80..00000000
--- a/lib/jaraco/text/to-dvorak.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import sys
-
-from . import layouts
-
-
-__name__ == '__main__' and layouts._translate_stream(sys.stdin, layouts.to_dvorak)
diff --git a/lib/jaraco/text/to-qwerty.py b/lib/jaraco/text/to-qwerty.py
deleted file mode 100644
index abe27286..00000000
--- a/lib/jaraco/text/to-qwerty.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import sys
-
-from . import layouts
-
-
-__name__ == '__main__' and layouts._translate_stream(sys.stdin, layouts.to_qwerty)
diff --git a/lib/jwt/__init__.py b/lib/jwt/__init__.py
deleted file mode 100644
index 457a4e35..00000000
--- a/lib/jwt/__init__.py
+++ /dev/null
@@ -1,75 +0,0 @@
-from .api_jwk import PyJWK, PyJWKSet
-from .api_jws import (
-    PyJWS,
-    get_algorithm_by_name,
-    get_unverified_header,
-    register_algorithm,
-    unregister_algorithm,
-)
-from .api_jwt import PyJWT, decode, decode_complete, encode
-from .exceptions import (
-    DecodeError,
-    ExpiredSignatureError,
-    ImmatureSignatureError,
-    InvalidAlgorithmError,
-    InvalidAudienceError,
-    InvalidIssuedAtError,
-    InvalidIssuerError,
-    InvalidKeyError,
-    InvalidSignatureError,
-    InvalidTokenError,
-    MissingRequiredClaimError,
-    PyJWKClientConnectionError,
-    PyJWKClientError,
-    PyJWKError,
-    PyJWKSetError,
-    PyJWTError,
-)
-from .jwks_client import PyJWKClient
-
-__version__ = "2.10.1"
-
-__title__ = "PyJWT"
-__description__ = "JSON Web Token implementation in Python"
-__url__ = "https://pyjwt.readthedocs.io"
-__uri__ = __url__
-__doc__ = f"{__description__} <{__uri__}>"
-
-__author__ = "José Padilla"
-__email__ = "hello@jpadilla.com"
-
-__license__ = "MIT"
-__copyright__ = "Copyright 2015-2022 José Padilla"
-
-
-__all__ = [
-    "PyJWS",
-    "PyJWT",
-    "PyJWKClient",
-    "PyJWK",
-    "PyJWKSet",
-    "decode",
-    "decode_complete",
-    "encode",
-    "get_unverified_header",
-    "register_algorithm",
-    "unregister_algorithm",
-    "get_algorithm_by_name",
-    # Exceptions
-    "DecodeError",
-    "ExpiredSignatureError",
-    "ImmatureSignatureError",
-    "InvalidAlgorithmError",
-    "InvalidAudienceError",
-    "InvalidIssuedAtError",
-    "InvalidIssuerError",
-    "InvalidKeyError",
-    "InvalidSignatureError",
-    "InvalidTokenError",
-    "MissingRequiredClaimError",
-    "PyJWKClientConnectionError",
-    "PyJWKClientError",
-    "PyJWKError",
-    "PyJWKSetError",
-    "PyJWTError",
-]
diff --git a/lib/jwt/algorithms.py b/lib/jwt/algorithms.py
deleted file mode 100644
index ccb1500f..00000000
--- a/lib/jwt/algorithms.py
+++ /dev/null
@@ -1,875 +0,0 @@
-from __future__ import annotations
-
-import hashlib
-import hmac
-import json
-from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, Any, ClassVar, Literal, NoReturn, cast, overload
-
-from .exceptions import InvalidKeyError
-from .types import HashlibHash, JWKDict
-from .utils import (
-    base64url_decode,
-    base64url_encode,
-    der_to_raw_signature,
-    force_bytes,
-    from_base64url_uint,
-    is_pem_format,
-    is_ssh_key,
-    raw_to_der_signature,
-    to_base64url_uint,
-)
-
-try:
-    from cryptography.exceptions import InvalidSignature, UnsupportedAlgorithm
-    from cryptography.hazmat.backends import default_backend
-    from cryptography.hazmat.primitives import hashes
-    from cryptography.hazmat.primitives.asymmetric import padding
-    from cryptography.hazmat.primitives.asymmetric.ec import (
-        ECDSA,
-        SECP256K1,
-        SECP256R1,
-        SECP384R1,
-        SECP521R1,
-        EllipticCurve,
-        EllipticCurvePrivateKey,
-        EllipticCurvePrivateNumbers,
-        EllipticCurvePublicKey,
-        EllipticCurvePublicNumbers,
-    )
-    from cryptography.hazmat.primitives.asymmetric.ed448 import (
-        Ed448PrivateKey,
-        Ed448PublicKey,
-    )
-    from cryptography.hazmat.primitives.asymmetric.ed25519 import (
-        Ed25519PrivateKey,
-        Ed25519PublicKey,
-    )
-    from cryptography.hazmat.primitives.asymmetric.rsa import (
-        RSAPrivateKey,
-        RSAPrivateNumbers,
-        RSAPublicKey,
-        RSAPublicNumbers,
-        rsa_crt_dmp1,
-        rsa_crt_dmq1,
-        rsa_crt_iqmp,
-        rsa_recover_prime_factors,
-    )
-    from cryptography.hazmat.primitives.serialization import (
-        Encoding,
-        NoEncryption,
-        PrivateFormat,
-        PublicFormat,
-        load_pem_private_key,
-        load_pem_public_key,
-        load_ssh_public_key,
-    )
-
-    has_crypto = True
-except ModuleNotFoundError:
-    has_crypto = False
-
-
-if TYPE_CHECKING:
-    # Type aliases for convenience in algorithms method signatures
-    AllowedRSAKeys = RSAPrivateKey | RSAPublicKey
-    AllowedECKeys = EllipticCurvePrivateKey | EllipticCurvePublicKey
-    AllowedOKPKeys = (
-        Ed25519PrivateKey | Ed25519PublicKey | Ed448PrivateKey | Ed448PublicKey
-    )
-    AllowedKeys = AllowedRSAKeys | AllowedECKeys | AllowedOKPKeys
-    AllowedPrivateKeys = (
-        RSAPrivateKey | EllipticCurvePrivateKey | Ed25519PrivateKey | Ed448PrivateKey
-    )
-    AllowedPublicKeys = (
-        RSAPublicKey | EllipticCurvePublicKey | Ed25519PublicKey | Ed448PublicKey
-    )
-
-
-requires_cryptography = {
-    "RS256",
-    "RS384",
-    "RS512",
-    "ES256",
-    "ES256K",
-    "ES384",
-    "ES521",
-    "ES512",
-    "PS256",
-    "PS384",
-    "PS512",
-    "EdDSA",
-}
-
-
-def get_default_algorithms() -> dict[str, Algorithm]:
-    """
-    Returns the algorithms that are implemented by the library.
-    """
-    default_algorithms = {
-        "none": NoneAlgorithm(),
-        "HS256": HMACAlgorithm(HMACAlgorithm.SHA256),
-        "HS384": HMACAlgorithm(HMACAlgorithm.SHA384),
-        "HS512": HMACAlgorithm(HMACAlgorithm.SHA512),
-    }
-
-    if has_crypto:
-        default_algorithms.update(
-            {
-                "RS256": RSAAlgorithm(RSAAlgorithm.SHA256),
-                "RS384": RSAAlgorithm(RSAAlgorithm.SHA384),
-                "RS512": RSAAlgorithm(RSAAlgorithm.SHA512),
-                "ES256": ECAlgorithm(ECAlgorithm.SHA256),
-                "ES256K": ECAlgorithm(ECAlgorithm.SHA256),
-                "ES384": ECAlgorithm(ECAlgorithm.SHA384),
-                "ES521": ECAlgorithm(ECAlgorithm.SHA512),
-                "ES512": ECAlgorithm(
-                    ECAlgorithm.SHA512
-                ),  # Backward compat for #219 fix
-                "PS256": RSAPSSAlgorithm(RSAPSSAlgorithm.SHA256),
-                "PS384": RSAPSSAlgorithm(RSAPSSAlgorithm.SHA384),
-                "PS512": RSAPSSAlgorithm(RSAPSSAlgorithm.SHA512),
-                "EdDSA": OKPAlgorithm(),
-            }
-        )
-
-    return default_algorithms
-
-
-class Algorithm(ABC):
-    """
-    The interface for an algorithm used to sign and verify tokens.
-    """
-
-    def compute_hash_digest(self, bytestr: bytes) -> bytes:
-        """
-        Compute a hash digest using the specified algorithm's hash algorithm.
-
-        If there is no hash algorithm, raises a NotImplementedError.
-        """
-        # lookup self.hash_alg if defined in a way that mypy can understand
-        hash_alg = getattr(self, "hash_alg", None)
-        if hash_alg is None:
-            raise NotImplementedError
-
-        if (
-            has_crypto
-            and isinstance(hash_alg, type)
-            and issubclass(hash_alg, hashes.HashAlgorithm)
-        ):
-            digest = hashes.Hash(hash_alg(), backend=default_backend())
-            digest.update(bytestr)
-            return bytes(digest.finalize())
-        else:
-            return bytes(hash_alg(bytestr).digest())
-
-    @abstractmethod
-    def prepare_key(self, key: Any) -> Any:
-        """
-        Performs necessary validation and conversions on the key and returns
-        the key value in the proper format for sign() and verify().
-        """
-
-    @abstractmethod
-    def sign(self, msg: bytes, key: Any) -> bytes:
-        """
-        Returns a digital signature for the specified message
-        using the specified key value.
-        """
-
-    @abstractmethod
-    def verify(self, msg: bytes, key: Any, sig: bytes) -> bool:
-        """
-        Verifies that the specified digital signature is valid
-        for the specified message and key values.
-        """
-
-    @overload
-    @staticmethod
-    @abstractmethod
-    def to_jwk(key_obj, as_dict: Literal[True]) -> JWKDict: ...  # pragma: no cover
-
-    @overload
-    @staticmethod
-    @abstractmethod
-    def to_jwk(key_obj, as_dict: Literal[False] = False) -> str: ...  # pragma: no cover
-
-    @staticmethod
-    @abstractmethod
-    def to_jwk(key_obj, as_dict: bool = False) -> JWKDict | str:
-        """
-        Serializes a given key into a JWK
-        """
-
-    @staticmethod
-    @abstractmethod
-    def from_jwk(jwk: str | JWKDict) -> Any:
-        """
-        Deserializes a given key from JWK back into a key object
-        """
-
-
-class NoneAlgorithm(Algorithm):
-    """
-    Placeholder for use when no signing or verification
-    operations are required.
-    """
-
-    def prepare_key(self, key: str | None) -> None:
-        if key == "":
-            key = None
-
-        if key is not None:
-            raise InvalidKeyError('When alg = "none", key value must be None.')
-
-        return key
-
-    def sign(self, msg: bytes, key: None) -> bytes:
-        return b""
-
-    def verify(self, msg: bytes, key: None, sig: bytes) -> bool:
-        return False
-
-    @staticmethod
-    def to_jwk(key_obj: Any, as_dict: bool = False) -> NoReturn:
-        raise NotImplementedError()
-
-    @staticmethod
-    def from_jwk(jwk: str | JWKDict) -> NoReturn:
-        raise NotImplementedError()
-
-
-class HMACAlgorithm(Algorithm):
-    """
-    Performs signing and verification operations using HMAC
-    and the specified hash function.
-    """
-
-    SHA256: ClassVar[HashlibHash] = hashlib.sha256
-    SHA384: ClassVar[HashlibHash] = hashlib.sha384
-    SHA512: ClassVar[HashlibHash] = hashlib.sha512
-
-    def __init__(self, hash_alg: HashlibHash) -> None:
-        self.hash_alg = hash_alg
-
-    def prepare_key(self, key: str | bytes) -> bytes:
-        key_bytes = force_bytes(key)
-
-        if is_pem_format(key_bytes) or is_ssh_key(key_bytes):
-            raise InvalidKeyError(
-                "The specified key is an asymmetric key or x509 certificate and"
-                " should not be used as an HMAC secret."
-            )
-
-        return key_bytes
-
-    @overload
-    @staticmethod
-    def to_jwk(
-        key_obj: str | bytes, as_dict: Literal[True]
-    ) -> JWKDict: ...  # pragma: no cover
-
-    @overload
-    @staticmethod
-    def to_jwk(
-        key_obj: str | bytes, as_dict: Literal[False] = False
-    ) -> str: ...  # pragma: no cover
-
-    @staticmethod
-    def to_jwk(key_obj: str | bytes, as_dict: bool = False) -> JWKDict | str:
-        jwk = {
-            "k": base64url_encode(force_bytes(key_obj)).decode(),
-            "kty": "oct",
-        }
-
-        if as_dict:
-            return jwk
-        else:
-            return json.dumps(jwk)
-
-    @staticmethod
-    def from_jwk(jwk: str | JWKDict) -> bytes:
-        try:
-            if isinstance(jwk, str):
-                obj: JWKDict = json.loads(jwk)
-            elif isinstance(jwk, dict):
-                obj = jwk
-            else:
-                raise ValueError
-        except ValueError:
-            raise InvalidKeyError("Key is not valid JSON") from None
-
-        if obj.get("kty") != "oct":
-            raise InvalidKeyError("Not an HMAC key")
-
-        return base64url_decode(obj["k"])
-
-    def sign(self, msg: bytes, key: bytes) -> bytes:
-        return hmac.new(key, msg, self.hash_alg).digest()
-
-    def verify(self, msg: bytes, key: bytes, sig: bytes) -> bool:
-        return hmac.compare_digest(sig, self.sign(msg, key))
-
-
-if has_crypto:
-
-    class RSAAlgorithm(Algorithm):
-        """
-        Performs signing and verification operations using
-        RSASSA-PKCS-v1_5 and the specified hash function.
-        """
-
-        SHA256: ClassVar[type[hashes.HashAlgorithm]] = hashes.SHA256
-        SHA384: ClassVar[type[hashes.HashAlgorithm]] = hashes.SHA384
-        SHA512: ClassVar[type[hashes.HashAlgorithm]] = hashes.SHA512
-
-        def __init__(self, hash_alg: type[hashes.HashAlgorithm]) -> None:
-            self.hash_alg = hash_alg
-
-        def prepare_key(self, key: AllowedRSAKeys | str | bytes) -> AllowedRSAKeys:
-            if isinstance(key, (RSAPrivateKey, RSAPublicKey)):
-                return key
-
-            if not isinstance(key, (bytes, str)):
-                raise TypeError("Expecting a PEM-formatted key.")
-
-            key_bytes = force_bytes(key)
-
-            try:
-                if key_bytes.startswith(b"ssh-rsa"):
-                    return cast(RSAPublicKey, load_ssh_public_key(key_bytes))
-                else:
-                    return cast(
-                        RSAPrivateKey, load_pem_private_key(key_bytes, password=None)
-                    )
-            except ValueError:
-                try:
-                    return cast(RSAPublicKey, load_pem_public_key(key_bytes))
-                except (ValueError, UnsupportedAlgorithm):
-                    raise InvalidKeyError(
-                        "Could not parse the provided public key."
-                    ) from None
-
-        @overload
-        @staticmethod
-        def to_jwk(
-            key_obj: AllowedRSAKeys, as_dict: Literal[True]
-        ) -> JWKDict: ...  # pragma: no cover
-
-        @overload
-        @staticmethod
-        def to_jwk(
-            key_obj: AllowedRSAKeys, as_dict: Literal[False] = False
-        ) -> str: ...  # pragma: no cover
-
-        @staticmethod
-        def to_jwk(key_obj: AllowedRSAKeys, as_dict: bool = False) -> JWKDict | str:
-            obj: dict[str, Any] | None = None
-
-            if hasattr(key_obj, "private_numbers"):
-                # Private key
-                numbers = key_obj.private_numbers()
-
-                obj = {
-                    "kty": "RSA",
-                    "key_ops": ["sign"],
-                    "n": to_base64url_uint(numbers.public_numbers.n).decode(),
-                    "e": to_base64url_uint(numbers.public_numbers.e).decode(),
-                    "d": to_base64url_uint(numbers.d).decode(),
-                    "p": to_base64url_uint(numbers.p).decode(),
-                    "q": to_base64url_uint(numbers.q).decode(),
-                    "dp": to_base64url_uint(numbers.dmp1).decode(),
-                    "dq": to_base64url_uint(numbers.dmq1).decode(),
-                    "qi": to_base64url_uint(numbers.iqmp).decode(),
-                }
-
-            elif hasattr(key_obj, "verify"):
-                # Public key
-                numbers = key_obj.public_numbers()
-
-                obj = {
-                    "kty": "RSA",
-                    "key_ops": ["verify"],
-                    "n": to_base64url_uint(numbers.n).decode(),
-                    "e": to_base64url_uint(numbers.e).decode(),
-                }
-            else:
-                raise InvalidKeyError("Not a public or private key")
-
-            if as_dict:
-                return obj
-            else:
-                return json.dumps(obj)
-
-        @staticmethod
-        def from_jwk(jwk: str | JWKDict) -> AllowedRSAKeys:
-            try:
-                if isinstance(jwk, str):
-                    obj = json.loads(jwk)
-                elif isinstance(jwk, dict):
-                    obj = jwk
-                else:
-                    raise ValueError
-            except ValueError:
-                raise InvalidKeyError("Key is not valid JSON") from None
-
-            if obj.get("kty") != "RSA":
-                raise InvalidKeyError("Not an RSA key") from None
-
-            if "d" in obj and "e" in obj and "n" in obj:
-                # Private key
-                if "oth" in obj:
-                    raise InvalidKeyError(
-                        "Unsupported RSA private key: > 2 primes not supported"
-                    )
-
-                other_props = ["p", "q", "dp", "dq", "qi"]
-                props_found = [prop in obj for prop in other_props]
-                any_props_found = any(props_found)
-
-                if any_props_found and not all(props_found):
-                    raise InvalidKeyError(
-                        "RSA key must include all parameters if any are present besides d"
-                    ) from None
-
-                public_numbers = RSAPublicNumbers(
-                    from_base64url_uint(obj["e"]),
-                    from_base64url_uint(obj["n"]),
-                )
-
-                if any_props_found:
-                    numbers = RSAPrivateNumbers(
-                        d=from_base64url_uint(obj["d"]),
-                        p=from_base64url_uint(obj["p"]),
-                        q=from_base64url_uint(obj["q"]),
-                        dmp1=from_base64url_uint(obj["dp"]),
-                        dmq1=from_base64url_uint(obj["dq"]),
-                        iqmp=from_base64url_uint(obj["qi"]),
-                        public_numbers=public_numbers,
-                    )
-                else:
-                    d = from_base64url_uint(obj["d"])
-                    p, q = rsa_recover_prime_factors(
-                        public_numbers.n, d, public_numbers.e
-                    )
-
-                    numbers = RSAPrivateNumbers(
-                        d=d,
-                        p=p,
-                        q=q,
-                        dmp1=rsa_crt_dmp1(d, p),
-                        dmq1=rsa_crt_dmq1(d, q),
-                        iqmp=rsa_crt_iqmp(p, q),
-                        public_numbers=public_numbers,
-                    )
-
-                return numbers.private_key()
-            elif "n" in obj and "e" in obj:
-                # Public key
-                return RSAPublicNumbers(
-                    from_base64url_uint(obj["e"]),
-                    from_base64url_uint(obj["n"]),
-                ).public_key()
-            else:
-                raise InvalidKeyError("Not a public or private key")
-
-        def sign(self, msg: bytes, key: RSAPrivateKey) -> bytes:
-            return key.sign(msg, padding.PKCS1v15(), self.hash_alg())
-
-        def verify(self, msg: bytes, key: RSAPublicKey, sig: bytes) -> bool:
-            try:
-                key.verify(sig, msg, padding.PKCS1v15(), self.hash_alg())
-                return True
-            except InvalidSignature:
-                return False
-
-    class ECAlgorithm(Algorithm):
-        """
-        Performs signing and verification operations using
-        ECDSA and the specified hash function
-        """
-
-        SHA256: ClassVar[type[hashes.HashAlgorithm]] = hashes.SHA256
-        SHA384: ClassVar[type[hashes.HashAlgorithm]] = hashes.SHA384
-        SHA512: ClassVar[type[hashes.HashAlgorithm]] = hashes.SHA512
-
-        def __init__(self, hash_alg: type[hashes.HashAlgorithm]) -> None:
-            self.hash_alg = hash_alg
-
-        def prepare_key(self, key: AllowedECKeys | str | bytes) -> AllowedECKeys:
-            if isinstance(key, (EllipticCurvePrivateKey, EllipticCurvePublicKey)):
-                return key
-
-            if not isinstance(key, (bytes, str)):
-                raise TypeError("Expecting a PEM-formatted key.")
-
-            key_bytes = force_bytes(key)
-
-            # Attempt to load key. We don't know if it's
-            # a Signing Key or a Verifying Key, so we try
-            # the Verifying Key first.
-            try:
-                if key_bytes.startswith(b"ecdsa-sha2-"):
-                    crypto_key = load_ssh_public_key(key_bytes)
-                else:
-                    crypto_key = load_pem_public_key(key_bytes)  # type: ignore[assignment]
-            except ValueError:
-                crypto_key = load_pem_private_key(key_bytes, password=None)  # type: ignore[assignment]
-
-            # Explicit check the key to prevent confusing errors from cryptography
-            if not isinstance(
-                crypto_key, (EllipticCurvePrivateKey, EllipticCurvePublicKey)
-            ):
-                raise InvalidKeyError(
-                    "Expecting a EllipticCurvePrivateKey/EllipticCurvePublicKey. Wrong key provided for ECDSA algorithms"
-                ) from None
-
-            return crypto_key
-
-        def sign(self, msg: bytes, key: EllipticCurvePrivateKey) -> bytes:
-            der_sig = key.sign(msg, ECDSA(self.hash_alg()))
-
-            return der_to_raw_signature(der_sig, key.curve)
-
-        def verify(self, msg: bytes, key: AllowedECKeys, sig: bytes) -> bool:
-            try:
-                der_sig = raw_to_der_signature(sig, key.curve)
-            except ValueError:
-                return False
-
-            try:
-                public_key = (
-                    key.public_key()
-                    if isinstance(key, EllipticCurvePrivateKey)
-                    else key
-                )
-                public_key.verify(der_sig, msg, ECDSA(self.hash_alg()))
-                return True
-            except InvalidSignature:
-                return False
-
-        @overload
-        @staticmethod
-        def to_jwk(
-            key_obj: AllowedECKeys, as_dict: Literal[True]
-        ) -> JWKDict: ...  # pragma: no cover
-
-        @overload
-        @staticmethod
-        def to_jwk(
-            key_obj: AllowedECKeys, as_dict: Literal[False] = False
-        ) -> str: ...  # pragma: no cover
-
-        @staticmethod
-        def to_jwk(key_obj: AllowedECKeys, as_dict: bool = False) -> JWKDict | str:
-            if isinstance(key_obj, EllipticCurvePrivateKey):
-                public_numbers = key_obj.public_key().public_numbers()
-            elif isinstance(key_obj, EllipticCurvePublicKey):
-                public_numbers = key_obj.public_numbers()
-            else:
-                raise InvalidKeyError("Not a public or private key")
-
-            if isinstance(key_obj.curve, SECP256R1):
-                crv = "P-256"
-            elif isinstance(key_obj.curve, SECP384R1):
-                crv = "P-384"
-            elif isinstance(key_obj.curve, SECP521R1):
-                crv = "P-521"
-            elif isinstance(key_obj.curve, SECP256K1):
-                crv = "secp256k1"
-            else:
-                raise InvalidKeyError(f"Invalid curve: {key_obj.curve}")
-
-            obj: dict[str, Any] = {
-                "kty": "EC",
-                "crv": crv,
-                "x": to_base64url_uint(
-                    public_numbers.x,
-                    bit_length=key_obj.curve.key_size,
-                ).decode(),
-                "y": to_base64url_uint(
-                    public_numbers.y,
-                    bit_length=key_obj.curve.key_size,
-                ).decode(),
-            }
-
-            if isinstance(key_obj, EllipticCurvePrivateKey):
-                obj["d"] = to_base64url_uint(
-                    key_obj.private_numbers().private_value,
-                    bit_length=key_obj.curve.key_size,
-                ).decode()
-
-            if as_dict:
-                return obj
-            else:
-                return json.dumps(obj)
-
-        @staticmethod
-        def from_jwk(jwk: str | JWKDict) -> AllowedECKeys:
-            try:
-                if isinstance(jwk, str):
-                    obj = json.loads(jwk)
-                elif isinstance(jwk, dict):
-                    obj = jwk
-                else:
-                    raise ValueError
-            except ValueError:
-                raise InvalidKeyError("Key is not valid JSON") from None
-
-            if obj.get("kty") != "EC":
-                raise InvalidKeyError("Not an Elliptic curve key") from None
-
-            if "x" not in obj or "y" not in obj:
-                raise InvalidKeyError("Not an Elliptic curve key") from None
-
-            x = base64url_decode(obj.get("x"))
-            y = base64url_decode(obj.get("y"))
-
-            curve = obj.get("crv")
-            curve_obj: EllipticCurve
-
-            if curve == "P-256":
-                if len(x) == len(y) == 32:
-                    curve_obj = SECP256R1()
-                else:
-                    raise InvalidKeyError(
-                        "Coords should be 32 bytes for curve P-256"
-                    ) from None
-            elif curve == "P-384":
-                if len(x) == len(y) == 48:
-                    curve_obj = SECP384R1()
-                else:
-                    raise InvalidKeyError(
-                        "Coords should be 48 bytes for curve P-384"
-                    ) from None
-            elif curve == "P-521":
-                if len(x) == len(y) == 66:
-                    curve_obj = SECP521R1()
-                else:
-                    raise InvalidKeyError(
-                        "Coords should be 66 bytes for curve P-521"
-                    ) from None
-            elif curve == "secp256k1":
-                if len(x) == len(y) == 32:
-                    curve_obj = SECP256K1()
-                else:
-                    raise InvalidKeyError(
-                        "Coords should be 32 bytes for curve secp256k1"
-                    )
-            else:
-                raise InvalidKeyError(f"Invalid curve: {curve}")
-
-            public_numbers = EllipticCurvePublicNumbers(
-                x=int.from_bytes(x, byteorder="big"),
-                y=int.from_bytes(y, byteorder="big"),
-                curve=curve_obj,
-            )
-
-            if "d" not in obj:
-                return public_numbers.public_key()
-
-            d = base64url_decode(obj.get("d"))
-            if len(d) != len(x):
-                raise InvalidKeyError(
-                    "D should be {} bytes for curve {}", len(x), curve
-                )
-
-            return EllipticCurvePrivateNumbers(
-                int.from_bytes(d, byteorder="big"), public_numbers
-            ).private_key()
-
-    class RSAPSSAlgorithm(RSAAlgorithm):
-        """
-        Performs a signature using RSASSA-PSS with MGF1
-        """
-
-        def sign(self, msg: bytes, key: RSAPrivateKey) -> bytes:
-            return key.sign(
-                msg,
-                padding.PSS(
-                    mgf=padding.MGF1(self.hash_alg()),
-                    salt_length=self.hash_alg().digest_size,
-                ),
-                self.hash_alg(),
-            )
-
-        def verify(self, msg: bytes, key: RSAPublicKey, sig: bytes) -> bool:
-            try:
-                key.verify(
-                    sig,
-                    msg,
-                    padding.PSS(
-                        mgf=padding.MGF1(self.hash_alg()),
-                        salt_length=self.hash_alg().digest_size,
-                    ),
-                    self.hash_alg(),
-                )
-                return True
-            except InvalidSignature:
-                return False
-
-    class OKPAlgorithm(Algorithm):
-        """
-        Performs signing and verification operations using EdDSA
-
-        This class requires ``cryptography>=2.6`` to be installed.
-        """
-
-        def __init__(self, **kwargs: Any) -> None:
-            pass
-
-        def prepare_key(self, key: AllowedOKPKeys | str | bytes) -> AllowedOKPKeys:
-            if isinstance(key, (bytes, str)):
-                key_str = key.decode("utf-8") if isinstance(key, bytes) else key
-                key_bytes = key.encode("utf-8") if isinstance(key, str) else key
-
-                if "-----BEGIN PUBLIC" in key_str:
-                    key = load_pem_public_key(key_bytes)  # type: ignore[assignment]
-                elif "-----BEGIN PRIVATE" in key_str:
-                    key = load_pem_private_key(key_bytes, password=None)  # type: ignore[assignment]
-                elif key_str[0:4] == "ssh-":
-                    key = load_ssh_public_key(key_bytes)  # type: ignore[assignment]
-
-            # Explicit check the key to prevent confusing errors from cryptography
-            if not isinstance(
-                key,
-                (Ed25519PrivateKey, Ed25519PublicKey, Ed448PrivateKey, Ed448PublicKey),
-            ):
-                raise InvalidKeyError(
-                    "Expecting a EllipticCurvePrivateKey/EllipticCurvePublicKey. Wrong key provided for EdDSA algorithms"
-                )
-
-            return key
-
-        def sign(
-            self, msg: str | bytes, key: Ed25519PrivateKey | Ed448PrivateKey
-        ) -> bytes:
-            """
-            Sign a message ``msg`` using the EdDSA private key ``key``
-            :param str|bytes msg: Message to sign
-            :param Ed25519PrivateKey}Ed448PrivateKey key: A :class:`.Ed25519PrivateKey`
-                or :class:`.Ed448PrivateKey` isinstance
-            :return bytes signature: The signature, as bytes
-            """
-            msg_bytes = msg.encode("utf-8") if isinstance(msg, str) else msg
-            return key.sign(msg_bytes)
-
-        def verify(
-            self, msg: str | bytes, key: AllowedOKPKeys, sig: str | bytes
-        ) -> bool:
-            """
-            Verify a given ``msg`` against a signature ``sig`` using the EdDSA key ``key``
-
-            :param str|bytes sig: EdDSA signature to check ``msg`` against
-            :param str|bytes msg: Message to sign
-            :param Ed25519PrivateKey|Ed25519PublicKey|Ed448PrivateKey|Ed448PublicKey key:
-                A private or public EdDSA key instance
-            :return bool verified: True if signature is valid, False if not.
-            """
-            try:
-                msg_bytes = msg.encode("utf-8") if isinstance(msg, str) else msg
-                sig_bytes = sig.encode("utf-8") if isinstance(sig, str) else sig
-
-                public_key = (
-                    key.public_key()
-                    if isinstance(key, (Ed25519PrivateKey, Ed448PrivateKey))
-                    else key
-                )
-                public_key.verify(sig_bytes, msg_bytes)
-                return True  # If no exception was raised, the signature is valid.
-            except InvalidSignature:
-                return False
-
-        @overload
-        @staticmethod
-        def to_jwk(
-            key: AllowedOKPKeys, as_dict: Literal[True]
-        ) -> JWKDict: ...  # pragma: no cover
-
-        @overload
-        @staticmethod
-        def to_jwk(
-            key: AllowedOKPKeys, as_dict: Literal[False] = False
-        ) -> str: ...  # pragma: no cover
-
-        @staticmethod
-        def to_jwk(key: AllowedOKPKeys, as_dict: bool = False) -> JWKDict | str:
-            if isinstance(key, (Ed25519PublicKey, Ed448PublicKey)):
-                x = key.public_bytes(
-                    encoding=Encoding.Raw,
-                    format=PublicFormat.Raw,
-                )
-                crv = "Ed25519" if isinstance(key, Ed25519PublicKey) else "Ed448"
-
-                obj = {
-                    "x": base64url_encode(force_bytes(x)).decode(),
-                    "kty": "OKP",
-                    "crv": crv,
-                }
-
-                if as_dict:
-                    return obj
-                else:
-                    return json.dumps(obj)
-
-            if isinstance(key, (Ed25519PrivateKey, Ed448PrivateKey)):
-                d = key.private_bytes(
-                    encoding=Encoding.Raw,
-                    format=PrivateFormat.Raw,
-                    encryption_algorithm=NoEncryption(),
-                )
-
-                x = key.public_key().public_bytes(
-                    encoding=Encoding.Raw,
-                    format=PublicFormat.Raw,
-                )
-
-                crv = "Ed25519" if isinstance(key, Ed25519PrivateKey) else "Ed448"
-                obj = {
-                    "x": base64url_encode(force_bytes(x)).decode(),
-                    "d": base64url_encode(force_bytes(d)).decode(),
-                    "kty": "OKP",
-                    "crv": crv,
-                }
-
-                if as_dict:
-                    return obj
-                else:
-                    return json.dumps(obj)
-
-            raise InvalidKeyError("Not a public or private key")
-
-        @staticmethod
-        def from_jwk(jwk: str | JWKDict) -> AllowedOKPKeys:
-            try:
-                if isinstance(jwk, str):
-                    obj = json.loads(jwk)
-                elif isinstance(jwk, dict):
-                    obj = jwk
-                else:
-                    raise ValueError
-            except ValueError:
-                raise InvalidKeyError("Key is not valid JSON") from None
-
-            if obj.get("kty") != "OKP":
-                raise InvalidKeyError("Not an Octet Key Pair")
-
-            curve = obj.get("crv")
-            if curve != "Ed25519" and curve != "Ed448":
-                raise InvalidKeyError(f"Invalid curve: {curve}")
-
-            if "x" not in obj:
-                raise InvalidKeyError('OKP should have "x" parameter')
-            x = base64url_decode(obj.get("x"))
-
-            try:
-                if "d" not in obj:
-                    if curve == "Ed25519":
-                        return Ed25519PublicKey.from_public_bytes(x)
-                    return Ed448PublicKey.from_public_bytes(x)
-                d = base64url_decode(obj.get("d"))
-                if curve == "Ed25519":
-                    return Ed25519PrivateKey.from_private_bytes(d)
-                return Ed448PrivateKey.from_private_bytes(d)
-            except ValueError as err:
-                raise InvalidKeyError("Invalid key parameter") from err
diff --git a/lib/jwt/api_jwk.py b/lib/jwt/api_jwk.py
deleted file mode 100644
index 02f4679c..00000000
--- a/lib/jwt/api_jwk.py
+++ /dev/null
@@ -1,144 +0,0 @@
-from __future__ import annotations
-
-import json
-import time
-from typing import Any
-
-from .algorithms import get_default_algorithms, has_crypto, requires_cryptography
-from .exceptions import (
-    InvalidKeyError,
-    MissingCryptographyError,
-    PyJWKError,
-    PyJWKSetError,
-    PyJWTError,
-)
-from .types import JWKDict
-
-
-class PyJWK:
-    def __init__(self, jwk_data: JWKDict, algorithm: str | None = None) -> None:
-        self._algorithms = get_default_algorithms()
-        self._jwk_data = jwk_data
-
-        kty = self._jwk_data.get("kty", None)
-        if not kty:
-            raise InvalidKeyError(f"kty is not found: {self._jwk_data}")
-
-        if not algorithm and isinstance(self._jwk_data, dict):
-            algorithm = self._jwk_data.get("alg", None)
-
-        if not algorithm:
-            # Determine alg with kty (and crv).
-            crv = self._jwk_data.get("crv", None)
-            if kty == "EC":
-                if crv == "P-256" or not crv:
-                    algorithm = "ES256"
-                elif crv == "P-384":
-                    algorithm = "ES384"
-                elif crv == "P-521":
-                    algorithm = "ES512"
-                elif crv == "secp256k1":
-                    algorithm = "ES256K"
-                else:
-                    raise InvalidKeyError(f"Unsupported crv: {crv}")
-            elif kty == "RSA":
-                algorithm = "RS256"
-            elif kty == "oct":
-                algorithm = "HS256"
-            elif kty == "OKP":
-                if not crv:
-                    raise InvalidKeyError(f"crv is not found: {self._jwk_data}")
-                if crv == "Ed25519":
-                    algorithm = "EdDSA"
-                else:
-                    raise InvalidKeyError(f"Unsupported crv: {crv}")
-            else:
-                raise InvalidKeyError(f"Unsupported kty: {kty}")
-
-        if not has_crypto and algorithm in requires_cryptography:
-            raise MissingCryptographyError(
-                f"{algorithm} requires 'cryptography' to be installed."
-            )
-
-        self.algorithm_name = algorithm
-
-        if algorithm in self._algorithms:
-            self.Algorithm = self._algorithms[algorithm]
-        else:
-            raise PyJWKError(f"Unable to find an algorithm for key: {self._jwk_data}")
-
-        self.key = self.Algorithm.from_jwk(self._jwk_data)
-
-    @staticmethod
-    def from_dict(obj: JWKDict, algorithm: str | None = None) -> PyJWK:
-        return PyJWK(obj, algorithm)
-
-    @staticmethod
-    def from_json(data: str, algorithm: None = None) -> PyJWK:
-        obj = json.loads(data)
-        return PyJWK.from_dict(obj, algorithm)
-
-    @property
-    def key_type(self) -> str | None:
-        return self._jwk_data.get("kty", None)
-
-    @property
-    def key_id(self) -> str | None:
-        return self._jwk_data.get("kid", None)
-
-    @property
-    def public_key_use(self) -> str | None:
-        return self._jwk_data.get("use", None)
-
-
-class PyJWKSet:
-    def __init__(self, keys: list[JWKDict]) -> None:
-        self.keys = []
-
-        if not keys:
-            raise PyJWKSetError("The JWK Set did not contain any keys")
-
-        if not isinstance(keys, list):
-            raise PyJWKSetError("Invalid JWK Set value")
-
-        for key in keys:
-            try:
-                self.keys.append(PyJWK(key))
-            except PyJWTError as error:
-                if isinstance(error, MissingCryptographyError):
-                    raise error
-                # skip unusable keys
-                continue
-
-        if len(self.keys) == 0:
-            raise PyJWKSetError(
-                "The JWK Set did not contain any usable keys. Perhaps 'cryptography' is not installed?"
-            )
-
-    @staticmethod
-    def from_dict(obj: dict[str, Any]) -> PyJWKSet:
-        keys = obj.get("keys", [])
-        return PyJWKSet(keys)
-
-    @staticmethod
-    def from_json(data: str) -> PyJWKSet:
-        obj = json.loads(data)
-        return PyJWKSet.from_dict(obj)
-
-    def __getitem__(self, kid: str) -> PyJWK:
-        for key in self.keys:
-            if key.key_id == kid:
-                return key
-        raise KeyError(f"keyset has no key for kid: {kid}")
-
-
-class PyJWTSetWithTimestamp:
-    def __init__(self, jwk_set: PyJWKSet):
-        self.jwk_set = jwk_set
-        self.timestamp = time.monotonic()
-
-    def get_jwk_set(self) -> PyJWKSet:
-        return self.jwk_set
-
-    def get_timestamp(self) -> float:
-        return self.timestamp
diff --git a/lib/jwt/api_jws.py b/lib/jwt/api_jws.py
deleted file mode 100644
index 654ee0b7..00000000
--- a/lib/jwt/api_jws.py
+++ /dev/null
@@ -1,346 +0,0 @@
-from __future__ import annotations
-
-import binascii
-import json
-import warnings
-from collections.abc import Sequence
-from typing import TYPE_CHECKING, Any
-
-from .algorithms import (
-    Algorithm,
-    get_default_algorithms,
-    has_crypto,
-    requires_cryptography,
-)
-from .api_jwk import PyJWK
-from .exceptions import (
-    DecodeError,
-    InvalidAlgorithmError,
-    InvalidSignatureError,
-    InvalidTokenError,
-)
-from .utils import base64url_decode, base64url_encode
-from .warnings import RemovedInPyjwt3Warning
-
-if TYPE_CHECKING:
-    from .algorithms import AllowedPrivateKeys, AllowedPublicKeys
-
-
-class PyJWS:
-    header_typ = "JWT"
-
-    def __init__(
-        self,
-        algorithms: Sequence[str] | None = None,
-        options: dict[str, Any] | None = None,
-    ) -> None:
-        self._algorithms = get_default_algorithms()
-        self._valid_algs = (
-            set(algorithms) if algorithms is not None else set(self._algorithms)
-        )
-
-        # Remove algorithms that aren't on the whitelist
-        for key in list(self._algorithms.keys()):
-            if key not in self._valid_algs:
-                del self._algorithms[key]
-
-        if options is None:
-            options = {}
-        self.options = {**self._get_default_options(), **options}
-
-    @staticmethod
-    def _get_default_options() -> dict[str, bool]:
-        return {"verify_signature": True}
-
-    def register_algorithm(self, alg_id: str, alg_obj: Algorithm) -> None:
-        """
-        Registers a new Algorithm for use when creating and verifying tokens.
-        """
-        if alg_id in self._algorithms:
-            raise ValueError("Algorithm already has a handler.")
-
-        if not isinstance(alg_obj, Algorithm):
-            raise TypeError("Object is not of type `Algorithm`")
-
-        self._algorithms[alg_id] = alg_obj
-        self._valid_algs.add(alg_id)
-
-    def unregister_algorithm(self, alg_id: str) -> None:
-        """
-        Unregisters an Algorithm for use when creating and verifying tokens
-        Throws KeyError if algorithm is not registered.
-        """
-        if alg_id not in self._algorithms:
-            raise KeyError(
-                "The specified algorithm could not be removed"
-                " because it is not registered."
-            )
-
-        del self._algorithms[alg_id]
-        self._valid_algs.remove(alg_id)
-
-    def get_algorithms(self) -> list[str]:
-        """
-        Returns a list of supported values for the 'alg' parameter.
-        """
-        return list(self._valid_algs)
-
-    def get_algorithm_by_name(self, alg_name: str) -> Algorithm:
-        """
-        For a given string name, return the matching Algorithm object.
-
-        Example usage:
-
-        >>> jws_obj.get_algorithm_by_name("RS256")
-        """
-        try:
-            return self._algorithms[alg_name]
-        except KeyError as e:
-            if not has_crypto and alg_name in requires_cryptography:
-                raise NotImplementedError(
-                    f"Algorithm '{alg_name}' could not be found. Do you have cryptography installed?"
-                ) from e
-            raise NotImplementedError("Algorithm not supported") from e
-
-    def encode(
-        self,
-        payload: bytes,
-        key: AllowedPrivateKeys | PyJWK | str | bytes,
-        algorithm: str | None = None,
-        headers: dict[str, Any] | None = None,
-        json_encoder: type[json.JSONEncoder] | None = None,
-        is_payload_detached: bool = False,
-        sort_headers: bool = True,
-    ) -> str:
-        segments = []
-
-        # declare a new var to narrow the type for type checkers
-        if algorithm is None:
-            if isinstance(key, PyJWK):
-                algorithm_ = key.algorithm_name
-            else:
-                algorithm_ = "HS256"
-        else:
-            algorithm_ = algorithm
-
-        # Prefer headers values if present to function parameters.
-        if headers:
-            headers_alg = headers.get("alg")
-            if headers_alg:
-                algorithm_ = headers["alg"]
-
-            headers_b64 = headers.get("b64")
-            if headers_b64 is False:
-                is_payload_detached = True
-
-        # Header
-        header: dict[str, Any] = {"typ": self.header_typ, "alg": algorithm_}
-
-        if headers:
-            self._validate_headers(headers)
-            header.update(headers)
-
-        if not header["typ"]:
-            del header["typ"]
-
-        if is_payload_detached:
-            header["b64"] = False
-        elif "b64" in header:
-            # True is the standard value for b64, so no need for it
-            del header["b64"]
-
-        json_header = json.dumps(
-            header, separators=(",", ":"), cls=json_encoder, sort_keys=sort_headers
-        ).encode()
-
-        segments.append(base64url_encode(json_header))
-
-        if is_payload_detached:
-            msg_payload = payload
-        else:
-            msg_payload = base64url_encode(payload)
-        segments.append(msg_payload)
-
-        # Segments
-        signing_input = b".".join(segments)
-
-        alg_obj = self.get_algorithm_by_name(algorithm_)
-        if isinstance(key, PyJWK):
-            key = key.key
-        key = alg_obj.prepare_key(key)
-        signature = alg_obj.sign(signing_input, key)
-
-        segments.append(base64url_encode(signature))
-
-        # Don't put the payload content inside the encoded token when detached
-        if is_payload_detached:
-            segments[1] = b""
-        encoded_string = b".".join(segments)
-
-        return encoded_string.decode("utf-8")
-
-    def decode_complete(
-        self,
-        jwt: str | bytes,
-        key: AllowedPublicKeys | PyJWK | str | bytes = "",
-        algorithms: Sequence[str] | None = None,
-        options: dict[str, Any] | None = None,
-        detached_payload: bytes | None = None,
-        **kwargs,
-    ) -> dict[str, Any]:
-        if kwargs:
-            warnings.warn(
-                "passing additional kwargs to decode_complete() is deprecated "
-                "and will be removed in pyjwt version 3. "
-                f"Unsupported kwargs: {tuple(kwargs.keys())}",
-                RemovedInPyjwt3Warning,
-                stacklevel=2,
-            )
-        if options is None:
-            options = {}
-        merged_options = {**self.options, **options}
-        verify_signature = merged_options["verify_signature"]
-
-        if verify_signature and not algorithms and not isinstance(key, PyJWK):
-            raise DecodeError(
-                'It is required that you pass in a value for the "algorithms" argument when calling decode().'
-            )
-
-        payload, signing_input, header, signature = self._load(jwt)
-
-        if header.get("b64", True) is False:
-            if detached_payload is None:
-                raise DecodeError(
-                    'It is required that you pass in a value for the "detached_payload" argument to decode a message having the b64 header set to false.'
-                )
-            payload = detached_payload
-            signing_input = b".".join([signing_input.rsplit(b".", 1)[0], payload])
-
-        if verify_signature:
-            self._verify_signature(signing_input, header, signature, key, algorithms)
-
-        return {
-            "payload": payload,
-            "header": header,
-            "signature": signature,
-        }
-
-    def decode(
-        self,
-        jwt: str | bytes,
-        key: AllowedPublicKeys | PyJWK | str | bytes = "",
-        algorithms: Sequence[str] | None = None,
-        options: dict[str, Any] | None = None,
-        detached_payload: bytes | None = None,
-        **kwargs,
-    ) -> Any:
-        if kwargs:
-            warnings.warn(
-                "passing additional kwargs to decode() is deprecated "
-                "and will be removed in pyjwt version 3. "
-                f"Unsupported kwargs: {tuple(kwargs.keys())}",
-                RemovedInPyjwt3Warning,
-                stacklevel=2,
-            )
-        decoded = self.decode_complete(
-            jwt, key, algorithms, options, detached_payload=detached_payload
-        )
-        return decoded["payload"]
-
-    def get_unverified_header(self, jwt: str | bytes) -> dict[str, Any]:
-        """Returns back the JWT header parameters as a dict()
-
-        Note: The signature is not verified so the header parameters
-        should not be fully trusted until signature verification is complete
-        """
-        headers = self._load(jwt)[2]
-        self._validate_headers(headers)
-
-        return headers
-
-    def _load(self, jwt: str | bytes) -> tuple[bytes, bytes, dict[str, Any], bytes]:
-        if isinstance(jwt, str):
-            jwt = jwt.encode("utf-8")
-
-        if not isinstance(jwt, bytes):
-            raise DecodeError(f"Invalid token type. Token must be a {bytes}")
-
-        try:
-            signing_input, crypto_segment = jwt.rsplit(b".", 1)
-            header_segment, payload_segment = signing_input.split(b".", 1)
-        except ValueError as err:
-            raise DecodeError("Not enough segments") from err
-
-        try:
-            header_data = base64url_decode(header_segment)
-        except (TypeError, binascii.Error) as err:
-            raise DecodeError("Invalid header padding") from err
-
-        try:
-            header = json.loads(header_data)
-        except ValueError as e:
-            raise DecodeError(f"Invalid header string: {e}") from e
-
-        if not isinstance(header, dict):
-            raise DecodeError("Invalid header string: must be a json object")
-
-        try:
-            payload = base64url_decode(payload_segment)
-        except (TypeError, binascii.Error) as err:
-            raise DecodeError("Invalid payload padding") from err
-
-        try:
-            signature = base64url_decode(crypto_segment)
-        except (TypeError, binascii.Error) as err:
-            raise DecodeError("Invalid crypto padding") from err
-
-        return (payload, signing_input, header, signature)
-
-    def _verify_signature(
-        self,
-        signing_input: bytes,
-        header: dict[str, Any],
-        signature: bytes,
-        key: AllowedPublicKeys | PyJWK | str | bytes = "",
-        algorithms: Sequence[str] | None = None,
-    ) -> None:
-        if algorithms is None and isinstance(key, PyJWK):
-            algorithms = [key.algorithm_name]
-        try:
-            alg = header["alg"]
-        except KeyError:
-            raise InvalidAlgorithmError("Algorithm not specified") from None
-
-        if not alg or (algorithms is not None and alg not in algorithms):
-            raise InvalidAlgorithmError("The specified alg value is not allowed")
-
-        if isinstance(key, PyJWK):
-            alg_obj = key.Algorithm
-            prepared_key = key.key
-        else:
-            try:
-                alg_obj = self.get_algorithm_by_name(alg)
-            except NotImplementedError as e:
-                raise InvalidAlgorithmError("Algorithm not supported") from e
-            prepared_key = alg_obj.prepare_key(key)
-
-        if not alg_obj.verify(signing_input, prepared_key, signature):
-            raise InvalidSignatureError("Signature verification failed")
-
-    def _validate_headers(self, headers: dict[str, Any]) -> None:
-        if "kid" in headers:
-            self._validate_kid(headers["kid"])
-
-    def _validate_kid(self, kid: Any) -> None:
-        if not isinstance(kid, str):
-            raise InvalidTokenError("Key ID header parameter must be a string")
-
-
-_jws_global_obj = PyJWS()
-encode = _jws_global_obj.encode
-decode_complete = _jws_global_obj.decode_complete
-decode = _jws_global_obj.decode
-register_algorithm = _jws_global_obj.register_algorithm
-unregister_algorithm = _jws_global_obj.unregister_algorithm
-get_algorithm_by_name = _jws_global_obj.get_algorithm_by_name
-get_unverified_header = _jws_global_obj.get_unverified_header
diff --git a/lib/jwt/api_jwt.py b/lib/jwt/api_jwt.py
deleted file mode 100644
index 3a201436..00000000
--- a/lib/jwt/api_jwt.py
+++ /dev/null
@@ -1,433 +0,0 @@
-from __future__ import annotations
-
-import json
-import warnings
-from calendar import timegm
-from collections.abc import Iterable, Sequence
-from datetime import datetime, timedelta, timezone
-from typing import TYPE_CHECKING, Any
-
-from . import api_jws
-from .exceptions import (
-    DecodeError,
-    ExpiredSignatureError,
-    ImmatureSignatureError,
-    InvalidAudienceError,
-    InvalidIssuedAtError,
-    InvalidIssuerError,
-    InvalidJTIError,
-    InvalidSubjectError,
-    MissingRequiredClaimError,
-)
-from .warnings import RemovedInPyjwt3Warning
-
-if TYPE_CHECKING:
-    from .algorithms import AllowedPrivateKeys, AllowedPublicKeys
-    from .api_jwk import PyJWK
-
-
-class PyJWT:
-    def __init__(self, options: dict[str, Any] | None = None) -> None:
-        if options is None:
-            options = {}
-        self.options: dict[str, Any] = {**self._get_default_options(), **options}
-
-    @staticmethod
-    def _get_default_options() -> dict[str, bool | list[str]]:
-        return {
-            "verify_signature": True,
-            "verify_exp": True,
-            "verify_nbf": True,
-            "verify_iat": True,
-            "verify_aud": True,
-            "verify_iss": True,
-            "verify_sub": True,
-            "verify_jti": True,
-            "require": [],
-        }
-
-    def encode(
-        self,
-        payload: dict[str, Any],
-        key: AllowedPrivateKeys | PyJWK | str | bytes,
-        algorithm: str | None = None,
-        headers: dict[str, Any] | None = None,
-        json_encoder: type[json.JSONEncoder] | None = None,
-        sort_headers: bool = True,
-    ) -> str:
-        # Check that we get a dict
-        if not isinstance(payload, dict):
-            raise TypeError(
-                "Expecting a dict object, as JWT only supports "
-                "JSON objects as payloads."
-            )
-
-        # Payload
-        payload = payload.copy()
-        for time_claim in ["exp", "iat", "nbf"]:
-            # Convert datetime to a intDate value in known time-format claims
-            if isinstance(payload.get(time_claim), datetime):
-                payload[time_claim] = timegm(payload[time_claim].utctimetuple())
-
-        json_payload = self._encode_payload(
-            payload,
-            headers=headers,
-            json_encoder=json_encoder,
-        )
-
-        return api_jws.encode(
-            json_payload,
-            key,
-            algorithm,
-            headers,
-            json_encoder,
-            sort_headers=sort_headers,
-        )
-
-    def _encode_payload(
-        self,
-        payload: dict[str, Any],
-        headers: dict[str, Any] | None = None,
-        json_encoder: type[json.JSONEncoder] | None = None,
-    ) -> bytes:
-        """
-        Encode a given payload to the bytes to be signed.
-
-        This method is intended to be overridden by subclasses that need to
-        encode the payload in a different way, e.g. compress the payload.
-        """
-        return json.dumps(
-            payload,
-            separators=(",", ":"),
-            cls=json_encoder,
-        ).encode("utf-8")
-
-    def decode_complete(
-        self,
-        jwt: str | bytes,
-        key: AllowedPublicKeys | PyJWK | str | bytes = "",
-        algorithms: Sequence[str] | None = None,
-        options: dict[str, Any] | None = None,
-        # deprecated arg, remove in pyjwt3
-        verify: bool | None = None,
-        # could be used as passthrough to api_jws, consider removal in pyjwt3
-        detached_payload: bytes | None = None,
-        # passthrough arguments to _validate_claims
-        # consider putting in options
-        audience: str | Iterable[str] | None = None,
-        issuer: str | Sequence[str] | None = None,
-        subject: str | None = None,
-        leeway: float | timedelta = 0,
-        # kwargs
-        **kwargs: Any,
-    ) -> dict[str, Any]:
-        if kwargs:
-            warnings.warn(
-                "passing additional kwargs to decode_complete() is deprecated "
-                "and will be removed in pyjwt version 3. "
-                f"Unsupported kwargs: {tuple(kwargs.keys())}",
-                RemovedInPyjwt3Warning,
-                stacklevel=2,
-            )
-        options = dict(options or {})  # shallow-copy or initialize an empty dict
-        options.setdefault("verify_signature", True)
-
-        # If the user has set the legacy `verify` argument, and it doesn't match
-        # what the relevant `options` entry for the argument is, inform the user
-        # that they're likely making a mistake.
-        if verify is not None and verify != options["verify_signature"]:
-            warnings.warn(
-                "The `verify` argument to `decode` does nothing in PyJWT 2.0 and newer. "
-                "The equivalent is setting `verify_signature` to False in the `options` dictionary. "
-                "This invocation has a mismatch between the kwarg and the option entry.",
-                category=DeprecationWarning,
-                stacklevel=2,
-            )
-
-        if not options["verify_signature"]:
-            options.setdefault("verify_exp", False)
-            options.setdefault("verify_nbf", False)
-            options.setdefault("verify_iat", False)
-            options.setdefault("verify_aud", False)
-            options.setdefault("verify_iss", False)
-            options.setdefault("verify_sub", False)
-            options.setdefault("verify_jti", False)
-
-        decoded = api_jws.decode_complete(
-            jwt,
-            key=key,
-            algorithms=algorithms,
-            options=options,
-            detached_payload=detached_payload,
-        )
-
-        payload = self._decode_payload(decoded)
-
-        merged_options = {**self.options, **options}
-        self._validate_claims(
-            payload,
-            merged_options,
-            audience=audience,
-            issuer=issuer,
-            leeway=leeway,
-            subject=subject,
-        )
-
-        decoded["payload"] = payload
-        return decoded
-
-    def _decode_payload(self, decoded: dict[str, Any]) -> Any:
-        """
-        Decode the payload from a JWS dictionary (payload, signature, header).
-
-        This method is intended to be overridden by subclasses that need to
-        decode the payload in a different way, e.g. decompress compressed
-        payloads.
-        """
-        try:
-            payload = json.loads(decoded["payload"])
-        except ValueError as e:
-            raise DecodeError(f"Invalid payload string: {e}") from e
-        if not isinstance(payload, dict):
-            raise DecodeError("Invalid payload string: must be a json object")
-        return payload
-
-    def decode(
-        self,
-        jwt: str | bytes,
-        key: AllowedPublicKeys | PyJWK | str | bytes = "",
-        algorithms: Sequence[str] | None = None,
-        options: dict[str, Any] | None = None,
-        # deprecated arg, remove in pyjwt3
-        verify: bool | None = None,
-        # could be used as passthrough to api_jws, consider removal in pyjwt3
-        detached_payload: bytes | None = None,
-        # passthrough arguments to _validate_claims
-        # consider putting in options
-        audience: str | Iterable[str] | None = None,
-        subject: str | None = None,
-        issuer: str | Sequence[str] | None = None,
-        leeway: float | timedelta = 0,
-        # kwargs
-        **kwargs: Any,
-    ) -> Any:
-        if kwargs:
-            warnings.warn(
-                "passing additional kwargs to decode() is deprecated "
-                "and will be removed in pyjwt version 3. "
-                f"Unsupported kwargs: {tuple(kwargs.keys())}",
-                RemovedInPyjwt3Warning,
-                stacklevel=2,
-            )
-        decoded = self.decode_complete(
-            jwt,
-            key,
-            algorithms,
-            options,
-            verify=verify,
-            detached_payload=detached_payload,
-            audience=audience,
-            subject=subject,
-            issuer=issuer,
-            leeway=leeway,
-        )
-        return decoded["payload"]
-
-    def _validate_claims(
-        self,
-        payload: dict[str, Any],
-        options: dict[str, Any],
-        audience=None,
-        issuer=None,
-        subject: str | None = None,
-        leeway: float | timedelta = 0,
-    ) -> None:
-        if isinstance(leeway, timedelta):
-            leeway = leeway.total_seconds()
-
-        if audience is not None and not isinstance(audience, (str, Iterable)):
-            raise TypeError("audience must be a string, iterable or None")
-
-        self._validate_required_claims(payload, options)
-
-        now = datetime.now(tz=timezone.utc).timestamp()
-
-        if "iat" in payload and options["verify_iat"]:
-            self._validate_iat(payload, now, leeway)
-
-        if "nbf" in payload and options["verify_nbf"]:
-            self._validate_nbf(payload, now, leeway)
-
-        if "exp" in payload and options["verify_exp"]:
-            self._validate_exp(payload, now, leeway)
-
-        if options["verify_iss"]:
-            self._validate_iss(payload, issuer)
-
-        if options["verify_aud"]:
-            self._validate_aud(
-                payload, audience, strict=options.get("strict_aud", False)
-            )
-
-        if options["verify_sub"]:
-            self._validate_sub(payload, subject)
-
-        if options["verify_jti"]:
-            self._validate_jti(payload)
-
-    def _validate_required_claims(
-        self,
-        payload: dict[str, Any],
-        options: dict[str, Any],
-    ) -> None:
-        for claim in options["require"]:
-            if payload.get(claim) is None:
-                raise MissingRequiredClaimError(claim)
-
-    def _validate_sub(self, payload: dict[str, Any], subject=None) -> None:
-        """
-        Checks whether "sub" if in the payload is valid ot not.
-        This is an Optional claim
-
-        :param payload(dict): The payload which needs to be validated
-        :param subject(str): The subject of the token
-        """
-
-        if "sub" not in payload:
-            return
-
-        if not isinstance(payload["sub"], str):
-            raise InvalidSubjectError("Subject must be a string")
-
-        if subject is not None:
-            if payload.get("sub") != subject:
-                raise InvalidSubjectError("Invalid subject")
-
-    def _validate_jti(self, payload: dict[str, Any]) -> None:
-        """
-        Checks whether "jti" if in the payload is valid ot not
-        This is an Optional claim
-
-        :param payload(dict): The payload which needs to be validated
-        """
-
-        if "jti" not in payload:
-            return
-
-        if not isinstance(payload.get("jti"), str):
-            raise InvalidJTIError("JWT ID must be a string")
-
-    def _validate_iat(
-        self,
-        payload: dict[str, Any],
-        now: float,
-        leeway: float,
-    ) -> None:
-        try:
-            iat = int(payload["iat"])
-        except ValueError:
-            raise InvalidIssuedAtError(
-                "Issued At claim (iat) must be an integer."
-            ) from None
-        if iat > (now + leeway):
-            raise ImmatureSignatureError("The token is not yet valid (iat)")
-
-    def _validate_nbf(
-        self,
-        payload: dict[str, Any],
-        now: float,
-        leeway: float,
-    ) -> None:
-        try:
-            nbf = int(payload["nbf"])
-        except ValueError:
-            raise DecodeError("Not Before claim (nbf) must be an integer.") from None
-
-        if nbf > (now + leeway):
-            raise ImmatureSignatureError("The token is not yet valid (nbf)")
-
-    def _validate_exp(
-        self,
-        payload: dict[str, Any],
-        now: float,
-        leeway: float,
-    ) -> None:
-        try:
-            exp = int(payload["exp"])
-        except ValueError:
-            raise DecodeError(
-                "Expiration Time claim (exp) must be an integer."
-            ) from None
-
-        if exp <= (now - leeway):
-            raise ExpiredSignatureError("Signature has expired")
-
-    def _validate_aud(
-        self,
-        payload: dict[str, Any],
-        audience: str | Iterable[str] | None,
-        *,
-        strict: bool = False,
-    ) -> None:
-        if audience is None:
-            if "aud" not in payload or not payload["aud"]:
-                return
-            # Application did not specify an audience, but
-            # the token has the 'aud' claim
-            raise InvalidAudienceError("Invalid audience")
-
-        if "aud" not in payload or not payload["aud"]:
-            # Application specified an audience, but it could not be
-            # verified since the token does not contain a claim.
-            raise MissingRequiredClaimError("aud")
-
-        audience_claims = payload["aud"]
-
-        # In strict mode, we forbid list matching: the supplied audience
-        # must be a string, and it must exactly match the audience claim.
-        if strict:
-            # Only a single audience is allowed in strict mode.
-            if not isinstance(audience, str):
-                raise InvalidAudienceError("Invalid audience (strict)")
-
-            # Only a single audience claim is allowed in strict mode.
-            if not isinstance(audience_claims, str):
-                raise InvalidAudienceError("Invalid claim format in token (strict)")
-
-            if audience != audience_claims:
-                raise InvalidAudienceError("Audience doesn't match (strict)")
-
-            return
-
-        if isinstance(audience_claims, str):
-            audience_claims = [audience_claims]
-        if not isinstance(audience_claims, list):
-            raise InvalidAudienceError("Invalid claim format in token")
-        if any(not isinstance(c, str) for c in audience_claims):
-            raise InvalidAudienceError("Invalid claim format in token")
-
-        if isinstance(audience, str):
-            audience = [audience]
-
-        if all(aud not in audience_claims for aud in audience):
-            raise InvalidAudienceError("Audience doesn't match")
-
-    def _validate_iss(self, payload: dict[str, Any], issuer: Any) -> None:
-        if issuer is None:
-            return
-
-        if "iss" not in payload:
-            raise MissingRequiredClaimError("iss")
-
-        if isinstance(issuer, str):
-            if payload["iss"] != issuer:
-                raise InvalidIssuerError("Invalid issuer")
-        else:
-            if payload["iss"] not in issuer:
-                raise InvalidIssuerError("Invalid issuer")
-
-
-_jwt_global_obj = PyJWT()
-encode = _jwt_global_obj.encode
-decode_complete = _jwt_global_obj.decode_complete
-decode = _jwt_global_obj.decode
diff --git a/lib/jwt/exceptions.py b/lib/jwt/exceptions.py
deleted file mode 100644
index 9b45ae48..00000000
--- a/lib/jwt/exceptions.py
+++ /dev/null
@@ -1,82 +0,0 @@
-class PyJWTError(Exception):
-    """
-    Base class for all exceptions
-    """
-
-    pass
-
-
-class InvalidTokenError(PyJWTError):
-    pass
-
-
-class DecodeError(InvalidTokenError):
-    pass
-
-
-class InvalidSignatureError(DecodeError):
-    pass
-
-
-class ExpiredSignatureError(InvalidTokenError):
-    pass
-
-
-class InvalidAudienceError(InvalidTokenError):
-    pass
-
-
-class InvalidIssuerError(InvalidTokenError):
-    pass
-
-
-class InvalidIssuedAtError(InvalidTokenError):
-    pass
-
-
-class ImmatureSignatureError(InvalidTokenError):
-    pass
-
-
-class InvalidKeyError(PyJWTError):
-    pass
-
-
-class InvalidAlgorithmError(InvalidTokenError):
-    pass
-
-
-class MissingRequiredClaimError(InvalidTokenError):
-    def __init__(self, claim: str) -> None:
-        self.claim = claim
-
-    def __str__(self) -> str:
-        return f'Token is missing the "{self.claim}" claim'
-
-
-class PyJWKError(PyJWTError):
-    pass
-
-
-class MissingCryptographyError(PyJWKError):
-    pass
-
-
-class PyJWKSetError(PyJWTError):
-    pass
-
-
-class PyJWKClientError(PyJWTError):
-    pass
-
-
-class PyJWKClientConnectionError(PyJWKClientError):
-    pass
-
-
-class InvalidSubjectError(InvalidTokenError):
-    pass
-
-
-class InvalidJTIError(InvalidTokenError):
-    pass
diff --git a/lib/jwt/help.py b/lib/jwt/help.py
deleted file mode 100644
index 8e1c2286..00000000
--- a/lib/jwt/help.py
+++ /dev/null
@@ -1,67 +0,0 @@
-import json
-import platform
-import sys
-from typing import Dict
-
-from . import __version__ as pyjwt_version
-
-try:
-    import cryptography
-
-    cryptography_version = cryptography.__version__
-except ModuleNotFoundError:
-    cryptography_version = ""
-
-
-def info() -> Dict[str, Dict[str, str]]:
-    """
-    Generate information for a bug report.
-    Based on the requests package help utility module.
-    """
-    try:
-        platform_info = {
-            "system": platform.system(),
-            "release": platform.release(),
-        }
-    except OSError:
-        platform_info = {"system": "Unknown", "release": "Unknown"}
-
-    implementation = platform.python_implementation()
-
-    if implementation == "CPython":
-        implementation_version = platform.python_version()
-    elif implementation == "PyPy":
-        pypy_version_info = sys.pypy_version_info  # type: ignore[attr-defined]
-        implementation_version = (
-            f"{pypy_version_info.major}."
-            f"{pypy_version_info.minor}."
-            f"{pypy_version_info.micro}"
-        )
-        if pypy_version_info.releaselevel != "final":
-            implementation_version = "".join(
-                [
-                    implementation_version,
-                    pypy_version_info.releaselevel,
-                ]
-            )
-    else:
-        implementation_version = "Unknown"
-
-    return {
-        "platform": platform_info,
-        "implementation": {
-            "name": implementation,
-            "version": implementation_version,
-        },
-        "cryptography": {"version": cryptography_version},
-        "pyjwt": {"version": pyjwt_version},
-    }
-
-
-def main() -> None:
-    """Pretty-print the bug information as JSON."""
-    print(json.dumps(info(), sort_keys=True, indent=2))
-
-
-if __name__ == "__main__":
-    main()
diff --git a/lib/jwt/jwk_set_cache.py b/lib/jwt/jwk_set_cache.py
deleted file mode 100644
index 24325630..00000000
--- a/lib/jwt/jwk_set_cache.py
+++ /dev/null
@@ -1,31 +0,0 @@
-import time
-from typing import Optional
-
-from .api_jwk import PyJWKSet, PyJWTSetWithTimestamp
-
-
-class JWKSetCache:
-    def __init__(self, lifespan: int) -> None:
-        self.jwk_set_with_timestamp: Optional[PyJWTSetWithTimestamp] = None
-        self.lifespan = lifespan
-
-    def put(self, jwk_set: PyJWKSet) -> None:
-        if jwk_set is not None:
-            self.jwk_set_with_timestamp = PyJWTSetWithTimestamp(jwk_set)
-        else:
-            # clear cache
-            self.jwk_set_with_timestamp = None
-
-    def get(self) -> Optional[PyJWKSet]:
-        if self.jwk_set_with_timestamp is None or self.is_expired():
-            return None
-
-        return self.jwk_set_with_timestamp.get_jwk_set()
-
-    def is_expired(self) -> bool:
-        return (
-            self.jwk_set_with_timestamp is not None
-            and self.lifespan > -1
-            and time.monotonic()
-            > self.jwk_set_with_timestamp.get_timestamp() + self.lifespan
-        )
diff --git a/lib/jwt/jwks_client.py b/lib/jwt/jwks_client.py
deleted file mode 100644
index 9a8992ca..00000000
--- a/lib/jwt/jwks_client.py
+++ /dev/null
@@ -1,126 +0,0 @@
-import json
-import urllib.request
-from functools import lru_cache
-from ssl import SSLContext
-from typing import Any, Dict, List, Optional
-from urllib.error import URLError
-
-from .api_jwk import PyJWK, PyJWKSet
-from .api_jwt import decode_complete as decode_token
-from .exceptions import PyJWKClientConnectionError, PyJWKClientError
-from .jwk_set_cache import JWKSetCache
-
-
-class PyJWKClient:
-    def __init__(
-        self,
-        uri: str,
-        cache_keys: bool = False,
-        max_cached_keys: int = 16,
-        cache_jwk_set: bool = True,
-        lifespan: int = 300,
-        headers: Optional[Dict[str, Any]] = None,
-        timeout: int = 30,
-        ssl_context: Optional[SSLContext] = None,
-    ):
-        if headers is None:
-            headers = {}
-        self.uri = uri
-        self.jwk_set_cache: Optional[JWKSetCache] = None
-        self.headers = headers
-        self.timeout = timeout
-        self.ssl_context = ssl_context
-
-        if cache_jwk_set:
-            # Init jwt set cache with default or given lifespan.
-            # Default lifespan is 300 seconds (5 minutes).
-            if lifespan <= 0:
-                raise PyJWKClientError(
-                    f'Lifespan must be greater than 0, the input is "{lifespan}"'
-                )
-            self.jwk_set_cache = JWKSetCache(lifespan)
-        else:
-            self.jwk_set_cache = None
-
-        if cache_keys:
-            # Cache signing keys
-            # Ignore mypy (https://github.com/python/mypy/issues/2427)
-            self.get_signing_key = lru_cache(maxsize=max_cached_keys)(
-                self.get_signing_key
-            )  # type: ignore
-
-    def fetch_data(self) -> Any:
-        jwk_set: Any = None
-        try:
-            r = urllib.request.Request(url=self.uri, headers=self.headers)
-            with urllib.request.urlopen(
-                r, timeout=self.timeout, context=self.ssl_context
-            ) as response:
-                jwk_set = json.load(response)
-        except (URLError, TimeoutError) as e:
-            raise PyJWKClientConnectionError(
-                f'Fail to fetch data from the url, err: "{e}"'
-            ) from e
-        else:
-            return jwk_set
-        finally:
-            if self.jwk_set_cache is not None:
-                self.jwk_set_cache.put(jwk_set)
-
-    def get_jwk_set(self, refresh: bool = False) -> PyJWKSet:
-        data = None
-        if self.jwk_set_cache is not None and not refresh:
-            data = self.jwk_set_cache.get()
-
-        if data is None:
-            data = self.fetch_data()
-
-        if not isinstance(data, dict):
-            raise PyJWKClientError("The JWKS endpoint did not return a JSON object")
-
-        return PyJWKSet.from_dict(data)
-
-    def get_signing_keys(self, refresh: bool = False) -> List[PyJWK]:
-        jwk_set = self.get_jwk_set(refresh)
-        signing_keys = [
-            jwk_set_key
-            for jwk_set_key in jwk_set.keys
-            if jwk_set_key.public_key_use in ["sig", None] and jwk_set_key.key_id
-        ]
-
-        if not signing_keys:
-            raise PyJWKClientError("The JWKS endpoint did not contain any signing keys")
-
-        return signing_keys
-
-    def get_signing_key(self, kid: str) -> PyJWK:
-        signing_keys = self.get_signing_keys()
-        signing_key = self.match_kid(signing_keys, kid)
-
-        if not signing_key:
-            # If no matching signing key from the jwk set, refresh the jwk set and try again.
-            signing_keys = self.get_signing_keys(refresh=True)
-            signing_key = self.match_kid(signing_keys, kid)
-
-            if not signing_key:
-                raise PyJWKClientError(
-                    f'Unable to find a signing key that matches: "{kid}"'
-                )
-
-        return signing_key
-
-    def get_signing_key_from_jwt(self, token: str) -> PyJWK:
-        unverified = decode_token(token, options={"verify_signature": False})
-        header = unverified["header"]
-        return self.get_signing_key(header.get("kid"))
-
-    @staticmethod
-    def match_kid(signing_keys: List[PyJWK], kid: str) -> Optional[PyJWK]:
-        signing_key = None
-
-        for key in signing_keys:
-            if key.key_id == kid:
-                signing_key = key
-                break
-
-        return signing_key
diff --git a/lib/jwt/py.typed b/lib/jwt/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/jwt/types.py b/lib/jwt/types.py
deleted file mode 100644
index 7d993520..00000000
--- a/lib/jwt/types.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from typing import Any, Callable, Dict
-
-JWKDict = Dict[str, Any]
-
-HashlibHash = Callable[..., Any]
diff --git a/lib/jwt/utils.py b/lib/jwt/utils.py
deleted file mode 100644
index 56e89bb7..00000000
--- a/lib/jwt/utils.py
+++ /dev/null
@@ -1,142 +0,0 @@
-import base64
-import binascii
-import re
-from typing import Optional, Union
-
-try:
-    from cryptography.hazmat.primitives.asymmetric.ec import EllipticCurve
-    from cryptography.hazmat.primitives.asymmetric.utils import (
-        decode_dss_signature,
-        encode_dss_signature,
-    )
-except ModuleNotFoundError:
-    pass
-
-
-def force_bytes(value: Union[bytes, str]) -> bytes:
-    if isinstance(value, str):
-        return value.encode("utf-8")
-    elif isinstance(value, bytes):
-        return value
-    else:
-        raise TypeError("Expected a string value")
-
-
-def base64url_decode(input: Union[bytes, str]) -> bytes:
-    input_bytes = force_bytes(input)
-
-    rem = len(input_bytes) % 4
-
-    if rem > 0:
-        input_bytes += b"=" * (4 - rem)
-
-    return base64.urlsafe_b64decode(input_bytes)
-
-
-def base64url_encode(input: bytes) -> bytes:
-    return base64.urlsafe_b64encode(input).replace(b"=", b"")
-
-
-def to_base64url_uint(val: int, *, bit_length: Optional[int] = None) -> bytes:
-    if val < 0:
-        raise ValueError("Must be a positive integer")
-
-    int_bytes = bytes_from_int(val, bit_length=bit_length)
-
-    if len(int_bytes) == 0:
-        int_bytes = b"\x00"
-
-    return base64url_encode(int_bytes)
-
-
-def from_base64url_uint(val: Union[bytes, str]) -> int:
-    data = base64url_decode(force_bytes(val))
-    return int.from_bytes(data, byteorder="big")
-
-
-def number_to_bytes(num: int, num_bytes: int) -> bytes:
-    padded_hex = "%0*x" % (2 * num_bytes, num)
-    return binascii.a2b_hex(padded_hex.encode("ascii"))
-
-
-def bytes_to_number(string: bytes) -> int:
-    return int(binascii.b2a_hex(string), 16)
-
-
-def bytes_from_int(val: int, *, bit_length: Optional[int] = None) -> bytes:
-    if bit_length is None:
-        bit_length = val.bit_length()
-    byte_length = (bit_length + 7) // 8
-
-    return val.to_bytes(byte_length, "big", signed=False)
-
-
-def der_to_raw_signature(der_sig: bytes, curve: "EllipticCurve") -> bytes:
-    num_bits = curve.key_size
-    num_bytes = (num_bits + 7) // 8
-
-    r, s = decode_dss_signature(der_sig)
-
-    return number_to_bytes(r, num_bytes) + number_to_bytes(s, num_bytes)
-
-
-def raw_to_der_signature(raw_sig: bytes, curve: "EllipticCurve") -> bytes:
-    num_bits = curve.key_size
-    num_bytes = (num_bits + 7) // 8
-
-    if len(raw_sig) != 2 * num_bytes:
-        raise ValueError("Invalid signature")
-
-    r = bytes_to_number(raw_sig[:num_bytes])
-    s = bytes_to_number(raw_sig[num_bytes:])
-
-    return bytes(encode_dss_signature(r, s))
-
-
-# Based on https://github.com/hynek/pem/blob/7ad94db26b0bc21d10953f5dbad3acfdfacf57aa/src/pem/_core.py#L224-L252
-_PEMS = {
-    b"CERTIFICATE",
-    b"TRUSTED CERTIFICATE",
-    b"PRIVATE KEY",
-    b"PUBLIC KEY",
-    b"ENCRYPTED PRIVATE KEY",
-    b"OPENSSH PRIVATE KEY",
-    b"DSA PRIVATE KEY",
-    b"RSA PRIVATE KEY",
-    b"RSA PUBLIC KEY",
-    b"EC PRIVATE KEY",
-    b"DH PARAMETERS",
-    b"NEW CERTIFICATE REQUEST",
-    b"CERTIFICATE REQUEST",
-    b"SSH2 PUBLIC KEY",
-    b"SSH2 ENCRYPTED PRIVATE KEY",
-    b"X509 CRL",
-}
-
-_PEM_RE = re.compile(
-    b"----[- ]BEGIN ("
-    + b"|".join(_PEMS)
-    + b""")[- ]----\r?
-.+?\r?
-----[- ]END \\1[- ]----\r?\n?""",
-    re.DOTALL,
-)
-
-
-def is_pem_format(key: bytes) -> bool:
-    return bool(_PEM_RE.search(key))
-
-
-# Based on https://github.com/pyca/cryptography/blob/bcb70852d577b3f490f015378c75cba74986297b/src/cryptography/hazmat/primitives/serialization/ssh.py#L40-L46
-_SSH_KEY_FORMATS = (
-    b"ssh-ed25519",
-    b"ssh-rsa",
-    b"ssh-dss",
-    b"ecdsa-sha2-nistp256",
-    b"ecdsa-sha2-nistp384",
-    b"ecdsa-sha2-nistp521",
-)
-
-
-def is_ssh_key(key: bytes) -> bool:
-    return key.startswith(_SSH_KEY_FORMATS)
diff --git a/lib/jwt/warnings.py b/lib/jwt/warnings.py
deleted file mode 100644
index 8762a8cb..00000000
--- a/lib/jwt/warnings.py
+++ /dev/null
@@ -1,2 +0,0 @@
-class RemovedInPyjwt3Warning(DeprecationWarning):
-    pass
diff --git a/lib/libfuturize/__init__.py b/lib/libfuturize/__init__.py
deleted file mode 100644
index 4cb1cbcd..00000000
--- a/lib/libfuturize/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# empty to make this a package
diff --git a/lib/libfuturize/fixer_util.py b/lib/libfuturize/fixer_util.py
deleted file mode 100644
index b5c123f6..00000000
--- a/lib/libfuturize/fixer_util.py
+++ /dev/null
@@ -1,518 +0,0 @@
-"""
-Utility functions from 2to3, 3to2 and python-modernize (and some home-grown
-ones).
-
-Licences:
-2to3: PSF License v2
-3to2: Apache Software License (from 3to2/setup.py)
-python-modernize licence: BSD (from python-modernize/LICENSE)
-"""
-
-from lib2to3.fixer_util import (FromImport, Newline, is_import,
-                                find_root, does_tree_import,
-                                Call, Name, Comma)
-from lib2to3.pytree import Leaf, Node
-from lib2to3.pygram import python_symbols as syms
-from lib2to3.pygram import token
-import re
-
-
-def canonical_fix_name(fix, avail_fixes):
-    """
-    Examples:
-    >>> canonical_fix_name('fix_wrap_text_literals')
-    'libfuturize.fixes.fix_wrap_text_literals'
-    >>> canonical_fix_name('wrap_text_literals')
-    'libfuturize.fixes.fix_wrap_text_literals'
-    >>> canonical_fix_name('wrap_te')
-    ValueError("unknown fixer name")
-    >>> canonical_fix_name('wrap')
-    ValueError("ambiguous fixer name")
-    """
-    if ".fix_" in fix:
-        return fix
-    else:
-        if fix.startswith('fix_'):
-            fix = fix[4:]
-        # Infer the full module name for the fixer.
-        # First ensure that no names clash (e.g.
-        # lib2to3.fixes.fix_blah and libfuturize.fixes.fix_blah):
-        found = [f for f in avail_fixes
-                 if f.endswith('fix_{0}'.format(fix))]
-        if len(found) > 1:
-            raise ValueError("Ambiguous fixer name. Choose a fully qualified "
-                  "module name instead from these:\n" +
-                  "\n".join("  " + myf for myf in found))
-        elif len(found) == 0:
-            raise ValueError("Unknown fixer. Use --list-fixes or -l for a list.")
-        return found[0]
-
-
-
-## These functions are from 3to2 by Joe Amenta:
-
-def Star(prefix=None):
-    return Leaf(token.STAR, u'*', prefix=prefix)
-
-def DoubleStar(prefix=None):
-    return Leaf(token.DOUBLESTAR, u'**', prefix=prefix)
-
-def Minus(prefix=None):
-    return Leaf(token.MINUS, u'-', prefix=prefix)
-
-def commatize(leafs):
-    """
-    Accepts/turns: (Name, Name, ..., Name, Name)
-    Returns/into: (Name, Comma, Name, Comma, ..., Name, Comma, Name)
-    """
-    new_leafs = []
-    for leaf in leafs:
-        new_leafs.append(leaf)
-        new_leafs.append(Comma())
-    del new_leafs[-1]
-    return new_leafs
-
-def indentation(node):
-    """
-    Returns the indentation for this node
-    Iff a node is in a suite, then it has indentation.
-    """
-    while node.parent is not None and node.parent.type != syms.suite:
-        node = node.parent
-    if node.parent is None:
-        return u""
-    # The first three children of a suite are NEWLINE, INDENT, (some other node)
-    # INDENT.value contains the indentation for this suite
-    # anything after (some other node) has the indentation as its prefix.
-    if node.type == token.INDENT:
-        return node.value
-    elif node.prev_sibling is not None and node.prev_sibling.type == token.INDENT:
-        return node.prev_sibling.value
-    elif node.prev_sibling is None:
-        return u""
-    else:
-        return node.prefix
-
-def indentation_step(node):
-    """
-    Dirty little trick to get the difference between each indentation level
-    Implemented by finding the shortest indentation string
-    (technically, the "least" of all of the indentation strings, but
-    tabs and spaces mixed won't get this far, so those are synonymous.)
-    """
-    r = find_root(node)
-    # Collect all indentations into one set.
-    all_indents = set(i.value for i in r.pre_order() if i.type == token.INDENT)
-    if not all_indents:
-        # nothing is indented anywhere, so we get to pick what we want
-        return u"    " # four spaces is a popular convention
-    else:
-        return min(all_indents)
-
-def suitify(parent):
-    """
-    Turn the stuff after the first colon in parent's children
-    into a suite, if it wasn't already
-    """
-    for node in parent.children:
-        if node.type == syms.suite:
-            # already in the preferred format, do nothing
-            return
-
-    # One-liners have no suite node, we have to fake one up
-    for i, node in enumerate(parent.children):
-        if node.type == token.COLON:
-            break
-    else:
-        raise ValueError(u"No class suite and no ':'!")
-    # Move everything into a suite node
-    suite = Node(syms.suite, [Newline(), Leaf(token.INDENT, indentation(node) + indentation_step(node))])
-    one_node = parent.children[i+1]
-    one_node.remove()
-    one_node.prefix = u''
-    suite.append_child(one_node)
-    parent.append_child(suite)
-
-def NameImport(package, as_name=None, prefix=None):
-    """
-    Accepts a package (Name node), name to import it as (string), and
-    optional prefix and returns a node:
-    import <package> [as <as_name>]
-    """
-    if prefix is None:
-        prefix = u""
-    children = [Name(u"import", prefix=prefix), package]
-    if as_name is not None:
-        children.extend([Name(u"as", prefix=u" "),
-                         Name(as_name, prefix=u" ")])
-    return Node(syms.import_name, children)
-
-_compound_stmts = (syms.if_stmt, syms.while_stmt, syms.for_stmt, syms.try_stmt, syms.with_stmt)
-_import_stmts = (syms.import_name, syms.import_from)
-
-def import_binding_scope(node):
-    """
-    Generator yields all nodes for which a node (an import_stmt) has scope
-    The purpose of this is for a call to _find() on each of them
-    """
-    # import_name / import_from are small_stmts
-    assert node.type in _import_stmts
-    test = node.next_sibling
-    # A small_stmt can only be followed by a SEMI or a NEWLINE.
-    while test.type == token.SEMI:
-        nxt = test.next_sibling
-        # A SEMI can only be followed by a small_stmt or a NEWLINE
-        if nxt.type == token.NEWLINE:
-            break
-        else:
-            yield nxt
-        # A small_stmt can only be followed by either a SEMI or a NEWLINE
-        test = nxt.next_sibling
-    # Covered all subsequent small_stmts after the import_stmt
-    # Now to cover all subsequent stmts after the parent simple_stmt
-    parent = node.parent
-    assert parent.type == syms.simple_stmt
-    test = parent.next_sibling
-    while test is not None:
-        # Yes, this will yield NEWLINE and DEDENT.  Deal with it.
-        yield test
-        test = test.next_sibling
-
-    context = parent.parent
-    # Recursively yield nodes following imports inside of a if/while/for/try/with statement
-    if context.type in _compound_stmts:
-        # import is in a one-liner
-        c = context
-        while c.next_sibling is not None:
-            yield c.next_sibling
-            c = c.next_sibling
-        context = context.parent
-
-    # Can't chain one-liners on one line, so that takes care of that.
-
-    p = context.parent
-    if p is None:
-        return
-
-    # in a multi-line suite
-
-    while p.type in _compound_stmts:
-
-        if context.type == syms.suite:
-            yield context
-
-        context = context.next_sibling
-
-        if context is None:
-            context = p.parent
-            p = context.parent
-            if p is None:
-                break
-
-def ImportAsName(name, as_name, prefix=None):
-    new_name = Name(name)
-    new_as = Name(u"as", prefix=u" ")
-    new_as_name = Name(as_name, prefix=u" ")
-    new_node = Node(syms.import_as_name, [new_name, new_as, new_as_name])
-    if prefix is not None:
-        new_node.prefix = prefix
-    return new_node
-
-
-def is_docstring(node):
-    """
-    Returns True if the node appears to be a docstring
-    """
-    return (node.type == syms.simple_stmt and
-            len(node.children) > 0 and node.children[0].type == token.STRING)
-
-
-def future_import(feature, node):
-    """
-    This seems to work
-    """
-    root = find_root(node)
-
-    if does_tree_import(u"__future__", feature, node):
-        return
-
-    # Look for a shebang or encoding line
-    shebang_encoding_idx = None
-
-    for idx, node in enumerate(root.children):
-        # Is it a shebang or encoding line?
-        if is_shebang_comment(node) or is_encoding_comment(node):
-            shebang_encoding_idx = idx
-        if is_docstring(node):
-            # skip over docstring
-            continue
-        names = check_future_import(node)
-        if not names:
-            # not a future statement; need to insert before this
-            break
-        if feature in names:
-            # already imported
-            return
-
-    import_ = FromImport(u'__future__', [Leaf(token.NAME, feature, prefix=" ")])
-    if shebang_encoding_idx == 0 and idx == 0:
-        # If this __future__ import would go on the first line,
-        # detach the shebang / encoding prefix from the current first line.
-        # and attach it to our new __future__ import node.
-        import_.prefix = root.children[0].prefix
-        root.children[0].prefix = u''
-        # End the __future__ import line with a newline and add a blank line
-        # afterwards:
-    children = [import_ , Newline()]
-    root.insert_child(idx, Node(syms.simple_stmt, children))
-
-
-def future_import2(feature, node):
-    """
-    An alternative to future_import() which might not work ...
-    """
-    root = find_root(node)
-
-    if does_tree_import(u"__future__", feature, node):
-        return
-
-    insert_pos = 0
-    for idx, node in enumerate(root.children):
-        if node.type == syms.simple_stmt and node.children and \
-           node.children[0].type == token.STRING:
-            insert_pos = idx + 1
-            break
-
-    for thing_after in root.children[insert_pos:]:
-        if thing_after.type == token.NEWLINE:
-            insert_pos += 1
-            continue
-
-        prefix = thing_after.prefix
-        thing_after.prefix = u""
-        break
-    else:
-        prefix = u""
-
-    import_ = FromImport(u"__future__", [Leaf(token.NAME, feature, prefix=u" ")])
-
-    children = [import_, Newline()]
-    root.insert_child(insert_pos, Node(syms.simple_stmt, children, prefix=prefix))
-
-def parse_args(arglist, scheme):
-    u"""
-    Parse a list of arguments into a dict
-    """
-    arglist = [i for i in arglist if i.type != token.COMMA]
-
-    ret_mapping = dict([(k, None) for k in scheme])
-
-    for i, arg in enumerate(arglist):
-        if arg.type == syms.argument and arg.children[1].type == token.EQUAL:
-            # argument < NAME '=' any >
-            slot = arg.children[0].value
-            ret_mapping[slot] = arg.children[2]
-        else:
-            slot = scheme[i]
-            ret_mapping[slot] = arg
-
-    return ret_mapping
-
-
-# def is_import_from(node):
-#     """Returns true if the node is a statement "from ... import ..."
-#     """
-#     return node.type == syms.import_from
-
-
-def is_import_stmt(node):
-    return (node.type == syms.simple_stmt and node.children and
-            is_import(node.children[0]))
-
-
-def touch_import_top(package, name_to_import, node):
-    """Works like `does_tree_import` but adds an import statement at the
-    top if it was not imported (but below any __future__ imports) and below any
-    comments such as shebang lines).
-
-    Based on lib2to3.fixer_util.touch_import()
-
-    Calling this multiple times adds the imports in reverse order.
-
-    Also adds "standard_library.install_aliases()" after "from future import
-    standard_library".  This should probably be factored into another function.
-    """
-
-    root = find_root(node)
-
-    if does_tree_import(package, name_to_import, root):
-        return
-
-    # Ideally, we would look for whether futurize --all-imports has been run,
-    # as indicated by the presence of ``from builtins import (ascii, ...,
-    # zip)`` -- and, if it has, we wouldn't import the name again.
-
-    # Look for __future__ imports and insert below them
-    found = False
-    for name in ['absolute_import', 'division', 'print_function',
-                 'unicode_literals']:
-        if does_tree_import('__future__', name, root):
-            found = True
-            break
-    if found:
-        # At least one __future__ import. We want to loop until we've seen them
-        # all.
-        start, end = None, None
-        for idx, node in enumerate(root.children):
-            if check_future_import(node):
-                start = idx
-                # Start looping
-                idx2 = start
-                while node:
-                    node = node.next_sibling
-                    idx2 += 1
-                    if not check_future_import(node):
-                        end = idx2
-                        break
-                break
-        assert start is not None
-        assert end is not None
-        insert_pos = end
-    else:
-        # No __future__ imports.
-        # We look for a docstring and insert the new node below that. If no docstring
-        # exists, just insert the node at the top.
-        for idx, node in enumerate(root.children):
-            if node.type != syms.simple_stmt:
-                break
-            if not is_docstring(node):
-                # This is the usual case.
-                break
-        insert_pos = idx
-
-    children_hooks = []
-    if package is None:
-        import_ = Node(syms.import_name, [
-            Leaf(token.NAME, u"import"),
-            Leaf(token.NAME, name_to_import, prefix=u" ")
-        ])
-    else:
-        import_ = FromImport(package, [Leaf(token.NAME, name_to_import, prefix=u" ")])
-        if name_to_import == u'standard_library':
-            # Add:
-            #     standard_library.install_aliases()
-            # after:
-            #     from future import standard_library
-            install_hooks = Node(syms.simple_stmt,
-                                 [Node(syms.power,
-                                       [Leaf(token.NAME, u'standard_library'),
-                                        Node(syms.trailer, [Leaf(token.DOT, u'.'),
-                                        Leaf(token.NAME, u'install_aliases')]),
-                                        Node(syms.trailer, [Leaf(token.LPAR, u'('),
-                                                            Leaf(token.RPAR, u')')])
-                                       ])
-                                 ]
-                                )
-            children_hooks = [install_hooks, Newline()]
-
-        # FromImport(package, [Leaf(token.NAME, name_to_import, prefix=u" ")])
-
-    children_import = [import_, Newline()]
-    old_prefix = root.children[insert_pos].prefix
-    root.children[insert_pos].prefix = u''
-    root.insert_child(insert_pos, Node(syms.simple_stmt, children_import, prefix=old_prefix))
-    if len(children_hooks) > 0:
-        root.insert_child(insert_pos + 1, Node(syms.simple_stmt, children_hooks))
-
-
-## The following functions are from python-modernize by Armin Ronacher:
-# (a little edited).
-
-def check_future_import(node):
-    """If this is a future import, return set of symbols that are imported,
-    else return None."""
-    # node should be the import statement here
-    savenode = node
-    if not (node.type == syms.simple_stmt and node.children):
-        return set()
-    node = node.children[0]
-    # now node is the import_from node
-    if not (node.type == syms.import_from and
-            # node.type == token.NAME and      # seems to break it
-            hasattr(node.children[1], 'value') and
-            node.children[1].value == u'__future__'):
-        return set()
-    if node.children[3].type == token.LPAR:
-        node = node.children[4]
-    else:
-        node = node.children[3]
-    # now node is the import_as_name[s]
-    if node.type == syms.import_as_names:
-        result = set()
-        for n in node.children:
-            if n.type == token.NAME:
-                result.add(n.value)
-            elif n.type == syms.import_as_name:
-                n = n.children[0]
-                assert n.type == token.NAME
-                result.add(n.value)
-        return result
-    elif node.type == syms.import_as_name:
-        node = node.children[0]
-        assert node.type == token.NAME
-        return set([node.value])
-    elif node.type == token.NAME:
-        return set([node.value])
-    else:
-        # TODO: handle brackets like this:
-        #     from __future__ import (absolute_import, division)
-        assert False, "strange import: %s" % savenode
-
-
-SHEBANG_REGEX = r'^#!.*python'
-ENCODING_REGEX = r"^#.*coding[:=]\s*([-\w.]+)"
-
-
-def is_shebang_comment(node):
-    """
-    Comments are prefixes for Leaf nodes. Returns whether the given node has a
-    prefix that looks like a shebang line or an encoding line:
-
-        #!/usr/bin/env python
-        #!/usr/bin/python3
-    """
-    return bool(re.match(SHEBANG_REGEX, node.prefix))
-
-
-def is_encoding_comment(node):
-    """
-    Comments are prefixes for Leaf nodes. Returns whether the given node has a
-    prefix that looks like an encoding line:
-
-        # coding: utf-8
-        # encoding: utf-8
-        # -*- coding: <encoding name> -*-
-        # vim: set fileencoding=<encoding name> :
-    """
-    return bool(re.match(ENCODING_REGEX, node.prefix))
-
-
-def wrap_in_fn_call(fn_name, args, prefix=None):
-    """
-    Example:
-    >>> wrap_in_fn_call("oldstr", (arg,))
-    oldstr(arg)
-
-    >>> wrap_in_fn_call("olddiv", (arg1, arg2))
-    olddiv(arg1, arg2)
-
-    >>> wrap_in_fn_call("olddiv", [arg1, comma, arg2, comma, arg3])
-    olddiv(arg1, arg2, arg3)
-    """
-    assert len(args) > 0
-    if len(args) == 2:
-        expr1, expr2 = args
-        newargs = [expr1, Comma(), expr2]
-    else:
-        newargs = args
-    return Call(Name(fn_name), newargs, prefix=prefix)
diff --git a/lib/libfuturize/fixes/__init__.py b/lib/libfuturize/fixes/__init__.py
deleted file mode 100644
index 0b562501..00000000
--- a/lib/libfuturize/fixes/__init__.py
+++ /dev/null
@@ -1,97 +0,0 @@
-import sys
-from lib2to3 import refactor
-
-# The following fixers are "safe": they convert Python 2 code to more
-# modern Python 2 code. They should be uncontroversial to apply to most
-# projects that are happy to drop support for Py2.5 and below. Applying
-# them first will reduce the size of the patch set for the real porting.
-lib2to3_fix_names_stage1 = set([
-    'lib2to3.fixes.fix_apply',
-    'lib2to3.fixes.fix_except',
-    'lib2to3.fixes.fix_exec',
-    'lib2to3.fixes.fix_exitfunc',
-    'lib2to3.fixes.fix_funcattrs',
-    'lib2to3.fixes.fix_has_key',
-    'lib2to3.fixes.fix_idioms',
-    # 'lib2to3.fixes.fix_import',    # makes any implicit relative imports explicit. (Use with ``from __future__ import absolute_import)
-    'lib2to3.fixes.fix_intern',
-    'lib2to3.fixes.fix_isinstance',
-    'lib2to3.fixes.fix_methodattrs',
-    'lib2to3.fixes.fix_ne',
-    # 'lib2to3.fixes.fix_next',         # would replace ``next`` method names
-                                        # with ``__next__``.
-    'lib2to3.fixes.fix_numliterals',    # turns 1L into 1, 0755 into 0o755
-    'lib2to3.fixes.fix_paren',
-    # 'lib2to3.fixes.fix_print',        # see the libfuturize fixer that also
-                                        # adds ``from __future__ import print_function``
-    # 'lib2to3.fixes.fix_raise',   # uses incompatible with_traceback() method on exceptions
-    'lib2to3.fixes.fix_reduce',    # reduce is available in functools on Py2.6/Py2.7
-    'lib2to3.fixes.fix_renames',        # sys.maxint -> sys.maxsize
-    # 'lib2to3.fixes.fix_set_literal',  # this is unnecessary and breaks Py2.6 support
-    'lib2to3.fixes.fix_repr',
-    'lib2to3.fixes.fix_standarderror',
-    'lib2to3.fixes.fix_sys_exc',
-    'lib2to3.fixes.fix_throw',
-    'lib2to3.fixes.fix_tuple_params',
-    'lib2to3.fixes.fix_types',
-    'lib2to3.fixes.fix_ws_comma',       # can perhaps decrease readability: see issue #58
-    'lib2to3.fixes.fix_xreadlines',
-])
-
-# The following fixers add a dependency on the ``future`` package on order to
-# support Python 2:
-lib2to3_fix_names_stage2 = set([
-    # 'lib2to3.fixes.fix_buffer',    # perhaps not safe. Test this.
-    # 'lib2to3.fixes.fix_callable',  # not needed in Py3.2+
-    'lib2to3.fixes.fix_dict',        # TODO: add support for utils.viewitems() etc. and move to stage2
-    # 'lib2to3.fixes.fix_execfile',  # some problems: see issue #37.
-                                     # We use a custom fixer instead (see below)
-    # 'lib2to3.fixes.fix_future',    # we don't want to remove __future__ imports
-    'lib2to3.fixes.fix_getcwdu',
-    # 'lib2to3.fixes.fix_imports',   # called by libfuturize.fixes.fix_future_standard_library
-    # 'lib2to3.fixes.fix_imports2',  # we don't handle this yet (dbm)
-    # 'lib2to3.fixes.fix_input',     # Called conditionally by libfuturize.fixes.fix_input
-    'lib2to3.fixes.fix_itertools',
-    'lib2to3.fixes.fix_itertools_imports',
-    'lib2to3.fixes.fix_filter',
-    'lib2to3.fixes.fix_long',
-    'lib2to3.fixes.fix_map',
-    # 'lib2to3.fixes.fix_metaclass', # causes SyntaxError in Py2! Use the one from ``six`` instead
-    'lib2to3.fixes.fix_next',
-    'lib2to3.fixes.fix_nonzero',     # TODO: cause this to import ``object`` and/or add a decorator for mapping __bool__ to __nonzero__
-    'lib2to3.fixes.fix_operator',    # we will need support for this by e.g. extending the Py2 operator module to provide those functions in Py3
-    'lib2to3.fixes.fix_raw_input',
-    # 'lib2to3.fixes.fix_unicode',   # strips off the u'' prefix, which removes a potentially helpful source of information for disambiguating unicode/byte strings
-    # 'lib2to3.fixes.fix_urllib',    # included in libfuturize.fix_future_standard_library_urllib
-    # 'lib2to3.fixes.fix_xrange',    # custom one because of a bug with Py3.3's lib2to3
-    'lib2to3.fixes.fix_zip',
-])
-
-libfuturize_fix_names_stage1 = set([
-    'libfuturize.fixes.fix_absolute_import',
-    'libfuturize.fixes.fix_next_call',  # obj.next() -> next(obj). Unlike
-                                        # lib2to3.fixes.fix_next, doesn't change
-                                        # the ``next`` method to ``__next__``.
-    'libfuturize.fixes.fix_print_with_import',
-    'libfuturize.fixes.fix_raise',
-    # 'libfuturize.fixes.fix_order___future__imports',  # TODO: consolidate to a single line to simplify testing
-])
-
-libfuturize_fix_names_stage2 = set([
-    'libfuturize.fixes.fix_basestring',
-    # 'libfuturize.fixes.fix_add__future__imports_except_unicode_literals',  # just in case
-    'libfuturize.fixes.fix_cmp',
-    'libfuturize.fixes.fix_division_safe',
-    'libfuturize.fixes.fix_execfile',
-    'libfuturize.fixes.fix_future_builtins',
-    'libfuturize.fixes.fix_future_standard_library',
-    'libfuturize.fixes.fix_future_standard_library_urllib',
-    'libfuturize.fixes.fix_input',
-    'libfuturize.fixes.fix_metaclass',
-    'libpasteurize.fixes.fix_newstyle',
-    'libfuturize.fixes.fix_object',
-    # 'libfuturize.fixes.fix_order___future__imports',  # TODO: consolidate to a single line to simplify testing
-    'libfuturize.fixes.fix_unicode_keep_u',
-    # 'libfuturize.fixes.fix_unicode_literals_import',
-    'libfuturize.fixes.fix_xrange_with_import',  # custom one because of a bug with Py3.3's lib2to3
-])
diff --git a/lib/libfuturize/fixes/fix_UserDict.py b/lib/libfuturize/fixes/fix_UserDict.py
deleted file mode 100644
index cb0cfacc..00000000
--- a/lib/libfuturize/fixes/fix_UserDict.py
+++ /dev/null
@@ -1,102 +0,0 @@
-"""Fix UserDict.
-
-Incomplete!
-
-TODO: base this on fix_urllib perhaps?
-"""
-
-
-# Local imports
-from lib2to3 import fixer_base
-from lib2to3.fixer_util import Name, attr_chain
-from lib2to3.fixes.fix_imports import alternates, build_pattern, FixImports
-
-MAPPING = {'UserDict':  'collections',
-}
-
-# def alternates(members):
-#     return "(" + "|".join(map(repr, members)) + ")"
-#
-#
-# def build_pattern(mapping=MAPPING):
-#     mod_list = ' | '.join(["module_name='%s'" % key for key in mapping])
-#     bare_names = alternates(mapping.keys())
-#
-#     yield """name_import=import_name< 'import' ((%s) |
-#                multiple_imports=dotted_as_names< any* (%s) any* >) >
-#           """ % (mod_list, mod_list)
-#     yield """import_from< 'from' (%s) 'import' ['(']
-#               ( any | import_as_name< any 'as' any > |
-#                 import_as_names< any* >)  [')'] >
-#           """ % mod_list
-#     yield """import_name< 'import' (dotted_as_name< (%s) 'as' any > |
-#                multiple_imports=dotted_as_names<
-#                  any* dotted_as_name< (%s) 'as' any > any* >) >
-#           """ % (mod_list, mod_list)
-#
-#     # Find usages of module members in code e.g. thread.foo(bar)
-#     yield "power< bare_with_attr=(%s) trailer<'.' any > any* >" % bare_names
-
-
-# class FixUserDict(fixer_base.BaseFix):
-class FixUserdict(FixImports):
-
-    BM_compatible = True
-    keep_line_order = True
-    # This is overridden in fix_imports2.
-    mapping = MAPPING
-
-    # We want to run this fixer late, so fix_import doesn't try to make stdlib
-    # renames into relative imports.
-    run_order = 6
-
-    def build_pattern(self):
-        return "|".join(build_pattern(self.mapping))
-
-    def compile_pattern(self):
-        # We override this, so MAPPING can be pragmatically altered and the
-        # changes will be reflected in PATTERN.
-        self.PATTERN = self.build_pattern()
-        super(FixImports, self).compile_pattern()
-
-    # Don't match the node if it's within another match.
-    def match(self, node):
-        match = super(FixImports, self).match
-        results = match(node)
-        if results:
-            # Module usage could be in the trailer of an attribute lookup, so we
-            # might have nested matches when "bare_with_attr" is present.
-            if "bare_with_attr" not in results and \
-                    any(match(obj) for obj in attr_chain(node, "parent")):
-                return False
-            return results
-        return False
-
-    def start_tree(self, tree, filename):
-        super(FixImports, self).start_tree(tree, filename)
-        self.replace = {}
-
-    def transform(self, node, results):
-        import_mod = results.get("module_name")
-        if import_mod:
-            mod_name = import_mod.value
-            new_name = unicode(self.mapping[mod_name])
-            import_mod.replace(Name(new_name, prefix=import_mod.prefix))
-            if "name_import" in results:
-                # If it's not a "from x import x, y" or "import x as y" import,
-                # marked its usage to be replaced.
-                self.replace[mod_name] = new_name
-            if "multiple_imports" in results:
-                # This is a nasty hack to fix multiple imports on a line (e.g.,
-                # "import StringIO, urlparse"). The problem is that I can't
-                # figure out an easy way to make a pattern recognize the keys of
-                # MAPPING randomly sprinkled in an import statement.
-                results = self.match(node)
-                if results:
-                    self.transform(node, results)
-        else:
-            # Replace usage of the module.
-            bare_name = results["bare_with_attr"][0]
-            new_name = self.replace.get(bare_name.value)
-            if new_name:
-                bare_name.replace(Name(new_name, prefix=bare_name.prefix))
diff --git a/lib/libfuturize/fixes/fix_absolute_import.py b/lib/libfuturize/fixes/fix_absolute_import.py
deleted file mode 100644
index eab9c527..00000000
--- a/lib/libfuturize/fixes/fix_absolute_import.py
+++ /dev/null
@@ -1,91 +0,0 @@
-"""
-Fixer for import statements, with a __future__ import line.
-
-Based on lib2to3/fixes/fix_import.py, but extended slightly so it also
-supports Cython modules.
-
-If spam is being imported from the local directory, this import:
-    from spam import eggs
-becomes:
-    from __future__ import absolute_import
-    from .spam import eggs
-
-and this import:
-    import spam
-becomes:
-    from __future__ import absolute_import
-    from . import spam
-"""
-
-from os.path import dirname, join, exists, sep
-from lib2to3.fixes.fix_import import FixImport
-from lib2to3.fixer_util import FromImport, syms
-from lib2to3.fixes.fix_import import traverse_imports
-
-from libfuturize.fixer_util import future_import
-
-
-class FixAbsoluteImport(FixImport):
-    run_order = 9
-
-    def transform(self, node, results):
-        """
-        Copied from FixImport.transform(), but with this line added in
-        any modules that had implicit relative imports changed:
-
-            from __future__ import absolute_import"
-        """
-        if self.skip:
-            return
-        imp = results['imp']
-
-        if node.type == syms.import_from:
-            # Some imps are top-level (eg: 'import ham')
-            # some are first level (eg: 'import ham.eggs')
-            # some are third level (eg: 'import ham.eggs as spam')
-            # Hence, the loop
-            while not hasattr(imp, 'value'):
-                imp = imp.children[0]
-            if self.probably_a_local_import(imp.value):
-                imp.value = u"." + imp.value
-                imp.changed()
-                future_import(u"absolute_import", node)
-        else:
-            have_local = False
-            have_absolute = False
-            for mod_name in traverse_imports(imp):
-                if self.probably_a_local_import(mod_name):
-                    have_local = True
-                else:
-                    have_absolute = True
-            if have_absolute:
-                if have_local:
-                    # We won't handle both sibling and absolute imports in the
-                    # same statement at the moment.
-                    self.warning(node, "absolute and local imports together")
-                return
-
-            new = FromImport(u".", [imp])
-            new.prefix = node.prefix
-            future_import(u"absolute_import", node)
-            return new
-
-    def probably_a_local_import(self, imp_name):
-        """
-        Like the corresponding method in the base class, but this also
-        supports Cython modules.
-        """
-        if imp_name.startswith(u"."):
-            # Relative imports are certainly not local imports.
-            return False
-        imp_name = imp_name.split(u".", 1)[0]
-        base_path = dirname(self.filename)
-        base_path = join(base_path, imp_name)
-        # If there is no __init__.py next to the file its not in a package
-        # so can't be a relative import.
-        if not exists(join(dirname(base_path), "__init__.py")):
-            return False
-        for ext in [".py", sep, ".pyc", ".so", ".sl", ".pyd", ".pyx"]:
-            if exists(base_path + ext):
-                return True
-        return False
diff --git a/lib/libfuturize/fixes/fix_add__future__imports_except_unicode_literals.py b/lib/libfuturize/fixes/fix_add__future__imports_except_unicode_literals.py
deleted file mode 100644
index 37d7feec..00000000
--- a/lib/libfuturize/fixes/fix_add__future__imports_except_unicode_literals.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""
-Fixer for adding:
-
-    from __future__ import absolute_import
-    from __future__ import division
-    from __future__ import print_function
-
-This is "stage 1": hopefully uncontroversial changes.
-
-Stage 2 adds ``unicode_literals``.
-"""
-
-from lib2to3 import fixer_base
-from libfuturize.fixer_util import future_import
-
-class FixAddFutureImportsExceptUnicodeLiterals(fixer_base.BaseFix):
-    BM_compatible = True
-    PATTERN = "file_input"
-
-    run_order = 9
-
-    def transform(self, node, results):
-        # Reverse order:
-        future_import(u"absolute_import", node)
-        future_import(u"division", node)
-        future_import(u"print_function", node)
diff --git a/lib/libfuturize/fixes/fix_basestring.py b/lib/libfuturize/fixes/fix_basestring.py
deleted file mode 100644
index 5676d08f..00000000
--- a/lib/libfuturize/fixes/fix_basestring.py
+++ /dev/null
@@ -1,17 +0,0 @@
-"""
-Fixer that adds ``from past.builtins import basestring`` if there is a
-reference to ``basestring``
-"""
-
-from lib2to3 import fixer_base
-
-from libfuturize.fixer_util import touch_import_top
-
-
-class FixBasestring(fixer_base.BaseFix):
-    BM_compatible = True
-
-    PATTERN = "'basestring'"
-
-    def transform(self, node, results):
-        touch_import_top(u'past.builtins', 'basestring', node)
diff --git a/lib/libfuturize/fixes/fix_bytes.py b/lib/libfuturize/fixes/fix_bytes.py
deleted file mode 100644
index 42021223..00000000
--- a/lib/libfuturize/fixes/fix_bytes.py
+++ /dev/null
@@ -1,24 +0,0 @@
-"""Optional fixer that changes all unprefixed string literals "..." to b"...".
-
-br'abcd' is a SyntaxError on Python 2 but valid on Python 3.
-ur'abcd' is a SyntaxError on Python 3 but valid on Python 2.
-
-"""
-from __future__ import unicode_literals
-
-import re
-from lib2to3.pgen2 import token
-from lib2to3 import fixer_base
-
-_literal_re = re.compile(r"[^bBuUrR]?[\'\"]")
-
-class FixBytes(fixer_base.BaseFix):
-    BM_compatible = True
-    PATTERN = "STRING"
-
-    def transform(self, node, results):
-        if node.type == token.STRING:
-            if _literal_re.match(node.value):
-                new = node.clone()
-                new.value = u'b' + new.value
-                return new
diff --git a/lib/libfuturize/fixes/fix_cmp.py b/lib/libfuturize/fixes/fix_cmp.py
deleted file mode 100644
index 762eb4b4..00000000
--- a/lib/libfuturize/fixes/fix_cmp.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# coding: utf-8
-"""
-Fixer for the cmp() function on Py2, which was removed in Py3.
-
-Adds this import line::
-
-    from past.builtins import cmp
-
-if cmp() is called in the code.
-"""
-
-from __future__ import unicode_literals
-from lib2to3 import fixer_base
-
-from libfuturize.fixer_util import touch_import_top
-
-
-expression = "name='cmp'"
-
-
-class FixCmp(fixer_base.BaseFix):
-    BM_compatible = True
-    run_order = 9
-
-    PATTERN = """
-              power<
-                 ({0}) trailer< '(' args=[any] ')' >
-              rest=any* >
-              """.format(expression)
-
-    def transform(self, node, results):
-        name = results["name"]
-        touch_import_top(u'past.builtins', name.value, node)
diff --git a/lib/libfuturize/fixes/fix_division.py b/lib/libfuturize/fixes/fix_division.py
deleted file mode 100644
index 6975a52b..00000000
--- a/lib/libfuturize/fixes/fix_division.py
+++ /dev/null
@@ -1,12 +0,0 @@
-"""
-UNFINISHED
-For the ``future`` package.
-
-Adds this import line:
-
-    from __future__ import division
-
-at the top so the code runs identically on Py3 and Py2.6/2.7
-"""
-
-from libpasteurize.fixes.fix_division import FixDivision
diff --git a/lib/libfuturize/fixes/fix_division_safe.py b/lib/libfuturize/fixes/fix_division_safe.py
deleted file mode 100644
index 65c8c1da..00000000
--- a/lib/libfuturize/fixes/fix_division_safe.py
+++ /dev/null
@@ -1,109 +0,0 @@
-"""
-For the ``future`` package.
-
-Adds this import line:
-
-    from __future__ import division
-
-at the top and changes any old-style divisions to be calls to
-past.utils.old_div so the code runs as before on Py2.6/2.7 and has the same
-behaviour on Py3.
-
-If "from __future__ import division" is already in effect, this fixer does
-nothing.
-"""
-
-import re
-from lib2to3.fixer_util import Leaf, Node, Comma
-from lib2to3 import fixer_base
-from libfuturize.fixer_util import (token, future_import, touch_import_top,
-                                    wrap_in_fn_call)
-
-
-def match_division(node):
-    u"""
-    __future__.division redefines the meaning of a single slash for division,
-    so we match that and only that.
-    """
-    slash = token.SLASH
-    return node.type == slash and not node.next_sibling.type == slash and \
-                                  not node.prev_sibling.type == slash
-
-const_re = re.compile('^[0-9]*[.][0-9]*$')
-
-def is_floaty(node):
-    return _is_floaty(node.prev_sibling) or _is_floaty(node.next_sibling)
-
-
-def _is_floaty(expr):
-    if isinstance(expr, list):
-        expr = expr[0]
-
-    if isinstance(expr, Leaf):
-        # If it's a leaf, let's see if it's a numeric constant containing a '.'
-        return const_re.match(expr.value)
-    elif isinstance(expr, Node):
-        # If the expression is a node, let's see if it's a direct cast to float
-        if isinstance(expr.children[0], Leaf):
-            return expr.children[0].value == u'float'
-    return False
-
-
-class FixDivisionSafe(fixer_base.BaseFix):
-    # BM_compatible = True
-    run_order = 4    # this seems to be ignored?
-
-    _accept_type = token.SLASH
-
-    PATTERN = """
-    term<(not('/') any)+ '/' ((not('/') any))>
-    """
-
-    def start_tree(self, tree, name):
-        """
-        Skip this fixer if "__future__.division" is already imported.
-        """
-        super(FixDivisionSafe, self).start_tree(tree, name)
-        self.skip = "division" in tree.future_features
-
-    def match(self, node):
-        u"""
-        Since the tree needs to be fixed once and only once if and only if it
-        matches, we can start discarding matches after the first.
-        """
-        if node.type == self.syms.term:
-            matched = False
-            skip = False
-            children = []
-            for child in node.children:
-                if skip:
-                    skip = False
-                    continue
-                if match_division(child) and not is_floaty(child):
-                    matched = True
-
-                    # Strip any leading space for the first number:
-                    children[0].prefix = u''
-
-                    children = [wrap_in_fn_call("old_div",
-                                                children + [Comma(), child.next_sibling.clone()],
-                                                prefix=node.prefix)]
-                    skip = True
-                else:
-                    children.append(child.clone())
-            if matched:
-                # In Python 2.6, `Node` does not have the fixers_applied attribute
-                # https://github.com/python/cpython/blob/8493c0cd66cfc181ac1517268a74f077e9998701/Lib/lib2to3/pytree.py#L235
-                if hasattr(Node, "fixers_applied"):
-                    return Node(node.type, children, fixers_applied=node.fixers_applied)
-                else:
-                    return Node(node.type, children)
-
-        return False
-
-    def transform(self, node, results):
-        if self.skip:
-            return
-        future_import(u"division", node)
-        touch_import_top(u'past.utils', u'old_div', node)
-        return results
diff --git a/lib/libfuturize/fixes/fix_execfile.py b/lib/libfuturize/fixes/fix_execfile.py
deleted file mode 100644
index cfe9d8d0..00000000
--- a/lib/libfuturize/fixes/fix_execfile.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# coding: utf-8
-"""
-Fixer for the execfile() function on Py2, which was removed in Py3.
-
-The Lib/lib2to3/fixes/fix_execfile.py module has some problems: see
-python-future issue #37. This fixer merely imports execfile() from
-past.builtins and leaves the code alone.
-
-Adds this import line::
-
-    from past.builtins import execfile
-
-for the function execfile() that was removed from Py3.
-"""
-
-from __future__ import unicode_literals
-from lib2to3 import fixer_base
-
-from libfuturize.fixer_util import touch_import_top
-
-
-expression = "name='execfile'"
-
-
-class FixExecfile(fixer_base.BaseFix):
-    BM_compatible = True
-    run_order = 9
-
-    PATTERN = """
-              power<
-                 ({0}) trailer< '(' args=[any] ')' >
-              rest=any* >
-              """.format(expression)
-
-    def transform(self, node, results):
-        name = results["name"]
-        touch_import_top(u'past.builtins', name.value, node)
diff --git a/lib/libfuturize/fixes/fix_future_builtins.py b/lib/libfuturize/fixes/fix_future_builtins.py
deleted file mode 100644
index eea6c6a1..00000000
--- a/lib/libfuturize/fixes/fix_future_builtins.py
+++ /dev/null
@@ -1,59 +0,0 @@
-"""
-For the ``future`` package.
-
-Adds this import line::
-
-    from builtins import XYZ
-
-for each of the functions XYZ that is used in the module.
-
-Adds these imports after any other imports (in an initial block of them).
-"""
-
-from __future__ import unicode_literals
-
-from lib2to3 import fixer_base
-from lib2to3.pygram import python_symbols as syms
-from lib2to3.fixer_util import Name, Call, in_special_context
-
-from libfuturize.fixer_util import touch_import_top
-
-# All builtins are:
-#     from future.builtins.iterators import (filter, map, zip)
-#     from future.builtins.misc import (ascii, chr, hex, input, isinstance, oct, open, round, super)
-#     from future.types import (bytes, dict, int, range, str)
-# We don't need isinstance any more.
-
-replaced_builtin_fns = '''filter map zip
-                       ascii chr hex input next oct
-                       bytes range str raw_input'''.split()
-                       # This includes raw_input as a workaround for the
-                       # lib2to3 fixer for raw_input on Py3 (only), allowing
-                       # the correct import to be included. (Py3 seems to run
-                       # the fixers the wrong way around, perhaps ignoring the
-                       # run_order class attribute below ...)
-
-expression = '|'.join(["name='{0}'".format(name) for name in replaced_builtin_fns])
-
-
-class FixFutureBuiltins(fixer_base.BaseFix):
-    BM_compatible = True
-    run_order = 7
-
-    # Currently we only match uses as a function. This doesn't match e.g.:
-    #     if isinstance(s, str):
-    #         ...
-    PATTERN = """
-              power<
-                 ({0}) trailer< '(' [arglist=any] ')' >
-              rest=any* >
-              |
-              power<
-                  'map' trailer< '(' [arglist=any] ')' >
-              >
-              """.format(expression)
-
-    def transform(self, node, results):
-        name = results["name"]
-        touch_import_top(u'builtins', name.value, node)
-        # name.replace(Name(u"input", prefix=name.prefix))
diff --git a/lib/libfuturize/fixes/fix_future_standard_library.py b/lib/libfuturize/fixes/fix_future_standard_library.py
deleted file mode 100644
index a1c3f3d4..00000000
--- a/lib/libfuturize/fixes/fix_future_standard_library.py
+++ /dev/null
@@ -1,24 +0,0 @@
-"""
-For the ``future`` package.
-
-Changes any imports needed to reflect the standard library reorganization. Also
-Also adds these import lines:
-
-    from future import standard_library
-    standard_library.install_aliases()
-
-after any __future__ imports but before any other imports.
-"""
-
-from lib2to3.fixes.fix_imports import FixImports
-from libfuturize.fixer_util import touch_import_top
-
-
-class FixFutureStandardLibrary(FixImports):
-    run_order = 8
-
-    def transform(self, node, results):
-        result = super(FixFutureStandardLibrary, self).transform(node, results)
-        # TODO: add a blank line between any __future__ imports and this?
-        touch_import_top(u'future', u'standard_library', node)
-        return result
diff --git a/lib/libfuturize/fixes/fix_future_standard_library_urllib.py b/lib/libfuturize/fixes/fix_future_standard_library_urllib.py
deleted file mode 100644
index cf673884..00000000
--- a/lib/libfuturize/fixes/fix_future_standard_library_urllib.py
+++ /dev/null
@@ -1,28 +0,0 @@
-"""
-For the ``future`` package.
-
-A special fixer that ensures that these lines have been added::
-
-    from future import standard_library
-    standard_library.install_hooks()
-
-even if the only module imported was ``urllib``, in which case the regular fixer
-wouldn't have added these lines.
-
-"""
-
-from lib2to3.fixes.fix_urllib import FixUrllib
-from libfuturize.fixer_util import touch_import_top, find_root
-
-
-class FixFutureStandardLibraryUrllib(FixUrllib):     # not a subclass of FixImports
-    run_order = 8
-
-    def transform(self, node, results):
-        # transform_member() in lib2to3/fixes/fix_urllib.py breaks node so find_root(node)
-        # no longer works after the super() call below. So we find the root first:
-        root = find_root(node)
-        result = super(FixFutureStandardLibraryUrllib, self).transform(node, results)
-        # TODO: add a blank line between any __future__ imports and this?
-        touch_import_top(u'future', u'standard_library', root)
-        return result
diff --git a/lib/libfuturize/fixes/fix_input.py b/lib/libfuturize/fixes/fix_input.py
deleted file mode 100644
index 8a43882e..00000000
--- a/lib/libfuturize/fixes/fix_input.py
+++ /dev/null
@@ -1,32 +0,0 @@
-"""
-Fixer for input.
-
-Does a check for `from builtins import input` before running the lib2to3 fixer.
-The fixer will not run when the input is already present.
-
-
-this:
-    a = input()
-becomes:
-    from builtins import input
-    a = eval(input())
-
-and this:
-    from builtins import input
-    a = input()
-becomes (no change):
-    from builtins import input
-    a = input()
-"""
-
-import lib2to3.fixes.fix_input
-from lib2to3.fixer_util import does_tree_import
-
-
-class FixInput(lib2to3.fixes.fix_input.FixInput):
-    def transform(self, node, results):
-
-        if does_tree_import('builtins', 'input', node):
-            return
-
-        return super(FixInput, self).transform(node, results)
diff --git a/lib/libfuturize/fixes/fix_metaclass.py b/lib/libfuturize/fixes/fix_metaclass.py
deleted file mode 100644
index a7eee40d..00000000
--- a/lib/libfuturize/fixes/fix_metaclass.py
+++ /dev/null
@@ -1,262 +0,0 @@
-# coding: utf-8
-"""Fixer for __metaclass__ = X -> (future.utils.with_metaclass(X)) methods.
-
-   The various forms of classef (inherits nothing, inherits once, inherints
-   many) don't parse the same in the CST so we look at ALL classes for
-   a __metaclass__ and if we find one normalize the inherits to all be
-   an arglist.
-
-   For one-liner classes ('class X: pass') there is no indent/dedent so
-   we normalize those into having a suite.
-
-   Moving the __metaclass__ into the classdef can also cause the class
-   body to be empty so there is some special casing for that as well.
-
-   This fixer also tries very hard to keep original indenting and spacing
-   in all those corner cases.
-"""
-# This is a derived work of Lib/lib2to3/fixes/fix_metaclass.py under the
-# copyright of the Python Software Foundation, licensed under the Python
-# Software Foundation License 2.
-#
-# Copyright notice:
-#
-#     Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#     2011, 2012, 2013 Python Software Foundation. All rights reserved.
-#
-# Full license text: http://docs.python.org/3.4/license.html
-
-# Author: Jack Diederich, Daniel Neuhäuser
-
-# Local imports
-from lib2to3 import fixer_base
-from lib2to3.pygram import token
-from lib2to3.fixer_util import Name, syms, Node, Leaf, touch_import, Call, \
-    String, Comma, parenthesize
-
-
-def has_metaclass(parent):
-    """ we have to check the cls_node without changing it.
-        There are two possibilities:
-          1)  clsdef => suite => simple_stmt => expr_stmt => Leaf('__meta')
-          2)  clsdef => simple_stmt => expr_stmt => Leaf('__meta')
-    """
-    for node in parent.children:
-        if node.type == syms.suite:
-            return has_metaclass(node)
-        elif node.type == syms.simple_stmt and node.children:
-            expr_node = node.children[0]
-            if expr_node.type == syms.expr_stmt and expr_node.children:
-                left_side = expr_node.children[0]
-                if isinstance(left_side, Leaf) and \
-                        left_side.value == '__metaclass__':
-                    return True
-    return False
-
-
-def fixup_parse_tree(cls_node):
-    """ one-line classes don't get a suite in the parse tree so we add
-        one to normalize the tree
-    """
-    for node in cls_node.children:
-        if node.type == syms.suite:
-            # already in the preferred format, do nothing
-            return
-
-    # !%@#! one-liners have no suite node, we have to fake one up
-    for i, node in enumerate(cls_node.children):
-        if node.type == token.COLON:
-            break
-    else:
-        raise ValueError("No class suite and no ':'!")
-
-    # move everything into a suite node
-    suite = Node(syms.suite, [])
-    while cls_node.children[i+1:]:
-        move_node = cls_node.children[i+1]
-        suite.append_child(move_node.clone())
-        move_node.remove()
-    cls_node.append_child(suite)
-    node = suite
-
-
-def fixup_simple_stmt(parent, i, stmt_node):
-    """ if there is a semi-colon all the parts count as part of the same
-        simple_stmt.  We just want the __metaclass__ part so we move
-        everything efter the semi-colon into its own simple_stmt node
-    """
-    for semi_ind, node in enumerate(stmt_node.children):
-        if node.type == token.SEMI: # *sigh*
-            break
-    else:
-        return
-
-    node.remove() # kill the semicolon
-    new_expr = Node(syms.expr_stmt, [])
-    new_stmt = Node(syms.simple_stmt, [new_expr])
-    while stmt_node.children[semi_ind:]:
-        move_node = stmt_node.children[semi_ind]
-        new_expr.append_child(move_node.clone())
-        move_node.remove()
-    parent.insert_child(i, new_stmt)
-    new_leaf1 = new_stmt.children[0].children[0]
-    old_leaf1 = stmt_node.children[0].children[0]
-    new_leaf1.prefix = old_leaf1.prefix
-
-
-def remove_trailing_newline(node):
-    if node.children and node.children[-1].type == token.NEWLINE:
-        node.children[-1].remove()
-
-
-def find_metas(cls_node):
-    # find the suite node (Mmm, sweet nodes)
-    for node in cls_node.children:
-        if node.type == syms.suite:
-            break
-    else:
-        raise ValueError("No class suite!")
-
-    # look for simple_stmt[ expr_stmt[ Leaf('__metaclass__') ] ]
-    for i, simple_node in list(enumerate(node.children)):
-        if simple_node.type == syms.simple_stmt and simple_node.children:
-            expr_node = simple_node.children[0]
-            if expr_node.type == syms.expr_stmt and expr_node.children:
-                # Check if the expr_node is a simple assignment.
-                left_node = expr_node.children[0]
-                if isinstance(left_node, Leaf) and \
-                        left_node.value == u'__metaclass__':
-                    # We found a assignment to __metaclass__.
-                    fixup_simple_stmt(node, i, simple_node)
-                    remove_trailing_newline(simple_node)
-                    yield (node, i, simple_node)
-
-
-def fixup_indent(suite):
-    """ If an INDENT is followed by a thing with a prefix then nuke the prefix
-        Otherwise we get in trouble when removing __metaclass__ at suite start
-    """
-    kids = suite.children[::-1]
-    # find the first indent
-    while kids:
-        node = kids.pop()
-        if node.type == token.INDENT:
-            break
-
-    # find the first Leaf
-    while kids:
-        node = kids.pop()
-        if isinstance(node, Leaf) and node.type != token.DEDENT:
-            if node.prefix:
-                node.prefix = u''
-            return
-        else:
-            kids.extend(node.children[::-1])
-
-
-class FixMetaclass(fixer_base.BaseFix):
-    BM_compatible = True
-
-    PATTERN = """
-    classdef<any*>
-    """
-
-    def transform(self, node, results):
-        if not has_metaclass(node):
-            return
-
-        fixup_parse_tree(node)
-
-        # find metaclasses, keep the last one
-        last_metaclass = None
-        for suite, i, stmt in find_metas(node):
-            last_metaclass = stmt
-            stmt.remove()
-
-        text_type = node.children[0].type # always Leaf(nnn, 'class')
-
-        # figure out what kind of classdef we have
-        if len(node.children) == 7:
-            # Node(classdef, ['class', 'name', '(', arglist, ')', ':', suite])
-            #                 0        1       2    3        4    5    6
-            if node.children[3].type == syms.arglist:
-                arglist = node.children[3]
-            # Node(classdef, ['class', 'name', '(', 'Parent', ')', ':', suite])
-            else:
-                parent = node.children[3].clone()
-                arglist = Node(syms.arglist, [parent])
-                node.set_child(3, arglist)
-        elif len(node.children) == 6:
-            # Node(classdef, ['class', 'name', '(',  ')', ':', suite])
-            #                 0        1       2     3    4    5
-            arglist = Node(syms.arglist, [])
-            node.insert_child(3, arglist)
-        elif len(node.children) == 4:
-            # Node(classdef, ['class', 'name', ':', suite])
-            #                 0        1       2    3
-            arglist = Node(syms.arglist, [])
-            node.insert_child(2, Leaf(token.RPAR, u')'))
-            node.insert_child(2, arglist)
-            node.insert_child(2, Leaf(token.LPAR, u'('))
-        else:
-            raise ValueError("Unexpected class definition")
-
-        # now stick the metaclass in the arglist
-        meta_txt = last_metaclass.children[0].children[0]
-        meta_txt.value = 'metaclass'
-        orig_meta_prefix = meta_txt.prefix
-
-        # Was: touch_import(None, u'future.utils', node)
-        touch_import(u'future.utils', u'with_metaclass', node)
-
-        metaclass = last_metaclass.children[0].children[2].clone()
-        metaclass.prefix = u''
-
-        arguments = [metaclass]
-
-        if arglist.children:
-            if len(arglist.children) == 1:
-                base = arglist.children[0].clone()
-                base.prefix = u' '
-            else:
-                # Unfortunately six.with_metaclass() only allows one base
-                # class, so we have to dynamically generate a base class if
-                # there is more than one.
-                bases = parenthesize(arglist.clone())
-                bases.prefix = u' '
-                base = Call(Name('type'), [
-                    String("'NewBase'"),
-                    Comma(),
-                    bases,
-                    Comma(),
-                    Node(
-                        syms.atom,
-                        [Leaf(token.LBRACE, u'{'), Leaf(token.RBRACE, u'}')],
-                        prefix=u' '
-                    )
-                ], prefix=u' ')
-            arguments.extend([Comma(), base])
-
-        arglist.replace(Call(
-            Name(u'with_metaclass', prefix=arglist.prefix),
-            arguments
-        ))
-
-        fixup_indent(suite)
-
-        # check for empty suite
-        if not suite.children:
-            # one-liner that was just __metaclass_
-            suite.remove()
-            pass_leaf = Leaf(text_type, u'pass')
-            pass_leaf.prefix = orig_meta_prefix
-            node.append_child(pass_leaf)
-            node.append_child(Leaf(token.NEWLINE, u'\n'))
-
-        elif len(suite.children) > 1 and \
-                 (suite.children[-2].type == token.INDENT and
-                  suite.children[-1].type == token.DEDENT):
-            # there was only one line in the class body and it was __metaclass__
-            pass_leaf = Leaf(text_type, u'pass')
-            suite.insert_child(-1, pass_leaf)
-            suite.insert_child(-1, Leaf(token.NEWLINE, u'\n'))
diff --git a/lib/libfuturize/fixes/fix_next_call.py b/lib/libfuturize/fixes/fix_next_call.py
deleted file mode 100644
index 282f1852..00000000
--- a/lib/libfuturize/fixes/fix_next_call.py
+++ /dev/null
@@ -1,104 +0,0 @@
-"""
-Based on fix_next.py by Collin Winter.
-
-Replaces it.next() -> next(it), per PEP 3114.
-
-Unlike fix_next.py, this fixer doesn't replace the name of a next method with __next__,
-which would break Python 2 compatibility without further help from fixers in
-stage 2.
-"""
-
-# Local imports
-from lib2to3.pgen2 import token
-from lib2to3.pygram import python_symbols as syms
-from lib2to3 import fixer_base
-from lib2to3.fixer_util import Name, Call, find_binding
-
-bind_warning = "Calls to builtin next() possibly shadowed by global binding"
-
-
-class FixNextCall(fixer_base.BaseFix):
-    BM_compatible = True
-    PATTERN = """
-    power< base=any+ trailer< '.' attr='next' > trailer< '(' ')' > >
-    |
-    power< head=any+ trailer< '.' attr='next' > not trailer< '(' ')' > >
-    |
-    global=global_stmt< 'global' any* 'next' any* >
-    """
-
-    order = "pre" # Pre-order tree traversal
-
-    def start_tree(self, tree, filename):
-        super(FixNextCall, self).start_tree(tree, filename)
-
-        n = find_binding('next', tree)
-        if n:
-            self.warning(n, bind_warning)
-            self.shadowed_next = True
-        else:
-            self.shadowed_next = False
-
-    def transform(self, node, results):
-        assert results
-
-        base = results.get("base")
-        attr = results.get("attr")
-        name = results.get("name")
-
-        if base:
-            if self.shadowed_next:
-                # Omit this:
-                # attr.replace(Name("__next__", prefix=attr.prefix))
-                pass
-            else:
-                base = [n.clone() for n in base]
-                base[0].prefix = ""
-                node.replace(Call(Name("next", prefix=node.prefix), base))
-        elif name:
-            # Omit this:
-            # n = Name("__next__", prefix=name.prefix)
-            # name.replace(n)
-            pass
-        elif attr:
-            # We don't do this transformation if we're assigning to "x.next".
-            # Unfortunately, it doesn't seem possible to do this in PATTERN,
-            #  so it's being done here.
-            if is_assign_target(node):
-                head = results["head"]
-                if "".join([str(n) for n in head]).strip() == '__builtin__':
-                    self.warning(node, bind_warning)
-                return
-            # Omit this:
-            # attr.replace(Name("__next__"))
-        elif "global" in results:
-            self.warning(node, bind_warning)
-            self.shadowed_next = True
-
-
-### The following functions help test if node is part of an assignment
-###  target.
-
-def is_assign_target(node):
-    assign = find_assign(node)
-    if assign is None:
-        return False
-
-    for child in assign.children:
-        if child.type == token.EQUAL:
-            return False
-        elif is_subtree(child, node):
-            return True
-    return False
-
-def find_assign(node):
-    if node.type == syms.expr_stmt:
-        return node
-    if node.type == syms.simple_stmt or node.parent is None:
-        return None
-    return find_assign(node.parent)
-
-def is_subtree(root, node):
-    if root == node:
-        return True
-    return any(is_subtree(c, node) for c in root.children)
diff --git a/lib/libfuturize/fixes/fix_object.py b/lib/libfuturize/fixes/fix_object.py
deleted file mode 100644
index accf2c52..00000000
--- a/lib/libfuturize/fixes/fix_object.py
+++ /dev/null
@@ -1,17 +0,0 @@
-"""
-Fixer that adds ``from builtins import object`` if there is a line
-like this:
-    class Foo(object):
-"""
-
-from lib2to3 import fixer_base
-
-from libfuturize.fixer_util import touch_import_top
-
-
-class FixObject(fixer_base.BaseFix):
-
-    PATTERN = u"classdef< 'class' NAME '(' name='object' ')' colon=':' any >"
-
-    def transform(self, node, results):
-        touch_import_top(u'builtins', 'object', node)
diff --git a/lib/libfuturize/fixes/fix_oldstr_wrap.py b/lib/libfuturize/fixes/fix_oldstr_wrap.py
deleted file mode 100644
index ad58771d..00000000
--- a/lib/libfuturize/fixes/fix_oldstr_wrap.py
+++ /dev/null
@@ -1,39 +0,0 @@
-"""
-For the ``future`` package.
-
-Adds this import line:
-
-    from past.builtins import str as oldstr
-
-at the top and wraps any unadorned string literals 'abc' or explicit byte-string
-literals b'abc' in oldstr() calls so the code has the same behaviour on Py3 as
-on Py2.6/2.7.
-"""
-
-from __future__ import unicode_literals
-import re
-from lib2to3 import fixer_base
-from lib2to3.pgen2 import token
-from lib2to3.fixer_util import syms
-from libfuturize.fixer_util import (future_import, touch_import_top,
-                                    wrap_in_fn_call)
-
-
-_literal_re = re.compile(r"[^uUrR]?[\'\"]")
-
-
-class FixOldstrWrap(fixer_base.BaseFix):
-    BM_compatible = True
-    PATTERN = "STRING"
-
-    def transform(self, node, results):
-        if node.type == token.STRING:
-            touch_import_top(u'past.types', u'oldstr', node)
-            if _literal_re.match(node.value):
-                new = node.clone()
-                # Strip any leading space or comments:
-                # TODO: check: do we really want to do this?
-                new.prefix = u''
-                new.value = u'b' + new.value
-                wrapped = wrap_in_fn_call("oldstr", [new], prefix=node.prefix)
-                return wrapped
diff --git a/lib/libfuturize/fixes/fix_order___future__imports.py b/lib/libfuturize/fixes/fix_order___future__imports.py
deleted file mode 100644
index 00d7ef60..00000000
--- a/lib/libfuturize/fixes/fix_order___future__imports.py
+++ /dev/null
@@ -1,36 +0,0 @@
-"""
-UNFINISHED
-
-Fixer for turning multiple lines like these:
-
-    from __future__ import division
-    from __future__ import absolute_import
-    from __future__ import print_function
-
-into a single line like this:
-
-    from __future__ import (absolute_import, division, print_function)
-
-This helps with testing of ``futurize``.
-"""
-
-from lib2to3 import fixer_base
-from libfuturize.fixer_util import future_import
-
-class FixOrderFutureImports(fixer_base.BaseFix):
-    BM_compatible = True
-    PATTERN = "file_input"
-
-    run_order = 10
-
-    # def match(self, node):
-    #     """
-    #     Match only once per file
-    #     """
-    #     if hasattr(node, 'type') and node.type == syms.file_input:
-    #         return True
-    #     return False
-
-    def transform(self, node, results):
-        # TODO    # write me
-        pass
diff --git a/lib/libfuturize/fixes/fix_print.py b/lib/libfuturize/fixes/fix_print.py
deleted file mode 100644
index 2554717c..00000000
--- a/lib/libfuturize/fixes/fix_print.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 2006 Google, Inc. All Rights Reserved.
-# Licensed to PSF under a Contributor Agreement.
-
-"""Fixer for print.
-
-Change:
-    "print"          into "print()"
-    "print ..."      into "print(...)"
-    "print(...)"     not changed
-    "print ... ,"    into "print(..., end=' ')"
-    "print >>x, ..." into "print(..., file=x)"
-
-No changes are applied if print_function is imported from __future__
-
-"""
-
-# Local imports
-from lib2to3 import patcomp, pytree, fixer_base
-from lib2to3.pgen2 import token
-from lib2to3.fixer_util import Name, Call, Comma, String
-# from libmodernize import add_future
-
-parend_expr = patcomp.compile_pattern(
-              """atom< '(' [arith_expr|atom|power|term|STRING|NAME] ')' >"""
-              )
-
-
-class FixPrint(fixer_base.BaseFix):
-
-    BM_compatible = True
-
-    PATTERN = """
-              simple_stmt< any* bare='print' any* > | print_stmt
-              """
-
-    def transform(self, node, results):
-        assert results
-
-        bare_print = results.get("bare")
-
-        if bare_print:
-            # Special-case print all by itself.
-            bare_print.replace(Call(Name(u"print"), [],
-                               prefix=bare_print.prefix))
-            # The "from __future__ import print_function"" declaration is added
-            # by the fix_print_with_import fixer, so we skip it here.
-            # add_future(node, u'print_function')
-            return
-        assert node.children[0] == Name(u"print")
-        args = node.children[1:]
-        if len(args) == 1 and parend_expr.match(args[0]):
-            # We don't want to keep sticking parens around an
-            # already-parenthesised expression.
-            return
-
-        sep = end = file = None
-        if args and args[-1] == Comma():
-            args = args[:-1]
-            end = " "
-
-            # try to determine if the string ends in a non-space whitespace character, in which
-            # case there should be no space at the end of the conversion
-            string_leaves = [leaf for leaf in args[-1].leaves() if leaf.type == token.STRING]
-            if (
-                string_leaves
-                and string_leaves[-1].value[0] != "r"  # "raw" string
-                and string_leaves[-1].value[-3:-1] in (r"\t", r"\n", r"\r")
-            ):
-                end = ""
-        if args and args[0] == pytree.Leaf(token.RIGHTSHIFT, u">>"):
-            assert len(args) >= 2
-            file = args[1].clone()
-            args = args[3:] # Strip a possible comma after the file expression
-        # Now synthesize a print(args, sep=..., end=..., file=...) node.
-        l_args = [arg.clone() for arg in args]
-        if l_args:
-            l_args[0].prefix = u""
-        if sep is not None or end is not None or file is not None:
-            if sep is not None:
-                self.add_kwarg(l_args, u"sep", String(repr(sep)))
-            if end is not None:
-                self.add_kwarg(l_args, u"end", String(repr(end)))
-            if file is not None:
-                self.add_kwarg(l_args, u"file", file)
-        n_stmt = Call(Name(u"print"), l_args)
-        n_stmt.prefix = node.prefix
-
-        # Note that there are corner cases where adding this future-import is
-        # incorrect, for example when the file also has a 'print ()' statement
-        # that was intended to print "()".
-        # add_future(node, u'print_function')
-        return n_stmt
-
-    def add_kwarg(self, l_nodes, s_kwd, n_expr):
-        # XXX All this prefix-setting may lose comments (though rarely)
-        n_expr.prefix = u""
-        n_argument = pytree.Node(self.syms.argument,
-                                 (Name(s_kwd),
-                                  pytree.Leaf(token.EQUAL, u"="),
-                                  n_expr))
-        if l_nodes:
-            l_nodes.append(Comma())
-            n_argument.prefix = u" "
-        l_nodes.append(n_argument)
diff --git a/lib/libfuturize/fixes/fix_print_with_import.py b/lib/libfuturize/fixes/fix_print_with_import.py
deleted file mode 100644
index 34490461..00000000
--- a/lib/libfuturize/fixes/fix_print_with_import.py
+++ /dev/null
@@ -1,22 +0,0 @@
-"""
-For the ``future`` package.
-
-Turns any print statements into functions and adds this import line:
-
-    from __future__ import print_function
-
-at the top to retain compatibility with Python 2.6+.
-"""
-
-from libfuturize.fixes.fix_print import FixPrint
-from libfuturize.fixer_util import future_import
-
-class FixPrintWithImport(FixPrint):
-    run_order = 7
-    def transform(self, node, results):
-        # Add the __future__ import first. (Otherwise any shebang or encoding
-        # comment line attached as a prefix to the print statement will be
-        # copied twice and appear twice.)
-        future_import(u'print_function', node)
-        n_stmt = super(FixPrintWithImport, self).transform(node, results)
-        return n_stmt
diff --git a/lib/libfuturize/fixes/fix_raise.py b/lib/libfuturize/fixes/fix_raise.py
deleted file mode 100644
index d113401c..00000000
--- a/lib/libfuturize/fixes/fix_raise.py
+++ /dev/null
@@ -1,107 +0,0 @@
-"""Fixer for 'raise E, V'
-
-From Armin Ronacher's ``python-modernize``.
-
-raise         -> raise
-raise E       -> raise E
-raise E, 5    -> raise E(5)
-raise E, 5, T -> raise E(5).with_traceback(T)
-raise E, None, T -> raise E.with_traceback(T)
-
-raise (((E, E'), E''), E'''), 5 -> raise E(5)
-raise "foo", V, T               -> warns about string exceptions
-
-raise E, (V1, V2) -> raise E(V1, V2)
-raise E, (V1, V2), T -> raise E(V1, V2).with_traceback(T)
-
-
-CAVEATS:
-1) "raise E, V, T" cannot be translated safely in general. If V
-   is not a tuple or a (number, string, None) literal, then:
-
-   raise E, V, T -> from future.utils import raise_
-                    raise_(E, V, T)
-"""
-# Author: Collin Winter, Armin Ronacher, Mark Huang
-
-# Local imports
-from lib2to3 import pytree, fixer_base
-from lib2to3.pgen2 import token
-from lib2to3.fixer_util import Name, Call, is_tuple, Comma, Attr, ArgList
-
-from libfuturize.fixer_util import touch_import_top
-
-
-class FixRaise(fixer_base.BaseFix):
-
-    BM_compatible = True
-    PATTERN = """
-    raise_stmt< 'raise' exc=any [',' val=any [',' tb=any]] >
-    """
-
-    def transform(self, node, results):
-        syms = self.syms
-
-        exc = results["exc"].clone()
-        if exc.type == token.STRING:
-            msg = "Python 3 does not support string exceptions"
-            self.cannot_convert(node, msg)
-            return
-
-        # Python 2 supports
-        #  raise ((((E1, E2), E3), E4), E5), V
-        # as a synonym for
-        #  raise E1, V
-        # Since Python 3 will not support this, we recurse down any tuple
-        # literals, always taking the first element.
-        if is_tuple(exc):
-            while is_tuple(exc):
-                # exc.children[1:-1] is the unparenthesized tuple
-                # exc.children[1].children[0] is the first element of the tuple
-                exc = exc.children[1].children[0].clone()
-            exc.prefix = u" "
-
-        if "tb" in results:
-            tb = results["tb"].clone()
-        else:
-            tb = None
-
-        if "val" in results:
-            val = results["val"].clone()
-            if is_tuple(val):
-                # Assume that exc is a subclass of Exception and call exc(*val).
-                args = [c.clone() for c in val.children[1:-1]]
-                exc = Call(exc, args)
-            elif val.type in (token.NUMBER, token.STRING):
-                # Handle numeric and string literals specially, e.g.
-                # "raise Exception, 5" -> "raise Exception(5)".
-                val.prefix = u""
-                exc = Call(exc, [val])
-            elif val.type == token.NAME and val.value == u"None":
-                # Handle None specially, e.g.
-                # "raise Exception, None" -> "raise Exception".
-                pass
-            else:
-                # val is some other expression. If val evaluates to an instance
-                # of exc, it should just be raised. If val evaluates to None,
-                # a default instance of exc should be raised (as above). If val
-                # evaluates to a tuple, exc(*val) should be called (as
-                # above). Otherwise, exc(val) should be called. We can only
-                # tell what to do at runtime, so defer to future.utils.raise_(),
-                # which handles all of these cases.
-                touch_import_top(u"future.utils", u"raise_", node)
-                exc.prefix = u""
-                args = [exc, Comma(), val]
-                if tb is not None:
-                    args += [Comma(), tb]
-                return Call(Name(u"raise_"), args, prefix=node.prefix)
-
-        if tb is not None:
-            tb.prefix = ""
-            exc_list = Attr(exc, Name('with_traceback')) + [ArgList([tb])]
-        else:
-            exc_list = [exc]
-
-        return pytree.Node(syms.raise_stmt,
-                           [Name(u"raise")] + exc_list,
-                           prefix=node.prefix)
diff --git a/lib/libfuturize/fixes/fix_remove_old__future__imports.py b/lib/libfuturize/fixes/fix_remove_old__future__imports.py
deleted file mode 100644
index 9336f75f..00000000
--- a/lib/libfuturize/fixes/fix_remove_old__future__imports.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""
-Fixer for removing any of these lines:
-
-    from __future__ import with_statement
-    from __future__ import nested_scopes
-    from __future__ import generators
-
-The reason is that __future__ imports like these are required to be the first
-line of code (after docstrings) on Python 2.6+, which can get in the way.
-
-These imports are always enabled in Python 2.6+, which is the minimum sane
-version to target for Py2/3 compatibility.
-"""
-
-from lib2to3 import fixer_base
-from libfuturize.fixer_util import remove_future_import
-
-class FixRemoveOldFutureImports(fixer_base.BaseFix):
-    BM_compatible = True
-    PATTERN = "file_input"
-    run_order = 1
-
-    def transform(self, node, results):
-        remove_future_import(u"with_statement", node)
-        remove_future_import(u"nested_scopes", node)
-        remove_future_import(u"generators", node)
diff --git a/lib/libfuturize/fixes/fix_unicode_keep_u.py b/lib/libfuturize/fixes/fix_unicode_keep_u.py
deleted file mode 100644
index 2e9a4e47..00000000
--- a/lib/libfuturize/fixes/fix_unicode_keep_u.py
+++ /dev/null
@@ -1,24 +0,0 @@
-"""Fixer that changes unicode to str and unichr to chr, but -- unlike the
-lib2to3 fix_unicode.py fixer, does not change u"..." into "...".
-
-The reason is that Py3.3+ supports the u"..." string prefix, and, if
-present, the prefix may provide useful information for disambiguating
-between byte strings and unicode strings, which is often the hardest part
-of the porting task.
-
-"""
-
-from lib2to3.pgen2 import token
-from lib2to3 import fixer_base
-
-_mapping = {u"unichr" : u"chr", u"unicode" : u"str"}
-
-class FixUnicodeKeepU(fixer_base.BaseFix):
-    BM_compatible = True
-    PATTERN = "'unicode' | 'unichr'"
-
-    def transform(self, node, results):
-        if node.type == token.NAME:
-            new = node.clone()
-            new.value = _mapping[node.value]
-            return new
diff --git a/lib/libfuturize/fixes/fix_unicode_literals_import.py b/lib/libfuturize/fixes/fix_unicode_literals_import.py
deleted file mode 100644
index 51c50620..00000000
--- a/lib/libfuturize/fixes/fix_unicode_literals_import.py
+++ /dev/null
@@ -1,18 +0,0 @@
-"""
-Adds this import:
-
-    from __future__ import unicode_literals
-
-"""
-
-from lib2to3 import fixer_base
-from libfuturize.fixer_util import future_import
-
-class FixUnicodeLiteralsImport(fixer_base.BaseFix):
-    BM_compatible = True
-    PATTERN = "file_input"
-
-    run_order = 9
-
-    def transform(self, node, results):
-        future_import(u"unicode_literals", node)
diff --git a/lib/libfuturize/fixes/fix_xrange_with_import.py b/lib/libfuturize/fixes/fix_xrange_with_import.py
deleted file mode 100644
index c910f816..00000000
--- a/lib/libfuturize/fixes/fix_xrange_with_import.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""
-For the ``future`` package.
-
-Turns any xrange calls into range calls and adds this import line:
-
-    from builtins import range
-
-at the top.
-"""
-
-from lib2to3.fixes.fix_xrange import FixXrange
-
-from libfuturize.fixer_util import touch_import_top
-
-
-class FixXrangeWithImport(FixXrange):
-    def transform(self, node, results):
-        result = super(FixXrangeWithImport, self).transform(node, results)
-        touch_import_top('builtins', 'range', node)
-        return result
diff --git a/lib/libfuturize/main.py b/lib/libfuturize/main.py
deleted file mode 100644
index 634c2f25..00000000
--- a/lib/libfuturize/main.py
+++ /dev/null
@@ -1,322 +0,0 @@
-"""
-futurize: automatic conversion to clean 2/3 code using ``python-future``
-======================================================================
-
-Like Armin Ronacher's modernize.py, ``futurize`` attempts to produce clean
-standard Python 3 code that runs on both Py2 and Py3.
-
-One pass
---------
-
-Use it like this on Python 2 code:
-
-  $ futurize --verbose mypython2script.py
-
-This will attempt to port the code to standard Py3 code that also
-provides Py2 compatibility with the help of the right imports from
-``future``.
-
-To write changes to the files, use the -w flag.
-
-Two stages
-----------
-
-The ``futurize`` script can also be called in two separate stages. First:
-
-  $ futurize --stage1 mypython2script.py
-
-This produces more modern Python 2 code that is not yet compatible with Python
-3. The tests should still run and the diff should be uncontroversial to apply to
-most Python projects that are willing to drop support for Python 2.5 and lower.
-
-After this, the recommended approach is to explicitly mark all strings that must
-be byte-strings with a b'' prefix and all text (unicode) strings with a u''
-prefix, and then invoke the second stage of Python 2 to 2/3 conversion with::
-
-  $ futurize --stage2 mypython2script.py
-
-Stage 2 adds a dependency on ``future``. It converts most remaining Python
-2-specific code to Python 3 code and adds appropriate imports from ``future``
-to restore Py2 support.
-
-The command above leaves all unadorned string literals as native strings
-(byte-strings on Py2, unicode strings on Py3). If instead you would like all
-unadorned string literals to be promoted to unicode, you can also pass this
-flag:
-
-  $ futurize --stage2 --unicode-literals mypython2script.py
-
-This adds the declaration ``from __future__ import unicode_literals`` to the
-top of each file, which implicitly declares all unadorned string literals to be
-unicode strings (``unicode`` on Py2).
-
-All imports
------------
-
-The --all-imports option forces adding all ``__future__`` imports,
-``builtins`` imports, and standard library aliases, even if they don't
-seem necessary for the current state of each module. (This can simplify
-testing, and can reduce the need to think about Py2 compatibility when editing
-the code further.)
-
-"""
-
-from __future__ import (absolute_import, print_function, unicode_literals)
-import future.utils
-from future import __version__
-
-import sys
-import logging
-import optparse
-import os
-
-from lib2to3.main import warn, StdoutRefactoringTool
-from lib2to3 import refactor
-
-from libfuturize.fixes import (lib2to3_fix_names_stage1,
-                               lib2to3_fix_names_stage2,
-                               libfuturize_fix_names_stage1,
-                               libfuturize_fix_names_stage2)
-
-fixer_pkg = 'libfuturize.fixes'
-
-
-def main(args=None):
-    """Main program.
-
-    Args:
-        fixer_pkg: the name of a package where the fixers are located.
-        args: optional; a list of command line arguments. If omitted,
-              sys.argv[1:] is used.
-
-    Returns a suggested exit status (0, 1, 2).
-    """
-
-    # Set up option parser
-    parser = optparse.OptionParser(usage="futurize [options] file|dir ...")
-    parser.add_option("-V", "--version", action="store_true",
-                      help="Report the version number of futurize")
-    parser.add_option("-a", "--all-imports", action="store_true",
-                      help="Add all __future__ and future imports to each module")
-    parser.add_option("-1", "--stage1", action="store_true",
-                      help="Modernize Python 2 code only; no compatibility with Python 3 (or dependency on ``future``)")
-    parser.add_option("-2", "--stage2", action="store_true",
-                      help="Take modernized (stage1) code and add a dependency on ``future`` to provide Py3 compatibility.")
-    parser.add_option("-0", "--both-stages", action="store_true",
-                      help="Apply both stages 1 and 2")
-    parser.add_option("-u", "--unicode-literals", action="store_true",
-                      help="Add ``from __future__ import unicode_literals`` to implicitly convert all unadorned string literals '' into unicode strings")
-    parser.add_option("-f", "--fix", action="append", default=[],
-                      help="Each FIX specifies a transformation; default: all.\nEither use '-f division -f metaclass' etc. or use the fully-qualified module name: '-f lib2to3.fixes.fix_types -f libfuturize.fixes.fix_unicode_keep_u'")
-    parser.add_option("-j", "--processes", action="store", default=1,
-                      type="int", help="Run 2to3 concurrently")
-    parser.add_option("-x", "--nofix", action="append", default=[],
-                      help="Prevent a fixer from being run.")
-    parser.add_option("-l", "--list-fixes", action="store_true",
-                      help="List available transformations")
-    parser.add_option("-p", "--print-function", action="store_true",
-                      help="Modify the grammar so that print() is a function")
-    parser.add_option("-v", "--verbose", action="store_true",
-                      help="More verbose logging")
-    parser.add_option("--no-diffs", action="store_true",
-                      help="Don't show diffs of the refactoring")
-    parser.add_option("-w", "--write", action="store_true",
-                      help="Write back modified files")
-    parser.add_option("-n", "--nobackups", action="store_true", default=False,
-                      help="Don't write backups for modified files.")
-    parser.add_option("-o", "--output-dir", action="store", type="str",
-                      default="", help="Put output files in this directory "
-                      "instead of overwriting the input files.  Requires -n. "
-                      "For Python >= 2.7 only.")
-    parser.add_option("-W", "--write-unchanged-files", action="store_true",
-                      help="Also write files even if no changes were required"
-                      " (useful with --output-dir); implies -w.")
-    parser.add_option("--add-suffix", action="store", type="str", default="",
-                      help="Append this string to all output filenames."
-                      " Requires -n if non-empty. For Python >= 2.7 only."
-                      "ex: --add-suffix='3' will generate .py3 files.")
-
-    # Parse command line arguments
-    flags = {}
-    refactor_stdin = False
-    options, args = parser.parse_args(args)
-
-    if options.write_unchanged_files:
-        flags["write_unchanged_files"] = True
-        if not options.write:
-            warn("--write-unchanged-files/-W implies -w.")
-        options.write = True
-    # If we allowed these, the original files would be renamed to backup names
-    # but not replaced.
-    if options.output_dir and not options.nobackups:
-        parser.error("Can't use --output-dir/-o without -n.")
-    if options.add_suffix and not options.nobackups:
-        parser.error("Can't use --add-suffix without -n.")
-
-    if not options.write and options.no_diffs:
-        warn("not writing files and not printing diffs; that's not very useful")
-    if not options.write and options.nobackups:
-        parser.error("Can't use -n without -w")
-    if "-" in args:
-        refactor_stdin = True
-        if options.write:
-            print("Can't write to stdin.", file=sys.stderr)
-            return 2
-    # Is this ever necessary?
-    if options.print_function:
-        flags["print_function"] = True
-
-    # Set up logging handler
-    level = logging.DEBUG if options.verbose else logging.INFO
-    logging.basicConfig(format='%(name)s: %(message)s', level=level)
-    logger = logging.getLogger('libfuturize.main')
-
-    if options.stage1 or options.stage2:
-        assert options.both_stages is None
-        options.both_stages = False
-    else:
-        options.both_stages = True
-
-    avail_fixes = set()
-
-    if options.stage1 or options.both_stages:
-        avail_fixes.update(lib2to3_fix_names_stage1)
-        avail_fixes.update(libfuturize_fix_names_stage1)
-    if options.stage2 or options.both_stages:
-        avail_fixes.update(lib2to3_fix_names_stage2)
-        avail_fixes.update(libfuturize_fix_names_stage2)
-
-    if options.unicode_literals:
-        avail_fixes.add('libfuturize.fixes.fix_unicode_literals_import')
-
-    if options.version:
-        print(__version__)
-        return 0
-    if options.list_fixes:
-        print("Available transformations for the -f/--fix option:")
-        # for fixname in sorted(refactor.get_all_fix_names(fixer_pkg)):
-        for fixname in sorted(avail_fixes):
-            print(fixname)
-        if not args:
-            return 0
-    if not args:
-        print("At least one file or directory argument required.",
-              file=sys.stderr)
-        print("Use --help to show usage.", file=sys.stderr)
-        return 2
-
-    unwanted_fixes = set()
-    for fix in options.nofix:
-        if ".fix_" in fix:
-            unwanted_fixes.add(fix)
-        else:
-            # Infer the full module name for the fixer.
-            # First ensure that no names clash (e.g.
-            # lib2to3.fixes.fix_blah and libfuturize.fixes.fix_blah):
-            found = [f for f in avail_fixes
-                     if f.endswith('fix_{0}'.format(fix))]
-            if len(found) > 1:
-                print("Ambiguous fixer name. Choose a fully qualified "
-                      "module name instead from these:\n" +
-                      "\n".join("  " + myf for myf in found),
-                      file=sys.stderr)
-                return 2
-            elif len(found) == 0:
-                print("Unknown fixer. Use --list-fixes or -l for a list.",
-                      file=sys.stderr)
-                return 2
-            unwanted_fixes.add(found[0])
-
-    extra_fixes = set()
-    if options.all_imports:
-        if options.stage1:
-            prefix = 'libfuturize.fixes.'
-            extra_fixes.add(prefix +
-                            'fix_add__future__imports_except_unicode_literals')
-        else:
-            # In case the user hasn't run stage1 for some reason:
-            prefix = 'libpasteurize.fixes.'
-            extra_fixes.add(prefix + 'fix_add_all__future__imports')
-            extra_fixes.add(prefix + 'fix_add_future_standard_library_import')
-            extra_fixes.add(prefix + 'fix_add_all_future_builtins')
-    explicit = set()
-    if options.fix:
-        all_present = False
-        for fix in options.fix:
-            if fix == 'all':
-                all_present = True
-            else:
-                if ".fix_" in fix:
-                    explicit.add(fix)
-                else:
-                    # Infer the full module name for the fixer.
-                    # First ensure that no names clash (e.g.
-                    # lib2to3.fixes.fix_blah and libfuturize.fixes.fix_blah):
-                    found = [f for f in avail_fixes
-                             if f.endswith('fix_{0}'.format(fix))]
-                    if len(found) > 1:
-                        print("Ambiguous fixer name. Choose a fully qualified "
-                              "module name instead from these:\n" +
-                              "\n".join("  " + myf for myf in found),
-                              file=sys.stderr)
-                        return 2
-                    elif len(found) == 0:
-                        print("Unknown fixer. Use --list-fixes or -l for a list.",
-                              file=sys.stderr)
-                        return 2
-                    explicit.add(found[0])
-        if len(explicit & unwanted_fixes) > 0:
-            print("Conflicting usage: the following fixers have been "
-                  "simultaneously requested and disallowed:\n" +
-                  "\n".join("  " + myf for myf in (explicit & unwanted_fixes)),
-                  file=sys.stderr)
-            return 2
-        requested = avail_fixes.union(explicit) if all_present else explicit
-    else:
-        requested = avail_fixes.union(explicit)
-    fixer_names = (requested | extra_fixes) - unwanted_fixes
-
-    input_base_dir = os.path.commonprefix(args)
-    if (input_base_dir and not input_base_dir.endswith(os.sep)
-        and not os.path.isdir(input_base_dir)):
-        # One or more similar names were passed, their directory is the base.
-        # os.path.commonprefix() is ignorant of path elements, this corrects
-        # for that weird API.
-        input_base_dir = os.path.dirname(input_base_dir)
-    if options.output_dir:
-        input_base_dir = input_base_dir.rstrip(os.sep)
-        logger.info('Output in %r will mirror the input directory %r layout.',
-                    options.output_dir, input_base_dir)
-
-    # Initialize the refactoring tool
-    if future.utils.PY26:
-        extra_kwargs = {}
-    else:
-        extra_kwargs = {
-                        'append_suffix': options.add_suffix,
-                        'output_dir': options.output_dir,
-                        'input_base_dir': input_base_dir,
-                       }
-
-    rt = StdoutRefactoringTool(
-            sorted(fixer_names), flags, sorted(explicit),
-            options.nobackups, not options.no_diffs,
-            **extra_kwargs)
-
-    # Refactor all files and directories passed as arguments
-    if not rt.errors:
-        if refactor_stdin:
-            rt.refactor_stdin()
-        else:
-            try:
-                rt.refactor(args, options.write, None,
-                            options.processes)
-            except refactor.MultiprocessingUnsupported:
-                assert options.processes > 1
-                print("Sorry, -j isn't " \
-                      "supported on this platform.", file=sys.stderr)
-                return 1
-        rt.summarize()
-
-    # Return error status (0 if rt.errors is zero)
-    return int(bool(rt.errors))
diff --git a/lib/libpasteurize/__init__.py b/lib/libpasteurize/__init__.py
deleted file mode 100644
index 4cb1cbcd..00000000
--- a/lib/libpasteurize/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# empty to make this a package
diff --git a/lib/libpasteurize/fixes/__init__.py b/lib/libpasteurize/fixes/__init__.py
deleted file mode 100644
index 905aec47..00000000
--- a/lib/libpasteurize/fixes/__init__.py
+++ /dev/null
@@ -1,54 +0,0 @@
-import sys
-from lib2to3 import refactor
-
-# The original set of these fixes comes from lib3to2 (https://bitbucket.org/amentajo/lib3to2):
-fix_names = set([
-                 'libpasteurize.fixes.fix_add_all__future__imports',  # from __future__ import absolute_import etc. on separate lines
-                 'libpasteurize.fixes.fix_add_future_standard_library_import',  # we force adding this import for now, even if it doesn't seem necessary to the fix_future_standard_library fixer, for ease of testing
-                 # 'libfuturize.fixes.fix_order___future__imports',  # consolidates to a single line to simplify testing -- UNFINISHED
-                 'libpasteurize.fixes.fix_future_builtins',   # adds "from future.builtins import *"
-                 'libfuturize.fixes.fix_future_standard_library', # adds "from future import standard_library"
-
-                 'libpasteurize.fixes.fix_annotations',
-                 # 'libpasteurize.fixes.fix_bitlength',  # ints have this in Py2.7
-                 # 'libpasteurize.fixes.fix_bool',    # need a decorator or Mixin
-                 # 'libpasteurize.fixes.fix_bytes',   # leave bytes as bytes
-                 # 'libpasteurize.fixes.fix_classdecorator',  # available in
-                 # Py2.6+
-                 # 'libpasteurize.fixes.fix_collections', hmmm ...
-                 # 'libpasteurize.fixes.fix_dctsetcomp',  # avail in Py27
-                 'libpasteurize.fixes.fix_division',   # yes
-                 # 'libpasteurize.fixes.fix_except',   # avail in Py2.6+
-                 # 'libpasteurize.fixes.fix_features',  # ?
-                 'libpasteurize.fixes.fix_fullargspec',
-                 # 'libpasteurize.fixes.fix_funcattrs',
-                 'libpasteurize.fixes.fix_getcwd',
-                 'libpasteurize.fixes.fix_imports',   # adds "from future import standard_library"
-                 'libpasteurize.fixes.fix_imports2',
-                 # 'libpasteurize.fixes.fix_input',
-                 # 'libpasteurize.fixes.fix_int',
-                 # 'libpasteurize.fixes.fix_intern',
-                 # 'libpasteurize.fixes.fix_itertools',
-                 'libpasteurize.fixes.fix_kwargs',   # yes, we want this
-                 # 'libpasteurize.fixes.fix_memoryview',
-                 # 'libpasteurize.fixes.fix_metaclass',  # write a custom handler for
-                 # this
-                 # 'libpasteurize.fixes.fix_methodattrs',  # __func__ and __self__ seem to be defined on Py2.7 already
-                 'libpasteurize.fixes.fix_newstyle',   # yes, we want this: explicit inheritance from object. Without new-style classes in Py2, super() will break etc.
-                 # 'libpasteurize.fixes.fix_next',   # use a decorator for this
-                 # 'libpasteurize.fixes.fix_numliterals',   # prob not
-                 # 'libpasteurize.fixes.fix_open',   # huh?
-                 # 'libpasteurize.fixes.fix_print',  # no way
-                 'libpasteurize.fixes.fix_printfunction',  # adds __future__ import print_function
-                 # 'libpasteurize.fixes.fix_raise_',   # TODO: get this working!
-
-                 # 'libpasteurize.fixes.fix_range',  # nope
-                 # 'libpasteurize.fixes.fix_reduce',
-                 # 'libpasteurize.fixes.fix_setliteral',
-                 # 'libpasteurize.fixes.fix_str',
-                 # 'libpasteurize.fixes.fix_super',  # maybe, if our magic super() isn't robust enough
-                 'libpasteurize.fixes.fix_throw',   # yes, if Py3 supports it
-                 # 'libpasteurize.fixes.fix_unittest',
-                 'libpasteurize.fixes.fix_unpacking',  # yes, this is useful
-                 # 'libpasteurize.fixes.fix_with'      # way out of date
-                ])
diff --git a/lib/libpasteurize/fixes/feature_base.py b/lib/libpasteurize/fixes/feature_base.py
deleted file mode 100644
index c36d9a95..00000000
--- a/lib/libpasteurize/fixes/feature_base.py
+++ /dev/null
@@ -1,57 +0,0 @@
-u"""
-Base classes for features that are backwards-incompatible.
-
-Usage:
-features = Features()
-features.add(Feature("py3k_feature", "power< 'py3k' any* >", "2.7"))
-PATTERN = features.PATTERN
-"""
-
-pattern_unformatted = u"%s=%s" # name=pattern, for dict lookups
-message_unformatted = u"""
-%s is only supported in Python %s and above."""
-
-class Feature(object):
-    u"""
-    A feature has a name, a pattern, and a minimum version of Python 2.x
-    required to use the feature (or 3.x if there is no backwards-compatible
-    version of 2.x)
-    """
-    def __init__(self, name, PATTERN, version):
-        self.name = name
-        self._pattern = PATTERN
-        self.version = version
-
-    def message_text(self):
-        u"""
-        Format the above text with the name and minimum version required.
-        """
-        return message_unformatted % (self.name, self.version)
-
-class Features(set):
-    u"""
-    A set of features that generates a pattern for the features it contains.
-    This set will act like a mapping in that we map names to patterns.
-    """
-    mapping = {}
-
-    def update_mapping(self):
-        u"""
-        Called every time we care about the mapping of names to features.
-        """
-        self.mapping = dict([(f.name, f) for f in iter(self)])
-
-    @property
-    def PATTERN(self):
-        u"""
-        Uses the mapping of names to features to return a PATTERN suitable
-        for using the lib2to3 patcomp.
-        """
-        self.update_mapping()
-        return u" |\n".join([pattern_unformatted % (f.name, f._pattern) for f in iter(self)])
-
-    def __getitem__(self, key):
-        u"""
-        Implement a simple mapping to get patterns from names.
-        """
-        return self.mapping[key]
diff --git a/lib/libpasteurize/fixes/fix_add_all__future__imports.py b/lib/libpasteurize/fixes/fix_add_all__future__imports.py
deleted file mode 100644
index a151f9f1..00000000
--- a/lib/libpasteurize/fixes/fix_add_all__future__imports.py
+++ /dev/null
@@ -1,24 +0,0 @@
-"""
-Fixer for adding:
-
-    from __future__ import absolute_import
-    from __future__ import division
-    from __future__ import print_function
-    from __future__ import unicode_literals
-
-This is done when converting from Py3 to both Py3/Py2.
-"""
-
-from lib2to3 import fixer_base
-from libfuturize.fixer_util import future_import
-
-class FixAddAllFutureImports(fixer_base.BaseFix):
-    BM_compatible = True
-    PATTERN = "file_input"
-    run_order = 1
-
-    def transform(self, node, results):
-        future_import(u"absolute_import", node)
-        future_import(u"division", node)
-        future_import(u"print_function", node)
-        future_import(u"unicode_literals", node)
diff --git a/lib/libpasteurize/fixes/fix_add_all_future_builtins.py b/lib/libpasteurize/fixes/fix_add_all_future_builtins.py
deleted file mode 100644
index 22911bad..00000000
--- a/lib/libpasteurize/fixes/fix_add_all_future_builtins.py
+++ /dev/null
@@ -1,37 +0,0 @@
-"""
-For the ``future`` package.
-
-Adds this import line::
-
-    from builtins import (ascii, bytes, chr, dict, filter, hex, input,
-                          int, list, map, next, object, oct, open, pow,
-                          range, round, str, super, zip)
-
-to a module, irrespective of whether each definition is used.
-
-Adds these imports after any other imports (in an initial block of them).
-"""
-
-from __future__ import unicode_literals
-
-from lib2to3 import fixer_base
-
-from libfuturize.fixer_util import touch_import_top
-
-
-class FixAddAllFutureBuiltins(fixer_base.BaseFix):
-    BM_compatible = True
-    PATTERN = "file_input"
-    run_order = 1
-
-    def transform(self, node, results):
-        # import_str = """(ascii, bytes, chr, dict, filter, hex, input,
-        #                      int, list, map, next, object, oct, open, pow,
-        #                      range, round, str, super, zip)"""
-        touch_import_top(u'builtins', '*', node)
-
-        # builtins = """ascii bytes chr dict filter hex input
-        #                      int list map next object oct open pow
-        #                      range round str super zip"""
-        # for builtin in sorted(builtins.split(), reverse=True):
-        #     touch_import_top(u'builtins', builtin, node)
diff --git a/lib/libpasteurize/fixes/fix_add_future_standard_library_import.py b/lib/libpasteurize/fixes/fix_add_future_standard_library_import.py
deleted file mode 100644
index 0778406a..00000000
--- a/lib/libpasteurize/fixes/fix_add_future_standard_library_import.py
+++ /dev/null
@@ -1,23 +0,0 @@
-"""
-For the ``future`` package.
-
-Adds this import line:
-
-    from future import standard_library
-
-after any __future__ imports but before any other imports. Doesn't actually
-change the imports to Py3 style.
-"""
-
-from lib2to3 import fixer_base
-from libfuturize.fixer_util import touch_import_top
-
-class FixAddFutureStandardLibraryImport(fixer_base.BaseFix):
-    BM_compatible = True
-    PATTERN = "file_input"
-    run_order = 8
-
-    def transform(self, node, results):
-        # TODO: add a blank line between any __future__ imports and this?
-        touch_import_top(u'future', u'standard_library', node)
-        # TODO: also add standard_library.install_hooks()
diff --git a/lib/libpasteurize/fixes/fix_annotations.py b/lib/libpasteurize/fixes/fix_annotations.py
deleted file mode 100644
index 884b6741..00000000
--- a/lib/libpasteurize/fixes/fix_annotations.py
+++ /dev/null
@@ -1,48 +0,0 @@
-u"""
-Fixer to remove function annotations
-"""
-
-from lib2to3 import fixer_base
-from lib2to3.pgen2 import token
-from lib2to3.fixer_util import syms
-
-warning_text = u"Removing function annotations completely."
-
-def param_without_annotations(node):
-    return node.children[0]
-
-class FixAnnotations(fixer_base.BaseFix):
-
-    warned = False
-
-    def warn_once(self, node, reason):
-        if not self.warned:
-            self.warned = True
-            self.warning(node, reason=reason)
-
-    PATTERN = u"""
-              funcdef< 'def' any parameters< '(' [params=any] ')' > ['->' ret=any] ':' any* >
-              """
-
-    def transform(self, node, results):
-        u"""
-        This just strips annotations from the funcdef completely.
-        """
-        params = results.get(u"params")
-        ret = results.get(u"ret")
-        if ret is not None:
-            assert ret.prev_sibling.type == token.RARROW, u"Invalid return annotation"
-            self.warn_once(node, reason=warning_text)
-            ret.prev_sibling.remove()
-            ret.remove()
-        if params is None: return
-        if params.type == syms.typedargslist:
-            # more than one param in a typedargslist
-            for param in params.children:
-                if param.type == syms.tname:
-                    self.warn_once(node, reason=warning_text)
-                    param.replace(param_without_annotations(param))
-        elif params.type == syms.tname:
-            # one param
-            self.warn_once(node, reason=warning_text)
-            params.replace(param_without_annotations(params))
diff --git a/lib/libpasteurize/fixes/fix_division.py b/lib/libpasteurize/fixes/fix_division.py
deleted file mode 100644
index 6a048710..00000000
--- a/lib/libpasteurize/fixes/fix_division.py
+++ /dev/null
@@ -1,28 +0,0 @@
-u"""
-Fixer for division: from __future__ import division if needed
-"""
-
-from lib2to3 import fixer_base
-from libfuturize.fixer_util import token, future_import
-
-def match_division(node):
-    u"""
-    __future__.division redefines the meaning of a single slash for division,
-    so we match that and only that.
-    """
-    slash = token.SLASH
-    return node.type == slash and not node.next_sibling.type == slash and \
-                                  not node.prev_sibling.type == slash
-
-class FixDivision(fixer_base.BaseFix):
-    run_order = 4    # this seems to be ignored?
-
-    def match(self, node):
-        u"""
-        Since the tree needs to be fixed once and only once if and only if it
-        matches, then we can start discarding matches after we make the first.
-        """
-        return match_division(node)
-
-    def transform(self, node, results):
-        future_import(u"division", node)
diff --git a/lib/libpasteurize/fixes/fix_features.py b/lib/libpasteurize/fixes/fix_features.py
deleted file mode 100644
index 52630f98..00000000
--- a/lib/libpasteurize/fixes/fix_features.py
+++ /dev/null
@@ -1,86 +0,0 @@
-u"""
-Warn about features that are not present in Python 2.5, giving a message that
-points to the earliest version of Python 2.x (or 3.x, if none) that supports it
-"""
-
-from .feature_base import Feature, Features
-from lib2to3 import fixer_base
-
-FEATURES = [
-   #(FeatureName,
-   #    FeaturePattern,
-   # FeatureMinVersion,
-   #),
-    (u"memoryview",
-        u"power < 'memoryview' trailer < '(' any* ')' > any* >",
-     u"2.7",
-    ),
-    (u"numbers",
-        u"""import_from< 'from' 'numbers' 'import' any* > |
-           import_name< 'import' ('numbers' dotted_as_names< any* 'numbers' any* >) >""",
-     u"2.6",
-    ),
-    (u"abc",
-        u"""import_name< 'import' ('abc' dotted_as_names< any* 'abc' any* >) > |
-           import_from< 'from' 'abc' 'import' any* >""",
-     u"2.6",
-    ),
-    (u"io",
-        u"""import_name< 'import' ('io' dotted_as_names< any* 'io' any* >) > |
-           import_from< 'from' 'io' 'import' any* >""",
-     u"2.6",
-    ),
-    (u"bin",
-        u"power< 'bin' trailer< '(' any* ')' > any* >",
-     u"2.6",
-    ),
-    (u"formatting",
-        u"power< any trailer< '.' 'format' > trailer< '(' any* ')' > >",
-     u"2.6",
-    ),
-    (u"nonlocal",
-        u"global_stmt< 'nonlocal' any* >",
-     u"3.0",
-    ),
-    (u"with_traceback",
-        u"trailer< '.' 'with_traceback' >",
-     u"3.0",
-    ),
-]
-
-class FixFeatures(fixer_base.BaseFix):
-
-    run_order = 9 # Wait until all other fixers have run to check for these
-
-    # To avoid spamming, we only want to warn for each feature once.
-    features_warned = set()
-
-    # Build features from the list above
-    features = Features([Feature(name, pattern, version) for \
-                                name, pattern, version in FEATURES])
-
-    PATTERN = features.PATTERN
-
-    def match(self, node):
-        to_ret = super(FixFeatures, self).match(node)
-        # We want the mapping only to tell us the node's specific information.
-        try:
-            del to_ret[u'node']
-        except Exception:
-            # We want it to delete the 'node' from the results
-            # if it's there, so we don't care if it fails for normal reasons.
-            pass
-        return to_ret
-
-    def transform(self, node, results):
-        for feature_name in results:
-            if feature_name in self.features_warned:
-                continue
-            else:
-                curr_feature = self.features[feature_name]
-                if curr_feature.version >= u"3":
-                    fail = self.cannot_convert
-                else:
-                    fail = self.warning
-                fail(node, reason=curr_feature.message_text())
-                self.features_warned.add(feature_name)
diff --git a/lib/libpasteurize/fixes/fix_fullargspec.py b/lib/libpasteurize/fixes/fix_fullargspec.py
deleted file mode 100644
index 4bd37e15..00000000
--- a/lib/libpasteurize/fixes/fix_fullargspec.py
+++ /dev/null
@@ -1,16 +0,0 @@
-u"""
-Fixer for getfullargspec -> getargspec
-"""
-
-from lib2to3 import fixer_base
-from lib2to3.fixer_util import Name
-
-warn_msg = u"some of the values returned by getfullargspec are not valid in Python 2 and have no equivalent."
-
-class FixFullargspec(fixer_base.BaseFix):
-
-    PATTERN = u"'getfullargspec'"
-
-    def transform(self, node, results):
-        self.warning(node, warn_msg)
-        return Name(u"getargspec", prefix=node.prefix)
diff --git a/lib/libpasteurize/fixes/fix_future_builtins.py b/lib/libpasteurize/fixes/fix_future_builtins.py
deleted file mode 100644
index 68496799..00000000
--- a/lib/libpasteurize/fixes/fix_future_builtins.py
+++ /dev/null
@@ -1,46 +0,0 @@
-"""
-Adds this import line:
-
-    from builtins import XYZ
-
-for each of the functions XYZ that is used in the module.
-"""
-
-from __future__ import unicode_literals
-
-from lib2to3 import fixer_base
-from lib2to3.pygram import python_symbols as syms
-from lib2to3.fixer_util import Name, Call, in_special_context
-
-from libfuturize.fixer_util import touch_import_top
-
-# All builtins are:
-#     from future.builtins.iterators import (filter, map, zip)
-#     from future.builtins.misc import (ascii, chr, hex, input, isinstance, oct, open, round, super)
-#     from future.types import (bytes, dict, int, range, str)
-# We don't need isinstance any more.
-
-replaced_builtins = '''filter map zip
-                       ascii chr hex input next oct open round super
-                       bytes dict int range str'''.split()
-
-expression = '|'.join(["name='{0}'".format(name) for name in replaced_builtins])
-
-
-class FixFutureBuiltins(fixer_base.BaseFix):
-    BM_compatible = True
-    run_order = 9
-
-    # Currently we only match uses as a function. This doesn't match e.g.:
-    #     if isinstance(s, str):
-    #         ...
-    PATTERN = """
-              power<
-                 ({0}) trailer< '(' args=[any] ')' >
-              rest=any* >
-              """.format(expression)
-
-    def transform(self, node, results):
-        name = results["name"]
-        touch_import_top(u'builtins', name.value, node)
-        # name.replace(Name(u"input", prefix=name.prefix))
diff --git a/lib/libpasteurize/fixes/fix_getcwd.py b/lib/libpasteurize/fixes/fix_getcwd.py
deleted file mode 100644
index 9b7f002b..00000000
--- a/lib/libpasteurize/fixes/fix_getcwd.py
+++ /dev/null
@@ -1,26 +0,0 @@
-u"""
-Fixer for os.getcwd() -> os.getcwdu().
-Also warns about "from os import getcwd", suggesting the above form.
-"""
-
-from lib2to3 import fixer_base
-from lib2to3.fixer_util import Name
-
-class FixGetcwd(fixer_base.BaseFix):
-
-    PATTERN = u"""
-              power< 'os' trailer< dot='.' name='getcwd' > any* >
-              |
-              import_from< 'from' 'os' 'import' bad='getcwd' >
-              """
-
-    def transform(self, node, results):
-        if u"name" in results:
-            name = results[u"name"]
-            name.replace(Name(u"getcwdu", prefix=name.prefix))
-        elif u"bad" in results:
-            # Can't convert to getcwdu and then expect to catch every use.
-            self.cannot_convert(node, u"import os, use os.getcwd() instead.")
-            return
-        else:
-            raise ValueError(u"For some reason, the pattern matcher failed.")
diff --git a/lib/libpasteurize/fixes/fix_imports.py b/lib/libpasteurize/fixes/fix_imports.py
deleted file mode 100644
index b18ecf3d..00000000
--- a/lib/libpasteurize/fixes/fix_imports.py
+++ /dev/null
@@ -1,113 +0,0 @@
-u"""
-Fixer for standard library imports renamed in Python 3
-"""
-
-from lib2to3 import fixer_base
-from lib2to3.fixer_util import Name, is_probably_builtin, Newline, does_tree_import
-from lib2to3.pygram import python_symbols as syms
-from lib2to3.pgen2 import token
-from lib2to3.pytree import Node, Leaf
-
-from libfuturize.fixer_util import touch_import_top
-# from ..fixer_util import NameImport
-
-# used in simple_mapping_to_pattern()
-MAPPING = {u"reprlib": u"repr",
-           u"winreg": u"_winreg",
-           u"configparser": u"ConfigParser",
-           u"copyreg": u"copy_reg",
-           u"multiprocessing.SimpleQueue": u"multiprocessing.queues.SimpleQueue",
-           u"queue": u"Queue",
-           u"socketserver": u"SocketServer",
-           u"_markupbase": u"markupbase",
-           u"test.support": u"test.test_support",
-           u"dbm.bsd": u"dbhash",
-           u"dbm.ndbm": u"dbm",
-           u"dbm.dumb": u"dumbdbm",
-           u"dbm.gnu": u"gdbm",
-           u"html.parser": u"HTMLParser",
-           u"html.entities": u"htmlentitydefs",
-           u"http.client": u"httplib",
-           u"http.cookies": u"Cookie",
-           u"http.cookiejar": u"cookielib",
-#          "tkinter": "Tkinter",
-           u"tkinter.dialog": u"Dialog",
-           u"tkinter._fix": u"FixTk",
-           u"tkinter.scrolledtext": u"ScrolledText",
-           u"tkinter.tix": u"Tix",
-           u"tkinter.constants": u"Tkconstants",
-           u"tkinter.dnd": u"Tkdnd",
-           u"tkinter.__init__": u"Tkinter",
-           u"tkinter.colorchooser": u"tkColorChooser",
-           u"tkinter.commondialog": u"tkCommonDialog",
-           u"tkinter.font": u"tkFont",
-           u"tkinter.ttk": u"ttk",
-           u"tkinter.messagebox": u"tkMessageBox",
-           u"tkinter.turtle": u"turtle",
-           u"urllib.robotparser": u"robotparser",
-           u"xmlrpc.client": u"xmlrpclib",
-           u"builtins": u"__builtin__",
-}
-
-# generic strings to help build patterns
-# these variables mean (with http.client.HTTPConnection as an example):
-# name = http
-# attr = client
-# used = HTTPConnection
-# fmt_name is a formatted subpattern (simple_name_match or dotted_name_match)
-
-# helps match 'queue', as in 'from queue import ...'
-simple_name_match = u"name='%s'"
-# helps match 'client', to be used if client has been imported from http
-subname_match = u"attr='%s'"
-# helps match 'http.client', as in 'import urllib.request'
-dotted_name_match = u"dotted_name=dotted_name< %s '.' %s >"
-# helps match 'queue', as in 'queue.Queue(...)'
-power_onename_match = u"%s"
-# helps match 'http.client', as in 'http.client.HTTPConnection(...)'
-power_twoname_match = u"power< %s trailer< '.' %s > any* >"
-# helps match 'client.HTTPConnection', if 'client' has been imported from http
-power_subname_match = u"power< %s any* >"
-# helps match 'from http.client import HTTPConnection'
-from_import_match = u"from_import=import_from< 'from' %s 'import' imported=any >"
-# helps match 'from http import client'
-from_import_submod_match = u"from_import_submod=import_from< 'from' %s 'import' (%s | import_as_name< %s 'as' renamed=any > | import_as_names< any* (%s | import_as_name< %s 'as' renamed=any >) any* > ) >"
-# helps match 'import urllib.request'
-name_import_match = u"name_import=import_name< 'import' %s > | name_import=import_name< 'import' dotted_as_name< %s 'as' renamed=any > >"
-# helps match 'import http.client, winreg'
-multiple_name_import_match = u"name_import=import_name< 'import' dotted_as_names< names=any* > >"
-
-def all_patterns(name):
-    u"""
-    Accepts a string and returns a pattern of possible patterns involving that name
-    Called by simple_mapping_to_pattern for each name in the mapping it receives.
-    """
-
-    # i_ denotes an import-like node
-    # u_ denotes a node that appears to be a usage of the name
-    if u'.' in name:
-        name, attr = name.split(u'.', 1)
-        simple_name = simple_name_match % (name)
-        simple_attr = subname_match % (attr)
-        dotted_name = dotted_name_match % (simple_name, simple_attr)
-        i_from = from_import_match % (dotted_name)
-        i_from_submod = from_import_submod_match % (simple_name, simple_attr, simple_attr, simple_attr, simple_attr)
-        i_name = name_import_match % (dotted_name, dotted_name)
-        u_name = power_twoname_match % (simple_name, simple_attr)
-        u_subname = power_subname_match % (simple_attr)
-        return u' | \n'.join((i_name, i_from, i_from_submod, u_name, u_subname))
-    else:
-        simple_name = simple_name_match % (name)
-        i_name = name_import_match % (simple_name, simple_name)
-        i_from = from_import_match % (simple_name)
-        u_name = power_onename_match % (simple_name)
-        return u' | \n'.join((i_name, i_from, u_name))
-
-
-class FixImports(fixer_base.BaseFix):
-
-    PATTERN = u' | \n'.join([all_patterns(name) for name in MAPPING])
-    PATTERN = u' | \n'.join((PATTERN, multiple_name_import_match))
-
-    def transform(self, node, results):
-        touch_import_top(u'future', u'standard_library', node)
diff --git a/lib/libpasteurize/fixes/fix_imports2.py b/lib/libpasteurize/fixes/fix_imports2.py
deleted file mode 100644
index 70444e9e..00000000
--- a/lib/libpasteurize/fixes/fix_imports2.py
+++ /dev/null
@@ -1,174 +0,0 @@
-u"""
-Fixer for complicated imports
-"""
-
-from lib2to3 import fixer_base
-from lib2to3.fixer_util import Name, String, FromImport, Newline, Comma
-from libfuturize.fixer_util import touch_import_top
-
-
-TK_BASE_NAMES = (u'ACTIVE', u'ALL', u'ANCHOR', u'ARC',u'BASELINE', u'BEVEL', u'BOTH',
-                 u'BOTTOM', u'BROWSE', u'BUTT', u'CASCADE', u'CENTER', u'CHAR',
-                 u'CHECKBUTTON', u'CHORD', u'COMMAND', u'CURRENT', u'DISABLED',
-                 u'DOTBOX', u'E', u'END', u'EW', u'EXCEPTION', u'EXTENDED', u'FALSE',
-                 u'FIRST', u'FLAT', u'GROOVE', u'HIDDEN', u'HORIZONTAL', u'INSERT',
-                 u'INSIDE', u'LAST', u'LEFT', u'MITER', u'MOVETO', u'MULTIPLE', u'N',
-                 u'NE', u'NO', u'NONE', u'NORMAL', u'NS', u'NSEW', u'NUMERIC', u'NW',
-                 u'OFF', u'ON', u'OUTSIDE', u'PAGES', u'PIESLICE', u'PROJECTING',
-                 u'RADIOBUTTON', u'RAISED', u'READABLE', u'RIDGE', u'RIGHT',
-                 u'ROUND', u'S', u'SCROLL', u'SE', u'SEL', u'SEL_FIRST', u'SEL_LAST',
-                 u'SEPARATOR', u'SINGLE', u'SOLID', u'SUNKEN', u'SW', u'StringTypes',
-                 u'TOP', u'TRUE', u'TclVersion', u'TkVersion', u'UNDERLINE',
-                 u'UNITS', u'VERTICAL', u'W', u'WORD', u'WRITABLE', u'X', u'Y', u'YES',
-                 u'wantobjects')
-
-PY2MODULES = {
-              u'urllib2' : (
-                  u'AbstractBasicAuthHandler', u'AbstractDigestAuthHandler',
-                  u'AbstractHTTPHandler', u'BaseHandler', u'CacheFTPHandler',
-                  u'FTPHandler', u'FileHandler', u'HTTPBasicAuthHandler',
-                  u'HTTPCookieProcessor', u'HTTPDefaultErrorHandler',
-                  u'HTTPDigestAuthHandler', u'HTTPError', u'HTTPErrorProcessor',
-                  u'HTTPHandler', u'HTTPPasswordMgr',
-                  u'HTTPPasswordMgrWithDefaultRealm', u'HTTPRedirectHandler',
-                  u'HTTPSHandler', u'OpenerDirector', u'ProxyBasicAuthHandler',
-                  u'ProxyDigestAuthHandler', u'ProxyHandler', u'Request',
-                  u'StringIO', u'URLError', u'UnknownHandler', u'addinfourl',
-                  u'build_opener', u'install_opener', u'parse_http_list',
-                  u'parse_keqv_list', u'randombytes', u'request_host', u'urlopen'),
-              u'urllib' : (
-                  u'ContentTooShortError', u'FancyURLopener',u'URLopener',
-                  u'basejoin', u'ftperrors', u'getproxies',
-                  u'getproxies_environment', u'localhost', u'pathname2url',
-                  u'quote', u'quote_plus', u'splitattr', u'splithost',
-                  u'splitnport', u'splitpasswd', u'splitport', u'splitquery',
-                  u'splittag', u'splittype', u'splituser', u'splitvalue',
-                  u'thishost', u'unquote', u'unquote_plus', u'unwrap',
-                  u'url2pathname', u'urlcleanup', u'urlencode', u'urlopen',
-                  u'urlretrieve',),
-              u'urlparse' : (
-                  u'parse_qs', u'parse_qsl', u'urldefrag', u'urljoin',
-                  u'urlparse', u'urlsplit', u'urlunparse', u'urlunsplit'),
-              u'dbm' : (
-                  u'ndbm', u'gnu', u'dumb'),
-              u'anydbm' : (
-                  u'error', u'open'),
-              u'whichdb' : (
-                  u'whichdb',),
-              u'BaseHTTPServer' : (
-                  u'BaseHTTPRequestHandler', u'HTTPServer'),
-              u'CGIHTTPServer' : (
-                  u'CGIHTTPRequestHandler',),
-              u'SimpleHTTPServer' : (
-                  u'SimpleHTTPRequestHandler',),
-              u'FileDialog' : TK_BASE_NAMES + (
-                  u'FileDialog', u'LoadFileDialog', u'SaveFileDialog',
-                  u'dialogstates', u'test'),
-              u'tkFileDialog' : (
-                  u'Directory', u'Open', u'SaveAs', u'_Dialog', u'askdirectory',
-                  u'askopenfile', u'askopenfilename', u'askopenfilenames',
-                  u'askopenfiles', u'asksaveasfile', u'asksaveasfilename'),
-              u'SimpleDialog' : TK_BASE_NAMES + (
-                  u'SimpleDialog',),
-              u'tkSimpleDialog' : TK_BASE_NAMES + (
-                  u'askfloat', u'askinteger', u'askstring', u'Dialog'),
-              u'SimpleXMLRPCServer' : (
-                  u'CGIXMLRPCRequestHandler', u'SimpleXMLRPCDispatcher',
-                  u'SimpleXMLRPCRequestHandler', u'SimpleXMLRPCServer',
-                  u'list_public_methods', u'remove_duplicates',
-                  u'resolve_dotted_attribute'),
-              u'DocXMLRPCServer' : (
-                  u'DocCGIXMLRPCRequestHandler', u'DocXMLRPCRequestHandler',
-                  u'DocXMLRPCServer', u'ServerHTMLDoc',u'XMLRPCDocGenerator'),
-                }
-
-MAPPING = { u'urllib.request' :
-                (u'urllib2', u'urllib'),
-            u'urllib.error' :
-                (u'urllib2', u'urllib'),
-            u'urllib.parse' :
-                (u'urllib2', u'urllib', u'urlparse'),
-            u'dbm.__init__' :
-                (u'anydbm', u'whichdb'),
-            u'http.server' :
-                (u'CGIHTTPServer', u'SimpleHTTPServer', u'BaseHTTPServer'),
-            u'tkinter.filedialog' :
-                (u'tkFileDialog', u'FileDialog'),
-            u'tkinter.simpledialog' :
-                (u'tkSimpleDialog', u'SimpleDialog'),
-            u'xmlrpc.server' :
-                (u'DocXMLRPCServer', u'SimpleXMLRPCServer'),
-            }
-
-# helps match 'http', as in 'from http.server import ...'
-simple_name = u"name='%s'"
-# helps match 'server', as in 'from http.server import ...'
-simple_attr = u"attr='%s'"
-# helps match 'HTTPServer', as in 'from http.server import HTTPServer'
-simple_using = u"using='%s'"
-# helps match 'urllib.request', as in 'import urllib.request'
-dotted_name = u"dotted_name=dotted_name< %s '.' %s >"
-# helps match 'http.server', as in 'http.server.HTTPServer(...)'
-power_twoname = u"pow=power< %s trailer< '.' %s > trailer< '.' using=any > any* >"
-# helps match 'dbm.whichdb', as in 'dbm.whichdb(...)'
-power_onename = u"pow=power< %s trailer< '.' using=any > any* >"
-# helps match 'from http.server import HTTPServer'
-# also helps match 'from http.server import HTTPServer, SimpleHTTPRequestHandler'
-# also helps match 'from http.server import *'
-from_import = u"from_import=import_from< 'from' %s 'import' (import_as_name< using=any 'as' renamed=any> | in_list=import_as_names< using=any* > | using='*' | using=NAME) >"
-# helps match 'import urllib.request'
-name_import = u"name_import=import_name< 'import' (%s | in_list=dotted_as_names< imp_list=any* >) >"
-
-#############
-# WON'T FIX #
-#############
-
-# helps match 'import urllib.request as name'
-name_import_rename = u"name_import_rename=dotted_as_name< %s 'as' renamed=any >"
-# helps match 'from http import server'
-from_import_rename = u"from_import_rename=import_from< 'from' %s 'import' (%s | import_as_name< %s 'as' renamed=any > | in_list=import_as_names< any* (%s | import_as_name< %s 'as' renamed=any >) any* >) >"
-
-
-def all_modules_subpattern():
-    u"""
-    Builds a pattern for all toplevel names
-    (urllib, http, etc)
-    """
-    names_dot_attrs = [mod.split(u".") for mod in MAPPING]
-    ret = u"( " + u" | ".join([dotted_name % (simple_name % (mod[0]),
-                                            simple_attr % (mod[1])) for mod in names_dot_attrs])
-    ret += u" | "
-    ret += u" | ".join([simple_name % (mod[0]) for mod in names_dot_attrs if mod[1] == u"__init__"]) + u" )"
-    return ret
-
-
-def build_import_pattern(mapping1, mapping2):
-    u"""
-    mapping1: A dict mapping py3k modules to all possible py2k replacements
-    mapping2: A dict mapping py2k modules to the things they do
-    This builds a HUGE pattern to match all ways that things can be imported
-    """
-    # py3k: urllib.request, py2k: ('urllib2', 'urllib')
-    yield from_import % (all_modules_subpattern())
-    for py3k, py2k in mapping1.items():
-        name, attr = py3k.split(u'.')
-        s_name = simple_name % (name)
-        s_attr = simple_attr % (attr)
-        d_name = dotted_name % (s_name, s_attr)
-        yield name_import % (d_name)
-        yield power_twoname % (s_name, s_attr)
-        if attr == u'__init__':
-            yield name_import % (s_name)
-            yield power_onename % (s_name)
-        yield name_import_rename % (d_name)
-        yield from_import_rename % (s_name, s_attr, s_attr, s_attr, s_attr)
-
-
-class FixImports2(fixer_base.BaseFix):
-
-    run_order = 4
-
-    PATTERN = u" | \n".join(build_import_pattern(MAPPING, PY2MODULES))
-
-    def transform(self, node, results):
-        touch_import_top(u'future', u'standard_library', node)
diff --git a/lib/libpasteurize/fixes/fix_kwargs.py b/lib/libpasteurize/fixes/fix_kwargs.py
deleted file mode 100644
index 290f991e..00000000
--- a/lib/libpasteurize/fixes/fix_kwargs.py
+++ /dev/null
@@ -1,147 +0,0 @@
-u"""
-Fixer for Python 3 function parameter syntax
-This fixer is rather sensitive to incorrect py3k syntax.
-"""
-
-# Note: "relevant" parameters are parameters following the first STAR in the list.
-
-from lib2to3 import fixer_base
-from lib2to3.fixer_util import token, String, Newline, Comma, Name
-from libfuturize.fixer_util import indentation, suitify, DoubleStar
-
-_assign_template = u"%(name)s = %(kwargs)s['%(name)s']; del %(kwargs)s['%(name)s']"
-_if_template = u"if '%(name)s' in %(kwargs)s: %(assign)s"
-_else_template = u"else: %(name)s = %(default)s"
-_kwargs_default_name = u"_3to2kwargs"
-
-def gen_params(raw_params):
-    u"""
-    Generator that yields tuples of (name, default_value) for each parameter in the list
-    If no default is given, then it is default_value is None (not Leaf(token.NAME, 'None'))
-    """
-    assert raw_params[0].type == token.STAR and len(raw_params) > 2
-    curr_idx = 2 # the first place a keyword-only parameter name can be is index 2
-    max_idx = len(raw_params)
-    while curr_idx < max_idx:
-        curr_item = raw_params[curr_idx]
-        prev_item = curr_item.prev_sibling
-        if curr_item.type != token.NAME:
-            curr_idx += 1
-            continue
-        if prev_item is not None and prev_item.type == token.DOUBLESTAR:
-            break
-        name = curr_item.value
-        nxt = curr_item.next_sibling
-        if nxt is not None and nxt.type == token.EQUAL:
-            default_value = nxt.next_sibling
-            curr_idx += 2
-        else:
-            default_value = None
-        yield (name, default_value)
-        curr_idx += 1
-
-def remove_params(raw_params, kwargs_default=_kwargs_default_name):
-    u"""
-    Removes all keyword-only args from the params list and a bare star, if any.
-    Does not add the kwargs dict if needed.
-    Returns True if more action is needed, False if not
-    (more action is needed if no kwargs dict exists)
-    """
-    assert raw_params[0].type == token.STAR
-    if raw_params[1].type == token.COMMA:
-        raw_params[0].remove()
-        raw_params[1].remove()
-        kw_params = raw_params[2:]
-    else:
-        kw_params = raw_params[3:]
-    for param in kw_params:
-        if param.type != token.DOUBLESTAR:
-            param.remove()
-        else:
-            return False
-    else:
-        return True
-
-def needs_fixing(raw_params, kwargs_default=_kwargs_default_name):
-    u"""
-    Returns string with the name of the kwargs dict if the params after the first star need fixing
-    Otherwise returns empty string
-    """
-    found_kwargs = False
-    needs_fix = False
-
-    for t in raw_params[2:]:
-        if t.type == token.COMMA:
-            # Commas are irrelevant at this stage.
-            continue
-        elif t.type == token.NAME and not found_kwargs:
-            # Keyword-only argument: definitely need to fix.
-            needs_fix = True
-        elif t.type == token.NAME and found_kwargs:
-            # Return 'foobar' of **foobar, if needed.
-            return t.value if needs_fix else u''
-        elif t.type == token.DOUBLESTAR:
-            # Found either '*' from **foobar.
-            found_kwargs = True
-    else:
-        # Never found **foobar.  Return a synthetic name, if needed.
-        return kwargs_default if needs_fix else u''
-
-class FixKwargs(fixer_base.BaseFix):
-
-    run_order = 7 # Run after function annotations are removed
-
-    PATTERN = u"funcdef< 'def' NAME parameters< '(' arglist=typedargslist< params=any* > ')' > ':' suite=any >"
-
-    def transform(self, node, results):
-        params_rawlist = results[u"params"]
-        for i, item in enumerate(params_rawlist):
-            if item.type == token.STAR:
-                params_rawlist = params_rawlist[i:]
-                break
-        else:
-            return
-        # params is guaranteed to be a list starting with *.
-        # if fixing is needed, there will be at least 3 items in this list:
-        # [STAR, COMMA, NAME] is the minimum that we need to worry about.
-        new_kwargs = needs_fixing(params_rawlist)
-        # new_kwargs is the name of the kwargs dictionary.
-        if not new_kwargs:
-            return
-        suitify(node)
-
-        # At this point, params_rawlist is guaranteed to be a list
-        # beginning with a star that includes at least one keyword-only param
-        # e.g., [STAR, NAME, COMMA, NAME, COMMA, DOUBLESTAR, NAME] or
-        # [STAR, COMMA, NAME], or [STAR, COMMA, NAME, COMMA, DOUBLESTAR, NAME]
-
-        # Anatomy of a funcdef: ['def', 'name', parameters, ':', suite]
-        # Anatomy of that suite: [NEWLINE, INDENT, first_stmt, all_other_stmts]
-        # We need to insert our new stuff before the first_stmt and change the
-        # first_stmt's prefix.
-
-        suite = node.children[4]
-        first_stmt = suite.children[2]
-        ident = indentation(first_stmt)
-
-        for name, default_value in gen_params(params_rawlist):
-            if default_value is None:
-                suite.insert_child(2, Newline())
-                suite.insert_child(2, String(_assign_template %{u'name':name, u'kwargs':new_kwargs}, prefix=ident))
-            else:
-                suite.insert_child(2, Newline())
-                suite.insert_child(2, String(_else_template %{u'name':name, u'default':default_value}, prefix=ident))
-                suite.insert_child(2, Newline())
-                suite.insert_child(2, String(_if_template %{u'assign':_assign_template %{u'name':name, u'kwargs':new_kwargs}, u'name':name, u'kwargs':new_kwargs}, prefix=ident))
-        first_stmt.prefix = ident
-        suite.children[2].prefix = u""
-
-        # Now, we need to fix up the list of params.
-
-        must_add_kwargs = remove_params(params_rawlist)
-        if must_add_kwargs:
-            arglist = results[u'arglist']
-            if len(arglist.children) > 0 and arglist.children[-1].type != token.COMMA:
-                arglist.append_child(Comma())
-            arglist.append_child(DoubleStar(prefix=u" "))
-            arglist.append_child(Name(new_kwargs))
diff --git a/lib/libpasteurize/fixes/fix_memoryview.py b/lib/libpasteurize/fixes/fix_memoryview.py
deleted file mode 100644
index a20f6f3f..00000000
--- a/lib/libpasteurize/fixes/fix_memoryview.py
+++ /dev/null
@@ -1,21 +0,0 @@
-u"""
-Fixer for memoryview(s) -> buffer(s).
-Explicit because some memoryview methods are invalid on buffer objects.
-"""
-
-from lib2to3 import fixer_base
-from lib2to3.fixer_util import Name
-
-
-class FixMemoryview(fixer_base.BaseFix):
-
-    explicit = True # User must specify that they want this.
-
-    PATTERN = u"""
-              power< name='memoryview' trailer< '(' [any] ')' >
-              rest=any* >
-              """
-
-    def transform(self, node, results):
-        name = results[u"name"]
-        name.replace(Name(u"buffer", prefix=name.prefix))
diff --git a/lib/libpasteurize/fixes/fix_metaclass.py b/lib/libpasteurize/fixes/fix_metaclass.py
deleted file mode 100644
index 52dd1d14..00000000
--- a/lib/libpasteurize/fixes/fix_metaclass.py
+++ /dev/null
@@ -1,78 +0,0 @@
-u"""
-Fixer for (metaclass=X) -> __metaclass__ = X
-Some semantics (see PEP 3115) may be altered in the translation."""
-
-from lib2to3 import fixer_base
-from lib2to3.fixer_util import Name, syms, Node, Leaf, Newline, find_root
-from lib2to3.pygram import token
-from libfuturize.fixer_util import indentation, suitify
-# from ..fixer_util import Name, syms, Node, Leaf, Newline, find_root, indentation, suitify
-
-def has_metaclass(parent):
-    results = None
-    for node in parent.children:
-        kids = node.children
-        if node.type == syms.argument:
-            if kids[0] == Leaf(token.NAME, u"metaclass") and \
-                kids[1] == Leaf(token.EQUAL, u"=") and \
-                kids[2]:
-                #Hack to avoid "class X(=):" with this case.
-                results = [node] + kids
-                break
-        elif node.type == syms.arglist:
-            # Argument list... loop through it looking for:
-            # Node(*, [*, Leaf(token.NAME, u"metaclass"), Leaf(token.EQUAL, u"="), Leaf(*, *)]
-            for child in node.children:
-                if results: break
-                if child.type == token.COMMA:
-                    #Store the last comma, which precedes the metaclass
-                    comma = child
-                elif type(child) == Node:
-                    meta = equal = name = None
-                    for arg in child.children:
-                        if arg == Leaf(token.NAME, u"metaclass"):
-                            #We have the (metaclass) part
-                            meta = arg
-                        elif meta and arg == Leaf(token.EQUAL, u"="):
-                            #We have the (metaclass=) part
-                            equal = arg
-                        elif meta and equal:
-                            #Here we go, we have (metaclass=X)
-                            name = arg
-                            results = (comma, meta, equal, name)
-                            break
-    return results
-
-
-class FixMetaclass(fixer_base.BaseFix):
-
-    PATTERN = u"""
-    classdef<any*>
-    """
-
-    def transform(self, node, results):
-        meta_results = has_metaclass(node)
-        if not meta_results: return
-        for meta in meta_results:
-            meta.remove()
-        target = Leaf(token.NAME, u"__metaclass__")
-        equal = Leaf(token.EQUAL, u"=", prefix=u" ")
-        # meta is the last item in what was returned by has_metaclass(): name
-        name = meta
-        name.prefix = u" "
-        stmt_node = Node(syms.atom, [target, equal, name])
-
-        suitify(node)
-        for item in node.children:
-            if item.type == syms.suite:
-                for stmt in item.children:
-                    if stmt.type == token.INDENT:
-                        # Insert, in reverse order, the statement, a newline,
-                        # and an indent right after the first indented line
-                        loc = item.children.index(stmt) + 1
-                        # Keep consistent indentation form
-                        ident = Leaf(token.INDENT, stmt.value)
-                        item.insert_child(loc, ident)
-                        item.insert_child(loc, Newline())
-                        item.insert_child(loc, stmt_node)
-                        break
diff --git a/lib/libpasteurize/fixes/fix_newstyle.py b/lib/libpasteurize/fixes/fix_newstyle.py
deleted file mode 100644
index cc6b3adc..00000000
--- a/lib/libpasteurize/fixes/fix_newstyle.py
+++ /dev/null
@@ -1,33 +0,0 @@
-u"""
-Fixer for "class Foo: ..." -> "class Foo(object): ..."
-"""
-
-from lib2to3 import fixer_base
-from lib2to3.fixer_util import LParen, RParen, Name
-
-from libfuturize.fixer_util import touch_import_top
-
-
-def insert_object(node, idx):
-    node.insert_child(idx, RParen())
-    node.insert_child(idx, Name(u"object"))
-    node.insert_child(idx, LParen())
-
-class FixNewstyle(fixer_base.BaseFix):
-
-    # Match:
-    #   class Blah:
-    # and:
-    #   class Blah():
-
-    PATTERN = u"classdef< 'class' NAME ['(' ')'] colon=':' any >"
-
-    def transform(self, node, results):
-        colon = results[u"colon"]
-        idx = node.children.index(colon)
-        if (node.children[idx-2].value == '(' and
-            node.children[idx-1].value == ')'):
-            del node.children[idx-2:idx]
-            idx -= 2
-        insert_object(node, idx)
-        touch_import_top(u'builtins', 'object', node)
diff --git a/lib/libpasteurize/fixes/fix_next.py b/lib/libpasteurize/fixes/fix_next.py
deleted file mode 100644
index 9ecb6c04..00000000
--- a/lib/libpasteurize/fixes/fix_next.py
+++ /dev/null
@@ -1,43 +0,0 @@
-u"""
-Fixer for:
-it.__next__() -> it.next().
-next(it) -> it.next().
-"""
-
-from lib2to3.pgen2 import token
-from lib2to3.pygram import python_symbols as syms
-from lib2to3 import fixer_base
-from lib2to3.fixer_util import Name, Call, find_binding, Attr
-
-bind_warning = u"Calls to builtin next() possibly shadowed by global binding"
-
-
-class FixNext(fixer_base.BaseFix):
-
-    PATTERN = u"""
-    power< base=any+ trailer< '.' attr='__next__' > any* >
-    |
-    power< head='next' trailer< '(' arg=any ')' > any* >
-    |
-    classdef< 'class' base=any+ ':'
-              suite< any*
-                     funcdef< 'def'
-                              attr='__next__'
-                              parameters< '(' NAME ')' > any+ >
-                     any* > >
-    """
-
-    def transform(self, node, results):
-        assert results
-
-        base = results.get(u"base")
-        attr = results.get(u"attr")
-        head = results.get(u"head")
-        arg_ = results.get(u"arg")
-        if arg_:
-            arg = arg_.clone()
-            head.replace(Attr(Name(unicode(arg),prefix=head.prefix),
-                              Name(u"next")))
-            arg_.remove()
-        elif base:
-            attr.replace(Name(u"next", prefix=attr.prefix))
diff --git a/lib/libpasteurize/fixes/fix_printfunction.py b/lib/libpasteurize/fixes/fix_printfunction.py
deleted file mode 100644
index a2a6e084..00000000
--- a/lib/libpasteurize/fixes/fix_printfunction.py
+++ /dev/null
@@ -1,17 +0,0 @@
-u"""
-Fixer for print: from __future__ import print_function.
-"""
-
-from lib2to3 import fixer_base
-from libfuturize.fixer_util import future_import
-
-class FixPrintfunction(fixer_base.BaseFix):
-
-    # explicit = True
-
-    PATTERN = u"""
-              power< 'print' trailer < '(' any* ')' > any* >
-              """
-
-    def transform(self, node, results):
-        future_import(u"print_function", node)
diff --git a/lib/libpasteurize/fixes/fix_raise.py b/lib/libpasteurize/fixes/fix_raise.py
deleted file mode 100644
index 9c9c192f..00000000
--- a/lib/libpasteurize/fixes/fix_raise.py
+++ /dev/null
@@ -1,25 +0,0 @@
-u"""Fixer for 'raise E(V).with_traceback(T)' -> 'raise E, V, T'"""
-
-from lib2to3 import fixer_base
-from lib2to3.fixer_util import Comma, Node, Leaf, token, syms
-
-class FixRaise(fixer_base.BaseFix):
-
-    PATTERN = u"""
-    raise_stmt< 'raise' (power< name=any [trailer< '(' val=any* ')' >]
-        [trailer< '.' 'with_traceback' > trailer< '(' trc=any ')' >] > | any) ['from' chain=any] >"""
-
-    def transform(self, node, results):
-        name, val, trc = (results.get(u"name"), results.get(u"val"), results.get(u"trc"))
-        chain = results.get(u"chain")
-        if chain is not None:
-            self.warning(node, u"explicit exception chaining is not supported in Python 2")
-            chain.prev_sibling.remove()
-            chain.remove()
-        if trc is not None:
-            val = val[0] if val else Leaf(token.NAME, u"None")
-            val.prefix = trc.prefix = u" "
-            kids = [Leaf(token.NAME, u"raise"), name.clone(), Comma(),
-                    val.clone(), Comma(), trc.clone()]
-            raise_stmt = Node(syms.raise_stmt, kids)
-            node.replace(raise_stmt)
diff --git a/lib/libpasteurize/fixes/fix_raise_.py b/lib/libpasteurize/fixes/fix_raise_.py
deleted file mode 100644
index 0f020c45..00000000
--- a/lib/libpasteurize/fixes/fix_raise_.py
+++ /dev/null
@@ -1,35 +0,0 @@
-u"""Fixer for
-              raise E(V).with_traceback(T)
-    to:
-              from future.utils import raise_
-              ...
-              raise_(E, V, T)
-
-TODO: FIXME!!
-
-"""
-
-from lib2to3 import fixer_base
-from lib2to3.fixer_util import Comma, Node, Leaf, token, syms
-
-class FixRaise(fixer_base.BaseFix):
-
-    PATTERN = u"""
-    raise_stmt< 'raise' (power< name=any [trailer< '(' val=any* ')' >]
-        [trailer< '.' 'with_traceback' > trailer< '(' trc=any ')' >] > | any) ['from' chain=any] >"""
-
-    def transform(self, node, results):
-        FIXME
-        name, val, trc = (results.get(u"name"), results.get(u"val"), results.get(u"trc"))
-        chain = results.get(u"chain")
-        if chain is not None:
-            self.warning(node, u"explicit exception chaining is not supported in Python 2")
-            chain.prev_sibling.remove()
-            chain.remove()
-        if trc is not None:
-            val = val[0] if val else Leaf(token.NAME, u"None")
-            val.prefix = trc.prefix = u" "
-            kids = [Leaf(token.NAME, u"raise"), name.clone(), Comma(),
-                    val.clone(), Comma(), trc.clone()]
-            raise_stmt = Node(syms.raise_stmt, kids)
-            node.replace(raise_stmt)
diff --git a/lib/libpasteurize/fixes/fix_throw.py b/lib/libpasteurize/fixes/fix_throw.py
deleted file mode 100644
index c0feed1e..00000000
--- a/lib/libpasteurize/fixes/fix_throw.py
+++ /dev/null
@@ -1,23 +0,0 @@
-u"""Fixer for 'g.throw(E(V).with_traceback(T))' -> 'g.throw(E, V, T)'"""
-
-from lib2to3 import fixer_base
-from lib2to3.pytree import Node, Leaf
-from lib2to3.pgen2 import token
-from lib2to3.fixer_util import Comma
-
-class FixThrow(fixer_base.BaseFix):
-
-    PATTERN = u"""
-    power< any trailer< '.' 'throw' >
-        trailer< '(' args=power< exc=any trailer< '(' val=any* ')' >
-        trailer< '.' 'with_traceback' > trailer< '(' trc=any ')' > > ')' > >
-    """
-
-    def transform(self, node, results):
-        syms = self.syms
-        exc, val, trc = (results[u"exc"], results[u"val"], results[u"trc"])
-        val = val[0] if val else Leaf(token.NAME, u"None")
-        val.prefix = trc.prefix = u" "
-        kids = [exc.clone(), Comma(), val.clone(), Comma(), trc.clone()]
-        args = results[u"args"]
-        args.children = kids
diff --git a/lib/libpasteurize/fixes/fix_unpacking.py b/lib/libpasteurize/fixes/fix_unpacking.py
deleted file mode 100644
index 6e839e6b..00000000
--- a/lib/libpasteurize/fixes/fix_unpacking.py
+++ /dev/null
@@ -1,124 +0,0 @@
-u"""
-Fixer for:
-(a,)* *b (,c)* [,] = s
-for (a,)* *b (,c)* [,] in d: ...
-"""
-
-from lib2to3 import fixer_base
-from itertools import count
-from lib2to3.fixer_util import (Assign, Comma, Call, Newline, Name,
-                                Number, token, syms, Node, Leaf)
-from libfuturize.fixer_util import indentation, suitify, commatize
-# from libfuturize.fixer_util import Assign, Comma, Call, Newline, Name, Number, indentation, suitify, commatize, token, syms, Node, Leaf
-
-def assignment_source(num_pre, num_post, LISTNAME, ITERNAME):
-    u"""
-    Accepts num_pre and num_post, which are counts of values
-    before and after the starg (not including the starg)
-    Returns a source fit for Assign() from fixer_util
-    """
-    children = []
-    try:
-        pre = unicode(num_pre)
-        post = unicode(num_post)
-    except NameError:
-        pre = str(num_pre)
-        post = str(num_post)
-    # This code builds the assignment source from lib2to3 tree primitives.
-    # It's not very readable, but it seems like the most correct way to do it.
-    if num_pre > 0:
-        pre_part = Node(syms.power, [Name(LISTNAME), Node(syms.trailer, [Leaf(token.LSQB, u"["), Node(syms.subscript, [Leaf(token.COLON, u":"), Number(pre)]), Leaf(token.RSQB, u"]")])])
-        children.append(pre_part)
-        children.append(Leaf(token.PLUS, u"+", prefix=u" "))
-    main_part = Node(syms.power, [Leaf(token.LSQB, u"[", prefix=u" "), Name(LISTNAME), Node(syms.trailer, [Leaf(token.LSQB, u"["), Node(syms.subscript, [Number(pre) if num_pre > 0 else Leaf(1, u""), Leaf(token.COLON, u":"), Node(syms.factor, [Leaf(token.MINUS, u"-"), Number(post)]) if num_post > 0 else Leaf(1, u"")]), Leaf(token.RSQB, u"]"), Leaf(token.RSQB, u"]")])])
-    children.append(main_part)
-    if num_post > 0:
-        children.append(Leaf(token.PLUS, u"+", prefix=u" "))
-        post_part = Node(syms.power, [Name(LISTNAME, prefix=u" "), Node(syms.trailer, [Leaf(token.LSQB, u"["), Node(syms.subscript, [Node(syms.factor, [Leaf(token.MINUS, u"-"), Number(post)]), Leaf(token.COLON, u":")]), Leaf(token.RSQB, u"]")])])
-        children.append(post_part)
-    source = Node(syms.arith_expr, children)
-    return source
-
-class FixUnpacking(fixer_base.BaseFix):
-
-    PATTERN = u"""
-    expl=expr_stmt< testlist_star_expr<
-        pre=(any ',')*
-            star_expr< '*' name=NAME >
-        post=(',' any)* [','] > '=' source=any > |
-    impl=for_stmt< 'for' lst=exprlist<
-        pre=(any ',')*
-            star_expr< '*' name=NAME >
-        post=(',' any)* [','] > 'in' it=any ':' suite=any>"""
-
-    def fix_explicit_context(self, node, results):
-        pre, name, post, source = (results.get(n) for n in (u"pre", u"name", u"post", u"source"))
-        pre = [n.clone() for n in pre if n.type == token.NAME]
-        name.prefix = u" "
-        post = [n.clone() for n in post if n.type == token.NAME]
-        target = [n.clone() for n in commatize(pre + [name.clone()] + post)]
-        # to make the special-case fix for "*z, = ..." correct with the least
-        # amount of modification, make the left-side into a guaranteed tuple
-        target.append(Comma())
-        source.prefix = u""
-        setup_line = Assign(Name(self.LISTNAME), Call(Name(u"list"), [source.clone()]))
-        power_line = Assign(target, assignment_source(len(pre), len(post), self.LISTNAME, self.ITERNAME))
-        return setup_line, power_line
-
-    def fix_implicit_context(self, node, results):
-        u"""
-        Only example of the implicit context is
-        a for loop, so only fix that.
-        """
-        pre, name, post, it = (results.get(n) for n in (u"pre", u"name", u"post", u"it"))
-        pre = [n.clone() for n in pre if n.type == token.NAME]
-        name.prefix = u" "
-        post = [n.clone() for n in post if n.type == token.NAME]
-        target = [n.clone() for n in commatize(pre + [name.clone()] + post)]
-        # to make the special-case fix for "*z, = ..." correct with the least
-        # amount of modification, make the left-side into a guaranteed tuple
-        target.append(Comma())
-        source = it.clone()
-        source.prefix = u""
-        setup_line = Assign(Name(self.LISTNAME), Call(Name(u"list"), [Name(self.ITERNAME)]))
-        power_line = Assign(target, assignment_source(len(pre), len(post), self.LISTNAME, self.ITERNAME))
-        return setup_line, power_line
-
-    def transform(self, node, results):
-        u"""
-        a,b,c,d,e,f,*g,h,i = range(100) changes to
-        _3to2list = list(range(100))
-        a,b,c,d,e,f,g,h,i, = _3to2list[:6] + [_3to2list[6:-2]] + _3to2list[-2:]
-
-        and
-
-        for a,b,*c,d,e in iter_of_iters: do_stuff changes to
-        for _3to2iter in iter_of_iters:
-            _3to2list = list(_3to2iter)
-            a,b,c,d,e, = _3to2list[:2] + [_3to2list[2:-2]] + _3to2list[-2:]
-            do_stuff
-        """
-        self.LISTNAME = self.new_name(u"_3to2list")
-        self.ITERNAME = self.new_name(u"_3to2iter")
-        expl, impl = results.get(u"expl"), results.get(u"impl")
-        if expl is not None:
-            setup_line, power_line = self.fix_explicit_context(node, results)
-            setup_line.prefix = expl.prefix
-            power_line.prefix = indentation(expl.parent)
-            setup_line.append_child(Newline())
-            parent = node.parent
-            i = node.remove()
-            parent.insert_child(i, power_line)
-            parent.insert_child(i, setup_line)
-        elif impl is not None:
-            setup_line, power_line = self.fix_implicit_context(node, results)
-            suitify(node)
-            suite = [k for k in node.children if k.type == syms.suite][0]
-            setup_line.prefix = u""
-            power_line.prefix = suite.children[1].value
-            suite.children[2].prefix = indentation(suite.children[2])
-            suite.insert_child(2, Newline())
-            suite.insert_child(2, power_line)
-            suite.insert_child(2, Newline())
-            suite.insert_child(2, setup_line)
-            results.get(u"lst").replace(Name(self.ITERNAME, prefix=u" "))
diff --git a/lib/libpasteurize/main.py b/lib/libpasteurize/main.py
deleted file mode 100644
index 4179174b..00000000
--- a/lib/libpasteurize/main.py
+++ /dev/null
@@ -1,204 +0,0 @@
-"""
-pasteurize: automatic conversion of Python 3 code to clean 2/3 code
-===================================================================
-
-``pasteurize`` attempts to convert existing Python 3 code into source-compatible
-Python 2 and 3 code.
-
-Use it like this on Python 3 code:
-
-  $ pasteurize --verbose mypython3script.py
-
-This removes any Py3-only syntax (e.g. new metaclasses) and adds these
-import lines:
-
-    from __future__ import absolute_import
-    from __future__ import division
-    from __future__ import print_function
-    from __future__ import unicode_literals
-    from future import standard_library
-    standard_library.install_hooks()
-    from builtins import *
-
-To write changes to the files, use the -w flag.
-
-It also adds any other wrappers needed for Py2/3 compatibility.
-
-Note that separate stages are not available (or needed) when converting from
-Python 3 with ``pasteurize`` as they are when converting from Python 2 with
-``futurize``.
-
-The --all-imports option forces adding all ``__future__`` imports,
-``builtins`` imports, and standard library aliases, even if they don't
-seem necessary for the current state of each module. (This can simplify
-testing, and can reduce the need to think about Py2 compatibility when editing
-the code further.)
-
-"""
-
-from __future__ import (absolute_import, print_function, unicode_literals)
-
-import sys
-import logging
-import optparse
-from lib2to3.main import main, warn, StdoutRefactoringTool
-from lib2to3 import refactor
-
-from future import __version__
-from libpasteurize.fixes import fix_names
-
-
-def main(args=None):
-    """Main program.
-
-    Returns a suggested exit status (0, 1, 2).
-    """
-    # Set up option parser
-    parser = optparse.OptionParser(usage="pasteurize [options] file|dir ...")
-    parser.add_option("-V", "--version", action="store_true",
-                      help="Report the version number of pasteurize")
-    parser.add_option("-a", "--all-imports", action="store_true",
-                      help="Adds all __future__ and future imports to each module")
-    parser.add_option("-f", "--fix", action="append", default=[],
-                      help="Each FIX specifies a transformation; default: all")
-    parser.add_option("-j", "--processes", action="store", default=1,
-                      type="int", help="Run 2to3 concurrently")
-    parser.add_option("-x", "--nofix", action="append", default=[],
-                      help="Prevent a fixer from being run.")
-    parser.add_option("-l", "--list-fixes", action="store_true",
-                      help="List available transformations")
-    # parser.add_option("-p", "--print-function", action="store_true",
-    #                   help="Modify the grammar so that print() is a function")
-    parser.add_option("-v", "--verbose", action="store_true",
-                      help="More verbose logging")
-    parser.add_option("--no-diffs", action="store_true",
-                      help="Don't show diffs of the refactoring")
-    parser.add_option("-w", "--write", action="store_true",
-                      help="Write back modified files")
-    parser.add_option("-n", "--nobackups", action="store_true", default=False,
-                      help="Don't write backups for modified files.")
-
-    # Parse command line arguments
-    refactor_stdin = False
-    flags = {}
-    options, args = parser.parse_args(args)
-    fixer_pkg = 'libpasteurize.fixes'
-    avail_fixes = fix_names
-    flags["print_function"] = True
-
-    if not options.write and options.no_diffs:
-        warn("not writing files and not printing diffs; that's not very useful")
-    if not options.write and options.nobackups:
-        parser.error("Can't use -n without -w")
-    if options.version:
-        print(__version__)
-        return 0
-    if options.list_fixes:
-        print("Available transformations for the -f/--fix option:")
-        for fixname in sorted(avail_fixes):
-            print(fixname)
-        if not args:
-            return 0
-    if not args:
-        print("At least one file or directory argument required.",
-              file=sys.stderr)
-        print("Use --help to show usage.", file=sys.stderr)
-        return 2
-    if "-" in args:
-        refactor_stdin = True
-        if options.write:
-            print("Can't write to stdin.", file=sys.stderr)
-            return 2
-
-    # Set up logging handler
-    level = logging.DEBUG if options.verbose else logging.INFO
-    logging.basicConfig(format='%(name)s: %(message)s', level=level)
-
-    unwanted_fixes = set()
-    for fix in options.nofix:
-        if ".fix_" in fix:
-            unwanted_fixes.add(fix)
-        else:
-            # Infer the full module name for the fixer.
-            # First ensure that no names clash (e.g.
-            # lib2to3.fixes.fix_blah and libfuturize.fixes.fix_blah):
-            found = [f for f in avail_fixes
-                     if f.endswith('fix_{0}'.format(fix))]
-            if len(found) > 1:
-                print("Ambiguous fixer name. Choose a fully qualified "
-                      "module name instead from these:\n" +
-                      "\n".join("  " + myf for myf in found),
-                      file=sys.stderr)
-                return 2
-            elif len(found) == 0:
-                print("Unknown fixer. Use --list-fixes or -l for a list.",
-                      file=sys.stderr)
-                return 2
-            unwanted_fixes.add(found[0])
-
-    extra_fixes = set()
-    if options.all_imports:
-        prefix = 'libpasteurize.fixes.'
-        extra_fixes.add(prefix + 'fix_add_all__future__imports')
-        extra_fixes.add(prefix + 'fix_add_future_standard_library_import')
-        extra_fixes.add(prefix + 'fix_add_all_future_builtins')
-
-    explicit = set()
-    if options.fix:
-        all_present = False
-        for fix in options.fix:
-            if fix == 'all':
-                all_present = True
-            else:
-                if ".fix_" in fix:
-                    explicit.add(fix)
-                else:
-                    # Infer the full module name for the fixer.
-                    # First ensure that no names clash (e.g.
-                    # lib2to3.fixes.fix_blah and libpasteurize.fixes.fix_blah):
-                    found = [f for f in avail_fixes
-                             if f.endswith('fix_{0}'.format(fix))]
-                    if len(found) > 1:
-                        print("Ambiguous fixer name. Choose a fully qualified "
-                              "module name instead from these:\n" +
-                              "\n".join("  " + myf for myf in found),
-                              file=sys.stderr)
-                        return 2
-                    elif len(found) == 0:
-                        print("Unknown fixer. Use --list-fixes or -l for a list.",
-                              file=sys.stderr)
-                        return 2
-                    explicit.add(found[0])
-        if len(explicit & unwanted_fixes) > 0:
-            print("Conflicting usage: the following fixers have been "
-                  "simultaneously requested and disallowed:\n" +
-                  "\n".join("  " + myf for myf in (explicit & unwanted_fixes)),
-                  file=sys.stderr)
-            return 2
-        requested = avail_fixes.union(explicit) if all_present else explicit
-    else:
-        requested = avail_fixes.union(explicit)
-
-    fixer_names = requested | extra_fixes - unwanted_fixes
-
-    # Initialize the refactoring tool
-    rt = StdoutRefactoringTool(sorted(fixer_names), flags, set(),
-                               options.nobackups, not options.no_diffs)
-
-    # Refactor all files and directories passed as arguments
-    if not rt.errors:
-        if refactor_stdin:
-            rt.refactor_stdin()
-        else:
-            try:
-                rt.refactor(args, options.write, None,
-                            options.processes)
-            except refactor.MultiprocessingUnsupported:
-                assert options.processes > 1
-                print("Sorry, -j isn't " \
-                      "supported on this platform.", file=sys.stderr)
-                return 1
-        rt.summarize()
-
-    # Return error status (0 if rt.errors is zero)
-    return int(bool(rt.errors))
diff --git a/lib/logutils/__init__.py b/lib/logutils/__init__.py
new file mode 100644
index 00000000..44e261f8
--- /dev/null
+++ b/lib/logutils/__init__.py
@@ -0,0 +1,195 @@
+#
+# Copyright (C) 2010-2013 Vinay Sajip. See LICENSE.txt for details.
+#
+"""
+The logutils package provides a set of handlers for the Python standard
+library's logging package.
+
+Some of these handlers are out-of-scope for the standard library, and
+so they are packaged here. Others are updated versions which have
+appeared in recent Python releases, but are usable with older versions
+of Python, and so are packaged here.
+"""
+import logging
+from string import Template
+
+__version__ = '0.3.3'
+
+class NullHandler(logging.Handler):
+    """
+    This handler does nothing. It's intended to be used to avoid the
+    "No handlers could be found for logger XXX" one-off warning. This is
+    important for library code, which may contain code to log events. If a user
+    of the library does not configure logging, the one-off warning might be
+    produced; to avoid this, the library developer simply needs to instantiate
+    a NullHandler and add it to the top-level logger of the library module or
+    package.
+    """
+
+    def handle(self, record):
+        """
+        Handle a record. Does nothing in this class, but in other
+        handlers it typically filters and then emits the record in a 
+        thread-safe way.
+        """
+        pass
+
+    def emit(self, record):
+        """
+        Emit a record. This does nothing and shouldn't be called during normal
+        processing, unless you redefine :meth:`~logutils.NullHandler.handle`.
+        """
+        pass
+
+    def createLock(self):
+        """
+        Since this handler does nothing, it has no underlying I/O to protect
+        against multi-threaded access, so this method returns `None`.
+        """
+        self.lock = None
+
+class PercentStyle(object):
+
+    default_format = '%(message)s'
+    asctime_format = '%(asctime)s'
+
+    def __init__(self, fmt):
+        self._fmt = fmt or self.default_format
+
+    def usesTime(self):
+        return self._fmt.find(self.asctime_format) >= 0
+
+    def format(self, record):
+        return self._fmt % record.__dict__
+
+class StrFormatStyle(PercentStyle):
+    default_format = '{message}'
+    asctime_format = '{asctime}'
+
+    def format(self, record):
+        return self._fmt.format(**record.__dict__)
+
+
+class StringTemplateStyle(PercentStyle):
+    default_format = '${message}'
+    asctime_format = '${asctime}'
+
+    def __init__(self, fmt):
+        self._fmt = fmt or self.default_format
+        self._tpl = Template(self._fmt)
+
+    def usesTime(self):
+        fmt = self._fmt
+        return fmt.find('$asctime') >= 0 or fmt.find(self.asctime_format) >= 0
+
+    def format(self, record):
+        return self._tpl.substitute(**record.__dict__)
+
+_STYLES = {
+    '%': PercentStyle,
+    '{': StrFormatStyle,
+    '$': StringTemplateStyle
+}
+
+class Formatter(logging.Formatter):
+    """
+    Subclasses Formatter in Pythons earlier than 3.2 in order to give
+    3.2 Formatter behaviour with respect to allowing %-, {} or $-
+    formatting.
+    """
+    def __init__(self, fmt=None, datefmt=None, style='%'):
+        """
+        Initialize the formatter with specified format strings.
+
+        Initialize the formatter either with the specified format string, or a
+        default as described above. Allow for specialized date formatting with
+        the optional datefmt argument (if omitted, you get the ISO8601 format).
+
+        Use a style parameter of '%', '{' or '$' to specify that you want to
+        use one of %-formatting, :meth:`str.format` (``{}``) formatting or
+        :class:`string.Template` formatting in your format string.
+        """
+        if style not in _STYLES:
+            raise ValueError('Style must be one of: %s' % ','.join(
+                             _STYLES.keys()))
+        self._style = _STYLES[style](fmt)
+        self._fmt = self._style._fmt
+        self.datefmt = datefmt
+
+    def usesTime(self):
+        """
+        Check if the format uses the creation time of the record.
+        """
+        return self._style.usesTime()
+
+    def formatMessage(self, record):
+        return self._style.format(record)
+
+    def format(self, record):
+        """
+        Format the specified record as text.
+
+        The record's attribute dictionary is used as the operand to a
+        string formatting operation which yields the returned string.
+        Before formatting the dictionary, a couple of preparatory steps
+        are carried out. The message attribute of the record is computed
+        using LogRecord.getMessage(). If the formatting string uses the
+        time (as determined by a call to usesTime(), formatTime() is
+        called to format the event time. If there is exception information,
+        it is formatted using formatException() and appended to the message.
+        """
+        record.message = record.getMessage()
+        if self.usesTime():
+            record.asctime = self.formatTime(record, self.datefmt)
+        s = self.formatMessage(record)
+        if record.exc_info:
+            # Cache the traceback text to avoid converting it multiple times
+            # (it's constant anyway)
+            if not record.exc_text:
+                record.exc_text = self.formatException(record.exc_info)
+        if record.exc_text:
+            if s[-1:] != "\n":
+                s = s + "\n"
+            s = s + record.exc_text
+        return s
+
+
+class BraceMessage(object):
+    def __init__(self, fmt, *args, **kwargs):
+        self.fmt = fmt
+        self.args = args
+        self.kwargs = kwargs
+        self.str = None
+        
+    def __str__(self):
+        if self.str is None:
+            self.str = self.fmt.format(*self.args, **self.kwargs)
+        return self.str
+
+class DollarMessage(object):
+    def __init__(self, fmt, **kwargs):
+        self.fmt = fmt
+        self.kwargs = kwargs
+        self.str = None
+        
+    def __str__(self):
+        if self.str is None:
+            self.str = Template(self.fmt).substitute(**self.kwargs)
+        return self.str
+
+
+def hasHandlers(logger):
+    """
+    See if a logger has any handlers.
+    """
+    rv = False
+    while logger:
+        if logger.handlers:
+            rv = True
+            break
+        elif not logger.propagate:
+            break
+        else:
+            logger = logger.parent
+    return rv
+
diff --git a/lib/logutils/adapter.py b/lib/logutils/adapter.py
new file mode 100644
index 00000000..399e1eed
--- /dev/null
+++ b/lib/logutils/adapter.py
@@ -0,0 +1,116 @@
+#
+# Copyright (C) 2010-2013 Vinay Sajip. See LICENSE.txt for details.
+#
+import logging
+import logutils
+
+class LoggerAdapter(object):
+    """
+    An adapter for loggers which makes it easier to specify contextual
+    information in logging output.
+    """
+
+    def __init__(self, logger, extra):
+        """
+        Initialize the adapter with a logger and a dict-like object which
+        provides contextual information. This constructor signature allows
+        easy stacking of LoggerAdapters, if so desired.
+
+        You can effectively pass keyword arguments as shown in the
+        following example:
+
+        adapter = LoggerAdapter(someLogger, dict(p1=v1, p2="v2"))
+        """
+        self.logger = logger
+        self.extra = extra
+
+    def process(self, msg, kwargs):
+        """
+        Process the logging message and keyword arguments passed in to
+        a logging call to insert contextual information. You can either
+        manipulate the message itself, the keyword args or both. Return
+        the message and kwargs modified (or not) to suit your needs.
+
+        Normally, you'll only need to override this one method in a
+        LoggerAdapter subclass for your specific needs.
+        """
+        kwargs["extra"] = self.extra
+        return msg, kwargs
+
+    #
+    # Boilerplate convenience methods
+    #
+    def debug(self, msg, *args, **kwargs):
+        """
+        Delegate a debug call to the underlying logger.
+        """
+        self.log(logging.DEBUG, msg, *args, **kwargs)
+
+    def info(self, msg, *args, **kwargs):
+        """
+        Delegate an info call to the underlying logger.
+        """
+        self.log(logging.INFO, msg, *args, **kwargs)
+
+    def warning(self, msg, *args, **kwargs):
+        """
+        Delegate a warning call to the underlying logger.
+        """
+        self.log(logging.WARNING, msg, *args, **kwargs)
+
+    warn = warning
+
+    def error(self, msg, *args, **kwargs):
+        """
+        Delegate an error call to the underlying logger.
+        """
+        self.log(logging.ERROR, msg, *args, **kwargs)
+
+    def exception(self, msg, *args, **kwargs):
+        """
+        Delegate an exception call to the underlying logger.
+        """
+        kwargs["exc_info"] = 1
+        self.log(logging.ERROR, msg, *args, **kwargs)
+
+    def critical(self, msg, *args, **kwargs):
+        """
+        Delegate a critical call to the underlying logger.
+        """
+        self.log(logging.CRITICAL, msg, *args, **kwargs)
+
+    def log(self, level, msg, *args, **kwargs):
+        """
+        Delegate a log call to the underlying logger, after adding
+        contextual information from this adapter instance.
+        """
+        if self.isEnabledFor(level):
+            msg, kwargs = self.process(msg, kwargs)
+            self.logger._log(level, msg, args, **kwargs)
+
+    def isEnabledFor(self, level):
+        """
+        Is this logger enabled for level 'level'?
+        """
+        if self.logger.manager.disable >= level:
+            return False
+        return level >= self.getEffectiveLevel()
+
+    def setLevel(self, level):
+        """
+        Set the specified level on the underlying logger.
+        """
+        self.logger.setLevel(level)
+
+    def getEffectiveLevel(self):
+        """
+        Get the effective level for the underlying logger.
+        """
+        return self.logger.getEffectiveLevel()
+
+    def hasHandlers(self):
+        """
+        See if the underlying logger has any handlers.
+        """
+        return logutils.hasHandlers(self.logger)
+
diff --git a/lib/logutils/colorize.py b/lib/logutils/colorize.py
new file mode 100644
index 00000000..2c396394
--- /dev/null
+++ b/lib/logutils/colorize.py
@@ -0,0 +1,194 @@
+#
+# Copyright (C) 2010-2013 Vinay Sajip. All rights reserved.
+#
+import ctypes
+import logging
+import os
+
+try:
+    unicode
+except NameError:
+    unicode = None
+
+class ColorizingStreamHandler(logging.StreamHandler):
+    """
+    A stream handler which supports colorizing of console streams
+    under Windows, Linux and Mac OS X.
+
+    :param strm: The stream to colorize - typically ``sys.stdout``
+                 or ``sys.stderr``.
+    """
+    
+    # color names to indices
+    color_map = {
+        'black': 0,
+        'red': 1,
+        'green': 2,
+        'yellow': 3,
+        'blue': 4,
+        'magenta': 5,
+        'cyan': 6,
+        'white': 7,
+    }
+
+    #levels to (background, foreground, bold/intense)
+    if os.name == 'nt':
+        level_map = {
+            logging.DEBUG: (None, 'blue', True),
+            logging.INFO: (None, 'white', False),
+            logging.WARNING: (None, 'yellow', True),
+            logging.ERROR: (None, 'red', True),
+            logging.CRITICAL: ('red', 'white', True),
+        }
+    else:
+        "Maps levels to colour/intensity settings."
+        level_map = {
+            logging.DEBUG: (None, 'blue', False),
+            logging.INFO: (None, 'black', False),
+            logging.WARNING: (None, 'yellow', False),
+            logging.ERROR: (None, 'red', False),
+            logging.CRITICAL: ('red', 'white', True),
+        }
+
+    csi = '\x1b['
+    reset = '\x1b[0m'
+
+    @property
+    def is_tty(self):
+        "Returns true if the handler's stream is a terminal."
+        isatty = getattr(self.stream, 'isatty', None)
+        return isatty and isatty()
+
+    def emit(self, record):
+        try:
+            message = self.format(record)
+            stream = self.stream
+            if unicode and isinstance(message, unicode):
+                enc = getattr(stream, 'encoding', 'utf-8')
+                message = message.encode(enc, 'replace')
+            if not self.is_tty:
+                stream.write(message)
+            else:
+                self.output_colorized(message)
+            stream.write(getattr(self, 'terminator', '\n'))
+            self.flush()
+        except (KeyboardInterrupt, SystemExit):
+            raise
+        except:
+            self.handleError(record)
+
+    if os.name != 'nt':
+        def output_colorized(self, message):
+            """
+            Output a colorized message.
+
+            On Linux and Mac OS X, this method just writes the
+            already-colorized message to the stream, since on these
+            platforms console streams accept ANSI escape sequences
+            for colorization. On Windows, this handler implements a
+            subset of ANSI escape sequence handling by parsing the
+            message, extracting the sequences and making Win32 API
+            calls to colorize the output.
+
+            :param message: The message to colorize and output.
+            """
+            self.stream.write(message)
+    else:
+        import re
+        ansi_esc = re.compile(r'\x1b\[((?:\d+)(?:;(?:\d+))*)m')
+
+        nt_color_map = {
+            0: 0x00,    # black
+            1: 0x04,    # red
+            2: 0x02,    # green
+            3: 0x06,    # yellow
+            4: 0x01,    # blue
+            5: 0x05,    # magenta
+            6: 0x03,    # cyan
+            7: 0x07,    # white
+        }
+
+        def output_colorized(self, message):
+            """
+            Output a colorized message.
+
+            On Linux and Mac OS X, this method just writes the
+            already-colorized message to the stream, since on these
+            platforms console streams accept ANSI escape sequences
+            for colorization. On Windows, this handler implements a
+            subset of ANSI escape sequence handling by parsing the
+            message, extracting the sequences and making Win32 API
+            calls to colorize the output.
+
+            :param message: The message to colorize and output.
+            """
+            parts = self.ansi_esc.split(message)
+            write = self.stream.write
+            h = None
+            fd = getattr(self.stream, 'fileno', None)
+            if fd is not None:
+                fd = fd()
+                if fd in (1, 2): # stdout or stderr
+                    h = ctypes.windll.kernel32.GetStdHandle(-10 - fd)
+            while parts:
+                text = parts.pop(0)
+                if text:
+                    write(text)
+                if parts:
+                    params = parts.pop(0)
+                    if h is not None:
+                        params = [int(p) for p in params.split(';')]
+                        color = 0
+                        for p in params:
+                            if 40 <= p <= 47:
+                                color |= self.nt_color_map[p - 40] << 4
+                            elif 30 <= p <= 37:
+                                color |= self.nt_color_map[p - 30]
+                            elif p == 1:
+                                color |= 0x08 # foreground intensity on
+                            elif p == 0: # reset to default color
+                                color = 0x07
+                            else:
+                                pass # error condition ignored
+                        ctypes.windll.kernel32.SetConsoleTextAttribute(h, color)
+
+    def colorize(self, message, record):
+        """
+        Colorize a message for a logging event.
+
+        This implementation uses the ``level_map`` class attribute to
+        map the LogRecord's level to a colour/intensity setting, which is
+        then applied to the whole message.
+
+        :param message: The message to colorize.
+        :param record: The ``LogRecord`` for the message.
+        """
+        if record.levelno in self.level_map:
+            bg, fg, bold = self.level_map[record.levelno]
+            params = []
+            if bg in self.color_map:
+                params.append(str(self.color_map[bg] + 40))
+            if fg in self.color_map:
+                params.append(str(self.color_map[fg] + 30))
+            if bold:
+                params.append('1')
+            if params:
+                message = ''.join((self.csi, ';'.join(params),
+                                   'm', message, self.reset))
+        return message
+
+    def format(self, record):
+        """
+        Formats a record for output.
+
+        This implementation colorizes the message line, but leaves
+        any traceback unolorized.
+        """
+        message = logging.StreamHandler.format(self, record)
+        if self.is_tty:
+            # Don't colorize any traceback
+            parts = message.split('\n', 1)
+            parts[0] = self.colorize(parts[0], record)
+            message = '\n'.join(parts)
+        return message
+
diff --git a/lib/logutils/dictconfig.py b/lib/logutils/dictconfig.py
new file mode 100644
index 00000000..4a2281f3
--- /dev/null
+++ b/lib/logutils/dictconfig.py
@@ -0,0 +1,573 @@
+#
+# Copyright (C) 2009-2013 Vinay Sajip. See LICENSE.txt for details.
+#
+import logging.handlers
+import re
+import sys
+import types
+
+try:
+    basestring
+except NameError:
+    basestring = str
+try:
+    StandardError
+except NameError:
+    StandardError = Exception
+   
+IDENTIFIER = re.compile('^[a-z_][a-z0-9_]*$', re.I)
+
+def valid_ident(s):
+    m = IDENTIFIER.match(s)
+    if not m:
+        raise ValueError('Not a valid Python identifier: %r' % s)
+    return True
+
+#
+# This function is defined in logging only in recent versions of Python
+#
+try:
+    from logging import _checkLevel
+except ImportError:
+    def _checkLevel(level):
+        if isinstance(level, int):
+            rv = level
+        elif str(level) == level:
+            if level not in logging._levelNames:
+                raise ValueError('Unknown level: %r' % level)
+            rv = logging._levelNames[level]
+        else:
+            raise TypeError('Level not an integer or a '
+                            'valid string: %r' % level)
+        return rv
+
+# The ConvertingXXX classes are wrappers around standard Python containers,
+# and they serve to convert any suitable values in the container. The
+# conversion converts base dicts, lists and tuples to their wrapped
+# equivalents, whereas strings which match a conversion format are converted
+# appropriately.
+#
+# Each wrapper should have a configurator attribute holding the actual
+# configurator to use for conversion.
+
+class ConvertingDict(dict):
+    """A converting dictionary wrapper."""
+
+    def __getitem__(self, key):
+        value = dict.__getitem__(self, key)
+        result = self.configurator.convert(value)
+        #If the converted value is different, save for next time
+        if value is not result:
+            self[key] = result
+            if type(result) in (ConvertingDict, ConvertingList,
+                                ConvertingTuple):
+                result.parent = self
+                result.key = key
+        return result
+        
+    def get(self, key, default=None):
+        value = dict.get(self, key, default)
+        result = self.configurator.convert(value)
+        #If the converted value is different, save for next time
+        if value is not result:
+            self[key] = result
+            if type(result) in (ConvertingDict, ConvertingList,
+                                ConvertingTuple):
+                result.parent = self
+                result.key = key
+        return result
+        
+    def pop(self, key, default=None):
+        value = dict.pop(self, key, default)
+        result = self.configurator.convert(value)
+        if value is not result:
+            if type(result) in (ConvertingDict, ConvertingList,
+                                ConvertingTuple):
+                result.parent = self
+                result.key = key
+        return result
+
+class ConvertingList(list):
+    """A converting list wrapper."""
+    def __getitem__(self, key):
+        value = list.__getitem__(self, key)
+        result = self.configurator.convert(value)
+        #If the converted value is different, save for next time
+        if value is not result:
+            self[key] = result
+            if type(result) in (ConvertingDict, ConvertingList,
+                                ConvertingTuple):
+                result.parent = self
+                result.key = key
+        return result
+
+    def pop(self, idx=-1):
+        value = list.pop(self, idx)
+        result = self.configurator.convert(value)
+        if value is not result:
+            if type(result) in (ConvertingDict, ConvertingList,
+                                ConvertingTuple):
+                result.parent = self
+        return result
+
+class ConvertingTuple(tuple):
+    """A converting tuple wrapper."""
+    def __getitem__(self, key):
+        value = tuple.__getitem__(self, key)
+        result = self.configurator.convert(value)
+        if value is not result:
+            if type(result) in (ConvertingDict, ConvertingList,
+                                ConvertingTuple):
+                result.parent = self
+                result.key = key
+        return result
+
+class BaseConfigurator(object):
+    """
+    The configurator base class which defines some useful defaults.
+    """
+    
+    CONVERT_PATTERN = re.compile(r'^(?P<prefix>[a-z]+)://(?P<suffix>.*)$')
+
+    WORD_PATTERN = re.compile(r'^\s*(\w+)\s*')
+    DOT_PATTERN = re.compile(r'^\.\s*(\w+)\s*')
+    INDEX_PATTERN = re.compile(r'^\[\s*(\w+)\s*\]\s*')
+    DIGIT_PATTERN = re.compile(r'^\d+$')
+
+    value_converters = {
+        'ext' : 'ext_convert',
+        'cfg' : 'cfg_convert',
+    }
+
+    # We might want to use a different one, e.g. importlib
+    importer = __import__
+    "Allows the importer to be redefined."
+
+    def __init__(self, config):
+        """
+        Initialise an instance with the specified configuration
+        dictionary.
+        """
+        self.config = ConvertingDict(config)
+        self.config.configurator = self
+
+    def resolve(self, s):
+        """
+        Resolve strings to objects using standard import and attribute
+        syntax.
+        """
+        name = s.split('.')
+        used = name.pop(0)
+        try:
+            found = self.importer(used)
+            for frag in name:
+                used += '.' + frag
+                try:
+                    found = getattr(found, frag)
+                except AttributeError:
+                    self.importer(used)
+                    found = getattr(found, frag)
+            return found
+        except ImportError:
+            e, tb = sys.exc_info()[1:]
+            v = ValueError('Cannot resolve %r: %s' % (s, e))
+            v.__cause__, v.__traceback__ = e, tb
+            raise v
+
+    def ext_convert(self, value):
+        """Default converter for the ext:// protocol."""
+        return self.resolve(value)
+    
+    def cfg_convert(self, value):
+        """Default converter for the cfg:// protocol."""
+        rest = value
+        m = self.WORD_PATTERN.match(rest)
+        if m is None:
+            raise ValueError("Unable to convert %r" % value)
+        else:
+            rest = rest[m.end():]
+            d = self.config[m.groups()[0]]
+            #print d, rest
+            while rest:
+                m = self.DOT_PATTERN.match(rest)
+                if m:
+                    d = d[m.groups()[0]]
+                else:
+                    m = self.INDEX_PATTERN.match(rest)
+                    if m:
+                        idx = m.groups()[0]
+                        if not self.DIGIT_PATTERN.match(idx):
+                            d = d[idx]
+                        else:
+                            try:
+                                n = int(idx) # try as number first (most likely)
+                                d = d[n]
+                            except TypeError:
+                                d = d[idx]
+                if m:
+                    rest = rest[m.end():]
+                else:
+                    raise ValueError('Unable to convert '
+                                     '%r at %r' % (value, rest))
+        #rest should be empty
+        return d
+
+    def convert(self, value):
+        """
+        Convert values to an appropriate type. dicts, lists and tuples are
+        replaced by their converting alternatives. Strings are checked to
+        see if they have a conversion format and are converted if they do.
+        """
+        if not isinstance(value, ConvertingDict) and isinstance(value, dict):
+            value = ConvertingDict(value)
+            value.configurator = self
+        elif not isinstance(value, ConvertingList) and isinstance(value, list):
+            value = ConvertingList(value)
+            value.configurator = self
+        elif not isinstance(value, ConvertingTuple) and\
+                 isinstance(value, tuple):
+            value = ConvertingTuple(value)
+            value.configurator = self
+        elif isinstance(value, basestring):
+            m = self.CONVERT_PATTERN.match(value)
+            if m:
+                d = m.groupdict()
+                prefix = d['prefix']
+                converter = self.value_converters.get(prefix, None)
+                if converter:
+                    suffix = d['suffix']
+                    converter = getattr(self, converter)
+                    value = converter(suffix)
+        return value
+    
+    def configure_custom(self, config):
+        """Configure an object with a user-supplied factory."""
+        c = config.pop('()')
+        if isinstance(c, basestring):
+            c = self.resolve(c)
+        props = config.pop('.', None)
+        # Check for valid identifiers
+        kwargs = dict([(k, config[k]) for k in config if valid_ident(k)])
+        result = c(**kwargs)
+        if props:
+            for name, value in props.items():
+                setattr(result, name, value)
+        return result
+
+    def as_tuple(self, value):
+        """Utility function which converts lists to tuples."""
+        if isinstance(value, list):
+            value = tuple(value)
+        return value
+
+def named_handlers_supported():
+    major, minor = sys.version_info[:2]
+    if major == 2:
+        result = minor >= 7
+    elif major == 3:
+        result = minor >= 2
+    else:
+        result = (major > 3)
+    return result
+    
+class DictConfigurator(BaseConfigurator):
+    """
+    Configure logging using a dictionary-like object to describe the
+    configuration.
+    """
+
+    def configure(self):
+        """Do the configuration."""
+
+        config = self.config
+        if 'version' not in config:
+            raise ValueError("dictionary doesn't specify a version")
+        if config['version'] != 1:
+            raise ValueError("Unsupported version: %s" % config['version'])
+        incremental = config.pop('incremental', False)
+        EMPTY_DICT = {}
+        logging._acquireLock()
+        try:
+            if incremental:
+                handlers = config.get('handlers', EMPTY_DICT)
+                # incremental handler config only if handler name
+                # ties in to logging._handlers (Python 2.7, 3.2+)
+                if named_handlers_supported():
+                    for name in handlers:
+                        if name not in logging._handlers:
+                            raise ValueError('No handler found with '
+                                             'name %r'  % name)
+                        else:
+                            try:
+                                handler = logging._handlers[name]
+                                handler_config = handlers[name]
+                                level = handler_config.get('level', None)
+                                if level:
+                                    handler.setLevel(_checkLevel(level))
+                            except StandardError:
+                                e = sys.exc_info()[1]
+                                raise ValueError('Unable to configure handler '
+                                                 '%r: %s' % (name, e))
+                loggers = config.get('loggers', EMPTY_DICT)
+                for name in loggers:
+                    try:
+                        self.configure_logger(name, loggers[name], True)
+                    except StandardError:
+                        e = sys.exc_info()[1]
+                        raise ValueError('Unable to configure logger '
+                                         '%r: %s' % (name, e))
+                root = config.get('root', None)
+                if root:
+                    try:
+                        self.configure_root(root, True)
+                    except StandardError:
+                        e = sys.exc_info()[1]
+                        raise ValueError('Unable to configure root '
+                                         'logger: %s' % e)
+            else:
+                disable_existing = config.pop('disable_existing_loggers', True)
+                
+                logging._handlers.clear()
+                del logging._handlerList[:]
+                    
+                # Do formatters first - they don't refer to anything else
+                formatters = config.get('formatters', EMPTY_DICT)
+                for name in formatters:
+                    try:
+                        formatters[name] = self.configure_formatter(
+                                                            formatters[name])
+                    except StandardError:
+                        e = sys.exc_info()[1]
+                        raise ValueError('Unable to configure '
+                                         'formatter %r: %s' % (name, e))
+                # Next, do filters - they don't refer to anything else, either
+                filters = config.get('filters', EMPTY_DICT)
+                for name in filters:
+                    try:
+                        filters[name] = self.configure_filter(filters[name])
+                    except StandardError:
+                        e = sys.exc_info()[1]
+                        raise ValueError('Unable to configure '
+                                         'filter %r: %s' % (name, e))
+
+                # Next, do handlers - they refer to formatters and filters
+                # As handlers can refer to other handlers, sort the keys
+                # to allow a deterministic order of configuration
+                handlers = config.get('handlers', EMPTY_DICT)
+                for name in sorted(handlers):
+                    try:
+                        handler = self.configure_handler(handlers[name])
+                        handler.name = name
+                        handlers[name] = handler
+                    except StandardError:
+                        e = sys.exc_info()[1]
+                        raise ValueError('Unable to configure handler '
+                                         '%r: %s' % (name, e))
+                # Next, do loggers - they refer to handlers and filters
+                
+                #we don't want to lose the existing loggers,
+                #since other threads may have pointers to them.
+                #existing is set to contain all existing loggers,
+                #and as we go through the new configuration we
+                #remove any which are configured. At the end,
+                #what's left in existing is the set of loggers
+                #which were in the previous configuration but
+                #which are not in the new configuration.
+                root = logging.root
+                existing = sorted(root.manager.loggerDict.keys())
+                #The list needs to be sorted so that we can
+                #avoid disabling child loggers of explicitly
+                #named loggers. With a sorted list it is easier
+                #to find the child loggers.
+                #We'll keep the list of existing loggers
+                #which are children of named loggers here...
+                child_loggers = []
+                #now set up the new ones...
+                loggers = config.get('loggers', EMPTY_DICT)
+                for name in loggers:
+                    if name in existing:
+                        i = existing.index(name)
+                        prefixed = name + "."
+                        pflen = len(prefixed)
+                        num_existing = len(existing)
+                        i = i + 1 # look at the entry after name
+                        while (i < num_existing) and\
+                              (existing[i][:pflen] == prefixed):
+                            child_loggers.append(existing[i])
+                            i = i + 1
+                        existing.remove(name)
+                    try:
+                        self.configure_logger(name, loggers[name])
+                    except StandardError:
+                        e = sys.exc_info()[1]
+                        raise ValueError('Unable to configure logger '
+                                         '%r: %s' % (name, e))
+                    
+                #Disable any old loggers. There's no point deleting
+                #them as other threads may continue to hold references
+                #and by disabling them, you stop them doing any logging.
+                #However, don't disable children of named loggers, as that's
+                #probably not what was intended by the user.
+                for log in existing:
+                    logger = root.manager.loggerDict[log]
+                    if log in child_loggers:
+                        logger.level = logging.NOTSET
+                        logger.handlers = []
+                        logger.propagate = True
+                    elif disable_existing:
+                        logger.disabled = True
+    
+                # And finally, do the root logger
+                root = config.get('root', None)
+                if root:
+                    try:
+                        self.configure_root(root)                        
+                    except StandardError:
+                        e = sys.exc_info()[1]
+                        raise ValueError('Unable to configure root '
+                                         'logger: %s' % e)
+        finally:
+            logging._releaseLock()
+
+    def configure_formatter(self, config):
+        """Configure a formatter from a dictionary."""
+        if '()' in config:
+            factory = config['()'] # for use in exception handler
+            try:
+                result = self.configure_custom(config)
+            except TypeError:
+                te = sys.exc_info()[1]
+                if "'format'" not in str(te):
+                    raise
+                #Name of parameter changed from fmt to format.
+                #Retry with old name.
+                #This is so that code can be used with older Python versions
+                #(e.g. by Django)
+                config['fmt'] = config.pop('format')
+                config['()'] = factory
+                result = self.configure_custom(config)
+        else:
+            fmt = config.get('format', None)
+            dfmt = config.get('datefmt', None)
+            result = logging.Formatter(fmt, dfmt)
+        return result
+    
+    def configure_filter(self, config):
+        """Configure a filter from a dictionary."""
+        if '()' in config:
+            result = self.configure_custom(config)
+        else:
+            name = config.get('name', '')
+            result = logging.Filter(name)
+        return result
+
+    def add_filters(self, filterer, filters):
+        """Add filters to a filterer from a list of names."""
+        for f in filters:
+            try:
+                filterer.addFilter(self.config['filters'][f])
+            except StandardError:
+                e = sys.exc_info()[1]
+                raise ValueError('Unable to add filter %r: %s' % (f, e))
+
+    def configure_handler(self, config):
+        """Configure a handler from a dictionary."""
+        formatter = config.pop('formatter', None)
+        if formatter:
+            try:
+                formatter = self.config['formatters'][formatter]
+            except StandardError:
+                e = sys.exc_info()[1]
+                raise ValueError('Unable to set formatter '
+                                 '%r: %s' % (formatter, e))
+        level = config.pop('level', None)
+        filters = config.pop('filters', None)
+        if '()' in config:
+            c = config.pop('()')
+            if isinstance(c, basestring):
+                c = self.resolve(c)
+            factory = c
+        else:
+            klass = self.resolve(config.pop('class'))
+            #Special case for handler which refers to another handler
+            if issubclass(klass, logging.handlers.MemoryHandler) and\
+                'target' in config:
+                try:
+                    config['target'] = self.config['handlers'][config['target']]
+                except StandardError:
+                    e = sys.exc_info()[1]
+                    raise ValueError('Unable to set target handler '
+                                     '%r: %s' % (config['target'], e))
+            elif issubclass(klass, logging.handlers.SMTPHandler) and\
+                'mailhost' in config:
+                config['mailhost'] = self.as_tuple(config['mailhost'])
+            elif issubclass(klass, logging.handlers.SysLogHandler) and\
+                'address' in config:
+                config['address'] = self.as_tuple(config['address'])
+            factory = klass
+        kwargs = dict([(k, config[k]) for k in config if valid_ident(k)])
+        try:
+            result = factory(**kwargs)
+        except TypeError:
+            te = sys.exc_info()[1]
+            if "'stream'" not in str(te):
+                raise
+            #The argument name changed from strm to stream
+            #Retry with old name.
+            #This is so that code can be used with older Python versions
+            #(e.g. by Django)
+            kwargs['strm'] = kwargs.pop('stream')
+            result = factory(**kwargs)
+        if formatter:
+            result.setFormatter(formatter)
+        if level is not None:
+            result.setLevel(_checkLevel(level))
+        if filters:
+            self.add_filters(result, filters)
+        return result
+
+    def add_handlers(self, logger, handlers):
+        """Add handlers to a logger from a list of names."""
+        for h in handlers:
+            try:
+                logger.addHandler(self.config['handlers'][h])
+            except StandardError:
+                e = sys.exc_info()[1]
+                raise ValueError('Unable to add handler %r: %s' % (h, e))
+
+    def common_logger_config(self, logger, config, incremental=False):
+        """
+        Perform configuration which is common to root and non-root loggers.
+        """
+        level = config.get('level', None)
+        if level is not None:
+            logger.setLevel(_checkLevel(level))
+        if not incremental:
+            #Remove any existing handlers
+            for h in logger.handlers[:]:
+                logger.removeHandler(h)
+            handlers = config.get('handlers', None)
+            if handlers:
+                self.add_handlers(logger, handlers)
+            filters = config.get('filters', None)
+            if filters:
+                self.add_filters(logger, filters)
+        
+    def configure_logger(self, name, config, incremental=False):
+        """Configure a non-root logger from a dictionary."""
+        logger = logging.getLogger(name)
+        self.common_logger_config(logger, config, incremental)
+        propagate = config.get('propagate', None)
+        if propagate is not None:
+            logger.propagate = propagate
+            
+    def configure_root(self, config, incremental=False):
+        """Configure a root logger from a dictionary."""
+        root = logging.getLogger()
+        self.common_logger_config(root, config, incremental)
+
+dictConfigClass = DictConfigurator
+
+def dictConfig(config):
+    """Configure logging using a dictionary."""
+    dictConfigClass(config).configure()
diff --git a/lib/logutils/http.py b/lib/logutils/http.py
new file mode 100644
index 00000000..5d145c37
--- /dev/null
+++ b/lib/logutils/http.py
@@ -0,0 +1,90 @@
+#
+# Copyright (C) 2010-2013 Vinay Sajip. See LICENSE.txt for details.
+#
+import logging
+
+class HTTPHandler(logging.Handler):
+    """
+    A class which sends records to a Web server, using either GET or
+    POST semantics.
+
+    :param host: The Web server to connect to.
+    :param url: The URL to use for the connection.
+    :param method: The HTTP method to use. GET and POST are supported.
+    :param secure: set to True if HTTPS is to be used.
+    :param credentials: Set to a username/password tuple if desired. If
+                        set, a Basic authentication header is sent. WARNING:
+                        if using credentials, make sure `secure` is `True`
+                        to avoid sending usernames and passwords in
+                        cleartext over the wire.
+    """
+    def __init__(self, host, url, method="GET", secure=False, credentials=None):
+        """
+        Initialize an instance.
+        """
+        logging.Handler.__init__(self)
+        method = method.upper()
+        if method not in ["GET", "POST"]:
+            raise ValueError("method must be GET or POST")
+        self.host = host
+        self.url = url
+        self.method = method
+        self.secure = secure
+        self.credentials = credentials
+
+    def mapLogRecord(self, record):
+        """
+        Default implementation of mapping the log record into a dict
+        that is sent as the CGI data. Overwrite in your class.
+        Contributed by Franz Glasner.
+        
+        :param record: The record to be mapped.
+        """
+        return record.__dict__
+
+    def emit(self, record):
+        """
+        Emit a record.
+
+        Send the record to the Web server as a percent-encoded dictionary
+
+        :param record: The record to be emitted.
+        """
+        try:
+            import http.client, urllib.parse
+            host = self.host
+            if self.secure:
+                h = http.client.HTTPSConnection(host)
+            else:
+                h = http.client.HTTPConnection(host)
+            url = self.url
+            data = urllib.parse.urlencode(self.mapLogRecord(record))
+            if self.method == "GET":
+                if (url.find('?') >= 0):
+                    sep = '&'
+                else:
+                    sep = '?'
+                url = url + "%c%s" % (sep, data)
+            h.putrequest(self.method, url)
+            # support multiple hosts on one IP address...
+            # need to strip optional :port from host, if present
+            i = host.find(":")
+            if i >= 0:
+                host = host[:i]
+            h.putheader("Host", host)
+            if self.method == "POST":
+                h.putheader("Content-type",
+                            "application/x-www-form-urlencoded")
+                h.putheader("Content-length", str(len(data)))
+            if self.credentials:
+                import base64
+                s = ('u%s:%s' % self.credentials).encode('utf-8')
+                s = 'Basic ' + base64.b64encode(s).strip()
+                h.putheader('Authorization', s)
+            h.endheaders(data if self.method == "POST" else None)
+            h.getresponse()    #can't do anything with the result
+        except (KeyboardInterrupt, SystemExit):
+            raise
+        except:
+            self.handleError(record)
+
diff --git a/lib/logutils/queue.py b/lib/logutils/queue.py
new file mode 100644
index 00000000..cced8c55
--- /dev/null
+++ b/lib/logutils/queue.py
@@ -0,0 +1,225 @@
+#
+# Copyright (C) 2010-2013 Vinay Sajip. See LICENSE.txt for details.
+#
+"""
+This module contains classes which help you work with queues. A typical
+application is when you want to log from performance-critical threads, but
+where the handlers you want to use are slow (for example,
+:class:`~logging.handlers.SMTPHandler`). In that case, you can create a queue,
+pass it to a :class:`QueueHandler` instance and use that instance with your
+loggers. Elsewhere, you can instantiate a :class:`QueueListener` with the same
+queue and some slow handlers, and call :meth:`~QueueListener.start` on it.
+This will start monitoring the queue on a separate thread and call all the
+configured handlers *on that thread*, so that your logging thread is not held
+up by the slow handlers.
+
+Note that as well as in-process queues, you can use these classes with queues
+from the :mod:`multiprocessing` module.
+
+**N.B.** This is part of the standard library since Python 3.2, so the
+version here is for use with earlier Python versions.
+"""
+import logging
+try:
+    import Queue as queue
+except ImportError:
+    import queue
+import threading
+
+class QueueHandler(logging.Handler):
+    """
+    This handler sends events to a queue. Typically, it would be used together
+    with a multiprocessing Queue to centralise logging to file in one process
+    (in a multi-process application), so as to avoid file write contention
+    between processes.
+    
+    :param queue: The queue to send `LogRecords` to.
+    """
+
+    def __init__(self, queue):
+        """
+        Initialise an instance, using the passed queue.
+        """
+        logging.Handler.__init__(self)
+        self.queue = queue
+
+    def enqueue(self, record):
+        """
+        Enqueue a record.
+
+        The base implementation uses :meth:`~queue.Queue.put_nowait`. You may
+        want to override this method if you want to use blocking, timeouts or
+        custom queue implementations.
+        
+        :param record: The record to enqueue.
+        """
+        self.queue.put_nowait(record)
+
+    def prepare(self, record):
+        """
+        Prepares a record for queuing. The object returned by this method is
+        enqueued.
+
+        The base implementation formats the record to merge the message
+        and arguments, and removes unpickleable items from the record
+        in-place.
+
+        You might want to override this method if you want to convert
+        the record to a dict or JSON string, or send a modified copy
+        of the record while leaving the original intact.
+        
+        :param record: The record to prepare.
+        """
+        # The format operation gets traceback text into record.exc_text
+        # (if there's exception data), and also puts the message into
+        # record.message. We can then use this to replace the original
+        # msg + args, as these might be unpickleable. We also zap the
+        # exc_info attribute, as it's no longer needed and, if not None,
+        # will typically not be pickleable.
+        self.format(record)
+        record.msg = record.message
+        record.args = None
+        record.exc_info = None
+        return record
+
+    def emit(self, record):
+        """
+        Emit a record.
+
+        Writes the LogRecord to the queue, preparing it for pickling first.
+        
+        :param record: The record to emit.
+        """
+        try:
+            self.enqueue(self.prepare(record))
+        except (KeyboardInterrupt, SystemExit):
+            raise
+        except:
+            self.handleError(record)
+
+class QueueListener(object):
+    """
+    This class implements an internal threaded listener which watches for
+    LogRecords being added to a queue, removes them and passes them to a
+    list of handlers for processing.
+            
+    :param record: The queue to listen to.
+    :param handlers: The handlers to invoke on everything received from
+                     the queue.
+    """
+    _sentinel = None
+
+    def __init__(self, queue, *handlers):
+        """
+        Initialise an instance with the specified queue and
+        handlers.
+        """
+        self.queue = queue
+        self.handlers = handlers
+        self._stop = threading.Event()
+        self._thread = None
+
+    def dequeue(self, block):
+        """
+        Dequeue a record and return it, optionally blocking.
+
+        The base implementation uses :meth:`~queue.Queue.get`. You may want to
+        override this method if you want to use timeouts or work with custom
+        queue implementations.
+        
+        :param block: Whether to block if the queue is empty. If `False` and
+                      the queue is empty, an :class:`~queue.Empty` exception
+                      will be thrown.
+        """
+        return self.queue.get(block)
+
+    def start(self):
+        """
+        Start the listener.
+
+        This starts up a background thread to monitor the queue for
+        LogRecords to process.
+        """
+        self._thread = t = threading.Thread(target=self._monitor)
+        t.setDaemon(True)
+        t.start()
+
+    def prepare(self , record):
+        """
+        Prepare a record for handling.
+
+        This method just returns the passed-in record. You may want to
+        override this method if you need to do any custom marshalling or
+        manipulation of the record before passing it to the handlers.
+        
+        :param record: The record to prepare.
+        """
+        return record
+
+    def handle(self, record):
+        """
+        Handle a record.
+
+        This just loops through the handlers offering them the record
+        to handle.
+
+        :param record: The record to handle.
+        """
+        record = self.prepare(record)
+        for handler in self.handlers:
+            handler.handle(record)
+
+    def _monitor(self):
+        """
+        Monitor the queue for records, and ask the handler
+        to deal with them.
+
+        This method runs on a separate, internal thread.
+        The thread will terminate if it sees a sentinel object in the queue.
+        """
+        q = self.queue
+        has_task_done = hasattr(q, 'task_done')
+        while not self._stop.isSet():
+            try:
+                record = self.dequeue(True)
+                if record is self._sentinel:
+                    break
+                self.handle(record)
+                if has_task_done:
+                    q.task_done()
+            except queue.Empty:
+                pass
+        # There might still be records in the queue.
+        while True:
+            try:
+                record = self.dequeue(False)
+                if record is self._sentinel:
+                    break
+                self.handle(record)
+                if has_task_done:
+                    q.task_done()
+            except queue.Empty:
+                break
+
+    def enqueue_sentinel(self):
+        """
+        Writes a sentinel to the queue to tell the listener to quit. This
+        implementation uses ``put_nowait()``.  You may want to override this
+        method if you want to use timeouts or work with custom queue
+        implementations.
+        """
+        self.queue.put_nowait(self._sentinel)
+
+    def stop(self):
+        """
+        Stop the listener.
+
+        This asks the thread to terminate, and then waits for it to do so.
+        Note that if you don't call this before your application exits, there
+        may be some records still left on the queue, which won't be processed.
+        """
+        self._stop.set()
+        self.enqueue_sentinel()
+        self._thread.join()
+        self._thread = None
+
diff --git a/lib/logutils/redis.py b/lib/logutils/redis.py
new file mode 100644
index 00000000..0fea2d1e
--- /dev/null
+++ b/lib/logutils/redis.py
@@ -0,0 +1,75 @@
+#
+# Copyright (C) 2011-2013 Vinay Sajip. See LICENSE.txt for details.
+#
+"""
+This module contains classes which help you work with Redis queues.
+"""
+
+from logutils.queue import QueueHandler, QueueListener
+try:
+    import cPickle as pickle
+except ImportError:
+    import pickle
+
+class RedisQueueHandler(QueueHandler):
+    """
+    A QueueHandler implementation which pushes pickled
+    records to a Redis queue using a specified key.
+    
+    :param key: The key to use for the queue. Defaults to
+                "python.logging".
+    :param redis: If specified, this instance is used to
+                  communicate with a Redis instance.
+    :param limit: If specified, the queue is restricted to
+                  have only this many elements.
+    """
+    def __init__(self, key='python.logging', redis=None, limit=0):
+        if redis is None:
+            from redis import Redis
+            redis = Redis()
+        self.key = key
+        assert limit >= 0
+        self.limit = limit
+        QueueHandler.__init__(self, redis)
+        
+    def enqueue(self, record):
+        s = pickle.dumps(vars(record))
+        self.queue.rpush(self.key, s)
+        if self.limit:
+            self.queue.ltrim(self.key, -self.limit, -1)
+
+class RedisQueueListener(QueueListener):
+    """
+    A QueueListener implementation which fetches pickled
+    records from a Redis queue using a specified key.
+    
+    :param key: The key to use for the queue. Defaults to
+                "python.logging".
+    :param redis: If specified, this instance is used to
+                  communicate with a Redis instance.
+    """
+    def __init__(self, *handlers, **kwargs):
+        redis = kwargs.get('redis')
+        if redis is None:
+            from redis import Redis
+            redis = Redis()
+        self.key = kwargs.get('key', 'python.logging')
+        QueueListener.__init__(self, redis, *handlers)
+
+    def dequeue(self, block):
+        """
+        Dequeue and return a record.
+        """
+        if block:
+            s = self.queue.blpop(self.key)[1]
+        else:
+            s = self.queue.lpop(self.key)        
+        if not s:
+            record = None
+        else:
+            record = pickle.loads(s)
+        return record
+
+    def enqueue_sentinel(self):
+        self.queue.rpush(self.key, '')
+
diff --git a/lib/logutils/testing.py b/lib/logutils/testing.py
new file mode 100644
index 00000000..dfc8d212
--- /dev/null
+++ b/lib/logutils/testing.py
@@ -0,0 +1,156 @@
+#
+# Copyright (C) 2010-2013 Vinay Sajip. See LICENSE.txt for details.
+#
+import logging
+from logging.handlers import BufferingHandler
+
+class TestHandler(BufferingHandler):
+    """
+    This handler collects records in a buffer for later inspection by
+    your unit test code.
+    
+    :param matcher: The :class:`~logutils.testing.Matcher` instance to
+                    use for matching.
+    """
+    def __init__(self, matcher):
+        # BufferingHandler takes a "capacity" argument
+        # so as to know when to flush. As we're overriding
+        # shouldFlush anyway, we can set a capacity of zero.
+        # You can call flush() manually to clear out the
+        # buffer.
+        BufferingHandler.__init__(self, 0)
+        self.formatted = []
+        self.matcher = matcher
+
+    def shouldFlush(self):
+        """
+        Should the buffer be flushed?
+
+        This returns `False` - you'll need to flush manually, usually after
+        your unit test code checks the buffer contents against your
+        expectations.
+        """
+        return False
+
+    def emit(self, record):
+        """
+        Saves the `__dict__` of the record in the `buffer` attribute,
+        and the formatted records in the `formatted` attribute.
+
+        :param record: The record to emit.
+        """
+        self.formatted.append(self.format(record))
+        self.buffer.append(record.__dict__)
+
+    def flush(self):
+        """
+        Clears out the `buffer` and `formatted` attributes.
+        """
+        BufferingHandler.flush(self)
+        self.formatted = []
+
+    def matches(self, **kwargs):
+        """
+        Look for a saved dict whose keys/values match the supplied arguments.
+
+        Return `True` if found, else `False`.
+        
+        :param kwargs: A set of keyword arguments whose names are LogRecord
+                       attributes and whose values are what you want to 
+                       match in a stored LogRecord.
+        """
+        result = False
+        for d in self.buffer:
+            if self.matcher.matches(d, **kwargs):
+                result = True
+                break
+        #if not result:
+        #    print('*** matcher failed completely on %d records' % len(self.buffer))
+        return result
+
+    def matchall(self, kwarglist):
+        """
+        Accept a list of keyword argument values and ensure that the handler's
+        buffer of stored records matches the list one-for-one.
+
+        Return `True` if exactly matched, else `False`.
+        
+        :param kwarglist: A list of keyword-argument dictionaries, each of
+                          which will be passed to :meth:`matches` with the
+                          corresponding record from the buffer.
+        """
+        if self.count != len(kwarglist):
+            result = False
+        else:
+            result = True
+            for d, kwargs in zip(self.buffer, kwarglist):
+                if not self.matcher.matches(d, **kwargs):
+                    result = False
+                    break
+        return result
+
+    @property
+    def count(self):
+        """
+        The number of records in the buffer.
+        """
+        return len(self.buffer)
+
+class Matcher(object):
+    """
+    This utility class matches a stored dictionary of
+    :class:`logging.LogRecord` attributes with keyword arguments
+    passed to its :meth:`~logutils.testing.Matcher.matches` method.
+    """
+    
+    _partial_matches = ('msg', 'message')
+    """
+    A list of :class:`logging.LogRecord` attribute names which
+    will be checked for partial matches. If not in this list,
+    an exact match will be attempted.
+    """
+    
+    def matches(self, d, **kwargs):
+        """
+        Try to match a single dict with the supplied arguments.
+
+        Keys whose values are strings and which are in self._partial_matches
+        will be checked for partial (i.e. substring) matches. You can extend
+        this scheme to (for example) do regular expression matching, etc.
+        
+        Return `True` if found, else `False`.
+
+        :param kwargs: A set of keyword arguments whose names are LogRecord
+                       attributes and whose values are what you want to 
+                       match in a stored LogRecord.
+        """
+        result = True
+        for k in kwargs:
+            v = kwargs[k]
+            dv = d.get(k)
+            if not self.match_value(k, dv, v):
+                #print('*** matcher failed: %s, %r, %r' % (k, dv, v))
+                result = False
+                break
+        return result
+
+    def match_value(self, k, dv, v):
+        """
+        Try to match a single stored value (dv) with a supplied value (v).
+
+        Return `True` if found, else `False`.
+
+        :param k: The key value (LogRecord attribute name).
+        :param dv: The stored value to match against.
+        :param v: The value to compare with the stored value.
+        """
+        if type(v) != type(dv):
+            result = False
+        elif type(dv) is not str or k not in self._partial_matches:
+            result = (v == dv)
+        else:
+            result = dv.find(v) >= 0
+        #if not result:
+        #    print('*** matcher failed on %s: %r vs. %r' % (k, dv, v))
+        return result
+
diff --git a/lib/mako/LICENSE b/lib/mako/LICENSE
new file mode 100644
index 00000000..24eefa1f
--- /dev/null
+++ b/lib/mako/LICENSE
@@ -0,0 +1,20 @@
+This is the MIT license: http://www.opensource.org/licenses/mit-license.php
+
+Copyright (C) 2006-2015 the Mako authors and contributors <see AUTHORS file>.
+Mako is a trademark of Michael Bayer.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the "Software"), to deal in the Software
+without restriction, including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/lib/mako/README.rst b/lib/mako/README.rst
new file mode 100644
index 00000000..8da9d697
--- /dev/null
+++ b/lib/mako/README.rst
@@ -0,0 +1,52 @@
+=========================
+Mako Templates for Python
+=========================
+
+Mako is a template library written in Python. It provides a familiar, non-XML 
+syntax which compiles into Python modules for maximum performance. Mako's 
+syntax and API borrows from the best ideas of many others, including Django
+templates, Cheetah, Myghty, and Genshi. Conceptually, Mako is an embedded 
+Python (i.e. Python Server Page) language, which refines the familiar ideas
+of componentized layout and inheritance to produce one of the most 
+straightforward and flexible models available, while also maintaining close 
+ties to Python calling and scoping semantics.
+
+Nutshell
+========
+
+::
+
+    <%inherit file="base.html"/>
+    <%
+        rows = [[v for v in range(0,10)] for row in range(0,10)]
+    %>
+    <table>
+        % for row in rows:
+            ${makerow(row)}
+        % endfor
+    </table>
+
+    <%def name="makerow(row)">
+        <tr>
+        % for name in row:
+            <td>${name}</td>\
+        % endfor
+        </tr>
+    </%def>
+
+Philosophy
+===========
+
+Python is a great scripting language. Don't reinvent the wheel...your templates can handle it !
+
+Documentation
+==============
+
+See documentation for Mako at http://www.makotemplates.org/docs/
+
+License
+========
+
+Mako is licensed under an MIT-style license (see LICENSE).
+Other incorporated projects may be licensed under different licenses.
+All licenses allow for non-commercial and commercial use.
diff --git a/lib/mako/__init__.py b/lib/mako/__init__.py
index d7223f7c..d9638481 100644
--- a/lib/mako/__init__.py
+++ b/lib/mako/__init__.py
@@ -1,8 +1,8 @@
 # mako/__init__.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright (C) 2006-2015 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 
-__version__ = "1.3.6"
+__version__ = '1.0.1'
diff --git a/lib/mako/_ast_util.py b/lib/mako/_ast_util.py
index 63b8f228..efbc4fc2 100644
--- a/lib/mako/_ast_util.py
+++ b/lib/mako/_ast_util.py
@@ -1,5 +1,5 @@
 # mako/_ast_util.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright (C) 2006-2015 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
@@ -8,76 +8,69 @@
     ast
     ~~~
 
-    This is a stripped down version of Armin Ronacher's ast module.
+    The `ast` module helps Python applications to process trees of the Python
+    abstract syntax grammar.  The abstract syntax itself might change with
+    each Python release; this module helps to find out programmatically what
+    the current grammar looks like and allows modifications of it.
+
+    An abstract syntax tree can be generated by passing `ast.PyCF_ONLY_AST` as
+    a flag to the `compile()` builtin function or by using the `parse()`
+    function from this module.  The result will be a tree of objects whose
+    classes all inherit from `ast.AST`.
+
+    A modified abstract syntax tree can be compiled into a Python code object
+    using the built-in `compile()` function.
+
+    Additionally various helper functions are provided that make working with
+    the trees simpler.  The main intention of the helper functions and this
+    module in general is to provide an easy to use interface for libraries
+    that work tightly with the python syntax (template engines for example).
+
 
     :copyright: Copyright 2008 by Armin Ronacher.
     :license: Python License.
 """
+from _ast import *
+from mako.compat import arg_stringname
 
-
-from _ast import Add
-from _ast import And
-from _ast import AST
-from _ast import BitAnd
-from _ast import BitOr
-from _ast import BitXor
-from _ast import Div
-from _ast import Eq
-from _ast import FloorDiv
-from _ast import Gt
-from _ast import GtE
-from _ast import If
-from _ast import In
-from _ast import Invert
-from _ast import Is
-from _ast import IsNot
-from _ast import LShift
-from _ast import Lt
-from _ast import LtE
-from _ast import Mod
-from _ast import Mult
-from _ast import Name
-from _ast import Not
-from _ast import NotEq
-from _ast import NotIn
-from _ast import Or
-from _ast import PyCF_ONLY_AST
-from _ast import RShift
-from _ast import Sub
-from _ast import UAdd
-from _ast import USub
-
-
-BOOLOP_SYMBOLS = {And: "and", Or: "or"}
+BOOLOP_SYMBOLS = {
+    And: 'and',
+    Or: 'or'
+}
 
 BINOP_SYMBOLS = {
-    Add: "+",
-    Sub: "-",
-    Mult: "*",
-    Div: "/",
-    FloorDiv: "//",
-    Mod: "%",
-    LShift: "<<",
-    RShift: ">>",
-    BitOr: "|",
-    BitAnd: "&",
-    BitXor: "^",
+    Add: '+',
+    Sub: '-',
+    Mult: '*',
+    Div: '/',
+    FloorDiv: '//',
+    Mod: '%',
+    LShift: '<<',
+    RShift: '>>',
+    BitOr: '|',
+    BitAnd: '&',
+    BitXor: '^'
 }
 
 CMPOP_SYMBOLS = {
-    Eq: "==",
-    Gt: ">",
-    GtE: ">=",
-    In: "in",
-    Is: "is",
-    IsNot: "is not",
-    Lt: "<",
-    LtE: "<=",
-    NotEq: "!=",
-    NotIn: "not in",
+    Eq: '==',
+    Gt: '>',
+    GtE: '>=',
+    In: 'in',
+    Is: 'is',
+    IsNot: 'is not',
+    Lt: '<',
+    LtE: '<=',
+    NotEq: '!=',
+    NotIn: 'not in'
 }
 
-UNARYOP_SYMBOLS = {Invert: "~", Not: "not", UAdd: "+", USub: "-"}
+UNARYOP_SYMBOLS = {
+    Invert: '~',
+    Not: 'not',
+    UAdd: '+',
+    USub: '-'
+}
 
 ALL_SYMBOLS = {}
 ALL_SYMBOLS.update(BOOLOP_SYMBOLS)
@@ -86,14 +79,106 @@ ALL_SYMBOLS.update(CMPOP_SYMBOLS)
 ALL_SYMBOLS.update(UNARYOP_SYMBOLS)
 
 
-def parse(expr, filename="<unknown>", mode="exec"):
+def parse(expr, filename='<unknown>', mode='exec'):
     """Parse an expression into an AST node."""
     return compile(expr, filename, mode, PyCF_ONLY_AST)
 
 
+def to_source(node, indent_with=' ' * 4):
+    """
+    This function can convert a node tree back into python sourcecode.  This
+    is useful for debugging purposes, especially if you're dealing with custom
+    asts not generated by python itself.
+
+    It could be that the sourcecode is evaluable when the AST itself is not
+    compilable / evaluable.  The reason for this is that the AST contains some
+    more data than regular sourcecode does, which is dropped during
+    conversion.
+
+    Each level of indentation is replaced with `indent_with`.  Per default this
+    parameter is equal to four spaces as suggested by PEP 8, but it might be
+    adjusted to match the application's styleguide.
+    """
+    generator = SourceGenerator(indent_with)
+    generator.visit(node)
+    return ''.join(generator.result)
+
+
+def dump(node):
+    """
+    A very verbose representation of the node passed.  This is useful for
+    debugging purposes.
+    """
+    def _format(node):
+        if isinstance(node, AST):
+            return '%s(%s)' % (node.__class__.__name__,
+                               ', '.join('%s=%s' % (a, _format(b))
+                                         for a, b in iter_fields(node)))
+        elif isinstance(node, list):
+            return '[%s]' % ', '.join(_format(x) for x in node)
+        return repr(node)
+    if not isinstance(node, AST):
+        raise TypeError('expected AST, got %r' % node.__class__.__name__)
+    return _format(node)
+
+
+def copy_location(new_node, old_node):
+    """
+    Copy the source location hint (`lineno` and `col_offset`) from the
+    old to the new node if possible and return the new one.
+    """
+    for attr in 'lineno', 'col_offset':
+        if attr in old_node._attributes and attr in new_node._attributes \
+           and hasattr(old_node, attr):
+            setattr(new_node, attr, getattr(old_node, attr))
+    return new_node
+
+
+def fix_missing_locations(node):
+    """
+    Some nodes require a line number and the column offset.  Without that
+    information the compiler will abort the compilation.  Because it can be
+    a dull task to add appropriate line numbers and column offsets when
+    adding new nodes this function can help.  It copies the line number and
+    column offset of the parent node to the child nodes without this
+    information.
+
+    Unlike `copy_location` this works recursive and won't touch nodes that
+    already have a location information.
+    """
+    def _fix(node, lineno, col_offset):
+        if 'lineno' in node._attributes:
+            if not hasattr(node, 'lineno'):
+                node.lineno = lineno
+            else:
+                lineno = node.lineno
+        if 'col_offset' in node._attributes:
+            if not hasattr(node, 'col_offset'):
+                node.col_offset = col_offset
+            else:
+                col_offset = node.col_offset
+        for child in iter_child_nodes(node):
+            _fix(child, lineno, col_offset)
+    _fix(node, 1, 0)
+    return node
+
+
+def increment_lineno(node, n=1):
+    """
+    Increment the line numbers of all nodes by `n` if they have line number
+    attributes.  This is useful to "move code" to a different location in a
+    file.
+    """
+    for node in zip((node,), walk(node)):
+        if 'lineno' in node._attributes:
+            node.lineno = getattr(node, 'lineno', 0) + n
+
+
 def iter_fields(node):
     """Iterate over all fields of a node, only yielding existing fields."""
-
+    # CPython 2.5 compat
+    if not hasattr(node, '_fields') or not node._fields:
+        return
     for field in node._fields:
         try:
             yield field, getattr(node, field)
@@ -101,8 +186,66 @@ def iter_fields(node):
             pass
 
 
-class NodeVisitor:
+def get_fields(node):
+    """Like `iter_fiels` but returns a dict."""
+    return dict(iter_fields(node))
 
+
+def iter_child_nodes(node):
+    """Iterate over all child nodes or a node."""
+    for name, field in iter_fields(node):
+        if isinstance(field, AST):
+            yield field
+        elif isinstance(field, list):
+            for item in field:
+                if isinstance(item, AST):
+                    yield item
+
+
+def get_child_nodes(node):
+    """Like `iter_child_nodes` but returns a list."""
+    return list(iter_child_nodes(node))
+
+
+def get_compile_mode(node):
+    """
+    Get the mode for `compile` of a given node.  If the node is not a `mod`
+    node (`Expression`, `Module` etc.) a `TypeError` is thrown.
+    """
+    if not isinstance(node, mod):
+        raise TypeError('expected mod node, got %r' % node.__class__.__name__)
+    return {
+        Expression: 'eval',
+        Interactive: 'single'
+    }.get(node.__class__, 'expr')
+
+
+def get_docstring(node):
+    """
+    Return the docstring for the given node or `None` if no docstring can be
+    found.  If the node provided does not accept docstrings a `TypeError`
+    will be raised.
+    """
+    if not isinstance(node, (FunctionDef, ClassDef, Module)):
+        raise TypeError("%r can't have docstrings" % node.__class__.__name__)
+    if node.body and isinstance(node.body[0], Str):
+        return node.body[0].s
+
+
+def walk(node):
+    """
+    Iterate over all nodes.  This is useful if you only want to modify nodes in
+    place and don't care about the context or the order the nodes are returned.
+    """
+    from collections import deque
+    todo = deque([node])
+    while todo:
+        node = todo.popleft()
+        todo.extend(iter_child_nodes(node))
+        yield node
+
+
+class NodeVisitor(object):
     """
     Walks the abstract syntax tree and call visitor functions for every node
     found.  The visitor functions may return values which will be forwarded
@@ -125,7 +268,7 @@ class NodeVisitor:
         exists for this node.  In that case the generic visit function is
         used instead.
         """
-        method = "visit_" + node.__class__.__name__
+        method = 'visit_' + node.__class__.__name__
         return getattr(self, method, None)
 
     def visit(self, node):
@@ -147,7 +290,6 @@ class NodeVisitor:
 
 
 class NodeTransformer(NodeVisitor):
-
     """
     Walks the abstract syntax tree and allows modifications of nodes.
 
@@ -207,7 +349,6 @@ class NodeTransformer(NodeVisitor):
 
 
 class SourceGenerator(NodeVisitor):
-
     """
     This visitor is able to transform a well formed syntax tree into python
     sourcecode.  For more details have a look at the docstring of the
@@ -223,7 +364,7 @@ class SourceGenerator(NodeVisitor):
     def write(self, x):
         if self.new_lines:
             if self.result:
-                self.result.append("\n" * self.new_lines)
+                self.result.append('\n' * self.new_lines)
             self.result.append(self.indent_with * self.indentation)
             self.new_lines = 0
         self.result.append(x)
@@ -242,15 +383,14 @@ class SourceGenerator(NodeVisitor):
         self.body(node.body)
         if node.orelse:
             self.newline()
-            self.write("else:")
+            self.write('else:')
             self.body(node.orelse)
 
     def signature(self, node):
         want_comma = []
-
         def write_comma():
             if want_comma:
-                self.write(", ")
+                self.write(', ')
             else:
                 want_comma.append(True)
 
@@ -259,19 +399,19 @@ class SourceGenerator(NodeVisitor):
             write_comma()
             self.visit(arg)
             if default is not None:
-                self.write("=")
+                self.write('=')
                 self.visit(default)
         if node.vararg is not None:
             write_comma()
-            self.write("*" + node.vararg.arg)
+            self.write('*' + arg_stringname(node.vararg))
         if node.kwarg is not None:
             write_comma()
-            self.write("**" + node.kwarg.arg)
+            self.write('**' + arg_stringname(node.kwarg))
 
     def decorators(self, node):
         for decorator in node.decorator_list:
             self.newline()
-            self.write("@")
+            self.write('@')
             self.visit(decorator)
 
     # Statements
@@ -280,29 +420,29 @@ class SourceGenerator(NodeVisitor):
         self.newline()
         for idx, target in enumerate(node.targets):
             if idx:
-                self.write(", ")
+                self.write(', ')
             self.visit(target)
-        self.write(" = ")
+        self.write(' = ')
         self.visit(node.value)
 
     def visit_AugAssign(self, node):
         self.newline()
         self.visit(node.target)
-        self.write(BINOP_SYMBOLS[type(node.op)] + "=")
+        self.write(BINOP_SYMBOLS[type(node.op)] + '=')
         self.visit(node.value)
 
     def visit_ImportFrom(self, node):
         self.newline()
-        self.write("from %s%s import " % ("." * node.level, node.module))
+        self.write('from %s%s import ' % ('.' * node.level, node.module))
         for idx, item in enumerate(node.names):
             if idx:
-                self.write(", ")
+                self.write(', ')
             self.write(item)
 
     def visit_Import(self, node):
         self.newline()
         for item in node.names:
-            self.write("import ")
+            self.write('import ')
             self.visit(item)
 
     def visit_Expr(self, node):
@@ -313,210 +453,208 @@ class SourceGenerator(NodeVisitor):
         self.newline(n=2)
         self.decorators(node)
         self.newline()
-        self.write("def %s(" % node.name)
+        self.write('def %s(' % node.name)
         self.signature(node.args)
-        self.write("):")
+        self.write('):')
         self.body(node.body)
 
     def visit_ClassDef(self, node):
         have_args = []
-
         def paren_or_comma():
             if have_args:
-                self.write(", ")
+                self.write(', ')
             else:
                 have_args.append(True)
-                self.write("(")
+                self.write('(')
 
         self.newline(n=3)
         self.decorators(node)
         self.newline()
-        self.write("class %s" % node.name)
+        self.write('class %s' % node.name)
         for base in node.bases:
             paren_or_comma()
             self.visit(base)
         # XXX: the if here is used to keep this module compatible
         #      with python 2.6.
-        if hasattr(node, "keywords"):
+        if hasattr(node, 'keywords'):
             for keyword in node.keywords:
                 paren_or_comma()
-                self.write(keyword.arg + "=")
+                self.write(keyword.arg + '=')
                 self.visit(keyword.value)
-            if getattr(node, "starargs", None):
+            if node.starargs is not None:
                 paren_or_comma()
-                self.write("*")
+                self.write('*')
                 self.visit(node.starargs)
-            if getattr(node, "kwargs", None):
+            if node.kwargs is not None:
                 paren_or_comma()
-                self.write("**")
+                self.write('**')
                 self.visit(node.kwargs)
-        self.write(have_args and "):" or ":")
+        self.write(have_args and '):' or ':')
         self.body(node.body)
 
     def visit_If(self, node):
         self.newline()
-        self.write("if ")
+        self.write('if ')
         self.visit(node.test)
-        self.write(":")
+        self.write(':')
         self.body(node.body)
         while True:
             else_ = node.orelse
             if len(else_) == 1 and isinstance(else_[0], If):
                 node = else_[0]
                 self.newline()
-                self.write("elif ")
+                self.write('elif ')
                 self.visit(node.test)
-                self.write(":")
+                self.write(':')
                 self.body(node.body)
             else:
                 self.newline()
-                self.write("else:")
+                self.write('else:')
                 self.body(else_)
                 break
 
     def visit_For(self, node):
         self.newline()
-        self.write("for ")
+        self.write('for ')
         self.visit(node.target)
-        self.write(" in ")
+        self.write(' in ')
         self.visit(node.iter)
-        self.write(":")
+        self.write(':')
         self.body_or_else(node)
 
     def visit_While(self, node):
         self.newline()
-        self.write("while ")
+        self.write('while ')
         self.visit(node.test)
-        self.write(":")
+        self.write(':')
         self.body_or_else(node)
 
     def visit_With(self, node):
         self.newline()
-        self.write("with ")
+        self.write('with ')
         self.visit(node.context_expr)
         if node.optional_vars is not None:
-            self.write(" as ")
+            self.write(' as ')
             self.visit(node.optional_vars)
-        self.write(":")
+        self.write(':')
         self.body(node.body)
 
     def visit_Pass(self, node):
         self.newline()
-        self.write("pass")
+        self.write('pass')
 
     def visit_Print(self, node):
         # XXX: python 2.6 only
         self.newline()
-        self.write("print ")
+        self.write('print ')
         want_comma = False
         if node.dest is not None:
-            self.write(" >> ")
+            self.write(' >> ')
             self.visit(node.dest)
             want_comma = True
         for value in node.values:
             if want_comma:
-                self.write(", ")
+                self.write(', ')
             self.visit(value)
             want_comma = True
         if not node.nl:
-            self.write(",")
+            self.write(',')
 
     def visit_Delete(self, node):
         self.newline()
-        self.write("del ")
+        self.write('del ')
         for idx, target in enumerate(node):
             if idx:
-                self.write(", ")
+                self.write(', ')
             self.visit(target)
 
     def visit_TryExcept(self, node):
         self.newline()
-        self.write("try:")
+        self.write('try:')
         self.body(node.body)
         for handler in node.handlers:
             self.visit(handler)
 
     def visit_TryFinally(self, node):
         self.newline()
-        self.write("try:")
+        self.write('try:')
         self.body(node.body)
         self.newline()
-        self.write("finally:")
+        self.write('finally:')
         self.body(node.finalbody)
 
     def visit_Global(self, node):
         self.newline()
-        self.write("global " + ", ".join(node.names))
+        self.write('global ' + ', '.join(node.names))
 
     def visit_Nonlocal(self, node):
         self.newline()
-        self.write("nonlocal " + ", ".join(node.names))
+        self.write('nonlocal ' + ', '.join(node.names))
 
     def visit_Return(self, node):
         self.newline()
-        self.write("return ")
+        self.write('return ')
         self.visit(node.value)
 
     def visit_Break(self, node):
         self.newline()
-        self.write("break")
+        self.write('break')
 
     def visit_Continue(self, node):
         self.newline()
-        self.write("continue")
+        self.write('continue')
 
     def visit_Raise(self, node):
         # XXX: Python 2.6 / 3.0 compatibility
         self.newline()
-        self.write("raise")
-        if hasattr(node, "exc") and node.exc is not None:
-            self.write(" ")
+        self.write('raise')
+        if hasattr(node, 'exc') and node.exc is not None:
+            self.write(' ')
             self.visit(node.exc)
             if node.cause is not None:
-                self.write(" from ")
+                self.write(' from ')
                 self.visit(node.cause)
-        elif hasattr(node, "type") and node.type is not None:
+        elif hasattr(node, 'type') and node.type is not None:
             self.visit(node.type)
             if node.inst is not None:
-                self.write(", ")
+                self.write(', ')
                 self.visit(node.inst)
             if node.tback is not None:
-                self.write(", ")
+                self.write(', ')
                 self.visit(node.tback)
 
     # Expressions
 
     def visit_Attribute(self, node):
         self.visit(node.value)
-        self.write("." + node.attr)
+        self.write('.' + node.attr)
 
     def visit_Call(self, node):
         want_comma = []
-
         def write_comma():
             if want_comma:
-                self.write(", ")
+                self.write(', ')
             else:
                 want_comma.append(True)
 
         self.visit(node.func)
-        self.write("(")
+        self.write('(')
         for arg in node.args:
             write_comma()
             self.visit(arg)
         for keyword in node.keywords:
             write_comma()
-            self.write(keyword.arg + "=")
+            self.write(keyword.arg + '=')
             self.visit(keyword.value)
-        if getattr(node, "starargs", None):
+        if node.starargs is not None:
             write_comma()
-            self.write("*")
+            self.write('*')
             self.visit(node.starargs)
-        if getattr(node, "kwargs", None):
+        if node.kwargs is not None:
             write_comma()
-            self.write("**")
+            self.write('**')
             self.visit(node.kwargs)
-        self.write(")")
+        self.write(')')
 
     def visit_Name(self, node):
         self.write(node.id)
@@ -536,111 +674,106 @@ class SourceGenerator(NodeVisitor):
     def visit_Num(self, node):
         self.write(repr(node.n))
 
-    # newly needed in Python 3.8
-    def visit_Constant(self, node):
-        self.write(repr(node.value))
-
     def visit_Tuple(self, node):
-        self.write("(")
+        self.write('(')
         idx = -1
         for idx, item in enumerate(node.elts):
             if idx:
-                self.write(", ")
+                self.write(', ')
             self.visit(item)
-        self.write(idx and ")" or ",)")
+        self.write(idx and ')' or ',)')
 
     def sequence_visit(left, right):
         def visit(self, node):
             self.write(left)
             for idx, item in enumerate(node.elts):
                 if idx:
-                    self.write(", ")
+                    self.write(', ')
                 self.visit(item)
             self.write(right)
-
         return visit
 
-    visit_List = sequence_visit("[", "]")
-    visit_Set = sequence_visit("{", "}")
+    visit_List = sequence_visit('[', ']')
+    visit_Set = sequence_visit('{', '}')
     del sequence_visit
 
     def visit_Dict(self, node):
-        self.write("{")
+        self.write('{')
         for idx, (key, value) in enumerate(zip(node.keys, node.values)):
             if idx:
-                self.write(", ")
+                self.write(', ')
             self.visit(key)
-            self.write(": ")
+            self.write(': ')
             self.visit(value)
-        self.write("}")
+        self.write('}')
 
     def visit_BinOp(self, node):
-        self.write("(")
+        self.write('(')
         self.visit(node.left)
-        self.write(" %s " % BINOP_SYMBOLS[type(node.op)])
+        self.write(' %s ' % BINOP_SYMBOLS[type(node.op)])
         self.visit(node.right)
-        self.write(")")
+        self.write(')')
 
     def visit_BoolOp(self, node):
-        self.write("(")
+        self.write('(')
         for idx, value in enumerate(node.values):
             if idx:
-                self.write(" %s " % BOOLOP_SYMBOLS[type(node.op)])
+                self.write(' %s ' % BOOLOP_SYMBOLS[type(node.op)])
             self.visit(value)
-        self.write(")")
+        self.write(')')
 
     def visit_Compare(self, node):
-        self.write("(")
+        self.write('(')
         self.visit(node.left)
         for op, right in zip(node.ops, node.comparators):
-            self.write(" %s " % CMPOP_SYMBOLS[type(op)])
+            self.write(' %s ' % CMPOP_SYMBOLS[type(op)])
             self.visit(right)
-        self.write(")")
+        self.write(')')
 
     def visit_UnaryOp(self, node):
-        self.write("(")
+        self.write('(')
         op = UNARYOP_SYMBOLS[type(node.op)]
         self.write(op)
-        if op == "not":
-            self.write(" ")
+        if op == 'not':
+            self.write(' ')
         self.visit(node.operand)
-        self.write(")")
+        self.write(')')
 
     def visit_Subscript(self, node):
         self.visit(node.value)
-        self.write("[")
+        self.write('[')
         self.visit(node.slice)
-        self.write("]")
+        self.write(']')
 
     def visit_Slice(self, node):
         if node.lower is not None:
             self.visit(node.lower)
-        self.write(":")
+        self.write(':')
         if node.upper is not None:
             self.visit(node.upper)
         if node.step is not None:
-            self.write(":")
-            if not (isinstance(node.step, Name) and node.step.id == "None"):
+            self.write(':')
+            if not (isinstance(node.step, Name) and node.step.id == 'None'):
                 self.visit(node.step)
 
     def visit_ExtSlice(self, node):
         for idx, item in node.dims:
             if idx:
-                self.write(", ")
+                self.write(', ')
             self.visit(item)
 
     def visit_Yield(self, node):
-        self.write("yield ")
+        self.write('yield ')
         self.visit(node.value)
 
     def visit_Lambda(self, node):
-        self.write("lambda ")
+        self.write('lambda ')
         self.signature(node.args)
-        self.write(": ")
+        self.write(': ')
         self.visit(node.body)
 
     def visit_Ellipsis(self, node):
-        self.write("Ellipsis")
+        self.write('Ellipsis')
 
     def generator_visit(left, right):
         def visit(self, node):
@@ -649,65 +782,64 @@ class SourceGenerator(NodeVisitor):
             for comprehension in node.generators:
                 self.visit(comprehension)
             self.write(right)
-
         return visit
 
-    visit_ListComp = generator_visit("[", "]")
-    visit_GeneratorExp = generator_visit("(", ")")
-    visit_SetComp = generator_visit("{", "}")
+    visit_ListComp = generator_visit('[', ']')
+    visit_GeneratorExp = generator_visit('(', ')')
+    visit_SetComp = generator_visit('{', '}')
     del generator_visit
 
     def visit_DictComp(self, node):
-        self.write("{")
+        self.write('{')
         self.visit(node.key)
-        self.write(": ")
+        self.write(': ')
         self.visit(node.value)
         for comprehension in node.generators:
             self.visit(comprehension)
-        self.write("}")
+        self.write('}')
 
     def visit_IfExp(self, node):
         self.visit(node.body)
-        self.write(" if ")
+        self.write(' if ')
         self.visit(node.test)
-        self.write(" else ")
+        self.write(' else ')
         self.visit(node.orelse)
 
     def visit_Starred(self, node):
-        self.write("*")
+        self.write('*')
         self.visit(node.value)
 
     def visit_Repr(self, node):
         # XXX: python 2.6 only
-        self.write("`")
+        self.write('`')
         self.visit(node.value)
-        self.write("`")
+        self.write('`')
 
     # Helper Nodes
 
     def visit_alias(self, node):
         self.write(node.name)
         if node.asname is not None:
-            self.write(" as " + node.asname)
+            self.write(' as ' + node.asname)
 
     def visit_comprehension(self, node):
-        self.write(" for ")
+        self.write(' for ')
         self.visit(node.target)
-        self.write(" in ")
+        self.write(' in ')
         self.visit(node.iter)
         if node.ifs:
             for if_ in node.ifs:
-                self.write(" if ")
+                self.write(' if ')
                 self.visit(if_)
 
     def visit_excepthandler(self, node):
         self.newline()
-        self.write("except")
+        self.write('except')
         if node.type is not None:
-            self.write(" ")
+            self.write(' ')
             self.visit(node.type)
             if node.name is not None:
-                self.write(" as ")
+                self.write(' as ')
                 self.visit(node.name)
-        self.write(":")
+        self.write(':')
         self.body(node.body)
diff --git a/lib/mako/ast.py b/lib/mako/ast.py
index e59df3eb..65fd84df 100644
--- a/lib/mako/ast.py
+++ b/lib/mako/ast.py
@@ -1,5 +1,5 @@
 # mako/ast.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright (C) 2006-2015 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
@@ -7,16 +7,11 @@
 """utilities for analyzing expressions and blocks of Python
 code, as well as generating Python from AST nodes"""
 
+from mako import exceptions, pyparser, compat
 import re
 
-from mako import exceptions
-from mako import pyparser
-
-
-class PythonCode:
-
+class PythonCode(object):
     """represents information about a string containing Python code"""
-
     def __init__(self, code, **exception_kwargs):
         self.code = code
 
@@ -38,7 +33,7 @@ class PythonCode:
         # - AST is less likely to break with version changes
         # (for example, the behavior of co_names changed a little bit
         # in python version 2.5)
-        if isinstance(code, str):
+        if isinstance(code, compat.string_types):
             expr = pyparser.parse(code.lstrip(), "exec", **exception_kwargs)
         else:
             expr = code
@@ -46,21 +41,18 @@ class PythonCode:
         f = pyparser.FindIdentifiers(self, **exception_kwargs)
         f.visit(expr)
 
-
-class ArgumentList:
-
+class ArgumentList(object):
     """parses a fragment of code as a comma-separated list of expressions"""
-
     def __init__(self, code, **exception_kwargs):
         self.codeargs = []
         self.args = []
         self.declared_identifiers = set()
         self.undeclared_identifiers = set()
-        if isinstance(code, str):
+        if isinstance(code, compat.string_types):
             if re.match(r"\S", code) and not re.match(r",\s*$", code):
                 # if theres text and no trailing comma, insure its parsed
                 # as a tuple by adding a trailing comma
-                code += ","
+                code  += ","
             expr = pyparser.parse(code, "exec", **exception_kwargs)
         else:
             expr = code
@@ -68,69 +60,58 @@ class ArgumentList:
         f = pyparser.FindTuple(self, PythonCode, **exception_kwargs)
         f.visit(expr)
 
-
 class PythonFragment(PythonCode):
-
     """extends PythonCode to provide identifier lookups in partial control
     statements
 
-    e.g.::
-
+    e.g.
         for x in 5:
         elif y==9:
         except (MyException, e):
-
+    etc.
     """
-
     def __init__(self, code, **exception_kwargs):
-        m = re.match(r"^(\w+)(?:\s+(.*?))?:\s*(#|$)", code.strip(), re.S)
+        m = re.match(r'^(\w+)(?:\s+(.*?))?:\s*(#|$)', code.strip(), re.S)
         if not m:
             raise exceptions.CompileException(
-                "Fragment '%s' is not a partial control statement" % code,
-                **exception_kwargs,
-            )
+                          "Fragment '%s' is not a partial control statement" %
+                          code, **exception_kwargs)
         if m.group(3):
-            code = code[: m.start(3)]
-        (keyword, expr) = m.group(1, 2)
-        if keyword in ["for", "if", "while"]:
+            code = code[:m.start(3)]
+        (keyword, expr) = m.group(1,2)
+        if keyword in ['for','if', 'while']:
             code = code + "pass"
-        elif keyword == "try":
+        elif keyword == 'try':
             code = code + "pass\nexcept:pass"
-        elif keyword in ["elif", "else"]:
+        elif keyword == 'elif' or keyword == 'else':
             code = "if False:pass\n" + code + "pass"
-        elif keyword == "except":
+        elif keyword == 'except':
             code = "try:pass\n" + code + "pass"
-        elif keyword == "with":
+        elif keyword == 'with':
             code = code + "pass"
         else:
             raise exceptions.CompileException(
-                "Unsupported control keyword: '%s'" % keyword,
-                **exception_kwargs,
-            )
-        super().__init__(code, **exception_kwargs)
+                                "Unsupported control keyword: '%s'" %
+                                keyword, **exception_kwargs)
+        super(PythonFragment, self).__init__(code, **exception_kwargs)
 
 
-class FunctionDecl:
-
+class FunctionDecl(object):
     """function declaration"""
-
     def __init__(self, code, allow_kwargs=True, **exception_kwargs):
         self.code = code
         expr = pyparser.parse(code, "exec", **exception_kwargs)
 
         f = pyparser.ParseFunc(self, **exception_kwargs)
         f.visit(expr)
-        if not hasattr(self, "funcname"):
+        if not hasattr(self, 'funcname'):
             raise exceptions.CompileException(
-                "Code '%s' is not a function declaration" % code,
-                **exception_kwargs,
-            )
+                            "Code '%s' is not a function declaration" % code,
+                            **exception_kwargs)
         if not allow_kwargs and self.kwargs:
             raise exceptions.CompileException(
-                "'**%s' keyword argument not allowed here"
-                % self.kwargnames[-1],
-                **exception_kwargs,
-            )
+                                "'**%s' keyword argument not allowed here" %
+                                self.kwargnames[-1], **exception_kwargs)
 
     def get_argument_expressions(self, as_call=False):
         """Return the argument declarations of this FunctionDecl as a printable
@@ -165,10 +146,8 @@ class FunctionDecl:
                     # `def foo(*, a=1, b, c=3)`
                     namedecls.append(name)
                 else:
-                    namedecls.append(
-                        "%s=%s"
-                        % (name, pyparser.ExpressionGenerator(default).value())
-                    )
+                    namedecls.append("%s=%s" % (
+                        name, pyparser.ExpressionGenerator(default).value()))
             else:
                 namedecls.append(name)
 
@@ -181,10 +160,8 @@ class FunctionDecl:
                 namedecls.append(name)
             else:
                 default = defaults.pop(0)
-                namedecls.append(
-                    "%s=%s"
-                    % (name, pyparser.ExpressionGenerator(default).value())
-                )
+                namedecls.append("%s=%s" % (
+                    name, pyparser.ExpressionGenerator(default).value()))
 
         namedecls.reverse()
         return namedecls
@@ -193,10 +170,9 @@ class FunctionDecl:
     def allargnames(self):
         return tuple(self.argnames) + tuple(self.kwargnames)
 
-
 class FunctionArgs(FunctionDecl):
-
     """the argument portion of a function declaration"""
 
     def __init__(self, code, **kwargs):
-        super().__init__("def ANON(%s):pass" % code, **kwargs)
+        super(FunctionArgs, self).__init__("def ANON(%s):pass" % code,
+                **kwargs)
diff --git a/lib/mako/cache.py b/lib/mako/cache.py
index bad25257..c405c517 100644
--- a/lib/mako/cache.py
+++ b/lib/mako/cache.py
@@ -1,10 +1,10 @@
 # mako/cache.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright (C) 2006-2015 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
-from mako import util
+from mako import compat, util
 
 _cache_plugins = util.PluginLoader("mako.cache")
 
@@ -12,8 +12,7 @@ register_plugin = _cache_plugins.register
 register_plugin("beaker", "mako.ext.beaker_cache", "BeakerCacheImpl")
 
 
-class Cache:
-
+class Cache(object):
     """Represents a data content cache made available to the module
     space of a specific :class:`.Template` object.
 
@@ -65,7 +64,7 @@ class Cache:
     def __init__(self, template, *args):
         # check for a stale template calling the
         # constructor
-        if isinstance(template, str) and args:
+        if isinstance(template, compat.string_types) and args:
             return
         self.template = template
         self.id = template.module.__name__
@@ -90,11 +89,12 @@ class Cache:
             return creation_function()
 
         return self.impl.get_or_create(
-            key, creation_function, **self._get_cache_kw(kw, context)
-        )
+            key,
+            creation_function,
+            **self._get_cache_kw(kw, context))
 
     def set(self, key, value, **kw):
-        r"""Place a value in the cache.
+        """Place a value in the cache.
 
         :param key: the value's key.
         :param value: the value.
@@ -112,7 +112,7 @@ class Cache:
     """
 
     def get(self, key, **kw):
-        r"""Retrieve a value from the cache.
+        """Retrieve a value from the cache.
 
         :param key: the value's key.
         :param \**kw: cache configuration arguments.  The
@@ -124,7 +124,7 @@ class Cache:
         return self.impl.get(key, **self._get_cache_kw(kw, None))
 
     def invalidate(self, key, **kw):
-        r"""Invalidate a value in the cache.
+        """Invalidate a value in the cache.
 
         :param key: the value's key.
         :param \**kw: cache configuration arguments.  The
@@ -140,7 +140,7 @@ class Cache:
         template.
 
         """
-        self.invalidate("render_body", __M_defname="render_body")
+        self.invalidate('render_body', __M_defname='render_body')
 
     def invalidate_def(self, name):
         """Invalidate the cached content of a particular ``<%def>`` within this
@@ -148,7 +148,7 @@ class Cache:
 
         """
 
-        self.invalidate("render_%s" % name, __M_defname="render_%s" % name)
+        self.invalidate('render_%s' % name, __M_defname='render_%s' % name)
 
     def invalidate_closure(self, name):
         """Invalidate a nested ``<%def>`` within this template.
@@ -164,7 +164,7 @@ class Cache:
         self.invalidate(name, __M_defname=name)
 
     def _get_cache_kw(self, kw, context):
-        defname = kw.pop("__M_defname", None)
+        defname = kw.pop('__M_defname', None)
         if not defname:
             tmpl_kw = self.template.cache_args.copy()
             tmpl_kw.update(kw)
@@ -176,12 +176,11 @@ class Cache:
             self._def_regions[defname] = tmpl_kw
         if context and self.impl.pass_context:
             tmpl_kw = tmpl_kw.copy()
-            tmpl_kw.setdefault("context", context)
+            tmpl_kw.setdefault('context', context)
         return tmpl_kw
 
 
-class CacheImpl:
-
+class CacheImpl(object):
     """Provide a cache implementation for use by :class:`.Cache`."""
 
     def __init__(self, cache):
@@ -193,7 +192,7 @@ class CacheImpl:
     """
 
     def get_or_create(self, key, creation_function, **kw):
-        r"""Retrieve a value from the cache, using the given creation function
+        """Retrieve a value from the cache, using the given creation function
         to generate a new value.
 
         This function *must* return a value, either from
@@ -211,7 +210,7 @@ class CacheImpl:
         raise NotImplementedError()
 
     def set(self, key, value, **kw):
-        r"""Place a value in the cache.
+        """Place a value in the cache.
 
         :param key: the value's key.
         :param value: the value.
@@ -221,7 +220,7 @@ class CacheImpl:
         raise NotImplementedError()
 
     def get(self, key, **kw):
-        r"""Retrieve a value from the cache.
+        """Retrieve a value from the cache.
 
         :param key: the value's key.
         :param \**kw: cache configuration arguments.
@@ -230,7 +229,7 @@ class CacheImpl:
         raise NotImplementedError()
 
     def invalidate(self, key, **kw):
-        r"""Invalidate a value in the cache.
+        """Invalidate a value in the cache.
 
         :param key: the value's key.
         :param \**kw: cache configuration arguments.
diff --git a/lib/mako/cmd.py b/lib/mako/cmd.py
index 3858a127..1a9ca566 100755
--- a/lib/mako/cmd.py
+++ b/lib/mako/cmd.py
@@ -1,71 +1,43 @@
 # mako/cmd.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright (C) 2006-2015 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 from argparse import ArgumentParser
-from os.path import dirname
-from os.path import isfile
+from os.path import isfile, dirname
 import sys
-
-from mako import exceptions
-from mako.lookup import TemplateLookup
 from mako.template import Template
-
+from mako.lookup import TemplateLookup
+from mako import exceptions
 
 def varsplit(var):
     if "=" not in var:
         return (var, "")
     return var.split("=", 1)
 
-
 def _exit():
     sys.stderr.write(exceptions.text_error_template().render())
     sys.exit(1)
 
-
 def cmdline(argv=None):
-    parser = ArgumentParser()
-    parser.add_argument(
-        "--var",
-        default=[],
-        action="append",
-        help="variable (can be used multiple times, use name=value)",
-    )
-    parser.add_argument(
-        "--template-dir",
-        default=[],
-        action="append",
-        help="Directory to use for template lookup (multiple "
-        "directories may be provided). If not given then if the "
-        "template is read from stdin, the value defaults to be "
-        "the current directory, otherwise it defaults to be the "
-        "parent directory of the file provided.",
-    )
-    parser.add_argument(
-        "--output-encoding", default=None, help="force output encoding"
-    )
-    parser.add_argument(
-        "--output-file",
-        default=None,
-        help="Write to file upon successful render instead of stdout",
-    )
-    parser.add_argument("input", nargs="?", default="-")
+
+    parser = ArgumentParser("usage: %prog [FILENAME]")
+    parser.add_argument("--var", default=[], action="append",
+                  help="variable (can be used multiple times, use name=value)")
+    parser.add_argument("--template-dir", default=[], action="append",
+                  help="Directory to use for template lookup (multiple "
+                    "directories may be provided). If not given then if the "
+                    "template is read from stdin, the value defaults to be "
+                    "the current directory, otherwise it defaults to be the "
+                    "parent directory of the file provided.")
+    parser.add_argument('input', nargs='?', default='-')
 
     options = parser.parse_args(argv)
-
-    output_encoding = options.output_encoding
-    output_file = options.output_file
-
-    if options.input == "-":
+    if options.input == '-':
         lookup_dirs = options.template_dir or ["."]
         lookup = TemplateLookup(lookup_dirs)
         try:
-            template = Template(
-                sys.stdin.read(),
-                lookup=lookup,
-                output_encoding=output_encoding,
-            )
+            template = Template(sys.stdin.read(), lookup=lookup)
         except:
             _exit()
     else:
@@ -75,24 +47,15 @@ def cmdline(argv=None):
         lookup_dirs = options.template_dir or [dirname(filename)]
         lookup = TemplateLookup(lookup_dirs)
         try:
-            template = Template(
-                filename=filename,
-                lookup=lookup,
-                output_encoding=output_encoding,
-            )
+            template = Template(filename=filename, lookup=lookup)
         except:
             _exit()
 
-    kw = dict(varsplit(var) for var in options.var)
+    kw = dict([varsplit(var) for var in options.var])
     try:
-        rendered = template.render(**kw)
+        print(template.render(**kw))
     except:
         _exit()
-    else:
-        if output_file:
-            open(output_file, "wt", encoding=output_encoding).write(rendered)
-        else:
-            sys.stdout.write(rendered)
 
 
 if __name__ == "__main__":
diff --git a/lib/mako/codegen.py b/lib/mako/codegen.py
index b9fea937..4b0bda86 100644
--- a/lib/mako/codegen.py
+++ b/lib/mako/codegen.py
@@ -1,5 +1,5 @@
 # mako/codegen.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright (C) 2006-2015 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
@@ -7,16 +7,11 @@
 """provides functionality for rendering a parsetree constructing into module
 source code."""
 
-import json
-import re
 import time
-
-from mako import ast
-from mako import exceptions
-from mako import filters
-from mako import parsetree
-from mako import util
+import re
 from mako.pygen import PythonPrinter
+from mako import util, ast, parsetree, filters, exceptions
+from mako import compat
 
 
 MAGIC_NUMBER = 10
@@ -24,65 +19,66 @@ MAGIC_NUMBER = 10
 # names which are hardwired into the
 # template and are not accessed via the
 # context itself
-TOPLEVEL_DECLARED = {"UNDEFINED", "STOP_RENDERING"}
-RESERVED_NAMES = {"context", "loop"}.union(TOPLEVEL_DECLARED)
+RESERVED_NAMES = set(['context', 'loop', 'UNDEFINED'])
 
+def compile(node,
+                uri,
+                filename=None,
+                default_filters=None,
+                buffer_filters=None,
+                imports=None,
+                future_imports=None,
+                source_encoding=None,
+                generate_magic_comment=True,
+                disable_unicode=False,
+                strict_undefined=False,
+                enable_loop=True,
+                reserved_names=frozenset()):
 
-def compile(  # noqa
-    node,
-    uri,
-    filename=None,
-    default_filters=None,
-    buffer_filters=None,
-    imports=None,
-    future_imports=None,
-    source_encoding=None,
-    generate_magic_comment=True,
-    strict_undefined=False,
-    enable_loop=True,
-    reserved_names=frozenset(),
-):
     """Generate module source code given a parsetree node,
-    uri, and optional source filename"""
+      uri, and optional source filename"""
+
+    # if on Py2K, push the "source_encoding" string to be
+    # a bytestring itself, as we will be embedding it into
+    # the generated source and we don't want to coerce the
+    # result into a unicode object, in "disable_unicode" mode
+    if not compat.py3k and isinstance(source_encoding, compat.text_type):
+        source_encoding = source_encoding.encode(source_encoding)
+
 
     buf = util.FastEncodingBuffer()
 
     printer = PythonPrinter(buf)
-    _GenerateRenderMethod(
-        printer,
-        _CompileContext(
-            uri,
-            filename,
-            default_filters,
-            buffer_filters,
-            imports,
-            future_imports,
-            source_encoding,
-            generate_magic_comment,
-            strict_undefined,
-            enable_loop,
-            reserved_names,
-        ),
-        node,
-    )
+    _GenerateRenderMethod(printer,
+                            _CompileContext(uri,
+                                            filename,
+                                            default_filters,
+                                            buffer_filters,
+                                            imports,
+                                            future_imports,
+                                            source_encoding,
+                                            generate_magic_comment,
+                                            disable_unicode,
+                                            strict_undefined,
+                                            enable_loop,
+                                            reserved_names),
+                                node)
     return buf.getvalue()
 
-
-class _CompileContext:
-    def __init__(
-        self,
-        uri,
-        filename,
-        default_filters,
-        buffer_filters,
-        imports,
-        future_imports,
-        source_encoding,
-        generate_magic_comment,
-        strict_undefined,
-        enable_loop,
-        reserved_names,
-    ):
+class _CompileContext(object):
+    def __init__(self,
+                    uri,
+                    filename,
+                    default_filters,
+                    buffer_filters,
+                    imports,
+                    future_imports,
+                    source_encoding,
+                    generate_magic_comment,
+                    disable_unicode,
+                    strict_undefined,
+                    enable_loop,
+                    reserved_names):
         self.uri = uri
         self.filename = filename
         self.default_filters = default_filters
@@ -91,18 +87,16 @@ class _CompileContext:
         self.future_imports = future_imports
         self.source_encoding = source_encoding
         self.generate_magic_comment = generate_magic_comment
+        self.disable_unicode = disable_unicode
         self.strict_undefined = strict_undefined
         self.enable_loop = enable_loop
         self.reserved_names = reserved_names
 
-
-class _GenerateRenderMethod:
-
+class _GenerateRenderMethod(object):
     """A template visitor object which generates the
-    full module source for a template.
+       full module source for a template.
 
     """
-
     def __init__(self, printer, compiler, node):
         self.printer = printer
         self.compiler = compiler
@@ -114,12 +108,12 @@ class _GenerateRenderMethod:
             name = "render_%s" % node.funcname
             args = node.get_argument_expressions()
             filtered = len(node.filter_args.args) > 0
-            buffered = eval(node.attributes.get("buffered", "False"))
-            cached = eval(node.attributes.get("cached", "False"))
+            buffered = eval(node.attributes.get('buffered', 'False'))
+            cached = eval(node.attributes.get('cached', 'False'))
             defs = None
             pagetag = None
             if node.is_block and not node.is_anonymous:
-                args += ["**pageargs"]
+                args += ['**pageargs']
         else:
             defs = self.write_toplevel()
             pagetag = self.compiler.pagetag
@@ -127,23 +121,25 @@ class _GenerateRenderMethod:
             if pagetag is not None:
                 args = pagetag.body_decl.get_argument_expressions()
                 if not pagetag.body_decl.kwargs:
-                    args += ["**pageargs"]
-                cached = eval(pagetag.attributes.get("cached", "False"))
+                    args += ['**pageargs']
+                cached = eval(pagetag.attributes.get('cached', 'False'))
                 self.compiler.enable_loop = self.compiler.enable_loop or eval(
-                    pagetag.attributes.get("enable_loop", "False")
-                )
+                                        pagetag.attributes.get(
+                                                'enable_loop', 'False')
+                                    )
             else:
-                args = ["**pageargs"]
+                args = ['**pageargs']
                 cached = False
             buffered = filtered = False
         if args is None:
-            args = ["context"]
+            args = ['context']
         else:
-            args = [a for a in ["context"] + args]
+            args = [a for a in ['context'] + args]
 
         self.write_render_callable(
-            pagetag or node, name, args, buffered, filtered, cached
-        )
+                            pagetag or node,
+                            name, args,
+                            buffered, filtered, cached)
 
         if defs is not None:
             for node in defs:
@@ -153,9 +149,8 @@ class _GenerateRenderMethod:
             self.write_metadata_struct()
 
     def write_metadata_struct(self):
-        self.printer.source_map[self.printer.lineno] = max(
-            self.printer.source_map
-        )
+        self.printer.source_map[self.printer.lineno] = \
+                    max(self.printer.source_map)
         struct = {
             "filename": self.compiler.filename,
             "uri": self.compiler.uri,
@@ -164,9 +159,10 @@ class _GenerateRenderMethod:
         }
         self.printer.writelines(
             '"""',
-            "__M_BEGIN_METADATA",
-            json.dumps(struct),
-            "__M_END_METADATA\n" '"""',
+            '__M_BEGIN_METADATA',
+            compat.json.dumps(struct),
+            '__M_END_METADATA\n'
+            '"""'
         )
 
     @property
@@ -184,16 +180,13 @@ class _GenerateRenderMethod:
 
         self.compiler.pagetag = None
 
-        class FindTopLevel:
+        class FindTopLevel(object):
             def visitInheritTag(s, node):
                 inherit.append(node)
-
             def visitNamespaceTag(s, node):
                 namespaces[node.name] = node
-
             def visitPageTag(s, node):
                 self.compiler.pagetag = node
-
             def visitCode(s, node):
                 if node.ismodule:
                     module_code.append(node)
@@ -212,63 +205,52 @@ class _GenerateRenderMethod:
         module_identifiers.declared = module_ident
 
         # module-level names, python code
-        if (
-            self.compiler.generate_magic_comment
-            and self.compiler.source_encoding
-        ):
-            self.printer.writeline(
-                "# -*- coding:%s -*-" % self.compiler.source_encoding
-            )
+        if self.compiler.generate_magic_comment and \
+                self.compiler.source_encoding:
+            self.printer.writeline("# -*- coding:%s -*-" %
+                                    self.compiler.source_encoding)
 
         if self.compiler.future_imports:
-            self.printer.writeline(
-                "from __future__ import %s"
-                % (", ".join(self.compiler.future_imports),)
-            )
+            self.printer.writeline("from __future__ import %s" %
+                                   (", ".join(self.compiler.future_imports),))
         self.printer.writeline("from mako import runtime, filters, cache")
         self.printer.writeline("UNDEFINED = runtime.UNDEFINED")
-        self.printer.writeline("STOP_RENDERING = runtime.STOP_RENDERING")
         self.printer.writeline("__M_dict_builtin = dict")
         self.printer.writeline("__M_locals_builtin = locals")
         self.printer.writeline("_magic_number = %r" % MAGIC_NUMBER)
         self.printer.writeline("_modified_time = %r" % time.time())
         self.printer.writeline("_enable_loop = %r" % self.compiler.enable_loop)
         self.printer.writeline(
-            "_template_filename = %r" % self.compiler.filename
-        )
+                            "_template_filename = %r" % self.compiler.filename)
         self.printer.writeline("_template_uri = %r" % self.compiler.uri)
         self.printer.writeline(
-            "_source_encoding = %r" % self.compiler.source_encoding
-        )
+                    "_source_encoding = %r" % self.compiler.source_encoding)
         if self.compiler.imports:
-            buf = ""
+            buf = ''
             for imp in self.compiler.imports:
                 buf += imp + "\n"
                 self.printer.writeline(imp)
             impcode = ast.PythonCode(
-                buf,
-                source="",
-                lineno=0,
-                pos=0,
-                filename="template defined imports",
-            )
+                            buf,
+                            source='', lineno=0,
+                            pos=0,
+                            filename='template defined imports')
         else:
             impcode = None
 
         main_identifiers = module_identifiers.branch(self.node)
-        mit = module_identifiers.topleveldefs
-        module_identifiers.topleveldefs = mit.union(
-            main_identifiers.topleveldefs
-        )
-        module_identifiers.declared.update(TOPLEVEL_DECLARED)
+        module_identifiers.topleveldefs = \
+            module_identifiers.topleveldefs.\
+                union(main_identifiers.topleveldefs)
+        module_identifiers.declared.add("UNDEFINED")
         if impcode:
             module_identifiers.declared.update(impcode.declared_identifiers)
 
         self.compiler.identifiers = module_identifiers
-        self.printer.writeline(
-            "_exports = %r"
-            % [n.name for n in main_identifiers.topleveldefs.values()]
-        )
+        self.printer.writeline("_exports = %r" %
+                            [n.name for n in
+                            main_identifiers.topleveldefs.values()]
+                        )
         self.printer.write_blanks(2)
 
         if len(module_code):
@@ -282,9 +264,8 @@ class _GenerateRenderMethod:
 
         return list(main_identifiers.topleveldefs.values())
 
-    def write_render_callable(
-        self, node, name, args, buffered, filtered, cached
-    ):
+    def write_render_callable(self, node, name, args, buffered, filtered,
+            cached):
         """write a top-level render callable.
 
         this could be the main render() method or that of a top-level def."""
@@ -293,38 +274,32 @@ class _GenerateRenderMethod:
             decorator = node.decorator
             if decorator:
                 self.printer.writeline(
-                    "@runtime._decorate_toplevel(%s)" % decorator
-                )
+                                "@runtime._decorate_toplevel(%s)" % decorator)
 
         self.printer.start_source(node.lineno)
         self.printer.writelines(
-            "def %s(%s):" % (name, ",".join(args)),
-            # push new frame, assign current frame to __M_caller
-            "__M_caller = context.caller_stack._push_frame()",
-            "try:",
+            "def %s(%s):" % (name, ','.join(args)),
+                # push new frame, assign current frame to __M_caller
+                "__M_caller = context.caller_stack._push_frame()",
+                "try:"
         )
         if buffered or filtered or cached:
             self.printer.writeline("context._push_buffer()")
 
         self.identifier_stack.append(
-            self.compiler.identifiers.branch(self.node)
-        )
-        if (not self.in_def or self.node.is_block) and "**pageargs" in args:
-            self.identifier_stack[-1].argument_declared.add("pageargs")
+                                self.compiler.identifiers.branch(self.node))
+        if (not self.in_def or self.node.is_block) and '**pageargs' in args:
+            self.identifier_stack[-1].argument_declared.add('pageargs')
 
         if not self.in_def and (
-            len(self.identifiers.locally_assigned) > 0
-            or len(self.identifiers.argument_declared) > 0
-        ):
-            self.printer.writeline(
-                "__M_locals = __M_dict_builtin(%s)"
-                % ",".join(
-                    [
-                        "%s=%s" % (x, x)
-                        for x in self.identifiers.argument_declared
-                    ]
-                )
-            )
+                                len(self.identifiers.locally_assigned) > 0 or
+                                len(self.identifiers.argument_declared) > 0
+                                ):
+            self.printer.writeline("__M_locals = __M_dict_builtin(%s)" %
+                                    ','.join([
+                                            "%s=%s" % (x, x) for x in
+                                            self.identifiers.argument_declared
+                                            ]))
 
         self.write_variable_declares(self.identifiers, toplevel=True)
 
@@ -336,42 +311,44 @@ class _GenerateRenderMethod:
         self.printer.write_blanks(2)
         if cached:
             self.write_cache_decorator(
-                node, name, args, buffered, self.identifiers, toplevel=True
-            )
+                                node, name,
+                                args, buffered,
+                                self.identifiers, toplevel=True)
 
     def write_module_code(self, module_code):
         """write module-level template code, i.e. that which
         is enclosed in <%! %> tags in the template."""
         for n in module_code:
-            self.printer.write_indented_block(n.text, starting_lineno=n.lineno)
+            self.printer.start_source(n.lineno)
+            self.printer.write_indented_block(n.text)
 
     def write_inherit(self, node):
         """write the module-level inheritance-determination callable."""
 
         self.printer.writelines(
             "def _mako_inherit(template, context):",
-            "_mako_generate_namespaces(context)",
-            "return runtime._inherit_from(context, %s, _template_uri)"
-            % (node.parsed_attributes["file"]),
-            None,
+                "_mako_generate_namespaces(context)",
+                "return runtime._inherit_from(context, %s, _template_uri)" %
+                (node.parsed_attributes['file']),
+                None
         )
 
     def write_namespaces(self, namespaces):
         """write the module-level namespace-generating callable."""
         self.printer.writelines(
             "def _mako_get_namespace(context, name):",
-            "try:",
-            "return context.namespaces[(__name__, name)]",
-            "except KeyError:",
-            "_mako_generate_namespaces(context)",
-            "return context.namespaces[(__name__, name)]",
-            None,
-            None,
+                "try:",
+                    "return context.namespaces[(__name__, name)]",
+                "except KeyError:",
+                    "_mako_generate_namespaces(context)",
+                "return context.namespaces[(__name__, name)]",
+            None, None
         )
         self.printer.writeline("def _mako_generate_namespaces(context):")
 
+
         for node in namespaces.values():
-            if "import" in node.attributes:
+            if 'import' in node.attributes:
                 self.compiler.has_ns_imports = True
             self.printer.start_source(node.lineno)
             if len(node.nodes):
@@ -379,8 +356,7 @@ class _GenerateRenderMethod:
                 export = []
                 identifiers = self.compiler.identifiers.branch(node)
                 self.in_def = True
-
-                class NSDefVisitor:
+                class NSDefVisitor(object):
                     def visitDefTag(s, node):
                         s.visitDefOrBase(node)
 
@@ -392,58 +368,60 @@ class _GenerateRenderMethod:
                             raise exceptions.CompileException(
                                 "Can't put anonymous blocks inside "
                                 "<%namespace>",
-                                **node.exception_kwargs,
+                                **node.exception_kwargs
                             )
                         self.write_inline_def(node, identifiers, nested=False)
                         export.append(node.funcname)
-
                 vis = NSDefVisitor()
                 for n in node.nodes:
                     n.accept_visitor(vis)
-                self.printer.writeline("return [%s]" % (",".join(export)))
+                self.printer.writeline("return [%s]" % (','.join(export)))
                 self.printer.writeline(None)
                 self.in_def = False
                 callable_name = "make_namespace()"
             else:
                 callable_name = "None"
 
-            if "file" in node.parsed_attributes:
+            if 'file' in node.parsed_attributes:
                 self.printer.writeline(
-                    "ns = runtime.TemplateNamespace(%r,"
-                    " context._clean_inheritance_tokens(),"
-                    " templateuri=%s, callables=%s, "
-                    " calling_uri=_template_uri)"
-                    % (
-                        node.name,
-                        node.parsed_attributes.get("file", "None"),
-                        callable_name,
-                    )
-                )
-            elif "module" in node.parsed_attributes:
+                                "ns = runtime.TemplateNamespace(%r,"
+                                " context._clean_inheritance_tokens(),"
+                                " templateuri=%s, callables=%s, "
+                                " calling_uri=_template_uri)" %
+                                (
+                                    node.name,
+                                    node.parsed_attributes.get('file', 'None'),
+                                    callable_name,
+                                )
+                            )
+            elif 'module' in node.parsed_attributes:
                 self.printer.writeline(
-                    "ns = runtime.ModuleNamespace(%r,"
-                    " context._clean_inheritance_tokens(),"
-                    " callables=%s, calling_uri=_template_uri,"
-                    " module=%s)"
-                    % (
-                        node.name,
-                        callable_name,
-                        node.parsed_attributes.get("module", "None"),
-                    )
-                )
+                                "ns = runtime.ModuleNamespace(%r,"
+                                " context._clean_inheritance_tokens(),"
+                                " callables=%s, calling_uri=_template_uri,"
+                                " module=%s)" %
+                                (
+                                    node.name,
+                                    callable_name,
+                                    node.parsed_attributes.get(
+                                                'module', 'None')
+                                )
+                            )
             else:
                 self.printer.writeline(
-                    "ns = runtime.Namespace(%r,"
-                    " context._clean_inheritance_tokens(),"
-                    " callables=%s, calling_uri=_template_uri)"
-                    % (node.name, callable_name)
-                )
-            if eval(node.attributes.get("inheritable", "False")):
+                                "ns = runtime.Namespace(%r,"
+                                " context._clean_inheritance_tokens(),"
+                                " callables=%s, calling_uri=_template_uri)" %
+                                (
+                                    node.name,
+                                    callable_name,
+                                )
+                            )
+            if eval(node.attributes.get('inheritable', "False")):
                 self.printer.writeline("context['self'].%s = ns" % (node.name))
 
             self.printer.writeline(
-                "context.namespaces[(__name__, %s)] = ns" % repr(node.name)
-            )
+                "context.namespaces[(__name__, %s)] = ns" % repr(node.name))
             self.printer.write_blanks(1)
         if not len(namespaces):
             self.printer.writeline("pass")
@@ -469,7 +447,7 @@ class _GenerateRenderMethod:
         """
 
         # collection of all defs available to us in this scope
-        comp_idents = {c.funcname: c for c in identifiers.defs}
+        comp_idents = dict([(c.funcname, c) for c in identifiers.defs])
         to_write = set()
 
         # write "context.get()" for all variables we are going to
@@ -479,8 +457,7 @@ class _GenerateRenderMethod:
         # write closure functions for closures that we define
         # right here
         to_write = to_write.union(
-            [c.funcname for c in identifiers.closuredefs.values()]
-        )
+                        [c.funcname for c in identifiers.closuredefs.values()])
 
         # remove identifiers that are declared in the argument
         # signature of the callable
@@ -504,22 +481,23 @@ class _GenerateRenderMethod:
         if limit is not None:
             to_write = to_write.intersection(limit)
 
-        if toplevel and getattr(self.compiler, "has_ns_imports", False):
+        if toplevel and getattr(self.compiler, 'has_ns_imports', False):
             self.printer.writeline("_import_ns = {}")
             self.compiler.has_imports = True
             for ident, ns in self.compiler.namespaces.items():
-                if "import" in ns.attributes:
+                if 'import' in ns.attributes:
                     self.printer.writeline(
-                        "_mako_get_namespace(context, %r)."
-                        "_populate(_import_ns, %r)"
-                        % (
-                            ident,
-                            re.split(r"\s*,\s*", ns.attributes["import"]),
-                        )
-                    )
+                            "_mako_get_namespace(context, %r)."
+                                    "_populate(_import_ns, %r)" %
+                            (
+                                ident,
+                                re.split(r'\s*,\s*', ns.attributes['import'])
+                            ))
 
         if has_loop:
-            self.printer.writeline("loop = __M_loop = runtime.LoopStack()")
+            self.printer.writeline(
+                'loop = __M_loop = runtime.LoopStack()'
+            )
 
         for ident in to_write:
             if ident in comp_idents:
@@ -537,36 +515,36 @@ class _GenerateRenderMethod:
 
             elif ident in self.compiler.namespaces:
                 self.printer.writeline(
-                    "%s = _mako_get_namespace(context, %r)" % (ident, ident)
-                )
+                            "%s = _mako_get_namespace(context, %r)" %
+                                (ident, ident)
+                            )
             else:
-                if getattr(self.compiler, "has_ns_imports", False):
+                if getattr(self.compiler, 'has_ns_imports', False):
                     if self.compiler.strict_undefined:
                         self.printer.writelines(
-                            "%s = _import_ns.get(%r, UNDEFINED)"
-                            % (ident, ident),
-                            "if %s is UNDEFINED:" % ident,
+                        "%s = _import_ns.get(%r, UNDEFINED)" %
+                        (ident, ident),
+                        "if %s is UNDEFINED:" % ident,
                             "try:",
-                            "%s = context[%r]" % (ident, ident),
+                                "%s = context[%r]" % (ident, ident),
                             "except KeyError:",
-                            "raise NameError(\"'%s' is not defined\")" % ident,
-                            None,
-                            None,
+                                "raise NameError(\"'%s' is not defined\")" %
+                                    ident,
+                            None, None
                         )
                     else:
                         self.printer.writeline(
-                            "%s = _import_ns.get"
-                            "(%r, context.get(%r, UNDEFINED))"
-                            % (ident, ident, ident)
-                        )
+                        "%s = _import_ns.get(%r, context.get(%r, UNDEFINED))" %
+                        (ident, ident, ident))
                 else:
                     if self.compiler.strict_undefined:
                         self.printer.writelines(
                             "try:",
-                            "%s = context[%r]" % (ident, ident),
+                                "%s = context[%r]" % (ident, ident),
                             "except KeyError:",
-                            "raise NameError(\"'%s' is not defined\")" % ident,
-                            None,
+                                "raise NameError(\"'%s' is not defined\")" %
+                                    ident,
+                            None
                         )
                     else:
                         self.printer.writeline(
@@ -582,16 +560,14 @@ class _GenerateRenderMethod:
         nameargs = node.get_argument_expressions(as_call=True)
 
         if not self.in_def and (
-            len(self.identifiers.locally_assigned) > 0
-            or len(self.identifiers.argument_declared) > 0
-        ):
-            nameargs.insert(0, "context._locals(__M_locals)")
+                                len(self.identifiers.locally_assigned) > 0 or
+                                len(self.identifiers.argument_declared) > 0):
+            nameargs.insert(0, 'context._locals(__M_locals)')
         else:
-            nameargs.insert(0, "context")
+            nameargs.insert(0, 'context')
         self.printer.writeline("def %s(%s):" % (funcname, ",".join(namedecls)))
         self.printer.writeline(
-            "return render_%s(%s)" % (funcname, ",".join(nameargs))
-        )
+                    "return render_%s(%s)" % (funcname, ",".join(nameargs)))
         self.printer.writeline(None)
 
     def write_inline_def(self, node, identifiers, nested):
@@ -602,21 +578,21 @@ class _GenerateRenderMethod:
         decorator = node.decorator
         if decorator:
             self.printer.writeline(
-                "@runtime._decorate_inline(context, %s)" % decorator
-            )
+                        "@runtime._decorate_inline(context, %s)" % decorator)
         self.printer.writeline(
-            "def %s(%s):" % (node.funcname, ",".join(namedecls))
-        )
+                        "def %s(%s):" % (node.funcname, ",".join(namedecls)))
         filtered = len(node.filter_args.args) > 0
-        buffered = eval(node.attributes.get("buffered", "False"))
-        cached = eval(node.attributes.get("cached", "False"))
+        buffered = eval(node.attributes.get('buffered', 'False'))
+        cached = eval(node.attributes.get('cached', 'False'))
         self.printer.writelines(
             # push new frame, assign current frame to __M_caller
             "__M_caller = context.caller_stack._push_frame()",
-            "try:",
+            "try:"
         )
         if buffered or filtered or cached:
-            self.printer.writelines("context._push_buffer()")
+            self.printer.writelines(
+                "context._push_buffer()",
+            )
 
         identifiers = identifiers.branch(node, nested=nested)
 
@@ -630,19 +606,12 @@ class _GenerateRenderMethod:
         self.write_def_finish(node, buffered, filtered, cached)
         self.printer.writeline(None)
         if cached:
-            self.write_cache_decorator(
-                node,
-                node.funcname,
-                namedecls,
-                False,
-                identifiers,
-                inline=True,
-                toplevel=False,
-            )
+            self.write_cache_decorator(node, node.funcname,
+                                        namedecls, False, identifiers,
+                                        inline=True, toplevel=False)
 
-    def write_def_finish(
-        self, node, buffered, filtered, cached, callstack=True
-    ):
+    def write_def_finish(self, node, buffered, filtered, cached,
+            callstack=True):
         """write the end section of a rendering function, either outermost or
         inline.
 
@@ -655,7 +624,9 @@ class _GenerateRenderMethod:
             self.printer.writeline("return ''")
             if callstack:
                 self.printer.writelines(
-                    "finally:", "context.caller_stack._pop_frame()", None
+                    "finally:",
+                        "context.caller_stack._pop_frame()",
+                    None
                 )
 
         if buffered or filtered or cached:
@@ -665,12 +636,13 @@ class _GenerateRenderMethod:
                 # implemenation might be using a context with no
                 # extra buffers
                 self.printer.writelines(
-                    "finally:", "__M_buf = context._pop_buffer()"
+                    "finally:",
+                        "__M_buf = context._pop_buffer()"
                 )
             else:
                 self.printer.writelines(
                     "finally:",
-                    "__M_buf, __M_writer = context._pop_buffer_and_writer()",
+                    "__M_buf, __M_writer = context._pop_buffer_and_writer()"
                 )
 
             if callstack:
@@ -678,100 +650,89 @@ class _GenerateRenderMethod:
 
             s = "__M_buf.getvalue()"
             if filtered:
-                s = self.create_filter_callable(
-                    node.filter_args.args, s, False
-                )
+                s = self.create_filter_callable(node.filter_args.args, s,
+                                                False)
             self.printer.writeline(None)
             if buffered and not cached:
-                s = self.create_filter_callable(
-                    self.compiler.buffer_filters, s, False
-                )
+                s = self.create_filter_callable(self.compiler.buffer_filters,
+                                                s, False)
             if buffered or cached:
                 self.printer.writeline("return %s" % s)
             else:
-                self.printer.writelines("__M_writer(%s)" % s, "return ''")
+                self.printer.writelines(
+                    "__M_writer(%s)" % s,
+                    "return ''"
+                )
 
-    def write_cache_decorator(
-        self,
-        node_or_pagetag,
-        name,
-        args,
-        buffered,
-        identifiers,
-        inline=False,
-        toplevel=False,
-    ):
+    def write_cache_decorator(self, node_or_pagetag, name,
+                                    args, buffered, identifiers,
+                                    inline=False, toplevel=False):
         """write a post-function decorator to replace a rendering
-        callable with a cached version of itself."""
+            callable with a cached version of itself."""
 
         self.printer.writeline("__M_%s = %s" % (name, name))
-        cachekey = node_or_pagetag.parsed_attributes.get(
-            "cache_key", repr(name)
-        )
+        cachekey = node_or_pagetag.parsed_attributes.get('cache_key',
+                                                         repr(name))
 
         cache_args = {}
         if self.compiler.pagetag is not None:
             cache_args.update(
-                (pa[6:], self.compiler.pagetag.parsed_attributes[pa])
+                (
+                    pa[6:],
+                    self.compiler.pagetag.parsed_attributes[pa]
+                )
                 for pa in self.compiler.pagetag.parsed_attributes
-                if pa.startswith("cache_") and pa != "cache_key"
+                if pa.startswith('cache_') and pa != 'cache_key'
             )
         cache_args.update(
-            (pa[6:], node_or_pagetag.parsed_attributes[pa])
-            for pa in node_or_pagetag.parsed_attributes
-            if pa.startswith("cache_") and pa != "cache_key"
+            (
+                pa[6:],
+                node_or_pagetag.parsed_attributes[pa]
+            ) for pa in node_or_pagetag.parsed_attributes
+            if pa.startswith('cache_') and pa != 'cache_key'
         )
-        if "timeout" in cache_args:
-            cache_args["timeout"] = int(eval(cache_args["timeout"]))
+        if 'timeout' in cache_args:
+            cache_args['timeout'] = int(eval(cache_args['timeout']))
 
-        self.printer.writeline("def %s(%s):" % (name, ",".join(args)))
+        self.printer.writeline("def %s(%s):" % (name, ','.join(args)))
 
         # form "arg1, arg2, arg3=arg3, arg4=arg4", etc.
         pass_args = [
-            "%s=%s" % ((a.split("=")[0],) * 2) if "=" in a else a for a in args
-        ]
+                        "%s=%s" % ((a.split('=')[0],) * 2) if '=' in a else a
+                        for a in args
+                    ]
 
         self.write_variable_declares(
-            identifiers,
-            toplevel=toplevel,
-            limit=node_or_pagetag.undeclared_identifiers(),
-        )
+                            identifiers,
+                            toplevel=toplevel,
+                            limit=node_or_pagetag.undeclared_identifiers()
+                        )
         if buffered:
-            s = (
-                "context.get('local')."
-                "cache._ctx_get_or_create("
-                "%s, lambda:__M_%s(%s),  context, %s__M_defname=%r)"
-                % (
-                    cachekey,
-                    name,
-                    ",".join(pass_args),
-                    "".join(
-                        ["%s=%s, " % (k, v) for k, v in cache_args.items()]
-                    ),
-                    name,
-                )
-            )
+            s = "context.get('local')."\
+                "cache._ctx_get_or_create("\
+                "%s, lambda:__M_%s(%s),  context, %s__M_defname=%r)" % (
+                                cachekey, name, ','.join(pass_args),
+                                ''.join(["%s=%s, " % (k, v)
+                                for k, v in cache_args.items()]),
+                                name
+                            )
             # apply buffer_filters
-            s = self.create_filter_callable(
-                self.compiler.buffer_filters, s, False
-            )
+            s = self.create_filter_callable(self.compiler.buffer_filters, s,
+                                            False)
             self.printer.writelines("return " + s, None)
         else:
             self.printer.writelines(
-                "__M_writer(context.get('local')."
-                "cache._ctx_get_or_create("
-                "%s, lambda:__M_%s(%s), context, %s__M_defname=%r))"
-                % (
-                    cachekey,
-                    name,
-                    ",".join(pass_args),
-                    "".join(
-                        ["%s=%s, " % (k, v) for k, v in cache_args.items()]
+                    "__M_writer(context.get('local')."
+                    "cache._ctx_get_or_create("
+                    "%s, lambda:__M_%s(%s), context, %s__M_defname=%r))" %
+                    (
+                        cachekey, name, ','.join(pass_args),
+                        ''.join(["%s=%s, " % (k, v)
+                        for k, v in cache_args.items()]),
+                        name,
                     ),
-                    name,
-                ),
-                "return ''",
-                None,
+                    "return ''",
+                None
             )
 
     def create_filter_callable(self, args, target, is_expression):
@@ -780,22 +741,24 @@ class _GenerateRenderMethod:
         'default' filter aliases as needed."""
 
         def locate_encode(name):
-            if re.match(r"decode\..+", name):
+            if re.match(r'decode\..+', name):
                 return "filters." + name
+            elif self.compiler.disable_unicode:
+                return filters.NON_UNICODE_ESCAPES.get(name, name)
             else:
                 return filters.DEFAULT_ESCAPES.get(name, name)
 
-        if "n" not in args:
+        if 'n' not in args:
             if is_expression:
                 if self.compiler.pagetag:
                     args = self.compiler.pagetag.filter_args.args + args
-                if self.compiler.default_filters and "n" not in args:
+                if self.compiler.default_filters:
                     args = self.compiler.default_filters + args
         for e in args:
             # if filter given as a function, get just the identifier portion
-            if e == "n":
+            if e == 'n':
                 continue
-            m = re.match(r"(.+?)(\(.*\))", e)
+            m = re.match(r'(.+?)(\(.*\))', e)
             if m:
                 ident, fargs = m.group(1, 2)
                 f = locate_encode(ident)
@@ -808,17 +771,15 @@ class _GenerateRenderMethod:
 
     def visitExpression(self, node):
         self.printer.start_source(node.lineno)
-        if (
-            len(node.escapes)
-            or (
-                self.compiler.pagetag is not None
-                and len(self.compiler.pagetag.filter_args.args)
-            )
-            or len(self.compiler.default_filters)
-        ):
-            s = self.create_filter_callable(
-                node.escapes_code.args, "%s" % node.text, True
-            )
+        if len(node.escapes) or \
+                (
+                    self.compiler.pagetag is not None and
+                    len(self.compiler.pagetag.filter_args.args)
+                ) or \
+                len(self.compiler.default_filters):
+
+            s = self.create_filter_callable(node.escapes_code.args,
+                                            "%s" % node.text, True)
             self.printer.writeline("__M_writer(%s)" % s)
         else:
             self.printer.writeline("__M_writer(%s)" % node.text)
@@ -827,45 +788,29 @@ class _GenerateRenderMethod:
         if node.isend:
             self.printer.writeline(None)
             if node.has_loop_context:
-                self.printer.writeline("finally:")
+                self.printer.writeline('finally:')
                 self.printer.writeline("loop = __M_loop._exit()")
                 self.printer.writeline(None)
         else:
             self.printer.start_source(node.lineno)
-            if self.compiler.enable_loop and node.keyword == "for":
+            if self.compiler.enable_loop and node.keyword == 'for':
                 text = mangle_mako_loop(node, self.printer)
             else:
                 text = node.text
             self.printer.writeline(text)
             children = node.get_children()
-
-            # this covers the four situations where we want to insert a pass:
-            # 1) a ternary control line with no children,
-            # 2) a primary control line with nothing but its own ternary
-            #       and end control lines, and
-            # 3) any control line with no content other than comments
-            # 4) the first control block with no content other than comments
-            def _search_for_control_line():
-                for c in children:
-                    if isinstance(c, parsetree.Comment):
-                        continue
-                    elif isinstance(c, parsetree.ControlLine):
-                        return True
-                    return False
-
-            if (
-                not children
-                or all(
-                    isinstance(c, (parsetree.Comment, parsetree.ControlLine))
-                    for c in children
-                )
-                and all(
-                    (node.is_ternary(c.keyword) or c.isend)
-                    for c in children
-                    if isinstance(c, parsetree.ControlLine)
-                )
-                or _search_for_control_line()
-            ):
+            # this covers the three situations where we want to insert a pass:
+            #    1) a ternary control line with no children,
+            #    2) a primary control line with nothing but its own ternary
+            #          and end control lines, and
+            #    3) any control line with no content other than comments
+            if not children or (
+                    compat.all(isinstance(c, (parsetree.Comment,
+                                            parsetree.ControlLine))
+                             for c in children) and
+                    compat.all((node.is_ternary(c.keyword) or c.isend)
+                             for c in children
+                             if isinstance(c, parsetree.ControlLine))):
                 self.printer.writeline("pass")
 
     def visitText(self, node):
@@ -876,7 +821,8 @@ class _GenerateRenderMethod:
         filtered = len(node.filter_args.args) > 0
         if filtered:
             self.printer.writelines(
-                "__M_writer = context._push_writer()", "try:"
+                "__M_writer = context._push_writer()",
+                "try:",
             )
         for n in node.nodes:
             n.accept_visitor(self)
@@ -884,18 +830,18 @@ class _GenerateRenderMethod:
             self.printer.writelines(
                 "finally:",
                 "__M_buf, __M_writer = context._pop_buffer_and_writer()",
-                "__M_writer(%s)"
-                % self.create_filter_callable(
-                    node.filter_args.args, "__M_buf.getvalue()", False
-                ),
-                None,
+                "__M_writer(%s)" %
+                self.create_filter_callable(
+                                node.filter_args.args,
+                                "__M_buf.getvalue()",
+                                False),
+                None
             )
 
     def visitCode(self, node):
         if not node.ismodule:
-            self.printer.write_indented_block(
-                node.text, starting_lineno=node.lineno
-            )
+            self.printer.start_source(node.lineno)
+            self.printer.write_indented_block(node.text)
 
             if not self.in_def and len(self.identifiers.locally_assigned) > 0:
                 # if we are the "template" def, fudge locally
@@ -903,28 +849,24 @@ class _GenerateRenderMethod:
                 # which is used for def calls within the same template,
                 # to simulate "enclosing scope"
                 self.printer.writeline(
-                    "__M_locals_builtin_stored = __M_locals_builtin()"
-                )
+                    '__M_locals_builtin_stored = __M_locals_builtin()')
                 self.printer.writeline(
-                    "__M_locals.update(__M_dict_builtin([(__M_key,"
-                    " __M_locals_builtin_stored[__M_key]) for __M_key in"
-                    " [%s] if __M_key in __M_locals_builtin_stored]))"
-                    % ",".join([repr(x) for x in node.declared_identifiers()])
-                )
+                    '__M_locals.update(__M_dict_builtin([(__M_key,'
+                    ' __M_locals_builtin_stored[__M_key]) for __M_key in'
+                    ' [%s] if __M_key in __M_locals_builtin_stored]))' %
+                    ','.join([repr(x) for x in node.declared_identifiers()]))
 
     def visitIncludeTag(self, node):
         self.printer.start_source(node.lineno)
-        args = node.attributes.get("args")
+        args = node.attributes.get('args')
         if args:
             self.printer.writeline(
-                "runtime._include_file(context, %s, _template_uri, %s)"
-                % (node.parsed_attributes["file"], args)
-            )
+                    "runtime._include_file(context, %s, _template_uri, %s)" %
+                    (node.parsed_attributes['file'], args))
         else:
             self.printer.writeline(
-                "runtime._include_file(context, %s, _template_uri)"
-                % (node.parsed_attributes["file"])
-            )
+                        "runtime._include_file(context, %s, _template_uri)" %
+                        (node.parsed_attributes['file']))
 
     def visitNamespaceTag(self, node):
         pass
@@ -937,14 +879,12 @@ class _GenerateRenderMethod:
             self.printer.writeline("%s()" % node.funcname)
         else:
             nameargs = node.get_argument_expressions(as_call=True)
-            nameargs += ["**pageargs"]
+            nameargs += ['**pageargs']
+            self.printer.writeline("if 'parent' not in context._data or "
+                                  "not hasattr(context._data['parent'], '%s'):"
+                                  % node.funcname)
             self.printer.writeline(
-                "if 'parent' not in context._data or "
-                "not hasattr(context._data['parent'], '%s'):" % node.funcname
-            )
-            self.printer.writeline(
-                "context['self'].%s(%s)" % (node.funcname, ",".join(nameargs))
-            )
+                "context['self'].%s(%s)" % (node.funcname, ",".join(nameargs)))
             self.printer.writeline("\n")
 
     def visitCallNamespaceTag(self, node):
@@ -955,18 +895,17 @@ class _GenerateRenderMethod:
 
     def visitCallTag(self, node):
         self.printer.writeline("def ccall(caller):")
-        export = ["body"]
+        export = ['body']
         callable_identifiers = self.identifiers.branch(node, nested=True)
         body_identifiers = callable_identifiers.branch(node, nested=False)
         # we want the 'caller' passed to ccall to be used
         # for the body() function, but for other non-body()
         # <%def>s within <%call> we want the current caller
         # off the call stack (if any)
-        body_identifiers.add_declared("caller")
+        body_identifiers.add_declared('caller')
 
         self.identifier_stack.append(body_identifiers)
-
-        class DefVisitor:
+        class DefVisitor(object):
             def visitDefTag(s, node):
                 s.visitDefOrBase(node)
 
@@ -988,13 +927,16 @@ class _GenerateRenderMethod:
         self.identifier_stack.pop()
 
         bodyargs = node.body_decl.get_argument_expressions()
-        self.printer.writeline("def body(%s):" % ",".join(bodyargs))
+        self.printer.writeline("def body(%s):" % ','.join(bodyargs))
 
         # TODO: figure out best way to specify
         # buffering/nonbuffering (at call time would be better)
         buffered = False
         if buffered:
-            self.printer.writelines("context._push_buffer()", "try:")
+            self.printer.writelines(
+                "context._push_buffer()",
+                "try:"
+            )
         self.write_variable_declares(body_identifiers)
         self.identifier_stack.append(body_identifiers)
 
@@ -1003,27 +945,28 @@ class _GenerateRenderMethod:
         self.identifier_stack.pop()
 
         self.write_def_finish(node, buffered, False, False, callstack=False)
-        self.printer.writelines(None, "return [%s]" % (",".join(export)), None)
+        self.printer.writelines(
+            None,
+            "return [%s]" % (','.join(export)),
+            None
+        )
 
         self.printer.writelines(
             # push on caller for nested call
             "context.caller_stack.nextcaller = "
-            "runtime.Namespace('caller', context, "
-            "callables=ccall(__M_caller))",
-            "try:",
-        )
+                "runtime.Namespace('caller', context, "
+                                "callables=ccall(__M_caller))",
+            "try:")
         self.printer.start_source(node.lineno)
         self.printer.writelines(
-            "__M_writer(%s)"
-            % self.create_filter_callable([], node.expression, True),
+                "__M_writer(%s)" % self.create_filter_callable(
+                                                    [], node.expression, True),
             "finally:",
-            "context.caller_stack.nextcaller = None",
-            None,
+                "context.caller_stack.nextcaller = None",
+            None
         )
 
-
-class _Identifiers:
-
+class _Identifiers(object):
     """tracks the status of identifier names as template code is rendered."""
 
     def __init__(self, compiler, node=None, parent=None, nested=False):
@@ -1036,12 +979,10 @@ class _Identifiers:
             else:
                 # things that have already been declared
                 # in an enclosing namespace (i.e. names we can just use)
-                self.declared = (
-                    set(parent.declared)
-                    .union([c.name for c in parent.closuredefs.values()])
-                    .union(parent.locally_declared)
-                    .union(parent.argument_declared)
-                )
+                self.declared = set(parent.declared).\
+                        union([c.name for c in parent.closuredefs.values()]).\
+                        union(parent.locally_declared).\
+                        union(parent.argument_declared)
 
                 # if these identifiers correspond to a "nested"
                 # scope, it means whatever the parent identifiers
@@ -1085,17 +1026,16 @@ class _Identifiers:
             node.accept_visitor(self)
 
         illegal_names = self.compiler.reserved_names.intersection(
-            self.locally_declared
-        )
+                                                        self.locally_declared)
         if illegal_names:
             raise exceptions.NameConflictError(
-                "Reserved words declared in template: %s"
-                % ", ".join(illegal_names)
-            )
+                "Reserved words declared in template: %s" %
+                ", ".join(illegal_names))
+
 
     def branch(self, node, **kwargs):
         """create a new Identifiers for a new Node, with
-        this Identifiers as the parent."""
+          this Identifiers as the parent."""
 
         return _Identifiers(self.compiler, node, self, **kwargs)
 
@@ -1104,28 +1044,24 @@ class _Identifiers:
         return set(self.topleveldefs.union(self.closuredefs).values())
 
     def __repr__(self):
-        return (
-            "Identifiers(declared=%r, locally_declared=%r, "
-            "undeclared=%r, topleveldefs=%r, closuredefs=%r, "
-            "argumentdeclared=%r)"
-            % (
-                list(self.declared),
-                list(self.locally_declared),
-                list(self.undeclared),
-                [c.name for c in self.topleveldefs.values()],
-                [c.name for c in self.closuredefs.values()],
-                self.argument_declared,
-            )
-        )
+        return "Identifiers(declared=%r, locally_declared=%r, "\
+                "undeclared=%r, topleveldefs=%r, closuredefs=%r, "\
+                "argumentdeclared=%r)" %\
+                (
+                    list(self.declared),
+                    list(self.locally_declared),
+                    list(self.undeclared),
+                    [c.name for c in self.topleveldefs.values()],
+                    [c.name for c in self.closuredefs.values()],
+                    self.argument_declared)
 
     def check_declared(self, node):
         """update the state of this Identifiers with the undeclared
-        and declared identifiers of the given node."""
+            and declared identifiers of the given node."""
 
         for ident in node.undeclared_identifiers():
-            if ident != "context" and ident not in self.declared.union(
-                self.locally_declared
-            ):
+            if ident != 'context' and\
+                    ident not in self.declared.union(self.locally_declared):
                 self.undeclared.add(ident)
         for ident in node.declared_identifiers():
             self.locally_declared.add(ident)
@@ -1145,8 +1081,7 @@ class _Identifiers:
         if not node.ismodule:
             self.check_declared(node)
             self.locally_assigned = self.locally_assigned.union(
-                node.declared_identifiers()
-            )
+                                                node.declared_identifiers())
 
     def visitNamespaceTag(self, node):
         # only traverse into the sub-elements of a
@@ -1159,16 +1094,13 @@ class _Identifiers:
     def _check_name_exists(self, collection, node):
         existing = collection.get(node.funcname)
         collection[node.funcname] = node
-        if (
-            existing is not None
-            and existing is not node
-            and (node.is_block or existing.is_block)
-        ):
+        if existing is not None and \
+            existing is not node and \
+            (node.is_block or existing.is_block):
             raise exceptions.CompileException(
-                "%%def or %%block named '%s' already "
-                "exists in this template." % node.funcname,
-                **node.exception_kwargs,
-            )
+                    "%%def or %%block named '%s' already "
+                    "exists in this template." %
+                    node.funcname, **node.exception_kwargs)
 
     def visitDefTag(self, node):
         if node.is_root() and not node.is_anonymous:
@@ -1177,9 +1109,8 @@ class _Identifiers:
             self._check_name_exists(self.closuredefs, node)
 
         for ident in node.undeclared_identifiers():
-            if ident != "context" and ident not in self.declared.union(
-                self.locally_declared
-            ):
+            if ident != 'context' and \
+                    ident not in self.declared.union(self.locally_declared):
                 self.undeclared.add(ident)
 
         # visit defs only one level deep
@@ -1192,25 +1123,20 @@ class _Identifiers:
 
     def visitBlockTag(self, node):
         if node is not self.node and not node.is_anonymous:
+
             if isinstance(self.node, parsetree.DefTag):
                 raise exceptions.CompileException(
-                    "Named block '%s' not allowed inside of def '%s'"
-                    % (node.name, self.node.name),
-                    **node.exception_kwargs,
-                )
-            elif isinstance(
-                self.node, (parsetree.CallTag, parsetree.CallNamespaceTag)
-            ):
+                        "Named block '%s' not allowed inside of def '%s'"
+                        % (node.name, self.node.name), **node.exception_kwargs)
+            elif isinstance(self.node,
+                            (parsetree.CallTag, parsetree.CallNamespaceTag)):
                 raise exceptions.CompileException(
-                    "Named block '%s' not allowed inside of <%%call> tag"
-                    % (node.name,),
-                    **node.exception_kwargs,
-                )
+                        "Named block '%s' not allowed inside of <%%call> tag"
+                        % (node.name, ), **node.exception_kwargs)
 
         for ident in node.undeclared_identifiers():
-            if ident != "context" and ident not in self.declared.union(
-                self.locally_declared
-            ):
+            if ident != 'context' and \
+                    ident not in self.declared.union(self.locally_declared):
                 self.undeclared.add(ident)
 
         if not node.is_anonymous:
@@ -1225,9 +1151,8 @@ class _Identifiers:
 
     def visitTextTag(self, node):
         for ident in node.undeclared_identifiers():
-            if ident != "context" and ident not in self.declared.union(
-                self.locally_declared
-            ):
+            if ident != 'context' and \
+                    ident not in self.declared.union(self.locally_declared):
                 self.undeclared.add(ident)
 
     def visitIncludeTag(self, node):
@@ -1244,9 +1169,9 @@ class _Identifiers:
     def visitCallTag(self, node):
         if node is self.node:
             for ident in node.undeclared_identifiers():
-                if ident != "context" and ident not in self.declared.union(
-                    self.locally_declared
-                ):
+                if ident != 'context' and \
+                        ident not in self.declared.union(
+                                                self.locally_declared):
                     self.undeclared.add(ident)
             for ident in node.declared_identifiers():
                 self.argument_declared.add(ident)
@@ -1254,23 +1179,17 @@ class _Identifiers:
                 n.accept_visitor(self)
         else:
             for ident in node.undeclared_identifiers():
-                if ident != "context" and ident not in self.declared.union(
-                    self.locally_declared
-                ):
+                if ident != 'context' and \
+                        ident not in self.declared.union(
+                                                self.locally_declared):
                     self.undeclared.add(ident)
 
 
 _FOR_LOOP = re.compile(
-    r"^for\s+((?:\(?)\s*"
-    r"(?:\(?)\s*[A-Za-z_][A-Za-z_0-9]*"
-    r"(?:\s*,\s*(?:[A-Za-z_][A-Za-z_0-9]*),??)*\s*(?:\)?)"
-    r"(?:\s*,\s*(?:"
-    r"(?:\(?)\s*[A-Za-z_][A-Za-z_0-9]*"
-    r"(?:\s*,\s*(?:[A-Za-z_][A-Za-z_0-9]*),??)*\s*(?:\)?)"
-    r"),??)*\s*(?:\)?))\s+in\s+(.*):"
+        r'^for\s+((?:\(?)\s*[A-Za-z_][A-Za-z_0-9]*'
+        r'(?:\s*,\s*(?:[A-Za-z_][A-Za-z0-9_]*),??)*\s*(?:\)?))\s+in\s+(.*):'
 )
 
-
 def mangle_mako_loop(node, printer):
     """converts a for loop into a context manager wrapped around a for loop
     when access to the `loop` variable has been detected in the for loop body
@@ -1282,11 +1201,11 @@ def mangle_mako_loop(node, printer):
         match = _FOR_LOOP.match(node.text)
         if match:
             printer.writelines(
-                "loop = __M_loop._enter(%s)" % match.group(2),
-                "try:"
-                # 'with __M_loop(%s) as loop:' % match.group(2)
+                    'loop = __M_loop._enter(%s)' % match.group(2),
+                    'try:'
+                    #'with __M_loop(%s) as loop:' % match.group(2)
             )
-            text = "for %s in loop:" % match.group(1)
+            text = 'for %s in loop:' % match.group(1)
         else:
             raise SyntaxError("Couldn't apply loop context: %s" % node.text)
     else:
@@ -1294,8 +1213,7 @@ def mangle_mako_loop(node, printer):
     return text
 
 
-class LoopVariable:
-
+class LoopVariable(object):
     """A node visitor which looks for the name 'loop' within undeclared
     identifiers."""
 
@@ -1303,7 +1221,7 @@ class LoopVariable:
         self.detected = False
 
     def _loop_reference_detected(self, node):
-        if "loop" in node.undeclared_identifiers():
+        if 'loop' in node.undeclared_identifiers():
             self.detected = True
         else:
             for n in node.get_children():
diff --git a/lib/mako/compat.py b/lib/mako/compat.py
index 18322159..fe277bbf 100644
--- a/lib/mako/compat.py
+++ b/lib/mako/compat.py
@@ -1,70 +1,174 @@
-# mako/compat.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
-#
-# This module is part of Mako and is released under
-# the MIT License: http://www.opensource.org/licenses/mit-license.php
-
-import collections
-from importlib import metadata as importlib_metadata
-from importlib import util
-import inspect
 import sys
+import time
 
-win32 = sys.platform.startswith("win")
-pypy = hasattr(sys, "pypy_version_info")
+py3k = sys.version_info >= (3, 0)
+py33 = sys.version_info >= (3, 3)
+py2k = sys.version_info < (3,)
+py26 = sys.version_info >= (2, 6)
+jython = sys.platform.startswith('java')
+win32 = sys.platform.startswith('win')
+pypy = hasattr(sys, 'pypy_version_info')
 
-ArgSpec = collections.namedtuple(
-    "ArgSpec", ["args", "varargs", "keywords", "defaults"]
-)
+if py3k:
+    from io import StringIO
+    import builtins as compat_builtins
+    from urllib.parse import quote_plus, unquote_plus
+    from html.entities import codepoint2name, name2codepoint
+    string_types = str,
+    binary_type = bytes
+    text_type = str
+
+    from io import BytesIO as byte_buffer
+
+    def u(s):
+        return s
+
+    def b(s):
+        return s.encode("latin-1")
+
+    def octal(lit):
+        return eval("0o" + lit)
+
+else:
+    import __builtin__ as compat_builtins
+    try:
+        from cStringIO import StringIO
+    except:
+        from StringIO import StringIO
+
+    byte_buffer = StringIO
+
+    from urllib import quote_plus, unquote_plus
+    from htmlentitydefs import codepoint2name, name2codepoint
+    string_types = basestring,
+    binary_type = str
+    text_type = unicode
+
+    def u(s):
+        return unicode(s, "utf-8")
+
+    def b(s):
+        return s
+
+    def octal(lit):
+        return eval("0" + lit)
 
 
-def inspect_getargspec(func):
-    """getargspec based on fully vendored getfullargspec from Python 3.3."""
-
-    if inspect.ismethod(func):
-        func = func.__func__
-    if not inspect.isfunction(func):
-        raise TypeError(f"{func!r} is not a Python function")
-
-    co = func.__code__
-    if not inspect.iscode(co):
-        raise TypeError(f"{co!r} is not a code object")
-
-    nargs = co.co_argcount
-    names = co.co_varnames
-    nkwargs = co.co_kwonlyargcount
-    args = list(names[:nargs])
-
-    nargs += nkwargs
-    varargs = None
-    if co.co_flags & inspect.CO_VARARGS:
-        varargs = co.co_varnames[nargs]
-        nargs = nargs + 1
-    varkw = None
-    if co.co_flags & inspect.CO_VARKEYWORDS:
-        varkw = co.co_varnames[nargs]
-
-    return ArgSpec(args, varargs, varkw, func.__defaults__)
+if py33:
+    from importlib import machinery
+    def load_module(module_id, path):
+        return machinery.SourceFileLoader(module_id, path).load_module()
+else:
+    import imp
+    def load_module(module_id, path):
+        fp = open(path, 'rb')
+        try:
+            return imp.load_source(module_id, path, fp)
+        finally:
+            fp.close()
 
 
-def load_module(module_id, path):
-    spec = util.spec_from_file_location(module_id, path)
-    module = util.module_from_spec(spec)
-    spec.loader.exec_module(module)
-    return module
+if py3k:
+    def reraise(tp, value, tb=None, cause=None):
+        if cause is not None:
+            value.__cause__ = cause
+        if value.__traceback__ is not tb:
+            raise value.with_traceback(tb)
+        raise value
+else:
+    exec("def reraise(tp, value, tb=None, cause=None):\n"
+            "    raise tp, value, tb\n")
 
 
 def exception_as():
     return sys.exc_info()[1]
 
+try:
+    import threading
+    if py3k:
+        import _thread as thread
+    else:
+        import thread
+except ImportError:
+    import dummy_threading as threading
+    if py3k:
+        import _dummy_thread as thread
+    else:
+        import dummy_thread as thread
+
+if win32 or jython:
+    time_func = time.clock
+else:
+    time_func = time.time
+
+try:
+    from functools import partial
+except:
+    def partial(func, *args, **keywords):
+        def newfunc(*fargs, **fkeywords):
+            newkeywords = keywords.copy()
+            newkeywords.update(fkeywords)
+            return func(*(args + fargs), **newkeywords)
+        return newfunc
+
+
+all = all
+import json
 
 def exception_name(exc):
     return exc.__class__.__name__
 
+try:
+    from inspect import CO_VARKEYWORDS, CO_VARARGS
+    def inspect_func_args(fn):
+        if py3k:
+            co = fn.__code__
+        else:
+            co = fn.func_code
 
-def importlib_metadata_get(group):
-    ep = importlib_metadata.entry_points()
-    if hasattr(ep, "select"):
-        return ep.select(group=group)
+        nargs = co.co_argcount
+        names = co.co_varnames
+        args = list(names[:nargs])
+
+        varargs = None
+        if co.co_flags & CO_VARARGS:
+            varargs = co.co_varnames[nargs]
+            nargs = nargs + 1
+        varkw = None
+        if co.co_flags & CO_VARKEYWORDS:
+            varkw = co.co_varnames[nargs]
+
+        if py3k:
+            return args, varargs, varkw, fn.__defaults__
+        else:
+            return args, varargs, varkw, fn.func_defaults
+except ImportError:
+    import inspect
+    def inspect_func_args(fn):
+        return inspect.getargspec(fn)
+
+if py3k:
+    def callable(fn):
+        return hasattr(fn, '__call__')
+else:
+    callable = callable
+
+
+################################################
+# cross-compatible metaclass implementation
+# Copyright (c) 2010-2012 Benjamin Peterson
+def with_metaclass(meta, base=object):
+    """Create a base class with a metaclass."""
+    return meta("%sBase" % meta.__name__, (base,), {})
+################################################
+
+
+def arg_stringname(func_arg):
+    """Gets the string name of a kwarg or vararg
+    In Python3.4 a function's args are
+    of _ast.arg type not _ast.name
+    """
+    if hasattr(func_arg, 'arg'):
+        return func_arg.arg
     else:
-        return ep.get(group, ())
+        return str(func_arg)
diff --git a/lib/mako/exceptions.py b/lib/mako/exceptions.py
index ca225677..c531f211 100644
--- a/lib/mako/exceptions.py
+++ b/lib/mako/exceptions.py
@@ -1,26 +1,21 @@
 # mako/exceptions.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright (C) 2006-2015 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 """exception classes"""
 
-import sys
 import traceback
-
-from mako import compat
-from mako import util
-
+import sys
+from mako import util, compat
 
 class MakoException(Exception):
     pass
 
-
 class RuntimeException(MakoException):
     pass
 
-
 def _format_filepos(lineno, pos, filename):
     if filename is None:
         return " at line: %d char: %d" % (lineno, pos)
@@ -30,53 +25,41 @@ def _format_filepos(lineno, pos, filename):
 
 class CompileException(MakoException):
     def __init__(self, message, source, lineno, pos, filename):
-        MakoException.__init__(
-            self, message + _format_filepos(lineno, pos, filename)
-        )
+        MakoException.__init__(self,
+                              message + _format_filepos(lineno, pos, filename))
         self.lineno = lineno
         self.pos = pos
         self.filename = filename
         self.source = source
 
-
 class SyntaxException(MakoException):
     def __init__(self, message, source, lineno, pos, filename):
-        MakoException.__init__(
-            self, message + _format_filepos(lineno, pos, filename)
-        )
+        MakoException.__init__(self,
+                              message + _format_filepos(lineno, pos, filename))
         self.lineno = lineno
         self.pos = pos
         self.filename = filename
         self.source = source
 
-
 class UnsupportedError(MakoException):
-
     """raised when a retired feature is used."""
 
-
 class NameConflictError(MakoException):
-
     """raised when a reserved word is used inappropriately"""
 
-
 class TemplateLookupException(MakoException):
     pass
 
-
 class TopLevelLookupException(TemplateLookupException):
     pass
 
-
-class RichTraceback:
-
+class RichTraceback(object):
     """Pull the current exception from the ``sys`` traceback and extracts
     Mako-specific template information.
 
     See the usage examples in :ref:`handling_exceptions`.
 
     """
-
     def __init__(self, error=None, traceback=None):
         self.source, self.lineno = "", 0
 
@@ -106,7 +89,7 @@ class RichTraceback:
     def _init_message(self):
         """Find a unicode representation of self.error"""
         try:
-            self.message = str(self.error)
+            self.message = compat.text_type(self.error)
         except UnicodeError:
             try:
                 self.message = str(self.error)
@@ -114,8 +97,8 @@ class RichTraceback:
                 # Fallback to args as neither unicode nor
                 # str(Exception(u'\xe6')) work in Python < 2.6
                 self.message = self.error.args[0]
-        if not isinstance(self.message, str):
-            self.message = str(self.message, "ascii", "replace")
+        if not isinstance(self.message, compat.text_type):
+            self.message = compat.text_type(self.message, 'ascii', 'replace')
 
     def _get_reformatted_records(self, records):
         for rec in records:
@@ -139,7 +122,8 @@ class RichTraceback:
 
     @property
     def reverse_traceback(self):
-        """Return the same data as traceback, except in reverse order."""
+        """Return the same data as traceback, except in reverse order.
+        """
 
         return list(self._get_reformatted_records(self.reverse_records))
 
@@ -150,51 +134,47 @@ class RichTraceback:
         source, and code line from that line number of the template."""
 
         import mako.template
-
         mods = {}
         rawrecords = traceback.extract_tb(trcback)
         new_trcback = []
         for filename, lineno, function, line in rawrecords:
             if not line:
-                line = ""
+                line = ''
             try:
-                (line_map, template_lines, template_filename) = mods[filename]
+                (line_map, template_lines) = mods[filename]
             except KeyError:
                 try:
                     info = mako.template._get_module_info(filename)
                     module_source = info.code
                     template_source = info.source
-                    template_filename = (
-                        info.template_filename or info.template_uri or filename
-                    )
+                    template_filename = info.template_filename or filename
                 except KeyError:
                     # A normal .py file (not a Template)
-                    new_trcback.append(
-                        (
-                            filename,
-                            lineno,
-                            function,
-                            line,
-                            None,
-                            None,
-                            None,
-                            None,
-                        )
-                    )
+                    if not compat.py3k:
+                        try:
+                            fp = open(filename, 'rb')
+                            encoding = util.parse_encoding(fp)
+                            fp.close()
+                        except IOError:
+                            encoding = None
+                        if encoding:
+                            line = line.decode(encoding)
+                        else:
+                            line = line.decode('ascii', 'replace')
+                    new_trcback.append((filename, lineno, function, line,
+                                            None, None, None, None))
                     continue
 
                 template_ln = 1
 
-                mtm = mako.template.ModuleInfo
-                source_map = mtm.get_module_source_metadata(
-                    module_source, full_line_map=True
-                )
-                line_map = source_map["full_line_map"]
+                source_map = mako.template.ModuleInfo.\
+                                get_module_source_metadata(
+                                    module_source, full_line_map=True)
+                line_map = source_map['full_line_map']
 
-                template_lines = [
-                    line_ for line_ in template_source.split("\n")
-                ]
-                mods[filename] = (line_map, template_lines, template_filename)
+                template_lines = [line for line in
+                                    template_source.split("\n")]
+                mods[filename] = (line_map, template_lines)
 
             template_ln = line_map[lineno - 1]
 
@@ -202,18 +182,9 @@ class RichTraceback:
                 template_line = template_lines[template_ln - 1]
             else:
                 template_line = None
-            new_trcback.append(
-                (
-                    filename,
-                    lineno,
-                    function,
-                    line,
-                    template_filename,
-                    template_ln,
-                    template_line,
-                    template_source,
-                )
-            )
+            new_trcback.append((filename, lineno, function,
+                                line, template_filename, template_ln,
+                                template_line, template_source))
         if not self.source:
             for l in range(len(new_trcback) - 1, 0, -1):
                 if new_trcback[l][5]:
@@ -224,16 +195,15 @@ class RichTraceback:
                 if new_trcback:
                     try:
                         # A normal .py file (not a Template)
-                        with open(new_trcback[-1][0], "rb") as fp:
-                            encoding = util.parse_encoding(fp)
-                            if not encoding:
-                                encoding = "utf-8"
-                            fp.seek(0)
-                            self.source = fp.read()
+                        fp = open(new_trcback[-1][0], 'rb')
+                        encoding = util.parse_encoding(fp)
+                        fp.seek(0)
+                        self.source = fp.read()
+                        fp.close()
                         if encoding:
                             self.source = self.source.decode(encoding)
                     except IOError:
-                        self.source = ""
+                        self.source = ''
                     self.lineno = new_trcback[-1][1]
         return new_trcback
 
@@ -246,9 +216,7 @@ def text_error_template(lookup=None):
 
     """
     import mako.template
-
-    return mako.template.Template(
-        r"""
+    return mako.template.Template(r"""
 <%page args="error=None, traceback=None"/>
 <%!
     from mako.exceptions import RichTraceback
@@ -262,36 +230,28 @@ Traceback (most recent call last):
     ${line | trim}
 % endfor
 ${tback.errorname}: ${tback.message}
-"""
-    )
+""")
 
 
 def _install_pygments():
     global syntax_highlight, pygments_html_formatter
-    from mako.ext.pygmentplugin import syntax_highlight  # noqa
-    from mako.ext.pygmentplugin import pygments_html_formatter  # noqa
-
+    from mako.ext.pygmentplugin import syntax_highlight,\
+            pygments_html_formatter
 
 def _install_fallback():
     global syntax_highlight, pygments_html_formatter
     from mako.filters import html_escape
-
     pygments_html_formatter = None
-
-    def syntax_highlight(filename="", language=None):
+    def syntax_highlight(filename='', language=None):
         return html_escape
 
-
 def _install_highlighting():
     try:
         _install_pygments()
     except ImportError:
         _install_fallback()
-
-
 _install_highlighting()
 
-
 def html_error_template():
     """Provides a template that renders a stack trace in an HTML format,
     providing an excerpt of code as well as substituting source template
@@ -306,9 +266,7 @@ def html_error_template():
 
     """
     import mako.template
-
-    return mako.template.Template(
-        r"""
+    return mako.template.Template(r"""
 <%!
     from mako.exceptions import RichTraceback, syntax_highlight,\
             pygments_html_formatter
@@ -411,7 +369,5 @@ def html_error_template():
 </body>
 </html>
 % endif
-""",
-        output_encoding=sys.getdefaultencoding(),
-        encoding_errors="htmlentityreplace",
-    )
+""", output_encoding=sys.getdefaultencoding(),
+        encoding_errors='htmlentityreplace')
diff --git a/lib/mako/ext/autohandler.py b/lib/mako/ext/autohandler.py
index dff9b6a8..8deaae19 100644
--- a/lib/mako/ext/autohandler.py
+++ b/lib/mako/ext/autohandler.py
@@ -1,5 +1,5 @@
 # ext/autohandler.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright (C) 2006-2015 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
@@ -8,29 +8,26 @@
 
 requires that the TemplateLookup class is used with templates.
 
-usage::
+usage:
 
-    <%!
-        from mako.ext.autohandler import autohandler
-    %>
-    <%inherit file="${autohandler(template, context)}"/>
+<%!
+    from mako.ext.autohandler import autohandler
+%>
+<%inherit file="${autohandler(template, context)}"/>
 
 
-or with custom autohandler filename::
+or with custom autohandler filename:
 
-    <%!
-        from mako.ext.autohandler import autohandler
-    %>
-    <%inherit file="${autohandler(template, context, name='somefilename')}"/>
+<%!
+    from mako.ext.autohandler import autohandler
+%>
+<%inherit file="${autohandler(template, context, name='somefilename')}"/>
 
 """
 
-import os
-import posixpath
-import re
+import posixpath, os, re
 
-
-def autohandler(template, context, name="autohandler"):
+def autohandler(template, context, name='autohandler'):
     lookup = context.lookup
     _template_uri = template.module._template_uri
     if not lookup.filesystem_checks:
@@ -39,32 +36,30 @@ def autohandler(template, context, name="autohandler"):
         except KeyError:
             pass
 
-    tokens = re.findall(r"([^/]+)", posixpath.dirname(_template_uri)) + [name]
+    tokens = re.findall(r'([^/]+)', posixpath.dirname(_template_uri)) + [name]
     while len(tokens):
-        path = "/" + "/".join(tokens)
+        path = '/' + '/'.join(tokens)
         if path != _template_uri and _file_exists(lookup, path):
             if not lookup.filesystem_checks:
                 return lookup._uri_cache.setdefault(
-                    (autohandler, _template_uri, name), path
-                )
+                            (autohandler, _template_uri, name), path)
             else:
                 return path
         if len(tokens) == 1:
             break
         tokens[-2:] = [name]
-
+ 
     if not lookup.filesystem_checks:
         return lookup._uri_cache.setdefault(
-            (autohandler, _template_uri, name), None
-        )
+                            (autohandler, _template_uri, name), None)
     else:
         return None
 
-
 def _file_exists(lookup, path):
-    psub = re.sub(r"^/", "", path)
+    psub = re.sub(r'^/', '',path)
     for d in lookup.directories:
-        if os.path.exists(d + "/" + psub):
+        if os.path.exists(d + '/' + psub):
             return True
     else:
         return False
+ 
diff --git a/lib/mako/ext/babelplugin.py b/lib/mako/ext/babelplugin.py
index cdb37cdf..ead70811 100644
--- a/lib/mako/ext/babelplugin.py
+++ b/lib/mako/ext/babelplugin.py
@@ -1,12 +1,11 @@
 # ext/babelplugin.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright (C) 2006-2015 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
-"""gettext message extraction via Babel: https://pypi.org/project/Babel/"""
+"""gettext message extraction via Babel: http://babel.edgewall.org/"""
 from babel.messages.extract import extract_python
-
 from mako.ext.extract import MessageExtractor
 
 
@@ -15,30 +14,22 @@ class BabelMakoExtractor(MessageExtractor):
         self.keywords = keywords
         self.options = options
         self.config = {
-            "comment-tags": " ".join(comment_tags),
-            "encoding": options.get(
-                "input_encoding", options.get("encoding", None)
-            ),
-        }
-        super().__init__()
+                'comment-tags': u' '.join(comment_tags),
+                'encoding': options.get('input_encoding',
+                    options.get('encoding', None)),
+            }
+        super(BabelMakoExtractor, self).__init__()
 
     def __call__(self, fileobj):
         return self.process_file(fileobj)
 
     def process_python(self, code, code_lineno, translator_strings):
-        comment_tags = self.config["comment-tags"]
-        for (
-            lineno,
-            funcname,
-            messages,
-            python_translator_comments,
-        ) in extract_python(code, self.keywords, comment_tags, self.options):
-            yield (
-                code_lineno + (lineno - 1),
-                funcname,
-                messages,
-                translator_strings + python_translator_comments,
-            )
+        comment_tags = self.config['comment-tags']
+        for lineno, funcname, messages, python_translator_comments \
+                in extract_python(code,
+                        self.keywords, comment_tags, self.options):
+            yield (code_lineno + (lineno - 1), funcname, messages,
+                   translator_strings + python_translator_comments)
 
 
 def extract(fileobj, keywords, comment_tags, options):
@@ -54,4 +45,5 @@ def extract(fileobj, keywords, comment_tags, options):
     :rtype: ``iterator``
     """
     extractor = BabelMakoExtractor(keywords, comment_tags, options)
-    yield from extractor(fileobj)
+    for message in extractor(fileobj):
+        yield message
diff --git a/lib/mako/ext/beaker_cache.py b/lib/mako/ext/beaker_cache.py
index 590fbd01..40ef7745 100644
--- a/lib/mako/ext/beaker_cache.py
+++ b/lib/mako/ext/beaker_cache.py
@@ -1,12 +1,7 @@
-# ext/beaker_cache.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
-#
-# This module is part of Mako and is released under
-# the MIT License: http://www.opensource.org/licenses/mit-license.php
-
 """Provide a :class:`.CacheImpl` for the Beaker caching system."""
 
 from mako import exceptions
+
 from mako.cache import CacheImpl
 
 try:
@@ -20,7 +15,6 @@ _beaker_cache = None
 
 
 class BeakerCacheImpl(CacheImpl):
-
     """A :class:`.CacheImpl` provided for the Beaker caching system.
 
     This plugin is used by default, based on the default
@@ -32,37 +26,36 @@ class BeakerCacheImpl(CacheImpl):
     def __init__(self, cache):
         if not has_beaker:
             raise exceptions.RuntimeException(
-                "Can't initialize Beaker plugin; Beaker is not installed."
-            )
+                "Can't initialize Beaker plugin; Beaker is not installed.")
         global _beaker_cache
         if _beaker_cache is None:
-            if "manager" in cache.template.cache_args:
-                _beaker_cache = cache.template.cache_args["manager"]
+            if 'manager' in cache.template.cache_args:
+                _beaker_cache = cache.template.cache_args['manager']
             else:
                 _beaker_cache = beaker_cache.CacheManager()
-        super().__init__(cache)
+        super(BeakerCacheImpl, self).__init__(cache)
 
     def _get_cache(self, **kw):
-        expiretime = kw.pop("timeout", None)
-        if "dir" in kw:
-            kw["data_dir"] = kw.pop("dir")
+        expiretime = kw.pop('timeout', None)
+        if 'dir' in kw:
+            kw['data_dir'] = kw.pop('dir')
         elif self.cache.template.module_directory:
-            kw["data_dir"] = self.cache.template.module_directory
+            kw['data_dir'] = self.cache.template.module_directory
 
-        if "manager" in kw:
-            kw.pop("manager")
+        if 'manager' in kw:
+            kw.pop('manager')
 
-        if kw.get("type") == "memcached":
-            kw["type"] = "ext:memcached"
+        if kw.get('type') == 'memcached':
+            kw['type'] = 'ext:memcached'
 
-        if "region" in kw:
-            region = kw.pop("region")
+        if 'region' in kw:
+            region = kw.pop('region')
             cache = _beaker_cache.get_cache_region(self.cache.id, region, **kw)
         else:
             cache = _beaker_cache.get_cache(self.cache.id, **kw)
-        cache_args = {"starttime": self.cache.starttime}
+        cache_args = {'starttime': self.cache.starttime}
         if expiretime:
-            cache_args["expiretime"] = expiretime
+            cache_args['expiretime'] = expiretime
         return cache, cache_args
 
     def get_or_create(self, key, creation_function, **kw):
diff --git a/lib/mako/ext/extract.py b/lib/mako/ext/extract.py
index d03789db..5ce51757 100644
--- a/lib/mako/ext/extract.py
+++ b/lib/mako/ext/extract.py
@@ -1,41 +1,28 @@
-# ext/extract.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
-#
-# This module is part of Mako and is released under
-# the MIT License: http://www.opensource.org/licenses/mit-license.php
-
-from io import BytesIO
-from io import StringIO
 import re
-
+from mako import compat
 from mako import lexer
 from mako import parsetree
 
 
-class MessageExtractor:
-    use_bytes = True
-
+class MessageExtractor(object):
     def process_file(self, fileobj):
         template_node = lexer.Lexer(
-            fileobj.read(), input_encoding=self.config["encoding"]
-        ).parse()
-        yield from self.extract_nodes(template_node.get_children())
+            fileobj.read(),
+            input_encoding=self.config['encoding']).parse()
+        for extracted in self.extract_nodes(template_node.get_children()):
+            yield extracted
 
     def extract_nodes(self, nodes):
         translator_comments = []
         in_translator_comments = False
-        input_encoding = self.config["encoding"] or "ascii"
         comment_tags = list(
-            filter(None, re.split(r"\s+", self.config["comment-tags"]))
-        )
+            filter(None, re.split(r'\s+', self.config['comment-tags'])))
 
         for node in nodes:
             child_nodes = None
-            if (
-                in_translator_comments
-                and isinstance(node, parsetree.Text)
-                and not node.content.strip()
-            ):
+            if in_translator_comments and \
+                    isinstance(node, parsetree.Text) and \
+                    not node.content.strip():
                 # Ignore whitespace within translator comments
                 continue
 
@@ -43,15 +30,13 @@ class MessageExtractor:
                 value = node.text.strip()
                 if in_translator_comments:
                     translator_comments.extend(
-                        self._split_comment(node.lineno, value)
-                    )
+                        self._split_comment(node.lineno, value))
                     continue
                 for comment_tag in comment_tags:
                     if value.startswith(comment_tag):
                         in_translator_comments = True
                         translator_comments.extend(
-                            self._split_comment(node.lineno, value)
-                        )
+                            self._split_comment(node.lineno, value))
                 continue
 
             if isinstance(node, parsetree.DefTag):
@@ -81,34 +66,22 @@ class MessageExtractor:
             else:
                 continue
 
-            # Comments don't apply unless they immediately precede the message
-            if (
-                translator_comments
-                and translator_comments[-1][0] < node.lineno - 1
-            ):
+            # Comments don't apply unless they immediately preceed the message
+            if translator_comments and \
+                    translator_comments[-1][0] < node.lineno - 1:
                 translator_comments = []
 
             translator_strings = [
-                comment[1] for comment in translator_comments
-            ]
+                comment[1] for comment in translator_comments]
 
-            if isinstance(code, str) and self.use_bytes:
-                code = code.encode(input_encoding, "backslashreplace")
+            if isinstance(code, compat.text_type):
+                code = code.encode('ascii', 'backslashreplace')
 
             used_translator_comments = False
-            # We add extra newline to work around a pybabel bug
-            # (see python-babel/babel#274, parse_encoding dies if the first
-            # input string of the input is non-ascii)
-            # Also, because we added it, we have to subtract one from
-            # node.lineno
-            if self.use_bytes:
-                code = BytesIO(b"\n" + code)
-            else:
-                code = StringIO("\n" + code)
+            code = compat.byte_buffer(code)
 
             for message in self.process_python(
-                code, node.lineno - 1, translator_strings
-            ):
+                    code, node.lineno, translator_strings):
                 yield message
                 used_translator_comments = True
 
@@ -117,13 +90,12 @@ class MessageExtractor:
             in_translator_comments = False
 
             if child_nodes:
-                yield from self.extract_nodes(child_nodes)
+                for extracted in self.extract_nodes(child_nodes):
+                    yield extracted
 
     @staticmethod
     def _split_comment(lineno, comment):
         """Return the multiline comment at lineno split into a list of
         comment line numbers and the accompanying comment line"""
-        return [
-            (lineno + index, line)
-            for index, line in enumerate(comment.splitlines())
-        ]
+        return [(lineno + index, line) for index, line in
+                enumerate(comment.splitlines())]
diff --git a/lib/mako/ext/linguaplugin.py b/lib/mako/ext/linguaplugin.py
index 22077e66..a809072c 100644
--- a/lib/mako/ext/linguaplugin.py
+++ b/lib/mako/ext/linguaplugin.py
@@ -1,57 +1,38 @@
-# ext/linguaplugin.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
-#
-# This module is part of Mako and is released under
-# the MIT License: http://www.opensource.org/licenses/mit-license.php
-
-import contextlib
 import io
-
 from lingua.extractors import Extractor
-from lingua.extractors import get_extractor
 from lingua.extractors import Message
-
+from lingua.extractors import get_extractor
 from mako.ext.extract import MessageExtractor
+from mako import compat
 
 
 class LinguaMakoExtractor(Extractor, MessageExtractor):
-    """Mako templates"""
-
-    use_bytes = False
-    extensions = [".mako"]
-    default_config = {"encoding": "utf-8", "comment-tags": ""}
+    '''Mako templates'''
+    extensions = ['.mako']
+    default_config = {
+        'encoding': 'utf-8',
+        'comment-tags': '',
+    }
 
     def __call__(self, filename, options, fileobj=None):
         self.options = options
         self.filename = filename
-        self.python_extractor = get_extractor("x.py")
+        self.python_extractor = get_extractor('x.py')
         if fileobj is None:
-            ctx = open(filename, "r")
-        else:
-            ctx = contextlib.nullcontext(fileobj)
-        with ctx as file_:
-            yield from self.process_file(file_)
+            fileobj = open(filename, 'rb')
+        return self.process_file(fileobj)
 
     def process_python(self, code, code_lineno, translator_strings):
         source = code.getvalue().strip()
-        if source.endswith(":"):
-            if source in ("try:", "else:") or source.startswith("except"):
-                source = ""  # Ignore try/except and else
-            elif source.startswith("elif"):
-                source = source[2:]  # Replace "elif" with "if"
-            source += "pass"
-        code = io.StringIO(source)
+        if source.endswith(compat.b(':')):
+            source += compat.b(' pass')
+            code = io.BytesIO(source)
         for msg in self.python_extractor(
-            self.filename, self.options, code, code_lineno - 1
-        ):
+                self.filename, self.options, code, code_lineno):
             if translator_strings:
-                msg = Message(
-                    msg.msgctxt,
-                    msg.msgid,
-                    msg.msgid_plural,
-                    msg.flags,
-                    " ".join(translator_strings + [msg.comment]),
-                    msg.tcomment,
-                    msg.location,
-                )
+                msg = Message(msg.msgctxt, msg.msgid, msg.msgid_plural,
+                              msg.flags,
+                              compat.u(' ').join(
+                                  translator_strings + [msg.comment]),
+                              msg.tcomment, msg.location)
             yield msg
diff --git a/lib/mako/ext/preprocessors.py b/lib/mako/ext/preprocessors.py
index 6d1aaf5d..c24893bd 100644
--- a/lib/mako/ext/preprocessors.py
+++ b/lib/mako/ext/preprocessors.py
@@ -1,20 +1,20 @@
 # ext/preprocessors.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright (C) 2006-2015 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
-"""preprocessing functions, used with the 'preprocessor'
+"""preprocessing functions, used with the 'preprocessor' 
 argument on Template, TemplateLookup"""
 
 import re
 
-
 def convert_comments(text):
     """preprocess old style comments.
-
+ 
     example:
-
+ 
     from mako.ext.preprocessors import convert_comments
     t = Template(..., preprocessor=convert_comments)"""
-    return re.sub(r"(?<=\n)\s*#[^#]", "##", text)
+    return re.sub(r'(?<=\n)\s*#[^#]', "##", text)
+
diff --git a/lib/mako/ext/pygmentplugin.py b/lib/mako/ext/pygmentplugin.py
index f422623d..3adcfb8c 100644
--- a/lib/mako/ext/pygmentplugin.py
+++ b/lib/mako/ext/pygmentplugin.py
@@ -1,71 +1,44 @@
 # ext/pygmentplugin.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright (C) 2006-2015 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
-from pygments import highlight
+from pygments.lexers.web import \
+     HtmlLexer, XmlLexer, JavascriptLexer, CssLexer
+from pygments.lexers.agile import PythonLexer, Python3Lexer
+from pygments.lexer import DelegatingLexer, RegexLexer, bygroups, \
+     include, using
+from pygments.token import \
+     Text, Comment, Operator, Keyword, Name, String, Other
 from pygments.formatters.html import HtmlFormatter
-from pygments.lexer import bygroups
-from pygments.lexer import DelegatingLexer
-from pygments.lexer import include
-from pygments.lexer import RegexLexer
-from pygments.lexer import using
-from pygments.lexers.agile import Python3Lexer
-from pygments.lexers.agile import PythonLexer
-from pygments.lexers.web import CssLexer
-from pygments.lexers.web import HtmlLexer
-from pygments.lexers.web import JavascriptLexer
-from pygments.lexers.web import XmlLexer
-from pygments.token import Comment
-from pygments.token import Keyword
-from pygments.token import Name
-from pygments.token import Operator
-from pygments.token import Other
-from pygments.token import String
-from pygments.token import Text
-
+from pygments import highlight
+from mako import compat
 
 class MakoLexer(RegexLexer):
-    name = "Mako"
-    aliases = ["mako"]
-    filenames = ["*.mao"]
+    name = 'Mako'
+    aliases = ['mako']
+    filenames = ['*.mao']
 
     tokens = {
-        "root": [
-            (
-                r"(\s*)(\%)(\s*end(?:\w+))(\n|\Z)",
-                bygroups(Text, Comment.Preproc, Keyword, Other),
-            ),
-            (
-                r"(\s*)(\%(?!%))([^\n]*)(\n|\Z)",
-                bygroups(Text, Comment.Preproc, using(PythonLexer), Other),
-            ),
-            (
-                r"(\s*)(##[^\n]*)(\n|\Z)",
-                bygroups(Text, Comment.Preproc, Other),
-            ),
-            (r"""(?s)<%doc>.*?</%doc>""", Comment.Preproc),
-            (
-                r"(<%)([\w\.\:]+)",
-                bygroups(Comment.Preproc, Name.Builtin),
-                "tag",
-            ),
-            (
-                r"(</%)([\w\.\:]+)(>)",
-                bygroups(Comment.Preproc, Name.Builtin, Comment.Preproc),
-            ),
-            (r"<%(?=([\w\.\:]+))", Comment.Preproc, "ondeftags"),
-            (
-                r"(?s)(<%(?:!?))(.*?)(%>)",
-                bygroups(Comment.Preproc, using(PythonLexer), Comment.Preproc),
-            ),
-            (
-                r"(\$\{)(.*?)(\})",
-                bygroups(Comment.Preproc, using(PythonLexer), Comment.Preproc),
-            ),
-            (
-                r"""(?sx)
+        'root': [
+            (r'(\s*)(\%)(\s*end(?:\w+))(\n|\Z)',
+             bygroups(Text, Comment.Preproc, Keyword, Other)),
+            (r'(\s*)(\%(?!%))([^\n]*)(\n|\Z)',
+             bygroups(Text, Comment.Preproc, using(PythonLexer), Other)),
+            (r'(\s*)(##[^\n]*)(\n|\Z)',
+              bygroups(Text, Comment.Preproc, Other)),
+            (r'''(?s)<%doc>.*?</%doc>''', Comment.Preproc),
+            (r'(<%)([\w\.\:]+)',
+              bygroups(Comment.Preproc, Name.Builtin), 'tag'),
+            (r'(</%)([\w\.\:]+)(>)',
+              bygroups(Comment.Preproc, Name.Builtin, Comment.Preproc)),
+            (r'<%(?=([\w\.\:]+))', Comment.Preproc, 'ondeftags'),
+            (r'(<%(?:!?))(.*?)(%>)(?s)',
+              bygroups(Comment.Preproc, using(PythonLexer), Comment.Preproc)),
+            (r'(\$\{)(.*?)(\})',
+             bygroups(Comment.Preproc, using(PythonLexer), Comment.Preproc)),
+            (r'''(?sx)
                 (.+?)               # anything, followed by:
                 (?:
                  (?<=\n)(?=%(?!%)|\#\#) |  # an eval or comment line
@@ -78,73 +51,72 @@ class MakoLexer(RegexLexer):
                  (\\\n) |           # an escaped newline
                  \Z                 # end of string
                 )
-            """,
-                bygroups(Other, Operator),
-            ),
-            (r"\s+", Text),
+            ''', bygroups(Other, Operator)),
+            (r'\s+', Text),
         ],
-        "ondeftags": [
-            (r"<%", Comment.Preproc),
-            (r"(?<=<%)(include|inherit|namespace|page)", Name.Builtin),
-            include("tag"),
+        'ondeftags': [
+            (r'<%', Comment.Preproc),
+            (r'(?<=<%)(include|inherit|namespace|page)', Name.Builtin),
+            include('tag'),
         ],
-        "tag": [
-            (r'((?:\w+)\s*=)\s*(".*?")', bygroups(Name.Attribute, String)),
-            (r"/?\s*>", Comment.Preproc, "#pop"),
-            (r"\s+", Text),
+        'tag': [
+            (r'((?:\w+)\s*=)\s*(".*?")',
+             bygroups(Name.Attribute, String)),
+            (r'/?\s*>', Comment.Preproc, '#pop'),
+            (r'\s+', Text),
         ],
-        "attr": [
-            ('".*?"', String, "#pop"),
-            ("'.*?'", String, "#pop"),
-            (r"[^\s>]+", String, "#pop"),
+        'attr': [
+            ('".*?"', String, '#pop'),
+            ("'.*?'", String, '#pop'),
+            (r'[^\s>]+', String, '#pop'),
         ],
     }
 
 
 class MakoHtmlLexer(DelegatingLexer):
-    name = "HTML+Mako"
-    aliases = ["html+mako"]
+    name = 'HTML+Mako'
+    aliases = ['html+mako']
 
     def __init__(self, **options):
-        super().__init__(HtmlLexer, MakoLexer, **options)
-
+        super(MakoHtmlLexer, self).__init__(HtmlLexer, MakoLexer,
+                                              **options)
 
 class MakoXmlLexer(DelegatingLexer):
-    name = "XML+Mako"
-    aliases = ["xml+mako"]
+    name = 'XML+Mako'
+    aliases = ['xml+mako']
 
     def __init__(self, **options):
-        super().__init__(XmlLexer, MakoLexer, **options)
-
+        super(MakoXmlLexer, self).__init__(XmlLexer, MakoLexer,
+                                             **options)
 
 class MakoJavascriptLexer(DelegatingLexer):
-    name = "JavaScript+Mako"
-    aliases = ["js+mako", "javascript+mako"]
+    name = 'JavaScript+Mako'
+    aliases = ['js+mako', 'javascript+mako']
 
     def __init__(self, **options):
-        super().__init__(JavascriptLexer, MakoLexer, **options)
-
+        super(MakoJavascriptLexer, self).__init__(JavascriptLexer,
+                                                    MakoLexer, **options)
 
 class MakoCssLexer(DelegatingLexer):
-    name = "CSS+Mako"
-    aliases = ["css+mako"]
+    name = 'CSS+Mako'
+    aliases = ['css+mako']
 
     def __init__(self, **options):
-        super().__init__(CssLexer, MakoLexer, **options)
+        super(MakoCssLexer, self).__init__(CssLexer, MakoLexer,
+                                             **options)
 
 
-pygments_html_formatter = HtmlFormatter(
-    cssclass="syntax-highlighted", linenos=True
-)
-
-
-def syntax_highlight(filename="", language=None):
+pygments_html_formatter = HtmlFormatter(cssclass='syntax-highlighted',
+                                        linenos=True)
+def syntax_highlight(filename='', language=None):
     mako_lexer = MakoLexer()
-    python_lexer = Python3Lexer()
-    if filename.startswith("memory:") or language == "mako":
-        return lambda string: highlight(
-            string, mako_lexer, pygments_html_formatter
-        )
-    return lambda string: highlight(
-        string, python_lexer, pygments_html_formatter
-    )
+    if compat.py3k:
+        python_lexer = Python3Lexer()
+    else:
+        python_lexer = PythonLexer()
+    if filename.startswith('memory:') or language == 'mako':
+        return lambda string: highlight(string, mako_lexer,
+                                        pygments_html_formatter)
+    return lambda string: highlight(string, python_lexer,
+                                    pygments_html_formatter)
+
diff --git a/lib/mako/ext/turbogears.py b/lib/mako/ext/turbogears.py
index 2a3ec7d7..d3976d97 100644
--- a/lib/mako/ext/turbogears.py
+++ b/lib/mako/ext/turbogears.py
@@ -1,19 +1,18 @@
 # ext/turbogears.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright (C) 2006-2015 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
+import inspect
 from mako import compat
 from mako.lookup import TemplateLookup
 from mako.template import Template
 
-
-class TGPlugin:
-
+class TGPlugin(object):
     """TurboGears compatible Template Plugin."""
 
-    def __init__(self, extra_vars_func=None, options=None, extension="mak"):
+    def __init__(self, extra_vars_func=None, options=None, extension='mak'):
         self.extra_vars_func = extra_vars_func
         self.extension = extension
         if not options:
@@ -22,16 +21,16 @@ class TGPlugin:
         # Pull the options out and initialize the lookup
         lookup_options = {}
         for k, v in options.items():
-            if k.startswith("mako."):
+            if k.startswith('mako.'):
                 lookup_options[k[5:]] = v
-            elif k in ["directories", "filesystem_checks", "module_directory"]:
+            elif k in ['directories', 'filesystem_checks', 'module_directory']:
                 lookup_options[k] = v
         self.lookup = TemplateLookup(**lookup_options)
 
         self.tmpl_options = {}
         # transfer lookup args to template args, based on those available
         # in getargspec
-        for kw in compat.inspect_getargspec(Template.__init__)[0]:
+        for kw in inspect.getargspec(Template.__init__)[0]:
             if kw in lookup_options:
                 self.tmpl_options[kw] = lookup_options[kw]
 
@@ -40,18 +39,15 @@ class TGPlugin:
         if template_string is not None:
             return Template(template_string, **self.tmpl_options)
         # Translate TG dot notation to normal / template path
-        if "/" not in templatename:
-            templatename = (
-                "/" + templatename.replace(".", "/") + "." + self.extension
-            )
+        if '/' not in templatename:
+            templatename = '/' + templatename.replace('.', '/') + '.' +\
+                    self.extension
 
         # Lookup template
         return self.lookup.get_template(templatename)
 
-    def render(
-        self, info, format="html", fragment=False, template=None  # noqa
-    ):
-        if isinstance(template, str):
+    def render(self, info, format="html", fragment=False, template=None):
+        if isinstance(template, compat.string_types):
             template = self.load_template(template)
 
         # Load extra vars func if provided
@@ -59,3 +55,4 @@ class TGPlugin:
             info.update(self.extra_vars_func())
 
         return template.render(**info)
+
diff --git a/lib/mako/filters.py b/lib/mako/filters.py
index 2a4b4386..d79ce238 100644
--- a/lib/mako/filters.py
+++ b/lib/mako/filters.py
@@ -1,64 +1,91 @@
 # mako/filters.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright (C) 2006-2015 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 
-import codecs
-from html.entities import codepoint2name
-from html.entities import name2codepoint
 import re
-from urllib.parse import quote_plus
+import codecs
 
-import markupsafe
+from mako.compat import quote_plus, unquote_plus, codepoint2name, \
+        name2codepoint
 
-html_escape = markupsafe.escape
+from mako import compat
 
 xml_escapes = {
-    "&": "&amp;",
-    ">": "&gt;",
-    "<": "&lt;",
-    '"': "&#34;",  # also &quot; in html-only
-    "'": "&#39;",  # also &apos; in html-only
+    '&': '&amp;',
+    '>': '&gt;',
+    '<': '&lt;',
+    '"': '&#34;',   # also &quot; in html-only
+    "'": '&#39;'    # also &apos; in html-only
 }
 
+# XXX: &quot; is valid in HTML and XML
+#      &apos; is not valid HTML, but is valid XML
+
+def legacy_html_escape(s):
+    """legacy HTML escape for non-unicode mode."""
+    s = s.replace("&", "&amp;")
+    s = s.replace(">", "&gt;")
+    s = s.replace("<", "&lt;")
+    s = s.replace('"', "&#34;")
+    s = s.replace("'", "&#39;")
+    return s
+
+
+try:
+    import markupsafe
+    html_escape = markupsafe.escape
+except ImportError:
+    html_escape = legacy_html_escape
 
 def xml_escape(string):
     return re.sub(r'([&<"\'>])', lambda m: xml_escapes[m.group()], string)
 
-
 def url_escape(string):
     # convert into a list of octets
     string = string.encode("utf8")
     return quote_plus(string)
 
+def legacy_url_escape(string):
+    # convert into a list of octets
+    return quote_plus(string)
+
+def url_unescape(string):
+    text = unquote_plus(string)
+    if not is_ascii_str(text):
+        text = text.decode("utf8")
+    return text
 
 def trim(string):
     return string.strip()
 
 
-class Decode:
+class Decode(object):
     def __getattr__(self, key):
         def decode(x):
-            if isinstance(x, str):
+            if isinstance(x, compat.text_type):
                 return x
-            elif not isinstance(x, bytes):
+            elif not isinstance(x, compat.binary_type):
                 return decode(str(x))
             else:
-                return str(x, encoding=key)
-
+                return compat.text_type(x, encoding=key)
         return decode
-
-
 decode = Decode()
 
 
-class XMLEntityEscaper:
+_ASCII_re = re.compile(r'\A[\x00-\x7f]*\Z')
+
+def is_ascii_str(text):
+    return isinstance(text, str) and _ASCII_re.match(text)
+
+################################################################
+
+class XMLEntityEscaper(object):
     def __init__(self, codepoint2name, name2codepoint):
-        self.codepoint2entity = {
-            c: str("&%s;" % n) for c, n in codepoint2name.items()
-        }
+        self.codepoint2entity = dict([(c, compat.text_type('&%s;' % n))
+                                      for c, n in codepoint2name.items()])
         self.name2codepoint = name2codepoint
 
     def escape_entities(self, text):
@@ -66,14 +93,15 @@ class XMLEntityEscaper:
 
         Only characters corresponding to a named entity are replaced.
         """
-        return str(text).translate(self.codepoint2entity)
+        return compat.text_type(text).translate(self.codepoint2entity)
 
     def __escape(self, m):
         codepoint = ord(m.group())
         try:
             return self.codepoint2entity[codepoint]
         except (KeyError, IndexError):
-            return "&#x%X;" % codepoint
+            return '&#x%X;' % codepoint
+
 
     __escapable = re.compile(r'["&<>]|[^\x00-\x7f]')
 
@@ -86,20 +114,19 @@ class XMLEntityEscaper:
 
         The return value is guaranteed to be ASCII.
         """
-        return self.__escapable.sub(self.__escape, str(text)).encode("ascii")
+        return self.__escapable.sub(self.__escape, compat.text_type(text)
+                                    ).encode('ascii')
 
     # XXX: This regexp will not match all valid XML entity names__.
     # (It punts on details involving involving CombiningChars and Extenders.)
     #
     # .. __: http://www.w3.org/TR/2000/REC-xml-20001006#NT-EntityRef
-    __characterrefs = re.compile(
-        r"""& (?:
+    __characterrefs = re.compile(r'''& (?:
                                           \#(\d+)
                                           | \#x([\da-f]+)
                                           | ( (?!\d) [:\w] [-.:\w]+ )
-                                          ) ;""",
-        re.X | re.UNICODE,
-    )
+                                          ) ;''',
+                                 re.X | re.UNICODE)
 
     def __unescape(self, m):
         dval, hval, name = m.groups()
@@ -108,7 +135,7 @@ class XMLEntityEscaper:
         elif hval:
             codepoint = int(hval, 16)
         else:
-            codepoint = self.name2codepoint.get(name, 0xFFFD)
+            codepoint = self.name2codepoint.get(name, 0xfffd)
             # U+FFFD = "REPLACEMENT CHARACTER"
         if codepoint < 128:
             return chr(codepoint)
@@ -132,32 +159,43 @@ html_entities_unescape = _html_entities_escaper.unescape
 def htmlentityreplace_errors(ex):
     """An encoding error handler.
 
-    This python codecs error handler replaces unencodable
+    This python `codecs`_ error handler replaces unencodable
     characters with HTML entities, or, if no HTML entity exists for
-    the character, XML character references::
+    the character, XML character references.
 
-        >>> 'The cost was \u20ac12.'.encode('latin1', 'htmlentityreplace')
-        'The cost was &euro;12.'
+    >>> u'The cost was \u20ac12.'.encode('latin1', 'htmlentityreplace')
+    'The cost was &euro;12.'
     """
     if isinstance(ex, UnicodeEncodeError):
         # Handle encoding errors
-        bad_text = ex.object[ex.start : ex.end]
+        bad_text = ex.object[ex.start:ex.end]
         text = _html_entities_escaper.escape(bad_text)
-        return (str(text), ex.end)
+        return (compat.text_type(text), ex.end)
     raise ex
 
-
-codecs.register_error("htmlentityreplace", htmlentityreplace_errors)
+codecs.register_error('htmlentityreplace', htmlentityreplace_errors)
 
 
+# TODO: options to make this dynamic per-compilation will be added in a later
+# release
 DEFAULT_ESCAPES = {
-    "x": "filters.xml_escape",
-    "h": "filters.html_escape",
-    "u": "filters.url_escape",
-    "trim": "filters.trim",
-    "entity": "filters.html_entities_escape",
-    "unicode": "str",
-    "decode": "decode",
-    "str": "str",
-    "n": "n",
+    'x': 'filters.xml_escape',
+    'h': 'filters.html_escape',
+    'u': 'filters.url_escape',
+    'trim': 'filters.trim',
+    'entity': 'filters.html_entities_escape',
+    'unicode': 'unicode',
+    'decode': 'decode',
+    'str': 'str',
+    'n': 'n'
 }
+
+if compat.py3k:
+    DEFAULT_ESCAPES.update({
+        'unicode': 'str'
+    })
+
+NON_UNICODE_ESCAPES = DEFAULT_ESCAPES.copy()
+NON_UNICODE_ESCAPES['h'] = 'filters.legacy_html_escape'
+NON_UNICODE_ESCAPES['u'] = 'filters.legacy_url_escape'
+
diff --git a/lib/mako/lexer.py b/lib/mako/lexer.py
index b4a76a45..1dda3982 100644
--- a/lib/mako/lexer.py
+++ b/lib/mako/lexer.py
@@ -1,25 +1,22 @@
 # mako/lexer.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright (C) 2006-2015 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 """provides the Lexer class for parsing template strings into parse trees."""
 
-import codecs
 import re
-
-from mako import exceptions
-from mako import parsetree
+import codecs
+from mako import parsetree, exceptions, compat
 from mako.pygen import adjust_whitespace
 
 _regexp_cache = {}
 
-
-class Lexer:
-    def __init__(
-        self, text, filename=None, input_encoding=None, preprocessor=None
-    ):
+class Lexer(object):
+    def __init__(self, text, filename=None,
+                        disable_unicode=False,
+                        input_encoding=None, preprocessor=None):
         self.text = text
         self.filename = filename
         self.template = parsetree.TemplateNode(self.filename)
@@ -30,23 +27,27 @@ class Lexer:
         self.tag = []
         self.control_line = []
         self.ternary_stack = []
+        self.disable_unicode = disable_unicode
         self.encoding = input_encoding
 
+        if compat.py3k and disable_unicode:
+            raise exceptions.UnsupportedError(
+                                    "Mako for Python 3 does not "
+                                    "support disabling Unicode")
+
         if preprocessor is None:
             self.preprocessor = []
-        elif not hasattr(preprocessor, "__iter__"):
+        elif not hasattr(preprocessor, '__iter__'):
             self.preprocessor = [preprocessor]
         else:
             self.preprocessor = preprocessor
 
     @property
     def exception_kwargs(self):
-        return {
-            "source": self.text,
-            "lineno": self.matched_lineno,
-            "pos": self.matched_charpos,
-            "filename": self.filename,
-        }
+        return {'source': self.text,
+                'lineno': self.matched_lineno,
+                'pos': self.matched_charpos,
+                'filename': self.filename}
 
     def match(self, regexp, flags=None):
         """compile the given regexp, cache the reg, and call match_reg()."""
@@ -54,7 +55,10 @@ class Lexer:
         try:
             reg = _regexp_cache[(regexp, flags)]
         except KeyError:
-            reg = re.compile(regexp, flags) if flags else re.compile(regexp)
+            if flags:
+                reg = re.compile(regexp, flags)
+            else:
+                reg = re.compile(regexp)
             _regexp_cache[(regexp, flags)] = reg
 
         return self.match_reg(reg)
@@ -72,60 +76,59 @@ class Lexer:
         match = reg.match(self.text, self.match_position)
         if match:
             (start, end) = match.span()
-            self.match_position = end + 1 if end == start else end
+            if end == start:
+                self.match_position = end + 1
+            else:
+                self.match_position = end
             self.matched_lineno = self.lineno
+            lines = re.findall(r"\n", self.text[mp:self.match_position])
             cp = mp - 1
-            if cp >= 0 and cp < self.textlength:
-                cp = self.text[: cp + 1].rfind("\n")
+            while (cp >= 0 and cp < self.textlength and self.text[cp] != '\n'):
+                cp -= 1
             self.matched_charpos = mp - cp
-            self.lineno += self.text[mp : self.match_position].count("\n")
+            self.lineno += len(lines)
+            #print "MATCHED:", match.group(0), "LINE START:",
+            # self.matched_lineno, "LINE END:", self.lineno
+        #print "MATCH:", regexp, "\n", self.text[mp : mp + 15], \
+        #          (match and "TRUE" or "FALSE")
         return match
 
-    def parse_until_text(self, watch_nesting, *text):
+    def parse_until_text(self, *text):
         startpos = self.match_position
-        text_re = r"|".join(text)
+        text_re = r'|'.join(text)
         brace_level = 0
-        paren_level = 0
-        bracket_level = 0
         while True:
-            match = self.match(r"#.*\n")
+            match = self.match(r'#.*\n')
             if match:
                 continue
-            match = self.match(
-                r"(\"\"\"|\'\'\'|\"|\')[^\\]*?(\\.[^\\]*?)*\1", re.S
-            )
+            match = self.match(r'(\"\"\"|\'\'\'|\"|\')((?<!\\)\\\1|.)*?\1',
+                               re.S)
             if match:
                 continue
-            match = self.match(r"(%s)" % text_re)
-            if match and not (
-                watch_nesting
-                and (brace_level > 0 or paren_level > 0 or bracket_level > 0)
-            ):
-                return (
-                    self.text[
-                        startpos : self.match_position - len(match.group(1))
-                    ],
-                    match.group(1),
-                )
-            elif not match:
-                match = self.match(r"(.*?)(?=\"|\'|#|%s)" % text_re, re.S)
+            match = self.match(r'(%s)' % text_re)
             if match:
-                brace_level += match.group(1).count("{")
-                brace_level -= match.group(1).count("}")
-                paren_level += match.group(1).count("(")
-                paren_level -= match.group(1).count(")")
-                bracket_level += match.group(1).count("[")
-                bracket_level -= match.group(1).count("]")
+                if match.group(1) == '}' and brace_level > 0:
+                    brace_level -= 1
+                    continue
+                return \
+                    self.text[startpos:
+                              self.match_position - len(match.group(1))],\
+                    match.group(1)
+            match = self.match(r"(.*?)(?=\"|\'|#|%s)" % text_re, re.S)
+            if match:
+                brace_level += match.group(1).count('{')
+                brace_level -= match.group(1).count('}')
                 continue
             raise exceptions.SyntaxException(
-                "Expected: %s" % ",".join(text), **self.exception_kwargs
-            )
+                        "Expected: %s" %
+                        ','.join(text),
+                        **self.exception_kwargs)
 
     def append_node(self, nodecls, *args, **kwargs):
-        kwargs.setdefault("source", self.text)
-        kwargs.setdefault("lineno", self.matched_lineno)
-        kwargs.setdefault("pos", self.matched_charpos)
-        kwargs["filename"] = self.filename
+        kwargs.setdefault('source', self.text)
+        kwargs.setdefault('lineno', self.matched_lineno)
+        kwargs.setdefault('pos', self.matched_charpos)
+        kwargs['filename'] = self.filename
         node = nodecls(*args, **kwargs)
         if len(self.tag):
             self.tag[-1].nodes.append(node)
@@ -138,15 +141,10 @@ class Lexer:
         if self.control_line:
             control_frame = self.control_line[-1]
             control_frame.nodes.append(node)
-            if (
-                not (
-                    isinstance(node, parsetree.ControlLine)
-                    and control_frame.is_ternary(node.keyword)
-                )
-                and self.ternary_stack
-                and self.ternary_stack[-1]
-            ):
-                self.ternary_stack[-1][-1].nodes.append(node)
+            if not (isinstance(node, parsetree.ControlLine) and
+                    control_frame.is_ternary(node.keyword)):
+                if self.ternary_stack and self.ternary_stack[-1]:
+                    self.ternary_stack[-1][-1].nodes.append(node)
         if isinstance(node, parsetree.Tag):
             if len(self.tag):
                 node.parent = self.tag[-1]
@@ -158,67 +156,63 @@ class Lexer:
             elif node.is_primary:
                 self.control_line.append(node)
                 self.ternary_stack.append([])
-            elif self.control_line and self.control_line[-1].is_ternary(
-                node.keyword
-            ):
+            elif self.control_line and \
+                    self.control_line[-1].is_ternary(node.keyword):
                 self.ternary_stack[-1].append(node)
-            elif self.control_line and not self.control_line[-1].is_ternary(
-                node.keyword
-            ):
+            elif self.control_line and \
+                    not self.control_line[-1].is_ternary(node.keyword):
                 raise exceptions.SyntaxException(
-                    "Keyword '%s' not a legal ternary for keyword '%s'"
-                    % (node.keyword, self.control_line[-1].keyword),
-                    **self.exception_kwargs,
-                )
+                        "Keyword '%s' not a legal ternary for keyword '%s'" %
+                        (node.keyword, self.control_line[-1].keyword),
+                        **self.exception_kwargs)
 
-    _coding_re = re.compile(r"#.*coding[:=]\s*([-\w.]+).*\r?\n")
+    _coding_re = re.compile(r'#.*coding[:=]\s*([-\w.]+).*\r?\n')
 
     def decode_raw_stream(self, text, decode_raw, known_encoding, filename):
         """given string/unicode or bytes/string, determine encoding
-        from magic encoding comment, return body as unicode
-        or raw if decode_raw=False
+           from magic encoding comment, return body as unicode
+           or raw if decode_raw=False
 
         """
-        if isinstance(text, str):
+        if isinstance(text, compat.text_type):
             m = self._coding_re.match(text)
-            encoding = m and m.group(1) or known_encoding or "utf-8"
+            encoding = m and m.group(1) or known_encoding or 'ascii'
             return encoding, text
 
         if text.startswith(codecs.BOM_UTF8):
-            text = text[len(codecs.BOM_UTF8) :]
-            parsed_encoding = "utf-8"
-            m = self._coding_re.match(text.decode("utf-8", "ignore"))
-            if m is not None and m.group(1) != "utf-8":
+            text = text[len(codecs.BOM_UTF8):]
+            parsed_encoding = 'utf-8'
+            m = self._coding_re.match(text.decode('utf-8', 'ignore'))
+            if m is not None and m.group(1) != 'utf-8':
                 raise exceptions.CompileException(
-                    "Found utf-8 BOM in file, with conflicting "
-                    "magic encoding comment of '%s'" % m.group(1),
-                    text.decode("utf-8", "ignore"),
-                    0,
-                    0,
-                    filename,
-                )
+                                "Found utf-8 BOM in file, with conflicting "
+                                "magic encoding comment of '%s'" % m.group(1),
+                                text.decode('utf-8', 'ignore'),
+                                0, 0, filename)
         else:
-            m = self._coding_re.match(text.decode("utf-8", "ignore"))
-            parsed_encoding = m.group(1) if m else known_encoding or "utf-8"
+            m = self._coding_re.match(text.decode('utf-8', 'ignore'))
+            if m:
+                parsed_encoding = m.group(1)
+            else:
+                parsed_encoding = known_encoding or 'ascii'
+
         if decode_raw:
             try:
                 text = text.decode(parsed_encoding)
             except UnicodeDecodeError:
                 raise exceptions.CompileException(
-                    "Unicode decode operation of encoding '%s' failed"
-                    % parsed_encoding,
-                    text.decode("utf-8", "ignore"),
-                    0,
-                    0,
-                    filename,
-                )
+                        "Unicode decode operation of encoding '%s' failed" %
+                        parsed_encoding,
+                        text.decode('utf-8', 'ignore'),
+                        0, 0, filename)
 
         return parsed_encoding, text
 
     def parse(self):
-        self.encoding, self.text = self.decode_raw_stream(
-            self.text, True, self.encoding, self.filename
-        )
+        self.encoding, self.text = self.decode_raw_stream(self.text,
+                                        not self.disable_unicode,
+                                        self.encoding,
+                                        self.filename,)
 
         for preproc in self.preprocessor:
             self.text = preproc(self.text)
@@ -229,7 +223,7 @@ class Lexer:
 
         self.textlength = len(self.text)
 
-        while True:
+        while (True):
             if self.match_position > self.textlength:
                 break
 
@@ -247,143 +241,117 @@ class Lexer:
                 continue
             if self.match_python_block():
                 continue
-            if self.match_percent():
-                continue
             if self.match_text():
                 continue
 
             if self.match_position > self.textlength:
                 break
-            # TODO: no coverage here
-            raise exceptions.MakoException("assertion failed")
+            raise exceptions.CompileException("assertion failed")
 
         if len(self.tag):
-            raise exceptions.SyntaxException(
-                "Unclosed tag: <%%%s>" % self.tag[-1].keyword,
-                **self.exception_kwargs,
-            )
+            raise exceptions.SyntaxException("Unclosed tag: <%%%s>" %
+                                                self.tag[-1].keyword,
+                                                **self.exception_kwargs)
         if len(self.control_line):
             raise exceptions.SyntaxException(
-                "Unterminated control keyword: '%s'"
-                % self.control_line[-1].keyword,
-                self.text,
-                self.control_line[-1].lineno,
-                self.control_line[-1].pos,
-                self.filename,
-            )
+                                    "Unterminated control keyword: '%s'" %
+                                    self.control_line[-1].keyword,
+                                    self.text,
+                                    self.control_line[-1].lineno,
+                                    self.control_line[-1].pos, self.filename)
         return self.template
 
     def match_tag_start(self):
-        reg = r"""
+        match = self.match(r'''
             \<%     # opening tag
 
             ([\w\.\:]+)   # keyword
 
-            ((?:\s+\w+|\s*=\s*|"[^"]*?"|'[^']*?'|\s*,\s*)*)  # attrname, = \
+            ((?:\s+\w+|\s*=\s*|".*?"|'.*?')*)  # attrname, = \
                                                #        sign, string expression
-                                               # comma is for backwards compat
-                                               # identified in #366
 
             \s*     # more whitespace
 
             (/)?>   # closing
 
-        """
+            ''',
 
-        match = self.match(
-            reg,
-            re.I | re.S | re.X,
-        )
+            re.I | re.S | re.X)
 
-        if not match:
+        if match:
+            keyword, attr, isend = match.groups()
+            self.keyword = keyword
+            attributes = {}
+            if attr:
+                for att in re.findall(
+                           r"\s*(\w+)\s*=\s*(?:'([^']*)'|\"([^\"]*)\")", attr):
+                    key, val1, val2 = att
+                    text = val1 or val2
+                    text = text.replace('\r\n', '\n')
+                    attributes[key] = text
+            self.append_node(parsetree.Tag, keyword, attributes)
+            if isend:
+                self.tag.pop()
+            else:
+                if keyword == 'text':
+                    match = self.match(r'(.*?)(?=\</%text>)',  re.S)
+                    if not match:
+                        raise exceptions.SyntaxException(
+                                            "Unclosed tag: <%%%s>" %
+                                            self.tag[-1].keyword,
+                                            **self.exception_kwargs)
+                    self.append_node(parsetree.Text, match.group(1))
+                    return self.match_tag_end()
+            return True
+        else:
             return False
 
-        keyword, attr, isend = match.groups()
-        self.keyword = keyword
-        attributes = {}
-        if attr:
-            for att in re.findall(
-                r"\s*(\w+)\s*=\s*(?:'([^']*)'|\"([^\"]*)\")", attr
-            ):
-                key, val1, val2 = att
-                text = val1 or val2
-                text = text.replace("\r\n", "\n")
-                attributes[key] = text
-        self.append_node(parsetree.Tag, keyword, attributes)
-        if isend:
-            self.tag.pop()
-        elif keyword == "text":
-            match = self.match(r"(.*?)(?=\</%text>)", re.S)
-            if not match:
-                raise exceptions.SyntaxException(
-                    "Unclosed tag: <%%%s>" % self.tag[-1].keyword,
-                    **self.exception_kwargs,
-                )
-            self.append_node(parsetree.Text, match.group(1))
-            return self.match_tag_end()
-        return True
-
     def match_tag_end(self):
-        match = self.match(r"\</%[\t ]*([^\t ]+?)[\t ]*>")
+        match = self.match(r'\</%[\t ]*(.+?)[\t ]*>')
         if match:
             if not len(self.tag):
                 raise exceptions.SyntaxException(
-                    "Closing tag without opening tag: </%%%s>"
-                    % match.group(1),
-                    **self.exception_kwargs,
-                )
+                                "Closing tag without opening tag: </%%%s>" %
+                                match.group(1),
+                                **self.exception_kwargs)
             elif self.tag[-1].keyword != match.group(1):
                 raise exceptions.SyntaxException(
-                    "Closing tag </%%%s> does not match tag: <%%%s>"
-                    % (match.group(1), self.tag[-1].keyword),
-                    **self.exception_kwargs,
-                )
+                            "Closing tag </%%%s> does not match tag: <%%%s>" %
+                            (match.group(1), self.tag[-1].keyword),
+                            **self.exception_kwargs)
             self.tag.pop()
             return True
         else:
             return False
 
     def match_end(self):
-        match = self.match(r"\Z", re.S)
-        if not match:
-            return False
-
-        string = match.group()
-        if string:
-            return string
-        else:
-            return True
-
-    def match_percent(self):
-        match = self.match(r"(?<=^)(\s*)%%(%*)", re.M)
+        match = self.match(r'\Z', re.S)
         if match:
-            self.append_node(
-                parsetree.Text, match.group(1) + "%" + match.group(2)
-            )
-            return True
+            string = match.group()
+            if string:
+                return string
+            else:
+                return True
         else:
             return False
 
     def match_text(self):
-        match = self.match(
-            r"""
+        match = self.match(r"""
                 (.*?)         # anything, followed by:
                 (
-                 (?<=\n)(?=[ \t]*(?=%|\#\#))  # an eval or line-based
-                                            # comment, preceded by a
-                                            # consumed newline and whitespace
+                 (?<=\n)(?=[ \t]*(?=%|\#\#)) # an eval or line-based
+                                             # comment preceded by a
+                                             # consumed newline and whitespace
                  |
                  (?=\${)      # an expression
                  |
-                 (?=</?%)  # a substitution or block or call start or end
+                 (?=</?[%&])  # a substitution or block or call start or end
                               # - don't consume
                  |
                  (\\\r?\n)    # an escaped newline  - throw away
                  |
                  \Z           # end of string
-                )""",
-            re.X | re.S,
-        )
+                )""", re.X | re.S)
 
         if match:
             text = match.group(1)
@@ -397,79 +365,70 @@ class Lexer:
         match = self.match(r"<%(!)?")
         if match:
             line, pos = self.matched_lineno, self.matched_charpos
-            text, end = self.parse_until_text(False, r"%>")
+            text, end = self.parse_until_text(r'%>')
             # the trailing newline helps
             # compiler.parse() not complain about indentation
             text = adjust_whitespace(text) + "\n"
             self.append_node(
-                parsetree.Code,
-                text,
-                match.group(1) == "!",
-                lineno=line,
-                pos=pos,
-            )
+                        parsetree.Code,
+                        text,
+                        match.group(1) == '!', lineno=line, pos=pos)
             return True
         else:
             return False
 
     def match_expression(self):
         match = self.match(r"\${")
-        if not match:
-            return False
-
-        line, pos = self.matched_lineno, self.matched_charpos
-        text, end = self.parse_until_text(True, r"\|", r"}")
-        if end == "|":
-            escapes, end = self.parse_until_text(True, r"}")
+        if match:
+            line, pos = self.matched_lineno, self.matched_charpos
+            text, end = self.parse_until_text(r'\|', r'}')
+            if end == '|':
+                escapes, end = self.parse_until_text(r'}')
+            else:
+                escapes = ""
+            text = text.replace('\r\n', '\n')
+            self.append_node(
+                            parsetree.Expression,
+                            text, escapes.strip(),
+                            lineno=line, pos=pos)
+            return True
         else:
-            escapes = ""
-        text = text.replace("\r\n", "\n")
-        self.append_node(
-            parsetree.Expression,
-            text,
-            escapes.strip(),
-            lineno=line,
-            pos=pos,
-        )
-        return True
+            return False
 
     def match_control_line(self):
         match = self.match(
-            r"(?<=^)[\t ]*(%(?!%)|##)[\t ]*((?:(?:\\\r?\n)|[^\r\n])*)"
-            r"(?:\r?\n|\Z)",
-            re.M,
-        )
-        if not match:
-            return False
-
-        operator = match.group(1)
-        text = match.group(2)
-        if operator == "%":
-            m2 = re.match(r"(end)?(\w+)\s*(.*)", text)
-            if not m2:
-                raise exceptions.SyntaxException(
-                    "Invalid control line: '%s'" % text,
-                    **self.exception_kwargs,
-                )
-            isend, keyword = m2.group(1, 2)
-            isend = isend is not None
-
-            if isend:
-                if not len(self.control_line):
+                    r"(?<=^)[\t ]*(%(?!%)|##)[\t ]*((?:(?:\\r?\n)|[^\r\n])*)"
+                    r"(?:\r?\n|\Z)", re.M)
+        if match:
+            operator = match.group(1)
+            text = match.group(2)
+            if operator == '%':
+                m2 = re.match(r'(end)?(\w+)\s*(.*)', text)
+                if not m2:
                     raise exceptions.SyntaxException(
-                        "No starting keyword '%s' for '%s'" % (keyword, text),
-                        **self.exception_kwargs,
-                    )
-                elif self.control_line[-1].keyword != keyword:
-                    raise exceptions.SyntaxException(
-                        "Keyword '%s' doesn't match keyword '%s'"
-                        % (text, self.control_line[-1].keyword),
-                        **self.exception_kwargs,
-                    )
-            self.append_node(parsetree.ControlLine, keyword, isend, text)
+                                "Invalid control line: '%s'" %
+                                text,
+                                **self.exception_kwargs)
+                isend, keyword = m2.group(1, 2)
+                isend = (isend is not None)
+
+                if isend:
+                    if not len(self.control_line):
+                        raise exceptions.SyntaxException(
+                                "No starting keyword '%s' for '%s'" %
+                                (keyword, text),
+                                **self.exception_kwargs)
+                    elif self.control_line[-1].keyword != keyword:
+                        raise exceptions.SyntaxException(
+                                "Keyword '%s' doesn't match keyword '%s'" %
+                                (text, self.control_line[-1].keyword),
+                                **self.exception_kwargs)
+                self.append_node(parsetree.ControlLine, keyword, isend, text)
+            else:
+                self.append_node(parsetree.Comment, text)
+            return True
         else:
-            self.append_node(parsetree.Comment, text)
-        return True
+            return False
 
     def match_comment(self):
         """matches the multiline version of a comment"""
@@ -479,3 +438,4 @@ class Lexer:
             return True
         else:
             return False
+
diff --git a/lib/mako/lookup.py b/lib/mako/lookup.py
index d916db77..2af54119 100644
--- a/lib/mako/lookup.py
+++ b/lib/mako/lookup.py
@@ -1,22 +1,19 @@
 # mako/lookup.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright (C) 2006-2015 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
-import os
-import posixpath
-import re
-import stat
-import threading
-
-from mako import exceptions
-from mako import util
+import os, stat, posixpath, re
+from mako import exceptions, util
 from mako.template import Template
 
+try:
+    import threading
+except:
+    import dummy_threading as threading
 
-class TemplateCollection:
-
+class TemplateCollection(object):
     """Represent a collection of :class:`.Template` objects,
     identifiable via URI.
 
@@ -30,7 +27,7 @@ class TemplateCollection:
     :class:`.TemplateCollection` is an abstract class,
     with the usual default implementation being :class:`.TemplateLookup`.
 
-    """
+     """
 
     def has_template(self, uri):
         """Return ``True`` if this :class:`.TemplateLookup` is
@@ -64,7 +61,7 @@ class TemplateCollection:
 
     def filename_to_uri(self, uri, filename):
         """Convert the given ``filename`` to a URI relative to
-        this :class:`.TemplateCollection`."""
+           this :class:`.TemplateCollection`."""
 
         return uri
 
@@ -82,9 +79,7 @@ class TemplateCollection:
         """
         return uri
 
-
 class TemplateLookup(TemplateCollection):
-
     """Represent a collection of templates that locates template source files
     from the local filesystem.
 
@@ -149,38 +144,40 @@ class TemplateLookup(TemplateCollection):
 
     """
 
-    def __init__(
-        self,
-        directories=None,
-        module_directory=None,
-        filesystem_checks=True,
-        collection_size=-1,
-        format_exceptions=False,
-        error_handler=None,
-        output_encoding=None,
-        encoding_errors="strict",
-        cache_args=None,
-        cache_impl="beaker",
-        cache_enabled=True,
-        cache_type=None,
-        cache_dir=None,
-        cache_url=None,
-        modulename_callable=None,
-        module_writer=None,
-        default_filters=None,
-        buffer_filters=(),
-        strict_undefined=False,
-        imports=None,
-        future_imports=None,
-        enable_loop=True,
-        input_encoding=None,
-        preprocessor=None,
-        lexer_cls=None,
-        include_error_handler=None,
-    ):
-        self.directories = [
-            posixpath.normpath(d) for d in util.to_list(directories, ())
-        ]
+    def __init__(self,
+                        directories=None,
+                        module_directory=None,
+                        filesystem_checks=True,
+                        collection_size=-1,
+                        format_exceptions=False,
+                        error_handler=None,
+                        disable_unicode=False,
+                        bytestring_passthrough=False,
+                        output_encoding=None,
+                        encoding_errors='strict',
+
+                        cache_args=None,
+                        cache_impl='beaker',
+                        cache_enabled=True,
+                        cache_type=None,
+                        cache_dir=None,
+                        cache_url=None,
+
+                        modulename_callable=None,
+                        module_writer=None,
+                        default_filters=None,
+                        buffer_filters=(),
+                        strict_undefined=False,
+                        imports=None,
+                        future_imports=None,
+                        enable_loop=True,
+                        input_encoding=None,
+                        preprocessor=None,
+                        lexer_cls=None):
+
+        self.directories = [posixpath.normpath(d) for d in
+                            util.to_list(directories, ())
+                            ]
         self.module_directory = module_directory
         self.modulename_callable = modulename_callable
         self.filesystem_checks = filesystem_checks
@@ -190,32 +187,33 @@ class TemplateLookup(TemplateCollection):
             cache_args = {}
         # transfer deprecated cache_* args
         if cache_dir:
-            cache_args.setdefault("dir", cache_dir)
+            cache_args.setdefault('dir', cache_dir)
         if cache_url:
-            cache_args.setdefault("url", cache_url)
+            cache_args.setdefault('url', cache_url)
         if cache_type:
-            cache_args.setdefault("type", cache_type)
+            cache_args.setdefault('type', cache_type)
 
         self.template_args = {
-            "format_exceptions": format_exceptions,
-            "error_handler": error_handler,
-            "include_error_handler": include_error_handler,
-            "output_encoding": output_encoding,
-            "cache_impl": cache_impl,
-            "encoding_errors": encoding_errors,
-            "input_encoding": input_encoding,
-            "module_directory": module_directory,
-            "module_writer": module_writer,
-            "cache_args": cache_args,
-            "cache_enabled": cache_enabled,
-            "default_filters": default_filters,
-            "buffer_filters": buffer_filters,
-            "strict_undefined": strict_undefined,
-            "imports": imports,
-            "future_imports": future_imports,
-            "enable_loop": enable_loop,
-            "preprocessor": preprocessor,
-            "lexer_cls": lexer_cls,
+            'format_exceptions':format_exceptions,
+            'error_handler':error_handler,
+            'disable_unicode':disable_unicode,
+            'bytestring_passthrough':bytestring_passthrough,
+            'output_encoding':output_encoding,
+            'cache_impl':cache_impl,
+            'encoding_errors':encoding_errors,
+            'input_encoding':input_encoding,
+            'module_directory':module_directory,
+            'module_writer':module_writer,
+            'cache_args':cache_args,
+            'cache_enabled':cache_enabled,
+            'default_filters':default_filters,
+            'buffer_filters':buffer_filters,
+            'strict_undefined':strict_undefined,
+            'imports':imports,
+            'future_imports':future_imports,
+            'enable_loop':enable_loop,
+            'preprocessor':preprocessor,
+            'lexer_cls':lexer_cls
         }
 
         if collection_size == -1:
@@ -230,8 +228,7 @@ class TemplateLookup(TemplateCollection):
         """Return a :class:`.Template` object corresponding to the given
         ``uri``.
 
-        .. note:: The ``relativeto`` argument is not supported here at
-           the moment.
+        .. note:: The ``relativeto`` argument is not supported here at the moment.
 
         """
 
@@ -240,19 +237,15 @@ class TemplateLookup(TemplateCollection):
                 return self._check(uri, self._collection[uri])
             else:
                 return self._collection[uri]
-        except KeyError as e:
-            u = re.sub(r"^\/+", "", uri)
-            for dir_ in self.directories:
-                # make sure the path seperators are posix - os.altsep is empty
-                # on POSIX and cannot be used.
-                dir_ = dir_.replace(os.path.sep, posixpath.sep)
-                srcfile = posixpath.normpath(posixpath.join(dir_, u))
+        except KeyError:
+            u = re.sub(r'^\/+', '', uri)
+            for dir in self.directories:
+                srcfile = posixpath.normpath(posixpath.join(dir, u))
                 if os.path.isfile(srcfile):
                     return self._load(srcfile, uri)
             else:
                 raise exceptions.TopLevelLookupException(
-                    "Can't locate template for uri %r" % uri
-                ) from e
+                                    "Cant locate template for uri %r" % uri)
 
     def adjust_uri(self, uri, relativeto):
         """Adjust the given ``uri`` based on the given relative URI."""
@@ -261,19 +254,20 @@ class TemplateLookup(TemplateCollection):
         if key in self._uri_cache:
             return self._uri_cache[key]
 
-        if uri[0] == "/":
-            v = self._uri_cache[key] = uri
-        elif relativeto is not None:
-            v = self._uri_cache[key] = posixpath.join(
-                posixpath.dirname(relativeto), uri
-            )
+        if uri[0] != '/':
+            if relativeto is not None:
+                v = self._uri_cache[key] = posixpath.join(
+                                            posixpath.dirname(relativeto), uri)
+            else:
+                v = self._uri_cache[key] = '/' + uri
         else:
-            v = self._uri_cache[key] = "/" + uri
+            v = self._uri_cache[key] = uri
         return v
 
+
     def filename_to_uri(self, filename):
         """Convert the given ``filename`` to a URI relative to
-        this :class:`.TemplateCollection`."""
+           this :class:`.TemplateCollection`."""
 
         try:
             return self._uri_cache[filename]
@@ -284,14 +278,14 @@ class TemplateLookup(TemplateCollection):
 
     def _relativeize(self, filename):
         """Return the portion of a filename that is 'relative'
-        to the directories in this lookup.
+           to the directories in this lookup.
 
         """
 
         filename = posixpath.normpath(filename)
-        for dir_ in self.directories:
-            if filename[0 : len(dir_)] == dir_:
-                return filename[len(dir_) :]
+        for dir in self.directories:
+            if filename[0:len(dir)] == dir:
+                return filename[len(dir):]
         else:
             return None
 
@@ -310,12 +304,11 @@ class TemplateLookup(TemplateCollection):
                 else:
                     module_filename = None
                 self._collection[uri] = template = Template(
-                    uri=uri,
-                    filename=posixpath.normpath(filename),
-                    lookup=self,
-                    module_filename=module_filename,
-                    **self.template_args,
-                )
+                                        uri=uri,
+                                        filename=posixpath.normpath(filename),
+                                        lookup=self,
+                                        module_filename=module_filename,
+                                        **self.template_args)
                 return template
             except:
                 # if compilation fails etc, ensure
@@ -332,15 +325,17 @@ class TemplateLookup(TemplateCollection):
 
         try:
             template_stat = os.stat(template.filename)
-            if template.module._modified_time >= template_stat[stat.ST_MTIME]:
+            if template.module._modified_time < \
+                        template_stat[stat.ST_MTIME]:
+                self._collection.pop(uri, None)
+                return self._load(template.filename, uri)
+            else:
                 return template
-            self._collection.pop(uri, None)
-            return self._load(template.filename, uri)
-        except OSError as e:
+        except OSError:
             self._collection.pop(uri, None)
             raise exceptions.TemplateLookupException(
-                "Can't locate template for uri %r" % uri
-            ) from e
+                                "Cant locate template for uri %r" % uri)
+
 
     def put_string(self, uri, text):
         """Place a new :class:`.Template` object into this
@@ -349,8 +344,10 @@ class TemplateLookup(TemplateCollection):
 
         """
         self._collection[uri] = Template(
-            text, lookup=self, uri=uri, **self.template_args
-        )
+                                    text,
+                                    lookup=self,
+                                    uri=uri,
+                                    **self.template_args)
 
     def put_template(self, uri, template):
         """Place a new :class:`.Template` object into this
@@ -359,3 +356,4 @@ class TemplateLookup(TemplateCollection):
 
         """
         self._collection[uri] = template
+
diff --git a/lib/mako/parsetree.py b/lib/mako/parsetree.py
index 04686ece..49ec4e06 100644
--- a/lib/mako/parsetree.py
+++ b/lib/mako/parsetree.py
@@ -1,21 +1,15 @@
 # mako/parsetree.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright (C) 2006-2015 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 """defines the parse tree components for Mako templates."""
 
+from mako import exceptions, ast, util, filters, compat
 import re
 
-from mako import ast
-from mako import exceptions
-from mako import filters
-from mako import util
-
-
-class Node:
-
+class Node(object):
     """base class for a Node in the parse tree."""
 
     def __init__(self, source, lineno, pos, filename):
@@ -26,12 +20,8 @@ class Node:
 
     @property
     def exception_kwargs(self):
-        return {
-            "source": self.source,
-            "lineno": self.lineno,
-            "pos": self.pos,
-            "filename": self.filename,
-        }
+        return {'source': self.source, 'lineno': self.lineno,
+                'pos': self.pos, 'filename': self.filename}
 
     def get_children(self):
         return []
@@ -44,13 +34,11 @@ class Node:
         method = getattr(visitor, "visit" + self.__class__.__name__, traverse)
         method(self)
 
-
 class TemplateNode(Node):
-
     """a 'container' node that stores the overall collection of nodes."""
 
     def __init__(self, filename):
-        super().__init__("", 0, 0, filename)
+        super(TemplateNode, self).__init__('', 0, 0, filename)
         self.nodes = []
         self.page_attributes = {}
 
@@ -59,13 +47,10 @@ class TemplateNode(Node):
 
     def __repr__(self):
         return "TemplateNode(%s, %r)" % (
-            util.sorted_dict_repr(self.page_attributes),
-            self.nodes,
-        )
-
+                    util.sorted_dict_repr(self.page_attributes),
+                    self.nodes)
 
 class ControlLine(Node):
-
     """defines a control line, a line-oriented python line or end tag.
 
     e.g.::
@@ -79,11 +64,11 @@ class ControlLine(Node):
     has_loop_context = False
 
     def __init__(self, keyword, isend, text, **kwargs):
-        super().__init__(**kwargs)
+        super(ControlLine, self).__init__(**kwargs)
         self.text = text
         self.keyword = keyword
         self.isend = isend
-        self.is_primary = keyword in ["for", "if", "while", "try", "with"]
+        self.is_primary = keyword in ['for', 'if', 'while', 'try', 'with']
         self.nodes = []
         if self.isend:
             self._declared_identifiers = []
@@ -106,34 +91,30 @@ class ControlLine(Node):
         """return true if the given keyword is a ternary keyword
         for this ControlLine"""
 
-        cases = {
-            "if": {"else", "elif"},
-            "try": {"except", "finally"},
-            "for": {"else"},
-        }
-
-        return keyword in cases.get(self.keyword, set())
+        return keyword in {
+            'if':set(['else', 'elif']),
+            'try':set(['except', 'finally']),
+            'for':set(['else'])
+        }.get(self.keyword, [])
 
     def __repr__(self):
         return "ControlLine(%r, %r, %r, %r)" % (
             self.keyword,
             self.text,
             self.isend,
-            (self.lineno, self.pos),
+            (self.lineno, self.pos)
         )
 
-
 class Text(Node):
     """defines plain text in the template."""
 
     def __init__(self, content, **kwargs):
-        super().__init__(**kwargs)
+        super(Text, self).__init__(**kwargs)
         self.content = content
 
     def __repr__(self):
         return "Text(%r, %r)" % (self.content, (self.lineno, self.pos))
 
-
 class Code(Node):
     """defines a Python code block, either inline or module level.
 
@@ -152,7 +133,7 @@ class Code(Node):
     """
 
     def __init__(self, text, ismodule, **kwargs):
-        super().__init__(**kwargs)
+        super(Code, self).__init__(**kwargs)
         self.text = text
         self.ismodule = ismodule
         self.code = ast.PythonCode(text, **self.exception_kwargs)
@@ -167,10 +148,9 @@ class Code(Node):
         return "Code(%r, %r, %r)" % (
             self.text,
             self.ismodule,
-            (self.lineno, self.pos),
+            (self.lineno, self.pos)
         )
 
-
 class Comment(Node):
     """defines a comment line.
 
@@ -179,13 +159,12 @@ class Comment(Node):
     """
 
     def __init__(self, text, **kwargs):
-        super().__init__(**kwargs)
+        super(Comment, self).__init__(**kwargs)
         self.text = text
 
     def __repr__(self):
         return "Comment(%r, %r)" % (self.text, (self.lineno, self.pos))
 
-
 class Expression(Node):
     """defines an inline expression.
 
@@ -194,7 +173,7 @@ class Expression(Node):
     """
 
     def __init__(self, text, escapes, **kwargs):
-        super().__init__(**kwargs)
+        super(Expression, self).__init__(**kwargs)
         self.text = text
         self.escapes = escapes
         self.escapes_code = ast.ArgumentList(escapes, **self.exception_kwargs)
@@ -206,75 +185,62 @@ class Expression(Node):
     def undeclared_identifiers(self):
         # TODO: make the "filter" shortcut list configurable at parse/gen time
         return self.code.undeclared_identifiers.union(
-            self.escapes_code.undeclared_identifiers.difference(
-                filters.DEFAULT_ESCAPES
-            )
-        ).difference(self.code.declared_identifiers)
+                self.escapes_code.undeclared_identifiers.difference(
+                    set(filters.DEFAULT_ESCAPES.keys())
+                )
+            ).difference(self.code.declared_identifiers)
 
     def __repr__(self):
         return "Expression(%r, %r, %r)" % (
             self.text,
             self.escapes_code.args,
-            (self.lineno, self.pos),
+            (self.lineno, self.pos)
         )
 
-
 class _TagMeta(type):
     """metaclass to allow Tag to produce a subclass according to
     its keyword"""
 
     _classmap = {}
 
-    def __init__(cls, clsname, bases, dict_):
-        if getattr(cls, "__keyword__", None) is not None:
+    def __init__(cls, clsname, bases, dict):
+        if getattr(cls, '__keyword__', None) is not None:
             cls._classmap[cls.__keyword__] = cls
-        super().__init__(clsname, bases, dict_)
+        super(_TagMeta, cls).__init__(clsname, bases, dict)
 
     def __call__(cls, keyword, attributes, **kwargs):
         if ":" in keyword:
-            ns, defname = keyword.split(":")
-            return type.__call__(
-                CallNamespaceTag, ns, defname, attributes, **kwargs
-            )
+            ns, defname = keyword.split(':')
+            return type.__call__(CallNamespaceTag, ns, defname,
+                                        attributes, **kwargs)
 
         try:
             cls = _TagMeta._classmap[keyword]
         except KeyError:
             raise exceptions.CompileException(
                 "No such tag: '%s'" % keyword,
-                source=kwargs["source"],
-                lineno=kwargs["lineno"],
-                pos=kwargs["pos"],
-                filename=kwargs["filename"],
+                source=kwargs['source'],
+                lineno=kwargs['lineno'],
+                pos=kwargs['pos'],
+                filename=kwargs['filename']
             )
         return type.__call__(cls, keyword, attributes, **kwargs)
 
-
-class Tag(Node, metaclass=_TagMeta):
+class Tag(compat.with_metaclass(_TagMeta, Node)):
     """abstract base class for tags.
 
-    e.g.::
+    <%sometag/>
 
-        <%sometag/>
-
-        <%someothertag>
-            stuff
-        </%someothertag>
+    <%someothertag>
+        stuff
+    </%someothertag>
 
     """
-
     __keyword__ = None
 
-    def __init__(
-        self,
-        keyword,
-        attributes,
-        expressions,
-        nonexpressions,
-        required,
-        **kwargs,
-    ):
-        r"""construct a new Tag instance.
+    def __init__(self, keyword, attributes, expressions,
+                        nonexpressions, required, **kwargs):
+        """construct a new Tag instance.
 
         this constructor not called directly, and is only called
         by subclasses.
@@ -293,20 +259,16 @@ class Tag(Node, metaclass=_TagMeta):
          other arguments passed to the Node superclass (lineno, pos)
 
         """
-        super().__init__(**kwargs)
+        super(Tag, self).__init__(**kwargs)
         self.keyword = keyword
         self.attributes = attributes
         self._parse_attributes(expressions, nonexpressions)
         missing = [r for r in required if r not in self.parsed_attributes]
         if len(missing):
             raise exceptions.CompileException(
-                (
-                    "Missing attribute(s): %s"
-                    % ",".join(repr(m) for m in missing)
-                ),
-                **self.exception_kwargs,
-            )
-
+                "Missing attribute(s): %s" %
+                    ",".join([repr(m) for m in missing]),
+                **self.exception_kwargs)
         self.parent = None
         self.nodes = []
 
@@ -322,39 +284,36 @@ class Tag(Node, metaclass=_TagMeta):
         for key in self.attributes:
             if key in expressions:
                 expr = []
-                for x in re.compile(r"(\${.+?})", re.S).split(
-                    self.attributes[key]
-                ):
-                    m = re.compile(r"^\${(.+?)}$", re.S).match(x)
+                for x in re.compile(r'(\${.+?})',
+                                    re.S).split(self.attributes[key]):
+                    m = re.compile(r'^\${(.+?)}$', re.S).match(x)
                     if m:
-                        code = ast.PythonCode(
-                            m.group(1).rstrip(), **self.exception_kwargs
-                        )
+                        code = ast.PythonCode(m.group(1).rstrip(),
+                                **self.exception_kwargs)
                         # we aren't discarding "declared_identifiers" here,
                         # which we do so that list comprehension-declared
                         # variables aren't counted.   As yet can't find a
                         # condition that requires it here.
-                        undeclared_identifiers = undeclared_identifiers.union(
-                            code.undeclared_identifiers
-                        )
-                        expr.append("(%s)" % m.group(1))
-                    elif x:
-                        expr.append(repr(x))
-                self.parsed_attributes[key] = " + ".join(expr) or repr("")
+                        undeclared_identifiers = \
+                            undeclared_identifiers.union(
+                                    code.undeclared_identifiers)
+                        expr.append('(%s)' % m.group(1))
+                    else:
+                        if x:
+                            expr.append(repr(x))
+                self.parsed_attributes[key] = " + ".join(expr) or repr('')
             elif key in nonexpressions:
-                if re.search(r"\${.+?}", self.attributes[key]):
+                if re.search(r'\${.+?}', self.attributes[key]):
                     raise exceptions.CompileException(
-                        "Attribute '%s' in tag '%s' does not allow embedded "
-                        "expressions" % (key, self.keyword),
-                        **self.exception_kwargs,
-                    )
+                           "Attibute '%s' in tag '%s' does not allow embedded "
+                           "expressions"  % (key, self.keyword),
+                           **self.exception_kwargs)
                 self.parsed_attributes[key] = repr(self.attributes[key])
             else:
                 raise exceptions.CompileException(
-                    "Invalid attribute for tag '%s': '%s'"
-                    % (self.keyword, key),
-                    **self.exception_kwargs,
-                )
+                                    "Invalid attribute for tag '%s': '%s'" %
+                                    (self.keyword, key),
+                                    **self.exception_kwargs)
         self.expression_undeclared_identifiers = undeclared_identifiers
 
     def declared_identifiers(self):
@@ -364,115 +323,108 @@ class Tag(Node, metaclass=_TagMeta):
         return self.expression_undeclared_identifiers
 
     def __repr__(self):
-        return "%s(%r, %s, %r, %r)" % (
-            self.__class__.__name__,
-            self.keyword,
-            util.sorted_dict_repr(self.attributes),
-            (self.lineno, self.pos),
-            self.nodes,
-        )
-
+        return "%s(%r, %s, %r, %r)" % (self.__class__.__name__,
+                                    self.keyword,
+                                    util.sorted_dict_repr(self.attributes),
+                                    (self.lineno, self.pos),
+                                    self.nodes
+                                )
 
 class IncludeTag(Tag):
-    __keyword__ = "include"
+    __keyword__ = 'include'
 
     def __init__(self, keyword, attributes, **kwargs):
-        super().__init__(
-            keyword,
-            attributes,
-            ("file", "import", "args"),
-            (),
-            ("file",),
-            **kwargs,
-        )
+        super(IncludeTag, self).__init__(
+                                    keyword,
+                                    attributes,
+                                    ('file', 'import', 'args'),
+                                    (), ('file',), **kwargs)
         self.page_args = ast.PythonCode(
-            "__DUMMY(%s)" % attributes.get("args", ""), **self.exception_kwargs
-        )
+                                "__DUMMY(%s)" % attributes.get('args', ''),
+                                 **self.exception_kwargs)
 
     def declared_identifiers(self):
         return []
 
     def undeclared_identifiers(self):
-        identifiers = self.page_args.undeclared_identifiers.difference(
-            {"__DUMMY"}
-        ).difference(self.page_args.declared_identifiers)
-        return identifiers.union(super().undeclared_identifiers())
-
+        identifiers = self.page_args.undeclared_identifiers.\
+                            difference(set(["__DUMMY"])).\
+                            difference(self.page_args.declared_identifiers)
+        return identifiers.union(super(IncludeTag, self).
+                                    undeclared_identifiers())
 
 class NamespaceTag(Tag):
-    __keyword__ = "namespace"
+    __keyword__ = 'namespace'
 
     def __init__(self, keyword, attributes, **kwargs):
-        super().__init__(
-            keyword,
-            attributes,
-            ("file",),
-            ("name", "inheritable", "import", "module"),
-            (),
-            **kwargs,
-        )
+        super(NamespaceTag, self).__init__(
+                                        keyword, attributes,
+                                        ('file',),
+                                        ('name','inheritable',
+                                        'import','module'),
+                                        (), **kwargs)
 
-        self.name = attributes.get("name", "__anon_%s" % hex(abs(id(self))))
-        if "name" not in attributes and "import" not in attributes:
+        self.name = attributes.get('name', '__anon_%s' % hex(abs(id(self))))
+        if not 'name' in attributes and not 'import' in attributes:
             raise exceptions.CompileException(
                 "'name' and/or 'import' attributes are required "
                 "for <%namespace>",
-                **self.exception_kwargs,
-            )
-        if "file" in attributes and "module" in attributes:
+                **self.exception_kwargs)
+        if 'file' in attributes and 'module' in attributes:
             raise exceptions.CompileException(
                 "<%namespace> may only have one of 'file' or 'module'",
-                **self.exception_kwargs,
+                **self.exception_kwargs
             )
 
     def declared_identifiers(self):
         return []
 
-
 class TextTag(Tag):
-    __keyword__ = "text"
+    __keyword__ = 'text'
 
     def __init__(self, keyword, attributes, **kwargs):
-        super().__init__(keyword, attributes, (), ("filter"), (), **kwargs)
+        super(TextTag, self).__init__(
+                                    keyword,
+                                    attributes, (),
+                                    ('filter'), (), **kwargs)
         self.filter_args = ast.ArgumentList(
-            attributes.get("filter", ""), **self.exception_kwargs
-        )
+                                    attributes.get('filter', ''),
+                                    **self.exception_kwargs)
 
     def undeclared_identifiers(self):
-        return self.filter_args.undeclared_identifiers.difference(
-            filters.DEFAULT_ESCAPES.keys()
-        ).union(self.expression_undeclared_identifiers)
-
+        return self.filter_args.\
+                            undeclared_identifiers.\
+                            difference(filters.DEFAULT_ESCAPES.keys()).union(
+                        self.expression_undeclared_identifiers
+                    )
 
 class DefTag(Tag):
-    __keyword__ = "def"
+    __keyword__ = 'def'
 
     def __init__(self, keyword, attributes, **kwargs):
-        expressions = ["buffered", "cached"] + [
-            c for c in attributes if c.startswith("cache_")
-        ]
+        expressions = ['buffered', 'cached'] + [
+                c for c in attributes if c.startswith('cache_')]
 
-        super().__init__(
-            keyword,
-            attributes,
-            expressions,
-            ("name", "filter", "decorator"),
-            ("name",),
-            **kwargs,
-        )
-        name = attributes["name"]
-        if re.match(r"^[\w_]+$", name):
+
+        super(DefTag, self).__init__(
+                keyword,
+                attributes,
+                expressions,
+                ('name', 'filter', 'decorator'),
+                ('name',),
+                **kwargs)
+        name = attributes['name']
+        if re.match(r'^[\w_]+$', name):
             raise exceptions.CompileException(
-                "Missing parenthesis in %def", **self.exception_kwargs
-            )
-        self.function_decl = ast.FunctionDecl(
-            "def " + name + ":pass", **self.exception_kwargs
-        )
+                                "Missing parenthesis in %def",
+                                **self.exception_kwargs)
+        self.function_decl = ast.FunctionDecl("def " + name + ":pass",
+                                                    **self.exception_kwargs)
         self.name = self.function_decl.funcname
-        self.decorator = attributes.get("decorator", "")
+        self.decorator = attributes.get('decorator', '')
         self.filter_args = ast.ArgumentList(
-            attributes.get("filter", ""), **self.exception_kwargs
-        )
+                                attributes.get('filter', ''),
+                                **self.exception_kwargs)
 
     is_anonymous = False
     is_block = False
@@ -490,58 +442,51 @@ class DefTag(Tag):
     def undeclared_identifiers(self):
         res = []
         for c in self.function_decl.defaults:
-            res += list(
-                ast.PythonCode(
-                    c, **self.exception_kwargs
-                ).undeclared_identifiers
-            )
-        return (
-            set(res)
-            .union(
-                self.filter_args.undeclared_identifiers.difference(
-                    filters.DEFAULT_ESCAPES.keys()
-                )
-            )
-            .union(self.expression_undeclared_identifiers)
-            .difference(self.function_decl.allargnames)
+            res += list(ast.PythonCode(c, **self.exception_kwargs).
+                                    undeclared_identifiers)
+        return set(res).union(
+            self.filter_args.\
+                            undeclared_identifiers.\
+                            difference(filters.DEFAULT_ESCAPES.keys())
+        ).union(
+            self.expression_undeclared_identifiers
+        ).difference(
+            self.function_decl.allargnames
         )
 
-
 class BlockTag(Tag):
-    __keyword__ = "block"
+    __keyword__ = 'block'
 
     def __init__(self, keyword, attributes, **kwargs):
-        expressions = ["buffered", "cached", "args"] + [
-            c for c in attributes if c.startswith("cache_")
-        ]
+        expressions = ['buffered', 'cached', 'args'] + [
+                 c for c in attributes if c.startswith('cache_')]
 
-        super().__init__(
-            keyword,
-            attributes,
-            expressions,
-            ("name", "filter", "decorator"),
-            (),
-            **kwargs,
-        )
-        name = attributes.get("name")
-        if name and not re.match(r"^[\w_]+$", name):
+        super(BlockTag, self).__init__(
+                keyword,
+                attributes,
+                expressions,
+                ('name','filter', 'decorator'),
+                (),
+                **kwargs)
+        name = attributes.get('name')
+        if name and not re.match(r'^[\w_]+$',name):
             raise exceptions.CompileException(
-                "%block may not specify an argument signature",
-                **self.exception_kwargs,
-            )
-        if not name and attributes.get("args", None):
+                               "%block may not specify an argument signature",
+                               **self.exception_kwargs)
+        if not name and attributes.get('args', None):
             raise exceptions.CompileException(
-                "Only named %blocks may specify args", **self.exception_kwargs
-            )
-        self.body_decl = ast.FunctionArgs(
-            attributes.get("args", ""), **self.exception_kwargs
-        )
+                                "Only named %blocks may specify args",
+                                **self.exception_kwargs
+                                )
+        self.body_decl = ast.FunctionArgs(attributes.get('args', ''),
+                                            **self.exception_kwargs)
 
         self.name = name
-        self.decorator = attributes.get("decorator", "")
+        self.decorator = attributes.get('decorator', '')
         self.filter_args = ast.ArgumentList(
-            attributes.get("filter", ""), **self.exception_kwargs
-        )
+                                attributes.get('filter', ''),
+                                **self.exception_kwargs)
+
 
     is_block = True
 
@@ -551,7 +496,7 @@ class BlockTag(Tag):
 
     @property
     def funcname(self):
-        return self.name or "__M_anon_%d" % (self.lineno,)
+        return self.name or "__M_anon_%d" % (self.lineno, )
 
     def get_argument_expressions(self, **kw):
         return self.body_decl.get_argument_expressions(**kw)
@@ -560,97 +505,90 @@ class BlockTag(Tag):
         return self.body_decl.allargnames
 
     def undeclared_identifiers(self):
-        return (
-            self.filter_args.undeclared_identifiers.difference(
-                filters.DEFAULT_ESCAPES.keys()
-            )
-        ).union(self.expression_undeclared_identifiers)
+        return (self.filter_args.\
+                            undeclared_identifiers.\
+                            difference(filters.DEFAULT_ESCAPES.keys())
+                ).union(self.expression_undeclared_identifiers)
+
 
 
 class CallTag(Tag):
-    __keyword__ = "call"
+    __keyword__ = 'call'
 
     def __init__(self, keyword, attributes, **kwargs):
-        super().__init__(
-            keyword, attributes, ("args"), ("expr",), ("expr",), **kwargs
-        )
-        self.expression = attributes["expr"]
+        super(CallTag, self).__init__(keyword, attributes,
+                                    ('args'), ('expr',), ('expr',), **kwargs)
+        self.expression = attributes['expr']
         self.code = ast.PythonCode(self.expression, **self.exception_kwargs)
-        self.body_decl = ast.FunctionArgs(
-            attributes.get("args", ""), **self.exception_kwargs
-        )
+        self.body_decl = ast.FunctionArgs(attributes.get('args', ''),
+                                            **self.exception_kwargs)
 
     def declared_identifiers(self):
         return self.code.declared_identifiers.union(self.body_decl.allargnames)
 
     def undeclared_identifiers(self):
-        return self.code.undeclared_identifiers.difference(
-            self.code.declared_identifiers
-        )
-
+        return self.code.undeclared_identifiers.\
+                    difference(self.code.declared_identifiers)
 
 class CallNamespaceTag(Tag):
+
     def __init__(self, namespace, defname, attributes, **kwargs):
-        super().__init__(
-            namespace + ":" + defname,
-            attributes,
-            tuple(attributes.keys()) + ("args",),
-            (),
-            (),
-            **kwargs,
-        )
+        super(CallNamespaceTag, self).__init__(
+                    namespace + ":" + defname,
+                    attributes,
+                    tuple(attributes.keys()) + ('args', ),
+                    (),
+                    (),
+                    **kwargs)
 
         self.expression = "%s.%s(%s)" % (
-            namespace,
-            defname,
-            ",".join(
-                "%s=%s" % (k, v)
-                for k, v in self.parsed_attributes.items()
-                if k != "args"
-            ),
-        )
-
+                                namespace,
+                                defname,
+                                ",".join(["%s=%s" % (k, v) for k, v in
+                                            self.parsed_attributes.items()
+                                            if k != 'args'])
+                            )
         self.code = ast.PythonCode(self.expression, **self.exception_kwargs)
         self.body_decl = ast.FunctionArgs(
-            attributes.get("args", ""), **self.exception_kwargs
-        )
+                                    attributes.get('args', ''),
+                                    **self.exception_kwargs)
 
     def declared_identifiers(self):
         return self.code.declared_identifiers.union(self.body_decl.allargnames)
 
     def undeclared_identifiers(self):
-        return self.code.undeclared_identifiers.difference(
-            self.code.declared_identifiers
-        )
-
+        return self.code.undeclared_identifiers.\
+                    difference(self.code.declared_identifiers)
 
 class InheritTag(Tag):
-    __keyword__ = "inherit"
+    __keyword__ = 'inherit'
 
     def __init__(self, keyword, attributes, **kwargs):
-        super().__init__(
-            keyword, attributes, ("file",), (), ("file",), **kwargs
-        )
-
+        super(InheritTag, self).__init__(
+                                keyword, attributes,
+                                ('file',), (), ('file',), **kwargs)
 
 class PageTag(Tag):
-    __keyword__ = "page"
+    __keyword__ = 'page'
 
     def __init__(self, keyword, attributes, **kwargs):
-        expressions = [
-            "cached",
-            "args",
-            "expression_filter",
-            "enable_loop",
-        ] + [c for c in attributes if c.startswith("cache_")]
+        expressions =   ['cached', 'args', 'expression_filter', 'enable_loop'] + [
+                    c for c in attributes if c.startswith('cache_')]
 
-        super().__init__(keyword, attributes, expressions, (), (), **kwargs)
-        self.body_decl = ast.FunctionArgs(
-            attributes.get("args", ""), **self.exception_kwargs
-        )
+        super(PageTag, self).__init__(
+                keyword,
+                attributes,
+                expressions,
+                (),
+                (),
+                **kwargs)
+        self.body_decl = ast.FunctionArgs(attributes.get('args', ''),
+                                            **self.exception_kwargs)
         self.filter_args = ast.ArgumentList(
-            attributes.get("expression_filter", ""), **self.exception_kwargs
-        )
+                                attributes.get('expression_filter', ''),
+                                **self.exception_kwargs)
 
     def declared_identifiers(self):
         return self.body_decl.allargnames
+
+
diff --git a/lib/mako/pygen.py b/lib/mako/pygen.py
index 820e101d..5ba5125a 100644
--- a/lib/mako/pygen.py
+++ b/lib/mako/pygen.py
@@ -1,5 +1,5 @@
 # mako/pygen.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright (C) 2006-2015 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
@@ -7,11 +7,9 @@
 """utilities for generating and formatting literal Python code."""
 
 import re
-
 from mako import exceptions
 
-
-class PythonPrinter:
+class PythonPrinter(object):
     def __init__(self, stream):
         # indentation counter
         self.indent = 0
@@ -43,15 +41,6 @@ class PythonPrinter:
         # source lines
         self.source_map = {}
 
-        self._re_space_comment = re.compile(r"^\s*#")
-        self._re_space = re.compile(r"^\s*$")
-        self._re_indent = re.compile(r":[ \t]*(?:#.*)?$")
-        self._re_compound = re.compile(r"^\s*(if|try|elif|while|for|with)")
-        self._re_indent_keyword = re.compile(
-            r"^\s*(def|class|else|elif|except|finally)"
-        )
-        self._re_unindentor = re.compile(r"^\s*(else|elif|except|finally).*\:")
-
     def _update_lineno(self, num):
         self.lineno += num
 
@@ -63,16 +52,14 @@ class PythonPrinter:
         self.stream.write("\n" * num)
         self._update_lineno(num)
 
-    def write_indented_block(self, block, starting_lineno=None):
+    def write_indented_block(self, block):
         """print a line or lines of python which already contain indentation.
 
         The indentation of the total block of lines will be adjusted to that of
         the current indent level."""
         self.in_indent_lines = False
-        for i, l in enumerate(re.split(r"\r?\n", block)):
+        for l in re.split(r'\r?\n', block):
             self.line_buffer.append(l)
-            if starting_lineno is not None:
-                self.start_source(starting_lineno + i)
             self._update_lineno(1)
 
     def writelines(self, *lines):
@@ -93,31 +80,30 @@ class PythonPrinter:
             self._flush_adjusted_lines()
             self.in_indent_lines = True
 
-        if (
-            line is None
-            or self._re_space_comment.match(line)
-            or self._re_space.match(line)
-        ):
+        if (line is None or
+            re.match(r"^\s*#",line) or
+            re.match(r"^\s*$", line)
+            ):
             hastext = False
         else:
             hastext = True
 
-        is_comment = line and len(line) and line[0] == "#"
+        is_comment = line and len(line) and line[0] == '#'
 
         # see if this line should decrease the indentation level
-        if (
-            not is_comment
-            and (not hastext or self._is_unindentor(line))
-            and self.indent > 0
-        ):
-            self.indent -= 1
-            # if the indent_detail stack is empty, the user
-            # probably put extra closures - the resulting
-            # module wont compile.
-            if len(self.indent_detail) == 0:
-                # TODO: no coverage here
-                raise exceptions.MakoException("Too many whitespace closures")
-            self.indent_detail.pop()
+        if (not is_comment and
+            (not hastext or self._is_unindentor(line))
+            ):
+
+            if self.indent > 0:
+                self.indent -= 1
+                # if the indent_detail stack is empty, the user
+                # probably put extra closures - the resulting
+                # module wont compile.
+                if len(self.indent_detail) == 0:
+                    raise exceptions.SyntaxException(
+                                    "Too many whitespace closures")
+                self.indent_detail.pop()
 
         if line is None:
             return
@@ -130,12 +116,12 @@ class PythonPrinter:
         # note that a line can both decrase (before printing) and
         # then increase (after printing) the indentation level.
 
-        if self._re_indent.search(line):
+        if re.search(r":[ \t]*(?:#.*)?$", line):
             # increment indentation count, and also
             # keep track of what the keyword was that indented us,
             # if it is a python compound statement keyword
             # where we might have to look for an "unindent" keyword
-            match = self._re_compound.match(line)
+            match = re.match(r"^\s*(if|try|elif|while|for|with)", line)
             if match:
                 # its a "compound" keyword, so we will check for "unindentors"
                 indentor = match.group(1)
@@ -146,7 +132,8 @@ class PythonPrinter:
                 # its not a "compound" keyword.  but lets also
                 # test for valid Python keywords that might be indenting us,
                 # else assume its a non-indenting line
-                m2 = self._re_indent_keyword.match(line)
+                m2 = re.match(r"^\s*(def|class|else|elif|except|finally)",
+                              line)
                 if m2:
                     self.indent += 1
                     self.indent_detail.append(indentor)
@@ -174,39 +161,38 @@ class PythonPrinter:
 
         # if the current line doesnt have one of the "unindentor" keywords,
         # return False
-        match = self._re_unindentor.match(line)
-        # if True, whitespace matches up, we have a compound indentor,
+        match = re.match(r"^\s*(else|elif|except|finally).*\:", line)
+        if not match:
+            return False
+
+        # whitespace matches up, we have a compound indentor,
         # and this line has an unindentor, this
         # is probably good enough
-        return bool(match)
+        return True
 
         # should we decide that its not good enough, heres
         # more stuff to check.
-        # keyword = match.group(1)
+        #keyword = match.group(1)
 
         # match the original indent keyword
-        # for crit in [
+        #for crit in [
         #   (r'if|elif', r'else|elif'),
         #   (r'try', r'except|finally|else'),
         #   (r'while|for', r'else'),
-        # ]:
+        #]:
         #   if re.match(crit[0], indentor) and re.match(crit[1], keyword):
         #        return True
 
-        # return False
+        #return False
 
-    def _indent_line(self, line, stripspace=""):
+    def _indent_line(self, line, stripspace=''):
         """indent the given line according to the current indent level.
 
         stripspace is a string of space that will be truncated from the
         start of the line before indenting."""
-        if stripspace == "":
-            # Fast path optimization.
-            return self.indentstring * self.indent + line
 
-        return re.sub(
-            r"^%s" % stripspace, self.indentstring * self.indent, line
-        )
+        return re.sub(r"^%s" % stripspace, self.indentstring
+                      * self.indent, line)
 
     def _reset_multi_line_flags(self):
         """reset the flags which would indicate we are in a backslashed
@@ -224,9 +210,13 @@ class PythonPrinter:
         # a literal multiline string with unfortunately placed
         # whitespace
 
-        current_state = self.backslashed or self.triplequoted
+        current_state = (self.backslashed or self.triplequoted)
+
+        if re.search(r"\\$", line):
+            self.backslashed = True
+        else:
+            self.backslashed = False
 
-        self.backslashed = bool(re.search(r"\\$", line))
         triples = len(re.findall(r"\"\"\"|\'\'\'", line))
         if triples == 1 or triples % 2 != 0:
             self.triplequoted = not self.triplequoted
@@ -257,7 +247,7 @@ def adjust_whitespace(text):
     (backslashed, triplequoted) = (0, 1)
 
     def in_multi_line(line):
-        start_state = state[backslashed] or state[triplequoted]
+        start_state = (state[backslashed] or state[triplequoted])
 
         if re.search(r"\\$", line):
             state[backslashed] = True
@@ -267,7 +257,7 @@ def adjust_whitespace(text):
         def match(reg, t):
             m = re.match(reg, t)
             if m:
-                return m, t[len(m.group(0)) :]
+                return m, t[len(m.group(0)):]
             else:
                 return None, t
 
@@ -279,7 +269,7 @@ def adjust_whitespace(text):
                 else:
                     m, line = match(r".*?(?=%s|$)" % state[triplequoted], line)
             else:
-                m, line = match(r"#", line)
+                m, line = match(r'#', line)
                 if m:
                     return start_state
 
@@ -292,13 +282,13 @@ def adjust_whitespace(text):
 
         return start_state
 
-    def _indent_line(line, stripspace=""):
-        return re.sub(r"^%s" % stripspace, "", line)
+    def _indent_line(line, stripspace=''):
+        return re.sub(r"^%s" % stripspace, '', line)
 
     lines = []
     stripspace = None
 
-    for line in re.split(r"\r?\n", text):
+    for line in re.split(r'\r?\n', text):
         if in_multi_line(line):
             lines.append(line)
         else:
diff --git a/lib/mako/pyparser.py b/lib/mako/pyparser.py
index 714e0043..bfa46a9f 100644
--- a/lib/mako/pyparser.py
+++ b/lib/mako/pyparser.py
@@ -1,5 +1,5 @@
 # mako/pyparser.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright (C) 2006-2015 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
@@ -10,43 +10,46 @@ Parsing to AST is done via _ast on Python > 2.5, otherwise the compiler
 module is used.
 """
 
+from mako import exceptions, util, compat
+from mako.compat import arg_stringname
 import operator
 
+if compat.py3k:
+    # words that cannot be assigned to (notably
+    # smaller than the total keys in __builtins__)
+    reserved = set(['True', 'False', 'None', 'print'])
+
+    # the "id" attribute on a function node
+    arg_id = operator.attrgetter('arg')
+else:
+    # words that cannot be assigned to (notably
+    # smaller than the total keys in __builtins__)
+    reserved = set(['True', 'False', 'None'])
+
+    # the "id" attribute on a function node
+    arg_id = operator.attrgetter('id')
+
 import _ast
-
-from mako import _ast_util
-from mako import compat
-from mako import exceptions
-from mako import util
-
-# words that cannot be assigned to (notably
-# smaller than the total keys in __builtins__)
-reserved = {"True", "False", "None", "print"}
-
-# the "id" attribute on a function node
-arg_id = operator.attrgetter("arg")
-
 util.restore__ast(_ast)
+from mako import _ast_util
 
 
-def parse(code, mode="exec", **exception_kwargs):
+def parse(code, mode='exec', **exception_kwargs):
     """Parse an expression into AST"""
 
     try:
-        return _ast_util.parse(code, "<unknown>", mode)
-    except Exception as e:
+        return _ast_util.parse(code, '<unknown>', mode)
+    except Exception:
         raise exceptions.SyntaxException(
-            "(%s) %s (%r)"
-            % (
-                compat.exception_as().__class__.__name__,
-                compat.exception_as(),
-                code[0:50],
-            ),
-            **exception_kwargs,
-        ) from e
+                    "(%s) %s (%r)" % (
+                        compat.exception_as().__class__.__name__,
+                        compat.exception_as(),
+                        code[0:50]
+                    ), **exception_kwargs)
 
 
 class FindIdentifiers(_ast_util.NodeVisitor):
+
     def __init__(self, listener, **exception_kwargs):
         self.in_function = False
         self.in_assign_targets = False
@@ -64,6 +67,7 @@ class FindIdentifiers(_ast_util.NodeVisitor):
         self._add_declared(node.name)
 
     def visit_Assign(self, node):
+
         # flip around the visiting of Assign so the expression gets
         # evaluated first, in the case of a clause like "x=x+5" (x
         # is undeclared)
@@ -75,13 +79,18 @@ class FindIdentifiers(_ast_util.NodeVisitor):
             self.visit(n)
         self.in_assign_targets = in_a
 
-    def visit_ExceptHandler(self, node):
-        if node.name is not None:
-            self._add_declared(node.name)
-        if node.type is not None:
-            self.visit(node.type)
-        for statement in node.body:
-            self.visit(statement)
+    if compat.py3k:
+
+        # ExceptHandler is in Python 2, but this block only works in
+        # Python 3 (and is required there)
+
+        def visit_ExceptHandler(self, node):
+            if node.name is not None:
+                self._add_declared(node.name)
+            if node.type is not None:
+                self.visit(node.type)
+            for statement in node.body:
+                self.visit(statement)
 
     def visit_Lambda(self, node, *args):
         self._visit_function(node, True)
@@ -90,30 +99,16 @@ class FindIdentifiers(_ast_util.NodeVisitor):
         self._add_declared(node.name)
         self._visit_function(node, False)
 
-    def visit_ListComp(self, node):
-        if self.in_function:
-            for comp in node.generators:
-                self.visit(comp.iter)
-        else:
-            self.generic_visit(node)
-
-    visit_SetComp = visit_GeneratorExp = visit_ListComp
-
-    def visit_DictComp(self, node):
-        if self.in_function:
-            for comp in node.generators:
-                self.visit(comp.iter)
-        else:
-            self.generic_visit(node)
-
     def _expand_tuples(self, args):
         for arg in args:
             if isinstance(arg, _ast.Tuple):
-                yield from arg.elts
+                for n in arg.elts:
+                    yield n
             else:
                 yield arg
 
     def _visit_function(self, node, islambda):
+
         # push function state onto stack.  dont log any more
         # identifiers as "declared" until outside of the function,
         # but keep logging identifiers as "undeclared". track
@@ -124,9 +119,9 @@ class FindIdentifiers(_ast_util.NodeVisitor):
         self.in_function = True
 
         local_ident_stack = self.local_ident_stack
-        self.local_ident_stack = local_ident_stack.union(
-            [arg_id(arg) for arg in self._expand_tuples(node.args.args)]
-        )
+        self.local_ident_stack = local_ident_stack.union([
+            arg_id(arg) for arg in self._expand_tuples(node.args.args)
+        ])
         if islambda:
             self.visit(node.body)
         else:
@@ -136,6 +131,7 @@ class FindIdentifiers(_ast_util.NodeVisitor):
         self.local_ident_stack = local_ident_stack
 
     def visit_For(self, node):
+
         # flip around visit
 
         self.visit(node.iter)
@@ -150,11 +146,9 @@ class FindIdentifiers(_ast_util.NodeVisitor):
             # this is eqiuvalent to visit_AssName in
             # compiler
             self._add_declared(node.id)
-        elif (
-            node.id not in reserved
-            and node.id not in self.listener.declared_identifiers
-            and node.id not in self.local_ident_stack
-        ):
+        elif node.id not in reserved and node.id \
+            not in self.listener.declared_identifiers and node.id \
+                not in self.local_ident_stack:
             self.listener.undeclared_identifiers.add(node.id)
 
     def visit_Import(self, node):
@@ -162,25 +156,24 @@ class FindIdentifiers(_ast_util.NodeVisitor):
             if name.asname is not None:
                 self._add_declared(name.asname)
             else:
-                self._add_declared(name.name.split(".")[0])
+                self._add_declared(name.name.split('.')[0])
 
     def visit_ImportFrom(self, node):
         for name in node.names:
             if name.asname is not None:
                 self._add_declared(name.asname)
-            elif name.name == "*":
-                raise exceptions.CompileException(
-                    "'import *' is not supported, since all identifier "
-                    "names must be explicitly declared.  Please use the "
-                    "form 'from <modulename> import <name1>, <name2>, "
-                    "...' instead.",
-                    **self.exception_kwargs,
-                )
             else:
+                if name.name == '*':
+                    raise exceptions.CompileException(
+                        "'import *' is not supported, since all identifier "
+                        "names must be explicitly declared.  Please use the "
+                        "form 'from <modulename> import <name1>, <name2>, "
+                        "...' instead.", **self.exception_kwargs)
                 self._add_declared(name.name)
 
 
 class FindTuple(_ast_util.NodeVisitor):
+
     def __init__(self, listener, code_factory, **exception_kwargs):
         self.listener = listener
         self.exception_kwargs = exception_kwargs
@@ -191,17 +184,16 @@ class FindTuple(_ast_util.NodeVisitor):
             p = self.code_factory(n, **self.exception_kwargs)
             self.listener.codeargs.append(p)
             self.listener.args.append(ExpressionGenerator(n).value())
-            ldi = self.listener.declared_identifiers
-            self.listener.declared_identifiers = ldi.union(
-                p.declared_identifiers
-            )
-            lui = self.listener.undeclared_identifiers
-            self.listener.undeclared_identifiers = lui.union(
-                p.undeclared_identifiers
-            )
+            self.listener.declared_identifiers = \
+                self.listener.declared_identifiers.union(
+                                                p.declared_identifiers)
+            self.listener.undeclared_identifiers = \
+                self.listener.undeclared_identifiers.union(
+                                                p.undeclared_identifiers)
 
 
 class ParseFunc(_ast_util.NodeVisitor):
+
     def __init__(self, listener, **exception_kwargs):
         self.listener = listener
         self.exception_kwargs = exception_kwargs
@@ -211,23 +203,30 @@ class ParseFunc(_ast_util.NodeVisitor):
 
         argnames = [arg_id(arg) for arg in node.args.args]
         if node.args.vararg:
-            argnames.append(node.args.vararg.arg)
+            argnames.append(arg_stringname(node.args.vararg))
 
-        kwargnames = [arg_id(arg) for arg in node.args.kwonlyargs]
+        if compat.py2k:
+            # kw-only args don't exist in Python 2
+            kwargnames = []
+        else:
+            kwargnames = [arg_id(arg) for arg in node.args.kwonlyargs]
         if node.args.kwarg:
-            kwargnames.append(node.args.kwarg.arg)
+            kwargnames.append(arg_stringname(node.args.kwarg))
         self.listener.argnames = argnames
         self.listener.defaults = node.args.defaults  # ast
         self.listener.kwargnames = kwargnames
-        self.listener.kwdefaults = node.args.kw_defaults
+        if compat.py2k:
+            self.listener.kwdefaults = []
+        else:
+            self.listener.kwdefaults = node.args.kw_defaults
         self.listener.varargs = node.args.vararg
         self.listener.kwargs = node.args.kwarg
 
+class ExpressionGenerator(object):
 
-class ExpressionGenerator:
     def __init__(self, astnode):
-        self.generator = _ast_util.SourceGenerator(" " * 4)
+        self.generator = _ast_util.SourceGenerator(' ' * 4)
         self.generator.visit(astnode)
 
     def value(self):
-        return "".join(self.generator.result)
+        return ''.join(self.generator.result)
diff --git a/lib/mako/runtime.py b/lib/mako/runtime.py
index 23401b70..6b6a35a9 100644
--- a/lib/mako/runtime.py
+++ b/lib/mako/runtime.py
@@ -1,5 +1,5 @@
 # mako/runtime.py
-# Copyright 2006-2020 the Mako authors and contributors <see AUTHORS file>
+# Copyright (C) 2006-2015 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
@@ -7,24 +7,19 @@
 """provides runtime services for templates, including Context,
 Namespace, and various helper functions."""
 
-import builtins
-import functools
+from mako import exceptions, util, compat
+from mako.compat import compat_builtins
 import sys
 
-from mako import compat
-from mako import exceptions
-from mako import util
-
-
-class Context:
 
+class Context(object):
     """Provides runtime namespace, output buffer, and various
     callstacks for templates.
 
     See :ref:`runtime_toplevel` for detail on the usage of
     :class:`.Context`.
 
-    """
+     """
 
     def __init__(self, buffer, **data):
         self._buffer_stack = [buffer]
@@ -38,19 +33,18 @@ class Context:
 
         # "capture" function which proxies to the
         # generic "capture" function
-        self._data["capture"] = functools.partial(capture, self)
+        self._data['capture'] = compat.partial(capture, self)
 
         # "caller" stack used by def calls with content
-        self.caller_stack = self._data["caller"] = CallerStack()
+        self.caller_stack = self._data['caller'] = CallerStack()
 
     def _set_with_template(self, t):
         self._with_template = t
         illegal_names = t.reserved_names.intersection(self._data)
         if illegal_names:
             raise exceptions.NameConflictError(
-                "Reserved words passed to render(): %s"
-                % ", ".join(illegal_names)
-            )
+                "Reserved words passed to render(): %s" %
+                ", ".join(illegal_names))
 
     @property
     def lookup(self):
@@ -86,6 +80,7 @@ class Context:
         """Push a ``caller`` callable onto the callstack for
         this :class:`.Context`."""
 
+
         self.caller_stack.append(caller)
 
     def pop_caller(self):
@@ -103,7 +98,7 @@ class Context:
         if key in self._data:
             return self._data[key]
         else:
-            return builtins.__dict__[key]
+            return compat_builtins.__dict__[key]
 
     def _push_writer(self):
         """push a capturing buffer onto this Context and return
@@ -135,7 +130,7 @@ class Context:
     def get(self, key, default=None):
         """Return a value from this :class:`.Context`."""
 
-        return self._data.get(key, builtins.__dict__.get(key, default))
+        return self._data.get(key, compat_builtins.__dict__.get(key, default))
 
     def write(self, string):
         """Write a string to this :class:`.Context` object's
@@ -182,12 +177,11 @@ class Context:
 
         c = self._copy()
         x = c._data
-        x.pop("self", None)
-        x.pop("parent", None)
-        x.pop("next", None)
+        x.pop('self', None)
+        x.pop('parent', None)
+        x.pop('next', None)
         return c
 
-
 class CallerStack(list):
     def __init__(self):
         self.nextcaller = None
@@ -216,8 +210,7 @@ class CallerStack(list):
         self.nextcaller = self.pop()
 
 
-class Undefined:
-
+class Undefined(object):
     """Represents an undefined value in a template.
 
     All template modules have a constant value
@@ -225,7 +218,6 @@ class Undefined:
     object.
 
     """
-
     def __str__(self):
         raise NameError("Undefined")
 
@@ -235,13 +227,9 @@ class Undefined:
     def __bool__(self):
         return False
 
-
 UNDEFINED = Undefined()
-STOP_RENDERING = ""
-
-
-class LoopStack:
 
+class LoopStack(object):
     """a stack for LoopContexts that implements the context manager protocol
     to automatically pop off the top of the stack on context exit
     """
@@ -280,8 +268,7 @@ class LoopStack:
         return iter(self._top)
 
 
-class LoopContext:
-
+class LoopContext(object):
     """A magic loop variable.
     Automatically accessible in any ``% for`` block.
 
@@ -339,16 +326,16 @@ class LoopContext:
         return bool(self.index % 2)
 
     def cycle(self, *values):
-        """Cycle through values as the loop progresses."""
+        """Cycle through values as the loop progresses.
+        """
         if not values:
             raise ValueError("You must provide values to cycle through")
         return values[self.index % len(values)]
 
 
-class _NSAttr:
+class _NSAttr(object):
     def __init__(self, parent):
         self.__parent = parent
-
     def __getattr__(self, key):
         ns = self.__parent
         while ns:
@@ -358,38 +345,30 @@ class _NSAttr:
                 ns = ns.inherits
         raise AttributeError(key)
 
-
-class Namespace:
-
+class Namespace(object):
     """Provides access to collections of rendering methods, which
-    can be local, from other templates, or from imported modules.
+      can be local, from other templates, or from imported modules.
 
-    To access a particular rendering method referenced by a
-    :class:`.Namespace`, use plain attribute access:
+      To access a particular rendering method referenced by a
+      :class:`.Namespace`, use plain attribute access:
 
-    .. sourcecode:: mako
+      .. sourcecode:: mako
 
-      ${some_namespace.foo(x, y, z)}
+        ${some_namespace.foo(x, y, z)}
 
-    :class:`.Namespace` also contains several built-in attributes
-    described here.
+      :class:`.Namespace` also contains several built-in attributes
+      described here.
 
-    """
+      """
 
-    def __init__(
-        self,
-        name,
-        context,
-        callables=None,
-        inherits=None,
-        populate_self=True,
-        calling_uri=None,
-    ):
+    def __init__(self, name, context,
+                            callables=None, inherits=None,
+                            populate_self=True, calling_uri=None):
         self.name = name
         self.context = context
         self.inherits = inherits
         if callables is not None:
-            self.callables = {c.__name__: c for c in callables}
+            self.callables = dict([(c.__name__, c) for c in callables])
 
     callables = ()
 
@@ -481,14 +460,12 @@ class Namespace:
         key = (self, uri)
         if key in self.context.namespaces:
             return self.context.namespaces[key]
-        ns = TemplateNamespace(
-            uri,
-            self.context._copy(),
-            templateuri=uri,
-            calling_uri=self._templateuri,
-        )
-        self.context.namespaces[key] = ns
-        return ns
+        else:
+            ns = TemplateNamespace(uri, self.context._copy(),
+                                templateuri=uri,
+                                calling_uri=self._templateuri)
+            self.context.namespaces[key] = ns
+            return ns
 
     def get_template(self, uri):
         """Return a :class:`.Template` from the given ``uri``.
@@ -529,8 +506,8 @@ class Namespace:
 
     def _populate(self, d, l):
         for ident in l:
-            if ident == "*":
-                for k, v in self._get_star():
+            if ident == '*':
+                for (k, v) in self._get_star():
                     d[k] = v
             else:
                 d[ident] = getattr(self, ident)
@@ -547,35 +524,26 @@ class Namespace:
             val = getattr(self.inherits, key)
         else:
             raise AttributeError(
-                "Namespace '%s' has no member '%s'" % (self.name, key)
-            )
+                    "Namespace '%s' has no member '%s'" %
+                    (self.name, key))
         setattr(self, key, val)
         return val
 
-
 class TemplateNamespace(Namespace):
-
     """A :class:`.Namespace` specific to a :class:`.Template` instance."""
 
-    def __init__(
-        self,
-        name,
-        context,
-        template=None,
-        templateuri=None,
-        callables=None,
-        inherits=None,
-        populate_self=True,
-        calling_uri=None,
-    ):
+    def __init__(self, name, context, template=None, templateuri=None,
+                            callables=None, inherits=None,
+                            populate_self=True, calling_uri=None):
         self.name = name
         self.context = context
         self.inherits = inherits
         if callables is not None:
-            self.callables = {c.__name__: c for c in callables}
+            self.callables = dict([(c.__name__, c) for c in callables])
 
         if templateuri is not None:
-            self.template = _lookup_template(context, templateuri, calling_uri)
+            self.template = _lookup_template(context, templateuri,
+                                                calling_uri)
             self._templateuri = self.template.module._template_uri
         elif template is not None:
             self.template = template
@@ -584,9 +552,9 @@ class TemplateNamespace(Namespace):
             raise TypeError("'template' argument is required.")
 
         if populate_self:
-            lclcallable, lclcontext = _populate_self_namespace(
-                context, self.template, self_ns=self
-            )
+            lclcallable, lclcontext = \
+                        _populate_self_namespace(context, self.template,
+                                                    self_ns=self)
 
     @property
     def module(self):
@@ -621,11 +589,9 @@ class TemplateNamespace(Namespace):
         if self.callables:
             for key in self.callables:
                 yield (key, self.callables[key])
-
         def get(key):
             callable_ = self.template._get_def_callable(key)
-            return functools.partial(callable_, self.context)
-
+            return compat.partial(callable_, self.context)
         for k in self.template.module._exports:
             yield (k, get(k))
 
@@ -634,40 +600,31 @@ class TemplateNamespace(Namespace):
             val = self.callables[key]
         elif self.template.has_def(key):
             callable_ = self.template._get_def_callable(key)
-            val = functools.partial(callable_, self.context)
+            val = compat.partial(callable_, self.context)
         elif self.inherits:
             val = getattr(self.inherits, key)
 
         else:
             raise AttributeError(
-                "Namespace '%s' has no member '%s'" % (self.name, key)
-            )
+                    "Namespace '%s' has no member '%s'" %
+                    (self.name, key))
         setattr(self, key, val)
         return val
 
-
 class ModuleNamespace(Namespace):
-
     """A :class:`.Namespace` specific to a Python module instance."""
 
-    def __init__(
-        self,
-        name,
-        context,
-        module,
-        callables=None,
-        inherits=None,
-        populate_self=True,
-        calling_uri=None,
-    ):
+    def __init__(self, name, context, module,
+                            callables=None, inherits=None,
+                            populate_self=True, calling_uri=None):
         self.name = name
         self.context = context
         self.inherits = inherits
         if callables is not None:
-            self.callables = {c.__name__: c for c in callables}
+            self.callables = dict([(c.__name__, c) for c in callables])
 
         mod = __import__(module)
-        for token in module.split(".")[1:]:
+        for token in module.split('.')[1:]:
             mod = getattr(mod, token)
         self.module = mod
 
@@ -683,27 +640,27 @@ class ModuleNamespace(Namespace):
             for key in self.callables:
                 yield (key, self.callables[key])
         for key in dir(self.module):
-            if key[0] != "_":
+            if key[0] != '_':
                 callable_ = getattr(self.module, key)
-                if callable(callable_):
-                    yield key, functools.partial(callable_, self.context)
+                if compat.callable(callable_):
+                    yield key, compat.partial(callable_, self.context)
+
 
     def __getattr__(self, key):
         if key in self.callables:
             val = self.callables[key]
         elif hasattr(self.module, key):
             callable_ = getattr(self.module, key)
-            val = functools.partial(callable_, self.context)
+            val = compat.partial(callable_, self.context)
         elif self.inherits:
             val = getattr(self.inherits, key)
         else:
             raise AttributeError(
-                "Namespace '%s' has no member '%s'" % (self.name, key)
-            )
+                    "Namespace '%s' has no member '%s'" %
+                    (self.name, key))
         setattr(self, key, val)
         return val
 
-
 def supports_caller(func):
     """Apply a caller_stack compatibility decorator to a plain
     Python function.
@@ -718,10 +675,8 @@ def supports_caller(func):
             return func(context, *args, **kwargs)
         finally:
             context.caller_stack._pop_frame()
-
     return wrap_stackframe
 
-
 def capture(context, callable_, *args, **kwargs):
     """Execute the given template def, capturing the output into
     a buffer.
@@ -730,11 +685,11 @@ def capture(context, callable_, *args, **kwargs):
 
     """
 
-    if not callable(callable_):
+    if not compat.callable(callable_):
         raise exceptions.RuntimeException(
-            "capture() function expects a callable as "
-            "its argument (i.e. capture(func, *args, **kwargs))"
-        )
+                        "capture() function expects a callable as "
+                        "its argument (i.e. capture(func, *args, **kwargs))"
+                        )
     context._push_buffer()
     try:
         callable_(*args, **kwargs)
@@ -742,56 +697,37 @@ def capture(context, callable_, *args, **kwargs):
         buf = context._pop_buffer()
     return buf.getvalue()
 
-
 def _decorate_toplevel(fn):
     def decorate_render(render_fn):
         def go(context, *args, **kw):
             def y(*args, **kw):
                 return render_fn(context, *args, **kw)
-
             try:
                 y.__name__ = render_fn.__name__[7:]
             except TypeError:
                 # < Python 2.4
                 pass
             return fn(y)(context, *args, **kw)
-
         return go
-
     return decorate_render
 
-
 def _decorate_inline(context, fn):
     def decorate_render(render_fn):
         dec = fn(render_fn)
-
         def go(*args, **kw):
             return dec(context, *args, **kw)
-
         return go
-
     return decorate_render
 
-
 def _include_file(context, uri, calling_uri, **kwargs):
     """locate the template from the given uri and include it in
     the current output."""
 
     template = _lookup_template(context, uri, calling_uri)
     (callable_, ctx) = _populate_self_namespace(
-        context._clean_inheritance_tokens(), template
-    )
-    kwargs = _kwargs_for_include(callable_, context._data, **kwargs)
-    if template.include_error_handler:
-        try:
-            callable_(ctx, **kwargs)
-        except Exception:
-            result = template.include_error_handler(ctx, compat.exception_as())
-            if not result:
-                raise
-    else:
-        callable_(ctx, **kwargs)
-
+                                context._clean_inheritance_tokens(),
+                                template)
+    callable_(ctx, **_kwargs_for_include(callable_, context._data, **kwargs))
 
 def _inherit_from(context, uri, calling_uri):
     """called by the _inherit method in template modules to set
@@ -801,88 +737,74 @@ def _inherit_from(context, uri, calling_uri):
     if uri is None:
         return None
     template = _lookup_template(context, uri, calling_uri)
-    self_ns = context["self"]
+    self_ns = context['self']
     ih = self_ns
     while ih.inherits is not None:
         ih = ih.inherits
-    lclcontext = context._locals({"next": ih})
-    ih.inherits = TemplateNamespace(
-        "self:%s" % template.uri,
-        lclcontext,
-        template=template,
-        populate_self=False,
-    )
-    context._data["parent"] = lclcontext._data["local"] = ih.inherits
-    callable_ = getattr(template.module, "_mako_inherit", None)
+    lclcontext = context._locals({'next': ih})
+    ih.inherits = TemplateNamespace("self:%s" % template.uri,
+                                lclcontext,
+                                template=template,
+                                populate_self=False)
+    context._data['parent'] = lclcontext._data['local'] = ih.inherits
+    callable_ = getattr(template.module, '_mako_inherit', None)
     if callable_ is not None:
         ret = callable_(template, lclcontext)
         if ret:
             return ret
 
-    gen_ns = getattr(template.module, "_mako_generate_namespaces", None)
+    gen_ns = getattr(template.module, '_mako_generate_namespaces', None)
     if gen_ns is not None:
         gen_ns(context)
     return (template.callable_, lclcontext)
 
-
 def _lookup_template(context, uri, relativeto):
     lookup = context._with_template.lookup
     if lookup is None:
         raise exceptions.TemplateLookupException(
-            "Template '%s' has no TemplateLookup associated"
-            % context._with_template.uri
-        )
+                            "Template '%s' has no TemplateLookup associated" %
+                            context._with_template.uri)
     uri = lookup.adjust_uri(uri, relativeto)
     try:
         return lookup.get_template(uri)
-    except exceptions.TopLevelLookupException as e:
-        raise exceptions.TemplateLookupException(
-            str(compat.exception_as())
-        ) from e
-
+    except exceptions.TopLevelLookupException:
+        raise exceptions.TemplateLookupException(str(compat.exception_as()))
 
 def _populate_self_namespace(context, template, self_ns=None):
     if self_ns is None:
-        self_ns = TemplateNamespace(
-            "self:%s" % template.uri,
-            context,
-            template=template,
-            populate_self=False,
-        )
-    context._data["self"] = context._data["local"] = self_ns
-    if hasattr(template.module, "_mako_inherit"):
+        self_ns = TemplateNamespace('self:%s' % template.uri,
+                                context, template=template,
+                                populate_self=False)
+    context._data['self'] = context._data['local'] = self_ns
+    if hasattr(template.module, '_mako_inherit'):
         ret = template.module._mako_inherit(template, context)
         if ret:
             return ret
     return (template.callable_, context)
 
-
 def _render(template, callable_, args, data, as_unicode=False):
     """create a Context and return the string
     output of the given template and template callable."""
 
     if as_unicode:
-        buf = util.FastEncodingBuffer()
+        buf = util.FastEncodingBuffer(as_unicode=True)
+    elif template.bytestring_passthrough:
+        buf = compat.StringIO()
     else:
         buf = util.FastEncodingBuffer(
-            encoding=template.output_encoding, errors=template.encoding_errors
-        )
+                        as_unicode=as_unicode,
+                        encoding=template.output_encoding,
+                        errors=template.encoding_errors)
     context = Context(buf, **data)
     context._outputting_as_unicode = as_unicode
     context._set_with_template(template)
 
-    _render_context(
-        template,
-        callable_,
-        context,
-        *args,
-        **_kwargs_for_callable(callable_, data),
-    )
+    _render_context(template, callable_, context, *args,
+                            **_kwargs_for_callable(callable_, data))
     return context._pop_buffer().getvalue()
 
-
 def _kwargs_for_callable(callable_, data):
-    argspec = compat.inspect_getargspec(callable_)
+    argspec = compat.inspect_func_args(callable_)
     # for normal pages, **pageargs is usually present
     if argspec[2]:
         return data
@@ -891,23 +813,20 @@ def _kwargs_for_callable(callable_, data):
     namedargs = argspec[0] + [v for v in argspec[1:3] if v is not None]
     kwargs = {}
     for arg in namedargs:
-        if arg != "context" and arg in data and arg not in kwargs:
+        if arg != 'context' and arg in data and arg not in kwargs:
             kwargs[arg] = data[arg]
     return kwargs
 
-
 def _kwargs_for_include(callable_, data, **kwargs):
-    argspec = compat.inspect_getargspec(callable_)
+    argspec = compat.inspect_func_args(callable_)
     namedargs = argspec[0] + [v for v in argspec[1:3] if v is not None]
     for arg in namedargs:
-        if arg != "context" and arg in data and arg not in kwargs:
+        if arg != 'context' and arg in data and arg not in kwargs:
             kwargs[arg] = data[arg]
     return kwargs
 
-
 def _render_context(tmpl, callable_, context, *args, **kwargs):
     import mako.template as template
-
     # create polymorphic 'self' namespace for this
     # template with possibly updated context
     if not isinstance(tmpl, template.DefTemplate):
@@ -919,7 +838,6 @@ def _render_context(tmpl, callable_, context, *args, **kwargs):
         (inherit, lclcontext) = _populate_self_namespace(context, tmpl.parent)
         _exec_template(callable_, context, args=args, kwargs=kwargs)
 
-
 def _exec_template(callable_, context, args=None, kwargs=None):
     """execute a rendering callable given the callable, a
     Context, and optional explicit arguments
@@ -929,9 +847,8 @@ def _exec_template(callable_, context, args=None, kwargs=None):
     be interpreted here.
     """
     template = context._with_template
-    if template is not None and (
-        template.format_exceptions or template.error_handler
-    ):
+    if template is not None and \
+            (template.format_exceptions or template.error_handler):
         try:
             callable_(context, *args, **kwargs)
         except Exception:
@@ -942,27 +859,20 @@ def _exec_template(callable_, context, args=None, kwargs=None):
     else:
         callable_(context, *args, **kwargs)
 
-
 def _render_error(template, context, error):
     if template.error_handler:
         result = template.error_handler(context, error)
         if not result:
-            tp, value, tb = sys.exc_info()
-            if value and tb:
-                raise value.with_traceback(tb)
-            else:
-                raise error
+            compat.reraise(*sys.exc_info())
     else:
         error_template = exceptions.html_error_template()
         if context._outputting_as_unicode:
-            context._buffer_stack[:] = [util.FastEncodingBuffer()]
-        else:
             context._buffer_stack[:] = [
-                util.FastEncodingBuffer(
-                    error_template.output_encoding,
-                    error_template.encoding_errors,
-                )
-            ]
+                                    util.FastEncodingBuffer(as_unicode=True)]
+        else:
+            context._buffer_stack[:] = [util.FastEncodingBuffer(
+                                            error_template.output_encoding,
+                                            error_template.encoding_errors)]
 
         context._set_with_template(error_template)
         error_template.render_context(context, error=error)
diff --git a/lib/mako/template.py b/lib/mako/template.py
index e2771727..fb610628 100644
--- a/lib/mako/template.py
+++ b/lib/mako/template.py
@@ -1,5 +1,5 @@
 # mako/template.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright (C) 2006-2015 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
@@ -7,26 +7,20 @@
 """Provides the Template class, a facade for parsing, generating and executing
 template strings, as well as template runtime operations."""
 
-import json
+from mako.lexer import Lexer
+from mako import runtime, util, exceptions, codegen, cache, compat
 import os
 import re
 import shutil
 import stat
+import sys
 import tempfile
 import types
 import weakref
 
-from mako import cache
-from mako import codegen
-from mako import compat
-from mako import exceptions
-from mako import runtime
-from mako import util
-from mako.lexer import Lexer
 
-
-class Template:
-    r"""Represents a compiled template.
+class Template(object):
+    """Represents a compiled template.
 
     :class:`.Template` includes a reference to the original
     template source (via the :attr:`.source` attribute)
@@ -52,6 +46,17 @@ class Template:
      of return-valued ``%def``\ s "opt out" of that filtering via
      passing special attributes or objects.
 
+    :param bytestring_passthrough: When ``True``, and ``output_encoding`` is
+     set to ``None``, and :meth:`.Template.render` is used to render,
+     the `StringIO` or `cStringIO` buffer will be used instead of the
+     default "fast" buffer.   This allows raw bytestrings in the
+     output stream, such as in expressions, to pass straight
+     through to the buffer.  This flag is forced
+     to ``True`` if ``disable_unicode`` is also configured.
+
+     .. versionadded:: 0.4
+        Added to provide the same behavior as that of the previous series.
+
     :param cache_args: Dictionary of cache configuration arguments that
      will be passed to the :class:`.CacheImpl`.   See :ref:`caching_toplevel`.
 
@@ -82,6 +87,9 @@ class Template:
     :param default_filters: List of string filter names that will
      be applied to all expressions.  See :ref:`filtering_default_filters`.
 
+    :param disable_unicode: Disables all awareness of Python Unicode
+     objects.  See :ref:`unicode_disabled`.
+
     :param enable_loop: When ``True``, enable the ``loop`` context variable.
      This can be set to ``False`` to support templates that may
      be making usage of the name "``loop``".   Individual templates can
@@ -100,11 +108,6 @@ class Template:
      completes. Is used to provide custom error-rendering
      functions.
 
-     .. seealso::
-
-        :paramref:`.Template.include_error_handler` - include-specific
-        error handler function
-
     :param format_exceptions: if ``True``, exceptions which occur during
      the render phase of this template will be caught and
      formatted into an HTML error page, which then becomes the
@@ -125,16 +128,6 @@ class Template:
      import will not appear as the first executed statement in the generated
      code and will therefore not have the desired effect.
 
-    :param include_error_handler: An error handler that runs when this template
-     is included within another one via the ``<%include>`` tag, and raises an
-     error.  Compare to the :paramref:`.Template.error_handler` option.
-
-     .. versionadded:: 1.0.6
-
-     .. seealso::
-
-        :paramref:`.Template.error_handler` - top-level error handler function
-
     :param input_encoding: Encoding of the template's source code.  Can
      be used in lieu of the coding comment. See
      :ref:`usage_unicode` as well as :ref:`unicode_toplevel` for
@@ -221,41 +214,40 @@ class Template:
 
     lexer_cls = Lexer
 
-    def __init__(
-        self,
-        text=None,
-        filename=None,
-        uri=None,
-        format_exceptions=False,
-        error_handler=None,
-        lookup=None,
-        output_encoding=None,
-        encoding_errors="strict",
-        module_directory=None,
-        cache_args=None,
-        cache_impl="beaker",
-        cache_enabled=True,
-        cache_type=None,
-        cache_dir=None,
-        cache_url=None,
-        module_filename=None,
-        input_encoding=None,
-        module_writer=None,
-        default_filters=None,
-        buffer_filters=(),
-        strict_undefined=False,
-        imports=None,
-        future_imports=None,
-        enable_loop=True,
-        preprocessor=None,
-        lexer_cls=None,
-        include_error_handler=None,
-    ):
+    def __init__(self,
+                    text=None,
+                    filename=None,
+                    uri=None,
+                    format_exceptions=False,
+                    error_handler=None,
+                    lookup=None,
+                    output_encoding=None,
+                    encoding_errors='strict',
+                    module_directory=None,
+                    cache_args=None,
+                    cache_impl='beaker',
+                    cache_enabled=True,
+                    cache_type=None,
+                    cache_dir=None,
+                    cache_url=None,
+                    module_filename=None,
+                    input_encoding=None,
+                    disable_unicode=False,
+                    module_writer=None,
+                    bytestring_passthrough=False,
+                    default_filters=None,
+                    buffer_filters=(),
+                    strict_undefined=False,
+                    imports=None,
+                    future_imports=None,
+                    enable_loop=True,
+                    preprocessor=None,
+                    lexer_cls=None):
         if uri:
-            self.module_id = re.sub(r"\W", "_", uri)
+            self.module_id = re.sub(r'\W', "_", uri)
             self.uri = uri
         elif filename:
-            self.module_id = re.sub(r"\W", "_", filename)
+            self.module_id = re.sub(r'\W', "_", filename)
             drive, path = os.path.splitdrive(filename)
             path = os.path.normpath(path).replace(os.path.sep, "/")
             self.uri = path
@@ -269,20 +261,32 @@ class Template:
         u_norm = os.path.normpath(u_norm)
         if u_norm.startswith(".."):
             raise exceptions.TemplateLookupException(
-                'Template uri "%s" is invalid - '
-                "it cannot be relative outside "
-                "of the root path." % self.uri
-            )
+                    "Template uri \"%s\" is invalid - "
+                    "it cannot be relative outside "
+                    "of the root path." % self.uri)
 
         self.input_encoding = input_encoding
         self.output_encoding = output_encoding
         self.encoding_errors = encoding_errors
+        self.disable_unicode = disable_unicode
+        self.bytestring_passthrough = bytestring_passthrough or disable_unicode
         self.enable_loop = enable_loop
         self.strict_undefined = strict_undefined
         self.module_writer = module_writer
 
+        if compat.py3k and disable_unicode:
+            raise exceptions.UnsupportedError(
+                                    "Mako for Python 3 does not "
+                                    "support disabling Unicode")
+        elif output_encoding and disable_unicode:
+            raise exceptions.UnsupportedError(
+                                    "output_encoding must be set to "
+                                    "None when disable_unicode is used.")
         if default_filters is None:
-            self.default_filters = ["str"]
+            if compat.py3k or self.disable_unicode:
+                self.default_filters = ['str']
+            else:
+                self.default_filters = ['unicode']
         else:
             self.default_filters = default_filters
         self.buffer_filters = buffer_filters
@@ -299,7 +303,7 @@ class Template:
             (code, module) = _compile_text(self, text, filename)
             self._code = code
             self._source = text
-            ModuleInfo(module, None, self, filename, code, text, uri)
+            ModuleInfo(module, None, self, filename, code, text)
         elif filename is not None:
             # if template filename and a module directory, load
             # a filesystem-based module file, generating if needed
@@ -307,92 +311,95 @@ class Template:
                 path = module_filename
             elif module_directory is not None:
                 path = os.path.abspath(
-                    os.path.join(
-                        os.path.normpath(module_directory), u_norm + ".py"
-                    )
-                )
+                        os.path.join(
+                            os.path.normpath(module_directory),
+                            u_norm + ".py"
+                            )
+                        )
             else:
                 path = None
             module = self._compile_from_file(path, filename)
         else:
             raise exceptions.RuntimeException(
-                "Template requires text or filename"
-            )
+                                "Template requires text or filename")
 
         self.module = module
         self.filename = filename
         self.callable_ = self.module.render_body
         self.format_exceptions = format_exceptions
         self.error_handler = error_handler
-        self.include_error_handler = include_error_handler
         self.lookup = lookup
 
         self.module_directory = module_directory
 
         self._setup_cache_args(
-            cache_impl,
-            cache_enabled,
-            cache_args,
-            cache_type,
-            cache_dir,
-            cache_url,
+            cache_impl, cache_enabled, cache_args,
+            cache_type, cache_dir, cache_url
         )
 
+
     @util.memoized_property
     def reserved_names(self):
         if self.enable_loop:
             return codegen.RESERVED_NAMES
         else:
-            return codegen.RESERVED_NAMES.difference(["loop"])
+            return codegen.RESERVED_NAMES.difference(['loop'])
 
-    def _setup_cache_args(
-        self,
-        cache_impl,
-        cache_enabled,
-        cache_args,
-        cache_type,
-        cache_dir,
-        cache_url,
-    ):
+    def _setup_cache_args(self,
+                cache_impl, cache_enabled, cache_args,
+                cache_type, cache_dir, cache_url):
         self.cache_impl = cache_impl
         self.cache_enabled = cache_enabled
-        self.cache_args = cache_args or {}
+        if cache_args:
+            self.cache_args = cache_args
+        else:
+            self.cache_args = {}
+
         # transfer deprecated cache_* args
         if cache_type:
-            self.cache_args["type"] = cache_type
+            self.cache_args['type'] = cache_type
         if cache_dir:
-            self.cache_args["dir"] = cache_dir
+            self.cache_args['dir'] = cache_dir
         if cache_url:
-            self.cache_args["url"] = cache_url
+            self.cache_args['url'] = cache_url
 
     def _compile_from_file(self, path, filename):
         if path is not None:
             util.verify_directory(os.path.dirname(path))
             filemtime = os.stat(filename)[stat.ST_MTIME]
-            if (
-                not os.path.exists(path)
-                or os.stat(path)[stat.ST_MTIME] < filemtime
-            ):
+            if not os.path.exists(path) or \
+                        os.stat(path)[stat.ST_MTIME] < filemtime:
                 data = util.read_file(filename)
                 _compile_module_file(
-                    self, data, filename, path, self.module_writer
-                )
+                            self,
+                            data,
+                            filename,
+                            path,
+                            self.module_writer)
             module = compat.load_module(self.module_id, path)
+            del sys.modules[self.module_id]
             if module._magic_number != codegen.MAGIC_NUMBER:
                 data = util.read_file(filename)
                 _compile_module_file(
-                    self, data, filename, path, self.module_writer
-                )
+                            self,
+                            data,
+                            filename,
+                            path,
+                            self.module_writer)
                 module = compat.load_module(self.module_id, path)
-            ModuleInfo(module, path, self, filename, None, None, None)
+                del sys.modules[self.module_id]
+            ModuleInfo(module, path, self, filename, None, None)
         else:
             # template filename and no module directory, compile code
             # in memory
             data = util.read_file(filename)
-            code, module = _compile_text(self, data, filename)
+            code, module = _compile_text(
+                                self,
+                                data,
+                                filename)
             self._source = None
             self._code = code
-            ModuleInfo(module, None, self, filename, code, None, None)
+            ModuleInfo(module, None, self, filename, code, None)
         return module
 
     @property
@@ -413,22 +420,20 @@ class Template:
 
     @property
     def cache_dir(self):
-        return self.cache_args["dir"]
-
+        return self.cache_args['dir']
     @property
     def cache_url(self):
-        return self.cache_args["url"]
-
+        return self.cache_args['url']
     @property
     def cache_type(self):
-        return self.cache_args["type"]
+        return self.cache_args['type']
 
     def render(self, *args, **data):
         """Render the output of this template as a string.
 
         If the template specifies an output encoding, the string
         will be encoded accordingly, else the output is raw (raw
-        output uses `StringIO` and can't handle multibyte
+        output uses `cStringIO` and can't handle multibyte
         characters). A :class:`.Context` object is created corresponding
         to the given data. Arguments that are explicitly declared
         by this template's internal rendering method are also
@@ -440,9 +445,11 @@ class Template:
     def render_unicode(self, *args, **data):
         """Render the output of this template as a unicode object."""
 
-        return runtime._render(
-            self, self.callable_, args, data, as_unicode=True
-        )
+        return runtime._render(self,
+                                self.callable_,
+                                args,
+                                data,
+                                as_unicode=True)
 
     def render_context(self, context, *args, **kwargs):
         """Render this :class:`.Template` with the given context.
@@ -450,9 +457,13 @@ class Template:
         The data is written to the context's buffer.
 
         """
-        if getattr(context, "_with_template", None) is None:
+        if getattr(context, '_with_template', None) is None:
             context._set_with_template(self)
-        runtime._render_context(self, self.callable_, context, *args, **kwargs)
+        runtime._render_context(self,
+                                self.callable_,
+                                context,
+                                *args,
+                                **kwargs)
 
     def has_def(self, name):
         return hasattr(self.module, "render_%s" % name)
@@ -462,14 +473,6 @@ class Template:
 
         return DefTemplate(self, getattr(self.module, "render_%s" % name))
 
-    def list_defs(self):
-        """return a list of defs in the template.
-
-        .. versionadded:: 1.0.4
-
-        """
-        return [i[7:] for i in dir(self.module) if i[:7] == "render_"]
-
     def _get_def_callable(self, name):
         return getattr(self.module, "render_%s" % name)
 
@@ -477,82 +480,80 @@ class Template:
     def last_modified(self):
         return self.module._modified_time
 
-
 class ModuleTemplate(Template):
-
     """A Template which is constructed given an existing Python module.
 
-    e.g.::
+        e.g.::
 
-         t = Template("this is a template")
-         f = file("mymodule.py", "w")
-         f.write(t.code)
-         f.close()
+        t = Template("this is a template")
+        f = file("mymodule.py", "w")
+        f.write(t.code)
+        f.close()
 
-         import mymodule
+        import mymodule
 
-         t = ModuleTemplate(mymodule)
-         print(t.render())
+        t = ModuleTemplate(mymodule)
+        print t.render()
 
     """
 
-    def __init__(
-        self,
-        module,
-        module_filename=None,
-        template=None,
-        template_filename=None,
-        module_source=None,
-        template_source=None,
-        output_encoding=None,
-        encoding_errors="strict",
-        format_exceptions=False,
-        error_handler=None,
-        lookup=None,
-        cache_args=None,
-        cache_impl="beaker",
-        cache_enabled=True,
-        cache_type=None,
-        cache_dir=None,
-        cache_url=None,
-        include_error_handler=None,
+    def __init__(self, module,
+                        module_filename=None,
+                        template=None,
+                        template_filename=None,
+                        module_source=None,
+                        template_source=None,
+                        output_encoding=None,
+                        encoding_errors='strict',
+                        disable_unicode=False,
+                        bytestring_passthrough=False,
+                        format_exceptions=False,
+                        error_handler=None,
+                        lookup=None,
+                        cache_args=None,
+                        cache_impl='beaker',
+                        cache_enabled=True,
+                        cache_type=None,
+                        cache_dir=None,
+                        cache_url=None,
     ):
-        self.module_id = re.sub(r"\W", "_", module._template_uri)
+        self.module_id = re.sub(r'\W', "_", module._template_uri)
         self.uri = module._template_uri
         self.input_encoding = module._source_encoding
         self.output_encoding = output_encoding
         self.encoding_errors = encoding_errors
+        self.disable_unicode = disable_unicode
+        self.bytestring_passthrough = bytestring_passthrough or disable_unicode
         self.enable_loop = module._enable_loop
 
+        if compat.py3k and disable_unicode:
+            raise exceptions.UnsupportedError(
+                                    "Mako for Python 3 does not "
+                                    "support disabling Unicode")
+        elif output_encoding and disable_unicode:
+            raise exceptions.UnsupportedError(
+                                    "output_encoding must be set to "
+                                    "None when disable_unicode is used.")
+
         self.module = module
         self.filename = template_filename
-        ModuleInfo(
-            module,
-            module_filename,
-            self,
-            template_filename,
-            module_source,
-            template_source,
-            module._template_uri,
-        )
+        ModuleInfo(module,
+                        module_filename,
+                        self,
+                        template_filename,
+                        module_source,
+                        template_source)
 
         self.callable_ = self.module.render_body
         self.format_exceptions = format_exceptions
         self.error_handler = error_handler
-        self.include_error_handler = include_error_handler
         self.lookup = lookup
         self._setup_cache_args(
-            cache_impl,
-            cache_enabled,
-            cache_args,
-            cache_type,
-            cache_dir,
-            cache_url,
+            cache_impl, cache_enabled, cache_args,
+            cache_type, cache_dir, cache_url
         )
 
-
 class DefTemplate(Template):
-
     """A :class:`.Template` which represents a callable def in a parent
     template."""
 
@@ -564,40 +565,33 @@ class DefTemplate(Template):
         self.encoding_errors = parent.encoding_errors
         self.format_exceptions = parent.format_exceptions
         self.error_handler = parent.error_handler
-        self.include_error_handler = parent.include_error_handler
         self.enable_loop = parent.enable_loop
         self.lookup = parent.lookup
+        self.bytestring_passthrough = parent.bytestring_passthrough
 
     def get_def(self, name):
         return self.parent.get_def(name)
 
-
-class ModuleInfo:
-
+class ModuleInfo(object):
     """Stores information about a module currently loaded into
     memory, provides reverse lookups of template source, module
     source code based on a module's identifier.
 
-    """
-
+     """
     _modules = weakref.WeakValueDictionary()
 
-    def __init__(
-        self,
-        module,
-        module_filename,
-        template,
-        template_filename,
-        module_source,
-        template_source,
-        template_uri,
-    ):
+    def __init__(self,
+                    module,
+                    module_filename,
+                    template,
+                    template_filename,
+                    module_source,
+                    template_source):
         self.module = module
         self.module_filename = module_filename
         self.template_filename = template_filename
         self.module_source = module_source
         self.template_source = template_source
-        self.template_uri = template_uri
         self._modules[module.__name__] = template._mmarker = self
         if module_filename:
             self._modules[module_filename] = self
@@ -605,15 +599,14 @@ class ModuleInfo:
     @classmethod
     def get_module_source_metadata(cls, module_source, full_line_map=False):
         source_map = re.search(
-            r"__M_BEGIN_METADATA(.+?)__M_END_METADATA", module_source, re.S
-        ).group(1)
-        source_map = json.loads(source_map)
-        source_map["line_map"] = {
-            int(k): int(v) for k, v in source_map["line_map"].items()
-        }
+                        r"__M_BEGIN_METADATA(.+?)__M_END_METADATA",
+                        module_source, re.S).group(1)
+        source_map = compat.json.loads(source_map)
+        source_map['line_map'] = dict((int(k), int(v))
+                                    for k, v in source_map['line_map'].items())
         if full_line_map:
-            f_line_map = source_map["full_line_map"] = []
-            line_map = source_map["line_map"]
+            f_line_map = source_map['full_line_map'] = []
+            line_map = source_map['line_map']
 
             curr_templ_line = 1
             for mod_line in range(1, max(line_map)):
@@ -631,68 +624,63 @@ class ModuleInfo:
 
     @property
     def source(self):
-        if self.template_source is None:
+        if self.template_source is not None:
+            if self.module._source_encoding and \
+                    not isinstance(self.template_source, compat.text_type):
+                return self.template_source.decode(
+                                self.module._source_encoding)
+            else:
+                return self.template_source
+        else:
             data = util.read_file(self.template_filename)
             if self.module._source_encoding:
                 return data.decode(self.module._source_encoding)
             else:
                 return data
 
-        elif self.module._source_encoding and not isinstance(
-            self.template_source, str
-        ):
-            return self.template_source.decode(self.module._source_encoding)
-        else:
-            return self.template_source
-
-
 def _compile(template, text, filename, generate_magic_comment):
-    lexer = template.lexer_cls(
-        text,
-        filename,
-        input_encoding=template.input_encoding,
-        preprocessor=template.preprocessor,
-    )
+    lexer = template.lexer_cls(text,
+                           filename,
+                           disable_unicode=template.disable_unicode,
+                           input_encoding=template.input_encoding,
+                           preprocessor=template.preprocessor)
     node = lexer.parse()
-    source = codegen.compile(
-        node,
-        template.uri,
-        filename,
-        default_filters=template.default_filters,
-        buffer_filters=template.buffer_filters,
-        imports=template.imports,
-        future_imports=template.future_imports,
-        source_encoding=lexer.encoding,
-        generate_magic_comment=generate_magic_comment,
-        strict_undefined=template.strict_undefined,
-        enable_loop=template.enable_loop,
-        reserved_names=template.reserved_names,
-    )
+    source = codegen.compile(node,
+                            template.uri,
+                            filename,
+                            default_filters=template.default_filters,
+                            buffer_filters=template.buffer_filters,
+                            imports=template.imports,
+                            future_imports=template.future_imports,
+                            source_encoding=lexer.encoding,
+                            generate_magic_comment=generate_magic_comment,
+                            disable_unicode=template.disable_unicode,
+                            strict_undefined=template.strict_undefined,
+                            enable_loop=template.enable_loop,
+                            reserved_names=template.reserved_names)
     return source, lexer
 
-
 def _compile_text(template, text, filename):
     identifier = template.module_id
-    source, lexer = _compile(
-        template, text, filename, generate_magic_comment=False
-    )
+    source, lexer = _compile(template, text, filename,
+                        generate_magic_comment=template.disable_unicode)
 
     cid = identifier
+    if not compat.py3k and isinstance(cid, compat.text_type):
+        cid = cid.encode()
     module = types.ModuleType(cid)
-    code = compile(source, cid, "exec")
+    code = compile(source, cid, 'exec')
 
     # this exec() works for 2.4->3.3.
     exec(code, module.__dict__, module.__dict__)
     return (source, module)
 
-
 def _compile_module_file(template, text, filename, outputpath, module_writer):
-    source, lexer = _compile(
-        template, text, filename, generate_magic_comment=True
-    )
+    source, lexer = _compile(template, text, filename,
+                        generate_magic_comment=True)
 
-    if isinstance(source, str):
-        source = source.encode(lexer.encoding or "ascii")
+    if isinstance(source, compat.text_type):
+        source = source.encode(lexer.encoding or 'ascii')
 
     if module_writer:
         module_writer(source, outputpath)
@@ -706,10 +694,12 @@ def _compile_module_file(template, text, filename, outputpath, module_writer):
         os.close(dest)
         shutil.move(name, outputpath)
 
-
 def _get_module_info_from_callable(callable_):
-    return _get_module_info(callable_.__globals__["__name__"])
-
+    if compat.py3k:
+        return _get_module_info(callable_.__globals__['__name__'])
+    else:
+        return _get_module_info(callable_.func_globals['__name__'])
 
 def _get_module_info(filename):
     return ModuleInfo._modules[filename]
+
diff --git a/lib/mako/testing/__init__.py b/lib/mako/testing/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/mako/testing/_config.py b/lib/mako/testing/_config.py
deleted file mode 100644
index 4ee3d0a6..00000000
--- a/lib/mako/testing/_config.py
+++ /dev/null
@@ -1,128 +0,0 @@
-import configparser
-import dataclasses
-from dataclasses import dataclass
-from pathlib import Path
-from typing import Callable
-from typing import ClassVar
-from typing import Optional
-from typing import Union
-
-from .helpers import make_path
-
-
-class ConfigError(BaseException):
-    pass
-
-
-class MissingConfig(ConfigError):
-    pass
-
-
-class MissingConfigSection(ConfigError):
-    pass
-
-
-class MissingConfigItem(ConfigError):
-    pass
-
-
-class ConfigValueTypeError(ConfigError):
-    pass
-
-
-class _GetterDispatch:
-    def __init__(self, initialdata, default_getter: Callable):
-        self.default_getter = default_getter
-        self.data = initialdata
-
-    def get_fn_for_type(self, type_):
-        return self.data.get(type_, self.default_getter)
-
-    def get_typed_value(self, type_, name):
-        get_fn = self.get_fn_for_type(type_)
-        return get_fn(name)
-
-
-def _parse_cfg_file(filespec: Union[Path, str]):
-    cfg = configparser.ConfigParser()
-    try:
-        filepath = make_path(filespec, check_exists=True)
-    except FileNotFoundError as e:
-        raise MissingConfig(f"No config file found at {filespec}") from e
-    else:
-        with open(filepath, encoding="utf-8") as f:
-            cfg.read_file(f)
-        return cfg
-
-
-def _build_getter(cfg_obj, cfg_section, method, converter=None):
-    def caller(option, **kwargs):
-        try:
-            rv = getattr(cfg_obj, method)(cfg_section, option, **kwargs)
-        except configparser.NoSectionError as nse:
-            raise MissingConfigSection(
-                f"No config section named {cfg_section}"
-            ) from nse
-        except configparser.NoOptionError as noe:
-            raise MissingConfigItem(f"No config item for {option}") from noe
-        except ValueError as ve:
-            # ConfigParser.getboolean, .getint, .getfloat raise ValueError
-            # on bad types
-            raise ConfigValueTypeError(
-                f"Wrong value type for {option}"
-            ) from ve
-        else:
-            if converter:
-                try:
-                    rv = converter(rv)
-                except Exception as e:
-                    raise ConfigValueTypeError(
-                        f"Wrong value type for {option}"
-                    ) from e
-            return rv
-
-    return caller
-
-
-def _build_getter_dispatch(cfg_obj, cfg_section, converters=None):
-    converters = converters or {}
-
-    default_getter = _build_getter(cfg_obj, cfg_section, "get")
-
-    # support ConfigParser builtins
-    getters = {
-        int: _build_getter(cfg_obj, cfg_section, "getint"),
-        bool: _build_getter(cfg_obj, cfg_section, "getboolean"),
-        float: _build_getter(cfg_obj, cfg_section, "getfloat"),
-        str: default_getter,
-    }
-
-    # use ConfigParser.get and convert value
-    getters.update(
-        {
-            type_: _build_getter(
-                cfg_obj, cfg_section, "get", converter=converter_fn
-            )
-            for type_, converter_fn in converters.items()
-        }
-    )
-
-    return _GetterDispatch(getters, default_getter)
-
-
-@dataclass
-class ReadsCfg:
-    section_header: ClassVar[str]
-    converters: ClassVar[Optional[dict]] = None
-
-    @classmethod
-    def from_cfg_file(cls, filespec: Union[Path, str]):
-        cfg = _parse_cfg_file(filespec)
-        dispatch = _build_getter_dispatch(
-            cfg, cls.section_header, converters=cls.converters
-        )
-        kwargs = {
-            field.name: dispatch.get_typed_value(field.type, field.name)
-            for field in dataclasses.fields(cls)
-        }
-        return cls(**kwargs)
diff --git a/lib/mako/testing/assertions.py b/lib/mako/testing/assertions.py
deleted file mode 100644
index 22221cd2..00000000
--- a/lib/mako/testing/assertions.py
+++ /dev/null
@@ -1,166 +0,0 @@
-import contextlib
-import re
-import sys
-
-
-def eq_(a, b, msg=None):
-    """Assert a == b, with repr messaging on failure."""
-    assert a == b, msg or "%r != %r" % (a, b)
-
-
-def ne_(a, b, msg=None):
-    """Assert a != b, with repr messaging on failure."""
-    assert a != b, msg or "%r == %r" % (a, b)
-
-
-def in_(a, b, msg=None):
-    """Assert a in b, with repr messaging on failure."""
-    assert a in b, msg or "%r not in %r" % (a, b)
-
-
-def not_in(a, b, msg=None):
-    """Assert a in not b, with repr messaging on failure."""
-    assert a not in b, msg or "%r is in %r" % (a, b)
-
-
-def _assert_proper_exception_context(exception):
-    """assert that any exception we're catching does not have a __context__
-    without a __cause__, and that __suppress_context__ is never set.
-
-    Python 3 will report nested as exceptions as "during the handling of
-    error X, error Y occurred". That's not what we want to do. We want
-    these exceptions in a cause chain.
-
-    """
-
-    if (
-        exception.__context__ is not exception.__cause__
-        and not exception.__suppress_context__
-    ):
-        assert False, (
-            "Exception %r was correctly raised but did not set a cause, "
-            "within context %r as its cause."
-            % (exception, exception.__context__)
-        )
-
-
-def _assert_proper_cause_cls(exception, cause_cls):
-    """assert that any exception we're catching does not have a __context__
-    without a __cause__, and that __suppress_context__ is never set.
-
-    Python 3 will report nested as exceptions as "during the handling of
-    error X, error Y occurred". That's not what we want to do. We want
-    these exceptions in a cause chain.
-
-    """
-    assert isinstance(exception.__cause__, cause_cls), (
-        "Exception %r was correctly raised but has cause %r, which does not "
-        "have the expected cause type %r."
-        % (exception, exception.__cause__, cause_cls)
-    )
-
-
-def assert_raises(except_cls, callable_, *args, **kw):
-    return _assert_raises(except_cls, callable_, args, kw)
-
-
-def assert_raises_with_proper_context(except_cls, callable_, *args, **kw):
-    return _assert_raises(except_cls, callable_, args, kw, check_context=True)
-
-
-def assert_raises_with_given_cause(
-    except_cls, cause_cls, callable_, *args, **kw
-):
-    return _assert_raises(except_cls, callable_, args, kw, cause_cls=cause_cls)
-
-
-def assert_raises_message(except_cls, msg, callable_, *args, **kwargs):
-    return _assert_raises(except_cls, callable_, args, kwargs, msg=msg)
-
-
-def assert_raises_message_with_proper_context(
-    except_cls, msg, callable_, *args, **kwargs
-):
-    return _assert_raises(
-        except_cls, callable_, args, kwargs, msg=msg, check_context=True
-    )
-
-
-def assert_raises_message_with_given_cause(
-    except_cls, msg, cause_cls, callable_, *args, **kwargs
-):
-    return _assert_raises(
-        except_cls, callable_, args, kwargs, msg=msg, cause_cls=cause_cls
-    )
-
-
-def _assert_raises(
-    except_cls,
-    callable_,
-    args,
-    kwargs,
-    msg=None,
-    check_context=False,
-    cause_cls=None,
-):
-    with _expect_raises(except_cls, msg, check_context, cause_cls) as ec:
-        callable_(*args, **kwargs)
-    return ec.error
-
-
-class _ErrorContainer:
-    error = None
-
-
-@contextlib.contextmanager
-def _expect_raises(except_cls, msg=None, check_context=False, cause_cls=None):
-    ec = _ErrorContainer()
-    if check_context:
-        are_we_already_in_a_traceback = sys.exc_info()[0]
-    try:
-        yield ec
-        success = False
-    except except_cls as err:
-        ec.error = err
-        success = True
-        if msg is not None:
-            # I'm often pdbing here, and "err" above isn't
-            # in scope, so assign the string explicitly
-            error_as_string = str(err)
-            assert re.search(msg, error_as_string, re.UNICODE), "%r !~ %s" % (
-                msg,
-                error_as_string,
-            )
-        if cause_cls is not None:
-            _assert_proper_cause_cls(err, cause_cls)
-        if check_context and not are_we_already_in_a_traceback:
-            _assert_proper_exception_context(err)
-        print(str(err).encode("utf-8"))
-
-    # it's generally a good idea to not carry traceback objects outside
-    # of the except: block, but in this case especially we seem to have
-    # hit some bug in either python 3.10.0b2 or greenlet or both which
-    # this seems to fix:
-    # https://github.com/python-greenlet/greenlet/issues/242
-    del ec
-
-    # assert outside the block so it works for AssertionError too !
-    assert success, "Callable did not raise an exception"
-
-
-def expect_raises(except_cls, check_context=False):
-    return _expect_raises(except_cls, check_context=check_context)
-
-
-def expect_raises_message(except_cls, msg, check_context=False):
-    return _expect_raises(except_cls, msg=msg, check_context=check_context)
-
-
-def expect_raises_with_proper_context(except_cls, check_context=True):
-    return _expect_raises(except_cls, check_context=check_context)
-
-
-def expect_raises_message_with_proper_context(
-    except_cls, msg, check_context=True
-):
-    return _expect_raises(except_cls, msg=msg, check_context=check_context)
diff --git a/lib/mako/testing/config.py b/lib/mako/testing/config.py
deleted file mode 100644
index b77d0c08..00000000
--- a/lib/mako/testing/config.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from dataclasses import dataclass
-from pathlib import Path
-
-from ._config import ReadsCfg
-from .helpers import make_path
-
-
-@dataclass
-class Config(ReadsCfg):
-    module_base: Path
-    template_base: Path
-
-    section_header = "mako_testing"
-    converters = {Path: make_path}
-
-
-config = Config.from_cfg_file("./setup.cfg")
diff --git a/lib/mako/testing/exclusions.py b/lib/mako/testing/exclusions.py
deleted file mode 100644
index 37b2d14a..00000000
--- a/lib/mako/testing/exclusions.py
+++ /dev/null
@@ -1,80 +0,0 @@
-import pytest
-
-from mako.ext.beaker_cache import has_beaker
-from mako.util import update_wrapper
-
-
-try:
-    import babel.messages.extract as babel
-except ImportError:
-    babel = None
-
-
-try:
-    import lingua
-except ImportError:
-    lingua = None
-
-
-try:
-    import dogpile.cache  # noqa
-except ImportError:
-    has_dogpile_cache = False
-else:
-    has_dogpile_cache = True
-
-
-requires_beaker = pytest.mark.skipif(
-    not has_beaker, reason="Beaker is required for these tests."
-)
-
-
-requires_babel = pytest.mark.skipif(
-    babel is None, reason="babel not installed: skipping babelplugin test"
-)
-
-
-requires_lingua = pytest.mark.skipif(
-    lingua is None, reason="lingua not installed: skipping linguaplugin test"
-)
-
-
-requires_dogpile_cache = pytest.mark.skipif(
-    not has_dogpile_cache,
-    reason="dogpile.cache is required to run these tests",
-)
-
-
-def _pygments_version():
-    try:
-        import pygments
-
-        version = pygments.__version__
-    except:
-        version = "0"
-    return version
-
-
-requires_pygments_14 = pytest.mark.skipif(
-    _pygments_version() < "1.4", reason="Requires pygments 1.4 or greater"
-)
-
-
-# def requires_pygments_14(fn):
-
-#     return skip_if(
-#         lambda: version < "1.4", "Requires pygments 1.4 or greater"
-#     )(fn)
-
-
-def requires_no_pygments_exceptions(fn):
-    def go(*arg, **kw):
-        from mako import exceptions
-
-        exceptions._install_fallback()
-        try:
-            return fn(*arg, **kw)
-        finally:
-            exceptions._install_highlighting()
-
-    return update_wrapper(go, fn)
diff --git a/lib/mako/testing/fixtures.py b/lib/mako/testing/fixtures.py
deleted file mode 100644
index 01e99617..00000000
--- a/lib/mako/testing/fixtures.py
+++ /dev/null
@@ -1,119 +0,0 @@
-import os
-
-from mako.cache import CacheImpl
-from mako.cache import register_plugin
-from mako.template import Template
-from .assertions import eq_
-from .config import config
-
-
-class TemplateTest:
-    def _file_template(self, filename, **kw):
-        filepath = self._file_path(filename)
-        return Template(
-            uri=filename,
-            filename=filepath,
-            module_directory=config.module_base,
-            **kw,
-        )
-
-    def _file_path(self, filename):
-        name, ext = os.path.splitext(filename)
-        py3k_path = os.path.join(config.template_base, name + "_py3k" + ext)
-        if os.path.exists(py3k_path):
-            return py3k_path
-
-        return os.path.join(config.template_base, filename)
-
-    def _do_file_test(
-        self,
-        filename,
-        expected,
-        filters=None,
-        unicode_=True,
-        template_args=None,
-        **kw,
-    ):
-        t1 = self._file_template(filename, **kw)
-        self._do_test(
-            t1,
-            expected,
-            filters=filters,
-            unicode_=unicode_,
-            template_args=template_args,
-        )
-
-    def _do_memory_test(
-        self,
-        source,
-        expected,
-        filters=None,
-        unicode_=True,
-        template_args=None,
-        **kw,
-    ):
-        t1 = Template(text=source, **kw)
-        self._do_test(
-            t1,
-            expected,
-            filters=filters,
-            unicode_=unicode_,
-            template_args=template_args,
-        )
-
-    def _do_test(
-        self,
-        template,
-        expected,
-        filters=None,
-        template_args=None,
-        unicode_=True,
-    ):
-        if template_args is None:
-            template_args = {}
-        if unicode_:
-            output = template.render_unicode(**template_args)
-        else:
-            output = template.render(**template_args)
-
-        if filters:
-            output = filters(output)
-        eq_(output, expected)
-
-    def indicates_unbound_local_error(self, rendered_output, unbound_var):
-        var = f"&#39;{unbound_var}&#39;"
-        error_msgs = (
-            # < 3.11
-            f"local variable {var} referenced before assignment",
-            # >= 3.11
-            f"cannot access local variable {var} where it is not associated",
-        )
-        return any((msg in rendered_output) for msg in error_msgs)
-
-
-class PlainCacheImpl(CacheImpl):
-    """Simple memory cache impl so that tests which
-    use caching can run without beaker."""
-
-    def __init__(self, cache):
-        self.cache = cache
-        self.data = {}
-
-    def get_or_create(self, key, creation_function, **kw):
-        if key in self.data:
-            return self.data[key]
-        else:
-            self.data[key] = data = creation_function(**kw)
-            return data
-
-    def put(self, key, value, **kw):
-        self.data[key] = value
-
-    def get(self, key, **kw):
-        return self.data[key]
-
-    def invalidate(self, key, **kw):
-        del self.data[key]
-
-
-register_plugin("plain", __name__, "PlainCacheImpl")
diff --git a/lib/mako/testing/helpers.py b/lib/mako/testing/helpers.py
deleted file mode 100644
index 5ae9d38d..00000000
--- a/lib/mako/testing/helpers.py
+++ /dev/null
@@ -1,71 +0,0 @@
-import contextlib
-import pathlib
-from pathlib import Path
-import re
-import time
-from typing import Union
-from unittest import mock
-
-
-def flatten_result(result):
-    return re.sub(r"[\s\r\n]+", " ", result).strip()
-
-
-def result_lines(result):
-    return [
-        x.strip()
-        for x in re.split(r"\r?\n", re.sub(r" +", " ", result))
-        if x.strip() != ""
-    ]
-
-
-def result_raw_lines(result):
-    return [x for x in re.split(r"\r?\n", result) if x.strip() != ""]
-
-
-def make_path(
-    filespec: Union[Path, str],
-    make_absolute: bool = True,
-    check_exists: bool = False,
-) -> Path:
-    path = Path(filespec)
-    if make_absolute:
-        path = path.resolve(strict=check_exists)
-    if check_exists and (not path.exists()):
-        raise FileNotFoundError(f"No file or directory at {filespec}")
-    return path
-
-
-def _unlink_path(path, missing_ok=False):
-    # Replicate 3.8+ functionality in 3.7
-    cm = contextlib.nullcontext()
-    if missing_ok:
-        cm = contextlib.suppress(FileNotFoundError)
-
-    with cm:
-        path.unlink()
-
-
-def replace_file_with_dir(pathspec):
-    path = pathlib.Path(pathspec)
-    _unlink_path(path, missing_ok=True)
-    path.mkdir(exist_ok=True)
-    return path
-
-
-def file_with_template_code(filespec):
-    with open(filespec, "w") as f:
-        f.write(
-            """
-i am an artificial template just for you
-"""
-        )
-    return filespec
-
-
-@contextlib.contextmanager
-def rewind_compile_time(hours=1):
-    rewound = time.time() - (hours * 3_600)
-    with mock.patch("mako.codegen.time") as codegen_time:
-        codegen_time.time.return_value = rewound
-        yield
diff --git a/lib/mako/util.py b/lib/mako/util.py
index 91188cac..cba2ab79 100644
--- a/lib/mako/util.py
+++ b/lib/mako/util.py
@@ -1,18 +1,15 @@
 # mako/util.py
-# Copyright 2006-2024 the Mako authors and contributors <see AUTHORS file>
+# Copyright (C) 2006-2015 the Mako authors and contributors <see AUTHORS file>
 #
 # This module is part of Mako and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
-from ast import parse
-import codecs
-import collections
-import operator
-import os
+
 import re
-import timeit
-
-from .compat import importlib_metadata_get
-
+import collections
+import codecs
+import os
+from mako import compat
+import operator
 
 def update_wrapper(decorated, fn):
     decorated.__wrapped__ = fn
@@ -20,7 +17,7 @@ def update_wrapper(decorated, fn):
     return decorated
 
 
-class PluginLoader:
+class PluginLoader(object):
     def __init__(self, group):
         self.group = group
         self.impls = {}
@@ -28,17 +25,18 @@ class PluginLoader:
     def load(self, name):
         if name in self.impls:
             return self.impls[name]()
-
-        for impl in importlib_metadata_get(self.group):
-            if impl.name == name:
+        else:
+            import pkg_resources
+            for impl in pkg_resources.iter_entry_points(
+                                self.group,
+                                name):
                 self.impls[name] = impl.load
                 return impl.load()
-
-        from mako import exceptions
-
-        raise exceptions.RuntimeException(
-            "Can't load plugin %s %s" % (self.group, name)
-        )
+            else:
+                from mako import exceptions
+                raise exceptions.RuntimeException(
+                        "Can't load plugin %s %s" %
+                        (self.group, name))
 
     def register(self, name, modulepath, objname):
         def load():
@@ -46,24 +44,21 @@ class PluginLoader:
             for token in modulepath.split(".")[1:]:
                 mod = getattr(mod, token)
             return getattr(mod, objname)
-
         self.impls[name] = load
 
-
-def verify_directory(dir_):
+def verify_directory(dir):
     """create and/or verify a filesystem directory."""
 
     tries = 0
 
-    while not os.path.exists(dir_):
+    while not os.path.exists(dir):
         try:
             tries += 1
-            os.makedirs(dir_, 0o755)
+            os.makedirs(dir, compat.octal("0775"))
         except:
             if tries > 5:
                 raise
 
-
 def to_list(x, default=None):
     if x is None:
         return default
@@ -73,10 +68,8 @@ def to_list(x, default=None):
         return x
 
 
-class memoized_property:
-
+class memoized_property(object):
     """A read-only @property that is only evaluated once."""
-
     def __init__(self, fget, doc=None):
         self.fget = fget
         self.__doc__ = doc or fget.__doc__
@@ -88,9 +81,7 @@ class memoized_property:
         obj.__dict__[self.__name__] = result = self.fget(obj)
         return result
 
-
-class memoized_instancemethod:
-
+class memoized_instancemethod(object):
     """Decorate a method memoize its return value.
 
     Best applied to no-arg methods: memoization is not sensitive to
@@ -98,7 +89,6 @@ class memoized_instancemethod:
     called with different arguments.
 
     """
-
     def __init__(self, fget, doc=None):
         self.fget = fget
         self.__doc__ = doc or fget.__doc__
@@ -107,27 +97,19 @@ class memoized_instancemethod:
     def __get__(self, obj, cls):
         if obj is None:
             return self
-
         def oneshot(*args, **kw):
             result = self.fget(obj, *args, **kw)
-
-            def memo(*a, **kw):
-                return result
-
+            memo = lambda *a, **kw: result
             memo.__name__ = self.__name__
             memo.__doc__ = self.__doc__
             obj.__dict__[self.__name__] = memo
             return result
-
         oneshot.__name__ = self.__name__
         oneshot.__doc__ = self.__doc__
         return oneshot
 
-
 class SetLikeDict(dict):
-
     """a dictionary that has some setlike methods on it"""
-
     def union(self, other):
         """produce a 'union' of this dict and another (at the key level).
 
@@ -136,16 +118,18 @@ class SetLikeDict(dict):
         x.update(other)
         return x
 
-
-class FastEncodingBuffer:
-
+class FastEncodingBuffer(object):
     """a very rudimentary buffer that is faster than StringIO,
-    and supports unicode data."""
+    but doesn't crash on unicode data like cStringIO."""
 
-    def __init__(self, encoding=None, errors="strict"):
+    def __init__(self, encoding=None, errors='strict', as_unicode=False):
         self.data = collections.deque()
         self.encoding = encoding
-        self.delim = ""
+        if as_unicode:
+            self.delim = compat.u('')
+        else:
+            self.delim = ''
+        self.as_unicode = as_unicode
         self.errors = errors
         self.write = self.data.append
 
@@ -155,15 +139,12 @@ class FastEncodingBuffer:
 
     def getvalue(self):
         if self.encoding:
-            return self.delim.join(self.data).encode(
-                self.encoding, self.errors
-            )
+            return self.delim.join(self.data).encode(self.encoding,
+                                                     self.errors)
         else:
             return self.delim.join(self.data)
 
-
 class LRUCache(dict):
-
     """A dictionary-like object that stores a limited number of items,
     discarding lesser used items periodically.
 
@@ -172,22 +153,21 @@ class LRUCache(dict):
     is inexact.
     """
 
-    class _Item:
+    class _Item(object):
         def __init__(self, key, value):
             self.key = key
             self.value = value
-            self.timestamp = timeit.default_timer()
-
+            self.timestamp = compat.time_func()
         def __repr__(self):
             return repr(self.value)
 
-    def __init__(self, capacity, threshold=0.5):
+    def __init__(self, capacity, threshold=.5):
         self.capacity = capacity
         self.threshold = threshold
 
     def __getitem__(self, key):
         item = dict.__getitem__(self, key)
-        item.timestamp = timeit.default_timer()
+        item.timestamp = compat.time_func()
         return item.value
 
     def values(self):
@@ -196,8 +176,9 @@ class LRUCache(dict):
     def setdefault(self, key, value):
         if key in self:
             return self[key]
-        self[key] = value
-        return value
+        else:
+            self[key] = value
+            return value
 
     def __setitem__(self, key, value):
         item = dict.get(self, key)
@@ -210,12 +191,9 @@ class LRUCache(dict):
 
     def _manage_size(self):
         while len(self) > self.capacity + self.capacity * self.threshold:
-            bytime = sorted(
-                dict.values(self),
-                key=operator.attrgetter("timestamp"),
-                reverse=True,
-            )
-            for item in bytime[self.capacity :]:
+            bytime = sorted(dict.values(self),
+                            key=operator.attrgetter('timestamp'), reverse=True)
+            for item in bytime[self.capacity:]:
                 try:
                     del self[item.key]
                 except KeyError:
@@ -223,12 +201,10 @@ class LRUCache(dict):
                     # broke in on us. loop around and try again
                     break
 
-
 # Regexp to match python magic encoding line
 _PYTHON_MAGIC_COMMENT_re = re.compile(
-    r"[ \t\f]* \# .* coding[=:][ \t]*([-\w.]+)", re.VERBOSE
-)
-
+    r'[ \t\f]* \# .* coding[=:][ \t]*([-\w.]+)',
+    re.VERBOSE)
 
 def parse_encoding(fp):
     """Deduce the encoding of a Python source file (binary mode) from magic
@@ -246,12 +222,13 @@ def parse_encoding(fp):
         line1 = fp.readline()
         has_bom = line1.startswith(codecs.BOM_UTF8)
         if has_bom:
-            line1 = line1[len(codecs.BOM_UTF8) :]
+            line1 = line1[len(codecs.BOM_UTF8):]
 
-        m = _PYTHON_MAGIC_COMMENT_re.match(line1.decode("ascii", "ignore"))
+        m = _PYTHON_MAGIC_COMMENT_re.match(line1.decode('ascii', 'ignore'))
         if not m:
             try:
-                parse(line1.decode("ascii", "ignore"))
+                import parser
+                parser.suite(line1.decode('ascii', 'ignore'))
             except (ImportError, SyntaxError):
                 # Either it's a real syntax error, in which case the source
                 # is not valid python source, or line2 is a continuation of
@@ -261,16 +238,13 @@ def parse_encoding(fp):
             else:
                 line2 = fp.readline()
                 m = _PYTHON_MAGIC_COMMENT_re.match(
-                    line2.decode("ascii", "ignore")
-                )
+                                               line2.decode('ascii', 'ignore'))
 
         if has_bom:
             if m:
-                raise SyntaxError(
-                    "python refuses to compile code with both a UTF8"
-                    " byte-order-mark and a magic encoding comment"
-                )
-            return "utf_8"
+                raise SyntaxError("python refuses to compile code with both a UTF8" \
+                      " byte-order-mark and a magic encoding comment")
+            return 'utf_8'
         elif m:
             return m.group(1)
         else:
@@ -278,7 +252,6 @@ def parse_encoding(fp):
     finally:
         fp.seek(pos)
 
-
 def sorted_dict_repr(d):
     """repr() a dictionary with the keys in order.
 
@@ -287,20 +260,18 @@ def sorted_dict_repr(d):
     """
     keys = list(d.keys())
     keys.sort()
-    return "{" + ", ".join("%r: %r" % (k, d[k]) for k in keys) + "}"
-
+    return "{" + ", ".join(["%r: %r" % (k, d[k]) for k in keys]) + "}"
 
 def restore__ast(_ast):
     """Attempt to restore the required classes to the _ast module if it
     appears to be missing them
     """
-    if hasattr(_ast, "AST"):
+    if hasattr(_ast, 'AST'):
         return
     _ast.PyCF_ONLY_AST = 2 << 9
-    m = compile(
-        """\
+    m = compile("""\
 def foo(): pass
-class Bar: pass
+class Bar(object): pass
 if False: pass
 baz = 'mako'
 1 + 2 - 3 * 4 / 5
@@ -311,17 +282,13 @@ baz = 'mako'
 baz and 'foo' or 'bar'
 (mako is baz == baz) is not baz != mako
 mako > baz < mako >= baz <= mako
-mako in baz not in mako""",
-        "<unknown>",
-        "exec",
-        _ast.PyCF_ONLY_AST,
-    )
+mako in baz not in mako""", '<unknown>', 'exec', _ast.PyCF_ONLY_AST)
     _ast.Module = type(m)
 
     for cls in _ast.Module.__mro__:
-        if cls.__name__ == "mod":
+        if cls.__name__ == 'mod':
             _ast.mod = cls
-        elif cls.__name__ == "AST":
+        elif cls.__name__ == 'AST':
             _ast.AST = cls
 
     _ast.FunctionDef = type(m.body[0])
@@ -371,10 +338,14 @@ mako in baz not in mako""",
     _ast.NotIn = type(m.body[12].value.ops[1])
 
 
-def read_file(path, mode="rb"):
-    with open(path, mode) as fp:
-        return fp.read()
 
+def read_file(path, mode='rb'):
+    fp = open(path, mode)
+    try:
+        data = fp.read()
+        return data
+    finally:
+        fp.close()
 
 def read_python_file(path):
     fp = open(path, "rb")
@@ -386,3 +357,4 @@ def read_python_file(path):
         return data
     finally:
         fp.close()
+
diff --git a/lib/markupsafe/__init__.py b/lib/markupsafe/__init__.py
deleted file mode 100644
index fee8dc7a..00000000
--- a/lib/markupsafe/__init__.py
+++ /dev/null
@@ -1,395 +0,0 @@
-from __future__ import annotations
-
-import collections.abc as cabc
-import string
-import typing as t
-
-try:
-    from ._speedups import _escape_inner
-except ImportError:
-    from ._native import _escape_inner
-
-if t.TYPE_CHECKING:
-    import typing_extensions as te
-
-
-class _HasHTML(t.Protocol):
-    def __html__(self, /) -> str: ...
-
-
-class _TPEscape(t.Protocol):
-    def __call__(self, s: t.Any, /) -> Markup: ...
-
-
-def escape(s: t.Any, /) -> Markup:
-    """Replace the characters ``&``, ``<``, ``>``, ``'``, and ``"`` in
-    the string with HTML-safe sequences. Use this if you need to display
-    text that might contain such characters in HTML.
-
-    If the object has an ``__html__`` method, it is called and the
-    return value is assumed to already be safe for HTML.
-
-    :param s: An object to be converted to a string and escaped.
-    :return: A :class:`Markup` string with the escaped text.
-    """
-    # If the object is already a plain string, skip __html__ check and string
-    # conversion. This is the most common use case.
-    # Use type(s) instead of s.__class__ because a proxy object may be reporting
-    # the __class__ of the proxied value.
-    if type(s) is str:
-        return Markup(_escape_inner(s))
-
-    if hasattr(s, "__html__"):
-        return Markup(s.__html__())
-
-    return Markup(_escape_inner(str(s)))
-
-
-def escape_silent(s: t.Any | None, /) -> Markup:
-    """Like :func:`escape` but treats ``None`` as the empty string.
-    Useful with optional values, as otherwise you get the string
-    ``'None'`` when the value is ``None``.
-
-    >>> escape(None)
-    Markup('None')
-    >>> escape_silent(None)
-    Markup('')
-    """
-    if s is None:
-        return Markup()
-
-    return escape(s)
-
-
-def soft_str(s: t.Any, /) -> str:
-    """Convert an object to a string if it isn't already. This preserves
-    a :class:`Markup` string rather than converting it back to a basic
-    string, so it will still be marked as safe and won't be escaped
-    again.
-
-    >>> value = escape("<User 1>")
-    >>> value
-    Markup('&lt;User 1&gt;')
-    >>> escape(str(value))
-    Markup('&amp;lt;User 1&amp;gt;')
-    >>> escape(soft_str(value))
-    Markup('&lt;User 1&gt;')
-    """
-    if not isinstance(s, str):
-        return str(s)
-
-    return s
-
-
-class Markup(str):
-    """A string that is ready to be safely inserted into an HTML or XML
-    document, either because it was escaped or because it was marked
-    safe.
-
-    Passing an object to the constructor converts it to text and wraps
-    it to mark it safe without escaping. To escape the text, use the
-    :meth:`escape` class method instead.
-
-    >>> Markup("Hello, <em>World</em>!")
-    Markup('Hello, <em>World</em>!')
-    >>> Markup(42)
-    Markup('42')
-    >>> Markup.escape("Hello, <em>World</em>!")
-    Markup('Hello &lt;em&gt;World&lt;/em&gt;!')
-
-    This implements the ``__html__()`` interface that some frameworks
-    use. Passing an object that implements ``__html__()`` will wrap the
-    output of that method, marking it safe.
-
-    >>> class Foo:
-    ...     def __html__(self):
-    ...         return '<a href="/foo">foo</a>'
-    ...
-    >>> Markup(Foo())
-    Markup('<a href="/foo">foo</a>')
-
-    This is a subclass of :class:`str`. It has the same methods, but
-    escapes their arguments and returns a ``Markup`` instance.
-
-    >>> Markup("<em>%s</em>") % ("foo & bar",)
-    Markup('<em>foo &amp; bar</em>')
-    >>> Markup("<em>Hello</em> ") + "<foo>"
-    Markup('<em>Hello</em> &lt;foo&gt;')
-    """
-
-    __slots__ = ()
-
-    def __new__(
-        cls, object: t.Any = "", encoding: str | None = None, errors: str = "strict"
-    ) -> te.Self:
-        if hasattr(object, "__html__"):
-            object = object.__html__()
-
-        if encoding is None:
-            return super().__new__(cls, object)
-
-        return super().__new__(cls, object, encoding, errors)
-
-    def __html__(self, /) -> te.Self:
-        return self
-
-    def __add__(self, value: str | _HasHTML, /) -> te.Self:
-        if isinstance(value, str) or hasattr(value, "__html__"):
-            return self.__class__(super().__add__(self.escape(value)))
-
-        return NotImplemented
-
-    def __radd__(self, value: str | _HasHTML, /) -> te.Self:
-        if isinstance(value, str) or hasattr(value, "__html__"):
-            return self.escape(value).__add__(self)
-
-        return NotImplemented
-
-    def __mul__(self, value: t.SupportsIndex, /) -> te.Self:
-        return self.__class__(super().__mul__(value))
-
-    def __rmul__(self, value: t.SupportsIndex, /) -> te.Self:
-        return self.__class__(super().__mul__(value))
-
-    def __mod__(self, value: t.Any, /) -> te.Self:
-        if isinstance(value, tuple):
-            # a tuple of arguments, each wrapped
-            value = tuple(_MarkupEscapeHelper(x, self.escape) for x in value)
-        elif hasattr(type(value), "__getitem__") and not isinstance(value, str):
-            # a mapping of arguments, wrapped
-            value = _MarkupEscapeHelper(value, self.escape)
-        else:
-            # a single argument, wrapped with the helper and a tuple
-            value = (_MarkupEscapeHelper(value, self.escape),)
-
-        return self.__class__(super().__mod__(value))
-
-    def __repr__(self, /) -> str:
-        return f"{self.__class__.__name__}({super().__repr__()})"
-
-    def join(self, iterable: cabc.Iterable[str | _HasHTML], /) -> te.Self:
-        return self.__class__(super().join(map(self.escape, iterable)))
-
-    def split(  # type: ignore[override]
-        self, /, sep: str | None = None, maxsplit: t.SupportsIndex = -1
-    ) -> list[te.Self]:
-        return [self.__class__(v) for v in super().split(sep, maxsplit)]
-
-    def rsplit(  # type: ignore[override]
-        self, /, sep: str | None = None, maxsplit: t.SupportsIndex = -1
-    ) -> list[te.Self]:
-        return [self.__class__(v) for v in super().rsplit(sep, maxsplit)]
-
-    def splitlines(  # type: ignore[override]
-        self, /, keepends: bool = False
-    ) -> list[te.Self]:
-        return [self.__class__(v) for v in super().splitlines(keepends)]
-
-    def unescape(self, /) -> str:
-        """Convert escaped markup back into a text string. This replaces
-        HTML entities with the characters they represent.
-
-        >>> Markup("Main &raquo; <em>About</em>").unescape()
-        'Main » <em>About</em>'
-        """
-        from html import unescape
-
-        return unescape(str(self))
-
-    def striptags(self, /) -> str:
-        """:meth:`unescape` the markup, remove tags, and normalize
-        whitespace to single spaces.
-
-        >>> Markup("Main &raquo;\t<em>About</em>").striptags()
-        'Main » About'
-        """
-        value = str(self)
-
-        # Look for comments then tags separately. Otherwise, a comment that
-        # contains a tag would end early, leaving some of the comment behind.
-
-        # keep finding comment start marks
-        while (start := value.find("<!--")) != -1:
-            # find a comment end mark beyond the start, otherwise stop
-            if (end := value.find("-->", start)) == -1:
-                break
-
-            value = f"{value[:start]}{value[end + 3:]}"
-
-        # remove tags using the same method
-        while (start := value.find("<")) != -1:
-            if (end := value.find(">", start)) == -1:
-                break
-
-            value = f"{value[:start]}{value[end + 1:]}"
-
-        # collapse spaces
-        value = " ".join(value.split())
-        return self.__class__(value).unescape()
-
-    @classmethod
-    def escape(cls, s: t.Any, /) -> te.Self:
-        """Escape a string. Calls :func:`escape` and ensures that for
-        subclasses the correct type is returned.
-        """
-        rv = escape(s)
-
-        if rv.__class__ is not cls:
-            return cls(rv)
-
-        return rv  # type: ignore[return-value]
-
-    def __getitem__(self, key: t.SupportsIndex | slice, /) -> te.Self:
-        return self.__class__(super().__getitem__(key))
-
-    def capitalize(self, /) -> te.Self:
-        return self.__class__(super().capitalize())
-
-    def title(self, /) -> te.Self:
-        return self.__class__(super().title())
-
-    def lower(self, /) -> te.Self:
-        return self.__class__(super().lower())
-
-    def upper(self, /) -> te.Self:
-        return self.__class__(super().upper())
-
-    def replace(self, old: str, new: str, count: t.SupportsIndex = -1, /) -> te.Self:
-        return self.__class__(super().replace(old, self.escape(new), count))
-
-    def ljust(self, width: t.SupportsIndex, fillchar: str = " ", /) -> te.Self:
-        return self.__class__(super().ljust(width, self.escape(fillchar)))
-
-    def rjust(self, width: t.SupportsIndex, fillchar: str = " ", /) -> te.Self:
-        return self.__class__(super().rjust(width, self.escape(fillchar)))
-
-    def lstrip(self, chars: str | None = None, /) -> te.Self:
-        return self.__class__(super().lstrip(chars))
-
-    def rstrip(self, chars: str | None = None, /) -> te.Self:
-        return self.__class__(super().rstrip(chars))
-
-    def center(self, width: t.SupportsIndex, fillchar: str = " ", /) -> te.Self:
-        return self.__class__(super().center(width, self.escape(fillchar)))
-
-    def strip(self, chars: str | None = None, /) -> te.Self:
-        return self.__class__(super().strip(chars))
-
-    def translate(
-        self,
-        table: cabc.Mapping[int, str | int | None],  # type: ignore[override]
-        /,
-    ) -> str:
-        return self.__class__(super().translate(table))
-
-    def expandtabs(self, /, tabsize: t.SupportsIndex = 8) -> te.Self:
-        return self.__class__(super().expandtabs(tabsize))
-
-    def swapcase(self, /) -> te.Self:
-        return self.__class__(super().swapcase())
-
-    def zfill(self, width: t.SupportsIndex, /) -> te.Self:
-        return self.__class__(super().zfill(width))
-
-    def casefold(self, /) -> te.Self:
-        return self.__class__(super().casefold())
-
-    def removeprefix(self, prefix: str, /) -> te.Self:
-        return self.__class__(super().removeprefix(prefix))
-
-    def removesuffix(self, suffix: str) -> te.Self:
-        return self.__class__(super().removesuffix(suffix))
-
-    def partition(self, sep: str, /) -> tuple[te.Self, te.Self, te.Self]:
-        left, sep, right = super().partition(sep)
-        cls = self.__class__
-        return cls(left), cls(sep), cls(right)
-
-    def rpartition(self, sep: str, /) -> tuple[te.Self, te.Self, te.Self]:
-        left, sep, right = super().rpartition(sep)
-        cls = self.__class__
-        return cls(left), cls(sep), cls(right)
-
-    def format(self, *args: t.Any, **kwargs: t.Any) -> te.Self:
-        formatter = EscapeFormatter(self.escape)
-        return self.__class__(formatter.vformat(self, args, kwargs))
-
-    def format_map(
-        self,
-        mapping: cabc.Mapping[str, t.Any],  # type: ignore[override]
-        /,
-    ) -> te.Self:
-        formatter = EscapeFormatter(self.escape)
-        return self.__class__(formatter.vformat(self, (), mapping))
-
-    def __html_format__(self, format_spec: str, /) -> te.Self:
-        if format_spec:
-            raise ValueError("Unsupported format specification for Markup.")
-
-        return self
-
-
-class EscapeFormatter(string.Formatter):
-    __slots__ = ("escape",)
-
-    def __init__(self, escape: _TPEscape) -> None:
-        self.escape: _TPEscape = escape
-        super().__init__()
-
-    def format_field(self, value: t.Any, format_spec: str) -> str:
-        if hasattr(value, "__html_format__"):
-            rv = value.__html_format__(format_spec)
-        elif hasattr(value, "__html__"):
-            if format_spec:
-                raise ValueError(
-                    f"Format specifier {format_spec} given, but {type(value)} does not"
-                    " define __html_format__. A class that defines __html__ must define"
-                    " __html_format__ to work with format specifiers."
-                )
-            rv = value.__html__()
-        else:
-            # We need to make sure the format spec is str here as
-            # otherwise the wrong callback methods are invoked.
-            rv = super().format_field(value, str(format_spec))
-        return str(self.escape(rv))
-
-
-class _MarkupEscapeHelper:
-    """Helper for :meth:`Markup.__mod__`."""
-
-    __slots__ = ("obj", "escape")
-
-    def __init__(self, obj: t.Any, escape: _TPEscape) -> None:
-        self.obj: t.Any = obj
-        self.escape: _TPEscape = escape
-
-    def __getitem__(self, key: t.Any, /) -> te.Self:
-        return self.__class__(self.obj[key], self.escape)
-
-    def __str__(self, /) -> str:
-        return str(self.escape(self.obj))
-
-    def __repr__(self, /) -> str:
-        return str(self.escape(repr(self.obj)))
-
-    def __int__(self, /) -> int:
-        return int(self.obj)
-
-    def __float__(self, /) -> float:
-        return float(self.obj)
-
-
-def __getattr__(name: str) -> t.Any:
-    if name == "__version__":
-        import importlib.metadata
-        import warnings
-
-        warnings.warn(
-            "The '__version__' attribute is deprecated and will be removed in"
-            " MarkupSafe 3.1. Use feature detection, or"
-            ' `importlib.metadata.version("markupsafe")`, instead.',
-            stacklevel=2,
-        )
-        return importlib.metadata.version("markupsafe")
-
-    raise AttributeError(name)
diff --git a/lib/markupsafe/_native.py b/lib/markupsafe/_native.py
deleted file mode 100644
index 088b3bca..00000000
--- a/lib/markupsafe/_native.py
+++ /dev/null
@@ -1,8 +0,0 @@
-def _escape_inner(s: str, /) -> str:
-    return (
-        s.replace("&", "&amp;")
-        .replace(">", "&gt;")
-        .replace("<", "&lt;")
-        .replace("'", "&#39;")
-        .replace('"', "&#34;")
-    )
diff --git a/lib/markupsafe/_speedups.c b/lib/markupsafe/_speedups.c
deleted file mode 100644
index 09dd57ca..00000000
--- a/lib/markupsafe/_speedups.c
+++ /dev/null
@@ -1,204 +0,0 @@
-#include <Python.h>
-
-#define GET_DELTA(inp, inp_end, delta) \
-	while (inp < inp_end) { \
-		switch (*inp++) { \
-		case '"': \
-		case '\'': \
-		case '&': \
-			delta += 4; \
-			break; \
-		case '<': \
-		case '>': \
-			delta += 3; \
-			break; \
-		} \
-	}
-
-#define DO_ESCAPE(inp, inp_end, outp) \
-	{ \
-		Py_ssize_t ncopy = 0; \
-		while (inp < inp_end) { \
-			switch (*inp) { \
-			case '"': \
-				memcpy(outp, inp-ncopy, sizeof(*outp)*ncopy); \
-				outp += ncopy; ncopy = 0; \
-				*outp++ = '&'; \
-				*outp++ = '#'; \
-				*outp++ = '3'; \
-				*outp++ = '4'; \
-				*outp++ = ';'; \
-				break; \
-			case '\'': \
-				memcpy(outp, inp-ncopy, sizeof(*outp)*ncopy); \
-				outp += ncopy; ncopy = 0; \
-				*outp++ = '&'; \
-				*outp++ = '#'; \
-				*outp++ = '3'; \
-				*outp++ = '9'; \
-				*outp++ = ';'; \
-				break; \
-			case '&': \
-				memcpy(outp, inp-ncopy, sizeof(*outp)*ncopy); \
-				outp += ncopy; ncopy = 0; \
-				*outp++ = '&'; \
-				*outp++ = 'a'; \
-				*outp++ = 'm'; \
-				*outp++ = 'p'; \
-				*outp++ = ';'; \
-				break; \
-			case '<': \
-				memcpy(outp, inp-ncopy, sizeof(*outp)*ncopy); \
-				outp += ncopy; ncopy = 0; \
-				*outp++ = '&'; \
-				*outp++ = 'l'; \
-				*outp++ = 't'; \
-				*outp++ = ';'; \
-				break; \
-			case '>': \
-				memcpy(outp, inp-ncopy, sizeof(*outp)*ncopy); \
-				outp += ncopy; ncopy = 0; \
-				*outp++ = '&'; \
-				*outp++ = 'g'; \
-				*outp++ = 't'; \
-				*outp++ = ';'; \
-				break; \
-			default: \
-				ncopy++; \
-			} \
-			inp++; \
-		} \
-		memcpy(outp, inp-ncopy, sizeof(*outp)*ncopy); \
-	}
-
-static PyObject*
-escape_unicode_kind1(PyUnicodeObject *in)
-{
-	Py_UCS1 *inp = PyUnicode_1BYTE_DATA(in);
-	Py_UCS1 *inp_end = inp + PyUnicode_GET_LENGTH(in);
-	Py_UCS1 *outp;
-	PyObject *out;
-	Py_ssize_t delta = 0;
-
-	GET_DELTA(inp, inp_end, delta);
-	if (!delta) {
-		Py_INCREF(in);
-		return (PyObject*)in;
-	}
-
-	out = PyUnicode_New(PyUnicode_GET_LENGTH(in) + delta,
-						PyUnicode_IS_ASCII(in) ? 127 : 255);
-	if (!out)
-		return NULL;
-
-	inp = PyUnicode_1BYTE_DATA(in);
-	outp = PyUnicode_1BYTE_DATA(out);
-	DO_ESCAPE(inp, inp_end, outp);
-	return out;
-}
-
-static PyObject*
-escape_unicode_kind2(PyUnicodeObject *in)
-{
-	Py_UCS2 *inp = PyUnicode_2BYTE_DATA(in);
-	Py_UCS2 *inp_end = inp + PyUnicode_GET_LENGTH(in);
-	Py_UCS2 *outp;
-	PyObject *out;
-	Py_ssize_t delta = 0;
-
-	GET_DELTA(inp, inp_end, delta);
-	if (!delta) {
-		Py_INCREF(in);
-		return (PyObject*)in;
-	}
-
-	out = PyUnicode_New(PyUnicode_GET_LENGTH(in) + delta, 65535);
-	if (!out)
-		return NULL;
-
-	inp = PyUnicode_2BYTE_DATA(in);
-	outp = PyUnicode_2BYTE_DATA(out);
-	DO_ESCAPE(inp, inp_end, outp);
-	return out;
-}
-
-
-static PyObject*
-escape_unicode_kind4(PyUnicodeObject *in)
-{
-	Py_UCS4 *inp = PyUnicode_4BYTE_DATA(in);
-	Py_UCS4 *inp_end = inp + PyUnicode_GET_LENGTH(in);
-	Py_UCS4 *outp;
-	PyObject *out;
-	Py_ssize_t delta = 0;
-
-	GET_DELTA(inp, inp_end, delta);
-	if (!delta) {
-		Py_INCREF(in);
-		return (PyObject*)in;
-	}
-
-	out = PyUnicode_New(PyUnicode_GET_LENGTH(in) + delta, 1114111);
-	if (!out)
-		return NULL;
-
-	inp = PyUnicode_4BYTE_DATA(in);
-	outp = PyUnicode_4BYTE_DATA(out);
-	DO_ESCAPE(inp, inp_end, outp);
-	return out;
-}
-
-static PyObject*
-escape_unicode(PyObject *self, PyObject *s)
-{
-	if (!PyUnicode_Check(s))
-		return NULL;
-
-    // This check is no longer needed in Python 3.12.
-	if (PyUnicode_READY(s))
-		return NULL;
-
-	switch (PyUnicode_KIND(s)) {
-	case PyUnicode_1BYTE_KIND:
-		return escape_unicode_kind1((PyUnicodeObject*) s);
-	case PyUnicode_2BYTE_KIND:
-		return escape_unicode_kind2((PyUnicodeObject*) s);
-	case PyUnicode_4BYTE_KIND:
-		return escape_unicode_kind4((PyUnicodeObject*) s);
-	}
-	assert(0);  /* shouldn't happen */
-	return NULL;
-}
-
-static PyMethodDef module_methods[] = {
-	{"_escape_inner", (PyCFunction)escape_unicode, METH_O, NULL},
-	{NULL, NULL, 0, NULL}  /* Sentinel */
-};
-
-static struct PyModuleDef module_definition = {
-	PyModuleDef_HEAD_INIT,
-	"markupsafe._speedups",
-	NULL,
-	-1,
-	module_methods,
-	NULL,
-	NULL,
-	NULL,
-	NULL
-};
-
-PyMODINIT_FUNC
-PyInit__speedups(void)
-{
-	PyObject *m = PyModule_Create(&module_definition);
-
-	if (m == NULL) {
-		return NULL;
-	}
-
-	#ifdef Py_GIL_DISABLED
-	PyUnstable_Module_SetGIL(m, Py_MOD_GIL_NOT_USED);
-	#endif
-
-	return m;
-}
diff --git a/lib/markupsafe/_speedups.pyi b/lib/markupsafe/_speedups.pyi
deleted file mode 100644
index 8c888585..00000000
--- a/lib/markupsafe/_speedups.pyi
+++ /dev/null
@@ -1 +0,0 @@
-def _escape_inner(s: str, /) -> str: ...
diff --git a/lib/markupsafe/py.typed b/lib/markupsafe/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/more_itertools/__init__.py b/lib/more_itertools/__init__.py
deleted file mode 100644
index 2e2fcbbe..00000000
--- a/lib/more_itertools/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-"""More routines for operating on iterables, beyond itertools"""
-
-from .more import *  # noqa
-from .recipes import *  # noqa
-
-__version__ = '10.4.0'
diff --git a/lib/more_itertools/__init__.pyi b/lib/more_itertools/__init__.pyi
deleted file mode 100644
index 96f6e36c..00000000
--- a/lib/more_itertools/__init__.pyi
+++ /dev/null
@@ -1,2 +0,0 @@
-from .more import *
-from .recipes import *
diff --git a/lib/more_itertools/more.py b/lib/more_itertools/more.py
deleted file mode 100755
index 3bf2c76b..00000000
--- a/lib/more_itertools/more.py
+++ /dev/null
@@ -1,4980 +0,0 @@
-import math
-import warnings
-
-from collections import Counter, defaultdict, deque, abc
-from collections.abc import Sequence
-from contextlib import suppress
-from functools import cached_property, partial, reduce, wraps
-from heapq import heapify, heapreplace
-from itertools import (
-    chain,
-    combinations,
-    compress,
-    count,
-    cycle,
-    dropwhile,
-    groupby,
-    islice,
-    repeat,
-    starmap,
-    takewhile,
-    tee,
-    zip_longest,
-    product,
-)
-from math import comb, e, exp, factorial, floor, fsum, log, log1p, perm, tau
-from queue import Empty, Queue
-from random import random, randrange, shuffle, uniform
-from operator import itemgetter, mul, sub, gt, lt, le
-from sys import hexversion, maxsize
-from time import monotonic
-
-from .recipes import (
-    _marker,
-    _zip_equal,
-    UnequalIterablesError,
-    consume,
-    flatten,
-    powerset,
-    take,
-    unique_everseen,
-    all_equal,
-    batched,
-)
-
-__all__ = [
-    'AbortThread',
-    'SequenceView',
-    'UnequalIterablesError',
-    'adjacent',
-    'all_unique',
-    'always_iterable',
-    'always_reversible',
-    'bucket',
-    'callback_iter',
-    'chunked',
-    'chunked_even',
-    'circular_shifts',
-    'collapse',
-    'combination_index',
-    'combination_with_replacement_index',
-    'consecutive_groups',
-    'constrained_batches',
-    'consumer',
-    'count_cycle',
-    'countable',
-    'dft',
-    'difference',
-    'distinct_combinations',
-    'distinct_permutations',
-    'distribute',
-    'divide',
-    'doublestarmap',
-    'duplicates_everseen',
-    'duplicates_justseen',
-    'classify_unique',
-    'exactly_n',
-    'filter_except',
-    'filter_map',
-    'first',
-    'gray_product',
-    'groupby_transform',
-    'ichunked',
-    'iequals',
-    'idft',
-    'ilen',
-    'interleave',
-    'interleave_evenly',
-    'interleave_longest',
-    'intersperse',
-    'is_sorted',
-    'islice_extended',
-    'iterate',
-    'iter_suppress',
-    'join_mappings',
-    'last',
-    'locate',
-    'longest_common_prefix',
-    'lstrip',
-    'make_decorator',
-    'map_except',
-    'map_if',
-    'map_reduce',
-    'mark_ends',
-    'minmax',
-    'nth_or_last',
-    'nth_permutation',
-    'nth_product',
-    'nth_combination_with_replacement',
-    'numeric_range',
-    'one',
-    'only',
-    'outer_product',
-    'padded',
-    'partial_product',
-    'partitions',
-    'peekable',
-    'permutation_index',
-    'powerset_of_sets',
-    'product_index',
-    'raise_',
-    'repeat_each',
-    'repeat_last',
-    'replace',
-    'rlocate',
-    'rstrip',
-    'run_length',
-    'sample',
-    'seekable',
-    'set_partitions',
-    'side_effect',
-    'sliced',
-    'sort_together',
-    'split_after',
-    'split_at',
-    'split_before',
-    'split_into',
-    'split_when',
-    'spy',
-    'stagger',
-    'strip',
-    'strictly_n',
-    'substrings',
-    'substrings_indexes',
-    'takewhile_inclusive',
-    'time_limited',
-    'unique_in_window',
-    'unique_to_each',
-    'unzip',
-    'value_chain',
-    'windowed',
-    'windowed_complete',
-    'with_iter',
-    'zip_broadcast',
-    'zip_equal',
-    'zip_offset',
-]
-
-# math.sumprod is available for Python 3.12+
-_fsumprod = getattr(math, 'sumprod', lambda x, y: fsum(map(mul, x, y)))
-
-
-def chunked(iterable, n, strict=False):
-    """Break *iterable* into lists of length *n*:
-
-        >>> list(chunked([1, 2, 3, 4, 5, 6], 3))
-        [[1, 2, 3], [4, 5, 6]]
-
-    By the default, the last yielded list will have fewer than *n* elements
-    if the length of *iterable* is not divisible by *n*:
-
-        >>> list(chunked([1, 2, 3, 4, 5, 6, 7, 8], 3))
-        [[1, 2, 3], [4, 5, 6], [7, 8]]
-
-    To use a fill-in value instead, see the :func:`grouper` recipe.
-
-    If the length of *iterable* is not divisible by *n* and *strict* is
-    ``True``, then ``ValueError`` will be raised before the last
-    list is yielded.
-
-    """
-    iterator = iter(partial(take, n, iter(iterable)), [])
-    if strict:
-        if n is None:
-            raise ValueError('n must not be None when using strict mode.')
-
-        def ret():
-            for chunk in iterator:
-                if len(chunk) != n:
-                    raise ValueError('iterable is not divisible by n.')
-                yield chunk
-
-        return iter(ret())
-    else:
-        return iterator
-
-
-def first(iterable, default=_marker):
-    """Return the first item of *iterable*, or *default* if *iterable* is
-    empty.
-
-        >>> first([0, 1, 2, 3])
-        0
-        >>> first([], 'some default')
-        'some default'
-
-    If *default* is not provided and there are no items in the iterable,
-    raise ``ValueError``.
-
-    :func:`first` is useful when you have a generator of expensive-to-retrieve
-    values and want any arbitrary one. It is marginally shorter than
-    ``next(iter(iterable), default)``.
-
-    """
-    for item in iterable:
-        return item
-    if default is _marker:
-        raise ValueError(
-            'first() was called on an empty iterable, and no '
-            'default value was provided.'
-        )
-    return default
-
-
-def last(iterable, default=_marker):
-    """Return the last item of *iterable*, or *default* if *iterable* is
-    empty.
-
-        >>> last([0, 1, 2, 3])
-        3
-        >>> last([], 'some default')
-        'some default'
-
-    If *default* is not provided and there are no items in the iterable,
-    raise ``ValueError``.
-    """
-    try:
-        if isinstance(iterable, Sequence):
-            return iterable[-1]
-        # Work around https://bugs.python.org/issue38525
-        elif hasattr(iterable, '__reversed__') and (hexversion != 0x030800F0):
-            return next(reversed(iterable))
-        else:
-            return deque(iterable, maxlen=1)[-1]
-    except (IndexError, TypeError, StopIteration):
-        if default is _marker:
-            raise ValueError(
-                'last() was called on an empty iterable, and no default was '
-                'provided.'
-            )
-        return default
-
-
-def nth_or_last(iterable, n, default=_marker):
-    """Return the nth or the last item of *iterable*,
-    or *default* if *iterable* is empty.
-
-        >>> nth_or_last([0, 1, 2, 3], 2)
-        2
-        >>> nth_or_last([0, 1], 2)
-        1
-        >>> nth_or_last([], 0, 'some default')
-        'some default'
-
-    If *default* is not provided and there are no items in the iterable,
-    raise ``ValueError``.
-    """
-    return last(islice(iterable, n + 1), default=default)
-
-
-class peekable:
-    """Wrap an iterator to allow lookahead and prepending elements.
-
-    Call :meth:`peek` on the result to get the value that will be returned
-    by :func:`next`. This won't advance the iterator:
-
-        >>> p = peekable(['a', 'b'])
-        >>> p.peek()
-        'a'
-        >>> next(p)
-        'a'
-
-    Pass :meth:`peek` a default value to return that instead of raising
-    ``StopIteration`` when the iterator is exhausted.
-
-        >>> p = peekable([])
-        >>> p.peek('hi')
-        'hi'
-
-    peekables also offer a :meth:`prepend` method, which "inserts" items
-    at the head of the iterable:
-
-        >>> p = peekable([1, 2, 3])
-        >>> p.prepend(10, 11, 12)
-        >>> next(p)
-        10
-        >>> p.peek()
-        11
-        >>> list(p)
-        [11, 12, 1, 2, 3]
-
-    peekables can be indexed. Index 0 is the item that will be returned by
-    :func:`next`, index 1 is the item after that, and so on:
-    The values up to the given index will be cached.
-
-        >>> p = peekable(['a', 'b', 'c', 'd'])
-        >>> p[0]
-        'a'
-        >>> p[1]
-        'b'
-        >>> next(p)
-        'a'
-
-    Negative indexes are supported, but be aware that they will cache the
-    remaining items in the source iterator, which may require significant
-    storage.
-
-    To check whether a peekable is exhausted, check its truth value:
-
-        >>> p = peekable(['a', 'b'])
-        >>> if p:  # peekable has items
-        ...     list(p)
-        ['a', 'b']
-        >>> if not p:  # peekable is exhausted
-        ...     list(p)
-        []
-
-    """
-
-    def __init__(self, iterable):
-        self._it = iter(iterable)
-        self._cache = deque()
-
-    def __iter__(self):
-        return self
-
-    def __bool__(self):
-        try:
-            self.peek()
-        except StopIteration:
-            return False
-        return True
-
-    def peek(self, default=_marker):
-        """Return the item that will be next returned from ``next()``.
-
-        Return ``default`` if there are no items left. If ``default`` is not
-        provided, raise ``StopIteration``.
-
-        """
-        if not self._cache:
-            try:
-                self._cache.append(next(self._it))
-            except StopIteration:
-                if default is _marker:
-                    raise
-                return default
-        return self._cache[0]
-
-    def prepend(self, *items):
-        """Stack up items to be the next ones returned from ``next()`` or
-        ``self.peek()``. The items will be returned in
-        first in, first out order::
-
-            >>> p = peekable([1, 2, 3])
-            >>> p.prepend(10, 11, 12)
-            >>> next(p)
-            10
-            >>> list(p)
-            [11, 12, 1, 2, 3]
-
-        It is possible, by prepending items, to "resurrect" a peekable that
-        previously raised ``StopIteration``.
-
-            >>> p = peekable([])
-            >>> next(p)
-            Traceback (most recent call last):
-              ...
-            StopIteration
-            >>> p.prepend(1)
-            >>> next(p)
-            1
-            >>> next(p)
-            Traceback (most recent call last):
-              ...
-            StopIteration
-
-        """
-        self._cache.extendleft(reversed(items))
-
-    def __next__(self):
-        if self._cache:
-            return self._cache.popleft()
-
-        return next(self._it)
-
-    def _get_slice(self, index):
-        # Normalize the slice's arguments
-        step = 1 if (index.step is None) else index.step
-        if step > 0:
-            start = 0 if (index.start is None) else index.start
-            stop = maxsize if (index.stop is None) else index.stop
-        elif step < 0:
-            start = -1 if (index.start is None) else index.start
-            stop = (-maxsize - 1) if (index.stop is None) else index.stop
-        else:
-            raise ValueError('slice step cannot be zero')
-
-        # If either the start or stop index is negative, we'll need to cache
-        # the rest of the iterable in order to slice from the right side.
-        if (start < 0) or (stop < 0):
-            self._cache.extend(self._it)
-        # Otherwise we'll need to find the rightmost index and cache to that
-        # point.
-        else:
-            n = min(max(start, stop) + 1, maxsize)
-            cache_len = len(self._cache)
-            if n >= cache_len:
-                self._cache.extend(islice(self._it, n - cache_len))
-
-        return list(self._cache)[index]
-
-    def __getitem__(self, index):
-        if isinstance(index, slice):
-            return self._get_slice(index)
-
-        cache_len = len(self._cache)
-        if index < 0:
-            self._cache.extend(self._it)
-        elif index >= cache_len:
-            self._cache.extend(islice(self._it, index + 1 - cache_len))
-
-        return self._cache[index]
-
-
-def consumer(func):
-    """Decorator that automatically advances a PEP-342-style "reverse iterator"
-    to its first yield point so you don't have to call ``next()`` on it
-    manually.
-
-        >>> @consumer
-        ... def tally():
-        ...     i = 0
-        ...     while True:
-        ...         print('Thing number %s is %s.' % (i, (yield)))
-        ...         i += 1
-        ...
-        >>> t = tally()
-        >>> t.send('red')
-        Thing number 0 is red.
-        >>> t.send('fish')
-        Thing number 1 is fish.
-
-    Without the decorator, you would have to call ``next(t)`` before
-    ``t.send()`` could be used.
-
-    """
-
-    @wraps(func)
-    def wrapper(*args, **kwargs):
-        gen = func(*args, **kwargs)
-        next(gen)
-        return gen
-
-    return wrapper
-
-
-def ilen(iterable):
-    """Return the number of items in *iterable*.
-
-        >>> ilen(x for x in range(1000000) if x % 3 == 0)
-        333334
-
-    This consumes the iterable, so handle with care.
-
-    """
-    # This is the "most beautiful of the fast variants" of this function.
-    # If you think you can improve on it, please ensure that your version
-    # is both 10x faster and 10x more beautiful.
-    return sum(compress(repeat(1), zip(iterable)))
-
-
-def iterate(func, start):
-    """Return ``start``, ``func(start)``, ``func(func(start))``, ...
-
-    >>> from itertools import islice
-    >>> list(islice(iterate(lambda x: 2*x, 1), 10))
-    [1, 2, 4, 8, 16, 32, 64, 128, 256, 512]
-
-    """
-    while True:
-        yield start
-        try:
-            start = func(start)
-        except StopIteration:
-            break
-
-
-def with_iter(context_manager):
-    """Wrap an iterable in a ``with`` statement, so it closes once exhausted.
-
-    For example, this will close the file when the iterator is exhausted::
-
-        upper_lines = (line.upper() for line in with_iter(open('foo')))
-
-    Any context manager which returns an iterable is a candidate for
-    ``with_iter``.
-
-    """
-    with context_manager as iterable:
-        yield from iterable
-
-
-def one(iterable, too_short=None, too_long=None):
-    """Return the first item from *iterable*, which is expected to contain only
-    that item. Raise an exception if *iterable* is empty or has more than one
-    item.
-
-    :func:`one` is useful for ensuring that an iterable contains only one item.
-    For example, it can be used to retrieve the result of a database query
-    that is expected to return a single row.
-
-    If *iterable* is empty, ``ValueError`` will be raised. You may specify a
-    different exception with the *too_short* keyword:
-
-        >>> it = []
-        >>> one(it)  # doctest: +IGNORE_EXCEPTION_DETAIL
-        Traceback (most recent call last):
-        ...
-        ValueError: too many items in iterable (expected 1)'
-        >>> too_short = IndexError('too few items')
-        >>> one(it, too_short=too_short)  # doctest: +IGNORE_EXCEPTION_DETAIL
-        Traceback (most recent call last):
-        ...
-        IndexError: too few items
-
-    Similarly, if *iterable* contains more than one item, ``ValueError`` will
-    be raised. You may specify a different exception with the *too_long*
-    keyword:
-
-        >>> it = ['too', 'many']
-        >>> one(it)  # doctest: +IGNORE_EXCEPTION_DETAIL
-        Traceback (most recent call last):
-        ...
-        ValueError: Expected exactly one item in iterable, but got 'too',
-        'many', and perhaps more.
-        >>> too_long = RuntimeError
-        >>> one(it, too_long=too_long)  # doctest: +IGNORE_EXCEPTION_DETAIL
-        Traceback (most recent call last):
-        ...
-        RuntimeError
-
-    Note that :func:`one` attempts to advance *iterable* twice to ensure there
-    is only one item. See :func:`spy` or :func:`peekable` to check iterable
-    contents less destructively.
-
-    """
-    it = iter(iterable)
-
-    try:
-        first_value = next(it)
-    except StopIteration as exc:
-        raise (
-            too_short or ValueError('too few items in iterable (expected 1)')
-        ) from exc
-
-    try:
-        second_value = next(it)
-    except StopIteration:
-        pass
-    else:
-        msg = (
-            'Expected exactly one item in iterable, but got {!r}, {!r}, '
-            'and perhaps more.'.format(first_value, second_value)
-        )
-        raise too_long or ValueError(msg)
-
-    return first_value
-
-
-def raise_(exception, *args):
-    raise exception(*args)
-
-
-def strictly_n(iterable, n, too_short=None, too_long=None):
-    """Validate that *iterable* has exactly *n* items and return them if
-    it does. If it has fewer than *n* items, call function *too_short*
-    with those items. If it has more than *n* items, call function
-    *too_long* with the first ``n + 1`` items.
-
-        >>> iterable = ['a', 'b', 'c', 'd']
-        >>> n = 4
-        >>> list(strictly_n(iterable, n))
-        ['a', 'b', 'c', 'd']
-
-    Note that the returned iterable must be consumed in order for the check to
-    be made.
-
-    By default, *too_short* and *too_long* are functions that raise
-    ``ValueError``.
-
-        >>> list(strictly_n('ab', 3))  # doctest: +IGNORE_EXCEPTION_DETAIL
-        Traceback (most recent call last):
-        ...
-        ValueError: too few items in iterable (got 2)
-
-        >>> list(strictly_n('abc', 2))  # doctest: +IGNORE_EXCEPTION_DETAIL
-        Traceback (most recent call last):
-        ...
-        ValueError: too many items in iterable (got at least 3)
-
-    You can instead supply functions that do something else.
-    *too_short* will be called with the number of items in *iterable*.
-    *too_long* will be called with `n + 1`.
-
-        >>> def too_short(item_count):
-        ...     raise RuntimeError
-        >>> it = strictly_n('abcd', 6, too_short=too_short)
-        >>> list(it)  # doctest: +IGNORE_EXCEPTION_DETAIL
-        Traceback (most recent call last):
-        ...
-        RuntimeError
-
-        >>> def too_long(item_count):
-        ...     print('The boss is going to hear about this')
-        >>> it = strictly_n('abcdef', 4, too_long=too_long)
-        >>> list(it)
-        The boss is going to hear about this
-        ['a', 'b', 'c', 'd']
-
-    """
-    if too_short is None:
-        too_short = lambda item_count: raise_(
-            ValueError,
-            'Too few items in iterable (got {})'.format(item_count),
-        )
-
-    if too_long is None:
-        too_long = lambda item_count: raise_(
-            ValueError,
-            'Too many items in iterable (got at least {})'.format(item_count),
-        )
-
-    it = iter(iterable)
-    for i in range(n):
-        try:
-            item = next(it)
-        except StopIteration:
-            too_short(i)
-            return
-        else:
-            yield item
-
-    try:
-        next(it)
-    except StopIteration:
-        pass
-    else:
-        too_long(n + 1)
-
-
-def distinct_permutations(iterable, r=None):
-    """Yield successive distinct permutations of the elements in *iterable*.
-
-        >>> sorted(distinct_permutations([1, 0, 1]))
-        [(0, 1, 1), (1, 0, 1), (1, 1, 0)]
-
-    Equivalent to yielding from ``set(permutations(iterable))``, except
-    duplicates are not generated and thrown away. For larger input sequences
-    this is much more efficient.
-
-    Duplicate permutations arise when there are duplicated elements in the
-    input iterable. The number of items returned is
-    `n! / (x_1! * x_2! * ... * x_n!)`, where `n` is the total number of
-    items input, and each `x_i` is the count of a distinct item in the input
-    sequence.
-
-    If *r* is given, only the *r*-length permutations are yielded.
-
-        >>> sorted(distinct_permutations([1, 0, 1], r=2))
-        [(0, 1), (1, 0), (1, 1)]
-        >>> sorted(distinct_permutations(range(3), r=2))
-        [(0, 1), (0, 2), (1, 0), (1, 2), (2, 0), (2, 1)]
-
-    *iterable* need not be sortable, but note that using equal (``x == y``)
-    but non-identical (``id(x) != id(y)``) elements may produce surprising
-    behavior. For example, ``1`` and ``True`` are equal but non-identical:
-
-        >>> list(distinct_permutations([1, True, '3']))  # doctest: +SKIP
-        [
-            (1, True, '3'),
-            (1, '3', True),
-            ('3', 1, True)
-        ]
-        >>> list(distinct_permutations([1, 2, '3']))  # doctest: +SKIP
-        [
-            (1, 2, '3'),
-            (1, '3', 2),
-            (2, 1, '3'),
-            (2, '3', 1),
-            ('3', 1, 2),
-            ('3', 2, 1)
-        ]
-    """
-
-    # Algorithm: https://w.wiki/Qai
-    def _full(A):
-        while True:
-            # Yield the permutation we have
-            yield tuple(A)
-
-            # Find the largest index i such that A[i] < A[i + 1]
-            for i in range(size - 2, -1, -1):
-                if A[i] < A[i + 1]:
-                    break
-            #  If no such index exists, this permutation is the last one
-            else:
-                return
-
-            # Find the largest index j greater than j such that A[i] < A[j]
-            for j in range(size - 1, i, -1):
-                if A[i] < A[j]:
-                    break
-
-            # Swap the value of A[i] with that of A[j], then reverse the
-            # sequence from A[i + 1] to form the new permutation
-            A[i], A[j] = A[j], A[i]
-            A[i + 1 :] = A[: i - size : -1]  # A[i + 1:][::-1]
-
-    # Algorithm: modified from the above
-    def _partial(A, r):
-        # Split A into the first r items and the last r items
-        head, tail = A[:r], A[r:]
-        right_head_indexes = range(r - 1, -1, -1)
-        left_tail_indexes = range(len(tail))
-
-        while True:
-            # Yield the permutation we have
-            yield tuple(head)
-
-            # Starting from the right, find the first index of the head with
-            # value smaller than the maximum value of the tail - call it i.
-            pivot = tail[-1]
-            for i in right_head_indexes:
-                if head[i] < pivot:
-                    break
-                pivot = head[i]
-            else:
-                return
-
-            # Starting from the left, find the first value of the tail
-            # with a value greater than head[i] and swap.
-            for j in left_tail_indexes:
-                if tail[j] > head[i]:
-                    head[i], tail[j] = tail[j], head[i]
-                    break
-            # If we didn't find one, start from the right and find the first
-            # index of the head with a value greater than head[i] and swap.
-            else:
-                for j in right_head_indexes:
-                    if head[j] > head[i]:
-                        head[i], head[j] = head[j], head[i]
-                        break
-
-            # Reverse head[i + 1:] and swap it with tail[:r - (i + 1)]
-            tail += head[: i - r : -1]  # head[i + 1:][::-1]
-            i += 1
-            head[i:], tail[:] = tail[: r - i], tail[r - i :]
-
-    items = list(iterable)
-
-    try:
-        items.sort()
-        sortable = True
-    except TypeError:
-        sortable = False
-
-        indices_dict = defaultdict(list)
-
-        for item in items:
-            indices_dict[items.index(item)].append(item)
-
-        indices = [items.index(item) for item in items]
-        indices.sort()
-
-        equivalent_items = {k: cycle(v) for k, v in indices_dict.items()}
-
-        def permuted_items(permuted_indices):
-            return tuple(
-                next(equivalent_items[index]) for index in permuted_indices
-            )
-
-    size = len(items)
-    if r is None:
-        r = size
-
-    # functools.partial(_partial, ... )
-    algorithm = _full if (r == size) else partial(_partial, r=r)
-
-    if 0 < r <= size:
-        if sortable:
-            return algorithm(items)
-        else:
-            return (
-                permuted_items(permuted_indices)
-                for permuted_indices in algorithm(indices)
-            )
-
-    return iter(() if r else ((),))
-
-
-def intersperse(e, iterable, n=1):
-    """Intersperse filler element *e* among the items in *iterable*, leaving
-    *n* items between each filler element.
-
-        >>> list(intersperse('!', [1, 2, 3, 4, 5]))
-        [1, '!', 2, '!', 3, '!', 4, '!', 5]
-
-        >>> list(intersperse(None, [1, 2, 3, 4, 5], n=2))
-        [1, 2, None, 3, 4, None, 5]
-
-    """
-    if n == 0:
-        raise ValueError('n must be > 0')
-    elif n == 1:
-        # interleave(repeat(e), iterable) -> e, x_0, e, x_1, e, x_2...
-        # islice(..., 1, None) -> x_0, e, x_1, e, x_2...
-        return islice(interleave(repeat(e), iterable), 1, None)
-    else:
-        # interleave(filler, chunks) -> [e], [x_0, x_1], [e], [x_2, x_3]...
-        # islice(..., 1, None) -> [x_0, x_1], [e], [x_2, x_3]...
-        # flatten(...) -> x_0, x_1, e, x_2, x_3...
-        filler = repeat([e])
-        chunks = chunked(iterable, n)
-        return flatten(islice(interleave(filler, chunks), 1, None))
-
-
-def unique_to_each(*iterables):
-    """Return the elements from each of the input iterables that aren't in the
-    other input iterables.
-
-    For example, suppose you have a set of packages, each with a set of
-    dependencies::
-
-        {'pkg_1': {'A', 'B'}, 'pkg_2': {'B', 'C'}, 'pkg_3': {'B', 'D'}}
-
-    If you remove one package, which dependencies can also be removed?
-
-    If ``pkg_1`` is removed, then ``A`` is no longer necessary - it is not
-    associated with ``pkg_2`` or ``pkg_3``. Similarly, ``C`` is only needed for
-    ``pkg_2``, and ``D`` is only needed for ``pkg_3``::
-
-        >>> unique_to_each({'A', 'B'}, {'B', 'C'}, {'B', 'D'})
-        [['A'], ['C'], ['D']]
-
-    If there are duplicates in one input iterable that aren't in the others
-    they will be duplicated in the output. Input order is preserved::
-
-        >>> unique_to_each("mississippi", "missouri")
-        [['p', 'p'], ['o', 'u', 'r']]
-
-    It is assumed that the elements of each iterable are hashable.
-
-    """
-    pool = [list(it) for it in iterables]
-    counts = Counter(chain.from_iterable(map(set, pool)))
-    uniques = {element for element in counts if counts[element] == 1}
-    return [list(filter(uniques.__contains__, it)) for it in pool]
-
-
-def windowed(seq, n, fillvalue=None, step=1):
-    """Return a sliding window of width *n* over the given iterable.
-
-        >>> all_windows = windowed([1, 2, 3, 4, 5], 3)
-        >>> list(all_windows)
-        [(1, 2, 3), (2, 3, 4), (3, 4, 5)]
-
-    When the window is larger than the iterable, *fillvalue* is used in place
-    of missing values:
-
-        >>> list(windowed([1, 2, 3], 4))
-        [(1, 2, 3, None)]
-
-    Each window will advance in increments of *step*:
-
-        >>> list(windowed([1, 2, 3, 4, 5, 6], 3, fillvalue='!', step=2))
-        [(1, 2, 3), (3, 4, 5), (5, 6, '!')]
-
-    To slide into the iterable's items, use :func:`chain` to add filler items
-    to the left:
-
-        >>> iterable = [1, 2, 3, 4]
-        >>> n = 3
-        >>> padding = [None] * (n - 1)
-        >>> list(windowed(chain(padding, iterable), 3))
-        [(None, None, 1), (None, 1, 2), (1, 2, 3), (2, 3, 4)]
-    """
-    if n < 0:
-        raise ValueError('n must be >= 0')
-    if n == 0:
-        yield ()
-        return
-    if step < 1:
-        raise ValueError('step must be >= 1')
-
-    iterable = iter(seq)
-
-    # Generate first window
-    window = deque(islice(iterable, n), maxlen=n)
-
-    # Deal with the first window not being full
-    if not window:
-        return
-    if len(window) < n:
-        yield tuple(window) + ((fillvalue,) * (n - len(window)))
-        return
-    yield tuple(window)
-
-    # Create the filler for the next windows. The padding ensures
-    # we have just enough elements to fill the last window.
-    padding = (fillvalue,) * (n - 1 if step >= n else step - 1)
-    filler = map(window.append, chain(iterable, padding))
-
-    # Generate the rest of the windows
-    for _ in islice(filler, step - 1, None, step):
-        yield tuple(window)
-
-
-def substrings(iterable):
-    """Yield all of the substrings of *iterable*.
-
-        >>> [''.join(s) for s in substrings('more')]
-        ['m', 'o', 'r', 'e', 'mo', 'or', 're', 'mor', 'ore', 'more']
-
-    Note that non-string iterables can also be subdivided.
-
-        >>> list(substrings([0, 1, 2]))
-        [(0,), (1,), (2,), (0, 1), (1, 2), (0, 1, 2)]
-
-    """
-    # The length-1 substrings
-    seq = []
-    for item in iter(iterable):
-        seq.append(item)
-        yield (item,)
-    seq = tuple(seq)
-    item_count = len(seq)
-
-    # And the rest
-    for n in range(2, item_count + 1):
-        for i in range(item_count - n + 1):
-            yield seq[i : i + n]
-
-
-def substrings_indexes(seq, reverse=False):
-    """Yield all substrings and their positions in *seq*
-
-    The items yielded will be a tuple of the form ``(substr, i, j)``, where
-    ``substr == seq[i:j]``.
-
-    This function only works for iterables that support slicing, such as
-    ``str`` objects.
-
-    >>> for item in substrings_indexes('more'):
-    ...    print(item)
-    ('m', 0, 1)
-    ('o', 1, 2)
-    ('r', 2, 3)
-    ('e', 3, 4)
-    ('mo', 0, 2)
-    ('or', 1, 3)
-    ('re', 2, 4)
-    ('mor', 0, 3)
-    ('ore', 1, 4)
-    ('more', 0, 4)
-
-    Set *reverse* to ``True`` to yield the same items in the opposite order.
-
-
-    """
-    r = range(1, len(seq) + 1)
-    if reverse:
-        r = reversed(r)
-    return (
-        (seq[i : i + L], i, i + L) for L in r for i in range(len(seq) - L + 1)
-    )
-
-
-class bucket:
-    """Wrap *iterable* and return an object that buckets the iterable into
-    child iterables based on a *key* function.
-
-        >>> iterable = ['a1', 'b1', 'c1', 'a2', 'b2', 'c2', 'b3']
-        >>> s = bucket(iterable, key=lambda x: x[0])  # Bucket by 1st character
-        >>> sorted(list(s))  # Get the keys
-        ['a', 'b', 'c']
-        >>> a_iterable = s['a']
-        >>> next(a_iterable)
-        'a1'
-        >>> next(a_iterable)
-        'a2'
-        >>> list(s['b'])
-        ['b1', 'b2', 'b3']
-
-    The original iterable will be advanced and its items will be cached until
-    they are used by the child iterables. This may require significant storage.
-
-    By default, attempting to select a bucket to which no items belong  will
-    exhaust the iterable and cache all values.
-    If you specify a *validator* function, selected buckets will instead be
-    checked against it.
-
-        >>> from itertools import count
-        >>> it = count(1, 2)  # Infinite sequence of odd numbers
-        >>> key = lambda x: x % 10  # Bucket by last digit
-        >>> validator = lambda x: x in {1, 3, 5, 7, 9}  # Odd digits only
-        >>> s = bucket(it, key=key, validator=validator)
-        >>> 2 in s
-        False
-        >>> list(s[2])
-        []
-
-    """
-
-    def __init__(self, iterable, key, validator=None):
-        self._it = iter(iterable)
-        self._key = key
-        self._cache = defaultdict(deque)
-        self._validator = validator or (lambda x: True)
-
-    def __contains__(self, value):
-        if not self._validator(value):
-            return False
-
-        try:
-            item = next(self[value])
-        except StopIteration:
-            return False
-        else:
-            self._cache[value].appendleft(item)
-
-        return True
-
-    def _get_values(self, value):
-        """
-        Helper to yield items from the parent iterator that match *value*.
-        Items that don't match are stored in the local cache as they
-        are encountered.
-        """
-        while True:
-            # If we've cached some items that match the target value, emit
-            # the first one and evict it from the cache.
-            if self._cache[value]:
-                yield self._cache[value].popleft()
-            # Otherwise we need to advance the parent iterator to search for
-            # a matching item, caching the rest.
-            else:
-                while True:
-                    try:
-                        item = next(self._it)
-                    except StopIteration:
-                        return
-                    item_value = self._key(item)
-                    if item_value == value:
-                        yield item
-                        break
-                    elif self._validator(item_value):
-                        self._cache[item_value].append(item)
-
-    def __iter__(self):
-        for item in self._it:
-            item_value = self._key(item)
-            if self._validator(item_value):
-                self._cache[item_value].append(item)
-
-        yield from self._cache.keys()
-
-    def __getitem__(self, value):
-        if not self._validator(value):
-            return iter(())
-
-        return self._get_values(value)
-
-
-def spy(iterable, n=1):
-    """Return a 2-tuple with a list containing the first *n* elements of
-    *iterable*, and an iterator with the same items as *iterable*.
-    This allows you to "look ahead" at the items in the iterable without
-    advancing it.
-
-    There is one item in the list by default:
-
-        >>> iterable = 'abcdefg'
-        >>> head, iterable = spy(iterable)
-        >>> head
-        ['a']
-        >>> list(iterable)
-        ['a', 'b', 'c', 'd', 'e', 'f', 'g']
-
-    You may use unpacking to retrieve items instead of lists:
-
-        >>> (head,), iterable = spy('abcdefg')
-        >>> head
-        'a'
-        >>> (first, second), iterable = spy('abcdefg', 2)
-        >>> first
-        'a'
-        >>> second
-        'b'
-
-    The number of items requested can be larger than the number of items in
-    the iterable:
-
-        >>> iterable = [1, 2, 3, 4, 5]
-        >>> head, iterable = spy(iterable, 10)
-        >>> head
-        [1, 2, 3, 4, 5]
-        >>> list(iterable)
-        [1, 2, 3, 4, 5]
-
-    """
-    it = iter(iterable)
-    head = take(n, it)
-
-    return head.copy(), chain(head, it)
-
-
-def interleave(*iterables):
-    """Return a new iterable yielding from each iterable in turn,
-    until the shortest is exhausted.
-
-        >>> list(interleave([1, 2, 3], [4, 5], [6, 7, 8]))
-        [1, 4, 6, 2, 5, 7]
-
-    For a version that doesn't terminate after the shortest iterable is
-    exhausted, see :func:`interleave_longest`.
-
-    """
-    return chain.from_iterable(zip(*iterables))
-
-
-def interleave_longest(*iterables):
-    """Return a new iterable yielding from each iterable in turn,
-    skipping any that are exhausted.
-
-        >>> list(interleave_longest([1, 2, 3], [4, 5], [6, 7, 8]))
-        [1, 4, 6, 2, 5, 7, 3, 8]
-
-    This function produces the same output as :func:`roundrobin`, but may
-    perform better for some inputs (in particular when the number of iterables
-    is large).
-
-    """
-    i = chain.from_iterable(zip_longest(*iterables, fillvalue=_marker))
-    return (x for x in i if x is not _marker)
-
-
-def interleave_evenly(iterables, lengths=None):
-    """
-    Interleave multiple iterables so that their elements are evenly distributed
-    throughout the output sequence.
-
-    >>> iterables = [1, 2, 3, 4, 5], ['a', 'b']
-    >>> list(interleave_evenly(iterables))
-    [1, 2, 'a', 3, 4, 'b', 5]
-
-    >>> iterables = [[1, 2, 3], [4, 5], [6, 7, 8]]
-    >>> list(interleave_evenly(iterables))
-    [1, 6, 4, 2, 7, 3, 8, 5]
-
-    This function requires iterables of known length. Iterables without
-    ``__len__()`` can be used by manually specifying lengths with *lengths*:
-
-    >>> from itertools import combinations, repeat
-    >>> iterables = [combinations(range(4), 2), ['a', 'b', 'c']]
-    >>> lengths = [4 * (4 - 1) // 2, 3]
-    >>> list(interleave_evenly(iterables, lengths=lengths))
-    [(0, 1), (0, 2), 'a', (0, 3), (1, 2), 'b', (1, 3), (2, 3), 'c']
-
-    Based on Bresenham's algorithm.
-    """
-    if lengths is None:
-        try:
-            lengths = [len(it) for it in iterables]
-        except TypeError:
-            raise ValueError(
-                'Iterable lengths could not be determined automatically. '
-                'Specify them with the lengths keyword.'
-            )
-    elif len(iterables) != len(lengths):
-        raise ValueError('Mismatching number of iterables and lengths.')
-
-    dims = len(lengths)
-
-    # sort iterables by length, descending
-    lengths_permute = sorted(
-        range(dims), key=lambda i: lengths[i], reverse=True
-    )
-    lengths_desc = [lengths[i] for i in lengths_permute]
-    iters_desc = [iter(iterables[i]) for i in lengths_permute]
-
-    # the longest iterable is the primary one (Bresenham: the longest
-    # distance along an axis)
-    delta_primary, deltas_secondary = lengths_desc[0], lengths_desc[1:]
-    iter_primary, iters_secondary = iters_desc[0], iters_desc[1:]
-    errors = [delta_primary // dims] * len(deltas_secondary)
-
-    to_yield = sum(lengths)
-    while to_yield:
-        yield next(iter_primary)
-        to_yield -= 1
-        # update errors for each secondary iterable
-        errors = [e - delta for e, delta in zip(errors, deltas_secondary)]
-
-        # those iterables for which the error is negative are yielded
-        # ("diagonal step" in Bresenham)
-        for i, e_ in enumerate(errors):
-            if e_ < 0:
-                yield next(iters_secondary[i])
-                to_yield -= 1
-                errors[i] += delta_primary
-
-
-def collapse(iterable, base_type=None, levels=None):
-    """Flatten an iterable with multiple levels of nesting (e.g., a list of
-    lists of tuples) into non-iterable types.
-
-        >>> iterable = [(1, 2), ([3, 4], [[5], [6]])]
-        >>> list(collapse(iterable))
-        [1, 2, 3, 4, 5, 6]
-
-    Binary and text strings are not considered iterable and
-    will not be collapsed.
-
-    To avoid collapsing other types, specify *base_type*:
-
-        >>> iterable = ['ab', ('cd', 'ef'), ['gh', 'ij']]
-        >>> list(collapse(iterable, base_type=tuple))
-        ['ab', ('cd', 'ef'), 'gh', 'ij']
-
-    Specify *levels* to stop flattening after a certain level:
-
-    >>> iterable = [('a', ['b']), ('c', ['d'])]
-    >>> list(collapse(iterable))  # Fully flattened
-    ['a', 'b', 'c', 'd']
-    >>> list(collapse(iterable, levels=1))  # Only one level flattened
-    ['a', ['b'], 'c', ['d']]
-
-    """
-    stack = deque()
-    # Add our first node group, treat the iterable as a single node
-    stack.appendleft((0, repeat(iterable, 1)))
-
-    while stack:
-        node_group = stack.popleft()
-        level, nodes = node_group
-
-        # Check if beyond max level
-        if levels is not None and level > levels:
-            yield from nodes
-            continue
-
-        for node in nodes:
-            # Check if done iterating
-            if isinstance(node, (str, bytes)) or (
-                (base_type is not None) and isinstance(node, base_type)
-            ):
-                yield node
-            # Otherwise try to create child nodes
-            else:
-                try:
-                    tree = iter(node)
-                except TypeError:
-                    yield node
-                else:
-                    # Save our current location
-                    stack.appendleft(node_group)
-                    # Append the new child node
-                    stack.appendleft((level + 1, tree))
-                    # Break to process child node
-                    break
-
-
-def side_effect(func, iterable, chunk_size=None, before=None, after=None):
-    """Invoke *func* on each item in *iterable* (or on each *chunk_size* group
-    of items) before yielding the item.
-
-    `func` must be a function that takes a single argument. Its return value
-    will be discarded.
-
-    *before* and *after* are optional functions that take no arguments. They
-    will be executed before iteration starts and after it ends, respectively.
-
-    `side_effect` can be used for logging, updating progress bars, or anything
-    that is not functionally "pure."
-
-    Emitting a status message:
-
-        >>> from more_itertools import consume
-        >>> func = lambda item: print('Received {}'.format(item))
-        >>> consume(side_effect(func, range(2)))
-        Received 0
-        Received 1
-
-    Operating on chunks of items:
-
-        >>> pair_sums = []
-        >>> func = lambda chunk: pair_sums.append(sum(chunk))
-        >>> list(side_effect(func, [0, 1, 2, 3, 4, 5], 2))
-        [0, 1, 2, 3, 4, 5]
-        >>> list(pair_sums)
-        [1, 5, 9]
-
-    Writing to a file-like object:
-
-        >>> from io import StringIO
-        >>> from more_itertools import consume
-        >>> f = StringIO()
-        >>> func = lambda x: print(x, file=f)
-        >>> before = lambda: print(u'HEADER', file=f)
-        >>> after = f.close
-        >>> it = [u'a', u'b', u'c']
-        >>> consume(side_effect(func, it, before=before, after=after))
-        >>> f.closed
-        True
-
-    """
-    try:
-        if before is not None:
-            before()
-
-        if chunk_size is None:
-            for item in iterable:
-                func(item)
-                yield item
-        else:
-            for chunk in chunked(iterable, chunk_size):
-                func(chunk)
-                yield from chunk
-    finally:
-        if after is not None:
-            after()
-
-
-def sliced(seq, n, strict=False):
-    """Yield slices of length *n* from the sequence *seq*.
-
-    >>> list(sliced((1, 2, 3, 4, 5, 6), 3))
-    [(1, 2, 3), (4, 5, 6)]
-
-    By the default, the last yielded slice will have fewer than *n* elements
-    if the length of *seq* is not divisible by *n*:
-
-    >>> list(sliced((1, 2, 3, 4, 5, 6, 7, 8), 3))
-    [(1, 2, 3), (4, 5, 6), (7, 8)]
-
-    If the length of *seq* is not divisible by *n* and *strict* is
-    ``True``, then ``ValueError`` will be raised before the last
-    slice is yielded.
-
-    This function will only work for iterables that support slicing.
-    For non-sliceable iterables, see :func:`chunked`.
-
-    """
-    iterator = takewhile(len, (seq[i : i + n] for i in count(0, n)))
-    if strict:
-
-        def ret():
-            for _slice in iterator:
-                if len(_slice) != n:
-                    raise ValueError("seq is not divisible by n.")
-                yield _slice
-
-        return iter(ret())
-    else:
-        return iterator
-
-
-def split_at(iterable, pred, maxsplit=-1, keep_separator=False):
-    """Yield lists of items from *iterable*, where each list is delimited by
-    an item where callable *pred* returns ``True``.
-
-        >>> list(split_at('abcdcba', lambda x: x == 'b'))
-        [['a'], ['c', 'd', 'c'], ['a']]
-
-        >>> list(split_at(range(10), lambda n: n % 2 == 1))
-        [[0], [2], [4], [6], [8], []]
-
-    At most *maxsplit* splits are done. If *maxsplit* is not specified or -1,
-    then there is no limit on the number of splits:
-
-        >>> list(split_at(range(10), lambda n: n % 2 == 1, maxsplit=2))
-        [[0], [2], [4, 5, 6, 7, 8, 9]]
-
-    By default, the delimiting items are not included in the output.
-    To include them, set *keep_separator* to ``True``.
-
-        >>> list(split_at('abcdcba', lambda x: x == 'b', keep_separator=True))
-        [['a'], ['b'], ['c', 'd', 'c'], ['b'], ['a']]
-
-    """
-    if maxsplit == 0:
-        yield list(iterable)
-        return
-
-    buf = []
-    it = iter(iterable)
-    for item in it:
-        if pred(item):
-            yield buf
-            if keep_separator:
-                yield [item]
-            if maxsplit == 1:
-                yield list(it)
-                return
-            buf = []
-            maxsplit -= 1
-        else:
-            buf.append(item)
-    yield buf
-
-
-def split_before(iterable, pred, maxsplit=-1):
-    """Yield lists of items from *iterable*, where each list ends just before
-    an item for which callable *pred* returns ``True``:
-
-        >>> list(split_before('OneTwo', lambda s: s.isupper()))
-        [['O', 'n', 'e'], ['T', 'w', 'o']]
-
-        >>> list(split_before(range(10), lambda n: n % 3 == 0))
-        [[0, 1, 2], [3, 4, 5], [6, 7, 8], [9]]
-
-    At most *maxsplit* splits are done. If *maxsplit* is not specified or -1,
-    then there is no limit on the number of splits:
-
-        >>> list(split_before(range(10), lambda n: n % 3 == 0, maxsplit=2))
-        [[0, 1, 2], [3, 4, 5], [6, 7, 8, 9]]
-    """
-    if maxsplit == 0:
-        yield list(iterable)
-        return
-
-    buf = []
-    it = iter(iterable)
-    for item in it:
-        if pred(item) and buf:
-            yield buf
-            if maxsplit == 1:
-                yield [item] + list(it)
-                return
-            buf = []
-            maxsplit -= 1
-        buf.append(item)
-    if buf:
-        yield buf
-
-
-def split_after(iterable, pred, maxsplit=-1):
-    """Yield lists of items from *iterable*, where each list ends with an
-    item where callable *pred* returns ``True``:
-
-        >>> list(split_after('one1two2', lambda s: s.isdigit()))
-        [['o', 'n', 'e', '1'], ['t', 'w', 'o', '2']]
-
-        >>> list(split_after(range(10), lambda n: n % 3 == 0))
-        [[0], [1, 2, 3], [4, 5, 6], [7, 8, 9]]
-
-    At most *maxsplit* splits are done. If *maxsplit* is not specified or -1,
-    then there is no limit on the number of splits:
-
-        >>> list(split_after(range(10), lambda n: n % 3 == 0, maxsplit=2))
-        [[0], [1, 2, 3], [4, 5, 6, 7, 8, 9]]
-
-    """
-    if maxsplit == 0:
-        yield list(iterable)
-        return
-
-    buf = []
-    it = iter(iterable)
-    for item in it:
-        buf.append(item)
-        if pred(item) and buf:
-            yield buf
-            if maxsplit == 1:
-                buf = list(it)
-                if buf:
-                    yield buf
-                return
-            buf = []
-            maxsplit -= 1
-    if buf:
-        yield buf
-
-
-def split_when(iterable, pred, maxsplit=-1):
-    """Split *iterable* into pieces based on the output of *pred*.
-    *pred* should be a function that takes successive pairs of items and
-    returns ``True`` if the iterable should be split in between them.
-
-    For example, to find runs of increasing numbers, split the iterable when
-    element ``i`` is larger than element ``i + 1``:
-
-        >>> list(split_when([1, 2, 3, 3, 2, 5, 2, 4, 2], lambda x, y: x > y))
-        [[1, 2, 3, 3], [2, 5], [2, 4], [2]]
-
-    At most *maxsplit* splits are done. If *maxsplit* is not specified or -1,
-    then there is no limit on the number of splits:
-
-        >>> list(split_when([1, 2, 3, 3, 2, 5, 2, 4, 2],
-        ...                 lambda x, y: x > y, maxsplit=2))
-        [[1, 2, 3, 3], [2, 5], [2, 4, 2]]
-
-    """
-    if maxsplit == 0:
-        yield list(iterable)
-        return
-
-    it = iter(iterable)
-    try:
-        cur_item = next(it)
-    except StopIteration:
-        return
-
-    buf = [cur_item]
-    for next_item in it:
-        if pred(cur_item, next_item):
-            yield buf
-            if maxsplit == 1:
-                yield [next_item] + list(it)
-                return
-            buf = []
-            maxsplit -= 1
-
-        buf.append(next_item)
-        cur_item = next_item
-
-    yield buf
-
-
-def split_into(iterable, sizes):
-    """Yield a list of sequential items from *iterable* of length 'n' for each
-    integer 'n' in *sizes*.
-
-        >>> list(split_into([1,2,3,4,5,6], [1,2,3]))
-        [[1], [2, 3], [4, 5, 6]]
-
-    If the sum of *sizes* is smaller than the length of *iterable*, then the
-    remaining items of *iterable* will not be returned.
-
-        >>> list(split_into([1,2,3,4,5,6], [2,3]))
-        [[1, 2], [3, 4, 5]]
-
-    If the sum of *sizes* is larger than the length of *iterable*, fewer items
-    will be returned in the iteration that overruns *iterable* and further
-    lists will be empty:
-
-        >>> list(split_into([1,2,3,4], [1,2,3,4]))
-        [[1], [2, 3], [4], []]
-
-    When a ``None`` object is encountered in *sizes*, the returned list will
-    contain items up to the end of *iterable* the same way that itertools.slice
-    does:
-
-        >>> list(split_into([1,2,3,4,5,6,7,8,9,0], [2,3,None]))
-        [[1, 2], [3, 4, 5], [6, 7, 8, 9, 0]]
-
-    :func:`split_into` can be useful for grouping a series of items where the
-    sizes of the groups are not uniform. An example would be where in a row
-    from a table, multiple columns represent elements of the same feature
-    (e.g. a point represented by x,y,z) but, the format is not the same for
-    all columns.
-    """
-    # convert the iterable argument into an iterator so its contents can
-    # be consumed by islice in case it is a generator
-    it = iter(iterable)
-
-    for size in sizes:
-        if size is None:
-            yield list(it)
-            return
-        else:
-            yield list(islice(it, size))
-
-
-def padded(iterable, fillvalue=None, n=None, next_multiple=False):
-    """Yield the elements from *iterable*, followed by *fillvalue*, such that
-    at least *n* items are emitted.
-
-        >>> list(padded([1, 2, 3], '?', 5))
-        [1, 2, 3, '?', '?']
-
-    If *next_multiple* is ``True``, *fillvalue* will be emitted until the
-    number of items emitted is a multiple of *n*:
-
-        >>> list(padded([1, 2, 3, 4], n=3, next_multiple=True))
-        [1, 2, 3, 4, None, None]
-
-    If *n* is ``None``, *fillvalue* will be emitted indefinitely.
-
-    To create an *iterable* of exactly size *n*, you can truncate with
-    :func:`islice`.
-
-        >>> list(islice(padded([1, 2, 3], '?'), 5))
-        [1, 2, 3, '?', '?']
-        >>> list(islice(padded([1, 2, 3, 4, 5, 6, 7, 8], '?'), 5))
-        [1, 2, 3, 4, 5]
-
-    """
-    iterable = iter(iterable)
-    iterable_with_repeat = chain(iterable, repeat(fillvalue))
-
-    if n is None:
-        return iterable_with_repeat
-    elif n < 1:
-        raise ValueError('n must be at least 1')
-    elif next_multiple:
-
-        def slice_generator():
-            for first in iterable:
-                yield (first,)
-                yield islice(iterable_with_repeat, n - 1)
-
-        # While elements exist produce slices of size n
-        return chain.from_iterable(slice_generator())
-    else:
-        # Ensure the first batch is at least size n then iterate
-        return chain(islice(iterable_with_repeat, n), iterable)
-
-
-def repeat_each(iterable, n=2):
-    """Repeat each element in *iterable* *n* times.
-
-    >>> list(repeat_each('ABC', 3))
-    ['A', 'A', 'A', 'B', 'B', 'B', 'C', 'C', 'C']
-    """
-    return chain.from_iterable(map(repeat, iterable, repeat(n)))
-
-
-def repeat_last(iterable, default=None):
-    """After the *iterable* is exhausted, keep yielding its last element.
-
-        >>> list(islice(repeat_last(range(3)), 5))
-        [0, 1, 2, 2, 2]
-
-    If the iterable is empty, yield *default* forever::
-
-        >>> list(islice(repeat_last(range(0), 42), 5))
-        [42, 42, 42, 42, 42]
-
-    """
-    item = _marker
-    for item in iterable:
-        yield item
-    final = default if item is _marker else item
-    yield from repeat(final)
-
-
-def distribute(n, iterable):
-    """Distribute the items from *iterable* among *n* smaller iterables.
-
-        >>> group_1, group_2 = distribute(2, [1, 2, 3, 4, 5, 6])
-        >>> list(group_1)
-        [1, 3, 5]
-        >>> list(group_2)
-        [2, 4, 6]
-
-    If the length of *iterable* is not evenly divisible by *n*, then the
-    length of the returned iterables will not be identical:
-
-        >>> children = distribute(3, [1, 2, 3, 4, 5, 6, 7])
-        >>> [list(c) for c in children]
-        [[1, 4, 7], [2, 5], [3, 6]]
-
-    If the length of *iterable* is smaller than *n*, then the last returned
-    iterables will be empty:
-
-        >>> children = distribute(5, [1, 2, 3])
-        >>> [list(c) for c in children]
-        [[1], [2], [3], [], []]
-
-    This function uses :func:`itertools.tee` and may require significant
-    storage.
-
-    If you need the order items in the smaller iterables to match the
-    original iterable, see :func:`divide`.
-
-    """
-    if n < 1:
-        raise ValueError('n must be at least 1')
-
-    children = tee(iterable, n)
-    return [islice(it, index, None, n) for index, it in enumerate(children)]
-
-
-def stagger(iterable, offsets=(-1, 0, 1), longest=False, fillvalue=None):
-    """Yield tuples whose elements are offset from *iterable*.
-    The amount by which the `i`-th item in each tuple is offset is given by
-    the `i`-th item in *offsets*.
-
-        >>> list(stagger([0, 1, 2, 3]))
-        [(None, 0, 1), (0, 1, 2), (1, 2, 3)]
-        >>> list(stagger(range(8), offsets=(0, 2, 4)))
-        [(0, 2, 4), (1, 3, 5), (2, 4, 6), (3, 5, 7)]
-
-    By default, the sequence will end when the final element of a tuple is the
-    last item in the iterable. To continue until the first element of a tuple
-    is the last item in the iterable, set *longest* to ``True``::
-
-        >>> list(stagger([0, 1, 2, 3], longest=True))
-        [(None, 0, 1), (0, 1, 2), (1, 2, 3), (2, 3, None), (3, None, None)]
-
-    By default, ``None`` will be used to replace offsets beyond the end of the
-    sequence. Specify *fillvalue* to use some other value.
-
-    """
-    children = tee(iterable, len(offsets))
-
-    return zip_offset(
-        *children, offsets=offsets, longest=longest, fillvalue=fillvalue
-    )
-
-
-def zip_equal(*iterables):
-    """``zip`` the input *iterables* together, but raise
-    ``UnequalIterablesError`` if they aren't all the same length.
-
-        >>> it_1 = range(3)
-        >>> it_2 = iter('abc')
-        >>> list(zip_equal(it_1, it_2))
-        [(0, 'a'), (1, 'b'), (2, 'c')]
-
-        >>> it_1 = range(3)
-        >>> it_2 = iter('abcd')
-        >>> list(zip_equal(it_1, it_2)) # doctest: +IGNORE_EXCEPTION_DETAIL
-        Traceback (most recent call last):
-        ...
-        more_itertools.more.UnequalIterablesError: Iterables have different
-        lengths
-
-    """
-    if hexversion >= 0x30A00A6:
-        warnings.warn(
-            (
-                'zip_equal will be removed in a future version of '
-                'more-itertools. Use the builtin zip function with '
-                'strict=True instead.'
-            ),
-            DeprecationWarning,
-        )
-
-    return _zip_equal(*iterables)
-
-
-def zip_offset(*iterables, offsets, longest=False, fillvalue=None):
-    """``zip`` the input *iterables* together, but offset the `i`-th iterable
-    by the `i`-th item in *offsets*.
-
-        >>> list(zip_offset('0123', 'abcdef', offsets=(0, 1)))
-        [('0', 'b'), ('1', 'c'), ('2', 'd'), ('3', 'e')]
-
-    This can be used as a lightweight alternative to SciPy or pandas to analyze
-    data sets in which some series have a lead or lag relationship.
-
-    By default, the sequence will end when the shortest iterable is exhausted.
-    To continue until the longest iterable is exhausted, set *longest* to
-    ``True``.
-
-        >>> list(zip_offset('0123', 'abcdef', offsets=(0, 1), longest=True))
-        [('0', 'b'), ('1', 'c'), ('2', 'd'), ('3', 'e'), (None, 'f')]
-
-    By default, ``None`` will be used to replace offsets beyond the end of the
-    sequence. Specify *fillvalue* to use some other value.
-
-    """
-    if len(iterables) != len(offsets):
-        raise ValueError("Number of iterables and offsets didn't match")
-
-    staggered = []
-    for it, n in zip(iterables, offsets):
-        if n < 0:
-            staggered.append(chain(repeat(fillvalue, -n), it))
-        elif n > 0:
-            staggered.append(islice(it, n, None))
-        else:
-            staggered.append(it)
-
-    if longest:
-        return zip_longest(*staggered, fillvalue=fillvalue)
-
-    return zip(*staggered)
-
-
-def sort_together(
-    iterables, key_list=(0,), key=None, reverse=False, strict=False
-):
-    """Return the input iterables sorted together, with *key_list* as the
-    priority for sorting. All iterables are trimmed to the length of the
-    shortest one.
-
-    This can be used like the sorting function in a spreadsheet. If each
-    iterable represents a column of data, the key list determines which
-    columns are used for sorting.
-
-    By default, all iterables are sorted using the ``0``-th iterable::
-
-        >>> iterables = [(4, 3, 2, 1), ('a', 'b', 'c', 'd')]
-        >>> sort_together(iterables)
-        [(1, 2, 3, 4), ('d', 'c', 'b', 'a')]
-
-    Set a different key list to sort according to another iterable.
-    Specifying multiple keys dictates how ties are broken::
-
-        >>> iterables = [(3, 1, 2), (0, 1, 0), ('c', 'b', 'a')]
-        >>> sort_together(iterables, key_list=(1, 2))
-        [(2, 3, 1), (0, 0, 1), ('a', 'c', 'b')]
-
-    To sort by a function of the elements of the iterable, pass a *key*
-    function. Its arguments are the elements of the iterables corresponding to
-    the key list::
-
-        >>> names = ('a', 'b', 'c')
-        >>> lengths = (1, 2, 3)
-        >>> widths = (5, 2, 1)
-        >>> def area(length, width):
-        ...     return length * width
-        >>> sort_together([names, lengths, widths], key_list=(1, 2), key=area)
-        [('c', 'b', 'a'), (3, 2, 1), (1, 2, 5)]
-
-    Set *reverse* to ``True`` to sort in descending order.
-
-        >>> sort_together([(1, 2, 3), ('c', 'b', 'a')], reverse=True)
-        [(3, 2, 1), ('a', 'b', 'c')]
-
-    If the *strict* keyword argument is ``True``, then
-    ``UnequalIterablesError`` will be raised if any of the iterables have
-    different lengths.
-
-    """
-    if key is None:
-        # if there is no key function, the key argument to sorted is an
-        # itemgetter
-        key_argument = itemgetter(*key_list)
-    else:
-        # if there is a key function, call it with the items at the offsets
-        # specified by the key function as arguments
-        key_list = list(key_list)
-        if len(key_list) == 1:
-            # if key_list contains a single item, pass the item at that offset
-            # as the only argument to the key function
-            key_offset = key_list[0]
-            key_argument = lambda zipped_items: key(zipped_items[key_offset])
-        else:
-            # if key_list contains multiple items, use itemgetter to return a
-            # tuple of items, which we pass as *args to the key function
-            get_key_items = itemgetter(*key_list)
-            key_argument = lambda zipped_items: key(
-                *get_key_items(zipped_items)
-            )
-
-    zipper = zip_equal if strict else zip
-    return list(
-        zipper(*sorted(zipper(*iterables), key=key_argument, reverse=reverse))
-    )
-
-
-def unzip(iterable):
-    """The inverse of :func:`zip`, this function disaggregates the elements
-    of the zipped *iterable*.
-
-    The ``i``-th iterable contains the ``i``-th element from each element
-    of the zipped iterable. The first element is used to determine the
-    length of the remaining elements.
-
-        >>> iterable = [('a', 1), ('b', 2), ('c', 3), ('d', 4)]
-        >>> letters, numbers = unzip(iterable)
-        >>> list(letters)
-        ['a', 'b', 'c', 'd']
-        >>> list(numbers)
-        [1, 2, 3, 4]
-
-    This is similar to using ``zip(*iterable)``, but it avoids reading
-    *iterable* into memory. Note, however, that this function uses
-    :func:`itertools.tee` and thus may require significant storage.
-
-    """
-    head, iterable = spy(iter(iterable))
-    if not head:
-        # empty iterable, e.g. zip([], [], [])
-        return ()
-    # spy returns a one-length iterable as head
-    head = head[0]
-    iterables = tee(iterable, len(head))
-
-    def itemgetter(i):
-        def getter(obj):
-            try:
-                return obj[i]
-            except IndexError:
-                # basically if we have an iterable like
-                # iter([(1, 2, 3), (4, 5), (6,)])
-                # the second unzipped iterable would fail at the third tuple
-                # since it would try to access tup[1]
-                # same with the third unzipped iterable and the second tuple
-                # to support these "improperly zipped" iterables,
-                # we create a custom itemgetter
-                # which just stops the unzipped iterables
-                # at first length mismatch
-                raise StopIteration
-
-        return getter
-
-    return tuple(map(itemgetter(i), it) for i, it in enumerate(iterables))
-
-
-def divide(n, iterable):
-    """Divide the elements from *iterable* into *n* parts, maintaining
-    order.
-
-        >>> group_1, group_2 = divide(2, [1, 2, 3, 4, 5, 6])
-        >>> list(group_1)
-        [1, 2, 3]
-        >>> list(group_2)
-        [4, 5, 6]
-
-    If the length of *iterable* is not evenly divisible by *n*, then the
-    length of the returned iterables will not be identical:
-
-        >>> children = divide(3, [1, 2, 3, 4, 5, 6, 7])
-        >>> [list(c) for c in children]
-        [[1, 2, 3], [4, 5], [6, 7]]
-
-    If the length of the iterable is smaller than n, then the last returned
-    iterables will be empty:
-
-        >>> children = divide(5, [1, 2, 3])
-        >>> [list(c) for c in children]
-        [[1], [2], [3], [], []]
-
-    This function will exhaust the iterable before returning.
-    If order is not important, see :func:`distribute`, which does not first
-    pull the iterable into memory.
-
-    """
-    if n < 1:
-        raise ValueError('n must be at least 1')
-
-    try:
-        iterable[:0]
-    except TypeError:
-        seq = tuple(iterable)
-    else:
-        seq = iterable
-
-    q, r = divmod(len(seq), n)
-
-    ret = []
-    stop = 0
-    for i in range(1, n + 1):
-        start = stop
-        stop += q + 1 if i <= r else q
-        ret.append(iter(seq[start:stop]))
-
-    return ret
-
-
-def always_iterable(obj, base_type=(str, bytes)):
-    """If *obj* is iterable, return an iterator over its items::
-
-        >>> obj = (1, 2, 3)
-        >>> list(always_iterable(obj))
-        [1, 2, 3]
-
-    If *obj* is not iterable, return a one-item iterable containing *obj*::
-
-        >>> obj = 1
-        >>> list(always_iterable(obj))
-        [1]
-
-    If *obj* is ``None``, return an empty iterable:
-
-        >>> obj = None
-        >>> list(always_iterable(None))
-        []
-
-    By default, binary and text strings are not considered iterable::
-
-        >>> obj = 'foo'
-        >>> list(always_iterable(obj))
-        ['foo']
-
-    If *base_type* is set, objects for which ``isinstance(obj, base_type)``
-    returns ``True`` won't be considered iterable.
-
-        >>> obj = {'a': 1}
-        >>> list(always_iterable(obj))  # Iterate over the dict's keys
-        ['a']
-        >>> list(always_iterable(obj, base_type=dict))  # Treat dicts as a unit
-        [{'a': 1}]
-
-    Set *base_type* to ``None`` to avoid any special handling and treat objects
-    Python considers iterable as iterable:
-
-        >>> obj = 'foo'
-        >>> list(always_iterable(obj, base_type=None))
-        ['f', 'o', 'o']
-    """
-    if obj is None:
-        return iter(())
-
-    if (base_type is not None) and isinstance(obj, base_type):
-        return iter((obj,))
-
-    try:
-        return iter(obj)
-    except TypeError:
-        return iter((obj,))
-
-
-def adjacent(predicate, iterable, distance=1):
-    """Return an iterable over `(bool, item)` tuples where the `item` is
-    drawn from *iterable* and the `bool` indicates whether
-    that item satisfies the *predicate* or is adjacent to an item that does.
-
-    For example, to find whether items are adjacent to a ``3``::
-
-        >>> list(adjacent(lambda x: x == 3, range(6)))
-        [(False, 0), (False, 1), (True, 2), (True, 3), (True, 4), (False, 5)]
-
-    Set *distance* to change what counts as adjacent. For example, to find
-    whether items are two places away from a ``3``:
-
-        >>> list(adjacent(lambda x: x == 3, range(6), distance=2))
-        [(False, 0), (True, 1), (True, 2), (True, 3), (True, 4), (True, 5)]
-
-    This is useful for contextualizing the results of a search function.
-    For example, a code comparison tool might want to identify lines that
-    have changed, but also surrounding lines to give the viewer of the diff
-    context.
-
-    The predicate function will only be called once for each item in the
-    iterable.
-
-    See also :func:`groupby_transform`, which can be used with this function
-    to group ranges of items with the same `bool` value.
-
-    """
-    # Allow distance=0 mainly for testing that it reproduces results with map()
-    if distance < 0:
-        raise ValueError('distance must be at least 0')
-
-    i1, i2 = tee(iterable)
-    padding = [False] * distance
-    selected = chain(padding, map(predicate, i1), padding)
-    adjacent_to_selected = map(any, windowed(selected, 2 * distance + 1))
-    return zip(adjacent_to_selected, i2)
-
-
-def groupby_transform(iterable, keyfunc=None, valuefunc=None, reducefunc=None):
-    """An extension of :func:`itertools.groupby` that can apply transformations
-    to the grouped data.
-
-    * *keyfunc* is a function computing a key value for each item in *iterable*
-    * *valuefunc* is a function that transforms the individual items from
-      *iterable* after grouping
-    * *reducefunc* is a function that transforms each group of items
-
-    >>> iterable = 'aAAbBBcCC'
-    >>> keyfunc = lambda k: k.upper()
-    >>> valuefunc = lambda v: v.lower()
-    >>> reducefunc = lambda g: ''.join(g)
-    >>> list(groupby_transform(iterable, keyfunc, valuefunc, reducefunc))
-    [('A', 'aaa'), ('B', 'bbb'), ('C', 'ccc')]
-
-    Each optional argument defaults to an identity function if not specified.
-
-    :func:`groupby_transform` is useful when grouping elements of an iterable
-    using a separate iterable as the key. To do this, :func:`zip` the iterables
-    and pass a *keyfunc* that extracts the first element and a *valuefunc*
-    that extracts the second element::
-
-        >>> from operator import itemgetter
-        >>> keys = [0, 0, 1, 1, 1, 2, 2, 2, 3]
-        >>> values = 'abcdefghi'
-        >>> iterable = zip(keys, values)
-        >>> grouper = groupby_transform(iterable, itemgetter(0), itemgetter(1))
-        >>> [(k, ''.join(g)) for k, g in grouper]
-        [(0, 'ab'), (1, 'cde'), (2, 'fgh'), (3, 'i')]
-
-    Note that the order of items in the iterable is significant.
-    Only adjacent items are grouped together, so if you don't want any
-    duplicate groups, you should sort the iterable by the key function.
-
-    """
-    ret = groupby(iterable, keyfunc)
-    if valuefunc:
-        ret = ((k, map(valuefunc, g)) for k, g in ret)
-    if reducefunc:
-        ret = ((k, reducefunc(g)) for k, g in ret)
-
-    return ret
-
-
-class numeric_range(abc.Sequence, abc.Hashable):
-    """An extension of the built-in ``range()`` function whose arguments can
-    be any orderable numeric type.
-
-    With only *stop* specified, *start* defaults to ``0`` and *step*
-    defaults to ``1``. The output items will match the type of *stop*:
-
-        >>> list(numeric_range(3.5))
-        [0.0, 1.0, 2.0, 3.0]
-
-    With only *start* and *stop* specified, *step* defaults to ``1``. The
-    output items will match the type of *start*:
-
-        >>> from decimal import Decimal
-        >>> start = Decimal('2.1')
-        >>> stop = Decimal('5.1')
-        >>> list(numeric_range(start, stop))
-        [Decimal('2.1'), Decimal('3.1'), Decimal('4.1')]
-
-    With *start*, *stop*, and *step*  specified the output items will match
-    the type of ``start + step``:
-
-        >>> from fractions import Fraction
-        >>> start = Fraction(1, 2)  # Start at 1/2
-        >>> stop = Fraction(5, 2)  # End at 5/2
-        >>> step = Fraction(1, 2)  # Count by 1/2
-        >>> list(numeric_range(start, stop, step))
-        [Fraction(1, 2), Fraction(1, 1), Fraction(3, 2), Fraction(2, 1)]
-
-    If *step* is zero, ``ValueError`` is raised. Negative steps are supported:
-
-        >>> list(numeric_range(3, -1, -1.0))
-        [3.0, 2.0, 1.0, 0.0]
-
-    Be aware of the limitations of floating point numbers; the representation
-    of the yielded numbers may be surprising.
-
-    ``datetime.datetime`` objects can be used for *start* and *stop*, if *step*
-    is a ``datetime.timedelta`` object:
-
-        >>> import datetime
-        >>> start = datetime.datetime(2019, 1, 1)
-        >>> stop = datetime.datetime(2019, 1, 3)
-        >>> step = datetime.timedelta(days=1)
-        >>> items = iter(numeric_range(start, stop, step))
-        >>> next(items)
-        datetime.datetime(2019, 1, 1, 0, 0)
-        >>> next(items)
-        datetime.datetime(2019, 1, 2, 0, 0)
-
-    """
-
-    _EMPTY_HASH = hash(range(0, 0))
-
-    def __init__(self, *args):
-        argc = len(args)
-        if argc == 1:
-            (self._stop,) = args
-            self._start = type(self._stop)(0)
-            self._step = type(self._stop - self._start)(1)
-        elif argc == 2:
-            self._start, self._stop = args
-            self._step = type(self._stop - self._start)(1)
-        elif argc == 3:
-            self._start, self._stop, self._step = args
-        elif argc == 0:
-            raise TypeError(
-                'numeric_range expected at least '
-                '1 argument, got {}'.format(argc)
-            )
-        else:
-            raise TypeError(
-                'numeric_range expected at most '
-                '3 arguments, got {}'.format(argc)
-            )
-
-        self._zero = type(self._step)(0)
-        if self._step == self._zero:
-            raise ValueError('numeric_range() arg 3 must not be zero')
-        self._growing = self._step > self._zero
-
-    def __bool__(self):
-        if self._growing:
-            return self._start < self._stop
-        else:
-            return self._start > self._stop
-
-    def __contains__(self, elem):
-        if self._growing:
-            if self._start <= elem < self._stop:
-                return (elem - self._start) % self._step == self._zero
-        else:
-            if self._start >= elem > self._stop:
-                return (self._start - elem) % (-self._step) == self._zero
-
-        return False
-
-    def __eq__(self, other):
-        if isinstance(other, numeric_range):
-            empty_self = not bool(self)
-            empty_other = not bool(other)
-            if empty_self or empty_other:
-                return empty_self and empty_other  # True if both empty
-            else:
-                return (
-                    self._start == other._start
-                    and self._step == other._step
-                    and self._get_by_index(-1) == other._get_by_index(-1)
-                )
-        else:
-            return False
-
-    def __getitem__(self, key):
-        if isinstance(key, int):
-            return self._get_by_index(key)
-        elif isinstance(key, slice):
-            step = self._step if key.step is None else key.step * self._step
-
-            if key.start is None or key.start <= -self._len:
-                start = self._start
-            elif key.start >= self._len:
-                start = self._stop
-            else:  # -self._len < key.start < self._len
-                start = self._get_by_index(key.start)
-
-            if key.stop is None or key.stop >= self._len:
-                stop = self._stop
-            elif key.stop <= -self._len:
-                stop = self._start
-            else:  # -self._len < key.stop < self._len
-                stop = self._get_by_index(key.stop)
-
-            return numeric_range(start, stop, step)
-        else:
-            raise TypeError(
-                'numeric range indices must be '
-                'integers or slices, not {}'.format(type(key).__name__)
-            )
-
-    def __hash__(self):
-        if self:
-            return hash((self._start, self._get_by_index(-1), self._step))
-        else:
-            return self._EMPTY_HASH
-
-    def __iter__(self):
-        values = (self._start + (n * self._step) for n in count())
-        if self._growing:
-            return takewhile(partial(gt, self._stop), values)
-        else:
-            return takewhile(partial(lt, self._stop), values)
-
-    def __len__(self):
-        return self._len
-
-    @cached_property
-    def _len(self):
-        if self._growing:
-            start = self._start
-            stop = self._stop
-            step = self._step
-        else:
-            start = self._stop
-            stop = self._start
-            step = -self._step
-        distance = stop - start
-        if distance <= self._zero:
-            return 0
-        else:  # distance > 0 and step > 0: regular euclidean division
-            q, r = divmod(distance, step)
-            return int(q) + int(r != self._zero)
-
-    def __reduce__(self):
-        return numeric_range, (self._start, self._stop, self._step)
-
-    def __repr__(self):
-        if self._step == 1:
-            return "numeric_range({}, {})".format(
-                repr(self._start), repr(self._stop)
-            )
-        else:
-            return "numeric_range({}, {}, {})".format(
-                repr(self._start), repr(self._stop), repr(self._step)
-            )
-
-    def __reversed__(self):
-        return iter(
-            numeric_range(
-                self._get_by_index(-1), self._start - self._step, -self._step
-            )
-        )
-
-    def count(self, value):
-        return int(value in self)
-
-    def index(self, value):
-        if self._growing:
-            if self._start <= value < self._stop:
-                q, r = divmod(value - self._start, self._step)
-                if r == self._zero:
-                    return int(q)
-        else:
-            if self._start >= value > self._stop:
-                q, r = divmod(self._start - value, -self._step)
-                if r == self._zero:
-                    return int(q)
-
-        raise ValueError("{} is not in numeric range".format(value))
-
-    def _get_by_index(self, i):
-        if i < 0:
-            i += self._len
-        if i < 0 or i >= self._len:
-            raise IndexError("numeric range object index out of range")
-        return self._start + i * self._step
-
-
-def count_cycle(iterable, n=None):
-    """Cycle through the items from *iterable* up to *n* times, yielding
-    the number of completed cycles along with each item. If *n* is omitted the
-    process repeats indefinitely.
-
-    >>> list(count_cycle('AB', 3))
-    [(0, 'A'), (0, 'B'), (1, 'A'), (1, 'B'), (2, 'A'), (2, 'B')]
-
-    """
-    iterable = tuple(iterable)
-    if not iterable:
-        return iter(())
-    counter = count() if n is None else range(n)
-    return ((i, item) for i in counter for item in iterable)
-
-
-def mark_ends(iterable):
-    """Yield 3-tuples of the form ``(is_first, is_last, item)``.
-
-    >>> list(mark_ends('ABC'))
-    [(True, False, 'A'), (False, False, 'B'), (False, True, 'C')]
-
-    Use this when looping over an iterable to take special action on its first
-    and/or last items:
-
-    >>> iterable = ['Header', 100, 200, 'Footer']
-    >>> total = 0
-    >>> for is_first, is_last, item in mark_ends(iterable):
-    ...     if is_first:
-    ...         continue  # Skip the header
-    ...     if is_last:
-    ...         continue  # Skip the footer
-    ...     total += item
-    >>> print(total)
-    300
-    """
-    it = iter(iterable)
-
-    try:
-        b = next(it)
-    except StopIteration:
-        return
-
-    try:
-        for i in count():
-            a = b
-            b = next(it)
-            yield i == 0, False, a
-
-    except StopIteration:
-        yield i == 0, True, a
-
-
-def locate(iterable, pred=bool, window_size=None):
-    """Yield the index of each item in *iterable* for which *pred* returns
-    ``True``.
-
-    *pred* defaults to :func:`bool`, which will select truthy items:
-
-        >>> list(locate([0, 1, 1, 0, 1, 0, 0]))
-        [1, 2, 4]
-
-    Set *pred* to a custom function to, e.g., find the indexes for a particular
-    item.
-
-        >>> list(locate(['a', 'b', 'c', 'b'], lambda x: x == 'b'))
-        [1, 3]
-
-    If *window_size* is given, then the *pred* function will be called with
-    that many items. This enables searching for sub-sequences:
-
-        >>> iterable = [0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3]
-        >>> pred = lambda *args: args == (1, 2, 3)
-        >>> list(locate(iterable, pred=pred, window_size=3))
-        [1, 5, 9]
-
-    Use with :func:`seekable` to find indexes and then retrieve the associated
-    items:
-
-        >>> from itertools import count
-        >>> from more_itertools import seekable
-        >>> source = (3 * n + 1 if (n % 2) else n // 2 for n in count())
-        >>> it = seekable(source)
-        >>> pred = lambda x: x > 100
-        >>> indexes = locate(it, pred=pred)
-        >>> i = next(indexes)
-        >>> it.seek(i)
-        >>> next(it)
-        106
-
-    """
-    if window_size is None:
-        return compress(count(), map(pred, iterable))
-
-    if window_size < 1:
-        raise ValueError('window size must be at least 1')
-
-    it = windowed(iterable, window_size, fillvalue=_marker)
-    return compress(count(), starmap(pred, it))
-
-
-def longest_common_prefix(iterables):
-    """Yield elements of the longest common prefix amongst given *iterables*.
-
-    >>> ''.join(longest_common_prefix(['abcd', 'abc', 'abf']))
-    'ab'
-
-    """
-    return (c[0] for c in takewhile(all_equal, zip(*iterables)))
-
-
-def lstrip(iterable, pred):
-    """Yield the items from *iterable*, but strip any from the beginning
-    for which *pred* returns ``True``.
-
-    For example, to remove a set of items from the start of an iterable:
-
-        >>> iterable = (None, False, None, 1, 2, None, 3, False, None)
-        >>> pred = lambda x: x in {None, False, ''}
-        >>> list(lstrip(iterable, pred))
-        [1, 2, None, 3, False, None]
-
-    This function is analogous to to :func:`str.lstrip`, and is essentially
-    an wrapper for :func:`itertools.dropwhile`.
-
-    """
-    return dropwhile(pred, iterable)
-
-
-def rstrip(iterable, pred):
-    """Yield the items from *iterable*, but strip any from the end
-    for which *pred* returns ``True``.
-
-    For example, to remove a set of items from the end of an iterable:
-
-        >>> iterable = (None, False, None, 1, 2, None, 3, False, None)
-        >>> pred = lambda x: x in {None, False, ''}
-        >>> list(rstrip(iterable, pred))
-        [None, False, None, 1, 2, None, 3]
-
-    This function is analogous to :func:`str.rstrip`.
-
-    """
-    cache = []
-    cache_append = cache.append
-    cache_clear = cache.clear
-    for x in iterable:
-        if pred(x):
-            cache_append(x)
-        else:
-            yield from cache
-            cache_clear()
-            yield x
-
-
-def strip(iterable, pred):
-    """Yield the items from *iterable*, but strip any from the
-    beginning and end for which *pred* returns ``True``.
-
-    For example, to remove a set of items from both ends of an iterable:
-
-        >>> iterable = (None, False, None, 1, 2, None, 3, False, None)
-        >>> pred = lambda x: x in {None, False, ''}
-        >>> list(strip(iterable, pred))
-        [1, 2, None, 3]
-
-    This function is analogous to :func:`str.strip`.
-
-    """
-    return rstrip(lstrip(iterable, pred), pred)
-
-
-class islice_extended:
-    """An extension of :func:`itertools.islice` that supports negative values
-    for *stop*, *start*, and *step*.
-
-        >>> iterable = iter('abcdefgh')
-        >>> list(islice_extended(iterable, -4, -1))
-        ['e', 'f', 'g']
-
-    Slices with negative values require some caching of *iterable*, but this
-    function takes care to minimize the amount of memory required.
-
-    For example, you can use a negative step with an infinite iterator:
-
-        >>> from itertools import count
-        >>> list(islice_extended(count(), 110, 99, -2))
-        [110, 108, 106, 104, 102, 100]
-
-    You can also use slice notation directly:
-
-        >>> iterable = map(str, count())
-        >>> it = islice_extended(iterable)[10:20:2]
-        >>> list(it)
-        ['10', '12', '14', '16', '18']
-
-    """
-
-    def __init__(self, iterable, *args):
-        it = iter(iterable)
-        if args:
-            self._iterable = _islice_helper(it, slice(*args))
-        else:
-            self._iterable = it
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        return next(self._iterable)
-
-    def __getitem__(self, key):
-        if isinstance(key, slice):
-            return islice_extended(_islice_helper(self._iterable, key))
-
-        raise TypeError('islice_extended.__getitem__ argument must be a slice')
-
-
-def _islice_helper(it, s):
-    start = s.start
-    stop = s.stop
-    if s.step == 0:
-        raise ValueError('step argument must be a non-zero integer or None.')
-    step = s.step or 1
-
-    if step > 0:
-        start = 0 if (start is None) else start
-
-        if start < 0:
-            # Consume all but the last -start items
-            cache = deque(enumerate(it, 1), maxlen=-start)
-            len_iter = cache[-1][0] if cache else 0
-
-            # Adjust start to be positive
-            i = max(len_iter + start, 0)
-
-            # Adjust stop to be positive
-            if stop is None:
-                j = len_iter
-            elif stop >= 0:
-                j = min(stop, len_iter)
-            else:
-                j = max(len_iter + stop, 0)
-
-            # Slice the cache
-            n = j - i
-            if n <= 0:
-                return
-
-            for index, item in islice(cache, 0, n, step):
-                yield item
-        elif (stop is not None) and (stop < 0):
-            # Advance to the start position
-            next(islice(it, start, start), None)
-
-            # When stop is negative, we have to carry -stop items while
-            # iterating
-            cache = deque(islice(it, -stop), maxlen=-stop)
-
-            for index, item in enumerate(it):
-                cached_item = cache.popleft()
-                if index % step == 0:
-                    yield cached_item
-                cache.append(item)
-        else:
-            # When both start and stop are positive we have the normal case
-            yield from islice(it, start, stop, step)
-    else:
-        start = -1 if (start is None) else start
-
-        if (stop is not None) and (stop < 0):
-            # Consume all but the last items
-            n = -stop - 1
-            cache = deque(enumerate(it, 1), maxlen=n)
-            len_iter = cache[-1][0] if cache else 0
-
-            # If start and stop are both negative they are comparable and
-            # we can just slice. Otherwise we can adjust start to be negative
-            # and then slice.
-            if start < 0:
-                i, j = start, stop
-            else:
-                i, j = min(start - len_iter, -1), None
-
-            for index, item in list(cache)[i:j:step]:
-                yield item
-        else:
-            # Advance to the stop position
-            if stop is not None:
-                m = stop + 1
-                next(islice(it, m, m), None)
-
-            # stop is positive, so if start is negative they are not comparable
-            # and we need the rest of the items.
-            if start < 0:
-                i = start
-                n = None
-            # stop is None and start is positive, so we just need items up to
-            # the start index.
-            elif stop is None:
-                i = None
-                n = start + 1
-            # Both stop and start are positive, so they are comparable.
-            else:
-                i = None
-                n = start - stop
-                if n <= 0:
-                    return
-
-            cache = list(islice(it, n))
-
-            yield from cache[i::step]
-
-
-def always_reversible(iterable):
-    """An extension of :func:`reversed` that supports all iterables, not
-    just those which implement the ``Reversible`` or ``Sequence`` protocols.
-
-        >>> print(*always_reversible(x for x in range(3)))
-        2 1 0
-
-    If the iterable is already reversible, this function returns the
-    result of :func:`reversed()`. If the iterable is not reversible,
-    this function will cache the remaining items in the iterable and
-    yield them in reverse order, which may require significant storage.
-    """
-    try:
-        return reversed(iterable)
-    except TypeError:
-        return reversed(list(iterable))
-
-
-def consecutive_groups(iterable, ordering=lambda x: x):
-    """Yield groups of consecutive items using :func:`itertools.groupby`.
-    The *ordering* function determines whether two items are adjacent by
-    returning their position.
-
-    By default, the ordering function is the identity function. This is
-    suitable for finding runs of numbers:
-
-        >>> iterable = [1, 10, 11, 12, 20, 30, 31, 32, 33, 40]
-        >>> for group in consecutive_groups(iterable):
-        ...     print(list(group))
-        [1]
-        [10, 11, 12]
-        [20]
-        [30, 31, 32, 33]
-        [40]
-
-    For finding runs of adjacent letters, try using the :meth:`index` method
-    of a string of letters:
-
-        >>> from string import ascii_lowercase
-        >>> iterable = 'abcdfgilmnop'
-        >>> ordering = ascii_lowercase.index
-        >>> for group in consecutive_groups(iterable, ordering):
-        ...     print(list(group))
-        ['a', 'b', 'c', 'd']
-        ['f', 'g']
-        ['i']
-        ['l', 'm', 'n', 'o', 'p']
-
-    Each group of consecutive items is an iterator that shares it source with
-    *iterable*. When an an output group is advanced, the previous group is
-    no longer available unless its elements are copied (e.g., into a ``list``).
-
-        >>> iterable = [1, 2, 11, 12, 21, 22]
-        >>> saved_groups = []
-        >>> for group in consecutive_groups(iterable):
-        ...     saved_groups.append(list(group))  # Copy group elements
-        >>> saved_groups
-        [[1, 2], [11, 12], [21, 22]]
-
-    """
-    for k, g in groupby(
-        enumerate(iterable), key=lambda x: x[0] - ordering(x[1])
-    ):
-        yield map(itemgetter(1), g)
-
-
-def difference(iterable, func=sub, *, initial=None):
-    """This function is the inverse of :func:`itertools.accumulate`. By default
-    it will compute the first difference of *iterable* using
-    :func:`operator.sub`:
-
-        >>> from itertools import accumulate
-        >>> iterable = accumulate([0, 1, 2, 3, 4])  # produces 0, 1, 3, 6, 10
-        >>> list(difference(iterable))
-        [0, 1, 2, 3, 4]
-
-    *func* defaults to :func:`operator.sub`, but other functions can be
-    specified. They will be applied as follows::
-
-        A, B, C, D, ... --> A, func(B, A), func(C, B), func(D, C), ...
-
-    For example, to do progressive division:
-
-        >>> iterable = [1, 2, 6, 24, 120]
-        >>> func = lambda x, y: x // y
-        >>> list(difference(iterable, func))
-        [1, 2, 3, 4, 5]
-
-    If the *initial* keyword is set, the first element will be skipped when
-    computing successive differences.
-
-        >>> it = [10, 11, 13, 16]  # from accumulate([1, 2, 3], initial=10)
-        >>> list(difference(it, initial=10))
-        [1, 2, 3]
-
-    """
-    a, b = tee(iterable)
-    try:
-        first = [next(b)]
-    except StopIteration:
-        return iter([])
-
-    if initial is not None:
-        first = []
-
-    return chain(first, map(func, b, a))
-
-
-class SequenceView(Sequence):
-    """Return a read-only view of the sequence object *target*.
-
-    :class:`SequenceView` objects are analogous to Python's built-in
-    "dictionary view" types. They provide a dynamic view of a sequence's items,
-    meaning that when the sequence updates, so does the view.
-
-        >>> seq = ['0', '1', '2']
-        >>> view = SequenceView(seq)
-        >>> view
-        SequenceView(['0', '1', '2'])
-        >>> seq.append('3')
-        >>> view
-        SequenceView(['0', '1', '2', '3'])
-
-    Sequence views support indexing, slicing, and length queries. They act
-    like the underlying sequence, except they don't allow assignment:
-
-        >>> view[1]
-        '1'
-        >>> view[1:-1]
-        ['1', '2']
-        >>> len(view)
-        4
-
-    Sequence views are useful as an alternative to copying, as they don't
-    require (much) extra storage.
-
-    """
-
-    def __init__(self, target):
-        if not isinstance(target, Sequence):
-            raise TypeError
-        self._target = target
-
-    def __getitem__(self, index):
-        return self._target[index]
-
-    def __len__(self):
-        return len(self._target)
-
-    def __repr__(self):
-        return '{}({})'.format(self.__class__.__name__, repr(self._target))
-
-
-class seekable:
-    """Wrap an iterator to allow for seeking backward and forward. This
-    progressively caches the items in the source iterable so they can be
-    re-visited.
-
-    Call :meth:`seek` with an index to seek to that position in the source
-    iterable.
-
-    To "reset" an iterator, seek to ``0``:
-
-        >>> from itertools import count
-        >>> it = seekable((str(n) for n in count()))
-        >>> next(it), next(it), next(it)
-        ('0', '1', '2')
-        >>> it.seek(0)
-        >>> next(it), next(it), next(it)
-        ('0', '1', '2')
-
-    You can also seek forward:
-
-        >>> it = seekable((str(n) for n in range(20)))
-        >>> it.seek(10)
-        >>> next(it)
-        '10'
-        >>> it.seek(20)  # Seeking past the end of the source isn't a problem
-        >>> list(it)
-        []
-        >>> it.seek(0)  # Resetting works even after hitting the end
-        >>> next(it)
-        '0'
-
-    Call :meth:`relative_seek` to seek relative to the source iterator's
-    current position.
-
-        >>> it = seekable((str(n) for n in range(20)))
-        >>> next(it), next(it), next(it)
-        ('0', '1', '2')
-        >>> it.relative_seek(2)
-        >>> next(it)
-        '5'
-        >>> it.relative_seek(-3)  # Source is at '6', we move back to '3'
-        >>> next(it)
-        '3'
-        >>> it.relative_seek(-3)  # Source is at '4', we move back to '1'
-        >>> next(it)
-        '1'
-
-
-    Call :meth:`peek` to look ahead one item without advancing the iterator:
-
-        >>> it = seekable('1234')
-        >>> it.peek()
-        '1'
-        >>> list(it)
-        ['1', '2', '3', '4']
-        >>> it.peek(default='empty')
-        'empty'
-
-    Before the iterator is at its end, calling :func:`bool` on it will return
-    ``True``. After it will return ``False``:
-
-        >>> it = seekable('5678')
-        >>> bool(it)
-        True
-        >>> list(it)
-        ['5', '6', '7', '8']
-        >>> bool(it)
-        False
-
-    You may view the contents of the cache with the :meth:`elements` method.
-    That returns a :class:`SequenceView`, a view that updates automatically:
-
-        >>> it = seekable((str(n) for n in range(10)))
-        >>> next(it), next(it), next(it)
-        ('0', '1', '2')
-        >>> elements = it.elements()
-        >>> elements
-        SequenceView(['0', '1', '2'])
-        >>> next(it)
-        '3'
-        >>> elements
-        SequenceView(['0', '1', '2', '3'])
-
-    By default, the cache grows as the source iterable progresses, so beware of
-    wrapping very large or infinite iterables. Supply *maxlen* to limit the
-    size of the cache (this of course limits how far back you can seek).
-
-        >>> from itertools import count
-        >>> it = seekable((str(n) for n in count()), maxlen=2)
-        >>> next(it), next(it), next(it), next(it)
-        ('0', '1', '2', '3')
-        >>> list(it.elements())
-        ['2', '3']
-        >>> it.seek(0)
-        >>> next(it), next(it), next(it), next(it)
-        ('2', '3', '4', '5')
-        >>> next(it)
-        '6'
-
-    """
-
-    def __init__(self, iterable, maxlen=None):
-        self._source = iter(iterable)
-        if maxlen is None:
-            self._cache = []
-        else:
-            self._cache = deque([], maxlen)
-        self._index = None
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        if self._index is not None:
-            try:
-                item = self._cache[self._index]
-            except IndexError:
-                self._index = None
-            else:
-                self._index += 1
-                return item
-
-        item = next(self._source)
-        self._cache.append(item)
-        return item
-
-    def __bool__(self):
-        try:
-            self.peek()
-        except StopIteration:
-            return False
-        return True
-
-    def peek(self, default=_marker):
-        try:
-            peeked = next(self)
-        except StopIteration:
-            if default is _marker:
-                raise
-            return default
-        if self._index is None:
-            self._index = len(self._cache)
-        self._index -= 1
-        return peeked
-
-    def elements(self):
-        return SequenceView(self._cache)
-
-    def seek(self, index):
-        self._index = index
-        remainder = index - len(self._cache)
-        if remainder > 0:
-            consume(self, remainder)
-
-    def relative_seek(self, count):
-        if self._index is None:
-            self._index = len(self._cache)
-
-        self.seek(max(self._index + count, 0))
-
-
-class run_length:
-    """
-    :func:`run_length.encode` compresses an iterable with run-length encoding.
-    It yields groups of repeated items with the count of how many times they
-    were repeated:
-
-        >>> uncompressed = 'abbcccdddd'
-        >>> list(run_length.encode(uncompressed))
-        [('a', 1), ('b', 2), ('c', 3), ('d', 4)]
-
-    :func:`run_length.decode` decompresses an iterable that was previously
-    compressed with run-length encoding. It yields the items of the
-    decompressed iterable:
-
-        >>> compressed = [('a', 1), ('b', 2), ('c', 3), ('d', 4)]
-        >>> list(run_length.decode(compressed))
-        ['a', 'b', 'b', 'c', 'c', 'c', 'd', 'd', 'd', 'd']
-
-    """
-
-    @staticmethod
-    def encode(iterable):
-        return ((k, ilen(g)) for k, g in groupby(iterable))
-
-    @staticmethod
-    def decode(iterable):
-        return chain.from_iterable(starmap(repeat, iterable))
-
-
-def exactly_n(iterable, n, predicate=bool):
-    """Return ``True`` if exactly ``n`` items in the iterable are ``True``
-    according to the *predicate* function.
-
-        >>> exactly_n([True, True, False], 2)
-        True
-        >>> exactly_n([True, True, False], 1)
-        False
-        >>> exactly_n([0, 1, 2, 3, 4, 5], 3, lambda x: x < 3)
-        True
-
-    The iterable will be advanced until ``n + 1`` truthy items are encountered,
-    so avoid calling it on infinite iterables.
-
-    """
-    return len(take(n + 1, filter(predicate, iterable))) == n
-
-
-def circular_shifts(iterable, steps=1):
-    """Yield the circular shifts of *iterable*.
-
-    >>> list(circular_shifts(range(4)))
-    [(0, 1, 2, 3), (1, 2, 3, 0), (2, 3, 0, 1), (3, 0, 1, 2)]
-
-    Set *steps* to the number of places to rotate to the left
-    (or to the right if negative).  Defaults to 1.
-
-    >>> list(circular_shifts(range(4), 2))
-    [(0, 1, 2, 3), (2, 3, 0, 1)]
-
-    >>> list(circular_shifts(range(4), -1))
-    [(0, 1, 2, 3), (3, 0, 1, 2), (2, 3, 0, 1), (1, 2, 3, 0)]
-
-    """
-    buffer = deque(iterable)
-    if steps == 0:
-        raise ValueError('Steps should be a non-zero integer')
-
-    buffer.rotate(steps)
-    steps = -steps
-    n = len(buffer)
-    n //= math.gcd(n, steps)
-
-    for __ in repeat(None, n):
-        buffer.rotate(steps)
-        yield tuple(buffer)
-
-
-def make_decorator(wrapping_func, result_index=0):
-    """Return a decorator version of *wrapping_func*, which is a function that
-    modifies an iterable. *result_index* is the position in that function's
-    signature where the iterable goes.
-
-    This lets you use itertools on the "production end," i.e. at function
-    definition. This can augment what the function returns without changing the
-    function's code.
-
-    For example, to produce a decorator version of :func:`chunked`:
-
-        >>> from more_itertools import chunked
-        >>> chunker = make_decorator(chunked, result_index=0)
-        >>> @chunker(3)
-        ... def iter_range(n):
-        ...     return iter(range(n))
-        ...
-        >>> list(iter_range(9))
-        [[0, 1, 2], [3, 4, 5], [6, 7, 8]]
-
-    To only allow truthy items to be returned:
-
-        >>> truth_serum = make_decorator(filter, result_index=1)
-        >>> @truth_serum(bool)
-        ... def boolean_test():
-        ...     return [0, 1, '', ' ', False, True]
-        ...
-        >>> list(boolean_test())
-        [1, ' ', True]
-
-    The :func:`peekable` and :func:`seekable` wrappers make for practical
-    decorators:
-
-        >>> from more_itertools import peekable
-        >>> peekable_function = make_decorator(peekable)
-        >>> @peekable_function()
-        ... def str_range(*args):
-        ...     return (str(x) for x in range(*args))
-        ...
-        >>> it = str_range(1, 20, 2)
-        >>> next(it), next(it), next(it)
-        ('1', '3', '5')
-        >>> it.peek()
-        '7'
-        >>> next(it)
-        '7'
-
-    """
-
-    # See https://sites.google.com/site/bbayles/index/decorator_factory for
-    # notes on how this works.
-    def decorator(*wrapping_args, **wrapping_kwargs):
-        def outer_wrapper(f):
-            def inner_wrapper(*args, **kwargs):
-                result = f(*args, **kwargs)
-                wrapping_args_ = list(wrapping_args)
-                wrapping_args_.insert(result_index, result)
-                return wrapping_func(*wrapping_args_, **wrapping_kwargs)
-
-            return inner_wrapper
-
-        return outer_wrapper
-
-    return decorator
-
-
-def map_reduce(iterable, keyfunc, valuefunc=None, reducefunc=None):
-    """Return a dictionary that maps the items in *iterable* to categories
-    defined by *keyfunc*, transforms them with *valuefunc*, and
-    then summarizes them by category with *reducefunc*.
-
-    *valuefunc* defaults to the identity function if it is unspecified.
-    If *reducefunc* is unspecified, no summarization takes place:
-
-        >>> keyfunc = lambda x: x.upper()
-        >>> result = map_reduce('abbccc', keyfunc)
-        >>> sorted(result.items())
-        [('A', ['a']), ('B', ['b', 'b']), ('C', ['c', 'c', 'c'])]
-
-    Specifying *valuefunc* transforms the categorized items:
-
-        >>> keyfunc = lambda x: x.upper()
-        >>> valuefunc = lambda x: 1
-        >>> result = map_reduce('abbccc', keyfunc, valuefunc)
-        >>> sorted(result.items())
-        [('A', [1]), ('B', [1, 1]), ('C', [1, 1, 1])]
-
-    Specifying *reducefunc* summarizes the categorized items:
-
-        >>> keyfunc = lambda x: x.upper()
-        >>> valuefunc = lambda x: 1
-        >>> reducefunc = sum
-        >>> result = map_reduce('abbccc', keyfunc, valuefunc, reducefunc)
-        >>> sorted(result.items())
-        [('A', 1), ('B', 2), ('C', 3)]
-
-    You may want to filter the input iterable before applying the map/reduce
-    procedure:
-
-        >>> all_items = range(30)
-        >>> items = [x for x in all_items if 10 <= x <= 20]  # Filter
-        >>> keyfunc = lambda x: x % 2  # Evens map to 0; odds to 1
-        >>> categories = map_reduce(items, keyfunc=keyfunc)
-        >>> sorted(categories.items())
-        [(0, [10, 12, 14, 16, 18, 20]), (1, [11, 13, 15, 17, 19])]
-        >>> summaries = map_reduce(items, keyfunc=keyfunc, reducefunc=sum)
-        >>> sorted(summaries.items())
-        [(0, 90), (1, 75)]
-
-    Note that all items in the iterable are gathered into a list before the
-    summarization step, which may require significant storage.
-
-    The returned object is a :obj:`collections.defaultdict` with the
-    ``default_factory`` set to ``None``, such that it behaves like a normal
-    dictionary.
-
-    """
-    valuefunc = (lambda x: x) if (valuefunc is None) else valuefunc
-
-    ret = defaultdict(list)
-    for item in iterable:
-        key = keyfunc(item)
-        value = valuefunc(item)
-        ret[key].append(value)
-
-    if reducefunc is not None:
-        for key, value_list in ret.items():
-            ret[key] = reducefunc(value_list)
-
-    ret.default_factory = None
-    return ret
-
-
-def rlocate(iterable, pred=bool, window_size=None):
-    """Yield the index of each item in *iterable* for which *pred* returns
-    ``True``, starting from the right and moving left.
-
-    *pred* defaults to :func:`bool`, which will select truthy items:
-
-        >>> list(rlocate([0, 1, 1, 0, 1, 0, 0]))  # Truthy at 1, 2, and 4
-        [4, 2, 1]
-
-    Set *pred* to a custom function to, e.g., find the indexes for a particular
-    item:
-
-        >>> iterable = iter('abcb')
-        >>> pred = lambda x: x == 'b'
-        >>> list(rlocate(iterable, pred))
-        [3, 1]
-
-    If *window_size* is given, then the *pred* function will be called with
-    that many items. This enables searching for sub-sequences:
-
-        >>> iterable = [0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3]
-        >>> pred = lambda *args: args == (1, 2, 3)
-        >>> list(rlocate(iterable, pred=pred, window_size=3))
-        [9, 5, 1]
-
-    Beware, this function won't return anything for infinite iterables.
-    If *iterable* is reversible, ``rlocate`` will reverse it and search from
-    the right. Otherwise, it will search from the left and return the results
-    in reverse order.
-
-    See :func:`locate` to for other example applications.
-
-    """
-    if window_size is None:
-        try:
-            len_iter = len(iterable)
-            return (len_iter - i - 1 for i in locate(reversed(iterable), pred))
-        except TypeError:
-            pass
-
-    return reversed(list(locate(iterable, pred, window_size)))
-
-
-def replace(iterable, pred, substitutes, count=None, window_size=1):
-    """Yield the items from *iterable*, replacing the items for which *pred*
-    returns ``True`` with the items from the iterable *substitutes*.
-
-        >>> iterable = [1, 1, 0, 1, 1, 0, 1, 1]
-        >>> pred = lambda x: x == 0
-        >>> substitutes = (2, 3)
-        >>> list(replace(iterable, pred, substitutes))
-        [1, 1, 2, 3, 1, 1, 2, 3, 1, 1]
-
-    If *count* is given, the number of replacements will be limited:
-
-        >>> iterable = [1, 1, 0, 1, 1, 0, 1, 1, 0]
-        >>> pred = lambda x: x == 0
-        >>> substitutes = [None]
-        >>> list(replace(iterable, pred, substitutes, count=2))
-        [1, 1, None, 1, 1, None, 1, 1, 0]
-
-    Use *window_size* to control the number of items passed as arguments to
-    *pred*. This allows for locating and replacing subsequences.
-
-        >>> iterable = [0, 1, 2, 5, 0, 1, 2, 5]
-        >>> window_size = 3
-        >>> pred = lambda *args: args == (0, 1, 2)  # 3 items passed to pred
-        >>> substitutes = [3, 4] # Splice in these items
-        >>> list(replace(iterable, pred, substitutes, window_size=window_size))
-        [3, 4, 5, 3, 4, 5]
-
-    """
-    if window_size < 1:
-        raise ValueError('window_size must be at least 1')
-
-    # Save the substitutes iterable, since it's used more than once
-    substitutes = tuple(substitutes)
-
-    # Add padding such that the number of windows matches the length of the
-    # iterable
-    it = chain(iterable, [_marker] * (window_size - 1))
-    windows = windowed(it, window_size)
-
-    n = 0
-    for w in windows:
-        # If the current window matches our predicate (and we haven't hit
-        # our maximum number of replacements), splice in the substitutes
-        # and then consume the following windows that overlap with this one.
-        # For example, if the iterable is (0, 1, 2, 3, 4...)
-        # and the window size is 2, we have (0, 1), (1, 2), (2, 3)...
-        # If the predicate matches on (0, 1), we need to zap (0, 1) and (1, 2)
-        if pred(*w):
-            if (count is None) or (n < count):
-                n += 1
-                yield from substitutes
-                consume(windows, window_size - 1)
-                continue
-
-        # If there was no match (or we've reached the replacement limit),
-        # yield the first item from the window.
-        if w and (w[0] is not _marker):
-            yield w[0]
-
-
-def partitions(iterable):
-    """Yield all possible order-preserving partitions of *iterable*.
-
-    >>> iterable = 'abc'
-    >>> for part in partitions(iterable):
-    ...     print([''.join(p) for p in part])
-    ['abc']
-    ['a', 'bc']
-    ['ab', 'c']
-    ['a', 'b', 'c']
-
-    This is unrelated to :func:`partition`.
-
-    """
-    sequence = list(iterable)
-    n = len(sequence)
-    for i in powerset(range(1, n)):
-        yield [sequence[i:j] for i, j in zip((0,) + i, i + (n,))]
-
-
-def set_partitions(iterable, k=None, min_size=None, max_size=None):
-    """
-    Yield the set partitions of *iterable* into *k* parts. Set partitions are
-    not order-preserving.
-
-    >>> iterable = 'abc'
-    >>> for part in set_partitions(iterable, 2):
-    ...     print([''.join(p) for p in part])
-    ['a', 'bc']
-    ['ab', 'c']
-    ['b', 'ac']
-
-
-    If *k* is not given, every set partition is generated.
-
-    >>> iterable = 'abc'
-    >>> for part in set_partitions(iterable):
-    ...     print([''.join(p) for p in part])
-    ['abc']
-    ['a', 'bc']
-    ['ab', 'c']
-    ['b', 'ac']
-    ['a', 'b', 'c']
-
-    if *min_size* and/or *max_size* are given, the minimum and/or maximum size
-    per block in partition is set.
-
-    >>> iterable = 'abc'
-    >>> for part in set_partitions(iterable, min_size=2):
-    ...     print([''.join(p) for p in part])
-    ['abc']
-    >>> for part in set_partitions(iterable, max_size=2):
-    ...     print([''.join(p) for p in part])
-    ['a', 'bc']
-    ['ab', 'c']
-    ['b', 'ac']
-    ['a', 'b', 'c']
-
-    """
-    L = list(iterable)
-    n = len(L)
-    if k is not None:
-        if k < 1:
-            raise ValueError(
-                "Can't partition in a negative or zero number of groups"
-            )
-        elif k > n:
-            return
-
-    min_size = min_size if min_size is not None else 0
-    max_size = max_size if max_size is not None else n
-    if min_size > max_size:
-        return
-
-    def set_partitions_helper(L, k):
-        n = len(L)
-        if k == 1:
-            yield [L]
-        elif n == k:
-            yield [[s] for s in L]
-        else:
-            e, *M = L
-            for p in set_partitions_helper(M, k - 1):
-                yield [[e], *p]
-            for p in set_partitions_helper(M, k):
-                for i in range(len(p)):
-                    yield p[:i] + [[e] + p[i]] + p[i + 1 :]
-
-    if k is None:
-        for k in range(1, n + 1):
-            yield from filter(
-                lambda z: all(min_size <= len(bk) <= max_size for bk in z),
-                set_partitions_helper(L, k),
-            )
-    else:
-        yield from filter(
-            lambda z: all(min_size <= len(bk) <= max_size for bk in z),
-            set_partitions_helper(L, k),
-        )
-
-
-class time_limited:
-    """
-    Yield items from *iterable* until *limit_seconds* have passed.
-    If the time limit expires before all items have been yielded, the
-    ``timed_out`` parameter will be set to ``True``.
-
-    >>> from time import sleep
-    >>> def generator():
-    ...     yield 1
-    ...     yield 2
-    ...     sleep(0.2)
-    ...     yield 3
-    >>> iterable = time_limited(0.1, generator())
-    >>> list(iterable)
-    [1, 2]
-    >>> iterable.timed_out
-    True
-
-    Note that the time is checked before each item is yielded, and iteration
-    stops if  the time elapsed is greater than *limit_seconds*. If your time
-    limit is 1 second, but it takes 2 seconds to generate the first item from
-    the iterable, the function will run for 2 seconds and not yield anything.
-    As a special case, when *limit_seconds* is zero, the iterator never
-    returns anything.
-
-    """
-
-    def __init__(self, limit_seconds, iterable):
-        if limit_seconds < 0:
-            raise ValueError('limit_seconds must be positive')
-        self.limit_seconds = limit_seconds
-        self._iterable = iter(iterable)
-        self._start_time = monotonic()
-        self.timed_out = False
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        if self.limit_seconds == 0:
-            self.timed_out = True
-            raise StopIteration
-        item = next(self._iterable)
-        if monotonic() - self._start_time > self.limit_seconds:
-            self.timed_out = True
-            raise StopIteration
-
-        return item
-
-
-def only(iterable, default=None, too_long=None):
-    """If *iterable* has only one item, return it.
-    If it has zero items, return *default*.
-    If it has more than one item, raise the exception given by *too_long*,
-    which is ``ValueError`` by default.
-
-    >>> only([], default='missing')
-    'missing'
-    >>> only([1])
-    1
-    >>> only([1, 2])  # doctest: +IGNORE_EXCEPTION_DETAIL
-    Traceback (most recent call last):
-    ...
-    ValueError: Expected exactly one item in iterable, but got 1, 2,
-     and perhaps more.'
-    >>> only([1, 2], too_long=TypeError)  # doctest: +IGNORE_EXCEPTION_DETAIL
-    Traceback (most recent call last):
-    ...
-    TypeError
-
-    Note that :func:`only` attempts to advance *iterable* twice to ensure there
-    is only one item.  See :func:`spy` or :func:`peekable` to check
-    iterable contents less destructively.
-    """
-    it = iter(iterable)
-    first_value = next(it, default)
-
-    try:
-        second_value = next(it)
-    except StopIteration:
-        pass
-    else:
-        msg = (
-            'Expected exactly one item in iterable, but got {!r}, {!r}, '
-            'and perhaps more.'.format(first_value, second_value)
-        )
-        raise too_long or ValueError(msg)
-
-    return first_value
-
-
-def _ichunk(iterable, n):
-    cache = deque()
-    chunk = islice(iterable, n)
-
-    def generator():
-        while True:
-            if cache:
-                yield cache.popleft()
-            else:
-                try:
-                    item = next(chunk)
-                except StopIteration:
-                    return
-                else:
-                    yield item
-
-    def materialize_next(n=1):
-        # if n not specified materialize everything
-        if n is None:
-            cache.extend(chunk)
-            return len(cache)
-
-        to_cache = n - len(cache)
-
-        # materialize up to n
-        if to_cache > 0:
-            cache.extend(islice(chunk, to_cache))
-
-        # return number materialized up to n
-        return min(n, len(cache))
-
-    return (generator(), materialize_next)
-
-
-def ichunked(iterable, n):
-    """Break *iterable* into sub-iterables with *n* elements each.
-    :func:`ichunked` is like :func:`chunked`, but it yields iterables
-    instead of lists.
-
-    If the sub-iterables are read in order, the elements of *iterable*
-    won't be stored in memory.
-    If they are read out of order, :func:`itertools.tee` is used to cache
-    elements as necessary.
-
-    >>> from itertools import count
-    >>> all_chunks = ichunked(count(), 4)
-    >>> c_1, c_2, c_3 = next(all_chunks), next(all_chunks), next(all_chunks)
-    >>> list(c_2)  # c_1's elements have been cached; c_3's haven't been
-    [4, 5, 6, 7]
-    >>> list(c_1)
-    [0, 1, 2, 3]
-    >>> list(c_3)
-    [8, 9, 10, 11]
-
-    """
-    iterable = iter(iterable)
-    while True:
-        # Create new chunk
-        chunk, materialize_next = _ichunk(iterable, n)
-
-        # Check to see whether we're at the end of the source iterable
-        if not materialize_next():
-            return
-
-        yield chunk
-
-        # Fill previous chunk's cache
-        materialize_next(None)
-
-
-def iequals(*iterables):
-    """Return ``True`` if all given *iterables* are equal to each other,
-    which means that they contain the same elements in the same order.
-
-    The function is useful for comparing iterables of different data types
-    or iterables that do not support equality checks.
-
-    >>> iequals("abc", ['a', 'b', 'c'], ('a', 'b', 'c'), iter("abc"))
-    True
-
-    >>> iequals("abc", "acb")
-    False
-
-    Not to be confused with :func:`all_equal`, which checks whether all
-    elements of iterable are equal to each other.
-
-    """
-    return all(map(all_equal, zip_longest(*iterables, fillvalue=object())))
-
-
-def distinct_combinations(iterable, r):
-    """Yield the distinct combinations of *r* items taken from *iterable*.
-
-        >>> list(distinct_combinations([0, 0, 1], 2))
-        [(0, 0), (0, 1)]
-
-    Equivalent to ``set(combinations(iterable))``, except duplicates are not
-    generated and thrown away. For larger input sequences this is much more
-    efficient.
-
-    """
-    if r < 0:
-        raise ValueError('r must be non-negative')
-    elif r == 0:
-        yield ()
-        return
-    pool = tuple(iterable)
-    generators = [unique_everseen(enumerate(pool), key=itemgetter(1))]
-    current_combo = [None] * r
-    level = 0
-    while generators:
-        try:
-            cur_idx, p = next(generators[-1])
-        except StopIteration:
-            generators.pop()
-            level -= 1
-            continue
-        current_combo[level] = p
-        if level + 1 == r:
-            yield tuple(current_combo)
-        else:
-            generators.append(
-                unique_everseen(
-                    enumerate(pool[cur_idx + 1 :], cur_idx + 1),
-                    key=itemgetter(1),
-                )
-            )
-            level += 1
-
-
-def filter_except(validator, iterable, *exceptions):
-    """Yield the items from *iterable* for which the *validator* function does
-    not raise one of the specified *exceptions*.
-
-    *validator* is called for each item in *iterable*.
-    It should be a function that accepts one argument and raises an exception
-    if that item is not valid.
-
-    >>> iterable = ['1', '2', 'three', '4', None]
-    >>> list(filter_except(int, iterable, ValueError, TypeError))
-    ['1', '2', '4']
-
-    If an exception other than one given by *exceptions* is raised by
-    *validator*, it is raised like normal.
-    """
-    for item in iterable:
-        try:
-            validator(item)
-        except exceptions:
-            pass
-        else:
-            yield item
-
-
-def map_except(function, iterable, *exceptions):
-    """Transform each item from *iterable* with *function* and yield the
-    result, unless *function* raises one of the specified *exceptions*.
-
-    *function* is called to transform each item in *iterable*.
-    It should accept one argument.
-
-    >>> iterable = ['1', '2', 'three', '4', None]
-    >>> list(map_except(int, iterable, ValueError, TypeError))
-    [1, 2, 4]
-
-    If an exception other than one given by *exceptions* is raised by
-    *function*, it is raised like normal.
-    """
-    for item in iterable:
-        try:
-            yield function(item)
-        except exceptions:
-            pass
-
-
-def map_if(iterable, pred, func, func_else=lambda x: x):
-    """Evaluate each item from *iterable* using *pred*. If the result is
-    equivalent to ``True``, transform the item with *func* and yield it.
-    Otherwise, transform the item with *func_else* and yield it.
-
-    *pred*, *func*, and *func_else* should each be functions that accept
-    one argument. By default, *func_else* is the identity function.
-
-    >>> from math import sqrt
-    >>> iterable = list(range(-5, 5))
-    >>> iterable
-    [-5, -4, -3, -2, -1, 0, 1, 2, 3, 4]
-    >>> list(map_if(iterable, lambda x: x > 3, lambda x: 'toobig'))
-    [-5, -4, -3, -2, -1, 0, 1, 2, 3, 'toobig']
-    >>> list(map_if(iterable, lambda x: x >= 0,
-    ... lambda x: f'{sqrt(x):.2f}', lambda x: None))
-    [None, None, None, None, None, '0.00', '1.00', '1.41', '1.73', '2.00']
-    """
-    for item in iterable:
-        yield func(item) if pred(item) else func_else(item)
-
-
-def _sample_unweighted(iterator, k, strict):
-    # Algorithm L in the 1994 paper by Kim-Hung Li:
-    # "Reservoir-Sampling Algorithms of Time Complexity O(n(1+log(N/n)))".
-
-    reservoir = list(islice(iterator, k))
-    if strict and len(reservoir) < k:
-        raise ValueError('Sample larger than population')
-    W = 1.0
-
-    with suppress(StopIteration):
-        while True:
-            W *= exp(log(random()) / k)
-            skip = floor(log(random()) / log1p(-W))
-            element = next(islice(iterator, skip, None))
-            reservoir[randrange(k)] = element
-
-    shuffle(reservoir)
-    return reservoir
-
-
-def _sample_weighted(iterator, k, weights, strict):
-    # Implementation of "A-ExpJ" from the 2006 paper by Efraimidis et al. :
-    # "Weighted random sampling with a reservoir".
-
-    # Log-transform for numerical stability for weights that are small/large
-    weight_keys = (log(random()) / weight for weight in weights)
-
-    # Fill up the reservoir (collection of samples) with the first `k`
-    # weight-keys and elements, then heapify the list.
-    reservoir = take(k, zip(weight_keys, iterator))
-    if strict and len(reservoir) < k:
-        raise ValueError('Sample larger than population')
-
-    heapify(reservoir)
-
-    # The number of jumps before changing the reservoir is a random variable
-    # with an exponential distribution. Sample it using random() and logs.
-    smallest_weight_key, _ = reservoir[0]
-    weights_to_skip = log(random()) / smallest_weight_key
-
-    for weight, element in zip(weights, iterator):
-        if weight >= weights_to_skip:
-            # The notation here is consistent with the paper, but we store
-            # the weight-keys in log-space for better numerical stability.
-            smallest_weight_key, _ = reservoir[0]
-            t_w = exp(weight * smallest_weight_key)
-            r_2 = uniform(t_w, 1)  # generate U(t_w, 1)
-            weight_key = log(r_2) / weight
-            heapreplace(reservoir, (weight_key, element))
-            smallest_weight_key, _ = reservoir[0]
-            weights_to_skip = log(random()) / smallest_weight_key
-        else:
-            weights_to_skip -= weight
-
-    ret = [element for weight_key, element in reservoir]
-    shuffle(ret)
-    return ret
-
-
-def _sample_counted(population, k, counts, strict):
-    element = None
-    remaining = 0
-
-    def feed(i):
-        # Advance *i* steps ahead and consume an element
-        nonlocal element, remaining
-
-        while i + 1 > remaining:
-            i = i - remaining
-            element = next(population)
-            remaining = next(counts)
-        remaining -= i + 1
-        return element
-
-    with suppress(StopIteration):
-        reservoir = []
-        for _ in range(k):
-            reservoir.append(feed(0))
-        if strict and len(reservoir) < k:
-            raise ValueError('Sample larger than population')
-
-        W = 1.0
-        while True:
-            W *= exp(log(random()) / k)
-            skip = floor(log(random()) / log1p(-W))
-            element = feed(skip)
-            reservoir[randrange(k)] = element
-
-    shuffle(reservoir)
-    return reservoir
-
-
-def sample(iterable, k, weights=None, *, counts=None, strict=False):
-    """Return a *k*-length list of elements chosen (without replacement)
-    from the *iterable*. Similar to :func:`random.sample`, but works on
-    iterables of unknown length.
-
-    >>> iterable = range(100)
-    >>> sample(iterable, 5)  # doctest: +SKIP
-    [81, 60, 96, 16, 4]
-
-    For iterables with repeated elements, you may supply *counts* to
-    indicate the repeats.
-
-    >>> iterable = ['a', 'b']
-    >>> counts = [3, 4]  # Equivalent to 'a', 'a', 'a', 'b', 'b', 'b', 'b'
-    >>> sample(iterable, k=3, counts=counts)  # doctest: +SKIP
-    ['a', 'a', 'b']
-
-    An iterable with *weights* may be given:
-
-    >>> iterable = range(100)
-    >>> weights = (i * i + 1 for i in range(100))
-    >>> sampled = sample(iterable, 5, weights=weights)  # doctest: +SKIP
-    [79, 67, 74, 66, 78]
-
-    Weighted selections are made without replacement.
-    After an element is selected, it is removed from the pool and the
-    relative weights of the other elements increase (this
-    does not match the behavior of :func:`random.sample`'s *counts*
-    parameter). Note that *weights* may not be used with *counts*.
-
-    If the length of *iterable* is less than *k*,
-    ``ValueError`` is raised if *strict* is ``True`` and
-    all elements are returned (in shuffled order) if *strict* is ``False``.
-
-    By default, the `Algorithm L <https://w.wiki/ANrM>`__ reservoir sampling
-    technique is used. When *weights* are provided,
-    `Algorithm A-ExpJ <https://w.wiki/ANrS>`__ is used.
-    """
-    iterator = iter(iterable)
-
-    if k < 0:
-        raise ValueError('k must be non-negative')
-
-    if k == 0:
-        return []
-
-    if weights is not None and counts is not None:
-        raise TypeError('weights and counts are mutally exclusive')
-
-    elif weights is not None:
-        weights = iter(weights)
-        return _sample_weighted(iterator, k, weights, strict)
-
-    elif counts is not None:
-        counts = iter(counts)
-        return _sample_counted(iterator, k, counts, strict)
-
-    else:
-        return _sample_unweighted(iterator, k, strict)
-
-
-def is_sorted(iterable, key=None, reverse=False, strict=False):
-    """Returns ``True`` if the items of iterable are in sorted order, and
-    ``False`` otherwise. *key* and *reverse* have the same meaning that they do
-    in the built-in :func:`sorted` function.
-
-    >>> is_sorted(['1', '2', '3', '4', '5'], key=int)
-    True
-    >>> is_sorted([5, 4, 3, 1, 2], reverse=True)
-    False
-
-    If *strict*, tests for strict sorting, that is, returns ``False`` if equal
-    elements are found:
-
-    >>> is_sorted([1, 2, 2])
-    True
-    >>> is_sorted([1, 2, 2], strict=True)
-    False
-
-    The function returns ``False`` after encountering the first out-of-order
-    item, which means it may produce results that differ from the built-in
-    :func:`sorted` function for objects with unusual comparison dynamics.
-    If there are no out-of-order items, the iterable is exhausted.
-    """
-    compare = le if strict else lt
-    it = iterable if (key is None) else map(key, iterable)
-    it_1, it_2 = tee(it)
-    next(it_2 if reverse else it_1, None)
-
-    return not any(map(compare, it_1, it_2))
-
-
-class AbortThread(BaseException):
-    pass
-
-
-class callback_iter:
-    """Convert a function that uses callbacks to an iterator.
-
-    Let *func* be a function that takes a `callback` keyword argument.
-    For example:
-
-    >>> def func(callback=None):
-    ...     for i, c in [(1, 'a'), (2, 'b'), (3, 'c')]:
-    ...         if callback:
-    ...             callback(i, c)
-    ...     return 4
-
-
-    Use ``with callback_iter(func)`` to get an iterator over the parameters
-    that are delivered to the callback.
-
-    >>> with callback_iter(func) as it:
-    ...     for args, kwargs in it:
-    ...         print(args)
-    (1, 'a')
-    (2, 'b')
-    (3, 'c')
-
-    The function will be called in a background thread. The ``done`` property
-    indicates whether it has completed execution.
-
-    >>> it.done
-    True
-
-    If it completes successfully, its return value will be available
-    in the ``result`` property.
-
-    >>> it.result
-    4
-
-    Notes:
-
-    * If the function uses some keyword argument besides ``callback``, supply
-      *callback_kwd*.
-    * If it finished executing, but raised an exception, accessing the
-      ``result`` property will raise the same exception.
-    * If it hasn't finished executing, accessing the ``result``
-      property from within the ``with`` block will raise ``RuntimeError``.
-    * If it hasn't finished executing, accessing the ``result`` property from
-      outside the ``with`` block will raise a
-      ``more_itertools.AbortThread`` exception.
-    * Provide *wait_seconds* to adjust how frequently the it is polled for
-      output.
-
-    """
-
-    def __init__(self, func, callback_kwd='callback', wait_seconds=0.1):
-        self._func = func
-        self._callback_kwd = callback_kwd
-        self._aborted = False
-        self._future = None
-        self._wait_seconds = wait_seconds
-        # Lazily import concurrent.future
-        self._executor = __import__(
-            'concurrent.futures'
-        ).futures.ThreadPoolExecutor(max_workers=1)
-        self._iterator = self._reader()
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, exc_type, exc_value, traceback):
-        self._aborted = True
-        self._executor.shutdown()
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        return next(self._iterator)
-
-    @property
-    def done(self):
-        if self._future is None:
-            return False
-        return self._future.done()
-
-    @property
-    def result(self):
-        if not self.done:
-            raise RuntimeError('Function has not yet completed')
-
-        return self._future.result()
-
-    def _reader(self):
-        q = Queue()
-
-        def callback(*args, **kwargs):
-            if self._aborted:
-                raise AbortThread('canceled by user')
-
-            q.put((args, kwargs))
-
-        self._future = self._executor.submit(
-            self._func, **{self._callback_kwd: callback}
-        )
-
-        while True:
-            try:
-                item = q.get(timeout=self._wait_seconds)
-            except Empty:
-                pass
-            else:
-                q.task_done()
-                yield item
-
-            if self._future.done():
-                break
-
-        remaining = []
-        while True:
-            try:
-                item = q.get_nowait()
-            except Empty:
-                break
-            else:
-                q.task_done()
-                remaining.append(item)
-        q.join()
-        yield from remaining
-
-
-def windowed_complete(iterable, n):
-    """
-    Yield ``(beginning, middle, end)`` tuples, where:
-
-    * Each ``middle`` has *n* items from *iterable*
-    * Each ``beginning`` has the items before the ones in ``middle``
-    * Each ``end`` has the items after the ones in ``middle``
-
-    >>> iterable = range(7)
-    >>> n = 3
-    >>> for beginning, middle, end in windowed_complete(iterable, n):
-    ...     print(beginning, middle, end)
-    () (0, 1, 2) (3, 4, 5, 6)
-    (0,) (1, 2, 3) (4, 5, 6)
-    (0, 1) (2, 3, 4) (5, 6)
-    (0, 1, 2) (3, 4, 5) (6,)
-    (0, 1, 2, 3) (4, 5, 6) ()
-
-    Note that *n* must be at least 0 and most equal to the length of
-    *iterable*.
-
-    This function will exhaust the iterable and may require significant
-    storage.
-    """
-    if n < 0:
-        raise ValueError('n must be >= 0')
-
-    seq = tuple(iterable)
-    size = len(seq)
-
-    if n > size:
-        raise ValueError('n must be <= len(seq)')
-
-    for i in range(size - n + 1):
-        beginning = seq[:i]
-        middle = seq[i : i + n]
-        end = seq[i + n :]
-        yield beginning, middle, end
-
-
-def all_unique(iterable, key=None):
-    """
-    Returns ``True`` if all the elements of *iterable* are unique (no two
-    elements are equal).
-
-        >>> all_unique('ABCB')
-        False
-
-    If a *key* function is specified, it will be used to make comparisons.
-
-        >>> all_unique('ABCb')
-        True
-        >>> all_unique('ABCb', str.lower)
-        False
-
-    The function returns as soon as the first non-unique element is
-    encountered. Iterables with a mix of hashable and unhashable items can
-    be used, but the function will be slower for unhashable items.
-    """
-    seenset = set()
-    seenset_add = seenset.add
-    seenlist = []
-    seenlist_add = seenlist.append
-    for element in map(key, iterable) if key else iterable:
-        try:
-            if element in seenset:
-                return False
-            seenset_add(element)
-        except TypeError:
-            if element in seenlist:
-                return False
-            seenlist_add(element)
-    return True
-
-
-def nth_product(index, *args):
-    """Equivalent to ``list(product(*args))[index]``.
-
-    The products of *args* can be ordered lexicographically.
-    :func:`nth_product` computes the product at sort position *index* without
-    computing the previous products.
-
-        >>> nth_product(8, range(2), range(2), range(2), range(2))
-        (1, 0, 0, 0)
-
-    ``IndexError`` will be raised if the given *index* is invalid.
-    """
-    pools = list(map(tuple, reversed(args)))
-    ns = list(map(len, pools))
-
-    c = reduce(mul, ns)
-
-    if index < 0:
-        index += c
-
-    if not 0 <= index < c:
-        raise IndexError
-
-    result = []
-    for pool, n in zip(pools, ns):
-        result.append(pool[index % n])
-        index //= n
-
-    return tuple(reversed(result))
-
-
-def nth_permutation(iterable, r, index):
-    """Equivalent to ``list(permutations(iterable, r))[index]```
-
-    The subsequences of *iterable* that are of length *r* where order is
-    important can be ordered lexicographically. :func:`nth_permutation`
-    computes the subsequence at sort position *index* directly, without
-    computing the previous subsequences.
-
-        >>> nth_permutation('ghijk', 2, 5)
-        ('h', 'i')
-
-    ``ValueError`` will be raised If *r* is negative or greater than the length
-    of *iterable*.
-    ``IndexError`` will be raised if the given *index* is invalid.
-    """
-    pool = list(iterable)
-    n = len(pool)
-
-    if r is None or r == n:
-        r, c = n, factorial(n)
-    elif not 0 <= r < n:
-        raise ValueError
-    else:
-        c = perm(n, r)
-    assert c > 0  # factortial(n)>0, and r<n so perm(n,r) is never zero
-
-    if index < 0:
-        index += c
-
-    if not 0 <= index < c:
-        raise IndexError
-
-    result = [0] * r
-    q = index * factorial(n) // c if r < n else index
-    for d in range(1, n + 1):
-        q, i = divmod(q, d)
-        if 0 <= n - d < r:
-            result[n - d] = i
-        if q == 0:
-            break
-
-    return tuple(map(pool.pop, result))
-
-
-def nth_combination_with_replacement(iterable, r, index):
-    """Equivalent to
-    ``list(combinations_with_replacement(iterable, r))[index]``.
-
-
-    The subsequences with repetition of *iterable* that are of length *r* can
-    be ordered lexicographically. :func:`nth_combination_with_replacement`
-    computes the subsequence at sort position *index* directly, without
-    computing the previous subsequences with replacement.
-
-        >>> nth_combination_with_replacement(range(5), 3, 5)
-        (0, 1, 1)
-
-    ``ValueError`` will be raised If *r* is negative or greater than the length
-    of *iterable*.
-    ``IndexError`` will be raised if the given *index* is invalid.
-    """
-    pool = tuple(iterable)
-    n = len(pool)
-    if (r < 0) or (r > n):
-        raise ValueError
-
-    c = comb(n + r - 1, r)
-
-    if index < 0:
-        index += c
-
-    if (index < 0) or (index >= c):
-        raise IndexError
-
-    result = []
-    i = 0
-    while r:
-        r -= 1
-        while n >= 0:
-            num_combs = comb(n + r - 1, r)
-            if index < num_combs:
-                break
-            n -= 1
-            i += 1
-            index -= num_combs
-        result.append(pool[i])
-
-    return tuple(result)
-
-
-def value_chain(*args):
-    """Yield all arguments passed to the function in the same order in which
-    they were passed. If an argument itself is iterable then iterate over its
-    values.
-
-        >>> list(value_chain(1, 2, 3, [4, 5, 6]))
-        [1, 2, 3, 4, 5, 6]
-
-    Binary and text strings are not considered iterable and are emitted
-    as-is:
-
-        >>> list(value_chain('12', '34', ['56', '78']))
-        ['12', '34', '56', '78']
-
-    Pre- or postpend a single element to an iterable:
-
-        >>> list(value_chain(1, [2, 3, 4, 5, 6]))
-        [1, 2, 3, 4, 5, 6]
-        >>> list(value_chain([1, 2, 3, 4, 5], 6))
-        [1, 2, 3, 4, 5, 6]
-
-    Multiple levels of nesting are not flattened.
-
-    """
-    for value in args:
-        if isinstance(value, (str, bytes)):
-            yield value
-            continue
-        try:
-            yield from value
-        except TypeError:
-            yield value
-
-
-def product_index(element, *args):
-    """Equivalent to ``list(product(*args)).index(element)``
-
-    The products of *args* can be ordered lexicographically.
-    :func:`product_index` computes the first index of *element* without
-    computing the previous products.
-
-        >>> product_index([8, 2], range(10), range(5))
-        42
-
-    ``ValueError`` will be raised if the given *element* isn't in the product
-    of *args*.
-    """
-    index = 0
-
-    for x, pool in zip_longest(element, args, fillvalue=_marker):
-        if x is _marker or pool is _marker:
-            raise ValueError('element is not a product of args')
-
-        pool = tuple(pool)
-        index = index * len(pool) + pool.index(x)
-
-    return index
-
-
-def combination_index(element, iterable):
-    """Equivalent to ``list(combinations(iterable, r)).index(element)``
-
-    The subsequences of *iterable* that are of length *r* can be ordered
-    lexicographically. :func:`combination_index` computes the index of the
-    first *element*, without computing the previous combinations.
-
-        >>> combination_index('adf', 'abcdefg')
-        10
-
-    ``ValueError`` will be raised if the given *element* isn't one of the
-    combinations of *iterable*.
-    """
-    element = enumerate(element)
-    k, y = next(element, (None, None))
-    if k is None:
-        return 0
-
-    indexes = []
-    pool = enumerate(iterable)
-    for n, x in pool:
-        if x == y:
-            indexes.append(n)
-            tmp, y = next(element, (None, None))
-            if tmp is None:
-                break
-            else:
-                k = tmp
-    else:
-        raise ValueError('element is not a combination of iterable')
-
-    n, _ = last(pool, default=(n, None))
-
-    # Python versions below 3.8 don't have math.comb
-    index = 1
-    for i, j in enumerate(reversed(indexes), start=1):
-        j = n - j
-        if i <= j:
-            index += comb(j, i)
-
-    return comb(n + 1, k + 1) - index
-
-
-def combination_with_replacement_index(element, iterable):
-    """Equivalent to
-    ``list(combinations_with_replacement(iterable, r)).index(element)``
-
-    The subsequences with repetition of *iterable* that are of length *r* can
-    be ordered lexicographically. :func:`combination_with_replacement_index`
-    computes the index of the first *element*, without computing the previous
-    combinations with replacement.
-
-        >>> combination_with_replacement_index('adf', 'abcdefg')
-        20
-
-    ``ValueError`` will be raised if the given *element* isn't one of the
-    combinations with replacement of *iterable*.
-    """
-    element = tuple(element)
-    l = len(element)
-    element = enumerate(element)
-
-    k, y = next(element, (None, None))
-    if k is None:
-        return 0
-
-    indexes = []
-    pool = tuple(iterable)
-    for n, x in enumerate(pool):
-        while x == y:
-            indexes.append(n)
-            tmp, y = next(element, (None, None))
-            if tmp is None:
-                break
-            else:
-                k = tmp
-        if y is None:
-            break
-    else:
-        raise ValueError(
-            'element is not a combination with replacement of iterable'
-        )
-
-    n = len(pool)
-    occupations = [0] * n
-    for p in indexes:
-        occupations[p] += 1
-
-    index = 0
-    cumulative_sum = 0
-    for k in range(1, n):
-        cumulative_sum += occupations[k - 1]
-        j = l + n - 1 - k - cumulative_sum
-        i = n - k
-        if i <= j:
-            index += comb(j, i)
-
-    return index
-
-
-def permutation_index(element, iterable):
-    """Equivalent to ``list(permutations(iterable, r)).index(element)```
-
-    The subsequences of *iterable* that are of length *r* where order is
-    important can be ordered lexicographically. :func:`permutation_index`
-    computes the index of the first *element* directly, without computing
-    the previous permutations.
-
-        >>> permutation_index([1, 3, 2], range(5))
-        19
-
-    ``ValueError`` will be raised if the given *element* isn't one of the
-    permutations of *iterable*.
-    """
-    index = 0
-    pool = list(iterable)
-    for i, x in zip(range(len(pool), -1, -1), element):
-        r = pool.index(x)
-        index = index * i + r
-        del pool[r]
-
-    return index
-
-
-class countable:
-    """Wrap *iterable* and keep a count of how many items have been consumed.
-
-    The ``items_seen`` attribute starts at ``0`` and increments as the iterable
-    is consumed:
-
-        >>> iterable = map(str, range(10))
-        >>> it = countable(iterable)
-        >>> it.items_seen
-        0
-        >>> next(it), next(it)
-        ('0', '1')
-        >>> list(it)
-        ['2', '3', '4', '5', '6', '7', '8', '9']
-        >>> it.items_seen
-        10
-    """
-
-    def __init__(self, iterable):
-        self._it = iter(iterable)
-        self.items_seen = 0
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        item = next(self._it)
-        self.items_seen += 1
-
-        return item
-
-
-def chunked_even(iterable, n):
-    """Break *iterable* into lists of approximately length *n*.
-    Items are distributed such the lengths of the lists differ by at most
-    1 item.
-
-    >>> iterable = [1, 2, 3, 4, 5, 6, 7]
-    >>> n = 3
-    >>> list(chunked_even(iterable, n))  # List lengths: 3, 2, 2
-    [[1, 2, 3], [4, 5], [6, 7]]
-    >>> list(chunked(iterable, n))  # List lengths: 3, 3, 1
-    [[1, 2, 3], [4, 5, 6], [7]]
-
-    """
-    iterable = iter(iterable)
-
-    # Initialize a buffer to process the chunks while keeping
-    # some back to fill any underfilled chunks
-    min_buffer = (n - 1) * (n - 2)
-    buffer = list(islice(iterable, min_buffer))
-
-    # Append items until we have a completed chunk
-    for _ in islice(map(buffer.append, iterable), n, None, n):
-        yield buffer[:n]
-        del buffer[:n]
-
-    # Check if any chunks need addition processing
-    if not buffer:
-        return
-    length = len(buffer)
-
-    # Chunks are either size `full_size <= n` or `partial_size = full_size - 1`
-    q, r = divmod(length, n)
-    num_lists = q + (1 if r > 0 else 0)
-    q, r = divmod(length, num_lists)
-    full_size = q + (1 if r > 0 else 0)
-    partial_size = full_size - 1
-    num_full = length - partial_size * num_lists
-
-    # Yield chunks of full size
-    partial_start_idx = num_full * full_size
-    if full_size > 0:
-        for i in range(0, partial_start_idx, full_size):
-            yield buffer[i : i + full_size]
-
-    # Yield chunks of partial size
-    if partial_size > 0:
-        for i in range(partial_start_idx, length, partial_size):
-            yield buffer[i : i + partial_size]
-
-
-def zip_broadcast(*objects, scalar_types=(str, bytes), strict=False):
-    """A version of :func:`zip` that "broadcasts" any scalar
-    (i.e., non-iterable) items into output tuples.
-
-    >>> iterable_1 = [1, 2, 3]
-    >>> iterable_2 = ['a', 'b', 'c']
-    >>> scalar = '_'
-    >>> list(zip_broadcast(iterable_1, iterable_2, scalar))
-    [(1, 'a', '_'), (2, 'b', '_'), (3, 'c', '_')]
-
-    The *scalar_types* keyword argument determines what types are considered
-    scalar. It is set to ``(str, bytes)`` by default. Set it to ``None`` to
-    treat strings and byte strings as iterable:
-
-    >>> list(zip_broadcast('abc', 0, 'xyz', scalar_types=None))
-    [('a', 0, 'x'), ('b', 0, 'y'), ('c', 0, 'z')]
-
-    If the *strict* keyword argument is ``True``, then
-    ``UnequalIterablesError`` will be raised if any of the iterables have
-    different lengths.
-    """
-
-    def is_scalar(obj):
-        if scalar_types and isinstance(obj, scalar_types):
-            return True
-        try:
-            iter(obj)
-        except TypeError:
-            return True
-        else:
-            return False
-
-    size = len(objects)
-    if not size:
-        return
-
-    new_item = [None] * size
-    iterables, iterable_positions = [], []
-    for i, obj in enumerate(objects):
-        if is_scalar(obj):
-            new_item[i] = obj
-        else:
-            iterables.append(iter(obj))
-            iterable_positions.append(i)
-
-    if not iterables:
-        yield tuple(objects)
-        return
-
-    zipper = _zip_equal if strict else zip
-    for item in zipper(*iterables):
-        for i, new_item[i] in zip(iterable_positions, item):
-            pass
-        yield tuple(new_item)
-
-
-def unique_in_window(iterable, n, key=None):
-    """Yield the items from *iterable* that haven't been seen recently.
-    *n* is the size of the lookback window.
-
-        >>> iterable = [0, 1, 0, 2, 3, 0]
-        >>> n = 3
-        >>> list(unique_in_window(iterable, n))
-        [0, 1, 2, 3, 0]
-
-    The *key* function, if provided, will be used to determine uniqueness:
-
-        >>> list(unique_in_window('abAcda', 3, key=lambda x: x.lower()))
-        ['a', 'b', 'c', 'd', 'a']
-
-    The items in *iterable* must be hashable.
-
-    """
-    if n <= 0:
-        raise ValueError('n must be greater than 0')
-
-    window = deque(maxlen=n)
-    counts = defaultdict(int)
-    use_key = key is not None
-
-    for item in iterable:
-        if len(window) == n:
-            to_discard = window[0]
-            if counts[to_discard] == 1:
-                del counts[to_discard]
-            else:
-                counts[to_discard] -= 1
-
-        k = key(item) if use_key else item
-        if k not in counts:
-            yield item
-        counts[k] += 1
-        window.append(k)
-
-
-def duplicates_everseen(iterable, key=None):
-    """Yield duplicate elements after their first appearance.
-
-    >>> list(duplicates_everseen('mississippi'))
-    ['s', 'i', 's', 's', 'i', 'p', 'i']
-    >>> list(duplicates_everseen('AaaBbbCccAaa', str.lower))
-    ['a', 'a', 'b', 'b', 'c', 'c', 'A', 'a', 'a']
-
-    This function is analogous to :func:`unique_everseen` and is subject to
-    the same performance considerations.
-
-    """
-    seen_set = set()
-    seen_list = []
-    use_key = key is not None
-
-    for element in iterable:
-        k = key(element) if use_key else element
-        try:
-            if k not in seen_set:
-                seen_set.add(k)
-            else:
-                yield element
-        except TypeError:
-            if k not in seen_list:
-                seen_list.append(k)
-            else:
-                yield element
-
-
-def duplicates_justseen(iterable, key=None):
-    """Yields serially-duplicate elements after their first appearance.
-
-    >>> list(duplicates_justseen('mississippi'))
-    ['s', 's', 'p']
-    >>> list(duplicates_justseen('AaaBbbCccAaa', str.lower))
-    ['a', 'a', 'b', 'b', 'c', 'c', 'a', 'a']
-
-    This function is analogous to :func:`unique_justseen`.
-
-    """
-    return flatten(g for _, g in groupby(iterable, key) for _ in g)
-
-
-def classify_unique(iterable, key=None):
-    """Classify each element in terms of its uniqueness.
-
-    For each element in the input iterable, return a 3-tuple consisting of:
-
-    1. The element itself
-    2. ``False`` if the element is equal to the one preceding it in the input,
-       ``True`` otherwise (i.e. the equivalent of :func:`unique_justseen`)
-    3. ``False`` if this element has been seen anywhere in the input before,
-       ``True`` otherwise (i.e. the equivalent of :func:`unique_everseen`)
-
-    >>> list(classify_unique('otto'))    # doctest: +NORMALIZE_WHITESPACE
-    [('o', True,  True),
-     ('t', True,  True),
-     ('t', False, False),
-     ('o', True,  False)]
-
-    This function is analogous to :func:`unique_everseen` and is subject to
-    the same performance considerations.
-
-    """
-    seen_set = set()
-    seen_list = []
-    use_key = key is not None
-    previous = None
-
-    for i, element in enumerate(iterable):
-        k = key(element) if use_key else element
-        is_unique_justseen = not i or previous != k
-        previous = k
-        is_unique_everseen = False
-        try:
-            if k not in seen_set:
-                seen_set.add(k)
-                is_unique_everseen = True
-        except TypeError:
-            if k not in seen_list:
-                seen_list.append(k)
-                is_unique_everseen = True
-        yield element, is_unique_justseen, is_unique_everseen
-
-
-def minmax(iterable_or_value, *others, key=None, default=_marker):
-    """Returns both the smallest and largest items in an iterable
-    or the largest of two or more arguments.
-
-        >>> minmax([3, 1, 5])
-        (1, 5)
-
-        >>> minmax(4, 2, 6)
-        (2, 6)
-
-    If a *key* function is provided, it will be used to transform the input
-    items for comparison.
-
-        >>> minmax([5, 30], key=str)  # '30' sorts before '5'
-        (30, 5)
-
-    If a *default* value is provided, it will be returned if there are no
-    input items.
-
-        >>> minmax([], default=(0, 0))
-        (0, 0)
-
-    Otherwise ``ValueError`` is raised.
-
-    This function is based on the
-    `recipe <http://code.activestate.com/recipes/577916/>`__ by
-    Raymond Hettinger and takes care to minimize the number of comparisons
-    performed.
-    """
-    iterable = (iterable_or_value, *others) if others else iterable_or_value
-
-    it = iter(iterable)
-
-    try:
-        lo = hi = next(it)
-    except StopIteration as exc:
-        if default is _marker:
-            raise ValueError(
-                '`minmax()` argument is an empty iterable. '
-                'Provide a `default` value to suppress this error.'
-            ) from exc
-        return default
-
-    # Different branches depending on the presence of key. This saves a lot
-    # of unimportant copies which would slow the "key=None" branch
-    # significantly down.
-    if key is None:
-        for x, y in zip_longest(it, it, fillvalue=lo):
-            if y < x:
-                x, y = y, x
-            if x < lo:
-                lo = x
-            if hi < y:
-                hi = y
-
-    else:
-        lo_key = hi_key = key(lo)
-
-        for x, y in zip_longest(it, it, fillvalue=lo):
-            x_key, y_key = key(x), key(y)
-
-            if y_key < x_key:
-                x, y, x_key, y_key = y, x, y_key, x_key
-            if x_key < lo_key:
-                lo, lo_key = x, x_key
-            if hi_key < y_key:
-                hi, hi_key = y, y_key
-
-    return lo, hi
-
-
-def constrained_batches(
-    iterable, max_size, max_count=None, get_len=len, strict=True
-):
-    """Yield batches of items from *iterable* with a combined size limited by
-    *max_size*.
-
-    >>> iterable = [b'12345', b'123', b'12345678', b'1', b'1', b'12', b'1']
-    >>> list(constrained_batches(iterable, 10))
-    [(b'12345', b'123'), (b'12345678', b'1', b'1'), (b'12', b'1')]
-
-    If a *max_count* is supplied, the number of items per batch is also
-    limited:
-
-    >>> iterable = [b'12345', b'123', b'12345678', b'1', b'1', b'12', b'1']
-    >>> list(constrained_batches(iterable, 10, max_count = 2))
-    [(b'12345', b'123'), (b'12345678', b'1'), (b'1', b'12'), (b'1',)]
-
-    If a *get_len* function is supplied, use that instead of :func:`len` to
-    determine item size.
-
-    If *strict* is ``True``, raise ``ValueError`` if any single item is bigger
-    than *max_size*. Otherwise, allow single items to exceed *max_size*.
-    """
-    if max_size <= 0:
-        raise ValueError('maximum size must be greater than zero')
-
-    batch = []
-    batch_size = 0
-    batch_count = 0
-    for item in iterable:
-        item_len = get_len(item)
-        if strict and item_len > max_size:
-            raise ValueError('item size exceeds maximum size')
-
-        reached_count = batch_count == max_count
-        reached_size = item_len + batch_size > max_size
-        if batch_count and (reached_size or reached_count):
-            yield tuple(batch)
-            batch.clear()
-            batch_size = 0
-            batch_count = 0
-
-        batch.append(item)
-        batch_size += item_len
-        batch_count += 1
-
-    if batch:
-        yield tuple(batch)
-
-
-def gray_product(*iterables):
-    """Like :func:`itertools.product`, but return tuples in an order such
-    that only one element in the generated tuple changes from one iteration
-    to the next.
-
-        >>> list(gray_product('AB','CD'))
-        [('A', 'C'), ('B', 'C'), ('B', 'D'), ('A', 'D')]
-
-    This function consumes all of the input iterables before producing output.
-    If any of the input iterables have fewer than two items, ``ValueError``
-    is raised.
-
-    For information on the algorithm, see
-    `this section <https://www-cs-faculty.stanford.edu/~knuth/fasc2a.ps.gz>`__
-    of Donald Knuth's *The Art of Computer Programming*.
-    """
-    all_iterables = tuple(tuple(x) for x in iterables)
-    iterable_count = len(all_iterables)
-    for iterable in all_iterables:
-        if len(iterable) < 2:
-            raise ValueError("each iterable must have two or more items")
-
-    # This is based on "Algorithm H" from section 7.2.1.1, page 20.
-    # a holds the indexes of the source iterables for the n-tuple to be yielded
-    # f is the array of "focus pointers"
-    # o is the array of "directions"
-    a = [0] * iterable_count
-    f = list(range(iterable_count + 1))
-    o = [1] * iterable_count
-    while True:
-        yield tuple(all_iterables[i][a[i]] for i in range(iterable_count))
-        j = f[0]
-        f[0] = 0
-        if j == iterable_count:
-            break
-        a[j] = a[j] + o[j]
-        if a[j] == 0 or a[j] == len(all_iterables[j]) - 1:
-            o[j] = -o[j]
-            f[j] = f[j + 1]
-            f[j + 1] = j + 1
-
-
-def partial_product(*iterables):
-    """Yields tuples containing one item from each iterator, with subsequent
-    tuples changing a single item at a time by advancing each iterator until it
-    is exhausted. This sequence guarantees every value in each iterable is
-    output at least once without generating all possible combinations.
-
-    This may be useful, for example, when testing an expensive function.
-
-        >>> list(partial_product('AB', 'C', 'DEF'))
-        [('A', 'C', 'D'), ('B', 'C', 'D'), ('B', 'C', 'E'), ('B', 'C', 'F')]
-    """
-
-    iterators = list(map(iter, iterables))
-
-    try:
-        prod = [next(it) for it in iterators]
-    except StopIteration:
-        return
-    yield tuple(prod)
-
-    for i, it in enumerate(iterators):
-        for prod[i] in it:
-            yield tuple(prod)
-
-
-def takewhile_inclusive(predicate, iterable):
-    """A variant of :func:`takewhile` that yields one additional element.
-
-        >>> list(takewhile_inclusive(lambda x: x < 5, [1, 4, 6, 4, 1]))
-        [1, 4, 6]
-
-    :func:`takewhile` would return ``[1, 4]``.
-    """
-    for x in iterable:
-        yield x
-        if not predicate(x):
-            break
-
-
-def outer_product(func, xs, ys, *args, **kwargs):
-    """A generalized outer product that applies a binary function to all
-    pairs of items. Returns a 2D matrix with ``len(xs)`` rows and ``len(ys)``
-    columns.
-    Also accepts ``*args`` and ``**kwargs`` that are passed to ``func``.
-
-    Multiplication table:
-
-    >>> list(outer_product(mul, range(1, 4), range(1, 6)))
-    [(1, 2, 3, 4, 5), (2, 4, 6, 8, 10), (3, 6, 9, 12, 15)]
-
-    Cross tabulation:
-
-    >>> xs = ['A', 'B', 'A', 'A', 'B', 'B', 'A', 'A', 'B', 'B']
-    >>> ys = ['X', 'X', 'X', 'Y', 'Z', 'Z', 'Y', 'Y', 'Z', 'Z']
-    >>> rows = list(zip(xs, ys))
-    >>> count_rows = lambda x, y: rows.count((x, y))
-    >>> list(outer_product(count_rows, sorted(set(xs)), sorted(set(ys))))
-    [(2, 3, 0), (1, 0, 4)]
-
-    Usage with ``*args`` and ``**kwargs``:
-
-    >>> animals = ['cat', 'wolf', 'mouse']
-    >>> list(outer_product(min, animals, animals, key=len))
-    [('cat', 'cat', 'cat'), ('cat', 'wolf', 'wolf'), ('cat', 'wolf', 'mouse')]
-    """
-    ys = tuple(ys)
-    return batched(
-        starmap(lambda x, y: func(x, y, *args, **kwargs), product(xs, ys)),
-        n=len(ys),
-    )
-
-
-def iter_suppress(iterable, *exceptions):
-    """Yield each of the items from *iterable*. If the iteration raises one of
-    the specified *exceptions*, that exception will be suppressed and iteration
-    will stop.
-
-    >>> from itertools import chain
-    >>> def breaks_at_five(x):
-    ...     while True:
-    ...         if x >= 5:
-    ...             raise RuntimeError
-    ...         yield x
-    ...         x += 1
-    >>> it_1 = iter_suppress(breaks_at_five(1), RuntimeError)
-    >>> it_2 = iter_suppress(breaks_at_five(2), RuntimeError)
-    >>> list(chain(it_1, it_2))
-    [1, 2, 3, 4, 2, 3, 4]
-    """
-    try:
-        yield from iterable
-    except exceptions:
-        return
-
-
-def filter_map(func, iterable):
-    """Apply *func* to every element of *iterable*, yielding only those which
-    are not ``None``.
-
-    >>> elems = ['1', 'a', '2', 'b', '3']
-    >>> list(filter_map(lambda s: int(s) if s.isnumeric() else None, elems))
-    [1, 2, 3]
-    """
-    for x in iterable:
-        y = func(x)
-        if y is not None:
-            yield y
-
-
-def powerset_of_sets(iterable):
-    """Yields all possible subsets of the iterable.
-
-        >>> list(powerset_of_sets([1, 2, 3]))  # doctest: +SKIP
-        [set(), {1}, {2}, {3}, {1, 2}, {1, 3}, {2, 3}, {1, 2, 3}]
-        >>> list(powerset_of_sets([1, 1, 0]))  # doctest: +SKIP
-        [set(), {1}, {0}, {0, 1}]
-
-    :func:`powerset_of_sets` takes care to minimize the number
-    of hash operations performed.
-    """
-    sets = tuple(map(set, dict.fromkeys(map(frozenset, zip(iterable)))))
-    for r in range(len(sets) + 1):
-        yield from starmap(set().union, combinations(sets, r))
-
-
-def join_mappings(**field_to_map):
-    """
-    Joins multiple mappings together using their common keys.
-
-    >>> user_scores = {'elliot': 50, 'claris': 60}
-    >>> user_times = {'elliot': 30, 'claris': 40}
-    >>> join_mappings(score=user_scores, time=user_times)
-    {'elliot': {'score': 50, 'time': 30}, 'claris': {'score': 60, 'time': 40}}
-    """
-    ret = defaultdict(dict)
-
-    for field_name, mapping in field_to_map.items():
-        for key, value in mapping.items():
-            ret[key][field_name] = value
-
-    return dict(ret)
-
-
-def _complex_sumprod(v1, v2):
-    """High precision sumprod() for complex numbers.
-    Used by :func:`dft` and :func:`idft`.
-    """
-
-    r1 = chain((p.real for p in v1), (-p.imag for p in v1))
-    r2 = chain((q.real for q in v2), (q.imag for q in v2))
-    i1 = chain((p.real for p in v1), (p.imag for p in v1))
-    i2 = chain((q.imag for q in v2), (q.real for q in v2))
-    return complex(_fsumprod(r1, r2), _fsumprod(i1, i2))
-
-
-def dft(xarr):
-    """Discrete Fourier Tranform. *xarr* is a sequence of complex numbers.
-    Yields the components of the corresponding transformed output vector.
-
-    >>> import cmath
-    >>> xarr = [1, 2-1j, -1j, -1+2j]
-    >>> Xarr = [2, -2-2j, -2j, 4+4j]
-    >>> all(map(cmath.isclose, dft(xarr), Xarr))
-    True
-
-    See :func:`idft` for the inverse Discrete Fourier Transform.
-    """
-    N = len(xarr)
-    roots_of_unity = [e ** (n / N * tau * -1j) for n in range(N)]
-    for k in range(N):
-        coeffs = [roots_of_unity[k * n % N] for n in range(N)]
-        yield _complex_sumprod(xarr, coeffs)
-
-
-def idft(Xarr):
-    """Inverse Discrete Fourier Tranform. *Xarr* is a sequence of
-    complex numbers. Yields the components of the corresponding
-    inverse-transformed output vector.
-
-    >>> import cmath
-    >>> xarr = [1, 2-1j, -1j, -1+2j]
-    >>> Xarr = [2, -2-2j, -2j, 4+4j]
-    >>> all(map(cmath.isclose, idft(Xarr), xarr))
-    True
-
-    See :func:`dft` for the Discrete Fourier Transform.
-    """
-    N = len(Xarr)
-    roots_of_unity = [e ** (n / N * tau * 1j) for n in range(N)]
-    for k in range(N):
-        coeffs = [roots_of_unity[k * n % N] for n in range(N)]
-        yield _complex_sumprod(Xarr, coeffs) / N
-
-
-def doublestarmap(func, iterable):
-    """Apply *func* to every item of *iterable* by dictionary unpacking
-    the item into *func*.
-
-    The difference between :func:`itertools.starmap` and :func:`doublestarmap`
-    parallels the distinction between ``func(*a)`` and ``func(**a)``.
-
-    >>> iterable = [{'a': 1, 'b': 2}, {'a': 40, 'b': 60}]
-    >>> list(doublestarmap(lambda a, b: a + b, iterable))
-    [3, 100]
-
-    ``TypeError`` will be raised if *func*'s signature doesn't match the
-    mapping contained in *iterable* or if *iterable* does not contain mappings.
-    """
-    for item in iterable:
-        yield func(**item)
diff --git a/lib/more_itertools/more.pyi b/lib/more_itertools/more.pyi
deleted file mode 100644
index f1a155dc..00000000
--- a/lib/more_itertools/more.pyi
+++ /dev/null
@@ -1,815 +0,0 @@
-"""Stubs for more_itertools.more"""
-
-from __future__ import annotations
-
-import sys
-
-from types import TracebackType
-from typing import (
-    Any,
-    Callable,
-    Container,
-    ContextManager,
-    Generic,
-    Hashable,
-    Mapping,
-    Iterable,
-    Iterator,
-    Mapping,
-    overload,
-    Reversible,
-    Sequence,
-    Sized,
-    Type,
-    TypeVar,
-    type_check_only,
-)
-from typing_extensions import Protocol
-
-# Type and type variable definitions
-_T = TypeVar('_T')
-_T1 = TypeVar('_T1')
-_T2 = TypeVar('_T2')
-_T3 = TypeVar('_T3')
-_T4 = TypeVar('_T4')
-_T5 = TypeVar('_T5')
-_U = TypeVar('_U')
-_V = TypeVar('_V')
-_W = TypeVar('_W')
-_T_co = TypeVar('_T_co', covariant=True)
-_GenFn = TypeVar('_GenFn', bound=Callable[..., Iterator[Any]])
-_Raisable = BaseException | Type[BaseException]
-
-# The type of isinstance's second argument (from typeshed builtins)
-if sys.version_info >= (3, 10):
-    _ClassInfo = type | UnionType | tuple[_ClassInfo, ...]
-else:
-    _ClassInfo = type | tuple[_ClassInfo, ...]
-
-@type_check_only
-class _SizedIterable(Protocol[_T_co], Sized, Iterable[_T_co]): ...
-
-@type_check_only
-class _SizedReversible(Protocol[_T_co], Sized, Reversible[_T_co]): ...
-
-@type_check_only
-class _SupportsSlicing(Protocol[_T_co]):
-    def __getitem__(self, __k: slice) -> _T_co: ...
-
-def chunked(
-    iterable: Iterable[_T], n: int | None, strict: bool = ...
-) -> Iterator[list[_T]]: ...
-@overload
-def first(iterable: Iterable[_T]) -> _T: ...
-@overload
-def first(iterable: Iterable[_T], default: _U) -> _T | _U: ...
-@overload
-def last(iterable: Iterable[_T]) -> _T: ...
-@overload
-def last(iterable: Iterable[_T], default: _U) -> _T | _U: ...
-@overload
-def nth_or_last(iterable: Iterable[_T], n: int) -> _T: ...
-@overload
-def nth_or_last(iterable: Iterable[_T], n: int, default: _U) -> _T | _U: ...
-
-class peekable(Generic[_T], Iterator[_T]):
-    def __init__(self, iterable: Iterable[_T]) -> None: ...
-    def __iter__(self) -> peekable[_T]: ...
-    def __bool__(self) -> bool: ...
-    @overload
-    def peek(self) -> _T: ...
-    @overload
-    def peek(self, default: _U) -> _T | _U: ...
-    def prepend(self, *items: _T) -> None: ...
-    def __next__(self) -> _T: ...
-    @overload
-    def __getitem__(self, index: int) -> _T: ...
-    @overload
-    def __getitem__(self, index: slice) -> list[_T]: ...
-
-def consumer(func: _GenFn) -> _GenFn: ...
-def ilen(iterable: Iterable[_T]) -> int: ...
-def iterate(func: Callable[[_T], _T], start: _T) -> Iterator[_T]: ...
-def with_iter(
-    context_manager: ContextManager[Iterable[_T]],
-) -> Iterator[_T]: ...
-def one(
-    iterable: Iterable[_T],
-    too_short: _Raisable | None = ...,
-    too_long: _Raisable | None = ...,
-) -> _T: ...
-def raise_(exception: _Raisable, *args: Any) -> None: ...
-def strictly_n(
-    iterable: Iterable[_T],
-    n: int,
-    too_short: _GenFn | None = ...,
-    too_long: _GenFn | None = ...,
-) -> list[_T]: ...
-def distinct_permutations(
-    iterable: Iterable[_T], r: int | None = ...
-) -> Iterator[tuple[_T, ...]]: ...
-def intersperse(
-    e: _U, iterable: Iterable[_T], n: int = ...
-) -> Iterator[_T | _U]: ...
-def unique_to_each(*iterables: Iterable[_T]) -> list[list[_T]]: ...
-@overload
-def windowed(
-    seq: Iterable[_T], n: int, *, step: int = ...
-) -> Iterator[tuple[_T | None, ...]]: ...
-@overload
-def windowed(
-    seq: Iterable[_T], n: int, fillvalue: _U, step: int = ...
-) -> Iterator[tuple[_T | _U, ...]]: ...
-def substrings(iterable: Iterable[_T]) -> Iterator[tuple[_T, ...]]: ...
-def substrings_indexes(
-    seq: Sequence[_T], reverse: bool = ...
-) -> Iterator[tuple[Sequence[_T], int, int]]: ...
-
-class bucket(Generic[_T, _U], Container[_U]):
-    def __init__(
-        self,
-        iterable: Iterable[_T],
-        key: Callable[[_T], _U],
-        validator: Callable[[_U], object] | None = ...,
-    ) -> None: ...
-    def __contains__(self, value: object) -> bool: ...
-    def __iter__(self) -> Iterator[_U]: ...
-    def __getitem__(self, value: object) -> Iterator[_T]: ...
-
-def spy(
-    iterable: Iterable[_T], n: int = ...
-) -> tuple[list[_T], Iterator[_T]]: ...
-def interleave(*iterables: Iterable[_T]) -> Iterator[_T]: ...
-def interleave_longest(*iterables: Iterable[_T]) -> Iterator[_T]: ...
-def interleave_evenly(
-    iterables: list[Iterable[_T]], lengths: list[int] | None = ...
-) -> Iterator[_T]: ...
-def collapse(
-    iterable: Iterable[Any],
-    base_type: _ClassInfo | None = ...,
-    levels: int | None = ...,
-) -> Iterator[Any]: ...
-@overload
-def side_effect(
-    func: Callable[[_T], object],
-    iterable: Iterable[_T],
-    chunk_size: None = ...,
-    before: Callable[[], object] | None = ...,
-    after: Callable[[], object] | None = ...,
-) -> Iterator[_T]: ...
-@overload
-def side_effect(
-    func: Callable[[list[_T]], object],
-    iterable: Iterable[_T],
-    chunk_size: int,
-    before: Callable[[], object] | None = ...,
-    after: Callable[[], object] | None = ...,
-) -> Iterator[_T]: ...
-def sliced(
-    seq: _SupportsSlicing[_T], n: int, strict: bool = ...
-) -> Iterator[_T]: ...
-def split_at(
-    iterable: Iterable[_T],
-    pred: Callable[[_T], object],
-    maxsplit: int = ...,
-    keep_separator: bool = ...,
-) -> Iterator[list[_T]]: ...
-def split_before(
-    iterable: Iterable[_T], pred: Callable[[_T], object], maxsplit: int = ...
-) -> Iterator[list[_T]]: ...
-def split_after(
-    iterable: Iterable[_T], pred: Callable[[_T], object], maxsplit: int = ...
-) -> Iterator[list[_T]]: ...
-def split_when(
-    iterable: Iterable[_T],
-    pred: Callable[[_T, _T], object],
-    maxsplit: int = ...,
-) -> Iterator[list[_T]]: ...
-def split_into(
-    iterable: Iterable[_T], sizes: Iterable[int | None]
-) -> Iterator[list[_T]]: ...
-@overload
-def padded(
-    iterable: Iterable[_T],
-    *,
-    n: int | None = ...,
-    next_multiple: bool = ...,
-) -> Iterator[_T | None]: ...
-@overload
-def padded(
-    iterable: Iterable[_T],
-    fillvalue: _U,
-    n: int | None = ...,
-    next_multiple: bool = ...,
-) -> Iterator[_T | _U]: ...
-@overload
-def repeat_last(iterable: Iterable[_T]) -> Iterator[_T]: ...
-@overload
-def repeat_last(iterable: Iterable[_T], default: _U) -> Iterator[_T | _U]: ...
-def distribute(n: int, iterable: Iterable[_T]) -> list[Iterator[_T]]: ...
-@overload
-def stagger(
-    iterable: Iterable[_T],
-    offsets: _SizedIterable[int] = ...,
-    longest: bool = ...,
-) -> Iterator[tuple[_T | None, ...]]: ...
-@overload
-def stagger(
-    iterable: Iterable[_T],
-    offsets: _SizedIterable[int] = ...,
-    longest: bool = ...,
-    fillvalue: _U = ...,
-) -> Iterator[tuple[_T | _U, ...]]: ...
-
-class UnequalIterablesError(ValueError):
-    def __init__(self, details: tuple[int, int, int] | None = ...) -> None: ...
-
-# zip_equal
-@overload
-def zip_equal(__iter1: Iterable[_T1]) -> Iterator[tuple[_T1]]: ...
-@overload
-def zip_equal(
-    __iter1: Iterable[_T1], __iter2: Iterable[_T2]
-) -> Iterator[tuple[_T1, _T2]]: ...
-@overload
-def zip_equal(
-    __iter1: Iterable[_T1], __iter2: Iterable[_T2], __iter3: Iterable[_T3]
-) -> Iterator[tuple[_T1, _T2, _T3]]: ...
-@overload
-def zip_equal(
-    __iter1: Iterable[_T1],
-    __iter2: Iterable[_T2],
-    __iter3: Iterable[_T3],
-    __iter4: Iterable[_T4],
-) -> Iterator[tuple[_T1, _T2, _T3, _T4]]: ...
-@overload
-def zip_equal(
-    __iter1: Iterable[_T1],
-    __iter2: Iterable[_T2],
-    __iter3: Iterable[_T3],
-    __iter4: Iterable[_T4],
-    __iter5: Iterable[_T5],
-) -> Iterator[tuple[_T1, _T2, _T3, _T4, _T5]]: ...
-@overload
-def zip_equal(
-    __iter1: Iterable[Any],
-    __iter2: Iterable[Any],
-    __iter3: Iterable[Any],
-    __iter4: Iterable[Any],
-    __iter5: Iterable[Any],
-    __iter6: Iterable[Any],
-    *iterables: Iterable[Any],
-) -> Iterator[tuple[Any, ...]]: ...
-
-# zip_offset
-@overload
-def zip_offset(
-    __iter1: Iterable[_T1],
-    *,
-    offsets: _SizedIterable[int],
-    longest: bool = ...,
-    fillvalue: None = None,
-) -> Iterator[tuple[_T1 | None]]: ...
-@overload
-def zip_offset(
-    __iter1: Iterable[_T1],
-    __iter2: Iterable[_T2],
-    *,
-    offsets: _SizedIterable[int],
-    longest: bool = ...,
-    fillvalue: None = None,
-) -> Iterator[tuple[_T1 | None, _T2 | None]]: ...
-@overload
-def zip_offset(
-    __iter1: Iterable[_T],
-    __iter2: Iterable[_T],
-    __iter3: Iterable[_T],
-    *iterables: Iterable[_T],
-    offsets: _SizedIterable[int],
-    longest: bool = ...,
-    fillvalue: None = None,
-) -> Iterator[tuple[_T | None, ...]]: ...
-@overload
-def zip_offset(
-    __iter1: Iterable[_T1],
-    *,
-    offsets: _SizedIterable[int],
-    longest: bool = ...,
-    fillvalue: _U,
-) -> Iterator[tuple[_T1 | _U]]: ...
-@overload
-def zip_offset(
-    __iter1: Iterable[_T1],
-    __iter2: Iterable[_T2],
-    *,
-    offsets: _SizedIterable[int],
-    longest: bool = ...,
-    fillvalue: _U,
-) -> Iterator[tuple[_T1 | _U, _T2 | _U]]: ...
-@overload
-def zip_offset(
-    __iter1: Iterable[_T],
-    __iter2: Iterable[_T],
-    __iter3: Iterable[_T],
-    *iterables: Iterable[_T],
-    offsets: _SizedIterable[int],
-    longest: bool = ...,
-    fillvalue: _U,
-) -> Iterator[tuple[_T | _U, ...]]: ...
-def sort_together(
-    iterables: Iterable[Iterable[_T]],
-    key_list: Iterable[int] = ...,
-    key: Callable[..., Any] | None = ...,
-    reverse: bool = ...,
-    strict: bool = ...,
-) -> list[tuple[_T, ...]]: ...
-def unzip(iterable: Iterable[Sequence[_T]]) -> tuple[Iterator[_T], ...]: ...
-def divide(n: int, iterable: Iterable[_T]) -> list[Iterator[_T]]: ...
-def always_iterable(
-    obj: object,
-    base_type: _ClassInfo | None = ...,
-) -> Iterator[Any]: ...
-def adjacent(
-    predicate: Callable[[_T], bool],
-    iterable: Iterable[_T],
-    distance: int = ...,
-) -> Iterator[tuple[bool, _T]]: ...
-@overload
-def groupby_transform(
-    iterable: Iterable[_T],
-    keyfunc: None = None,
-    valuefunc: None = None,
-    reducefunc: None = None,
-) -> Iterator[tuple[_T, Iterator[_T]]]: ...
-@overload
-def groupby_transform(
-    iterable: Iterable[_T],
-    keyfunc: Callable[[_T], _U],
-    valuefunc: None,
-    reducefunc: None,
-) -> Iterator[tuple[_U, Iterator[_T]]]: ...
-@overload
-def groupby_transform(
-    iterable: Iterable[_T],
-    keyfunc: None,
-    valuefunc: Callable[[_T], _V],
-    reducefunc: None,
-) -> Iterable[tuple[_T, Iterable[_V]]]: ...
-@overload
-def groupby_transform(
-    iterable: Iterable[_T],
-    keyfunc: Callable[[_T], _U],
-    valuefunc: Callable[[_T], _V],
-    reducefunc: None,
-) -> Iterable[tuple[_U, Iterator[_V]]]: ...
-@overload
-def groupby_transform(
-    iterable: Iterable[_T],
-    keyfunc: None,
-    valuefunc: None,
-    reducefunc: Callable[[Iterator[_T]], _W],
-) -> Iterable[tuple[_T, _W]]: ...
-@overload
-def groupby_transform(
-    iterable: Iterable[_T],
-    keyfunc: Callable[[_T], _U],
-    valuefunc: None,
-    reducefunc: Callable[[Iterator[_T]], _W],
-) -> Iterable[tuple[_U, _W]]: ...
-@overload
-def groupby_transform(
-    iterable: Iterable[_T],
-    keyfunc: None,
-    valuefunc: Callable[[_T], _V],
-    reducefunc: Callable[[Iterable[_V]], _W],
-) -> Iterable[tuple[_T, _W]]: ...
-@overload
-def groupby_transform(
-    iterable: Iterable[_T],
-    keyfunc: Callable[[_T], _U],
-    valuefunc: Callable[[_T], _V],
-    reducefunc: Callable[[Iterable[_V]], _W],
-) -> Iterable[tuple[_U, _W]]: ...
-
-class numeric_range(Generic[_T, _U], Sequence[_T], Hashable, Reversible[_T]):
-    @overload
-    def __init__(self, __stop: _T) -> None: ...
-    @overload
-    def __init__(self, __start: _T, __stop: _T) -> None: ...
-    @overload
-    def __init__(self, __start: _T, __stop: _T, __step: _U) -> None: ...
-    def __bool__(self) -> bool: ...
-    def __contains__(self, elem: object) -> bool: ...
-    def __eq__(self, other: object) -> bool: ...
-    @overload
-    def __getitem__(self, key: int) -> _T: ...
-    @overload
-    def __getitem__(self, key: slice) -> numeric_range[_T, _U]: ...
-    def __hash__(self) -> int: ...
-    def __iter__(self) -> Iterator[_T]: ...
-    def __len__(self) -> int: ...
-    def __reduce__(
-        self,
-    ) -> tuple[Type[numeric_range[_T, _U]], tuple[_T, _T, _U]]: ...
-    def __repr__(self) -> str: ...
-    def __reversed__(self) -> Iterator[_T]: ...
-    def count(self, value: _T) -> int: ...
-    def index(self, value: _T) -> int: ...  # type: ignore
-
-def count_cycle(
-    iterable: Iterable[_T], n: int | None = ...
-) -> Iterable[tuple[int, _T]]: ...
-def mark_ends(
-    iterable: Iterable[_T],
-) -> Iterable[tuple[bool, bool, _T]]: ...
-def locate(
-    iterable: Iterable[_T],
-    pred: Callable[..., Any] = ...,
-    window_size: int | None = ...,
-) -> Iterator[int]: ...
-def lstrip(
-    iterable: Iterable[_T], pred: Callable[[_T], object]
-) -> Iterator[_T]: ...
-def rstrip(
-    iterable: Iterable[_T], pred: Callable[[_T], object]
-) -> Iterator[_T]: ...
-def strip(
-    iterable: Iterable[_T], pred: Callable[[_T], object]
-) -> Iterator[_T]: ...
-
-class islice_extended(Generic[_T], Iterator[_T]):
-    def __init__(self, iterable: Iterable[_T], *args: int | None) -> None: ...
-    def __iter__(self) -> islice_extended[_T]: ...
-    def __next__(self) -> _T: ...
-    def __getitem__(self, index: slice) -> islice_extended[_T]: ...
-
-def always_reversible(iterable: Iterable[_T]) -> Iterator[_T]: ...
-def consecutive_groups(
-    iterable: Iterable[_T], ordering: Callable[[_T], int] = ...
-) -> Iterator[Iterator[_T]]: ...
-@overload
-def difference(
-    iterable: Iterable[_T],
-    func: Callable[[_T, _T], _U] = ...,
-    *,
-    initial: None = ...,
-) -> Iterator[_T | _U]: ...
-@overload
-def difference(
-    iterable: Iterable[_T], func: Callable[[_T, _T], _U] = ..., *, initial: _U
-) -> Iterator[_U]: ...
-
-class SequenceView(Generic[_T], Sequence[_T]):
-    def __init__(self, target: Sequence[_T]) -> None: ...
-    @overload
-    def __getitem__(self, index: int) -> _T: ...
-    @overload
-    def __getitem__(self, index: slice) -> Sequence[_T]: ...
-    def __len__(self) -> int: ...
-
-class seekable(Generic[_T], Iterator[_T]):
-    def __init__(
-        self, iterable: Iterable[_T], maxlen: int | None = ...
-    ) -> None: ...
-    def __iter__(self) -> seekable[_T]: ...
-    def __next__(self) -> _T: ...
-    def __bool__(self) -> bool: ...
-    @overload
-    def peek(self) -> _T: ...
-    @overload
-    def peek(self, default: _U) -> _T | _U: ...
-    def elements(self) -> SequenceView[_T]: ...
-    def seek(self, index: int) -> None: ...
-    def relative_seek(self, count: int) -> None: ...
-
-class run_length:
-    @staticmethod
-    def encode(iterable: Iterable[_T]) -> Iterator[tuple[_T, int]]: ...
-    @staticmethod
-    def decode(iterable: Iterable[tuple[_T, int]]) -> Iterator[_T]: ...
-
-def exactly_n(
-    iterable: Iterable[_T], n: int, predicate: Callable[[_T], object] = ...
-) -> bool: ...
-def circular_shifts(
-    iterable: Iterable[_T], steps: int = 1
-) -> list[tuple[_T, ...]]: ...
-def make_decorator(
-    wrapping_func: Callable[..., _U], result_index: int = ...
-) -> Callable[..., Callable[[Callable[..., Any]], Callable[..., _U]]]: ...
-@overload
-def map_reduce(
-    iterable: Iterable[_T],
-    keyfunc: Callable[[_T], _U],
-    valuefunc: None = ...,
-    reducefunc: None = ...,
-) -> dict[_U, list[_T]]: ...
-@overload
-def map_reduce(
-    iterable: Iterable[_T],
-    keyfunc: Callable[[_T], _U],
-    valuefunc: Callable[[_T], _V],
-    reducefunc: None = ...,
-) -> dict[_U, list[_V]]: ...
-@overload
-def map_reduce(
-    iterable: Iterable[_T],
-    keyfunc: Callable[[_T], _U],
-    valuefunc: None = ...,
-    reducefunc: Callable[[list[_T]], _W] = ...,
-) -> dict[_U, _W]: ...
-@overload
-def map_reduce(
-    iterable: Iterable[_T],
-    keyfunc: Callable[[_T], _U],
-    valuefunc: Callable[[_T], _V],
-    reducefunc: Callable[[list[_V]], _W],
-) -> dict[_U, _W]: ...
-def rlocate(
-    iterable: Iterable[_T],
-    pred: Callable[..., object] = ...,
-    window_size: int | None = ...,
-) -> Iterator[int]: ...
-def replace(
-    iterable: Iterable[_T],
-    pred: Callable[..., object],
-    substitutes: Iterable[_U],
-    count: int | None = ...,
-    window_size: int = ...,
-) -> Iterator[_T | _U]: ...
-def partitions(iterable: Iterable[_T]) -> Iterator[list[list[_T]]]: ...
-def set_partitions(
-    iterable: Iterable[_T],
-    k: int | None = ...,
-    min_size: int | None = ...,
-    max_size: int | None = ...,
-) -> Iterator[list[list[_T]]]: ...
-
-class time_limited(Generic[_T], Iterator[_T]):
-    def __init__(
-        self, limit_seconds: float, iterable: Iterable[_T]
-    ) -> None: ...
-    def __iter__(self) -> islice_extended[_T]: ...
-    def __next__(self) -> _T: ...
-
-@overload
-def only(
-    iterable: Iterable[_T], *, too_long: _Raisable | None = ...
-) -> _T | None: ...
-@overload
-def only(
-    iterable: Iterable[_T], default: _U, too_long: _Raisable | None = ...
-) -> _T | _U: ...
-def ichunked(iterable: Iterable[_T], n: int) -> Iterator[Iterator[_T]]: ...
-def distinct_combinations(
-    iterable: Iterable[_T], r: int
-) -> Iterator[tuple[_T, ...]]: ...
-def filter_except(
-    validator: Callable[[Any], object],
-    iterable: Iterable[_T],
-    *exceptions: Type[BaseException],
-) -> Iterator[_T]: ...
-def map_except(
-    function: Callable[[Any], _U],
-    iterable: Iterable[_T],
-    *exceptions: Type[BaseException],
-) -> Iterator[_U]: ...
-def map_if(
-    iterable: Iterable[Any],
-    pred: Callable[[Any], bool],
-    func: Callable[[Any], Any],
-    func_else: Callable[[Any], Any] | None = ...,
-) -> Iterator[Any]: ...
-def _sample_unweighted(
-    iterator: Iterator[_T], k: int, strict: bool
-) -> list[_T]: ...
-def _sample_counted(
-    population: Iterator[_T], k: int, counts: Iterable[int], strict: bool
-) -> list[_T]: ...
-def _sample_weighted(
-    iterator: Iterator[_T], k: int, weights, strict
-) -> list[_T]: ...
-def sample(
-    iterable: Iterable[_T],
-    k: int,
-    weights: Iterable[float] | None = ...,
-    *,
-    counts: Iterable[int] | None = ...,
-    strict: bool = False,
-) -> list[_T]: ...
-def is_sorted(
-    iterable: Iterable[_T],
-    key: Callable[[_T], _U] | None = ...,
-    reverse: bool = False,
-    strict: bool = False,
-) -> bool: ...
-
-class AbortThread(BaseException):
-    pass
-
-class callback_iter(Generic[_T], Iterator[_T]):
-    def __init__(
-        self,
-        func: Callable[..., Any],
-        callback_kwd: str = ...,
-        wait_seconds: float = ...,
-    ) -> None: ...
-    def __enter__(self) -> callback_iter[_T]: ...
-    def __exit__(
-        self,
-        exc_type: Type[BaseException] | None,
-        exc_value: BaseException | None,
-        traceback: TracebackType | None,
-    ) -> bool | None: ...
-    def __iter__(self) -> callback_iter[_T]: ...
-    def __next__(self) -> _T: ...
-    def _reader(self) -> Iterator[_T]: ...
-    @property
-    def done(self) -> bool: ...
-    @property
-    def result(self) -> Any: ...
-
-def windowed_complete(
-    iterable: Iterable[_T], n: int
-) -> Iterator[tuple[tuple[_T, ...], tuple[_T, ...], tuple[_T, ...]]]: ...
-def all_unique(
-    iterable: Iterable[_T], key: Callable[[_T], _U] | None = ...
-) -> bool: ...
-def nth_product(index: int, *args: Iterable[_T]) -> tuple[_T, ...]: ...
-def nth_combination_with_replacement(
-    iterable: Iterable[_T], r: int, index: int
-) -> tuple[_T, ...]: ...
-def nth_permutation(
-    iterable: Iterable[_T], r: int, index: int
-) -> tuple[_T, ...]: ...
-def value_chain(*args: _T | Iterable[_T]) -> Iterable[_T]: ...
-def product_index(element: Iterable[_T], *args: Iterable[_T]) -> int: ...
-def combination_index(
-    element: Iterable[_T], iterable: Iterable[_T]
-) -> int: ...
-def combination_with_replacement_index(
-    element: Iterable[_T], iterable: Iterable[_T]
-) -> int: ...
-def permutation_index(
-    element: Iterable[_T], iterable: Iterable[_T]
-) -> int: ...
-def repeat_each(iterable: Iterable[_T], n: int = ...) -> Iterator[_T]: ...
-
-class countable(Generic[_T], Iterator[_T]):
-    def __init__(self, iterable: Iterable[_T]) -> None: ...
-    def __iter__(self) -> countable[_T]: ...
-    def __next__(self) -> _T: ...
-    items_seen: int
-
-def chunked_even(iterable: Iterable[_T], n: int) -> Iterator[list[_T]]: ...
-@overload
-def zip_broadcast(
-    __obj1: _T | Iterable[_T],
-    *,
-    scalar_types: _ClassInfo | None = ...,
-    strict: bool = ...,
-) -> Iterable[tuple[_T, ...]]: ...
-@overload
-def zip_broadcast(
-    __obj1: _T | Iterable[_T],
-    __obj2: _T | Iterable[_T],
-    *,
-    scalar_types: _ClassInfo | None = ...,
-    strict: bool = ...,
-) -> Iterable[tuple[_T, ...]]: ...
-@overload
-def zip_broadcast(
-    __obj1: _T | Iterable[_T],
-    __obj2: _T | Iterable[_T],
-    __obj3: _T | Iterable[_T],
-    *,
-    scalar_types: _ClassInfo | None = ...,
-    strict: bool = ...,
-) -> Iterable[tuple[_T, ...]]: ...
-@overload
-def zip_broadcast(
-    __obj1: _T | Iterable[_T],
-    __obj2: _T | Iterable[_T],
-    __obj3: _T | Iterable[_T],
-    __obj4: _T | Iterable[_T],
-    *,
-    scalar_types: _ClassInfo | None = ...,
-    strict: bool = ...,
-) -> Iterable[tuple[_T, ...]]: ...
-@overload
-def zip_broadcast(
-    __obj1: _T | Iterable[_T],
-    __obj2: _T | Iterable[_T],
-    __obj3: _T | Iterable[_T],
-    __obj4: _T | Iterable[_T],
-    __obj5: _T | Iterable[_T],
-    *,
-    scalar_types: _ClassInfo | None = ...,
-    strict: bool = ...,
-) -> Iterable[tuple[_T, ...]]: ...
-@overload
-def zip_broadcast(
-    __obj1: _T | Iterable[_T],
-    __obj2: _T | Iterable[_T],
-    __obj3: _T | Iterable[_T],
-    __obj4: _T | Iterable[_T],
-    __obj5: _T | Iterable[_T],
-    __obj6: _T | Iterable[_T],
-    *objects: _T | Iterable[_T],
-    scalar_types: _ClassInfo | None = ...,
-    strict: bool = ...,
-) -> Iterable[tuple[_T, ...]]: ...
-def unique_in_window(
-    iterable: Iterable[_T], n: int, key: Callable[[_T], _U] | None = ...
-) -> Iterator[_T]: ...
-def duplicates_everseen(
-    iterable: Iterable[_T], key: Callable[[_T], _U] | None = ...
-) -> Iterator[_T]: ...
-def duplicates_justseen(
-    iterable: Iterable[_T], key: Callable[[_T], _U] | None = ...
-) -> Iterator[_T]: ...
-def classify_unique(
-    iterable: Iterable[_T], key: Callable[[_T], _U] | None = ...
-) -> Iterator[tuple[_T, bool, bool]]: ...
-
-class _SupportsLessThan(Protocol):
-    def __lt__(self, __other: Any) -> bool: ...
-
-_SupportsLessThanT = TypeVar("_SupportsLessThanT", bound=_SupportsLessThan)
-
-@overload
-def minmax(
-    iterable_or_value: Iterable[_SupportsLessThanT], *, key: None = None
-) -> tuple[_SupportsLessThanT, _SupportsLessThanT]: ...
-@overload
-def minmax(
-    iterable_or_value: Iterable[_T], *, key: Callable[[_T], _SupportsLessThan]
-) -> tuple[_T, _T]: ...
-@overload
-def minmax(
-    iterable_or_value: Iterable[_SupportsLessThanT],
-    *,
-    key: None = None,
-    default: _U,
-) -> _U | tuple[_SupportsLessThanT, _SupportsLessThanT]: ...
-@overload
-def minmax(
-    iterable_or_value: Iterable[_T],
-    *,
-    key: Callable[[_T], _SupportsLessThan],
-    default: _U,
-) -> _U | tuple[_T, _T]: ...
-@overload
-def minmax(
-    iterable_or_value: _SupportsLessThanT,
-    __other: _SupportsLessThanT,
-    *others: _SupportsLessThanT,
-) -> tuple[_SupportsLessThanT, _SupportsLessThanT]: ...
-@overload
-def minmax(
-    iterable_or_value: _T,
-    __other: _T,
-    *others: _T,
-    key: Callable[[_T], _SupportsLessThan],
-) -> tuple[_T, _T]: ...
-def longest_common_prefix(
-    iterables: Iterable[Iterable[_T]],
-) -> Iterator[_T]: ...
-def iequals(*iterables: Iterable[Any]) -> bool: ...
-def constrained_batches(
-    iterable: Iterable[_T],
-    max_size: int,
-    max_count: int | None = ...,
-    get_len: Callable[[_T], object] = ...,
-    strict: bool = ...,
-) -> Iterator[tuple[_T]]: ...
-def gray_product(*iterables: Iterable[_T]) -> Iterator[tuple[_T, ...]]: ...
-def partial_product(*iterables: Iterable[_T]) -> Iterator[tuple[_T, ...]]: ...
-def takewhile_inclusive(
-    predicate: Callable[[_T], bool], iterable: Iterable[_T]
-) -> Iterator[_T]: ...
-def outer_product(
-    func: Callable[[_T, _U], _V],
-    xs: Iterable[_T],
-    ys: Iterable[_U],
-    *args: Any,
-    **kwargs: Any,
-) -> Iterator[tuple[_V, ...]]: ...
-def iter_suppress(
-    iterable: Iterable[_T],
-    *exceptions: Type[BaseException],
-) -> Iterator[_T]: ...
-def filter_map(
-    func: Callable[[_T], _V | None],
-    iterable: Iterable[_T],
-) -> Iterator[_V]: ...
-def powerset_of_sets(iterable: Iterable[_T]) -> Iterator[set[_T]]: ...
-def join_mappings(
-    **field_to_map: Mapping[_T, _V]
-) -> dict[_T, dict[str, _V]]: ...
-def doublestarmap(
-    func: Callable[..., _T],
-    iterable: Iterable[Mapping[str, Any]],
-) -> Iterator[_T]: ...
-def dft(xarr: Sequence[complex]) -> Iterator[complex]: ...
-def idft(Xarr: Sequence[complex]) -> Iterator[complex]: ...
diff --git a/lib/more_itertools/py.typed b/lib/more_itertools/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/more_itertools/recipes.py b/lib/more_itertools/recipes.py
deleted file mode 100644
index a21a1f5d..00000000
--- a/lib/more_itertools/recipes.py
+++ /dev/null
@@ -1,1070 +0,0 @@
-"""Imported from the recipes section of the itertools documentation.
-
-All functions taken from the recipes section of the itertools library docs
-[1]_.
-Some backward-compatible usability improvements have been made.
-
-.. [1] http://docs.python.org/library/itertools.html#recipes
-
-"""
-
-import math
-import operator
-
-from collections import deque
-from collections.abc import Sized
-from functools import partial, reduce
-from itertools import (
-    chain,
-    combinations,
-    compress,
-    count,
-    cycle,
-    groupby,
-    islice,
-    product,
-    repeat,
-    starmap,
-    tee,
-    zip_longest,
-)
-from random import randrange, sample, choice
-from sys import hexversion
-
-__all__ = [
-    'all_equal',
-    'batched',
-    'before_and_after',
-    'consume',
-    'convolve',
-    'dotproduct',
-    'first_true',
-    'factor',
-    'flatten',
-    'grouper',
-    'iter_except',
-    'iter_index',
-    'matmul',
-    'ncycles',
-    'nth',
-    'nth_combination',
-    'padnone',
-    'pad_none',
-    'pairwise',
-    'partition',
-    'polynomial_eval',
-    'polynomial_from_roots',
-    'polynomial_derivative',
-    'powerset',
-    'prepend',
-    'quantify',
-    'reshape',
-    'random_combination_with_replacement',
-    'random_combination',
-    'random_permutation',
-    'random_product',
-    'repeatfunc',
-    'roundrobin',
-    'sieve',
-    'sliding_window',
-    'subslices',
-    'sum_of_squares',
-    'tabulate',
-    'tail',
-    'take',
-    'totient',
-    'transpose',
-    'triplewise',
-    'unique',
-    'unique_everseen',
-    'unique_justseen',
-]
-
-_marker = object()
-
-
-# zip with strict is available for Python 3.10+
-try:
-    zip(strict=True)
-except TypeError:
-    _zip_strict = zip
-else:
-    _zip_strict = partial(zip, strict=True)
-
-# math.sumprod is available for Python 3.12+
-_sumprod = getattr(math, 'sumprod', lambda x, y: dotproduct(x, y))
-
-
-def take(n, iterable):
-    """Return first *n* items of the iterable as a list.
-
-        >>> take(3, range(10))
-        [0, 1, 2]
-
-    If there are fewer than *n* items in the iterable, all of them are
-    returned.
-
-        >>> take(10, range(3))
-        [0, 1, 2]
-
-    """
-    return list(islice(iterable, n))
-
-
-def tabulate(function, start=0):
-    """Return an iterator over the results of ``func(start)``,
-    ``func(start + 1)``, ``func(start + 2)``...
-
-    *func* should be a function that accepts one integer argument.
-
-    If *start* is not specified it defaults to 0. It will be incremented each
-    time the iterator is advanced.
-
-        >>> square = lambda x: x ** 2
-        >>> iterator = tabulate(square, -3)
-        >>> take(4, iterator)
-        [9, 4, 1, 0]
-
-    """
-    return map(function, count(start))
-
-
-def tail(n, iterable):
-    """Return an iterator over the last *n* items of *iterable*.
-
-    >>> t = tail(3, 'ABCDEFG')
-    >>> list(t)
-    ['E', 'F', 'G']
-
-    """
-    # If the given iterable has a length, then we can use islice to get its
-    # final elements. Note that if the iterable is not actually Iterable,
-    # either islice or deque will throw a TypeError. This is why we don't
-    # check if it is Iterable.
-    if isinstance(iterable, Sized):
-        yield from islice(iterable, max(0, len(iterable) - n), None)
-    else:
-        yield from iter(deque(iterable, maxlen=n))
-
-
-def consume(iterator, n=None):
-    """Advance *iterable* by *n* steps. If *n* is ``None``, consume it
-    entirely.
-
-    Efficiently exhausts an iterator without returning values. Defaults to
-    consuming the whole iterator, but an optional second argument may be
-    provided to limit consumption.
-
-        >>> i = (x for x in range(10))
-        >>> next(i)
-        0
-        >>> consume(i, 3)
-        >>> next(i)
-        4
-        >>> consume(i)
-        >>> next(i)
-        Traceback (most recent call last):
-          File "<stdin>", line 1, in <module>
-        StopIteration
-
-    If the iterator has fewer items remaining than the provided limit, the
-    whole iterator will be consumed.
-
-        >>> i = (x for x in range(3))
-        >>> consume(i, 5)
-        >>> next(i)
-        Traceback (most recent call last):
-          File "<stdin>", line 1, in <module>
-        StopIteration
-
-    """
-    # Use functions that consume iterators at C speed.
-    if n is None:
-        # feed the entire iterator into a zero-length deque
-        deque(iterator, maxlen=0)
-    else:
-        # advance to the empty slice starting at position n
-        next(islice(iterator, n, n), None)
-
-
-def nth(iterable, n, default=None):
-    """Returns the nth item or a default value.
-
-    >>> l = range(10)
-    >>> nth(l, 3)
-    3
-    >>> nth(l, 20, "zebra")
-    'zebra'
-
-    """
-    return next(islice(iterable, n, None), default)
-
-
-def all_equal(iterable, key=None):
-    """
-    Returns ``True`` if all the elements are equal to each other.
-
-        >>> all_equal('aaaa')
-        True
-        >>> all_equal('aaab')
-        False
-
-    A function that accepts a single argument and returns a transformed version
-    of each input item can be specified with *key*:
-
-        >>> all_equal('AaaA', key=str.casefold)
-        True
-        >>> all_equal([1, 2, 3], key=lambda x: x < 10)
-        True
-
-    """
-    return len(list(islice(groupby(iterable, key), 2))) <= 1
-
-
-def quantify(iterable, pred=bool):
-    """Return the how many times the predicate is true.
-
-    >>> quantify([True, False, True])
-    2
-
-    """
-    return sum(map(pred, iterable))
-
-
-def pad_none(iterable):
-    """Returns the sequence of elements and then returns ``None`` indefinitely.
-
-        >>> take(5, pad_none(range(3)))
-        [0, 1, 2, None, None]
-
-    Useful for emulating the behavior of the built-in :func:`map` function.
-
-    See also :func:`padded`.
-
-    """
-    return chain(iterable, repeat(None))
-
-
-padnone = pad_none
-
-
-def ncycles(iterable, n):
-    """Returns the sequence elements *n* times
-
-    >>> list(ncycles(["a", "b"], 3))
-    ['a', 'b', 'a', 'b', 'a', 'b']
-
-    """
-    return chain.from_iterable(repeat(tuple(iterable), n))
-
-
-def dotproduct(vec1, vec2):
-    """Returns the dot product of the two iterables.
-
-    >>> dotproduct([10, 10], [20, 20])
-    400
-
-    """
-    return sum(map(operator.mul, vec1, vec2))
-
-
-def flatten(listOfLists):
-    """Return an iterator flattening one level of nesting in a list of lists.
-
-        >>> list(flatten([[0, 1], [2, 3]]))
-        [0, 1, 2, 3]
-
-    See also :func:`collapse`, which can flatten multiple levels of nesting.
-
-    """
-    return chain.from_iterable(listOfLists)
-
-
-def repeatfunc(func, times=None, *args):
-    """Call *func* with *args* repeatedly, returning an iterable over the
-    results.
-
-    If *times* is specified, the iterable will terminate after that many
-    repetitions:
-
-        >>> from operator import add
-        >>> times = 4
-        >>> args = 3, 5
-        >>> list(repeatfunc(add, times, *args))
-        [8, 8, 8, 8]
-
-    If *times* is ``None`` the iterable will not terminate:
-
-        >>> from random import randrange
-        >>> times = None
-        >>> args = 1, 11
-        >>> take(6, repeatfunc(randrange, times, *args))  # doctest:+SKIP
-        [2, 4, 8, 1, 8, 4]
-
-    """
-    if times is None:
-        return starmap(func, repeat(args))
-    return starmap(func, repeat(args, times))
-
-
-def _pairwise(iterable):
-    """Returns an iterator of paired items, overlapping, from the original
-
-    >>> take(4, pairwise(count()))
-    [(0, 1), (1, 2), (2, 3), (3, 4)]
-
-    On Python 3.10 and above, this is an alias for :func:`itertools.pairwise`.
-
-    """
-    a, b = tee(iterable)
-    next(b, None)
-    return zip(a, b)
-
-
-try:
-    from itertools import pairwise as itertools_pairwise
-except ImportError:
-    pairwise = _pairwise
-else:
-
-    def pairwise(iterable):
-        return itertools_pairwise(iterable)
-
-    pairwise.__doc__ = _pairwise.__doc__
-
-
-class UnequalIterablesError(ValueError):
-    def __init__(self, details=None):
-        msg = 'Iterables have different lengths'
-        if details is not None:
-            msg += (': index 0 has length {}; index {} has length {}').format(
-                *details
-            )
-
-        super().__init__(msg)
-
-
-def _zip_equal_generator(iterables):
-    for combo in zip_longest(*iterables, fillvalue=_marker):
-        for val in combo:
-            if val is _marker:
-                raise UnequalIterablesError()
-        yield combo
-
-
-def _zip_equal(*iterables):
-    # Check whether the iterables are all the same size.
-    try:
-        first_size = len(iterables[0])
-        for i, it in enumerate(iterables[1:], 1):
-            size = len(it)
-            if size != first_size:
-                raise UnequalIterablesError(details=(first_size, i, size))
-        # All sizes are equal, we can use the built-in zip.
-        return zip(*iterables)
-    # If any one of the iterables didn't have a length, start reading
-    # them until one runs out.
-    except TypeError:
-        return _zip_equal_generator(iterables)
-
-
-def grouper(iterable, n, incomplete='fill', fillvalue=None):
-    """Group elements from *iterable* into fixed-length groups of length *n*.
-
-    >>> list(grouper('ABCDEF', 3))
-    [('A', 'B', 'C'), ('D', 'E', 'F')]
-
-    The keyword arguments *incomplete* and *fillvalue* control what happens for
-    iterables whose length is not a multiple of *n*.
-
-    When *incomplete* is `'fill'`, the last group will contain instances of
-    *fillvalue*.
-
-    >>> list(grouper('ABCDEFG', 3, incomplete='fill', fillvalue='x'))
-    [('A', 'B', 'C'), ('D', 'E', 'F'), ('G', 'x', 'x')]
-
-    When *incomplete* is `'ignore'`, the last group will not be emitted.
-
-    >>> list(grouper('ABCDEFG', 3, incomplete='ignore', fillvalue='x'))
-    [('A', 'B', 'C'), ('D', 'E', 'F')]
-
-    When *incomplete* is `'strict'`, a subclass of `ValueError` will be raised.
-
-    >>> it = grouper('ABCDEFG', 3, incomplete='strict')
-    >>> list(it)  # doctest: +IGNORE_EXCEPTION_DETAIL
-    Traceback (most recent call last):
-    ...
-    UnequalIterablesError
-
-    """
-    args = [iter(iterable)] * n
-    if incomplete == 'fill':
-        return zip_longest(*args, fillvalue=fillvalue)
-    if incomplete == 'strict':
-        return _zip_equal(*args)
-    if incomplete == 'ignore':
-        return zip(*args)
-    else:
-        raise ValueError('Expected fill, strict, or ignore')
-
-
-def roundrobin(*iterables):
-    """Yields an item from each iterable, alternating between them.
-
-        >>> list(roundrobin('ABC', 'D', 'EF'))
-        ['A', 'D', 'E', 'B', 'F', 'C']
-
-    This function produces the same output as :func:`interleave_longest`, but
-    may perform better for some inputs (in particular when the number of
-    iterables is small).
-
-    """
-    # Algorithm credited to George Sakkis
-    iterators = map(iter, iterables)
-    for num_active in range(len(iterables), 0, -1):
-        iterators = cycle(islice(iterators, num_active))
-        yield from map(next, iterators)
-
-
-def partition(pred, iterable):
-    """
-    Returns a 2-tuple of iterables derived from the input iterable.
-    The first yields the items that have ``pred(item) == False``.
-    The second yields the items that have ``pred(item) == True``.
-
-        >>> is_odd = lambda x: x % 2 != 0
-        >>> iterable = range(10)
-        >>> even_items, odd_items = partition(is_odd, iterable)
-        >>> list(even_items), list(odd_items)
-        ([0, 2, 4, 6, 8], [1, 3, 5, 7, 9])
-
-    If *pred* is None, :func:`bool` is used.
-
-        >>> iterable = [0, 1, False, True, '', ' ']
-        >>> false_items, true_items = partition(None, iterable)
-        >>> list(false_items), list(true_items)
-        ([0, False, ''], [1, True, ' '])
-
-    """
-    if pred is None:
-        pred = bool
-
-    t1, t2, p = tee(iterable, 3)
-    p1, p2 = tee(map(pred, p))
-    return (compress(t1, map(operator.not_, p1)), compress(t2, p2))
-
-
-def powerset(iterable):
-    """Yields all possible subsets of the iterable.
-
-        >>> list(powerset([1, 2, 3]))
-        [(), (1,), (2,), (3,), (1, 2), (1, 3), (2, 3), (1, 2, 3)]
-
-    :func:`powerset` will operate on iterables that aren't :class:`set`
-    instances, so repeated elements in the input will produce repeated elements
-    in the output.
-
-        >>> seq = [1, 1, 0]
-        >>> list(powerset(seq))
-        [(), (1,), (1,), (0,), (1, 1), (1, 0), (1, 0), (1, 1, 0)]
-
-    For a variant that efficiently yields actual :class:`set` instances, see
-    :func:`powerset_of_sets`.
-    """
-    s = list(iterable)
-    return chain.from_iterable(combinations(s, r) for r in range(len(s) + 1))
-
-
-def unique_everseen(iterable, key=None):
-    """
-    Yield unique elements, preserving order.
-
-        >>> list(unique_everseen('AAAABBBCCDAABBB'))
-        ['A', 'B', 'C', 'D']
-        >>> list(unique_everseen('ABBCcAD', str.lower))
-        ['A', 'B', 'C', 'D']
-
-    Sequences with a mix of hashable and unhashable items can be used.
-    The function will be slower (i.e., `O(n^2)`) for unhashable items.
-
-    Remember that ``list`` objects are unhashable - you can use the *key*
-    parameter to transform the list to a tuple (which is hashable) to
-    avoid a slowdown.
-
-        >>> iterable = ([1, 2], [2, 3], [1, 2])
-        >>> list(unique_everseen(iterable))  # Slow
-        [[1, 2], [2, 3]]
-        >>> list(unique_everseen(iterable, key=tuple))  # Faster
-        [[1, 2], [2, 3]]
-
-    Similarly, you may want to convert unhashable ``set`` objects with
-    ``key=frozenset``. For ``dict`` objects,
-    ``key=lambda x: frozenset(x.items())`` can be used.
-
-    """
-    seenset = set()
-    seenset_add = seenset.add
-    seenlist = []
-    seenlist_add = seenlist.append
-    use_key = key is not None
-
-    for element in iterable:
-        k = key(element) if use_key else element
-        try:
-            if k not in seenset:
-                seenset_add(k)
-                yield element
-        except TypeError:
-            if k not in seenlist:
-                seenlist_add(k)
-                yield element
-
-
-def unique_justseen(iterable, key=None):
-    """Yields elements in order, ignoring serial duplicates
-
-    >>> list(unique_justseen('AAAABBBCCDAABBB'))
-    ['A', 'B', 'C', 'D', 'A', 'B']
-    >>> list(unique_justseen('ABBCcAD', str.lower))
-    ['A', 'B', 'C', 'A', 'D']
-
-    """
-    if key is None:
-        return map(operator.itemgetter(0), groupby(iterable))
-
-    return map(next, map(operator.itemgetter(1), groupby(iterable, key)))
-
-
-def unique(iterable, key=None, reverse=False):
-    """Yields unique elements in sorted order.
-
-    >>> list(unique([[1, 2], [3, 4], [1, 2]]))
-    [[1, 2], [3, 4]]
-
-    *key* and *reverse* are passed to :func:`sorted`.
-
-    >>> list(unique('ABBcCAD', str.casefold))
-    ['A', 'B', 'c', 'D']
-    >>> list(unique('ABBcCAD', str.casefold, reverse=True))
-    ['D', 'c', 'B', 'A']
-
-    The elements in *iterable* need not be hashable, but they must be
-    comparable for sorting to work.
-    """
-    return unique_justseen(sorted(iterable, key=key, reverse=reverse), key=key)
-
-
-def iter_except(func, exception, first=None):
-    """Yields results from a function repeatedly until an exception is raised.
-
-    Converts a call-until-exception interface to an iterator interface.
-    Like ``iter(func, sentinel)``, but uses an exception instead of a sentinel
-    to end the loop.
-
-        >>> l = [0, 1, 2]
-        >>> list(iter_except(l.pop, IndexError))
-        [2, 1, 0]
-
-    Multiple exceptions can be specified as a stopping condition:
-
-        >>> l = [1, 2, 3, '...', 4, 5, 6]
-        >>> list(iter_except(lambda: 1 + l.pop(), (IndexError, TypeError)))
-        [7, 6, 5]
-        >>> list(iter_except(lambda: 1 + l.pop(), (IndexError, TypeError)))
-        [4, 3, 2]
-        >>> list(iter_except(lambda: 1 + l.pop(), (IndexError, TypeError)))
-        []
-
-    """
-    try:
-        if first is not None:
-            yield first()
-        while 1:
-            yield func()
-    except exception:
-        pass
-
-
-def first_true(iterable, default=None, pred=None):
-    """
-    Returns the first true value in the iterable.
-
-    If no true value is found, returns *default*
-
-    If *pred* is not None, returns the first item for which
-    ``pred(item) == True`` .
-
-        >>> first_true(range(10))
-        1
-        >>> first_true(range(10), pred=lambda x: x > 5)
-        6
-        >>> first_true(range(10), default='missing', pred=lambda x: x > 9)
-        'missing'
-
-    """
-    return next(filter(pred, iterable), default)
-
-
-def random_product(*args, repeat=1):
-    """Draw an item at random from each of the input iterables.
-
-        >>> random_product('abc', range(4), 'XYZ')  # doctest:+SKIP
-        ('c', 3, 'Z')
-
-    If *repeat* is provided as a keyword argument, that many items will be
-    drawn from each iterable.
-
-        >>> random_product('abcd', range(4), repeat=2)  # doctest:+SKIP
-        ('a', 2, 'd', 3)
-
-    This equivalent to taking a random selection from
-    ``itertools.product(*args, **kwarg)``.
-
-    """
-    pools = [tuple(pool) for pool in args] * repeat
-    return tuple(choice(pool) for pool in pools)
-
-
-def random_permutation(iterable, r=None):
-    """Return a random *r* length permutation of the elements in *iterable*.
-
-    If *r* is not specified or is ``None``, then *r* defaults to the length of
-    *iterable*.
-
-        >>> random_permutation(range(5))  # doctest:+SKIP
-        (3, 4, 0, 1, 2)
-
-    This equivalent to taking a random selection from
-    ``itertools.permutations(iterable, r)``.
-
-    """
-    pool = tuple(iterable)
-    r = len(pool) if r is None else r
-    return tuple(sample(pool, r))
-
-
-def random_combination(iterable, r):
-    """Return a random *r* length subsequence of the elements in *iterable*.
-
-        >>> random_combination(range(5), 3)  # doctest:+SKIP
-        (2, 3, 4)
-
-    This equivalent to taking a random selection from
-    ``itertools.combinations(iterable, r)``.
-
-    """
-    pool = tuple(iterable)
-    n = len(pool)
-    indices = sorted(sample(range(n), r))
-    return tuple(pool[i] for i in indices)
-
-
-def random_combination_with_replacement(iterable, r):
-    """Return a random *r* length subsequence of elements in *iterable*,
-    allowing individual elements to be repeated.
-
-        >>> random_combination_with_replacement(range(3), 5) # doctest:+SKIP
-        (0, 0, 1, 2, 2)
-
-    This equivalent to taking a random selection from
-    ``itertools.combinations_with_replacement(iterable, r)``.
-
-    """
-    pool = tuple(iterable)
-    n = len(pool)
-    indices = sorted(randrange(n) for i in range(r))
-    return tuple(pool[i] for i in indices)
-
-
-def nth_combination(iterable, r, index):
-    """Equivalent to ``list(combinations(iterable, r))[index]``.
-
-    The subsequences of *iterable* that are of length *r* can be ordered
-    lexicographically. :func:`nth_combination` computes the subsequence at
-    sort position *index* directly, without computing the previous
-    subsequences.
-
-        >>> nth_combination(range(5), 3, 5)
-        (0, 3, 4)
-
-    ``ValueError`` will be raised If *r* is negative or greater than the length
-    of *iterable*.
-    ``IndexError`` will be raised if the given *index* is invalid.
-    """
-    pool = tuple(iterable)
-    n = len(pool)
-    if (r < 0) or (r > n):
-        raise ValueError
-
-    c = 1
-    k = min(r, n - r)
-    for i in range(1, k + 1):
-        c = c * (n - k + i) // i
-
-    if index < 0:
-        index += c
-
-    if (index < 0) or (index >= c):
-        raise IndexError
-
-    result = []
-    while r:
-        c, n, r = c * r // n, n - 1, r - 1
-        while index >= c:
-            index -= c
-            c, n = c * (n - r) // n, n - 1
-        result.append(pool[-1 - n])
-
-    return tuple(result)
-
-
-def prepend(value, iterator):
-    """Yield *value*, followed by the elements in *iterator*.
-
-        >>> value = '0'
-        >>> iterator = ['1', '2', '3']
-        >>> list(prepend(value, iterator))
-        ['0', '1', '2', '3']
-
-    To prepend multiple values, see :func:`itertools.chain`
-    or :func:`value_chain`.
-
-    """
-    return chain([value], iterator)
-
-
-def convolve(signal, kernel):
-    """Convolve the iterable *signal* with the iterable *kernel*.
-
-        >>> signal = (1, 2, 3, 4, 5)
-        >>> kernel = [3, 2, 1]
-        >>> list(convolve(signal, kernel))
-        [3, 8, 14, 20, 26, 14, 5]
-
-    Note: the input arguments are not interchangeable, as the *kernel*
-    is immediately consumed and stored.
-
-    """
-    # This implementation intentionally doesn't match the one in the itertools
-    # documentation.
-    kernel = tuple(kernel)[::-1]
-    n = len(kernel)
-    window = deque([0], maxlen=n) * n
-    for x in chain(signal, repeat(0, n - 1)):
-        window.append(x)
-        yield _sumprod(kernel, window)
-
-
-def before_and_after(predicate, it):
-    """A variant of :func:`takewhile` that allows complete access to the
-    remainder of the iterator.
-
-         >>> it = iter('ABCdEfGhI')
-         >>> all_upper, remainder = before_and_after(str.isupper, it)
-         >>> ''.join(all_upper)
-         'ABC'
-         >>> ''.join(remainder) # takewhile() would lose the 'd'
-         'dEfGhI'
-
-    Note that the first iterator must be fully consumed before the second
-    iterator can generate valid results.
-    """
-    it = iter(it)
-    transition = []
-
-    def true_iterator():
-        for elem in it:
-            if predicate(elem):
-                yield elem
-            else:
-                transition.append(elem)
-                return
-
-    # Note: this is different from itertools recipes to allow nesting
-    # before_and_after remainders into before_and_after again. See tests
-    # for an example.
-    remainder_iterator = chain(transition, it)
-
-    return true_iterator(), remainder_iterator
-
-
-def triplewise(iterable):
-    """Return overlapping triplets from *iterable*.
-
-    >>> list(triplewise('ABCDE'))
-    [('A', 'B', 'C'), ('B', 'C', 'D'), ('C', 'D', 'E')]
-
-    """
-    # This deviates from the itertools documentation reciple - see
-    # https://github.com/more-itertools/more-itertools/issues/889
-    t1, t2, t3 = tee(iterable, 3)
-    next(t3, None)
-    next(t3, None)
-    next(t2, None)
-    return zip(t1, t2, t3)
-
-
-def _sliding_window_islice(iterable, n):
-    # Fast path for small, non-zero values of n.
-    iterators = tee(iterable, n)
-    for i, iterator in enumerate(iterators):
-        next(islice(iterator, i, i), None)
-    return zip(*iterators)
-
-
-def _sliding_window_deque(iterable, n):
-    # Normal path for other values of n.
-    it = iter(iterable)
-    window = deque(islice(it, n - 1), maxlen=n)
-    for x in it:
-        window.append(x)
-        yield tuple(window)
-
-
-def sliding_window(iterable, n):
-    """Return a sliding window of width *n* over *iterable*.
-
-        >>> list(sliding_window(range(6), 4))
-        [(0, 1, 2, 3), (1, 2, 3, 4), (2, 3, 4, 5)]
-
-    If *iterable* has fewer than *n* items, then nothing is yielded:
-
-        >>> list(sliding_window(range(3), 4))
-        []
-
-    For a variant with more features, see :func:`windowed`.
-    """
-    if n > 20:
-        return _sliding_window_deque(iterable, n)
-    elif n > 2:
-        return _sliding_window_islice(iterable, n)
-    elif n == 2:
-        return pairwise(iterable)
-    elif n == 1:
-        return zip(iterable)
-    else:
-        raise ValueError(f'n should be at least one, not {n}')
-
-
-def subslices(iterable):
-    """Return all contiguous non-empty subslices of *iterable*.
-
-        >>> list(subslices('ABC'))
-        [['A'], ['A', 'B'], ['A', 'B', 'C'], ['B'], ['B', 'C'], ['C']]
-
-    This is similar to :func:`substrings`, but emits items in a different
-    order.
-    """
-    seq = list(iterable)
-    slices = starmap(slice, combinations(range(len(seq) + 1), 2))
-    return map(operator.getitem, repeat(seq), slices)
-
-
-def polynomial_from_roots(roots):
-    """Compute a polynomial's coefficients from its roots.
-
-    >>> roots = [5, -4, 3]  # (x - 5) * (x + 4) * (x - 3)
-    >>> polynomial_from_roots(roots)  # x^3 - 4 * x^2 - 17 * x + 60
-    [1, -4, -17, 60]
-    """
-    factors = zip(repeat(1), map(operator.neg, roots))
-    return list(reduce(convolve, factors, [1]))
-
-
-def iter_index(iterable, value, start=0, stop=None):
-    """Yield the index of each place in *iterable* that *value* occurs,
-    beginning with index *start* and ending before index *stop*.
-
-
-    >>> list(iter_index('AABCADEAF', 'A'))
-    [0, 1, 4, 7]
-    >>> list(iter_index('AABCADEAF', 'A', 1))  # start index is inclusive
-    [1, 4, 7]
-    >>> list(iter_index('AABCADEAF', 'A', 1, 7))  # stop index is not inclusive
-    [1, 4]
-
-    The behavior for non-scalar *values* matches the built-in Python types.
-
-    >>> list(iter_index('ABCDABCD', 'AB'))
-    [0, 4]
-    >>> list(iter_index([0, 1, 2, 3, 0, 1, 2, 3], [0, 1]))
-    []
-    >>> list(iter_index([[0, 1], [2, 3], [0, 1], [2, 3]], [0, 1]))
-    [0, 2]
-
-    See :func:`locate` for a more general means of finding the indexes
-    associated with particular values.
-
-    """
-    seq_index = getattr(iterable, 'index', None)
-    if seq_index is None:
-        # Slow path for general iterables
-        it = islice(iterable, start, stop)
-        for i, element in enumerate(it, start):
-            if element is value or element == value:
-                yield i
-    else:
-        # Fast path for sequences
-        stop = len(iterable) if stop is None else stop
-        i = start - 1
-        try:
-            while True:
-                yield (i := seq_index(value, i + 1, stop))
-        except ValueError:
-            pass
-
-
-def sieve(n):
-    """Yield the primes less than n.
-
-    >>> list(sieve(30))
-    [2, 3, 5, 7, 11, 13, 17, 19, 23, 29]
-    """
-    if n > 2:
-        yield 2
-    start = 3
-    data = bytearray((0, 1)) * (n // 2)
-    limit = math.isqrt(n) + 1
-    for p in iter_index(data, 1, start, limit):
-        yield from iter_index(data, 1, start, p * p)
-        data[p * p : n : p + p] = bytes(len(range(p * p, n, p + p)))
-        start = p * p
-    yield from iter_index(data, 1, start)
-
-
-def _batched(iterable, n, *, strict=False):
-    """Batch data into tuples of length *n*. If the number of items in
-    *iterable* is not divisible by *n*:
-    * The last batch will be shorter if *strict* is ``False``.
-    * :exc:`ValueError` will be raised if *strict* is ``True``.
-
-    >>> list(batched('ABCDEFG', 3))
-    [('A', 'B', 'C'), ('D', 'E', 'F'), ('G',)]
-
-    On Python 3.13 and above, this is an alias for :func:`itertools.batched`.
-    """
-    if n < 1:
-        raise ValueError('n must be at least one')
-    it = iter(iterable)
-    while batch := tuple(islice(it, n)):
-        if strict and len(batch) != n:
-            raise ValueError('batched(): incomplete batch')
-        yield batch
-
-
-if hexversion >= 0x30D00A2:
-    from itertools import batched as itertools_batched
-
-    def batched(iterable, n, *, strict=False):
-        return itertools_batched(iterable, n, strict=strict)
-
-else:
-    batched = _batched
-
-    batched.__doc__ = _batched.__doc__
-
-
-def transpose(it):
-    """Swap the rows and columns of the input matrix.
-
-    >>> list(transpose([(1, 2, 3), (11, 22, 33)]))
-    [(1, 11), (2, 22), (3, 33)]
-
-    The caller should ensure that the dimensions of the input are compatible.
-    If the input is empty, no output will be produced.
-    """
-    return _zip_strict(*it)
-
-
-def reshape(matrix, cols):
-    """Reshape the 2-D input *matrix* to have a column count given by *cols*.
-
-    >>> matrix = [(0, 1), (2, 3), (4, 5)]
-    >>> cols = 3
-    >>> list(reshape(matrix, cols))
-    [(0, 1, 2), (3, 4, 5)]
-    """
-    return batched(chain.from_iterable(matrix), cols)
-
-
-def matmul(m1, m2):
-    """Multiply two matrices.
-
-    >>> list(matmul([(7, 5), (3, 5)], [(2, 5), (7, 9)]))
-    [(49, 80), (41, 60)]
-
-    The caller should ensure that the dimensions of the input matrices are
-    compatible with each other.
-    """
-    n = len(m2[0])
-    return batched(starmap(_sumprod, product(m1, transpose(m2))), n)
-
-
-def factor(n):
-    """Yield the prime factors of n.
-
-    >>> list(factor(360))
-    [2, 2, 2, 3, 3, 5]
-    """
-    for prime in sieve(math.isqrt(n) + 1):
-        while not n % prime:
-            yield prime
-            n //= prime
-            if n == 1:
-                return
-    if n > 1:
-        yield n
-
-
-def polynomial_eval(coefficients, x):
-    """Evaluate a polynomial at a specific value.
-
-    Example: evaluating x^3 - 4 * x^2 - 17 * x + 60 at x = 2.5:
-
-    >>> coefficients = [1, -4, -17, 60]
-    >>> x = 2.5
-    >>> polynomial_eval(coefficients, x)
-    8.125
-    """
-    n = len(coefficients)
-    if n == 0:
-        return x * 0  # coerce zero to the type of x
-    powers = map(pow, repeat(x), reversed(range(n)))
-    return _sumprod(coefficients, powers)
-
-
-def sum_of_squares(it):
-    """Return the sum of the squares of the input values.
-
-    >>> sum_of_squares([10, 20, 30])
-    1400
-    """
-    return _sumprod(*tee(it))
-
-
-def polynomial_derivative(coefficients):
-    """Compute the first derivative of a polynomial.
-
-    Example: evaluating the derivative of x^3 - 4 * x^2 - 17 * x + 60
-
-    >>> coefficients = [1, -4, -17, 60]
-    >>> derivative_coefficients = polynomial_derivative(coefficients)
-    >>> derivative_coefficients
-    [3, -8, -17]
-    """
-    n = len(coefficients)
-    powers = reversed(range(1, n))
-    return list(map(operator.mul, coefficients, powers))
-
-
-def totient(n):
-    """Return the count of natural numbers up to *n* that are coprime with *n*.
-
-    >>> totient(9)
-    6
-    >>> totient(12)
-    4
-    """
-    for prime in set(factor(n)):
-        n -= n // prime
-    return n
diff --git a/lib/more_itertools/recipes.pyi b/lib/more_itertools/recipes.pyi
deleted file mode 100644
index 739acec0..00000000
--- a/lib/more_itertools/recipes.pyi
+++ /dev/null
@@ -1,136 +0,0 @@
-"""Stubs for more_itertools.recipes"""
-
-from __future__ import annotations
-
-from typing import (
-    Any,
-    Callable,
-    Iterable,
-    Iterator,
-    overload,
-    Sequence,
-    Type,
-    TypeVar,
-)
-
-# Type and type variable definitions
-_T = TypeVar('_T')
-_T1 = TypeVar('_T1')
-_T2 = TypeVar('_T2')
-_U = TypeVar('_U')
-
-def take(n: int, iterable: Iterable[_T]) -> list[_T]: ...
-def tabulate(
-    function: Callable[[int], _T], start: int = ...
-) -> Iterator[_T]: ...
-def tail(n: int, iterable: Iterable[_T]) -> Iterator[_T]: ...
-def consume(iterator: Iterable[_T], n: int | None = ...) -> None: ...
-@overload
-def nth(iterable: Iterable[_T], n: int) -> _T | None: ...
-@overload
-def nth(iterable: Iterable[_T], n: int, default: _U) -> _T | _U: ...
-def all_equal(
-    iterable: Iterable[_T], key: Callable[[_T], _U] | None = ...
-) -> bool: ...
-def quantify(
-    iterable: Iterable[_T], pred: Callable[[_T], bool] = ...
-) -> int: ...
-def pad_none(iterable: Iterable[_T]) -> Iterator[_T | None]: ...
-def padnone(iterable: Iterable[_T]) -> Iterator[_T | None]: ...
-def ncycles(iterable: Iterable[_T], n: int) -> Iterator[_T]: ...
-def dotproduct(vec1: Iterable[_T1], vec2: Iterable[_T2]) -> Any: ...
-def flatten(listOfLists: Iterable[Iterable[_T]]) -> Iterator[_T]: ...
-def repeatfunc(
-    func: Callable[..., _U], times: int | None = ..., *args: Any
-) -> Iterator[_U]: ...
-def pairwise(iterable: Iterable[_T]) -> Iterator[tuple[_T, _T]]: ...
-def grouper(
-    iterable: Iterable[_T],
-    n: int,
-    incomplete: str = ...,
-    fillvalue: _U = ...,
-) -> Iterator[tuple[_T | _U, ...]]: ...
-def roundrobin(*iterables: Iterable[_T]) -> Iterator[_T]: ...
-def partition(
-    pred: Callable[[_T], object] | None, iterable: Iterable[_T]
-) -> tuple[Iterator[_T], Iterator[_T]]: ...
-def powerset(iterable: Iterable[_T]) -> Iterator[tuple[_T, ...]]: ...
-def unique_everseen(
-    iterable: Iterable[_T], key: Callable[[_T], _U] | None = ...
-) -> Iterator[_T]: ...
-def unique_justseen(
-    iterable: Iterable[_T], key: Callable[[_T], object] | None = ...
-) -> Iterator[_T]: ...
-def unique(
-    iterable: Iterable[_T],
-    key: Callable[[_T], object] | None = ...,
-    reverse: bool = False,
-) -> Iterator[_T]: ...
-@overload
-def iter_except(
-    func: Callable[[], _T],
-    exception: Type[BaseException] | tuple[Type[BaseException], ...],
-    first: None = ...,
-) -> Iterator[_T]: ...
-@overload
-def iter_except(
-    func: Callable[[], _T],
-    exception: Type[BaseException] | tuple[Type[BaseException], ...],
-    first: Callable[[], _U],
-) -> Iterator[_T | _U]: ...
-@overload
-def first_true(
-    iterable: Iterable[_T], *, pred: Callable[[_T], object] | None = ...
-) -> _T | None: ...
-@overload
-def first_true(
-    iterable: Iterable[_T],
-    default: _U,
-    pred: Callable[[_T], object] | None = ...,
-) -> _T | _U: ...
-def random_product(
-    *args: Iterable[_T], repeat: int = ...
-) -> tuple[_T, ...]: ...
-def random_permutation(
-    iterable: Iterable[_T], r: int | None = ...
-) -> tuple[_T, ...]: ...
-def random_combination(iterable: Iterable[_T], r: int) -> tuple[_T, ...]: ...
-def random_combination_with_replacement(
-    iterable: Iterable[_T], r: int
-) -> tuple[_T, ...]: ...
-def nth_combination(
-    iterable: Iterable[_T], r: int, index: int
-) -> tuple[_T, ...]: ...
-def prepend(value: _T, iterator: Iterable[_U]) -> Iterator[_T | _U]: ...
-def convolve(signal: Iterable[_T], kernel: Iterable[_T]) -> Iterator[_T]: ...
-def before_and_after(
-    predicate: Callable[[_T], bool], it: Iterable[_T]
-) -> tuple[Iterator[_T], Iterator[_T]]: ...
-def triplewise(iterable: Iterable[_T]) -> Iterator[tuple[_T, _T, _T]]: ...
-def sliding_window(
-    iterable: Iterable[_T], n: int
-) -> Iterator[tuple[_T, ...]]: ...
-def subslices(iterable: Iterable[_T]) -> Iterator[list[_T]]: ...
-def polynomial_from_roots(roots: Sequence[_T]) -> list[_T]: ...
-def iter_index(
-    iterable: Iterable[_T],
-    value: Any,
-    start: int | None = ...,
-    stop: int | None = ...,
-) -> Iterator[int]: ...
-def sieve(n: int) -> Iterator[int]: ...
-def batched(
-    iterable: Iterable[_T], n: int, *, strict: bool = False
-) -> Iterator[tuple[_T]]: ...
-def transpose(
-    it: Iterable[Iterable[_T]],
-) -> Iterator[tuple[_T, ...]]: ...
-def reshape(
-    matrix: Iterable[Iterable[_T]], cols: int
-) -> Iterator[tuple[_T, ...]]: ...
-def matmul(m1: Sequence[_T], m2: Sequence[_T]) -> Iterator[tuple[_T]]: ...
-def factor(n: int) -> Iterator[int]: ...
-def polynomial_eval(coefficients: Sequence[_T], x: _U) -> _U: ...
-def sum_of_squares(it: Iterable[_T]) -> _T: ...
-def polynomial_derivative(coefficients: Sequence[_T]) -> list[_T]: ...
-def totient(n: int) -> int: ...
diff --git a/lib/munkres.py b/lib/munkres.py
new file mode 100644
index 00000000..f5337223
--- /dev/null
+++ b/lib/munkres.py
@@ -0,0 +1,786 @@
+#!/usr/bin/env python
+# -*- coding: iso-8859-1 -*-
+
+# Documentation is intended to be processed by Epydoc.
+
+"""
+Introduction
+============
+
+The Munkres module provides an implementation of the Munkres algorithm
+(also called the Hungarian algorithm or the Kuhn-Munkres algorithm),
+useful for solving the Assignment Problem.
+
+Assignment Problem
+==================
+
+Let *C* be an *n*\ x\ *n* matrix representing the costs of each of *n* workers
+to perform any of *n* jobs. The assignment problem is to assign jobs to
+workers in a way that minimizes the total cost. Since each worker can perform
+only one job and each job can be assigned to only one worker the assignments
+represent an independent set of the matrix *C*.
+
+One way to generate the optimal set is to create all permutations of
+the indexes necessary to traverse the matrix so that no row and column
+are used more than once. For instance, given this matrix (expressed in
+Python)::
+
+    matrix = [[5, 9, 1],
+              [10, 3, 2],
+              [8, 7, 4]]
+
+You could use this code to generate the traversal indexes::
+
+    def permute(a, results):
+        if len(a) == 1:
+            results.insert(len(results), a)
+
+        else:
+            for i in range(0, len(a)):
+                element = a[i]
+                a_copy = [a[j] for j in range(0, len(a)) if j != i]
+                subresults = []
+                permute(a_copy, subresults)
+                for subresult in subresults:
+                    result = [element] + subresult
+                    results.insert(len(results), result)
+
+    results = []
+    permute(range(len(matrix)), results) # [0, 1, 2] for a 3x3 matrix
+
+After the call to permute(), the results matrix would look like this::
+
+    [[0, 1, 2],
+     [0, 2, 1],
+     [1, 0, 2],
+     [1, 2, 0],
+     [2, 0, 1],
+     [2, 1, 0]]
+
+You could then use that index matrix to loop over the original cost matrix
+and calculate the smallest cost of the combinations::
+
+    n = len(matrix)
+    minval = sys.maxsize
+    for row in range(n):
+        cost = 0
+        for col in range(n):
+            cost += matrix[row][col]
+        minval = min(cost, minval)
+
+    print minval
+
+While this approach works fine for small matrices, it does not scale. It
+executes in O(*n*!) time: Calculating the permutations for an *n*\ x\ *n*
+matrix requires *n*! operations. For a 12x12 matrix, that's 479,001,600
+traversals. Even if you could manage to perform each traversal in just one
+millisecond, it would still take more than 133 hours to perform the entire
+traversal. A 20x20 matrix would take 2,432,902,008,176,640,000 operations. At
+an optimistic millisecond per operation, that's more than 77 million years.
+
+The Munkres algorithm runs in O(*n*\ ^3) time, rather than O(*n*!). This
+package provides an implementation of that algorithm.
+
+This version is based on
+http://www.public.iastate.edu/~ddoty/HungarianAlgorithm.html.
+
+This version was written for Python by Brian Clapper from the (Ada) algorithm
+at the above web site. (The ``Algorithm::Munkres`` Perl version, in CPAN, was
+clearly adapted from the same web site.)
+
+Usage
+=====
+
+Construct a Munkres object::
+
+    from munkres import Munkres
+
+    m = Munkres()
+
+Then use it to compute the lowest cost assignment from a cost matrix. Here's
+a sample program::
+
+    from munkres import Munkres, print_matrix
+
+    matrix = [[5, 9, 1],
+              [10, 3, 2],
+              [8, 7, 4]]
+    m = Munkres()
+    indexes = m.compute(matrix)
+    print_matrix(matrix, msg='Lowest cost through this matrix:')
+    total = 0
+    for row, column in indexes:
+        value = matrix[row][column]
+        total += value
+        print '(%d, %d) -> %d' % (row, column, value)
+    print 'total cost: %d' % total
+
+Running that program produces::
+
+    Lowest cost through this matrix:
+    [5, 9, 1]
+    [10, 3, 2]
+    [8, 7, 4]
+    (0, 0) -> 5
+    (1, 1) -> 3
+    (2, 2) -> 4
+    total cost=12
+
+The instantiated Munkres object can be used multiple times on different
+matrices.
+
+Non-square Cost Matrices
+========================
+
+The Munkres algorithm assumes that the cost matrix is square. However, it's
+possible to use a rectangular matrix if you first pad it with 0 values to make
+it square. This module automatically pads rectangular cost matrices to make
+them square.
+
+Notes:
+
+- The module operates on a *copy* of the caller's matrix, so any padding will
+  not be seen by the caller.
+- The cost matrix must be rectangular or square. An irregular matrix will
+  *not* work.
+
+Calculating Profit, Rather than Cost
+====================================
+
+The cost matrix is just that: A cost matrix. The Munkres algorithm finds
+the combination of elements (one from each row and column) that results in
+the smallest cost. It's also possible to use the algorithm to maximize
+profit. To do that, however, you have to convert your profit matrix to a
+cost matrix. The simplest way to do that is to subtract all elements from a
+large value. For example::
+
+    from munkres import Munkres, print_matrix
+
+    matrix = [[5, 9, 1],
+              [10, 3, 2],
+              [8, 7, 4]]
+    cost_matrix = []
+    for row in matrix:
+        cost_row = []
+        for col in row:
+            cost_row += [sys.maxsize - col]
+        cost_matrix += [cost_row]
+
+    m = Munkres()
+    indexes = m.compute(cost_matrix)
+    print_matrix(matrix, msg='Highest profit through this matrix:')
+    total = 0
+    for row, column in indexes:
+        value = matrix[row][column]
+        total += value
+        print '(%d, %d) -> %d' % (row, column, value)
+
+    print 'total profit=%d' % total
+
+Running that program produces::
+
+    Highest profit through this matrix:
+    [5, 9, 1]
+    [10, 3, 2]
+    [8, 7, 4]
+    (0, 1) -> 9
+    (1, 0) -> 10
+    (2, 2) -> 4
+    total profit=23
+
+The ``munkres`` module provides a convenience method for creating a cost
+matrix from a profit matrix. Since it doesn't know whether the matrix contains
+floating point numbers, decimals, or integers, you have to provide the
+conversion function; but the convenience method takes care of the actual
+creation of the cost matrix::
+
+    import munkres
+
+    cost_matrix = munkres.make_cost_matrix(matrix,
+                                           lambda cost: sys.maxsize - cost)
+
+So, the above profit-calculation program can be recast as::
+
+    from munkres import Munkres, print_matrix, make_cost_matrix
+
+    matrix = [[5, 9, 1],
+              [10, 3, 2],
+              [8, 7, 4]]
+    cost_matrix = make_cost_matrix(matrix, lambda cost: sys.maxsize - cost)
+    m = Munkres()
+    indexes = m.compute(cost_matrix)
+    print_matrix(matrix, msg='Lowest cost through this matrix:')
+    total = 0
+    for row, column in indexes:
+        value = matrix[row][column]
+        total += value
+        print '(%d, %d) -> %d' % (row, column, value)
+    print 'total profit=%d' % total
+
+References
+==========
+
+1. http://www.public.iastate.edu/~ddoty/HungarianAlgorithm.html
+
+2. Harold W. Kuhn. The Hungarian Method for the assignment problem.
+   *Naval Research Logistics Quarterly*, 2:83-97, 1955.
+
+3. Harold W. Kuhn. Variants of the Hungarian method for assignment
+   problems. *Naval Research Logistics Quarterly*, 3: 253-258, 1956.
+
+4. Munkres, J. Algorithms for the Assignment and Transportation Problems.
+   *Journal of the Society of Industrial and Applied Mathematics*,
+   5(1):32-38, March, 1957.
+
+5. http://en.wikipedia.org/wiki/Hungarian_algorithm
+
+Copyright and License
+=====================
+
+This software is released under a BSD license, adapted from
+<http://opensource.org/licenses/bsd-license.php>
+
+Copyright (c) 2008 Brian M. Clapper
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name "clapper.org" nor the names of its contributors may be
+  used to endorse or promote products derived from this software without
+  specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+"""
+
+__docformat__ = 'restructuredtext'
+
+# ---------------------------------------------------------------------------
+# Imports
+# ---------------------------------------------------------------------------
+
+import sys
+import copy
+
+# ---------------------------------------------------------------------------
+# Exports
+# ---------------------------------------------------------------------------
+
+__all__     = ['Munkres', 'make_cost_matrix']
+
+# ---------------------------------------------------------------------------
+# Globals
+# ---------------------------------------------------------------------------
+
+# Info about the module
+__version__   = "1.0.6"
+__author__    = "Brian Clapper, bmc@clapper.org"
+__url__       = "http://software.clapper.org/munkres/"
+__copyright__ = "(c) 2008 Brian M. Clapper"
+__license__   = "BSD-style license"
+
+# ---------------------------------------------------------------------------
+# Classes
+# ---------------------------------------------------------------------------
+
+class Munkres:
+    """
+    Calculate the Munkres solution to the classical assignment problem.
+    See the module documentation for usage.
+    """
+
+    def __init__(self):
+        """Create a new instance"""
+        self.C = None
+        self.row_covered = []
+        self.col_covered = []
+        self.n = 0
+        self.Z0_r = 0
+        self.Z0_c = 0
+        self.marked = None
+        self.path = None
+
+    def make_cost_matrix(profit_matrix, inversion_function):
+        """
+        **DEPRECATED**
+
+        Please use the module function ``make_cost_matrix()``.
+        """
+        import munkres
+        return munkres.make_cost_matrix(profit_matrix, inversion_function)
+
+    make_cost_matrix = staticmethod(make_cost_matrix)
+
+    def pad_matrix(self, matrix, pad_value=0):
+        """
+        Pad a possibly non-square matrix to make it square.
+
+        :Parameters:
+            matrix : list of lists
+                matrix to pad
+
+            pad_value : int
+                value to use to pad the matrix
+
+        :rtype: list of lists
+        :return: a new, possibly padded, matrix
+        """
+        max_columns = 0
+        total_rows = len(matrix)
+
+        for row in matrix:
+            max_columns = max(max_columns, len(row))
+
+        total_rows = max(max_columns, total_rows)
+
+        new_matrix = []
+        for row in matrix:
+            row_len = len(row)
+            new_row = row[:]
+            if total_rows > row_len:
+                # Row too short. Pad it.
+                new_row += [0] * (total_rows - row_len)
+            new_matrix += [new_row]
+
+        while len(new_matrix) < total_rows:
+            new_matrix += [[0] * total_rows]
+
+        return new_matrix
+
+    def compute(self, cost_matrix):
+        """
+        Compute the indexes for the lowest-cost pairings between rows and
+        columns in the database. Returns a list of (row, column) tuples
+        that can be used to traverse the matrix.
+
+        :Parameters:
+            cost_matrix : list of lists
+                The cost matrix. If this cost matrix is not square, it
+                will be padded with zeros, via a call to ``pad_matrix()``.
+                (This method does *not* modify the caller's matrix. It
+                operates on a copy of the matrix.)
+
+                **WARNING**: This code handles square and rectangular
+                matrices. It does *not* handle irregular matrices.
+
+        :rtype: list
+        :return: A list of ``(row, column)`` tuples that describe the lowest
+                 cost path through the matrix
+
+        """
+        self.C = self.pad_matrix(cost_matrix)
+        self.n = len(self.C)
+        self.original_length = len(cost_matrix)
+        self.original_width = len(cost_matrix[0])
+        self.row_covered = [False for i in range(self.n)]
+        self.col_covered = [False for i in range(self.n)]
+        self.Z0_r = 0
+        self.Z0_c = 0
+        self.path = self.__make_matrix(self.n * 2, 0)
+        self.marked = self.__make_matrix(self.n, 0)
+
+        done = False
+        step = 1
+
+        steps = { 1 : self.__step1,
+                  2 : self.__step2,
+                  3 : self.__step3,
+                  4 : self.__step4,
+                  5 : self.__step5,
+                  6 : self.__step6 }
+
+        while not done:
+            try:
+                func = steps[step]
+                step = func()
+            except KeyError:
+                done = True
+
+        # Look for the starred columns
+        results = []
+        for i in range(self.original_length):
+            for j in range(self.original_width):
+                if self.marked[i][j] == 1:
+                    results += [(i, j)]
+
+        return results
+
+    def __copy_matrix(self, matrix):
+        """Return an exact copy of the supplied matrix"""
+        return copy.deepcopy(matrix)
+
+    def __make_matrix(self, n, val):
+        """Create an *n*x*n* matrix, populating it with the specific value."""
+        matrix = []
+        for i in range(n):
+            matrix += [[val for j in range(n)]]
+        return matrix
+
+    def __step1(self):
+        """
+        For each row of the matrix, find the smallest element and
+        subtract it from every element in its row. Go to Step 2.
+        """
+        C = self.C
+        n = self.n
+        for i in range(n):
+            minval = min(self.C[i])
+            # Find the minimum value for this row and subtract that minimum
+            # from every element in the row.
+            for j in range(n):
+                self.C[i][j] -= minval
+
+        return 2
+
+    def __step2(self):
+        """
+        Find a zero (Z) in the resulting matrix. If there is no starred
+        zero in its row or column, star Z. Repeat for each element in the
+        matrix. Go to Step 3.
+        """
+        n = self.n
+        for i in range(n):
+            for j in range(n):
+                if (self.C[i][j] == 0) and \
+                        (not self.col_covered[j]) and \
+                        (not self.row_covered[i]):
+                    self.marked[i][j] = 1
+                    self.col_covered[j] = True
+                    self.row_covered[i] = True
+
+        self.__clear_covers()
+        return 3
+
+    def __step3(self):
+        """
+        Cover each column containing a starred zero. If K columns are
+        covered, the starred zeros describe a complete set of unique
+        assignments. In this case, Go to DONE, otherwise, Go to Step 4.
+        """
+        n = self.n
+        count = 0
+        for i in range(n):
+            for j in range(n):
+                if self.marked[i][j] == 1:
+                    self.col_covered[j] = True
+                    count += 1
+
+        if count >= n:
+            step = 7 # done
+        else:
+            step = 4
+
+        return step
+
+    def __step4(self):
+        """
+        Find a noncovered zero and prime it. If there is no starred zero
+        in the row containing this primed zero, Go to Step 5. Otherwise,
+        cover this row and uncover the column containing the starred
+        zero. Continue in this manner until there are no uncovered zeros
+        left. Save the smallest uncovered value and Go to Step 6.
+        """
+        step = 0
+        done = False
+        row = -1
+        col = -1
+        star_col = -1
+        while not done:
+            (row, col) = self.__find_a_zero()
+            if row < 0:
+                done = True
+                step = 6
+            else:
+                self.marked[row][col] = 2
+                star_col = self.__find_star_in_row(row)
+                if star_col >= 0:
+                    col = star_col
+                    self.row_covered[row] = True
+                    self.col_covered[col] = False
+                else:
+                    done = True
+                    self.Z0_r = row
+                    self.Z0_c = col
+                    step = 5
+
+        return step
+
+    def __step5(self):
+        """
+        Construct a series of alternating primed and starred zeros as
+        follows. Let Z0 represent the uncovered primed zero found in Step 4.
+        Let Z1 denote the starred zero in the column of Z0 (if any).
+        Let Z2 denote the primed zero in the row of Z1 (there will always
+        be one). Continue until the series terminates at a primed zero
+        that has no starred zero in its column. Unstar each starred zero
+        of the series, star each primed zero of the series, erase all
+        primes and uncover every line in the matrix. Return to Step 3
+        """
+        count = 0
+        path = self.path
+        path[count][0] = self.Z0_r
+        path[count][1] = self.Z0_c
+        done = False
+        while not done:
+            row = self.__find_star_in_col(path[count][1])
+            if row >= 0:
+                count += 1
+                path[count][0] = row
+                path[count][1] = path[count-1][1]
+            else:
+                done = True
+
+            if not done:
+                col = self.__find_prime_in_row(path[count][0])
+                count += 1
+                path[count][0] = path[count-1][0]
+                path[count][1] = col
+
+        self.__convert_path(path, count)
+        self.__clear_covers()
+        self.__erase_primes()
+        return 3
+
+    def __step6(self):
+        """
+        Add the value found in Step 4 to every element of each covered
+        row, and subtract it from every element of each uncovered column.
+        Return to Step 4 without altering any stars, primes, or covered
+        lines.
+        """
+        minval = self.__find_smallest()
+        for i in range(self.n):
+            for j in range(self.n):
+                if self.row_covered[i]:
+                    self.C[i][j] += minval
+                if not self.col_covered[j]:
+                    self.C[i][j] -= minval
+        return 4
+
+    def __find_smallest(self):
+        """Find the smallest uncovered value in the matrix."""
+        minval = sys.maxsize
+        for i in range(self.n):
+            for j in range(self.n):
+                if (not self.row_covered[i]) and (not self.col_covered[j]):
+                    if minval > self.C[i][j]:
+                        minval = self.C[i][j]
+        return minval
+
+    def __find_a_zero(self):
+        """Find the first uncovered element with value 0"""
+        row = -1
+        col = -1
+        i = 0
+        n = self.n
+        done = False
+
+        while not done:
+            j = 0
+            while True:
+                if (self.C[i][j] == 0) and \
+                        (not self.row_covered[i]) and \
+                        (not self.col_covered[j]):
+                    row = i
+                    col = j
+                    done = True
+                j += 1
+                if j >= n:
+                    break
+            i += 1
+            if i >= n:
+                done = True
+
+        return (row, col)
+
+    def __find_star_in_row(self, row):
+        """
+        Find the first starred element in the specified row. Returns
+        the column index, or -1 if no starred element was found.
+        """
+        col = -1
+        for j in range(self.n):
+            if self.marked[row][j] == 1:
+                col = j
+                break
+
+        return col
+
+    def __find_star_in_col(self, col):
+        """
+        Find the first starred element in the specified row. Returns
+        the row index, or -1 if no starred element was found.
+        """
+        row = -1
+        for i in range(self.n):
+            if self.marked[i][col] == 1:
+                row = i
+                break
+
+        return row
+
+    def __find_prime_in_row(self, row):
+        """
+        Find the first prime element in the specified row. Returns
+        the column index, or -1 if no starred element was found.
+        """
+        col = -1
+        for j in range(self.n):
+            if self.marked[row][j] == 2:
+                col = j
+                break
+
+        return col
+
+    def __convert_path(self, path, count):
+        for i in range(count+1):
+            if self.marked[path[i][0]][path[i][1]] == 1:
+                self.marked[path[i][0]][path[i][1]] = 0
+            else:
+                self.marked[path[i][0]][path[i][1]] = 1
+
+    def __clear_covers(self):
+        """Clear all covered matrix cells"""
+        for i in range(self.n):
+            self.row_covered[i] = False
+            self.col_covered[i] = False
+
+    def __erase_primes(self):
+        """Erase all prime markings"""
+        for i in range(self.n):
+            for j in range(self.n):
+                if self.marked[i][j] == 2:
+                    self.marked[i][j] = 0
+
+# ---------------------------------------------------------------------------
+# Functions
+# ---------------------------------------------------------------------------
+
+def make_cost_matrix(profit_matrix, inversion_function):
+    """
+    Create a cost matrix from a profit matrix by calling
+    'inversion_function' to invert each value. The inversion
+    function must take one numeric argument (of any type) and return
+    another numeric argument which is presumed to be the cost inverse
+    of the original profit.
+
+    This is a static method. Call it like this:
+
+    .. python::
+
+        cost_matrix = Munkres.make_cost_matrix(matrix, inversion_func)
+
+    For example:
+
+    .. python::
+
+        cost_matrix = Munkres.make_cost_matrix(matrix, lambda x : sys.maxsize - x)
+
+    :Parameters:
+        profit_matrix : list of lists
+            The matrix to convert from a profit to a cost matrix
+
+        inversion_function : function
+            The function to use to invert each entry in the profit matrix
+
+    :rtype: list of lists
+    :return: The converted matrix
+    """
+    cost_matrix = []
+    for row in profit_matrix:
+        cost_matrix.append([inversion_function(value) for value in row])
+    return cost_matrix
+
+def print_matrix(matrix, msg=None):
+    """
+    Convenience function: Displays the contents of a matrix of integers.
+
+    :Parameters:
+        matrix : list of lists
+            Matrix to print
+
+        msg : str
+            Optional message to print before displaying the matrix
+    """
+    import math
+
+    if msg is not None:
+        print(msg)
+
+    # Calculate the appropriate format width.
+    width = 0
+    for row in matrix:
+        for val in row:
+            width = max(width, int(math.log10(val)) + 1)
+
+    # Make the format string
+    format = '%%%dd' % width
+
+    # Print the matrix
+    for row in matrix:
+        sep = '['
+        for val in row:
+            sys.stdout.write(sep + format % val)
+            sep = ', '
+        sys.stdout.write(']\n')
+
+# ---------------------------------------------------------------------------
+# Main
+# ---------------------------------------------------------------------------
+
+if __name__ == '__main__':
+
+    matrices = [
+        # Square
+        ([[400, 150, 400],
+          [400, 450, 600],
+          [300, 225, 300]],
+         850),  # expected cost
+
+        # Rectangular variant
+        ([[400, 150, 400, 1],
+          [400, 450, 600, 2],
+          [300, 225, 300, 3]],
+         452),  # expected cost
+
+
+        # Square
+        ([[10, 10,  8],
+          [9,  8,  1],
+          [9,  7,  4]],
+         18),
+
+        # Rectangular variant
+        ([[10, 10,  8, 11],
+          [9,  8,  1, 1],
+          [9,  7,  4, 10]],
+         15)]
+
+    m = Munkres()
+    for cost_matrix, expected_total in matrices:
+        print_matrix(cost_matrix, msg='cost matrix')
+        indexes = m.compute(cost_matrix)
+        total_cost = 0
+        for r, c in indexes:
+            x = cost_matrix[r][c]
+            total_cost += x
+            print('(%d, %d) -> %d' % (r, c, x))
+        print('lowest cost=%d' % total_cost)
+        assert expected_total == total_cost
diff --git a/lib/musicbrainzngs/__init__.py b/lib/musicbrainzngs/__init__.py
deleted file mode 100644
index 22fed80d..00000000
--- a/lib/musicbrainzngs/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from musicbrainzngs.musicbrainz import *
-from musicbrainzngs.caa import *
diff --git a/lib/musicbrainzngs/caa.py b/lib/musicbrainzngs/caa.py
deleted file mode 100644
index caa0c5f3..00000000
--- a/lib/musicbrainzngs/caa.py
+++ /dev/null
@@ -1,187 +0,0 @@
-# This file is part of the musicbrainzngs library
-# Copyright (C) Alastair Porter, Wieland Hoffmann, and others
-# This file is distributed under a BSD-2-Clause type license.
-# See the COPYING file for more information.
-
-__all__ = [
-    'set_caa_hostname', 'get_image_list', 'get_release_group_image_list',
-    'get_release_group_image_front', 'get_image_front', 'get_image_back',
-    'get_image'
-    ]
-
-import json
-
-from musicbrainzngs import compat
-from musicbrainzngs import musicbrainz
-from musicbrainzngs.util import _unicode
-
-hostname = "coverartarchive.org"
-https = True
-
-
-def set_caa_hostname(new_hostname, use_https=False):
-    """Set the base hostname for Cover Art Archive requests.
-    Defaults to 'coverartarchive.org', accessing over https.
-    For backwards compatibility, `use_https` is False by default.
-
-    :param str new_hostname: The hostname (and port) of the CAA server to connect to
-    :param bool use_https: `True` if the host should be accessed using https. Default is `False`
-"""
-    global hostname
-    global https
-    hostname = new_hostname
-    https = use_https
-
-
-def _caa_request(mbid, imageid=None, size=None, entitytype="release"):
-    """ Make a CAA request.
-
-    :param imageid: ``front``, ``back`` or a number from the listing obtained
-                    with :meth:`get_image_list`.
-    :type imageid: str
-
-    :param size: "250", "500", "1200"
-    :type size: str or None
-
-    :param entitytype: ``release`` or ``release-group``
-    :type entitytype: str
-    """
-    # Construct the full URL for the request, including hostname and
-    # query string.
-    path = [entitytype, mbid]
-    if imageid and size:
-        path.append("%s-%s" % (imageid, size))
-    elif imageid:
-        path.append(imageid)
-    url = compat.urlunparse((
-        'https' if https else 'http',
-        hostname,
-        '/%s' % '/'.join(path),
-        '',
-        '',
-        ''
-    ))
-    musicbrainz._log.debug("GET request for %s" % (url, ))
-
-    # Set up HTTP request handler and URL opener.
-    httpHandler = compat.HTTPHandler(debuglevel=0)
-    handlers = [httpHandler]
-
-    opener = compat.build_opener(*handlers)
-
-    # Make request.
-    req = musicbrainz._MusicbrainzHttpRequest("GET", url, None)
-    # Useragent isn't needed for CAA, but we'll add it if it exists
-    if musicbrainz._useragent != "":
-        req.add_header('User-Agent', musicbrainz._useragent)
-        musicbrainz._log.debug("requesting with UA %s" % musicbrainz._useragent)
-
-    resp = musicbrainz._safe_read(opener, req, None)
-
-    # TODO: The content type declared by the CAA for JSON files is
-    # 'applicaiton/octet-stream'. This is not useful to detect whether the
-    # content is JSON, so default to decoding JSON if no imageid was supplied.
-    # http://tickets.musicbrainz.org/browse/CAA-75
-    if imageid:
-        # If we asked for an image, return the image
-        return resp
-    else:
-        # Otherwise it's json
-        data = _unicode(resp)
-        return json.loads(data)
-
-
-def get_image_list(releaseid):
-    """Get the list of cover art associated with a release.
-
-    The return value is the deserialized response of the `JSON listing
-    <http://musicbrainz.org/doc/Cover_Art_Archive/API#.2Frelease.2F.7Bmbid.7D.2F>`_
-    returned by the Cover Art Archive API.
-
-    If an error occurs then a :class:`~musicbrainzngs.ResponseError` will
-    be raised with one of the following HTTP codes:
-
-    * 400: `Releaseid` is not a valid UUID
-    * 404: No release exists with an MBID of `releaseid`
-    * 503: Ratelimit exceeded
-    """
-    return _caa_request(releaseid)
-
-
-def get_release_group_image_list(releasegroupid):
-    """Get the list of cover art associated with a release group.
-
-    The return value is the deserialized response of the `JSON listing
-    <http://musicbrainz.org/doc/Cover_Art_Archive/API#.2Frelease-group.2F.7Bmbid.7D.2F>`_
-    returned by the Cover Art Archive API.
-
-    If an error occurs then a :class:`~musicbrainzngs.ResponseError` will
-    be raised with one of the following HTTP codes:
-
-    * 400: `Releaseid` is not a valid UUID
-    * 404: No release exists with an MBID of `releaseid`
-    * 503: Ratelimit exceeded
-    """
-    return _caa_request(releasegroupid, entitytype="release-group")
-
-
-def get_release_group_image_front(releasegroupid, size=None):
-    """Download the front cover art for a release group.
-    The `size` argument and the possible error conditions are the same as for
-    :meth:`get_image`.
-    """
-    return get_image(releasegroupid, "front", size=size,
-                     entitytype="release-group")
-
-
-def get_image_front(releaseid, size=None):
-    """Download the front cover art for a release.
-    The `size` argument and the possible error conditions are the same as for
-    :meth:`get_image`.
-    """
-    return get_image(releaseid, "front", size=size)
-
-
-def get_image_back(releaseid, size=None):
-    """Download the back cover art for a release.
-    The `size` argument and the possible error conditions are the same as for
-    :meth:`get_image`.
-    """
-    return get_image(releaseid, "back", size=size)
-
-
-def get_image(mbid, coverid, size=None, entitytype="release"):
-    """Download cover art for a release. The coverart file to download
-    is specified by the `coverid` argument.
-
-    If `size` is not specified, download the largest copy present, which can be
-    very large.
-
-    If an error occurs then a :class:`~musicbrainzngs.ResponseError`
-    will be raised with one of the following HTTP codes:
-
-    * 400: `Releaseid` is not a valid UUID or `coverid` is invalid
-    * 404: No release exists with an MBID of `releaseid`
-    * 503: Ratelimit exceeded
-
-    :param coverid: ``front``, ``back`` or a number from the listing obtained with
-                    :meth:`get_image_list`
-    :type coverid: int or str
-
-    :param size: "250", "500", "1200" or None. If it is None, the largest
-                 available picture will be downloaded. If the image originally
-                 uploaded to the Cover Art Archive was smaller than the
-                 requested size, only the original image will be returned.
-    :type size: str or None
-
-    :param entitytype: The type of entity for which to download the cover art.
-                       This is either ``release`` or ``release-group``.
-    :type entitytype: str
-    :return: The binary image data
-    :type: str
-    """
-    if isinstance(coverid, int):
-        coverid = "%d" % (coverid, )
-    if isinstance(size, int):
-        size = "%d" % (size, )
-    return _caa_request(mbid, coverid, size=size, entitytype=entitytype)
diff --git a/lib/musicbrainzngs/compat.py b/lib/musicbrainzngs/compat.py
deleted file mode 100644
index 689e0834..00000000
--- a/lib/musicbrainzngs/compat.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2012 Kenneth Reitz.
-
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""
-pythoncompat
-"""
-
-
-import sys
-
-# -------
-# Pythons
-# -------
-
-# Syntax sugar.
-_ver = sys.version_info
-
-#: Python 2.x?
-is_py2 = (_ver[0] == 2)
-
-#: Python 3.x?
-is_py3 = (_ver[0] == 3)
-
-# ---------
-# Specifics
-# ---------
-
-if is_py2:
-	from StringIO import StringIO
-	from urllib2 import HTTPPasswordMgr, HTTPDigestAuthHandler, Request,\
-						HTTPHandler, build_opener, HTTPError, URLError
-	from httplib import BadStatusLine, HTTPException
-	from urlparse import urlunparse
-	from urllib import urlencode, quote_plus
-
-	bytes = str
-	unicode = unicode
-	basestring = basestring
-elif is_py3:
-	from io import StringIO
-	from urllib.request import HTTPPasswordMgr, HTTPDigestAuthHandler, Request,\
-								HTTPHandler, build_opener
-	from urllib.error import HTTPError, URLError
-	from http.client import HTTPException, BadStatusLine
-	from urllib.parse import urlunparse, urlencode, quote_plus
-
-	unicode = str
-	bytes = bytes
-	basestring = (str,bytes)
diff --git a/lib/musicbrainzngs/mbxml.py b/lib/musicbrainzngs/mbxml.py
deleted file mode 100644
index e85fe7cb..00000000
--- a/lib/musicbrainzngs/mbxml.py
+++ /dev/null
@@ -1,817 +0,0 @@
-# This file is part of the musicbrainzngs library
-# Copyright (C) Alastair Porter, Adrian Sampson, and others
-# This file is distributed under a BSD-2-Clause type license.
-# See the COPYING file for more information.
-
-import re
-import xml.etree.ElementTree as ET
-import logging
-
-from . import util
-
-
-def fixtag(tag, namespaces):
-    # given a decorated tag (of the form {uri}tag), return prefixed
-    # tag and namespace declaration, if any
-    if isinstance(tag, ET.QName):
-        tag = tag.text
-    namespace_uri, tag = tag[1:].split("}", 1)
-    prefix = namespaces.get(namespace_uri)
-    if prefix is None:
-        prefix = "ns%d" % len(namespaces)
-        namespaces[namespace_uri] = prefix
-        if prefix == "xml":
-            xmlns = None
-        else:
-            xmlns = ("xmlns:%s" % prefix, namespace_uri)
-    else:
-        xmlns = None
-    return "%s:%s" % (prefix, tag), xmlns
-
-
-NS_MAP = {"http://musicbrainz.org/ns/mmd-2.0#": "ws2",
-          "http://musicbrainz.org/ns/ext#-2.0": "ext"}
-_log = logging.getLogger("musicbrainzngs")
-
-def get_error_message(error):
-    """ Given an error XML message from the webservice containing
-    <error><text>x</text><text>y</text></error>, return a list
-    of [x, y]"""
-    try:
-        tree = util.bytes_to_elementtree(error)
-        root = tree.getroot()
-        errors = []
-        if root.tag == "error":
-            for ch in root:
-                if ch.tag == "text":
-                    errors.append(ch.text)
-        return errors
-    except ET.ParseError:
-        return None
-
-def make_artist_credit(artists):
-    names = []
-    for artist in artists:
-        if isinstance(artist, dict):
-            if "name" in artist:
-                names.append(artist.get("name", ""))
-            else:
-                names.append(artist.get("artist", {}).get("name", ""))
-        else:
-                names.append(artist)
-    return "".join(names)
-
-def parse_elements(valid_els, inner_els, element):
-    """ Extract single level subelements from an element.
-        For example, given the element:
-        <element>
-            <subelement>Text</subelement>
-        </element>
-        and a list valid_els that contains "subelement",
-        return a dict {'subelement': 'Text'}
-
-        Delegate the parsing of multi-level subelements to another function.
-        For example, given the element:
-        <element>
-            <subelement>
-                <a>Foo</a><b>Bar</b>
-            </subelement>
-        </element>
-        and a dictionary {'subelement': parse_subelement},
-        call parse_subelement(<subelement>) and
-        return a dict {'subelement': <result>}
-        if parse_subelement returns a tuple of the form
-        (True, {'subelement-key': <result>})
-        then merge the second element of the tuple into the
-        result (which may have a key other than 'subelement' or
-        more than 1 key)
-    """
-    result = {}
-    for sub in element:
-        t = fixtag(sub.tag, NS_MAP)[0]
-        if ":" in t:
-            t = t.split(":")[1]
-        if t in valid_els:
-            result[t] = sub.text or ""
-        elif t in inner_els.keys():
-            inner_result = inner_els[t](sub)
-            if isinstance(inner_result, tuple) and inner_result[0]:
-                result.update(inner_result[1])
-            else:
-                result[t] = inner_result
-            # add counts for lists when available
-            m = re.match(r'([a-z0-9-]+)-list', t)
-            if m and "count" in sub.attrib:
-                result["%s-count" % m.group(1)] = int(sub.attrib["count"])
-        else:
-            _log.info("in <%s>, uncaught <%s>",
-                      fixtag(element.tag, NS_MAP)[0], t)
-    return result
-
-def parse_attributes(attributes, element):
-    """ Extract attributes from an element.
-        For example, given the element:
-        <element type="Group" />
-        and a list attributes that contains "type",
-        return a dict {'type': 'Group'}
-    """
-    result = {}
-    for attr in element.attrib:
-        if "{" in attr:
-            a = fixtag(attr, NS_MAP)[0]
-        else:
-            a = attr
-        if a in attributes:
-            result[a] = element.attrib[attr]
-        else:
-            _log.info("in <%s>, uncaught attribute %s", fixtag(element.tag, NS_MAP)[0], attr)
-
-    return result
-
-def parse_message(message):
-    tree = util.bytes_to_elementtree(message)
-    root = tree.getroot()
-    result = {}
-    valid_elements = {"area": parse_area,
-                      "artist": parse_artist,
-                      "instrument": parse_instrument,
-                      "label": parse_label,
-                      "place": parse_place,
-                      "event": parse_event,
-                      "release": parse_release,
-                      "release-group": parse_release_group,
-                      "series": parse_series,
-                      "recording": parse_recording,
-                      "work": parse_work,
-                      "url": parse_url,
-
-                      "disc": parse_disc,
-                      "cdstub": parse_cdstub,
-                      "isrc": parse_isrc,
-
-                      "annotation-list": parse_annotation_list,
-                      "area-list": parse_area_list,
-                      "artist-list": parse_artist_list,
-                      "label-list": parse_label_list,
-                      "place-list": parse_place_list,
-                      "event-list": parse_event_list,
-                      "instrument-list": parse_instrument_list,
-                      "release-list": parse_release_list,
-                      "release-group-list": parse_release_group_list,
-                      "series-list": parse_series_list,
-                      "recording-list": parse_recording_list,
-                      "work-list": parse_work_list,
-                      "url-list": parse_url_list,
-
-                      "collection-list": parse_collection_list,
-                      "collection": parse_collection,
-
-                      "message": parse_response_message
-                      }
-    result.update(parse_elements([], valid_elements, root))
-    return result
-
-def parse_response_message(message):
-    return parse_elements(["text"], {}, message)
-
-def parse_collection_list(cl):
-    return [parse_collection(c) for c in cl]
-
-def parse_collection(collection):
-    result = {}
-    attribs = ["id", "type", "entity-type"]
-    elements = ["name", "editor"]
-    inner_els = {"release-list": parse_release_list,
-                 "artist-list": parse_artist_list,
-                 "event-list": parse_event_list,
-                 "place-list": parse_place_list,
-                 "recording-list": parse_recording_list,
-                 "work-list": parse_work_list}
-    result.update(parse_attributes(attribs, collection))
-    result.update(parse_elements(elements, inner_els, collection))
-
-    return result
-
-def parse_annotation_list(al):
-    return [parse_annotation(a) for a in al]
-
-def parse_annotation(annotation):
-    result = {}
-    attribs = ["type", "ext:score"]
-    elements = ["entity", "name", "text"]
-    result.update(parse_attributes(attribs, annotation))
-    result.update(parse_elements(elements, {}, annotation))
-    return result
-
-def parse_lifespan(lifespan):
-    parts = parse_elements(["begin", "end", "ended"], {}, lifespan)
-
-    return parts
-
-def parse_area_list(al):
-    return [parse_area(a) for a in al]
-
-def parse_area(area):
-    result = {}
-    attribs = ["id", "type", "ext:score"]
-    elements = ["name", "sort-name", "disambiguation"]
-    inner_els = {"life-span": parse_lifespan,
-                 "alias-list": parse_alias_list,
-                 "relation-list": parse_relation_list,
-                 "annotation": parse_annotation,
-                 "iso-3166-1-code-list": parse_element_list,
-                 "iso-3166-2-code-list": parse_element_list,
-                 "iso-3166-3-code-list": parse_element_list}
-
-    result.update(parse_attributes(attribs, area))
-    result.update(parse_elements(elements, inner_els, area))
-
-    return result
-
-def parse_artist_list(al):
-    return [parse_artist(a) for a in al]
-
-def parse_artist(artist):
-    result = {}
-    attribs = ["id", "type", "ext:score"]
-    elements = ["name", "sort-name", "country", "user-rating",
-                "disambiguation", "gender", "ipi"]
-    inner_els = {"area": parse_area,
-                 "begin-area": parse_area,
-                 "end-area": parse_area,
-                 "life-span": parse_lifespan,
-                 "recording-list": parse_recording_list,
-                 "relation-list": parse_relation_list,
-                 "release-list": parse_release_list,
-                 "release-group-list": parse_release_group_list,
-                 "work-list": parse_work_list,
-                 "tag-list": parse_tag_list,
-                 "user-tag-list": parse_tag_list,
-                 "rating": parse_rating,
-                 "ipi-list": parse_element_list,
-                 "isni-list": parse_element_list,
-                 "alias-list": parse_alias_list,
-                 "annotation": parse_annotation}
-
-    result.update(parse_attributes(attribs, artist))
-    result.update(parse_elements(elements, inner_els, artist))
-
-    return result
-
-def parse_coordinates(c):
-    return parse_elements(['latitude', 'longitude'], {}, c)
-
-def parse_place_list(pl):
-    return [parse_place(p) for p in pl]
-
-def parse_place(place):
-    result = {}
-    attribs = ["id", "type", "ext:score"]
-    elements = ["name", "address",
-                "ipi", "disambiguation"]
-    inner_els = {"area": parse_area,
-                 "coordinates": parse_coordinates,
-                 "life-span": parse_lifespan,
-                 "tag-list": parse_tag_list,
-                 "user-tag-list": parse_tag_list,
-                 "alias-list": parse_alias_list,
-                 "relation-list": parse_relation_list,
-                 "annotation": parse_annotation}
-
-    result.update(parse_attributes(attribs, place))
-    result.update(parse_elements(elements, inner_els, place))
-
-    return result
-
-def parse_event_list(el):
-    return [parse_event(e) for e in el]
-
-def parse_event(event):
-    result = {}
-    attribs = ["id", "type", "ext:score"]
-    elements = ["name", "time", "setlist", "cancelled", "disambiguation", "user-rating"]
-    inner_els = {"life-span": parse_lifespan,
-                 "relation-list": parse_relation_list,
-                 "alias-list": parse_alias_list,
-                 "tag-list": parse_tag_list,
-                 "user-tag-list": parse_tag_list,
-                 "rating": parse_rating}
-
-    result.update(parse_attributes(attribs, event))
-    result.update(parse_elements(elements, inner_els, event))
-
-    return result
-
-def parse_instrument(instrument):
-    result = {}
-    attribs = ["id", "type", "ext:score"]
-    elements = ["name", "description", "disambiguation"]
-    inner_els = {"relation-list": parse_relation_list,
-                 "tag-list": parse_tag_list,
-                 "alias-list": parse_alias_list,
-                 "annotation": parse_annotation}
-    result.update(parse_attributes(attribs, instrument))
-    result.update(parse_elements(elements, inner_els, instrument))
-
-    return result
-
-def parse_label_list(ll):
-    return [parse_label(l) for l in ll]
-
-def parse_label(label):
-    result = {}
-    attribs = ["id", "type", "ext:score"]
-    elements = ["name", "sort-name", "country", "label-code", "user-rating",
-                "ipi", "disambiguation"]
-    inner_els = {"area": parse_area,
-                 "life-span": parse_lifespan,
-                 "release-list": parse_release_list,
-                 "tag-list": parse_tag_list,
-                 "user-tag-list": parse_tag_list,
-                 "rating": parse_rating,
-                 "ipi-list": parse_element_list,
-                 "alias-list": parse_alias_list,
-                 "relation-list": parse_relation_list,
-                 "annotation": parse_annotation}
-
-    result.update(parse_attributes(attribs, label))
-    result.update(parse_elements(elements, inner_els, label))
-
-    return result
-
-def parse_relation_target(tgt):
-    attributes = parse_attributes(['id'], tgt)
-    if 'id' in attributes:
-        return (True, {'target-id': attributes['id']})
-    else:
-        return (True, {'target-id': tgt.text})
-
-def parse_relation_list(rl):
-    attribs = ["target-type"]
-    ttype = parse_attributes(attribs, rl)
-    key = "%s-relation-list" % ttype["target-type"]
-    return (True, {key: [parse_relation(r) for r in rl]})
-
-def parse_relation(relation):
-    result = {}
-    attribs = ["type", "type-id"]
-    elements = ["target", "direction", "begin", "end", "ended", "ordering-key"]
-    inner_els = {"area": parse_area,
-                 "artist": parse_artist,
-                 "instrument": parse_instrument,
-                 "label": parse_label,
-                 "place": parse_place,
-                 "event": parse_event,
-                 "recording": parse_recording,
-                 "release": parse_release,
-                 "release-group": parse_release_group,
-                 "series": parse_series,
-                 "attribute-list": parse_element_list,
-                 "work": parse_work,
-                 "target": parse_relation_target
-                }
-    result.update(parse_attributes(attribs, relation))
-    result.update(parse_elements(elements, inner_els, relation))
-    # We parse attribute-list again to get attributes that have both
-    # text and attribute values
-    result.update(parse_elements(['target-credit'], {"attribute-list": parse_relation_attribute_list}, relation))
-
-    return result
-
-def parse_relation_attribute_list(attributelist):
-    ret = []
-    for attribute in attributelist:
-        ret.append(parse_relation_attribute_element(attribute))
-    return (True, {"attributes": ret})
-
-def parse_relation_attribute_element(element):
-    # Parses an attribute into a dictionary containing an element
-    # {"attribute": <text value>} and also an additional element
-    # containing any xml attributes.
-    # e.g <attribute value="BuxWV 1">number</attribute>
-    # -> {"attribute": "number", "value": "BuxWV 1"}
-    result = {}
-    for attr in element.attrib:
-        if "{" in attr:
-            a = fixtag(attr, NS_MAP)[0]
-        else:
-            a = attr
-        result[a] = element.attrib[attr]
-    result["attribute"] = element.text
-    return result
-
-def parse_release(release):
-    result = {}
-    attribs = ["id", "ext:score"]
-    elements = ["title", "status", "disambiguation", "quality", "country",
-                "barcode", "date", "packaging", "asin"]
-    inner_els = {"text-representation": parse_text_representation,
-                 "artist-credit": parse_artist_credit,
-                 "label-info-list": parse_label_info_list,
-                 "medium-list": parse_medium_list,
-                 "release-group": parse_release_group,
-                 "tag-list": parse_tag_list,
-                 "user-tag-list": parse_tag_list,
-                 "relation-list": parse_relation_list,
-                 "annotation": parse_annotation,
-                 "cover-art-archive": parse_caa,
-                 "release-event-list": parse_release_event_list}
-
-    result.update(parse_attributes(attribs, release))
-    result.update(parse_elements(elements, inner_els, release))
-    if "artist-credit" in result:
-        result["artist-credit-phrase"] = make_artist_credit(
-                                                        result["artist-credit"])
-
-    return result
-
-def parse_medium_list(ml):
-    """medium-list results from search have an additional
-    <track-count> element containing the number of tracks
-    over all mediums. Optionally add this"""
-    medium_list = []
-    track_count = None
-    for m in ml:
-        tag = fixtag(m.tag, NS_MAP)[0]
-        if tag == "ws2:medium":
-            medium_list.append(parse_medium(m))
-        elif tag == "ws2:track-count":
-            track_count = int(m.text)
-    ret = {"medium-list": medium_list}
-    if track_count is not None:
-        ret["medium-track-count"] = track_count
-
-    return (True, ret)
-
-def parse_release_event_list(rel):
-    return [parse_release_event(re) for re in rel]
-
-def parse_release_event(event):
-    result = {}
-    elements = ["date"]
-    inner_els = {"area": parse_area}
-
-    result.update(parse_elements(elements, inner_els, event))
-    return result
-
-def parse_medium(medium):
-    result = {}
-    elements = ["position", "format", "title"]
-    inner_els = {"disc-list": parse_disc_list,
-                 "pregap": parse_track,
-                 "track-list": parse_track_list,
-                 "data-track-list": parse_track_list}
-
-    result.update(parse_elements(elements, inner_els, medium))
-    return result
-
-def parse_disc_list(dl):
-    return [parse_disc(d) for d in dl]
-
-def parse_text_representation(textr):
-    return parse_elements(["language", "script"], {}, textr)
-
-def parse_release_group(rg):
-    result = {}
-    attribs = ["id", "type", "ext:score"]
-    elements = ["title", "user-rating", "first-release-date", "primary-type",
-                "disambiguation"]
-    inner_els = {"artist-credit": parse_artist_credit,
-                 "release-list": parse_release_list,
-                 "tag-list": parse_tag_list,
-                 "user-tag-list": parse_tag_list,
-                 "secondary-type-list": parse_element_list,
-                 "relation-list": parse_relation_list,
-                 "rating": parse_rating,
-                 "annotation": parse_annotation}
-
-    result.update(parse_attributes(attribs, rg))
-    result.update(parse_elements(elements, inner_els, rg))
-    if "artist-credit" in result:
-        result["artist-credit-phrase"] = make_artist_credit(result["artist-credit"])
-
-    return result
-
-def parse_recording(recording):
-    result = {}
-    attribs = ["id", "ext:score"]
-    elements = ["title", "length", "user-rating", "disambiguation", "video"]
-    inner_els = {"artist-credit": parse_artist_credit,
-                 "release-list": parse_release_list,
-                 "tag-list": parse_tag_list,
-                 "user-tag-list": parse_tag_list,
-                 "rating": parse_rating,
-                 "isrc-list": parse_external_id_list,
-                 "relation-list": parse_relation_list,
-                 "annotation": parse_annotation}
-
-    result.update(parse_attributes(attribs, recording))
-    result.update(parse_elements(elements, inner_els, recording))
-    if "artist-credit" in result:
-        result["artist-credit-phrase"] = make_artist_credit(result["artist-credit"])
-
-    return result
-
-def parse_series_list(sl):
-    return [parse_series(s) for s in sl]
-
-def parse_series(series):
-    result = {}
-    attribs = ["id", "type", "ext:score"]
-    elements = ["name", "disambiguation"]
-    inner_els = {"alias-list": parse_alias_list,
-                 "relation-list": parse_relation_list,
-                 "annotation": parse_annotation}
-
-    result.update(parse_attributes(attribs, series))
-    result.update(parse_elements(elements, inner_els, series))
-
-    return result
-
-def parse_external_id_list(pl):
-    return [parse_attributes(["id"], p)["id"] for p in pl]
-
-def parse_element_list(el):
-    return [e.text for e in el]
-
-def parse_work_list(wl):
-    return [parse_work(w) for w in wl]
-
-def parse_work(work):
-    result = {}
-    attribs = ["id", "ext:score", "type"]
-    elements = ["title", "user-rating", "language", "iswc", "disambiguation"]
-    inner_els = {"tag-list": parse_tag_list,
-                 "user-tag-list": parse_tag_list,
-                 "rating": parse_rating,
-                 "alias-list": parse_alias_list,
-                 "iswc-list": parse_element_list,
-                 "relation-list": parse_relation_list,
-                 "annotation": parse_response_message,
-                 "attribute-list": parse_work_attribute_list
-    }
-
-    result.update(parse_attributes(attribs, work))
-    result.update(parse_elements(elements, inner_els, work))
-
-    return result
-
-def parse_work_attribute_list(wal):
-    return [parse_work_attribute(wa) for wa in wal]
-
-def parse_work_attribute(wa):
-    attribs = ["type"]
-    typeinfo = parse_attributes(attribs, wa)
-    result = {}
-    if typeinfo:
-        result = {"attribute": typeinfo["type"],
-                  "value": wa.text}
-
-    return result
-
-
-def parse_url_list(ul):
-    return [parse_url(u) for u in ul]
-
-def parse_url(url):
-    result = {}
-    attribs = ["id"]
-    elements = ["resource"]
-    inner_els = {"relation-list": parse_relation_list}
-
-    result.update(parse_attributes(attribs, url))
-    result.update(parse_elements(elements, inner_els, url))
-
-    return result
-
-def parse_disc(disc):
-    result = {}
-    attribs = ["id"]
-    elements = ["sectors"]
-    inner_els = {"release-list": parse_release_list,
-                 "offset-list": parse_offset_list
-    }
-
-    result.update(parse_attributes(attribs, disc))
-    result.update(parse_elements(elements, inner_els, disc))
-
-    return result
-
-def parse_cdstub(cdstub):
-    result = {}
-    attribs = ["id"]
-    elements = ["title", "artist", "barcode"]
-    inner_els = {"track-list": parse_track_list}
-
-    result.update(parse_attributes(attribs, cdstub))
-    result.update(parse_elements(elements, inner_els, cdstub))
-
-    return result
-
-def parse_offset_list(ol):
-    return [int(o.text) for o in ol]
-
-def parse_instrument_list(rl):
-    result = []
-    for r in rl:
-        result.append(parse_instrument(r))
-    return result
-
-def parse_release_list(rl):
-    result = []
-    for r in rl:
-        result.append(parse_release(r))
-    return result
-
-def parse_release_group_list(rgl):
-    result = []
-    for rg in rgl:
-        result.append(parse_release_group(rg))
-    return result
-
-def parse_isrc(isrc):
-    result = {}
-    attribs = ["id"]
-    inner_els = {"recording-list": parse_recording_list}
-
-    result.update(parse_attributes(attribs, isrc))
-    result.update(parse_elements([], inner_els, isrc))
-
-    return result
-
-def parse_recording_list(recs):
-    result = []
-    for r in recs:
-        result.append(parse_recording(r))
-    return result
-
-def parse_artist_credit(ac):
-    result = []
-    for namecredit in ac:
-        result.append(parse_name_credit(namecredit))
-        join = parse_attributes(["joinphrase"], namecredit)
-        if "joinphrase" in join:
-            result.append(join["joinphrase"])
-    return result
-
-def parse_name_credit(nc):
-    result = {}
-    elements = ["name"]
-    inner_els = {"artist": parse_artist}
-
-    result.update(parse_elements(elements, inner_els, nc))
-
-    return result
-
-def parse_label_info_list(lil):
-    result = []
-
-    for li in lil:
-        result.append(parse_label_info(li))
-    return result
-
-def parse_label_info(li):
-    result = {}
-    elements = ["catalog-number"]
-    inner_els = {"label": parse_label}
-
-    result.update(parse_elements(elements, inner_els, li))
-    return result
-
-def parse_track_list(tl):
-    result = []
-    for t in tl:
-        result.append(parse_track(t))
-    return result
-
-def parse_track(track):
-    result = {}
-    attribs = ["id"]
-    elements = ["number", "position", "title", "length"]
-    inner_els = {"recording": parse_recording,
-                 "artist-credit": parse_artist_credit}
-
-    result.update(parse_attributes(attribs, track))
-    result.update(parse_elements(elements, inner_els, track))
-    if "artist-credit" in result.get("recording", {}) and "artist-credit" not in result:
-        result["artist-credit"] = result["recording"]["artist-credit"]
-    if "artist-credit" in result:
-        result["artist-credit-phrase"] = make_artist_credit(result["artist-credit"])
-    # Make a length field that contains track length or recording length
-    track_or_recording = None
-    if "length" in result:
-        track_or_recording = result["length"]
-    elif result.get("recording", {}).get("length"):
-        track_or_recording = result.get("recording", {}).get("length")
-    if track_or_recording:
-        result["track_or_recording_length"] = track_or_recording
-    return result
-
-def parse_tag_list(tl):
-    return [parse_tag(t) for t in tl]
-
-def parse_tag(tag):
-    result = {}
-    attribs = ["count"]
-    elements = ["name"]
-
-    result.update(parse_attributes(attribs, tag))
-    result.update(parse_elements(elements, {}, tag))
-
-    return result
-
-def parse_rating(rating):
-    result = {}
-    attribs = ["votes-count"]
-
-    result.update(parse_attributes(attribs, rating))
-    result["rating"] = rating.text
-
-    return result
-
-def parse_alias_list(al):
-    return [parse_alias(a) for a in al]
-
-def parse_alias(alias):
-    result = {}
-    attribs = ["locale", "sort-name", "type", "primary",
-               "begin-date", "end-date"]
-
-    result.update(parse_attributes(attribs, alias))
-    result["alias"] = alias.text
-
-    return result
-
-def parse_caa(caa_element):
-    result = {}
-    elements = ["artwork", "count", "front", "back", "darkened"]
-
-    result.update(parse_elements(elements, {}, caa_element))
-    return result
-
-
-###
-
-def make_barcode_request(release2barcode):
-    NS = "http://musicbrainz.org/ns/mmd-2.0#"
-    root = ET.Element("{%s}metadata" % NS)
-    rel_list = ET.SubElement(root, "{%s}release-list" % NS)
-    for release, barcode in release2barcode.items():
-        rel_xml = ET.SubElement(rel_list, "{%s}release" % NS)
-        bar_xml = ET.SubElement(rel_xml, "{%s}barcode" % NS)
-        rel_xml.set("{%s}id" % NS, release)
-        bar_xml.text = barcode
-
-    return ET.tostring(root, "utf-8")
-
-def make_tag_request(**kwargs):
-    NS = "http://musicbrainz.org/ns/mmd-2.0#"
-    root = ET.Element("{%s}metadata" % NS)
-    for entity_type in ['artist', 'label', 'place', 'recording', 'release', 'release_group', 'work']:
-        entity_tags = kwargs.pop(entity_type + '_tags', None)
-        if entity_tags is not None:
-            e_list = ET.SubElement(root, "{%s}%s-list" % (NS, entity_type.replace('_', '-')))
-            for e, tags in entity_tags.items():
-                e_xml = ET.SubElement(e_list, "{%s}%s" % (NS, entity_type.replace('_', '-')))
-                e_xml.set("{%s}id" % NS, e)
-                taglist = ET.SubElement(e_xml, "{%s}user-tag-list" % NS)
-                for tag in tags:
-                    usertag_xml = ET.SubElement(taglist, "{%s}user-tag" % NS)
-                    name_xml = ET.SubElement(usertag_xml, "{%s}name" % NS)
-                    name_xml.text = tag
-    if kwargs.keys():
-        raise TypeError("make_tag_request() got an unexpected keyword argument '%s'" % kwargs.popitem()[0])
-
-    return ET.tostring(root, "utf-8")
-
-def make_rating_request(**kwargs):
-    NS = "http://musicbrainz.org/ns/mmd-2.0#"
-    root = ET.Element("{%s}metadata" % NS)
-    for entity_type in ['artist', 'label', 'recording', 'release_group', 'work']:
-        entity_ratings = kwargs.pop(entity_type + '_ratings', None)
-        if entity_ratings is not None:
-            e_list = ET.SubElement(root, "{%s}%s-list" % (NS, entity_type.replace('_', '-')))
-            for e, rating in entity_ratings.items():
-                e_xml = ET.SubElement(e_list, "{%s}%s" % (NS, entity_type.replace('_', '-')))
-                e_xml.set("{%s}id" % NS, e)
-                rating_xml = ET.SubElement(e_xml, "{%s}user-rating" % NS)
-                rating_xml.text = str(rating)
-    if kwargs.keys():
-        raise TypeError("make_rating_request() got an unexpected keyword argument '%s'" % kwargs.popitem()[0])
-
-    return ET.tostring(root, "utf-8")
-
-def make_isrc_request(recording2isrcs):
-    NS = "http://musicbrainz.org/ns/mmd-2.0#"
-    root = ET.Element("{%s}metadata" % NS)
-    rec_list = ET.SubElement(root, "{%s}recording-list" % NS)
-    for rec, isrcs in recording2isrcs.items():
-        if len(isrcs) > 0:
-            rec_xml = ET.SubElement(rec_list, "{%s}recording" % NS)
-            rec_xml.set("{%s}id" % NS, rec)
-            isrc_list_xml = ET.SubElement(rec_xml, "{%s}isrc-list" % NS)
-            isrc_list_xml.set("{%s}count" % NS, str(len(isrcs)))
-            for isrc in isrcs:
-                isrc_xml = ET.SubElement(isrc_list_xml, "{%s}isrc" % NS)
-                isrc_xml.set("{%s}id" % NS, isrc)
-    return ET.tostring(root, "utf-8")
diff --git a/lib/musicbrainzngs/musicbrainz.py b/lib/musicbrainzngs/musicbrainz.py
deleted file mode 100644
index beb0a79b..00000000
--- a/lib/musicbrainzngs/musicbrainz.py
+++ /dev/null
@@ -1,1312 +0,0 @@
-# This file is part of the musicbrainzngs library
-# Copyright (C) Alastair Porter, Adrian Sampson, and others
-# This file is distributed under a BSD-2-Clause type license.
-# See the COPYING file for more information.
-
-import re
-import threading
-import time
-import logging
-import socket
-import hashlib
-import locale
-import sys
-import json
-import xml.etree.ElementTree as etree
-from xml.parsers import expat
-from warnings import warn
-
-from musicbrainzngs import mbxml
-from musicbrainzngs import util
-from musicbrainzngs import compat
-
-_version = "0.7.1"
-_log = logging.getLogger("musicbrainzngs")
-
-LUCENE_SPECIAL = r'([+\-&|!(){}\[\]\^"~*?:\\\/])'
-
-# Constants for validation.
-
-RELATABLE_TYPES = ['area', 'artist', 'label', 'place', 'event', 'recording', 'release', 'release-group', 'series', 'url', 'work', 'instrument']
-RELATION_INCLUDES = [entity + '-rels' for entity in RELATABLE_TYPES]
-TAG_INCLUDES = ["tags", "user-tags"]
-RATING_INCLUDES = ["ratings", "user-ratings"]
-
-VALID_INCLUDES = {
-    'area' : ["aliases", "annotation"] + RELATION_INCLUDES,
-    'artist': [
-        "recordings", "releases", "release-groups", "works", # Subqueries
-        "various-artists", "discids", "media", "isrcs",
-        "aliases", "annotation"
-    ] + RELATION_INCLUDES + TAG_INCLUDES + RATING_INCLUDES,
-    'annotation': [
-
-    ],
-    'instrument': ["aliases", "annotation"
-    ] + RELATION_INCLUDES + TAG_INCLUDES,
-    'label': [
-        "releases", # Subqueries
-        "discids", "media",
-        "aliases", "annotation"
-    ] + RELATION_INCLUDES + TAG_INCLUDES + RATING_INCLUDES,
-    'place' : ["aliases", "annotation"] + RELATION_INCLUDES + TAG_INCLUDES,
-    'event' : ["aliases"] + RELATION_INCLUDES + TAG_INCLUDES + RATING_INCLUDES,
-    'recording': [
-        "artists", "releases", # Subqueries
-        "discids", "media", "artist-credits", "isrcs",
-        "work-level-rels", "annotation", "aliases"
-    ] + TAG_INCLUDES + RATING_INCLUDES + RELATION_INCLUDES,
-    'release': [
-        "artists", "labels", "recordings", "release-groups", "media",
-        "artist-credits", "discids", "isrcs",
-        "recording-level-rels", "work-level-rels", "annotation", "aliases"
-    ] + TAG_INCLUDES + RELATION_INCLUDES,
-    'release-group': [
-        "artists", "releases", "discids", "media",
-        "artist-credits", "annotation", "aliases"
-    ] + TAG_INCLUDES + RATING_INCLUDES + RELATION_INCLUDES,
-    'series': [
-        "annotation", "aliases"
-    ] + RELATION_INCLUDES,
-    'work': [
-        "aliases", "annotation"
-    ] + TAG_INCLUDES + RATING_INCLUDES + RELATION_INCLUDES,
-    'url': RELATION_INCLUDES,
-    'discid': [ # Discid should be the same as release
-        "artists", "labels", "recordings", "release-groups", "media",
-        "artist-credits", "discids", "isrcs",
-        "recording-level-rels", "work-level-rels", "annotation", "aliases"
-    ] + RELATION_INCLUDES,
-    'isrc': ["artists", "releases", "isrcs"],
-    'iswc': ["artists"],
-    'collection': ['releases'],
-}
-VALID_BROWSE_INCLUDES = {
-    'artist': ["aliases"] + TAG_INCLUDES + RATING_INCLUDES + RELATION_INCLUDES,
-    'event': ["aliases"] + TAG_INCLUDES + RATING_INCLUDES + RELATION_INCLUDES,
-    'label': ["aliases"] + TAG_INCLUDES + RATING_INCLUDES + RELATION_INCLUDES,
-    'recording': ["artist-credits", "isrcs"] + TAG_INCLUDES + RATING_INCLUDES + RELATION_INCLUDES,
-    'release': ["artist-credits", "labels", "recordings", "isrcs",
-                "release-groups", "media", "discids"] + RELATION_INCLUDES,
-    'place': ["aliases"] + TAG_INCLUDES + RELATION_INCLUDES,
-    'release-group': ["artist-credits"] + TAG_INCLUDES + RATING_INCLUDES + RELATION_INCLUDES,
-    'url': RELATION_INCLUDES,
-    'work': ["aliases", "annotation"] + TAG_INCLUDES + RATING_INCLUDES + RELATION_INCLUDES,
-}
-
-#: These can be used to filter whenever releases are includes or browsed
-VALID_RELEASE_TYPES = [
-    "nat",
-    "album", "single", "ep", "broadcast", "other", # primary types
-    "compilation", "soundtrack", "spokenword", "interview", "audiobook",
-    "live", "remix", "dj-mix", "mixtape/street", # secondary types
-]
-#: These can be used to filter whenever releases or release-groups are involved
-VALID_RELEASE_STATUSES = ["official", "promotion", "bootleg", "pseudo-release"]
-VALID_SEARCH_FIELDS = {
-    'annotation': [
-        'entity', 'name', 'text', 'type'
-    ],
-    'area': [
-        'aid', 'alias', 'area', 'areaaccent', 'begin', 'comment', 'end',
-        'ended', 'iso', 'iso1', 'iso2', 'iso3', 'sortname', 'tag', 'type'
-    ],
-    'artist': [
-        'alias', 'area', 'arid', 'artist', 'artistaccent', 'begin', 'beginarea',
-        'comment', 'country', 'end', 'endarea', 'ended', 'gender',
-        'ipi', 'isni', 'primary_alias', 'sortname', 'tag', 'type'
-    ],
-    'event': [
-        'aid', 'alias', 'area', 'arid', 'artist', 'begin', 'comment', 'eid',
-        'end', 'ended', 'event', 'eventaccent', 'pid', 'place', 'tag', 'type'
-    ],
-    'instrument': [
-        'alias', 'comment', 'description', 'iid', 'instrument',
-        'instrumentaccent', 'tag', 'type'
-    ],
-    'label': [
-        'alias', 'area', 'begin', 'code', 'comment', 'country', 'end', 'ended',
-        'ipi', 'label', 'labelaccent', 'laid', 'release_count', 'sortname',
-        'tag', 'type'
-    ],
-    'place': [
-        'address', 'alias', 'area', 'begin', 'comment', 'end', 'ended', 'lat', 'long',
-        'pid', 'place', 'placeaccent', 'type'
-    ],
-    'recording': [
-        'alias', 'arid', 'artist', 'artistname', 'comment', 'country',
-        'creditname', 'date', 'dur', 'format', 'isrc', 'number', 'position',
-        'primarytype', 'qdur', 'recording', 'recordingaccent', 'reid',
-        'release', 'rgid', 'rid', 'secondarytype', 'status', 'tag', 'tid',
-        'tnum', 'tracks', 'tracksrelease', 'type', 'video'],
-
-    'release-group': [
-        'alias', 'arid', 'artist', 'artistname', 'comment', 'creditname',
-        'primarytype', 'reid', 'release', 'releasegroup', 'releasegroupaccent',
-        'releases', 'rgid', 'secondarytype', 'status', 'tag', 'type'
-    ],
-    'release': [
-        'alias', 'arid', 'artist', 'artistname', 'asin', 'barcode', 'catno',
-        'comment', 'country', 'creditname', 'date', 'discids', 'discidsmedium',
-        'format', 'label', 'laid', 'lang', 'mediums', 'primarytype', 'quality',
-        'reid', 'release', 'releaseaccent', 'rgid', 'script', 'secondarytype',
-        'status', 'tag', 'tracks', 'tracksmedium', 'type'
-    ],
-    'series': [
-        'alias', 'comment', 'orderingattribute', 'series', 'seriesaccent',
-        'sid', 'tag', 'type'
-    ],
-    'work': [
-        'alias', 'arid', 'artist', 'comment', 'iswc', 'lang', 'recording',
-        'recording_count', 'rid', 'tag', 'type', 'wid', 'work', 'workaccent'
-    ]
-}
-
-# Constants
-class AUTH_YES: pass
-class AUTH_NO: pass
-class AUTH_IFSET: pass
-
-
-# Exceptions.
-
-class MusicBrainzError(Exception):
-	"""Base class for all exceptions related to MusicBrainz."""
-	pass
-
-class UsageError(MusicBrainzError):
-	"""Error related to misuse of the module API."""
-	pass
-
-class InvalidSearchFieldError(UsageError):
-	pass
-
-class InvalidIncludeError(UsageError):
-	def __init__(self, msg='Invalid Includes', reason=None):
-		super(InvalidIncludeError, self).__init__(self)
-		self.msg = msg
-		self.reason = reason
-
-	def __str__(self):
-		return self.msg
-
-class InvalidFilterError(UsageError):
-	def __init__(self, msg='Invalid Includes', reason=None):
-		super(InvalidFilterError, self).__init__(self)
-		self.msg = msg
-		self.reason = reason
-
-	def __str__(self):
-		return self.msg
-
-class WebServiceError(MusicBrainzError):
-	"""Error related to MusicBrainz API requests."""
-	def __init__(self, message=None, cause=None):
-		"""Pass ``cause`` if this exception was caused by another
-		exception.
-		"""
-		self.message = message
-		self.cause = cause
-
-	def __str__(self):
-		if self.message:
-			msg = "%s, " % self.message
-		else:
-			msg = ""
-		msg += "caused by: %s" % str(self.cause)
-		return msg
-
-class NetworkError(WebServiceError):
-	"""Problem communicating with the MB server."""
-	pass
-
-class ResponseError(WebServiceError):
-	"""Bad response sent by the MB server."""
-	pass
-
-class AuthenticationError(WebServiceError):
-	"""Received a HTTP 401 response while accessing a protected resource."""
-	pass
-
-
-# Helpers for validating and formatting allowed sets.
-
-def _check_includes_impl(includes, valid_includes):
-    for i in includes:
-        if i not in valid_includes:
-            raise InvalidIncludeError("Bad includes: "
-                                      "%s is not a valid include" % i)
-def _check_includes(entity, inc):
-    _check_includes_impl(inc, VALID_INCLUDES[entity])
-
-def _check_filter(values, valid):
-	for v in values:
-		if v not in valid:
-			raise InvalidFilterError(v)
-
-def _check_filter_and_make_params(entity, includes, release_status=[], release_type=[]):
-    """Check that the status or type values are valid. Then, check that
-    the filters can be used with the given includes. Return a params
-    dict that can be passed to _do_mb_query.
-    """
-    if isinstance(release_status, compat.basestring):
-        release_status = [release_status]
-    if isinstance(release_type, compat.basestring):
-        release_type = [release_type]
-    _check_filter(release_status, VALID_RELEASE_STATUSES)
-    _check_filter(release_type, VALID_RELEASE_TYPES)
-
-    if (release_status
-            and "releases" not in includes and entity != "release"):
-        raise InvalidFilterError("Can't have a status with no release include")
-    if (release_type
-            and "release-groups" not in includes and "releases" not in includes
-            and entity not in ["release-group", "release"]):
-        raise InvalidFilterError("Can't have a release type "
-                "with no releases or release-groups involved")
-
-    # Build parameters.
-    params = {}
-    if len(release_status):
-        params["status"] = "|".join(release_status)
-    if len(release_type):
-        params["type"] = "|".join(release_type)
-    return params
-
-def _docstring_get(entity):
-    includes = list(VALID_INCLUDES.get(entity, []))
-    return _docstring_impl("includes", includes)
-
-def _docstring_browse(entity):
-    includes = list(VALID_BROWSE_INCLUDES.get(entity, []))
-    return _docstring_impl("includes", includes)
-
-def _docstring_search(entity):
-    search_fields = list(VALID_SEARCH_FIELDS.get(entity, []))
-    return _docstring_impl("fields", search_fields)
-
-def _docstring_impl(name, values):
-    def _decorator(func):
-        vstr = ", ".join(values)
-        args = {name: vstr}
-        if func.__doc__:
-            func.__doc__ = func.__doc__.format(**args)
-        return func
-
-    return _decorator
-
-
-# Global authentication and endpoint details.
-
-user = password = ""
-hostname = "musicbrainz.org"
-https = True
-_client = ""
-_useragent = ""
-
-def auth(u, p):
-	"""Set the username and password to be used in subsequent queries to
-	the MusicBrainz XML API that require authentication.
-	"""
-	global user, password
-	user = u
-	password = p
-
-def set_useragent(app, version, contact=None):
-    """Set the User-Agent to be used for requests to the MusicBrainz webservice.
-    This must be set before requests are made."""
-    global _useragent, _client
-    if not app or not version:
-        raise ValueError("App and version can not be empty")
-    if contact is not None:
-        _useragent = "%s/%s python-musicbrainzngs/%s ( %s )" % (app, version, _version, contact)
-    else:
-        _useragent = "%s/%s python-musicbrainzngs/%s" % (app, version, _version)
-    _client = "%s-%s" % (app, version)
-    _log.debug("set user-agent to %s" % _useragent)
-
-
-def set_hostname(new_hostname, use_https=False):
-    """Set the hostname for MusicBrainz webservice requests.
-    Defaults to 'musicbrainz.org', accessing over https.
-    For backwards compatibility, `use_https` is False by default.
-
-    :param str new_hostname: The hostname (and port) of the MusicBrainz server to connect to
-    :param bool use_https: `True` if the host should be accessed using https. Default is `False`
-
-    Specify a non-standard port by adding it to the hostname,
-    for example 'localhost:8000'."""
-    global hostname
-    global https
-    hostname = new_hostname
-    https = use_https
-
-# Rate limiting.
-
-limit_interval = 1.0
-limit_requests = 1
-do_rate_limit = True
-
-def set_rate_limit(limit_or_interval=1.0, new_requests=1):
-    """Sets the rate limiting behavior of the module. Must be invoked
-    before the first Web service call.
-    If the `limit_or_interval` parameter is set to False then
-    rate limiting will be disabled. If it is a number then only
-    a set number of requests (`new_requests`) will be made per
-    given interval (`limit_or_interval`).
-    """
-    global limit_interval
-    global limit_requests
-    global do_rate_limit
-    if isinstance(limit_or_interval, bool):
-        do_rate_limit = limit_or_interval
-    else:
-        if limit_or_interval <= 0.0:
-            raise ValueError("limit_or_interval can't be less than 0")
-        if new_requests <= 0:
-            raise ValueError("new_requests can't be less than 0")
-        do_rate_limit = True
-        limit_interval = limit_or_interval
-        limit_requests = new_requests
-
-class _rate_limit(object):
-    """A decorator that limits the rate at which the function may be
-    called. The rate is controlled by the `limit_interval` and
-    `limit_requests` global variables.  The limiting is thread-safe;
-    only one thread may be in the function at a time (acts like a
-    monitor in this sense). The globals must be set before the first
-    call to the limited function.
-    """
-    def __init__(self, fun):
-        self.fun = fun
-        self.last_call = 0.0
-        self.lock = threading.Lock()
-        self.remaining_requests = None # Set on first invocation.
-
-    def _update_remaining(self):
-        """Update remaining requests based on the elapsed time since
-        they were last calculated.
-        """
-        # On first invocation, we have the maximum number of requests
-        # available.
-        if self.remaining_requests is None:
-            self.remaining_requests = float(limit_requests)
-
-        else:
-            since_last_call = time.time() - self.last_call
-            self.remaining_requests += since_last_call * \
-                                       (limit_requests / limit_interval)
-            self.remaining_requests = min(self.remaining_requests,
-                                          float(limit_requests))
-
-        self.last_call = time.time()
-
-    def __call__(self, *args, **kwargs):
-        with self.lock:
-            if do_rate_limit:
-                self._update_remaining()
-
-                # Delay if necessary.
-                while self.remaining_requests < 0.999:
-                    time.sleep((1.0 - self.remaining_requests) *
-                               (limit_requests / limit_interval))
-                    self._update_remaining()
-
-                # Call the original function, "paying" for this call.
-                self.remaining_requests -= 1.0
-            return self.fun(*args, **kwargs)
-
-# From pymb2
-class _RedirectPasswordMgr(compat.HTTPPasswordMgr):
-	def __init__(self):
-		self._realms = { }
-
-	def find_user_password(self, realm, uri):
-		# ignoring the uri parameter intentionally
-		try:
-			return self._realms[realm]
-		except KeyError:
-			return (None, None)
-
-	def add_password(self, realm, uri, username, password):
-		# ignoring the uri parameter intentionally
-		self._realms[realm] = (username, password)
-
-class _DigestAuthHandler(compat.HTTPDigestAuthHandler):
-    def get_authorization (self, req, chal):
-        qop = chal.get ('qop', None)
-        if qop and ',' in qop and 'auth' in qop.split (','):
-            chal['qop'] = 'auth'
-
-        return compat.HTTPDigestAuthHandler.get_authorization (self, req, chal)
-
-    def _encode_utf8(self, msg):
-        """The MusicBrainz server also accepts UTF-8 encoded passwords."""
-        encoding = sys.stdin.encoding or locale.getpreferredencoding()
-        try:
-            # This works on Python 2 (msg in bytes)
-            msg = msg.decode(encoding)
-        except AttributeError:
-            # on Python 3 (msg is already in unicode)
-            pass
-        return msg.encode("utf-8")
-
-    def get_algorithm_impls(self, algorithm):
-        # algorithm should be case-insensitive according to RFC2617
-        algorithm = algorithm.upper()
-        # lambdas assume digest modules are imported at the top level
-        if algorithm == 'MD5':
-            H = lambda x: hashlib.md5(self._encode_utf8(x)).hexdigest()
-        elif algorithm == 'SHA':
-            H = lambda x: hashlib.sha1(self._encode_utf8(x)).hexdigest()
-        # XXX MD5-sess
-        KD = lambda s, d: H("%s:%s" % (s, d))
-        return H, KD
-
-class _MusicbrainzHttpRequest(compat.Request):
-	""" A custom request handler that allows DELETE and PUT"""
-	def __init__(self, method, url, data=None):
-		compat.Request.__init__(self, url, data)
-		allowed_m = ["GET", "POST", "DELETE", "PUT"]
-		if method not in allowed_m:
-			raise ValueError("invalid method: %s" % method)
-		self.method = method
-
-	def get_method(self):
-		return self.method
-
-
-# Core (internal) functions for calling the MB API.
-
-def _safe_read(opener, req, body=None, max_retries=8, retry_delay_delta=2.0):
-	"""Open an HTTP request with a given URL opener and (optionally) a
-	request body. Transient errors lead to retries.  Permanent errors
-	and repeated errors are translated into a small set of handleable
-	exceptions. Return a bytestring.
-	"""
-	last_exc = None
-	for retry_num in range(max_retries):
-		if retry_num: # Not the first try: delay an increasing amount.
-			_log.info("retrying after delay (#%i)" % retry_num)
-			time.sleep(retry_num * retry_delay_delta)
-
-		try:
-			if body:
-				f = opener.open(req, body)
-			else:
-				f = opener.open(req)
-			return f.read()
-
-		except compat.HTTPError as exc:
-			if exc.code in (400, 404, 411):
-				# Bad request, not found, etc.
-				raise ResponseError(cause=exc)
-			elif exc.code in (503, 502, 500):
-				# Rate limiting, internal overloading...
-				_log.info("HTTP error %i" % exc.code)
-			elif exc.code in (401, ):
-				raise AuthenticationError(cause=exc)
-			else:
-				# Other, unknown error. Should handle more cases, but
-				# retrying for now.
-				_log.info("unknown HTTP error %i" % exc.code)
-			last_exc = exc
-		except compat.BadStatusLine as exc:
-			_log.info("bad status line")
-			last_exc = exc
-		except compat.HTTPException as exc:
-			_log.info("miscellaneous HTTP exception: %s" % str(exc))
-			last_exc = exc
-		except compat.URLError as exc:
-			if isinstance(exc.reason, socket.error):
-				code = exc.reason.errno
-				if code == 104: # "Connection reset by peer."
-					continue
-			raise NetworkError(cause=exc)
-		except socket.timeout as exc:
-			_log.info("socket timeout")
-			last_exc = exc
-		except socket.error as exc:
-			if exc.errno == 104:
-				continue
-			raise NetworkError(cause=exc)
-		except IOError as exc:
-			raise NetworkError(cause=exc)
-
-	# Out of retries!
-	raise NetworkError("retried %i times" % max_retries, last_exc)
-
-# Get the XML parsing exceptions to catch. The behavior chnaged with Python 2.7
-# and ElementTree 1.3.
-if hasattr(etree, 'ParseError'):
-	ETREE_EXCEPTIONS = (etree.ParseError, expat.ExpatError)
-else:
-	ETREE_EXCEPTIONS = (expat.ExpatError)
-
-
-# Parsing setup
-
-def mb_parser_null(resp):
-    """Return the raw response (XML)"""
-    return resp
-
-def mb_parser_xml(resp):
-    """Return a Python dict representing the XML response"""
-    # Parse the response.
-    try:
-        return mbxml.parse_message(resp)
-    except UnicodeError as exc:
-        raise ResponseError(cause=exc)
-    except Exception as exc:
-        if isinstance(exc, ETREE_EXCEPTIONS):
-            raise ResponseError(cause=exc)
-        else:
-            raise
-
-# Defaults
-parser_fun = mb_parser_xml
-ws_format = "xml"
-
-def set_parser(new_parser_fun=None):
-    """Sets the function used to parse the response from the
-    MusicBrainz web service.
-
-    If no parser is given, the parser is reset to the default parser
-    :func:`mb_parser_xml`.
-    """
-    global parser_fun
-    if new_parser_fun is None:
-        new_parser_fun = mb_parser_xml
-    if not callable(new_parser_fun):
-        raise ValueError("new_parser_fun must be callable")
-    parser_fun = new_parser_fun
-
-def set_format(fmt="xml"):
-    """Sets the format that should be returned by the Web Service.
-    The server currently supports `xml` and `json`.
-
-    This method will set a default parser for the specified format,
-    but you can modify it with :func:`set_parser`.
-
-    .. warning:: The json format used by the server is different from
-        the json format returned by the `musicbrainzngs` internal parser
-        when using the `xml` format! This format may change at any time.
-    """
-    global ws_format
-    if fmt == "xml":
-        ws_format = fmt
-        set_parser() # set to default
-    elif fmt == "json":
-        ws_format = fmt
-        warn("The json format is non-official and may change at any time")
-        set_parser(json.loads)
-    else:
-        raise ValueError("invalid format: %s" % fmt)
-
-
-@_rate_limit
-def _mb_request(path, method='GET', auth_required=AUTH_NO,
-                client_required=False, args=None, data=None, body=None):
-    """Makes a request for the specified `path` (endpoint) on /ws/2 on
-    the globally-specified hostname. Parses the responses and returns
-    the resulting object.  `auth_required` and `client_required` control
-    whether exceptions should be raised if the username/password and
-    client are left unspecified, respectively.
-    """
-    global parser_fun
-
-    if args is None:
-        args = {}
-    else:
-        args = dict(args) or {}
-
-    if _useragent == "":
-        raise UsageError("set a proper user-agent with "
-                         "set_useragent(\"application name\", \"application version\", \"contact info (preferably URL or email for your application)\")")
-
-    if client_required:
-        args["client"] = _client
-
-    if ws_format != "xml":
-        args["fmt"] = ws_format
-
-    # Convert args from a dictionary to a list of tuples
-    # so that the ordering of elements is stable for easy
-    # testing (in this case we order alphabetically)
-    # Encode Unicode arguments using UTF-8.
-    newargs = []
-    for key, value in sorted(args.items()):
-        if isinstance(value, compat.unicode):
-            value = value.encode('utf8')
-        newargs.append((key, value))
-
-    # Construct the full URL for the request, including hostname and
-    # query string.
-    url = compat.urlunparse((
-        'https' if https else 'http',
-        hostname,
-        '/ws/2/%s' % path,
-        '',
-        compat.urlencode(newargs),
-        ''
-    ))
-    _log.debug("%s request for %s" % (method, url))
-
-    # Set up HTTP request handler and URL opener.
-    httpHandler = compat.HTTPHandler(debuglevel=0)
-    handlers = [httpHandler]
-
-    # Add credentials if required.
-    add_auth = False
-    if auth_required == AUTH_YES:
-        _log.debug("Auth required for %s" % url)
-        if not user:
-            raise UsageError("authorization required; "
-                             "use auth(user, pass) first")
-        add_auth = True
-
-    if auth_required == AUTH_IFSET and user:
-        _log.debug("Using auth for %s because user and pass is set" % url)
-        add_auth = True
-
-    if add_auth:
-        passwordMgr = _RedirectPasswordMgr()
-        authHandler = _DigestAuthHandler(passwordMgr)
-        authHandler.add_password("musicbrainz.org", (), user, password)
-        handlers.append(authHandler)
-
-    opener = compat.build_opener(*handlers)
-
-    # Make request.
-    req = _MusicbrainzHttpRequest(method, url, data)
-    req.add_header('User-Agent', _useragent)
-    _log.debug("requesting with UA %s" % _useragent)
-    if body:
-        req.add_header('Content-Type', 'application/xml; charset=UTF-8')
-    elif not data and not req.has_header('Content-Length'):
-        # Explicitly indicate zero content length if no request data
-        # will be sent (avoids HTTP 411 error).
-        req.add_header('Content-Length', '0')
-    resp = _safe_read(opener, req, body)
-
-    return parser_fun(resp)
-
-def _get_auth_type(entity, id, includes):
-    """ Some calls require authentication. This returns
-    True if a call does, False otherwise
-    """
-    if "user-tags" in includes or "user-ratings" in includes:
-        return AUTH_YES
-    elif entity.startswith("collection"):
-        if not id:
-            return AUTH_YES
-        else:
-            return AUTH_IFSET
-    else:
-        return AUTH_NO
-
-def _do_mb_query(entity, id, includes=[], params={}):
-	"""Make a single GET call to the MusicBrainz XML API. `entity` is a
-	string indicated the type of object to be retrieved. The id may be
-	empty, in which case the query is a search. `includes` is a list
-	of strings that must be valid includes for the entity type. `params`
-	is a dictionary of additional parameters for the API call. The
-	response is parsed and returned.
-	"""
-	# Build arguments.
-	if not isinstance(includes, list):
-		includes = [includes]
-	_check_includes(entity, includes)
-	auth_required = _get_auth_type(entity, id, includes)
-	args = dict(params)
-	if len(includes) > 0:
-		inc = " ".join(includes)
-		args["inc"] = inc
-
-	# Build the endpoint components.
-	path = '%s/%s' % (entity, id)
-	return _mb_request(path, 'GET', auth_required, args=args)
-
-def _do_mb_search(entity, query='', fields={},
-		  limit=None, offset=None, strict=False):
-	"""Perform a full-text search on the MusicBrainz search server.
-	`query` is a lucene query string when no fields are set,
-	but is escaped when any fields are given. `fields` is a dictionary
-	of key/value query parameters. They keys in `fields` must be valid
-	for the given entity type.
-	"""
-	# Encode the query terms as a Lucene query string.
-	query_parts = []
-	if query:
-		clean_query = util._unicode(query)
-		if fields:
-			clean_query = re.sub(LUCENE_SPECIAL, r'\\\1',
-					     clean_query)
-			if strict:
-				query_parts.append('"%s"' % clean_query)
-			else:
-				query_parts.append(clean_query.lower())
-		else:
-			query_parts.append(clean_query)
-	for key, value in fields.items():
-		# Ensure this is a valid search field.
-		if key not in VALID_SEARCH_FIELDS[entity]:
-			raise InvalidSearchFieldError(
-				'%s is not a valid search field for %s' % (key, entity)
-			)
-
-		# Escape Lucene's special characters.
-		value = util._unicode(value)
-		value = re.sub(LUCENE_SPECIAL, r'\\\1', value)
-		if value:
-			if strict:
-				query_parts.append('%s:"%s"' % (key, value))
-			else:
-				value = value.lower() # avoid AND / OR
-				query_parts.append('%s:(%s)' % (key, value))
-	if strict:
-		full_query = ' AND '.join(query_parts).strip()
-	else:
-		full_query = ' '.join(query_parts).strip()
-
-	if not full_query:
-		raise ValueError('at least one query term is required')
-
-	# Additional parameters to the search.
-	params = {'query': full_query}
-	if limit:
-		params['limit'] = str(limit)
-	if offset:
-		params['offset'] = str(offset)
-
-	return _do_mb_query(entity, '', [], params)
-
-def _do_mb_delete(path):
-	"""Send a DELETE request for the specified object.
-	"""
-	return _mb_request(path, 'DELETE', AUTH_YES, True)
-
-def _do_mb_put(path):
-	"""Send a PUT request for the specified object.
-	"""
-	return _mb_request(path, 'PUT', AUTH_YES, True)
-
-def _do_mb_post(path, body):
-	"""Perform a single POST call for an endpoint with a specified
-	request body.
-	"""
-	return _mb_request(path, 'POST', AUTH_YES, True, body=body)
-
-
-# The main interface!
-
-# Single entity by ID
-
-@_docstring_get("area")
-def get_area_by_id(id, includes=[], release_status=[], release_type=[]):
-    """Get the area with the MusicBrainz `id` as a dict with an 'area' key.
-
-    *Available includes*: {includes}"""
-    params = _check_filter_and_make_params("area", includes,
-                                           release_status, release_type)
-    return _do_mb_query("area", id, includes, params)
-
-@_docstring_get("artist")
-def get_artist_by_id(id, includes=[], release_status=[], release_type=[]):
-    """Get the artist with the MusicBrainz `id` as a dict with an 'artist' key.
-
-    *Available includes*: {includes}"""
-    params = _check_filter_and_make_params("artist", includes,
-                                           release_status, release_type)
-    return _do_mb_query("artist", id, includes, params)
-
-@_docstring_get("instrument")
-def get_instrument_by_id(id, includes=[], release_status=[], release_type=[]):
-    """Get the instrument with the MusicBrainz `id` as a dict with an 'artist' key.
-
-    *Available includes*: {includes}"""
-    params = _check_filter_and_make_params("instrument", includes,
-                                           release_status, release_type)
-    return _do_mb_query("instrument", id, includes, params)
-
-@_docstring_get("label")
-def get_label_by_id(id, includes=[], release_status=[], release_type=[]):
-    """Get the label with the MusicBrainz `id` as a dict with a 'label' key.
-
-    *Available includes*: {includes}"""
-    params = _check_filter_and_make_params("label", includes,
-                                           release_status, release_type)
-    return _do_mb_query("label", id, includes, params)
-
-@_docstring_get("place")
-def get_place_by_id(id, includes=[], release_status=[], release_type=[]):
-    """Get the place with the MusicBrainz `id` as a dict with an 'place' key.
-
-    *Available includes*: {includes}"""
-    params = _check_filter_and_make_params("place", includes,
-                                           release_status, release_type)
-    return _do_mb_query("place", id, includes, params)
-
-@_docstring_get("event")
-def get_event_by_id(id, includes=[], release_status=[], release_type=[]):
-    """Get the event with the MusicBrainz `id` as a dict with an 'event' key.
-
-    The event dict has the following keys:
-    `id`, `type`, `name`, `time`, `disambiguation` and `life-span`.
-
-    *Available includes*: {includes}"""
-    params = _check_filter_and_make_params("event", includes,
-                                           release_status, release_type)
-    return _do_mb_query("event", id, includes, params)
-
-@_docstring_get("recording")
-def get_recording_by_id(id, includes=[], release_status=[], release_type=[]):
-    """Get the recording with the MusicBrainz `id` as a dict
-    with a 'recording' key.
-
-    *Available includes*: {includes}"""
-    params = _check_filter_and_make_params("recording", includes,
-                                           release_status, release_type)
-    return _do_mb_query("recording", id, includes, params)
-
-@_docstring_get("release")
-def get_release_by_id(id, includes=[], release_status=[], release_type=[]):
-    """Get the release with the MusicBrainz `id` as a dict with a 'release' key.
-
-    *Available includes*: {includes}"""
-    params = _check_filter_and_make_params("release", includes,
-                                           release_status, release_type)
-    return _do_mb_query("release", id, includes, params)
-
-@_docstring_get("release-group")
-def get_release_group_by_id(id, includes=[],
-                            release_status=[], release_type=[]):
-    """Get the release group with the MusicBrainz `id` as a dict
-    with a 'release-group' key.
-
-    *Available includes*: {includes}"""
-    params = _check_filter_and_make_params("release-group", includes,
-                                           release_status, release_type)
-    return _do_mb_query("release-group", id, includes, params)
-
-@_docstring_get("series")
-def get_series_by_id(id, includes=[]):
-    """Get the series with the MusicBrainz `id` as a dict with a 'series' key.
-
-    *Available includes*: {includes}"""
-    return _do_mb_query("series", id, includes)
-
-@_docstring_get("work")
-def get_work_by_id(id, includes=[]):
-    """Get the work with the MusicBrainz `id` as a dict with a 'work' key.
-
-    *Available includes*: {includes}"""
-    return _do_mb_query("work", id, includes)
-
-@_docstring_get("url")
-def get_url_by_id(id, includes=[]):
-    """Get the url with the MusicBrainz `id` as a dict with a 'url' key.
-
-    *Available includes*: {includes}"""
-    return _do_mb_query("url", id, includes)
-
-
-# Searching
-
-@_docstring_search("annotation")
-def search_annotations(query='', limit=None, offset=None, strict=False, **fields):
-    """Search for annotations and return a dict with an 'annotation-list' key.
-
-    *Available search fields*: {fields}"""
-    return _do_mb_search('annotation', query, fields, limit, offset, strict)
-
-@_docstring_search("area")
-def search_areas(query='', limit=None, offset=None, strict=False, **fields):
-    """Search for areas and return a dict with an 'area-list' key.
-
-    *Available search fields*: {fields}"""
-    return _do_mb_search('area', query, fields, limit, offset, strict)
-
-@_docstring_search("artist")
-def search_artists(query='', limit=None, offset=None, strict=False, **fields):
-    """Search for artists and return a dict with an 'artist-list' key.
-
-    *Available search fields*: {fields}"""
-    return _do_mb_search('artist', query, fields, limit, offset, strict)
-
-@_docstring_search("event")
-def search_events(query='', limit=None, offset=None, strict=False, **fields):
-    """Search for events and return a dict with an 'event-list' key.
-
-    *Available search fields*: {fields}"""
-    return _do_mb_search('event', query, fields, limit, offset, strict)
-
-@_docstring_search("instrument")
-def search_instruments(query='', limit=None, offset=None, strict=False, **fields):
-    """Search for instruments and return a dict with a 'instrument-list' key.
-
-    *Available search fields*: {fields}"""
-    return _do_mb_search('instrument', query, fields, limit, offset, strict)
-
-@_docstring_search("label")
-def search_labels(query='', limit=None, offset=None, strict=False, **fields):
-    """Search for labels and return a dict with a 'label-list' key.
-
-    *Available search fields*: {fields}"""
-    return _do_mb_search('label', query, fields, limit, offset, strict)
-
-@_docstring_search("place")
-def search_places(query='', limit=None, offset=None, strict=False, **fields):
-    """Search for places and return a dict with a 'place-list' key.
-
-    *Available search fields*: {fields}"""
-    return _do_mb_search('place', query, fields, limit, offset, strict)
-
-@_docstring_search("recording")
-def search_recordings(query='', limit=None, offset=None,
-                      strict=False, **fields):
-    """Search for recordings and return a dict with a 'recording-list' key.
-
-    *Available search fields*: {fields}"""
-    return _do_mb_search('recording', query, fields, limit, offset, strict)
-
-@_docstring_search("release")
-def search_releases(query='', limit=None, offset=None, strict=False, **fields):
-    """Search for recordings and return a dict with a 'recording-list' key.
-
-    *Available search fields*: {fields}"""
-    return _do_mb_search('release', query, fields, limit, offset, strict)
-
-@_docstring_search("release-group")
-def search_release_groups(query='', limit=None, offset=None,
-			  strict=False, **fields):
-    """Search for release groups and return a dict
-    with a 'release-group-list' key.
-
-    *Available search fields*: {fields}"""
-    return _do_mb_search('release-group', query, fields, limit, offset, strict)
-
-@_docstring_search("series")
-def search_series(query='', limit=None, offset=None, strict=False, **fields):
-    """Search for series and return a dict with a 'series-list' key.
-
-    *Available search fields*: {fields}"""
-    return _do_mb_search('series', query, fields, limit, offset, strict)
-
-@_docstring_search("work")
-def search_works(query='', limit=None, offset=None, strict=False, **fields):
-    """Search for works and return a dict with a 'work-list' key.
-
-    *Available search fields*: {fields}"""
-    return _do_mb_search('work', query, fields, limit, offset, strict)
-
-
-# Lists of entities
-@_docstring_get("discid")
-def get_releases_by_discid(id, includes=[], toc=None, cdstubs=True, media_format=None):
-    """Search for releases with a :musicbrainz:`Disc ID` or table of contents.
-
-    When a `toc` is provided and no release with the disc ID is found,
-    a fuzzy search by the toc is done.
-    The `toc` should have to same format as :attr:`discid.Disc.toc_string`.
-    When a `toc` is provided, the format of the discid itself is not
-    checked server-side, so any value may be passed if searching by only
-    `toc` is desired.
-
-    If no toc matches in musicbrainz but a :musicbrainz:`CD Stub` does,
-    the CD Stub will be returned. Prevent this from happening by
-    passing `cdstubs=False`.
-
-    By default only results that match a format that allows discids
-    (e.g. CD) are included. To include all media formats, pass
-    `media_format='all'`.
-
-    The result is a dict with either a 'disc' , a 'cdstub' key
-    or a 'release-list' (fuzzy match with TOC).
-    A 'disc' has an 'offset-count', an 'offset-list' and a 'release-list'.
-    A 'cdstub' key has direct 'artist' and 'title' keys.
-
-    *Available includes*: {includes}"""
-    params = _check_filter_and_make_params("discid", includes, release_status=[],
-                                           release_type=[])
-    if toc:
-        params["toc"] = toc
-    if not cdstubs:
-        params["cdstubs"] = "no"
-    if media_format:
-        params["media-format"] = media_format
-    return _do_mb_query("discid", id, includes, params)
-
-
-@_docstring_get("recording")
-def get_recordings_by_isrc(isrc, includes=[], release_status=[],
-                           release_type=[]):
-    """Search for recordings with an :musicbrainz:`ISRC`.
-    The result is a dict with an 'isrc' key,
-    which again includes a 'recording-list'.
-
-    *Available includes*: {includes}"""
-    params = _check_filter_and_make_params("isrc", includes,
-                                           release_status, release_type)
-    return _do_mb_query("isrc", isrc, includes, params)
-
-@_docstring_get("work")
-def get_works_by_iswc(iswc, includes=[]):
-    """Search for works with an :musicbrainz:`ISWC`.
-    The result is a dict with a`work-list`.
-
-    *Available includes*: {includes}"""
-    return _do_mb_query("iswc", iswc, includes)
-
-
-def _browse_impl(entity, includes, limit, offset, params, release_status=[], release_type=[]):
-    includes = includes if isinstance(includes, list) else [includes]
-    valid_includes = VALID_BROWSE_INCLUDES[entity]
-    _check_includes_impl(includes, valid_includes)
-    p = {}
-    for k,v in params.items():
-        if v:
-            p[k] = v
-    if len(p) > 1:
-        raise Exception("Can't have more than one of " + ", ".join(params.keys()))
-    if limit: p["limit"] = limit
-    if offset: p["offset"] = offset
-    filterp = _check_filter_and_make_params(entity, includes, release_status, release_type)
-    p.update(filterp)
-    return _do_mb_query(entity, "", includes, p)
-
-# Browse methods
-# Browse include are a subset of regular get includes, so we check them here
-# and the test in _do_mb_query will pass anyway.
-@_docstring_browse("artist")
-def browse_artists(recording=None, release=None, release_group=None,
-                   work=None, includes=[], limit=None, offset=None):
-    """Get all artists linked to a recording, a release or a release group.
-    You need to give one MusicBrainz ID.
-
-    *Available includes*: {includes}"""
-    params = {"recording": recording,
-              "release": release,
-              "release-group": release_group,
-              "work": work}
-    return _browse_impl("artist", includes, limit, offset, params)
-
-@_docstring_browse("event")
-def browse_events(area=None, artist=None, place=None,
-                   includes=[], limit=None, offset=None):
-    """Get all events linked to a area, a artist or a place.
-    You need to give one MusicBrainz ID.
-
-    *Available includes*: {includes}"""
-    params = {"area": area,
-              "artist": artist,
-              "place": place}
-    return _browse_impl("event", includes, limit, offset, params)
-
-@_docstring_browse("label")
-def browse_labels(release=None, includes=[], limit=None, offset=None):
-    """Get all labels linked to a relase. You need to give a MusicBrainz ID.
-
-    *Available includes*: {includes}"""
-    params = {"release": release}
-    return _browse_impl("label", includes, limit, offset, params)
-
-@_docstring_browse("place")
-def browse_places(area=None, includes=[], limit=None, offset=None):
-    """Get all places linked to an area. You need to give a MusicBrainz ID.
-
-    *Available includes*: {includes}"""
-    params = {"area": area}
-    return _browse_impl("place", includes, limit, offset, params)
-
-@_docstring_browse("recording")
-def browse_recordings(artist=None, release=None, includes=[],
-                      limit=None, offset=None):
-    """Get all recordings linked to an artist or a release.
-    You need to give one MusicBrainz ID.
-
-    *Available includes*: {includes}"""
-    params = {"artist": artist,
-              "release": release}
-    return _browse_impl("recording", includes, limit, offset, params)
-
-@_docstring_browse("release")
-def browse_releases(artist=None, track_artist=None, label=None, recording=None,
-                    release_group=None, release_status=[], release_type=[],
-                    includes=[], limit=None, offset=None):
-    """Get all releases linked to an artist, a label, a recording
-    or a release group. You need to give one MusicBrainz ID.
-
-    You can also browse by `track_artist`, which gives all releases where some
-    tracks are attributed to that artist, but not the whole release.
-
-    You can filter by :data:`musicbrainz.VALID_RELEASE_TYPES` or
-    :data:`musicbrainz.VALID_RELEASE_STATUSES`.
-
-    *Available includes*: {includes}"""
-    # track_artist param doesn't work yet
-    params = {"artist": artist,
-              "track_artist": track_artist,
-              "label": label,
-              "recording": recording,
-              "release-group": release_group}
-    return _browse_impl("release", includes, limit, offset,
-                        params, release_status, release_type)
-
-@_docstring_browse("release-group")
-def browse_release_groups(artist=None, release=None, release_type=[],
-                          includes=[], limit=None, offset=None):
-    """Get all release groups linked to an artist or a release.
-    You need to give one MusicBrainz ID.
-
-    You can filter by :data:`musicbrainz.VALID_RELEASE_TYPES`.
-
-    *Available includes*: {includes}"""
-    params = {"artist": artist,
-              "release": release}
-    return _browse_impl("release-group", includes, limit,
-                        offset, params, [], release_type)
-
-@_docstring_browse("url")
-def browse_urls(resource=None, includes=[], limit=None, offset=None):
-    """Get urls by actual URL string.
-    You need to give a URL string as 'resource'
-
-    *Available includes*: {includes}"""
-    params = {"resource": resource}
-    return _browse_impl("url", includes, limit, offset, params)
-
-@_docstring_browse("work")
-def browse_works(artist=None, includes=[], limit=None, offset=None):
-    """Get all works linked to an artist
-
-    *Available includes*: {includes}"""
-    params = {"artist": artist}
-    return _browse_impl("work", includes, limit, offset, params)
-
-# Collections
-def get_collections():
-    """List the collections for the currently :func:`authenticated <auth>` user
-    as a dict with a 'collection-list' key."""
-    # Missing <release-list count="n"> the count in the reply
-    return _do_mb_query("collection", '')
-
-def _do_collection_query(collection, collection_type, limit, offset):
-    params = {}
-    if limit: params["limit"] = limit
-    if offset: params["offset"] = offset
-    return _do_mb_query("collection", "%s/%s" % (collection, collection_type), [], params)
-
-def get_artists_in_collection(collection, limit=None, offset=None):
-    """List the artists in a collection.
-    Returns a dict with a 'collection' key, which again has a 'artist-list'.
-
-    See `Browsing`_ for how to use `limit` and `offset`.
-    """
-    return _do_collection_query(collection, "artists", limit, offset)
-
-def get_releases_in_collection(collection, limit=None, offset=None):
-    """List the releases in a collection.
-    Returns a dict with a 'collection' key, which again has a 'release-list'.
-
-    See `Browsing`_ for how to use `limit` and `offset`.
-    """
-    return _do_collection_query(collection, "releases", limit, offset)
-
-def get_events_in_collection(collection, limit=None, offset=None):
-    """List the events in a collection.
-    Returns a dict with a 'collection' key, which again has a 'event-list'.
-
-    See `Browsing`_ for how to use `limit` and `offset`.
-    """
-    return _do_collection_query(collection, "events", limit, offset)
-
-def get_places_in_collection(collection, limit=None, offset=None):
-    """List the places in a collection.
-    Returns a dict with a 'collection' key, which again has a 'place-list'.
-
-    See `Browsing`_ for how to use `limit` and `offset`.
-    """
-    return _do_collection_query(collection, "places", limit, offset)
-
-def get_recordings_in_collection(collection, limit=None, offset=None):
-    """List the recordings in a collection.
-    Returns a dict with a 'collection' key, which again has a 'recording-list'.
-
-    See `Browsing`_ for how to use `limit` and `offset`.
-    """
-    return _do_collection_query(collection, "recordings", limit, offset)
-
-def get_works_in_collection(collection, limit=None, offset=None):
-    """List the works in a collection.
-    Returns a dict with a 'collection' key, which again has a 'work-list'.
-
-    See `Browsing`_ for how to use `limit` and `offset`.
-    """
-    return _do_collection_query(collection, "works", limit, offset)
-
-
-# Submission methods
-
-def submit_barcodes(release_barcode):
-    """Submits a set of {release_id1: barcode, ...}"""
-    query = mbxml.make_barcode_request(release_barcode)
-    return _do_mb_post("release", query)
-
-
-def submit_isrcs(recording_isrcs):
-    """Submit ISRCs.
-    Submits a set of {recording-id1: [isrc1, ...], ...}
-    or {recording_id1: isrc, ...}.
-    """
-    rec2isrcs = dict()
-    for (rec, isrcs) in recording_isrcs.items():
-        rec2isrcs[rec] = isrcs if isinstance(isrcs, list) else [isrcs]
-    query = mbxml.make_isrc_request(rec2isrcs)
-    return _do_mb_post("recording", query)
-
-def submit_tags(**kwargs):
-    """Submit user tags.
-    Takes parameters named e.g. 'artist_tags', 'recording_tags', etc.,
-    and of the form:
-    {entity_id1: [tag1, ...], ...}
-    If you only have one tag for an entity you can use a string instead
-    of a list.
-
-    The user's tags for each entity will be set to that list, adding or
-    removing tags as necessary. Submitting an empty list for an entity
-    will remove all tags for that entity by the user.
-    """
-    for k, v in kwargs.items():
-        for id, tags in v.items():
-            kwargs[k][id] = tags if isinstance(tags, list) else [tags]
-
-    query = mbxml.make_tag_request(**kwargs)
-    return _do_mb_post("tag", query)
-
-def submit_ratings(**kwargs):
-    """Submit user ratings.
-    Takes parameters named e.g. 'artist_ratings', 'recording_ratings', etc.,
-    and of the form:
-    {entity_id1: rating, ...}
-
-    Ratings are numbers from 0-100, at intervals of 20 (20 per 'star').
-    Submitting a rating of 0 will remove the user's rating.
-    """
-    query = mbxml.make_rating_request(**kwargs)
-    return _do_mb_post("rating", query)
-
-def add_releases_to_collection(collection, releases=[]):
-    """Add releases to a collection.
-    Collection and releases should be identified by their MBIDs
-    """
-    # XXX: Maximum URI length of 16kb means we should only allow ~400 releases
-    releaselist = ";".join(releases)
-    return _do_mb_put("collection/%s/releases/%s" % (collection, releaselist))
-
-def remove_releases_from_collection(collection, releases=[]):
-    """Remove releases from a collection.
-    Collection and releases should be identified by their MBIDs
-    """
-    releaselist = ";".join(releases)
-    return _do_mb_delete("collection/%s/releases/%s" % (collection, releaselist))
diff --git a/lib/musicbrainzngs/util.py b/lib/musicbrainzngs/util.py
deleted file mode 100644
index 37316f53..00000000
--- a/lib/musicbrainzngs/util.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# This file is part of the musicbrainzngs library
-# Copyright (C) Alastair Porter, Adrian Sampson, and others
-# This file is distributed under a BSD-2-Clause type license.
-# See the COPYING file for more information.
-
-import sys
-import locale
-import xml.etree.ElementTree as ET
-
-from . import compat
-
-def _unicode(string, encoding=None):
-    """Try to decode byte strings to unicode.
-    This can only be a guess, but this might be better than failing.
-    It is safe to use this on numbers or strings that are already unicode.
-    """
-    if isinstance(string, compat.unicode):
-        unicode_string = string
-    elif isinstance(string, compat.bytes):
-        # use given encoding, stdin, preferred until something != None is found
-        if encoding is None:
-            encoding = sys.stdin.encoding
-        if encoding is None:
-            encoding = locale.getpreferredencoding()
-        unicode_string = string.decode(encoding, "ignore")
-    else:
-        unicode_string = compat.unicode(string)
-    return unicode_string.replace('\x00', '').strip()
-
-def bytes_to_elementtree(bytes_or_file):
-	"""Given a bytestring or a file-like object that will produce them,
-	parse and return an ElementTree.
-	"""
-	if isinstance(bytes_or_file, compat.basestring):
-		s = bytes_or_file
-	else:
-		s = bytes_or_file.read()
-
-	if compat.is_py3:
-		s = _unicode(s, "utf-8")
-
-	f = compat.StringIO(s)
-	tree = ET.ElementTree(file=f)
-	return tree
diff --git a/lib/mutagen/README.rst b/lib/mutagen/README.rst
new file mode 100644
index 00000000..7ea1b21e
--- /dev/null
+++ b/lib/mutagen/README.rst
@@ -0,0 +1,58 @@
+Mutagen
+=======
+
+Mutagen is a Python module to handle audio metadata. It supports ASF, FLAC, 
+M4A, Monkey's Audio, MP3, Musepack, Ogg Opus, Ogg FLAC, Ogg Speex, Ogg 
+Theora, Ogg Vorbis, True Audio, WavPack, OptimFROG, and AIFF audio files. 
+All versions of ID3v2 are supported, and all standard ID3v2.4 frames are 
+parsed. It can read Xing headers to accurately calculate the bitrate and 
+length of MP3s. ID3 and APEv2 tags can be edited regardless of audio 
+format. It can also manipulate Ogg streams on an individual packet/page 
+level.
+
+Mutagen works on Python 2.6, 2.7, 3.3, 3.4 (CPython and PyPy) and has no 
+dependencies outside the Python standard library.
+
+
+Installing
+----------
+
+ $ ./setup.py build
+ $ su -c "./setup.py install"
+
+
+Documentation
+-------------
+
+The primary documentation for Mutagen is the doc strings found in
+the source code and the sphinx documentation in the docs/ directory.
+
+To build the docs (needs sphinx):
+
+ $ ./setup.py build_sphinx
+
+The tools/ directory contains several useful examples.
+
+The docs are also hosted on readthedocs.org:
+
+ http://mutagen.readthedocs.org
+
+
+Testing the Module
+------------------
+
+To test Mutagen's MP3 reading support, run
+ $ tools/mutagen-pony <your top-level MP3 directory here>
+Mutagen will try to load all of them, and report any errors.
+
+To look at the tags in files, run
+ $ tools/mutagen-inspect filename ...
+
+To run our test suite,
+ $ ./setup.py test
+
+
+Compatibility/Bugs
+------------------
+
+See docs/bugs.rst
diff --git a/lib/mutagen/__init__.py b/lib/mutagen/__init__.py
new file mode 100644
index 00000000..83b47e5f
--- /dev/null
+++ b/lib/mutagen/__init__.py
@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2005  Michael Urman
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+
+
+"""Mutagen aims to be an all purpose multimedia tagging library.
+
+::
+
+    import mutagen.[format]
+    metadata = mutagen.[format].Open(filename)
+
+`metadata` acts like a dictionary of tags in the file. Tags are generally a
+list of string-like values, but may have additional methods available
+depending on tag or format. They may also be entirely different objects
+for certain keys, again depending on format.
+"""
+
+from mutagen._util import MutagenError
+from mutagen._file import FileType, StreamInfo, File
+from mutagen._tags import Metadata
+
+version = (1, 27)
+"""Version tuple."""
+
+version_string = ".".join(map(str, version))
+"""Version string."""
+
+MutagenError
+
+FileType
+
+StreamInfo
+
+File
+
+Metadata
diff --git a/lib/mutagen/_compat.py b/lib/mutagen/_compat.py
new file mode 100644
index 00000000..fa01f72e
--- /dev/null
+++ b/lib/mutagen/_compat.py
@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2013  Christoph Reiter
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+
+import sys
+
+
+PY2 = sys.version_info[0] == 2
+PY3 = not PY2
+
+if PY2:
+    from StringIO import StringIO
+    BytesIO = StringIO
+    from cStringIO import StringIO as cBytesIO
+
+    long_ = long
+    integer_types = (int, long)
+    string_types = (str, unicode)
+    text_type = unicode
+
+    xrange = xrange
+    cmp = cmp
+    chr_ = chr
+
+    def endswith(text, end):
+        return text.endswith(end)
+
+    iteritems = lambda d: d.iteritems()
+    itervalues = lambda d: d.itervalues()
+    iterkeys = lambda d: d.iterkeys()
+
+    iterbytes = lambda b: iter(b)
+
+    exec("def reraise(tp, value, tb):\n raise tp, value, tb")
+
+    def swap_to_string(cls):
+        if "__str__" in cls.__dict__:
+            cls.__unicode__ = cls.__str__
+
+        if "__bytes__" in cls.__dict__:
+            cls.__str__ = cls.__bytes__
+
+        return cls
+
+elif PY3:
+    from io import StringIO
+    StringIO = StringIO
+    from io import BytesIO
+    cBytesIO = BytesIO
+
+    long_ = int
+    integer_types = (int,)
+    string_types = (str,)
+    text_type = str
+
+    xrange = range
+    cmp = lambda a, b: (a > b) - (a < b)
+    chr_ = lambda x: bytes([x])
+
+    def endswith(text, end):
+        # usefull for paths which can be both, str and bytes
+        if isinstance(text, str):
+            if not isinstance(end, str):
+                end = end.decode("ascii")
+        else:
+            if not isinstance(end, bytes):
+                end = end.encode("ascii")
+        return text.endswith(end)
+
+    iteritems = lambda d: iter(d.items())
+    itervalues = lambda d: iter(d.values())
+    iterkeys = lambda d: iter(d.keys())
+
+    iterbytes = lambda b: (bytes([v]) for v in b)
+
+    def reraise(tp, value, tb):
+        raise tp(value).with_traceback(tb)
+
+    def swap_to_string(cls):
+        return cls
diff --git a/lib/mutagen/_constants.py b/lib/mutagen/_constants.py
new file mode 100644
index 00000000..62c1ce02
--- /dev/null
+++ b/lib/mutagen/_constants.py
@@ -0,0 +1,199 @@
+# -*- coding: utf-8 -*-
+
+"""Constants used by Mutagen."""
+
+GENRES = [
+    u"Blues",
+    u"Classic Rock",
+    u"Country",
+    u"Dance",
+    u"Disco",
+    u"Funk",
+    u"Grunge",
+    u"Hip-Hop",
+    u"Jazz",
+    u"Metal",
+    u"New Age",
+    u"Oldies",
+    u"Other",
+    u"Pop",
+    u"R&B",
+    u"Rap",
+    u"Reggae",
+    u"Rock",
+    u"Techno",
+    u"Industrial",
+    u"Alternative",
+    u"Ska",
+    u"Death Metal",
+    u"Pranks",
+    u"Soundtrack",
+    u"Euro-Techno",
+    u"Ambient",
+    u"Trip-Hop",
+    u"Vocal",
+    u"Jazz+Funk",
+    u"Fusion",
+    u"Trance",
+    u"Classical",
+    u"Instrumental",
+    u"Acid",
+    u"House",
+    u"Game",
+    u"Sound Clip",
+    u"Gospel",
+    u"Noise",
+    u"Alt. Rock",
+    u"Bass",
+    u"Soul",
+    u"Punk",
+    u"Space",
+    u"Meditative",
+    u"Instrumental Pop",
+    u"Instrumental Rock",
+    u"Ethnic",
+    u"Gothic",
+    u"Darkwave",
+    u"Techno-Industrial",
+    u"Electronic",
+    u"Pop-Folk",
+    u"Eurodance",
+    u"Dream",
+    u"Southern Rock",
+    u"Comedy",
+    u"Cult",
+    u"Gangsta Rap",
+    u"Top 40",
+    u"Christian Rap",
+    u"Pop/Funk",
+    u"Jungle",
+    u"Native American",
+    u"Cabaret",
+    u"New Wave",
+    u"Psychedelic",
+    u"Rave",
+    u"Showtunes",
+    u"Trailer",
+    u"Lo-Fi",
+    u"Tribal",
+    u"Acid Punk",
+    u"Acid Jazz",
+    u"Polka",
+    u"Retro",
+    u"Musical",
+    u"Rock & Roll",
+    u"Hard Rock",
+    u"Folk",
+    u"Folk-Rock",
+    u"National Folk",
+    u"Swing",
+    u"Fast-Fusion",
+    u"Bebop",
+    u"Latin",
+    u"Revival",
+    u"Celtic",
+    u"Bluegrass",
+    u"Avantgarde",
+    u"Gothic Rock",
+    u"Progressive Rock",
+    u"Psychedelic Rock",
+    u"Symphonic Rock",
+    u"Slow Rock",
+    u"Big Band",
+    u"Chorus",
+    u"Easy Listening",
+    u"Acoustic",
+    u"Humour",
+    u"Speech",
+    u"Chanson",
+    u"Opera",
+    u"Chamber Music",
+    u"Sonata",
+    u"Symphony",
+    u"Booty Bass",
+    u"Primus",
+    u"Porn Groove",
+    u"Satire",
+    u"Slow Jam",
+    u"Club",
+    u"Tango",
+    u"Samba",
+    u"Folklore",
+    u"Ballad",
+    u"Power Ballad",
+    u"Rhythmic Soul",
+    u"Freestyle",
+    u"Duet",
+    u"Punk Rock",
+    u"Drum Solo",
+    u"A Cappella",
+    u"Euro-House",
+    u"Dance Hall",
+    u"Goa",
+    u"Drum & Bass",
+    u"Club-House",
+    u"Hardcore",
+    u"Terror",
+    u"Indie",
+    u"BritPop",
+    u"Afro-Punk",
+    u"Polsk Punk",
+    u"Beat",
+    u"Christian Gangsta Rap",
+    u"Heavy Metal",
+    u"Black Metal",
+    u"Crossover",
+    u"Contemporary Christian",
+    u"Christian Rock",
+    u"Merengue",
+    u"Salsa",
+    u"Thrash Metal",
+    u"Anime",
+    u"JPop",
+    u"Synthpop",
+    u"Abstract",
+    u"Art Rock",
+    u"Baroque",
+    u"Bhangra",
+    u"Big Beat",
+    u"Breakbeat",
+    u"Chillout",
+    u"Downtempo",
+    u"Dub",
+    u"EBM",
+    u"Eclectic",
+    u"Electro",
+    u"Electroclash",
+    u"Emo",
+    u"Experimental",
+    u"Garage",
+    u"Global",
+    u"IDM",
+    u"Illbient",
+    u"Industro-Goth",
+    u"Jam Band",
+    u"Krautrock",
+    u"Leftfield",
+    u"Lounge",
+    u"Math Rock",
+    u"New Romantic",
+    u"Nu-Breakz",
+    u"Post-Punk",
+    u"Post-Rock",
+    u"Psytrance",
+    u"Shoegaze",
+    u"Space Rock",
+    u"Trop Rock",
+    u"World Music",
+    u"Neoclassical",
+    u"Audiobook",
+    u"Audio Theatre",
+    u"Neue Deutsche Welle",
+    u"Podcast",
+    u"Indie Rock",
+    u"G-Funk",
+    u"Dubstep",
+    u"Garage Rock",
+    u"Psybient",
+]
+"""The ID3v1 genre list."""
diff --git a/lib/mutagen/_file.py b/lib/mutagen/_file.py
new file mode 100644
index 00000000..fc1caeb9
--- /dev/null
+++ b/lib/mutagen/_file.py
@@ -0,0 +1,237 @@
+# Copyright (C) 2005  Michael Urman
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+
+import warnings
+
+from mutagen._util import DictMixin
+
+
+class FileType(DictMixin):
+    """An abstract object wrapping tags and audio stream information.
+
+    Attributes:
+
+    * info -- stream information (length, bitrate, sample rate)
+    * tags -- metadata tags, if any
+
+    Each file format has different potential tags and stream
+    information.
+
+    FileTypes implement an interface very similar to Metadata; the
+    dict interface, save, load, and delete calls on a FileType call
+    the appropriate methods on its tag data.
+    """
+
+    __module__ = "mutagen"
+
+    info = None
+    tags = None
+    filename = None
+    _mimes = ["application/octet-stream"]
+
+    def __init__(self, filename=None, *args, **kwargs):
+        if filename is None:
+            warnings.warn("FileType constructor requires a filename",
+                          DeprecationWarning)
+        else:
+            self.load(filename, *args, **kwargs)
+
+    def load(self, filename, *args, **kwargs):
+        raise NotImplementedError
+
+    def __getitem__(self, key):
+        """Look up a metadata tag key.
+
+        If the file has no tags at all, a KeyError is raised.
+        """
+
+        if self.tags is None:
+            raise KeyError(key)
+        else:
+            return self.tags[key]
+
+    def __setitem__(self, key, value):
+        """Set a metadata tag.
+
+        If the file has no tags, an appropriate format is added (but
+        not written until save is called).
+        """
+
+        if self.tags is None:
+            self.add_tags()
+        self.tags[key] = value
+
+    def __delitem__(self, key):
+        """Delete a metadata tag key.
+
+        If the file has no tags at all, a KeyError is raised.
+        """
+
+        if self.tags is None:
+            raise KeyError(key)
+        else:
+            del(self.tags[key])
+
+    def keys(self):
+        """Return a list of keys in the metadata tag.
+
+        If the file has no tags at all, an empty list is returned.
+        """
+
+        if self.tags is None:
+            return []
+        else:
+            return self.tags.keys()
+
+    def delete(self, filename=None):
+        """Remove tags from a file."""
+
+        if self.tags is not None:
+            if filename is None:
+                filename = self.filename
+            else:
+                warnings.warn(
+                    "delete(filename=...) is deprecated, reload the file",
+                    DeprecationWarning)
+            return self.tags.delete(filename)
+
+    def save(self, filename=None, **kwargs):
+        """Save metadata tags."""
+
+        if filename is None:
+            filename = self.filename
+        else:
+            warnings.warn(
+                "save(filename=...) is deprecated, reload the file",
+                DeprecationWarning)
+        if self.tags is not None:
+            return self.tags.save(filename, **kwargs)
+        else:
+            raise ValueError("no tags in file")
+
+    def pprint(self):
+        """Print stream information and comment key=value pairs."""
+
+        stream = "%s (%s)" % (self.info.pprint(), self.mime[0])
+        try:
+            tags = self.tags.pprint()
+        except AttributeError:
+            return stream
+        else:
+            return stream + ((tags and "\n" + tags) or "")
+
+    def add_tags(self):
+        """Adds new tags to the file.
+
+        Raises if tags already exist.
+        """
+
+        raise NotImplementedError
+
+    @property
+    def mime(self):
+        """A list of mime types"""
+
+        mimes = []
+        for Kind in type(self).__mro__:
+            for mime in getattr(Kind, '_mimes', []):
+                if mime not in mimes:
+                    mimes.append(mime)
+        return mimes
+
+    @staticmethod
+    def score(filename, fileobj, header):
+        raise NotImplementedError
+
+
+class StreamInfo(object):
+    """Abstract stream information object.
+
+    Provides attributes for length, bitrate, sample rate etc.
+
+    See the implementations for details.
+    """
+
+    __module__ = "mutagen"
+
+    def pprint(self):
+        """Print stream information"""
+
+        raise NotImplementedError
+
+
+def File(filename, options=None, easy=False):
+    """Guess the type of the file and try to open it.
+
+    The file type is decided by several things, such as the first 128
+    bytes (which usually contains a file type identifier), the
+    filename extension, and the presence of existing tags.
+
+    If no appropriate type could be found, None is returned.
+
+    :param options: Sequence of :class:`FileType` implementations, defaults to
+                    all included ones.
+
+    :param easy: If the easy wrappers should be returnd if available.
+                 For example :class:`EasyMP3 <mp3.EasyMP3>` instead
+                 of :class:`MP3 <mp3.MP3>`.
+    """
+
+    if options is None:
+        from mutagen.asf import ASF
+        from mutagen.apev2 import APEv2File
+        from mutagen.flac import FLAC
+        if easy:
+            from mutagen.easyid3 import EasyID3FileType as ID3FileType
+        else:
+            from mutagen.id3 import ID3FileType
+        if easy:
+            from mutagen.mp3 import EasyMP3 as MP3
+        else:
+            from mutagen.mp3 import MP3
+        from mutagen.oggflac import OggFLAC
+        from mutagen.oggspeex import OggSpeex
+        from mutagen.oggtheora import OggTheora
+        from mutagen.oggvorbis import OggVorbis
+        from mutagen.oggopus import OggOpus
+        if easy:
+            from mutagen.trueaudio import EasyTrueAudio as TrueAudio
+        else:
+            from mutagen.trueaudio import TrueAudio
+        from mutagen.wavpack import WavPack
+        if easy:
+            from mutagen.easymp4 import EasyMP4 as MP4
+        else:
+            from mutagen.mp4 import MP4
+        from mutagen.musepack import Musepack
+        from mutagen.monkeysaudio import MonkeysAudio
+        from mutagen.optimfrog import OptimFROG
+        from mutagen.aiff import AIFF
+        from mutagen.aac import AAC
+        options = [MP3, TrueAudio, OggTheora, OggSpeex, OggVorbis, OggFLAC,
+                   FLAC, AIFF, APEv2File, MP4, ID3FileType, WavPack,
+                   Musepack, MonkeysAudio, OptimFROG, ASF, OggOpus, AAC]
+
+    if not options:
+        return None
+
+    fileobj = open(filename, "rb")
+    try:
+        header = fileobj.read(128)
+        # Sort by name after score. Otherwise import order affects
+        # Kind sort order, which affects treatment of things with
+        # equals scores.
+        results = [(Kind.score(filename, fileobj, header), Kind.__name__)
+                   for Kind in options]
+    finally:
+        fileobj.close()
+    results = list(zip(results, options))
+    results.sort()
+    (score, name), Kind = results[-1]
+    if score > 0:
+        return Kind(filename)
+    else:
+        return None
diff --git a/lib/mutagen/_tags.py b/lib/mutagen/_tags.py
new file mode 100644
index 00000000..8f9b9aa9
--- /dev/null
+++ b/lib/mutagen/_tags.py
@@ -0,0 +1,31 @@
+# Copyright (C) 2005  Michael Urman
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+
+
+class Metadata(object):
+    """An abstract dict-like object.
+
+    Metadata is the base class for many of the tag objects in Mutagen.
+    """
+
+    __module__ = "mutagen"
+
+    def __init__(self, *args, **kwargs):
+        if args or kwargs:
+            self.load(*args, **kwargs)
+
+    def load(self, *args, **kwargs):
+        raise NotImplementedError
+
+    def save(self, filename=None):
+        """Save changes to a file."""
+
+        raise NotImplementedError
+
+    def delete(self, filename=None):
+        """Remove tags from a file."""
+
+        raise NotImplementedError
diff --git a/lib/mutagen/_util.py b/lib/mutagen/_util.py
new file mode 100644
index 00000000..570744b1
--- /dev/null
+++ b/lib/mutagen/_util.py
@@ -0,0 +1,603 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2006  Joe Wreschnig
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+
+"""Utility classes for Mutagen.
+
+You should not rely on the interfaces here being stable. They are
+intended for internal use in Mutagen only.
+"""
+
+import struct
+import codecs
+
+from fnmatch import fnmatchcase
+
+from ._compat import chr_, text_type, PY2, iteritems, iterbytes, \
+    integer_types, xrange
+
+
+class MutagenError(Exception):
+    """Base class for all custom exceptions in mutagen
+
+    .. versionadded:: 1.25
+    """
+
+
+def total_ordering(cls):
+    assert "__eq__" in cls.__dict__
+    assert "__lt__" in cls.__dict__
+
+    cls.__le__ = lambda self, other: self == other or self < other
+    cls.__gt__ = lambda self, other: not (self == other or self < other)
+    cls.__ge__ = lambda self, other: not self < other
+    cls.__ne__ = lambda self, other: not self.__eq__(other)
+
+    return cls
+
+
+def hashable(cls):
+    """Makes sure the class is hashable.
+
+    Needs a working __eq__ and __hash__ and will add a __ne__.
+    """
+
+    # py2
+    assert "__hash__" in cls.__dict__
+    # py3
+    assert cls.__dict__["__hash__"] is not None
+    assert "__eq__" in cls.__dict__
+
+    cls.__ne__ = lambda self, other: not self.__eq__(other)
+
+    return cls
+
+
+def enum(cls):
+    assert cls.__bases__ == (object,)
+
+    d = dict(cls.__dict__)
+    new_type = type(cls.__name__, (int,), d)
+    new_type.__module__ = cls.__module__
+
+    map_ = {}
+    for key, value in iteritems(d):
+        if key.upper() == key and isinstance(value, integer_types):
+            value_instance = new_type(value)
+            setattr(new_type, key, value_instance)
+            map_[value] = key
+
+    def repr_(self):
+        if self in map_:
+            return "%s.%s" % (type(self).__name__, map_[self])
+        else:
+            return "%s(%s)" % (type(self).__name__, self)
+
+    setattr(new_type, "__repr__", repr_)
+
+    return new_type
+
+
+@total_ordering
+class DictMixin(object):
+    """Implement the dict API using keys() and __*item__ methods.
+
+    Similar to UserDict.DictMixin, this takes a class that defines
+    __getitem__, __setitem__, __delitem__, and keys(), and turns it
+    into a full dict-like object.
+
+    UserDict.DictMixin is not suitable for this purpose because it's
+    an old-style class.
+
+    This class is not optimized for very large dictionaries; many
+    functions have linear memory requirements. I recommend you
+    override some of these functions if speed is required.
+    """
+
+    def __iter__(self):
+        return iter(self.keys())
+
+    def __has_key(self, key):
+        try:
+            self[key]
+        except KeyError:
+            return False
+        else:
+            return True
+
+    if PY2:
+        has_key = __has_key
+
+    __contains__ = __has_key
+
+    if PY2:
+        iterkeys = lambda self: iter(self.keys())
+
+    def values(self):
+        return [self[k] for k in self.keys()]
+
+    if PY2:
+        itervalues = lambda self: iter(self.values())
+
+    def items(self):
+        return list(zip(self.keys(), self.values()))
+
+    if PY2:
+        iteritems = lambda s: iter(s.items())
+
+    def clear(self):
+        for key in list(self.keys()):
+            self.__delitem__(key)
+
+    def pop(self, key, *args):
+        if len(args) > 1:
+            raise TypeError("pop takes at most two arguments")
+        try:
+            value = self[key]
+        except KeyError:
+            if args:
+                return args[0]
+            else:
+                raise
+        del(self[key])
+        return value
+
+    def popitem(self):
+        for key in self.keys():
+            break
+        else:
+            raise KeyError("dictionary is empty")
+        return key, self.pop(key)
+
+    def update(self, other=None, **kwargs):
+        if other is None:
+            self.update(kwargs)
+            other = {}
+
+        try:
+            for key, value in other.items():
+                self.__setitem__(key, value)
+        except AttributeError:
+            for key, value in other:
+                self[key] = value
+
+    def setdefault(self, key, default=None):
+        try:
+            return self[key]
+        except KeyError:
+            self[key] = default
+            return default
+
+    def get(self, key, default=None):
+        try:
+            return self[key]
+        except KeyError:
+            return default
+
+    def __repr__(self):
+        return repr(dict(self.items()))
+
+    def __eq__(self, other):
+        return dict(self.items()) == other
+
+    def __lt__(self, other):
+        return dict(self.items()) < other
+
+    __hash__ = object.__hash__
+
+    def __len__(self):
+        return len(self.keys())
+
+
+class DictProxy(DictMixin):
+    def __init__(self, *args, **kwargs):
+        self.__dict = {}
+        super(DictProxy, self).__init__(*args, **kwargs)
+
+    def __getitem__(self, key):
+        return self.__dict[key]
+
+    def __setitem__(self, key, value):
+        self.__dict[key] = value
+
+    def __delitem__(self, key):
+        del(self.__dict[key])
+
+    def keys(self):
+        return self.__dict.keys()
+
+
+def _fill_cdata(cls):
+    """Add struct pack/unpack functions"""
+
+    funcs = {}
+    for key, name in [("b", "char"), ("h", "short"),
+                      ("i", "int"), ("q", "longlong")]:
+        for echar, esuffix in [("<", "le"), (">", "be")]:
+            esuffix = "_" + esuffix
+            for unsigned in [True, False]:
+                s = struct.Struct(echar + (key.upper() if unsigned else key))
+                get_wrapper = lambda f: lambda *a, **k: f(*a, **k)[0]
+                unpack = get_wrapper(s.unpack)
+                unpack_from = get_wrapper(s.unpack_from)
+
+                def get_unpack_from(s):
+                    def unpack_from(data, offset=0):
+                        return s.unpack_from(data, offset)[0], offset + s.size
+                    return unpack_from
+
+                unpack_from = get_unpack_from(s)
+                pack = s.pack
+
+                prefix = "u" if unsigned else ""
+                if s.size == 1:
+                    esuffix = ""
+                bits = str(s.size * 8)
+                funcs["%s%s%s" % (prefix, name, esuffix)] = unpack
+                funcs["%sint%s%s" % (prefix, bits, esuffix)] = unpack
+                funcs["%s%s%s_from" % (prefix, name, esuffix)] = unpack_from
+                funcs["%sint%s%s_from" % (prefix, bits, esuffix)] = unpack_from
+                funcs["to_%s%s%s" % (prefix, name, esuffix)] = pack
+                funcs["to_%sint%s%s" % (prefix, bits, esuffix)] = pack
+
+    for key, func in iteritems(funcs):
+        setattr(cls, key, staticmethod(func))
+
+
+class cdata(object):
+    """C character buffer to Python numeric type conversions.
+
+    For each size/sign/endianness:
+    uint32_le(data)/to_uint32_le(num)/uint32_le_from(data, offset=0)
+    """
+
+    from struct import error
+    error = error
+
+    bitswap = b''.join(
+        chr_(sum(((val >> i) & 1) << (7 - i) for i in range(8)))
+        for val in range(256))
+
+    test_bit = staticmethod(lambda value, n: bool((value >> n) & 1))
+
+
+_fill_cdata(cdata)
+
+
+def lock(fileobj):
+    """Lock a file object 'safely'.
+
+    That means a failure to lock because the platform doesn't
+    support fcntl or filesystem locks is not considered a
+    failure. This call does block.
+
+    Returns whether or not the lock was successful, or
+    raises an exception in more extreme circumstances (full
+    lock table, invalid file).
+    """
+
+    try:
+        import fcntl
+    except ImportError:
+        return False
+    else:
+        try:
+            fcntl.lockf(fileobj, fcntl.LOCK_EX)
+        except IOError:
+            # FIXME: There's possibly a lot of complicated
+            # logic that needs to go here in case the IOError
+            # is EACCES or EAGAIN.
+            return False
+        else:
+            return True
+
+
+def unlock(fileobj):
+    """Unlock a file object.
+
+    Don't call this on a file object unless a call to lock()
+    returned true.
+    """
+
+    # If this fails there's a mismatched lock/unlock pair,
+    # so we definitely don't want to ignore errors.
+    import fcntl
+    fcntl.lockf(fileobj, fcntl.LOCK_UN)
+
+
+def insert_bytes(fobj, size, offset, BUFFER_SIZE=2 ** 16):
+    """Insert size bytes of empty space starting at offset.
+
+    fobj must be an open file object, open rb+ or
+    equivalent. Mutagen tries to use mmap to resize the file, but
+    falls back to a significantly slower method if mmap fails.
+    """
+
+    assert 0 < size
+    assert 0 <= offset
+    locked = False
+    fobj.seek(0, 2)
+    filesize = fobj.tell()
+    movesize = filesize - offset
+    fobj.write(b'\x00' * size)
+    fobj.flush()
+    try:
+        try:
+            import mmap
+            file_map = mmap.mmap(fobj.fileno(), filesize + size)
+            try:
+                file_map.move(offset + size, offset, movesize)
+            finally:
+                file_map.close()
+        except (ValueError, EnvironmentError, ImportError):
+            # handle broken mmap scenarios
+            locked = lock(fobj)
+            fobj.truncate(filesize)
+
+            fobj.seek(0, 2)
+            padsize = size
+            # Don't generate an enormous string if we need to pad
+            # the file out several megs.
+            while padsize:
+                addsize = min(BUFFER_SIZE, padsize)
+                fobj.write(b"\x00" * addsize)
+                padsize -= addsize
+
+            fobj.seek(filesize, 0)
+            while movesize:
+                # At the start of this loop, fobj is pointing at the end
+                # of the data we need to move, which is of movesize length.
+                thismove = min(BUFFER_SIZE, movesize)
+                # Seek back however much we're going to read this frame.
+                fobj.seek(-thismove, 1)
+                nextpos = fobj.tell()
+                # Read it, so we're back at the end.
+                data = fobj.read(thismove)
+                # Seek back to where we need to write it.
+                fobj.seek(-thismove + size, 1)
+                # Write it.
+                fobj.write(data)
+                # And seek back to the end of the unmoved data.
+                fobj.seek(nextpos)
+                movesize -= thismove
+
+            fobj.flush()
+    finally:
+        if locked:
+            unlock(fobj)
+
+
+def delete_bytes(fobj, size, offset, BUFFER_SIZE=2 ** 16):
+    """Delete size bytes of empty space starting at offset.
+
+    fobj must be an open file object, open rb+ or
+    equivalent. Mutagen tries to use mmap to resize the file, but
+    falls back to a significantly slower method if mmap fails.
+    """
+
+    locked = False
+    assert 0 < size
+    assert 0 <= offset
+    fobj.seek(0, 2)
+    filesize = fobj.tell()
+    movesize = filesize - offset - size
+    assert 0 <= movesize
+    try:
+        if movesize > 0:
+            fobj.flush()
+            try:
+                import mmap
+                file_map = mmap.mmap(fobj.fileno(), filesize)
+                try:
+                    file_map.move(offset, offset + size, movesize)
+                finally:
+                    file_map.close()
+            except (ValueError, EnvironmentError, ImportError):
+                # handle broken mmap scenarios
+                locked = lock(fobj)
+                fobj.seek(offset + size)
+                buf = fobj.read(BUFFER_SIZE)
+                while buf:
+                    fobj.seek(offset)
+                    fobj.write(buf)
+                    offset += len(buf)
+                    fobj.seek(offset + size)
+                    buf = fobj.read(BUFFER_SIZE)
+        fobj.truncate(filesize - size)
+        fobj.flush()
+    finally:
+        if locked:
+            unlock(fobj)
+
+
+def dict_match(d, key, default=None):
+    """Like __getitem__ but works as if the keys() are all filename patterns.
+    Returns the value of any dict key that matches the passed key.
+    """
+
+    if key in d and "[" not in key:
+        return d[key]
+    else:
+        for pattern, value in iteritems(d):
+            if fnmatchcase(key, pattern):
+                return value
+    return default
+
+
+def decode_terminated(data, encoding, strict=True):
+    """Returns the decoded data until the first NULL terminator
+    and all data after it.
+
+    In case the data can't be decoded raises UnicodeError.
+    In case the encoding is not found raises LookupError.
+    In case the data isn't null terminated (even if it is encoded correctly)
+    raises ValueError except if strict is False, then the decoded string
+    will be returned anyway.
+    """
+
+    codec_info = codecs.lookup(encoding)
+
+    # normalize encoding name so we can compare by name
+    encoding = codec_info.name
+
+    # fast path
+    if encoding in ("utf-8", "iso8859-1"):
+        index = data.find(b"\x00")
+        if index == -1:
+            # make sure we raise UnicodeError first, like in the slow path
+            res = data.decode(encoding), b""
+            if strict:
+                raise ValueError("not null terminated")
+            else:
+                return res
+        return data[:index].decode(encoding), data[index + 1:]
+
+    # slow path
+    decoder = codec_info.incrementaldecoder()
+    r = []
+    for i, b in enumerate(iterbytes(data)):
+        c = decoder.decode(b)
+        if c == u"\x00":
+            return u"".join(r), data[i + 1:]
+        r.append(c)
+    else:
+        # make sure the decoder is finished
+        r.append(decoder.decode(b"", True))
+        if strict:
+            raise ValueError("not null terminated")
+        return u"".join(r), b""
+
+
+def split_escape(string, sep, maxsplit=None, escape_char="\\"):
+    """Like unicode/str/bytes.split but allows for the separator to be escaped
+
+    If passed unicode/str/bytes will only return list of unicode/str/bytes.
+    """
+
+    assert len(sep) == 1
+    assert len(escape_char) == 1
+
+    if isinstance(string, bytes):
+        if isinstance(escape_char, text_type):
+            escape_char = escape_char.encode("ascii")
+        iter_ = iterbytes
+    else:
+        iter_ = iter
+
+    if maxsplit is None:
+        maxsplit = len(string)
+
+    empty = string[:0]
+    result = []
+    current = empty
+    escaped = False
+    for char in iter_(string):
+        if escaped:
+            if char != escape_char and char != sep:
+                current += escape_char
+            current += char
+            escaped = False
+        else:
+            if char == escape_char:
+                escaped = True
+            elif char == sep and len(result) < maxsplit:
+                result.append(current)
+                current = empty
+            else:
+                current += char
+    result.append(current)
+    return result
+
+
+class BitReaderError(Exception):
+    pass
+
+
+class BitReader(object):
+
+    def __init__(self, fileobj):
+        self._fileobj = fileobj
+        self._buffer = 0
+        self._bits = 0
+        self._pos = fileobj.tell()
+
+    def bits(self, count):
+        """Reads `count` bits and returns an uint, MSB read first.
+
+        May raise BitReaderError if not enough data could be read or
+        IOError by the underlying file object.
+        """
+
+        if count < 0:
+            raise ValueError
+
+        if count > self._bits:
+            n_bytes = (count - self._bits + 7) // 8
+            data = self._fileobj.read(n_bytes)
+            if len(data) != n_bytes:
+                raise BitReaderError("not enough data")
+            for b in bytearray(data):
+                self._buffer = (self._buffer << 8) | b
+            self._bits += n_bytes * 8
+
+        self._bits -= count
+        value = self._buffer >> self._bits
+        self._buffer &= (1 << self._bits) - 1
+        assert self._bits < 8
+        return value
+
+    def bytes(self, count):
+        """Returns a bytearray of length `count`. Works unaligned."""
+
+        if count < 0:
+            raise ValueError
+
+        # fast path
+        if self._bits == 0:
+            data = self._fileobj.read(count)
+            if len(data) != count:
+                raise BitReaderError("not enough data")
+            return data
+
+        return bytes(bytearray(self.bits(8) for _ in xrange(count)))
+
+    def skip(self, count):
+        """Skip `count` bits.
+
+        Might raise BitReaderError if there wasn't enough data to skip,
+        but might also fail on the next bits() instead.
+        """
+
+        if count < 0:
+            raise ValueError
+
+        if count <= self._bits:
+            self.bits(count)
+        else:
+            count -= self.align()
+            n_bytes = count // 8
+            self._fileobj.seek(n_bytes, 1)
+            count -= n_bytes * 8
+            self.bits(count)
+
+    def get_position(self):
+        """Returns the amount of bits read or skipped so far"""
+
+        return (self._fileobj.tell() - self._pos) * 8 - self._bits
+
+    def align(self):
+        """Align to the next byte, returns the amount of bits skipped"""
+
+        bits = self._bits
+        self._buffer = 0
+        self._bits = 0
+        return bits
+
+    def is_aligned(self):
+        """If we are currently aligned to bytes and nothing is buffered"""
+
+        return self._bits == 0
diff --git a/lib/mutagen/_vorbis.py b/lib/mutagen/_vorbis.py
new file mode 100644
index 00000000..b5cd9254
--- /dev/null
+++ b/lib/mutagen/_vorbis.py
@@ -0,0 +1,327 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2005-2006  Joe Wreschnig
+#                    2013  Christoph Reiter
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+
+"""Read and write Vorbis comment data.
+
+Vorbis comments are freeform key/value pairs; keys are
+case-insensitive ASCII and values are Unicode strings. A key may have
+multiple values.
+
+The specification is at http://www.xiph.org/vorbis/doc/v-comment.html.
+"""
+
+import sys
+
+import mutagen
+from ._compat import reraise, BytesIO, text_type, xrange, PY3, PY2
+from mutagen._util import DictMixin, cdata
+
+
+def is_valid_key(key):
+    """Return true if a string is a valid Vorbis comment key.
+
+    Valid Vorbis comment keys are printable ASCII between 0x20 (space)
+    and 0x7D ('}'), excluding '='.
+
+    Takes str/unicode in Python 2, unicode in Python 3
+    """
+
+    if PY3 and isinstance(key, bytes):
+        raise TypeError("needs to be str not bytes")
+
+    for c in key:
+        if c < " " or c > "}" or c == "=":
+            return False
+    else:
+        return bool(key)
+
+
+istag = is_valid_key
+
+
+class error(IOError):
+    pass
+
+
+class VorbisUnsetFrameError(error):
+    pass
+
+
+class VorbisEncodingError(error):
+    pass
+
+
+class VComment(mutagen.Metadata, list):
+    """A Vorbis comment parser, accessor, and renderer.
+
+    All comment ordering is preserved. A VComment is a list of
+    key/value pairs, and so any Python list method can be used on it.
+
+    Vorbis comments are always wrapped in something like an Ogg Vorbis
+    bitstream or a FLAC metadata block, so this loads string data or a
+    file-like object, not a filename.
+
+    Attributes:
+
+    * vendor -- the stream 'vendor' (i.e. writer); default 'Mutagen'
+    """
+
+    vendor = u"Mutagen " + mutagen.version_string
+
+    def __init__(self, data=None, *args, **kwargs):
+        # Collect the args to pass to load, this lets child classes
+        # override just load and get equivalent magic for the
+        # constructor.
+        if data is not None:
+            if isinstance(data, bytes):
+                data = BytesIO(data)
+            elif not hasattr(data, 'read'):
+                raise TypeError("VComment requires bytes or a file-like")
+            self.load(data, *args, **kwargs)
+
+    def load(self, fileobj, errors='replace', framing=True):
+        """Parse a Vorbis comment from a file-like object.
+
+        Keyword arguments:
+
+        * errors:
+            'strict', 'replace', or 'ignore'. This affects Unicode decoding
+            and how other malformed content is interpreted.
+        * framing -- if true, fail if a framing bit is not present
+
+        Framing bits are required by the Vorbis comment specification,
+        but are not used in FLAC Vorbis comment blocks.
+        """
+
+        try:
+            vendor_length = cdata.uint_le(fileobj.read(4))
+            self.vendor = fileobj.read(vendor_length).decode('utf-8', errors)
+            count = cdata.uint_le(fileobj.read(4))
+            for i in xrange(count):
+                length = cdata.uint_le(fileobj.read(4))
+                try:
+                    string = fileobj.read(length).decode('utf-8', errors)
+                except (OverflowError, MemoryError):
+                    raise error("cannot read %d bytes, too large" % length)
+                try:
+                    tag, value = string.split('=', 1)
+                except ValueError as err:
+                    if errors == "ignore":
+                        continue
+                    elif errors == "replace":
+                        tag, value = u"unknown%d" % i, string
+                    else:
+                        reraise(VorbisEncodingError, err, sys.exc_info()[2])
+                try:
+                    tag = tag.encode('ascii', errors)
+                except UnicodeEncodeError:
+                    raise VorbisEncodingError("invalid tag name %r" % tag)
+                else:
+                    # string keys in py3k
+                    if PY3:
+                        tag = tag.decode("ascii")
+                    if is_valid_key(tag):
+                        self.append((tag, value))
+
+            if framing and not bytearray(fileobj.read(1))[0] & 0x01:
+                raise VorbisUnsetFrameError("framing bit was unset")
+        except (cdata.error, TypeError):
+            raise error("file is not a valid Vorbis comment")
+
+    def validate(self):
+        """Validate keys and values.
+
+        Check to make sure every key used is a valid Vorbis key, and
+        that every value used is a valid Unicode or UTF-8 string. If
+        any invalid keys or values are found, a ValueError is raised.
+
+        In Python 3 all keys and values have to be a string.
+        """
+
+        if not isinstance(self.vendor, text_type):
+            if PY3:
+                raise ValueError("vendor needs to be str")
+
+            try:
+                self.vendor.decode('utf-8')
+            except UnicodeDecodeError:
+                raise ValueError
+
+        for key, value in self:
+            try:
+                if not is_valid_key(key):
+                    raise ValueError
+            except TypeError:
+                raise ValueError("%r is not a valid key" % key)
+
+            if not isinstance(value, text_type):
+                if PY3:
+                    raise ValueError("%r needs to be str" % key)
+
+                try:
+                    value.decode("utf-8")
+                except:
+                    raise ValueError("%r is not a valid value" % value)
+
+        return True
+
+    def clear(self):
+        """Clear all keys from the comment."""
+
+        for i in list(self):
+            self.remove(i)
+
+    def write(self, framing=True):
+        """Return a string representation of the data.
+
+        Validation is always performed, so calling this function on
+        invalid data may raise a ValueError.
+
+        Keyword arguments:
+
+        * framing -- if true, append a framing bit (see load)
+        """
+
+        self.validate()
+
+        def _encode(value):
+            if not isinstance(value, bytes):
+                return value.encode('utf-8')
+            return value
+
+        f = BytesIO()
+        vendor = _encode(self.vendor)
+        f.write(cdata.to_uint_le(len(vendor)))
+        f.write(vendor)
+        f.write(cdata.to_uint_le(len(self)))
+        for tag, value in self:
+            tag = _encode(tag)
+            value = _encode(value)
+            comment = tag + b"=" + value
+            f.write(cdata.to_uint_le(len(comment)))
+            f.write(comment)
+        if framing:
+            f.write(b"\x01")
+        return f.getvalue()
+
+    def pprint(self):
+
+        def _decode(value):
+            if not isinstance(value, text_type):
+                return value.decode('utf-8', 'replace')
+            return value
+
+        tags = [u"%s=%s" % (_decode(k), _decode(v)) for k, v in self]
+        return u"\n".join(tags)
+
+
+class VCommentDict(VComment, DictMixin):
+    """A VComment that looks like a dictionary.
+
+    This object differs from a dictionary in two ways. First,
+    len(comment) will still return the number of values, not the
+    number of keys. Secondly, iterating through the object will
+    iterate over (key, value) pairs, not keys. Since a key may have
+    multiple values, the same value may appear multiple times while
+    iterating.
+
+    Since Vorbis comment keys are case-insensitive, all keys are
+    normalized to lowercase ASCII.
+    """
+
+    def __getitem__(self, key):
+        """A list of values for the key.
+
+        This is a copy, so comment['title'].append('a title') will not
+        work.
+        """
+
+        # PY3 only
+        if isinstance(key, slice):
+            return VComment.__getitem__(self, key)
+
+        if not is_valid_key(key):
+            raise ValueError
+
+        key = key.lower()
+
+        values = [value for (k, value) in self if k.lower() == key]
+        if not values:
+            raise KeyError(key)
+        else:
+            return values
+
+    def __delitem__(self, key):
+        """Delete all values associated with the key."""
+
+        # PY3 only
+        if isinstance(key, slice):
+            return VComment.__delitem__(self, key)
+
+        if not is_valid_key(key):
+            raise ValueError
+
+        key = key.lower()
+        to_delete = [x for x in self if x[0].lower() == key]
+        if not to_delete:
+            raise KeyError(key)
+        else:
+            for item in to_delete:
+                self.remove(item)
+
+    def __contains__(self, key):
+        """Return true if the key has any values."""
+
+        if not is_valid_key(key):
+            raise ValueError
+
+        key = key.lower()
+        for k, value in self:
+            if k.lower() == key:
+                return True
+        else:
+            return False
+
+    def __setitem__(self, key, values):
+        """Set a key's value or values.
+
+        Setting a value overwrites all old ones. The value may be a
+        list of Unicode or UTF-8 strings, or a single Unicode or UTF-8
+        string.
+        """
+
+        # PY3 only
+        if isinstance(key, slice):
+            return VComment.__setitem__(self, key, values)
+
+        if not is_valid_key(key):
+            raise ValueError
+
+        if not isinstance(values, list):
+            values = [values]
+        try:
+            del(self[key])
+        except KeyError:
+            pass
+
+        if PY2:
+            key = key.encode('ascii')
+
+        for value in values:
+            self.append((key, value))
+
+    def keys(self):
+        """Return all keys in the comment."""
+
+        return list(set([k.lower() for k, v in self]))
+
+    def as_dict(self):
+        """Return a copy of the comment data in a real dict."""
+
+        return dict([(key, self[key]) for key in self.keys()])
diff --git a/lib/mutagen/aac.py b/lib/mutagen/aac.py
new file mode 100644
index 00000000..62488711
--- /dev/null
+++ b/lib/mutagen/aac.py
@@ -0,0 +1,407 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2014 Christoph Reiter
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+
+"""
+* ADTS - Audio Data Transport Stream
+* ADIF - Audio Data Interchange Format
+* See ISO/IEC 13818-7 / 14496-03
+"""
+
+from mutagen import StreamInfo
+from mutagen._file import FileType
+from mutagen._util import BitReader, BitReaderError, MutagenError
+from mutagen._compat import endswith, xrange
+
+
+_FREQS = [
+    96000, 88200, 64000, 48000,
+    44100, 32000, 24000, 22050,
+    16000, 12000, 11025, 8000,
+    7350,
+]
+
+
+class _ADTSStream(object):
+    """Represents a series of frames belonging to the same stream"""
+
+    parsed_frames = 0
+    """Number of successfully parsed frames"""
+
+    offset = 0
+    """offset in bytes at which the stream starts (the first sync word)"""
+
+    @classmethod
+    def find_stream(cls, fileobj, max_bytes):
+        """Returns a possibly valid _ADTSStream or None.
+
+        Args:
+            max_bytes (int): maximum bytes to read
+        """
+
+        r = BitReader(fileobj)
+        stream = cls(r)
+        if stream.sync(max_bytes):
+            stream.offset = (r.get_position() - 12) // 8
+            return stream
+
+    def sync(self, max_bytes):
+        """Find the next sync.
+        Returns True if found."""
+
+        # at least 2 bytes for the sync
+        max_bytes = max(max_bytes, 2)
+
+        r = self._r
+        r.align()
+        while max_bytes > 0:
+            try:
+                b = r.bytes(1)
+                if b == b"\xff":
+                    if r.bits(4) == 0xf:
+                        return True
+                    r.align()
+                    max_bytes -= 2
+                else:
+                    max_bytes -= 1
+            except BitReaderError:
+                return False
+        return False
+
+    def __init__(self, r):
+        """Use _ADTSStream.find_stream to create a stream"""
+
+        self._fixed_header_key = None
+        self._r = r
+        self.offset = -1
+        self.parsed_frames = 0
+
+        self._samples = 0
+        self._payload = 0
+        self._start = r.get_position() / 8
+        self._last = self._start
+
+    @property
+    def bitrate(self):
+        """Bitrate of the raw aac blocks, excluding framing/crc"""
+
+        assert self.parsed_frames, "no frame parsed yet"
+
+        if self._samples == 0:
+            return 0
+
+        return (8 * self._payload * self.frequency) // self._samples
+
+    @property
+    def samples(self):
+        """samples so far"""
+
+        assert self.parsed_frames, "no frame parsed yet"
+
+        return self._samples
+
+    @property
+    def size(self):
+        """bytes read in the stream so far (including framing)"""
+
+        assert self.parsed_frames, "no frame parsed yet"
+
+        return self._last - self._start
+
+    @property
+    def channels(self):
+        """0 means unknown"""
+
+        assert self.parsed_frames, "no frame parsed yet"
+
+        b_index = self._fixed_header_key[6]
+        if b_index == 7:
+            return 8
+        elif b_index > 7:
+            return 0
+        else:
+            return b_index
+
+    @property
+    def frequency(self):
+        """0 means unknown"""
+
+        assert self.parsed_frames, "no frame parsed yet"
+
+        f_index = self._fixed_header_key[4]
+        try:
+            return _FREQS[f_index]
+        except IndexError:
+            return 0
+
+    def parse_frame(self):
+        """True if parsing was successful.
+        Fails either because the frame wasn't valid or the stream ended.
+        """
+
+        try:
+            return self._parse_frame()
+        except BitReaderError:
+            return False
+
+    def _parse_frame(self):
+        r = self._r
+        # start == position of sync word
+        start = r.get_position() - 12
+
+        # adts_fixed_header
+        id_ = r.bits(1)
+        layer = r.bits(2)
+        protection_absent = r.bits(1)
+
+        profile = r.bits(2)
+        sampling_frequency_index = r.bits(4)
+        private_bit = r.bits(1)
+        # TODO: if 0 we could parse program_config_element()
+        channel_configuration = r.bits(3)
+        original_copy = r.bits(1)
+        home = r.bits(1)
+
+        # the fixed header has to be the same for every frame in the stream
+        fixed_header_key = (
+            id_, layer, protection_absent, profile, sampling_frequency_index,
+            private_bit, channel_configuration, original_copy, home,
+        )
+
+        if self._fixed_header_key is None:
+            self._fixed_header_key = fixed_header_key
+        else:
+            if self._fixed_header_key != fixed_header_key:
+                return False
+
+        # adts_variable_header
+        r.skip(2)  # copyright_identification_bit/start
+        frame_length = r.bits(13)
+        r.skip(11)  # adts_buffer_fullness
+        nordbif = r.bits(2)
+        # adts_variable_header end
+
+        crc_overhead = 0
+        if not protection_absent:
+            crc_overhead += (nordbif + 1) * 16
+            if nordbif != 0:
+                crc_overhead *= 2
+
+        left = (frame_length * 8) - (r.get_position() - start)
+        if left < 0:
+            return False
+        r.skip(left)
+        assert r.is_aligned()
+
+        self._payload += (left - crc_overhead) / 8
+        self._samples += (nordbif + 1) * 1024
+        self._last = r.get_position() / 8
+
+        self.parsed_frames += 1
+        return True
+
+
+class ProgramConfigElement(object):
+
+    element_instance_tag = None
+    object_type = None
+    sampling_frequency_index = None
+    channels = None
+
+    def __init__(self, r):
+        """Reads the program_config_element()
+
+        Raises BitReaderError
+        """
+
+        self.element_instance_tag = r.bits(4)
+        self.object_type = r.bits(2)
+        self.sampling_frequency_index = r.bits(4)
+        num_front_channel_elements = r.bits(4)
+        num_side_channel_elements = r.bits(4)
+        num_back_channel_elements = r.bits(4)
+        num_lfe_channel_elements = r.bits(2)
+        num_assoc_data_elements = r.bits(3)
+        num_valid_cc_elements = r.bits(4)
+
+        mono_mixdown_present = r.bits(1)
+        if mono_mixdown_present == 1:
+            r.skip(4)
+        stereo_mixdown_present = r.bits(1)
+        if stereo_mixdown_present == 1:
+            r.skip(4)
+        matrix_mixdown_idx_present = r.bits(1)
+        if matrix_mixdown_idx_present == 1:
+            r.skip(3)
+
+        elms = num_front_channel_elements + num_side_channel_elements + \
+            num_back_channel_elements
+        channels = 0
+        for i in xrange(elms):
+            channels += 1
+            element_is_cpe = r.bits(1)
+            if element_is_cpe:
+                channels += 1
+            r.skip(4)
+        channels += num_lfe_channel_elements
+        self.channels = channels
+
+        r.skip(4 * num_lfe_channel_elements)
+        r.skip(4 * num_assoc_data_elements)
+        r.skip(5 * num_valid_cc_elements)
+        r.align()
+        comment_field_bytes = r.bits(8)
+        r.skip(8 * comment_field_bytes)
+
+
+class AACError(MutagenError):
+    pass
+
+
+class AACInfo(StreamInfo):
+    """AAC stream information.
+
+    Attributes:
+
+    * channels -- number of audio channels
+    * length -- file length in seconds, as a float
+    * sample_rate -- audio sampling rate in Hz
+    * bitrate -- audio bitrate, in bits per second
+
+    The length of the stream is just a guess and might not be correct.
+    """
+
+    channels = 0
+    length = 0
+    sample_rate = 0
+    bitrate = 0
+
+    def __init__(self, fileobj):
+        # skip id3v2 header
+        start_offset = 0
+        header = fileobj.read(10)
+        from mutagen.id3 import BitPaddedInt
+        if header.startswith(b"ID3"):
+            size = BitPaddedInt(header[6:])
+            start_offset = size + 10
+
+        fileobj.seek(start_offset)
+        adif = fileobj.read(4)
+        if adif == b"ADIF":
+            self._parse_adif(fileobj)
+            self._type = "ADIF"
+        else:
+            self._parse_adts(fileobj, start_offset)
+            self._type = "ADTS"
+
+    def _parse_adif(self, fileobj):
+        r = BitReader(fileobj)
+        try:
+            copyright_id_present = r.bits(1)
+            if copyright_id_present:
+                r.skip(72)  # copyright_id
+            r.skip(1 + 1)  # original_copy, home
+            bitstream_type = r.bits(1)
+            self.bitrate = r.bits(23)
+            npce = r.bits(4)
+            if bitstream_type == 0:
+                r.skip(20)  # adif_buffer_fullness
+
+            pce = ProgramConfigElement(r)
+            try:
+                self.sample_rate = _FREQS[pce.sampling_frequency_index]
+            except IndexError:
+                pass
+            self.channels = pce.channels
+
+            # other pces..
+            for i in xrange(npce):
+                ProgramConfigElement(r)
+            r.align()
+        except BitReaderError as e:
+            raise AACError(e)
+
+        # use bitrate + data size to guess length
+        start = fileobj.tell()
+        fileobj.seek(0, 2)
+        length = fileobj.tell() - start
+        if self.bitrate != 0:
+            self.length = (8.0 * length) / self.bitrate
+
+    def _parse_adts(self, fileobj, start_offset):
+        max_initial_read = 512
+        max_resync_read = 10
+        max_sync_tries = 10
+
+        frames_max = 100
+        frames_needed = 3
+
+        # Try up to X times to find a sync word and read up to Y frames.
+        # If more than Z frames are valid we assume a valid stream
+        offset = start_offset
+        for i in xrange(max_sync_tries):
+            fileobj.seek(offset)
+            s = _ADTSStream.find_stream(fileobj, max_initial_read)
+            if s is None:
+                raise AACError("sync not found")
+            # start right after the last found offset
+            offset += s.offset + 1
+
+            for i in xrange(frames_max):
+                if not s.parse_frame():
+                    break
+                if not s.sync(max_resync_read):
+                    break
+
+            if s.parsed_frames >= frames_needed:
+                break
+        else:
+            raise AACError(
+                "no valid stream found (only %d frames)" % s.parsed_frames)
+
+        self.sample_rate = s.frequency
+        self.channels = s.channels
+        self.bitrate = s.bitrate
+
+        # size from stream start to end of file
+        fileobj.seek(0, 2)
+        stream_size = fileobj.tell() - (offset + s.offset)
+        # approx
+        self.length = float(s.samples * stream_size) / (s.size * s.frequency)
+
+    def pprint(self):
+        return "AAC (%s), %d Hz, %.2f seconds, %d channel(s), %d bps" % (
+            self._type, self.sample_rate, self.length, self.channels,
+            self.bitrate)
+
+
+class AAC(FileType):
+    """Load ADTS or ADIF streams containing AAC.
+
+    Tagging is not supported.
+    Use the ID3/APEv2 classes directly instead.
+    """
+
+    _mimes = ["audio/x-aac"]
+
+    def load(self, filename):
+        self.filename = filename
+        with open(filename, "rb") as h:
+            self.info = AACInfo(h)
+
+    @staticmethod
+    def score(filename, fileobj, header):
+        filename = filename.lower()
+        s = endswith(filename, ".aac") or endswith(filename, ".adts") or \
+            endswith(filename, ".adif")
+        s += b"ADIF" in header
+        return s
+
+
+Open = AAC
+error = AACError
+
+__all__ = ["AAC", "Open"]
diff --git a/lib/mutagen/aiff.py b/lib/mutagen/aiff.py
new file mode 100644
index 00000000..1618caa3
--- /dev/null
+++ b/lib/mutagen/aiff.py
@@ -0,0 +1,362 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2014  Evan Purkhiser
+#               2014  Ben Ockmore
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+
+"""AIFF audio stream information and tags."""
+
+# NOTE from Ben Ockmore - according to the Py3k migration guidelines, AIFF
+# chunk keys should be unicode in Py3k, and unicode or bytes in Py2k (ASCII).
+# To make this easier, chunk keys should be stored internally as unicode.
+
+import struct
+from struct import pack
+
+from ._compat import endswith, text_type, PY3
+from mutagen import StreamInfo, FileType
+
+from mutagen.id3 import ID3
+from mutagen.id3._util import error as ID3Error
+from mutagen._util import insert_bytes, delete_bytes, MutagenError
+
+__all__ = ["AIFF", "Open", "delete"]
+
+
+class error(MutagenError, RuntimeError):
+    pass
+
+
+class InvalidChunk(error, IOError):
+    pass
+
+
+# based on stdlib's aifc
+_HUGE_VAL = 1.79769313486231e+308
+
+
+def is_valid_chunk_id(id):
+    if not isinstance(id, text_type):
+        if PY3:
+            raise TypeError("AIFF chunk must be unicode")
+
+        try:
+            id = id.decode('ascii')
+        except UnicodeDecodeError:
+            return False
+
+    return ((len(id) <= 4) and (min(id) >= u' ') and
+            (max(id) <= u'~'))
+
+
+def read_float(data):  # 10 bytes
+    expon, himant, lomant = struct.unpack('>hLL', data)
+    sign = 1
+    if expon < 0:
+        sign = -1
+        expon = expon + 0x8000
+    if expon == himant == lomant == 0:
+        f = 0.0
+    elif expon == 0x7FFF:
+        f = _HUGE_VAL
+    else:
+        expon = expon - 16383
+        f = (himant * 0x100000000 + lomant) * pow(2.0, expon - 63)
+    return sign * f
+
+
+class IFFChunk(object):
+    """Representation of a single IFF chunk"""
+
+    # Chunk headers are 8 bytes long (4 for ID and 4 for the size)
+    HEADER_SIZE = 8
+
+    def __init__(self, fileobj, parent_chunk=None):
+        self.__fileobj = fileobj
+        self.parent_chunk = parent_chunk
+        self.offset = fileobj.tell()
+
+        header = fileobj.read(self.HEADER_SIZE)
+        if len(header) < self.HEADER_SIZE:
+            raise InvalidChunk()
+
+        self.id, self.data_size = struct.unpack('>4si', header)
+
+        if not isinstance(self.id, text_type):
+            self.id = self.id.decode('ascii')
+
+        if not is_valid_chunk_id(self.id):
+            raise InvalidChunk()
+
+        self.size = self.HEADER_SIZE + self.data_size
+        self.data_offset = fileobj.tell()
+        self.data = None
+
+    def read(self):
+        """Read the chunks data"""
+        self.__fileobj.seek(self.data_offset)
+        self.data = self.__fileobj.read(self.data_size)
+
+    def delete(self):
+        """Removes the chunk from the file"""
+        delete_bytes(self.__fileobj, self.size, self.offset)
+        if self.parent_chunk is not None:
+            self.parent_chunk.resize(self.parent_chunk.data_size - self.size)
+
+    def resize(self, data_size):
+        """Update the size of the chunk"""
+        self.__fileobj.seek(self.offset + 4)
+        self.__fileobj.write(pack('>I', data_size))
+        if self.parent_chunk is not None:
+            size_diff = self.data_size - data_size
+            self.parent_chunk.resize(self.parent_chunk.data_size - size_diff)
+        self.data_size = data_size
+        self.size = data_size + self.HEADER_SIZE
+
+
+class IFFFile(object):
+    """Representation of a IFF file"""
+
+    def __init__(self, fileobj):
+        self.__fileobj = fileobj
+        self.__chunks = {}
+
+        # AIFF Files always start with the FORM chunk which contains a 4 byte
+        # ID before the start of other chunks
+        fileobj.seek(0)
+        self.__chunks[u'FORM'] = IFFChunk(fileobj)
+
+        # Skip past the 4 byte FORM id
+        fileobj.seek(IFFChunk.HEADER_SIZE + 4)
+
+        # Where the next chunk can be located. We need to keep track of this
+        # since the size indicated in the FORM header may not match up with the
+        # offset determined from the size of the last chunk in the file
+        self.__next_offset = fileobj.tell()
+
+        # Load all of the chunks
+        while True:
+            try:
+                chunk = IFFChunk(fileobj, self[u'FORM'])
+            except InvalidChunk:
+                break
+            self.__chunks[chunk.id.strip()] = chunk
+
+            # Calculate the location of the next chunk,
+            # considering the pad byte
+            self.__next_offset = chunk.offset + chunk.size
+            self.__next_offset += self.__next_offset % 2
+            fileobj.seek(self.__next_offset)
+
+    def __contains__(self, id_):
+        """Check if the IFF file contains a specific chunk"""
+
+        if not isinstance(id_, text_type):
+            id_ = id_.decode('ascii')
+
+        if not is_valid_chunk_id(id_):
+            raise KeyError("AIFF key must be four ASCII characters.")
+
+        return id_ in self.__chunks
+
+    def __getitem__(self, id_):
+        """Get a chunk from the IFF file"""
+
+        if not isinstance(id_, text_type):
+            id_ = id_.decode('ascii')
+
+        if not is_valid_chunk_id(id_):
+            raise KeyError("AIFF key must be four ASCII characters.")
+
+        try:
+            return self.__chunks[id_]
+        except KeyError:
+            raise KeyError(
+                "%r has no %r chunk" % (self.__fileobj.name, id_))
+
+    def __delitem__(self, id_):
+        """Remove a chunk from the IFF file"""
+
+        if not isinstance(id_, text_type):
+            id_ = id_.decode('ascii')
+
+        if not is_valid_chunk_id(id_):
+            raise KeyError("AIFF key must be four ASCII characters.")
+
+        self.__chunks.pop(id_).delete()
+
+    def insert_chunk(self, id_):
+        """Insert a new chunk at the end of the IFF file"""
+
+        if not isinstance(id_, text_type):
+            id_ = id_.decode('ascii')
+
+        if not is_valid_chunk_id(id_):
+            raise KeyError("AIFF key must be four ASCII characters.")
+
+        self.__fileobj.seek(self.__next_offset)
+        self.__fileobj.write(pack('>4si', id_.ljust(4).encode('ascii'), 0))
+        self.__fileobj.seek(self.__next_offset)
+        chunk = IFFChunk(self.__fileobj, self[u'FORM'])
+        self[u'FORM'].resize(self[u'FORM'].data_size + chunk.size)
+
+        self.__chunks[id_] = chunk
+        self.__next_offset = chunk.offset + chunk.size
+
+
+class AIFFInfo(StreamInfo):
+    """AIFF audio stream information.
+
+    Information is parsed from the COMM chunk of the AIFF file
+
+    Useful attributes:
+
+    * length -- audio length, in seconds
+    * bitrate -- audio bitrate, in bits per second
+    * channels -- The number of audio channels
+    * sample_rate -- audio sample rate, in Hz
+    * sample_size -- The audio sample size
+    """
+
+    length = 0
+    bitrate = 0
+    channels = 0
+    sample_rate = 0
+
+    def __init__(self, fileobj):
+        iff = IFFFile(fileobj)
+        try:
+            common_chunk = iff[u'COMM']
+        except KeyError as e:
+            raise error(str(e))
+
+        common_chunk.read()
+
+        info = struct.unpack('>hLh10s', common_chunk.data[:18])
+        channels, frame_count, sample_size, sample_rate = info
+
+        self.sample_rate = int(read_float(sample_rate))
+        self.sample_size = sample_size
+        self.channels = channels
+        self.bitrate = channels * sample_size * self.sample_rate
+        self.length = frame_count / float(self.sample_rate)
+
+    def pprint(self):
+        return "%d channel AIFF @ %d bps, %s Hz, %.2f seconds" % (
+            self.channels, self.bitrate, self.sample_rate, self.length)
+
+
+class _IFFID3(ID3):
+    """A AIFF file with ID3v2 tags"""
+
+    def _load_header(self):
+        try:
+            self._fileobj.seek(IFFFile(self._fileobj)[u'ID3'].data_offset)
+        except (InvalidChunk, KeyError):
+            raise ID3Error()
+        super(_IFFID3, self)._load_header()
+
+    def save(self, filename=None, v2_version=4, v23_sep='/'):
+        """Save ID3v2 data to the AIFF file"""
+
+        framedata = self._prepare_framedata(v2_version, v23_sep)
+        framesize = len(framedata)
+
+        if filename is None:
+            filename = self.filename
+
+        # Unlike the parent ID3.save method, we won't save to a blank file
+        # since we would have to construct a empty AIFF file
+        fileobj = open(filename, 'rb+')
+        iff_file = IFFFile(fileobj)
+
+        try:
+            if u'ID3' not in iff_file:
+                iff_file.insert_chunk(u'ID3')
+
+            chunk = iff_file[u'ID3']
+            fileobj.seek(chunk.data_offset)
+
+            header = fileobj.read(10)
+            header = self._prepare_id3_header(header, framesize, v2_version)
+            header, new_size, _ = header
+
+            data = header + framedata + (b'\x00' * (new_size - framesize))
+
+            # Include ID3 header size in 'new_size' calculation
+            new_size += 10
+
+            # Expand the chunk if necessary, including pad byte
+            if new_size > chunk.size:
+                insert_at = chunk.offset + chunk.size
+                insert_size = new_size - chunk.size + new_size % 2
+                insert_bytes(fileobj, insert_size, insert_at)
+                chunk.resize(new_size)
+
+            fileobj.seek(chunk.data_offset)
+            fileobj.write(data)
+        finally:
+            fileobj.close()
+
+    def delete(self, filename=None):
+        """Completely removes the ID3 chunk from the AIFF file"""
+
+        if filename is None:
+            filename = self.filename
+        delete(filename)
+        self.clear()
+
+
+def delete(filename):
+    """Completely removes the ID3 chunk from the AIFF file"""
+
+    with open(filename, "rb+") as file_:
+        try:
+            del IFFFile(file_)[u'ID3']
+        except KeyError:
+            pass
+
+
+class AIFF(FileType):
+    """An AIFF audio file.
+
+    :ivar info: :class:`AIFFInfo`
+    :ivar tags: :class:`ID3`
+    """
+
+    _mimes = ["audio/aiff", "audio/x-aiff"]
+
+    @staticmethod
+    def score(filename, fileobj, header):
+        filename = filename.lower()
+
+        return (header.startswith(b"FORM") * 2 + endswith(filename, b".aif") +
+                endswith(filename, b".aiff") + endswith(filename, b".aifc"))
+
+    def add_tags(self):
+        """Add an empty ID3 tag to the file."""
+        if self.tags is None:
+            self.tags = _IFFID3()
+        else:
+            raise error("an ID3 tag already exists")
+
+    def load(self, filename, **kwargs):
+        """Load stream and tag information from a file."""
+        self.filename = filename
+
+        try:
+            self.tags = _IFFID3(filename, **kwargs)
+        except ID3Error:
+            self.tags = None
+
+        try:
+            fileobj = open(filename, "rb")
+            self.info = AIFFInfo(fileobj)
+        finally:
+            fileobj.close()
+
+
+Open = AIFF
diff --git a/lib/mutagen/apev2.py b/lib/mutagen/apev2.py
new file mode 100644
index 00000000..6eee43ce
--- /dev/null
+++ b/lib/mutagen/apev2.py
@@ -0,0 +1,714 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2005  Joe Wreschnig
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+
+"""APEv2 reading and writing.
+
+The APEv2 format is most commonly used with Musepack files, but is
+also the format of choice for WavPack and other formats. Some MP3s
+also have APEv2 tags, but this can cause problems with many MP3
+decoders and taggers.
+
+APEv2 tags, like Vorbis comments, are freeform key=value pairs. APEv2
+keys can be any ASCII string with characters from 0x20 to 0x7E,
+between 2 and 255 characters long.  Keys are case-sensitive, but
+readers are recommended to be case insensitive, and it is forbidden to
+multiple keys which differ only in case.  Keys are usually stored
+title-cased (e.g. 'Artist' rather than 'artist').
+
+APEv2 values are slightly more structured than Vorbis comments; values
+are flagged as one of text, binary, or an external reference (usually
+a URI).
+
+Based off the format specification found at
+http://wiki.hydrogenaudio.org/index.php?title=APEv2_specification.
+"""
+
+__all__ = ["APEv2", "APEv2File", "Open", "delete"]
+
+import sys
+import struct
+from collections import MutableSequence
+
+from ._compat import (cBytesIO, PY3, text_type, PY2, reraise, swap_to_string,
+                      xrange)
+from mutagen import Metadata, FileType, StreamInfo
+from mutagen._util import (DictMixin, cdata, delete_bytes, total_ordering,
+                           MutagenError)
+
+
+def is_valid_apev2_key(key):
+    if not isinstance(key, text_type):
+        if PY3:
+            raise TypeError("APEv2 key must be str")
+
+        try:
+            key = key.decode('ascii')
+        except UnicodeDecodeError:
+            return False
+
+    # PY26 - Change to set literal syntax (since set is faster than list here)
+    return ((2 <= len(key) <= 255) and (min(key) >= u' ') and
+            (max(key) <= u'~') and
+            (key not in [u"OggS", u"TAG", u"ID3", u"MP+"]))
+
+# There are three different kinds of APE tag values.
+# "0: Item contains text information coded in UTF-8
+#  1: Item contains binary information
+#  2: Item is a locator of external stored information [e.g. URL]
+#  3: reserved"
+TEXT, BINARY, EXTERNAL = range(3)
+
+HAS_HEADER = 1 << 31
+HAS_NO_FOOTER = 1 << 30
+IS_HEADER = 1 << 29
+
+
+class error(IOError, MutagenError):
+    pass
+
+
+class APENoHeaderError(error, ValueError):
+    pass
+
+
+class APEUnsupportedVersionError(error, ValueError):
+    pass
+
+
+class APEBadItemError(error, ValueError):
+    pass
+
+
+class _APEv2Data(object):
+    # Store offsets of the important parts of the file.
+    start = header = data = footer = end = None
+    # Footer or header; seek here and read 32 to get version/size/items/flags
+    metadata = None
+    # Actual tag data
+    tag = None
+
+    version = None
+    size = None
+    items = None
+    flags = 0
+
+    # The tag is at the start rather than the end. A tag at both
+    # the start and end of the file (i.e. the tag is the whole file)
+    # is not considered to be at the start.
+    is_at_start = False
+
+    def __init__(self, fileobj):
+        self.__find_metadata(fileobj)
+
+        if self.header is None:
+            self.metadata = self.footer
+        elif self.footer is None:
+            self.metadata = self.header
+        else:
+            self.metadata = max(self.header, self.footer)
+
+        if self.metadata is None:
+            return
+
+        self.__fill_missing(fileobj)
+        self.__fix_brokenness(fileobj)
+        if self.data is not None:
+            fileobj.seek(self.data)
+            self.tag = fileobj.read(self.size)
+
+    def __find_metadata(self, fileobj):
+        # Try to find a header or footer.
+
+        # Check for a simple footer.
+        try:
+            fileobj.seek(-32, 2)
+        except IOError:
+            fileobj.seek(0, 2)
+            return
+        if fileobj.read(8) == b"APETAGEX":
+            fileobj.seek(-8, 1)
+            self.footer = self.metadata = fileobj.tell()
+            return
+
+        # Check for an APEv2 tag followed by an ID3v1 tag at the end.
+        try:
+            fileobj.seek(-128, 2)
+            if fileobj.read(3) == b"TAG":
+
+                fileobj.seek(-35, 1)  # "TAG" + header length
+                if fileobj.read(8) == b"APETAGEX":
+                    fileobj.seek(-8, 1)
+                    self.footer = fileobj.tell()
+                    return
+
+                # ID3v1 tag at the end, maybe preceded by Lyrics3v2.
+                # (http://www.id3.org/lyrics3200.html)
+                # (header length - "APETAGEX") - "LYRICS200"
+                fileobj.seek(15, 1)
+                if fileobj.read(9) == b'LYRICS200':
+                    fileobj.seek(-15, 1)  # "LYRICS200" + size tag
+                    try:
+                        offset = int(fileobj.read(6))
+                    except ValueError:
+                        raise IOError
+
+                    fileobj.seek(-32 - offset - 6, 1)
+                    if fileobj.read(8) == b"APETAGEX":
+                        fileobj.seek(-8, 1)
+                        self.footer = fileobj.tell()
+                        return
+
+        except IOError:
+            pass
+
+        # Check for a tag at the start.
+        fileobj.seek(0, 0)
+        if fileobj.read(8) == b"APETAGEX":
+            self.is_at_start = True
+            self.header = 0
+
+    def __fill_missing(self, fileobj):
+        fileobj.seek(self.metadata + 8)
+        self.version = fileobj.read(4)
+        self.size = cdata.uint_le(fileobj.read(4))
+        self.items = cdata.uint_le(fileobj.read(4))
+        self.flags = cdata.uint_le(fileobj.read(4))
+
+        if self.header is not None:
+            self.data = self.header + 32
+            # If we're reading the header, the size is the header
+            # offset + the size, which includes the footer.
+            self.end = self.data + self.size
+            fileobj.seek(self.end - 32, 0)
+            if fileobj.read(8) == b"APETAGEX":
+                self.footer = self.end - 32
+        elif self.footer is not None:
+            self.end = self.footer + 32
+            self.data = self.end - self.size
+            if self.flags & HAS_HEADER:
+                self.header = self.data - 32
+            else:
+                self.header = self.data
+        else:
+            raise APENoHeaderError("No APE tag found")
+
+        # exclude the footer from size
+        if self.footer is not None:
+            self.size -= 32
+
+    def __fix_brokenness(self, fileobj):
+        # Fix broken tags written with PyMusepack.
+        if self.header is not None:
+            start = self.header
+        else:
+            start = self.data
+        fileobj.seek(start)
+
+        while start > 0:
+            # Clean up broken writing from pre-Mutagen PyMusepack.
+            # It didn't remove the first 24 bytes of header.
+            try:
+                fileobj.seek(-24, 1)
+            except IOError:
+                break
+            else:
+                if fileobj.read(8) == b"APETAGEX":
+                    fileobj.seek(-8, 1)
+                    start = fileobj.tell()
+                else:
+                    break
+        self.start = start
+
+
+class _CIDictProxy(DictMixin):
+
+    def __init__(self, *args, **kwargs):
+        self.__casemap = {}
+        self.__dict = {}
+        super(_CIDictProxy, self).__init__(*args, **kwargs)
+        # Internally all names are stored as lowercase, but the case
+        # they were set with is remembered and used when saving.  This
+        # is roughly in line with the standard, which says that keys
+        # are case-sensitive but two keys differing only in case are
+        # not allowed, and recommends case-insensitive
+        # implementations.
+
+    def __getitem__(self, key):
+        return self.__dict[key.lower()]
+
+    def __setitem__(self, key, value):
+        lower = key.lower()
+        self.__casemap[lower] = key
+        self.__dict[lower] = value
+
+    def __delitem__(self, key):
+        lower = key.lower()
+        del(self.__casemap[lower])
+        del(self.__dict[lower])
+
+    def keys(self):
+        return [self.__casemap.get(key, key) for key in self.__dict.keys()]
+
+
+class APEv2(_CIDictProxy, Metadata):
+    """A file with an APEv2 tag.
+
+    ID3v1 tags are silently ignored and overwritten.
+    """
+
+    filename = None
+
+    def pprint(self):
+        """Return tag key=value pairs in a human-readable format."""
+
+        items = sorted(self.items())
+        return u"\n".join(u"%s=%s" % (k, v.pprint()) for k, v in items)
+
+    def load(self, filename):
+        """Load tags from a filename."""
+
+        self.filename = filename
+        fileobj = open(filename, "rb")
+        try:
+            data = _APEv2Data(fileobj)
+        finally:
+            fileobj.close()
+        if data.tag:
+            self.clear()
+            self.__parse_tag(data.tag, data.items)
+        else:
+            raise APENoHeaderError("No APE tag found")
+
+    def __parse_tag(self, tag, count):
+        fileobj = cBytesIO(tag)
+
+        for i in xrange(count):
+            size_data = fileobj.read(4)
+            # someone writes wrong item counts
+            if not size_data:
+                break
+            size = cdata.uint_le(size_data)
+            flags = cdata.uint_le(fileobj.read(4))
+
+            # Bits 1 and 2 bits are flags, 0-3
+            # Bit 0 is read/write flag, ignored
+            kind = (flags & 6) >> 1
+            if kind == 3:
+                raise APEBadItemError("value type must be 0, 1, or 2")
+            key = value = fileobj.read(1)
+            while key[-1:] != b'\x00' and value:
+                value = fileobj.read(1)
+                key += value
+            if key[-1:] == b"\x00":
+                key = key[:-1]
+            if PY3:
+                try:
+                    key = key.decode("ascii")
+                except UnicodeError as err:
+                    reraise(APEBadItemError, err, sys.exc_info()[2])
+            value = fileobj.read(size)
+
+            value = _get_value_type(kind)._new(value)
+
+            self[key] = value
+
+    def __getitem__(self, key):
+        if not is_valid_apev2_key(key):
+            raise KeyError("%r is not a valid APEv2 key" % key)
+        if PY2:
+            key = key.encode('ascii')
+
+        return super(APEv2, self).__getitem__(key)
+
+    def __delitem__(self, key):
+        if not is_valid_apev2_key(key):
+            raise KeyError("%r is not a valid APEv2 key" % key)
+        if PY2:
+            key = key.encode('ascii')
+
+        super(APEv2, self).__delitem__(key)
+
+    def __setitem__(self, key, value):
+        """'Magic' value setter.
+
+        This function tries to guess at what kind of value you want to
+        store. If you pass in a valid UTF-8 or Unicode string, it
+        treats it as a text value. If you pass in a list, it treats it
+        as a list of string/Unicode values.  If you pass in a string
+        that is not valid UTF-8, it assumes it is a binary value.
+
+        Python 3: all bytes will be assumed to be a byte value, even
+        if they are valid utf-8.
+
+        If you need to force a specific type of value (e.g. binary
+        data that also happens to be valid UTF-8, or an external
+        reference), use the APEValue factory and set the value to the
+        result of that::
+
+            from mutagen.apev2 import APEValue, EXTERNAL
+            tag['Website'] = APEValue('http://example.org', EXTERNAL)
+        """
+
+        if not is_valid_apev2_key(key):
+            raise KeyError("%r is not a valid APEv2 key" % key)
+
+        if PY2:
+            key = key.encode('ascii')
+
+        if not isinstance(value, _APEValue):
+            # let's guess at the content if we're not already a value...
+            if isinstance(value, text_type):
+                # unicode? we've got to be text.
+                value = APEValue(value, TEXT)
+            elif isinstance(value, list):
+                items = []
+                for v in value:
+                    if not isinstance(v, text_type):
+                        if PY3:
+                            raise TypeError("item in list not str")
+                        v = v.decode("utf-8")
+                    items.append(v)
+
+                # list? text.
+                value = APEValue(u"\0".join(items), TEXT)
+            else:
+                if PY3:
+                    value = APEValue(value, BINARY)
+                else:
+                    try:
+                        value.decode("utf-8")
+                    except UnicodeError:
+                        # invalid UTF8 text, probably binary
+                        value = APEValue(value, BINARY)
+                    else:
+                        # valid UTF8, probably text
+                        value = APEValue(value, TEXT)
+
+        super(APEv2, self).__setitem__(key, value)
+
+    def save(self, filename=None):
+        """Save changes to a file.
+
+        If no filename is given, the one most recently loaded is used.
+
+        Tags are always written at the end of the file, and include
+        a header and a footer.
+        """
+
+        filename = filename or self.filename
+        try:
+            fileobj = open(filename, "r+b")
+        except IOError:
+            fileobj = open(filename, "w+b")
+        data = _APEv2Data(fileobj)
+
+        if data.is_at_start:
+            delete_bytes(fileobj, data.end - data.start, data.start)
+        elif data.start is not None:
+            fileobj.seek(data.start)
+            # Delete an ID3v1 tag if present, too.
+            fileobj.truncate()
+        fileobj.seek(0, 2)
+
+        tags = []
+        for key, value in self.items():
+            # Packed format for an item:
+            # 4B: Value length
+            # 4B: Value type
+            # Key name
+            # 1B: Null
+            # Key value
+            value_data = value._write()
+            if not isinstance(key, bytes):
+                key = key.encode("utf-8")
+            tag_data = bytearray()
+            tag_data += struct.pack("<2I", len(value_data), value.kind << 1)
+            tag_data += key + b"\0" + value_data
+            tags.append(bytes(tag_data))
+
+        # "APE tags items should be sorted ascending by size... This is
+        # not a MUST, but STRONGLY recommended. Actually the items should
+        # be sorted by importance/byte, but this is not feasible."
+        tags.sort(key=len)
+        num_tags = len(tags)
+        tags = b"".join(tags)
+
+        header = bytearray(b"APETAGEX")
+        # version, tag size, item count, flags
+        header += struct.pack("<4I", 2000, len(tags) + 32, num_tags,
+                              HAS_HEADER | IS_HEADER)
+        header += b"\0" * 8
+        fileobj.write(header)
+
+        fileobj.write(tags)
+
+        footer = bytearray(b"APETAGEX")
+        footer += struct.pack("<4I", 2000, len(tags) + 32, num_tags,
+                              HAS_HEADER)
+        footer += b"\0" * 8
+
+        fileobj.write(footer)
+        fileobj.close()
+
+    def delete(self, filename=None):
+        """Remove tags from a file."""
+
+        filename = filename or self.filename
+        fileobj = open(filename, "r+b")
+        try:
+            data = _APEv2Data(fileobj)
+            if data.start is not None and data.size is not None:
+                delete_bytes(fileobj, data.end - data.start, data.start)
+        finally:
+            fileobj.close()
+        self.clear()
+
+
+Open = APEv2
+
+
+def delete(filename):
+    """Remove tags from a file."""
+
+    try:
+        APEv2(filename).delete()
+    except APENoHeaderError:
+        pass
+
+
+def _get_value_type(kind):
+    """Returns a _APEValue subclass or raises ValueError"""
+
+    if kind == TEXT:
+        return APETextValue
+    elif kind == BINARY:
+        return APEBinaryValue
+    elif kind == EXTERNAL:
+        return APEExtValue
+    raise ValueError("unknown kind %r" % kind)
+
+
+def APEValue(value, kind):
+    """APEv2 tag value factory.
+
+    Use this if you need to specify the value's type manually.  Binary
+    and text data are automatically detected by APEv2.__setitem__.
+    """
+
+    try:
+        type_ = _get_value_type(kind)
+    except ValueError:
+        raise ValueError("kind must be TEXT, BINARY, or EXTERNAL")
+    else:
+        return type_(value)
+
+
+class _APEValue(object):
+
+    kind = None
+    value = None
+
+    def __init__(self, value, kind=None):
+        # kind kwarg is for backwards compat
+        if kind is not None and kind != self.kind:
+            raise ValueError
+        self.value = self._validate(value)
+
+    @classmethod
+    def _new(cls, data):
+        instance = cls.__new__(cls)
+        instance._parse(data)
+        return instance
+
+    def _parse(self, data):
+        """Sets value or raises APEBadItemError"""
+
+        raise NotImplementedError
+
+    def _write(self):
+        """Returns bytes"""
+
+        raise NotImplementedError
+
+    def _validate(self, value):
+        """Returns validated value or raises TypeError/ValueErrr"""
+
+        raise NotImplementedError
+
+    def __repr__(self):
+        return "%s(%r, %d)" % (type(self).__name__, self.value, self.kind)
+
+
+@swap_to_string
+@total_ordering
+class _APEUtf8Value(_APEValue):
+
+    def _parse(self, data):
+        try:
+            self.value = data.decode("utf-8")
+        except UnicodeDecodeError as e:
+            reraise(APEBadItemError, e, sys.exc_info()[2])
+
+    def _validate(self, value):
+        if not isinstance(value, text_type):
+            if PY3:
+                raise TypeError("value not str")
+            else:
+                value = value.decode("utf-8")
+        return value
+
+    def _write(self):
+        return self.value.encode("utf-8")
+
+    def __len__(self):
+        return len(self.value)
+
+    def __bytes__(self):
+        return self._write()
+
+    def __eq__(self, other):
+        return self.value == other
+
+    def __lt__(self, other):
+        return self.value < other
+
+    def __str__(self):
+        return self.value
+
+
+class APETextValue(_APEUtf8Value, MutableSequence):
+    """An APEv2 text value.
+
+    Text values are Unicode/UTF-8 strings. They can be accessed like
+    strings (with a null separating the values), or arrays of strings.
+    """
+
+    kind = TEXT
+
+    def __iter__(self):
+        """Iterate over the strings of the value (not the characters)"""
+
+        return iter(self.value.split(u"\0"))
+
+    def __getitem__(self, index):
+        return self.value.split(u"\0")[index]
+
+    def __len__(self):
+        return self.value.count(u"\0") + 1
+
+    def __setitem__(self, index, value):
+        if not isinstance(value, text_type):
+            if PY3:
+                raise TypeError("value not str")
+            else:
+                value = value.decode("utf-8")
+
+        values = list(self)
+        values[index] = value
+        self.value = u"\0".join(values)
+
+    def insert(self, index, value):
+        if not isinstance(value, text_type):
+            if PY3:
+                raise TypeError("value not str")
+            else:
+                value = value.decode("utf-8")
+
+        values = list(self)
+        values.insert(index, value)
+        self.value = u"\0".join(values)
+
+    def __delitem__(self, index):
+        values = list(self)
+        del values[index]
+        self.value = u"\0".join(values)
+
+    def pprint(self):
+        return u" / ".join(self)
+
+
+@swap_to_string
+@total_ordering
+class APEBinaryValue(_APEValue):
+    """An APEv2 binary value."""
+
+    kind = BINARY
+
+    def _parse(self, data):
+        self.value = data
+
+    def _write(self):
+        return self.value
+
+    def _validate(self, value):
+        if not isinstance(value, bytes):
+            raise TypeError("value not bytes")
+        return bytes(value)
+
+    def __len__(self):
+        return len(self.value)
+
+    def __bytes__(self):
+        return self._write()
+
+    def __eq__(self, other):
+        return self.value == other
+
+    def __lt__(self, other):
+        return self.value < other
+
+    def pprint(self):
+        return u"[%d bytes]" % len(self)
+
+
+class APEExtValue(_APEUtf8Value):
+    """An APEv2 external value.
+
+    External values are usually URI or IRI strings.
+    """
+
+    kind = EXTERNAL
+
+    def pprint(self):
+        return u"[External] %s" % self.value
+
+
+class APEv2File(FileType):
+    class _Info(StreamInfo):
+        length = 0
+        bitrate = 0
+
+        def __init__(self, fileobj):
+            pass
+
+        @staticmethod
+        def pprint():
+            return u"Unknown format with APEv2 tag."
+
+    def load(self, filename):
+        self.filename = filename
+        self.info = self._Info(open(filename, "rb"))
+        try:
+            self.tags = APEv2(filename)
+        except APENoHeaderError:
+            self.tags = None
+
+    def add_tags(self):
+        if self.tags is None:
+            self.tags = APEv2()
+        else:
+            raise ValueError("%r already has tags: %r" % (self, self.tags))
+
+    @staticmethod
+    def score(filename, fileobj, header):
+        try:
+            fileobj.seek(-160, 2)
+        except IOError:
+            fileobj.seek(0)
+        footer = fileobj.read()
+        return ((b"APETAGEX" in footer) - header.startswith(b"ID3"))
diff --git a/lib/mutagen/asf.py b/lib/mutagen/asf.py
new file mode 100644
index 00000000..7cb7910d
--- /dev/null
+++ b/lib/mutagen/asf.py
@@ -0,0 +1,862 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2005-2006  Joe Wreschnig
+# Copyright (C) 2006-2007  Lukas Lalinsky
+
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+
+"""Read and write ASF (Window Media Audio) files."""
+
+__all__ = ["ASF", "Open"]
+
+import sys
+import struct
+from mutagen import FileType, Metadata, StreamInfo
+from mutagen._util import (insert_bytes, delete_bytes, DictMixin,
+                           total_ordering, MutagenError)
+from ._compat import swap_to_string, text_type, PY2, string_types, reraise, \
+    xrange, long_, PY3
+
+
+class error(IOError, MutagenError):
+    pass
+
+
+class ASFError(error):
+    pass
+
+
+class ASFHeaderError(error):
+    pass
+
+
+class ASFInfo(StreamInfo):
+    """ASF stream information."""
+
+    def __init__(self):
+        self.length = 0.0
+        self.sample_rate = 0
+        self.bitrate = 0
+        self.channels = 0
+
+    def pprint(self):
+        s = "Windows Media Audio %d bps, %s Hz, %d channels, %.2f seconds" % (
+            self.bitrate, self.sample_rate, self.channels, self.length)
+        return s
+
+
+class ASFTags(list, DictMixin, Metadata):
+    """Dictionary containing ASF attributes."""
+
+    def pprint(self):
+        return "\n".join("%s=%s" % (k, v) for k, v in self)
+
+    def __getitem__(self, key):
+        """A list of values for the key.
+
+        This is a copy, so comment['title'].append('a title') will not
+        work.
+
+        """
+
+        # PY3 only
+        if isinstance(key, slice):
+            return list.__getitem__(self, key)
+
+        values = [value for (k, value) in self if k == key]
+        if not values:
+            raise KeyError(key)
+        else:
+            return values
+
+    def __delitem__(self, key):
+        """Delete all values associated with the key."""
+
+        # PY3 only
+        if isinstance(key, slice):
+            return list.__delitem__(self, key)
+
+        to_delete = [x for x in self if x[0] == key]
+        if not to_delete:
+            raise KeyError(key)
+        else:
+            for k in to_delete:
+                self.remove(k)
+
+    def __contains__(self, key):
+        """Return true if the key has any values."""
+        for k, value in self:
+            if k == key:
+                return True
+        else:
+            return False
+
+    def __setitem__(self, key, values):
+        """Set a key's value or values.
+
+        Setting a value overwrites all old ones. The value may be a
+        list of Unicode or UTF-8 strings, or a single Unicode or UTF-8
+        string.
+
+        """
+
+        # PY3 only
+        if isinstance(key, slice):
+            return list.__setitem__(self, key, values)
+
+        if not isinstance(values, list):
+            values = [values]
+
+        to_append = []
+        for value in values:
+            if not isinstance(value, ASFBaseAttribute):
+                if isinstance(value, string_types):
+                    value = ASFUnicodeAttribute(value)
+                elif PY3 and isinstance(value, bytes):
+                    value = ASFByteArrayAttribute(value)
+                elif isinstance(value, bool):
+                    value = ASFBoolAttribute(value)
+                elif isinstance(value, int):
+                    value = ASFDWordAttribute(value)
+                elif isinstance(value, long_):
+                    value = ASFQWordAttribute(value)
+                else:
+                    raise TypeError("Invalid type %r" % type(value))
+            to_append.append((key, value))
+
+        try:
+            del(self[key])
+        except KeyError:
+            pass
+
+        self.extend(to_append)
+
+    def keys(self):
+        """Return all keys in the comment."""
+        return self and set(next(iter(zip(*self))))
+
+    def as_dict(self):
+        """Return a copy of the comment data in a real dict."""
+        d = {}
+        for key, value in self:
+            d.setdefault(key, []).append(value)
+        return d
+
+
+class ASFBaseAttribute(object):
+    """Generic attribute."""
+    TYPE = None
+
+    def __init__(self, value=None, data=None, language=None,
+                 stream=None, **kwargs):
+        self.language = language
+        self.stream = stream
+        if data:
+            self.value = self.parse(data, **kwargs)
+        else:
+            if value is None:
+                # we used to support not passing any args and instead assign
+                # them later, keep that working..
+                self.value = None
+            else:
+                self.value = self._validate(value)
+
+    def _validate(self, value):
+        """Raises TypeError or ValueError in case the user supplied value
+        isn't valid.
+        """
+
+        return value
+
+    def data_size(self):
+        raise NotImplementedError
+
+    def __repr__(self):
+        name = "%s(%r" % (type(self).__name__, self.value)
+        if self.language:
+            name += ", language=%d" % self.language
+        if self.stream:
+            name += ", stream=%d" % self.stream
+        name += ")"
+        return name
+
+    def render(self, name):
+        name = name.encode("utf-16-le") + b"\x00\x00"
+        data = self._render()
+        return (struct.pack("<H", len(name)) + name +
+                struct.pack("<HH", self.TYPE, len(data)) + data)
+
+    def render_m(self, name):
+        name = name.encode("utf-16-le") + b"\x00\x00"
+        if self.TYPE == 2:
+            data = self._render(dword=False)
+        else:
+            data = self._render()
+        return (struct.pack("<HHHHI", 0, self.stream or 0, len(name),
+                            self.TYPE, len(data)) + name + data)
+
+    def render_ml(self, name):
+        name = name.encode("utf-16-le") + b"\x00\x00"
+        if self.TYPE == 2:
+            data = self._render(dword=False)
+        else:
+            data = self._render()
+
+        return (struct.pack("<HHHHI", self.language or 0, self.stream or 0,
+                            len(name), self.TYPE, len(data)) + name + data)
+
+
+@swap_to_string
+@total_ordering
+class ASFUnicodeAttribute(ASFBaseAttribute):
+    """Unicode string attribute."""
+    TYPE = 0x0000
+
+    def parse(self, data):
+        try:
+            return data.decode("utf-16-le").strip("\x00")
+        except UnicodeDecodeError as e:
+            reraise(ASFError, e, sys.exc_info()[2])
+
+    def _validate(self, value):
+        if not isinstance(value, text_type):
+            if PY2:
+                return value.decode("utf-8")
+            else:
+                raise TypeError("%r not str" % value)
+        return value
+
+    def _render(self):
+        return self.value.encode("utf-16-le") + b"\x00\x00"
+
+    def data_size(self):
+        return len(self._render())
+
+    def __bytes__(self):
+        return self.value.encode("utf-16-le")
+
+    def __str__(self):
+        return self.value
+
+    def __eq__(self, other):
+        return text_type(self) == other
+
+    def __lt__(self, other):
+        return text_type(self) < other
+
+    __hash__ = ASFBaseAttribute.__hash__
+
+
+@swap_to_string
+@total_ordering
+class ASFByteArrayAttribute(ASFBaseAttribute):
+    """Byte array attribute."""
+    TYPE = 0x0001
+
+    def parse(self, data):
+        assert isinstance(data, bytes)
+        return data
+
+    def _render(self):
+        assert isinstance(self.value, bytes)
+        return self.value
+
+    def _validate(self, value):
+        if not isinstance(value, bytes):
+            raise TypeError("must be bytes/str: %r" % value)
+        return value
+
+    def data_size(self):
+        return len(self.value)
+
+    def __bytes__(self):
+        return self.value
+
+    def __str__(self):
+        return "[binary data (%d bytes)]" % len(self.value)
+
+    def __eq__(self, other):
+        return self.value == other
+
+    def __lt__(self, other):
+        return self.value < other
+
+    __hash__ = ASFBaseAttribute.__hash__
+
+
+@swap_to_string
+@total_ordering
+class ASFBoolAttribute(ASFBaseAttribute):
+    """Bool attribute."""
+    TYPE = 0x0002
+
+    def parse(self, data, dword=True):
+        if dword:
+            return struct.unpack("<I", data)[0] == 1
+        else:
+            return struct.unpack("<H", data)[0] == 1
+
+    def _render(self, dword=True):
+        if dword:
+            return struct.pack("<I", bool(self.value))
+        else:
+            return struct.pack("<H", bool(self.value))
+
+    def _validate(self, value):
+        return bool(value)
+
+    def data_size(self):
+        return 4
+
+    def __bool__(self):
+        return bool(self.value)
+
+    def __bytes__(self):
+        return text_type(self.value).encode('utf-8')
+
+    def __str__(self):
+        return text_type(self.value)
+
+    def __eq__(self, other):
+        return bool(self.value) == other
+
+    def __lt__(self, other):
+        return bool(self.value) < other
+
+    __hash__ = ASFBaseAttribute.__hash__
+
+
+@swap_to_string
+@total_ordering
+class ASFDWordAttribute(ASFBaseAttribute):
+    """DWORD attribute."""
+    TYPE = 0x0003
+
+    def parse(self, data):
+        return struct.unpack("<L", data)[0]
+
+    def _render(self):
+        return struct.pack("<L", self.value)
+
+    def _validate(self, value):
+        value = int(value)
+        if not 0 <= value <= 2 ** 32 - 1:
+            raise ValueError("Out of range")
+        return value
+
+    def data_size(self):
+        return 4
+
+    def __int__(self):
+        return self.value
+
+    def __bytes__(self):
+        return text_type(self.value).encode('utf-8')
+
+    def __str__(self):
+        return text_type(self.value)
+
+    def __eq__(self, other):
+        return int(self.value) == other
+
+    def __lt__(self, other):
+        return int(self.value) < other
+
+    __hash__ = ASFBaseAttribute.__hash__
+
+
+@swap_to_string
+@total_ordering
+class ASFQWordAttribute(ASFBaseAttribute):
+    """QWORD attribute."""
+    TYPE = 0x0004
+
+    def parse(self, data):
+        return struct.unpack("<Q", data)[0]
+
+    def _render(self):
+        return struct.pack("<Q", self.value)
+
+    def _validate(self, value):
+        value = int(value)
+        if not 0 <= value <= 2 ** 64 - 1:
+            raise ValueError("Out of range")
+        return value
+
+    def data_size(self):
+        return 8
+
+    def __int__(self):
+        return self.value
+
+    def __bytes__(self):
+        return text_type(self.value).encode('utf-8')
+
+    def __str__(self):
+        return text_type(self.value)
+
+    def __eq__(self, other):
+        return int(self.value) == other
+
+    def __lt__(self, other):
+        return int(self.value) < other
+
+    __hash__ = ASFBaseAttribute.__hash__
+
+
+@swap_to_string
+@total_ordering
+class ASFWordAttribute(ASFBaseAttribute):
+    """WORD attribute."""
+    TYPE = 0x0005
+
+    def parse(self, data):
+        return struct.unpack("<H", data)[0]
+
+    def _render(self):
+        return struct.pack("<H", self.value)
+
+    def _validate(self, value):
+        value = int(value)
+        if not 0 <= value <= 2 ** 16 - 1:
+            raise ValueError("Out of range")
+        return value
+
+    def data_size(self):
+        return 2
+
+    def __int__(self):
+        return self.value
+
+    def __bytes__(self):
+        return text_type(self.value).encode('utf-8')
+
+    def __str__(self):
+        return text_type(self.value)
+
+    def __eq__(self, other):
+        return int(self.value) == other
+
+    def __lt__(self, other):
+        return int(self.value) < other
+
+    __hash__ = ASFBaseAttribute.__hash__
+
+
+@swap_to_string
+@total_ordering
+class ASFGUIDAttribute(ASFBaseAttribute):
+    """GUID attribute."""
+    TYPE = 0x0006
+
+    def parse(self, data):
+        assert isinstance(data, bytes)
+        return data
+
+    def _render(self):
+        assert isinstance(self.value, bytes)
+        return self.value
+
+    def _validate(self, value):
+        if not isinstance(value, bytes):
+            raise TypeError("must be bytes/str: %r" % value)
+        return value
+
+    def data_size(self):
+        return len(self.value)
+
+    def __bytes__(self):
+        return self.value
+
+    def __str__(self):
+        return repr(self.value)
+
+    def __eq__(self, other):
+        return self.value == other
+
+    def __lt__(self, other):
+        return self.value < other
+
+    __hash__ = ASFBaseAttribute.__hash__
+
+
+UNICODE = ASFUnicodeAttribute.TYPE
+BYTEARRAY = ASFByteArrayAttribute.TYPE
+BOOL = ASFBoolAttribute.TYPE
+DWORD = ASFDWordAttribute.TYPE
+QWORD = ASFQWordAttribute.TYPE
+WORD = ASFWordAttribute.TYPE
+GUID = ASFGUIDAttribute.TYPE
+
+
+def ASFValue(value, kind, **kwargs):
+    try:
+        attr_type = _attribute_types[kind]
+    except KeyError:
+        raise ValueError("Unknown value type %r" % kind)
+    else:
+        return attr_type(value=value, **kwargs)
+
+
+_attribute_types = {
+    ASFUnicodeAttribute.TYPE: ASFUnicodeAttribute,
+    ASFByteArrayAttribute.TYPE: ASFByteArrayAttribute,
+    ASFBoolAttribute.TYPE: ASFBoolAttribute,
+    ASFDWordAttribute.TYPE: ASFDWordAttribute,
+    ASFQWordAttribute.TYPE: ASFQWordAttribute,
+    ASFWordAttribute.TYPE: ASFWordAttribute,
+    ASFGUIDAttribute.TYPE: ASFGUIDAttribute,
+}
+
+
+class BaseObject(object):
+    """Base ASF object."""
+    GUID = None
+
+    def parse(self, asf, data, fileobj, size):
+        self.data = data
+
+    def render(self, asf):
+        data = self.GUID + struct.pack("<Q", len(self.data) + 24) + self.data
+        return data
+
+
+class UnknownObject(BaseObject):
+    """Unknown ASF object."""
+    def __init__(self, guid):
+        assert isinstance(guid, bytes)
+        self.GUID = guid
+
+
+class HeaderObject(object):
+    """ASF header."""
+    GUID = b"\x30\x26\xB2\x75\x8E\x66\xCF\x11\xA6\xD9\x00\xAA\x00\x62\xCE\x6C"
+
+
+class ContentDescriptionObject(BaseObject):
+    """Content description."""
+    GUID = b"\x33\x26\xB2\x75\x8E\x66\xCF\x11\xA6\xD9\x00\xAA\x00\x62\xCE\x6C"
+
+    NAMES = [
+        u"Title",
+        u"Author",
+        u"Copyright",
+        u"Description",
+        u"Rating",
+    ]
+
+    def parse(self, asf, data, fileobj, size):
+        super(ContentDescriptionObject, self).parse(asf, data, fileobj, size)
+        asf.content_description_obj = self
+        lengths = struct.unpack("<HHHHH", data[:10])
+        texts = []
+        pos = 10
+        for length in lengths:
+            end = pos + length
+            if length > 0:
+                texts.append(data[pos:end].decode("utf-16-le").strip(u"\x00"))
+            else:
+                texts.append(None)
+            pos = end
+
+        for key, value in zip(self.NAMES, texts):
+            if value is not None:
+                value = ASFUnicodeAttribute(value=value)
+                asf._tags.setdefault(self.GUID, []).append((key, value))
+
+    def render(self, asf):
+        def render_text(name):
+            value = asf.to_content_description.get(name)
+            if value is not None:
+                return text_type(value).encode("utf-16-le") + b"\x00\x00"
+            else:
+                return b""
+
+        texts = [render_text(x) for x in self.NAMES]
+        data = struct.pack("<HHHHH", *map(len, texts)) + b"".join(texts)
+        return self.GUID + struct.pack("<Q", 24 + len(data)) + data
+
+
+class ExtendedContentDescriptionObject(BaseObject):
+    """Extended content description."""
+    GUID = b"\x40\xA4\xD0\xD2\x07\xE3\xD2\x11\x97\xF0\x00\xA0\xC9\x5E\xA8\x50"
+
+    def parse(self, asf, data, fileobj, size):
+        super(ExtendedContentDescriptionObject, self).parse(
+            asf, data, fileobj, size)
+        asf.extended_content_description_obj = self
+        num_attributes, = struct.unpack("<H", data[0:2])
+        pos = 2
+        for i in xrange(num_attributes):
+            name_length, = struct.unpack("<H", data[pos:pos + 2])
+            pos += 2
+            name = data[pos:pos + name_length]
+            name = name.decode("utf-16-le").strip("\x00")
+            pos += name_length
+            value_type, value_length = struct.unpack("<HH", data[pos:pos + 4])
+            pos += 4
+            value = data[pos:pos + value_length]
+            pos += value_length
+            attr = _attribute_types[value_type](data=value)
+            asf._tags.setdefault(self.GUID, []).append((name, attr))
+
+    def render(self, asf):
+        attrs = asf.to_extended_content_description.items()
+        data = b"".join(attr.render(name) for (name, attr) in attrs)
+        data = struct.pack("<QH", 26 + len(data), len(attrs)) + data
+        return self.GUID + data
+
+
+class FilePropertiesObject(BaseObject):
+    """File properties."""
+    GUID = b"\xA1\xDC\xAB\x8C\x47\xA9\xCF\x11\x8E\xE4\x00\xC0\x0C\x20\x53\x65"
+
+    def parse(self, asf, data, fileobj, size):
+        super(FilePropertiesObject, self).parse(asf, data, fileobj, size)
+        length, _, preroll = struct.unpack("<QQQ", data[40:64])
+        asf.info.length = (length / 10000000.0) - (preroll / 1000.0)
+
+
+class StreamPropertiesObject(BaseObject):
+    """Stream properties."""
+    GUID = b"\x91\x07\xDC\xB7\xB7\xA9\xCF\x11\x8E\xE6\x00\xC0\x0C\x20\x53\x65"
+
+    def parse(self, asf, data, fileobj, size):
+        super(StreamPropertiesObject, self).parse(asf, data, fileobj, size)
+        channels, sample_rate, bitrate = struct.unpack("<HII", data[56:66])
+        asf.info.channels = channels
+        asf.info.sample_rate = sample_rate
+        asf.info.bitrate = bitrate * 8
+
+
+class HeaderExtensionObject(BaseObject):
+    """Header extension."""
+    GUID = b"\xb5\x03\xbf_.\xa9\xcf\x11\x8e\xe3\x00\xc0\x0c Se"
+
+    def parse(self, asf, data, fileobj, size):
+        super(HeaderExtensionObject, self).parse(asf, data, fileobj, size)
+        asf.header_extension_obj = self
+        datasize, = struct.unpack("<I", data[18:22])
+        datapos = 0
+        self.objects = []
+        while datapos < datasize:
+            guid, size = struct.unpack(
+                "<16sQ", data[22 + datapos:22 + datapos + 24])
+            if guid in _object_types:
+                obj = _object_types[guid]()
+            else:
+                obj = UnknownObject(guid)
+            obj.parse(asf, data[22 + datapos + 24:22 + datapos + size],
+                      fileobj, size)
+            self.objects.append(obj)
+            datapos += size
+
+    def render(self, asf):
+        data = b"".join(obj.render(asf) for obj in self.objects)
+        return (self.GUID + struct.pack("<Q", 24 + 16 + 6 + len(data)) +
+                b"\x11\xD2\xD3\xAB\xBA\xA9\xcf\x11" +
+                b"\x8E\xE6\x00\xC0\x0C\x20\x53\x65" +
+                b"\x06\x00" + struct.pack("<I", len(data)) + data)
+
+
+class MetadataObject(BaseObject):
+    """Metadata description."""
+    GUID = b"\xea\xcb\xf8\xc5\xaf[wH\x84g\xaa\x8cD\xfaL\xca"
+
+    def parse(self, asf, data, fileobj, size):
+        super(MetadataObject, self).parse(asf, data, fileobj, size)
+        asf.metadata_obj = self
+        num_attributes, = struct.unpack("<H", data[0:2])
+        pos = 2
+        for i in xrange(num_attributes):
+            (reserved, stream, name_length, value_type,
+             value_length) = struct.unpack("<HHHHI", data[pos:pos + 12])
+            pos += 12
+            name = data[pos:pos + name_length]
+            name = name.decode("utf-16-le").strip("\x00")
+            pos += name_length
+            value = data[pos:pos + value_length]
+            pos += value_length
+            args = {'data': value, 'stream': stream}
+            if value_type == 2:
+                args['dword'] = False
+            attr = _attribute_types[value_type](**args)
+            asf._tags.setdefault(self.GUID, []).append((name, attr))
+
+    def render(self, asf):
+        attrs = asf.to_metadata.items()
+        data = b"".join([attr.render_m(name) for (name, attr) in attrs])
+        return (self.GUID + struct.pack("<QH", 26 + len(data), len(attrs)) +
+                data)
+
+
+class MetadataLibraryObject(BaseObject):
+    """Metadata library description."""
+    GUID = b"\x94\x1c#D\x98\x94\xd1I\xa1A\x1d\x13NEpT"
+
+    def parse(self, asf, data, fileobj, size):
+        super(MetadataLibraryObject, self).parse(asf, data, fileobj, size)
+        asf.metadata_library_obj = self
+        num_attributes, = struct.unpack("<H", data[0:2])
+        pos = 2
+        for i in xrange(num_attributes):
+            (language, stream, name_length, value_type,
+             value_length) = struct.unpack("<HHHHI", data[pos:pos + 12])
+            pos += 12
+            name = data[pos:pos + name_length]
+            name = name.decode("utf-16-le").strip("\x00")
+            pos += name_length
+            value = data[pos:pos + value_length]
+            pos += value_length
+            args = {'data': value, 'language': language, 'stream': stream}
+            if value_type == 2:
+                args['dword'] = False
+            attr = _attribute_types[value_type](**args)
+            asf._tags.setdefault(self.GUID, []).append((name, attr))
+
+    def render(self, asf):
+        attrs = asf.to_metadata_library
+        data = b"".join([attr.render_ml(name) for (name, attr) in attrs])
+        return (self.GUID + struct.pack("<QH", 26 + len(data), len(attrs)) +
+                data)
+
+
+_object_types = {
+    ExtendedContentDescriptionObject.GUID: ExtendedContentDescriptionObject,
+    ContentDescriptionObject.GUID: ContentDescriptionObject,
+    FilePropertiesObject.GUID: FilePropertiesObject,
+    StreamPropertiesObject.GUID: StreamPropertiesObject,
+    HeaderExtensionObject.GUID: HeaderExtensionObject,
+    MetadataLibraryObject.GUID: MetadataLibraryObject,
+    MetadataObject.GUID: MetadataObject,
+}
+
+
+class ASF(FileType):
+    """An ASF file, probably containing WMA or WMV."""
+
+    _mimes = ["audio/x-ms-wma", "audio/x-ms-wmv", "video/x-ms-asf",
+              "audio/x-wma", "video/x-wmv"]
+
+    def load(self, filename):
+        self.filename = filename
+        with open(filename, "rb") as fileobj:
+            self.size = 0
+            self.size1 = 0
+            self.size2 = 0
+            self.offset1 = 0
+            self.offset2 = 0
+            self.num_objects = 0
+            self.info = ASFInfo()
+            self.tags = ASFTags()
+            self.__read_file(fileobj)
+
+    def save(self):
+        # Move attributes to the right objects
+        self.to_content_description = {}
+        self.to_extended_content_description = {}
+        self.to_metadata = {}
+        self.to_metadata_library = []
+        for name, value in self.tags:
+            library_only = (value.data_size() > 0xFFFF or value.TYPE == GUID)
+            can_cont_desc = value.TYPE == UNICODE
+
+            if library_only or value.language is not None:
+                self.to_metadata_library.append((name, value))
+            elif value.stream is not None:
+                if name not in self.to_metadata:
+                    self.to_metadata[name] = value
+                else:
+                    self.to_metadata_library.append((name, value))
+            elif name in ContentDescriptionObject.NAMES:
+                if name not in self.to_content_description and can_cont_desc:
+                    self.to_content_description[name] = value
+                else:
+                    self.to_metadata_library.append((name, value))
+            else:
+                if name not in self.to_extended_content_description:
+                    self.to_extended_content_description[name] = value
+                else:
+                    self.to_metadata_library.append((name, value))
+
+        # Add missing objects
+        if not self.content_description_obj:
+            self.content_description_obj = \
+                ContentDescriptionObject()
+            self.objects.append(self.content_description_obj)
+        if not self.extended_content_description_obj:
+            self.extended_content_description_obj = \
+                ExtendedContentDescriptionObject()
+            self.objects.append(self.extended_content_description_obj)
+        if not self.header_extension_obj:
+            self.header_extension_obj = \
+                HeaderExtensionObject()
+            self.objects.append(self.header_extension_obj)
+        if not self.metadata_obj:
+            self.metadata_obj = \
+                MetadataObject()
+            self.header_extension_obj.objects.append(self.metadata_obj)
+        if not self.metadata_library_obj:
+            self.metadata_library_obj = \
+                MetadataLibraryObject()
+            self.header_extension_obj.objects.append(self.metadata_library_obj)
+
+        # Render the header
+        data = b"".join([obj.render(self) for obj in self.objects])
+        data = (HeaderObject.GUID +
+                struct.pack("<QL", len(data) + 30, len(self.objects)) +
+                b"\x01\x02" + data)
+
+        with open(self.filename, "rb+") as fileobj:
+            size = len(data)
+            if size > self.size:
+                insert_bytes(fileobj, size - self.size, self.size)
+            if size < self.size:
+                delete_bytes(fileobj, self.size - size, 0)
+            fileobj.seek(0)
+            fileobj.write(data)
+
+        self.size = size
+        self.num_objects = len(self.objects)
+
+    def __read_file(self, fileobj):
+        header = fileobj.read(30)
+        if len(header) != 30 or header[:16] != HeaderObject.GUID:
+            raise ASFHeaderError("Not an ASF file.")
+
+        self.extended_content_description_obj = None
+        self.content_description_obj = None
+        self.header_extension_obj = None
+        self.metadata_obj = None
+        self.metadata_library_obj = None
+
+        self.size, self.num_objects = struct.unpack("<QL", header[16:28])
+        self.objects = []
+        self._tags = {}
+        for i in xrange(self.num_objects):
+            self.__read_object(fileobj)
+
+        for guid in [ContentDescriptionObject.GUID,
+                ExtendedContentDescriptionObject.GUID, MetadataObject.GUID,
+                MetadataLibraryObject.GUID]:
+            self.tags.extend(self._tags.pop(guid, []))
+        assert not self._tags
+
+    def __read_object(self, fileobj):
+        guid, size = struct.unpack("<16sQ", fileobj.read(24))
+        if guid in _object_types:
+            obj = _object_types[guid]()
+        else:
+            obj = UnknownObject(guid)
+        data = fileobj.read(size - 24)
+        obj.parse(self, data, fileobj, size)
+        self.objects.append(obj)
+
+    @staticmethod
+    def score(filename, fileobj, header):
+        return header.startswith(HeaderObject.GUID) * 2
+
+Open = ASF
diff --git a/lib/mutagen/easyid3.py b/lib/mutagen/easyid3.py
new file mode 100644
index 00000000..f8dd2de0
--- /dev/null
+++ b/lib/mutagen/easyid3.py
@@ -0,0 +1,534 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2006  Joe Wreschnig
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+
+"""Easier access to ID3 tags.
+
+EasyID3 is a wrapper around mutagen.id3.ID3 to make ID3 tags appear
+more like Vorbis or APEv2 tags.
+"""
+
+import mutagen.id3
+
+from ._compat import iteritems, text_type, PY2
+from mutagen import Metadata
+from mutagen._util import DictMixin, dict_match
+from mutagen.id3 import ID3, error, delete, ID3FileType
+
+
+__all__ = ['EasyID3', 'Open', 'delete']
+
+
+class EasyID3KeyError(KeyError, ValueError, error):
+    """Raised when trying to get/set an invalid key.
+
+    Subclasses both KeyError and ValueError for API compatibility,
+    catching KeyError is preferred.
+    """
+
+
+class EasyID3(DictMixin, Metadata):
+    """A file with an ID3 tag.
+
+    Like Vorbis comments, EasyID3 keys are case-insensitive ASCII
+    strings. Only a subset of ID3 frames are supported by default. Use
+    EasyID3.RegisterKey and its wrappers to support more.
+
+    You can also set the GetFallback, SetFallback, and DeleteFallback
+    to generic key getter/setter/deleter functions, which are called
+    if no specific handler is registered for a key. Additionally,
+    ListFallback can be used to supply an arbitrary list of extra
+    keys. These can be set on EasyID3 or on individual instances after
+    creation.
+
+    To use an EasyID3 class with mutagen.mp3.MP3::
+
+        from mutagen.mp3 import EasyMP3 as MP3
+        MP3(filename)
+
+    Because many of the attributes are constructed on the fly, things
+    like the following will not work::
+
+        ezid3["performer"].append("Joe")
+
+    Instead, you must do::
+
+        values = ezid3["performer"]
+        values.append("Joe")
+        ezid3["performer"] = values
+
+    """
+
+    Set = {}
+    Get = {}
+    Delete = {}
+    List = {}
+
+    # For compatibility.
+    valid_keys = Get
+
+    GetFallback = None
+    SetFallback = None
+    DeleteFallback = None
+    ListFallback = None
+
+    @classmethod
+    def RegisterKey(cls, key,
+                    getter=None, setter=None, deleter=None, lister=None):
+        """Register a new key mapping.
+
+        A key mapping is four functions, a getter, setter, deleter,
+        and lister. The key may be either a string or a glob pattern.
+
+        The getter, deleted, and lister receive an ID3 instance and
+        the requested key name. The setter also receives the desired
+        value, which will be a list of strings.
+
+        The getter, setter, and deleter are used to implement __getitem__,
+        __setitem__, and __delitem__.
+
+        The lister is used to implement keys(). It should return a
+        list of keys that are actually in the ID3 instance, provided
+        by its associated getter.
+        """
+        key = key.lower()
+        if getter is not None:
+            cls.Get[key] = getter
+        if setter is not None:
+            cls.Set[key] = setter
+        if deleter is not None:
+            cls.Delete[key] = deleter
+        if lister is not None:
+            cls.List[key] = lister
+
+    @classmethod
+    def RegisterTextKey(cls, key, frameid):
+        """Register a text key.
+
+        If the key you need to register is a simple one-to-one mapping
+        of ID3 frame name to EasyID3 key, then you can use this
+        function::
+
+            EasyID3.RegisterTextKey("title", "TIT2")
+        """
+        def getter(id3, key):
+            return list(id3[frameid])
+
+        def setter(id3, key, value):
+            try:
+                frame = id3[frameid]
+            except KeyError:
+                id3.add(mutagen.id3.Frames[frameid](encoding=3, text=value))
+            else:
+                frame.encoding = 3
+                frame.text = value
+
+        def deleter(id3, key):
+            del(id3[frameid])
+
+        cls.RegisterKey(key, getter, setter, deleter)
+
+    @classmethod
+    def RegisterTXXXKey(cls, key, desc):
+        """Register a user-defined text frame key.
+
+        Some ID3 tags are stored in TXXX frames, which allow a
+        freeform 'description' which acts as a subkey,
+        e.g. TXXX:BARCODE.::
+
+            EasyID3.RegisterTXXXKey('barcode', 'BARCODE').
+        """
+        frameid = "TXXX:" + desc
+
+        def getter(id3, key):
+            return list(id3[frameid])
+
+        def setter(id3, key, value):
+            try:
+                frame = id3[frameid]
+            except KeyError:
+                enc = 0
+                # Store 8859-1 if we can, per MusicBrainz spec.
+                for v in value:
+                    if v and max(v) > u'\x7f':
+                        enc = 3
+                        break
+
+                id3.add(mutagen.id3.TXXX(encoding=enc, text=value, desc=desc))
+            else:
+                frame.text = value
+
+        def deleter(id3, key):
+            del(id3[frameid])
+
+        cls.RegisterKey(key, getter, setter, deleter)
+
+    def __init__(self, filename=None):
+        self.__id3 = ID3()
+        if filename is not None:
+            self.load(filename)
+
+    load = property(lambda s: s.__id3.load,
+                    lambda s, v: setattr(s.__id3, 'load', v))
+
+    def save(self, *args, **kwargs):
+        # ignore v2_version until we support 2.3 here
+        kwargs.pop("v2_version", None)
+        self.__id3.save(*args, **kwargs)
+
+    delete = property(lambda s: s.__id3.delete,
+                      lambda s, v: setattr(s.__id3, 'delete', v))
+
+    filename = property(lambda s: s.__id3.filename,
+                        lambda s, fn: setattr(s.__id3, 'filename', fn))
+
+    size = property(lambda s: s.__id3.size,
+                    lambda s, fn: setattr(s.__id3, 'size', s))
+
+    def __getitem__(self, key):
+        key = key.lower()
+        func = dict_match(self.Get, key, self.GetFallback)
+        if func is not None:
+            return func(self.__id3, key)
+        else:
+            raise EasyID3KeyError("%r is not a valid key" % key)
+
+    def __setitem__(self, key, value):
+        key = key.lower()
+        if PY2:
+            if isinstance(value, basestring):
+                value = [value]
+        else:
+            if isinstance(value, text_type):
+                value = [value]
+        func = dict_match(self.Set, key, self.SetFallback)
+        if func is not None:
+            return func(self.__id3, key, value)
+        else:
+            raise EasyID3KeyError("%r is not a valid key" % key)
+
+    def __delitem__(self, key):
+        key = key.lower()
+        func = dict_match(self.Delete, key, self.DeleteFallback)
+        if func is not None:
+            return func(self.__id3, key)
+        else:
+            raise EasyID3KeyError("%r is not a valid key" % key)
+
+    def keys(self):
+        keys = []
+        for key in self.Get.keys():
+            if key in self.List:
+                keys.extend(self.List[key](self.__id3, key))
+            elif key in self:
+                keys.append(key)
+        if self.ListFallback is not None:
+            keys.extend(self.ListFallback(self.__id3, ""))
+        return keys
+
+    def pprint(self):
+        """Print tag key=value pairs."""
+        strings = []
+        for key in sorted(self.keys()):
+            values = self[key]
+            for value in values:
+                strings.append("%s=%s" % (key, value))
+        return "\n".join(strings)
+
+
+Open = EasyID3
+
+
+def genre_get(id3, key):
+    return id3["TCON"].genres
+
+
+def genre_set(id3, key, value):
+    try:
+        frame = id3["TCON"]
+    except KeyError:
+        id3.add(mutagen.id3.TCON(encoding=3, text=value))
+    else:
+        frame.encoding = 3
+        frame.genres = value
+
+
+def genre_delete(id3, key):
+    del(id3["TCON"])
+
+
+def date_get(id3, key):
+    return [stamp.text for stamp in id3["TDRC"].text]
+
+
+def date_set(id3, key, value):
+    id3.add(mutagen.id3.TDRC(encoding=3, text=value))
+
+
+def date_delete(id3, key):
+    del(id3["TDRC"])
+
+
+def original_date_get(id3, key):
+    return [stamp.text for stamp in id3["TDOR"].text]
+
+
+def original_date_set(id3, key, value):
+    id3.add(mutagen.id3.TDOR(encoding=3, text=value))
+
+
+def original_date_delete(id3, key):
+    del(id3["TDOR"])
+
+
+def performer_get(id3, key):
+    people = []
+    wanted_role = key.split(":", 1)[1]
+    try:
+        mcl = id3["TMCL"]
+    except KeyError:
+        raise KeyError(key)
+    for role, person in mcl.people:
+        if role == wanted_role:
+            people.append(person)
+    if people:
+        return people
+    else:
+        raise KeyError(key)
+
+
+def performer_set(id3, key, value):
+    wanted_role = key.split(":", 1)[1]
+    try:
+        mcl = id3["TMCL"]
+    except KeyError:
+        mcl = mutagen.id3.TMCL(encoding=3, people=[])
+        id3.add(mcl)
+    mcl.encoding = 3
+    people = [p for p in mcl.people if p[0] != wanted_role]
+    for v in value:
+        people.append((wanted_role, v))
+    mcl.people = people
+
+
+def performer_delete(id3, key):
+    wanted_role = key.split(":", 1)[1]
+    try:
+        mcl = id3["TMCL"]
+    except KeyError:
+        raise KeyError(key)
+    people = [p for p in mcl.people if p[0] != wanted_role]
+    if people == mcl.people:
+        raise KeyError(key)
+    elif people:
+        mcl.people = people
+    else:
+        del(id3["TMCL"])
+
+
+def performer_list(id3, key):
+    try:
+        mcl = id3["TMCL"]
+    except KeyError:
+        return []
+    else:
+        return list(set("performer:" + p[0] for p in mcl.people))
+
+
+def musicbrainz_trackid_get(id3, key):
+    return [id3["UFID:http://musicbrainz.org"].data.decode('ascii')]
+
+
+def musicbrainz_trackid_set(id3, key, value):
+    if len(value) != 1:
+        raise ValueError("only one track ID may be set per song")
+    value = value[0].encode('ascii')
+    try:
+        frame = id3["UFID:http://musicbrainz.org"]
+    except KeyError:
+        frame = mutagen.id3.UFID(owner="http://musicbrainz.org", data=value)
+        id3.add(frame)
+    else:
+        frame.data = value
+
+
+def musicbrainz_trackid_delete(id3, key):
+    del(id3["UFID:http://musicbrainz.org"])
+
+
+def website_get(id3, key):
+    urls = [frame.url for frame in id3.getall("WOAR")]
+    if urls:
+        return urls
+    else:
+        raise EasyID3KeyError(key)
+
+
+def website_set(id3, key, value):
+    id3.delall("WOAR")
+    for v in value:
+        id3.add(mutagen.id3.WOAR(url=v))
+
+
+def website_delete(id3, key):
+    id3.delall("WOAR")
+
+
+def gain_get(id3, key):
+    try:
+        frame = id3["RVA2:" + key[11:-5]]
+    except KeyError:
+        raise EasyID3KeyError(key)
+    else:
+        return [u"%+f dB" % frame.gain]
+
+
+def gain_set(id3, key, value):
+    if len(value) != 1:
+        raise ValueError(
+            "there must be exactly one gain value, not %r.", value)
+    gain = float(value[0].split()[0])
+    try:
+        frame = id3["RVA2:" + key[11:-5]]
+    except KeyError:
+        frame = mutagen.id3.RVA2(desc=key[11:-5], gain=0, peak=0, channel=1)
+        id3.add(frame)
+    frame.gain = gain
+
+
+def gain_delete(id3, key):
+    try:
+        frame = id3["RVA2:" + key[11:-5]]
+    except KeyError:
+        pass
+    else:
+        if frame.peak:
+            frame.gain = 0.0
+        else:
+            del(id3["RVA2:" + key[11:-5]])
+
+
+def peak_get(id3, key):
+    try:
+        frame = id3["RVA2:" + key[11:-5]]
+    except KeyError:
+        raise EasyID3KeyError(key)
+    else:
+        return [u"%f" % frame.peak]
+
+
+def peak_set(id3, key, value):
+    if len(value) != 1:
+        raise ValueError(
+            "there must be exactly one peak value, not %r.", value)
+    peak = float(value[0])
+    if peak >= 2 or peak < 0:
+        raise ValueError("peak must be => 0 and < 2.")
+    try:
+        frame = id3["RVA2:" + key[11:-5]]
+    except KeyError:
+        frame = mutagen.id3.RVA2(desc=key[11:-5], gain=0, peak=0, channel=1)
+        id3.add(frame)
+    frame.peak = peak
+
+
+def peak_delete(id3, key):
+    try:
+        frame = id3["RVA2:" + key[11:-5]]
+    except KeyError:
+        pass
+    else:
+        if frame.gain:
+            frame.peak = 0.0
+        else:
+            del(id3["RVA2:" + key[11:-5]])
+
+
+def peakgain_list(id3, key):
+    keys = []
+    for frame in id3.getall("RVA2"):
+        keys.append("replaygain_%s_gain" % frame.desc)
+        keys.append("replaygain_%s_peak" % frame.desc)
+    return keys
+
+for frameid, key in iteritems({
+    "TALB": "album",
+    "TBPM": "bpm",
+    "TCMP": "compilation",  # iTunes extension
+    "TCOM": "composer",
+    "TCOP": "copyright",
+    "TENC": "encodedby",
+    "TEXT": "lyricist",
+    "TLEN": "length",
+    "TMED": "media",
+    "TMOO": "mood",
+    "TIT2": "title",
+    "TIT3": "version",
+    "TPE1": "artist",
+    "TPE2": "performer",
+    "TPE3": "conductor",
+    "TPE4": "arranger",
+    "TPOS": "discnumber",
+    "TPUB": "organization",
+    "TRCK": "tracknumber",
+    "TOLY": "author",
+    "TSO2": "albumartistsort",  # iTunes extension
+    "TSOA": "albumsort",
+    "TSOC": "composersort",  # iTunes extension
+    "TSOP": "artistsort",
+    "TSOT": "titlesort",
+    "TSRC": "isrc",
+    "TSST": "discsubtitle",
+    "TLAN": "language",
+}):
+    EasyID3.RegisterTextKey(key, frameid)
+
+EasyID3.RegisterKey("genre", genre_get, genre_set, genre_delete)
+EasyID3.RegisterKey("date", date_get, date_set, date_delete)
+EasyID3.RegisterKey("originaldate", original_date_get, original_date_set,
+                    original_date_delete)
+EasyID3.RegisterKey(
+    "performer:*", performer_get, performer_set, performer_delete,
+    performer_list)
+EasyID3.RegisterKey("musicbrainz_trackid", musicbrainz_trackid_get,
+                    musicbrainz_trackid_set, musicbrainz_trackid_delete)
+EasyID3.RegisterKey("website", website_get, website_set, website_delete)
+EasyID3.RegisterKey(
+    "replaygain_*_gain", gain_get, gain_set, gain_delete, peakgain_list)
+EasyID3.RegisterKey("replaygain_*_peak", peak_get, peak_set, peak_delete)
+
+# At various times, information for this came from
+# http://musicbrainz.org/docs/specs/metadata_tags.html
+# http://bugs.musicbrainz.org/ticket/1383
+# http://musicbrainz.org/doc/MusicBrainzTag
+for desc, key in iteritems({
+    u"MusicBrainz Artist Id": "musicbrainz_artistid",
+    u"MusicBrainz Album Id": "musicbrainz_albumid",
+    u"MusicBrainz Album Artist Id": "musicbrainz_albumartistid",
+    u"MusicBrainz TRM Id": "musicbrainz_trmid",
+    u"MusicIP PUID": "musicip_puid",
+    u"MusicMagic Fingerprint": "musicip_fingerprint",
+    u"MusicBrainz Album Status": "musicbrainz_albumstatus",
+    u"MusicBrainz Album Type": "musicbrainz_albumtype",
+    u"MusicBrainz Album Release Country": "releasecountry",
+    u"MusicBrainz Disc Id": "musicbrainz_discid",
+    u"ASIN": "asin",
+    u"ALBUMARTISTSORT": "albumartistsort",
+    u"BARCODE": "barcode",
+    u"CATALOGNUMBER": "catalognumber",
+    u"MusicBrainz Release Track Id": "musicbrainz_releasetrackid",
+    u"MusicBrainz Release Group Id": "musicbrainz_releasegroupid",
+    u"MusicBrainz Work Id": "musicbrainz_workid",
+    u"Acoustid Fingerprint": "acoustid_fingerprint",
+    u"Acoustid Id": "acoustid_id",
+}):
+    EasyID3.RegisterTXXXKey(key, desc)
+
+
+class EasyID3FileType(ID3FileType):
+    """Like ID3FileType, but uses EasyID3 for tags."""
+    ID3 = EasyID3
diff --git a/lib/mutagen/easymp4.py b/lib/mutagen/easymp4.py
new file mode 100644
index 00000000..627c0e28
--- /dev/null
+++ b/lib/mutagen/easymp4.py
@@ -0,0 +1,284 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2009  Joe Wreschnig
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+
+from mutagen import Metadata
+from mutagen._util import DictMixin, dict_match
+from mutagen.mp4 import MP4, MP4Tags, error, delete
+from ._compat import PY2, text_type, PY3
+
+
+__all__ = ["EasyMP4Tags", "EasyMP4", "delete", "error"]
+
+
+class EasyMP4KeyError(error, KeyError, ValueError):
+    pass
+
+
+class EasyMP4Tags(DictMixin, Metadata):
+    """A file with MPEG-4 iTunes metadata.
+
+    Like Vorbis comments, EasyMP4Tags keys are case-insensitive ASCII
+    strings, and values are a list of Unicode strings (and these lists
+    are always of length 0 or 1).
+
+    If you need access to the full MP4 metadata feature set, you should use
+    MP4, not EasyMP4.
+    """
+
+    Set = {}
+    Get = {}
+    Delete = {}
+    List = {}
+
+    def __init__(self, *args, **kwargs):
+        self.__mp4 = MP4Tags(*args, **kwargs)
+        self.load = self.__mp4.load
+        self.save = self.__mp4.save
+        self.delete = self.__mp4.delete
+
+    filename = property(lambda s: s.__mp4.filename,
+                        lambda s, fn: setattr(s.__mp4, 'filename', fn))
+
+    @classmethod
+    def RegisterKey(cls, key,
+                    getter=None, setter=None, deleter=None, lister=None):
+        """Register a new key mapping.
+
+        A key mapping is four functions, a getter, setter, deleter,
+        and lister. The key may be either a string or a glob pattern.
+
+        The getter, deleted, and lister receive an MP4Tags instance
+        and the requested key name. The setter also receives the
+        desired value, which will be a list of strings.
+
+        The getter, setter, and deleter are used to implement __getitem__,
+        __setitem__, and __delitem__.
+
+        The lister is used to implement keys(). It should return a
+        list of keys that are actually in the MP4 instance, provided
+        by its associated getter.
+        """
+        key = key.lower()
+        if getter is not None:
+            cls.Get[key] = getter
+        if setter is not None:
+            cls.Set[key] = setter
+        if deleter is not None:
+            cls.Delete[key] = deleter
+        if lister is not None:
+            cls.List[key] = lister
+
+    @classmethod
+    def RegisterTextKey(cls, key, atomid):
+        """Register a text key.
+
+        If the key you need to register is a simple one-to-one mapping
+        of MP4 atom name to EasyMP4Tags key, then you can use this
+        function::
+
+            EasyMP4Tags.RegisterTextKey("artist", "\xa9ART")
+        """
+        def getter(tags, key):
+            return tags[atomid]
+
+        def setter(tags, key, value):
+            tags[atomid] = value
+
+        def deleter(tags, key):
+            del(tags[atomid])
+
+        cls.RegisterKey(key, getter, setter, deleter)
+
+    @classmethod
+    def RegisterIntKey(cls, key, atomid, min_value=0, max_value=(2 ** 16) - 1):
+        """Register a scalar integer key.
+        """
+
+        def getter(tags, key):
+            return list(map(text_type, tags[atomid]))
+
+        def setter(tags, key, value):
+            clamp = lambda x: int(min(max(min_value, x), max_value))
+            tags[atomid] = [clamp(v) for v in map(int, value)]
+
+        def deleter(tags, key):
+            del(tags[atomid])
+
+        cls.RegisterKey(key, getter, setter, deleter)
+
+    @classmethod
+    def RegisterIntPairKey(cls, key, atomid, min_value=0,
+                           max_value=(2 ** 16) - 1):
+        def getter(tags, key):
+            ret = []
+            for (track, total) in tags[atomid]:
+                if total:
+                    ret.append(u"%d/%d" % (track, total))
+                else:
+                    ret.append(text_type(track))
+            return ret
+
+        def setter(tags, key, value):
+            clamp = lambda x: int(min(max(min_value, x), max_value))
+            data = []
+            for v in value:
+                try:
+                    tracks, total = v.split("/")
+                    tracks = clamp(int(tracks))
+                    total = clamp(int(total))
+                except (ValueError, TypeError):
+                    tracks = clamp(int(v))
+                    total = min_value
+                data.append((tracks, total))
+            tags[atomid] = data
+
+        def deleter(tags, key):
+            del(tags[atomid])
+
+        cls.RegisterKey(key, getter, setter, deleter)
+
+    @classmethod
+    def RegisterFreeformKey(cls, key, name, mean="com.apple.iTunes"):
+        """Register a text key.
+
+        If the key you need to register is a simple one-to-one mapping
+        of MP4 freeform atom (----) and name to EasyMP4Tags key, then
+        you can use this function::
+
+            EasyMP4Tags.RegisterFreeformKey(
+                "musicbrainz_artistid", "MusicBrainz Artist Id")
+        """
+        atomid = "----:" + mean + ":" + name
+
+        def getter(tags, key):
+            return [s.decode("utf-8", "replace") for s in tags[atomid]]
+
+        def setter(tags, key, value):
+            encoded = []
+            for v in value:
+                if not isinstance(v, text_type):
+                    if PY3:
+                        raise TypeError("%r not str" % v)
+                    v = v.decode("utf-8")
+                encoded.append(v.encode("utf-8"))
+            tags[atomid] = encoded
+
+        def deleter(tags, key):
+            del(tags[atomid])
+
+        cls.RegisterKey(key, getter, setter, deleter)
+
+    def __getitem__(self, key):
+        key = key.lower()
+        func = dict_match(self.Get, key)
+        if func is not None:
+            return func(self.__mp4, key)
+        else:
+            raise EasyMP4KeyError("%r is not a valid key" % key)
+
+    def __setitem__(self, key, value):
+        key = key.lower()
+
+        if PY2:
+            if isinstance(value, basestring):
+                value = [value]
+        else:
+            if isinstance(value, text_type):
+                value = [value]
+
+        func = dict_match(self.Set, key)
+        if func is not None:
+            return func(self.__mp4, key, value)
+        else:
+            raise EasyMP4KeyError("%r is not a valid key" % key)
+
+    def __delitem__(self, key):
+        key = key.lower()
+        func = dict_match(self.Delete, key)
+        if func is not None:
+            return func(self.__mp4, key)
+        else:
+            raise EasyMP4KeyError("%r is not a valid key" % key)
+
+    def keys(self):
+        keys = []
+        for key in self.Get.keys():
+            if key in self.List:
+                keys.extend(self.List[key](self.__mp4, key))
+            elif key in self:
+                keys.append(key)
+        return keys
+
+    def pprint(self):
+        """Print tag key=value pairs."""
+        strings = []
+        for key in sorted(self.keys()):
+            values = self[key]
+            for value in values:
+                strings.append("%s=%s" % (key, value))
+        return "\n".join(strings)
+
+for atomid, key in {
+    '\xa9nam': 'title',
+    '\xa9alb': 'album',
+    '\xa9ART': 'artist',
+    'aART': 'albumartist',
+    '\xa9day': 'date',
+    '\xa9cmt': 'comment',
+    'desc': 'description',
+    '\xa9grp': 'grouping',
+    '\xa9gen': 'genre',
+    'cprt': 'copyright',
+    'soal': 'albumsort',
+    'soaa': 'albumartistsort',
+    'soar': 'artistsort',
+    'sonm': 'titlesort',
+    'soco': 'composersort',
+}.items():
+    EasyMP4Tags.RegisterTextKey(key, atomid)
+
+for name, key in {
+    'MusicBrainz Artist Id': 'musicbrainz_artistid',
+    'MusicBrainz Track Id': 'musicbrainz_trackid',
+    'MusicBrainz Album Id': 'musicbrainz_albumid',
+    'MusicBrainz Album Artist Id': 'musicbrainz_albumartistid',
+    'MusicIP PUID': 'musicip_puid',
+    'MusicBrainz Album Status': 'musicbrainz_albumstatus',
+    'MusicBrainz Album Type': 'musicbrainz_albumtype',
+    'MusicBrainz Release Country': 'releasecountry',
+}.items():
+    EasyMP4Tags.RegisterFreeformKey(key, name)
+
+for name, key in {
+    "tmpo": "bpm",
+}.items():
+    EasyMP4Tags.RegisterIntKey(key, name)
+
+for name, key in {
+    "trkn": "tracknumber",
+    "disk": "discnumber",
+}.items():
+    EasyMP4Tags.RegisterIntPairKey(key, name)
+
+
+class EasyMP4(MP4):
+    """Like :class:`MP4 <mutagen.mp4.MP4>`,
+    but uses :class:`EasyMP4Tags` for tags.
+
+    :ivar info: :class:`MP4Info <mutagen.mp4.MP4Info>`
+    :ivar tags: :class:`EasyMP4Tags`
+    """
+
+    MP4Tags = EasyMP4Tags
+
+    Get = EasyMP4Tags.Get
+    Set = EasyMP4Tags.Set
+    Delete = EasyMP4Tags.Delete
+    List = EasyMP4Tags.List
+    RegisterTextKey = EasyMP4Tags.RegisterTextKey
+    RegisterKey = EasyMP4Tags.RegisterKey
diff --git a/lib/mutagen/flac.py b/lib/mutagen/flac.py
new file mode 100644
index 00000000..50a8f9d5
--- /dev/null
+++ b/lib/mutagen/flac.py
@@ -0,0 +1,838 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2005  Joe Wreschnig
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+
+"""Read and write FLAC Vorbis comments and stream information.
+
+Read more about FLAC at http://flac.sourceforge.net.
+
+FLAC supports arbitrary metadata blocks. The two most interesting ones
+are the FLAC stream information block, and the Vorbis comment block;
+these are also the only ones Mutagen can currently read.
+
+This module does not handle Ogg FLAC files.
+
+Based off documentation available at
+http://flac.sourceforge.net/format.html
+"""
+
+__all__ = ["FLAC", "Open", "delete"]
+
+import struct
+from ._vorbis import VCommentDict
+import mutagen
+
+from ._compat import cBytesIO, endswith, chr_
+from mutagen._util import insert_bytes, MutagenError
+from mutagen.id3 import BitPaddedInt
+from functools import reduce
+
+
+class error(IOError, MutagenError):
+    pass
+
+
+class FLACNoHeaderError(error):
+    pass
+
+
+class FLACVorbisError(ValueError, error):
+    pass
+
+
+def to_int_be(data):
+    """Convert an arbitrarily-long string to a long using big-endian
+    byte order."""
+    return reduce(lambda a, b: (a << 8) + b, bytearray(data), 0)
+
+
+class StrictFileObject(object):
+    """Wraps a file-like object and raises an exception if the requested
+    amount of data to read isn't returned."""
+
+    def __init__(self, fileobj):
+        self._fileobj = fileobj
+        for m in ["close", "tell", "seek", "write", "name"]:
+            if hasattr(fileobj, m):
+                setattr(self, m, getattr(fileobj, m))
+
+    def read(self, size=-1):
+        data = self._fileobj.read(size)
+        if size >= 0 and len(data) != size:
+            raise error("file said %d bytes, read %d bytes" % (
+                        size, len(data)))
+        return data
+
+    def tryread(self, *args):
+        return self._fileobj.read(*args)
+
+
+class MetadataBlock(object):
+    """A generic block of FLAC metadata.
+
+    This class is extended by specific used as an ancestor for more specific
+    blocks, and also as a container for data blobs of unknown blocks.
+
+    Attributes:
+
+    * data -- raw binary data for this block
+    """
+
+    _distrust_size = False
+
+    def __init__(self, data):
+        """Parse the given data string or file-like as a metadata block.
+        The metadata header should not be included."""
+        if data is not None:
+            if not isinstance(data, StrictFileObject):
+                if isinstance(data, bytes):
+                    data = cBytesIO(data)
+                elif not hasattr(data, 'read'):
+                    raise TypeError(
+                        "StreamInfo requires string data or a file-like")
+                data = StrictFileObject(data)
+            self.load(data)
+
+    def load(self, data):
+        self.data = data.read()
+
+    def write(self):
+        return self.data
+
+    @staticmethod
+    def writeblocks(blocks):
+        """Render metadata block as a byte string."""
+        data = []
+        codes = [[block.code, block.write()] for block in blocks]
+        codes[-1][0] |= 128
+        for code, datum in codes:
+            byte = chr_(code)
+            if len(datum) > 2 ** 24:
+                raise error("block is too long to write")
+            length = struct.pack(">I", len(datum))[-3:]
+            data.append(byte + length + datum)
+        return b"".join(data)
+
+    @staticmethod
+    def group_padding(blocks):
+        """Consolidate FLAC padding metadata blocks.
+
+        The overall size of the rendered blocks does not change, so
+        this adds several bytes of padding for each merged block.
+        """
+
+        paddings = [b for b in blocks if isinstance(b, Padding)]
+        for p in paddings:
+            blocks.remove(p)
+        # total padding size is the sum of padding sizes plus 4 bytes
+        # per removed header.
+        size = sum(padding.length for padding in paddings)
+        padding = Padding()
+        padding.length = size + 4 * (len(paddings) - 1)
+        blocks.append(padding)
+
+
+class StreamInfo(MetadataBlock, mutagen.StreamInfo):
+    """FLAC stream information.
+
+    This contains information about the audio data in the FLAC file.
+    Unlike most stream information objects in Mutagen, changes to this
+    one will rewritten to the file when it is saved. Unless you are
+    actually changing the audio stream itself, don't change any
+    attributes of this block.
+
+    Attributes:
+
+    * min_blocksize -- minimum audio block size
+    * max_blocksize -- maximum audio block size
+    * sample_rate -- audio sample rate in Hz
+    * channels -- audio channels (1 for mono, 2 for stereo)
+    * bits_per_sample -- bits per sample
+    * total_samples -- total samples in file
+    * length -- audio length in seconds
+    """
+
+    code = 0
+
+    def __eq__(self, other):
+        try:
+            return (self.min_blocksize == other.min_blocksize and
+                    self.max_blocksize == other.max_blocksize and
+                    self.sample_rate == other.sample_rate and
+                    self.channels == other.channels and
+                    self.bits_per_sample == other.bits_per_sample and
+                    self.total_samples == other.total_samples)
+        except:
+            return False
+
+    __hash__ = MetadataBlock.__hash__
+
+    def load(self, data):
+        self.min_blocksize = int(to_int_be(data.read(2)))
+        self.max_blocksize = int(to_int_be(data.read(2)))
+        self.min_framesize = int(to_int_be(data.read(3)))
+        self.max_framesize = int(to_int_be(data.read(3)))
+        # first 16 bits of sample rate
+        sample_first = to_int_be(data.read(2))
+        # last 4 bits of sample rate, 3 of channels, first 1 of bits/sample
+        sample_channels_bps = to_int_be(data.read(1))
+        # last 4 of bits/sample, 36 of total samples
+        bps_total = to_int_be(data.read(5))
+
+        sample_tail = sample_channels_bps >> 4
+        self.sample_rate = int((sample_first << 4) + sample_tail)
+        if not self.sample_rate:
+            raise error("A sample rate value of 0 is invalid")
+        self.channels = int(((sample_channels_bps >> 1) & 7) + 1)
+        bps_tail = bps_total >> 36
+        bps_head = (sample_channels_bps & 1) << 4
+        self.bits_per_sample = int(bps_head + bps_tail + 1)
+        self.total_samples = bps_total & 0xFFFFFFFFF
+        self.length = self.total_samples / float(self.sample_rate)
+
+        self.md5_signature = to_int_be(data.read(16))
+
+    def write(self):
+        f = cBytesIO()
+        f.write(struct.pack(">I", self.min_blocksize)[-2:])
+        f.write(struct.pack(">I", self.max_blocksize)[-2:])
+        f.write(struct.pack(">I", self.min_framesize)[-3:])
+        f.write(struct.pack(">I", self.max_framesize)[-3:])
+
+        # first 16 bits of sample rate
+        f.write(struct.pack(">I", self.sample_rate >> 4)[-2:])
+        # 4 bits sample, 3 channel, 1 bps
+        byte = (self.sample_rate & 0xF) << 4
+        byte += ((self.channels - 1) & 7) << 1
+        byte += ((self.bits_per_sample - 1) >> 4) & 1
+        f.write(chr_(byte))
+        # 4 bits of bps, 4 of sample count
+        byte = ((self.bits_per_sample - 1) & 0xF) << 4
+        byte += (self.total_samples >> 32) & 0xF
+        f.write(chr_(byte))
+        # last 32 of sample count
+        f.write(struct.pack(">I", self.total_samples & 0xFFFFFFFF))
+        # MD5 signature
+        sig = self.md5_signature
+        f.write(struct.pack(
+            ">4I", (sig >> 96) & 0xFFFFFFFF, (sig >> 64) & 0xFFFFFFFF,
+            (sig >> 32) & 0xFFFFFFFF, sig & 0xFFFFFFFF))
+        return f.getvalue()
+
+    def pprint(self):
+        return "FLAC, %.2f seconds, %d Hz" % (self.length, self.sample_rate)
+
+
+class SeekPoint(tuple):
+    """A single seek point in a FLAC file.
+
+    Placeholder seek points have first_sample of 0xFFFFFFFFFFFFFFFFL,
+    and byte_offset and num_samples undefined. Seek points must be
+    sorted in ascending order by first_sample number. Seek points must
+    be unique by first_sample number, except for placeholder
+    points. Placeholder points must occur last in the table and there
+    may be any number of them.
+
+    Attributes:
+
+    * first_sample -- sample number of first sample in the target frame
+    * byte_offset -- offset from first frame to target frame
+    * num_samples -- number of samples in target frame
+    """
+
+    def __new__(cls, first_sample, byte_offset, num_samples):
+        return super(cls, SeekPoint).__new__(
+            cls, (first_sample, byte_offset, num_samples))
+
+    first_sample = property(lambda self: self[0])
+    byte_offset = property(lambda self: self[1])
+    num_samples = property(lambda self: self[2])
+
+
+class SeekTable(MetadataBlock):
+    """Read and write FLAC seek tables.
+
+    Attributes:
+
+    * seekpoints -- list of SeekPoint objects
+    """
+
+    __SEEKPOINT_FORMAT = '>QQH'
+    __SEEKPOINT_SIZE = struct.calcsize(__SEEKPOINT_FORMAT)
+
+    code = 3
+
+    def __init__(self, data):
+        self.seekpoints = []
+        super(SeekTable, self).__init__(data)
+
+    def __eq__(self, other):
+        try:
+            return (self.seekpoints == other.seekpoints)
+        except (AttributeError, TypeError):
+            return False
+
+    __hash__ = MetadataBlock.__hash__
+
+    def load(self, data):
+        self.seekpoints = []
+        sp = data.tryread(self.__SEEKPOINT_SIZE)
+        while len(sp) == self.__SEEKPOINT_SIZE:
+            self.seekpoints.append(SeekPoint(
+                *struct.unpack(self.__SEEKPOINT_FORMAT, sp)))
+            sp = data.tryread(self.__SEEKPOINT_SIZE)
+
+    def write(self):
+        f = cBytesIO()
+        for seekpoint in self.seekpoints:
+            packed = struct.pack(
+                self.__SEEKPOINT_FORMAT,
+                seekpoint.first_sample, seekpoint.byte_offset,
+                seekpoint.num_samples)
+            f.write(packed)
+        return f.getvalue()
+
+    def __repr__(self):
+        return "<%s seekpoints=%r>" % (type(self).__name__, self.seekpoints)
+
+
+class VCFLACDict(VCommentDict):
+    """Read and write FLAC Vorbis comments.
+
+    FLACs don't use the framing bit at the end of the comment block.
+    So this extends VCommentDict to not use the framing bit.
+    """
+
+    code = 4
+    _distrust_size = True
+
+    def load(self, data, errors='replace', framing=False):
+        super(VCFLACDict, self).load(data, errors=errors, framing=framing)
+
+    def write(self, framing=False):
+        return super(VCFLACDict, self).write(framing=framing)
+
+
+class CueSheetTrackIndex(tuple):
+    """Index for a track in a cuesheet.
+
+    For CD-DA, an index_number of 0 corresponds to the track
+    pre-gap. The first index in a track must have a number of 0 or 1,
+    and subsequently, index_numbers must increase by 1. Index_numbers
+    must be unique within a track. And index_offset must be evenly
+    divisible by 588 samples.
+
+    Attributes:
+
+    * index_number -- index point number
+    * index_offset -- offset in samples from track start
+    """
+
+    def __new__(cls, index_number, index_offset):
+        return super(cls, CueSheetTrackIndex).__new__(
+            cls, (index_number, index_offset))
+
+    index_number = property(lambda self: self[0])
+    index_offset = property(lambda self: self[1])
+
+
+class CueSheetTrack(object):
+    """A track in a cuesheet.
+
+    For CD-DA, track_numbers must be 1-99, or 170 for the
+    lead-out. Track_numbers must be unique within a cue sheet. There
+    must be atleast one index in every track except the lead-out track
+    which must have none.
+
+    Attributes:
+
+    * track_number -- track number
+    * start_offset -- track offset in samples from start of FLAC stream
+    * isrc -- ISRC code
+    * type -- 0 for audio, 1 for digital data
+    * pre_emphasis -- true if the track is recorded with pre-emphasis
+    * indexes -- list of CueSheetTrackIndex objects
+    """
+
+    def __init__(self, track_number, start_offset, isrc='', type_=0,
+                 pre_emphasis=False):
+        self.track_number = track_number
+        self.start_offset = start_offset
+        self.isrc = isrc
+        self.type = type_
+        self.pre_emphasis = pre_emphasis
+        self.indexes = []
+
+    def __eq__(self, other):
+        try:
+            return (self.track_number == other.track_number and
+                    self.start_offset == other.start_offset and
+                    self.isrc == other.isrc and
+                    self.type == other.type and
+                    self.pre_emphasis == other.pre_emphasis and
+                    self.indexes == other.indexes)
+        except (AttributeError, TypeError):
+            return False
+
+    __hash__ = object.__hash__
+
+    def __repr__(self):
+        return (("<%s number=%r, offset=%d, isrc=%r, type=%r, "
+                "pre_emphasis=%r, indexes=%r)>") %
+                (type(self).__name__, self.track_number, self.start_offset,
+                 self.isrc, self.type, self.pre_emphasis, self.indexes))
+
+
+class CueSheet(MetadataBlock):
+    """Read and write FLAC embedded cue sheets.
+
+    Number of tracks should be from 1 to 100. There should always be
+    exactly one lead-out track and that track must be the last track
+    in the cue sheet.
+
+    Attributes:
+
+    * media_catalog_number -- media catalog number in ASCII
+    * lead_in_samples -- number of lead-in samples
+    * compact_disc -- true if the cuesheet corresponds to a compact disc
+    * tracks -- list of CueSheetTrack objects
+    * lead_out -- lead-out as CueSheetTrack or None if lead-out was not found
+    """
+
+    __CUESHEET_FORMAT = '>128sQB258xB'
+    __CUESHEET_SIZE = struct.calcsize(__CUESHEET_FORMAT)
+    __CUESHEET_TRACK_FORMAT = '>QB12sB13xB'
+    __CUESHEET_TRACK_SIZE = struct.calcsize(__CUESHEET_TRACK_FORMAT)
+    __CUESHEET_TRACKINDEX_FORMAT = '>QB3x'
+    __CUESHEET_TRACKINDEX_SIZE = struct.calcsize(__CUESHEET_TRACKINDEX_FORMAT)
+
+    code = 5
+
+    media_catalog_number = b''
+    lead_in_samples = 88200
+    compact_disc = True
+
+    def __init__(self, data):
+        self.tracks = []
+        super(CueSheet, self).__init__(data)
+
+    def __eq__(self, other):
+        try:
+            return (self.media_catalog_number == other.media_catalog_number and
+                    self.lead_in_samples == other.lead_in_samples and
+                    self.compact_disc == other.compact_disc and
+                    self.tracks == other.tracks)
+        except (AttributeError, TypeError):
+            return False
+
+    __hash__ = MetadataBlock.__hash__
+
+    def load(self, data):
+        header = data.read(self.__CUESHEET_SIZE)
+        media_catalog_number, lead_in_samples, flags, num_tracks = \
+            struct.unpack(self.__CUESHEET_FORMAT, header)
+        self.media_catalog_number = media_catalog_number.rstrip(b'\0')
+        self.lead_in_samples = lead_in_samples
+        self.compact_disc = bool(flags & 0x80)
+        self.tracks = []
+        for i in range(num_tracks):
+            track = data.read(self.__CUESHEET_TRACK_SIZE)
+            start_offset, track_number, isrc_padded, flags, num_indexes = \
+                struct.unpack(self.__CUESHEET_TRACK_FORMAT, track)
+            isrc = isrc_padded.rstrip(b'\0')
+            type_ = (flags & 0x80) >> 7
+            pre_emphasis = bool(flags & 0x40)
+            val = CueSheetTrack(
+                track_number, start_offset, isrc, type_, pre_emphasis)
+            for j in range(num_indexes):
+                index = data.read(self.__CUESHEET_TRACKINDEX_SIZE)
+                index_offset, index_number = struct.unpack(
+                    self.__CUESHEET_TRACKINDEX_FORMAT, index)
+                val.indexes.append(
+                    CueSheetTrackIndex(index_number, index_offset))
+            self.tracks.append(val)
+
+    def write(self):
+        f = cBytesIO()
+        flags = 0
+        if self.compact_disc:
+            flags |= 0x80
+        packed = struct.pack(
+            self.__CUESHEET_FORMAT, self.media_catalog_number,
+            self.lead_in_samples, flags, len(self.tracks))
+        f.write(packed)
+        for track in self.tracks:
+            track_flags = 0
+            track_flags |= (track.type & 1) << 7
+            if track.pre_emphasis:
+                track_flags |= 0x40
+            track_packed = struct.pack(
+                self.__CUESHEET_TRACK_FORMAT, track.start_offset,
+                track.track_number, track.isrc, track_flags,
+                len(track.indexes))
+            f.write(track_packed)
+            for index in track.indexes:
+                index_packed = struct.pack(
+                    self.__CUESHEET_TRACKINDEX_FORMAT,
+                    index.index_offset, index.index_number)
+                f.write(index_packed)
+        return f.getvalue()
+
+    def __repr__(self):
+        return (("<%s media_catalog_number=%r, lead_in=%r, compact_disc=%r, "
+                 "tracks=%r>") %
+                (type(self).__name__, self.media_catalog_number,
+                 self.lead_in_samples, self.compact_disc, self.tracks))
+
+
+class Picture(MetadataBlock):
+    """Read and write FLAC embed pictures.
+
+    Attributes:
+
+    * type -- picture type (same as types for ID3 APIC frames)
+    * mime -- MIME type of the picture
+    * desc -- picture's description
+    * width -- width in pixels
+    * height -- height in pixels
+    * depth -- color depth in bits-per-pixel
+    * colors -- number of colors for indexed palettes (like GIF),
+      0 for non-indexed
+    * data -- picture data
+    """
+
+    code = 6
+    _distrust_size = True
+
+    def __init__(self, data=None):
+        self.type = 0
+        self.mime = u''
+        self.desc = u''
+        self.width = 0
+        self.height = 0
+        self.depth = 0
+        self.colors = 0
+        self.data = b''
+        super(Picture, self).__init__(data)
+
+    def __eq__(self, other):
+        try:
+            return (self.type == other.type and
+                    self.mime == other.mime and
+                    self.desc == other.desc and
+                    self.width == other.width and
+                    self.height == other.height and
+                    self.depth == other.depth and
+                    self.colors == other.colors and
+                    self.data == other.data)
+        except (AttributeError, TypeError):
+            return False
+
+    __hash__ = MetadataBlock.__hash__
+
+    def load(self, data):
+        self.type, length = struct.unpack('>2I', data.read(8))
+        self.mime = data.read(length).decode('UTF-8', 'replace')
+        length, = struct.unpack('>I', data.read(4))
+        self.desc = data.read(length).decode('UTF-8', 'replace')
+        (self.width, self.height, self.depth,
+         self.colors, length) = struct.unpack('>5I', data.read(20))
+        self.data = data.read(length)
+
+    def write(self):
+        f = cBytesIO()
+        mime = self.mime.encode('UTF-8')
+        f.write(struct.pack('>2I', self.type, len(mime)))
+        f.write(mime)
+        desc = self.desc.encode('UTF-8')
+        f.write(struct.pack('>I', len(desc)))
+        f.write(desc)
+        f.write(struct.pack('>5I', self.width, self.height, self.depth,
+                            self.colors, len(self.data)))
+        f.write(self.data)
+        return f.getvalue()
+
+    def __repr__(self):
+        return "<%s '%s' (%d bytes)>" % (type(self).__name__, self.mime,
+                                         len(self.data))
+
+
+class Padding(MetadataBlock):
+    """Empty padding space for metadata blocks.
+
+    To avoid rewriting the entire FLAC file when editing comments,
+    metadata is often padded. Padding should occur at the end, and no
+    more than one padding block should be in any FLAC file. Mutagen
+    handles this with MetadataBlock.group_padding.
+    """
+
+    code = 1
+
+    def __init__(self, data=b""):
+        super(Padding, self).__init__(data)
+
+    def load(self, data):
+        self.length = len(data.read())
+
+    def write(self):
+        try:
+            return b"\x00" * self.length
+        # On some 64 bit platforms this won't generate a MemoryError
+        # or OverflowError since you might have enough RAM, but it
+        # still generates a ValueError. On other 64 bit platforms,
+        # this will still succeed for extremely large values.
+        # Those should never happen in the real world, and if they
+        # do, writeblocks will catch it.
+        except (OverflowError, ValueError, MemoryError):
+            raise error("cannot write %d bytes" % self.length)
+
+    def __eq__(self, other):
+        return isinstance(other, Padding) and self.length == other.length
+
+    __hash__ = MetadataBlock.__hash__
+
+    def __repr__(self):
+        return "<%s (%d bytes)>" % (type(self).__name__, self.length)
+
+
+class FLAC(mutagen.FileType):
+    """A FLAC audio file.
+
+    Attributes:
+
+    * info -- stream information (length, bitrate, sample rate)
+    * tags -- metadata tags, if any
+    * cuesheet -- CueSheet object, if any
+    * seektable -- SeekTable object, if any
+    * pictures -- list of embedded pictures
+    """
+
+    _mimes = ["audio/x-flac", "application/x-flac"]
+
+    METADATA_BLOCKS = [StreamInfo, Padding, None, SeekTable, VCFLACDict,
+                       CueSheet, Picture]
+    """Known metadata block types, indexed by ID."""
+
+    @staticmethod
+    def score(filename, fileobj, header_data):
+        return (header_data.startswith(b"fLaC") +
+                endswith(filename.lower(), ".flac") * 3)
+
+    def __read_metadata_block(self, fileobj):
+        byte = ord(fileobj.read(1))
+        size = to_int_be(fileobj.read(3))
+        code = byte & 0x7F
+        last_block = bool(byte & 0x80)
+
+        try:
+            block_type = self.METADATA_BLOCKS[code] or MetadataBlock
+        except IndexError:
+            block_type = MetadataBlock
+
+        if block_type._distrust_size:
+            # Some jackass is writing broken Metadata block length
+            # for Vorbis comment blocks, and the FLAC reference
+            # implementaton can parse them (mostly by accident),
+            # so we have to too.  Instead of parsing the size
+            # given, parse an actual Vorbis comment, leaving
+            # fileobj in the right position.
+            # http://code.google.com/p/mutagen/issues/detail?id=52
+            # ..same for the Picture block:
+            # http://code.google.com/p/mutagen/issues/detail?id=106
+            block = block_type(fileobj)
+        else:
+            data = fileobj.read(size)
+            block = block_type(data)
+        block.code = code
+
+        if block.code == VCFLACDict.code:
+            if self.tags is None:
+                self.tags = block
+            else:
+                raise FLACVorbisError("> 1 Vorbis comment block found")
+        elif block.code == CueSheet.code:
+            if self.cuesheet is None:
+                self.cuesheet = block
+            else:
+                raise error("> 1 CueSheet block found")
+        elif block.code == SeekTable.code:
+            if self.seektable is None:
+                self.seektable = block
+            else:
+                raise error("> 1 SeekTable block found")
+        self.metadata_blocks.append(block)
+        return not last_block
+
+    def add_tags(self):
+        """Add a Vorbis comment block to the file."""
+        if self.tags is None:
+            self.tags = VCFLACDict()
+            self.metadata_blocks.append(self.tags)
+        else:
+            raise FLACVorbisError("a Vorbis comment already exists")
+
+    add_vorbiscomment = add_tags
+
+    def delete(self, filename=None):
+        """Remove Vorbis comments from a file.
+
+        If no filename is given, the one most recently loaded is used.
+        """
+        if filename is None:
+            filename = self.filename
+        for s in list(self.metadata_blocks):
+            if isinstance(s, VCFLACDict):
+                self.metadata_blocks.remove(s)
+                self.tags = None
+                self.save()
+                break
+
+    vc = property(lambda s: s.tags, doc="Alias for tags; don't use this.")
+
+    def load(self, filename):
+        """Load file information from a filename."""
+
+        self.metadata_blocks = []
+        self.tags = None
+        self.cuesheet = None
+        self.seektable = None
+        self.filename = filename
+        fileobj = StrictFileObject(open(filename, "rb"))
+        try:
+            self.__check_header(fileobj)
+            while self.__read_metadata_block(fileobj):
+                pass
+        finally:
+            fileobj.close()
+
+        try:
+            self.metadata_blocks[0].length
+        except (AttributeError, IndexError):
+            raise FLACNoHeaderError("Stream info block not found")
+
+    @property
+    def info(self):
+        return self.metadata_blocks[0]
+
+    def add_picture(self, picture):
+        """Add a new picture to the file."""
+        self.metadata_blocks.append(picture)
+
+    def clear_pictures(self):
+        """Delete all pictures from the file."""
+
+        blocks = [b for b in self.metadata_blocks if b.code != Picture.code]
+        self.metadata_blocks = blocks
+
+    @property
+    def pictures(self):
+        """List of embedded pictures"""
+
+        return [b for b in self.metadata_blocks if b.code == Picture.code]
+
+    def save(self, filename=None, deleteid3=False):
+        """Save metadata blocks to a file.
+
+        If no filename is given, the one most recently loaded is used.
+        """
+
+        if filename is None:
+            filename = self.filename
+        f = open(filename, 'rb+')
+
+        try:
+            # Ensure we've got padding at the end, and only at the end.
+            # If adding makes it too large, we'll scale it down later.
+            self.metadata_blocks.append(Padding(b'\x00' * 1020))
+            MetadataBlock.group_padding(self.metadata_blocks)
+
+            header = self.__check_header(f)
+            # "fLaC" and maybe ID3
+            available = self.__find_audio_offset(f) - header
+            data = MetadataBlock.writeblocks(self.metadata_blocks)
+
+            # Delete ID3v2
+            if deleteid3 and header > 4:
+                available += header - 4
+                header = 4
+
+            if len(data) > available:
+                # If we have too much data, see if we can reduce padding.
+                padding = self.metadata_blocks[-1]
+                newlength = padding.length - (len(data) - available)
+                if newlength > 0:
+                    padding.length = newlength
+                    data = MetadataBlock.writeblocks(self.metadata_blocks)
+                    assert len(data) == available
+
+            elif len(data) < available:
+                # If we have too little data, increase padding.
+                self.metadata_blocks[-1].length += (available - len(data))
+                data = MetadataBlock.writeblocks(self.metadata_blocks)
+                assert len(data) == available
+
+            if len(data) != available:
+                # We couldn't reduce the padding enough.
+                diff = (len(data) - available)
+                insert_bytes(f, diff, header)
+
+            f.seek(header - 4)
+            f.write(b"fLaC" + data)
+
+            # Delete ID3v1
+            if deleteid3:
+                try:
+                    f.seek(-128, 2)
+                except IOError:
+                    pass
+                else:
+                    if f.read(3) == b"TAG":
+                        f.seek(-128, 2)
+                        f.truncate()
+        finally:
+            f.close()
+
+    def __find_audio_offset(self, fileobj):
+        byte = 0x00
+        while not (byte & 0x80):
+            byte = ord(fileobj.read(1))
+            size = to_int_be(fileobj.read(3))
+            try:
+                block_type = self.METADATA_BLOCKS[byte & 0x7F]
+            except IndexError:
+                block_type = None
+
+            if block_type and block_type._distrust_size:
+                # See comments in read_metadata_block; the size can't
+                # be trusted for Vorbis comment blocks and Picture block
+                block_type(fileobj)
+            else:
+                fileobj.read(size)
+        return fileobj.tell()
+
+    def __check_header(self, fileobj):
+        size = 4
+        header = fileobj.read(4)
+        if header != b"fLaC":
+            size = None
+            if header[:3] == b"ID3":
+                size = 14 + BitPaddedInt(fileobj.read(6)[2:])
+                fileobj.seek(size - 4)
+                if fileobj.read(4) != b"fLaC":
+                    size = None
+        if size is None:
+            raise FLACNoHeaderError(
+                "%r is not a valid FLAC file" % fileobj.name)
+        return size
+
+
+Open = FLAC
+
+
+def delete(filename):
+    """Remove tags from a file."""
+    FLAC(filename).delete()
diff --git a/lib/mutagen/id3/__init__.py b/lib/mutagen/id3/__init__.py
new file mode 100644
index 00000000..bfb4a3f6
--- /dev/null
+++ b/lib/mutagen/id3/__init__.py
@@ -0,0 +1,1034 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2005  Michael Urman
+#               2006  Lukas Lalinsky
+#               2013  Christoph Reiter
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+
+"""ID3v2 reading and writing.
+
+This is based off of the following references:
+
+* http://id3.org/id3v2.4.0-structure
+* http://id3.org/id3v2.4.0-frames
+* http://id3.org/id3v2.3.0
+* http://id3.org/id3v2-00
+* http://id3.org/ID3v1
+
+Its largest deviation from the above (versions 2.3 and 2.2) is that it
+will not interpret the / characters as a separator, and will almost
+always accept null separators to generate multi-valued text frames.
+
+Because ID3 frame structure differs between frame types, each frame is
+implemented as a different class (e.g. TIT2 as mutagen.id3.TIT2). Each
+frame's documentation contains a list of its attributes.
+
+Since this file's documentation is a little unwieldy, you are probably
+interested in the :class:`ID3` class to start with.
+"""
+
+__all__ = ['ID3', 'ID3FileType', 'Frames', 'Open', 'delete']
+
+import struct
+import errno
+
+from struct import unpack, pack, error as StructError
+
+import mutagen
+from mutagen._util import insert_bytes, delete_bytes, DictProxy, enum
+from .._compat import chr_, PY3
+
+from ._util import *
+from ._frames import *
+from ._specs import *
+
+
+@enum
+class ID3v1SaveOptions(object):
+
+    REMOVE = 0
+    """ID3v1 tags will be removed"""
+
+    UPDATE = 1
+    """ID3v1 tags will be updated but not added"""
+
+    CREATE = 2
+    """ID3v1 tags will be created and/or updated"""
+
+
+class ID3(DictProxy, mutagen.Metadata):
+    """A file with an ID3v2 tag.
+
+    Attributes:
+
+    * version -- ID3 tag version as a tuple
+    * unknown_frames -- raw frame data of any unknown frames found
+    * size -- the total size of the ID3 tag, including the header
+    """
+
+    __module__ = "mutagen.id3"
+
+    PEDANTIC = True
+    version = (2, 4, 0)
+    """ID3 tag version as a tuple (of the loaded file)"""
+
+    filename = None
+    size = 0
+    __flags = 0
+    __readbytes = 0
+    __crc = None
+    __unknown_version = None
+
+    _V24 = (2, 4, 0)
+    _V23 = (2, 3, 0)
+    _V22 = (2, 2, 0)
+    _V11 = (1, 1)
+
+    def __init__(self, *args, **kwargs):
+        self.unknown_frames = []
+        super(ID3, self).__init__(*args, **kwargs)
+
+    def __fullread(self, size):
+        """ Read a certain number of bytes from the source file. """
+
+        try:
+            if size < 0:
+                raise ValueError('Requested bytes (%s) less than zero' % size)
+            if size > self.__filesize:
+                raise EOFError('Requested %#x of %#x (%s)' % (
+                    int(size), int(self.__filesize), self.filename))
+        except AttributeError:
+            pass
+        data = self._fileobj.read(size)
+        if len(data) != size:
+            raise EOFError
+        self.__readbytes += size
+        return data
+
+    def load(self, filename, known_frames=None, translate=True, v2_version=4):
+        """Load tags from a filename.
+
+        Keyword arguments:
+
+        * filename -- filename to load tag data from
+        * known_frames -- dict mapping frame IDs to Frame objects
+        * translate -- Update all tags to ID3v2.3/4 internally. If you
+                       intend to save, this must be true or you have to
+                       call update_to_v23() / update_to_v24() manually.
+        * v2_version -- if update_to_v23 or update_to_v24 get called (3 or 4)
+
+        Example of loading a custom frame::
+
+            my_frames = dict(mutagen.id3.Frames)
+            class XMYF(Frame): ...
+            my_frames["XMYF"] = XMYF
+            mutagen.id3.ID3(filename, known_frames=my_frames)
+        """
+
+        if v2_version not in (3, 4):
+            raise ValueError("Only 3 and 4 possible for v2_version")
+
+        from os.path import getsize
+
+        self.filename = filename
+        self.__known_frames = known_frames
+        self._fileobj = open(filename, 'rb')
+        self.__filesize = getsize(filename)
+        try:
+            try:
+                self._load_header()
+            except EOFError:
+                self.size = 0
+                raise ID3NoHeaderError("%s: too small (%d bytes)" % (
+                    filename, self.__filesize))
+            except (ID3NoHeaderError, ID3UnsupportedVersionError):
+                self.size = 0
+                frames, offset = _find_id3v1(self._fileobj)
+                if frames is None:
+                    raise
+
+                self.version = self._V11
+                for v in frames.values():
+                    self.add(v)
+            else:
+                frames = self.__known_frames
+                if frames is None:
+                    if self._V23 <= self.version:
+                        frames = Frames
+                    elif self._V22 <= self.version:
+                        frames = Frames_2_2
+                data = self.__fullread(self.size - 10)
+                for frame in self.__read_frames(data, frames=frames):
+                    if isinstance(frame, Frame):
+                        self.add(frame)
+                    else:
+                        self.unknown_frames.append(frame)
+                self.__unknown_version = self.version[:2]
+        finally:
+            self._fileobj.close()
+            del self._fileobj
+            del self.__filesize
+            if translate:
+                if v2_version == 3:
+                    self.update_to_v23()
+                else:
+                    self.update_to_v24()
+
+    def getall(self, key):
+        """Return all frames with a given name (the list may be empty).
+
+        This is best explained by examples::
+
+            id3.getall('TIT2') == [id3['TIT2']]
+            id3.getall('TTTT') == []
+            id3.getall('TXXX') == [TXXX(desc='woo', text='bar'),
+                                   TXXX(desc='baz', text='quuuux'), ...]
+
+        Since this is based on the frame's HashKey, which is
+        colon-separated, you can use it to do things like
+        ``getall('COMM:MusicMatch')`` or ``getall('TXXX:QuodLibet:')``.
+        """
+        if key in self:
+            return [self[key]]
+        else:
+            key = key + ":"
+            return [v for s, v in self.items() if s.startswith(key)]
+
+    def delall(self, key):
+        """Delete all tags of a given kind; see getall."""
+        if key in self:
+            del(self[key])
+        else:
+            key = key + ":"
+            for k in list(self.keys()):
+                if k.startswith(key):
+                    del(self[k])
+
+    def setall(self, key, values):
+        """Delete frames of the given type and add frames in 'values'."""
+        self.delall(key)
+        for tag in values:
+            self[tag.HashKey] = tag
+
+    def pprint(self):
+        """Return tags in a human-readable format.
+
+        "Human-readable" is used loosely here. The format is intended
+        to mirror that used for Vorbis or APEv2 output, e.g.
+
+            ``TIT2=My Title``
+
+        However, ID3 frames can have multiple keys:
+
+            ``POPM=user@example.org=3 128/255``
+        """
+        frames = sorted(Frame.pprint(s) for s in self.values())
+        return "\n".join(frames)
+
+    def loaded_frame(self, tag):
+        """Deprecated; use the add method."""
+        # turn 2.2 into 2.3/2.4 tags
+        if len(type(tag).__name__) == 3:
+            tag = type(tag).__base__(tag)
+        self[tag.HashKey] = tag
+
+    # add = loaded_frame (and vice versa) break applications that
+    # expect to be able to override loaded_frame (e.g. Quod Libet),
+    # as does making loaded_frame call add.
+    def add(self, frame):
+        """Add a frame to the tag."""
+        return self.loaded_frame(frame)
+
+    def _load_header(self):
+        fn = self.filename
+        data = self.__fullread(10)
+        id3, vmaj, vrev, flags, size = unpack('>3sBBB4s', data)
+        self.__flags = flags
+        self.size = BitPaddedInt(size) + 10
+        self.version = (2, vmaj, vrev)
+
+        if id3 != b'ID3':
+            raise ID3NoHeaderError("%r doesn't start with an ID3 tag" % fn)
+        if vmaj not in [2, 3, 4]:
+            raise ID3UnsupportedVersionError("%r ID3v2.%d not supported"
+                                             % (fn, vmaj))
+
+        if self.PEDANTIC:
+            if not BitPaddedInt.has_valid_padding(size):
+                raise ValueError("Header size not synchsafe")
+
+            if (self._V24 <= self.version) and (flags & 0x0f):
+                raise ValueError("%r has invalid flags %#02x" % (fn, flags))
+            elif (self._V23 <= self.version < self._V24) and (flags & 0x1f):
+                raise ValueError("%r has invalid flags %#02x" % (fn, flags))
+
+        if self.f_extended:
+            extsize = self.__fullread(4)
+            frame_id = extsize.decode("ascii", "replace") if PY3 else extsize
+            if frame_id in Frames:
+                # Some tagger sets the extended header flag but
+                # doesn't write an extended header; in this case, the
+                # ID3 data follows immediately. Since no extended
+                # header is going to be long enough to actually match
+                # a frame, and if it's *not* a frame we're going to be
+                # completely lost anyway, this seems to be the most
+                # correct check.
+                # http://code.google.com/p/quodlibet/issues/detail?id=126
+                self.__flags ^= 0x40
+                self.__extsize = 0
+                self._fileobj.seek(-4, 1)
+                self.__readbytes -= 4
+            elif self.version >= self._V24:
+                # "Where the 'Extended header size' is the size of the whole
+                # extended header, stored as a 32 bit synchsafe integer."
+                self.__extsize = BitPaddedInt(extsize) - 4
+                if self.PEDANTIC:
+                    if not BitPaddedInt.has_valid_padding(extsize):
+                        raise ValueError("Extended header size not synchsafe")
+            else:
+                # "Where the 'Extended header size', currently 6 or 10 bytes,
+                # excludes itself."
+                self.__extsize = unpack('>L', extsize)[0]
+            if self.__extsize:
+                self.__extdata = self.__fullread(self.__extsize)
+            else:
+                self.__extdata = b""
+
+    def __determine_bpi(self, data, frames):
+        if self.version < self._V24:
+            return int
+
+        return _determine_bpi(data, frames)
+
+    def __read_frames(self, data, frames):
+        if self.version < self._V24 and self.f_unsynch:
+            try:
+                data = unsynch.decode(data)
+            except ValueError:
+                pass
+
+        if self._V23 <= self.version:
+            bpi = self.__determine_bpi(data, frames)
+            while data:
+                header = data[:10]
+                try:
+                    name, size, flags = unpack('>4sLH', header)
+                except struct.error:
+                    return  # not enough header
+                if name.strip(b'\x00') == b'':
+                    return
+
+                size = bpi(size)
+                framedata = data[10:10 + size]
+                data = data[10 + size:]
+                if size == 0:
+                    continue  # drop empty frames
+
+                if PY3:
+                    try:
+                        name = name.decode('ascii')
+                    except UnicodeDecodeError:
+                        continue
+
+                try:
+                    # someone writes 2.3 frames with 2.2 names
+                    if name[-1] == "\x00":
+                        tag = Frames_2_2[name[:-1]]
+                        name = tag.__base__.__name__
+
+                    tag = frames[name]
+                except KeyError:
+                    if is_valid_frame_id(name):
+                        yield header + framedata
+                else:
+                    try:
+                        yield self.__load_framedata(tag, flags, framedata)
+                    except NotImplementedError:
+                        yield header + framedata
+                    except ID3JunkFrameError:
+                        pass
+
+        elif self._V22 <= self.version:
+            while data:
+                header = data[0:6]
+                try:
+                    name, size = unpack('>3s3s', header)
+                except struct.error:
+                    return  # not enough header
+                size, = struct.unpack('>L', b'\x00' + size)
+                if name.strip(b'\x00') == b'':
+                    return
+
+                framedata = data[6:6 + size]
+                data = data[6 + size:]
+                if size == 0:
+                    continue  # drop empty frames
+
+                if PY3:
+                    try:
+                        name = name.decode('ascii')
+                    except UnicodeDecodeError:
+                        continue
+
+                try:
+                    tag = frames[name]
+                except KeyError:
+                    if is_valid_frame_id(name):
+                        yield header + framedata
+                else:
+                    try:
+                        yield self.__load_framedata(tag, 0, framedata)
+                    except NotImplementedError:
+                        yield header + framedata
+                    except ID3JunkFrameError:
+                        pass
+
+    def __load_framedata(self, tag, flags, framedata):
+        return tag.fromData(self, flags, framedata)
+
+    f_unsynch = property(lambda s: bool(s.__flags & 0x80))
+    f_extended = property(lambda s: bool(s.__flags & 0x40))
+    f_experimental = property(lambda s: bool(s.__flags & 0x20))
+    f_footer = property(lambda s: bool(s.__flags & 0x10))
+
+    # f_crc = property(lambda s: bool(s.__extflags & 0x8000))
+
+    def _prepare_framedata(self, v2_version, v23_sep):
+        if v2_version == 3:
+            version = self._V23
+        elif v2_version == 4:
+            version = self._V24
+        else:
+            raise ValueError("Only 3 or 4 allowed for v2_version")
+
+        # Sort frames by 'importance'
+        order = ["TIT2", "TPE1", "TRCK", "TALB", "TPOS", "TDRC", "TCON"]
+        order = dict((b, a) for a, b in enumerate(order))
+        last = len(order)
+        frames = sorted(self.items(),
+                        key=lambda a: (order.get(a[0][:4], last), a[0]))
+
+        framedata = [self.__save_frame(frame, version=version, v23_sep=v23_sep)
+                     for (key, frame) in frames]
+
+        # only write unknown frames if they were loaded from the version
+        # we are saving with or upgraded to it
+        if self.__unknown_version == version[:2]:
+            framedata.extend(data for data in self.unknown_frames
+                             if len(data) > 10)
+
+        return b''.join(framedata)
+
+    def _prepare_id3_header(self, original_header, framesize, v2_version):
+        try:
+            id3, vmaj, vrev, flags, insize = \
+                unpack('>3sBBB4s', original_header)
+        except struct.error:
+            id3, insize = b'', 0
+        insize = BitPaddedInt(insize)
+        if id3 != b'ID3':
+            insize = -10
+
+        if insize >= framesize:
+            outsize = insize
+        else:
+            outsize = (framesize + 1023) & ~0x3FF
+
+        framesize = BitPaddedInt.to_str(outsize, width=4)
+        header = pack('>3sBBB4s', b'ID3', v2_version, 0, 0, framesize)
+
+        return (header, outsize, insize)
+
+    def save(self, filename=None, v1=1, v2_version=4, v23_sep='/'):
+        """Save changes to a file.
+
+        Args:
+            filename:
+                Filename to save the tag to. If no filename is given,
+                the one most recently loaded is used.
+            v1 (ID3v1SaveOptions):
+                if 0, ID3v1 tags will be removed.
+                if 1, ID3v1 tags will be updated but not added.
+                if 2, ID3v1 tags will be created and/or updated
+            v2 (int):
+                version of ID3v2 tags (3 or 4).
+            v23_sep (str):
+                the separator used to join multiple text values
+                if v2_version == 3. Defaults to '/' but if it's None
+                will be the ID3v2v2.4 null separator.
+
+        By default Mutagen saves ID3v2.4 tags. If you want to save ID3v2.3
+        tags, you must call method update_to_v23 before saving the file.
+
+        The lack of a way to update only an ID3v1 tag is intentional.
+        """
+
+        framedata = self._prepare_framedata(v2_version, v23_sep)
+        framesize = len(framedata)
+
+        if not framedata:
+            try:
+                self.delete(filename)
+            except EnvironmentError as err:
+                from errno import ENOENT
+                if err.errno != ENOENT:
+                    raise
+            return
+
+        if filename is None:
+            filename = self.filename
+        try:
+            f = open(filename, 'rb+')
+        except IOError as err:
+            from errno import ENOENT
+            if err.errno != ENOENT:
+                raise
+            f = open(filename, 'ab')  # create, then reopen
+            f = open(filename, 'rb+')
+        try:
+            idata = f.read(10)
+
+            header = self._prepare_id3_header(idata, framesize, v2_version)
+            header, outsize, insize = header
+
+            data = header + framedata + (b'\x00' * (outsize - framesize))
+
+            if (insize < outsize):
+                insert_bytes(f, outsize - insize, insize + 10)
+            f.seek(0)
+            f.write(data)
+
+            self.__save_v1(f, v1)
+
+        finally:
+            f.close()
+
+    def __save_v1(self, f, v1):
+        tag, offset = _find_id3v1(f)
+        has_v1 = tag is not None
+
+        f.seek(offset, 2)
+        if v1 == ID3v1SaveOptions.UPDATE and has_v1 or \
+                v1 == ID3v1SaveOptions.CREATE:
+            f.write(MakeID3v1(self))
+        else:
+            f.truncate()
+
+    def delete(self, filename=None, delete_v1=True, delete_v2=True):
+        """Remove tags from a file.
+
+        If no filename is given, the one most recently loaded is used.
+
+        Keyword arguments:
+
+        * delete_v1 -- delete any ID3v1 tag
+        * delete_v2 -- delete any ID3v2 tag
+        """
+        if filename is None:
+            filename = self.filename
+        delete(filename, delete_v1, delete_v2)
+        self.clear()
+
+    def __save_frame(self, frame, name=None, version=_V24, v23_sep=None):
+        flags = 0
+        if self.PEDANTIC and isinstance(frame, TextFrame):
+            if len(str(frame)) == 0:
+                return b''
+
+        if version == self._V23:
+            framev23 = frame._get_v23_frame(sep=v23_sep)
+            framedata = framev23._writeData()
+        else:
+            framedata = frame._writeData()
+
+        usize = len(framedata)
+        if usize > 2048:
+            # Disabled as this causes iTunes and other programs
+            # to fail to find these frames, which usually includes
+            # e.g. APIC.
+            # framedata = BitPaddedInt.to_str(usize) + framedata.encode('zlib')
+            # flags |= Frame.FLAG24_COMPRESS | Frame.FLAG24_DATALEN
+            pass
+
+        if version == self._V24:
+            bits = 7
+        elif version == self._V23:
+            bits = 8
+        else:
+            raise ValueError
+
+        datasize = BitPaddedInt.to_str(len(framedata), width=4, bits=bits)
+
+        if name is not None:
+            assert isinstance(name, bytes)
+            frame_name = name
+        else:
+            frame_name = type(frame).__name__
+            if PY3:
+                frame_name = frame_name.encode("ascii")
+
+        header = pack('>4s4sH', frame_name, datasize, flags)
+        return header + framedata
+
+    def __update_common(self):
+        """Updates done by both v23 and v24 update"""
+
+        if "TCON" in self:
+            # Get rid of "(xx)Foobr" format.
+            self["TCON"].genres = self["TCON"].genres
+
+        # ID3v2.2 LNK frames are just way too different to upgrade.
+        for frame in self.getall("LINK"):
+            if len(frame.frameid) != 4:
+                del self[frame.HashKey]
+
+        mimes = {"PNG": "image/png", "JPG": "image/jpeg"}
+        for pic in self.getall("APIC"):
+            if pic.mime in mimes:
+                newpic = APIC(
+                    encoding=pic.encoding, mime=mimes[pic.mime],
+                    type=pic.type, desc=pic.desc, data=pic.data)
+                self.add(newpic)
+
+    def update_to_v24(self):
+        """Convert older tags into an ID3v2.4 tag.
+
+        This updates old ID3v2 frames to ID3v2.4 ones (e.g. TYER to
+        TDRC). If you intend to save tags, you must call this function
+        at some point; it is called by default when loading the tag.
+        """
+
+        self.__update_common()
+
+        if self.__unknown_version == (2, 3):
+            # convert unknown 2.3 frames (flags/size) to 2.4
+            converted = []
+            for frame in self.unknown_frames:
+                try:
+                    name, size, flags = unpack('>4sLH', frame[:10])
+                    frame = BinaryFrame.fromData(self, flags, frame[10:])
+                except (struct.error, error):
+                    continue
+
+                converted.append(self.__save_frame(frame, name=name))
+            self.unknown_frames[:] = converted
+            self.__unknown_version = (2, 4)
+
+        # TDAT, TYER, and TIME have been turned into TDRC.
+        try:
+            date = text_type(self.get("TYER", ""))
+            if date.strip(u"\x00"):
+                self.pop("TYER")
+                dat = text_type(self.get("TDAT", ""))
+                if dat.strip("\x00"):
+                    self.pop("TDAT")
+                    date = "%s-%s-%s" % (date, dat[2:], dat[:2])
+                    time = text_type(self.get("TIME", ""))
+                    if time.strip("\x00"):
+                        self.pop("TIME")
+                        date += "T%s:%s:00" % (time[:2], time[2:])
+                if "TDRC" not in self:
+                    self.add(TDRC(encoding=0, text=date))
+        except UnicodeDecodeError:
+            # Old ID3 tags have *lots* of Unicode problems, so if TYER
+            # is bad, just chuck the frames.
+            pass
+
+        # TORY can be the first part of a TDOR.
+        if "TORY" in self:
+            f = self.pop("TORY")
+            if "TDOR" not in self:
+                try:
+                    self.add(TDOR(encoding=0, text=str(f)))
+                except UnicodeDecodeError:
+                    pass
+
+        # IPLS is now TIPL.
+        if "IPLS" in self:
+            f = self.pop("IPLS")
+            if "TIPL" not in self:
+                self.add(TIPL(encoding=f.encoding, people=f.people))
+
+        # These can't be trivially translated to any ID3v2.4 tags, or
+        # should have been removed already.
+        for key in ["RVAD", "EQUA", "TRDA", "TSIZ", "TDAT", "TIME", "CRM"]:
+            if key in self:
+                del(self[key])
+
+    def update_to_v23(self):
+        """Convert older (and newer) tags into an ID3v2.3 tag.
+
+        This updates incompatible ID3v2 frames to ID3v2.3 ones. If you
+        intend to save tags as ID3v2.3, you must call this function
+        at some point.
+
+        If you want to to go off spec and include some v2.4 frames
+        in v2.3, remove them before calling this and add them back afterwards.
+        """
+
+        self.__update_common()
+
+        # we could downgrade unknown v2.4 frames here, but given that
+        # the main reason to save v2.3 is compatibility and this
+        # might increase the chance of some parser breaking.. better not
+
+        # TMCL, TIPL -> TIPL
+        if "TIPL" in self or "TMCL" in self:
+            people = []
+            if "TIPL" in self:
+                f = self.pop("TIPL")
+                people.extend(f.people)
+            if "TMCL" in self:
+                f = self.pop("TMCL")
+                people.extend(f.people)
+            if "IPLS" not in self:
+                self.add(IPLS(encoding=f.encoding, people=people))
+
+        # TDOR -> TORY
+        if "TDOR" in self:
+            f = self.pop("TDOR")
+            if f.text:
+                d = f.text[0]
+                if d.year and "TORY" not in self:
+                    self.add(TORY(encoding=f.encoding, text="%04d" % d.year))
+
+        # TDRC -> TYER, TDAT, TIME
+        if "TDRC" in self:
+            f = self.pop("TDRC")
+            if f.text:
+                d = f.text[0]
+                if d.year and "TYER" not in self:
+                    self.add(TYER(encoding=f.encoding, text="%04d" % d.year))
+                if d.month and d.day and "TDAT" not in self:
+                    self.add(TDAT(encoding=f.encoding,
+                                  text="%02d%02d" % (d.day, d.month)))
+                if d.hour and d.minute and "TIME" not in self:
+                    self.add(TIME(encoding=f.encoding,
+                                  text="%02d%02d" % (d.hour, d.minute)))
+
+        # New frames added in v2.4
+        v24_frames = [
+            'ASPI', 'EQU2', 'RVA2', 'SEEK', 'SIGN', 'TDEN', 'TDOR',
+            'TDRC', 'TDRL', 'TDTG', 'TIPL', 'TMCL', 'TMOO', 'TPRO',
+            'TSOA', 'TSOP', 'TSOT', 'TSST',
+        ]
+
+        for key in v24_frames:
+            if key in self:
+                del(self[key])
+
+
+def delete(filename, delete_v1=True, delete_v2=True):
+    """Remove tags from a file.
+
+    Keyword arguments:
+
+    * delete_v1 -- delete any ID3v1 tag
+    * delete_v2 -- delete any ID3v2 tag
+    """
+
+    f = open(filename, 'rb+')
+
+    if delete_v1:
+        tag, offset = _find_id3v1(f)
+        if tag is not None:
+            f.seek(offset, 2)
+            f.truncate()
+
+    # technically an insize=0 tag is invalid, but we delete it anyway
+    # (primarily because we used to write it)
+    if delete_v2:
+        f.seek(0, 0)
+        idata = f.read(10)
+        try:
+            id3, vmaj, vrev, flags, insize = unpack('>3sBBB4s', idata)
+        except struct.error:
+            id3, insize = b'', -1
+        insize = BitPaddedInt(insize)
+        if id3 == b'ID3' and insize >= 0:
+            delete_bytes(f, insize + 10, 0)
+
+
+# support open(filename) as interface
+Open = ID3
+
+
+def _determine_bpi(data, frames, EMPTY=b"\x00" * 10):
+    """Takes id3v2.4 frame data and determines if ints or bitpaddedints
+    should be used for parsing. Needed because iTunes used to write
+    normal ints for frame sizes.
+    """
+
+    # count number of tags found as BitPaddedInt and how far past
+    o = 0
+    asbpi = 0
+    while o < len(data) - 10:
+        part = data[o:o + 10]
+        if part == EMPTY:
+            bpioff = -((len(data) - o) % 10)
+            break
+        name, size, flags = unpack('>4sLH', part)
+        size = BitPaddedInt(size)
+        o += 10 + size
+        if PY3:
+            try:
+                name = name.decode("ascii")
+            except UnicodeDecodeError:
+                continue
+        if name in frames:
+            asbpi += 1
+    else:
+        bpioff = o - len(data)
+
+    # count number of tags found as int and how far past
+    o = 0
+    asint = 0
+    while o < len(data) - 10:
+        part = data[o:o + 10]
+        if part == EMPTY:
+            intoff = -((len(data) - o) % 10)
+            break
+        name, size, flags = unpack('>4sLH', part)
+        o += 10 + size
+        if PY3:
+            try:
+                name = name.decode("ascii")
+            except UnicodeDecodeError:
+                continue
+        if name in frames:
+            asint += 1
+    else:
+        intoff = o - len(data)
+
+    # if more tags as int, or equal and bpi is past and int is not
+    if asint > asbpi or (asint == asbpi and (bpioff >= 1 and intoff <= 1)):
+        return int
+    return BitPaddedInt
+
+
+def _find_id3v1(fileobj):
+    """Returns a tuple of (id3tag, offset_to_end) or (None, 0)
+
+    offset mainly because we used to write too short tags in some cases and
+    we need the offset to delete them.
+    """
+
+    # id3v1 is always at the end (after apev2)
+
+    extra_read = b"APETAGEX".index(b"TAG")
+
+    try:
+        fileobj.seek(-128 - extra_read, 2)
+    except IOError as e:
+        if e.errno == errno.EINVAL:
+            # If the file is too small, might be ok since we wrote too small
+            # tags at some point. let's see how the parsing goes..
+            fileobj.seek(0, 0)
+        else:
+            raise
+
+    data = fileobj.read(128 + extra_read)
+    try:
+        idx = data.index(b"TAG")
+    except ValueError:
+        return (None, 0)
+    else:
+        # FIXME: make use of the apev2 parser here
+        # if TAG is part of APETAGEX assume this is an APEv2 tag
+        try:
+            ape_idx = data.index(b"APETAGEX")
+        except ValueError:
+            pass
+        else:
+            if idx == ape_idx + extra_read:
+                return (None, 0)
+
+        tag = ParseID3v1(data[idx:])
+        if tag is None:
+            return (None, 0)
+
+        offset = idx - len(data)
+        return (tag, offset)
+
+
+# ID3v1.1 support.
+def ParseID3v1(data):
+    """Parse an ID3v1 tag, returning a list of ID3v2.4 frames.
+
+    Returns a {frame_name: frame} dict or None.
+    """
+
+    try:
+        data = data[data.index(b"TAG"):]
+    except ValueError:
+        return None
+    if 128 < len(data) or len(data) < 124:
+        return None
+
+    # Issue #69 - Previous versions of Mutagen, when encountering
+    # out-of-spec TDRC and TYER frames of less than four characters,
+    # wrote only the characters available - e.g. "1" or "" - into the
+    # year field. To parse those, reduce the size of the year field.
+    # Amazingly, "0s" works as a struct format string.
+    unpack_fmt = "3s30s30s30s%ds29sBB" % (len(data) - 124)
+
+    try:
+        tag, title, artist, album, year, comment, track, genre = unpack(
+            unpack_fmt, data)
+    except StructError:
+        return None
+
+    if tag != b"TAG":
+        return None
+
+    def fix(data):
+        return data.split(b"\x00")[0].strip().decode('latin1')
+
+    title, artist, album, year, comment = map(
+        fix, [title, artist, album, year, comment])
+
+    frames = {}
+    if title:
+        frames["TIT2"] = TIT2(encoding=0, text=title)
+    if artist:
+        frames["TPE1"] = TPE1(encoding=0, text=[artist])
+    if album:
+        frames["TALB"] = TALB(encoding=0, text=album)
+    if year:
+        frames["TDRC"] = TDRC(encoding=0, text=year)
+    if comment:
+        frames["COMM"] = COMM(
+            encoding=0, lang="eng", desc="ID3v1 Comment", text=comment)
+    # Don't read a track number if it looks like the comment was
+    # padded with spaces instead of nulls (thanks, WinAmp).
+    if track and ((track != 32) or (data[-3] == b'\x00'[0])):
+        frames["TRCK"] = TRCK(encoding=0, text=str(track))
+    if genre != 255:
+        frames["TCON"] = TCON(encoding=0, text=str(genre))
+    return frames
+
+
+def MakeID3v1(id3):
+    """Return an ID3v1.1 tag string from a dict of ID3v2.4 frames."""
+
+    v1 = {}
+
+    for v2id, name in {"TIT2": "title", "TPE1": "artist",
+                       "TALB": "album"}.items():
+        if v2id in id3:
+            text = id3[v2id].text[0].encode('latin1', 'replace')[:30]
+        else:
+            text = b""
+        v1[name] = text + (b"\x00" * (30 - len(text)))
+
+    if "COMM" in id3:
+        cmnt = id3["COMM"].text[0].encode('latin1', 'replace')[:28]
+    else:
+        cmnt = b""
+    v1["comment"] = cmnt + (b"\x00" * (29 - len(cmnt)))
+
+    if "TRCK" in id3:
+        try:
+            v1["track"] = chr_(+id3["TRCK"])
+        except ValueError:
+            v1["track"] = b"\x00"
+    else:
+        v1["track"] = b"\x00"
+
+    if "TCON" in id3:
+        try:
+            genre = id3["TCON"].genres[0]
+        except IndexError:
+            pass
+        else:
+            if genre in TCON.GENRES:
+                v1["genre"] = chr_(TCON.GENRES.index(genre))
+    if "genre" not in v1:
+        v1["genre"] = b"\xff"
+
+    if "TDRC" in id3:
+        year = text_type(id3["TDRC"]).encode('ascii')
+    elif "TYER" in id3:
+        year = text_type(id3["TYER"]).encode('ascii')
+    else:
+        year = b""
+    v1["year"] = (year + b"\x00\x00\x00\x00")[:4]
+
+    return (
+        b"TAG" +
+        v1["title"] +
+        v1["artist"] +
+        v1["album"] +
+        v1["year"] +
+        v1["comment"] +
+        v1["track"] +
+        v1["genre"]
+    )
+
+
+class ID3FileType(mutagen.FileType):
+    """An unknown type of file with ID3 tags."""
+
+    ID3 = ID3
+
+    class _Info(mutagen.StreamInfo):
+        length = 0
+
+        def __init__(self, fileobj, offset):
+            pass
+
+        @staticmethod
+        def pprint():
+            return "Unknown format with ID3 tag"
+
+    @staticmethod
+    def score(filename, fileobj, header_data):
+        return header_data.startswith(b"ID3")
+
+    def add_tags(self, ID3=None):
+        """Add an empty ID3 tag to the file.
+
+        A custom tag reader may be used in instead of the default
+        mutagen.id3.ID3 object, e.g. an EasyID3 reader.
+        """
+        if ID3 is None:
+            ID3 = self.ID3
+        if self.tags is None:
+            self.ID3 = ID3
+            self.tags = ID3()
+        else:
+            raise error("an ID3 tag already exists")
+
+    def load(self, filename, ID3=None, **kwargs):
+        """Load stream and tag information from a file.
+
+        A custom tag reader may be used in instead of the default
+        mutagen.id3.ID3 object, e.g. an EasyID3 reader.
+        """
+
+        if ID3 is None:
+            ID3 = self.ID3
+        else:
+            # If this was initialized with EasyID3, remember that for
+            # when tags are auto-instantiated in add_tags.
+            self.ID3 = ID3
+        self.filename = filename
+        try:
+            self.tags = ID3(filename, **kwargs)
+        except error:
+            self.tags = None
+        if self.tags is not None:
+            try:
+                offset = self.tags.size
+            except AttributeError:
+                offset = None
+        else:
+            offset = None
+        try:
+            fileobj = open(filename, "rb")
+            self.info = self._Info(fileobj, offset)
+        finally:
+            fileobj.close()
diff --git a/lib/mutagen/id3/_frames.py b/lib/mutagen/id3/_frames.py
new file mode 100644
index 00000000..75bfee53
--- /dev/null
+++ b/lib/mutagen/id3/_frames.py
@@ -0,0 +1,1916 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2005  Michael Urman
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+
+import zlib
+from warnings import warn
+from struct import unpack
+
+from ._util import (
+    ID3Warning, ID3JunkFrameError, ID3BadCompressedData,
+    ID3EncryptionUnsupportedError, ID3BadUnsynchData, unsynch)
+from ._specs import (
+    BinaryDataSpec, StringSpec, Latin1TextSpec, EncodedTextSpec, ByteSpec,
+    EncodingSpec, ASPIIndexSpec, SizedIntegerSpec, IntegerSpec,
+    VolumeAdjustmentsSpec, VolumePeakSpec, VolumeAdjustmentSpec,
+    ChannelSpec, MultiSpec, SynchronizedTextSpec, KeyEventSpec, TimeStampSpec,
+    EncodedNumericPartTextSpec, EncodedNumericTextSpec)
+from .._compat import text_type, string_types, swap_to_string, iteritems
+
+
+def is_valid_frame_id(frame_id):
+    return frame_id.isalnum() and frame_id.isupper()
+
+
+def _bytes2key(b):
+    assert isinstance(b, bytes)
+
+    return b.decode("latin1")
+
+
+class Frame(object):
+    """Fundamental unit of ID3 data.
+
+    ID3 tags are split into frames. Each frame has a potentially
+    different structure, and so this base class is not very featureful.
+    """
+
+    FLAG23_ALTERTAG = 0x8000
+    FLAG23_ALTERFILE = 0x4000
+    FLAG23_READONLY = 0x2000
+    FLAG23_COMPRESS = 0x0080
+    FLAG23_ENCRYPT = 0x0040
+    FLAG23_GROUP = 0x0020
+
+    FLAG24_ALTERTAG = 0x4000
+    FLAG24_ALTERFILE = 0x2000
+    FLAG24_READONLY = 0x1000
+    FLAG24_GROUPID = 0x0040
+    FLAG24_COMPRESS = 0x0008
+    FLAG24_ENCRYPT = 0x0004
+    FLAG24_UNSYNCH = 0x0002
+    FLAG24_DATALEN = 0x0001
+
+    _framespec = []
+
+    def __init__(self, *args, **kwargs):
+        if len(args) == 1 and len(kwargs) == 0 and \
+                isinstance(args[0], type(self)):
+            other = args[0]
+            # ask the sub class to fill in our data
+            other._to_other(self)
+        else:
+            for checker, val in zip(self._framespec, args):
+                setattr(self, checker.name, checker.validate(self, val))
+            for checker in self._framespec[len(args):]:
+                try:
+                    validated = checker.validate(
+                        self, kwargs.get(checker.name, None))
+                except ValueError as e:
+                    raise ValueError("%s: %s" % (checker.name, e))
+                setattr(self, checker.name, validated)
+
+    def _to_other(self, other):
+        # this impl covers subclasses with the same framespec
+        if other._framespec is not self._framespec:
+            raise ValueError
+
+        for checker in other._framespec:
+            setattr(other, checker.name, getattr(self, checker.name))
+
+    def _get_v23_frame(self, **kwargs):
+        """Returns a frame copy which is suitable for writing into a v2.3 tag.
+
+        kwargs get passed to the specs.
+        """
+
+        new_kwargs = {}
+        for checker in self._framespec:
+            name = checker.name
+            value = getattr(self, name)
+            new_kwargs[name] = checker._validate23(self, value, **kwargs)
+        return type(self)(**new_kwargs)
+
+    @property
+    def HashKey(self):
+        """An internal key used to ensure frame uniqueness in a tag"""
+
+        return self.FrameID
+
+    @property
+    def FrameID(self):
+        """ID3v2 three or four character frame ID"""
+
+        return type(self).__name__
+
+    def __repr__(self):
+        """Python representation of a frame.
+
+        The string returned is a valid Python expression to construct
+        a copy of this frame.
+        """
+        kw = []
+        for attr in self._framespec:
+            # so repr works during __init__
+            if hasattr(self, attr.name):
+                kw.append('%s=%r' % (attr.name, getattr(self, attr.name)))
+        return '%s(%s)' % (type(self).__name__, ', '.join(kw))
+
+    def _readData(self, data):
+        odata = data
+        for reader in self._framespec:
+            if len(data):
+                try:
+                    value, data = reader.read(self, data)
+                except UnicodeDecodeError:
+                    raise ID3JunkFrameError
+            else:
+                raise ID3JunkFrameError
+            setattr(self, reader.name, value)
+        if data.strip(b'\x00'):
+            warn('Leftover data: %s: %r (from %r)' % (
+                 type(self).__name__, data, odata),
+                 ID3Warning)
+
+    def _writeData(self):
+        data = []
+        for writer in self._framespec:
+            data.append(writer.write(self, getattr(self, writer.name)))
+        return b''.join(data)
+
+    def pprint(self):
+        """Return a human-readable representation of the frame."""
+        return "%s=%s" % (type(self).__name__, self._pprint())
+
+    def _pprint(self):
+        return "[unrepresentable data]"
+
+    @classmethod
+    def fromData(cls, id3, tflags, data):
+        """Construct this ID3 frame from raw string data."""
+
+        if id3._V24 <= id3.version:
+            if tflags & (Frame.FLAG24_COMPRESS | Frame.FLAG24_DATALEN):
+                # The data length int is syncsafe in 2.4 (but not 2.3).
+                # However, we don't actually need the data length int,
+                # except to work around a QL 0.12 bug, and in that case
+                # all we need are the raw bytes.
+                datalen_bytes = data[:4]
+                data = data[4:]
+            if tflags & Frame.FLAG24_UNSYNCH or id3.f_unsynch:
+                try:
+                    data = unsynch.decode(data)
+                except ValueError as err:
+                    if id3.PEDANTIC:
+                        raise ID3BadUnsynchData('%s: %r' % (err, data))
+            if tflags & Frame.FLAG24_ENCRYPT:
+                raise ID3EncryptionUnsupportedError
+            if tflags & Frame.FLAG24_COMPRESS:
+                try:
+                    data = zlib.decompress(data)
+                except zlib.error as err:
+                    # the initial mutagen that went out with QL 0.12 did not
+                    # write the 4 bytes of uncompressed size. Compensate.
+                    data = datalen_bytes + data
+                    try:
+                        data = zlib.decompress(data)
+                    except zlib.error as err:
+                        if id3.PEDANTIC:
+                            raise ID3BadCompressedData('%s: %r' % (err, data))
+
+        elif id3._V23 <= id3.version:
+            if tflags & Frame.FLAG23_COMPRESS:
+                usize, = unpack('>L', data[:4])
+                data = data[4:]
+            if tflags & Frame.FLAG23_ENCRYPT:
+                raise ID3EncryptionUnsupportedError
+            if tflags & Frame.FLAG23_COMPRESS:
+                try:
+                    data = zlib.decompress(data)
+                except zlib.error as err:
+                    if id3.PEDANTIC:
+                        raise ID3BadCompressedData('%s: %r' % (err, data))
+
+        frame = cls()
+        frame._rawdata = data
+        frame._flags = tflags
+        frame._readData(data)
+        return frame
+
+    def __hash__(self):
+        raise TypeError("Frame objects are unhashable")
+
+
+class FrameOpt(Frame):
+    """A frame with optional parts.
+
+    Some ID3 frames have optional data; this class extends Frame to
+    provide support for those parts.
+    """
+
+    _optionalspec = []
+
+    def __init__(self, *args, **kwargs):
+        super(FrameOpt, self).__init__(*args, **kwargs)
+        for spec in self._optionalspec:
+            if spec.name in kwargs:
+                validated = spec.validate(self, kwargs[spec.name])
+                setattr(self, spec.name, validated)
+            else:
+                break
+
+    def _to_other(self, other):
+        super(FrameOpt, self)._to_other(other)
+
+        # this impl covers subclasses with the same optionalspec
+        if other._optionalspec is not self._optionalspec:
+            raise ValueError
+
+        for checker in other._optionalspec:
+            if hasattr(self, checker.name):
+                setattr(other, checker.name, getattr(self, checker.name))
+
+    def _readData(self, data):
+        odata = data
+        for reader in self._framespec:
+            if len(data):
+                value, data = reader.read(self, data)
+            else:
+                raise ID3JunkFrameError
+            setattr(self, reader.name, value)
+        if data:
+            for reader in self._optionalspec:
+                if len(data):
+                    value, data = reader.read(self, data)
+                else:
+                    break
+                setattr(self, reader.name, value)
+        if data.strip(b'\x00'):
+            warn('Leftover data: %s: %r (from %r)' % (
+                 type(self).__name__, data, odata),
+                 ID3Warning)
+
+    def _writeData(self):
+        data = []
+        for writer in self._framespec:
+            data.append(writer.write(self, getattr(self, writer.name)))
+        for writer in self._optionalspec:
+            try:
+                data.append(writer.write(self, getattr(self, writer.name)))
+            except AttributeError:
+                break
+        return b''.join(data)
+
+    def __repr__(self):
+        kw = []
+        for attr in self._framespec:
+            kw.append('%s=%r' % (attr.name, getattr(self, attr.name)))
+        for attr in self._optionalspec:
+            if hasattr(self, attr.name):
+                kw.append('%s=%r' % (attr.name, getattr(self, attr.name)))
+        return '%s(%s)' % (type(self).__name__, ', '.join(kw))
+
+
+@swap_to_string
+class TextFrame(Frame):
+    """Text strings.
+
+    Text frames support casts to unicode or str objects, as well as
+    list-like indexing, extend, and append.
+
+    Iterating over a TextFrame iterates over its strings, not its
+    characters.
+
+    Text frames have a 'text' attribute which is the list of strings,
+    and an 'encoding' attribute; 0 for ISO-8859 1, 1 UTF-16, 2 for
+    UTF-16BE, and 3 for UTF-8. If you don't want to worry about
+    encodings, just set it to 3.
+    """
+
+    _framespec = [
+        EncodingSpec('encoding'),
+        MultiSpec('text', EncodedTextSpec('text'), sep=u'\u0000'),
+    ]
+
+    def __bytes__(self):
+        return text_type(self).encode('utf-8')
+
+    def __str__(self):
+        return u'\u0000'.join(self.text)
+
+    def __eq__(self, other):
+        if isinstance(other, bytes):
+            return bytes(self) == other
+        elif isinstance(other, text_type):
+            return text_type(self) == other
+        return self.text == other
+
+    __hash__ = Frame.__hash__
+
+    def __getitem__(self, item):
+        return self.text[item]
+
+    def __iter__(self):
+        return iter(self.text)
+
+    def append(self, value):
+        """Append a string."""
+
+        return self.text.append(value)
+
+    def extend(self, value):
+        """Extend the list by appending all strings from the given list."""
+
+        return self.text.extend(value)
+
+    def _pprint(self):
+        return " / ".join(self.text)
+
+
+class NumericTextFrame(TextFrame):
+    """Numerical text strings.
+
+    The numeric value of these frames can be gotten with unary plus, e.g.::
+
+        frame = TLEN('12345')
+        length = +frame
+    """
+
+    _framespec = [
+        EncodingSpec('encoding'),
+        MultiSpec('text', EncodedNumericTextSpec('text'), sep=u'\u0000'),
+    ]
+
+    def __pos__(self):
+        """Return the numerical value of the string."""
+        return int(self.text[0])
+
+
+class NumericPartTextFrame(TextFrame):
+    """Multivalue numerical text strings.
+
+    These strings indicate 'part (e.g. track) X of Y', and unary plus
+    returns the first value::
+
+        frame = TRCK('4/15')
+        track = +frame # track == 4
+    """
+
+    _framespec = [
+        EncodingSpec('encoding'),
+        MultiSpec('text', EncodedNumericPartTextSpec('text'), sep=u'\u0000'),
+    ]
+
+    def __pos__(self):
+        return int(self.text[0].split("/")[0])
+
+
+@swap_to_string
+class TimeStampTextFrame(TextFrame):
+    """A list of time stamps.
+
+    The 'text' attribute in this frame is a list of ID3TimeStamp
+    objects, not a list of strings.
+    """
+
+    _framespec = [
+        EncodingSpec('encoding'),
+        MultiSpec('text', TimeStampSpec('stamp'), sep=u','),
+    ]
+
+    def __bytes__(self):
+        return text_type(self).encode('utf-8')
+
+    def __str__(self):
+        return u','.join([stamp.text for stamp in self.text])
+
+    def _pprint(self):
+        return u" / ".join([stamp.text for stamp in self.text])
+
+
+@swap_to_string
+class UrlFrame(Frame):
+    """A frame containing a URL string.
+
+    The ID3 specification is silent about IRIs and normalized URL
+    forms. Mutagen assumes all URLs in files are encoded as Latin 1,
+    but string conversion of this frame returns a UTF-8 representation
+    for compatibility with other string conversions.
+
+    The only sane way to handle URLs in MP3s is to restrict them to
+    ASCII.
+    """
+
+    _framespec = [Latin1TextSpec('url')]
+
+    def __bytes__(self):
+        return self.url.encode('utf-8')
+
+    def __str__(self):
+        return self.url
+
+    def __eq__(self, other):
+        return self.url == other
+
+    __hash__ = Frame.__hash__
+
+    def _pprint(self):
+        return self.url
+
+
+class UrlFrameU(UrlFrame):
+
+    @property
+    def HashKey(self):
+        return '%s:%s' % (self.FrameID, self.url)
+
+
+class TALB(TextFrame):
+    "Album"
+
+
+class TBPM(NumericTextFrame):
+    "Beats per minute"
+
+
+class TCOM(TextFrame):
+    "Composer"
+
+
+class TCON(TextFrame):
+    """Content type (Genre)
+
+    ID3 has several ways genres can be represented; for convenience,
+    use the 'genres' property rather than the 'text' attribute.
+    """
+
+    from mutagen._constants import GENRES
+    GENRES = GENRES
+
+    def __get_genres(self):
+        genres = []
+        import re
+        genre_re = re.compile(r"((?:\((?P<id>[0-9]+|RX|CR)\))*)(?P<str>.+)?")
+        for value in self.text:
+            # 255 possible entries in id3v1
+            if value.isdigit() and int(value) < 256:
+                try:
+                    genres.append(self.GENRES[int(value)])
+                except IndexError:
+                    genres.append(u"Unknown")
+            elif value == "CR":
+                genres.append(u"Cover")
+            elif value == "RX":
+                genres.append(u"Remix")
+            elif value:
+                newgenres = []
+                genreid, dummy, genrename = genre_re.match(value).groups()
+
+                if genreid:
+                    for gid in genreid[1:-1].split(")("):
+                        if gid.isdigit() and int(gid) < len(self.GENRES):
+                            gid = text_type(self.GENRES[int(gid)])
+                            newgenres.append(gid)
+                        elif gid == "CR":
+                            newgenres.append(u"Cover")
+                        elif gid == "RX":
+                            newgenres.append(u"Remix")
+                        else:
+                            newgenres.append(u"Unknown")
+
+                if genrename:
+                    # "Unescaping" the first parenthesis
+                    if genrename.startswith("(("):
+                        genrename = genrename[1:]
+                    if genrename not in newgenres:
+                        newgenres.append(genrename)
+
+                genres.extend(newgenres)
+
+        return genres
+
+    def __set_genres(self, genres):
+        if isinstance(genres, string_types):
+            genres = [genres]
+        self.text = [self.__decode(g) for g in genres]
+
+    def __decode(self, value):
+        if isinstance(value, bytes):
+            enc = EncodedTextSpec._encodings[self.encoding][0]
+            return value.decode(enc)
+        else:
+            return value
+
+    genres = property(__get_genres, __set_genres, None,
+                      "A list of genres parsed from the raw text data.")
+
+    def _pprint(self):
+        return " / ".join(self.genres)
+
+
+class TCOP(TextFrame):
+    "Copyright (c)"
+
+
+class TCMP(NumericTextFrame):
+    "iTunes Compilation Flag"
+
+
+class TDAT(TextFrame):
+    "Date of recording (DDMM)"
+
+
+class TDEN(TimeStampTextFrame):
+    "Encoding Time"
+
+
+class TDES(TextFrame):
+    "iTunes Podcast Description"
+
+
+class TDOR(TimeStampTextFrame):
+    "Original Release Time"
+
+
+class TDLY(NumericTextFrame):
+    "Audio Delay (ms)"
+
+
+class TDRC(TimeStampTextFrame):
+    "Recording Time"
+
+
+class TDRL(TimeStampTextFrame):
+    "Release Time"
+
+
+class TDTG(TimeStampTextFrame):
+    "Tagging Time"
+
+
+class TENC(TextFrame):
+    "Encoder"
+
+
+class TEXT(TextFrame):
+    "Lyricist"
+
+
+class TFLT(TextFrame):
+    "File type"
+
+
+class TGID(TextFrame):
+    "iTunes Podcast Identifier"
+
+
+class TIME(TextFrame):
+    "Time of recording (HHMM)"
+
+
+class TIT1(TextFrame):
+    "Content group description"
+
+
+class TIT2(TextFrame):
+    "Title"
+
+
+class TIT3(TextFrame):
+    "Subtitle/Description refinement"
+
+
+class TKEY(TextFrame):
+    "Starting Key"
+
+
+class TLAN(TextFrame):
+    "Audio Languages"
+
+
+class TLEN(NumericTextFrame):
+    "Audio Length (ms)"
+
+
+class TMED(TextFrame):
+    "Source Media Type"
+
+
+class TMOO(TextFrame):
+    "Mood"
+
+
+class TOAL(TextFrame):
+    "Original Album"
+
+
+class TOFN(TextFrame):
+    "Original Filename"
+
+
+class TOLY(TextFrame):
+    "Original Lyricist"
+
+
+class TOPE(TextFrame):
+    "Original Artist/Performer"
+
+
+class TORY(NumericTextFrame):
+    "Original Release Year"
+
+
+class TOWN(TextFrame):
+    "Owner/Licensee"
+
+
+class TPE1(TextFrame):
+    "Lead Artist/Performer/Soloist/Group"
+
+
+class TPE2(TextFrame):
+    "Band/Orchestra/Accompaniment"
+
+
+class TPE3(TextFrame):
+    "Conductor"
+
+
+class TPE4(TextFrame):
+    "Interpreter/Remixer/Modifier"
+
+
+class TPOS(NumericPartTextFrame):
+    "Part of set"
+
+
+class TPRO(TextFrame):
+    "Produced (P)"
+
+
+class TPUB(TextFrame):
+    "Publisher"
+
+
+class TRCK(NumericPartTextFrame):
+    "Track Number"
+
+
+class TRDA(TextFrame):
+    "Recording Dates"
+
+
+class TRSN(TextFrame):
+    "Internet Radio Station Name"
+
+
+class TRSO(TextFrame):
+    "Internet Radio Station Owner"
+
+
+class TSIZ(NumericTextFrame):
+    "Size of audio data (bytes)"
+
+
+class TSO2(TextFrame):
+    "iTunes Album Artist Sort"
+
+
+class TSOA(TextFrame):
+    "Album Sort Order key"
+
+
+class TSOC(TextFrame):
+    "iTunes Composer Sort"
+
+
+class TSOP(TextFrame):
+    "Perfomer Sort Order key"
+
+
+class TSOT(TextFrame):
+    "Title Sort Order key"
+
+
+class TSRC(TextFrame):
+    "International Standard Recording Code (ISRC)"
+
+
+class TSSE(TextFrame):
+    "Encoder settings"
+
+
+class TSST(TextFrame):
+    "Set Subtitle"
+
+
+class TYER(NumericTextFrame):
+    "Year of recording"
+
+
+class TXXX(TextFrame):
+    """User-defined text data.
+
+    TXXX frames have a 'desc' attribute which is set to any Unicode
+    value (though the encoding of the text and the description must be
+    the same). Many taggers use this frame to store freeform keys.
+    """
+
+    _framespec = [
+        EncodingSpec('encoding'),
+        EncodedTextSpec('desc'),
+        MultiSpec('text', EncodedTextSpec('text'), sep=u'\u0000'),
+    ]
+
+    @property
+    def HashKey(self):
+        return '%s:%s' % (self.FrameID, self.desc)
+
+    def _pprint(self):
+        return "%s=%s" % (self.desc, " / ".join(self.text))
+
+
+class WCOM(UrlFrameU):
+    "Commercial Information"
+
+
+class WCOP(UrlFrame):
+    "Copyright Information"
+
+
+class WFED(UrlFrame):
+    "iTunes Podcast Feed"
+
+
+class WOAF(UrlFrame):
+    "Official File Information"
+
+
+class WOAR(UrlFrameU):
+    "Official Artist/Performer Information"
+
+
+class WOAS(UrlFrame):
+    "Official Source Information"
+
+
+class WORS(UrlFrame):
+    "Official Internet Radio Information"
+
+
+class WPAY(UrlFrame):
+    "Payment Information"
+
+
+class WPUB(UrlFrame):
+    "Official Publisher Information"
+
+
+class WXXX(UrlFrame):
+    """User-defined URL data.
+
+    Like TXXX, this has a freeform description associated with it.
+    """
+
+    _framespec = [
+        EncodingSpec('encoding'),
+        EncodedTextSpec('desc'),
+        Latin1TextSpec('url'),
+    ]
+
+    @property
+    def HashKey(self):
+        return '%s:%s' % (self.FrameID, self.desc)
+
+
+class PairedTextFrame(Frame):
+    """Paired text strings.
+
+    Some ID3 frames pair text strings, to associate names with a more
+    specific involvement in the song. The 'people' attribute of these
+    frames contains a list of pairs::
+
+        [['trumpet', 'Miles Davis'], ['bass', 'Paul Chambers']]
+
+    Like text frames, these frames also have an encoding attribute.
+    """
+
+    _framespec = [
+        EncodingSpec('encoding'),
+        MultiSpec('people',
+                  EncodedTextSpec('involvement'),
+                  EncodedTextSpec('person'))
+    ]
+
+    def __eq__(self, other):
+        return self.people == other
+
+    __hash__ = Frame.__hash__
+
+
+class TIPL(PairedTextFrame):
+    "Involved People List"
+
+
+class TMCL(PairedTextFrame):
+    "Musicians Credits List"
+
+
+class IPLS(TIPL):
+    "Involved People List"
+
+
+class BinaryFrame(Frame):
+    """Binary data
+
+    The 'data' attribute contains the raw byte string.
+    """
+
+    _framespec = [BinaryDataSpec('data')]
+
+    def __eq__(self, other):
+        return self.data == other
+
+    __hash__ = Frame.__hash__
+
+
+class MCDI(BinaryFrame):
+    "Binary dump of CD's TOC"
+
+
+class ETCO(Frame):
+    """Event timing codes."""
+
+    _framespec = [
+        ByteSpec("format"),
+        KeyEventSpec("events"),
+    ]
+
+    def __eq__(self, other):
+        return self.events == other
+
+    __hash__ = Frame.__hash__
+
+
+class MLLT(Frame):
+    """MPEG location lookup table.
+
+    This frame's attributes may be changed in the future based on
+    feedback from real-world use.
+    """
+
+    _framespec = [
+        SizedIntegerSpec('frames', 2),
+        SizedIntegerSpec('bytes', 3),
+        SizedIntegerSpec('milliseconds', 3),
+        ByteSpec('bits_for_bytes'),
+        ByteSpec('bits_for_milliseconds'),
+        BinaryDataSpec('data'),
+    ]
+
+    def __eq__(self, other):
+        return self.data == other
+
+    __hash__ = Frame.__hash__
+
+
+class SYTC(Frame):
+    """Synchronised tempo codes.
+
+    This frame's attributes may be changed in the future based on
+    feedback from real-world use.
+    """
+
+    _framespec = [
+        ByteSpec("format"),
+        BinaryDataSpec("data"),
+    ]
+
+    def __eq__(self, other):
+        return self.data == other
+
+    __hash__ = Frame.__hash__
+
+
+@swap_to_string
+class USLT(Frame):
+    """Unsynchronised lyrics/text transcription.
+
+    Lyrics have a three letter ISO language code ('lang'), a
+    description ('desc'), and a block of plain text ('text').
+    """
+
+    _framespec = [
+        EncodingSpec('encoding'),
+        StringSpec('lang', 3),
+        EncodedTextSpec('desc'),
+        EncodedTextSpec('text'),
+    ]
+
+    @property
+    def HashKey(self):
+        return '%s:%s:%s' % (self.FrameID, self.desc, self.lang)
+
+    def __bytes__(self):
+        return self.text.encode('utf-8')
+
+    def __str__(self):
+        return self.text
+
+    def __eq__(self, other):
+        return self.text == other
+
+    __hash__ = Frame.__hash__
+
+
+@swap_to_string
+class SYLT(Frame):
+    """Synchronised lyrics/text."""
+
+    _framespec = [
+        EncodingSpec('encoding'),
+        StringSpec('lang', 3),
+        ByteSpec('format'),
+        ByteSpec('type'),
+        EncodedTextSpec('desc'),
+        SynchronizedTextSpec('text'),
+    ]
+
+    @property
+    def HashKey(self):
+        return '%s:%s:%s' % (self.FrameID, self.desc, self.lang)
+
+    def __eq__(self, other):
+        return str(self) == other
+
+    __hash__ = Frame.__hash__
+
+    def __str__(self):
+        return u"".join(text for (text, time) in self.text)
+
+    def __bytes__(self):
+        return text_type(self).encode("utf-8")
+
+
+class COMM(TextFrame):
+    """User comment.
+
+    User comment frames have a descrption, like TXXX, and also a three
+    letter ISO language code in the 'lang' attribute.
+    """
+
+    _framespec = [
+        EncodingSpec('encoding'),
+        StringSpec('lang', 3),
+        EncodedTextSpec('desc'),
+        MultiSpec('text', EncodedTextSpec('text'), sep=u'\u0000'),
+    ]
+
+    @property
+    def HashKey(self):
+        return '%s:%s:%s' % (self.FrameID, self.desc, self.lang)
+
+    def _pprint(self):
+        return "%s=%s=%s" % (self.desc, self.lang, " / ".join(self.text))
+
+
+class RVA2(Frame):
+    """Relative volume adjustment (2).
+
+    This frame is used to implemented volume scaling, and in
+    particular, normalization using ReplayGain.
+
+    Attributes:
+
+    * desc -- description or context of this adjustment
+    * channel -- audio channel to adjust (master is 1)
+    * gain -- a + or - dB gain relative to some reference level
+    * peak -- peak of the audio as a floating point number, [0, 1]
+
+    When storing ReplayGain tags, use descriptions of 'album' and
+    'track' on channel 1.
+    """
+
+    _framespec = [
+        Latin1TextSpec('desc'),
+        ChannelSpec('channel'),
+        VolumeAdjustmentSpec('gain'),
+        VolumePeakSpec('peak'),
+    ]
+
+    _channels = ["Other", "Master volume", "Front right", "Front left",
+                 "Back right", "Back left", "Front centre", "Back centre",
+                 "Subwoofer"]
+
+    @property
+    def HashKey(self):
+        return '%s:%s' % (self.FrameID, self.desc)
+
+    def __eq__(self, other):
+        try:
+            return ((str(self) == other) or
+                    (self.desc == other.desc and
+                     self.channel == other.channel and
+                     self.gain == other.gain and
+                     self.peak == other.peak))
+        except AttributeError:
+            return False
+
+    __hash__ = Frame.__hash__
+
+    def __str__(self):
+        return "%s: %+0.4f dB/%0.4f" % (
+            self._channels[self.channel], self.gain, self.peak)
+
+
+class EQU2(Frame):
+    """Equalisation (2).
+
+    Attributes:
+    method -- interpolation method (0 = band, 1 = linear)
+    desc -- identifying description
+    adjustments -- list of (frequency, vol_adjustment) pairs
+    """
+
+    _framespec = [
+        ByteSpec("method"),
+        Latin1TextSpec("desc"),
+        VolumeAdjustmentsSpec("adjustments"),
+    ]
+
+    def __eq__(self, other):
+        return self.adjustments == other
+
+    __hash__ = Frame.__hash__
+
+    @property
+    def HashKey(self):
+        return '%s:%s' % (self.FrameID, self.desc)
+
+
+# class RVAD: unsupported
+# class EQUA: unsupported
+
+
+class RVRB(Frame):
+    """Reverb."""
+
+    _framespec = [
+        SizedIntegerSpec('left', 2),
+        SizedIntegerSpec('right', 2),
+        ByteSpec('bounce_left'),
+        ByteSpec('bounce_right'),
+        ByteSpec('feedback_ltl'),
+        ByteSpec('feedback_ltr'),
+        ByteSpec('feedback_rtr'),
+        ByteSpec('feedback_rtl'),
+        ByteSpec('premix_ltr'),
+        ByteSpec('premix_rtl'),
+    ]
+
+    def __eq__(self, other):
+        return (self.left, self.right) == other
+
+    __hash__ = Frame.__hash__
+
+
+class APIC(Frame):
+    """Attached (or linked) Picture.
+
+    Attributes:
+
+    * encoding -- text encoding for the description
+    * mime -- a MIME type (e.g. image/jpeg) or '-->' if the data is a URI
+    * type -- the source of the image (3 is the album front cover)
+    * desc -- a text description of the image
+    * data -- raw image data, as a byte string
+
+    Mutagen will automatically compress large images when saving tags.
+    """
+
+    _framespec = [
+        EncodingSpec('encoding'),
+        Latin1TextSpec('mime'),
+        ByteSpec('type'),
+        EncodedTextSpec('desc'),
+        BinaryDataSpec('data'),
+    ]
+
+    def __eq__(self, other):
+        return self.data == other
+
+    __hash__ = Frame.__hash__
+
+    @property
+    def HashKey(self):
+        return '%s:%s' % (self.FrameID, self.desc)
+
+    def _validate_from_22(self, other, checker):
+        if checker.name == "mime":
+            self.mime = other.mime.decode("ascii", "ignore")
+        else:
+            super(APIC, self)._validate_from_22(other, checker)
+
+    def _pprint(self):
+        return "%s (%s, %d bytes)" % (
+            self.desc, self.mime, len(self.data))
+
+
+class PCNT(Frame):
+    """Play counter.
+
+    The 'count' attribute contains the (recorded) number of times this
+    file has been played.
+
+    This frame is basically obsoleted by POPM.
+    """
+
+    _framespec = [IntegerSpec('count')]
+
+    def __eq__(self, other):
+        return self.count == other
+
+    __hash__ = Frame.__hash__
+
+    def __pos__(self):
+        return self.count
+
+    def _pprint(self):
+        return text_type(self.count)
+
+
+class POPM(FrameOpt):
+    """Popularimeter.
+
+    This frame keys a rating (out of 255) and a play count to an email
+    address.
+
+    Attributes:
+
+    * email -- email this POPM frame is for
+    * rating -- rating from 0 to 255
+    * count -- number of times the files has been played (optional)
+    """
+
+    _framespec = [
+        Latin1TextSpec('email'),
+        ByteSpec('rating'),
+    ]
+
+    _optionalspec = [IntegerSpec('count')]
+
+    @property
+    def HashKey(self):
+        return '%s:%s' % (self.FrameID, self.email)
+
+    def __eq__(self, other):
+        return self.rating == other
+
+    __hash__ = FrameOpt.__hash__
+
+    def __pos__(self):
+        return self.rating
+
+    def _pprint(self):
+        return "%s=%r %r/255" % (
+            self.email, getattr(self, 'count', None), self.rating)
+
+
+class GEOB(Frame):
+    """General Encapsulated Object.
+
+    A blob of binary data, that is not a picture (those go in APIC).
+
+    Attributes:
+
+    * encoding -- encoding of the description
+    * mime -- MIME type of the data or '-->' if the data is a URI
+    * filename -- suggested filename if extracted
+    * desc -- text description of the data
+    * data -- raw data, as a byte string
+    """
+
+    _framespec = [
+        EncodingSpec('encoding'),
+        Latin1TextSpec('mime'),
+        EncodedTextSpec('filename'),
+        EncodedTextSpec('desc'),
+        BinaryDataSpec('data'),
+    ]
+
+    @property
+    def HashKey(self):
+        return '%s:%s' % (self.FrameID, self.desc)
+
+    def __eq__(self, other):
+        return self.data == other
+
+    __hash__ = Frame.__hash__
+
+
+class RBUF(FrameOpt):
+    """Recommended buffer size.
+
+    Attributes:
+
+    * size -- recommended buffer size in bytes
+    * info -- if ID3 tags may be elsewhere in the file (optional)
+    * offset -- the location of the next ID3 tag, if any
+
+    Mutagen will not find the next tag itself.
+    """
+
+    _framespec = [SizedIntegerSpec('size', 3)]
+
+    _optionalspec = [
+        ByteSpec('info'),
+        SizedIntegerSpec('offset', 4),
+    ]
+
+    def __eq__(self, other):
+        return self.size == other
+
+    __hash__ = FrameOpt.__hash__
+
+    def __pos__(self):
+        return self.size
+
+
+@swap_to_string
+class AENC(FrameOpt):
+    """Audio encryption.
+
+    Attributes:
+
+    * owner -- key identifying this encryption type
+    * preview_start -- unencrypted data block offset
+    * preview_length -- number of unencrypted blocks
+    * data -- data required for decryption (optional)
+
+    Mutagen cannot decrypt files.
+    """
+
+    _framespec = [
+        Latin1TextSpec('owner'),
+        SizedIntegerSpec('preview_start', 2),
+        SizedIntegerSpec('preview_length', 2),
+    ]
+
+    _optionalspec = [BinaryDataSpec('data')]
+
+    @property
+    def HashKey(self):
+        return '%s:%s' % (self.FrameID, self.owner)
+
+    def __bytes__(self):
+        return self.owner.encode('utf-8')
+
+    def __str__(self):
+        return self.owner
+
+    def __eq__(self, other):
+        return self.owner == other
+
+    __hash__ = FrameOpt.__hash__
+
+
+class LINK(FrameOpt):
+    """Linked information.
+
+    Attributes:
+
+    * frameid -- the ID of the linked frame
+    * url -- the location of the linked frame
+    * data -- further ID information for the frame
+    """
+
+    _framespec = [
+        StringSpec('frameid', 4),
+        Latin1TextSpec('url'),
+    ]
+
+    _optionalspec = [BinaryDataSpec('data')]
+
+    @property
+    def HashKey(self):
+        try:
+            return "%s:%s:%s:%s" % (
+                self.FrameID, self.frameid, self.url, _bytes2key(self.data))
+        except AttributeError:
+            return "%s:%s:%s" % (self.FrameID, self.frameid, self.url)
+
+    def __eq__(self, other):
+        try:
+            return (self.frameid, self.url, self.data) == other
+        except AttributeError:
+            return (self.frameid, self.url) == other
+
+    __hash__ = FrameOpt.__hash__
+
+
+class POSS(Frame):
+    """Position synchronisation frame
+
+    Attribute:
+
+    * format -- format of the position attribute (frames or milliseconds)
+    * position -- current position of the file
+    """
+
+    _framespec = [
+        ByteSpec('format'),
+        IntegerSpec('position'),
+    ]
+
+    def __pos__(self):
+        return self.position
+
+    def __eq__(self, other):
+        return self.position == other
+
+    __hash__ = Frame.__hash__
+
+
+class UFID(Frame):
+    """Unique file identifier.
+
+    Attributes:
+
+    * owner -- format/type of identifier
+    * data -- identifier
+    """
+
+    _framespec = [
+        Latin1TextSpec('owner'),
+        BinaryDataSpec('data'),
+    ]
+
+    @property
+    def HashKey(self):
+        return '%s:%s' % (self.FrameID, self.owner)
+
+    def __eq__(s, o):
+        if isinstance(o, UFI):
+            return s.owner == o.owner and s.data == o.data
+        else:
+            return s.data == o
+
+    __hash__ = Frame.__hash__
+
+    def _pprint(self):
+        return "%s=%r" % (self.owner, self.data)
+
+
+@swap_to_string
+class USER(Frame):
+    """Terms of use.
+
+    Attributes:
+
+    * encoding -- text encoding
+    * lang -- ISO three letter language code
+    * text -- licensing terms for the audio
+    """
+
+    _framespec = [
+        EncodingSpec('encoding'),
+        StringSpec('lang', 3),
+        EncodedTextSpec('text'),
+    ]
+
+    @property
+    def HashKey(self):
+        return '%s:%s' % (self.FrameID, self.lang)
+
+    def __bytes__(self):
+        return self.text.encode('utf-8')
+
+    def __str__(self):
+        return self.text
+
+    def __eq__(self, other):
+        return self.text == other
+
+    __hash__ = Frame.__hash__
+
+    def _pprint(self):
+        return "%r=%s" % (self.lang, self.text)
+
+
+@swap_to_string
+class OWNE(Frame):
+    """Ownership frame."""
+
+    _framespec = [
+        EncodingSpec('encoding'),
+        Latin1TextSpec('price'),
+        StringSpec('date', 8),
+        EncodedTextSpec('seller'),
+    ]
+
+    def __bytes__(self):
+        return self.seller.encode('utf-8')
+
+    def __str__(self):
+        return self.seller
+
+    def __eq__(self, other):
+        return self.seller == other
+
+    __hash__ = Frame.__hash__
+
+
+class COMR(FrameOpt):
+    """Commercial frame."""
+
+    _framespec = [
+        EncodingSpec('encoding'),
+        Latin1TextSpec('price'),
+        StringSpec('valid_until', 8),
+        Latin1TextSpec('contact'),
+        ByteSpec('format'),
+        EncodedTextSpec('seller'),
+        EncodedTextSpec('desc'),
+    ]
+
+    _optionalspec = [
+        Latin1TextSpec('mime'),
+        BinaryDataSpec('logo'),
+    ]
+
+    @property
+    def HashKey(self):
+        return '%s:%s' % (self.FrameID, _bytes2key(self._writeData()))
+
+    def __eq__(self, other):
+        return self._writeData() == other._writeData()
+
+    __hash__ = FrameOpt.__hash__
+
+
+@swap_to_string
+class ENCR(Frame):
+    """Encryption method registration.
+
+    The standard does not allow multiple ENCR frames with the same owner
+    or the same method. Mutagen only verifies that the owner is unique.
+    """
+
+    _framespec = [
+        Latin1TextSpec('owner'),
+        ByteSpec('method'),
+        BinaryDataSpec('data'),
+    ]
+
+    @property
+    def HashKey(self):
+        return "%s:%s" % (self.FrameID, self.owner)
+
+    def __bytes__(self):
+        return self.data
+
+    def __eq__(self, other):
+        return self.data == other
+
+    __hash__ = Frame.__hash__
+
+
+@swap_to_string
+class GRID(FrameOpt):
+    """Group identification registration."""
+
+    _framespec = [
+        Latin1TextSpec('owner'),
+        ByteSpec('group'),
+    ]
+
+    _optionalspec = [BinaryDataSpec('data')]
+
+    @property
+    def HashKey(self):
+        return '%s:%s' % (self.FrameID, self.group)
+
+    def __pos__(self):
+        return self.group
+
+    def __bytes__(self):
+        return self.owner.encode('utf-8')
+
+    def __str__(self):
+        return self.owner
+
+    def __eq__(self, other):
+        return self.owner == other or self.group == other
+
+    __hash__ = FrameOpt.__hash__
+
+
+@swap_to_string
+class PRIV(Frame):
+    """Private frame."""
+
+    _framespec = [
+        Latin1TextSpec('owner'),
+        BinaryDataSpec('data'),
+    ]
+
+    @property
+    def HashKey(self):
+        return '%s:%s:%s' % (
+            self.FrameID, self.owner, _bytes2key(self.data))
+
+    def __bytes__(self):
+        return self.data
+
+    def __eq__(self, other):
+        return self.data == other
+
+    def _pprint(self):
+        return "%s=%r" % (self.owner, self.data)
+
+    __hash__ = Frame.__hash__
+
+
+@swap_to_string
+class SIGN(Frame):
+    """Signature frame."""
+
+    _framespec = [
+        ByteSpec('group'),
+        BinaryDataSpec('sig'),
+    ]
+
+    @property
+    def HashKey(self):
+        return '%s:%s:%s' % (self.FrameID, self.group, _bytes2key(self.sig))
+
+    def __bytes__(self):
+        return self.sig
+
+    def __eq__(self, other):
+        return self.sig == other
+
+    __hash__ = Frame.__hash__
+
+
+class SEEK(Frame):
+    """Seek frame.
+
+    Mutagen does not find tags at seek offsets.
+    """
+
+    _framespec = [IntegerSpec('offset')]
+
+    def __pos__(self):
+        return self.offset
+
+    def __eq__(self, other):
+        return self.offset == other
+
+    __hash__ = Frame.__hash__
+
+
+class ASPI(Frame):
+    """Audio seek point index.
+
+    Attributes: S, L, N, b, and Fi. For the meaning of these, see
+    the ID3v2.4 specification. Fi is a list of integers.
+    """
+    _framespec = [
+        SizedIntegerSpec("S", 4),
+        SizedIntegerSpec("L", 4),
+        SizedIntegerSpec("N", 2),
+        ByteSpec("b"),
+        ASPIIndexSpec("Fi"),
+    ]
+
+    def __eq__(self, other):
+        return self.Fi == other
+
+    __hash__ = Frame.__hash__
+
+
+# ID3v2.2 frames
+class UFI(UFID):
+    "Unique File Identifier"
+
+
+class TT1(TIT1):
+    "Content group description"
+
+
+class TT2(TIT2):
+    "Title"
+
+
+class TT3(TIT3):
+    "Subtitle/Description refinement"
+
+
+class TP1(TPE1):
+    "Lead Artist/Performer/Soloist/Group"
+
+
+class TP2(TPE2):
+    "Band/Orchestra/Accompaniment"
+
+
+class TP3(TPE3):
+    "Conductor"
+
+
+class TP4(TPE4):
+    "Interpreter/Remixer/Modifier"
+
+
+class TCM(TCOM):
+    "Composer"
+
+
+class TXT(TEXT):
+    "Lyricist"
+
+
+class TLA(TLAN):
+    "Audio Language(s)"
+
+
+class TCO(TCON):
+    "Content Type (Genre)"
+
+
+class TAL(TALB):
+    "Album"
+
+
+class TPA(TPOS):
+    "Part of set"
+
+
+class TRK(TRCK):
+    "Track Number"
+
+
+class TRC(TSRC):
+    "International Standard Recording Code (ISRC)"
+
+
+class TYE(TYER):
+    "Year of recording"
+
+
+class TDA(TDAT):
+    "Date of recording (DDMM)"
+
+
+class TIM(TIME):
+    "Time of recording (HHMM)"
+
+
+class TRD(TRDA):
+    "Recording Dates"
+
+
+class TMT(TMED):
+    "Source Media Type"
+
+
+class TFT(TFLT):
+    "File Type"
+
+
+class TBP(TBPM):
+    "Beats per minute"
+
+
+class TCP(TCMP):
+    "iTunes Compilation Flag"
+
+
+class TCR(TCOP):
+    "Copyright (C)"
+
+
+class TPB(TPUB):
+    "Publisher"
+
+
+class TEN(TENC):
+    "Encoder"
+
+
+class TSS(TSSE):
+    "Encoder settings"
+
+
+class TOF(TOFN):
+    "Original Filename"
+
+
+class TLE(TLEN):
+    "Audio Length (ms)"
+
+
+class TSI(TSIZ):
+    "Audio Data size (bytes)"
+
+
+class TDY(TDLY):
+    "Audio Delay (ms)"
+
+
+class TKE(TKEY):
+    "Starting Key"
+
+
+class TOT(TOAL):
+    "Original Album"
+
+
+class TOA(TOPE):
+    "Original Artist/Perfomer"
+
+
+class TOL(TOLY):
+    "Original Lyricist"
+
+
+class TOR(TORY):
+    "Original Release Year"
+
+
+class TXX(TXXX):
+    "User-defined Text"
+
+
+class WAF(WOAF):
+    "Official File Information"
+
+
+class WAR(WOAR):
+    "Official Artist/Performer Information"
+
+
+class WAS(WOAS):
+    "Official Source Information"
+
+
+class WCM(WCOM):
+    "Commercial Information"
+
+
+class WCP(WCOP):
+    "Copyright Information"
+
+
+class WPB(WPUB):
+    "Official Publisher Information"
+
+
+class WXX(WXXX):
+    "User-defined URL"
+
+
+class IPL(IPLS):
+    "Involved people list"
+
+
+class MCI(MCDI):
+    "Binary dump of CD's TOC"
+
+
+class ETC(ETCO):
+    "Event timing codes"
+
+
+class MLL(MLLT):
+    "MPEG location lookup table"
+
+
+class STC(SYTC):
+    "Synced tempo codes"
+
+
+class ULT(USLT):
+    "Unsychronised lyrics/text transcription"
+
+
+class SLT(SYLT):
+    "Synchronised lyrics/text"
+
+
+class COM(COMM):
+    "Comment"
+
+
+# class RVA(RVAD)
+# class EQU(EQUA)
+
+
+class REV(RVRB):
+    "Reverb"
+
+
+class PIC(APIC):
+    """Attached Picture.
+
+    The 'mime' attribute of an ID3v2.2 attached picture must be either
+    'PNG' or 'JPG'.
+    """
+
+    _framespec = [
+        EncodingSpec('encoding'),
+        StringSpec('mime', 3),
+        ByteSpec('type'),
+        EncodedTextSpec('desc'),
+        BinaryDataSpec('data')
+    ]
+
+    def _to_other(self, other):
+        if not isinstance(other, APIC):
+            raise TypeError
+
+        other.encoding = self.encoding
+        other.mime = self.mime
+        other.type = self.type
+        other.desc = self.desc
+        other.data = self.data
+
+
+class GEO(GEOB):
+    "General Encapsulated Object"
+
+
+class CNT(PCNT):
+    "Play counter"
+
+
+class POP(POPM):
+    "Popularimeter"
+
+
+class BUF(RBUF):
+    "Recommended buffer size"
+
+
+class CRM(Frame):
+    """Encrypted meta frame"""
+    _framespec = [Latin1TextSpec('owner'), Latin1TextSpec('desc'),
+                  BinaryDataSpec('data')]
+
+    def __eq__(self, other):
+        return self.data == other
+    __hash__ = Frame.__hash__
+
+
+class CRA(AENC):
+    "Audio encryption"
+
+
+class LNK(LINK):
+    """Linked information"""
+
+    _framespec = [
+        StringSpec('frameid', 3),
+        Latin1TextSpec('url')
+    ]
+
+    _optionalspec = [BinaryDataSpec('data')]
+
+    def _to_other(self, other):
+        if not isinstance(other, LINK):
+            raise TypeError
+
+        other.frameid = self.frameid
+        other.url = self.url
+        if hasattr(self, "data"):
+            other.data = self.data
+
+
+Frames = {}
+"""All supported ID3v2.3/4 frames, keyed by frame name."""
+
+
+Frames_2_2 = {}
+"""All supported ID3v2.2 frames, keyed by frame name."""
+
+
+k, v = None, None
+for k, v in iteritems(globals()):
+    if isinstance(v, type) and issubclass(v, Frame):
+        v.__module__ = "mutagen.id3"
+
+        if len(k) == 3:
+            Frames_2_2[k] = v
+        elif len(k) == 4:
+            Frames[k] = v
+
+try:
+    del k
+    del v
+except NameError:
+    pass
diff --git a/lib/mutagen/id3/_specs.py b/lib/mutagen/id3/_specs.py
new file mode 100644
index 00000000..351d5319
--- /dev/null
+++ b/lib/mutagen/id3/_specs.py
@@ -0,0 +1,543 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2005  Michael Urman
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+
+import struct
+from struct import unpack, pack
+from warnings import warn
+
+from .._compat import text_type, chr_, PY3, swap_to_string, string_types
+from .._util import total_ordering, decode_terminated, enum
+from ._util import ID3JunkFrameError, ID3Warning, BitPaddedInt
+
+
+class Spec(object):
+
+    def __init__(self, name):
+        self.name = name
+
+    def __hash__(self):
+        raise TypeError("Spec objects are unhashable")
+
+    def _validate23(self, frame, value, **kwargs):
+        """Return a possibly modified value which, if written,
+        results in valid id3v2.3 data.
+        """
+
+        return value
+
+    def read(self, frame, value):
+        raise NotImplementedError
+
+    def write(self, frame, value):
+        raise NotImplementedError
+
+    def validate(self, frame, value):
+        """Returns the validated data or raises ValueError/TypeError"""
+
+        raise NotImplementedError
+
+
+class ByteSpec(Spec):
+    def read(self, frame, data):
+        return bytearray(data)[0], data[1:]
+
+    def write(self, frame, value):
+        return chr_(value)
+
+    def validate(self, frame, value):
+        if value is not None:
+            chr_(value)
+        return value
+
+
+class IntegerSpec(Spec):
+    def read(self, frame, data):
+        return int(BitPaddedInt(data, bits=8)), b''
+
+    def write(self, frame, value):
+        return BitPaddedInt.to_str(value, bits=8, width=-1)
+
+    def validate(self, frame, value):
+        return value
+
+
+class SizedIntegerSpec(Spec):
+    def __init__(self, name, size):
+        self.name, self.__sz = name, size
+
+    def read(self, frame, data):
+        return int(BitPaddedInt(data[:self.__sz], bits=8)), data[self.__sz:]
+
+    def write(self, frame, value):
+        return BitPaddedInt.to_str(value, bits=8, width=self.__sz)
+
+    def validate(self, frame, value):
+        return value
+
+
+@enum
+class Encoding(object):
+    LATIN1 = 0
+    UTF16 = 1
+    UTF16BE = 2
+    UTF8 = 3
+
+
+class EncodingSpec(ByteSpec):
+    def read(self, frame, data):
+        enc, data = super(EncodingSpec, self).read(frame, data)
+        if enc < 16:
+            return enc, data
+        else:
+            return 0, chr_(enc) + data
+
+    def validate(self, frame, value):
+        if value is None:
+            return None
+        if 0 <= value <= 3:
+            return value
+        raise ValueError('Invalid Encoding: %r' % value)
+
+    def _validate23(self, frame, value, **kwargs):
+        # only 0, 1 are valid in v2.3, default to utf-16
+        return min(1, value)
+
+
+class StringSpec(Spec):
+    """A fixed size ASCII only payload."""
+
+    def __init__(self, name, length):
+        super(StringSpec, self).__init__(name)
+        self.len = length
+
+    def read(s, frame, data):
+        chunk = data[:s.len]
+        try:
+            ascii = chunk.decode("ascii")
+        except UnicodeDecodeError:
+            raise ID3JunkFrameError("not ascii")
+        else:
+            if PY3:
+                chunk = ascii
+
+        return chunk, data[s.len:]
+
+    def write(s, frame, value):
+        if value is None:
+            return b'\x00' * s.len
+        else:
+            if PY3:
+                value = value.encode("ascii")
+            return (bytes(value) + b'\x00' * s.len)[:s.len]
+
+    def validate(s, frame, value):
+        if value is None:
+            return None
+
+        if PY3:
+            if not isinstance(value, str):
+                raise TypeError("%s has to be str" % s.name)
+            value.encode("ascii")
+        else:
+            if not isinstance(value, bytes):
+                value = value.encode("ascii")
+
+        if len(value) == s.len:
+            return value
+
+        raise ValueError('Invalid StringSpec[%d] data: %r' % (s.len, value))
+
+
+class BinaryDataSpec(Spec):
+    def read(self, frame, data):
+        return data, b''
+
+    def write(self, frame, value):
+        if value is None:
+            return b""
+        if isinstance(value, bytes):
+            return value
+        value = text_type(value).encode("ascii")
+        return value
+
+    def validate(self, frame, value):
+        if value is None:
+            return None
+
+        if isinstance(value, bytes):
+            return value
+        elif PY3:
+            raise TypeError("%s has to be bytes" % self.name)
+
+        value = text_type(value).encode("ascii")
+        return value
+
+
+class EncodedTextSpec(Spec):
+    # Okay, seriously. This is private and defined explicitly and
+    # completely by the ID3 specification. You can't just add
+    # encodings here however you want.
+    _encodings = (
+        ('latin1', b'\x00'),
+        ('utf16', b'\x00\x00'),
+        ('utf_16_be', b'\x00\x00'),
+        ('utf8', b'\x00')
+    )
+
+    def read(self, frame, data):
+        enc, term = self._encodings[frame.encoding]
+        try:
+            # allow missing termination
+            return decode_terminated(data, enc, strict=False)
+        except ValueError:
+            # utf-16 termination with missing BOM, or single NULL
+            if not data[:len(term)].strip(b"\x00"):
+                return u"", data[len(term):]
+
+            # utf-16 data with single NULL, see issue 169
+            try:
+                return decode_terminated(data + b"\x00", enc)
+            except ValueError:
+                raise ID3JunkFrameError
+
+    def write(self, frame, value):
+        enc, term = self._encodings[frame.encoding]
+        return value.encode(enc) + term
+
+    def validate(self, frame, value):
+        return text_type(value)
+
+
+class MultiSpec(Spec):
+    def __init__(self, name, *specs, **kw):
+        super(MultiSpec, self).__init__(name)
+        self.specs = specs
+        self.sep = kw.get('sep')
+
+    def read(self, frame, data):
+        values = []
+        while data:
+            record = []
+            for spec in self.specs:
+                value, data = spec.read(frame, data)
+                record.append(value)
+            if len(self.specs) != 1:
+                values.append(record)
+            else:
+                values.append(record[0])
+        return values, data
+
+    def write(self, frame, value):
+        data = []
+        if len(self.specs) == 1:
+            for v in value:
+                data.append(self.specs[0].write(frame, v))
+        else:
+            for record in value:
+                for v, s in zip(record, self.specs):
+                    data.append(s.write(frame, v))
+        return b''.join(data)
+
+    def validate(self, frame, value):
+        if value is None:
+            return []
+        if self.sep and isinstance(value, string_types):
+            value = value.split(self.sep)
+        if isinstance(value, list):
+            if len(self.specs) == 1:
+                return [self.specs[0].validate(frame, v) for v in value]
+            else:
+                return [
+                    [s.validate(frame, v) for (v, s) in zip(val, self.specs)]
+                    for val in value]
+        raise ValueError('Invalid MultiSpec data: %r' % value)
+
+    def _validate23(self, frame, value, **kwargs):
+        if len(self.specs) != 1:
+            return [[s._validate23(frame, v, **kwargs)
+                     for (v, s) in zip(val, self.specs)]
+                    for val in value]
+
+        spec = self.specs[0]
+
+        # Merge single text spec multispecs only.
+        # (TimeStampSpec beeing the exception, but it's not a valid v2.3 frame)
+        if not isinstance(spec, EncodedTextSpec) or \
+                isinstance(spec, TimeStampSpec):
+            return value
+
+        value = [spec._validate23(frame, v, **kwargs) for v in value]
+        if kwargs.get("sep") is not None:
+            return [spec.validate(frame, kwargs["sep"].join(value))]
+        return value
+
+
+class EncodedNumericTextSpec(EncodedTextSpec):
+    pass
+
+
+class EncodedNumericPartTextSpec(EncodedTextSpec):
+    pass
+
+
+class Latin1TextSpec(EncodedTextSpec):
+    def read(self, frame, data):
+        if b'\x00' in data:
+            data, ret = data.split(b'\x00', 1)
+        else:
+            ret = b''
+        return data.decode('latin1'), ret
+
+    def write(self, data, value):
+        return value.encode('latin1') + b'\x00'
+
+    def validate(self, frame, value):
+        return text_type(value)
+
+
+@swap_to_string
+@total_ordering
+class ID3TimeStamp(object):
+    """A time stamp in ID3v2 format.
+
+    This is a restricted form of the ISO 8601 standard; time stamps
+    take the form of:
+        YYYY-MM-DD HH:MM:SS
+    Or some partial form (YYYY-MM-DD HH, YYYY, etc.).
+
+    The 'text' attribute contains the raw text data of the time stamp.
+    """
+
+    import re
+
+    def __init__(self, text):
+        if isinstance(text, ID3TimeStamp):
+            text = text.text
+        elif not isinstance(text, text_type):
+            if PY3:
+                raise TypeError("not a str")
+            text = text.decode("utf-8")
+
+        self.text = text
+
+    __formats = ['%04d'] + ['%02d'] * 5
+    __seps = ['-', '-', ' ', ':', ':', 'x']
+
+    def get_text(self):
+        parts = [self.year, self.month, self.day,
+                 self.hour, self.minute, self.second]
+        pieces = []
+        for i, part in enumerate(parts):
+            if part is None:
+                break
+            pieces.append(self.__formats[i] % part + self.__seps[i])
+        return u''.join(pieces)[:-1]
+
+    def set_text(self, text, splitre=re.compile('[-T:/.]|\s+')):
+        year, month, day, hour, minute, second = \
+            splitre.split(text + ':::::')[:6]
+        for a in 'year month day hour minute second'.split():
+            try:
+                v = int(locals()[a])
+            except ValueError:
+                v = None
+            setattr(self, a, v)
+
+    text = property(get_text, set_text, doc="ID3v2.4 date and time.")
+
+    def __str__(self):
+        return self.text
+
+    def __bytes__(self):
+        return self.text.encode("utf-8")
+
+    def __repr__(self):
+        return repr(self.text)
+
+    def __eq__(self, other):
+        return self.text == other.text
+
+    def __lt__(self, other):
+        return self.text < other.text
+
+    __hash__ = object.__hash__
+
+    def encode(self, *args):
+        return self.text.encode(*args)
+
+
+class TimeStampSpec(EncodedTextSpec):
+    def read(self, frame, data):
+        value, data = super(TimeStampSpec, self).read(frame, data)
+        return self.validate(frame, value), data
+
+    def write(self, frame, data):
+        return super(TimeStampSpec, self).write(frame,
+                                                data.text.replace(' ', 'T'))
+
+    def validate(self, frame, value):
+        try:
+            return ID3TimeStamp(value)
+        except TypeError:
+            raise ValueError("Invalid ID3TimeStamp: %r" % value)
+
+
+class ChannelSpec(ByteSpec):
+    (OTHER, MASTER, FRONTRIGHT, FRONTLEFT, BACKRIGHT, BACKLEFT, FRONTCENTRE,
+     BACKCENTRE, SUBWOOFER) = range(9)
+
+
+class VolumeAdjustmentSpec(Spec):
+    def read(self, frame, data):
+        value, = unpack('>h', data[0:2])
+        return value / 512.0, data[2:]
+
+    def write(self, frame, value):
+        number = int(round(value * 512))
+        # pack only fails in 2.7, do it manually in 2.6
+        if not -32768 <= number <= 32767:
+            raise struct.error
+        return pack('>h', number)
+
+    def validate(self, frame, value):
+        if value is not None:
+            try:
+                self.write(frame, value)
+            except struct.error:
+                raise ValueError("out of range")
+        return value
+
+
+class VolumePeakSpec(Spec):
+    def read(self, frame, data):
+        # http://bugs.xmms.org/attachment.cgi?id=113&action=view
+        peak = 0
+        data_array = bytearray(data)
+        bits = data_array[0]
+        vol_bytes = min(4, (bits + 7) >> 3)
+        # not enough frame data
+        if vol_bytes + 1 > len(data):
+            raise ID3JunkFrameError
+        shift = ((8 - (bits & 7)) & 7) + (4 - vol_bytes) * 8
+        for i in range(1, vol_bytes + 1):
+            peak *= 256
+            peak += data_array[i]
+        peak *= 2 ** shift
+        return (float(peak) / (2 ** 31 - 1)), data[1 + vol_bytes:]
+
+    def write(self, frame, value):
+        number = int(round(value * 32768))
+        # pack only fails in 2.7, do it manually in 2.6
+        if not 0 <= number <= 65535:
+            raise struct.error
+        # always write as 16 bits for sanity.
+        return b"\x10" + pack('>H', number)
+
+    def validate(self, frame, value):
+        if value is not None:
+            try:
+                self.write(frame, value)
+            except struct.error:
+                raise ValueError("out of range")
+        return value
+
+
+class SynchronizedTextSpec(EncodedTextSpec):
+    def read(self, frame, data):
+        texts = []
+        encoding, term = self._encodings[frame.encoding]
+        while data:
+            try:
+                value, data = decode_terminated(data, encoding)
+            except ValueError:
+                raise ID3JunkFrameError
+
+            if len(data) < 4:
+                raise ID3JunkFrameError
+            time, = struct.unpack(">I", data[:4])
+
+            texts.append((value, time))
+            data = data[4:]
+        return texts, b""
+
+    def write(self, frame, value):
+        data = []
+        encoding, term = self._encodings[frame.encoding]
+        for text, time in value:
+            text = text.encode(encoding) + term
+            data.append(text + struct.pack(">I", time))
+        return b"".join(data)
+
+    def validate(self, frame, value):
+        return value
+
+
+class KeyEventSpec(Spec):
+    def read(self, frame, data):
+        events = []
+        while len(data) >= 5:
+            events.append(struct.unpack(">bI", data[:5]))
+            data = data[5:]
+        return events, data
+
+    def write(self, frame, value):
+        return b"".join(struct.pack(">bI", *event) for event in value)
+
+    def validate(self, frame, value):
+        return value
+
+
+class VolumeAdjustmentsSpec(Spec):
+    # Not to be confused with VolumeAdjustmentSpec.
+    def read(self, frame, data):
+        adjustments = {}
+        while len(data) >= 4:
+            freq, adj = struct.unpack(">Hh", data[:4])
+            data = data[4:]
+            freq /= 2.0
+            adj /= 512.0
+            adjustments[freq] = adj
+        adjustments = sorted(adjustments.items())
+        return adjustments, data
+
+    def write(self, frame, value):
+        value.sort()
+        return b"".join(struct.pack(">Hh", int(freq * 2), int(adj * 512))
+                        for (freq, adj) in value)
+
+    def validate(self, frame, value):
+        return value
+
+
+class ASPIIndexSpec(Spec):
+    def read(self, frame, data):
+        if frame.b == 16:
+            format = "H"
+            size = 2
+        elif frame.b == 8:
+            format = "B"
+            size = 1
+        else:
+            warn("invalid bit count in ASPI (%d)" % frame.b, ID3Warning)
+            return [], data
+
+        indexes = data[:frame.N * size]
+        data = data[frame.N * size:]
+        return list(struct.unpack(">" + format * frame.N, indexes)), data
+
+    def write(self, frame, values):
+        if frame.b == 16:
+            format = "H"
+        elif frame.b == 8:
+            format = "B"
+        else:
+            raise ValueError("frame.b must be 8 or 16")
+        return struct.pack(">" + format * frame.N, *values)
+
+    def validate(self, frame, values):
+        return values
diff --git a/lib/mutagen/id3/_util.py b/lib/mutagen/id3/_util.py
new file mode 100644
index 00000000..363953e7
--- /dev/null
+++ b/lib/mutagen/id3/_util.py
@@ -0,0 +1,165 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2005  Michael Urman
+#               2013  Christoph Reiter
+#               2014  Ben Ockmore
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+
+from .._compat import long_, integer_types
+from .._util import MutagenError
+
+
+class error(MutagenError):
+    pass
+
+
+class ID3NoHeaderError(error, ValueError):
+    pass
+
+
+class ID3BadUnsynchData(error, ValueError):
+    pass
+
+
+class ID3BadCompressedData(error, ValueError):
+    pass
+
+
+class ID3TagError(error, ValueError):
+    pass
+
+
+class ID3UnsupportedVersionError(error, NotImplementedError):
+    pass
+
+
+class ID3EncryptionUnsupportedError(error, NotImplementedError):
+    pass
+
+
+class ID3JunkFrameError(error, ValueError):
+    pass
+
+
+class ID3Warning(error, UserWarning):
+    pass
+
+
+class unsynch(object):
+    @staticmethod
+    def decode(value):
+        fragments = bytearray(value).split(b'\xff')
+        if len(fragments) > 1 and not fragments[-1]:
+            raise ValueError('string ended unsafe')
+
+        for f in fragments[1:]:
+            if (not f) or (f[0] >= 0xE0):
+                raise ValueError('invalid sync-safe string')
+
+            if f[0] == 0x00:
+                del f[0]
+
+        return bytes(bytearray(b'\xff').join(fragments))
+
+    @staticmethod
+    def encode(value):
+        fragments = bytearray(value).split(b'\xff')
+        for f in fragments[1:]:
+            if (not f) or (f[0] >= 0xE0) or (f[0] == 0x00):
+                f.insert(0, 0x00)
+        return bytes(bytearray(b'\xff').join(fragments))
+
+
+class _BitPaddedMixin(object):
+
+    def as_str(self, width=4, minwidth=4):
+        return self.to_str(self, self.bits, self.bigendian, width, minwidth)
+
+    @staticmethod
+    def to_str(value, bits=7, bigendian=True, width=4, minwidth=4):
+        mask = (1 << bits) - 1
+
+        if width != -1:
+            index = 0
+            bytes_ = bytearray(width)
+            try:
+                while value:
+                    bytes_[index] = value & mask
+                    value >>= bits
+                    index += 1
+            except IndexError:
+                raise ValueError('Value too wide (>%d bytes)' % width)
+        else:
+            # PCNT and POPM use growing integers
+            # of at least 4 bytes (=minwidth) as counters.
+            bytes_ = bytearray()
+            append = bytes_.append
+            while value:
+                append(value & mask)
+                value >>= bits
+            bytes_ = bytes_.ljust(minwidth, b"\x00")
+
+        if bigendian:
+            bytes_.reverse()
+        return bytes(bytes_)
+
+    @staticmethod
+    def has_valid_padding(value, bits=7):
+        """Whether the padding bits are all zero"""
+
+        assert bits <= 8
+
+        mask = (((1 << (8 - bits)) - 1) << bits)
+
+        if isinstance(value, integer_types):
+            while value:
+                if value & mask:
+                    return False
+                value >>= 8
+        elif isinstance(value, bytes):
+            for byte in bytearray(value):
+                if byte & mask:
+                    return False
+        else:
+            raise TypeError
+
+        return True
+
+
+class BitPaddedInt(int, _BitPaddedMixin):
+
+    def __new__(cls, value, bits=7, bigendian=True):
+
+        mask = (1 << (bits)) - 1
+        numeric_value = 0
+        shift = 0
+
+        if isinstance(value, integer_types):
+            while value:
+                numeric_value += (value & mask) << shift
+                value >>= 8
+                shift += bits
+        elif isinstance(value, bytes):
+            if bigendian:
+                value = reversed(value)
+            for byte in bytearray(value):
+                numeric_value += (byte & mask) << shift
+                shift += bits
+        else:
+            raise TypeError
+
+        if isinstance(numeric_value, int):
+            self = int.__new__(BitPaddedInt, numeric_value)
+        else:
+            self = long_.__new__(BitPaddedLong, numeric_value)
+
+        self.bits = bits
+        self.bigendian = bigendian
+        return self
+
+
+class BitPaddedLong(long_, _BitPaddedMixin):
+    pass
diff --git a/lib/mutagen/m4a.py b/lib/mutagen/m4a.py
new file mode 100644
index 00000000..b8fa9784
--- /dev/null
+++ b/lib/mutagen/m4a.py
@@ -0,0 +1,545 @@
+# Copyright 2006 Joe Wreschnig
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+
+import sys
+
+if sys.version_info[0] != 2:
+    raise ImportError("No longer available with Python 3, use mutagen.mp4")
+
+"""Read and write MPEG-4 audio files with iTunes metadata.
+
+This module will read MPEG-4 audio information and metadata,
+as found in Apple's M4A (aka MP4, M4B, M4P) files.
+
+There is no official specification for this format. The source code
+for TagLib, FAAD, and various MPEG specifications at
+http://developer.apple.com/documentation/QuickTime/QTFF/,
+http://www.geocities.com/xhelmboyx/quicktime/formats/mp4-layout.txt,
+and http://wiki.multimedia.cx/index.php?title=Apple_QuickTime were all
+consulted.
+
+This module does not support 64 bit atom sizes, and so will not
+work on metadata over 4GB.
+"""
+
+import struct
+import sys
+
+from cStringIO import StringIO
+
+from ._compat import reraise
+from mutagen import FileType, Metadata, StreamInfo
+from mutagen._constants import GENRES
+from mutagen._util import cdata, insert_bytes, delete_bytes, DictProxy, \
+    MutagenError
+
+
+class error(IOError, MutagenError):
+    pass
+
+
+class M4AMetadataError(error):
+    pass
+
+
+class M4AStreamInfoError(error):
+    pass
+
+
+class M4AMetadataValueError(ValueError, M4AMetadataError):
+    pass
+
+
+import warnings
+warnings.warn(
+    "mutagen.m4a is deprecated; use mutagen.mp4 instead.", DeprecationWarning)
+
+
+# This is not an exhaustive list of container atoms, but just the
+# ones this module needs to peek inside.
+_CONTAINERS = ["moov", "udta", "trak", "mdia", "meta", "ilst",
+               "stbl", "minf", "stsd"]
+_SKIP_SIZE = {"meta": 4}
+
+__all__ = ['M4A', 'Open', 'delete', 'M4ACover']
+
+
+class M4ACover(str):
+    """A cover artwork.
+
+    Attributes:
+    imageformat -- format of the image (either FORMAT_JPEG or FORMAT_PNG)
+    """
+    FORMAT_JPEG = 0x0D
+    FORMAT_PNG = 0x0E
+
+    def __new__(cls, data, imageformat=None):
+        self = str.__new__(cls, data)
+        if imageformat is None:
+            imageformat = M4ACover.FORMAT_JPEG
+        self.imageformat = imageformat
+        try:
+            self.format
+        except AttributeError:
+            self.format = imageformat
+        return self
+
+
+class Atom(object):
+    """An individual atom.
+
+    Attributes:
+    children -- list child atoms (or None for non-container atoms)
+    length -- length of this atom, including length and name
+    name -- four byte name of the atom, as a str
+    offset -- location in the constructor-given fileobj of this atom
+
+    This structure should only be used internally by Mutagen.
+    """
+
+    children = None
+
+    def __init__(self, fileobj):
+        self.offset = fileobj.tell()
+        self.length, self.name = struct.unpack(">I4s", fileobj.read(8))
+        if self.length == 1:
+            raise error("64 bit atom sizes are not supported")
+        elif self.length < 8:
+            return
+
+        if self.name in _CONTAINERS:
+            self.children = []
+            fileobj.seek(_SKIP_SIZE.get(self.name, 0), 1)
+            while fileobj.tell() < self.offset + self.length:
+                self.children.append(Atom(fileobj))
+        else:
+            fileobj.seek(self.offset + self.length, 0)
+
+    @staticmethod
+    def render(name, data):
+        """Render raw atom data."""
+        # this raises OverflowError if Py_ssize_t can't handle the atom data
+        size = len(data) + 8
+        if size <= 0xFFFFFFFF:
+            return struct.pack(">I4s", size, name) + data
+        else:
+            return struct.pack(">I4sQ", 1, name, size + 8) + data
+
+    def __getitem__(self, remaining):
+        """Look up a child atom, potentially recursively.
+
+        e.g. atom['udta', 'meta'] => <Atom name='meta' ...>
+        """
+        if not remaining:
+            return self
+        elif self.children is None:
+            raise KeyError("%r is not a container" % self.name)
+        for child in self.children:
+            if child.name == remaining[0]:
+                return child[remaining[1:]]
+        else:
+            raise KeyError("%r not found" % remaining[0])
+
+    def __repr__(self):
+        klass = self.__class__.__name__
+        if self.children is None:
+            return "<%s name=%r length=%r offset=%r>" % (
+                klass, self.name, self.length, self.offset)
+        else:
+            children = "\n".join([" " + line for child in self.children
+                                  for line in repr(child).splitlines()])
+            return "<%s name=%r length=%r offset=%r\n%s>" % (
+                klass, self.name, self.length, self.offset, children)
+
+
+class Atoms(object):
+    """Root atoms in a given file.
+
+    Attributes:
+    atoms -- a list of top-level atoms as Atom objects
+
+    This structure should only be used internally by Mutagen.
+    """
+    def __init__(self, fileobj):
+        self.atoms = []
+        fileobj.seek(0, 2)
+        end = fileobj.tell()
+        fileobj.seek(0)
+        while fileobj.tell() < end:
+            self.atoms.append(Atom(fileobj))
+
+    def path(self, *names):
+        """Look up and return the complete path of an atom.
+
+        For example, atoms.path('moov', 'udta', 'meta') will return a
+        list of three atoms, corresponding to the moov, udta, and meta
+        atoms.
+        """
+        path = [self]
+        for name in names:
+            path.append(path[-1][name, ])
+        return path[1:]
+
+    def __getitem__(self, names):
+        """Look up a child atom.
+
+        'names' may be a list of atoms (['moov', 'udta']) or a string
+        specifying the complete path ('moov.udta').
+        """
+        if isinstance(names, basestring):
+            names = names.split(".")
+        for child in self.atoms:
+            if child.name == names[0]:
+                return child[names[1:]]
+        else:
+            raise KeyError("%s not found" % names[0])
+
+    def __repr__(self):
+        return "\n".join([repr(child) for child in self.atoms])
+
+
+class M4ATags(DictProxy, Metadata):
+    """Dictionary containing Apple iTunes metadata list key/values.
+
+    Keys are four byte identifiers, except for freeform ('----')
+    keys. Values are usually unicode strings, but some atoms have a
+    special structure:
+        cpil -- boolean
+        trkn, disk -- tuple of 16 bit ints (current, total)
+        tmpo -- 16 bit int
+        covr -- list of M4ACover objects (which are tagged strs)
+        gnre -- not supported. Use '\\xa9gen' instead.
+
+    The freeform '----' frames use a key in the format '----:mean:name'
+    where 'mean' is usually 'com.apple.iTunes' and 'name' is a unique
+    identifier for this frame. The value is a str, but is probably
+    text that can be decoded as UTF-8.
+
+    M4A tag data cannot exist outside of the structure of an M4A file,
+    so this class should not be manually instantiated.
+
+    Unknown non-text tags are removed.
+    """
+
+    def load(self, atoms, fileobj):
+        try:
+            ilst = atoms["moov.udta.meta.ilst"]
+        except KeyError as key:
+            raise M4AMetadataError(key)
+        for atom in ilst.children:
+            fileobj.seek(atom.offset + 8)
+            data = fileobj.read(atom.length - 8)
+            parse = self.__atoms.get(atom.name, (M4ATags.__parse_text,))[0]
+            parse(self, atom, data)
+
+    @staticmethod
+    def __key_sort(item1, item2):
+        (key1, v1) = item1
+        (key2, v2) = item2
+        # iTunes always writes the tags in order of "relevance", try
+        # to copy it as closely as possible.
+        order = ["\xa9nam", "\xa9ART", "\xa9wrt", "\xa9alb",
+                 "\xa9gen", "gnre", "trkn", "disk",
+                 "\xa9day", "cpil", "tmpo", "\xa9too",
+                 "----", "covr", "\xa9lyr"]
+        order = dict(zip(order, range(len(order))))
+        last = len(order)
+        # If there's no key-based way to distinguish, order by length.
+        # If there's still no way, go by string comparison on the
+        # values, so we at least have something determinstic.
+        return (cmp(order.get(key1[:4], last), order.get(key2[:4], last)) or
+                cmp(len(v1), len(v2)) or cmp(v1, v2))
+
+    def save(self, filename):
+        """Save the metadata to the given filename."""
+        values = []
+        items = self.items()
+        items.sort(self.__key_sort)
+        for key, value in items:
+            render = self.__atoms.get(
+                key[:4], (None, M4ATags.__render_text))[1]
+            values.append(render(self, key, value))
+        data = Atom.render("ilst", "".join(values))
+
+        # Find the old atoms.
+        fileobj = open(filename, "rb+")
+        try:
+            atoms = Atoms(fileobj)
+
+            moov = atoms["moov"]
+
+            if moov != atoms.atoms[-1]:
+                # "Free" the old moov block. Something in the mdat
+                # block is not happy when its offset changes and it
+                # won't play back. So, rather than try to figure that
+                # out, just move the moov atom to the end of the file.
+                offset = self.__move_moov(fileobj, moov)
+            else:
+                offset = 0
+
+            try:
+                path = atoms.path("moov", "udta", "meta", "ilst")
+            except KeyError:
+                self.__save_new(fileobj, atoms, data, offset)
+            else:
+                self.__save_existing(fileobj, atoms, path, data, offset)
+        finally:
+            fileobj.close()
+
+    def __move_moov(self, fileobj, moov):
+        fileobj.seek(moov.offset)
+        data = fileobj.read(moov.length)
+        fileobj.seek(moov.offset)
+        free = Atom.render("free", "\x00" * (moov.length - 8))
+        fileobj.write(free)
+        fileobj.seek(0, 2)
+        # Figure out how far we have to shift all our successive
+        # seek calls, relative to what the atoms say.
+        old_end = fileobj.tell()
+        fileobj.write(data)
+        return old_end - moov.offset
+
+    def __save_new(self, fileobj, atoms, ilst, offset):
+        hdlr = Atom.render("hdlr", "\x00" * 8 + "mdirappl" + "\x00" * 9)
+        meta = Atom.render("meta", "\x00\x00\x00\x00" + hdlr + ilst)
+        moov, udta = atoms.path("moov", "udta")
+        insert_bytes(fileobj, len(meta), udta.offset + offset + 8)
+        fileobj.seek(udta.offset + offset + 8)
+        fileobj.write(meta)
+        self.__update_parents(fileobj, [moov, udta], len(meta), offset)
+
+    def __save_existing(self, fileobj, atoms, path, data, offset):
+        # Replace the old ilst atom.
+        ilst = path.pop()
+        delta = len(data) - ilst.length
+        fileobj.seek(ilst.offset + offset)
+        if delta > 0:
+            insert_bytes(fileobj, delta, ilst.offset + offset)
+        elif delta < 0:
+            delete_bytes(fileobj, -delta, ilst.offset + offset)
+        fileobj.seek(ilst.offset + offset)
+        fileobj.write(data)
+        self.__update_parents(fileobj, path, delta, offset)
+
+    def __update_parents(self, fileobj, path, delta, offset):
+        # Update all parent atoms with the new size.
+        for atom in path:
+            fileobj.seek(atom.offset + offset)
+            size = cdata.uint_be(fileobj.read(4)) + delta
+            fileobj.seek(atom.offset + offset)
+            fileobj.write(cdata.to_uint_be(size))
+
+    def __render_data(self, key, flags, data):
+        data = struct.pack(">2I", flags, 0) + data
+        return Atom.render(key, Atom.render("data", data))
+
+    def __parse_freeform(self, atom, data):
+        try:
+            fileobj = StringIO(data)
+            mean_length = cdata.uint_be(fileobj.read(4))
+            # skip over 8 bytes of atom name, flags
+            mean = fileobj.read(mean_length - 4)[8:]
+            name_length = cdata.uint_be(fileobj.read(4))
+            name = fileobj.read(name_length - 4)[8:]
+            value_length = cdata.uint_be(fileobj.read(4))
+            # Name, flags, and reserved bytes
+            value = fileobj.read(value_length - 4)[12:]
+        except struct.error:
+            # Some ---- atoms have no data atom, I have no clue why
+            # they actually end up in the file.
+            pass
+        else:
+            self["%s:%s:%s" % (atom.name, mean, name)] = value
+
+    def __render_freeform(self, key, value):
+        dummy, mean, name = key.split(":", 2)
+        mean = struct.pack(">I4sI", len(mean) + 12, "mean", 0) + mean
+        name = struct.pack(">I4sI", len(name) + 12, "name", 0) + name
+        value = struct.pack(">I4s2I", len(value) + 16, "data", 0x1, 0) + value
+        final = mean + name + value
+        return Atom.render("----", final)
+
+    def __parse_pair(self, atom, data):
+        self[atom.name] = struct.unpack(">2H", data[18:22])
+
+    def __render_pair(self, key, value):
+        track, total = value
+        if 0 <= track < 1 << 16 and 0 <= total < 1 << 16:
+            data = struct.pack(">4H", 0, track, total, 0)
+            return self.__render_data(key, 0, data)
+        else:
+            raise M4AMetadataValueError("invalid numeric pair %r" % (value,))
+
+    def __render_pair_no_trailing(self, key, value):
+        track, total = value
+        if 0 <= track < 1 << 16 and 0 <= total < 1 << 16:
+            data = struct.pack(">3H", 0, track, total)
+            return self.__render_data(key, 0, data)
+        else:
+            raise M4AMetadataValueError("invalid numeric pair %r" % (value,))
+
+    def __parse_genre(self, atom, data):
+        # Translate to a freeform genre.
+        genre = cdata.short_be(data[16:18])
+        if "\xa9gen" not in self:
+            try:
+                self["\xa9gen"] = GENRES[genre - 1]
+            except IndexError:
+                pass
+
+    def __parse_tempo(self, atom, data):
+        self[atom.name] = cdata.short_be(data[16:18])
+
+    def __render_tempo(self, key, value):
+        if 0 <= value < 1 << 16:
+            return self.__render_data(key, 0x15, cdata.to_ushort_be(value))
+        else:
+            raise M4AMetadataValueError("invalid short integer %r" % value)
+
+    def __parse_compilation(self, atom, data):
+        try:
+            self[atom.name] = bool(ord(data[16:17]))
+        except TypeError:
+            self[atom.name] = False
+
+    def __render_compilation(self, key, value):
+        return self.__render_data(key, 0x15, chr(bool(value)))
+
+    def __parse_cover(self, atom, data):
+        length, name, imageformat = struct.unpack(">I4sI", data[:12])
+        if name != "data":
+            raise M4AMetadataError(
+                "unexpected atom %r inside 'covr'" % name)
+        if imageformat not in (M4ACover.FORMAT_JPEG, M4ACover.FORMAT_PNG):
+            imageformat = M4ACover.FORMAT_JPEG
+        self[atom.name] = M4ACover(data[16:length], imageformat)
+
+    def __render_cover(self, key, value):
+        try:
+            imageformat = value.imageformat
+        except AttributeError:
+            imageformat = M4ACover.FORMAT_JPEG
+        data = Atom.render("data", struct.pack(">2I", imageformat, 0) + value)
+        return Atom.render(key, data)
+
+    def __parse_text(self, atom, data):
+        flags = cdata.uint_be(data[8:12])
+        if flags == 1:
+            self[atom.name] = data[16:].decode('utf-8', 'replace')
+
+    def __render_text(self, key, value):
+        return self.__render_data(key, 0x1, value.encode('utf-8'))
+
+    def delete(self, filename):
+        self.clear()
+        self.save(filename)
+
+    __atoms = {
+        "----": (__parse_freeform, __render_freeform),
+        "trkn": (__parse_pair, __render_pair),
+        "disk": (__parse_pair, __render_pair_no_trailing),
+        "gnre": (__parse_genre, None),
+        "tmpo": (__parse_tempo, __render_tempo),
+        "cpil": (__parse_compilation, __render_compilation),
+        "covr": (__parse_cover, __render_cover),
+    }
+
+    def pprint(self):
+        values = []
+        for key, value in self.iteritems():
+            key = key.decode('latin1')
+            try:
+                values.append("%s=%s" % (key, value))
+            except UnicodeDecodeError:
+                values.append("%s=[%d bytes of data]" % (key, len(value)))
+        return "\n".join(values)
+
+
+class M4AInfo(StreamInfo):
+    """MPEG-4 stream information.
+
+    Attributes:
+    bitrate -- bitrate in bits per second, as an int
+    length -- file length in seconds, as a float
+    """
+
+    bitrate = 0
+
+    def __init__(self, atoms, fileobj):
+        hdlr = atoms["moov.trak.mdia.hdlr"]
+        fileobj.seek(hdlr.offset)
+        if "soun" not in fileobj.read(hdlr.length):
+            raise M4AStreamInfoError("track has no audio data")
+
+        mdhd = atoms["moov.trak.mdia.mdhd"]
+        fileobj.seek(mdhd.offset)
+        data = fileobj.read(mdhd.length)
+        if ord(data[8]) == 0:
+            offset = 20
+            fmt = ">2I"
+        else:
+            offset = 28
+            fmt = ">IQ"
+        end = offset + struct.calcsize(fmt)
+        unit, length = struct.unpack(fmt, data[offset:end])
+        self.length = float(length) / unit
+
+        try:
+            atom = atoms["moov.trak.mdia.minf.stbl.stsd"]
+            fileobj.seek(atom.offset)
+            data = fileobj.read(atom.length)
+            self.bitrate = cdata.uint_be(data[-17:-13])
+        except (ValueError, KeyError):
+            # Bitrate values are optional.
+            pass
+
+    def pprint(self):
+        return "MPEG-4 audio, %.2f seconds, %d bps" % (
+            self.length, self.bitrate)
+
+
+class M4A(FileType):
+    """An MPEG-4 audio file, probably containing AAC.
+
+    If more than one track is present in the file, the first is used.
+    Only audio ('soun') tracks will be read.
+    """
+
+    _mimes = ["audio/mp4", "audio/x-m4a", "audio/mpeg4", "audio/aac"]
+
+    def load(self, filename):
+        self.filename = filename
+        fileobj = open(filename, "rb")
+        try:
+            atoms = Atoms(fileobj)
+            try:
+                self.info = M4AInfo(atoms, fileobj)
+            except StandardError as err:
+                reraise(M4AStreamInfoError, err, sys.exc_info()[2])
+            try:
+                self.tags = M4ATags(atoms, fileobj)
+            except M4AMetadataError:
+                self.tags = None
+            except StandardError as err:
+                reraise(M4AMetadataError, err, sys.exc_info()[2])
+        finally:
+            fileobj.close()
+
+    def add_tags(self):
+        self.tags = M4ATags()
+
+    @staticmethod
+    def score(filename, fileobj, header):
+        return ("ftyp" in header) + ("mp4" in header)
+
+
+Open = M4A
+
+
+def delete(filename):
+    """Remove tags from a file."""
+
+    M4A(filename).delete()
diff --git a/lib/mutagen/monkeysaudio.py b/lib/mutagen/monkeysaudio.py
new file mode 100644
index 00000000..536d7b18
--- /dev/null
+++ b/lib/mutagen/monkeysaudio.py
@@ -0,0 +1,86 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2006  Lukas Lalinsky
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+
+"""Monkey's Audio streams with APEv2 tags.
+
+Monkey's Audio is a very efficient lossless audio compressor developed
+by Matt Ashland.
+
+For more information, see http://www.monkeysaudio.com/.
+"""
+
+__all__ = ["MonkeysAudio", "Open", "delete"]
+
+import struct
+
+from ._compat import endswith
+from mutagen import StreamInfo
+from mutagen.apev2 import APEv2File, error, delete
+from mutagen._util import cdata
+
+
+class MonkeysAudioHeaderError(error):
+    pass
+
+
+class MonkeysAudioInfo(StreamInfo):
+    """Monkey's Audio stream information.
+
+    Attributes:
+
+    * channels -- number of audio channels
+    * length -- file length in seconds, as a float
+    * sample_rate -- audio sampling rate in Hz
+    * bits_per_sample -- bits per sample
+    * version -- Monkey's Audio stream version, as a float (eg: 3.99)
+    """
+
+    def __init__(self, fileobj):
+        header = fileobj.read(76)
+        if len(header) != 76 or not header.startswith(b"MAC "):
+            raise MonkeysAudioHeaderError("not a Monkey's Audio file")
+        self.version = cdata.ushort_le(header[4:6])
+        if self.version >= 3980:
+            (blocks_per_frame, final_frame_blocks, total_frames,
+             self.bits_per_sample, self.channels,
+             self.sample_rate) = struct.unpack("<IIIHHI", header[56:76])
+        else:
+            compression_level = cdata.ushort_le(header[6:8])
+            self.channels, self.sample_rate = struct.unpack(
+                "<HI", header[10:16])
+            total_frames, final_frame_blocks = struct.unpack(
+                "<II", header[24:32])
+            if self.version >= 3950:
+                blocks_per_frame = 73728 * 4
+            elif self.version >= 3900 or (self.version >= 3800 and
+                                          compression_level == 4):
+                blocks_per_frame = 73728
+            else:
+                blocks_per_frame = 9216
+        self.version /= 1000.0
+        self.length = 0.0
+        if (self.sample_rate != 0) and (total_frames > 0):
+            total_blocks = ((total_frames - 1) * blocks_per_frame +
+                            final_frame_blocks)
+            self.length = float(total_blocks) / self.sample_rate
+
+    def pprint(self):
+        return "Monkey's Audio %.2f, %.2f seconds, %d Hz" % (
+            self.version, self.length, self.sample_rate)
+
+
+class MonkeysAudio(APEv2File):
+    _Info = MonkeysAudioInfo
+    _mimes = ["audio/ape", "audio/x-ape"]
+
+    @staticmethod
+    def score(filename, fileobj, header):
+        return header.startswith(b"MAC ") + endswith(filename.lower(), ".ape")
+
+
+Open = MonkeysAudio
diff --git a/lib/mutagen/mp3.py b/lib/mutagen/mp3.py
new file mode 100644
index 00000000..535c6b4d
--- /dev/null
+++ b/lib/mutagen/mp3.py
@@ -0,0 +1,289 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2006  Joe Wreschnig
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+
+"""MPEG audio stream information and tags."""
+
+import os
+import struct
+
+from ._compat import endswith
+from mutagen import StreamInfo
+from mutagen._util import MutagenError
+from mutagen.id3 import ID3FileType, BitPaddedInt, delete
+
+__all__ = ["MP3", "Open", "delete", "MP3"]
+
+
+class error(RuntimeError, MutagenError):
+    pass
+
+
+class HeaderNotFoundError(error, IOError):
+    pass
+
+
+class InvalidMPEGHeader(error, IOError):
+    pass
+
+
+# Mode values.
+STEREO, JOINTSTEREO, DUALCHANNEL, MONO = range(4)
+
+
+class MPEGInfo(StreamInfo):
+    """MPEG audio stream information
+
+    Parse information about an MPEG audio file. This also reads the
+    Xing VBR header format.
+
+    This code was implemented based on the format documentation at
+    http://mpgedit.org/mpgedit/mpeg_format/mpeghdr.htm.
+
+    Useful attributes:
+
+    * length -- audio length, in seconds
+    * bitrate -- audio bitrate, in bits per second
+    * sketchy -- if true, the file may not be valid MPEG audio
+
+    Useless attributes:
+
+    * version -- MPEG version (1, 2, 2.5)
+    * layer -- 1, 2, or 3
+    * mode -- One of STEREO, JOINTSTEREO, DUALCHANNEL, or MONO (0-3)
+    * protected -- whether or not the file is "protected"
+    * padding -- whether or not audio frames are padded
+    * sample_rate -- audio sample rate, in Hz
+    """
+
+    # Map (version, layer) tuples to bitrates.
+    __BITRATE = {
+        (1, 1): [0, 32, 64, 96, 128, 160, 192, 224,
+                 256, 288, 320, 352, 384, 416, 448],
+        (1, 2): [0, 32, 48, 56, 64, 80, 96, 112, 128,
+                 160, 192, 224, 256, 320, 384],
+        (1, 3): [0, 32, 40, 48, 56, 64, 80, 96, 112,
+                 128, 160, 192, 224, 256, 320],
+        (2, 1): [0, 32, 48, 56, 64, 80, 96, 112, 128,
+                 144, 160, 176, 192, 224, 256],
+        (2, 2): [0, 8, 16, 24, 32, 40, 48, 56, 64,
+                 80, 96, 112, 128, 144, 160],
+    }
+
+    __BITRATE[(2, 3)] = __BITRATE[(2, 2)]
+    for i in range(1, 4):
+        __BITRATE[(2.5, i)] = __BITRATE[(2, i)]
+
+    # Map version to sample rates.
+    __RATES = {
+        1: [44100, 48000, 32000],
+        2: [22050, 24000, 16000],
+        2.5: [11025, 12000, 8000]
+    }
+
+    sketchy = False
+
+    def __init__(self, fileobj, offset=None):
+        """Parse MPEG stream information from a file-like object.
+
+        If an offset argument is given, it is used to start looking
+        for stream information and Xing headers; otherwise, ID3v2 tags
+        will be skipped automatically. A correct offset can make
+        loading files significantly faster.
+        """
+
+        try:
+            size = os.path.getsize(fileobj.name)
+        except (IOError, OSError, AttributeError):
+            fileobj.seek(0, 2)
+            size = fileobj.tell()
+
+        # If we don't get an offset, try to skip an ID3v2 tag.
+        if offset is None:
+            fileobj.seek(0, 0)
+            idata = fileobj.read(10)
+            try:
+                id3, insize = struct.unpack('>3sxxx4s', idata)
+            except struct.error:
+                id3, insize = '', 0
+            insize = BitPaddedInt(insize)
+            if id3 == b'ID3' and insize > 0:
+                offset = insize + 10
+            else:
+                offset = 0
+
+        # Try to find two valid headers (meaning, very likely MPEG data)
+        # at the given offset, 30% through the file, 60% through the file,
+        # and 90% through the file.
+        for i in [offset, 0.3 * size, 0.6 * size, 0.9 * size]:
+            try:
+                self.__try(fileobj, int(i), size - offset)
+            except error:
+                pass
+            else:
+                break
+        # If we can't find any two consecutive frames, try to find just
+        # one frame back at the original offset given.
+        else:
+            self.__try(fileobj, offset, size - offset, False)
+            self.sketchy = True
+
+    def __try(self, fileobj, offset, real_size, check_second=True):
+        # This is going to be one really long function; bear with it,
+        # because there's not really a sane point to cut it up.
+        fileobj.seek(offset, 0)
+
+        # We "know" we have an MPEG file if we find two frames that look like
+        # valid MPEG data. If we can't find them in 32k of reads, something
+        # is horribly wrong (the longest frame can only be about 4k). This
+        # is assuming the offset didn't lie.
+        data = fileobj.read(32768)
+
+        frame_1 = data.find(b"\xff")
+        while 0 <= frame_1 <= (len(data) - 4):
+            frame_data = struct.unpack(">I", data[frame_1:frame_1 + 4])[0]
+            if ((frame_data >> 16) & 0xE0) != 0xE0:
+                frame_1 = data.find(b"\xff", frame_1 + 2)
+            else:
+                version = (frame_data >> 19) & 0x3
+                layer = (frame_data >> 17) & 0x3
+                protection = (frame_data >> 16) & 0x1
+                bitrate = (frame_data >> 12) & 0xF
+                sample_rate = (frame_data >> 10) & 0x3
+                padding = (frame_data >> 9) & 0x1
+                # private = (frame_data >> 8) & 0x1
+                self.mode = (frame_data >> 6) & 0x3
+                # mode_extension = (frame_data >> 4) & 0x3
+                # copyright = (frame_data >> 3) & 0x1
+                # original = (frame_data >> 2) & 0x1
+                # emphasis = (frame_data >> 0) & 0x3
+                if (version == 1 or layer == 0 or sample_rate == 0x3 or
+                        bitrate == 0 or bitrate == 0xF):
+                    frame_1 = data.find(b"\xff", frame_1 + 2)
+                else:
+                    break
+        else:
+            raise HeaderNotFoundError("can't sync to an MPEG frame")
+
+        # There is a serious problem here, which is that many flags
+        # in an MPEG header are backwards.
+        self.version = [2.5, None, 2, 1][version]
+        self.layer = 4 - layer
+        self.protected = not protection
+        self.padding = bool(padding)
+
+        self.bitrate = self.__BITRATE[(self.version, self.layer)][bitrate]
+        self.bitrate *= 1000
+        self.sample_rate = self.__RATES[self.version][sample_rate]
+
+        if self.layer == 1:
+            frame_length = (
+                (12 * self.bitrate // self.sample_rate) + padding) * 4
+            frame_size = 384
+        elif self.version >= 2 and self.layer == 3:
+            frame_length = (72 * self.bitrate // self.sample_rate) + padding
+            frame_size = 576
+        else:
+            frame_length = (144 * self.bitrate // self.sample_rate) + padding
+            frame_size = 1152
+
+        if check_second:
+            possible = int(frame_1 + frame_length)
+            if possible > len(data) + 4:
+                raise HeaderNotFoundError("can't sync to second MPEG frame")
+            try:
+                frame_data = struct.unpack(
+                    ">H", data[possible:possible + 2])[0]
+            except struct.error:
+                raise HeaderNotFoundError("can't sync to second MPEG frame")
+            if (frame_data & 0xFFE0) != 0xFFE0:
+                raise HeaderNotFoundError("can't sync to second MPEG frame")
+
+        self.length = 8 * real_size / float(self.bitrate)
+
+        # Try to find/parse the Xing header, which trumps the above length
+        # and bitrate calculation.
+        fileobj.seek(offset, 0)
+        data = fileobj.read(32768)
+        try:
+            xing = data[:-4].index(b"Xing")
+        except ValueError:
+            # Try to find/parse the VBRI header, which trumps the above length
+            # calculation.
+            try:
+                vbri = data[:-24].index(b"VBRI")
+            except ValueError:
+                pass
+            else:
+                # If a VBRI header was found, this is definitely MPEG audio.
+                self.sketchy = False
+                vbri_version = struct.unpack('>H', data[vbri + 4:vbri + 6])[0]
+                if vbri_version == 1:
+                    frame_count = struct.unpack(
+                        '>I', data[vbri + 14:vbri + 18])[0]
+                    samples = float(frame_size * frame_count)
+                    self.length = (samples / self.sample_rate) or self.length
+        else:
+            # If a Xing header was found, this is definitely MPEG audio.
+            self.sketchy = False
+            flags = struct.unpack('>I', data[xing + 4:xing + 8])[0]
+            if flags & 0x1:
+                frame_count = struct.unpack('>I', data[xing + 8:xing + 12])[0]
+                samples = float(frame_size * frame_count)
+                self.length = (samples / self.sample_rate) or self.length
+            if flags & 0x2:
+                bitrate_data = struct.unpack(
+                    '>I', data[xing + 12:xing + 16])[0]
+                self.bitrate = int((bitrate_data * 8) // self.length)
+
+    def pprint(self):
+        s = "MPEG %s layer %d, %d bps, %s Hz, %.2f seconds" % (
+            self.version, self.layer, self.bitrate, self.sample_rate,
+            self.length)
+        if self.sketchy:
+            s += " (sketchy)"
+        return s
+
+
+class MP3(ID3FileType):
+    """An MPEG audio (usually MPEG-1 Layer 3) file.
+
+    :ivar info: :class:`MPEGInfo`
+    :ivar tags: :class:`ID3 <mutagen.id3.ID3>`
+    """
+
+    _Info = MPEGInfo
+
+    _mimes = ["audio/mpeg", "audio/mpg", "audio/x-mpeg"]
+
+    @property
+    def mime(self):
+        l = self.info.layer
+        return ["audio/mp%d" % l, "audio/x-mp%d" % l] + super(MP3, self).mime
+
+    @staticmethod
+    def score(filename, fileobj, header_data):
+        filename = filename.lower()
+
+        return (header_data.startswith(b"ID3") * 2 +
+                endswith(filename, b".mp3") +
+                endswith(filename, b".mp2") + endswith(filename, b".mpg") +
+                endswith(filename, b".mpeg"))
+
+
+Open = MP3
+
+
+class EasyMP3(MP3):
+    """Like MP3, but uses EasyID3 for tags.
+
+    :ivar info: :class:`MPEGInfo`
+    :ivar tags: :class:`EasyID3 <mutagen.easyid3.EasyID3>`
+    """
+
+    from mutagen.easyid3 import EasyID3 as ID3
+    ID3 = ID3
diff --git a/lib/mutagen/mp4/__init__.py b/lib/mutagen/mp4/__init__.py
new file mode 100644
index 00000000..b60ffcb9
--- /dev/null
+++ b/lib/mutagen/mp4/__init__.py
@@ -0,0 +1,965 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2006  Joe Wreschnig
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+
+"""Read and write MPEG-4 audio files with iTunes metadata.
+
+This module will read MPEG-4 audio information and metadata,
+as found in Apple's MP4 (aka M4A, M4B, M4P) files.
+
+There is no official specification for this format. The source code
+for TagLib, FAAD, and various MPEG specifications at
+
+* http://developer.apple.com/documentation/QuickTime/QTFF/
+* http://www.geocities.com/xhelmboyx/quicktime/formats/mp4-layout.txt
+* http://standards.iso.org/ittf/PubliclyAvailableStandards/\
+c041828_ISO_IEC_14496-12_2005(E).zip
+* http://wiki.multimedia.cx/index.php?title=Apple_QuickTime
+
+were all consulted.
+"""
+
+import struct
+import sys
+
+from mutagen import FileType, Metadata, StreamInfo
+from mutagen._constants import GENRES
+from mutagen._util import (cdata, insert_bytes, DictProxy, MutagenError,
+                           hashable, enum)
+from mutagen._compat import (reraise, PY2, string_types, text_type, chr_,
+                             iteritems, PY3, cBytesIO)
+from ._atom import Atoms, Atom, AtomError
+from ._util import parse_full_atom
+from ._as_entry import AudioSampleEntry, ASEntryError
+
+
+class error(IOError, MutagenError):
+    pass
+
+
+class MP4MetadataError(error):
+    pass
+
+
+class MP4StreamInfoError(error):
+    pass
+
+
+class MP4MetadataValueError(ValueError, MP4MetadataError):
+    pass
+
+
+__all__ = ['MP4', 'Open', 'delete', 'MP4Cover', 'MP4FreeForm', 'AtomDataType']
+
+
+@enum
+class AtomDataType(object):
+    """Enum for `dataformat` attribute of MP4FreeForm.
+
+    .. versionadded:: 1.25
+    """
+
+    IMPLICIT = 0
+    """for use with tags for which no type needs to be indicated because
+       only one type is allowed"""
+
+    UTF8 = 1
+    """without any count or null terminator"""
+
+    UTF16 = 2
+    """also known as UTF-16BE"""
+
+    SJIS = 3
+    """deprecated unless it is needed for special Japanese characters"""
+
+    HTML = 6
+    """the HTML file header specifies which HTML version"""
+
+    XML = 7
+    """the XML header must identify the DTD or schemas"""
+
+    UUID = 8
+    """also known as GUID; stored as 16 bytes in binary (valid as an ID)"""
+
+    ISRC = 9
+    """stored as UTF-8 text (valid as an ID)"""
+
+    MI3P = 10
+    """stored as UTF-8 text (valid as an ID)"""
+
+    GIF = 12
+    """(deprecated) a GIF image"""
+
+    JPEG = 13
+    """a JPEG image"""
+
+    PNG = 14
+    """PNG image"""
+
+    URL = 15
+    """absolute, in UTF-8 characters"""
+
+    DURATION = 16
+    """in milliseconds, 32-bit integer"""
+
+    DATETIME = 17
+    """in UTC, counting seconds since midnight, January 1, 1904;
+       32 or 64-bits"""
+
+    GENRES = 18
+    """a list of enumerated values"""
+
+    INTEGER = 21
+    """a signed big-endian integer with length one of { 1,2,3,4,8 } bytes"""
+
+    RIAA_PA = 24
+    """RIAA parental advisory; { -1=no, 1=yes, 0=unspecified },
+       8-bit ingteger"""
+
+    UPC = 25
+    """Universal Product Code, in text UTF-8 format (valid as an ID)"""
+
+    BMP = 27
+    """Windows bitmap image"""
+
+
+@hashable
+class MP4Cover(bytes):
+    """A cover artwork.
+
+    Attributes:
+
+    * imageformat -- format of the image (either FORMAT_JPEG or FORMAT_PNG)
+    """
+
+    FORMAT_JPEG = AtomDataType.JPEG
+    FORMAT_PNG = AtomDataType.PNG
+
+    def __new__(cls, data, *args, **kwargs):
+        return bytes.__new__(cls, data)
+
+    def __init__(self, data, imageformat=FORMAT_JPEG):
+        self.imageformat = imageformat
+
+    __hash__ = bytes.__hash__
+
+    def __eq__(self, other):
+        if not isinstance(other, MP4Cover):
+            return NotImplemented
+
+        if not bytes.__eq__(self, other):
+            return False
+
+        if self.imageformat != other.imageformat:
+            return False
+
+        return True
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
+    def __repr__(self):
+        return "%s(%r, %r)" % (
+            type(self).__name__, bytes(self),
+            AtomDataType(self.imageformat))
+
+
+@hashable
+class MP4FreeForm(bytes):
+    """A freeform value.
+
+    Attributes:
+
+    * dataformat -- format of the data (see AtomDataType)
+    """
+
+    FORMAT_DATA = AtomDataType.IMPLICIT  # deprecated
+    FORMAT_TEXT = AtomDataType.UTF8  # deprecated
+
+    def __new__(cls, data, *args, **kwargs):
+        return bytes.__new__(cls, data)
+
+    def __init__(self, data, dataformat=AtomDataType.UTF8, version=0):
+        self.dataformat = dataformat
+        self.version = version
+
+    __hash__ = bytes.__hash__
+
+    def __eq__(self, other):
+        if not isinstance(other, MP4FreeForm):
+            return NotImplemented
+
+        if not bytes.__eq__(self, other):
+            return False
+
+        if self.dataformat != other.dataformat:
+            return False
+
+        if self.version != other.version:
+            return False
+
+        return True
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
+    def __repr__(self):
+        return "%s(%r, %r)" % (
+            type(self).__name__, bytes(self),
+            AtomDataType(self.dataformat))
+
+
+
+def _name2key(name):
+    if PY2:
+        return name
+    return name.decode("latin-1")
+
+
+def _key2name(key):
+    if PY2:
+        return key
+    return key.encode("latin-1")
+
+
+class MP4Tags(DictProxy, Metadata):
+    r"""Dictionary containing Apple iTunes metadata list key/values.
+
+    Keys are four byte identifiers, except for freeform ('----')
+    keys. Values are usually unicode strings, but some atoms have a
+    special structure:
+
+    Text values (multiple values per key are supported):
+
+    * '\\xa9nam' -- track title
+    * '\\xa9alb' -- album
+    * '\\xa9ART' -- artist
+    * 'aART' -- album artist
+    * '\\xa9wrt' -- composer
+    * '\\xa9day' -- year
+    * '\\xa9cmt' -- comment
+    * 'desc' -- description (usually used in podcasts)
+    * 'purd' -- purchase date
+    * '\\xa9grp' -- grouping
+    * '\\xa9gen' -- genre
+    * '\\xa9lyr' -- lyrics
+    * 'purl' -- podcast URL
+    * 'egid' -- podcast episode GUID
+    * 'catg' -- podcast category
+    * 'keyw' -- podcast keywords
+    * '\\xa9too' -- encoded by
+    * 'cprt' -- copyright
+    * 'soal' -- album sort order
+    * 'soaa' -- album artist sort order
+    * 'soar' -- artist sort order
+    * 'sonm' -- title sort order
+    * 'soco' -- composer sort order
+    * 'sosn' -- show sort order
+    * 'tvsh' -- show name
+
+    Boolean values:
+
+    * 'cpil' -- part of a compilation
+    * 'pgap' -- part of a gapless album
+    * 'pcst' -- podcast (iTunes reads this only on import)
+
+    Tuples of ints (multiple values per key are supported):
+
+    * 'trkn' -- track number, total tracks
+    * 'disk' -- disc number, total discs
+
+    Others:
+
+    * 'tmpo' -- tempo/BPM, 16 bit int
+    * 'covr' -- cover artwork, list of MP4Cover objects (which are
+      tagged strs)
+    * 'gnre' -- ID3v1 genre. Not supported, use '\\xa9gen' instead.
+
+    The freeform '----' frames use a key in the format '----:mean:name'
+    where 'mean' is usually 'com.apple.iTunes' and 'name' is a unique
+    identifier for this frame. The value is a str, but is probably
+    text that can be decoded as UTF-8. Multiple values per key are
+    supported.
+
+    MP4 tag data cannot exist outside of the structure of an MP4 file,
+    so this class should not be manually instantiated.
+
+    Unknown non-text tags and tags that failed to parse will be written
+    back as is.
+    """
+
+    def __init__(self, *args, **kwargs):
+        self._failed_atoms = {}
+        super(MP4Tags, self).__init__(*args, **kwargs)
+
+    def load(self, atoms, fileobj):
+        try:
+            ilst = atoms[b"moov.udta.meta.ilst"]
+        except KeyError as key:
+            raise MP4MetadataError(key)
+        for atom in ilst.children:
+            ok, data = atom.read(fileobj)
+            if not ok:
+                raise MP4MetadataError("Not enough data")
+
+            try:
+                if atom.name in self.__atoms:
+                    info = self.__atoms[atom.name]
+                    info[0](self, atom, data)
+                else:
+                    # unknown atom, try as text
+                    self.__parse_text(atom, data, implicit=False)
+            except MP4MetadataError:
+                # parsing failed, save them so we can write them back
+                key = _name2key(atom.name)
+                self._failed_atoms.setdefault(key, []).append(data)
+
+    def __setitem__(self, key, value):
+        if not isinstance(key, str):
+            raise TypeError("key has to be str")
+        super(MP4Tags, self).__setitem__(key, value)
+
+    @classmethod
+    def _can_load(cls, atoms):
+        return b"moov.udta.meta.ilst" in atoms
+
+    @staticmethod
+    def __key_sort(item):
+        (key, v) = item
+        # iTunes always writes the tags in order of "relevance", try
+        # to copy it as closely as possible.
+        order = [b"\xa9nam", b"\xa9ART", b"\xa9wrt", b"\xa9alb",
+                 b"\xa9gen", b"gnre", b"trkn", b"disk",
+                 b"\xa9day", b"cpil", b"pgap", b"pcst", b"tmpo",
+                 b"\xa9too", b"----", b"covr", b"\xa9lyr"]
+        order = dict(zip(order, range(len(order))))
+        last = len(order)
+        # If there's no key-based way to distinguish, order by length.
+        # If there's still no way, go by string comparison on the
+        # values, so we at least have something determinstic.
+        return (order.get(key[:4], last), len(repr(v)), repr(v))
+
+    def save(self, filename):
+        """Save the metadata to the given filename."""
+
+        values = []
+        items = sorted(self.items(), key=self.__key_sort)
+        for key, value in items:
+            atom_name = _key2name(key)[:4]
+            if atom_name in self.__atoms:
+                render_func = self.__atoms[atom_name][1]
+            else:
+                render_func = type(self).__render_text
+
+            try:
+                values.append(render_func(self, key, value))
+            except (TypeError, ValueError) as s:
+                reraise(MP4MetadataValueError, s, sys.exc_info()[2])
+
+        for atom_name, failed in iteritems(self._failed_atoms):
+            # don't write atoms back if we have added a new one with
+            # the same name, this excludes freeform which can have
+            # multiple atoms with the same key (most parsers seem to be able
+            # to handle that)
+            if atom_name in self:
+                assert atom_name != b"----"
+                continue
+            for data in failed:
+                values.append(Atom.render(_key2name(atom_name), data))
+
+        data = Atom.render(b"ilst", b"".join(values))
+
+        # Find the old atoms.
+        with open(filename, "rb+") as fileobj:
+            try:
+                atoms = Atoms(fileobj)
+            except AtomError as err:
+                reraise(error, err, sys.exc_info()[2])
+
+            try:
+                path = atoms.path(b"moov", b"udta", b"meta", b"ilst")
+            except KeyError:
+                self.__save_new(fileobj, atoms, data)
+            else:
+                self.__save_existing(fileobj, atoms, path, data)
+
+    def __pad_ilst(self, data, length=None):
+        if length is None:
+            length = ((len(data) + 1023) & ~1023) - len(data)
+        return Atom.render(b"free", b"\x00" * length)
+
+    def __save_new(self, fileobj, atoms, ilst):
+        hdlr = Atom.render(b"hdlr", b"\x00" * 8 + b"mdirappl" + b"\x00" * 9)
+        meta = Atom.render(
+            b"meta", b"\x00\x00\x00\x00" + hdlr + ilst + self.__pad_ilst(ilst))
+        try:
+            path = atoms.path(b"moov", b"udta")
+        except KeyError:
+            # moov.udta not found -- create one
+            path = atoms.path(b"moov")
+            meta = Atom.render(b"udta", meta)
+        offset = path[-1].offset + 8
+        insert_bytes(fileobj, len(meta), offset)
+        fileobj.seek(offset)
+        fileobj.write(meta)
+        self.__update_parents(fileobj, path, len(meta))
+        self.__update_offsets(fileobj, atoms, len(meta), offset)
+
+    def __save_existing(self, fileobj, atoms, path, data):
+        # Replace the old ilst atom.
+        ilst = path.pop()
+        offset = ilst.offset
+        length = ilst.length
+
+        # Check for padding "free" atoms
+        meta = path[-1]
+        index = meta.children.index(ilst)
+        try:
+            prev = meta.children[index - 1]
+            if prev.name == b"free":
+                offset = prev.offset
+                length += prev.length
+        except IndexError:
+            pass
+        try:
+            next = meta.children[index + 1]
+            if next.name == b"free":
+                length += next.length
+        except IndexError:
+            pass
+
+        delta = len(data) - length
+        if delta > 0 or (delta < 0 and delta > -8):
+            data += self.__pad_ilst(data)
+            delta = len(data) - length
+            insert_bytes(fileobj, delta, offset)
+        elif delta < 0:
+            data += self.__pad_ilst(data, -delta - 8)
+            delta = 0
+
+        fileobj.seek(offset)
+        fileobj.write(data)
+        self.__update_parents(fileobj, path, delta)
+        self.__update_offsets(fileobj, atoms, delta, offset)
+
+    def __update_parents(self, fileobj, path, delta):
+        """Update all parent atoms with the new size."""
+        for atom in path:
+            fileobj.seek(atom.offset)
+            size = cdata.uint_be(fileobj.read(4))
+            if size == 1:  # 64bit
+                # skip name (4B) and read size (8B)
+                size = cdata.ulonglong_be(fileobj.read(12)[4:])
+                fileobj.seek(atom.offset + 8)
+                fileobj.write(cdata.to_ulonglong_be(size + delta))
+            else:  # 32bit
+                fileobj.seek(atom.offset)
+                fileobj.write(cdata.to_uint_be(size + delta))
+
+    def __update_offset_table(self, fileobj, fmt, atom, delta, offset):
+        """Update offset table in the specified atom."""
+        if atom.offset > offset:
+            atom.offset += delta
+        fileobj.seek(atom.offset + 12)
+        data = fileobj.read(atom.length - 12)
+        fmt = fmt % cdata.uint_be(data[:4])
+        offsets = struct.unpack(fmt, data[4:])
+        offsets = [o + (0, delta)[offset < o] for o in offsets]
+        fileobj.seek(atom.offset + 16)
+        fileobj.write(struct.pack(fmt, *offsets))
+
+    def __update_tfhd(self, fileobj, atom, delta, offset):
+        if atom.offset > offset:
+            atom.offset += delta
+        fileobj.seek(atom.offset + 9)
+        data = fileobj.read(atom.length - 9)
+        flags = cdata.uint_be(b"\x00" + data[:3])
+        if flags & 1:
+            o = cdata.ulonglong_be(data[7:15])
+            if o > offset:
+                o += delta
+            fileobj.seek(atom.offset + 16)
+            fileobj.write(cdata.to_ulonglong_be(o))
+
+    def __update_offsets(self, fileobj, atoms, delta, offset):
+        """Update offset tables in all 'stco' and 'co64' atoms."""
+        if delta == 0:
+            return
+        moov = atoms[b"moov"]
+        for atom in moov.findall(b'stco', True):
+            self.__update_offset_table(fileobj, ">%dI", atom, delta, offset)
+        for atom in moov.findall(b'co64', True):
+            self.__update_offset_table(fileobj, ">%dQ", atom, delta, offset)
+        try:
+            for atom in atoms[b"moof"].findall(b'tfhd', True):
+                self.__update_tfhd(fileobj, atom, delta, offset)
+        except KeyError:
+            pass
+
+    def __parse_data(self, atom, data):
+        pos = 0
+        while pos < atom.length - 8:
+            head = data[pos:pos + 12]
+            if len(head) != 12:
+                raise MP4MetadataError("truncated atom % r" % atom.name)
+            length, name = struct.unpack(">I4s", head[:8])
+            version = ord(head[8:9])
+            flags = struct.unpack(">I", b"\x00" + head[9:12])[0]
+            if name != b"data":
+                raise MP4MetadataError(
+                    "unexpected atom %r inside %r" % (name, atom.name))
+
+            chunk = data[pos + 16:pos + length]
+            if len(chunk) != length - 16:
+                raise MP4MetadataError("truncated atom % r" % atom.name)
+            yield version, flags, chunk
+            pos += length
+
+    def __add(self, key, value, single=False):
+        assert isinstance(key, str)
+
+        if single:
+            self[key] = value
+        else:
+            self.setdefault(key, []).extend(value)
+
+    def __render_data(self, key, version, flags, value):
+        return Atom.render(_key2name(key), b"".join([
+            Atom.render(
+                b"data", struct.pack(">2I", version << 24 | flags, 0) + data)
+            for data in value]))
+
+    def __parse_freeform(self, atom, data):
+        length = cdata.uint_be(data[:4])
+        mean = data[12:length]
+        pos = length
+        length = cdata.uint_be(data[pos:pos + 4])
+        name = data[pos + 12:pos + length]
+        pos += length
+        value = []
+        while pos < atom.length - 8:
+            length, atom_name = struct.unpack(">I4s", data[pos:pos + 8])
+            if atom_name != b"data":
+                raise MP4MetadataError(
+                    "unexpected atom %r inside %r" % (atom_name, atom.name))
+
+            version = ord(data[pos + 8:pos + 8 + 1])
+            flags = struct.unpack(">I", b"\x00" + data[pos + 9:pos + 12])[0]
+            value.append(MP4FreeForm(data[pos + 16:pos + length],
+                                     dataformat=flags, version=version))
+            pos += length
+
+        key = _name2key(atom.name + b":" + mean + b":" + name)
+        self.__add(key, value)
+
+    def __render_freeform(self, key, value):
+        if isinstance(value, bytes):
+            value = [value]
+
+        dummy, mean, name = _key2name(key).split(b":", 2)
+        mean = struct.pack(">I4sI", len(mean) + 12, b"mean", 0) + mean
+        name = struct.pack(">I4sI", len(name) + 12, b"name", 0) + name
+
+        data = b""
+        for v in value:
+            flags = AtomDataType.UTF8
+            version = 0
+            if isinstance(v, MP4FreeForm):
+                flags = v.dataformat
+                version = v.version
+
+            data += struct.pack(
+                ">I4s2I", len(v) + 16, b"data", version << 24 | flags, 0)
+            data += v
+
+        return Atom.render(b"----", mean + name + data)
+
+    def __parse_pair(self, atom, data):
+        key = _name2key(atom.name)
+        values = [struct.unpack(">2H", d[2:6]) for
+                  version, flags, d in self.__parse_data(atom, data)]
+        self.__add(key, values)
+
+    def __render_pair(self, key, value):
+        data = []
+        for (track, total) in value:
+            if 0 <= track < 1 << 16 and 0 <= total < 1 << 16:
+                data.append(struct.pack(">4H", 0, track, total, 0))
+            else:
+                raise MP4MetadataValueError(
+                    "invalid numeric pair %r" % ((track, total),))
+        return self.__render_data(key, 0, AtomDataType.IMPLICIT, data)
+
+    def __render_pair_no_trailing(self, key, value):
+        data = []
+        for (track, total) in value:
+            if 0 <= track < 1 << 16 and 0 <= total < 1 << 16:
+                data.append(struct.pack(">3H", 0, track, total))
+            else:
+                raise MP4MetadataValueError(
+                    "invalid numeric pair %r" % ((track, total),))
+        return self.__render_data(key, 0, AtomDataType.IMPLICIT, data)
+
+    def __parse_genre(self, atom, data):
+        values = []
+        for version, flags, data in self.__parse_data(atom, data):
+            # version = 0, flags = 0
+            if len(data) != 2:
+                raise MP4MetadataValueError("invalid genre")
+            genre = cdata.short_be(data)
+            # Translate to a freeform genre.
+            try:
+                genre = GENRES[genre - 1]
+            except IndexError:
+                # this will make us write it back at least
+                raise MP4MetadataValueError("unknown genre")
+            values.append(genre)
+        key = _name2key(b"\xa9gen")
+        self.__add(key, values)
+
+    def __parse_tempo(self, atom, data):
+        values = []
+        for version, flags, data in self.__parse_data(atom, data):
+            # version = 0, flags = 0 or 21
+            if len(data) != 2:
+                raise MP4MetadataValueError("invalid tempo")
+            values.append(cdata.ushort_be(data))
+        key = _name2key(atom.name)
+        self.__add(key, values)
+
+    def __render_tempo(self, key, value):
+        try:
+            if len(value) == 0:
+                return self.__render_data(key, 0, AtomDataType.INTEGER, b"")
+
+            if (min(value) < 0) or (max(value) >= 2 ** 16):
+                raise MP4MetadataValueError(
+                    "invalid 16 bit integers: %r" % value)
+        except TypeError:
+            raise MP4MetadataValueError(
+                "tmpo must be a list of 16 bit integers")
+
+        values = [cdata.to_ushort_be(v) for v in value]
+        return self.__render_data(key, 0, AtomDataType.INTEGER, values)
+
+    def __parse_bool(self, atom, data):
+        for version, flags, data in self.__parse_data(atom, data):
+            if len(data) != 1:
+                raise MP4MetadataValueError("invalid bool")
+
+            value = bool(ord(data))
+            key = _name2key(atom.name)
+            self.__add(key, value, single=True)
+
+    def __render_bool(self, key, value):
+        return self.__render_data(
+            key, 0, AtomDataType.INTEGER, [chr_(bool(value))])
+
+    def __parse_cover(self, atom, data):
+        values = []
+        pos = 0
+        while pos < atom.length - 8:
+            length, name, imageformat = struct.unpack(">I4sI",
+                                                      data[pos:pos + 12])
+            if name != b"data":
+                if name == b"name":
+                    pos += length
+                    continue
+                raise MP4MetadataError(
+                    "unexpected atom %r inside 'covr'" % name)
+            if imageformat not in (MP4Cover.FORMAT_JPEG, MP4Cover.FORMAT_PNG):
+                # Sometimes AtomDataType.IMPLICIT or simply wrong.
+                # In all cases it was jpeg, so default to it
+                imageformat = MP4Cover.FORMAT_JPEG
+            cover = MP4Cover(data[pos + 16:pos + length], imageformat)
+            values.append(cover)
+            pos += length
+
+        key = _name2key(atom.name)
+        self.__add(key, values)
+
+    def __render_cover(self, key, value):
+        atom_data = []
+        for cover in value:
+            try:
+                imageformat = cover.imageformat
+            except AttributeError:
+                imageformat = MP4Cover.FORMAT_JPEG
+            atom_data.append(Atom.render(
+                b"data", struct.pack(">2I", imageformat, 0) + cover))
+        return Atom.render(_key2name(key), b"".join(atom_data))
+
+    def __parse_text(self, atom, data, implicit=True):
+        # implicit = False, for parsing unknown atoms only take utf8 ones.
+        # For known ones we can assume the implicit are utf8 too.
+        values = []
+        for version, flags, atom_data in self.__parse_data(atom, data):
+            if implicit:
+                if flags not in (AtomDataType.IMPLICIT, AtomDataType.UTF8):
+                    raise MP4MetadataError(
+                        "Unknown atom type %r for %r" % (flags, atom.name))
+            else:
+                if flags != AtomDataType.UTF8:
+                    raise MP4MetadataError(
+                        "%r is not text, ignore" % atom.name)
+
+            try:
+                text = atom_data.decode("utf-8")
+            except UnicodeDecodeError as e:
+                raise MP4MetadataError("%s: %s" % (atom.name, e))
+
+            values.append(text)
+
+        key = _name2key(atom.name)
+        self.__add(key, values)
+
+    def __render_text(self, key, value, flags=AtomDataType.UTF8):
+        if isinstance(value, string_types):
+            value = [value]
+
+        encoded = []
+        for v in value:
+            if not isinstance(v, text_type):
+                if PY3:
+                    raise TypeError("%r not str" % v)
+                v = v.decode("utf-8")
+            encoded.append(v.encode("utf-8"))
+
+        return self.__render_data(key, 0, flags, encoded)
+
+    def delete(self, filename):
+        """Remove the metadata from the given filename."""
+
+        self._failed_atoms.clear()
+        self.clear()
+        self.save(filename)
+
+    __atoms = {
+        b"----": (__parse_freeform, __render_freeform),
+        b"trkn": (__parse_pair, __render_pair),
+        b"disk": (__parse_pair, __render_pair_no_trailing),
+        b"gnre": (__parse_genre, None),
+        b"tmpo": (__parse_tempo, __render_tempo),
+        b"cpil": (__parse_bool, __render_bool),
+        b"pgap": (__parse_bool, __render_bool),
+        b"pcst": (__parse_bool, __render_bool),
+        b"covr": (__parse_cover, __render_cover),
+        b"purl": (__parse_text, __render_text),
+        b"egid": (__parse_text, __render_text),
+    }
+
+    # these allow implicit flags and parse as text
+    for name in [b"\xa9nam", b"\xa9alb", b"\xa9ART", b"aART", b"\xa9wrt",
+                 b"\xa9day", b"\xa9cmt", b"desc", b"purd", b"\xa9grp",
+                 b"\xa9gen", b"\xa9lyr", b"catg", b"keyw", b"\xa9too",
+                 b"cprt", b"soal", b"soaa", b"soar", b"sonm", b"soco",
+                 b"sosn", b"tvsh"]:
+        __atoms[name] = (__parse_text, __render_text)
+
+    def pprint(self):
+        values = []
+        for key, value in iteritems(self):
+            if not isinstance(key, text_type):
+                key = key.decode("latin-1")
+            if key == "covr":
+                values.append("%s=%s" % (key, ", ".join(
+                    ["[%d bytes of data]" % len(data) for data in value])))
+            elif isinstance(value, list):
+                values.append("%s=%s" %
+                              (key, " / ".join(map(text_type, value))))
+            else:
+                values.append("%s=%s" % (key, value))
+        return "\n".join(values)
+
+
+class MP4Info(StreamInfo):
+    """MPEG-4 stream information.
+
+    Attributes:
+
+    * bitrate -- bitrate in bits per second, as an int
+    * length -- file length in seconds, as a float
+    * channels -- number of audio channels
+    * sample_rate -- audio sampling rate in Hz
+    * bits_per_sample -- bits per sample
+    * codec (string):
+        * if starting with ``"mp4a"`` uses an mp4a audio codec
+          (see the codec parameter in rfc6381 for details e.g. ``"mp4a.40.2"``)
+        * for everything else see a list of possible values at
+          http://www.mp4ra.org/codecs.html
+
+        e.g. ``"mp4a"``, ``"alac"``, ``"mp4a.40.2"``, ``"ac-3"`` etc.
+    * codec_description (string):
+        Name of the codec used (ALAC, AAC LC, AC-3...). Values might change in
+        the future, use for display purposes only.
+    """
+
+    bitrate = 0
+    channels = 0
+    sample_rate = 0
+    bits_per_sample = 0
+    codec = u""
+    codec_name = u""
+
+    def __init__(self, atoms, fileobj):
+        try:
+            moov = atoms[b"moov"]
+        except KeyError:
+            raise MP4StreamInfoError("not a MP4 file")
+
+        for trak in moov.findall(b"trak"):
+            hdlr = trak[b"mdia", b"hdlr"]
+            ok, data = hdlr.read(fileobj)
+            if not ok:
+                raise MP4StreamInfoError("Not enough data")
+            if data[8:12] == b"soun":
+                break
+        else:
+            raise MP4StreamInfoError("track has no audio data")
+
+        mdhd = trak[b"mdia", b"mdhd"]
+        ok, data = mdhd.read(fileobj)
+        if not ok:
+            raise MP4StreamInfoError("Not enough data")
+
+        try:
+            version, flags, data = parse_full_atom(data)
+        except ValueError as e:
+            raise MP4StreamInfoError(e)
+
+        if version == 0:
+            offset = 8
+            fmt = ">2I"
+        elif version == 1:
+            offset = 16
+            fmt = ">IQ"
+        else:
+            raise MP4StreamInfoError("Unknown mdhd version %d" % version)
+
+        end = offset + struct.calcsize(fmt)
+        unit, length = struct.unpack(fmt, data[offset:end])
+        try:
+            self.length = float(length) / unit
+        except ZeroDivisionError:
+            self.length = 0
+
+        try:
+            atom = trak[b"mdia", b"minf", b"stbl", b"stsd"]
+        except KeyError:
+            pass
+        else:
+            self._parse_stsd(atom, fileobj)
+
+    def _parse_stsd(self, atom, fileobj):
+        """Sets channels, bits_per_sample, sample_rate and optionally bitrate.
+
+        Can raise MP4StreamInfoError.
+        """
+
+        assert atom.name == b"stsd"
+
+        ok, data = atom.read(fileobj)
+        if not ok:
+            raise MP4StreamInfoError("Invalid stsd")
+
+        try:
+            version, flags, data = parse_full_atom(data)
+        except ValueError as e:
+            raise MP4StreamInfoError(e)
+
+        if version != 0:
+            raise MP4StreamInfoError("Unsupported stsd version")
+
+        try:
+            num_entries, offset = cdata.uint32_be_from(data, 0)
+        except cdata.error as e:
+            raise MP4StreamInfoError(e)
+
+        if num_entries == 0:
+            return
+
+        # look at the first entry if there is one
+        entry_fileobj = cBytesIO(data[offset:])
+        try:
+            entry_atom = Atom(entry_fileobj)
+        except AtomError as e:
+            raise MP4StreamInfoError(e)
+
+        try:
+            entry = AudioSampleEntry(entry_atom, entry_fileobj)
+        except ASEntryError as e:
+            raise MP4StreamInfoError(e)
+        else:
+            self.channels = entry.channels
+            self.bits_per_sample = entry.sample_size
+            self.sample_rate = entry.sample_rate
+            self.bitrate = entry.bitrate
+            self.codec = entry.codec
+            self.codec_description = entry.codec_description
+
+    def pprint(self):
+        return "MPEG-4 audio (%s), %.2f seconds, %d bps" % (
+            self.codec_description, self.length, self.bitrate)
+
+
+class MP4(FileType):
+    """An MPEG-4 audio file, probably containing AAC.
+
+    If more than one track is present in the file, the first is used.
+    Only audio ('soun') tracks will be read.
+
+    :ivar info: :class:`MP4Info`
+    :ivar tags: :class:`MP4Tags`
+    """
+
+    MP4Tags = MP4Tags
+
+    _mimes = ["audio/mp4", "audio/x-m4a", "audio/mpeg4", "audio/aac"]
+
+    def load(self, filename):
+        self.filename = filename
+        with open(filename, "rb") as fileobj:
+            try:
+                atoms = Atoms(fileobj)
+            except AtomError as err:
+                reraise(error, err, sys.exc_info()[2])
+
+            try:
+                self.info = MP4Info(atoms, fileobj)
+            except error:
+                raise
+            except Exception as err:
+                reraise(MP4StreamInfoError, err, sys.exc_info()[2])
+
+            if not MP4Tags._can_load(atoms):
+                self.tags = None
+            else:
+                try:
+                    self.tags = self.MP4Tags(atoms, fileobj)
+                except error:
+                    raise
+                except Exception as err:
+                    reraise(MP4MetadataError, err, sys.exc_info()[2])
+
+    def add_tags(self):
+        if self.tags is None:
+            self.tags = self.MP4Tags()
+        else:
+            raise error("an MP4 tag already exists")
+
+    @staticmethod
+    def score(filename, fileobj, header_data):
+        return (b"ftyp" in header_data) + (b"mp4" in header_data)
+
+
+Open = MP4
+
+
+def delete(filename):
+    """Remove tags from a file."""
+
+    MP4(filename).delete()
diff --git a/lib/mutagen/mp4/_as_entry.py b/lib/mutagen/mp4/_as_entry.py
new file mode 100644
index 00000000..1cc4ff88
--- /dev/null
+++ b/lib/mutagen/mp4/_as_entry.py
@@ -0,0 +1,541 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2014 Christoph Reiter
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+
+from mutagen._compat import cBytesIO, xrange
+from mutagen.aac import ProgramConfigElement
+from mutagen._util import BitReader, BitReaderError, cdata, text_type
+from ._util import parse_full_atom
+from ._atom import Atom, AtomError
+
+
+class ASEntryError(Exception):
+    pass
+
+
+class AudioSampleEntry(object):
+    """Parses an AudioSampleEntry atom.
+
+    Private API.
+
+    Attrs:
+        channels (int): number of channels
+        sample_size (int): sample size in bits
+        sample_rate (int): sample rate in Hz
+        bitrate (int): bits per second (0 means unknown)
+        codec (string):
+            audio codec, either 'mp4a[.*][.*]' (rfc6381) or 'alac'
+        codec_description (string): descriptive codec name e.g. "AAC LC+SBR"
+
+    Can raise ASEntryError.
+    """
+
+    channels = 0
+    sample_size = 0
+    sample_rate = 0
+    bitrate = 0
+    codec = None
+    codec_description = None
+
+    def __init__(self, atom, fileobj):
+        ok, data = atom.read(fileobj)
+        if not ok:
+            raise ASEntryError("too short %r atom" % atom.name)
+
+        fileobj = cBytesIO(data)
+        r = BitReader(fileobj)
+
+        try:
+            # SampleEntry
+            r.skip(6 * 8)  # reserved
+            r.skip(2 * 8)  # data_ref_index
+
+            # AudioSampleEntry
+            r.skip(8 * 8)  # reserved
+            self.channels = r.bits(16)
+            self.sample_size = r.bits(16)
+            r.skip(2 * 8)  # pre_defined
+            r.skip(2 * 8)  # reserved
+            self.sample_rate = r.bits(32) >> 16
+        except BitReaderError as e:
+            raise ASEntryError(e)
+
+        assert r.is_aligned()
+
+        try:
+            extra = Atom(fileobj)
+        except AtomError as e:
+            raise ASEntryError(e)
+
+        self.codec = atom.name.decode("latin-1")
+        self.codec_description = None
+
+        if atom.name == b"mp4a" and extra.name == b"esds":
+            self._parse_esds(extra, fileobj)
+        elif atom.name == b"alac" and extra.name == b"alac":
+            self._parse_alac(extra, fileobj)
+        elif atom.name == b"ac-3" and extra.name == b"dac3":
+            self._parse_dac3(extra, fileobj)
+
+        if self.codec_description is None:
+            self.codec_description = self.codec.upper()
+
+    def _parse_dac3(self, atom, fileobj):
+        # ETSI TS 102 366
+
+        assert atom.name == b"dac3"
+
+        ok, data = atom.read(fileobj)
+        if not ok:
+            raise ASEntryError("truncated %s atom" % atom.name)
+        fileobj = cBytesIO(data)
+        r = BitReader(fileobj)
+
+        # sample_rate in AudioSampleEntry covers values in
+        # fscod2 and not just fscod, so ignore fscod here.
+        try:
+            r.skip(2 + 5 + 3)  # fscod, bsid, bsmod
+            acmod = r.bits(3)
+            lfeon = r.bits(1)
+            bit_rate_code = r.bits(5)
+            r.skip(5)  # reserved
+        except BitReaderError as e:
+            raise ASEntryError(e)
+
+        self.channels = [2, 1, 2, 3, 3, 4, 4, 5][acmod] + lfeon
+
+        try:
+            self.bitrate = [
+                32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192,
+                224, 256, 320, 384, 448, 512, 576, 640][bit_rate_code] * 1000
+        except IndexError:
+            pass
+
+    def _parse_alac(self, atom, fileobj):
+        # https://alac.macosforge.org/trac/browser/trunk/
+        #    ALACMagicCookieDescription.txt
+
+        assert atom.name == b"alac"
+
+        ok, data = atom.read(fileobj)
+        if not ok:
+            raise ASEntryError("truncated %s atom" % atom.name)
+
+        try:
+            version, flags, data = parse_full_atom(data)
+        except ValueError as e:
+            raise ASEntryError(e)
+
+        if version != 0:
+            raise ASEntryError("Unsupported version %d" % version)
+
+        fileobj = cBytesIO(data)
+        r = BitReader(fileobj)
+
+        try:
+            # for some files the AudioSampleEntry values default to 44100/2chan
+            # and the real info is in the alac cookie, so prefer it
+            r.skip(32)  # frameLength
+            compatibleVersion = r.bits(8)
+            if compatibleVersion != 0:
+                return
+            self.sample_size = r.bits(8)
+            r.skip(8 + 8 + 8)
+            self.channels = r.bits(8)
+            r.skip(16 + 32)
+            self.bitrate = r.bits(32)
+            self.sample_rate = r.bits(32)
+        except BitReaderError as e:
+            raise ASEntryError(e)
+
+    def _parse_esds(self, esds, fileobj):
+        assert esds.name == b"esds"
+
+        ok, data = esds.read(fileobj)
+        if not ok:
+            raise ASEntryError("truncated %s atom" % esds.name)
+
+        try:
+            version, flags, data = parse_full_atom(data)
+        except ValueError as e:
+            raise ASEntryError(e)
+
+        if version != 0:
+            raise ASEntryError("Unsupported version %d" % version)
+
+        fileobj = cBytesIO(data)
+        r = BitReader(fileobj)
+
+        try:
+            tag = r.bits(8)
+            if tag != ES_Descriptor.TAG:
+                raise ASEntryError("unexpected descriptor: %d" % tag)
+            assert r.is_aligned()
+        except BitReaderError as e:
+            raise ASEntryError(e)
+
+        try:
+            decSpecificInfo = ES_Descriptor.parse(fileobj)
+        except DescriptorError as e:
+            raise ASEntryError(e)
+        dec_conf_desc = decSpecificInfo.decConfigDescr
+
+        self.bitrate = dec_conf_desc.avgBitrate
+        self.codec += dec_conf_desc.codec_param
+        self.codec_description = dec_conf_desc.codec_desc
+
+        decSpecificInfo = dec_conf_desc.decSpecificInfo
+        if decSpecificInfo is not None:
+            if decSpecificInfo.channels != 0:
+                self.channels = decSpecificInfo.channels
+
+            if decSpecificInfo.sample_rate != 0:
+                self.sample_rate = decSpecificInfo.sample_rate
+
+
+class DescriptorError(Exception):
+    pass
+
+
+class BaseDescriptor(object):
+
+    TAG = None
+
+    @classmethod
+    def _parse_desc_length_file(cls, fileobj):
+        """May raise ValueError"""
+
+        value = 0
+        for i in xrange(4):
+            try:
+                b = cdata.uint8(fileobj.read(1))
+            except cdata.error as e:
+                raise ValueError(e)
+            value = (value << 7) | (b & 0x7f)
+            if not b >> 7:
+                break
+        else:
+            raise ValueError("invalid descriptor length")
+
+        return value
+
+    @classmethod
+    def parse(cls, fileobj):
+        """Returns a parsed instance of the called type.
+        The file position is right after the descriptor after this returns.
+
+        Raises DescriptorError
+        """
+
+        try:
+            length = cls._parse_desc_length_file(fileobj)
+        except ValueError as e:
+            raise DescriptorError(e)
+        pos = fileobj.tell()
+        instance = cls(fileobj, length)
+        left = length - (fileobj.tell() - pos)
+        if left < 0:
+            raise DescriptorError("descriptor parsing read too much data")
+        fileobj.seek(left, 1)
+        return instance
+
+
+class ES_Descriptor(BaseDescriptor):
+
+    TAG = 0x3
+
+    def __init__(self, fileobj, length):
+        """Raises DescriptorError"""
+
+        r = BitReader(fileobj)
+        try:
+            self.ES_ID = r.bits(16)
+            self.streamDependenceFlag = r.bits(1)
+            self.URL_Flag = r.bits(1)
+            self.OCRstreamFlag = r.bits(1)
+            self.streamPriority = r.bits(5)
+            if self.streamDependenceFlag:
+                self.dependsOn_ES_ID = r.bits(16)
+            if self.URL_Flag:
+                URLlength = r.bits(8)
+                self.URLstring = r.bytes(URLlength)
+            if self.OCRstreamFlag:
+                self.OCR_ES_Id = r.bits(16)
+
+            tag = r.bits(8)
+        except BitReaderError as e:
+            raise DescriptorError(e)
+
+        if tag != DecoderConfigDescriptor.TAG:
+            raise DescriptorError("unexpected DecoderConfigDescrTag %d" % tag)
+
+        assert r.is_aligned()
+        self.decConfigDescr = DecoderConfigDescriptor.parse(fileobj)
+
+
+class DecoderConfigDescriptor(BaseDescriptor):
+
+    TAG = 0x4
+
+    decSpecificInfo = None
+    """A DecoderSpecificInfo, optional"""
+
+    def __init__(self, fileobj, length):
+        """Raises DescriptorError"""
+
+        r = BitReader(fileobj)
+
+        try:
+            self.objectTypeIndication = r.bits(8)
+            self.streamType = r.bits(6)
+            self.upStream = r.bits(1)
+            self.reserved = r.bits(1)
+            self.bufferSizeDB = r.bits(24)
+            self.maxBitrate = r.bits(32)
+            self.avgBitrate = r.bits(32)
+
+            if (self.objectTypeIndication, self.streamType) != (0x40, 0x5):
+                return
+
+            # all from here is optional
+            if length * 8 == r.get_position():
+                return
+
+            tag = r.bits(8)
+        except BitReaderError as e:
+            raise DescriptorError(e)
+
+        if tag == DecoderSpecificInfo.TAG:
+            assert r.is_aligned()
+            self.decSpecificInfo = DecoderSpecificInfo.parse(fileobj)
+
+    @property
+    def codec_param(self):
+        """string"""
+
+        param = u".%X" % self.objectTypeIndication
+        info = self.decSpecificInfo
+        if info is not None:
+            param += u".%d" % info.audioObjectType
+        return param
+
+    @property
+    def codec_desc(self):
+        """string or None"""
+
+        info = self.decSpecificInfo
+        desc = None
+        if info is not None:
+            desc = info.description
+        return desc
+
+
+class DecoderSpecificInfo(BaseDescriptor):
+
+    TAG = 0x5
+
+    _TYPE_NAMES = [
+        None, "AAC MAIN", "AAC LC", "AAC SSR", "AAC LTP", "SBR",
+        "AAC scalable", "TwinVQ", "CELP", "HVXC", None, None, "TTSI",
+        "Main synthetic", "Wavetable synthesis", "General MIDI",
+        "Algorithmic Synthesis and Audio FX", "ER AAC LC", None, "ER AAC LTP",
+        "ER AAC scalable", "ER Twin VQ", "ER BSAC", "ER AAC LD", "ER CELP",
+        "ER HVXC", "ER HILN", "ER Parametric", "SSC", "PS", "MPEG Surround",
+        None, "Layer-1", "Layer-2", "Layer-3", "DST", "ALS", "SLS",
+        "SLS non-core", "ER AAC ELD", "SMR Simple", "SMR Main", "USAC",
+        "SAOC", "LD MPEG Surround", "USAC"
+    ]
+
+    _FREQS = [
+        96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000,
+        12000, 11025, 8000, 7350,
+    ]
+
+    @property
+    def description(self):
+        """string or None if unknown"""
+
+        name = None
+        try:
+            name = self._TYPE_NAMES[self.audioObjectType]
+        except IndexError:
+            pass
+        if name is None:
+            return
+        if self.sbrPresentFlag == 1:
+            name += "+SBR"
+        if self.psPresentFlag == 1:
+            name += "+PS"
+        return text_type(name)
+
+    @property
+    def sample_rate(self):
+        """0 means unknown"""
+
+        if self.sbrPresentFlag == 1:
+            return self.extensionSamplingFrequency
+        elif self.sbrPresentFlag == 0:
+            return self.samplingFrequency
+        else:
+            # these are all types that support SBR
+            aot_can_sbr = (1, 2, 3, 4, 6, 17, 19, 20, 22)
+            if self.audioObjectType not in aot_can_sbr:
+                return self.samplingFrequency
+            # there shouldn't be SBR for > 48KHz
+            if self.samplingFrequency > 24000:
+                return self.samplingFrequency
+            # either samplingFrequency or samplingFrequency * 2
+            return 0
+
+    @property
+    def channels(self):
+        """channel count or 0 for unknown"""
+
+        # from ProgramConfigElement()
+        if hasattr(self, "pce_channels"):
+            return self.pce_channels
+
+        conf = getattr(
+            self, "extensionChannelConfiguration", self.channelConfiguration)
+
+        if conf == 1:
+            if self.psPresentFlag == -1:
+                return 0
+            elif self.psPresentFlag == 1:
+                return 2
+            else:
+                return 1
+        elif conf == 7:
+            return 8
+        elif conf > 7:
+            return 0
+        else:
+            return conf
+
+    def _get_audio_object_type(self, r):
+        """Raises BitReaderError"""
+
+        audioObjectType = r.bits(5)
+        if audioObjectType == 31:
+            audioObjectTypeExt = r.bits(6)
+            audioObjectType = 32 + audioObjectTypeExt
+        return audioObjectType
+
+    def _get_sampling_freq(self, r):
+        """Raises BitReaderError"""
+
+        samplingFrequencyIndex = r.bits(4)
+        if samplingFrequencyIndex == 0xf:
+            samplingFrequency = r.bits(24)
+        else:
+            try:
+                samplingFrequency = self._FREQS[samplingFrequencyIndex]
+            except IndexError:
+                samplingFrequency = 0
+        return samplingFrequency
+
+    def __init__(self, fileobj, length):
+        """Raises DescriptorError"""
+
+        r = BitReader(fileobj)
+        try:
+            self._parse(r, length)
+        except BitReaderError as e:
+            raise DescriptorError(e)
+
+    def _parse(self, r, length):
+        """Raises BitReaderError"""
+
+        def bits_left():
+            return length * 8 - r.get_position()
+
+        self.audioObjectType = self._get_audio_object_type(r)
+        self.samplingFrequency = self._get_sampling_freq(r)
+        self.channelConfiguration = r.bits(4)
+
+        self.sbrPresentFlag = -1
+        self.psPresentFlag = -1
+        if self.audioObjectType in (5, 29):
+            self.extensionAudioObjectType = 5
+            self.sbrPresentFlag = 1
+            if self.audioObjectType == 29:
+                self.psPresentFlag = 1
+            self.extensionSamplingFrequency = self._get_sampling_freq(r)
+            self.audioObjectType = self._get_audio_object_type(r)
+            if self.audioObjectType == 22:
+                self.extensionChannelConfiguration = r.bits(4)
+        else:
+            self.extensionAudioObjectType = 0
+
+        if self.audioObjectType in (1, 2, 3, 4, 6, 7, 17, 19, 20, 21, 22, 23):
+            try:
+                GASpecificConfig(r, self)
+            except NotImplementedError:
+                # unsupported, (warn?)
+                return
+        else:
+            # unsupported
+            return
+
+        if self.audioObjectType in (
+                17, 19, 20, 21, 22, 23, 24, 25, 26, 27, 39):
+            epConfig = r.bits(2)
+            if epConfig in (2, 3):
+                # unsupported
+                return
+
+        if self.extensionAudioObjectType != 5 and bits_left() >= 16:
+            syncExtensionType = r.bits(11)
+            if syncExtensionType == 0x2b7:
+                self.extensionAudioObjectType = self._get_audio_object_type(r)
+
+                if self.extensionAudioObjectType == 5:
+                    self.sbrPresentFlag = r.bits(1)
+                    if self.sbrPresentFlag == 1:
+                        self.extensionSamplingFrequency = \
+                            self._get_sampling_freq(r)
+                        if bits_left() >= 12:
+                            syncExtensionType = r.bits(11)
+                            if syncExtensionType == 0x548:
+                                self.psPresentFlag = r.bits(1)
+
+                if self.extensionAudioObjectType == 22:
+                    self.sbrPresentFlag = r.bits(1)
+                    if self.sbrPresentFlag == 1:
+                        self.extensionSamplingFrequency = \
+                            self._get_sampling_freq(r)
+                    self.extensionChannelConfiguration = r.bits(4)
+
+
+def GASpecificConfig(r, info):
+    """Reads GASpecificConfig which is needed to get the data after that
+    (there is no length defined to skip it) and to read program_config_element
+    which can contain channel counts.
+
+    May raise BitReaderError on error or
+    NotImplementedError if some reserved data was set.
+    """
+
+    assert isinstance(info, DecoderSpecificInfo)
+
+    r.skip(1)  # frameLengthFlag
+    dependsOnCoreCoder = r.bits(1)
+    if dependsOnCoreCoder:
+        r.skip(14)
+    extensionFlag = r.bits(1)
+    if not info.channelConfiguration:
+        pce = ProgramConfigElement(r)
+        info.pce_channels = pce.channels
+    if info.audioObjectType == 6 or info.audioObjectType == 20:
+        r.skip(3)
+    if extensionFlag:
+        if info.audioObjectType == 22:
+            r.skip(5 + 11)
+        if info.audioObjectType in (17, 19, 20, 23):
+            r.skip(1 + 1 + 1)
+        extensionFlag3 = r.bits(1)
+        if extensionFlag3 != 0:
+            raise NotImplementedError("extensionFlag3 set")
diff --git a/lib/mutagen/mp4/_atom.py b/lib/mutagen/mp4/_atom.py
new file mode 100644
index 00000000..7567fa10
--- /dev/null
+++ b/lib/mutagen/mp4/_atom.py
@@ -0,0 +1,190 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2006  Joe Wreschnig
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+
+import struct
+
+from mutagen._compat import PY2
+
+# This is not an exhaustive list of container atoms, but just the
+# ones this module needs to peek inside.
+_CONTAINERS = [b"moov", b"udta", b"trak", b"mdia", b"meta", b"ilst",
+               b"stbl", b"minf", b"moof", b"traf"]
+_SKIP_SIZE = {b"meta": 4}
+
+
+class AtomError(Exception):
+    pass
+
+
+class Atom(object):
+    """An individual atom.
+
+    Attributes:
+    children -- list child atoms (or None for non-container atoms)
+    length -- length of this atom, including length and name
+    name -- four byte name of the atom, as a str
+    offset -- location in the constructor-given fileobj of this atom
+
+    This structure should only be used internally by Mutagen.
+    """
+
+    children = None
+
+    def __init__(self, fileobj, level=0):
+        """May raise AtomError"""
+
+        self.offset = fileobj.tell()
+        try:
+            self.length, self.name = struct.unpack(">I4s", fileobj.read(8))
+        except struct.error:
+            raise AtomError("truncated data")
+        self._dataoffset = self.offset + 8
+        if self.length == 1:
+            try:
+                self.length, = struct.unpack(">Q", fileobj.read(8))
+            except struct.error:
+                raise AtomError("truncated data")
+            self._dataoffset += 8
+            if self.length < 16:
+                raise AtomError(
+                    "64 bit atom length can only be 16 and higher")
+        elif self.length == 0:
+            if level != 0:
+                raise AtomError(
+                    "only a top-level atom can have zero length")
+            # Only the last atom is supposed to have a zero-length, meaning it
+            # extends to the end of file.
+            fileobj.seek(0, 2)
+            self.length = fileobj.tell() - self.offset
+            fileobj.seek(self.offset + 8, 0)
+        elif self.length < 8:
+            raise AtomError(
+                "atom length can only be 0, 1 or 8 and higher")
+
+        if self.name in _CONTAINERS:
+            self.children = []
+            fileobj.seek(_SKIP_SIZE.get(self.name, 0), 1)
+            while fileobj.tell() < self.offset + self.length:
+                self.children.append(Atom(fileobj, level + 1))
+        else:
+            fileobj.seek(self.offset + self.length, 0)
+
+    def read(self, fileobj):
+        """Return if all data could be read and the atom payload"""
+
+        fileobj.seek(self._dataoffset, 0)
+        length = self.length - (self._dataoffset - self.offset)
+        data = fileobj.read(length)
+        return len(data) == length, data
+
+    @staticmethod
+    def render(name, data):
+        """Render raw atom data."""
+        # this raises OverflowError if Py_ssize_t can't handle the atom data
+        size = len(data) + 8
+        if size <= 0xFFFFFFFF:
+            return struct.pack(">I4s", size, name) + data
+        else:
+            return struct.pack(">I4sQ", 1, name, size + 8) + data
+
+    def findall(self, name, recursive=False):
+        """Recursively find all child atoms by specified name."""
+        if self.children is not None:
+            for child in self.children:
+                if child.name == name:
+                    yield child
+                if recursive:
+                    for atom in child.findall(name, True):
+                        yield atom
+
+    def __getitem__(self, remaining):
+        """Look up a child atom, potentially recursively.
+
+        e.g. atom['udta', 'meta'] => <Atom name='meta' ...>
+        """
+        if not remaining:
+            return self
+        elif self.children is None:
+            raise KeyError("%r is not a container" % self.name)
+        for child in self.children:
+            if child.name == remaining[0]:
+                return child[remaining[1:]]
+        else:
+            raise KeyError("%r not found" % remaining[0])
+
+    def __repr__(self):
+        cls = self.__class__.__name__
+        if self.children is None:
+            return "<%s name=%r length=%r offset=%r>" % (
+                cls, self.name, self.length, self.offset)
+        else:
+            children = "\n".join([" " + line for child in self.children
+                                  for line in repr(child).splitlines()])
+            return "<%s name=%r length=%r offset=%r\n%s>" % (
+                cls, self.name, self.length, self.offset, children)
+
+
+class Atoms(object):
+    """Root atoms in a given file.
+
+    Attributes:
+    atoms -- a list of top-level atoms as Atom objects
+
+    This structure should only be used internally by Mutagen.
+    """
+
+    def __init__(self, fileobj):
+        self.atoms = []
+        fileobj.seek(0, 2)
+        end = fileobj.tell()
+        fileobj.seek(0)
+        while fileobj.tell() + 8 <= end:
+            self.atoms.append(Atom(fileobj))
+
+    def path(self, *names):
+        """Look up and return the complete path of an atom.
+
+        For example, atoms.path('moov', 'udta', 'meta') will return a
+        list of three atoms, corresponding to the moov, udta, and meta
+        atoms.
+        """
+
+        path = [self]
+        for name in names:
+            path.append(path[-1][name, ])
+        return path[1:]
+
+    def __contains__(self, names):
+        try:
+            self[names]
+        except KeyError:
+            return False
+        return True
+
+    def __getitem__(self, names):
+        """Look up a child atom.
+
+        'names' may be a list of atoms (['moov', 'udta']) or a string
+        specifying the complete path ('moov.udta').
+        """
+
+        if PY2:
+            if isinstance(names, basestring):
+                names = names.split(b".")
+        else:
+            if isinstance(names, bytes):
+                names = names.split(b".")
+
+        for child in self.atoms:
+            if child.name == names[0]:
+                return child[names[1:]]
+        else:
+            raise KeyError("%s not found" % names[0])
+
+    def __repr__(self):
+        return "\n".join([repr(child) for child in self.atoms])
diff --git a/lib/mutagen/mp4/_util.py b/lib/mutagen/mp4/_util.py
new file mode 100644
index 00000000..9583334a
--- /dev/null
+++ b/lib/mutagen/mp4/_util.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2014 Christoph Reiter
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+
+from mutagen._util import cdata
+
+
+def parse_full_atom(data):
+    """Some atoms are versioned. Split them up in (version, flags, payload).
+    Can raise ValueError.
+    """
+
+    if len(data) < 4:
+        raise ValueError("not enough data")
+
+    version = ord(data[0:1])
+    flags = cdata.uint_be(b"\x00" + data[1:4])
+    return version, flags, data[4:]
diff --git a/lib/mutagen/musepack.py b/lib/mutagen/musepack.py
new file mode 100644
index 00000000..0dc940f1
--- /dev/null
+++ b/lib/mutagen/musepack.py
@@ -0,0 +1,270 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2006  Lukas Lalinsky
+# Copyright (C) 2012  Christoph Reiter
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+
+"""Musepack audio streams with APEv2 tags.
+
+Musepack is an audio format originally based on the MPEG-1 Layer-2
+algorithms. Stream versions 4 through 7 are supported.
+
+For more information, see http://www.musepack.net/.
+"""
+
+__all__ = ["Musepack", "Open", "delete"]
+
+import struct
+
+from ._compat import endswith, xrange
+from mutagen import StreamInfo
+from mutagen.apev2 import APEv2File, error, delete
+from mutagen.id3 import BitPaddedInt
+from mutagen._util import cdata
+
+
+class MusepackHeaderError(error):
+    pass
+
+
+RATES = [44100, 48000, 37800, 32000]
+
+
+def _parse_sv8_int(fileobj, limit=9):
+    """Reads (max limit) bytes from fileobj until the MSB is zero.
+    All 7 LSB will be merged to a big endian uint.
+
+    Raises ValueError in case not MSB is zero, or EOFError in
+    case the file ended before limit is reached.
+
+    Returns (parsed number, number of bytes read)
+    """
+
+    num = 0
+    for i in xrange(limit):
+        c = fileobj.read(1)
+        if len(c) != 1:
+            raise EOFError
+        c = bytearray(c)
+        num = (num << 7) | (c[0] & 0x7F)
+        if not c[0] & 0x80:
+            return num, i + 1
+    if limit > 0:
+        raise ValueError
+    return 0, 0
+
+
+def _calc_sv8_gain(gain):
+    # 64.82 taken from mpcdec
+    return 64.82 - gain / 256.0
+
+
+def _calc_sv8_peak(peak):
+    return (10 ** (peak / (256.0 * 20.0)) / 65535.0)
+
+
+class MusepackInfo(StreamInfo):
+    """Musepack stream information.
+
+    Attributes:
+
+    * channels -- number of audio channels
+    * length -- file length in seconds, as a float
+    * sample_rate -- audio sampling rate in Hz
+    * bitrate -- audio bitrate, in bits per second
+    * version -- Musepack stream version
+
+    Optional Attributes:
+
+    * title_gain, title_peak -- Replay Gain and peak data for this song
+    * album_gain, album_peak -- Replay Gain and peak data for this album
+
+    These attributes are only available in stream version 7/8. The
+    gains are a float, +/- some dB. The peaks are a percentage [0..1] of
+    the maximum amplitude. This means to get a number comparable to
+    VorbisGain, you must multiply the peak by 2.
+    """
+
+    def __init__(self, fileobj):
+        header = fileobj.read(4)
+        if len(header) != 4:
+            raise MusepackHeaderError("not a Musepack file")
+
+        # Skip ID3v2 tags
+        if header[:3] == b"ID3":
+            header = fileobj.read(6)
+            if len(header) != 6:
+                raise MusepackHeaderError("not a Musepack file")
+            size = 10 + BitPaddedInt(header[2:6])
+            fileobj.seek(size)
+            header = fileobj.read(4)
+            if len(header) != 4:
+                raise MusepackHeaderError("not a Musepack file")
+
+        if header.startswith(b"MPCK"):
+            self.__parse_sv8(fileobj)
+        else:
+            self.__parse_sv467(fileobj)
+
+        if not self.bitrate and self.length != 0:
+            fileobj.seek(0, 2)
+            self.bitrate = int(round(fileobj.tell() * 8 / self.length))
+
+    def __parse_sv8(self, fileobj):
+        # SV8 http://trac.musepack.net/trac/wiki/SV8Specification
+
+        key_size = 2
+        mandatory_packets = [b"SH", b"RG"]
+
+        def check_frame_key(key):
+            if ((len(frame_type) != key_size) or
+                    (not b'AA' <= frame_type <= b'ZZ')):
+                raise MusepackHeaderError("Invalid frame key.")
+
+        frame_type = fileobj.read(key_size)
+        check_frame_key(frame_type)
+
+        while frame_type not in (b"AP", b"SE") and mandatory_packets:
+            try:
+                frame_size, slen = _parse_sv8_int(fileobj)
+            except (EOFError, ValueError):
+                raise MusepackHeaderError("Invalid packet size.")
+            data_size = frame_size - key_size - slen
+            # packets can be at maximum data_size big and are padded with zeros
+
+            if frame_type == b"SH":
+                mandatory_packets.remove(frame_type)
+                self.__parse_stream_header(fileobj, data_size)
+            elif frame_type == b"RG":
+                mandatory_packets.remove(frame_type)
+                self.__parse_replaygain_packet(fileobj, data_size)
+            else:
+                fileobj.seek(data_size, 1)
+
+            frame_type = fileobj.read(key_size)
+            check_frame_key(frame_type)
+
+        if mandatory_packets:
+            raise MusepackHeaderError("Missing mandatory packets: %s." %
+                                      ", ".join(map(repr, mandatory_packets)))
+
+        self.length = float(self.samples) / self.sample_rate
+        self.bitrate = 0
+
+    def __parse_stream_header(self, fileobj, data_size):
+        # skip CRC
+        fileobj.seek(4, 1)
+        remaining_size = data_size - 4
+
+        try:
+            self.version = bytearray(fileobj.read(1))[0]
+        except TypeError:
+            raise MusepackHeaderError("SH packet ended unexpectedly.")
+
+        remaining_size -= 1
+
+        try:
+            samples, l1 = _parse_sv8_int(fileobj)
+            samples_skip, l2 = _parse_sv8_int(fileobj)
+        except (EOFError, ValueError):
+            raise MusepackHeaderError(
+                "SH packet: Invalid sample counts.")
+
+        self.samples = samples - samples_skip
+        remaining_size -= l1 + l2
+
+        data = fileobj.read(remaining_size)
+        if len(data) != remaining_size:
+            raise MusepackHeaderError("SH packet ended unexpectedly.")
+        self.sample_rate = RATES[bytearray(data)[0] >> 5]
+        self.channels = (bytearray(data)[1] >> 4) + 1
+
+    def __parse_replaygain_packet(self, fileobj, data_size):
+        data = fileobj.read(data_size)
+        if data_size < 9:
+            raise MusepackHeaderError("Invalid RG packet size.")
+        if len(data) != data_size:
+            raise MusepackHeaderError("RG packet ended unexpectedly.")
+        title_gain = cdata.short_be(data[1:3])
+        title_peak = cdata.short_be(data[3:5])
+        album_gain = cdata.short_be(data[5:7])
+        album_peak = cdata.short_be(data[7:9])
+        if title_gain:
+            self.title_gain = _calc_sv8_gain(title_gain)
+        if title_peak:
+            self.title_peak = _calc_sv8_peak(title_peak)
+        if album_gain:
+            self.album_gain = _calc_sv8_gain(album_gain)
+        if album_peak:
+            self.album_peak = _calc_sv8_peak(album_peak)
+
+    def __parse_sv467(self, fileobj):
+        fileobj.seek(-4, 1)
+        header = fileobj.read(32)
+        if len(header) != 32:
+            raise MusepackHeaderError("not a Musepack file")
+
+        # SV7
+        if header.startswith(b"MP+"):
+            self.version = bytearray(header)[3] & 0xF
+            if self.version < 7:
+                raise MusepackHeaderError("not a Musepack file")
+            frames = cdata.uint_le(header[4:8])
+            flags = cdata.uint_le(header[8:12])
+
+            self.title_peak, self.title_gain = struct.unpack(
+                "<Hh", header[12:16])
+            self.album_peak, self.album_gain = struct.unpack(
+                "<Hh", header[16:20])
+            self.title_gain /= 100.0
+            self.album_gain /= 100.0
+            self.title_peak /= 65535.0
+            self.album_peak /= 65535.0
+
+            self.sample_rate = RATES[(flags >> 16) & 0x0003]
+            self.bitrate = 0
+        # SV4-SV6
+        else:
+            header_dword = cdata.uint_le(header[0:4])
+            self.version = (header_dword >> 11) & 0x03FF
+            if self.version < 4 or self.version > 6:
+                raise MusepackHeaderError("not a Musepack file")
+            self.bitrate = (header_dword >> 23) & 0x01FF
+            self.sample_rate = 44100
+            if self.version >= 5:
+                frames = cdata.uint_le(header[4:8])
+            else:
+                frames = cdata.ushort_le(header[6:8])
+            if self.version < 6:
+                frames -= 1
+        self.channels = 2
+        self.length = float(frames * 1152 - 576) / self.sample_rate
+
+    def pprint(self):
+        rg_data = []
+        if hasattr(self, "title_gain"):
+            rg_data.append("%+0.2f (title)" % self.title_gain)
+        if hasattr(self, "album_gain"):
+            rg_data.append("%+0.2f (album)" % self.album_gain)
+        rg_data = (rg_data and ", Gain: " + ", ".join(rg_data)) or ""
+
+        return "Musepack SV%d, %.2f seconds, %d Hz, %d bps%s" % (
+            self.version, self.length, self.sample_rate, self.bitrate, rg_data)
+
+
+class Musepack(APEv2File):
+    _Info = MusepackInfo
+    _mimes = ["audio/x-musepack", "audio/x-mpc"]
+
+    @staticmethod
+    def score(filename, fileobj, header):
+        filename = filename.lower()
+
+        return (header.startswith(b"MP+") + header.startswith(b"MPCK") +
+                endswith(filename, b".mpc"))
+
+
+Open = Musepack
diff --git a/lib/mutagen/ogg.py b/lib/mutagen/ogg.py
new file mode 100644
index 00000000..99eaf422
--- /dev/null
+++ b/lib/mutagen/ogg.py
@@ -0,0 +1,508 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2006  Joe Wreschnig
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+
+"""Read and write Ogg bitstreams and pages.
+
+This module reads and writes a subset of the Ogg bitstream format
+version 0. It does *not* read or write Ogg Vorbis files! For that,
+you should use mutagen.oggvorbis.
+
+This implementation is based on the RFC 3533 standard found at
+http://www.xiph.org/ogg/doc/rfc3533.txt.
+"""
+
+import struct
+import sys
+import zlib
+
+from mutagen import FileType
+from mutagen._util import cdata, insert_bytes, delete_bytes, MutagenError
+from ._compat import cBytesIO, reraise, chr_
+
+
+class error(IOError, MutagenError):
+    """Ogg stream parsing errors."""
+
+    pass
+
+
+class OggPage(object):
+    """A single Ogg page (not necessarily a single encoded packet).
+
+    A page is a header of 26 bytes, followed by the length of the
+    data, followed by the data.
+
+    The constructor is givin a file-like object pointing to the start
+    of an Ogg page. After the constructor is finished it is pointing
+    to the start of the next page.
+
+    Attributes:
+
+    * version -- stream structure version (currently always 0)
+    * position -- absolute stream position (default -1)
+    * serial -- logical stream serial number (default 0)
+    * sequence -- page sequence number within logical stream (default 0)
+    * offset -- offset this page was read from (default None)
+    * complete -- if the last packet on this page is complete (default True)
+    * packets -- list of raw packet data (default [])
+
+    Note that if 'complete' is false, the next page's 'continued'
+    property must be true (so set both when constructing pages).
+
+    If a file-like object is supplied to the constructor, the above
+    attributes will be filled in based on it.
+    """
+
+    version = 0
+    __type_flags = 0
+    position = 0
+    serial = 0
+    sequence = 0
+    offset = None
+    complete = True
+
+    def __init__(self, fileobj=None):
+        self.packets = []
+
+        if fileobj is None:
+            return
+
+        self.offset = fileobj.tell()
+
+        header = fileobj.read(27)
+        if len(header) == 0:
+            raise EOFError
+
+        try:
+            (oggs, self.version, self.__type_flags,
+             self.position, self.serial, self.sequence,
+             crc, segments) = struct.unpack("<4sBBqIIiB", header)
+        except struct.error:
+            raise error("unable to read full header; got %r" % header)
+
+        if oggs != b"OggS":
+            raise error("read %r, expected %r, at 0x%x" % (
+                oggs, b"OggS", fileobj.tell() - 27))
+
+        if self.version != 0:
+            raise error("version %r unsupported" % self.version)
+
+        total = 0
+        lacings = []
+        lacing_bytes = fileobj.read(segments)
+        if len(lacing_bytes) != segments:
+            raise error("unable to read %r lacing bytes" % segments)
+        for c in bytearray(lacing_bytes):
+            total += c
+            if c < 255:
+                lacings.append(total)
+                total = 0
+        if total:
+            lacings.append(total)
+            self.complete = False
+
+        self.packets = [fileobj.read(l) for l in lacings]
+        if [len(p) for p in self.packets] != lacings:
+            raise error("unable to read full data")
+
+    def __eq__(self, other):
+        """Two Ogg pages are the same if they write the same data."""
+        try:
+            return (self.write() == other.write())
+        except AttributeError:
+            return False
+
+    __hash__ = object.__hash__
+
+    def __repr__(self):
+        attrs = ['version', 'position', 'serial', 'sequence', 'offset',
+                 'complete', 'continued', 'first', 'last']
+        values = ["%s=%r" % (attr, getattr(self, attr)) for attr in attrs]
+        return "<%s %s, %d bytes in %d packets>" % (
+            type(self).__name__, " ".join(values), sum(map(len, self.packets)),
+            len(self.packets))
+
+    def write(self):
+        """Return a string encoding of the page header and data.
+
+        A ValueError is raised if the data is too big to fit in a
+        single page.
+        """
+
+        data = [
+            struct.pack("<4sBBqIIi", b"OggS", self.version, self.__type_flags,
+                        self.position, self.serial, self.sequence, 0)
+        ]
+
+        lacing_data = []
+        for datum in self.packets:
+            quot, rem = divmod(len(datum), 255)
+            lacing_data.append(b"\xff" * quot + chr_(rem))
+        lacing_data = b"".join(lacing_data)
+        if not self.complete and lacing_data.endswith(b"\x00"):
+            lacing_data = lacing_data[:-1]
+        data.append(chr_(len(lacing_data)))
+        data.append(lacing_data)
+        data.extend(self.packets)
+        data = b"".join(data)
+
+        # Python's CRC is swapped relative to Ogg's needs.
+        # crc32 returns uint prior to py2.6 on some platforms, so force uint
+        crc = (~zlib.crc32(data.translate(cdata.bitswap), -1)) & 0xffffffff
+        # Although we're using to_uint_be, this actually makes the CRC
+        # a proper le integer, since Python's CRC is byteswapped.
+        crc = cdata.to_uint_be(crc).translate(cdata.bitswap)
+        data = data[:22] + crc + data[26:]
+        return data
+
+    @property
+    def size(self):
+        """Total frame size."""
+
+        size = 27  # Initial header size
+        for datum in self.packets:
+            quot, rem = divmod(len(datum), 255)
+            size += quot + 1
+        if not self.complete and rem == 0:
+            # Packet contains a multiple of 255 bytes and is not
+            # terminated, so we don't have a \x00 at the end.
+            size -= 1
+        size += sum(map(len, self.packets))
+        return size
+
+    def __set_flag(self, bit, val):
+        mask = 1 << bit
+        if val:
+            self.__type_flags |= mask
+        else:
+            self.__type_flags &= ~mask
+
+    continued = property(
+        lambda self: cdata.test_bit(self.__type_flags, 0),
+        lambda self, v: self.__set_flag(0, v),
+        doc="The first packet is continued from the previous page.")
+
+    first = property(
+        lambda self: cdata.test_bit(self.__type_flags, 1),
+        lambda self, v: self.__set_flag(1, v),
+        doc="This is the first page of a logical bitstream.")
+
+    last = property(
+        lambda self: cdata.test_bit(self.__type_flags, 2),
+        lambda self, v: self.__set_flag(2, v),
+        doc="This is the last page of a logical bitstream.")
+
+    @staticmethod
+    def renumber(fileobj, serial, start):
+        """Renumber pages belonging to a specified logical stream.
+
+        fileobj must be opened with mode r+b or w+b.
+
+        Starting at page number 'start', renumber all pages belonging
+        to logical stream 'serial'. Other pages will be ignored.
+
+        fileobj must point to the start of a valid Ogg page; any
+        occuring after it and part of the specified logical stream
+        will be numbered. No adjustment will be made to the data in
+        the pages nor the granule position; only the page number, and
+        so also the CRC.
+
+        If an error occurs (e.g. non-Ogg data is found), fileobj will
+        be left pointing to the place in the stream the error occured,
+        but the invalid data will be left intact (since this function
+        does not change the total file size).
+        """
+
+        number = start
+        while True:
+            try:
+                page = OggPage(fileobj)
+            except EOFError:
+                break
+            else:
+                if page.serial != serial:
+                    # Wrong stream, skip this page.
+                    continue
+                # Changing the number can't change the page size,
+                # so seeking back based on the current size is safe.
+                fileobj.seek(-page.size, 1)
+            page.sequence = number
+            fileobj.write(page.write())
+            fileobj.seek(page.offset + page.size, 0)
+            number += 1
+
+    @staticmethod
+    def to_packets(pages, strict=False):
+        """Construct a list of packet data from a list of Ogg pages.
+
+        If strict is true, the first page must start a new packet,
+        and the last page must end the last packet.
+        """
+
+        serial = pages[0].serial
+        sequence = pages[0].sequence
+        packets = []
+
+        if strict:
+            if pages[0].continued:
+                raise ValueError("first packet is continued")
+            if not pages[-1].complete:
+                raise ValueError("last packet does not complete")
+        elif pages and pages[0].continued:
+            packets.append([b""])
+
+        for page in pages:
+            if serial != page.serial:
+                raise ValueError("invalid serial number in %r" % page)
+            elif sequence != page.sequence:
+                raise ValueError("bad sequence number in %r" % page)
+            else:
+                sequence += 1
+
+            if page.continued:
+                packets[-1].append(page.packets[0])
+            else:
+                packets.append([page.packets[0]])
+            packets.extend([p] for p in page.packets[1:])
+
+        return [b"".join(p) for p in packets]
+
+    @staticmethod
+    def from_packets(packets, sequence=0, default_size=4096,
+                     wiggle_room=2048):
+        """Construct a list of Ogg pages from a list of packet data.
+
+        The algorithm will generate pages of approximately
+        default_size in size (rounded down to the nearest multiple of
+        255). However, it will also allow pages to increase to
+        approximately default_size + wiggle_room if allowing the
+        wiggle room would finish a packet (only one packet will be
+        finished in this way per page; if the next packet would fit
+        into the wiggle room, it still starts on a new page).
+
+        This method reduces packet fragmentation when packet sizes are
+        slightly larger than the default page size, while still
+        ensuring most pages are of the average size.
+
+        Pages are numbered started at 'sequence'; other information is
+        uninitialized.
+        """
+
+        chunk_size = (default_size // 255) * 255
+
+        pages = []
+
+        page = OggPage()
+        page.sequence = sequence
+
+        for packet in packets:
+            page.packets.append(b"")
+            while packet:
+                data, packet = packet[:chunk_size], packet[chunk_size:]
+                if page.size < default_size and len(page.packets) < 255:
+                    page.packets[-1] += data
+                else:
+                    # If we've put any packet data into this page yet,
+                    # we need to mark it incomplete. However, we can
+                    # also have just started this packet on an already
+                    # full page, in which case, just start the new
+                    # page with this packet.
+                    if page.packets[-1]:
+                        page.complete = False
+                        if len(page.packets) == 1:
+                            page.position = -1
+                    else:
+                        page.packets.pop(-1)
+                    pages.append(page)
+                    page = OggPage()
+                    page.continued = not pages[-1].complete
+                    page.sequence = pages[-1].sequence + 1
+                    page.packets.append(data)
+
+                if len(packet) < wiggle_room:
+                    page.packets[-1] += packet
+                    packet = b""
+
+        if page.packets:
+            pages.append(page)
+
+        return pages
+
+    @classmethod
+    def replace(cls, fileobj, old_pages, new_pages):
+        """Replace old_pages with new_pages within fileobj.
+
+        old_pages must have come from reading fileobj originally.
+        new_pages are assumed to have the 'same' data as old_pages,
+        and so the serial and sequence numbers will be copied, as will
+        the flags for the first and last pages.
+
+        fileobj will be resized and pages renumbered as necessary. As
+        such, it must be opened r+b or w+b.
+        """
+
+        # Number the new pages starting from the first old page.
+        first = old_pages[0].sequence
+        for page, seq in zip(new_pages, range(first, first + len(new_pages))):
+            page.sequence = seq
+            page.serial = old_pages[0].serial
+
+        new_pages[0].first = old_pages[0].first
+        new_pages[0].last = old_pages[0].last
+        new_pages[0].continued = old_pages[0].continued
+
+        new_pages[-1].first = old_pages[-1].first
+        new_pages[-1].last = old_pages[-1].last
+        new_pages[-1].complete = old_pages[-1].complete
+        if not new_pages[-1].complete and len(new_pages[-1].packets) == 1:
+            new_pages[-1].position = -1
+
+        new_data = b"".join(cls.write(p) for p in new_pages)
+
+        # Make room in the file for the new data.
+        delta = len(new_data)
+        fileobj.seek(old_pages[0].offset, 0)
+        insert_bytes(fileobj, delta, old_pages[0].offset)
+        fileobj.seek(old_pages[0].offset, 0)
+        fileobj.write(new_data)
+        new_data_end = old_pages[0].offset + delta
+
+        # Go through the old pages and delete them. Since we shifted
+        # the data down the file, we need to adjust their offsets. We
+        # also need to go backwards, so we don't adjust the deltas of
+        # the other pages.
+        old_pages.reverse()
+        for old_page in old_pages:
+            adj_offset = old_page.offset + delta
+            delete_bytes(fileobj, old_page.size, adj_offset)
+
+        # Finally, if there's any discrepency in length, we need to
+        # renumber the pages for the logical stream.
+        if len(old_pages) != len(new_pages):
+            fileobj.seek(new_data_end, 0)
+            serial = new_pages[-1].serial
+            sequence = new_pages[-1].sequence + 1
+            cls.renumber(fileobj, serial, sequence)
+
+    @staticmethod
+    def find_last(fileobj, serial):
+        """Find the last page of the stream 'serial'.
+
+        If the file is not multiplexed this function is fast. If it is,
+        it must read the whole the stream.
+
+        This finds the last page in the actual file object, or the last
+        page in the stream (with eos set), whichever comes first.
+        """
+
+        # For non-muxed streams, look at the last page.
+        try:
+            fileobj.seek(-256 * 256, 2)
+        except IOError:
+            # The file is less than 64k in length.
+            fileobj.seek(0)
+        data = fileobj.read()
+        try:
+            index = data.rindex(b"OggS")
+        except ValueError:
+            raise error("unable to find final Ogg header")
+        bytesobj = cBytesIO(data[index:])
+        best_page = None
+        try:
+            page = OggPage(bytesobj)
+        except error:
+            pass
+        else:
+            if page.serial == serial:
+                if page.last:
+                    return page
+                else:
+                    best_page = page
+            else:
+                best_page = None
+
+        # The stream is muxed, so use the slow way.
+        fileobj.seek(0)
+        try:
+            page = OggPage(fileobj)
+            while not page.last:
+                page = OggPage(fileobj)
+                while page.serial != serial:
+                    page = OggPage(fileobj)
+                best_page = page
+            return page
+        except error:
+            return best_page
+        except EOFError:
+            return best_page
+
+
+class OggFileType(FileType):
+    """An generic Ogg file."""
+
+    _Info = None
+    _Tags = None
+    _Error = None
+    _mimes = ["application/ogg", "application/x-ogg"]
+
+    def load(self, filename):
+        """Load file information from a filename."""
+
+        self.filename = filename
+        fileobj = open(filename, "rb")
+        try:
+            try:
+                self.info = self._Info(fileobj)
+                self.tags = self._Tags(fileobj, self.info)
+                self.info._post_tags(fileobj)
+            except error as e:
+                reraise(self._Error, e, sys.exc_info()[2])
+            except EOFError:
+                raise self._Error("no appropriate stream found")
+        finally:
+            fileobj.close()
+
+    def delete(self, filename=None):
+        """Remove tags from a file.
+
+        If no filename is given, the one most recently loaded is used.
+        """
+
+        if filename is None:
+            filename = self.filename
+
+        self.tags.clear()
+        fileobj = open(filename, "rb+")
+        try:
+            try:
+                self.tags._inject(fileobj)
+            except error as e:
+                reraise(self._Error, e, sys.exc_info()[2])
+            except EOFError:
+                raise self._Error("no appropriate stream found")
+        finally:
+            fileobj.close()
+
+    def save(self, filename=None):
+        """Save a tag to a file.
+
+        If no filename is given, the one most recently loaded is used.
+        """
+
+        if filename is None:
+            filename = self.filename
+        fileobj = open(filename, "rb+")
+        try:
+            try:
+                self.tags._inject(fileobj)
+            except error as e:
+                reraise(self._Error, e, sys.exc_info()[2])
+            except EOFError:
+                raise self._Error("no appropriate stream found")
+        finally:
+            fileobj.close()
diff --git a/lib/mutagen/oggflac.py b/lib/mutagen/oggflac.py
new file mode 100644
index 00000000..507a7f55
--- /dev/null
+++ b/lib/mutagen/oggflac.py
@@ -0,0 +1,147 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2006  Joe Wreschnig
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+
+"""Read and write Ogg FLAC comments.
+
+This module handles FLAC files wrapped in an Ogg bitstream. The first
+FLAC stream found is used. For 'naked' FLACs, see mutagen.flac.
+
+This module is based off the specification at
+http://flac.sourceforge.net/ogg_mapping.html.
+"""
+
+__all__ = ["OggFLAC", "Open", "delete"]
+
+import struct
+
+from ._compat import cBytesIO
+
+from mutagen.flac import StreamInfo, VCFLACDict, StrictFileObject
+from mutagen.ogg import OggPage, OggFileType, error as OggError
+
+
+class error(OggError):
+    pass
+
+
+class OggFLACHeaderError(error):
+    pass
+
+
+class OggFLACStreamInfo(StreamInfo):
+    """Ogg FLAC general header and stream info.
+
+    This encompasses the Ogg wrapper for the FLAC STREAMINFO metadata
+    block, as well as the Ogg codec setup that precedes it.
+
+    Attributes (in addition to StreamInfo's):
+
+    * packets -- number of metadata packets
+    * serial -- Ogg logical stream serial number
+    """
+
+    packets = 0
+    serial = 0
+
+    def load(self, data):
+        # Ogg expects file objects that don't raise on read
+        if isinstance(data, StrictFileObject):
+            data = data._fileobj
+
+        page = OggPage(data)
+        while not page.packets[0].startswith(b"\x7FFLAC"):
+            page = OggPage(data)
+        major, minor, self.packets, flac = struct.unpack(
+            ">BBH4s", page.packets[0][5:13])
+        if flac != b"fLaC":
+            raise OggFLACHeaderError("invalid FLAC marker (%r)" % flac)
+        elif (major, minor) != (1, 0):
+            raise OggFLACHeaderError(
+                "unknown mapping version: %d.%d" % (major, minor))
+        self.serial = page.serial
+
+        # Skip over the block header.
+        stringobj = StrictFileObject(cBytesIO(page.packets[0][17:]))
+        super(OggFLACStreamInfo, self).load(stringobj)
+
+    def _post_tags(self, fileobj):
+        if self.length:
+            return
+        page = OggPage.find_last(fileobj, self.serial)
+        self.length = page.position / float(self.sample_rate)
+
+    def pprint(self):
+        return u"Ogg " + super(OggFLACStreamInfo, self).pprint()
+
+
+class OggFLACVComment(VCFLACDict):
+    def load(self, data, info, errors='replace'):
+        # data should be pointing at the start of an Ogg page, after
+        # the first FLAC page.
+        pages = []
+        complete = False
+        while not complete:
+            page = OggPage(data)
+            if page.serial == info.serial:
+                pages.append(page)
+                complete = page.complete or (len(page.packets) > 1)
+        comment = cBytesIO(OggPage.to_packets(pages)[0][4:])
+        super(OggFLACVComment, self).load(comment, errors=errors)
+
+    def _inject(self, fileobj):
+        """Write tag data into the FLAC Vorbis comment packet/page."""
+
+        # Ogg FLAC has no convenient data marker like Vorbis, but the
+        # second packet - and second page - must be the comment data.
+        fileobj.seek(0)
+        page = OggPage(fileobj)
+        while not page.packets[0].startswith(b"\x7FFLAC"):
+            page = OggPage(fileobj)
+
+        first_page = page
+        while not (page.sequence == 1 and page.serial == first_page.serial):
+            page = OggPage(fileobj)
+
+        old_pages = [page]
+        while not (old_pages[-1].complete or len(old_pages[-1].packets) > 1):
+            page = OggPage(fileobj)
+            if page.serial == first_page.serial:
+                old_pages.append(page)
+
+        packets = OggPage.to_packets(old_pages, strict=False)
+
+        # Set the new comment block.
+        data = self.write()
+        data = packets[0][:1] + struct.pack(">I", len(data))[-3:] + data
+        packets[0] = data
+
+        new_pages = OggPage.from_packets(packets, old_pages[0].sequence)
+        OggPage.replace(fileobj, old_pages, new_pages)
+
+
+class OggFLAC(OggFileType):
+    """An Ogg FLAC file."""
+
+    _Info = OggFLACStreamInfo
+    _Tags = OggFLACVComment
+    _Error = OggFLACHeaderError
+    _mimes = ["audio/x-oggflac"]
+
+    @staticmethod
+    def score(filename, fileobj, header):
+        return (header.startswith(b"OggS") * (
+            (b"FLAC" in header) + (b"fLaC" in header)))
+
+
+Open = OggFLAC
+
+
+def delete(filename):
+    """Remove tags from a file."""
+
+    OggFLAC(filename).delete()
diff --git a/lib/mutagen/oggopus.py b/lib/mutagen/oggopus.py
new file mode 100644
index 00000000..091dcf43
--- /dev/null
+++ b/lib/mutagen/oggopus.py
@@ -0,0 +1,138 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2012, 2013  Christoph Reiter
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+
+"""Read and write Ogg Opus comments.
+
+This module handles Opus files wrapped in an Ogg bitstream. The
+first Opus stream found is used.
+
+Based on http://tools.ietf.org/html/draft-terriberry-oggopus-01
+"""
+
+__all__ = ["OggOpus", "Open", "delete"]
+
+import struct
+
+from mutagen import StreamInfo
+from mutagen._compat import BytesIO
+from mutagen._vorbis import VCommentDict
+from mutagen.ogg import OggPage, OggFileType, error as OggError
+
+
+class error(OggError):
+    pass
+
+
+class OggOpusHeaderError(error):
+    pass
+
+
+class OggOpusInfo(StreamInfo):
+    """Ogg Opus stream information.
+
+    Attributes:
+
+    * length - file length in seconds, as a float
+    * channels - number of channels
+    """
+
+    length = 0
+
+    def __init__(self, fileobj):
+        page = OggPage(fileobj)
+        while not page.packets[0].startswith(b"OpusHead"):
+            page = OggPage(fileobj)
+
+        self.serial = page.serial
+
+        if not page.first:
+            raise OggOpusHeaderError(
+                "page has ID header, but doesn't start a stream")
+
+        (version, self.channels, pre_skip, orig_sample_rate, output_gain,
+         channel_map) = struct.unpack("<BBHIhB", page.packets[0][8:19])
+
+        self.__pre_skip = pre_skip
+
+        # only the higher 4 bits change on incombatible changes
+        major = version >> 4
+        if major != 0:
+            raise OggOpusHeaderError("version %r unsupported" % major)
+
+    def _post_tags(self, fileobj):
+        page = OggPage.find_last(fileobj, self.serial)
+        self.length = (page.position - self.__pre_skip) / float(48000)
+
+    def pprint(self):
+        return u"Ogg Opus, %.2f seconds" % (self.length)
+
+
+class OggOpusVComment(VCommentDict):
+    """Opus comments embedded in an Ogg bitstream."""
+
+    def __get_comment_pages(self, fileobj, info):
+        # find the first tags page with the right serial
+        page = OggPage(fileobj)
+        while ((info.serial != page.serial) or
+                not page.packets[0].startswith(b"OpusTags")):
+            page = OggPage(fileobj)
+
+        # get all comment pages
+        pages = [page]
+        while not (pages[-1].complete or len(pages[-1].packets) > 1):
+            page = OggPage(fileobj)
+            if page.serial == pages[0].serial:
+                pages.append(page)
+
+        return pages
+
+    def __init__(self, fileobj, info):
+        pages = self.__get_comment_pages(fileobj, info)
+        data = OggPage.to_packets(pages)[0][8:]  # Strip OpusTags
+        fileobj = BytesIO(data)
+        super(OggOpusVComment, self).__init__(fileobj, framing=False)
+
+        # in case the LSB of the first byte after v-comment is 1, preserve the
+        # following data
+        padding_flag = fileobj.read(1)
+        if padding_flag and ord(padding_flag) & 0x1:
+            self._pad_data = padding_flag + fileobj.read()
+        else:
+            self._pad_data = b""
+
+    def _inject(self, fileobj):
+        fileobj.seek(0)
+        info = OggOpusInfo(fileobj)
+        old_pages = self.__get_comment_pages(fileobj, info)
+
+        packets = OggPage.to_packets(old_pages)
+        packets[0] = b"OpusTags" + self.write(framing=False) + self._pad_data
+        new_pages = OggPage.from_packets(packets, old_pages[0].sequence)
+        OggPage.replace(fileobj, old_pages, new_pages)
+
+
+class OggOpus(OggFileType):
+    """An Ogg Opus file."""
+
+    _Info = OggOpusInfo
+    _Tags = OggOpusVComment
+    _Error = OggOpusHeaderError
+    _mimes = ["audio/ogg", "audio/ogg; codecs=opus"]
+
+    @staticmethod
+    def score(filename, fileobj, header):
+        return (header.startswith(b"OggS") * (b"OpusHead" in header))
+
+
+Open = OggOpus
+
+
+def delete(filename):
+    """Remove tags from a file."""
+
+    OggOpus(filename).delete()
diff --git a/lib/mutagen/oggspeex.py b/lib/mutagen/oggspeex.py
new file mode 100644
index 00000000..0590fa6b
--- /dev/null
+++ b/lib/mutagen/oggspeex.py
@@ -0,0 +1,138 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2006 Joe Wreschnig
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+
+"""Read and write Ogg Speex comments.
+
+This module handles Speex files wrapped in an Ogg bitstream. The
+first Speex stream found is used.
+
+Read more about Ogg Speex at http://www.speex.org/. This module is
+based on the specification at http://www.speex.org/manual2/node7.html
+and clarifications after personal communication with Jean-Marc,
+http://lists.xiph.org/pipermail/speex-dev/2006-July/004676.html.
+"""
+
+__all__ = ["OggSpeex", "Open", "delete"]
+
+from mutagen import StreamInfo
+from mutagen._vorbis import VCommentDict
+from mutagen.ogg import OggPage, OggFileType, error as OggError
+from mutagen._util import cdata
+
+
+class error(OggError):
+    pass
+
+
+class OggSpeexHeaderError(error):
+    pass
+
+
+class OggSpeexInfo(StreamInfo):
+    """Ogg Speex stream information.
+
+    Attributes:
+
+    * bitrate - nominal bitrate in bits per second
+    * channels - number of channels
+    * length - file length in seconds, as a float
+
+    The reference encoder does not set the bitrate; in this case,
+    the bitrate will be 0.
+    """
+
+    length = 0
+
+    def __init__(self, fileobj):
+        page = OggPage(fileobj)
+        while not page.packets[0].startswith(b"Speex   "):
+            page = OggPage(fileobj)
+        if not page.first:
+            raise OggSpeexHeaderError(
+                "page has ID header, but doesn't start a stream")
+        self.sample_rate = cdata.uint_le(page.packets[0][36:40])
+        self.channels = cdata.uint_le(page.packets[0][48:52])
+        self.bitrate = max(0, cdata.int_le(page.packets[0][52:56]))
+        self.serial = page.serial
+
+    def _post_tags(self, fileobj):
+        page = OggPage.find_last(fileobj, self.serial)
+        self.length = page.position / float(self.sample_rate)
+
+    def pprint(self):
+        return u"Ogg Speex, %.2f seconds" % self.length
+
+
+class OggSpeexVComment(VCommentDict):
+    """Speex comments embedded in an Ogg bitstream."""
+
+    def __init__(self, fileobj, info):
+        pages = []
+        complete = False
+        while not complete:
+            page = OggPage(fileobj)
+            if page.serial == info.serial:
+                pages.append(page)
+                complete = page.complete or (len(page.packets) > 1)
+        data = OggPage.to_packets(pages)[0] + b"\x01"
+        super(OggSpeexVComment, self).__init__(data, framing=False)
+
+    def _inject(self, fileobj):
+        """Write tag data into the Speex comment packet/page."""
+
+        fileobj.seek(0)
+
+        # Find the first header page, with the stream info.
+        # Use it to get the serial number.
+        page = OggPage(fileobj)
+        while not page.packets[0].startswith(b"Speex   "):
+            page = OggPage(fileobj)
+
+        # Look for the next page with that serial number, it'll start
+        # the comment packet.
+        serial = page.serial
+        page = OggPage(fileobj)
+        while page.serial != serial:
+            page = OggPage(fileobj)
+
+        # Then find all the pages with the comment packet.
+        old_pages = [page]
+        while not (old_pages[-1].complete or len(old_pages[-1].packets) > 1):
+            page = OggPage(fileobj)
+            if page.serial == old_pages[0].serial:
+                old_pages.append(page)
+
+        packets = OggPage.to_packets(old_pages, strict=False)
+
+        # Set the new comment packet.
+        packets[0] = self.write(framing=False)
+
+        new_pages = OggPage.from_packets(packets, old_pages[0].sequence)
+        OggPage.replace(fileobj, old_pages, new_pages)
+
+
+class OggSpeex(OggFileType):
+    """An Ogg Speex file."""
+
+    _Info = OggSpeexInfo
+    _Tags = OggSpeexVComment
+    _Error = OggSpeexHeaderError
+    _mimes = ["audio/x-speex"]
+
+    @staticmethod
+    def score(filename, fileobj, header):
+        return (header.startswith(b"OggS") * (b"Speex   " in header))
+
+
+Open = OggSpeex
+
+
+def delete(filename):
+    """Remove tags from a file."""
+
+    OggSpeex(filename).delete()
diff --git a/lib/mutagen/oggtheora.py b/lib/mutagen/oggtheora.py
new file mode 100644
index 00000000..0542823c
--- /dev/null
+++ b/lib/mutagen/oggtheora.py
@@ -0,0 +1,131 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2006 Joe Wreschnig
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+
+"""Read and write Ogg Theora comments.
+
+This module handles Theora files wrapped in an Ogg bitstream. The
+first Theora stream found is used.
+
+Based on the specification at http://theora.org/doc/Theora_I_spec.pdf.
+"""
+
+__all__ = ["OggTheora", "Open", "delete"]
+
+import struct
+
+from mutagen import StreamInfo
+from mutagen._vorbis import VCommentDict
+from mutagen._util import cdata
+from mutagen.ogg import OggPage, OggFileType, error as OggError
+
+
+class error(OggError):
+    pass
+
+
+class OggTheoraHeaderError(error):
+    pass
+
+
+class OggTheoraInfo(StreamInfo):
+    """Ogg Theora stream information.
+
+    Attributes:
+
+    * length - file length in seconds, as a float
+    * fps - video frames per second, as a float
+    """
+
+    length = 0
+
+    def __init__(self, fileobj):
+        page = OggPage(fileobj)
+        while not page.packets[0].startswith(b"\x80theora"):
+            page = OggPage(fileobj)
+        if not page.first:
+            raise OggTheoraHeaderError(
+                "page has ID header, but doesn't start a stream")
+        data = page.packets[0]
+        vmaj, vmin = struct.unpack("2B", data[7:9])
+        if (vmaj, vmin) != (3, 2):
+            raise OggTheoraHeaderError(
+                "found Theora version %d.%d != 3.2" % (vmaj, vmin))
+        fps_num, fps_den = struct.unpack(">2I", data[22:30])
+        self.fps = fps_num / float(fps_den)
+        self.bitrate = cdata.uint_be(b"\x00" + data[37:40])
+        self.granule_shift = (cdata.ushort_be(data[40:42]) >> 5) & 0x1F
+        self.serial = page.serial
+
+    def _post_tags(self, fileobj):
+        page = OggPage.find_last(fileobj, self.serial)
+        position = page.position
+        mask = (1 << self.granule_shift) - 1
+        frames = (position >> self.granule_shift) + (position & mask)
+        self.length = frames / float(self.fps)
+
+    def pprint(self):
+        return "Ogg Theora, %.2f seconds, %d bps" % (self.length, self.bitrate)
+
+
+class OggTheoraCommentDict(VCommentDict):
+    """Theora comments embedded in an Ogg bitstream."""
+
+    def __init__(self, fileobj, info):
+        pages = []
+        complete = False
+        while not complete:
+            page = OggPage(fileobj)
+            if page.serial == info.serial:
+                pages.append(page)
+                complete = page.complete or (len(page.packets) > 1)
+        data = OggPage.to_packets(pages)[0][7:]
+        super(OggTheoraCommentDict, self).__init__(data + b"\x01")
+
+    def _inject(self, fileobj):
+        """Write tag data into the Theora comment packet/page."""
+
+        fileobj.seek(0)
+        page = OggPage(fileobj)
+        while not page.packets[0].startswith(b"\x81theora"):
+            page = OggPage(fileobj)
+
+        old_pages = [page]
+        while not (old_pages[-1].complete or len(old_pages[-1].packets) > 1):
+            page = OggPage(fileobj)
+            if page.serial == old_pages[0].serial:
+                old_pages.append(page)
+
+        packets = OggPage.to_packets(old_pages, strict=False)
+
+        packets[0] = b"\x81theora" + self.write(framing=False)
+
+        new_pages = OggPage.from_packets(packets, old_pages[0].sequence)
+        OggPage.replace(fileobj, old_pages, new_pages)
+
+
+class OggTheora(OggFileType):
+    """An Ogg Theora file."""
+
+    _Info = OggTheoraInfo
+    _Tags = OggTheoraCommentDict
+    _Error = OggTheoraHeaderError
+    _mimes = ["video/x-theora"]
+
+    @staticmethod
+    def score(filename, fileobj, header):
+        return (header.startswith(b"OggS") *
+                ((b"\x80theora" in header) + (b"\x81theora" in header)) * 2)
+
+
+Open = OggTheora
+
+
+def delete(filename):
+    """Remove tags from a file."""
+
+    OggTheora(filename).delete()
diff --git a/lib/mutagen/oggvorbis.py b/lib/mutagen/oggvorbis.py
new file mode 100644
index 00000000..fda58c4f
--- /dev/null
+++ b/lib/mutagen/oggvorbis.py
@@ -0,0 +1,139 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2006 Joe Wreschnig
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+
+"""Read and write Ogg Vorbis comments.
+
+This module handles Vorbis files wrapped in an Ogg bitstream. The
+first Vorbis stream found is used.
+
+Read more about Ogg Vorbis at http://vorbis.com/. This module is based
+on the specification at http://www.xiph.org/vorbis/doc/Vorbis_I_spec.html.
+"""
+
+__all__ = ["OggVorbis", "Open", "delete"]
+
+import struct
+
+from mutagen import StreamInfo
+from mutagen._vorbis import VCommentDict
+from mutagen.ogg import OggPage, OggFileType, error as OggError
+
+
+class error(OggError):
+    pass
+
+
+class OggVorbisHeaderError(error):
+    pass
+
+
+class OggVorbisInfo(StreamInfo):
+    """Ogg Vorbis stream information.
+
+    Attributes:
+
+    * length - file length in seconds, as a float
+    * bitrate - nominal ('average') bitrate in bits per second, as an int
+    """
+
+    length = 0
+
+    def __init__(self, fileobj):
+        page = OggPage(fileobj)
+        while not page.packets[0].startswith(b"\x01vorbis"):
+            page = OggPage(fileobj)
+        if not page.first:
+            raise OggVorbisHeaderError(
+                "page has ID header, but doesn't start a stream")
+        (self.channels, self.sample_rate, max_bitrate, nominal_bitrate,
+         min_bitrate) = struct.unpack("<B4i", page.packets[0][11:28])
+        self.serial = page.serial
+
+        max_bitrate = max(0, max_bitrate)
+        min_bitrate = max(0, min_bitrate)
+        nominal_bitrate = max(0, nominal_bitrate)
+
+        if nominal_bitrate == 0:
+            self.bitrate = (max_bitrate + min_bitrate) // 2
+        elif max_bitrate and max_bitrate < nominal_bitrate:
+            # If the max bitrate is less than the nominal, we know
+            # the nominal is wrong.
+            self.bitrate = max_bitrate
+        elif min_bitrate > nominal_bitrate:
+            self.bitrate = min_bitrate
+        else:
+            self.bitrate = nominal_bitrate
+
+    def _post_tags(self, fileobj):
+        page = OggPage.find_last(fileobj, self.serial)
+        self.length = page.position / float(self.sample_rate)
+
+    def pprint(self):
+        return u"Ogg Vorbis, %.2f seconds, %d bps" % (
+            self.length, self.bitrate)
+
+
+class OggVCommentDict(VCommentDict):
+    """Vorbis comments embedded in an Ogg bitstream."""
+
+    def __init__(self, fileobj, info):
+        pages = []
+        complete = False
+        while not complete:
+            page = OggPage(fileobj)
+            if page.serial == info.serial:
+                pages.append(page)
+                complete = page.complete or (len(page.packets) > 1)
+        data = OggPage.to_packets(pages)[0][7:]  # Strip off "\x03vorbis".
+        super(OggVCommentDict, self).__init__(data)
+
+    def _inject(self, fileobj):
+        """Write tag data into the Vorbis comment packet/page."""
+
+        # Find the old pages in the file; we'll need to remove them,
+        # plus grab any stray setup packet data out of them.
+        fileobj.seek(0)
+        page = OggPage(fileobj)
+        while not page.packets[0].startswith(b"\x03vorbis"):
+            page = OggPage(fileobj)
+
+        old_pages = [page]
+        while not (old_pages[-1].complete or len(old_pages[-1].packets) > 1):
+            page = OggPage(fileobj)
+            if page.serial == old_pages[0].serial:
+                old_pages.append(page)
+
+        packets = OggPage.to_packets(old_pages, strict=False)
+
+        # Set the new comment packet.
+        packets[0] = b"\x03vorbis" + self.write()
+
+        new_pages = OggPage.from_packets(packets, old_pages[0].sequence)
+        OggPage.replace(fileobj, old_pages, new_pages)
+
+
+class OggVorbis(OggFileType):
+    """An Ogg Vorbis file."""
+
+    _Info = OggVorbisInfo
+    _Tags = OggVCommentDict
+    _Error = OggVorbisHeaderError
+    _mimes = ["audio/vorbis", "audio/x-vorbis"]
+
+    @staticmethod
+    def score(filename, fileobj, header):
+        return (header.startswith(b"OggS") * (b"\x01vorbis" in header))
+
+
+Open = OggVorbis
+
+
+def delete(filename):
+    """Remove tags from a file."""
+
+    OggVorbis(filename).delete()
diff --git a/lib/mutagen/optimfrog.py b/lib/mutagen/optimfrog.py
new file mode 100644
index 00000000..3b6a70d8
--- /dev/null
+++ b/lib/mutagen/optimfrog.py
@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2006  Lukas Lalinsky
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+
+"""OptimFROG audio streams with APEv2 tags.
+
+OptimFROG is a lossless audio compression program. Its main goal is to
+reduce at maximum the size of audio files, while permitting bit
+identical restoration for all input. It is similar with the ZIP
+compression, but it is highly specialized to compress audio data.
+
+Only versions 4.5 and higher are supported.
+
+For more information, see http://www.losslessaudio.org/
+"""
+
+__all__ = ["OptimFROG", "Open", "delete"]
+
+import struct
+
+from ._compat import endswith
+from mutagen import StreamInfo
+from mutagen.apev2 import APEv2File, error, delete
+
+
+class OptimFROGHeaderError(error):
+    pass
+
+
+class OptimFROGInfo(StreamInfo):
+    """OptimFROG stream information.
+
+    Attributes:
+
+    * channels - number of audio channels
+    * length - file length in seconds, as a float
+    * sample_rate - audio sampling rate in Hz
+    """
+
+    def __init__(self, fileobj):
+        header = fileobj.read(76)
+        if (len(header) != 76 or not header.startswith(b"OFR ") or
+                struct.unpack("<I", header[4:8])[0] not in [12, 15]):
+            raise OptimFROGHeaderError("not an OptimFROG file")
+        (total_samples, total_samples_high, sample_type, self.channels,
+         self.sample_rate) = struct.unpack("<IHBBI", header[8:20])
+        total_samples += total_samples_high << 32
+        self.channels += 1
+        if self.sample_rate:
+            self.length = float(total_samples) / (self.channels *
+                                                  self.sample_rate)
+        else:
+            self.length = 0.0
+
+    def pprint(self):
+        return "OptimFROG, %.2f seconds, %d Hz" % (self.length,
+                                                   self.sample_rate)
+
+
+class OptimFROG(APEv2File):
+    _Info = OptimFROGInfo
+
+    @staticmethod
+    def score(filename, fileobj, header):
+        filename = filename.lower()
+
+        return (header.startswith(b"OFR") + endswith(filename, b".ofr") +
+                endswith(filename, b".ofs"))
+
+Open = OptimFROG
diff --git a/lib/mutagen/trueaudio.py b/lib/mutagen/trueaudio.py
new file mode 100644
index 00000000..f268fe60
--- /dev/null
+++ b/lib/mutagen/trueaudio.py
@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (C) 2006  Joe Wreschnig
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+
+"""True Audio audio stream information and tags.
+
+True Audio is a lossless format designed for real-time encoding and
+decoding. This module is based on the documentation at
+http://www.true-audio.com/TTA_Lossless_Audio_Codec\_-_Format_Description
+
+True Audio files use ID3 tags.
+"""
+
+__all__ = ["TrueAudio", "Open", "delete", "EasyTrueAudio"]
+
+from ._compat import endswith
+from mutagen import StreamInfo
+from mutagen.id3 import ID3FileType, delete
+from mutagen._util import cdata, MutagenError
+
+
+class error(RuntimeError, MutagenError):
+    pass
+
+
+class TrueAudioHeaderError(error, IOError):
+    pass
+
+
+class TrueAudioInfo(StreamInfo):
+    """True Audio stream information.
+
+    Attributes:
+
+    * length - audio length, in seconds
+    * sample_rate - audio sample rate, in Hz
+    """
+
+    def __init__(self, fileobj, offset):
+        fileobj.seek(offset or 0)
+        header = fileobj.read(18)
+        if len(header) != 18 or not header.startswith(b"TTA"):
+            raise TrueAudioHeaderError("TTA header not found")
+        self.sample_rate = cdata.int_le(header[10:14])
+        samples = cdata.uint_le(header[14:18])
+        self.length = float(samples) / self.sample_rate
+
+    def pprint(self):
+        return "True Audio, %.2f seconds, %d Hz." % (
+            self.length, self.sample_rate)
+
+
+class TrueAudio(ID3FileType):
+    """A True Audio file.
+
+    :ivar info: :class:`TrueAudioInfo`
+    :ivar tags: :class:`ID3 <mutagen.id3.ID3>`
+    """
+
+    _Info = TrueAudioInfo
+    _mimes = ["audio/x-tta"]
+
+    @staticmethod
+    def score(filename, fileobj, header):
+        return (header.startswith(b"ID3") + header.startswith(b"TTA") +
+                endswith(filename.lower(), b".tta") * 2)
+
+
+Open = TrueAudio
+
+
+class EasyTrueAudio(TrueAudio):
+    """Like MP3, but uses EasyID3 for tags.
+
+    :ivar info: :class:`TrueAudioInfo`
+    :ivar tags: :class:`EasyID3 <mutagen.easyid3.EasyID3>`
+    """
+
+    from mutagen.easyid3 import EasyID3 as ID3
+    ID3 = ID3
diff --git a/lib/mutagen/wavpack.py b/lib/mutagen/wavpack.py
new file mode 100644
index 00000000..1ef6ef43
--- /dev/null
+++ b/lib/mutagen/wavpack.py
@@ -0,0 +1,124 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2006 Joe Wreschnig
+#           2014 Christoph Reiter
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+
+"""WavPack reading and writing.
+
+WavPack is a lossless format that uses APEv2 tags. Read
+
+* http://www.wavpack.com/
+* http://www.wavpack.com/file_format.txt
+
+for more information.
+"""
+
+__all__ = ["WavPack", "Open", "delete"]
+
+from mutagen import StreamInfo
+from mutagen.apev2 import APEv2File, error, delete
+from mutagen._util import cdata
+
+
+class WavPackHeaderError(error):
+    pass
+
+RATES = [6000, 8000, 9600, 11025, 12000, 16000, 22050, 24000, 32000, 44100,
+         48000, 64000, 88200, 96000, 192000]
+
+
+class _WavPackHeader(object):
+
+    def __init__(self, block_size, version, track_no, index_no, total_samples,
+                 block_index, block_samples, flags, crc):
+
+        self.block_size = block_size
+        self.version = version
+        self.track_no = track_no
+        self.index_no = index_no
+        self.total_samples = total_samples
+        self.block_index = block_index
+        self.block_samples = block_samples
+        self.flags = flags
+        self.crc = crc
+
+    @classmethod
+    def from_fileobj(cls, fileobj):
+        """A new _WavPackHeader or raises WavPackHeaderError"""
+
+        header = fileobj.read(32)
+        if len(header) != 32 or not header.startswith(b"wvpk"):
+            raise WavPackHeaderError("not a WavPack header: %r" % header)
+
+        block_size = cdata.uint_le(header[4:8])
+        version = cdata.ushort_le(header[8:10])
+        track_no = ord(header[10:11])
+        index_no = ord(header[11:12])
+        samples = cdata.uint_le(header[12:16])
+        if samples == 2 ** 32 - 1:
+            samples = -1
+        block_index = cdata.uint_le(header[16:20])
+        block_samples = cdata.uint_le(header[20:24])
+        flags = cdata.uint_le(header[24:28])
+        crc = cdata.uint_le(header[28:32])
+
+        return _WavPackHeader(block_size, version, track_no, index_no,
+                              samples, block_index, block_samples, flags, crc)
+
+
+class WavPackInfo(StreamInfo):
+    """WavPack stream information.
+
+    Attributes:
+
+    * channels - number of audio channels (1 or 2)
+    * length - file length in seconds, as a float
+    * sample_rate - audio sampling rate in Hz
+    * version - WavPack stream version
+    """
+
+    def __init__(self, fileobj):
+        try:
+            header = _WavPackHeader.from_fileobj(fileobj)
+        except WavPackHeaderError:
+            raise WavPackHeaderError("not a WavPack file")
+
+        self.version = header.version
+        self.channels = bool(header.flags & 4) or 2
+        self.sample_rate = RATES[(header.flags >> 23) & 0xF]
+
+        if header.total_samples == -1 or header.block_index != 0:
+            # TODO: we could make this faster by using the tag size
+            # and search backwards for the last block, then do
+            # last.block_index + last.block_samples - initial.block_index
+            samples = header.block_samples
+            while 1:
+                fileobj.seek(header.block_size - 32 + 8, 1)
+                try:
+                    header = _WavPackHeader.from_fileobj(fileobj)
+                except WavPackHeaderError:
+                    break
+                samples += header.block_samples
+        else:
+            samples = header.total_samples
+
+        self.length = float(samples) / self.sample_rate
+
+    def pprint(self):
+        return "WavPack, %.2f seconds, %d Hz" % (self.length, self.sample_rate)
+
+
+class WavPack(APEv2File):
+    _Info = WavPackInfo
+    _mimes = ["audio/x-wavpack"]
+
+    @staticmethod
+    def score(filename, fileobj, header):
+        return header.startswith(b"wvpk") * 2
+
+
+Open = WavPack
diff --git a/lib/oauth2/__init__.py b/lib/oauth2/__init__.py
new file mode 100644
index 00000000..0ea3803e
--- /dev/null
+++ b/lib/oauth2/__init__.py
@@ -0,0 +1,704 @@
+"""
+The MIT License
+
+Copyright (c) 2007 Leah Culver, Joe Stump, Mark Paschal, Vic Fryzel
+
+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.
+"""
+
+import urllib
+import time
+import random
+import urlparse
+import hmac
+import binascii
+import httplib2 as httplib2
+
+try:
+    from urlparse import parse_qs, parse_qsl
+except ImportError:
+    from cgi import parse_qs, parse_qsl
+
+
+VERSION = '1.0' # Hi Blaine!
+HTTP_METHOD = 'GET'
+SIGNATURE_METHOD = 'PLAINTEXT'
+
+
+class Error(RuntimeError):
+    """Generic exception class."""
+
+    def __init__(self, message='OAuth error occured.'):
+        self._message = message
+
+    @property
+    def message(self):
+        """A hack to get around the deprecation errors in 2.6."""
+        return self._message
+
+    def __str__(self):
+        return self._message
+
+class MissingSignature(Error):
+    pass
+
+def build_authenticate_header(realm=''):
+    """Optional WWW-Authenticate header (401 error)"""
+    return {'WWW-Authenticate': 'OAuth realm="%s"' % realm}
+
+
+def escape(s):
+    """Escape a URL including any /."""
+    return urllib.quote(s, safe='~')
+
+
+def generate_timestamp():
+    """Get seconds since epoch (UTC)."""
+    return int(time.time())
+
+
+def generate_nonce(length=8):
+    """Generate pseudorandom number."""
+    return ''.join([str(random.randint(0, 9)) for i in range(length)])
+
+
+def generate_verifier(length=8):
+    """Generate pseudorandom number."""
+    return ''.join([str(random.randint(0, 9)) for i in range(length)])
+
+
+class Consumer(object):
+    """A consumer of OAuth-protected services.
+
+    The OAuth consumer is a "third-party" service that wants to access
+    protected resources from an OAuth service provider on behalf of an end
+    user. It's kind of the OAuth client.
+
+    Usually a consumer must be registered with the service provider by the
+    developer of the consumer software. As part of that process, the service
+    provider gives the consumer a *key* and a *secret* with which the consumer
+    software can identify itself to the service. The consumer will include its
+    key in each request to identify itself, but will use its secret only when
+    signing requests, to prove that the request is from that particular
+    registered consumer.
+
+    Once registered, the consumer can then use its consumer credentials to ask
+    the service provider for a request token, kicking off the OAuth
+    authorization process.
+    """
+
+    key = None
+    secret = None
+
+    def __init__(self, key, secret):
+        self.key = key
+        self.secret = secret
+
+        if self.key is None or self.secret is None:
+            raise ValueError("Key and secret must be set.")
+
+    def __str__(self):
+        data = {
+            'oauth_consumer_key': self.key,
+            'oauth_consumer_secret': self.secret
+        }
+
+        return urllib.urlencode(data)
+
+
+class Token(object):
+    """An OAuth credential used to request authorization or a protected
+    resource.
+
+    Tokens in OAuth comprise a *key* and a *secret*. The key is included in
+    requests to identify the token being used, but the secret is used only in
+    the signature, to prove that the requester is who the server gave the
+    token to.
+
+    When first negotiating the authorization, the consumer asks for a *request
+    token* that the live user authorizes with the service provider. The
+    consumer then exchanges the request token for an *access token* that can
+    be used to access protected resources.
+    """
+
+    key = None
+    secret = None
+    callback = None
+    callback_confirmed = None
+    verifier = None
+
+    def __init__(self, key, secret):
+        self.key = key
+        self.secret = secret
+
+        if self.key is None or self.secret is None:
+            raise ValueError("Key and secret must be set.")
+
+    def set_callback(self, callback):
+        self.callback = callback
+        self.callback_confirmed = 'true'
+
+    def set_verifier(self, verifier=None):
+        if verifier is not None:
+            self.verifier = verifier
+        else:
+            self.verifier = generate_verifier()
+
+    def get_callback_url(self):
+        if self.callback and self.verifier:
+            # Append the oauth_verifier.
+            parts = urlparse.urlparse(self.callback)
+            scheme, netloc, path, params, query, fragment = parts[:6]
+            if query:
+                query = '%s&oauth_verifier=%s' % (query, self.verifier)
+            else:
+                query = 'oauth_verifier=%s' % self.verifier
+            return urlparse.urlunparse((scheme, netloc, path, params,
+                query, fragment))
+        return self.callback
+
+    def to_string(self):
+        """Returns this token as a plain string, suitable for storage.
+
+        The resulting string includes the token's secret, so you should never
+        send or store this string where a third party can read it.
+        """
+
+        data = {
+            'oauth_token': self.key,
+            'oauth_token_secret': self.secret,
+        }
+
+        if self.callback_confirmed is not None:
+            data['oauth_callback_confirmed'] = self.callback_confirmed
+        return urllib.urlencode(data)
+
+    @staticmethod
+    def from_string(s):
+        """Deserializes a token from a string like one returned by
+        `to_string()`."""
+
+        if not len(s):
+            raise ValueError("Invalid parameter string.")
+
+        params = parse_qs(s, keep_blank_values=False)
+        if not len(params):
+            raise ValueError("Invalid parameter string.")
+
+        try:
+            key = params['oauth_token'][0]
+        except Exception:
+            raise ValueError("'oauth_token' not found in OAuth request.")
+
+        try:
+            secret = params['oauth_token_secret'][0]
+        except Exception:
+            raise ValueError("'oauth_token_secret' not found in "
+                "OAuth request.")
+
+        token = Token(key, secret)
+        try:
+            token.callback_confirmed = params['oauth_callback_confirmed'][0]
+        except KeyError:
+            pass # 1.0, no callback confirmed.
+        return token
+
+    def __str__(self):
+        return self.to_string()
+
+
+def setter(attr):
+    name = attr.__name__
+
+    def getter(self):
+        try:
+            return self.__dict__[name]
+        except KeyError:
+            raise AttributeError(name)
+
+    def deleter(self):
+        del self.__dict__[name]
+
+    return property(getter, attr, deleter)
+
+
+class Request(dict):
+
+    """The parameters and information for an HTTP request, suitable for
+    authorizing with OAuth credentials.
+
+    When a consumer wants to access a service's protected resources, it does
+    so using a signed HTTP request identifying itself (the consumer) with its
+    key, and providing an access token authorized by the end user to access
+    those resources.
+
+    """
+
+    http_method = HTTP_METHOD
+    http_url = None
+    version = VERSION
+
+    def __init__(self, method=HTTP_METHOD, url=None, parameters=None):
+        if method is not None:
+            self.method = method
+
+        if url is not None:
+            self.url = url
+
+        if parameters is not None:
+            self.update(parameters)
+
+    @setter
+    def url(self, value):
+        parts = urlparse.urlparse(value)
+        scheme, netloc, path = parts[:3]
+
+        # Exclude default port numbers.
+        if scheme == 'http' and netloc[-3:] == ':80':
+            netloc = netloc[:-3]
+        elif scheme == 'https' and netloc[-4:] == ':443':
+            netloc = netloc[:-4]
+
+        if scheme != 'http' and scheme != 'https':
+            raise ValueError("Unsupported URL %s (%s)." % (value, scheme))
+
+        value = '%s://%s%s' % (scheme, netloc, path)
+        self.__dict__['url'] = value
+
+    @setter
+    def method(self, value):
+        self.__dict__['method'] = value.upper()
+
+    def _get_timestamp_nonce(self):
+        return self['oauth_timestamp'], self['oauth_nonce']
+
+    def get_nonoauth_parameters(self):
+        """Get any non-OAuth parameters."""
+        return dict([(k, v) for k, v in self.iteritems()
+                    if not k.startswith('oauth_')])
+
+    def to_header(self, realm=''):
+        """Serialize as a header for an HTTPAuth request."""
+        oauth_params = ((k, v) for k, v in self.items()
+                            if k.startswith('oauth_'))
+        stringy_params = ((k, escape(str(v))) for k, v in oauth_params)
+        header_params = ('%s="%s"' % (k, v) for k, v in stringy_params)
+        params_header = ', '.join(header_params)
+
+        auth_header = 'OAuth realm="%s"' % realm
+        if params_header:
+            auth_header = "%s, %s" % (auth_header, params_header)
+
+        return {'Authorization': auth_header}
+
+    def to_postdata(self):
+        """Serialize as post data for a POST request."""
+        return self.encode_postdata(self)
+
+    def encode_postdata(self, data):
+        # tell urlencode to deal with sequence values and map them correctly
+        # to resulting querystring. for example self["k"] = ["v1", "v2"] will
+        # result in 'k=v1&k=v2' and not k=%5B%27v1%27%2C+%27v2%27%5D
+        return urllib.urlencode(data, True)
+
+    def to_url(self):
+        """Serialize as a URL for a GET request."""
+        return '%s?%s' % (self.url, self.to_postdata())
+
+    def get_parameter(self, parameter):
+        ret = self.get(parameter)
+        if ret is None:
+            raise Error('Parameter not found: %s' % parameter)
+
+        return ret
+
+    def get_normalized_parameters(self):
+        """Return a string that contains the parameters that must be signed."""
+        items = [(k, v) for k, v in self.items() if k != 'oauth_signature']
+        encoded_str = urllib.urlencode(sorted(items), True)
+        # Encode signature parameters per Oauth Core 1.0 protocol
+        # spec draft 7, section 3.6
+        # (http://tools.ietf.org/html/draft-hammer-oauth-07#section-3.6)
+        # Spaces must be encoded with "%20" instead of "+"
+        return encoded_str.replace('+', '%20')
+
+    def sign_request(self, signature_method, consumer, token):
+        """Set the signature parameter to the result of sign."""
+
+        if 'oauth_consumer_key' not in self:
+            self['oauth_consumer_key'] = consumer.key
+
+        if token and 'oauth_token' not in self:
+            self['oauth_token'] = token.key
+
+        self['oauth_signature_method'] = signature_method.name
+        self['oauth_signature'] = signature_method.sign(self, consumer, token)
+
+    @classmethod
+    def make_timestamp(cls):
+        """Get seconds since epoch (UTC)."""
+        return str(int(time.time()))
+
+    @classmethod
+    def make_nonce(cls):
+        """Generate pseudorandom number."""
+        return str(random.randint(0, 100000000))
+
+    @classmethod
+    def from_request(cls, http_method, http_url, headers=None, parameters=None,
+            query_string=None):
+        """Combines multiple parameter sources."""
+        if parameters is None:
+            parameters = {}
+
+        # Headers
+        if headers and 'Authorization' in headers:
+            auth_header = headers['Authorization']
+            # Check that the authorization header is OAuth.
+            if auth_header[:6] == 'OAuth ':
+                auth_header = auth_header[6:]
+                try:
+                    # Get the parameters from the header.
+                    header_params = cls._split_header(auth_header)
+                    parameters.update(header_params)
+                except:
+                    raise Error('Unable to parse OAuth parameters from '
+                        'Authorization header.')
+
+        # GET or POST query string.
+        if query_string:
+            query_params = cls._split_url_string(query_string)
+            parameters.update(query_params)
+
+        # URL parameters.
+        param_str = urlparse.urlparse(http_url)[4] # query
+        url_params = cls._split_url_string(param_str)
+        parameters.update(url_params)
+
+        if parameters:
+            return cls(http_method, http_url, parameters)
+
+        return None
+
+    @classmethod
+    def from_consumer_and_token(cls, consumer, token=None,
+            http_method=HTTP_METHOD, http_url=None, parameters=None):
+        if not parameters:
+            parameters = {}
+
+        defaults = {
+            'oauth_consumer_key': consumer.key,
+            'oauth_timestamp': cls.make_timestamp(),
+            'oauth_nonce': cls.make_nonce(),
+            'oauth_version': cls.version,
+        }
+
+        defaults.update(parameters)
+        parameters = defaults
+
+        if token:
+            parameters['oauth_token'] = token.key
+
+        return Request(http_method, http_url, parameters)
+
+    @classmethod
+    def from_token_and_callback(cls, token, callback=None,
+        http_method=HTTP_METHOD, http_url=None, parameters=None):
+
+        if not parameters:
+            parameters = {}
+
+        parameters['oauth_token'] = token.key
+
+        if callback:
+            parameters['oauth_callback'] = callback
+
+        return cls(http_method, http_url, parameters)
+
+    @staticmethod
+    def _split_header(header):
+        """Turn Authorization: header into parameters."""
+        params = {}
+        parts = header.split(',')
+        for param in parts:
+            # Ignore realm parameter.
+            if param.find('realm') > -1:
+                continue
+            # Remove whitespace.
+            param = param.strip()
+            # Split key-value.
+            param_parts = param.split('=', 1)
+            # Remove quotes and unescape the value.
+            params[param_parts[0]] = urllib.unquote(param_parts[1].strip('\"'))
+        return params
+
+    @staticmethod
+    def _split_url_string(param_str):
+        """Turn URL string into parameters."""
+        parameters = parse_qs(param_str, keep_blank_values=False)
+        for k, v in parameters.iteritems():
+            parameters[k] = urllib.unquote(v[0])
+        return parameters
+
+
+class Server(object):
+    """A skeletal implementation of a service provider, providing protected
+    resources to requests from authorized consumers.
+
+    This class implements the logic to check requests for authorization. You
+    can use it with your web server or web framework to protect certain
+    resources with OAuth.
+    """
+
+    timestamp_threshold = 300 # In seconds, five minutes.
+    version = VERSION
+    signature_methods = None
+
+    def __init__(self, signature_methods=None):
+        self.signature_methods = signature_methods or {}
+
+    def add_signature_method(self, signature_method):
+        self.signature_methods[signature_method.name] = signature_method
+        return self.signature_methods
+
+    def verify_request(self, request, consumer, token):
+        """Verifies an api call and checks all the parameters."""
+
+        version = self._get_version(request)
+        self._check_signature(request, consumer, token)
+        parameters = request.get_nonoauth_parameters()
+        return parameters
+
+    def build_authenticate_header(self, realm=''):
+        """Optional support for the authenticate header."""
+        return {'WWW-Authenticate': 'OAuth realm="%s"' % realm}
+
+    def _get_version(self, request):
+        """Verify the correct version request for this server."""
+        try:
+            version = request.get_parameter('oauth_version')
+        except:
+            version = VERSION
+
+        if version and version != self.version:
+            raise Error('OAuth version %s not supported.' % str(version))
+
+        return version
+
+    def _get_signature_method(self, request):
+        """Figure out the signature with some defaults."""
+        try:
+            signature_method = request.get_parameter('oauth_signature_method')
+        except:
+            signature_method = SIGNATURE_METHOD
+
+        try:
+            # Get the signature method object.
+            signature_method = self.signature_methods[signature_method]
+        except:
+            signature_method_names = ', '.join(self.signature_methods.keys())
+            raise Error('Signature method %s not supported try one of the following: %s' % (signature_method, signature_method_names))
+
+        return signature_method
+
+    def _get_verifier(self, request):
+        return request.get_parameter('oauth_verifier')
+
+    def _check_signature(self, request, consumer, token):
+        timestamp, nonce = request._get_timestamp_nonce()
+        self._check_timestamp(timestamp)
+        signature_method = self._get_signature_method(request)
+
+        try:
+            signature = request.get_parameter('oauth_signature')
+        except:
+            raise MissingSignature('Missing oauth_signature.')
+
+        # Validate the signature.
+        valid = signature_method.check(request, consumer, token, signature)
+
+        if not valid:
+            key, base = signature_method.signing_base(request, consumer, token)
+
+            raise Error('Invalid signature. Expected signature base '
+                'string: %s' % base)
+
+        built = signature_method.sign(request, consumer, token)
+
+    def _check_timestamp(self, timestamp):
+        """Verify that timestamp is recentish."""
+        timestamp = int(timestamp)
+        now = int(time.time())
+        lapsed = now - timestamp
+        if lapsed > self.timestamp_threshold:
+            raise Error('Expired timestamp: given %d and now %s has a '
+                'greater difference than threshold %d' % (timestamp, now, self.timestamp_threshold))
+
+
+class Client(httplib2.Http):
+    """OAuthClient is a worker to attempt to execute a request."""
+
+    def __init__(self, consumer, token=None, cache=None, timeout=None,
+        proxy_info=None):
+
+        if consumer is not None and not isinstance(consumer, Consumer):
+            raise ValueError("Invalid consumer.")
+
+        if token is not None and not isinstance(token, Token):
+            raise ValueError("Invalid token.")
+
+        self.consumer = consumer
+        self.token = token
+        self.method = SignatureMethod_HMAC_SHA1()
+
+        httplib2.Http.__init__(self, cache=cache, timeout=timeout,
+            proxy_info=proxy_info)
+
+    def set_signature_method(self, method):
+        if not isinstance(method, SignatureMethod):
+            raise ValueError("Invalid signature method.")
+
+        self.method = method
+
+    def request(self, uri, method="GET", body=None, headers=None,
+        redirections=httplib2.DEFAULT_MAX_REDIRECTS, connection_type=None,
+        force_auth_header=False):
+
+        if not isinstance(headers, dict):
+            headers = {}
+
+        if body and method == "POST":
+            parameters = dict(parse_qsl(body))
+        elif method == "GET":
+            parsed = urlparse.urlparse(uri)
+            parameters = parse_qs(parsed.query)
+        else:
+            parameters = None
+
+        req = Request.from_consumer_and_token(self.consumer, token=self.token,
+            http_method=method, http_url=uri, parameters=parameters)
+
+        req.sign_request(self.method, self.consumer, self.token)
+
+        if force_auth_header:
+            # ensure we always send Authorization
+            headers.update(req.to_header())
+
+        if method == "POST":
+            if not force_auth_header:
+                body = req.to_postdata()
+            else:
+                body = req.encode_postdata(req.get_nonoauth_parameters())
+            headers['Content-Type'] = 'application/x-www-form-urlencoded'
+        elif method == "GET":
+            if not force_auth_header:
+                uri = req.to_url()
+        else:
+            if not force_auth_header:
+                # don't call update twice.
+                headers.update(req.to_header())
+
+        return httplib2.Http.request(self, uri, method=method, body=body,
+            headers=headers, redirections=redirections,
+            connection_type=connection_type)
+
+
+class SignatureMethod(object):
+    """A way of signing requests.
+
+    The OAuth protocol lets consumers and service providers pick a way to sign
+    requests. This interface shows the methods expected by the other `oauth`
+    modules for signing requests. Subclass it and implement its methods to
+    provide a new way to sign requests.
+    """
+
+    def signing_base(self, request, consumer, token):
+        """Calculates the string that needs to be signed.
+
+        This method returns a 2-tuple containing the starting key for the
+        signing and the message to be signed. The latter may be used in error
+        messages to help clients debug their software.
+
+        """
+        raise NotImplementedError
+
+    def sign(self, request, consumer, token):
+        """Returns the signature for the given request, based on the consumer
+        and token also provided.
+
+        You should use your implementation of `signing_base()` to build the
+        message to sign. Otherwise it may be less useful for debugging.
+
+        """
+        raise NotImplementedError
+
+    def check(self, request, consumer, token, signature):
+        """Returns whether the given signature is the correct signature for
+        the given consumer and token signing the given request."""
+        built = self.sign(request, consumer, token)
+        return built == signature
+
+
+class SignatureMethod_HMAC_SHA1(SignatureMethod):
+    name = 'HMAC-SHA1'
+
+    def signing_base(self, request, consumer, token):
+        sig = (
+            escape(request.method),
+            escape(request.url),
+            escape(request.get_normalized_parameters()),
+        )
+
+        key = '%s&' % escape(consumer.secret)
+        if token:
+            key += escape(token.secret)
+        raw = '&'.join(sig)
+        return key, raw
+
+    def sign(self, request, consumer, token):
+        """Builds the base signature string."""
+        key, raw = self.signing_base(request, consumer, token)
+
+        # HMAC object.
+        try:
+            import hashlib # 2.5
+            hashed = hmac.new(key, raw, hashlib.sha1)
+        except ImportError:
+            import sha # Deprecated
+            hashed = hmac.new(key, raw, sha)
+
+        # Calculate the digest base 64.
+        return binascii.b2a_base64(hashed.digest())[:-1]
+
+class SignatureMethod_PLAINTEXT(SignatureMethod):
+
+    name = 'PLAINTEXT'
+
+    def signing_base(self, request, consumer, token):
+        """Concatenates the consumer key and secret with the token's
+        secret."""
+        sig = '%s&' % escape(consumer.secret)
+        if token:
+            sig = sig + escape(token.secret)
+        return sig, sig
+
+    def sign(self, request, consumer, token):
+        key, raw = self.signing_base(request, consumer, token)
+        return raw
+
diff --git a/lib/oauthlib/__init__.py b/lib/oauthlib/__init__.py
deleted file mode 100644
index d9a5e38e..00000000
--- a/lib/oauthlib/__init__.py
+++ /dev/null
@@ -1,34 +0,0 @@
-"""
-    oauthlib
-    ~~~~~~~~
-
-    A generic, spec-compliant, thorough implementation of the OAuth
-    request-signing logic.
-
-    :copyright: (c) 2019 by The OAuthlib Community
-    :license: BSD, see LICENSE for details.
-"""
-import logging
-from logging import NullHandler
-
-__author__ = 'The OAuthlib Community'
-__version__ = '3.2.2'
-
-logging.getLogger('oauthlib').addHandler(NullHandler())
-
-_DEBUG = False
-
-def set_debug(debug_val):
-	"""Set value of debug flag
-	
-    :param debug_val: Value to set. Must be a bool value.
-	"""
-	global _DEBUG
-	_DEBUG = debug_val
-
-def get_debug():
-	"""Get debug mode value. 
-	
-	:return: `True` if debug mode is on, `False` otherwise
-	"""
-	return _DEBUG	
diff --git a/lib/oauthlib/common.py b/lib/oauthlib/common.py
deleted file mode 100644
index 395e75ef..00000000
--- a/lib/oauthlib/common.py
+++ /dev/null
@@ -1,432 +0,0 @@
-"""
-oauthlib.common
-~~~~~~~~~~~~~~
-
-This module provides data structures and utilities common
-to all implementations of OAuth.
-"""
-import collections
-import datetime
-import logging
-import re
-import time
-import urllib.parse as urlparse
-from urllib.parse import (
-    quote as _quote, unquote as _unquote, urlencode as _urlencode,
-)
-
-from . import get_debug
-
-try:
-    from secrets import SystemRandom, randbits
-except ImportError:
-    from random import SystemRandom, getrandbits as randbits
-
-UNICODE_ASCII_CHARACTER_SET = ('abcdefghijklmnopqrstuvwxyz'
-                               'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-                               '0123456789')
-
-CLIENT_ID_CHARACTER_SET = (r' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMN'
-                           'OPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}')
-
-SANITIZE_PATTERN = re.compile(r'([^&;]*(?:password|token)[^=]*=)[^&;]+', re.IGNORECASE)
-INVALID_HEX_PATTERN = re.compile(r'%[^0-9A-Fa-f]|%[0-9A-Fa-f][^0-9A-Fa-f]')
-
-always_safe = ('ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-               'abcdefghijklmnopqrstuvwxyz'
-               '0123456789' '_.-')
-
-log = logging.getLogger('oauthlib')
-
-
-# 'safe' must be bytes (Python 2.6 requires bytes, other versions allow either)
-def quote(s, safe=b'/'):
-    s = s.encode('utf-8') if isinstance(s, str) else s
-    s = _quote(s, safe)
-    # PY3 always returns unicode.  PY2 may return either, depending on whether
-    # it had to modify the string.
-    if isinstance(s, bytes):
-        s = s.decode('utf-8')
-    return s
-
-
-def unquote(s):
-    s = _unquote(s)
-    # PY3 always returns unicode.  PY2 seems to always return what you give it,
-    # which differs from quote's behavior.  Just to be safe, make sure it is
-    # unicode before we return.
-    if isinstance(s, bytes):
-        s = s.decode('utf-8')
-    return s
-
-
-def urlencode(params):
-    utf8_params = encode_params_utf8(params)
-    urlencoded = _urlencode(utf8_params)
-    if isinstance(urlencoded, str):
-        return urlencoded
-    else:
-        return urlencoded.decode("utf-8")
-
-
-def encode_params_utf8(params):
-    """Ensures that all parameters in a list of 2-element tuples are encoded to
-    bytestrings using UTF-8
-    """
-    encoded = []
-    for k, v in params:
-        encoded.append((
-            k.encode('utf-8') if isinstance(k, str) else k,
-            v.encode('utf-8') if isinstance(v, str) else v))
-    return encoded
-
-
-def decode_params_utf8(params):
-    """Ensures that all parameters in a list of 2-element tuples are decoded to
-    unicode using UTF-8.
-    """
-    decoded = []
-    for k, v in params:
-        decoded.append((
-            k.decode('utf-8') if isinstance(k, bytes) else k,
-            v.decode('utf-8') if isinstance(v, bytes) else v))
-    return decoded
-
-
-urlencoded = set(always_safe) | set('=&;:%+~,*@!()/?\'$')
-
-
-def urldecode(query):
-    """Decode a query string in x-www-form-urlencoded format into a sequence
-    of two-element tuples.
-
-    Unlike urlparse.parse_qsl(..., strict_parsing=True) urldecode will enforce
-    correct formatting of the query string by validation. If validation fails
-    a ValueError will be raised. urllib.parse_qsl will only raise errors if
-    any of name-value pairs omits the equals sign.
-    """
-    # Check if query contains invalid characters
-    if query and not set(query) <= urlencoded:
-        error = ("Error trying to decode a non urlencoded string. "
-                 "Found invalid characters: %s "
-                 "in the string: '%s'. "
-                 "Please ensure the request/response body is "
-                 "x-www-form-urlencoded.")
-        raise ValueError(error % (set(query) - urlencoded, query))
-
-    # Check for correctly hex encoded values using a regular expression
-    # All encoded values begin with % followed by two hex characters
-    # correct = %00, %A0, %0A, %FF
-    # invalid = %G0, %5H, %PO
-    if INVALID_HEX_PATTERN.search(query):
-        raise ValueError('Invalid hex encoding in query string.')
-
-    # We want to allow queries such as "c2" whereas urlparse.parse_qsl
-    # with the strict_parsing flag will not.
-    params = urlparse.parse_qsl(query, keep_blank_values=True)
-
-    # unicode all the things
-    return decode_params_utf8(params)
-
-
-def extract_params(raw):
-    """Extract parameters and return them as a list of 2-tuples.
-
-    Will successfully extract parameters from urlencoded query strings,
-    dicts, or lists of 2-tuples. Empty strings/dicts/lists will return an
-    empty list of parameters. Any other input will result in a return
-    value of None.
-    """
-    if isinstance(raw, (bytes, str)):
-        try:
-            params = urldecode(raw)
-        except ValueError:
-            params = None
-    elif hasattr(raw, '__iter__'):
-        try:
-            dict(raw)
-        except ValueError:
-            params = None
-        except TypeError:
-            params = None
-        else:
-            params = list(raw.items() if isinstance(raw, dict) else raw)
-            params = decode_params_utf8(params)
-    else:
-        params = None
-
-    return params
-
-
-def generate_nonce():
-    """Generate pseudorandom nonce that is unlikely to repeat.
-
-    Per `section 3.3`_ of the OAuth 1 RFC 5849 spec.
-    Per `section 3.2.1`_ of the MAC Access Authentication spec.
-
-    A random 64-bit number is appended to the epoch timestamp for both
-    randomness and to decrease the likelihood of collisions.
-
-    .. _`section 3.2.1`: https://tools.ietf.org/html/draft-ietf-oauth-v2-http-mac-01#section-3.2.1
-    .. _`section 3.3`: https://tools.ietf.org/html/rfc5849#section-3.3
-    """
-    return str(str(randbits(64)) + generate_timestamp())
-
-
-def generate_timestamp():
-    """Get seconds since epoch (UTC).
-
-    Per `section 3.3`_ of the OAuth 1 RFC 5849 spec.
-    Per `section 3.2.1`_ of the MAC Access Authentication spec.
-
-    .. _`section 3.2.1`: https://tools.ietf.org/html/draft-ietf-oauth-v2-http-mac-01#section-3.2.1
-    .. _`section 3.3`: https://tools.ietf.org/html/rfc5849#section-3.3
-    """
-    return str(int(time.time()))
-
-
-def generate_token(length=30, chars=UNICODE_ASCII_CHARACTER_SET):
-    """Generates a non-guessable OAuth token
-
-    OAuth (1 and 2) does not specify the format of tokens except that they
-    should be strings of random characters. Tokens should not be guessable
-    and entropy when generating the random characters is important. Which is
-    why SystemRandom is used instead of the default random.choice method.
-    """
-    rand = SystemRandom()
-    return ''.join(rand.choice(chars) for x in range(length))
-
-
-def generate_signed_token(private_pem, request):
-    import jwt
-
-    now = datetime.datetime.utcnow()
-
-    claims = {
-        'scope': request.scope,
-        'exp': now + datetime.timedelta(seconds=request.expires_in)
-    }
-
-    claims.update(request.claims)
-
-    token = jwt.encode(claims, private_pem, 'RS256')
-    token = to_unicode(token, "UTF-8")
-
-    return token
-
-
-def verify_signed_token(public_pem, token):
-    import jwt
-
-    return jwt.decode(token, public_pem, algorithms=['RS256'])
-
-
-def generate_client_id(length=30, chars=CLIENT_ID_CHARACTER_SET):
-    """Generates an OAuth client_id
-
-    OAuth 2 specify the format of client_id in
-    https://tools.ietf.org/html/rfc6749#appendix-A.
-    """
-    return generate_token(length, chars)
-
-
-def add_params_to_qs(query, params):
-    """Extend a query with a list of two-tuples."""
-    if isinstance(params, dict):
-        params = params.items()
-    queryparams = urlparse.parse_qsl(query, keep_blank_values=True)
-    queryparams.extend(params)
-    return urlencode(queryparams)
-
-
-def add_params_to_uri(uri, params, fragment=False):
-    """Add a list of two-tuples to the uri query components."""
-    sch, net, path, par, query, fra = urlparse.urlparse(uri)
-    if fragment:
-        fra = add_params_to_qs(fra, params)
-    else:
-        query = add_params_to_qs(query, params)
-    return urlparse.urlunparse((sch, net, path, par, query, fra))
-
-
-def safe_string_equals(a, b):
-    """ Near-constant time string comparison.
-
-    Used in order to avoid timing attacks on sensitive information such
-    as secret keys during request verification (`rootLabs`_).
-
-    .. _`rootLabs`: http://rdist.root.org/2010/01/07/timing-independent-array-comparison/
-
-    """
-    if len(a) != len(b):
-        return False
-
-    result = 0
-    for x, y in zip(a, b):
-        result |= ord(x) ^ ord(y)
-    return result == 0
-
-
-def to_unicode(data, encoding='UTF-8'):
-    """Convert a number of different types of objects to unicode."""
-    if isinstance(data, str):
-        return data
-
-    if isinstance(data, bytes):
-        return str(data, encoding=encoding)
-
-    if hasattr(data, '__iter__'):
-        try:
-            dict(data)
-        except TypeError:
-            pass
-        except ValueError:
-            # Assume it's a one dimensional data structure
-            return (to_unicode(i, encoding) for i in data)
-        else:
-            # We support 2.6 which lacks dict comprehensions
-            if hasattr(data, 'items'):
-                data = data.items()
-            return {to_unicode(k, encoding): to_unicode(v, encoding) for k, v in data}
-
-    return data
-
-
-class CaseInsensitiveDict(dict):
-
-    """Basic case insensitive dict with strings only keys."""
-
-    proxy = {}
-
-    def __init__(self, data):
-        self.proxy = {k.lower(): k for k in data}
-        for k in data:
-            self[k] = data[k]
-
-    def __contains__(self, k):
-        return k.lower() in self.proxy
-
-    def __delitem__(self, k):
-        key = self.proxy[k.lower()]
-        super().__delitem__(key)
-        del self.proxy[k.lower()]
-
-    def __getitem__(self, k):
-        key = self.proxy[k.lower()]
-        return super().__getitem__(key)
-
-    def get(self, k, default=None):
-        return self[k] if k in self else default
-
-    def __setitem__(self, k, v):
-        super().__setitem__(k, v)
-        self.proxy[k.lower()] = k
-
-    def update(self, *args, **kwargs):
-        super().update(*args, **kwargs)
-        for k in dict(*args, **kwargs):
-            self.proxy[k.lower()] = k
-
-
-class Request:
-
-    """A malleable representation of a signable HTTP request.
-
-    Body argument may contain any data, but parameters will only be decoded if
-    they are one of:
-
-    * urlencoded query string
-    * dict
-    * list of 2-tuples
-
-    Anything else will be treated as raw body data to be passed through
-    unmolested.
-    """
-
-    def __init__(self, uri, http_method='GET', body=None, headers=None,
-                 encoding='utf-8'):
-        # Convert to unicode using encoding if given, else assume unicode
-        encode = lambda x: to_unicode(x, encoding) if encoding else x
-
-        self.uri = encode(uri)
-        self.http_method = encode(http_method)
-        self.headers = CaseInsensitiveDict(encode(headers or {}))
-        self.body = encode(body)
-        self.decoded_body = extract_params(self.body)
-        self.oauth_params = []
-        self.validator_log = {}
-
-        self._params = {
-            "access_token": None,
-            "client": None,
-            "client_id": None,
-            "client_secret": None,
-            "code": None,
-            "code_challenge": None,
-            "code_challenge_method": None,
-            "code_verifier": None,
-            "extra_credentials": None,
-            "grant_type": None,
-            "redirect_uri": None,
-            "refresh_token": None,
-            "request_token": None,
-            "response_type": None,
-            "scope": None,
-            "scopes": None,
-            "state": None,
-            "token": None,
-            "user": None,
-            "token_type_hint": None,
-
-            # OpenID Connect
-            "response_mode": None,
-            "nonce": None,
-            "display": None,
-            "prompt": None,
-            "claims": None,
-            "max_age": None,
-            "ui_locales": None,
-            "id_token_hint": None,
-            "login_hint": None,
-            "acr_values": None
-        }
-        self._params.update(dict(urldecode(self.uri_query)))
-        self._params.update(dict(self.decoded_body or []))
-
-    def __getattr__(self, name):
-        if name in self._params:
-            return self._params[name]
-        else:
-            raise AttributeError(name)
-
-    def __repr__(self):
-        if not get_debug():
-            return "<oauthlib.Request SANITIZED>"
-        body = self.body
-        headers = self.headers.copy()
-        if body:
-            body = SANITIZE_PATTERN.sub('\1<SANITIZED>', str(body))
-        if 'Authorization' in headers:
-            headers['Authorization'] = '<SANITIZED>'
-        return '<oauthlib.Request url="{}", http_method="{}", headers="{}", body="{}">'.format(
-            self.uri, self.http_method, headers, body)
-
-    @property
-    def uri_query(self):
-        return urlparse.urlparse(self.uri).query
-
-    @property
-    def uri_query_params(self):
-        if not self.uri_query:
-            return []
-        return urlparse.parse_qsl(self.uri_query, keep_blank_values=True,
-                                  strict_parsing=True)
-
-    @property
-    def duplicate_params(self):
-        seen_keys = collections.defaultdict(int)
-        all_keys = (p[0]
-                    for p in (self.decoded_body or []) + self.uri_query_params)
-        for k in all_keys:
-            seen_keys[k] += 1
-        return [k for k, c in seen_keys.items() if c > 1]
diff --git a/lib/oauthlib/oauth1/__init__.py b/lib/oauthlib/oauth1/__init__.py
deleted file mode 100644
index 9caf12a9..00000000
--- a/lib/oauthlib/oauth1/__init__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-"""
-oauthlib.oauth1
-~~~~~~~~~~~~~~
-
-This module is a wrapper for the most recent implementation of OAuth 1.0 Client
-and Server classes.
-"""
-from .rfc5849 import (
-    SIGNATURE_HMAC, SIGNATURE_HMAC_SHA1, SIGNATURE_HMAC_SHA256,
-    SIGNATURE_HMAC_SHA512, SIGNATURE_PLAINTEXT, SIGNATURE_RSA,
-    SIGNATURE_RSA_SHA1, SIGNATURE_RSA_SHA256, SIGNATURE_RSA_SHA512,
-    SIGNATURE_TYPE_AUTH_HEADER, SIGNATURE_TYPE_BODY, SIGNATURE_TYPE_QUERY,
-    Client,
-)
-from .rfc5849.endpoints import (
-    AccessTokenEndpoint, AuthorizationEndpoint, RequestTokenEndpoint,
-    ResourceEndpoint, SignatureOnlyEndpoint, WebApplicationServer,
-)
-from .rfc5849.errors import (
-    InsecureTransportError, InvalidClientError, InvalidRequestError,
-    InvalidSignatureMethodError, OAuth1Error,
-)
-from .rfc5849.request_validator import RequestValidator
diff --git a/lib/oauthlib/oauth1/rfc5849/__init__.py b/lib/oauthlib/oauth1/rfc5849/__init__.py
deleted file mode 100644
index c559251f..00000000
--- a/lib/oauthlib/oauth1/rfc5849/__init__.py
+++ /dev/null
@@ -1,365 +0,0 @@
-"""
-oauthlib.oauth1.rfc5849
-~~~~~~~~~~~~~~
-
-This module is an implementation of various logic needed
-for signing and checking OAuth 1.0 RFC 5849 requests.
-
-It supports all three standard signature methods defined in RFC 5849:
-
-- HMAC-SHA1
-- RSA-SHA1
-- PLAINTEXT
-
-It also supports signature methods that are not defined in RFC 5849. These are
-based on the standard ones but replace SHA-1 with the more secure SHA-256:
-
-- HMAC-SHA256
-- RSA-SHA256
-
-"""
-import base64
-import hashlib
-import logging
-import urllib.parse as urlparse
-
-from oauthlib.common import (
-    Request, generate_nonce, generate_timestamp, to_unicode, urlencode,
-)
-
-from . import parameters, signature
-
-log = logging.getLogger(__name__)
-
-# Available signature methods
-#
-# Note: SIGNATURE_HMAC and SIGNATURE_RSA are kept for backward compatibility
-# with previous versions of this library, when it the only HMAC-based and
-# RSA-based signature methods were HMAC-SHA1 and RSA-SHA1. But now that it
-# supports other hashing algorithms besides SHA1, explicitly identifying which
-# hashing algorithm is being used is recommended.
-#
-# Note: if additional values are defined here, don't forget to update the
-# imports in "../__init__.py" so they are available outside this module.
-
-SIGNATURE_HMAC_SHA1 = "HMAC-SHA1"
-SIGNATURE_HMAC_SHA256 = "HMAC-SHA256"
-SIGNATURE_HMAC_SHA512 = "HMAC-SHA512"
-SIGNATURE_HMAC = SIGNATURE_HMAC_SHA1  # deprecated variable for HMAC-SHA1
-
-SIGNATURE_RSA_SHA1 = "RSA-SHA1"
-SIGNATURE_RSA_SHA256 = "RSA-SHA256"
-SIGNATURE_RSA_SHA512 = "RSA-SHA512"
-SIGNATURE_RSA = SIGNATURE_RSA_SHA1  # deprecated variable for RSA-SHA1
-
-SIGNATURE_PLAINTEXT = "PLAINTEXT"
-
-SIGNATURE_METHODS = (
-    SIGNATURE_HMAC_SHA1,
-    SIGNATURE_HMAC_SHA256,
-    SIGNATURE_HMAC_SHA512,
-    SIGNATURE_RSA_SHA1,
-    SIGNATURE_RSA_SHA256,
-    SIGNATURE_RSA_SHA512,
-    SIGNATURE_PLAINTEXT
-)
-
-SIGNATURE_TYPE_AUTH_HEADER = 'AUTH_HEADER'
-SIGNATURE_TYPE_QUERY = 'QUERY'
-SIGNATURE_TYPE_BODY = 'BODY'
-
-CONTENT_TYPE_FORM_URLENCODED = 'application/x-www-form-urlencoded'
-
-
-class Client:
-
-    """A client used to sign OAuth 1.0 RFC 5849 requests."""
-    SIGNATURE_METHODS = {
-        SIGNATURE_HMAC_SHA1: signature.sign_hmac_sha1_with_client,
-        SIGNATURE_HMAC_SHA256: signature.sign_hmac_sha256_with_client,
-        SIGNATURE_HMAC_SHA512: signature.sign_hmac_sha512_with_client,
-        SIGNATURE_RSA_SHA1: signature.sign_rsa_sha1_with_client,
-        SIGNATURE_RSA_SHA256: signature.sign_rsa_sha256_with_client,
-        SIGNATURE_RSA_SHA512: signature.sign_rsa_sha512_with_client,
-        SIGNATURE_PLAINTEXT: signature.sign_plaintext_with_client
-    }
-
-    @classmethod
-    def register_signature_method(cls, method_name, method_callback):
-        cls.SIGNATURE_METHODS[method_name] = method_callback
-
-    def __init__(self, client_key,
-                 client_secret=None,
-                 resource_owner_key=None,
-                 resource_owner_secret=None,
-                 callback_uri=None,
-                 signature_method=SIGNATURE_HMAC_SHA1,
-                 signature_type=SIGNATURE_TYPE_AUTH_HEADER,
-                 rsa_key=None, verifier=None, realm=None,
-                 encoding='utf-8', decoding=None,
-                 nonce=None, timestamp=None):
-        """Create an OAuth 1 client.
-
-        :param client_key: Client key (consumer key), mandatory.
-        :param resource_owner_key: Resource owner key (oauth token).
-        :param resource_owner_secret: Resource owner secret (oauth token secret).
-        :param callback_uri: Callback used when obtaining request token.
-        :param signature_method: SIGNATURE_HMAC, SIGNATURE_RSA or SIGNATURE_PLAINTEXT.
-        :param signature_type: SIGNATURE_TYPE_AUTH_HEADER (default),
-                               SIGNATURE_TYPE_QUERY or SIGNATURE_TYPE_BODY
-                               depending on where you want to embed the oauth
-                               credentials.
-        :param rsa_key: RSA key used with SIGNATURE_RSA.
-        :param verifier: Verifier used when obtaining an access token.
-        :param realm: Realm (scope) to which access is being requested.
-        :param encoding: If you provide non-unicode input you may use this
-                         to have oauthlib automatically convert.
-        :param decoding: If you wish that the returned uri, headers and body
-                         from sign be encoded back from unicode, then set
-                         decoding to your preferred encoding, i.e. utf-8.
-        :param nonce: Use this nonce instead of generating one. (Mainly for testing)
-        :param timestamp: Use this timestamp instead of using current. (Mainly for testing)
-        """
-        # Convert to unicode using encoding if given, else assume unicode
-        encode = lambda x: to_unicode(x, encoding) if encoding else x
-
-        self.client_key = encode(client_key)
-        self.client_secret = encode(client_secret)
-        self.resource_owner_key = encode(resource_owner_key)
-        self.resource_owner_secret = encode(resource_owner_secret)
-        self.signature_method = encode(signature_method)
-        self.signature_type = encode(signature_type)
-        self.callback_uri = encode(callback_uri)
-        self.rsa_key = encode(rsa_key)
-        self.verifier = encode(verifier)
-        self.realm = encode(realm)
-        self.encoding = encode(encoding)
-        self.decoding = encode(decoding)
-        self.nonce = encode(nonce)
-        self.timestamp = encode(timestamp)
-
-    def __repr__(self):
-        attrs = vars(self).copy()
-        attrs['client_secret'] = '****' if attrs['client_secret'] else None
-        attrs['rsa_key'] = '****' if attrs['rsa_key'] else None
-        attrs[
-            'resource_owner_secret'] = '****' if attrs['resource_owner_secret'] else None
-        attribute_str = ', '.join('{}={}'.format(k, v) for k, v in attrs.items())
-        return '<{} {}>'.format(self.__class__.__name__, attribute_str)
-
-    def get_oauth_signature(self, request):
-        """Get an OAuth signature to be used in signing a request
-
-        To satisfy `section 3.4.1.2`_ item 2, if the request argument's
-        headers dict attribute contains a Host item, its value will
-        replace any netloc part of the request argument's uri attribute
-        value.
-
-        .. _`section 3.4.1.2`: https://tools.ietf.org/html/rfc5849#section-3.4.1.2
-        """
-        if self.signature_method == SIGNATURE_PLAINTEXT:
-            # fast-path
-            return signature.sign_plaintext(self.client_secret,
-                                            self.resource_owner_secret)
-
-        uri, headers, body = self._render(request)
-
-        collected_params = signature.collect_parameters(
-            uri_query=urlparse.urlparse(uri).query,
-            body=body,
-            headers=headers)
-        log.debug("Collected params: {}".format(collected_params))
-
-        normalized_params = signature.normalize_parameters(collected_params)
-        normalized_uri = signature.base_string_uri(uri, headers.get('Host', None))
-        log.debug("Normalized params: {}".format(normalized_params))
-        log.debug("Normalized URI: {}".format(normalized_uri))
-
-        base_string = signature.signature_base_string(request.http_method,
-                                                      normalized_uri, normalized_params)
-
-        log.debug("Signing: signature base string: {}".format(base_string))
-
-        if self.signature_method not in self.SIGNATURE_METHODS:
-            raise ValueError('Invalid signature method.')
-
-        sig = self.SIGNATURE_METHODS[self.signature_method](base_string, self)
-
-        log.debug("Signature: {}".format(sig))
-        return sig
-
-    def get_oauth_params(self, request):
-        """Get the basic OAuth parameters to be used in generating a signature.
-        """
-        nonce = (generate_nonce()
-                 if self.nonce is None else self.nonce)
-        timestamp = (generate_timestamp()
-                     if self.timestamp is None else self.timestamp)
-        params = [
-            ('oauth_nonce', nonce),
-            ('oauth_timestamp', timestamp),
-            ('oauth_version', '1.0'),
-            ('oauth_signature_method', self.signature_method),
-            ('oauth_consumer_key', self.client_key),
-        ]
-        if self.resource_owner_key:
-            params.append(('oauth_token', self.resource_owner_key))
-        if self.callback_uri:
-            params.append(('oauth_callback', self.callback_uri))
-        if self.verifier:
-            params.append(('oauth_verifier', self.verifier))
-
-        # providing body hash for requests other than x-www-form-urlencoded
-        # as described in https://tools.ietf.org/html/draft-eaton-oauth-bodyhash-00#section-4.1.1
-        # 4.1.1. When to include the body hash
-        #    *  [...] MUST NOT include an oauth_body_hash parameter on requests with form-encoded request bodies
-        #    *  [...] SHOULD include the oauth_body_hash parameter on all other requests.
-        # Note that SHA-1 is vulnerable. The spec acknowledges that in https://tools.ietf.org/html/draft-eaton-oauth-bodyhash-00#section-6.2
-        # At this time, no further effort has been made to replace SHA-1 for the OAuth Request Body Hash extension.
-        content_type = request.headers.get('Content-Type', None)
-        content_type_eligible = content_type and content_type.find('application/x-www-form-urlencoded') < 0
-        if request.body is not None and content_type_eligible:
-            params.append(('oauth_body_hash', base64.b64encode(hashlib.sha1(request.body.encode('utf-8')).digest()).decode('utf-8')))
-
-        return params
-
-    def _render(self, request, formencode=False, realm=None):
-        """Render a signed request according to signature type
-
-        Returns a 3-tuple containing the request URI, headers, and body.
-
-        If the formencode argument is True and the body contains parameters, it
-        is escaped and returned as a valid formencoded string.
-        """
-        # TODO what if there are body params on a header-type auth?
-        # TODO what if there are query params on a body-type auth?
-
-        uri, headers, body = request.uri, request.headers, request.body
-
-        # TODO: right now these prepare_* methods are very narrow in scope--they
-        # only affect their little thing. In some cases (for example, with
-        # header auth) it might be advantageous to allow these methods to touch
-        # other parts of the request, like the headers—so the prepare_headers
-        # method could also set the Content-Type header to x-www-form-urlencoded
-        # like the spec requires. This would be a fundamental change though, and
-        # I'm not sure how I feel about it.
-        if self.signature_type == SIGNATURE_TYPE_AUTH_HEADER:
-            headers = parameters.prepare_headers(
-                request.oauth_params, request.headers, realm=realm)
-        elif self.signature_type == SIGNATURE_TYPE_BODY and request.decoded_body is not None:
-            body = parameters.prepare_form_encoded_body(
-                request.oauth_params, request.decoded_body)
-            if formencode:
-                body = urlencode(body)
-            headers['Content-Type'] = 'application/x-www-form-urlencoded'
-        elif self.signature_type == SIGNATURE_TYPE_QUERY:
-            uri = parameters.prepare_request_uri_query(
-                request.oauth_params, request.uri)
-        else:
-            raise ValueError('Unknown signature type specified.')
-
-        return uri, headers, body
-
-    def sign(self, uri, http_method='GET', body=None, headers=None, realm=None):
-        """Sign a request
-
-        Signs an HTTP request with the specified parts.
-
-        Returns a 3-tuple of the signed request's URI, headers, and body.
-        Note that http_method is not returned as it is unaffected by the OAuth
-        signing process. Also worth noting is that duplicate parameters
-        will be included in the signature, regardless of where they are
-        specified (query, body).
-
-        The body argument may be a dict, a list of 2-tuples, or a formencoded
-        string. The Content-Type header must be 'application/x-www-form-urlencoded'
-        if it is present.
-
-        If the body argument is not one of the above, it will be returned
-        verbatim as it is unaffected by the OAuth signing process. Attempting to
-        sign a request with non-formencoded data using the OAuth body signature
-        type is invalid and will raise an exception.
-
-        If the body does contain parameters, it will be returned as a properly-
-        formatted formencoded string.
-
-        Body may not be included if the http_method is either GET or HEAD as
-        this changes the semantic meaning of the request.
-
-        All string data MUST be unicode or be encoded with the same encoding
-        scheme supplied to the Client constructor, default utf-8. This includes
-        strings inside body dicts, for example.
-        """
-        # normalize request data
-        request = Request(uri, http_method, body, headers,
-                          encoding=self.encoding)
-
-        # sanity check
-        content_type = request.headers.get('Content-Type', None)
-        multipart = content_type and content_type.startswith('multipart/')
-        should_have_params = content_type == CONTENT_TYPE_FORM_URLENCODED
-        has_params = request.decoded_body is not None
-        # 3.4.1.3.1.  Parameter Sources
-        # [Parameters are collected from the HTTP request entity-body, but only
-        # if [...]:
-        #    *  The entity-body is single-part.
-        if multipart and has_params:
-            raise ValueError(
-                "Headers indicate a multipart body but body contains parameters.")
-        #    *  The entity-body follows the encoding requirements of the
-        #       "application/x-www-form-urlencoded" content-type as defined by
-        #       [W3C.REC-html40-19980424].
-        elif should_have_params and not has_params:
-            raise ValueError(
-                "Headers indicate a formencoded body but body was not decodable.")
-        #    *  The HTTP request entity-header includes the "Content-Type"
-        #       header field set to "application/x-www-form-urlencoded".
-        elif not should_have_params and has_params:
-            raise ValueError(
-                "Body contains parameters but Content-Type header was {} "
-                "instead of {}".format(content_type or "not set",
-                                        CONTENT_TYPE_FORM_URLENCODED))
-
-        # 3.5.2.  Form-Encoded Body
-        # Protocol parameters can be transmitted in the HTTP request entity-
-        # body, but only if the following REQUIRED conditions are met:
-        # o  The entity-body is single-part.
-        # o  The entity-body follows the encoding requirements of the
-        #    "application/x-www-form-urlencoded" content-type as defined by
-        #    [W3C.REC-html40-19980424].
-        # o  The HTTP request entity-header includes the "Content-Type" header
-        #    field set to "application/x-www-form-urlencoded".
-        elif self.signature_type == SIGNATURE_TYPE_BODY and not (
-                should_have_params and has_params and not multipart):
-            raise ValueError(
-                'Body signatures may only be used with form-urlencoded content')
-
-        # We amend https://tools.ietf.org/html/rfc5849#section-3.4.1.3.1
-        # with the clause that parameters from body should only be included
-        # in non GET or HEAD requests. Extracting the request body parameters
-        # and including them in the signature base string would give semantic
-        # meaning to the body, which it should not have according to the
-        # HTTP 1.1 spec.
-        elif http_method.upper() in ('GET', 'HEAD') and has_params:
-            raise ValueError('GET/HEAD requests should not include body.')
-
-        # generate the basic OAuth parameters
-        request.oauth_params = self.get_oauth_params(request)
-
-        # generate the signature
-        request.oauth_params.append(
-            ('oauth_signature', self.get_oauth_signature(request)))
-
-        # render the signed request and return it
-        uri, headers, body = self._render(request, formencode=True,
-                                          realm=(realm or self.realm))
-
-        if self.decoding:
-            log.debug('Encoding URI, headers and body to %s.', self.decoding)
-            uri = uri.encode(self.decoding)
-            body = body.encode(self.decoding) if body else body
-            new_headers = {}
-            for k, v in headers.items():
-                new_headers[k.encode(self.decoding)] = v.encode(self.decoding)
-            headers = new_headers
-        return uri, headers, body
diff --git a/lib/oauthlib/oauth1/rfc5849/endpoints/__init__.py b/lib/oauthlib/oauth1/rfc5849/endpoints/__init__.py
deleted file mode 100644
index 9f30389f..00000000
--- a/lib/oauthlib/oauth1/rfc5849/endpoints/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from .access_token import AccessTokenEndpoint
-from .authorization import AuthorizationEndpoint
-from .base import BaseEndpoint
-from .request_token import RequestTokenEndpoint
-from .resource import ResourceEndpoint
-from .signature_only import SignatureOnlyEndpoint
-
-from .pre_configured import WebApplicationServer  # isort:skip
diff --git a/lib/oauthlib/oauth1/rfc5849/endpoints/access_token.py b/lib/oauthlib/oauth1/rfc5849/endpoints/access_token.py
deleted file mode 100644
index 13665db0..00000000
--- a/lib/oauthlib/oauth1/rfc5849/endpoints/access_token.py
+++ /dev/null
@@ -1,215 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-oauthlib.oauth1.rfc5849.endpoints.access_token
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of the access token provider logic of
-OAuth 1.0 RFC 5849. It validates the correctness of access token requests,
-creates and persists tokens as well as create the proper response to be
-returned to the client.
-"""
-import logging
-
-from oauthlib.common import urlencode
-
-from .. import errors
-from .base import BaseEndpoint
-
-log = logging.getLogger(__name__)
-
-
-class AccessTokenEndpoint(BaseEndpoint):
-
-    """An endpoint responsible for providing OAuth 1 access tokens.
-
-    Typical use is to instantiate with a request validator and invoke the
-    ``create_access_token_response`` from a view function. The tuple returned
-    has all information necessary (body, status, headers) to quickly form
-    and return a proper response. See :doc:`/oauth1/validator` for details on which
-    validator methods to implement for this endpoint.
-    """
-
-    def create_access_token(self, request, credentials):
-        """Create and save a new access token.
-
-        Similar to OAuth 2, indication of granted scopes will be included as a
-        space separated list in ``oauth_authorized_realms``.
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :returns: The token as an urlencoded string.
-        """
-        request.realms = self.request_validator.get_realms(
-            request.resource_owner_key, request)
-        token = {
-            'oauth_token': self.token_generator(),
-            'oauth_token_secret': self.token_generator(),
-            # Backport the authorized scopes indication used in OAuth2
-            'oauth_authorized_realms': ' '.join(request.realms)
-        }
-        token.update(credentials)
-        self.request_validator.save_access_token(token, request)
-        return urlencode(token.items())
-
-    def create_access_token_response(self, uri, http_method='GET', body=None,
-                                     headers=None, credentials=None):
-        """Create an access token response, with a new request token if valid.
-
-        :param uri: The full URI of the token request.
-        :param http_method: A valid HTTP verb, i.e. GET, POST, PUT, HEAD, etc.
-        :param body: The request body as a string.
-        :param headers: The request headers as a dict.
-        :param credentials: A list of extra credentials to include in the token.
-        :returns: A tuple of 3 elements.
-                  1. A dict of headers to set on the response.
-                  2. The response body as a string.
-                  3. The response status code as an integer.
-
-        An example of a valid request::
-
-            >>> from your_validator import your_validator
-            >>> from oauthlib.oauth1 import AccessTokenEndpoint
-            >>> endpoint = AccessTokenEndpoint(your_validator)
-            >>> h, b, s = endpoint.create_access_token_response(
-            ...     'https://your.provider/access_token?foo=bar',
-            ...     headers={
-            ...         'Authorization': 'OAuth oauth_token=234lsdkf....'
-            ...     },
-            ...     credentials={
-            ...         'my_specific': 'argument',
-            ...     })
-            >>> h
-            {'Content-Type': 'application/x-www-form-urlencoded'}
-            >>> b
-            'oauth_token=lsdkfol23w54jlksdef&oauth_token_secret=qwe089234lkjsdf&oauth_authorized_realms=movies+pics&my_specific=argument'
-            >>> s
-            200
-
-        An response to invalid request would have a different body and status::
-
-            >>> b
-            'error=invalid_request&description=missing+resource+owner+key'
-            >>> s
-            400
-
-        The same goes for an an unauthorized request:
-
-            >>> b
-            ''
-            >>> s
-            401
-        """
-        resp_headers = {'Content-Type': 'application/x-www-form-urlencoded'}
-        try:
-            request = self._create_request(uri, http_method, body, headers)
-            valid, processed_request = self.validate_access_token_request(
-                request)
-            if valid:
-                token = self.create_access_token(request, credentials or {})
-                self.request_validator.invalidate_request_token(
-                    request.client_key,
-                    request.resource_owner_key,
-                    request)
-                return resp_headers, token, 200
-            else:
-                return {}, None, 401
-        except errors.OAuth1Error as e:
-            return resp_headers, e.urlencoded, e.status_code
-
-    def validate_access_token_request(self, request):
-        """Validate an access token request.
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :raises: OAuth1Error if the request is invalid.
-        :returns: A tuple of 2 elements.
-                  1. The validation result (True or False).
-                  2. The request object.
-        """
-        self._check_transport_security(request)
-        self._check_mandatory_parameters(request)
-
-        if not request.resource_owner_key:
-            raise errors.InvalidRequestError(
-                description='Missing resource owner.')
-
-        if not self.request_validator.check_request_token(
-                request.resource_owner_key):
-            raise errors.InvalidRequestError(
-                description='Invalid resource owner key format.')
-
-        if not request.verifier:
-            raise errors.InvalidRequestError(
-                description='Missing verifier.')
-
-        if not self.request_validator.check_verifier(request.verifier):
-            raise errors.InvalidRequestError(
-                description='Invalid verifier format.')
-
-        if not self.request_validator.validate_timestamp_and_nonce(
-                request.client_key, request.timestamp, request.nonce, request,
-                request_token=request.resource_owner_key):
-            return False, request
-
-        # The server SHOULD return a 401 (Unauthorized) status code when
-        # receiving a request with invalid client credentials.
-        # Note: This is postponed in order to avoid timing attacks, instead
-        # a dummy client is assigned and used to maintain near constant
-        # time request verification.
-        #
-        # Note that early exit would enable client enumeration
-        valid_client = self.request_validator.validate_client_key(
-            request.client_key, request)
-        if not valid_client:
-            request.client_key = self.request_validator.dummy_client
-
-        # The server SHOULD return a 401 (Unauthorized) status code when
-        # receiving a request with invalid or expired token.
-        # Note: This is postponed in order to avoid timing attacks, instead
-        # a dummy token is assigned and used to maintain near constant
-        # time request verification.
-        #
-        # Note that early exit would enable resource owner enumeration
-        valid_resource_owner = self.request_validator.validate_request_token(
-            request.client_key, request.resource_owner_key, request)
-        if not valid_resource_owner:
-            request.resource_owner_key = self.request_validator.dummy_request_token
-
-        # The server MUST verify (Section 3.2) the validity of the request,
-        # ensure that the resource owner has authorized the provisioning of
-        # token credentials to the client, and ensure that the temporary
-        # credentials have not expired or been used before.  The server MUST
-        # also verify the verification code received from the client.
-        # .. _`Section 3.2`: https://tools.ietf.org/html/rfc5849#section-3.2
-        #
-        # Note that early exit would enable resource owner authorization
-        # verifier enumertion.
-        valid_verifier = self.request_validator.validate_verifier(
-            request.client_key,
-            request.resource_owner_key,
-            request.verifier,
-            request)
-
-        valid_signature = self._check_signature(request, is_token_request=True)
-
-        # log the results to the validator_log
-        # this lets us handle internal reporting and analysis
-        request.validator_log['client'] = valid_client
-        request.validator_log['resource_owner'] = valid_resource_owner
-        request.validator_log['verifier'] = valid_verifier
-        request.validator_log['signature'] = valid_signature
-
-        # We delay checking validity until the very end, using dummy values for
-        # calculations and fetching secrets/keys to ensure the flow of every
-        # request remains almost identical regardless of whether valid values
-        # have been supplied. This ensures near constant time execution and
-        # prevents malicious users from guessing sensitive information
-        v = all((valid_client, valid_resource_owner, valid_verifier,
-                 valid_signature))
-        if not v:
-            log.info("[Failure] request verification failed.")
-            log.info("Valid client:, %s", valid_client)
-            log.info("Valid token:, %s", valid_resource_owner)
-            log.info("Valid verifier:, %s", valid_verifier)
-            log.info("Valid signature:, %s", valid_signature)
-        return v, request
diff --git a/lib/oauthlib/oauth1/rfc5849/endpoints/authorization.py b/lib/oauthlib/oauth1/rfc5849/endpoints/authorization.py
deleted file mode 100644
index 00d9576b..00000000
--- a/lib/oauthlib/oauth1/rfc5849/endpoints/authorization.py
+++ /dev/null
@@ -1,158 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-oauthlib.oauth1.rfc5849.endpoints.authorization
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of various logic needed
-for signing and checking OAuth 1.0 RFC 5849 requests.
-"""
-from urllib.parse import urlencode
-
-from oauthlib.common import add_params_to_uri
-
-from .. import errors
-from .base import BaseEndpoint
-
-
-class AuthorizationEndpoint(BaseEndpoint):
-
-    """An endpoint responsible for letting authenticated users authorize access
-    to their protected resources to a client.
-
-    Typical use would be to have two views, one for displaying the authorization
-    form and one to process said form on submission.
-
-    The first view will want to utilize ``get_realms_and_credentials`` to fetch
-    requested realms and useful client credentials, such as name and
-    description, to be used when creating the authorization form.
-
-    During form processing you can use ``create_authorization_response`` to
-    validate the request, create a verifier as well as prepare the final
-    redirection URI used to send the user back to the client.
-
-    See :doc:`/oauth1/validator` for details on which validator methods to implement
-    for this endpoint.
-    """
-
-    def create_verifier(self, request, credentials):
-        """Create and save a new request token.
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :param credentials: A dict of extra token credentials.
-        :returns: The verifier as a dict.
-        """
-        verifier = {
-            'oauth_token': request.resource_owner_key,
-            'oauth_verifier': self.token_generator(),
-        }
-        verifier.update(credentials)
-        self.request_validator.save_verifier(
-            request.resource_owner_key, verifier, request)
-        return verifier
-
-    def create_authorization_response(self, uri, http_method='GET', body=None,
-                                      headers=None, realms=None, credentials=None):
-        """Create an authorization response, with a new request token if valid.
-
-        :param uri: The full URI of the token request.
-        :param http_method: A valid HTTP verb, i.e. GET, POST, PUT, HEAD, etc.
-        :param body: The request body as a string.
-        :param headers: The request headers as a dict.
-        :param credentials: A list of credentials to include in the verifier.
-        :returns: A tuple of 3 elements.
-                  1. A dict of headers to set on the response.
-                  2. The response body as a string.
-                  3. The response status code as an integer.
-
-        If the callback URI tied to the current token is "oob", a response with
-        a 200 status code will be returned. In this case, it may be desirable to
-        modify the response to better display the verifier to the client.
-
-        An example of an authorization request::
-
-            >>> from your_validator import your_validator
-            >>> from oauthlib.oauth1 import AuthorizationEndpoint
-            >>> endpoint = AuthorizationEndpoint(your_validator)
-            >>> h, b, s = endpoint.create_authorization_response(
-            ...     'https://your.provider/authorize?oauth_token=...',
-            ...     credentials={
-            ...         'extra': 'argument',
-            ...     })
-            >>> h
-            {'Location': 'https://the.client/callback?oauth_verifier=...&extra=argument'}
-            >>> b
-            None
-            >>> s
-            302
-
-        An example of a request with an "oob" callback::
-
-            >>> from your_validator import your_validator
-            >>> from oauthlib.oauth1 import AuthorizationEndpoint
-            >>> endpoint = AuthorizationEndpoint(your_validator)
-            >>> h, b, s = endpoint.create_authorization_response(
-            ...     'https://your.provider/authorize?foo=bar',
-            ...     credentials={
-            ...         'extra': 'argument',
-            ...     })
-            >>> h
-            {'Content-Type': 'application/x-www-form-urlencoded'}
-            >>> b
-            'oauth_verifier=...&extra=argument'
-            >>> s
-            200
-        """
-        request = self._create_request(uri, http_method=http_method, body=body,
-                                       headers=headers)
-
-        if not request.resource_owner_key:
-            raise errors.InvalidRequestError(
-                'Missing mandatory parameter oauth_token.')
-        if not self.request_validator.verify_request_token(
-                request.resource_owner_key, request):
-            raise errors.InvalidClientError()
-
-        request.realms = realms
-        if (request.realms and not self.request_validator.verify_realms(
-                request.resource_owner_key, request.realms, request)):
-            raise errors.InvalidRequestError(
-                description=('User granted access to realms outside of '
-                             'what the client may request.'))
-
-        verifier = self.create_verifier(request, credentials or {})
-        redirect_uri = self.request_validator.get_redirect_uri(
-            request.resource_owner_key, request)
-        if redirect_uri == 'oob':
-            response_headers = {
-                'Content-Type': 'application/x-www-form-urlencoded'}
-            response_body = urlencode(verifier)
-            return response_headers, response_body, 200
-        else:
-            populated_redirect = add_params_to_uri(
-                redirect_uri, verifier.items())
-            return {'Location': populated_redirect}, None, 302
-
-    def get_realms_and_credentials(self, uri, http_method='GET', body=None,
-                                   headers=None):
-        """Fetch realms and credentials for the presented request token.
-
-        :param uri: The full URI of the token request.
-        :param http_method: A valid HTTP verb, i.e. GET, POST, PUT, HEAD, etc.
-        :param body: The request body as a string.
-        :param headers: The request headers as a dict.
-        :returns: A tuple of 2 elements.
-                  1. A list of request realms.
-                  2. A dict of credentials which may be useful in creating the
-                  authorization form.
-        """
-        request = self._create_request(uri, http_method=http_method, body=body,
-                                       headers=headers)
-
-        if not self.request_validator.verify_request_token(
-                request.resource_owner_key, request):
-            raise errors.InvalidClientError()
-
-        realms = self.request_validator.get_realms(
-            request.resource_owner_key, request)
-        return realms, {'resource_owner_key': request.resource_owner_key}
diff --git a/lib/oauthlib/oauth1/rfc5849/endpoints/base.py b/lib/oauthlib/oauth1/rfc5849/endpoints/base.py
deleted file mode 100644
index 7831be7c..00000000
--- a/lib/oauthlib/oauth1/rfc5849/endpoints/base.py
+++ /dev/null
@@ -1,244 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-oauthlib.oauth1.rfc5849.endpoints.base
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of various logic needed
-for signing and checking OAuth 1.0 RFC 5849 requests.
-"""
-import time
-
-from oauthlib.common import CaseInsensitiveDict, Request, generate_token
-
-from .. import (
-    CONTENT_TYPE_FORM_URLENCODED, SIGNATURE_HMAC_SHA1, SIGNATURE_HMAC_SHA256,
-    SIGNATURE_HMAC_SHA512, SIGNATURE_PLAINTEXT, SIGNATURE_RSA_SHA1,
-    SIGNATURE_RSA_SHA256, SIGNATURE_RSA_SHA512, SIGNATURE_TYPE_AUTH_HEADER,
-    SIGNATURE_TYPE_BODY, SIGNATURE_TYPE_QUERY, errors, signature, utils,
-)
-
-
-class BaseEndpoint:
-
-    def __init__(self, request_validator, token_generator=None):
-        self.request_validator = request_validator
-        self.token_generator = token_generator or generate_token
-
-    def _get_signature_type_and_params(self, request):
-        """Extracts parameters from query, headers and body. Signature type
-        is set to the source in which parameters were found.
-        """
-        # Per RFC5849, only the Authorization header may contain the 'realm'
-        # optional parameter.
-        header_params = signature.collect_parameters(headers=request.headers,
-                                                     exclude_oauth_signature=False, with_realm=True)
-        body_params = signature.collect_parameters(body=request.body,
-                                                   exclude_oauth_signature=False)
-        query_params = signature.collect_parameters(uri_query=request.uri_query,
-                                                    exclude_oauth_signature=False)
-
-        params = []
-        params.extend(header_params)
-        params.extend(body_params)
-        params.extend(query_params)
-        signature_types_with_oauth_params = list(filter(lambda s: s[2], (
-            (SIGNATURE_TYPE_AUTH_HEADER, params,
-                utils.filter_oauth_params(header_params)),
-            (SIGNATURE_TYPE_BODY, params,
-                utils.filter_oauth_params(body_params)),
-            (SIGNATURE_TYPE_QUERY, params,
-                utils.filter_oauth_params(query_params))
-        )))
-
-        if len(signature_types_with_oauth_params) > 1:
-            found_types = [s[0] for s in signature_types_with_oauth_params]
-            raise errors.InvalidRequestError(
-                description=('oauth_ params must come from only 1 signature'
-                             'type but were found in %s',
-                             ', '.join(found_types)))
-
-        try:
-            signature_type, params, oauth_params = signature_types_with_oauth_params[
-                0]
-        except IndexError:
-            raise errors.InvalidRequestError(
-                description='Missing mandatory OAuth parameters.')
-
-        return signature_type, params, oauth_params
-
-    def _create_request(self, uri, http_method, body, headers):
-        # Only include body data from x-www-form-urlencoded requests
-        headers = CaseInsensitiveDict(headers or {})
-        if ("Content-Type" in headers and
-                CONTENT_TYPE_FORM_URLENCODED in headers["Content-Type"]):
-            request = Request(uri, http_method, body, headers)
-        else:
-            request = Request(uri, http_method, '', headers)
-
-        signature_type, params, oauth_params = (
-            self._get_signature_type_and_params(request))
-
-        # The server SHOULD return a 400 (Bad Request) status code when
-        # receiving a request with duplicated protocol parameters.
-        if len(dict(oauth_params)) != len(oauth_params):
-            raise errors.InvalidRequestError(
-                description='Duplicate OAuth1 entries.')
-
-        oauth_params = dict(oauth_params)
-        request.signature = oauth_params.get('oauth_signature')
-        request.client_key = oauth_params.get('oauth_consumer_key')
-        request.resource_owner_key = oauth_params.get('oauth_token')
-        request.nonce = oauth_params.get('oauth_nonce')
-        request.timestamp = oauth_params.get('oauth_timestamp')
-        request.redirect_uri = oauth_params.get('oauth_callback')
-        request.verifier = oauth_params.get('oauth_verifier')
-        request.signature_method = oauth_params.get('oauth_signature_method')
-        request.realm = dict(params).get('realm')
-        request.oauth_params = oauth_params
-
-        # Parameters to Client depend on signature method which may vary
-        # for each request. Note that HMAC-SHA1 and PLAINTEXT share parameters
-        request.params = [(k, v) for k, v in params if k != "oauth_signature"]
-
-        if 'realm' in request.headers.get('Authorization', ''):
-            request.params = [(k, v)
-                              for k, v in request.params if k != "realm"]
-
-        return request
-
-    def _check_transport_security(self, request):
-        # TODO: move into oauthlib.common from oauth2.utils
-        if (self.request_validator.enforce_ssl and
-                not request.uri.lower().startswith("https://")):
-            raise errors.InsecureTransportError()
-
-    def _check_mandatory_parameters(self, request):
-        # The server SHOULD return a 400 (Bad Request) status code when
-        # receiving a request with missing parameters.
-        if not all((request.signature, request.client_key,
-                    request.nonce, request.timestamp,
-                    request.signature_method)):
-            raise errors.InvalidRequestError(
-                description='Missing mandatory OAuth parameters.')
-
-        # OAuth does not mandate a particular signature method, as each
-        # implementation can have its own unique requirements.  Servers are
-        # free to implement and document their own custom methods.
-        # Recommending any particular method is beyond the scope of this
-        # specification.  Implementers should review the Security
-        # Considerations section (`Section 4`_) before deciding on which
-        # method to support.
-        # .. _`Section 4`: https://tools.ietf.org/html/rfc5849#section-4
-        if (not request.signature_method in
-                self.request_validator.allowed_signature_methods):
-            raise errors.InvalidSignatureMethodError(
-                description="Invalid signature, {} not in {!r}.".format(
-                    request.signature_method,
-                    self.request_validator.allowed_signature_methods))
-
-        # Servers receiving an authenticated request MUST validate it by:
-        #   If the "oauth_version" parameter is present, ensuring its value is
-        #   "1.0".
-        if ('oauth_version' in request.oauth_params and
-                request.oauth_params['oauth_version'] != '1.0'):
-            raise errors.InvalidRequestError(
-                description='Invalid OAuth version.')
-
-        # The timestamp value MUST be a positive integer. Unless otherwise
-        # specified by the server's documentation, the timestamp is expressed
-        # in the number of seconds since January 1, 1970 00:00:00 GMT.
-        if len(request.timestamp) != 10:
-            raise errors.InvalidRequestError(
-                description='Invalid timestamp size')
-
-        try:
-            ts = int(request.timestamp)
-
-        except ValueError:
-            raise errors.InvalidRequestError(
-                description='Timestamp must be an integer.')
-
-        else:
-            # To avoid the need to retain an infinite number of nonce values for
-            # future checks, servers MAY choose to restrict the time period after
-            # which a request with an old timestamp is rejected.
-            if abs(time.time() - ts) > self.request_validator.timestamp_lifetime:
-                raise errors.InvalidRequestError(
-                    description=('Timestamp given is invalid, differ from '
-                                 'allowed by over %s seconds.' % (
-                                     self.request_validator.timestamp_lifetime)))
-
-        # Provider specific validation of parameters, used to enforce
-        # restrictions such as character set and length.
-        if not self.request_validator.check_client_key(request.client_key):
-            raise errors.InvalidRequestError(
-                description='Invalid client key format.')
-
-        if not self.request_validator.check_nonce(request.nonce):
-            raise errors.InvalidRequestError(
-                description='Invalid nonce format.')
-
-    def _check_signature(self, request, is_token_request=False):
-        # ---- RSA Signature verification ----
-        if request.signature_method == SIGNATURE_RSA_SHA1 or \
-           request.signature_method == SIGNATURE_RSA_SHA256 or \
-           request.signature_method == SIGNATURE_RSA_SHA512:
-            # RSA-based signature method
-
-            # The server verifies the signature per `[RFC3447] section 8.2.2`_
-            # .. _`[RFC3447] section 8.2.2`: https://tools.ietf.org/html/rfc3447#section-8.2.1
-
-            rsa_key = self.request_validator.get_rsa_key(
-                request.client_key, request)
-
-            if request.signature_method == SIGNATURE_RSA_SHA1:
-                valid_signature = signature.verify_rsa_sha1(request, rsa_key)
-            elif request.signature_method == SIGNATURE_RSA_SHA256:
-                valid_signature = signature.verify_rsa_sha256(request, rsa_key)
-            elif request.signature_method == SIGNATURE_RSA_SHA512:
-                valid_signature = signature.verify_rsa_sha512(request, rsa_key)
-            else:
-                valid_signature = False
-
-        # ---- HMAC or Plaintext Signature verification ----
-        else:
-            # Non-RSA based signature method
-
-            # Servers receiving an authenticated request MUST validate it by:
-            #   Recalculating the request signature independently as described in
-            #   `Section 3.4`_ and comparing it to the value received from the
-            #   client via the "oauth_signature" parameter.
-            # .. _`Section 3.4`: https://tools.ietf.org/html/rfc5849#section-3.4
-
-            client_secret = self.request_validator.get_client_secret(
-                request.client_key, request)
-
-            resource_owner_secret = None
-            if request.resource_owner_key:
-                if is_token_request:
-                    resource_owner_secret = \
-                        self.request_validator.get_request_token_secret(
-                            request.client_key, request.resource_owner_key,
-                            request)
-                else:
-                    resource_owner_secret = \
-                        self.request_validator.get_access_token_secret(
-                            request.client_key, request.resource_owner_key,
-                            request)
-
-            if request.signature_method == SIGNATURE_HMAC_SHA1:
-                valid_signature = signature.verify_hmac_sha1(
-                    request, client_secret, resource_owner_secret)
-            elif request.signature_method == SIGNATURE_HMAC_SHA256:
-                valid_signature = signature.verify_hmac_sha256(
-                    request, client_secret, resource_owner_secret)
-            elif request.signature_method == SIGNATURE_HMAC_SHA512:
-                valid_signature = signature.verify_hmac_sha512(
-                    request, client_secret, resource_owner_secret)
-            elif request.signature_method == SIGNATURE_PLAINTEXT:
-                valid_signature = signature.verify_plaintext(
-                    request, client_secret, resource_owner_secret)
-            else:
-                valid_signature = False
-
-        return valid_signature
diff --git a/lib/oauthlib/oauth1/rfc5849/endpoints/pre_configured.py b/lib/oauthlib/oauth1/rfc5849/endpoints/pre_configured.py
deleted file mode 100644
index 23e3cfc8..00000000
--- a/lib/oauthlib/oauth1/rfc5849/endpoints/pre_configured.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from . import (
-    AccessTokenEndpoint, AuthorizationEndpoint, RequestTokenEndpoint,
-    ResourceEndpoint,
-)
-
-
-class WebApplicationServer(RequestTokenEndpoint, AuthorizationEndpoint,
-                           AccessTokenEndpoint, ResourceEndpoint):
-
-    def __init__(self, request_validator):
-        RequestTokenEndpoint.__init__(self, request_validator)
-        AuthorizationEndpoint.__init__(self, request_validator)
-        AccessTokenEndpoint.__init__(self, request_validator)
-        ResourceEndpoint.__init__(self, request_validator)
diff --git a/lib/oauthlib/oauth1/rfc5849/endpoints/request_token.py b/lib/oauthlib/oauth1/rfc5849/endpoints/request_token.py
deleted file mode 100644
index 0323cfb8..00000000
--- a/lib/oauthlib/oauth1/rfc5849/endpoints/request_token.py
+++ /dev/null
@@ -1,209 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-oauthlib.oauth1.rfc5849.endpoints.request_token
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of the request token provider logic of
-OAuth 1.0 RFC 5849. It validates the correctness of request token requests,
-creates and persists tokens as well as create the proper response to be
-returned to the client.
-"""
-import logging
-
-from oauthlib.common import urlencode
-
-from .. import errors
-from .base import BaseEndpoint
-
-log = logging.getLogger(__name__)
-
-
-class RequestTokenEndpoint(BaseEndpoint):
-
-    """An endpoint responsible for providing OAuth 1 request tokens.
-
-    Typical use is to instantiate with a request validator and invoke the
-    ``create_request_token_response`` from a view function. The tuple returned
-    has all information necessary (body, status, headers) to quickly form
-    and return a proper response. See :doc:`/oauth1/validator` for details on which
-    validator methods to implement for this endpoint.
-    """
-
-    def create_request_token(self, request, credentials):
-        """Create and save a new request token.
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :param credentials: A dict of extra token credentials.
-        :returns: The token as an urlencoded string.
-        """
-        token = {
-            'oauth_token': self.token_generator(),
-            'oauth_token_secret': self.token_generator(),
-            'oauth_callback_confirmed': 'true'
-        }
-        token.update(credentials)
-        self.request_validator.save_request_token(token, request)
-        return urlencode(token.items())
-
-    def create_request_token_response(self, uri, http_method='GET', body=None,
-                                      headers=None, credentials=None):
-        """Create a request token response, with a new request token if valid.
-
-        :param uri: The full URI of the token request.
-        :param http_method: A valid HTTP verb, i.e. GET, POST, PUT, HEAD, etc.
-        :param body: The request body as a string.
-        :param headers: The request headers as a dict.
-        :param credentials: A list of extra credentials to include in the token.
-        :returns: A tuple of 3 elements.
-                  1. A dict of headers to set on the response.
-                  2. The response body as a string.
-                  3. The response status code as an integer.
-
-        An example of a valid request::
-
-            >>> from your_validator import your_validator
-            >>> from oauthlib.oauth1 import RequestTokenEndpoint
-            >>> endpoint = RequestTokenEndpoint(your_validator)
-            >>> h, b, s = endpoint.create_request_token_response(
-            ...     'https://your.provider/request_token?foo=bar',
-            ...     headers={
-            ...         'Authorization': 'OAuth realm=movies user, oauth_....'
-            ...     },
-            ...     credentials={
-            ...         'my_specific': 'argument',
-            ...     })
-            >>> h
-            {'Content-Type': 'application/x-www-form-urlencoded'}
-            >>> b
-            'oauth_token=lsdkfol23w54jlksdef&oauth_token_secret=qwe089234lkjsdf&oauth_callback_confirmed=true&my_specific=argument'
-            >>> s
-            200
-
-        An response to invalid request would have a different body and status::
-
-            >>> b
-            'error=invalid_request&description=missing+callback+uri'
-            >>> s
-            400
-
-        The same goes for an an unauthorized request:
-
-            >>> b
-            ''
-            >>> s
-            401
-        """
-        resp_headers = {'Content-Type': 'application/x-www-form-urlencoded'}
-        try:
-            request = self._create_request(uri, http_method, body, headers)
-            valid, processed_request = self.validate_request_token_request(
-                request)
-            if valid:
-                token = self.create_request_token(request, credentials or {})
-                return resp_headers, token, 200
-            else:
-                return {}, None, 401
-        except errors.OAuth1Error as e:
-            return resp_headers, e.urlencoded, e.status_code
-
-    def validate_request_token_request(self, request):
-        """Validate a request token request.
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :raises: OAuth1Error if the request is invalid.
-        :returns: A tuple of 2 elements.
-                  1. The validation result (True or False).
-                  2. The request object.
-        """
-        self._check_transport_security(request)
-        self._check_mandatory_parameters(request)
-
-        if request.realm:
-            request.realms = request.realm.split(' ')
-        else:
-            request.realms = self.request_validator.get_default_realms(
-                request.client_key, request)
-        if not self.request_validator.check_realms(request.realms):
-            raise errors.InvalidRequestError(
-                description='Invalid realm {}. Allowed are {!r}.'.format(
-                    request.realms, self.request_validator.realms))
-
-        if not request.redirect_uri:
-            raise errors.InvalidRequestError(
-                description='Missing callback URI.')
-
-        if not self.request_validator.validate_timestamp_and_nonce(
-                request.client_key, request.timestamp, request.nonce, request,
-                request_token=request.resource_owner_key):
-            return False, request
-
-        # The server SHOULD return a 401 (Unauthorized) status code when
-        # receiving a request with invalid client credentials.
-        # Note: This is postponed in order to avoid timing attacks, instead
-        # a dummy client is assigned and used to maintain near constant
-        # time request verification.
-        #
-        # Note that early exit would enable client enumeration
-        valid_client = self.request_validator.validate_client_key(
-            request.client_key, request)
-        if not valid_client:
-            request.client_key = self.request_validator.dummy_client
-
-        # Note that `realm`_ is only used in authorization headers and how
-        # it should be interpreted is not included in the OAuth spec.
-        # However they could be seen as a scope or realm to which the
-        # client has access and as such every client should be checked
-        # to ensure it is authorized access to that scope or realm.
-        # .. _`realm`: https://tools.ietf.org/html/rfc2617#section-1.2
-        #
-        # Note that early exit would enable client realm access enumeration.
-        #
-        # The require_realm indicates this is the first step in the OAuth
-        # workflow where a client requests access to a specific realm.
-        # This first step (obtaining request token) need not require a realm
-        # and can then be identified by checking the require_resource_owner
-        # flag and absence of realm.
-        #
-        # Clients obtaining an access token will not supply a realm and it will
-        # not be checked. Instead the previously requested realm should be
-        # transferred from the request token to the access token.
-        #
-        # Access to protected resources will always validate the realm but note
-        # that the realm is now tied to the access token and not provided by
-        # the client.
-        valid_realm = self.request_validator.validate_requested_realms(
-            request.client_key, request.realms, request)
-
-        # Callback is normally never required, except for requests for
-        # a Temporary Credential as described in `Section 2.1`_
-        # .._`Section 2.1`: https://tools.ietf.org/html/rfc5849#section-2.1
-        valid_redirect = self.request_validator.validate_redirect_uri(
-            request.client_key, request.redirect_uri, request)
-        if not request.redirect_uri:
-            raise NotImplementedError('Redirect URI must either be provided '
-                                      'or set to a default during validation.')
-
-        valid_signature = self._check_signature(request)
-
-        # log the results to the validator_log
-        # this lets us handle internal reporting and analysis
-        request.validator_log['client'] = valid_client
-        request.validator_log['realm'] = valid_realm
-        request.validator_log['callback'] = valid_redirect
-        request.validator_log['signature'] = valid_signature
-
-        # We delay checking validity until the very end, using dummy values for
-        # calculations and fetching secrets/keys to ensure the flow of every
-        # request remains almost identical regardless of whether valid values
-        # have been supplied. This ensures near constant time execution and
-        # prevents malicious users from guessing sensitive information
-        v = all((valid_client, valid_realm, valid_redirect, valid_signature))
-        if not v:
-            log.info("[Failure] request verification failed.")
-            log.info("Valid client: %s.", valid_client)
-            log.info("Valid realm: %s.", valid_realm)
-            log.info("Valid callback: %s.", valid_redirect)
-            log.info("Valid signature: %s.", valid_signature)
-        return v, request
diff --git a/lib/oauthlib/oauth1/rfc5849/endpoints/resource.py b/lib/oauthlib/oauth1/rfc5849/endpoints/resource.py
deleted file mode 100644
index 8641152e..00000000
--- a/lib/oauthlib/oauth1/rfc5849/endpoints/resource.py
+++ /dev/null
@@ -1,163 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-oauthlib.oauth1.rfc5849.endpoints.resource
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of the resource protection provider logic of
-OAuth 1.0 RFC 5849.
-"""
-import logging
-
-from .. import errors
-from .base import BaseEndpoint
-
-log = logging.getLogger(__name__)
-
-
-class ResourceEndpoint(BaseEndpoint):
-
-    """An endpoint responsible for protecting resources.
-
-    Typical use is to instantiate with a request validator and invoke the
-    ``validate_protected_resource_request`` in a decorator around a view
-    function. If the request is valid, invoke and return the response of the
-    view. If invalid create and return an error response directly from the
-    decorator.
-
-    See :doc:`/oauth1/validator` for details on which validator methods to implement
-    for this endpoint.
-
-    An example decorator::
-
-        from functools import wraps
-        from your_validator import your_validator
-        from oauthlib.oauth1 import ResourceEndpoint
-        endpoint = ResourceEndpoint(your_validator)
-
-        def require_oauth(realms=None):
-            def decorator(f):
-                @wraps(f)
-                def wrapper(request, *args, **kwargs):
-                    v, r = provider.validate_protected_resource_request(
-                            request.url,
-                            http_method=request.method,
-                            body=request.data,
-                            headers=request.headers,
-                            realms=realms or [])
-                    if v:
-                        return f(*args, **kwargs)
-                    else:
-                        return abort(403)
-    """
-
-    def validate_protected_resource_request(self, uri, http_method='GET',
-                                            body=None, headers=None, realms=None):
-        """Create a request token response, with a new request token if valid.
-
-        :param uri: The full URI of the token request.
-        :param http_method: A valid HTTP verb, i.e. GET, POST, PUT, HEAD, etc.
-        :param body: The request body as a string.
-        :param headers: The request headers as a dict.
-        :param realms: A list of realms the resource is protected under.
-                       This will be supplied to the ``validate_realms``
-                       method of the request validator.
-        :returns: A tuple of 2 elements.
-                  1. True if valid, False otherwise.
-                  2. An oauthlib.common.Request object.
-        """
-        try:
-            request = self._create_request(uri, http_method, body, headers)
-        except errors.OAuth1Error:
-            return False, None
-
-        try:
-            self._check_transport_security(request)
-            self._check_mandatory_parameters(request)
-        except errors.OAuth1Error:
-            return False, request
-
-        if not request.resource_owner_key:
-            return False, request
-
-        if not self.request_validator.check_access_token(
-                request.resource_owner_key):
-            return False, request
-
-        if not self.request_validator.validate_timestamp_and_nonce(
-                request.client_key, request.timestamp, request.nonce, request,
-                access_token=request.resource_owner_key):
-            return False, request
-
-        # The server SHOULD return a 401 (Unauthorized) status code when
-        # receiving a request with invalid client credentials.
-        # Note: This is postponed in order to avoid timing attacks, instead
-        # a dummy client is assigned and used to maintain near constant
-        # time request verification.
-        #
-        # Note that early exit would enable client enumeration
-        valid_client = self.request_validator.validate_client_key(
-            request.client_key, request)
-        if not valid_client:
-            request.client_key = self.request_validator.dummy_client
-
-        # The server SHOULD return a 401 (Unauthorized) status code when
-        # receiving a request with invalid or expired token.
-        # Note: This is postponed in order to avoid timing attacks, instead
-        # a dummy token is assigned and used to maintain near constant
-        # time request verification.
-        #
-        # Note that early exit would enable resource owner enumeration
-        valid_resource_owner = self.request_validator.validate_access_token(
-            request.client_key, request.resource_owner_key, request)
-        if not valid_resource_owner:
-            request.resource_owner_key = self.request_validator.dummy_access_token
-
-        # Note that `realm`_ is only used in authorization headers and how
-        # it should be interpreted is not included in the OAuth spec.
-        # However they could be seen as a scope or realm to which the
-        # client has access and as such every client should be checked
-        # to ensure it is authorized access to that scope or realm.
-        # .. _`realm`: https://tools.ietf.org/html/rfc2617#section-1.2
-        #
-        # Note that early exit would enable client realm access enumeration.
-        #
-        # The require_realm indicates this is the first step in the OAuth
-        # workflow where a client requests access to a specific realm.
-        # This first step (obtaining request token) need not require a realm
-        # and can then be identified by checking the require_resource_owner
-        # flag and absence of realm.
-        #
-        # Clients obtaining an access token will not supply a realm and it will
-        # not be checked. Instead the previously requested realm should be
-        # transferred from the request token to the access token.
-        #
-        # Access to protected resources will always validate the realm but note
-        # that the realm is now tied to the access token and not provided by
-        # the client.
-        valid_realm = self.request_validator.validate_realms(request.client_key,
-                                                             request.resource_owner_key, request, uri=request.uri,
-                                                             realms=realms)
-
-        valid_signature = self._check_signature(request)
-
-        # log the results to the validator_log
-        # this lets us handle internal reporting and analysis
-        request.validator_log['client'] = valid_client
-        request.validator_log['resource_owner'] = valid_resource_owner
-        request.validator_log['realm'] = valid_realm
-        request.validator_log['signature'] = valid_signature
-
-        # We delay checking validity until the very end, using dummy values for
-        # calculations and fetching secrets/keys to ensure the flow of every
-        # request remains almost identical regardless of whether valid values
-        # have been supplied. This ensures near constant time execution and
-        # prevents malicious users from guessing sensitive information
-        v = all((valid_client, valid_resource_owner, valid_realm,
-                 valid_signature))
-        if not v:
-            log.info("[Failure] request verification failed.")
-            log.info("Valid client: %s", valid_client)
-            log.info("Valid token: %s", valid_resource_owner)
-            log.info("Valid realm: %s", valid_realm)
-            log.info("Valid signature: %s", valid_signature)
-        return v, request
diff --git a/lib/oauthlib/oauth1/rfc5849/endpoints/signature_only.py b/lib/oauthlib/oauth1/rfc5849/endpoints/signature_only.py
deleted file mode 100644
index d693ccb7..00000000
--- a/lib/oauthlib/oauth1/rfc5849/endpoints/signature_only.py
+++ /dev/null
@@ -1,82 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-oauthlib.oauth1.rfc5849.endpoints.signature_only
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of the signing logic of OAuth 1.0 RFC 5849.
-"""
-
-import logging
-
-from .. import errors
-from .base import BaseEndpoint
-
-log = logging.getLogger(__name__)
-
-
-class SignatureOnlyEndpoint(BaseEndpoint):
-
-    """An endpoint only responsible for verifying an oauth signature."""
-
-    def validate_request(self, uri, http_method='GET',
-                         body=None, headers=None):
-        """Validate a signed OAuth request.
-
-        :param uri: The full URI of the token request.
-        :param http_method: A valid HTTP verb, i.e. GET, POST, PUT, HEAD, etc.
-        :param body: The request body as a string.
-        :param headers: The request headers as a dict.
-        :returns: A tuple of 2 elements.
-                  1. True if valid, False otherwise.
-                  2. An oauthlib.common.Request object.
-        """
-        try:
-            request = self._create_request(uri, http_method, body, headers)
-        except errors.OAuth1Error as err:
-            log.info(
-                'Exception caught while validating request, %s.' % err)
-            return False, None
-
-        try:
-            self._check_transport_security(request)
-            self._check_mandatory_parameters(request)
-        except errors.OAuth1Error as err:
-            log.info(
-                'Exception caught while validating request, %s.' % err)
-            return False, request
-
-        if not self.request_validator.validate_timestamp_and_nonce(
-                request.client_key, request.timestamp, request.nonce, request):
-            log.debug('[Failure] verification failed: timestamp/nonce')
-            return False, request
-
-        # The server SHOULD return a 401 (Unauthorized) status code when
-        # receiving a request with invalid client credentials.
-        # Note: This is postponed in order to avoid timing attacks, instead
-        # a dummy client is assigned and used to maintain near constant
-        # time request verification.
-        #
-        # Note that early exit would enable client enumeration
-        valid_client = self.request_validator.validate_client_key(
-            request.client_key, request)
-        if not valid_client:
-            request.client_key = self.request_validator.dummy_client
-
-        valid_signature = self._check_signature(request)
-
-        # log the results to the validator_log
-        # this lets us handle internal reporting and analysis
-        request.validator_log['client'] = valid_client
-        request.validator_log['signature'] = valid_signature
-
-        # We delay checking validity until the very end, using dummy values for
-        # calculations and fetching secrets/keys to ensure the flow of every
-        # request remains almost identical regardless of whether valid values
-        # have been supplied. This ensures near constant time execution and
-        # prevents malicious users from guessing sensitive information
-        v = all((valid_client, valid_signature))
-        if not v:
-            log.info("[Failure] request verification failed.")
-            log.info("Valid client: %s", valid_client)
-            log.info("Valid signature: %s", valid_signature)
-        return v, request
diff --git a/lib/oauthlib/oauth1/rfc5849/errors.py b/lib/oauthlib/oauth1/rfc5849/errors.py
deleted file mode 100644
index 8774d407..00000000
--- a/lib/oauthlib/oauth1/rfc5849/errors.py
+++ /dev/null
@@ -1,76 +0,0 @@
-"""
-oauthlib.oauth1.rfc5849.errors
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Error used both by OAuth 1 clients and provicers to represent the spec
-defined error responses for all four core grant types.
-"""
-from oauthlib.common import add_params_to_uri, urlencode
-
-
-class OAuth1Error(Exception):
-    error = None
-    description = ''
-
-    def __init__(self, description=None, uri=None, status_code=400,
-                 request=None):
-        """
-        description:    A human-readable ASCII [USASCII] text providing
-                        additional information, used to assist the client
-                        developer in understanding the error that occurred.
-                        Values for the "error_description" parameter MUST NOT
-                        include characters outside the set
-                        x20-21 / x23-5B / x5D-7E.
-
-        uri:    A URI identifying a human-readable web page with information
-                about the error, used to provide the client developer with
-                additional information about the error.  Values for the
-                "error_uri" parameter MUST conform to the URI- Reference
-                syntax, and thus MUST NOT include characters outside the set
-                x21 / x23-5B / x5D-7E.
-
-        state:  A CSRF protection value received from the client.
-
-        request:  Oauthlib Request object
-        """
-        self.description = description or self.description
-        message = '({}) {}'.format(self.error, self.description)
-        if request:
-            message += ' ' + repr(request)
-        super().__init__(message)
-
-        self.uri = uri
-        self.status_code = status_code
-
-    def in_uri(self, uri):
-        return add_params_to_uri(uri, self.twotuples)
-
-    @property
-    def twotuples(self):
-        error = [('error', self.error)]
-        if self.description:
-            error.append(('error_description', self.description))
-        if self.uri:
-            error.append(('error_uri', self.uri))
-        return error
-
-    @property
-    def urlencoded(self):
-        return urlencode(self.twotuples)
-
-
-class InsecureTransportError(OAuth1Error):
-    error = 'insecure_transport_protocol'
-    description = 'Only HTTPS connections are permitted.'
-
-
-class InvalidSignatureMethodError(OAuth1Error):
-    error = 'invalid_signature_method'
-
-
-class InvalidRequestError(OAuth1Error):
-    error = 'invalid_request'
-
-
-class InvalidClientError(OAuth1Error):
-    error = 'invalid_client'
diff --git a/lib/oauthlib/oauth1/rfc5849/parameters.py b/lib/oauthlib/oauth1/rfc5849/parameters.py
deleted file mode 100644
index 2163772d..00000000
--- a/lib/oauthlib/oauth1/rfc5849/parameters.py
+++ /dev/null
@@ -1,133 +0,0 @@
-"""
-oauthlib.parameters
-~~~~~~~~~~~~~~~~~~~
-
-This module contains methods related to `section 3.5`_ of the OAuth 1.0a spec.
-
-.. _`section 3.5`: https://tools.ietf.org/html/rfc5849#section-3.5
-"""
-from urllib.parse import urlparse, urlunparse
-
-from oauthlib.common import extract_params, urlencode
-
-from . import utils
-
-
-# TODO: do we need filter_params now that oauth_params are handled by Request?
-#       We can easily pass in just oauth protocol params.
-@utils.filter_params
-def prepare_headers(oauth_params, headers=None, realm=None):
-    """**Prepare the Authorization header.**
-    Per `section 3.5.1`_ of the spec.
-
-    Protocol parameters can be transmitted using the HTTP "Authorization"
-    header field as defined by `RFC2617`_ with the auth-scheme name set to
-    "OAuth" (case insensitive).
-
-    For example::
-
-        Authorization: OAuth realm="Example",
-            oauth_consumer_key="0685bd9184jfhq22",
-            oauth_token="ad180jjd733klru7",
-            oauth_signature_method="HMAC-SHA1",
-            oauth_signature="wOJIO9A2W5mFwDgiDvZbTSMK%2FPY%3D",
-            oauth_timestamp="137131200",
-            oauth_nonce="4572616e48616d6d65724c61686176",
-            oauth_version="1.0"
-
-
-    .. _`section 3.5.1`: https://tools.ietf.org/html/rfc5849#section-3.5.1
-    .. _`RFC2617`: https://tools.ietf.org/html/rfc2617
-    """
-    headers = headers or {}
-
-    # Protocol parameters SHALL be included in the "Authorization" header
-    # field as follows:
-    authorization_header_parameters_parts = []
-    for oauth_parameter_name, value in oauth_params:
-        # 1.  Parameter names and values are encoded per Parameter Encoding
-        #     (`Section 3.6`_)
-        #
-        # .. _`Section 3.6`: https://tools.ietf.org/html/rfc5849#section-3.6
-        escaped_name = utils.escape(oauth_parameter_name)
-        escaped_value = utils.escape(value)
-
-        # 2.  Each parameter's name is immediately followed by an "=" character
-        #     (ASCII code 61), a """ character (ASCII code 34), the parameter
-        #     value (MAY be empty), and another """ character (ASCII code 34).
-        part = '{}="{}"'.format(escaped_name, escaped_value)
-
-        authorization_header_parameters_parts.append(part)
-
-    # 3.  Parameters are separated by a "," character (ASCII code 44) and
-    #     OPTIONAL linear whitespace per `RFC2617`_.
-    #
-    # .. _`RFC2617`: https://tools.ietf.org/html/rfc2617
-    authorization_header_parameters = ', '.join(
-        authorization_header_parameters_parts)
-
-    # 4.  The OPTIONAL "realm" parameter MAY be added and interpreted per
-    #     `RFC2617 section 1.2`_.
-    #
-    # .. _`RFC2617 section 1.2`: https://tools.ietf.org/html/rfc2617#section-1.2
-    if realm:
-        # NOTE: realm should *not* be escaped
-        authorization_header_parameters = ('realm="%s", ' % realm +
-                                           authorization_header_parameters)
-
-    # the auth-scheme name set to "OAuth" (case insensitive).
-    authorization_header = 'OAuth %s' % authorization_header_parameters
-
-    # contribute the Authorization header to the given headers
-    full_headers = {}
-    full_headers.update(headers)
-    full_headers['Authorization'] = authorization_header
-    return full_headers
-
-
-def _append_params(oauth_params, params):
-    """Append OAuth params to an existing set of parameters.
-
-    Both params and oauth_params is must be lists of 2-tuples.
-
-    Per `section 3.5.2`_ and `3.5.3`_ of the spec.
-
-    .. _`section 3.5.2`: https://tools.ietf.org/html/rfc5849#section-3.5.2
-    .. _`3.5.3`: https://tools.ietf.org/html/rfc5849#section-3.5.3
-
-    """
-    merged = list(params)
-    merged.extend(oauth_params)
-    # The request URI / entity-body MAY include other request-specific
-    # parameters, in which case, the protocol parameters SHOULD be appended
-    # following the request-specific parameters, properly separated by an "&"
-    # character (ASCII code 38)
-    merged.sort(key=lambda i: i[0].startswith('oauth_'))
-    return merged
-
-
-def prepare_form_encoded_body(oauth_params, body):
-    """Prepare the Form-Encoded Body.
-
-    Per `section 3.5.2`_ of the spec.
-
-    .. _`section 3.5.2`: https://tools.ietf.org/html/rfc5849#section-3.5.2
-
-    """
-    # append OAuth params to the existing body
-    return _append_params(oauth_params, body)
-
-
-def prepare_request_uri_query(oauth_params, uri):
-    """Prepare the Request URI Query.
-
-    Per `section 3.5.3`_ of the spec.
-
-    .. _`section 3.5.3`: https://tools.ietf.org/html/rfc5849#section-3.5.3
-
-    """
-    # append OAuth params to the existing set of query components
-    sch, net, path, par, query, fra = urlparse(uri)
-    query = urlencode(
-        _append_params(oauth_params, extract_params(query) or []))
-    return urlunparse((sch, net, path, par, query, fra))
diff --git a/lib/oauthlib/oauth1/rfc5849/request_validator.py b/lib/oauthlib/oauth1/rfc5849/request_validator.py
deleted file mode 100644
index e937aabf..00000000
--- a/lib/oauthlib/oauth1/rfc5849/request_validator.py
+++ /dev/null
@@ -1,849 +0,0 @@
-"""
-oauthlib.oauth1.rfc5849
-~~~~~~~~~~~~~~
-
-This module is an implementation of various logic needed
-for signing and checking OAuth 1.0 RFC 5849 requests.
-"""
-from . import SIGNATURE_METHODS, utils
-
-
-class RequestValidator:
-
-    """A validator/datastore interaction base class for OAuth 1 providers.
-
-    OAuth providers should inherit from RequestValidator and implement the
-    methods and properties outlined below. Further details are provided in the
-    documentation for each method and property.
-
-    Methods used to check the format of input parameters. Common tests include
-    length, character set, membership, range or pattern. These tests are
-    referred to as `whitelisting or blacklisting`_. Whitelisting is better
-    but blacklisting can be useful to spot malicious activity.
-    The following have methods a default implementation:
-
-    - check_client_key
-    - check_request_token
-    - check_access_token
-    - check_nonce
-    - check_verifier
-    - check_realms
-
-    The methods above default to whitelist input parameters, checking that they
-    are alphanumerical and between a minimum and maximum length. Rather than
-    overloading the methods a few properties can be used to configure these
-    methods.
-
-    * @safe_characters -> (character set)
-    * @client_key_length -> (min, max)
-    * @request_token_length -> (min, max)
-    * @access_token_length -> (min, max)
-    * @nonce_length -> (min, max)
-    * @verifier_length -> (min, max)
-    * @realms -> [list, of, realms]
-
-    Methods used to validate/invalidate input parameters. These checks usually
-    hit either persistent or temporary storage such as databases or the
-    filesystem. See each methods documentation for detailed usage.
-    The following methods must be implemented:
-
-    - validate_client_key
-    - validate_request_token
-    - validate_access_token
-    - validate_timestamp_and_nonce
-    - validate_redirect_uri
-    - validate_requested_realms
-    - validate_realms
-    - validate_verifier
-    - invalidate_request_token
-
-    Methods used to retrieve sensitive information from storage.
-    The following methods must be implemented:
-
-    - get_client_secret
-    - get_request_token_secret
-    - get_access_token_secret
-    - get_rsa_key
-    - get_realms
-    - get_default_realms
-    - get_redirect_uri
-
-    Methods used to save credentials.
-    The following methods must be implemented:
-
-    - save_request_token
-    - save_verifier
-    - save_access_token
-
-    Methods used to verify input parameters. This methods are used during
-    authorizing request token by user (AuthorizationEndpoint), to check if
-    parameters are valid. During token authorization request is not signed,
-    thus 'validation' methods can not be used. The following methods must be
-    implemented:
-
-    - verify_realms
-    - verify_request_token
-
-    To prevent timing attacks it is necessary to not exit early even if the
-    client key or resource owner key is invalid. Instead dummy values should
-    be used during the remaining verification process. It is very important
-    that the dummy client and token are valid input parameters to the methods
-    get_client_secret, get_rsa_key and get_(access/request)_token_secret and
-    that the running time of those methods when given a dummy value remain
-    equivalent to the running time when given a valid client/resource owner.
-    The following properties must be implemented:
-
-    * @dummy_client
-    * @dummy_request_token
-    * @dummy_access_token
-
-    Example implementations have been provided, note that the database used is
-    a simple dictionary and serves only an illustrative purpose. Use whichever
-    database suits your project and how to access it is entirely up to you.
-    The methods are introduced in an order which should make understanding
-    their use more straightforward and as such it could be worth reading what
-    follows in chronological order.
-
-    .. _`whitelisting or blacklisting`: https://www.schneier.com/blog/archives/2011/01/whitelisting_vs.html
-    """
-
-    def __init__(self):
-        pass
-
-    @property
-    def allowed_signature_methods(self):
-        return SIGNATURE_METHODS
-
-    @property
-    def safe_characters(self):
-        return set(utils.UNICODE_ASCII_CHARACTER_SET)
-
-    @property
-    def client_key_length(self):
-        return 20, 30
-
-    @property
-    def request_token_length(self):
-        return 20, 30
-
-    @property
-    def access_token_length(self):
-        return 20, 30
-
-    @property
-    def timestamp_lifetime(self):
-        return 600
-
-    @property
-    def nonce_length(self):
-        return 20, 30
-
-    @property
-    def verifier_length(self):
-        return 20, 30
-
-    @property
-    def realms(self):
-        return []
-
-    @property
-    def enforce_ssl(self):
-        return True
-
-    def check_client_key(self, client_key):
-        """Check that the client key only contains safe characters
-        and is no shorter than lower and no longer than upper.
-        """
-        lower, upper = self.client_key_length
-        return (set(client_key) <= self.safe_characters and
-                lower <= len(client_key) <= upper)
-
-    def check_request_token(self, request_token):
-        """Checks that the request token contains only safe characters
-        and is no shorter than lower and no longer than upper.
-        """
-        lower, upper = self.request_token_length
-        return (set(request_token) <= self.safe_characters and
-                lower <= len(request_token) <= upper)
-
-    def check_access_token(self, request_token):
-        """Checks that the token contains only safe characters
-        and is no shorter than lower and no longer than upper.
-        """
-        lower, upper = self.access_token_length
-        return (set(request_token) <= self.safe_characters and
-                lower <= len(request_token) <= upper)
-
-    def check_nonce(self, nonce):
-        """Checks that the nonce only contains only safe characters
-        and is no shorter than lower and no longer than upper.
-        """
-        lower, upper = self.nonce_length
-        return (set(nonce) <= self.safe_characters and
-                lower <= len(nonce) <= upper)
-
-    def check_verifier(self, verifier):
-        """Checks that the verifier contains only safe characters
-        and is no shorter than lower and no longer than upper.
-        """
-        lower, upper = self.verifier_length
-        return (set(verifier) <= self.safe_characters and
-                lower <= len(verifier) <= upper)
-
-    def check_realms(self, realms):
-        """Check that the realm is one of a set allowed realms."""
-        return all(r in self.realms for r in realms)
-
-    def _subclass_must_implement(self, fn):
-        """
-        Returns a NotImplementedError for a function that should be implemented.
-        :param fn: name of the function
-        """
-        m = "Missing function implementation in {}: {}".format(type(self), fn)
-        return NotImplementedError(m)
-
-    @property
-    def dummy_client(self):
-        """Dummy client used when an invalid client key is supplied.
-
-        :returns: The dummy client key string.
-
-        The dummy client should be associated with either a client secret,
-        a rsa key or both depending on which signature methods are supported.
-        Providers should make sure that
-
-        get_client_secret(dummy_client)
-        get_rsa_key(dummy_client)
-
-        return a valid secret or key for the dummy client.
-
-        This method is used by
-
-        * AccessTokenEndpoint
-        * RequestTokenEndpoint
-        * ResourceEndpoint
-        * SignatureOnlyEndpoint
-        """
-        raise self._subclass_must_implement("dummy_client")
-
-    @property
-    def dummy_request_token(self):
-        """Dummy request token used when an invalid token was supplied.
-
-        :returns: The dummy request token string.
-
-        The dummy request token should be associated with a request token
-        secret such that get_request_token_secret(.., dummy_request_token)
-        returns a valid secret.
-
-        This method is used by
-
-        * AccessTokenEndpoint
-        """
-        raise self._subclass_must_implement("dummy_request_token")
-
-    @property
-    def dummy_access_token(self):
-        """Dummy access token used when an invalid token was supplied.
-
-        :returns: The dummy access token string.
-
-        The dummy access token should be associated with an access token
-        secret such that get_access_token_secret(.., dummy_access_token)
-        returns a valid secret.
-
-        This method is used by
-
-        * ResourceEndpoint
-        """
-        raise self._subclass_must_implement("dummy_access_token")
-
-    def get_client_secret(self, client_key, request):
-        """Retrieves the client secret associated with the client key.
-
-        :param client_key: The client/consumer key.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :returns: The client secret as a string.
-
-        This method must allow the use of a dummy client_key value.
-        Fetching the secret using the dummy key must take the same amount of
-        time as fetching a secret for a valid client::
-
-            # Unlikely to be near constant time as it uses two database
-            # lookups for a valid client, and only one for an invalid.
-            from your_datastore import ClientSecret
-            if ClientSecret.has(client_key):
-                return ClientSecret.get(client_key)
-            else:
-                return 'dummy'
-
-            # Aim to mimic number of latency inducing operations no matter
-            # whether the client is valid or not.
-            from your_datastore import ClientSecret
-            return ClientSecret.get(client_key, 'dummy')
-
-        Note that the returned key must be in plaintext.
-
-        This method is used by
-
-        * AccessTokenEndpoint
-        * RequestTokenEndpoint
-        * ResourceEndpoint
-        * SignatureOnlyEndpoint
-        """
-        raise self._subclass_must_implement('get_client_secret')
-
-    def get_request_token_secret(self, client_key, token, request):
-        """Retrieves the shared secret associated with the request token.
-
-        :param client_key: The client/consumer key.
-        :param token: The request token string.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :returns: The token secret as a string.
-
-        This method must allow the use of a dummy values and the running time
-        must be roughly equivalent to that of the running time of valid values::
-
-            # Unlikely to be near constant time as it uses two database
-            # lookups for a valid client, and only one for an invalid.
-            from your_datastore import RequestTokenSecret
-            if RequestTokenSecret.has(client_key):
-                return RequestTokenSecret.get((client_key, request_token))
-            else:
-                return 'dummy'
-
-            # Aim to mimic number of latency inducing operations no matter
-            # whether the client is valid or not.
-            from your_datastore import RequestTokenSecret
-            return ClientSecret.get((client_key, request_token), 'dummy')
-
-        Note that the returned key must be in plaintext.
-
-        This method is used by
-
-        * AccessTokenEndpoint
-        """
-        raise self._subclass_must_implement('get_request_token_secret')
-
-    def get_access_token_secret(self, client_key, token, request):
-        """Retrieves the shared secret associated with the access token.
-
-        :param client_key: The client/consumer key.
-        :param token: The access token string.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :returns: The token secret as a string.
-
-        This method must allow the use of a dummy values and the running time
-        must be roughly equivalent to that of the running time of valid values::
-
-            # Unlikely to be near constant time as it uses two database
-            # lookups for a valid client, and only one for an invalid.
-            from your_datastore import AccessTokenSecret
-            if AccessTokenSecret.has(client_key):
-                return AccessTokenSecret.get((client_key, request_token))
-            else:
-                return 'dummy'
-
-            # Aim to mimic number of latency inducing operations no matter
-            # whether the client is valid or not.
-            from your_datastore import AccessTokenSecret
-            return ClientSecret.get((client_key, request_token), 'dummy')
-
-        Note that the returned key must be in plaintext.
-
-        This method is used by
-
-        * ResourceEndpoint
-        """
-        raise self._subclass_must_implement("get_access_token_secret")
-
-    def get_default_realms(self, client_key, request):
-        """Get the default realms for a client.
-
-        :param client_key: The client/consumer key.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :returns: The list of default realms associated with the client.
-
-        The list of default realms will be set during client registration and
-        is outside the scope of OAuthLib.
-
-        This method is used by
-
-        * RequestTokenEndpoint
-        """
-        raise self._subclass_must_implement("get_default_realms")
-
-    def get_realms(self, token, request):
-        """Get realms associated with a request token.
-
-        :param token: The request token string.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :returns: The list of realms associated with the request token.
-
-        This method is used by
-
-        * AuthorizationEndpoint
-        * AccessTokenEndpoint
-        """
-        raise self._subclass_must_implement("get_realms")
-
-    def get_redirect_uri(self, token, request):
-        """Get the redirect URI associated with a request token.
-
-        :param token: The request token string.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :returns: The redirect URI associated with the request token.
-
-        It may be desirable to return a custom URI if the redirect is set to "oob".
-        In this case, the user will be redirected to the returned URI and at that
-        endpoint the verifier can be displayed.
-
-        This method is used by
-
-        * AuthorizationEndpoint
-        """
-        raise self._subclass_must_implement("get_redirect_uri")
-
-    def get_rsa_key(self, client_key, request):
-        """Retrieves a previously stored client provided RSA key.
-
-        :param client_key: The client/consumer key.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :returns: The rsa public key as a string.
-
-        This method must allow the use of a dummy client_key value. Fetching
-        the rsa key using the dummy key must take the same amount of time
-        as fetching a key for a valid client. The dummy key must also be of
-        the same bit length as client keys.
-
-        Note that the key must be returned in plaintext.
-
-        This method is used by
-
-        * AccessTokenEndpoint
-        * RequestTokenEndpoint
-        * ResourceEndpoint
-        * SignatureOnlyEndpoint
-        """
-        raise self._subclass_must_implement("get_rsa_key")
-
-    def invalidate_request_token(self, client_key, request_token, request):
-        """Invalidates a used request token.
-
-        :param client_key: The client/consumer key.
-        :param request_token: The request token string.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :returns: None
-
-        Per `Section 2.3`_ of the spec:
-
-        "The server MUST (...) ensure that the temporary
-        credentials have not expired or been used before."
-
-        .. _`Section 2.3`: https://tools.ietf.org/html/rfc5849#section-2.3
-
-        This method should ensure that provided token won't validate anymore.
-        It can be simply removing RequestToken from storage or setting
-        specific flag that makes it invalid (note that such flag should be
-        also validated during request token validation).
-
-        This method is used by
-
-        * AccessTokenEndpoint
-        """
-        raise self._subclass_must_implement("invalidate_request_token")
-
-    def validate_client_key(self, client_key, request):
-        """Validates that supplied client key is a registered and valid client.
-
-        :param client_key: The client/consumer key.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :returns: True or False
-
-        Note that if the dummy client is supplied it should validate in same
-        or nearly the same amount of time as a valid one.
-
-        Ensure latency inducing tasks are mimiced even for dummy clients.
-        For example, use::
-
-            from your_datastore import Client
-            try:
-                return Client.exists(client_key, access_token)
-            except DoesNotExist:
-                return False
-
-        Rather than::
-
-            from your_datastore import Client
-            if access_token == self.dummy_access_token:
-                return False
-            else:
-                return Client.exists(client_key, access_token)
-
-        This method is used by
-
-        * AccessTokenEndpoint
-        * RequestTokenEndpoint
-        * ResourceEndpoint
-        * SignatureOnlyEndpoint
-        """
-        raise self._subclass_must_implement("validate_client_key")
-
-    def validate_request_token(self, client_key, token, request):
-        """Validates that supplied request token is registered and valid.
-
-        :param client_key: The client/consumer key.
-        :param token: The request token string.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :returns: True or False
-
-        Note that if the dummy request_token is supplied it should validate in
-        the same nearly the same amount of time as a valid one.
-
-        Ensure latency inducing tasks are mimiced even for dummy clients.
-        For example, use::
-
-            from your_datastore import RequestToken
-            try:
-                return RequestToken.exists(client_key, access_token)
-            except DoesNotExist:
-                return False
-
-        Rather than::
-
-            from your_datastore import RequestToken
-            if access_token == self.dummy_access_token:
-                return False
-            else:
-                return RequestToken.exists(client_key, access_token)
-
-        This method is used by
-
-        * AccessTokenEndpoint
-        """
-        raise self._subclass_must_implement("validate_request_token")
-
-    def validate_access_token(self, client_key, token, request):
-        """Validates that supplied access token is registered and valid.
-
-        :param client_key: The client/consumer key.
-        :param token: The access token string.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :returns: True or False
-
-        Note that if the dummy access token is supplied it should validate in
-        the same or nearly the same amount of time as a valid one.
-
-        Ensure latency inducing tasks are mimiced even for dummy clients.
-        For example, use::
-
-            from your_datastore import AccessToken
-            try:
-                return AccessToken.exists(client_key, access_token)
-            except DoesNotExist:
-                return False
-
-        Rather than::
-
-            from your_datastore import AccessToken
-            if access_token == self.dummy_access_token:
-                return False
-            else:
-                return AccessToken.exists(client_key, access_token)
-
-        This method is used by
-
-        * ResourceEndpoint
-        """
-        raise self._subclass_must_implement("validate_access_token")
-
-    def validate_timestamp_and_nonce(self, client_key, timestamp, nonce,
-                                     request, request_token=None, access_token=None):
-        """Validates that the nonce has not been used before.
-
-        :param client_key: The client/consumer key.
-        :param timestamp: The ``oauth_timestamp`` parameter.
-        :param nonce: The ``oauth_nonce`` parameter.
-        :param request_token: Request token string, if any.
-        :param access_token: Access token string, if any.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :returns: True or False
-
-        Per `Section 3.3`_ of the spec.
-
-        "A nonce is a random string, uniquely generated by the client to allow
-        the server to verify that a request has never been made before and
-        helps prevent replay attacks when requests are made over a non-secure
-        channel.  The nonce value MUST be unique across all requests with the
-        same timestamp, client credentials, and token combinations."
-
-        .. _`Section 3.3`: https://tools.ietf.org/html/rfc5849#section-3.3
-
-        One of the first validation checks that will be made is for the validity
-        of the nonce and timestamp, which are associated with a client key and
-        possibly a token. If invalid then immediately fail the request
-        by returning False. If the nonce/timestamp pair has been used before and
-        you may just have detected a replay attack. Therefore it is an essential
-        part of OAuth security that you not allow nonce/timestamp reuse.
-        Note that this validation check is done before checking the validity of
-        the client and token.::
-
-           nonces_and_timestamps_database = [
-              (u'foo', 1234567890, u'rannoMstrInghere', u'bar')
-           ]
-
-           def validate_timestamp_and_nonce(self, client_key, timestamp, nonce,
-              request_token=None, access_token=None):
-
-              return ((client_key, timestamp, nonce, request_token or access_token)
-                       not in self.nonces_and_timestamps_database)
-
-        This method is used by
-
-        * AccessTokenEndpoint
-        * RequestTokenEndpoint
-        * ResourceEndpoint
-        * SignatureOnlyEndpoint
-        """
-        raise self._subclass_must_implement("validate_timestamp_and_nonce")
-
-    def validate_redirect_uri(self, client_key, redirect_uri, request):
-        """Validates the client supplied redirection URI.
-
-        :param client_key: The client/consumer key.
-        :param redirect_uri: The URI the client which to redirect back to after
-                             authorization is successful.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :returns: True or False
-
-        It is highly recommended that OAuth providers require their clients
-        to register all redirection URIs prior to using them in requests and
-        register them as absolute URIs. See `CWE-601`_ for more information
-        about open redirection attacks.
-
-        By requiring registration of all redirection URIs it should be
-        straightforward for the provider to verify whether the supplied
-        redirect_uri is valid or not.
-
-        Alternatively per `Section 2.1`_ of the spec:
-
-        "If the client is unable to receive callbacks or a callback URI has
-        been established via other means, the parameter value MUST be set to
-        "oob" (case sensitive), to indicate an out-of-band configuration."
-
-        .. _`CWE-601`: http://cwe.mitre.org/top25/index.html#CWE-601
-        .. _`Section 2.1`: https://tools.ietf.org/html/rfc5849#section-2.1
-
-        This method is used by
-
-        * RequestTokenEndpoint
-        """
-        raise self._subclass_must_implement("validate_redirect_uri")
-
-    def validate_requested_realms(self, client_key, realms, request):
-        """Validates that the client may request access to the realm.
-
-        :param client_key: The client/consumer key.
-        :param realms: The list of realms that client is requesting access to.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :returns: True or False
-
-        This method is invoked when obtaining a request token and should
-        tie a realm to the request token and after user authorization
-        this realm restriction should transfer to the access token.
-
-        This method is used by
-
-        * RequestTokenEndpoint
-        """
-        raise self._subclass_must_implement("validate_requested_realms")
-
-    def validate_realms(self, client_key, token, request, uri=None,
-                        realms=None):
-        """Validates access to the request realm.
-
-        :param client_key: The client/consumer key.
-        :param token: A request token string.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :param uri: The URI the realms is protecting.
-        :param realms: A list of realms that must have been granted to
-                       the access token.
-        :returns: True or False
-
-        How providers choose to use the realm parameter is outside the OAuth
-        specification but it is commonly used to restrict access to a subset
-        of protected resources such as "photos".
-
-        realms is a convenience parameter which can be used to provide
-        a per view method pre-defined list of allowed realms.
-
-        Can be as simple as::
-
-            from your_datastore import RequestToken
-            request_token = RequestToken.get(token, None)
-
-            if not request_token:
-                return False
-            return set(request_token.realms).issuperset(set(realms))
-
-        This method is used by
-
-        * ResourceEndpoint
-        """
-        raise self._subclass_must_implement("validate_realms")
-
-    def validate_verifier(self, client_key, token, verifier, request):
-        """Validates a verification code.
-
-        :param client_key: The client/consumer key.
-        :param token: A request token string.
-        :param verifier: The authorization verifier string.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :returns: True or False
-
-        OAuth providers issue a verification code to clients after the
-        resource owner authorizes access. This code is used by the client to
-        obtain token credentials and the provider must verify that the
-        verifier is valid and associated with the client as well as the
-        resource owner.
-
-        Verifier validation should be done in near constant time
-        (to avoid verifier enumeration). To achieve this we need a
-        constant time string comparison which is provided by OAuthLib
-        in ``oauthlib.common.safe_string_equals``::
-
-            from your_datastore import Verifier
-            correct_verifier = Verifier.get(client_key, request_token)
-            from oauthlib.common import safe_string_equals
-            return safe_string_equals(verifier, correct_verifier)
-
-        This method is used by
-
-        * AccessTokenEndpoint
-        """
-        raise self._subclass_must_implement("validate_verifier")
-
-    def verify_request_token(self, token, request):
-        """Verify that the given OAuth1 request token is valid.
-
-        :param token: A request token string.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :returns: True or False
-
-        This method is used only in AuthorizationEndpoint to check whether the
-        oauth_token given in the authorization URL is valid or not.
-        This request is not signed and thus similar ``validate_request_token``
-        method can not be used.
-
-        This method is used by
-
-        * AuthorizationEndpoint
-        """
-        raise self._subclass_must_implement("verify_request_token")
-
-    def verify_realms(self, token, realms, request):
-        """Verify authorized realms to see if they match those given to token.
-
-        :param token: An access token string.
-        :param realms: A list of realms the client attempts to access.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :returns: True or False
-
-        This prevents the list of authorized realms sent by the client during
-        the authorization step to be altered to include realms outside what
-        was bound with the request token.
-
-        Can be as simple as::
-
-            valid_realms = self.get_realms(token)
-            return all((r in valid_realms for r in realms))
-
-        This method is used by
-
-        * AuthorizationEndpoint
-        """
-        raise self._subclass_must_implement("verify_realms")
-
-    def save_access_token(self, token, request):
-        """Save an OAuth1 access token.
-
-        :param token: A dict with token credentials.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-
-        The token dictionary will at minimum include
-
-        * ``oauth_token`` the access token string.
-        * ``oauth_token_secret`` the token specific secret used in signing.
-        * ``oauth_authorized_realms`` a space separated list of realms.
-
-        Client key can be obtained from ``request.client_key``.
-
-        The list of realms (not joined string) can be obtained from
-        ``request.realm``.
-
-        This method is used by
-
-        * AccessTokenEndpoint
-        """
-        raise self._subclass_must_implement("save_access_token")
-
-    def save_request_token(self, token, request):
-        """Save an OAuth1 request token.
-
-        :param token: A dict with token credentials.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-
-        The token dictionary will at minimum include
-
-        * ``oauth_token`` the request token string.
-        * ``oauth_token_secret`` the token specific secret used in signing.
-        * ``oauth_callback_confirmed`` the string ``true``.
-
-        Client key can be obtained from ``request.client_key``.
-
-        This method is used by
-
-        * RequestTokenEndpoint
-        """
-        raise self._subclass_must_implement("save_request_token")
-
-    def save_verifier(self, token, verifier, request):
-        """Associate an authorization verifier with a request token.
-
-        :param token: A request token string.
-        :param verifier: A dictionary containing the oauth_verifier and
-                        oauth_token
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-
-        We need to associate verifiers with tokens for validation during the
-        access token request.
-
-        Note that unlike save_x_token token here is the ``oauth_token`` token
-        string from the request token saved previously.
-
-        This method is used by
-
-        * AuthorizationEndpoint
-        """
-        raise self._subclass_must_implement("save_verifier")
diff --git a/lib/oauthlib/oauth1/rfc5849/signature.py b/lib/oauthlib/oauth1/rfc5849/signature.py
deleted file mode 100644
index 9cb1a517..00000000
--- a/lib/oauthlib/oauth1/rfc5849/signature.py
+++ /dev/null
@@ -1,852 +0,0 @@
-"""
-This module is an implementation of `section 3.4`_ of RFC 5849.
-
-**Usage**
-
-Steps for signing a request:
-
-1. Collect parameters from the request using ``collect_parameters``.
-2. Normalize those parameters using ``normalize_parameters``.
-3. Create the *base string URI* using ``base_string_uri``.
-4. Create the *signature base string* from the above three components
-   using ``signature_base_string``.
-5. Pass the *signature base string* and the client credentials to one of the
-   sign-with-client functions. The HMAC-based signing functions needs
-   client credentials with secrets. The RSA-based signing functions needs
-   client credentials with an RSA private key.
-
-To verify a request, pass the request and credentials to one of the verify
-functions. The HMAC-based signing functions needs the shared secrets. The
-RSA-based verify functions needs the RSA public key.
-
-**Scope**
-
-All of the functions in this module should be considered internal to OAuthLib,
-since they are not imported into the "oauthlib.oauth1" module. Programs using
-OAuthLib should not use directly invoke any of the functions in this module.
-
-**Deprecated functions**
-
-The "sign_" methods that are not "_with_client" have been deprecated. They may
-be removed in a future release. Since they are all internal functions, this
-should have no impact on properly behaving programs.
-
-.. _`section 3.4`: https://tools.ietf.org/html/rfc5849#section-3.4
-"""
-
-import binascii
-import hashlib
-import hmac
-import ipaddress
-import logging
-import urllib.parse as urlparse
-import warnings
-
-from oauthlib.common import extract_params, safe_string_equals, urldecode
-
-from . import utils
-
-log = logging.getLogger(__name__)
-
-
-# ==== Common functions ==========================================
-
-def signature_base_string(
-        http_method: str,
-        base_str_uri: str,
-        normalized_encoded_request_parameters: str) -> str:
-    """
-    Construct the signature base string.
-
-    The *signature base string* is the value that is calculated and signed by
-    the client. It is also independently calculated by the server to verify
-    the signature, and therefore must produce the exact same value at both
-    ends or the signature won't verify.
-
-    The rules for calculating the *signature base string* are defined in
-    section 3.4.1.1`_ of RFC 5849.
-
-    .. _`section 3.4.1.1`: https://tools.ietf.org/html/rfc5849#section-3.4.1.1
-    """
-
-    # The signature base string is constructed by concatenating together,
-    # in order, the following HTTP request elements:
-
-    # 1.  The HTTP request method in uppercase.  For example: "HEAD",
-    #     "GET", "POST", etc.  If the request uses a custom HTTP method, it
-    #     MUST be encoded (`Section 3.6`_).
-    #
-    # .. _`Section 3.6`: https://tools.ietf.org/html/rfc5849#section-3.6
-    base_string = utils.escape(http_method.upper())
-
-    # 2.  An "&" character (ASCII code 38).
-    base_string += '&'
-
-    # 3.  The base string URI from `Section 3.4.1.2`_, after being encoded
-    #     (`Section 3.6`_).
-    #
-    # .. _`Section 3.4.1.2`: https://tools.ietf.org/html/rfc5849#section-3.4.1.2
-    # .. _`Section 3.6`: https://tools.ietf.org/html/rfc5849#section-3.6
-    base_string += utils.escape(base_str_uri)
-
-    # 4.  An "&" character (ASCII code 38).
-    base_string += '&'
-
-    # 5.  The request parameters as normalized in `Section 3.4.1.3.2`_, after
-    #     being encoded (`Section 3.6`).
-    #
-    # .. _`Sec 3.4.1.3.2`: https://tools.ietf.org/html/rfc5849#section-3.4.1.3.2
-    # .. _`Section 3.6`: https://tools.ietf.org/html/rfc5849#section-3.6
-    base_string += utils.escape(normalized_encoded_request_parameters)
-
-    return base_string
-
-
-def base_string_uri(uri: str, host: str = None) -> str:
-    """
-    Calculates the _base string URI_.
-
-    The *base string URI* is one of the components that make up the
-     *signature base string*.
-
-    The ``host`` is optional. If provided, it is used to override any host and
-    port values in the ``uri``. The value for ``host`` is usually extracted from
-    the "Host" request header from the HTTP request. Its value may be just the
-    hostname, or the hostname followed by a colon and a TCP/IP port number
-    (hostname:port). If a value for the``host`` is provided but it does not
-    contain a port number, the default port number is used (i.e. if the ``uri``
-    contained a port number, it will be discarded).
-
-    The rules for calculating the *base string URI* are defined in
-    section 3.4.1.2`_ of RFC 5849.
-
-    .. _`section 3.4.1.2`: https://tools.ietf.org/html/rfc5849#section-3.4.1.2
-
-    :param uri: URI
-    :param host: hostname with optional port number, separated by a colon
-    :return: base string URI
-    """
-
-    if not isinstance(uri, str):
-        raise ValueError('uri must be a string.')
-
-    # FIXME: urlparse does not support unicode
-    output = urlparse.urlparse(uri)
-    scheme = output.scheme
-    hostname = output.hostname
-    port = output.port
-    path = output.path
-    params = output.params
-
-    # The scheme, authority, and path of the request resource URI `RFC3986`
-    # are included by constructing an "http" or "https" URI representing
-    # the request resource (without the query or fragment) as follows:
-    #
-    # .. _`RFC3986`: https://tools.ietf.org/html/rfc3986
-
-    if not scheme:
-        raise ValueError('missing scheme')
-
-    # Per `RFC 2616 section 5.1.2`_:
-    #
-    # Note that the absolute path cannot be empty; if none is present in
-    # the original URI, it MUST be given as "/" (the server root).
-    #
-    # .. _`RFC 2616 5.1.2`: https://tools.ietf.org/html/rfc2616#section-5.1.2
-    if not path:
-        path = '/'
-
-    # 1.  The scheme and host MUST be in lowercase.
-    scheme = scheme.lower()
-    # Note: if ``host`` is used, it will be converted to lowercase below
-    if hostname is not None:
-        hostname = hostname.lower()
-
-    # 2.  The host and port values MUST match the content of the HTTP
-    #     request "Host" header field.
-    if host is not None:
-        # NOTE: override value in uri with provided host
-        # Host argument is equal to netloc. It means it's missing scheme.
-        # Add it back, before parsing.
-
-        host = host.lower()
-        host = f"{scheme}://{host}"
-        output = urlparse.urlparse(host)
-        hostname = output.hostname
-        port = output.port
-
-    # 3.  The port MUST be included if it is not the default port for the
-    #     scheme, and MUST be excluded if it is the default.  Specifically,
-    #     the port MUST be excluded when making an HTTP request `RFC2616`_
-    #     to port 80 or when making an HTTPS request `RFC2818`_ to port 443.
-    #     All other non-default port numbers MUST be included.
-    #
-    # .. _`RFC2616`: https://tools.ietf.org/html/rfc2616
-    # .. _`RFC2818`: https://tools.ietf.org/html/rfc2818
-
-    if hostname is None:
-        raise ValueError('missing host')
-
-    # NOTE: Try guessing if we're dealing with IP or hostname
-    try:
-        hostname = ipaddress.ip_address(hostname)
-    except ValueError:
-        pass
-
-    if isinstance(hostname, ipaddress.IPv6Address):
-        hostname = f"[{hostname}]"
-    elif isinstance(hostname, ipaddress.IPv4Address):
-        hostname = f"{hostname}"
-
-    if port is not None and not (0 < port <= 65535):
-        raise ValueError('port out of range')  # 16-bit unsigned ints
-    if (scheme, port) in (('http', 80), ('https', 443)):
-        netloc = hostname  # default port for scheme: exclude port num
-    elif port:
-        netloc = f"{hostname}:{port}"  # use hostname:port
-    else:
-        netloc = hostname
-
-    v = urlparse.urlunparse((scheme, netloc, path, params, '', ''))
-
-    # RFC 5849 does not specify which characters are encoded in the
-    # "base string URI", nor how they are encoded - which is very bad, since
-    # the signatures won't match if there are any differences. Fortunately,
-    # most URIs only use characters that are clearly not encoded (e.g. digits
-    # and A-Z, a-z), so have avoided any differences between implementations.
-    #
-    # The example from its section 3.4.1.2 illustrates that spaces in
-    # the path are percent encoded. But it provides no guidance as to what other
-    # characters (if any) must be encoded (nor how); nor if characters in the
-    # other components are to be encoded or not.
-    #
-    # This implementation **assumes** that **only** the space is percent-encoded
-    # and it is done to the entire value (not just to spaces in the path).
-    #
-    # This code may need to be changed if it is discovered that other characters
-    # are expected to be encoded.
-    #
-    # Note: the "base string URI" returned by this function will be encoded
-    # again before being concatenated into the "signature base string". So any
-    # spaces in the URI will actually appear in the "signature base string"
-    # as "%2520" (the "%20" further encoded according to section 3.6).
-
-    return v.replace(' ', '%20')
-
-
-def collect_parameters(uri_query='', body=None, headers=None,
-                       exclude_oauth_signature=True, with_realm=False):
-    """
-    Gather the request parameters from all the parameter sources.
-
-    This function is used to extract all the parameters, which are then passed
-    to ``normalize_parameters`` to produce one of the components that make up
-    the *signature base string*.
-
-    Parameters starting with `oauth_` will be unescaped.
-
-    Body parameters must be supplied as a dict, a list of 2-tuples, or a
-    form encoded query string.
-
-    Headers must be supplied as a dict.
-
-    The rules where the parameters must be sourced from are defined in
-    `section 3.4.1.3.1`_ of RFC 5849.
-
-    .. _`Sec 3.4.1.3.1`: https://tools.ietf.org/html/rfc5849#section-3.4.1.3.1
-    """
-    if body is None:
-        body = []
-    headers = headers or {}
-    params = []
-
-    # The parameters from the following sources are collected into a single
-    # list of name/value pairs:
-
-    # *  The query component of the HTTP request URI as defined by
-    #    `RFC3986, Section 3.4`_.  The query component is parsed into a list
-    #    of name/value pairs by treating it as an
-    #    "application/x-www-form-urlencoded" string, separating the names
-    #    and values and decoding them as defined by W3C.REC-html40-19980424
-    #    `W3C-HTML-4.0`_, Section 17.13.4.
-    #
-    # .. _`RFC3986, Sec 3.4`: https://tools.ietf.org/html/rfc3986#section-3.4
-    # .. _`W3C-HTML-4.0`: https://www.w3.org/TR/1998/REC-html40-19980424/
-    if uri_query:
-        params.extend(urldecode(uri_query))
-
-    # *  The OAuth HTTP "Authorization" header field (`Section 3.5.1`_) if
-    #    present.  The header's content is parsed into a list of name/value
-    #    pairs excluding the "realm" parameter if present.  The parameter
-    #    values are decoded as defined by `Section 3.5.1`_.
-    #
-    # .. _`Section 3.5.1`: https://tools.ietf.org/html/rfc5849#section-3.5.1
-    if headers:
-        headers_lower = {k.lower(): v for k, v in headers.items()}
-        authorization_header = headers_lower.get('authorization')
-        if authorization_header is not None:
-            params.extend([i for i in utils.parse_authorization_header(
-                authorization_header) if with_realm or i[0] != 'realm'])
-
-    # *  The HTTP request entity-body, but only if all of the following
-    #    conditions are met:
-    #     *  The entity-body is single-part.
-    #
-    #     *  The entity-body follows the encoding requirements of the
-    #        "application/x-www-form-urlencoded" content-type as defined by
-    #        W3C.REC-html40-19980424 `W3C-HTML-4.0`_.
-
-    #     *  The HTTP request entity-header includes the "Content-Type"
-    #        header field set to "application/x-www-form-urlencoded".
-    #
-    # .. _`W3C-HTML-4.0`: https://www.w3.org/TR/1998/REC-html40-19980424/
-
-    # TODO: enforce header param inclusion conditions
-    bodyparams = extract_params(body) or []
-    params.extend(bodyparams)
-
-    # ensure all oauth params are unescaped
-    unescaped_params = []
-    for k, v in params:
-        if k.startswith('oauth_'):
-            v = utils.unescape(v)
-        unescaped_params.append((k, v))
-
-    # The "oauth_signature" parameter MUST be excluded from the signature
-    # base string if present.
-    if exclude_oauth_signature:
-        unescaped_params = list(filter(lambda i: i[0] != 'oauth_signature',
-                                       unescaped_params))
-
-    return unescaped_params
-
-
-def normalize_parameters(params) -> str:
-    """
-    Calculate the normalized request parameters.
-
-    The *normalized request parameters* is one of the components that make up
-    the *signature base string*.
-
-    The rules for parameter normalization are defined in `section 3.4.1.3.2`_ of
-    RFC 5849.
-
-    .. _`Sec 3.4.1.3.2`: https://tools.ietf.org/html/rfc5849#section-3.4.1.3.2
-    """
-
-    # The parameters collected in `Section 3.4.1.3`_ are normalized into a
-    # single string as follows:
-    #
-    # .. _`Section 3.4.1.3`: https://tools.ietf.org/html/rfc5849#section-3.4.1.3
-
-    # 1.  First, the name and value of each parameter are encoded
-    #     (`Section 3.6`_).
-    #
-    # .. _`Section 3.6`: https://tools.ietf.org/html/rfc5849#section-3.6
-    key_values = [(utils.escape(k), utils.escape(v)) for k, v in params]
-
-    # 2.  The parameters are sorted by name, using ascending byte value
-    #     ordering.  If two or more parameters share the same name, they
-    #     are sorted by their value.
-    key_values.sort()
-
-    # 3.  The name of each parameter is concatenated to its corresponding
-    #     value using an "=" character (ASCII code 61) as a separator, even
-    #     if the value is empty.
-    parameter_parts = ['{}={}'.format(k, v) for k, v in key_values]
-
-    # 4.  The sorted name/value pairs are concatenated together into a
-    #     single string by using an "&" character (ASCII code 38) as
-    #     separator.
-    return '&'.join(parameter_parts)
-
-
-# ==== Common functions for HMAC-based signature methods =========
-
-def _sign_hmac(hash_algorithm_name: str,
-               sig_base_str: str,
-               client_secret: str,
-               resource_owner_secret: str):
-    """
-    **HMAC-SHA256**
-
-    The "HMAC-SHA256" signature method uses the HMAC-SHA256 signature
-    algorithm as defined in `RFC4634`_::
-
-        digest = HMAC-SHA256 (key, text)
-
-    Per `section 3.4.2`_ of the spec.
-
-    .. _`RFC4634`: https://tools.ietf.org/html/rfc4634
-    .. _`section 3.4.2`: https://tools.ietf.org/html/rfc5849#section-3.4.2
-    """
-
-    # The HMAC-SHA256 function variables are used in following way:
-
-    # text is set to the value of the signature base string from
-    # `Section 3.4.1.1`_.
-    #
-    # .. _`Section 3.4.1.1`: https://tools.ietf.org/html/rfc5849#section-3.4.1.1
-    text = sig_base_str
-
-    # key is set to the concatenated values of:
-    # 1.  The client shared-secret, after being encoded (`Section 3.6`_).
-    #
-    # .. _`Section 3.6`: https://tools.ietf.org/html/rfc5849#section-3.6
-    key = utils.escape(client_secret or '')
-
-    # 2.  An "&" character (ASCII code 38), which MUST be included
-    #     even when either secret is empty.
-    key += '&'
-
-    # 3.  The token shared-secret, after being encoded (`Section 3.6`_).
-    #
-    # .. _`Section 3.6`: https://tools.ietf.org/html/rfc5849#section-3.6
-    key += utils.escape(resource_owner_secret or '')
-
-    # Get the hashing algorithm to use
-
-    m = {
-        'SHA-1': hashlib.sha1,
-        'SHA-256': hashlib.sha256,
-        'SHA-512': hashlib.sha512,
-    }
-    hash_alg = m[hash_algorithm_name]
-
-    # Calculate the signature
-
-    # FIXME: HMAC does not support unicode!
-    key_utf8 = key.encode('utf-8')
-    text_utf8 = text.encode('utf-8')
-    signature = hmac.new(key_utf8, text_utf8, hash_alg)
-
-    # digest  is used to set the value of the "oauth_signature" protocol
-    #         parameter, after the result octet string is base64-encoded
-    #         per `RFC2045, Section 6.8`.
-    #
-    # .. _`RFC2045, Sec 6.8`: https://tools.ietf.org/html/rfc2045#section-6.8
-    return binascii.b2a_base64(signature.digest())[:-1].decode('utf-8')
-
-
-def _verify_hmac(hash_algorithm_name: str,
-                 request,
-                 client_secret=None,
-                 resource_owner_secret=None):
-    """Verify a HMAC-SHA1 signature.
-
-    Per `section 3.4`_ of the spec.
-
-    .. _`section 3.4`: https://tools.ietf.org/html/rfc5849#section-3.4
-
-    To satisfy `RFC2616 section 5.2`_ item 1, the request argument's uri
-    attribute MUST be an absolute URI whose netloc part identifies the
-    origin server or gateway on which the resource resides. Any Host
-    item of the request argument's headers dict attribute will be
-    ignored.
-
-    .. _`RFC2616 section 5.2`: https://tools.ietf.org/html/rfc2616#section-5.2
-
-    """
-    norm_params = normalize_parameters(request.params)
-    bs_uri = base_string_uri(request.uri)
-    sig_base_str = signature_base_string(request.http_method, bs_uri,
-                                         norm_params)
-    signature = _sign_hmac(hash_algorithm_name, sig_base_str,
-                           client_secret, resource_owner_secret)
-    match = safe_string_equals(signature, request.signature)
-    if not match:
-        log.debug('Verify HMAC failed: signature base string: %s', sig_base_str)
-    return match
-
-
-# ==== HMAC-SHA1 =================================================
-
-def sign_hmac_sha1_with_client(sig_base_str, client):
-    return _sign_hmac('SHA-1', sig_base_str,
-                      client.client_secret, client.resource_owner_secret)
-
-
-def verify_hmac_sha1(request, client_secret=None, resource_owner_secret=None):
-    return _verify_hmac('SHA-1', request, client_secret, resource_owner_secret)
-
-
-def sign_hmac_sha1(base_string, client_secret, resource_owner_secret):
-    """
-    Deprecated function for calculating a HMAC-SHA1 signature.
-
-    This function has been replaced by invoking ``sign_hmac`` with "SHA-1"
-    as the hash algorithm name.
-
-    This function was invoked by sign_hmac_sha1_with_client and
-    test_signatures.py, but does any application invoke it directly? If not,
-    it can be removed.
-    """
-    warnings.warn('use sign_hmac_sha1_with_client instead of sign_hmac_sha1',
-                  DeprecationWarning)
-
-    # For some unknown reason, the original implementation assumed base_string
-    # could either be bytes or str. The signature base string calculating
-    # function always returned a str, so the new ``sign_rsa`` only expects that.
-
-    base_string = base_string.decode('ascii') \
-        if isinstance(base_string, bytes) else base_string
-
-    return _sign_hmac('SHA-1', base_string,
-                      client_secret, resource_owner_secret)
-
-
-# ==== HMAC-SHA256 ===============================================
-
-def sign_hmac_sha256_with_client(sig_base_str, client):
-    return _sign_hmac('SHA-256', sig_base_str,
-                      client.client_secret, client.resource_owner_secret)
-
-
-def verify_hmac_sha256(request, client_secret=None, resource_owner_secret=None):
-    return _verify_hmac('SHA-256', request,
-                        client_secret, resource_owner_secret)
-
-
-def sign_hmac_sha256(base_string, client_secret, resource_owner_secret):
-    """
-    Deprecated function for calculating a HMAC-SHA256 signature.
-
-    This function has been replaced by invoking ``sign_hmac`` with "SHA-256"
-    as the hash algorithm name.
-
-    This function was invoked by sign_hmac_sha256_with_client and
-    test_signatures.py, but does any application invoke it directly? If not,
-    it can be removed.
-    """
-    warnings.warn(
-        'use sign_hmac_sha256_with_client instead of sign_hmac_sha256',
-        DeprecationWarning)
-
-    # For some unknown reason, the original implementation assumed base_string
-    # could either be bytes or str. The signature base string calculating
-    # function always returned a str, so the new ``sign_rsa`` only expects that.
-
-    base_string = base_string.decode('ascii') \
-        if isinstance(base_string, bytes) else base_string
-
-    return _sign_hmac('SHA-256', base_string,
-                      client_secret, resource_owner_secret)
-
-
-# ==== HMAC-SHA512 ===============================================
-
-def sign_hmac_sha512_with_client(sig_base_str: str,
-                                 client):
-    return _sign_hmac('SHA-512', sig_base_str,
-                      client.client_secret, client.resource_owner_secret)
-
-
-def verify_hmac_sha512(request,
-                       client_secret: str = None,
-                       resource_owner_secret: str = None):
-    return _verify_hmac('SHA-512', request,
-                        client_secret, resource_owner_secret)
-
-
-# ==== Common functions for RSA-based signature methods ==========
-
-_jwt_rsa = {}  # cache of RSA-hash implementations from PyJWT jwt.algorithms
-
-
-def _get_jwt_rsa_algorithm(hash_algorithm_name: str):
-    """
-    Obtains an RSAAlgorithm object that implements RSA with the hash algorithm.
-
-    This method maintains the ``_jwt_rsa`` cache.
-
-    Returns a jwt.algorithm.RSAAlgorithm.
-    """
-    if hash_algorithm_name in _jwt_rsa:
-        # Found in cache: return it
-        return _jwt_rsa[hash_algorithm_name]
-    else:
-        # Not in cache: instantiate a new RSAAlgorithm
-
-        # PyJWT has some nice pycrypto/cryptography abstractions
-        import jwt.algorithms as jwt_algorithms
-        m = {
-            'SHA-1': jwt_algorithms.hashes.SHA1,
-            'SHA-256': jwt_algorithms.hashes.SHA256,
-            'SHA-512': jwt_algorithms.hashes.SHA512,
-        }
-        v = jwt_algorithms.RSAAlgorithm(m[hash_algorithm_name])
-
-        _jwt_rsa[hash_algorithm_name] = v  # populate cache
-
-        return v
-
-
-def _prepare_key_plus(alg, keystr):
-    """
-    Prepare a PEM encoded key (public or private), by invoking the `prepare_key`
-    method on alg with the keystr.
-
-    The keystr should be a string or bytes.  If the keystr is bytes, it is
-    decoded as UTF-8 before being passed to prepare_key. Otherwise, it
-    is passed directly.
-    """
-    if isinstance(keystr, bytes):
-        keystr = keystr.decode('utf-8')
-    return alg.prepare_key(keystr)
-
-
-def _sign_rsa(hash_algorithm_name: str,
-              sig_base_str: str,
-              rsa_private_key: str):
-    """
-    Calculate the signature for an RSA-based signature method.
-
-    The ``alg`` is used to calculate the digest over the signature base string.
-    For the "RSA_SHA1" signature method, the alg must be SHA-1. While OAuth 1.0a
-    only defines the RSA-SHA1 signature method, this function can be used for
-    other non-standard signature methods that only differ from RSA-SHA1 by the
-    digest algorithm.
-
-    Signing for the RSA-SHA1 signature method is defined in
-    `section 3.4.3`_ of RFC 5849.
-
-    The RSASSA-PKCS1-v1_5 signature algorithm used defined by
-    `RFC3447, Section 8.2`_ (also known as PKCS#1), with the `alg` as the
-    hash function for EMSA-PKCS1-v1_5.  To
-    use this method, the client MUST have established client credentials
-    with the server that included its RSA public key (in a manner that is
-    beyond the scope of this specification).
-
-    .. _`section 3.4.3`: https://tools.ietf.org/html/rfc5849#section-3.4.3
-    .. _`RFC3447, Section 8.2`: https://tools.ietf.org/html/rfc3447#section-8.2
-    """
-
-    # Get the implementation of RSA-hash
-
-    alg = _get_jwt_rsa_algorithm(hash_algorithm_name)
-
-    # Check private key
-
-    if not rsa_private_key:
-        raise ValueError('rsa_private_key required for RSA with ' +
-                         alg.hash_alg.name + ' signature method')
-
-    # Convert the "signature base string" into a sequence of bytes (M)
-    #
-    # The signature base string, by definition, only contain printable US-ASCII
-    # characters. So encoding it as 'ascii' will always work. It will raise a
-    # ``UnicodeError`` if it can't encode the value, which will never happen
-    # if the signature base string was created correctly. Therefore, using
-    # 'ascii' encoding provides an extra level of error checking.
-
-    m = sig_base_str.encode('ascii')
-
-    # Perform signing: S = RSASSA-PKCS1-V1_5-SIGN (K, M)
-
-    key = _prepare_key_plus(alg, rsa_private_key)
-    s = alg.sign(m, key)
-
-    # base64-encoded per RFC2045 section 6.8.
-    #
-    # 1. While b2a_base64 implements base64 defined by RFC 3548. As used here,
-    #    it is the same as base64 defined by RFC 2045.
-    # 2. b2a_base64 includes a "\n" at the end of its result ([:-1] removes it)
-    # 3. b2a_base64 produces a binary string. Use decode to produce a str.
-    #    It should only contain only printable US-ASCII characters.
-
-    return binascii.b2a_base64(s)[:-1].decode('ascii')
-
-
-def _verify_rsa(hash_algorithm_name: str,
-                request,
-                rsa_public_key: str):
-    """
-    Verify a base64 encoded signature for a RSA-based signature method.
-
-    The ``alg`` is used to calculate the digest over the signature base string.
-    For the "RSA_SHA1" signature method, the alg must be SHA-1. While OAuth 1.0a
-    only defines the RSA-SHA1 signature method, this function can be used for
-    other non-standard signature methods that only differ from RSA-SHA1 by the
-    digest algorithm.
-
-    Verification for the RSA-SHA1 signature method is defined in
-    `section 3.4.3`_ of RFC 5849.
-
-    .. _`section 3.4.3`: https://tools.ietf.org/html/rfc5849#section-3.4.3
-
-        To satisfy `RFC2616 section 5.2`_ item 1, the request argument's uri
-        attribute MUST be an absolute URI whose netloc part identifies the
-        origin server or gateway on which the resource resides. Any Host
-        item of the request argument's headers dict attribute will be
-        ignored.
-
-        .. _`RFC2616 Sec 5.2`: https://tools.ietf.org/html/rfc2616#section-5.2
-    """
-
-    try:
-        # Calculate the *signature base string* of the actual received request
-
-        norm_params = normalize_parameters(request.params)
-        bs_uri = base_string_uri(request.uri)
-        sig_base_str = signature_base_string(
-            request.http_method, bs_uri, norm_params)
-
-        # Obtain the signature that was received in the request
-
-        sig = binascii.a2b_base64(request.signature.encode('ascii'))
-
-        # Get the implementation of RSA-with-hash algorithm to use
-
-        alg = _get_jwt_rsa_algorithm(hash_algorithm_name)
-
-        # Verify the received signature was produced by the private key
-        # corresponding to the `rsa_public_key`, signing exact same
-        # *signature base string*.
-        #
-        #     RSASSA-PKCS1-V1_5-VERIFY ((n, e), M, S)
-
-        key = _prepare_key_plus(alg, rsa_public_key)
-
-        # The signature base string only contain printable US-ASCII characters.
-        # The ``encode`` method with the default "strict" error handling will
-        # raise a ``UnicodeError`` if it can't encode the value. So using
-        # "ascii" will always work.
-
-        verify_ok = alg.verify(sig_base_str.encode('ascii'), key, sig)
-
-        if not verify_ok:
-            log.debug('Verify failed: RSA with ' + alg.hash_alg.name +
-                      ': signature base string=%s' + sig_base_str)
-        return verify_ok
-
-    except UnicodeError:
-        # A properly encoded signature will only contain printable US-ASCII
-        # characters. The ``encode`` method with the default "strict" error
-        # handling will raise a ``UnicodeError`` if it can't decode the value.
-        # So using "ascii" will work with all valid signatures. But an
-        # incorrectly or maliciously produced signature could contain other
-        # bytes.
-        #
-        # This implementation treats that situation as equivalent to the
-        # signature verification having failed.
-        #
-        # Note: simply changing the encode to use 'utf-8' will not remove this
-        # case, since an incorrect or malicious request can contain bytes which
-        # are invalid as UTF-8.
-        return False
-
-
-# ==== RSA-SHA1 ==================================================
-
-def sign_rsa_sha1_with_client(sig_base_str, client):
-    # For some reason, this function originally accepts both str and bytes.
-    # This behaviour is preserved here. But won't be done for the newer
-    # sign_rsa_sha256_with_client and sign_rsa_sha512_with_client functions,
-    # which will only accept strings. The function to calculate a
-    # "signature base string" always produces a string, so it is not clear
-    # why support for bytes would ever be needed.
-    sig_base_str = sig_base_str.decode('ascii')\
-        if isinstance(sig_base_str, bytes) else sig_base_str
-
-    return _sign_rsa('SHA-1', sig_base_str, client.rsa_key)
-
-
-def verify_rsa_sha1(request, rsa_public_key: str):
-    return _verify_rsa('SHA-1', request, rsa_public_key)
-
-
-def sign_rsa_sha1(base_string, rsa_private_key):
-    """
-    Deprecated function for calculating a RSA-SHA1 signature.
-
-    This function has been replaced by invoking ``sign_rsa`` with "SHA-1"
-    as the hash algorithm name.
-
-    This function was invoked by sign_rsa_sha1_with_client and
-    test_signatures.py, but does any application invoke it directly? If not,
-    it can be removed.
-    """
-    warnings.warn('use _sign_rsa("SHA-1", ...) instead of sign_rsa_sha1',
-                  DeprecationWarning)
-
-    if isinstance(base_string, bytes):
-        base_string = base_string.decode('ascii')
-
-    return _sign_rsa('SHA-1', base_string, rsa_private_key)
-
-
-# ==== RSA-SHA256 ================================================
-
-def sign_rsa_sha256_with_client(sig_base_str: str, client):
-    return _sign_rsa('SHA-256', sig_base_str, client.rsa_key)
-
-
-def verify_rsa_sha256(request, rsa_public_key: str):
-    return _verify_rsa('SHA-256', request, rsa_public_key)
-
-
-# ==== RSA-SHA512 ================================================
-
-def sign_rsa_sha512_with_client(sig_base_str: str, client):
-    return _sign_rsa('SHA-512', sig_base_str, client.rsa_key)
-
-
-def verify_rsa_sha512(request, rsa_public_key: str):
-    return _verify_rsa('SHA-512', request, rsa_public_key)
-
-
-# ==== PLAINTEXT =================================================
-
-def sign_plaintext_with_client(_signature_base_string, client):
-    # _signature_base_string is not used because the signature with PLAINTEXT
-    # is just the secret: it isn't a real signature.
-    return sign_plaintext(client.client_secret, client.resource_owner_secret)
-
-
-def sign_plaintext(client_secret, resource_owner_secret):
-    """Sign a request using plaintext.
-
-    Per `section 3.4.4`_ of the spec.
-
-    The "PLAINTEXT" method does not employ a signature algorithm.  It
-    MUST be used with a transport-layer mechanism such as TLS or SSL (or
-    sent over a secure channel with equivalent protections).  It does not
-    utilize the signature base string or the "oauth_timestamp" and
-    "oauth_nonce" parameters.
-
-    .. _`section 3.4.4`: https://tools.ietf.org/html/rfc5849#section-3.4.4
-
-    """
-
-    # The "oauth_signature" protocol parameter is set to the concatenated
-    # value of:
-
-    # 1.  The client shared-secret, after being encoded (`Section 3.6`_).
-    #
-    # .. _`Section 3.6`: https://tools.ietf.org/html/rfc5849#section-3.6
-    signature = utils.escape(client_secret or '')
-
-    # 2.  An "&" character (ASCII code 38), which MUST be included even
-    #     when either secret is empty.
-    signature += '&'
-
-    # 3.  The token shared-secret, after being encoded (`Section 3.6`_).
-    #
-    # .. _`Section 3.6`: https://tools.ietf.org/html/rfc5849#section-3.6
-    signature += utils.escape(resource_owner_secret or '')
-
-    return signature
-
-
-def verify_plaintext(request, client_secret=None, resource_owner_secret=None):
-    """Verify a PLAINTEXT signature.
-
-    Per `section 3.4`_ of the spec.
-
-    .. _`section 3.4`: https://tools.ietf.org/html/rfc5849#section-3.4
-    """
-    signature = sign_plaintext(client_secret, resource_owner_secret)
-    match = safe_string_equals(signature, request.signature)
-    if not match:
-        log.debug('Verify PLAINTEXT failed')
-    return match
diff --git a/lib/oauthlib/oauth1/rfc5849/utils.py b/lib/oauthlib/oauth1/rfc5849/utils.py
deleted file mode 100644
index 8fb8302e..00000000
--- a/lib/oauthlib/oauth1/rfc5849/utils.py
+++ /dev/null
@@ -1,83 +0,0 @@
-"""
-oauthlib.utils
-~~~~~~~~~~~~~~
-
-This module contains utility methods used by various parts of the OAuth
-spec.
-"""
-import urllib.request as urllib2
-
-from oauthlib.common import quote, unquote
-
-UNICODE_ASCII_CHARACTER_SET = ('abcdefghijklmnopqrstuvwxyz'
-                               'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-                               '0123456789')
-
-
-def filter_params(target):
-    """Decorator which filters params to remove non-oauth_* parameters
-
-    Assumes the decorated method takes a params dict or list of tuples as its
-    first argument.
-    """
-    def wrapper(params, *args, **kwargs):
-        params = filter_oauth_params(params)
-        return target(params, *args, **kwargs)
-
-    wrapper.__doc__ = target.__doc__
-    return wrapper
-
-
-def filter_oauth_params(params):
-    """Removes all non oauth parameters from a dict or a list of params."""
-    is_oauth = lambda kv: kv[0].startswith("oauth_")
-    if isinstance(params, dict):
-        return list(filter(is_oauth, list(params.items())))
-    else:
-        return list(filter(is_oauth, params))
-
-
-def escape(u):
-    """Escape a unicode string in an OAuth-compatible fashion.
-
-    Per `section 3.6`_ of the spec.
-
-    .. _`section 3.6`: https://tools.ietf.org/html/rfc5849#section-3.6
-
-    """
-    if not isinstance(u, str):
-        raise ValueError('Only unicode objects are escapable. ' +
-                         'Got {!r} of type {}.'.format(u, type(u)))
-    # Letters, digits, and the characters '_.-' are already treated as safe
-    # by urllib.quote(). We need to add '~' to fully support rfc5849.
-    return quote(u, safe=b'~')
-
-
-def unescape(u):
-    if not isinstance(u, str):
-        raise ValueError('Only unicode objects are unescapable.')
-    return unquote(u)
-
-
-def parse_keqv_list(l):
-    """A unicode-safe version of urllib2.parse_keqv_list"""
-    # With Python 2.6, parse_http_list handles unicode fine
-    return urllib2.parse_keqv_list(l)
-
-
-def parse_http_list(u):
-    """A unicode-safe version of urllib2.parse_http_list"""
-    # With Python 2.6, parse_http_list handles unicode fine
-    return urllib2.parse_http_list(u)
-
-
-def parse_authorization_header(authorization_header):
-    """Parse an OAuth authorization header into a list of 2-tuples"""
-    auth_scheme = 'OAuth '.lower()
-    if authorization_header[:len(auth_scheme)].lower().startswith(auth_scheme):
-        items = parse_http_list(authorization_header[len(auth_scheme):])
-        try:
-            return list(parse_keqv_list(items).items())
-        except (IndexError, ValueError):
-            pass
-    raise ValueError('Malformed authorization header')
diff --git a/lib/oauthlib/oauth2/__init__.py b/lib/oauthlib/oauth2/__init__.py
deleted file mode 100644
index deefb1af..00000000
--- a/lib/oauthlib/oauth2/__init__.py
+++ /dev/null
@@ -1,36 +0,0 @@
-"""
-oauthlib.oauth2
-~~~~~~~~~~~~~~
-
-This module is a wrapper for the most recent implementation of OAuth 2.0 Client
-and Server classes.
-"""
-from .rfc6749.clients import (
-    BackendApplicationClient, Client, LegacyApplicationClient,
-    MobileApplicationClient, ServiceApplicationClient, WebApplicationClient,
-)
-from .rfc6749.endpoints import (
-    AuthorizationEndpoint, BackendApplicationServer, IntrospectEndpoint,
-    LegacyApplicationServer, MetadataEndpoint, MobileApplicationServer,
-    ResourceEndpoint, RevocationEndpoint, Server, TokenEndpoint,
-    WebApplicationServer,
-)
-from .rfc6749.errors import (
-    AccessDeniedError, FatalClientError, InsecureTransportError,
-    InvalidClientError, InvalidClientIdError, InvalidGrantError,
-    InvalidRedirectURIError, InvalidRequestError, InvalidRequestFatalError,
-    InvalidScopeError, MismatchingRedirectURIError, MismatchingStateError,
-    MissingClientIdError, MissingCodeError, MissingRedirectURIError,
-    MissingResponseTypeError, MissingTokenError, MissingTokenTypeError,
-    OAuth2Error, ServerError, TemporarilyUnavailableError, TokenExpiredError,
-    UnauthorizedClientError, UnsupportedGrantTypeError,
-    UnsupportedResponseTypeError, UnsupportedTokenTypeError,
-)
-from .rfc6749.grant_types import (
-    AuthorizationCodeGrant, ClientCredentialsGrant, ImplicitGrant,
-    RefreshTokenGrant, ResourceOwnerPasswordCredentialsGrant,
-)
-from .rfc6749.request_validator import RequestValidator
-from .rfc6749.tokens import BearerToken, OAuth2Token
-from .rfc6749.utils import is_secure_transport
-from .rfc8628.clients import DeviceClient
diff --git a/lib/oauthlib/oauth2/rfc6749/__init__.py b/lib/oauthlib/oauth2/rfc6749/__init__.py
deleted file mode 100644
index 4b75a8a1..00000000
--- a/lib/oauthlib/oauth2/rfc6749/__init__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-"""
-oauthlib.oauth2.rfc6749
-~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of various logic needed
-for consuming and providing OAuth 2.0 RFC6749.
-"""
-import functools
-import logging
-
-from .endpoints.base import BaseEndpoint, catch_errors_and_unavailability
-from .errors import (
-    FatalClientError, OAuth2Error, ServerError, TemporarilyUnavailableError,
-)
-
-log = logging.getLogger(__name__)
diff --git a/lib/oauthlib/oauth2/rfc6749/clients/__init__.py b/lib/oauthlib/oauth2/rfc6749/clients/__init__.py
deleted file mode 100644
index 8fc6c955..00000000
--- a/lib/oauthlib/oauth2/rfc6749/clients/__init__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-oauthlib.oauth2.rfc6749
-~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of various logic needed
-for consuming OAuth 2.0 RFC6749.
-"""
-from .backend_application import BackendApplicationClient
-from .base import AUTH_HEADER, BODY, URI_QUERY, Client
-from .legacy_application import LegacyApplicationClient
-from .mobile_application import MobileApplicationClient
-from .service_application import ServiceApplicationClient
-from .web_application import WebApplicationClient
diff --git a/lib/oauthlib/oauth2/rfc6749/clients/backend_application.py b/lib/oauthlib/oauth2/rfc6749/clients/backend_application.py
deleted file mode 100644
index e11e8fae..00000000
--- a/lib/oauthlib/oauth2/rfc6749/clients/backend_application.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-oauthlib.oauth2.rfc6749
-~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of various logic needed
-for consuming and providing OAuth 2.0 RFC6749.
-"""
-from ..parameters import prepare_token_request
-from .base import Client
-
-
-class BackendApplicationClient(Client):
-
-    """A public client utilizing the client credentials grant workflow.
-
-    The client can request an access token using only its client
-    credentials (or other supported means of authentication) when the
-    client is requesting access to the protected resources under its
-    control, or those of another resource owner which has been previously
-    arranged with the authorization server (the method of which is beyond
-    the scope of this specification).
-
-    The client credentials grant type MUST only be used by confidential
-    clients.
-
-    Since the client authentication is used as the authorization grant,
-    no additional authorization request is needed.
-    """
-
-    grant_type = 'client_credentials'
-
-    def prepare_request_body(self, body='', scope=None,
-                             include_client_id=False, **kwargs):
-        """Add the client credentials to the request body.
-
-        The client makes a request to the token endpoint by adding the
-        following parameters using the "application/x-www-form-urlencoded"
-        format per `Appendix B`_ in the HTTP request entity-body:
-
-        :param body: Existing request body (URL encoded string) to embed parameters
-                     into. This may contain extra parameters. Default ''.
-        :param scope:   The scope of the access request as described by
-                        `Section 3.3`_.
-
-        :param include_client_id: `True` to send the `client_id` in the
-                                  body of the upstream request. This is required
-                                  if the client is not authenticating with the
-                                  authorization server as described in
-                                  `Section 3.2.1`_. False otherwise (default).
-        :type include_client_id: Boolean
-
-        :param kwargs:  Extra credentials to include in the token request.
-
-        The client MUST authenticate with the authorization server as
-        described in `Section 3.2.1`_.
-
-        The prepared body will include all provided credentials as well as
-        the ``grant_type`` parameter set to ``client_credentials``::
-
-            >>> from oauthlib.oauth2 import BackendApplicationClient
-            >>> client = BackendApplicationClient('your_id')
-            >>> client.prepare_request_body(scope=['hello', 'world'])
-            'grant_type=client_credentials&scope=hello+world'
-
-        .. _`Appendix B`: https://tools.ietf.org/html/rfc6749#appendix-B
-        .. _`Section 3.3`: https://tools.ietf.org/html/rfc6749#section-3.3
-        .. _`Section 3.2.1`: https://tools.ietf.org/html/rfc6749#section-3.2.1
-        """
-        kwargs['client_id'] = self.client_id
-        kwargs['include_client_id'] = include_client_id
-        scope = self.scope if scope is None else scope
-        return prepare_token_request(self.grant_type, body=body,
-                                     scope=scope, **kwargs)
diff --git a/lib/oauthlib/oauth2/rfc6749/clients/base.py b/lib/oauthlib/oauth2/rfc6749/clients/base.py
deleted file mode 100644
index d5eb0cc1..00000000
--- a/lib/oauthlib/oauth2/rfc6749/clients/base.py
+++ /dev/null
@@ -1,604 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-oauthlib.oauth2.rfc6749
-~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of various logic needed
-for consuming OAuth 2.0 RFC6749.
-"""
-import base64
-import hashlib
-import re
-import secrets
-import time
-import warnings
-
-from oauthlib.common import generate_token
-from oauthlib.oauth2.rfc6749 import tokens
-from oauthlib.oauth2.rfc6749.errors import (
-    InsecureTransportError, TokenExpiredError,
-)
-from oauthlib.oauth2.rfc6749.parameters import (
-    parse_token_response, prepare_token_request,
-    prepare_token_revocation_request,
-)
-from oauthlib.oauth2.rfc6749.utils import is_secure_transport
-
-AUTH_HEADER = 'auth_header'
-URI_QUERY = 'query'
-BODY = 'body'
-
-FORM_ENC_HEADERS = {
-    'Content-Type': 'application/x-www-form-urlencoded'
-}
-
-
-class Client:
-    """Base OAuth2 client responsible for access token management.
-
-    This class also acts as a generic interface providing methods common to all
-    client types such as ``prepare_authorization_request`` and
-    ``prepare_token_revocation_request``. The ``prepare_x_request`` methods are
-    the recommended way of interacting with clients (as opposed to the abstract
-    prepare uri/body/etc methods). They are recommended over the older set
-    because they are easier to use (more consistent) and add a few additional
-    security checks, such as HTTPS and state checking.
-
-    Some of these methods require further implementation only provided by the
-    specific purpose clients such as
-    :py:class:`oauthlib.oauth2.MobileApplicationClient` and thus you should always
-    seek to use the client class matching the OAuth workflow you need. For
-    Python, this is usually :py:class:`oauthlib.oauth2.WebApplicationClient`.
-
-    """
-    refresh_token_key = 'refresh_token'
-
-    def __init__(self, client_id,
-                 default_token_placement=AUTH_HEADER,
-                 token_type='Bearer',
-                 access_token=None,
-                 refresh_token=None,
-                 mac_key=None,
-                 mac_algorithm=None,
-                 token=None,
-                 scope=None,
-                 state=None,
-                 redirect_url=None,
-                 state_generator=generate_token,
-                 code_verifier=None,
-                 code_challenge=None,
-                 code_challenge_method=None,
-                 **kwargs):
-        """Initialize a client with commonly used attributes.
-
-        :param client_id: Client identifier given by the OAuth provider upon
-        registration.
-
-        :param default_token_placement: Tokens can be supplied in the Authorization
-        header (default), the URL query component (``query``) or the request
-        body (``body``).
-
-        :param token_type: OAuth 2 token type. Defaults to Bearer. Change this
-        if you specify the ``access_token`` parameter and know it is of a
-        different token type, such as a MAC, JWT or SAML token. Can
-        also be supplied as ``token_type`` inside the ``token`` dict parameter.
-
-        :param access_token: An access token (string) used to authenticate
-        requests to protected resources. Can also be supplied inside the
-        ``token`` dict parameter.
-
-        :param refresh_token: A refresh token (string) used to refresh expired
-        tokens. Can also be supplied inside the ``token`` dict parameter.
-
-        :param mac_key: Encryption key used with MAC tokens.
-
-        :param mac_algorithm:  Hashing algorithm for MAC tokens.
-
-        :param token: A dict of token attributes such as ``access_token``,
-        ``token_type`` and ``expires_at``.
-
-        :param scope: A list of default scopes to request authorization for.
-
-        :param state: A CSRF protection string used during authorization.
-
-        :param redirect_url: The redirection endpoint on the client side to which
-        the user returns after authorization.
-
-        :param state_generator: A no argument state generation callable. Defaults
-        to :py:meth:`oauthlib.common.generate_token`.
-
-        :param code_verifier: PKCE parameter. A cryptographically random string that is used to correlate the
-        authorization request to the token request.
-
-        :param code_challenge: PKCE parameter. A challenge derived from the code verifier that is sent in the
-        authorization request, to be verified against later.
-
-        :param code_challenge_method: PKCE parameter. A method that was used to derive code challenge.
-        Defaults to "plain" if not present in the request.
-        """
-
-        self.client_id = client_id
-        self.default_token_placement = default_token_placement
-        self.token_type = token_type
-        self.access_token = access_token
-        self.refresh_token = refresh_token
-        self.mac_key = mac_key
-        self.mac_algorithm = mac_algorithm
-        self.token = token or {}
-        self.scope = scope
-        self.state_generator = state_generator
-        self.state = state
-        self.redirect_url = redirect_url
-        self.code_verifier = code_verifier
-        self.code_challenge = code_challenge
-        self.code_challenge_method = code_challenge_method
-        self.code = None
-        self.expires_in = None
-        self._expires_at = None
-        self.populate_token_attributes(self.token)
-
-    @property
-    def token_types(self):
-        """Supported token types and their respective methods
-
-        Additional tokens can be supported by extending this dictionary.
-
-        The Bearer token spec is stable and safe to use.
-
-        The MAC token spec is not yet stable and support for MAC tokens
-        is experimental and currently matching version 00 of the spec.
-        """
-        return {
-            'Bearer': self._add_bearer_token,
-            'MAC': self._add_mac_token
-        }
-
-    def prepare_request_uri(self, *args, **kwargs):
-        """Abstract method used to create request URIs."""
-        raise NotImplementedError("Must be implemented by inheriting classes.")
-
-    def prepare_request_body(self, *args, **kwargs):
-        """Abstract method used to create request bodies."""
-        raise NotImplementedError("Must be implemented by inheriting classes.")
-
-    def parse_request_uri_response(self, *args, **kwargs):
-        """Abstract method used to parse redirection responses."""
-        raise NotImplementedError("Must be implemented by inheriting classes.")
-
-    def add_token(self, uri, http_method='GET', body=None, headers=None,
-                  token_placement=None, **kwargs):
-        """Add token to the request uri, body or authorization header.
-
-        The access token type provides the client with the information
-        required to successfully utilize the access token to make a protected
-        resource request (along with type-specific attributes).  The client
-        MUST NOT use an access token if it does not understand the token
-        type.
-
-        For example, the "bearer" token type defined in
-        [`I-D.ietf-oauth-v2-bearer`_] is utilized by simply including the access
-        token string in the request:
-
-        .. code-block:: http
-
-            GET /resource/1 HTTP/1.1
-            Host: example.com
-            Authorization: Bearer mF_9.B5f-4.1JqM
-
-        while the "mac" token type defined in [`I-D.ietf-oauth-v2-http-mac`_] is
-        utilized by issuing a MAC key together with the access token which is
-        used to sign certain components of the HTTP requests:
-
-        .. code-block:: http
-
-            GET /resource/1 HTTP/1.1
-            Host: example.com
-            Authorization: MAC id="h480djs93hd8",
-                                nonce="274312:dj83hs9s",
-                                mac="kDZvddkndxvhGRXZhvuDjEWhGeE="
-
-        .. _`I-D.ietf-oauth-v2-bearer`: https://tools.ietf.org/html/rfc6749#section-12.2
-        .. _`I-D.ietf-oauth-v2-http-mac`: https://tools.ietf.org/html/rfc6749#section-12.2
-        """
-        if not is_secure_transport(uri):
-            raise InsecureTransportError()
-
-        token_placement = token_placement or self.default_token_placement
-
-        case_insensitive_token_types = {
-            k.lower(): v for k, v in self.token_types.items()}
-        if not self.token_type.lower() in case_insensitive_token_types:
-            raise ValueError("Unsupported token type: %s" % self.token_type)
-
-        if not (self.access_token or self.token.get('access_token')):
-            raise ValueError("Missing access token.")
-
-        if self._expires_at and self._expires_at < time.time():
-            raise TokenExpiredError()
-
-        return case_insensitive_token_types[self.token_type.lower()](uri, http_method, body,
-                                                                     headers, token_placement, **kwargs)
-
-    def prepare_authorization_request(self, authorization_url, state=None,
-                                      redirect_url=None, scope=None, **kwargs):
-        """Prepare the authorization request.
-
-        This is the first step in many OAuth flows in which the user is
-        redirected to a certain authorization URL. This method adds
-        required parameters to the authorization URL.
-
-        :param authorization_url: Provider authorization endpoint URL.
-        :param state: CSRF protection string. Will be automatically created if
-            not provided. The generated state is available via the ``state``
-            attribute. Clients should verify that the state is unchanged and
-            present in the authorization response. This verification is done
-            automatically if using the ``authorization_response`` parameter
-            with ``prepare_token_request``.
-        :param redirect_url: Redirect URL to which the user will be returned
-            after authorization. Must be provided unless previously setup with
-            the provider. If provided then it must also be provided in the
-            token request.
-        :param scope: List of scopes to request. Must be equal to
-            or a subset of the scopes granted when obtaining the refresh
-            token. If none is provided, the ones provided in the constructor are
-            used.
-        :param kwargs: Additional parameters to included in the request.
-        :returns: The prepared request tuple with (url, headers, body).
-        """
-        if not is_secure_transport(authorization_url):
-            raise InsecureTransportError()
-
-        self.state = state or self.state_generator()
-        self.redirect_url = redirect_url or self.redirect_url
-        # do not assign scope to self automatically anymore
-        scope = self.scope if scope is None else scope
-        auth_url = self.prepare_request_uri(
-            authorization_url, redirect_uri=self.redirect_url,
-            scope=scope, state=self.state, **kwargs)
-        return auth_url, FORM_ENC_HEADERS, ''
-
-    def prepare_token_request(self, token_url, authorization_response=None,
-                              redirect_url=None, state=None, body='', **kwargs):
-        """Prepare a token creation request.
-
-        Note that these requests usually require client authentication, either
-        by including client_id or a set of provider specific authentication
-        credentials.
-
-        :param token_url: Provider token creation endpoint URL.
-        :param authorization_response: The full redirection URL string, i.e.
-            the location to which the user was redirected after successful
-            authorization. Used to mine credentials needed to obtain a token
-            in this step, such as authorization code.
-        :param redirect_url: The redirect_url supplied with the authorization
-            request (if there was one).
-        :param state:
-        :param body: Existing request body (URL encoded string) to embed parameters
-                     into. This may contain extra parameters. Default ''.
-        :param kwargs: Additional parameters to included in the request.
-        :returns: The prepared request tuple with (url, headers, body).
-        """
-        if not is_secure_transport(token_url):
-            raise InsecureTransportError()
-
-        state = state or self.state
-        if authorization_response:
-            self.parse_request_uri_response(
-                authorization_response, state=state)
-        self.redirect_url = redirect_url or self.redirect_url
-        body = self.prepare_request_body(body=body,
-                                         redirect_uri=self.redirect_url, **kwargs)
-
-        return token_url, FORM_ENC_HEADERS, body
-
-    def prepare_refresh_token_request(self, token_url, refresh_token=None,
-                                      body='', scope=None, **kwargs):
-        """Prepare an access token refresh request.
-
-        Expired access tokens can be replaced by new access tokens without
-        going through the OAuth dance if the client obtained a refresh token.
-        This refresh token and authentication credentials can be used to
-        obtain a new access token, and possibly a new refresh token.
-
-        :param token_url: Provider token refresh endpoint URL.
-        :param refresh_token: Refresh token string.
-        :param body: Existing request body (URL encoded string) to embed parameters
-            into. This may contain extra parameters. Default ''.
-        :param scope: List of scopes to request. Must be equal to
-            or a subset of the scopes granted when obtaining the refresh
-            token. If none is provided, the ones provided in the constructor are
-            used.
-        :param kwargs: Additional parameters to included in the request.
-        :returns: The prepared request tuple with (url, headers, body).
-        """
-        if not is_secure_transport(token_url):
-            raise InsecureTransportError()
-
-        # do not assign scope to self automatically anymore
-        scope = self.scope if scope is None else scope
-        body = self.prepare_refresh_body(body=body,
-                                         refresh_token=refresh_token, scope=scope, **kwargs)
-        return token_url, FORM_ENC_HEADERS, body
-
-    def prepare_token_revocation_request(self, revocation_url, token,
-                                         token_type_hint="access_token", body='', callback=None, **kwargs):
-        """Prepare a token revocation request.
-
-        :param revocation_url: Provider token revocation endpoint URL.
-        :param token: The access or refresh token to be revoked (string).
-        :param token_type_hint: ``"access_token"`` (default) or
-            ``"refresh_token"``. This is optional and if you wish to not pass it you
-            must provide ``token_type_hint=None``.
-        :param body:
-        :param callback: A jsonp callback such as ``package.callback`` to be invoked
-            upon receiving the response. Not that it should not include a () suffix.
-        :param kwargs: Additional parameters to included in the request.
-        :returns: The prepared request tuple with (url, headers, body).
-
-        Note that JSONP request may use GET requests as the parameters will
-        be added to the request URL query as opposed to the request body.
-
-        An example of a revocation request
-
-        .. code-block:: http
-
-            POST /revoke HTTP/1.1
-            Host: server.example.com
-            Content-Type: application/x-www-form-urlencoded
-            Authorization: Basic czZCaGRSa3F0MzpnWDFmQmF0M2JW
-
-            token=45ghiukldjahdnhzdauz&token_type_hint=refresh_token
-
-        An example of a jsonp revocation request
-
-        .. code-block:: http
-
-            GET /revoke?token=agabcdefddddafdd&callback=package.myCallback HTTP/1.1
-            Host: server.example.com
-            Content-Type: application/x-www-form-urlencoded
-            Authorization: Basic czZCaGRSa3F0MzpnWDFmQmF0M2JW
-
-        and an error response
-
-        .. code-block:: javascript
-
-            package.myCallback({"error":"unsupported_token_type"});
-
-        Note that these requests usually require client credentials, client_id in
-        the case for public clients and provider specific authentication
-        credentials for confidential clients.
-        """
-        if not is_secure_transport(revocation_url):
-            raise InsecureTransportError()
-
-        return prepare_token_revocation_request(revocation_url, token,
-                                                token_type_hint=token_type_hint, body=body, callback=callback,
-                                                **kwargs)
-
-    def parse_request_body_response(self, body, scope=None, **kwargs):
-        """Parse the JSON response body.
-
-        If the access token request is valid and authorized, the
-        authorization server issues an access token as described in
-        `Section 5.1`_.  A refresh token SHOULD NOT be included.  If the request
-        failed client authentication or is invalid, the authorization server
-        returns an error response as described in `Section 5.2`_.
-
-        :param body: The response body from the token request.
-        :param scope: Scopes originally requested. If none is provided, the ones
-            provided in the constructor are used.
-        :return: Dictionary of token parameters.
-        :raises: Warning if scope has changed. :py:class:`oauthlib.oauth2.errors.OAuth2Error`
-            if response is invalid.
-
-        These response are json encoded and could easily be parsed without
-        the assistance of OAuthLib. However, there are a few subtle issues
-        to be aware of regarding the response which are helpfully addressed
-        through the raising of various errors.
-
-        A successful response should always contain
-
-        **access_token**
-                The access token issued by the authorization server. Often
-                a random string.
-
-        **token_type**
-            The type of the token issued as described in `Section 7.1`_.
-            Commonly ``Bearer``.
-
-        While it is not mandated it is recommended that the provider include
-
-        **expires_in**
-            The lifetime in seconds of the access token.  For
-            example, the value "3600" denotes that the access token will
-            expire in one hour from the time the response was generated.
-            If omitted, the authorization server SHOULD provide the
-            expiration time via other means or document the default value.
-
-         **scope**
-            Providers may supply this in all responses but are required to only
-            if it has changed since the authorization request.
-
-        .. _`Section 5.1`: https://tools.ietf.org/html/rfc6749#section-5.1
-        .. _`Section 5.2`: https://tools.ietf.org/html/rfc6749#section-5.2
-        .. _`Section 7.1`: https://tools.ietf.org/html/rfc6749#section-7.1
-        """
-        scope = self.scope if scope is None else scope
-        self.token = parse_token_response(body, scope=scope)
-        self.populate_token_attributes(self.token)
-        return self.token
-
-    def prepare_refresh_body(self, body='', refresh_token=None, scope=None, **kwargs):
-        """Prepare an access token request, using a refresh token.
-
-        If the authorization server issued a refresh token to the client, the
-        client makes a refresh request to the token endpoint by adding the
-        following parameters using the `application/x-www-form-urlencoded`
-        format in the HTTP request entity-body:
-
-        :param refresh_token: REQUIRED.  The refresh token issued to the client.
-        :param scope:  OPTIONAL.  The scope of the access request as described by
-            Section 3.3.  The requested scope MUST NOT include any scope
-            not originally granted by the resource owner, and if omitted is
-            treated as equal to the scope originally granted by the
-            resource owner. Note that if none is provided, the ones provided
-            in the constructor are used if any.
-        """
-        refresh_token = refresh_token or self.refresh_token
-        scope = self.scope if scope is None else scope
-        return prepare_token_request(self.refresh_token_key, body=body, scope=scope,
-                                     refresh_token=refresh_token, **kwargs)
-
-    def _add_bearer_token(self, uri, http_method='GET', body=None,
-                          headers=None, token_placement=None):
-        """Add a bearer token to the request uri, body or authorization header."""
-        if token_placement == AUTH_HEADER:
-            headers = tokens.prepare_bearer_headers(self.access_token, headers)
-
-        elif token_placement == URI_QUERY:
-            uri = tokens.prepare_bearer_uri(self.access_token, uri)
-
-        elif token_placement == BODY:
-            body = tokens.prepare_bearer_body(self.access_token, body)
-
-        else:
-            raise ValueError("Invalid token placement.")
-        return uri, headers, body
-
-    def create_code_verifier(self, length):
-        """Create PKCE **code_verifier** used in computing **code_challenge**. 
-        See `RFC7636 Section 4.1`_
-
-        :param length: REQUIRED. The length of the code_verifier.
-
-        The client first creates a code verifier, "code_verifier", for each
-        OAuth 2.0 [RFC6749] Authorization Request, in the following manner:
-
-        .. code-block:: text
-
-               code_verifier = high-entropy cryptographic random STRING using the
-               unreserved characters [A-Z] / [a-z] / [0-9] / "-" / "." / "_" / "~"
-               from Section 2.3 of [RFC3986], with a minimum length of 43 characters
-               and a maximum length of 128 characters.
-
-        .. _`RFC7636 Section 4.1`: https://tools.ietf.org/html/rfc7636#section-4.1
-        """
-        code_verifier = None
-
-        if not length >= 43:
-            raise ValueError("Length must be greater than or equal to 43")
-
-        if not length <= 128:
-            raise ValueError("Length must be less than or equal to 128")
-
-        allowed_characters = re.compile('^[A-Zaa-z0-9-._~]')
-        code_verifier = secrets.token_urlsafe(length)
-
-        if not re.search(allowed_characters, code_verifier):
-            raise ValueError("code_verifier contains invalid characters")
-
-        self.code_verifier = code_verifier
-
-        return code_verifier
-
-    def create_code_challenge(self, code_verifier, code_challenge_method=None):
-        """Create PKCE **code_challenge** derived from the  **code_verifier**.
-        See `RFC7636 Section 4.2`_
-
-        :param code_verifier: REQUIRED. The **code_verifier** generated from `create_code_verifier()`.
-        :param code_challenge_method: OPTIONAL. The method used to derive the **code_challenge**. Acceptable values include `S256`. DEFAULT is `plain`.
-
-               The client then creates a code challenge derived from the code
-               verifier by using one of the following transformations on the code
-               verifier::
-
-                   plain
-                      code_challenge = code_verifier
-                   S256
-                      code_challenge = BASE64URL-ENCODE(SHA256(ASCII(code_verifier)))
-
-               If the client is capable of using `S256`, it MUST use `S256`, as
-               `S256` is Mandatory To Implement (MTI) on the server.  Clients are
-               permitted to use `plain` only if they cannot support `S256` for some
-               technical reason and know via out-of-band configuration that the
-               server supports `plain`.
-
-               The plain transformation is for compatibility with existing
-               deployments and for constrained environments that can't use the S256 transformation.
-
-        .. _`RFC7636 Section 4.2`: https://tools.ietf.org/html/rfc7636#section-4.2
-        """
-        code_challenge = None
-
-        if code_verifier == None:
-            raise ValueError("Invalid code_verifier")
-
-        if code_challenge_method == None:
-            code_challenge_method = "plain"
-            self.code_challenge_method = code_challenge_method
-            code_challenge = code_verifier
-            self.code_challenge = code_challenge
-
-        if code_challenge_method == "S256":
-            h = hashlib.sha256()
-            h.update(code_verifier.encode(encoding='ascii'))
-            sha256_val = h.digest()
-            code_challenge = bytes.decode(base64.urlsafe_b64encode(sha256_val))
-            # replace '+' with '-', '/' with '_', and remove trailing '='
-            code_challenge = code_challenge.replace("+", "-").replace("/", "_").replace("=", "")
-            self.code_challenge = code_challenge
-
-        return code_challenge
-
-    def _add_mac_token(self, uri, http_method='GET', body=None,
-                       headers=None, token_placement=AUTH_HEADER, ext=None, **kwargs):
-        """Add a MAC token to the request authorization header.
-
-        Warning: MAC token support is experimental as the spec is not yet stable.
-        """
-        if token_placement != AUTH_HEADER:
-            raise ValueError("Invalid token placement.")
-
-        headers = tokens.prepare_mac_header(self.access_token, uri,
-                                            self.mac_key, http_method, headers=headers, body=body, ext=ext,
-                                            hash_algorithm=self.mac_algorithm, **kwargs)
-        return uri, headers, body
-
-    def _populate_attributes(self, response):
-        warnings.warn("Please switch to the public method "
-                      "populate_token_attributes.", DeprecationWarning)
-        return self.populate_token_attributes(response)
-
-    def populate_code_attributes(self, response):
-        """Add attributes from an auth code response to self."""
-
-        if 'code' in response:
-            self.code = response.get('code')
-
-    def populate_token_attributes(self, response):
-        """Add attributes from a token exchange response to self."""
-
-        if 'access_token' in response:
-            self.access_token = response.get('access_token')
-
-        if 'refresh_token' in response:
-            self.refresh_token = response.get('refresh_token')
-
-        if 'token_type' in response:
-            self.token_type = response.get('token_type')
-
-        if 'expires_in' in response:
-            self.expires_in = response.get('expires_in')
-            self._expires_at = time.time() + int(self.expires_in)
-
-        if 'expires_at' in response:
-            try:
-                self._expires_at = int(response.get('expires_at'))
-            except:
-                self._expires_at = None
-
-        if 'mac_key' in response:
-            self.mac_key = response.get('mac_key')
-
-        if 'mac_algorithm' in response:
-            self.mac_algorithm = response.get('mac_algorithm')
diff --git a/lib/oauthlib/oauth2/rfc6749/clients/legacy_application.py b/lib/oauthlib/oauth2/rfc6749/clients/legacy_application.py
deleted file mode 100644
index 9920981d..00000000
--- a/lib/oauthlib/oauth2/rfc6749/clients/legacy_application.py
+++ /dev/null
@@ -1,84 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-oauthlib.oauth2.rfc6749
-~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of various logic needed
-for consuming and providing OAuth 2.0 RFC6749.
-"""
-from ..parameters import prepare_token_request
-from .base import Client
-
-
-class LegacyApplicationClient(Client):
-
-    """A public client using the resource owner password and username directly.
-
-    The resource owner password credentials grant type is suitable in
-    cases where the resource owner has a trust relationship with the
-    client, such as the device operating system or a highly privileged
-    application.  The authorization server should take special care when
-    enabling this grant type, and only allow it when other flows are not
-    viable.
-
-    The grant type is suitable for clients capable of obtaining the
-    resource owner's credentials (username and password, typically using
-    an interactive form).  It is also used to migrate existing clients
-    using direct authentication schemes such as HTTP Basic or Digest
-    authentication to OAuth by converting the stored credentials to an
-    access token.
-
-    The method through which the client obtains the resource owner
-    credentials is beyond the scope of this specification.  The client
-    MUST discard the credentials once an access token has been obtained.
-    """
-
-    grant_type = 'password'
-
-    def __init__(self, client_id, **kwargs):
-        super().__init__(client_id, **kwargs)
-
-    def prepare_request_body(self, username, password, body='', scope=None,
-                             include_client_id=False, **kwargs):
-        """Add the resource owner password and username to the request body.
-
-        The client makes a request to the token endpoint by adding the
-        following parameters using the "application/x-www-form-urlencoded"
-        format per `Appendix B`_ in the HTTP request entity-body:
-
-        :param username:    The resource owner username.
-        :param password:    The resource owner password.
-        :param body: Existing request body (URL encoded string) to embed parameters
-                     into. This may contain extra parameters. Default ''.
-        :param scope:   The scope of the access request as described by
-                        `Section 3.3`_.
-        :param include_client_id: `True` to send the `client_id` in the
-                                  body of the upstream request. This is required
-                                  if the client is not authenticating with the
-                                  authorization server as described in
-                                  `Section 3.2.1`_. False otherwise (default).
-        :type include_client_id: Boolean
-        :param kwargs:  Extra credentials to include in the token request.
-
-        If the client type is confidential or the client was issued client
-        credentials (or assigned other authentication requirements), the
-        client MUST authenticate with the authorization server as described
-        in `Section 3.2.1`_.
-
-        The prepared body will include all provided credentials as well as
-        the ``grant_type`` parameter set to ``password``::
-
-            >>> from oauthlib.oauth2 import LegacyApplicationClient
-            >>> client = LegacyApplicationClient('your_id')
-            >>> client.prepare_request_body(username='foo', password='bar', scope=['hello', 'world'])
-            'grant_type=password&username=foo&scope=hello+world&password=bar'
-
-        .. _`Appendix B`: https://tools.ietf.org/html/rfc6749#appendix-B
-        .. _`Section 3.3`: https://tools.ietf.org/html/rfc6749#section-3.3
-        .. _`Section 3.2.1`: https://tools.ietf.org/html/rfc6749#section-3.2.1
-        """
-        kwargs['client_id'] = self.client_id
-        kwargs['include_client_id'] = include_client_id
-        scope = self.scope if scope is None else scope
-        return prepare_token_request(self.grant_type, body=body, username=username,
-                                     password=password, scope=scope, **kwargs)
diff --git a/lib/oauthlib/oauth2/rfc6749/clients/mobile_application.py b/lib/oauthlib/oauth2/rfc6749/clients/mobile_application.py
deleted file mode 100644
index b10b41ce..00000000
--- a/lib/oauthlib/oauth2/rfc6749/clients/mobile_application.py
+++ /dev/null
@@ -1,174 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-oauthlib.oauth2.rfc6749
-~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of various logic needed
-for consuming and providing OAuth 2.0 RFC6749.
-"""
-from ..parameters import parse_implicit_response, prepare_grant_uri
-from .base import Client
-
-
-class MobileApplicationClient(Client):
-
-    """A public client utilizing the implicit code grant workflow.
-
-    A user-agent-based application is a public client in which the
-    client code is downloaded from a web server and executes within a
-    user-agent (e.g. web browser) on the device used by the resource
-    owner.  Protocol data and credentials are easily accessible (and
-    often visible) to the resource owner.  Since such applications
-    reside within the user-agent, they can make seamless use of the
-    user-agent capabilities when requesting authorization.
-
-    The implicit grant type is used to obtain access tokens (it does not
-    support the issuance of refresh tokens) and is optimized for public
-    clients known to operate a particular redirection URI.  These clients
-    are typically implemented in a browser using a scripting language
-    such as JavaScript.
-
-    As a redirection-based flow, the client must be capable of
-    interacting with the resource owner's user-agent (typically a web
-    browser) and capable of receiving incoming requests (via redirection)
-    from the authorization server.
-
-    Unlike the authorization code grant type in which the client makes
-    separate requests for authorization and access token, the client
-    receives the access token as the result of the authorization request.
-
-    The implicit grant type does not include client authentication, and
-    relies on the presence of the resource owner and the registration of
-    the redirection URI.  Because the access token is encoded into the
-    redirection URI, it may be exposed to the resource owner and other
-    applications residing on the same device.
-    """
-    
-    response_type = 'token'
-
-    def prepare_request_uri(self, uri, redirect_uri=None, scope=None,
-                            state=None, **kwargs):
-        """Prepare the implicit grant request URI.
-
-        The client constructs the request URI by adding the following
-        parameters to the query component of the authorization endpoint URI
-        using the "application/x-www-form-urlencoded" format, per `Appendix B`_:
-
-        :param redirect_uri:  OPTIONAL. The redirect URI must be an absolute URI
-                              and it should have been registered with the OAuth
-                              provider prior to use. As described in `Section 3.1.2`_.
-
-        :param scope:  OPTIONAL. The scope of the access request as described by
-                       Section 3.3`_. These may be any string but are commonly
-                       URIs or various categories such as ``videos`` or ``documents``.
-
-        :param state:   RECOMMENDED.  An opaque value used by the client to maintain
-                        state between the request and callback.  The authorization
-                        server includes this value when redirecting the user-agent back
-                        to the client.  The parameter SHOULD be used for preventing
-                        cross-site request forgery as described in `Section 10.12`_.
-
-        :param kwargs:  Extra arguments to include in the request URI.
-
-        In addition to supplied parameters, OAuthLib will append the ``client_id``
-        that was provided in the constructor as well as the mandatory ``response_type``
-        argument, set to ``token``::
-
-            >>> from oauthlib.oauth2 import MobileApplicationClient
-            >>> client = MobileApplicationClient('your_id')
-            >>> client.prepare_request_uri('https://example.com')
-            'https://example.com?client_id=your_id&response_type=token'
-            >>> client.prepare_request_uri('https://example.com', redirect_uri='https://a.b/callback')
-            'https://example.com?client_id=your_id&response_type=token&redirect_uri=https%3A%2F%2Fa.b%2Fcallback'
-            >>> client.prepare_request_uri('https://example.com', scope=['profile', 'pictures'])
-            'https://example.com?client_id=your_id&response_type=token&scope=profile+pictures'
-            >>> client.prepare_request_uri('https://example.com', foo='bar')
-            'https://example.com?client_id=your_id&response_type=token&foo=bar'
-
-        .. _`Appendix B`: https://tools.ietf.org/html/rfc6749#appendix-B
-        .. _`Section 2.2`: https://tools.ietf.org/html/rfc6749#section-2.2
-        .. _`Section 3.1.2`: https://tools.ietf.org/html/rfc6749#section-3.1.2
-        .. _`Section 3.3`: https://tools.ietf.org/html/rfc6749#section-3.3
-        .. _`Section 10.12`: https://tools.ietf.org/html/rfc6749#section-10.12
-        """
-        scope = self.scope if scope is None else scope
-        return prepare_grant_uri(uri, self.client_id, self.response_type,
-                                 redirect_uri=redirect_uri, state=state, scope=scope, **kwargs)
-
-    def parse_request_uri_response(self, uri, state=None, scope=None):
-        """Parse the response URI fragment.
-
-        If the resource owner grants the access request, the authorization
-        server issues an access token and delivers it to the client by adding
-        the following parameters to the fragment component of the redirection
-        URI using the "application/x-www-form-urlencoded" format:
-
-        :param uri: The callback URI that resulted from the user being redirected
-                    back from the provider to you, the client.
-        :param state: The state provided in the authorization request.
-        :param scope: The scopes provided in the authorization request.
-        :return: Dictionary of token parameters.
-        :raises: OAuth2Error if response is invalid.
-
-        A successful response should always contain
-
-        **access_token**
-                The access token issued by the authorization server. Often
-                a random string.
-
-        **token_type**
-            The type of the token issued as described in `Section 7.1`_.
-            Commonly ``Bearer``.
-
-        **state**
-            If you provided the state parameter in the authorization phase, then
-            the provider is required to include that exact state value in the
-            response.
-
-        While it is not mandated it is recommended that the provider include
-
-        **expires_in**
-            The lifetime in seconds of the access token.  For
-            example, the value "3600" denotes that the access token will
-            expire in one hour from the time the response was generated.
-            If omitted, the authorization server SHOULD provide the
-            expiration time via other means or document the default value.
-
-        **scope**
-            Providers may supply this in all responses but are required to only
-            if it has changed since the authorization request.
-
-        A few example responses can be seen below::
-
-            >>> response_uri = 'https://example.com/callback#access_token=sdlfkj452&state=ss345asyht&token_type=Bearer&scope=hello+world'
-            >>> from oauthlib.oauth2 import MobileApplicationClient
-            >>> client = MobileApplicationClient('your_id')
-            >>> client.parse_request_uri_response(response_uri)
-            {
-                'access_token': 'sdlfkj452',
-                'token_type': 'Bearer',
-                'state': 'ss345asyht',
-                'scope': [u'hello', u'world']
-            }
-            >>> client.parse_request_uri_response(response_uri, state='other')
-            Traceback (most recent call last):
-                File "<stdin>", line 1, in <module>
-                File "oauthlib/oauth2/rfc6749/__init__.py", line 598, in parse_request_uri_response
-                    **scope**
-                File "oauthlib/oauth2/rfc6749/parameters.py", line 197, in parse_implicit_response
-                    raise ValueError("Mismatching or missing state in params.")
-            ValueError: Mismatching or missing state in params.
-            >>> def alert_scope_changed(message, old, new):
-            ...     print(message, old, new)
-            ...
-            >>> oauthlib.signals.scope_changed.connect(alert_scope_changed)
-            >>> client.parse_request_body_response(response_body, scope=['other'])
-            ('Scope has changed from "other" to "hello world".', ['other'], ['hello', 'world'])
-
-        .. _`Section 7.1`: https://tools.ietf.org/html/rfc6749#section-7.1
-        .. _`Section 3.3`: https://tools.ietf.org/html/rfc6749#section-3.3
-        """
-        scope = self.scope if scope is None else scope
-        self.token = parse_implicit_response(uri, state=state, scope=scope)
-        self.populate_token_attributes(self.token)
-        return self.token
diff --git a/lib/oauthlib/oauth2/rfc6749/clients/service_application.py b/lib/oauthlib/oauth2/rfc6749/clients/service_application.py
deleted file mode 100644
index 8fb17377..00000000
--- a/lib/oauthlib/oauth2/rfc6749/clients/service_application.py
+++ /dev/null
@@ -1,189 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-oauthlib.oauth2.rfc6749
-~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of various logic needed
-for consuming and providing OAuth 2.0 RFC6749.
-"""
-import time
-
-from oauthlib.common import to_unicode
-
-from ..parameters import prepare_token_request
-from .base import Client
-
-
-class ServiceApplicationClient(Client):
-    """A public client utilizing the JWT bearer grant.
-
-    JWT bearer tokes can be used to request an access token when a client
-    wishes to utilize an existing trust relationship, expressed through the
-    semantics of (and digital signature or keyed message digest calculated
-    over) the JWT, without a direct user approval step at the authorization
-    server.
-
-    This grant type does not involve an authorization step. It may be
-    used by both public and confidential clients.
-    """
-
-    grant_type = 'urn:ietf:params:oauth:grant-type:jwt-bearer'
-
-    def __init__(self, client_id, private_key=None, subject=None, issuer=None,
-                 audience=None, **kwargs):
-        """Initialize a JWT client with defaults for implicit use later.
-
-        :param client_id: Client identifier given by the OAuth provider upon
-                          registration.
-
-        :param private_key: Private key used for signing and encrypting.
-                            Must be given as a string.
-
-        :param subject: The principal that is the subject of the JWT, i.e.
-                        which user is the token requested on behalf of.
-                        For example, ``foo@example.com.
-
-        :param issuer: The JWT MUST contain an "iss" (issuer) claim that
-                       contains a unique identifier for the entity that issued
-                       the JWT. For example, ``your-client@provider.com``.
-
-        :param audience: A value identifying the authorization server as an
-                         intended audience, e.g.
-                         ``https://provider.com/oauth2/token``.
-
-        :param kwargs: Additional arguments to pass to base client, such as
-                       state and token. See ``Client.__init__.__doc__`` for
-                       details.
-        """
-        super().__init__(client_id, **kwargs)
-        self.private_key = private_key
-        self.subject = subject
-        self.issuer = issuer
-        self.audience = audience
-
-    def prepare_request_body(self,
-                             private_key=None,
-                             subject=None,
-                             issuer=None,
-                             audience=None,
-                             expires_at=None,
-                             issued_at=None,
-                             extra_claims=None,
-                             body='',
-                             scope=None,
-                             include_client_id=False,
-                             **kwargs):
-        """Create and add a JWT assertion to the request body.
-
-        :param private_key: Private key used for signing and encrypting.
-                            Must be given as a string.
-
-        :param subject: (sub) The principal that is the subject of the JWT,
-                        i.e.  which user is the token requested on behalf of.
-                        For example, ``foo@example.com.
-
-        :param issuer: (iss) The JWT MUST contain an "iss" (issuer) claim that
-                       contains a unique identifier for the entity that issued
-                       the JWT. For example, ``your-client@provider.com``.
-
-        :param audience: (aud) A value identifying the authorization server as an
-                         intended audience, e.g.
-                         ``https://provider.com/oauth2/token``.
-
-        :param expires_at: A unix expiration timestamp for the JWT. Defaults
-                           to an hour from now, i.e. ``time.time() + 3600``.
-
-        :param issued_at: A unix timestamp of when the JWT was created.
-                          Defaults to now, i.e. ``time.time()``.
-
-        :param extra_claims: A dict of additional claims to include in the JWT.
-
-        :param body: Existing request body (URL encoded string) to embed parameters
-                     into. This may contain extra parameters. Default ''.
-
-        :param scope: The scope of the access request.
-
-        :param include_client_id: `True` to send the `client_id` in the
-                                  body of the upstream request. This is required
-                                  if the client is not authenticating with the
-                                  authorization server as described in
-                                  `Section 3.2.1`_. False otherwise (default).
-        :type include_client_id: Boolean
-
-        :param not_before: A unix timestamp after which the JWT may be used.
-                           Not included unless provided. *
-
-        :param jwt_id: A unique JWT token identifier. Not included unless
-                       provided. *
-
-        :param kwargs: Extra credentials to include in the token request.
-
-        Parameters marked with a `*` above are not explicit arguments in the
-        function signature, but are specially documented arguments for items
-        appearing in the generic `**kwargs` keyworded input.
-
-        The "scope" parameter may be used, as defined in the Assertion
-        Framework for OAuth 2.0 Client Authentication and Authorization Grants
-        [I-D.ietf-oauth-assertions] specification, to indicate the requested
-        scope.
-
-        Authentication of the client is optional, as described in
-        `Section 3.2.1`_ of OAuth 2.0 [RFC6749] and consequently, the
-        "client_id" is only needed when a form of client authentication that
-        relies on the parameter is used.
-
-        The following non-normative example demonstrates an Access Token
-        Request with a JWT as an authorization grant (with extra line breaks
-        for display purposes only):
-
-        .. code-block: http
-
-            POST /token.oauth2 HTTP/1.1
-            Host: as.example.com
-            Content-Type: application/x-www-form-urlencoded
-
-            grant_type=urn%3Aietf%3Aparams%3Aoauth%3Agrant-type%3Ajwt-bearer
-            &assertion=eyJhbGciOiJFUzI1NiJ9.
-            eyJpc3Mi[...omitted for brevity...].
-            J9l-ZhwP[...omitted for brevity...]
-
-        .. _`Section 3.2.1`: https://tools.ietf.org/html/rfc6749#section-3.2.1
-        """
-        import jwt
-
-        key = private_key or self.private_key
-        if not key:
-            raise ValueError('An encryption key must be supplied to make JWT'
-                             ' token requests.')
-        claim = {
-            'iss': issuer or self.issuer,
-            'aud': audience or self.audience,
-            'sub': subject or self.subject,
-            'exp': int(expires_at or time.time() + 3600),
-            'iat': int(issued_at or time.time()),
-        }
-
-        for attr in ('iss', 'aud', 'sub'):
-            if claim[attr] is None:
-                raise ValueError(
-                        'Claim must include %s but none was given.' % attr)
-
-        if 'not_before' in kwargs:
-            claim['nbf'] = kwargs.pop('not_before')
-
-        if 'jwt_id' in kwargs:
-            claim['jti'] = kwargs.pop('jwt_id')
-
-        claim.update(extra_claims or {})
-
-        assertion = jwt.encode(claim, key, 'RS256')
-        assertion = to_unicode(assertion)
-
-        kwargs['client_id'] = self.client_id
-        kwargs['include_client_id'] = include_client_id
-        scope = self.scope if scope is None else scope
-        return prepare_token_request(self.grant_type,
-                                     body=body,
-                                     assertion=assertion,
-                                     scope=scope,
-                                     **kwargs)
diff --git a/lib/oauthlib/oauth2/rfc6749/clients/web_application.py b/lib/oauthlib/oauth2/rfc6749/clients/web_application.py
deleted file mode 100644
index 50890fbf..00000000
--- a/lib/oauthlib/oauth2/rfc6749/clients/web_application.py
+++ /dev/null
@@ -1,222 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-oauthlib.oauth2.rfc6749
-~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of various logic needed
-for consuming and providing OAuth 2.0 RFC6749.
-"""
-import warnings
-
-from ..parameters import (
-    parse_authorization_code_response, prepare_grant_uri,
-    prepare_token_request,
-)
-from .base import Client
-
-
-class WebApplicationClient(Client):
-
-    """A client utilizing the authorization code grant workflow.
-
-    A web application is a confidential client running on a web
-    server.  Resource owners access the client via an HTML user
-    interface rendered in a user-agent on the device used by the
-    resource owner.  The client credentials as well as any access
-    token issued to the client are stored on the web server and are
-    not exposed to or accessible by the resource owner.
-
-    The authorization code grant type is used to obtain both access
-    tokens and refresh tokens and is optimized for confidential clients.
-    As a redirection-based flow, the client must be capable of
-    interacting with the resource owner's user-agent (typically a web
-    browser) and capable of receiving incoming requests (via redirection)
-    from the authorization server.
-    """
-    
-    grant_type = 'authorization_code'
-
-    def __init__(self, client_id, code=None, **kwargs):
-        super().__init__(client_id, **kwargs)
-        self.code = code
-
-    def prepare_request_uri(self, uri, redirect_uri=None, scope=None,
-                            state=None, code_challenge=None, code_challenge_method='plain', **kwargs):
-        """Prepare the authorization code request URI
-
-        The client constructs the request URI by adding the following
-        parameters to the query component of the authorization endpoint URI
-        using the "application/x-www-form-urlencoded" format, per `Appendix B`_:
-
-        :param redirect_uri:  OPTIONAL. The redirect URI must be an absolute URI
-                              and it should have been registered with the OAuth
-                              provider prior to use. As described in `Section 3.1.2`_.
-
-        :param scope:  OPTIONAL. The scope of the access request as described by
-                       Section 3.3`_. These may be any string but are commonly
-                       URIs or various categories such as ``videos`` or ``documents``.
-
-        :param state:   RECOMMENDED.  An opaque value used by the client to maintain
-                        state between the request and callback.  The authorization
-                        server includes this value when redirecting the user-agent back
-                        to the client.  The parameter SHOULD be used for preventing
-                        cross-site request forgery as described in `Section 10.12`_.
-
-        :param code_challenge: OPTIONAL. PKCE parameter. REQUIRED if PKCE is enforced. 
-                        A challenge derived from the code_verifier that is sent in the 
-                        authorization request, to be verified against later.
-
-        :param code_challenge_method: OPTIONAL. PKCE parameter. A method that was used to derive code challenge.
-                                      Defaults to "plain" if not present in the request.
-
-        :param kwargs:  Extra arguments to include in the request URI.
-
-        In addition to supplied parameters, OAuthLib will append the ``client_id``
-        that was provided in the constructor as well as the mandatory ``response_type``
-        argument, set to ``code``::
-
-            >>> from oauthlib.oauth2 import WebApplicationClient
-            >>> client = WebApplicationClient('your_id')
-            >>> client.prepare_request_uri('https://example.com')
-            'https://example.com?client_id=your_id&response_type=code'
-            >>> client.prepare_request_uri('https://example.com', redirect_uri='https://a.b/callback')
-            'https://example.com?client_id=your_id&response_type=code&redirect_uri=https%3A%2F%2Fa.b%2Fcallback'
-            >>> client.prepare_request_uri('https://example.com', scope=['profile', 'pictures'])
-            'https://example.com?client_id=your_id&response_type=code&scope=profile+pictures'
-            >>> client.prepare_request_uri('https://example.com', code_challenge='kjasBS523KdkAILD2k78NdcJSk2k3KHG6')
-            'https://example.com?client_id=your_id&response_type=code&code_challenge=kjasBS523KdkAILD2k78NdcJSk2k3KHG6'
-            >>> client.prepare_request_uri('https://example.com', code_challenge_method='S256')
-            'https://example.com?client_id=your_id&response_type=code&code_challenge_method=S256'
-            >>> client.prepare_request_uri('https://example.com', foo='bar')
-            'https://example.com?client_id=your_id&response_type=code&foo=bar'
-
-        .. _`Appendix B`: https://tools.ietf.org/html/rfc6749#appendix-B
-        .. _`Section 2.2`: https://tools.ietf.org/html/rfc6749#section-2.2
-        .. _`Section 3.1.2`: https://tools.ietf.org/html/rfc6749#section-3.1.2
-        .. _`Section 3.3`: https://tools.ietf.org/html/rfc6749#section-3.3
-        .. _`Section 10.12`: https://tools.ietf.org/html/rfc6749#section-10.12
-        """
-        scope = self.scope if scope is None else scope
-        return prepare_grant_uri(uri, self.client_id, 'code',
-                                 redirect_uri=redirect_uri, scope=scope, state=state, code_challenge=code_challenge,
-                                 code_challenge_method=code_challenge_method, **kwargs)
-
-    def prepare_request_body(self, code=None, redirect_uri=None, body='',
-                             include_client_id=True, code_verifier=None, **kwargs):
-        """Prepare the access token request body.
-
-        The client makes a request to the token endpoint by adding the
-        following parameters using the "application/x-www-form-urlencoded"
-        format in the HTTP request entity-body:
-
-        :param code:    REQUIRED. The authorization code received from the
-                        authorization server.
-
-        :param redirect_uri:    REQUIRED, if the "redirect_uri" parameter was included in the
-                                authorization request as described in `Section 4.1.1`_, and their
-                                values MUST be identical.
-
-        :param body: Existing request body (URL encoded string) to embed parameters
-                     into. This may contain extra parameters. Default ''.
-
-        :param include_client_id: `True` (default) to send the `client_id` in the
-                                  body of the upstream request. This is required
-                                  if the client is not authenticating with the
-                                  authorization server as described in `Section 3.2.1`_.
-        :type include_client_id: Boolean
-
-        :param code_verifier: OPTIONAL. A cryptographically random string that is used to correlate the
-                                        authorization request to the token request.
-
-        :param kwargs: Extra parameters to include in the token request.
-
-        In addition OAuthLib will add the ``grant_type`` parameter set to
-        ``authorization_code``.
-
-        If the client type is confidential or the client was issued client
-        credentials (or assigned other authentication requirements), the
-        client MUST authenticate with the authorization server as described
-        in `Section 3.2.1`_::
-
-            >>> from oauthlib.oauth2 import WebApplicationClient
-            >>> client = WebApplicationClient('your_id')
-            >>> client.prepare_request_body(code='sh35ksdf09sf')
-            'grant_type=authorization_code&code=sh35ksdf09sf'
-            >>> client.prepare_request_body(code_verifier='KB46DCKJ873NCGXK5GD682NHDKK34GR')
-            'grant_type=authorization_code&code_verifier=KB46DCKJ873NCGXK5GD682NHDKK34GR'
-            >>> client.prepare_request_body(code='sh35ksdf09sf', foo='bar')
-            'grant_type=authorization_code&code=sh35ksdf09sf&foo=bar'
-
-        `Section 3.2.1` also states:
-            In the "authorization_code" "grant_type" request to the token
-            endpoint, an unauthenticated client MUST send its "client_id" to
-            prevent itself from inadvertently accepting a code intended for a
-            client with a different "client_id".  This protects the client from
-            substitution of the authentication code.  (It provides no additional
-            security for the protected resource.)
-
-        .. _`Section 4.1.1`: https://tools.ietf.org/html/rfc6749#section-4.1.1
-        .. _`Section 3.2.1`: https://tools.ietf.org/html/rfc6749#section-3.2.1
-        """
-        code = code or self.code
-        if 'client_id' in kwargs:
-            warnings.warn("`client_id` has been deprecated in favor of "
-                          "`include_client_id`, a boolean value which will "
-                          "include the already configured `self.client_id`.",
-                          DeprecationWarning)
-            if kwargs['client_id'] != self.client_id:
-                raise ValueError("`client_id` was supplied as an argument, but "
-                                 "it does not match `self.client_id`")
-
-        kwargs['client_id'] = self.client_id
-        kwargs['include_client_id'] = include_client_id
-        return prepare_token_request(self.grant_type, code=code, body=body,
-                                     redirect_uri=redirect_uri, code_verifier=code_verifier, **kwargs)
-
-    def parse_request_uri_response(self, uri, state=None):
-        """Parse the URI query for code and state.
-
-        If the resource owner grants the access request, the authorization
-        server issues an authorization code and delivers it to the client by
-        adding the following parameters to the query component of the
-        redirection URI using the "application/x-www-form-urlencoded" format:
-
-        :param uri: The callback URI that resulted from the user being redirected
-                    back from the provider to you, the client.
-        :param state: The state provided in the authorization request.
-
-        **code**
-            The authorization code generated by the authorization server.
-            The authorization code MUST expire shortly after it is issued
-            to mitigate the risk of leaks. A maximum authorization code
-            lifetime of 10 minutes is RECOMMENDED. The client MUST NOT
-            use the authorization code more than once. If an authorization
-            code is used more than once, the authorization server MUST deny
-            the request and SHOULD revoke (when possible) all tokens
-            previously issued based on that authorization code.
-            The authorization code is bound to the client identifier and
-            redirection URI.
-
-        **state**
-                If the "state" parameter was present in the authorization request.
-
-        This method is mainly intended to enforce strict state checking with
-        the added benefit of easily extracting parameters from the URI::
-
-            >>> from oauthlib.oauth2 import WebApplicationClient
-            >>> client = WebApplicationClient('your_id')
-            >>> uri = 'https://example.com/callback?code=sdfkjh345&state=sfetw45'
-            >>> client.parse_request_uri_response(uri, state='sfetw45')
-            {'state': 'sfetw45', 'code': 'sdfkjh345'}
-            >>> client.parse_request_uri_response(uri, state='other')
-            Traceback (most recent call last):
-                File "<stdin>", line 1, in <module>
-                File "oauthlib/oauth2/rfc6749/__init__.py", line 357, in parse_request_uri_response
-                    back from the provider to you, the client.
-                File "oauthlib/oauth2/rfc6749/parameters.py", line 153, in parse_authorization_code_response
-                    raise MismatchingStateError()
-            oauthlib.oauth2.rfc6749.errors.MismatchingStateError
-        """
-        response = parse_authorization_code_response(uri, state=state)
-        self.populate_code_attributes(response)
-        return response
diff --git a/lib/oauthlib/oauth2/rfc6749/endpoints/__init__.py b/lib/oauthlib/oauth2/rfc6749/endpoints/__init__.py
deleted file mode 100644
index 1695b41b..00000000
--- a/lib/oauthlib/oauth2/rfc6749/endpoints/__init__.py
+++ /dev/null
@@ -1,17 +0,0 @@
-"""
-oauthlib.oauth2.rfc6749
-~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of various logic needed
-for consuming and providing OAuth 2.0 RFC6749.
-"""
-from .authorization import AuthorizationEndpoint
-from .introspect import IntrospectEndpoint
-from .metadata import MetadataEndpoint
-from .pre_configured import (
-    BackendApplicationServer, LegacyApplicationServer, MobileApplicationServer,
-    Server, WebApplicationServer,
-)
-from .resource import ResourceEndpoint
-from .revocation import RevocationEndpoint
-from .token import TokenEndpoint
diff --git a/lib/oauthlib/oauth2/rfc6749/endpoints/authorization.py b/lib/oauthlib/oauth2/rfc6749/endpoints/authorization.py
deleted file mode 100644
index 71967865..00000000
--- a/lib/oauthlib/oauth2/rfc6749/endpoints/authorization.py
+++ /dev/null
@@ -1,114 +0,0 @@
-"""
-oauthlib.oauth2.rfc6749
-~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of various logic needed
-for consuming and providing OAuth 2.0 RFC6749.
-"""
-import logging
-
-from oauthlib.common import Request
-from oauthlib.oauth2.rfc6749 import utils
-
-from .base import BaseEndpoint, catch_errors_and_unavailability
-
-log = logging.getLogger(__name__)
-
-
-class AuthorizationEndpoint(BaseEndpoint):
-
-    """Authorization endpoint - used by the client to obtain authorization
-    from the resource owner via user-agent redirection.
-
-    The authorization endpoint is used to interact with the resource
-    owner and obtain an authorization grant.  The authorization server
-    MUST first verify the identity of the resource owner.  The way in
-    which the authorization server authenticates the resource owner (e.g.
-    username and password login, session cookies) is beyond the scope of
-    this specification.
-
-    The endpoint URI MAY include an "application/x-www-form-urlencoded"
-    formatted (per `Appendix B`_) query component,
-    which MUST be retained when adding additional query parameters.  The
-    endpoint URI MUST NOT include a fragment component::
-
-        https://example.com/path?query=component             # OK
-        https://example.com/path?query=component#fragment    # Not OK
-
-    Since requests to the authorization endpoint result in user
-    authentication and the transmission of clear-text credentials (in the
-    HTTP response), the authorization server MUST require the use of TLS
-    as described in Section 1.6 when sending requests to the
-    authorization endpoint::
-
-        # We will deny any request which URI schema is not with https
-
-    The authorization server MUST support the use of the HTTP "GET"
-    method [RFC2616] for the authorization endpoint, and MAY support the
-    use of the "POST" method as well::
-
-        # HTTP method is currently not enforced
-
-    Parameters sent without a value MUST be treated as if they were
-    omitted from the request.  The authorization server MUST ignore
-    unrecognized request parameters.  Request and response parameters
-    MUST NOT be included more than once::
-
-        # Enforced through the design of oauthlib.common.Request
-
-    .. _`Appendix B`: https://tools.ietf.org/html/rfc6749#appendix-B
-    """
-
-    def __init__(self, default_response_type, default_token_type,
-                 response_types):
-        BaseEndpoint.__init__(self)
-        self._response_types = response_types
-        self._default_response_type = default_response_type
-        self._default_token_type = default_token_type
-
-    @property
-    def response_types(self):
-        return self._response_types
-
-    @property
-    def default_response_type(self):
-        return self._default_response_type
-
-    @property
-    def default_response_type_handler(self):
-        return self.response_types.get(self.default_response_type)
-
-    @property
-    def default_token_type(self):
-        return self._default_token_type
-
-    @catch_errors_and_unavailability
-    def create_authorization_response(self, uri, http_method='GET', body=None,
-                                      headers=None, scopes=None, credentials=None):
-        """Extract response_type and route to the designated handler."""
-        request = Request(
-            uri, http_method=http_method, body=body, headers=headers)
-        request.scopes = scopes
-        # TODO: decide whether this should be a required argument
-        request.user = None     # TODO: explain this in docs
-        for k, v in (credentials or {}).items():
-            setattr(request, k, v)
-        response_type_handler = self.response_types.get(
-            request.response_type, self.default_response_type_handler)
-        log.debug('Dispatching response_type %s request to %r.',
-                  request.response_type, response_type_handler)
-        return response_type_handler.create_authorization_response(
-            request, self.default_token_type)
-
-    @catch_errors_and_unavailability
-    def validate_authorization_request(self, uri, http_method='GET', body=None,
-                                       headers=None):
-        """Extract response_type and route to the designated handler."""
-        request = Request(
-            uri, http_method=http_method, body=body, headers=headers)
-
-        request.scopes = utils.scope_to_list(request.scope)
-
-        response_type_handler = self.response_types.get(
-            request.response_type, self.default_response_type_handler)
-        return response_type_handler.validate_authorization_request(request)
diff --git a/lib/oauthlib/oauth2/rfc6749/endpoints/base.py b/lib/oauthlib/oauth2/rfc6749/endpoints/base.py
deleted file mode 100644
index 3f239917..00000000
--- a/lib/oauthlib/oauth2/rfc6749/endpoints/base.py
+++ /dev/null
@@ -1,113 +0,0 @@
-"""
-oauthlib.oauth2.rfc6749
-~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of various logic needed
-for consuming and providing OAuth 2.0 RFC6749.
-"""
-import functools
-import logging
-
-from ..errors import (
-    FatalClientError, InvalidClientError, InvalidRequestError, OAuth2Error,
-    ServerError, TemporarilyUnavailableError, UnsupportedTokenTypeError,
-)
-
-log = logging.getLogger(__name__)
-
-
-class BaseEndpoint:
-
-    def __init__(self):
-        self._available = True
-        self._catch_errors = False
-        self._valid_request_methods = None
-
-    @property
-    def valid_request_methods(self):
-        return self._valid_request_methods
-
-    @valid_request_methods.setter
-    def valid_request_methods(self, valid_request_methods):
-        if valid_request_methods is not None:
-            valid_request_methods = [x.upper() for x in valid_request_methods]
-        self._valid_request_methods = valid_request_methods
-    
-
-    @property
-    def available(self):
-        return self._available
-
-    @available.setter
-    def available(self, available):
-        self._available = available       
-
-    @property
-    def catch_errors(self):
-        return self._catch_errors
-
-    @catch_errors.setter
-    def catch_errors(self, catch_errors):
-        self._catch_errors = catch_errors
-
-    def _raise_on_missing_token(self, request):
-        """Raise error on missing token."""
-        if not request.token:
-            raise InvalidRequestError(request=request,
-                                      description='Missing token parameter.')
-    def _raise_on_invalid_client(self, request):
-        """Raise on failed client authentication."""
-        if self.request_validator.client_authentication_required(request):
-            if not self.request_validator.authenticate_client(request):
-                log.debug('Client authentication failed, %r.', request)
-                raise InvalidClientError(request=request)
-        elif not self.request_validator.authenticate_client_id(request.client_id, request):
-            log.debug('Client authentication failed, %r.', request)
-            raise InvalidClientError(request=request)
-
-    def _raise_on_unsupported_token(self, request):
-        """Raise on unsupported tokens."""
-        if (request.token_type_hint and
-            request.token_type_hint in self.valid_token_types and
-            request.token_type_hint not in self.supported_token_types):
-            raise UnsupportedTokenTypeError(request=request)
-
-    def _raise_on_bad_method(self, request):
-        if self.valid_request_methods is None:
-            raise ValueError('Configure "valid_request_methods" property first')
-        if request.http_method.upper() not in self.valid_request_methods:
-            raise InvalidRequestError(request=request,
-                                      description=('Unsupported request method %s' % request.http_method.upper()))
-
-    def _raise_on_bad_post_request(self, request):
-        """Raise if invalid POST request received
-        """
-        if request.http_method.upper() == 'POST':
-            query_params = request.uri_query or ""
-            if query_params:
-                raise InvalidRequestError(request=request,
-                                          description=('URL query parameters are not allowed'))
-
-def catch_errors_and_unavailability(f):
-    @functools.wraps(f)
-    def wrapper(endpoint, uri, *args, **kwargs):
-        if not endpoint.available:
-            e = TemporarilyUnavailableError()
-            log.info('Endpoint unavailable, ignoring request %s.' % uri)
-            return {}, e.json, 503
-
-        if endpoint.catch_errors:
-            try:
-                return f(endpoint, uri, *args, **kwargs)
-            except OAuth2Error:
-                raise
-            except FatalClientError:
-                raise
-            except Exception as e:
-                error = ServerError()
-                log.warning(
-                    'Exception caught while processing request, %s.' % e)
-                return {}, error.json, 500
-        else:
-            return f(endpoint, uri, *args, **kwargs)
-    return wrapper
diff --git a/lib/oauthlib/oauth2/rfc6749/endpoints/introspect.py b/lib/oauthlib/oauth2/rfc6749/endpoints/introspect.py
deleted file mode 100644
index 3cc61e66..00000000
--- a/lib/oauthlib/oauth2/rfc6749/endpoints/introspect.py
+++ /dev/null
@@ -1,120 +0,0 @@
-"""
-oauthlib.oauth2.rfc6749.endpoint.introspect
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-An implementation of the OAuth 2.0 `Token Introspection`.
-
-.. _`Token Introspection`: https://tools.ietf.org/html/rfc7662
-"""
-import json
-import logging
-
-from oauthlib.common import Request
-
-from ..errors import OAuth2Error
-from .base import BaseEndpoint, catch_errors_and_unavailability
-
-log = logging.getLogger(__name__)
-
-
-class IntrospectEndpoint(BaseEndpoint):
-
-    """Introspect token endpoint.
-
-   This endpoint defines a method to query an OAuth 2.0 authorization
-   server to determine the active state of an OAuth 2.0 token and to
-   determine meta-information about this token. OAuth 2.0 deployments
-   can use this method to convey information about the authorization
-   context of the token from the authorization server to the protected
-   resource.
-
-   To prevent the values of access tokens from leaking into
-   server-side logs via query parameters, an authorization server
-   offering token introspection MAY disallow the use of HTTP GET on
-   the introspection endpoint and instead require the HTTP POST method
-   to be used at the introspection endpoint.
-   """
-
-    valid_token_types = ('access_token', 'refresh_token')
-    valid_request_methods = ('POST',)
-
-    def __init__(self, request_validator, supported_token_types=None):
-        BaseEndpoint.__init__(self)
-        self.request_validator = request_validator
-        self.supported_token_types = (
-            supported_token_types or self.valid_token_types)
-
-    @catch_errors_and_unavailability
-    def create_introspect_response(self, uri, http_method='POST', body=None,
-                                   headers=None):
-        """Create introspect valid or invalid response
-
-        If the authorization server is unable to determine the state
-        of the token without additional information, it SHOULD return
-        an introspection response indicating the token is not active
-        as described in Section 2.2.
-        """
-        resp_headers = {
-            'Content-Type': 'application/json',
-            'Cache-Control': 'no-store',
-            'Pragma': 'no-cache',
-        }
-        request = Request(uri, http_method, body, headers)
-        try:
-            self.validate_introspect_request(request)
-            log.debug('Token introspect valid for %r.', request)
-        except OAuth2Error as e:
-            log.debug('Client error during validation of %r. %r.', request, e)
-            resp_headers.update(e.headers)
-            return resp_headers, e.json, e.status_code
-
-        claims = self.request_validator.introspect_token(
-            request.token,
-            request.token_type_hint,
-            request
-        )
-        if claims is None:
-            return resp_headers, json.dumps(dict(active=False)), 200
-        if "active" in claims:
-            claims.pop("active")
-        return resp_headers, json.dumps(dict(active=True, **claims)), 200
-
-    def validate_introspect_request(self, request):
-        """Ensure the request is valid.
-
-        The protected resource calls the introspection endpoint using
-        an HTTP POST request with parameters sent as
-        "application/x-www-form-urlencoded".
-
-        * token REQUIRED.  The string value of the token.
-        * token_type_hint OPTIONAL.
-
-        A hint about the type of the token submitted for
-        introspection.  The protected resource MAY pass this parameter to
-        help the authorization server optimize the token lookup.  If the
-        server is unable to locate the token using the given hint, it MUST
-        extend its search across all of its supported token types.  An
-        authorization server MAY ignore this parameter, particularly if it
-        is able to detect the token type automatically.
-
-        *  access_token: An Access Token as defined in [`RFC6749`], `section 1.4`_
-        *  refresh_token: A Refresh Token as defined in [`RFC6749`], `section 1.5`_
-
-        The introspection endpoint MAY accept other OPTIONAL
-        parameters to provide further context to the query.  For
-        instance, an authorization server may desire to know the IP
-        address of the client accessing the protected resource to
-        determine if the correct client is likely to be presenting the
-        token.  The definition of this or any other parameters are
-        outside the scope of this specification, to be defined by
-        service documentation or extensions to this specification.
-
-        .. _`section 1.4`: http://tools.ietf.org/html/rfc6749#section-1.4
-        .. _`section 1.5`: http://tools.ietf.org/html/rfc6749#section-1.5
-        .. _`RFC6749`: http://tools.ietf.org/html/rfc6749
-        """
-        self._raise_on_bad_method(request)
-        self._raise_on_bad_post_request(request)
-        self._raise_on_missing_token(request)
-        self._raise_on_invalid_client(request)
-        self._raise_on_unsupported_token(request)
diff --git a/lib/oauthlib/oauth2/rfc6749/endpoints/metadata.py b/lib/oauthlib/oauth2/rfc6749/endpoints/metadata.py
deleted file mode 100644
index a2820f28..00000000
--- a/lib/oauthlib/oauth2/rfc6749/endpoints/metadata.py
+++ /dev/null
@@ -1,238 +0,0 @@
-"""
-oauthlib.oauth2.rfc6749.endpoint.metadata
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-An implementation of the `OAuth 2.0 Authorization Server Metadata`.
-
-.. _`OAuth 2.0 Authorization Server Metadata`: https://tools.ietf.org/html/rfc8414
-"""
-import copy
-import json
-import logging
-
-from .. import grant_types, utils
-from .authorization import AuthorizationEndpoint
-from .base import BaseEndpoint, catch_errors_and_unavailability
-from .introspect import IntrospectEndpoint
-from .revocation import RevocationEndpoint
-from .token import TokenEndpoint
-
-log = logging.getLogger(__name__)
-
-
-class MetadataEndpoint(BaseEndpoint):
-
-    """OAuth2.0 Authorization Server Metadata endpoint.
-
-   This specification generalizes the metadata format defined by
-   `OpenID Connect Discovery 1.0` in a way that is compatible
-   with OpenID Connect Discovery while being applicable to a wider set
-   of OAuth 2.0 use cases.  This is intentionally parallel to the way
-   that OAuth 2.0 Dynamic Client Registration Protocol [`RFC7591`_]
-   generalized the dynamic client registration mechanisms defined by
-   OpenID Connect Dynamic Client Registration 1.0
-   in a way that is compatible with it.
-
-   .. _`OpenID Connect Discovery 1.0`: https://openid.net/specs/openid-connect-discovery-1_0.html
-   .. _`RFC7591`: https://tools.ietf.org/html/rfc7591
-   """
-
-    def __init__(self, endpoints, claims={}, raise_errors=True):
-        assert isinstance(claims, dict)
-        for endpoint in endpoints:
-            assert isinstance(endpoint, BaseEndpoint)
-
-        BaseEndpoint.__init__(self)
-        self.raise_errors = raise_errors
-        self.endpoints = endpoints
-        self.initial_claims = claims
-        self.claims = self.validate_metadata_server()
-
-    @catch_errors_and_unavailability
-    def create_metadata_response(self, uri, http_method='GET', body=None,
-                                 headers=None):
-        """Create metadata response
-        """
-        headers = {
-            'Content-Type': 'application/json',
-            'Access-Control-Allow-Origin': '*',
-        }
-        return headers, json.dumps(self.claims), 200
-
-    def validate_metadata(self, array, key, is_required=False, is_list=False, is_url=False, is_issuer=False):
-        if not self.raise_errors:
-            return
-
-        if key not in array:
-            if is_required:
-                raise ValueError("key {} is a mandatory metadata.".format(key))
-
-        elif is_issuer:
-            if not utils.is_secure_transport(array[key]):
-                raise ValueError("key {}: {} must be an HTTPS URL".format(key, array[key]))
-            if "?" in array[key] or "&" in array[key] or "#" in array[key]:
-                raise ValueError("key {}: {} must not contain query or fragment components".format(key, array[key]))
-
-        elif is_url:
-            if not array[key].startswith("http"):
-                raise ValueError("key {}: {} must be an URL".format(key, array[key]))
-
-        elif is_list:
-            if not isinstance(array[key], list):
-                raise ValueError("key {}: {} must be an Array".format(key, array[key]))
-            for elem in array[key]:
-                if not isinstance(elem, str):
-                    raise ValueError("array {}: {} must contains only string (not {})".format(key, array[key], elem))
-
-    def validate_metadata_token(self, claims, endpoint):
-        """
-        If the token endpoint is used in the grant type, the value of this
-        parameter MUST be the same as the value of the "grant_type"
-        parameter passed to the token endpoint defined in the grant type
-        definition.
-        """
-        self._grant_types.extend(endpoint._grant_types.keys())
-        claims.setdefault("token_endpoint_auth_methods_supported", ["client_secret_post", "client_secret_basic"])
-
-        self.validate_metadata(claims, "token_endpoint_auth_methods_supported", is_list=True)
-        self.validate_metadata(claims, "token_endpoint_auth_signing_alg_values_supported", is_list=True)
-        self.validate_metadata(claims, "token_endpoint", is_required=True, is_url=True)
-
-    def validate_metadata_authorization(self, claims, endpoint):
-        claims.setdefault("response_types_supported",
-                          list(filter(lambda x: x != "none", endpoint._response_types.keys())))
-        claims.setdefault("response_modes_supported", ["query", "fragment"])
-
-        # The OAuth2.0 Implicit flow is defined as a "grant type" but it is not
-        # using the "token" endpoint, as such, we have to add it explicitly to
-        # the list of "grant_types_supported" when enabled.
-        if "token" in claims["response_types_supported"]:
-            self._grant_types.append("implicit")
-
-        self.validate_metadata(claims, "response_types_supported", is_required=True, is_list=True)
-        self.validate_metadata(claims, "response_modes_supported", is_list=True)
-        if "code" in claims["response_types_supported"]:
-            code_grant = endpoint._response_types["code"]
-            if not isinstance(code_grant, grant_types.AuthorizationCodeGrant) and hasattr(code_grant, "default_grant"):
-                code_grant = code_grant.default_grant
-
-            claims.setdefault("code_challenge_methods_supported",
-                              list(code_grant._code_challenge_methods.keys()))
-            self.validate_metadata(claims, "code_challenge_methods_supported", is_list=True)
-        self.validate_metadata(claims, "authorization_endpoint", is_required=True, is_url=True)
-
-    def validate_metadata_revocation(self, claims, endpoint):
-        claims.setdefault("revocation_endpoint_auth_methods_supported",
-                          ["client_secret_post", "client_secret_basic"])
-
-        self.validate_metadata(claims, "revocation_endpoint_auth_methods_supported", is_list=True)
-        self.validate_metadata(claims, "revocation_endpoint_auth_signing_alg_values_supported", is_list=True)
-        self.validate_metadata(claims, "revocation_endpoint", is_required=True, is_url=True)
-
-    def validate_metadata_introspection(self, claims, endpoint):
-        claims.setdefault("introspection_endpoint_auth_methods_supported",
-                          ["client_secret_post", "client_secret_basic"])
-
-        self.validate_metadata(claims, "introspection_endpoint_auth_methods_supported", is_list=True)
-        self.validate_metadata(claims, "introspection_endpoint_auth_signing_alg_values_supported", is_list=True)
-        self.validate_metadata(claims, "introspection_endpoint", is_required=True, is_url=True)
-
-    def validate_metadata_server(self):
-        """
-        Authorization servers can have metadata describing their
-        configuration.  The following authorization server metadata values
-        are used by this specification. More details can be found in
-        `RFC8414 section 2`_ :
-
-       issuer
-          REQUIRED
-
-       authorization_endpoint
-          URL of the authorization server's authorization endpoint
-          [`RFC6749#Authorization`_].  This is REQUIRED unless no grant types are supported
-          that use the authorization endpoint.
-
-       token_endpoint
-          URL of the authorization server's token endpoint [`RFC6749#Token`_].  This
-          is REQUIRED unless only the implicit grant type is supported.
-
-       scopes_supported
-          RECOMMENDED.
-
-       response_types_supported
-          REQUIRED.
-
-       Other OPTIONAL fields:
-          jwks_uri,
-          registration_endpoint,
-          response_modes_supported
-
-       grant_types_supported
-          OPTIONAL.  JSON array containing a list of the OAuth 2.0 grant
-          type values that this authorization server supports.  The array
-          values used are the same as those used with the "grant_types"
-          parameter defined by "OAuth 2.0 Dynamic Client Registration
-          Protocol" [`RFC7591`_].  If omitted, the default value is
-          "["authorization_code", "implicit"]".
-
-       token_endpoint_auth_methods_supported
-
-       token_endpoint_auth_signing_alg_values_supported
-
-       service_documentation
-
-       ui_locales_supported
-
-       op_policy_uri
-
-       op_tos_uri
-
-       revocation_endpoint
-
-       revocation_endpoint_auth_methods_supported
-
-       revocation_endpoint_auth_signing_alg_values_supported
-
-       introspection_endpoint
-
-       introspection_endpoint_auth_methods_supported
-
-       introspection_endpoint_auth_signing_alg_values_supported
-
-       code_challenge_methods_supported
-
-       Additional authorization server metadata parameters MAY also be used.
-       Some are defined by other specifications, such as OpenID Connect
-       Discovery 1.0 [`OpenID.Discovery`_].
-
-        .. _`RFC8414 section 2`: https://tools.ietf.org/html/rfc8414#section-2
-        .. _`RFC6749#Authorization`: https://tools.ietf.org/html/rfc6749#section-3.1
-        .. _`RFC6749#Token`: https://tools.ietf.org/html/rfc6749#section-3.2
-        .. _`RFC7591`: https://tools.ietf.org/html/rfc7591
-        .. _`OpenID.Discovery`: https://openid.net/specs/openid-connect-discovery-1_0.html
-        """
-        claims = copy.deepcopy(self.initial_claims)
-        self.validate_metadata(claims, "issuer", is_required=True, is_issuer=True)
-        self.validate_metadata(claims, "jwks_uri", is_url=True)
-        self.validate_metadata(claims, "scopes_supported", is_list=True)
-        self.validate_metadata(claims, "service_documentation", is_url=True)
-        self.validate_metadata(claims, "ui_locales_supported", is_list=True)
-        self.validate_metadata(claims, "op_policy_uri", is_url=True)
-        self.validate_metadata(claims, "op_tos_uri", is_url=True)
-
-        self._grant_types = []
-        for endpoint in self.endpoints:
-            if isinstance(endpoint, TokenEndpoint):
-                self.validate_metadata_token(claims, endpoint)
-            if isinstance(endpoint, AuthorizationEndpoint):
-                self.validate_metadata_authorization(claims, endpoint)
-            if isinstance(endpoint, RevocationEndpoint):
-                self.validate_metadata_revocation(claims, endpoint)
-            if isinstance(endpoint, IntrospectEndpoint):
-                self.validate_metadata_introspection(claims, endpoint)
-
-        # "grant_types_supported" is a combination of all OAuth2 grant types
-        # allowed in the current provider implementation.
-        claims.setdefault("grant_types_supported", self._grant_types)
-        self.validate_metadata(claims, "grant_types_supported", is_list=True)
-        return claims
diff --git a/lib/oauthlib/oauth2/rfc6749/endpoints/pre_configured.py b/lib/oauthlib/oauth2/rfc6749/endpoints/pre_configured.py
deleted file mode 100644
index d64a1663..00000000
--- a/lib/oauthlib/oauth2/rfc6749/endpoints/pre_configured.py
+++ /dev/null
@@ -1,216 +0,0 @@
-"""
-oauthlib.oauth2.rfc6749.endpoints.pre_configured
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of various endpoints needed
-for providing OAuth 2.0 RFC6749 servers.
-"""
-from ..grant_types import (
-    AuthorizationCodeGrant, ClientCredentialsGrant, ImplicitGrant,
-    RefreshTokenGrant, ResourceOwnerPasswordCredentialsGrant,
-)
-from ..tokens import BearerToken
-from .authorization import AuthorizationEndpoint
-from .introspect import IntrospectEndpoint
-from .resource import ResourceEndpoint
-from .revocation import RevocationEndpoint
-from .token import TokenEndpoint
-
-
-class Server(AuthorizationEndpoint, IntrospectEndpoint, TokenEndpoint,
-             ResourceEndpoint, RevocationEndpoint):
-
-    """An all-in-one endpoint featuring all four major grant types."""
-
-    def __init__(self, request_validator, token_expires_in=None,
-                 token_generator=None, refresh_token_generator=None,
-                 *args, **kwargs):
-        """Construct a new all-grants-in-one server.
-
-        :param request_validator: An implementation of
-                                  oauthlib.oauth2.RequestValidator.
-        :param token_expires_in: An int or a function to generate a token
-                                 expiration offset (in seconds) given a
-                                 oauthlib.common.Request object.
-        :param token_generator: A function to generate a token from a request.
-        :param refresh_token_generator: A function to generate a token from a
-                                        request for the refresh token.
-        :param kwargs: Extra parameters to pass to authorization-,
-                       token-, resource-, and revocation-endpoint constructors.
-        """
-        self.auth_grant = AuthorizationCodeGrant(request_validator)
-        self.implicit_grant = ImplicitGrant(request_validator)
-        self.password_grant = ResourceOwnerPasswordCredentialsGrant(
-            request_validator)
-        self.credentials_grant = ClientCredentialsGrant(request_validator)
-        self.refresh_grant = RefreshTokenGrant(request_validator)
-
-        self.bearer = BearerToken(request_validator, token_generator,
-                             token_expires_in, refresh_token_generator)
-
-        AuthorizationEndpoint.__init__(self, default_response_type='code',
-                                       response_types={
-                                           'code': self.auth_grant,
-                                           'token': self.implicit_grant,
-                                           'none': self.auth_grant
-                                       },
-                                       default_token_type=self.bearer)
-
-        TokenEndpoint.__init__(self, default_grant_type='authorization_code',
-                               grant_types={
-                                   'authorization_code': self.auth_grant,
-                                   'password': self.password_grant,
-                                   'client_credentials': self.credentials_grant,
-                                   'refresh_token': self.refresh_grant,
-                               },
-                               default_token_type=self.bearer)
-        ResourceEndpoint.__init__(self, default_token='Bearer',
-                                  token_types={'Bearer': self.bearer})
-        RevocationEndpoint.__init__(self, request_validator)
-        IntrospectEndpoint.__init__(self, request_validator)
-
-
-class WebApplicationServer(AuthorizationEndpoint, IntrospectEndpoint, TokenEndpoint,
-                           ResourceEndpoint, RevocationEndpoint):
-
-    """An all-in-one endpoint featuring Authorization code grant and Bearer tokens."""
-
-    def __init__(self, request_validator, token_generator=None,
-                 token_expires_in=None, refresh_token_generator=None, **kwargs):
-        """Construct a new web application server.
-
-        :param request_validator: An implementation of
-                                  oauthlib.oauth2.RequestValidator.
-        :param token_expires_in: An int or a function to generate a token
-                                 expiration offset (in seconds) given a
-                                 oauthlib.common.Request object.
-        :param token_generator: A function to generate a token from a request.
-        :param refresh_token_generator: A function to generate a token from a
-                                        request for the refresh token.
-        :param kwargs: Extra parameters to pass to authorization-,
-                       token-, resource-, and revocation-endpoint constructors.
-        """
-        self.auth_grant = AuthorizationCodeGrant(request_validator)
-        self.refresh_grant = RefreshTokenGrant(request_validator)
-        self.bearer = BearerToken(request_validator, token_generator,
-                             token_expires_in, refresh_token_generator)
-        AuthorizationEndpoint.__init__(self, default_response_type='code',
-                                       response_types={'code': self.auth_grant},
-                                       default_token_type=self.bearer)
-        TokenEndpoint.__init__(self, default_grant_type='authorization_code',
-                               grant_types={
-                                   'authorization_code': self.auth_grant,
-                                   'refresh_token': self.refresh_grant,
-                               },
-                               default_token_type=self.bearer)
-        ResourceEndpoint.__init__(self, default_token='Bearer',
-                                  token_types={'Bearer': self.bearer})
-        RevocationEndpoint.__init__(self, request_validator)
-        IntrospectEndpoint.__init__(self, request_validator)
-
-
-class MobileApplicationServer(AuthorizationEndpoint, IntrospectEndpoint,
-                              ResourceEndpoint, RevocationEndpoint):
-
-    """An all-in-one endpoint featuring Implicit code grant and Bearer tokens."""
-
-    def __init__(self, request_validator, token_generator=None,
-                 token_expires_in=None, refresh_token_generator=None, **kwargs):
-        """Construct a new implicit grant server.
-
-        :param request_validator: An implementation of
-                                  oauthlib.oauth2.RequestValidator.
-        :param token_expires_in: An int or a function to generate a token
-                                 expiration offset (in seconds) given a
-                                 oauthlib.common.Request object.
-        :param token_generator: A function to generate a token from a request.
-        :param refresh_token_generator: A function to generate a token from a
-                                        request for the refresh token.
-        :param kwargs: Extra parameters to pass to authorization-,
-                       token-, resource-, and revocation-endpoint constructors.
-        """
-        self.implicit_grant = ImplicitGrant(request_validator)
-        self.bearer = BearerToken(request_validator, token_generator,
-                             token_expires_in, refresh_token_generator)
-        AuthorizationEndpoint.__init__(self, default_response_type='token',
-                                       response_types={
-                                           'token': self.implicit_grant},
-                                       default_token_type=self.bearer)
-        ResourceEndpoint.__init__(self, default_token='Bearer',
-                                  token_types={'Bearer': self.bearer})
-        RevocationEndpoint.__init__(self, request_validator,
-                                    supported_token_types=['access_token'])
-        IntrospectEndpoint.__init__(self, request_validator,
-                                    supported_token_types=['access_token'])
-
-
-class LegacyApplicationServer(TokenEndpoint, IntrospectEndpoint,
-                              ResourceEndpoint, RevocationEndpoint):
-
-    """An all-in-one endpoint featuring Resource Owner Password Credentials grant and Bearer tokens."""
-
-    def __init__(self, request_validator, token_generator=None,
-                 token_expires_in=None, refresh_token_generator=None, **kwargs):
-        """Construct a resource owner password credentials grant server.
-
-        :param request_validator: An implementation of
-                                  oauthlib.oauth2.RequestValidator.
-        :param token_expires_in: An int or a function to generate a token
-                                 expiration offset (in seconds) given a
-                                 oauthlib.common.Request object.
-        :param token_generator: A function to generate a token from a request.
-        :param refresh_token_generator: A function to generate a token from a
-                                        request for the refresh token.
-        :param kwargs: Extra parameters to pass to authorization-,
-                       token-, resource-, and revocation-endpoint constructors.
-        """
-        self.password_grant = ResourceOwnerPasswordCredentialsGrant(
-            request_validator)
-        self.refresh_grant = RefreshTokenGrant(request_validator)
-        self.bearer = BearerToken(request_validator, token_generator,
-                             token_expires_in, refresh_token_generator)
-        TokenEndpoint.__init__(self, default_grant_type='password',
-                               grant_types={
-                                   'password': self.password_grant,
-                                   'refresh_token': self.refresh_grant,
-                               },
-                               default_token_type=self.bearer)
-        ResourceEndpoint.__init__(self, default_token='Bearer',
-                                  token_types={'Bearer': self.bearer})
-        RevocationEndpoint.__init__(self, request_validator)
-        IntrospectEndpoint.__init__(self, request_validator)
-
-
-class BackendApplicationServer(TokenEndpoint, IntrospectEndpoint,
-                               ResourceEndpoint, RevocationEndpoint):
-
-    """An all-in-one endpoint featuring Client Credentials grant and Bearer tokens."""
-
-    def __init__(self, request_validator, token_generator=None,
-                 token_expires_in=None, refresh_token_generator=None, **kwargs):
-        """Construct a client credentials grant server.
-
-        :param request_validator: An implementation of
-                                  oauthlib.oauth2.RequestValidator.
-        :param token_expires_in: An int or a function to generate a token
-                                 expiration offset (in seconds) given a
-                                 oauthlib.common.Request object.
-        :param token_generator: A function to generate a token from a request.
-        :param refresh_token_generator: A function to generate a token from a
-                                        request for the refresh token.
-        :param kwargs: Extra parameters to pass to authorization-,
-                       token-, resource-, and revocation-endpoint constructors.
-        """
-        self.credentials_grant = ClientCredentialsGrant(request_validator)
-        self.bearer = BearerToken(request_validator, token_generator,
-                             token_expires_in, refresh_token_generator)
-        TokenEndpoint.__init__(self, default_grant_type='client_credentials',
-                               grant_types={
-                                   'client_credentials': self.credentials_grant},
-                               default_token_type=self.bearer)
-        ResourceEndpoint.__init__(self, default_token='Bearer',
-                                  token_types={'Bearer': self.bearer})
-        RevocationEndpoint.__init__(self, request_validator,
-                                    supported_token_types=['access_token'])
-        IntrospectEndpoint.__init__(self, request_validator,
-                                    supported_token_types=['access_token'])
diff --git a/lib/oauthlib/oauth2/rfc6749/endpoints/resource.py b/lib/oauthlib/oauth2/rfc6749/endpoints/resource.py
deleted file mode 100644
index f7562255..00000000
--- a/lib/oauthlib/oauth2/rfc6749/endpoints/resource.py
+++ /dev/null
@@ -1,84 +0,0 @@
-"""
-oauthlib.oauth2.rfc6749
-~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of various logic needed
-for consuming and providing OAuth 2.0 RFC6749.
-"""
-import logging
-
-from oauthlib.common import Request
-
-from .base import BaseEndpoint, catch_errors_and_unavailability
-
-log = logging.getLogger(__name__)
-
-
-class ResourceEndpoint(BaseEndpoint):
-
-    """Authorizes access to protected resources.
-
-    The client accesses protected resources by presenting the access
-    token to the resource server.  The resource server MUST validate the
-    access token and ensure that it has not expired and that its scope
-    covers the requested resource.  The methods used by the resource
-    server to validate the access token (as well as any error responses)
-    are beyond the scope of this specification but generally involve an
-    interaction or coordination between the resource server and the
-    authorization server::
-
-        # For most cases, returning a 403 should suffice.
-
-    The method in which the client utilizes the access token to
-    authenticate with the resource server depends on the type of access
-    token issued by the authorization server.  Typically, it involves
-    using the HTTP "Authorization" request header field [RFC2617] with an
-    authentication scheme defined by the specification of the access
-    token type used, such as [RFC6750]::
-
-        # Access tokens may also be provided in query and body
-        https://example.com/protected?access_token=kjfch2345sdf   # Query
-        access_token=sdf23409df   # Body
-    """
-
-    def __init__(self, default_token, token_types):
-        BaseEndpoint.__init__(self)
-        self._tokens = token_types
-        self._default_token = default_token
-
-    @property
-    def default_token(self):
-        return self._default_token
-
-    @property
-    def default_token_type_handler(self):
-        return self.tokens.get(self.default_token)
-
-    @property
-    def tokens(self):
-        return self._tokens
-
-    @catch_errors_and_unavailability
-    def verify_request(self, uri, http_method='GET', body=None, headers=None,
-                       scopes=None):
-        """Validate client, code etc, return body + headers"""
-        request = Request(uri, http_method, body, headers)
-        request.token_type = self.find_token_type(request)
-        request.scopes = scopes
-        token_type_handler = self.tokens.get(request.token_type,
-                                             self.default_token_type_handler)
-        log.debug('Dispatching token_type %s request to %r.',
-                  request.token_type, token_type_handler)
-        return token_type_handler.validate_request(request), request
-
-    def find_token_type(self, request):
-        """Token type identification.
-
-        RFC 6749 does not provide a method for easily differentiating between
-        different token types during protected resource access. We estimate
-        the most likely token type (if any) by asking each known token type
-        to give an estimation based on the request.
-        """
-        estimates = sorted(((t.estimate_type(request), n)
-                            for n, t in self.tokens.items()), reverse=True)
-        return estimates[0][1] if len(estimates) else None
diff --git a/lib/oauthlib/oauth2/rfc6749/endpoints/revocation.py b/lib/oauthlib/oauth2/rfc6749/endpoints/revocation.py
deleted file mode 100644
index 596d0860..00000000
--- a/lib/oauthlib/oauth2/rfc6749/endpoints/revocation.py
+++ /dev/null
@@ -1,126 +0,0 @@
-"""
-oauthlib.oauth2.rfc6749.endpoint.revocation
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-An implementation of the OAuth 2 `Token Revocation`_ spec (draft 11).
-
-.. _`Token Revocation`: https://tools.ietf.org/html/draft-ietf-oauth-revocation-11
-"""
-import logging
-
-from oauthlib.common import Request
-
-from ..errors import OAuth2Error
-from .base import BaseEndpoint, catch_errors_and_unavailability
-
-log = logging.getLogger(__name__)
-
-
-class RevocationEndpoint(BaseEndpoint):
-
-    """Token revocation endpoint.
-
-    Endpoint used by authenticated clients to revoke access and refresh tokens.
-    Commonly this will be part of the Authorization Endpoint.
-    """
-
-    valid_token_types = ('access_token', 'refresh_token')
-    valid_request_methods = ('POST',)
-
-    def __init__(self, request_validator, supported_token_types=None,
-            enable_jsonp=False):
-        BaseEndpoint.__init__(self)
-        self.request_validator = request_validator
-        self.supported_token_types = (
-            supported_token_types or self.valid_token_types)
-        self.enable_jsonp = enable_jsonp
-
-    @catch_errors_and_unavailability
-    def create_revocation_response(self, uri, http_method='POST', body=None,
-                                   headers=None):
-        """Revoke supplied access or refresh token.
-
-
-        The authorization server responds with HTTP status code 200 if the
-        token has been revoked successfully or if the client submitted an
-        invalid token.
-
-        Note: invalid tokens do not cause an error response since the client
-        cannot handle such an error in a reasonable way.  Moreover, the purpose
-        of the revocation request, invalidating the particular token, is
-        already achieved.
-
-        The content of the response body is ignored by the client as all
-        necessary information is conveyed in the response code.
-
-        An invalid token type hint value is ignored by the authorization server
-        and does not influence the revocation response.
-        """
-        resp_headers = {
-            'Content-Type': 'application/json',
-            'Cache-Control': 'no-store',
-            'Pragma': 'no-cache',
-        }
-        request = Request(
-            uri, http_method=http_method, body=body, headers=headers)
-        try:
-            self.validate_revocation_request(request)
-            log.debug('Token revocation valid for %r.', request)
-        except OAuth2Error as e:
-            log.debug('Client error during validation of %r. %r.', request, e)
-            response_body = e.json
-            if self.enable_jsonp and request.callback:
-                response_body = '{}({});'.format(request.callback, response_body)
-            resp_headers.update(e.headers)
-            return resp_headers, response_body, e.status_code
-
-        self.request_validator.revoke_token(request.token,
-                                            request.token_type_hint, request)
-
-        response_body = ''
-        if self.enable_jsonp and request.callback:
-            response_body = request.callback + '();'
-        return {}, response_body, 200
-
-    def validate_revocation_request(self, request):
-        """Ensure the request is valid.
-
-        The client constructs the request by including the following parameters
-        using the "application/x-www-form-urlencoded" format in the HTTP
-        request entity-body:
-
-        token (REQUIRED).  The token that the client wants to get revoked.
-
-        token_type_hint (OPTIONAL).  A hint about the type of the token
-        submitted for revocation.  Clients MAY pass this parameter in order to
-        help the authorization server to optimize the token lookup.  If the
-        server is unable to locate the token using the given hint, it MUST
-        extend its search across all of its supported token types.  An
-        authorization server MAY ignore this parameter, particularly if it is
-        able to detect the token type automatically.  This specification
-        defines two such values:
-
-                *  access_token: An Access Token as defined in [RFC6749],
-                    `section 1.4`_
-
-                *  refresh_token: A Refresh Token as defined in [RFC6749],
-                    `section 1.5`_
-
-                Specific implementations, profiles, and extensions of this
-                specification MAY define other values for this parameter using
-                the registry defined in `Section 4.1.2`_.
-
-        The client also includes its authentication credentials as described in
-        `Section 2.3`_. of [`RFC6749`_].
-
-        .. _`section 1.4`: https://tools.ietf.org/html/rfc6749#section-1.4
-        .. _`section 1.5`: https://tools.ietf.org/html/rfc6749#section-1.5
-        .. _`section 2.3`: https://tools.ietf.org/html/rfc6749#section-2.3
-        .. _`Section 4.1.2`: https://tools.ietf.org/html/draft-ietf-oauth-revocation-11#section-4.1.2
-        .. _`RFC6749`: https://tools.ietf.org/html/rfc6749
-        """
-        self._raise_on_bad_method(request)
-        self._raise_on_bad_post_request(request)
-        self._raise_on_missing_token(request)
-        self._raise_on_invalid_client(request)
-        self._raise_on_unsupported_token(request)
diff --git a/lib/oauthlib/oauth2/rfc6749/endpoints/token.py b/lib/oauthlib/oauth2/rfc6749/endpoints/token.py
deleted file mode 100644
index ab9e0918..00000000
--- a/lib/oauthlib/oauth2/rfc6749/endpoints/token.py
+++ /dev/null
@@ -1,119 +0,0 @@
-"""
-oauthlib.oauth2.rfc6749
-~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of various logic needed
-for consuming and providing OAuth 2.0 RFC6749.
-"""
-import logging
-
-from oauthlib.common import Request
-from oauthlib.oauth2.rfc6749 import utils
-
-from .base import BaseEndpoint, catch_errors_and_unavailability
-
-log = logging.getLogger(__name__)
-
-
-class TokenEndpoint(BaseEndpoint):
-
-    """Token issuing endpoint.
-
-    The token endpoint is used by the client to obtain an access token by
-    presenting its authorization grant or refresh token.  The token
-    endpoint is used with every authorization grant except for the
-    implicit grant type (since an access token is issued directly).
-
-    The means through which the client obtains the location of the token
-    endpoint are beyond the scope of this specification, but the location
-    is typically provided in the service documentation.
-
-    The endpoint URI MAY include an "application/x-www-form-urlencoded"
-    formatted (per `Appendix B`_) query component,
-    which MUST be retained when adding additional query parameters.  The
-    endpoint URI MUST NOT include a fragment component::
-
-        https://example.com/path?query=component             # OK
-        https://example.com/path?query=component#fragment    # Not OK
-
-    Since requests to the token endpoint result in the transmission of
-    clear-text credentials (in the HTTP request and response), the
-    authorization server MUST require the use of TLS as described in
-    Section 1.6 when sending requests to the token endpoint::
-
-        # We will deny any request which URI schema is not with https
-
-    The client MUST use the HTTP "POST" method when making access token
-    requests::
-
-        # HTTP method is currently not enforced
-
-    Parameters sent without a value MUST be treated as if they were
-    omitted from the request.  The authorization server MUST ignore
-    unrecognized request parameters.  Request and response parameters
-    MUST NOT be included more than once::
-
-        # Delegated to each grant type.
-
-    .. _`Appendix B`: https://tools.ietf.org/html/rfc6749#appendix-B
-    """
-
-    valid_request_methods = ('POST',)
-
-    def __init__(self, default_grant_type, default_token_type, grant_types):
-        BaseEndpoint.__init__(self)
-        self._grant_types = grant_types
-        self._default_token_type = default_token_type
-        self._default_grant_type = default_grant_type
-
-    @property
-    def grant_types(self):
-        return self._grant_types
-
-    @property
-    def default_grant_type(self):
-        return self._default_grant_type
-
-    @property
-    def default_grant_type_handler(self):
-        return self.grant_types.get(self.default_grant_type)
-
-    @property
-    def default_token_type(self):
-        return self._default_token_type
-
-    @catch_errors_and_unavailability
-    def create_token_response(self, uri, http_method='POST', body=None,
-                              headers=None, credentials=None, grant_type_for_scope=None,
-                              claims=None):
-        """Extract grant_type and route to the designated handler."""
-        request = Request(
-            uri, http_method=http_method, body=body, headers=headers)
-        self.validate_token_request(request)
-        # 'scope' is an allowed Token Request param in both the "Resource Owner Password Credentials Grant"
-        # and "Client Credentials Grant" flows
-        # https://tools.ietf.org/html/rfc6749#section-4.3.2
-        # https://tools.ietf.org/html/rfc6749#section-4.4.2
-        request.scopes = utils.scope_to_list(request.scope)
-
-        request.extra_credentials = credentials
-        if grant_type_for_scope:
-            request.grant_type = grant_type_for_scope
-
-        # OpenID Connect claims, if provided.  The server using oauthlib might choose
-        # to implement the claims parameter of the Authorization Request.  In this case
-        # it should retrieve those claims and pass them via the claims argument here,
-        # as a dict.
-        if claims:
-            request.claims = claims
-
-        grant_type_handler = self.grant_types.get(request.grant_type,
-                                                  self.default_grant_type_handler)
-        log.debug('Dispatching grant_type %s request to %r.',
-                  request.grant_type, grant_type_handler)
-        return grant_type_handler.create_token_response(
-            request, self.default_token_type)
-
-    def validate_token_request(self, request):
-        self._raise_on_bad_method(request)
-        self._raise_on_bad_post_request(request)
diff --git a/lib/oauthlib/oauth2/rfc6749/errors.py b/lib/oauthlib/oauth2/rfc6749/errors.py
deleted file mode 100644
index da24feab..00000000
--- a/lib/oauthlib/oauth2/rfc6749/errors.py
+++ /dev/null
@@ -1,400 +0,0 @@
-"""
-oauthlib.oauth2.rfc6749.errors
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Error used both by OAuth 2 clients and providers to represent the spec
-defined error responses for all four core grant types.
-"""
-import json
-
-from oauthlib.common import add_params_to_uri, urlencode
-
-
-class OAuth2Error(Exception):
-    error = None
-    status_code = 400
-    description = ''
-
-    def __init__(self, description=None, uri=None, state=None,
-                 status_code=None, request=None):
-        """
-        :param description: A human-readable ASCII [USASCII] text providing
-                            additional information, used to assist the client
-                            developer in understanding the error that occurred.
-                            Values for the "error_description" parameter
-                            MUST NOT include characters outside the set
-                            x20-21 / x23-5B / x5D-7E.
-
-        :param uri: A URI identifying a human-readable web page with information
-                    about the error, used to provide the client developer with
-                    additional information about the error.  Values for the
-                    "error_uri" parameter MUST conform to the URI- Reference
-                    syntax, and thus MUST NOT include characters outside the set
-                    x21 / x23-5B / x5D-7E.
-
-        :param state: A CSRF protection value received from the client.
-
-        :param status_code:
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        """
-        if description is not None:
-            self.description = description
-
-        message = '({}) {}'.format(self.error, self.description)
-        if request:
-            message += ' ' + repr(request)
-        super().__init__(message)
-
-        self.uri = uri
-        self.state = state
-
-        if status_code:
-            self.status_code = status_code
-
-        if request:
-            self.redirect_uri = request.redirect_uri
-            self.client_id = request.client_id
-            self.scopes = request.scopes
-            self.response_type = request.response_type
-            self.response_mode = request.response_mode
-            self.grant_type = request.grant_type
-            if not state:
-                self.state = request.state
-        else:
-            self.redirect_uri = None
-            self.client_id = None
-            self.scopes = None
-            self.response_type = None
-            self.response_mode = None
-            self.grant_type = None
-
-    def in_uri(self, uri):
-        fragment = self.response_mode == "fragment"
-        return add_params_to_uri(uri, self.twotuples, fragment)
-
-    @property
-    def twotuples(self):
-        error = [('error', self.error)]
-        if self.description:
-            error.append(('error_description', self.description))
-        if self.uri:
-            error.append(('error_uri', self.uri))
-        if self.state:
-            error.append(('state', self.state))
-        return error
-
-    @property
-    def urlencoded(self):
-        return urlencode(self.twotuples)
-
-    @property
-    def json(self):
-        return json.dumps(dict(self.twotuples))
-
-    @property
-    def headers(self):
-        if self.status_code == 401:
-            """
-            https://tools.ietf.org/html/rfc6750#section-3
-
-            All challenges defined by this specification MUST use the auth-scheme
-            value "Bearer".  This scheme MUST be followed by one or more
-            auth-param values.
-            """
-            authvalues = ['error="{}"'.format(self.error)]
-            if self.description:
-                authvalues.append('error_description="{}"'.format(self.description))
-            if self.uri:
-                authvalues.append('error_uri="{}"'.format(self.uri))
-            return {"WWW-Authenticate": "Bearer " + ", ".join(authvalues)}
-        return {}
-
-
-class TokenExpiredError(OAuth2Error):
-    error = 'token_expired'
-
-
-class InsecureTransportError(OAuth2Error):
-    error = 'insecure_transport'
-    description = 'OAuth 2 MUST utilize https.'
-
-
-class MismatchingStateError(OAuth2Error):
-    error = 'mismatching_state'
-    description = 'CSRF Warning! State not equal in request and response.'
-
-
-class MissingCodeError(OAuth2Error):
-    error = 'missing_code'
-
-
-class MissingTokenError(OAuth2Error):
-    error = 'missing_token'
-
-
-class MissingTokenTypeError(OAuth2Error):
-    error = 'missing_token_type'
-
-
-class FatalClientError(OAuth2Error):
-    """
-    Errors during authorization where user should not be redirected back.
-
-    If the request fails due to a missing, invalid, or mismatching
-    redirection URI, or if the client identifier is missing or invalid,
-    the authorization server SHOULD inform the resource owner of the
-    error and MUST NOT automatically redirect the user-agent to the
-    invalid redirection URI.
-
-    Instead the user should be informed of the error by the provider itself.
-    """
-    pass
-
-
-class InvalidRequestFatalError(FatalClientError):
-    """
-    For fatal errors, the request is missing a required parameter, includes
-    an invalid parameter value, includes a parameter more than once, or is
-    otherwise malformed.
-    """
-    error = 'invalid_request'
-
-
-class InvalidRedirectURIError(InvalidRequestFatalError):
-    description = 'Invalid redirect URI.'
-
-
-class MissingRedirectURIError(InvalidRequestFatalError):
-    description = 'Missing redirect URI.'
-
-
-class MismatchingRedirectURIError(InvalidRequestFatalError):
-    description = 'Mismatching redirect URI.'
-
-
-class InvalidClientIdError(InvalidRequestFatalError):
-    description = 'Invalid client_id parameter value.'
-
-
-class MissingClientIdError(InvalidRequestFatalError):
-    description = 'Missing client_id parameter.'
-
-
-class InvalidRequestError(OAuth2Error):
-    """
-    The request is missing a required parameter, includes an invalid
-    parameter value, includes a parameter more than once, or is
-    otherwise malformed.
-    """
-    error = 'invalid_request'
-
-
-class MissingResponseTypeError(InvalidRequestError):
-    description = 'Missing response_type parameter.'
-
-
-class MissingCodeChallengeError(InvalidRequestError):
-    """
-    If the server requires Proof Key for Code Exchange (PKCE) by OAuth
-    public clients and the client does not send the "code_challenge" in
-    the request, the authorization endpoint MUST return the authorization
-    error response with the "error" value set to "invalid_request".  The
-    "error_description" or the response of "error_uri" SHOULD explain the
-    nature of error, e.g., code challenge required.
-    """
-    description = 'Code challenge required.'
-
-
-class MissingCodeVerifierError(InvalidRequestError):
-    """
-    The request to the token endpoint, when PKCE is enabled, has
-    the parameter `code_verifier` REQUIRED.
-    """
-    description = 'Code verifier required.'
-
-
-class AccessDeniedError(OAuth2Error):
-    """
-    The resource owner or authorization server denied the request.
-    """
-    error = 'access_denied'
-
-
-class UnsupportedResponseTypeError(OAuth2Error):
-    """
-    The authorization server does not support obtaining an authorization
-    code using this method.
-    """
-    error = 'unsupported_response_type'
-
-
-class UnsupportedCodeChallengeMethodError(InvalidRequestError):
-    """
-    If the server supporting PKCE does not support the requested
-    transformation, the authorization endpoint MUST return the
-    authorization error response with "error" value set to
-    "invalid_request".  The "error_description" or the response of
-    "error_uri" SHOULD explain the nature of error, e.g., transform
-    algorithm not supported.
-    """
-    description = 'Transform algorithm not supported.'
-
-
-class InvalidScopeError(OAuth2Error):
-    """
-    The requested scope is invalid, unknown, or malformed, or
-    exceeds the scope granted by the resource owner.
-
-    https://tools.ietf.org/html/rfc6749#section-5.2
-    """
-    error = 'invalid_scope'
-
-
-class ServerError(OAuth2Error):
-    """
-    The authorization server encountered an unexpected condition that
-    prevented it from fulfilling the request.  (This error code is needed
-    because a 500 Internal Server Error HTTP status code cannot be returned
-    to the client via a HTTP redirect.)
-    """
-    error = 'server_error'
-
-
-class TemporarilyUnavailableError(OAuth2Error):
-    """
-    The authorization server is currently unable to handle the request
-    due to a temporary overloading or maintenance of the server.
-    (This error code is needed because a 503 Service Unavailable HTTP
-    status code cannot be returned to the client via a HTTP redirect.)
-    """
-    error = 'temporarily_unavailable'
-
-
-class InvalidClientError(FatalClientError):
-    """
-    Client authentication failed (e.g. unknown client, no client
-    authentication included, or unsupported authentication method).
-    The authorization server MAY return an HTTP 401 (Unauthorized) status
-    code to indicate which HTTP authentication schemes are supported.
-    If the client attempted to authenticate via the "Authorization" request
-    header field, the authorization server MUST respond with an
-    HTTP 401 (Unauthorized) status code, and include the "WWW-Authenticate"
-    response header field matching the authentication scheme used by the
-    client.
-    """
-    error = 'invalid_client'
-    status_code = 401
-
-
-class InvalidGrantError(OAuth2Error):
-    """
-    The provided authorization grant (e.g. authorization code, resource
-    owner credentials) or refresh token is invalid, expired, revoked, does
-    not match the redirection URI used in the authorization request, or was
-    issued to another client.
-
-    https://tools.ietf.org/html/rfc6749#section-5.2
-    """
-    error = 'invalid_grant'
-    status_code = 400
-
-
-class UnauthorizedClientError(OAuth2Error):
-    """
-    The authenticated client is not authorized to use this authorization
-    grant type.
-    """
-    error = 'unauthorized_client'
-
-
-class UnsupportedGrantTypeError(OAuth2Error):
-    """
-    The authorization grant type is not supported by the authorization
-    server.
-    """
-    error = 'unsupported_grant_type'
-
-
-class UnsupportedTokenTypeError(OAuth2Error):
-    """
-    The authorization server does not support the hint of the
-    presented token type.  I.e. the client tried to revoke an access token
-    on a server not supporting this feature.
-    """
-    error = 'unsupported_token_type'
-
-
-class InvalidTokenError(OAuth2Error):
-    """
-    The access token provided is expired, revoked, malformed, or
-    invalid for other reasons.  The resource SHOULD respond with
-    the HTTP 401 (Unauthorized) status code.  The client MAY
-    request a new access token and retry the protected resource
-    request.
-    """
-    error = 'invalid_token'
-    status_code = 401
-    description = ("The access token provided is expired, revoked, malformed, "
-                   "or invalid for other reasons.")
-
-
-class InsufficientScopeError(OAuth2Error):
-    """
-    The request requires higher privileges than provided by the
-    access token.  The resource server SHOULD respond with the HTTP
-    403 (Forbidden) status code and MAY include the "scope"
-    attribute with the scope necessary to access the protected
-    resource.
-    """
-    error = 'insufficient_scope'
-    status_code = 403
-    description = ("The request requires higher privileges than provided by "
-                   "the access token.")
-
-
-class ConsentRequired(OAuth2Error):
-    """
-    The Authorization Server requires End-User consent.
-
-    This error MAY be returned when the prompt parameter value in the
-    Authentication Request is none, but the Authentication Request cannot be
-    completed without displaying a user interface for End-User consent.
-    """
-    error = 'consent_required'
-
-
-class LoginRequired(OAuth2Error):
-    """
-    The Authorization Server requires End-User authentication.
-
-    This error MAY be returned when the prompt parameter value in the
-    Authentication Request is none, but the Authentication Request cannot be
-    completed without displaying a user interface for End-User authentication.
-    """
-    error = 'login_required'
-
-
-class CustomOAuth2Error(OAuth2Error):
-    """
-    This error is a placeholder for all custom errors not described by the RFC.
-    Some of the popular OAuth2 providers are using custom errors.
-    """
-    def __init__(self, error, *args, **kwargs):
-        self.error = error
-        super().__init__(*args, **kwargs)
-
-
-def raise_from_error(error, params=None):
-    import inspect
-    import sys
-    kwargs = {
-        'description': params.get('error_description'),
-        'uri': params.get('error_uri'),
-        'state': params.get('state')
-    }
-    for _, cls in inspect.getmembers(sys.modules[__name__], inspect.isclass):
-        if cls.error == error:
-            raise cls(**kwargs)
-    raise CustomOAuth2Error(error=error, **kwargs)
diff --git a/lib/oauthlib/oauth2/rfc6749/grant_types/__init__.py b/lib/oauthlib/oauth2/rfc6749/grant_types/__init__.py
deleted file mode 100644
index eb88cfc2..00000000
--- a/lib/oauthlib/oauth2/rfc6749/grant_types/__init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
-"""
-oauthlib.oauth2.rfc6749.grant_types
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-"""
-from .authorization_code import AuthorizationCodeGrant
-from .client_credentials import ClientCredentialsGrant
-from .implicit import ImplicitGrant
-from .refresh_token import RefreshTokenGrant
-from .resource_owner_password_credentials import (
-    ResourceOwnerPasswordCredentialsGrant,
-)
diff --git a/lib/oauthlib/oauth2/rfc6749/grant_types/authorization_code.py b/lib/oauthlib/oauth2/rfc6749/grant_types/authorization_code.py
deleted file mode 100644
index 858855a1..00000000
--- a/lib/oauthlib/oauth2/rfc6749/grant_types/authorization_code.py
+++ /dev/null
@@ -1,548 +0,0 @@
-"""
-oauthlib.oauth2.rfc6749.grant_types
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-"""
-import base64
-import hashlib
-import json
-import logging
-
-from oauthlib import common
-
-from .. import errors
-from .base import GrantTypeBase
-
-log = logging.getLogger(__name__)
-
-
-def code_challenge_method_s256(verifier, challenge):
-    """
-    If the "code_challenge_method" from `Section 4.3`_ was "S256", the
-    received "code_verifier" is hashed by SHA-256, base64url-encoded, and
-    then compared to the "code_challenge", i.e.:
-
-    BASE64URL-ENCODE(SHA256(ASCII(code_verifier))) == code_challenge
-
-    How to implement a base64url-encoding
-    function without padding, based upon the standard base64-encoding
-    function that uses padding.
-
-    To be concrete, example C# code implementing these functions is shown
-    below.  Similar code could be used in other languages.
-
-    static string base64urlencode(byte [] arg)
-    {
-        string s = Convert.ToBase64String(arg); // Regular base64 encoder
-        s = s.Split('=')[0]; // Remove any trailing '='s
-        s = s.Replace('+', '-'); // 62nd char of encoding
-        s = s.Replace('/', '_'); // 63rd char of encoding
-        return s;
-    }
-
-    In python urlsafe_b64encode is already replacing '+' and '/', but preserve
-    the trailing '='. So we have to remove it.
-
-    .. _`Section 4.3`: https://tools.ietf.org/html/rfc7636#section-4.3
-    """
-    return base64.urlsafe_b64encode(
-        hashlib.sha256(verifier.encode()).digest()
-    ).decode().rstrip('=') == challenge
-
-
-def code_challenge_method_plain(verifier, challenge):
-    """
-    If the "code_challenge_method" from `Section 4.3`_ was "plain", they are
-    compared directly, i.e.:
-
-    code_verifier == code_challenge.
-
-    .. _`Section 4.3`: https://tools.ietf.org/html/rfc7636#section-4.3
-    """
-    return verifier == challenge
-
-
-class AuthorizationCodeGrant(GrantTypeBase):
-
-    """`Authorization Code Grant`_
-
-    The authorization code grant type is used to obtain both access
-    tokens and refresh tokens and is optimized for confidential clients.
-    Since this is a redirection-based flow, the client must be capable of
-    interacting with the resource owner's user-agent (typically a web
-    browser) and capable of receiving incoming requests (via redirection)
-    from the authorization server::
-
-        +----------+
-        | Resource |
-        |   Owner  |
-        |          |
-        +----------+
-             ^
-             |
-            (B)
-        +----|-----+          Client Identifier      +---------------+
-        |         -+----(A)-- & Redirection URI ---->|               |
-        |  User-   |                                 | Authorization |
-        |  Agent  -+----(B)-- User authenticates --->|     Server    |
-        |          |                                 |               |
-        |         -+----(C)-- Authorization Code ---<|               |
-        +-|----|---+                                 +---------------+
-          |    |                                         ^      v
-         (A)  (C)                                        |      |
-          |    |                                         |      |
-          ^    v                                         |      |
-        +---------+                                      |      |
-        |         |>---(D)-- Authorization Code ---------'      |
-        |  Client |          & Redirection URI                  |
-        |         |                                             |
-        |         |<---(E)----- Access Token -------------------'
-        +---------+       (w/ Optional Refresh Token)
-
-    Note: The lines illustrating steps (A), (B), and (C) are broken into
-    two parts as they pass through the user-agent.
-
-    Figure 3: Authorization Code Flow
-
-    The flow illustrated in Figure 3 includes the following steps:
-
-    (A)  The client initiates the flow by directing the resource owner's
-         user-agent to the authorization endpoint.  The client includes
-         its client identifier, requested scope, local state, and a
-         redirection URI to which the authorization server will send the
-         user-agent back once access is granted (or denied).
-
-    (B)  The authorization server authenticates the resource owner (via
-         the user-agent) and establishes whether the resource owner
-         grants or denies the client's access request.
-
-    (C)  Assuming the resource owner grants access, the authorization
-         server redirects the user-agent back to the client using the
-         redirection URI provided earlier (in the request or during
-         client registration).  The redirection URI includes an
-         authorization code and any local state provided by the client
-         earlier.
-
-    (D)  The client requests an access token from the authorization
-         server's token endpoint by including the authorization code
-         received in the previous step.  When making the request, the
-         client authenticates with the authorization server.  The client
-         includes the redirection URI used to obtain the authorization
-         code for verification.
-
-    (E)  The authorization server authenticates the client, validates the
-         authorization code, and ensures that the redirection URI
-         received matches the URI used to redirect the client in
-         step (C).  If valid, the authorization server responds back with
-         an access token and, optionally, a refresh token.
-
-    OAuth 2.0 public clients utilizing the Authorization Code Grant are
-    susceptible to the authorization code interception attack.
-
-    A technique to mitigate against the threat through the use of Proof Key for Code
-    Exchange (PKCE, pronounced "pixy") is implemented in the current oauthlib
-    implementation.
-
-    .. _`Authorization Code Grant`: https://tools.ietf.org/html/rfc6749#section-4.1
-    .. _`PKCE`: https://tools.ietf.org/html/rfc7636
-    """
-
-    default_response_mode = 'query'
-    response_types = ['code']
-
-    # This dict below is private because as RFC mention it:
-    # "S256" is Mandatory To Implement (MTI) on the server.
-    #
-    _code_challenge_methods = {
-        'plain': code_challenge_method_plain,
-        'S256': code_challenge_method_s256
-    }
-
-    def create_authorization_code(self, request):
-        """
-        Generates an authorization grant represented as a dictionary.
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        """
-        grant = {'code': common.generate_token()}
-        if hasattr(request, 'state') and request.state:
-            grant['state'] = request.state
-        log.debug('Created authorization code grant %r for request %r.',
-                  grant, request)
-        return grant
-
-    def create_authorization_response(self, request, token_handler):
-        """
-        The client constructs the request URI by adding the following
-        parameters to the query component of the authorization endpoint URI
-        using the "application/x-www-form-urlencoded" format, per `Appendix B`_:
-
-        response_type
-                REQUIRED.  Value MUST be set to "code" for standard OAuth2
-                authorization flow.  For OpenID Connect it must be one of
-                "code token", "code id_token", or "code token id_token" - we
-                essentially test that "code" appears in the response_type.
-        client_id
-                REQUIRED.  The client identifier as described in `Section 2.2`_.
-        redirect_uri
-                OPTIONAL.  As described in `Section 3.1.2`_.
-        scope
-                OPTIONAL.  The scope of the access request as described by
-                `Section 3.3`_.
-        state
-                RECOMMENDED.  An opaque value used by the client to maintain
-                state between the request and callback.  The authorization
-                server includes this value when redirecting the user-agent back
-                to the client.  The parameter SHOULD be used for preventing
-                cross-site request forgery as described in `Section 10.12`_.
-
-        The client directs the resource owner to the constructed URI using an
-        HTTP redirection response, or by other means available to it via the
-        user-agent.
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :param token_handler: A token handler instance, for example of type
-                              oauthlib.oauth2.BearerToken.
-        :returns: headers, body, status
-        :raises: FatalClientError on invalid redirect URI or client id.
-
-        A few examples::
-
-            >>> from your_validator import your_validator
-            >>> request = Request('https://example.com/authorize?client_id=valid'
-            ...                   '&redirect_uri=http%3A%2F%2Fclient.com%2F')
-            >>> from oauthlib.common import Request
-            >>> from oauthlib.oauth2 import AuthorizationCodeGrant, BearerToken
-            >>> token = BearerToken(your_validator)
-            >>> grant = AuthorizationCodeGrant(your_validator)
-            >>> request.scopes = ['authorized', 'in', 'some', 'form']
-            >>> grant.create_authorization_response(request, token)
-            (u'http://client.com/?error=invalid_request&error_description=Missing+response_type+parameter.', None, None, 400)
-            >>> request = Request('https://example.com/authorize?client_id=valid'
-            ...                   '&redirect_uri=http%3A%2F%2Fclient.com%2F'
-            ...                   '&response_type=code')
-            >>> request.scopes = ['authorized', 'in', 'some', 'form']
-            >>> grant.create_authorization_response(request, token)
-            (u'http://client.com/?code=u3F05aEObJuP2k7DordviIgW5wl52N', None, None, 200)
-            >>> # If the client id or redirect uri fails validation
-            >>> grant.create_authorization_response(request, token)
-            Traceback (most recent call last):
-                File "<stdin>", line 1, in <module>
-                File "oauthlib/oauth2/rfc6749/grant_types.py", line 515, in create_authorization_response
-                    >>> grant.create_authorization_response(request, token)
-                File "oauthlib/oauth2/rfc6749/grant_types.py", line 591, in validate_authorization_request
-            oauthlib.oauth2.rfc6749.errors.InvalidClientIdError
-
-        .. _`Appendix B`: https://tools.ietf.org/html/rfc6749#appendix-B
-        .. _`Section 2.2`: https://tools.ietf.org/html/rfc6749#section-2.2
-        .. _`Section 3.1.2`: https://tools.ietf.org/html/rfc6749#section-3.1.2
-        .. _`Section 3.3`: https://tools.ietf.org/html/rfc6749#section-3.3
-        .. _`Section 10.12`: https://tools.ietf.org/html/rfc6749#section-10.12
-        """
-        try:
-            self.validate_authorization_request(request)
-            log.debug('Pre resource owner authorization validation ok for %r.',
-                      request)
-
-        # If the request fails due to a missing, invalid, or mismatching
-        # redirection URI, or if the client identifier is missing or invalid,
-        # the authorization server SHOULD inform the resource owner of the
-        # error and MUST NOT automatically redirect the user-agent to the
-        # invalid redirection URI.
-        except errors.FatalClientError as e:
-            log.debug('Fatal client error during validation of %r. %r.',
-                      request, e)
-            raise
-
-        # If the resource owner denies the access request or if the request
-        # fails for reasons other than a missing or invalid redirection URI,
-        # the authorization server informs the client by adding the following
-        # parameters to the query component of the redirection URI using the
-        # "application/x-www-form-urlencoded" format, per Appendix B:
-        # https://tools.ietf.org/html/rfc6749#appendix-B
-        except errors.OAuth2Error as e:
-            log.debug('Client error during validation of %r. %r.', request, e)
-            request.redirect_uri = request.redirect_uri or self.error_uri
-            redirect_uri = common.add_params_to_uri(
-                request.redirect_uri, e.twotuples,
-                fragment=request.response_mode == "fragment")
-            return {'Location': redirect_uri}, None, 302
-
-        grant = self.create_authorization_code(request)
-        for modifier in self._code_modifiers:
-            grant = modifier(grant, token_handler, request)
-        if 'access_token' in grant:
-            self.request_validator.save_token(grant, request)
-        log.debug('Saving grant %r for %r.', grant, request)
-        self.request_validator.save_authorization_code(
-            request.client_id, grant, request)
-        return self.prepare_authorization_response(
-            request, grant, {}, None, 302)
-
-    def create_token_response(self, request, token_handler):
-        """Validate the authorization code.
-
-        The client MUST NOT use the authorization code more than once. If an
-        authorization code is used more than once, the authorization server
-        MUST deny the request and SHOULD revoke (when possible) all tokens
-        previously issued based on that authorization code. The authorization
-        code is bound to the client identifier and redirection URI.
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :param token_handler: A token handler instance, for example of type
-                              oauthlib.oauth2.BearerToken.
-
-        """
-        headers = self._get_default_headers()
-        try:
-            self.validate_token_request(request)
-            log.debug('Token request validation ok for %r.', request)
-        except errors.OAuth2Error as e:
-            log.debug('Client error during validation of %r. %r.', request, e)
-            headers.update(e.headers)
-            return headers, e.json, e.status_code
-
-        token = token_handler.create_token(request, refresh_token=self.refresh_token)
-
-        for modifier in self._token_modifiers:
-            token = modifier(token, token_handler, request)
-
-        self.request_validator.save_token(token, request)
-        self.request_validator.invalidate_authorization_code(
-            request.client_id, request.code, request)
-        headers.update(self._create_cors_headers(request))
-        return headers, json.dumps(token), 200
-
-    def validate_authorization_request(self, request):
-        """Check the authorization request for normal and fatal errors.
-
-        A normal error could be a missing response_type parameter or the client
-        attempting to access scope it is not allowed to ask authorization for.
-        Normal errors can safely be included in the redirection URI and
-        sent back to the client.
-
-        Fatal errors occur when the client_id or redirect_uri is invalid or
-        missing. These must be caught by the provider and handled, how this
-        is done is outside of the scope of OAuthLib but showing an error
-        page describing the issue is a good idea.
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        """
-
-        # First check for fatal errors
-
-        # If the request fails due to a missing, invalid, or mismatching
-        # redirection URI, or if the client identifier is missing or invalid,
-        # the authorization server SHOULD inform the resource owner of the
-        # error and MUST NOT automatically redirect the user-agent to the
-        # invalid redirection URI.
-
-        # First check duplicate parameters
-        for param in ('client_id', 'response_type', 'redirect_uri', 'scope', 'state'):
-            try:
-                duplicate_params = request.duplicate_params
-            except ValueError:
-                raise errors.InvalidRequestFatalError(description='Unable to parse query string', request=request)
-            if param in duplicate_params:
-                raise errors.InvalidRequestFatalError(description='Duplicate %s parameter.' % param, request=request)
-
-        # REQUIRED. The client identifier as described in Section 2.2.
-        # https://tools.ietf.org/html/rfc6749#section-2.2
-        if not request.client_id:
-            raise errors.MissingClientIdError(request=request)
-
-        if not self.request_validator.validate_client_id(request.client_id, request):
-            raise errors.InvalidClientIdError(request=request)
-
-        # OPTIONAL. As described in Section 3.1.2.
-        # https://tools.ietf.org/html/rfc6749#section-3.1.2
-        log.debug('Validating redirection uri %s for client %s.',
-                  request.redirect_uri, request.client_id)
-
-        # OPTIONAL. As described in Section 3.1.2.
-        # https://tools.ietf.org/html/rfc6749#section-3.1.2
-        self._handle_redirects(request)
-
-        # Then check for normal errors.
-
-        # If the resource owner denies the access request or if the request
-        # fails for reasons other than a missing or invalid redirection URI,
-        # the authorization server informs the client by adding the following
-        # parameters to the query component of the redirection URI using the
-        # "application/x-www-form-urlencoded" format, per Appendix B.
-        # https://tools.ietf.org/html/rfc6749#appendix-B
-
-        # Note that the correct parameters to be added are automatically
-        # populated through the use of specific exceptions.
-
-        request_info = {}
-        for validator in self.custom_validators.pre_auth:
-            request_info.update(validator(request))
-
-        # REQUIRED.
-        if request.response_type is None:
-            raise errors.MissingResponseTypeError(request=request)
-        # Value MUST be set to "code" or one of the OpenID authorization code including
-        # response_types "code token", "code id_token", "code token id_token"
-        elif not 'code' in request.response_type and request.response_type != 'none':
-            raise errors.UnsupportedResponseTypeError(request=request)
-
-        if not self.request_validator.validate_response_type(request.client_id,
-                                                             request.response_type,
-                                                             request.client, request):
-
-            log.debug('Client %s is not authorized to use response_type %s.',
-                      request.client_id, request.response_type)
-            raise errors.UnauthorizedClientError(request=request)
-
-        # OPTIONAL. Validate PKCE request or reply with "error"/"invalid_request"
-        # https://tools.ietf.org/html/rfc6749#section-4.4.1
-        if self.request_validator.is_pkce_required(request.client_id, request) is True:
-            if request.code_challenge is None:
-                raise errors.MissingCodeChallengeError(request=request)
-
-        if request.code_challenge is not None:
-            request_info["code_challenge"] = request.code_challenge
-
-            # OPTIONAL, defaults to "plain" if not present in the request.
-            if request.code_challenge_method is None:
-                request.code_challenge_method = "plain"
-
-            if request.code_challenge_method not in self._code_challenge_methods:
-                raise errors.UnsupportedCodeChallengeMethodError(request=request)
-            request_info["code_challenge_method"] = request.code_challenge_method
-
-        # OPTIONAL. The scope of the access request as described by Section 3.3
-        # https://tools.ietf.org/html/rfc6749#section-3.3
-        self.validate_scopes(request)
-
-        request_info.update({
-            'client_id': request.client_id,
-            'redirect_uri': request.redirect_uri,
-            'response_type': request.response_type,
-            'state': request.state,
-            'request': request
-        })
-
-        for validator in self.custom_validators.post_auth:
-            request_info.update(validator(request))
-
-        return request.scopes, request_info
-
-    def validate_token_request(self, request):
-        """
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        """
-        # REQUIRED. Value MUST be set to "authorization_code".
-        if request.grant_type not in ('authorization_code', 'openid'):
-            raise errors.UnsupportedGrantTypeError(request=request)
-
-        for validator in self.custom_validators.pre_token:
-            validator(request)
-
-        if request.code is None:
-            raise errors.InvalidRequestError(
-                description='Missing code parameter.', request=request)
-
-        for param in ('client_id', 'grant_type', 'redirect_uri'):
-            if param in request.duplicate_params:
-                raise errors.InvalidRequestError(description='Duplicate %s parameter.' % param,
-                                                 request=request)
-
-        if self.request_validator.client_authentication_required(request):
-            # If the client type is confidential or the client was issued client
-            # credentials (or assigned other authentication requirements), the
-            # client MUST authenticate with the authorization server as described
-            # in Section 3.2.1.
-            # https://tools.ietf.org/html/rfc6749#section-3.2.1
-            if not self.request_validator.authenticate_client(request):
-                log.debug('Client authentication failed, %r.', request)
-                raise errors.InvalidClientError(request=request)
-        elif not self.request_validator.authenticate_client_id(request.client_id, request):
-            # REQUIRED, if the client is not authenticating with the
-            # authorization server as described in Section 3.2.1.
-            # https://tools.ietf.org/html/rfc6749#section-3.2.1
-            log.debug('Client authentication failed, %r.', request)
-            raise errors.InvalidClientError(request=request)
-
-        if not hasattr(request.client, 'client_id'):
-            raise NotImplementedError('Authenticate client must set the '
-                                      'request.client.client_id attribute '
-                                      'in authenticate_client.')
-
-        request.client_id = request.client_id or request.client.client_id
-
-        # Ensure client is authorized use of this grant type
-        self.validate_grant_type(request)
-
-        # REQUIRED. The authorization code received from the
-        # authorization server.
-        if not self.request_validator.validate_code(request.client_id,
-                                                    request.code, request.client, request):
-            log.debug('Client, %r (%r), is not allowed access to scopes %r.',
-                      request.client_id, request.client, request.scopes)
-            raise errors.InvalidGrantError(request=request)
-
-        # OPTIONAL. Validate PKCE code_verifier
-        challenge = self.request_validator.get_code_challenge(request.code, request)
-
-        if challenge is not None:
-            if request.code_verifier is None:
-                raise errors.MissingCodeVerifierError(request=request)
-
-            challenge_method = self.request_validator.get_code_challenge_method(request.code, request)
-            if challenge_method is None:
-                raise errors.InvalidGrantError(request=request, description="Challenge method not found")
-
-            if challenge_method not in self._code_challenge_methods:
-                raise errors.ServerError(
-                    description="code_challenge_method {} is not supported.".format(challenge_method),
-                    request=request
-                )
-
-            if not self.validate_code_challenge(challenge,
-                                                challenge_method,
-                                                request.code_verifier):
-                log.debug('request provided a invalid code_verifier.')
-                raise errors.InvalidGrantError(request=request)
-        elif self.request_validator.is_pkce_required(request.client_id, request) is True:
-            if request.code_verifier is None:
-                raise errors.MissingCodeVerifierError(request=request)
-            raise errors.InvalidGrantError(request=request, description="Challenge not found")
-
-        for attr in ('user', 'scopes'):
-            if getattr(request, attr, None) is None:
-                log.debug('request.%s was not set on code validation.', attr)
-
-        # REQUIRED, if the "redirect_uri" parameter was included in the
-        # authorization request as described in Section 4.1.1, and their
-        # values MUST be identical.
-        if request.redirect_uri is None:
-            request.using_default_redirect_uri = True
-            request.redirect_uri = self.request_validator.get_default_redirect_uri(
-                request.client_id, request)
-            log.debug('Using default redirect_uri %s.', request.redirect_uri)
-            if not request.redirect_uri:
-                raise errors.MissingRedirectURIError(request=request)
-        else:
-            request.using_default_redirect_uri = False
-            log.debug('Using provided redirect_uri %s', request.redirect_uri)
-
-        if not self.request_validator.confirm_redirect_uri(request.client_id, request.code,
-                                                           request.redirect_uri, request.client,
-                                                           request):
-            log.debug('Redirect_uri (%r) invalid for client %r (%r).',
-                      request.redirect_uri, request.client_id, request.client)
-            raise errors.MismatchingRedirectURIError(request=request)
-
-        for validator in self.custom_validators.post_token:
-            validator(request)
-
-    def validate_code_challenge(self, challenge, challenge_method, verifier):
-        if challenge_method in self._code_challenge_methods:
-            return self._code_challenge_methods[challenge_method](verifier, challenge)
-        raise NotImplementedError('Unknown challenge_method %s' % challenge_method)
diff --git a/lib/oauthlib/oauth2/rfc6749/grant_types/base.py b/lib/oauthlib/oauth2/rfc6749/grant_types/base.py
deleted file mode 100644
index ca343a11..00000000
--- a/lib/oauthlib/oauth2/rfc6749/grant_types/base.py
+++ /dev/null
@@ -1,268 +0,0 @@
-"""
-oauthlib.oauth2.rfc6749.grant_types
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-"""
-import logging
-from itertools import chain
-
-from oauthlib.common import add_params_to_uri
-from oauthlib.oauth2.rfc6749 import errors, utils
-from oauthlib.uri_validate import is_absolute_uri
-
-from ..request_validator import RequestValidator
-from ..utils import is_secure_transport
-
-log = logging.getLogger(__name__)
-
-
-class ValidatorsContainer:
-    """
-    Container object for holding custom validator callables to be invoked
-    as part of the grant type `validate_authorization_request()` or
-    `validate_authorization_request()` methods on the various grant types.
-
-    Authorization validators must be callables that take a request object and
-    return a dict, which may contain items to be added to the `request_info`
-    returned from the grant_type after validation.
-
-    Token validators must be callables that take a request object and
-    return None.
-
-    Both authorization validators and token validators may raise OAuth2
-    exceptions if validation conditions fail.
-
-    Authorization validators added to `pre_auth` will be run BEFORE
-    the standard validations (but after the critical ones that raise
-    fatal errors) as part of `validate_authorization_request()`
-
-    Authorization validators added to `post_auth` will be run AFTER
-    the standard validations as part of `validate_authorization_request()`
-
-    Token validators added to `pre_token` will be run BEFORE
-    the standard validations as part of `validate_token_request()`
-
-    Token validators added to `post_token` will be run AFTER
-    the standard validations as part of `validate_token_request()`
-
-    For example:
-
-    >>> def my_auth_validator(request):
-    ...    return {'myval': True}
-    >>> auth_code_grant = AuthorizationCodeGrant(request_validator)
-    >>> auth_code_grant.custom_validators.pre_auth.append(my_auth_validator)
-    >>> def my_token_validator(request):
-    ...     if not request.everything_okay:
-    ...         raise errors.OAuth2Error("uh-oh")
-    >>> auth_code_grant.custom_validators.post_token.append(my_token_validator)
-    """
-
-    def __init__(self, post_auth, post_token,
-                 pre_auth, pre_token):
-        self.pre_auth = pre_auth
-        self.post_auth = post_auth
-        self.pre_token = pre_token
-        self.post_token = post_token
-
-    @property
-    def all_pre(self):
-        return chain(self.pre_auth, self.pre_token)
-
-    @property
-    def all_post(self):
-        return chain(self.post_auth, self.post_token)
-
-
-class GrantTypeBase:
-    error_uri = None
-    request_validator = None
-    default_response_mode = 'fragment'
-    refresh_token = True
-    response_types = ['code']
-
-    def __init__(self, request_validator=None, **kwargs):
-        self.request_validator = request_validator or RequestValidator()
-
-        # Transforms class variables into instance variables:
-        self.response_types = self.response_types
-        self.refresh_token = self.refresh_token
-        self._setup_custom_validators(kwargs)
-        self._code_modifiers = []
-        self._token_modifiers = []
-
-        for kw, val in kwargs.items():
-            setattr(self, kw, val)
-
-    def _setup_custom_validators(self, kwargs):
-        post_auth = kwargs.get('post_auth', [])
-        post_token = kwargs.get('post_token', [])
-        pre_auth = kwargs.get('pre_auth', [])
-        pre_token = kwargs.get('pre_token', [])
-        if not hasattr(self, 'validate_authorization_request'):
-            if post_auth or pre_auth:
-                msg = ("{} does not support authorization validators. Use "
-                       "token validators instead.").format(self.__class__.__name__)
-                raise ValueError(msg)
-            # Using tuples here because they can't be appended to:
-            post_auth, pre_auth = (), ()
-        self.custom_validators = ValidatorsContainer(post_auth, post_token,
-                                                     pre_auth, pre_token)
-
-    def register_response_type(self, response_type):
-        self.response_types.append(response_type)
-
-    def register_code_modifier(self, modifier):
-        self._code_modifiers.append(modifier)
-
-    def register_token_modifier(self, modifier):
-        self._token_modifiers.append(modifier)
-
-    def create_authorization_response(self, request, token_handler):
-        """
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :param token_handler: A token handler instance, for example of type
-                              oauthlib.oauth2.BearerToken.
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def create_token_response(self, request, token_handler):
-        """
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :param token_handler: A token handler instance, for example of type
-                              oauthlib.oauth2.BearerToken.
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def add_token(self, token, token_handler, request):
-        """
-        :param token:
-        :param token_handler: A token handler instance, for example of type
-                              oauthlib.oauth2.BearerToken.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        """
-        # Only add a hybrid access token on auth step if asked for
-        if not request.response_type in ["token", "code token", "id_token token", "code id_token token"]:
-            return token
-
-        token.update(token_handler.create_token(request, refresh_token=False))
-        return token
-
-    def validate_grant_type(self, request):
-        """
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        """
-        client_id = getattr(request, 'client_id', None)
-        if not self.request_validator.validate_grant_type(client_id,
-                                                          request.grant_type, request.client, request):
-            log.debug('Unauthorized from %r (%r) access to grant type %s.',
-                      request.client_id, request.client, request.grant_type)
-            raise errors.UnauthorizedClientError(request=request)
-
-    def validate_scopes(self, request):
-        """
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        """
-        if not request.scopes:
-            request.scopes = utils.scope_to_list(request.scope) or utils.scope_to_list(
-                self.request_validator.get_default_scopes(request.client_id, request))
-        log.debug('Validating access to scopes %r for client %r (%r).',
-                  request.scopes, request.client_id, request.client)
-        if not self.request_validator.validate_scopes(request.client_id,
-                                                      request.scopes, request.client, request):
-            raise errors.InvalidScopeError(request=request)
-
-    def prepare_authorization_response(self, request, token, headers, body, status):
-        """Place token according to response mode.
-
-        Base classes can define a default response mode for their authorization
-        response by overriding the static `default_response_mode` member.
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :param token:
-        :param headers:
-        :param body:
-        :param status:
-        """
-        request.response_mode = request.response_mode or self.default_response_mode
-
-        if request.response_mode not in ('query', 'fragment'):
-            log.debug('Overriding invalid response mode %s with %s',
-                      request.response_mode, self.default_response_mode)
-            request.response_mode = self.default_response_mode
-
-        token_items = token.items()
-
-        if request.response_type == 'none':
-            state = token.get('state', None)
-            if state:
-                token_items = [('state', state)]
-            else:
-                token_items = []
-
-        if request.response_mode == 'query':
-            headers['Location'] = add_params_to_uri(
-                request.redirect_uri, token_items, fragment=False)
-            return headers, body, status
-
-        if request.response_mode == 'fragment':
-            headers['Location'] = add_params_to_uri(
-                request.redirect_uri, token_items, fragment=True)
-            return headers, body, status
-
-        raise NotImplementedError(
-            'Subclasses must set a valid default_response_mode')
-
-    def _get_default_headers(self):
-        """Create default headers for grant responses."""
-        return {
-            'Content-Type': 'application/json',
-            'Cache-Control': 'no-store',
-            'Pragma': 'no-cache',
-        }
-
-    def _handle_redirects(self, request):
-        if request.redirect_uri is not None:
-            request.using_default_redirect_uri = False
-            log.debug('Using provided redirect_uri %s', request.redirect_uri)
-            if not is_absolute_uri(request.redirect_uri):
-                raise errors.InvalidRedirectURIError(request=request)
-
-            # The authorization server MUST verify that the redirection URI
-            # to which it will redirect the access token matches a
-            # redirection URI registered by the client as described in
-            # Section 3.1.2.
-            # https://tools.ietf.org/html/rfc6749#section-3.1.2
-            if not self.request_validator.validate_redirect_uri(
-                    request.client_id, request.redirect_uri, request):
-                raise errors.MismatchingRedirectURIError(request=request)
-        else:
-            request.redirect_uri = self.request_validator.get_default_redirect_uri(
-                request.client_id, request)
-            request.using_default_redirect_uri = True
-            log.debug('Using default redirect_uri %s.', request.redirect_uri)
-            if not request.redirect_uri:
-                raise errors.MissingRedirectURIError(request=request)
-            if not is_absolute_uri(request.redirect_uri):
-                raise errors.InvalidRedirectURIError(request=request)
-
-    def _create_cors_headers(self, request):
-        """If CORS is allowed, create the appropriate headers."""
-        if 'origin' not in request.headers:
-            return {}
-
-        origin = request.headers['origin']
-        if not is_secure_transport(origin):
-            log.debug('Origin "%s" is not HTTPS, CORS not allowed.', origin)
-            return {}
-        elif not self.request_validator.is_origin_allowed(
-            request.client_id, origin, request):
-            log.debug('Invalid origin "%s", CORS not allowed.', origin)
-            return {}
-        else:
-            log.debug('Valid origin "%s", injecting CORS headers.', origin)
-            return {'Access-Control-Allow-Origin': origin}
diff --git a/lib/oauthlib/oauth2/rfc6749/grant_types/client_credentials.py b/lib/oauthlib/oauth2/rfc6749/grant_types/client_credentials.py
deleted file mode 100644
index e7b46189..00000000
--- a/lib/oauthlib/oauth2/rfc6749/grant_types/client_credentials.py
+++ /dev/null
@@ -1,123 +0,0 @@
-"""
-oauthlib.oauth2.rfc6749.grant_types
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-"""
-import json
-import logging
-
-from .. import errors
-from .base import GrantTypeBase
-
-log = logging.getLogger(__name__)
-
-
-class ClientCredentialsGrant(GrantTypeBase):
-
-    """`Client Credentials Grant`_
-
-    The client can request an access token using only its client
-    credentials (or other supported means of authentication) when the
-    client is requesting access to the protected resources under its
-    control, or those of another resource owner that have been previously
-    arranged with the authorization server (the method of which is beyond
-    the scope of this specification).
-
-    The client credentials grant type MUST only be used by confidential
-    clients::
-
-        +---------+                                  +---------------+
-        :         :                                  :               :
-        :         :>-- A - Client Authentication --->: Authorization :
-        : Client  :                                  :     Server    :
-        :         :<-- B ---- Access Token ---------<:               :
-        :         :                                  :               :
-        +---------+                                  +---------------+
-
-    Figure 6: Client Credentials Flow
-
-    The flow illustrated in Figure 6 includes the following steps:
-
-    (A)  The client authenticates with the authorization server and
-            requests an access token from the token endpoint.
-
-    (B)  The authorization server authenticates the client, and if valid,
-            issues an access token.
-
-    .. _`Client Credentials Grant`: https://tools.ietf.org/html/rfc6749#section-4.4
-    """
-
-    def create_token_response(self, request, token_handler):
-        """Return token or error in JSON format.
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :param token_handler: A token handler instance, for example of type
-                              oauthlib.oauth2.BearerToken.
-
-        If the access token request is valid and authorized, the
-        authorization server issues an access token as described in
-        `Section 5.1`_.  A refresh token SHOULD NOT be included.  If the request
-        failed client authentication or is invalid, the authorization server
-        returns an error response as described in `Section 5.2`_.
-
-        .. _`Section 5.1`: https://tools.ietf.org/html/rfc6749#section-5.1
-        .. _`Section 5.2`: https://tools.ietf.org/html/rfc6749#section-5.2
-        """
-        headers = self._get_default_headers()
-        try:
-            log.debug('Validating access token request, %r.', request)
-            self.validate_token_request(request)
-        except errors.OAuth2Error as e:
-            log.debug('Client error in token request. %s.', e)
-            headers.update(e.headers)
-            return headers, e.json, e.status_code
-
-        token = token_handler.create_token(request, refresh_token=False)
-
-        for modifier in self._token_modifiers:
-            token = modifier(token)
-
-        self.request_validator.save_token(token, request)
-
-        log.debug('Issuing token to client id %r (%r), %r.',
-                  request.client_id, request.client, token)
-        return headers, json.dumps(token), 200
-
-    def validate_token_request(self, request):
-        """
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        """
-        for validator in self.custom_validators.pre_token:
-            validator(request)
-
-        if not getattr(request, 'grant_type', None):
-            raise errors.InvalidRequestError('Request is missing grant type.',
-                                             request=request)
-
-        if not request.grant_type == 'client_credentials':
-            raise errors.UnsupportedGrantTypeError(request=request)
-
-        for param in ('grant_type', 'scope'):
-            if param in request.duplicate_params:
-                raise errors.InvalidRequestError(description='Duplicate %s parameter.' % param,
-                                                 request=request)
-
-        log.debug('Authenticating client, %r.', request)
-        if not self.request_validator.authenticate_client(request):
-            log.debug('Client authentication failed, %r.', request)
-            raise errors.InvalidClientError(request=request)
-        else:
-            if not hasattr(request.client, 'client_id'):
-                raise NotImplementedError('Authenticate client must set the '
-                                          'request.client.client_id attribute '
-                                          'in authenticate_client.')
-        # Ensure client is authorized use of this grant type
-        self.validate_grant_type(request)
-
-        request.client_id = request.client_id or request.client.client_id
-        log.debug('Authorizing access to client %r.', request.client_id)
-        self.validate_scopes(request)
-
-        for validator in self.custom_validators.post_token:
-            validator(request)
diff --git a/lib/oauthlib/oauth2/rfc6749/grant_types/implicit.py b/lib/oauthlib/oauth2/rfc6749/grant_types/implicit.py
deleted file mode 100644
index 6110b6f3..00000000
--- a/lib/oauthlib/oauth2/rfc6749/grant_types/implicit.py
+++ /dev/null
@@ -1,376 +0,0 @@
-"""
-oauthlib.oauth2.rfc6749.grant_types
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-"""
-import logging
-
-from oauthlib import common
-
-from .. import errors
-from .base import GrantTypeBase
-
-log = logging.getLogger(__name__)
-
-
-class ImplicitGrant(GrantTypeBase):
-
-    """`Implicit Grant`_
-
-    The implicit grant type is used to obtain access tokens (it does not
-    support the issuance of refresh tokens) and is optimized for public
-    clients known to operate a particular redirection URI.  These clients
-    are typically implemented in a browser using a scripting language
-    such as JavaScript.
-
-    Unlike the authorization code grant type, in which the client makes
-    separate requests for authorization and for an access token, the
-    client receives the access token as the result of the authorization
-    request.
-
-    The implicit grant type does not include client authentication, and
-    relies on the presence of the resource owner and the registration of
-    the redirection URI.  Because the access token is encoded into the
-    redirection URI, it may be exposed to the resource owner and other
-    applications residing on the same device::
-
-        +----------+
-        | Resource |
-        |  Owner   |
-        |          |
-        +----------+
-             ^
-             |
-            (B)
-        +----|-----+          Client Identifier     +---------------+
-        |         -+----(A)-- & Redirection URI --->|               |
-        |  User-   |                                | Authorization |
-        |  Agent  -|----(B)-- User authenticates -->|     Server    |
-        |          |                                |               |
-        |          |<---(C)--- Redirection URI ----<|               |
-        |          |          with Access Token     +---------------+
-        |          |            in Fragment
-        |          |                                +---------------+
-        |          |----(D)--- Redirection URI ---->|   Web-Hosted  |
-        |          |          without Fragment      |     Client    |
-        |          |                                |    Resource   |
-        |     (F)  |<---(E)------- Script ---------<|               |
-        |          |                                +---------------+
-        +-|--------+
-          |    |
-         (A)  (G) Access Token
-          |    |
-          ^    v
-        +---------+
-        |         |
-        |  Client |
-        |         |
-        +---------+
-
-   Note: The lines illustrating steps (A) and (B) are broken into two
-   parts as they pass through the user-agent.
-
-   Figure 4: Implicit Grant Flow
-
-   The flow illustrated in Figure 4 includes the following steps:
-
-   (A)  The client initiates the flow by directing the resource owner's
-        user-agent to the authorization endpoint.  The client includes
-        its client identifier, requested scope, local state, and a
-        redirection URI to which the authorization server will send the
-        user-agent back once access is granted (or denied).
-
-   (B)  The authorization server authenticates the resource owner (via
-        the user-agent) and establishes whether the resource owner
-        grants or denies the client's access request.
-
-   (C)  Assuming the resource owner grants access, the authorization
-        server redirects the user-agent back to the client using the
-        redirection URI provided earlier.  The redirection URI includes
-        the access token in the URI fragment.
-
-   (D)  The user-agent follows the redirection instructions by making a
-        request to the web-hosted client resource (which does not
-        include the fragment per [RFC2616]).  The user-agent retains the
-        fragment information locally.
-
-   (E)  The web-hosted client resource returns a web page (typically an
-        HTML document with an embedded script) capable of accessing the
-        full redirection URI including the fragment retained by the
-        user-agent, and extracting the access token (and other
-        parameters) contained in the fragment.
-
-   (F)  The user-agent executes the script provided by the web-hosted
-        client resource locally, which extracts the access token.
-
-   (G)  The user-agent passes the access token to the client.
-
-    See `Section 10.3`_ and `Section 10.16`_ for important security considerations
-    when using the implicit grant.
-
-    .. _`Implicit Grant`: https://tools.ietf.org/html/rfc6749#section-4.2
-    .. _`Section 10.3`: https://tools.ietf.org/html/rfc6749#section-10.3
-    .. _`Section 10.16`: https://tools.ietf.org/html/rfc6749#section-10.16
-    """
-
-    response_types = ['token']
-    grant_allows_refresh_token = False
-
-    def create_authorization_response(self, request, token_handler):
-        """Create an authorization response.
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :param token_handler: A token handler instance, for example of type
-                              oauthlib.oauth2.BearerToken.
-
-        The client constructs the request URI by adding the following
-        parameters to the query component of the authorization endpoint URI
-        using the "application/x-www-form-urlencoded" format, per `Appendix B`_:
-
-        response_type
-                REQUIRED.  Value MUST be set to "token" for standard OAuth2 implicit flow
-                           or "id_token token" or just "id_token" for OIDC implicit flow
-
-        client_id
-                REQUIRED.  The client identifier as described in `Section 2.2`_.
-
-        redirect_uri
-                OPTIONAL.  As described in `Section 3.1.2`_.
-
-        scope
-                OPTIONAL.  The scope of the access request as described by
-                `Section 3.3`_.
-
-        state
-                RECOMMENDED.  An opaque value used by the client to maintain
-                state between the request and callback.  The authorization
-                server includes this value when redirecting the user-agent back
-                to the client.  The parameter SHOULD be used for preventing
-                cross-site request forgery as described in `Section 10.12`_.
-
-        The authorization server validates the request to ensure that all
-        required parameters are present and valid.  The authorization server
-        MUST verify that the redirection URI to which it will redirect the
-        access token matches a redirection URI registered by the client as
-        described in `Section 3.1.2`_.
-
-        .. _`Section 2.2`: https://tools.ietf.org/html/rfc6749#section-2.2
-        .. _`Section 3.1.2`: https://tools.ietf.org/html/rfc6749#section-3.1.2
-        .. _`Section 3.3`: https://tools.ietf.org/html/rfc6749#section-3.3
-        .. _`Section 10.12`: https://tools.ietf.org/html/rfc6749#section-10.12
-        .. _`Appendix B`: https://tools.ietf.org/html/rfc6749#appendix-B
-        """
-        return self.create_token_response(request, token_handler)
-
-    def create_token_response(self, request, token_handler):
-        """Return token or error embedded in the URI fragment.
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :param token_handler: A token handler instance, for example of type
-                              oauthlib.oauth2.BearerToken.
-
-        If the resource owner grants the access request, the authorization
-        server issues an access token and delivers it to the client by adding
-        the following parameters to the fragment component of the redirection
-        URI using the "application/x-www-form-urlencoded" format, per
-        `Appendix B`_:
-
-        access_token
-                REQUIRED.  The access token issued by the authorization server.
-
-        token_type
-                REQUIRED.  The type of the token issued as described in
-                `Section 7.1`_.  Value is case insensitive.
-
-        expires_in
-                RECOMMENDED.  The lifetime in seconds of the access token.  For
-                example, the value "3600" denotes that the access token will
-                expire in one hour from the time the response was generated.
-                If omitted, the authorization server SHOULD provide the
-                expiration time via other means or document the default value.
-
-        scope
-                OPTIONAL, if identical to the scope requested by the client;
-                otherwise, REQUIRED.  The scope of the access token as
-                described by `Section 3.3`_.
-
-        state
-                REQUIRED if the "state" parameter was present in the client
-                authorization request.  The exact value received from the
-                client.
-
-        The authorization server MUST NOT issue a refresh token.
-
-        .. _`Appendix B`: https://tools.ietf.org/html/rfc6749#appendix-B
-        .. _`Section 3.3`: https://tools.ietf.org/html/rfc6749#section-3.3
-        .. _`Section 7.1`: https://tools.ietf.org/html/rfc6749#section-7.1
-        """
-        try:
-            self.validate_token_request(request)
-
-        # If the request fails due to a missing, invalid, or mismatching
-        # redirection URI, or if the client identifier is missing or invalid,
-        # the authorization server SHOULD inform the resource owner of the
-        # error and MUST NOT automatically redirect the user-agent to the
-        # invalid redirection URI.
-        except errors.FatalClientError as e:
-            log.debug('Fatal client error during validation of %r. %r.',
-                      request, e)
-            raise
-
-        # If the resource owner denies the access request or if the request
-        # fails for reasons other than a missing or invalid redirection URI,
-        # the authorization server informs the client by adding the following
-        # parameters to the fragment component of the redirection URI using the
-        # "application/x-www-form-urlencoded" format, per Appendix B:
-        # https://tools.ietf.org/html/rfc6749#appendix-B
-        except errors.OAuth2Error as e:
-            log.debug('Client error during validation of %r. %r.', request, e)
-            return {'Location': common.add_params_to_uri(request.redirect_uri, e.twotuples,
-                                                         fragment=True)}, None, 302
-
-        # In OIDC implicit flow it is possible to have a request_type that does not include the access_token!
-        # "id_token token" - return the access token and the id token
-        # "id_token" - don't return the access token
-        if "token" in request.response_type.split():
-            token = token_handler.create_token(request, refresh_token=False)
-        else:
-            token = {}
-
-        if request.state is not None:
-            token['state'] = request.state
-
-        for modifier in self._token_modifiers:
-            token = modifier(token, token_handler, request)
-
-        # In OIDC implicit flow it is possible to have a request_type that does
-        # not include the access_token! In this case there is no need to save a token.
-        if "token" in request.response_type.split():
-            self.request_validator.save_token(token, request)
-
-        return self.prepare_authorization_response(
-            request, token, {}, None, 302)
-
-    def validate_authorization_request(self, request):
-        """
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        """
-        return self.validate_token_request(request)
-
-    def validate_token_request(self, request):
-        """Check the token request for normal and fatal errors.
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-
-        This method is very similar to validate_authorization_request in
-        the AuthorizationCodeGrant but differ in a few subtle areas.
-
-        A normal error could be a missing response_type parameter or the client
-        attempting to access scope it is not allowed to ask authorization for.
-        Normal errors can safely be included in the redirection URI and
-        sent back to the client.
-
-        Fatal errors occur when the client_id or redirect_uri is invalid or
-        missing. These must be caught by the provider and handled, how this
-        is done is outside of the scope of OAuthLib but showing an error
-        page describing the issue is a good idea.
-        """
-
-        # First check for fatal errors
-
-        # If the request fails due to a missing, invalid, or mismatching
-        # redirection URI, or if the client identifier is missing or invalid,
-        # the authorization server SHOULD inform the resource owner of the
-        # error and MUST NOT automatically redirect the user-agent to the
-        # invalid redirection URI.
-
-        # First check duplicate parameters
-        for param in ('client_id', 'response_type', 'redirect_uri', 'scope', 'state'):
-            try:
-                duplicate_params = request.duplicate_params
-            except ValueError:
-                raise errors.InvalidRequestFatalError(description='Unable to parse query string', request=request)
-            if param in duplicate_params:
-                raise errors.InvalidRequestFatalError(description='Duplicate %s parameter.' % param, request=request)
-
-        # REQUIRED. The client identifier as described in Section 2.2.
-        # https://tools.ietf.org/html/rfc6749#section-2.2
-        if not request.client_id:
-            raise errors.MissingClientIdError(request=request)
-
-        if not self.request_validator.validate_client_id(request.client_id, request):
-            raise errors.InvalidClientIdError(request=request)
-
-        # OPTIONAL. As described in Section 3.1.2.
-        # https://tools.ietf.org/html/rfc6749#section-3.1.2
-        self._handle_redirects(request)
-
-        # Then check for normal errors.
-
-        request_info = self._run_custom_validators(request,
-                                                   self.custom_validators.all_pre)
-
-        # If the resource owner denies the access request or if the request
-        # fails for reasons other than a missing or invalid redirection URI,
-        # the authorization server informs the client by adding the following
-        # parameters to the fragment component of the redirection URI using the
-        # "application/x-www-form-urlencoded" format, per Appendix B.
-        # https://tools.ietf.org/html/rfc6749#appendix-B
-
-        # Note that the correct parameters to be added are automatically
-        # populated through the use of specific exceptions
-
-        # REQUIRED.
-        if request.response_type is None:
-            raise errors.MissingResponseTypeError(request=request)
-        # Value MUST be one of our registered types: "token" by default or if using OIDC "id_token" or "id_token token"
-        elif not set(request.response_type.split()).issubset(self.response_types):
-            raise errors.UnsupportedResponseTypeError(request=request)
-
-        log.debug('Validating use of response_type token for client %r (%r).',
-                  request.client_id, request.client)
-        if not self.request_validator.validate_response_type(request.client_id,
-                                                             request.response_type,
-                                                             request.client, request):
-
-            log.debug('Client %s is not authorized to use response_type %s.',
-                      request.client_id, request.response_type)
-            raise errors.UnauthorizedClientError(request=request)
-
-        # OPTIONAL. The scope of the access request as described by Section 3.3
-        # https://tools.ietf.org/html/rfc6749#section-3.3
-        self.validate_scopes(request)
-
-        request_info.update({
-            'client_id': request.client_id,
-            'redirect_uri': request.redirect_uri,
-            'response_type': request.response_type,
-            'state': request.state,
-            'request': request,
-        })
-
-        request_info = self._run_custom_validators(
-            request,
-            self.custom_validators.all_post,
-            request_info
-        )
-
-        return request.scopes, request_info
-
-    def _run_custom_validators(self,
-                               request,
-                               validations,
-                               request_info=None):
-        # Make a copy so we don't modify the existing request_info dict
-        request_info = {} if request_info is None else request_info.copy()
-        # For implicit grant, auth_validators and token_validators are
-        # basically equivalent since the token is returned from the
-        # authorization endpoint.
-        for validator in validations:
-            result = validator(request)
-            if result is not None:
-                request_info.update(result)
-        return request_info
diff --git a/lib/oauthlib/oauth2/rfc6749/grant_types/refresh_token.py b/lib/oauthlib/oauth2/rfc6749/grant_types/refresh_token.py
deleted file mode 100644
index ce33df0e..00000000
--- a/lib/oauthlib/oauth2/rfc6749/grant_types/refresh_token.py
+++ /dev/null
@@ -1,136 +0,0 @@
-"""
-oauthlib.oauth2.rfc6749.grant_types
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-"""
-import json
-import logging
-
-from .. import errors, utils
-from .base import GrantTypeBase
-
-log = logging.getLogger(__name__)
-
-
-class RefreshTokenGrant(GrantTypeBase):
-
-    """`Refresh token grant`_
-
-    .. _`Refresh token grant`: https://tools.ietf.org/html/rfc6749#section-6
-    """
-
-    def __init__(self, request_validator=None,
-                 issue_new_refresh_tokens=True,
-                 **kwargs):
-        super().__init__(
-            request_validator,
-            issue_new_refresh_tokens=issue_new_refresh_tokens,
-            **kwargs)
-
-    def create_token_response(self, request, token_handler):
-        """Create a new access token from a refresh_token.
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :param token_handler: A token handler instance, for example of type
-                              oauthlib.oauth2.BearerToken.
-
-        If valid and authorized, the authorization server issues an access
-        token as described in `Section 5.1`_. If the request failed
-        verification or is invalid, the authorization server returns an error
-        response as described in `Section 5.2`_.
-
-        The authorization server MAY issue a new refresh token, in which case
-        the client MUST discard the old refresh token and replace it with the
-        new refresh token. The authorization server MAY revoke the old
-        refresh token after issuing a new refresh token to the client. If a
-        new refresh token is issued, the refresh token scope MUST be
-        identical to that of the refresh token included by the client in the
-        request.
-
-        .. _`Section 5.1`: https://tools.ietf.org/html/rfc6749#section-5.1
-        .. _`Section 5.2`: https://tools.ietf.org/html/rfc6749#section-5.2
-        """
-        headers = self._get_default_headers()
-        try:
-            log.debug('Validating refresh token request, %r.', request)
-            self.validate_token_request(request)
-        except errors.OAuth2Error as e:
-            log.debug('Client error in token request, %s.', e)
-            headers.update(e.headers)
-            return headers, e.json, e.status_code
-
-        token = token_handler.create_token(request,
-                                           refresh_token=self.issue_new_refresh_tokens)
-
-        for modifier in self._token_modifiers:
-            token = modifier(token, token_handler, request)
-
-        self.request_validator.save_token(token, request)
-
-        log.debug('Issuing new token to client id %r (%r), %r.',
-                  request.client_id, request.client, token)
-        headers.update(self._create_cors_headers(request))
-        return headers, json.dumps(token), 200
-
-    def validate_token_request(self, request):
-        """
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        """
-        # REQUIRED. Value MUST be set to "refresh_token".
-        if request.grant_type != 'refresh_token':
-            raise errors.UnsupportedGrantTypeError(request=request)
-
-        for validator in self.custom_validators.pre_token:
-            validator(request)
-
-        if request.refresh_token is None:
-            raise errors.InvalidRequestError(
-                description='Missing refresh token parameter.',
-                request=request)
-
-        # Because refresh tokens are typically long-lasting credentials used to
-        # request additional access tokens, the refresh token is bound to the
-        # client to which it was issued.  If the client type is confidential or
-        # the client was issued client credentials (or assigned other
-        # authentication requirements), the client MUST authenticate with the
-        # authorization server as described in Section 3.2.1.
-        # https://tools.ietf.org/html/rfc6749#section-3.2.1
-        if self.request_validator.client_authentication_required(request):
-            log.debug('Authenticating client, %r.', request)
-            if not self.request_validator.authenticate_client(request):
-                log.debug('Invalid client (%r), denying access.', request)
-                raise errors.InvalidClientError(request=request)
-        elif not self.request_validator.authenticate_client_id(request.client_id, request):
-            log.debug('Client authentication failed, %r.', request)
-            raise errors.InvalidClientError(request=request)
-
-        # Ensure client is authorized use of this grant type
-        self.validate_grant_type(request)
-
-        # REQUIRED. The refresh token issued to the client.
-        log.debug('Validating refresh token %s for client %r.',
-                  request.refresh_token, request.client)
-        if not self.request_validator.validate_refresh_token(
-                request.refresh_token, request.client, request):
-            log.debug('Invalid refresh token, %s, for client %r.',
-                      request.refresh_token, request.client)
-            raise errors.InvalidGrantError(request=request)
-
-        original_scopes = utils.scope_to_list(
-            self.request_validator.get_original_scopes(
-                request.refresh_token, request))
-
-        if request.scope:
-            request.scopes = utils.scope_to_list(request.scope)
-            if (not all(s in original_scopes for s in request.scopes)
-                and not self.request_validator.is_within_original_scope(
-                    request.scopes, request.refresh_token, request)):
-                log.debug('Refresh token %s lack requested scopes, %r.',
-                          request.refresh_token, request.scopes)
-                raise errors.InvalidScopeError(request=request)
-        else:
-            request.scopes = original_scopes
-
-        for validator in self.custom_validators.post_token:
-            validator(request)
diff --git a/lib/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py b/lib/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py
deleted file mode 100644
index 4b0de5bf..00000000
--- a/lib/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py
+++ /dev/null
@@ -1,199 +0,0 @@
-"""
-oauthlib.oauth2.rfc6749.grant_types
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-"""
-import json
-import logging
-
-from .. import errors
-from .base import GrantTypeBase
-
-log = logging.getLogger(__name__)
-
-
-class ResourceOwnerPasswordCredentialsGrant(GrantTypeBase):
-
-    """`Resource Owner Password Credentials Grant`_
-
-    The resource owner password credentials grant type is suitable in
-    cases where the resource owner has a trust relationship with the
-    client, such as the device operating system or a highly privileged
-    application.  The authorization server should take special care when
-    enabling this grant type and only allow it when other flows are not
-    viable.
-
-    This grant type is suitable for clients capable of obtaining the
-    resource owner's credentials (username and password, typically using
-    an interactive form).  It is also used to migrate existing clients
-    using direct authentication schemes such as HTTP Basic or Digest
-    authentication to OAuth by converting the stored credentials to an
-    access token::
-
-            +----------+
-            | Resource |
-            |  Owner   |
-            |          |
-            +----------+
-                 v
-                 |    Resource Owner
-                (A) Password Credentials
-                 |
-                 v
-            +---------+                                  +---------------+
-            |         |>--(B)---- Resource Owner ------->|               |
-            |         |         Password Credentials     | Authorization |
-            | Client  |                                  |     Server    |
-            |         |<--(C)---- Access Token ---------<|               |
-            |         |    (w/ Optional Refresh Token)   |               |
-            +---------+                                  +---------------+
-
-    Figure 5: Resource Owner Password Credentials Flow
-
-    The flow illustrated in Figure 5 includes the following steps:
-
-    (A)  The resource owner provides the client with its username and
-            password.
-
-    (B)  The client requests an access token from the authorization
-            server's token endpoint by including the credentials received
-            from the resource owner.  When making the request, the client
-            authenticates with the authorization server.
-
-    (C)  The authorization server authenticates the client and validates
-            the resource owner credentials, and if valid, issues an access
-            token.
-
-    .. _`Resource Owner Password Credentials Grant`: https://tools.ietf.org/html/rfc6749#section-4.3
-    """
-
-    def create_token_response(self, request, token_handler):
-        """Return token or error in json format.
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :param token_handler: A token handler instance, for example of type
-                              oauthlib.oauth2.BearerToken.
-
-        If the access token request is valid and authorized, the
-        authorization server issues an access token and optional refresh
-        token as described in `Section 5.1`_.  If the request failed client
-        authentication or is invalid, the authorization server returns an
-        error response as described in `Section 5.2`_.
-
-        .. _`Section 5.1`: https://tools.ietf.org/html/rfc6749#section-5.1
-        .. _`Section 5.2`: https://tools.ietf.org/html/rfc6749#section-5.2
-        """
-        headers = self._get_default_headers()
-        try:
-            if self.request_validator.client_authentication_required(request):
-                log.debug('Authenticating client, %r.', request)
-                if not self.request_validator.authenticate_client(request):
-                    log.debug('Client authentication failed, %r.', request)
-                    raise errors.InvalidClientError(request=request)
-            elif not self.request_validator.authenticate_client_id(request.client_id, request):
-                log.debug('Client authentication failed, %r.', request)
-                raise errors.InvalidClientError(request=request)
-            log.debug('Validating access token request, %r.', request)
-            self.validate_token_request(request)
-        except errors.OAuth2Error as e:
-            log.debug('Client error in token request, %s.', e)
-            headers.update(e.headers)
-            return headers, e.json, e.status_code
-
-        token = token_handler.create_token(request, self.refresh_token)
-
-        for modifier in self._token_modifiers:
-            token = modifier(token)
-
-        self.request_validator.save_token(token, request)
-
-        log.debug('Issuing token %r to client id %r (%r) and username %s.',
-                  token, request.client_id, request.client, request.username)
-        return headers, json.dumps(token), 200
-
-    def validate_token_request(self, request):
-        """
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-
-        The client makes a request to the token endpoint by adding the
-        following parameters using the "application/x-www-form-urlencoded"
-        format per Appendix B with a character encoding of UTF-8 in the HTTP
-        request entity-body:
-
-        grant_type
-                REQUIRED.  Value MUST be set to "password".
-
-        username
-                REQUIRED.  The resource owner username.
-
-        password
-                REQUIRED.  The resource owner password.
-
-        scope
-                OPTIONAL.  The scope of the access request as described by
-                `Section 3.3`_.
-
-        If the client type is confidential or the client was issued client
-        credentials (or assigned other authentication requirements), the
-        client MUST authenticate with the authorization server as described
-        in `Section 3.2.1`_.
-
-        The authorization server MUST:
-
-        o  require client authentication for confidential clients or for any
-            client that was issued client credentials (or with other
-            authentication requirements),
-
-        o  authenticate the client if client authentication is included, and
-
-        o  validate the resource owner password credentials using its
-            existing password validation algorithm.
-
-        Since this access token request utilizes the resource owner's
-        password, the authorization server MUST protect the endpoint against
-        brute force attacks (e.g., using rate-limitation or generating
-        alerts).
-
-        .. _`Section 3.3`: https://tools.ietf.org/html/rfc6749#section-3.3
-        .. _`Section 3.2.1`: https://tools.ietf.org/html/rfc6749#section-3.2.1
-        """
-        for validator in self.custom_validators.pre_token:
-            validator(request)
-
-        for param in ('grant_type', 'username', 'password'):
-            if not getattr(request, param, None):
-                raise errors.InvalidRequestError(
-                    'Request is missing %s parameter.' % param, request=request)
-
-        for param in ('grant_type', 'username', 'password', 'scope'):
-            if param in request.duplicate_params:
-                raise errors.InvalidRequestError(description='Duplicate %s parameter.' % param, request=request)
-
-        # This error should rarely (if ever) occur if requests are routed to
-        # grant type handlers based on the grant_type parameter.
-        if not request.grant_type == 'password':
-            raise errors.UnsupportedGrantTypeError(request=request)
-
-        log.debug('Validating username %s.', request.username)
-        if not self.request_validator.validate_user(request.username,
-                                                    request.password, request.client, request):
-            raise errors.InvalidGrantError(
-                'Invalid credentials given.', request=request)
-        else:
-            if not hasattr(request.client, 'client_id'):
-                raise NotImplementedError(
-                    'Validate user must set the '
-                    'request.client.client_id attribute '
-                    'in authenticate_client.')
-        log.debug('Authorizing access to user %r.', request.user)
-
-        # Ensure client is authorized use of this grant type
-        self.validate_grant_type(request)
-
-        if request.client:
-            request.client_id = request.client_id or request.client.client_id
-        self.validate_scopes(request)
-
-        for validator in self.custom_validators.post_token:
-            validator(request)
diff --git a/lib/oauthlib/oauth2/rfc6749/parameters.py b/lib/oauthlib/oauth2/rfc6749/parameters.py
deleted file mode 100644
index 8f6ce2c7..00000000
--- a/lib/oauthlib/oauth2/rfc6749/parameters.py
+++ /dev/null
@@ -1,471 +0,0 @@
-"""
-oauthlib.oauth2.rfc6749.parameters
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This module contains methods related to `Section 4`_ of the OAuth 2 RFC.
-
-.. _`Section 4`: https://tools.ietf.org/html/rfc6749#section-4
-"""
-import json
-import os
-import time
-import urllib.parse as urlparse
-
-from oauthlib.common import add_params_to_qs, add_params_to_uri
-from oauthlib.signals import scope_changed
-
-from .errors import (
-    InsecureTransportError, MismatchingStateError, MissingCodeError,
-    MissingTokenError, MissingTokenTypeError, raise_from_error,
-)
-from .tokens import OAuth2Token
-from .utils import is_secure_transport, list_to_scope, scope_to_list
-
-
-def prepare_grant_uri(uri, client_id, response_type, redirect_uri=None,
-                      scope=None, state=None, code_challenge=None, code_challenge_method='plain', **kwargs):
-    """Prepare the authorization grant request URI.
-
-    The client constructs the request URI by adding the following
-    parameters to the query component of the authorization endpoint URI
-    using the ``application/x-www-form-urlencoded`` format as defined by
-    [`W3C.REC-html401-19991224`_]:
-
-    :param uri:
-    :param client_id: The client identifier as described in `Section 2.2`_.
-    :param response_type: To indicate which OAuth 2 grant/flow is required,
-                          "code" and "token".
-    :param redirect_uri: The client provided URI to redirect back to after
-                         authorization as described in `Section 3.1.2`_.
-    :param scope: The scope of the access request as described by
-                  `Section 3.3`_.
-    :param state: An opaque value used by the client to maintain
-                  state between the request and callback.  The authorization
-                  server includes this value when redirecting the user-agent
-                  back to the client.  The parameter SHOULD be used for
-                  preventing cross-site request forgery as described in
-                  `Section 10.12`_.
-    :param code_challenge: PKCE parameter. A challenge derived from the 
-                           code_verifier that is sent in the authorization 
-                           request, to be verified against later.
-    :param code_challenge_method: PKCE parameter. A method that was used to derive the 
-                                  code_challenge. Defaults to "plain" if not present in the request.
-    :param kwargs: Extra arguments to embed in the grant/authorization URL.
-
-    An example of an authorization code grant authorization URL:
-
-    .. code-block:: http
-
-        GET /authorize?response_type=code&client_id=s6BhdRkqt3&state=xyz
-            &code_challenge=kjasBS523KdkAILD2k78NdcJSk2k3KHG6&code_challenge_method=S256
-            &redirect_uri=https%3A%2F%2Fclient%2Eexample%2Ecom%2Fcb HTTP/1.1
-        Host: server.example.com
-
-    .. _`W3C.REC-html401-19991224`: https://tools.ietf.org/html/rfc6749#ref-W3C.REC-html401-19991224
-    .. _`Section 2.2`: https://tools.ietf.org/html/rfc6749#section-2.2
-    .. _`Section 3.1.2`: https://tools.ietf.org/html/rfc6749#section-3.1.2
-    .. _`Section 3.3`: https://tools.ietf.org/html/rfc6749#section-3.3
-    .. _`section 10.12`: https://tools.ietf.org/html/rfc6749#section-10.12
-    """
-    if not is_secure_transport(uri):
-        raise InsecureTransportError()
-
-    params = [(('response_type', response_type)),
-              (('client_id', client_id))]
-
-    if redirect_uri:
-        params.append(('redirect_uri', redirect_uri))
-    if scope:
-        params.append(('scope', list_to_scope(scope)))
-    if state:
-        params.append(('state', state))
-    if code_challenge is not None:
-        params.append(('code_challenge', code_challenge))
-        params.append(('code_challenge_method', code_challenge_method))
-
-    for k in kwargs:
-        if kwargs[k]:
-            params.append((str(k), kwargs[k]))
-
-    return add_params_to_uri(uri, params)
-
-
-def prepare_token_request(grant_type, body='', include_client_id=True, code_verifier=None, **kwargs):
-    """Prepare the access token request.
-
-    The client makes a request to the token endpoint by adding the
-    following parameters using the ``application/x-www-form-urlencoded``
-    format in the HTTP request entity-body:
-
-    :param grant_type: To indicate grant type being used, i.e. "password",
-                       "authorization_code" or "client_credentials".
-
-    :param body: Existing request body (URL encoded string) to embed parameters
-                 into. This may contain extra parameters. Default ''.
-
-    :param include_client_id: `True` (default) to send the `client_id` in the
-                              body of the upstream request. This is required
-                              if the client is not authenticating with the
-                              authorization server as described in
-                              `Section 3.2.1`_.
-    :type include_client_id: Boolean
-
-    :param client_id: Unicode client identifier. Will only appear if
-                      `include_client_id` is True. *
-
-    :param client_secret: Unicode client secret. Will only appear if set to a
-                          value that is not `None`. Invoking this function with
-                          an empty string will send an empty `client_secret`
-                          value to the server. *
-
-    :param code: If using authorization_code grant, pass the previously
-                 obtained authorization code as the ``code`` argument. *
-
-    :param redirect_uri: If the "redirect_uri" parameter was included in the
-                         authorization request as described in
-                         `Section 4.1.1`_, and their values MUST be identical. *
-
-    :param code_verifier: PKCE parameter. A cryptographically random string that is used to correlate the
-                          authorization request to the token request.
-
-    :param kwargs: Extra arguments to embed in the request body.
-
-    Parameters marked with a `*` above are not explicit arguments in the
-    function signature, but are specially documented arguments for items
-    appearing in the generic `**kwargs` keyworded input.
-
-    An example of an authorization code token request body:
-
-    .. code-block:: http
-
-        grant_type=authorization_code&code=SplxlOBeZQQYbYS6WxSbIA
-        &redirect_uri=https%3A%2F%2Fclient%2Eexample%2Ecom%2Fcb
-
-    .. _`Section 4.1.1`: https://tools.ietf.org/html/rfc6749#section-4.1.1
-    """
-    params = [('grant_type', grant_type)]
-
-    if 'scope' in kwargs:
-        kwargs['scope'] = list_to_scope(kwargs['scope'])
-
-    # pull the `client_id` out of the kwargs.
-    client_id = kwargs.pop('client_id', None)
-    if include_client_id:
-        if client_id is not None:
-            params.append(('client_id', client_id))
-
-    # use code_verifier if code_challenge was passed in the authorization request
-    if code_verifier is not None:
-        params.append(('code_verifier', code_verifier))
-
-    # the kwargs iteration below only supports including boolean truth (truthy)
-    # values, but some servers may require an empty string for `client_secret`
-    client_secret = kwargs.pop('client_secret', None)
-    if client_secret is not None:
-        params.append(('client_secret', client_secret))
-
-    # this handles: `code`, `redirect_uri`, and other undocumented params
-    for k in kwargs:
-        if kwargs[k]:
-            params.append((str(k), kwargs[k]))
-
-    return add_params_to_qs(body, params)
-
-
-def prepare_token_revocation_request(url, token, token_type_hint="access_token",
-        callback=None, body='', **kwargs):
-    """Prepare a token revocation request.
-
-    The client constructs the request by including the following parameters
-    using the ``application/x-www-form-urlencoded`` format in the HTTP request
-    entity-body:
-
-    :param token: REQUIRED.  The token that the client wants to get revoked.
-
-    :param token_type_hint: OPTIONAL.  A hint about the type of the token
-                            submitted for revocation. Clients MAY pass this
-                            parameter in order to help the authorization server
-                            to optimize the token lookup.  If the server is
-                            unable to locate the token using the given hint, it
-                            MUST extend its search across all of its supported
-                            token types.  An authorization server MAY ignore
-                            this parameter, particularly if it is able to detect
-                            the token type automatically.
-
-    This specification defines two values for `token_type_hint`:
-
-        * access_token: An access token as defined in [RFC6749],
-             `Section 1.4`_
-
-        * refresh_token: A refresh token as defined in [RFC6749],
-             `Section 1.5`_
-
-        Specific implementations, profiles, and extensions of this
-        specification MAY define other values for this parameter using the
-        registry defined in `Section 4.1.2`_.
-
-    .. _`Section 1.4`: https://tools.ietf.org/html/rfc6749#section-1.4
-    .. _`Section 1.5`: https://tools.ietf.org/html/rfc6749#section-1.5
-    .. _`Section 4.1.2`: https://tools.ietf.org/html/rfc7009#section-4.1.2
-
-    """
-    if not is_secure_transport(url):
-        raise InsecureTransportError()
-
-    params = [('token', token)]
-
-    if token_type_hint:
-        params.append(('token_type_hint', token_type_hint))
-
-    for k in kwargs:
-        if kwargs[k]:
-            params.append((str(k), kwargs[k]))
-
-    headers = {'Content-Type': 'application/x-www-form-urlencoded'}
-
-    if callback:
-        params.append(('callback', callback))
-        return add_params_to_uri(url, params), headers, body
-    else:
-        return url, headers, add_params_to_qs(body, params)
-
-
-def parse_authorization_code_response(uri, state=None):
-    """Parse authorization grant response URI into a dict.
-
-    If the resource owner grants the access request, the authorization
-    server issues an authorization code and delivers it to the client by
-    adding the following parameters to the query component of the
-    redirection URI using the ``application/x-www-form-urlencoded`` format:
-
-    **code**
-            REQUIRED.  The authorization code generated by the
-            authorization server.  The authorization code MUST expire
-            shortly after it is issued to mitigate the risk of leaks.  A
-            maximum authorization code lifetime of 10 minutes is
-            RECOMMENDED.  The client MUST NOT use the authorization code
-            more than once.  If an authorization code is used more than
-            once, the authorization server MUST deny the request and SHOULD
-            revoke (when possible) all tokens previously issued based on
-            that authorization code.  The authorization code is bound to
-            the client identifier and redirection URI.
-
-    **state**
-            REQUIRED if the "state" parameter was present in the client
-            authorization request.  The exact value received from the
-            client.
-
-    :param uri: The full redirect URL back to the client.
-    :param state: The state parameter from the authorization request.
-
-    For example, the authorization server redirects the user-agent by
-    sending the following HTTP response:
-
-    .. code-block:: http
-
-        HTTP/1.1 302 Found
-        Location: https://client.example.com/cb?code=SplxlOBeZQQYbYS6WxSbIA
-                &state=xyz
-
-    """
-    if not is_secure_transport(uri):
-        raise InsecureTransportError()
-
-    query = urlparse.urlparse(uri).query
-    params = dict(urlparse.parse_qsl(query))
-
-    if state and params.get('state', None) != state:
-        raise MismatchingStateError()
-
-    if 'error' in params:
-        raise_from_error(params.get('error'), params)
-
-    if not 'code' in params:
-        raise MissingCodeError("Missing code parameter in response.")
-
-    return params
-
-
-def parse_implicit_response(uri, state=None, scope=None):
-    """Parse the implicit token response URI into a dict.
-
-    If the resource owner grants the access request, the authorization
-    server issues an access token and delivers it to the client by adding
-    the following parameters to the fragment component of the redirection
-    URI using the ``application/x-www-form-urlencoded`` format:
-
-    **access_token**
-            REQUIRED.  The access token issued by the authorization server.
-
-    **token_type**
-            REQUIRED.  The type of the token issued as described in
-            Section 7.1.  Value is case insensitive.
-
-    **expires_in**
-            RECOMMENDED.  The lifetime in seconds of the access token.  For
-            example, the value "3600" denotes that the access token will
-            expire in one hour from the time the response was generated.
-            If omitted, the authorization server SHOULD provide the
-            expiration time via other means or document the default value.
-
-    **scope**
-            OPTIONAL, if identical to the scope requested by the client,
-            otherwise REQUIRED.  The scope of the access token as described
-            by Section 3.3.
-
-    **state**
-            REQUIRED if the "state" parameter was present in the client
-            authorization request.  The exact value received from the
-            client.
-
-    :param uri:
-    :param state:
-    :param scope:
-
-    Similar to the authorization code response, but with a full token provided
-    in the URL fragment:
-
-    .. code-block:: http
-
-        HTTP/1.1 302 Found
-        Location: http://example.com/cb#access_token=2YotnFZFEjr1zCsicMWpAA
-                &state=xyz&token_type=example&expires_in=3600
-    """
-    if not is_secure_transport(uri):
-        raise InsecureTransportError()
-
-    fragment = urlparse.urlparse(uri).fragment
-    params = dict(urlparse.parse_qsl(fragment, keep_blank_values=True))
-
-    for key in ('expires_in',):
-        if key in params:  # cast things to int
-            params[key] = int(params[key])
-
-    if 'scope' in params:
-        params['scope'] = scope_to_list(params['scope'])
-
-    if 'expires_in' in params:
-        params['expires_at'] = time.time() + int(params['expires_in'])
-
-    if state and params.get('state', None) != state:
-        raise ValueError("Mismatching or missing state in params.")
-
-    params = OAuth2Token(params, old_scope=scope)
-    validate_token_parameters(params)
-    return params
-
-
-def parse_token_response(body, scope=None):
-    """Parse the JSON token response body into a dict.
-
-    The authorization server issues an access token and optional refresh
-    token, and constructs the response by adding the following parameters
-    to the entity body of the HTTP response with a 200 (OK) status code:
-
-    access_token
-            REQUIRED.  The access token issued by the authorization server.
-    token_type
-            REQUIRED.  The type of the token issued as described in
-            `Section 7.1`_.  Value is case insensitive.
-    expires_in
-            RECOMMENDED.  The lifetime in seconds of the access token.  For
-            example, the value "3600" denotes that the access token will
-            expire in one hour from the time the response was generated.
-            If omitted, the authorization server SHOULD provide the
-            expiration time via other means or document the default value.
-    refresh_token
-            OPTIONAL.  The refresh token which can be used to obtain new
-            access tokens using the same authorization grant as described
-            in `Section 6`_.
-    scope
-            OPTIONAL, if identical to the scope requested by the client,
-            otherwise REQUIRED.  The scope of the access token as described
-            by `Section 3.3`_.
-
-    The parameters are included in the entity body of the HTTP response
-    using the "application/json" media type as defined by [`RFC4627`_].  The
-    parameters are serialized into a JSON structure by adding each
-    parameter at the highest structure level.  Parameter names and string
-    values are included as JSON strings.  Numerical values are included
-    as JSON numbers.  The order of parameters does not matter and can
-    vary.
-
-    :param body: The full json encoded response body.
-    :param scope: The scope requested during authorization.
-
-    For example:
-
-    .. code-block:: http
-
-        HTTP/1.1 200 OK
-        Content-Type: application/json
-        Cache-Control: no-store
-        Pragma: no-cache
-
-        {
-            "access_token":"2YotnFZFEjr1zCsicMWpAA",
-            "token_type":"example",
-            "expires_in":3600,
-            "refresh_token":"tGzv3JOkF0XG5Qx2TlKWIA",
-            "example_parameter":"example_value"
-        }
-
-    .. _`Section 7.1`: https://tools.ietf.org/html/rfc6749#section-7.1
-    .. _`Section 6`: https://tools.ietf.org/html/rfc6749#section-6
-    .. _`Section 3.3`: https://tools.ietf.org/html/rfc6749#section-3.3
-    .. _`RFC4627`: https://tools.ietf.org/html/rfc4627
-    """
-    try:
-        params = json.loads(body)
-    except ValueError:
-
-        # Fall back to URL-encoded string, to support old implementations,
-        # including (at time of writing) Facebook. See:
-        #   https://github.com/oauthlib/oauthlib/issues/267
-
-        params = dict(urlparse.parse_qsl(body))
-        for key in ('expires_in',):
-            if key in params:  # cast things to int
-                params[key] = int(params[key])
-
-    if 'scope' in params:
-        params['scope'] = scope_to_list(params['scope'])
-
-    if 'expires_in' in params:
-        if params['expires_in'] is None:
-            params.pop('expires_in')
-        else:
-            params['expires_at'] = time.time() + int(params['expires_in'])
-
-    params = OAuth2Token(params, old_scope=scope)
-    validate_token_parameters(params)
-    return params
-
-
-def validate_token_parameters(params):
-    """Ensures token presence, token type, expiration and scope in params."""
-    if 'error' in params:
-        raise_from_error(params.get('error'), params)
-
-    if not 'access_token' in params:
-        raise MissingTokenError(description="Missing access token parameter.")
-
-    if not 'token_type' in params:
-        if os.environ.get('OAUTHLIB_STRICT_TOKEN_TYPE'):
-            raise MissingTokenTypeError()
-
-    # If the issued access token scope is different from the one requested by
-    # the client, the authorization server MUST include the "scope" response
-    # parameter to inform the client of the actual scope granted.
-    # https://tools.ietf.org/html/rfc6749#section-3.3
-    if params.scope_changed:
-        message = 'Scope has changed from "{old}" to "{new}".'.format(
-            old=params.old_scope, new=params.scope,
-        )
-        scope_changed.send(message=message, old=params.old_scopes, new=params.scopes)
-        if not os.environ.get('OAUTHLIB_RELAX_TOKEN_SCOPE', None):
-            w = Warning(message)
-            w.token = params
-            w.old_scope = params.old_scopes
-            w.new_scope = params.scopes
-            raise w
diff --git a/lib/oauthlib/oauth2/rfc6749/request_validator.py b/lib/oauthlib/oauth2/rfc6749/request_validator.py
deleted file mode 100644
index 3910c0b9..00000000
--- a/lib/oauthlib/oauth2/rfc6749/request_validator.py
+++ /dev/null
@@ -1,680 +0,0 @@
-"""
-oauthlib.oauth2.rfc6749.request_validator
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-"""
-import logging
-
-log = logging.getLogger(__name__)
-
-
-class RequestValidator:
-
-    def client_authentication_required(self, request, *args, **kwargs):
-        """Determine if client authentication is required for current request.
-
-        According to the rfc6749, client authentication is required in the following cases:
-            - Resource Owner Password Credentials Grant, when Client type is Confidential or when
-              Client was issued client credentials or whenever Client provided client
-              authentication, see `Section 4.3.2`_.
-            - Authorization Code Grant, when Client type is Confidential or when Client was issued
-              client credentials or whenever Client provided client authentication,
-              see `Section 4.1.3`_.
-            - Refresh Token Grant, when Client type is Confidential or when Client was issued
-              client credentials or whenever Client provided client authentication, see
-              `Section 6`_
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: True or False
-
-        Method is used by:
-            - Authorization Code Grant
-            - Resource Owner Password Credentials Grant
-            - Refresh Token Grant
-
-        .. _`Section 4.3.2`: https://tools.ietf.org/html/rfc6749#section-4.3.2
-        .. _`Section 4.1.3`: https://tools.ietf.org/html/rfc6749#section-4.1.3
-        .. _`Section 6`: https://tools.ietf.org/html/rfc6749#section-6
-        """
-        return True
-
-    def authenticate_client(self, request, *args, **kwargs):
-        """Authenticate client through means outside the OAuth 2 spec.
-
-        Means of authentication is negotiated beforehand and may for example
-        be `HTTP Basic Authentication Scheme`_ which utilizes the Authorization
-        header.
-
-        Headers may be accesses through request.headers and parameters found in
-        both body and query can be obtained by direct attribute access, i.e.
-        request.client_id for client_id in the URL query.
-		
-        The authentication process is required to contain the identification of
-        the client (i.e. search the database based on the client_id). In case the
-        client doesn't exist based on the received client_id, this method has to
-        return False and the HTTP response created by the library will contain
-        'invalid_client' message. 
-
-        After the client identification succeeds, this method needs to set the
-        client on the request, i.e. request.client = client. A client object's
-        class must contain the 'client_id' attribute and the 'client_id' must have
-        a value.
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: True or False
-
-        Method is used by:
-            - Authorization Code Grant
-            - Resource Owner Password Credentials Grant (may be disabled)
-            - Client Credentials Grant
-            - Refresh Token Grant
-
-        .. _`HTTP Basic Authentication Scheme`: https://tools.ietf.org/html/rfc1945#section-11.1
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def authenticate_client_id(self, client_id, request, *args, **kwargs):
-        """Ensure client_id belong to a non-confidential client.
-
-        A non-confidential client is one that is not required to authenticate
-        through other means, such as using HTTP Basic.
-
-        Note, while not strictly necessary it can often be very convenient
-        to set request.client to the client object associated with the
-        given client_id.
-
-        :param client_id: Unicode client identifier.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: True or False
-
-        Method is used by:
-            - Authorization Code Grant
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def confirm_redirect_uri(self, client_id, code, redirect_uri, client, request,
-                             *args, **kwargs):
-        """Ensure that the authorization process represented by this authorization
-        code began with this 'redirect_uri'.
-
-        If the client specifies a redirect_uri when obtaining code then that
-        redirect URI must be bound to the code and verified equal in this
-        method, according to RFC 6749 section 4.1.3.  Do not compare against
-        the client's allowed redirect URIs, but against the URI used when the
-        code was saved.
-
-        :param client_id: Unicode client identifier.
-        :param code: Unicode authorization_code.
-        :param redirect_uri: Unicode absolute URI.
-        :param client: Client object set by you, see ``.authenticate_client``.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: True or False
-
-        Method is used by:
-            - Authorization Code Grant (during token request)
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def get_default_redirect_uri(self, client_id, request, *args, **kwargs):
-        """Get the default redirect URI for the client.
-
-        :param client_id: Unicode client identifier.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: The default redirect URI for the client
-
-        Method is used by:
-            - Authorization Code Grant
-            - Implicit Grant
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def get_default_scopes(self, client_id, request, *args, **kwargs):
-        """Get the default scopes for the client.
-
-        :param client_id: Unicode client identifier.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: List of default scopes
-
-        Method is used by all core grant types:
-            - Authorization Code Grant
-            - Implicit Grant
-            - Resource Owner Password Credentials Grant
-            - Client Credentials grant
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def get_original_scopes(self, refresh_token, request, *args, **kwargs):
-        """Get the list of scopes associated with the refresh token.
-
-        :param refresh_token: Unicode refresh token.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: List of scopes.
-
-        Method is used by:
-            - Refresh token grant
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def is_within_original_scope(self, request_scopes, refresh_token, request, *args, **kwargs):
-        """Check if requested scopes are within a scope of the refresh token.
-
-        When access tokens are refreshed the scope of the new token
-        needs to be within the scope of the original token. This is
-        ensured by checking that all requested scopes strings are on
-        the list returned by the get_original_scopes. If this check
-        fails, is_within_original_scope is called. The method can be
-        used in situations where returning all valid scopes from the
-        get_original_scopes is not practical.
-
-        :param request_scopes: A list of scopes that were requested by client.
-        :param refresh_token: Unicode refresh_token.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: True or False
-
-        Method is used by:
-            - Refresh token grant
-        """
-        return False
-
-    def introspect_token(self, token, token_type_hint, request, *args, **kwargs):
-        """Introspect an access or refresh token.
-
-        Called once the introspect request is validated. This method should
-        verify the *token* and either return a dictionary with the list of
-        claims associated, or `None` in case the token is unknown.
-
-        Below the list of registered claims you should be interested in:
-
-        - scope : space-separated list of scopes
-        - client_id : client identifier
-        - username : human-readable identifier for the resource owner
-        - token_type : type of the token
-        - exp : integer timestamp indicating when this token will expire
-        - iat : integer timestamp indicating when this token was issued
-        - nbf : integer timestamp indicating when it can be "not-before" used
-        - sub : subject of the token - identifier of the resource owner
-        - aud : list of string identifiers representing the intended audience
-        - iss : string representing issuer of this token
-        - jti : string identifier for the token
-
-        Note that most of them are coming directly from JWT RFC. More details
-        can be found in `Introspect Claims`_ or `JWT Claims`_.
-
-        The implementation can use *token_type_hint* to improve lookup
-        efficiency, but must fallback to other types to be compliant with RFC.
-
-        The dict of claims is added to request.token after this method.
-
-        :param token: The token string.
-        :param token_type_hint: access_token or refresh_token.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-
-        Method is used by:
-            - Introspect Endpoint (all grants are compatible)
-
-        .. _`Introspect Claims`: https://tools.ietf.org/html/rfc7662#section-2.2
-        .. _`JWT Claims`: https://tools.ietf.org/html/rfc7519#section-4
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def invalidate_authorization_code(self, client_id, code, request, *args, **kwargs):
-        """Invalidate an authorization code after use.
-
-        :param client_id: Unicode client identifier.
-        :param code: The authorization code grant (request.code).
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-
-        Method is used by:
-            - Authorization Code Grant
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def revoke_token(self, token, token_type_hint, request, *args, **kwargs):
-        """Revoke an access or refresh token.
-
-        :param token: The token string.
-        :param token_type_hint: access_token or refresh_token.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-
-        Method is used by:
-            - Revocation Endpoint
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def rotate_refresh_token(self, request):
-        """Determine whether to rotate the refresh token. Default, yes.
-
-        When access tokens are refreshed the old refresh token can be kept
-        or replaced with a new one (rotated). Return True to rotate and
-        and False for keeping original.
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: True or False
-
-        Method is used by:
-            - Refresh Token Grant
-        """
-        return True
-
-    def save_authorization_code(self, client_id, code, request, *args, **kwargs):
-        """Persist the authorization_code.
-
-        The code should at minimum be stored with:
-            - the client_id (``client_id``)
-            - the redirect URI used (``request.redirect_uri``)
-            - a resource owner / user (``request.user``)
-            - the authorized scopes (``request.scopes``)
-
-        To support PKCE, you MUST associate the code with:
-            - Code Challenge (``request.code_challenge``) and
-            - Code Challenge Method (``request.code_challenge_method``)
-
-        To support OIDC, you MUST associate the code with:
-            - nonce, if present (``code["nonce"]``)
-
-        The ``code`` argument is actually a dictionary, containing at least a
-        ``code`` key with the actual authorization code:
-
-            ``{'code': 'sdf345jsdf0934f'}``
-
-        It may also have a ``claims`` parameter which, when present, will be a dict
-        deserialized from JSON as described at
-        http://openid.net/specs/openid-connect-core-1_0.html#ClaimsParameter
-        This value should be saved in this method and used again in ``.validate_code``.
-
-        :param client_id: Unicode client identifier.
-        :param code: A dict of the authorization code grant and, optionally, state.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-
-        Method is used by:
-            - Authorization Code Grant
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def save_token(self, token, request, *args, **kwargs):
-        """Persist the token with a token type specific method.
-
-        Currently, only save_bearer_token is supported.
-
-        :param token: A (Bearer) token dict.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        """
-        return self.save_bearer_token(token, request, *args, **kwargs)
-
-    def save_bearer_token(self, token, request, *args, **kwargs):
-        """Persist the Bearer token.
-
-        The Bearer token should at minimum be associated with:
-            - a client and it's client_id, if available
-            - a resource owner / user (request.user)
-            - authorized scopes (request.scopes)
-            - an expiration time
-            - a refresh token, if issued
-            - a claims document, if present in request.claims
-
-        The Bearer token dict may hold a number of items::
-
-            {
-                'token_type': 'Bearer',
-                'access_token': 'askfjh234as9sd8',
-                'expires_in': 3600,
-                'scope': 'string of space separated authorized scopes',
-                'refresh_token': '23sdf876234',  # if issued
-                'state': 'given_by_client',  # if supplied by client (implicit ONLY)
-            }
-
-        Note that while "scope" is a string-separated list of authorized scopes,
-        the original list is still available in request.scopes.
-
-        The token dict is passed as a reference so any changes made to the dictionary
-        will go back to the user.  If additional information must return to the client
-        user, and it is only possible to get this information after writing the token
-        to storage, it should be added to the token dictionary.  If the token
-        dictionary must be modified but the changes should not go back to the user,
-        a copy of the dictionary must be made before making the changes.
-
-        Also note that if an Authorization Code grant request included a valid claims
-        parameter (for OpenID Connect) then the request.claims property will contain
-        the claims dict, which should be saved for later use when generating the
-        id_token and/or UserInfo response content.
-
-        :param token: A Bearer token dict.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: The default redirect URI for the client
-
-        Method is used by all core grant types issuing Bearer tokens:
-            - Authorization Code Grant
-            - Implicit Grant
-            - Resource Owner Password Credentials Grant (might not associate a client)
-            - Client Credentials grant
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def validate_bearer_token(self, token, scopes, request):
-        """Ensure the Bearer token is valid and authorized access to scopes.
-
-        :param token: A string of random characters.
-        :param scopes: A list of scopes associated with the protected resource.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-
-        A key to OAuth 2 security and restricting impact of leaked tokens is
-        the short expiration time of tokens, *always ensure the token has not
-        expired!*.
-
-        Two different approaches to scope validation:
-
-            1) all(scopes). The token must be authorized access to all scopes
-                            associated with the resource. For example, the
-                            token has access to ``read-only`` and ``images``,
-                            thus the client can view images but not upload new.
-                            Allows for fine grained access control through
-                            combining various scopes.
-
-            2) any(scopes). The token must be authorized access to one of the
-                            scopes associated with the resource. For example,
-                            token has access to ``read-only-images``.
-                            Allows for fine grained, although arguably less
-                            convenient, access control.
-
-        A powerful way to use scopes would mimic UNIX ACLs and see a scope
-        as a group with certain privileges. For a restful API these might
-        map to HTTP verbs instead of read, write and execute.
-
-        Note, the request.user attribute can be set to the resource owner
-        associated with this token. Similarly the request.client and
-        request.scopes attribute can be set to associated client object
-        and authorized scopes. If you then use a decorator such as the
-        one provided for django these attributes will be made available
-        in all protected views as keyword arguments.
-
-        :param token: Unicode Bearer token
-        :param scopes: List of scopes (defined by you)
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: True or False
-
-        Method is indirectly used by all core Bearer token issuing grant types:
-            - Authorization Code Grant
-            - Implicit Grant
-            - Resource Owner Password Credentials Grant
-            - Client Credentials Grant
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def validate_client_id(self, client_id, request, *args, **kwargs):
-        """Ensure client_id belong to a valid and active client.
-
-        Note, while not strictly necessary it can often be very convenient
-        to set request.client to the client object associated with the
-        given client_id.
-
-        :param client_id: Unicode client identifier.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: True or False
-
-        Method is used by:
-            - Authorization Code Grant
-            - Implicit Grant
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def validate_code(self, client_id, code, client, request, *args, **kwargs):
-        """Verify that the authorization_code is valid and assigned to the given
-        client.
-
-        Before returning true, set the following based on the information stored
-        with the code in 'save_authorization_code':
-
-            - request.user
-            - request.scopes
-            - request.claims (if given)
-
-        OBS! The request.user attribute should be set to the resource owner
-        associated with this authorization code. Similarly request.scopes
-        must also be set.
-
-        The request.claims property, if it was given, should assigned a dict.
-
-        If PKCE is enabled (see 'is_pkce_required' and 'save_authorization_code')
-        you MUST set the following based on the information stored:
-
-            - request.code_challenge
-            - request.code_challenge_method
-
-        :param client_id: Unicode client identifier.
-        :param code: Unicode authorization code.
-        :param client: Client object set by you, see ``.authenticate_client``.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: True or False
-
-        Method is used by:
-            - Authorization Code Grant
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def validate_grant_type(self, client_id, grant_type, client, request, *args, **kwargs):
-        """Ensure client is authorized to use the grant_type requested.
-
-        :param client_id: Unicode client identifier.
-        :param grant_type: Unicode grant type, i.e. authorization_code, password.
-        :param client: Client object set by you, see ``.authenticate_client``.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: True or False
-
-        Method is used by:
-            - Authorization Code Grant
-            - Resource Owner Password Credentials Grant
-            - Client Credentials Grant
-            - Refresh Token Grant
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def validate_redirect_uri(self, client_id, redirect_uri, request, *args, **kwargs):
-        """Ensure client is authorized to redirect to the redirect_uri requested.
-
-        All clients should register the absolute URIs of all URIs they intend
-        to redirect to. The registration is outside of the scope of oauthlib.
-
-        :param client_id: Unicode client identifier.
-        :param redirect_uri: Unicode absolute URI.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: True or False
-
-        Method is used by:
-            - Authorization Code Grant
-            - Implicit Grant
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def validate_refresh_token(self, refresh_token, client, request, *args, **kwargs):
-        """Ensure the Bearer token is valid and authorized access to scopes.
-
-        OBS! The request.user attribute should be set to the resource owner
-        associated with this refresh token.
-
-        :param refresh_token: Unicode refresh token.
-        :param client: Client object set by you, see ``.authenticate_client``.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: True or False
-
-        Method is used by:
-            - Authorization Code Grant (indirectly by issuing refresh tokens)
-            - Resource Owner Password Credentials Grant (also indirectly)
-            - Refresh Token Grant
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def validate_response_type(self, client_id, response_type, client, request, *args, **kwargs):
-        """Ensure client is authorized to use the response_type requested.
-
-        :param client_id: Unicode client identifier.
-        :param response_type: Unicode response type, i.e. code, token.
-        :param client: Client object set by you, see ``.authenticate_client``.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: True or False
-
-        Method is used by:
-            - Authorization Code Grant
-            - Implicit Grant
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def validate_scopes(self, client_id, scopes, client, request, *args, **kwargs):
-        """Ensure the client is authorized access to requested scopes.
-
-        :param client_id: Unicode client identifier.
-        :param scopes: List of scopes (defined by you).
-        :param client: Client object set by you, see ``.authenticate_client``.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: True or False
-
-        Method is used by all core grant types:
-            - Authorization Code Grant
-            - Implicit Grant
-            - Resource Owner Password Credentials Grant
-            - Client Credentials Grant
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def validate_user(self, username, password, client, request, *args, **kwargs):
-        """Ensure the username and password is valid.
-
-        OBS! The validation should also set the user attribute of the request
-        to a valid resource owner, i.e. request.user = username or similar. If
-        not set you will be unable to associate a token with a user in the
-        persistence method used (commonly, save_bearer_token).
-
-        :param username: Unicode username.
-        :param password: Unicode password.
-        :param client: Client object set by you, see ``.authenticate_client``.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: True or False
-
-        Method is used by:
-            - Resource Owner Password Credentials Grant
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def is_pkce_required(self, client_id, request):
-        """Determine if current request requires PKCE. Default, False.
-        This is called for both "authorization" and "token" requests.
-
-        Override this method by ``return True`` to enable PKCE for everyone.
-        You might want to enable it only for public clients.
-        Note that PKCE can also be used in addition of a client authentication.
-
-        OAuth 2.0 public clients utilizing the Authorization Code Grant are
-        susceptible to the authorization code interception attack.  This
-        specification describes the attack as well as a technique to mitigate
-        against the threat through the use of Proof Key for Code Exchange
-        (PKCE, pronounced "pixy"). See `RFC7636`_.
-
-        :param client_id: Client identifier.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: True or False
-
-        Method is used by:
-            - Authorization Code Grant
-
-        .. _`RFC7636`: https://tools.ietf.org/html/rfc7636
-        """
-        return False
-
-    def get_code_challenge(self, code, request):
-        """Is called for every "token" requests.
-
-        When the server issues the authorization code in the authorization
-        response, it MUST associate the ``code_challenge`` and
-        ``code_challenge_method`` values with the authorization code so it can
-        be verified later.
-
-        Typically, the ``code_challenge`` and ``code_challenge_method`` values
-        are stored in encrypted form in the ``code`` itself but could
-        alternatively be stored on the server associated with the code.  The
-        server MUST NOT include the ``code_challenge`` value in client requests
-        in a form that other entities can extract.
-
-        Return the ``code_challenge`` associated to the code.
-        If ``None`` is returned, code is considered to not be associated to any
-        challenges.
-
-        :param code: Authorization code.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: code_challenge string
-
-        Method is used by:
-            - Authorization Code Grant - when PKCE is active
-
-        """
-        return None
-
-    def get_code_challenge_method(self, code, request):
-        """Is called during the "token" request processing, when a
-        ``code_verifier`` and a ``code_challenge`` has been provided.
-
-        See ``.get_code_challenge``.
-
-        Must return ``plain`` or ``S256``. You can return a custom value if you have
-        implemented your own ``AuthorizationCodeGrant`` class.
-
-        :param code: Authorization code.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: code_challenge_method string
-
-        Method is used by:
-            - Authorization Code Grant - when PKCE is active
-
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def is_origin_allowed(self, client_id, origin, request, *args, **kwargs):
-        """Indicate if the given origin is allowed to access the token endpoint
-        via Cross-Origin Resource Sharing (CORS).  CORS is used by browser-based
-        clients, such as Single-Page Applications, to perform the Authorization
-        Code Grant.
-
-        (Note:  If performing Authorization Code Grant via a public client such
-        as a browser, you should use PKCE as well.)
-
-        If this method returns true, the appropriate CORS headers will be added
-        to the response.  By default this method always returns False, meaning
-        CORS is disabled.
-
-        :param client_id: Unicode client identifier.
-        :param redirect_uri: Unicode origin.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: bool
-
-        Method is used by:
-            - Authorization Code Grant
-            - Refresh Token Grant
-
-        """
-        return False
diff --git a/lib/oauthlib/oauth2/rfc6749/tokens.py b/lib/oauthlib/oauth2/rfc6749/tokens.py
deleted file mode 100644
index 0757d07e..00000000
--- a/lib/oauthlib/oauth2/rfc6749/tokens.py
+++ /dev/null
@@ -1,356 +0,0 @@
-"""
-oauthlib.oauth2.rfc6749.tokens
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This module contains methods for adding two types of access tokens to requests.
-
-- Bearer https://tools.ietf.org/html/rfc6750
-- MAC https://tools.ietf.org/html/draft-ietf-oauth-v2-http-mac-01
-"""
-import hashlib
-import hmac
-import warnings
-from binascii import b2a_base64
-from urllib.parse import urlparse
-
-from oauthlib import common
-from oauthlib.common import add_params_to_qs, add_params_to_uri
-
-from . import utils
-
-
-class OAuth2Token(dict):
-
-    def __init__(self, params, old_scope=None):
-        super().__init__(params)
-        self._new_scope = None
-        if 'scope' in params and params['scope']:
-            self._new_scope = set(utils.scope_to_list(params['scope']))
-        if old_scope is not None:
-            self._old_scope = set(utils.scope_to_list(old_scope))
-            if self._new_scope is None:
-                # the rfc says that if the scope hasn't changed, it's optional
-                # in params so set the new scope to the old scope
-                self._new_scope = self._old_scope
-        else:
-            self._old_scope = self._new_scope
-
-    @property
-    def scope_changed(self):
-        return self._new_scope != self._old_scope
-
-    @property
-    def old_scope(self):
-        return utils.list_to_scope(self._old_scope)
-
-    @property
-    def old_scopes(self):
-        return list(self._old_scope)
-
-    @property
-    def scope(self):
-        return utils.list_to_scope(self._new_scope)
-
-    @property
-    def scopes(self):
-        return list(self._new_scope)
-
-    @property
-    def missing_scopes(self):
-        return list(self._old_scope - self._new_scope)
-
-    @property
-    def additional_scopes(self):
-        return list(self._new_scope - self._old_scope)
-
-
-def prepare_mac_header(token, uri, key, http_method,
-                       nonce=None,
-                       headers=None,
-                       body=None,
-                       ext='',
-                       hash_algorithm='hmac-sha-1',
-                       issue_time=None,
-                       draft=0):
-    """Add an `MAC Access Authentication`_ signature to headers.
-
-    Unlike OAuth 1, this HMAC signature does not require inclusion of the
-    request payload/body, neither does it use a combination of client_secret
-    and token_secret but rather a mac_key provided together with the access
-    token.
-
-    Currently two algorithms are supported, "hmac-sha-1" and "hmac-sha-256",
-    `extension algorithms`_ are not supported.
-
-    Example MAC Authorization header, linebreaks added for clarity
-
-    Authorization: MAC id="h480djs93hd8",
-                       nonce="1336363200:dj83hs9s",
-                       mac="bhCQXTVyfj5cmA9uKkPFx1zeOXM="
-
-    .. _`MAC Access Authentication`: https://tools.ietf.org/html/draft-ietf-oauth-v2-http-mac-01
-    .. _`extension algorithms`: https://tools.ietf.org/html/draft-ietf-oauth-v2-http-mac-01#section-7.1
-
-    :param token:
-    :param uri: Request URI.
-    :param key: MAC given provided by token endpoint.
-    :param http_method: HTTP Request method.
-    :param nonce:
-    :param headers: Request headers as a dictionary.
-    :param body:
-    :param ext:
-    :param hash_algorithm: HMAC algorithm provided by token endpoint.
-    :param issue_time: Time when the MAC credentials were issued (datetime).
-    :param draft: MAC authentication specification version.
-    :return: headers dictionary with the authorization field added.
-    """
-    http_method = http_method.upper()
-    host, port = utils.host_from_uri(uri)
-
-    if hash_algorithm.lower() == 'hmac-sha-1':
-        h = hashlib.sha1
-    elif hash_algorithm.lower() == 'hmac-sha-256':
-        h = hashlib.sha256
-    else:
-        raise ValueError('unknown hash algorithm')
-
-    if draft == 0:
-        nonce = nonce or '{}:{}'.format(utils.generate_age(issue_time),
-                                          common.generate_nonce())
-    else:
-        ts = common.generate_timestamp()
-        nonce = common.generate_nonce()
-
-    sch, net, path, par, query, fra = urlparse(uri)
-
-    if query:
-        request_uri = path + '?' + query
-    else:
-        request_uri = path
-
-    # Hash the body/payload
-    if body is not None and draft == 0:
-        body = body.encode('utf-8')
-        bodyhash = b2a_base64(h(body).digest())[:-1].decode('utf-8')
-    else:
-        bodyhash = ''
-
-    # Create the normalized base string
-    base = []
-    if draft == 0:
-        base.append(nonce)
-    else:
-        base.append(ts)
-        base.append(nonce)
-    base.append(http_method.upper())
-    base.append(request_uri)
-    base.append(host)
-    base.append(port)
-    if draft == 0:
-        base.append(bodyhash)
-    base.append(ext or '')
-    base_string = '\n'.join(base) + '\n'
-
-    # hmac struggles with unicode strings - http://bugs.python.org/issue5285
-    if isinstance(key, str):
-        key = key.encode('utf-8')
-    sign = hmac.new(key, base_string.encode('utf-8'), h)
-    sign = b2a_base64(sign.digest())[:-1].decode('utf-8')
-
-    header = []
-    header.append('MAC id="%s"' % token)
-    if draft != 0:
-        header.append('ts="%s"' % ts)
-    header.append('nonce="%s"' % nonce)
-    if bodyhash:
-        header.append('bodyhash="%s"' % bodyhash)
-    if ext:
-        header.append('ext="%s"' % ext)
-    header.append('mac="%s"' % sign)
-
-    headers = headers or {}
-    headers['Authorization'] = ', '.join(header)
-    return headers
-
-
-def prepare_bearer_uri(token, uri):
-    """Add a `Bearer Token`_ to the request URI.
-    Not recommended, use only if client can't use authorization header or body.
-
-    http://www.example.com/path?access_token=h480djs93hd8
-
-    .. _`Bearer Token`: https://tools.ietf.org/html/rfc6750
-
-    :param token:
-    :param uri:
-    """
-    return add_params_to_uri(uri, [(('access_token', token))])
-
-
-def prepare_bearer_headers(token, headers=None):
-    """Add a `Bearer Token`_ to the request URI.
-    Recommended method of passing bearer tokens.
-
-    Authorization: Bearer h480djs93hd8
-
-    .. _`Bearer Token`: https://tools.ietf.org/html/rfc6750
-
-    :param token:
-    :param headers:
-    """
-    headers = headers or {}
-    headers['Authorization'] = 'Bearer %s' % token
-    return headers
-
-
-def prepare_bearer_body(token, body=''):
-    """Add a `Bearer Token`_ to the request body.
-
-    access_token=h480djs93hd8
-
-    .. _`Bearer Token`: https://tools.ietf.org/html/rfc6750
-
-    :param token:
-    :param body:
-    """
-    return add_params_to_qs(body, [(('access_token', token))])
-
-
-def random_token_generator(request, refresh_token=False):
-    """
-    :param request: OAuthlib request.
-    :type request: oauthlib.common.Request
-    :param refresh_token:
-    """
-    return common.generate_token()
-
-
-def signed_token_generator(private_pem, **kwargs):
-    """
-    :param private_pem:
-    """
-    def signed_token_generator(request):
-        request.claims = kwargs
-        return common.generate_signed_token(private_pem, request)
-
-    return signed_token_generator
-
-
-def get_token_from_header(request):
-    """
-    Helper function to extract a token from the request header.
-
-    :param request: OAuthlib request.
-    :type request: oauthlib.common.Request
-    :return: Return the token or None if the Authorization header is malformed.
-    """
-    token = None
-
-    if 'Authorization' in request.headers:
-        split_header = request.headers.get('Authorization').split()
-        if len(split_header) == 2 and split_header[0].lower() == 'bearer':
-            token = split_header[1]
-    else:
-        token = request.access_token
-
-    return token
-
-
-class TokenBase:
-    __slots__ = ()
-
-    def __call__(self, request, refresh_token=False):
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def validate_request(self, request):
-        """
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def estimate_type(self, request):
-        """
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-
-class BearerToken(TokenBase):
-    __slots__ = (
-        'request_validator', 'token_generator',
-        'refresh_token_generator', 'expires_in'
-    )
-
-    def __init__(self, request_validator=None, token_generator=None,
-                 expires_in=None, refresh_token_generator=None):
-        self.request_validator = request_validator
-        self.token_generator = token_generator or random_token_generator
-        self.refresh_token_generator = (
-            refresh_token_generator or self.token_generator
-        )
-        self.expires_in = expires_in or 3600
-
-    def create_token(self, request, refresh_token=False, **kwargs):
-        """
-        Create a BearerToken, by default without refresh token.
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :param refresh_token:
-        """
-        if "save_token" in kwargs:
-            warnings.warn("`save_token` has been deprecated, it was not called internally."
-                          "If you do, call `request_validator.save_token()` instead.",
-                          DeprecationWarning)
-
-        if callable(self.expires_in):
-            expires_in = self.expires_in(request)
-        else:
-            expires_in = self.expires_in
-
-        request.expires_in = expires_in
-
-        token = {
-            'access_token': self.token_generator(request),
-            'expires_in': expires_in,
-            'token_type': 'Bearer',
-        }
-
-        # If provided, include - this is optional in some cases https://tools.ietf.org/html/rfc6749#section-3.3 but
-        # there is currently no mechanism to coordinate issuing a token for only a subset of the requested scopes so
-        # all tokens issued are for the entire set of requested scopes.
-        if request.scopes is not None:
-            token['scope'] = ' '.join(request.scopes)
-
-        if refresh_token:
-            if (request.refresh_token and
-                    not self.request_validator.rotate_refresh_token(request)):
-                token['refresh_token'] = request.refresh_token
-            else:
-                token['refresh_token'] = self.refresh_token_generator(request)
-
-        token.update(request.extra_credentials or {})
-        return OAuth2Token(token)
-
-    def validate_request(self, request):
-        """
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        """
-        token = get_token_from_header(request)
-        return self.request_validator.validate_bearer_token(
-            token, request.scopes, request)
-
-    def estimate_type(self, request):
-        """
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        """
-        if request.headers.get('Authorization', '').split(' ')[0].lower() == 'bearer':
-            return 9
-        elif request.access_token is not None:
-            return 5
-        else:
-            return 0
diff --git a/lib/oauthlib/oauth2/rfc6749/utils.py b/lib/oauthlib/oauth2/rfc6749/utils.py
deleted file mode 100644
index 7dc27b3d..00000000
--- a/lib/oauthlib/oauth2/rfc6749/utils.py
+++ /dev/null
@@ -1,83 +0,0 @@
-"""
-oauthlib.utils
-~~~~~~~~~~~~~~
-
-This module contains utility methods used by various parts of the OAuth 2 spec.
-"""
-import datetime
-import os
-from urllib.parse import quote, urlparse
-
-from oauthlib.common import urldecode
-
-
-def list_to_scope(scope):
-    """Convert a list of scopes to a space separated string."""
-    if isinstance(scope, str) or scope is None:
-        return scope
-    elif isinstance(scope, (set, tuple, list)):
-        return " ".join([str(s) for s in scope])
-    else:
-        raise ValueError("Invalid scope (%s), must be string, tuple, set, or list." % scope)
-
-
-def scope_to_list(scope):
-    """Convert a space separated string to a list of scopes."""
-    if isinstance(scope, (tuple, list, set)):
-        return [str(s) for s in scope]
-    elif scope is None:
-        return None
-    else:
-        return scope.strip().split(" ")
-
-
-def params_from_uri(uri):
-    params = dict(urldecode(urlparse(uri).query))
-    if 'scope' in params:
-        params['scope'] = scope_to_list(params['scope'])
-    return params
-
-
-def host_from_uri(uri):
-    """Extract hostname and port from URI.
-
-    Will use default port for HTTP and HTTPS if none is present in the URI.
-    """
-    default_ports = {
-        'HTTP': '80',
-        'HTTPS': '443',
-    }
-
-    sch, netloc, path, par, query, fra = urlparse(uri)
-    if ':' in netloc:
-        netloc, port = netloc.split(':', 1)
-    else:
-        port = default_ports.get(sch.upper())
-
-    return netloc, port
-
-
-def escape(u):
-    """Escape a string in an OAuth-compatible fashion.
-
-    TODO: verify whether this can in fact be used for OAuth 2
-
-    """
-    if not isinstance(u, str):
-        raise ValueError('Only unicode objects are escapable.')
-    return quote(u.encode('utf-8'), safe=b'~')
-
-
-def generate_age(issue_time):
-    """Generate a age parameter for MAC authentication draft 00."""
-    td = datetime.datetime.now() - issue_time
-    age = (td.microseconds + (td.seconds + td.days * 24 * 3600)
-           * 10 ** 6) / 10 ** 6
-    return str(age)
-
-
-def is_secure_transport(uri):
-    """Check if the uri is over ssl."""
-    if os.environ.get('OAUTHLIB_INSECURE_TRANSPORT'):
-        return True
-    return uri.lower().startswith('https://')
diff --git a/lib/oauthlib/oauth2/rfc8628/__init__.py b/lib/oauthlib/oauth2/rfc8628/__init__.py
deleted file mode 100644
index 531929dc..00000000
--- a/lib/oauthlib/oauth2/rfc8628/__init__.py
+++ /dev/null
@@ -1,10 +0,0 @@
-"""
-oauthlib.oauth2.rfc8628
-~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of various logic needed
-for consuming and providing OAuth 2.0 Device Authorization RFC8628.
-"""
-import logging
-
-log = logging.getLogger(__name__)
diff --git a/lib/oauthlib/oauth2/rfc8628/clients/__init__.py b/lib/oauthlib/oauth2/rfc8628/clients/__init__.py
deleted file mode 100644
index 130b52e3..00000000
--- a/lib/oauthlib/oauth2/rfc8628/clients/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-"""
-oauthlib.oauth2.rfc8628
-~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of various logic needed
-for consuming OAuth 2.0 Device Authorization RFC8628.
-"""
-from .device import DeviceClient
diff --git a/lib/oauthlib/oauth2/rfc8628/clients/device.py b/lib/oauthlib/oauth2/rfc8628/clients/device.py
deleted file mode 100644
index b9ba2150..00000000
--- a/lib/oauthlib/oauth2/rfc8628/clients/device.py
+++ /dev/null
@@ -1,95 +0,0 @@
-"""
-oauthlib.oauth2.rfc8628
-~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of various logic needed
-for consuming and providing OAuth 2.0 Device Authorization RFC8628.
-"""
-from oauthlib.common import add_params_to_uri
-from oauthlib.oauth2 import BackendApplicationClient, Client
-from oauthlib.oauth2.rfc6749.errors import InsecureTransportError
-from oauthlib.oauth2.rfc6749.parameters import prepare_token_request
-from oauthlib.oauth2.rfc6749.utils import is_secure_transport, list_to_scope
-
-
-class DeviceClient(Client):
-
-    """A public client utilizing the device authorization workflow.
-
-    The client can request an access token using a device code and
-    a public client id associated with the device code as defined
-    in RFC8628.
-
-    The device authorization grant type can be used to obtain both
-    access tokens and refresh tokens and is intended to be used in
-    a scenario where the device being authorized does not have a
-    user interface that is suitable for performing authentication.
-    """
-
-    grant_type = 'urn:ietf:params:oauth:grant-type:device_code'
-
-    def __init__(self, client_id, **kwargs):
-        super().__init__(client_id, **kwargs)
-        self.client_secret = kwargs.get('client_secret')
-
-    def prepare_request_uri(self, uri, scope=None, **kwargs):
-        if not is_secure_transport(uri):
-            raise InsecureTransportError()
-
-        scope = self.scope if scope is None else scope
-        params = [(('client_id', self.client_id)), (('grant_type', self.grant_type))]
-
-        if self.client_secret is not None:
-            params.append(('client_secret', self.client_secret))
-
-        if scope:
-            params.append(('scope', list_to_scope(scope)))
-
-        for k in kwargs:
-            if kwargs[k]:
-                params.append((str(k), kwargs[k]))
-
-        return add_params_to_uri(uri, params)
-
-    def prepare_request_body(self, device_code, body='', scope=None,
-                             include_client_id=False, **kwargs):
-        """Add device_code to request body
-
-        The client makes a request to the token endpoint by adding the
-        device_code as a parameter using the
-        "application/x-www-form-urlencoded" format to the HTTP request
-        body.
-
-        :param body: Existing request body (URL encoded string) to embed parameters
-                     into. This may contain extra parameters. Default ''.
-        :param scope:   The scope of the access request as described by
-                        `Section 3.3`_.
-
-        :param include_client_id: `True` to send the `client_id` in the
-                                  body of the upstream request. This is required
-                                  if the client is not authenticating with the
-                                  authorization server as described in
-                                  `Section 3.2.1`_. False otherwise (default).
-        :type include_client_id: Boolean
-
-        :param kwargs:  Extra credentials to include in the token request.
-
-        The prepared body will include all provided device_code as well as
-        the ``grant_type`` parameter set to
-        ``urn:ietf:params:oauth:grant-type:device_code``::
-
-            >>> from oauthlib.oauth2 import DeviceClient
-            >>> client = DeviceClient('your_id', 'your_code')
-            >>> client.prepare_request_body(scope=['hello', 'world'])
-            'grant_type=urn:ietf:params:oauth:grant-type:device_code&scope=hello+world'
-
-        .. _`Section 3.2.1`: https://datatracker.ietf.org/doc/html/rfc6749#section-3.2.1
-        .. _`Section 3.3`: https://datatracker.ietf.org/doc/html/rfc6749#section-3.3
-        .. _`Section 3.4`: https://datatracker.ietf.org/doc/html/rfc8628#section-3.4
-        """
-
-        kwargs['client_id'] = self.client_id
-        kwargs['include_client_id'] = include_client_id
-        scope = self.scope if scope is None else scope
-        return prepare_token_request(self.grant_type, body=body, device_code=device_code,
-                                     scope=scope, **kwargs)
diff --git a/lib/oauthlib/openid/__init__.py b/lib/oauthlib/openid/__init__.py
deleted file mode 100644
index e3174374..00000000
--- a/lib/oauthlib/openid/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-"""
-oauthlib.openid
-~~~~~~~~~~~~~~
-
-"""
-from .connect.core.endpoints import Server, UserInfoEndpoint
-from .connect.core.request_validator import RequestValidator
diff --git a/lib/oauthlib/openid/connect/__init__.py b/lib/oauthlib/openid/connect/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/oauthlib/openid/connect/core/__init__.py b/lib/oauthlib/openid/connect/core/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/oauthlib/openid/connect/core/endpoints/__init__.py b/lib/oauthlib/openid/connect/core/endpoints/__init__.py
deleted file mode 100644
index 7017ff4f..00000000
--- a/lib/oauthlib/openid/connect/core/endpoints/__init__.py
+++ /dev/null
@@ -1,9 +0,0 @@
-"""
-oauthlib.oopenid.core
-~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of various logic needed
-for consuming and providing OpenID Connect
-"""
-from .pre_configured import Server
-from .userinfo import UserInfoEndpoint
diff --git a/lib/oauthlib/openid/connect/core/endpoints/pre_configured.py b/lib/oauthlib/openid/connect/core/endpoints/pre_configured.py
deleted file mode 100644
index 8ce8bee6..00000000
--- a/lib/oauthlib/openid/connect/core/endpoints/pre_configured.py
+++ /dev/null
@@ -1,97 +0,0 @@
-"""
-oauthlib.openid.connect.core.endpoints.pre_configured
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of various endpoints needed
-for providing OpenID Connect servers.
-"""
-from oauthlib.oauth2.rfc6749.endpoints import (
-    AuthorizationEndpoint, IntrospectEndpoint, ResourceEndpoint,
-    RevocationEndpoint, TokenEndpoint,
-)
-from oauthlib.oauth2.rfc6749.grant_types import (
-    AuthorizationCodeGrant as OAuth2AuthorizationCodeGrant,
-    ClientCredentialsGrant, ImplicitGrant as OAuth2ImplicitGrant,
-    RefreshTokenGrant, ResourceOwnerPasswordCredentialsGrant,
-)
-from oauthlib.oauth2.rfc6749.tokens import BearerToken
-
-from ..grant_types import AuthorizationCodeGrant, HybridGrant, ImplicitGrant
-from ..grant_types.dispatchers import (
-    AuthorizationCodeGrantDispatcher, AuthorizationTokenGrantDispatcher,
-    ImplicitTokenGrantDispatcher,
-)
-from ..tokens import JWTToken
-from .userinfo import UserInfoEndpoint
-
-
-class Server(AuthorizationEndpoint, IntrospectEndpoint, TokenEndpoint,
-             ResourceEndpoint, RevocationEndpoint, UserInfoEndpoint):
-
-    """An all-in-one endpoint featuring all four major grant types."""
-
-    def __init__(self, request_validator, token_expires_in=None,
-                 token_generator=None, refresh_token_generator=None,
-                 *args, **kwargs):
-        """Construct a new all-grants-in-one server.
-
-        :param request_validator: An implementation of
-                                  oauthlib.oauth2.RequestValidator.
-        :param token_expires_in: An int or a function to generate a token
-                                 expiration offset (in seconds) given a
-                                 oauthlib.common.Request object.
-        :param token_generator: A function to generate a token from a request.
-        :param refresh_token_generator: A function to generate a token from a
-                                        request for the refresh token.
-        :param kwargs: Extra parameters to pass to authorization-,
-                       token-, resource-, and revocation-endpoint constructors.
-        """
-        self.auth_grant = OAuth2AuthorizationCodeGrant(request_validator)
-        self.implicit_grant = OAuth2ImplicitGrant(request_validator)
-        self.password_grant = ResourceOwnerPasswordCredentialsGrant(
-            request_validator)
-        self.credentials_grant = ClientCredentialsGrant(request_validator)
-        self.refresh_grant = RefreshTokenGrant(request_validator)
-        self.openid_connect_auth = AuthorizationCodeGrant(request_validator)
-        self.openid_connect_implicit = ImplicitGrant(request_validator)
-        self.openid_connect_hybrid = HybridGrant(request_validator)
-
-        self.bearer = BearerToken(request_validator, token_generator,
-                             token_expires_in, refresh_token_generator)
-
-        self.jwt = JWTToken(request_validator, token_generator,
-                       token_expires_in, refresh_token_generator)
-
-        self.auth_grant_choice = AuthorizationCodeGrantDispatcher(default_grant=self.auth_grant, oidc_grant=self.openid_connect_auth)
-        self.implicit_grant_choice = ImplicitTokenGrantDispatcher(default_grant=self.implicit_grant, oidc_grant=self.openid_connect_implicit)
-
-        # See http://openid.net/specs/oauth-v2-multiple-response-types-1_0.html#Combinations for valid combinations
-        # internally our AuthorizationEndpoint will ensure they can appear in any order for any valid combination
-        AuthorizationEndpoint.__init__(self, default_response_type='code',
-                                       response_types={
-                                           'code': self.auth_grant_choice,
-                                           'token': self.implicit_grant_choice,
-                                           'id_token': self.openid_connect_implicit,
-                                           'id_token token': self.openid_connect_implicit,
-                                           'code token': self.openid_connect_hybrid,
-                                           'code id_token': self.openid_connect_hybrid,
-                                           'code id_token token': self.openid_connect_hybrid,
-                                           'none': self.auth_grant
-                                       },
-                                       default_token_type=self.bearer)
-
-        self.token_grant_choice = AuthorizationTokenGrantDispatcher(request_validator, default_grant=self.auth_grant, oidc_grant=self.openid_connect_auth)
-
-        TokenEndpoint.__init__(self, default_grant_type='authorization_code',
-                               grant_types={
-                                   'authorization_code': self.token_grant_choice,
-                                   'password': self.password_grant,
-                                   'client_credentials': self.credentials_grant,
-                                   'refresh_token': self.refresh_grant,
-                               },
-                               default_token_type=self.bearer)
-        ResourceEndpoint.__init__(self, default_token='Bearer',
-                                  token_types={'Bearer': self.bearer, 'JWT': self.jwt})
-        RevocationEndpoint.__init__(self, request_validator)
-        IntrospectEndpoint.__init__(self, request_validator)
-        UserInfoEndpoint.__init__(self, request_validator)
diff --git a/lib/oauthlib/openid/connect/core/endpoints/userinfo.py b/lib/oauthlib/openid/connect/core/endpoints/userinfo.py
deleted file mode 100644
index 7aa2bbe9..00000000
--- a/lib/oauthlib/openid/connect/core/endpoints/userinfo.py
+++ /dev/null
@@ -1,106 +0,0 @@
-"""
-oauthlib.openid.connect.core.endpoints.userinfo
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This module is an implementation of userinfo endpoint.
-"""
-import json
-import logging
-
-from oauthlib.common import Request
-from oauthlib.oauth2.rfc6749 import errors
-from oauthlib.oauth2.rfc6749.endpoints.base import (
-    BaseEndpoint, catch_errors_and_unavailability,
-)
-from oauthlib.oauth2.rfc6749.tokens import BearerToken
-
-log = logging.getLogger(__name__)
-
-
-class UserInfoEndpoint(BaseEndpoint):
-    """Authorizes access to userinfo resource.
-    """
-    def __init__(self, request_validator):
-        self.bearer = BearerToken(request_validator, None, None, None)
-        self.request_validator = request_validator
-        BaseEndpoint.__init__(self)
-
-    @catch_errors_and_unavailability
-    def create_userinfo_response(self, uri, http_method='GET', body=None, headers=None):
-        """Validate BearerToken and return userinfo from RequestValidator
-
-        The UserInfo Endpoint MUST return a
-        content-type header to indicate which format is being returned. The
-        content-type of the HTTP response MUST be application/json if the
-        response body is a text JSON object; the response body SHOULD be encoded
-        using UTF-8.
-        """
-        request = Request(uri, http_method, body, headers)
-        request.scopes = ["openid"]
-        self.validate_userinfo_request(request)
-
-        claims = self.request_validator.get_userinfo_claims(request)
-        if claims is None:
-            log.error('Userinfo MUST have claims for %r.', request)
-            raise errors.ServerError(status_code=500)
-
-        if isinstance(claims, dict):
-            resp_headers = {
-                'Content-Type': 'application/json'
-            }
-            if "sub" not in claims:
-                log.error('Userinfo MUST have "sub" for %r.', request)
-                raise errors.ServerError(status_code=500)
-            body = json.dumps(claims)
-        elif isinstance(claims, str):
-            resp_headers = {
-                'Content-Type': 'application/jwt'
-            }
-            body = claims
-        else:
-            log.error('Userinfo return unknown response for %r.', request)
-            raise errors.ServerError(status_code=500)
-        log.debug('Userinfo access valid for %r.', request)
-        return resp_headers, body, 200
-
-    def validate_userinfo_request(self, request):
-        """Ensure the request is valid.
-
-        5.3.1.  UserInfo Request
-        The Client sends the UserInfo Request using either HTTP GET or HTTP
-        POST. The Access Token obtained from an OpenID Connect Authentication
-        Request MUST be sent as a Bearer Token, per `Section 2`_ of OAuth 2.0
-        Bearer Token Usage [RFC6750].
-
-        It is RECOMMENDED that the request use the HTTP GET method and the
-        Access Token be sent using the Authorization header field.
-
-        The following is a non-normative example of a UserInfo Request:
-
-        .. code-block:: http
-
-            GET /userinfo HTTP/1.1
-            Host: server.example.com
-            Authorization: Bearer SlAV32hkKG
-
-        5.3.3. UserInfo Error Response
-        When an error condition occurs, the UserInfo Endpoint returns an Error
-        Response as defined in `Section 3`_ of OAuth 2.0 Bearer Token Usage
-        [RFC6750]. (HTTP errors unrelated to RFC 6750 are returned to the User
-        Agent using the appropriate HTTP status code.)
-
-        The following is a non-normative example of a UserInfo Error Response:
-
-        .. code-block:: http
-
-            HTTP/1.1 401 Unauthorized
-            WWW-Authenticate: Bearer error="invalid_token",
-                error_description="The Access Token expired"
-
-        .. _`Section 2`: https://datatracker.ietf.org/doc/html/rfc6750#section-2
-        .. _`Section 3`: https://datatracker.ietf.org/doc/html/rfc6750#section-3
-        """
-        if not self.bearer.validate_request(request):
-            raise errors.InvalidTokenError()
-        if "openid" not in request.scopes:
-            raise errors.InsufficientScopeError()
diff --git a/lib/oauthlib/openid/connect/core/exceptions.py b/lib/oauthlib/openid/connect/core/exceptions.py
deleted file mode 100644
index 099b84e2..00000000
--- a/lib/oauthlib/openid/connect/core/exceptions.py
+++ /dev/null
@@ -1,149 +0,0 @@
-"""
-oauthlib.oauth2.rfc6749.errors
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Error used both by OAuth 2 clients and providers to represent the spec
-defined error responses for all four core grant types.
-"""
-from oauthlib.oauth2.rfc6749.errors import FatalClientError, OAuth2Error
-
-
-class FatalOpenIDClientError(FatalClientError):
-    pass
-
-
-class OpenIDClientError(OAuth2Error):
-    pass
-
-
-class InteractionRequired(OpenIDClientError):
-    """
-    The Authorization Server requires End-User interaction to proceed.
-
-    This error MAY be returned when the prompt parameter value in the
-    Authentication Request is none, but the Authentication Request cannot be
-    completed without displaying a user interface for End-User interaction.
-    """
-    error = 'interaction_required'
-    status_code = 401
-
-
-class LoginRequired(OpenIDClientError):
-    """
-    The Authorization Server requires End-User authentication.
-
-    This error MAY be returned when the prompt parameter value in the
-    Authentication Request is none, but the Authentication Request cannot be
-    completed without displaying a user interface for End-User authentication.
-    """
-    error = 'login_required'
-    status_code = 401
-
-
-class AccountSelectionRequired(OpenIDClientError):
-    """
-    The End-User is REQUIRED to select a session at the Authorization Server.
-
-    The End-User MAY be authenticated at the Authorization Server with
-    different associated accounts, but the End-User did not select a session.
-    This error MAY be returned when the prompt parameter value in the
-    Authentication Request is none, but the Authentication Request cannot be
-    completed without displaying a user interface to prompt for a session to
-    use.
-    """
-    error = 'account_selection_required'
-
-
-class ConsentRequired(OpenIDClientError):
-    """
-    The Authorization Server requires End-User consent.
-
-    This error MAY be returned when the prompt parameter value in the
-    Authentication Request is none, but the Authentication Request cannot be
-    completed without displaying a user interface for End-User consent.
-    """
-    error = 'consent_required'
-    status_code = 401
-
-
-class InvalidRequestURI(OpenIDClientError):
-    """
-    The request_uri in the Authorization Request returns an error or
-    contains invalid data.
-    """
-    error = 'invalid_request_uri'
-    description = 'The request_uri in the Authorization Request returns an ' \
-                  'error or contains invalid data.'
-
-
-class InvalidRequestObject(OpenIDClientError):
-    """
-    The request parameter contains an invalid Request Object.
-    """
-    error = 'invalid_request_object'
-    description = 'The request parameter contains an invalid Request Object.'
-
-
-class RequestNotSupported(OpenIDClientError):
-    """
-    The OP does not support use of the request parameter.
-    """
-    error = 'request_not_supported'
-    description = 'The request parameter is not supported.'
-
-
-class RequestURINotSupported(OpenIDClientError):
-    """
-    The OP does not support use of the request_uri parameter.
-    """
-    error = 'request_uri_not_supported'
-    description = 'The request_uri parameter is not supported.'
-
-
-class RegistrationNotSupported(OpenIDClientError):
-    """
-    The OP does not support use of the registration parameter.
-    """
-    error = 'registration_not_supported'
-    description = 'The registration parameter is not supported.'
-
-
-class InvalidTokenError(OAuth2Error):
-    """
-    The access token provided is expired, revoked, malformed, or
-    invalid for other reasons.  The resource SHOULD respond with
-    the HTTP 401 (Unauthorized) status code.  The client MAY
-    request a new access token and retry the protected resource
-    request.
-    """
-    error = 'invalid_token'
-    status_code = 401
-    description = ("The access token provided is expired, revoked, malformed, "
-                   "or invalid for other reasons.")
-
-
-class InsufficientScopeError(OAuth2Error):
-    """
-    The request requires higher privileges than provided by the
-    access token.  The resource server SHOULD respond with the HTTP
-    403 (Forbidden) status code and MAY include the "scope"
-    attribute with the scope necessary to access the protected
-    resource.
-    """
-    error = 'insufficient_scope'
-    status_code = 403
-    description = ("The request requires higher privileges than provided by "
-                   "the access token.")
-
-
-def raise_from_error(error, params=None):
-    import inspect
-    import sys
-    kwargs = {
-        'description': params.get('error_description'),
-        'uri': params.get('error_uri'),
-        'state': params.get('state')
-    }
-    for _, cls in inspect.getmembers(sys.modules[__name__], inspect.isclass):
-        if cls.error == error:
-            raise cls(**kwargs)
diff --git a/lib/oauthlib/openid/connect/core/grant_types/__init__.py b/lib/oauthlib/openid/connect/core/grant_types/__init__.py
deleted file mode 100644
index 8dad5f60..00000000
--- a/lib/oauthlib/openid/connect/core/grant_types/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-"""
-oauthlib.openid.connect.core.grant_types
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-"""
-from .authorization_code import AuthorizationCodeGrant
-from .base import GrantTypeBase
-from .dispatchers import (
-    AuthorizationCodeGrantDispatcher, AuthorizationTokenGrantDispatcher,
-    ImplicitTokenGrantDispatcher,
-)
-from .hybrid import HybridGrant
-from .implicit import ImplicitGrant
-from .refresh_token import RefreshTokenGrant
diff --git a/lib/oauthlib/openid/connect/core/grant_types/authorization_code.py b/lib/oauthlib/openid/connect/core/grant_types/authorization_code.py
deleted file mode 100644
index 6b2dcc3b..00000000
--- a/lib/oauthlib/openid/connect/core/grant_types/authorization_code.py
+++ /dev/null
@@ -1,43 +0,0 @@
-"""
-oauthlib.openid.connect.core.grant_types
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-"""
-import logging
-
-from oauthlib.oauth2.rfc6749.grant_types.authorization_code import (
-    AuthorizationCodeGrant as OAuth2AuthorizationCodeGrant,
-)
-
-from .base import GrantTypeBase
-
-log = logging.getLogger(__name__)
-
-
-class AuthorizationCodeGrant(GrantTypeBase):
-
-    def __init__(self, request_validator=None, **kwargs):
-        self.proxy_target = OAuth2AuthorizationCodeGrant(
-            request_validator=request_validator, **kwargs)
-        self.custom_validators.post_auth.append(
-            self.openid_authorization_validator)
-        self.register_token_modifier(self.add_id_token)
-
-    def add_id_token(self, token, token_handler, request):
-        """
-        Construct an initial version of id_token, and let the
-        request_validator sign or encrypt it.
-
-        The authorization_code version of this method is used to
-        retrieve the nonce accordingly to the code storage.
-        """
-        # Treat it as normal OAuth 2 auth code request if openid is not present
-        if not request.scopes or 'openid' not in request.scopes:
-            return token
-
-        nonce = self.request_validator.get_authorization_code_nonce(
-            request.client_id,
-            request.code,
-            request.redirect_uri,
-            request
-        )
-        return super().add_id_token(token, token_handler, request, nonce=nonce)
diff --git a/lib/oauthlib/openid/connect/core/grant_types/base.py b/lib/oauthlib/openid/connect/core/grant_types/base.py
deleted file mode 100644
index 33411dad..00000000
--- a/lib/oauthlib/openid/connect/core/grant_types/base.py
+++ /dev/null
@@ -1,326 +0,0 @@
-import base64
-import hashlib
-import logging
-import time
-from json import loads
-
-from oauthlib.oauth2.rfc6749.errors import (
-    ConsentRequired, InvalidRequestError, LoginRequired,
-)
-
-log = logging.getLogger(__name__)
-
-
-class GrantTypeBase:
-
-    # Just proxy the majority of method calls through to the
-    # proxy_target grant type handler, which will usually be either
-    # the standard OAuth2 AuthCode or Implicit grant types.
-    def __getattr__(self, attr):
-        return getattr(self.proxy_target, attr)
-
-    def __setattr__(self, attr, value):
-        proxied_attrs = {'refresh_token', 'response_types'}
-        if attr in proxied_attrs:
-            setattr(self.proxy_target, attr, value)
-        else:
-            super(OpenIDConnectBase, self).__setattr__(attr, value)
-
-    def validate_authorization_request(self, request):
-        """Validates the OpenID Connect authorization request parameters.
-
-        :returns: (list of scopes, dict of request info)
-        """
-        return self.proxy_target.validate_authorization_request(request)
-
-    def _inflate_claims(self, request):
-        # this may be called multiple times in a single request so make sure we only de-serialize the claims once
-        if request.claims and not isinstance(request.claims, dict):
-            # specific claims are requested during the Authorization Request and may be requested for inclusion
-            # in either the id_token or the UserInfo endpoint response
-            # see http://openid.net/specs/openid-connect-core-1_0.html#ClaimsParameter
-            try:
-                request.claims = loads(request.claims)
-            except Exception as ex:
-                raise InvalidRequestError(description="Malformed claims parameter",
-                                          uri="http://openid.net/specs/openid-connect-core-1_0.html#ClaimsParameter")
-
-    def id_token_hash(self, value, hashfunc=hashlib.sha256):
-        """
-        Its value is the base64url encoding of the left-most half of the
-        hash of the octets of the ASCII representation of the access_token
-        value, where the hash algorithm used is the hash algorithm used in
-        the alg Header Parameter of the ID Token's JOSE Header.
-
-        For instance, if the alg is RS256, hash the access_token value
-        with SHA-256, then take the left-most 128 bits and
-        base64url-encode them.
-        For instance, if the alg is HS512, hash the code value with
-        SHA-512, then take the left-most 256 bits and base64url-encode
-        them. The c_hash value is a case-sensitive string.
-
-        Example of hash from OIDC specification (bound to a JWS using RS256):
-
-        code:
-        Qcb0Orv1zh30vL1MPRsbm-diHiMwcLyZvn1arpZv-Jxf_11jnpEX3Tgfvk
-
-        c_hash:
-        LDktKdoQak3Pk0cnXxCltA
-        """
-        digest = hashfunc(value.encode()).digest()
-        left_most = len(digest) // 2
-        return base64.urlsafe_b64encode(digest[:left_most]).decode().rstrip("=")
-
-    def add_id_token(self, token, token_handler, request, nonce=None):
-        """
-        Construct an initial version of id_token, and let the
-        request_validator sign or encrypt it.
-
-        The initial version can contain the fields below, accordingly
-        to the spec:
-        - aud
-        - iat
-        - nonce
-        - at_hash
-        - c_hash
-        """
-        # Treat it as normal OAuth 2 auth code request if openid is not present
-        if not request.scopes or 'openid' not in request.scopes:
-            return token
-
-        # Only add an id token on auth/token step if asked for.
-        if request.response_type and 'id_token' not in request.response_type:
-            return token
-
-        # Implementation mint its own id_token without help.
-        id_token = self.request_validator.get_id_token(token, token_handler, request)
-        if id_token:
-            token['id_token'] = id_token
-            return token
-
-        # Fallback for asking some help from oauthlib framework.
-        # Start with technicals fields bound to the specification.
-        id_token = {}
-        id_token['aud'] = request.client_id
-        id_token['iat'] = int(time.time())
-
-        # nonce is REQUIRED when response_type value is:
-        # - id_token token (Implicit)
-        # - id_token (Implicit)
-        # - code id_token (Hybrid)
-        # - code id_token token (Hybrid)
-        #
-        # nonce is OPTIONAL when response_type value is:
-        # - code (Authorization Code)
-        # - code token (Hybrid)
-        if nonce is not None:
-            id_token["nonce"] = nonce
-
-        # at_hash is REQUIRED when response_type value is:
-        # - id_token token (Implicit)
-        # - code id_token token (Hybrid)
-        #
-        # at_hash is OPTIONAL when:
-        # - code (Authorization code)
-        # - code id_token (Hybrid)
-        # - code token (Hybrid)
-        #
-        # at_hash MAY NOT be used when:
-        # - id_token (Implicit)
-        if "access_token" in token:
-            id_token["at_hash"] = self.id_token_hash(token["access_token"])
-
-        # c_hash is REQUIRED when response_type value is:
-        # - code id_token (Hybrid)
-        # - code id_token token (Hybrid)
-        #
-        # c_hash is OPTIONAL for others.
-        if "code" in token:
-            id_token["c_hash"] = self.id_token_hash(token["code"])
-
-        # Call request_validator to complete/sign/encrypt id_token
-        token['id_token'] = self.request_validator.finalize_id_token(id_token, token, token_handler, request)
-
-        return token
-
-    def openid_authorization_validator(self, request):
-        """Perform OpenID Connect specific authorization request validation.
-
-        nonce
-                OPTIONAL. String value used to associate a Client session with
-                an ID Token, and to mitigate replay attacks. The value is
-                passed through unmodified from the Authentication Request to
-                the ID Token. Sufficient entropy MUST be present in the nonce
-                values used to prevent attackers from guessing values
-
-        display
-                OPTIONAL. ASCII string value that specifies how the
-                Authorization Server displays the authentication and consent
-                user interface pages to the End-User. The defined values are:
-
-                    page - The Authorization Server SHOULD display the
-                    authentication and consent UI consistent with a full User
-                    Agent page view. If the display parameter is not specified,
-                    this is the default display mode.
-
-                    popup - The Authorization Server SHOULD display the
-                    authentication and consent UI consistent with a popup User
-                    Agent window. The popup User Agent window should be of an
-                    appropriate size for a login-focused dialog and should not
-                    obscure the entire window that it is popping up over.
-
-                    touch - The Authorization Server SHOULD display the
-                    authentication and consent UI consistent with a device that
-                    leverages a touch interface.
-
-                    wap - The Authorization Server SHOULD display the
-                    authentication and consent UI consistent with a "feature
-                    phone" type display.
-
-                The Authorization Server MAY also attempt to detect the
-                capabilities of the User Agent and present an appropriate
-                display.
-
-        prompt
-                OPTIONAL. Space delimited, case sensitive list of ASCII string
-                values that specifies whether the Authorization Server prompts
-                the End-User for reauthentication and consent. The defined
-                values are:
-
-                    none - The Authorization Server MUST NOT display any
-                    authentication or consent user interface pages. An error is
-                    returned if an End-User is not already authenticated or the
-                    Client does not have pre-configured consent for the
-                    requested Claims or does not fulfill other conditions for
-                    processing the request. The error code will typically be
-                    login_required, interaction_required, or another code
-                    defined in Section 3.1.2.6. This can be used as a method to
-                    check for existing authentication and/or consent.
-
-                    login - The Authorization Server SHOULD prompt the End-User
-                    for reauthentication. If it cannot reauthenticate the
-                    End-User, it MUST return an error, typically
-                    login_required.
-
-                    consent - The Authorization Server SHOULD prompt the
-                    End-User for consent before returning information to the
-                    Client. If it cannot obtain consent, it MUST return an
-                    error, typically consent_required.
-
-                    select_account - The Authorization Server SHOULD prompt the
-                    End-User to select a user account. This enables an End-User
-                    who has multiple accounts at the Authorization Server to
-                    select amongst the multiple accounts that they might have
-                    current sessions for. If it cannot obtain an account
-                    selection choice made by the End-User, it MUST return an
-                    error, typically account_selection_required.
-
-                The prompt parameter can be used by the Client to make sure
-                that the End-User is still present for the current session or
-                to bring attention to the request. If this parameter contains
-                none with any other value, an error is returned.
-
-        max_age
-                OPTIONAL. Maximum Authentication Age. Specifies the allowable
-                elapsed time in seconds since the last time the End-User was
-                actively authenticated by the OP. If the elapsed time is
-                greater than this value, the OP MUST attempt to actively
-                re-authenticate the End-User. (The max_age request parameter
-                corresponds to the OpenID 2.0 PAPE [OpenID.PAPE] max_auth_age
-                request parameter.) When max_age is used, the ID Token returned
-                MUST include an auth_time Claim Value.
-
-        ui_locales
-                OPTIONAL. End-User's preferred languages and scripts for the
-                user interface, represented as a space-separated list of BCP47
-                [RFC5646] language tag values, ordered by preference. For
-                instance, the value "fr-CA fr en" represents a preference for
-                French as spoken in Canada, then French (without a region
-                designation), followed by English (without a region
-                designation). An error SHOULD NOT result if some or all of the
-                requested locales are not supported by the OpenID Provider.
-
-        id_token_hint
-                OPTIONAL. ID Token previously issued by the Authorization
-                Server being passed as a hint about the End-User's current or
-                past authenticated session with the Client. If the End-User
-                identified by the ID Token is logged in or is logged in by the
-                request, then the Authorization Server returns a positive
-                response; otherwise, it SHOULD return an error, such as
-                login_required. When possible, an id_token_hint SHOULD be
-                present when prompt=none is used and an invalid_request error
-                MAY be returned if it is not; however, the server SHOULD
-                respond successfully when possible, even if it is not present.
-                The Authorization Server need not be listed as an audience of
-                the ID Token when it is used as an id_token_hint value. If the
-                ID Token received by the RP from the OP is encrypted, to use it
-                as an id_token_hint, the Client MUST decrypt the signed ID
-                Token contained within the encrypted ID Token. The Client MAY
-                re-encrypt the signed ID token to the Authentication Server
-                using a key that enables the server to decrypt the ID Token,
-                and use the re-encrypted ID token as the id_token_hint value.
-
-        login_hint
-                OPTIONAL. Hint to the Authorization Server about the login
-                identifier the End-User might use to log in (if necessary).
-                This hint can be used by an RP if it first asks the End-User
-                for their e-mail address (or other identifier) and then wants
-                to pass that value as a hint to the discovered authorization
-                service. It is RECOMMENDED that the hint value match the value
-                used for discovery. This value MAY also be a phone number in
-                the format specified for the phone_number Claim. The use of
-                this parameter is left to the OP's discretion.
-
-        acr_values
-                OPTIONAL. Requested Authentication Context Class Reference
-                values. Space-separated string that specifies the acr values
-                that the Authorization Server is being requested to use for
-                processing this Authentication Request, with the values
-                appearing in order of preference. The Authentication Context
-                Class satisfied by the authentication performed is returned as
-                the acr Claim Value, as specified in Section 2. The acr Claim
-                is requested as a Voluntary Claim by this parameter.
-        """
-
-        # Treat it as normal OAuth 2 auth code request if openid is not present
-        if not request.scopes or 'openid' not in request.scopes:
-            return {}
-
-        prompt = request.prompt if request.prompt else []
-        if hasattr(prompt, 'split'):
-            prompt = prompt.strip().split()
-        prompt = set(prompt)
-
-        if 'none' in prompt:
-
-            if len(prompt) > 1:
-                msg = "Prompt none is mutually exclusive with other values."
-                raise InvalidRequestError(request=request, description=msg)
-
-            if not self.request_validator.validate_silent_login(request):
-                raise LoginRequired(request=request)
-
-            if not self.request_validator.validate_silent_authorization(request):
-                raise ConsentRequired(request=request)
-
-        self._inflate_claims(request)
-
-        if not self.request_validator.validate_user_match(
-                request.id_token_hint, request.scopes, request.claims, request):
-            msg = "Session user does not match client supplied user."
-            raise LoginRequired(request=request, description=msg)
-
-        request_info = {
-            'display': request.display,
-            'nonce': request.nonce,
-            'prompt': prompt,
-            'ui_locales': request.ui_locales.split() if request.ui_locales else [],
-            'id_token_hint': request.id_token_hint,
-            'login_hint': request.login_hint,
-            'claims': request.claims
-        }
-
-        return request_info
-
-
-OpenIDConnectBase = GrantTypeBase
diff --git a/lib/oauthlib/openid/connect/core/grant_types/dispatchers.py b/lib/oauthlib/openid/connect/core/grant_types/dispatchers.py
deleted file mode 100644
index 5aa7d469..00000000
--- a/lib/oauthlib/openid/connect/core/grant_types/dispatchers.py
+++ /dev/null
@@ -1,101 +0,0 @@
-import logging
-
-log = logging.getLogger(__name__)
-
-
-class Dispatcher:
-    default_grant = None
-    oidc_grant = None
-
-
-class AuthorizationCodeGrantDispatcher(Dispatcher):
-    """
-    This is an adapter class that will route simple Authorization Code
-    requests, those that have `response_type=code` and a scope including
-    `openid` to either the `default_grant` or the `oidc_grant` based on
-    the scopes requested.
-    """
-    def __init__(self, default_grant=None, oidc_grant=None):
-        self.default_grant = default_grant
-        self.oidc_grant = oidc_grant
-
-    def _handler_for_request(self, request):
-        handler = self.default_grant
-
-        if request.scopes and "openid" in request.scopes:
-            handler = self.oidc_grant
-
-        log.debug('Selecting handler for request %r.', handler)
-        return handler
-
-    def create_authorization_response(self, request, token_handler):
-        """Read scope and route to the designated handler."""
-        return self._handler_for_request(request).create_authorization_response(request, token_handler)
-
-    def validate_authorization_request(self, request):
-        """Read scope and route to the designated handler."""
-        return self._handler_for_request(request).validate_authorization_request(request)
-
-
-class ImplicitTokenGrantDispatcher(Dispatcher):
-    """
-    This is an adapter class that will route simple Authorization
-    requests, those that have `id_token` in `response_type` and a scope
-    including `openid` to either the `default_grant` or the `oidc_grant`
-    based on the scopes requested.
-    """
-    def __init__(self, default_grant=None, oidc_grant=None):
-        self.default_grant = default_grant
-        self.oidc_grant = oidc_grant
-
-    def _handler_for_request(self, request):
-        handler = self.default_grant
-
-        if request.scopes and "openid" in request.scopes and 'id_token' in request.response_type:
-            handler = self.oidc_grant
-
-        log.debug('Selecting handler for request %r.', handler)
-        return handler
-
-    def create_authorization_response(self, request, token_handler):
-        """Read scope and route to the designated handler."""
-        return self._handler_for_request(request).create_authorization_response(request, token_handler)
-
-    def validate_authorization_request(self, request):
-        """Read scope and route to the designated handler."""
-        return self._handler_for_request(request).validate_authorization_request(request)
-
-
-class AuthorizationTokenGrantDispatcher(Dispatcher):
-    """
-    This is an adapter class that will route simple Token requests, those that authorization_code have a scope
-    including 'openid' to either the default_grant or the oidc_grant based on the scopes requested.
-    """
-    def __init__(self, request_validator, default_grant=None, oidc_grant=None):
-        self.default_grant = default_grant
-        self.oidc_grant = oidc_grant
-        self.request_validator = request_validator
-
-    def _handler_for_request(self, request):
-        handler = self.default_grant
-        scopes = ()
-        parameters = dict(request.decoded_body)
-        client_id = parameters.get('client_id', None)
-        code = parameters.get('code', None)
-        redirect_uri = parameters.get('redirect_uri', None)
-
-        # If code is not present fallback to `default_grant` which will
-        # raise an error for the missing `code` in `create_token_response` step.
-        if code:
-            scopes = self.request_validator.get_authorization_code_scopes(client_id, code, redirect_uri, request)
-
-        if 'openid' in scopes:
-            handler = self.oidc_grant
-
-        log.debug('Selecting handler for request %r.', handler)
-        return handler
-
-    def create_token_response(self, request, token_handler):
-        """Read scope and route to the designated handler."""
-        handler = self._handler_for_request(request)
-        return handler.create_token_response(request, token_handler)
diff --git a/lib/oauthlib/openid/connect/core/grant_types/hybrid.py b/lib/oauthlib/openid/connect/core/grant_types/hybrid.py
deleted file mode 100644
index 7cb0758b..00000000
--- a/lib/oauthlib/openid/connect/core/grant_types/hybrid.py
+++ /dev/null
@@ -1,63 +0,0 @@
-"""
-oauthlib.openid.connect.core.grant_types
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-"""
-import logging
-
-from oauthlib.oauth2.rfc6749.errors import InvalidRequestError
-from oauthlib.oauth2.rfc6749.grant_types.authorization_code import (
-    AuthorizationCodeGrant as OAuth2AuthorizationCodeGrant,
-)
-
-from ..request_validator import RequestValidator
-from .base import GrantTypeBase
-
-log = logging.getLogger(__name__)
-
-
-class HybridGrant(GrantTypeBase):
-
-    def __init__(self, request_validator=None, **kwargs):
-        self.request_validator = request_validator or RequestValidator()
-
-        self.proxy_target = OAuth2AuthorizationCodeGrant(
-            request_validator=request_validator, **kwargs)
-        # All hybrid response types should be fragment-encoded.
-        self.proxy_target.default_response_mode = "fragment"
-        self.register_response_type('code id_token')
-        self.register_response_type('code token')
-        self.register_response_type('code id_token token')
-        self.custom_validators.post_auth.append(
-            self.openid_authorization_validator)
-        # Hybrid flows can return the id_token from the authorization
-        # endpoint as part of the 'code' response
-        self.register_code_modifier(self.add_token)
-        self.register_code_modifier(self.add_id_token)
-        self.register_token_modifier(self.add_id_token)
-
-    def add_id_token(self, token, token_handler, request):
-        return super().add_id_token(token, token_handler, request, nonce=request.nonce)
-
-    def openid_authorization_validator(self, request):
-        """Additional validation when following the Authorization Code flow.
-        """
-        request_info = super().openid_authorization_validator(request)
-        if not request_info:  # returns immediately if OAuth2.0
-            return request_info
-
-        # REQUIRED if the Response Type of the request is `code
-        # id_token` or `code id_token token` and OPTIONAL when the
-        # Response Type of the request is `code token`. It is a string
-        # value used to associate a Client session with an ID Token,
-        # and to mitigate replay attacks. The value is passed through
-        # unmodified from the Authentication Request to the ID
-        # Token. Sufficient entropy MUST be present in the `nonce`
-        # values used to prevent attackers from guessing values. For
-        # implementation notes, see Section 15.5.2.
-        if request.response_type in ["code id_token", "code id_token token"]:
-            if not request.nonce:
-                raise InvalidRequestError(
-                    request=request,
-                    description='Request is missing mandatory nonce parameter.'
-                )
-        return request_info
diff --git a/lib/oauthlib/openid/connect/core/grant_types/implicit.py b/lib/oauthlib/openid/connect/core/grant_types/implicit.py
deleted file mode 100644
index a4fe6049..00000000
--- a/lib/oauthlib/openid/connect/core/grant_types/implicit.py
+++ /dev/null
@@ -1,51 +0,0 @@
-"""
-oauthlib.openid.connect.core.grant_types
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-"""
-import logging
-
-from oauthlib.oauth2.rfc6749.errors import InvalidRequestError
-from oauthlib.oauth2.rfc6749.grant_types.implicit import (
-    ImplicitGrant as OAuth2ImplicitGrant,
-)
-
-from .base import GrantTypeBase
-
-log = logging.getLogger(__name__)
-
-
-class ImplicitGrant(GrantTypeBase):
-
-    def __init__(self, request_validator=None, **kwargs):
-        self.proxy_target = OAuth2ImplicitGrant(
-            request_validator=request_validator, **kwargs)
-        self.register_response_type('id_token')
-        self.register_response_type('id_token token')
-        self.custom_validators.post_auth.append(
-            self.openid_authorization_validator)
-        self.register_token_modifier(self.add_id_token)
-
-    def add_id_token(self, token, token_handler, request):
-        if 'state' not in token and request.state:
-            token['state'] = request.state
-        return super().add_id_token(token, token_handler, request, nonce=request.nonce)
-
-    def openid_authorization_validator(self, request):
-        """Additional validation when following the implicit flow.
-        """
-        request_info = super().openid_authorization_validator(request)
-        if not request_info:  # returns immediately if OAuth2.0
-            return request_info
-
-        # REQUIRED. String value used to associate a Client session with an ID
-        # Token, and to mitigate replay attacks. The value is passed through
-        # unmodified from the Authentication Request to the ID Token.
-        # Sufficient entropy MUST be present in the nonce values used to
-        # prevent attackers from guessing values. For implementation notes, see
-        # Section 15.5.2.
-        if not request.nonce:
-            raise InvalidRequestError(
-                request=request,
-                description='Request is missing mandatory nonce parameter.'
-            )
-        return request_info
diff --git a/lib/oauthlib/openid/connect/core/grant_types/refresh_token.py b/lib/oauthlib/openid/connect/core/grant_types/refresh_token.py
deleted file mode 100644
index 43e4499c..00000000
--- a/lib/oauthlib/openid/connect/core/grant_types/refresh_token.py
+++ /dev/null
@@ -1,34 +0,0 @@
-"""
-oauthlib.openid.connect.core.grant_types
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-"""
-import logging
-
-from oauthlib.oauth2.rfc6749.grant_types.refresh_token import (
-    RefreshTokenGrant as OAuth2RefreshTokenGrant,
-)
-
-from .base import GrantTypeBase
-
-log = logging.getLogger(__name__)
-
-
-class RefreshTokenGrant(GrantTypeBase):
-
-    def __init__(self, request_validator=None, **kwargs):
-        self.proxy_target = OAuth2RefreshTokenGrant(
-            request_validator=request_validator, **kwargs)
-        self.register_token_modifier(self.add_id_token)
-
-    def add_id_token(self, token, token_handler, request):
-        """
-        Construct an initial version of id_token, and let the
-        request_validator sign or encrypt it.
-
-        The authorization_code version of this method is used to
-        retrieve the nonce accordingly to the code storage.
-        """
-        if not self.request_validator.refresh_id_token(request):
-            return token
-
-        return super().add_id_token(token, token_handler, request)
diff --git a/lib/oauthlib/openid/connect/core/request_validator.py b/lib/oauthlib/openid/connect/core/request_validator.py
deleted file mode 100644
index 47c4cd94..00000000
--- a/lib/oauthlib/openid/connect/core/request_validator.py
+++ /dev/null
@@ -1,320 +0,0 @@
-"""
-oauthlib.openid.connect.core.request_validator
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-"""
-import logging
-
-from oauthlib.oauth2.rfc6749.request_validator import (
-    RequestValidator as OAuth2RequestValidator,
-)
-
-log = logging.getLogger(__name__)
-
-
-class RequestValidator(OAuth2RequestValidator):
-
-    def get_authorization_code_scopes(self, client_id, code, redirect_uri, request):
-        """ Extracts scopes from saved authorization code.
-
-        The scopes returned by this method is used to route token requests
-        based on scopes passed to Authorization Code requests.
-
-        With that the token endpoint knows when to include OpenIDConnect
-        id_token in token response only based on authorization code scopes.
-
-        Only code param should be sufficient to retrieve grant code from
-        any storage you are using, `client_id` and `redirect_uri` can have a
-        blank value `""` don't forget to check it before using those values
-        in a select query if a database is used.
-
-        :param client_id: Unicode client identifier
-        :param code: Unicode authorization code grant
-        :param redirect_uri: Unicode absolute URI
-        :return: A list of scope
-
-        Method is used by:
-            - Authorization Token Grant Dispatcher
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def get_authorization_code_nonce(self, client_id, code, redirect_uri, request):
-        """ Extracts nonce from saved authorization code.
-
-        If present in the Authentication Request, Authorization
-        Servers MUST include a nonce Claim in the ID Token with the
-        Claim Value being the nonce value sent in the Authentication
-        Request. Authorization Servers SHOULD perform no other
-        processing on nonce values used. The nonce value is a
-        case-sensitive string.
-
-        Only code param should be sufficient to retrieve grant code from
-        any storage you are using. However, `client_id` and `redirect_uri`
-        have been validated and can be used also.
-
-        :param client_id: Unicode client identifier
-        :param code: Unicode authorization code grant
-        :param redirect_uri: Unicode absolute URI
-        :return: Unicode nonce
-
-        Method is used by:
-            - Authorization Token Grant Dispatcher
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def get_jwt_bearer_token(self, token, token_handler, request):
-        """Get JWT Bearer token or OpenID Connect ID token
-
-        If using OpenID Connect this SHOULD call `oauthlib.oauth2.RequestValidator.get_id_token`
-
-        :param token: A Bearer token dict
-        :param token_handler: the token handler (BearerToken class)
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :return: The JWT Bearer token or OpenID Connect ID token (a JWS signed JWT)
-
-        Method is used by JWT Bearer and OpenID Connect tokens:
-            - JWTToken.create_token
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def get_id_token(self, token, token_handler, request):
-        """Get OpenID Connect ID token
-
-        This method is OPTIONAL and is NOT RECOMMENDED.
-        `finalize_id_token` SHOULD be implemented instead. However, if you
-        want a full control over the minting of the `id_token`, you
-        MAY want to override `get_id_token` instead of using
-        `finalize_id_token`.
-
-        In the OpenID Connect workflows when an ID Token is requested this method is called.
-        Subclasses should implement the construction, signing and optional encryption of the
-        ID Token as described in the OpenID Connect spec.
-
-        In addition to the standard OAuth2 request properties, the request may also contain
-        these OIDC specific properties which are useful to this method:
-
-            - nonce, if workflow is implicit or hybrid and it was provided
-            - claims, if provided to the original Authorization Code request
-
-        The token parameter is a dict which may contain an ``access_token`` entry, in which
-        case the resulting ID Token *should* include a calculated ``at_hash`` claim.
-
-        Similarly, when the request parameter has a ``code`` property defined, the ID Token
-        *should* include a calculated ``c_hash`` claim.
-
-        http://openid.net/specs/openid-connect-core-1_0.html (sections `3.1.3.6`_, `3.2.2.10`_, `3.3.2.11`_)
-
-        .. _`3.1.3.6`: http://openid.net/specs/openid-connect-core-1_0.html#CodeIDToken
-        .. _`3.2.2.10`: http://openid.net/specs/openid-connect-core-1_0.html#ImplicitIDToken
-        .. _`3.3.2.11`: http://openid.net/specs/openid-connect-core-1_0.html#HybridIDToken
-
-        :param token: A Bearer token dict
-        :param token_handler: the token handler (BearerToken class)
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :return: The ID Token (a JWS signed JWT)
-        """
-        return None
-
-    def finalize_id_token(self, id_token, token, token_handler, request):
-        """Finalize OpenID Connect ID token & Sign or Encrypt.
-
-        In the OpenID Connect workflows when an ID Token is requested
-        this method is called.  Subclasses should implement the
-        construction, signing and optional encryption of the ID Token
-        as described in the OpenID Connect spec.
-
-        The `id_token` parameter is a dict containing a couple of OIDC
-        technical fields related to the specification. Prepopulated
-        attributes are:
-
-        - `aud`, equals to `request.client_id`.
-        - `iat`, equals to current time.
-        - `nonce`, if present, is equals to the `nonce` from the
-          authorization request.
-        - `at_hash`, hash of `access_token`, if relevant.
-        - `c_hash`, hash of `code`, if relevant.
-
-        This method MUST provide required fields as below:
-
-        - `iss`, REQUIRED. Issuer Identifier for the Issuer of the response.
-        - `sub`, REQUIRED. Subject Identifier
-        - `exp`, REQUIRED. Expiration time on or after which the ID
-          Token MUST NOT be accepted by the RP when performing
-          authentication with the OP.
-
-        Additionals claims must be added, note that `request.scope`
-        should be used to determine the list of claims.
-
-        More information can be found at `OpenID Connect Core#Claims`_
-
-        .. _`OpenID Connect Core#Claims`: https://openid.net/specs/openid-connect-core-1_0.html#Claims
-
-        :param id_token: A dict containing technical fields of id_token
-        :param token: A Bearer token dict
-        :param token_handler: the token handler (BearerToken class)
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :return: The ID Token (a JWS signed JWT or JWE encrypted JWT)
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def validate_jwt_bearer_token(self, token, scopes, request):
-        """Ensure the JWT Bearer token or OpenID Connect ID token are valids and authorized access to scopes.
-
-        If using OpenID Connect this SHOULD call `oauthlib.oauth2.RequestValidator.get_id_token`
-
-        If not using OpenID Connect this can `return None` to avoid 5xx rather 401/3 response.
-
-        OpenID connect core 1.0 describe how to validate an id_token:
-            - http://openid.net/specs/openid-connect-core-1_0.html#IDTokenValidation
-            - http://openid.net/specs/openid-connect-core-1_0.html#ImplicitIDTValidation
-            - http://openid.net/specs/openid-connect-core-1_0.html#HybridIDTValidation
-            - http://openid.net/specs/openid-connect-core-1_0.html#HybridIDTValidation2
-
-        :param token: Unicode Bearer token
-        :param scopes: List of scopes (defined by you)
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: True or False
-
-        Method is indirectly used by all core OpenID connect JWT token issuing grant types:
-            - Authorization Code Grant
-            - Implicit Grant
-            - Hybrid Grant
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def validate_id_token(self, token, scopes, request):
-        """Ensure the id token is valid and authorized access to scopes.
-
-        OpenID connect core 1.0 describe how to validate an id_token:
-            - http://openid.net/specs/openid-connect-core-1_0.html#IDTokenValidation
-            - http://openid.net/specs/openid-connect-core-1_0.html#ImplicitIDTValidation
-            - http://openid.net/specs/openid-connect-core-1_0.html#HybridIDTValidation
-            - http://openid.net/specs/openid-connect-core-1_0.html#HybridIDTValidation2
-
-        :param token: Unicode Bearer token
-        :param scopes: List of scopes (defined by you)
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: True or False
-
-        Method is indirectly used by all core OpenID connect JWT token issuing grant types:
-            - Authorization Code Grant
-            - Implicit Grant
-            - Hybrid Grant
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def validate_silent_authorization(self, request):
-        """Ensure the logged in user has authorized silent OpenID authorization.
-
-        Silent OpenID authorization allows access tokens and id tokens to be
-        granted to clients without any user prompt or interaction.
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: True or False
-
-        Method is used by:
-            - OpenIDConnectAuthCode
-            - OpenIDConnectImplicit
-            - OpenIDConnectHybrid
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def validate_silent_login(self, request):
-        """Ensure session user has authorized silent OpenID login.
-
-        If no user is logged in or has not authorized silent login, this
-        method should return False.
-
-        If the user is logged in but associated with multiple accounts and
-        not selected which one to link to the token then this method should
-        raise an oauthlib.oauth2.AccountSelectionRequired error.
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: True or False
-
-        Method is used by:
-            - OpenIDConnectAuthCode
-            - OpenIDConnectImplicit
-            - OpenIDConnectHybrid
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def validate_user_match(self, id_token_hint, scopes, claims, request):
-        """Ensure client supplied user id hint matches session user.
-
-        If the sub claim or id_token_hint is supplied then the session
-        user must match the given ID.
-
-        :param id_token_hint: User identifier string.
-        :param scopes: List of OAuth 2 scopes and OpenID claims (strings).
-        :param claims: OpenID Connect claims dict.
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: True or False
-
-        Method is used by:
-            - OpenIDConnectAuthCode
-            - OpenIDConnectImplicit
-            - OpenIDConnectHybrid
-        """
-        raise NotImplementedError('Subclasses must implement this method.')
-
-    def get_userinfo_claims(self, request):
-        """Return the UserInfo claims in JSON or Signed or Encrypted.
-
-        The UserInfo Claims MUST be returned as the members of a JSON object
-         unless a signed or encrypted response was requested during Client
-         Registration. The Claims defined in Section 5.1 can be returned, as can
-         additional Claims not specified there.
-
-        For privacy reasons, OpenID Providers MAY elect to not return values for
-        some requested Claims.
-
-        If a Claim is not returned, that Claim Name SHOULD be omitted from the
-        JSON object representing the Claims; it SHOULD NOT be present with a
-        null or empty string value.
-
-        The sub (subject) Claim MUST always be returned in the UserInfo
-        Response.
-
-        Upon receipt of the UserInfo Request, the UserInfo Endpoint MUST return
-        the JSON Serialization of the UserInfo Response as in Section 13.3 in
-        the HTTP response body unless a different format was specified during
-        Registration [OpenID.Registration].
-
-        If the UserInfo Response is signed and/or encrypted, then the Claims are
-        returned in a JWT and the content-type MUST be application/jwt. The
-        response MAY be encrypted without also being signed. If both signing and
-        encryption are requested, the response MUST be signed then encrypted,
-        with the result being a Nested JWT, as defined in [JWT].
-
-        If signed, the UserInfo Response SHOULD contain the Claims iss (issuer)
-        and aud (audience) as members. The iss value SHOULD be the OP's Issuer
-        Identifier URL. The aud value SHOULD be or include the RP's Client ID
-        value.
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: Claims as a dict OR JWT/JWS/JWE as a string
-
-        Method is used by:
-            UserInfoEndpoint
-        """
-
-    def refresh_id_token(self, request):
-        """Whether the id token should be refreshed. Default, True
-
-        :param request: OAuthlib request.
-        :type request: oauthlib.common.Request
-        :rtype: True or False
-
-        Method is used by:
-            RefreshTokenGrant
-        """
-        return True
diff --git a/lib/oauthlib/openid/connect/core/tokens.py b/lib/oauthlib/openid/connect/core/tokens.py
deleted file mode 100644
index 936ab52e..00000000
--- a/lib/oauthlib/openid/connect/core/tokens.py
+++ /dev/null
@@ -1,48 +0,0 @@
-"""
-authlib.openid.connect.core.tokens
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This module contains methods for adding JWT tokens to requests.
-"""
-from oauthlib.oauth2.rfc6749.tokens import (
-    TokenBase, get_token_from_header, random_token_generator,
-)
-
-
-class JWTToken(TokenBase):
-    __slots__ = (
-        'request_validator', 'token_generator',
-        'refresh_token_generator', 'expires_in'
-    )
-
-    def __init__(self, request_validator=None, token_generator=None,
-                 expires_in=None, refresh_token_generator=None):
-        self.request_validator = request_validator
-        self.token_generator = token_generator or random_token_generator
-        self.refresh_token_generator = (
-            refresh_token_generator or self.token_generator
-        )
-        self.expires_in = expires_in or 3600
-
-    def create_token(self, request, refresh_token=False):
-        """Create a JWT Token, using requestvalidator method."""
-
-        if callable(self.expires_in):
-            expires_in = self.expires_in(request)
-        else:
-            expires_in = self.expires_in
-
-        request.expires_in = expires_in
-
-        return self.request_validator.get_jwt_bearer_token(None, None, request)
-
-    def validate_request(self, request):
-        token = get_token_from_header(request)
-        return self.request_validator.validate_jwt_bearer_token(
-            token, request.scopes, request)
-
-    def estimate_type(self, request):
-        token = get_token_from_header(request)
-        if token and token.startswith('ey') and token.count('.') in (2, 4):
-            return 10
-        return 0
diff --git a/lib/oauthlib/signals.py b/lib/oauthlib/signals.py
deleted file mode 100644
index 8fd347a5..00000000
--- a/lib/oauthlib/signals.py
+++ /dev/null
@@ -1,40 +0,0 @@
-"""
-    Implements signals based on blinker if available, otherwise
-    falls silently back to a noop. Shamelessly stolen from flask.signals:
-    https://github.com/mitsuhiko/flask/blob/master/flask/signals.py
-"""
-signals_available = False
-try:
-    from blinker import Namespace
-    signals_available = True
-except ImportError:  # noqa
-    class Namespace:
-        def signal(self, name, doc=None):
-            return _FakeSignal(name, doc)
-
-    class _FakeSignal:
-        """If blinker is unavailable, create a fake class with the same
-        interface that allows sending of signals but will fail with an
-        error on anything else.  Instead of doing anything on send, it
-        will just ignore the arguments and do nothing instead.
-        """
-
-        def __init__(self, name, doc=None):
-            self.name = name
-            self.__doc__ = doc
-        def _fail(self, *args, **kwargs):
-            raise RuntimeError('signalling support is unavailable '
-                               'because the blinker library is '
-                               'not installed.')
-        send = lambda *a, **kw: None
-        connect = disconnect = has_receivers_for = receivers_for = \
-            temporarily_connected_to = connected_to = _fail
-        del _fail
-
-# The namespace for code signals.  If you are not oauthlib code, do
-# not put signals in here.  Create your own namespace instead.
-_signals = Namespace()
-
-
-# Core signals.
-scope_changed = _signals.signal('scope-changed')
diff --git a/lib/oauthlib/uri_validate.py b/lib/oauthlib/uri_validate.py
deleted file mode 100644
index a6fe0fb2..00000000
--- a/lib/oauthlib/uri_validate.py
+++ /dev/null
@@ -1,190 +0,0 @@
-"""
-Regex for URIs
-
-These regex are directly derived from the collected ABNF in RFC3986
-(except for DIGIT, ALPHA and HEXDIG, defined by RFC2234).
-
-They should be processed with re.VERBOSE.
-
-Thanks Mark Nottingham for this code - https://gist.github.com/138549
-"""
-import re
-
-# basics
-
-DIGIT = r"[\x30-\x39]"
-
-ALPHA = r"[\x41-\x5A\x61-\x7A]"
-
-HEXDIG = r"[\x30-\x39A-Fa-f]"
-
-#   pct-encoded   = "%" HEXDIG HEXDIG
-pct_encoded = r" %% %(HEXDIG)s %(HEXDIG)s" % locals()
-
-#   unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
-unreserved = r"(?: %(ALPHA)s | %(DIGIT)s | \- | \. | _ | ~ )" % locals()
-
-# gen-delims    = ":" / "/" / "?" / "#" / "[" / "]" / "@"
-gen_delims = r"(?: : | / | \? | \# | \[ | \] | @ )"
-
-#   sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
-#                 / "*" / "+" / "," / ";" / "="
-sub_delims = r"""(?: ! | \$ | & | ' | \( | \) |
-                     \* | \+ | , | ; | = )"""
-
-#   pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
-pchar = r"(?: %(unreserved)s | %(pct_encoded)s | %(sub_delims)s | : | @ )" % locals(
-)
-
-#   reserved      = gen-delims / sub-delims
-reserved = r"(?: %(gen_delims)s | %(sub_delims)s )" % locals()
-
-
-# scheme
-
-#   scheme        = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
-scheme = r"%(ALPHA)s (?: %(ALPHA)s | %(DIGIT)s | \+ | \- | \. )*" % locals()
-
-
-# authority
-
-#   dec-octet     = DIGIT                 ; 0-9
-#                 / %x31-39 DIGIT         ; 10-99
-#                 / "1" 2DIGIT            ; 100-199
-#                 / "2" %x30-34 DIGIT     ; 200-249
-#                 / "25" %x30-35          ; 250-255
-dec_octet = r"""(?: %(DIGIT)s |
-                    [\x31-\x39] %(DIGIT)s |
-                    1 %(DIGIT)s{2} |
-                    2 [\x30-\x34] %(DIGIT)s |
-                    25 [\x30-\x35]
-                )
-""" % locals()
-
-#  IPv4address   = dec-octet "." dec-octet "." dec-octet "." dec-octet
-IPv4address = r"%(dec_octet)s \. %(dec_octet)s \. %(dec_octet)s \. %(dec_octet)s" % locals(
-)
-
-#   IPv6address
-IPv6address = r"([A-Fa-f0-9:]+[:$])[A-Fa-f0-9]{1,4}"
-
-#   IPvFuture     = "v" 1*HEXDIG "." 1*( unreserved / sub-delims / ":" )
-IPvFuture = r"v %(HEXDIG)s+ \. (?: %(unreserved)s | %(sub_delims)s | : )+" % locals()
-
-#   IP-literal    = "[" ( IPv6address / IPvFuture  ) "]"
-IP_literal = r"\[ (?: %(IPv6address)s | %(IPvFuture)s ) \]" % locals()
-
-#   reg-name      = *( unreserved / pct-encoded / sub-delims )
-reg_name = r"(?: %(unreserved)s | %(pct_encoded)s | %(sub_delims)s )*" % locals()
-
-#   userinfo      = *( unreserved / pct-encoded / sub-delims / ":" )
-userinfo = r"(?: %(unreserved)s | %(pct_encoded)s | %(sub_delims)s | : )" % locals(
-)
-
-#   host          = IP-literal / IPv4address / reg-name
-host = r"(?: %(IP_literal)s | %(IPv4address)s | %(reg_name)s )" % locals()
-
-#   port          = *DIGIT
-port = r"(?: %(DIGIT)s )*" % locals()
-
-#   authority     = [ userinfo "@" ] host [ ":" port ]
-authority = r"(?: %(userinfo)s @)? %(host)s (?: : %(port)s)?" % locals()
-
-# Path
-
-#   segment       = *pchar
-segment = r"%(pchar)s*" % locals()
-
-#   segment-nz    = 1*pchar
-segment_nz = r"%(pchar)s+" % locals()
-
-#   segment-nz-nc = 1*( unreserved / pct-encoded / sub-delims / "@" )
-#                 ; non-zero-length segment without any colon ":"
-segment_nz_nc = r"(?: %(unreserved)s | %(pct_encoded)s | %(sub_delims)s | @ )+" % locals()
-
-#   path-abempty  = *( "/" segment )
-path_abempty = r"(?: / %(segment)s )*" % locals()
-
-#   path-absolute = "/" [ segment-nz *( "/" segment ) ]
-path_absolute = r"/ (?: %(segment_nz)s (?: / %(segment)s )* )?" % locals()
-
-#   path-noscheme = segment-nz-nc *( "/" segment )
-path_noscheme = r"%(segment_nz_nc)s (?: / %(segment)s )*" % locals()
-
-#   path-rootless = segment-nz *( "/" segment )
-path_rootless = r"%(segment_nz)s (?: / %(segment)s )*" % locals()
-
-#   path-empty    = 0<pchar>
-path_empty = r""  # FIXME
-
-#   path          = path-abempty    ; begins with "/" or is empty
-#                 / path-absolute   ; begins with "/" but not "//"
-#                 / path-noscheme   ; begins with a non-colon segment
-#                 / path-rootless   ; begins with a segment
-#                 / path-empty      ; zero characters
-path = r"""(?: %(path_abempty)s |
-               %(path_absolute)s |
-               %(path_noscheme)s |
-               %(path_rootless)s |
-               %(path_empty)s
-            )
-""" % locals()
-
-### Query and Fragment
-
-#   query         = *( pchar / "/" / "?" )
-query = r"(?: %(pchar)s | / | \? )*" % locals()
-
-#   fragment      = *( pchar / "/" / "?" )
-fragment = r"(?: %(pchar)s | / | \? )*" % locals()
-
-# URIs
-
-#   hier-part     = "//" authority path-abempty
-#                 / path-absolute
-#                 / path-rootless
-#                 / path-empty
-hier_part = r"""(?: (?: // %(authority)s %(path_abempty)s ) |
-                    %(path_absolute)s |
-                    %(path_rootless)s |
-                    %(path_empty)s
-                )
-""" % locals()
-
-#   relative-part = "//" authority path-abempty
-#                 / path-absolute
-#                 / path-noscheme
-#                 / path-empty
-relative_part = r"""(?: (?: // %(authority)s %(path_abempty)s ) |
-                        %(path_absolute)s |
-                        %(path_noscheme)s |
-                        %(path_empty)s
-                    )
-""" % locals()
-
-# relative-ref  = relative-part [ "?" query ] [ "#" fragment ]
-relative_ref = r"%(relative_part)s (?: \? %(query)s)? (?: \# %(fragment)s)?" % locals(
-)
-
-# URI           = scheme ":" hier-part [ "?" query ] [ "#" fragment ]
-URI = r"^(?: %(scheme)s : %(hier_part)s (?: \? %(query)s )? (?: \# %(fragment)s )? )$" % locals(
-)
-
-#   URI-reference = URI / relative-ref
-URI_reference = r"^(?: %(URI)s | %(relative_ref)s )$" % locals()
-
-#   absolute-URI  = scheme ":" hier-part [ "?" query ]
-absolute_URI = r"^(?: %(scheme)s : %(hier_part)s (?: \? %(query)s )? )$" % locals(
-)
-
-
-def is_uri(uri):
-    return re.match(URI, uri, re.VERBOSE)
-
-
-def is_uri_reference(uri):
-    return re.match(URI_reference, uri, re.VERBOSE)
-
-
-def is_absolute_uri(uri):
-    return re.match(absolute_URI, uri, re.VERBOSE)
diff --git a/lib/ordereddict.py b/lib/ordereddict.py
new file mode 100644
index 00000000..7242b506
--- /dev/null
+++ b/lib/ordereddict.py
@@ -0,0 +1,127 @@
+# Copyright (c) 2009 Raymond Hettinger
+#
+# 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.
+
+from UserDict import DictMixin
+
+class OrderedDict(dict, DictMixin):
+
+    def __init__(self, *args, **kwds):
+        if len(args) > 1:
+            raise TypeError('expected at most 1 arguments, got %d' % len(args))
+        try:
+            self.__end
+        except AttributeError:
+            self.clear()
+        self.update(*args, **kwds)
+
+    def clear(self):
+        self.__end = end = []
+        end += [None, end, end]         # sentinel node for doubly linked list
+        self.__map = {}                 # key --> [key, prev, next]
+        dict.clear(self)
+
+    def __setitem__(self, key, value):
+        if key not in self:
+            end = self.__end
+            curr = end[1]
+            curr[2] = end[1] = self.__map[key] = [key, curr, end]
+        dict.__setitem__(self, key, value)
+
+    def __delitem__(self, key):
+        dict.__delitem__(self, key)
+        key, prev, next = self.__map.pop(key)
+        prev[2] = next
+        next[1] = prev
+
+    def __iter__(self):
+        end = self.__end
+        curr = end[2]
+        while curr is not end:
+            yield curr[0]
+            curr = curr[2]
+
+    def __reversed__(self):
+        end = self.__end
+        curr = end[1]
+        while curr is not end:
+            yield curr[0]
+            curr = curr[1]
+
+    def popitem(self, last=True):
+        if not self:
+            raise KeyError('dictionary is empty')
+        if last:
+            key = reversed(self).next()
+        else:
+            key = iter(self).next()
+        value = self.pop(key)
+        return key, value
+
+    def __reduce__(self):
+        items = [[k, self[k]] for k in self]
+        tmp = self.__map, self.__end
+        del self.__map, self.__end
+        inst_dict = vars(self).copy()
+        self.__map, self.__end = tmp
+        if inst_dict:
+            return (self.__class__, (items,), inst_dict)
+        return self.__class__, (items,)
+
+    def keys(self):
+        return list(self)
+
+    setdefault = DictMixin.setdefault
+    update = DictMixin.update
+    pop = DictMixin.pop
+    values = DictMixin.values
+    items = DictMixin.items
+    iterkeys = DictMixin.iterkeys
+    itervalues = DictMixin.itervalues
+    iteritems = DictMixin.iteritems
+
+    def __repr__(self):
+        if not self:
+            return '%s()' % (self.__class__.__name__,)
+        return '%s(%r)' % (self.__class__.__name__, self.items())
+
+    def copy(self):
+        return self.__class__(self)
+
+    @classmethod
+    def fromkeys(cls, iterable, value=None):
+        d = cls()
+        for key in iterable:
+            d[key] = value
+        return d
+
+    def __eq__(self, other):
+        if isinstance(other, OrderedDict):
+            if len(self) != len(other):
+                return False
+            for p, q in  zip(self.items(), other.items()):
+                if p != q:
+                    return False
+            return True
+        return dict.__eq__(self, other)
+
+    def __ne__(self, other):
+        return not self == other
diff --git a/lib/osxnotify/registerapp.py b/lib/osxnotify/registerapp.py
index 55a84b20..e42cead4 100644
--- a/lib/osxnotify/registerapp.py
+++ b/lib/osxnotify/registerapp.py
@@ -120,7 +120,7 @@ def swizzled_bundleIdentifier(self, original):
     return 'ade.plexpy.osxnotify'
 
 if __name__ == '__main__':
-    notify('Tautulli', 'Test Subtitle', 'Test Body')
+    notify('PlexPy', 'Test Subtitle', 'Test Body')
 """)
         f.close()
 
@@ -129,5 +129,5 @@ if __name__ == '__main__':
 
         return app_path, 'App registered'
 
-    except Exception as e:
+    except Exception, e:
         return None, 'Error creating App %s. %s' % (app_path, e)
\ No newline at end of file
diff --git a/lib/packaging/__init__.py b/lib/packaging/__init__.py
deleted file mode 100644
index d79f73c5..00000000
--- a/lib/packaging/__init__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-
-__title__ = "packaging"
-__summary__ = "Core utilities for Python packages"
-__uri__ = "https://github.com/pypa/packaging"
-
-__version__ = "24.2"
-
-__author__ = "Donald Stufft and individual contributors"
-__email__ = "donald@stufft.io"
-
-__license__ = "BSD-2-Clause or Apache-2.0"
-__copyright__ = f"2014 {__author__}"
diff --git a/lib/packaging/_elffile.py b/lib/packaging/_elffile.py
deleted file mode 100644
index 25f4282c..00000000
--- a/lib/packaging/_elffile.py
+++ /dev/null
@@ -1,110 +0,0 @@
-"""
-ELF file parser.
-
-This provides a class ``ELFFile`` that parses an ELF executable in a similar
-interface to ``ZipFile``. Only the read interface is implemented.
-
-Based on: https://gist.github.com/lyssdod/f51579ae8d93c8657a5564aefc2ffbca
-ELF header: https://refspecs.linuxfoundation.org/elf/gabi4+/ch4.eheader.html
-"""
-
-from __future__ import annotations
-
-import enum
-import os
-import struct
-from typing import IO
-
-
-class ELFInvalid(ValueError):
-    pass
-
-
-class EIClass(enum.IntEnum):
-    C32 = 1
-    C64 = 2
-
-
-class EIData(enum.IntEnum):
-    Lsb = 1
-    Msb = 2
-
-
-class EMachine(enum.IntEnum):
-    I386 = 3
-    S390 = 22
-    Arm = 40
-    X8664 = 62
-    AArc64 = 183
-
-
-class ELFFile:
-    """
-    Representation of an ELF executable.
-    """
-
-    def __init__(self, f: IO[bytes]) -> None:
-        self._f = f
-
-        try:
-            ident = self._read("16B")
-        except struct.error as e:
-            raise ELFInvalid("unable to parse identification") from e
-        magic = bytes(ident[:4])
-        if magic != b"\x7fELF":
-            raise ELFInvalid(f"invalid magic: {magic!r}")
-
-        self.capacity = ident[4]  # Format for program header (bitness).
-        self.encoding = ident[5]  # Data structure encoding (endianness).
-
-        try:
-            # e_fmt: Format for program header.
-            # p_fmt: Format for section header.
-            # p_idx: Indexes to find p_type, p_offset, and p_filesz.
-            e_fmt, self._p_fmt, self._p_idx = {
-                (1, 1): ("<HHIIIIIHHH", "<IIIIIIII", (0, 1, 4)),  # 32-bit LSB.
-                (1, 2): (">HHIIIIIHHH", ">IIIIIIII", (0, 1, 4)),  # 32-bit MSB.
-                (2, 1): ("<HHIQQQIHHH", "<IIQQQQQQ", (0, 2, 5)),  # 64-bit LSB.
-                (2, 2): (">HHIQQQIHHH", ">IIQQQQQQ", (0, 2, 5)),  # 64-bit MSB.
-            }[(self.capacity, self.encoding)]
-        except KeyError as e:
-            raise ELFInvalid(
-                f"unrecognized capacity ({self.capacity}) or "
-                f"encoding ({self.encoding})"
-            ) from e
-
-        try:
-            (
-                _,
-                self.machine,  # Architecture type.
-                _,
-                _,
-                self._e_phoff,  # Offset of program header.
-                _,
-                self.flags,  # Processor-specific flags.
-                _,
-                self._e_phentsize,  # Size of section.
-                self._e_phnum,  # Number of sections.
-            ) = self._read(e_fmt)
-        except struct.error as e:
-            raise ELFInvalid("unable to parse machine and section information") from e
-
-    def _read(self, fmt: str) -> tuple[int, ...]:
-        return struct.unpack(fmt, self._f.read(struct.calcsize(fmt)))
-
-    @property
-    def interpreter(self) -> str | None:
-        """
-        The path recorded in the ``PT_INTERP`` section header.
-        """
-        for index in range(self._e_phnum):
-            self._f.seek(self._e_phoff + self._e_phentsize * index)
-            try:
-                data = self._read(self._p_fmt)
-            except struct.error:
-                continue
-            if data[self._p_idx[0]] != 3:  # Not PT_INTERP.
-                continue
-            self._f.seek(data[self._p_idx[1]])
-            return os.fsdecode(self._f.read(data[self._p_idx[2]])).strip("\0")
-        return None
diff --git a/lib/packaging/_manylinux.py b/lib/packaging/_manylinux.py
deleted file mode 100644
index 61339a6f..00000000
--- a/lib/packaging/_manylinux.py
+++ /dev/null
@@ -1,263 +0,0 @@
-from __future__ import annotations
-
-import collections
-import contextlib
-import functools
-import os
-import re
-import sys
-import warnings
-from typing import Generator, Iterator, NamedTuple, Sequence
-
-from ._elffile import EIClass, EIData, ELFFile, EMachine
-
-EF_ARM_ABIMASK = 0xFF000000
-EF_ARM_ABI_VER5 = 0x05000000
-EF_ARM_ABI_FLOAT_HARD = 0x00000400
-
-
-# `os.PathLike` not a generic type until Python 3.9, so sticking with `str`
-# as the type for `path` until then.
-@contextlib.contextmanager
-def _parse_elf(path: str) -> Generator[ELFFile | None, None, None]:
-    try:
-        with open(path, "rb") as f:
-            yield ELFFile(f)
-    except (OSError, TypeError, ValueError):
-        yield None
-
-
-def _is_linux_armhf(executable: str) -> bool:
-    # hard-float ABI can be detected from the ELF header of the running
-    # process
-    # https://static.docs.arm.com/ihi0044/g/aaelf32.pdf
-    with _parse_elf(executable) as f:
-        return (
-            f is not None
-            and f.capacity == EIClass.C32
-            and f.encoding == EIData.Lsb
-            and f.machine == EMachine.Arm
-            and f.flags & EF_ARM_ABIMASK == EF_ARM_ABI_VER5
-            and f.flags & EF_ARM_ABI_FLOAT_HARD == EF_ARM_ABI_FLOAT_HARD
-        )
-
-
-def _is_linux_i686(executable: str) -> bool:
-    with _parse_elf(executable) as f:
-        return (
-            f is not None
-            and f.capacity == EIClass.C32
-            and f.encoding == EIData.Lsb
-            and f.machine == EMachine.I386
-        )
-
-
-def _have_compatible_abi(executable: str, archs: Sequence[str]) -> bool:
-    if "armv7l" in archs:
-        return _is_linux_armhf(executable)
-    if "i686" in archs:
-        return _is_linux_i686(executable)
-    allowed_archs = {
-        "x86_64",
-        "aarch64",
-        "ppc64",
-        "ppc64le",
-        "s390x",
-        "loongarch64",
-        "riscv64",
-    }
-    return any(arch in allowed_archs for arch in archs)
-
-
-# If glibc ever changes its major version, we need to know what the last
-# minor version was, so we can build the complete list of all versions.
-# For now, guess what the highest minor version might be, assume it will
-# be 50 for testing. Once this actually happens, update the dictionary
-# with the actual value.
-_LAST_GLIBC_MINOR: dict[int, int] = collections.defaultdict(lambda: 50)
-
-
-class _GLibCVersion(NamedTuple):
-    major: int
-    minor: int
-
-
-def _glibc_version_string_confstr() -> str | None:
-    """
-    Primary implementation of glibc_version_string using os.confstr.
-    """
-    # os.confstr is quite a bit faster than ctypes.DLL. It's also less likely
-    # to be broken or missing. This strategy is used in the standard library
-    # platform module.
-    # https://github.com/python/cpython/blob/fcf1d003bf4f0100c/Lib/platform.py#L175-L183
-    try:
-        # Should be a string like "glibc 2.17".
-        version_string: str | None = os.confstr("CS_GNU_LIBC_VERSION")
-        assert version_string is not None
-        _, version = version_string.rsplit()
-    except (AssertionError, AttributeError, OSError, ValueError):
-        # os.confstr() or CS_GNU_LIBC_VERSION not available (or a bad value)...
-        return None
-    return version
-
-
-def _glibc_version_string_ctypes() -> str | None:
-    """
-    Fallback implementation of glibc_version_string using ctypes.
-    """
-    try:
-        import ctypes
-    except ImportError:
-        return None
-
-    # ctypes.CDLL(None) internally calls dlopen(NULL), and as the dlopen
-    # manpage says, "If filename is NULL, then the returned handle is for the
-    # main program". This way we can let the linker do the work to figure out
-    # which libc our process is actually using.
-    #
-    # We must also handle the special case where the executable is not a
-    # dynamically linked executable. This can occur when using musl libc,
-    # for example. In this situation, dlopen() will error, leading to an
-    # OSError. Interestingly, at least in the case of musl, there is no
-    # errno set on the OSError. The single string argument used to construct
-    # OSError comes from libc itself and is therefore not portable to
-    # hard code here. In any case, failure to call dlopen() means we
-    # can proceed, so we bail on our attempt.
-    try:
-        process_namespace = ctypes.CDLL(None)
-    except OSError:
-        return None
-
-    try:
-        gnu_get_libc_version = process_namespace.gnu_get_libc_version
-    except AttributeError:
-        # Symbol doesn't exist -> therefore, we are not linked to
-        # glibc.
-        return None
-
-    # Call gnu_get_libc_version, which returns a string like "2.5"
-    gnu_get_libc_version.restype = ctypes.c_char_p
-    version_str: str = gnu_get_libc_version()
-    # py2 / py3 compatibility:
-    if not isinstance(version_str, str):
-        version_str = version_str.decode("ascii")
-
-    return version_str
-
-
-def _glibc_version_string() -> str | None:
-    """Returns glibc version string, or None if not using glibc."""
-    return _glibc_version_string_confstr() or _glibc_version_string_ctypes()
-
-
-def _parse_glibc_version(version_str: str) -> tuple[int, int]:
-    """Parse glibc version.
-
-    We use a regexp instead of str.split because we want to discard any
-    random junk that might come after the minor version -- this might happen
-    in patched/forked versions of glibc (e.g. Linaro's version of glibc
-    uses version strings like "2.20-2014.11"). See gh-3588.
-    """
-    m = re.match(r"(?P<major>[0-9]+)\.(?P<minor>[0-9]+)", version_str)
-    if not m:
-        warnings.warn(
-            f"Expected glibc version with 2 components major.minor,"
-            f" got: {version_str}",
-            RuntimeWarning,
-            stacklevel=2,
-        )
-        return -1, -1
-    return int(m.group("major")), int(m.group("minor"))
-
-
-@functools.lru_cache
-def _get_glibc_version() -> tuple[int, int]:
-    version_str = _glibc_version_string()
-    if version_str is None:
-        return (-1, -1)
-    return _parse_glibc_version(version_str)
-
-
-# From PEP 513, PEP 600
-def _is_compatible(arch: str, version: _GLibCVersion) -> bool:
-    sys_glibc = _get_glibc_version()
-    if sys_glibc < version:
-        return False
-    # Check for presence of _manylinux module.
-    try:
-        import _manylinux
-    except ImportError:
-        return True
-    if hasattr(_manylinux, "manylinux_compatible"):
-        result = _manylinux.manylinux_compatible(version[0], version[1], arch)
-        if result is not None:
-            return bool(result)
-        return True
-    if version == _GLibCVersion(2, 5):
-        if hasattr(_manylinux, "manylinux1_compatible"):
-            return bool(_manylinux.manylinux1_compatible)
-    if version == _GLibCVersion(2, 12):
-        if hasattr(_manylinux, "manylinux2010_compatible"):
-            return bool(_manylinux.manylinux2010_compatible)
-    if version == _GLibCVersion(2, 17):
-        if hasattr(_manylinux, "manylinux2014_compatible"):
-            return bool(_manylinux.manylinux2014_compatible)
-    return True
-
-
-_LEGACY_MANYLINUX_MAP = {
-    # CentOS 7 w/ glibc 2.17 (PEP 599)
-    (2, 17): "manylinux2014",
-    # CentOS 6 w/ glibc 2.12 (PEP 571)
-    (2, 12): "manylinux2010",
-    # CentOS 5 w/ glibc 2.5 (PEP 513)
-    (2, 5): "manylinux1",
-}
-
-
-def platform_tags(archs: Sequence[str]) -> Iterator[str]:
-    """Generate manylinux tags compatible to the current platform.
-
-    :param archs: Sequence of compatible architectures.
-        The first one shall be the closest to the actual architecture and be the part of
-        platform tag after the ``linux_`` prefix, e.g. ``x86_64``.
-        The ``linux_`` prefix is assumed as a prerequisite for the current platform to
-        be manylinux-compatible.
-
-    :returns: An iterator of compatible manylinux tags.
-    """
-    if not _have_compatible_abi(sys.executable, archs):
-        return
-    # Oldest glibc to be supported regardless of architecture is (2, 17).
-    too_old_glibc2 = _GLibCVersion(2, 16)
-    if set(archs) & {"x86_64", "i686"}:
-        # On x86/i686 also oldest glibc to be supported is (2, 5).
-        too_old_glibc2 = _GLibCVersion(2, 4)
-    current_glibc = _GLibCVersion(*_get_glibc_version())
-    glibc_max_list = [current_glibc]
-    # We can assume compatibility across glibc major versions.
-    # https://sourceware.org/bugzilla/show_bug.cgi?id=24636
-    #
-    # Build a list of maximum glibc versions so that we can
-    # output the canonical list of all glibc from current_glibc
-    # down to too_old_glibc2, including all intermediary versions.
-    for glibc_major in range(current_glibc.major - 1, 1, -1):
-        glibc_minor = _LAST_GLIBC_MINOR[glibc_major]
-        glibc_max_list.append(_GLibCVersion(glibc_major, glibc_minor))
-    for arch in archs:
-        for glibc_max in glibc_max_list:
-            if glibc_max.major == too_old_glibc2.major:
-                min_minor = too_old_glibc2.minor
-            else:
-                # For other glibc major versions oldest supported is (x, 0).
-                min_minor = -1
-            for glibc_minor in range(glibc_max.minor, min_minor, -1):
-                glibc_version = _GLibCVersion(glibc_max.major, glibc_minor)
-                tag = "manylinux_{}_{}".format(*glibc_version)
-                if _is_compatible(arch, glibc_version):
-                    yield f"{tag}_{arch}"
-                # Handle the legacy manylinux1, manylinux2010, manylinux2014 tags.
-                if glibc_version in _LEGACY_MANYLINUX_MAP:
-                    legacy_tag = _LEGACY_MANYLINUX_MAP[glibc_version]
-                    if _is_compatible(arch, glibc_version):
-                        yield f"{legacy_tag}_{arch}"
diff --git a/lib/packaging/_musllinux.py b/lib/packaging/_musllinux.py
deleted file mode 100644
index d2bf30b5..00000000
--- a/lib/packaging/_musllinux.py
+++ /dev/null
@@ -1,85 +0,0 @@
-"""PEP 656 support.
-
-This module implements logic to detect if the currently running Python is
-linked against musl, and what musl version is used.
-"""
-
-from __future__ import annotations
-
-import functools
-import re
-import subprocess
-import sys
-from typing import Iterator, NamedTuple, Sequence
-
-from ._elffile import ELFFile
-
-
-class _MuslVersion(NamedTuple):
-    major: int
-    minor: int
-
-
-def _parse_musl_version(output: str) -> _MuslVersion | None:
-    lines = [n for n in (n.strip() for n in output.splitlines()) if n]
-    if len(lines) < 2 or lines[0][:4] != "musl":
-        return None
-    m = re.match(r"Version (\d+)\.(\d+)", lines[1])
-    if not m:
-        return None
-    return _MuslVersion(major=int(m.group(1)), minor=int(m.group(2)))
-
-
-@functools.lru_cache
-def _get_musl_version(executable: str) -> _MuslVersion | None:
-    """Detect currently-running musl runtime version.
-
-    This is done by checking the specified executable's dynamic linking
-    information, and invoking the loader to parse its output for a version
-    string. If the loader is musl, the output would be something like::
-
-        musl libc (x86_64)
-        Version 1.2.2
-        Dynamic Program Loader
-    """
-    try:
-        with open(executable, "rb") as f:
-            ld = ELFFile(f).interpreter
-    except (OSError, TypeError, ValueError):
-        return None
-    if ld is None or "musl" not in ld:
-        return None
-    proc = subprocess.run([ld], stderr=subprocess.PIPE, text=True)
-    return _parse_musl_version(proc.stderr)
-
-
-def platform_tags(archs: Sequence[str]) -> Iterator[str]:
-    """Generate musllinux tags compatible to the current platform.
-
-    :param archs: Sequence of compatible architectures.
-        The first one shall be the closest to the actual architecture and be the part of
-        platform tag after the ``linux_`` prefix, e.g. ``x86_64``.
-        The ``linux_`` prefix is assumed as a prerequisite for the current platform to
-        be musllinux-compatible.
-
-    :returns: An iterator of compatible musllinux tags.
-    """
-    sys_musl = _get_musl_version(sys.executable)
-    if sys_musl is None:  # Python not dynamically linked against musl.
-        return
-    for arch in archs:
-        for minor in range(sys_musl.minor, -1, -1):
-            yield f"musllinux_{sys_musl.major}_{minor}_{arch}"
-
-
-if __name__ == "__main__":  # pragma: no cover
-    import sysconfig
-
-    plat = sysconfig.get_platform()
-    assert plat.startswith("linux-"), "not linux"
-
-    print("plat:", plat)
-    print("musl:", _get_musl_version(sys.executable))
-    print("tags:", end=" ")
-    for t in platform_tags(re.sub(r"[.-]", "_", plat.split("-", 1)[-1])):
-        print(t, end="\n      ")
diff --git a/lib/packaging/_parser.py b/lib/packaging/_parser.py
deleted file mode 100644
index c1238c06..00000000
--- a/lib/packaging/_parser.py
+++ /dev/null
@@ -1,354 +0,0 @@
-"""Handwritten parser of dependency specifiers.
-
-The docstring for each __parse_* function contains EBNF-inspired grammar representing
-the implementation.
-"""
-
-from __future__ import annotations
-
-import ast
-from typing import NamedTuple, Sequence, Tuple, Union
-
-from ._tokenizer import DEFAULT_RULES, Tokenizer
-
-
-class Node:
-    def __init__(self, value: str) -> None:
-        self.value = value
-
-    def __str__(self) -> str:
-        return self.value
-
-    def __repr__(self) -> str:
-        return f"<{self.__class__.__name__}('{self}')>"
-
-    def serialize(self) -> str:
-        raise NotImplementedError
-
-
-class Variable(Node):
-    def serialize(self) -> str:
-        return str(self)
-
-
-class Value(Node):
-    def serialize(self) -> str:
-        return f'"{self}"'
-
-
-class Op(Node):
-    def serialize(self) -> str:
-        return str(self)
-
-
-MarkerVar = Union[Variable, Value]
-MarkerItem = Tuple[MarkerVar, Op, MarkerVar]
-MarkerAtom = Union[MarkerItem, Sequence["MarkerAtom"]]
-MarkerList = Sequence[Union["MarkerList", MarkerAtom, str]]
-
-
-class ParsedRequirement(NamedTuple):
-    name: str
-    url: str
-    extras: list[str]
-    specifier: str
-    marker: MarkerList | None
-
-
-# --------------------------------------------------------------------------------------
-# Recursive descent parser for dependency specifier
-# --------------------------------------------------------------------------------------
-def parse_requirement(source: str) -> ParsedRequirement:
-    return _parse_requirement(Tokenizer(source, rules=DEFAULT_RULES))
-
-
-def _parse_requirement(tokenizer: Tokenizer) -> ParsedRequirement:
-    """
-    requirement = WS? IDENTIFIER WS? extras WS? requirement_details
-    """
-    tokenizer.consume("WS")
-
-    name_token = tokenizer.expect(
-        "IDENTIFIER", expected="package name at the start of dependency specifier"
-    )
-    name = name_token.text
-    tokenizer.consume("WS")
-
-    extras = _parse_extras(tokenizer)
-    tokenizer.consume("WS")
-
-    url, specifier, marker = _parse_requirement_details(tokenizer)
-    tokenizer.expect("END", expected="end of dependency specifier")
-
-    return ParsedRequirement(name, url, extras, specifier, marker)
-
-
-def _parse_requirement_details(
-    tokenizer: Tokenizer,
-) -> tuple[str, str, MarkerList | None]:
-    """
-    requirement_details = AT URL (WS requirement_marker?)?
-                        | specifier WS? (requirement_marker)?
-    """
-
-    specifier = ""
-    url = ""
-    marker = None
-
-    if tokenizer.check("AT"):
-        tokenizer.read()
-        tokenizer.consume("WS")
-
-        url_start = tokenizer.position
-        url = tokenizer.expect("URL", expected="URL after @").text
-        if tokenizer.check("END", peek=True):
-            return (url, specifier, marker)
-
-        tokenizer.expect("WS", expected="whitespace after URL")
-
-        # The input might end after whitespace.
-        if tokenizer.check("END", peek=True):
-            return (url, specifier, marker)
-
-        marker = _parse_requirement_marker(
-            tokenizer, span_start=url_start, after="URL and whitespace"
-        )
-    else:
-        specifier_start = tokenizer.position
-        specifier = _parse_specifier(tokenizer)
-        tokenizer.consume("WS")
-
-        if tokenizer.check("END", peek=True):
-            return (url, specifier, marker)
-
-        marker = _parse_requirement_marker(
-            tokenizer,
-            span_start=specifier_start,
-            after=(
-                "version specifier"
-                if specifier
-                else "name and no valid version specifier"
-            ),
-        )
-
-    return (url, specifier, marker)
-
-
-def _parse_requirement_marker(
-    tokenizer: Tokenizer, *, span_start: int, after: str
-) -> MarkerList:
-    """
-    requirement_marker = SEMICOLON marker WS?
-    """
-
-    if not tokenizer.check("SEMICOLON"):
-        tokenizer.raise_syntax_error(
-            f"Expected end or semicolon (after {after})",
-            span_start=span_start,
-        )
-    tokenizer.read()
-
-    marker = _parse_marker(tokenizer)
-    tokenizer.consume("WS")
-
-    return marker
-
-
-def _parse_extras(tokenizer: Tokenizer) -> list[str]:
-    """
-    extras = (LEFT_BRACKET wsp* extras_list? wsp* RIGHT_BRACKET)?
-    """
-    if not tokenizer.check("LEFT_BRACKET", peek=True):
-        return []
-
-    with tokenizer.enclosing_tokens(
-        "LEFT_BRACKET",
-        "RIGHT_BRACKET",
-        around="extras",
-    ):
-        tokenizer.consume("WS")
-        extras = _parse_extras_list(tokenizer)
-        tokenizer.consume("WS")
-
-    return extras
-
-
-def _parse_extras_list(tokenizer: Tokenizer) -> list[str]:
-    """
-    extras_list = identifier (wsp* ',' wsp* identifier)*
-    """
-    extras: list[str] = []
-
-    if not tokenizer.check("IDENTIFIER"):
-        return extras
-
-    extras.append(tokenizer.read().text)
-
-    while True:
-        tokenizer.consume("WS")
-        if tokenizer.check("IDENTIFIER", peek=True):
-            tokenizer.raise_syntax_error("Expected comma between extra names")
-        elif not tokenizer.check("COMMA"):
-            break
-
-        tokenizer.read()
-        tokenizer.consume("WS")
-
-        extra_token = tokenizer.expect("IDENTIFIER", expected="extra name after comma")
-        extras.append(extra_token.text)
-
-    return extras
-
-
-def _parse_specifier(tokenizer: Tokenizer) -> str:
-    """
-    specifier = LEFT_PARENTHESIS WS? version_many WS? RIGHT_PARENTHESIS
-              | WS? version_many WS?
-    """
-    with tokenizer.enclosing_tokens(
-        "LEFT_PARENTHESIS",
-        "RIGHT_PARENTHESIS",
-        around="version specifier",
-    ):
-        tokenizer.consume("WS")
-        parsed_specifiers = _parse_version_many(tokenizer)
-        tokenizer.consume("WS")
-
-    return parsed_specifiers
-
-
-def _parse_version_many(tokenizer: Tokenizer) -> str:
-    """
-    version_many = (SPECIFIER (WS? COMMA WS? SPECIFIER)*)?
-    """
-    parsed_specifiers = ""
-    while tokenizer.check("SPECIFIER"):
-        span_start = tokenizer.position
-        parsed_specifiers += tokenizer.read().text
-        if tokenizer.check("VERSION_PREFIX_TRAIL", peek=True):
-            tokenizer.raise_syntax_error(
-                ".* suffix can only be used with `==` or `!=` operators",
-                span_start=span_start,
-                span_end=tokenizer.position + 1,
-            )
-        if tokenizer.check("VERSION_LOCAL_LABEL_TRAIL", peek=True):
-            tokenizer.raise_syntax_error(
-                "Local version label can only be used with `==` or `!=` operators",
-                span_start=span_start,
-                span_end=tokenizer.position,
-            )
-        tokenizer.consume("WS")
-        if not tokenizer.check("COMMA"):
-            break
-        parsed_specifiers += tokenizer.read().text
-        tokenizer.consume("WS")
-
-    return parsed_specifiers
-
-
-# --------------------------------------------------------------------------------------
-# Recursive descent parser for marker expression
-# --------------------------------------------------------------------------------------
-def parse_marker(source: str) -> MarkerList:
-    return _parse_full_marker(Tokenizer(source, rules=DEFAULT_RULES))
-
-
-def _parse_full_marker(tokenizer: Tokenizer) -> MarkerList:
-    retval = _parse_marker(tokenizer)
-    tokenizer.expect("END", expected="end of marker expression")
-    return retval
-
-
-def _parse_marker(tokenizer: Tokenizer) -> MarkerList:
-    """
-    marker = marker_atom (BOOLOP marker_atom)+
-    """
-    expression = [_parse_marker_atom(tokenizer)]
-    while tokenizer.check("BOOLOP"):
-        token = tokenizer.read()
-        expr_right = _parse_marker_atom(tokenizer)
-        expression.extend((token.text, expr_right))
-    return expression
-
-
-def _parse_marker_atom(tokenizer: Tokenizer) -> MarkerAtom:
-    """
-    marker_atom = WS? LEFT_PARENTHESIS WS? marker WS? RIGHT_PARENTHESIS WS?
-                | WS? marker_item WS?
-    """
-
-    tokenizer.consume("WS")
-    if tokenizer.check("LEFT_PARENTHESIS", peek=True):
-        with tokenizer.enclosing_tokens(
-            "LEFT_PARENTHESIS",
-            "RIGHT_PARENTHESIS",
-            around="marker expression",
-        ):
-            tokenizer.consume("WS")
-            marker: MarkerAtom = _parse_marker(tokenizer)
-            tokenizer.consume("WS")
-    else:
-        marker = _parse_marker_item(tokenizer)
-    tokenizer.consume("WS")
-    return marker
-
-
-def _parse_marker_item(tokenizer: Tokenizer) -> MarkerItem:
-    """
-    marker_item = WS? marker_var WS? marker_op WS? marker_var WS?
-    """
-    tokenizer.consume("WS")
-    marker_var_left = _parse_marker_var(tokenizer)
-    tokenizer.consume("WS")
-    marker_op = _parse_marker_op(tokenizer)
-    tokenizer.consume("WS")
-    marker_var_right = _parse_marker_var(tokenizer)
-    tokenizer.consume("WS")
-    return (marker_var_left, marker_op, marker_var_right)
-
-
-def _parse_marker_var(tokenizer: Tokenizer) -> MarkerVar:
-    """
-    marker_var = VARIABLE | QUOTED_STRING
-    """
-    if tokenizer.check("VARIABLE"):
-        return process_env_var(tokenizer.read().text.replace(".", "_"))
-    elif tokenizer.check("QUOTED_STRING"):
-        return process_python_str(tokenizer.read().text)
-    else:
-        tokenizer.raise_syntax_error(
-            message="Expected a marker variable or quoted string"
-        )
-
-
-def process_env_var(env_var: str) -> Variable:
-    if env_var in ("platform_python_implementation", "python_implementation"):
-        return Variable("platform_python_implementation")
-    else:
-        return Variable(env_var)
-
-
-def process_python_str(python_str: str) -> Value:
-    value = ast.literal_eval(python_str)
-    return Value(str(value))
-
-
-def _parse_marker_op(tokenizer: Tokenizer) -> Op:
-    """
-    marker_op = IN | NOT IN | OP
-    """
-    if tokenizer.check("IN"):
-        tokenizer.read()
-        return Op("in")
-    elif tokenizer.check("NOT"):
-        tokenizer.read()
-        tokenizer.expect("WS", expected="whitespace after 'not'")
-        tokenizer.expect("IN", expected="'in' after 'not'")
-        return Op("not in")
-    elif tokenizer.check("OP"):
-        return Op(tokenizer.read().text)
-    else:
-        return tokenizer.raise_syntax_error(
-            "Expected marker operator, one of "
-            "<=, <, !=, ==, >=, >, ~=, ===, in, not in"
-        )
diff --git a/lib/packaging/_structures.py b/lib/packaging/_structures.py
deleted file mode 100644
index 90a6465f..00000000
--- a/lib/packaging/_structures.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-
-
-class InfinityType:
-    def __repr__(self) -> str:
-        return "Infinity"
-
-    def __hash__(self) -> int:
-        return hash(repr(self))
-
-    def __lt__(self, other: object) -> bool:
-        return False
-
-    def __le__(self, other: object) -> bool:
-        return False
-
-    def __eq__(self, other: object) -> bool:
-        return isinstance(other, self.__class__)
-
-    def __gt__(self, other: object) -> bool:
-        return True
-
-    def __ge__(self, other: object) -> bool:
-        return True
-
-    def __neg__(self: object) -> "NegativeInfinityType":
-        return NegativeInfinity
-
-
-Infinity = InfinityType()
-
-
-class NegativeInfinityType:
-    def __repr__(self) -> str:
-        return "-Infinity"
-
-    def __hash__(self) -> int:
-        return hash(repr(self))
-
-    def __lt__(self, other: object) -> bool:
-        return True
-
-    def __le__(self, other: object) -> bool:
-        return True
-
-    def __eq__(self, other: object) -> bool:
-        return isinstance(other, self.__class__)
-
-    def __gt__(self, other: object) -> bool:
-        return False
-
-    def __ge__(self, other: object) -> bool:
-        return False
-
-    def __neg__(self: object) -> InfinityType:
-        return Infinity
-
-
-NegativeInfinity = NegativeInfinityType()
diff --git a/lib/packaging/_tokenizer.py b/lib/packaging/_tokenizer.py
deleted file mode 100644
index 89d04160..00000000
--- a/lib/packaging/_tokenizer.py
+++ /dev/null
@@ -1,194 +0,0 @@
-from __future__ import annotations
-
-import contextlib
-import re
-from dataclasses import dataclass
-from typing import Iterator, NoReturn
-
-from .specifiers import Specifier
-
-
-@dataclass
-class Token:
-    name: str
-    text: str
-    position: int
-
-
-class ParserSyntaxError(Exception):
-    """The provided source text could not be parsed correctly."""
-
-    def __init__(
-        self,
-        message: str,
-        *,
-        source: str,
-        span: tuple[int, int],
-    ) -> None:
-        self.span = span
-        self.message = message
-        self.source = source
-
-        super().__init__()
-
-    def __str__(self) -> str:
-        marker = " " * self.span[0] + "~" * (self.span[1] - self.span[0]) + "^"
-        return "\n    ".join([self.message, self.source, marker])
-
-
-DEFAULT_RULES: dict[str, str | re.Pattern[str]] = {
-    "LEFT_PARENTHESIS": r"\(",
-    "RIGHT_PARENTHESIS": r"\)",
-    "LEFT_BRACKET": r"\[",
-    "RIGHT_BRACKET": r"\]",
-    "SEMICOLON": r";",
-    "COMMA": r",",
-    "QUOTED_STRING": re.compile(
-        r"""
-            (
-                ('[^']*')
-                |
-                ("[^"]*")
-            )
-        """,
-        re.VERBOSE,
-    ),
-    "OP": r"(===|==|~=|!=|<=|>=|<|>)",
-    "BOOLOP": r"\b(or|and)\b",
-    "IN": r"\bin\b",
-    "NOT": r"\bnot\b",
-    "VARIABLE": re.compile(
-        r"""
-            \b(
-                python_version
-                |python_full_version
-                |os[._]name
-                |sys[._]platform
-                |platform_(release|system)
-                |platform[._](version|machine|python_implementation)
-                |python_implementation
-                |implementation_(name|version)
-                |extra
-            )\b
-        """,
-        re.VERBOSE,
-    ),
-    "SPECIFIER": re.compile(
-        Specifier._operator_regex_str + Specifier._version_regex_str,
-        re.VERBOSE | re.IGNORECASE,
-    ),
-    "AT": r"\@",
-    "URL": r"[^ \t]+",
-    "IDENTIFIER": r"\b[a-zA-Z0-9][a-zA-Z0-9._-]*\b",
-    "VERSION_PREFIX_TRAIL": r"\.\*",
-    "VERSION_LOCAL_LABEL_TRAIL": r"\+[a-z0-9]+(?:[-_\.][a-z0-9]+)*",
-    "WS": r"[ \t]+",
-    "END": r"$",
-}
-
-
-class Tokenizer:
-    """Context-sensitive token parsing.
-
-    Provides methods to examine the input stream to check whether the next token
-    matches.
-    """
-
-    def __init__(
-        self,
-        source: str,
-        *,
-        rules: dict[str, str | re.Pattern[str]],
-    ) -> None:
-        self.source = source
-        self.rules: dict[str, re.Pattern[str]] = {
-            name: re.compile(pattern) for name, pattern in rules.items()
-        }
-        self.next_token: Token | None = None
-        self.position = 0
-
-    def consume(self, name: str) -> None:
-        """Move beyond provided token name, if at current position."""
-        if self.check(name):
-            self.read()
-
-    def check(self, name: str, *, peek: bool = False) -> bool:
-        """Check whether the next token has the provided name.
-
-        By default, if the check succeeds, the token *must* be read before
-        another check. If `peek` is set to `True`, the token is not loaded and
-        would need to be checked again.
-        """
-        assert (
-            self.next_token is None
-        ), f"Cannot check for {name!r}, already have {self.next_token!r}"
-        assert name in self.rules, f"Unknown token name: {name!r}"
-
-        expression = self.rules[name]
-
-        match = expression.match(self.source, self.position)
-        if match is None:
-            return False
-        if not peek:
-            self.next_token = Token(name, match[0], self.position)
-        return True
-
-    def expect(self, name: str, *, expected: str) -> Token:
-        """Expect a certain token name next, failing with a syntax error otherwise.
-
-        The token is *not* read.
-        """
-        if not self.check(name):
-            raise self.raise_syntax_error(f"Expected {expected}")
-        return self.read()
-
-    def read(self) -> Token:
-        """Consume the next token and return it."""
-        token = self.next_token
-        assert token is not None
-
-        self.position += len(token.text)
-        self.next_token = None
-
-        return token
-
-    def raise_syntax_error(
-        self,
-        message: str,
-        *,
-        span_start: int | None = None,
-        span_end: int | None = None,
-    ) -> NoReturn:
-        """Raise ParserSyntaxError at the given position."""
-        span = (
-            self.position if span_start is None else span_start,
-            self.position if span_end is None else span_end,
-        )
-        raise ParserSyntaxError(
-            message,
-            source=self.source,
-            span=span,
-        )
-
-    @contextlib.contextmanager
-    def enclosing_tokens(
-        self, open_token: str, close_token: str, *, around: str
-    ) -> Iterator[None]:
-        if self.check(open_token):
-            open_position = self.position
-            self.read()
-        else:
-            open_position = None
-
-        yield
-
-        if open_position is None:
-            return
-
-        if not self.check(close_token):
-            self.raise_syntax_error(
-                f"Expected matching {close_token} for {open_token}, after {around}",
-                span_start=open_position,
-            )
-
-        self.read()
diff --git a/lib/packaging/licenses/__init__.py b/lib/packaging/licenses/__init__.py
deleted file mode 100644
index 569156d6..00000000
--- a/lib/packaging/licenses/__init__.py
+++ /dev/null
@@ -1,145 +0,0 @@
-#######################################################################################
-#
-# Adapted from:
-#  https://github.com/pypa/hatch/blob/5352e44/backend/src/hatchling/licenses/parse.py
-#
-# MIT License
-#
-# Copyright (c) 2017-present Ofek Lev <oss@ofek.dev>
-#
-# 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.
-#
-#
-# With additional allowance of arbitrary `LicenseRef-` identifiers, not just
-# `LicenseRef-Public-Domain` and `LicenseRef-Proprietary`.
-#
-#######################################################################################
-from __future__ import annotations
-
-import re
-from typing import NewType, cast
-
-from packaging.licenses._spdx import EXCEPTIONS, LICENSES
-
-__all__ = [
-    "NormalizedLicenseExpression",
-    "InvalidLicenseExpression",
-    "canonicalize_license_expression",
-]
-
-license_ref_allowed = re.compile("^[A-Za-z0-9.-]*$")
-
-NormalizedLicenseExpression = NewType("NormalizedLicenseExpression", str)
-
-
-class InvalidLicenseExpression(ValueError):
-    """Raised when a license-expression string is invalid
-
-    >>> canonicalize_license_expression("invalid")
-    Traceback (most recent call last):
-        ...
-    packaging.licenses.InvalidLicenseExpression: Invalid license expression: 'invalid'
-    """
-
-
-def canonicalize_license_expression(
-    raw_license_expression: str,
-) -> NormalizedLicenseExpression:
-    if not raw_license_expression:
-        message = f"Invalid license expression: {raw_license_expression!r}"
-        raise InvalidLicenseExpression(message)
-
-    # Pad any parentheses so tokenization can be achieved by merely splitting on
-    # whitespace.
-    license_expression = raw_license_expression.replace("(", " ( ").replace(")", " ) ")
-    licenseref_prefix = "LicenseRef-"
-    license_refs = {
-        ref.lower(): "LicenseRef-" + ref[len(licenseref_prefix) :]
-        for ref in license_expression.split()
-        if ref.lower().startswith(licenseref_prefix.lower())
-    }
-
-    # Normalize to lower case so we can look up licenses/exceptions
-    # and so boolean operators are Python-compatible.
-    license_expression = license_expression.lower()
-
-    tokens = license_expression.split()
-
-    # Rather than implementing boolean logic, we create an expression that Python can
-    # parse. Everything that is not involved with the grammar itself is treated as
-    # `False` and the expression should evaluate as such.
-    python_tokens = []
-    for token in tokens:
-        if token not in {"or", "and", "with", "(", ")"}:
-            python_tokens.append("False")
-        elif token == "with":
-            python_tokens.append("or")
-        elif token == "(" and python_tokens and python_tokens[-1] not in {"or", "and"}:
-            message = f"Invalid license expression: {raw_license_expression!r}"
-            raise InvalidLicenseExpression(message)
-        else:
-            python_tokens.append(token)
-
-    python_expression = " ".join(python_tokens)
-    try:
-        invalid = eval(python_expression, globals(), locals())
-    except Exception:
-        invalid = True
-
-    if invalid is not False:
-        message = f"Invalid license expression: {raw_license_expression!r}"
-        raise InvalidLicenseExpression(message) from None
-
-    # Take a final pass to check for unknown licenses/exceptions.
-    normalized_tokens = []
-    for token in tokens:
-        if token in {"or", "and", "with", "(", ")"}:
-            normalized_tokens.append(token.upper())
-            continue
-
-        if normalized_tokens and normalized_tokens[-1] == "WITH":
-            if token not in EXCEPTIONS:
-                message = f"Unknown license exception: {token!r}"
-                raise InvalidLicenseExpression(message)
-
-            normalized_tokens.append(EXCEPTIONS[token]["id"])
-        else:
-            if token.endswith("+"):
-                final_token = token[:-1]
-                suffix = "+"
-            else:
-                final_token = token
-                suffix = ""
-
-            if final_token.startswith("licenseref-"):
-                if not license_ref_allowed.match(final_token):
-                    message = f"Invalid licenseref: {final_token!r}"
-                    raise InvalidLicenseExpression(message)
-                normalized_tokens.append(license_refs[final_token] + suffix)
-            else:
-                if final_token not in LICENSES:
-                    message = f"Unknown license: {final_token!r}"
-                    raise InvalidLicenseExpression(message)
-                normalized_tokens.append(LICENSES[final_token]["id"] + suffix)
-
-    normalized_expression = " ".join(normalized_tokens)
-
-    return cast(
-        NormalizedLicenseExpression,
-        normalized_expression.replace("( ", "(").replace(" )", ")"),
-    )
diff --git a/lib/packaging/licenses/_spdx.py b/lib/packaging/licenses/_spdx.py
deleted file mode 100644
index eac22276..00000000
--- a/lib/packaging/licenses/_spdx.py
+++ /dev/null
@@ -1,759 +0,0 @@
-
-from __future__ import annotations
-
-from typing import TypedDict
-
-class SPDXLicense(TypedDict):
-    id: str
-    deprecated: bool
-
-class SPDXException(TypedDict):
-    id: str
-    deprecated: bool
-
-
-VERSION = '3.25.0'
-
-LICENSES: dict[str, SPDXLicense] = {
-    '0bsd': {'id': '0BSD', 'deprecated': False},
-    '3d-slicer-1.0': {'id': '3D-Slicer-1.0', 'deprecated': False},
-    'aal': {'id': 'AAL', 'deprecated': False},
-    'abstyles': {'id': 'Abstyles', 'deprecated': False},
-    'adacore-doc': {'id': 'AdaCore-doc', 'deprecated': False},
-    'adobe-2006': {'id': 'Adobe-2006', 'deprecated': False},
-    'adobe-display-postscript': {'id': 'Adobe-Display-PostScript', 'deprecated': False},
-    'adobe-glyph': {'id': 'Adobe-Glyph', 'deprecated': False},
-    'adobe-utopia': {'id': 'Adobe-Utopia', 'deprecated': False},
-    'adsl': {'id': 'ADSL', 'deprecated': False},
-    'afl-1.1': {'id': 'AFL-1.1', 'deprecated': False},
-    'afl-1.2': {'id': 'AFL-1.2', 'deprecated': False},
-    'afl-2.0': {'id': 'AFL-2.0', 'deprecated': False},
-    'afl-2.1': {'id': 'AFL-2.1', 'deprecated': False},
-    'afl-3.0': {'id': 'AFL-3.0', 'deprecated': False},
-    'afmparse': {'id': 'Afmparse', 'deprecated': False},
-    'agpl-1.0': {'id': 'AGPL-1.0', 'deprecated': True},
-    'agpl-1.0-only': {'id': 'AGPL-1.0-only', 'deprecated': False},
-    'agpl-1.0-or-later': {'id': 'AGPL-1.0-or-later', 'deprecated': False},
-    'agpl-3.0': {'id': 'AGPL-3.0', 'deprecated': True},
-    'agpl-3.0-only': {'id': 'AGPL-3.0-only', 'deprecated': False},
-    'agpl-3.0-or-later': {'id': 'AGPL-3.0-or-later', 'deprecated': False},
-    'aladdin': {'id': 'Aladdin', 'deprecated': False},
-    'amd-newlib': {'id': 'AMD-newlib', 'deprecated': False},
-    'amdplpa': {'id': 'AMDPLPA', 'deprecated': False},
-    'aml': {'id': 'AML', 'deprecated': False},
-    'aml-glslang': {'id': 'AML-glslang', 'deprecated': False},
-    'ampas': {'id': 'AMPAS', 'deprecated': False},
-    'antlr-pd': {'id': 'ANTLR-PD', 'deprecated': False},
-    'antlr-pd-fallback': {'id': 'ANTLR-PD-fallback', 'deprecated': False},
-    'any-osi': {'id': 'any-OSI', 'deprecated': False},
-    'apache-1.0': {'id': 'Apache-1.0', 'deprecated': False},
-    'apache-1.1': {'id': 'Apache-1.1', 'deprecated': False},
-    'apache-2.0': {'id': 'Apache-2.0', 'deprecated': False},
-    'apafml': {'id': 'APAFML', 'deprecated': False},
-    'apl-1.0': {'id': 'APL-1.0', 'deprecated': False},
-    'app-s2p': {'id': 'App-s2p', 'deprecated': False},
-    'apsl-1.0': {'id': 'APSL-1.0', 'deprecated': False},
-    'apsl-1.1': {'id': 'APSL-1.1', 'deprecated': False},
-    'apsl-1.2': {'id': 'APSL-1.2', 'deprecated': False},
-    'apsl-2.0': {'id': 'APSL-2.0', 'deprecated': False},
-    'arphic-1999': {'id': 'Arphic-1999', 'deprecated': False},
-    'artistic-1.0': {'id': 'Artistic-1.0', 'deprecated': False},
-    'artistic-1.0-cl8': {'id': 'Artistic-1.0-cl8', 'deprecated': False},
-    'artistic-1.0-perl': {'id': 'Artistic-1.0-Perl', 'deprecated': False},
-    'artistic-2.0': {'id': 'Artistic-2.0', 'deprecated': False},
-    'aswf-digital-assets-1.0': {'id': 'ASWF-Digital-Assets-1.0', 'deprecated': False},
-    'aswf-digital-assets-1.1': {'id': 'ASWF-Digital-Assets-1.1', 'deprecated': False},
-    'baekmuk': {'id': 'Baekmuk', 'deprecated': False},
-    'bahyph': {'id': 'Bahyph', 'deprecated': False},
-    'barr': {'id': 'Barr', 'deprecated': False},
-    'bcrypt-solar-designer': {'id': 'bcrypt-Solar-Designer', 'deprecated': False},
-    'beerware': {'id': 'Beerware', 'deprecated': False},
-    'bitstream-charter': {'id': 'Bitstream-Charter', 'deprecated': False},
-    'bitstream-vera': {'id': 'Bitstream-Vera', 'deprecated': False},
-    'bittorrent-1.0': {'id': 'BitTorrent-1.0', 'deprecated': False},
-    'bittorrent-1.1': {'id': 'BitTorrent-1.1', 'deprecated': False},
-    'blessing': {'id': 'blessing', 'deprecated': False},
-    'blueoak-1.0.0': {'id': 'BlueOak-1.0.0', 'deprecated': False},
-    'boehm-gc': {'id': 'Boehm-GC', 'deprecated': False},
-    'borceux': {'id': 'Borceux', 'deprecated': False},
-    'brian-gladman-2-clause': {'id': 'Brian-Gladman-2-Clause', 'deprecated': False},
-    'brian-gladman-3-clause': {'id': 'Brian-Gladman-3-Clause', 'deprecated': False},
-    'bsd-1-clause': {'id': 'BSD-1-Clause', 'deprecated': False},
-    'bsd-2-clause': {'id': 'BSD-2-Clause', 'deprecated': False},
-    'bsd-2-clause-darwin': {'id': 'BSD-2-Clause-Darwin', 'deprecated': False},
-    'bsd-2-clause-first-lines': {'id': 'BSD-2-Clause-first-lines', 'deprecated': False},
-    'bsd-2-clause-freebsd': {'id': 'BSD-2-Clause-FreeBSD', 'deprecated': True},
-    'bsd-2-clause-netbsd': {'id': 'BSD-2-Clause-NetBSD', 'deprecated': True},
-    'bsd-2-clause-patent': {'id': 'BSD-2-Clause-Patent', 'deprecated': False},
-    'bsd-2-clause-views': {'id': 'BSD-2-Clause-Views', 'deprecated': False},
-    'bsd-3-clause': {'id': 'BSD-3-Clause', 'deprecated': False},
-    'bsd-3-clause-acpica': {'id': 'BSD-3-Clause-acpica', 'deprecated': False},
-    'bsd-3-clause-attribution': {'id': 'BSD-3-Clause-Attribution', 'deprecated': False},
-    'bsd-3-clause-clear': {'id': 'BSD-3-Clause-Clear', 'deprecated': False},
-    'bsd-3-clause-flex': {'id': 'BSD-3-Clause-flex', 'deprecated': False},
-    'bsd-3-clause-hp': {'id': 'BSD-3-Clause-HP', 'deprecated': False},
-    'bsd-3-clause-lbnl': {'id': 'BSD-3-Clause-LBNL', 'deprecated': False},
-    'bsd-3-clause-modification': {'id': 'BSD-3-Clause-Modification', 'deprecated': False},
-    'bsd-3-clause-no-military-license': {'id': 'BSD-3-Clause-No-Military-License', 'deprecated': False},
-    'bsd-3-clause-no-nuclear-license': {'id': 'BSD-3-Clause-No-Nuclear-License', 'deprecated': False},
-    'bsd-3-clause-no-nuclear-license-2014': {'id': 'BSD-3-Clause-No-Nuclear-License-2014', 'deprecated': False},
-    'bsd-3-clause-no-nuclear-warranty': {'id': 'BSD-3-Clause-No-Nuclear-Warranty', 'deprecated': False},
-    'bsd-3-clause-open-mpi': {'id': 'BSD-3-Clause-Open-MPI', 'deprecated': False},
-    'bsd-3-clause-sun': {'id': 'BSD-3-Clause-Sun', 'deprecated': False},
-    'bsd-4-clause': {'id': 'BSD-4-Clause', 'deprecated': False},
-    'bsd-4-clause-shortened': {'id': 'BSD-4-Clause-Shortened', 'deprecated': False},
-    'bsd-4-clause-uc': {'id': 'BSD-4-Clause-UC', 'deprecated': False},
-    'bsd-4.3reno': {'id': 'BSD-4.3RENO', 'deprecated': False},
-    'bsd-4.3tahoe': {'id': 'BSD-4.3TAHOE', 'deprecated': False},
-    'bsd-advertising-acknowledgement': {'id': 'BSD-Advertising-Acknowledgement', 'deprecated': False},
-    'bsd-attribution-hpnd-disclaimer': {'id': 'BSD-Attribution-HPND-disclaimer', 'deprecated': False},
-    'bsd-inferno-nettverk': {'id': 'BSD-Inferno-Nettverk', 'deprecated': False},
-    'bsd-protection': {'id': 'BSD-Protection', 'deprecated': False},
-    'bsd-source-beginning-file': {'id': 'BSD-Source-beginning-file', 'deprecated': False},
-    'bsd-source-code': {'id': 'BSD-Source-Code', 'deprecated': False},
-    'bsd-systemics': {'id': 'BSD-Systemics', 'deprecated': False},
-    'bsd-systemics-w3works': {'id': 'BSD-Systemics-W3Works', 'deprecated': False},
-    'bsl-1.0': {'id': 'BSL-1.0', 'deprecated': False},
-    'busl-1.1': {'id': 'BUSL-1.1', 'deprecated': False},
-    'bzip2-1.0.5': {'id': 'bzip2-1.0.5', 'deprecated': True},
-    'bzip2-1.0.6': {'id': 'bzip2-1.0.6', 'deprecated': False},
-    'c-uda-1.0': {'id': 'C-UDA-1.0', 'deprecated': False},
-    'cal-1.0': {'id': 'CAL-1.0', 'deprecated': False},
-    'cal-1.0-combined-work-exception': {'id': 'CAL-1.0-Combined-Work-Exception', 'deprecated': False},
-    'caldera': {'id': 'Caldera', 'deprecated': False},
-    'caldera-no-preamble': {'id': 'Caldera-no-preamble', 'deprecated': False},
-    'catharon': {'id': 'Catharon', 'deprecated': False},
-    'catosl-1.1': {'id': 'CATOSL-1.1', 'deprecated': False},
-    'cc-by-1.0': {'id': 'CC-BY-1.0', 'deprecated': False},
-    'cc-by-2.0': {'id': 'CC-BY-2.0', 'deprecated': False},
-    'cc-by-2.5': {'id': 'CC-BY-2.5', 'deprecated': False},
-    'cc-by-2.5-au': {'id': 'CC-BY-2.5-AU', 'deprecated': False},
-    'cc-by-3.0': {'id': 'CC-BY-3.0', 'deprecated': False},
-    'cc-by-3.0-at': {'id': 'CC-BY-3.0-AT', 'deprecated': False},
-    'cc-by-3.0-au': {'id': 'CC-BY-3.0-AU', 'deprecated': False},
-    'cc-by-3.0-de': {'id': 'CC-BY-3.0-DE', 'deprecated': False},
-    'cc-by-3.0-igo': {'id': 'CC-BY-3.0-IGO', 'deprecated': False},
-    'cc-by-3.0-nl': {'id': 'CC-BY-3.0-NL', 'deprecated': False},
-    'cc-by-3.0-us': {'id': 'CC-BY-3.0-US', 'deprecated': False},
-    'cc-by-4.0': {'id': 'CC-BY-4.0', 'deprecated': False},
-    'cc-by-nc-1.0': {'id': 'CC-BY-NC-1.0', 'deprecated': False},
-    'cc-by-nc-2.0': {'id': 'CC-BY-NC-2.0', 'deprecated': False},
-    'cc-by-nc-2.5': {'id': 'CC-BY-NC-2.5', 'deprecated': False},
-    'cc-by-nc-3.0': {'id': 'CC-BY-NC-3.0', 'deprecated': False},
-    'cc-by-nc-3.0-de': {'id': 'CC-BY-NC-3.0-DE', 'deprecated': False},
-    'cc-by-nc-4.0': {'id': 'CC-BY-NC-4.0', 'deprecated': False},
-    'cc-by-nc-nd-1.0': {'id': 'CC-BY-NC-ND-1.0', 'deprecated': False},
-    'cc-by-nc-nd-2.0': {'id': 'CC-BY-NC-ND-2.0', 'deprecated': False},
-    'cc-by-nc-nd-2.5': {'id': 'CC-BY-NC-ND-2.5', 'deprecated': False},
-    'cc-by-nc-nd-3.0': {'id': 'CC-BY-NC-ND-3.0', 'deprecated': False},
-    'cc-by-nc-nd-3.0-de': {'id': 'CC-BY-NC-ND-3.0-DE', 'deprecated': False},
-    'cc-by-nc-nd-3.0-igo': {'id': 'CC-BY-NC-ND-3.0-IGO', 'deprecated': False},
-    'cc-by-nc-nd-4.0': {'id': 'CC-BY-NC-ND-4.0', 'deprecated': False},
-    'cc-by-nc-sa-1.0': {'id': 'CC-BY-NC-SA-1.0', 'deprecated': False},
-    'cc-by-nc-sa-2.0': {'id': 'CC-BY-NC-SA-2.0', 'deprecated': False},
-    'cc-by-nc-sa-2.0-de': {'id': 'CC-BY-NC-SA-2.0-DE', 'deprecated': False},
-    'cc-by-nc-sa-2.0-fr': {'id': 'CC-BY-NC-SA-2.0-FR', 'deprecated': False},
-    'cc-by-nc-sa-2.0-uk': {'id': 'CC-BY-NC-SA-2.0-UK', 'deprecated': False},
-    'cc-by-nc-sa-2.5': {'id': 'CC-BY-NC-SA-2.5', 'deprecated': False},
-    'cc-by-nc-sa-3.0': {'id': 'CC-BY-NC-SA-3.0', 'deprecated': False},
-    'cc-by-nc-sa-3.0-de': {'id': 'CC-BY-NC-SA-3.0-DE', 'deprecated': False},
-    'cc-by-nc-sa-3.0-igo': {'id': 'CC-BY-NC-SA-3.0-IGO', 'deprecated': False},
-    'cc-by-nc-sa-4.0': {'id': 'CC-BY-NC-SA-4.0', 'deprecated': False},
-    'cc-by-nd-1.0': {'id': 'CC-BY-ND-1.0', 'deprecated': False},
-    'cc-by-nd-2.0': {'id': 'CC-BY-ND-2.0', 'deprecated': False},
-    'cc-by-nd-2.5': {'id': 'CC-BY-ND-2.5', 'deprecated': False},
-    'cc-by-nd-3.0': {'id': 'CC-BY-ND-3.0', 'deprecated': False},
-    'cc-by-nd-3.0-de': {'id': 'CC-BY-ND-3.0-DE', 'deprecated': False},
-    'cc-by-nd-4.0': {'id': 'CC-BY-ND-4.0', 'deprecated': False},
-    'cc-by-sa-1.0': {'id': 'CC-BY-SA-1.0', 'deprecated': False},
-    'cc-by-sa-2.0': {'id': 'CC-BY-SA-2.0', 'deprecated': False},
-    'cc-by-sa-2.0-uk': {'id': 'CC-BY-SA-2.0-UK', 'deprecated': False},
-    'cc-by-sa-2.1-jp': {'id': 'CC-BY-SA-2.1-JP', 'deprecated': False},
-    'cc-by-sa-2.5': {'id': 'CC-BY-SA-2.5', 'deprecated': False},
-    'cc-by-sa-3.0': {'id': 'CC-BY-SA-3.0', 'deprecated': False},
-    'cc-by-sa-3.0-at': {'id': 'CC-BY-SA-3.0-AT', 'deprecated': False},
-    'cc-by-sa-3.0-de': {'id': 'CC-BY-SA-3.0-DE', 'deprecated': False},
-    'cc-by-sa-3.0-igo': {'id': 'CC-BY-SA-3.0-IGO', 'deprecated': False},
-    'cc-by-sa-4.0': {'id': 'CC-BY-SA-4.0', 'deprecated': False},
-    'cc-pddc': {'id': 'CC-PDDC', 'deprecated': False},
-    'cc0-1.0': {'id': 'CC0-1.0', 'deprecated': False},
-    'cddl-1.0': {'id': 'CDDL-1.0', 'deprecated': False},
-    'cddl-1.1': {'id': 'CDDL-1.1', 'deprecated': False},
-    'cdl-1.0': {'id': 'CDL-1.0', 'deprecated': False},
-    'cdla-permissive-1.0': {'id': 'CDLA-Permissive-1.0', 'deprecated': False},
-    'cdla-permissive-2.0': {'id': 'CDLA-Permissive-2.0', 'deprecated': False},
-    'cdla-sharing-1.0': {'id': 'CDLA-Sharing-1.0', 'deprecated': False},
-    'cecill-1.0': {'id': 'CECILL-1.0', 'deprecated': False},
-    'cecill-1.1': {'id': 'CECILL-1.1', 'deprecated': False},
-    'cecill-2.0': {'id': 'CECILL-2.0', 'deprecated': False},
-    'cecill-2.1': {'id': 'CECILL-2.1', 'deprecated': False},
-    'cecill-b': {'id': 'CECILL-B', 'deprecated': False},
-    'cecill-c': {'id': 'CECILL-C', 'deprecated': False},
-    'cern-ohl-1.1': {'id': 'CERN-OHL-1.1', 'deprecated': False},
-    'cern-ohl-1.2': {'id': 'CERN-OHL-1.2', 'deprecated': False},
-    'cern-ohl-p-2.0': {'id': 'CERN-OHL-P-2.0', 'deprecated': False},
-    'cern-ohl-s-2.0': {'id': 'CERN-OHL-S-2.0', 'deprecated': False},
-    'cern-ohl-w-2.0': {'id': 'CERN-OHL-W-2.0', 'deprecated': False},
-    'cfitsio': {'id': 'CFITSIO', 'deprecated': False},
-    'check-cvs': {'id': 'check-cvs', 'deprecated': False},
-    'checkmk': {'id': 'checkmk', 'deprecated': False},
-    'clartistic': {'id': 'ClArtistic', 'deprecated': False},
-    'clips': {'id': 'Clips', 'deprecated': False},
-    'cmu-mach': {'id': 'CMU-Mach', 'deprecated': False},
-    'cmu-mach-nodoc': {'id': 'CMU-Mach-nodoc', 'deprecated': False},
-    'cnri-jython': {'id': 'CNRI-Jython', 'deprecated': False},
-    'cnri-python': {'id': 'CNRI-Python', 'deprecated': False},
-    'cnri-python-gpl-compatible': {'id': 'CNRI-Python-GPL-Compatible', 'deprecated': False},
-    'coil-1.0': {'id': 'COIL-1.0', 'deprecated': False},
-    'community-spec-1.0': {'id': 'Community-Spec-1.0', 'deprecated': False},
-    'condor-1.1': {'id': 'Condor-1.1', 'deprecated': False},
-    'copyleft-next-0.3.0': {'id': 'copyleft-next-0.3.0', 'deprecated': False},
-    'copyleft-next-0.3.1': {'id': 'copyleft-next-0.3.1', 'deprecated': False},
-    'cornell-lossless-jpeg': {'id': 'Cornell-Lossless-JPEG', 'deprecated': False},
-    'cpal-1.0': {'id': 'CPAL-1.0', 'deprecated': False},
-    'cpl-1.0': {'id': 'CPL-1.0', 'deprecated': False},
-    'cpol-1.02': {'id': 'CPOL-1.02', 'deprecated': False},
-    'cronyx': {'id': 'Cronyx', 'deprecated': False},
-    'crossword': {'id': 'Crossword', 'deprecated': False},
-    'crystalstacker': {'id': 'CrystalStacker', 'deprecated': False},
-    'cua-opl-1.0': {'id': 'CUA-OPL-1.0', 'deprecated': False},
-    'cube': {'id': 'Cube', 'deprecated': False},
-    'curl': {'id': 'curl', 'deprecated': False},
-    'cve-tou': {'id': 'cve-tou', 'deprecated': False},
-    'd-fsl-1.0': {'id': 'D-FSL-1.0', 'deprecated': False},
-    'dec-3-clause': {'id': 'DEC-3-Clause', 'deprecated': False},
-    'diffmark': {'id': 'diffmark', 'deprecated': False},
-    'dl-de-by-2.0': {'id': 'DL-DE-BY-2.0', 'deprecated': False},
-    'dl-de-zero-2.0': {'id': 'DL-DE-ZERO-2.0', 'deprecated': False},
-    'doc': {'id': 'DOC', 'deprecated': False},
-    'docbook-schema': {'id': 'DocBook-Schema', 'deprecated': False},
-    'docbook-xml': {'id': 'DocBook-XML', 'deprecated': False},
-    'dotseqn': {'id': 'Dotseqn', 'deprecated': False},
-    'drl-1.0': {'id': 'DRL-1.0', 'deprecated': False},
-    'drl-1.1': {'id': 'DRL-1.1', 'deprecated': False},
-    'dsdp': {'id': 'DSDP', 'deprecated': False},
-    'dtoa': {'id': 'dtoa', 'deprecated': False},
-    'dvipdfm': {'id': 'dvipdfm', 'deprecated': False},
-    'ecl-1.0': {'id': 'ECL-1.0', 'deprecated': False},
-    'ecl-2.0': {'id': 'ECL-2.0', 'deprecated': False},
-    'ecos-2.0': {'id': 'eCos-2.0', 'deprecated': True},
-    'efl-1.0': {'id': 'EFL-1.0', 'deprecated': False},
-    'efl-2.0': {'id': 'EFL-2.0', 'deprecated': False},
-    'egenix': {'id': 'eGenix', 'deprecated': False},
-    'elastic-2.0': {'id': 'Elastic-2.0', 'deprecated': False},
-    'entessa': {'id': 'Entessa', 'deprecated': False},
-    'epics': {'id': 'EPICS', 'deprecated': False},
-    'epl-1.0': {'id': 'EPL-1.0', 'deprecated': False},
-    'epl-2.0': {'id': 'EPL-2.0', 'deprecated': False},
-    'erlpl-1.1': {'id': 'ErlPL-1.1', 'deprecated': False},
-    'etalab-2.0': {'id': 'etalab-2.0', 'deprecated': False},
-    'eudatagrid': {'id': 'EUDatagrid', 'deprecated': False},
-    'eupl-1.0': {'id': 'EUPL-1.0', 'deprecated': False},
-    'eupl-1.1': {'id': 'EUPL-1.1', 'deprecated': False},
-    'eupl-1.2': {'id': 'EUPL-1.2', 'deprecated': False},
-    'eurosym': {'id': 'Eurosym', 'deprecated': False},
-    'fair': {'id': 'Fair', 'deprecated': False},
-    'fbm': {'id': 'FBM', 'deprecated': False},
-    'fdk-aac': {'id': 'FDK-AAC', 'deprecated': False},
-    'ferguson-twofish': {'id': 'Ferguson-Twofish', 'deprecated': False},
-    'frameworx-1.0': {'id': 'Frameworx-1.0', 'deprecated': False},
-    'freebsd-doc': {'id': 'FreeBSD-DOC', 'deprecated': False},
-    'freeimage': {'id': 'FreeImage', 'deprecated': False},
-    'fsfap': {'id': 'FSFAP', 'deprecated': False},
-    'fsfap-no-warranty-disclaimer': {'id': 'FSFAP-no-warranty-disclaimer', 'deprecated': False},
-    'fsful': {'id': 'FSFUL', 'deprecated': False},
-    'fsfullr': {'id': 'FSFULLR', 'deprecated': False},
-    'fsfullrwd': {'id': 'FSFULLRWD', 'deprecated': False},
-    'ftl': {'id': 'FTL', 'deprecated': False},
-    'furuseth': {'id': 'Furuseth', 'deprecated': False},
-    'fwlw': {'id': 'fwlw', 'deprecated': False},
-    'gcr-docs': {'id': 'GCR-docs', 'deprecated': False},
-    'gd': {'id': 'GD', 'deprecated': False},
-    'gfdl-1.1': {'id': 'GFDL-1.1', 'deprecated': True},
-    'gfdl-1.1-invariants-only': {'id': 'GFDL-1.1-invariants-only', 'deprecated': False},
-    'gfdl-1.1-invariants-or-later': {'id': 'GFDL-1.1-invariants-or-later', 'deprecated': False},
-    'gfdl-1.1-no-invariants-only': {'id': 'GFDL-1.1-no-invariants-only', 'deprecated': False},
-    'gfdl-1.1-no-invariants-or-later': {'id': 'GFDL-1.1-no-invariants-or-later', 'deprecated': False},
-    'gfdl-1.1-only': {'id': 'GFDL-1.1-only', 'deprecated': False},
-    'gfdl-1.1-or-later': {'id': 'GFDL-1.1-or-later', 'deprecated': False},
-    'gfdl-1.2': {'id': 'GFDL-1.2', 'deprecated': True},
-    'gfdl-1.2-invariants-only': {'id': 'GFDL-1.2-invariants-only', 'deprecated': False},
-    'gfdl-1.2-invariants-or-later': {'id': 'GFDL-1.2-invariants-or-later', 'deprecated': False},
-    'gfdl-1.2-no-invariants-only': {'id': 'GFDL-1.2-no-invariants-only', 'deprecated': False},
-    'gfdl-1.2-no-invariants-or-later': {'id': 'GFDL-1.2-no-invariants-or-later', 'deprecated': False},
-    'gfdl-1.2-only': {'id': 'GFDL-1.2-only', 'deprecated': False},
-    'gfdl-1.2-or-later': {'id': 'GFDL-1.2-or-later', 'deprecated': False},
-    'gfdl-1.3': {'id': 'GFDL-1.3', 'deprecated': True},
-    'gfdl-1.3-invariants-only': {'id': 'GFDL-1.3-invariants-only', 'deprecated': False},
-    'gfdl-1.3-invariants-or-later': {'id': 'GFDL-1.3-invariants-or-later', 'deprecated': False},
-    'gfdl-1.3-no-invariants-only': {'id': 'GFDL-1.3-no-invariants-only', 'deprecated': False},
-    'gfdl-1.3-no-invariants-or-later': {'id': 'GFDL-1.3-no-invariants-or-later', 'deprecated': False},
-    'gfdl-1.3-only': {'id': 'GFDL-1.3-only', 'deprecated': False},
-    'gfdl-1.3-or-later': {'id': 'GFDL-1.3-or-later', 'deprecated': False},
-    'giftware': {'id': 'Giftware', 'deprecated': False},
-    'gl2ps': {'id': 'GL2PS', 'deprecated': False},
-    'glide': {'id': 'Glide', 'deprecated': False},
-    'glulxe': {'id': 'Glulxe', 'deprecated': False},
-    'glwtpl': {'id': 'GLWTPL', 'deprecated': False},
-    'gnuplot': {'id': 'gnuplot', 'deprecated': False},
-    'gpl-1.0': {'id': 'GPL-1.0', 'deprecated': True},
-    'gpl-1.0+': {'id': 'GPL-1.0+', 'deprecated': True},
-    'gpl-1.0-only': {'id': 'GPL-1.0-only', 'deprecated': False},
-    'gpl-1.0-or-later': {'id': 'GPL-1.0-or-later', 'deprecated': False},
-    'gpl-2.0': {'id': 'GPL-2.0', 'deprecated': True},
-    'gpl-2.0+': {'id': 'GPL-2.0+', 'deprecated': True},
-    'gpl-2.0-only': {'id': 'GPL-2.0-only', 'deprecated': False},
-    'gpl-2.0-or-later': {'id': 'GPL-2.0-or-later', 'deprecated': False},
-    'gpl-2.0-with-autoconf-exception': {'id': 'GPL-2.0-with-autoconf-exception', 'deprecated': True},
-    'gpl-2.0-with-bison-exception': {'id': 'GPL-2.0-with-bison-exception', 'deprecated': True},
-    'gpl-2.0-with-classpath-exception': {'id': 'GPL-2.0-with-classpath-exception', 'deprecated': True},
-    'gpl-2.0-with-font-exception': {'id': 'GPL-2.0-with-font-exception', 'deprecated': True},
-    'gpl-2.0-with-gcc-exception': {'id': 'GPL-2.0-with-GCC-exception', 'deprecated': True},
-    'gpl-3.0': {'id': 'GPL-3.0', 'deprecated': True},
-    'gpl-3.0+': {'id': 'GPL-3.0+', 'deprecated': True},
-    'gpl-3.0-only': {'id': 'GPL-3.0-only', 'deprecated': False},
-    'gpl-3.0-or-later': {'id': 'GPL-3.0-or-later', 'deprecated': False},
-    'gpl-3.0-with-autoconf-exception': {'id': 'GPL-3.0-with-autoconf-exception', 'deprecated': True},
-    'gpl-3.0-with-gcc-exception': {'id': 'GPL-3.0-with-GCC-exception', 'deprecated': True},
-    'graphics-gems': {'id': 'Graphics-Gems', 'deprecated': False},
-    'gsoap-1.3b': {'id': 'gSOAP-1.3b', 'deprecated': False},
-    'gtkbook': {'id': 'gtkbook', 'deprecated': False},
-    'gutmann': {'id': 'Gutmann', 'deprecated': False},
-    'haskellreport': {'id': 'HaskellReport', 'deprecated': False},
-    'hdparm': {'id': 'hdparm', 'deprecated': False},
-    'hidapi': {'id': 'HIDAPI', 'deprecated': False},
-    'hippocratic-2.1': {'id': 'Hippocratic-2.1', 'deprecated': False},
-    'hp-1986': {'id': 'HP-1986', 'deprecated': False},
-    'hp-1989': {'id': 'HP-1989', 'deprecated': False},
-    'hpnd': {'id': 'HPND', 'deprecated': False},
-    'hpnd-dec': {'id': 'HPND-DEC', 'deprecated': False},
-    'hpnd-doc': {'id': 'HPND-doc', 'deprecated': False},
-    'hpnd-doc-sell': {'id': 'HPND-doc-sell', 'deprecated': False},
-    'hpnd-export-us': {'id': 'HPND-export-US', 'deprecated': False},
-    'hpnd-export-us-acknowledgement': {'id': 'HPND-export-US-acknowledgement', 'deprecated': False},
-    'hpnd-export-us-modify': {'id': 'HPND-export-US-modify', 'deprecated': False},
-    'hpnd-export2-us': {'id': 'HPND-export2-US', 'deprecated': False},
-    'hpnd-fenneberg-livingston': {'id': 'HPND-Fenneberg-Livingston', 'deprecated': False},
-    'hpnd-inria-imag': {'id': 'HPND-INRIA-IMAG', 'deprecated': False},
-    'hpnd-intel': {'id': 'HPND-Intel', 'deprecated': False},
-    'hpnd-kevlin-henney': {'id': 'HPND-Kevlin-Henney', 'deprecated': False},
-    'hpnd-markus-kuhn': {'id': 'HPND-Markus-Kuhn', 'deprecated': False},
-    'hpnd-merchantability-variant': {'id': 'HPND-merchantability-variant', 'deprecated': False},
-    'hpnd-mit-disclaimer': {'id': 'HPND-MIT-disclaimer', 'deprecated': False},
-    'hpnd-netrek': {'id': 'HPND-Netrek', 'deprecated': False},
-    'hpnd-pbmplus': {'id': 'HPND-Pbmplus', 'deprecated': False},
-    'hpnd-sell-mit-disclaimer-xserver': {'id': 'HPND-sell-MIT-disclaimer-xserver', 'deprecated': False},
-    'hpnd-sell-regexpr': {'id': 'HPND-sell-regexpr', 'deprecated': False},
-    'hpnd-sell-variant': {'id': 'HPND-sell-variant', 'deprecated': False},
-    'hpnd-sell-variant-mit-disclaimer': {'id': 'HPND-sell-variant-MIT-disclaimer', 'deprecated': False},
-    'hpnd-sell-variant-mit-disclaimer-rev': {'id': 'HPND-sell-variant-MIT-disclaimer-rev', 'deprecated': False},
-    'hpnd-uc': {'id': 'HPND-UC', 'deprecated': False},
-    'hpnd-uc-export-us': {'id': 'HPND-UC-export-US', 'deprecated': False},
-    'htmltidy': {'id': 'HTMLTIDY', 'deprecated': False},
-    'ibm-pibs': {'id': 'IBM-pibs', 'deprecated': False},
-    'icu': {'id': 'ICU', 'deprecated': False},
-    'iec-code-components-eula': {'id': 'IEC-Code-Components-EULA', 'deprecated': False},
-    'ijg': {'id': 'IJG', 'deprecated': False},
-    'ijg-short': {'id': 'IJG-short', 'deprecated': False},
-    'imagemagick': {'id': 'ImageMagick', 'deprecated': False},
-    'imatix': {'id': 'iMatix', 'deprecated': False},
-    'imlib2': {'id': 'Imlib2', 'deprecated': False},
-    'info-zip': {'id': 'Info-ZIP', 'deprecated': False},
-    'inner-net-2.0': {'id': 'Inner-Net-2.0', 'deprecated': False},
-    'intel': {'id': 'Intel', 'deprecated': False},
-    'intel-acpi': {'id': 'Intel-ACPI', 'deprecated': False},
-    'interbase-1.0': {'id': 'Interbase-1.0', 'deprecated': False},
-    'ipa': {'id': 'IPA', 'deprecated': False},
-    'ipl-1.0': {'id': 'IPL-1.0', 'deprecated': False},
-    'isc': {'id': 'ISC', 'deprecated': False},
-    'isc-veillard': {'id': 'ISC-Veillard', 'deprecated': False},
-    'jam': {'id': 'Jam', 'deprecated': False},
-    'jasper-2.0': {'id': 'JasPer-2.0', 'deprecated': False},
-    'jpl-image': {'id': 'JPL-image', 'deprecated': False},
-    'jpnic': {'id': 'JPNIC', 'deprecated': False},
-    'json': {'id': 'JSON', 'deprecated': False},
-    'kastrup': {'id': 'Kastrup', 'deprecated': False},
-    'kazlib': {'id': 'Kazlib', 'deprecated': False},
-    'knuth-ctan': {'id': 'Knuth-CTAN', 'deprecated': False},
-    'lal-1.2': {'id': 'LAL-1.2', 'deprecated': False},
-    'lal-1.3': {'id': 'LAL-1.3', 'deprecated': False},
-    'latex2e': {'id': 'Latex2e', 'deprecated': False},
-    'latex2e-translated-notice': {'id': 'Latex2e-translated-notice', 'deprecated': False},
-    'leptonica': {'id': 'Leptonica', 'deprecated': False},
-    'lgpl-2.0': {'id': 'LGPL-2.0', 'deprecated': True},
-    'lgpl-2.0+': {'id': 'LGPL-2.0+', 'deprecated': True},
-    'lgpl-2.0-only': {'id': 'LGPL-2.0-only', 'deprecated': False},
-    'lgpl-2.0-or-later': {'id': 'LGPL-2.0-or-later', 'deprecated': False},
-    'lgpl-2.1': {'id': 'LGPL-2.1', 'deprecated': True},
-    'lgpl-2.1+': {'id': 'LGPL-2.1+', 'deprecated': True},
-    'lgpl-2.1-only': {'id': 'LGPL-2.1-only', 'deprecated': False},
-    'lgpl-2.1-or-later': {'id': 'LGPL-2.1-or-later', 'deprecated': False},
-    'lgpl-3.0': {'id': 'LGPL-3.0', 'deprecated': True},
-    'lgpl-3.0+': {'id': 'LGPL-3.0+', 'deprecated': True},
-    'lgpl-3.0-only': {'id': 'LGPL-3.0-only', 'deprecated': False},
-    'lgpl-3.0-or-later': {'id': 'LGPL-3.0-or-later', 'deprecated': False},
-    'lgpllr': {'id': 'LGPLLR', 'deprecated': False},
-    'libpng': {'id': 'Libpng', 'deprecated': False},
-    'libpng-2.0': {'id': 'libpng-2.0', 'deprecated': False},
-    'libselinux-1.0': {'id': 'libselinux-1.0', 'deprecated': False},
-    'libtiff': {'id': 'libtiff', 'deprecated': False},
-    'libutil-david-nugent': {'id': 'libutil-David-Nugent', 'deprecated': False},
-    'liliq-p-1.1': {'id': 'LiLiQ-P-1.1', 'deprecated': False},
-    'liliq-r-1.1': {'id': 'LiLiQ-R-1.1', 'deprecated': False},
-    'liliq-rplus-1.1': {'id': 'LiLiQ-Rplus-1.1', 'deprecated': False},
-    'linux-man-pages-1-para': {'id': 'Linux-man-pages-1-para', 'deprecated': False},
-    'linux-man-pages-copyleft': {'id': 'Linux-man-pages-copyleft', 'deprecated': False},
-    'linux-man-pages-copyleft-2-para': {'id': 'Linux-man-pages-copyleft-2-para', 'deprecated': False},
-    'linux-man-pages-copyleft-var': {'id': 'Linux-man-pages-copyleft-var', 'deprecated': False},
-    'linux-openib': {'id': 'Linux-OpenIB', 'deprecated': False},
-    'loop': {'id': 'LOOP', 'deprecated': False},
-    'lpd-document': {'id': 'LPD-document', 'deprecated': False},
-    'lpl-1.0': {'id': 'LPL-1.0', 'deprecated': False},
-    'lpl-1.02': {'id': 'LPL-1.02', 'deprecated': False},
-    'lppl-1.0': {'id': 'LPPL-1.0', 'deprecated': False},
-    'lppl-1.1': {'id': 'LPPL-1.1', 'deprecated': False},
-    'lppl-1.2': {'id': 'LPPL-1.2', 'deprecated': False},
-    'lppl-1.3a': {'id': 'LPPL-1.3a', 'deprecated': False},
-    'lppl-1.3c': {'id': 'LPPL-1.3c', 'deprecated': False},
-    'lsof': {'id': 'lsof', 'deprecated': False},
-    'lucida-bitmap-fonts': {'id': 'Lucida-Bitmap-Fonts', 'deprecated': False},
-    'lzma-sdk-9.11-to-9.20': {'id': 'LZMA-SDK-9.11-to-9.20', 'deprecated': False},
-    'lzma-sdk-9.22': {'id': 'LZMA-SDK-9.22', 'deprecated': False},
-    'mackerras-3-clause': {'id': 'Mackerras-3-Clause', 'deprecated': False},
-    'mackerras-3-clause-acknowledgment': {'id': 'Mackerras-3-Clause-acknowledgment', 'deprecated': False},
-    'magaz': {'id': 'magaz', 'deprecated': False},
-    'mailprio': {'id': 'mailprio', 'deprecated': False},
-    'makeindex': {'id': 'MakeIndex', 'deprecated': False},
-    'martin-birgmeier': {'id': 'Martin-Birgmeier', 'deprecated': False},
-    'mcphee-slideshow': {'id': 'McPhee-slideshow', 'deprecated': False},
-    'metamail': {'id': 'metamail', 'deprecated': False},
-    'minpack': {'id': 'Minpack', 'deprecated': False},
-    'miros': {'id': 'MirOS', 'deprecated': False},
-    'mit': {'id': 'MIT', 'deprecated': False},
-    'mit-0': {'id': 'MIT-0', 'deprecated': False},
-    'mit-advertising': {'id': 'MIT-advertising', 'deprecated': False},
-    'mit-cmu': {'id': 'MIT-CMU', 'deprecated': False},
-    'mit-enna': {'id': 'MIT-enna', 'deprecated': False},
-    'mit-feh': {'id': 'MIT-feh', 'deprecated': False},
-    'mit-festival': {'id': 'MIT-Festival', 'deprecated': False},
-    'mit-khronos-old': {'id': 'MIT-Khronos-old', 'deprecated': False},
-    'mit-modern-variant': {'id': 'MIT-Modern-Variant', 'deprecated': False},
-    'mit-open-group': {'id': 'MIT-open-group', 'deprecated': False},
-    'mit-testregex': {'id': 'MIT-testregex', 'deprecated': False},
-    'mit-wu': {'id': 'MIT-Wu', 'deprecated': False},
-    'mitnfa': {'id': 'MITNFA', 'deprecated': False},
-    'mmixware': {'id': 'MMIXware', 'deprecated': False},
-    'motosoto': {'id': 'Motosoto', 'deprecated': False},
-    'mpeg-ssg': {'id': 'MPEG-SSG', 'deprecated': False},
-    'mpi-permissive': {'id': 'mpi-permissive', 'deprecated': False},
-    'mpich2': {'id': 'mpich2', 'deprecated': False},
-    'mpl-1.0': {'id': 'MPL-1.0', 'deprecated': False},
-    'mpl-1.1': {'id': 'MPL-1.1', 'deprecated': False},
-    'mpl-2.0': {'id': 'MPL-2.0', 'deprecated': False},
-    'mpl-2.0-no-copyleft-exception': {'id': 'MPL-2.0-no-copyleft-exception', 'deprecated': False},
-    'mplus': {'id': 'mplus', 'deprecated': False},
-    'ms-lpl': {'id': 'MS-LPL', 'deprecated': False},
-    'ms-pl': {'id': 'MS-PL', 'deprecated': False},
-    'ms-rl': {'id': 'MS-RL', 'deprecated': False},
-    'mtll': {'id': 'MTLL', 'deprecated': False},
-    'mulanpsl-1.0': {'id': 'MulanPSL-1.0', 'deprecated': False},
-    'mulanpsl-2.0': {'id': 'MulanPSL-2.0', 'deprecated': False},
-    'multics': {'id': 'Multics', 'deprecated': False},
-    'mup': {'id': 'Mup', 'deprecated': False},
-    'naist-2003': {'id': 'NAIST-2003', 'deprecated': False},
-    'nasa-1.3': {'id': 'NASA-1.3', 'deprecated': False},
-    'naumen': {'id': 'Naumen', 'deprecated': False},
-    'nbpl-1.0': {'id': 'NBPL-1.0', 'deprecated': False},
-    'ncbi-pd': {'id': 'NCBI-PD', 'deprecated': False},
-    'ncgl-uk-2.0': {'id': 'NCGL-UK-2.0', 'deprecated': False},
-    'ncl': {'id': 'NCL', 'deprecated': False},
-    'ncsa': {'id': 'NCSA', 'deprecated': False},
-    'net-snmp': {'id': 'Net-SNMP', 'deprecated': True},
-    'netcdf': {'id': 'NetCDF', 'deprecated': False},
-    'newsletr': {'id': 'Newsletr', 'deprecated': False},
-    'ngpl': {'id': 'NGPL', 'deprecated': False},
-    'nicta-1.0': {'id': 'NICTA-1.0', 'deprecated': False},
-    'nist-pd': {'id': 'NIST-PD', 'deprecated': False},
-    'nist-pd-fallback': {'id': 'NIST-PD-fallback', 'deprecated': False},
-    'nist-software': {'id': 'NIST-Software', 'deprecated': False},
-    'nlod-1.0': {'id': 'NLOD-1.0', 'deprecated': False},
-    'nlod-2.0': {'id': 'NLOD-2.0', 'deprecated': False},
-    'nlpl': {'id': 'NLPL', 'deprecated': False},
-    'nokia': {'id': 'Nokia', 'deprecated': False},
-    'nosl': {'id': 'NOSL', 'deprecated': False},
-    'noweb': {'id': 'Noweb', 'deprecated': False},
-    'npl-1.0': {'id': 'NPL-1.0', 'deprecated': False},
-    'npl-1.1': {'id': 'NPL-1.1', 'deprecated': False},
-    'nposl-3.0': {'id': 'NPOSL-3.0', 'deprecated': False},
-    'nrl': {'id': 'NRL', 'deprecated': False},
-    'ntp': {'id': 'NTP', 'deprecated': False},
-    'ntp-0': {'id': 'NTP-0', 'deprecated': False},
-    'nunit': {'id': 'Nunit', 'deprecated': True},
-    'o-uda-1.0': {'id': 'O-UDA-1.0', 'deprecated': False},
-    'oar': {'id': 'OAR', 'deprecated': False},
-    'occt-pl': {'id': 'OCCT-PL', 'deprecated': False},
-    'oclc-2.0': {'id': 'OCLC-2.0', 'deprecated': False},
-    'odbl-1.0': {'id': 'ODbL-1.0', 'deprecated': False},
-    'odc-by-1.0': {'id': 'ODC-By-1.0', 'deprecated': False},
-    'offis': {'id': 'OFFIS', 'deprecated': False},
-    'ofl-1.0': {'id': 'OFL-1.0', 'deprecated': False},
-    'ofl-1.0-no-rfn': {'id': 'OFL-1.0-no-RFN', 'deprecated': False},
-    'ofl-1.0-rfn': {'id': 'OFL-1.0-RFN', 'deprecated': False},
-    'ofl-1.1': {'id': 'OFL-1.1', 'deprecated': False},
-    'ofl-1.1-no-rfn': {'id': 'OFL-1.1-no-RFN', 'deprecated': False},
-    'ofl-1.1-rfn': {'id': 'OFL-1.1-RFN', 'deprecated': False},
-    'ogc-1.0': {'id': 'OGC-1.0', 'deprecated': False},
-    'ogdl-taiwan-1.0': {'id': 'OGDL-Taiwan-1.0', 'deprecated': False},
-    'ogl-canada-2.0': {'id': 'OGL-Canada-2.0', 'deprecated': False},
-    'ogl-uk-1.0': {'id': 'OGL-UK-1.0', 'deprecated': False},
-    'ogl-uk-2.0': {'id': 'OGL-UK-2.0', 'deprecated': False},
-    'ogl-uk-3.0': {'id': 'OGL-UK-3.0', 'deprecated': False},
-    'ogtsl': {'id': 'OGTSL', 'deprecated': False},
-    'oldap-1.1': {'id': 'OLDAP-1.1', 'deprecated': False},
-    'oldap-1.2': {'id': 'OLDAP-1.2', 'deprecated': False},
-    'oldap-1.3': {'id': 'OLDAP-1.3', 'deprecated': False},
-    'oldap-1.4': {'id': 'OLDAP-1.4', 'deprecated': False},
-    'oldap-2.0': {'id': 'OLDAP-2.0', 'deprecated': False},
-    'oldap-2.0.1': {'id': 'OLDAP-2.0.1', 'deprecated': False},
-    'oldap-2.1': {'id': 'OLDAP-2.1', 'deprecated': False},
-    'oldap-2.2': {'id': 'OLDAP-2.2', 'deprecated': False},
-    'oldap-2.2.1': {'id': 'OLDAP-2.2.1', 'deprecated': False},
-    'oldap-2.2.2': {'id': 'OLDAP-2.2.2', 'deprecated': False},
-    'oldap-2.3': {'id': 'OLDAP-2.3', 'deprecated': False},
-    'oldap-2.4': {'id': 'OLDAP-2.4', 'deprecated': False},
-    'oldap-2.5': {'id': 'OLDAP-2.5', 'deprecated': False},
-    'oldap-2.6': {'id': 'OLDAP-2.6', 'deprecated': False},
-    'oldap-2.7': {'id': 'OLDAP-2.7', 'deprecated': False},
-    'oldap-2.8': {'id': 'OLDAP-2.8', 'deprecated': False},
-    'olfl-1.3': {'id': 'OLFL-1.3', 'deprecated': False},
-    'oml': {'id': 'OML', 'deprecated': False},
-    'openpbs-2.3': {'id': 'OpenPBS-2.3', 'deprecated': False},
-    'openssl': {'id': 'OpenSSL', 'deprecated': False},
-    'openssl-standalone': {'id': 'OpenSSL-standalone', 'deprecated': False},
-    'openvision': {'id': 'OpenVision', 'deprecated': False},
-    'opl-1.0': {'id': 'OPL-1.0', 'deprecated': False},
-    'opl-uk-3.0': {'id': 'OPL-UK-3.0', 'deprecated': False},
-    'opubl-1.0': {'id': 'OPUBL-1.0', 'deprecated': False},
-    'oset-pl-2.1': {'id': 'OSET-PL-2.1', 'deprecated': False},
-    'osl-1.0': {'id': 'OSL-1.0', 'deprecated': False},
-    'osl-1.1': {'id': 'OSL-1.1', 'deprecated': False},
-    'osl-2.0': {'id': 'OSL-2.0', 'deprecated': False},
-    'osl-2.1': {'id': 'OSL-2.1', 'deprecated': False},
-    'osl-3.0': {'id': 'OSL-3.0', 'deprecated': False},
-    'padl': {'id': 'PADL', 'deprecated': False},
-    'parity-6.0.0': {'id': 'Parity-6.0.0', 'deprecated': False},
-    'parity-7.0.0': {'id': 'Parity-7.0.0', 'deprecated': False},
-    'pddl-1.0': {'id': 'PDDL-1.0', 'deprecated': False},
-    'php-3.0': {'id': 'PHP-3.0', 'deprecated': False},
-    'php-3.01': {'id': 'PHP-3.01', 'deprecated': False},
-    'pixar': {'id': 'Pixar', 'deprecated': False},
-    'pkgconf': {'id': 'pkgconf', 'deprecated': False},
-    'plexus': {'id': 'Plexus', 'deprecated': False},
-    'pnmstitch': {'id': 'pnmstitch', 'deprecated': False},
-    'polyform-noncommercial-1.0.0': {'id': 'PolyForm-Noncommercial-1.0.0', 'deprecated': False},
-    'polyform-small-business-1.0.0': {'id': 'PolyForm-Small-Business-1.0.0', 'deprecated': False},
-    'postgresql': {'id': 'PostgreSQL', 'deprecated': False},
-    'ppl': {'id': 'PPL', 'deprecated': False},
-    'psf-2.0': {'id': 'PSF-2.0', 'deprecated': False},
-    'psfrag': {'id': 'psfrag', 'deprecated': False},
-    'psutils': {'id': 'psutils', 'deprecated': False},
-    'python-2.0': {'id': 'Python-2.0', 'deprecated': False},
-    'python-2.0.1': {'id': 'Python-2.0.1', 'deprecated': False},
-    'python-ldap': {'id': 'python-ldap', 'deprecated': False},
-    'qhull': {'id': 'Qhull', 'deprecated': False},
-    'qpl-1.0': {'id': 'QPL-1.0', 'deprecated': False},
-    'qpl-1.0-inria-2004': {'id': 'QPL-1.0-INRIA-2004', 'deprecated': False},
-    'radvd': {'id': 'radvd', 'deprecated': False},
-    'rdisc': {'id': 'Rdisc', 'deprecated': False},
-    'rhecos-1.1': {'id': 'RHeCos-1.1', 'deprecated': False},
-    'rpl-1.1': {'id': 'RPL-1.1', 'deprecated': False},
-    'rpl-1.5': {'id': 'RPL-1.5', 'deprecated': False},
-    'rpsl-1.0': {'id': 'RPSL-1.0', 'deprecated': False},
-    'rsa-md': {'id': 'RSA-MD', 'deprecated': False},
-    'rscpl': {'id': 'RSCPL', 'deprecated': False},
-    'ruby': {'id': 'Ruby', 'deprecated': False},
-    'ruby-pty': {'id': 'Ruby-pty', 'deprecated': False},
-    'sax-pd': {'id': 'SAX-PD', 'deprecated': False},
-    'sax-pd-2.0': {'id': 'SAX-PD-2.0', 'deprecated': False},
-    'saxpath': {'id': 'Saxpath', 'deprecated': False},
-    'scea': {'id': 'SCEA', 'deprecated': False},
-    'schemereport': {'id': 'SchemeReport', 'deprecated': False},
-    'sendmail': {'id': 'Sendmail', 'deprecated': False},
-    'sendmail-8.23': {'id': 'Sendmail-8.23', 'deprecated': False},
-    'sgi-b-1.0': {'id': 'SGI-B-1.0', 'deprecated': False},
-    'sgi-b-1.1': {'id': 'SGI-B-1.1', 'deprecated': False},
-    'sgi-b-2.0': {'id': 'SGI-B-2.0', 'deprecated': False},
-    'sgi-opengl': {'id': 'SGI-OpenGL', 'deprecated': False},
-    'sgp4': {'id': 'SGP4', 'deprecated': False},
-    'shl-0.5': {'id': 'SHL-0.5', 'deprecated': False},
-    'shl-0.51': {'id': 'SHL-0.51', 'deprecated': False},
-    'simpl-2.0': {'id': 'SimPL-2.0', 'deprecated': False},
-    'sissl': {'id': 'SISSL', 'deprecated': False},
-    'sissl-1.2': {'id': 'SISSL-1.2', 'deprecated': False},
-    'sl': {'id': 'SL', 'deprecated': False},
-    'sleepycat': {'id': 'Sleepycat', 'deprecated': False},
-    'smlnj': {'id': 'SMLNJ', 'deprecated': False},
-    'smppl': {'id': 'SMPPL', 'deprecated': False},
-    'snia': {'id': 'SNIA', 'deprecated': False},
-    'snprintf': {'id': 'snprintf', 'deprecated': False},
-    'softsurfer': {'id': 'softSurfer', 'deprecated': False},
-    'soundex': {'id': 'Soundex', 'deprecated': False},
-    'spencer-86': {'id': 'Spencer-86', 'deprecated': False},
-    'spencer-94': {'id': 'Spencer-94', 'deprecated': False},
-    'spencer-99': {'id': 'Spencer-99', 'deprecated': False},
-    'spl-1.0': {'id': 'SPL-1.0', 'deprecated': False},
-    'ssh-keyscan': {'id': 'ssh-keyscan', 'deprecated': False},
-    'ssh-openssh': {'id': 'SSH-OpenSSH', 'deprecated': False},
-    'ssh-short': {'id': 'SSH-short', 'deprecated': False},
-    'ssleay-standalone': {'id': 'SSLeay-standalone', 'deprecated': False},
-    'sspl-1.0': {'id': 'SSPL-1.0', 'deprecated': False},
-    'standardml-nj': {'id': 'StandardML-NJ', 'deprecated': True},
-    'sugarcrm-1.1.3': {'id': 'SugarCRM-1.1.3', 'deprecated': False},
-    'sun-ppp': {'id': 'Sun-PPP', 'deprecated': False},
-    'sun-ppp-2000': {'id': 'Sun-PPP-2000', 'deprecated': False},
-    'sunpro': {'id': 'SunPro', 'deprecated': False},
-    'swl': {'id': 'SWL', 'deprecated': False},
-    'swrule': {'id': 'swrule', 'deprecated': False},
-    'symlinks': {'id': 'Symlinks', 'deprecated': False},
-    'tapr-ohl-1.0': {'id': 'TAPR-OHL-1.0', 'deprecated': False},
-    'tcl': {'id': 'TCL', 'deprecated': False},
-    'tcp-wrappers': {'id': 'TCP-wrappers', 'deprecated': False},
-    'termreadkey': {'id': 'TermReadKey', 'deprecated': False},
-    'tgppl-1.0': {'id': 'TGPPL-1.0', 'deprecated': False},
-    'threeparttable': {'id': 'threeparttable', 'deprecated': False},
-    'tmate': {'id': 'TMate', 'deprecated': False},
-    'torque-1.1': {'id': 'TORQUE-1.1', 'deprecated': False},
-    'tosl': {'id': 'TOSL', 'deprecated': False},
-    'tpdl': {'id': 'TPDL', 'deprecated': False},
-    'tpl-1.0': {'id': 'TPL-1.0', 'deprecated': False},
-    'ttwl': {'id': 'TTWL', 'deprecated': False},
-    'ttyp0': {'id': 'TTYP0', 'deprecated': False},
-    'tu-berlin-1.0': {'id': 'TU-Berlin-1.0', 'deprecated': False},
-    'tu-berlin-2.0': {'id': 'TU-Berlin-2.0', 'deprecated': False},
-    'ubuntu-font-1.0': {'id': 'Ubuntu-font-1.0', 'deprecated': False},
-    'ucar': {'id': 'UCAR', 'deprecated': False},
-    'ucl-1.0': {'id': 'UCL-1.0', 'deprecated': False},
-    'ulem': {'id': 'ulem', 'deprecated': False},
-    'umich-merit': {'id': 'UMich-Merit', 'deprecated': False},
-    'unicode-3.0': {'id': 'Unicode-3.0', 'deprecated': False},
-    'unicode-dfs-2015': {'id': 'Unicode-DFS-2015', 'deprecated': False},
-    'unicode-dfs-2016': {'id': 'Unicode-DFS-2016', 'deprecated': False},
-    'unicode-tou': {'id': 'Unicode-TOU', 'deprecated': False},
-    'unixcrypt': {'id': 'UnixCrypt', 'deprecated': False},
-    'unlicense': {'id': 'Unlicense', 'deprecated': False},
-    'upl-1.0': {'id': 'UPL-1.0', 'deprecated': False},
-    'urt-rle': {'id': 'URT-RLE', 'deprecated': False},
-    'vim': {'id': 'Vim', 'deprecated': False},
-    'vostrom': {'id': 'VOSTROM', 'deprecated': False},
-    'vsl-1.0': {'id': 'VSL-1.0', 'deprecated': False},
-    'w3c': {'id': 'W3C', 'deprecated': False},
-    'w3c-19980720': {'id': 'W3C-19980720', 'deprecated': False},
-    'w3c-20150513': {'id': 'W3C-20150513', 'deprecated': False},
-    'w3m': {'id': 'w3m', 'deprecated': False},
-    'watcom-1.0': {'id': 'Watcom-1.0', 'deprecated': False},
-    'widget-workshop': {'id': 'Widget-Workshop', 'deprecated': False},
-    'wsuipa': {'id': 'Wsuipa', 'deprecated': False},
-    'wtfpl': {'id': 'WTFPL', 'deprecated': False},
-    'wxwindows': {'id': 'wxWindows', 'deprecated': True},
-    'x11': {'id': 'X11', 'deprecated': False},
-    'x11-distribute-modifications-variant': {'id': 'X11-distribute-modifications-variant', 'deprecated': False},
-    'x11-swapped': {'id': 'X11-swapped', 'deprecated': False},
-    'xdebug-1.03': {'id': 'Xdebug-1.03', 'deprecated': False},
-    'xerox': {'id': 'Xerox', 'deprecated': False},
-    'xfig': {'id': 'Xfig', 'deprecated': False},
-    'xfree86-1.1': {'id': 'XFree86-1.1', 'deprecated': False},
-    'xinetd': {'id': 'xinetd', 'deprecated': False},
-    'xkeyboard-config-zinoviev': {'id': 'xkeyboard-config-Zinoviev', 'deprecated': False},
-    'xlock': {'id': 'xlock', 'deprecated': False},
-    'xnet': {'id': 'Xnet', 'deprecated': False},
-    'xpp': {'id': 'xpp', 'deprecated': False},
-    'xskat': {'id': 'XSkat', 'deprecated': False},
-    'xzoom': {'id': 'xzoom', 'deprecated': False},
-    'ypl-1.0': {'id': 'YPL-1.0', 'deprecated': False},
-    'ypl-1.1': {'id': 'YPL-1.1', 'deprecated': False},
-    'zed': {'id': 'Zed', 'deprecated': False},
-    'zeeff': {'id': 'Zeeff', 'deprecated': False},
-    'zend-2.0': {'id': 'Zend-2.0', 'deprecated': False},
-    'zimbra-1.3': {'id': 'Zimbra-1.3', 'deprecated': False},
-    'zimbra-1.4': {'id': 'Zimbra-1.4', 'deprecated': False},
-    'zlib': {'id': 'Zlib', 'deprecated': False},
-    'zlib-acknowledgement': {'id': 'zlib-acknowledgement', 'deprecated': False},
-    'zpl-1.1': {'id': 'ZPL-1.1', 'deprecated': False},
-    'zpl-2.0': {'id': 'ZPL-2.0', 'deprecated': False},
-    'zpl-2.1': {'id': 'ZPL-2.1', 'deprecated': False},
-}
-
-EXCEPTIONS: dict[str, SPDXException] = {
-    '389-exception': {'id': '389-exception', 'deprecated': False},
-    'asterisk-exception': {'id': 'Asterisk-exception', 'deprecated': False},
-    'asterisk-linking-protocols-exception': {'id': 'Asterisk-linking-protocols-exception', 'deprecated': False},
-    'autoconf-exception-2.0': {'id': 'Autoconf-exception-2.0', 'deprecated': False},
-    'autoconf-exception-3.0': {'id': 'Autoconf-exception-3.0', 'deprecated': False},
-    'autoconf-exception-generic': {'id': 'Autoconf-exception-generic', 'deprecated': False},
-    'autoconf-exception-generic-3.0': {'id': 'Autoconf-exception-generic-3.0', 'deprecated': False},
-    'autoconf-exception-macro': {'id': 'Autoconf-exception-macro', 'deprecated': False},
-    'bison-exception-1.24': {'id': 'Bison-exception-1.24', 'deprecated': False},
-    'bison-exception-2.2': {'id': 'Bison-exception-2.2', 'deprecated': False},
-    'bootloader-exception': {'id': 'Bootloader-exception', 'deprecated': False},
-    'classpath-exception-2.0': {'id': 'Classpath-exception-2.0', 'deprecated': False},
-    'clisp-exception-2.0': {'id': 'CLISP-exception-2.0', 'deprecated': False},
-    'cryptsetup-openssl-exception': {'id': 'cryptsetup-OpenSSL-exception', 'deprecated': False},
-    'digirule-foss-exception': {'id': 'DigiRule-FOSS-exception', 'deprecated': False},
-    'ecos-exception-2.0': {'id': 'eCos-exception-2.0', 'deprecated': False},
-    'erlang-otp-linking-exception': {'id': 'erlang-otp-linking-exception', 'deprecated': False},
-    'fawkes-runtime-exception': {'id': 'Fawkes-Runtime-exception', 'deprecated': False},
-    'fltk-exception': {'id': 'FLTK-exception', 'deprecated': False},
-    'fmt-exception': {'id': 'fmt-exception', 'deprecated': False},
-    'font-exception-2.0': {'id': 'Font-exception-2.0', 'deprecated': False},
-    'freertos-exception-2.0': {'id': 'freertos-exception-2.0', 'deprecated': False},
-    'gcc-exception-2.0': {'id': 'GCC-exception-2.0', 'deprecated': False},
-    'gcc-exception-2.0-note': {'id': 'GCC-exception-2.0-note', 'deprecated': False},
-    'gcc-exception-3.1': {'id': 'GCC-exception-3.1', 'deprecated': False},
-    'gmsh-exception': {'id': 'Gmsh-exception', 'deprecated': False},
-    'gnat-exception': {'id': 'GNAT-exception', 'deprecated': False},
-    'gnome-examples-exception': {'id': 'GNOME-examples-exception', 'deprecated': False},
-    'gnu-compiler-exception': {'id': 'GNU-compiler-exception', 'deprecated': False},
-    'gnu-javamail-exception': {'id': 'gnu-javamail-exception', 'deprecated': False},
-    'gpl-3.0-interface-exception': {'id': 'GPL-3.0-interface-exception', 'deprecated': False},
-    'gpl-3.0-linking-exception': {'id': 'GPL-3.0-linking-exception', 'deprecated': False},
-    'gpl-3.0-linking-source-exception': {'id': 'GPL-3.0-linking-source-exception', 'deprecated': False},
-    'gpl-cc-1.0': {'id': 'GPL-CC-1.0', 'deprecated': False},
-    'gstreamer-exception-2005': {'id': 'GStreamer-exception-2005', 'deprecated': False},
-    'gstreamer-exception-2008': {'id': 'GStreamer-exception-2008', 'deprecated': False},
-    'i2p-gpl-java-exception': {'id': 'i2p-gpl-java-exception', 'deprecated': False},
-    'kicad-libraries-exception': {'id': 'KiCad-libraries-exception', 'deprecated': False},
-    'lgpl-3.0-linking-exception': {'id': 'LGPL-3.0-linking-exception', 'deprecated': False},
-    'libpri-openh323-exception': {'id': 'libpri-OpenH323-exception', 'deprecated': False},
-    'libtool-exception': {'id': 'Libtool-exception', 'deprecated': False},
-    'linux-syscall-note': {'id': 'Linux-syscall-note', 'deprecated': False},
-    'llgpl': {'id': 'LLGPL', 'deprecated': False},
-    'llvm-exception': {'id': 'LLVM-exception', 'deprecated': False},
-    'lzma-exception': {'id': 'LZMA-exception', 'deprecated': False},
-    'mif-exception': {'id': 'mif-exception', 'deprecated': False},
-    'nokia-qt-exception-1.1': {'id': 'Nokia-Qt-exception-1.1', 'deprecated': True},
-    'ocaml-lgpl-linking-exception': {'id': 'OCaml-LGPL-linking-exception', 'deprecated': False},
-    'occt-exception-1.0': {'id': 'OCCT-exception-1.0', 'deprecated': False},
-    'openjdk-assembly-exception-1.0': {'id': 'OpenJDK-assembly-exception-1.0', 'deprecated': False},
-    'openvpn-openssl-exception': {'id': 'openvpn-openssl-exception', 'deprecated': False},
-    'pcre2-exception': {'id': 'PCRE2-exception', 'deprecated': False},
-    'ps-or-pdf-font-exception-20170817': {'id': 'PS-or-PDF-font-exception-20170817', 'deprecated': False},
-    'qpl-1.0-inria-2004-exception': {'id': 'QPL-1.0-INRIA-2004-exception', 'deprecated': False},
-    'qt-gpl-exception-1.0': {'id': 'Qt-GPL-exception-1.0', 'deprecated': False},
-    'qt-lgpl-exception-1.1': {'id': 'Qt-LGPL-exception-1.1', 'deprecated': False},
-    'qwt-exception-1.0': {'id': 'Qwt-exception-1.0', 'deprecated': False},
-    'romic-exception': {'id': 'romic-exception', 'deprecated': False},
-    'rrdtool-floss-exception-2.0': {'id': 'RRDtool-FLOSS-exception-2.0', 'deprecated': False},
-    'sane-exception': {'id': 'SANE-exception', 'deprecated': False},
-    'shl-2.0': {'id': 'SHL-2.0', 'deprecated': False},
-    'shl-2.1': {'id': 'SHL-2.1', 'deprecated': False},
-    'stunnel-exception': {'id': 'stunnel-exception', 'deprecated': False},
-    'swi-exception': {'id': 'SWI-exception', 'deprecated': False},
-    'swift-exception': {'id': 'Swift-exception', 'deprecated': False},
-    'texinfo-exception': {'id': 'Texinfo-exception', 'deprecated': False},
-    'u-boot-exception-2.0': {'id': 'u-boot-exception-2.0', 'deprecated': False},
-    'ubdl-exception': {'id': 'UBDL-exception', 'deprecated': False},
-    'universal-foss-exception-1.0': {'id': 'Universal-FOSS-exception-1.0', 'deprecated': False},
-    'vsftpd-openssl-exception': {'id': 'vsftpd-openssl-exception', 'deprecated': False},
-    'wxwindows-exception-3.1': {'id': 'WxWindows-exception-3.1', 'deprecated': False},
-    'x11vnc-openssl-exception': {'id': 'x11vnc-openssl-exception', 'deprecated': False},
-}
diff --git a/lib/packaging/markers.py b/lib/packaging/markers.py
deleted file mode 100644
index fb7f49cf..00000000
--- a/lib/packaging/markers.py
+++ /dev/null
@@ -1,331 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-
-from __future__ import annotations
-
-import operator
-import os
-import platform
-import sys
-from typing import Any, Callable, TypedDict, cast
-
-from ._parser import MarkerAtom, MarkerList, Op, Value, Variable
-from ._parser import parse_marker as _parse_marker
-from ._tokenizer import ParserSyntaxError
-from .specifiers import InvalidSpecifier, Specifier
-from .utils import canonicalize_name
-
-__all__ = [
-    "InvalidMarker",
-    "Marker",
-    "UndefinedComparison",
-    "UndefinedEnvironmentName",
-    "default_environment",
-]
-
-Operator = Callable[[str, str], bool]
-
-
-class InvalidMarker(ValueError):
-    """
-    An invalid marker was found, users should refer to PEP 508.
-    """
-
-
-class UndefinedComparison(ValueError):
-    """
-    An invalid operation was attempted on a value that doesn't support it.
-    """
-
-
-class UndefinedEnvironmentName(ValueError):
-    """
-    A name was attempted to be used that does not exist inside of the
-    environment.
-    """
-
-
-class Environment(TypedDict):
-    implementation_name: str
-    """The implementation's identifier, e.g. ``'cpython'``."""
-
-    implementation_version: str
-    """
-    The implementation's version, e.g. ``'3.13.0a2'`` for CPython 3.13.0a2, or
-    ``'7.3.13'`` for PyPy3.10 v7.3.13.
-    """
-
-    os_name: str
-    """
-    The value of :py:data:`os.name`. The name of the operating system dependent module
-    imported, e.g. ``'posix'``.
-    """
-
-    platform_machine: str
-    """
-    Returns the machine type, e.g. ``'i386'``.
-
-    An empty string if the value cannot be determined.
-    """
-
-    platform_release: str
-    """
-    The system's release, e.g. ``'2.2.0'`` or ``'NT'``.
-
-    An empty string if the value cannot be determined.
-    """
-
-    platform_system: str
-    """
-    The system/OS name, e.g. ``'Linux'``, ``'Windows'`` or ``'Java'``.
-
-    An empty string if the value cannot be determined.
-    """
-
-    platform_version: str
-    """
-    The system's release version, e.g. ``'#3 on degas'``.
-
-    An empty string if the value cannot be determined.
-    """
-
-    python_full_version: str
-    """
-    The Python version as string ``'major.minor.patchlevel'``.
-
-    Note that unlike the Python :py:data:`sys.version`, this value will always include
-    the patchlevel (it defaults to 0).
-    """
-
-    platform_python_implementation: str
-    """
-    A string identifying the Python implementation, e.g. ``'CPython'``.
-    """
-
-    python_version: str
-    """The Python version as string ``'major.minor'``."""
-
-    sys_platform: str
-    """
-    This string contains a platform identifier that can be used to append
-    platform-specific components to :py:data:`sys.path`, for instance.
-
-    For Unix systems, except on Linux and AIX, this is the lowercased OS name as
-    returned by ``uname -s`` with the first part of the version as returned by
-    ``uname -r`` appended, e.g. ``'sunos5'`` or ``'freebsd8'``, at the time when Python
-    was built.
-    """
-
-
-def _normalize_extra_values(results: Any) -> Any:
-    """
-    Normalize extra values.
-    """
-    if isinstance(results[0], tuple):
-        lhs, op, rhs = results[0]
-        if isinstance(lhs, Variable) and lhs.value == "extra":
-            normalized_extra = canonicalize_name(rhs.value)
-            rhs = Value(normalized_extra)
-        elif isinstance(rhs, Variable) and rhs.value == "extra":
-            normalized_extra = canonicalize_name(lhs.value)
-            lhs = Value(normalized_extra)
-        results[0] = lhs, op, rhs
-    return results
-
-
-def _format_marker(
-    marker: list[str] | MarkerAtom | str, first: bool | None = True
-) -> str:
-    assert isinstance(marker, (list, tuple, str))
-
-    # Sometimes we have a structure like [[...]] which is a single item list
-    # where the single item is itself it's own list. In that case we want skip
-    # the rest of this function so that we don't get extraneous () on the
-    # outside.
-    if (
-        isinstance(marker, list)
-        and len(marker) == 1
-        and isinstance(marker[0], (list, tuple))
-    ):
-        return _format_marker(marker[0])
-
-    if isinstance(marker, list):
-        inner = (_format_marker(m, first=False) for m in marker)
-        if first:
-            return " ".join(inner)
-        else:
-            return "(" + " ".join(inner) + ")"
-    elif isinstance(marker, tuple):
-        return " ".join([m.serialize() for m in marker])
-    else:
-        return marker
-
-
-_operators: dict[str, Operator] = {
-    "in": lambda lhs, rhs: lhs in rhs,
-    "not in": lambda lhs, rhs: lhs not in rhs,
-    "<": operator.lt,
-    "<=": operator.le,
-    "==": operator.eq,
-    "!=": operator.ne,
-    ">=": operator.ge,
-    ">": operator.gt,
-}
-
-
-def _eval_op(lhs: str, op: Op, rhs: str) -> bool:
-    try:
-        spec = Specifier("".join([op.serialize(), rhs]))
-    except InvalidSpecifier:
-        pass
-    else:
-        return spec.contains(lhs, prereleases=True)
-
-    oper: Operator | None = _operators.get(op.serialize())
-    if oper is None:
-        raise UndefinedComparison(f"Undefined {op!r} on {lhs!r} and {rhs!r}.")
-
-    return oper(lhs, rhs)
-
-
-def _normalize(*values: str, key: str) -> tuple[str, ...]:
-    # PEP 685 – Comparison of extra names for optional distribution dependencies
-    # https://peps.python.org/pep-0685/
-    # > When comparing extra names, tools MUST normalize the names being
-    # > compared using the semantics outlined in PEP 503 for names
-    if key == "extra":
-        return tuple(canonicalize_name(v) for v in values)
-
-    # other environment markers don't have such standards
-    return values
-
-
-def _evaluate_markers(markers: MarkerList, environment: dict[str, str]) -> bool:
-    groups: list[list[bool]] = [[]]
-
-    for marker in markers:
-        assert isinstance(marker, (list, tuple, str))
-
-        if isinstance(marker, list):
-            groups[-1].append(_evaluate_markers(marker, environment))
-        elif isinstance(marker, tuple):
-            lhs, op, rhs = marker
-
-            if isinstance(lhs, Variable):
-                environment_key = lhs.value
-                lhs_value = environment[environment_key]
-                rhs_value = rhs.value
-            else:
-                lhs_value = lhs.value
-                environment_key = rhs.value
-                rhs_value = environment[environment_key]
-
-            lhs_value, rhs_value = _normalize(lhs_value, rhs_value, key=environment_key)
-            groups[-1].append(_eval_op(lhs_value, op, rhs_value))
-        else:
-            assert marker in ["and", "or"]
-            if marker == "or":
-                groups.append([])
-
-    return any(all(item) for item in groups)
-
-
-def format_full_version(info: sys._version_info) -> str:
-    version = f"{info.major}.{info.minor}.{info.micro}"
-    kind = info.releaselevel
-    if kind != "final":
-        version += kind[0] + str(info.serial)
-    return version
-
-
-def default_environment() -> Environment:
-    iver = format_full_version(sys.implementation.version)
-    implementation_name = sys.implementation.name
-    return {
-        "implementation_name": implementation_name,
-        "implementation_version": iver,
-        "os_name": os.name,
-        "platform_machine": platform.machine(),
-        "platform_release": platform.release(),
-        "platform_system": platform.system(),
-        "platform_version": platform.version(),
-        "python_full_version": platform.python_version(),
-        "platform_python_implementation": platform.python_implementation(),
-        "python_version": ".".join(platform.python_version_tuple()[:2]),
-        "sys_platform": sys.platform,
-    }
-
-
-class Marker:
-    def __init__(self, marker: str) -> None:
-        # Note: We create a Marker object without calling this constructor in
-        #       packaging.requirements.Requirement. If any additional logic is
-        #       added here, make sure to mirror/adapt Requirement.
-        try:
-            self._markers = _normalize_extra_values(_parse_marker(marker))
-            # The attribute `_markers` can be described in terms of a recursive type:
-            # MarkerList = List[Union[Tuple[Node, ...], str, MarkerList]]
-            #
-            # For example, the following expression:
-            # python_version > "3.6" or (python_version == "3.6" and os_name == "unix")
-            #
-            # is parsed into:
-            # [
-            #     (<Variable('python_version')>, <Op('>')>, <Value('3.6')>),
-            #     'and',
-            #     [
-            #         (<Variable('python_version')>, <Op('==')>, <Value('3.6')>),
-            #         'or',
-            #         (<Variable('os_name')>, <Op('==')>, <Value('unix')>)
-            #     ]
-            # ]
-        except ParserSyntaxError as e:
-            raise InvalidMarker(str(e)) from e
-
-    def __str__(self) -> str:
-        return _format_marker(self._markers)
-
-    def __repr__(self) -> str:
-        return f"<Marker('{self}')>"
-
-    def __hash__(self) -> int:
-        return hash((self.__class__.__name__, str(self)))
-
-    def __eq__(self, other: Any) -> bool:
-        if not isinstance(other, Marker):
-            return NotImplemented
-
-        return str(self) == str(other)
-
-    def evaluate(self, environment: dict[str, str] | None = None) -> bool:
-        """Evaluate a marker.
-
-        Return the boolean from evaluating the given marker against the
-        environment. environment is an optional argument to override all or
-        part of the determined environment.
-
-        The environment is determined from the current Python process.
-        """
-        current_environment = cast("dict[str, str]", default_environment())
-        current_environment["extra"] = ""
-        if environment is not None:
-            current_environment.update(environment)
-            # The API used to allow setting extra to None. We need to handle this
-            # case for backwards compatibility.
-            if current_environment["extra"] is None:
-                current_environment["extra"] = ""
-
-        return _evaluate_markers(
-            self._markers, _repair_python_full_version(current_environment)
-        )
-
-
-def _repair_python_full_version(env: dict[str, str]) -> dict[str, str]:
-    """
-    Work around platform.python_version() returning something that is not PEP 440
-    compliant for non-tagged Python builds.
-    """
-    if env["python_full_version"].endswith("+"):
-        env["python_full_version"] += "local"
-    return env
diff --git a/lib/packaging/metadata.py b/lib/packaging/metadata.py
deleted file mode 100644
index 721f411c..00000000
--- a/lib/packaging/metadata.py
+++ /dev/null
@@ -1,863 +0,0 @@
-from __future__ import annotations
-
-import email.feedparser
-import email.header
-import email.message
-import email.parser
-import email.policy
-import pathlib
-import sys
-import typing
-from typing import (
-    Any,
-    Callable,
-    Generic,
-    Literal,
-    TypedDict,
-    cast,
-)
-
-from . import licenses, requirements, specifiers, utils
-from . import version as version_module
-from .licenses import NormalizedLicenseExpression
-
-T = typing.TypeVar("T")
-
-
-if sys.version_info >= (3, 11):  # pragma: no cover
-    ExceptionGroup = ExceptionGroup
-else:  # pragma: no cover
-
-    class ExceptionGroup(Exception):
-        """A minimal implementation of :external:exc:`ExceptionGroup` from Python 3.11.
-
-        If :external:exc:`ExceptionGroup` is already defined by Python itself,
-        that version is used instead.
-        """
-
-        message: str
-        exceptions: list[Exception]
-
-        def __init__(self, message: str, exceptions: list[Exception]) -> None:
-            self.message = message
-            self.exceptions = exceptions
-
-        def __repr__(self) -> str:
-            return f"{self.__class__.__name__}({self.message!r}, {self.exceptions!r})"
-
-
-class InvalidMetadata(ValueError):
-    """A metadata field contains invalid data."""
-
-    field: str
-    """The name of the field that contains invalid data."""
-
-    def __init__(self, field: str, message: str) -> None:
-        self.field = field
-        super().__init__(message)
-
-
-# The RawMetadata class attempts to make as few assumptions about the underlying
-# serialization formats as possible. The idea is that as long as a serialization
-# formats offer some very basic primitives in *some* way then we can support
-# serializing to and from that format.
-class RawMetadata(TypedDict, total=False):
-    """A dictionary of raw core metadata.
-
-    Each field in core metadata maps to a key of this dictionary (when data is
-    provided). The key is lower-case and underscores are used instead of dashes
-    compared to the equivalent core metadata field. Any core metadata field that
-    can be specified multiple times or can hold multiple values in a single
-    field have a key with a plural name. See :class:`Metadata` whose attributes
-    match the keys of this dictionary.
-
-    Core metadata fields that can be specified multiple times are stored as a
-    list or dict depending on which is appropriate for the field. Any fields
-    which hold multiple values in a single field are stored as a list.
-
-    """
-
-    # Metadata 1.0 - PEP 241
-    metadata_version: str
-    name: str
-    version: str
-    platforms: list[str]
-    summary: str
-    description: str
-    keywords: list[str]
-    home_page: str
-    author: str
-    author_email: str
-    license: str
-
-    # Metadata 1.1 - PEP 314
-    supported_platforms: list[str]
-    download_url: str
-    classifiers: list[str]
-    requires: list[str]
-    provides: list[str]
-    obsoletes: list[str]
-
-    # Metadata 1.2 - PEP 345
-    maintainer: str
-    maintainer_email: str
-    requires_dist: list[str]
-    provides_dist: list[str]
-    obsoletes_dist: list[str]
-    requires_python: str
-    requires_external: list[str]
-    project_urls: dict[str, str]
-
-    # Metadata 2.0
-    # PEP 426 attempted to completely revamp the metadata format
-    # but got stuck without ever being able to build consensus on
-    # it and ultimately ended up withdrawn.
-    #
-    # However, a number of tools had started emitting METADATA with
-    # `2.0` Metadata-Version, so for historical reasons, this version
-    # was skipped.
-
-    # Metadata 2.1 - PEP 566
-    description_content_type: str
-    provides_extra: list[str]
-
-    # Metadata 2.2 - PEP 643
-    dynamic: list[str]
-
-    # Metadata 2.3 - PEP 685
-    # No new fields were added in PEP 685, just some edge case were
-    # tightened up to provide better interoptability.
-
-    # Metadata 2.4 - PEP 639
-    license_expression: str
-    license_files: list[str]
-
-
-_STRING_FIELDS = {
-    "author",
-    "author_email",
-    "description",
-    "description_content_type",
-    "download_url",
-    "home_page",
-    "license",
-    "license_expression",
-    "maintainer",
-    "maintainer_email",
-    "metadata_version",
-    "name",
-    "requires_python",
-    "summary",
-    "version",
-}
-
-_LIST_FIELDS = {
-    "classifiers",
-    "dynamic",
-    "license_files",
-    "obsoletes",
-    "obsoletes_dist",
-    "platforms",
-    "provides",
-    "provides_dist",
-    "provides_extra",
-    "requires",
-    "requires_dist",
-    "requires_external",
-    "supported_platforms",
-}
-
-_DICT_FIELDS = {
-    "project_urls",
-}
-
-
-def _parse_keywords(data: str) -> list[str]:
-    """Split a string of comma-separated keywords into a list of keywords."""
-    return [k.strip() for k in data.split(",")]
-
-
-def _parse_project_urls(data: list[str]) -> dict[str, str]:
-    """Parse a list of label/URL string pairings separated by a comma."""
-    urls = {}
-    for pair in data:
-        # Our logic is slightly tricky here as we want to try and do
-        # *something* reasonable with malformed data.
-        #
-        # The main thing that we have to worry about, is data that does
-        # not have a ',' at all to split the label from the Value. There
-        # isn't a singular right answer here, and we will fail validation
-        # later on (if the caller is validating) so it doesn't *really*
-        # matter, but since the missing value has to be an empty str
-        # and our return value is dict[str, str], if we let the key
-        # be the missing value, then they'd have multiple '' values that
-        # overwrite each other in a accumulating dict.
-        #
-        # The other potentional issue is that it's possible to have the
-        # same label multiple times in the metadata, with no solid "right"
-        # answer with what to do in that case. As such, we'll do the only
-        # thing we can, which is treat the field as unparseable and add it
-        # to our list of unparsed fields.
-        parts = [p.strip() for p in pair.split(",", 1)]
-        parts.extend([""] * (max(0, 2 - len(parts))))  # Ensure 2 items
-
-        # TODO: The spec doesn't say anything about if the keys should be
-        #       considered case sensitive or not... logically they should
-        #       be case-preserving and case-insensitive, but doing that
-        #       would open up more cases where we might have duplicate
-        #       entries.
-        label, url = parts
-        if label in urls:
-            # The label already exists in our set of urls, so this field
-            # is unparseable, and we can just add the whole thing to our
-            # unparseable data and stop processing it.
-            raise KeyError("duplicate labels in project urls")
-        urls[label] = url
-
-    return urls
-
-
-def _get_payload(msg: email.message.Message, source: bytes | str) -> str:
-    """Get the body of the message."""
-    # If our source is a str, then our caller has managed encodings for us,
-    # and we don't need to deal with it.
-    if isinstance(source, str):
-        payload = msg.get_payload()
-        assert isinstance(payload, str)
-        return payload
-    # If our source is a bytes, then we're managing the encoding and we need
-    # to deal with it.
-    else:
-        bpayload = msg.get_payload(decode=True)
-        assert isinstance(bpayload, bytes)
-        try:
-            return bpayload.decode("utf8", "strict")
-        except UnicodeDecodeError as exc:
-            raise ValueError("payload in an invalid encoding") from exc
-
-
-# The various parse_FORMAT functions here are intended to be as lenient as
-# possible in their parsing, while still returning a correctly typed
-# RawMetadata.
-#
-# To aid in this, we also generally want to do as little touching of the
-# data as possible, except where there are possibly some historic holdovers
-# that make valid data awkward to work with.
-#
-# While this is a lower level, intermediate format than our ``Metadata``
-# class, some light touch ups can make a massive difference in usability.
-
-# Map METADATA fields to RawMetadata.
-_EMAIL_TO_RAW_MAPPING = {
-    "author": "author",
-    "author-email": "author_email",
-    "classifier": "classifiers",
-    "description": "description",
-    "description-content-type": "description_content_type",
-    "download-url": "download_url",
-    "dynamic": "dynamic",
-    "home-page": "home_page",
-    "keywords": "keywords",
-    "license": "license",
-    "license-expression": "license_expression",
-    "license-file": "license_files",
-    "maintainer": "maintainer",
-    "maintainer-email": "maintainer_email",
-    "metadata-version": "metadata_version",
-    "name": "name",
-    "obsoletes": "obsoletes",
-    "obsoletes-dist": "obsoletes_dist",
-    "platform": "platforms",
-    "project-url": "project_urls",
-    "provides": "provides",
-    "provides-dist": "provides_dist",
-    "provides-extra": "provides_extra",
-    "requires": "requires",
-    "requires-dist": "requires_dist",
-    "requires-external": "requires_external",
-    "requires-python": "requires_python",
-    "summary": "summary",
-    "supported-platform": "supported_platforms",
-    "version": "version",
-}
-_RAW_TO_EMAIL_MAPPING = {raw: email for email, raw in _EMAIL_TO_RAW_MAPPING.items()}
-
-
-def parse_email(data: bytes | str) -> tuple[RawMetadata, dict[str, list[str]]]:
-    """Parse a distribution's metadata stored as email headers (e.g. from ``METADATA``).
-
-    This function returns a two-item tuple of dicts. The first dict is of
-    recognized fields from the core metadata specification. Fields that can be
-    parsed and translated into Python's built-in types are converted
-    appropriately. All other fields are left as-is. Fields that are allowed to
-    appear multiple times are stored as lists.
-
-    The second dict contains all other fields from the metadata. This includes
-    any unrecognized fields. It also includes any fields which are expected to
-    be parsed into a built-in type but were not formatted appropriately. Finally,
-    any fields that are expected to appear only once but are repeated are
-    included in this dict.
-
-    """
-    raw: dict[str, str | list[str] | dict[str, str]] = {}
-    unparsed: dict[str, list[str]] = {}
-
-    if isinstance(data, str):
-        parsed = email.parser.Parser(policy=email.policy.compat32).parsestr(data)
-    else:
-        parsed = email.parser.BytesParser(policy=email.policy.compat32).parsebytes(data)
-
-    # We have to wrap parsed.keys() in a set, because in the case of multiple
-    # values for a key (a list), the key will appear multiple times in the
-    # list of keys, but we're avoiding that by using get_all().
-    for name in frozenset(parsed.keys()):
-        # Header names in RFC are case insensitive, so we'll normalize to all
-        # lower case to make comparisons easier.
-        name = name.lower()
-
-        # We use get_all() here, even for fields that aren't multiple use,
-        # because otherwise someone could have e.g. two Name fields, and we
-        # would just silently ignore it rather than doing something about it.
-        headers = parsed.get_all(name) or []
-
-        # The way the email module works when parsing bytes is that it
-        # unconditionally decodes the bytes as ascii using the surrogateescape
-        # handler. When you pull that data back out (such as with get_all() ),
-        # it looks to see if the str has any surrogate escapes, and if it does
-        # it wraps it in a Header object instead of returning the string.
-        #
-        # As such, we'll look for those Header objects, and fix up the encoding.
-        value = []
-        # Flag if we have run into any issues processing the headers, thus
-        # signalling that the data belongs in 'unparsed'.
-        valid_encoding = True
-        for h in headers:
-            # It's unclear if this can return more types than just a Header or
-            # a str, so we'll just assert here to make sure.
-            assert isinstance(h, (email.header.Header, str))
-
-            # If it's a header object, we need to do our little dance to get
-            # the real data out of it. In cases where there is invalid data
-            # we're going to end up with mojibake, but there's no obvious, good
-            # way around that without reimplementing parts of the Header object
-            # ourselves.
-            #
-            # That should be fine since, if mojibacked happens, this key is
-            # going into the unparsed dict anyways.
-            if isinstance(h, email.header.Header):
-                # The Header object stores it's data as chunks, and each chunk
-                # can be independently encoded, so we'll need to check each
-                # of them.
-                chunks: list[tuple[bytes, str | None]] = []
-                for bin, encoding in email.header.decode_header(h):
-                    try:
-                        bin.decode("utf8", "strict")
-                    except UnicodeDecodeError:
-                        # Enable mojibake.
-                        encoding = "latin1"
-                        valid_encoding = False
-                    else:
-                        encoding = "utf8"
-                    chunks.append((bin, encoding))
-
-                # Turn our chunks back into a Header object, then let that
-                # Header object do the right thing to turn them into a
-                # string for us.
-                value.append(str(email.header.make_header(chunks)))
-            # This is already a string, so just add it.
-            else:
-                value.append(h)
-
-        # We've processed all of our values to get them into a list of str,
-        # but we may have mojibake data, in which case this is an unparsed
-        # field.
-        if not valid_encoding:
-            unparsed[name] = value
-            continue
-
-        raw_name = _EMAIL_TO_RAW_MAPPING.get(name)
-        if raw_name is None:
-            # This is a bit of a weird situation, we've encountered a key that
-            # we don't know what it means, so we don't know whether it's meant
-            # to be a list or not.
-            #
-            # Since we can't really tell one way or another, we'll just leave it
-            # as a list, even though it may be a single item list, because that's
-            # what makes the most sense for email headers.
-            unparsed[name] = value
-            continue
-
-        # If this is one of our string fields, then we'll check to see if our
-        # value is a list of a single item. If it is then we'll assume that
-        # it was emitted as a single string, and unwrap the str from inside
-        # the list.
-        #
-        # If it's any other kind of data, then we haven't the faintest clue
-        # what we should parse it as, and we have to just add it to our list
-        # of unparsed stuff.
-        if raw_name in _STRING_FIELDS and len(value) == 1:
-            raw[raw_name] = value[0]
-        # If this is one of our list of string fields, then we can just assign
-        # the value, since email *only* has strings, and our get_all() call
-        # above ensures that this is a list.
-        elif raw_name in _LIST_FIELDS:
-            raw[raw_name] = value
-        # Special Case: Keywords
-        # The keywords field is implemented in the metadata spec as a str,
-        # but it conceptually is a list of strings, and is serialized using
-        # ", ".join(keywords), so we'll do some light data massaging to turn
-        # this into what it logically is.
-        elif raw_name == "keywords" and len(value) == 1:
-            raw[raw_name] = _parse_keywords(value[0])
-        # Special Case: Project-URL
-        # The project urls is implemented in the metadata spec as a list of
-        # specially-formatted strings that represent a key and a value, which
-        # is fundamentally a mapping, however the email format doesn't support
-        # mappings in a sane way, so it was crammed into a list of strings
-        # instead.
-        #
-        # We will do a little light data massaging to turn this into a map as
-        # it logically should be.
-        elif raw_name == "project_urls":
-            try:
-                raw[raw_name] = _parse_project_urls(value)
-            except KeyError:
-                unparsed[name] = value
-        # Nothing that we've done has managed to parse this, so it'll just
-        # throw it in our unparseable data and move on.
-        else:
-            unparsed[name] = value
-
-    # We need to support getting the Description from the message payload in
-    # addition to getting it from the the headers. This does mean, though, there
-    # is the possibility of it being set both ways, in which case we put both
-    # in 'unparsed' since we don't know which is right.
-    try:
-        payload = _get_payload(parsed, data)
-    except ValueError:
-        unparsed.setdefault("description", []).append(
-            parsed.get_payload(decode=isinstance(data, bytes))  # type: ignore[call-overload]
-        )
-    else:
-        if payload:
-            # Check to see if we've already got a description, if so then both
-            # it, and this body move to unparseable.
-            if "description" in raw:
-                description_header = cast(str, raw.pop("description"))
-                unparsed.setdefault("description", []).extend(
-                    [description_header, payload]
-                )
-            elif "description" in unparsed:
-                unparsed["description"].append(payload)
-            else:
-                raw["description"] = payload
-
-    # We need to cast our `raw` to a metadata, because a TypedDict only support
-    # literal key names, but we're computing our key names on purpose, but the
-    # way this function is implemented, our `TypedDict` can only have valid key
-    # names.
-    return cast(RawMetadata, raw), unparsed
-
-
-_NOT_FOUND = object()
-
-
-# Keep the two values in sync.
-_VALID_METADATA_VERSIONS = ["1.0", "1.1", "1.2", "2.1", "2.2", "2.3", "2.4"]
-_MetadataVersion = Literal["1.0", "1.1", "1.2", "2.1", "2.2", "2.3", "2.4"]
-
-_REQUIRED_ATTRS = frozenset(["metadata_version", "name", "version"])
-
-
-class _Validator(Generic[T]):
-    """Validate a metadata field.
-
-    All _process_*() methods correspond to a core metadata field. The method is
-    called with the field's raw value. If the raw value is valid it is returned
-    in its "enriched" form (e.g. ``version.Version`` for the ``Version`` field).
-    If the raw value is invalid, :exc:`InvalidMetadata` is raised (with a cause
-    as appropriate).
-    """
-
-    name: str
-    raw_name: str
-    added: _MetadataVersion
-
-    def __init__(
-        self,
-        *,
-        added: _MetadataVersion = "1.0",
-    ) -> None:
-        self.added = added
-
-    def __set_name__(self, _owner: Metadata, name: str) -> None:
-        self.name = name
-        self.raw_name = _RAW_TO_EMAIL_MAPPING[name]
-
-    def __get__(self, instance: Metadata, _owner: type[Metadata]) -> T:
-        # With Python 3.8, the caching can be replaced with functools.cached_property().
-        # No need to check the cache as attribute lookup will resolve into the
-        # instance's __dict__ before __get__ is called.
-        cache = instance.__dict__
-        value = instance._raw.get(self.name)
-
-        # To make the _process_* methods easier, we'll check if the value is None
-        # and if this field is NOT a required attribute, and if both of those
-        # things are true, we'll skip the the converter. This will mean that the
-        # converters never have to deal with the None union.
-        if self.name in _REQUIRED_ATTRS or value is not None:
-            try:
-                converter: Callable[[Any], T] = getattr(self, f"_process_{self.name}")
-            except AttributeError:
-                pass
-            else:
-                value = converter(value)
-
-        cache[self.name] = value
-        try:
-            del instance._raw[self.name]  # type: ignore[misc]
-        except KeyError:
-            pass
-
-        return cast(T, value)
-
-    def _invalid_metadata(
-        self, msg: str, cause: Exception | None = None
-    ) -> InvalidMetadata:
-        exc = InvalidMetadata(
-            self.raw_name, msg.format_map({"field": repr(self.raw_name)})
-        )
-        exc.__cause__ = cause
-        return exc
-
-    def _process_metadata_version(self, value: str) -> _MetadataVersion:
-        # Implicitly makes Metadata-Version required.
-        if value not in _VALID_METADATA_VERSIONS:
-            raise self._invalid_metadata(f"{value!r} is not a valid metadata version")
-        return cast(_MetadataVersion, value)
-
-    def _process_name(self, value: str) -> str:
-        if not value:
-            raise self._invalid_metadata("{field} is a required field")
-        # Validate the name as a side-effect.
-        try:
-            utils.canonicalize_name(value, validate=True)
-        except utils.InvalidName as exc:
-            raise self._invalid_metadata(
-                f"{value!r} is invalid for {{field}}", cause=exc
-            ) from exc
-        else:
-            return value
-
-    def _process_version(self, value: str) -> version_module.Version:
-        if not value:
-            raise self._invalid_metadata("{field} is a required field")
-        try:
-            return version_module.parse(value)
-        except version_module.InvalidVersion as exc:
-            raise self._invalid_metadata(
-                f"{value!r} is invalid for {{field}}", cause=exc
-            ) from exc
-
-    def _process_summary(self, value: str) -> str:
-        """Check the field contains no newlines."""
-        if "\n" in value:
-            raise self._invalid_metadata("{field} must be a single line")
-        return value
-
-    def _process_description_content_type(self, value: str) -> str:
-        content_types = {"text/plain", "text/x-rst", "text/markdown"}
-        message = email.message.EmailMessage()
-        message["content-type"] = value
-
-        content_type, parameters = (
-            # Defaults to `text/plain` if parsing failed.
-            message.get_content_type().lower(),
-            message["content-type"].params,
-        )
-        # Check if content-type is valid or defaulted to `text/plain` and thus was
-        # not parseable.
-        if content_type not in content_types or content_type not in value.lower():
-            raise self._invalid_metadata(
-                f"{{field}} must be one of {list(content_types)}, not {value!r}"
-            )
-
-        charset = parameters.get("charset", "UTF-8")
-        if charset != "UTF-8":
-            raise self._invalid_metadata(
-                f"{{field}} can only specify the UTF-8 charset, not {list(charset)}"
-            )
-
-        markdown_variants = {"GFM", "CommonMark"}
-        variant = parameters.get("variant", "GFM")  # Use an acceptable default.
-        if content_type == "text/markdown" and variant not in markdown_variants:
-            raise self._invalid_metadata(
-                f"valid Markdown variants for {{field}} are {list(markdown_variants)}, "
-                f"not {variant!r}",
-            )
-        return value
-
-    def _process_dynamic(self, value: list[str]) -> list[str]:
-        for dynamic_field in map(str.lower, value):
-            if dynamic_field in {"name", "version", "metadata-version"}:
-                raise self._invalid_metadata(
-                    f"{dynamic_field!r} is not allowed as a dynamic field"
-                )
-            elif dynamic_field not in _EMAIL_TO_RAW_MAPPING:
-                raise self._invalid_metadata(
-                    f"{dynamic_field!r} is not a valid dynamic field"
-                )
-        return list(map(str.lower, value))
-
-    def _process_provides_extra(
-        self,
-        value: list[str],
-    ) -> list[utils.NormalizedName]:
-        normalized_names = []
-        try:
-            for name in value:
-                normalized_names.append(utils.canonicalize_name(name, validate=True))
-        except utils.InvalidName as exc:
-            raise self._invalid_metadata(
-                f"{name!r} is invalid for {{field}}", cause=exc
-            ) from exc
-        else:
-            return normalized_names
-
-    def _process_requires_python(self, value: str) -> specifiers.SpecifierSet:
-        try:
-            return specifiers.SpecifierSet(value)
-        except specifiers.InvalidSpecifier as exc:
-            raise self._invalid_metadata(
-                f"{value!r} is invalid for {{field}}", cause=exc
-            ) from exc
-
-    def _process_requires_dist(
-        self,
-        value: list[str],
-    ) -> list[requirements.Requirement]:
-        reqs = []
-        try:
-            for req in value:
-                reqs.append(requirements.Requirement(req))
-        except requirements.InvalidRequirement as exc:
-            raise self._invalid_metadata(
-                f"{req!r} is invalid for {{field}}", cause=exc
-            ) from exc
-        else:
-            return reqs
-
-    def _process_license_expression(
-        self, value: str
-    ) -> NormalizedLicenseExpression | None:
-        try:
-            return licenses.canonicalize_license_expression(value)
-        except ValueError as exc:
-            raise self._invalid_metadata(
-                f"{value!r} is invalid for {{field}}", cause=exc
-            ) from exc
-
-    def _process_license_files(self, value: list[str]) -> list[str]:
-        paths = []
-        for path in value:
-            if ".." in path:
-                raise self._invalid_metadata(
-                    f"{path!r} is invalid for {{field}}, "
-                    "parent directory indicators are not allowed"
-                )
-            if "*" in path:
-                raise self._invalid_metadata(
-                    f"{path!r} is invalid for {{field}}, paths must be resolved"
-                )
-            if (
-                pathlib.PurePosixPath(path).is_absolute()
-                or pathlib.PureWindowsPath(path).is_absolute()
-            ):
-                raise self._invalid_metadata(
-                    f"{path!r} is invalid for {{field}}, paths must be relative"
-                )
-            if pathlib.PureWindowsPath(path).as_posix() != path:
-                raise self._invalid_metadata(
-                    f"{path!r} is invalid for {{field}}, "
-                    "paths must use '/' delimiter"
-                )
-            paths.append(path)
-        return paths
-
-
-class Metadata:
-    """Representation of distribution metadata.
-
-    Compared to :class:`RawMetadata`, this class provides objects representing
-    metadata fields instead of only using built-in types. Any invalid metadata
-    will cause :exc:`InvalidMetadata` to be raised (with a
-    :py:attr:`~BaseException.__cause__` attribute as appropriate).
-    """
-
-    _raw: RawMetadata
-
-    @classmethod
-    def from_raw(cls, data: RawMetadata, *, validate: bool = True) -> Metadata:
-        """Create an instance from :class:`RawMetadata`.
-
-        If *validate* is true, all metadata will be validated. All exceptions
-        related to validation will be gathered and raised as an :class:`ExceptionGroup`.
-        """
-        ins = cls()
-        ins._raw = data.copy()  # Mutations occur due to caching enriched values.
-
-        if validate:
-            exceptions: list[Exception] = []
-            try:
-                metadata_version = ins.metadata_version
-                metadata_age = _VALID_METADATA_VERSIONS.index(metadata_version)
-            except InvalidMetadata as metadata_version_exc:
-                exceptions.append(metadata_version_exc)
-                metadata_version = None
-
-            # Make sure to check for the fields that are present, the required
-            # fields (so their absence can be reported).
-            fields_to_check = frozenset(ins._raw) | _REQUIRED_ATTRS
-            # Remove fields that have already been checked.
-            fields_to_check -= {"metadata_version"}
-
-            for key in fields_to_check:
-                try:
-                    if metadata_version:
-                        # Can't use getattr() as that triggers descriptor protocol which
-                        # will fail due to no value for the instance argument.
-                        try:
-                            field_metadata_version = cls.__dict__[key].added
-                        except KeyError:
-                            exc = InvalidMetadata(key, f"unrecognized field: {key!r}")
-                            exceptions.append(exc)
-                            continue
-                        field_age = _VALID_METADATA_VERSIONS.index(
-                            field_metadata_version
-                        )
-                        if field_age > metadata_age:
-                            field = _RAW_TO_EMAIL_MAPPING[key]
-                            exc = InvalidMetadata(
-                                field,
-                                f"{field} introduced in metadata version "
-                                f"{field_metadata_version}, not {metadata_version}",
-                            )
-                            exceptions.append(exc)
-                            continue
-                    getattr(ins, key)
-                except InvalidMetadata as exc:
-                    exceptions.append(exc)
-
-            if exceptions:
-                raise ExceptionGroup("invalid metadata", exceptions)
-
-        return ins
-
-    @classmethod
-    def from_email(cls, data: bytes | str, *, validate: bool = True) -> Metadata:
-        """Parse metadata from email headers.
-
-        If *validate* is true, the metadata will be validated. All exceptions
-        related to validation will be gathered and raised as an :class:`ExceptionGroup`.
-        """
-        raw, unparsed = parse_email(data)
-
-        if validate:
-            exceptions: list[Exception] = []
-            for unparsed_key in unparsed:
-                if unparsed_key in _EMAIL_TO_RAW_MAPPING:
-                    message = f"{unparsed_key!r} has invalid data"
-                else:
-                    message = f"unrecognized field: {unparsed_key!r}"
-                exceptions.append(InvalidMetadata(unparsed_key, message))
-
-            if exceptions:
-                raise ExceptionGroup("unparsed", exceptions)
-
-        try:
-            return cls.from_raw(raw, validate=validate)
-        except ExceptionGroup as exc_group:
-            raise ExceptionGroup(
-                "invalid or unparsed metadata", exc_group.exceptions
-            ) from None
-
-    metadata_version: _Validator[_MetadataVersion] = _Validator()
-    """:external:ref:`core-metadata-metadata-version`
-    (required; validated to be a valid metadata version)"""
-    # `name` is not normalized/typed to NormalizedName so as to provide access to
-    # the original/raw name.
-    name: _Validator[str] = _Validator()
-    """:external:ref:`core-metadata-name`
-    (required; validated using :func:`~packaging.utils.canonicalize_name` and its
-    *validate* parameter)"""
-    version: _Validator[version_module.Version] = _Validator()
-    """:external:ref:`core-metadata-version` (required)"""
-    dynamic: _Validator[list[str] | None] = _Validator(
-        added="2.2",
-    )
-    """:external:ref:`core-metadata-dynamic`
-    (validated against core metadata field names and lowercased)"""
-    platforms: _Validator[list[str] | None] = _Validator()
-    """:external:ref:`core-metadata-platform`"""
-    supported_platforms: _Validator[list[str] | None] = _Validator(added="1.1")
-    """:external:ref:`core-metadata-supported-platform`"""
-    summary: _Validator[str | None] = _Validator()
-    """:external:ref:`core-metadata-summary` (validated to contain no newlines)"""
-    description: _Validator[str | None] = _Validator()  # TODO 2.1: can be in body
-    """:external:ref:`core-metadata-description`"""
-    description_content_type: _Validator[str | None] = _Validator(added="2.1")
-    """:external:ref:`core-metadata-description-content-type` (validated)"""
-    keywords: _Validator[list[str] | None] = _Validator()
-    """:external:ref:`core-metadata-keywords`"""
-    home_page: _Validator[str | None] = _Validator()
-    """:external:ref:`core-metadata-home-page`"""
-    download_url: _Validator[str | None] = _Validator(added="1.1")
-    """:external:ref:`core-metadata-download-url`"""
-    author: _Validator[str | None] = _Validator()
-    """:external:ref:`core-metadata-author`"""
-    author_email: _Validator[str | None] = _Validator()
-    """:external:ref:`core-metadata-author-email`"""
-    maintainer: _Validator[str | None] = _Validator(added="1.2")
-    """:external:ref:`core-metadata-maintainer`"""
-    maintainer_email: _Validator[str | None] = _Validator(added="1.2")
-    """:external:ref:`core-metadata-maintainer-email`"""
-    license: _Validator[str | None] = _Validator()
-    """:external:ref:`core-metadata-license`"""
-    license_expression: _Validator[NormalizedLicenseExpression | None] = _Validator(
-        added="2.4"
-    )
-    """:external:ref:`core-metadata-license-expression`"""
-    license_files: _Validator[list[str] | None] = _Validator(added="2.4")
-    """:external:ref:`core-metadata-license-file`"""
-    classifiers: _Validator[list[str] | None] = _Validator(added="1.1")
-    """:external:ref:`core-metadata-classifier`"""
-    requires_dist: _Validator[list[requirements.Requirement] | None] = _Validator(
-        added="1.2"
-    )
-    """:external:ref:`core-metadata-requires-dist`"""
-    requires_python: _Validator[specifiers.SpecifierSet | None] = _Validator(
-        added="1.2"
-    )
-    """:external:ref:`core-metadata-requires-python`"""
-    # Because `Requires-External` allows for non-PEP 440 version specifiers, we
-    # don't do any processing on the values.
-    requires_external: _Validator[list[str] | None] = _Validator(added="1.2")
-    """:external:ref:`core-metadata-requires-external`"""
-    project_urls: _Validator[dict[str, str] | None] = _Validator(added="1.2")
-    """:external:ref:`core-metadata-project-url`"""
-    # PEP 685 lets us raise an error if an extra doesn't pass `Name` validation
-    # regardless of metadata version.
-    provides_extra: _Validator[list[utils.NormalizedName] | None] = _Validator(
-        added="2.1",
-    )
-    """:external:ref:`core-metadata-provides-extra`"""
-    provides_dist: _Validator[list[str] | None] = _Validator(added="1.2")
-    """:external:ref:`core-metadata-provides-dist`"""
-    obsoletes_dist: _Validator[list[str] | None] = _Validator(added="1.2")
-    """:external:ref:`core-metadata-obsoletes-dist`"""
-    requires: _Validator[list[str] | None] = _Validator(added="1.1")
-    """``Requires`` (deprecated)"""
-    provides: _Validator[list[str] | None] = _Validator(added="1.1")
-    """``Provides`` (deprecated)"""
-    obsoletes: _Validator[list[str] | None] = _Validator(added="1.1")
-    """``Obsoletes`` (deprecated)"""
diff --git a/lib/packaging/py.typed b/lib/packaging/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/packaging/requirements.py b/lib/packaging/requirements.py
deleted file mode 100644
index 4e068c95..00000000
--- a/lib/packaging/requirements.py
+++ /dev/null
@@ -1,91 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-from __future__ import annotations
-
-from typing import Any, Iterator
-
-from ._parser import parse_requirement as _parse_requirement
-from ._tokenizer import ParserSyntaxError
-from .markers import Marker, _normalize_extra_values
-from .specifiers import SpecifierSet
-from .utils import canonicalize_name
-
-
-class InvalidRequirement(ValueError):
-    """
-    An invalid requirement was found, users should refer to PEP 508.
-    """
-
-
-class Requirement:
-    """Parse a requirement.
-
-    Parse a given requirement string into its parts, such as name, specifier,
-    URL, and extras. Raises InvalidRequirement on a badly-formed requirement
-    string.
-    """
-
-    # TODO: Can we test whether something is contained within a requirement?
-    #       If so how do we do that? Do we need to test against the _name_ of
-    #       the thing as well as the version? What about the markers?
-    # TODO: Can we normalize the name and extra name?
-
-    def __init__(self, requirement_string: str) -> None:
-        try:
-            parsed = _parse_requirement(requirement_string)
-        except ParserSyntaxError as e:
-            raise InvalidRequirement(str(e)) from e
-
-        self.name: str = parsed.name
-        self.url: str | None = parsed.url or None
-        self.extras: set[str] = set(parsed.extras or [])
-        self.specifier: SpecifierSet = SpecifierSet(parsed.specifier)
-        self.marker: Marker | None = None
-        if parsed.marker is not None:
-            self.marker = Marker.__new__(Marker)
-            self.marker._markers = _normalize_extra_values(parsed.marker)
-
-    def _iter_parts(self, name: str) -> Iterator[str]:
-        yield name
-
-        if self.extras:
-            formatted_extras = ",".join(sorted(self.extras))
-            yield f"[{formatted_extras}]"
-
-        if self.specifier:
-            yield str(self.specifier)
-
-        if self.url:
-            yield f"@ {self.url}"
-            if self.marker:
-                yield " "
-
-        if self.marker:
-            yield f"; {self.marker}"
-
-    def __str__(self) -> str:
-        return "".join(self._iter_parts(self.name))
-
-    def __repr__(self) -> str:
-        return f"<Requirement('{self}')>"
-
-    def __hash__(self) -> int:
-        return hash(
-            (
-                self.__class__.__name__,
-                *self._iter_parts(canonicalize_name(self.name)),
-            )
-        )
-
-    def __eq__(self, other: Any) -> bool:
-        if not isinstance(other, Requirement):
-            return NotImplemented
-
-        return (
-            canonicalize_name(self.name) == canonicalize_name(other.name)
-            and self.extras == other.extras
-            and self.specifier == other.specifier
-            and self.url == other.url
-            and self.marker == other.marker
-        )
diff --git a/lib/packaging/specifiers.py b/lib/packaging/specifiers.py
deleted file mode 100644
index b30926af..00000000
--- a/lib/packaging/specifiers.py
+++ /dev/null
@@ -1,1020 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-"""
-.. testsetup::
-
-    from packaging.specifiers import Specifier, SpecifierSet, InvalidSpecifier
-    from packaging.version import Version
-"""
-
-from __future__ import annotations
-
-import abc
-import itertools
-import re
-from typing import Callable, Iterable, Iterator, TypeVar, Union
-
-from .utils import canonicalize_version
-from .version import Version
-
-UnparsedVersion = Union[Version, str]
-UnparsedVersionVar = TypeVar("UnparsedVersionVar", bound=UnparsedVersion)
-CallableOperator = Callable[[Version, str], bool]
-
-
-def _coerce_version(version: UnparsedVersion) -> Version:
-    if not isinstance(version, Version):
-        version = Version(version)
-    return version
-
-
-class InvalidSpecifier(ValueError):
-    """
-    Raised when attempting to create a :class:`Specifier` with a specifier
-    string that is invalid.
-
-    >>> Specifier("lolwat")
-    Traceback (most recent call last):
-        ...
-    packaging.specifiers.InvalidSpecifier: Invalid specifier: 'lolwat'
-    """
-
-
-class BaseSpecifier(metaclass=abc.ABCMeta):
-    @abc.abstractmethod
-    def __str__(self) -> str:
-        """
-        Returns the str representation of this Specifier-like object. This
-        should be representative of the Specifier itself.
-        """
-
-    @abc.abstractmethod
-    def __hash__(self) -> int:
-        """
-        Returns a hash value for this Specifier-like object.
-        """
-
-    @abc.abstractmethod
-    def __eq__(self, other: object) -> bool:
-        """
-        Returns a boolean representing whether or not the two Specifier-like
-        objects are equal.
-
-        :param other: The other object to check against.
-        """
-
-    @property
-    @abc.abstractmethod
-    def prereleases(self) -> bool | None:
-        """Whether or not pre-releases as a whole are allowed.
-
-        This can be set to either ``True`` or ``False`` to explicitly enable or disable
-        prereleases or it can be set to ``None`` (the default) to use default semantics.
-        """
-
-    @prereleases.setter
-    def prereleases(self, value: bool) -> None:
-        """Setter for :attr:`prereleases`.
-
-        :param value: The value to set.
-        """
-
-    @abc.abstractmethod
-    def contains(self, item: str, prereleases: bool | None = None) -> bool:
-        """
-        Determines if the given item is contained within this specifier.
-        """
-
-    @abc.abstractmethod
-    def filter(
-        self, iterable: Iterable[UnparsedVersionVar], prereleases: bool | None = None
-    ) -> Iterator[UnparsedVersionVar]:
-        """
-        Takes an iterable of items and filters them so that only items which
-        are contained within this specifier are allowed in it.
-        """
-
-
-class Specifier(BaseSpecifier):
-    """This class abstracts handling of version specifiers.
-
-    .. tip::
-
-        It is generally not required to instantiate this manually. You should instead
-        prefer to work with :class:`SpecifierSet` instead, which can parse
-        comma-separated version specifiers (which is what package metadata contains).
-    """
-
-    _operator_regex_str = r"""
-        (?P<operator>(~=|==|!=|<=|>=|<|>|===))
-        """
-    _version_regex_str = r"""
-        (?P<version>
-            (?:
-                # The identity operators allow for an escape hatch that will
-                # do an exact string match of the version you wish to install.
-                # This will not be parsed by PEP 440 and we cannot determine
-                # any semantic meaning from it. This operator is discouraged
-                # but included entirely as an escape hatch.
-                (?<====)  # Only match for the identity operator
-                \s*
-                [^\s;)]*  # The arbitrary version can be just about anything,
-                          # we match everything except for whitespace, a
-                          # semi-colon for marker support, and a closing paren
-                          # since versions can be enclosed in them.
-            )
-            |
-            (?:
-                # The (non)equality operators allow for wild card and local
-                # versions to be specified so we have to define these two
-                # operators separately to enable that.
-                (?<===|!=)            # Only match for equals and not equals
-
-                \s*
-                v?
-                (?:[0-9]+!)?          # epoch
-                [0-9]+(?:\.[0-9]+)*   # release
-
-                # You cannot use a wild card and a pre-release, post-release, a dev or
-                # local version together so group them with a | and make them optional.
-                (?:
-                    \.\*  # Wild card syntax of .*
-                    |
-                    (?:                                  # pre release
-                        [-_\.]?
-                        (alpha|beta|preview|pre|a|b|c|rc)
-                        [-_\.]?
-                        [0-9]*
-                    )?
-                    (?:                                  # post release
-                        (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
-                    )?
-                    (?:[-_\.]?dev[-_\.]?[0-9]*)?         # dev release
-                    (?:\+[a-z0-9]+(?:[-_\.][a-z0-9]+)*)? # local
-                )?
-            )
-            |
-            (?:
-                # The compatible operator requires at least two digits in the
-                # release segment.
-                (?<=~=)               # Only match for the compatible operator
-
-                \s*
-                v?
-                (?:[0-9]+!)?          # epoch
-                [0-9]+(?:\.[0-9]+)+   # release  (We have a + instead of a *)
-                (?:                   # pre release
-                    [-_\.]?
-                    (alpha|beta|preview|pre|a|b|c|rc)
-                    [-_\.]?
-                    [0-9]*
-                )?
-                (?:                                   # post release
-                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
-                )?
-                (?:[-_\.]?dev[-_\.]?[0-9]*)?          # dev release
-            )
-            |
-            (?:
-                # All other operators only allow a sub set of what the
-                # (non)equality operators do. Specifically they do not allow
-                # local versions to be specified nor do they allow the prefix
-                # matching wild cards.
-                (?<!==|!=|~=)         # We have special cases for these
-                                      # operators so we want to make sure they
-                                      # don't match here.
-
-                \s*
-                v?
-                (?:[0-9]+!)?          # epoch
-                [0-9]+(?:\.[0-9]+)*   # release
-                (?:                   # pre release
-                    [-_\.]?
-                    (alpha|beta|preview|pre|a|b|c|rc)
-                    [-_\.]?
-                    [0-9]*
-                )?
-                (?:                                   # post release
-                    (?:-[0-9]+)|(?:[-_\.]?(post|rev|r)[-_\.]?[0-9]*)
-                )?
-                (?:[-_\.]?dev[-_\.]?[0-9]*)?          # dev release
-            )
-        )
-        """
-
-    _regex = re.compile(
-        r"^\s*" + _operator_regex_str + _version_regex_str + r"\s*$",
-        re.VERBOSE | re.IGNORECASE,
-    )
-
-    _operators = {
-        "~=": "compatible",
-        "==": "equal",
-        "!=": "not_equal",
-        "<=": "less_than_equal",
-        ">=": "greater_than_equal",
-        "<": "less_than",
-        ">": "greater_than",
-        "===": "arbitrary",
-    }
-
-    def __init__(self, spec: str = "", prereleases: bool | None = None) -> None:
-        """Initialize a Specifier instance.
-
-        :param spec:
-            The string representation of a specifier which will be parsed and
-            normalized before use.
-        :param prereleases:
-            This tells the specifier if it should accept prerelease versions if
-            applicable or not. The default of ``None`` will autodetect it from the
-            given specifiers.
-        :raises InvalidSpecifier:
-            If the given specifier is invalid (i.e. bad syntax).
-        """
-        match = self._regex.search(spec)
-        if not match:
-            raise InvalidSpecifier(f"Invalid specifier: {spec!r}")
-
-        self._spec: tuple[str, str] = (
-            match.group("operator").strip(),
-            match.group("version").strip(),
-        )
-
-        # Store whether or not this Specifier should accept prereleases
-        self._prereleases = prereleases
-
-    # https://github.com/python/mypy/pull/13475#pullrequestreview-1079784515
-    @property  # type: ignore[override]
-    def prereleases(self) -> bool:
-        # If there is an explicit prereleases set for this, then we'll just
-        # blindly use that.
-        if self._prereleases is not None:
-            return self._prereleases
-
-        # Look at all of our specifiers and determine if they are inclusive
-        # operators, and if they are if they are including an explicit
-        # prerelease.
-        operator, version = self._spec
-        if operator in ["==", ">=", "<=", "~=", "===", ">", "<"]:
-            # The == specifier can include a trailing .*, if it does we
-            # want to remove before parsing.
-            if operator == "==" and version.endswith(".*"):
-                version = version[:-2]
-
-            # Parse the version, and if it is a pre-release than this
-            # specifier allows pre-releases.
-            if Version(version).is_prerelease:
-                return True
-
-        return False
-
-    @prereleases.setter
-    def prereleases(self, value: bool) -> None:
-        self._prereleases = value
-
-    @property
-    def operator(self) -> str:
-        """The operator of this specifier.
-
-        >>> Specifier("==1.2.3").operator
-        '=='
-        """
-        return self._spec[0]
-
-    @property
-    def version(self) -> str:
-        """The version of this specifier.
-
-        >>> Specifier("==1.2.3").version
-        '1.2.3'
-        """
-        return self._spec[1]
-
-    def __repr__(self) -> str:
-        """A representation of the Specifier that shows all internal state.
-
-        >>> Specifier('>=1.0.0')
-        <Specifier('>=1.0.0')>
-        >>> Specifier('>=1.0.0', prereleases=False)
-        <Specifier('>=1.0.0', prereleases=False)>
-        >>> Specifier('>=1.0.0', prereleases=True)
-        <Specifier('>=1.0.0', prereleases=True)>
-        """
-        pre = (
-            f", prereleases={self.prereleases!r}"
-            if self._prereleases is not None
-            else ""
-        )
-
-        return f"<{self.__class__.__name__}({str(self)!r}{pre})>"
-
-    def __str__(self) -> str:
-        """A string representation of the Specifier that can be round-tripped.
-
-        >>> str(Specifier('>=1.0.0'))
-        '>=1.0.0'
-        >>> str(Specifier('>=1.0.0', prereleases=False))
-        '>=1.0.0'
-        """
-        return "{}{}".format(*self._spec)
-
-    @property
-    def _canonical_spec(self) -> tuple[str, str]:
-        canonical_version = canonicalize_version(
-            self._spec[1],
-            strip_trailing_zero=(self._spec[0] != "~="),
-        )
-        return self._spec[0], canonical_version
-
-    def __hash__(self) -> int:
-        return hash(self._canonical_spec)
-
-    def __eq__(self, other: object) -> bool:
-        """Whether or not the two Specifier-like objects are equal.
-
-        :param other: The other object to check against.
-
-        The value of :attr:`prereleases` is ignored.
-
-        >>> Specifier("==1.2.3") == Specifier("== 1.2.3.0")
-        True
-        >>> (Specifier("==1.2.3", prereleases=False) ==
-        ...  Specifier("==1.2.3", prereleases=True))
-        True
-        >>> Specifier("==1.2.3") == "==1.2.3"
-        True
-        >>> Specifier("==1.2.3") == Specifier("==1.2.4")
-        False
-        >>> Specifier("==1.2.3") == Specifier("~=1.2.3")
-        False
-        """
-        if isinstance(other, str):
-            try:
-                other = self.__class__(str(other))
-            except InvalidSpecifier:
-                return NotImplemented
-        elif not isinstance(other, self.__class__):
-            return NotImplemented
-
-        return self._canonical_spec == other._canonical_spec
-
-    def _get_operator(self, op: str) -> CallableOperator:
-        operator_callable: CallableOperator = getattr(
-            self, f"_compare_{self._operators[op]}"
-        )
-        return operator_callable
-
-    def _compare_compatible(self, prospective: Version, spec: str) -> bool:
-        # Compatible releases have an equivalent combination of >= and ==. That
-        # is that ~=2.2 is equivalent to >=2.2,==2.*. This allows us to
-        # implement this in terms of the other specifiers instead of
-        # implementing it ourselves. The only thing we need to do is construct
-        # the other specifiers.
-
-        # We want everything but the last item in the version, but we want to
-        # ignore suffix segments.
-        prefix = _version_join(
-            list(itertools.takewhile(_is_not_suffix, _version_split(spec)))[:-1]
-        )
-
-        # Add the prefix notation to the end of our string
-        prefix += ".*"
-
-        return self._get_operator(">=")(prospective, spec) and self._get_operator("==")(
-            prospective, prefix
-        )
-
-    def _compare_equal(self, prospective: Version, spec: str) -> bool:
-        # We need special logic to handle prefix matching
-        if spec.endswith(".*"):
-            # In the case of prefix matching we want to ignore local segment.
-            normalized_prospective = canonicalize_version(
-                prospective.public, strip_trailing_zero=False
-            )
-            # Get the normalized version string ignoring the trailing .*
-            normalized_spec = canonicalize_version(spec[:-2], strip_trailing_zero=False)
-            # Split the spec out by bangs and dots, and pretend that there is
-            # an implicit dot in between a release segment and a pre-release segment.
-            split_spec = _version_split(normalized_spec)
-
-            # Split the prospective version out by bangs and dots, and pretend
-            # that there is an implicit dot in between a release segment and
-            # a pre-release segment.
-            split_prospective = _version_split(normalized_prospective)
-
-            # 0-pad the prospective version before shortening it to get the correct
-            # shortened version.
-            padded_prospective, _ = _pad_version(split_prospective, split_spec)
-
-            # Shorten the prospective version to be the same length as the spec
-            # so that we can determine if the specifier is a prefix of the
-            # prospective version or not.
-            shortened_prospective = padded_prospective[: len(split_spec)]
-
-            return shortened_prospective == split_spec
-        else:
-            # Convert our spec string into a Version
-            spec_version = Version(spec)
-
-            # If the specifier does not have a local segment, then we want to
-            # act as if the prospective version also does not have a local
-            # segment.
-            if not spec_version.local:
-                prospective = Version(prospective.public)
-
-            return prospective == spec_version
-
-    def _compare_not_equal(self, prospective: Version, spec: str) -> bool:
-        return not self._compare_equal(prospective, spec)
-
-    def _compare_less_than_equal(self, prospective: Version, spec: str) -> bool:
-        # NB: Local version identifiers are NOT permitted in the version
-        # specifier, so local version labels can be universally removed from
-        # the prospective version.
-        return Version(prospective.public) <= Version(spec)
-
-    def _compare_greater_than_equal(self, prospective: Version, spec: str) -> bool:
-        # NB: Local version identifiers are NOT permitted in the version
-        # specifier, so local version labels can be universally removed from
-        # the prospective version.
-        return Version(prospective.public) >= Version(spec)
-
-    def _compare_less_than(self, prospective: Version, spec_str: str) -> bool:
-        # Convert our spec to a Version instance, since we'll want to work with
-        # it as a version.
-        spec = Version(spec_str)
-
-        # Check to see if the prospective version is less than the spec
-        # version. If it's not we can short circuit and just return False now
-        # instead of doing extra unneeded work.
-        if not prospective < spec:
-            return False
-
-        # This special case is here so that, unless the specifier itself
-        # includes is a pre-release version, that we do not accept pre-release
-        # versions for the version mentioned in the specifier (e.g. <3.1 should
-        # not match 3.1.dev0, but should match 3.0.dev0).
-        if not spec.is_prerelease and prospective.is_prerelease:
-            if Version(prospective.base_version) == Version(spec.base_version):
-                return False
-
-        # If we've gotten to here, it means that prospective version is both
-        # less than the spec version *and* it's not a pre-release of the same
-        # version in the spec.
-        return True
-
-    def _compare_greater_than(self, prospective: Version, spec_str: str) -> bool:
-        # Convert our spec to a Version instance, since we'll want to work with
-        # it as a version.
-        spec = Version(spec_str)
-
-        # Check to see if the prospective version is greater than the spec
-        # version. If it's not we can short circuit and just return False now
-        # instead of doing extra unneeded work.
-        if not prospective > spec:
-            return False
-
-        # This special case is here so that, unless the specifier itself
-        # includes is a post-release version, that we do not accept
-        # post-release versions for the version mentioned in the specifier
-        # (e.g. >3.1 should not match 3.0.post0, but should match 3.2.post0).
-        if not spec.is_postrelease and prospective.is_postrelease:
-            if Version(prospective.base_version) == Version(spec.base_version):
-                return False
-
-        # Ensure that we do not allow a local version of the version mentioned
-        # in the specifier, which is technically greater than, to match.
-        if prospective.local is not None:
-            if Version(prospective.base_version) == Version(spec.base_version):
-                return False
-
-        # If we've gotten to here, it means that prospective version is both
-        # greater than the spec version *and* it's not a pre-release of the
-        # same version in the spec.
-        return True
-
-    def _compare_arbitrary(self, prospective: Version, spec: str) -> bool:
-        return str(prospective).lower() == str(spec).lower()
-
-    def __contains__(self, item: str | Version) -> bool:
-        """Return whether or not the item is contained in this specifier.
-
-        :param item: The item to check for.
-
-        This is used for the ``in`` operator and behaves the same as
-        :meth:`contains` with no ``prereleases`` argument passed.
-
-        >>> "1.2.3" in Specifier(">=1.2.3")
-        True
-        >>> Version("1.2.3") in Specifier(">=1.2.3")
-        True
-        >>> "1.0.0" in Specifier(">=1.2.3")
-        False
-        >>> "1.3.0a1" in Specifier(">=1.2.3")
-        False
-        >>> "1.3.0a1" in Specifier(">=1.2.3", prereleases=True)
-        True
-        """
-        return self.contains(item)
-
-    def contains(self, item: UnparsedVersion, prereleases: bool | None = None) -> bool:
-        """Return whether or not the item is contained in this specifier.
-
-        :param item:
-            The item to check for, which can be a version string or a
-            :class:`Version` instance.
-        :param prereleases:
-            Whether or not to match prereleases with this Specifier. If set to
-            ``None`` (the default), it uses :attr:`prereleases` to determine
-            whether or not prereleases are allowed.
-
-        >>> Specifier(">=1.2.3").contains("1.2.3")
-        True
-        >>> Specifier(">=1.2.3").contains(Version("1.2.3"))
-        True
-        >>> Specifier(">=1.2.3").contains("1.0.0")
-        False
-        >>> Specifier(">=1.2.3").contains("1.3.0a1")
-        False
-        >>> Specifier(">=1.2.3", prereleases=True).contains("1.3.0a1")
-        True
-        >>> Specifier(">=1.2.3").contains("1.3.0a1", prereleases=True)
-        True
-        """
-
-        # Determine if prereleases are to be allowed or not.
-        if prereleases is None:
-            prereleases = self.prereleases
-
-        # Normalize item to a Version, this allows us to have a shortcut for
-        # "2.0" in Specifier(">=2")
-        normalized_item = _coerce_version(item)
-
-        # Determine if we should be supporting prereleases in this specifier
-        # or not, if we do not support prereleases than we can short circuit
-        # logic if this version is a prereleases.
-        if normalized_item.is_prerelease and not prereleases:
-            return False
-
-        # Actually do the comparison to determine if this item is contained
-        # within this Specifier or not.
-        operator_callable: CallableOperator = self._get_operator(self.operator)
-        return operator_callable(normalized_item, self.version)
-
-    def filter(
-        self, iterable: Iterable[UnparsedVersionVar], prereleases: bool | None = None
-    ) -> Iterator[UnparsedVersionVar]:
-        """Filter items in the given iterable, that match the specifier.
-
-        :param iterable:
-            An iterable that can contain version strings and :class:`Version` instances.
-            The items in the iterable will be filtered according to the specifier.
-        :param prereleases:
-            Whether or not to allow prereleases in the returned iterator. If set to
-            ``None`` (the default), it will be intelligently decide whether to allow
-            prereleases or not (based on the :attr:`prereleases` attribute, and
-            whether the only versions matching are prereleases).
-
-        This method is smarter than just ``filter(Specifier().contains, [...])``
-        because it implements the rule from :pep:`440` that a prerelease item
-        SHOULD be accepted if no other versions match the given specifier.
-
-        >>> list(Specifier(">=1.2.3").filter(["1.2", "1.3", "1.5a1"]))
-        ['1.3']
-        >>> list(Specifier(">=1.2.3").filter(["1.2", "1.2.3", "1.3", Version("1.4")]))
-        ['1.2.3', '1.3', <Version('1.4')>]
-        >>> list(Specifier(">=1.2.3").filter(["1.2", "1.5a1"]))
-        ['1.5a1']
-        >>> list(Specifier(">=1.2.3").filter(["1.3", "1.5a1"], prereleases=True))
-        ['1.3', '1.5a1']
-        >>> list(Specifier(">=1.2.3", prereleases=True).filter(["1.3", "1.5a1"]))
-        ['1.3', '1.5a1']
-        """
-
-        yielded = False
-        found_prereleases = []
-
-        kw = {"prereleases": prereleases if prereleases is not None else True}
-
-        # Attempt to iterate over all the values in the iterable and if any of
-        # them match, yield them.
-        for version in iterable:
-            parsed_version = _coerce_version(version)
-
-            if self.contains(parsed_version, **kw):
-                # If our version is a prerelease, and we were not set to allow
-                # prereleases, then we'll store it for later in case nothing
-                # else matches this specifier.
-                if parsed_version.is_prerelease and not (
-                    prereleases or self.prereleases
-                ):
-                    found_prereleases.append(version)
-                # Either this is not a prerelease, or we should have been
-                # accepting prereleases from the beginning.
-                else:
-                    yielded = True
-                    yield version
-
-        # Now that we've iterated over everything, determine if we've yielded
-        # any values, and if we have not and we have any prereleases stored up
-        # then we will go ahead and yield the prereleases.
-        if not yielded and found_prereleases:
-            for version in found_prereleases:
-                yield version
-
-
-_prefix_regex = re.compile(r"^([0-9]+)((?:a|b|c|rc)[0-9]+)$")
-
-
-def _version_split(version: str) -> list[str]:
-    """Split version into components.
-
-    The split components are intended for version comparison. The logic does
-    not attempt to retain the original version string, so joining the
-    components back with :func:`_version_join` may not produce the original
-    version string.
-    """
-    result: list[str] = []
-
-    epoch, _, rest = version.rpartition("!")
-    result.append(epoch or "0")
-
-    for item in rest.split("."):
-        match = _prefix_regex.search(item)
-        if match:
-            result.extend(match.groups())
-        else:
-            result.append(item)
-    return result
-
-
-def _version_join(components: list[str]) -> str:
-    """Join split version components into a version string.
-
-    This function assumes the input came from :func:`_version_split`, where the
-    first component must be the epoch (either empty or numeric), and all other
-    components numeric.
-    """
-    epoch, *rest = components
-    return f"{epoch}!{'.'.join(rest)}"
-
-
-def _is_not_suffix(segment: str) -> bool:
-    return not any(
-        segment.startswith(prefix) for prefix in ("dev", "a", "b", "rc", "post")
-    )
-
-
-def _pad_version(left: list[str], right: list[str]) -> tuple[list[str], list[str]]:
-    left_split, right_split = [], []
-
-    # Get the release segment of our versions
-    left_split.append(list(itertools.takewhile(lambda x: x.isdigit(), left)))
-    right_split.append(list(itertools.takewhile(lambda x: x.isdigit(), right)))
-
-    # Get the rest of our versions
-    left_split.append(left[len(left_split[0]) :])
-    right_split.append(right[len(right_split[0]) :])
-
-    # Insert our padding
-    left_split.insert(1, ["0"] * max(0, len(right_split[0]) - len(left_split[0])))
-    right_split.insert(1, ["0"] * max(0, len(left_split[0]) - len(right_split[0])))
-
-    return (
-        list(itertools.chain.from_iterable(left_split)),
-        list(itertools.chain.from_iterable(right_split)),
-    )
-
-
-class SpecifierSet(BaseSpecifier):
-    """This class abstracts handling of a set of version specifiers.
-
-    It can be passed a single specifier (``>=3.0``), a comma-separated list of
-    specifiers (``>=3.0,!=3.1``), or no specifier at all.
-    """
-
-    def __init__(
-        self,
-        specifiers: str | Iterable[Specifier] = "",
-        prereleases: bool | None = None,
-    ) -> None:
-        """Initialize a SpecifierSet instance.
-
-        :param specifiers:
-            The string representation of a specifier or a comma-separated list of
-            specifiers which will be parsed and normalized before use.
-            May also be an iterable of ``Specifier`` instances, which will be used
-            as is.
-        :param prereleases:
-            This tells the SpecifierSet if it should accept prerelease versions if
-            applicable or not. The default of ``None`` will autodetect it from the
-            given specifiers.
-
-        :raises InvalidSpecifier:
-            If the given ``specifiers`` are not parseable than this exception will be
-            raised.
-        """
-
-        if isinstance(specifiers, str):
-            # Split on `,` to break each individual specifier into its own item, and
-            # strip each item to remove leading/trailing whitespace.
-            split_specifiers = [s.strip() for s in specifiers.split(",") if s.strip()]
-
-            # Make each individual specifier a Specifier and save in a frozen set
-            # for later.
-            self._specs = frozenset(map(Specifier, split_specifiers))
-        else:
-            # Save the supplied specifiers in a frozen set.
-            self._specs = frozenset(specifiers)
-
-        # Store our prereleases value so we can use it later to determine if
-        # we accept prereleases or not.
-        self._prereleases = prereleases
-
-    @property
-    def prereleases(self) -> bool | None:
-        # If we have been given an explicit prerelease modifier, then we'll
-        # pass that through here.
-        if self._prereleases is not None:
-            return self._prereleases
-
-        # If we don't have any specifiers, and we don't have a forced value,
-        # then we'll just return None since we don't know if this should have
-        # pre-releases or not.
-        if not self._specs:
-            return None
-
-        # Otherwise we'll see if any of the given specifiers accept
-        # prereleases, if any of them do we'll return True, otherwise False.
-        return any(s.prereleases for s in self._specs)
-
-    @prereleases.setter
-    def prereleases(self, value: bool) -> None:
-        self._prereleases = value
-
-    def __repr__(self) -> str:
-        """A representation of the specifier set that shows all internal state.
-
-        Note that the ordering of the individual specifiers within the set may not
-        match the input string.
-
-        >>> SpecifierSet('>=1.0.0,!=2.0.0')
-        <SpecifierSet('!=2.0.0,>=1.0.0')>
-        >>> SpecifierSet('>=1.0.0,!=2.0.0', prereleases=False)
-        <SpecifierSet('!=2.0.0,>=1.0.0', prereleases=False)>
-        >>> SpecifierSet('>=1.0.0,!=2.0.0', prereleases=True)
-        <SpecifierSet('!=2.0.0,>=1.0.0', prereleases=True)>
-        """
-        pre = (
-            f", prereleases={self.prereleases!r}"
-            if self._prereleases is not None
-            else ""
-        )
-
-        return f"<SpecifierSet({str(self)!r}{pre})>"
-
-    def __str__(self) -> str:
-        """A string representation of the specifier set that can be round-tripped.
-
-        Note that the ordering of the individual specifiers within the set may not
-        match the input string.
-
-        >>> str(SpecifierSet(">=1.0.0,!=1.0.1"))
-        '!=1.0.1,>=1.0.0'
-        >>> str(SpecifierSet(">=1.0.0,!=1.0.1", prereleases=False))
-        '!=1.0.1,>=1.0.0'
-        """
-        return ",".join(sorted(str(s) for s in self._specs))
-
-    def __hash__(self) -> int:
-        return hash(self._specs)
-
-    def __and__(self, other: SpecifierSet | str) -> SpecifierSet:
-        """Return a SpecifierSet which is a combination of the two sets.
-
-        :param other: The other object to combine with.
-
-        >>> SpecifierSet(">=1.0.0,!=1.0.1") & '<=2.0.0,!=2.0.1'
-        <SpecifierSet('!=1.0.1,!=2.0.1,<=2.0.0,>=1.0.0')>
-        >>> SpecifierSet(">=1.0.0,!=1.0.1") & SpecifierSet('<=2.0.0,!=2.0.1')
-        <SpecifierSet('!=1.0.1,!=2.0.1,<=2.0.0,>=1.0.0')>
-        """
-        if isinstance(other, str):
-            other = SpecifierSet(other)
-        elif not isinstance(other, SpecifierSet):
-            return NotImplemented
-
-        specifier = SpecifierSet()
-        specifier._specs = frozenset(self._specs | other._specs)
-
-        if self._prereleases is None and other._prereleases is not None:
-            specifier._prereleases = other._prereleases
-        elif self._prereleases is not None and other._prereleases is None:
-            specifier._prereleases = self._prereleases
-        elif self._prereleases == other._prereleases:
-            specifier._prereleases = self._prereleases
-        else:
-            raise ValueError(
-                "Cannot combine SpecifierSets with True and False prerelease "
-                "overrides."
-            )
-
-        return specifier
-
-    def __eq__(self, other: object) -> bool:
-        """Whether or not the two SpecifierSet-like objects are equal.
-
-        :param other: The other object to check against.
-
-        The value of :attr:`prereleases` is ignored.
-
-        >>> SpecifierSet(">=1.0.0,!=1.0.1") == SpecifierSet(">=1.0.0,!=1.0.1")
-        True
-        >>> (SpecifierSet(">=1.0.0,!=1.0.1", prereleases=False) ==
-        ...  SpecifierSet(">=1.0.0,!=1.0.1", prereleases=True))
-        True
-        >>> SpecifierSet(">=1.0.0,!=1.0.1") == ">=1.0.0,!=1.0.1"
-        True
-        >>> SpecifierSet(">=1.0.0,!=1.0.1") == SpecifierSet(">=1.0.0")
-        False
-        >>> SpecifierSet(">=1.0.0,!=1.0.1") == SpecifierSet(">=1.0.0,!=1.0.2")
-        False
-        """
-        if isinstance(other, (str, Specifier)):
-            other = SpecifierSet(str(other))
-        elif not isinstance(other, SpecifierSet):
-            return NotImplemented
-
-        return self._specs == other._specs
-
-    def __len__(self) -> int:
-        """Returns the number of specifiers in this specifier set."""
-        return len(self._specs)
-
-    def __iter__(self) -> Iterator[Specifier]:
-        """
-        Returns an iterator over all the underlying :class:`Specifier` instances
-        in this specifier set.
-
-        >>> sorted(SpecifierSet(">=1.0.0,!=1.0.1"), key=str)
-        [<Specifier('!=1.0.1')>, <Specifier('>=1.0.0')>]
-        """
-        return iter(self._specs)
-
-    def __contains__(self, item: UnparsedVersion) -> bool:
-        """Return whether or not the item is contained in this specifier.
-
-        :param item: The item to check for.
-
-        This is used for the ``in`` operator and behaves the same as
-        :meth:`contains` with no ``prereleases`` argument passed.
-
-        >>> "1.2.3" in SpecifierSet(">=1.0.0,!=1.0.1")
-        True
-        >>> Version("1.2.3") in SpecifierSet(">=1.0.0,!=1.0.1")
-        True
-        >>> "1.0.1" in SpecifierSet(">=1.0.0,!=1.0.1")
-        False
-        >>> "1.3.0a1" in SpecifierSet(">=1.0.0,!=1.0.1")
-        False
-        >>> "1.3.0a1" in SpecifierSet(">=1.0.0,!=1.0.1", prereleases=True)
-        True
-        """
-        return self.contains(item)
-
-    def contains(
-        self,
-        item: UnparsedVersion,
-        prereleases: bool | None = None,
-        installed: bool | None = None,
-    ) -> bool:
-        """Return whether or not the item is contained in this SpecifierSet.
-
-        :param item:
-            The item to check for, which can be a version string or a
-            :class:`Version` instance.
-        :param prereleases:
-            Whether or not to match prereleases with this SpecifierSet. If set to
-            ``None`` (the default), it uses :attr:`prereleases` to determine
-            whether or not prereleases are allowed.
-
-        >>> SpecifierSet(">=1.0.0,!=1.0.1").contains("1.2.3")
-        True
-        >>> SpecifierSet(">=1.0.0,!=1.0.1").contains(Version("1.2.3"))
-        True
-        >>> SpecifierSet(">=1.0.0,!=1.0.1").contains("1.0.1")
-        False
-        >>> SpecifierSet(">=1.0.0,!=1.0.1").contains("1.3.0a1")
-        False
-        >>> SpecifierSet(">=1.0.0,!=1.0.1", prereleases=True).contains("1.3.0a1")
-        True
-        >>> SpecifierSet(">=1.0.0,!=1.0.1").contains("1.3.0a1", prereleases=True)
-        True
-        """
-        # Ensure that our item is a Version instance.
-        if not isinstance(item, Version):
-            item = Version(item)
-
-        # Determine if we're forcing a prerelease or not, if we're not forcing
-        # one for this particular filter call, then we'll use whatever the
-        # SpecifierSet thinks for whether or not we should support prereleases.
-        if prereleases is None:
-            prereleases = self.prereleases
-
-        # We can determine if we're going to allow pre-releases by looking to
-        # see if any of the underlying items supports them. If none of them do
-        # and this item is a pre-release then we do not allow it and we can
-        # short circuit that here.
-        # Note: This means that 1.0.dev1 would not be contained in something
-        #       like >=1.0.devabc however it would be in >=1.0.debabc,>0.0.dev0
-        if not prereleases and item.is_prerelease:
-            return False
-
-        if installed and item.is_prerelease:
-            item = Version(item.base_version)
-
-        # We simply dispatch to the underlying specs here to make sure that the
-        # given version is contained within all of them.
-        # Note: This use of all() here means that an empty set of specifiers
-        #       will always return True, this is an explicit design decision.
-        return all(s.contains(item, prereleases=prereleases) for s in self._specs)
-
-    def filter(
-        self, iterable: Iterable[UnparsedVersionVar], prereleases: bool | None = None
-    ) -> Iterator[UnparsedVersionVar]:
-        """Filter items in the given iterable, that match the specifiers in this set.
-
-        :param iterable:
-            An iterable that can contain version strings and :class:`Version` instances.
-            The items in the iterable will be filtered according to the specifier.
-        :param prereleases:
-            Whether or not to allow prereleases in the returned iterator. If set to
-            ``None`` (the default), it will be intelligently decide whether to allow
-            prereleases or not (based on the :attr:`prereleases` attribute, and
-            whether the only versions matching are prereleases).
-
-        This method is smarter than just ``filter(SpecifierSet(...).contains, [...])``
-        because it implements the rule from :pep:`440` that a prerelease item
-        SHOULD be accepted if no other versions match the given specifier.
-
-        >>> list(SpecifierSet(">=1.2.3").filter(["1.2", "1.3", "1.5a1"]))
-        ['1.3']
-        >>> list(SpecifierSet(">=1.2.3").filter(["1.2", "1.3", Version("1.4")]))
-        ['1.3', <Version('1.4')>]
-        >>> list(SpecifierSet(">=1.2.3").filter(["1.2", "1.5a1"]))
-        []
-        >>> list(SpecifierSet(">=1.2.3").filter(["1.3", "1.5a1"], prereleases=True))
-        ['1.3', '1.5a1']
-        >>> list(SpecifierSet(">=1.2.3", prereleases=True).filter(["1.3", "1.5a1"]))
-        ['1.3', '1.5a1']
-
-        An "empty" SpecifierSet will filter items based on the presence of prerelease
-        versions in the set.
-
-        >>> list(SpecifierSet("").filter(["1.3", "1.5a1"]))
-        ['1.3']
-        >>> list(SpecifierSet("").filter(["1.5a1"]))
-        ['1.5a1']
-        >>> list(SpecifierSet("", prereleases=True).filter(["1.3", "1.5a1"]))
-        ['1.3', '1.5a1']
-        >>> list(SpecifierSet("").filter(["1.3", "1.5a1"], prereleases=True))
-        ['1.3', '1.5a1']
-        """
-        # Determine if we're forcing a prerelease or not, if we're not forcing
-        # one for this particular filter call, then we'll use whatever the
-        # SpecifierSet thinks for whether or not we should support prereleases.
-        if prereleases is None:
-            prereleases = self.prereleases
-
-        # If we have any specifiers, then we want to wrap our iterable in the
-        # filter method for each one, this will act as a logical AND amongst
-        # each specifier.
-        if self._specs:
-            for spec in self._specs:
-                iterable = spec.filter(iterable, prereleases=bool(prereleases))
-            return iter(iterable)
-        # If we do not have any specifiers, then we need to have a rough filter
-        # which will filter out any pre-releases, unless there are no final
-        # releases.
-        else:
-            filtered: list[UnparsedVersionVar] = []
-            found_prereleases: list[UnparsedVersionVar] = []
-
-            for item in iterable:
-                parsed_version = _coerce_version(item)
-
-                # Store any item which is a pre-release for later unless we've
-                # already found a final version or we are accepting prereleases
-                if parsed_version.is_prerelease and not prereleases:
-                    if not filtered:
-                        found_prereleases.append(item)
-                else:
-                    filtered.append(item)
-
-            # If we've found no items except for pre-releases, then we'll go
-            # ahead and use the pre-releases
-            if not filtered and found_prereleases and prereleases is None:
-                return iter(found_prereleases)
-
-            return iter(filtered)
diff --git a/lib/packaging/tags.py b/lib/packaging/tags.py
deleted file mode 100644
index f5903402..00000000
--- a/lib/packaging/tags.py
+++ /dev/null
@@ -1,617 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-
-from __future__ import annotations
-
-import logging
-import platform
-import re
-import struct
-import subprocess
-import sys
-import sysconfig
-from importlib.machinery import EXTENSION_SUFFIXES
-from typing import (
-    Iterable,
-    Iterator,
-    Sequence,
-    Tuple,
-    cast,
-)
-
-from . import _manylinux, _musllinux
-
-logger = logging.getLogger(__name__)
-
-PythonVersion = Sequence[int]
-AppleVersion = Tuple[int, int]
-
-INTERPRETER_SHORT_NAMES: dict[str, str] = {
-    "python": "py",  # Generic.
-    "cpython": "cp",
-    "pypy": "pp",
-    "ironpython": "ip",
-    "jython": "jy",
-}
-
-
-_32_BIT_INTERPRETER = struct.calcsize("P") == 4
-
-
-class Tag:
-    """
-    A representation of the tag triple for a wheel.
-
-    Instances are considered immutable and thus are hashable. Equality checking
-    is also supported.
-    """
-
-    __slots__ = ["_abi", "_hash", "_interpreter", "_platform"]
-
-    def __init__(self, interpreter: str, abi: str, platform: str) -> None:
-        self._interpreter = interpreter.lower()
-        self._abi = abi.lower()
-        self._platform = platform.lower()
-        # The __hash__ of every single element in a Set[Tag] will be evaluated each time
-        # that a set calls its `.disjoint()` method, which may be called hundreds of
-        # times when scanning a page of links for packages with tags matching that
-        # Set[Tag]. Pre-computing the value here produces significant speedups for
-        # downstream consumers.
-        self._hash = hash((self._interpreter, self._abi, self._platform))
-
-    @property
-    def interpreter(self) -> str:
-        return self._interpreter
-
-    @property
-    def abi(self) -> str:
-        return self._abi
-
-    @property
-    def platform(self) -> str:
-        return self._platform
-
-    def __eq__(self, other: object) -> bool:
-        if not isinstance(other, Tag):
-            return NotImplemented
-
-        return (
-            (self._hash == other._hash)  # Short-circuit ASAP for perf reasons.
-            and (self._platform == other._platform)
-            and (self._abi == other._abi)
-            and (self._interpreter == other._interpreter)
-        )
-
-    def __hash__(self) -> int:
-        return self._hash
-
-    def __str__(self) -> str:
-        return f"{self._interpreter}-{self._abi}-{self._platform}"
-
-    def __repr__(self) -> str:
-        return f"<{self} @ {id(self)}>"
-
-
-def parse_tag(tag: str) -> frozenset[Tag]:
-    """
-    Parses the provided tag (e.g. `py3-none-any`) into a frozenset of Tag instances.
-
-    Returning a set is required due to the possibility that the tag is a
-    compressed tag set.
-    """
-    tags = set()
-    interpreters, abis, platforms = tag.split("-")
-    for interpreter in interpreters.split("."):
-        for abi in abis.split("."):
-            for platform_ in platforms.split("."):
-                tags.add(Tag(interpreter, abi, platform_))
-    return frozenset(tags)
-
-
-def _get_config_var(name: str, warn: bool = False) -> int | str | None:
-    value: int | str | None = sysconfig.get_config_var(name)
-    if value is None and warn:
-        logger.debug(
-            "Config variable '%s' is unset, Python ABI tag may be incorrect", name
-        )
-    return value
-
-
-def _normalize_string(string: str) -> str:
-    return string.replace(".", "_").replace("-", "_").replace(" ", "_")
-
-
-def _is_threaded_cpython(abis: list[str]) -> bool:
-    """
-    Determine if the ABI corresponds to a threaded (`--disable-gil`) build.
-
-    The threaded builds are indicated by a "t" in the abiflags.
-    """
-    if len(abis) == 0:
-        return False
-    # expect e.g., cp313
-    m = re.match(r"cp\d+(.*)", abis[0])
-    if not m:
-        return False
-    abiflags = m.group(1)
-    return "t" in abiflags
-
-
-def _abi3_applies(python_version: PythonVersion, threading: bool) -> bool:
-    """
-    Determine if the Python version supports abi3.
-
-    PEP 384 was first implemented in Python 3.2. The threaded (`--disable-gil`)
-    builds do not support abi3.
-    """
-    return len(python_version) > 1 and tuple(python_version) >= (3, 2) and not threading
-
-
-def _cpython_abis(py_version: PythonVersion, warn: bool = False) -> list[str]:
-    py_version = tuple(py_version)  # To allow for version comparison.
-    abis = []
-    version = _version_nodot(py_version[:2])
-    threading = debug = pymalloc = ucs4 = ""
-    with_debug = _get_config_var("Py_DEBUG", warn)
-    has_refcount = hasattr(sys, "gettotalrefcount")
-    # Windows doesn't set Py_DEBUG, so checking for support of debug-compiled
-    # extension modules is the best option.
-    # https://github.com/pypa/pip/issues/3383#issuecomment-173267692
-    has_ext = "_d.pyd" in EXTENSION_SUFFIXES
-    if with_debug or (with_debug is None and (has_refcount or has_ext)):
-        debug = "d"
-    if py_version >= (3, 13) and _get_config_var("Py_GIL_DISABLED", warn):
-        threading = "t"
-    if py_version < (3, 8):
-        with_pymalloc = _get_config_var("WITH_PYMALLOC", warn)
-        if with_pymalloc or with_pymalloc is None:
-            pymalloc = "m"
-        if py_version < (3, 3):
-            unicode_size = _get_config_var("Py_UNICODE_SIZE", warn)
-            if unicode_size == 4 or (
-                unicode_size is None and sys.maxunicode == 0x10FFFF
-            ):
-                ucs4 = "u"
-    elif debug:
-        # Debug builds can also load "normal" extension modules.
-        # We can also assume no UCS-4 or pymalloc requirement.
-        abis.append(f"cp{version}{threading}")
-    abis.insert(0, f"cp{version}{threading}{debug}{pymalloc}{ucs4}")
-    return abis
-
-
-def cpython_tags(
-    python_version: PythonVersion | None = None,
-    abis: Iterable[str] | None = None,
-    platforms: Iterable[str] | None = None,
-    *,
-    warn: bool = False,
-) -> Iterator[Tag]:
-    """
-    Yields the tags for a CPython interpreter.
-
-    The tags consist of:
-    - cp<python_version>-<abi>-<platform>
-    - cp<python_version>-abi3-<platform>
-    - cp<python_version>-none-<platform>
-    - cp<less than python_version>-abi3-<platform>  # Older Python versions down to 3.2.
-
-    If python_version only specifies a major version then user-provided ABIs and
-    the 'none' ABItag will be used.
-
-    If 'abi3' or 'none' are specified in 'abis' then they will be yielded at
-    their normal position and not at the beginning.
-    """
-    if not python_version:
-        python_version = sys.version_info[:2]
-
-    interpreter = f"cp{_version_nodot(python_version[:2])}"
-
-    if abis is None:
-        if len(python_version) > 1:
-            abis = _cpython_abis(python_version, warn)
-        else:
-            abis = []
-    abis = list(abis)
-    # 'abi3' and 'none' are explicitly handled later.
-    for explicit_abi in ("abi3", "none"):
-        try:
-            abis.remove(explicit_abi)
-        except ValueError:
-            pass
-
-    platforms = list(platforms or platform_tags())
-    for abi in abis:
-        for platform_ in platforms:
-            yield Tag(interpreter, abi, platform_)
-
-    threading = _is_threaded_cpython(abis)
-    use_abi3 = _abi3_applies(python_version, threading)
-    if use_abi3:
-        yield from (Tag(interpreter, "abi3", platform_) for platform_ in platforms)
-    yield from (Tag(interpreter, "none", platform_) for platform_ in platforms)
-
-    if use_abi3:
-        for minor_version in range(python_version[1] - 1, 1, -1):
-            for platform_ in platforms:
-                version = _version_nodot((python_version[0], minor_version))
-                interpreter = f"cp{version}"
-                yield Tag(interpreter, "abi3", platform_)
-
-
-def _generic_abi() -> list[str]:
-    """
-    Return the ABI tag based on EXT_SUFFIX.
-    """
-    # The following are examples of `EXT_SUFFIX`.
-    # We want to keep the parts which are related to the ABI and remove the
-    # parts which are related to the platform:
-    # - linux:   '.cpython-310-x86_64-linux-gnu.so' => cp310
-    # - mac:     '.cpython-310-darwin.so'           => cp310
-    # - win:     '.cp310-win_amd64.pyd'             => cp310
-    # - win:     '.pyd'                             => cp37 (uses _cpython_abis())
-    # - pypy:    '.pypy38-pp73-x86_64-linux-gnu.so' => pypy38_pp73
-    # - graalpy: '.graalpy-38-native-x86_64-darwin.dylib'
-    #                                               => graalpy_38_native
-
-    ext_suffix = _get_config_var("EXT_SUFFIX", warn=True)
-    if not isinstance(ext_suffix, str) or ext_suffix[0] != ".":
-        raise SystemError("invalid sysconfig.get_config_var('EXT_SUFFIX')")
-    parts = ext_suffix.split(".")
-    if len(parts) < 3:
-        # CPython3.7 and earlier uses ".pyd" on Windows.
-        return _cpython_abis(sys.version_info[:2])
-    soabi = parts[1]
-    if soabi.startswith("cpython"):
-        # non-windows
-        abi = "cp" + soabi.split("-")[1]
-    elif soabi.startswith("cp"):
-        # windows
-        abi = soabi.split("-")[0]
-    elif soabi.startswith("pypy"):
-        abi = "-".join(soabi.split("-")[:2])
-    elif soabi.startswith("graalpy"):
-        abi = "-".join(soabi.split("-")[:3])
-    elif soabi:
-        # pyston, ironpython, others?
-        abi = soabi
-    else:
-        return []
-    return [_normalize_string(abi)]
-
-
-def generic_tags(
-    interpreter: str | None = None,
-    abis: Iterable[str] | None = None,
-    platforms: Iterable[str] | None = None,
-    *,
-    warn: bool = False,
-) -> Iterator[Tag]:
-    """
-    Yields the tags for a generic interpreter.
-
-    The tags consist of:
-    - <interpreter>-<abi>-<platform>
-
-    The "none" ABI will be added if it was not explicitly provided.
-    """
-    if not interpreter:
-        interp_name = interpreter_name()
-        interp_version = interpreter_version(warn=warn)
-        interpreter = "".join([interp_name, interp_version])
-    if abis is None:
-        abis = _generic_abi()
-    else:
-        abis = list(abis)
-    platforms = list(platforms or platform_tags())
-    if "none" not in abis:
-        abis.append("none")
-    for abi in abis:
-        for platform_ in platforms:
-            yield Tag(interpreter, abi, platform_)
-
-
-def _py_interpreter_range(py_version: PythonVersion) -> Iterator[str]:
-    """
-    Yields Python versions in descending order.
-
-    After the latest version, the major-only version will be yielded, and then
-    all previous versions of that major version.
-    """
-    if len(py_version) > 1:
-        yield f"py{_version_nodot(py_version[:2])}"
-    yield f"py{py_version[0]}"
-    if len(py_version) > 1:
-        for minor in range(py_version[1] - 1, -1, -1):
-            yield f"py{_version_nodot((py_version[0], minor))}"
-
-
-def compatible_tags(
-    python_version: PythonVersion | None = None,
-    interpreter: str | None = None,
-    platforms: Iterable[str] | None = None,
-) -> Iterator[Tag]:
-    """
-    Yields the sequence of tags that are compatible with a specific version of Python.
-
-    The tags consist of:
-    - py*-none-<platform>
-    - <interpreter>-none-any  # ... if `interpreter` is provided.
-    - py*-none-any
-    """
-    if not python_version:
-        python_version = sys.version_info[:2]
-    platforms = list(platforms or platform_tags())
-    for version in _py_interpreter_range(python_version):
-        for platform_ in platforms:
-            yield Tag(version, "none", platform_)
-    if interpreter:
-        yield Tag(interpreter, "none", "any")
-    for version in _py_interpreter_range(python_version):
-        yield Tag(version, "none", "any")
-
-
-def _mac_arch(arch: str, is_32bit: bool = _32_BIT_INTERPRETER) -> str:
-    if not is_32bit:
-        return arch
-
-    if arch.startswith("ppc"):
-        return "ppc"
-
-    return "i386"
-
-
-def _mac_binary_formats(version: AppleVersion, cpu_arch: str) -> list[str]:
-    formats = [cpu_arch]
-    if cpu_arch == "x86_64":
-        if version < (10, 4):
-            return []
-        formats.extend(["intel", "fat64", "fat32"])
-
-    elif cpu_arch == "i386":
-        if version < (10, 4):
-            return []
-        formats.extend(["intel", "fat32", "fat"])
-
-    elif cpu_arch == "ppc64":
-        # TODO: Need to care about 32-bit PPC for ppc64 through 10.2?
-        if version > (10, 5) or version < (10, 4):
-            return []
-        formats.append("fat64")
-
-    elif cpu_arch == "ppc":
-        if version > (10, 6):
-            return []
-        formats.extend(["fat32", "fat"])
-
-    if cpu_arch in {"arm64", "x86_64"}:
-        formats.append("universal2")
-
-    if cpu_arch in {"x86_64", "i386", "ppc64", "ppc", "intel"}:
-        formats.append("universal")
-
-    return formats
-
-
-def mac_platforms(
-    version: AppleVersion | None = None, arch: str | None = None
-) -> Iterator[str]:
-    """
-    Yields the platform tags for a macOS system.
-
-    The `version` parameter is a two-item tuple specifying the macOS version to
-    generate platform tags for. The `arch` parameter is the CPU architecture to
-    generate platform tags for. Both parameters default to the appropriate value
-    for the current system.
-    """
-    version_str, _, cpu_arch = platform.mac_ver()
-    if version is None:
-        version = cast("AppleVersion", tuple(map(int, version_str.split(".")[:2])))
-        if version == (10, 16):
-            # When built against an older macOS SDK, Python will report macOS 10.16
-            # instead of the real version.
-            version_str = subprocess.run(
-                [
-                    sys.executable,
-                    "-sS",
-                    "-c",
-                    "import platform; print(platform.mac_ver()[0])",
-                ],
-                check=True,
-                env={"SYSTEM_VERSION_COMPAT": "0"},
-                stdout=subprocess.PIPE,
-                text=True,
-            ).stdout
-            version = cast("AppleVersion", tuple(map(int, version_str.split(".")[:2])))
-    else:
-        version = version
-    if arch is None:
-        arch = _mac_arch(cpu_arch)
-    else:
-        arch = arch
-
-    if (10, 0) <= version and version < (11, 0):
-        # Prior to Mac OS 11, each yearly release of Mac OS bumped the
-        # "minor" version number.  The major version was always 10.
-        major_version = 10
-        for minor_version in range(version[1], -1, -1):
-            compat_version = major_version, minor_version
-            binary_formats = _mac_binary_formats(compat_version, arch)
-            for binary_format in binary_formats:
-                yield f"macosx_{major_version}_{minor_version}_{binary_format}"
-
-    if version >= (11, 0):
-        # Starting with Mac OS 11, each yearly release bumps the major version
-        # number.   The minor versions are now the midyear updates.
-        minor_version = 0
-        for major_version in range(version[0], 10, -1):
-            compat_version = major_version, minor_version
-            binary_formats = _mac_binary_formats(compat_version, arch)
-            for binary_format in binary_formats:
-                yield f"macosx_{major_version}_{minor_version}_{binary_format}"
-
-    if version >= (11, 0):
-        # Mac OS 11 on x86_64 is compatible with binaries from previous releases.
-        # Arm64 support was introduced in 11.0, so no Arm binaries from previous
-        # releases exist.
-        #
-        # However, the "universal2" binary format can have a
-        # macOS version earlier than 11.0 when the x86_64 part of the binary supports
-        # that version of macOS.
-        major_version = 10
-        if arch == "x86_64":
-            for minor_version in range(16, 3, -1):
-                compat_version = major_version, minor_version
-                binary_formats = _mac_binary_formats(compat_version, arch)
-                for binary_format in binary_formats:
-                    yield f"macosx_{major_version}_{minor_version}_{binary_format}"
-        else:
-            for minor_version in range(16, 3, -1):
-                compat_version = major_version, minor_version
-                binary_format = "universal2"
-                yield f"macosx_{major_version}_{minor_version}_{binary_format}"
-
-
-def ios_platforms(
-    version: AppleVersion | None = None, multiarch: str | None = None
-) -> Iterator[str]:
-    """
-    Yields the platform tags for an iOS system.
-
-    :param version: A two-item tuple specifying the iOS version to generate
-        platform tags for. Defaults to the current iOS version.
-    :param multiarch: The CPU architecture+ABI to generate platform tags for -
-        (the value used by `sys.implementation._multiarch` e.g.,
-        `arm64_iphoneos` or `x84_64_iphonesimulator`). Defaults to the current
-        multiarch value.
-    """
-    if version is None:
-        # if iOS is the current platform, ios_ver *must* be defined. However,
-        # it won't exist for CPython versions before 3.13, which causes a mypy
-        # error.
-        _, release, _, _ = platform.ios_ver()  # type: ignore[attr-defined, unused-ignore]
-        version = cast("AppleVersion", tuple(map(int, release.split(".")[:2])))
-
-    if multiarch is None:
-        multiarch = sys.implementation._multiarch
-    multiarch = multiarch.replace("-", "_")
-
-    ios_platform_template = "ios_{major}_{minor}_{multiarch}"
-
-    # Consider any iOS major.minor version from the version requested, down to
-    # 12.0. 12.0 is the first iOS version that is known to have enough features
-    # to support CPython. Consider every possible minor release up to X.9. There
-    # highest the minor has ever gone is 8 (14.8 and 15.8) but having some extra
-    # candidates that won't ever match doesn't really hurt, and it saves us from
-    # having to keep an explicit list of known iOS versions in the code. Return
-    # the results descending order of version number.
-
-    # If the requested major version is less than 12, there won't be any matches.
-    if version[0] < 12:
-        return
-
-    # Consider the actual X.Y version that was requested.
-    yield ios_platform_template.format(
-        major=version[0], minor=version[1], multiarch=multiarch
-    )
-
-    # Consider every minor version from X.0 to the minor version prior to the
-    # version requested by the platform.
-    for minor in range(version[1] - 1, -1, -1):
-        yield ios_platform_template.format(
-            major=version[0], minor=minor, multiarch=multiarch
-        )
-
-    for major in range(version[0] - 1, 11, -1):
-        for minor in range(9, -1, -1):
-            yield ios_platform_template.format(
-                major=major, minor=minor, multiarch=multiarch
-            )
-
-
-def _linux_platforms(is_32bit: bool = _32_BIT_INTERPRETER) -> Iterator[str]:
-    linux = _normalize_string(sysconfig.get_platform())
-    if not linux.startswith("linux_"):
-        # we should never be here, just yield the sysconfig one and return
-        yield linux
-        return
-    if is_32bit:
-        if linux == "linux_x86_64":
-            linux = "linux_i686"
-        elif linux == "linux_aarch64":
-            linux = "linux_armv8l"
-    _, arch = linux.split("_", 1)
-    archs = {"armv8l": ["armv8l", "armv7l"]}.get(arch, [arch])
-    yield from _manylinux.platform_tags(archs)
-    yield from _musllinux.platform_tags(archs)
-    for arch in archs:
-        yield f"linux_{arch}"
-
-
-def _generic_platforms() -> Iterator[str]:
-    yield _normalize_string(sysconfig.get_platform())
-
-
-def platform_tags() -> Iterator[str]:
-    """
-    Provides the platform tags for this installation.
-    """
-    if platform.system() == "Darwin":
-        return mac_platforms()
-    elif platform.system() == "iOS":
-        return ios_platforms()
-    elif platform.system() == "Linux":
-        return _linux_platforms()
-    else:
-        return _generic_platforms()
-
-
-def interpreter_name() -> str:
-    """
-    Returns the name of the running interpreter.
-
-    Some implementations have a reserved, two-letter abbreviation which will
-    be returned when appropriate.
-    """
-    name = sys.implementation.name
-    return INTERPRETER_SHORT_NAMES.get(name) or name
-
-
-def interpreter_version(*, warn: bool = False) -> str:
-    """
-    Returns the version of the running interpreter.
-    """
-    version = _get_config_var("py_version_nodot", warn=warn)
-    if version:
-        version = str(version)
-    else:
-        version = _version_nodot(sys.version_info[:2])
-    return version
-
-
-def _version_nodot(version: PythonVersion) -> str:
-    return "".join(map(str, version))
-
-
-def sys_tags(*, warn: bool = False) -> Iterator[Tag]:
-    """
-    Returns the sequence of tag triples for the running interpreter.
-
-    The order of the sequence corresponds to priority order for the
-    interpreter, from most to least important.
-    """
-
-    interp_name = interpreter_name()
-    if interp_name == "cp":
-        yield from cpython_tags(warn=warn)
-    else:
-        yield from generic_tags()
-
-    if interp_name == "pp":
-        interp = "pp3"
-    elif interp_name == "cp":
-        interp = "cp" + interpreter_version(warn=warn)
-    else:
-        interp = None
-    yield from compatible_tags(interpreter=interp)
diff --git a/lib/packaging/utils.py b/lib/packaging/utils.py
deleted file mode 100644
index 23450953..00000000
--- a/lib/packaging/utils.py
+++ /dev/null
@@ -1,163 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-
-from __future__ import annotations
-
-import functools
-import re
-from typing import NewType, Tuple, Union, cast
-
-from .tags import Tag, parse_tag
-from .version import InvalidVersion, Version, _TrimmedRelease
-
-BuildTag = Union[Tuple[()], Tuple[int, str]]
-NormalizedName = NewType("NormalizedName", str)
-
-
-class InvalidName(ValueError):
-    """
-    An invalid distribution name; users should refer to the packaging user guide.
-    """
-
-
-class InvalidWheelFilename(ValueError):
-    """
-    An invalid wheel filename was found, users should refer to PEP 427.
-    """
-
-
-class InvalidSdistFilename(ValueError):
-    """
-    An invalid sdist filename was found, users should refer to the packaging user guide.
-    """
-
-
-# Core metadata spec for `Name`
-_validate_regex = re.compile(
-    r"^([A-Z0-9]|[A-Z0-9][A-Z0-9._-]*[A-Z0-9])$", re.IGNORECASE
-)
-_canonicalize_regex = re.compile(r"[-_.]+")
-_normalized_regex = re.compile(r"^([a-z0-9]|[a-z0-9]([a-z0-9-](?!--))*[a-z0-9])$")
-# PEP 427: The build number must start with a digit.
-_build_tag_regex = re.compile(r"(\d+)(.*)")
-
-
-def canonicalize_name(name: str, *, validate: bool = False) -> NormalizedName:
-    if validate and not _validate_regex.match(name):
-        raise InvalidName(f"name is invalid: {name!r}")
-    # This is taken from PEP 503.
-    value = _canonicalize_regex.sub("-", name).lower()
-    return cast(NormalizedName, value)
-
-
-def is_normalized_name(name: str) -> bool:
-    return _normalized_regex.match(name) is not None
-
-
-@functools.singledispatch
-def canonicalize_version(
-    version: Version | str, *, strip_trailing_zero: bool = True
-) -> str:
-    """
-    Return a canonical form of a version as a string.
-
-    >>> canonicalize_version('1.0.1')
-    '1.0.1'
-
-    Per PEP 625, versions may have multiple canonical forms, differing
-    only by trailing zeros.
-
-    >>> canonicalize_version('1.0.0')
-    '1'
-    >>> canonicalize_version('1.0.0', strip_trailing_zero=False)
-    '1.0.0'
-
-    Invalid versions are returned unaltered.
-
-    >>> canonicalize_version('foo bar baz')
-    'foo bar baz'
-    """
-    return str(_TrimmedRelease(str(version)) if strip_trailing_zero else version)
-
-
-@canonicalize_version.register
-def _(version: str, *, strip_trailing_zero: bool = True) -> str:
-    try:
-        parsed = Version(version)
-    except InvalidVersion:
-        # Legacy versions cannot be normalized
-        return version
-    return canonicalize_version(parsed, strip_trailing_zero=strip_trailing_zero)
-
-
-def parse_wheel_filename(
-    filename: str,
-) -> tuple[NormalizedName, Version, BuildTag, frozenset[Tag]]:
-    if not filename.endswith(".whl"):
-        raise InvalidWheelFilename(
-            f"Invalid wheel filename (extension must be '.whl'): {filename!r}"
-        )
-
-    filename = filename[:-4]
-    dashes = filename.count("-")
-    if dashes not in (4, 5):
-        raise InvalidWheelFilename(
-            f"Invalid wheel filename (wrong number of parts): {filename!r}"
-        )
-
-    parts = filename.split("-", dashes - 2)
-    name_part = parts[0]
-    # See PEP 427 for the rules on escaping the project name.
-    if "__" in name_part or re.match(r"^[\w\d._]*$", name_part, re.UNICODE) is None:
-        raise InvalidWheelFilename(f"Invalid project name: {filename!r}")
-    name = canonicalize_name(name_part)
-
-    try:
-        version = Version(parts[1])
-    except InvalidVersion as e:
-        raise InvalidWheelFilename(
-            f"Invalid wheel filename (invalid version): {filename!r}"
-        ) from e
-
-    if dashes == 5:
-        build_part = parts[2]
-        build_match = _build_tag_regex.match(build_part)
-        if build_match is None:
-            raise InvalidWheelFilename(
-                f"Invalid build number: {build_part} in {filename!r}"
-            )
-        build = cast(BuildTag, (int(build_match.group(1)), build_match.group(2)))
-    else:
-        build = ()
-    tags = parse_tag(parts[-1])
-    return (name, version, build, tags)
-
-
-def parse_sdist_filename(filename: str) -> tuple[NormalizedName, Version]:
-    if filename.endswith(".tar.gz"):
-        file_stem = filename[: -len(".tar.gz")]
-    elif filename.endswith(".zip"):
-        file_stem = filename[: -len(".zip")]
-    else:
-        raise InvalidSdistFilename(
-            f"Invalid sdist filename (extension must be '.tar.gz' or '.zip'):"
-            f" {filename!r}"
-        )
-
-    # We are requiring a PEP 440 version, which cannot contain dashes,
-    # so we split on the last dash.
-    name_part, sep, version_part = file_stem.rpartition("-")
-    if not sep:
-        raise InvalidSdistFilename(f"Invalid sdist filename: {filename!r}")
-
-    name = canonicalize_name(name_part)
-
-    try:
-        version = Version(version_part)
-    except InvalidVersion as e:
-        raise InvalidSdistFilename(
-            f"Invalid sdist filename (invalid version): {filename!r}"
-        ) from e
-
-    return (name, version)
diff --git a/lib/packaging/version.py b/lib/packaging/version.py
deleted file mode 100644
index c9bbda20..00000000
--- a/lib/packaging/version.py
+++ /dev/null
@@ -1,582 +0,0 @@
-# This file is dual licensed under the terms of the Apache License, Version
-# 2.0, and the BSD License. See the LICENSE file in the root of this repository
-# for complete details.
-"""
-.. testsetup::
-
-    from packaging.version import parse, Version
-"""
-
-from __future__ import annotations
-
-import itertools
-import re
-from typing import Any, Callable, NamedTuple, SupportsInt, Tuple, Union
-
-from ._structures import Infinity, InfinityType, NegativeInfinity, NegativeInfinityType
-
-__all__ = ["VERSION_PATTERN", "InvalidVersion", "Version", "parse"]
-
-LocalType = Tuple[Union[int, str], ...]
-
-CmpPrePostDevType = Union[InfinityType, NegativeInfinityType, Tuple[str, int]]
-CmpLocalType = Union[
-    NegativeInfinityType,
-    Tuple[Union[Tuple[int, str], Tuple[NegativeInfinityType, Union[int, str]]], ...],
-]
-CmpKey = Tuple[
-    int,
-    Tuple[int, ...],
-    CmpPrePostDevType,
-    CmpPrePostDevType,
-    CmpPrePostDevType,
-    CmpLocalType,
-]
-VersionComparisonMethod = Callable[[CmpKey, CmpKey], bool]
-
-
-class _Version(NamedTuple):
-    epoch: int
-    release: tuple[int, ...]
-    dev: tuple[str, int] | None
-    pre: tuple[str, int] | None
-    post: tuple[str, int] | None
-    local: LocalType | None
-
-
-def parse(version: str) -> Version:
-    """Parse the given version string.
-
-    >>> parse('1.0.dev1')
-    <Version('1.0.dev1')>
-
-    :param version: The version string to parse.
-    :raises InvalidVersion: When the version string is not a valid version.
-    """
-    return Version(version)
-
-
-class InvalidVersion(ValueError):
-    """Raised when a version string is not a valid version.
-
-    >>> Version("invalid")
-    Traceback (most recent call last):
-        ...
-    packaging.version.InvalidVersion: Invalid version: 'invalid'
-    """
-
-
-class _BaseVersion:
-    _key: tuple[Any, ...]
-
-    def __hash__(self) -> int:
-        return hash(self._key)
-
-    # Please keep the duplicated `isinstance` check
-    # in the six comparisons hereunder
-    # unless you find a way to avoid adding overhead function calls.
-    def __lt__(self, other: _BaseVersion) -> bool:
-        if not isinstance(other, _BaseVersion):
-            return NotImplemented
-
-        return self._key < other._key
-
-    def __le__(self, other: _BaseVersion) -> bool:
-        if not isinstance(other, _BaseVersion):
-            return NotImplemented
-
-        return self._key <= other._key
-
-    def __eq__(self, other: object) -> bool:
-        if not isinstance(other, _BaseVersion):
-            return NotImplemented
-
-        return self._key == other._key
-
-    def __ge__(self, other: _BaseVersion) -> bool:
-        if not isinstance(other, _BaseVersion):
-            return NotImplemented
-
-        return self._key >= other._key
-
-    def __gt__(self, other: _BaseVersion) -> bool:
-        if not isinstance(other, _BaseVersion):
-            return NotImplemented
-
-        return self._key > other._key
-
-    def __ne__(self, other: object) -> bool:
-        if not isinstance(other, _BaseVersion):
-            return NotImplemented
-
-        return self._key != other._key
-
-
-# Deliberately not anchored to the start and end of the string, to make it
-# easier for 3rd party code to reuse
-_VERSION_PATTERN = r"""
-    v?
-    (?:
-        (?:(?P<epoch>[0-9]+)!)?                           # epoch
-        (?P<release>[0-9]+(?:\.[0-9]+)*)                  # release segment
-        (?P<pre>                                          # pre-release
-            [-_\.]?
-            (?P<pre_l>alpha|a|beta|b|preview|pre|c|rc)
-            [-_\.]?
-            (?P<pre_n>[0-9]+)?
-        )?
-        (?P<post>                                         # post release
-            (?:-(?P<post_n1>[0-9]+))
-            |
-            (?:
-                [-_\.]?
-                (?P<post_l>post|rev|r)
-                [-_\.]?
-                (?P<post_n2>[0-9]+)?
-            )
-        )?
-        (?P<dev>                                          # dev release
-            [-_\.]?
-            (?P<dev_l>dev)
-            [-_\.]?
-            (?P<dev_n>[0-9]+)?
-        )?
-    )
-    (?:\+(?P<local>[a-z0-9]+(?:[-_\.][a-z0-9]+)*))?       # local version
-"""
-
-VERSION_PATTERN = _VERSION_PATTERN
-"""
-A string containing the regular expression used to match a valid version.
-
-The pattern is not anchored at either end, and is intended for embedding in larger
-expressions (for example, matching a version number as part of a file name). The
-regular expression should be compiled with the ``re.VERBOSE`` and ``re.IGNORECASE``
-flags set.
-
-:meta hide-value:
-"""
-
-
-class Version(_BaseVersion):
-    """This class abstracts handling of a project's versions.
-
-    A :class:`Version` instance is comparison aware and can be compared and
-    sorted using the standard Python interfaces.
-
-    >>> v1 = Version("1.0a5")
-    >>> v2 = Version("1.0")
-    >>> v1
-    <Version('1.0a5')>
-    >>> v2
-    <Version('1.0')>
-    >>> v1 < v2
-    True
-    >>> v1 == v2
-    False
-    >>> v1 > v2
-    False
-    >>> v1 >= v2
-    False
-    >>> v1 <= v2
-    True
-    """
-
-    _regex = re.compile(r"^\s*" + VERSION_PATTERN + r"\s*$", re.VERBOSE | re.IGNORECASE)
-    _key: CmpKey
-
-    def __init__(self, version: str) -> None:
-        """Initialize a Version object.
-
-        :param version:
-            The string representation of a version which will be parsed and normalized
-            before use.
-        :raises InvalidVersion:
-            If the ``version`` does not conform to PEP 440 in any way then this
-            exception will be raised.
-        """
-
-        # Validate the version and parse it into pieces
-        match = self._regex.search(version)
-        if not match:
-            raise InvalidVersion(f"Invalid version: {version!r}")
-
-        # Store the parsed out pieces of the version
-        self._version = _Version(
-            epoch=int(match.group("epoch")) if match.group("epoch") else 0,
-            release=tuple(int(i) for i in match.group("release").split(".")),
-            pre=_parse_letter_version(match.group("pre_l"), match.group("pre_n")),
-            post=_parse_letter_version(
-                match.group("post_l"), match.group("post_n1") or match.group("post_n2")
-            ),
-            dev=_parse_letter_version(match.group("dev_l"), match.group("dev_n")),
-            local=_parse_local_version(match.group("local")),
-        )
-
-        # Generate a key which will be used for sorting
-        self._key = _cmpkey(
-            self._version.epoch,
-            self._version.release,
-            self._version.pre,
-            self._version.post,
-            self._version.dev,
-            self._version.local,
-        )
-
-    def __repr__(self) -> str:
-        """A representation of the Version that shows all internal state.
-
-        >>> Version('1.0.0')
-        <Version('1.0.0')>
-        """
-        return f"<Version('{self}')>"
-
-    def __str__(self) -> str:
-        """A string representation of the version that can be round-tripped.
-
-        >>> str(Version("1.0a5"))
-        '1.0a5'
-        """
-        parts = []
-
-        # Epoch
-        if self.epoch != 0:
-            parts.append(f"{self.epoch}!")
-
-        # Release segment
-        parts.append(".".join(str(x) for x in self.release))
-
-        # Pre-release
-        if self.pre is not None:
-            parts.append("".join(str(x) for x in self.pre))
-
-        # Post-release
-        if self.post is not None:
-            parts.append(f".post{self.post}")
-
-        # Development release
-        if self.dev is not None:
-            parts.append(f".dev{self.dev}")
-
-        # Local version segment
-        if self.local is not None:
-            parts.append(f"+{self.local}")
-
-        return "".join(parts)
-
-    @property
-    def epoch(self) -> int:
-        """The epoch of the version.
-
-        >>> Version("2.0.0").epoch
-        0
-        >>> Version("1!2.0.0").epoch
-        1
-        """
-        return self._version.epoch
-
-    @property
-    def release(self) -> tuple[int, ...]:
-        """The components of the "release" segment of the version.
-
-        >>> Version("1.2.3").release
-        (1, 2, 3)
-        >>> Version("2.0.0").release
-        (2, 0, 0)
-        >>> Version("1!2.0.0.post0").release
-        (2, 0, 0)
-
-        Includes trailing zeroes but not the epoch or any pre-release / development /
-        post-release suffixes.
-        """
-        return self._version.release
-
-    @property
-    def pre(self) -> tuple[str, int] | None:
-        """The pre-release segment of the version.
-
-        >>> print(Version("1.2.3").pre)
-        None
-        >>> Version("1.2.3a1").pre
-        ('a', 1)
-        >>> Version("1.2.3b1").pre
-        ('b', 1)
-        >>> Version("1.2.3rc1").pre
-        ('rc', 1)
-        """
-        return self._version.pre
-
-    @property
-    def post(self) -> int | None:
-        """The post-release number of the version.
-
-        >>> print(Version("1.2.3").post)
-        None
-        >>> Version("1.2.3.post1").post
-        1
-        """
-        return self._version.post[1] if self._version.post else None
-
-    @property
-    def dev(self) -> int | None:
-        """The development number of the version.
-
-        >>> print(Version("1.2.3").dev)
-        None
-        >>> Version("1.2.3.dev1").dev
-        1
-        """
-        return self._version.dev[1] if self._version.dev else None
-
-    @property
-    def local(self) -> str | None:
-        """The local version segment of the version.
-
-        >>> print(Version("1.2.3").local)
-        None
-        >>> Version("1.2.3+abc").local
-        'abc'
-        """
-        if self._version.local:
-            return ".".join(str(x) for x in self._version.local)
-        else:
-            return None
-
-    @property
-    def public(self) -> str:
-        """The public portion of the version.
-
-        >>> Version("1.2.3").public
-        '1.2.3'
-        >>> Version("1.2.3+abc").public
-        '1.2.3'
-        >>> Version("1!1.2.3dev1+abc").public
-        '1!1.2.3.dev1'
-        """
-        return str(self).split("+", 1)[0]
-
-    @property
-    def base_version(self) -> str:
-        """The "base version" of the version.
-
-        >>> Version("1.2.3").base_version
-        '1.2.3'
-        >>> Version("1.2.3+abc").base_version
-        '1.2.3'
-        >>> Version("1!1.2.3dev1+abc").base_version
-        '1!1.2.3'
-
-        The "base version" is the public version of the project without any pre or post
-        release markers.
-        """
-        parts = []
-
-        # Epoch
-        if self.epoch != 0:
-            parts.append(f"{self.epoch}!")
-
-        # Release segment
-        parts.append(".".join(str(x) for x in self.release))
-
-        return "".join(parts)
-
-    @property
-    def is_prerelease(self) -> bool:
-        """Whether this version is a pre-release.
-
-        >>> Version("1.2.3").is_prerelease
-        False
-        >>> Version("1.2.3a1").is_prerelease
-        True
-        >>> Version("1.2.3b1").is_prerelease
-        True
-        >>> Version("1.2.3rc1").is_prerelease
-        True
-        >>> Version("1.2.3dev1").is_prerelease
-        True
-        """
-        return self.dev is not None or self.pre is not None
-
-    @property
-    def is_postrelease(self) -> bool:
-        """Whether this version is a post-release.
-
-        >>> Version("1.2.3").is_postrelease
-        False
-        >>> Version("1.2.3.post1").is_postrelease
-        True
-        """
-        return self.post is not None
-
-    @property
-    def is_devrelease(self) -> bool:
-        """Whether this version is a development release.
-
-        >>> Version("1.2.3").is_devrelease
-        False
-        >>> Version("1.2.3.dev1").is_devrelease
-        True
-        """
-        return self.dev is not None
-
-    @property
-    def major(self) -> int:
-        """The first item of :attr:`release` or ``0`` if unavailable.
-
-        >>> Version("1.2.3").major
-        1
-        """
-        return self.release[0] if len(self.release) >= 1 else 0
-
-    @property
-    def minor(self) -> int:
-        """The second item of :attr:`release` or ``0`` if unavailable.
-
-        >>> Version("1.2.3").minor
-        2
-        >>> Version("1").minor
-        0
-        """
-        return self.release[1] if len(self.release) >= 2 else 0
-
-    @property
-    def micro(self) -> int:
-        """The third item of :attr:`release` or ``0`` if unavailable.
-
-        >>> Version("1.2.3").micro
-        3
-        >>> Version("1").micro
-        0
-        """
-        return self.release[2] if len(self.release) >= 3 else 0
-
-
-class _TrimmedRelease(Version):
-    @property
-    def release(self) -> tuple[int, ...]:
-        """
-        Release segment without any trailing zeros.
-
-        >>> _TrimmedRelease('1.0.0').release
-        (1,)
-        >>> _TrimmedRelease('0.0').release
-        (0,)
-        """
-        rel = super().release
-        nonzeros = (index for index, val in enumerate(rel) if val)
-        last_nonzero = max(nonzeros, default=0)
-        return rel[: last_nonzero + 1]
-
-
-def _parse_letter_version(
-    letter: str | None, number: str | bytes | SupportsInt | None
-) -> tuple[str, int] | None:
-    if letter:
-        # We consider there to be an implicit 0 in a pre-release if there is
-        # not a numeral associated with it.
-        if number is None:
-            number = 0
-
-        # We normalize any letters to their lower case form
-        letter = letter.lower()
-
-        # We consider some words to be alternate spellings of other words and
-        # in those cases we want to normalize the spellings to our preferred
-        # spelling.
-        if letter == "alpha":
-            letter = "a"
-        elif letter == "beta":
-            letter = "b"
-        elif letter in ["c", "pre", "preview"]:
-            letter = "rc"
-        elif letter in ["rev", "r"]:
-            letter = "post"
-
-        return letter, int(number)
-
-    assert not letter
-    if number:
-        # We assume if we are given a number, but we are not given a letter
-        # then this is using the implicit post release syntax (e.g. 1.0-1)
-        letter = "post"
-
-        return letter, int(number)
-
-    return None
-
-
-_local_version_separators = re.compile(r"[\._-]")
-
-
-def _parse_local_version(local: str | None) -> LocalType | None:
-    """
-    Takes a string like abc.1.twelve and turns it into ("abc", 1, "twelve").
-    """
-    if local is not None:
-        return tuple(
-            part.lower() if not part.isdigit() else int(part)
-            for part in _local_version_separators.split(local)
-        )
-    return None
-
-
-def _cmpkey(
-    epoch: int,
-    release: tuple[int, ...],
-    pre: tuple[str, int] | None,
-    post: tuple[str, int] | None,
-    dev: tuple[str, int] | None,
-    local: LocalType | None,
-) -> CmpKey:
-    # When we compare a release version, we want to compare it with all of the
-    # trailing zeros removed. So we'll use a reverse the list, drop all the now
-    # leading zeros until we come to something non zero, then take the rest
-    # re-reverse it back into the correct order and make it a tuple and use
-    # that for our sorting key.
-    _release = tuple(
-        reversed(list(itertools.dropwhile(lambda x: x == 0, reversed(release))))
-    )
-
-    # We need to "trick" the sorting algorithm to put 1.0.dev0 before 1.0a0.
-    # We'll do this by abusing the pre segment, but we _only_ want to do this
-    # if there is not a pre or a post segment. If we have one of those then
-    # the normal sorting rules will handle this case correctly.
-    if pre is None and post is None and dev is not None:
-        _pre: CmpPrePostDevType = NegativeInfinity
-    # Versions without a pre-release (except as noted above) should sort after
-    # those with one.
-    elif pre is None:
-        _pre = Infinity
-    else:
-        _pre = pre
-
-    # Versions without a post segment should sort before those with one.
-    if post is None:
-        _post: CmpPrePostDevType = NegativeInfinity
-
-    else:
-        _post = post
-
-    # Versions without a development segment should sort after those with one.
-    if dev is None:
-        _dev: CmpPrePostDevType = Infinity
-
-    else:
-        _dev = dev
-
-    if local is None:
-        # Versions without a local segment should sort before those with one.
-        _local: CmpLocalType = NegativeInfinity
-    else:
-        # Versions with a local segment need that segment parsed to implement
-        # the sorting rules in PEP440.
-        # - Alpha numeric segments sort before numeric segments
-        # - Alpha numeric segments sort lexicographically
-        # - Numeric segments sort numerically
-        # - Shorter versions sort before longer versions when the prefixes
-        #   match exactly
-        _local = tuple(
-            (i, "") if isinstance(i, int) else (NegativeInfinity, i) for i in local
-        )
-
-    return epoch, _release, _pre, _post, _dev, _local
diff --git a/lib/paho/__init__.py b/lib/paho/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/paho/mqtt/__init__.py b/lib/paho/mqtt/__init__.py
deleted file mode 100644
index 377cecc7..00000000
--- a/lib/paho/mqtt/__init__.py
+++ /dev/null
@@ -1,5 +0,0 @@
-__version__ = "2.1.0"
-
-
-class MQTTException(Exception):
-    pass
diff --git a/lib/paho/mqtt/client.py b/lib/paho/mqtt/client.py
deleted file mode 100644
index 4ccc8696..00000000
--- a/lib/paho/mqtt/client.py
+++ /dev/null
@@ -1,5004 +0,0 @@
-# Copyright (c) 2012-2019 Roger Light and others
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v2.0
-# and Eclipse Distribution License v1.0 which accompany this distribution.
-#
-# The Eclipse Public License is available at
-#    http://www.eclipse.org/legal/epl-v20.html
-# and the Eclipse Distribution License is available at
-#   http://www.eclipse.org/org/documents/edl-v10.php.
-#
-# Contributors:
-#    Roger Light - initial API and implementation
-#    Ian Craggs - MQTT V5 support
-"""
-This is an MQTT client module. MQTT is a lightweight pub/sub messaging
-protocol that is easy to implement and suitable for low powered devices.
-"""
-from __future__ import annotations
-
-import base64
-import collections
-import errno
-import hashlib
-import logging
-import os
-import platform
-import select
-import socket
-import string
-import struct
-import threading
-import time
-import urllib.parse
-import urllib.request
-import uuid
-import warnings
-from typing import TYPE_CHECKING, Any, Callable, Dict, Iterator, List, NamedTuple, Sequence, Tuple, Union, cast
-
-from paho.mqtt.packettypes import PacketTypes
-
-from .enums import CallbackAPIVersion, ConnackCode, LogLevel, MessageState, MessageType, MQTTErrorCode, MQTTProtocolVersion, PahoClientMode, _ConnectionState
-from .matcher import MQTTMatcher
-from .properties import Properties
-from .reasoncodes import ReasonCode, ReasonCodes
-from .subscribeoptions import SubscribeOptions
-
-try:
-    from typing import Literal
-except ImportError:
-    from typing_extensions import Literal  # type: ignore
-
-if TYPE_CHECKING:
-    try:
-        from typing import TypedDict  # type: ignore
-    except ImportError:
-        from typing_extensions import TypedDict
-
-    try:
-        from typing import Protocol  # type: ignore
-    except ImportError:
-        from typing_extensions import Protocol  # type: ignore
-
-    class _InPacket(TypedDict):
-        command: int
-        have_remaining: int
-        remaining_count: list[int]
-        remaining_mult: int
-        remaining_length: int
-        packet: bytearray
-        to_process: int
-        pos: int
-
-
-    class _OutPacket(TypedDict):
-        command: int
-        mid: int
-        qos: int
-        pos: int
-        to_process: int
-        packet: bytes
-        info: MQTTMessageInfo | None
-
-    class SocketLike(Protocol):
-        def recv(self, buffer_size: int) -> bytes:
-            ...
-        def send(self, buffer: bytes) -> int:
-            ...
-        def close(self) -> None:
-            ...
-        def fileno(self) -> int:
-            ...
-        def setblocking(self, flag: bool) -> None:
-            ...
-
-
-try:
-    import ssl
-except ImportError:
-    ssl = None  # type: ignore[assignment]
-
-
-try:
-    import socks  # type: ignore[import-untyped]
-except ImportError:
-    socks = None  # type: ignore[assignment]
-
-
-try:
-    # Use monotonic clock if available
-    time_func = time.monotonic
-except AttributeError:
-    time_func = time.time
-
-try:
-    import dns.resolver
-
-    HAVE_DNS = True
-except ImportError:
-    HAVE_DNS = False
-
-
-if platform.system() == 'Windows':
-    EAGAIN = errno.WSAEWOULDBLOCK  # type: ignore[attr-defined]
-else:
-    EAGAIN = errno.EAGAIN
-
-# Avoid linter complain. We kept importing it as ReasonCodes (plural) for compatibility
-_ = ReasonCodes
-
-# Keep copy of enums values for compatibility.
-CONNECT = MessageType.CONNECT
-CONNACK = MessageType.CONNACK
-PUBLISH = MessageType.PUBLISH
-PUBACK = MessageType.PUBACK
-PUBREC = MessageType.PUBREC
-PUBREL = MessageType.PUBREL
-PUBCOMP = MessageType.PUBCOMP
-SUBSCRIBE = MessageType.SUBSCRIBE
-SUBACK = MessageType.SUBACK
-UNSUBSCRIBE = MessageType.UNSUBSCRIBE
-UNSUBACK = MessageType.UNSUBACK
-PINGREQ = MessageType.PINGREQ
-PINGRESP = MessageType.PINGRESP
-DISCONNECT = MessageType.DISCONNECT
-AUTH = MessageType.AUTH
-
-# Log levels
-MQTT_LOG_INFO = LogLevel.MQTT_LOG_INFO
-MQTT_LOG_NOTICE = LogLevel.MQTT_LOG_NOTICE
-MQTT_LOG_WARNING = LogLevel.MQTT_LOG_WARNING
-MQTT_LOG_ERR = LogLevel.MQTT_LOG_ERR
-MQTT_LOG_DEBUG = LogLevel.MQTT_LOG_DEBUG
-LOGGING_LEVEL = {
-    LogLevel.MQTT_LOG_DEBUG: logging.DEBUG,
-    LogLevel.MQTT_LOG_INFO: logging.INFO,
-    LogLevel.MQTT_LOG_NOTICE: logging.INFO,  # This has no direct equivalent level
-    LogLevel.MQTT_LOG_WARNING: logging.WARNING,
-    LogLevel.MQTT_LOG_ERR: logging.ERROR,
-}
-
-# CONNACK codes
-CONNACK_ACCEPTED = ConnackCode.CONNACK_ACCEPTED
-CONNACK_REFUSED_PROTOCOL_VERSION = ConnackCode.CONNACK_REFUSED_PROTOCOL_VERSION
-CONNACK_REFUSED_IDENTIFIER_REJECTED = ConnackCode.CONNACK_REFUSED_IDENTIFIER_REJECTED
-CONNACK_REFUSED_SERVER_UNAVAILABLE = ConnackCode.CONNACK_REFUSED_SERVER_UNAVAILABLE
-CONNACK_REFUSED_BAD_USERNAME_PASSWORD = ConnackCode.CONNACK_REFUSED_BAD_USERNAME_PASSWORD
-CONNACK_REFUSED_NOT_AUTHORIZED = ConnackCode.CONNACK_REFUSED_NOT_AUTHORIZED
-
-# Message state
-mqtt_ms_invalid = MessageState.MQTT_MS_INVALID
-mqtt_ms_publish = MessageState.MQTT_MS_PUBLISH
-mqtt_ms_wait_for_puback = MessageState.MQTT_MS_WAIT_FOR_PUBACK
-mqtt_ms_wait_for_pubrec = MessageState.MQTT_MS_WAIT_FOR_PUBREC
-mqtt_ms_resend_pubrel = MessageState.MQTT_MS_RESEND_PUBREL
-mqtt_ms_wait_for_pubrel = MessageState.MQTT_MS_WAIT_FOR_PUBREL
-mqtt_ms_resend_pubcomp = MessageState.MQTT_MS_RESEND_PUBCOMP
-mqtt_ms_wait_for_pubcomp = MessageState.MQTT_MS_WAIT_FOR_PUBCOMP
-mqtt_ms_send_pubrec = MessageState.MQTT_MS_SEND_PUBREC
-mqtt_ms_queued = MessageState.MQTT_MS_QUEUED
-
-MQTT_ERR_AGAIN = MQTTErrorCode.MQTT_ERR_AGAIN
-MQTT_ERR_SUCCESS = MQTTErrorCode.MQTT_ERR_SUCCESS
-MQTT_ERR_NOMEM = MQTTErrorCode.MQTT_ERR_NOMEM
-MQTT_ERR_PROTOCOL = MQTTErrorCode.MQTT_ERR_PROTOCOL
-MQTT_ERR_INVAL = MQTTErrorCode.MQTT_ERR_INVAL
-MQTT_ERR_NO_CONN = MQTTErrorCode.MQTT_ERR_NO_CONN
-MQTT_ERR_CONN_REFUSED = MQTTErrorCode.MQTT_ERR_CONN_REFUSED
-MQTT_ERR_NOT_FOUND = MQTTErrorCode.MQTT_ERR_NOT_FOUND
-MQTT_ERR_CONN_LOST = MQTTErrorCode.MQTT_ERR_CONN_LOST
-MQTT_ERR_TLS = MQTTErrorCode.MQTT_ERR_TLS
-MQTT_ERR_PAYLOAD_SIZE = MQTTErrorCode.MQTT_ERR_PAYLOAD_SIZE
-MQTT_ERR_NOT_SUPPORTED = MQTTErrorCode.MQTT_ERR_NOT_SUPPORTED
-MQTT_ERR_AUTH = MQTTErrorCode.MQTT_ERR_AUTH
-MQTT_ERR_ACL_DENIED = MQTTErrorCode.MQTT_ERR_ACL_DENIED
-MQTT_ERR_UNKNOWN = MQTTErrorCode.MQTT_ERR_UNKNOWN
-MQTT_ERR_ERRNO = MQTTErrorCode.MQTT_ERR_ERRNO
-MQTT_ERR_QUEUE_SIZE = MQTTErrorCode.MQTT_ERR_QUEUE_SIZE
-MQTT_ERR_KEEPALIVE = MQTTErrorCode.MQTT_ERR_KEEPALIVE
-
-MQTTv31 = MQTTProtocolVersion.MQTTv31
-MQTTv311 = MQTTProtocolVersion.MQTTv311
-MQTTv5 = MQTTProtocolVersion.MQTTv5
-
-MQTT_CLIENT = PahoClientMode.MQTT_CLIENT
-MQTT_BRIDGE = PahoClientMode.MQTT_BRIDGE
-
-# For MQTT V5, use the clean start flag only on the first successful connect
-MQTT_CLEAN_START_FIRST_ONLY: CleanStartOption = 3
-
-sockpair_data = b"0"
-
-# Payload support all those type and will be converted to bytes:
-# * str are utf8 encoded
-# * int/float are converted to string and utf8 encoded (e.g. 1 is converted to b"1")
-# * None is converted to a zero-length payload (i.e. b"")
-PayloadType = Union[str, bytes, bytearray, int, float, None]
-
-HTTPHeader = Dict[str, str]
-WebSocketHeaders = Union[Callable[[HTTPHeader], HTTPHeader], HTTPHeader]
-
-CleanStartOption = Union[bool, Literal[3]]
-
-
-class ConnectFlags(NamedTuple):
-    """Contains additional information passed to `on_connect` callback"""
-
-    session_present: bool
-    """
-    this flag is useful for clients that are
-    using clean session set to False only (MQTTv3) or clean_start = False (MQTTv5).
-    In that case, if client  that reconnects to a broker that it has previously
-    connected to, this flag indicates whether the broker still has the
-    session information for the client. If true, the session still exists.
-    """
-
-
-class DisconnectFlags(NamedTuple):
-    """Contains additional information passed to `on_disconnect` callback"""
-
-    is_disconnect_packet_from_server: bool
-    """
-    tells whether this on_disconnect call is the result
-    of receiving an DISCONNECT packet from the broker or if the on_disconnect is only
-    generated by the client library.
-    When true, the reason code is generated by the broker.
-    """
-
-
-CallbackOnConnect_v1_mqtt3 = Callable[["Client", Any, Dict[str, Any], MQTTErrorCode], None]
-CallbackOnConnect_v1_mqtt5 = Callable[["Client", Any, Dict[str, Any], ReasonCode, Union[Properties, None]], None]
-CallbackOnConnect_v1 = Union[CallbackOnConnect_v1_mqtt5, CallbackOnConnect_v1_mqtt3]
-CallbackOnConnect_v2 = Callable[["Client", Any, ConnectFlags, ReasonCode, Union[Properties, None]], None]
-CallbackOnConnect = Union[CallbackOnConnect_v1, CallbackOnConnect_v2]
-CallbackOnConnectFail = Callable[["Client", Any], None]
-CallbackOnDisconnect_v1_mqtt3 = Callable[["Client", Any, MQTTErrorCode], None]
-CallbackOnDisconnect_v1_mqtt5 = Callable[["Client", Any, Union[ReasonCode, int, None], Union[Properties, None]], None]
-CallbackOnDisconnect_v1 = Union[CallbackOnDisconnect_v1_mqtt3, CallbackOnDisconnect_v1_mqtt5]
-CallbackOnDisconnect_v2 = Callable[["Client", Any, DisconnectFlags, ReasonCode, Union[Properties, None]], None]
-CallbackOnDisconnect = Union[CallbackOnDisconnect_v1, CallbackOnDisconnect_v2]
-CallbackOnLog = Callable[["Client", Any, int, str], None]
-CallbackOnMessage = Callable[["Client", Any, "MQTTMessage"], None]
-CallbackOnPreConnect = Callable[["Client", Any], None]
-CallbackOnPublish_v1 = Callable[["Client", Any, int], None]
-CallbackOnPublish_v2 = Callable[["Client", Any, int, ReasonCode, Properties], None]
-CallbackOnPublish = Union[CallbackOnPublish_v1, CallbackOnPublish_v2]
-CallbackOnSocket = Callable[["Client", Any, "SocketLike"], None]
-CallbackOnSubscribe_v1_mqtt3 = Callable[["Client", Any, int, Tuple[int, ...]], None]
-CallbackOnSubscribe_v1_mqtt5 = Callable[["Client", Any, int, List[ReasonCode], Properties], None]
-CallbackOnSubscribe_v1 = Union[CallbackOnSubscribe_v1_mqtt3, CallbackOnSubscribe_v1_mqtt5]
-CallbackOnSubscribe_v2 = Callable[["Client", Any, int, List[ReasonCode], Union[Properties, None]], None]
-CallbackOnSubscribe = Union[CallbackOnSubscribe_v1, CallbackOnSubscribe_v2]
-CallbackOnUnsubscribe_v1_mqtt3 = Callable[["Client", Any, int], None]
-CallbackOnUnsubscribe_v1_mqtt5 = Callable[["Client", Any, int, Properties, Union[ReasonCode, List[ReasonCode]]], None]
-CallbackOnUnsubscribe_v1 = Union[CallbackOnUnsubscribe_v1_mqtt3, CallbackOnUnsubscribe_v1_mqtt5]
-CallbackOnUnsubscribe_v2 = Callable[["Client", Any, int, List[ReasonCode], Union[Properties, None]], None]
-CallbackOnUnsubscribe = Union[CallbackOnUnsubscribe_v1, CallbackOnUnsubscribe_v2]
-
-# This is needed for typing because class Client redefined the name "socket"
-_socket = socket
-
-
-class WebsocketConnectionError(ConnectionError):
-    """ WebsocketConnectionError is a subclass of ConnectionError.
-
-        It's raised when unable to perform the Websocket handshake.
-    """
-    pass
-
-
-def error_string(mqtt_errno: MQTTErrorCode | int) -> str:
-    """Return the error string associated with an mqtt error number."""
-    if mqtt_errno == MQTT_ERR_SUCCESS:
-        return "No error."
-    elif mqtt_errno == MQTT_ERR_NOMEM:
-        return "Out of memory."
-    elif mqtt_errno == MQTT_ERR_PROTOCOL:
-        return "A network protocol error occurred when communicating with the broker."
-    elif mqtt_errno == MQTT_ERR_INVAL:
-        return "Invalid function arguments provided."
-    elif mqtt_errno == MQTT_ERR_NO_CONN:
-        return "The client is not currently connected."
-    elif mqtt_errno == MQTT_ERR_CONN_REFUSED:
-        return "The connection was refused."
-    elif mqtt_errno == MQTT_ERR_NOT_FOUND:
-        return "Message not found (internal error)."
-    elif mqtt_errno == MQTT_ERR_CONN_LOST:
-        return "The connection was lost."
-    elif mqtt_errno == MQTT_ERR_TLS:
-        return "A TLS error occurred."
-    elif mqtt_errno == MQTT_ERR_PAYLOAD_SIZE:
-        return "Payload too large."
-    elif mqtt_errno == MQTT_ERR_NOT_SUPPORTED:
-        return "This feature is not supported."
-    elif mqtt_errno == MQTT_ERR_AUTH:
-        return "Authorisation failed."
-    elif mqtt_errno == MQTT_ERR_ACL_DENIED:
-        return "Access denied by ACL."
-    elif mqtt_errno == MQTT_ERR_UNKNOWN:
-        return "Unknown error."
-    elif mqtt_errno == MQTT_ERR_ERRNO:
-        return "Error defined by errno."
-    elif mqtt_errno == MQTT_ERR_QUEUE_SIZE:
-        return "Message queue full."
-    elif mqtt_errno == MQTT_ERR_KEEPALIVE:
-        return "Client or broker did not communicate in the keepalive interval."
-    else:
-        return "Unknown error."
-
-
-def connack_string(connack_code: int|ReasonCode) -> str:
-    """Return the string associated with a CONNACK result or CONNACK reason code."""
-    if isinstance(connack_code, ReasonCode):
-        return str(connack_code)
-
-    if connack_code == CONNACK_ACCEPTED:
-        return "Connection Accepted."
-    elif connack_code == CONNACK_REFUSED_PROTOCOL_VERSION:
-        return "Connection Refused: unacceptable protocol version."
-    elif connack_code == CONNACK_REFUSED_IDENTIFIER_REJECTED:
-        return "Connection Refused: identifier rejected."
-    elif connack_code == CONNACK_REFUSED_SERVER_UNAVAILABLE:
-        return "Connection Refused: broker unavailable."
-    elif connack_code == CONNACK_REFUSED_BAD_USERNAME_PASSWORD:
-        return "Connection Refused: bad user name or password."
-    elif connack_code == CONNACK_REFUSED_NOT_AUTHORIZED:
-        return "Connection Refused: not authorised."
-    else:
-        return "Connection Refused: unknown reason."
-
-
-def convert_connack_rc_to_reason_code(connack_code: ConnackCode) -> ReasonCode:
-    """Convert a MQTTv3 / MQTTv3.1.1 connack result to `ReasonCode`.
-
-    This is used in `on_connect` callback to have a consistent API.
-
-    Be careful that the numeric value isn't the same, for example:
-
-    >>> ConnackCode.CONNACK_REFUSED_SERVER_UNAVAILABLE == 3
-    >>> convert_connack_rc_to_reason_code(ConnackCode.CONNACK_REFUSED_SERVER_UNAVAILABLE) == 136
-
-    It's recommended to compare by names
-
-    >>> code_to_test = ReasonCode(PacketTypes.CONNACK, "Server unavailable")
-    >>> convert_connack_rc_to_reason_code(ConnackCode.CONNACK_REFUSED_SERVER_UNAVAILABLE) == code_to_test
-    """
-    if connack_code == ConnackCode.CONNACK_ACCEPTED:
-        return ReasonCode(PacketTypes.CONNACK, "Success")
-    if connack_code == ConnackCode.CONNACK_REFUSED_PROTOCOL_VERSION:
-        return ReasonCode(PacketTypes.CONNACK, "Unsupported protocol version")
-    if connack_code == ConnackCode.CONNACK_REFUSED_IDENTIFIER_REJECTED:
-        return ReasonCode(PacketTypes.CONNACK, "Client identifier not valid")
-    if connack_code == ConnackCode.CONNACK_REFUSED_SERVER_UNAVAILABLE:
-        return ReasonCode(PacketTypes.CONNACK, "Server unavailable")
-    if connack_code == ConnackCode.CONNACK_REFUSED_BAD_USERNAME_PASSWORD:
-        return ReasonCode(PacketTypes.CONNACK, "Bad user name or password")
-    if connack_code == ConnackCode.CONNACK_REFUSED_NOT_AUTHORIZED:
-        return ReasonCode(PacketTypes.CONNACK, "Not authorized")
-
-    return ReasonCode(PacketTypes.CONNACK, "Unspecified error")
-
-
-def convert_disconnect_error_code_to_reason_code(rc: MQTTErrorCode) -> ReasonCode:
-    """Convert an MQTTErrorCode to Reason code.
-
-    This is used in `on_disconnect` callback to have a consistent API.
-
-    Be careful that the numeric value isn't the same, for example:
-
-    >>> MQTTErrorCode.MQTT_ERR_PROTOCOL == 2
-    >>> convert_disconnect_error_code_to_reason_code(MQTTErrorCode.MQTT_ERR_PROTOCOL) == 130
-
-    It's recommended to compare by names
-
-    >>> code_to_test = ReasonCode(PacketTypes.DISCONNECT, "Protocol error")
-    >>> convert_disconnect_error_code_to_reason_code(MQTTErrorCode.MQTT_ERR_PROTOCOL) == code_to_test
-    """
-    if rc == MQTTErrorCode.MQTT_ERR_SUCCESS:
-        return ReasonCode(PacketTypes.DISCONNECT, "Success")
-    if rc == MQTTErrorCode.MQTT_ERR_KEEPALIVE:
-        return ReasonCode(PacketTypes.DISCONNECT, "Keep alive timeout")
-    if rc == MQTTErrorCode.MQTT_ERR_CONN_LOST:
-        return ReasonCode(PacketTypes.DISCONNECT, "Unspecified error")
-    return ReasonCode(PacketTypes.DISCONNECT, "Unspecified error")
-
-
-def _base62(
-    num: int,
-    base: str = string.digits + string.ascii_letters,
-    padding: int = 1,
-) -> str:
-    """Convert a number to base-62 representation."""
-    if num < 0:
-        raise ValueError("Number must be positive or zero")
-    digits = []
-    while num:
-        num, rest = divmod(num, 62)
-        digits.append(base[rest])
-    digits.extend(base[0] for _ in range(len(digits), padding))
-    return ''.join(reversed(digits))
-
-
-def topic_matches_sub(sub: str, topic: str) -> bool:
-    """Check whether a topic matches a subscription.
-
-    For example:
-
-    * Topic "foo/bar" would match the subscription "foo/#" or "+/bar"
-    * Topic "non/matching" would not match the subscription "non/+/+"
-    """
-    matcher = MQTTMatcher()
-    matcher[sub] = True
-    try:
-        next(matcher.iter_match(topic))
-        return True
-    except StopIteration:
-        return False
-
-
-def _socketpair_compat() -> tuple[socket.socket, socket.socket]:
-    """TCP/IP socketpair including Windows support"""
-    listensock = socket.socket(
-        socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_IP)
-    listensock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-    listensock.bind(("127.0.0.1", 0))
-    listensock.listen(1)
-
-    iface, port = listensock.getsockname()
-    sock1 = socket.socket(
-        socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_IP)
-    sock1.setblocking(False)
-    try:
-        sock1.connect(("127.0.0.1", port))
-    except BlockingIOError:
-        pass
-    sock2, address = listensock.accept()
-    sock2.setblocking(False)
-    listensock.close()
-    return (sock1, sock2)
-
-
-def _force_bytes(s: str | bytes) -> bytes:
-    if isinstance(s, str):
-        return s.encode("utf-8")
-    return s
-
-
-def _encode_payload(payload: str | bytes | bytearray | int | float | None) -> bytes|bytearray:
-    if isinstance(payload, str):
-        return payload.encode("utf-8")
-
-    if isinstance(payload, (int, float)):
-        return str(payload).encode("ascii")
-
-    if payload is None:
-        return b""
-
-    if not isinstance(payload, (bytes, bytearray)):
-        raise TypeError(
-            "payload must be a string, bytearray, int, float or None."
-        )
-
-    return payload
-
-
-class MQTTMessageInfo:
-    """This is a class returned from `Client.publish()` and can be used to find
-    out the mid of the message that was published, and to determine whether the
-    message has been published, and/or wait until it is published.
-    """
-
-    __slots__ = 'mid', '_published', '_condition', 'rc', '_iterpos'
-
-    def __init__(self, mid: int):
-        self.mid = mid
-        """ The message Id (int)"""
-        self._published = False
-        self._condition = threading.Condition()
-        self.rc: MQTTErrorCode = MQTTErrorCode.MQTT_ERR_SUCCESS
-        """ The `MQTTErrorCode` that give status for this message.
-        This value could change until the message `is_published`"""
-        self._iterpos = 0
-
-    def __str__(self) -> str:
-        return str((self.rc, self.mid))
-
-    def __iter__(self) -> Iterator[MQTTErrorCode | int]:
-        self._iterpos = 0
-        return self
-
-    def __next__(self) -> MQTTErrorCode | int:
-        return self.next()
-
-    def next(self) -> MQTTErrorCode | int:
-        if self._iterpos == 0:
-            self._iterpos = 1
-            return self.rc
-        elif self._iterpos == 1:
-            self._iterpos = 2
-            return self.mid
-        else:
-            raise StopIteration
-
-    def __getitem__(self, index: int) -> MQTTErrorCode | int:
-        if index == 0:
-            return self.rc
-        elif index == 1:
-            return self.mid
-        else:
-            raise IndexError("index out of range")
-
-    def _set_as_published(self) -> None:
-        with self._condition:
-            self._published = True
-            self._condition.notify()
-
-    def wait_for_publish(self, timeout: float | None = None) -> None:
-        """Block until the message associated with this object is published, or
-        until the timeout occurs. If timeout is None, this will never time out.
-        Set timeout to a positive number of seconds, e.g. 1.2, to enable the
-        timeout.
-
-        :raises ValueError: if the message was not queued due to the outgoing
-            queue being full.
-
-        :raises RuntimeError: if the message was not published for another
-            reason.
-        """
-        if self.rc == MQTT_ERR_QUEUE_SIZE:
-            raise ValueError('Message is not queued due to ERR_QUEUE_SIZE')
-        elif self.rc == MQTT_ERR_AGAIN:
-            pass
-        elif self.rc > 0:
-            raise RuntimeError(f'Message publish failed: {error_string(self.rc)}')
-
-        timeout_time = None if timeout is None else time_func() + timeout
-        timeout_tenth = None if timeout is None else timeout / 10.
-        def timed_out() -> bool:
-            return False if timeout_time is None else time_func() > timeout_time
-
-        with self._condition:
-            while not self._published and not timed_out():
-                self._condition.wait(timeout_tenth)
-
-        if self.rc > 0:
-            raise RuntimeError(f'Message publish failed: {error_string(self.rc)}')
-
-    def is_published(self) -> bool:
-        """Returns True if the message associated with this object has been
-        published, else returns False.
-
-        To wait for this to become true, look at `wait_for_publish`.
-        """
-        if self.rc == MQTTErrorCode.MQTT_ERR_QUEUE_SIZE:
-            raise ValueError('Message is not queued due to ERR_QUEUE_SIZE')
-        elif self.rc == MQTTErrorCode.MQTT_ERR_AGAIN:
-            pass
-        elif self.rc > 0:
-            raise RuntimeError(f'Message publish failed: {error_string(self.rc)}')
-
-        with self._condition:
-            return self._published
-
-
-class MQTTMessage:
-    """ This is a class that describes an incoming message. It is
-    passed to the `on_message` callback as the message parameter.
-    """
-    __slots__ = 'timestamp', 'state', 'dup', 'mid', '_topic', 'payload', 'qos', 'retain', 'info', 'properties'
-
-    def __init__(self, mid: int = 0, topic: bytes = b""):
-        self.timestamp = 0.0
-        self.state = mqtt_ms_invalid
-        self.dup = False
-        self.mid = mid
-        """ The message id (int)."""
-        self._topic = topic
-        self.payload = b""
-        """the message payload (bytes)"""
-        self.qos = 0
-        """ The message Quality of Service (0, 1 or 2)."""
-        self.retain = False
-        """ If true, the message is a retained message and not fresh."""
-        self.info = MQTTMessageInfo(mid)
-        self.properties: Properties | None = None
-        """ In MQTT v5.0, the properties associated with the message. (`Properties`)"""
-
-    def __eq__(self, other: object) -> bool:
-        """Override the default Equals behavior"""
-        if isinstance(other, self.__class__):
-            return self.mid == other.mid
-        return False
-
-    def __ne__(self, other: object) -> bool:
-        """Define a non-equality test"""
-        return not self.__eq__(other)
-
-    @property
-    def topic(self) -> str:
-        """topic that the message was published on.
-
-        This property is read-only.
-        """
-        return self._topic.decode('utf-8')
-
-    @topic.setter
-    def topic(self, value: bytes) -> None:
-        self._topic = value
-
-
-class Client:
-    """MQTT version 3.1/3.1.1/5.0 client class.
-
-    This is the main class for use communicating with an MQTT broker.
-
-    General usage flow:
-
-    * Use `connect()`, `connect_async()` or `connect_srv()` to connect to a broker
-    * Use `loop_start()` to set a thread running to call `loop()` for you.
-    * Or use `loop_forever()` to handle calling `loop()` for you in a blocking function.
-    * Or call `loop()` frequently to maintain network traffic flow with the broker
-    * Use `subscribe()` to subscribe to a topic and receive messages
-    * Use `publish()` to send messages
-    * Use `disconnect()` to disconnect from the broker
-
-    Data returned from the broker is made available with the use of callback
-    functions as described below.
-
-    :param CallbackAPIVersion callback_api_version: define the API version for user-callback (on_connect, on_publish,...).
-        This field is required and it's recommended to use the latest version (CallbackAPIVersion.API_VERSION2).
-        See each callback for description of API for each version. The file docs/migrations.rst contains details on
-        how to migrate between version.
-
-    :param str client_id: the unique client id string used when connecting to the
-        broker. If client_id is zero length or None, then the behaviour is
-        defined by which protocol version is in use. If using MQTT v3.1.1, then
-        a zero length client id will be sent to the broker and the broker will
-        generate a random for the client. If using MQTT v3.1 then an id will be
-        randomly generated. In both cases, clean_session must be True. If this
-        is not the case a ValueError will be raised.
-
-    :param bool clean_session: a boolean that determines the client type. If True,
-        the broker will remove all information about this client when it
-        disconnects. If False, the client is a persistent client and
-        subscription information and queued messages will be retained when the
-        client disconnects.
-        Note that a client will never discard its own outgoing messages on
-        disconnect. Calling connect() or reconnect() will cause the messages to
-        be resent.  Use reinitialise() to reset a client to its original state.
-        The clean_session argument only applies to MQTT versions v3.1.1 and v3.1.
-        It is not accepted if the MQTT version is v5.0 - use the clean_start
-        argument on connect() instead.
-
-    :param userdata: user defined data of any type that is passed as the "userdata"
-        parameter to callbacks. It may be updated at a later point with the
-        user_data_set() function.
-
-    :param int protocol: allows explicit setting of the MQTT version to
-        use for this client. Can be paho.mqtt.client.MQTTv311 (v3.1.1),
-        paho.mqtt.client.MQTTv31 (v3.1) or paho.mqtt.client.MQTTv5 (v5.0),
-        with the default being v3.1.1.
-
-    :param transport: use "websockets" to use WebSockets as the transport
-        mechanism. Set to "tcp" to use raw TCP, which is the default.
-        Use "unix" to use Unix sockets as the transport mechanism; note that
-        this option is only available on platforms that support Unix sockets,
-        and the "host" argument is interpreted as the path to the Unix socket
-        file in this case.
-
-    :param bool manual_ack: normally, when a message is received, the library automatically
-        acknowledges after on_message callback returns.  manual_ack=True allows the application to
-        acknowledge receipt after it has completed processing of a message
-        using a the ack() method. This addresses vulnerability to message loss
-        if applications fails while processing a message, or while it pending
-        locally.
-
-    Callbacks
-    =========
-
-    A number of callback functions are available to receive data back from the
-    broker. To use a callback, define a function and then assign it to the
-    client::
-
-        def on_connect(client, userdata, flags, reason_code, properties):
-            print(f"Connected with result code {reason_code}")
-
-        client.on_connect = on_connect
-
-    Callbacks can also be attached using decorators::
-
-        mqttc = paho.mqtt.Client()
-
-        @mqttc.connect_callback()
-        def on_connect(client, userdata, flags, reason_code, properties):
-            print(f"Connected with result code {reason_code}")
-
-    All of the callbacks as described below have a "client" and an "userdata"
-    argument. "client" is the `Client` instance that is calling the callback.
-    userdata" is user data of any type and can be set when creating a new client
-    instance or with `user_data_set()`.
-
-    If you wish to suppress exceptions within a callback, you should set
-    ``mqttc.suppress_exceptions = True``
-
-    The callbacks are listed below, documentation for each of them can be found
-    at the same function name:
-
-    `on_connect`, `on_connect_fail`, `on_disconnect`, `on_message`, `on_publish`,
-    `on_subscribe`, `on_unsubscribe`, `on_log`, `on_socket_open`, `on_socket_close`,
-    `on_socket_register_write`, `on_socket_unregister_write`
-    """
-
-    def __init__(
-        self,
-        callback_api_version: CallbackAPIVersion = CallbackAPIVersion.VERSION1,
-        client_id: str | None = "",
-        clean_session: bool | None = None,
-        userdata: Any = None,
-        protocol: MQTTProtocolVersion = MQTTv311,
-        transport: Literal["tcp", "websockets", "unix"] = "tcp",
-        reconnect_on_failure: bool = True,
-        manual_ack: bool = False,
-    ) -> None:
-        transport = transport.lower()  # type: ignore
-        if transport == "unix" and not hasattr(socket, "AF_UNIX"):
-            raise ValueError('"unix" transport not supported')
-        elif transport not in ("websockets", "tcp", "unix"):
-            raise ValueError(
-                f'transport must be "websockets", "tcp" or "unix", not {transport}')
-
-        self._manual_ack = manual_ack
-        self._transport = transport
-        self._protocol = protocol
-        self._userdata = userdata
-        self._sock: SocketLike | None = None
-        self._sockpairR: socket.socket | None = None
-        self._sockpairW: socket.socket | None = None
-        self._keepalive = 60
-        self._connect_timeout = 5.0
-        self._client_mode = MQTT_CLIENT
-        self._callback_api_version = callback_api_version
-
-        if self._callback_api_version == CallbackAPIVersion.VERSION1:
-            warnings.warn(
-                "Callback API version 1 is deprecated, update to latest version",
-                category=DeprecationWarning,
-                stacklevel=2,
-            )
-        if isinstance(self._callback_api_version, str):
-            # Help user to migrate, it probably provided a client id
-            # as first arguments
-            raise ValueError(
-                "Unsupported callback API version: version 2.0 added a callback_api_version, see docs/migrations.rst for details"
-            )
-        if self._callback_api_version not in CallbackAPIVersion:
-            raise ValueError("Unsupported callback API version")
-
-        self._clean_start: int = MQTT_CLEAN_START_FIRST_ONLY
-
-        if protocol == MQTTv5:
-            if clean_session is not None:
-                raise ValueError('Clean session is not used for MQTT 5.0')
-        else:
-            if clean_session is None:
-                clean_session = True
-            if not clean_session and (client_id == "" or client_id is None):
-                raise ValueError(
-                    'A client id must be provided if clean session is False.')
-            self._clean_session = clean_session
-
-        # [MQTT-3.1.3-4] Client Id must be UTF-8 encoded string.
-        if client_id == "" or client_id is None:
-            if protocol == MQTTv31:
-                self._client_id = _base62(uuid.uuid4().int, padding=22).encode("utf8")
-            else:
-                self._client_id = b""
-        else:
-            self._client_id = _force_bytes(client_id)
-
-        self._username: bytes | None = None
-        self._password: bytes | None = None
-        self._in_packet: _InPacket = {
-            "command": 0,
-            "have_remaining": 0,
-            "remaining_count": [],
-            "remaining_mult": 1,
-            "remaining_length": 0,
-            "packet": bytearray(b""),
-            "to_process": 0,
-            "pos": 0,
-        }
-        self._out_packet: collections.deque[_OutPacket] = collections.deque()
-        self._last_msg_in = time_func()
-        self._last_msg_out = time_func()
-        self._reconnect_min_delay = 1
-        self._reconnect_max_delay = 120
-        self._reconnect_delay: int | None = None
-        self._reconnect_on_failure = reconnect_on_failure
-        self._ping_t = 0.0
-        self._last_mid = 0
-        self._state = _ConnectionState.MQTT_CS_NEW
-        self._out_messages: collections.OrderedDict[
-            int, MQTTMessage
-        ] = collections.OrderedDict()
-        self._in_messages: collections.OrderedDict[
-            int, MQTTMessage
-        ] = collections.OrderedDict()
-        self._max_inflight_messages = 20
-        self._inflight_messages = 0
-        self._max_queued_messages = 0
-        self._connect_properties: Properties | None = None
-        self._will_properties: Properties | None = None
-        self._will = False
-        self._will_topic = b""
-        self._will_payload = b""
-        self._will_qos = 0
-        self._will_retain = False
-        self._on_message_filtered = MQTTMatcher()
-        self._host = ""
-        self._port = 1883
-        self._bind_address = ""
-        self._bind_port = 0
-        self._proxy: Any = {}
-        self._in_callback_mutex = threading.Lock()
-        self._callback_mutex = threading.RLock()
-        self._msgtime_mutex = threading.Lock()
-        self._out_message_mutex = threading.RLock()
-        self._in_message_mutex = threading.Lock()
-        self._reconnect_delay_mutex = threading.Lock()
-        self._mid_generate_mutex = threading.Lock()
-        self._thread: threading.Thread | None = None
-        self._thread_terminate = False
-        self._ssl = False
-        self._ssl_context: ssl.SSLContext | None = None
-        # Only used when SSL context does not have check_hostname attribute
-        self._tls_insecure = False
-        self._logger: logging.Logger | None = None
-        self._registered_write = False
-        # No default callbacks
-        self._on_log: CallbackOnLog | None = None
-        self._on_pre_connect: CallbackOnPreConnect | None = None
-        self._on_connect: CallbackOnConnect | None = None
-        self._on_connect_fail: CallbackOnConnectFail | None = None
-        self._on_subscribe: CallbackOnSubscribe | None = None
-        self._on_message: CallbackOnMessage | None = None
-        self._on_publish: CallbackOnPublish | None = None
-        self._on_unsubscribe: CallbackOnUnsubscribe | None = None
-        self._on_disconnect: CallbackOnDisconnect | None = None
-        self._on_socket_open: CallbackOnSocket | None = None
-        self._on_socket_close: CallbackOnSocket | None = None
-        self._on_socket_register_write: CallbackOnSocket | None = None
-        self._on_socket_unregister_write: CallbackOnSocket | None = None
-        self._websocket_path = "/mqtt"
-        self._websocket_extra_headers: WebSocketHeaders | None = None
-        # for clean_start == MQTT_CLEAN_START_FIRST_ONLY
-        self._mqttv5_first_connect = True
-        self.suppress_exceptions = False # For callbacks
-
-    def __del__(self) -> None:
-        self._reset_sockets()
-
-    @property
-    def host(self) -> str:
-        """
-        Host to connect to. If `connect()` hasn't been called yet, returns an empty string.
-
-        This property may not be changed if the connection is already open.
-        """
-        return self._host
-
-    @host.setter
-    def host(self, value: str) -> None:
-        if not self._connection_closed():
-            raise RuntimeError("updating host on established connection is not supported")
-
-        if not value:
-            raise ValueError("Invalid host.")
-        self._host = value
-
-    @property
-    def port(self) -> int:
-        """
-        Broker TCP port to connect to.
-
-        This property may not be changed if the connection is already open.
-        """
-        return self._port
-
-    @port.setter
-    def port(self, value: int) -> None:
-        if not self._connection_closed():
-            raise RuntimeError("updating port on established connection is not supported")
-
-        if value <= 0:
-            raise ValueError("Invalid port number.")
-        self._port = value
-
-    @property
-    def keepalive(self) -> int:
-        """
-        Client keepalive interval (in seconds).
-
-        This property may not be changed if the connection is already open.
-        """
-        return self._keepalive
-
-    @keepalive.setter
-    def keepalive(self, value: int) -> None:
-        if not self._connection_closed():
-            # The issue here is that the previous value of keepalive matter to possibly
-            # sent ping packet.
-            raise RuntimeError("updating keepalive on established connection is not supported")
-
-        if value < 0:
-            raise ValueError("Keepalive must be >=0.")
-
-        self._keepalive = value
-
-    @property
-    def transport(self) -> Literal["tcp", "websockets", "unix"]:
-        """
-        Transport method used for the connection ("tcp" or "websockets").
-
-        This property may not be changed if the connection is already open.
-        """
-        return self._transport
-
-    @transport.setter
-    def transport(self, value: Literal["tcp", "websockets"]) -> None:
-        if not self._connection_closed():
-            raise RuntimeError("updating transport on established connection is not supported")
-
-        self._transport = value
-
-    @property
-    def protocol(self) -> MQTTProtocolVersion:
-        """
-        Protocol version used (MQTT v3, MQTT v3.11, MQTTv5)
-
-        This property is read-only.
-        """
-        return self._protocol
-
-    @property
-    def connect_timeout(self) -> float:
-        """
-        Connection establishment timeout in seconds.
-
-        This property may not be changed if the connection is already open.
-        """
-        return self._connect_timeout
-
-    @connect_timeout.setter
-    def connect_timeout(self, value: float) -> None:
-        if not self._connection_closed():
-            raise RuntimeError("updating connect_timeout on established connection is not supported")
-
-        if value <= 0.0:
-            raise ValueError("timeout must be a positive number")
-
-        self._connect_timeout = value
-
-    @property
-    def username(self) -> str | None:
-        """The username used to connect to the MQTT broker, or None if no username is used.
-
-        This property may not be changed if the connection is already open.
-        """
-        if self._username is None:
-            return None
-        return self._username.decode("utf-8")
-
-    @username.setter
-    def username(self, value: str | None) -> None:
-        if not self._connection_closed():
-            raise RuntimeError("updating username on established connection is not supported")
-
-        if value is None:
-            self._username = None
-        else:
-            self._username = value.encode("utf-8")
-
-    @property
-    def password(self) -> str | None:
-        """The password used to connect to the MQTT broker, or None if no password is used.
-
-        This property may not be changed if the connection is already open.
-        """
-        if self._password is None:
-            return None
-        return self._password.decode("utf-8")
-
-    @password.setter
-    def password(self, value: str | None) -> None:
-        if not self._connection_closed():
-            raise RuntimeError("updating password on established connection is not supported")
-
-        if value is None:
-            self._password = None
-        else:
-            self._password = value.encode("utf-8")
-
-    @property
-    def max_inflight_messages(self) -> int:
-        """
-        Maximum number of messages with QoS > 0 that can be partway through the network flow at once
-
-        This property may not be changed if the connection is already open.
-        """
-        return self._max_inflight_messages
-
-    @max_inflight_messages.setter
-    def max_inflight_messages(self, value: int) -> None:
-        if not self._connection_closed():
-            # Not tested. Some doubt that everything is okay when max_inflight change between 0
-            # and > 0 value because _update_inflight is skipped when _max_inflight_messages == 0
-            raise RuntimeError("updating max_inflight_messages on established connection is not supported")
-
-        if value < 0:
-            raise ValueError("Invalid inflight.")
-
-        self._max_inflight_messages = value
-
-    @property
-    def max_queued_messages(self) -> int:
-        """
-        Maximum number of message in the outgoing message queue, 0 means unlimited
-
-        This property may not be changed if the connection is already open.
-        """
-        return self._max_queued_messages
-
-    @max_queued_messages.setter
-    def max_queued_messages(self, value: int) -> None:
-        if not self._connection_closed():
-            # Not tested.
-            raise RuntimeError("updating max_queued_messages on established connection is not supported")
-
-        if value < 0:
-            raise ValueError("Invalid queue size.")
-
-        self._max_queued_messages = value
-
-    @property
-    def will_topic(self) -> str | None:
-        """
-        The topic name a will message is sent to when disconnecting unexpectedly. None if a will shall not be sent.
-
-        This property is read-only. Use `will_set()` to change its value.
-        """
-        if self._will_topic is None:
-            return None
-
-        return self._will_topic.decode("utf-8")
-
-    @property
-    def will_payload(self) -> bytes | None:
-        """
-        The payload for the will message that is sent when disconnecting unexpectedly. None if a will shall not be sent.
-
-        This property is read-only. Use `will_set()` to change its value.
-        """
-        return self._will_payload
-
-    @property
-    def logger(self) -> logging.Logger | None:
-        return self._logger
-
-    @logger.setter
-    def logger(self, value: logging.Logger | None) -> None:
-        self._logger = value
-
-    def _sock_recv(self, bufsize: int) -> bytes:
-        if self._sock is None:
-            raise ConnectionError("self._sock is None")
-        try:
-            return self._sock.recv(bufsize)
-        except ssl.SSLWantReadError as err:
-            raise BlockingIOError() from err
-        except ssl.SSLWantWriteError as err:
-            self._call_socket_register_write()
-            raise BlockingIOError() from err
-        except AttributeError as err:
-            self._easy_log(
-                MQTT_LOG_DEBUG, "socket was None: %s", err)
-            raise ConnectionError() from err
-
-    def _sock_send(self, buf: bytes) -> int:
-        if self._sock is None:
-            raise ConnectionError("self._sock is None")
-
-        try:
-            return self._sock.send(buf)
-        except ssl.SSLWantReadError as err:
-            raise BlockingIOError() from err
-        except ssl.SSLWantWriteError as err:
-            self._call_socket_register_write()
-            raise BlockingIOError() from err
-        except BlockingIOError as err:
-            self._call_socket_register_write()
-            raise BlockingIOError() from err
-
-    def _sock_close(self) -> None:
-        """Close the connection to the server."""
-        if not self._sock:
-            return
-
-        try:
-            sock = self._sock
-            self._sock = None
-            self._call_socket_unregister_write(sock)
-            self._call_socket_close(sock)
-        finally:
-            # In case a callback fails, still close the socket to avoid leaking the file descriptor.
-            sock.close()
-
-    def _reset_sockets(self, sockpair_only: bool = False) -> None:
-        if not sockpair_only:
-            self._sock_close()
-
-        if self._sockpairR:
-            self._sockpairR.close()
-            self._sockpairR = None
-        if self._sockpairW:
-            self._sockpairW.close()
-            self._sockpairW = None
-
-    def reinitialise(
-        self,
-        client_id: str = "",
-        clean_session: bool = True,
-        userdata: Any = None,
-    ) -> None:
-        self._reset_sockets()
-
-        self.__init__(client_id, clean_session, userdata)  # type: ignore[misc]
-
-    def ws_set_options(
-        self,
-        path: str = "/mqtt",
-        headers: WebSocketHeaders | None = None,
-    ) -> None:
-        """ Set the path and headers for a websocket connection
-
-        :param str path: a string starting with / which should be the endpoint of the
-            mqtt connection on the remote server
-
-        :param headers:  can be either a dict or a callable object. If it is a dict then
-            the extra items in the dict are added to the websocket headers. If it is
-            a callable, then the default websocket headers are passed into this
-            function and the result is used as the new headers.
-        """
-        self._websocket_path = path
-
-        if headers is not None:
-            if isinstance(headers, dict) or callable(headers):
-                self._websocket_extra_headers = headers
-            else:
-                raise ValueError(
-                    "'headers' option to ws_set_options has to be either a dictionary or callable")
-
-    def tls_set_context(
-        self,
-        context: ssl.SSLContext | None = None,
-    ) -> None:
-        """Configure network encryption and authentication context. Enables SSL/TLS support.
-
-        :param context: an ssl.SSLContext object. By default this is given by
-            ``ssl.create_default_context()``, if available.
-
-        Must be called before `connect()`, `connect_async()` or `connect_srv()`."""
-        if self._ssl_context is not None:
-            raise ValueError('SSL/TLS has already been configured.')
-
-        if context is None:
-            context = ssl.create_default_context()
-
-        self._ssl = True
-        self._ssl_context = context
-
-        # Ensure _tls_insecure is consistent with check_hostname attribute
-        if hasattr(context, 'check_hostname'):
-            self._tls_insecure = not context.check_hostname
-
-    def tls_set(
-        self,
-        ca_certs: str | None = None,
-        certfile: str | None = None,
-        keyfile: str | None = None,
-        cert_reqs: ssl.VerifyMode | None = None,
-        tls_version: int | None = None,
-        ciphers: str | None = None,
-        keyfile_password: str | None = None,
-        alpn_protocols: list[str] | None = None,
-    ) -> None:
-        """Configure network encryption and authentication options. Enables SSL/TLS support.
-
-        :param str ca_certs: a string path to the Certificate Authority certificate files
-            that are to be treated as trusted by this client. If this is the only
-            option given then the client will operate in a similar manner to a web
-            browser. That is to say it will require the broker to have a
-            certificate signed by the Certificate Authorities in ca_certs and will
-            communicate using TLS v1,2, but will not attempt any form of
-            authentication. This provides basic network encryption but may not be
-            sufficient depending on how the broker is configured.
-
-            By default, on Python 2.7.9+ or 3.4+, the default certification
-            authority of the system is used. On older Python version this parameter
-            is mandatory.
-        :param str certfile: PEM encoded client certificate filename. Used with
-            keyfile for client TLS based authentication. Support for this feature is
-            broker dependent. Note that if the files in encrypted and needs a password to
-            decrypt it, then this can be passed using the keyfile_password argument - you
-            should take precautions to ensure that your password is
-            not hard coded into your program by loading the password from a file
-            for example. If you do not provide keyfile_password, the password will
-            be requested to be typed in at a terminal window.
-        :param str keyfile: PEM encoded client private keys filename. Used with
-            certfile for client TLS based authentication. Support for this feature is
-            broker dependent. Note that if the files in encrypted and needs a password to
-            decrypt it, then this can be passed using the keyfile_password argument - you
-            should take precautions to ensure that your password is
-            not hard coded into your program by loading the password from a file
-            for example. If you do not provide keyfile_password, the password will
-            be requested to be typed in at a terminal window.
-        :param cert_reqs: the certificate requirements that the client imposes
-            on the broker to be changed. By default this is ssl.CERT_REQUIRED,
-            which means that the broker must provide a certificate. See the ssl
-            pydoc for more information on this parameter.
-        :param tls_version: the version of the SSL/TLS protocol used to be
-            specified. By default TLS v1.2 is used. Previous versions are allowed
-            but not recommended due to possible security problems.
-        :param str ciphers: encryption ciphers that are allowed
-            for this connection, or None to use the defaults. See the ssl pydoc for
-            more information.
-
-        Must be called before `connect()`, `connect_async()` or `connect_srv()`."""
-        if ssl is None:
-            raise ValueError('This platform has no SSL/TLS.')
-
-        if not hasattr(ssl, 'SSLContext'):
-            # Require Python version that has SSL context support in standard library
-            raise ValueError(
-                'Python 2.7.9 and 3.2 are the minimum supported versions for TLS.')
-
-        if ca_certs is None and not hasattr(ssl.SSLContext, 'load_default_certs'):
-            raise ValueError('ca_certs must not be None.')
-
-        # Create SSLContext object
-        if tls_version is None:
-            tls_version = ssl.PROTOCOL_TLSv1_2
-            # If the python version supports it, use highest TLS version automatically
-            if hasattr(ssl, "PROTOCOL_TLS_CLIENT"):
-                # This also enables CERT_REQUIRED and check_hostname by default.
-                tls_version = ssl.PROTOCOL_TLS_CLIENT
-            elif hasattr(ssl, "PROTOCOL_TLS"):
-                tls_version = ssl.PROTOCOL_TLS
-        context = ssl.SSLContext(tls_version)
-
-        # Configure context
-        if ciphers is not None:
-            context.set_ciphers(ciphers)
-
-        if certfile is not None:
-            context.load_cert_chain(certfile, keyfile, keyfile_password)
-
-        if cert_reqs == ssl.CERT_NONE and hasattr(context, 'check_hostname'):
-            context.check_hostname = False
-
-        context.verify_mode = ssl.CERT_REQUIRED if cert_reqs is None else cert_reqs
-
-        if ca_certs is not None:
-            context.load_verify_locations(ca_certs)
-        else:
-            context.load_default_certs()
-
-        if alpn_protocols is not None:
-            if not getattr(ssl, "HAS_ALPN", None):
-                raise ValueError("SSL library has no support for ALPN")
-            context.set_alpn_protocols(alpn_protocols)
-
-        self.tls_set_context(context)
-
-        if cert_reqs != ssl.CERT_NONE:
-            # Default to secure, sets context.check_hostname attribute
-            # if available
-            self.tls_insecure_set(False)
-        else:
-            # But with ssl.CERT_NONE, we can not check_hostname
-            self.tls_insecure_set(True)
-
-    def tls_insecure_set(self, value: bool) -> None:
-        """Configure verification of the server hostname in the server certificate.
-
-        If value is set to true, it is impossible to guarantee that the host
-        you are connecting to is not impersonating your server. This can be
-        useful in initial server testing, but makes it possible for a malicious
-        third party to impersonate your server through DNS spoofing, for
-        example.
-
-        Do not use this function in a real system. Setting value to true means
-        there is no point using encryption.
-
-        Must be called before `connect()` and after either `tls_set()` or
-        `tls_set_context()`."""
-
-        if self._ssl_context is None:
-            raise ValueError(
-                'Must configure SSL context before using tls_insecure_set.')
-
-        self._tls_insecure = value
-
-        # Ensure check_hostname is consistent with _tls_insecure attribute
-        if hasattr(self._ssl_context, 'check_hostname'):
-            # Rely on SSLContext to check host name
-            # If verify_mode is CERT_NONE then the host name will never be checked
-            self._ssl_context.check_hostname = not value
-
-    def proxy_set(self, **proxy_args: Any) -> None:
-        """Configure proxying of MQTT connection. Enables support for SOCKS or
-        HTTP proxies.
-
-        Proxying is done through the PySocks library. Brief descriptions of the
-        proxy_args parameters are below; see the PySocks docs for more info.
-
-        (Required)
-
-        :param proxy_type: One of {socks.HTTP, socks.SOCKS4, or socks.SOCKS5}
-        :param proxy_addr: IP address or DNS name of proxy server
-
-        (Optional)
-
-        :param proxy_port: (int) port number of the proxy server. If not provided,
-            the PySocks package default value will be utilized, which differs by proxy_type.
-        :param proxy_rdns: boolean indicating whether proxy lookup should be performed
-            remotely (True, default) or locally (False)
-        :param proxy_username: username for SOCKS5 proxy, or userid for SOCKS4 proxy
-        :param proxy_password: password for SOCKS5 proxy
-
-        Example::
-
-            mqttc.proxy_set(proxy_type=socks.HTTP, proxy_addr='1.2.3.4', proxy_port=4231)
-        """
-        if socks is None:
-            raise ValueError("PySocks must be installed for proxy support.")
-        elif not self._proxy_is_valid(proxy_args):
-            raise ValueError("proxy_type and/or proxy_addr are invalid.")
-        else:
-            self._proxy = proxy_args
-
-    def enable_logger(self, logger: logging.Logger | None = None) -> None:
-        """
-        Enables a logger to send log messages to
-
-        :param logging.Logger logger: if specified, that ``logging.Logger`` object will be used, otherwise
-            one will be created automatically.
-
-        See `disable_logger` to undo this action.
-        """
-        if logger is None:
-            if self._logger is not None:
-                # Do not replace existing logger
-                return
-            logger = logging.getLogger(__name__)
-        self.logger = logger
-
-    def disable_logger(self) -> None:
-        """
-        Disable logging using standard python logging package. This has no effect on the `on_log` callback.
-        """
-        self._logger = None
-
-    def connect(
-        self,
-        host: str,
-        port: int = 1883,
-        keepalive: int = 60,
-        bind_address: str = "",
-        bind_port: int = 0,
-        clean_start: CleanStartOption = MQTT_CLEAN_START_FIRST_ONLY,
-        properties: Properties | None = None,
-    ) -> MQTTErrorCode:
-        """Connect to a remote broker. This is a blocking call that establishes
-        the underlying connection and transmits a CONNECT packet.
-        Note that the connection status will not be updated until a CONNACK is received and
-        processed (this requires a running network loop, see `loop_start`, `loop_forever`, `loop`...).
-
-        :param str host: the hostname or IP address of the remote broker.
-        :param int port: the network port of the server host to connect to. Defaults to
-            1883. Note that the default port for MQTT over SSL/TLS is 8883 so if you
-            are using `tls_set()` the port may need providing.
-        :param int keepalive: Maximum period in seconds between communications with the
-            broker. If no other messages are being exchanged, this controls the
-            rate at which the client will send ping messages to the broker.
-        :param bool clean_start: (MQTT v5.0 only) True, False or MQTT_CLEAN_START_FIRST_ONLY.
-            Sets the MQTT v5.0 clean_start flag always, never or on the first successful connect only,
-            respectively.  MQTT session data (such as outstanding messages and subscriptions)
-            is cleared on successful connect when the clean_start flag is set.
-            For MQTT v3.1.1, the ``clean_session`` argument of `Client` should be used for similar
-            result.
-        :param Properties properties: (MQTT v5.0 only) the MQTT v5.0 properties to be sent in the
-            MQTT connect packet.
-        """
-
-        if self._protocol == MQTTv5:
-            self._mqttv5_first_connect = True
-        else:
-            if clean_start != MQTT_CLEAN_START_FIRST_ONLY:
-                raise ValueError("Clean start only applies to MQTT V5")
-            if properties:
-                raise ValueError("Properties only apply to MQTT V5")
-
-        self.connect_async(host, port, keepalive,
-                           bind_address, bind_port, clean_start, properties)
-        return self.reconnect()
-
-    def connect_srv(
-        self,
-        domain: str | None = None,
-        keepalive: int = 60,
-        bind_address: str = "",
-        bind_port: int = 0,
-        clean_start: CleanStartOption = MQTT_CLEAN_START_FIRST_ONLY,
-        properties: Properties | None = None,
-    ) -> MQTTErrorCode:
-        """Connect to a remote broker.
-
-        :param str domain: the DNS domain to search for SRV records; if None,
-            try to determine local domain name.
-        :param keepalive, bind_address, clean_start and properties: see `connect()`
-        """
-
-        if HAVE_DNS is False:
-            raise ValueError(
-                'No DNS resolver library found, try "pip install dnspython".')
-
-        if domain is None:
-            domain = socket.getfqdn()
-            domain = domain[domain.find('.') + 1:]
-
-        try:
-            rr = f'_mqtt._tcp.{domain}'
-            if self._ssl:
-                # IANA specifies secure-mqtt (not mqtts) for port 8883
-                rr = f'_secure-mqtt._tcp.{domain}'
-            answers = []
-            for answer in dns.resolver.query(rr, dns.rdatatype.SRV):
-                addr = answer.target.to_text()[:-1]
-                answers.append(
-                    (addr, answer.port, answer.priority, answer.weight))
-        except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer, dns.resolver.NoNameservers) as err:
-            raise ValueError(f"No answer/NXDOMAIN for SRV in {domain}") from err
-
-        # FIXME: doesn't account for weight
-        for answer in answers:
-            host, port, prio, weight = answer
-
-            try:
-                return self.connect(host, port, keepalive, bind_address, bind_port, clean_start, properties)
-            except Exception:  # noqa: S110
-                pass
-
-        raise ValueError("No SRV hosts responded")
-
-    def connect_async(
-        self,
-        host: str,
-        port: int = 1883,
-        keepalive: int = 60,
-        bind_address: str = "",
-        bind_port: int = 0,
-        clean_start: CleanStartOption = MQTT_CLEAN_START_FIRST_ONLY,
-        properties: Properties | None = None,
-    ) -> None:
-        """Connect to a remote broker asynchronously. This is a non-blocking
-        connect call that can be used with `loop_start()` to provide very quick
-        start.
-
-        Any already established connection will be terminated immediately.
-
-        :param str host: the hostname or IP address of the remote broker.
-        :param int port: the network port of the server host to connect to. Defaults to
-            1883. Note that the default port for MQTT over SSL/TLS is 8883 so if you
-            are using `tls_set()` the port may need providing.
-        :param int keepalive: Maximum period in seconds between communications with the
-            broker. If no other messages are being exchanged, this controls the
-            rate at which the client will send ping messages to the broker.
-        :param bool clean_start: (MQTT v5.0 only) True, False or MQTT_CLEAN_START_FIRST_ONLY.
-            Sets the MQTT v5.0 clean_start flag always, never or on the first successful connect only,
-            respectively.  MQTT session data (such as outstanding messages and subscriptions)
-            is cleared on successful connect when the clean_start flag is set.
-            For MQTT v3.1.1, the ``clean_session`` argument of `Client` should be used for similar
-            result.
-        :param Properties properties: (MQTT v5.0 only) the MQTT v5.0 properties to be sent in the
-            MQTT connect packet.
-        """
-        if bind_port < 0:
-            raise ValueError('Invalid bind port number.')
-
-        # Switch to state NEW to allow update of host, port & co.
-        self._sock_close()
-        self._state = _ConnectionState.MQTT_CS_NEW
-
-        self.host = host
-        self.port = port
-        self.keepalive = keepalive
-        self._bind_address = bind_address
-        self._bind_port = bind_port
-        self._clean_start = clean_start
-        self._connect_properties = properties
-        self._state = _ConnectionState.MQTT_CS_CONNECT_ASYNC
-
-    def reconnect_delay_set(self, min_delay: int = 1, max_delay: int = 120) -> None:
-        """ Configure the exponential reconnect delay
-
-            When connection is lost, wait initially min_delay seconds and
-            double this time every attempt. The wait is capped at max_delay.
-            Once the client is fully connected (e.g. not only TCP socket, but
-            received a success CONNACK), the wait timer is reset to min_delay.
-        """
-        with self._reconnect_delay_mutex:
-            self._reconnect_min_delay = min_delay
-            self._reconnect_max_delay = max_delay
-            self._reconnect_delay = None
-
-    def reconnect(self) -> MQTTErrorCode:
-        """Reconnect the client after a disconnect. Can only be called after
-        connect()/connect_async()."""
-        if len(self._host) == 0:
-            raise ValueError('Invalid host.')
-        if self._port <= 0:
-            raise ValueError('Invalid port number.')
-
-        self._in_packet = {
-            "command": 0,
-            "have_remaining": 0,
-            "remaining_count": [],
-            "remaining_mult": 1,
-            "remaining_length": 0,
-            "packet": bytearray(b""),
-            "to_process": 0,
-            "pos": 0,
-        }
-
-        self._ping_t = 0.0
-        self._state = _ConnectionState.MQTT_CS_CONNECTING
-
-        self._sock_close()
-
-        # Mark all currently outgoing QoS = 0 packets as lost,
-        # or `wait_for_publish()` could hang forever
-        for pkt in self._out_packet:
-            if pkt["command"] & 0xF0 == PUBLISH and pkt["qos"] == 0 and pkt["info"] is not None:
-                pkt["info"].rc = MQTT_ERR_CONN_LOST
-                pkt["info"]._set_as_published()
-
-        self._out_packet.clear()
-
-        with self._msgtime_mutex:
-            self._last_msg_in = time_func()
-            self._last_msg_out = time_func()
-
-        # Put messages in progress in a valid state.
-        self._messages_reconnect_reset()
-
-        with self._callback_mutex:
-            on_pre_connect = self.on_pre_connect
-
-        if on_pre_connect:
-            try:
-                on_pre_connect(self, self._userdata)
-            except Exception as err:
-                self._easy_log(
-                    MQTT_LOG_ERR, 'Caught exception in on_pre_connect: %s', err)
-                if not self.suppress_exceptions:
-                    raise
-
-        self._sock = self._create_socket()
-
-        self._sock.setblocking(False)  # type: ignore[attr-defined]
-        self._registered_write = False
-        self._call_socket_open(self._sock)
-
-        return self._send_connect(self._keepalive)
-
-    def loop(self, timeout: float = 1.0) -> MQTTErrorCode:
-        """Process network events.
-
-        It is strongly recommended that you use `loop_start()`, or
-        `loop_forever()`, or if you are using an external event loop using
-        `loop_read()`, `loop_write()`, and `loop_misc()`. Using loop() on it's own is
-        no longer recommended.
-
-        This function must be called regularly to ensure communication with the
-        broker is carried out. It calls select() on the network socket to wait
-        for network events. If incoming data is present it will then be
-        processed. Outgoing commands, from e.g. `publish()`, are normally sent
-        immediately that their function is called, but this is not always
-        possible. loop() will also attempt to send any remaining outgoing
-        messages, which also includes commands that are part of the flow for
-        messages with QoS>0.
-
-        :param int timeout: The time in seconds to wait for incoming/outgoing network
-            traffic before timing out and returning.
-
-        Returns MQTT_ERR_SUCCESS on success.
-        Returns >0 on error.
-
-        A ValueError will be raised if timeout < 0"""
-
-        if self._sockpairR is None or self._sockpairW is None:
-            self._reset_sockets(sockpair_only=True)
-            self._sockpairR, self._sockpairW = _socketpair_compat()
-
-        return self._loop(timeout)
-
-    def _loop(self, timeout: float = 1.0) -> MQTTErrorCode:
-        if timeout < 0.0:
-            raise ValueError('Invalid timeout.')
-
-        if self.want_write():
-            wlist = [self._sock]
-        else:
-            wlist = []
-
-        # used to check if there are any bytes left in the (SSL) socket
-        pending_bytes = 0
-        if hasattr(self._sock, 'pending'):
-            pending_bytes = self._sock.pending()  # type: ignore[union-attr]
-
-        # if bytes are pending do not wait in select
-        if pending_bytes > 0:
-            timeout = 0.0
-
-        # sockpairR is used to break out of select() before the timeout, on a
-        # call to publish() etc.
-        if self._sockpairR is None:
-            rlist = [self._sock]
-        else:
-            rlist = [self._sock, self._sockpairR]
-
-        try:
-            socklist = select.select(rlist, wlist, [], timeout)
-        except TypeError:
-            # Socket isn't correct type, in likelihood connection is lost
-            # ... or we called disconnect(). In that case the socket will
-            # be closed but some loop (like loop_forever) will continue to
-            # call _loop(). We still want to break that loop by returning an
-            # rc != MQTT_ERR_SUCCESS and we don't want state to change from
-            # mqtt_cs_disconnecting.
-            if self._state not in (_ConnectionState.MQTT_CS_DISCONNECTING, _ConnectionState.MQTT_CS_DISCONNECTED):
-                self._state = _ConnectionState.MQTT_CS_CONNECTION_LOST
-            return MQTTErrorCode.MQTT_ERR_CONN_LOST
-        except ValueError:
-            # Can occur if we just reconnected but rlist/wlist contain a -1 for
-            # some reason.
-            if self._state not in (_ConnectionState.MQTT_CS_DISCONNECTING, _ConnectionState.MQTT_CS_DISCONNECTED):
-                self._state = _ConnectionState.MQTT_CS_CONNECTION_LOST
-            return MQTTErrorCode.MQTT_ERR_CONN_LOST
-        except Exception:
-            # Note that KeyboardInterrupt, etc. can still terminate since they
-            # are not derived from Exception
-            return MQTTErrorCode.MQTT_ERR_UNKNOWN
-
-        if self._sock in socklist[0] or pending_bytes > 0:
-            rc = self.loop_read()
-            if rc or self._sock is None:
-                return rc
-
-        if self._sockpairR and self._sockpairR in socklist[0]:
-            # Stimulate output write even though we didn't ask for it, because
-            # at that point the publish or other command wasn't present.
-            socklist[1].insert(0, self._sock)
-            # Clear sockpairR - only ever a single byte written.
-            try:
-                # Read many bytes at once - this allows up to 10000 calls to
-                # publish() inbetween calls to loop().
-                self._sockpairR.recv(10000)
-            except BlockingIOError:
-                pass
-
-        if self._sock in socklist[1]:
-            rc = self.loop_write()
-            if rc or self._sock is None:
-                return rc
-
-        return self.loop_misc()
-
-    def publish(
-        self,
-        topic: str,
-        payload: PayloadType = None,
-        qos: int = 0,
-        retain: bool = False,
-        properties: Properties | None = None,
-    ) -> MQTTMessageInfo:
-        """Publish a message on a topic.
-
-        This causes a message to be sent to the broker and subsequently from
-        the broker to any clients subscribing to matching topics.
-
-        :param str topic: The topic that the message should be published on.
-        :param payload: The actual message to send. If not given, or set to None a
-            zero length message will be used. Passing an int or float will result
-            in the payload being converted to a string representing that number. If
-            you wish to send a true int/float, use struct.pack() to create the
-            payload you require.
-        :param int qos: The quality of service level to use.
-        :param bool retain: If set to true, the message will be set as the "last known
-            good"/retained message for the topic.
-        :param Properties properties: (MQTT v5.0 only) the MQTT v5.0 properties to be included.
-
-        Returns a `MQTTMessageInfo` class, which can be used to determine whether
-        the message has been delivered (using `is_published()`) or to block
-        waiting for the message to be delivered (`wait_for_publish()`). The
-        message ID and return code of the publish() call can be found at
-        :py:attr:`info.mid <MQTTMessage.mid>` and :py:attr:`info.rc <MQTTMessage.rc>`.
-
-        For backwards compatibility, the `MQTTMessageInfo` class is iterable so
-        the old construct of ``(rc, mid) = client.publish(...)`` is still valid.
-
-        rc is MQTT_ERR_SUCCESS to indicate success or MQTT_ERR_NO_CONN if the
-        client is not currently connected.  mid is the message ID for the
-        publish request. The mid value can be used to track the publish request
-        by checking against the mid argument in the on_publish() callback if it
-        is defined.
-
-        :raises ValueError: if topic is None, has zero length or is
-            invalid (contains a wildcard), except if the MQTT version used is v5.0.
-            For v5.0, a zero length topic can be used when a Topic Alias has been set.
-        :raises ValueError: if qos is not one of 0, 1 or 2
-        :raises ValueError: if the length of the payload is greater than 268435455 bytes.
-        """
-        if self._protocol != MQTTv5:
-            if topic is None or len(topic) == 0:
-                raise ValueError('Invalid topic.')
-
-        topic_bytes = topic.encode('utf-8')
-
-        self._raise_for_invalid_topic(topic_bytes)
-
-        if qos < 0 or qos > 2:
-            raise ValueError('Invalid QoS level.')
-
-        local_payload = _encode_payload(payload)
-
-        if len(local_payload) > 268435455:
-            raise ValueError('Payload too large.')
-
-        local_mid = self._mid_generate()
-
-        if qos == 0:
-            info = MQTTMessageInfo(local_mid)
-            rc = self._send_publish(
-                local_mid, topic_bytes, local_payload, qos, retain, False, info, properties)
-            info.rc = rc
-            return info
-        else:
-            message = MQTTMessage(local_mid, topic_bytes)
-            message.timestamp = time_func()
-            message.payload = local_payload
-            message.qos = qos
-            message.retain = retain
-            message.dup = False
-            message.properties = properties
-
-            with self._out_message_mutex:
-                if self._max_queued_messages > 0 and len(self._out_messages) >= self._max_queued_messages:
-                    message.info.rc = MQTTErrorCode.MQTT_ERR_QUEUE_SIZE
-                    return message.info
-
-                if local_mid in self._out_messages:
-                    message.info.rc = MQTTErrorCode.MQTT_ERR_QUEUE_SIZE
-                    return message.info
-
-                self._out_messages[message.mid] = message
-                if self._max_inflight_messages == 0 or self._inflight_messages < self._max_inflight_messages:
-                    self._inflight_messages += 1
-                    if qos == 1:
-                        message.state = mqtt_ms_wait_for_puback
-                    elif qos == 2:
-                        message.state = mqtt_ms_wait_for_pubrec
-
-                    rc = self._send_publish(message.mid, topic_bytes, message.payload, message.qos, message.retain,
-                                            message.dup, message.info, message.properties)
-
-                    # remove from inflight messages so it will be send after a connection is made
-                    if rc == MQTTErrorCode.MQTT_ERR_NO_CONN:
-                        self._inflight_messages -= 1
-                        message.state = mqtt_ms_publish
-
-                    message.info.rc = rc
-                    return message.info
-                else:
-                    message.state = mqtt_ms_queued
-                    message.info.rc = MQTTErrorCode.MQTT_ERR_SUCCESS
-                    return message.info
-
-    def username_pw_set(
-        self, username: str | None, password: str | None = None
-    ) -> None:
-        """Set a username and optionally a password for broker authentication.
-
-        Must be called before connect() to have any effect.
-        Requires a broker that supports MQTT v3.1 or more.
-
-        :param str username: The username to authenticate with. Need have no relationship to the client id. Must be str
-            [MQTT-3.1.3-11].
-            Set to None to reset client back to not using username/password for broker authentication.
-        :param str password: The password to authenticate with. Optional, set to None if not required. If it is str, then it
-            will be encoded as UTF-8.
-        """
-
-        # [MQTT-3.1.3-11] User name must be UTF-8 encoded string
-        self._username = None if username is None else username.encode('utf-8')
-        if isinstance(password, str):
-            self._password = password.encode('utf-8')
-        else:
-            self._password = password
-
-    def enable_bridge_mode(self) -> None:
-        """Sets the client in a bridge mode instead of client mode.
-
-        Must be called before `connect()` to have any effect.
-        Requires brokers that support bridge mode.
-
-        Under bridge mode, the broker will identify the client as a bridge and
-        not send it's own messages back to it. Hence a subsciption of # is
-        possible without message loops. This feature also correctly propagates
-        the retain flag on the messages.
-
-        Currently Mosquitto and RSMB support this feature. This feature can
-        be used to create a bridge between multiple broker.
-        """
-        self._client_mode = MQTT_BRIDGE
-
-    def _connection_closed(self) -> bool:
-        """
-        Return true if the connection is closed (and not trying to be opened).
-        """
-        return (
-            self._state == _ConnectionState.MQTT_CS_NEW
-            or (self._state in (_ConnectionState.MQTT_CS_DISCONNECTING, _ConnectionState.MQTT_CS_DISCONNECTED) and self._sock is None))
-
-    def is_connected(self) -> bool:
-        """Returns the current status of the connection
-
-        True if connection exists
-        False if connection is closed
-        """
-        return self._state == _ConnectionState.MQTT_CS_CONNECTED
-
-    def disconnect(
-        self,
-        reasoncode: ReasonCode | None = None,
-        properties: Properties | None = None,
-    ) -> MQTTErrorCode:
-        """Disconnect a connected client from the broker.
-
-        :param ReasonCode reasoncode: (MQTT v5.0 only) a ReasonCode instance setting the MQTT v5.0
-            reasoncode to be sent with the disconnect packet. It is optional, the receiver
-            then assuming that 0 (success) is the value.
-        :param Properties properties: (MQTT v5.0 only) a Properties instance setting the MQTT v5.0 properties
-            to be included. Optional - if not set, no properties are sent.
-        """
-        if self._sock is None:
-            self._state = _ConnectionState.MQTT_CS_DISCONNECTED
-            return MQTT_ERR_NO_CONN
-        else:
-            self._state = _ConnectionState.MQTT_CS_DISCONNECTING
-
-        return self._send_disconnect(reasoncode, properties)
-
-    def subscribe(
-        self,
-        topic: str | tuple[str, int] | tuple[str, SubscribeOptions] | list[tuple[str, int]] | list[tuple[str, SubscribeOptions]],
-        qos: int = 0,
-        options: SubscribeOptions | None = None,
-        properties: Properties | None = None,
-    ) -> tuple[MQTTErrorCode, int | None]:
-        """Subscribe the client to one or more topics.
-
-        This function may be called in three different ways (and a further three for MQTT v5.0):
-
-        Simple string and integer
-        -------------------------
-        e.g. subscribe("my/topic", 2)
-
-        :topic: A string specifying the subscription topic to subscribe to.
-        :qos: The desired quality of service level for the subscription.
-            Defaults to 0.
-        :options and properties: Not used.
-
-        Simple string and subscribe options (MQTT v5.0 only)
-        ----------------------------------------------------
-        e.g. subscribe("my/topic", options=SubscribeOptions(qos=2))
-
-        :topic: A string specifying the subscription topic to subscribe to.
-        :qos: Not used.
-        :options: The MQTT v5.0 subscribe options.
-        :properties: a Properties instance setting the MQTT v5.0 properties
-            to be included. Optional - if not set, no properties are sent.
-
-        String and integer tuple
-        ------------------------
-        e.g. subscribe(("my/topic", 1))
-
-        :topic: A tuple of (topic, qos). Both topic and qos must be present in
-               the tuple.
-        :qos and options: Not used.
-        :properties: Only used for MQTT v5.0.  A Properties instance setting the
-            MQTT v5.0 properties. Optional - if not set, no properties are sent.
-
-        String and subscribe options tuple (MQTT v5.0 only)
-        ---------------------------------------------------
-        e.g. subscribe(("my/topic", SubscribeOptions(qos=1)))
-
-        :topic: A tuple of (topic, SubscribeOptions). Both topic and subscribe
-                options must be present in the tuple.
-        :qos and options: Not used.
-        :properties: a Properties instance setting the MQTT v5.0 properties
-            to be included. Optional - if not set, no properties are sent.
-
-        List of string and integer tuples
-        ---------------------------------
-        e.g. subscribe([("my/topic", 0), ("another/topic", 2)])
-
-        This allows multiple topic subscriptions in a single SUBSCRIPTION
-        command, which is more efficient than using multiple calls to
-        subscribe().
-
-        :topic: A list of tuple of format (topic, qos). Both topic and qos must
-               be present in all of the tuples.
-        :qos, options and properties: Not used.
-
-        List of string and subscribe option tuples (MQTT v5.0 only)
-        -----------------------------------------------------------
-        e.g. subscribe([("my/topic", SubscribeOptions(qos=0), ("another/topic", SubscribeOptions(qos=2)])
-
-        This allows multiple topic subscriptions in a single SUBSCRIPTION
-        command, which is more efficient than using multiple calls to
-        subscribe().
-
-        :topic: A list of tuple of format (topic, SubscribeOptions). Both topic and subscribe
-                options must be present in all of the tuples.
-        :qos and options: Not used.
-        :properties: a Properties instance setting the MQTT v5.0 properties
-            to be included. Optional - if not set, no properties are sent.
-
-        The function returns a tuple (result, mid), where result is
-        MQTT_ERR_SUCCESS to indicate success or (MQTT_ERR_NO_CONN, None) if the
-        client is not currently connected.  mid is the message ID for the
-        subscribe request. The mid value can be used to track the subscribe
-        request by checking against the mid argument in the on_subscribe()
-        callback if it is defined.
-
-        Raises a ValueError if qos is not 0, 1 or 2, or if topic is None or has
-        zero string length, or if topic is not a string, tuple or list.
-        """
-        topic_qos_list = None
-
-        if isinstance(topic, tuple):
-            if self._protocol == MQTTv5:
-                topic, options = topic  # type: ignore
-                if not isinstance(options, SubscribeOptions):
-                    raise ValueError(
-                        'Subscribe options must be instance of SubscribeOptions class.')
-            else:
-                topic, qos = topic  # type: ignore
-
-        if isinstance(topic, (bytes, str)):
-            if qos < 0 or qos > 2:
-                raise ValueError('Invalid QoS level.')
-            if self._protocol == MQTTv5:
-                if options is None:
-                    # if no options are provided, use the QoS passed instead
-                    options = SubscribeOptions(qos=qos)
-                elif qos != 0:
-                    raise ValueError(
-                        'Subscribe options and qos parameters cannot be combined.')
-                if not isinstance(options, SubscribeOptions):
-                    raise ValueError(
-                        'Subscribe options must be instance of SubscribeOptions class.')
-                topic_qos_list = [(topic.encode('utf-8'), options)]
-            else:
-                if topic is None or len(topic) == 0:
-                    raise ValueError('Invalid topic.')
-                topic_qos_list = [(topic.encode('utf-8'), qos)]  # type: ignore
-        elif isinstance(topic, list):
-            if len(topic) == 0:
-                raise ValueError('Empty topic list')
-            topic_qos_list = []
-            if self._protocol == MQTTv5:
-                for t, o in topic:
-                    if not isinstance(o, SubscribeOptions):
-                        # then the second value should be QoS
-                        if o < 0 or o > 2:
-                            raise ValueError('Invalid QoS level.')
-                        o = SubscribeOptions(qos=o)
-                    topic_qos_list.append((t.encode('utf-8'), o))
-            else:
-                for t, q in topic:
-                    if isinstance(q, SubscribeOptions) or q < 0 or q > 2:
-                        raise ValueError('Invalid QoS level.')
-                    if t is None or len(t) == 0 or not isinstance(t, (bytes, str)):
-                        raise ValueError('Invalid topic.')
-                    topic_qos_list.append((t.encode('utf-8'), q))  # type: ignore
-
-        if topic_qos_list is None:
-            raise ValueError("No topic specified, or incorrect topic type.")
-
-        if any(self._filter_wildcard_len_check(topic) != MQTT_ERR_SUCCESS for topic, _ in topic_qos_list):
-            raise ValueError('Invalid subscription filter.')
-
-        if self._sock is None:
-            return (MQTT_ERR_NO_CONN, None)
-
-        return self._send_subscribe(False, topic_qos_list, properties)
-
-    def unsubscribe(
-        self, topic: str | list[str], properties: Properties | None = None
-    ) -> tuple[MQTTErrorCode, int | None]:
-        """Unsubscribe the client from one or more topics.
-
-        :param topic: A single string, or list of strings that are the subscription
-            topics to unsubscribe from.
-        :param properties: (MQTT v5.0 only) a Properties instance setting the MQTT v5.0 properties
-            to be included. Optional - if not set, no properties are sent.
-
-        Returns a tuple (result, mid), where result is MQTT_ERR_SUCCESS
-        to indicate success or (MQTT_ERR_NO_CONN, None) if the client is not
-        currently connected.
-        mid is the message ID for the unsubscribe request. The mid value can be
-        used to track the unsubscribe request by checking against the mid
-        argument in the on_unsubscribe() callback if it is defined.
-
-        :raises ValueError: if topic is None or has zero string length, or is
-            not a string or list.
-        """
-        topic_list = None
-        if topic is None:
-            raise ValueError('Invalid topic.')
-        if isinstance(topic, (bytes, str)):
-            if len(topic) == 0:
-                raise ValueError('Invalid topic.')
-            topic_list = [topic.encode('utf-8')]
-        elif isinstance(topic, list):
-            topic_list = []
-            for t in topic:
-                if len(t) == 0 or not isinstance(t, (bytes, str)):
-                    raise ValueError('Invalid topic.')
-                topic_list.append(t.encode('utf-8'))
-
-        if topic_list is None:
-            raise ValueError("No topic specified, or incorrect topic type.")
-
-        if self._sock is None:
-            return (MQTTErrorCode.MQTT_ERR_NO_CONN, None)
-
-        return self._send_unsubscribe(False, topic_list, properties)
-
-    def loop_read(self, max_packets: int = 1) -> MQTTErrorCode:
-        """Process read network events. Use in place of calling `loop()` if you
-        wish to handle your client reads as part of your own application.
-
-        Use `socket()` to obtain the client socket to call select() or equivalent
-        on.
-
-        Do not use if you are using `loop_start()` or `loop_forever()`."""
-        if self._sock is None:
-            return MQTTErrorCode.MQTT_ERR_NO_CONN
-
-        max_packets = len(self._out_messages) + len(self._in_messages)
-        if max_packets < 1:
-            max_packets = 1
-
-        for _ in range(0, max_packets):
-            if self._sock is None:
-                return MQTTErrorCode.MQTT_ERR_NO_CONN
-            rc = self._packet_read()
-            if rc > 0:
-                return self._loop_rc_handle(rc)
-            elif rc == MQTTErrorCode.MQTT_ERR_AGAIN:
-                return MQTTErrorCode.MQTT_ERR_SUCCESS
-        return MQTTErrorCode.MQTT_ERR_SUCCESS
-
-    def loop_write(self) -> MQTTErrorCode:
-        """Process write network events. Use in place of calling `loop()` if you
-        wish to handle your client writes as part of your own application.
-
-        Use `socket()` to obtain the client socket to call select() or equivalent
-        on.
-
-        Use `want_write()` to determine if there is data waiting to be written.
-
-        Do not use if you are using `loop_start()` or `loop_forever()`."""
-        if self._sock is None:
-            return MQTTErrorCode.MQTT_ERR_NO_CONN
-
-        try:
-            rc = self._packet_write()
-            if rc == MQTTErrorCode.MQTT_ERR_AGAIN:
-                return MQTTErrorCode.MQTT_ERR_SUCCESS
-            elif rc > 0:
-                return self._loop_rc_handle(rc)
-            else:
-                return MQTTErrorCode.MQTT_ERR_SUCCESS
-        finally:
-            if self.want_write():
-                self._call_socket_register_write()
-            else:
-                self._call_socket_unregister_write()
-
-    def want_write(self) -> bool:
-        """Call to determine if there is network data waiting to be written.
-        Useful if you are calling select() yourself rather than using `loop()`, `loop_start()` or `loop_forever()`.
-        """
-        return len(self._out_packet) > 0
-
-    def loop_misc(self) -> MQTTErrorCode:
-        """Process miscellaneous network events. Use in place of calling `loop()` if you
-        wish to call select() or equivalent on.
-
-        Do not use if you are using `loop_start()` or `loop_forever()`."""
-        if self._sock is None:
-            return MQTTErrorCode.MQTT_ERR_NO_CONN
-
-        now = time_func()
-        self._check_keepalive()
-
-        if self._ping_t > 0 and now - self._ping_t >= self._keepalive:
-            # client->ping_t != 0 means we are waiting for a pingresp.
-            # This hasn't happened in the keepalive time so we should disconnect.
-            self._sock_close()
-
-            if self._state in (_ConnectionState.MQTT_CS_DISCONNECTING, _ConnectionState.MQTT_CS_DISCONNECTED):
-                self._state = _ConnectionState.MQTT_CS_DISCONNECTED
-                rc = MQTTErrorCode.MQTT_ERR_SUCCESS
-            else:
-                self._state = _ConnectionState.MQTT_CS_CONNECTION_LOST
-                rc = MQTTErrorCode.MQTT_ERR_KEEPALIVE
-
-            self._do_on_disconnect(
-                packet_from_broker=False,
-                v1_rc=rc,
-            )
-
-            return MQTTErrorCode.MQTT_ERR_CONN_LOST
-
-        return MQTTErrorCode.MQTT_ERR_SUCCESS
-
-    def max_inflight_messages_set(self, inflight: int) -> None:
-        """Set the maximum number of messages with QoS>0 that can be part way
-        through their network flow at once. Defaults to 20."""
-        self.max_inflight_messages = inflight
-
-    def max_queued_messages_set(self, queue_size: int) -> Client:
-        """Set the maximum number of messages in the outgoing message queue.
-        0 means unlimited."""
-        if not isinstance(queue_size, int):
-            raise ValueError('Invalid type of queue size.')
-        self.max_queued_messages = queue_size
-        return self
-
-    def user_data_set(self, userdata: Any) -> None:
-        """Set the user data variable passed to callbacks. May be any data type."""
-        self._userdata = userdata
-
-    def user_data_get(self) -> Any:
-        """Get the user data variable passed to callbacks. May be any data type."""
-        return self._userdata
-
-    def will_set(
-        self,
-        topic: str,
-        payload: PayloadType = None,
-        qos: int = 0,
-        retain: bool = False,
-        properties: Properties | None = None,
-    ) -> None:
-        """Set a Will to be sent by the broker in case the client disconnects unexpectedly.
-
-        This must be called before connect() to have any effect.
-
-        :param str topic: The topic that the will message should be published on.
-        :param payload: The message to send as a will. If not given, or set to None a
-            zero length message will be used as the will. Passing an int or float
-            will result in the payload being converted to a string representing
-            that number. If you wish to send a true int/float, use struct.pack() to
-            create the payload you require.
-        :param int qos: The quality of service level to use for the will.
-        :param bool retain: If set to true, the will message will be set as the "last known
-            good"/retained message for the topic.
-        :param Properties properties: (MQTT v5.0 only) the MQTT v5.0 properties
-            to be included with the will message. Optional - if not set, no properties are sent.
-
-        :raises ValueError: if qos is not 0, 1 or 2, or if topic is None or has
-            zero string length.
-
-        See `will_clear` to clear will. Note that will are NOT send if the client disconnect cleanly
-        for example by calling `disconnect()`.
-        """
-        if topic is None or len(topic) == 0:
-            raise ValueError('Invalid topic.')
-
-        if qos < 0 or qos > 2:
-            raise ValueError('Invalid QoS level.')
-
-        if properties and not isinstance(properties, Properties):
-            raise ValueError(
-                "The properties argument must be an instance of the Properties class.")
-
-        self._will_payload = _encode_payload(payload)
-        self._will = True
-        self._will_topic = topic.encode('utf-8')
-        self._will_qos = qos
-        self._will_retain = retain
-        self._will_properties = properties
-
-    def will_clear(self) -> None:
-        """ Removes a will that was previously configured with `will_set()`.
-
-        Must be called before connect() to have any effect."""
-        self._will = False
-        self._will_topic = b""
-        self._will_payload = b""
-        self._will_qos = 0
-        self._will_retain = False
-
-    def socket(self) -> SocketLike | None:
-        """Return the socket or ssl object for this client."""
-        return self._sock
-
-    def loop_forever(
-        self,
-        timeout: float = 1.0,
-        retry_first_connection: bool = False,
-    ) -> MQTTErrorCode:
-        """This function calls the network loop functions for you in an
-        infinite blocking loop. It is useful for the case where you only want
-        to run the MQTT client loop in your program.
-
-        loop_forever() will handle reconnecting for you if reconnect_on_failure is
-        true (this is the default behavior). If you call `disconnect()` in a callback
-        it will return.
-
-        :param int timeout: The time in seconds to wait for incoming/outgoing network
-          traffic before timing out and returning.
-        :param bool retry_first_connection: Should the first connection attempt be retried on failure.
-          This is independent of the reconnect_on_failure setting.
-
-        :raises OSError: if the first connection fail unless retry_first_connection=True
-        """
-
-        run = True
-
-        while run:
-            if self._thread_terminate is True:
-                break
-
-            if self._state == _ConnectionState.MQTT_CS_CONNECT_ASYNC:
-                try:
-                    self.reconnect()
-                except OSError:
-                    self._handle_on_connect_fail()
-                    if not retry_first_connection:
-                        raise
-                    self._easy_log(
-                        MQTT_LOG_DEBUG, "Connection failed, retrying")
-                    self._reconnect_wait()
-            else:
-                break
-
-        while run:
-            rc = MQTTErrorCode.MQTT_ERR_SUCCESS
-            while rc == MQTTErrorCode.MQTT_ERR_SUCCESS:
-                rc = self._loop(timeout)
-                # We don't need to worry about locking here, because we've
-                # either called loop_forever() when in single threaded mode, or
-                # in multi threaded mode when loop_stop() has been called and
-                # so no other threads can access _out_packet or _messages.
-                if (self._thread_terminate is True
-                    and len(self._out_packet) == 0
-                        and len(self._out_messages) == 0):
-                    rc = MQTTErrorCode.MQTT_ERR_NOMEM
-                    run = False
-
-            def should_exit() -> bool:
-                return (
-                    self._state in (_ConnectionState.MQTT_CS_DISCONNECTING, _ConnectionState.MQTT_CS_DISCONNECTED) or
-                    run is False or  # noqa: B023 (uses the run variable from the outer scope on purpose)
-                    self._thread_terminate is True
-                )
-
-            if should_exit() or not self._reconnect_on_failure:
-                run = False
-            else:
-                self._reconnect_wait()
-
-                if should_exit():
-                    run = False
-                else:
-                    try:
-                        self.reconnect()
-                    except OSError:
-                        self._handle_on_connect_fail()
-                        self._easy_log(
-                            MQTT_LOG_DEBUG, "Connection failed, retrying")
-
-        return rc
-
-    def loop_start(self) -> MQTTErrorCode:
-        """This is part of the threaded client interface. Call this once to
-        start a new thread to process network traffic. This provides an
-        alternative to repeatedly calling `loop()` yourself.
-
-        Under the hood, this will call `loop_forever` in a thread, which means that
-        the thread will terminate if you call `disconnect()`
-        """
-        if self._thread is not None:
-            return MQTTErrorCode.MQTT_ERR_INVAL
-
-        self._sockpairR, self._sockpairW = _socketpair_compat()
-        self._thread_terminate = False
-        self._thread = threading.Thread(target=self._thread_main, name=f"paho-mqtt-client-{self._client_id.decode()}")
-        self._thread.daemon = True
-        self._thread.start()
-
-        return MQTTErrorCode.MQTT_ERR_SUCCESS
-
-    def loop_stop(self) -> MQTTErrorCode:
-        """This is part of the threaded client interface. Call this once to
-        stop the network thread previously created with `loop_start()`. This call
-        will block until the network thread finishes.
-
-        This don't guarantee that publish packet are sent, use `wait_for_publish` or
-        `on_publish` to ensure `publish` are sent.
-        """
-        if self._thread is None:
-            return MQTTErrorCode.MQTT_ERR_INVAL
-
-        self._thread_terminate = True
-        if threading.current_thread() != self._thread:
-            self._thread.join()
-
-        return MQTTErrorCode.MQTT_ERR_SUCCESS
-
-    @property
-    def callback_api_version(self) -> CallbackAPIVersion:
-        """
-        Return the callback API version used for user-callback. See docstring for
-        each user-callback (`on_connect`, `on_publish`, ...) for details.
-
-        This property is read-only.
-        """
-        return self._callback_api_version
-
-    @property
-    def on_log(self) -> CallbackOnLog | None:
-        """The callback called when the client has log information.
-        Defined to allow debugging.
-
-        Expected signature is::
-
-            log_callback(client, userdata, level, buf)
-
-        :param Client client: the client instance for this callback
-        :param userdata: the private user data as set in Client() or user_data_set()
-        :param int level: gives the severity of the message and will be one of
-                    MQTT_LOG_INFO, MQTT_LOG_NOTICE, MQTT_LOG_WARNING,
-                    MQTT_LOG_ERR, and MQTT_LOG_DEBUG.
-        :param str buf: the message itself
-
-        Decorator: @client.log_callback() (``client`` is the name of the
-            instance which this callback is being attached to)
-        """
-        return self._on_log
-
-    @on_log.setter
-    def on_log(self, func: CallbackOnLog | None) -> None:
-        self._on_log = func
-
-    def log_callback(self) -> Callable[[CallbackOnLog], CallbackOnLog]:
-        def decorator(func: CallbackOnLog) -> CallbackOnLog:
-            self.on_log = func
-            return func
-        return decorator
-
-    @property
-    def on_pre_connect(self) -> CallbackOnPreConnect | None:
-        """The callback called immediately prior to the connection is made
-        request.
-
-        Expected signature (for all callback API version)::
-
-            connect_callback(client, userdata)
-
-        :parama Client client: the client instance for this callback
-        :parama userdata: the private user data as set in Client() or user_data_set()
-
-        Decorator: @client.pre_connect_callback() (``client`` is the name of the
-            instance which this callback is being attached to)
-
-        """
-        return self._on_pre_connect
-
-    @on_pre_connect.setter
-    def on_pre_connect(self, func: CallbackOnPreConnect | None) -> None:
-        with self._callback_mutex:
-            self._on_pre_connect = func
-
-    def pre_connect_callback(
-        self,
-    ) -> Callable[[CallbackOnPreConnect], CallbackOnPreConnect]:
-        def decorator(func: CallbackOnPreConnect) -> CallbackOnPreConnect:
-            self.on_pre_connect = func
-            return func
-        return decorator
-
-    @property
-    def on_connect(self) -> CallbackOnConnect | None:
-        """The callback called when the broker reponds to our connection request.
-
-        Expected signature for callback API version 2::
-
-            connect_callback(client, userdata, connect_flags, reason_code, properties)
-
-        Expected signature for callback API version 1 change with MQTT protocol version:
-            * For MQTT v3.1 and v3.1.1 it's::
-
-                connect_callback(client, userdata, flags, rc)
-
-            * For MQTT v5.0 it's::
-
-                connect_callback(client, userdata, flags, reason_code, properties)
-
-
-        :param Client client: the client instance for this callback
-        :param userdata: the private user data as set in Client() or user_data_set()
-        :param ConnectFlags connect_flags: the flags for this connection
-        :param ReasonCode reason_code: the connection reason code received from the broken.
-                       In MQTT v5.0 it's the reason code defined by the standard.
-                       In MQTT v3, we convert return code to a reason code, see
-                       `convert_connack_rc_to_reason_code()`.
-                       `ReasonCode` may be compared to integer.
-        :param Properties properties: the MQTT v5.0 properties received from the broker.
-                       For MQTT v3.1 and v3.1.1 properties is not provided and an empty Properties
-                       object is always used.
-        :param dict flags: response flags sent by the broker
-        :param int rc: the connection result, should have a value of `ConnackCode`
-
-        flags is a dict that contains response flags from the broker:
-            flags['session present'] - this flag is useful for clients that are
-                using clean session set to 0 only. If a client with clean
-                session=0, that reconnects to a broker that it has previously
-                connected to, this flag indicates whether the broker still has the
-                session information for the client. If 1, the session still exists.
-
-        The value of rc indicates success or not:
-            - 0: Connection successful
-            - 1: Connection refused - incorrect protocol version
-            - 2: Connection refused - invalid client identifier
-            - 3: Connection refused - server unavailable
-            - 4: Connection refused - bad username or password
-            - 5: Connection refused - not authorised
-            - 6-255: Currently unused.
-
-        Decorator: @client.connect_callback() (``client`` is the name of the
-            instance which this callback is being attached to)
-        """
-        return self._on_connect
-
-    @on_connect.setter
-    def on_connect(self, func: CallbackOnConnect | None) -> None:
-        with self._callback_mutex:
-            self._on_connect = func
-
-    def connect_callback(
-        self,
-    ) -> Callable[[CallbackOnConnect], CallbackOnConnect]:
-        def decorator(func: CallbackOnConnect) -> CallbackOnConnect:
-            self.on_connect = func
-            return func
-        return decorator
-
-    @property
-    def on_connect_fail(self) -> CallbackOnConnectFail | None:
-        """The callback called when the client failed to connect
-        to the broker.
-
-        Expected signature is (for all callback_api_version)::
-
-            connect_fail_callback(client, userdata)
-
-        :param Client client: the client instance for this callback
-        :parama userdata: the private user data as set in Client() or user_data_set()
-
-        Decorator: @client.connect_fail_callback() (``client`` is the name of the
-            instance which this callback is being attached to)
-        """
-        return self._on_connect_fail
-
-    @on_connect_fail.setter
-    def on_connect_fail(self, func: CallbackOnConnectFail | None) -> None:
-        with self._callback_mutex:
-            self._on_connect_fail = func
-
-    def connect_fail_callback(
-        self,
-    ) -> Callable[[CallbackOnConnectFail], CallbackOnConnectFail]:
-        def decorator(func: CallbackOnConnectFail) -> CallbackOnConnectFail:
-            self.on_connect_fail = func
-            return func
-        return decorator
-
-    @property
-    def on_subscribe(self) -> CallbackOnSubscribe | None:
-        """The callback called when the broker responds to a subscribe
-        request.
-
-        Expected signature for callback API version 2::
-
-            subscribe_callback(client, userdata, mid, reason_code_list, properties)
-
-        Expected signature for callback API version 1 change with MQTT protocol version:
-            * For MQTT v3.1 and v3.1.1 it's::
-
-                subscribe_callback(client, userdata, mid, granted_qos)
-
-            * For MQTT v5.0 it's::
-
-                subscribe_callback(client, userdata, mid, reason_code_list, properties)
-
-        :param Client client: the client instance for this callback
-        :param userdata: the private user data as set in Client() or user_data_set()
-        :param int mid: matches the mid variable returned from the corresponding
-                          subscribe() call.
-        :param list[ReasonCode] reason_code_list: reason codes received from the broker for each subscription.
-                          In MQTT v5.0 it's the reason code defined by the standard.
-                          In MQTT v3, we convert granted QoS to a reason code.
-                          It's a list of ReasonCode instances.
-        :param Properties properties: the MQTT v5.0 properties received from the broker.
-                          For MQTT v3.1 and v3.1.1 properties is not provided and an empty Properties
-                          object is always used.
-        :param list[int] granted_qos: list of integers that give the QoS level the broker has
-                          granted for each of the different subscription requests.
-
-        Decorator: @client.subscribe_callback() (``client`` is the name of the
-            instance which this callback is being attached to)
-        """
-        return self._on_subscribe
-
-    @on_subscribe.setter
-    def on_subscribe(self, func: CallbackOnSubscribe | None) -> None:
-        with self._callback_mutex:
-            self._on_subscribe = func
-
-    def subscribe_callback(
-        self,
-    ) -> Callable[[CallbackOnSubscribe], CallbackOnSubscribe]:
-        def decorator(func: CallbackOnSubscribe) -> CallbackOnSubscribe:
-            self.on_subscribe = func
-            return func
-        return decorator
-
-    @property
-    def on_message(self) -> CallbackOnMessage | None:
-        """The callback called when a message has been received on a topic
-        that the client subscribes to.
-
-        This callback will be called for every message received unless a
-        `message_callback_add()` matched the message.
-
-        Expected signature is (for all callback API version):
-            message_callback(client, userdata, message)
-
-        :param Client client: the client instance for this callback
-        :param userdata: the private user data as set in Client() or user_data_set()
-        :param MQTTMessage message: the received message.
-                    This is a class with members topic, payload, qos, retain.
-
-        Decorator: @client.message_callback() (``client`` is the name of the
-            instance which this callback is being attached to)
-        """
-        return self._on_message
-
-    @on_message.setter
-    def on_message(self, func: CallbackOnMessage | None) -> None:
-        with self._callback_mutex:
-            self._on_message = func
-
-    def message_callback(
-        self,
-    ) -> Callable[[CallbackOnMessage], CallbackOnMessage]:
-        def decorator(func: CallbackOnMessage) -> CallbackOnMessage:
-            self.on_message = func
-            return func
-        return decorator
-
-    @property
-    def on_publish(self) -> CallbackOnPublish | None:
-        """The callback called when a message that was to be sent using the
-        `publish()` call has completed transmission to the broker.
-
-        For messages with QoS levels 1 and 2, this means that the appropriate
-        handshakes have completed. For QoS 0, this simply means that the message
-        has left the client.
-        This callback is important because even if the `publish()` call returns
-        success, it does not always mean that the message has been sent.
-
-        See also `wait_for_publish` which could be simpler to use.
-
-        Expected signature for callback API version 2::
-
-            publish_callback(client, userdata, mid, reason_code, properties)
-
-        Expected signature for callback API version 1::
-
-            publish_callback(client, userdata, mid)
-
-        :param Client client: the client instance for this callback
-        :param userdata: the private user data as set in Client() or user_data_set()
-        :param int mid: matches the mid variable returned from the corresponding
-                     `publish()` call, to allow outgoing messages to be tracked.
-        :param ReasonCode reason_code: the connection reason code received from the broken.
-                     In MQTT v5.0 it's the reason code defined by the standard.
-                     In MQTT v3 it's always the reason code Success
-        :parama Properties properties: the MQTT v5.0 properties received from the broker.
-                     For MQTT v3.1 and v3.1.1 properties is not provided and an empty Properties
-                     object is always used.
-
-        Note: for QoS = 0, the reason_code and the properties don't really exist, it's the client
-        library that generate them. It's always an empty properties and a success reason code.
-        Because the (MQTTv5) standard don't have reason code for PUBLISH packet, the library create them
-        at PUBACK packet, as if the message was sent with QoS = 1.
-
-        Decorator: @client.publish_callback() (``client`` is the name of the
-            instance which this callback is being attached to)
-
-        """
-        return self._on_publish
-
-    @on_publish.setter
-    def on_publish(self, func: CallbackOnPublish | None) -> None:
-        with self._callback_mutex:
-            self._on_publish = func
-
-    def publish_callback(
-        self,
-    ) -> Callable[[CallbackOnPublish], CallbackOnPublish]:
-        def decorator(func: CallbackOnPublish) -> CallbackOnPublish:
-            self.on_publish = func
-            return func
-        return decorator
-
-    @property
-    def on_unsubscribe(self) -> CallbackOnUnsubscribe | None:
-        """The callback called when the broker responds to an unsubscribe
-        request.
-
-        Expected signature for callback API version 2::
-
-            unsubscribe_callback(client, userdata, mid, reason_code_list, properties)
-
-        Expected signature for callback API version 1 change with MQTT protocol version:
-            * For MQTT v3.1 and v3.1.1 it's::
-
-                unsubscribe_callback(client, userdata, mid)
-
-            * For MQTT v5.0 it's::
-
-                unsubscribe_callback(client, userdata, mid, properties, v1_reason_codes)
-
-        :param Client client: the client instance for this callback
-        :param userdata: the private user data as set in Client() or user_data_set()
-        :param mid: matches the mid variable returned from the corresponding
-                          unsubscribe() call.
-        :param list[ReasonCode] reason_code_list: reason codes received from the broker for each unsubscription.
-                          In MQTT v5.0 it's the reason code defined by the standard.
-                          In MQTT v3, there is not equivalent from broken and empty list
-                          is always used.
-        :param Properties properties: the MQTT v5.0 properties received from the broker.
-                          For MQTT v3.1 and v3.1.1 properties is not provided and an empty Properties
-                          object is always used.
-        :param v1_reason_codes: the MQTT v5.0 reason codes received from the broker for each
-                          unsubscribe topic.  A list of ReasonCode instances OR a single
-                          ReasonCode when we unsubscribe from a single topic.
-
-        Decorator: @client.unsubscribe_callback() (``client`` is the name of the
-            instance which this callback is being attached to)
-        """
-        return self._on_unsubscribe
-
-    @on_unsubscribe.setter
-    def on_unsubscribe(self, func: CallbackOnUnsubscribe | None) -> None:
-        with self._callback_mutex:
-            self._on_unsubscribe = func
-
-    def unsubscribe_callback(
-        self,
-    ) -> Callable[[CallbackOnUnsubscribe], CallbackOnUnsubscribe]:
-        def decorator(func: CallbackOnUnsubscribe) -> CallbackOnUnsubscribe:
-            self.on_unsubscribe = func
-            return func
-        return decorator
-
-    @property
-    def on_disconnect(self) -> CallbackOnDisconnect | None:
-        """The callback called when the client disconnects from the broker.
-
-        Expected signature for callback API version 2::
-
-            disconnect_callback(client, userdata, disconnect_flags, reason_code, properties)
-
-        Expected signature for callback API version 1 change with MQTT protocol version:
-            * For MQTT v3.1 and v3.1.1 it's::
-
-                disconnect_callback(client, userdata, rc)
-
-            * For MQTT v5.0 it's::
-
-                disconnect_callback(client, userdata, reason_code, properties)
-
-        :param Client client: the client instance for this callback
-        :param userdata:  the private user data as set in Client() or user_data_set()
-        :param DisconnectFlag disconnect_flags: the flags for this disconnection.
-        :param ReasonCode reason_code:  the disconnection reason code possibly received from the broker (see disconnect_flags).
-                          In MQTT v5.0 it's the reason code defined by the standard.
-                          In MQTT v3 it's never received from the broker, we convert an MQTTErrorCode,
-                          see `convert_disconnect_error_code_to_reason_code()`.
-                          `ReasonCode` may be compared to integer.
-        :param Properties properties: the MQTT v5.0 properties received from the broker.
-                          For MQTT v3.1 and v3.1.1 properties is not provided and an empty Properties
-                          object is always used.
-        :param int rc: the disconnection result
-                          The rc parameter indicates the disconnection state. If
-                          MQTT_ERR_SUCCESS (0), the callback was called in response to
-                          a disconnect() call. If any other value the disconnection
-                          was unexpected, such as might be caused by a network error.
-
-        Decorator: @client.disconnect_callback() (``client`` is the name of the
-            instance which this callback is being attached to)
-
-        """
-        return self._on_disconnect
-
-    @on_disconnect.setter
-    def on_disconnect(self, func: CallbackOnDisconnect | None) -> None:
-        with self._callback_mutex:
-            self._on_disconnect = func
-
-    def disconnect_callback(
-        self,
-    ) -> Callable[[CallbackOnDisconnect], CallbackOnDisconnect]:
-        def decorator(func: CallbackOnDisconnect) -> CallbackOnDisconnect:
-            self.on_disconnect = func
-            return func
-        return decorator
-
-    @property
-    def on_socket_open(self) -> CallbackOnSocket | None:
-        """The callback called just after the socket was opend.
-
-        This should be used to register the socket to an external event loop for reading.
-
-        Expected signature is (for all callback API version)::
-
-            socket_open_callback(client, userdata, socket)
-
-        :param Client client:     the client instance for this callback
-        :param userdata:   the private user data as set in Client() or user_data_set()
-        :param SocketLike sock: the socket which was just opened.
-
-        Decorator: @client.socket_open_callback() (``client`` is the name of the
-            instance which this callback is being attached to)
-        """
-        return self._on_socket_open
-
-    @on_socket_open.setter
-    def on_socket_open(self, func: CallbackOnSocket | None) -> None:
-        with self._callback_mutex:
-            self._on_socket_open = func
-
-    def socket_open_callback(
-        self,
-    ) -> Callable[[CallbackOnSocket], CallbackOnSocket]:
-        def decorator(func: CallbackOnSocket) -> CallbackOnSocket:
-            self.on_socket_open = func
-            return func
-        return decorator
-
-    def _call_socket_open(self, sock: SocketLike) -> None:
-        """Call the socket_open callback with the just-opened socket"""
-        with self._callback_mutex:
-            on_socket_open = self.on_socket_open
-
-        if on_socket_open:
-            with self._in_callback_mutex:
-                try:
-                    on_socket_open(self, self._userdata, sock)
-                except Exception as err:
-                    self._easy_log(
-                        MQTT_LOG_ERR, 'Caught exception in on_socket_open: %s', err)
-                    if not self.suppress_exceptions:
-                        raise
-
-    @property
-    def on_socket_close(self) -> CallbackOnSocket | None:
-        """The callback called just before the socket is closed.
-
-        This should be used to unregister the socket from an external event loop for reading.
-
-        Expected signature is (for all callback API version)::
-
-            socket_close_callback(client, userdata, socket)
-
-        :param Client client: the client instance for this callback
-        :param userdata: the private user data as set in Client() or user_data_set()
-        :param SocketLike sock: the socket which is about to be closed.
-
-        Decorator: @client.socket_close_callback() (``client`` is the name of the
-            instance which this callback is being attached to)
-        """
-        return self._on_socket_close
-
-    @on_socket_close.setter
-    def on_socket_close(self, func: CallbackOnSocket | None) -> None:
-        with self._callback_mutex:
-            self._on_socket_close = func
-
-    def socket_close_callback(
-        self,
-    ) -> Callable[[CallbackOnSocket], CallbackOnSocket]:
-        def decorator(func: CallbackOnSocket) -> CallbackOnSocket:
-            self.on_socket_close = func
-            return func
-        return decorator
-
-    def _call_socket_close(self, sock: SocketLike) -> None:
-        """Call the socket_close callback with the about-to-be-closed socket"""
-        with self._callback_mutex:
-            on_socket_close = self.on_socket_close
-
-        if on_socket_close:
-            with self._in_callback_mutex:
-                try:
-                    on_socket_close(self, self._userdata, sock)
-                except Exception as err:
-                    self._easy_log(
-                        MQTT_LOG_ERR, 'Caught exception in on_socket_close: %s', err)
-                    if not self.suppress_exceptions:
-                        raise
-
-    @property
-    def on_socket_register_write(self) -> CallbackOnSocket | None:
-        """The callback called when the socket needs writing but can't.
-
-        This should be used to register the socket with an external event loop for writing.
-
-        Expected signature is (for all callback API version)::
-
-            socket_register_write_callback(client, userdata, socket)
-
-        :param Client client: the client instance for this callback
-        :param userdata: the private user data as set in Client() or user_data_set()
-        :param SocketLike sock: the socket which should be registered for writing
-
-        Decorator: @client.socket_register_write_callback() (``client`` is the name of the
-            instance which this callback is being attached to)
-        """
-        return self._on_socket_register_write
-
-    @on_socket_register_write.setter
-    def on_socket_register_write(self, func: CallbackOnSocket | None) -> None:
-        with self._callback_mutex:
-            self._on_socket_register_write = func
-
-    def socket_register_write_callback(
-        self,
-    ) -> Callable[[CallbackOnSocket], CallbackOnSocket]:
-        def decorator(func: CallbackOnSocket) -> CallbackOnSocket:
-            self._on_socket_register_write = func
-            return func
-        return decorator
-
-    def _call_socket_register_write(self) -> None:
-        """Call the socket_register_write callback with the unwritable socket"""
-        if not self._sock or self._registered_write:
-            return
-        self._registered_write = True
-        with self._callback_mutex:
-            on_socket_register_write = self.on_socket_register_write
-
-        if on_socket_register_write:
-            try:
-                on_socket_register_write(
-                    self, self._userdata, self._sock)
-            except Exception as err:
-                self._easy_log(
-                    MQTT_LOG_ERR, 'Caught exception in on_socket_register_write: %s', err)
-                if not self.suppress_exceptions:
-                    raise
-
-    @property
-    def on_socket_unregister_write(
-        self,
-    ) -> CallbackOnSocket | None:
-        """The callback called when the socket doesn't need writing anymore.
-
-        This should be used to unregister the socket from an external event loop for writing.
-
-        Expected signature is (for all callback API version)::
-
-            socket_unregister_write_callback(client, userdata, socket)
-
-        :param Client client: the client instance for this callback
-        :param userdata: the private user data as set in Client() or user_data_set()
-        :param SocketLike sock: the socket which should be unregistered for writing
-
-        Decorator: @client.socket_unregister_write_callback() (``client`` is the name of the
-            instance which this callback is being attached to)
-        """
-        return self._on_socket_unregister_write
-
-    @on_socket_unregister_write.setter
-    def on_socket_unregister_write(
-        self, func: CallbackOnSocket | None
-    ) -> None:
-        with self._callback_mutex:
-            self._on_socket_unregister_write = func
-
-    def socket_unregister_write_callback(
-        self,
-    ) -> Callable[[CallbackOnSocket], CallbackOnSocket]:
-        def decorator(
-            func: CallbackOnSocket,
-        ) -> CallbackOnSocket:
-            self._on_socket_unregister_write = func
-            return func
-        return decorator
-
-    def _call_socket_unregister_write(
-        self, sock: SocketLike | None = None
-    ) -> None:
-        """Call the socket_unregister_write callback with the writable socket"""
-        sock = sock or self._sock
-        if not sock or not self._registered_write:
-            return
-        self._registered_write = False
-
-        with self._callback_mutex:
-            on_socket_unregister_write = self.on_socket_unregister_write
-
-        if on_socket_unregister_write:
-            try:
-                on_socket_unregister_write(self, self._userdata, sock)
-            except Exception as err:
-                self._easy_log(
-                    MQTT_LOG_ERR, 'Caught exception in on_socket_unregister_write: %s', err)
-                if not self.suppress_exceptions:
-                    raise
-
-    def message_callback_add(self, sub: str, callback: CallbackOnMessage) -> None:
-        """Register a message callback for a specific topic.
-        Messages that match 'sub' will be passed to 'callback'. Any
-        non-matching messages will be passed to the default `on_message`
-        callback.
-
-        Call multiple times with different 'sub' to define multiple topic
-        specific callbacks.
-
-        Topic specific callbacks may be removed with
-        `message_callback_remove()`.
-
-        See `on_message` for the expected signature of the callback.
-
-        Decorator: @client.topic_callback(sub) (``client`` is the name of the
-            instance which this callback is being attached to)
-
-        Example::
-
-            @client.topic_callback("mytopic/#")
-            def handle_mytopic(client, userdata, message):
-                ...
-        """
-        if callback is None or sub is None:
-            raise ValueError("sub and callback must both be defined.")
-
-        with self._callback_mutex:
-            self._on_message_filtered[sub] = callback
-
-    def topic_callback(
-        self, sub: str
-    ) -> Callable[[CallbackOnMessage], CallbackOnMessage]:
-        def decorator(func: CallbackOnMessage) -> CallbackOnMessage:
-            self.message_callback_add(sub, func)
-            return func
-        return decorator
-
-    def message_callback_remove(self, sub: str) -> None:
-        """Remove a message callback previously registered with
-        `message_callback_add()`."""
-        if sub is None:
-            raise ValueError("sub must defined.")
-
-        with self._callback_mutex:
-            try:
-                del self._on_message_filtered[sub]
-            except KeyError:  # no such subscription
-                pass
-
-    # ============================================================
-    # Private functions
-    # ============================================================
-
-    def _loop_rc_handle(
-        self,
-        rc: MQTTErrorCode,
-    ) -> MQTTErrorCode:
-        if rc:
-            self._sock_close()
-
-            if self._state in (_ConnectionState.MQTT_CS_DISCONNECTING, _ConnectionState.MQTT_CS_DISCONNECTED):
-                self._state = _ConnectionState.MQTT_CS_DISCONNECTED
-                rc = MQTTErrorCode.MQTT_ERR_SUCCESS
-
-            self._do_on_disconnect(packet_from_broker=False, v1_rc=rc)
-
-        if rc == MQTT_ERR_CONN_LOST:
-            self._state = _ConnectionState.MQTT_CS_CONNECTION_LOST
-
-        return rc
-
-    def _packet_read(self) -> MQTTErrorCode:
-        # This gets called if pselect() indicates that there is network data
-        # available - ie. at least one byte.  What we do depends on what data we
-        # already have.
-        # If we've not got a command, attempt to read one and save it. This should
-        # always work because it's only a single byte.
-        # Then try to read the remaining length. This may fail because it is may
-        # be more than one byte - will need to save data pending next read if it
-        # does fail.
-        # Then try to read the remaining payload, where 'payload' here means the
-        # combined variable header and actual payload. This is the most likely to
-        # fail due to longer length, so save current data and current position.
-        # After all data is read, send to _mqtt_handle_packet() to deal with.
-        # Finally, free the memory and reset everything to starting conditions.
-        if self._in_packet['command'] == 0:
-            try:
-                command = self._sock_recv(1)
-            except BlockingIOError:
-                return MQTTErrorCode.MQTT_ERR_AGAIN
-            except TimeoutError as err:
-                self._easy_log(
-                    MQTT_LOG_ERR, 'timeout on socket: %s', err)
-                return MQTTErrorCode.MQTT_ERR_CONN_LOST
-            except OSError as err:
-                self._easy_log(
-                    MQTT_LOG_ERR, 'failed to receive on socket: %s', err)
-                return MQTTErrorCode.MQTT_ERR_CONN_LOST
-            else:
-                if len(command) == 0:
-                    return MQTTErrorCode.MQTT_ERR_CONN_LOST
-                self._in_packet['command'] = command[0]
-
-        if self._in_packet['have_remaining'] == 0:
-            # Read remaining
-            # Algorithm for decoding taken from pseudo code at
-            # http://publib.boulder.ibm.com/infocenter/wmbhelp/v6r0m0/topic/com.ibm.etools.mft.doc/ac10870_.htm
-            while True:
-                try:
-                    byte = self._sock_recv(1)
-                except BlockingIOError:
-                    return MQTTErrorCode.MQTT_ERR_AGAIN
-                except OSError as err:
-                    self._easy_log(
-                        MQTT_LOG_ERR, 'failed to receive on socket: %s', err)
-                    return MQTTErrorCode.MQTT_ERR_CONN_LOST
-                else:
-                    if len(byte) == 0:
-                        return MQTTErrorCode.MQTT_ERR_CONN_LOST
-                    byte_value = byte[0]
-                    self._in_packet['remaining_count'].append(byte_value)
-                    # Max 4 bytes length for remaining length as defined by protocol.
-                    # Anything more likely means a broken/malicious client.
-                    if len(self._in_packet['remaining_count']) > 4:
-                        return MQTTErrorCode.MQTT_ERR_PROTOCOL
-
-                    self._in_packet['remaining_length'] += (
-                        byte_value & 127) * self._in_packet['remaining_mult']
-                    self._in_packet['remaining_mult'] = self._in_packet['remaining_mult'] * 128
-
-                if (byte_value & 128) == 0:
-                    break
-
-            self._in_packet['have_remaining'] = 1
-            self._in_packet['to_process'] = self._in_packet['remaining_length']
-
-        count = 100 # Don't get stuck in this loop if we have a huge message.
-        while self._in_packet['to_process'] > 0:
-            try:
-                data = self._sock_recv(self._in_packet['to_process'])
-            except BlockingIOError:
-                return MQTTErrorCode.MQTT_ERR_AGAIN
-            except OSError as err:
-                self._easy_log(
-                    MQTT_LOG_ERR, 'failed to receive on socket: %s', err)
-                return MQTTErrorCode.MQTT_ERR_CONN_LOST
-            else:
-                if len(data) == 0:
-                    return MQTTErrorCode.MQTT_ERR_CONN_LOST
-                self._in_packet['to_process'] -= len(data)
-                self._in_packet['packet'] += data
-            count -= 1
-            if count == 0:
-                with self._msgtime_mutex:
-                    self._last_msg_in = time_func()
-                return MQTTErrorCode.MQTT_ERR_AGAIN
-
-        # All data for this packet is read.
-        self._in_packet['pos'] = 0
-        rc = self._packet_handle()
-
-        # Free data and reset values
-        self._in_packet = {
-            "command": 0,
-            "have_remaining": 0,
-            "remaining_count": [],
-            "remaining_mult": 1,
-            "remaining_length": 0,
-            "packet": bytearray(b""),
-            "to_process": 0,
-            "pos": 0,
-        }
-
-        with self._msgtime_mutex:
-            self._last_msg_in = time_func()
-        return rc
-
-    def _packet_write(self) -> MQTTErrorCode:
-        while True:
-            try:
-                packet = self._out_packet.popleft()
-            except IndexError:
-                return MQTTErrorCode.MQTT_ERR_SUCCESS
-
-            try:
-                write_length = self._sock_send(
-                    packet['packet'][packet['pos']:])
-            except (AttributeError, ValueError):
-                self._out_packet.appendleft(packet)
-                return MQTTErrorCode.MQTT_ERR_SUCCESS
-            except BlockingIOError:
-                self._out_packet.appendleft(packet)
-                return MQTTErrorCode.MQTT_ERR_AGAIN
-            except OSError as err:
-                self._out_packet.appendleft(packet)
-                self._easy_log(
-                    MQTT_LOG_ERR, 'failed to receive on socket: %s', err)
-                return MQTTErrorCode.MQTT_ERR_CONN_LOST
-
-            if write_length > 0:
-                packet['to_process'] -= write_length
-                packet['pos'] += write_length
-
-                if packet['to_process'] == 0:
-                    if (packet['command'] & 0xF0) == PUBLISH and packet['qos'] == 0:
-                        with self._callback_mutex:
-                            on_publish = self.on_publish
-
-                        if on_publish:
-                            with self._in_callback_mutex:
-                                try:
-                                    if self._callback_api_version == CallbackAPIVersion.VERSION1:
-                                        on_publish = cast(CallbackOnPublish_v1, on_publish)
-
-                                        on_publish(self, self._userdata, packet["mid"])
-                                    elif self._callback_api_version == CallbackAPIVersion.VERSION2:
-                                        on_publish = cast(CallbackOnPublish_v2, on_publish)
-
-                                        on_publish(
-                                            self,
-                                            self._userdata,
-                                            packet["mid"],
-                                            ReasonCode(PacketTypes.PUBACK),
-                                            Properties(PacketTypes.PUBACK),
-                                        )
-                                    else:
-                                        raise RuntimeError("Unsupported callback API version")
-                                except Exception as err:
-                                    self._easy_log(
-                                        MQTT_LOG_ERR, 'Caught exception in on_publish: %s', err)
-                                    if not self.suppress_exceptions:
-                                        raise
-
-                        # TODO: Something is odd here. I don't see why packet["info"] can't be None.
-                        # A packet could be produced by _handle_connack with qos=0 and no info
-                        # (around line 3645). Ignore the mypy check for now but I feel there is a bug
-                        # somewhere.
-                        packet['info']._set_as_published()  # type: ignore
-
-                    if (packet['command'] & 0xF0) == DISCONNECT:
-                        with self._msgtime_mutex:
-                            self._last_msg_out = time_func()
-
-                        self._do_on_disconnect(
-                            packet_from_broker=False,
-                            v1_rc=MQTTErrorCode.MQTT_ERR_SUCCESS,
-                        )
-                        self._sock_close()
-                        # Only change to disconnected if the disconnection was wanted
-                        # by the client (== state was disconnecting). If the broker disconnected
-                        # use unilaterally don't change the state and client may reconnect.
-                        if self._state == _ConnectionState.MQTT_CS_DISCONNECTING:
-                            self._state = _ConnectionState.MQTT_CS_DISCONNECTED
-                        return MQTTErrorCode.MQTT_ERR_SUCCESS
-
-                else:
-                    # We haven't finished with this packet
-                    self._out_packet.appendleft(packet)
-            else:
-                break
-
-        with self._msgtime_mutex:
-            self._last_msg_out = time_func()
-
-        return MQTTErrorCode.MQTT_ERR_SUCCESS
-
-    def _easy_log(self, level: LogLevel, fmt: str, *args: Any) -> None:
-        if self.on_log is not None:
-            buf = fmt % args
-            try:
-                self.on_log(self, self._userdata, level, buf)
-            except Exception:  # noqa: S110
-                # Can't _easy_log this, as we'll recurse until we break
-                pass  # self._logger will pick this up, so we're fine
-        if self._logger is not None:
-            level_std = LOGGING_LEVEL[level]
-            self._logger.log(level_std, fmt, *args)
-
-    def _check_keepalive(self) -> None:
-        if self._keepalive == 0:
-            return
-
-        now = time_func()
-
-        with self._msgtime_mutex:
-            last_msg_out = self._last_msg_out
-            last_msg_in = self._last_msg_in
-
-        if self._sock is not None and (now - last_msg_out >= self._keepalive or now - last_msg_in >= self._keepalive):
-            if self._state == _ConnectionState.MQTT_CS_CONNECTED and self._ping_t == 0:
-                try:
-                    self._send_pingreq()
-                except Exception:
-                    self._sock_close()
-                    self._do_on_disconnect(
-                        packet_from_broker=False,
-                        v1_rc=MQTTErrorCode.MQTT_ERR_CONN_LOST,
-                    )
-                else:
-                    with self._msgtime_mutex:
-                        self._last_msg_out = now
-                        self._last_msg_in = now
-            else:
-                self._sock_close()
-
-                if self._state in (_ConnectionState.MQTT_CS_DISCONNECTING, _ConnectionState.MQTT_CS_DISCONNECTED):
-                    self._state = _ConnectionState.MQTT_CS_DISCONNECTED
-                    rc = MQTTErrorCode.MQTT_ERR_SUCCESS
-                else:
-                    rc = MQTTErrorCode.MQTT_ERR_KEEPALIVE
-
-                self._do_on_disconnect(
-                    packet_from_broker=False,
-                    v1_rc=rc,
-                )
-
-    def _mid_generate(self) -> int:
-        with self._mid_generate_mutex:
-            self._last_mid += 1
-            if self._last_mid == 65536:
-                self._last_mid = 1
-            return self._last_mid
-
-    @staticmethod
-    def _raise_for_invalid_topic(topic: bytes) -> None:
-        """ Check if the topic is a topic without wildcard and valid length.
-
-            Raise ValueError if the topic isn't valid.
-        """
-        if b'+' in topic or b'#' in topic:
-            raise ValueError('Publish topic cannot contain wildcards.')
-        if len(topic) > 65535:
-            raise ValueError('Publish topic is too long.')
-
-    @staticmethod
-    def _filter_wildcard_len_check(sub: bytes) -> MQTTErrorCode:
-        if (len(sub) == 0 or len(sub) > 65535
-            or any(b'+' in p or b'#' in p for p in sub.split(b'/') if len(p) > 1)
-                or b'#/' in sub):
-            return MQTTErrorCode.MQTT_ERR_INVAL
-        else:
-            return MQTTErrorCode.MQTT_ERR_SUCCESS
-
-    def _send_pingreq(self) -> MQTTErrorCode:
-        self._easy_log(MQTT_LOG_DEBUG, "Sending PINGREQ")
-        rc = self._send_simple_command(PINGREQ)
-        if rc == MQTTErrorCode.MQTT_ERR_SUCCESS:
-            self._ping_t = time_func()
-        return rc
-
-    def _send_pingresp(self) -> MQTTErrorCode:
-        self._easy_log(MQTT_LOG_DEBUG, "Sending PINGRESP")
-        return self._send_simple_command(PINGRESP)
-
-    def _send_puback(self, mid: int) -> MQTTErrorCode:
-        self._easy_log(MQTT_LOG_DEBUG, "Sending PUBACK (Mid: %d)", mid)
-        return self._send_command_with_mid(PUBACK, mid, False)
-
-    def _send_pubcomp(self, mid: int) -> MQTTErrorCode:
-        self._easy_log(MQTT_LOG_DEBUG, "Sending PUBCOMP (Mid: %d)", mid)
-        return self._send_command_with_mid(PUBCOMP, mid, False)
-
-    def _pack_remaining_length(
-        self, packet: bytearray, remaining_length: int
-    ) -> bytearray:
-        remaining_bytes = []
-        while True:
-            byte = remaining_length % 128
-            remaining_length = remaining_length // 128
-            # If there are more digits to encode, set the top bit of this digit
-            if remaining_length > 0:
-                byte |= 0x80
-
-            remaining_bytes.append(byte)
-            packet.append(byte)
-            if remaining_length == 0:
-                # FIXME - this doesn't deal with incorrectly large payloads
-                return packet
-
-    def _pack_str16(self, packet: bytearray, data: bytes | str) -> None:
-        data = _force_bytes(data)
-        packet.extend(struct.pack("!H", len(data)))
-        packet.extend(data)
-
-    def _send_publish(
-        self,
-        mid: int,
-        topic: bytes,
-        payload: bytes|bytearray = b"",
-        qos: int = 0,
-        retain: bool = False,
-        dup: bool = False,
-        info: MQTTMessageInfo | None = None,
-        properties: Properties | None = None,
-    ) -> MQTTErrorCode:
-        # we assume that topic and payload are already properly encoded
-        if not isinstance(topic, bytes):
-            raise TypeError('topic must be bytes, not str')
-        if payload and not isinstance(payload, (bytes, bytearray)):
-            raise TypeError('payload must be bytes if set')
-
-        if self._sock is None:
-            return MQTTErrorCode.MQTT_ERR_NO_CONN
-
-        command = PUBLISH | ((dup & 0x1) << 3) | (qos << 1) | retain
-        packet = bytearray()
-        packet.append(command)
-
-        payloadlen = len(payload)
-        remaining_length = 2 + len(topic) + payloadlen
-
-        if payloadlen == 0:
-            if self._protocol == MQTTv5:
-                self._easy_log(
-                    MQTT_LOG_DEBUG,
-                    "Sending PUBLISH (d%d, q%d, r%d, m%d), '%s', properties=%s (NULL payload)",
-                    dup, qos, retain, mid, topic, properties
-                )
-            else:
-                self._easy_log(
-                    MQTT_LOG_DEBUG,
-                    "Sending PUBLISH (d%d, q%d, r%d, m%d), '%s' (NULL payload)",
-                    dup, qos, retain, mid, topic
-                )
-        else:
-            if self._protocol == MQTTv5:
-                self._easy_log(
-                    MQTT_LOG_DEBUG,
-                    "Sending PUBLISH (d%d, q%d, r%d, m%d), '%s', properties=%s, ... (%d bytes)",
-                    dup, qos, retain, mid, topic, properties, payloadlen
-                )
-            else:
-                self._easy_log(
-                    MQTT_LOG_DEBUG,
-                    "Sending PUBLISH (d%d, q%d, r%d, m%d), '%s', ... (%d bytes)",
-                    dup, qos, retain, mid, topic, payloadlen
-                )
-
-        if qos > 0:
-            # For message id
-            remaining_length += 2
-
-        if self._protocol == MQTTv5:
-            if properties is None:
-                packed_properties = b'\x00'
-            else:
-                packed_properties = properties.pack()
-            remaining_length += len(packed_properties)
-
-        self._pack_remaining_length(packet, remaining_length)
-        self._pack_str16(packet, topic)
-
-        if qos > 0:
-            # For message id
-            packet.extend(struct.pack("!H", mid))
-
-        if self._protocol == MQTTv5:
-            packet.extend(packed_properties)
-
-        packet.extend(payload)
-
-        return self._packet_queue(PUBLISH, packet, mid, qos, info)
-
-    def _send_pubrec(self, mid: int) -> MQTTErrorCode:
-        self._easy_log(MQTT_LOG_DEBUG, "Sending PUBREC (Mid: %d)", mid)
-        return self._send_command_with_mid(PUBREC, mid, False)
-
-    def _send_pubrel(self, mid: int) -> MQTTErrorCode:
-        self._easy_log(MQTT_LOG_DEBUG, "Sending PUBREL (Mid: %d)", mid)
-        return self._send_command_with_mid(PUBREL | 2, mid, False)
-
-    def _send_command_with_mid(self, command: int, mid: int, dup: int) -> MQTTErrorCode:
-        # For PUBACK, PUBCOMP, PUBREC, and PUBREL
-        if dup:
-            command |= 0x8
-
-        remaining_length = 2
-        packet = struct.pack('!BBH', command, remaining_length, mid)
-        return self._packet_queue(command, packet, mid, 1)
-
-    def _send_simple_command(self, command: int) -> MQTTErrorCode:
-        # For DISCONNECT, PINGREQ and PINGRESP
-        remaining_length = 0
-        packet = struct.pack('!BB', command, remaining_length)
-        return self._packet_queue(command, packet, 0, 0)
-
-    def _send_connect(self, keepalive: int) -> MQTTErrorCode:
-        proto_ver = int(self._protocol)
-        # hard-coded UTF-8 encoded string
-        protocol = b"MQTT" if proto_ver >= MQTTv311 else b"MQIsdp"
-
-        remaining_length = 2 + len(protocol) + 1 + \
-            1 + 2 + 2 + len(self._client_id)
-
-        connect_flags = 0
-        if self._protocol == MQTTv5:
-            if self._clean_start is True:
-                connect_flags |= 0x02
-            elif self._clean_start == MQTT_CLEAN_START_FIRST_ONLY and self._mqttv5_first_connect:
-                connect_flags |= 0x02
-        elif self._clean_session:
-            connect_flags |= 0x02
-
-        if self._will:
-            remaining_length += 2 + \
-                len(self._will_topic) + 2 + len(self._will_payload)
-            connect_flags |= 0x04 | ((self._will_qos & 0x03) << 3) | (
-                (self._will_retain & 0x01) << 5)
-
-        if self._username is not None:
-            remaining_length += 2 + len(self._username)
-            connect_flags |= 0x80
-            if self._password is not None:
-                connect_flags |= 0x40
-                remaining_length += 2 + len(self._password)
-
-        if self._protocol == MQTTv5:
-            if self._connect_properties is None:
-                packed_connect_properties = b'\x00'
-            else:
-                packed_connect_properties = self._connect_properties.pack()
-            remaining_length += len(packed_connect_properties)
-            if self._will:
-                if self._will_properties is None:
-                    packed_will_properties = b'\x00'
-                else:
-                    packed_will_properties = self._will_properties.pack()
-                remaining_length += len(packed_will_properties)
-
-        command = CONNECT
-        packet = bytearray()
-        packet.append(command)
-
-        # as per the mosquitto broker, if the MSB of this version is set
-        # to 1, then it treats the connection as a bridge
-        if self._client_mode == MQTT_BRIDGE:
-            proto_ver |= 0x80
-
-        self._pack_remaining_length(packet, remaining_length)
-        packet.extend(struct.pack(
-            f"!H{len(protocol)}sBBH",
-            len(protocol), protocol, proto_ver, connect_flags, keepalive,
-        ))
-
-        if self._protocol == MQTTv5:
-            packet += packed_connect_properties
-
-        self._pack_str16(packet, self._client_id)
-
-        if self._will:
-            if self._protocol == MQTTv5:
-                packet += packed_will_properties
-            self._pack_str16(packet, self._will_topic)
-            self._pack_str16(packet, self._will_payload)
-
-        if self._username is not None:
-            self._pack_str16(packet, self._username)
-
-            if self._password is not None:
-                self._pack_str16(packet, self._password)
-
-        self._keepalive = keepalive
-        if self._protocol == MQTTv5:
-            self._easy_log(
-                MQTT_LOG_DEBUG,
-                "Sending CONNECT (u%d, p%d, wr%d, wq%d, wf%d, c%d, k%d) client_id=%s properties=%s",
-                (connect_flags & 0x80) >> 7,
-                (connect_flags & 0x40) >> 6,
-                (connect_flags & 0x20) >> 5,
-                (connect_flags & 0x18) >> 3,
-                (connect_flags & 0x4) >> 2,
-                (connect_flags & 0x2) >> 1,
-                keepalive,
-                self._client_id,
-                self._connect_properties
-            )
-        else:
-            self._easy_log(
-                MQTT_LOG_DEBUG,
-                "Sending CONNECT (u%d, p%d, wr%d, wq%d, wf%d, c%d, k%d) client_id=%s",
-                (connect_flags & 0x80) >> 7,
-                (connect_flags & 0x40) >> 6,
-                (connect_flags & 0x20) >> 5,
-                (connect_flags & 0x18) >> 3,
-                (connect_flags & 0x4) >> 2,
-                (connect_flags & 0x2) >> 1,
-                keepalive,
-                self._client_id
-            )
-        return self._packet_queue(command, packet, 0, 0)
-
-    def _send_disconnect(
-        self,
-        reasoncode: ReasonCode | None = None,
-        properties: Properties | None = None,
-    ) -> MQTTErrorCode:
-        if self._protocol == MQTTv5:
-            self._easy_log(MQTT_LOG_DEBUG, "Sending DISCONNECT reasonCode=%s properties=%s",
-                           reasoncode,
-                           properties
-                           )
-        else:
-            self._easy_log(MQTT_LOG_DEBUG, "Sending DISCONNECT")
-
-        remaining_length = 0
-
-        command = DISCONNECT
-        packet = bytearray()
-        packet.append(command)
-
-        if self._protocol == MQTTv5:
-            if properties is not None or reasoncode is not None:
-                if reasoncode is None:
-                    reasoncode = ReasonCode(DISCONNECT >> 4, identifier=0)
-                remaining_length += 1
-                if properties is not None:
-                    packed_props = properties.pack()
-                    remaining_length += len(packed_props)
-
-        self._pack_remaining_length(packet, remaining_length)
-
-        if self._protocol == MQTTv5:
-            if reasoncode is not None:
-                packet += reasoncode.pack()
-                if properties is not None:
-                    packet += packed_props
-
-        return self._packet_queue(command, packet, 0, 0)
-
-    def _send_subscribe(
-        self,
-        dup: int,
-        topics: Sequence[tuple[bytes, SubscribeOptions | int]],
-        properties: Properties | None = None,
-    ) -> tuple[MQTTErrorCode, int]:
-        remaining_length = 2
-        if self._protocol == MQTTv5:
-            if properties is None:
-                packed_subscribe_properties = b'\x00'
-            else:
-                packed_subscribe_properties = properties.pack()
-            remaining_length += len(packed_subscribe_properties)
-        for t, _ in topics:
-            remaining_length += 2 + len(t) + 1
-
-        command = SUBSCRIBE | (dup << 3) | 0x2
-        packet = bytearray()
-        packet.append(command)
-        self._pack_remaining_length(packet, remaining_length)
-        local_mid = self._mid_generate()
-        packet.extend(struct.pack("!H", local_mid))
-
-        if self._protocol == MQTTv5:
-            packet += packed_subscribe_properties
-
-        for t, q in topics:
-            self._pack_str16(packet, t)
-            if self._protocol == MQTTv5:
-                packet += q.pack()  # type: ignore
-            else:
-                packet.append(q)  # type: ignore
-
-        self._easy_log(
-            MQTT_LOG_DEBUG,
-            "Sending SUBSCRIBE (d%d, m%d) %s",
-            dup,
-            local_mid,
-            topics,
-        )
-        return (self._packet_queue(command, packet, local_mid, 1), local_mid)
-
-    def _send_unsubscribe(
-        self,
-        dup: int,
-        topics: list[bytes],
-        properties: Properties | None = None,
-    ) -> tuple[MQTTErrorCode, int]:
-        remaining_length = 2
-        if self._protocol == MQTTv5:
-            if properties is None:
-                packed_unsubscribe_properties = b'\x00'
-            else:
-                packed_unsubscribe_properties = properties.pack()
-            remaining_length += len(packed_unsubscribe_properties)
-        for t in topics:
-            remaining_length += 2 + len(t)
-
-        command = UNSUBSCRIBE | (dup << 3) | 0x2
-        packet = bytearray()
-        packet.append(command)
-        self._pack_remaining_length(packet, remaining_length)
-        local_mid = self._mid_generate()
-        packet.extend(struct.pack("!H", local_mid))
-
-        if self._protocol == MQTTv5:
-            packet += packed_unsubscribe_properties
-
-        for t in topics:
-            self._pack_str16(packet, t)
-
-        # topics_repr = ", ".join("'"+topic.decode('utf8')+"'" for topic in topics)
-        if self._protocol == MQTTv5:
-            self._easy_log(
-                MQTT_LOG_DEBUG,
-                "Sending UNSUBSCRIBE (d%d, m%d) %s %s",
-                dup,
-                local_mid,
-                properties,
-                topics,
-            )
-        else:
-            self._easy_log(
-                MQTT_LOG_DEBUG,
-                "Sending UNSUBSCRIBE (d%d, m%d) %s",
-                dup,
-                local_mid,
-                topics,
-            )
-        return (self._packet_queue(command, packet, local_mid, 1), local_mid)
-
-    def _check_clean_session(self) -> bool:
-        if self._protocol == MQTTv5:
-            if self._clean_start == MQTT_CLEAN_START_FIRST_ONLY:
-                return self._mqttv5_first_connect
-            else:
-                return self._clean_start  # type: ignore
-        else:
-            return self._clean_session
-
-    def _messages_reconnect_reset_out(self) -> None:
-        with self._out_message_mutex:
-            self._inflight_messages = 0
-            for m in self._out_messages.values():
-                m.timestamp = 0
-                if self._max_inflight_messages == 0 or self._inflight_messages < self._max_inflight_messages:
-                    if m.qos == 0:
-                        m.state = mqtt_ms_publish
-                    elif m.qos == 1:
-                        # self._inflight_messages = self._inflight_messages + 1
-                        if m.state == mqtt_ms_wait_for_puback:
-                            m.dup = True
-                        m.state = mqtt_ms_publish
-                    elif m.qos == 2:
-                        # self._inflight_messages = self._inflight_messages + 1
-                        if self._check_clean_session():
-                            if m.state != mqtt_ms_publish:
-                                m.dup = True
-                            m.state = mqtt_ms_publish
-                        else:
-                            if m.state == mqtt_ms_wait_for_pubcomp:
-                                m.state = mqtt_ms_resend_pubrel
-                            else:
-                                if m.state == mqtt_ms_wait_for_pubrec:
-                                    m.dup = True
-                                m.state = mqtt_ms_publish
-                else:
-                    m.state = mqtt_ms_queued
-
-    def _messages_reconnect_reset_in(self) -> None:
-        with self._in_message_mutex:
-            if self._check_clean_session():
-                self._in_messages = collections.OrderedDict()
-                return
-            for m in self._in_messages.values():
-                m.timestamp = 0
-                if m.qos != 2:
-                    self._in_messages.pop(m.mid)
-                else:
-                    # Preserve current state
-                    pass
-
-    def _messages_reconnect_reset(self) -> None:
-        self._messages_reconnect_reset_out()
-        self._messages_reconnect_reset_in()
-
-    def _packet_queue(
-        self,
-        command: int,
-        packet: bytes,
-        mid: int,
-        qos: int,
-        info: MQTTMessageInfo | None = None,
-    ) -> MQTTErrorCode:
-        mpkt: _OutPacket = {
-            "command": command,
-            "mid": mid,
-            "qos": qos,
-            "pos": 0,
-            "to_process": len(packet),
-            "packet": packet,
-            "info": info,
-        }
-
-        self._out_packet.append(mpkt)
-
-        # Write a single byte to sockpairW (connected to sockpairR) to break
-        # out of select() if in threaded mode.
-        if self._sockpairW is not None:
-            try:
-                self._sockpairW.send(sockpair_data)
-            except BlockingIOError:
-                pass
-
-        # If we have an external event loop registered, use that instead
-        # of calling loop_write() directly.
-        if self._thread is None and self._on_socket_register_write is None:
-            if self._in_callback_mutex.acquire(False):
-                self._in_callback_mutex.release()
-                return self.loop_write()
-
-        self._call_socket_register_write()
-
-        return MQTTErrorCode.MQTT_ERR_SUCCESS
-
-    def _packet_handle(self) -> MQTTErrorCode:
-        cmd = self._in_packet['command'] & 0xF0
-        if cmd == PINGREQ:
-            return self._handle_pingreq()
-        elif cmd == PINGRESP:
-            return self._handle_pingresp()
-        elif cmd == PUBACK:
-            return self._handle_pubackcomp("PUBACK")
-        elif cmd == PUBCOMP:
-            return self._handle_pubackcomp("PUBCOMP")
-        elif cmd == PUBLISH:
-            return self._handle_publish()
-        elif cmd == PUBREC:
-            return self._handle_pubrec()
-        elif cmd == PUBREL:
-            return self._handle_pubrel()
-        elif cmd == CONNACK:
-            return self._handle_connack()
-        elif cmd == SUBACK:
-            self._handle_suback()
-            return MQTTErrorCode.MQTT_ERR_SUCCESS
-        elif cmd == UNSUBACK:
-            return self._handle_unsuback()
-        elif cmd == DISCONNECT and self._protocol == MQTTv5:  # only allowed in MQTT 5.0
-            self._handle_disconnect()
-            return MQTTErrorCode.MQTT_ERR_SUCCESS
-        else:
-            # If we don't recognise the command, return an error straight away.
-            self._easy_log(MQTT_LOG_ERR, "Error: Unrecognised command %s", cmd)
-            return MQTTErrorCode.MQTT_ERR_PROTOCOL
-
-    def _handle_pingreq(self) -> MQTTErrorCode:
-        if self._in_packet['remaining_length'] != 0:
-            return MQTTErrorCode.MQTT_ERR_PROTOCOL
-
-        self._easy_log(MQTT_LOG_DEBUG, "Received PINGREQ")
-        return self._send_pingresp()
-
-    def _handle_pingresp(self) -> MQTTErrorCode:
-        if self._in_packet['remaining_length'] != 0:
-            return MQTTErrorCode.MQTT_ERR_PROTOCOL
-
-        # No longer waiting for a PINGRESP.
-        self._ping_t = 0
-        self._easy_log(MQTT_LOG_DEBUG, "Received PINGRESP")
-        return MQTTErrorCode.MQTT_ERR_SUCCESS
-
-    def _handle_connack(self) -> MQTTErrorCode:
-        if self._protocol == MQTTv5:
-            if self._in_packet['remaining_length'] < 2:
-                return MQTTErrorCode.MQTT_ERR_PROTOCOL
-        elif self._in_packet['remaining_length'] != 2:
-            return MQTTErrorCode.MQTT_ERR_PROTOCOL
-
-        if self._protocol == MQTTv5:
-            (flags, result) = struct.unpack(
-                "!BB", self._in_packet['packet'][:2])
-            if result == 1:
-                # This is probably a failure from a broker that doesn't support
-                # MQTT v5.
-                reason = ReasonCode(CONNACK >> 4, aName="Unsupported protocol version")
-                properties = None
-            else:
-                reason = ReasonCode(CONNACK >> 4, identifier=result)
-                properties = Properties(CONNACK >> 4)
-                properties.unpack(self._in_packet['packet'][2:])
-        else:
-            (flags, result) = struct.unpack("!BB", self._in_packet['packet'])
-            reason = convert_connack_rc_to_reason_code(result)
-            properties = None
-        if self._protocol == MQTTv311:
-            if result == CONNACK_REFUSED_PROTOCOL_VERSION:
-                if not self._reconnect_on_failure:
-                    return MQTT_ERR_PROTOCOL
-                self._easy_log(
-                    MQTT_LOG_DEBUG,
-                    "Received CONNACK (%s, %s), attempting downgrade to MQTT v3.1.",
-                    flags, result
-                )
-                # Downgrade to MQTT v3.1
-                self._protocol = MQTTv31
-                return self.reconnect()
-            elif (result == CONNACK_REFUSED_IDENTIFIER_REJECTED
-                    and self._client_id == b''):
-                if not self._reconnect_on_failure:
-                    return MQTT_ERR_PROTOCOL
-                self._easy_log(
-                    MQTT_LOG_DEBUG,
-                    "Received CONNACK (%s, %s), attempting to use non-empty CID",
-                    flags, result,
-                )
-                self._client_id = _base62(uuid.uuid4().int, padding=22).encode("utf8")
-                return self.reconnect()
-
-        if result == 0:
-            self._state = _ConnectionState.MQTT_CS_CONNECTED
-            self._reconnect_delay = None
-
-        if self._protocol == MQTTv5:
-            self._easy_log(
-                MQTT_LOG_DEBUG, "Received CONNACK (%s, %s) properties=%s", flags, reason, properties)
-        else:
-            self._easy_log(
-                MQTT_LOG_DEBUG, "Received CONNACK (%s, %s)", flags, result)
-
-        # it won't be the first successful connect any more
-        self._mqttv5_first_connect = False
-
-        with self._callback_mutex:
-            on_connect = self.on_connect
-
-        if on_connect:
-            flags_dict = {}
-            flags_dict['session present'] = flags & 0x01
-            with self._in_callback_mutex:
-                try:
-                    if self._callback_api_version == CallbackAPIVersion.VERSION1:
-                        if self._protocol == MQTTv5:
-                            on_connect = cast(CallbackOnConnect_v1_mqtt5, on_connect)
-
-                            on_connect(self, self._userdata,
-                                            flags_dict, reason, properties)
-                        else:
-                            on_connect = cast(CallbackOnConnect_v1_mqtt3, on_connect)
-
-                            on_connect(
-                                self, self._userdata, flags_dict, result)
-                    elif self._callback_api_version == CallbackAPIVersion.VERSION2:
-                        on_connect = cast(CallbackOnConnect_v2, on_connect)
-
-                        connect_flags = ConnectFlags(
-                            session_present=flags_dict['session present'] > 0
-                        )
-
-                        if properties is None:
-                            properties = Properties(PacketTypes.CONNACK)
-
-                        on_connect(
-                            self,
-                            self._userdata,
-                            connect_flags,
-                            reason,
-                            properties,
-                        )
-                    else:
-                        raise RuntimeError("Unsupported callback API version")
-                except Exception as err:
-                    self._easy_log(
-                        MQTT_LOG_ERR, 'Caught exception in on_connect: %s', err)
-                    if not self.suppress_exceptions:
-                        raise
-
-        if result == 0:
-            rc = MQTTErrorCode.MQTT_ERR_SUCCESS
-            with self._out_message_mutex:
-                for m in self._out_messages.values():
-                    m.timestamp = time_func()
-                    if m.state == mqtt_ms_queued:
-                        self.loop_write()  # Process outgoing messages that have just been queued up
-                        return MQTT_ERR_SUCCESS
-
-                    if m.qos == 0:
-                        with self._in_callback_mutex:  # Don't call loop_write after _send_publish()
-                            rc = self._send_publish(
-                                m.mid,
-                                m.topic.encode('utf-8'),
-                                m.payload,
-                                m.qos,
-                                m.retain,
-                                m.dup,
-                                properties=m.properties
-                            )
-                        if rc != MQTTErrorCode.MQTT_ERR_SUCCESS:
-                            return rc
-                    elif m.qos == 1:
-                        if m.state == mqtt_ms_publish:
-                            self._inflight_messages += 1
-                            m.state = mqtt_ms_wait_for_puback
-                            with self._in_callback_mutex:  # Don't call loop_write after _send_publish()
-                                rc = self._send_publish(
-                                    m.mid,
-                                    m.topic.encode('utf-8'),
-                                    m.payload,
-                                    m.qos,
-                                    m.retain,
-                                    m.dup,
-                                    properties=m.properties
-                                )
-                            if rc != MQTTErrorCode.MQTT_ERR_SUCCESS:
-                                return rc
-                    elif m.qos == 2:
-                        if m.state == mqtt_ms_publish:
-                            self._inflight_messages += 1
-                            m.state = mqtt_ms_wait_for_pubrec
-                            with self._in_callback_mutex:  # Don't call loop_write after _send_publish()
-                                rc = self._send_publish(
-                                    m.mid,
-                                    m.topic.encode('utf-8'),
-                                    m.payload,
-                                    m.qos,
-                                    m.retain,
-                                    m.dup,
-                                    properties=m.properties
-                                )
-                            if rc != MQTTErrorCode.MQTT_ERR_SUCCESS:
-                                return rc
-                        elif m.state == mqtt_ms_resend_pubrel:
-                            self._inflight_messages += 1
-                            m.state = mqtt_ms_wait_for_pubcomp
-                            with self._in_callback_mutex:  # Don't call loop_write after _send_publish()
-                                rc = self._send_pubrel(m.mid)
-                            if rc != MQTTErrorCode.MQTT_ERR_SUCCESS:
-                                return rc
-                    self.loop_write()  # Process outgoing messages that have just been queued up
-
-            return rc
-        elif result > 0 and result < 6:
-            return MQTTErrorCode.MQTT_ERR_CONN_REFUSED
-        else:
-            return MQTTErrorCode.MQTT_ERR_PROTOCOL
-
-    def _handle_disconnect(self) -> None:
-        packet_type = DISCONNECT >> 4
-        reasonCode = properties = None
-        if self._in_packet['remaining_length'] > 2:
-            reasonCode = ReasonCode(packet_type)
-            reasonCode.unpack(self._in_packet['packet'])
-            if self._in_packet['remaining_length'] > 3:
-                properties = Properties(packet_type)
-                props, props_len = properties.unpack(
-                    self._in_packet['packet'][1:])
-        self._easy_log(MQTT_LOG_DEBUG, "Received DISCONNECT %s %s",
-                       reasonCode,
-                       properties
-                       )
-
-        self._sock_close()
-        self._do_on_disconnect(
-            packet_from_broker=True,
-            v1_rc=MQTTErrorCode.MQTT_ERR_SUCCESS,  # If reason is absent (remaining length < 1), it means normal disconnection
-            reason=reasonCode,
-            properties=properties,
-        )
-
-    def _handle_suback(self) -> None:
-        self._easy_log(MQTT_LOG_DEBUG, "Received SUBACK")
-        pack_format = f"!H{len(self._in_packet['packet']) - 2}s"
-        (mid, packet) = struct.unpack(pack_format, self._in_packet['packet'])
-
-        if self._protocol == MQTTv5:
-            properties = Properties(SUBACK >> 4)
-            props, props_len = properties.unpack(packet)
-            reasoncodes = [ReasonCode(SUBACK >> 4, identifier=c) for c in packet[props_len:]]
-        else:
-            pack_format = f"!{'B' * len(packet)}"
-            granted_qos = struct.unpack(pack_format, packet)
-            reasoncodes = [ReasonCode(SUBACK >> 4, identifier=c) for c in granted_qos]
-            properties = Properties(SUBACK >> 4)
-
-        with self._callback_mutex:
-            on_subscribe = self.on_subscribe
-
-        if on_subscribe:
-            with self._in_callback_mutex:  # Don't call loop_write after _send_publish()
-                try:
-                    if self._callback_api_version == CallbackAPIVersion.VERSION1:
-                        if self._protocol == MQTTv5:
-                            on_subscribe = cast(CallbackOnSubscribe_v1_mqtt5, on_subscribe)
-
-                            on_subscribe(
-                                self, self._userdata, mid, reasoncodes, properties)
-                        else:
-                            on_subscribe = cast(CallbackOnSubscribe_v1_mqtt3, on_subscribe)
-
-                            on_subscribe(
-                                self, self._userdata, mid, granted_qos)
-                    elif self._callback_api_version == CallbackAPIVersion.VERSION2:
-                        on_subscribe = cast(CallbackOnSubscribe_v2, on_subscribe)
-
-                        on_subscribe(
-                            self,
-                            self._userdata,
-                            mid,
-                            reasoncodes,
-                            properties,
-                        )
-                    else:
-                        raise RuntimeError("Unsupported callback API version")
-                except Exception as err:
-                    self._easy_log(
-                        MQTT_LOG_ERR, 'Caught exception in on_subscribe: %s', err)
-                    if not self.suppress_exceptions:
-                        raise
-
-    def _handle_publish(self) -> MQTTErrorCode:
-        header = self._in_packet['command']
-        message = MQTTMessage()
-        message.dup = ((header & 0x08) >> 3) != 0
-        message.qos = (header & 0x06) >> 1
-        message.retain = (header & 0x01) != 0
-
-        pack_format = f"!H{len(self._in_packet['packet']) - 2}s"
-        (slen, packet) = struct.unpack(pack_format, self._in_packet['packet'])
-        pack_format = f"!{slen}s{len(packet) - slen}s"
-        (topic, packet) = struct.unpack(pack_format, packet)
-
-        if self._protocol != MQTTv5 and len(topic) == 0:
-            return MQTTErrorCode.MQTT_ERR_PROTOCOL
-
-        # Handle topics with invalid UTF-8
-        # This replaces an invalid topic with a message and the hex
-        # representation of the topic for logging. When the user attempts to
-        # access message.topic in the callback, an exception will be raised.
-        try:
-            print_topic = topic.decode('utf-8')
-        except UnicodeDecodeError:
-            print_topic = f"TOPIC WITH INVALID UTF-8: {topic!r}"
-
-        message.topic = topic
-
-        if message.qos > 0:
-            pack_format = f"!H{len(packet) - 2}s"
-            (message.mid, packet) = struct.unpack(pack_format, packet)
-
-        if self._protocol == MQTTv5:
-            message.properties = Properties(PUBLISH >> 4)
-            props, props_len = message.properties.unpack(packet)
-            packet = packet[props_len:]
-
-        message.payload = packet
-
-        if self._protocol == MQTTv5:
-            self._easy_log(
-                MQTT_LOG_DEBUG,
-                "Received PUBLISH (d%d, q%d, r%d, m%d), '%s', properties=%s, ...  (%d bytes)",
-                message.dup, message.qos, message.retain, message.mid,
-                print_topic, message.properties, len(message.payload)
-            )
-        else:
-            self._easy_log(
-                MQTT_LOG_DEBUG,
-                "Received PUBLISH (d%d, q%d, r%d, m%d), '%s', ...  (%d bytes)",
-                message.dup, message.qos, message.retain, message.mid,
-                print_topic, len(message.payload)
-            )
-
-        message.timestamp = time_func()
-        if message.qos == 0:
-            self._handle_on_message(message)
-            return MQTTErrorCode.MQTT_ERR_SUCCESS
-        elif message.qos == 1:
-            self._handle_on_message(message)
-            if self._manual_ack:
-                return MQTTErrorCode.MQTT_ERR_SUCCESS
-            else:
-                return self._send_puback(message.mid)
-        elif message.qos == 2:
-
-            rc = self._send_pubrec(message.mid)
-
-            message.state = mqtt_ms_wait_for_pubrel
-            with self._in_message_mutex:
-                self._in_messages[message.mid] = message
-
-            return rc
-        else:
-            return MQTTErrorCode.MQTT_ERR_PROTOCOL
-
-    def ack(self, mid: int, qos: int) -> MQTTErrorCode:
-        """
-           send an acknowledgement for a given message id (stored in :py:attr:`message.mid <MQTTMessage.mid>`).
-           only useful in QoS>=1 and ``manual_ack=True`` (option of `Client`)
-        """
-        if self._manual_ack :
-            if qos == 1:
-                return self._send_puback(mid)
-            elif qos == 2:
-                return self._send_pubcomp(mid)
-
-        return MQTTErrorCode.MQTT_ERR_SUCCESS
-
-    def manual_ack_set(self, on: bool) -> None:
-        """
-           The paho library normally acknowledges messages as soon as they are delivered to the caller.
-           If manual_ack is turned on, then the caller MUST manually acknowledge every message once
-           application processing is complete using `ack()`
-        """
-        self._manual_ack = on
-
-
-    def _handle_pubrel(self) -> MQTTErrorCode:
-        if self._protocol == MQTTv5:
-            if self._in_packet['remaining_length'] < 2:
-                return MQTTErrorCode.MQTT_ERR_PROTOCOL
-        elif self._in_packet['remaining_length'] != 2:
-            return MQTTErrorCode.MQTT_ERR_PROTOCOL
-
-        mid, = struct.unpack("!H", self._in_packet['packet'][:2])
-        if self._protocol == MQTTv5:
-            if self._in_packet['remaining_length'] > 2:
-                reasonCode = ReasonCode(PUBREL >> 4)
-                reasonCode.unpack(self._in_packet['packet'][2:])
-                if self._in_packet['remaining_length'] > 3:
-                    properties = Properties(PUBREL >> 4)
-                    props, props_len = properties.unpack(
-                        self._in_packet['packet'][3:])
-        self._easy_log(MQTT_LOG_DEBUG, "Received PUBREL (Mid: %d)", mid)
-
-        with self._in_message_mutex:
-            if mid in self._in_messages:
-                # Only pass the message on if we have removed it from the queue - this
-                # prevents multiple callbacks for the same message.
-                message = self._in_messages.pop(mid)
-                self._handle_on_message(message)
-                self._inflight_messages -= 1
-                if self._max_inflight_messages > 0:
-                    with self._out_message_mutex:
-                        rc = self._update_inflight()
-                    if rc != MQTTErrorCode.MQTT_ERR_SUCCESS:
-                        return rc
-
-        # FIXME: this should only be done if the message is known
-        # If unknown it's a protocol error and we should close the connection.
-        # But since we don't have (on disk) persistence for the session, it
-        # is possible that we must known about this message.
-        # Choose to acknowledge this message (thus losing a message) but
-        # avoid hanging. See #284.
-        if self._manual_ack:
-            return MQTTErrorCode.MQTT_ERR_SUCCESS
-        else:
-            return self._send_pubcomp(mid)
-
-    def _update_inflight(self) -> MQTTErrorCode:
-        # Dont lock message_mutex here
-        for m in self._out_messages.values():
-            if self._inflight_messages < self._max_inflight_messages:
-                if m.qos > 0 and m.state == mqtt_ms_queued:
-                    self._inflight_messages += 1
-                    if m.qos == 1:
-                        m.state = mqtt_ms_wait_for_puback
-                    elif m.qos == 2:
-                        m.state = mqtt_ms_wait_for_pubrec
-                    rc = self._send_publish(
-                        m.mid,
-                        m.topic.encode('utf-8'),
-                        m.payload,
-                        m.qos,
-                        m.retain,
-                        m.dup,
-                        properties=m.properties,
-                    )
-                    if rc != MQTTErrorCode.MQTT_ERR_SUCCESS:
-                        return rc
-            else:
-                return MQTTErrorCode.MQTT_ERR_SUCCESS
-        return MQTTErrorCode.MQTT_ERR_SUCCESS
-
-    def _handle_pubrec(self) -> MQTTErrorCode:
-        if self._protocol == MQTTv5:
-            if self._in_packet['remaining_length'] < 2:
-                return MQTTErrorCode.MQTT_ERR_PROTOCOL
-        elif self._in_packet['remaining_length'] != 2:
-            return MQTTErrorCode.MQTT_ERR_PROTOCOL
-
-        mid, = struct.unpack("!H", self._in_packet['packet'][:2])
-        if self._protocol == MQTTv5:
-            if self._in_packet['remaining_length'] > 2:
-                reasonCode = ReasonCode(PUBREC >> 4)
-                reasonCode.unpack(self._in_packet['packet'][2:])
-                if self._in_packet['remaining_length'] > 3:
-                    properties = Properties(PUBREC >> 4)
-                    props, props_len = properties.unpack(
-                        self._in_packet['packet'][3:])
-        self._easy_log(MQTT_LOG_DEBUG, "Received PUBREC (Mid: %d)", mid)
-
-        with self._out_message_mutex:
-            if mid in self._out_messages:
-                msg = self._out_messages[mid]
-                msg.state = mqtt_ms_wait_for_pubcomp
-                msg.timestamp = time_func()
-                return self._send_pubrel(mid)
-
-        return MQTTErrorCode.MQTT_ERR_SUCCESS
-
-    def _handle_unsuback(self) -> MQTTErrorCode:
-        if self._protocol == MQTTv5:
-            if self._in_packet['remaining_length'] < 4:
-                return MQTTErrorCode.MQTT_ERR_PROTOCOL
-        elif self._in_packet['remaining_length'] != 2:
-            return MQTTErrorCode.MQTT_ERR_PROTOCOL
-
-        mid, = struct.unpack("!H", self._in_packet['packet'][:2])
-        if self._protocol == MQTTv5:
-            packet = self._in_packet['packet'][2:]
-            properties = Properties(UNSUBACK >> 4)
-            props, props_len = properties.unpack(packet)
-            reasoncodes_list = [
-                ReasonCode(UNSUBACK >> 4, identifier=c)
-                for c in packet[props_len:]
-            ]
-        else:
-            reasoncodes_list = []
-            properties = Properties(UNSUBACK >> 4)
-
-        self._easy_log(MQTT_LOG_DEBUG, "Received UNSUBACK (Mid: %d)", mid)
-        with self._callback_mutex:
-            on_unsubscribe = self.on_unsubscribe
-
-        if on_unsubscribe:
-            with self._in_callback_mutex:
-                try:
-                    if self._callback_api_version == CallbackAPIVersion.VERSION1:
-                        if self._protocol == MQTTv5:
-                            on_unsubscribe = cast(CallbackOnUnsubscribe_v1_mqtt5, on_unsubscribe)
-
-                            reasoncodes: ReasonCode | list[ReasonCode] = reasoncodes_list
-                            if len(reasoncodes_list) == 1:
-                                reasoncodes = reasoncodes_list[0]
-
-                            on_unsubscribe(
-                                self, self._userdata, mid, properties, reasoncodes)
-                        else:
-                            on_unsubscribe = cast(CallbackOnUnsubscribe_v1_mqtt3, on_unsubscribe)
-
-                            on_unsubscribe(self, self._userdata, mid)
-                    elif self._callback_api_version == CallbackAPIVersion.VERSION2:
-                        on_unsubscribe = cast(CallbackOnUnsubscribe_v2, on_unsubscribe)
-
-                        if properties is None:
-                            properties = Properties(PacketTypes.CONNACK)
-
-                        on_unsubscribe(
-                            self,
-                            self._userdata,
-                            mid,
-                            reasoncodes_list,
-                            properties,
-                        )
-                    else:
-                        raise RuntimeError("Unsupported callback API version")
-                except Exception as err:
-                    self._easy_log(
-                        MQTT_LOG_ERR, 'Caught exception in on_unsubscribe: %s', err)
-                    if not self.suppress_exceptions:
-                        raise
-
-        return MQTTErrorCode.MQTT_ERR_SUCCESS
-
-    def _do_on_disconnect(
-        self,
-        packet_from_broker: bool,
-        v1_rc: MQTTErrorCode,
-        reason: ReasonCode | None = None,
-        properties: Properties | None = None,
-    ) -> None:
-        with self._callback_mutex:
-            on_disconnect = self.on_disconnect
-
-        if on_disconnect:
-            with self._in_callback_mutex:
-                try:
-                    if self._callback_api_version == CallbackAPIVersion.VERSION1:
-                        if self._protocol == MQTTv5:
-                            on_disconnect = cast(CallbackOnDisconnect_v1_mqtt5, on_disconnect)
-
-                            if packet_from_broker:
-                                on_disconnect(self, self._userdata, reason, properties)
-                            else:
-                                on_disconnect(self, self._userdata, v1_rc, None)
-                        else:
-                            on_disconnect = cast(CallbackOnDisconnect_v1_mqtt3, on_disconnect)
-
-                            on_disconnect(self, self._userdata, v1_rc)
-                    elif self._callback_api_version == CallbackAPIVersion.VERSION2:
-                        on_disconnect = cast(CallbackOnDisconnect_v2, on_disconnect)
-
-                        disconnect_flags = DisconnectFlags(
-                            is_disconnect_packet_from_server=packet_from_broker
-                        )
-
-                        if reason is None:
-                            reason = convert_disconnect_error_code_to_reason_code(v1_rc)
-
-                        if properties is None:
-                            properties = Properties(PacketTypes.DISCONNECT)
-
-                        on_disconnect(
-                            self,
-                            self._userdata,
-                            disconnect_flags,
-                            reason,
-                            properties,
-                        )
-                    else:
-                        raise RuntimeError("Unsupported callback API version")
-                except Exception as err:
-                    self._easy_log(
-                        MQTT_LOG_ERR, 'Caught exception in on_disconnect: %s', err)
-                    if not self.suppress_exceptions:
-                        raise
-
-    def _do_on_publish(self, mid: int, reason_code: ReasonCode, properties: Properties) -> MQTTErrorCode:
-        with self._callback_mutex:
-            on_publish = self.on_publish
-
-        if on_publish:
-            with self._in_callback_mutex:
-                try:
-                    if self._callback_api_version == CallbackAPIVersion.VERSION1:
-                        on_publish = cast(CallbackOnPublish_v1, on_publish)
-
-                        on_publish(self, self._userdata, mid)
-                    elif self._callback_api_version == CallbackAPIVersion.VERSION2:
-                        on_publish = cast(CallbackOnPublish_v2, on_publish)
-
-                        on_publish(
-                            self,
-                            self._userdata,
-                            mid,
-                            reason_code,
-                            properties,
-                        )
-                    else:
-                        raise RuntimeError("Unsupported callback API version")
-                except Exception as err:
-                    self._easy_log(
-                        MQTT_LOG_ERR, 'Caught exception in on_publish: %s', err)
-                    if not self.suppress_exceptions:
-                        raise
-
-        msg = self._out_messages.pop(mid)
-        msg.info._set_as_published()
-        if msg.qos > 0:
-            self._inflight_messages -= 1
-            if self._max_inflight_messages > 0:
-                rc = self._update_inflight()
-                if rc != MQTTErrorCode.MQTT_ERR_SUCCESS:
-                    return rc
-        return MQTTErrorCode.MQTT_ERR_SUCCESS
-
-    def _handle_pubackcomp(
-        self, cmd: Literal['PUBACK'] | Literal['PUBCOMP']
-    ) -> MQTTErrorCode:
-        if self._protocol == MQTTv5:
-            if self._in_packet['remaining_length'] < 2:
-                return MQTTErrorCode.MQTT_ERR_PROTOCOL
-        elif self._in_packet['remaining_length'] != 2:
-            return MQTTErrorCode.MQTT_ERR_PROTOCOL
-
-        packet_type_enum = PUBACK if cmd == "PUBACK" else PUBCOMP
-        packet_type = packet_type_enum.value >> 4
-        mid, = struct.unpack("!H", self._in_packet['packet'][:2])
-        reasonCode = ReasonCode(packet_type)
-        properties = Properties(packet_type)
-        if self._protocol == MQTTv5:
-            if self._in_packet['remaining_length'] > 2:
-                reasonCode.unpack(self._in_packet['packet'][2:])
-                if self._in_packet['remaining_length'] > 3:
-                    props, props_len = properties.unpack(
-                        self._in_packet['packet'][3:])
-        self._easy_log(MQTT_LOG_DEBUG, "Received %s (Mid: %d)", cmd, mid)
-
-        with self._out_message_mutex:
-            if mid in self._out_messages:
-                # Only inform the client the message has been sent once.
-                rc = self._do_on_publish(mid, reasonCode, properties)
-                return rc
-
-        return MQTTErrorCode.MQTT_ERR_SUCCESS
-
-    def _handle_on_message(self, message: MQTTMessage) -> None:
-
-        try:
-            topic = message.topic
-        except UnicodeDecodeError:
-            topic = None
-
-        on_message_callbacks = []
-        with self._callback_mutex:
-            if topic is not None:
-                on_message_callbacks = list(self._on_message_filtered.iter_match(message.topic))
-
-            if len(on_message_callbacks) == 0:
-                on_message = self.on_message
-            else:
-                on_message = None
-
-        for callback in on_message_callbacks:
-            with self._in_callback_mutex:
-                try:
-                    callback(self, self._userdata, message)
-                except Exception as err:
-                    self._easy_log(
-                        MQTT_LOG_ERR,
-                        'Caught exception in user defined callback function %s: %s',
-                        callback.__name__,
-                        err
-                    )
-                    if not self.suppress_exceptions:
-                        raise
-
-        if on_message:
-            with self._in_callback_mutex:
-                try:
-                    on_message(self, self._userdata, message)
-                except Exception as err:
-                    self._easy_log(
-                        MQTT_LOG_ERR, 'Caught exception in on_message: %s', err)
-                    if not self.suppress_exceptions:
-                        raise
-
-
-    def _handle_on_connect_fail(self) -> None:
-        with self._callback_mutex:
-            on_connect_fail = self.on_connect_fail
-
-        if on_connect_fail:
-            with self._in_callback_mutex:
-                try:
-                    on_connect_fail(self, self._userdata)
-                except Exception as err:
-                    self._easy_log(
-                        MQTT_LOG_ERR, 'Caught exception in on_connect_fail: %s', err)
-
-    def _thread_main(self) -> None:
-        try:
-            self.loop_forever(retry_first_connection=True)
-        finally:
-            self._thread = None
-
-    def _reconnect_wait(self) -> None:
-        # See reconnect_delay_set for details
-        now = time_func()
-        with self._reconnect_delay_mutex:
-            if self._reconnect_delay is None:
-                self._reconnect_delay = self._reconnect_min_delay
-            else:
-                self._reconnect_delay = min(
-                    self._reconnect_delay * 2,
-                    self._reconnect_max_delay,
-                )
-
-            target_time = now + self._reconnect_delay
-
-        remaining = target_time - now
-        while (self._state not in (_ConnectionState.MQTT_CS_DISCONNECTING, _ConnectionState.MQTT_CS_DISCONNECTED)
-                and not self._thread_terminate
-                and remaining > 0):
-
-            time.sleep(min(remaining, 1))
-            remaining = target_time - time_func()
-
-    @staticmethod
-    def _proxy_is_valid(p) -> bool:  # type: ignore[no-untyped-def]
-        def check(t, a) -> bool:  # type: ignore[no-untyped-def]
-            return (socks is not None and
-                    t in {socks.HTTP, socks.SOCKS4, socks.SOCKS5} and a)
-
-        if isinstance(p, dict):
-            return check(p.get("proxy_type"), p.get("proxy_addr"))
-        elif isinstance(p, (list, tuple)):
-            return len(p) == 6 and check(p[0], p[1])
-        else:
-            return False
-
-    def _get_proxy(self) -> dict[str, Any] | None:
-        if socks is None:
-            return None
-
-        # First, check if the user explicitly passed us a proxy to use
-        if self._proxy_is_valid(self._proxy):
-            return self._proxy
-
-        # Next, check for an mqtt_proxy environment variable as long as the host
-        # we're trying to connect to isn't listed under the no_proxy environment
-        # variable (matches built-in module urllib's behavior)
-        if not (hasattr(urllib.request, "proxy_bypass") and
-                urllib.request.proxy_bypass(self._host)):
-            env_proxies = urllib.request.getproxies()
-            if "mqtt" in env_proxies:
-                parts = urllib.parse.urlparse(env_proxies["mqtt"])
-                if parts.scheme == "http":
-                    proxy = {
-                        "proxy_type": socks.HTTP,
-                        "proxy_addr": parts.hostname,
-                        "proxy_port": parts.port
-                    }
-                    return proxy
-                elif parts.scheme == "socks":
-                    proxy = {
-                        "proxy_type": socks.SOCKS5,
-                        "proxy_addr": parts.hostname,
-                        "proxy_port": parts.port
-                    }
-                    return proxy
-
-        # Finally, check if the user has monkeypatched the PySocks library with
-        # a default proxy
-        socks_default = socks.get_default_proxy()
-        if self._proxy_is_valid(socks_default):
-            proxy_keys = ("proxy_type", "proxy_addr", "proxy_port",
-                          "proxy_rdns", "proxy_username", "proxy_password")
-            return dict(zip(proxy_keys, socks_default))
-
-        # If we didn't find a proxy through any of the above methods, return
-        # None to indicate that the connection should be handled normally
-        return None
-
-    def _create_socket(self) -> SocketLike:
-        if self._transport == "unix":
-            sock = self._create_unix_socket_connection()
-        else:
-            sock = self._create_socket_connection()
-
-        if self._ssl:
-            sock = self._ssl_wrap_socket(sock)
-
-        if self._transport == "websockets":
-            sock.settimeout(self._keepalive)
-            return _WebsocketWrapper(
-                socket=sock,
-                host=self._host,
-                port=self._port,
-                is_ssl=self._ssl,
-                path=self._websocket_path,
-                extra_headers=self._websocket_extra_headers,
-            )
-
-        return sock
-
-    def _create_unix_socket_connection(self) -> _socket.socket:
-        unix_socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-        unix_socket.connect(self._host)
-        return unix_socket
-
-    def _create_socket_connection(self) -> _socket.socket:
-        proxy = self._get_proxy()
-        addr = (self._host, self._port)
-        source = (self._bind_address, self._bind_port)
-
-        if proxy:
-            return socks.create_connection(addr, timeout=self._connect_timeout, source_address=source, **proxy)
-        else:
-            return socket.create_connection(addr, timeout=self._connect_timeout, source_address=source)
-
-    def _ssl_wrap_socket(self, tcp_sock: _socket.socket) -> ssl.SSLSocket:
-        if self._ssl_context is None:
-            raise ValueError(
-                "Impossible condition. _ssl_context should never be None if _ssl is True"
-            )
-
-        verify_host = not self._tls_insecure
-        try:
-            # Try with server_hostname, even it's not supported in certain scenarios
-            ssl_sock = self._ssl_context.wrap_socket(
-                tcp_sock,
-                server_hostname=self._host,
-                do_handshake_on_connect=False,
-            )
-        except ssl.CertificateError:
-            # CertificateError is derived from ValueError
-            raise
-        except ValueError:
-            # Python version requires SNI in order to handle server_hostname, but SNI is not available
-            ssl_sock = self._ssl_context.wrap_socket(
-                tcp_sock,
-                do_handshake_on_connect=False,
-            )
-        else:
-            # If SSL context has already checked hostname, then don't need to do it again
-            if getattr(self._ssl_context, 'check_hostname', False):  # type: ignore
-                verify_host = False
-
-        ssl_sock.settimeout(self._keepalive)
-        ssl_sock.do_handshake()
-
-        if verify_host:
-            # TODO: this type error is a true error:
-            # error: Module has no attribute "match_hostname"  [attr-defined]
-            # Python 3.12 no longer have this method.
-            ssl.match_hostname(ssl_sock.getpeercert(), self._host)  # type: ignore
-
-        return ssl_sock
-
-class _WebsocketWrapper:
-    OPCODE_CONTINUATION = 0x0
-    OPCODE_TEXT = 0x1
-    OPCODE_BINARY = 0x2
-    OPCODE_CONNCLOSE = 0x8
-    OPCODE_PING = 0x9
-    OPCODE_PONG = 0xa
-
-    def __init__(
-        self,
-        socket: socket.socket | ssl.SSLSocket,
-        host: str,
-        port: int,
-        is_ssl: bool,
-        path: str,
-        extra_headers: WebSocketHeaders | None,
-    ):
-        self.connected = False
-
-        self._ssl = is_ssl
-        self._host = host
-        self._port = port
-        self._socket = socket
-        self._path = path
-
-        self._sendbuffer = bytearray()
-        self._readbuffer = bytearray()
-
-        self._requested_size = 0
-        self._payload_head = 0
-        self._readbuffer_head = 0
-
-        self._do_handshake(extra_headers)
-
-    def __del__(self) -> None:
-        self._sendbuffer = bytearray()
-        self._readbuffer = bytearray()
-
-    def _do_handshake(self, extra_headers: WebSocketHeaders | None) -> None:
-
-        sec_websocket_key = uuid.uuid4().bytes
-        sec_websocket_key = base64.b64encode(sec_websocket_key)
-
-        if self._ssl:
-            default_port = 443
-            http_schema = "https"
-        else:
-            default_port = 80
-            http_schema = "http"
-
-        if default_port == self._port:
-            host_port = f"{self._host}"
-        else:
-            host_port = f"{self._host}:{self._port}"
-
-        websocket_headers = {
-            "Host": host_port,
-            "Upgrade": "websocket",
-            "Connection": "Upgrade",
-            "Origin": f"{http_schema}://{host_port}",
-            "Sec-WebSocket-Key": sec_websocket_key.decode("utf8"),
-            "Sec-Websocket-Version": "13",
-            "Sec-Websocket-Protocol": "mqtt",
-        }
-
-        # This is checked in ws_set_options so it will either be None, a
-        # dictionary, or a callable
-        if isinstance(extra_headers, dict):
-            websocket_headers.update(extra_headers)
-        elif callable(extra_headers):
-            websocket_headers = extra_headers(websocket_headers)
-
-        header = "\r\n".join([
-            f"GET {self._path} HTTP/1.1",
-            "\r\n".join(f"{i}: {j}" for i, j in websocket_headers.items()),
-            "\r\n",
-        ]).encode("utf8")
-
-        self._socket.send(header)
-
-        has_secret = False
-        has_upgrade = False
-
-        while True:
-            # read HTTP response header as lines
-            try:
-                byte = self._socket.recv(1)
-            except ConnectionResetError:
-                byte = b""
-
-            self._readbuffer.extend(byte)
-
-            # line end
-            if byte == b"\n":
-                if len(self._readbuffer) > 2:
-                    # check upgrade
-                    if b"connection" in str(self._readbuffer).lower().encode('utf-8'):
-                        if b"upgrade" not in str(self._readbuffer).lower().encode('utf-8'):
-                            raise WebsocketConnectionError(
-                                "WebSocket handshake error, connection not upgraded")
-                        else:
-                            has_upgrade = True
-
-                    # check key hash
-                    if b"sec-websocket-accept" in str(self._readbuffer).lower().encode('utf-8'):
-                        GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
-
-                        server_hash_str = self._readbuffer.decode(
-                            'utf-8').split(": ", 1)[1]
-                        server_hash = server_hash_str.strip().encode('utf-8')
-
-                        client_hash_key = sec_websocket_key.decode('utf-8') + GUID
-                        # Use of SHA-1 is OK here; it's according to the Websocket spec.
-                        client_hash_digest = hashlib.sha1(client_hash_key.encode('utf-8'))  # noqa: S324
-                        client_hash = base64.b64encode(client_hash_digest.digest())
-
-                        if server_hash != client_hash:
-                            raise WebsocketConnectionError(
-                                "WebSocket handshake error, invalid secret key")
-                        else:
-                            has_secret = True
-                else:
-                    # ending linebreak
-                    break
-
-                # reset linebuffer
-                self._readbuffer = bytearray()
-
-            # connection reset
-            elif not byte:
-                raise WebsocketConnectionError("WebSocket handshake error")
-
-        if not has_upgrade or not has_secret:
-            raise WebsocketConnectionError("WebSocket handshake error")
-
-        self._readbuffer = bytearray()
-        self.connected = True
-
-    def _create_frame(
-        self, opcode: int, data: bytearray, do_masking: int = 1
-    ) -> bytearray:
-        header = bytearray()
-        length = len(data)
-
-        mask_key = bytearray(os.urandom(4))
-        mask_flag = do_masking
-
-        # 1 << 7 is the final flag, we don't send continuated data
-        header.append(1 << 7 | opcode)
-
-        if length < 126:
-            header.append(mask_flag << 7 | length)
-
-        elif length < 65536:
-            header.append(mask_flag << 7 | 126)
-            header += struct.pack("!H", length)
-
-        elif length < 0x8000000000000001:
-            header.append(mask_flag << 7 | 127)
-            header += struct.pack("!Q", length)
-
-        else:
-            raise ValueError("Maximum payload size is 2^63")
-
-        if mask_flag == 1:
-            for index in range(length):
-                data[index] ^= mask_key[index % 4]
-            data = mask_key + data
-
-        return header + data
-
-    def _buffered_read(self, length: int) -> bytearray:
-
-        # try to recv and store needed bytes
-        wanted_bytes = length - (len(self._readbuffer) - self._readbuffer_head)
-        if wanted_bytes > 0:
-
-            data = self._socket.recv(wanted_bytes)
-
-            if not data:
-                raise ConnectionAbortedError
-            else:
-                self._readbuffer.extend(data)
-
-            if len(data) < wanted_bytes:
-                raise BlockingIOError
-
-        self._readbuffer_head += length
-        return self._readbuffer[self._readbuffer_head - length:self._readbuffer_head]
-
-    def _recv_impl(self, length: int) -> bytes:
-
-        # try to decode websocket payload part from data
-        try:
-
-            self._readbuffer_head = 0
-
-            result = b""
-
-            chunk_startindex = self._payload_head
-            chunk_endindex = self._payload_head + length
-
-            header1 = self._buffered_read(1)
-            header2 = self._buffered_read(1)
-
-            opcode = (header1[0] & 0x0f)
-            maskbit = (header2[0] & 0x80) == 0x80
-            lengthbits = (header2[0] & 0x7f)
-            payload_length = lengthbits
-            mask_key = None
-
-            # read length
-            if lengthbits == 0x7e:
-
-                value = self._buffered_read(2)
-                payload_length, = struct.unpack("!H", value)
-
-            elif lengthbits == 0x7f:
-
-                value = self._buffered_read(8)
-                payload_length, = struct.unpack("!Q", value)
-
-            # read mask
-            if maskbit:
-                mask_key = self._buffered_read(4)
-
-            # if frame payload is shorter than the requested data, read only the possible part
-            readindex = chunk_endindex
-            if payload_length < readindex:
-                readindex = payload_length
-
-            if readindex > 0:
-                # get payload chunk
-                payload = self._buffered_read(readindex)
-
-                # unmask only the needed part
-                if mask_key is not None:
-                    for index in range(chunk_startindex, readindex):
-                        payload[index] ^= mask_key[index % 4]
-
-                result = payload[chunk_startindex:readindex]
-                self._payload_head = readindex
-            else:
-                payload = bytearray()
-
-            # check if full frame arrived and reset readbuffer and payloadhead if needed
-            if readindex == payload_length:
-                self._readbuffer = bytearray()
-                self._payload_head = 0
-
-                # respond to non-binary opcodes, their arrival is not guaranteed because of non-blocking sockets
-                if opcode == _WebsocketWrapper.OPCODE_CONNCLOSE:
-                    frame = self._create_frame(
-                        _WebsocketWrapper.OPCODE_CONNCLOSE, payload, 0)
-                    self._socket.send(frame)
-
-                if opcode == _WebsocketWrapper.OPCODE_PING:
-                    frame = self._create_frame(
-                        _WebsocketWrapper.OPCODE_PONG, payload, 0)
-                    self._socket.send(frame)
-
-            # This isn't *proper* handling of continuation frames, but given
-            # that we only support binary frames, it is *probably* good enough.
-            if (opcode == _WebsocketWrapper.OPCODE_BINARY or opcode == _WebsocketWrapper.OPCODE_CONTINUATION) \
-                    and payload_length > 0:
-                return result
-            else:
-                raise BlockingIOError
-
-        except ConnectionError:
-            self.connected = False
-            return b''
-
-    def _send_impl(self, data: bytes) -> int:
-
-        # if previous frame was sent successfully
-        if len(self._sendbuffer) == 0:
-            # create websocket frame
-            frame = self._create_frame(
-                _WebsocketWrapper.OPCODE_BINARY, bytearray(data))
-            self._sendbuffer.extend(frame)
-            self._requested_size = len(data)
-
-        # try to write out as much as possible
-        length = self._socket.send(self._sendbuffer)
-
-        self._sendbuffer = self._sendbuffer[length:]
-
-        if len(self._sendbuffer) == 0:
-            # buffer sent out completely, return with payload's size
-            return self._requested_size
-        else:
-            # couldn't send whole data, request the same data again with 0 as sent length
-            return 0
-
-    def recv(self, length: int) -> bytes:
-        return self._recv_impl(length)
-
-    def read(self, length: int) -> bytes:
-        return self._recv_impl(length)
-
-    def send(self, data: bytes) -> int:
-        return self._send_impl(data)
-
-    def write(self, data: bytes) -> int:
-        return self._send_impl(data)
-
-    def close(self) -> None:
-        self._socket.close()
-
-    def fileno(self) -> int:
-        return self._socket.fileno()
-
-    def pending(self) -> int:
-        # Fix for bug #131: a SSL socket may still have data available
-        # for reading without select() being aware of it.
-        if self._ssl:
-            return self._socket.pending()  # type: ignore[union-attr]
-        else:
-            # normal socket rely only on select()
-            return 0
-
-    def setblocking(self, flag: bool) -> None:
-        self._socket.setblocking(flag)
diff --git a/lib/paho/mqtt/enums.py b/lib/paho/mqtt/enums.py
deleted file mode 100644
index 5428769f..00000000
--- a/lib/paho/mqtt/enums.py
+++ /dev/null
@@ -1,113 +0,0 @@
-import enum
-
-
-class MQTTErrorCode(enum.IntEnum):
-    MQTT_ERR_AGAIN = -1
-    MQTT_ERR_SUCCESS = 0
-    MQTT_ERR_NOMEM = 1
-    MQTT_ERR_PROTOCOL = 2
-    MQTT_ERR_INVAL = 3
-    MQTT_ERR_NO_CONN = 4
-    MQTT_ERR_CONN_REFUSED = 5
-    MQTT_ERR_NOT_FOUND = 6
-    MQTT_ERR_CONN_LOST = 7
-    MQTT_ERR_TLS = 8
-    MQTT_ERR_PAYLOAD_SIZE = 9
-    MQTT_ERR_NOT_SUPPORTED = 10
-    MQTT_ERR_AUTH = 11
-    MQTT_ERR_ACL_DENIED = 12
-    MQTT_ERR_UNKNOWN = 13
-    MQTT_ERR_ERRNO = 14
-    MQTT_ERR_QUEUE_SIZE = 15
-    MQTT_ERR_KEEPALIVE = 16
-
-
-class MQTTProtocolVersion(enum.IntEnum):
-    MQTTv31 = 3
-    MQTTv311 = 4
-    MQTTv5 = 5
-
-
-class CallbackAPIVersion(enum.Enum):
-    """Defined the arguments passed to all user-callback.
-
-    See each callbacks for details: `on_connect`, `on_connect_fail`, `on_disconnect`, `on_message`, `on_publish`,
-    `on_subscribe`, `on_unsubscribe`, `on_log`, `on_socket_open`, `on_socket_close`,
-    `on_socket_register_write`, `on_socket_unregister_write`
-    """
-    VERSION1 = 1
-    """The version used with paho-mqtt 1.x before introducing CallbackAPIVersion.
-
-    This version had different arguments depending if MQTTv5 or MQTTv3 was used. `Properties` & `ReasonCode` were missing
-    on some callback (apply only to MQTTv5).
-
-    This version is deprecated and will be removed in version 3.0.
-    """
-    VERSION2 = 2
-    """ This version fix some of the shortcoming of previous version.
-
-    Callback have the same signature if using MQTTv5 or MQTTv3. `ReasonCode` are used in MQTTv3.
-    """
-
-
-class MessageType(enum.IntEnum):
-    CONNECT = 0x10
-    CONNACK = 0x20
-    PUBLISH = 0x30
-    PUBACK = 0x40
-    PUBREC = 0x50
-    PUBREL = 0x60
-    PUBCOMP = 0x70
-    SUBSCRIBE = 0x80
-    SUBACK = 0x90
-    UNSUBSCRIBE = 0xA0
-    UNSUBACK = 0xB0
-    PINGREQ = 0xC0
-    PINGRESP = 0xD0
-    DISCONNECT = 0xE0
-    AUTH = 0xF0
-
-
-class LogLevel(enum.IntEnum):
-    MQTT_LOG_INFO = 0x01
-    MQTT_LOG_NOTICE = 0x02
-    MQTT_LOG_WARNING = 0x04
-    MQTT_LOG_ERR = 0x08
-    MQTT_LOG_DEBUG = 0x10
-
-
-class ConnackCode(enum.IntEnum):
-    CONNACK_ACCEPTED = 0
-    CONNACK_REFUSED_PROTOCOL_VERSION = 1
-    CONNACK_REFUSED_IDENTIFIER_REJECTED = 2
-    CONNACK_REFUSED_SERVER_UNAVAILABLE = 3
-    CONNACK_REFUSED_BAD_USERNAME_PASSWORD = 4
-    CONNACK_REFUSED_NOT_AUTHORIZED = 5
-
-
-class _ConnectionState(enum.Enum):
-    MQTT_CS_NEW = enum.auto()
-    MQTT_CS_CONNECT_ASYNC = enum.auto()
-    MQTT_CS_CONNECTING = enum.auto()
-    MQTT_CS_CONNECTED = enum.auto()
-    MQTT_CS_CONNECTION_LOST = enum.auto()
-    MQTT_CS_DISCONNECTING = enum.auto()
-    MQTT_CS_DISCONNECTED = enum.auto()
-
-
-class MessageState(enum.IntEnum):
-    MQTT_MS_INVALID = 0
-    MQTT_MS_PUBLISH = 1
-    MQTT_MS_WAIT_FOR_PUBACK = 2
-    MQTT_MS_WAIT_FOR_PUBREC = 3
-    MQTT_MS_RESEND_PUBREL = 4
-    MQTT_MS_WAIT_FOR_PUBREL = 5
-    MQTT_MS_RESEND_PUBCOMP = 6
-    MQTT_MS_WAIT_FOR_PUBCOMP = 7
-    MQTT_MS_SEND_PUBREC = 8
-    MQTT_MS_QUEUED = 9
-
-
-class PahoClientMode(enum.IntEnum):
-    MQTT_CLIENT = 0
-    MQTT_BRIDGE = 1
diff --git a/lib/paho/mqtt/matcher.py b/lib/paho/mqtt/matcher.py
deleted file mode 100644
index b73c13ac..00000000
--- a/lib/paho/mqtt/matcher.py
+++ /dev/null
@@ -1,78 +0,0 @@
-class MQTTMatcher:
-    """Intended to manage topic filters including wildcards.
-
-    Internally, MQTTMatcher use a prefix tree (trie) to store
-    values associated with filters, and has an iter_match()
-    method to iterate efficiently over all filters that match
-    some topic name."""
-
-    class Node:
-        __slots__ = '_children', '_content'
-
-        def __init__(self):
-            self._children = {}
-            self._content = None
-
-    def __init__(self):
-        self._root = self.Node()
-
-    def __setitem__(self, key, value):
-        """Add a topic filter :key to the prefix tree
-        and associate it to :value"""
-        node = self._root
-        for sym in key.split('/'):
-            node = node._children.setdefault(sym, self.Node())
-        node._content = value
-
-    def __getitem__(self, key):
-        """Retrieve the value associated with some topic filter :key"""
-        try:
-            node = self._root
-            for sym in key.split('/'):
-                node = node._children[sym]
-            if node._content is None:
-                raise KeyError(key)
-            return node._content
-        except KeyError as ke:
-            raise KeyError(key) from ke
-
-    def __delitem__(self, key):
-        """Delete the value associated with some topic filter :key"""
-        lst = []
-        try:
-            parent, node = None, self._root
-            for k in key.split('/'):
-                 parent, node = node, node._children[k]
-                 lst.append((parent, k, node))
-            # TODO
-            node._content = None
-        except KeyError as ke:
-            raise KeyError(key) from ke
-        else:  # cleanup
-            for parent, k, node in reversed(lst):
-                if node._children or node._content is not None:
-                     break
-                del parent._children[k]
-
-    def iter_match(self, topic):
-        """Return an iterator on all values associated with filters
-        that match the :topic"""
-        lst = topic.split('/')
-        normal = not topic.startswith('$')
-        def rec(node, i=0):
-            if i == len(lst):
-                if node._content is not None:
-                    yield node._content
-            else:
-                part = lst[i]
-                if part in node._children:
-                    for content in rec(node._children[part], i + 1):
-                        yield content
-                if '+' in node._children and (normal or i > 0):
-                    for content in rec(node._children['+'], i + 1):
-                        yield content
-            if '#' in node._children and (normal or i > 0):
-                content = node._children['#']._content
-                if content is not None:
-                    yield content
-        return rec(self._root)
diff --git a/lib/paho/mqtt/packettypes.py b/lib/paho/mqtt/packettypes.py
deleted file mode 100644
index d2051490..00000000
--- a/lib/paho/mqtt/packettypes.py
+++ /dev/null
@@ -1,43 +0,0 @@
-"""
-*******************************************************************
-  Copyright (c) 2017, 2019 IBM Corp.
-
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v2.0
-  and Eclipse Distribution License v1.0 which accompany this distribution.
-
-  The Eclipse Public License is available at
-     http://www.eclipse.org/legal/epl-v20.html
-  and the Eclipse Distribution License is available at
-    http://www.eclipse.org/org/documents/edl-v10.php.
-
-  Contributors:
-     Ian Craggs - initial implementation and/or documentation
-*******************************************************************
-"""
-
-
-class PacketTypes:
-
-    """
-    Packet types class.  Includes the AUTH packet for MQTT v5.0.
-
-    Holds constants for each packet type such as PacketTypes.PUBLISH
-    and packet name strings: PacketTypes.Names[PacketTypes.PUBLISH].
-
-    """
-
-    indexes = range(1, 16)
-
-    # Packet types
-    CONNECT, CONNACK, PUBLISH, PUBACK, PUBREC, PUBREL, \
-        PUBCOMP, SUBSCRIBE, SUBACK, UNSUBSCRIBE, UNSUBACK, \
-        PINGREQ, PINGRESP, DISCONNECT, AUTH = indexes
-
-    # Dummy packet type for properties use - will delay only applies to will
-    WILLMESSAGE = 99
-
-    Names = ( "reserved", \
-    "Connect", "Connack", "Publish", "Puback", "Pubrec", "Pubrel", \
-    "Pubcomp", "Subscribe", "Suback", "Unsubscribe", "Unsuback", \
-    "Pingreq", "Pingresp", "Disconnect", "Auth")
diff --git a/lib/paho/mqtt/properties.py b/lib/paho/mqtt/properties.py
deleted file mode 100644
index f307b865..00000000
--- a/lib/paho/mqtt/properties.py
+++ /dev/null
@@ -1,421 +0,0 @@
-# *******************************************************************
-#   Copyright (c) 2017, 2019 IBM Corp.
-#
-#   All rights reserved. This program and the accompanying materials
-#   are made available under the terms of the Eclipse Public License v2.0
-#   and Eclipse Distribution License v1.0 which accompany this distribution.
-#
-#   The Eclipse Public License is available at
-#      http://www.eclipse.org/legal/epl-v20.html
-#   and the Eclipse Distribution License is available at
-#     http://www.eclipse.org/org/documents/edl-v10.php.
-#
-#   Contributors:
-#      Ian Craggs - initial implementation and/or documentation
-# *******************************************************************
-
-import struct
-
-from .packettypes import PacketTypes
-
-
-class MQTTException(Exception):
-    pass
-
-
-class MalformedPacket(MQTTException):
-    pass
-
-
-def writeInt16(length):
-    # serialize a 16 bit integer to network format
-    return bytearray(struct.pack("!H", length))
-
-
-def readInt16(buf):
-    # deserialize a 16 bit integer from network format
-    return struct.unpack("!H", buf[:2])[0]
-
-
-def writeInt32(length):
-    # serialize a 32 bit integer to network format
-    return bytearray(struct.pack("!L", length))
-
-
-def readInt32(buf):
-    # deserialize a 32 bit integer from network format
-    return struct.unpack("!L", buf[:4])[0]
-
-
-def writeUTF(data):
-    # data could be a string, or bytes.  If string, encode into bytes with utf-8
-    if not isinstance(data, bytes):
-        data = bytes(data, "utf-8")
-    return writeInt16(len(data)) + data
-
-
-def readUTF(buffer, maxlen):
-    if maxlen >= 2:
-        length = readInt16(buffer)
-    else:
-        raise MalformedPacket("Not enough data to read string length")
-    maxlen -= 2
-    if length > maxlen:
-        raise MalformedPacket("Length delimited string too long")
-    buf = buffer[2:2+length].decode("utf-8")
-    # look for chars which are invalid for MQTT
-    for c in buf: # look for D800-DFFF in the UTF string
-        ord_c = ord(c)
-        if ord_c >= 0xD800 and ord_c <= 0xDFFF:
-            raise MalformedPacket("[MQTT-1.5.4-1] D800-DFFF found in UTF-8 data")
-        if ord_c == 0x00: # look for null in the UTF string
-            raise MalformedPacket("[MQTT-1.5.4-2] Null found in UTF-8 data")
-        if ord_c == 0xFEFF:
-            raise MalformedPacket("[MQTT-1.5.4-3] U+FEFF in UTF-8 data")
-    return buf, length+2
-
-
-def writeBytes(buffer):
-    return writeInt16(len(buffer)) + buffer
-
-
-def readBytes(buffer):
-    length = readInt16(buffer)
-    return buffer[2:2+length], length+2
-
-
-class VariableByteIntegers:  # Variable Byte Integer
-    """
-    MQTT variable byte integer helper class.  Used
-    in several places in MQTT v5.0 properties.
-
-    """
-
-    @staticmethod
-    def encode(x):
-        """
-          Convert an integer 0 <= x <= 268435455 into multi-byte format.
-          Returns the buffer converted from the integer.
-        """
-        if not 0 <= x <= 268435455:
-            raise ValueError(f"Value {x!r} must be in range 0-268435455")
-        buffer = b''
-        while 1:
-            digit = x % 128
-            x //= 128
-            if x > 0:
-                digit |= 0x80
-            buffer += bytes([digit])
-            if x == 0:
-                break
-        return buffer
-
-    @staticmethod
-    def decode(buffer):
-        """
-          Get the value of a multi-byte integer from a buffer
-          Return the value, and the number of bytes used.
-
-          [MQTT-1.5.5-1] the encoded value MUST use the minimum number of bytes necessary to represent the value
-        """
-        multiplier = 1
-        value = 0
-        bytes = 0
-        while 1:
-            bytes += 1
-            digit = buffer[0]
-            buffer = buffer[1:]
-            value += (digit & 127) * multiplier
-            if digit & 128 == 0:
-                break
-            multiplier *= 128
-        return (value, bytes)
-
-
-class Properties:
-    """MQTT v5.0 properties class.
-
-    See Properties.names for a list of accepted property names along with their numeric values.
-
-    See Properties.properties for the data type of each property.
-
-    Example of use::
-
-        publish_properties = Properties(PacketTypes.PUBLISH)
-        publish_properties.UserProperty = ("a", "2")
-        publish_properties.UserProperty = ("c", "3")
-
-    First the object is created with packet type as argument, no properties will be present at
-    this point. Then properties are added as attributes, the name of which is the string property
-    name without the spaces.
-
-    """
-
-    def __init__(self, packetType):
-        self.packetType = packetType
-        self.types = ["Byte", "Two Byte Integer", "Four Byte Integer", "Variable Byte Integer",
-                      "Binary Data", "UTF-8 Encoded String", "UTF-8 String Pair"]
-
-        self.names = {
-            "Payload Format Indicator": 1,
-            "Message Expiry Interval": 2,
-            "Content Type": 3,
-            "Response Topic": 8,
-            "Correlation Data": 9,
-            "Subscription Identifier": 11,
-            "Session Expiry Interval": 17,
-            "Assigned Client Identifier": 18,
-            "Server Keep Alive": 19,
-            "Authentication Method": 21,
-            "Authentication Data": 22,
-            "Request Problem Information": 23,
-            "Will Delay Interval": 24,
-            "Request Response Information": 25,
-            "Response Information": 26,
-            "Server Reference": 28,
-            "Reason String": 31,
-            "Receive Maximum": 33,
-            "Topic Alias Maximum": 34,
-            "Topic Alias": 35,
-            "Maximum QoS": 36,
-            "Retain Available": 37,
-            "User Property": 38,
-            "Maximum Packet Size": 39,
-            "Wildcard Subscription Available": 40,
-            "Subscription Identifier Available": 41,
-            "Shared Subscription Available": 42
-        }
-
-        self.properties = {
-            # id:  type, packets
-            # payload format indicator
-            1: (self.types.index("Byte"), [PacketTypes.PUBLISH, PacketTypes.WILLMESSAGE]),
-            2: (self.types.index("Four Byte Integer"), [PacketTypes.PUBLISH, PacketTypes.WILLMESSAGE]),
-            3: (self.types.index("UTF-8 Encoded String"), [PacketTypes.PUBLISH, PacketTypes.WILLMESSAGE]),
-            8: (self.types.index("UTF-8 Encoded String"), [PacketTypes.PUBLISH, PacketTypes.WILLMESSAGE]),
-            9: (self.types.index("Binary Data"), [PacketTypes.PUBLISH, PacketTypes.WILLMESSAGE]),
-            11: (self.types.index("Variable Byte Integer"),
-                 [PacketTypes.PUBLISH, PacketTypes.SUBSCRIBE]),
-            17: (self.types.index("Four Byte Integer"),
-                 [PacketTypes.CONNECT, PacketTypes.CONNACK, PacketTypes.DISCONNECT]),
-            18: (self.types.index("UTF-8 Encoded String"), [PacketTypes.CONNACK]),
-            19: (self.types.index("Two Byte Integer"), [PacketTypes.CONNACK]),
-            21: (self.types.index("UTF-8 Encoded String"),
-                 [PacketTypes.CONNECT, PacketTypes.CONNACK, PacketTypes.AUTH]),
-            22: (self.types.index("Binary Data"),
-                 [PacketTypes.CONNECT, PacketTypes.CONNACK, PacketTypes.AUTH]),
-            23: (self.types.index("Byte"),
-                 [PacketTypes.CONNECT]),
-            24: (self.types.index("Four Byte Integer"), [PacketTypes.WILLMESSAGE]),
-            25: (self.types.index("Byte"), [PacketTypes.CONNECT]),
-            26: (self.types.index("UTF-8 Encoded String"), [PacketTypes.CONNACK]),
-            28: (self.types.index("UTF-8 Encoded String"),
-                 [PacketTypes.CONNACK, PacketTypes.DISCONNECT]),
-            31: (self.types.index("UTF-8 Encoded String"),
-                 [PacketTypes.CONNACK, PacketTypes.PUBACK, PacketTypes.PUBREC,
-                  PacketTypes.PUBREL, PacketTypes.PUBCOMP, PacketTypes.SUBACK,
-                  PacketTypes.UNSUBACK, PacketTypes.DISCONNECT, PacketTypes.AUTH]),
-            33: (self.types.index("Two Byte Integer"),
-                 [PacketTypes.CONNECT, PacketTypes.CONNACK]),
-            34: (self.types.index("Two Byte Integer"),
-                 [PacketTypes.CONNECT, PacketTypes.CONNACK]),
-            35: (self.types.index("Two Byte Integer"), [PacketTypes.PUBLISH]),
-            36: (self.types.index("Byte"), [PacketTypes.CONNACK]),
-            37: (self.types.index("Byte"), [PacketTypes.CONNACK]),
-            38: (self.types.index("UTF-8 String Pair"),
-                 [PacketTypes.CONNECT, PacketTypes.CONNACK,
-                  PacketTypes.PUBLISH, PacketTypes.PUBACK,
-                  PacketTypes.PUBREC, PacketTypes.PUBREL, PacketTypes.PUBCOMP,
-                  PacketTypes.SUBSCRIBE, PacketTypes.SUBACK,
-                  PacketTypes.UNSUBSCRIBE, PacketTypes.UNSUBACK,
-                  PacketTypes.DISCONNECT, PacketTypes.AUTH, PacketTypes.WILLMESSAGE]),
-            39: (self.types.index("Four Byte Integer"),
-                 [PacketTypes.CONNECT, PacketTypes.CONNACK]),
-            40: (self.types.index("Byte"), [PacketTypes.CONNACK]),
-            41: (self.types.index("Byte"), [PacketTypes.CONNACK]),
-            42: (self.types.index("Byte"), [PacketTypes.CONNACK]),
-        }
-
-    def allowsMultiple(self, compressedName):
-        return self.getIdentFromName(compressedName) in [11, 38]
-
-    def getIdentFromName(self, compressedName):
-        # return the identifier corresponding to the property name
-        result = -1
-        for name in self.names.keys():
-            if compressedName == name.replace(' ', ''):
-                result = self.names[name]
-                break
-        return result
-
-    def __setattr__(self, name, value):
-        name = name.replace(' ', '')
-        privateVars = ["packetType", "types", "names", "properties"]
-        if name in privateVars:
-            object.__setattr__(self, name, value)
-        else:
-            # the name could have spaces in, or not.  Remove spaces before assignment
-            if name not in [aname.replace(' ', '') for aname in self.names.keys()]:
-                raise MQTTException(
-                    f"Property name must be one of {self.names.keys()}")
-            # check that this attribute applies to the packet type
-            if self.packetType not in self.properties[self.getIdentFromName(name)][1]:
-                raise MQTTException(f"Property {name} does not apply to packet type {PacketTypes.Names[self.packetType]}")
-
-            # Check for forbidden values
-            if not isinstance(value, list):
-                if name in ["ReceiveMaximum", "TopicAlias"] \
-                        and (value < 1 or value > 65535):
-
-                    raise MQTTException(f"{name} property value must be in the range 1-65535")
-                elif name in ["TopicAliasMaximum"] \
-                        and (value < 0 or value > 65535):
-
-                    raise MQTTException(f"{name} property value must be in the range 0-65535")
-                elif name in ["MaximumPacketSize", "SubscriptionIdentifier"] \
-                        and (value < 1 or value > 268435455):
-
-                    raise MQTTException(f"{name} property value must be in the range 1-268435455")
-                elif name in ["RequestResponseInformation", "RequestProblemInformation", "PayloadFormatIndicator"] \
-                        and (value != 0 and value != 1):
-
-                    raise MQTTException(
-                        f"{name} property value must be 0 or 1")
-
-            if self.allowsMultiple(name):
-                if not isinstance(value, list):
-                    value = [value]
-                if hasattr(self, name):
-                    value = object.__getattribute__(self, name) + value
-            object.__setattr__(self, name, value)
-
-    def __str__(self):
-        buffer = "["
-        first = True
-        for name in self.names.keys():
-            compressedName = name.replace(' ', '')
-            if hasattr(self, compressedName):
-                if not first:
-                    buffer += ", "
-                buffer += f"{compressedName} : {getattr(self, compressedName)}"
-                first = False
-        buffer += "]"
-        return buffer
-
-    def json(self):
-        data = {}
-        for name in self.names.keys():
-            compressedName = name.replace(' ', '')
-            if hasattr(self, compressedName):
-                val = getattr(self, compressedName)
-                if compressedName == 'CorrelationData' and isinstance(val, bytes):
-                    data[compressedName] = val.hex()
-                else:
-                    data[compressedName] = val
-        return data
-
-    def isEmpty(self):
-        rc = True
-        for name in self.names.keys():
-            compressedName = name.replace(' ', '')
-            if hasattr(self, compressedName):
-                rc = False
-                break
-        return rc
-
-    def clear(self):
-        for name in self.names.keys():
-            compressedName = name.replace(' ', '')
-            if hasattr(self, compressedName):
-                delattr(self, compressedName)
-
-    def writeProperty(self, identifier, type, value):
-        buffer = b""
-        buffer += VariableByteIntegers.encode(identifier)  # identifier
-        if type == self.types.index("Byte"):  # value
-            buffer += bytes([value])
-        elif type == self.types.index("Two Byte Integer"):
-            buffer += writeInt16(value)
-        elif type == self.types.index("Four Byte Integer"):
-            buffer += writeInt32(value)
-        elif type == self.types.index("Variable Byte Integer"):
-            buffer += VariableByteIntegers.encode(value)
-        elif type == self.types.index("Binary Data"):
-            buffer += writeBytes(value)
-        elif type == self.types.index("UTF-8 Encoded String"):
-            buffer += writeUTF(value)
-        elif type == self.types.index("UTF-8 String Pair"):
-            buffer += writeUTF(value[0]) + writeUTF(value[1])
-        return buffer
-
-    def pack(self):
-        # serialize properties into buffer for sending over network
-        buffer = b""
-        for name in self.names.keys():
-            compressedName = name.replace(' ', '')
-            if hasattr(self, compressedName):
-                identifier = self.getIdentFromName(compressedName)
-                attr_type = self.properties[identifier][0]
-                if self.allowsMultiple(compressedName):
-                    for prop in getattr(self, compressedName):
-                        buffer += self.writeProperty(identifier,
-                                                     attr_type, prop)
-                else:
-                    buffer += self.writeProperty(identifier, attr_type,
-                                                 getattr(self, compressedName))
-        return VariableByteIntegers.encode(len(buffer)) + buffer
-
-    def readProperty(self, buffer, type, propslen):
-        if type == self.types.index("Byte"):
-            value = buffer[0]
-            valuelen = 1
-        elif type == self.types.index("Two Byte Integer"):
-            value = readInt16(buffer)
-            valuelen = 2
-        elif type == self.types.index("Four Byte Integer"):
-            value = readInt32(buffer)
-            valuelen = 4
-        elif type == self.types.index("Variable Byte Integer"):
-            value, valuelen = VariableByteIntegers.decode(buffer)
-        elif type == self.types.index("Binary Data"):
-            value, valuelen = readBytes(buffer)
-        elif type == self.types.index("UTF-8 Encoded String"):
-            value, valuelen = readUTF(buffer, propslen)
-        elif type == self.types.index("UTF-8 String Pair"):
-            value, valuelen = readUTF(buffer, propslen)
-            buffer = buffer[valuelen:]  # strip the bytes used by the value
-            value1, valuelen1 = readUTF(buffer, propslen - valuelen)
-            value = (value, value1)
-            valuelen += valuelen1
-        return value, valuelen
-
-    def getNameFromIdent(self, identifier):
-        rc = None
-        for name in self.names:
-            if self.names[name] == identifier:
-                rc = name
-        return rc
-
-    def unpack(self, buffer):
-        self.clear()
-        # deserialize properties into attributes from buffer received from network
-        propslen, VBIlen = VariableByteIntegers.decode(buffer)
-        buffer = buffer[VBIlen:]  # strip the bytes used by the VBI
-        propslenleft = propslen
-        while propslenleft > 0:  # properties length is 0 if there are none
-            identifier, VBIlen2 = VariableByteIntegers.decode(
-                buffer)  # property identifier
-            buffer = buffer[VBIlen2:]  # strip the bytes used by the VBI
-            propslenleft -= VBIlen2
-            attr_type = self.properties[identifier][0]
-            value, valuelen = self.readProperty(
-                buffer, attr_type, propslenleft)
-            buffer = buffer[valuelen:]  # strip the bytes used by the value
-            propslenleft -= valuelen
-            propname = self.getNameFromIdent(identifier)
-            compressedName = propname.replace(' ', '')
-            if not self.allowsMultiple(compressedName) and hasattr(self, compressedName):
-                raise MQTTException(
-                    f"Property '{property}' must not exist more than once")
-            setattr(self, propname, value)
-        return self, propslen + VBIlen
diff --git a/lib/paho/mqtt/publish.py b/lib/paho/mqtt/publish.py
deleted file mode 100644
index 333c190a..00000000
--- a/lib/paho/mqtt/publish.py
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright (c) 2014 Roger Light <roger@atchoo.org>
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v2.0
-# and Eclipse Distribution License v1.0 which accompany this distribution.
-#
-# The Eclipse Public License is available at
-#    http://www.eclipse.org/legal/epl-v20.html
-# and the Eclipse Distribution License is available at
-#   http://www.eclipse.org/org/documents/edl-v10.php.
-#
-# Contributors:
-#    Roger Light - initial API and implementation
-
-"""
-This module provides some helper functions to allow straightforward publishing
-of messages in a one-shot manner. In other words, they are useful for the
-situation where you have a single/multiple messages you want to publish to a
-broker, then disconnect and nothing else is required.
-"""
-from __future__ import annotations
-
-import collections
-from collections.abc import Iterable
-from typing import TYPE_CHECKING, Any, List, Tuple, Union
-
-from paho.mqtt.enums import CallbackAPIVersion, MQTTProtocolVersion
-from paho.mqtt.properties import Properties
-from paho.mqtt.reasoncodes import ReasonCode
-
-from .. import mqtt
-from . import client as paho
-
-if TYPE_CHECKING:
-    try:
-        from typing import NotRequired, Required, TypedDict  # type: ignore
-    except ImportError:
-        from typing_extensions import NotRequired, Required, TypedDict
-
-    try:
-        from typing import Literal
-    except ImportError:
-        from typing_extensions import Literal  # type: ignore
-
-
-
-    class AuthParameter(TypedDict, total=False):
-        username: Required[str]
-        password: NotRequired[str]
-
-
-    class TLSParameter(TypedDict, total=False):
-        ca_certs: Required[str]
-        certfile: NotRequired[str]
-        keyfile: NotRequired[str]
-        tls_version: NotRequired[int]
-        ciphers: NotRequired[str]
-        insecure: NotRequired[bool]
-
-
-    class MessageDict(TypedDict, total=False):
-        topic: Required[str]
-        payload: NotRequired[paho.PayloadType]
-        qos: NotRequired[int]
-        retain: NotRequired[bool]
-
-    MessageTuple = Tuple[str, paho.PayloadType, int, bool]
-
-    MessagesList = List[Union[MessageDict, MessageTuple]]
-
-
-def _do_publish(client: paho.Client):
-    """Internal function"""
-
-    message = client._userdata.popleft()
-
-    if isinstance(message, dict):
-        client.publish(**message)
-    elif isinstance(message, (tuple, list)):
-        client.publish(*message)
-    else:
-        raise TypeError('message must be a dict, tuple, or list')
-
-
-def _on_connect(client: paho.Client, userdata: MessagesList, flags, reason_code, properties):
-    """Internal v5 callback"""
-    if reason_code == 0:
-        if len(userdata) > 0:
-            _do_publish(client)
-    else:
-        raise mqtt.MQTTException(paho.connack_string(reason_code))
-
-
-def _on_publish(
-    client: paho.Client, userdata: collections.deque[MessagesList], mid: int, reason_codes: ReasonCode, properties: Properties,
-) -> None:
-    """Internal callback"""
-    #pylint: disable=unused-argument
-
-    if len(userdata) == 0:
-        client.disconnect()
-    else:
-        _do_publish(client)
-
-
-def multiple(
-    msgs: MessagesList,
-    hostname: str = "localhost",
-    port: int = 1883,
-    client_id: str = "",
-    keepalive: int = 60,
-    will: MessageDict | None = None,
-    auth: AuthParameter | None = None,
-    tls: TLSParameter | None = None,
-    protocol: MQTTProtocolVersion = paho.MQTTv311,
-    transport: Literal["tcp", "websockets"] = "tcp",
-    proxy_args: Any | None = None,
-) -> None:
-    """Publish multiple messages to a broker, then disconnect cleanly.
-
-    This function creates an MQTT client, connects to a broker and publishes a
-    list of messages. Once the messages have been delivered, it disconnects
-    cleanly from the broker.
-
-    :param msgs: a list of messages to publish. Each message is either a dict or a
-           tuple.
-
-           If a dict, only the topic must be present. Default values will be
-           used for any missing arguments. The dict must be of the form:
-
-           msg = {'topic':"<topic>", 'payload':"<payload>", 'qos':<qos>,
-           'retain':<retain>}
-           topic must be present and may not be empty.
-           If payload is "", None or not present then a zero length payload
-           will be published.
-           If qos is not present, the default of 0 is used.
-           If retain is not present, the default of False is used.
-
-           If a tuple, then it must be of the form:
-           ("<topic>", "<payload>", qos, retain)
-
-    :param str hostname: the address of the broker to connect to.
-               Defaults to localhost.
-
-    :param int port: the port to connect to the broker on. Defaults to 1883.
-
-    :param str client_id: the MQTT client id to use. If "" or None, the Paho library will
-                generate a client id automatically.
-
-    :param int keepalive: the keepalive timeout value for the client. Defaults to 60
-                seconds.
-
-    :param will: a dict containing will parameters for the client: will = {'topic':
-           "<topic>", 'payload':"<payload">, 'qos':<qos>, 'retain':<retain>}.
-           Topic is required, all other parameters are optional and will
-           default to None, 0 and False respectively.
-           Defaults to None, which indicates no will should be used.
-
-    :param auth: a dict containing authentication parameters for the client:
-           auth = {'username':"<username>", 'password':"<password>"}
-           Username is required, password is optional and will default to None
-           if not provided.
-           Defaults to None, which indicates no authentication is to be used.
-
-    :param tls: a dict containing TLS configuration parameters for the client:
-          dict = {'ca_certs':"<ca_certs>", 'certfile':"<certfile>",
-          'keyfile':"<keyfile>", 'tls_version':"<tls_version>",
-          'ciphers':"<ciphers">, 'insecure':"<bool>"}
-          ca_certs is required, all other parameters are optional and will
-          default to None if not provided, which results in the client using
-          the default behaviour - see the paho.mqtt.client documentation.
-          Alternatively, tls input can be an SSLContext object, which will be
-          processed using the tls_set_context method.
-          Defaults to None, which indicates that TLS should not be used.
-
-    :param str transport: set to "tcp" to use the default setting of transport which is
-          raw TCP. Set to "websockets" to use WebSockets as the transport.
-
-    :param proxy_args: a dictionary that will be given to the client.
-    """
-
-    if not isinstance(msgs, Iterable):
-        raise TypeError('msgs must be an iterable')
-    if len(msgs) == 0:
-        raise ValueError('msgs is empty')
-
-    client = paho.Client(
-        CallbackAPIVersion.VERSION2,
-        client_id=client_id,
-        userdata=collections.deque(msgs),
-        protocol=protocol,
-        transport=transport,
-    )
-
-    client.enable_logger()
-    client.on_publish = _on_publish
-    client.on_connect = _on_connect  # type: ignore
-
-    if proxy_args is not None:
-        client.proxy_set(**proxy_args)
-
-    if auth:
-        username = auth.get('username')
-        if username:
-            password = auth.get('password')
-            client.username_pw_set(username, password)
-        else:
-            raise KeyError("The 'username' key was not found, this is "
-                           "required for auth")
-
-    if will is not None:
-        client.will_set(**will)
-
-    if tls is not None:
-        if isinstance(tls, dict):
-            insecure = tls.pop('insecure', False)
-            # mypy don't get that tls no longer contains the key insecure
-            client.tls_set(**tls)  # type: ignore[misc]
-            if insecure:
-                # Must be set *after* the `client.tls_set()` call since it sets
-                # up the SSL context that `client.tls_insecure_set` alters.
-                client.tls_insecure_set(insecure)
-        else:
-            # Assume input is SSLContext object
-            client.tls_set_context(tls)
-
-    client.connect(hostname, port, keepalive)
-    client.loop_forever()
-
-
-def single(
-    topic: str,
-    payload: paho.PayloadType = None,
-    qos: int = 0,
-    retain: bool = False,
-    hostname: str = "localhost",
-    port: int = 1883,
-    client_id: str = "",
-    keepalive: int = 60,
-    will: MessageDict | None = None,
-    auth: AuthParameter | None = None,
-    tls: TLSParameter | None = None,
-    protocol: MQTTProtocolVersion = paho.MQTTv311,
-    transport: Literal["tcp", "websockets"] = "tcp",
-    proxy_args: Any | None = None,
-) -> None:
-    """Publish a single message to a broker, then disconnect cleanly.
-
-    This function creates an MQTT client, connects to a broker and publishes a
-    single message. Once the message has been delivered, it disconnects cleanly
-    from the broker.
-
-    :param str topic: the only required argument must be the topic string to which the
-            payload will be published.
-
-    :param payload: the payload to be published. If "" or None, a zero length payload
-              will be published.
-
-    :param int qos: the qos to use when publishing,  default to 0.
-
-    :param bool retain: set the message to be retained (True) or not (False).
-
-    :param str hostname: the address of the broker to connect to.
-               Defaults to localhost.
-
-    :param int port: the port to connect to the broker on. Defaults to 1883.
-
-    :param str client_id: the MQTT client id to use. If "" or None, the Paho library will
-                generate a client id automatically.
-
-    :param int keepalive: the keepalive timeout value for the client. Defaults to 60
-                seconds.
-
-    :param will: a dict containing will parameters for the client: will = {'topic':
-           "<topic>", 'payload':"<payload">, 'qos':<qos>, 'retain':<retain>}.
-           Topic is required, all other parameters are optional and will
-           default to None, 0 and False respectively.
-           Defaults to None, which indicates no will should be used.
-
-    :param auth: a dict containing authentication parameters for the client:
-           Username is required, password is optional and will default to None
-           auth = {'username':"<username>", 'password':"<password>"}
-           if not provided.
-           Defaults to None, which indicates no authentication is to be used.
-
-    :param tls: a dict containing TLS configuration parameters for the client:
-          dict = {'ca_certs':"<ca_certs>", 'certfile':"<certfile>",
-          'keyfile':"<keyfile>", 'tls_version':"<tls_version>",
-          'ciphers':"<ciphers">, 'insecure':"<bool>"}
-          ca_certs is required, all other parameters are optional and will
-          default to None if not provided, which results in the client using
-          the default behaviour - see the paho.mqtt.client documentation.
-          Defaults to None, which indicates that TLS should not be used.
-          Alternatively, tls input can be an SSLContext object, which will be
-          processed using the tls_set_context method.
-
-    :param transport: set to "tcp" to use the default setting of transport which is
-          raw TCP. Set to "websockets" to use WebSockets as the transport.
-
-    :param proxy_args: a dictionary that will be given to the client.
-    """
-
-    msg: MessageDict = {'topic':topic, 'payload':payload, 'qos':qos, 'retain':retain}
-
-    multiple([msg], hostname, port, client_id, keepalive, will, auth, tls,
-             protocol, transport, proxy_args)
diff --git a/lib/paho/mqtt/py.typed b/lib/paho/mqtt/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/paho/mqtt/reasoncodes.py b/lib/paho/mqtt/reasoncodes.py
deleted file mode 100644
index 243ac96f..00000000
--- a/lib/paho/mqtt/reasoncodes.py
+++ /dev/null
@@ -1,223 +0,0 @@
-# *******************************************************************
-#   Copyright (c) 2017, 2019 IBM Corp.
-#
-#   All rights reserved. This program and the accompanying materials
-#   are made available under the terms of the Eclipse Public License v2.0
-#   and Eclipse Distribution License v1.0 which accompany this distribution.
-#
-#   The Eclipse Public License is available at
-#      http://www.eclipse.org/legal/epl-v20.html
-#   and the Eclipse Distribution License is available at
-#     http://www.eclipse.org/org/documents/edl-v10.php.
-#
-#   Contributors:
-#      Ian Craggs - initial implementation and/or documentation
-# *******************************************************************
-
-import functools
-import warnings
-from typing import Any
-
-from .packettypes import PacketTypes
-
-
-@functools.total_ordering
-class ReasonCode:
-    """MQTT version 5.0 reason codes class.
-
-    See ReasonCode.names for a list of possible numeric values along with their
-    names and the packets to which they apply.
-
-    """
-
-    def __init__(self, packetType: int, aName: str ="Success", identifier: int =-1):
-        """
-        packetType: the type of the packet, such as PacketTypes.CONNECT that
-            this reason code will be used with.  Some reason codes have different
-            names for the same identifier when used a different packet type.
-
-        aName: the String name of the reason code to be created.  Ignored
-            if the identifier is set.
-
-        identifier: an integer value of the reason code to be created.
-
-        """
-
-        self.packetType = packetType
-        self.names = {
-            0: {"Success": [PacketTypes.CONNACK, PacketTypes.PUBACK,
-                            PacketTypes.PUBREC, PacketTypes.PUBREL, PacketTypes.PUBCOMP,
-                            PacketTypes.UNSUBACK, PacketTypes.AUTH],
-                "Normal disconnection": [PacketTypes.DISCONNECT],
-                "Granted QoS 0": [PacketTypes.SUBACK]},
-            1: {"Granted QoS 1": [PacketTypes.SUBACK]},
-            2: {"Granted QoS 2": [PacketTypes.SUBACK]},
-            4: {"Disconnect with will message": [PacketTypes.DISCONNECT]},
-            16: {"No matching subscribers":
-                 [PacketTypes.PUBACK, PacketTypes.PUBREC]},
-            17: {"No subscription found": [PacketTypes.UNSUBACK]},
-            24: {"Continue authentication": [PacketTypes.AUTH]},
-            25: {"Re-authenticate": [PacketTypes.AUTH]},
-            128: {"Unspecified error": [PacketTypes.CONNACK, PacketTypes.PUBACK,
-                                        PacketTypes.PUBREC, PacketTypes.SUBACK, PacketTypes.UNSUBACK,
-                                        PacketTypes.DISCONNECT], },
-            129: {"Malformed packet":
-                  [PacketTypes.CONNACK, PacketTypes.DISCONNECT]},
-            130: {"Protocol error":
-                  [PacketTypes.CONNACK, PacketTypes.DISCONNECT]},
-            131: {"Implementation specific error": [PacketTypes.CONNACK,
-                                                    PacketTypes.PUBACK, PacketTypes.PUBREC, PacketTypes.SUBACK,
-                                                    PacketTypes.UNSUBACK, PacketTypes.DISCONNECT], },
-            132: {"Unsupported protocol version": [PacketTypes.CONNACK]},
-            133: {"Client identifier not valid": [PacketTypes.CONNACK]},
-            134: {"Bad user name or password": [PacketTypes.CONNACK]},
-            135: {"Not authorized": [PacketTypes.CONNACK, PacketTypes.PUBACK,
-                                     PacketTypes.PUBREC, PacketTypes.SUBACK, PacketTypes.UNSUBACK,
-                                     PacketTypes.DISCONNECT], },
-            136: {"Server unavailable": [PacketTypes.CONNACK]},
-            137: {"Server busy": [PacketTypes.CONNACK, PacketTypes.DISCONNECT]},
-            138: {"Banned": [PacketTypes.CONNACK]},
-            139: {"Server shutting down": [PacketTypes.DISCONNECT]},
-            140: {"Bad authentication method":
-                  [PacketTypes.CONNACK, PacketTypes.DISCONNECT]},
-            141: {"Keep alive timeout": [PacketTypes.DISCONNECT]},
-            142: {"Session taken over": [PacketTypes.DISCONNECT]},
-            143: {"Topic filter invalid":
-                  [PacketTypes.SUBACK, PacketTypes.UNSUBACK, PacketTypes.DISCONNECT]},
-            144: {"Topic name invalid":
-                  [PacketTypes.CONNACK, PacketTypes.PUBACK,
-                   PacketTypes.PUBREC, PacketTypes.DISCONNECT]},
-            145: {"Packet identifier in use":
-                  [PacketTypes.PUBACK, PacketTypes.PUBREC,
-                   PacketTypes.SUBACK, PacketTypes.UNSUBACK]},
-            146: {"Packet identifier not found":
-                  [PacketTypes.PUBREL, PacketTypes.PUBCOMP]},
-            147: {"Receive maximum exceeded": [PacketTypes.DISCONNECT]},
-            148: {"Topic alias invalid": [PacketTypes.DISCONNECT]},
-            149: {"Packet too large": [PacketTypes.CONNACK, PacketTypes.DISCONNECT]},
-            150: {"Message rate too high": [PacketTypes.DISCONNECT]},
-            151: {"Quota exceeded": [PacketTypes.CONNACK, PacketTypes.PUBACK,
-                                     PacketTypes.PUBREC, PacketTypes.SUBACK, PacketTypes.DISCONNECT], },
-            152: {"Administrative action": [PacketTypes.DISCONNECT]},
-            153: {"Payload format invalid":
-                  [PacketTypes.PUBACK, PacketTypes.PUBREC, PacketTypes.DISCONNECT]},
-            154: {"Retain not supported":
-                  [PacketTypes.CONNACK, PacketTypes.DISCONNECT]},
-            155: {"QoS not supported":
-                  [PacketTypes.CONNACK, PacketTypes.DISCONNECT]},
-            156: {"Use another server":
-                  [PacketTypes.CONNACK, PacketTypes.DISCONNECT]},
-            157: {"Server moved":
-                  [PacketTypes.CONNACK, PacketTypes.DISCONNECT]},
-            158: {"Shared subscription not supported":
-                  [PacketTypes.SUBACK, PacketTypes.DISCONNECT]},
-            159: {"Connection rate exceeded":
-                  [PacketTypes.CONNACK, PacketTypes.DISCONNECT]},
-            160: {"Maximum connect time":
-                  [PacketTypes.DISCONNECT]},
-            161: {"Subscription identifiers not supported":
-                  [PacketTypes.SUBACK, PacketTypes.DISCONNECT]},
-            162: {"Wildcard subscription not supported":
-                  [PacketTypes.SUBACK, PacketTypes.DISCONNECT]},
-        }
-        if identifier == -1:
-            if packetType == PacketTypes.DISCONNECT and aName == "Success":
-                aName = "Normal disconnection"
-            self.set(aName)
-        else:
-            self.value = identifier
-            self.getName()  # check it's good
-
-    def __getName__(self, packetType, identifier):
-        """
-        Get the reason code string name for a specific identifier.
-        The name can vary by packet type for the same identifier, which
-        is why the packet type is also required.
-
-        Used when displaying the reason code.
-        """
-        if identifier not in self.names:
-            raise KeyError(identifier)
-        names = self.names[identifier]
-        namelist = [name for name in names.keys() if packetType in names[name]]
-        if len(namelist) != 1:
-            raise ValueError(f"Expected exactly one name, found {namelist!r}")
-        return namelist[0]
-
-    def getId(self, name):
-        """
-        Get the numeric id corresponding to a reason code name.
-
-        Used when setting the reason code for a packetType
-        check that only valid codes for the packet are set.
-        """
-        for code in self.names.keys():
-            if name in self.names[code].keys():
-                if self.packetType in self.names[code][name]:
-                    return code
-        raise KeyError(f"Reason code name not found: {name}")
-
-    def set(self, name):
-        self.value = self.getId(name)
-
-    def unpack(self, buffer):
-        c = buffer[0]
-        name = self.__getName__(self.packetType, c)
-        self.value = self.getId(name)
-        return 1
-
-    def getName(self):
-        """Returns the reason code name corresponding to the numeric value which is set.
-        """
-        return self.__getName__(self.packetType, self.value)
-
-    def __eq__(self, other):
-        if isinstance(other, int):
-            return self.value == other
-        if isinstance(other, str):
-            return other == str(self)
-        if isinstance(other, ReasonCode):
-            return self.value == other.value
-        return False
-
-    def __lt__(self, other):
-        if isinstance(other, int):
-            return self.value < other
-        if isinstance(other, ReasonCode):
-            return self.value < other.value
-        return NotImplemented
-
-    def __repr__(self):
-        try:
-            packet_name = PacketTypes.Names[self.packetType]
-        except IndexError:
-            packet_name = "Unknown"
-
-        return f"ReasonCode({packet_name}, {self.getName()!r})"
-
-    def __str__(self):
-        return self.getName()
-
-    def json(self):
-        return self.getName()
-
-    def pack(self):
-        return bytearray([self.value])
-
-    @property
-    def is_failure(self) -> bool:
-        return self.value >= 0x80
-
-
-class _CompatibilityIsInstance(type):
-    def __instancecheck__(self, other: Any) -> bool:
-        return isinstance(other, ReasonCode)
-
-
-class ReasonCodes(ReasonCode, metaclass=_CompatibilityIsInstance):
-    def __init__(self, *args, **kwargs):
-        warnings.warn("ReasonCodes is deprecated, use ReasonCode (singular) instead",
-            category=DeprecationWarning,
-            stacklevel=2,
-        )
-        super().__init__(*args, **kwargs)
diff --git a/lib/paho/mqtt/subscribe.py b/lib/paho/mqtt/subscribe.py
deleted file mode 100644
index b6c80f44..00000000
--- a/lib/paho/mqtt/subscribe.py
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright (c) 2016 Roger Light <roger@atchoo.org>
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v2.0
-# and Eclipse Distribution License v1.0 which accompany this distribution.
-#
-# The Eclipse Public License is available at
-#    http://www.eclipse.org/legal/epl-v20.html
-# and the Eclipse Distribution License is available at
-#   http://www.eclipse.org/org/documents/edl-v10.php.
-#
-# Contributors:
-#    Roger Light - initial API and implementation
-
-"""
-This module provides some helper functions to allow straightforward subscribing
-to topics and retrieving messages. The two functions are simple(), which
-returns one or messages matching a set of topics, and callback() which allows
-you to pass a callback for processing of messages.
-"""
-
-from .. import mqtt
-from . import client as paho
-
-
-def _on_connect(client, userdata, flags, reason_code, properties):
-    """Internal callback"""
-    if reason_code != 0:
-        raise mqtt.MQTTException(paho.connack_string(reason_code))
-
-    if isinstance(userdata['topics'], list):
-        for topic in userdata['topics']:
-            client.subscribe(topic, userdata['qos'])
-    else:
-        client.subscribe(userdata['topics'], userdata['qos'])
-
-
-def _on_message_callback(client, userdata, message):
-    """Internal callback"""
-    userdata['callback'](client, userdata['userdata'], message)
-
-
-def _on_message_simple(client, userdata, message):
-    """Internal callback"""
-
-    if userdata['msg_count'] == 0:
-        return
-
-    # Don't process stale retained messages if 'retained' was false
-    if message.retain and not userdata['retained']:
-        return
-
-    userdata['msg_count'] = userdata['msg_count'] - 1
-
-    if userdata['messages'] is None and userdata['msg_count'] == 0:
-        userdata['messages'] = message
-        client.disconnect()
-        return
-
-    userdata['messages'].append(message)
-    if userdata['msg_count'] == 0:
-        client.disconnect()
-
-
-def callback(callback, topics, qos=0, userdata=None, hostname="localhost",
-             port=1883, client_id="", keepalive=60, will=None, auth=None,
-             tls=None, protocol=paho.MQTTv311, transport="tcp",
-             clean_session=True, proxy_args=None):
-    """Subscribe to a list of topics and process them in a callback function.
-
-    This function creates an MQTT client, connects to a broker and subscribes
-    to a list of topics. Incoming messages are processed by the user provided
-    callback.  This is a blocking function and will never return.
-
-    :param callback: function with the same signature as `on_message` for
-               processing the messages received.
-
-    :param topics: either a string containing a single topic to subscribe to, or a
-             list of topics to subscribe to.
-
-    :param int qos: the qos to use when subscribing. This is applied to all topics.
-
-    :param userdata: passed to the callback
-
-    :param str hostname: the address of the broker to connect to.
-               Defaults to localhost.
-
-    :param int port: the port to connect to the broker on. Defaults to 1883.
-
-    :param str client_id: the MQTT client id to use. If "" or None, the Paho library will
-                generate a client id automatically.
-
-    :param int keepalive: the keepalive timeout value for the client. Defaults to 60
-                seconds.
-
-    :param will: a dict containing will parameters for the client: will = {'topic':
-           "<topic>", 'payload':"<payload">, 'qos':<qos>, 'retain':<retain>}.
-           Topic is required, all other parameters are optional and will
-           default to None, 0 and False respectively.
-
-           Defaults to None, which indicates no will should be used.
-
-    :param auth: a dict containing authentication parameters for the client:
-           auth = {'username':"<username>", 'password':"<password>"}
-           Username is required, password is optional and will default to None
-           if not provided.
-           Defaults to None, which indicates no authentication is to be used.
-
-    :param tls: a dict containing TLS configuration parameters for the client:
-          dict = {'ca_certs':"<ca_certs>", 'certfile':"<certfile>",
-          'keyfile':"<keyfile>", 'tls_version':"<tls_version>",
-          'ciphers':"<ciphers">, 'insecure':"<bool>"}
-          ca_certs is required, all other parameters are optional and will
-          default to None if not provided, which results in the client using
-          the default behaviour - see the paho.mqtt.client documentation.
-          Alternatively, tls input can be an SSLContext object, which will be
-          processed using the tls_set_context method.
-          Defaults to None, which indicates that TLS should not be used.
-
-    :param str transport: set to "tcp" to use the default setting of transport which is
-          raw TCP. Set to "websockets" to use WebSockets as the transport.
-
-    :param clean_session: a boolean that determines the client type. If True,
-                    the broker will remove all information about this client
-                    when it disconnects. If False, the client is a persistent
-                    client and subscription information and queued messages
-                    will be retained when the client disconnects.
-                    Defaults to True.
-
-    :param proxy_args: a dictionary that will be given to the client.
-    """
-
-    if qos < 0 or qos > 2:
-        raise ValueError('qos must be in the range 0-2')
-
-    callback_userdata = {
-        'callback':callback,
-        'topics':topics,
-        'qos':qos,
-        'userdata':userdata}
-
-    client = paho.Client(
-        paho.CallbackAPIVersion.VERSION2,
-        client_id=client_id,
-        userdata=callback_userdata,
-        protocol=protocol,
-        transport=transport,
-        clean_session=clean_session,
-    )
-    client.enable_logger()
-
-    client.on_message = _on_message_callback
-    client.on_connect = _on_connect
-
-    if proxy_args is not None:
-        client.proxy_set(**proxy_args)
-
-    if auth:
-        username = auth.get('username')
-        if username:
-            password = auth.get('password')
-            client.username_pw_set(username, password)
-        else:
-            raise KeyError("The 'username' key was not found, this is "
-                           "required for auth")
-
-    if will is not None:
-        client.will_set(**will)
-
-    if tls is not None:
-        if isinstance(tls, dict):
-            insecure = tls.pop('insecure', False)
-            client.tls_set(**tls)
-            if insecure:
-                # Must be set *after* the `client.tls_set()` call since it sets
-                # up the SSL context that `client.tls_insecure_set` alters.
-                client.tls_insecure_set(insecure)
-        else:
-            # Assume input is SSLContext object
-            client.tls_set_context(tls)
-
-    client.connect(hostname, port, keepalive)
-    client.loop_forever()
-
-
-def simple(topics, qos=0, msg_count=1, retained=True, hostname="localhost",
-           port=1883, client_id="", keepalive=60, will=None, auth=None,
-           tls=None, protocol=paho.MQTTv311, transport="tcp",
-           clean_session=True, proxy_args=None):
-    """Subscribe to a list of topics and return msg_count messages.
-
-    This function creates an MQTT client, connects to a broker and subscribes
-    to a list of topics. Once "msg_count" messages have been received, it
-    disconnects cleanly from the broker and returns the messages.
-
-    :param topics: either a string containing a single topic to subscribe to, or a
-             list of topics to subscribe to.
-
-    :param int qos: the qos to use when subscribing. This is applied to all topics.
-
-    :param int msg_count: the number of messages to retrieve from the broker.
-                if msg_count == 1 then a single MQTTMessage will be returned.
-                if msg_count > 1 then a list of MQTTMessages will be returned.
-
-    :param bool retained: If set to True, retained messages will be processed the same as
-               non-retained messages. If set to False, retained messages will
-               be ignored. This means that with retained=False and msg_count=1,
-               the function will return the first message received that does
-               not have the retained flag set.
-
-    :param str hostname: the address of the broker to connect to.
-               Defaults to localhost.
-
-    :param int port: the port to connect to the broker on. Defaults to 1883.
-
-    :param str client_id: the MQTT client id to use. If "" or None, the Paho library will
-                generate a client id automatically.
-
-    :param int keepalive: the keepalive timeout value for the client. Defaults to 60
-                seconds.
-
-    :param will: a dict containing will parameters for the client: will = {'topic':
-           "<topic>", 'payload':"<payload">, 'qos':<qos>, 'retain':<retain>}.
-           Topic is required, all other parameters are optional and will
-           default to None, 0 and False respectively.
-           Defaults to None, which indicates no will should be used.
-
-    :param auth: a dict containing authentication parameters for the client:
-           auth = {'username':"<username>", 'password':"<password>"}
-           Username is required, password is optional and will default to None
-           if not provided.
-           Defaults to None, which indicates no authentication is to be used.
-
-    :param tls: a dict containing TLS configuration parameters for the client:
-          dict = {'ca_certs':"<ca_certs>", 'certfile':"<certfile>",
-          'keyfile':"<keyfile>", 'tls_version':"<tls_version>",
-          'ciphers':"<ciphers">, 'insecure':"<bool>"}
-          ca_certs is required, all other parameters are optional and will
-          default to None if not provided, which results in the client using
-          the default behaviour - see the paho.mqtt.client documentation.
-          Alternatively, tls input can be an SSLContext object, which will be
-          processed using the tls_set_context method.
-          Defaults to None, which indicates that TLS should not be used.
-
-    :param protocol: the MQTT protocol version to use. Defaults to MQTTv311.
-
-    :param transport: set to "tcp" to use the default setting of transport which is
-          raw TCP. Set to "websockets" to use WebSockets as the transport.
-
-    :param clean_session: a boolean that determines the client type. If True,
-                    the broker will remove all information about this client
-                    when it disconnects. If False, the client is a persistent
-                    client and subscription information and queued messages
-                    will be retained when the client disconnects.
-                    Defaults to True. If protocol is MQTTv50, clean_session
-                    is ignored.
-
-    :param proxy_args: a dictionary that will be given to the client.
-    """
-
-    if msg_count < 1:
-        raise ValueError('msg_count must be > 0')
-
-    # Set ourselves up to return a single message if msg_count == 1, or a list
-    # if > 1.
-    if msg_count == 1:
-        messages = None
-    else:
-        messages = []
-
-    # Ignore clean_session if protocol is MQTTv50, otherwise Client will raise
-    if protocol == paho.MQTTv5:
-        clean_session = None
-
-    userdata = {'retained':retained, 'msg_count':msg_count, 'messages':messages}
-
-    callback(_on_message_simple, topics, qos, userdata, hostname, port,
-             client_id, keepalive, will, auth, tls, protocol, transport,
-             clean_session, proxy_args)
-
-    return userdata['messages']
diff --git a/lib/paho/mqtt/subscribeoptions.py b/lib/paho/mqtt/subscribeoptions.py
deleted file mode 100644
index 7e0605de..00000000
--- a/lib/paho/mqtt/subscribeoptions.py
+++ /dev/null
@@ -1,113 +0,0 @@
-"""
-*******************************************************************
-  Copyright (c) 2017, 2019 IBM Corp.
-
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License v2.0
-  and Eclipse Distribution License v1.0 which accompany this distribution.
-
-  The Eclipse Public License is available at
-     http://www.eclipse.org/legal/epl-v20.html
-  and the Eclipse Distribution License is available at
-    http://www.eclipse.org/org/documents/edl-v10.php.
-
-  Contributors:
-     Ian Craggs - initial implementation and/or documentation
-*******************************************************************
-"""
-
-
-
-class MQTTException(Exception):
-    pass
-
-
-class SubscribeOptions:
-    """The MQTT v5.0 subscribe options class.
-
-    The options are:
-        qos:                As in MQTT v3.1.1.
-        noLocal:            True or False. If set to True, the subscriber will not receive its own publications.
-        retainAsPublished:  True or False. If set to True, the retain flag on received publications will be as set
-                            by the publisher.
-        retainHandling:     RETAIN_SEND_ON_SUBSCRIBE, RETAIN_SEND_IF_NEW_SUB or RETAIN_DO_NOT_SEND
-                            Controls when the broker should send retained messages:
-                                - RETAIN_SEND_ON_SUBSCRIBE: on any successful subscribe request
-                                - RETAIN_SEND_IF_NEW_SUB: only if the subscribe request is new
-                                - RETAIN_DO_NOT_SEND: never send retained messages
-    """
-
-    # retain handling options
-    RETAIN_SEND_ON_SUBSCRIBE, RETAIN_SEND_IF_NEW_SUB, RETAIN_DO_NOT_SEND = range(
-        0, 3)
-
-    def __init__(
-        self,
-        qos: int = 0,
-        noLocal: bool = False,
-        retainAsPublished: bool = False,
-        retainHandling: int = RETAIN_SEND_ON_SUBSCRIBE,
-    ):
-        """
-        qos:                0, 1 or 2.  0 is the default.
-        noLocal:            True or False. False is the default and corresponds to MQTT v3.1.1 behavior.
-        retainAsPublished:  True or False. False is the default and corresponds to MQTT v3.1.1 behavior.
-        retainHandling:     RETAIN_SEND_ON_SUBSCRIBE, RETAIN_SEND_IF_NEW_SUB or RETAIN_DO_NOT_SEND
-                            RETAIN_SEND_ON_SUBSCRIBE is the default and corresponds to MQTT v3.1.1 behavior.
-        """
-        object.__setattr__(self, "names",
-                           ["QoS", "noLocal", "retainAsPublished", "retainHandling"])
-        self.QoS = qos  # bits 0,1
-        self.noLocal = noLocal  # bit 2
-        self.retainAsPublished = retainAsPublished  # bit 3
-        self.retainHandling = retainHandling  # bits 4 and 5: 0, 1 or 2
-        if self.retainHandling not in (0, 1, 2):
-            raise AssertionError(f"Retain handling should be 0, 1 or 2, not {self.retainHandling}")
-        if self.QoS not in (0, 1, 2):
-            raise AssertionError(f"QoS should be 0, 1 or 2, not {self.QoS}")
-
-    def __setattr__(self, name, value):
-        if name not in self.names:
-            raise MQTTException(
-                f"{name} Attribute name must be one of {self.names}")
-        object.__setattr__(self, name, value)
-
-    def pack(self):
-        if self.retainHandling not in (0, 1, 2):
-            raise AssertionError(f"Retain handling should be 0, 1 or 2, not {self.retainHandling}")
-        if self.QoS not in (0, 1, 2):
-            raise AssertionError(f"QoS should be 0, 1 or 2, not {self.QoS}")
-        noLocal = 1 if self.noLocal else 0
-        retainAsPublished = 1 if self.retainAsPublished else 0
-        data = [(self.retainHandling << 4) | (retainAsPublished << 3) |
-                (noLocal << 2) | self.QoS]
-        return bytes(data)
-
-    def unpack(self, buffer):
-        b0 = buffer[0]
-        self.retainHandling = ((b0 >> 4) & 0x03)
-        self.retainAsPublished = True if ((b0 >> 3) & 0x01) == 1 else False
-        self.noLocal = True if ((b0 >> 2) & 0x01) == 1 else False
-        self.QoS = (b0 & 0x03)
-        if self.retainHandling not in (0, 1, 2):
-            raise AssertionError(f"Retain handling should be 0, 1 or 2, not {self.retainHandling}")
-        if self.QoS not in (0, 1, 2):
-            raise AssertionError(f"QoS should be 0, 1 or 2, not {self.QoS}")
-        return 1
-
-    def __repr__(self):
-        return str(self)
-
-    def __str__(self):
-        return "{QoS="+str(self.QoS)+", noLocal="+str(self.noLocal) +\
-            ", retainAsPublished="+str(self.retainAsPublished) +\
-            ", retainHandling="+str(self.retainHandling)+"}"
-
-    def json(self):
-        data = {
-            "QoS": self.QoS,
-            "noLocal": self.noLocal,
-            "retainAsPublished": self.retainAsPublished,
-            "retainHandling": self.retainHandling,
-        }
-        return data
diff --git a/lib/past/__init__.py b/lib/past/__init__.py
deleted file mode 100644
index 54619e0a..00000000
--- a/lib/past/__init__.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# coding=utf-8
-"""
-past: compatibility with Python 2 from Python 3
-===============================================
-
-``past`` is a package to aid with Python 2/3 compatibility. Whereas ``future``
-contains backports of Python 3 constructs to Python 2, ``past`` provides
-implementations of some Python 2 constructs in Python 3 and tools to import and
-run Python 2 code in Python 3. It is intended to be used sparingly, as a way of
-running old Python 2 code from Python 3 until the code is ported properly.
-
-Potential uses for libraries:
-
-- as a step in porting a Python 2 codebase to Python 3 (e.g. with the ``futurize`` script)
-- to provide Python 3 support for previously Python 2-only libraries with the
-  same APIs as on Python 2 -- particularly with regard to 8-bit strings (the
-  ``past.builtins.str`` type).
-- to aid in providing minimal-effort Python 3 support for applications using
-  libraries that do not yet wish to upgrade their code properly to Python 3, or
-  wish to upgrade it gradually to Python 3 style.
-
-
-Here are some code examples that run identically on Python 3 and 2::
-
-    >>> from past.builtins import str as oldstr
-
-    >>> philosopher = oldstr(u'\u5b54\u5b50'.encode('utf-8'))
-    >>> # This now behaves like a Py2 byte-string on both Py2 and Py3.
-    >>> # For example, indexing returns a Python 2-like string object, not
-    >>> # an integer:
-    >>> philosopher[0]
-    '\xe5'
-    >>> type(philosopher[0])
-    <past.builtins.oldstr>
-
-    >>> # List-producing versions of range, reduce, map, filter
-    >>> from past.builtins import range, reduce
-    >>> range(10)
-    [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
-    >>> reduce(lambda x, y: x+y, [1, 2, 3, 4, 5])
-    15
-
-    >>> # Other functions removed in Python 3 are resurrected ...
-    >>> from past.builtins import execfile
-    >>> execfile('myfile.py')
-
-    >>> from past.builtins import raw_input
-    >>> name = raw_input('What is your name? ')
-    What is your name? [cursor]
-
-    >>> from past.builtins import reload
-    >>> reload(mymodule)   # equivalent to imp.reload(mymodule) in Python 3
-
-    >>> from past.builtins import xrange
-    >>> for i in xrange(10):
-    ...     pass
-
-
-It also provides import hooks so you can import and use Python 2 modules like
-this::
-
-    $ python3
-
-    >>> from past.translation import autotranslate
-    >>> authotranslate('mypy2module')
-    >>> import mypy2module
-
-until the authors of the Python 2 modules have upgraded their code. Then, for
-example::
-
-    >>> mypy2module.func_taking_py2_string(oldstr(b'abcd'))
-
-
-Credits
--------
-
-:Author:  Ed Schofield, Jordan M. Adler, et al
-:Sponsor: Python Charmers: https://pythoncharmers.com
-
-
-Licensing
----------
-Copyright 2013-2024 Python Charmers, Australia.
-The software is distributed under an MIT licence. See LICENSE.txt.
-"""
-
-from future import __version__, __copyright__, __license__
-
-__title__ = 'past'
-__author__ = 'Ed Schofield'
diff --git a/lib/past/builtins/__init__.py b/lib/past/builtins/__init__.py
deleted file mode 100644
index 1b19e373..00000000
--- a/lib/past/builtins/__init__.py
+++ /dev/null
@@ -1,72 +0,0 @@
-"""
-A resurrection of some old functions from Python 2 for use in Python 3. These
-should be used sparingly, to help with porting efforts, since code using them
-is no longer standard Python 3 code.
-
-This module provides the following:
-
-1. Implementations of these builtin functions which have no equivalent on Py3:
-
-- apply
-- chr
-- cmp
-- execfile
-
-2. Aliases:
-
-- intern <- sys.intern
-- raw_input <- input
-- reduce <- functools.reduce
-- reload <- imp.reload
-- unichr <- chr
-- unicode <- str
-- xrange <- range
-
-3. List-producing versions of the corresponding Python 3 iterator-producing functions:
-
-- filter
-- map
-- range
-- zip
-
-4. Forward-ported Py2 types:
-
-- basestring
-- dict
-- str
-- long
-- unicode
-
-"""
-
-from future.utils import PY3
-from past.builtins.noniterators import (filter, map, range, reduce, zip)
-# from past.builtins.misc import (ascii, hex, input, oct, open)
-if PY3:
-    from past.types import (basestring,
-                            olddict as dict,
-                            oldstr as str,
-                            long,
-                            unicode)
-else:
-    from __builtin__ import (basestring, dict, str, long, unicode)
-
-from past.builtins.misc import (apply, chr, cmp, execfile, intern, oct,
-                                raw_input, reload, unichr, unicode, xrange)
-from past import utils
-
-
-if utils.PY3:
-    # We only import names that shadow the builtins on Py3. No other namespace
-    # pollution on Py3.
-
-    # Only shadow builtins on Py3; no new names
-    __all__ = ['filter', 'map', 'range', 'reduce', 'zip',
-               'basestring', 'dict', 'str', 'long', 'unicode',
-               'apply', 'chr', 'cmp', 'execfile', 'intern', 'raw_input',
-               'reload', 'unichr', 'xrange'
-              ]
-
-else:
-    # No namespace pollution on Py2
-    __all__ = []
diff --git a/lib/past/builtins/misc.py b/lib/past/builtins/misc.py
deleted file mode 100644
index 0b8e6a98..00000000
--- a/lib/past/builtins/misc.py
+++ /dev/null
@@ -1,162 +0,0 @@
-from __future__ import unicode_literals
-
-import inspect
-import sys
-import math
-import numbers
-
-from future.utils import PY2, PY3, exec_
-
-
-if PY2:
-    from collections import Mapping
-else:
-    from collections.abc import Mapping
-
-if PY3:
-    import builtins
-    from collections.abc import Mapping
-
-    def apply(f, *args, **kw):
-        return f(*args, **kw)
-
-    from past.builtins import str as oldstr
-
-    def chr(i):
-        """
-        Return a byte-string of one character with ordinal i; 0 <= i <= 256
-        """
-        return oldstr(bytes((i,)))
-
-    def cmp(x, y):
-        """
-        cmp(x, y) -> integer
-
-        Return negative if x<y, zero if x==y, positive if x>y.
-        Python2 had looser comparison allowing cmp None and non Numerical types and collections.
-        Try to match the old behavior
-        """
-        if isinstance(x, set) and isinstance(y, set):
-            raise TypeError('cannot compare sets using cmp()',)
-        try:
-            if isinstance(x, numbers.Number) and math.isnan(x):
-                if not isinstance(y, numbers.Number):
-                    raise TypeError('cannot compare float("nan"), {type_y} with cmp'.format(type_y=type(y)))
-                if isinstance(y, int):
-                    return 1
-                else:
-                    return -1
-            if isinstance(y, numbers.Number) and math.isnan(y):
-                if not isinstance(x, numbers.Number):
-                    raise TypeError('cannot compare {type_x}, float("nan") with cmp'.format(type_x=type(x)))
-                if isinstance(x, int):
-                    return -1
-                else:
-                    return 1
-            return (x > y) - (x < y)
-        except TypeError:
-            if x == y:
-                return 0
-            type_order = [
-                type(None),
-                numbers.Number,
-                dict, list,
-                set,
-                (str, bytes),
-            ]
-            x_type_index = y_type_index = None
-            for i, type_match in enumerate(type_order):
-                if isinstance(x, type_match):
-                    x_type_index = i
-                if isinstance(y, type_match):
-                    y_type_index = i
-            if cmp(x_type_index, y_type_index) == 0:
-                if isinstance(x, bytes) and isinstance(y, str):
-                    return cmp(x.decode('ascii'), y)
-                if isinstance(y, bytes) and isinstance(x, str):
-                    return cmp(x, y.decode('ascii'))
-                elif isinstance(x, list):
-                    # if both arguments are lists take the comparison of the first non equal value
-                    for x_elem, y_elem in zip(x, y):
-                        elem_cmp_val = cmp(x_elem, y_elem)
-                        if elem_cmp_val != 0:
-                            return elem_cmp_val
-                    # if all elements are equal, return equal/0
-                    return 0
-                elif isinstance(x, dict):
-                    if len(x) != len(y):
-                        return cmp(len(x), len(y))
-                    else:
-                        x_key = min(a for a in x if a not in y or x[a] != y[a])
-                        y_key = min(b for b in y if b not in x or x[b] != y[b])
-                        if x_key != y_key:
-                            return cmp(x_key, y_key)
-                        else:
-                            return cmp(x[x_key], y[y_key])
-            return cmp(x_type_index, y_type_index)
-
-    from sys import intern
-
-    def oct(number):
-        """oct(number) -> string
-
-        Return the octal representation of an integer
-        """
-        return '0' + builtins.oct(number)[2:]
-
-    raw_input = input
-    # imp was deprecated in python 3.6
-    if sys.version_info >= (3, 6):
-        from importlib import reload
-    else:
-        # for python2, python3 <= 3.4
-        from imp import reload
-    unicode = str
-    unichr = chr
-    xrange = range
-else:
-    import __builtin__
-    from collections import Mapping
-    apply = __builtin__.apply
-    chr = __builtin__.chr
-    cmp = __builtin__.cmp
-    execfile = __builtin__.execfile
-    intern = __builtin__.intern
-    oct = __builtin__.oct
-    raw_input = __builtin__.raw_input
-    reload = __builtin__.reload
-    unicode = __builtin__.unicode
-    unichr = __builtin__.unichr
-    xrange = __builtin__.xrange
-
-
-if PY3:
-    def execfile(filename, myglobals=None, mylocals=None):
-        """
-        Read and execute a Python script from a file in the given namespaces.
-        The globals and locals are dictionaries, defaulting to the current
-        globals and locals. If only globals is given, locals defaults to it.
-        """
-        if myglobals is None:
-            # There seems to be no alternative to frame hacking here.
-            caller_frame = inspect.stack()[1]
-            myglobals = caller_frame[0].f_globals
-            mylocals = caller_frame[0].f_locals
-        elif mylocals is None:
-            # Only if myglobals is given do we set mylocals to it.
-            mylocals = myglobals
-        if not isinstance(myglobals, Mapping):
-            raise TypeError('globals must be a mapping')
-        if not isinstance(mylocals, Mapping):
-            raise TypeError('locals must be a mapping')
-        with open(filename, "rb") as fin:
-            source = fin.read()
-        code = compile(source, filename, "exec")
-        exec_(code, myglobals, mylocals)
-
-
-if PY3:
-    __all__ = ['apply', 'chr', 'cmp', 'execfile', 'intern', 'raw_input',
-               'reload', 'unichr', 'unicode', 'xrange']
-else:
-    __all__ = []
diff --git a/lib/past/builtins/noniterators.py b/lib/past/builtins/noniterators.py
deleted file mode 100644
index 183ffffd..00000000
--- a/lib/past/builtins/noniterators.py
+++ /dev/null
@@ -1,272 +0,0 @@
-"""
-This module is designed to be used as follows::
-
-    from past.builtins.noniterators import filter, map, range, reduce, zip
-
-And then, for example::
-
-    assert isinstance(range(5), list)
-
-The list-producing functions this brings in are::
-
-- ``filter``
-- ``map``
-- ``range``
-- ``reduce``
-- ``zip``
-
-"""
-
-from __future__ import division, absolute_import, print_function
-
-from itertools import chain, starmap
-import itertools       # since zip_longest doesn't exist on Py2
-from past.types import basestring
-from past.utils import PY3
-
-
-def flatmap(f, items):
-    return chain.from_iterable(map(f, items))
-
-
-if PY3:
-    import builtins
-
-    # list-producing versions of the major Python iterating functions
-    def oldfilter(*args):
-        """
-        filter(function or None, sequence) -> list, tuple, or string
-
-        Return those items of sequence for which function(item) is true.
-        If function is None, return the items that are true.  If sequence
-        is a tuple or string, return the same type, else return a list.
-        """
-        mytype = type(args[1])
-        if isinstance(args[1], basestring):
-            return mytype().join(builtins.filter(*args))
-        elif isinstance(args[1], (tuple, list)):
-            return mytype(builtins.filter(*args))
-        else:
-            # Fall back to list. Is this the right thing to do?
-            return list(builtins.filter(*args))
-
-    # This is surprisingly difficult to get right. For example, the
-    # solutions here fail with the test cases in the docstring below:
-    # http://stackoverflow.com/questions/8072755/
-    def oldmap(func, *iterables):
-        """
-        map(function, sequence[, sequence, ...]) -> list
-
-        Return a list of the results of applying the function to the
-        items of the argument sequence(s).  If more than one sequence is
-        given, the function is called with an argument list consisting of
-        the corresponding item of each sequence, substituting None for
-        missing values when not all sequences have the same length.  If
-        the function is None, return a list of the items of the sequence
-        (or a list of tuples if more than one sequence).
-
-        Test cases:
-        >>> oldmap(None, 'hello world')
-        ['h', 'e', 'l', 'l', 'o', ' ', 'w', 'o', 'r', 'l', 'd']
-
-        >>> oldmap(None, range(4))
-        [0, 1, 2, 3]
-
-        More test cases are in test_past.test_builtins.
-        """
-        zipped = itertools.zip_longest(*iterables)
-        l = list(zipped)
-        if len(l) == 0:
-            return []
-        if func is None:
-            result = l
-        else:
-            result = list(starmap(func, l))
-
-        # Inspect to see whether it's a simple sequence of tuples
-        try:
-            if max([len(item) for item in result]) == 1:
-                return list(chain.from_iterable(result))
-            # return list(flatmap(func, result))
-        except TypeError as e:
-            # Simple objects like ints have no len()
-            pass
-        return result
-
-        ############################
-        ### For reference, the source code for Py2.7 map function:
-        # static PyObject *
-        # builtin_map(PyObject *self, PyObject *args)
-        # {
-        #     typedef struct {
-        #         PyObject *it;           /* the iterator object */
-        #         int saw_StopIteration;  /* bool:  did the iterator end? */
-        #     } sequence;
-        #
-        #     PyObject *func, *result;
-        #     sequence *seqs = NULL, *sqp;
-        #     Py_ssize_t n, len;
-        #     register int i, j;
-        #
-        #     n = PyTuple_Size(args);
-        #     if (n < 2) {
-        #         PyErr_SetString(PyExc_TypeError,
-        #                         "map() requires at least two args");
-        #         return NULL;
-        #     }
-        #
-        #     func = PyTuple_GetItem(args, 0);
-        #     n--;
-        #
-        #     if (func == Py_None) {
-        #         if (PyErr_WarnPy3k("map(None, ...) not supported in 3.x; "
-        #                            "use list(...)", 1) < 0)
-        #             return NULL;
-        #         if (n == 1) {
-        #             /* map(None, S) is the same as list(S). */
-        #             return PySequence_List(PyTuple_GetItem(args, 1));
-        #         }
-        #     }
-        #
-        #     /* Get space for sequence descriptors.  Must NULL out the iterator
-        #      * pointers so that jumping to Fail_2 later doesn't see trash.
-        #      */
-        #     if ((seqs = PyMem_NEW(sequence, n)) == NULL) {
-        #         PyErr_NoMemory();
-        #         return NULL;
-        #     }
-        #     for (i = 0; i < n; ++i) {
-        #         seqs[i].it = (PyObject*)NULL;
-        #         seqs[i].saw_StopIteration = 0;
-        #     }
-        #
-        #     /* Do a first pass to obtain iterators for the arguments, and set len
-        #      * to the largest of their lengths.
-        #      */
-        #     len = 0;
-        #     for (i = 0, sqp = seqs; i < n; ++i, ++sqp) {
-        #         PyObject *curseq;
-        #         Py_ssize_t curlen;
-        #
-        #         /* Get iterator. */
-        #         curseq = PyTuple_GetItem(args, i+1);
-        #         sqp->it = PyObject_GetIter(curseq);
-        #         if (sqp->it == NULL) {
-        #             static char errmsg[] =
-        #                 "argument %d to map() must support iteration";
-        #             char errbuf[sizeof(errmsg) + 25];
-        #             PyOS_snprintf(errbuf, sizeof(errbuf), errmsg, i+2);
-        #             PyErr_SetString(PyExc_TypeError, errbuf);
-        #             goto Fail_2;
-        #         }
-        #
-        #         /* Update len. */
-        #         curlen = _PyObject_LengthHint(curseq, 8);
-        #         if (curlen > len)
-        #             len = curlen;
-        #     }
-        #
-        #     /* Get space for the result list. */
-        #     if ((result = (PyObject *) PyList_New(len)) == NULL)
-        #         goto Fail_2;
-        #
-        #     /* Iterate over the sequences until all have stopped. */
-        #     for (i = 0; ; ++i) {
-        #         PyObject *alist, *item=NULL, *value;
-        #         int numactive = 0;
-        #
-        #         if (func == Py_None && n == 1)
-        #             alist = NULL;
-        #         else if ((alist = PyTuple_New(n)) == NULL)
-        #             goto Fail_1;
-        #
-        #         for (j = 0, sqp = seqs; j < n; ++j, ++sqp) {
-        #             if (sqp->saw_StopIteration) {
-        #                 Py_INCREF(Py_None);
-        #                 item = Py_None;
-        #             }
-        #             else {
-        #                 item = PyIter_Next(sqp->it);
-        #                 if (item)
-        #                     ++numactive;
-        #                 else {
-        #                     if (PyErr_Occurred()) {
-        #                         Py_XDECREF(alist);
-        #                         goto Fail_1;
-        #                     }
-        #                     Py_INCREF(Py_None);
-        #                     item = Py_None;
-        #                     sqp->saw_StopIteration = 1;
-        #                 }
-        #             }
-        #             if (alist)
-        #                 PyTuple_SET_ITEM(alist, j, item);
-        #             else
-        #                 break;
-        #         }
-        #
-        #         if (!alist)
-        #             alist = item;
-        #
-        #         if (numactive == 0) {
-        #             Py_DECREF(alist);
-        #             break;
-        #         }
-        #
-        #         if (func == Py_None)
-        #             value = alist;
-        #         else {
-        #             value = PyEval_CallObject(func, alist);
-        #             Py_DECREF(alist);
-        #             if (value == NULL)
-        #                 goto Fail_1;
-        #         }
-        #         if (i >= len) {
-        #             int status = PyList_Append(result, value);
-        #             Py_DECREF(value);
-        #             if (status < 0)
-        #                 goto Fail_1;
-        #         }
-        #         else if (PyList_SetItem(result, i, value) < 0)
-        #             goto Fail_1;
-        #     }
-        #
-        #     if (i < len && PyList_SetSlice(result, i, len, NULL) < 0)
-        #         goto Fail_1;
-        #
-        #     goto Succeed;
-        #
-        # Fail_1:
-        #     Py_DECREF(result);
-        # Fail_2:
-        #     result = NULL;
-        # Succeed:
-        #     assert(seqs);
-        #     for (i = 0; i < n; ++i)
-        #         Py_XDECREF(seqs[i].it);
-        #     PyMem_DEL(seqs);
-        #     return result;
-        # }
-
-    def oldrange(*args, **kwargs):
-        return list(builtins.range(*args, **kwargs))
-
-    def oldzip(*args, **kwargs):
-        return list(builtins.zip(*args, **kwargs))
-
-    filter = oldfilter
-    map = oldmap
-    range = oldrange
-    from functools import reduce
-    zip = oldzip
-    __all__ = ['filter', 'map', 'range', 'reduce', 'zip']
-
-else:
-    import __builtin__
-    # Python 2-builtin ranges produce lists
-    filter = __builtin__.filter
-    map = __builtin__.map
-    range = __builtin__.range
-    reduce = __builtin__.reduce
-    zip = __builtin__.zip
-    __all__ = []
diff --git a/lib/past/translation/__init__.py b/lib/past/translation/__init__.py
deleted file mode 100644
index ae6c0d90..00000000
--- a/lib/past/translation/__init__.py
+++ /dev/null
@@ -1,453 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-past.translation
-==================
-
-The ``past.translation`` package provides an import hook for Python 3 which
-transparently runs ``futurize`` fixers over Python 2 code on import to convert
-print statements into functions, etc.
-
-It is intended to assist users in migrating to Python 3.x even if some
-dependencies still only support Python 2.x.
-
-Usage
------
-
-Once your Py2 package is installed in the usual module search path, the import
-hook is invoked as follows:
-
-    >>> from past.translation import autotranslate
-    >>> autotranslate('mypackagename')
-
-Or:
-
-    >>> autotranslate(['mypackage1', 'mypackage2'])
-
-You can unregister the hook using::
-
-    >>> from past.translation import remove_hooks
-    >>> remove_hooks()
-
-Author: Ed Schofield.
-Inspired by and based on ``uprefix`` by Vinay M. Sajip.
-"""
-
-import sys
-# imp was deprecated in python 3.6
-if sys.version_info >= (3, 6):
-    import importlib as imp
-else:
-    import imp
-import logging
-import os
-import copy
-from lib2to3.pgen2.parse import ParseError
-from lib2to3.refactor import RefactoringTool
-
-from libfuturize import fixes
-
-try:
-    from importlib.machinery import (
-        PathFinder,
-        SourceFileLoader,
-    )
-except ImportError:
-    PathFinder = None
-    SourceFileLoader = object
-
-if sys.version_info[:2] < (3, 4):
-    import imp
-
-logger = logging.getLogger(__name__)
-logger.setLevel(logging.DEBUG)
-
-myfixes = (list(fixes.libfuturize_fix_names_stage1) +
-           list(fixes.lib2to3_fix_names_stage1) +
-           list(fixes.libfuturize_fix_names_stage2) +
-           list(fixes.lib2to3_fix_names_stage2))
-
-
-# We detect whether the code is Py2 or Py3 by applying certain lib2to3 fixers
-# to it. If the diff is empty, it's Python 3 code.
-
-py2_detect_fixers = [
-# From stage 1:
-    'lib2to3.fixes.fix_apply',
-    # 'lib2to3.fixes.fix_dict',        # TODO: add support for utils.viewitems() etc. and move to stage2
-    'lib2to3.fixes.fix_except',
-    'lib2to3.fixes.fix_execfile',
-    'lib2to3.fixes.fix_exitfunc',
-    'lib2to3.fixes.fix_funcattrs',
-    'lib2to3.fixes.fix_filter',
-    'lib2to3.fixes.fix_has_key',
-    'lib2to3.fixes.fix_idioms',
-    'lib2to3.fixes.fix_import',    # makes any implicit relative imports explicit. (Use with ``from __future__ import absolute_import)
-    'lib2to3.fixes.fix_intern',
-    'lib2to3.fixes.fix_isinstance',
-    'lib2to3.fixes.fix_methodattrs',
-    'lib2to3.fixes.fix_ne',
-    'lib2to3.fixes.fix_numliterals',    # turns 1L into 1, 0755 into 0o755
-    'lib2to3.fixes.fix_paren',
-    'lib2to3.fixes.fix_print',
-    'lib2to3.fixes.fix_raise',   # uses incompatible with_traceback() method on exceptions
-    'lib2to3.fixes.fix_renames',
-    'lib2to3.fixes.fix_reduce',
-    # 'lib2to3.fixes.fix_set_literal',  # this is unnecessary and breaks Py2.6 support
-    'lib2to3.fixes.fix_repr',
-    'lib2to3.fixes.fix_standarderror',
-    'lib2to3.fixes.fix_sys_exc',
-    'lib2to3.fixes.fix_throw',
-    'lib2to3.fixes.fix_tuple_params',
-    'lib2to3.fixes.fix_types',
-    'lib2to3.fixes.fix_ws_comma',
-    'lib2to3.fixes.fix_xreadlines',
-
-# From stage 2:
-    'lib2to3.fixes.fix_basestring',
-    # 'lib2to3.fixes.fix_buffer',    # perhaps not safe. Test this.
-    # 'lib2to3.fixes.fix_callable',  # not needed in Py3.2+
-    # 'lib2to3.fixes.fix_dict',        # TODO: add support for utils.viewitems() etc.
-    'lib2to3.fixes.fix_exec',
-    # 'lib2to3.fixes.fix_future',    # we don't want to remove __future__ imports
-    'lib2to3.fixes.fix_getcwdu',
-    # 'lib2to3.fixes.fix_imports',   # called by libfuturize.fixes.fix_future_standard_library
-    # 'lib2to3.fixes.fix_imports2',  # we don't handle this yet (dbm)
-    # 'lib2to3.fixes.fix_input',
-    # 'lib2to3.fixes.fix_itertools',
-    # 'lib2to3.fixes.fix_itertools_imports',
-    'lib2to3.fixes.fix_long',
-    # 'lib2to3.fixes.fix_map',
-    # 'lib2to3.fixes.fix_metaclass', # causes SyntaxError in Py2! Use the one from ``six`` instead
-    'lib2to3.fixes.fix_next',
-    'lib2to3.fixes.fix_nonzero',     # TODO: add a decorator for mapping __bool__ to __nonzero__
-    # 'lib2to3.fixes.fix_operator',    # we will need support for this by e.g. extending the Py2 operator module to provide those functions in Py3
-    'lib2to3.fixes.fix_raw_input',
-    # 'lib2to3.fixes.fix_unicode',   # strips off the u'' prefix, which removes a potentially helpful source of information for disambiguating unicode/byte strings
-    # 'lib2to3.fixes.fix_urllib',
-    'lib2to3.fixes.fix_xrange',
-    # 'lib2to3.fixes.fix_zip',
-]
-
-
-class RTs:
-    """
-    A namespace for the refactoring tools. This avoids creating these at
-    the module level, which slows down the module import. (See issue #117).
-
-    There are two possible grammars: with or without the print statement.
-    Hence we have two possible refactoring tool implementations.
-    """
-    _rt = None
-    _rtp = None
-    _rt_py2_detect = None
-    _rtp_py2_detect = None
-
-    @staticmethod
-    def setup():
-        """
-        Call this before using the refactoring tools to create them on demand
-        if needed.
-        """
-        if None in [RTs._rt, RTs._rtp]:
-            RTs._rt = RefactoringTool(myfixes)
-            RTs._rtp = RefactoringTool(myfixes, {'print_function': True})
-
-
-    @staticmethod
-    def setup_detect_python2():
-        """
-        Call this before using the refactoring tools to create them on demand
-        if needed.
-        """
-        if None in [RTs._rt_py2_detect, RTs._rtp_py2_detect]:
-            RTs._rt_py2_detect = RefactoringTool(py2_detect_fixers)
-            RTs._rtp_py2_detect = RefactoringTool(py2_detect_fixers,
-                                                  {'print_function': True})
-
-
-# We need to find a prefix for the standard library, as we don't want to
-# process any files there (they will already be Python 3).
-#
-# The following method is used by Sanjay Vinip in uprefix. This fails for
-# ``conda`` environments:
-#     # In a non-pythonv virtualenv, sys.real_prefix points to the installed Python.
-#     # In a pythonv venv, sys.base_prefix points to the installed Python.
-#     # Outside a virtual environment, sys.prefix points to the installed Python.
-
-#     if hasattr(sys, 'real_prefix'):
-#         _syslibprefix = sys.real_prefix
-#     else:
-#         _syslibprefix = getattr(sys, 'base_prefix', sys.prefix)
-
-# Instead, we use the portion of the path common to both the stdlib modules
-# ``math`` and ``urllib``.
-
-def splitall(path):
-    """
-    Split a path into all components. From Python Cookbook.
-    """
-    allparts = []
-    while True:
-        parts = os.path.split(path)
-        if parts[0] == path:  # sentinel for absolute paths
-            allparts.insert(0, parts[0])
-            break
-        elif parts[1] == path: # sentinel for relative paths
-            allparts.insert(0, parts[1])
-            break
-        else:
-            path = parts[0]
-            allparts.insert(0, parts[1])
-    return allparts
-
-
-def common_substring(s1, s2):
-    """
-    Returns the longest common substring to the two strings, starting from the
-    left.
-    """
-    chunks = []
-    path1 = splitall(s1)
-    path2 = splitall(s2)
-    for (dir1, dir2) in zip(path1, path2):
-        if dir1 != dir2:
-            break
-        chunks.append(dir1)
-    return os.path.join(*chunks)
-
-# _stdlibprefix = common_substring(math.__file__, urllib.__file__)
-
-
-def detect_python2(source, pathname):
-    """
-    Returns a bool indicating whether we think the code is Py2
-    """
-    RTs.setup_detect_python2()
-    try:
-        tree = RTs._rt_py2_detect.refactor_string(source, pathname)
-    except ParseError as e:
-        if e.msg != 'bad input' or e.value != '=':
-            raise
-        tree = RTs._rtp.refactor_string(source, pathname)
-
-    if source != str(tree)[:-1]:   # remove added newline
-        # The above fixers made changes, so we conclude it's Python 2 code
-        logger.debug('Detected Python 2 code: {0}'.format(pathname))
-        return True
-    else:
-        logger.debug('Detected Python 3 code: {0}'.format(pathname))
-        return False
-
-
-def transform(source, pathname):
-    # This implementation uses lib2to3,
-    # you can override and use something else
-    # if that's better for you
-
-    # lib2to3 likes a newline at the end
-    RTs.setup()
-    source += '\n'
-    try:
-        tree = RTs._rt.refactor_string(source, pathname)
-    except ParseError as e:
-        if e.msg != 'bad input' or e.value != '=':
-            raise
-        tree = RTs._rtp.refactor_string(source, pathname)
-    # could optimise a bit for only doing str(tree) if
-    # getattr(tree, 'was_changed', False) returns True
-    return str(tree)[:-1]  # remove added newline
-
-
-class PastSourceFileLoader(SourceFileLoader):
-    exclude_paths = []
-    include_paths = []
-
-    def _convert_needed(self):
-        fullname = self.name
-        if any(fullname.startswith(path) for path in self.exclude_paths):
-            convert = False
-        elif any(fullname.startswith(path) for path in self.include_paths):
-            convert = True
-        else:
-            convert = False
-        return convert
-
-    def _exec_transformed_module(self, module):
-        source = self.get_source(self.name)
-        pathname = self.path
-        if detect_python2(source, pathname):
-            source = transform(source, pathname)
-        code = compile(source, pathname, "exec")
-        exec(code, module.__dict__)
-
-    # For Python 3.3
-    def load_module(self, fullname):
-        logger.debug("Running load_module for %s", fullname)
-        if fullname in sys.modules:
-            mod = sys.modules[fullname]
-        else:
-            if self._convert_needed():
-                logger.debug("Autoconverting %s", fullname)
-                mod = imp.new_module(fullname)
-                sys.modules[fullname] = mod
-
-                # required by PEP 302
-                mod.__file__ = self.path
-                mod.__loader__ = self
-                if self.is_package(fullname):
-                    mod.__path__ = []
-                    mod.__package__ = fullname
-                else:
-                    mod.__package__ = fullname.rpartition('.')[0]
-                self._exec_transformed_module(mod)
-            else:
-                mod = super().load_module(fullname)
-        return mod
-
-    # For Python >=3.4
-    def exec_module(self, module):
-        logger.debug("Running exec_module for %s", module)
-        if self._convert_needed():
-            logger.debug("Autoconverting %s", self.name)
-            self._exec_transformed_module(module)
-        else:
-            super().exec_module(module)
-
-
-class Py2Fixer(object):
-    """
-    An import hook class that uses lib2to3 for source-to-source translation of
-    Py2 code to Py3.
-    """
-
-    # See the comments on :class:future.standard_library.RenameImport.
-    # We add this attribute here so remove_hooks() and install_hooks() can
-    # unambiguously detect whether the import hook is installed:
-    PY2FIXER = True
-
-    def __init__(self):
-        self.found = None
-        self.base_exclude_paths = ['future', 'past']
-        self.exclude_paths = copy.copy(self.base_exclude_paths)
-        self.include_paths = []
-
-    def include(self, paths):
-        """
-        Pass in a sequence of module names such as 'plotrique.plotting' that,
-        if present at the leftmost side of the full package name, would
-        specify the module to be transformed from Py2 to Py3.
-        """
-        self.include_paths += paths
-
-    def exclude(self, paths):
-        """
-        Pass in a sequence of strings such as 'mymodule' that, if
-        present at the leftmost side of the full package name, would cause
-        the module not to undergo any source transformation.
-        """
-        self.exclude_paths += paths
-
-    # For Python 3.3
-    def find_module(self, fullname, path=None):
-        logger.debug("Running find_module: (%s, %s)", fullname, path)
-        loader = PathFinder.find_module(fullname, path)
-        if not loader:
-            logger.debug("Py2Fixer could not find %s", fullname)
-            return None
-        loader.__class__ = PastSourceFileLoader
-        loader.exclude_paths = self.exclude_paths
-        loader.include_paths = self.include_paths
-        return loader
-
-    # For Python >=3.4
-    def find_spec(self, fullname, path=None, target=None):
-        logger.debug("Running find_spec: (%s, %s, %s)", fullname, path, target)
-        spec = PathFinder.find_spec(fullname, path, target)
-        if not spec:
-            logger.debug("Py2Fixer could not find %s", fullname)
-            return None
-        spec.loader.__class__ = PastSourceFileLoader
-        spec.loader.exclude_paths = self.exclude_paths
-        spec.loader.include_paths = self.include_paths
-        return spec
-
-
-_hook = Py2Fixer()
-
-
-def install_hooks(include_paths=(), exclude_paths=()):
-    if isinstance(include_paths, str):
-        include_paths = (include_paths,)
-    if isinstance(exclude_paths, str):
-        exclude_paths = (exclude_paths,)
-    assert len(include_paths) + len(exclude_paths) > 0, 'Pass at least one argument'
-    _hook.include(include_paths)
-    _hook.exclude(exclude_paths)
-    # _hook.debug = debug
-    enable = sys.version_info[0] >= 3   # enabled for all 3.x+
-    if enable and _hook not in sys.meta_path:
-        sys.meta_path.insert(0, _hook)  # insert at beginning. This could be made a parameter
-
-    # We could return the hook when there are ways of configuring it
-    #return _hook
-
-
-def remove_hooks():
-    if _hook in sys.meta_path:
-        sys.meta_path.remove(_hook)
-
-
-def detect_hooks():
-    """
-    Returns True if the import hooks are installed, False if not.
-    """
-    return _hook in sys.meta_path
-    # present = any([hasattr(hook, 'PY2FIXER') for hook in sys.meta_path])
-    # return present
-
-
-class hooks(object):
-    """
-    Acts as a context manager. Use like this:
-
-    >>> from past import translation
-    >>> with translation.hooks():
-    ...     import mypy2module
-    >>> import requests        # py2/3 compatible anyway
-    >>> # etc.
-    """
-    def __enter__(self):
-        self.hooks_were_installed = detect_hooks()
-        install_hooks()
-        return self
-
-    def __exit__(self, *args):
-        if not self.hooks_were_installed:
-            remove_hooks()
-
-
-class suspend_hooks(object):
-    """
-    Acts as a context manager. Use like this:
-
-    >>> from past import translation
-    >>> translation.install_hooks()
-    >>> import http.client
-    >>> # ...
-    >>> with translation.suspend_hooks():
-    >>>     import requests     # or others that support Py2/3
-
-    If the hooks were disabled before the context, they are not installed when
-    the context is left.
-    """
-    def __enter__(self):
-        self.hooks_were_installed = detect_hooks()
-        remove_hooks()
-        return self
-    def __exit__(self, *args):
-        if self.hooks_were_installed:
-            install_hooks()
-
-
-# alias
-autotranslate = install_hooks
diff --git a/lib/past/types/__init__.py b/lib/past/types/__init__.py
deleted file mode 100644
index 91dd270f..00000000
--- a/lib/past/types/__init__.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""
-Forward-ports of types from Python 2 for use with Python 3:
-
-- ``basestring``: equivalent to ``(str, bytes)`` in ``isinstance`` checks
-- ``dict``: with list-producing .keys() etc. methods
-- ``str``: bytes-like, but iterating over them doesn't product integers
-- ``long``: alias of Py3 int with ``L`` suffix in the ``repr``
-- ``unicode``: alias of Py3 str with ``u`` prefix in the ``repr``
-
-"""
-
-from past import utils
-
-if utils.PY2:
-    import __builtin__
-    basestring = __builtin__.basestring
-    dict = __builtin__.dict
-    str = __builtin__.str
-    long = __builtin__.long
-    unicode = __builtin__.unicode
-    __all__ = []
-else:
-    from .basestring import basestring
-    from .olddict import olddict
-    from .oldstr import oldstr
-    long = int
-    unicode = str
-    # from .unicode import unicode
-    __all__ = ['basestring', 'olddict', 'oldstr', 'long', 'unicode']
diff --git a/lib/past/types/basestring.py b/lib/past/types/basestring.py
deleted file mode 100644
index 9c21715a..00000000
--- a/lib/past/types/basestring.py
+++ /dev/null
@@ -1,38 +0,0 @@
-"""
-An implementation of the basestring type for Python 3
-
-Example use:
-
->>> s = b'abc'
->>> assert isinstance(s, basestring)
->>> from past.types import str as oldstr
->>> s2 = oldstr(b'abc')
->>> assert isinstance(s2, basestring)
-
-"""
-
-import sys
-
-from past.utils import with_metaclass, PY2
-
-if PY2:
-    str = unicode
-
-ver = sys.version_info[:2]
-
-
-class BaseBaseString(type):
-    def __instancecheck__(cls, instance):
-        return isinstance(instance, (bytes, str))
-
-    def __subclasscheck__(cls, subclass):
-        return super(BaseBaseString, cls).__subclasscheck__(subclass) or issubclass(subclass, (bytes, str))
-
-
-class basestring(with_metaclass(BaseBaseString)):
-    """
-    A minimal backport of the Python 2 basestring type to Py3
-    """
-
-
-__all__ = ['basestring']
diff --git a/lib/past/types/olddict.py b/lib/past/types/olddict.py
deleted file mode 100644
index f4f92a26..00000000
--- a/lib/past/types/olddict.py
+++ /dev/null
@@ -1,96 +0,0 @@
-"""
-A dict subclass for Python 3 that behaves like Python 2's dict
-
-Example use:
-
->>> from past.builtins import dict
->>> d1 = dict()    # instead of {} for an empty dict
->>> d2 = dict(key1='value1', key2='value2')
-
-The keys, values and items methods now return lists on Python 3.x and there are
-methods for iterkeys, itervalues, iteritems, and viewkeys etc.
-
->>> for d in (d1, d2):
-...     assert isinstance(d.keys(), list)
-...     assert isinstance(d.values(), list)
-...     assert isinstance(d.items(), list)
-"""
-
-import sys
-
-from past.utils import with_metaclass
-
-
-_builtin_dict = dict
-ver = sys.version_info[:2]
-
-
-class BaseOldDict(type):
-    def __instancecheck__(cls, instance):
-        return isinstance(instance, _builtin_dict)
-
-
-class olddict(with_metaclass(BaseOldDict, _builtin_dict)):
-    """
-    A backport of the Python 3 dict object to Py2
-    """
-    iterkeys = _builtin_dict.keys
-    viewkeys = _builtin_dict.keys
-
-    def keys(self):
-        return list(super(olddict, self).keys())
-
-    itervalues = _builtin_dict.values
-    viewvalues = _builtin_dict.values
-
-    def values(self):
-        return list(super(olddict, self).values())
-
-    iteritems = _builtin_dict.items
-    viewitems = _builtin_dict.items
-
-    def items(self):
-        return list(super(olddict, self).items())
-
-    def has_key(self, k):
-        """
-        D.has_key(k) -> True if D has a key k, else False
-        """
-        return k in self
-
-    # def __new__(cls, *args, **kwargs):
-    #     """
-    #     dict() -> new empty dictionary
-    #     dict(mapping) -> new dictionary initialized from a mapping object's
-    #         (key, value) pairs
-    #     dict(iterable) -> new dictionary initialized as if via:
-    #         d = {}
-    #         for k, v in iterable:
-    #             d[k] = v
-    #     dict(**kwargs) -> new dictionary initialized with the name=value pairs
-    #         in the keyword argument list.  For example:  dict(one=1, two=2)
-
-    #     """
-    #
-    #     if len(args) == 0:
-    #         return super(olddict, cls).__new__(cls)
-    #     # Was: elif isinstance(args[0], newbytes):
-    #     # We use type() instead of the above because we're redefining
-    #     # this to be True for all unicode string subclasses. Warning:
-    #     # This may render newstr un-subclassable.
-    #     elif type(args[0]) == olddict:
-    #         return args[0]
-    #     # elif isinstance(args[0], _builtin_dict):
-    #     #     value = args[0]
-    #     else:
-    #         value = args[0]
-    #     return super(olddict, cls).__new__(cls, value)
-
-    def __native__(self):
-        """
-        Hook for the past.utils.native() function
-        """
-        return super(oldbytes, self)
-
-
-__all__ = ['olddict']
diff --git a/lib/past/types/oldstr.py b/lib/past/types/oldstr.py
deleted file mode 100644
index 5a0e3789..00000000
--- a/lib/past/types/oldstr.py
+++ /dev/null
@@ -1,135 +0,0 @@
-"""
-Pure-Python implementation of a Python 2-like str object for Python 3.
-"""
-
-from numbers import Integral
-
-from past.utils import PY2, with_metaclass
-
-if PY2:
-    from collections import Iterable
-else:
-    from collections.abc import Iterable
-
-_builtin_bytes = bytes
-
-
-class BaseOldStr(type):
-    def __instancecheck__(cls, instance):
-        return isinstance(instance, _builtin_bytes)
-
-
-def unescape(s):
-    r"""
-    Interprets strings with escape sequences
-
-    Example:
-    >>> s = unescape(r'abc\\def')   # i.e. 'abc\\\\def'
-    >>> print(s)
-    'abc\def'
-    >>> s2 = unescape('abc\\ndef')
-    >>> len(s2)
-    8
-    >>> print(s2)
-    abc
-    def
-    """
-    return s.encode().decode('unicode_escape')
-
-
-class oldstr(with_metaclass(BaseOldStr, _builtin_bytes)):
-    """
-    A forward port of the Python 2 8-bit string object to Py3
-    """
-    # Python 2 strings have no __iter__ method:
-    @property
-    def __iter__(self):
-        raise AttributeError
-
-    def __dir__(self):
-        return [thing for thing in dir(_builtin_bytes) if thing != '__iter__']
-
-    # def __new__(cls, *args, **kwargs):
-    #     """
-    #     From the Py3 bytes docstring:
-
-    #     bytes(iterable_of_ints) -> bytes
-    #     bytes(string, encoding[, errors]) -> bytes
-    #     bytes(bytes_or_buffer) -> immutable copy of bytes_or_buffer
-    #     bytes(int) -> bytes object of size given by the parameter initialized with null bytes
-    #     bytes() -> empty bytes object
-    #
-    #     Construct an immutable array of bytes from:
-    #       - an iterable yielding integers in range(256)
-    #       - a text string encoded using the specified encoding
-    #       - any object implementing the buffer API.
-    #       - an integer
-    #     """
-    #
-    #     if len(args) == 0:
-    #         return super(newbytes, cls).__new__(cls)
-    #     # Was: elif isinstance(args[0], newbytes):
-    #     # We use type() instead of the above because we're redefining
-    #     # this to be True for all unicode string subclasses. Warning:
-    #     # This may render newstr un-subclassable.
-    #     elif type(args[0]) == newbytes:
-    #         return args[0]
-    #     elif isinstance(args[0], _builtin_bytes):
-    #         value = args[0]
-    #     elif isinstance(args[0], unicode):
-    #         if 'encoding' not in kwargs:
-    #             raise TypeError('unicode string argument without an encoding')
-    #         ###
-    #         # Was:   value = args[0].encode(**kwargs)
-    #         # Python 2.6 string encode() method doesn't take kwargs:
-    #         # Use this instead:
-    #         newargs = [kwargs['encoding']]
-    #         if 'errors' in kwargs:
-    #             newargs.append(kwargs['errors'])
-    #         value = args[0].encode(*newargs)
-    #         ###
-    #     elif isinstance(args[0], Iterable):
-    #         if len(args[0]) == 0:
-    #             # What is this?
-    #             raise ValueError('unknown argument type')
-    #         elif len(args[0]) > 0 and isinstance(args[0][0], Integral):
-    #             # It's a list of integers
-    #             value = b''.join([chr(x) for x in args[0]])
-    #         else:
-    #             raise ValueError('item cannot be interpreted as an integer')
-    #     elif isinstance(args[0], Integral):
-    #         if args[0] < 0:
-    #             raise ValueError('negative count')
-    #         value = b'\x00' * args[0]
-    #     else:
-    #         value = args[0]
-    #     return super(newbytes, cls).__new__(cls, value)
-
-    def __repr__(self):
-        s = super(oldstr, self).__repr__()   # e.g. b'abc' on Py3, b'abc' on Py3
-        return s[1:]
-
-    def __str__(self):
-        s = super(oldstr, self).__str__()   # e.g. "b'abc'" or "b'abc\\ndef'
-        # TODO: fix this:
-        assert s[:2] == "b'" and s[-1] == "'"
-        return unescape(s[2:-1])            # e.g. 'abc'    or 'abc\ndef'
-
-    def __getitem__(self, y):
-        if isinstance(y, Integral):
-            return super(oldstr, self).__getitem__(slice(y, y+1))
-        else:
-            return super(oldstr, self).__getitem__(y)
-
-    def __getslice__(self, *args):
-        return self.__getitem__(slice(*args))
-
-    def __contains__(self, key):
-        if isinstance(key, int):
-            return False
-
-    def __native__(self):
-        return bytes(self)
-
-
-__all__ = ['oldstr']
diff --git a/lib/past/utils/__init__.py b/lib/past/utils/__init__.py
deleted file mode 100644
index f6b2642d..00000000
--- a/lib/past/utils/__init__.py
+++ /dev/null
@@ -1,97 +0,0 @@
-"""
-Various non-built-in utility functions and definitions for Py2
-compatibility in Py3.
-
-For example:
-
-    >>> # The old_div() function behaves like Python 2's / operator
-    >>> # without "from __future__ import division"
-    >>> from past.utils import old_div
-    >>> old_div(3, 2)    # like 3/2 in Py2
-    0
-    >>> old_div(3, 2.0)  # like 3/2.0 in Py2
-    1.5
-"""
-
-import sys
-import numbers
-
-PY3 = sys.version_info[0] >= 3
-PY2 = sys.version_info[0] == 2
-PYPY = hasattr(sys, 'pypy_translation_info')
-
-
-def with_metaclass(meta, *bases):
-    """
-    Function from jinja2/_compat.py. License: BSD.
-
-    Use it like this::
-
-        class BaseForm(object):
-            pass
-
-        class FormType(type):
-            pass
-
-        class Form(with_metaclass(FormType, BaseForm)):
-            pass
-
-    This requires a bit of explanation: the basic idea is to make a
-    dummy metaclass for one level of class instantiation that replaces
-    itself with the actual metaclass.  Because of internal type checks
-    we also need to make sure that we downgrade the custom metaclass
-    for one level to something closer to type (that's why __call__ and
-    __init__ comes back from type etc.).
-
-    This has the advantage over six.with_metaclass of not introducing
-    dummy classes into the final MRO.
-    """
-    class metaclass(meta):
-        __call__ = type.__call__
-        __init__ = type.__init__
-        def __new__(cls, name, this_bases, d):
-            if this_bases is None:
-                return type.__new__(cls, name, (), d)
-            return meta(name, bases, d)
-    return metaclass('temporary_class', None, {})
-
-
-def native(obj):
-    """
-    On Py2, this is a no-op: native(obj) -> obj
-
-    On Py3, returns the corresponding native Py3 types that are
-    superclasses for forward-ported objects from Py2:
-
-    >>> from past.builtins import str, dict
-
-    >>> native(str(b'ABC'))   # Output on Py3 follows. On Py2, output is 'ABC'
-    b'ABC'
-    >>> type(native(str(b'ABC')))
-    bytes
-
-    Existing native types on Py3 will be returned unchanged:
-
-    >>> type(native(b'ABC'))
-    bytes
-    """
-    if hasattr(obj, '__native__'):
-        return obj.__native__()
-    else:
-        return obj
-
-
-# An alias for future.utils.old_div():
-def old_div(a, b):
-    """
-    Equivalent to ``a / b`` on Python 2 without ``from __future__ import
-    division``.
-
-    TODO: generalize this to other objects (like arrays etc.)
-    """
-    if isinstance(a, numbers.Integral) and isinstance(b, numbers.Integral):
-        return a // b
-    else:
-        return a / b
-
-__all__ = ['PY3', 'PY2', 'PYPY', 'with_metaclass', 'native', 'old_div']
diff --git a/lib/pkg_resources.py b/lib/pkg_resources.py
new file mode 100644
index 00000000..511068a6
--- /dev/null
+++ b/lib/pkg_resources.py
@@ -0,0 +1,2895 @@
+"""
+Package resource API
+--------------------
+
+A resource is a logical file contained within a package, or a logical
+subdirectory thereof.  The package resource API expects resource names
+to have their path parts separated with ``/``, *not* whatever the local
+path separator is.  Do not use os.path operations to manipulate resource
+names being passed into the API.
+
+The package resource API is designed to work with normal filesystem packages,
+.egg files, and unpacked .egg files.  It can also work in a limited way with
+.zip files and with custom PEP 302 loaders that support the ``get_data()``
+method.
+"""
+
+import sys
+import os
+import io
+import time
+import re
+import imp
+import zipfile
+import zipimport
+import warnings
+import stat
+import functools
+import pkgutil
+import token
+import symbol
+import operator
+import platform
+import collections
+import plistlib
+import email.parser
+import tempfile
+from pkgutil import get_importer
+
+PY3 = sys.version_info > (3,)
+PY2 = not PY3
+
+if PY3:
+    from urllib.parse import urlparse, urlunparse
+
+if PY2:
+    from urlparse import urlparse, urlunparse
+
+if PY3:
+    string_types = str,
+else:
+    string_types = str, eval('unicode')
+
+# capture these to bypass sandboxing
+from os import utime
+try:
+    from os import mkdir, rename, unlink
+    WRITE_SUPPORT = True
+except ImportError:
+    # no write support, probably under GAE
+    WRITE_SUPPORT = False
+
+from os import open as os_open
+from os.path import isdir, split
+
+# Avoid try/except due to potential problems with delayed import mechanisms.
+if sys.version_info >= (3, 3) and sys.implementation.name == "cpython":
+    import importlib._bootstrap as importlib_bootstrap
+else:
+    importlib_bootstrap = None
+
+try:
+    import parser
+except ImportError:
+    pass
+
+
+_state_vars = {}
+
+def _declare_state(vartype, **kw):
+    globals().update(kw)
+    _state_vars.update(dict.fromkeys(kw, vartype))
+
+def __getstate__():
+    state = {}
+    g = globals()
+    for k, v in _state_vars.items():
+        state[k] = g['_sget_'+v](g[k])
+    return state
+
+def __setstate__(state):
+    g = globals()
+    for k, v in state.items():
+        g['_sset_'+_state_vars[k]](k, g[k], v)
+    return state
+
+def _sget_dict(val):
+    return val.copy()
+
+def _sset_dict(key, ob, state):
+    ob.clear()
+    ob.update(state)
+
+def _sget_object(val):
+    return val.__getstate__()
+
+def _sset_object(key, ob, state):
+    ob.__setstate__(state)
+
+_sget_none = _sset_none = lambda *args: None
+
+
+def get_supported_platform():
+    """Return this platform's maximum compatible version.
+
+    distutils.util.get_platform() normally reports the minimum version
+    of Mac OS X that would be required to *use* extensions produced by
+    distutils.  But what we want when checking compatibility is to know the
+    version of Mac OS X that we are *running*.  To allow usage of packages that
+    explicitly require a newer version of Mac OS X, we must also know the
+    current version of the OS.
+
+    If this condition occurs for any other platform with a version in its
+    platform strings, this function should be extended accordingly.
+    """
+    plat = get_build_platform()
+    m = macosVersionString.match(plat)
+    if m is not None and sys.platform == "darwin":
+        try:
+            plat = 'macosx-%s-%s' % ('.'.join(_macosx_vers()[:2]), m.group(3))
+        except ValueError:
+            # not Mac OS X
+            pass
+    return plat
+
+__all__ = [
+    # Basic resource access and distribution/entry point discovery
+    'require', 'run_script', 'get_provider',  'get_distribution',
+    'load_entry_point', 'get_entry_map', 'get_entry_info',
+    'iter_entry_points',
+    'resource_string', 'resource_stream', 'resource_filename',
+    'resource_listdir', 'resource_exists', 'resource_isdir',
+
+    # Environmental control
+    'declare_namespace', 'working_set', 'add_activation_listener',
+    'find_distributions', 'set_extraction_path', 'cleanup_resources',
+    'get_default_cache',
+
+    # Primary implementation classes
+    'Environment', 'WorkingSet', 'ResourceManager',
+    'Distribution', 'Requirement', 'EntryPoint',
+
+    # Exceptions
+    'ResolutionError', 'VersionConflict', 'DistributionNotFound',
+    'UnknownExtra', 'ExtractionError',
+
+    # Parsing functions and string utilities
+    'parse_requirements', 'parse_version', 'safe_name', 'safe_version',
+    'get_platform', 'compatible_platforms', 'yield_lines', 'split_sections',
+    'safe_extra', 'to_filename', 'invalid_marker', 'evaluate_marker',
+
+    # filesystem utilities
+    'ensure_directory', 'normalize_path',
+
+    # Distribution "precedence" constants
+    'EGG_DIST', 'BINARY_DIST', 'SOURCE_DIST', 'CHECKOUT_DIST', 'DEVELOP_DIST',
+
+    # "Provider" interfaces, implementations, and registration/lookup APIs
+    'IMetadataProvider', 'IResourceProvider', 'FileMetadata',
+    'PathMetadata', 'EggMetadata', 'EmptyProvider', 'empty_provider',
+    'NullProvider', 'EggProvider', 'DefaultProvider', 'ZipProvider',
+    'register_finder', 'register_namespace_handler', 'register_loader_type',
+    'fixup_namespace_packages', 'get_importer',
+
+    # Deprecated/backward compatibility only
+    'run_main', 'AvailableDistributions',
+]
+
+class ResolutionError(Exception):
+    """Abstract base for dependency resolution errors"""
+    def __repr__(self):
+        return self.__class__.__name__+repr(self.args)
+
+class VersionConflict(ResolutionError):
+    """An already-installed version conflicts with the requested version"""
+
+class DistributionNotFound(ResolutionError):
+    """A requested distribution was not found"""
+
+class UnknownExtra(ResolutionError):
+    """Distribution doesn't have an "extra feature" of the given name"""
+_provider_factories = {}
+
+PY_MAJOR = sys.version[:3]
+EGG_DIST = 3
+BINARY_DIST = 2
+SOURCE_DIST = 1
+CHECKOUT_DIST = 0
+DEVELOP_DIST = -1
+
+def register_loader_type(loader_type, provider_factory):
+    """Register `provider_factory` to make providers for `loader_type`
+
+    `loader_type` is the type or class of a PEP 302 ``module.__loader__``,
+    and `provider_factory` is a function that, passed a *module* object,
+    returns an ``IResourceProvider`` for that module.
+    """
+    _provider_factories[loader_type] = provider_factory
+
+def get_provider(moduleOrReq):
+    """Return an IResourceProvider for the named module or requirement"""
+    if isinstance(moduleOrReq, Requirement):
+        return working_set.find(moduleOrReq) or require(str(moduleOrReq))[0]
+    try:
+        module = sys.modules[moduleOrReq]
+    except KeyError:
+        __import__(moduleOrReq)
+        module = sys.modules[moduleOrReq]
+    loader = getattr(module, '__loader__', None)
+    return _find_adapter(_provider_factories, loader)(module)
+
+def _macosx_vers(_cache=[]):
+    if not _cache:
+        version = platform.mac_ver()[0]
+        # fallback for MacPorts
+        if version == '':
+            plist = '/System/Library/CoreServices/SystemVersion.plist'
+            if os.path.exists(plist):
+                if hasattr(plistlib, 'readPlist'):
+                    plist_content = plistlib.readPlist(plist)
+                    if 'ProductVersion' in plist_content:
+                        version = plist_content['ProductVersion']
+
+        _cache.append(version.split('.'))
+    return _cache[0]
+
+def _macosx_arch(machine):
+    return {'PowerPC': 'ppc', 'Power_Macintosh': 'ppc'}.get(machine, machine)
+
+def get_build_platform():
+    """Return this platform's string for platform-specific distributions
+
+    XXX Currently this is the same as ``distutils.util.get_platform()``, but it
+    needs some hacks for Linux and Mac OS X.
+    """
+    try:
+        # Python 2.7 or >=3.2
+        from sysconfig import get_platform
+    except ImportError:
+        from distutils.util import get_platform
+
+    plat = get_platform()
+    if sys.platform == "darwin" and not plat.startswith('macosx-'):
+        try:
+            version = _macosx_vers()
+            machine = os.uname()[4].replace(" ", "_")
+            return "macosx-%d.%d-%s" % (int(version[0]), int(version[1]),
+                _macosx_arch(machine))
+        except ValueError:
+            # if someone is running a non-Mac darwin system, this will fall
+            # through to the default implementation
+            pass
+    return plat
+
+macosVersionString = re.compile(r"macosx-(\d+)\.(\d+)-(.*)")
+darwinVersionString = re.compile(r"darwin-(\d+)\.(\d+)\.(\d+)-(.*)")
+# XXX backward compat
+get_platform = get_build_platform
+
+
+def compatible_platforms(provided, required):
+    """Can code for the `provided` platform run on the `required` platform?
+
+    Returns true if either platform is ``None``, or the platforms are equal.
+
+    XXX Needs compatibility checks for Linux and other unixy OSes.
+    """
+    if provided is None or required is None or provided==required:
+        # easy case
+        return True
+
+    # Mac OS X special cases
+    reqMac = macosVersionString.match(required)
+    if reqMac:
+        provMac = macosVersionString.match(provided)
+
+        # is this a Mac package?
+        if not provMac:
+            # this is backwards compatibility for packages built before
+            # setuptools 0.6. All packages built after this point will
+            # use the new macosx designation.
+            provDarwin = darwinVersionString.match(provided)
+            if provDarwin:
+                dversion = int(provDarwin.group(1))
+                macosversion = "%s.%s" % (reqMac.group(1), reqMac.group(2))
+                if dversion == 7 and macosversion >= "10.3" or \
+                        dversion == 8 and macosversion >= "10.4":
+                    return True
+            # egg isn't macosx or legacy darwin
+            return False
+
+        # are they the same major version and machine type?
+        if provMac.group(1) != reqMac.group(1) or \
+                provMac.group(3) != reqMac.group(3):
+            return False
+
+        # is the required OS major update >= the provided one?
+        if int(provMac.group(2)) > int(reqMac.group(2)):
+            return False
+
+        return True
+
+    # XXX Linux and other platforms' special cases should go here
+    return False
+
+
+def run_script(dist_spec, script_name):
+    """Locate distribution `dist_spec` and run its `script_name` script"""
+    ns = sys._getframe(1).f_globals
+    name = ns['__name__']
+    ns.clear()
+    ns['__name__'] = name
+    require(dist_spec)[0].run_script(script_name, ns)
+
+# backward compatibility
+run_main = run_script
+
+def get_distribution(dist):
+    """Return a current distribution object for a Requirement or string"""
+    if isinstance(dist, string_types):
+        dist = Requirement.parse(dist)
+    if isinstance(dist, Requirement):
+        dist = get_provider(dist)
+    if not isinstance(dist, Distribution):
+        raise TypeError("Expected string, Requirement, or Distribution", dist)
+    return dist
+
+def load_entry_point(dist, group, name):
+    """Return `name` entry point of `group` for `dist` or raise ImportError"""
+    return get_distribution(dist).load_entry_point(group, name)
+
+def get_entry_map(dist, group=None):
+    """Return the entry point map for `group`, or the full entry map"""
+    return get_distribution(dist).get_entry_map(group)
+
+def get_entry_info(dist, group, name):
+    """Return the EntryPoint object for `group`+`name`, or ``None``"""
+    return get_distribution(dist).get_entry_info(group, name)
+
+
+class IMetadataProvider:
+
+    def has_metadata(name):
+        """Does the package's distribution contain the named metadata?"""
+
+    def get_metadata(name):
+        """The named metadata resource as a string"""
+
+    def get_metadata_lines(name):
+        """Yield named metadata resource as list of non-blank non-comment lines
+
+       Leading and trailing whitespace is stripped from each line, and lines
+       with ``#`` as the first non-blank character are omitted."""
+
+    def metadata_isdir(name):
+        """Is the named metadata a directory?  (like ``os.path.isdir()``)"""
+
+    def metadata_listdir(name):
+        """List of metadata names in the directory (like ``os.listdir()``)"""
+
+    def run_script(script_name, namespace):
+        """Execute the named script in the supplied namespace dictionary"""
+
+
+class IResourceProvider(IMetadataProvider):
+    """An object that provides access to package resources"""
+
+    def get_resource_filename(manager, resource_name):
+        """Return a true filesystem path for `resource_name`
+
+        `manager` must be an ``IResourceManager``"""
+
+    def get_resource_stream(manager, resource_name):
+        """Return a readable file-like object for `resource_name`
+
+        `manager` must be an ``IResourceManager``"""
+
+    def get_resource_string(manager, resource_name):
+        """Return a string containing the contents of `resource_name`
+
+        `manager` must be an ``IResourceManager``"""
+
+    def has_resource(resource_name):
+        """Does the package contain the named resource?"""
+
+    def resource_isdir(resource_name):
+        """Is the named resource a directory?  (like ``os.path.isdir()``)"""
+
+    def resource_listdir(resource_name):
+        """List of resource names in the directory (like ``os.listdir()``)"""
+
+
+class WorkingSet(object):
+    """A collection of active distributions on sys.path (or a similar list)"""
+
+    def __init__(self, entries=None):
+        """Create working set from list of path entries (default=sys.path)"""
+        self.entries = []
+        self.entry_keys = {}
+        self.by_key = {}
+        self.callbacks = []
+
+        if entries is None:
+            entries = sys.path
+
+        for entry in entries:
+            self.add_entry(entry)
+
+    @classmethod
+    def _build_master(cls):
+        """
+        Prepare the master working set.
+        """
+        ws = cls()
+        try:
+            from __main__ import __requires__
+        except ImportError:
+            # The main program does not list any requirements
+            return ws
+
+        # ensure the requirements are met
+        try:
+            ws.require(__requires__)
+        except VersionConflict:
+            return cls._build_from_requirements(__requires__)
+
+        return ws
+
+    @classmethod
+    def _build_from_requirements(cls, req_spec):
+        """
+        Build a working set from a requirement spec. Rewrites sys.path.
+        """
+        # try it without defaults already on sys.path
+        # by starting with an empty path
+        ws = cls([])
+        reqs = parse_requirements(req_spec)
+        dists = ws.resolve(reqs, Environment())
+        for dist in dists:
+            ws.add(dist)
+
+        # add any missing entries from sys.path
+        for entry in sys.path:
+            if entry not in ws.entries:
+                ws.add_entry(entry)
+
+        # then copy back to sys.path
+        sys.path[:] = ws.entries
+        return ws
+
+    def add_entry(self, entry):
+        """Add a path item to ``.entries``, finding any distributions on it
+
+        ``find_distributions(entry, True)`` is used to find distributions
+        corresponding to the path entry, and they are added.  `entry` is
+        always appended to ``.entries``, even if it is already present.
+        (This is because ``sys.path`` can contain the same value more than
+        once, and the ``.entries`` of the ``sys.path`` WorkingSet should always
+        equal ``sys.path``.)
+        """
+        self.entry_keys.setdefault(entry, [])
+        self.entries.append(entry)
+        for dist in find_distributions(entry, True):
+            self.add(dist, entry, False)
+
+    def __contains__(self, dist):
+        """True if `dist` is the active distribution for its project"""
+        return self.by_key.get(dist.key) == dist
+
+    def find(self, req):
+        """Find a distribution matching requirement `req`
+
+        If there is an active distribution for the requested project, this
+        returns it as long as it meets the version requirement specified by
+        `req`.  But, if there is an active distribution for the project and it
+        does *not* meet the `req` requirement, ``VersionConflict`` is raised.
+        If there is no active distribution for the requested project, ``None``
+        is returned.
+        """
+        dist = self.by_key.get(req.key)
+        if dist is not None and dist not in req:
+            # XXX add more info
+            raise VersionConflict(dist, req)
+        else:
+            return dist
+
+    def iter_entry_points(self, group, name=None):
+        """Yield entry point objects from `group` matching `name`
+
+        If `name` is None, yields all entry points in `group` from all
+        distributions in the working set, otherwise only ones matching
+        both `group` and `name` are yielded (in distribution order).
+        """
+        for dist in self:
+            entries = dist.get_entry_map(group)
+            if name is None:
+                for ep in entries.values():
+                    yield ep
+            elif name in entries:
+                yield entries[name]
+
+    def run_script(self, requires, script_name):
+        """Locate distribution for `requires` and run `script_name` script"""
+        ns = sys._getframe(1).f_globals
+        name = ns['__name__']
+        ns.clear()
+        ns['__name__'] = name
+        self.require(requires)[0].run_script(script_name, ns)
+
+    def __iter__(self):
+        """Yield distributions for non-duplicate projects in the working set
+
+        The yield order is the order in which the items' path entries were
+        added to the working set.
+        """
+        seen = {}
+        for item in self.entries:
+            if item not in self.entry_keys:
+                # workaround a cache issue
+                continue
+
+            for key in self.entry_keys[item]:
+                if key not in seen:
+                    seen[key]=1
+                    yield self.by_key[key]
+
+    def add(self, dist, entry=None, insert=True, replace=False):
+        """Add `dist` to working set, associated with `entry`
+
+        If `entry` is unspecified, it defaults to the ``.location`` of `dist`.
+        On exit from this routine, `entry` is added to the end of the working
+        set's ``.entries`` (if it wasn't already present).
+
+        `dist` is only added to the working set if it's for a project that
+        doesn't already have a distribution in the set, unless `replace=True`.
+        If it's added, any callbacks registered with the ``subscribe()`` method
+        will be called.
+        """
+        if insert:
+            dist.insert_on(self.entries, entry)
+
+        if entry is None:
+            entry = dist.location
+        keys = self.entry_keys.setdefault(entry,[])
+        keys2 = self.entry_keys.setdefault(dist.location,[])
+        if not replace and dist.key in self.by_key:
+            # ignore hidden distros
+            return
+
+        self.by_key[dist.key] = dist
+        if dist.key not in keys:
+            keys.append(dist.key)
+        if dist.key not in keys2:
+            keys2.append(dist.key)
+        self._added_new(dist)
+
+    def resolve(self, requirements, env=None, installer=None,
+            replace_conflicting=False):
+        """List all distributions needed to (recursively) meet `requirements`
+
+        `requirements` must be a sequence of ``Requirement`` objects.  `env`,
+        if supplied, should be an ``Environment`` instance.  If
+        not supplied, it defaults to all distributions available within any
+        entry or distribution in the working set.  `installer`, if supplied,
+        will be invoked with each requirement that cannot be met by an
+        already-installed distribution; it should return a ``Distribution`` or
+        ``None``.
+
+        Unless `replace_conflicting=True`, raises a VersionConflict exception if
+        any requirements are found on the path that have the correct name but
+        the wrong version.  Otherwise, if an `installer` is supplied it will be
+        invoked to obtain the correct version of the requirement and activate
+        it.
+        """
+
+        # set up the stack
+        requirements = list(requirements)[::-1]
+        # set of processed requirements
+        processed = {}
+        # key -> dist
+        best = {}
+        to_activate = []
+
+        # Mapping of requirement to set of distributions that required it;
+        # useful for reporting info about conflicts.
+        required_by = collections.defaultdict(set)
+
+        while requirements:
+            # process dependencies breadth-first
+            req = requirements.pop(0)
+            if req in processed:
+                # Ignore cyclic or redundant dependencies
+                continue
+            dist = best.get(req.key)
+            if dist is None:
+                # Find the best distribution and add it to the map
+                dist = self.by_key.get(req.key)
+                if dist is None or (dist not in req and replace_conflicting):
+                    ws = self
+                    if env is None:
+                        if dist is None:
+                            env = Environment(self.entries)
+                        else:
+                            # Use an empty environment and workingset to avoid
+                            # any further conflicts with the conflicting
+                            # distribution
+                            env = Environment([])
+                            ws = WorkingSet([])
+                    dist = best[req.key] = env.best_match(req, ws, installer)
+                    if dist is None:
+                        #msg = ("The '%s' distribution was not found on this "
+                        #       "system, and is required by this application.")
+                        #raise DistributionNotFound(msg % req)
+
+                        # unfortunately, zc.buildout uses a str(err)
+                        # to get the name of the distribution here..
+                        raise DistributionNotFound(req)
+                to_activate.append(dist)
+            if dist not in req:
+                # Oops, the "best" so far conflicts with a dependency
+                tmpl = "%s is installed but %s is required by %s"
+                args = dist, req, list(required_by.get(req, []))
+                raise VersionConflict(tmpl % args)
+
+            # push the new requirements onto the stack
+            new_requirements = dist.requires(req.extras)[::-1]
+            requirements.extend(new_requirements)
+
+            # Register the new requirements needed by req
+            for new_requirement in new_requirements:
+                required_by[new_requirement].add(req.project_name)
+
+            processed[req] = True
+
+        # return list of distros to activate
+        return to_activate
+
+    def find_plugins(self, plugin_env, full_env=None, installer=None,
+            fallback=True):
+        """Find all activatable distributions in `plugin_env`
+
+        Example usage::
+
+            distributions, errors = working_set.find_plugins(
+                Environment(plugin_dirlist)
+            )
+            # add plugins+libs to sys.path
+            map(working_set.add, distributions)
+            # display errors
+            print('Could not load', errors)
+
+        The `plugin_env` should be an ``Environment`` instance that contains
+        only distributions that are in the project's "plugin directory" or
+        directories. The `full_env`, if supplied, should be an ``Environment``
+        contains all currently-available distributions.  If `full_env` is not
+        supplied, one is created automatically from the ``WorkingSet`` this
+        method is called on, which will typically mean that every directory on
+        ``sys.path`` will be scanned for distributions.
+
+        `installer` is a standard installer callback as used by the
+        ``resolve()`` method. The `fallback` flag indicates whether we should
+        attempt to resolve older versions of a plugin if the newest version
+        cannot be resolved.
+
+        This method returns a 2-tuple: (`distributions`, `error_info`), where
+        `distributions` is a list of the distributions found in `plugin_env`
+        that were loadable, along with any other distributions that are needed
+        to resolve their dependencies.  `error_info` is a dictionary mapping
+        unloadable plugin distributions to an exception instance describing the
+        error that occurred. Usually this will be a ``DistributionNotFound`` or
+        ``VersionConflict`` instance.
+        """
+
+        plugin_projects = list(plugin_env)
+        # scan project names in alphabetic order
+        plugin_projects.sort()
+
+        error_info = {}
+        distributions = {}
+
+        if full_env is None:
+            env = Environment(self.entries)
+            env += plugin_env
+        else:
+            env = full_env + plugin_env
+
+        shadow_set = self.__class__([])
+        # put all our entries in shadow_set
+        list(map(shadow_set.add, self))
+
+        for project_name in plugin_projects:
+
+            for dist in plugin_env[project_name]:
+
+                req = [dist.as_requirement()]
+
+                try:
+                    resolvees = shadow_set.resolve(req, env, installer)
+
+                except ResolutionError:
+                    v = sys.exc_info()[1]
+                    # save error info
+                    error_info[dist] = v
+                    if fallback:
+                        # try the next older version of project
+                        continue
+                    else:
+                        # give up on this project, keep going
+                        break
+
+                else:
+                    list(map(shadow_set.add, resolvees))
+                    distributions.update(dict.fromkeys(resolvees))
+
+                    # success, no need to try any more versions of this project
+                    break
+
+        distributions = list(distributions)
+        distributions.sort()
+
+        return distributions, error_info
+
+    def require(self, *requirements):
+        """Ensure that distributions matching `requirements` are activated
+
+        `requirements` must be a string or a (possibly-nested) sequence
+        thereof, specifying the distributions and versions required.  The
+        return value is a sequence of the distributions that needed to be
+        activated to fulfill the requirements; all relevant distributions are
+        included, even if they were already activated in this working set.
+        """
+        needed = self.resolve(parse_requirements(requirements))
+
+        for dist in needed:
+            self.add(dist)
+
+        return needed
+
+    def subscribe(self, callback):
+        """Invoke `callback` for all distributions (including existing ones)"""
+        if callback in self.callbacks:
+            return
+        self.callbacks.append(callback)
+        for dist in self:
+            callback(dist)
+
+    def _added_new(self, dist):
+        for callback in self.callbacks:
+            callback(dist)
+
+    def __getstate__(self):
+        return (
+            self.entries[:], self.entry_keys.copy(), self.by_key.copy(),
+            self.callbacks[:]
+        )
+
+    def __setstate__(self, e_k_b_c):
+        entries, keys, by_key, callbacks = e_k_b_c
+        self.entries = entries[:]
+        self.entry_keys = keys.copy()
+        self.by_key = by_key.copy()
+        self.callbacks = callbacks[:]
+
+
+class Environment(object):
+    """Searchable snapshot of distributions on a search path"""
+
+    def __init__(self, search_path=None, platform=get_supported_platform(),
+            python=PY_MAJOR):
+        """Snapshot distributions available on a search path
+
+        Any distributions found on `search_path` are added to the environment.
+        `search_path` should be a sequence of ``sys.path`` items.  If not
+        supplied, ``sys.path`` is used.
+
+        `platform` is an optional string specifying the name of the platform
+        that platform-specific distributions must be compatible with.  If
+        unspecified, it defaults to the current platform.  `python` is an
+        optional string naming the desired version of Python (e.g. ``'3.3'``);
+        it defaults to the current version.
+
+        You may explicitly set `platform` (and/or `python`) to ``None`` if you
+        wish to map *all* distributions, not just those compatible with the
+        running platform or Python version.
+        """
+        self._distmap = {}
+        self.platform = platform
+        self.python = python
+        self.scan(search_path)
+
+    def can_add(self, dist):
+        """Is distribution `dist` acceptable for this environment?
+
+        The distribution must match the platform and python version
+        requirements specified when this environment was created, or False
+        is returned.
+        """
+        return (self.python is None or dist.py_version is None
+            or dist.py_version==self.python) \
+            and compatible_platforms(dist.platform, self.platform)
+
+    def remove(self, dist):
+        """Remove `dist` from the environment"""
+        self._distmap[dist.key].remove(dist)
+
+    def scan(self, search_path=None):
+        """Scan `search_path` for distributions usable in this environment
+
+        Any distributions found are added to the environment.
+        `search_path` should be a sequence of ``sys.path`` items.  If not
+        supplied, ``sys.path`` is used.  Only distributions conforming to
+        the platform/python version defined at initialization are added.
+        """
+        if search_path is None:
+            search_path = sys.path
+
+        for item in search_path:
+            for dist in find_distributions(item):
+                self.add(dist)
+
+    def __getitem__(self, project_name):
+        """Return a newest-to-oldest list of distributions for `project_name`
+
+        Uses case-insensitive `project_name` comparison, assuming all the
+        project's distributions use their project's name converted to all
+        lowercase as their key.
+
+        """
+        distribution_key = project_name.lower()
+        return self._distmap.get(distribution_key, [])
+
+    def add(self, dist):
+        """Add `dist` if we ``can_add()`` it and it has not already been added
+        """
+        if self.can_add(dist) and dist.has_version():
+            dists = self._distmap.setdefault(dist.key, [])
+            if dist not in dists:
+                dists.append(dist)
+                dists.sort(key=operator.attrgetter('hashcmp'), reverse=True)
+
+    def best_match(self, req, working_set, installer=None):
+        """Find distribution best matching `req` and usable on `working_set`
+
+        This calls the ``find(req)`` method of the `working_set` to see if a
+        suitable distribution is already active.  (This may raise
+        ``VersionConflict`` if an unsuitable version of the project is already
+        active in the specified `working_set`.)  If a suitable distribution
+        isn't active, this method returns the newest distribution in the
+        environment that meets the ``Requirement`` in `req`.  If no suitable
+        distribution is found, and `installer` is supplied, then the result of
+        calling the environment's ``obtain(req, installer)`` method will be
+        returned.
+        """
+        dist = working_set.find(req)
+        if dist is not None:
+            return dist
+        for dist in self[req.key]:
+            if dist in req:
+                return dist
+        # try to download/install
+        return self.obtain(req, installer)
+
+    def obtain(self, requirement, installer=None):
+        """Obtain a distribution matching `requirement` (e.g. via download)
+
+        Obtain a distro that matches requirement (e.g. via download).  In the
+        base ``Environment`` class, this routine just returns
+        ``installer(requirement)``, unless `installer` is None, in which case
+        None is returned instead.  This method is a hook that allows subclasses
+        to attempt other ways of obtaining a distribution before falling back
+        to the `installer` argument."""
+        if installer is not None:
+            return installer(requirement)
+
+    def __iter__(self):
+        """Yield the unique project names of the available distributions"""
+        for key in self._distmap.keys():
+            if self[key]:
+                yield key
+
+    def __iadd__(self, other):
+        """In-place addition of a distribution or environment"""
+        if isinstance(other, Distribution):
+            self.add(other)
+        elif isinstance(other, Environment):
+            for project in other:
+                for dist in other[project]:
+                    self.add(dist)
+        else:
+            raise TypeError("Can't add %r to environment" % (other,))
+        return self
+
+    def __add__(self, other):
+        """Add an environment or distribution to an environment"""
+        new = self.__class__([], platform=None, python=None)
+        for env in self, other:
+            new += env
+        return new
+
+
+# XXX backward compatibility
+AvailableDistributions = Environment
+
+
+class ExtractionError(RuntimeError):
+    """An error occurred extracting a resource
+
+    The following attributes are available from instances of this exception:
+
+    manager
+        The resource manager that raised this exception
+
+    cache_path
+        The base directory for resource extraction
+
+    original_error
+        The exception instance that caused extraction to fail
+    """
+
+
+class ResourceManager:
+    """Manage resource extraction and packages"""
+    extraction_path = None
+
+    def __init__(self):
+        self.cached_files = {}
+
+    def resource_exists(self, package_or_requirement, resource_name):
+        """Does the named resource exist?"""
+        return get_provider(package_or_requirement).has_resource(resource_name)
+
+    def resource_isdir(self, package_or_requirement, resource_name):
+        """Is the named resource an existing directory?"""
+        return get_provider(package_or_requirement).resource_isdir(
+            resource_name
+        )
+
+    def resource_filename(self, package_or_requirement, resource_name):
+        """Return a true filesystem path for specified resource"""
+        return get_provider(package_or_requirement).get_resource_filename(
+            self, resource_name
+        )
+
+    def resource_stream(self, package_or_requirement, resource_name):
+        """Return a readable file-like object for specified resource"""
+        return get_provider(package_or_requirement).get_resource_stream(
+            self, resource_name
+        )
+
+    def resource_string(self, package_or_requirement, resource_name):
+        """Return specified resource as a string"""
+        return get_provider(package_or_requirement).get_resource_string(
+            self, resource_name
+        )
+
+    def resource_listdir(self, package_or_requirement, resource_name):
+        """List the contents of the named resource directory"""
+        return get_provider(package_or_requirement).resource_listdir(
+            resource_name
+        )
+
+    def extraction_error(self):
+        """Give an error message for problems extracting file(s)"""
+
+        old_exc = sys.exc_info()[1]
+        cache_path = self.extraction_path or get_default_cache()
+
+        err = ExtractionError("""Can't extract file(s) to egg cache
+
+The following error occurred while trying to extract file(s) to the Python egg
+cache:
+
+  %s
+
+The Python egg cache directory is currently set to:
+
+  %s
+
+Perhaps your account does not have write access to this directory?  You can
+change the cache directory by setting the PYTHON_EGG_CACHE environment
+variable to point to an accessible directory.
+""" % (old_exc, cache_path)
+        )
+        err.manager = self
+        err.cache_path = cache_path
+        err.original_error = old_exc
+        raise err
+
+    def get_cache_path(self, archive_name, names=()):
+        """Return absolute location in cache for `archive_name` and `names`
+
+        The parent directory of the resulting path will be created if it does
+        not already exist.  `archive_name` should be the base filename of the
+        enclosing egg (which may not be the name of the enclosing zipfile!),
+        including its ".egg" extension.  `names`, if provided, should be a
+        sequence of path name parts "under" the egg's extraction location.
+
+        This method should only be called by resource providers that need to
+        obtain an extraction location, and only for names they intend to
+        extract, as it tracks the generated names for possible cleanup later.
+        """
+        extract_path = self.extraction_path or get_default_cache()
+        target_path = os.path.join(extract_path, archive_name+'-tmp', *names)
+        try:
+            _bypass_ensure_directory(target_path)
+        except:
+            self.extraction_error()
+
+        self._warn_unsafe_extraction_path(extract_path)
+
+        self.cached_files[target_path] = 1
+        return target_path
+
+    @staticmethod
+    def _warn_unsafe_extraction_path(path):
+        """
+        If the default extraction path is overridden and set to an insecure
+        location, such as /tmp, it opens up an opportunity for an attacker to
+        replace an extracted file with an unauthorized payload. Warn the user
+        if a known insecure location is used.
+
+        See Distribute #375 for more details.
+        """
+        if os.name == 'nt' and not path.startswith(os.environ['windir']):
+            # On Windows, permissions are generally restrictive by default
+            #  and temp directories are not writable by other users, so
+            #  bypass the warning.
+            return
+        mode = os.stat(path).st_mode
+        if mode & stat.S_IWOTH or mode & stat.S_IWGRP:
+            msg = ("%s is writable by group/others and vulnerable to attack "
+                "when "
+                "used with get_resource_filename. Consider a more secure "
+                "location (set with .set_extraction_path or the "
+                "PYTHON_EGG_CACHE environment variable)." % path)
+            warnings.warn(msg, UserWarning)
+
+    def postprocess(self, tempname, filename):
+        """Perform any platform-specific postprocessing of `tempname`
+
+        This is where Mac header rewrites should be done; other platforms don't
+        have anything special they should do.
+
+        Resource providers should call this method ONLY after successfully
+        extracting a compressed resource.  They must NOT call it on resources
+        that are already in the filesystem.
+
+        `tempname` is the current (temporary) name of the file, and `filename`
+        is the name it will be renamed to by the caller after this routine
+        returns.
+        """
+
+        if os.name == 'posix':
+            # Make the resource executable
+            mode = ((os.stat(tempname).st_mode) | 0o555) & 0o7777
+            os.chmod(tempname, mode)
+
+    def set_extraction_path(self, path):
+        """Set the base path where resources will be extracted to, if needed.
+
+        If you do not call this routine before any extractions take place, the
+        path defaults to the return value of ``get_default_cache()``.  (Which
+        is based on the ``PYTHON_EGG_CACHE`` environment variable, with various
+        platform-specific fallbacks.  See that routine's documentation for more
+        details.)
+
+        Resources are extracted to subdirectories of this path based upon
+        information given by the ``IResourceProvider``.  You may set this to a
+        temporary directory, but then you must call ``cleanup_resources()`` to
+        delete the extracted files when done.  There is no guarantee that
+        ``cleanup_resources()`` will be able to remove all extracted files.
+
+        (Note: you may not change the extraction path for a given resource
+        manager once resources have been extracted, unless you first call
+        ``cleanup_resources()``.)
+        """
+        if self.cached_files:
+            raise ValueError(
+                "Can't change extraction path, files already extracted"
+            )
+
+        self.extraction_path = path
+
+    def cleanup_resources(self, force=False):
+        """
+        Delete all extracted resource files and directories, returning a list
+        of the file and directory names that could not be successfully removed.
+        This function does not have any concurrency protection, so it should
+        generally only be called when the extraction path is a temporary
+        directory exclusive to a single process.  This method is not
+        automatically called; you must call it explicitly or register it as an
+        ``atexit`` function if you wish to ensure cleanup of a temporary
+        directory used for extractions.
+        """
+        # XXX
+
+def get_default_cache():
+    """Determine the default cache location
+
+    This returns the ``PYTHON_EGG_CACHE`` environment variable, if set.
+    Otherwise, on Windows, it returns a "Python-Eggs" subdirectory of the
+    "Application Data" directory.  On all other systems, it's "~/.python-eggs".
+    """
+    try:
+        return os.environ['PYTHON_EGG_CACHE']
+    except KeyError:
+        pass
+
+    if os.name!='nt':
+        return os.path.expanduser('~/.python-eggs')
+
+    # XXX this may be locale-specific!
+    app_data = 'Application Data'
+    app_homes = [
+        # best option, should be locale-safe
+        (('APPDATA',), None),
+        (('USERPROFILE',), app_data),
+        (('HOMEDRIVE','HOMEPATH'), app_data),
+        (('HOMEPATH',), app_data),
+        (('HOME',), None),
+        # 95/98/ME
+        (('WINDIR',), app_data),
+    ]
+
+    for keys, subdir in app_homes:
+        dirname = ''
+        for key in keys:
+            if key in os.environ:
+                dirname = os.path.join(dirname, os.environ[key])
+            else:
+                break
+        else:
+            if subdir:
+                dirname = os.path.join(dirname, subdir)
+            return os.path.join(dirname, 'Python-Eggs')
+    else:
+        raise RuntimeError(
+            "Please set the PYTHON_EGG_CACHE enviroment variable"
+        )
+
+def safe_name(name):
+    """Convert an arbitrary string to a standard distribution name
+
+    Any runs of non-alphanumeric/. characters are replaced with a single '-'.
+    """
+    return re.sub('[^A-Za-z0-9.]+', '-', name)
+
+
+def safe_version(version):
+    """Convert an arbitrary string to a standard version string
+
+    Spaces become dots, and all other non-alphanumeric characters become
+    dashes, with runs of multiple dashes condensed to a single dash.
+    """
+    version = version.replace(' ','.')
+    return re.sub('[^A-Za-z0-9.]+', '-', version)
+
+
+def safe_extra(extra):
+    """Convert an arbitrary string to a standard 'extra' name
+
+    Any runs of non-alphanumeric characters are replaced with a single '_',
+    and the result is always lowercased.
+    """
+    return re.sub('[^A-Za-z0-9.]+', '_', extra).lower()
+
+
+def to_filename(name):
+    """Convert a project or version name to its filename-escaped form
+
+    Any '-' characters are currently replaced with '_'.
+    """
+    return name.replace('-','_')
+
+
+class MarkerEvaluation(object):
+    values = {
+        'os_name': lambda: os.name,
+        'sys_platform': lambda: sys.platform,
+        'python_full_version': platform.python_version,
+        'python_version': lambda: platform.python_version()[:3],
+        'platform_version': platform.version,
+        'platform_machine': platform.machine,
+        'python_implementation': platform.python_implementation,
+    }
+
+    @classmethod
+    def is_invalid_marker(cls, text):
+        """
+        Validate text as a PEP 426 environment marker; return an exception
+        if invalid or False otherwise.
+        """
+        try:
+            cls.evaluate_marker(text)
+        except SyntaxError:
+            return cls.normalize_exception(sys.exc_info()[1])
+        return False
+
+    @staticmethod
+    def normalize_exception(exc):
+        """
+        Given a SyntaxError from a marker evaluation, normalize the error
+        message:
+         - Remove indications of filename and line number.
+         - Replace platform-specific error messages with standard error
+           messages.
+        """
+        subs = {
+            'unexpected EOF while parsing': 'invalid syntax',
+            'parenthesis is never closed': 'invalid syntax',
+        }
+        exc.filename = None
+        exc.lineno = None
+        exc.msg = subs.get(exc.msg, exc.msg)
+        return exc
+
+    @classmethod
+    def and_test(cls, nodelist):
+        # MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
+        items = [
+            cls.interpret(nodelist[i])
+            for i in range(1, len(nodelist), 2)
+        ]
+        return functools.reduce(operator.and_, items)
+
+    @classmethod
+    def test(cls, nodelist):
+        # MUST NOT short-circuit evaluation, or invalid syntax can be skipped!
+        items = [
+            cls.interpret(nodelist[i])
+            for i in range(1, len(nodelist), 2)
+        ]
+        return functools.reduce(operator.or_, items)
+
+    @classmethod
+    def atom(cls, nodelist):
+        t = nodelist[1][0]
+        if t == token.LPAR:
+            if nodelist[2][0] == token.RPAR:
+                raise SyntaxError("Empty parentheses")
+            return cls.interpret(nodelist[2])
+        msg = "Language feature not supported in environment markers"
+        raise SyntaxError(msg)
+
+    @classmethod
+    def comparison(cls, nodelist):
+        if len(nodelist) > 4:
+            msg = "Chained comparison not allowed in environment markers"
+            raise SyntaxError(msg)
+        comp = nodelist[2][1]
+        cop = comp[1]
+        if comp[0] == token.NAME:
+            if len(nodelist[2]) == 3:
+                if cop == 'not':
+                    cop = 'not in'
+                else:
+                    cop = 'is not'
+        try:
+            cop = cls.get_op(cop)
+        except KeyError:
+            msg = repr(cop) + " operator not allowed in environment markers"
+            raise SyntaxError(msg)
+        return cop(cls.evaluate(nodelist[1]), cls.evaluate(nodelist[3]))
+
+    @classmethod
+    def get_op(cls, op):
+        ops = {
+            symbol.test: cls.test,
+            symbol.and_test: cls.and_test,
+            symbol.atom: cls.atom,
+            symbol.comparison: cls.comparison,
+            'not in': lambda x, y: x not in y,
+            'in': lambda x, y: x in y,
+            '==': operator.eq,
+            '!=': operator.ne,
+        }
+        if hasattr(symbol, 'or_test'):
+            ops[symbol.or_test] = cls.test
+        return ops[op]
+
+    @classmethod
+    def evaluate_marker(cls, text, extra=None):
+        """
+        Evaluate a PEP 426 environment marker on CPython 2.4+.
+        Return a boolean indicating the marker result in this environment.
+        Raise SyntaxError if marker is invalid.
+
+        This implementation uses the 'parser' module, which is not implemented
+        on
+        Jython and has been superseded by the 'ast' module in Python 2.6 and
+        later.
+        """
+        return cls.interpret(parser.expr(text).totuple(1)[1])
+
+    @classmethod
+    def _markerlib_evaluate(cls, text):
+        """
+        Evaluate a PEP 426 environment marker using markerlib.
+        Return a boolean indicating the marker result in this environment.
+        Raise SyntaxError if marker is invalid.
+        """
+        import _markerlib
+        # markerlib implements Metadata 1.2 (PEP 345) environment markers.
+        # Translate the variables to Metadata 2.0 (PEP 426).
+        env = _markerlib.default_environment()
+        for key in env.keys():
+            new_key = key.replace('.', '_')
+            env[new_key] = env.pop(key)
+        try:
+            result = _markerlib.interpret(text, env)
+        except NameError:
+            e = sys.exc_info()[1]
+            raise SyntaxError(e.args[0])
+        return result
+
+    if 'parser' not in globals():
+        # Fall back to less-complete _markerlib implementation if 'parser' module
+        # is not available.
+        evaluate_marker = _markerlib_evaluate
+
+    @classmethod
+    def interpret(cls, nodelist):
+        while len(nodelist)==2: nodelist = nodelist[1]
+        try:
+            op = cls.get_op(nodelist[0])
+        except KeyError:
+            raise SyntaxError("Comparison or logical expression expected")
+        return op(nodelist)
+
+    @classmethod
+    def evaluate(cls, nodelist):
+        while len(nodelist)==2: nodelist = nodelist[1]
+        kind = nodelist[0]
+        name = nodelist[1]
+        if kind==token.NAME:
+            try:
+                op = cls.values[name]
+            except KeyError:
+                raise SyntaxError("Unknown name %r" % name)
+            return op()
+        if kind==token.STRING:
+            s = nodelist[1]
+            if not cls._safe_string(s):
+                raise SyntaxError(
+                    "Only plain strings allowed in environment markers")
+            return s[1:-1]
+        msg = "Language feature not supported in environment markers"
+        raise SyntaxError(msg)
+
+    @staticmethod
+    def _safe_string(cand):
+        return (
+            cand[:1] in "'\"" and
+            not cand.startswith('"""') and
+            not cand.startswith("'''") and
+            '\\' not in cand
+        )
+
+invalid_marker = MarkerEvaluation.is_invalid_marker
+evaluate_marker = MarkerEvaluation.evaluate_marker
+
+class NullProvider:
+    """Try to implement resources and metadata for arbitrary PEP 302 loaders"""
+
+    egg_name = None
+    egg_info = None
+    loader = None
+
+    def __init__(self, module):
+        self.loader = getattr(module, '__loader__', None)
+        self.module_path = os.path.dirname(getattr(module, '__file__', ''))
+
+    def get_resource_filename(self, manager, resource_name):
+        return self._fn(self.module_path, resource_name)
+
+    def get_resource_stream(self, manager, resource_name):
+        return io.BytesIO(self.get_resource_string(manager, resource_name))
+
+    def get_resource_string(self, manager, resource_name):
+        return self._get(self._fn(self.module_path, resource_name))
+
+    def has_resource(self, resource_name):
+        return self._has(self._fn(self.module_path, resource_name))
+
+    def has_metadata(self, name):
+        return self.egg_info and self._has(self._fn(self.egg_info, name))
+
+    if sys.version_info <= (3,):
+        def get_metadata(self, name):
+            if not self.egg_info:
+                return ""
+            return self._get(self._fn(self.egg_info, name))
+    else:
+        def get_metadata(self, name):
+            if not self.egg_info:
+                return ""
+            return self._get(self._fn(self.egg_info, name)).decode("utf-8")
+
+    def get_metadata_lines(self, name):
+        return yield_lines(self.get_metadata(name))
+
+    def resource_isdir(self, resource_name):
+        return self._isdir(self._fn(self.module_path, resource_name))
+
+    def metadata_isdir(self, name):
+        return self.egg_info and self._isdir(self._fn(self.egg_info, name))
+
+    def resource_listdir(self, resource_name):
+        return self._listdir(self._fn(self.module_path, resource_name))
+
+    def metadata_listdir(self, name):
+        if self.egg_info:
+            return self._listdir(self._fn(self.egg_info, name))
+        return []
+
+    def run_script(self, script_name, namespace):
+        script = 'scripts/'+script_name
+        if not self.has_metadata(script):
+            raise ResolutionError("No script named %r" % script_name)
+        script_text = self.get_metadata(script).replace('\r\n', '\n')
+        script_text = script_text.replace('\r', '\n')
+        script_filename = self._fn(self.egg_info, script)
+        namespace['__file__'] = script_filename
+        if os.path.exists(script_filename):
+            source = open(script_filename).read()
+            code = compile(source, script_filename, 'exec')
+            exec(code, namespace, namespace)
+        else:
+            from linecache import cache
+            cache[script_filename] = (
+                len(script_text), 0, script_text.split('\n'), script_filename
+            )
+            script_code = compile(script_text, script_filename,'exec')
+            exec(script_code, namespace, namespace)
+
+    def _has(self, path):
+        raise NotImplementedError(
+            "Can't perform this operation for unregistered loader type"
+        )
+
+    def _isdir(self, path):
+        raise NotImplementedError(
+            "Can't perform this operation for unregistered loader type"
+        )
+
+    def _listdir(self, path):
+        raise NotImplementedError(
+            "Can't perform this operation for unregistered loader type"
+        )
+
+    def _fn(self, base, resource_name):
+        if resource_name:
+            return os.path.join(base, *resource_name.split('/'))
+        return base
+
+    def _get(self, path):
+        if hasattr(self.loader, 'get_data'):
+            return self.loader.get_data(path)
+        raise NotImplementedError(
+            "Can't perform this operation for loaders without 'get_data()'"
+        )
+
+register_loader_type(object, NullProvider)
+
+
+class EggProvider(NullProvider):
+    """Provider based on a virtual filesystem"""
+
+    def __init__(self, module):
+        NullProvider.__init__(self, module)
+        self._setup_prefix()
+
+    def _setup_prefix(self):
+        # we assume here that our metadata may be nested inside a "basket"
+        # of multiple eggs; that's why we use module_path instead of .archive
+        path = self.module_path
+        old = None
+        while path!=old:
+            if path.lower().endswith('.egg'):
+                self.egg_name = os.path.basename(path)
+                self.egg_info = os.path.join(path, 'EGG-INFO')
+                self.egg_root = path
+                break
+            old = path
+            path, base = os.path.split(path)
+
+class DefaultProvider(EggProvider):
+    """Provides access to package resources in the filesystem"""
+
+    def _has(self, path):
+        return os.path.exists(path)
+
+    def _isdir(self, path):
+        return os.path.isdir(path)
+
+    def _listdir(self, path):
+        return os.listdir(path)
+
+    def get_resource_stream(self, manager, resource_name):
+        return open(self._fn(self.module_path, resource_name), 'rb')
+
+    def _get(self, path):
+        with open(path, 'rb') as stream:
+            return stream.read()
+
+register_loader_type(type(None), DefaultProvider)
+
+if importlib_bootstrap is not None:
+    register_loader_type(importlib_bootstrap.SourceFileLoader, DefaultProvider)
+
+
+class EmptyProvider(NullProvider):
+    """Provider that returns nothing for all requests"""
+
+    _isdir = _has = lambda self, path: False
+    _get = lambda self, path: ''
+    _listdir = lambda self, path: []
+    module_path = None
+
+    def __init__(self):
+        pass
+
+empty_provider = EmptyProvider()
+
+
+class ZipManifests(dict):
+    """
+    zip manifest builder
+    """
+
+    @classmethod
+    def build(cls, path):
+        """
+        Build a dictionary similar to the zipimport directory
+        caches, except instead of tuples, store ZipInfo objects.
+
+        Use a platform-specific path separator (os.sep) for the path keys
+        for compatibility with pypy on Windows.
+        """
+        with ContextualZipFile(path) as zfile:
+            items = (
+                (
+                    name.replace('/', os.sep),
+                    zfile.getinfo(name),
+                )
+                for name in zfile.namelist()
+            )
+            return dict(items)
+
+    load = build
+
+
+class MemoizedZipManifests(ZipManifests):
+    """
+    Memoized zipfile manifests.
+    """
+    manifest_mod = collections.namedtuple('manifest_mod', 'manifest mtime')
+
+    def load(self, path):
+        """
+        Load a manifest at path or return a suitable manifest already loaded.
+        """
+        path = os.path.normpath(path)
+        mtime = os.stat(path).st_mtime
+
+        if path not in self or self[path].mtime != mtime:
+            manifest = self.build(path)
+            self[path] = self.manifest_mod(manifest, mtime)
+
+        return self[path].manifest
+
+
+class ContextualZipFile(zipfile.ZipFile):
+    """
+    Supplement ZipFile class to support context manager for Python 2.6
+    """
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, type, value, traceback):
+        self.close()
+
+    def __new__(cls, *args, **kwargs):
+        """
+        Construct a ZipFile or ContextualZipFile as appropriate
+        """
+        if hasattr(zipfile.ZipFile, '__exit__'):
+            return zipfile.ZipFile(*args, **kwargs)
+        return super(ContextualZipFile, cls).__new__(cls)
+
+
+class ZipProvider(EggProvider):
+    """Resource support for zips and eggs"""
+
+    eagers = None
+    _zip_manifests = MemoizedZipManifests()
+
+    def __init__(self, module):
+        EggProvider.__init__(self, module)
+        self.zip_pre = self.loader.archive+os.sep
+
+    def _zipinfo_name(self, fspath):
+        # Convert a virtual filename (full path to file) into a zipfile subpath
+        # usable with the zipimport directory cache for our target archive
+        if fspath.startswith(self.zip_pre):
+            return fspath[len(self.zip_pre):]
+        raise AssertionError(
+            "%s is not a subpath of %s" % (fspath, self.zip_pre)
+        )
+
+    def _parts(self, zip_path):
+        # Convert a zipfile subpath into an egg-relative path part list.
+        # pseudo-fs path
+        fspath = self.zip_pre+zip_path
+        if fspath.startswith(self.egg_root+os.sep):
+            return fspath[len(self.egg_root)+1:].split(os.sep)
+        raise AssertionError(
+            "%s is not a subpath of %s" % (fspath, self.egg_root)
+        )
+
+    @property
+    def zipinfo(self):
+        return self._zip_manifests.load(self.loader.archive)
+
+    def get_resource_filename(self, manager, resource_name):
+        if not self.egg_name:
+            raise NotImplementedError(
+                "resource_filename() only supported for .egg, not .zip"
+            )
+        # no need to lock for extraction, since we use temp names
+        zip_path = self._resource_to_zip(resource_name)
+        eagers = self._get_eager_resources()
+        if '/'.join(self._parts(zip_path)) in eagers:
+            for name in eagers:
+                self._extract_resource(manager, self._eager_to_zip(name))
+        return self._extract_resource(manager, zip_path)
+
+    @staticmethod
+    def _get_date_and_size(zip_stat):
+        size = zip_stat.file_size
+        # ymdhms+wday, yday, dst
+        date_time = zip_stat.date_time + (0, 0, -1)
+        # 1980 offset already done
+        timestamp = time.mktime(date_time)
+        return timestamp, size
+
+    def _extract_resource(self, manager, zip_path):
+
+        if zip_path in self._index():
+            for name in self._index()[zip_path]:
+                last = self._extract_resource(
+                    manager, os.path.join(zip_path, name)
+                )
+            # return the extracted directory name
+            return os.path.dirname(last)
+
+        timestamp, size = self._get_date_and_size(self.zipinfo[zip_path])
+
+        if not WRITE_SUPPORT:
+            raise IOError('"os.rename" and "os.unlink" are not supported '
+                          'on this platform')
+        try:
+
+            real_path = manager.get_cache_path(
+                self.egg_name, self._parts(zip_path)
+            )
+
+            if self._is_current(real_path, zip_path):
+                return real_path
+
+            outf, tmpnam = _mkstemp(".$extract", dir=os.path.dirname(real_path))
+            os.write(outf, self.loader.get_data(zip_path))
+            os.close(outf)
+            utime(tmpnam, (timestamp, timestamp))
+            manager.postprocess(tmpnam, real_path)
+
+            try:
+                rename(tmpnam, real_path)
+
+            except os.error:
+                if os.path.isfile(real_path):
+                    if self._is_current(real_path, zip_path):
+                        # the file became current since it was checked above,
+                        #  so proceed.
+                        return real_path
+                    # Windows, del old file and retry
+                    elif os.name=='nt':
+                        unlink(real_path)
+                        rename(tmpnam, real_path)
+                        return real_path
+                raise
+
+        except os.error:
+            # report a user-friendly error
+            manager.extraction_error()
+
+        return real_path
+
+    def _is_current(self, file_path, zip_path):
+        """
+        Return True if the file_path is current for this zip_path
+        """
+        timestamp, size = self._get_date_and_size(self.zipinfo[zip_path])
+        if not os.path.isfile(file_path):
+            return False
+        stat = os.stat(file_path)
+        if stat.st_size!=size or stat.st_mtime!=timestamp:
+            return False
+        # check that the contents match
+        zip_contents = self.loader.get_data(zip_path)
+        with open(file_path, 'rb') as f:
+            file_contents = f.read()
+        return zip_contents == file_contents
+
+    def _get_eager_resources(self):
+        if self.eagers is None:
+            eagers = []
+            for name in ('native_libs.txt', 'eager_resources.txt'):
+                if self.has_metadata(name):
+                    eagers.extend(self.get_metadata_lines(name))
+            self.eagers = eagers
+        return self.eagers
+
+    def _index(self):
+        try:
+            return self._dirindex
+        except AttributeError:
+            ind = {}
+            for path in self.zipinfo:
+                parts = path.split(os.sep)
+                while parts:
+                    parent = os.sep.join(parts[:-1])
+                    if parent in ind:
+                        ind[parent].append(parts[-1])
+                        break
+                    else:
+                        ind[parent] = [parts.pop()]
+            self._dirindex = ind
+            return ind
+
+    def _has(self, fspath):
+        zip_path = self._zipinfo_name(fspath)
+        return zip_path in self.zipinfo or zip_path in self._index()
+
+    def _isdir(self, fspath):
+        return self._zipinfo_name(fspath) in self._index()
+
+    def _listdir(self, fspath):
+        return list(self._index().get(self._zipinfo_name(fspath), ()))
+
+    def _eager_to_zip(self, resource_name):
+        return self._zipinfo_name(self._fn(self.egg_root, resource_name))
+
+    def _resource_to_zip(self, resource_name):
+        return self._zipinfo_name(self._fn(self.module_path, resource_name))
+
+register_loader_type(zipimport.zipimporter, ZipProvider)
+
+
+class FileMetadata(EmptyProvider):
+    """Metadata handler for standalone PKG-INFO files
+
+    Usage::
+
+        metadata = FileMetadata("/path/to/PKG-INFO")
+
+    This provider rejects all data and metadata requests except for PKG-INFO,
+    which is treated as existing, and will be the contents of the file at
+    the provided location.
+    """
+
+    def __init__(self, path):
+        self.path = path
+
+    def has_metadata(self, name):
+        return name=='PKG-INFO'
+
+    def get_metadata(self, name):
+        if name=='PKG-INFO':
+            with open(self.path,'rU') as f:
+                metadata = f.read()
+            return metadata
+        raise KeyError("No metadata except PKG-INFO is available")
+
+    def get_metadata_lines(self, name):
+        return yield_lines(self.get_metadata(name))
+
+
+class PathMetadata(DefaultProvider):
+    """Metadata provider for egg directories
+
+    Usage::
+
+        # Development eggs:
+
+        egg_info = "/path/to/PackageName.egg-info"
+        base_dir = os.path.dirname(egg_info)
+        metadata = PathMetadata(base_dir, egg_info)
+        dist_name = os.path.splitext(os.path.basename(egg_info))[0]
+        dist = Distribution(basedir, project_name=dist_name, metadata=metadata)
+
+        # Unpacked egg directories:
+
+        egg_path = "/path/to/PackageName-ver-pyver-etc.egg"
+        metadata = PathMetadata(egg_path, os.path.join(egg_path,'EGG-INFO'))
+        dist = Distribution.from_filename(egg_path, metadata=metadata)
+    """
+
+    def __init__(self, path, egg_info):
+        self.module_path = path
+        self.egg_info = egg_info
+
+
+class EggMetadata(ZipProvider):
+    """Metadata provider for .egg files"""
+
+    def __init__(self, importer):
+        """Create a metadata provider from a zipimporter"""
+
+        self.zip_pre = importer.archive+os.sep
+        self.loader = importer
+        if importer.prefix:
+            self.module_path = os.path.join(importer.archive, importer.prefix)
+        else:
+            self.module_path = importer.archive
+        self._setup_prefix()
+
+_declare_state('dict', _distribution_finders = {})
+
+def register_finder(importer_type, distribution_finder):
+    """Register `distribution_finder` to find distributions in sys.path items
+
+    `importer_type` is the type or class of a PEP 302 "Importer" (sys.path item
+    handler), and `distribution_finder` is a callable that, passed a path
+    item and the importer instance, yields ``Distribution`` instances found on
+    that path item.  See ``pkg_resources.find_on_path`` for an example."""
+    _distribution_finders[importer_type] = distribution_finder
+
+
+def find_distributions(path_item, only=False):
+    """Yield distributions accessible via `path_item`"""
+    importer = get_importer(path_item)
+    finder = _find_adapter(_distribution_finders, importer)
+    return finder(importer, path_item, only)
+
+def find_eggs_in_zip(importer, path_item, only=False):
+    """
+    Find eggs in zip files; possibly multiple nested eggs.
+    """
+    if importer.archive.endswith('.whl'):
+        # wheels are not supported with this finder
+        # they don't have PKG-INFO metadata, and won't ever contain eggs
+        return
+    metadata = EggMetadata(importer)
+    if metadata.has_metadata('PKG-INFO'):
+        yield Distribution.from_filename(path_item, metadata=metadata)
+    if only:
+        # don't yield nested distros
+        return
+    for subitem in metadata.resource_listdir('/'):
+        if subitem.endswith('.egg'):
+            subpath = os.path.join(path_item, subitem)
+            for dist in find_eggs_in_zip(zipimport.zipimporter(subpath), subpath):
+                yield dist
+
+register_finder(zipimport.zipimporter, find_eggs_in_zip)
+
+def find_nothing(importer, path_item, only=False):
+    return ()
+register_finder(object, find_nothing)
+
+def find_on_path(importer, path_item, only=False):
+    """Yield distributions accessible on a sys.path directory"""
+    path_item = _normalize_cached(path_item)
+
+    if os.path.isdir(path_item) and os.access(path_item, os.R_OK):
+        if path_item.lower().endswith('.egg'):
+            # unpacked egg
+            yield Distribution.from_filename(
+                path_item, metadata=PathMetadata(
+                    path_item, os.path.join(path_item,'EGG-INFO')
+                )
+            )
+        else:
+            # scan for .egg and .egg-info in directory
+            for entry in os.listdir(path_item):
+                lower = entry.lower()
+                if lower.endswith('.egg-info') or lower.endswith('.dist-info'):
+                    fullpath = os.path.join(path_item, entry)
+                    if os.path.isdir(fullpath):
+                        # egg-info directory, allow getting metadata
+                        metadata = PathMetadata(path_item, fullpath)
+                    else:
+                        metadata = FileMetadata(fullpath)
+                    yield Distribution.from_location(
+                        path_item, entry, metadata, precedence=DEVELOP_DIST
+                    )
+                elif not only and lower.endswith('.egg'):
+                    dists = find_distributions(os.path.join(path_item, entry))
+                    for dist in dists:
+                        yield dist
+                elif not only and lower.endswith('.egg-link'):
+                    with open(os.path.join(path_item, entry)) as entry_file:
+                        entry_lines = entry_file.readlines()
+                    for line in entry_lines:
+                        if not line.strip():
+                            continue
+                        path = os.path.join(path_item, line.rstrip())
+                        dists = find_distributions(path)
+                        for item in dists:
+                            yield item
+                        break
+register_finder(pkgutil.ImpImporter, find_on_path)
+
+if importlib_bootstrap is not None:
+    register_finder(importlib_bootstrap.FileFinder, find_on_path)
+
+_declare_state('dict', _namespace_handlers={})
+_declare_state('dict', _namespace_packages={})
+
+
+def register_namespace_handler(importer_type, namespace_handler):
+    """Register `namespace_handler` to declare namespace packages
+
+    `importer_type` is the type or class of a PEP 302 "Importer" (sys.path item
+    handler), and `namespace_handler` is a callable like this::
+
+        def namespace_handler(importer, path_entry, moduleName, module):
+            # return a path_entry to use for child packages
+
+    Namespace handlers are only called if the importer object has already
+    agreed that it can handle the relevant path item, and they should only
+    return a subpath if the module __path__ does not already contain an
+    equivalent subpath.  For an example namespace handler, see
+    ``pkg_resources.file_ns_handler``.
+    """
+    _namespace_handlers[importer_type] = namespace_handler
+
+def _handle_ns(packageName, path_item):
+    """Ensure that named package includes a subpath of path_item (if needed)"""
+
+    importer = get_importer(path_item)
+    if importer is None:
+        return None
+    loader = importer.find_module(packageName)
+    if loader is None:
+        return None
+    module = sys.modules.get(packageName)
+    if module is None:
+        module = sys.modules[packageName] = imp.new_module(packageName)
+        module.__path__ = []
+        _set_parent_ns(packageName)
+    elif not hasattr(module,'__path__'):
+        raise TypeError("Not a package:", packageName)
+    handler = _find_adapter(_namespace_handlers, importer)
+    subpath = handler(importer, path_item, packageName, module)
+    if subpath is not None:
+        path = module.__path__
+        path.append(subpath)
+        loader.load_module(packageName)
+        for path_item in path:
+            if path_item not in module.__path__:
+                module.__path__.append(path_item)
+    return subpath
+
+def declare_namespace(packageName):
+    """Declare that package 'packageName' is a namespace package"""
+
+    imp.acquire_lock()
+    try:
+        if packageName in _namespace_packages:
+            return
+
+        path, parent = sys.path, None
+        if '.' in packageName:
+            parent = '.'.join(packageName.split('.')[:-1])
+            declare_namespace(parent)
+            if parent not in _namespace_packages:
+                __import__(parent)
+            try:
+                path = sys.modules[parent].__path__
+            except AttributeError:
+                raise TypeError("Not a package:", parent)
+
+        # Track what packages are namespaces, so when new path items are added,
+        # they can be updated
+        _namespace_packages.setdefault(parent,[]).append(packageName)
+        _namespace_packages.setdefault(packageName,[])
+
+        for path_item in path:
+            # Ensure all the parent's path items are reflected in the child,
+            # if they apply
+            _handle_ns(packageName, path_item)
+
+    finally:
+        imp.release_lock()
+
+def fixup_namespace_packages(path_item, parent=None):
+    """Ensure that previously-declared namespace packages include path_item"""
+    imp.acquire_lock()
+    try:
+        for package in _namespace_packages.get(parent,()):
+            subpath = _handle_ns(package, path_item)
+            if subpath:
+                fixup_namespace_packages(subpath, package)
+    finally:
+        imp.release_lock()
+
+def file_ns_handler(importer, path_item, packageName, module):
+    """Compute an ns-package subpath for a filesystem or zipfile importer"""
+
+    subpath = os.path.join(path_item, packageName.split('.')[-1])
+    normalized = _normalize_cached(subpath)
+    for item in module.__path__:
+        if _normalize_cached(item)==normalized:
+            break
+    else:
+        # Only return the path if it's not already there
+        return subpath
+
+register_namespace_handler(pkgutil.ImpImporter, file_ns_handler)
+register_namespace_handler(zipimport.zipimporter, file_ns_handler)
+
+if importlib_bootstrap is not None:
+    register_namespace_handler(importlib_bootstrap.FileFinder, file_ns_handler)
+
+
+def null_ns_handler(importer, path_item, packageName, module):
+    return None
+
+register_namespace_handler(object, null_ns_handler)
+
+
+def normalize_path(filename):
+    """Normalize a file/dir name for comparison purposes"""
+    return os.path.normcase(os.path.realpath(filename))
+
+def _normalize_cached(filename, _cache={}):
+    try:
+        return _cache[filename]
+    except KeyError:
+        _cache[filename] = result = normalize_path(filename)
+        return result
+
+def _set_parent_ns(packageName):
+    parts = packageName.split('.')
+    name = parts.pop()
+    if parts:
+        parent = '.'.join(parts)
+        setattr(sys.modules[parent], name, sys.modules[packageName])
+
+
+def yield_lines(strs):
+    """Yield non-empty/non-comment lines of a string or sequence"""
+    if isinstance(strs, string_types):
+        for s in strs.splitlines():
+            s = s.strip()
+            # skip blank lines/comments
+            if s and not s.startswith('#'):
+                yield s
+    else:
+        for ss in strs:
+            for s in yield_lines(ss):
+                yield s
+
+# whitespace and comment
+LINE_END = re.compile(r"\s*(#.*)?$").match
+# line continuation
+CONTINUE = re.compile(r"\s*\\\s*(#.*)?$").match
+# Distribution or extra
+DISTRO = re.compile(r"\s*((\w|[-.])+)").match
+# ver. info
+VERSION = re.compile(r"\s*(<=?|>=?|==|!=)\s*((\w|[-.])+)").match
+# comma between items
+COMMA = re.compile(r"\s*,").match
+OBRACKET = re.compile(r"\s*\[").match
+CBRACKET = re.compile(r"\s*\]").match
+MODULE = re.compile(r"\w+(\.\w+)*$").match
+EGG_NAME = re.compile(
+    r"(?P<name>[^-]+)"
+    r"( -(?P<ver>[^-]+) (-py(?P<pyver>[^-]+) (-(?P<plat>.+))? )? )?",
+    re.VERBOSE | re.IGNORECASE
+).match
+
+component_re = re.compile(r'(\d+ | [a-z]+ | \.| -)', re.VERBOSE)
+replace = {'pre':'c', 'preview':'c','-':'final-','rc':'c','dev':'@'}.get
+
+def _parse_version_parts(s):
+    for part in component_re.split(s):
+        part = replace(part, part)
+        if not part or part=='.':
+            continue
+        if part[:1] in '0123456789':
+            # pad for numeric comparison
+            yield part.zfill(8)
+        else:
+            yield '*'+part
+
+    # ensure that alpha/beta/candidate are before final
+    yield '*final'
+
+def parse_version(s):
+    """Convert a version string to a chronologically-sortable key
+
+    This is a rough cross between distutils' StrictVersion and LooseVersion;
+    if you give it versions that would work with StrictVersion, then it behaves
+    the same; otherwise it acts like a slightly-smarter LooseVersion. It is
+    *possible* to create pathological version coding schemes that will fool
+    this parser, but they should be very rare in practice.
+
+    The returned value will be a tuple of strings.  Numeric portions of the
+    version are padded to 8 digits so they will compare numerically, but
+    without relying on how numbers compare relative to strings.  Dots are
+    dropped, but dashes are retained.  Trailing zeros between alpha segments
+    or dashes are suppressed, so that e.g. "2.4.0" is considered the same as
+    "2.4". Alphanumeric parts are lower-cased.
+
+    The algorithm assumes that strings like "-" and any alpha string that
+    alphabetically follows "final"  represents a "patch level".  So, "2.4-1"
+    is assumed to be a branch or patch of "2.4", and therefore "2.4.1" is
+    considered newer than "2.4-1", which in turn is newer than "2.4".
+
+    Strings like "a", "b", "c", "alpha", "beta", "candidate" and so on (that
+    come before "final" alphabetically) are assumed to be pre-release versions,
+    so that the version "2.4" is considered newer than "2.4a1".
+
+    Finally, to handle miscellaneous cases, the strings "pre", "preview", and
+    "rc" are treated as if they were "c", i.e. as though they were release
+    candidates, and therefore are not as new as a version string that does not
+    contain them, and "dev" is replaced with an '@' so that it sorts lower than
+    than any other pre-release tag.
+    """
+    parts = []
+    for part in _parse_version_parts(s.lower()):
+        if part.startswith('*'):
+            # remove '-' before a prerelease tag
+            if part < '*final':
+                while parts and parts[-1] == '*final-':
+                    parts.pop()
+            # remove trailing zeros from each series of numeric parts
+            while parts and parts[-1]=='00000000':
+                parts.pop()
+        parts.append(part)
+    return tuple(parts)
+
+
+class EntryPoint(object):
+    """Object representing an advertised importable object"""
+
+    def __init__(self, name, module_name, attrs=(), extras=(), dist=None):
+        if not MODULE(module_name):
+            raise ValueError("Invalid module name", module_name)
+        self.name = name
+        self.module_name = module_name
+        self.attrs = tuple(attrs)
+        self.extras = Requirement.parse(("x[%s]" % ','.join(extras))).extras
+        self.dist = dist
+
+    def __str__(self):
+        s = "%s = %s" % (self.name, self.module_name)
+        if self.attrs:
+            s += ':' + '.'.join(self.attrs)
+        if self.extras:
+            s += ' [%s]' % ','.join(self.extras)
+        return s
+
+    def __repr__(self):
+        return "EntryPoint.parse(%r)" % str(self)
+
+    def load(self, require=True, env=None, installer=None):
+        if require:
+            self.require(env, installer)
+        entry = __import__(self.module_name, globals(), globals(),
+            ['__name__'])
+        for attr in self.attrs:
+            try:
+                entry = getattr(entry, attr)
+            except AttributeError:
+                raise ImportError("%r has no %r attribute" % (entry, attr))
+        return entry
+
+    def require(self, env=None, installer=None):
+        if self.extras and not self.dist:
+            raise UnknownExtra("Can't require() without a distribution", self)
+        reqs = self.dist.requires(self.extras)
+        items = working_set.resolve(reqs, env, installer)
+        list(map(working_set.add, items))
+
+    @classmethod
+    def parse(cls, src, dist=None):
+        """Parse a single entry point from string `src`
+
+        Entry point syntax follows the form::
+
+            name = some.module:some.attr [extra1, extra2]
+
+        The entry name and module name are required, but the ``:attrs`` and
+        ``[extras]`` parts are optional
+        """
+        try:
+            attrs = extras = ()
+            name, value = src.split('=', 1)
+            if '[' in value:
+                value, extras = value.split('[', 1)
+                req = Requirement.parse("x[" + extras)
+                if req.specs:
+                    raise ValueError
+                extras = req.extras
+            if ':' in value:
+                value, attrs = value.split(':', 1)
+                if not MODULE(attrs.rstrip()):
+                    raise ValueError
+                attrs = attrs.rstrip().split('.')
+        except ValueError:
+            msg = "EntryPoint must be in 'name=module:attrs [extras]' format"
+            raise ValueError(msg, src)
+        else:
+            return cls(name.strip(), value.strip(), attrs, extras, dist)
+
+    @classmethod
+    def parse_group(cls, group, lines, dist=None):
+        """Parse an entry point group"""
+        if not MODULE(group):
+            raise ValueError("Invalid group name", group)
+        this = {}
+        for line in yield_lines(lines):
+            ep = cls.parse(line, dist)
+            if ep.name in this:
+                raise ValueError("Duplicate entry point", group, ep.name)
+            this[ep.name]=ep
+        return this
+
+    @classmethod
+    def parse_map(cls, data, dist=None):
+        """Parse a map of entry point groups"""
+        if isinstance(data, dict):
+            data = data.items()
+        else:
+            data = split_sections(data)
+        maps = {}
+        for group, lines in data:
+            if group is None:
+                if not lines:
+                    continue
+                raise ValueError("Entry points must be listed in groups")
+            group = group.strip()
+            if group in maps:
+                raise ValueError("Duplicate group name", group)
+            maps[group] = cls.parse_group(group, lines, dist)
+        return maps
+
+
+def _remove_md5_fragment(location):
+    if not location:
+        return ''
+    parsed = urlparse(location)
+    if parsed[-1].startswith('md5='):
+        return urlunparse(parsed[:-1] + ('',))
+    return location
+
+
+class Distribution(object):
+    """Wrap an actual or potential sys.path entry w/metadata"""
+    PKG_INFO = 'PKG-INFO'
+
+    def __init__(self, location=None, metadata=None, project_name=None,
+            version=None, py_version=PY_MAJOR, platform=None,
+            precedence=EGG_DIST):
+        self.project_name = safe_name(project_name or 'Unknown')
+        if version is not None:
+            self._version = safe_version(version)
+        self.py_version = py_version
+        self.platform = platform
+        self.location = location
+        self.precedence = precedence
+        self._provider = metadata or empty_provider
+
+    @classmethod
+    def from_location(cls, location, basename, metadata=None,**kw):
+        project_name, version, py_version, platform = [None]*4
+        basename, ext = os.path.splitext(basename)
+        if ext.lower() in _distributionImpl:
+            # .dist-info gets much metadata differently
+            match = EGG_NAME(basename)
+            if match:
+                project_name, version, py_version, platform = match.group(
+                    'name','ver','pyver','plat'
+                )
+            cls = _distributionImpl[ext.lower()]
+        return cls(
+            location, metadata, project_name=project_name, version=version,
+            py_version=py_version, platform=platform, **kw
+        )
+
+    @property
+    def hashcmp(self):
+        return (
+            getattr(self, 'parsed_version', ()),
+            self.precedence,
+            self.key,
+            _remove_md5_fragment(self.location),
+            self.py_version,
+            self.platform,
+        )
+
+    def __hash__(self):
+        return hash(self.hashcmp)
+
+    def __lt__(self, other):
+        return self.hashcmp < other.hashcmp
+
+    def __le__(self, other):
+        return self.hashcmp <= other.hashcmp
+
+    def __gt__(self, other):
+        return self.hashcmp > other.hashcmp
+
+    def __ge__(self, other):
+        return self.hashcmp >= other.hashcmp
+
+    def __eq__(self, other):
+        if not isinstance(other, self.__class__):
+            # It's not a Distribution, so they are not equal
+            return False
+        return self.hashcmp == other.hashcmp
+
+    def __ne__(self, other):
+        return not self == other
+
+    # These properties have to be lazy so that we don't have to load any
+    # metadata until/unless it's actually needed.  (i.e., some distributions
+    # may not know their name or version without loading PKG-INFO)
+
+    @property
+    def key(self):
+        try:
+            return self._key
+        except AttributeError:
+            self._key = key = self.project_name.lower()
+            return key
+
+    @property
+    def parsed_version(self):
+        try:
+            return self._parsed_version
+        except AttributeError:
+            self._parsed_version = pv = parse_version(self.version)
+            return pv
+
+    @property
+    def version(self):
+        try:
+            return self._version
+        except AttributeError:
+            for line in self._get_metadata(self.PKG_INFO):
+                if line.lower().startswith('version:'):
+                    self._version = safe_version(line.split(':',1)[1].strip())
+                    return self._version
+            else:
+                tmpl = "Missing 'Version:' header and/or %s file"
+                raise ValueError(tmpl % self.PKG_INFO, self)
+
+    @property
+    def _dep_map(self):
+        try:
+            return self.__dep_map
+        except AttributeError:
+            dm = self.__dep_map = {None: []}
+            for name in 'requires.txt', 'depends.txt':
+                for extra, reqs in split_sections(self._get_metadata(name)):
+                    if extra:
+                        if ':' in extra:
+                            extra, marker = extra.split(':', 1)
+                            if invalid_marker(marker):
+                                # XXX warn
+                                reqs=[]
+                            elif not evaluate_marker(marker):
+                                reqs=[]
+                        extra = safe_extra(extra) or None
+                    dm.setdefault(extra,[]).extend(parse_requirements(reqs))
+            return dm
+
+    def requires(self, extras=()):
+        """List of Requirements needed for this distro if `extras` are used"""
+        dm = self._dep_map
+        deps = []
+        deps.extend(dm.get(None, ()))
+        for ext in extras:
+            try:
+                deps.extend(dm[safe_extra(ext)])
+            except KeyError:
+                raise UnknownExtra(
+                    "%s has no such extra feature %r" % (self, ext)
+                )
+        return deps
+
+    def _get_metadata(self, name):
+        if self.has_metadata(name):
+            for line in self.get_metadata_lines(name):
+                yield line
+
+    def activate(self, path=None):
+        """Ensure distribution is importable on `path` (default=sys.path)"""
+        if path is None:
+            path = sys.path
+        self.insert_on(path)
+        if path is sys.path:
+            fixup_namespace_packages(self.location)
+            for pkg in self._get_metadata('namespace_packages.txt'):
+                if pkg in sys.modules:
+                    declare_namespace(pkg)
+
+    def egg_name(self):
+        """Return what this distribution's standard .egg filename should be"""
+        filename = "%s-%s-py%s" % (
+            to_filename(self.project_name), to_filename(self.version),
+            self.py_version or PY_MAJOR
+        )
+
+        if self.platform:
+            filename += '-' + self.platform
+        return filename
+
+    def __repr__(self):
+        if self.location:
+            return "%s (%s)" % (self, self.location)
+        else:
+            return str(self)
+
+    def __str__(self):
+        try:
+            version = getattr(self, 'version', None)
+        except ValueError:
+            version = None
+        version = version or "[unknown version]"
+        return "%s %s" % (self.project_name, version)
+
+    def __getattr__(self, attr):
+        """Delegate all unrecognized public attributes to .metadata provider"""
+        if attr.startswith('_'):
+            raise AttributeError(attr)
+        return getattr(self._provider, attr)
+
+    @classmethod
+    def from_filename(cls, filename, metadata=None, **kw):
+        return cls.from_location(
+            _normalize_cached(filename), os.path.basename(filename), metadata,
+            **kw
+        )
+
+    def as_requirement(self):
+        """Return a ``Requirement`` that matches this distribution exactly"""
+        return Requirement.parse('%s==%s' % (self.project_name, self.version))
+
+    def load_entry_point(self, group, name):
+        """Return the `name` entry point of `group` or raise ImportError"""
+        ep = self.get_entry_info(group, name)
+        if ep is None:
+            raise ImportError("Entry point %r not found" % ((group, name),))
+        return ep.load()
+
+    def get_entry_map(self, group=None):
+        """Return the entry point map for `group`, or the full entry map"""
+        try:
+            ep_map = self._ep_map
+        except AttributeError:
+            ep_map = self._ep_map = EntryPoint.parse_map(
+                self._get_metadata('entry_points.txt'), self
+            )
+        if group is not None:
+            return ep_map.get(group,{})
+        return ep_map
+
+    def get_entry_info(self, group, name):
+        """Return the EntryPoint object for `group`+`name`, or ``None``"""
+        return self.get_entry_map(group).get(name)
+
+    def insert_on(self, path, loc = None):
+        """Insert self.location in path before its nearest parent directory"""
+
+        loc = loc or self.location
+        if not loc:
+            return
+
+        nloc = _normalize_cached(loc)
+        bdir = os.path.dirname(nloc)
+        npath= [(p and _normalize_cached(p) or p) for p in path]
+
+        for p, item in enumerate(npath):
+            if item == nloc:
+                break
+            elif item == bdir and self.precedence == EGG_DIST:
+                # if it's an .egg, give it precedence over its directory
+                if path is sys.path:
+                    self.check_version_conflict()
+                path.insert(p, loc)
+                npath.insert(p, nloc)
+                break
+        else:
+            if path is sys.path:
+                self.check_version_conflict()
+            path.append(loc)
+            return
+
+        # p is the spot where we found or inserted loc; now remove duplicates
+        while True:
+            try:
+                np = npath.index(nloc, p+1)
+            except ValueError:
+                break
+            else:
+                del npath[np], path[np]
+                # ha!
+                p = np
+
+        return
+
+    def check_version_conflict(self):
+        if self.key == 'setuptools':
+            # ignore the inevitable setuptools self-conflicts  :(
+            return
+
+        nsp = dict.fromkeys(self._get_metadata('namespace_packages.txt'))
+        loc = normalize_path(self.location)
+        for modname in self._get_metadata('top_level.txt'):
+            if (modname not in sys.modules or modname in nsp
+                    or modname in _namespace_packages):
+                continue
+            if modname in ('pkg_resources', 'setuptools', 'site'):
+                continue
+            fn = getattr(sys.modules[modname], '__file__', None)
+            if fn and (normalize_path(fn).startswith(loc) or
+                       fn.startswith(self.location)):
+                continue
+            issue_warning(
+                "Module %s was already imported from %s, but %s is being added"
+                " to sys.path" % (modname, fn, self.location),
+            )
+
+    def has_version(self):
+        try:
+            self.version
+        except ValueError:
+            issue_warning("Unbuilt egg for " + repr(self))
+            return False
+        return True
+
+    def clone(self,**kw):
+        """Copy this distribution, substituting in any changed keyword args"""
+        names = 'project_name version py_version platform location precedence'
+        for attr in names.split():
+            kw.setdefault(attr, getattr(self, attr, None))
+        kw.setdefault('metadata', self._provider)
+        return self.__class__(**kw)
+
+    @property
+    def extras(self):
+        return [dep for dep in self._dep_map if dep]
+
+
+class DistInfoDistribution(Distribution):
+    """Wrap an actual or potential sys.path entry w/metadata, .dist-info style"""
+    PKG_INFO = 'METADATA'
+    EQEQ = re.compile(r"([\(,])\s*(\d.*?)\s*([,\)])")
+
+    @property
+    def _parsed_pkg_info(self):
+        """Parse and cache metadata"""
+        try:
+            return self._pkg_info
+        except AttributeError:
+            metadata = self.get_metadata(self.PKG_INFO)
+            self._pkg_info = email.parser.Parser().parsestr(metadata)
+            return self._pkg_info
+
+    @property
+    def _dep_map(self):
+        try:
+            return self.__dep_map
+        except AttributeError:
+            self.__dep_map = self._compute_dependencies()
+            return self.__dep_map
+
+    def _preparse_requirement(self, requires_dist):
+        """Convert 'Foobar (1); baz' to ('Foobar ==1', 'baz')
+        Split environment marker, add == prefix to version specifiers as
+        necessary, and remove parenthesis.
+        """
+        parts = requires_dist.split(';', 1) + ['']
+        distvers = parts[0].strip()
+        mark = parts[1].strip()
+        distvers = re.sub(self.EQEQ, r"\1==\2\3", distvers)
+        distvers = distvers.replace('(', '').replace(')', '')
+        return (distvers, mark)
+
+    def _compute_dependencies(self):
+        """Recompute this distribution's dependencies."""
+        from _markerlib import compile as compile_marker
+        dm = self.__dep_map = {None: []}
+
+        reqs = []
+        # Including any condition expressions
+        for req in self._parsed_pkg_info.get_all('Requires-Dist') or []:
+            distvers, mark = self._preparse_requirement(req)
+            parsed = next(parse_requirements(distvers))
+            parsed.marker_fn = compile_marker(mark)
+            reqs.append(parsed)
+
+        def reqs_for_extra(extra):
+            for req in reqs:
+                if req.marker_fn(override={'extra':extra}):
+                    yield req
+
+        common = frozenset(reqs_for_extra(None))
+        dm[None].extend(common)
+
+        for extra in self._parsed_pkg_info.get_all('Provides-Extra') or []:
+            extra = safe_extra(extra.strip())
+            dm[extra] = list(frozenset(reqs_for_extra(extra)) - common)
+
+        return dm
+
+
+_distributionImpl = {
+    '.egg': Distribution,
+    '.egg-info': Distribution,
+    '.dist-info': DistInfoDistribution,
+    }
+
+
+def issue_warning(*args,**kw):
+    level = 1
+    g = globals()
+    try:
+        # find the first stack frame that is *not* code in
+        # the pkg_resources module, to use for the warning
+        while sys._getframe(level).f_globals is g:
+            level += 1
+    except ValueError:
+        pass
+    warnings.warn(stacklevel=level + 1, *args, **kw)
+
+
+def parse_requirements(strs):
+    """Yield ``Requirement`` objects for each specification in `strs`
+
+    `strs` must be a string, or a (possibly-nested) iterable thereof.
+    """
+    # create a steppable iterator, so we can handle \-continuations
+    lines = iter(yield_lines(strs))
+
+    def scan_list(ITEM, TERMINATOR, line, p, groups, item_name):
+
+        items = []
+
+        while not TERMINATOR(line, p):
+            if CONTINUE(line, p):
+                try:
+                    line = next(lines)
+                    p = 0
+                except StopIteration:
+                    raise ValueError(
+                        "\\ must not appear on the last nonblank line"
+                    )
+
+            match = ITEM(line, p)
+            if not match:
+                msg = "Expected " + item_name + " in"
+                raise ValueError(msg, line, "at", line[p:])
+
+            items.append(match.group(*groups))
+            p = match.end()
+
+            match = COMMA(line, p)
+            if match:
+                # skip the comma
+                p = match.end()
+            elif not TERMINATOR(line, p):
+                msg = "Expected ',' or end-of-list in"
+                raise ValueError(msg, line, "at", line[p:])
+
+        match = TERMINATOR(line, p)
+        # skip the terminator, if any
+        if match:
+            p = match.end()
+        return line, p, items
+
+    for line in lines:
+        match = DISTRO(line)
+        if not match:
+            raise ValueError("Missing distribution spec", line)
+        project_name = match.group(1)
+        p = match.end()
+        extras = []
+
+        match = OBRACKET(line, p)
+        if match:
+            p = match.end()
+            line, p, extras = scan_list(
+                DISTRO, CBRACKET, line, p, (1,), "'extra' name"
+            )
+
+        line, p, specs = scan_list(VERSION, LINE_END, line, p, (1, 2),
+            "version spec")
+        specs = [(op, safe_version(val)) for op, val in specs]
+        yield Requirement(project_name, specs, extras)
+
+
+class Requirement:
+    def __init__(self, project_name, specs, extras):
+        """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!"""
+        self.unsafe_name, project_name = project_name, safe_name(project_name)
+        self.project_name, self.key = project_name, project_name.lower()
+        index = [
+            (parse_version(v), state_machine[op], op, v)
+            for op, v in specs
+        ]
+        index.sort()
+        self.specs = [(op, ver) for parsed, trans, op, ver in index]
+        self.index, self.extras = index, tuple(map(safe_extra, extras))
+        self.hashCmp = (
+            self.key,
+            tuple((op, parsed) for parsed, trans, op, ver in index),
+            frozenset(self.extras),
+        )
+        self.__hash = hash(self.hashCmp)
+
+    def __str__(self):
+        specs = ','.join([''.join(s) for s in self.specs])
+        extras = ','.join(self.extras)
+        if extras:
+            extras = '[%s]' % extras
+        return '%s%s%s' % (self.project_name, extras, specs)
+
+    def __eq__(self, other):
+        return (
+            isinstance(other, Requirement) and
+            self.hashCmp == other.hashCmp
+        )
+
+    def __contains__(self, item):
+        if isinstance(item, Distribution):
+            if item.key != self.key:
+                return False
+            # only get if we need it
+            if self.index:
+                item = item.parsed_version
+        elif isinstance(item, string_types):
+            item = parse_version(item)
+        last = None
+        # -1, 0, 1
+        compare = lambda a, b: (a > b) - (a < b)
+        for parsed, trans, op, ver in self.index:
+            # Indexing: 0, 1, -1
+            action = trans[compare(item, parsed)]
+            if action == 'F':
+                return False
+            elif action == 'T':
+                return True
+            elif action == '+':
+                last = True
+            elif action == '-' or last is None:
+                last = False
+        # no rules encountered
+        if last is None:
+            last = True
+        return last
+
+    def __hash__(self):
+        return self.__hash
+
+    def __repr__(self): return "Requirement.parse(%r)" % str(self)
+
+    @staticmethod
+    def parse(s):
+        reqs = list(parse_requirements(s))
+        if reqs:
+            if len(reqs) == 1:
+                return reqs[0]
+            raise ValueError("Expected only one requirement", s)
+        raise ValueError("No requirements found", s)
+
+state_machine = {
+    #       =><
+    '<': '--T',
+    '<=': 'T-T',
+    '>': 'F+F',
+    '>=': 'T+F',
+    '==': 'T..',
+    '!=': 'F++',
+}
+
+
+def _get_mro(cls):
+    """Get an mro for a type or classic class"""
+    if not isinstance(cls, type):
+        class cls(cls, object): pass
+        return cls.__mro__[1:]
+    return cls.__mro__
+
+def _find_adapter(registry, ob):
+    """Return an adapter factory for `ob` from `registry`"""
+    for t in _get_mro(getattr(ob, '__class__', type(ob))):
+        if t in registry:
+            return registry[t]
+
+
+def ensure_directory(path):
+    """Ensure that the parent directory of `path` exists"""
+    dirname = os.path.dirname(path)
+    if not os.path.isdir(dirname):
+        os.makedirs(dirname)
+
+
+def _bypass_ensure_directory(path, mode=0o777):
+    """Sandbox-bypassing version of ensure_directory()"""
+    if not WRITE_SUPPORT:
+        raise IOError('"os.mkdir" not supported on this platform.')
+    dirname, filename = split(path)
+    if dirname and filename and not isdir(dirname):
+        _bypass_ensure_directory(dirname)
+        mkdir(dirname, mode)
+
+
+def split_sections(s):
+    """Split a string or iterable thereof into (section, content) pairs
+
+    Each ``section`` is a stripped version of the section header ("[section]")
+    and each ``content`` is a list of stripped lines excluding blank lines and
+    comment-only lines.  If there are any such lines before the first section
+    header, they're returned in a first ``section`` of ``None``.
+    """
+    section = None
+    content = []
+    for line in yield_lines(s):
+        if line.startswith("["):
+            if line.endswith("]"):
+                if section or content:
+                    yield section, content
+                section = line[1:-1].strip()
+                content = []
+            else:
+                raise ValueError("Invalid section heading", line)
+        else:
+            content.append(line)
+
+    # wrap up last segment
+    yield section, content
+
+def _mkstemp(*args,**kw):
+    old_open = os.open
+    try:
+        # temporarily bypass sandboxing
+        os.open = os_open
+        return tempfile.mkstemp(*args,**kw)
+    finally:
+        # and then put it back
+        os.open = old_open
+
+
+# Set up global resource manager (deliberately not state-saved)
+_manager = ResourceManager()
+def _initialize(g):
+    for name in dir(_manager):
+        if not name.startswith('_'):
+            g[name] = getattr(_manager, name)
+_initialize(globals())
+
+# Prepare the master working set and make the ``require()`` API available
+working_set = WorkingSet._build_master()
+_declare_state('object', working_set=working_set)
+
+require = working_set.require
+iter_entry_points = working_set.iter_entry_points
+add_activation_listener = working_set.subscribe
+run_script = working_set.run_script
+# backward compatibility
+run_main = run_script
+# Activate all distributions already on sys.path, and ensure that
+# all distributions added to the working set in the future (e.g. by
+# calling ``require()``) will get activated as well.
+add_activation_listener(lambda dist: dist.activate())
+working_set.entries=[]
+# match order
+list(map(working_set.add_entry, sys.path))
diff --git a/lib/platformdirs/__init__.py b/lib/platformdirs/__init__.py
deleted file mode 100644
index afe8351d..00000000
--- a/lib/platformdirs/__init__.py
+++ /dev/null
@@ -1,631 +0,0 @@
-"""
-Utilities for determining application-specific dirs.
-
-See <https://github.com/platformdirs/platformdirs> for details and usage.
-
-"""
-
-from __future__ import annotations
-
-import os
-import sys
-from typing import TYPE_CHECKING
-
-from .api import PlatformDirsABC
-from .version import __version__
-from .version import __version_tuple__ as __version_info__
-
-if TYPE_CHECKING:
-    from pathlib import Path
-    from typing import Literal
-
-if sys.platform == "win32":
-    from platformdirs.windows import Windows as _Result
-elif sys.platform == "darwin":
-    from platformdirs.macos import MacOS as _Result
-else:
-    from platformdirs.unix import Unix as _Result
-
-
-def _set_platform_dir_class() -> type[PlatformDirsABC]:
-    if os.getenv("ANDROID_DATA") == "/data" and os.getenv("ANDROID_ROOT") == "/system":
-        if os.getenv("SHELL") or os.getenv("PREFIX"):
-            return _Result
-
-        from platformdirs.android import _android_folder  # noqa: PLC0415
-
-        if _android_folder() is not None:
-            from platformdirs.android import Android  # noqa: PLC0415
-
-            return Android  # return to avoid redefinition of a result
-
-    return _Result
-
-
-if TYPE_CHECKING:
-    # Work around mypy issue: https://github.com/python/mypy/issues/10962
-    PlatformDirs = _Result
-else:
-    PlatformDirs = _set_platform_dir_class()  #: Currently active platform
-AppDirs = PlatformDirs  #: Backwards compatibility with appdirs
-
-
-def user_data_dir(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    roaming: bool = False,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> str:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
-    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
-    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param roaming: See `roaming <platformdirs.api.PlatformDirsABC.roaming>`.
-    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: data directory tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        roaming=roaming,
-        ensure_exists=ensure_exists,
-    ).user_data_dir
-
-
-def site_data_dir(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    multipath: bool = False,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> str:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
-    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
-    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param multipath: See `roaming <platformdirs.api.PlatformDirsABC.multipath>`.
-    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: data directory shared by users
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        multipath=multipath,
-        ensure_exists=ensure_exists,
-    ).site_data_dir
-
-
-def user_config_dir(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    roaming: bool = False,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> str:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
-    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
-    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param roaming: See `roaming <platformdirs.api.PlatformDirsABC.roaming>`.
-    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: config directory tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        roaming=roaming,
-        ensure_exists=ensure_exists,
-    ).user_config_dir
-
-
-def site_config_dir(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    multipath: bool = False,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> str:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
-    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
-    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param multipath: See `roaming <platformdirs.api.PlatformDirsABC.multipath>`.
-    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: config directory shared by the users
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        multipath=multipath,
-        ensure_exists=ensure_exists,
-    ).site_config_dir
-
-
-def user_cache_dir(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    opinion: bool = True,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> str:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
-    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
-    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param opinion: See `roaming <platformdirs.api.PlatformDirsABC.opinion>`.
-    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: cache directory tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        opinion=opinion,
-        ensure_exists=ensure_exists,
-    ).user_cache_dir
-
-
-def site_cache_dir(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    opinion: bool = True,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> str:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
-    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
-    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param opinion: See `opinion <platformdirs.api.PlatformDirsABC.opinion>`.
-    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: cache directory tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        opinion=opinion,
-        ensure_exists=ensure_exists,
-    ).site_cache_dir
-
-
-def user_state_dir(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    roaming: bool = False,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> str:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
-    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
-    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param roaming: See `roaming <platformdirs.api.PlatformDirsABC.roaming>`.
-    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: state directory tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        roaming=roaming,
-        ensure_exists=ensure_exists,
-    ).user_state_dir
-
-
-def user_log_dir(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    opinion: bool = True,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> str:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
-    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
-    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param opinion: See `roaming <platformdirs.api.PlatformDirsABC.opinion>`.
-    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: log directory tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        opinion=opinion,
-        ensure_exists=ensure_exists,
-    ).user_log_dir
-
-
-def user_documents_dir() -> str:
-    """:returns: documents directory tied to the user"""
-    return PlatformDirs().user_documents_dir
-
-
-def user_downloads_dir() -> str:
-    """:returns: downloads directory tied to the user"""
-    return PlatformDirs().user_downloads_dir
-
-
-def user_pictures_dir() -> str:
-    """:returns: pictures directory tied to the user"""
-    return PlatformDirs().user_pictures_dir
-
-
-def user_videos_dir() -> str:
-    """:returns: videos directory tied to the user"""
-    return PlatformDirs().user_videos_dir
-
-
-def user_music_dir() -> str:
-    """:returns: music directory tied to the user"""
-    return PlatformDirs().user_music_dir
-
-
-def user_desktop_dir() -> str:
-    """:returns: desktop directory tied to the user"""
-    return PlatformDirs().user_desktop_dir
-
-
-def user_runtime_dir(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    opinion: bool = True,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> str:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
-    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
-    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param opinion: See `opinion <platformdirs.api.PlatformDirsABC.opinion>`.
-    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: runtime directory tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        opinion=opinion,
-        ensure_exists=ensure_exists,
-    ).user_runtime_dir
-
-
-def site_runtime_dir(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    opinion: bool = True,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> str:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
-    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
-    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param opinion: See `opinion <platformdirs.api.PlatformDirsABC.opinion>`.
-    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: runtime directory shared by users
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        opinion=opinion,
-        ensure_exists=ensure_exists,
-    ).site_runtime_dir
-
-
-def user_data_path(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    roaming: bool = False,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> Path:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
-    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
-    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param roaming: See `roaming <platformdirs.api.PlatformDirsABC.roaming>`.
-    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: data path tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        roaming=roaming,
-        ensure_exists=ensure_exists,
-    ).user_data_path
-
-
-def site_data_path(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    multipath: bool = False,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> Path:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
-    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
-    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param multipath: See `multipath <platformdirs.api.PlatformDirsABC.multipath>`.
-    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: data path shared by users
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        multipath=multipath,
-        ensure_exists=ensure_exists,
-    ).site_data_path
-
-
-def user_config_path(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    roaming: bool = False,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> Path:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
-    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
-    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param roaming: See `roaming <platformdirs.api.PlatformDirsABC.roaming>`.
-    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: config path tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        roaming=roaming,
-        ensure_exists=ensure_exists,
-    ).user_config_path
-
-
-def site_config_path(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    multipath: bool = False,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> Path:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
-    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
-    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param multipath: See `roaming <platformdirs.api.PlatformDirsABC.multipath>`.
-    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: config path shared by the users
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        multipath=multipath,
-        ensure_exists=ensure_exists,
-    ).site_config_path
-
-
-def site_cache_path(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    opinion: bool = True,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> Path:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
-    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
-    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param opinion: See `opinion <platformdirs.api.PlatformDirsABC.opinion>`.
-    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: cache directory tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        opinion=opinion,
-        ensure_exists=ensure_exists,
-    ).site_cache_path
-
-
-def user_cache_path(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    opinion: bool = True,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> Path:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
-    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
-    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param opinion: See `roaming <platformdirs.api.PlatformDirsABC.opinion>`.
-    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: cache path tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        opinion=opinion,
-        ensure_exists=ensure_exists,
-    ).user_cache_path
-
-
-def user_state_path(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    roaming: bool = False,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> Path:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
-    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
-    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param roaming: See `roaming <platformdirs.api.PlatformDirsABC.roaming>`.
-    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: state path tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        roaming=roaming,
-        ensure_exists=ensure_exists,
-    ).user_state_path
-
-
-def user_log_path(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    opinion: bool = True,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> Path:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
-    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
-    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param opinion: See `roaming <platformdirs.api.PlatformDirsABC.opinion>`.
-    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: log path tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        opinion=opinion,
-        ensure_exists=ensure_exists,
-    ).user_log_path
-
-
-def user_documents_path() -> Path:
-    """:returns: documents a path tied to the user"""
-    return PlatformDirs().user_documents_path
-
-
-def user_downloads_path() -> Path:
-    """:returns: downloads path tied to the user"""
-    return PlatformDirs().user_downloads_path
-
-
-def user_pictures_path() -> Path:
-    """:returns: pictures path tied to the user"""
-    return PlatformDirs().user_pictures_path
-
-
-def user_videos_path() -> Path:
-    """:returns: videos path tied to the user"""
-    return PlatformDirs().user_videos_path
-
-
-def user_music_path() -> Path:
-    """:returns: music path tied to the user"""
-    return PlatformDirs().user_music_path
-
-
-def user_desktop_path() -> Path:
-    """:returns: desktop path tied to the user"""
-    return PlatformDirs().user_desktop_path
-
-
-def user_runtime_path(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    opinion: bool = True,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> Path:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
-    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
-    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param opinion: See `opinion <platformdirs.api.PlatformDirsABC.opinion>`.
-    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: runtime path tied to the user
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        opinion=opinion,
-        ensure_exists=ensure_exists,
-    ).user_runtime_path
-
-
-def site_runtime_path(
-    appname: str | None = None,
-    appauthor: str | None | Literal[False] = None,
-    version: str | None = None,
-    opinion: bool = True,  # noqa: FBT001, FBT002
-    ensure_exists: bool = False,  # noqa: FBT001, FBT002
-) -> Path:
-    """
-    :param appname: See `appname <platformdirs.api.PlatformDirsABC.appname>`.
-    :param appauthor: See `appauthor <platformdirs.api.PlatformDirsABC.appauthor>`.
-    :param version: See `version <platformdirs.api.PlatformDirsABC.version>`.
-    :param opinion: See `opinion <platformdirs.api.PlatformDirsABC.opinion>`.
-    :param ensure_exists: See `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-    :returns: runtime path shared by users
-    """
-    return PlatformDirs(
-        appname=appname,
-        appauthor=appauthor,
-        version=version,
-        opinion=opinion,
-        ensure_exists=ensure_exists,
-    ).site_runtime_path
-
-
-__all__ = [
-    "AppDirs",
-    "PlatformDirs",
-    "PlatformDirsABC",
-    "__version__",
-    "__version_info__",
-    "site_cache_dir",
-    "site_cache_path",
-    "site_config_dir",
-    "site_config_path",
-    "site_data_dir",
-    "site_data_path",
-    "site_runtime_dir",
-    "site_runtime_path",
-    "user_cache_dir",
-    "user_cache_path",
-    "user_config_dir",
-    "user_config_path",
-    "user_data_dir",
-    "user_data_path",
-    "user_desktop_dir",
-    "user_desktop_path",
-    "user_documents_dir",
-    "user_documents_path",
-    "user_downloads_dir",
-    "user_downloads_path",
-    "user_log_dir",
-    "user_log_path",
-    "user_music_dir",
-    "user_music_path",
-    "user_pictures_dir",
-    "user_pictures_path",
-    "user_runtime_dir",
-    "user_runtime_path",
-    "user_state_dir",
-    "user_state_path",
-    "user_videos_dir",
-    "user_videos_path",
-]
diff --git a/lib/platformdirs/__main__.py b/lib/platformdirs/__main__.py
deleted file mode 100644
index 922c5213..00000000
--- a/lib/platformdirs/__main__.py
+++ /dev/null
@@ -1,55 +0,0 @@
-"""Main entry point."""
-
-from __future__ import annotations
-
-from platformdirs import PlatformDirs, __version__
-
-PROPS = (
-    "user_data_dir",
-    "user_config_dir",
-    "user_cache_dir",
-    "user_state_dir",
-    "user_log_dir",
-    "user_documents_dir",
-    "user_downloads_dir",
-    "user_pictures_dir",
-    "user_videos_dir",
-    "user_music_dir",
-    "user_runtime_dir",
-    "site_data_dir",
-    "site_config_dir",
-    "site_cache_dir",
-    "site_runtime_dir",
-)
-
-
-def main() -> None:
-    """Run the main entry point."""
-    app_name = "MyApp"
-    app_author = "MyCompany"
-
-    print(f"-- platformdirs {__version__} --")  # noqa: T201
-
-    print("-- app dirs (with optional 'version')")  # noqa: T201
-    dirs = PlatformDirs(app_name, app_author, version="1.0")
-    for prop in PROPS:
-        print(f"{prop}: {getattr(dirs, prop)}")  # noqa: T201
-
-    print("\n-- app dirs (without optional 'version')")  # noqa: T201
-    dirs = PlatformDirs(app_name, app_author)
-    for prop in PROPS:
-        print(f"{prop}: {getattr(dirs, prop)}")  # noqa: T201
-
-    print("\n-- app dirs (without optional 'appauthor')")  # noqa: T201
-    dirs = PlatformDirs(app_name)
-    for prop in PROPS:
-        print(f"{prop}: {getattr(dirs, prop)}")  # noqa: T201
-
-    print("\n-- app dirs (with disabled 'appauthor')")  # noqa: T201
-    dirs = PlatformDirs(app_name, appauthor=False)
-    for prop in PROPS:
-        print(f"{prop}: {getattr(dirs, prop)}")  # noqa: T201
-
-
-if __name__ == "__main__":
-    main()
diff --git a/lib/platformdirs/android.py b/lib/platformdirs/android.py
deleted file mode 100644
index 7004a852..00000000
--- a/lib/platformdirs/android.py
+++ /dev/null
@@ -1,249 +0,0 @@
-"""Android."""
-
-from __future__ import annotations
-
-import os
-import re
-import sys
-from functools import lru_cache
-from typing import TYPE_CHECKING, cast
-
-from .api import PlatformDirsABC
-
-
-class Android(PlatformDirsABC):
-    """
-    Follows the guidance `from here <https://android.stackexchange.com/a/216132>`_.
-
-    Makes use of the `appname <platformdirs.api.PlatformDirsABC.appname>`, `version
-    <platformdirs.api.PlatformDirsABC.version>`, `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-
-    """
-
-    @property
-    def user_data_dir(self) -> str:
-        """:return: data directory tied to the user, e.g. ``/data/user/<userid>/<packagename>/files/<AppName>``"""
-        return self._append_app_name_and_version(cast(str, _android_folder()), "files")
-
-    @property
-    def site_data_dir(self) -> str:
-        """:return: data directory shared by users, same as `user_data_dir`"""
-        return self.user_data_dir
-
-    @property
-    def user_config_dir(self) -> str:
-        """
-        :return: config directory tied to the user, e.g. \
-        ``/data/user/<userid>/<packagename>/shared_prefs/<AppName>``
-        """
-        return self._append_app_name_and_version(cast(str, _android_folder()), "shared_prefs")
-
-    @property
-    def site_config_dir(self) -> str:
-        """:return: config directory shared by the users, same as `user_config_dir`"""
-        return self.user_config_dir
-
-    @property
-    def user_cache_dir(self) -> str:
-        """:return: cache directory tied to the user, e.g.,``/data/user/<userid>/<packagename>/cache/<AppName>``"""
-        return self._append_app_name_and_version(cast(str, _android_folder()), "cache")
-
-    @property
-    def site_cache_dir(self) -> str:
-        """:return: cache directory shared by users, same as `user_cache_dir`"""
-        return self.user_cache_dir
-
-    @property
-    def user_state_dir(self) -> str:
-        """:return: state directory tied to the user, same as `user_data_dir`"""
-        return self.user_data_dir
-
-    @property
-    def user_log_dir(self) -> str:
-        """
-        :return: log directory tied to the user, same as `user_cache_dir` if not opinionated else ``log`` in it,
-          e.g. ``/data/user/<userid>/<packagename>/cache/<AppName>/log``
-        """
-        path = self.user_cache_dir
-        if self.opinion:
-            path = os.path.join(path, "log")  # noqa: PTH118
-        return path
-
-    @property
-    def user_documents_dir(self) -> str:
-        """:return: documents directory tied to the user e.g. ``/storage/emulated/0/Documents``"""
-        return _android_documents_folder()
-
-    @property
-    def user_downloads_dir(self) -> str:
-        """:return: downloads directory tied to the user e.g. ``/storage/emulated/0/Downloads``"""
-        return _android_downloads_folder()
-
-    @property
-    def user_pictures_dir(self) -> str:
-        """:return: pictures directory tied to the user e.g. ``/storage/emulated/0/Pictures``"""
-        return _android_pictures_folder()
-
-    @property
-    def user_videos_dir(self) -> str:
-        """:return: videos directory tied to the user e.g. ``/storage/emulated/0/DCIM/Camera``"""
-        return _android_videos_folder()
-
-    @property
-    def user_music_dir(self) -> str:
-        """:return: music directory tied to the user e.g. ``/storage/emulated/0/Music``"""
-        return _android_music_folder()
-
-    @property
-    def user_desktop_dir(self) -> str:
-        """:return: desktop directory tied to the user e.g. ``/storage/emulated/0/Desktop``"""
-        return "/storage/emulated/0/Desktop"
-
-    @property
-    def user_runtime_dir(self) -> str:
-        """
-        :return: runtime directory tied to the user, same as `user_cache_dir` if not opinionated else ``tmp`` in it,
-          e.g. ``/data/user/<userid>/<packagename>/cache/<AppName>/tmp``
-        """
-        path = self.user_cache_dir
-        if self.opinion:
-            path = os.path.join(path, "tmp")  # noqa: PTH118
-        return path
-
-    @property
-    def site_runtime_dir(self) -> str:
-        """:return: runtime directory shared by users, same as `user_runtime_dir`"""
-        return self.user_runtime_dir
-
-
-@lru_cache(maxsize=1)
-def _android_folder() -> str | None:  # noqa: C901
-    """:return: base folder for the Android OS or None if it cannot be found"""
-    result: str | None = None
-    # type checker isn't happy with our "import android", just don't do this when type checking see
-    # https://stackoverflow.com/a/61394121
-    if not TYPE_CHECKING:
-        try:
-            # First try to get a path to android app using python4android (if available)...
-            from android import mActivity  # noqa: PLC0415
-
-            context = cast("android.content.Context", mActivity.getApplicationContext())  # noqa: F821
-            result = context.getFilesDir().getParentFile().getAbsolutePath()
-        except Exception:  # noqa: BLE001
-            result = None
-    if result is None:
-        try:
-            # ...and fall back to using plain pyjnius, if python4android isn't available or doesn't deliver any useful
-            # result...
-            from jnius import autoclass  # noqa: PLC0415
-
-            context = autoclass("android.content.Context")
-            result = context.getFilesDir().getParentFile().getAbsolutePath()
-        except Exception:  # noqa: BLE001
-            result = None
-    if result is None:
-        # and if that fails, too, find an android folder looking at path on the sys.path
-        # warning: only works for apps installed under /data, not adopted storage etc.
-        pattern = re.compile(r"/data/(data|user/\d+)/(.+)/files")
-        for path in sys.path:
-            if pattern.match(path):
-                result = path.split("/files")[0]
-                break
-        else:
-            result = None
-    if result is None:
-        # one last try: find an android folder looking at path on the sys.path taking adopted storage paths into
-        # account
-        pattern = re.compile(r"/mnt/expand/[a-fA-F0-9-]{36}/(data|user/\d+)/(.+)/files")
-        for path in sys.path:
-            if pattern.match(path):
-                result = path.split("/files")[0]
-                break
-        else:
-            result = None
-    return result
-
-
-@lru_cache(maxsize=1)
-def _android_documents_folder() -> str:
-    """:return: documents folder for the Android OS"""
-    # Get directories with pyjnius
-    try:
-        from jnius import autoclass  # noqa: PLC0415
-
-        context = autoclass("android.content.Context")
-        environment = autoclass("android.os.Environment")
-        documents_dir: str = context.getExternalFilesDir(environment.DIRECTORY_DOCUMENTS).getAbsolutePath()
-    except Exception:  # noqa: BLE001
-        documents_dir = "/storage/emulated/0/Documents"
-
-    return documents_dir
-
-
-@lru_cache(maxsize=1)
-def _android_downloads_folder() -> str:
-    """:return: downloads folder for the Android OS"""
-    # Get directories with pyjnius
-    try:
-        from jnius import autoclass  # noqa: PLC0415
-
-        context = autoclass("android.content.Context")
-        environment = autoclass("android.os.Environment")
-        downloads_dir: str = context.getExternalFilesDir(environment.DIRECTORY_DOWNLOADS).getAbsolutePath()
-    except Exception:  # noqa: BLE001
-        downloads_dir = "/storage/emulated/0/Downloads"
-
-    return downloads_dir
-
-
-@lru_cache(maxsize=1)
-def _android_pictures_folder() -> str:
-    """:return: pictures folder for the Android OS"""
-    # Get directories with pyjnius
-    try:
-        from jnius import autoclass  # noqa: PLC0415
-
-        context = autoclass("android.content.Context")
-        environment = autoclass("android.os.Environment")
-        pictures_dir: str = context.getExternalFilesDir(environment.DIRECTORY_PICTURES).getAbsolutePath()
-    except Exception:  # noqa: BLE001
-        pictures_dir = "/storage/emulated/0/Pictures"
-
-    return pictures_dir
-
-
-@lru_cache(maxsize=1)
-def _android_videos_folder() -> str:
-    """:return: videos folder for the Android OS"""
-    # Get directories with pyjnius
-    try:
-        from jnius import autoclass  # noqa: PLC0415
-
-        context = autoclass("android.content.Context")
-        environment = autoclass("android.os.Environment")
-        videos_dir: str = context.getExternalFilesDir(environment.DIRECTORY_DCIM).getAbsolutePath()
-    except Exception:  # noqa: BLE001
-        videos_dir = "/storage/emulated/0/DCIM/Camera"
-
-    return videos_dir
-
-
-@lru_cache(maxsize=1)
-def _android_music_folder() -> str:
-    """:return: music folder for the Android OS"""
-    # Get directories with pyjnius
-    try:
-        from jnius import autoclass  # noqa: PLC0415
-
-        context = autoclass("android.content.Context")
-        environment = autoclass("android.os.Environment")
-        music_dir: str = context.getExternalFilesDir(environment.DIRECTORY_MUSIC).getAbsolutePath()
-    except Exception:  # noqa: BLE001
-        music_dir = "/storage/emulated/0/Music"
-
-    return music_dir
-
-
-__all__ = [
-    "Android",
-]
diff --git a/lib/platformdirs/api.py b/lib/platformdirs/api.py
deleted file mode 100644
index 18d660e4..00000000
--- a/lib/platformdirs/api.py
+++ /dev/null
@@ -1,298 +0,0 @@
-"""Base API."""
-
-from __future__ import annotations
-
-import os
-from abc import ABC, abstractmethod
-from pathlib import Path
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from typing import Iterator, Literal
-
-
-class PlatformDirsABC(ABC):  # noqa: PLR0904
-    """Abstract base class for platform directories."""
-
-    def __init__(  # noqa: PLR0913, PLR0917
-        self,
-        appname: str | None = None,
-        appauthor: str | None | Literal[False] = None,
-        version: str | None = None,
-        roaming: bool = False,  # noqa: FBT001, FBT002
-        multipath: bool = False,  # noqa: FBT001, FBT002
-        opinion: bool = True,  # noqa: FBT001, FBT002
-        ensure_exists: bool = False,  # noqa: FBT001, FBT002
-    ) -> None:
-        """
-        Create a new platform directory.
-
-        :param appname: See `appname`.
-        :param appauthor: See `appauthor`.
-        :param version: See `version`.
-        :param roaming: See `roaming`.
-        :param multipath: See `multipath`.
-        :param opinion: See `opinion`.
-        :param ensure_exists: See `ensure_exists`.
-
-        """
-        self.appname = appname  #: The name of application.
-        self.appauthor = appauthor
-        """
-        The name of the app author or distributing body for this application.
-
-        Typically, it is the owning company name. Defaults to `appname`. You may pass ``False`` to disable it.
-
-        """
-        self.version = version
-        """
-        An optional version path element to append to the path.
-
-        You might want to use this if you want multiple versions of your app to be able to run independently. If used,
-        this would typically be ``<major>.<minor>``.
-
-        """
-        self.roaming = roaming
-        """
-        Whether to use the roaming appdata directory on Windows.
-
-        That means that for users on a Windows network setup for roaming profiles, this user data will be synced on
-        login (see
-        `here <https://technet.microsoft.com/en-us/library/cc766489(WS.10).aspx>`_).
-
-        """
-        self.multipath = multipath
-        """
-        An optional parameter which indicates that the entire list of data dirs should be returned.
-
-        By default, the first item would only be returned.
-
-        """
-        self.opinion = opinion  #: A flag to indicating to use opinionated values.
-        self.ensure_exists = ensure_exists
-        """
-        Optionally create the directory (and any missing parents) upon access if it does not exist.
-
-        By default, no directories are created.
-
-        """
-
-    def _append_app_name_and_version(self, *base: str) -> str:
-        params = list(base[1:])
-        if self.appname:
-            params.append(self.appname)
-            if self.version:
-                params.append(self.version)
-        path = os.path.join(base[0], *params)  # noqa: PTH118
-        self._optionally_create_directory(path)
-        return path
-
-    def _optionally_create_directory(self, path: str) -> None:
-        if self.ensure_exists:
-            Path(path).mkdir(parents=True, exist_ok=True)
-
-    def _first_item_as_path_if_multipath(self, directory: str) -> Path:
-        if self.multipath:
-            # If multipath is True, the first path is returned.
-            directory = directory.split(os.pathsep)[0]
-        return Path(directory)
-
-    @property
-    @abstractmethod
-    def user_data_dir(self) -> str:
-        """:return: data directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def site_data_dir(self) -> str:
-        """:return: data directory shared by users"""
-
-    @property
-    @abstractmethod
-    def user_config_dir(self) -> str:
-        """:return: config directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def site_config_dir(self) -> str:
-        """:return: config directory shared by the users"""
-
-    @property
-    @abstractmethod
-    def user_cache_dir(self) -> str:
-        """:return: cache directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def site_cache_dir(self) -> str:
-        """:return: cache directory shared by users"""
-
-    @property
-    @abstractmethod
-    def user_state_dir(self) -> str:
-        """:return: state directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def user_log_dir(self) -> str:
-        """:return: log directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def user_documents_dir(self) -> str:
-        """:return: documents directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def user_downloads_dir(self) -> str:
-        """:return: downloads directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def user_pictures_dir(self) -> str:
-        """:return: pictures directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def user_videos_dir(self) -> str:
-        """:return: videos directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def user_music_dir(self) -> str:
-        """:return: music directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def user_desktop_dir(self) -> str:
-        """:return: desktop directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def user_runtime_dir(self) -> str:
-        """:return: runtime directory tied to the user"""
-
-    @property
-    @abstractmethod
-    def site_runtime_dir(self) -> str:
-        """:return: runtime directory shared by users"""
-
-    @property
-    def user_data_path(self) -> Path:
-        """:return: data path tied to the user"""
-        return Path(self.user_data_dir)
-
-    @property
-    def site_data_path(self) -> Path:
-        """:return: data path shared by users"""
-        return Path(self.site_data_dir)
-
-    @property
-    def user_config_path(self) -> Path:
-        """:return: config path tied to the user"""
-        return Path(self.user_config_dir)
-
-    @property
-    def site_config_path(self) -> Path:
-        """:return: config path shared by the users"""
-        return Path(self.site_config_dir)
-
-    @property
-    def user_cache_path(self) -> Path:
-        """:return: cache path tied to the user"""
-        return Path(self.user_cache_dir)
-
-    @property
-    def site_cache_path(self) -> Path:
-        """:return: cache path shared by users"""
-        return Path(self.site_cache_dir)
-
-    @property
-    def user_state_path(self) -> Path:
-        """:return: state path tied to the user"""
-        return Path(self.user_state_dir)
-
-    @property
-    def user_log_path(self) -> Path:
-        """:return: log path tied to the user"""
-        return Path(self.user_log_dir)
-
-    @property
-    def user_documents_path(self) -> Path:
-        """:return: documents a path tied to the user"""
-        return Path(self.user_documents_dir)
-
-    @property
-    def user_downloads_path(self) -> Path:
-        """:return: downloads path tied to the user"""
-        return Path(self.user_downloads_dir)
-
-    @property
-    def user_pictures_path(self) -> Path:
-        """:return: pictures path tied to the user"""
-        return Path(self.user_pictures_dir)
-
-    @property
-    def user_videos_path(self) -> Path:
-        """:return: videos path tied to the user"""
-        return Path(self.user_videos_dir)
-
-    @property
-    def user_music_path(self) -> Path:
-        """:return: music path tied to the user"""
-        return Path(self.user_music_dir)
-
-    @property
-    def user_desktop_path(self) -> Path:
-        """:return: desktop path tied to the user"""
-        return Path(self.user_desktop_dir)
-
-    @property
-    def user_runtime_path(self) -> Path:
-        """:return: runtime path tied to the user"""
-        return Path(self.user_runtime_dir)
-
-    @property
-    def site_runtime_path(self) -> Path:
-        """:return: runtime path shared by users"""
-        return Path(self.site_runtime_dir)
-
-    def iter_config_dirs(self) -> Iterator[str]:
-        """:yield: all user and site configuration directories."""
-        yield self.user_config_dir
-        yield self.site_config_dir
-
-    def iter_data_dirs(self) -> Iterator[str]:
-        """:yield: all user and site data directories."""
-        yield self.user_data_dir
-        yield self.site_data_dir
-
-    def iter_cache_dirs(self) -> Iterator[str]:
-        """:yield: all user and site cache directories."""
-        yield self.user_cache_dir
-        yield self.site_cache_dir
-
-    def iter_runtime_dirs(self) -> Iterator[str]:
-        """:yield: all user and site runtime directories."""
-        yield self.user_runtime_dir
-        yield self.site_runtime_dir
-
-    def iter_config_paths(self) -> Iterator[Path]:
-        """:yield: all user and site configuration paths."""
-        for path in self.iter_config_dirs():
-            yield Path(path)
-
-    def iter_data_paths(self) -> Iterator[Path]:
-        """:yield: all user and site data paths."""
-        for path in self.iter_data_dirs():
-            yield Path(path)
-
-    def iter_cache_paths(self) -> Iterator[Path]:
-        """:yield: all user and site cache paths."""
-        for path in self.iter_cache_dirs():
-            yield Path(path)
-
-    def iter_runtime_paths(self) -> Iterator[Path]:
-        """:yield: all user and site runtime paths."""
-        for path in self.iter_runtime_dirs():
-            yield Path(path)
diff --git a/lib/platformdirs/macos.py b/lib/platformdirs/macos.py
deleted file mode 100644
index e4b0391a..00000000
--- a/lib/platformdirs/macos.py
+++ /dev/null
@@ -1,144 +0,0 @@
-"""macOS."""
-
-from __future__ import annotations
-
-import os.path
-import sys
-from typing import TYPE_CHECKING
-
-from .api import PlatformDirsABC
-
-if TYPE_CHECKING:
-    from pathlib import Path
-
-
-class MacOS(PlatformDirsABC):
-    """
-    Platform directories for the macOS operating system.
-
-    Follows the guidance from
-    `Apple documentation <https://developer.apple.com/library/archive/documentation/FileManagement/Conceptual/FileSystemProgrammingGuide/MacOSXDirectories/MacOSXDirectories.html>`_.
-    Makes use of the `appname <platformdirs.api.PlatformDirsABC.appname>`,
-    `version <platformdirs.api.PlatformDirsABC.version>`,
-    `ensure_exists <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-
-    """
-
-    @property
-    def user_data_dir(self) -> str:
-        """:return: data directory tied to the user, e.g. ``~/Library/Application Support/$appname/$version``"""
-        return self._append_app_name_and_version(os.path.expanduser("~/Library/Application Support"))  # noqa: PTH111
-
-    @property
-    def site_data_dir(self) -> str:
-        """
-        :return: data directory shared by users, e.g. ``/Library/Application Support/$appname/$version``.
-          If we're using a Python binary managed by `Homebrew <https://brew.sh>`_, the directory
-          will be under the Homebrew prefix, e.g. ``/opt/homebrew/share/$appname/$version``.
-          If `multipath <platformdirs.api.PlatformDirsABC.multipath>` is enabled, and we're in Homebrew,
-          the response is a multi-path string separated by ":", e.g.
-          ``/opt/homebrew/share/$appname/$version:/Library/Application Support/$appname/$version``
-        """
-        is_homebrew = sys.prefix.startswith("/opt/homebrew")
-        path_list = [self._append_app_name_and_version("/opt/homebrew/share")] if is_homebrew else []
-        path_list.append(self._append_app_name_and_version("/Library/Application Support"))
-        if self.multipath:
-            return os.pathsep.join(path_list)
-        return path_list[0]
-
-    @property
-    def site_data_path(self) -> Path:
-        """:return: data path shared by users. Only return the first item, even if ``multipath`` is set to ``True``"""
-        return self._first_item_as_path_if_multipath(self.site_data_dir)
-
-    @property
-    def user_config_dir(self) -> str:
-        """:return: config directory tied to the user, same as `user_data_dir`"""
-        return self.user_data_dir
-
-    @property
-    def site_config_dir(self) -> str:
-        """:return: config directory shared by the users, same as `site_data_dir`"""
-        return self.site_data_dir
-
-    @property
-    def user_cache_dir(self) -> str:
-        """:return: cache directory tied to the user, e.g. ``~/Library/Caches/$appname/$version``"""
-        return self._append_app_name_and_version(os.path.expanduser("~/Library/Caches"))  # noqa: PTH111
-
-    @property
-    def site_cache_dir(self) -> str:
-        """
-        :return: cache directory shared by users, e.g. ``/Library/Caches/$appname/$version``.
-          If we're using a Python binary managed by `Homebrew <https://brew.sh>`_, the directory
-          will be under the Homebrew prefix, e.g. ``/opt/homebrew/var/cache/$appname/$version``.
-          If `multipath <platformdirs.api.PlatformDirsABC.multipath>` is enabled, and we're in Homebrew,
-          the response is a multi-path string separated by ":", e.g.
-          ``/opt/homebrew/var/cache/$appname/$version:/Library/Caches/$appname/$version``
-        """
-        is_homebrew = sys.prefix.startswith("/opt/homebrew")
-        path_list = [self._append_app_name_and_version("/opt/homebrew/var/cache")] if is_homebrew else []
-        path_list.append(self._append_app_name_and_version("/Library/Caches"))
-        if self.multipath:
-            return os.pathsep.join(path_list)
-        return path_list[0]
-
-    @property
-    def site_cache_path(self) -> Path:
-        """:return: cache path shared by users. Only return the first item, even if ``multipath`` is set to ``True``"""
-        return self._first_item_as_path_if_multipath(self.site_cache_dir)
-
-    @property
-    def user_state_dir(self) -> str:
-        """:return: state directory tied to the user, same as `user_data_dir`"""
-        return self.user_data_dir
-
-    @property
-    def user_log_dir(self) -> str:
-        """:return: log directory tied to the user, e.g. ``~/Library/Logs/$appname/$version``"""
-        return self._append_app_name_and_version(os.path.expanduser("~/Library/Logs"))  # noqa: PTH111
-
-    @property
-    def user_documents_dir(self) -> str:
-        """:return: documents directory tied to the user, e.g. ``~/Documents``"""
-        return os.path.expanduser("~/Documents")  # noqa: PTH111
-
-    @property
-    def user_downloads_dir(self) -> str:
-        """:return: downloads directory tied to the user, e.g. ``~/Downloads``"""
-        return os.path.expanduser("~/Downloads")  # noqa: PTH111
-
-    @property
-    def user_pictures_dir(self) -> str:
-        """:return: pictures directory tied to the user, e.g. ``~/Pictures``"""
-        return os.path.expanduser("~/Pictures")  # noqa: PTH111
-
-    @property
-    def user_videos_dir(self) -> str:
-        """:return: videos directory tied to the user, e.g. ``~/Movies``"""
-        return os.path.expanduser("~/Movies")  # noqa: PTH111
-
-    @property
-    def user_music_dir(self) -> str:
-        """:return: music directory tied to the user, e.g. ``~/Music``"""
-        return os.path.expanduser("~/Music")  # noqa: PTH111
-
-    @property
-    def user_desktop_dir(self) -> str:
-        """:return: desktop directory tied to the user, e.g. ``~/Desktop``"""
-        return os.path.expanduser("~/Desktop")  # noqa: PTH111
-
-    @property
-    def user_runtime_dir(self) -> str:
-        """:return: runtime directory tied to the user, e.g. ``~/Library/Caches/TemporaryItems/$appname/$version``"""
-        return self._append_app_name_and_version(os.path.expanduser("~/Library/Caches/TemporaryItems"))  # noqa: PTH111
-
-    @property
-    def site_runtime_dir(self) -> str:
-        """:return: runtime directory shared by users, same as `user_runtime_dir`"""
-        return self.user_runtime_dir
-
-
-__all__ = [
-    "MacOS",
-]
diff --git a/lib/platformdirs/py.typed b/lib/platformdirs/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/platformdirs/unix.py b/lib/platformdirs/unix.py
deleted file mode 100644
index f1942e92..00000000
--- a/lib/platformdirs/unix.py
+++ /dev/null
@@ -1,269 +0,0 @@
-"""Unix."""
-
-from __future__ import annotations
-
-import os
-import sys
-from configparser import ConfigParser
-from pathlib import Path
-from typing import Iterator, NoReturn
-
-from .api import PlatformDirsABC
-
-if sys.platform == "win32":
-
-    def getuid() -> NoReturn:
-        msg = "should only be used on Unix"
-        raise RuntimeError(msg)
-
-else:
-    from os import getuid
-
-
-class Unix(PlatformDirsABC):  # noqa: PLR0904
-    """
-    On Unix/Linux, we follow the `XDG Basedir Spec <https://specifications.freedesktop.org/basedir-spec/basedir-spec-
-    latest.html>`_.
-
-    The spec allows overriding directories with environment variables. The examples shown are the default values,
-    alongside the name of the environment variable that overrides them. Makes use of the `appname
-    <platformdirs.api.PlatformDirsABC.appname>`, `version <platformdirs.api.PlatformDirsABC.version>`, `multipath
-    <platformdirs.api.PlatformDirsABC.multipath>`, `opinion <platformdirs.api.PlatformDirsABC.opinion>`, `ensure_exists
-    <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-
-    """
-
-    @property
-    def user_data_dir(self) -> str:
-        """
-        :return: data directory tied to the user, e.g. ``~/.local/share/$appname/$version`` or
-         ``$XDG_DATA_HOME/$appname/$version``
-        """
-        path = os.environ.get("XDG_DATA_HOME", "")
-        if not path.strip():
-            path = os.path.expanduser("~/.local/share")  # noqa: PTH111
-        return self._append_app_name_and_version(path)
-
-    @property
-    def _site_data_dirs(self) -> list[str]:
-        path = os.environ.get("XDG_DATA_DIRS", "")
-        if not path.strip():
-            path = f"/usr/local/share{os.pathsep}/usr/share"
-        return [self._append_app_name_and_version(p) for p in path.split(os.pathsep)]
-
-    @property
-    def site_data_dir(self) -> str:
-        """
-        :return: data directories shared by users (if `multipath <platformdirs.api.PlatformDirsABC.multipath>` is
-         enabled and ``XDG_DATA_DIRS`` is set and a multi path the response is also a multi path separated by the
-         OS path separator), e.g. ``/usr/local/share/$appname/$version`` or ``/usr/share/$appname/$version``
-        """
-        # XDG default for $XDG_DATA_DIRS; only first, if multipath is False
-        dirs = self._site_data_dirs
-        if not self.multipath:
-            return dirs[0]
-        return os.pathsep.join(dirs)
-
-    @property
-    def user_config_dir(self) -> str:
-        """
-        :return: config directory tied to the user, e.g. ``~/.config/$appname/$version`` or
-         ``$XDG_CONFIG_HOME/$appname/$version``
-        """
-        path = os.environ.get("XDG_CONFIG_HOME", "")
-        if not path.strip():
-            path = os.path.expanduser("~/.config")  # noqa: PTH111
-        return self._append_app_name_and_version(path)
-
-    @property
-    def _site_config_dirs(self) -> list[str]:
-        path = os.environ.get("XDG_CONFIG_DIRS", "")
-        if not path.strip():
-            path = "/etc/xdg"
-        return [self._append_app_name_and_version(p) for p in path.split(os.pathsep)]
-
-    @property
-    def site_config_dir(self) -> str:
-        """
-        :return: config directories shared by users (if `multipath <platformdirs.api.PlatformDirsABC.multipath>`
-         is enabled and ``XDG_CONFIG_DIRS`` is set and a multi path the response is also a multi path separated by
-         the OS path separator), e.g. ``/etc/xdg/$appname/$version``
-        """
-        # XDG default for $XDG_CONFIG_DIRS only first, if multipath is False
-        dirs = self._site_config_dirs
-        if not self.multipath:
-            return dirs[0]
-        return os.pathsep.join(dirs)
-
-    @property
-    def user_cache_dir(self) -> str:
-        """
-        :return: cache directory tied to the user, e.g. ``~/.cache/$appname/$version`` or
-         ``~/$XDG_CACHE_HOME/$appname/$version``
-        """
-        path = os.environ.get("XDG_CACHE_HOME", "")
-        if not path.strip():
-            path = os.path.expanduser("~/.cache")  # noqa: PTH111
-        return self._append_app_name_and_version(path)
-
-    @property
-    def site_cache_dir(self) -> str:
-        """:return: cache directory shared by users, e.g. ``/var/cache/$appname/$version``"""
-        return self._append_app_name_and_version("/var/cache")
-
-    @property
-    def user_state_dir(self) -> str:
-        """
-        :return: state directory tied to the user, e.g. ``~/.local/state/$appname/$version`` or
-         ``$XDG_STATE_HOME/$appname/$version``
-        """
-        path = os.environ.get("XDG_STATE_HOME", "")
-        if not path.strip():
-            path = os.path.expanduser("~/.local/state")  # noqa: PTH111
-        return self._append_app_name_and_version(path)
-
-    @property
-    def user_log_dir(self) -> str:
-        """:return: log directory tied to the user, same as `user_state_dir` if not opinionated else ``log`` in it"""
-        path = self.user_state_dir
-        if self.opinion:
-            path = os.path.join(path, "log")  # noqa: PTH118
-            self._optionally_create_directory(path)
-        return path
-
-    @property
-    def user_documents_dir(self) -> str:
-        """:return: documents directory tied to the user, e.g. ``~/Documents``"""
-        return _get_user_media_dir("XDG_DOCUMENTS_DIR", "~/Documents")
-
-    @property
-    def user_downloads_dir(self) -> str:
-        """:return: downloads directory tied to the user, e.g. ``~/Downloads``"""
-        return _get_user_media_dir("XDG_DOWNLOAD_DIR", "~/Downloads")
-
-    @property
-    def user_pictures_dir(self) -> str:
-        """:return: pictures directory tied to the user, e.g. ``~/Pictures``"""
-        return _get_user_media_dir("XDG_PICTURES_DIR", "~/Pictures")
-
-    @property
-    def user_videos_dir(self) -> str:
-        """:return: videos directory tied to the user, e.g. ``~/Videos``"""
-        return _get_user_media_dir("XDG_VIDEOS_DIR", "~/Videos")
-
-    @property
-    def user_music_dir(self) -> str:
-        """:return: music directory tied to the user, e.g. ``~/Music``"""
-        return _get_user_media_dir("XDG_MUSIC_DIR", "~/Music")
-
-    @property
-    def user_desktop_dir(self) -> str:
-        """:return: desktop directory tied to the user, e.g. ``~/Desktop``"""
-        return _get_user_media_dir("XDG_DESKTOP_DIR", "~/Desktop")
-
-    @property
-    def user_runtime_dir(self) -> str:
-        """
-        :return: runtime directory tied to the user, e.g. ``/run/user/$(id -u)/$appname/$version`` or
-         ``$XDG_RUNTIME_DIR/$appname/$version``.
-
-         For FreeBSD/OpenBSD/NetBSD, it would return ``/var/run/user/$(id -u)/$appname/$version`` if
-         exists, otherwise ``/tmp/runtime-$(id -u)/$appname/$version``, if``$XDG_RUNTIME_DIR``
-         is not set.
-        """
-        path = os.environ.get("XDG_RUNTIME_DIR", "")
-        if not path.strip():
-            if sys.platform.startswith(("freebsd", "openbsd", "netbsd")):
-                path = f"/var/run/user/{getuid()}"
-                if not Path(path).exists():
-                    path = f"/tmp/runtime-{getuid()}"  # noqa: S108
-            else:
-                path = f"/run/user/{getuid()}"
-        return self._append_app_name_and_version(path)
-
-    @property
-    def site_runtime_dir(self) -> str:
-        """
-        :return: runtime directory shared by users, e.g. ``/run/$appname/$version`` or \
-        ``$XDG_RUNTIME_DIR/$appname/$version``.
-
-        Note that this behaves almost exactly like `user_runtime_dir` if ``$XDG_RUNTIME_DIR`` is set, but will
-        fall back to paths associated to the root user instead of a regular logged-in user if it's not set.
-
-        If you wish to ensure that a logged-in root user path is returned e.g. ``/run/user/0``, use `user_runtime_dir`
-        instead.
-
-        For FreeBSD/OpenBSD/NetBSD, it would return ``/var/run/$appname/$version`` if ``$XDG_RUNTIME_DIR`` is not set.
-        """
-        path = os.environ.get("XDG_RUNTIME_DIR", "")
-        if not path.strip():
-            if sys.platform.startswith(("freebsd", "openbsd", "netbsd")):
-                path = "/var/run"
-            else:
-                path = "/run"
-        return self._append_app_name_and_version(path)
-
-    @property
-    def site_data_path(self) -> Path:
-        """:return: data path shared by users. Only return the first item, even if ``multipath`` is set to ``True``"""
-        return self._first_item_as_path_if_multipath(self.site_data_dir)
-
-    @property
-    def site_config_path(self) -> Path:
-        """:return: config path shared by the users, returns the first item, even if ``multipath`` is set to ``True``"""
-        return self._first_item_as_path_if_multipath(self.site_config_dir)
-
-    @property
-    def site_cache_path(self) -> Path:
-        """:return: cache path shared by users. Only return the first item, even if ``multipath`` is set to ``True``"""
-        return self._first_item_as_path_if_multipath(self.site_cache_dir)
-
-    def iter_config_dirs(self) -> Iterator[str]:
-        """:yield: all user and site configuration directories."""
-        yield self.user_config_dir
-        yield from self._site_config_dirs
-
-    def iter_data_dirs(self) -> Iterator[str]:
-        """:yield: all user and site data directories."""
-        yield self.user_data_dir
-        yield from self._site_data_dirs
-
-
-def _get_user_media_dir(env_var: str, fallback_tilde_path: str) -> str:
-    media_dir = _get_user_dirs_folder(env_var)
-    if media_dir is None:
-        media_dir = os.environ.get(env_var, "").strip()
-        if not media_dir:
-            media_dir = os.path.expanduser(fallback_tilde_path)  # noqa: PTH111
-
-    return media_dir
-
-
-def _get_user_dirs_folder(key: str) -> str | None:
-    """
-    Return directory from user-dirs.dirs config file.
-
-    See https://freedesktop.org/wiki/Software/xdg-user-dirs/.
-
-    """
-    user_dirs_config_path = Path(Unix().user_config_dir) / "user-dirs.dirs"
-    if user_dirs_config_path.exists():
-        parser = ConfigParser()
-
-        with user_dirs_config_path.open() as stream:
-            # Add fake section header, so ConfigParser doesn't complain
-            parser.read_string(f"[top]\n{stream.read()}")
-
-        if key not in parser["top"]:
-            return None
-
-        path = parser["top"][key].strip('"')
-        # Handle relative home paths
-        return path.replace("$HOME", os.path.expanduser("~"))  # noqa: PTH111
-
-    return None
-
-
-__all__ = [
-    "Unix",
-]
diff --git a/lib/platformdirs/version.py b/lib/platformdirs/version.py
deleted file mode 100644
index afb49243..00000000
--- a/lib/platformdirs/version.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# file generated by setuptools_scm
-# don't change, don't track in version control
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple, Union
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-else:
-    VERSION_TUPLE = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-
-__version__ = version = '4.3.6'
-__version_tuple__ = version_tuple = (4, 3, 6)
diff --git a/lib/platformdirs/windows.py b/lib/platformdirs/windows.py
deleted file mode 100644
index d7bc9609..00000000
--- a/lib/platformdirs/windows.py
+++ /dev/null
@@ -1,272 +0,0 @@
-"""Windows."""
-
-from __future__ import annotations
-
-import os
-import sys
-from functools import lru_cache
-from typing import TYPE_CHECKING
-
-from .api import PlatformDirsABC
-
-if TYPE_CHECKING:
-    from collections.abc import Callable
-
-
-class Windows(PlatformDirsABC):
-    """
-    `MSDN on where to store app data files <https://learn.microsoft.com/en-us/windows/win32/shell/knownfolderid>`_.
-
-    Makes use of the `appname <platformdirs.api.PlatformDirsABC.appname>`, `appauthor
-    <platformdirs.api.PlatformDirsABC.appauthor>`, `version <platformdirs.api.PlatformDirsABC.version>`, `roaming
-    <platformdirs.api.PlatformDirsABC.roaming>`, `opinion <platformdirs.api.PlatformDirsABC.opinion>`, `ensure_exists
-    <platformdirs.api.PlatformDirsABC.ensure_exists>`.
-
-    """
-
-    @property
-    def user_data_dir(self) -> str:
-        """
-        :return: data directory tied to the user, e.g.
-         ``%USERPROFILE%\\AppData\\Local\\$appauthor\\$appname`` (not roaming) or
-         ``%USERPROFILE%\\AppData\\Roaming\\$appauthor\\$appname`` (roaming)
-        """
-        const = "CSIDL_APPDATA" if self.roaming else "CSIDL_LOCAL_APPDATA"
-        path = os.path.normpath(get_win_folder(const))
-        return self._append_parts(path)
-
-    def _append_parts(self, path: str, *, opinion_value: str | None = None) -> str:
-        params = []
-        if self.appname:
-            if self.appauthor is not False:
-                author = self.appauthor or self.appname
-                params.append(author)
-            params.append(self.appname)
-            if opinion_value is not None and self.opinion:
-                params.append(opinion_value)
-            if self.version:
-                params.append(self.version)
-        path = os.path.join(path, *params)  # noqa: PTH118
-        self._optionally_create_directory(path)
-        return path
-
-    @property
-    def site_data_dir(self) -> str:
-        """:return: data directory shared by users, e.g. ``C:\\ProgramData\\$appauthor\\$appname``"""
-        path = os.path.normpath(get_win_folder("CSIDL_COMMON_APPDATA"))
-        return self._append_parts(path)
-
-    @property
-    def user_config_dir(self) -> str:
-        """:return: config directory tied to the user, same as `user_data_dir`"""
-        return self.user_data_dir
-
-    @property
-    def site_config_dir(self) -> str:
-        """:return: config directory shared by the users, same as `site_data_dir`"""
-        return self.site_data_dir
-
-    @property
-    def user_cache_dir(self) -> str:
-        """
-        :return: cache directory tied to the user (if opinionated with ``Cache`` folder within ``$appname``) e.g.
-         ``%USERPROFILE%\\AppData\\Local\\$appauthor\\$appname\\Cache\\$version``
-        """
-        path = os.path.normpath(get_win_folder("CSIDL_LOCAL_APPDATA"))
-        return self._append_parts(path, opinion_value="Cache")
-
-    @property
-    def site_cache_dir(self) -> str:
-        """:return: cache directory shared by users, e.g. ``C:\\ProgramData\\$appauthor\\$appname\\Cache\\$version``"""
-        path = os.path.normpath(get_win_folder("CSIDL_COMMON_APPDATA"))
-        return self._append_parts(path, opinion_value="Cache")
-
-    @property
-    def user_state_dir(self) -> str:
-        """:return: state directory tied to the user, same as `user_data_dir`"""
-        return self.user_data_dir
-
-    @property
-    def user_log_dir(self) -> str:
-        """:return: log directory tied to the user, same as `user_data_dir` if not opinionated else ``Logs`` in it"""
-        path = self.user_data_dir
-        if self.opinion:
-            path = os.path.join(path, "Logs")  # noqa: PTH118
-            self._optionally_create_directory(path)
-        return path
-
-    @property
-    def user_documents_dir(self) -> str:
-        """:return: documents directory tied to the user e.g. ``%USERPROFILE%\\Documents``"""
-        return os.path.normpath(get_win_folder("CSIDL_PERSONAL"))
-
-    @property
-    def user_downloads_dir(self) -> str:
-        """:return: downloads directory tied to the user e.g. ``%USERPROFILE%\\Downloads``"""
-        return os.path.normpath(get_win_folder("CSIDL_DOWNLOADS"))
-
-    @property
-    def user_pictures_dir(self) -> str:
-        """:return: pictures directory tied to the user e.g. ``%USERPROFILE%\\Pictures``"""
-        return os.path.normpath(get_win_folder("CSIDL_MYPICTURES"))
-
-    @property
-    def user_videos_dir(self) -> str:
-        """:return: videos directory tied to the user e.g. ``%USERPROFILE%\\Videos``"""
-        return os.path.normpath(get_win_folder("CSIDL_MYVIDEO"))
-
-    @property
-    def user_music_dir(self) -> str:
-        """:return: music directory tied to the user e.g. ``%USERPROFILE%\\Music``"""
-        return os.path.normpath(get_win_folder("CSIDL_MYMUSIC"))
-
-    @property
-    def user_desktop_dir(self) -> str:
-        """:return: desktop directory tied to the user, e.g. ``%USERPROFILE%\\Desktop``"""
-        return os.path.normpath(get_win_folder("CSIDL_DESKTOPDIRECTORY"))
-
-    @property
-    def user_runtime_dir(self) -> str:
-        """
-        :return: runtime directory tied to the user, e.g.
-         ``%USERPROFILE%\\AppData\\Local\\Temp\\$appauthor\\$appname``
-        """
-        path = os.path.normpath(os.path.join(get_win_folder("CSIDL_LOCAL_APPDATA"), "Temp"))  # noqa: PTH118
-        return self._append_parts(path)
-
-    @property
-    def site_runtime_dir(self) -> str:
-        """:return: runtime directory shared by users, same as `user_runtime_dir`"""
-        return self.user_runtime_dir
-
-
-def get_win_folder_from_env_vars(csidl_name: str) -> str:
-    """Get folder from environment variables."""
-    result = get_win_folder_if_csidl_name_not_env_var(csidl_name)
-    if result is not None:
-        return result
-
-    env_var_name = {
-        "CSIDL_APPDATA": "APPDATA",
-        "CSIDL_COMMON_APPDATA": "ALLUSERSPROFILE",
-        "CSIDL_LOCAL_APPDATA": "LOCALAPPDATA",
-    }.get(csidl_name)
-    if env_var_name is None:
-        msg = f"Unknown CSIDL name: {csidl_name}"
-        raise ValueError(msg)
-    result = os.environ.get(env_var_name)
-    if result is None:
-        msg = f"Unset environment variable: {env_var_name}"
-        raise ValueError(msg)
-    return result
-
-
-def get_win_folder_if_csidl_name_not_env_var(csidl_name: str) -> str | None:
-    """Get a folder for a CSIDL name that does not exist as an environment variable."""
-    if csidl_name == "CSIDL_PERSONAL":
-        return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Documents")  # noqa: PTH118
-
-    if csidl_name == "CSIDL_DOWNLOADS":
-        return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Downloads")  # noqa: PTH118
-
-    if csidl_name == "CSIDL_MYPICTURES":
-        return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Pictures")  # noqa: PTH118
-
-    if csidl_name == "CSIDL_MYVIDEO":
-        return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Videos")  # noqa: PTH118
-
-    if csidl_name == "CSIDL_MYMUSIC":
-        return os.path.join(os.path.normpath(os.environ["USERPROFILE"]), "Music")  # noqa: PTH118
-    return None
-
-
-def get_win_folder_from_registry(csidl_name: str) -> str:
-    """
-    Get folder from the registry.
-
-    This is a fallback technique at best. I'm not sure if using the registry for these guarantees us the correct answer
-    for all CSIDL_* names.
-
-    """
-    shell_folder_name = {
-        "CSIDL_APPDATA": "AppData",
-        "CSIDL_COMMON_APPDATA": "Common AppData",
-        "CSIDL_LOCAL_APPDATA": "Local AppData",
-        "CSIDL_PERSONAL": "Personal",
-        "CSIDL_DOWNLOADS": "{374DE290-123F-4565-9164-39C4925E467B}",
-        "CSIDL_MYPICTURES": "My Pictures",
-        "CSIDL_MYVIDEO": "My Video",
-        "CSIDL_MYMUSIC": "My Music",
-    }.get(csidl_name)
-    if shell_folder_name is None:
-        msg = f"Unknown CSIDL name: {csidl_name}"
-        raise ValueError(msg)
-    if sys.platform != "win32":  # only needed for mypy type checker to know that this code runs only on Windows
-        raise NotImplementedError
-    import winreg  # noqa: PLC0415
-
-    key = winreg.OpenKey(winreg.HKEY_CURRENT_USER, r"Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders")
-    directory, _ = winreg.QueryValueEx(key, shell_folder_name)
-    return str(directory)
-
-
-def get_win_folder_via_ctypes(csidl_name: str) -> str:
-    """Get folder with ctypes."""
-    # There is no 'CSIDL_DOWNLOADS'.
-    # Use 'CSIDL_PROFILE' (40) and append the default folder 'Downloads' instead.
-    # https://learn.microsoft.com/en-us/windows/win32/shell/knownfolderid
-
-    import ctypes  # noqa: PLC0415
-
-    csidl_const = {
-        "CSIDL_APPDATA": 26,
-        "CSIDL_COMMON_APPDATA": 35,
-        "CSIDL_LOCAL_APPDATA": 28,
-        "CSIDL_PERSONAL": 5,
-        "CSIDL_MYPICTURES": 39,
-        "CSIDL_MYVIDEO": 14,
-        "CSIDL_MYMUSIC": 13,
-        "CSIDL_DOWNLOADS": 40,
-        "CSIDL_DESKTOPDIRECTORY": 16,
-    }.get(csidl_name)
-    if csidl_const is None:
-        msg = f"Unknown CSIDL name: {csidl_name}"
-        raise ValueError(msg)
-
-    buf = ctypes.create_unicode_buffer(1024)
-    windll = getattr(ctypes, "windll")  # noqa: B009 # using getattr to avoid false positive with mypy type checker
-    windll.shell32.SHGetFolderPathW(None, csidl_const, None, 0, buf)
-
-    # Downgrade to short path name if it has high-bit chars.
-    if any(ord(c) > 255 for c in buf):  # noqa: PLR2004
-        buf2 = ctypes.create_unicode_buffer(1024)
-        if windll.kernel32.GetShortPathNameW(buf.value, buf2, 1024):
-            buf = buf2
-
-    if csidl_name == "CSIDL_DOWNLOADS":
-        return os.path.join(buf.value, "Downloads")  # noqa: PTH118
-
-    return buf.value
-
-
-def _pick_get_win_folder() -> Callable[[str], str]:
-    try:
-        import ctypes  # noqa: PLC0415
-    except ImportError:
-        pass
-    else:
-        if hasattr(ctypes, "windll"):
-            return get_win_folder_via_ctypes
-    try:
-        import winreg  # noqa: PLC0415, F401
-    except ImportError:
-        return get_win_folder_from_env_vars
-    else:
-        return get_win_folder_from_registry
-
-
-get_win_folder = lru_cache(maxsize=None)(_pick_get_win_folder())
-
-__all__ = [
-    "Windows",
-]
diff --git a/lib/plexapi/__init__.py b/lib/plexapi/__init__.py
deleted file mode 100644
index 1d4fb471..00000000
--- a/lib/plexapi/__init__.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging
-import os
-from logging.handlers import RotatingFileHandler
-from platform import uname
-from uuid import getnode
-
-from plexapi.config import PlexConfig, reset_base_headers
-import plexapi.const as const
-from plexapi.utils import SecretsFilter
-
-# Load User Defined Config
-DEFAULT_CONFIG_PATH = os.path.expanduser('~/.config/plexapi/config.ini')
-CONFIG_PATH = os.environ.get('PLEXAPI_CONFIG_PATH', DEFAULT_CONFIG_PATH)
-CONFIG = PlexConfig(CONFIG_PATH)
-
-# PlexAPI Settings
-PROJECT = 'PlexAPI'
-VERSION = __version__ = const.__version__
-TIMEOUT = CONFIG.get('plexapi.timeout', 30, int)
-X_PLEX_CONTAINER_SIZE = CONFIG.get('plexapi.container_size', 100, int)
-X_PLEX_ENABLE_FAST_CONNECT = CONFIG.get('plexapi.enable_fast_connect', False, bool)
-
-# Plex Header Configuration
-X_PLEX_PROVIDES = CONFIG.get('header.provides', 'controller')
-X_PLEX_PLATFORM = CONFIG.get('header.platform', uname()[0])
-X_PLEX_PLATFORM_VERSION = CONFIG.get('header.platform_version', uname()[2])
-X_PLEX_PRODUCT = CONFIG.get('header.product', PROJECT)
-X_PLEX_VERSION = CONFIG.get('header.version', VERSION)
-X_PLEX_DEVICE = CONFIG.get('header.device', X_PLEX_PLATFORM)
-X_PLEX_DEVICE_NAME = CONFIG.get('header.device_name', uname()[1])
-X_PLEX_IDENTIFIER = CONFIG.get('header.identifier', str(hex(getnode())))
-X_PLEX_LANGUAGE = CONFIG.get('header.language', 'en')
-BASE_HEADERS = reset_base_headers()
-
-# Logging Configuration
-log = logging.getLogger('plexapi')
-logfile = CONFIG.get('log.path')
-logformat = CONFIG.get('log.format', '%(asctime)s %(module)12s:%(lineno)-4s %(levelname)-9s %(message)s')
-loglevel = CONFIG.get('log.level', 'INFO').upper()
-loghandler = logging.NullHandler()
-
-if logfile:  # pragma: no cover
-    logbackups = CONFIG.get('log.backup_count', 3, int)
-    logbytes = CONFIG.get('log.rotate_bytes', 512000, int)
-    loghandler = RotatingFileHandler(os.path.expanduser(logfile), 'a', logbytes, logbackups)
-
-loghandler.setFormatter(logging.Formatter(logformat))
-log.addHandler(loghandler)
-log.setLevel(loglevel)
-logfilter = SecretsFilter()
-if CONFIG.get('log.show_secrets', '').lower() != 'true':
-    log.addFilter(logfilter)
diff --git a/lib/plexapi/alert.py b/lib/plexapi/alert.py
deleted file mode 100644
index 2d6a18e8..00000000
--- a/lib/plexapi/alert.py
+++ /dev/null
@@ -1,97 +0,0 @@
-# -*- coding: utf-8 -*-
-import json
-import socket
-from typing import Callable
-import threading
-
-from plexapi import log
-
-
-class AlertListener(threading.Thread):
-    """ Creates a websocket connection to the PlexServer to optionally receive alert notifications.
-        These often include messages from Plex about media scans as well as updates to currently running
-        Transcode Sessions. This class implements threading.Thread, therefore to start monitoring
-        alerts you must call .start() on the object once it's created. When calling
-        `PlexServer.startAlertListener()`, the thread will be started for you.
-
-        Known `state`-values for timeline entries, with identifier=`com.plexapp.plugins.library`:
-
-            :0: The item was created
-            :1: Reporting progress on item processing
-            :2: Matching the item
-            :3: Downloading the metadata
-            :4: Processing downloaded metadata
-            :5: The item processed
-            :9: The item deleted
-
-        When metadata agent is not set for the library processing ends with state=1.
-
-        Parameters:
-            server (:class:`~plexapi.server.PlexServer`): PlexServer this listener is connected to.
-            callback (func): Callback function to call on received messages. The callback function
-                will be sent a single argument 'data' which will contain a dictionary of data
-                received from the server. :samp:`def my_callback(data): ...`
-            callbackError (func): Callback function to call on errors. The callback function
-                will be sent a single argument 'error' which will contain the Error object.
-                :samp:`def my_callback(error): ...`
-            ws_socket (socket): Socket to use for the connection. If not specified, a new socket will be created.
-    """
-    key = '/:/websockets/notifications'
-
-    def __init__(self, server, callback: Callable = None, callbackError: Callable = None, ws_socket: socket = None):
-        super(AlertListener, self).__init__()
-        self.daemon = True
-        self._server = server
-        self._callback = callback
-        self._callbackError = callbackError
-        self._socket = ws_socket
-        self._ws = None
-
-    def run(self):
-        try:
-            import websocket
-        except ImportError:
-            log.warning("Can't use the AlertListener without websocket")
-            return
-        # create the websocket connection
-        url = self._server.url(self.key, includeToken=True).replace('http', 'ws')
-        log.info('Starting AlertListener: %s', url)
-
-        self._ws = websocket.WebSocketApp(url, on_message=self._onMessage, on_error=self._onError, socket=self._socket)
-
-        self._ws.run_forever()
-
-    def stop(self):
-        """ Stop the AlertListener thread. Once the notifier is stopped, it cannot be directly
-            started again. You must call :func:`~plexapi.server.PlexServer.startAlertListener`
-            from a PlexServer instance.
-        """
-        log.info('Stopping AlertListener.')
-        self._ws.close()
-
-    def _onMessage(self, *args):
-        """ Called when websocket message is received.
-
-            We are assuming the last argument in the tuple is the message.
-        """
-        message = args[-1]
-        try:
-            data = json.loads(message)['NotificationContainer']
-            log.debug('Alert: %s %s %s', *data)
-            if self._callback:
-                self._callback(data)
-        except Exception as err:  # pragma: no cover
-            log.error('AlertListener Msg Error: %s', err)
-
-    def _onError(self, *args):  # pragma: no cover
-        """ Called when websocket error is received.
-
-            We are assuming the last argument in the tuple is the message.
-        """
-        err = args[-1]
-        try:
-            log.error('AlertListener Error: %s', err)
-            if self._callbackError:
-                self._callbackError(err)
-        except Exception as err:  # pragma: no cover
-            log.error('AlertListener Error: Error: %s', err)
diff --git a/lib/plexapi/audio.py b/lib/plexapi/audio.py
deleted file mode 100644
index 3bc6f514..00000000
--- a/lib/plexapi/audio.py
+++ /dev/null
@@ -1,686 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import annotations
-
-import os
-from pathlib import Path
-from urllib.parse import quote_plus
-
-from typing import Any, Dict, List, Optional, TypeVar
-
-from plexapi import media, utils
-from plexapi.base import Playable, PlexPartialObject, PlexHistory, PlexSession, cached_data_property
-from plexapi.exceptions import BadRequest
-from plexapi.mixins import (
-    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, PlayedUnplayedMixin, RatingMixin,
-    ArtUrlMixin, ArtMixin, PosterUrlMixin, PosterMixin, ThemeMixin, ThemeUrlMixin,
-    ArtistEditMixins, AlbumEditMixins, TrackEditMixins
-)
-from plexapi.playlist import Playlist
-
-
-TAudio = TypeVar("TAudio", bound="Audio")
-TTrack = TypeVar("TTrack", bound="Track")
-
-
-class Audio(PlexPartialObject, PlayedUnplayedMixin):
-    """ Base class for all audio objects including :class:`~plexapi.audio.Artist`,
-        :class:`~plexapi.audio.Album`, and :class:`~plexapi.audio.Track`.
-
-        Attributes:
-            addedAt (datetime): Datetime the item was added to the library.
-            art (str): URL to artwork image (/library/metadata/<ratingKey>/art/<artid>).
-            artBlurHash (str): BlurHash string for artwork image.
-            distance (float): Sonic Distance of the item from the seed item.
-            fields (List<:class:`~plexapi.media.Field`>): List of field objects.
-            guid (str): Plex GUID for the artist, album, or track (plex://artist/5d07bcb0403c64029053ac4c).
-            images (List<:class:`~plexapi.media.Image`>): List of image objects.
-            index (int): Plex index number (often the track number).
-            key (str): API URL (/library/metadata/<ratingkey>).
-            lastRatedAt (datetime): Datetime the item was last rated.
-            lastViewedAt (datetime): Datetime the item was last played.
-            librarySectionID (int): :class:`~plexapi.library.LibrarySection` ID.
-            librarySectionKey (str): :class:`~plexapi.library.LibrarySection` key.
-            librarySectionTitle (str): :class:`~plexapi.library.LibrarySection` title.
-            listType (str): Hardcoded as 'audio' (useful for search filters).
-            moods (List<:class:`~plexapi.media.Mood`>): List of mood objects.
-            musicAnalysisVersion (int): The Plex music analysis version for the item.
-            ratingKey (int): Unique key identifying the item.
-            summary (str): Summary of the artist, album, or track.
-            thumb (str): URL to thumbnail image (/library/metadata/<ratingKey>/thumb/<thumbid>).
-            thumbBlurHash (str): BlurHash string for thumbnail image.
-            title (str): Name of the artist, album, or track (Jason Mraz, We Sing, Lucky, etc.).
-            titleSort (str): Title to use when sorting (defaults to title).
-            type (str): 'artist', 'album', or 'track'.
-            updatedAt (datetime): Datetime the item was updated.
-            userRating (float): Rating of the item (0.0 - 10.0) equaling (0 stars - 5 stars).
-            viewCount (int): Count of times the item was played.
-    """
-    METADATA_TYPE = 'track'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.addedAt = utils.toDatetime(data.attrib.get('addedAt'))
-        self.art = data.attrib.get('art')
-        self.artBlurHash = data.attrib.get('artBlurHash')
-        self.distance = utils.cast(float, data.attrib.get('distance'))
-        self.guid = data.attrib.get('guid')
-        self.index = utils.cast(int, data.attrib.get('index'))
-        self.key = data.attrib.get('key', '')
-        self.lastRatedAt = utils.toDatetime(data.attrib.get('lastRatedAt'))
-        self.lastViewedAt = utils.toDatetime(data.attrib.get('lastViewedAt'))
-        self.librarySectionID = utils.cast(int, data.attrib.get('librarySectionID'))
-        self.librarySectionKey = data.attrib.get('librarySectionKey')
-        self.librarySectionTitle = data.attrib.get('librarySectionTitle')
-        self.listType = 'audio'
-        self.musicAnalysisVersion = utils.cast(int, data.attrib.get('musicAnalysisVersion'))
-        self.ratingKey = utils.cast(int, data.attrib.get('ratingKey'))
-        self.summary = data.attrib.get('summary')
-        self.thumb = data.attrib.get('thumb')
-        self.thumbBlurHash = data.attrib.get('thumbBlurHash')
-        self.title = data.attrib.get('title')
-        self.titleSort = data.attrib.get('titleSort', self.title)
-        self.type = data.attrib.get('type')
-        self.updatedAt = utils.toDatetime(data.attrib.get('updatedAt'))
-        self.userRating = utils.cast(float, data.attrib.get('userRating'))
-        self.viewCount = utils.cast(int, data.attrib.get('viewCount', 0))
-
-    @cached_data_property
-    def fields(self):
-        return self.findItems(self._data, media.Field)
-
-    @cached_data_property
-    def images(self):
-        return self.findItems(self._data, media.Image)
-
-    @cached_data_property
-    def moods(self):
-        return self.findItems(self._data, media.Mood)
-
-    def url(self, part):
-        """ Returns the full URL for the audio item. Typically used for getting a specific track. """
-        return self._server.url(part, includeToken=True) if part else None
-
-    def _defaultSyncTitle(self):
-        """ Returns str, default title for a new syncItem. """
-        return self.title
-
-    @property
-    def hasSonicAnalysis(self):
-        """ Returns True if the audio has been sonically analyzed. """
-        return self.musicAnalysisVersion == 1
-
-    def sync(self, bitrate, client=None, clientId=None, limit=None, title=None):
-        """ Add current audio (artist, album or track) as sync item for specified device.
-            See :func:`~plexapi.myplex.MyPlexAccount.sync` for possible exceptions.
-
-            Parameters:
-                bitrate (int): maximum bitrate for synchronized music, better use one of MUSIC_BITRATE_* values from the
-                               module :mod:`~plexapi.sync`.
-                client (:class:`~plexapi.myplex.MyPlexDevice`): sync destination, see
-                                                               :func:`~plexapi.myplex.MyPlexAccount.sync`.
-                clientId (str): sync destination, see :func:`~plexapi.myplex.MyPlexAccount.sync`.
-                limit (int): maximum count of items to sync, unlimited if `None`.
-                title (str): descriptive title for the new :class:`~plexapi.sync.SyncItem`, if empty the value would be
-                             generated from metadata of current media.
-
-            Returns:
-                :class:`~plexapi.sync.SyncItem`: an instance of created syncItem.
-        """
-
-        from plexapi.sync import SyncItem, Policy, MediaSettings
-
-        myplex = self._server.myPlexAccount()
-        sync_item = SyncItem(self._server, None)
-        sync_item.title = title if title else self._defaultSyncTitle()
-        sync_item.rootTitle = self.title
-        sync_item.contentType = self.listType
-        sync_item.metadataType = self.METADATA_TYPE
-        sync_item.machineIdentifier = self._server.machineIdentifier
-
-        section = self._server.library.sectionByID(self.librarySectionID)
-
-        sync_item.location = f'library://{section.uuid}/item/{quote_plus(self.key)}'
-        sync_item.policy = Policy.create(limit)
-        sync_item.mediaSettings = MediaSettings.createMusic(bitrate)
-
-        return myplex.sync(sync_item, client=client, clientId=clientId)
-
-    def sonicallySimilar(
-        self: TAudio,
-        limit: Optional[int] = None,
-        maxDistance: Optional[float] = None,
-        **kwargs,
-    ) -> List[TAudio]:
-        """Returns a list of sonically similar audio items.
-
-        Parameters:
-            limit (int): Maximum count of items to return. Default 50 (server default)
-            maxDistance (float): Maximum distance between tracks, 0.0 - 1.0. Default 0.25 (server default).
-            **kwargs: Additional options passed into :func:`~plexapi.base.PlexObject.fetchItems`.
-
-        Returns:
-            List[:class:`~plexapi.audio.Audio`]: list of sonically similar audio items.
-        """
-
-        key = f"{self.key}/nearest"
-        params: Dict[str, Any] = {}
-        if limit is not None:
-            params['limit'] = limit
-        if maxDistance is not None:
-            params['maxDistance'] = maxDistance
-        key += utils.joinArgs(params)
-
-        return self.fetchItems(
-            key,
-            cls=type(self),
-            **kwargs,
-        )
-
-
-@utils.registerPlexObject
-class Artist(
-    Audio,
-    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, RatingMixin,
-    ArtMixin, PosterMixin, ThemeMixin,
-    ArtistEditMixins
-):
-    """ Represents a single Artist.
-
-        Attributes:
-            TAG (str): 'Directory'
-            TYPE (str): 'artist'
-            albumSort (int): Setting that indicates how albums are sorted for the artist
-                (-1 = Library default, 0 = Newest first, 1 = Oldest first, 2 = By name).
-            audienceRating (float): Audience rating.
-            collections (List<:class:`~plexapi.media.Collection`>): List of collection objects.
-            countries (List<:class:`~plexapi.media.Country`>): List country objects.
-            genres (List<:class:`~plexapi.media.Genre`>): List of genre objects.
-            guids (List<:class:`~plexapi.media.Guid`>): List of guid objects.
-            key (str): API URL (/library/metadata/<ratingkey>).
-            labels (List<:class:`~plexapi.media.Label`>): List of label objects.
-            locations (List<str>): List of folder paths where the artist is found on disk.
-            rating (float): Artist rating (7.9; 9.8; 8.1).
-            similar (List<:class:`~plexapi.media.Similar`>): List of similar objects.
-            styles (List<:class:`~plexapi.media.Style`>): List of style objects.
-            theme (str): URL to theme resource (/library/metadata/<ratingkey>/theme/<themeid>).
-            ultraBlurColors (:class:`~plexapi.media.UltraBlurColors`): Ultra blur color object.
-    """
-    TAG = 'Directory'
-    TYPE = 'artist'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        Audio._loadData(self, data)
-        self.albumSort = utils.cast(int, data.attrib.get('albumSort', '-1'))
-        self.audienceRating = utils.cast(float, data.attrib.get('audienceRating'))
-        self.key = self.key.replace('/children', '')  # FIX_BUG_50
-        self.rating = utils.cast(float, data.attrib.get('rating'))
-        self.theme = data.attrib.get('theme')
-
-    @cached_data_property
-    def collections(self):
-        return self.findItems(self._data, media.Collection)
-
-    @cached_data_property
-    def countries(self):
-        return self.findItems(self._data, media.Country)
-
-    @cached_data_property
-    def genres(self):
-        return self.findItems(self._data, media.Genre)
-
-    @cached_data_property
-    def guids(self):
-        return self.findItems(self._data, media.Guid)
-
-    @cached_data_property
-    def labels(self):
-        return self.findItems(self._data, media.Label)
-
-    @cached_data_property
-    def locations(self):
-        return self.listAttrs(self._data, 'path', etag='Location')
-
-    @cached_data_property
-    def similar(self):
-        return self.findItems(self._data, media.Similar)
-
-    @cached_data_property
-    def styles(self):
-        return self.findItems(self._data, media.Style)
-
-    @cached_data_property
-    def ultraBlurColors(self):
-        return self.findItem(self._data, media.UltraBlurColors)
-
-    def __iter__(self):
-        for album in self.albums():
-            yield album
-
-    def album(self, title):
-        """ Returns the :class:`~plexapi.audio.Album` that matches the specified title.
-
-            Parameters:
-                title (str): Title of the album to return.
-        """
-        return self.section().get(
-            title=title,
-            libtype='album',
-            filters={'artist.id': self.ratingKey}
-        )
-
-    def albums(self, **kwargs):
-        """ Returns a list of :class:`~plexapi.audio.Album` objects by the artist. """
-        return self.section().search(
-            libtype='album',
-            filters={**kwargs.pop('filters', {}), 'artist.id': self.ratingKey},
-            **kwargs
-        )
-
-    def track(self, title=None, album=None, track=None):
-        """ Returns the :class:`~plexapi.audio.Track` that matches the specified title.
-
-            Parameters:
-                title (str): Title of the track to return.
-                album (str): Album name (default: None; required if title not specified).
-                track (int): Track number (default: None; required if title not specified).
-
-            Raises:
-                :exc:`~plexapi.exceptions.BadRequest`: If title or album and track parameters are missing.
-        """
-        key = f'{self.key}/allLeaves'
-        if title is not None:
-            return self.fetchItem(key, Track, title__iexact=title)
-        elif album is not None and track is not None:
-            return self.fetchItem(key, Track, parentTitle__iexact=album, index=track)
-        raise BadRequest('Missing argument: title or album and track are required')
-
-    def tracks(self, **kwargs):
-        """ Returns a list of :class:`~plexapi.audio.Track` objects by the artist. """
-        key = f'{self.key}/allLeaves'
-        return self.fetchItems(key, Track, **kwargs)
-
-    def get(self, title=None, album=None, track=None):
-        """ Alias of :func:`~plexapi.audio.Artist.track`. """
-        return self.track(title, album, track)
-
-    def download(self, savepath=None, keep_original_name=False, subfolders=False, **kwargs):
-        """ Download all tracks from the artist. See :func:`~plexapi.base.Playable.download` for details.
-
-            Parameters:
-                savepath (str): Defaults to current working dir.
-                keep_original_name (bool): True to keep the original filename otherwise
-                    a friendlier filename is generated.
-                subfolders (bool): True to separate tracks in to album folders.
-                **kwargs: Additional options passed into :func:`~plexapi.base.PlexObject.getStreamURL`.
-        """
-        filepaths = []
-        for track in self.tracks():
-            _savepath = os.path.join(savepath, track.parentTitle) if subfolders else savepath
-            filepaths += track.download(_savepath, keep_original_name, **kwargs)
-        return filepaths
-
-    def popularTracks(self):
-        """ Returns a list of :class:`~plexapi.audio.Track` popular tracks by the artist. """
-        filters = {
-            'album.subformat!': 'Compilation,Live',
-            'artist.id': self.ratingKey,
-            'group': 'title',
-            'ratingCount>>': 0,
-        }
-        return self.section().search(
-            libtype='track',
-            filters=filters,
-            sort='ratingCount:desc',
-            limit=100
-        )
-
-    def station(self):
-        """ Returns a :class:`~plexapi.playlist.Playlist` artist radio station or `None`. """
-        key = f'{self.key}?includeStations=1'
-        return next(iter(self.fetchItems(key, cls=Playlist, rtag="Stations")), None)
-
-    @property
-    def metadataDirectory(self):
-        """ Returns the Plex Media Server data directory where the metadata is stored. """
-        guid_hash = utils.sha1hash(self.guid)
-        return str(Path('Metadata') / 'Artists' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
-
-
-@utils.registerPlexObject
-class Album(
-    Audio,
-    SplitMergeMixin, UnmatchMatchMixin, RatingMixin,
-    ArtMixin, PosterMixin, ThemeUrlMixin,
-    AlbumEditMixins
-):
-    """ Represents a single Album.
-
-        Attributes:
-            TAG (str): 'Directory'
-            TYPE (str): 'album'
-            audienceRating (float): Audience rating.
-            collections (List<:class:`~plexapi.media.Collection`>): List of collection objects.
-            formats (List<:class:`~plexapi.media.Format`>): List of format objects.
-            genres (List<:class:`~plexapi.media.Genre`>): List of genre objects.
-            guids (List<:class:`~plexapi.media.Guid`>): List of guid objects.
-            key (str): API URL (/library/metadata/<ratingkey>).
-            labels (List<:class:`~plexapi.media.Label`>): List of label objects.
-            leafCount (int): Number of items in the album view.
-            loudnessAnalysisVersion (int): The Plex loudness analysis version level.
-            originallyAvailableAt (datetime): Datetime the album was released.
-            parentGuid (str): Plex GUID for the album artist (plex://artist/5d07bcb0403c64029053ac4c).
-            parentKey (str): API URL of the album artist (/library/metadata/<parentRatingKey>).
-            parentRatingKey (int): Unique key identifying the album artist.
-            parentTheme (str): URL to artist theme resource (/library/metadata/<parentRatingkey>/theme/<themeid>).
-            parentThumb (str): URL to album artist thumbnail image (/library/metadata/<parentRatingKey>/thumb/<thumbid>).
-            parentTitle (str): Name of the album artist.
-            rating (float): Album rating (7.9; 9.8; 8.1).
-            studio (str): Studio that released the album.
-            styles (List<:class:`~plexapi.media.Style`>): List of style objects.
-            subformats (List<:class:`~plexapi.media.Subformat`>): List of subformat objects.
-            ultraBlurColors (:class:`~plexapi.media.UltraBlurColors`): Ultra blur color object.
-            viewedLeafCount (int): Number of items marked as played in the album view.
-            year (int): Year the album was released.
-    """
-    TAG = 'Directory'
-    TYPE = 'album'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        Audio._loadData(self, data)
-        self.audienceRating = utils.cast(float, data.attrib.get('audienceRating'))
-        self.key = self.key.replace('/children', '')  # FIX_BUG_50
-        self.leafCount = utils.cast(int, data.attrib.get('leafCount'))
-        self.loudnessAnalysisVersion = utils.cast(int, data.attrib.get('loudnessAnalysisVersion'))
-        self.originallyAvailableAt = utils.toDatetime(data.attrib.get('originallyAvailableAt'), '%Y-%m-%d')
-        self.parentGuid = data.attrib.get('parentGuid')
-        self.parentKey = data.attrib.get('parentKey')
-        self.parentRatingKey = utils.cast(int, data.attrib.get('parentRatingKey'))
-        self.parentTheme = data.attrib.get('parentTheme')
-        self.parentThumb = data.attrib.get('parentThumb')
-        self.parentTitle = data.attrib.get('parentTitle')
-        self.rating = utils.cast(float, data.attrib.get('rating'))
-        self.studio = data.attrib.get('studio')
-        self.viewedLeafCount = utils.cast(int, data.attrib.get('viewedLeafCount'))
-        self.year = utils.cast(int, data.attrib.get('year'))
-
-    @cached_data_property
-    def collections(self):
-        return self.findItems(self._data, media.Collection)
-
-    @cached_data_property
-    def formats(self):
-        return self.findItems(self._data, media.Format)
-
-    @cached_data_property
-    def genres(self):
-        return self.findItems(self._data, media.Genre)
-
-    @cached_data_property
-    def guids(self):
-        return self.findItems(self._data, media.Guid)
-
-    @cached_data_property
-    def labels(self):
-        return self.findItems(self._data, media.Label)
-
-    @cached_data_property
-    def styles(self):
-        return self.findItems(self._data, media.Style)
-
-    @cached_data_property
-    def subformats(self):
-        return self.findItems(self._data, media.Subformat)
-
-    @cached_data_property
-    def ultraBlurColors(self):
-        return self.findItem(self._data, media.UltraBlurColors)
-
-    def __iter__(self):
-        for track in self.tracks():
-            yield track
-
-    def track(self, title=None, track=None):
-        """ Returns the :class:`~plexapi.audio.Track` that matches the specified title.
-
-            Parameters:
-                title (str): Title of the track to return.
-                track (int): Track number (default: None; required if title not specified).
-
-            Raises:
-                :exc:`~plexapi.exceptions.BadRequest`: If title or track parameter is missing.
-        """
-        key = f'{self.key}/children'
-        if title is not None and not isinstance(title, int):
-            return self.fetchItem(key, Track, title__iexact=title)
-        elif track is not None or isinstance(title, int):
-            if isinstance(title, int):
-                index = title
-            else:
-                index = track
-            return self.fetchItem(key, Track, parentTitle__iexact=self.title, index=index)
-        raise BadRequest('Missing argument: title or track is required')
-
-    def tracks(self, **kwargs):
-        """ Returns a list of :class:`~plexapi.audio.Track` objects in the album. """
-        key = f'{self.key}/children'
-        return self.fetchItems(key, Track, **kwargs)
-
-    def get(self, title=None, track=None):
-        """ Alias of :func:`~plexapi.audio.Album.track`. """
-        return self.track(title, track)
-
-    def artist(self):
-        """ Return the album's :class:`~plexapi.audio.Artist`. """
-        return self.fetchItem(self.parentKey)
-
-    def download(self, savepath=None, keep_original_name=False, **kwargs):
-        """ Download all tracks from the album. See :func:`~plexapi.base.Playable.download` for details.
-
-            Parameters:
-                savepath (str): Defaults to current working dir.
-                keep_original_name (bool): True to keep the original filename otherwise
-                    a friendlier filename is generated.
-                **kwargs: Additional options passed into :func:`~plexapi.base.PlexObject.getStreamURL`.
-        """
-        filepaths = []
-        for track in self.tracks():
-            filepaths += track.download(savepath, keep_original_name, **kwargs)
-        return filepaths
-
-    def _defaultSyncTitle(self):
-        """ Returns str, default title for a new syncItem. """
-        return f'{self.parentTitle} - {self.title}'
-
-    @property
-    def metadataDirectory(self):
-        """ Returns the Plex Media Server data directory where the metadata is stored. """
-        guid_hash = utils.sha1hash(self.guid)
-        return str(Path('Metadata') / 'Albums' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
-
-
-@utils.registerPlexObject
-class Track(
-    Audio, Playable,
-    ExtrasMixin, RatingMixin,
-    ArtUrlMixin, PosterUrlMixin, ThemeUrlMixin,
-    TrackEditMixins
-):
-    """ Represents a single Track.
-
-        Attributes:
-            TAG (str): 'Directory'
-            TYPE (str): 'track'
-            audienceRating (float): Audience rating.
-            chapters (List<:class:`~plexapi.media.Chapter`>): List of Chapter objects.
-            chapterSource (str): Unknown
-            collections (List<:class:`~plexapi.media.Collection`>): List of collection objects.
-            duration (int): Length of the track in milliseconds.
-            genres (List<:class:`~plexapi.media.Genre`>): List of genre objects.
-            grandparentArt (str): URL to album artist artwork (/library/metadata/<grandparentRatingKey>/art/<artid>).
-            grandparentGuid (str): Plex GUID for the album artist (plex://artist/5d07bcb0403c64029053ac4c).
-            grandparentKey (str): API URL of the album artist (/library/metadata/<grandparentRatingKey>).
-            grandparentRatingKey (int): Unique key identifying the album artist.
-            grandparentTheme (str): URL to artist theme resource  (/library/metadata/<grandparentRatingkey>/theme/<themeid>).
-                (/library/metadata/<grandparentRatingkey>/theme/<themeid>).
-            grandparentThumb (str): URL to album artist thumbnail image
-                (/library/metadata/<grandparentRatingKey>/thumb/<thumbid>).
-            grandparentTitle (str): Name of the album artist for the track.
-            guids (List<:class:`~plexapi.media.Guid`>): List of guid objects.
-            labels (List<:class:`~plexapi.media.Label`>): List of label objects.
-            media (List<:class:`~plexapi.media.Media`>): List of media objects.
-            originalTitle (str): The artist for the track.
-            parentGuid (str): Plex GUID for the album (plex://album/5d07cd8e403c640290f180f9).
-            parentIndex (int): Disc number of the track.
-            parentKey (str): API URL of the album (/library/metadata/<parentRatingKey>).
-            parentRatingKey (int): Unique key identifying the album.
-            parentThumb (str): URL to album thumbnail image (/library/metadata/<parentRatingKey>/thumb/<thumbid>).
-            parentTitle (str): Name of the album for the track.
-            primaryExtraKey (str) API URL for the primary extra for the track.
-            rating (float): Track rating (7.9; 9.8; 8.1).
-            ratingCount (int): Number of listeners who have scrobbled this track, as reported by Last.fm.
-            skipCount (int): Number of times the track has been skipped.
-            sourceURI (str): Remote server URI (server://<machineIdentifier>/com.plexapp.plugins.library)
-                (remote playlist item only).
-            viewOffset (int): View offset in milliseconds.
-            year (int): Year the track was released.
-    """
-    TAG = 'Track'
-    TYPE = 'track'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        Audio._loadData(self, data)
-        Playable._loadData(self, data)
-        self.audienceRating = utils.cast(float, data.attrib.get('audienceRating'))
-        self.chapterSource = data.attrib.get('chapterSource')
-        self.duration = utils.cast(int, data.attrib.get('duration'))
-        self.grandparentArt = data.attrib.get('grandparentArt')
-        self.grandparentGuid = data.attrib.get('grandparentGuid')
-        self.grandparentKey = data.attrib.get('grandparentKey')
-        self.grandparentRatingKey = utils.cast(int, data.attrib.get('grandparentRatingKey'))
-        self.grandparentTheme = data.attrib.get('grandparentTheme')
-        self.grandparentThumb = data.attrib.get('grandparentThumb')
-        self.grandparentTitle = data.attrib.get('grandparentTitle')
-        self.originalTitle = data.attrib.get('originalTitle')
-        self.parentGuid = data.attrib.get('parentGuid')
-        self.parentIndex = utils.cast(int, data.attrib.get('parentIndex'))
-        self.parentKey = data.attrib.get('parentKey')
-        self.parentRatingKey = utils.cast(int, data.attrib.get('parentRatingKey'))
-        self.parentThumb = data.attrib.get('parentThumb')
-        self.parentTitle = data.attrib.get('parentTitle')
-        self.primaryExtraKey = data.attrib.get('primaryExtraKey')
-        self.rating = utils.cast(float, data.attrib.get('rating'))
-        self.ratingCount = utils.cast(int, data.attrib.get('ratingCount'))
-        self.skipCount = utils.cast(int, data.attrib.get('skipCount'))
-        self.sourceURI = data.attrib.get('source')  # remote playlist item
-        self.viewOffset = utils.cast(int, data.attrib.get('viewOffset', 0))
-        self.year = utils.cast(int, data.attrib.get('year'))
-
-    @cached_data_property
-    def chapters(self):
-        return self.findItems(self._data, media.Chapter)
-
-    @cached_data_property
-    def collections(self):
-        return self.findItems(self._data, media.Collection)
-
-    @cached_data_property
-    def genres(self):
-        return self.findItems(self._data, media.Genre)
-
-    @cached_data_property
-    def guids(self):
-        return self.findItems(self._data, media.Guid)
-
-    @cached_data_property
-    def labels(self):
-        return self.findItems(self._data, media.Label)
-
-    @cached_data_property
-    def media(self):
-        return self.findItems(self._data, media.Media)
-
-    @property
-    def locations(self):
-        """ This does not exist in plex xml response but is added to have a common
-            interface to get the locations of the track.
-
-            Returns:
-                List<str> of file paths where the track is found on disk.
-        """
-        return [part.file for part in self.iterParts() if part]
-
-    @property
-    def trackNumber(self):
-        """ Returns the track number. """
-        return self.index
-
-    def _prettyfilename(self):
-        """ Returns a filename for use in download. """
-        return f'{self.grandparentTitle} - {self.parentTitle} - {str(self.trackNumber).zfill(2)} - {self.title}'
-
-    def album(self):
-        """ Return the track's :class:`~plexapi.audio.Album`. """
-        return self.fetchItem(self.parentKey)
-
-    def artist(self):
-        """ Return the track's :class:`~plexapi.audio.Artist`. """
-        return self.fetchItem(self.grandparentKey)
-
-    def _defaultSyncTitle(self):
-        """ Returns str, default title for a new syncItem. """
-        return f'{self.grandparentTitle} - {self.parentTitle} - {self.title}'
-
-    def _getWebURL(self, base=None):
-        """ Get the Plex Web URL with the correct parameters. """
-        return self._server._buildWebURL(base=base, endpoint='details', key=self.parentKey)
-
-    @property
-    def metadataDirectory(self):
-        """ Returns the Plex Media Server data directory where the metadata is stored. """
-        guid_hash = utils.sha1hash(self.parentGuid)
-        return str(Path('Metadata') / 'Albums' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
-
-    def sonicAdventure(
-        self: TTrack,
-        to: TTrack,
-        **kwargs: Any,
-    ) -> list[TTrack]:
-        """Returns a sonic adventure from the current track to the specified track.
-
-        Parameters:
-            to (:class:`~plexapi.audio.Track`): The target track for the sonic adventure.
-            **kwargs: Additional options passed into :func:`~plexapi.library.MusicSection.sonicAdventure`.
-
-        Returns:
-            List[:class:`~plexapi.audio.Track`]: list of tracks in the sonic adventure.
-        """
-        return self.section().sonicAdventure(self, to, **kwargs)
-
-
-@utils.registerPlexObject
-class TrackSession(PlexSession, Track):
-    """ Represents a single Track session
-        loaded from :func:`~plexapi.server.PlexServer.sessions`.
-    """
-    _SESSIONTYPE = True
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        Track._loadData(self, data)
-        PlexSession._loadData(self, data)
-
-
-@utils.registerPlexObject
-class TrackHistory(PlexHistory, Track):
-    """ Represents a single Track history entry
-        loaded from :func:`~plexapi.server.PlexServer.history`.
-    """
-    _HISTORYTYPE = True
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        Track._loadData(self, data)
-        PlexHistory._loadData(self, data)
diff --git a/lib/plexapi/base.py b/lib/plexapi/base.py
deleted file mode 100644
index fc519bb1..00000000
--- a/lib/plexapi/base.py
+++ /dev/null
@@ -1,1215 +0,0 @@
-# -*- coding: utf-8 -*-
-import re
-from typing import TYPE_CHECKING, Generic, Iterable, List, Optional, TypeVar, Union
-import weakref
-from functools import cached_property
-from urllib.parse import parse_qsl, urlencode, urlparse
-from xml.etree import ElementTree
-from xml.etree.ElementTree import Element
-
-from plexapi import CONFIG, X_PLEX_CONTAINER_SIZE, log, utils
-from plexapi.exceptions import BadRequest, NotFound, UnknownType, Unsupported
-
-if TYPE_CHECKING:
-    from plexapi.server import PlexServer
-
-PlexObjectT = TypeVar("PlexObjectT", bound='PlexObject')
-MediaContainerT = TypeVar("MediaContainerT", bound="MediaContainer")
-
-USER_DONT_RELOAD_FOR_KEYS = set()
-_DONT_RELOAD_FOR_KEYS = {'key', 'sourceURI'}
-OPERATORS = {
-    'exact': lambda v, q: v == q,
-    'iexact': lambda v, q: v.lower() == q.lower(),
-    'contains': lambda v, q: q in v,
-    'icontains': lambda v, q: q.lower() in v.lower(),
-    'ne': lambda v, q: v != q,
-    'in': lambda v, q: v in q,
-    'gt': lambda v, q: v > q,
-    'gte': lambda v, q: v >= q,
-    'lt': lambda v, q: v < q,
-    'lte': lambda v, q: v <= q,
-    'startswith': lambda v, q: v.startswith(q),
-    'istartswith': lambda v, q: v.lower().startswith(q.lower()),
-    'endswith': lambda v, q: v.endswith(q),
-    'iendswith': lambda v, q: v.lower().endswith(q.lower()),
-    'exists': lambda v, q: v is not None if q else v is None,
-    'regex': lambda v, q: bool(re.search(q, v)),
-    'iregex': lambda v, q: bool(re.search(q, v, flags=re.IGNORECASE)),
-}
-
-
-class cached_data_property(cached_property):
-    """Caching for PlexObject data properties.
-
-    This decorator creates properties that cache their values with
-    automatic invalidation on data changes.
-    """
-
-    def __set_name__(self, owner, name):
-        """Register the annotated property in the parent class's _cached_data_properties set."""
-        super().__set_name__(owner, name)
-        if not hasattr(owner, '_cached_data_properties'):
-            owner._cached_data_properties = set()
-        owner._cached_data_properties.add(name)
-
-
-class PlexObjectMeta(type):
-    """Metaclass for PlexObject to handle cached_data_properties."""
-    def __new__(mcs, name, bases, attrs):
-        cached_data_props = set()
-
-        # Merge all _cached_data_properties from parent classes
-        for base in bases:
-            if hasattr(base, '_cached_data_properties'):
-                cached_data_props.update(base._cached_data_properties)
-
-        # Find all properties annotated with cached_data_property in the current class
-        for attr_name, attr_value in attrs.items():
-            if isinstance(attr_value, cached_data_property):
-                cached_data_props.add(attr_name)
-
-        attrs['_cached_data_properties'] = cached_data_props
-
-        return super().__new__(mcs, name, bases, attrs)
-
-
-class PlexObject(metaclass=PlexObjectMeta):
-    """ Base class for all Plex objects.
-
-        Parameters:
-            server (:class:`~plexapi.server.PlexServer`): PlexServer this client is connected to (optional)
-            data (ElementTree): Response from PlexServer used to build this object (optional).
-            initpath (str): Relative path requested when retrieving specified `data` (optional).
-            parent (:class:`~plexapi.base.PlexObject`): The parent object that this object is built from (optional).
-    """
-    TAG = None      # xml element tag
-    TYPE = None     # xml element type
-    key = None      # plex relative url
-
-    def __init__(self, server, data, initpath=None, parent=None):
-        self._server = server
-        self._data = data
-        self._initpath = initpath or self.key
-        self._parent = weakref.ref(parent) if parent is not None else None
-        self._details_key = None
-
-        # Allow overwriting previous attribute values with `None` when manually reloading
-        self._overwriteNone = True
-        # Automatically reload the object when accessing a missing attribute
-        self._autoReload = CONFIG.get('plexapi.autoreload', True, bool)
-        # Attribute to save batch edits for a single API call
-        self._edits = None
-
-        if data is not None:
-            self._loadData(data)
-        self._details_key = self._buildDetailsKey()
-
-    def __repr__(self):
-        uid = self._clean(self.firstAttr('_baseurl', 'ratingKey', 'id', 'key', 'playQueueID', 'uri', 'type'))
-        name = self._clean(self.firstAttr('title', 'name', 'username', 'product', 'tag', 'value'))
-        return f"<{':'.join([p for p in [self.__class__.__name__, uid, name] if p])}>"
-
-    def __setattr__(self, attr, value):
-        overwriteNone = self.__dict__.get('_overwriteNone')
-        # Don't overwrite an attr with None unless it's a private variable or overwrite None is True
-        if value is not None or attr.startswith('_') or attr not in self.__dict__ or overwriteNone:
-            self.__dict__[attr] = value
-
-    def _clean(self, value):
-        """ Clean attr value for display in __repr__. """
-        if value:
-            value = str(value).replace('/library/metadata/', '')
-            value = value.replace('/children', '')
-            value = value.replace('/accounts/', '')
-            value = value.replace('/devices/', '')
-            return value.replace(' ', '-')[:20]
-
-    def _buildItem(self, elem, cls=None, initpath=None):
-        """ Factory function to build objects based on registered PLEXOBJECTS. """
-        # cls is specified, build the object and return
-        initpath = initpath or self._initpath
-        if cls is not None:
-            return cls(self._server, elem, initpath, parent=self)
-        # cls is not specified, try looking it up in PLEXOBJECTS
-        etype = elem.attrib.get('streamType', elem.attrib.get('tagType', elem.attrib.get('type')))
-        ehash = f'{elem.tag}.{etype}' if etype else elem.tag
-        if initpath == '/status/sessions':
-            ehash = f"{ehash}.session"
-        elif initpath.startswith('/status/sessions/history'):
-            ehash = f"{ehash}.history"
-        ecls = utils.getPlexObject(ehash, default=elem.tag)
-        # log.debug('Building %s as %s', elem.tag, ecls.__name__)
-        if ecls is not None:
-            return ecls(self._server, elem, initpath, parent=self)
-        raise UnknownType(f"Unknown library type <{elem.tag} type='{etype}'../>")
-
-    def _buildItemOrNone(self, elem, cls=None, initpath=None):
-        """ Calls :func:`~plexapi.base.PlexObject._buildItem` but returns
-            None if elem is an unknown type.
-        """
-        try:
-            return self._buildItem(elem, cls, initpath)
-        except UnknownType:
-            return None
-
-    def _buildDetailsKey(self, **kwargs):
-        """ Builds the details key with the XML include parameters.
-            All parameters are included by default with the option to override each parameter
-            or disable each parameter individually by setting it to False or 0.
-        """
-        details_key = self.key
-        params = {}
-
-        if details_key and hasattr(self, '_INCLUDES'):
-            for k, v in self._INCLUDES.items():
-                value = kwargs.pop(k, v)
-                if value not in [False, 0, '0']:
-                    params[k] = 1 if value is True else value
-
-        if details_key and hasattr(self, '_EXCLUDES'):
-            for k, v in self._EXCLUDES.items():
-                value = kwargs.pop(k, None)
-                if value is not None:
-                    params[k] = 1 if value is True else value
-
-        if params:
-            details_key += '?' + urlencode(sorted(params.items()))
-        return details_key
-
-    def _isChildOf(self, **kwargs):
-        """ Returns True if this object is a child of the given attributes.
-            This will search the parent objects all the way to the top.
-
-            Parameters:
-                **kwargs (dict): The attributes and values to search for in the parent objects.
-                    See all possible `**kwargs*` in :func:`~plexapi.base.PlexObject.fetchItem`.
-        """
-        obj = self
-        while obj and obj._parent is not None:
-            obj = obj._parent()
-            if obj and obj._checkAttrs(obj._data, **kwargs):
-                return True
-        return False
-
-    def _manuallyLoadXML(self, xml, cls=None):
-        """ Manually load an XML string as a :class:`~plexapi.base.PlexObject`.
-
-            Parameters:
-                xml (str): The XML string to load.
-                cls (:class:`~plexapi.base.PlexObject`): If you know the class of the
-                    items to be fetched, passing this in will help the parser ensure
-                    it only returns those items. By default we convert the xml elements
-                    with the best guess PlexObjects based on tag and type attrs.
-        """
-        elem = ElementTree.fromstring(xml)
-        return self._buildItemOrNone(elem, cls)
-
-    def fetchItems(
-        self,
-        ekey,
-        cls=None,
-        container_start=None,
-        container_size=None,
-        maxresults=None,
-        params=None,
-        **kwargs,
-    ):
-        """ Load the specified key to find and build all items with the specified tag
-            and attrs.
-
-            Parameters:
-                ekey (str or List<int>): API URL path in Plex to fetch items from. If a list of ints is passed
-                    in, the key will be translated to /library/metadata/<key1,key2,key3>. This allows
-                    fetching multiple items only knowing their key-ids.
-                cls (:class:`~plexapi.base.PlexObject`): If you know the class of the
-                    items to be fetched, passing this in will help the parser ensure
-                    it only returns those items. By default we convert the xml elements
-                    with the best guess PlexObjects based on tag and type attrs.
-                etag (str): Only fetch items with the specified tag.
-                container_start (None, int): offset to get a subset of the data
-                container_size (None, int): How many items in data
-                maxresults (int, optional): Only return the specified number of results.
-                params (dict, optional): Any additional params to add to the request.
-                **kwargs (dict): Optionally add XML attribute to filter the items.
-                    See the details below for more info.
-
-            **Filtering XML Attributes**
-
-            Any XML attribute can be filtered when fetching results. Filtering is done before
-            the Python objects are built to help keep things speedy. For example, passing in
-            ``viewCount=0`` will only return matching items where the view count is ``0``.
-            Note that case matters when specifying attributes. Attributes further down in the XML
-            tree can be filtered by *prepending* the attribute with each element tag ``Tag__``.
-
-            Examples:
-
-                .. code-block:: python
-
-                    fetchItem(ekey, viewCount=0)
-                    fetchItem(ekey, contentRating="PG")
-                    fetchItem(ekey, Genre__tag="Animation")
-                    fetchItem(ekey, Media__videoCodec="h265")
-                    fetchItem(ekey, Media__Part__container="mp4)
-
-            Note that because some attribute names are already used as arguments to this
-            function, such as ``tag``, you may still reference the attr tag by prepending an
-            underscore. For example, passing in ``_tag='foobar'`` will return all items where
-            ``tag='foobar'``.
-
-            **Using PlexAPI Operators**
-
-            Optionally, PlexAPI operators can be specified by *appending* it to the end of the
-            attribute for more complex lookups. For example, passing in ``viewCount__gte=0``
-            will return all items where ``viewCount >= 0``.
-
-            List of Available Operators:
-
-            * ``__contains``: Value contains specified arg.
-            * ``__endswith``: Value ends with specified arg.
-            * ``__exact``: Value matches specified arg.
-            * ``__exists`` (*bool*): Value is or is not present in the attrs.
-            * ``__gt``: Value is greater than specified arg.
-            * ``__gte``: Value is greater than or equal to specified arg.
-            * ``__icontains``: Case insensitive value contains specified arg.
-            * ``__iendswith``: Case insensitive value ends with specified arg.
-            * ``__iexact``: Case insensitive value matches specified arg.
-            * ``__in``: Value is in a specified list or tuple.
-            * ``__iregex``: Case insensitive value matches the specified regular expression.
-            * ``__istartswith``: Case insensitive value starts with specified arg.
-            * ``__lt``: Value is less than specified arg.
-            * ``__lte``: Value is less than or equal to specified arg.
-            * ``__regex``: Value matches the specified regular expression.
-            * ``__startswith``: Value starts with specified arg.
-
-            Examples:
-
-                .. code-block:: python
-
-                    fetchItem(ekey, viewCount__gte=0)
-                    fetchItem(ekey, Media__container__in=["mp4", "mkv"])
-                    fetchItem(ekey, guid__regex=r"com\\.plexapp\\.agents\\.(imdb|themoviedb)://|tt\\d+")
-                    fetchItem(ekey, guid__id__regex=r"(imdb|tmdb|tvdb)://")
-                    fetchItem(ekey, Media__Part__file__startswith="D:\\Movies")
-
-        """
-        if ekey is None:
-            raise BadRequest('ekey was not provided')
-
-        if isinstance(ekey, list) and all(isinstance(key, int) for key in ekey):
-            ekey = f'/library/metadata/{",".join(str(key) for key in ekey)}'
-
-        container_start = container_start or 0
-        container_size = container_size or X_PLEX_CONTAINER_SIZE
-        offset = container_start
-
-        if maxresults is not None:
-            container_size = min(container_size, maxresults)
-
-        results = MediaContainer[cls](self._server, Element('MediaContainer'), initpath=ekey)
-        headers = {}
-
-        while True:
-            headers['X-Plex-Container-Start'] = str(container_start)
-            headers['X-Plex-Container-Size'] = str(container_size)
-
-            data = self._server.query(ekey, headers=headers, params=params)
-            subresults = self.findItems(data, cls, ekey, **kwargs)
-            total_size = utils.cast(int, data.attrib.get('totalSize') or data.attrib.get('size')) or len(subresults)
-
-            if not subresults:
-                if offset > total_size:
-                    log.info('container_start is greater than the number of items')
-
-            librarySectionID = utils.cast(int, data.attrib.get('librarySectionID'))
-            if librarySectionID:
-                for item in subresults:
-                    item.librarySectionID = librarySectionID
-
-            results.extend(subresults)
-
-            container_start += container_size
-
-            if container_start > total_size:
-                break
-
-            wanted_number_of_items = total_size - offset
-            if maxresults is not None:
-                wanted_number_of_items = min(maxresults, wanted_number_of_items)
-                container_size = min(container_size, wanted_number_of_items - len(results))
-
-            if wanted_number_of_items <= len(results):
-                break
-
-        return results
-
-    def fetchItem(self, ekey, cls=None, **kwargs):
-        """ Load the specified key to find and build the first item with the
-            specified tag and attrs. If no tag or attrs are specified then
-            the first item in the result set is returned.
-
-            Parameters:
-                ekey (str or int): Path in Plex to fetch items from. If an int is passed
-                    in, the key will be translated to /library/metadata/<key>. This allows
-                    fetching an item only knowing its key-id.
-                cls (:class:`~plexapi.base.PlexObject`): If you know the class of the
-                    items to be fetched, passing this in will help the parser ensure
-                    it only returns those items. By default we convert the xml elements
-                    with the best guess PlexObjects based on tag and type attrs.
-                etag (str): Only fetch items with the specified tag.
-                **kwargs (dict): Optionally add XML attribute to filter the items.
-                    See :func:`~plexapi.base.PlexObject.fetchItems` for more details
-                    on how this is used.
-        """
-        if isinstance(ekey, int):
-            ekey = f'/library/metadata/{ekey}'
-
-        try:
-            return self.fetchItems(ekey, cls, **kwargs)[0]
-        except IndexError:
-            clsname = cls.__name__ if cls else 'None'
-            raise NotFound(f'Unable to find elem: cls={clsname}, attrs={kwargs}') from None
-
-    def findItems(self, data, cls=None, initpath=None, rtag=None, **kwargs):
-        """ Load the specified data to find and build all items with the specified tag
-            and attrs. See :func:`~plexapi.base.PlexObject.fetchItem` for more details
-            on how this is used.
-        """
-        # filter on cls attrs if specified
-        if cls and cls.TAG and 'tag' not in kwargs:
-            kwargs['etag'] = cls.TAG
-        if cls and cls.TYPE and 'type' not in kwargs:
-            kwargs['type'] = cls.TYPE
-        # rtag to iter on a specific root tag using breadth-first search
-        if rtag:
-            data = next(utils.iterXMLBFS(data, rtag), Element('Empty'))
-        # loop through all data elements to find matches
-        items = MediaContainer[cls](self._server, data, initpath=initpath) if data.tag == 'MediaContainer' else []
-        for elem in data:
-            if self._checkAttrs(elem, **kwargs):
-                item = self._buildItemOrNone(elem, cls, initpath)
-                if item is not None:
-                    items.append(item)
-        return items
-
-    def findItem(self, data, cls=None, initpath=None, rtag=None, **kwargs):
-        """ Load the specified data to find and build the first items with the specified tag
-            and attrs. See :func:`~plexapi.base.PlexObject.fetchItem` for more details
-            on how this is used.
-        """
-        try:
-            return self.findItems(data, cls, initpath, rtag, **kwargs)[0]
-        except IndexError:
-            return None
-
-    def firstAttr(self, *attrs):
-        """ Return the first attribute in attrs that is not None. """
-        for attr in attrs:
-            value = getattr(self, attr, None)
-            if value is not None:
-                return value
-
-    def listAttrs(self, data, attr, rtag=None, **kwargs):
-        """ Return a list of values from matching attribute. """
-        results = []
-        # rtag to iter on a specific root tag using breadth-first search
-        if rtag:
-            data = next(utils.iterXMLBFS(data, rtag), [])
-        for elem in data:
-            kwargs[f'{attr}__exists'] = True
-            if self._checkAttrs(elem, **kwargs):
-                results.append(elem.attrib.get(attr))
-        return results
-
-    def reload(self, key=None, **kwargs):
-        """ Reload the data for this object.
-
-            Parameters:
-                key (string, optional): Override the key to reload.
-                **kwargs (dict): A dictionary of XML include parameters to include/exclude or override.
-                    See :class:`~plexapi.base.PlexPartialObject` for all the available include parameters.
-                    Set parameter to True to include and False to exclude.
-
-            Example:
-
-                .. code-block:: python
-
-                    from plexapi.server import PlexServer
-                    plex = PlexServer('http://localhost:32400', token='xxxxxxxxxxxxxxxxxxxx')
-
-                    # Search results are partial objects.
-                    movie = plex.library.section('Movies').get('Cars')
-                    movie.isPartialObject()  # Returns True
-
-                    # Partial reload of the movie without a default include parameter.
-                    # The movie object will remain as a partial object.
-                    movie.reload(includeMarkers=False)
-                    movie.isPartialObject()  # Returns True
-
-                    # Full reload of the movie with all default include parameters.
-                    # The movie object will be a full object.
-                    movie.reload()
-                    movie.isFullObject()  # Returns True
-
-                    # Full reload of the movie with all default and extra include parameter.
-                    # Including `checkFiles` will tell the Plex server to check if the file
-                    # still exists and is accessible.
-                    # The movie object will be a full object.
-                    movie.reload(checkFiles=True)
-                    movie.isFullObject()  # Returns True
-
-        """
-        return self._reload(key=key, **kwargs)
-
-    def _reload(self, key=None, _overwriteNone=True, **kwargs):
-        """ Perform the actual reload. """
-        details_key = self._buildDetailsKey(**kwargs) if kwargs else self._details_key
-        key = key or details_key or self.key
-        if not key:
-            raise Unsupported('Cannot reload an object not built from a URL.')
-        self._initpath = key
-        data = self._server.query(key)
-        self._overwriteNone = _overwriteNone
-        self._invalidateCacheAndLoadData(data[0])
-        self._overwriteNone = True
-        return self
-
-    def _checkAttrs(self, elem, **kwargs):
-        attrsFound = {}
-        for attr, query in kwargs.items():
-            attr, op, operator = self._getAttrOperator(attr)
-            values = self._getAttrValue(elem, attr)
-            # special case query in (None, 0, '') to include missing attr
-            if op == 'exact' and not values and query in (None, 0, ''):
-                return True
-            # return if attr were looking for is missing
-            attrsFound[attr] = False
-            for value in values:
-                value = self._castAttrValue(op, query, value)
-                if operator(value, query):
-                    attrsFound[attr] = True
-                    break
-        # log.debug('Checking %s for %s found: %s', elem.tag, kwargs, attrsFound)
-        return all(attrsFound.values())
-
-    def _getAttrOperator(self, attr):
-        for op, operator in OPERATORS.items():
-            if attr.endswith(f'__{op}'):
-                attr = attr.rsplit('__', 1)[0]
-                return attr, op, operator
-        # default to exact match
-        return attr, 'exact', OPERATORS['exact']
-
-    def _getAttrValue(self, elem, attrstr, results=None):
-        # log.debug('Fetching %s in %s', attrstr, elem.tag)
-        parts = attrstr.split('__', 1)
-        attr = parts[0]
-        attrstr = parts[1] if len(parts) == 2 else None
-        if attrstr:
-            results = [] if results is None else results
-            for child in (c for c in elem if c.tag.lower() == attr.lower()):
-                results += self._getAttrValue(child, attrstr, results)
-            return [r for r in results if r is not None]
-        # check were looking for the tag
-        if attr.lower() == 'etag':
-            return [elem.tag]
-        # loop through attrs so we can perform case-insensitive match
-        for _attr, value in elem.attrib.items():
-            if attr.lower() == _attr.lower():
-                return [value]
-        return []
-
-    def _castAttrValue(self, op, query, value):
-        if op == 'exists':
-            return value
-        if isinstance(query, bool):
-            return bool(int(value))
-        if isinstance(query, int) and '.' in value:
-            return float(value)
-        if isinstance(query, int):
-            return int(value)
-        if isinstance(query, float):
-            return float(value)
-        return value
-
-    def _invalidateCacheAndLoadData(self, data):
-        """Load attribute values from Plex XML response and invalidate cached properties."""
-        old_data_id = id(getattr(self, '_data', None))
-        self._data = data
-
-        # If the data's object ID has changed, invalidate cached properties
-        if id(data) != old_data_id:
-            self._invalidateCachedProperties()
-
-        self._loadData(data)
-
-    def _invalidateCachedProperties(self):
-        """Invalidate all cached data property values."""
-        cached_props = getattr(self.__class__, '_cached_data_properties', set())
-
-        for prop_name in cached_props:
-            if prop_name in self.__dict__:
-                del self.__dict__[prop_name]
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        raise NotImplementedError('Abstract method not implemented.')
-
-    def _findAndLoadElem(self, data, **kwargs):
-        """ Find and load the first element in the data that matches the specified attributes. """
-        for elem in data:
-            if self._checkAttrs(elem, **kwargs):
-                self._invalidateCacheAndLoadData(elem)
-
-    @property
-    def _searchType(self):
-        return self.TYPE
-
-
-class PlexPartialObject(PlexObject):
-    """ Not all objects in the Plex listings return the complete list of elements
-        for the object. This object will allow you to assume each object is complete,
-        and if the specified value you request is None it will fetch the full object
-        automatically and update itself.
-    """
-    _INCLUDES = {
-        'checkFiles': 0,
-        'includeAllConcerts': 0,
-        'includeBandwidths': 1,
-        'includeChapters': 1,
-        'includeChildren': 0,
-        'includeConcerts': 0,
-        'includeExternalMedia': 0,
-        'includeExtras': 0,
-        'includeFields': 'thumbBlurHash,artBlurHash',
-        'includeGeolocation': 1,
-        'includeLoudnessRamps': 1,
-        'includeMarkers': 1,
-        'includeOnDeck': 0,
-        'includePopularLeaves': 0,
-        'includePreferences': 0,
-        'includeRelated': 0,
-        'includeRelatedCount': 0,
-        'includeReviews': 0,
-        'includeStations': 0,
-    }
-    _EXCLUDES = {
-        'excludeElements': (
-            'Media,Genre,Country,Guid,Rating,Collection,Director,Writer,Role,Producer,Similar,Style,Mood,Format'
-        ),
-        'excludeFields': 'summary,tagline',
-        'skipRefresh': 1,
-    }
-
-    def __eq__(self, other):
-        if isinstance(other, PlexPartialObject):
-            return self.key == other.key
-        return NotImplemented
-
-    def __hash__(self):
-        return hash(repr(self))
-
-    def __iter__(self):
-        yield self
-
-    def __getattribute__(self, attr):
-        # Dragons inside.. :-/
-        value = super(PlexPartialObject, self).__getattribute__(attr)
-        # Check a few cases where we don't want to reload
-        if attr in _DONT_RELOAD_FOR_KEYS: return value
-        if attr in USER_DONT_RELOAD_FOR_KEYS: return value
-        if attr.startswith('_'): return value
-        if value not in (None, []): return value
-        if self.isFullObject(): return value
-        if isinstance(self, (PlexSession, PlexHistory)): return value
-        if self._autoReload is False: return value
-        # Log the reload.
-        clsname = self.__class__.__name__
-        title = self.__dict__.get('title', self.__dict__.get('name'))
-        objname = f"{clsname} '{title}'" if title else clsname
-        log.debug("Reloading %s for attr '%s'", objname, attr)
-        # Reload and return the value
-        self._reload(_overwriteNone=False)
-        return super(PlexPartialObject, self).__getattribute__(attr)
-
-    def analyze(self):
-        """ Tell Plex Media Server to performs analysis on it this item to gather
-            information. Analysis includes:
-
-            * Gather Media Properties: All of the media you add to a Library has
-                properties that are useful to know–whether it's a video file, a
-                music track, or one of your photos (container, codec, resolution, etc).
-            * Generate Default Artwork: Artwork will automatically be grabbed from a
-                video file. A background image will be pulled out as well as a
-                smaller image to be used for poster/thumbnail type purposes.
-            * Generate Video Preview Thumbnails: Video preview thumbnails are created,
-                if you have that feature enabled. Video preview thumbnails allow
-                graphical seeking in some Apps. It's also used in the Plex Web App Now
-                Playing screen to show a graphical representation of where playback
-                is. Video preview thumbnails creation is a CPU-intensive process akin
-                to transcoding the file.
-            * Generate intro video markers: Detects show intros, exposing the
-                'Skip Intro' button in clients.
-        """
-        key = f"/{self.key.lstrip('/')}/analyze"
-        self._server.query(key, method=self._server._session.put)
-
-    def isFullObject(self):
-        """ Returns True if this is already a full object. A full object means all attributes
-            were populated from the api path representing only this item. For example, the
-            search result for a movie often only contain a portion of the attributes a full
-            object (main url) for that movie would contain.
-        """
-        parsed_key = urlparse(self._details_key or self.key)
-        parsed_initpath = urlparse(self._initpath)
-        query_key = set(parse_qsl(parsed_key.query))
-        query_init = set(parse_qsl(parsed_initpath.query))
-        return not self.key or (parsed_key.path == parsed_initpath.path and query_key <= query_init)
-
-    def isPartialObject(self):
-        """ Returns True if this is not a full object. """
-        return not self.isFullObject()
-
-    def isLocked(self, field: str):
-        """ Returns True if the specified field is locked, otherwise False.
-
-            Parameters:
-                field (str): The name of the field.
-        """
-        return next((f.locked for f in self.fields if f.name == field), False)
-
-    def _edit(self, **kwargs):
-        """ Actually edit an object. """
-        if isinstance(self._edits, dict):
-            self._edits.update(kwargs)
-            return self
-
-        if 'type' not in kwargs:
-            kwargs['type'] = utils.searchType(self._searchType)
-
-        self.section()._edit(items=self, **kwargs)
-        return self
-
-    def edit(self, **kwargs):
-        """ Edit an object.
-            Note: This is a low level method and you need to know all the field/tag keys.
-            See :class:`~plexapi.mixins.EditFieldMixin` and :class:`~plexapi.mixins.EditTagsMixin`
-            for individual field and tag editing methods.
-
-            Parameters:
-                kwargs (dict): Dict of settings to edit.
-
-            Example:
-
-                .. code-block:: python
-
-                    edits = {
-                        'type': 1,
-                        'id': movie.ratingKey,
-                        'title.value': 'A new title',
-                        'title.locked': 1,
-                        'summary.value': 'This is a summary.',
-                        'summary.locked': 1,
-                        'collection[0].tag.tag': 'A tag',
-                        'collection.locked': 1}
-                    }
-                    movie.edit(**edits)
-
-        """
-        return self._edit(**kwargs)
-
-    def batchEdits(self):
-        """ Enable batch editing mode to save API calls.
-            Must call :func:`~plexapi.base.PlexPartialObject.saveEdits` at the end to save all the edits.
-            See :class:`~plexapi.mixins.EditFieldMixin` and :class:`~plexapi.mixins.EditTagsMixin`
-            for individual field and tag editing methods.
-
-            Example:
-
-                .. code-block:: python
-
-                    # Batch editing multiple fields and tags in a single API call
-                    Movie.batchEdits()
-                    Movie.editTitle('A New Title').editSummary('A new summary').editTagline('A new tagline') \\
-                        .addCollection('New Collection').removeGenre('Action').addLabel('Favorite')
-                    Movie.saveEdits()
-
-        """
-        self._edits = {}
-        return self
-
-    def saveEdits(self):
-        """ Save all the batch edits. The object needs to be reloaded manually,
-            if required.
-            See :func:`~plexapi.base.PlexPartialObject.batchEdits` for details.
-        """
-        if not isinstance(self._edits, dict):
-            raise BadRequest('Batch editing mode not enabled. Must call `batchEdits()` first.')
-
-        edits = self._edits
-        self._edits = None
-        self._edit(**edits)
-        return self
-
-    def refresh(self):
-        """ Refreshing a Library or individual item causes the metadata for the item to be
-            refreshed, even if it already has metadata. You can think of refreshing as
-            "update metadata for the requested item even if it already has some". You should
-            refresh a Library or individual item if:
-
-            * You've changed the Library Metadata Agent.
-            * You've added "Local Media Assets" (such as artwork, theme music, external
-                subtitle files, etc.)
-            * You want to freshen the item posters, summary, etc.
-            * There's a problem with the poster image that's been downloaded.
-            * Items are missing posters or other downloaded information. This is possible if
-                the refresh process is interrupted (the Server is turned off, internet
-                connection dies, etc).
-        """
-        key = f'{self.key}/refresh'
-        self._server.query(key, method=self._server._session.put)
-
-    def section(self):
-        """ Returns the :class:`~plexapi.library.LibrarySection` this item belongs to. """
-        return self._server.library.sectionByID(self.librarySectionID)
-
-    def delete(self):
-        """ Delete a media element. This has to be enabled under settings > server > library in plex webui. """
-        try:
-            return self._server.query(self.key, method=self._server._session.delete)
-        except BadRequest:  # pragma: no cover
-            log.error('Failed to delete %s. This could be because you '
-                'have not allowed items to be deleted', self.key)
-            raise
-
-    def history(self, maxresults=None, mindate=None):
-        """ Get Play History for a media item.
-
-            Parameters:
-                maxresults (int): Only return the specified number of results (optional).
-                mindate (datetime): Min datetime to return results from.
-        """
-        return self._server.history(maxresults=maxresults, mindate=mindate, ratingKey=self.ratingKey)
-
-    def _getWebURL(self, base=None):
-        """ Get the Plex Web URL with the correct parameters.
-            Private method to allow overriding parameters from subclasses.
-        """
-        return self._server._buildWebURL(base=base, endpoint='details', key=self.key)
-
-    def getWebURL(self, base=None):
-        """ Returns the Plex Web URL for a media item.
-
-            Parameters:
-                base (str): The base URL before the fragment (``#!``).
-                    Default is https://app.plex.tv/desktop.
-        """
-        return self._getWebURL(base=base)
-
-    def playQueue(self, *args, **kwargs):
-        """ Returns a new :class:`~plexapi.playqueue.PlayQueue` from this media item.
-            See :func:`~plexapi.playqueue.PlayQueue.create` for available parameters.
-        """
-        from plexapi.playqueue import PlayQueue
-        return PlayQueue.create(self._server, self, *args, **kwargs)
-
-
-class Playable:
-    """ This is a mixin to store functions specific to media that is Playable.
-        Things were getting mixed up a bit when dealing with Shows, Season, Artists,
-        Albums which are all not playable.
-
-        Attributes:
-            playlistItemID (int): Playlist item ID (only populated for :class:`~plexapi.playlist.Playlist` items).
-            playQueueItemID (int): PlayQueue item ID (only populated for :class:`~plexapi.playlist.PlayQueue` items).
-    """
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.playlistItemID = utils.cast(int, data.attrib.get('playlistItemID'))    # playlist
-        self.playQueueItemID = utils.cast(int, data.attrib.get('playQueueItemID'))  # playqueue
-
-    def getStreamURL(self, **kwargs):
-        """ Returns a stream url that may be used by external applications such as VLC.
-
-            Parameters:
-                **kwargs (dict): optional parameters to manipulate the playback when accessing
-                    the stream. A few known parameters include: maxVideoBitrate, videoResolution
-                    offset, copyts, protocol, mediaIndex, partIndex, platform.
-
-            Raises:
-                :exc:`~plexapi.exceptions.Unsupported`: When the item doesn't support fetching a stream URL.
-        """
-        if self.TYPE not in ('movie', 'episode', 'track', 'clip'):
-            raise Unsupported(f'Fetching stream URL for {self.TYPE} is unsupported.')
-
-        mvb = kwargs.pop('maxVideoBitrate', None)
-        vr = kwargs.pop('videoResolution', '')
-        protocol = kwargs.pop('protocol', None)
-
-        params = {
-            'path': self.key,
-            'mediaIndex': kwargs.pop('mediaIndex', 0),
-            'partIndex': kwargs.pop('mediaIndex', 0),
-            'protocol': protocol,
-            'fastSeek': kwargs.pop('fastSeek', 1),
-            'copyts': kwargs.pop('copyts', 1),
-            'offset': kwargs.pop('offset', 0),
-            'maxVideoBitrate': max(mvb, 64) if mvb else None,
-            'videoResolution': vr if re.match(r'^\d+x\d+$', vr) else None,
-            'X-Plex-Platform': kwargs.pop('platform', 'Chrome')
-        }
-        params.update(kwargs)
-
-        # remove None values
-        params = {k: v for k, v in params.items() if v is not None}
-        streamtype = 'audio' if self.TYPE in ('track', 'album') else 'video'
-        ext = 'mpd' if protocol == 'dash' else 'm3u8'
-
-        return self._server.url(
-            f'/{streamtype}/:/transcode/universal/start.{ext}?{urlencode(params)}',
-            includeToken=True
-        )
-
-    def iterParts(self):
-        """ Iterates over the parts of this media item. """
-        for item in self.media:
-            for part in item.parts:
-                yield part
-
-    def videoStreams(self):
-        """ Returns a list of :class:`~plexapi.media.videoStream` objects for all MediaParts. """
-        if self.isPartialObject():
-            self.reload()
-        return sum((part.videoStreams() for part in self.iterParts()), [])
-
-    def audioStreams(self):
-        """ Returns a list of :class:`~plexapi.media.AudioStream` objects for all MediaParts. """
-        if self.isPartialObject():
-            self.reload()
-        return sum((part.audioStreams() for part in self.iterParts()), [])
-
-    def subtitleStreams(self):
-        """ Returns a list of :class:`~plexapi.media.SubtitleStream` objects for all MediaParts. """
-        if self.isPartialObject():
-            self.reload()
-        return sum((part.subtitleStreams() for part in self.iterParts()), [])
-
-    def lyricStreams(self):
-        """ Returns a list of :class:`~plexapi.media.LyricStream` objects for all MediaParts. """
-        if self.isPartialObject():
-            self.reload()
-        return sum((part.lyricStreams() for part in self.iterParts()), [])
-
-    def play(self, client):
-        """ Start playback on the specified client.
-
-            Parameters:
-                client (:class:`~plexapi.client.PlexClient`): Client to start playing on.
-        """
-        client.playMedia(self)
-
-    def download(self, savepath=None, keep_original_name=False, **kwargs):
-        """ Downloads the media item to the specified location. Returns a list of
-            filepaths that have been saved to disk.
-
-            Parameters:
-                savepath (str): Defaults to current working dir.
-                keep_original_name (bool): True to keep the original filename otherwise
-                    a friendlier filename is generated. See filenames below.
-                **kwargs (dict): Additional options passed into :func:`~plexapi.audio.Track.getStreamURL`
-                    to download a transcoded stream, otherwise the media item will be downloaded
-                    as-is and saved to disk.
-
-            **Filenames**
-
-            * Movie: ``<title> (<year>)``
-            * Episode: ``<show title> - s00e00 - <episode title>``
-            * Track: ``<artist title> - <album title> - 00 - <track title>``
-            * Photo: ``<photoalbum title> - <photo/clip title>`` or ``<photo/clip title>``
-        """
-        filepaths = []
-        parts = [i for i in self.iterParts() if i]
-
-        for part in parts:
-            if not keep_original_name:
-                filename = utils.cleanFilename(f'{self._prettyfilename()}.{part.container}')
-            else:
-                filename = part.file
-
-            if kwargs:
-                # So this seems to be a a lot slower but allows transcode.
-                kwargs['mediaIndex'] = self.media.index(part._parent())
-                kwargs['partIndex'] = part._parent().parts.index(part)
-                download_url = self.getStreamURL(**kwargs)
-            else:
-                download_url = self._server.url(f'{part.key}?download=1')
-
-            filepath = utils.download(
-                download_url,
-                self._server._token,
-                filename=filename,
-                savepath=savepath,
-                session=self._server._session
-            )
-
-            if filepath:
-                filepaths.append(filepath)
-
-        return filepaths
-
-    def updateProgress(self, time, state='stopped'):
-        """ Set the watched progress for this video.
-
-            Note that setting the time to 0 will not work.
-            Use :func:`~plexapi.mixins.PlayedUnplayedMixin.markPlayed` or
-            :func:`~plexapi.mixins.PlayedUnplayedMixin.markUnplayed` to achieve
-            that goal.
-
-            Parameters:
-                time (int): milliseconds watched
-                state (string): state of the video, default 'stopped'
-        """
-        key = f'/:/progress?key={self.ratingKey}&identifier=com.plexapp.plugins.library&time={time}&state={state}'
-        self._server.query(key)
-        return self
-
-    def updateTimeline(self, time, state='stopped', duration=None):
-        """ Set the timeline progress for this video.
-
-            Parameters:
-                time (int): milliseconds watched
-                state (string): state of the video, default 'stopped'
-                duration (int): duration of the item
-        """
-        durationStr = '&duration='
-        if duration is not None:
-            durationStr = durationStr + str(duration)
-        else:
-            durationStr = durationStr + str(self.duration)
-        key = (f'/:/timeline?ratingKey={self.ratingKey}&key={self.key}&'
-               f'identifier=com.plexapp.plugins.library&time={int(time)}&state={state}{durationStr}')
-        self._server.query(key)
-        return self
-
-
-class PlexSession:
-    """ This is a mixin to store functions specific to media that is a Plex Session.
-
-        Attributes:
-            live (bool): True if this is a live tv session.
-            player (:class:`~plexapi.client.PlexClient`): PlexClient object for the session.
-            session (:class:`~plexapi.media.Session`): Session object for the session
-                if the session is using bandwidth (None otherwise).
-            sessionKey (int): The session key for the session.
-            transcodeSession (:class:`~plexapi.media.TranscodeSession`): TranscodeSession object
-                if item is being transcoded (None otherwise).
-    """
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.live = utils.cast(bool, data.attrib.get('live', '0'))
-        self.sessionKey = utils.cast(int, data.attrib.get('sessionKey'))
-
-        user = data.find('User')
-        self._username = user.attrib.get('title')
-        self._userId = utils.cast(int, user.attrib.get('id'))
-
-        # For backwards compatibility
-        self.usernames = [self._username] if self._username else []
-        # `players`, `sessions`, and `transcodeSessions` are returned with properties
-        # to support lazy loading. See PR #1510
-
-    @cached_data_property
-    def player(self):
-        return self.findItem(self._data, etag='Player')
-
-    @cached_data_property
-    def session(self):
-        return self.findItem(self._data, etag='Session')
-
-    @cached_data_property
-    def transcodeSession(self):
-        return self.findItem(self._data, etag='TranscodeSession')
-
-    @property
-    def players(self):
-        return [self.player] if self.player else []
-
-    @property
-    def sessions(self):
-        return [self.session] if self.session else []
-
-    @property
-    def transcodeSessions(self):
-        return [self.transcodeSession] if self.transcodeSession else []
-
-    @cached_data_property
-    def user(self):
-        """ Returns the :class:`~plexapi.myplex.MyPlexAccount` object (for admin)
-            or :class:`~plexapi.myplex.MyPlexUser` object (for users) for this session.
-        """
-        myPlexAccount = self._server.myPlexAccount()
-        if self._userId == 1:
-            return myPlexAccount
-
-        return myPlexAccount.user(self._username)
-
-    def reload(self):
-        """ Reload the data for the session.
-            Note: This will return the object as-is if the session is no longer active.
-        """
-        return self._reload()
-
-    def _reload(self, **kwargs):
-        """ Reload the data for the session. """
-        key = self._initpath
-        data = self._server.query(key)
-        self._findAndLoadElem(data, sessionKey=str(self.sessionKey))
-        return self
-
-    def source(self):
-        """ Return the source media object for the session. """
-        return self.fetchItem(self._details_key)
-
-    def stop(self, reason=''):
-        """ Stop playback for the session.
-
-            Parameters:
-                reason (str): Message displayed to the user for stopping playback.
-        """
-        params = {
-            'sessionId': self.session.id,
-            'reason': reason,
-        }
-        key = '/status/sessions/terminate'
-        return self._server.query(key, params=params)
-
-
-class PlexHistory:
-    """ This is a mixin to store functions specific to media that is a Plex history item.
-
-        Attributes:
-            accountID (int): The associated :class:`~plexapi.server.SystemAccount` ID.
-            deviceID (int): The associated :class:`~plexapi.server.SystemDevice` ID.
-            historyKey (str): API URL (/status/sessions/history/<historyID>).
-            viewedAt (datetime): Datetime item was last watched.
-    """
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.accountID = utils.cast(int, data.attrib.get('accountID'))
-        self.deviceID = utils.cast(int, data.attrib.get('deviceID'))
-        self.historyKey = data.attrib.get('historyKey')
-        self.viewedAt = utils.toDatetime(data.attrib.get('viewedAt'))
-
-    def _reload(self, **kwargs):
-        """ Reload the data for the history entry. """
-        raise NotImplementedError('History objects cannot be reloaded. Use source() to get the source media item.')
-
-    def source(self):
-        """ Return the source media object for the history entry
-            or None if the media no longer exists on the server.
-        """
-        return self.fetchItem(self._details_key) if self._details_key else None
-
-    def delete(self):
-        """ Delete the history entry. """
-        return self._server.query(self.historyKey, method=self._server._session.delete)
-
-
-class MediaContainer(
-    Generic[PlexObjectT],
-    List[PlexObjectT],
-    PlexObject,
-):
-    """ Represents a single MediaContainer.
-
-        Attributes:
-            TAG (str): 'MediaContainer'
-            allowSync (int): Sync/Download is allowed/disallowed for feature.
-            augmentationKey (str): API URL (/library/metadata/augmentations/<augmentationKey>).
-            identifier (str): "com.plexapp.plugins.library"
-            librarySectionID (int): :class:`~plexapi.library.LibrarySection` ID.
-            librarySectionTitle (str): :class:`~plexapi.library.LibrarySection` title.
-            librarySectionUUID (str): :class:`~plexapi.library.LibrarySection` UUID.
-            mediaTagPrefix (str): "/system/bundle/media/flags/"
-            mediaTagVersion (int): Unknown
-            offset (int): The offset of current results.
-            size (int): The number of items in the hub.
-            totalSize (int): The total number of items for the query.
-
-    """
-    TAG = 'MediaContainer'
-
-    def __init__(
-        self,
-        server: "PlexServer",
-        data: Element,
-        *args: PlexObjectT,
-        initpath: Optional[str] = None,
-        parent: Optional[PlexObject] = None,
-    ) -> None:
-        # super calls Generic.__init__ which calls list.__init__ eventually
-        super().__init__(*args)
-        PlexObject.__init__(self, server, data, initpath, parent)
-
-    def extend(
-        self: MediaContainerT,
-        __iterable: Union[Iterable[PlexObjectT], MediaContainerT],
-    ) -> None:
-        curr_size = self.size if self.size is not None else len(self)
-        super().extend(__iterable)
-        # update size, totalSize, and offset
-        if not isinstance(__iterable, MediaContainer):
-            return
-
-        # prefer the totalSize of the new iterable even if it is smaller
-        self.totalSize = (
-            __iterable.totalSize
-            if __iterable.totalSize is not None
-            else self.totalSize
-        )  # ideally both should be equal
-
-        # the size of the new iterable is added to the current size
-        self.size = curr_size + (
-            __iterable.size if __iterable.size is not None else len(__iterable)
-        )
-
-        # the offset is the minimum of the two, prefering older values
-        if self.offset is not None and __iterable.offset is not None:
-            self.offset = min(self.offset, __iterable.offset)
-        else:
-            self.offset = (
-                self.offset if self.offset is not None else __iterable.offset
-            )
-
-        # for all other attributes, overwrite with the new iterable's values if previously None
-        for key in (
-            "allowSync",
-            "augmentationKey",
-            "identifier",
-            "librarySectionID",
-            "librarySectionTitle",
-            "librarySectionUUID",
-            "mediaTagPrefix",
-            "mediaTagVersion",
-        ):
-            if (not hasattr(self, key)) or (getattr(self, key) is None):
-                if not hasattr(__iterable, key):
-                    continue
-                setattr(self, key, getattr(__iterable, key))
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.allowSync = utils.cast(int, data.attrib.get('allowSync'))
-        self.augmentationKey = data.attrib.get('augmentationKey')
-        self.identifier = data.attrib.get('identifier')
-        self.librarySectionID = utils.cast(int, data.attrib.get('librarySectionID'))
-        self.librarySectionTitle = data.attrib.get('librarySectionTitle')
-        self.librarySectionUUID = data.attrib.get('librarySectionUUID')
-        self.mediaTagPrefix = data.attrib.get('mediaTagPrefix')
-        self.mediaTagVersion = data.attrib.get('mediaTagVersion')
-        self.offset = utils.cast(int, data.attrib.get("offset"))
-        self.size = utils.cast(int, data.attrib.get('size'))
-        self.totalSize = utils.cast(int, data.attrib.get("totalSize"))
diff --git a/lib/plexapi/client.py b/lib/plexapi/client.py
deleted file mode 100644
index 9a904b40..00000000
--- a/lib/plexapi/client.py
+++ /dev/null
@@ -1,636 +0,0 @@
-# -*- coding: utf-8 -*-
-import time
-import weakref
-from xml.etree import ElementTree
-
-import requests
-
-from plexapi import BASE_HEADERS, CONFIG, TIMEOUT, log, logfilter, utils
-from plexapi.base import PlexObject
-from plexapi.exceptions import BadRequest, NotFound, Unauthorized, Unsupported
-from plexapi.playqueue import PlayQueue
-from requests.status_codes import _codes as codes
-
-DEFAULT_MTYPE = 'video'
-
-
-@utils.registerPlexObject
-class PlexClient(PlexObject):
-    """ Main class for interacting with a Plex client. This class can connect
-        directly to the client and control it or proxy commands through your
-        Plex Server. To better understand the Plex client API's read this page:
-        https://github.com/plexinc/plex-media-player/wiki/Remote-control-API
-
-        Parameters:
-            server (:class:`~plexapi.server.PlexServer`): PlexServer this client is connected to (optional).
-            data (ElementTree): Response from PlexServer used to build this object (optional).
-            initpath (str): Path used to generate data.
-            baseurl (str): HTTP URL to connect directly to this client.
-            identifier (str): The resource/machine identifier for the desired client.
-                May be necessary when connecting to a specific proxied client (optional).
-            token (str): X-Plex-Token used for authentication (optional).
-            session (:class:`~requests.Session`): requests.Session object if you want more control (optional).
-            timeout (int): timeout in seconds on initial connect to client (default config.TIMEOUT).
-
-        Attributes:
-            TAG (str): 'Player'
-            key (str): '/resources'
-            device (str): Best guess on the type of device this is (PS, iPhone, Linux, etc).
-            deviceClass (str): Device class (pc, phone, etc).
-            machineIdentifier (str): Unique ID for this device.
-            model (str): Unknown
-            platform (str): Unknown
-            platformVersion (str): Description
-            product (str): Client Product (Plex for iOS, etc).
-            protocol (str): Always seems ot be 'plex'.
-            protocolCapabilities (list<str>): List of client capabilities (navigation, playback,
-                timeline, mirror, playqueues).
-            protocolVersion (str): Protocol version (1, future proofing?)
-            server (:class:`~plexapi.server.PlexServer`): Server this client is connected to.
-            session (:class:`~requests.Session`): Session object used for connection.
-            state (str): Unknown
-            title (str): Name of this client (Johns iPhone, etc).
-            token (str): X-Plex-Token used for authentication
-            vendor (str): Unknown
-            version (str): Device version (4.6.1, etc).
-            _baseurl (str): HTTP address of the client.
-            _token (str): Token used to access this client.
-            _session (obj): Requests session object used to access this client.
-            _proxyThroughServer (bool): Set to True after calling
-                :func:`~plexapi.client.PlexClient.proxyThroughServer` (default False).
-    """
-    TAG = 'Player'
-    key = '/resources'
-
-    def __init__(self, server=None, data=None, initpath=None, baseurl=None,
-          identifier=None, token=None, connect=True, session=None, timeout=None,
-          parent=None):
-        super(PlexClient, self).__init__(server, data, initpath)
-        self._baseurl = baseurl.strip('/') if baseurl else None
-        self._clientIdentifier = identifier
-        self._token = logfilter.add_secret(token)
-        self._showSecrets = CONFIG.get('log.show_secrets', '').lower() == 'true'
-        server_session = server._session if server else None
-        self._session = session or server_session or requests.Session()
-        self._timeout = timeout or TIMEOUT
-        self._proxyThroughServer = False
-        self._commandId = 0
-        self._last_call = 0
-        self._timeline_cache = []
-        self._timeline_cache_timestamp = 0
-        self._parent = weakref.ref(parent) if parent is not None else None
-        if not any([data is not None, initpath, baseurl, token]):
-            self._baseurl = CONFIG.get('auth.client_baseurl', 'http://localhost:32433')
-            self._token = logfilter.add_secret(CONFIG.get('auth.client_token'))
-        if connect and self._baseurl:
-            self.connect(timeout=timeout)
-
-    def _nextCommandId(self):
-        self._commandId += 1
-        return self._commandId
-
-    def connect(self, timeout=None):
-        """ Alias of reload as any subsequent requests to this client will be
-            made directly to the device even if the object attributes were initially
-            populated from a PlexServer.
-        """
-        if not self.key:
-            raise Unsupported('Cannot reload an object not built from a URL.')
-        self._initpath = self.key
-        data = self.query(self.key, timeout=timeout)
-        if data is None:
-            raise NotFound(f"Client not found at {self._baseurl}")
-        if self._clientIdentifier:
-            client = next(
-                (
-                    x
-                    for x in data
-                    if x.attrib.get("machineIdentifier") == self._clientIdentifier
-                ),
-                None,
-            )
-            if client is None:
-                raise NotFound(
-                    f"Client with identifier {self._clientIdentifier} not found at {self._baseurl}"
-                )
-        else:
-            client = data[0]
-        self._invalidateCacheAndLoadData(client)
-        return self
-
-    def reload(self):
-        """ Alias to self.connect(). """
-        return self.connect()
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.deviceClass = data.attrib.get('deviceClass')
-        self.machineIdentifier = data.attrib.get('machineIdentifier')
-        self.product = data.attrib.get('product')
-        self.protocol = data.attrib.get('protocol')
-        self.protocolCapabilities = data.attrib.get('protocolCapabilities', '').split(',')
-        self.protocolVersion = data.attrib.get('protocolVersion')
-        self.platform = data.attrib.get('platform')
-        self.platformVersion = data.attrib.get('platformVersion')
-        self.title = data.attrib.get('title') or data.attrib.get('name')
-        # Active session details
-        # Since protocolCapabilities is missing from /sessions we can't really control this player without
-        # creating a client manually.
-        # Add this in next breaking release.
-        # if self._initpath == 'status/sessions':
-        self.device = data.attrib.get('device')         # session
-        self.profile = data.attrib.get('profile')       # session
-        self.model = data.attrib.get('model')           # session
-        self.state = data.attrib.get('state')           # session
-        self.vendor = data.attrib.get('vendor')         # session
-        self.version = data.attrib.get('version')       # session
-        self.local = utils.cast(bool, data.attrib.get('local', 0))  # session
-        self.relayed = utils.cast(bool, data.attrib.get('relayed', 0))  # session
-        self.secure = utils.cast(bool, data.attrib.get('secure', 0))  # session
-        self.address = data.attrib.get('address')       # session
-        self.remotePublicAddress = data.attrib.get('remotePublicAddress')
-        self.userID = data.attrib.get('userID')
-
-    def _headers(self, **kwargs):
-        """ Returns a dict of all default headers for Client requests. """
-        headers = BASE_HEADERS
-        if self._token:
-            headers['X-Plex-Token'] = self._token
-        headers.update(kwargs)
-        return headers
-
-    def proxyThroughServer(self, value=True, server=None):
-        """ Tells this PlexClient instance to proxy all future commands through the PlexServer.
-            Useful if you do not wish to connect directly to the Client device itself.
-
-            Parameters:
-                value (bool): Enable or disable proxying (optional, default True).
-
-            Raises:
-                :exc:`~plexapi.exceptions.Unsupported`: Cannot use client proxy with unknown server.
-        """
-        if server:
-            self._server = server
-        if value is True and not self._server:
-            raise Unsupported('Cannot use client proxy with unknown server.')
-        self._proxyThroughServer = value
-
-    def query(self, path, method=None, headers=None, timeout=None, **kwargs):
-        """ Main method used to handle HTTPS requests to the Plex client. This method helps
-            by encoding the response to utf-8 and parsing the returned XML into and
-            ElementTree object. Returns None if no data exists in the response.
-        """
-        url = self.url(path)
-        method = method or self._session.get
-        timeout = timeout or self._timeout
-        log.debug('%s %s', method.__name__.upper(), url)
-        headers = self._headers(**headers or {})
-        response = method(url, headers=headers, timeout=timeout, **kwargs)
-        if response.status_code not in (200, 201, 204):
-            codename = codes.get(response.status_code)[0]
-            errtext = response.text.replace('\n', ' ')
-            message = f'({response.status_code}) {codename}; {response.url} {errtext}'
-            if response.status_code == 401:
-                raise Unauthorized(message)
-            elif response.status_code == 404:
-                raise NotFound(message)
-            else:
-                raise BadRequest(message)
-        return utils.parseXMLString(response.text)
-
-    def sendCommand(self, command, proxy=None, **params):
-        """ Convenience wrapper around :func:`~plexapi.client.PlexClient.query` to more easily
-            send simple commands to the client. Returns an ElementTree object containing
-            the response.
-
-            Parameters:
-                command (str): Command to be sent in for format '<controller>/<command>'.
-                proxy (bool): Set True to proxy this command through the PlexServer.
-                **params (dict): Additional GET parameters to include with the command.
-
-            Raises:
-                :exc:`~plexapi.exceptions.Unsupported`: When we detect the client doesn't support this capability.
-        """
-        command = command.strip('/')
-        controller = command.split('/')[0]
-        headers = {'X-Plex-Target-Client-Identifier': self.machineIdentifier}
-        if controller not in self.protocolCapabilities:
-            log.debug("Client %s doesn't support %s controller. What your trying might not work", self.title, controller)
-
-        proxy = self._proxyThroughServer if proxy is None else proxy
-        query = self._server.query if proxy else self.query
-
-        # Workaround for ptp. See https://github.com/pushingkarmaorg/python-plexapi/issues/244
-        t = time.time()
-        if command == 'timeline/poll':
-            self._last_call = t
-        elif t - self._last_call >= 80 and self.product in ('ptp', 'Plex Media Player'):
-            self._last_call = t
-            self.sendCommand(ClientTimeline.key, wait=0)
-
-        params['commandID'] = self._nextCommandId()
-        key = f'/player/{command}{utils.joinArgs(params)}'
-
-        try:
-            return query(key, headers=headers)
-        except ElementTree.ParseError:
-            # Workaround for players which don't return valid XML on successful commands
-            #   - Plexamp, Plex for Android: `b'OK'`
-            #   - Plex for Samsung: `b'<?xml version="1.0"?><Response code="200" status="OK">'`
-            if self.product in (
-                'Plexamp',
-                'Plex for Android (TV)',
-                'Plex for Android (Mobile)',
-                'Plex for Samsung',
-            ):
-                return
-            raise
-
-    def url(self, key, includeToken=False):
-        """ Build a URL string with proper token argument. Token will be appended to the URL
-            if either includeToken is True or CONFIG.log.show_secrets is 'true'.
-        """
-        if not self._baseurl:
-            raise BadRequest('PlexClient object missing baseurl.')
-        if self._token and (includeToken or self._showSecrets):
-            delim = '&' if '?' in key else '?'
-            return f'{self._baseurl}{key}{delim}X-Plex-Token={self._token}'
-        return f'{self._baseurl}{key}'
-
-    # ---------------------
-    # Navigation Commands
-    # These commands navigate around the user-interface.
-    def contextMenu(self):
-        """ Open the context menu on the client. """
-        self.sendCommand('navigation/contextMenu')
-
-    def goBack(self):
-        """ Navigate back one position. """
-        self.sendCommand('navigation/back')
-
-    def goToHome(self):
-        """ Go directly to the home screen. """
-        self.sendCommand('navigation/home')
-
-    def goToMusic(self):
-        """ Go directly to the playing music panel. """
-        self.sendCommand('navigation/music')
-
-    def moveDown(self):
-        """ Move selection down a position. """
-        self.sendCommand('navigation/moveDown')
-
-    def moveLeft(self):
-        """ Move selection left a position. """
-        self.sendCommand('navigation/moveLeft')
-
-    def moveRight(self):
-        """ Move selection right a position. """
-        self.sendCommand('navigation/moveRight')
-
-    def moveUp(self):
-        """ Move selection up a position. """
-        self.sendCommand('navigation/moveUp')
-
-    def nextLetter(self):
-        """ Jump to next letter in the alphabet. """
-        self.sendCommand('navigation/nextLetter')
-
-    def pageDown(self):
-        """ Move selection down a full page. """
-        self.sendCommand('navigation/pageDown')
-
-    def pageUp(self):
-        """ Move selection up a full page. """
-        self.sendCommand('navigation/pageUp')
-
-    def previousLetter(self):
-        """ Jump to previous letter in the alphabet. """
-        self.sendCommand('navigation/previousLetter')
-
-    def select(self):
-        """ Select element at the current position. """
-        self.sendCommand('navigation/select')
-
-    def toggleOSD(self):
-        """ Toggle the on screen display during playback. """
-        self.sendCommand('navigation/toggleOSD')
-
-    def goToMedia(self, media, **params):
-        """ Navigate directly to the specified media page.
-
-            Parameters:
-                media (:class:`~plexapi.media.Media`): Media object to navigate to.
-                **params (dict): Additional GET parameters to include with the command.
-        """
-        server_url = media._server._baseurl.split(':')
-        command = {
-            'machineIdentifier': media._server.machineIdentifier,
-            'address': server_url[1].strip('/'),
-            'port': server_url[-1],
-            'key': media.key,
-            'protocol': server_url[0],
-            **params,
-        }
-        token = media._server.createToken()
-        if token:
-            command["token"] = token
-
-        self.sendCommand("mirror/details", **command)
-
-    # -------------------
-    # Playback Commands
-    # Most of the playback commands take a mandatory mtype {'music','photo','video'} argument,
-    # to specify which media type to apply the command to, (except for playMedia). This
-    # is in case there are multiple things happening (e.g. music in the background, photo
-    # slideshow in the foreground).
-    def pause(self, mtype=DEFAULT_MTYPE):
-        """ Pause the currently playing media type.
-
-            Parameters:
-                mtype (str): Media type to take action against (music, photo, video).
-        """
-        self.sendCommand('playback/pause', type=mtype)
-
-    def play(self, mtype=DEFAULT_MTYPE):
-        """ Start playback for the specified media type.
-
-            Parameters:
-                mtype (str): Media type to take action against (music, photo, video).
-        """
-        self.sendCommand('playback/play', type=mtype)
-
-    def refreshPlayQueue(self, playQueueID, mtype=DEFAULT_MTYPE):
-        """ Refresh the specified Playqueue.
-
-            Parameters:
-                playQueueID (str): Playqueue ID.
-                mtype (str): Media type to take action against (music, photo, video).
-        """
-        self.sendCommand(
-            'playback/refreshPlayQueue', playQueueID=playQueueID, type=mtype)
-
-    def seekTo(self, offset, mtype=DEFAULT_MTYPE):
-        """ Seek to the specified offset (ms) during playback.
-
-            Parameters:
-                offset (int): Position to seek to (milliseconds).
-                mtype (str): Media type to take action against (music, photo, video).
-        """
-        self.sendCommand('playback/seekTo', offset=offset, type=mtype)
-
-    def skipNext(self, mtype=DEFAULT_MTYPE):
-        """ Skip to the next playback item.
-
-            Parameters:
-                mtype (str): Media type to take action against (music, photo, video).
-        """
-        self.sendCommand('playback/skipNext', type=mtype)
-
-    def skipPrevious(self, mtype=DEFAULT_MTYPE):
-        """ Skip to previous playback item.
-
-            Parameters:
-                mtype (str): Media type to take action against (music, photo, video).
-        """
-        self.sendCommand('playback/skipPrevious', type=mtype)
-
-    def skipTo(self, key, mtype=DEFAULT_MTYPE):
-        """ Skip to the playback item with the specified key.
-
-            Parameters:
-                key (str): Key of the media item to skip to.
-                mtype (str): Media type to take action against (music, photo, video).
-        """
-        self.sendCommand('playback/skipTo', key=key, type=mtype)
-
-    def stepBack(self, mtype=DEFAULT_MTYPE):
-        """ Step backward a chunk of time in the current playback item.
-
-            Parameters:
-                mtype (str): Media type to take action against (music, photo, video).
-        """
-        self.sendCommand('playback/stepBack', type=mtype)
-
-    def stepForward(self, mtype=DEFAULT_MTYPE):
-        """ Step forward a chunk of time in the current playback item.
-
-            Parameters:
-                mtype (str): Media type to take action against (music, photo, video).
-        """
-        self.sendCommand('playback/stepForward', type=mtype)
-
-    def stop(self, mtype=DEFAULT_MTYPE):
-        """ Stop the currently playing item.
-
-            Parameters:
-                mtype (str): Media type to take action against (music, photo, video).
-        """
-        self.sendCommand('playback/stop', type=mtype)
-
-    def setRepeat(self, repeat, mtype=DEFAULT_MTYPE):
-        """ Enable repeat for the specified playback items.
-
-            Parameters:
-                repeat (int): Repeat mode (0=off, 1=repeatone, 2=repeatall).
-                mtype (str): Media type to take action against (music, photo, video).
-        """
-        self.setParameters(repeat=repeat, mtype=mtype)
-
-    def setShuffle(self, shuffle, mtype=DEFAULT_MTYPE):
-        """ Enable shuffle for the specified playback items.
-
-            Parameters:
-                shuffle (int): Shuffle mode (0=off, 1=on)
-                mtype (str): Media type to take action against (music, photo, video).
-        """
-        self.setParameters(shuffle=shuffle, mtype=mtype)
-
-    def setVolume(self, volume, mtype=DEFAULT_MTYPE):
-        """ Enable volume for the current playback item.
-
-            Parameters:
-                volume (int): Volume level (0-100).
-                mtype (str): Media type to take action against (music, photo, video).
-        """
-        self.setParameters(volume=volume, mtype=mtype)
-
-    def setAudioStream(self, audioStreamID, mtype=DEFAULT_MTYPE):
-        """ Select the audio stream for the current playback item (only video).
-
-            Parameters:
-                audioStreamID (str): ID of the audio stream from the media object.
-                mtype (str): Media type to take action against (music, photo, video).
-        """
-        self.setStreams(audioStreamID=audioStreamID, mtype=mtype)
-
-    def setSubtitleStream(self, subtitleStreamID, mtype=DEFAULT_MTYPE):
-        """ Select the subtitle stream for the current playback item (only video).
-
-            Parameters:
-                subtitleStreamID (str): ID of the subtitle stream from the media object.
-                mtype (str): Media type to take action against (music, photo, video).
-        """
-        self.setStreams(subtitleStreamID=subtitleStreamID, mtype=mtype)
-
-    def setVideoStream(self, videoStreamID, mtype=DEFAULT_MTYPE):
-        """ Select the video stream for the current playback item (only video).
-
-            Parameters:
-                videoStreamID (str): ID of the video stream from the media object.
-                mtype (str): Media type to take action against (music, photo, video).
-        """
-        self.setStreams(videoStreamID=videoStreamID, mtype=mtype)
-
-    def playMedia(self, media, offset=0, **params):
-        """ Start playback of the specified media item. See also:
-
-            Parameters:
-                media (:class:`~plexapi.media.Media`): Media item to be played back
-                    (movie, music, photo, playlist, playqueue).
-                offset (int): Number of milliseconds at which to start playing with zero
-                    representing the beginning (default 0).
-                **params (dict): Optional additional parameters to include in the playback request. See
-                    also: https://github.com/plexinc/plex-media-player/wiki/Remote-control-API#modified-commands
-        """
-        server_url = media._server._baseurl.split(':')
-        server_port = server_url[-1].strip('/')
-
-        if hasattr(media, "playlistType"):
-            mediatype = media.playlistType
-        else:
-            if isinstance(media, PlayQueue):
-                mediatype = media.items[0].listType
-            else:
-                mediatype = media.listType
-
-        # mediatype must be in ["video", "music", "photo"]
-        if mediatype == "audio":
-            mediatype = "music"
-
-        playqueue = media if isinstance(media, PlayQueue) else media._server.createPlayQueue(media)
-        command = {
-            'providerIdentifier': 'com.plexapp.plugins.library',
-            'machineIdentifier': media._server.machineIdentifier,
-            'protocol': server_url[0],
-            'address': server_url[1].strip('/'),
-            'port': server_port,
-            'offset': offset,
-            'key': media.key or playqueue.selectedItem.key,
-            'type': mediatype,
-            'containerKey': f'/playQueues/{playqueue.playQueueID}?window=100&own=1',
-            **params,
-        }
-        token = media._server.createToken()
-        if token:
-            command["token"] = token
-
-        self.sendCommand("playback/playMedia", **command)
-
-    def setParameters(self, volume=None, shuffle=None, repeat=None, mtype=DEFAULT_MTYPE):
-        """ Set multiple playback parameters at once.
-
-            Parameters:
-                volume (int): Volume level (0-100; optional).
-                shuffle (int): Shuffle mode (0=off, 1=on; optional).
-                repeat (int): Repeat mode (0=off, 1=repeatone, 2=repeatall; optional).
-                mtype (str): Media type to take action against (optional music, photo, video).
-        """
-        params = {}
-        if repeat is not None:
-            params['repeat'] = repeat
-        if shuffle is not None:
-            params['shuffle'] = shuffle
-        if volume is not None:
-            params['volume'] = volume
-        if mtype is not None:
-            params['type'] = mtype
-        self.sendCommand('playback/setParameters', **params)
-
-    def setStreams(self, audioStreamID=None, subtitleStreamID=None, videoStreamID=None, mtype=DEFAULT_MTYPE):
-        """ Select multiple playback streams at once.
-
-            Parameters:
-                audioStreamID (str): ID of the audio stream from the media object.
-                subtitleStreamID (str): ID of the subtitle stream from the media object.
-                videoStreamID (str): ID of the video stream from the media object.
-                mtype (str): Media type to take action against (optional music, photo, video).
-        """
-        params = {}
-        if audioStreamID is not None:
-            params['audioStreamID'] = audioStreamID
-        if subtitleStreamID is not None:
-            params['subtitleStreamID'] = subtitleStreamID
-        if videoStreamID is not None:
-            params['videoStreamID'] = videoStreamID
-        if mtype is not None:
-            params['type'] = mtype
-        self.sendCommand('playback/setStreams', **params)
-
-    # -------------------
-    # Timeline Commands
-    def timelines(self, wait=0):
-        """Poll the client's timelines, create, and return timeline objects.
-           Some clients may not always respond to timeline requests, believe this
-           to be a Plex bug.
-        """
-        t = time.time()
-        if t - self._timeline_cache_timestamp > 1:
-            self._timeline_cache_timestamp = t
-            timelines = self.sendCommand(ClientTimeline.key, wait=wait) or []
-            self._timeline_cache = [ClientTimeline(self, data) for data in timelines]
-
-        return self._timeline_cache
-
-    @property
-    def timeline(self):
-        """Returns the active timeline object."""
-        return next((x for x in self.timelines() if x.state != 'stopped'), None)
-
-    def isPlayingMedia(self, includePaused=True):
-        """Returns True if any media is currently playing.
-
-            Parameters:
-                includePaused (bool): Set True to treat currently paused items
-                                      as playing (optional; default True).
-        """
-        state = getattr(self.timeline, "state", None)
-        return bool(state == 'playing' or (includePaused and state == 'paused'))
-
-
-class ClientTimeline(PlexObject):
-    """Get the timeline's attributes."""
-
-    key = 'timeline/poll'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.address = data.attrib.get('address')
-        self.audioStreamId = utils.cast(int, data.attrib.get('audioStreamId'))
-        self.autoPlay = utils.cast(bool, data.attrib.get('autoPlay'))
-        self.containerKey = data.attrib.get('containerKey')
-        self.controllable = data.attrib.get('controllable')
-        self.duration = utils.cast(int, data.attrib.get('duration'))
-        self.itemType = data.attrib.get('itemType')
-        self.key = data.attrib.get('key')
-        self.location = data.attrib.get('location')
-        self.machineIdentifier = data.attrib.get('machineIdentifier')
-        self.partCount = utils.cast(int, data.attrib.get('partCount'))
-        self.partIndex = utils.cast(int, data.attrib.get('partIndex'))
-        self.playQueueID = utils.cast(int, data.attrib.get('playQueueID'))
-        self.playQueueItemID = utils.cast(int, data.attrib.get('playQueueItemID'))
-        self.playQueueVersion = utils.cast(int, data.attrib.get('playQueueVersion'))
-        self.port = utils.cast(int, data.attrib.get('port'))
-        self.protocol = data.attrib.get('protocol')
-        self.providerIdentifier = data.attrib.get('providerIdentifier')
-        self.ratingKey = utils.cast(int, data.attrib.get('ratingKey'))
-        self.repeat = utils.cast(int, data.attrib.get('repeat'))
-        self.seekRange = data.attrib.get('seekRange')
-        self.shuffle = utils.cast(bool, data.attrib.get('shuffle'))
-        self.state = data.attrib.get('state')
-        self.subtitleColor = data.attrib.get('subtitleColor')
-        self.subtitlePosition = data.attrib.get('subtitlePosition')
-        self.subtitleSize = utils.cast(int, data.attrib.get('subtitleSize'))
-        self.time = utils.cast(int, data.attrib.get('time'))
-        self.type = data.attrib.get('type')
-        self.volume = utils.cast(int, data.attrib.get('volume'))
diff --git a/lib/plexapi/collection.py b/lib/plexapi/collection.py
deleted file mode 100644
index 308604a0..00000000
--- a/lib/plexapi/collection.py
+++ /dev/null
@@ -1,596 +0,0 @@
-# -*- coding: utf-8 -*-
-from pathlib import Path
-from urllib.parse import quote_plus
-
-from plexapi import media, utils
-from plexapi.base import PlexPartialObject, cached_data_property
-from plexapi.exceptions import BadRequest, NotFound, Unsupported
-from plexapi.library import LibrarySection, ManagedHub
-from plexapi.mixins import (
-    AdvancedSettingsMixin, SmartFilterMixin, HubsMixin, RatingMixin,
-    ArtMixin, PosterMixin, ThemeMixin,
-    CollectionEditMixins
-)
-from plexapi.utils import deprecated
-
-
-@utils.registerPlexObject
-class Collection(
-    PlexPartialObject,
-    AdvancedSettingsMixin, SmartFilterMixin, HubsMixin, RatingMixin,
-    ArtMixin, PosterMixin, ThemeMixin,
-    CollectionEditMixins
-):
-    """ Represents a single Collection.
-
-        Attributes:
-            TAG (str): 'Directory'
-            TYPE (str): 'collection'
-            addedAt (datetime): Datetime the collection was added to the library.
-            art (str): URL to artwork image (/library/metadata/<ratingKey>/art/<artid>).
-            artBlurHash (str): BlurHash string for artwork image.
-            audienceRating (float): Audience rating.
-            childCount (int): Number of items in the collection.
-            collectionFilterBasedOnUser (int): Which user's activity is used for the collection filtering.
-            collectionMode (int): How the items in the collection are displayed.
-            collectionPublished (bool): True if the collection is published to the Plex homepage.
-            collectionSort (int): How to sort the items in the collection.
-            content (str): The filter URI string for smart collections.
-            contentRating (str) Content rating (PG-13; NR; TV-G).
-            fields (List<:class:`~plexapi.media.Field`>): List of field objects.
-            guid (str): Plex GUID for the collection (collection://XXXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXX).
-            images (List<:class:`~plexapi.media.Image`>): List of image objects.
-            index (int): Plex index number for the collection.
-            key (str): API URL (/library/metadata/<ratingkey>).
-            labels (List<:class:`~plexapi.media.Label`>): List of label objects.
-            lastRatedAt (datetime): Datetime the collection was last rated.
-            librarySectionID (int): :class:`~plexapi.library.LibrarySection` ID.
-            librarySectionKey (str): :class:`~plexapi.library.LibrarySection` key.
-            librarySectionTitle (str): :class:`~plexapi.library.LibrarySection` title.
-            maxYear (int): Maximum year for the items in the collection.
-            minYear (int): Minimum year for the items in the collection.
-            rating (float): Collection rating (7.9; 9.8; 8.1).
-            ratingCount (int): The number of ratings.
-            ratingKey (int): Unique key identifying the collection.
-            smart (bool): True if the collection is a smart collection.
-            subtype (str): Media type of the items in the collection (movie, show, artist, or album).
-            summary (str): Summary of the collection.
-            theme (str): URL to theme resource (/library/metadata/<ratingkey>/theme/<themeid>).
-            thumb (str): URL to thumbnail image (/library/metadata/<ratingKey>/thumb/<thumbid>).
-            thumbBlurHash (str): BlurHash string for thumbnail image.
-            title (str): Name of the collection.
-            titleSort (str): Title to use when sorting (defaults to title).
-            type (str): 'collection'
-            ultraBlurColors (:class:`~plexapi.media.UltraBlurColors`): Ultra blur color object.
-            updatedAt (datetime): Datetime the collection was updated.
-            userRating (float): Rating of the collection (0.0 - 10.0) equaling (0 stars - 5 stars).
-    """
-    TAG = 'Directory'
-    TYPE = 'collection'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.addedAt = utils.toDatetime(data.attrib.get('addedAt'))
-        self.art = data.attrib.get('art')
-        self.artBlurHash = data.attrib.get('artBlurHash')
-        self.audienceRating = utils.cast(float, data.attrib.get('audienceRating'))
-        self.childCount = utils.cast(int, data.attrib.get('childCount'))
-        self.collectionFilterBasedOnUser = utils.cast(int, data.attrib.get('collectionFilterBasedOnUser', '0'))
-        self.collectionMode = utils.cast(int, data.attrib.get('collectionMode', '-1'))
-        self.collectionPublished = utils.cast(bool, data.attrib.get('collectionPublished', '0'))
-        self.collectionSort = utils.cast(int, data.attrib.get('collectionSort', '0'))
-        self.content = data.attrib.get('content')
-        self.contentRating = data.attrib.get('contentRating')
-        self.guid = data.attrib.get('guid')
-        self.index = utils.cast(int, data.attrib.get('index'))
-        self.key = data.attrib.get('key', '').replace('/children', '')  # FIX_BUG_50
-        self.lastRatedAt = utils.toDatetime(data.attrib.get('lastRatedAt'))
-        self.librarySectionID = utils.cast(int, data.attrib.get('librarySectionID'))
-        self.librarySectionKey = data.attrib.get('librarySectionKey')
-        self.librarySectionTitle = data.attrib.get('librarySectionTitle')
-        self.maxYear = utils.cast(int, data.attrib.get('maxYear'))
-        self.minYear = utils.cast(int, data.attrib.get('minYear'))
-        self.rating = utils.cast(float, data.attrib.get('rating'))
-        self.ratingCount = utils.cast(int, data.attrib.get('ratingCount'))
-        self.ratingKey = utils.cast(int, data.attrib.get('ratingKey'))
-        self.smart = utils.cast(bool, data.attrib.get('smart', '0'))
-        self.subtype = data.attrib.get('subtype')
-        self.summary = data.attrib.get('summary')
-        self.theme = data.attrib.get('theme')
-        self.thumb = data.attrib.get('thumb')
-        self.thumbBlurHash = data.attrib.get('thumbBlurHash')
-        self.title = data.attrib.get('title')
-        self.titleSort = data.attrib.get('titleSort', self.title)
-        self.type = data.attrib.get('type')
-        self.updatedAt = utils.toDatetime(data.attrib.get('updatedAt'))
-        self.userRating = utils.cast(float, data.attrib.get('userRating'))
-
-    @cached_data_property
-    def fields(self):
-        return self.findItems(self._data, media.Field)
-
-    @cached_data_property
-    def images(self):
-        return self.findItems(self._data, media.Image)
-
-    @cached_data_property
-    def labels(self):
-        return self.findItems(self._data, media.Label)
-
-    @cached_data_property
-    def ultraBlurColors(self):
-        return self.findItem(self._data, media.UltraBlurColors)
-
-    def __len__(self):  # pragma: no cover
-        return len(self.items())
-
-    def __iter__(self):  # pragma: no cover
-        for item in self.items():
-            yield item
-
-    def __contains__(self, other):  # pragma: no cover
-        return any(i.key == other.key for i in self.items())
-
-    def __getitem__(self, key):  # pragma: no cover
-        return self.items()[key]
-
-    @property
-    def listType(self):
-        """ Returns the listType for the collection. """
-        if self.isVideo:
-            return 'video'
-        elif self.isAudio:
-            return 'audio'
-        elif self.isPhoto:
-            return 'photo'
-        else:
-            raise Unsupported('Unexpected collection type')
-
-    @property
-    def metadataType(self):
-        """ Returns the type of metadata in the collection. """
-        return self.subtype
-
-    @property
-    def isVideo(self):
-        """ Returns True if this is a video collection. """
-        return self.subtype in {'movie', 'show', 'season', 'episode'}
-
-    @property
-    def isAudio(self):
-        """ Returns True if this is an audio collection. """
-        return self.subtype in {'artist', 'album', 'track'}
-
-    @property
-    def isPhoto(self):
-        """ Returns True if this is a photo collection. """
-        return self.subtype in {'photoalbum', 'photo'}
-
-    @property
-    @deprecated('use "items" instead', stacklevel=3)
-    def children(self):
-        return self.items()
-
-    @cached_data_property
-    def _filters(self):
-        """ Cache for filters. """
-        return self._parseFilters(self.content)
-
-    def filters(self):
-        """ Returns the search filter dict for smart collection.
-            The filter dict be passed back into :func:`~plexapi.library.LibrarySection.search`
-            to get the list of items.
-        """
-        return self._filters
-
-    @cached_data_property
-    def _section(self):
-        """ Cache for section. """
-        return super(Collection, self).section()
-
-    def section(self):
-        """ Returns the :class:`~plexapi.library.LibrarySection` this collection belongs to.
-        """
-        return self._section
-
-    def item(self, title):
-        """ Returns the item in the collection that matches the specified title.
-
-            Parameters:
-                title (str): Title of the item to return.
-
-            Raises:
-                :class:`plexapi.exceptions.NotFound`: When the item is not found in the collection.
-        """
-        for item in self.items():
-            if item.title.lower() == title.lower():
-                return item
-        raise NotFound(f'Item with title "{title}" not found in the collection')
-
-    @cached_data_property
-    def _items(self):
-        """ Cache for the items. """
-        key = f'{self.key}/children'
-        return self.fetchItems(key)
-
-    def items(self):
-        """ Returns a list of all items in the collection. """
-        return self._items
-
-    def visibility(self):
-        """ Returns the :class:`~plexapi.library.ManagedHub` for this collection. """
-        key = f'/hubs/sections/{self.librarySectionID}/manage?metadataItemId={self.ratingKey}'
-        data = self._server.query(key)
-        hub = self.findItem(data, cls=ManagedHub)
-        if hub is None:
-            hub = ManagedHub(self._server, data, parent=self)
-            hub.identifier = f'custom.collection.{self.librarySectionID}.{self.ratingKey}'
-            hub.title = self.title
-            hub._promoted = False
-        return hub
-
-    def get(self, title):
-        """ Alias to :func:`~plexapi.library.Collection.item`. """
-        return self.item(title)
-
-    def filterUserUpdate(self, user=None):
-        """ Update the collection filtering user advanced setting.
-
-            Parameters:
-                user (str): One of the following values:
-                    "admin" (Always the server admin user),
-                    "user" (User currently viewing the content)
-
-            Example:
-
-                .. code-block:: python
-
-                    collection.updateMode(user="user")
-
-        """
-        if not self.smart:
-            raise BadRequest('Cannot change collection filtering user for a non-smart collection.')
-
-        user_dict = {
-            'admin': 0,
-            'user': 1
-        }
-        key = user_dict.get(user)
-        if key is None:
-            raise BadRequest(f'Unknown collection filtering user: {user}. Options {list(user_dict)}')
-        return self.editAdvanced(collectionFilterBasedOnUser=key)
-
-    def modeUpdate(self, mode=None):
-        """ Update the collection mode advanced setting.
-
-            Parameters:
-                mode (str): One of the following values:
-                    "default" (Library default),
-                    "hide" (Hide Collection),
-                    "hideItems" (Hide Items in this Collection),
-                    "showItems" (Show this Collection and its Items)
-
-            Example:
-
-                .. code-block:: python
-
-                    collection.updateMode(mode="hide")
-
-        """
-        mode_dict = {
-            'default': -1,
-            'hide': 0,
-            'hideItems': 1,
-            'showItems': 2
-        }
-        key = mode_dict.get(mode)
-        if key is None:
-            raise BadRequest(f'Unknown collection mode: {mode}. Options {list(mode_dict)}')
-        return self.editAdvanced(collectionMode=key)
-
-    def sortUpdate(self, sort=None):
-        """ Update the collection order advanced setting.
-
-            Parameters:
-                sort (str): One of the following values:
-                    "release" (Order Collection by release dates),
-                    "alpha" (Order Collection alphabetically),
-                    "custom" (Custom collection order)
-
-            Example:
-
-                .. code-block:: python
-
-                    collection.sortUpdate(sort="alpha")
-
-        """
-        if self.smart:
-            raise BadRequest('Cannot change collection order for a smart collection.')
-
-        sort_dict = {
-            'release': 0,
-            'alpha': 1,
-            'custom': 2
-        }
-        key = sort_dict.get(sort)
-        if key is None:
-            raise BadRequest(f'Unknown sort dir: {sort}. Options: {list(sort_dict)}')
-        return self.editAdvanced(collectionSort=key)
-
-    def addItems(self, items):
-        """ Add items to the collection.
-
-            Parameters:
-                items (List): List of :class:`~plexapi.audio.Audio`, :class:`~plexapi.video.Video`,
-                    or :class:`~plexapi.photo.Photo` objects to be added to the collection.
-
-            Raises:
-                :class:`plexapi.exceptions.BadRequest`: When trying to add items to a smart collection.
-        """
-        if self.smart:
-            raise BadRequest('Cannot add items to a smart collection.')
-
-        if items and not isinstance(items, (list, tuple)):
-            items = [items]
-
-        ratingKeys = []
-        for item in items:
-            if item.type != self.subtype:  # pragma: no cover
-                raise BadRequest(f'Can not mix media types when building a collection: {self.subtype} and {item.type}')
-            ratingKeys.append(str(item.ratingKey))
-
-        ratingKeys = ','.join(ratingKeys)
-        uri = f'{self._server._uriRoot()}/library/metadata/{ratingKeys}'
-
-        args = {'uri': uri}
-        key = f"{self.key}/items{utils.joinArgs(args)}"
-        self._server.query(key, method=self._server._session.put)
-        return self
-
-    def removeItems(self, items):
-        """ Remove items from the collection.
-
-            Parameters:
-                items (List): List of :class:`~plexapi.audio.Audio`, :class:`~plexapi.video.Video`,
-                    or :class:`~plexapi.photo.Photo` objects to be removed from the collection.
-
-            Raises:
-                :class:`plexapi.exceptions.BadRequest`: When trying to remove items from a smart collection.
-        """
-        if self.smart:
-            raise BadRequest('Cannot remove items from a smart collection.')
-
-        if items and not isinstance(items, (list, tuple)):
-            items = [items]
-
-        for item in items:
-            key = f'{self.key}/items/{item.ratingKey}'
-            self._server.query(key, method=self._server._session.delete)
-        return self
-
-    def moveItem(self, item, after=None):
-        """ Move an item to a new position in the collection.
-
-            Parameters:
-                item (obj): :class:`~plexapi.audio.Audio`, :class:`~plexapi.video.Video`,
-                    or :class:`~plexapi.photo.Photo` object to be moved in the collection.
-                after (obj): :class:`~plexapi.audio.Audio`, :class:`~plexapi.video.Video`,
-                    or :class:`~plexapi.photo.Photo` object to move the item after in the collection.
-
-            Raises:
-                :class:`plexapi.exceptions.BadRequest`: When trying to move items in a smart collection.
-        """
-        if self.smart:
-            raise BadRequest('Cannot move items in a smart collection.')
-
-        key = f'{self.key}/items/{item.ratingKey}/move'
-
-        if after:
-            key += f'?after={after.ratingKey}'
-
-        self._server.query(key, method=self._server._session.put)
-        return self
-
-    def updateFilters(self, libtype=None, limit=None, sort=None, filters=None, **kwargs):
-        """ Update the filters for a smart collection.
-
-            Parameters:
-                libtype (str): The specific type of content to filter
-                    (movie, show, season, episode, artist, album, track, photoalbum, photo, collection).
-                limit (int): Limit the number of items in the collection.
-                sort (str or list, optional): A string of comma separated sort fields
-                    or a list of sort fields in the format ``column:dir``.
-                    See :func:`~plexapi.library.LibrarySection.search` for more info.
-                filters (dict): A dictionary of advanced filters.
-                    See :func:`~plexapi.library.LibrarySection.search` for more info.
-                **kwargs (dict): Additional custom filters to apply to the search results.
-                    See :func:`~plexapi.library.LibrarySection.search` for more info.
-
-            Raises:
-                :class:`plexapi.exceptions.BadRequest`: When trying update filters for a regular collection.
-        """
-        if not self.smart:
-            raise BadRequest('Cannot update filters for a regular collection.')
-
-        section = self.section()
-        searchKey = section._buildSearchKey(
-            sort=sort, libtype=libtype, limit=limit, filters=filters, **kwargs)
-        uri = f'{self._server._uriRoot()}{searchKey}'
-
-        args = {'uri': uri}
-        key = f"{self.key}/items{utils.joinArgs(args)}"
-        self._server.query(key, method=self._server._session.put)
-        return self
-
-    @deprecated('use editTitle, editSortTitle, editContentRating, and editSummary instead')
-    def edit(self, title=None, titleSort=None, contentRating=None, summary=None, **kwargs):
-        """ Edit the collection.
-
-            Parameters:
-                title (str, optional): The title of the collection.
-                titleSort (str, optional): The sort title of the collection.
-                contentRating (str, optional): The summary of the collection.
-                summary (str, optional): The summary of the collection.
-        """
-        args = {}
-        if title is not None:
-            args['title.value'] = title
-            args['title.locked'] = 1
-        if titleSort is not None:
-            args['titleSort.value'] = titleSort
-            args['titleSort.locked'] = 1
-        if contentRating is not None:
-            args['contentRating.value'] = contentRating
-            args['contentRating.locked'] = 1
-        if summary is not None:
-            args['summary.value'] = summary
-            args['summary.locked'] = 1
-
-        args.update(kwargs)
-        self._edit(**args)
-
-    def delete(self):
-        """ Delete the collection. """
-        super(Collection, self).delete()
-
-    @classmethod
-    def _create(cls, server, title, section, items):
-        """ Create a regular collection. """
-        if not items:
-            raise BadRequest('Must include items to add when creating new collection.')
-
-        if not isinstance(section, LibrarySection):
-            section = server.library.section(section)
-
-        if items and not isinstance(items, (list, tuple)):
-            items = [items]
-
-        itemType = items[0].type
-        ratingKeys = []
-        for item in items:
-            if item.type != itemType:  # pragma: no cover
-                raise BadRequest('Can not mix media types when building a collection.')
-            ratingKeys.append(str(item.ratingKey))
-
-        ratingKeys = ','.join(ratingKeys)
-        uri = f'{server._uriRoot()}/library/metadata/{ratingKeys}'
-
-        args = {'uri': uri, 'type': utils.searchType(itemType), 'title': title, 'smart': 0, 'sectionId': section.key}
-        key = f"/library/collections{utils.joinArgs(args)}"
-        data = server.query(key, method=server._session.post)[0]
-        return cls(server, data, initpath=key)
-
-    @classmethod
-    def _createSmart(cls, server, title, section, limit=None, libtype=None, sort=None, filters=None, **kwargs):
-        """ Create a smart collection. """
-        if not isinstance(section, LibrarySection):
-            section = server.library.section(section)
-
-        libtype = libtype or section.TYPE
-
-        searchKey = section._buildSearchKey(
-            sort=sort, libtype=libtype, limit=limit, filters=filters, **kwargs)
-        uri = f'{server._uriRoot()}{searchKey}'
-
-        args = {'uri': uri, 'type': utils.searchType(libtype), 'title': title, 'smart': 1, 'sectionId': section.key}
-        key = f"/library/collections{utils.joinArgs(args)}"
-        data = server.query(key, method=server._session.post)[0]
-        return cls(server, data, initpath=key)
-
-    @classmethod
-    def create(cls, server, title, section, items=None, smart=False, limit=None,
-               libtype=None, sort=None, filters=None, **kwargs):
-        """ Create a collection.
-
-            Parameters:
-                server (:class:`~plexapi.server.PlexServer`): Server to create the collection on.
-                title (str): Title of the collection.
-                section (:class:`~plexapi.library.LibrarySection`, str): The library section to create the collection in.
-                items (List): Regular collections only, list of :class:`~plexapi.audio.Audio`,
-                    :class:`~plexapi.video.Video`, or :class:`~plexapi.photo.Photo` objects to be added to the collection.
-                smart (bool): True to create a smart collection. Default False.
-                limit (int): Smart collections only, limit the number of items in the collection.
-                libtype (str): Smart collections only, the specific type of content to filter
-                    (movie, show, season, episode, artist, album, track, photoalbum, photo).
-                sort (str or list, optional): Smart collections only, a string of comma separated sort fields
-                    or a list of sort fields in the format ``column:dir``.
-                    See :func:`~plexapi.library.LibrarySection.search` for more info.
-                filters (dict): Smart collections only, a dictionary of advanced filters.
-                    See :func:`~plexapi.library.LibrarySection.search` for more info.
-                **kwargs (dict): Smart collections only, additional custom filters to apply to the
-                    search results. See :func:`~plexapi.library.LibrarySection.search` for more info.
-
-            Raises:
-                :class:`plexapi.exceptions.BadRequest`: When no items are included to create the collection.
-                :class:`plexapi.exceptions.BadRequest`: When mixing media types in the collection.
-
-            Returns:
-                :class:`~plexapi.collection.Collection`: A new instance of the created Collection.
-        """
-        if smart:
-            if items:
-                raise BadRequest('Cannot create a smart collection with items.')
-            return cls._createSmart(server, title, section, limit, libtype, sort, filters, **kwargs)
-        else:
-            return cls._create(server, title, section, items)
-
-    def sync(self, videoQuality=None, photoResolution=None, audioBitrate=None, client=None, clientId=None, limit=None,
-             unwatched=False, title=None):
-        """ Add the collection as sync item for the specified device.
-            See :func:`~plexapi.myplex.MyPlexAccount.sync` for possible exceptions.
-
-            Parameters:
-                videoQuality (int): idx of quality of the video, one of VIDEO_QUALITY_* values defined in
-                                    :mod:`~plexapi.sync` module. Used only when collection contains video.
-                photoResolution (str): maximum allowed resolution for synchronized photos, see PHOTO_QUALITY_* values in
-                                       the module :mod:`~plexapi.sync`. Used only when collection contains photos.
-                audioBitrate (int): maximum bitrate for synchronized music, better use one of MUSIC_BITRATE_* values
-                                    from the module :mod:`~plexapi.sync`. Used only when collection contains audio.
-                client (:class:`~plexapi.myplex.MyPlexDevice`): sync destination, see
-                                                               :func:`~plexapi.myplex.MyPlexAccount.sync`.
-                clientId (str): sync destination, see :func:`~plexapi.myplex.MyPlexAccount.sync`.
-                limit (int): maximum count of items to sync, unlimited if `None`.
-                unwatched (bool): if `True` watched videos wouldn't be synced.
-                title (str): descriptive title for the new :class:`~plexapi.sync.SyncItem`, if empty the value would be
-                             generated from metadata of current photo.
-
-            Raises:
-                :exc:`~plexapi.exceptions.BadRequest`: When collection is not allowed to sync.
-                :exc:`~plexapi.exceptions.Unsupported`: When collection content is unsupported.
-
-            Returns:
-                :class:`~plexapi.sync.SyncItem`: A new instance of the created sync item.
-        """
-        if not self.section().allowSync:
-            raise BadRequest('The collection is not allowed to sync')
-
-        from plexapi.sync import SyncItem, Policy, MediaSettings
-
-        myplex = self._server.myPlexAccount()
-        sync_item = SyncItem(self._server, None)
-        sync_item.title = title if title else self.title
-        sync_item.rootTitle = self.title
-        sync_item.contentType = self.listType
-        sync_item.metadataType = self.metadataType
-        sync_item.machineIdentifier = self._server.machineIdentifier
-
-        key = quote_plus(f'{self.key}/children?excludeAllLeaves=1')
-        sync_item.location = f'library:///directory/{key}'
-        sync_item.policy = Policy.create(limit, unwatched)
-
-        if self.isVideo:
-            sync_item.mediaSettings = MediaSettings.createVideo(videoQuality)
-        elif self.isAudio:
-            sync_item.mediaSettings = MediaSettings.createMusic(audioBitrate)
-        elif self.isPhoto:
-            sync_item.mediaSettings = MediaSettings.createPhoto(photoResolution)
-        else:
-            raise Unsupported('Unsupported collection content')
-
-        return myplex.sync(sync_item, client=client, clientId=clientId)
-
-    @property
-    def metadataDirectory(self):
-        """ Returns the Plex Media Server data directory where the metadata is stored. """
-        guid_hash = utils.sha1hash(self.guid)
-        return str(Path('Metadata') / 'Collections' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
diff --git a/lib/plexapi/config.py b/lib/plexapi/config.py
deleted file mode 100644
index 5cfa74c8..00000000
--- a/lib/plexapi/config.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# -*- coding: utf-8 -*-
-import os
-from collections import defaultdict
-from configparser import ConfigParser
-
-from plexapi import utils
-
-
-class PlexConfig(ConfigParser):
-    """ PlexAPI configuration object. Settings are stored in an INI file within the
-        user's home directory and can be overridden after importing plexapi by simply
-        setting the value. See the documentation section 'Configuration' for more
-        details on available options.
-
-        Parameters:
-            path (str): Path of the configuration file to load.
-    """
-
-    def __init__(self, path):
-        ConfigParser.__init__(self)
-        self.read(path)
-        self.data = self._asDict()
-
-    def get(self, key, default=None, cast=None):
-        """ Returns the specified configuration value or <default> if not found.
-
-            Parameters:
-                key (str): Configuration variable to load in the format '<section>.<variable>'.
-                default: Default value to use if key not found.
-                cast (func): Cast the value to the specified type before returning.
-        """
-        try:
-            # First: check environment variable is set
-            envkey = f"PLEXAPI_{key.upper().replace('.', '_')}"
-            value = os.environ.get(envkey)
-            if value is None:
-                # Second: check the config file has attr
-                section, name = key.lower().split('.')
-                value = self.data.get(section, {}).get(name, default)
-            return utils.cast(cast, value) if cast else value
-        except:  # noqa: E722
-            return default
-
-    def _asDict(self):
-        """ Returns all configuration values as a dictionary. """
-        config = defaultdict(dict)
-        for section in self._sections:
-            for name, value in self._sections[section].items():
-                if name != '__name__':
-                    config[section.lower()][name.lower()] = value
-        return dict(config)
-
-
-def reset_base_headers():
-    """ Convenience function returns a dict of all base X-Plex-* headers for session requests. """
-    import plexapi
-    return {
-        'X-Plex-Platform': plexapi.X_PLEX_PLATFORM,
-        'X-Plex-Platform-Version': plexapi.X_PLEX_PLATFORM_VERSION,
-        'X-Plex-Provides': plexapi.X_PLEX_PROVIDES,
-        'X-Plex-Product': plexapi.X_PLEX_PRODUCT,
-        'X-Plex-Version': plexapi.X_PLEX_VERSION,
-        'X-Plex-Device': plexapi.X_PLEX_DEVICE,
-        'X-Plex-Device-Name': plexapi.X_PLEX_DEVICE_NAME,
-        'X-Plex-Client-Identifier': plexapi.X_PLEX_IDENTIFIER,
-        'X-Plex-Language': plexapi.X_PLEX_LANGUAGE,
-        'X-Plex-Sync-Version': '2',
-        'X-Plex-Features': 'external-media',
-    }
diff --git a/lib/plexapi/const.py b/lib/plexapi/const.py
deleted file mode 100644
index 5b88be9c..00000000
--- a/lib/plexapi/const.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Constants used by plexapi."""
-
-# Library version
-MAJOR_VERSION = 4
-MINOR_VERSION = 17
-PATCH_VERSION = 0
-__short_version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}"
-__version__ = f"{__short_version__}.{PATCH_VERSION}"
diff --git a/lib/plexapi/exceptions.py b/lib/plexapi/exceptions.py
deleted file mode 100644
index 182feb13..00000000
--- a/lib/plexapi/exceptions.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-class PlexApiException(Exception):
-    """ Base class for all PlexAPI exceptions. """
-    pass
-
-
-class BadRequest(PlexApiException):
-    """ An invalid request, generally a user error. """
-    pass
-
-
-class NotFound(PlexApiException):
-    """ Request media item or device is not found. """
-    pass
-
-
-class UnknownType(PlexApiException):
-    """ Unknown library type. """
-    pass
-
-
-class Unsupported(PlexApiException):
-    """ Unsupported client request. """
-    pass
-
-
-class Unauthorized(BadRequest):
-    """ Invalid username/password or token. """
-    pass
-
-
-class TwoFactorRequired(Unauthorized):
-    """ Two factor authentication required. """
-    pass
diff --git a/lib/plexapi/gdm.py b/lib/plexapi/gdm.py
deleted file mode 100644
index b9edac08..00000000
--- a/lib/plexapi/gdm.py
+++ /dev/null
@@ -1,151 +0,0 @@
-"""
-Support for discovery using GDM (Good Day Mate), multicast protocol by Plex.
-
-# Licensed Apache 2.0
-# From https://github.com/home-assistant/netdisco/netdisco/gdm.py
-
-Inspired by:
-  hippojay's plexGDM: https://github.com/hippojay/script.plexbmc.helper/resources/lib/plexgdm.py
-  iBaa's PlexConnect: https://github.com/iBaa/PlexConnect/PlexAPI.py
-"""
-import socket
-import struct
-
-
-class GDM:
-    """Base class to discover GDM services.
-
-       Attributes:
-           entries (List<dict>): List of server and/or client data discovered.
-    """
-
-    def __init__(self):
-        self.entries = []
-
-    def scan(self, scan_for_clients=False):
-        """Scan the network."""
-        self.update(scan_for_clients)
-
-    def all(self, scan_for_clients=False):
-        """Return all found entries.
-
-        Will scan for entries if not scanned recently.
-        """
-        self.scan(scan_for_clients)
-        return list(self.entries)
-
-    def find_by_content_type(self, value):
-        """Return a list of entries that match the content_type."""
-        self.scan()
-        return [entry for entry in self.entries
-                if value in entry['data']['Content-Type']]
-
-    def find_by_data(self, values):
-        """Return a list of entries that match the search parameters."""
-        self.scan()
-        return [entry for entry in self.entries
-                if all(item in entry['data'].items()
-                       for item in values.items())]
-
-    def update(self, scan_for_clients):
-        """Scan for new GDM services.
-
-        Examples of the dict list assigned to self.entries by this function:
-
-            Server:
-
-                [{'data': {
-                     'Content-Type': 'plex/media-server',
-                     'Host': '53f4b5b6023d41182fe88a99b0e714ba.plex.direct',
-                     'Name': 'myfirstplexserver',
-                     'Port': '32400',
-                     'Resource-Identifier': '646ab0aa8a01c543e94ba975f6fd6efadc36b7',
-                     'Updated-At': '1585769946',
-                     'Version': '1.18.8.2527-740d4c206',
-                },
-                 'from': ('10.10.10.100', 32414)}]
-
-            Clients:
-
-                [{'data': {'Content-Type': 'plex/media-player',
-                     'Device-Class': 'stb',
-                     'Name': 'plexamp',
-                     'Port': '36000',
-                     'Product': 'Plexamp',
-                     'Protocol': 'plex',
-                     'Protocol-Capabilities': 'timeline,playback,playqueues,playqueues-creation',
-                     'Protocol-Version': '1',
-                     'Resource-Identifier': 'b6e57a3f-e0f8-494f-8884-f4b58501467e',
-                     'Version': '1.1.0',
-                },
-                 'from': ('10.10.10.101', 32412)}]
-        """
-
-        gdm_msg = 'M-SEARCH * HTTP/1.0'.encode('ascii')
-        gdm_timeout = 1
-
-        self.entries = []
-        known_responses = []
-
-        # setup socket for discovery -> multicast message
-        sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-        sock.settimeout(gdm_timeout)
-
-        # Set the time-to-live for messages for local network
-        sock.setsockopt(socket.IPPROTO_IP,
-                        socket.IP_MULTICAST_TTL,
-                        struct.pack("B", gdm_timeout))
-
-        if scan_for_clients:
-            # setup socket for broadcast to Plex clients
-            sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-            sock.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
-            gdm_ip = '255.255.255.255'
-            gdm_port = 32412
-        else:
-            # setup socket for multicast to Plex server(s)
-            gdm_ip = '239.0.0.250'
-            gdm_port = 32414
-
-        try:
-            # Send data to the multicast group
-            sock.sendto(gdm_msg, (gdm_ip, gdm_port))
-
-            # Look for responses from all recipients
-            while True:
-                try:
-                    bdata, host = sock.recvfrom(1024)
-                    data = bdata.decode('utf-8')
-                    if '200 OK' in data.splitlines()[0]:
-                        ddata = {k: v.strip() for (k, v) in (
-                            line.split(':') for line in
-                            data.splitlines() if ':' in line)}
-                        identifier = ddata.get('Resource-Identifier')
-                        if identifier and identifier in known_responses:
-                            continue
-                        known_responses.append(identifier)
-                        self.entries.append({'data': ddata,
-                                             'from': host})
-                except socket.timeout:
-                    break
-        finally:
-            sock.close()
-
-
-def main():
-    """Test GDM discovery."""
-    from pprint import pprint
-
-    gdm = GDM()
-
-    pprint("Scanning GDM for servers...")
-    gdm.scan()
-    pprint(gdm.entries)
-
-    pprint("Scanning GDM for clients...")
-    gdm.scan(scan_for_clients=True)
-    pprint(gdm.entries)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/lib/plexapi/library.py b/lib/plexapi/library.py
deleted file mode 100644
index 5d54b6a8..00000000
--- a/lib/plexapi/library.py
+++ /dev/null
@@ -1,3391 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import annotations
-
-import re
-from typing import Any, TYPE_CHECKING
-import warnings
-from collections import defaultdict
-from datetime import datetime
-from urllib.parse import parse_qs, quote_plus, urlencode, urlparse
-
-from plexapi import log, media, utils
-from plexapi.base import OPERATORS, PlexObject, cached_data_property
-from plexapi.exceptions import BadRequest, NotFound
-from plexapi.mixins import (
-    MovieEditMixins, ShowEditMixins, SeasonEditMixins, EpisodeEditMixins,
-    ArtistEditMixins, AlbumEditMixins, TrackEditMixins, PhotoalbumEditMixins, PhotoEditMixins
-)
-from plexapi.settings import Setting
-from plexapi.utils import deprecated
-
-
-if TYPE_CHECKING:
-    from plexapi.audio import Track
-
-
-class Library(PlexObject):
-    """ Represents a PlexServer library. This contains all sections of media defined
-        in your Plex server including video, shows and audio.
-
-        Attributes:
-            key (str): '/library'
-            identifier (str): Unknown ('com.plexapp.plugins.library').
-            mediaTagVersion (str): Unknown (/system/bundle/media/flags/)
-            server (:class:`~plexapi.server.PlexServer`): PlexServer this client is connected to.
-            title1 (str): 'Plex Library' (not sure how useful this is).
-            title2 (str): Second title (this is blank on my setup).
-    """
-    key = '/library'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.identifier = data.attrib.get('identifier')
-        self.mediaTagVersion = data.attrib.get('mediaTagVersion')
-        self.title1 = data.attrib.get('title1')
-        self.title2 = data.attrib.get('title2')
-
-    @cached_data_property
-    def _loadSections(self):
-        """ Loads and caches all the library sections. """
-        key = '/library/sections'
-        sectionsByID = {}
-        sectionsByTitle = defaultdict(list)
-        libcls = {
-            'movie': MovieSection,
-            'show': ShowSection,
-            'artist': MusicSection,
-            'photo': PhotoSection,
-        }
-
-        for elem in self._server.query(key):
-            section = libcls.get(elem.attrib.get('type'), LibrarySection)(self._server, elem, initpath=key)
-            sectionsByID[section.key] = section
-            sectionsByTitle[section.title.lower().strip()].append(section)
-
-        return sectionsByID, dict(sectionsByTitle)
-
-    @property
-    def _sectionsByID(self):
-        """ Returns a dictionary of all library sections by ID. """
-        return self._loadSections[0]
-
-    @property
-    def _sectionsByTitle(self):
-        """ Returns a dictionary of all library sections by title. """
-        return self._loadSections[1]
-
-    def sections(self):
-        """ Returns a list of all media sections in this library. Library sections may be any of
-            :class:`~plexapi.library.MovieSection`, :class:`~plexapi.library.ShowSection`,
-            :class:`~plexapi.library.MusicSection`, :class:`~plexapi.library.PhotoSection`.
-        """
-        return list(self._sectionsByID.values())
-
-    def section(self, title):
-        """ Returns the :class:`~plexapi.library.LibrarySection` that matches the specified title.
-            Note: Multiple library sections with the same title is ambiguous.
-            Use :func:`~plexapi.library.Library.sectionByID` instead for an exact match.
-
-            Parameters:
-                title (str): Title of the section to return.
-
-            Raises:
-                :exc:`~plexapi.exceptions.NotFound`: The library section title is not found on the server.
-        """
-        normalized_title = title.lower().strip()
-        try:
-            sections = self._sectionsByTitle[normalized_title]
-        except KeyError:
-            raise NotFound(f'Invalid library section: {title}') from None
-
-        if len(sections) > 1:
-            warnings.warn(
-                'Multiple library sections with the same title found, use "sectionByID" instead. '
-                'Returning the last section.'
-            )
-        return sections[-1]
-
-    def sectionByID(self, sectionID):
-        """ Returns the :class:`~plexapi.library.LibrarySection` that matches the specified sectionID.
-
-            Parameters:
-                sectionID (int): ID of the section to return.
-
-            Raises:
-                :exc:`~plexapi.exceptions.NotFound`: The library section ID is not found on the server.
-        """
-        try:
-            return self._sectionsByID[sectionID]
-        except KeyError:
-            raise NotFound(f'Invalid library sectionID: {sectionID}') from None
-
-    def hubs(self, sectionID=None, identifier=None, **kwargs):
-        """ Returns a list of :class:`~plexapi.library.Hub` across all library sections.
-
-            Parameters:
-                sectionID (int or str or list, optional):
-                    IDs of the sections to limit results or "playlists".
-                identifier (str or list, optional):
-                    Names of identifiers to limit results.
-                    Available on `Hub` instances as the `hubIdentifier` attribute.
-                    Examples: 'home.continue' or 'home.ondeck'
-        """
-        if sectionID:
-            if not isinstance(sectionID, list):
-                sectionID = [sectionID]
-            kwargs['contentDirectoryID'] = ",".join(map(str, sectionID))
-        if identifier:
-            if not isinstance(identifier, list):
-                identifier = [identifier]
-            kwargs['identifier'] = ",".join(identifier)
-        key = f'/hubs{utils.joinArgs(kwargs)}'
-        return self.fetchItems(key)
-
-    def all(self, **kwargs):
-        """ Returns a list of all media from all library sections.
-            This may be a very large dataset to retrieve.
-        """
-        items = []
-        for section in self.sections():
-            for item in section.all(**kwargs):
-                items.append(item)
-        return items
-
-    def onDeck(self):
-        """ Returns a list of all media items on deck. """
-        return self.fetchItems('/library/onDeck')
-
-    def recentlyAdded(self):
-        """ Returns a list of all media items recently added. """
-        return self.fetchItems('/library/recentlyAdded')
-
-    def search(self, title=None, libtype=None, **kwargs):
-        """ Searching within a library section is much more powerful. It seems certain
-            attributes on the media objects can be targeted to filter this search down
-            a bit, but I haven't found the documentation for it.
-
-            Example: "studio=Comedy%20Central" or "year=1999" "title=Kung Fu" all work. Other items
-            such as actor=<id> seem to work, but require you already know the id of the actor.
-            TLDR: This is untested but seems to work. Use library section search when you can.
-        """
-        args = {}
-        if title:
-            args['title'] = title
-        if libtype:
-            args['type'] = utils.searchType(libtype)
-        for attr, value in kwargs.items():
-            args[attr] = value
-        key = f'/library/all{utils.joinArgs(args)}'
-        return self.fetchItems(key)
-
-    def cleanBundles(self):
-        """ Poster images and other metadata for items in your library are kept in "bundle"
-            packages. When you remove items from your library, these bundles aren't immediately
-            removed. Removing these old bundles can reduce the size of your install. By default, your
-            server will automatically clean up old bundles once a week as part of Scheduled Tasks.
-        """
-        # TODO: Should this check the response for success or the correct mediaprefix?
-        self._server.query('/library/clean/bundles?async=1', method=self._server._session.put)
-        return self
-
-    def emptyTrash(self):
-        """ If a library has items in the Library Trash, use this option to empty the Trash. """
-        for section in self.sections():
-            section.emptyTrash()
-        return self
-
-    def optimize(self):
-        """ The Optimize option cleans up the server database from unused or fragmented data.
-            For example, if you have deleted or added an entire library or many items in a
-            library, you may like to optimize the database.
-        """
-        self._server.query('/library/optimize?async=1', method=self._server._session.put)
-        return self
-
-    def update(self):
-        """ Scan this library for new items."""
-        self._server.query('/library/sections/all/refresh')
-        return self
-
-    def cancelUpdate(self):
-        """ Cancel a library update. """
-        key = '/library/sections/all/refresh'
-        self._server.query(key, method=self._server._session.delete)
-        return self
-
-    def refresh(self):
-        """ Forces a download of fresh media information from the internet.
-            This can take a long time. Any locked fields are not modified.
-        """
-        self._server.query('/library/sections/all/refresh?force=1')
-        return self
-
-    def deleteMediaPreviews(self):
-        """ Delete the preview thumbnails for the all sections. This cannot be
-            undone. Recreating media preview files can take hours or even days.
-        """
-        for section in self.sections():
-            section.deleteMediaPreviews()
-        return self
-
-    def add(self, name='', type='', agent='', scanner='', location='', language='en-US', *args, **kwargs):
-        """ Simplified add for the most common options.
-
-            Parameters:
-                name (str): Name of the library
-                agent (str): Example com.plexapp.agents.imdb
-                type (str): movie, show, # check me
-                location (str or list): /path/to/files, ["/path/to/files", "/path/to/morefiles"]
-                language (str): Four letter language code (e.g. en-US)
-                kwargs (dict): Advanced options should be passed as a dict. where the id is the key.
-
-            **Photo Preferences**
-
-                * **agent** (str): com.plexapp.agents.none
-                * **enableAutoPhotoTags** (bool): Tag photos. Default value false.
-                * **enableBIFGeneration** (bool): Enable video preview thumbnails. Default value true.
-                * **includeInGlobal** (bool): Include in dashboard. Default value true.
-                * **scanner** (str): Plex Photo Scanner
-
-            **Movie Preferences**
-
-                * **agent** (str): com.plexapp.agents.none, com.plexapp.agents.imdb, tv.plex.agents.movie,
-                  com.plexapp.agents.themoviedb
-                * **enableBIFGeneration** (bool): Enable video preview thumbnails. Default value true.
-                * **enableCinemaTrailers** (bool): Enable Cinema Trailers. Default value true.
-                * **includeInGlobal** (bool): Include in dashboard. Default value true.
-                * **scanner** (str): Plex Movie, Plex Movie Scanner, Plex Video Files Scanner, Plex Video Files
-
-            **IMDB Movie Options** (com.plexapp.agents.imdb)
-
-                * **title** (bool): Localized titles. Default value false.
-                * **extras** (bool): Find trailers and extras automatically (Plex Pass required). Default value true.
-                * **only_trailers** (bool): Skip extras which aren't trailers. Default value false.
-                * **redband** (bool): Use red band (restricted audiences) trailers when available. Default value false.
-                * **native_subs** (bool): Include extras with subtitles in Library language. Default value false.
-                * **cast_list** (int): Cast List Source: Default value 1 Possible options: 0:IMDb,1:The Movie Database.
-                * **ratings** (int): Ratings Source, Default value 0 Possible options:
-                  0:Rotten Tomatoes, 1:IMDb, 2:The Movie Database.
-                * **summary** (int): Plot Summary Source: Default value 1 Possible options: 0:IMDb,1:The Movie Database.
-                * **country** (int): Default value 46 Possible options 0:Argentina, 1:Australia, 2:Austria,
-                  3:Belgium, 4:Belize, 5:Bolivia, 6:Brazil, 7:Canada, 8:Chile, 9:Colombia, 10:Costa Rica,
-                  11:Czech Republic, 12:Denmark, 13:Dominican Republic, 14:Ecuador, 15:El Salvador,
-                  16:France, 17:Germany, 18:Guatemala, 19:Honduras, 20:Hong Kong SAR, 21:Ireland,
-                  22:Italy, 23:Jamaica, 24:Korea, 25:Liechtenstein, 26:Luxembourg, 27:Mexico, 28:Netherlands,
-                  29:New Zealand, 30:Nicaragua, 31:Panama, 32:Paraguay, 33:Peru, 34:Portugal,
-                  35:Peoples Republic of China, 36:Puerto Rico, 37:Russia, 38:Singapore, 39:South Africa,
-                  40:Spain, 41:Sweden, 42:Switzerland, 43:Taiwan, 44:Trinidad, 45:United Kingdom,
-                  46:United States, 47:Uruguay, 48:Venezuela.
-                * **collections** (bool): Use collection info from The Movie Database. Default value false.
-                * **localart** (bool): Prefer artwork based on library language. Default value true.
-                * **adult** (bool): Include adult content. Default value false.
-                * **usage** (bool): Send anonymous usage data to Plex. Default value true.
-
-            **TheMovieDB Movie Options** (com.plexapp.agents.themoviedb)
-
-                * **collections** (bool): Use collection info from The Movie Database. Default value false.
-                * **localart** (bool): Prefer artwork based on library language. Default value true.
-                * **adult** (bool): Include adult content. Default value false.
-                * **country** (int): Country (used for release date and content rating). Default value 47 Possible
-                  options 0:, 1:Argentina, 2:Australia, 3:Austria, 4:Belgium, 5:Belize, 6:Bolivia, 7:Brazil, 8:Canada,
-                  9:Chile, 10:Colombia, 11:Costa Rica, 12:Czech Republic, 13:Denmark, 14:Dominican Republic, 15:Ecuador,
-                  16:El Salvador, 17:France, 18:Germany, 19:Guatemala, 20:Honduras, 21:Hong Kong SAR, 22:Ireland,
-                  23:Italy, 24:Jamaica, 25:Korea, 26:Liechtenstein, 27:Luxembourg, 28:Mexico, 29:Netherlands,
-                  30:New Zealand, 31:Nicaragua, 32:Panama, 33:Paraguay, 34:Peru, 35:Portugal,
-                  36:Peoples Republic of China, 37:Puerto Rico, 38:Russia, 39:Singapore, 40:South Africa, 41:Spain,
-                  42:Sweden, 43:Switzerland, 44:Taiwan, 45:Trinidad, 46:United Kingdom, 47:United States, 48:Uruguay,
-                  49:Venezuela.
-
-            **Show Preferences**
-
-                * **agent** (str): com.plexapp.agents.none, com.plexapp.agents.thetvdb, com.plexapp.agents.themoviedb,
-                  tv.plex.agents.series
-                * **enableBIFGeneration** (bool): Enable video preview thumbnails. Default value true.
-                * **episodeSort** (int): Episode order. Default -1 Possible options: 0:Oldest first, 1:Newest first.
-                * **flattenSeasons** (int): Seasons. Default value 0 Possible options: 0:Show,1:Hide.
-                * **includeInGlobal** (bool): Include in dashboard. Default value true.
-                * **scanner** (str): Plex TV Series, Plex Series Scanner
-
-            **TheTVDB Show Options** (com.plexapp.agents.thetvdb)
-
-                * **extras** (bool): Find trailers and extras automatically (Plex Pass required). Default value true.
-                * **native_subs** (bool): Include extras with subtitles in Library language. Default value false.
-
-            **TheMovieDB Show Options** (com.plexapp.agents.themoviedb)
-
-                * **collections** (bool): Use collection info from The Movie Database. Default value false.
-                * **localart** (bool): Prefer artwork based on library language. Default value true.
-                * **adult** (bool): Include adult content. Default value false.
-                * **country** (int): Country (used for release date and content rating). Default value 47 options
-                  0:, 1:Argentina, 2:Australia, 3:Austria, 4:Belgium, 5:Belize, 6:Bolivia, 7:Brazil, 8:Canada, 9:Chile,
-                  10:Colombia, 11:Costa Rica, 12:Czech Republic, 13:Denmark, 14:Dominican Republic, 15:Ecuador,
-                  16:El Salvador, 17:France, 18:Germany, 19:Guatemala, 20:Honduras, 21:Hong Kong SAR, 22:Ireland,
-                  23:Italy, 24:Jamaica, 25:Korea, 26:Liechtenstein, 27:Luxembourg, 28:Mexico, 29:Netherlands,
-                  30:New Zealand, 31:Nicaragua, 32:Panama, 33:Paraguay, 34:Peru, 35:Portugal,
-                  36:Peoples Republic of China, 37:Puerto Rico, 38:Russia, 39:Singapore, 40:South Africa,
-                  41:Spain, 42:Sweden, 43:Switzerland, 44:Taiwan, 45:Trinidad, 46:United Kingdom, 47:United States,
-                  48:Uruguay, 49:Venezuela.
-
-            **Other Video Preferences**
-
-                * **agent** (str): com.plexapp.agents.none, com.plexapp.agents.imdb, com.plexapp.agents.themoviedb
-                * **enableBIFGeneration** (bool): Enable video preview thumbnails. Default value true.
-                * **enableCinemaTrailers** (bool): Enable Cinema Trailers. Default value true.
-                * **includeInGlobal** (bool): Include in dashboard. Default value true.
-                * **scanner** (str): Plex Movie Scanner, Plex Video Files Scanner
-
-            **IMDB Other Video Options** (com.plexapp.agents.imdb)
-
-                * **title** (bool): Localized titles. Default value false.
-                * **extras** (bool): Find trailers and extras automatically (Plex Pass required). Default value true.
-                * **only_trailers** (bool): Skip extras which aren't trailers. Default value false.
-                * **redband** (bool): Use red band (restricted audiences) trailers when available. Default value false.
-                * **native_subs** (bool): Include extras with subtitles in Library language. Default value false.
-                * **cast_list** (int): Cast List Source: Default value 1 Possible options: 0:IMDb,1:The Movie Database.
-                * **ratings** (int): Ratings Source Default value 0 Possible options:
-                  0:Rotten Tomatoes,1:IMDb,2:The Movie Database.
-                * **summary** (int): Plot Summary Source: Default value 1 Possible options: 0:IMDb,1:The Movie Database.
-                * **country** (int): Country: Default value 46 Possible options: 0:Argentina, 1:Australia, 2:Austria,
-                  3:Belgium, 4:Belize, 5:Bolivia, 6:Brazil, 7:Canada, 8:Chile, 9:Colombia, 10:Costa Rica,
-                  11:Czech Republic, 12:Denmark, 13:Dominican Republic, 14:Ecuador, 15:El Salvador, 16:France,
-                  17:Germany, 18:Guatemala, 19:Honduras, 20:Hong Kong SAR, 21:Ireland, 22:Italy, 23:Jamaica,
-                  24:Korea, 25:Liechtenstein, 26:Luxembourg, 27:Mexico, 28:Netherlands, 29:New Zealand, 30:Nicaragua,
-                  31:Panama, 32:Paraguay, 33:Peru, 34:Portugal, 35:Peoples Republic of China, 36:Puerto Rico,
-                  37:Russia, 38:Singapore, 39:South Africa, 40:Spain, 41:Sweden, 42:Switzerland, 43:Taiwan, 44:Trinidad,
-                  45:United Kingdom, 46:United States, 47:Uruguay, 48:Venezuela.
-                * **collections** (bool): Use collection info from The Movie Database. Default value false.
-                * **localart** (bool): Prefer artwork based on library language. Default value true.
-                * **adult** (bool): Include adult content. Default value false.
-                * **usage** (bool): Send anonymous usage data to Plex. Default value true.
-
-            **TheMovieDB Other Video Options** (com.plexapp.agents.themoviedb)
-
-                * **collections** (bool): Use collection info from The Movie Database. Default value false.
-                * **localart** (bool): Prefer artwork based on library language. Default value true.
-                * **adult** (bool): Include adult content. Default value false.
-                * **country** (int): Country (used for release date and content rating). Default
-                  value 47 Possible options 0:, 1:Argentina, 2:Australia, 3:Austria, 4:Belgium, 5:Belize,
-                  6:Bolivia, 7:Brazil, 8:Canada, 9:Chile, 10:Colombia, 11:Costa Rica, 12:Czech Republic,
-                  13:Denmark, 14:Dominican Republic, 15:Ecuador, 16:El Salvador, 17:France, 18:Germany,
-                  19:Guatemala, 20:Honduras, 21:Hong Kong SAR, 22:Ireland, 23:Italy, 24:Jamaica,
-                  25:Korea, 26:Liechtenstein, 27:Luxembourg, 28:Mexico, 29:Netherlands, 30:New Zealand,
-                  31:Nicaragua, 32:Panama, 33:Paraguay, 34:Peru, 35:Portugal,
-                  36:Peoples Republic of China, 37:Puerto Rico, 38:Russia, 39:Singapore,
-                  40:South Africa, 41:Spain, 42:Sweden, 43:Switzerland, 44:Taiwan, 45:Trinidad,
-                  46:United Kingdom, 47:United States, 48:Uruguay, 49:Venezuela.
-        """
-        if isinstance(location, str):
-            location = [location]
-        locations = []
-        for path in location:
-            if not self._server.isBrowsable(path):
-                raise BadRequest(f'Path: {path} does not exist.')
-            locations.append(('location', path))
-
-        part = (f'/library/sections?name={quote_plus(name)}&type={type}&agent={agent}'
-                f'&scanner={quote_plus(scanner)}&language={language}&{urlencode(locations, doseq=True)}')
-        if kwargs:
-            prefs_params = {f'prefs[{k}]': v for k, v in kwargs.items()}
-            part += f'&{urlencode(prefs_params)}'
-        data = self._server.query(part, method=self._server._session.post)
-        self._invalidateCachedProperties()
-        return data
-
-    def history(self, maxresults=None, mindate=None):
-        """ Get Play History for all library Sections for the owner.
-            Parameters:
-                maxresults (int): Only return the specified number of results (optional).
-                mindate (datetime): Min datetime to return results from.
-        """
-        hist = []
-        for section in self.sections():
-            hist.extend(section.history(maxresults=maxresults, mindate=mindate))
-        return hist
-
-    def tags(self, tag):
-        """ Returns a list of :class:`~plexapi.library.LibraryMediaTag` objects for the specified tag.
-
-            Parameters:
-                tag (str): Tag name (see :data:`~plexapi.utils.TAGTYPES`).
-        """
-        tagType = utils.tagType(tag)
-        data = self._server.query(f'/library/tags?type={tagType}')
-        return self.findItems(data)
-
-
-class LibrarySection(PlexObject):
-    """ Base class for a single library section.
-
-        Attributes:
-            agent (str): The metadata agent used for the library section (com.plexapp.agents.imdb, etc).
-            allowSync (bool): True if you allow syncing content from the library section.
-            art (str): Background artwork used to respresent the library section.
-            composite (str): Composite image used to represent the library section.
-            createdAt (datetime): Datetime the library section was created.
-            filters (bool): True if filters are available for the library section.
-            key (int): Key (or ID) of this library section.
-            language (str): Language represented in this section (en, xn, etc).
-            locations (List<str>): List of folder paths added to the library section.
-            refreshing (bool): True if this section is currently being refreshed.
-            scanner (str): Internal scanner used to find media (Plex Movie Scanner, Plex Premium Music Scanner, etc.)
-            thumb (str): Thumbnail image used to represent the library section.
-            title (str): Name of the library section.
-            type (str): Type of content section represents (movie, show, artist, photo).
-            updatedAt (datetime): Datetime the library section was last updated.
-            uuid (str): Unique id for the section (32258d7c-3e6c-4ac5-98ad-bad7a3b78c63)
-    """
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.agent = data.attrib.get('agent')
-        self.allowSync = utils.cast(bool, data.attrib.get('allowSync'))
-        self.art = data.attrib.get('art')
-        self.composite = data.attrib.get('composite')
-        self.createdAt = utils.toDatetime(data.attrib.get('createdAt'))
-        self.filters = utils.cast(bool, data.attrib.get('filters'))
-        self.key = utils.cast(int, data.attrib.get('key'))
-        self.language = data.attrib.get('language')
-        self.refreshing = utils.cast(bool, data.attrib.get('refreshing'))
-        self.scanner = data.attrib.get('scanner')
-        self.thumb = data.attrib.get('thumb')
-        self.title = data.attrib.get('title')
-        self.type = data.attrib.get('type')
-        self.updatedAt = utils.toDatetime(data.attrib.get('updatedAt'))
-        self.uuid = data.attrib.get('uuid')
-
-    @cached_data_property
-    def locations(self):
-        return self.listAttrs(self._data, 'path', etag='Location')
-
-    @cached_data_property
-    def totalSize(self):
-        """ Returns the total number of items in the library for the default library type. """
-        return self.totalViewSize(includeCollections=False)
-
-    @property
-    def totalDuration(self):
-        """ Returns the total duration (in milliseconds) of items in the library. """
-        return self._getTotalDurationStorage[0]
-
-    @property
-    def totalStorage(self):
-        """ Returns the total storage (in bytes) of items in the library. """
-        return self._getTotalDurationStorage[1]
-
-    def __getattribute__(self, attr):
-        # Intercept to call EditFieldMixin and EditTagMixin methods
-        # based on the item type being batch multi-edited
-        value = super().__getattribute__(attr)
-        if attr.startswith('_'): return value
-        if callable(value) and 'Mixin' in value.__qualname__:
-            if not isinstance(self._edits, dict):
-                raise AttributeError("Must enable batchMultiEdit() to use this method")
-            elif not hasattr(self._edits['items'][0], attr):
-                raise AttributeError(
-                    f"Batch multi-editing '{self._edits['items'][0].__class__.__name__}' object has no attribute '{attr}'"
-                )
-        return value
-
-    @cached_data_property
-    def _getTotalDurationStorage(self):
-        """ Queries the Plex server for the total library duration and storage and caches the values. """
-        data = self._server.query('/media/providers?includeStorage=1')
-        xpath = (
-            './MediaProvider[@identifier="com.plexapp.plugins.library"]'
-            '/Feature[@type="content"]'
-            f'/Directory[@id="{self.key}"]'
-        )
-        directory = next(iter(data.findall(xpath)), None)
-        if directory:
-            totalDuration = utils.cast(int, directory.attrib.get('durationTotal'))
-            totalStorage = utils.cast(int, directory.attrib.get('storageTotal'))
-            return totalDuration, totalStorage
-        return None, None
-
-    def totalViewSize(self, libtype=None, includeCollections=True):
-        """ Returns the total number of items in the library for a specified libtype.
-            The number of items for the default library type will be returned if no libtype is specified.
-            (e.g. Specify ``libtype='episode'`` for the total number of episodes
-            or ``libtype='albums'`` for the total number of albums.)
-
-            Parameters:
-                libtype (str, optional): The type of items to return the total number for (movie, show, season, episode,
-                    artist, album, track, photoalbum). Default is the main library type.
-                includeCollections (bool, optional): True or False to include collections in the total number.
-                    Default is True.
-        """
-        args = {
-            'includeCollections': int(bool(includeCollections)),
-            'X-Plex-Container-Start': 0,
-            'X-Plex-Container-Size': 0
-        }
-        if libtype is not None:
-            if libtype == 'photo':
-                args['clusterZoomLevel'] = 1
-            else:
-                args['type'] = utils.searchType(libtype)
-        part = f'/library/sections/{self.key}/all{utils.joinArgs(args)}'
-        data = self._server.query(part)
-        return utils.cast(int, data.attrib.get("totalSize"))
-
-    def delete(self):
-        """ Delete a library section. """
-        try:
-            data = self._server.query(f'/library/sections/{self.key}', method=self._server._session.delete)
-            self._server.library._invalidateCachedProperties()
-            return data
-        except BadRequest:  # pragma: no cover
-            msg = f'Failed to delete library {self.key}'
-            msg += 'You may need to allow this permission in your Plex settings.'
-            log.error(msg)
-            raise
-
-    def _reload(self, **kwargs):
-        """ Reload the data for the library section. """
-        key = self._initpath
-        data = self._server.query(key)
-        self._findAndLoadElem(data, key=str(self.key))
-        return self
-
-    def edit(self, agent=None, **kwargs):
-        """ Edit a library. See :class:`~plexapi.library.Library` for example usage.
-
-            Parameters:
-                agent (str, optional): The library agent.
-                kwargs (dict): Dict of settings to edit.
-        """
-        if not agent:
-            agent = self.agent
-
-        locations = []
-        if kwargs.get('location'):
-            if isinstance(kwargs['location'], str):
-                kwargs['location'] = [kwargs['location']]
-            for path in kwargs.pop('location'):
-                if not self._server.isBrowsable(path):
-                    raise BadRequest(f'Path: {path} does not exist.')
-                locations.append(('location', path))
-
-        params = list(kwargs.items()) + locations
-
-        part = f'/library/sections/{self.key}?agent={agent}&{urlencode(params, doseq=True)}'
-        self._server.query(part, method=self._server._session.put)
-        return self
-
-    def addLocations(self, location):
-        """ Add a location to a library.
-
-            Parameters:
-                location (str or list): A single folder path, list of paths.
-
-            Example:
-
-                .. code-block:: python
-
-                    LibrarySection.addLocations('/path/1')
-                    LibrarySection.addLocations(['/path/1', 'path/2', '/path/3'])
-
-        """
-        locations = self.locations
-        if isinstance(location, str):
-            location = [location]
-        for path in location:
-            if not self._server.isBrowsable(path):
-                raise BadRequest(f'Path: {path} does not exist.')
-            locations.append(path)
-        return self.edit(location=locations)
-
-    def removeLocations(self, location):
-        """ Remove a location from a library.
-
-            Parameters:
-                location (str or list): A single folder path, list of paths.
-
-            Example:
-
-                .. code-block:: python
-
-                    LibrarySection.removeLocations('/path/1')
-                    LibrarySection.removeLocations(['/path/1', 'path/2', '/path/3'])
-
-        """
-        locations = self.locations
-        if isinstance(location, str):
-            location = [location]
-        for path in location:
-            if path in locations:
-                locations.remove(path)
-            else:
-                raise BadRequest(f'Path: {location} does not exist in the library.')
-        if len(locations) == 0:
-            raise BadRequest('You are unable to remove all locations from a library.')
-        return self.edit(location=locations)
-
-    def get(self, title, **kwargs):
-        """ Returns the media item with the specified title and kwargs.
-
-            Parameters:
-                title (str): Title of the item to return.
-                kwargs (dict): Additional search parameters.
-                    See :func:`~plexapi.library.LibrarySection.search` for more info.
-
-            Raises:
-                :exc:`~plexapi.exceptions.NotFound`: The title is not found in the library.
-        """
-        try:
-            return self.search(title, limit=1, **kwargs)[0]
-        except IndexError:
-            msg = f"Unable to find item with title '{title}'"
-            if kwargs:
-                msg += f" and kwargs {kwargs}"
-            raise NotFound(msg) from None
-
-    def getGuid(self, guid):
-        """ Returns the media item with the specified external Plex, IMDB, TMDB, or TVDB ID.
-            Note: Only available for the Plex Movie and Plex TV Series agents.
-
-            Parameters:
-                guid (str): The external guid of the item to return.
-                    Examples: Plex ``plex://show/5d9c086c46115600200aa2fe``
-                    IMDB ``imdb://tt0944947``, TMDB ``tmdb://1399``, TVDB ``tvdb://121361``.
-
-            Raises:
-                :exc:`~plexapi.exceptions.NotFound`: The guid is not found in the library.
-
-            Example:
-
-                .. code-block:: python
-
-                    result1 = library.getGuid('plex://show/5d9c086c46115600200aa2fe')
-                    result2 = library.getGuid('imdb://tt0944947')
-                    result3 = library.getGuid('tmdb://1399')
-                    result4 = library.getGuid('tvdb://121361')
-
-                    # Alternatively, create your own guid lookup dictionary for faster performance
-                    guidLookup = {}
-                    for item in library.all():
-                        guidLookup[item.guid] = item
-                        guidLookup.update({guid.id: item for guid in item.guids})
-
-                    result1 = guidLookup['plex://show/5d9c086c46115600200aa2fe']
-                    result2 = guidLookup['imdb://tt0944947']
-                    result3 = guidLookup['tmdb://1399']
-                    result4 = guidLookup['tvdb://121361']
-
-        """
-
-        try:
-            if guid.startswith('plex://'):
-                result = self.search(guid=guid)[0]
-                return result
-            else:
-                dummy = self.search(maxresults=1)[0]
-                match = dummy.matches(agent=self.agent, title=guid.replace('://', '-'))
-                return self.search(guid=match[0].guid)[0]
-        except IndexError:
-            raise NotFound(f"Guid '{guid}' is not found in the library") from None
-
-    def all(self, libtype=None, **kwargs):
-        """ Returns a list of all items from this library section.
-            See description of :func:`~plexapi.library.LibrarySection.search()` for details about filtering / sorting.
-        """
-        libtype = libtype or self.TYPE
-        return self.search(libtype=libtype, **kwargs)
-
-    def folders(self):
-        """ Returns a list of available :class:`~plexapi.library.Folder` for this library section.
-        """
-        key = f'/library/sections/{self.key}/folder'
-        return self.fetchItems(key, Folder)
-
-    def managedHubs(self):
-        """ Returns a list of available :class:`~plexapi.library.ManagedHub` for this library section.
-        """
-        key = f'/hubs/sections/{self.key}/manage'
-        return self.fetchItems(key, ManagedHub)
-
-    def resetManagedHubs(self):
-        """ Reset the managed hub customizations for this library section.
-        """
-        key = f'/hubs/sections/{self.key}/manage'
-        self._server.query(key, method=self._server._session.delete)
-
-    def hubs(self):
-        """ Returns a list of available :class:`~plexapi.library.Hub` for this library section.
-        """
-        key = f'/hubs/sections/{self.key}?includeStations=1'
-        return self.fetchItems(key)
-
-    def agents(self):
-        """ Returns a list of available :class:`~plexapi.media.Agent` for this library section.
-        """
-        return self._server.agents(self.type)
-
-    def settings(self):
-        """ Returns a list of all library settings. """
-        key = f'/library/sections/{self.key}/prefs'
-        data = self._server.query(key)
-        return self.findItems(data, cls=Setting)
-
-    def editAdvanced(self, **kwargs):
-        """ Edit a library's advanced settings. """
-        data = {}
-        idEnums = {}
-        key = 'prefs[{}]'
-
-        for setting in self.settings():
-            if setting.type != 'bool':
-                idEnums[setting.id] = setting.enumValues
-            else:
-                idEnums[setting.id] = {0: False, 1: True}
-
-        for settingID, value in kwargs.items():
-            try:
-                enums = idEnums[settingID]
-            except KeyError:
-                raise NotFound(f'{value} not found in {list(idEnums.keys())}')
-            if value in enums:
-                data[key.format(settingID)] = value
-            else:
-                raise NotFound(f'{value} not found in {enums}')
-
-        return self.edit(**data)
-
-    def defaultAdvanced(self):
-        """ Edit all of library's advanced settings to default. """
-        data = {}
-        key = 'prefs[{}]'
-        for setting in self.settings():
-            if setting.type == 'bool':
-                data[key.format(setting.id)] = int(setting.default)
-            else:
-                data[key.format(setting.id)] = setting.default
-
-        return self.edit(**data)
-
-    def _lockUnlockAllField(self, field, libtype=None, locked=True):
-        """ Lock or unlock a field for all items in the library. """
-        libtype = libtype or self.TYPE
-        args = {
-            'type': utils.searchType(libtype),
-            f'{field}.locked': int(locked)
-        }
-        key = f'/library/sections/{self.key}/all{utils.joinArgs(args)}'
-        self._server.query(key, method=self._server._session.put)
-        return self
-
-    def lockAllField(self, field, libtype=None):
-        """ Lock a field for all items in the library.
-
-            Parameters:
-                field (str): The field to lock (e.g. thumb, rating, collection).
-                libtype (str, optional): The library type to lock (movie, show, season, episode,
-                    artist, album, track, photoalbum, photo). Default is the main library type.
-        """
-        return self._lockUnlockAllField(field, libtype=libtype, locked=True)
-
-    def unlockAllField(self, field, libtype=None):
-        """ Unlock a field for all items in the library.
-
-            Parameters:
-                field (str): The field to unlock (e.g. thumb, rating, collection).
-                libtype (str, optional): The library type to lock (movie, show, season, episode,
-                    artist, album, track, photoalbum, photo). Default is the main library type.
-        """
-        return self._lockUnlockAllField(field, libtype=libtype, locked=False)
-
-    def timeline(self):
-        """ Returns a timeline query for this library section. """
-        key = f'/library/sections/{self.key}/timeline'
-        data = self._server.query(key)
-        return LibraryTimeline(self, data)
-
-    def onDeck(self):
-        """ Returns a list of media items on deck from this library section. """
-        key = f'/library/sections/{self.key}/onDeck'
-        return self.fetchItems(key)
-
-    def continueWatching(self):
-        """ Return a list of media items in the library's Continue Watching hub. """
-        key = f'/hubs/sections/{self.key}/continueWatching/items'
-        return self.fetchItems(key)
-
-    def recentlyAdded(self, maxresults=50, libtype=None):
-        """ Returns a list of media items recently added from this library section.
-
-            Parameters:
-                maxresults (int): Max number of items to return (default 50).
-                libtype (str, optional): The library type to filter (movie, show, season, episode,
-                    artist, album, track, photoalbum, photo). Default is the main library type.
-        """
-        libtype = libtype or self.TYPE
-        return self.search(sort='addedAt:desc', maxresults=maxresults, libtype=libtype)
-
-    def firstCharacter(self):
-        key = f'/library/sections/{self.key}/firstCharacter'
-        return self.fetchItems(key, cls=FirstCharacter)
-
-    def analyze(self):
-        """ Run an analysis on all of the items in this library section. See
-            See :func:`~plexapi.base.PlexPartialObject.analyze` for more details.
-        """
-        key = f'/library/sections/{self.key}/analyze'
-        self._server.query(key, method=self._server._session.put)
-        return self
-
-    def emptyTrash(self):
-        """ If a section has items in the Trash, use this option to empty the Trash. """
-        key = f'/library/sections/{self.key}/emptyTrash'
-        self._server.query(key, method=self._server._session.put)
-        return self
-
-    def update(self, path=None):
-        """ Scan this section for new media.
-
-            Parameters:
-                path (str, optional): Full path to folder to scan.
-        """
-        key = f'/library/sections/{self.key}/refresh'
-        if path is not None:
-            key += f'?path={quote_plus(path)}'
-        self._server.query(key)
-        return self
-
-    def cancelUpdate(self):
-        """ Cancel update of this Library Section. """
-        key = f'/library/sections/{self.key}/refresh'
-        self._server.query(key, method=self._server._session.delete)
-        return self
-
-    def refresh(self):
-        """ Forces a download of fresh media information from the internet.
-            This can take a long time. Any locked fields are not modified.
-        """
-        key = f'/library/sections/{self.key}/refresh?force=1'
-        self._server.query(key)
-        return self
-
-    def deleteMediaPreviews(self):
-        """ Delete the preview thumbnails for items in this library. This cannot
-            be undone. Recreating media preview files can take hours or even days.
-        """
-        key = f'/library/sections/{self.key}/indexes'
-        self._server.query(key, method=self._server._session.delete)
-        return self
-
-    @cached_data_property
-    def _loadFilters(self):
-        """ Retrieves and caches the list of :class:`~plexapi.library.FilteringType` and
-            list of :class:`~plexapi.library.FilteringFieldType` for this library section.
-        """
-        _key = ('/library/sections/{key}/{filter}?includeMeta=1&includeAdvanced=1'
-                '&X-Plex-Container-Start=0&X-Plex-Container-Size=0')
-
-        key = _key.format(key=self.key, filter='all')
-        data = self._server.query(key)
-        filterTypes = self.findItems(data, FilteringType, rtag='Meta')
-        fieldTypes = self.findItems(data, FilteringFieldType, rtag='Meta')
-
-        if self.TYPE != 'photo':  # No collections for photo library
-            key = _key.format(key=self.key, filter='collections')
-            data = self._server.query(key)
-            filterTypes.extend(self.findItems(data, FilteringType, rtag='Meta'))
-
-        # Manually add guid field type, only allowing "is" operator
-        guidFieldType = '<FieldType type="guid"><Operator key="=" title="is"/></FieldType>'
-        fieldTypes.append(self._manuallyLoadXML(guidFieldType, FilteringFieldType))
-
-        return filterTypes, fieldTypes
-
-    def filterTypes(self):
-        """ Returns a list of available :class:`~plexapi.library.FilteringType` for this library section. """
-        return self._loadFilters[0]
-
-    def getFilterType(self, libtype=None):
-        """ Returns a :class:`~plexapi.library.FilteringType` for a specified libtype.
-
-            Parameters:
-                libtype (str, optional): The library type to filter (movie, show, season, episode,
-                    artist, album, track, photoalbum, photo, collection).
-
-            Raises:
-                :exc:`~plexapi.exceptions.NotFound`: Unknown libtype for this library.
-        """
-        libtype = libtype or self.TYPE
-        try:
-            return next(f for f in self.filterTypes() if f.type == libtype)
-        except StopIteration:
-            availableLibtypes = [f.type for f in self.filterTypes()]
-            raise NotFound(f'Unknown libtype "{libtype}" for this library. '
-                           f'Available libtypes: {availableLibtypes}') from None
-
-    def fieldTypes(self):
-        """ Returns a list of available :class:`~plexapi.library.FilteringFieldType` for this library section. """
-        return self._loadFilters[1]
-
-    def getFieldType(self, fieldType):
-        """ Returns a :class:`~plexapi.library.FilteringFieldType` for a specified fieldType.
-
-            Parameters:
-                fieldType (str): The data type for the field (tag, integer, string, boolean, date,
-                    subtitleLanguage, audioLanguage, resolution).
-
-            Raises:
-                :exc:`~plexapi.exceptions.NotFound`: Unknown fieldType for this library.
-        """
-        try:
-            return next(f for f in self.fieldTypes() if f.type == fieldType)
-        except StopIteration:
-            availableFieldTypes = [f.type for f in self.fieldTypes()]
-            raise NotFound(f'Unknown field type "{fieldType}" for this library. '
-                           f'Available field types: {availableFieldTypes}') from None
-
-    def listFilters(self, libtype=None):
-        """ Returns a list of available :class:`~plexapi.library.FilteringFilter` for a specified libtype.
-            This is the list of options in the filter dropdown menu
-            (`screenshot <../_static/images/LibrarySection.listFilters.png>`__).
-
-            Parameters:
-                libtype (str, optional): The library type to filter (movie, show, season, episode,
-                    artist, album, track, photoalbum, photo, collection).
-
-            Example:
-
-                .. code-block:: python
-
-                    availableFilters = [f.filter for f in library.listFilters()]
-                    print("Available filter fields:", availableFilters)
-
-        """
-        return self.getFilterType(libtype).filters
-
-    def listSorts(self, libtype=None):
-        """ Returns a list of available :class:`~plexapi.library.FilteringSort` for a specified libtype.
-            This is the list of options in the sorting dropdown menu
-            (`screenshot <../_static/images/LibrarySection.listSorts.png>`__).
-
-            Parameters:
-                libtype (str, optional): The library type to filter (movie, show, season, episode,
-                    artist, album, track, photoalbum, photo, collection).
-
-            Example:
-
-                .. code-block:: python
-
-                    availableSorts = [f.key for f in library.listSorts()]
-                    print("Available sort fields:", availableSorts)
-
-        """
-        return self.getFilterType(libtype).sorts
-
-    def listFields(self, libtype=None):
-        """ Returns a list of available :class:`~plexapi.library.FilteringFields` for a specified libtype.
-            This is the list of options in the custom filter dropdown menu
-            (`screenshot <../_static/images/LibrarySection.search.png>`__).
-
-            Parameters:
-                libtype (str, optional): The library type to filter (movie, show, season, episode,
-                    artist, album, track, photoalbum, photo, collection).
-
-            Example:
-
-                .. code-block:: python
-
-                    availableFields = [f.key.split('.')[-1] for f in library.listFields()]
-                    print("Available fields:", availableFields)
-
-        """
-        return self.getFilterType(libtype).fields
-
-    def listOperators(self, fieldType):
-        """ Returns a list of available :class:`~plexapi.library.FilteringOperator` for a specified fieldType.
-            This is the list of options in the custom filter operator dropdown menu
-            (`screenshot <../_static/images/LibrarySection.search.png>`__).
-
-            Parameters:
-                fieldType (str): The data type for the field (tag, integer, string, boolean, date,
-                    subtitleLanguage, audioLanguage, resolution).
-
-            Example:
-
-                .. code-block:: python
-
-                    field = 'genre'  # Available filter field from listFields()
-                    filterField = next(f for f in library.listFields() if f.key.endswith(field))
-                    availableOperators = [o.key for o in library.listOperators(filterField.type)]
-                    print(f"Available operators for {field}:", availableOperators)
-
-        """
-        return self.getFieldType(fieldType).operators
-
-    def listFilterChoices(self, field, libtype=None):
-        """ Returns a list of available :class:`~plexapi.library.FilterChoice` for a specified
-            :class:`~plexapi.library.FilteringFilter` or filter field.
-            This is the list of available values for a custom filter
-            (`screenshot <../_static/images/LibrarySection.search.png>`__).
-
-            Parameters:
-                field (str): :class:`~plexapi.library.FilteringFilter` object,
-                    or the name of the field (genre, year, contentRating, etc.).
-                libtype (str, optional): The library type to filter (movie, show, season, episode,
-                    artist, album, track, photoalbum, photo, collection).
-
-            Raises:
-                :exc:`~plexapi.exceptions.BadRequest`: Invalid filter field.
-                :exc:`~plexapi.exceptions.NotFound`: Unknown filter field.
-
-            Example:
-
-                .. code-block:: python
-
-                    field = 'genre'  # Available filter field from listFilters()
-                    availableChoices = [f.title for f in library.listFilterChoices(field)]
-                    print(f"Available choices for {field}:", availableChoices)
-
-        """
-        if isinstance(field, str):
-            match = re.match(r'(?:([a-zA-Z]*)\.)?([a-zA-Z]+)', field)
-            if not match:
-                raise BadRequest(f'Invalid filter field: {field}')
-            _libtype, field = match.groups()
-            libtype = _libtype or libtype or self.TYPE
-            try:
-                field = next(f for f in self.listFilters(libtype) if f.filter == field)
-            except StopIteration:
-                availableFilters = [f.filter for f in self.listFilters(libtype)]
-                raise NotFound(f'Unknown filter field "{field}" for libtype "{libtype}". '
-                               f'Available filters: {availableFilters}') from None
-
-        data = self._server.query(field.key)
-        return self.findItems(data, FilterChoice)
-
-    def _validateFilterField(self, field, values, libtype=None):
-        """ Validates a filter field and values are available as a custom filter for the library.
-            Returns the validated field and values as a URL encoded parameter string.
-        """
-        match = re.match(r'(?:([a-zA-Z]*)\.)?([a-zA-Z]+)([!<>=&]*)', field)
-        if not match:
-            raise BadRequest(f'Invalid filter field: {field}')
-        _libtype, field, operator = match.groups()
-        libtype = _libtype or libtype or self.TYPE
-
-        try:
-            filterField = next(f for f in self.listFields(libtype) if f.key.split('.')[-1] == field)
-        except StopIteration:
-            for filterType in reversed(self.filterTypes()):
-                if filterType.type != libtype:
-                    filterField = next((f for f in filterType.fields if f.key.split('.')[-1] == field), None)
-                    if filterField:
-                        break
-            else:
-                availableFields = [f.key for f in self.listFields(libtype)]
-                raise NotFound(f'Unknown filter field "{field}" for libtype "{libtype}". '
-                               f'Available filter fields: {availableFields}') from None
-
-        field = filterField.key
-        operator = self._validateFieldOperator(filterField, operator)
-        result = self._validateFieldValue(filterField, values, libtype)
-
-        if operator == '&=':
-            args = {field: result}
-            return urlencode(args, doseq=True)
-        else:
-            args = {field + operator[:-1]: ','.join(result)}
-            return urlencode(args)
-
-    def _validateFieldOperator(self, filterField, operator):
-        """ Validates filter operator is in the available operators.
-            Returns the validated operator string.
-        """
-        fieldType = self.getFieldType(filterField.type)
-
-        and_operator = False
-        if operator in {'&', '&='}:
-            and_operator = True
-            operator = ''
-        if fieldType.type == 'string' and operator in {'=', '!='}:
-            operator += '='
-        operator = (operator[:-1] if operator[-1:] == '=' else operator) + '='
-
-        try:
-            next(o for o in fieldType.operators if o.key == operator)
-        except StopIteration:
-            availableOperators = [o.key for o in self.listOperators(filterField.type)]
-            raise NotFound(f'Unknown operator "{operator}" for filter field "{filterField.key}". '
-                           f'Available operators: {availableOperators}') from None
-
-        return '&=' if and_operator else operator
-
-    def _validateFieldValue(self, filterField, values, libtype=None):
-        """ Validates filter values are the correct datatype and in the available filter choices.
-            Returns the validated list of values.
-        """
-        if not isinstance(values, (list, tuple)):
-            values = [values]
-
-        fieldType = self.getFieldType(filterField.type)
-        results = []
-
-        try:
-            for value in values:
-                if fieldType.type == 'boolean':
-                    value = int(bool(value))
-                elif fieldType.type == 'date':
-                    value = self._validateFieldValueDate(value)
-                elif fieldType.type == 'integer':
-                    value = float(value) if '.' in str(value) else int(value)
-                elif fieldType.type == 'string':
-                    value = str(value)
-                elif fieldType.type in {'tag', 'subtitleLanguage', 'audioLanguage', 'resolution'}:
-                    value = self._validateFieldValueTag(value, filterField, libtype)
-                results.append(str(value))
-        except (ValueError, AttributeError):
-            raise BadRequest(f'Invalid value "{value}" for filter field "{filterField.key}", '
-                             f'value should be type {fieldType.type}') from None
-
-        return results
-
-    def _validateFieldValueDate(self, value):
-        """ Validates a filter date value. A filter date value can be a datetime object,
-            a relative date (e.g. -30d), or a date in YYYY-MM-DD format.
-        """
-        if isinstance(value, datetime):
-            return int(value.timestamp())
-        elif re.match(r'^-?\d+(mon|[smhdwy])$', value):
-            return '-' + value.lstrip('-')
-        else:
-            return int(utils.toDatetime(value, '%Y-%m-%d').timestamp())
-
-    def _validateFieldValueTag(self, value, filterField, libtype):
-        """ Validates a filter tag value. A filter tag value can be a :class:`~plexapi.library.FilterChoice` object,
-            a :class:`~plexapi.media.MediaTag` object, the exact name :attr:`MediaTag.tag` (*str*),
-            or the exact id :attr:`MediaTag.id` (*int*).
-        """
-        if isinstance(value, FilterChoice):
-            return value.key
-        if isinstance(value, (media.MediaTag, LibraryMediaTag)):
-            value = str(value.id or value.tag)
-        else:
-            value = str(value)
-        filterChoices = self.listFilterChoices(filterField.key, libtype)
-        matchValue = value.lower()
-        return next((f.key for f in filterChoices if matchValue in {f.key.lower(), f.title.lower()}), value)
-
-    def _validateSortFields(self, sort, libtype=None):
-        """ Validates a list of filter sort fields is available for the library. Sort fields can be a
-            list of :class:`~plexapi.library.FilteringSort` objects, or a comma separated string.
-            Returns the validated comma separated sort fields string.
-        """
-        if isinstance(sort, str):
-            sort = sort.split(',')
-
-        if not isinstance(sort, (list, tuple)):
-            sort = [sort]
-
-        validatedSorts = []
-        for _sort in sort:
-            validatedSorts.append(self._validateSortField(_sort, libtype))
-
-        return ','.join(validatedSorts)
-
-    def _validateSortField(self, sort, libtype=None):
-        """ Validates a filter sort field is available for the library. A sort field can be a
-            :class:`~plexapi.library.FilteringSort` object, or a string.
-            Returns the validated sort field string.
-        """
-        if isinstance(sort, FilteringSort):
-            return f'{libtype or self.TYPE}.{sort.key}:{sort.defaultDirection}'
-
-        match = re.match(r'(?:([a-zA-Z]*)\.)?([a-zA-Z]+):?([a-zA-Z]*)', sort.strip())
-        if not match:
-            raise BadRequest(f'Invalid filter sort: {sort}')
-        _libtype, sortField, sortDir = match.groups()
-        libtype = _libtype or libtype or self.TYPE
-
-        try:
-            filterSort = next(f for f in self.listSorts(libtype) if f.key == sortField)
-        except StopIteration:
-            availableSorts = [f.key for f in self.listSorts(libtype)]
-            raise NotFound(f'Unknown sort field "{sortField}" for libtype "{libtype}". '
-                           f'Available sort fields: {availableSorts}') from None
-
-        sortField = libtype + '.' + filterSort.key
-
-        availableDirections = ['', 'asc', 'desc', 'nullsLast']
-        if sortDir not in availableDirections:
-            raise NotFound(f'Unknown sort direction "{sortDir}". Available sort directions: {availableDirections}')
-
-        return f'{sortField}:{sortDir}' if sortDir else sortField
-
-    def _validateAdvancedSearch(self, filters, libtype):
-        """ Validates an advanced search filter dictionary.
-            Returns the list of validated URL encoded parameter strings for the advanced search.
-        """
-        if not isinstance(filters, dict):
-            raise BadRequest('Filters must be a dictionary.')
-
-        validatedFilters = []
-
-        for field, values in filters.items():
-            if field.lower() in {'and', 'or'}:
-                if len(filters.items()) > 1:
-                    raise BadRequest('Multiple keys in the same dictionary with and/or is not allowed.')
-                if not isinstance(values, list):
-                    raise BadRequest('Value for and/or keys must be a list of dictionaries.')
-
-                validatedFilters.append('push=1')
-
-                for value in values:
-                    validatedFilters.extend(self._validateAdvancedSearch(value, libtype))
-                    validatedFilters.append(f'{field.lower()}=1')
-
-                del validatedFilters[-1]
-                validatedFilters.append('pop=1')
-
-            else:
-                validatedFilters.append(self._validateFilterField(field, values, libtype))
-
-        return validatedFilters
-
-    def _buildSearchKey(self, title=None, sort=None, libtype=None, limit=None, filters=None, returnKwargs=False, **kwargs):
-        """ Returns the validated and formatted search query API key
-            (``/library/sections/<sectionKey>/all?<params>``).
-        """
-        args = {}
-        filter_args = []
-
-        args['includeGuids'] = int(bool(kwargs.pop('includeGuids', True)))
-        for field, values in list(kwargs.items()):
-            if field.split('__')[-1] not in OPERATORS:
-                filter_args.append(self._validateFilterField(field, values, libtype))
-                del kwargs[field]
-        if title is not None:
-            if isinstance(title, (list, tuple)):
-                filter_args.append(self._validateFilterField('title', title, libtype))
-            else:
-                args['title'] = title
-        if filters is not None:
-            filter_args.extend(self._validateAdvancedSearch(filters, libtype))
-        if sort is not None:
-            args['sort'] = self._validateSortFields(sort, libtype)
-        if libtype is not None:
-            args['type'] = utils.searchType(libtype)
-        if limit is not None:
-            args['limit'] = limit
-
-        joined_args = utils.joinArgs(args).lstrip('?')
-        joined_filter_args = '&'.join(filter_args) if filter_args else ''
-        params = '&'.join([joined_args, joined_filter_args]).strip('&')
-        key = f'/library/sections/{self.key}/all?{params}'
-
-        if returnKwargs:
-            return key, kwargs
-        return key
-
-    def hubSearch(self, query, mediatype=None, limit=None):
-        """ Returns the hub search results for this library. See :func:`plexapi.server.PlexServer.search`
-            for details and parameters.
-        """
-        return self._server.search(query, mediatype, limit, sectionId=self.key)
-
-    def search(self, title=None, sort=None, maxresults=None, libtype=None,
-               container_start=None, container_size=None, limit=None, filters=None, **kwargs):
-        """ Search the library. The http requests will be batched in container_size. If you are only looking for the
-            first <num> results, it would be wise to set the maxresults option to that amount so the search doesn't iterate
-            over all results on the server.
-
-            Parameters:
-                title (str, optional): General string query to search for. Partial string matches are allowed.
-                sort (:class:`~plexapi.library.FilteringSort` or str or list, optional): A field to sort the results.
-                    See the details below for more info.
-                maxresults (int, optional): Only return the specified number of results.
-                libtype (str, optional): Return results of a specific type (movie, show, season, episode,
-                    artist, album, track, photoalbum, photo, collection) (e.g. ``libtype='episode'`` will only
-                    return :class:`~plexapi.video.Episode` objects)
-                container_start (int, optional): Default 0.
-                container_size (int, optional): Default X_PLEX_CONTAINER_SIZE in your config file.
-                limit (int, optional): Limit the number of results from the filter.
-                filters (dict, optional): A dictionary of advanced filters. See the details below for more info.
-                **kwargs (dict): Additional custom filters to apply to the search results.
-                    See the details below for more info.
-
-            Raises:
-                :exc:`~plexapi.exceptions.BadRequest`: When the sort or filter is invalid.
-                :exc:`~plexapi.exceptions.NotFound`: When applying an unknown sort or filter.
-
-            **Sorting Results**
-
-            The search results can be sorted by including the ``sort`` parameter.
-
-            * See :func:`~plexapi.library.LibrarySection.listSorts` to get a list of available sort fields.
-
-            The ``sort`` parameter can be a :class:`~plexapi.library.FilteringSort` object or a sort string in the
-            format ``field:dir``. The sort direction ``dir`` can be ``asc``, ``desc``, or ``nullsLast``. Omitting the
-            sort direction or using a :class:`~plexapi.library.FilteringSort` object will sort the results in the default
-            direction of the field. Multi-sorting on multiple fields can be achieved by using a comma separated list of
-            sort strings, or a list of :class:`~plexapi.library.FilteringSort` object or strings.
-
-            Examples:
-
-                .. code-block:: python
-
-                    library.search(sort="titleSort:desc")  # Sort title in descending order
-                    library.search(sort="titleSort")  # Sort title in the default order
-                    # Multi-sort by year in descending order, then by audience rating in descending order
-                    library.search(sort="year:desc,audienceRating:desc")
-                    library.search(sort=["year:desc", "audienceRating:desc"])
-
-            **Using Plex Filters**
-
-            Any of the available custom filters can be applied to the search results
-            (`screenshot <../_static/images/LibrarySection.search.png>`__).
-
-            * See :func:`~plexapi.library.LibrarySection.listFields` to get a list of all available fields.
-            * See :func:`~plexapi.library.LibrarySection.listOperators` to get a list of all available operators.
-            * See :func:`~plexapi.library.LibrarySection.listFilterChoices` to get a list of all available filter values.
-
-            The following filter fields are just some examples of the possible filters. The list is not exhaustive,
-            and not all filters apply to all library types.
-
-            * **actor** (:class:`~plexapi.media.MediaTag`): Search for the name of an actor.
-            * **addedAt** (*datetime*): Search for items added before or after a date. See operators below.
-            * **audioLanguage** (*str*): Search for a specific audio language (3 character code, e.g. jpn).
-            * **collection** (:class:`~plexapi.media.MediaTag`): Search for the name of a collection.
-            * **contentRating** (:class:`~plexapi.media.MediaTag`): Search for a specific content rating.
-            * **country** (:class:`~plexapi.media.MediaTag`): Search for the name of a country.
-            * **decade** (*int*): Search for a specific decade (e.g. 2000).
-            * **director** (:class:`~plexapi.media.MediaTag`): Search for the name of a director.
-            * **duplicate** (*bool*) Search for duplicate items.
-            * **genre** (:class:`~plexapi.media.MediaTag`): Search for a specific genre.
-            * **hdr** (*bool*): Search for HDR items.
-            * **inProgress** (*bool*): Search for in progress items.
-            * **label** (:class:`~plexapi.media.MediaTag`): Search for a specific label.
-            * **lastViewedAt** (*datetime*): Search for items watched before or after a date. See operators below.
-            * **mood** (:class:`~plexapi.media.MediaTag`): Search for a specific mood.
-            * **producer** (:class:`~plexapi.media.MediaTag`): Search for the name of a producer.
-            * **resolution** (*str*): Search for a specific resolution (e.g. 1080).
-            * **studio** (*str*): Search for the name of a studio.
-            * **style** (:class:`~plexapi.media.MediaTag`): Search for a specific style.
-            * **subtitleLanguage** (*str*): Search for a specific subtitle language (3 character code, e.g. eng)
-            * **unmatched** (*bool*): Search for unmatched items.
-            * **unwatched** (*bool*): Search for unwatched items.
-            * **userRating** (*int*): Search for items with a specific user rating.
-            * **writer** (:class:`~plexapi.media.MediaTag`): Search for the name of a writer.
-            * **year** (*int*): Search for a specific year.
-
-            Tag type filter values can be a :class:`~plexapi.library.FilterChoice` object,
-            :class:`~plexapi.media.MediaTag` object, the exact name :attr:`MediaTag.tag` (*str*),
-            or the exact id :attr:`MediaTag.id` (*int*).
-
-            Date type filter values can be a ``datetime`` object, a relative date using a one of the
-            available date suffixes (e.g. ``30d``) (*str*), or a date in ``YYYY-MM-DD`` (*str*) format.
-
-            Relative date suffixes:
-
-            * ``s``: ``seconds``
-            * ``m``: ``minutes``
-            * ``h``: ``hours``
-            * ``d``: ``days``
-            * ``w``: ``weeks``
-            * ``mon``: ``months``
-            * ``y``: ``years``
-
-            Multiple values can be ``OR`` together by providing a list of values.
-
-            Examples:
-
-                .. code-block:: python
-
-                    library.search(unwatched=True, year=2020, resolution="4k")
-                    library.search(actor="Arnold Schwarzenegger", decade=1990)
-                    library.search(contentRating="TV-G", genre="animation")
-                    library.search(genre=["animation", "comedy"])  # Genre is animation OR comedy
-                    library.search(studio=["Disney", "Pixar"])  # Studio contains Disney OR Pixar
-
-            **Using a** ``libtype`` **Prefix**
-
-            Some filters may be prefixed by the ``libtype`` separated by a ``.`` (e.g. ``show.collection``,
-            ``episode.title``, ``artist.style``, ``album.genre``, ``track.userRating``, etc.). This should not be
-            confused with the ``libtype`` parameter. If no ``libtype`` prefix is provided, then the default library
-            type is assumed. For example, in a TV show library ``viewCount`` is assumed to be ``show.viewCount``.
-            If you want to filter using episode view count then you must specify ``episode.viewCount`` explicitly.
-            In addition, if the filter does not exist for the default library type it will fallback to the most
-            specific ``libtype`` available. For example, ``show.unwatched`` does not exists so it will fallback to
-            ``episode.unwatched``. The ``libtype`` prefix cannot be included directly in the function parameters so
-            the filters must be provided as a filters dictionary.
-
-            Examples:
-
-                .. code-block:: python
-
-                    library.search(filters={"show.collection": "Documentary", "episode.inProgress": True})
-                    library.search(filters={"artist.genre": "pop", "album.decade": 2000})
-
-                    # The following three options are identical and will return Episode objects
-                    showLibrary.search(title="Winter is Coming", libtype='episode')
-                    showLibrary.search(libtype='episode', filters={"episode.title": "Winter is Coming"})
-                    showLibrary.searchEpisodes(title="Winter is Coming")
-
-                    # The following will search for the episode title but return Show objects
-                    showLibrary.search(filters={"episode.title": "Winter is Coming"})
-
-                    # The following will fallback to episode.unwatched
-                    showLibrary.search(unwatched=True)
-
-            **Using Plex Operators**
-
-            Operators can be appended to the filter field to narrow down results with more granularity.
-            The following is a list of possible operators depending on the data type of the filter being applied.
-            A special ``&`` operator can also be used to ``AND`` together a list of values.
-
-            Type: :class:`~plexapi.media.MediaTag` or *subtitleLanguage* or *audioLanguage*
-
-            * no operator: ``is``
-            * ``!``: ``is not``
-
-            Type: *int*
-
-            * no operator: ``is``
-            * ``!``: ``is not``
-            * ``>>``: ``is greater than``
-            * ``<<``: ``is less than``
-
-            Type: *str*
-
-            * no operator: ``contains``
-            * ``!``: ``does not contain``
-            * ``=``: ``is``
-            * ``!=``: ``is not``
-            * ``<``: ``begins with``
-            * ``>``: ``ends with``
-
-            Type: *bool*
-
-            * no operator: ``is true``
-            * ``!``: ``is false``
-
-            Type: *datetime*
-
-            * ``<<``: ``is before``
-            * ``>>``: ``is after``
-
-            Type: *resolution* or *guid*
-
-            * no operator: ``is``
-
-            Operators cannot be included directly in the function parameters so the filters
-            must be provided as a filters dictionary.
-
-            Examples:
-
-                .. code-block:: python
-
-                    # Genre is horror AND thriller
-                    library.search(filters={"genre&": ["horror", "thriller"]})
-
-                    # Director is not Steven Spielberg
-                    library.search(filters={"director!": "Steven Spielberg"})
-
-                    # Title starts with Marvel and added before 2021-01-01
-                    library.search(filters={"title<": "Marvel", "addedAt<<": "2021-01-01"})
-
-                    # Added in the last 30 days using relative dates
-                    library.search(filters={"addedAt>>": "30d"})
-
-                    # Collection is James Bond and user rating is greater than 8
-                    library.search(filters={"collection": "James Bond", "userRating>>": 8})
-
-            **Using Advanced Filters**
-
-            Any of the Plex filters described above can be combined into a single ``filters`` dictionary that mimics
-            the advanced filters used in Plex Web with a tree of ``and``/``or`` branches. Each level of the tree must
-            start with ``and`` (Match all of the following) or ``or`` (Match any of the following) as the dictionary
-            key, and a list of dictionaries with the desired filters as the dictionary value.
-
-            The following example matches `this <../_static/images/LibrarySection.search_filters.png>`__ advanced filter
-            in Plex Web.
-
-            Examples:
-
-                .. code-block:: python
-
-                    advancedFilters = {
-                        'and': [                            # Match all of the following in this list
-                            {
-                                'or': [                     # Match any of the following in this list
-                                    {'title': 'elephant'},
-                                    {'title': 'bunny'}
-                                ]
-                            },
-                            {'year>>': 1990},
-                            {'unwatched': True}
-                        ]
-                    }
-                    library.search(filters=advancedFilters)
-
-            **Using PlexAPI Operators**
-
-            For even more advanced filtering which cannot be achieved in Plex, the PlexAPI operators can be applied
-            to any XML attribute. See :func:`plexapi.base.PlexObject.fetchItems` for a list of operators and how they
-            are used. Note that using the Plex filters above will be faster since the filters are applied by the Plex
-            server before the results are returned to PlexAPI. Using the PlexAPI operators requires the Plex server
-            to return *all* results to allow PlexAPI to do the filtering. The Plex filters and the PlexAPI operators
-            can be used in conjunction with each other.
-
-            Examples:
-
-                .. code-block:: python
-
-                    library.search(summary__icontains="Christmas")
-                    library.search(duration__gt=7200000)
-                    library.search(audienceRating__lte=6.0, audienceRatingImage__startswith="rottentomatoes://")
-                    library.search(media__videoCodec__exact="h265")
-                    library.search(genre="holiday", viewCount__gte=3)
-
-        """
-        key, kwargs = self._buildSearchKey(
-            title=title, sort=sort, libtype=libtype, limit=limit, filters=filters, returnKwargs=True, **kwargs)
-        return self.fetchItems(
-            key, container_start=container_start, container_size=container_size, maxresults=maxresults, **kwargs)
-
-    def _locations(self):
-        """ Returns a list of :class:`~plexapi.library.Location` objects
-        """
-        return self.findItems(self._data, Location)
-
-    def sync(self, policy, mediaSettings, client=None, clientId=None, title=None, sort=None, libtype=None,
-             **kwargs):
-        """ Add current library section as sync item for specified device.
-            See description of :func:`~plexapi.library.LibrarySection.search` for details about filtering / sorting
-            and :func:`~plexapi.myplex.MyPlexAccount.sync` for possible exceptions.
-
-            Parameters:
-                policy (:class:`~plexapi.sync.Policy`): policy of syncing the media (how many items to sync and process
-                                                       watched media or not), generated automatically when method
-                                                       called on specific LibrarySection object.
-                mediaSettings (:class:`~plexapi.sync.MediaSettings`): Transcoding settings used for the media, generated
-                                                                     automatically when method called on specific
-                                                                     LibrarySection object.
-                client (:class:`~plexapi.myplex.MyPlexDevice`): sync destination, see
-                                                               :func:`~plexapi.myplex.MyPlexAccount.sync`.
-                clientId (str): sync destination, see :func:`~plexapi.myplex.MyPlexAccount.sync`.
-                title (str): descriptive title for the new :class:`~plexapi.sync.SyncItem`, if empty the value would be
-                             generated from metadata of current media.
-                sort (str): formatted as `column:dir`; column can be any of {`addedAt`, `originallyAvailableAt`,
-                            `lastViewedAt`, `titleSort`, `rating`, `mediaHeight`, `duration`}. dir can be `asc` or
-                            `desc`.
-                libtype (str): Filter results to a specific libtype (`movie`, `show`, `episode`, `artist`, `album`,
-                               `track`).
-
-            Returns:
-                :class:`~plexapi.sync.SyncItem`: an instance of created syncItem.
-
-            Raises:
-                :exc:`~plexapi.exceptions.BadRequest`: When the library is not allowed to sync.
-                :exc:`~plexapi.exceptions.BadRequest`: When the sort or filter is invalid.
-                :exc:`~plexapi.exceptions.NotFound`: When applying an unknown sort or filter.
-
-            Example:
-
-                .. code-block:: python
-
-                    from plexapi import myplex
-                    from plexapi.sync import Policy, MediaSettings, VIDEO_QUALITY_3_MBPS_720p
-
-                    c = myplex.MyPlexAccount()
-                    target = c.device('Plex Client')
-                    sync_items_wd = c.syncItems(target.clientIdentifier)
-                    srv = c.resource('Server Name').connect()
-                    section = srv.library.section('Movies')
-                    policy = Policy('count', unwatched=True, value=1)
-                    media_settings = MediaSettings.create(VIDEO_QUALITY_3_MBPS_720p)
-                    section.sync(target, policy, media_settings, title='Next best movie', sort='rating:desc')
-
-        """
-        from plexapi.sync import SyncItem
-
-        if not self.allowSync:
-            raise BadRequest('The requested library is not allowed to sync')
-
-        myplex = self._server.myPlexAccount()
-        sync_item = SyncItem(self._server, None)
-        sync_item.title = title if title else self.title
-        sync_item.rootTitle = self.title
-        sync_item.contentType = self.CONTENT_TYPE
-        sync_item.metadataType = self.METADATA_TYPE
-        sync_item.machineIdentifier = self._server.machineIdentifier
-
-        key = self._buildSearchKey(title=title, sort=sort, libtype=libtype, **kwargs)
-
-        sync_item.location = f'library://{self.uuid}/directory/{quote_plus(key)}'
-        sync_item.policy = policy
-        sync_item.mediaSettings = mediaSettings
-
-        return myplex.sync(client=client, clientId=clientId, sync_item=sync_item)
-
-    def history(self, maxresults=None, mindate=None):
-        """ Get Play History for this library Section for the owner.
-            Parameters:
-                maxresults (int): Only return the specified number of results (optional).
-                mindate (datetime): Min datetime to return results from.
-        """
-        return self._server.history(maxresults=maxresults, mindate=mindate, librarySectionID=self.key, accountID=1)
-
-    def createCollection(self, title, items=None, smart=False, limit=None,
-                         libtype=None, sort=None, filters=None, **kwargs):
-        """ Alias for :func:`~plexapi.server.PlexServer.createCollection` using this
-            :class:`~plexapi.library.LibrarySection`.
-        """
-        return self._server.createCollection(
-            title, section=self, items=items, smart=smart, limit=limit,
-            libtype=libtype, sort=sort, filters=filters, **kwargs)
-
-    def collection(self, title):
-        """ Returns the collection with the specified title.
-
-            Parameters:
-                title (str): Title of the item to return.
-
-            Raises:
-                :exc:`~plexapi.exceptions.NotFound`: Unable to find collection.
-        """
-        try:
-            return self.collections(title=title, title__iexact=title)[0]
-        except IndexError:
-            raise NotFound(f'Unable to find collection with title "{title}".') from None
-
-    def collections(self, **kwargs):
-        """ Returns a list of collections from this library section.
-            See description of :func:`~plexapi.library.LibrarySection.search` for details about filtering / sorting.
-        """
-        return self.search(libtype='collection', **kwargs)
-
-    def createPlaylist(self, title, items=None, smart=False, limit=None,
-                       sort=None, filters=None, m3ufilepath=None, **kwargs):
-        """ Alias for :func:`~plexapi.server.PlexServer.createPlaylist` using this
-            :class:`~plexapi.library.LibrarySection`.
-        """
-        return self._server.createPlaylist(
-            title, section=self, items=items, smart=smart, limit=limit,
-            sort=sort, filters=filters, m3ufilepath=m3ufilepath, **kwargs)
-
-    def playlist(self, title):
-        """ Returns the playlist with the specified title.
-
-            Parameters:
-                title (str): Title of the item to return.
-
-            Raises:
-                :exc:`~plexapi.exceptions.NotFound`: Unable to find playlist.
-        """
-        try:
-            return self.playlists(title=title, title__iexact=title)[0]
-        except IndexError:
-            raise NotFound(f'Unable to find playlist with title "{title}".') from None
-
-    def playlists(self, sort=None, **kwargs):
-        """ Returns a list of playlists from this library section. """
-        return self._server.playlists(
-            playlistType=self.CONTENT_TYPE, sectionId=self.key, sort=sort, **kwargs)
-
-    @deprecated('use "listFields" instead')
-    def filterFields(self, mediaType=None):
-        return self.listFields(libtype=mediaType)
-
-    @deprecated('use "listFilterChoices" instead')
-    def listChoices(self, category, libtype=None, **kwargs):
-        return self.listFilterChoices(field=category, libtype=libtype)
-
-    def getWebURL(self, base=None, tab=None, key=None):
-        """ Returns the Plex Web URL for the library.
-
-            Parameters:
-                base (str): The base URL before the fragment (``#!``).
-                    Default is https://app.plex.tv/desktop.
-                tab (str): The library tab (recommended, library, collections, playlists, timeline).
-                key (str): A hub key.
-        """
-        params = {'source': self.key}
-        if tab is not None:
-            params['pivot'] = tab
-        if key is not None:
-            params['key'] = key
-            params['pageType'] = 'list'
-        return self._server._buildWebURL(base=base, **params)
-
-    def _validateItems(self, items):
-        """ Validates the specified items are from this library and of the same type. """
-        if items is None or items == []:
-            raise BadRequest('No items specified.')
-
-        if not isinstance(items, list):
-            items = [items]
-
-        itemType = items[0].type
-        for item in items:
-            if item.librarySectionID != self.key:
-                raise BadRequest(f'{item.title} is not from this library.')
-            elif item.type != itemType:
-                raise BadRequest(f'Cannot mix items of different type: {itemType} and {item.type}')
-
-        return items
-
-    def common(self, items):
-        """ Returns a :class:`~plexapi.library.Common` object for the specified items. """
-        params = {
-            'id': ','.join(str(item.ratingKey) for item in self._validateItems(items)),
-            'type': utils.searchType(items[0].type)
-        }
-        part = f'/library/sections/{self.key}/common{utils.joinArgs(params)}'
-        return self.fetchItem(part, cls=Common)
-
-    def _edit(self, items=None, **kwargs):
-        """ Actually edit multiple objects. """
-        if isinstance(self._edits, dict) and items is None:
-            self._edits.update(kwargs)
-            return self
-
-        kwargs['id'] = ','.join(str(item.ratingKey) for item in self._validateItems(items))
-        if 'type' not in kwargs:
-            kwargs['type'] = utils.searchType(items[0].type)
-
-        part = f'/library/sections/{self.key}/all{utils.joinArgs(kwargs)}'
-        self._server.query(part, method=self._server._session.put)
-        return self
-
-    def multiEdit(self, items, **kwargs):
-        """ Edit multiple objects at once.
-            Note: This is a low level method and you need to know all the field/tag keys.
-            See :class:`~plexapi.LibrarySection.batchMultiEdits` instead.
-
-            Parameters:
-                items (List): List of :class:`~plexapi.audio.Audio`, :class:`~plexapi.video.Video`,
-                    :class:`~plexapi.photo.Photo`, or :class:`~plexapi.collection.Collection`
-                    objects to be edited.
-                kwargs (dict): Dict of settings to edit.
-        """
-        return self._edit(items, **kwargs)
-
-    def batchMultiEdits(self, items):
-        """ Enable batch multi-editing mode to save API calls.
-            Must call :func:`~plexapi.library.LibrarySection.saveMultiEdits` at the end to save all the edits.
-            See :class:`~plexapi.mixins.EditFieldMixin` and :class:`~plexapi.mixins.EditTagsMixin`
-            for individual field and tag editing methods.
-
-            Parameters:
-                items (List): List of :class:`~plexapi.audio.Audio`, :class:`~plexapi.video.Video`,
-                    :class:`~plexapi.photo.Photo`, or :class:`~plexapi.collection.Collection`
-                    objects to be edited.
-
-            Example:
-
-                .. code-block:: python
-
-                    movies = MovieSection.all()
-                    items = [movies[0], movies[3], movies[5]]
-
-                    # Batch multi-editing multiple fields and tags in a single API call
-                    MovieSection.batchMultiEdits(items)
-                    MovieSection.editTitle('A New Title').editSummary('A new summary').editTagline('A new tagline') \\
-                        .addCollection('New Collection').removeGenre('Action').addLabel('Favorite')
-                    MovieSection.saveMultiEdits()
-
-        """
-        self._edits = {'items': self._validateItems(items)}
-        return self
-
-    def saveMultiEdits(self):
-        """ Save all the batch multi-edits.
-            See :func:`~plexapi.library.LibrarySection.batchMultiEdits` for details.
-        """
-        if not isinstance(self._edits, dict):
-            raise BadRequest('Batch multi-editing mode not enabled. Must call `batchMultiEdits()` first.')
-
-        edits = self._edits
-        self._edits = None
-        self._edit(items=edits.pop('items'), **edits)
-        return self
-
-
-class MovieSection(LibrarySection, MovieEditMixins):
-    """ Represents a :class:`~plexapi.library.LibrarySection` section containing movies.
-
-        Attributes:
-            TAG (str): 'Directory'
-            TYPE (str): 'movie'
-    """
-    TAG = 'Directory'
-    TYPE = 'movie'
-    METADATA_TYPE = 'movie'
-    CONTENT_TYPE = 'video'
-
-    def searchMovies(self, **kwargs):
-        """ Search for a movie. See :func:`~plexapi.library.LibrarySection.search` for usage. """
-        return self.search(libtype='movie', **kwargs)
-
-    def recentlyAddedMovies(self, maxresults=50):
-        """ Returns a list of recently added movies from this library section.
-
-            Parameters:
-                maxresults (int): Max number of items to return (default 50).
-        """
-        return self.recentlyAdded(maxresults=maxresults, libtype='movie')
-
-    def sync(self, videoQuality, limit=None, unwatched=False, **kwargs):
-        """ Add current Movie library section as sync item for specified device.
-            See description of :func:`~plexapi.library.LibrarySection.search` for details about filtering / sorting and
-            :func:`~plexapi.library.LibrarySection.sync` for details on syncing libraries and possible exceptions.
-
-            Parameters:
-                videoQuality (int): idx of quality of the video, one of VIDEO_QUALITY_* values defined in
-                                    :mod:`~plexapi.sync` module.
-                limit (int): maximum count of movies to sync, unlimited if `None`.
-                unwatched (bool): if `True` watched videos wouldn't be synced.
-
-            Returns:
-                :class:`~plexapi.sync.SyncItem`: an instance of created syncItem.
-
-            Example:
-
-                .. code-block:: python
-
-                    from plexapi import myplex
-                    from plexapi.sync import VIDEO_QUALITY_3_MBPS_720p
-
-                    c = myplex.MyPlexAccount()
-                    target = c.device('Plex Client')
-                    sync_items_wd = c.syncItems(target.clientIdentifier)
-                    srv = c.resource('Server Name').connect()
-                    section = srv.library.section('Movies')
-                    section.sync(VIDEO_QUALITY_3_MBPS_720p, client=target, limit=1, unwatched=True,
-                                 title='Next best movie', sort='rating:desc')
-
-        """
-        from plexapi.sync import Policy, MediaSettings
-        kwargs['mediaSettings'] = MediaSettings.createVideo(videoQuality)
-        kwargs['policy'] = Policy.create(limit, unwatched)
-        return super(MovieSection, self).sync(**kwargs)
-
-
-class ShowSection(LibrarySection, ShowEditMixins, SeasonEditMixins, EpisodeEditMixins):
-    """ Represents a :class:`~plexapi.library.LibrarySection` section containing tv shows.
-
-        Attributes:
-            TAG (str): 'Directory'
-            TYPE (str): 'show'
-    """
-    TAG = 'Directory'
-    TYPE = 'show'
-    METADATA_TYPE = 'episode'
-    CONTENT_TYPE = 'video'
-
-    def searchShows(self, **kwargs):
-        """ Search for a show. See :func:`~plexapi.library.LibrarySection.search` for usage. """
-        return self.search(libtype='show', **kwargs)
-
-    def searchSeasons(self, **kwargs):
-        """ Search for a season. See :func:`~plexapi.library.LibrarySection.search` for usage. """
-        return self.search(libtype='season', **kwargs)
-
-    def searchEpisodes(self, **kwargs):
-        """ Search for an episode. See :func:`~plexapi.library.LibrarySection.search` for usage. """
-        return self.search(libtype='episode', **kwargs)
-
-    def recentlyAddedShows(self, maxresults=50):
-        """ Returns a list of recently added shows from this library section.
-
-            Parameters:
-                maxresults (int): Max number of items to return (default 50).
-        """
-        return self.recentlyAdded(maxresults=maxresults, libtype='show')
-
-    def recentlyAddedSeasons(self, maxresults=50):
-        """ Returns a list of recently added seasons from this library section.
-
-            Parameters:
-                maxresults (int): Max number of items to return (default 50).
-        """
-        return self.recentlyAdded(maxresults=maxresults, libtype='season')
-
-    def recentlyAddedEpisodes(self, maxresults=50):
-        """ Returns a list of recently added episodes from this library section.
-
-            Parameters:
-                maxresults (int): Max number of items to return (default 50).
-        """
-        return self.recentlyAdded(maxresults=maxresults, libtype='episode')
-
-    def sync(self, videoQuality, limit=None, unwatched=False, **kwargs):
-        """ Add current Show library section as sync item for specified device.
-            See description of :func:`~plexapi.library.LibrarySection.search` for details about filtering / sorting and
-            :func:`~plexapi.library.LibrarySection.sync` for details on syncing libraries and possible exceptions.
-
-            Parameters:
-                videoQuality (int): idx of quality of the video, one of VIDEO_QUALITY_* values defined in
-                                    :mod:`~plexapi.sync` module.
-                limit (int): maximum count of episodes to sync, unlimited if `None`.
-                unwatched (bool): if `True` watched videos wouldn't be synced.
-
-            Returns:
-                :class:`~plexapi.sync.SyncItem`: an instance of created syncItem.
-
-            Example:
-
-                .. code-block:: python
-
-                    from plexapi import myplex
-                    from plexapi.sync import VIDEO_QUALITY_3_MBPS_720p
-
-                    c = myplex.MyPlexAccount()
-                    target = c.device('Plex Client')
-                    sync_items_wd = c.syncItems(target.clientIdentifier)
-                    srv = c.resource('Server Name').connect()
-                    section = srv.library.section('TV-Shows')
-                    section.sync(VIDEO_QUALITY_3_MBPS_720p, client=target, limit=1, unwatched=True,
-                                 title='Next unwatched episode')
-
-        """
-        from plexapi.sync import Policy, MediaSettings
-        kwargs['mediaSettings'] = MediaSettings.createVideo(videoQuality)
-        kwargs['policy'] = Policy.create(limit, unwatched)
-        return super(ShowSection, self).sync(**kwargs)
-
-
-class MusicSection(LibrarySection, ArtistEditMixins, AlbumEditMixins, TrackEditMixins):
-    """ Represents a :class:`~plexapi.library.LibrarySection` section containing music artists.
-
-        Attributes:
-            TAG (str): 'Directory'
-            TYPE (str): 'artist'
-    """
-    TAG = 'Directory'
-    TYPE = 'artist'
-    METADATA_TYPE = 'track'
-    CONTENT_TYPE = 'audio'
-
-    def albums(self):
-        """ Returns a list of :class:`~plexapi.audio.Album` objects in this section. """
-        key = f'/library/sections/{self.key}/albums'
-        return self.fetchItems(key)
-
-    def stations(self):
-        """ Returns a list of :class:`~plexapi.playlist.Playlist` stations in this section. """
-        return next((hub._partialItems for hub in self.hubs() if hub.context == 'hub.music.stations'), None)
-
-    def searchArtists(self, **kwargs):
-        """ Search for an artist. See :func:`~plexapi.library.LibrarySection.search` for usage. """
-        return self.search(libtype='artist', **kwargs)
-
-    def searchAlbums(self, **kwargs):
-        """ Search for an album. See :func:`~plexapi.library.LibrarySection.search` for usage. """
-        return self.search(libtype='album', **kwargs)
-
-    def searchTracks(self, **kwargs):
-        """ Search for a track. See :func:`~plexapi.library.LibrarySection.search` for usage. """
-        return self.search(libtype='track', **kwargs)
-
-    def recentlyAddedArtists(self, maxresults=50):
-        """ Returns a list of recently added artists from this library section.
-
-            Parameters:
-                maxresults (int): Max number of items to return (default 50).
-        """
-        return self.recentlyAdded(maxresults=maxresults, libtype='artist')
-
-    def recentlyAddedAlbums(self, maxresults=50):
-        """ Returns a list of recently added albums from this library section.
-
-            Parameters:
-                maxresults (int): Max number of items to return (default 50).
-        """
-        return self.recentlyAdded(maxresults=maxresults, libtype='album')
-
-    def recentlyAddedTracks(self, maxresults=50):
-        """ Returns a list of recently added tracks from this library section.
-
-            Parameters:
-                maxresults (int): Max number of items to return (default 50).
-        """
-        return self.recentlyAdded(maxresults=maxresults, libtype='track')
-
-    def sync(self, bitrate, limit=None, **kwargs):
-        """ Add current Music library section as sync item for specified device.
-            See description of :func:`~plexapi.library.LibrarySection.search` for details about filtering / sorting and
-            :func:`~plexapi.library.LibrarySection.sync` for details on syncing libraries and possible exceptions.
-
-            Parameters:
-                bitrate (int): maximum bitrate for synchronized music, better use one of MUSIC_BITRATE_* values from the
-                               module :mod:`~plexapi.sync`.
-                limit (int): maximum count of tracks to sync, unlimited if `None`.
-
-            Returns:
-                :class:`~plexapi.sync.SyncItem`: an instance of created syncItem.
-
-            Example:
-
-                .. code-block:: python
-
-                    from plexapi import myplex
-                    from plexapi.sync import AUDIO_BITRATE_320_KBPS
-
-                    c = myplex.MyPlexAccount()
-                    target = c.device('Plex Client')
-                    sync_items_wd = c.syncItems(target.clientIdentifier)
-                    srv = c.resource('Server Name').connect()
-                    section = srv.library.section('Music')
-                    section.sync(AUDIO_BITRATE_320_KBPS, client=target, limit=100, sort='addedAt:desc',
-                                 title='New music')
-
-        """
-        from plexapi.sync import Policy, MediaSettings
-        kwargs['mediaSettings'] = MediaSettings.createMusic(bitrate)
-        kwargs['policy'] = Policy.create(limit)
-        return super(MusicSection, self).sync(**kwargs)
-
-    def sonicAdventure(
-            self,
-            start: Track | int,
-            end: Track | int,
-            **kwargs: Any,
-    ) -> list[Track]:
-        """ Returns a list of tracks from this library section that are part of a sonic adventure.
-            ID's should be of a track, other ID's will return an empty list or items itself or an error.
-
-            Parameters:
-                start (Track | int): The :class:`~plexapi.audio.Track` or ID of the first track in the sonic adventure.
-                end (Track | int): The :class:`~plexapi.audio.Track` or ID of the last track in the sonic adventure.
-                kwargs: Additional parameters to pass to :func:`~plexapi.base.PlexObject.fetchItems`.
-
-            Returns:
-                List[:class:`~plexapi.audio.Track`]: a list of tracks from this library section
-                that are part of a sonic adventure.
-        """
-        # can not use Track due to circular import
-        startID = start if isinstance(start, int) else start.ratingKey
-        endID = end if isinstance(end, int) else end.ratingKey
-
-        key = f"/library/sections/{self.key}/computePath?startID={startID}&endID={endID}"
-        return self.fetchItems(key, **kwargs)
-
-
-class PhotoSection(LibrarySection, PhotoalbumEditMixins, PhotoEditMixins):
-    """ Represents a :class:`~plexapi.library.LibrarySection` section containing photos.
-
-        Attributes:
-            TAG (str): 'Directory'
-            TYPE (str): 'photo'
-    """
-    TAG = 'Directory'
-    TYPE = 'photo'
-    METADATA_TYPE = 'photo'
-    CONTENT_TYPE = 'photo'
-
-    def all(self, libtype=None, **kwargs):
-        """ Returns a list of all items from this library section.
-            See description of :func:`plexapi.library.LibrarySection.search()` for details about filtering / sorting.
-        """
-        libtype = libtype or 'photoalbum'
-        return self.search(libtype=libtype, **kwargs)
-
-    def collections(self, **kwargs):
-        raise NotImplementedError('Collections are not available for a Photo library.')
-
-    def searchAlbums(self, **kwargs):
-        """ Search for a photo album. See :func:`~plexapi.library.LibrarySection.search` for usage. """
-        return self.search(libtype='photoalbum', **kwargs)
-
-    def searchPhotos(self, **kwargs):
-        """ Search for a photo. See :func:`~plexapi.library.LibrarySection.search` for usage. """
-        return self.search(libtype='photo', **kwargs)
-
-    def recentlyAddedAlbums(self, maxresults=50):
-        """ Returns a list of recently added photo albums from this library section.
-
-            Parameters:
-                maxresults (int): Max number of items to return (default 50).
-        """
-        # Use search() instead of recentlyAdded() because libtype=None
-        return self.search(sort='addedAt:desc', maxresults=maxresults)
-
-    def sync(self, resolution, limit=None, **kwargs):
-        """ Add current Music library section as sync item for specified device.
-            See description of :func:`~plexapi.library.LibrarySection.search` for details about filtering / sorting and
-            :func:`~plexapi.library.LibrarySection.sync` for details on syncing libraries and possible exceptions.
-
-            Parameters:
-                resolution (str): maximum allowed resolution for synchronized photos, see PHOTO_QUALITY_* values in the
-                                  module :mod:`~plexapi.sync`.
-                limit (int): maximum count of tracks to sync, unlimited if `None`.
-
-            Returns:
-                :class:`~plexapi.sync.SyncItem`: an instance of created syncItem.
-
-            Example:
-
-                .. code-block:: python
-
-                    from plexapi import myplex
-                    from plexapi.sync import PHOTO_QUALITY_HIGH
-
-                    c = myplex.MyPlexAccount()
-                    target = c.device('Plex Client')
-                    sync_items_wd = c.syncItems(target.clientIdentifier)
-                    srv = c.resource('Server Name').connect()
-                    section = srv.library.section('Photos')
-                    section.sync(PHOTO_QUALITY_HIGH, client=target, limit=100, sort='addedAt:desc',
-                                 title='Fresh photos')
-
-        """
-        from plexapi.sync import Policy, MediaSettings
-        kwargs['mediaSettings'] = MediaSettings.createPhoto(resolution)
-        kwargs['policy'] = Policy.create(limit)
-        return super(PhotoSection, self).sync(**kwargs)
-
-
-@utils.registerPlexObject
-class LibraryTimeline(PlexObject):
-    """Represents a LibrarySection timeline.
-
-        Attributes:
-            TAG (str): 'LibraryTimeline'
-            size (int): Unknown
-            allowSync (bool): Unknown
-            art (str): Relative path to art image.
-            content (str): "secondary"
-            identifier (str): "com.plexapp.plugins.library"
-            latestEntryTime (int): Epoch timestamp
-            mediaTagPrefix (str): "/system/bundle/media/flags/"
-            mediaTagVersion (int): Unknown
-            thumb (str): Relative path to library thumb image.
-            title1 (str): Name of library section.
-            updateQueueSize (int): Number of items queued to update.
-            viewGroup (str): "secondary"
-            viewMode (int): Unknown
-    """
-    TAG = 'LibraryTimeline'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.size = utils.cast(int, data.attrib.get('size'))
-        self.allowSync = utils.cast(bool, data.attrib.get('allowSync'))
-        self.art = data.attrib.get('art')
-        self.content = data.attrib.get('content')
-        self.identifier = data.attrib.get('identifier')
-        self.latestEntryTime = utils.cast(int, data.attrib.get('latestEntryTime'))
-        self.mediaTagPrefix = data.attrib.get('mediaTagPrefix')
-        self.mediaTagVersion = utils.cast(int, data.attrib.get('mediaTagVersion'))
-        self.thumb = data.attrib.get('thumb')
-        self.title1 = data.attrib.get('title1')
-        self.updateQueueSize = utils.cast(int, data.attrib.get('updateQueueSize'))
-        self.viewGroup = data.attrib.get('viewGroup')
-        self.viewMode = utils.cast(int, data.attrib.get('viewMode'))
-
-
-@utils.registerPlexObject
-class Location(PlexObject):
-    """ Represents a single library Location.
-
-        Attributes:
-            TAG (str): 'Location'
-            id (int): Location path ID.
-            path (str): Path used for library..
-    """
-    TAG = 'Location'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.id = utils.cast(int, data.attrib.get('id'))
-        self.path = data.attrib.get('path')
-
-
-@utils.registerPlexObject
-class Hub(PlexObject):
-    """ Represents a single Hub (or category) in the PlexServer search.
-
-        Attributes:
-            TAG (str): 'Hub'
-            context (str): The context of the hub.
-            hubKey (str): API URL for these specific hub items.
-            hubIdentifier (str): The identifier of the hub.
-            items (list): List of items in the hub (automatically loads all items if more is True).
-            key (str): API URL for the hub.
-            random (bool): True if the items in the hub are randomized.
-            more (bool): True if there are more items to load (call items to fetch all items).
-            size (int): The number of items in the hub.
-            style (str): The style of the hub.
-            title (str): The title of the hub.
-            type (str): The type of items in the hub.
-    """
-    TAG = 'Hub'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.context = data.attrib.get('context')
-        self.hubKey = data.attrib.get('hubKey')
-        self.hubIdentifier = data.attrib.get('hubIdentifier')
-        self.key = data.attrib.get('key')
-        self.more = utils.cast(bool, data.attrib.get('more'))
-        self.random = utils.cast(bool, data.attrib.get('random', '0'))
-        self.size = utils.cast(int, data.attrib.get('size'))
-        self.style = data.attrib.get('style')
-        self.title = data.attrib.get('title')
-        self.type = data.attrib.get('type')
-
-    def __len__(self):
-        return self.size
-
-    @cached_data_property
-    def _partialItems(self):
-        """ Cache for partial items. """
-        return self.findItems(self._data)
-
-    @cached_data_property
-    def _items(self):
-        """ Cache for items. """
-        if self.more and self.key:  # If there are more items to load, fetch them
-            items = self.fetchItems(self.key)
-            self.more = False
-            self.size = len(items)
-            return items
-        # Otherwise, all the data is in the initial _data XML response
-        return self._partialItems
-
-    def items(self):
-        """ Returns a list of all items in the hub. """
-        return self._items
-
-    @cached_data_property
-    def _section(self):
-        """ Cache for section. """
-        return self._server.library.sectionByID(self.librarySectionID)
-
-    def section(self):
-        """ Returns the :class:`~plexapi.library.LibrarySection` this hub belongs to.
-        """
-        return self._section
-
-    def _reload(self, **kwargs):
-        """ Reload the data for the hub. """
-        key = self._initpath
-        data = self._server.query(key)
-        self._findAndLoadElem(data, hubIdentifier=self.hubIdentifier)
-        return self
-
-
-class LibraryMediaTag(PlexObject):
-    """ Base class of library media tags.
-
-        Attributes:
-            TAG (str): 'Directory'
-            count (int): The number of items where this tag is found.
-            filter (str): The URL filter for the tag.
-            id (int): The id of the tag.
-            key (str): API URL (/library/section/<librarySectionID>/all?<filter>).
-            librarySectionID (int): The library section ID where the tag is found.
-            librarySectionKey (str): API URL for the library section (/library/section/<librarySectionID>)
-            librarySectionTitle (str): The library title where the tag is found.
-            librarySectionType (int): The library type where the tag is found.
-            reason (str): The reason for the search result.
-            reasonID (int): The reason ID for the search result.
-            reasonTitle (str): The reason title for the search result.
-            score (float): The score for the search result.
-            type (str): The type of search result (tag).
-            tag (str): The title of the tag.
-            tagKey (str): The Plex Discover ratingKey (guid) for people.
-            tagType (int): The type ID of the tag.
-            tagValue (int): The value of the tag.
-            thumb (str): The URL for the thumbnail of the tag (if available).
-    """
-    TAG = 'Directory'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.count = utils.cast(int, data.attrib.get('count'))
-        self.filter = data.attrib.get('filter')
-        self.id = utils.cast(int, data.attrib.get('id'))
-        self.key = data.attrib.get('key')
-        self.librarySectionID = utils.cast(int, data.attrib.get('librarySectionID'))
-        self.librarySectionKey = data.attrib.get('librarySectionKey')
-        self.librarySectionTitle = data.attrib.get('librarySectionTitle')
-        self.librarySectionType = utils.cast(int, data.attrib.get('librarySectionType'))
-        self.reason = data.attrib.get('reason')
-        self.reasonID = utils.cast(int, data.attrib.get('reasonID'))
-        self.reasonTitle = data.attrib.get('reasonTitle')
-        self.score = utils.cast(float, data.attrib.get('score'))
-        self.type = data.attrib.get('type')
-        self.tag = data.attrib.get('tag')
-        self.tagKey = data.attrib.get('tagKey')
-        self.tagType = utils.cast(int, data.attrib.get('tagType'))
-        self.tagValue = utils.cast(int, data.attrib.get('tagValue'))
-        self.thumb = data.attrib.get('thumb')
-
-    def items(self, *args, **kwargs):
-        """ Return the list of items within this tag. """
-        if not self.key:
-            raise BadRequest(f'Key is not defined for this tag: {self.tag}')
-        return self.fetchItems(self.key)
-
-
-@utils.registerPlexObject
-class Aperture(LibraryMediaTag):
-    """ Represents a single Aperture library media tag.
-
-        Attributes:
-            TAGTYPE (int): 202
-    """
-    TAGTYPE = 202
-
-
-@utils.registerPlexObject
-class Art(LibraryMediaTag):
-    """ Represents a single Art library media tag.
-
-        Attributes:
-            TAGTYPE (int): 313
-    """
-    TAGTYPE = 313
-
-
-@utils.registerPlexObject
-class Autotag(LibraryMediaTag):
-    """ Represents a single Autotag library media tag.
-
-        Attributes:
-            TAGTYPE (int): 207
-    """
-    TAGTYPE = 207
-
-
-@utils.registerPlexObject
-class Chapter(LibraryMediaTag):
-    """ Represents a single Chapter library media tag.
-
-        Attributes:
-            TAGTYPE (int): 9
-    """
-    TAGTYPE = 9
-
-
-@utils.registerPlexObject
-class Collection(LibraryMediaTag):
-    """ Represents a single Collection library media tag.
-
-        Attributes:
-            TAGTYPE (int): 2
-    """
-    TAGTYPE = 2
-
-
-@utils.registerPlexObject
-class Concert(LibraryMediaTag):
-    """ Represents a single Concert library media tag.
-
-        Attributes:
-            TAGTYPE (int): 306
-    """
-    TAGTYPE = 306
-
-
-@utils.registerPlexObject
-class Country(LibraryMediaTag):
-    """ Represents a single Country library media tag.
-
-        Attributes:
-            TAGTYPE (int): 8
-    """
-    TAGTYPE = 8
-
-
-@utils.registerPlexObject
-class Device(LibraryMediaTag):
-    """ Represents a single Device library media tag.
-
-        Attributes:
-            TAGTYPE (int): 206
-    """
-    TAGTYPE = 206
-
-
-@utils.registerPlexObject
-class Director(LibraryMediaTag):
-    """ Represents a single Director library media tag.
-
-        Attributes:
-            TAGTYPE (int): 4
-    """
-    TAGTYPE = 4
-
-
-@utils.registerPlexObject
-class Exposure(LibraryMediaTag):
-    """ Represents a single Exposure library media tag.
-
-        Attributes:
-            TAGTYPE (int): 203
-    """
-    TAGTYPE = 203
-
-
-@utils.registerPlexObject
-class Format(LibraryMediaTag):
-    """ Represents a single Format library media tag.
-
-        Attributes:
-            TAGTYPE (int): 302
-    """
-    TAGTYPE = 302
-
-
-@utils.registerPlexObject
-class Genre(LibraryMediaTag):
-    """ Represents a single Genre library media tag.
-
-        Attributes:
-            TAGTYPE (int): 1
-    """
-    TAGTYPE = 1
-
-
-@utils.registerPlexObject
-class Guid(LibraryMediaTag):
-    """ Represents a single Guid library media tag.
-
-        Attributes:
-            TAGTYPE (int): 314
-    """
-    TAGTYPE = 314
-
-
-@utils.registerPlexObject
-class ISO(LibraryMediaTag):
-    """ Represents a single ISO library media tag.
-
-        Attributes:
-            TAGTYPE (int): 204
-    """
-    TAGTYPE = 204
-
-
-@utils.registerPlexObject
-class Label(LibraryMediaTag):
-    """ Represents a single Label library media tag.
-
-        Attributes:
-            TAGTYPE (int): 11
-    """
-    TAGTYPE = 11
-
-
-@utils.registerPlexObject
-class Lens(LibraryMediaTag):
-    """ Represents a single Lens library media tag.
-
-        Attributes:
-            TAGTYPE (int): 205
-    """
-    TAGTYPE = 205
-
-
-@utils.registerPlexObject
-class Make(LibraryMediaTag):
-    """ Represents a single Make library media tag.
-
-        Attributes:
-            TAGTYPE (int): 200
-    """
-    TAGTYPE = 200
-
-
-@utils.registerPlexObject
-class Marker(LibraryMediaTag):
-    """ Represents a single Marker library media tag.
-
-        Attributes:
-            TAGTYPE (int): 12
-    """
-    TAGTYPE = 12
-
-
-@utils.registerPlexObject
-class MediaProcessingTarget(LibraryMediaTag):
-    """ Represents a single MediaProcessingTarget library media tag.
-
-        Attributes:
-            TAG (str): 'Tag'
-            TAGTYPE (int): 42
-    """
-    TAG = 'Tag'
-    TAGTYPE = 42
-
-
-@utils.registerPlexObject
-class Model(LibraryMediaTag):
-    """ Represents a single Model library media tag.
-
-        Attributes:
-            TAGTYPE (int): 201
-    """
-    TAGTYPE = 201
-
-
-@utils.registerPlexObject
-class Mood(LibraryMediaTag):
-    """ Represents a single Mood library media tag.
-
-        Attributes:
-            TAGTYPE (int): 300
-    """
-    TAGTYPE = 300
-
-
-@utils.registerPlexObject
-class Network(LibraryMediaTag):
-    """ Represents a single Network library media tag.
-
-        Attributes:
-            TAGTYPE (int): 319
-    """
-    TAGTYPE = 319
-
-
-@utils.registerPlexObject
-class Place(LibraryMediaTag):
-    """ Represents a single Place library media tag.
-
-        Attributes:
-            TAGTYPE (int): 400
-    """
-    TAGTYPE = 400
-
-
-@utils.registerPlexObject
-class Poster(LibraryMediaTag):
-    """ Represents a single Poster library media tag.
-
-        Attributes:
-            TAGTYPE (int): 312
-    """
-    TAGTYPE = 312
-
-
-@utils.registerPlexObject
-class Producer(LibraryMediaTag):
-    """ Represents a single Producer library media tag.
-
-        Attributes:
-            TAGTYPE (int): 7
-    """
-    TAGTYPE = 7
-
-
-@utils.registerPlexObject
-class RatingImage(LibraryMediaTag):
-    """ Represents a single RatingImage library media tag.
-
-        Attributes:
-            TAGTYPE (int): 316
-    """
-    TAGTYPE = 316
-
-
-@utils.registerPlexObject
-class Review(LibraryMediaTag):
-    """ Represents a single Review library media tag.
-
-        Attributes:
-            TAGTYPE (int): 10
-    """
-    TAGTYPE = 10
-
-
-@utils.registerPlexObject
-class Role(LibraryMediaTag):
-    """ Represents a single Role library media tag.
-
-        Attributes:
-            TAGTYPE (int): 6
-    """
-    TAGTYPE = 6
-
-
-@utils.registerPlexObject
-class Similar(LibraryMediaTag):
-    """ Represents a single Similar library media tag.
-
-        Attributes:
-            TAGTYPE (int): 305
-    """
-    TAGTYPE = 305
-
-
-@utils.registerPlexObject
-class Studio(LibraryMediaTag):
-    """ Represents a single Studio library media tag.
-
-        Attributes:
-            TAGTYPE (int): 318
-    """
-    TAGTYPE = 318
-
-
-@utils.registerPlexObject
-class Style(LibraryMediaTag):
-    """ Represents a single Style library media tag.
-
-        Attributes:
-            TAGTYPE (int): 301
-    """
-    TAGTYPE = 301
-
-
-@utils.registerPlexObject
-class Tag(LibraryMediaTag):
-    """ Represents a single Tag library media tag.
-
-        Attributes:
-            TAGTYPE (int): 0
-    """
-    TAGTYPE = 0
-
-
-@utils.registerPlexObject
-class Theme(LibraryMediaTag):
-    """ Represents a single Theme library media tag.
-
-        Attributes:
-            TAGTYPE (int): 317
-    """
-    TAGTYPE = 317
-
-
-@utils.registerPlexObject
-class Writer(LibraryMediaTag):
-    """ Represents a single Writer library media tag.
-
-        Attributes:
-            TAGTYPE (int): 5
-    """
-    TAGTYPE = 5
-
-
-class FilteringType(PlexObject):
-    """ Represents a single filtering Type object for a library.
-
-        Attributes:
-            TAG (str): 'Type'
-            active (bool): True if this filter type is currently active.
-            fields (List<:class:`~plexapi.library.FilteringField`>): List of field objects.
-            filters (List<:class:`~plexapi.library.FilteringFilter`>): List of filter objects.
-            key (str): The API URL path for the libtype filter.
-            sorts (List<:class:`~plexapi.library.FilteringSort`>): List of sort objects.
-            title (str): The title for the libtype filter.
-            type (str): The libtype for the filter.
-    """
-    TAG = 'Type'
-
-    def __repr__(self):
-        _type = self._clean(self.firstAttr('type'))
-        return f"<{':'.join([p for p in [self.__class__.__name__, _type] if p])}>"
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.active = utils.cast(bool, data.attrib.get('active', '0'))
-        self.key = data.attrib.get('key')
-        self.title = data.attrib.get('title')
-        self.type = data.attrib.get('type')
-
-        self._librarySectionID = self._parent().key
-
-    @cached_data_property
-    def fields(self):
-        return self.findItems(self._data, FilteringField) + self._manualFields()
-
-    @cached_data_property
-    def filters(self):
-        return self.findItems(self._data, FilteringFilter) + self._manualFilters()
-
-    @cached_data_property
-    def sorts(self):
-        return self.findItems(self._data, FilteringSort) + self._manualSorts()
-
-    def _manualFilters(self):
-        """ Manually add additional filters which are available
-            but not exposed on the Plex server.
-        """
-        # Filters: (filter, type, title)
-        additionalFilters = [
-        ]
-
-        if self.type == 'season':
-            additionalFilters.extend([
-                ('label', 'string', 'Labels')
-            ])
-        elif self.type == 'episode':
-            additionalFilters.extend([
-                ('label', 'string', 'Labels')
-            ])
-        elif self.type == 'artist':
-            additionalFilters.extend([
-                ('label', 'string', 'Labels')
-            ])
-        elif self.type == 'track':
-            additionalFilters.extend([
-                ('label', 'string', 'Labels')
-            ])
-        elif self.type == 'collection':
-            additionalFilters.extend([
-                ('label', 'string', 'Labels')
-            ])
-
-        manualFilters = []
-        for filterTag, filterType, filterTitle in additionalFilters:
-            filterKey = f'/library/sections/{self._librarySectionID}/{filterTag}?type={utils.searchType(self.type)}'
-            filterXML = (
-                f'<Filter filter="{filterTag}" '
-                f'filterType="{filterType}" '
-                f'key="{filterKey}" '
-                f'title="{filterTitle}" '
-                f'type="filter" />'
-            )
-            manualFilters.append(self._manuallyLoadXML(filterXML, FilteringFilter))
-
-        return manualFilters
-
-    def _manualSorts(self):
-        """ Manually add additional sorts which are available
-            but not exposed on the Plex server.
-        """
-        # Sorts: (key, dir, title)
-        additionalSorts = [
-            ('guid', 'asc', 'Guid'),
-            ('id', 'asc', 'Rating Key'),
-            ('index', 'asc', f'{self.type.capitalize()} Number'),
-            ('summary', 'asc', 'Summary'),
-            ('tagline', 'asc', 'Tagline'),
-            ('updatedAt', 'asc', 'Date Updated')
-        ]
-
-        if self.type == 'season':
-            additionalSorts.extend([
-                ('titleSort', 'asc', 'Title')
-            ])
-        elif self.type == 'track':
-            # Don't know what this is but it is valid
-            additionalSorts.extend([
-                ('absoluteIndex', 'asc', 'Absolute Index')
-            ])
-        elif self.type == 'photo':
-            additionalSorts.extend([
-                ('viewUpdatedAt', 'desc', 'View Updated At')
-            ])
-        elif self.type == 'collection':
-            additionalSorts.extend([
-                ('addedAt', 'asc', 'Date Added')
-            ])
-
-        manualSorts = []
-        for sortField, sortDir, sortTitle in additionalSorts:
-            sortXML = (
-                f'<Sort defaultDirection="{sortDir}" '
-                f'descKey="{sortField}:desc" '
-                f'key="{sortField}" '
-                f'title="{sortTitle}" />'
-            )
-            manualSorts.append(self._manuallyLoadXML(sortXML, FilteringSort))
-
-        return manualSorts
-
-    def _manualFields(self):
-        """ Manually add additional fields which are available
-            but not exposed on the Plex server.
-        """
-        # Fields: (key, type, title)
-        additionalFields = [
-            ('guid', 'guid', 'Guid'),
-            ('id', 'integer', 'Rating Key'),
-            ('index', 'integer', f'{self.type.capitalize()} Number'),
-            ('lastRatedAt', 'date', f'{self.type.capitalize()} Last Rated'),
-            ('updatedAt', 'date', 'Date Updated'),
-            ('group', 'string', 'SQL Group By Statement'),
-            ('having', 'string', 'SQL Having Clause')
-        ]
-
-        if self.type == 'movie':
-            additionalFields.extend([
-                ('audienceRating', 'integer', 'Audience Rating'),
-                ('rating', 'integer', 'Critic Rating'),
-                ('viewOffset', 'integer', 'View Offset')
-            ])
-        elif self.type == 'show':
-            additionalFields.extend([
-                ('audienceRating', 'integer', 'Audience Rating'),
-                ('originallyAvailableAt', 'date', 'Show Release Date'),
-                ('rating', 'integer', 'Critic Rating'),
-                ('unviewedLeafCount', 'integer', 'Episode Unplayed Count')
-            ])
-        elif self.type == 'season':
-            additionalFields.extend([
-                ('addedAt', 'date', 'Date Season Added'),
-                ('unviewedLeafCount', 'integer', 'Episode Unplayed Count'),
-                ('year', 'integer', 'Season Year'),
-                ('label', 'tag', 'Label')
-            ])
-        elif self.type == 'episode':
-            additionalFields.extend([
-                ('audienceRating', 'integer', 'Audience Rating'),
-                ('duration', 'integer', 'Duration'),
-                ('rating', 'integer', 'Critic Rating'),
-                ('viewOffset', 'integer', 'View Offset'),
-                ('label', 'tag', 'Label')
-            ])
-        elif self.type == 'artist':
-            additionalFields.extend([
-                ('label', 'tag', 'Label')
-            ])
-        elif self.type == 'track':
-            additionalFields.extend([
-                ('duration', 'integer', 'Duration'),
-                ('viewOffset', 'integer', 'View Offset'),
-                ('label', 'tag', 'Label'),
-                ('ratingCount', 'integer', 'Rating Count'),
-            ])
-        elif self.type == 'collection':
-            additionalFields.extend([
-                ('addedAt', 'date', 'Date Added'),
-                ('label', 'tag', 'Label')
-            ])
-
-        prefix = '' if self.type == 'movie' else self.type + '.'
-
-        manualFields = []
-        for field, fieldType, fieldTitle in additionalFields:
-            if field not in {'group', 'having'}:
-                field = f"{prefix}{field}"
-            fieldXML = (
-                f'<Field key="{field}" '
-                f'title="{fieldTitle}" '
-                f'type="{fieldType}"/>'
-            )
-
-            manualFields.append(self._manuallyLoadXML(fieldXML, FilteringField))
-
-        return manualFields
-
-
-class FilteringFilter(PlexObject):
-    """ Represents a single Filter object for a :class:`~plexapi.library.FilteringType`.
-
-        Attributes:
-            TAG (str): 'Filter'
-            filter (str): The key for the filter.
-            filterType (str): The :class:`~plexapi.library.FilteringFieldType` type (string, boolean, integer, date, etc).
-            key (str): The API URL path for the filter.
-            title (str): The title of the filter.
-            type (str): 'filter'
-    """
-    TAG = 'Filter'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.filter = data.attrib.get('filter')
-        self.filterType = data.attrib.get('filterType')
-        self.key = data.attrib.get('key')
-        self.title = data.attrib.get('title')
-        self.type = data.attrib.get('type')
-
-
-class FilteringSort(PlexObject):
-    """ Represents a single Sort object for a :class:`~plexapi.library.FilteringType`.
-
-        Attributes:
-            TAG (str): 'Sort'
-            active (bool): True if the sort is currently active.
-            activeDirection (str): The currently active sorting direction.
-            default (str): The currently active default sorting direction.
-            defaultDirection (str): The default sorting direction.
-            descKey (str): The URL key for sorting with desc.
-            firstCharacterKey (str): API URL path for first character endpoint.
-            key (str): The URL key for the sorting.
-            title (str): The title of the sorting.
-    """
-    TAG = 'Sort'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.active = utils.cast(bool, data.attrib.get('active', '0'))
-        self.activeDirection = data.attrib.get('activeDirection')
-        self.default = data.attrib.get('default')
-        self.defaultDirection = data.attrib.get('defaultDirection')
-        self.descKey = data.attrib.get('descKey')
-        self.firstCharacterKey = data.attrib.get('firstCharacterKey')
-        self.key = data.attrib.get('key')
-        self.title = data.attrib.get('title')
-
-
-class FilteringField(PlexObject):
-    """ Represents a single Field object for a :class:`~plexapi.library.FilteringType`.
-
-        Attributes:
-            TAG (str): 'Field'
-            key (str): The URL key for the filter field.
-            title (str): The title of the filter field.
-            type (str): The :class:`~plexapi.library.FilteringFieldType` type (string, boolean, integer, date, etc).
-            subType (str): The subtype of the filter (decade, rating, etc).
-    """
-    TAG = 'Field'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.key = data.attrib.get('key')
-        self.title = data.attrib.get('title')
-        self.type = data.attrib.get('type')
-        self.subType = data.attrib.get('subType')
-
-
-class FilteringFieldType(PlexObject):
-    """ Represents a single FieldType for library filtering.
-
-        Attributes:
-            TAG (str): 'FieldType'
-            type (str): The filtering data type (string, boolean, integer, date, etc).
-            operators (List<:class:`~plexapi.library.FilteringOperator`>): List of operator objects.
-    """
-    TAG = 'FieldType'
-
-    def __repr__(self):
-        _type = self._clean(self.firstAttr('type'))
-        return f"<{':'.join([p for p in [self.__class__.__name__, _type] if p])}>"
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.type = data.attrib.get('type')
-
-    @cached_data_property
-    def operators(self):
-        return self.findItems(self._data, FilteringOperator)
-
-
-class FilteringOperator(PlexObject):
-    """ Represents an single Operator for a :class:`~plexapi.library.FilteringFieldType`.
-
-        Attributes:
-            TAG (str): 'Operator'
-            key (str): The URL key for the operator.
-            title (str): The title of the operator.
-    """
-    TAG = 'Operator'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.key = data.attrib.get('key')
-        self.title = data.attrib.get('title')
-
-
-class FilterChoice(PlexObject):
-    """ Represents a single FilterChoice object.
-        These objects are gathered when using filters while searching for library items and is the
-        object returned in the result set of :func:`~plexapi.library.LibrarySection.listFilterChoices`.
-
-        Attributes:
-            TAG (str): 'Directory'
-            fastKey (str): API URL path to quickly list all items with this filter choice.
-                (/library/sections/<section>/all?genre=<key>)
-            key (str): The id value of this filter choice.
-            thumb (str): Thumbnail URL for the filter choice.
-            title (str): The title of the filter choice.
-            type (str): The filter type (genre, contentRating, etc).
-    """
-    TAG = 'Directory'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.fastKey = data.attrib.get('fastKey')
-        self.key = data.attrib.get('key')
-        self.thumb = data.attrib.get('thumb')
-        self.title = data.attrib.get('title')
-        self.type = data.attrib.get('type')
-
-    def items(self):
-        """ Returns a list of items for this filter choice. """
-        return self.fetchItems(self.fastKey)
-
-
-class ManagedHub(PlexObject):
-    """ Represents a Managed Hub (recommendation) inside a library.
-
-        Attributes:
-            TAG (str): 'Hub'
-            deletable (bool): True if the Hub can be deleted (promoted collection).
-            homeVisibility (str): Promoted home visibility (none, all, admin, or shared).
-            identifier (str): Hub identifier for the managed hub.
-            promotedToOwnHome (bool): Promoted to own home.
-            promotedToRecommended (bool): Promoted to recommended.
-            promotedToSharedHome (bool): Promoted to shared home.
-            recommendationsVisibility (str): Promoted recommendation visibility (none or all).
-            title (str): Title of managed hub.
-    """
-    TAG = 'Hub'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.deletable = utils.cast(bool, data.attrib.get('deletable', True))
-        self.homeVisibility = data.attrib.get('homeVisibility', 'none')
-        self.identifier = data.attrib.get('identifier')
-        self.promotedToOwnHome = utils.cast(bool, data.attrib.get('promotedToOwnHome', False))
-        self.promotedToRecommended = utils.cast(bool, data.attrib.get('promotedToRecommended', False))
-        self.promotedToSharedHome = utils.cast(bool, data.attrib.get('promotedToSharedHome', False))
-        self.recommendationsVisibility = data.attrib.get('recommendationsVisibility', 'none')
-        self.title = data.attrib.get('title')
-        self._promoted = True  # flag to indicate if this hub has been promoted on the list of managed recommendations
-
-        parent = self._parent()
-        self.librarySectionID = parent.key if isinstance(parent, LibrarySection) else parent.librarySectionID
-
-    def _reload(self, **kwargs):
-        """ Reload the data for this managed hub. """
-        key = f'/hubs/sections/{self.librarySectionID}/manage'
-        data = self._server.query(key)
-        self._findAndLoadElem(data, identifier=self.identifier)
-        return self
-
-    def move(self, after=None):
-        """ Move a managed hub to a new position in the library's Managed Recommendations.
-
-            Parameters:
-                after (obj): :class:`~plexapi.library.ManagedHub` object to move the item after in the collection.
-
-            Raises:
-                :class:`plexapi.exceptions.BadRequest`: When trying to move a Hub that is not a Managed Recommendation.
-        """
-        if not self._promoted:
-            raise BadRequest('Collection must be a Managed Recommendation to be moved')
-        key = f'/hubs/sections/{self.librarySectionID}/manage/{self.identifier}/move'
-        if after:
-            key = f'{key}?after={after.identifier}'
-        self._server.query(key, method=self._server._session.put)
-
-    def remove(self):
-        """ Removes a managed hub from the library's Managed Recommendations.
-
-            Raises:
-                :class:`plexapi.exceptions.BadRequest`: When trying to remove a Hub that is not a Managed Recommendation
-                    or when the Hub cannot be removed.
-        """
-        if not self._promoted:
-            raise BadRequest('Collection must be a Managed Recommendation to be removed')
-        if not self.deletable:
-            raise BadRequest(f'{self.title} managed hub cannot be removed' % self.title)
-        key = f'/hubs/sections/{self.librarySectionID}/manage/{self.identifier}'
-        self._server.query(key, method=self._server._session.delete)
-
-    def updateVisibility(self, recommended=None, home=None, shared=None):
-        """ Update the managed hub's visibility settings.
-
-            Parameters:
-                recommended (bool): True to make visible on your Library Recommended page. False to hide. Default None.
-                home (bool): True to make visible on your Home page. False to hide. Default None.
-                shared (bool): True to make visible on your Friends' Home page. False to hide. Default None.
-
-            Example:
-
-                .. code-block:: python
-
-                    managedHub.updateVisibility(recommended=True, home=True, shared=False).reload()
-                    # or using chained methods
-                    managedHub.promoteRecommended().promoteHome().demoteShared().reload()
-
-        """
-        params = {
-            'promotedToRecommended': int(self.promotedToRecommended),
-            'promotedToOwnHome': int(self.promotedToOwnHome),
-            'promotedToSharedHome': int(self.promotedToSharedHome),
-        }
-        if recommended is not None:
-            params['promotedToRecommended'] = int(recommended)
-        if home is not None:
-            params['promotedToOwnHome'] = int(home)
-        if shared is not None:
-            params['promotedToSharedHome'] = int(shared)
-
-        if not self._promoted:
-            params['metadataItemId'] = self.identifier.rsplit('.')[-1]
-            key = f'/hubs/sections/{self.librarySectionID}/manage'
-            self._server.query(key, method=self._server._session.post, params=params)
-        else:
-            key = f'/hubs/sections/{self.librarySectionID}/manage/{self.identifier}'
-            self._server.query(key, method=self._server._session.put, params=params)
-        return self.reload()
-
-    def promoteRecommended(self):
-        """ Show the managed hub on your Library Recommended Page. """
-        return self.updateVisibility(recommended=True)
-
-    def demoteRecommended(self):
-        """ Hide the managed hub on your Library Recommended Page. """
-        return self.updateVisibility(recommended=False)
-
-    def promoteHome(self):
-        """ Show the managed hub on your Home Page. """
-        return self.updateVisibility(home=True)
-
-    def demoteHome(self):
-        """ Hide the manged hub on your Home Page. """
-        return self.updateVisibility(home=False)
-
-    def promoteShared(self):
-        """ Show the managed hub on your Friends' Home Page. """
-        return self.updateVisibility(shared=True)
-
-    def demoteShared(self):
-        """ Hide the managed hub on your Friends' Home Page. """
-        return self.updateVisibility(shared=False)
-
-
-class Folder(PlexObject):
-    """ Represents a Folder inside a library.
-
-        Attributes:
-            key (str): Url key for folder.
-            title (str): Title of folder.
-    """
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.key = data.attrib.get('key')
-        self.title = data.attrib.get('title')
-
-    def subfolders(self):
-        """ Returns a list of available :class:`~plexapi.library.Folder` for this folder.
-            Continue down subfolders until a mediaType is found.
-        """
-        if self.key.startswith('/library/metadata'):
-            return self.fetchItems(self.key)
-        else:
-            return self.fetchItems(self.key, Folder)
-
-    def allSubfolders(self):
-        """ Returns a list of all available :class:`~plexapi.library.Folder` for this folder.
-            Only returns :class:`~plexapi.library.Folder`.
-        """
-        folders = []
-        for folder in self.subfolders():
-            if not folder.key.startswith('/library/metadata'):
-                folders.append(folder)
-                while True:
-                    for subfolder in folder.subfolders():
-                        if not subfolder.key.startswith('/library/metadata'):
-                            folders.append(subfolder)
-                            continue
-                    break
-        return folders
-
-
-class FirstCharacter(PlexObject):
-    """ Represents a First Character element from a library.
-
-        Attributes:
-            key (str): Url key for character.
-            size (str): Total amount of library items starting with this character.
-            title (str): Character (#, !, A, B, C, ...).
-    """
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.key = data.attrib.get('key')
-        self.size = data.attrib.get('size')
-        self.title = data.attrib.get('title')
-
-
-@utils.registerPlexObject
-class Path(PlexObject):
-    """ Represents a single directory Path.
-
-        Attributes:
-            TAG (str): 'Path'
-            home (bool): True if the path is the home directory
-            key (str): API URL (/services/browse/<base64path>)
-            network (bool): True if path is a network location
-            path (str): Full path to folder
-            title (str): Folder name
-    """
-    TAG = 'Path'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.home = utils.cast(bool, data.attrib.get('home'))
-        self.key = data.attrib.get('key')
-        self.network = utils.cast(bool, data.attrib.get('network'))
-        self.path = data.attrib.get('path')
-        self.title = data.attrib.get('title')
-
-    def browse(self, includeFiles=True):
-        """ Alias for :func:`~plexapi.server.PlexServer.browse`. """
-        return self._server.browse(self, includeFiles)
-
-    def walk(self):
-        """ Alias for :func:`~plexapi.server.PlexServer.walk`. """
-        for path, paths, files in self._server.walk(self):
-            yield path, paths, files
-
-
-@utils.registerPlexObject
-class File(PlexObject):
-    """ Represents a single File.
-
-        Attributes:
-            TAG (str): 'File'
-            key (str): API URL (/services/browse/<base64path>)
-            path (str): Full path to file
-            title (str): File name
-    """
-    TAG = 'File'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.key = data.attrib.get('key')
-        self.path = data.attrib.get('path')
-        self.title = data.attrib.get('title')
-
-
-@utils.registerPlexObject
-class Common(PlexObject):
-    """ Represents a Common element from a library. This object lists common fields between multiple objects.
-
-        Attributes:
-            TAG (str): 'Common'
-            collections (List<:class:`~plexapi.media.Collection`>): List of collection objects.
-            contentRating (str): Content rating of the items.
-            countries (List<:class:`~plexapi.media.Country`>): List of countries objects.
-            directors (List<:class:`~plexapi.media.Director`>): List of director objects.
-            editionTitle (str): Edition title of the items.
-            fields (List<:class:`~plexapi.media.Field`>): List of field objects.
-            genres (List<:class:`~plexapi.media.Genre`>): List of genre objects.
-            grandparentRatingKey (int): Grandparent rating key of the items.
-            grandparentTitle (str): Grandparent title of the items.
-            guid (str): Plex GUID of the items.
-            guids (List<:class:`~plexapi.media.Guid`>): List of guid objects.
-            index (int): Index of the items.
-            key (str): API URL (/library/metadata/<ratingkey>).
-            labels (List<:class:`~plexapi.media.Label`>): List of label objects.
-            mixedFields (List<str>): List of mixed fields.
-            moods (List<:class:`~plexapi.media.Mood`>): List of mood objects.
-            originallyAvailableAt (datetime): Datetime of the release date of the items.
-            parentRatingKey (int): Parent rating key of the items.
-            parentTitle (str): Parent title of the items.
-            producers (List<:class:`~plexapi.media.Producer`>): List of producer objects.
-            ratingKey (int): Rating key of the items.
-            ratings (List<:class:`~plexapi.media.Rating`>): List of rating objects.
-            roles (List<:class:`~plexapi.media.Role`>): List of role objects.
-            studio (str): Studio name of the items.
-            styles (List<:class:`~plexapi.media.Style`>): List of style objects.
-            summary (str): Summary of the items.
-            tagline (str): Tagline of the items.
-            tags (List<:class:`~plexapi.media.Tag`>): List of tag objects.
-            title (str): Title of the items.
-            titleSort (str): Title to use when sorting of the items.
-            type (str): Type of the media (common).
-            writers (List<:class:`~plexapi.media.Writer`>): List of writer objects.
-            year (int): Year of the items.
-    """
-    TAG = 'Common'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.contentRating = data.attrib.get('contentRating')
-        self.editionTitle = data.attrib.get('editionTitle')
-        self.grandparentRatingKey = utils.cast(int, data.attrib.get('grandparentRatingKey'))
-        self.grandparentTitle = data.attrib.get('grandparentTitle')
-        self.guid = data.attrib.get('guid')
-        self.index = utils.cast(int, data.attrib.get('index'))
-        self.key = data.attrib.get('key')
-        self.mixedFields = data.attrib.get('mixedFields').split(',')
-        self.originallyAvailableAt = utils.toDatetime(data.attrib.get('originallyAvailableAt'))
-        self.parentRatingKey = utils.cast(int, data.attrib.get('parentRatingKey'))
-        self.parentTitle = data.attrib.get('parentTitle')
-        self.ratingKey = utils.cast(int, data.attrib.get('ratingKey'))
-        self.studio = data.attrib.get('studio')
-        self.summary = data.attrib.get('summary')
-        self.tagline = data.attrib.get('tagline')
-        self.title = data.attrib.get('title')
-        self.titleSort = data.attrib.get('titleSort')
-        self.type = data.attrib.get('type')
-        self.year = utils.cast(int, data.attrib.get('year'))
-
-    @cached_data_property
-    def collections(self):
-        return self.findItems(self._data, media.Collection)
-
-    @cached_data_property
-    def countries(self):
-        return self.findItems(self._data, media.Country)
-
-    @cached_data_property
-    def directors(self):
-        return self.findItems(self._data, media.Director)
-
-    @cached_data_property
-    def fields(self):
-        return self.findItems(self._data, media.Field)
-
-    @cached_data_property
-    def genres(self):
-        return self.findItems(self._data, media.Genre)
-
-    @cached_data_property
-    def guids(self):
-        return self.findItems(self._data, media.Guid)
-
-    @cached_data_property
-    def labels(self):
-        return self.findItems(self._data, media.Label)
-
-    @cached_data_property
-    def moods(self):
-        return self.findItems(self._data, media.Mood)
-
-    @cached_data_property
-    def producers(self):
-        return self.findItems(self._data, media.Producer)
-
-    @cached_data_property
-    def ratings(self):
-        return self.findItems(self._data, media.Rating)
-
-    @cached_data_property
-    def roles(self):
-        return self.findItems(self._data, media.Role)
-
-    @cached_data_property
-    def styles(self):
-        return self.findItems(self._data, media.Style)
-
-    @cached_data_property
-    def tags(self):
-        return self.findItems(self._data, media.Tag)
-
-    @cached_data_property
-    def writers(self):
-        return self.findItems(self._data, media.Writer)
-
-    def __repr__(self):
-        return '<%s:%s:%s>' % (
-            self.__class__.__name__,
-            self.commonType,
-            ','.join(str(key) for key in self.ratingKeys)
-        )
-
-    @property
-    def commonType(self):
-        """ Returns the media type of the common items. """
-        parsed_query = parse_qs(urlparse(self._initpath).query)
-        return utils.reverseSearchType(parsed_query['type'][0])
-
-    @property
-    def ratingKeys(self):
-        """ Returns a list of rating keys for the common items. """
-        parsed_query = parse_qs(urlparse(self._initpath).query)
-        return [int(value.strip()) for value in parsed_query['id'][0].split(',')]
-
-    def items(self):
-        """ Returns a list of the common items. """
-        return self._server.fetchItems(self.ratingKeys)
diff --git a/lib/plexapi/media.py b/lib/plexapi/media.py
deleted file mode 100644
index c1530959..00000000
--- a/lib/plexapi/media.py
+++ /dev/null
@@ -1,1345 +0,0 @@
-# -*- coding: utf-8 -*-
-from pathlib import Path
-from urllib.parse import quote_plus
-from xml.etree import ElementTree
-
-from plexapi import log, settings, utils
-from plexapi.base import PlexObject, cached_data_property
-from plexapi.exceptions import BadRequest
-from plexapi.utils import deprecated
-
-
-@utils.registerPlexObject
-class Media(PlexObject):
-    """ Container object for all MediaPart objects. Provides useful data about the
-        video or audio this media belong to such as video framerate, resolution, etc.
-
-        Attributes:
-            TAG (str): 'Media'
-            aspectRatio (float): The aspect ratio of the media (ex: 2.35).
-            audioChannels (int): The number of audio channels of the media (ex: 6).
-            audioCodec (str): The audio codec of the media (ex: ac3).
-            audioProfile (str): The audio profile of the media (ex: dts).
-            bitrate (int): The bitrate of the media (ex: 1624).
-            container (str): The container of the media (ex: avi).
-            duration (int): The duration of the media in milliseconds (ex: 6990483).
-            height (int): The height of the media in pixels (ex: 256).
-            id (int): The unique ID for this media on the server.
-            has64bitOffsets (bool): True if video has 64 bit offsets.
-            hasVoiceActivity (bool): True if video has voice activity analyzed.
-            optimizedForStreaming (bool): True if video is optimized for streaming.
-            parts (List<:class:`~plexapi.media.MediaPart`>): List of media part objects.
-            proxyType (int): Equals 42 for optimized versions.
-            target (str): The media version target name.
-            title (str): The title of the media.
-            videoCodec (str): The video codec of the media (ex: ac3).
-            videoFrameRate (str): The video frame rate of the media (ex: 24p).
-            videoProfile (str): The video profile of the media (ex: high).
-            videoResolution (str): The video resolution of the media (ex: sd).
-            width (int): The width of the video in pixels (ex: 608).
-
-            Photo_only_attributes: The following attributes are only available for photos.
-
-                * aperture (str): The aperture used to take the photo.
-                * exposure (str): The exposure used to take the photo.
-                * iso (int): The iso used to take the photo.
-                * lens (str): The lens used to take the photo.
-                * make (str): The make of the camera used to take the photo.
-                * model (str): The model of the camera used to take the photo.
-    """
-    TAG = 'Media'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.aspectRatio = utils.cast(float, data.attrib.get('aspectRatio'))
-        self.audioChannels = utils.cast(int, data.attrib.get('audioChannels'))
-        self.audioCodec = data.attrib.get('audioCodec')
-        self.audioProfile = data.attrib.get('audioProfile')
-        self.bitrate = utils.cast(int, data.attrib.get('bitrate'))
-        self.container = data.attrib.get('container')
-        self.duration = utils.cast(int, data.attrib.get('duration'))
-        self.height = utils.cast(int, data.attrib.get('height'))
-        self.id = utils.cast(int, data.attrib.get('id'))
-        self.has64bitOffsets = utils.cast(bool, data.attrib.get('has64bitOffsets'))
-        self.hasVoiceActivity = utils.cast(bool, data.attrib.get('hasVoiceActivity', '0'))
-        self.optimizedForStreaming = utils.cast(bool, data.attrib.get('optimizedForStreaming'))
-        self.proxyType = utils.cast(int, data.attrib.get('proxyType'))
-        self.selected = utils.cast(bool, data.attrib.get('selected'))
-        self.target = data.attrib.get('target')
-        self.title = data.attrib.get('title')
-        self.videoCodec = data.attrib.get('videoCodec')
-        self.videoFrameRate = data.attrib.get('videoFrameRate')
-        self.videoProfile = data.attrib.get('videoProfile')
-        self.videoResolution = data.attrib.get('videoResolution')
-        self.width = utils.cast(int, data.attrib.get('width'))
-        self.uuid = data.attrib.get('uuid')
-
-        # Photo only attributes
-        self.aperture = data.attrib.get('aperture')
-        self.exposure = data.attrib.get('exposure')
-        self.iso = utils.cast(int, data.attrib.get('iso'))
-        self.lens = data.attrib.get('lens')
-        self.make = data.attrib.get('make')
-        self.model = data.attrib.get('model')
-
-        parent = self._parent()
-        self._parentKey = parent.key
-
-    @cached_data_property
-    def parts(self):
-        return self.findItems(self._data, MediaPart)
-
-    @property
-    def isOptimizedVersion(self):
-        """ Returns True if the media is a Plex optimized version. """
-        return self.proxyType == utils.SEARCHTYPES['optimizedVersion']
-
-    def delete(self):
-        part = f'{self._parentKey}/media/{self.id}'
-        try:
-            return self._server.query(part, method=self._server._session.delete)
-        except BadRequest:
-            log.error("Failed to delete %s. This could be because you haven't allowed items to be deleted", part)
-            raise
-
-
-@utils.registerPlexObject
-class MediaPart(PlexObject):
-    """ Represents a single media part (often a single file) for the media this belongs to.
-
-        Attributes:
-            TAG (str): 'Part'
-            accessible (bool): True if the file is accessible.
-                Requires reloading the media with ``checkFiles=True``.
-                Refer to :func:`~plexapi.base.PlexObject.reload`.
-            audioProfile (str): The audio profile of the file.
-            container (str): The container type of the file (ex: avi).
-            decision (str): Unknown.
-            deepAnalysisVersion (int): The Plex deep analysis version for the file.
-            duration (int): The duration of the file in milliseconds.
-            exists (bool): True if the file exists.
-                Requires reloading the media with ``checkFiles=True``.
-                Refer to :func:`~plexapi.base.PlexObject.reload`.
-            file (str): The path to this file on disk (ex: /media/Movies/Cars (2006)/Cars (2006).mkv)
-            has64bitOffsets (bool): True if the file has 64 bit offsets.
-            hasThumbnail (bool): True if the file (track) has an embedded thumbnail.
-            id (int): The unique ID for this media part on the server.
-            indexes (str, None): sd if the file has generated preview (BIF) thumbnails.
-            key (str): API URL (ex: /library/parts/46618/1389985872/file.mkv).
-            optimizedForStreaming (bool): True if the file is optimized for streaming.
-            packetLength (int): The packet length of the file.
-            requiredBandwidths (str): The required bandwidths to stream the file.
-            selected (bool): True if this media part is selected.
-            size (int): The size of the file in bytes (ex: 733884416).
-            streams (List<:class:`~plexapi.media.MediaPartStream`>): List of stream objects.
-            syncItemId (int): The unique ID for this media part if it is synced.
-            syncState (str): The sync state for this media part.
-            videoProfile (str): The video profile of the file.
-    """
-    TAG = 'Part'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.accessible = utils.cast(bool, data.attrib.get('accessible'))
-        self.audioProfile = data.attrib.get('audioProfile')
-        self.container = data.attrib.get('container')
-        self.decision = data.attrib.get('decision')
-        self.deepAnalysisVersion = utils.cast(int, data.attrib.get('deepAnalysisVersion'))
-        self.duration = utils.cast(int, data.attrib.get('duration'))
-        self.exists = utils.cast(bool, data.attrib.get('exists'))
-        self.file = data.attrib.get('file')
-        self.has64bitOffsets = utils.cast(bool, data.attrib.get('has64bitOffsets'))
-        self.hasThumbnail = utils.cast(bool, data.attrib.get('hasThumbnail'))
-        self.id = utils.cast(int, data.attrib.get('id'))
-        self.indexes = data.attrib.get('indexes')
-        self.key = data.attrib.get('key')
-        self.optimizedForStreaming = utils.cast(bool, data.attrib.get('optimizedForStreaming'))
-        self.packetLength = utils.cast(int, data.attrib.get('packetLength'))
-        self.protocol = data.attrib.get('protocol')
-        self.requiredBandwidths = data.attrib.get('requiredBandwidths')
-        self.selected = utils.cast(bool, data.attrib.get('selected'))
-        self.size = utils.cast(int, data.attrib.get('size'))
-        self.streams = self._buildStreams(data)
-        self.syncItemId = utils.cast(int, data.attrib.get('syncItemId'))
-        self.syncState = data.attrib.get('syncState')
-        self.videoProfile = data.attrib.get('videoProfile')
-
-    def _buildStreams(self, data):
-        """ Returns a list of :class:`~plexapi.media.MediaPartStream` objects in this MediaPart. """
-        return self.findItems(data)
-
-    @property
-    def hasPreviewThumbnails(self):
-        """ Returns True if the media part has generated preview (BIF) thumbnails. """
-        return self.indexes == 'sd'
-
-    def videoStreams(self):
-        """ Returns a list of :class:`~plexapi.media.VideoStream` objects in this MediaPart. """
-        return [stream for stream in self.streams if isinstance(stream, VideoStream)]
-
-    def audioStreams(self):
-        """ Returns a list of :class:`~plexapi.media.AudioStream` objects in this MediaPart. """
-        return [stream for stream in self.streams if isinstance(stream, AudioStream)]
-
-    def subtitleStreams(self):
-        """ Returns a list of :class:`~plexapi.media.SubtitleStream` objects in this MediaPart. """
-        return [stream for stream in self.streams if isinstance(stream, SubtitleStream)]
-
-    def lyricStreams(self):
-        """ Returns a list of :class:`~plexapi.media.LyricStream` objects in this MediaPart. """
-        return [stream for stream in self.streams if isinstance(stream, LyricStream)]
-
-    def setSelectedAudioStream(self, stream):
-        """ Set the selected :class:`~plexapi.media.AudioStream` for this MediaPart.
-
-            Parameters:
-                stream (:class:`~plexapi.media.AudioStream`): Audio stream to set as selected
-        """
-        key = f'/library/parts/{self.id}'
-        params = {'allParts': 1}
-
-        if isinstance(stream, AudioStream):
-            params['audioStreamID'] = stream.id
-        else:
-            params['audioStreamID'] = stream
-
-        self._server.query(key, method=self._server._session.put, params=params)
-        return self
-
-    def setSelectedSubtitleStream(self, stream):
-        """ Set the selected :class:`~plexapi.media.SubtitleStream` for this MediaPart.
-
-            Parameters:
-                stream (:class:`~plexapi.media.SubtitleStream`): Subtitle stream to set as selected.
-        """
-        key = f'/library/parts/{self.id}'
-        params = {'allParts': 1}
-
-        if isinstance(stream, SubtitleStream):
-            params['subtitleStreamID'] = stream.id
-        else:
-            params['subtitleStreamID'] = stream
-
-        self._server.query(key, method=self._server._session.put, params=params)
-        return self
-
-    def resetSelectedSubtitleStream(self):
-        """ Set the selected subtitle of this MediaPart to 'None'. """
-        key = f'/library/parts/{self.id}'
-        params = {'subtitleStreamID': 0, 'allParts': 1}
-
-        self._server.query(key, method=self._server._session.put, params=params)
-        return self
-
-    @deprecated('Use "setSelectedAudioStream" instead.')
-    def setDefaultAudioStream(self, stream):
-        return self.setSelectedAudioStream(stream)
-
-    @deprecated('Use "setSelectedSubtitleStream" instead.')
-    def setDefaultSubtitleStream(self, stream):
-        return self.setSelectedSubtitleStream(stream)
-
-    @deprecated('Use "resetSelectedSubtitleStream" instead.')
-    def resetDefaultSubtitleStream(self):
-        return self.resetSelectedSubtitleStream()
-
-
-class MediaPartStream(PlexObject):
-    """ Base class for media streams. These consist of video, audio, subtitles, and lyrics.
-
-        Attributes:
-            bitrate (int): The bitrate of the stream.
-            codec (str): The codec of the stream (ex: srt, ac3, mpeg4).
-            default (bool): True if this is the default stream.
-            displayTitle (str): The display title of the stream.
-            extendedDisplayTitle (str): The extended display title of the stream.
-            key (str): API URL (/library/streams/<id>)
-            id (int): The unique ID for this stream on the server.
-            index (int): The index of the stream.
-            language (str): The language of the stream (ex: English, ไทย).
-            languageCode (str): The ASCII language code of the stream (ex: eng, tha).
-            languageTag (str): The two letter language tag of the stream (ex: en, fr).
-            requiredBandwidths (str): The required bandwidths to stream the file.
-            selected (bool): True if this stream is selected.
-            streamType (int): The stream type (1= :class:`~plexapi.media.VideoStream`,
-                2= :class:`~plexapi.media.AudioStream`, 3= :class:`~plexapi.media.SubtitleStream`).
-            title (str): The title of the stream.
-            type (int): Alias for streamType.
-    """
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.bitrate = utils.cast(int, data.attrib.get('bitrate'))
-        self.codec = data.attrib.get('codec')
-        self.decision = data.attrib.get('decision')
-        self.default = utils.cast(bool, data.attrib.get('default'))
-        self.displayTitle = data.attrib.get('displayTitle')
-        self.extendedDisplayTitle = data.attrib.get('extendedDisplayTitle')
-        self.id = utils.cast(int, data.attrib.get('id'))
-        self.index = utils.cast(int, data.attrib.get('index', '-1'))
-        self.key = data.attrib.get('key')
-        self.language = data.attrib.get('language')
-        self.languageCode = data.attrib.get('languageCode')
-        self.languageTag = data.attrib.get('languageTag')
-        self.location = data.attrib.get('location')
-        self.requiredBandwidths = data.attrib.get('requiredBandwidths')
-        self.selected = utils.cast(bool, data.attrib.get('selected', '0'))
-        self.streamType = utils.cast(int, data.attrib.get('streamType'))
-        self.title = data.attrib.get('title')
-        self.type = utils.cast(int, data.attrib.get('streamType'))
-
-
-@utils.registerPlexObject
-class VideoStream(MediaPartStream):
-    """ Represents a video stream within a :class:`~plexapi.media.MediaPart`.
-
-        Attributes:
-            TAG (str): 'Stream'
-            STREAMTYPE (int): 1
-            anamorphic (str): If the video is anamorphic.
-            bitDepth (int): The bit depth of the video stream (ex: 8).
-            cabac (int): The context-adaptive binary arithmetic coding.
-            chromaLocation (str): The chroma location of the video stream.
-            chromaSubsampling (str): The chroma subsampling of the video stream (ex: 4:2:0).
-            codecID (str): The codec ID (ex: XVID).
-            codedHeight (int): The coded height of the video stream in pixels.
-            codedWidth (int): The coded width of the video stream in pixels.
-            colorPrimaries (str): The color primaries of the video stream.
-            colorRange (str): The color range of the video stream.
-            colorSpace (str): The color space of the video stream (ex: bt2020).
-            colorTrc (str): The color trc of the video stream.
-            DOVIBLCompatID (int): Dolby Vision base layer compatibility ID.
-            DOVIBLPresent (bool): True if Dolby Vision base layer is present.
-            DOVIELPresent (bool): True if Dolby Vision enhancement layer is present.
-            DOVILevel (int): Dolby Vision level.
-            DOVIPresent (bool): True if Dolby Vision is present.
-            DOVIProfile (int): Dolby Vision profile.
-            DOVIRPUPresent (bool): True if Dolby Vision reference processing unit is present.
-            DOVIVersion (float): The Dolby Vision version.
-            duration (int): The duration of video stream in milliseconds.
-            frameRate (float): The frame rate of the video stream (ex: 23.976).
-            frameRateMode (str): The frame rate mode of the video stream.
-            hasScalingMatrix (bool): True if video stream has a scaling matrix.
-            height (int): The height of the video stream in pixels (ex: 1080).
-            level (int): The codec encoding level of the video stream (ex: 41).
-            profile (str): The profile of the video stream (ex: asp).
-            pixelAspectRatio (str): The pixel aspect ratio of the video stream.
-            pixelFormat (str): The pixel format of the video stream.
-            refFrames (int): The number of reference frames of the video stream.
-            scanType (str): The scan type of the video stream (ex: progressive).
-            streamIdentifier(int): The stream identifier of the video stream.
-            width (int): The width of the video stream in pixels (ex: 1920).
-    """
-    TAG = 'Stream'
-    STREAMTYPE = 1
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        super(VideoStream, self)._loadData(data)
-        self.anamorphic = data.attrib.get('anamorphic')
-        self.bitDepth = utils.cast(int, data.attrib.get('bitDepth'))
-        self.cabac = utils.cast(int, data.attrib.get('cabac'))
-        self.chromaLocation = data.attrib.get('chromaLocation')
-        self.chromaSubsampling = data.attrib.get('chromaSubsampling')
-        self.codecID = data.attrib.get('codecID')
-        self.codedHeight = utils.cast(int, data.attrib.get('codedHeight'))
-        self.codedWidth = utils.cast(int, data.attrib.get('codedWidth'))
-        self.colorPrimaries = data.attrib.get('colorPrimaries')
-        self.colorRange = data.attrib.get('colorRange')
-        self.colorSpace = data.attrib.get('colorSpace')
-        self.colorTrc = data.attrib.get('colorTrc')
-        self.DOVIBLCompatID = utils.cast(int, data.attrib.get('DOVIBLCompatID'))
-        self.DOVIBLPresent = utils.cast(bool, data.attrib.get('DOVIBLPresent'))
-        self.DOVIELPresent = utils.cast(bool, data.attrib.get('DOVIELPresent'))
-        self.DOVILevel = utils.cast(int, data.attrib.get('DOVILevel'))
-        self.DOVIPresent = utils.cast(bool, data.attrib.get('DOVIPresent'))
-        self.DOVIProfile = utils.cast(int, data.attrib.get('DOVIProfile'))
-        self.DOVIRPUPresent = utils.cast(bool, data.attrib.get('DOVIRPUPresent'))
-        self.DOVIVersion = utils.cast(float, data.attrib.get('DOVIVersion'))
-        self.duration = utils.cast(int, data.attrib.get('duration'))
-        self.frameRate = utils.cast(float, data.attrib.get('frameRate'))
-        self.frameRateMode = data.attrib.get('frameRateMode')
-        self.hasScalingMatrix = utils.cast(bool, data.attrib.get('hasScalingMatrix'))
-        self.height = utils.cast(int, data.attrib.get('height'))
-        self.level = utils.cast(int, data.attrib.get('level'))
-        self.profile = data.attrib.get('profile')
-        self.pixelAspectRatio = data.attrib.get('pixelAspectRatio')
-        self.pixelFormat = data.attrib.get('pixelFormat')
-        self.refFrames = utils.cast(int, data.attrib.get('refFrames'))
-        self.scanType = data.attrib.get('scanType')
-        self.streamIdentifier = utils.cast(int, data.attrib.get('streamIdentifier'))
-        self.width = utils.cast(int, data.attrib.get('width'))
-
-
-@utils.registerPlexObject
-class AudioStream(MediaPartStream):
-    """ Represents a audio stream within a :class:`~plexapi.media.MediaPart`.
-
-        Attributes:
-            TAG (str): 'Stream'
-            STREAMTYPE (int): 2
-            audioChannelLayout (str): The audio channel layout of the audio stream (ex: 5.1(side)).
-            bitDepth (int): The bit depth of the audio stream (ex: 16).
-            bitrateMode (str): The bitrate mode of the audio stream (ex: cbr).
-            channels (int): The number of audio channels of the audio stream (ex: 6).
-            duration (int): The duration of audio stream in milliseconds.
-            profile (str): The profile of the audio stream.
-            samplingRate (int): The sampling rate of the audio stream (ex: xxx)
-            streamIdentifier (int): The stream identifier of the audio stream.
-            visualImpaired (bool): True if this is a visually impaired (AD) audio stream.
-
-            Track_only_attributes: The following attributes are only available for tracks.
-
-                * albumGain (float): The gain for the album.
-                * albumPeak (float): The peak for the album.
-                * albumRange (float): The range for the album.
-                * endRamp (str): The end ramp for the track.
-                * gain (float): The gain for the track.
-                * loudness (float): The loudness for the track.
-                * lra (float): The lra for the track.
-                * peak (float): The peak for the track.
-                * startRamp (str): The start ramp for the track.
-    """
-    TAG = 'Stream'
-    STREAMTYPE = 2
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        super(AudioStream, self)._loadData(data)
-        self.audioChannelLayout = data.attrib.get('audioChannelLayout')
-        self.bitDepth = utils.cast(int, data.attrib.get('bitDepth'))
-        self.bitrateMode = data.attrib.get('bitrateMode')
-        self.channels = utils.cast(int, data.attrib.get('channels'))
-        self.duration = utils.cast(int, data.attrib.get('duration'))
-        self.profile = data.attrib.get('profile')
-        self.samplingRate = utils.cast(int, data.attrib.get('samplingRate'))
-        self.streamIdentifier = utils.cast(int, data.attrib.get('streamIdentifier'))
-        self.visualImpaired = utils.cast(bool, data.attrib.get('visualImpaired', '0'))
-
-        # Track only attributes
-        self.albumGain = utils.cast(float, data.attrib.get('albumGain'))
-        self.albumPeak = utils.cast(float, data.attrib.get('albumPeak'))
-        self.albumRange = utils.cast(float, data.attrib.get('albumRange'))
-        self.endRamp = data.attrib.get('endRamp')
-        self.gain = utils.cast(float, data.attrib.get('gain'))
-        self.loudness = utils.cast(float, data.attrib.get('loudness'))
-        self.lra = utils.cast(float, data.attrib.get('lra'))
-        self.peak = utils.cast(float, data.attrib.get('peak'))
-        self.startRamp = data.attrib.get('startRamp')
-
-    def setSelected(self):
-        """ Sets this audio stream as the selected audio stream.
-            Alias for :func:`~plexapi.media.MediaPart.setSelectedAudioStream`.
-        """
-        return self._parent().setSelectedAudioStream(self)
-
-    @deprecated('Use "setSelected" instead.')
-    def setDefault(self):
-        return self.setSelected()
-
-
-@utils.registerPlexObject
-class SubtitleStream(MediaPartStream):
-    """ Represents a audio stream within a :class:`~plexapi.media.MediaPart`.
-
-        Attributes:
-            TAG (str): 'Stream'
-            STREAMTYPE (int): 3
-            canAutoSync (bool): True if the subtitle stream can be auto synced.
-            container (str): The container of the subtitle stream.
-            forced (bool): True if this is a forced subtitle.
-            format (str): The format of the subtitle stream (ex: srt).
-            headerCompression (str): The header compression of the subtitle stream.
-            hearingImpaired (bool): True if this is a hearing impaired (SDH) subtitle.
-            perfectMatch (bool): True if the on-demand subtitle is a perfect match.
-            providerTitle (str): The provider title where the on-demand subtitle is downloaded from.
-            score (int): The match score (download count) of the on-demand subtitle.
-            sourceKey (str): The source key of the on-demand subtitle.
-            transient (str): Unknown.
-            userID (int): The user id of the user that downloaded the on-demand subtitle.
-    """
-    TAG = 'Stream'
-    STREAMTYPE = 3
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        super(SubtitleStream, self)._loadData(data)
-        self.canAutoSync = utils.cast(bool, data.attrib.get('canAutoSync'))
-        self.container = data.attrib.get('container')
-        self.forced = utils.cast(bool, data.attrib.get('forced', '0'))
-        self.format = data.attrib.get('format')
-        self.headerCompression = data.attrib.get('headerCompression')
-        self.hearingImpaired = utils.cast(bool, data.attrib.get('hearingImpaired', '0'))
-        self.perfectMatch = utils.cast(bool, data.attrib.get('perfectMatch'))
-        self.providerTitle = data.attrib.get('providerTitle')
-        self.score = utils.cast(int, data.attrib.get('score'))
-        self.sourceKey = data.attrib.get('sourceKey')
-        self.transient = data.attrib.get('transient')
-        self.userID = utils.cast(int, data.attrib.get('userID'))
-
-    def setSelected(self):
-        """ Sets this subtitle stream as the selected subtitle stream.
-            Alias for :func:`~plexapi.media.MediaPart.setSelectedSubtitleStream`.
-        """
-        return self._parent().setSelectedSubtitleStream(self)
-
-    @deprecated('Use "setSelected" instead.')
-    def setDefault(self):
-        return self.setSelected()
-
-
-@utils.registerPlexObject
-class LyricStream(MediaPartStream):
-    """ Represents a lyric stream within a :class:`~plexapi.media.MediaPart`.
-
-        Attributes:
-            TAG (str): 'Stream'
-            STREAMTYPE (int): 4
-            format (str): The format of the lyric stream (ex: lrc).
-            minLines (int): The minimum number of lines in the (timed) lyric stream.
-            provider (str): The provider of the lyric stream (ex: com.plexapp.agents.lyricfind).
-            timed (bool): True if the lyrics are timed to the track.
-    """
-    TAG = 'Stream'
-    STREAMTYPE = 4
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        super(LyricStream, self)._loadData(data)
-        self.format = data.attrib.get('format')
-        self.minLines = utils.cast(int, data.attrib.get('minLines'))
-        self.provider = data.attrib.get('provider')
-        self.timed = utils.cast(bool, data.attrib.get('timed', '0'))
-
-
-@utils.registerPlexObject
-class Session(PlexObject):
-    """ Represents a current session.
-
-        Attributes:
-            TAG (str): 'Session'
-            id (str): The unique identifier for the session.
-            bandwidth (int): The Plex streaming brain reserved bandwidth for the session.
-            location (str): The location of the session (lan, wan, or cellular)
-    """
-    TAG = 'Session'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.id = data.attrib.get('id')
-        self.bandwidth = utils.cast(int, data.attrib.get('bandwidth'))
-        self.location = data.attrib.get('location')
-
-
-@utils.registerPlexObject
-class TranscodeSession(PlexObject):
-    """ Represents a current transcode session.
-
-        Attributes:
-            TAG (str): 'TranscodeSession'
-            audioChannels (int): The number of audio channels of the transcoded media.
-            audioCodec (str): The audio codec of the transcoded media.
-            audioDecision (str): The transcode decision for the audio stream.
-            complete (bool): True if the transcode is complete.
-            container (str): The container of the transcoded media.
-            context (str): The context for the transcode session.
-            duration (int): The duration of the transcoded media in milliseconds.
-            height (int): The height of the transcoded media in pixels.
-            key (str): API URL (ex: /transcode/sessions/<id>).
-            maxOffsetAvailable (float): Unknown.
-            minOffsetAvailable (float): Unknown.
-            progress (float): The progress percentage of the transcode.
-            protocol (str): The protocol of the transcode.
-            remaining (int): Unknown.
-            size (int): The size of the transcoded media in bytes.
-            sourceAudioCodec (str): The audio codec of the source media.
-            sourceVideoCodec (str): The video codec of the source media.
-            speed (float): The speed of the transcode.
-            subtitleDecision (str): The transcode decision for the subtitle stream
-            throttled (bool): True if the transcode is throttled.
-            timestamp (int): The epoch timestamp when the transcode started.
-            transcodeHwDecoding (str): The hardware transcoding decoder engine.
-            transcodeHwDecodingTitle (str): The title of the hardware transcoding decoder engine.
-            transcodeHwEncoding (str): The hardware transcoding encoder engine.
-            transcodeHwEncodingTitle (str): The title of the hardware transcoding encoder engine.
-            transcodeHwFullPipeline (str): True if hardware decoding and encoding is being used for the transcode.
-            transcodeHwRequested (str): True if hardware transcoding was requested for the transcode.
-            videoCodec (str): The video codec of the transcoded media.
-            videoDecision (str): The transcode decision for the video stream.
-            width (str): The width of the transcoded media in pixels.
-    """
-    TAG = 'TranscodeSession'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.audioChannels = utils.cast(int, data.attrib.get('audioChannels'))
-        self.audioCodec = data.attrib.get('audioCodec')
-        self.audioDecision = data.attrib.get('audioDecision')
-        self.complete = utils.cast(bool, data.attrib.get('complete', '0'))
-        self.container = data.attrib.get('container')
-        self.context = data.attrib.get('context')
-        self.duration = utils.cast(int, data.attrib.get('duration'))
-        self.height = utils.cast(int, data.attrib.get('height'))
-        self.key = data.attrib.get('key')
-        self.maxOffsetAvailable = utils.cast(float, data.attrib.get('maxOffsetAvailable'))
-        self.minOffsetAvailable = utils.cast(float, data.attrib.get('minOffsetAvailable'))
-        self.progress = utils.cast(float, data.attrib.get('progress'))
-        self.protocol = data.attrib.get('protocol')
-        self.remaining = utils.cast(int, data.attrib.get('remaining'))
-        self.size = utils.cast(int, data.attrib.get('size'))
-        self.sourceAudioCodec = data.attrib.get('sourceAudioCodec')
-        self.sourceVideoCodec = data.attrib.get('sourceVideoCodec')
-        self.speed = utils.cast(float, data.attrib.get('speed'))
-        self.subtitleDecision = data.attrib.get('subtitleDecision')
-        self.throttled = utils.cast(bool, data.attrib.get('throttled', '0'))
-        self.timestamp = utils.cast(float, data.attrib.get('timeStamp'))
-        self.transcodeHwDecoding = data.attrib.get('transcodeHwDecoding')
-        self.transcodeHwDecodingTitle = data.attrib.get('transcodeHwDecodingTitle')
-        self.transcodeHwEncoding = data.attrib.get('transcodeHwEncoding')
-        self.transcodeHwEncodingTitle = data.attrib.get('transcodeHwEncodingTitle')
-        self.transcodeHwFullPipeline = utils.cast(bool, data.attrib.get('transcodeHwFullPipeline', '0'))
-        self.transcodeHwRequested = utils.cast(bool, data.attrib.get('transcodeHwRequested', '0'))
-        self.videoCodec = data.attrib.get('videoCodec')
-        self.videoDecision = data.attrib.get('videoDecision')
-        self.width = utils.cast(int, data.attrib.get('width'))
-
-
-@utils.registerPlexObject
-class TranscodeJob(PlexObject):
-    """ Represents an Optimizing job.
-        TrancodeJobs are the process for optimizing conversions.
-        Active or paused optimization items. Usually one item as a time."""
-    TAG = 'TranscodeJob'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.generatorID = data.attrib.get('generatorID')
-        self.key = data.attrib.get('key')
-        self.progress = data.attrib.get('progress')
-        self.ratingKey = data.attrib.get('ratingKey')
-        self.size = data.attrib.get('size')
-        self.targetTagID = data.attrib.get('targetTagID')
-        self.thumb = data.attrib.get('thumb')
-        self.title = data.attrib.get('title')
-        self.type = data.attrib.get('type')
-
-
-@utils.registerPlexObject
-class Optimized(PlexObject):
-    """ Represents a Optimized item.
-        Optimized items are optimized and queued conversions items."""
-    TAG = 'Item'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.id = data.attrib.get('id')
-        self.composite = data.attrib.get('composite')
-        self.title = data.attrib.get('title')
-        self.type = data.attrib.get('type')
-        self.target = data.attrib.get('target')
-        self.targetTagID = data.attrib.get('targetTagID')
-
-    def items(self):
-        """ Returns a list of all :class:`~plexapi.media.Video` objects
-            in this optimized item.
-        """
-        key = f'{self._initpath}/{self.id}/items'
-        return self.fetchItems(key)
-
-    def remove(self):
-        """ Remove an Optimized item"""
-        key = f'{self._initpath}/{self.id}'
-        self._server.query(key, method=self._server._session.delete)
-
-    def rename(self, title):
-        """ Rename an Optimized item"""
-        key = f'{self._initpath}/{self.id}?Item[title]={title}'
-        self._server.query(key, method=self._server._session.put)
-
-    def reprocess(self, ratingKey):
-        """ Reprocess a removed Conversion item that is still a listed Optimize item"""
-        key = f'{self._initpath}/{self.id}/{ratingKey}/enable'
-        self._server.query(key, method=self._server._session.put)
-
-
-@utils.registerPlexObject
-class Conversion(PlexObject):
-    """ Represents a Conversion item.
-        Conversions are items queued for optimization or being actively optimized."""
-    TAG = 'Video'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.addedAt = data.attrib.get('addedAt')
-        self.art = data.attrib.get('art')
-        self.chapterSource = data.attrib.get('chapterSource')
-        self.contentRating = data.attrib.get('contentRating')
-        self.duration = data.attrib.get('duration')
-        self.generatorID = data.attrib.get('generatorID')
-        self.generatorType = data.attrib.get('generatorType')
-        self.guid = data.attrib.get('guid')
-        self.key = data.attrib.get('key')
-        self.lastViewedAt = data.attrib.get('lastViewedAt')
-        self.librarySectionID = data.attrib.get('librarySectionID')
-        self.librarySectionKey = data.attrib.get('librarySectionKey')
-        self.librarySectionTitle = data.attrib.get('librarySectionTitle')
-        self.originallyAvailableAt = data.attrib.get('originallyAvailableAt')
-        self.playQueueItemID = data.attrib.get('playQueueItemID')
-        self.playlistID = data.attrib.get('playlistID')
-        self.primaryExtraKey = data.attrib.get('primaryExtraKey')
-        self.rating = data.attrib.get('rating')
-        self.ratingKey = data.attrib.get('ratingKey')
-        self.studio = data.attrib.get('studio')
-        self.summary = data.attrib.get('summary')
-        self.tagline = data.attrib.get('tagline')
-        self.target = data.attrib.get('target')
-        self.thumb = data.attrib.get('thumb')
-        self.title = data.attrib.get('title')
-        self.type = data.attrib.get('type')
-        self.updatedAt = data.attrib.get('updatedAt')
-        self.userID = data.attrib.get('userID')
-        self.username = data.attrib.get('username')
-        self.viewOffset = data.attrib.get('viewOffset')
-        self.year = data.attrib.get('year')
-
-    def remove(self):
-        """ Remove Conversion from queue """
-        key = f'/playlists/{self.playlistID}/items/{self.generatorID}/{self.ratingKey}/disable'
-        self._server.query(key, method=self._server._session.put)
-
-    def move(self, after):
-        """ Move Conversion items position in queue
-            after (int): Place item after specified playQueueItemID. '-1' is the active conversion.
-
-                Example:
-                    Move 5th conversion Item to active conversion
-                        conversions[4].move('-1')
-
-                    Move 4th conversion Item to 3rd in conversion queue
-                        conversions[3].move(conversions[1].playQueueItemID)
-        """
-
-        key = f'{self._initpath}/items/{self.playQueueItemID}/move?after={after}'
-        self._server.query(key, method=self._server._session.put)
-
-
-class MediaTag(PlexObject):
-    """ Base class for media tags used for filtering and searching your library
-        items or navigating the metadata of media items in your library. Tags are
-        the construct used for things such as Country, Director, Genre, etc.
-
-        Attributes:
-            filter (str): The library filter for the tag.
-            id (id): Tag ID (This seems meaningless except to use it as a unique id).
-            key (str): API URL (/library/section/<librarySectionID>/all?<filter>).
-            role (str): The name of the character role for :class:`~plexapi.media.Role` only.
-            tag (str): Name of the tag. This will be Animation, SciFi etc for Genres. The name of
-                person for Directors and Roles (ex: Animation, Stephen Graham, etc).
-            tagKey (str): Plex GUID for the actor/actress for :class:`~plexapi.media.Role` only.
-            thumb (str): URL to thumbnail image for :class:`~plexapi.media.Role` only.
-    """
-
-    def __str__(self):
-        """ Returns the tag name. """
-        return self.tag
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.filter = data.attrib.get('filter')
-        self.id = utils.cast(int, data.attrib.get('id'))
-        self.key = data.attrib.get('key')
-        self.role = data.attrib.get('role')
-        self.tag = data.attrib.get('tag')
-        self.tagKey = data.attrib.get('tagKey')
-        self.thumb = data.attrib.get('thumb')
-
-        parent = self._parent()
-        self._librarySectionID = utils.cast(int, parent._data.attrib.get('librarySectionID'))
-        self._librarySectionKey = parent._data.attrib.get('librarySectionKey')
-        self._librarySectionTitle = parent._data.attrib.get('librarySectionTitle')
-        self._parentType = parent.TYPE
-
-        if self._librarySectionKey and self.filter:
-            self.key = f'{self._librarySectionKey}/all?{self.filter}&type={utils.searchType(self._parentType)}'
-
-    def items(self):
-        """ Return the list of items within this tag. """
-        if not self.key:
-            raise BadRequest(f'Key is not defined for this tag: {self.tag}. Reload the parent object.')
-        return self.fetchItems(self.key)
-
-
-@utils.registerPlexObject
-class Collection(MediaTag):
-    """ Represents a single Collection media tag.
-
-        Attributes:
-            TAG (str): 'Collection'
-            FILTER (str): 'collection'
-    """
-    TAG = 'Collection'
-    FILTER = 'collection'
-
-    def collection(self):
-        """ Return the :class:`~plexapi.collection.Collection` object for this collection tag.
-        """
-        key = f'{self._librarySectionKey}/collections'
-        return self.fetchItem(key, etag='Directory', index=self.id)
-
-
-@utils.registerPlexObject
-class Country(MediaTag):
-    """ Represents a single Country media tag.
-
-        Attributes:
-            TAG (str): 'Country'
-            FILTER (str): 'country'
-    """
-    TAG = 'Country'
-    FILTER = 'country'
-
-
-@utils.registerPlexObject
-class Director(MediaTag):
-    """ Represents a single Director media tag.
-
-        Attributes:
-            TAG (str): 'Director'
-            FILTER (str): 'director'
-    """
-    TAG = 'Director'
-    FILTER = 'director'
-
-
-@utils.registerPlexObject
-class Format(MediaTag):
-    """ Represents a single Format media tag.
-
-        Attributes:
-            TAG (str): 'Format'
-            FILTER (str): 'format'
-    """
-    TAG = 'Format'
-    FILTER = 'format'
-
-
-@utils.registerPlexObject
-class Genre(MediaTag):
-    """ Represents a single Genre media tag.
-
-        Attributes:
-            TAG (str): 'Genre'
-            FILTER (str): 'genre'
-    """
-    TAG = 'Genre'
-    FILTER = 'genre'
-
-
-@utils.registerPlexObject
-class Label(MediaTag):
-    """ Represents a single Label media tag.
-
-        Attributes:
-            TAG (str): 'Label'
-            FILTER (str): 'label'
-    """
-    TAG = 'Label'
-    FILTER = 'label'
-
-
-@utils.registerPlexObject
-class Mood(MediaTag):
-    """ Represents a single Mood media tag.
-
-        Attributes:
-            TAG (str): 'Mood'
-            FILTER (str): 'mood'
-    """
-    TAG = 'Mood'
-    FILTER = 'mood'
-
-
-@utils.registerPlexObject
-class Producer(MediaTag):
-    """ Represents a single Producer media tag.
-
-        Attributes:
-            TAG (str): 'Producer'
-            FILTER (str): 'producer'
-    """
-    TAG = 'Producer'
-    FILTER = 'producer'
-
-
-@utils.registerPlexObject
-class Role(MediaTag):
-    """ Represents a single Role (actor/actress) media tag.
-
-        Attributes:
-            TAG (str): 'Role'
-            FILTER (str): 'role'
-    """
-    TAG = 'Role'
-    FILTER = 'role'
-
-
-@utils.registerPlexObject
-class Similar(MediaTag):
-    """ Represents a single Similar media tag.
-
-        Attributes:
-            TAG (str): 'Similar'
-            FILTER (str): 'similar'
-    """
-    TAG = 'Similar'
-    FILTER = 'similar'
-
-
-@utils.registerPlexObject
-class Style(MediaTag):
-    """ Represents a single Style media tag.
-
-        Attributes:
-            TAG (str): 'Style'
-            FILTER (str): 'style'
-    """
-    TAG = 'Style'
-    FILTER = 'style'
-
-
-@utils.registerPlexObject
-class Subformat(MediaTag):
-    """ Represents a single Subformat media tag.
-
-        Attributes:
-            TAG (str): 'Subformat'
-            FILTER (str): 'subformat'
-    """
-    TAG = 'Subformat'
-    FILTER = 'subformat'
-
-
-@utils.registerPlexObject
-class Tag(MediaTag):
-    """ Represents a single Tag media tag.
-
-        Attributes:
-            TAG (str): 'Tag'
-            FILTER (str): 'tag'
-    """
-    TAG = 'Tag'
-    FILTER = 'tag'
-
-
-@utils.registerPlexObject
-class Writer(MediaTag):
-    """ Represents a single Writer media tag.
-
-        Attributes:
-            TAG (str): 'Writer'
-            FILTER (str): 'writer'
-    """
-    TAG = 'Writer'
-    FILTER = 'writer'
-
-
-@utils.registerPlexObject
-class Guid(PlexObject):
-    """ Represents a single Guid media tag.
-
-        Attributes:
-            TAG (str): 'Guid'
-            id (id): The guid for external metadata sources (e.g. IMDB, TMDB, TVDB, MBID).
-    """
-    TAG = 'Guid'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.id = data.attrib.get('id')
-
-
-@utils.registerPlexObject
-class Image(PlexObject):
-    """ Represents a single Image media tag.
-
-        Attributes:
-            TAG (str): 'Image'
-            alt (str): The alt text for the image.
-            type (str): The type of image (e.g. coverPoster, background, snapshot).
-            url (str): The API URL (/library/metadata/<ratingKey>/thumb/<thumbid>).
-    """
-    TAG = 'Image'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.alt = data.attrib.get('alt')
-        self.type = data.attrib.get('type')
-        self.url = data.attrib.get('url')
-
-
-@utils.registerPlexObject
-class Rating(PlexObject):
-    """ Represents a single Rating media tag.
-
-        Attributes:
-            TAG (str): 'Rating'
-            image (str): The uri for the rating image
-                (e.g. ``imdb://image.rating``, ``rottentomatoes://image.rating.ripe``,
-                ``rottentomatoes://image.rating.upright``, ``themoviedb://image.rating``).
-            type (str): The type of rating (e.g. audience or critic).
-            value (float): The rating value.
-    """
-    TAG = 'Rating'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.image = data.attrib.get('image')
-        self.type = data.attrib.get('type')
-        self.value = utils.cast(float, data.attrib.get('value'))
-
-
-@utils.registerPlexObject
-class Review(PlexObject):
-    """ Represents a single Review for a Movie.
-
-        Attributes:
-            TAG (str): 'Review'
-            filter (str): The library filter for the review.
-            id (int): The ID of the review.
-            image (str): The image uri for the review.
-            link (str): The url to the online review.
-            source (str): The source of the review.
-            tag (str): The name of the reviewer.
-            text (str): The text of the review.
-    """
-    TAG = 'Review'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.filter = data.attrib.get('filter')
-        self.id = utils.cast(int, data.attrib.get('id', 0))
-        self.image = data.attrib.get('image')
-        self.link = data.attrib.get('link')
-        self.source = data.attrib.get('source')
-        self.tag = data.attrib.get('tag')
-        self.text = data.attrib.get('text')
-
-
-@utils.registerPlexObject
-class UltraBlurColors(PlexObject):
-    """ Represents a single UltraBlurColors media tag.
-
-        Attributes:
-            TAG (str): 'UltraBlurColors'
-            bottomLeft (str): The bottom left hex color.
-            bottomRight (str): The bottom right hex color.
-            topLeft (str): The top left hex color.
-            topRight (str): The top right hex color.
-    """
-    TAG = 'UltraBlurColors'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.bottomLeft = data.attrib.get('bottomLeft')
-        self.bottomRight = data.attrib.get('bottomRight')
-        self.topLeft = data.attrib.get('topLeft')
-        self.topRight = data.attrib.get('topRight')
-
-
-class BaseResource(PlexObject):
-    """ Base class for all Art, Poster, and Theme objects.
-
-        Attributes:
-            TAG (str): 'Photo' or 'Track'
-            key (str): API URL (/library/metadata/<ratingkey>).
-            provider (str): The source of the resource. 'local' for local files (e.g. theme.mp3),
-                None if uploaded or agent-/plugin-supplied.
-            ratingKey (str): Unique key identifying the resource.
-            selected (bool): True if the resource is currently selected.
-            thumb (str): The URL to retrieve the resource thumbnail.
-    """
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.key = data.attrib.get('key')
-        self.provider = data.attrib.get('provider')
-        self.ratingKey = data.attrib.get('ratingKey')
-        self.selected = utils.cast(bool, data.attrib.get('selected'))
-        self.thumb = data.attrib.get('thumb')
-
-    def select(self):
-        key = self._initpath[:-1]
-        data = f'{key}?url={quote_plus(self.ratingKey)}'
-        try:
-            self._server.query(data, method=self._server._session.put)
-        except ElementTree.ParseError:
-            pass
-
-    @property
-    def resourceFilepath(self):
-        """ Returns the file path to the resource in the Plex Media Server data directory.
-            Note: Returns the URL if the resource is not stored locally.
-        """
-        if self.ratingKey.startswith('media://'):
-            return str(Path('Media') / 'localhost' / self.ratingKey.split('://')[-1])
-        elif self.ratingKey.startswith('metadata://'):
-            return str(Path(self._parent().metadataDirectory) / 'Contents' / '_combined' / self.ratingKey.split('://')[-1])
-        elif self.ratingKey.startswith('upload://'):
-            return str(Path(self._parent().metadataDirectory) / 'Uploads' / self.ratingKey.split('://')[-1])
-        else:
-            return self.ratingKey
-
-
-class Art(BaseResource):
-    """ Represents a single Art object. """
-    TAG = 'Photo'
-
-
-class Logo(BaseResource):
-    """ Represents a single Logo object. """
-    TAG = 'Photo'
-
-
-class Poster(BaseResource):
-    """ Represents a single Poster object. """
-    TAG = 'Photo'
-
-
-class Theme(BaseResource):
-    """ Represents a single Theme object. """
-    TAG = 'Track'
-
-
-@utils.registerPlexObject
-class Chapter(PlexObject):
-    """ Represents a single Chapter media tag.
-
-        Attributes:
-            TAG (str): 'Chapter'
-            end (int): The end time of the chapter in milliseconds.
-            filter (str): The library filter for the chapter.
-            id (int): The ID of the chapter.
-            index (int): The index of the chapter.
-            tag (str): The name of the chapter.
-            title (str): The title of the chapter.
-            thumb (str): The URL to retrieve the chapter thumbnail.
-            start (int): The start time of the chapter in milliseconds.
-    """
-    TAG = 'Chapter'
-
-    def __repr__(self):
-        name = self._clean(self.firstAttr('tag'))
-        start = utils.millisecondToHumanstr(self._clean(self.firstAttr('start')))
-        end = utils.millisecondToHumanstr(self._clean(self.firstAttr('end')))
-        offsets = f'{start}-{end}'
-        return f"<{':'.join([self.__class__.__name__, name, offsets])}>"
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.end = utils.cast(int, data.attrib.get('endTimeOffset'))
-        self.filter = data.attrib.get('filter')
-        self.id = utils.cast(int, data.attrib.get('id', 0))
-        self.index = utils.cast(int, data.attrib.get('index'))
-        self.tag = data.attrib.get('tag')
-        self.title = self.tag
-        self.thumb = data.attrib.get('thumb')
-        self.start = utils.cast(int, data.attrib.get('startTimeOffset'))
-
-
-@utils.registerPlexObject
-class Marker(PlexObject):
-    """ Represents a single Marker media tag.
-
-        Attributes:
-            TAG (str): 'Marker'
-            end (int): The end time of the marker in milliseconds.
-            final (bool): True if the marker is the final credits marker.
-            id (int): The ID of the marker.
-            type (str): The type of marker.
-            start (int): The start time of the marker in milliseconds.
-            version (int): The Plex marker version.
-    """
-    TAG = 'Marker'
-
-    def __repr__(self):
-        name = self._clean(self.firstAttr('type'))
-        start = utils.millisecondToHumanstr(self._clean(self.firstAttr('start')))
-        end = utils.millisecondToHumanstr(self._clean(self.firstAttr('end')))
-        offsets = f'{start}-{end}'
-        return f"<{':'.join([self.__class__.__name__, name, offsets])}>"
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.end = utils.cast(int, data.attrib.get('endTimeOffset'))
-        self.final = utils.cast(bool, data.attrib.get('final'))
-        self.id = utils.cast(int, data.attrib.get('id'))
-        self.type = data.attrib.get('type')
-        self.start = utils.cast(int, data.attrib.get('startTimeOffset'))
-
-        attributes = data.find('Attributes')
-        self.version = attributes.attrib.get('version')
-
-    @property
-    def first(self):
-        """ Returns True if the marker in the first credits marker. """
-        if self.type != 'credits':
-            return None
-        first = min(
-            (marker for marker in self._parent().markers if marker.type == 'credits'),
-            key=lambda m: m.start
-        )
-        return first == self
-
-
-@utils.registerPlexObject
-class Field(PlexObject):
-    """ Represents a single Field.
-
-        Attributes:
-            TAG (str): 'Field'
-            locked (bool): True if the field is locked.
-            name (str): The name of the field.
-    """
-    TAG = 'Field'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.locked = utils.cast(bool, data.attrib.get('locked'))
-        self.name = data.attrib.get('name')
-
-
-@utils.registerPlexObject
-class SearchResult(PlexObject):
-    """ Represents a single SearchResult.
-
-        Attributes:
-            TAG (str): 'SearchResult'
-    """
-    TAG = 'SearchResult'
-
-    def __repr__(self):
-        name = self._clean(self.firstAttr('name'))
-        score = self._clean(self.firstAttr('score'))
-        return f"<{':'.join([p for p in [self.__class__.__name__, name, score] if p])}>"
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.guid = data.attrib.get('guid')
-        self.lifespanEnded = data.attrib.get('lifespanEnded')
-        self.name = data.attrib.get('name')
-        self.score = utils.cast(int, data.attrib.get('score'))
-        self.year = data.attrib.get('year')
-
-
-@utils.registerPlexObject
-class Agent(PlexObject):
-    """ Represents a single Agent.
-
-        Attributes:
-            TAG (str): 'Agent'
-    """
-    TAG = 'Agent'
-
-    def __repr__(self):
-        uid = self._clean(self.firstAttr('shortIdentifier'))
-        return f"<{':'.join([p for p in [self.__class__.__name__, uid] if p])}>"
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.hasAttribution = data.attrib.get('hasAttribution')
-        self.hasPrefs = data.attrib.get('hasPrefs')
-        self.identifier = data.attrib.get('identifier')
-        self.name = data.attrib.get('name')
-        self.primary = data.attrib.get('primary')
-        self.shortIdentifier = self.identifier.rsplit('.', 1)[1]
-
-    @cached_data_property
-    def languageCodes(self):
-        if 'mediaType' in self._initpath:
-            return self.listAttrs(self._data, 'code', etag='Language')
-        return []
-
-    @cached_data_property
-    def mediaTypes(self):
-        if 'mediaType' not in self._initpath:
-            return self.findItems(self._data, cls=AgentMediaType)
-        return []
-
-    @property
-    @deprecated('use "languageCodes" instead')
-    def languageCode(self):
-        return self.languageCodes
-
-    def settings(self):
-        key = f'/:/plugins/{self.identifier}/prefs'
-        data = self._server.query(key)
-        return self.findItems(data, cls=settings.Setting)
-
-    @deprecated('use "settings" instead')
-    def _settings(self):
-        return self.settings()
-
-
-class AgentMediaType(Agent):
-    """ Represents a single Agent MediaType.
-
-        Attributes:
-            TAG (str): 'MediaType'
-    """
-    TAG = 'MediaType'
-
-    def __repr__(self):
-        uid = self._clean(self.firstAttr('name'))
-        return f"<{':'.join([p for p in [self.__class__.__name__, uid] if p])}>"
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.mediaType = utils.cast(int, data.attrib.get('mediaType'))
-        self.name = data.attrib.get('name')
-
-    @cached_data_property
-    def languageCodes(self):
-        return self.listAttrs(self._data, 'code', etag='Language')
-
-    @property
-    @deprecated('use "languageCodes" instead')
-    def languageCode(self):
-        return self.languageCodes
-
-
-@utils.registerPlexObject
-class Availability(PlexObject):
-    """ Represents a single online streaming service Availability.
-
-        Attributes:
-            TAG (str): 'Availability'
-            country (str): The streaming service country.
-            offerType (str): Subscription, buy, or rent from the streaming service.
-            platform (str): The platform slug for the streaming service.
-            platformColorThumb (str): Thumbnail icon for the streaming service.
-            platformInfo (str): The streaming service platform info.
-            platformUrl (str): The URL to the media on the streaming service.
-            price (float): The price to buy or rent from the streaming service.
-            priceDescription (str): The display price to buy or rent from the streaming service.
-            quality (str): The video quality on the streaming service.
-            title (str): The title of the streaming service.
-            url (str): The Plex availability URL.
-    """
-    TAG = 'Availability'
-
-    def __repr__(self):
-        return f'<{self.__class__.__name__}:{self.platform}:{self.offerType}>'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.country = data.attrib.get('country')
-        self.offerType = data.attrib.get('offerType')
-        self.platform = data.attrib.get('platform')
-        self.platformColorThumb = data.attrib.get('platformColorThumb')
-        self.platformInfo = data.attrib.get('platformInfo')
-        self.platformUrl = data.attrib.get('platformUrl')
-        self.price = utils.cast(float, data.attrib.get('price'))
-        self.priceDescription = data.attrib.get('priceDescription')
-        self.quality = data.attrib.get('quality')
-        self.title = data.attrib.get('title')
-        self.url = data.attrib.get('url')
diff --git a/lib/plexapi/mixins.py b/lib/plexapi/mixins.py
deleted file mode 100644
index 95f785fc..00000000
--- a/lib/plexapi/mixins.py
+++ /dev/null
@@ -1,1325 +0,0 @@
-# -*- coding: utf-8 -*-
-from collections import deque
-from datetime import datetime
-from typing import Deque, Set, Tuple, Union
-from urllib.parse import parse_qsl, quote, quote_plus, unquote, urlencode, urlsplit
-
-from plexapi import media, settings, utils
-from plexapi.exceptions import BadRequest, NotFound
-from plexapi.utils import deprecated, openOrRead
-
-
-class AdvancedSettingsMixin:
-    """ Mixin for Plex objects that can have advanced settings. """
-
-    def preferences(self):
-        """ Returns a list of :class:`~plexapi.settings.Preferences` objects. """
-        key = f'{self.key}?includePreferences=1'
-        return self.fetchItems(key, cls=settings.Preferences, rtag='Preferences')
-
-    def preference(self, pref):
-        """ Returns a :class:`~plexapi.settings.Preferences` object for the specified pref.
-
-            Parameters:
-                pref (str): The id of the preference to return.
-        """
-        prefs = self.preferences()
-        try:
-            return next(p for p in prefs if p.id == pref)
-        except StopIteration:
-            availablePrefs = [p.id for p in prefs]
-            raise NotFound(f'Unknown preference "{pref}" for {self.TYPE}. '
-                           f'Available preferences: {availablePrefs}') from None
-
-    def editAdvanced(self, **kwargs):
-        """ Edit a Plex object's advanced settings. """
-        data = {}
-        key = f'{self.key}/prefs?'
-        preferences = {pref.id: pref for pref in self.preferences() if pref.enumValues}
-        for settingID, value in kwargs.items():
-            try:
-                pref = preferences[settingID]
-            except KeyError:
-                raise NotFound(f'{value} not found in {list(preferences.keys())}')
-
-            enumValues = pref.enumValues
-            if enumValues.get(value, enumValues.get(str(value))):
-                data[settingID] = value
-            else:
-                raise NotFound(f'{value} not found in {list(enumValues)}')
-        url = key + urlencode(data)
-        self._server.query(url, method=self._server._session.put)
-        return self
-
-    def defaultAdvanced(self):
-        """ Edit all of a Plex object's advanced settings to default. """
-        data = {}
-        key = f'{self.key}/prefs?'
-        for preference in self.preferences():
-            data[preference.id] = preference.default
-        url = key + urlencode(data)
-        self._server.query(url, method=self._server._session.put)
-        return self
-
-
-class SmartFilterMixin:
-    """ Mixin for Plex objects that can have smart filters. """
-
-    def _parseFilterGroups(self, feed: Deque[Tuple[str, str]], returnOn: Union[Set[str], None] = None) -> dict:
-        """ Parse filter groups from input lines between push and pop. """
-        currentFiltersStack: list[dict] = []
-        operatorForStack = None
-        if returnOn is None:
-            returnOn = set("pop")
-        else:
-            returnOn.add("pop")
-        allowedLogicalOperators = ["and", "or"]  # first is the default
-
-        while feed:
-            key, value = feed.popleft()  # consume the first item
-            if key == "push":
-                # recurse and add the result to the current stack
-                currentFiltersStack.append(
-                    self._parseFilterGroups(feed, returnOn)
-                )
-            elif key in returnOn:
-                # stop iterating and return the current stack
-                if not key == "pop":
-                    feed.appendleft((key, value))  # put the item back
-                break
-
-            elif key in allowedLogicalOperators:
-                # set the operator
-                if operatorForStack and not operatorForStack == key:
-                    raise ValueError(
-                        "cannot have different logical operators for the same"
-                        " filter group"
-                    )
-                operatorForStack = key
-
-            else:
-                # add the key value pair to the current filter
-                currentFiltersStack.append({key: value})
-
-        if not operatorForStack and len(currentFiltersStack) > 1:
-            # consider 'and' as the default operator
-            operatorForStack = allowedLogicalOperators[0]
-
-        if operatorForStack:
-            return {operatorForStack: currentFiltersStack}
-        return currentFiltersStack.pop()
-
-    def _parseQueryFeed(self, feed: "deque[Tuple[str, str]]") -> dict:
-        """ Parse the query string into a dict. """
-        filtersDict = {}
-        special_keys = {"type", "sort"}
-        integer_keys = {"includeGuids", "limit"}
-        as_is_keys = {"group", "having"}
-        reserved_keys = special_keys | integer_keys | as_is_keys
-        while feed:
-            key, value = feed.popleft()
-            if key in integer_keys:
-                filtersDict[key] = int(value)
-            elif key in as_is_keys:
-                filtersDict[key] = value
-            elif key == "type":
-                filtersDict["libtype"] = utils.reverseSearchType(value)
-            elif key == "sort":
-                filtersDict["sort"] = value.split(",")
-            else:
-                feed.appendleft((key, value))  # put the item back
-                filter_group = self._parseFilterGroups(
-                    feed, returnOn=reserved_keys
-                )
-                if "filters" in filtersDict:
-                    filtersDict["filters"] = {
-                        "and": [filtersDict["filters"], filter_group]
-                    }
-                else:
-                    filtersDict["filters"] = filter_group
-
-        return filtersDict
-
-    def _parseFilters(self, content):
-        """ Parse the content string and returns the filter dict. """
-        content = urlsplit(unquote(content))
-        feed = deque()
-
-        for key, value in parse_qsl(content.query):
-            # Move = sign to key when operator is ==
-            if value.startswith("="):
-                key, value = f"{key}=", value[1:]
-
-            feed.append((key, value))
-
-        return self._parseQueryFeed(feed)
-
-
-class SplitMergeMixin:
-    """ Mixin for Plex objects that can be split and merged. """
-
-    def split(self):
-        """ Split duplicated Plex object into separate objects. """
-        key = f'{self.key}/split'
-        self._server.query(key, method=self._server._session.put)
-        return self
-
-    def merge(self, ratingKeys):
-        """ Merge other Plex objects into the current object.
-
-            Parameters:
-                ratingKeys (list): A list of rating keys to merge.
-        """
-        if not isinstance(ratingKeys, list):
-            ratingKeys = str(ratingKeys).split(',')
-
-        key = f"{self.key}/merge?ids={','.join(str(r) for r in ratingKeys)}"
-        self._server.query(key, method=self._server._session.put)
-        return self
-
-
-class UnmatchMatchMixin:
-    """ Mixin for Plex objects that can be unmatched and matched. """
-
-    def unmatch(self):
-        """ Unmatches metadata match from object. """
-        key = f'{self.key}/unmatch'
-        self._server.query(key, method=self._server._session.put)
-
-    def matches(self, agent=None, title=None, year=None, language=None):
-        """ Return list of (:class:`~plexapi.media.SearchResult`) metadata matches.
-
-             Parameters:
-                agent (str): Agent name to be used (imdb, thetvdb, themoviedb, etc.)
-                title (str): Title of item to search for
-                year (str): Year of item to search in
-                language (str) : Language of item to search in
-
-            Examples:
-                1. video.matches()
-                2. video.matches(title="something", year=2020)
-                3. video.matches(title="something")
-                4. video.matches(year=2020)
-                5. video.matches(title="something", year="")
-                6. video.matches(title="", year=2020)
-                7. video.matches(title="", year="")
-
-                1. The default behaviour in Plex Web = no params in plexapi
-                2. Both title and year specified by user
-                3. Year automatically filled in
-                4. Title automatically filled in
-                5. Explicitly searches for title with blank year
-                6. Explicitly searches for blank title with year
-                7. I don't know what the user is thinking... return the same result as 1
-
-                For 2 to 7, the agent and language is automatically filled in
-        """
-        key = f'{self.key}/matches'
-        params = {'manual': 1}
-
-        if agent and not any([title, year, language]):
-            params['language'] = self.section().language
-            params['agent'] = utils.getAgentIdentifier(self.section(), agent)
-        else:
-            if any(x is not None for x in [agent, title, year, language]):
-                if title is None:
-                    params['title'] = self.title
-                else:
-                    params['title'] = title
-
-                if year is None:
-                    params['year'] = getattr(self, 'year', '')
-                else:
-                    params['year'] = year
-
-                params['language'] = language or self.section().language
-
-                if agent is None:
-                    params['agent'] = self.section().agent
-                else:
-                    params['agent'] = utils.getAgentIdentifier(self.section(), agent)
-
-        key = key + '?' + urlencode(params)
-        return self.fetchItems(key, cls=media.SearchResult)
-
-    def fixMatch(self, searchResult=None, auto=False, agent=None):
-        """ Use match result to update show metadata.
-
-            Parameters:
-                auto (bool): True uses first match from matches
-                    False allows user to provide the match
-                searchResult (:class:`~plexapi.media.SearchResult`): Search result from
-                    ~plexapi.base.matches()
-                agent (str): Agent name to be used (imdb, thetvdb, themoviedb, etc.)
-        """
-        key = f'{self.key}/match'
-        if auto:
-            autoMatch = self.matches(agent=agent)
-            if autoMatch:
-                searchResult = autoMatch[0]
-            else:
-                raise NotFound(f'No matches found using this agent: ({agent}:{autoMatch})')
-        elif not searchResult:
-            raise NotFound('fixMatch() requires either auto=True or '
-                           'searchResult=:class:`~plexapi.media.SearchResult`.')
-
-        params = {'guid': searchResult.guid,
-                  'name': searchResult.name}
-
-        data = key + '?' + urlencode(params)
-        self._server.query(data, method=self._server._session.put)
-        return self
-
-
-class ExtrasMixin:
-    """ Mixin for Plex objects that can have extras. """
-
-    def extras(self):
-        """ Returns a list of :class:`~plexapi.video.Extra` objects. """
-        from plexapi.video import Extra
-        key = f'{self.key}/extras'
-        return self.fetchItems(key, cls=Extra)
-
-
-class HubsMixin:
-    """ Mixin for Plex objects that can have related hubs. """
-
-    def hubs(self):
-        """ Returns a list of :class:`~plexapi.library.Hub` objects. """
-        from plexapi.library import Hub
-        key = f'{self.key}/related'
-        return self.fetchItems(key, cls=Hub)
-
-
-class PlayedUnplayedMixin:
-    """ Mixin for Plex objects that can be marked played and unplayed. """
-
-    @property
-    def isPlayed(self):
-        """ Returns True if this video is played. """
-        return bool(self.viewCount > 0) if self.viewCount else False
-
-    def markPlayed(self):
-        """ Mark the Plex object as played. """
-        key = '/:/scrobble'
-        params = {'key': self.ratingKey, 'identifier': 'com.plexapp.plugins.library'}
-        self._server.query(key, params=params)
-        return self
-
-    def markUnplayed(self):
-        """ Mark the Plex object as unplayed. """
-        key = '/:/unscrobble'
-        params = {'key': self.ratingKey, 'identifier': 'com.plexapp.plugins.library'}
-        self._server.query(key, params=params)
-        return self
-
-    @property
-    def isWatched(self):
-        """ Alias to self.isPlayed. """
-        return self.isPlayed
-
-    def markWatched(self):
-        """ Alias to :func:`~plexapi.mixins.PlayedUnplayedMixin.markPlayed`. """
-        self.markPlayed()
-
-    def markUnwatched(self):
-        """ Alias to :func:`~plexapi.mixins.PlayedUnplayedMixin.markUnplayed`. """
-        self.markUnplayed()
-
-
-class RatingMixin:
-    """ Mixin for Plex objects that can have user star ratings. """
-
-    def rate(self, rating=None):
-        """ Rate the Plex object. Note: Plex ratings are displayed out of 5 stars (e.g. rating 7.0 = 3.5 stars).
-
-            Parameters:
-                rating (float, optional): Rating from 0 to 10. Exclude to reset the rating.
-
-            Raises:
-                :exc:`~plexapi.exceptions.BadRequest`: If the rating is invalid.
-        """
-        if rating is None:
-            rating = -1
-        elif not isinstance(rating, (int, float)) or rating < 0 or rating > 10:
-            raise BadRequest('Rating must be between 0 to 10.')
-        key = f'/:/rate?key={self.ratingKey}&identifier=com.plexapp.plugins.library&rating={rating}'
-        self._server.query(key, method=self._server._session.put)
-        return self
-
-
-class ArtUrlMixin:
-    """ Mixin for Plex objects that can have a background artwork url. """
-
-    @property
-    def artUrl(self):
-        """ Return the art url for the Plex object. """
-        art = self.firstAttr('art', 'grandparentArt')
-        return self._server.url(art, includeToken=True) if art else None
-
-
-class ArtLockMixin:
-    """ Mixin for Plex objects that can have a locked background artwork. """
-
-    def lockArt(self):
-        """ Lock the background artwork for a Plex object. """
-        return self._edit(**{'art.locked': 1})
-
-    def unlockArt(self):
-        """ Unlock the background artwork for a Plex object. """
-        return self._edit(**{'art.locked': 0})
-
-
-class ArtMixin(ArtUrlMixin, ArtLockMixin):
-    """ Mixin for Plex objects that can have background artwork. """
-
-    def arts(self):
-        """ Returns list of available :class:`~plexapi.media.Art` objects. """
-        return self.fetchItems(f'/library/metadata/{self.ratingKey}/arts', cls=media.Art)
-
-    def uploadArt(self, url=None, filepath=None):
-        """ Upload a background artwork from a url or filepath.
-
-            Parameters:
-                url (str): The full URL to the image to upload.
-                filepath (str): The full file path the the image to upload or file-like object.
-        """
-        if url:
-            key = f'/library/metadata/{self.ratingKey}/arts?url={quote_plus(url)}'
-            self._server.query(key, method=self._server._session.post)
-        elif filepath:
-            key = f'/library/metadata/{self.ratingKey}/arts'
-            data = openOrRead(filepath)
-            self._server.query(key, method=self._server._session.post, data=data)
-        return self
-
-    def setArt(self, art):
-        """ Set the background artwork for a Plex object.
-
-            Parameters:
-                art (:class:`~plexapi.media.Art`): The art object to select.
-        """
-        art.select()
-        return self
-
-
-class LogoUrlMixin:
-    """ Mixin for Plex objects that can have a logo url. """
-
-    @property
-    def logoUrl(self):
-        """ Return the logo url for the Plex object. """
-        image = next((i for i in self.images if i.type == 'clearLogo'), None)
-        return self._server.url(image.url, includeToken=True) if image else None
-
-
-class LogoLockMixin:
-    """ Mixin for Plex objects that can have a locked logo. """
-
-    def lockLogo(self):
-        """ Lock the logo for a Plex object. """
-        raise NotImplementedError('Logo cannot be locked through the API.')
-
-    def unlockLogo(self):
-        """ Unlock the logo for a Plex object. """
-        raise NotImplementedError('Logo cannot be unlocked through the API.')
-
-
-class LogoMixin(LogoUrlMixin, LogoLockMixin):
-    """ Mixin for Plex objects that can have logos. """
-
-    def logos(self):
-        """ Returns list of available :class:`~plexapi.media.Logo` objects. """
-        return self.fetchItems(f'/library/metadata/{self.ratingKey}/clearLogos', cls=media.Logo)
-
-    def uploadLogo(self, url=None, filepath=None):
-        """ Upload a logo from a url or filepath.
-
-            Parameters:
-                url (str): The full URL to the image to upload.
-                filepath (str): The full file path the the image to upload or file-like object.
-        """
-        if url:
-            key = f'/library/metadata/{self.ratingKey}/clearLogos?url={quote_plus(url)}'
-            self._server.query(key, method=self._server._session.post)
-        elif filepath:
-            key = f'/library/metadata/{self.ratingKey}/clearLogos'
-            data = openOrRead(filepath)
-            self._server.query(key, method=self._server._session.post, data=data)
-        return self
-
-    def setLogo(self, logo):
-        """ Set the logo for a Plex object.
-
-            Raises:
-                :exc:`~plexapi.exceptions.NotImplementedError`: Logo cannot be set through the API.
-        """
-        raise NotImplementedError(
-            'Logo cannot be set through the API. '
-            'Re-upload the logo using "uploadLogo" to set it.'
-        )
-
-
-class PosterUrlMixin:
-    """ Mixin for Plex objects that can have a poster url. """
-
-    @property
-    def thumbUrl(self):
-        """ Return the thumb url for the Plex object. """
-        thumb = self.firstAttr('thumb', 'parentThumb', 'grandparentThumb')
-        return self._server.url(thumb, includeToken=True) if thumb else None
-
-    @property
-    def posterUrl(self):
-        """ Alias to self.thumbUrl. """
-        return self.thumbUrl
-
-
-class PosterLockMixin:
-    """ Mixin for Plex objects that can have a locked poster. """
-
-    def lockPoster(self):
-        """ Lock the poster for a Plex object. """
-        return self._edit(**{'thumb.locked': 1})
-
-    def unlockPoster(self):
-        """ Unlock the poster for a Plex object. """
-        return self._edit(**{'thumb.locked': 0})
-
-
-class PosterMixin(PosterUrlMixin, PosterLockMixin):
-    """ Mixin for Plex objects that can have posters. """
-
-    def posters(self):
-        """ Returns list of available :class:`~plexapi.media.Poster` objects. """
-        return self.fetchItems(f'/library/metadata/{self.ratingKey}/posters', cls=media.Poster)
-
-    def uploadPoster(self, url=None, filepath=None):
-        """ Upload a poster from a url or filepath.
-
-            Parameters:
-                url (str): The full URL to the image to upload.
-                filepath (str): The full file path the the image to upload or file-like object.
-        """
-        if url:
-            key = f'/library/metadata/{self.ratingKey}/posters?url={quote_plus(url)}'
-            self._server.query(key, method=self._server._session.post)
-        elif filepath:
-            key = f'/library/metadata/{self.ratingKey}/posters'
-            data = openOrRead(filepath)
-            self._server.query(key, method=self._server._session.post, data=data)
-        return self
-
-    def setPoster(self, poster):
-        """ Set the poster for a Plex object.
-
-            Parameters:
-                poster (:class:`~plexapi.media.Poster`): The poster object to select.
-        """
-        poster.select()
-        return self
-
-
-class ThemeUrlMixin:
-    """ Mixin for Plex objects that can have a theme url. """
-
-    @property
-    def themeUrl(self):
-        """ Return the theme url for the Plex object. """
-        theme = self.firstAttr('theme', 'parentTheme', 'grandparentTheme')
-        return self._server.url(theme, includeToken=True) if theme else None
-
-
-class ThemeLockMixin:
-    """ Mixin for Plex objects that can have a locked theme. """
-
-    def lockTheme(self):
-        """ Lock the theme for a Plex object. """
-        return self._edit(**{'theme.locked': 1})
-
-    def unlockTheme(self):
-        """ Unlock the theme for a Plex object. """
-        return self._edit(**{'theme.locked': 0})
-
-
-class ThemeMixin(ThemeUrlMixin, ThemeLockMixin):
-    """ Mixin for Plex objects that can have themes. """
-
-    def themes(self):
-        """ Returns list of available :class:`~plexapi.media.Theme` objects. """
-        return self.fetchItems(f'/library/metadata/{self.ratingKey}/themes', cls=media.Theme)
-
-    def uploadTheme(self, url=None, filepath=None, timeout=None):
-        """ Upload a theme from url or filepath.
-
-            Warning: Themes cannot be deleted using PlexAPI!
-
-            Parameters:
-                url (str): The full URL to the theme to upload.
-                filepath (str): The full file path to the theme to upload or file-like object.
-                timeout (int, optional): Timeout, in seconds, to use when uploading themes to the server.
-                    (default config.TIMEOUT).
-        """
-        if url:
-            key = f'/library/metadata/{self.ratingKey}/themes?url={quote_plus(url)}'
-            self._server.query(key, method=self._server._session.post, timeout=timeout)
-        elif filepath:
-            key = f'/library/metadata/{self.ratingKey}/themes'
-            data = openOrRead(filepath)
-            self._server.query(key, method=self._server._session.post, data=data, timeout=timeout)
-        return self
-
-    def setTheme(self, theme):
-        """ Set the theme for a Plex object.
-
-            Raises:
-                :exc:`~plexapi.exceptions.NotImplementedError`: Themes cannot be set through the API.
-        """
-        raise NotImplementedError(
-            'Themes cannot be set through the API. '
-            'Re-upload the theme using "uploadTheme" to set it.'
-        )
-
-
-class EditFieldMixin:
-    """ Mixin for editing Plex object fields. """
-
-    def editField(self, field, value, locked=True, **kwargs):
-        """ Edit the field of a Plex object. All field editing methods can be chained together.
-            Also see :func:`~plexapi.base.PlexPartialObject.batchEdits` for batch editing fields.
-
-            Parameters:
-                field (str): The name of the field to edit.
-                value (str): The value to edit the field to.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-
-            Example:
-
-                .. code-block:: python
-
-                    # Chaining multiple field edits with reloading
-                    Movie.editTitle('A New Title').editSummary('A new summary').editTagline('A new tagline').reload()
-
-        """
-        edits = {
-            f'{field}.value': value or '',
-            f'{field}.locked': 1 if locked else 0
-        }
-        edits.update(kwargs)
-        return self._edit(**edits)
-
-
-class AddedAtMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have an added at date. """
-
-    def editAddedAt(self, addedAt, locked=True):
-        """ Edit the added at date.
-
-            Parameters:
-                addedAt (int or str or datetime): The new value as a unix timestamp (int),
-                    "YYYY-MM-DD" (str), or datetime object.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        if isinstance(addedAt, str):
-            addedAt = int(round(datetime.strptime(addedAt, '%Y-%m-%d').timestamp()))
-        elif isinstance(addedAt, datetime):
-            addedAt = int(round(addedAt.timestamp()))
-        return self.editField('addedAt', addedAt, locked=locked)
-
-
-class AudienceRatingMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have an audience rating. """
-
-    def editAudienceRating(self, audienceRating, locked=True):
-        """ Edit the audience rating.
-
-            Parameters:
-                audienceRating (float): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('audienceRating', audienceRating, locked=locked)
-
-
-class ContentRatingMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a content rating. """
-
-    def editContentRating(self, contentRating, locked=True):
-        """ Edit the content rating.
-
-            Parameters:
-                contentRating (str): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('contentRating', contentRating, locked=locked)
-
-
-class CriticRatingMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a critic rating. """
-
-    def editCriticRating(self, criticRating, locked=True):
-        """ Edit the critic rating.
-
-            Parameters:
-                criticRating (float): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('rating', criticRating, locked=locked)
-
-
-class EditionTitleMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have an edition title. """
-
-    def editEditionTitle(self, editionTitle, locked=True):
-        """ Edit the edition title. Plex Pass is required to edit this field.
-
-            Parameters:
-                editionTitle (str): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('editionTitle', editionTitle, locked=locked)
-
-
-class OriginallyAvailableMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have an originally available date. """
-
-    def editOriginallyAvailable(self, originallyAvailable, locked=True):
-        """ Edit the originally available date.
-
-            Parameters:
-                originallyAvailable (str or datetime): The new value "YYYY-MM-DD (str) or datetime object.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        if isinstance(originallyAvailable, datetime):
-            originallyAvailable = originallyAvailable.strftime('%Y-%m-%d')
-        return self.editField('originallyAvailableAt', originallyAvailable, locked=locked)
-
-
-class OriginalTitleMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have an original title. """
-
-    def editOriginalTitle(self, originalTitle, locked=True):
-        """ Edit the original title.
-
-            Parameters:
-                originalTitle (str): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('originalTitle', originalTitle, locked=locked)
-
-
-class SortTitleMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a sort title. """
-
-    def editSortTitle(self, sortTitle, locked=True):
-        """ Edit the sort title.
-
-            Parameters:
-                sortTitle (str): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('titleSort', sortTitle, locked=locked)
-
-
-class StudioMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a studio. """
-
-    def editStudio(self, studio, locked=True):
-        """ Edit the studio.
-
-            Parameters:
-                studio (str): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('studio', studio, locked=locked)
-
-
-class SummaryMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a summary. """
-
-    def editSummary(self, summary, locked=True):
-        """ Edit the summary.
-
-            Parameters:
-                summary (str): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('summary', summary, locked=locked)
-
-
-class TaglineMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a tagline. """
-
-    def editTagline(self, tagline, locked=True):
-        """ Edit the tagline.
-
-            Parameters:
-                tagline (str): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('tagline', tagline, locked=locked)
-
-
-class TitleMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a title. """
-
-    def editTitle(self, title, locked=True):
-        """ Edit the title.
-
-            Parameters:
-                title (str): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        kwargs = {}
-        if self.TYPE == 'album':
-            # Editing album title also requires the artist ratingKey
-            kwargs['artist.id.value'] = self.parentRatingKey
-        return self.editField('title', title, locked=locked, **kwargs)
-
-
-class TrackArtistMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a track artist. """
-
-    def editTrackArtist(self, trackArtist, locked=True):
-        """ Edit the track artist.
-
-            Parameters:
-                trackArtist (str): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('originalTitle', trackArtist, locked=locked)
-
-
-class TrackNumberMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a track number. """
-
-    def editTrackNumber(self, trackNumber, locked=True):
-        """ Edit the track number.
-
-            Parameters:
-                trackNumber (int): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('index', trackNumber, locked=locked)
-
-
-class TrackDiscNumberMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a track disc number. """
-
-    def editDiscNumber(self, discNumber, locked=True):
-        """ Edit the track disc number.
-
-            Parameters:
-                discNumber (int): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('parentIndex', discNumber, locked=locked)
-
-
-class PhotoCapturedTimeMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a captured time. """
-
-    def editCapturedTime(self, capturedTime, locked=True):
-        """ Edit the photo captured time.
-
-            Parameters:
-                capturedTime (str or datetime): The new value "YYYY-MM-DD hh:mm:ss" (str) or datetime object.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        if isinstance(capturedTime, datetime):
-            capturedTime = capturedTime.strftime('%Y-%m-%d %H:%M:%S')
-        return self.editField('originallyAvailableAt', capturedTime, locked=locked)
-
-
-class UserRatingMixin(EditFieldMixin):
-    """ Mixin for Plex objects that can have a user rating. """
-
-    def editUserRating(self, userRating, locked=True):
-        """ Edit the user rating.
-
-            Parameters:
-                userRating (float): The new value.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editField('userRating', userRating, locked=locked)
-
-
-class EditTagsMixin:
-    """ Mixin for editing Plex object tags. """
-
-    @deprecated('use "editTags" instead')
-    def _edit_tags(self, tag, items, locked=True, remove=False):
-        return self.editTags(tag, items, locked, remove)
-
-    def editTags(self, tag, items, locked=True, remove=False, **kwargs):
-        """ Edit the tags of a Plex object. All tag editing methods can be chained together.
-            Also see :func:`~plexapi.base.PlexPartialObject.batchEdits` for batch editing tags.
-
-            Parameters:
-                tag (str): Name of the tag to edit.
-                items (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags to add or remove.
-                locked (bool): True (default) to lock the tags, False to unlock the tags.
-                remove (bool): True to remove the tags in items.
-
-            Example:
-
-                .. code-block:: python
-
-                    # Chaining multiple tag edits with reloading
-                    Show.addCollection('New Collection').removeGenre('Action').addLabel('Favorite').reload()
-
-        """
-        if not isinstance(items, list):
-            items = [items]
-
-        if not remove:
-            tags = getattr(self, self._tagPlural(tag), [])
-            if isinstance(tags, list):
-                items = tags + items
-
-        edits = self._tagHelper(self._tagSingular(tag), items, locked, remove)
-        edits.update(kwargs)
-        return self._edit(**edits)
-
-    @staticmethod
-    def _tagSingular(tag):
-        """ Return the singular name of a tag. """
-        if tag == 'countries':
-            return 'country'
-        elif tag == 'similar':
-            return 'similar'
-        elif tag[-1] == 's':
-            return tag[:-1]
-        return tag
-
-    @staticmethod
-    def _tagPlural(tag):
-        """ Return the plural name of a tag. """
-        if tag == 'country':
-            return 'countries'
-        elif tag == 'similar':
-            return 'similar'
-        elif tag[-1] != 's':
-            return tag + 's'
-        return tag
-
-    @staticmethod
-    def _tagHelper(tag, items, locked=True, remove=False):
-        """ Return a dict of the query parameters for editing a tag. """
-        if not isinstance(items, list):
-            items = [items]
-
-        data = {
-            f'{tag}.locked': 1 if locked else 0
-        }
-
-        if remove:
-            tagname = f'{tag}[].tag.tag-'
-            data[tagname] = ','.join(quote(str(t)) for t in items)
-        else:
-            for i, item in enumerate(items):
-                tagname = f'{str(tag)}[{i}].tag.tag'
-                data[tagname] = item
-
-        return data
-
-
-class CollectionMixin(EditTagsMixin):
-    """ Mixin for Plex objects that can have collections. """
-
-    def addCollection(self, collections, locked=True):
-        """ Add a collection tag(s).
-
-            Parameters:
-                collections (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('collection', collections, locked=locked)
-
-    def removeCollection(self, collections, locked=True):
-        """ Remove a collection tag(s).
-
-            Parameters:
-                collections (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('collection', collections, locked=locked, remove=True)
-
-
-class CountryMixin(EditTagsMixin):
-    """ Mixin for Plex objects that can have countries. """
-
-    def addCountry(self, countries, locked=True):
-        """ Add a country tag(s).
-
-            Parameters:
-                countries (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('country', countries, locked=locked)
-
-    def removeCountry(self, countries, locked=True):
-        """ Remove a country tag(s).
-
-            Parameters:
-                countries (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('country', countries, locked=locked, remove=True)
-
-
-class DirectorMixin(EditTagsMixin):
-    """ Mixin for Plex objects that can have directors. """
-
-    def addDirector(self, directors, locked=True):
-        """ Add a director tag(s).
-
-            Parameters:
-                directors (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('director', directors, locked=locked)
-
-    def removeDirector(self, directors, locked=True):
-        """ Remove a director tag(s).
-
-            Parameters:
-                directors (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('director', directors, locked=locked, remove=True)
-
-
-class GenreMixin(EditTagsMixin):
-    """ Mixin for Plex objects that can have genres. """
-
-    def addGenre(self, genres, locked=True):
-        """ Add a genre tag(s).
-
-            Parameters:
-                genres (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('genre', genres, locked=locked)
-
-    def removeGenre(self, genres, locked=True):
-        """ Remove a genre tag(s).
-
-            Parameters:
-                genres (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('genre', genres, locked=locked, remove=True)
-
-
-class LabelMixin(EditTagsMixin):
-    """ Mixin for Plex objects that can have labels. """
-
-    def addLabel(self, labels, locked=True):
-        """ Add a label tag(s).
-
-            Parameters:
-                labels (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('label', labels, locked=locked)
-
-    def removeLabel(self, labels, locked=True):
-        """ Remove a label tag(s).
-
-            Parameters:
-                labels (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('label', labels, locked=locked, remove=True)
-
-
-class MoodMixin(EditTagsMixin):
-    """ Mixin for Plex objects that can have moods. """
-
-    def addMood(self, moods, locked=True):
-        """ Add a mood tag(s).
-
-            Parameters:
-                moods (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('mood', moods, locked=locked)
-
-    def removeMood(self, moods, locked=True):
-        """ Remove a mood tag(s).
-
-            Parameters:
-                moods (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('mood', moods, locked=locked, remove=True)
-
-
-class ProducerMixin(EditTagsMixin):
-    """ Mixin for Plex objects that can have producers. """
-
-    def addProducer(self, producers, locked=True):
-        """ Add a producer tag(s).
-
-            Parameters:
-                producers (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('producer', producers, locked=locked)
-
-    def removeProducer(self, producers, locked=True):
-        """ Remove a producer tag(s).
-
-            Parameters:
-                producers (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('producer', producers, locked=locked, remove=True)
-
-
-class SimilarArtistMixin(EditTagsMixin):
-    """ Mixin for Plex objects that can have similar artists. """
-
-    def addSimilarArtist(self, artists, locked=True):
-        """ Add a similar artist tag(s).
-
-            Parameters:
-                artists (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('similar', artists, locked=locked)
-
-    def removeSimilarArtist(self, artists, locked=True):
-        """ Remove a similar artist tag(s).
-
-            Parameters:
-                artists (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('similar', artists, locked=locked, remove=True)
-
-
-class StyleMixin(EditTagsMixin):
-    """ Mixin for Plex objects that can have styles. """
-
-    def addStyle(self, styles, locked=True):
-        """ Add a style tag(s).
-
-            Parameters:
-                styles (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('style', styles, locked=locked)
-
-    def removeStyle(self, styles, locked=True):
-        """ Remove a style tag(s).
-
-            Parameters:
-                styles (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('style', styles, locked=locked, remove=True)
-
-
-class TagMixin(EditTagsMixin):
-    """ Mixin for Plex objects that can have tags. """
-
-    def addTag(self, tags, locked=True):
-        """ Add a tag(s).
-
-            Parameters:
-                tags (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('tag', tags, locked=locked)
-
-    def removeTag(self, tags, locked=True):
-        """ Remove a tag(s).
-
-            Parameters:
-                tags (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('tag', tags, locked=locked, remove=True)
-
-
-class WriterMixin(EditTagsMixin):
-    """ Mixin for Plex objects that can have writers. """
-
-    def addWriter(self, writers, locked=True):
-        """ Add a writer tag(s).
-
-            Parameters:
-                writers (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('writer', writers, locked=locked)
-
-    def removeWriter(self, writers, locked=True):
-        """ Remove a writer tag(s).
-
-            Parameters:
-                writers (List<str> or List<:class:`~plexapi.media.MediaTag`>): List of tags.
-                locked (bool): True (default) to lock the field, False to unlock the field.
-        """
-        return self.editTags('writer', writers, locked=locked, remove=True)
-
-
-class WatchlistMixin:
-    """ Mixin for Plex objects that can be added to a user's watchlist. """
-
-    def onWatchlist(self, account=None):
-        """ Returns True if the item is on the user's watchlist.
-            Also see :func:`~plexapi.myplex.MyPlexAccount.onWatchlist`.
-
-            Parameters:
-                account (:class:`~plexapi.myplex.MyPlexAccount`, optional): Account to check item on the watchlist.
-                   Note: This is required if you are not connected to a Plex server instance using the admin account.
-        """
-        try:
-            account = account or self._server.myPlexAccount()
-        except AttributeError:
-            account = self._server
-        return account.onWatchlist(self)
-
-    def addToWatchlist(self, account=None):
-        """ Add this item to the specified user's watchlist.
-            Also see :func:`~plexapi.myplex.MyPlexAccount.addToWatchlist`.
-
-            Parameters:
-                account (:class:`~plexapi.myplex.MyPlexAccount`, optional): Account to add item to the watchlist.
-                   Note: This is required if you are not connected to a Plex server instance using the admin account.
-        """
-        try:
-            account = account or self._server.myPlexAccount()
-        except AttributeError:
-            account = self._server
-        account.addToWatchlist(self)
-        return self
-
-    def removeFromWatchlist(self, account=None):
-        """ Remove this item from the specified user's watchlist.
-            Also see :func:`~plexapi.myplex.MyPlexAccount.removeFromWatchlist`.
-
-            Parameters:
-                account (:class:`~plexapi.myplex.MyPlexAccount`, optional): Account to remove item from the watchlist.
-                   Note: This is required if you are not connected to a Plex server instance using the admin account.
-        """
-        try:
-            account = account or self._server.myPlexAccount()
-        except AttributeError:
-            account = self._server
-        account.removeFromWatchlist(self)
-        return self
-
-    def streamingServices(self, account=None):
-        """ Return a list of :class:`~plexapi.media.Availability`
-            objects for the available streaming services for this item.
-
-            Parameters:
-                account (:class:`~plexapi.myplex.MyPlexAccount`, optional): Account used to retrieve availability.
-                   Note: This is required if you are not connected to a Plex server instance using the admin account.
-        """
-        try:
-            account = account or self._server.myPlexAccount()
-        except AttributeError:
-            account = self._server
-        ratingKey = self.guid.rsplit('/', 1)[-1]
-        data = account.query(f"{account.METADATA}/library/metadata/{ratingKey}/availabilities")
-        return self.findItems(data)
-
-
-class MovieEditMixins(
-    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
-    AddedAtMixin, AudienceRatingMixin, ContentRatingMixin, CriticRatingMixin, EditionTitleMixin,
-    OriginallyAvailableMixin, OriginalTitleMixin, SortTitleMixin,
-    StudioMixin, SummaryMixin, TaglineMixin, TitleMixin, UserRatingMixin,
-    CollectionMixin, CountryMixin, DirectorMixin, GenreMixin, LabelMixin, ProducerMixin, WriterMixin
-):
-    pass
-
-
-class ShowEditMixins(
-    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
-    AddedAtMixin, AudienceRatingMixin, ContentRatingMixin, CriticRatingMixin,
-    OriginallyAvailableMixin, OriginalTitleMixin, SortTitleMixin, StudioMixin,
-    SummaryMixin, TaglineMixin, TitleMixin, UserRatingMixin,
-    CollectionMixin, GenreMixin, LabelMixin,
-):
-    pass
-
-
-class SeasonEditMixins(
-    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
-    AddedAtMixin, AudienceRatingMixin, CriticRatingMixin,
-    SummaryMixin, TitleMixin, UserRatingMixin,
-    CollectionMixin, LabelMixin
-):
-    pass
-
-
-class EpisodeEditMixins(
-    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
-    AddedAtMixin, AudienceRatingMixin, ContentRatingMixin, CriticRatingMixin,
-    OriginallyAvailableMixin, SortTitleMixin, SummaryMixin, TitleMixin, UserRatingMixin,
-    CollectionMixin, DirectorMixin, LabelMixin, WriterMixin
-):
-    pass
-
-
-class ArtistEditMixins(
-    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
-    AddedAtMixin, AudienceRatingMixin, CriticRatingMixin,
-    SortTitleMixin, SummaryMixin, TitleMixin, UserRatingMixin,
-    CollectionMixin, CountryMixin, GenreMixin, LabelMixin, MoodMixin, SimilarArtistMixin, StyleMixin
-):
-    pass
-
-
-class AlbumEditMixins(
-    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
-    AddedAtMixin, AudienceRatingMixin, CriticRatingMixin,
-    OriginallyAvailableMixin, SortTitleMixin, StudioMixin, SummaryMixin, TitleMixin, UserRatingMixin,
-    CollectionMixin, GenreMixin, LabelMixin, MoodMixin, StyleMixin
-):
-    pass
-
-
-class TrackEditMixins(
-    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
-    AddedAtMixin, AudienceRatingMixin, CriticRatingMixin,
-    TitleMixin, TrackArtistMixin, TrackNumberMixin, TrackDiscNumberMixin, UserRatingMixin,
-    CollectionMixin, GenreMixin, LabelMixin, MoodMixin
-):
-    pass
-
-
-class PhotoalbumEditMixins(
-    ArtLockMixin, PosterLockMixin,
-    AddedAtMixin, SortTitleMixin, SummaryMixin, TitleMixin, UserRatingMixin
-):
-    pass
-
-
-class PhotoEditMixins(
-    ArtLockMixin, PosterLockMixin,
-    AddedAtMixin, PhotoCapturedTimeMixin, SortTitleMixin, SummaryMixin, TitleMixin, UserRatingMixin,
-    TagMixin
-):
-    pass
-
-
-class CollectionEditMixins(
-    ArtLockMixin, PosterLockMixin, ThemeLockMixin,
-    AddedAtMixin, AudienceRatingMixin, ContentRatingMixin, CriticRatingMixin,
-    SortTitleMixin, SummaryMixin, TitleMixin, UserRatingMixin,
-    LabelMixin
-):
-    pass
-
-
-class PlaylistEditMixins(
-    ArtLockMixin, PosterLockMixin,
-    SortTitleMixin, SummaryMixin, TitleMixin
-):
-    pass
diff --git a/lib/plexapi/myplex.py b/lib/plexapi/myplex.py
deleted file mode 100644
index 411d5618..00000000
--- a/lib/plexapi/myplex.py
+++ /dev/null
@@ -1,2062 +0,0 @@
-# -*- coding: utf-8 -*-
-import copy
-import html
-import threading
-import time
-from urllib.parse import parse_qsl, urlencode, urlsplit, urlunsplit
-
-import requests
-
-from plexapi import (BASE_HEADERS, CONFIG, TIMEOUT, X_PLEX_ENABLE_FAST_CONNECT, X_PLEX_IDENTIFIER,
-                     log, logfilter, utils)
-from plexapi.base import PlexObject, cached_data_property
-from plexapi.client import PlexClient
-from plexapi.exceptions import BadRequest, NotFound, Unauthorized, TwoFactorRequired
-from plexapi.library import LibrarySection
-from plexapi.server import PlexServer
-from plexapi.sonos import PlexSonosClient
-from plexapi.sync import SyncItem, SyncList
-from requests.status_codes import _codes as codes
-
-
-class MyPlexAccount(PlexObject):
-    """ MyPlex account and profile information. This object represents the data found Account on
-        the myplex.tv servers at the url https://plex.tv/api/v2/user. You may create this object
-        directly by passing in your username & password (or token). There is also a convenience
-        method provided at :class:`~plexapi.server.PlexServer.myPlexAccount()` which will create
-        and return this object.
-
-        Parameters:
-            username (str): Plex login username if not using a token.
-            password (str): Plex login password if not using a token.
-            token (str): Plex authentication token instead of username and password.
-            session (requests.Session, optional): Use your own session object if you want to
-                cache the http responses from PMS.
-            timeout (int): timeout in seconds on initial connect to myplex (default config.TIMEOUT).
-            code (str): Two-factor authentication code to use when logging in with username and password.
-            remember (bool): Remember the account token for 14 days (Default True).
-
-        Attributes:
-            key (str): 'https://plex.tv/api/v2/user'
-            adsConsent (str): Unknown.
-            adsConsentReminderAt (str): Unknown.
-            adsConsentSetAt (str): Unknown.
-            anonymous (str): Unknown.
-            authToken (str): The account token.
-            backupCodesCreated (bool): If the two-factor authentication backup codes have been created.
-            confirmed (bool): If the account has been confirmed.
-            country (str): The account country.
-            email (str): The account email address.
-            emailOnlyAuth (bool): If login with email only is enabled.
-            experimentalFeatures (bool): If experimental features are enabled.
-            friendlyName (str): Your account full name.
-            entitlements (List<str>): List of devices your allowed to use with this account.
-            guest (bool): If the account is a Plex Home guest user.
-            hasPassword (bool): If the account has a password.
-            home (bool): If the account is a Plex Home user.
-            homeAdmin (bool): If the account is the Plex Home admin.
-            homeSize (int): The number of accounts in the Plex Home.
-            id (int): The Plex account ID.
-            joinedAt (datetime): Date the account joined Plex.
-            locale (str): the account locale
-            mailingListActive (bool): If you are subscribed to the Plex newsletter.
-            mailingListStatus (str): Your current mailing list status.
-            maxHomeSize (int): The maximum number of accounts allowed in the Plex Home.
-            pin (str): The hashed Plex Home PIN.
-            profileAutoSelectAudio (bool): If the account has automatically select audio and subtitle tracks enabled.
-            profileDefaultAudioLanguage (str): The preferred audio language for the account.
-            profileDefaultSubtitleLanguage (str): The preferred subtitle language for the account.
-            profileAutoSelectSubtitle (int): The auto-select subtitle mode
-                (0 = Manually selected, 1 = Shown with foreign audio, 2 = Always enabled).
-            profileDefaultSubtitleAccessibility (int): The subtitles for the deaf or hard-of-hearing (SDH) searches mode
-                (0 = Prefer non-SDH subtitles, 1 = Prefer SDH subtitles, 2 = Only show SDH subtitles,
-                3 = Only shown non-SDH subtitles).
-            profileDefaultSubtitleForced (int): The forced subtitles searches mode
-                (0 = Prefer non-forced subtitles, 1 = Prefer forced subtitles, 2 = Only show forced subtitles,
-                3 = Only show non-forced subtitles).
-            protected (bool): If the account has a Plex Home PIN enabled.
-            rememberExpiresAt (datetime): Date the token expires.
-            restricted (bool): If the account is a Plex Home managed user.
-            roles: (List<str>) Lit of account roles. Plexpass membership listed here.
-            scrobbleTypes (List<int>): Unknown.
-            subscriptionActive (bool): If the account's Plex Pass subscription is active.
-            subscriptionDescription (str): Description of the Plex Pass subscription.
-            subscriptionFeatures: (List<str>) List of features allowed on your Plex Pass subscription.
-            subscriptionPaymentService (str): Payment service used for your Plex Pass subscription.
-            subscriptionPlan (str): Name of Plex Pass subscription plan.
-            subscriptionStatus (str): String representation of ``subscriptionActive``.
-            subscriptionSubscribedAt (datetime): Date the account subscribed to Plex Pass.
-            thumb (str): URL of the account thumbnail.
-            title (str): The title of the account (username or friendly name).
-            twoFactorEnabled (bool): If two-factor authentication is enabled.
-            username (str): The account username.
-            uuid (str): The account UUID.
-    """
-    FRIENDINVITE = 'https://plex.tv/api/servers/{machineId}/shared_servers'                     # post with data
-    HOMEUSERS = 'https://plex.tv/api/home/users'
-    HOMEUSERCREATE = 'https://plex.tv/api/home/users?title={title}'                             # post with data
-    EXISTINGUSER = 'https://plex.tv/api/home/users?invitedEmail={username}'                     # post with data
-    FRIENDSERVERS = 'https://plex.tv/api/servers/{machineId}/shared_servers/{serverId}'         # put with data
-    PLEXSERVERS = 'https://plex.tv/api/servers/{machineId}'                                     # get
-    FRIENDUPDATE = 'https://plex.tv/api/v2/sharings/{userId}'                                   # put with args, delete
-    HOMEUSER = 'https://plex.tv/api/home/users/{userId}'                                        # delete, put
-    MANAGEDHOMEUSER = 'https://plex.tv/api/v2/home/users/restricted/{userId}'                   # put
-    SIGNIN = 'https://plex.tv/api/v2/users/signin'                                              # post with auth
-    SIGNOUT = 'https://plex.tv/api/v2/users/signout'                                            # delete
-    WEBHOOKS = 'https://plex.tv/api/v2/user/webhooks'                                           # get, post with data
-    OPTOUTS = 'https://plex.tv/api/v2/user/{userUUID}/settings/opt_outs'                        # get
-    LINK = 'https://plex.tv/api/v2/pins/link'                                                   # put
-    VIEWSTATESYNC = 'https://plex.tv/api/v2/user/view_state_sync'                               # put
-    PING = 'https://plex.tv/api/v2/ping'
-    # Hub sections
-    VOD = 'https://vod.provider.plex.tv'                                                        # get
-    MUSIC = 'https://music.provider.plex.tv'                                                    # get
-    DISCOVER = 'https://discover.provider.plex.tv'
-    METADATA = 'https://metadata.provider.plex.tv'
-    key = 'https://plex.tv/api/v2/user'
-
-    def __init__(self, username=None, password=None, token=None, session=None, timeout=None, code=None, remember=True):
-        self._token = logfilter.add_secret(token or CONFIG.get('auth.server_token'))
-        self._session = session or requests.Session()
-        self._timeout = timeout or TIMEOUT
-        self._sonos_cache = []
-        self._sonos_cache_timestamp = 0
-        data, initpath = self._signin(username, password, code, remember, timeout)
-        super(MyPlexAccount, self).__init__(self, data, initpath)
-
-    def _signin(self, username, password, code, remember, timeout):
-        if self._token:
-            return self.query(self.key), self.key
-        payload = {
-            'login': username or CONFIG.get('auth.myplex_username'),
-            'password': password or CONFIG.get('auth.myplex_password'),
-            'rememberMe': remember
-        }
-        if code:
-            payload['verificationCode'] = code
-        data = self.query(self.SIGNIN, method=self._session.post, data=payload, timeout=timeout)
-        return data, self.SIGNIN
-
-    def signout(self):
-        """ Sign out of the Plex account. Invalidates the authentication token. """
-        return self.query(self.SIGNOUT, method=self._session.delete)
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self._token = logfilter.add_secret(data.attrib.get('authToken'))
-        self._webhooks = []
-
-        self.adsConsent = data.attrib.get('adsConsent')
-        self.adsConsentReminderAt = data.attrib.get('adsConsentReminderAt')
-        self.adsConsentSetAt = data.attrib.get('adsConsentSetAt')
-        self.anonymous = data.attrib.get('anonymous')
-        self.authToken = self._token
-        self.backupCodesCreated = utils.cast(bool, data.attrib.get('backupCodesCreated'))
-        self.confirmed = utils.cast(bool, data.attrib.get('confirmed'))
-        self.country = data.attrib.get('country')
-        self.email = data.attrib.get('email')
-        self.emailOnlyAuth = utils.cast(bool, data.attrib.get('emailOnlyAuth'))
-        self.experimentalFeatures = utils.cast(bool, data.attrib.get('experimentalFeatures'))
-        self.friendlyName = data.attrib.get('friendlyName')
-        self.guest = utils.cast(bool, data.attrib.get('guest'))
-        self.hasPassword = utils.cast(bool, data.attrib.get('hasPassword'))
-        self.home = utils.cast(bool, data.attrib.get('home'))
-        self.homeAdmin = utils.cast(bool, data.attrib.get('homeAdmin'))
-        self.homeSize = utils.cast(int, data.attrib.get('homeSize'))
-        self.id = utils.cast(int, data.attrib.get('id'))
-        self.joinedAt = utils.toDatetime(data.attrib.get('joinedAt'))
-        self.locale = data.attrib.get('locale')
-        self.mailingListActive = utils.cast(bool, data.attrib.get('mailingListActive'))
-        self.mailingListStatus = data.attrib.get('mailingListStatus')
-        self.maxHomeSize = utils.cast(int, data.attrib.get('maxHomeSize'))
-        self.pin = data.attrib.get('pin')
-        self.protected = utils.cast(bool, data.attrib.get('protected'))
-        self.rememberExpiresAt = utils.toDatetime(data.attrib.get('rememberExpiresAt'))
-        self.restricted = utils.cast(bool, data.attrib.get('restricted'))
-        self.scrobbleTypes = [utils.cast(int, x) for x in data.attrib.get('scrobbleTypes').split(',')]
-        self.thumb = data.attrib.get('thumb')
-        self.title = data.attrib.get('title')
-        self.twoFactorEnabled = utils.cast(bool, data.attrib.get('twoFactorEnabled'))
-        self.username = data.attrib.get('username')
-        self.uuid = data.attrib.get('uuid')
-
-        subscription = data.find('subscription')
-        self.subscriptionActive = utils.cast(bool, subscription.attrib.get('active'))
-        self.subscriptionDescription = data.attrib.get('subscriptionDescription')
-        self.subscriptionPaymentService = subscription.attrib.get('paymentService')
-        self.subscriptionPlan = subscription.attrib.get('plan')
-        self.subscriptionStatus = subscription.attrib.get('status')
-        self.subscriptionSubscribedAt = utils.toDatetime(
-            subscription.attrib.get('subscribedAt') or None, '%Y-%m-%d %H:%M:%S %Z'
-        )
-
-        profile = data.find('profile')
-        self.profileAutoSelectAudio = utils.cast(bool, profile.attrib.get('autoSelectAudio'))
-        self.profileDefaultAudioLanguage = profile.attrib.get('defaultAudioLanguage')
-        self.profileDefaultSubtitleLanguage = profile.attrib.get('defaultSubtitleLanguage')
-        self.profileAutoSelectSubtitle = utils.cast(int, profile.attrib.get('autoSelectSubtitle'))
-        self.profileDefaultSubtitleAccessibility = utils.cast(int, profile.attrib.get('defaultSubtitleAccessibility'))
-        self.profileDefaultSubtitleForces = utils.cast(int, profile.attrib.get('defaultSubtitleForces'))
-
-        # TODO: Fetch missing MyPlexAccount services
-        self.services = None
-
-    @cached_data_property
-    def subscriptionFeatures(self):
-        subscription = self._data.find('subscription')
-        return self.listAttrs(subscription, 'id', rtag='features', etag='feature')
-
-    @cached_data_property
-    def entitlements(self):
-        return self.listAttrs(self._data, 'id', rtag='entitlements', etag='entitlement')
-
-    @cached_data_property
-    def roles(self):
-        return self.listAttrs(self._data, 'id', rtag='roles', etag='role')
-
-    @property
-    def authenticationToken(self):
-        """ Returns the authentication token for the account. Alias for ``authToken``. """
-        return self.authToken
-
-    def _reload(self, **kwargs):
-        """ Perform the actual reload. """
-        data = self.query(self.key)
-        self._invalidateCacheAndLoadData(data)
-        return self
-
-    def _headers(self, **kwargs):
-        """ Returns dict containing base headers for all requests to the server. """
-        headers = BASE_HEADERS.copy()
-        if self._token:
-            headers['X-Plex-Token'] = self._token
-        headers.update(kwargs)
-        return headers
-
-    def query(self, url, method=None, headers=None, timeout=None, **kwargs):
-        method = method or self._session.get
-        timeout = timeout or self._timeout
-        log.debug('%s %s %s', method.__name__.upper(), url, kwargs.get('json', ''))
-        headers = self._headers(**headers or {})
-        response = method(url, headers=headers, timeout=timeout, **kwargs)
-        if response.status_code not in (200, 201, 204):  # pragma: no cover
-            codename = codes.get(response.status_code)[0]
-            errtext = response.text.replace('\n', ' ')
-            message = f'({response.status_code}) {codename}; {response.url} {errtext}'
-            if response.status_code == 401:
-                if "verification code" in response.text:
-                    raise TwoFactorRequired(message)
-                raise Unauthorized(message)
-            elif response.status_code == 404:
-                raise NotFound(message)
-            elif response.status_code == 422 and "Invalid token" in response.text:
-                raise Unauthorized(message)
-            else:
-                raise BadRequest(message)
-        if 'application/json' in response.headers.get('Content-Type', ''):
-            return response.json()
-        elif 'text/plain' in response.headers.get('Content-Type', ''):
-            return response.text.strip()
-        return utils.parseXMLString(response.text)
-
-    def ping(self):
-        """ Ping the Plex.tv API.
-            This will refresh the authentication token to prevent it from expiring.
-        """
-        pong = self.query(self.PING)
-        if pong is not None:
-            return utils.cast(bool, pong.text)
-        return False
-
-    def device(self, name=None, clientId=None):
-        """ Returns the :class:`~plexapi.myplex.MyPlexDevice` that matches the name specified.
-
-            Parameters:
-                name (str): Name to match against.
-                clientId (str): clientIdentifier to match against.
-        """
-        for device in self.devices():
-            if (name and device.name.lower() == name.lower() or device.clientIdentifier == clientId):
-                return device
-        raise NotFound(f'Unable to find device {name}')
-
-    def devices(self):
-        """ Returns a list of all :class:`~plexapi.myplex.MyPlexDevice` objects connected to the server. """
-        data = self.query(MyPlexDevice.key)
-        return [MyPlexDevice(self, elem) for elem in data]
-
-    def resource(self, name):
-        """ Returns the :class:`~plexapi.myplex.MyPlexResource` that matches the name specified.
-
-            Parameters:
-                name (str): Name  or machine identifier to match against.
-        """
-        for resource in self.resources():
-            if resource.name.lower() == name.lower() or resource.clientIdentifier == name:
-                return resource
-        raise NotFound(f'Unable to find resource {name}')
-
-    def resources(self):
-        """ Returns a list of all :class:`~plexapi.myplex.MyPlexResource` objects connected to the server. """
-        data = self.query(MyPlexResource.key)
-        return [MyPlexResource(self, elem) for elem in data]
-
-    def sonos_speakers(self):
-        if 'companions_sonos' not in self.subscriptionFeatures:
-            return []
-
-        t = time.time()
-        if t - self._sonos_cache_timestamp > 5:
-            self._sonos_cache_timestamp = t
-            data = self.query('https://sonos.plex.tv/resources')
-            self._sonos_cache = [PlexSonosClient(self, elem) for elem in data]
-
-        return self._sonos_cache
-
-    def sonos_speaker(self, name):
-        return next((x for x in self.sonos_speakers() if x.title.split("+")[0].strip() == name), None)
-
-    def sonos_speaker_by_id(self, identifier):
-        return next((x for x in self.sonos_speakers() if x.machineIdentifier.startswith(identifier)), None)
-
-    def inviteFriend(self, user, server, sections=None, allowSync=False, allowCameraUpload=False,
-                     allowChannels=False, filterMovies=None, filterTelevision=None, filterMusic=None):
-        """ Share library content with the specified user.
-
-            Parameters:
-                user (:class:`~plexapi.myplex.MyPlexUser`): `MyPlexUser` object, username, or email
-                    of the user to be added.
-                server (:class:`~plexapi.server.PlexServer`): `PlexServer` object, or machineIdentifier
-                    containing the library sections to share.
-                sections (List<:class:`~plexapi.library.LibrarySection`>): List of `LibrarySection` objects, or names
-                    to be shared (default None). `sections` must be defined in order to update shared libraries.
-                allowSync (Bool): Set True to allow user to sync content.
-                allowCameraUpload (Bool): Set True to allow user to upload photos.
-                allowChannels (Bool): Set True to allow user to utilize installed channels.
-                filterMovies (Dict): Dict containing key 'contentRating' and/or 'label' each set to a list of
-                    values to be filtered. ex: `{'contentRating':['G'], 'label':['foo']}`
-                filterTelevision (Dict): Dict containing key 'contentRating' and/or 'label' each set to a list of
-                    values to be filtered. ex: `{'contentRating':['G'], 'label':['foo']}`
-                filterMusic (Dict): Dict containing key 'label' set to a list of values to be filtered.
-                    ex: `{'label':['foo']}`
-        """
-        username = user.username if isinstance(user, MyPlexUser) else user
-        machineId = server.machineIdentifier if isinstance(server, PlexServer) else server
-        sectionIds = self._getSectionIds(machineId, sections)
-        params = {
-            'server_id': machineId,
-            'shared_server': {'library_section_ids': sectionIds, 'invited_email': username},
-            'sharing_settings': {
-                'allowSync': ('1' if allowSync else '0'),
-                'allowCameraUpload': ('1' if allowCameraUpload else '0'),
-                'allowChannels': ('1' if allowChannels else '0'),
-                'filterMovies': self._filterDictToStr(filterMovies or {}),
-                'filterTelevision': self._filterDictToStr(filterTelevision or {}),
-                'filterMusic': self._filterDictToStr(filterMusic or {}),
-            },
-        }
-        headers = {'Content-Type': 'application/json'}
-        url = self.FRIENDINVITE.format(machineId=machineId)
-        return self.query(url, self._session.post, json=params, headers=headers)
-
-    def createHomeUser(self, user, server, sections=None, allowSync=False, allowCameraUpload=False,
-                       allowChannels=False, filterMovies=None, filterTelevision=None, filterMusic=None):
-        """ Share library content with the specified user.
-
-            Parameters:
-                user (:class:`~plexapi.myplex.MyPlexUser`): `MyPlexUser` object, username, or email
-                    of the user to be added.
-                server (:class:`~plexapi.server.PlexServer`): `PlexServer` object, or machineIdentifier
-                    containing the library sections to share.
-                sections (List<:class:`~plexapi.library.LibrarySection`>): List of `LibrarySection` objects, or names
-                    to be shared (default None). `sections` must be defined in order to update shared libraries.
-                allowSync (Bool): Set True to allow user to sync content.
-                allowCameraUpload (Bool): Set True to allow user to upload photos.
-                allowChannels (Bool): Set True to allow user to utilize installed channels.
-                filterMovies (Dict): Dict containing key 'contentRating' and/or 'label' each set to a list of
-                    values to be filtered. ex: `{'contentRating':['G'], 'label':['foo']}`
-                filterTelevision (Dict): Dict containing key 'contentRating' and/or 'label' each set to a list of
-                    values to be filtered. ex: `{'contentRating':['G'], 'label':['foo']}`
-                filterMusic (Dict): Dict containing key 'label' set to a list of values to be filtered.
-                    ex: `{'label':['foo']}`
-        """
-        machineId = server.machineIdentifier if isinstance(server, PlexServer) else server
-        sectionIds = self._getSectionIds(server, sections)
-
-        headers = {'Content-Type': 'application/json'}
-        url = self.HOMEUSERCREATE.format(title=user)
-        # UserID needs to be created and referenced when adding sections
-        user_creation = self.query(url, self._session.post, headers=headers)
-        userIds = {}
-        for elem in user_creation.findall("."):
-            # Find userID
-            userIds['id'] = elem.attrib.get('id')
-        log.debug(userIds)
-        params = {
-            'server_id': machineId,
-            'shared_server': {'library_section_ids': sectionIds, 'invited_id': userIds['id']},
-            'sharing_settings': {
-                'allowSync': ('1' if allowSync else '0'),
-                'allowCameraUpload': ('1' if allowCameraUpload else '0'),
-                'allowChannels': ('1' if allowChannels else '0'),
-                'filterMovies': self._filterDictToStr(filterMovies or {}),
-                'filterTelevision': self._filterDictToStr(filterTelevision or {}),
-                'filterMusic': self._filterDictToStr(filterMusic or {}),
-            },
-        }
-        url = self.FRIENDINVITE.format(machineId=machineId)
-        library_assignment = self.query(url, self._session.post, json=params, headers=headers)
-        return user_creation, library_assignment
-
-    def createExistingUser(self, user, server, sections=None, allowSync=False, allowCameraUpload=False,
-                           allowChannels=False, filterMovies=None, filterTelevision=None, filterMusic=None):
-        """ Share library content with the specified user.
-
-            Parameters:
-                user (:class:`~plexapi.myplex.MyPlexUser`): `MyPlexUser` object, username, or email
-                    of the user to be added.
-                server (:class:`~plexapi.server.PlexServer`): `PlexServer` object, or machineIdentifier
-                    containing the library sections to share.
-                sections (List<:class:`~plexapi.library.LibrarySection`>): List of `LibrarySection` objects, or names
-                    to be shared (default None). `sections` must be defined in order to update shared libraries.
-                allowSync (Bool): Set True to allow user to sync content.
-                allowCameraUpload (Bool): Set True to allow user to upload photos.
-                allowChannels (Bool): Set True to allow user to utilize installed channels.
-                filterMovies (Dict): Dict containing key 'contentRating' and/or 'label' each set to a list of
-                    values to be filtered. ex: `{'contentRating':['G'], 'label':['foo']}`
-                filterTelevision (Dict): Dict containing key 'contentRating' and/or 'label' each set to a list of
-                    values to be filtered. ex: `{'contentRating':['G'], 'label':['foo']}`
-                filterMusic (Dict): Dict containing key 'label' set to a list of values to be filtered.
-                    ex: `{'label':['foo']}`
-        """
-        headers = {'Content-Type': 'application/json'}
-        # If user already exists, carry over sections and settings.
-        if isinstance(user, MyPlexUser):
-            username = user.username
-        elif user in [_user.username for _user in self.users()]:
-            username = self.user(user).username
-        else:
-            # If user does not already exists, treat request as new request and include sections and settings.
-            newUser = user
-            url = self.EXISTINGUSER.format(username=newUser)
-            user_creation = self.query(url, self._session.post, headers=headers)
-            machineId = server.machineIdentifier if isinstance(server, PlexServer) else server
-            sectionIds = self._getSectionIds(server, sections)
-            params = {
-                'server_id': machineId,
-                'shared_server': {'library_section_ids': sectionIds, 'invited_email': newUser},
-                'sharing_settings': {
-                    'allowSync': ('1' if allowSync else '0'),
-                    'allowCameraUpload': ('1' if allowCameraUpload else '0'),
-                    'allowChannels': ('1' if allowChannels else '0'),
-                    'filterMovies': self._filterDictToStr(filterMovies or {}),
-                    'filterTelevision': self._filterDictToStr(filterTelevision or {}),
-                    'filterMusic': self._filterDictToStr(filterMusic or {}),
-                },
-            }
-            url = self.FRIENDINVITE.format(machineId=machineId)
-            library_assignment = self.query(url, self._session.post, json=params, headers=headers)
-            return user_creation, library_assignment
-
-        url = self.EXISTINGUSER.format(username=username)
-        return self.query(url, self._session.post, headers=headers)
-
-    def removeFriend(self, user):
-        """ Remove the specified user from your friends.
-
-            Parameters:
-                user (:class:`~plexapi.myplex.MyPlexUser` or str): :class:`~plexapi.myplex.MyPlexUser`,
-                    username, or email of the user to be removed.
-        """
-        user = user if isinstance(user, MyPlexUser) else self.user(user)
-        url = self.FRIENDUPDATE.format(userId=user.id)
-        return self.query(url, self._session.delete)
-
-    def removeHomeUser(self, user):
-        """ Remove the specified user from your home users.
-
-            Parameters:
-                user (:class:`~plexapi.myplex.MyPlexUser` or str): :class:`~plexapi.myplex.MyPlexUser`,
-                    username, or email of the user to be removed.
-        """
-        user = user if isinstance(user, MyPlexUser) else self.user(user)
-        url = self.HOMEUSER.format(userId=user.id)
-        return self.query(url, self._session.delete)
-
-    def switchHomeUser(self, user, pin=None):
-        """ Returns a new :class:`~plexapi.myplex.MyPlexAccount` object switched to the given home user.
-
-            Parameters:
-                user (:class:`~plexapi.myplex.MyPlexUser` or str): :class:`~plexapi.myplex.MyPlexUser`,
-                    username, or email of the home user to switch to.
-                pin (str): PIN for the home user (required if the home user has a PIN set).
-
-            Example:
-
-                .. code-block:: python
-
-                    from plexapi.myplex import MyPlexAccount
-                    # Login to a Plex Home account
-                    account = MyPlexAccount('<USERNAME>', '<PASSWORD>')
-                    # Switch to a different Plex Home user
-                    userAccount = account.switchHomeUser('Username')
-
-        """
-        user = user if isinstance(user, MyPlexUser) else self.user(user)
-        url = f'{self.HOMEUSERS}/{user.id}/switch'
-        params = {}
-        if pin:
-            params['pin'] = pin
-        data = self.query(url, self._session.post, params=params)
-        userToken = data.attrib.get('authenticationToken')
-        return MyPlexAccount(token=userToken, session=self._session)
-
-    def setPin(self, newPin, currentPin=None):
-        """ Set a new Plex Home PIN for the account.
-
-            Parameters:
-                newPin (str): New PIN to set for the account.
-                currentPin (str): Current PIN for the account (required to change the PIN).
-        """
-        url = self.HOMEUSER.format(userId=self.id)
-        params = {'pin': newPin}
-        if currentPin:
-            params['currentPin'] = currentPin
-        return self.query(url, self._session.put, params=params)
-
-    def removePin(self, currentPin):
-        """ Remove the Plex Home PIN for the account.
-
-            Parameters:
-                currentPin (str): Current PIN for the account (required to remove the PIN).
-        """
-        return self.setPin('', currentPin)
-
-    def setManagedUserPin(self, user, newPin):
-        """ Set a new Plex Home PIN for a managed home user. This must be done from the Plex Home admin account.
-
-            Parameters:
-                user (:class:`~plexapi.myplex.MyPlexUser` or str): :class:`~plexapi.myplex.MyPlexUser`
-                    or username of the managed home user.
-                newPin (str): New PIN to set for the managed home user.
-        """
-        user = user if isinstance(user, MyPlexUser) else self.user(user)
-        url = self.MANAGEDHOMEUSER.format(userId=user.id)
-        params = {'pin': newPin}
-        return self.query(url, self._session.post, params=params)
-
-    def removeManagedUserPin(self, user):
-        """ Remove the Plex Home PIN for a managed home user. This must be done from the Plex Home admin account.
-
-            Parameters:
-                user (:class:`~plexapi.myplex.MyPlexUser` or str): :class:`~plexapi.myplex.MyPlexUser`
-                    or username of the managed home user.
-        """
-        user = user if isinstance(user, MyPlexUser) else self.user(user)
-        url = self.MANAGEDHOMEUSER.format(userId=user.id)
-        params = {'removePin': 1}
-        return self.query(url, self._session.post, params=params)
-
-    def acceptInvite(self, user):
-        """ Accept a pending friend invite from the specified user.
-
-            Parameters:
-                user (:class:`~plexapi.myplex.MyPlexInvite` or str): :class:`~plexapi.myplex.MyPlexInvite`,
-                    username, or email of the friend invite to accept.
-        """
-        invite = user if isinstance(user, MyPlexInvite) else self.pendingInvite(user, includeSent=False)
-        params = {
-            'friend': int(invite.friend),
-            'home': int(invite.home),
-            'server': int(invite.server)
-        }
-        url = MyPlexInvite.REQUESTS + f'/{invite.id}' + utils.joinArgs(params)
-        return self.query(url, self._session.put)
-
-    def cancelInvite(self, user):
-        """ Cancel a pending firend invite for the specified user.
-
-            Parameters:
-                user (:class:`~plexapi.myplex.MyPlexInvite` or str): :class:`~plexapi.myplex.MyPlexInvite`,
-                    username, or email of the friend invite to cancel.
-        """
-        invite = user if isinstance(user, MyPlexInvite) else self.pendingInvite(user, includeReceived=False)
-        params = {
-            'friend': int(invite.friend),
-            'home': int(invite.home),
-            'server': int(invite.server)
-        }
-        url = MyPlexInvite.REQUESTED + f'/{invite.id}' + utils.joinArgs(params)
-        return self.query(url, self._session.delete)
-
-    def updateFriend(self, user, server, sections=None, removeSections=False, allowSync=None, allowCameraUpload=None,
-                     allowChannels=None, filterMovies=None, filterTelevision=None, filterMusic=None):
-        """ Update the specified user's share settings.
-
-            Parameters:
-                user (:class:`~plexapi.myplex.MyPlexUser`): `MyPlexUser` object, username, or email
-                    of the user to be updated.
-                server (:class:`~plexapi.server.PlexServer`): `PlexServer` object, or machineIdentifier
-                    containing the library sections to share.
-                sections (List<:class:`~plexapi.library.LibrarySection`>): List of `LibrarySection` objects, or names
-                    to be shared (default None). `sections` must be defined in order to update shared libraries.
-                removeSections (Bool): Set True to remove all shares. Supersedes sections.
-                allowSync (Bool): Set True to allow user to sync content.
-                allowCameraUpload (Bool): Set True to allow user to upload photos.
-                allowChannels (Bool): Set True to allow user to utilize installed channels.
-                filterMovies (Dict): Dict containing key 'contentRating' and/or 'label' each set to a list of
-                    values to be filtered. ex: `{'contentRating':['G'], 'label':['foo']}`
-                filterTelevision (Dict): Dict containing key 'contentRating' and/or 'label' each set to a list of
-                    values to be filtered. ex: `{'contentRating':['G'], 'label':['foo']}`
-                filterMusic (Dict): Dict containing key 'label' set to a list of values to be filtered.
-                    ex: `{'label':['foo']}`
-        """
-        # Update friend servers
-        response_filters = ''
-        response_servers = ''
-        user = user if isinstance(user, MyPlexUser) else self.user(user)
-        machineId = server.machineIdentifier if isinstance(server, PlexServer) else server
-        sectionIds = self._getSectionIds(machineId, sections)
-        headers = {'Content-Type': 'application/json'}
-        # Determine whether user has access to the shared server.
-        user_servers = [s for s in user.servers if s.machineIdentifier == machineId]
-        if user_servers and sectionIds:
-            serverId = user_servers[0].id
-            params = {'server_id': machineId, 'shared_server': {'library_section_ids': sectionIds}}
-            url = self.FRIENDSERVERS.format(machineId=machineId, serverId=serverId)
-        else:
-            params = {'server_id': machineId,
-                      'shared_server': {'library_section_ids': sectionIds, 'invited_id': user.id}}
-            url = self.FRIENDINVITE.format(machineId=machineId)
-        # Remove share sections, add shares to user without shares, or update shares
-        if not user_servers or sectionIds:
-            if removeSections is True:
-                response_servers = self.query(url, self._session.delete, json=params, headers=headers)
-            elif 'invited_id' in params.get('shared_server', ''):
-                response_servers = self.query(url, self._session.post, json=params, headers=headers)
-            else:
-                response_servers = self.query(url, self._session.put, json=params, headers=headers)
-        else:
-            log.warning('Section name, number of section object is required changing library sections')
-        # Update friend filters
-        url = self.FRIENDUPDATE.format(userId=user.id)
-        params = {}
-        if isinstance(allowSync, bool):
-            params['allowSync'] = '1' if allowSync else '0'
-        if isinstance(allowCameraUpload, bool):
-            params['allowCameraUpload'] = '1' if allowCameraUpload else '0'
-        if isinstance(allowChannels, bool):
-            params['allowChannels'] = '1' if allowChannels else '0'
-        if isinstance(filterMovies, dict):
-            params['filterMovies'] = self._filterDictToStr(filterMovies or {})  # '1' if allowChannels else '0'
-        if isinstance(filterTelevision, dict):
-            params['filterTelevision'] = self._filterDictToStr(filterTelevision or {})
-        if isinstance(allowChannels, dict):
-            params['filterMusic'] = self._filterDictToStr(filterMusic or {})
-        if params:
-            url += utils.joinArgs(params)
-            response_filters = self.query(url, self._session.put)
-        return response_servers, response_filters
-
-    def user(self, username):
-        """ Returns the :class:`~plexapi.myplex.MyPlexUser` that matches the specified username or email.
-
-            Parameters:
-                username (str): Username, email or id of the user to return.
-        """
-        username = str(username)
-        for user in self.users():
-            # Home users don't have email, username etc.
-            if username.lower() == user.title.lower():
-                return user
-
-            elif (user.username and user.email and user.id and username.lower() in
-                    (user.username.lower(), user.email.lower(), str(user.id))):
-                return user
-
-        raise NotFound(f'Unable to find user {username}')
-
-    def users(self):
-        """ Returns a list of all :class:`~plexapi.myplex.MyPlexUser` objects connected to your account.
-        """
-        elem = self.query(MyPlexUser.key)
-        return self.findItems(elem, cls=MyPlexUser)
-
-    def pendingInvite(self, username, includeSent=True, includeReceived=True):
-        """ Returns the :class:`~plexapi.myplex.MyPlexInvite` that matches the specified username or email.
-            Note: This can be a pending invite sent from your account or received to your account.
-
-            Parameters:
-                username (str): Username, email or id of the user to return.
-                includeSent (bool): True to include sent invites.
-                includeReceived (bool): True to include received invites.
-        """
-        username = str(username)
-        for invite in self.pendingInvites(includeSent, includeReceived):
-            if (invite.username and invite.email and invite.id and username.lower() in
-                    (invite.username.lower(), invite.email.lower(), str(invite.id))):
-                return invite
-
-        raise NotFound(f'Unable to find invite {username}')
-
-    def pendingInvites(self, includeSent=True, includeReceived=True):
-        """ Returns a list of all :class:`~plexapi.myplex.MyPlexInvite` objects connected to your account.
-            Note: This includes all pending invites sent from your account and received to your account.
-
-            Parameters:
-                includeSent (bool): True to include sent invites.
-                includeReceived (bool): True to include received invites.
-        """
-        invites = []
-        if includeSent:
-            elem = self.query(MyPlexInvite.REQUESTED)
-            invites += self.findItems(elem, cls=MyPlexInvite)
-        if includeReceived:
-            elem = self.query(MyPlexInvite.REQUESTS)
-            invites += self.findItems(elem, cls=MyPlexInvite)
-        return invites
-
-    def _getSectionIds(self, server, sections):
-        """ Converts a list of section objects or names to sectionIds needed for library sharing. """
-        if not sections: return []
-        # Get a list of all section ids for looking up each section.
-        allSectionIds = {}
-        machineIdentifier = server.machineIdentifier if isinstance(server, PlexServer) else server
-        url = self.PLEXSERVERS.format(machineId=machineIdentifier)
-        data = self.query(url, self._session.get)
-        for elem in data[0]:
-            _id = utils.cast(int, elem.attrib.get('id'))
-            _key = utils.cast(int, elem.attrib.get('key'))
-            _title = elem.attrib.get('title', '').lower()
-            allSectionIds[_id] = _id
-            allSectionIds[_key] = _id
-            allSectionIds[_title] = _id
-        log.debug(allSectionIds)
-        # Convert passed in section items to section ids from above lookup
-        sectionIds = []
-        for section in sections:
-            sectionKey = section.key if isinstance(section, LibrarySection) else section.lower()
-            sectionIds.append(allSectionIds[sectionKey])
-        return sectionIds
-
-    def _filterDictToStr(self, filterDict):
-        """ Converts friend filters to a string representation for transport. """
-        values = []
-        for key, vals in filterDict.items():
-            if key not in ('contentRating', 'label', 'contentRating!', 'label!'):
-                raise BadRequest(f'Unknown filter key: {key}')
-            values.append(f"{key}={'%2C'.join(vals)}")
-        return '|'.join(values)
-
-    def addWebhook(self, url):
-        # copy _webhooks and append url
-        urls = self._webhooks[:] + [url]
-        return self.setWebhooks(urls)
-
-    def deleteWebhook(self, url):
-        urls = copy.copy(self._webhooks)
-        if url not in urls:
-            raise BadRequest(f'Webhook does not exist: {url}')
-        urls.remove(url)
-        return self.setWebhooks(urls)
-
-    def setWebhooks(self, urls):
-        log.info('Setting webhooks: %s', urls)
-        data = {'urls[]': urls} if len(urls) else {'urls': ''}
-        data = self.query(self.WEBHOOKS, self._session.post, data=data)
-        self._webhooks = self.listAttrs(data, 'url', etag='webhook')
-        return self._webhooks
-
-    def webhooks(self):
-        data = self.query(self.WEBHOOKS)
-        self._webhooks = self.listAttrs(data, 'url', etag='webhook')
-        return self._webhooks
-
-    def optOut(self, playback=None, library=None):
-        """ Opt in or out of sharing stuff with plex.
-            See: https://www.plex.tv/about/privacy-legal/
-        """
-        params = {}
-        if playback is not None:
-            params['optOutPlayback'] = int(playback)
-        if library is not None:
-            params['optOutLibraryStats'] = int(library)
-        url = 'https://plex.tv/api/v2/user/privacy'
-        return self.query(url, method=self._session.put, data=params)
-
-    def syncItems(self, client=None, clientId=None):
-        """ Returns an instance of :class:`~plexapi.sync.SyncList` for specified client.
-
-            Parameters:
-                client (:class:`~plexapi.myplex.MyPlexDevice`): a client to query SyncItems for.
-                clientId (str): an identifier of a client to query SyncItems for.
-
-            If both `client` and `clientId` provided the client would be preferred.
-            If neither `client` nor `clientId` provided the clientId would be set to current clients's identifier.
-        """
-        if client:
-            clientId = client.clientIdentifier
-        elif clientId is None:
-            clientId = X_PLEX_IDENTIFIER
-
-        data = self.query(SyncList.key.format(clientId=clientId))
-
-        return SyncList(self, data)
-
-    def sync(self, sync_item, client=None, clientId=None):
-        """ Adds specified sync item for the client. It's always easier to use methods defined directly in the media
-            objects, e.g. :func:`~plexapi.video.Video.sync`, :func:`~plexapi.audio.Audio.sync`.
-
-            Parameters:
-                client (:class:`~plexapi.myplex.MyPlexDevice`): a client for which you need to add SyncItem to.
-                clientId (str): an identifier of a client for which you need to add SyncItem to.
-                sync_item (:class:`~plexapi.sync.SyncItem`): prepared SyncItem object with all fields set.
-
-            If both `client` and `clientId` provided the client would be preferred.
-            If neither `client` nor `clientId` provided the clientId would be set to current clients's identifier.
-
-            Returns:
-                :class:`~plexapi.sync.SyncItem`: an instance of created syncItem.
-
-            Raises:
-                :exc:`~plexapi.exceptions.BadRequest`: When client with provided clientId wasn't found.
-                :exc:`~plexapi.exceptions.BadRequest`: Provided client doesn't provides `sync-target`.
-        """
-        if not client and not clientId:
-            clientId = X_PLEX_IDENTIFIER
-
-        if not client:
-            for device in self.devices():
-                if device.clientIdentifier == clientId:
-                    client = device
-                    break
-
-            if not client:
-                raise BadRequest(f'Unable to find client by clientId={clientId}')
-
-        if 'sync-target' not in client.provides:
-            raise BadRequest("Received client doesn't provides sync-target")
-
-        params = {
-            'SyncItem[title]': sync_item.title,
-            'SyncItem[rootTitle]': sync_item.rootTitle,
-            'SyncItem[metadataType]': sync_item.metadataType,
-            'SyncItem[machineIdentifier]': sync_item.machineIdentifier,
-            'SyncItem[contentType]': sync_item.contentType,
-            'SyncItem[Policy][scope]': sync_item.policy.scope,
-            'SyncItem[Policy][unwatched]': str(int(sync_item.policy.unwatched)),
-            'SyncItem[Policy][value]': str(sync_item.policy.value if hasattr(sync_item.policy, 'value') else 0),
-            'SyncItem[Location][uri]': sync_item.location,
-            'SyncItem[MediaSettings][audioBoost]': str(sync_item.mediaSettings.audioBoost),
-            'SyncItem[MediaSettings][maxVideoBitrate]': str(sync_item.mediaSettings.maxVideoBitrate),
-            'SyncItem[MediaSettings][musicBitrate]': str(sync_item.mediaSettings.musicBitrate),
-            'SyncItem[MediaSettings][photoQuality]': str(sync_item.mediaSettings.photoQuality),
-            'SyncItem[MediaSettings][photoResolution]': sync_item.mediaSettings.photoResolution,
-            'SyncItem[MediaSettings][subtitleSize]': str(sync_item.mediaSettings.subtitleSize),
-            'SyncItem[MediaSettings][videoQuality]': str(sync_item.mediaSettings.videoQuality),
-            'SyncItem[MediaSettings][videoResolution]': sync_item.mediaSettings.videoResolution,
-        }
-
-        url = SyncList.key.format(clientId=client.clientIdentifier)
-        data = self.query(url, method=self._session.post, params=params)
-
-        return SyncItem(self, data, None, clientIdentifier=client.clientIdentifier)
-
-    def claimToken(self):
-        """ Returns a str, a new "claim-token", which you can use to register your new Plex Server instance to your
-            account.
-            See: https://hub.docker.com/r/plexinc/pms-docker/, https://www.plex.tv/claim/
-        """
-        response = self._session.get('https://plex.tv/api/claim/token.json', headers=self._headers(), timeout=TIMEOUT)
-        if response.status_code not in (200, 201, 204):  # pragma: no cover
-            codename = codes.get(response.status_code)[0]
-            errtext = response.text.replace('\n', ' ')
-            raise BadRequest(f'({response.status_code}) {codename} {response.url}; {errtext}')
-        return response.json()['token']
-
-    def history(self, maxresults=None, mindate=None):
-        """ Get Play History for all library sections on all servers for the owner.
-
-            Parameters:
-                maxresults (int): Only return the specified number of results (optional).
-                mindate (datetime): Min datetime to return results from.
-        """
-        servers = [x for x in self.resources() if x.provides == 'server' and x.owned]
-        hist = []
-        for server in servers:
-            conn = server.connect()
-            hist.extend(conn.history(maxresults=maxresults, mindate=mindate, accountID=1))
-        return hist
-
-    def onlineMediaSources(self):
-        """ Returns a list of user account Online Media Sources settings :class:`~plexapi.myplex.AccountOptOut`
-        """
-        url = self.OPTOUTS.format(userUUID=self.uuid)
-        elem = self.query(url)
-        return self.findItems(elem, cls=AccountOptOut, etag='optOut')
-
-    def videoOnDemand(self):
-        """ Returns a list of VOD Hub items :class:`~plexapi.library.Hub`
-        """
-        data = self.query(f'{self.VOD}/hubs')
-        return self.findItems(data)
-
-    def tidal(self):
-        """ Returns a list of tidal Hub items :class:`~plexapi.library.Hub`
-        """
-        data = self.query(f'{self.MUSIC}/hubs')
-        return self.findItems(data)
-
-    def watchlist(self, filter=None, sort=None, libtype=None, maxresults=None, **kwargs):
-        """ Returns a list of :class:`~plexapi.video.Movie` and :class:`~plexapi.video.Show` items in the user's watchlist.
-            Note: The objects returned are from Plex's online metadata. To get the matching item on a Plex server,
-            search for the media using the guid.
-
-            Parameters:
-                filter (str, optional): 'available' or 'released' to only return items that are available or released,
-                    otherwise return all items.
-                sort (str, optional): In the format ``field:dir``. Available fields are ``watchlistedAt`` (Added At),
-                    ``titleSort`` (Title), ``originallyAvailableAt`` (Release Date), or ``rating`` (Critic Rating).
-                    ``dir`` can be ``asc`` or ``desc``.
-                libtype (str, optional): 'movie' or 'show' to only return movies or shows, otherwise return all items.
-                maxresults (int, optional): Only return the specified number of results.
-                **kwargs (dict): Additional custom filters to apply to the search results.
-
-
-            Example:
-
-                .. code-block:: python
-
-                    # Watchlist for released movies sorted by critic rating in descending order
-                    watchlist = account.watchlist(filter='released', sort='rating:desc', libtype='movie')
-                    item = watchlist[0]  # First item in the watchlist
-
-                    # Search for the item on a Plex server
-                    result = plex.library.search(guid=item.guid, libtype=item.type)
-
-        """
-        params = {
-            'includeCollections': 1,
-            'includeExternalMedia': 1
-        }
-
-        if not filter:
-            filter = 'all'
-        if sort:
-            params['sort'] = sort
-        if libtype:
-            params['type'] = utils.searchType(libtype)
-
-        params.update(kwargs)
-
-        key = f'{self.METADATA}/library/sections/watchlist/{filter}{utils.joinArgs(params)}'
-        return self._toOnlineMetadata(self.fetchItems(key, maxresults=maxresults), **kwargs)
-
-    def onWatchlist(self, item):
-        """ Returns True if the item is on the user's watchlist.
-
-            Parameters:
-                item (:class:`~plexapi.video.Movie` or :class:`~plexapi.video.Show`): Item to check
-                    if it is on the user's watchlist.
-        """
-        return bool(self.userState(item).watchlistedAt)
-
-    def addToWatchlist(self, items):
-        """ Add media items to the user's watchlist
-
-            Parameters:
-                items (List): List of :class:`~plexapi.video.Movie` or :class:`~plexapi.video.Show`
-                    objects to be added to the watchlist.
-
-            Raises:
-                :exc:`~plexapi.exceptions.BadRequest`: When trying to add invalid or existing
-                    media to the watchlist.
-        """
-        if not isinstance(items, list):
-            items = [items]
-
-        for item in items:
-            if self.onWatchlist(item):
-                raise BadRequest(f'"{item.title}" is already on the watchlist')
-            ratingKey = item.guid.rsplit('/', 1)[-1]
-            self.query(f'{self.METADATA}/actions/addToWatchlist?ratingKey={ratingKey}', method=self._session.put)
-        return self
-
-    def removeFromWatchlist(self, items):
-        """ Remove media items from the user's watchlist
-
-            Parameters:
-                items (List): List of :class:`~plexapi.video.Movie` or :class:`~plexapi.video.Show`
-                    objects to be added to the watchlist.
-
-            Raises:
-                :exc:`~plexapi.exceptions.BadRequest`: When trying to remove invalid or non-existing
-                    media to the watchlist.
-        """
-        if not isinstance(items, list):
-            items = [items]
-
-        for item in items:
-            if not self.onWatchlist(item):
-                raise BadRequest(f'"{item.title}" is not on the watchlist')
-            ratingKey = item.guid.rsplit('/', 1)[-1]
-            self.query(f'{self.METADATA}/actions/removeFromWatchlist?ratingKey={ratingKey}', method=self._session.put)
-        return self
-
-    def userState(self, item):
-        """ Returns a :class:`~plexapi.myplex.UserState` object for the specified item.
-
-            Parameters:
-                item (:class:`~plexapi.video.Movie` or :class:`~plexapi.video.Show`): Item to return the user state.
-        """
-        ratingKey = item.guid.rsplit('/', 1)[-1]
-        data = self.query(f"{self.METADATA}/library/metadata/{ratingKey}/userState")
-        return self.findItem(data, cls=UserState)
-
-    def isPlayed(self, item):
-        """ Return True if the item is played on Discover.
-
-            Parameters:
-                item (:class:`~plexapi.video.Movie`,
-                :class:`~plexapi.video.Show`, :class:`~plexapi.video.Season` or
-                :class:`~plexapi.video.Episode`): Object from searchDiscover().
-                Can be also result from Plex Movie or Plex TV Series agent.
-        """
-        userState = self.userState(item)
-        return bool(userState.viewCount > 0) if userState.viewCount else False
-
-    def markPlayed(self, item):
-        """ Mark the Plex object as played on Discover.
-
-            Parameters:
-                item (:class:`~plexapi.video.Movie`,
-                :class:`~plexapi.video.Show`, :class:`~plexapi.video.Season` or
-                :class:`~plexapi.video.Episode`): Object from searchDiscover().
-                Can be also result from Plex Movie or Plex TV Series agent.
-        """
-        key = f'{self.METADATA}/actions/scrobble'
-        ratingKey = item.guid.rsplit('/', 1)[-1]
-        params = {'key': ratingKey, 'identifier': 'com.plexapp.plugins.library'}
-        self.query(key, params=params)
-        return self
-
-    def markUnplayed(self, item):
-        """ Mark the Plex object as unplayed on Discover.
-
-            Parameters:
-                item (:class:`~plexapi.video.Movie`,
-                :class:`~plexapi.video.Show`, :class:`~plexapi.video.Season` or
-                :class:`~plexapi.video.Episode`): Object from searchDiscover().
-                Can be also result from Plex Movie or Plex TV Series agent.
-        """
-        key = f'{self.METADATA}/actions/unscrobble'
-        ratingKey = item.guid.rsplit('/', 1)[-1]
-        params = {'key': ratingKey, 'identifier': 'com.plexapp.plugins.library'}
-        self.query(key, params=params)
-        return self
-
-    def searchDiscover(self, query, limit=30, libtype=None, providers='discover'):
-        """ Search for movies and TV shows in Discover.
-            Returns a list of :class:`~plexapi.video.Movie` and :class:`~plexapi.video.Show` objects.
-
-            Parameters:
-                query (str): Search query.
-                limit (int, optional): Limit to the specified number of results. Default 30.
-                libtype (str, optional): 'movie' or 'show' to only return movies or shows, otherwise return all items.
-                providers (str, optional): 'discover' for default behavior
-                    or 'discover,PLEXAVOD' to also include the Plex ad-suported video service
-                    or 'discover,PLEXAVOD,PLEXTVOD' to also include the Plex video rental service
-        """
-        libtypes = {'movie': 'movies', 'show': 'tv'}
-        libtype = libtypes.get(libtype, 'movies,tv')
-
-        headers = {
-            'Accept': 'application/json'
-        }
-        params = {
-            'query': query,
-            'limit': limit,
-            'searchTypes': libtype,
-            'searchProviders': providers,
-            'includeMetadata': 1
-        }
-
-        data = self.query(f'{self.DISCOVER}/library/search', headers=headers, params=params)
-        searchResults = data['MediaContainer'].get('SearchResults', [])
-        searchResult = next((s.get('SearchResult', []) for s in searchResults if s.get('id') == 'external'), [])
-
-        results = []
-        for result in searchResult:
-            metadata = result['Metadata']
-            type = metadata['type']
-            if type == 'movie':
-                tag = 'Video'
-            elif type == 'show':
-                tag = 'Directory'
-            else:
-                continue
-            attrs = ''.join(f'{k}="{html.escape(str(v))}" ' for k, v in metadata.items())
-            xml = f'<{tag} {attrs}/>'
-            results.append(self._manuallyLoadXML(xml))
-
-        return self._toOnlineMetadata(results)
-
-    @property
-    def viewStateSync(self):
-        """ Returns True or False if syncing of watch state and ratings
-            is enabled or disabled, respectively, for the account.
-        """
-        headers = {'Accept': 'application/json'}
-        data = self.query(self.VIEWSTATESYNC, headers=headers)
-        return data.get('consent')
-
-    def enableViewStateSync(self):
-        """ Enable syncing of watch state and ratings for the account. """
-        self._updateViewStateSync(True)
-
-    def disableViewStateSync(self):
-        """ Disable syncing of watch state and ratings for the account. """
-        self._updateViewStateSync(False)
-
-    def _updateViewStateSync(self, consent):
-        """ Enable or disable syncing of watch state and ratings for the account.
-
-            Parameters:
-                consent (bool): True to enable, False to disable.
-        """
-        params = {'consent': consent}
-        self.query(self.VIEWSTATESYNC, method=self._session.put, params=params)
-
-    def link(self, pin):
-        """ Link a device to the account using a pin code.
-
-            Parameters:
-                pin (str): The 4 digit link pin code.
-        """
-        headers = {
-            'Content-Type': 'application/x-www-form-urlencoded',
-            'X-Plex-Product': 'Plex SSO'
-        }
-        data = {'code': pin}
-        self.query(self.LINK, self._session.put, headers=headers, data=data)
-
-    def _toOnlineMetadata(self, objs, **kwargs):
-        """ Convert a list of media objects to online metadata objects. """
-        # TODO: Add proper support for metadata.provider.plex.tv
-        # Temporary workaround to allow reloading and browsing of online media objects
-        server = PlexServer(self.METADATA, self._token, session=self._session)
-
-        includeUserState = int(bool(kwargs.pop('includeUserState', True)))
-
-        if not isinstance(objs, list):
-            objs = [objs]
-
-        for obj in objs:
-            obj._server = server
-
-            # Parse details key to modify query string
-            url = urlsplit(obj._details_key)
-            query = dict(parse_qsl(url.query))
-            query['includeUserState'] = includeUserState
-            query.pop('includeFields', None)
-            obj._details_key = urlunsplit((url.scheme, url.netloc, url.path, urlencode(query), url.fragment))
-
-        return objs
-
-    def publicIP(self):
-        """ Returns your public IP address. """
-        return self.query('https://plex.tv/:/ip')
-
-    def geoip(self, ip_address):
-        """ Returns a :class:`~plexapi.myplex.GeoLocation` object with geolocation information
-            for an IP address using Plex's GeoIP database.
-
-            Parameters:
-                ip_address (str): IP address to lookup.
-        """
-        params = {'ip_address': ip_address}
-        data = self.query('https://plex.tv/api/v2/geoip', params=params)
-        return GeoLocation(self, data)
-
-
-class MyPlexUser(PlexObject):
-    """ This object represents non-signed in users such as friends and linked
-        accounts. NOTE: This should not be confused with the :class:`~plexapi.myplex.MyPlexAccount`
-        which is your specific account. The raw xml for the data presented here
-        can be found at: https://plex.tv/api/users/
-
-        Attributes:
-            TAG (str): 'User'
-            key (str): 'https://plex.tv/api/users/'
-            allowCameraUpload (bool): True if this user can upload images.
-            allowChannels (bool): True if this user has access to channels.
-            allowSync (bool): True if this user can sync.
-            email (str): User's email address (user@gmail.com).
-            filterAll (str): Unknown.
-            filterMovies (str): Unknown.
-            filterMusic (str): Unknown.
-            filterPhotos (str): Unknown.
-            filterTelevision (str): Unknown.
-            home (bool): Unknown.
-            id (int): User's Plex account ID.
-            protected (False): Unknown (possibly SSL enabled?).
-            recommendationsPlaylistId (str): Unknown.
-            restricted (str): Unknown.
-            servers (List<:class:`~plexapi.myplex.<MyPlexServerShare`>)): Servers shared with the user.
-            thumb (str): Link to the users avatar.
-            title (str): Seems to be an alias for username.
-            username (str): User's username.
-    """
-    TAG = 'User'
-    key = 'https://plex.tv/api/users/'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.friend = self._initpath == self.key
-        self.allowCameraUpload = utils.cast(bool, data.attrib.get('allowCameraUpload'))
-        self.allowChannels = utils.cast(bool, data.attrib.get('allowChannels'))
-        self.allowSync = utils.cast(bool, data.attrib.get('allowSync'))
-        self.email = data.attrib.get('email')
-        self.filterAll = data.attrib.get('filterAll')
-        self.filterMovies = data.attrib.get('filterMovies')
-        self.filterMusic = data.attrib.get('filterMusic')
-        self.filterPhotos = data.attrib.get('filterPhotos')
-        self.filterTelevision = data.attrib.get('filterTelevision')
-        self.home = utils.cast(bool, data.attrib.get('home'))
-        self.id = utils.cast(int, data.attrib.get('id'))
-        self.protected = utils.cast(bool, data.attrib.get('protected'))
-        self.recommendationsPlaylistId = data.attrib.get('recommendationsPlaylistId')
-        self.restricted = data.attrib.get('restricted')
-        self.thumb = data.attrib.get('thumb')
-        self.title = data.attrib.get('title', '')
-        self.username = data.attrib.get('username', '')
-        for server in self.servers:
-            server.accountID = self.id
-
-    @cached_data_property
-    def servers(self):
-        return self.findItems(self._data, MyPlexServerShare)
-
-    def get_token(self, machineIdentifier):
-        try:
-            for item in self._server.query(self._server.FRIENDINVITE.format(machineId=machineIdentifier)):
-                if utils.cast(int, item.attrib.get('userID')) == self.id:
-                    return item.attrib.get('accessToken')
-        except Exception:
-            log.exception('Failed to get access token for %s', self.title)
-
-    def server(self, name):
-        """ Returns the :class:`~plexapi.myplex.MyPlexServerShare` that matches the name specified.
-
-            Parameters:
-                name (str): Name of the server to return.
-        """
-        for server in self.servers:
-            if name.lower() == server.name.lower():
-                return server
-
-        raise NotFound(f'Unable to find server {name}')
-
-    def history(self, maxresults=None, mindate=None):
-        """ Get all Play History for a user in all shared servers.
-            Parameters:
-                maxresults (int): Only return the specified number of results (optional).
-                mindate (datetime): Min datetime to return results from.
-        """
-        hist = []
-        for server in self.servers:
-            hist.extend(server.history(maxresults=maxresults, mindate=mindate))
-        return hist
-
-
-class MyPlexInvite(PlexObject):
-    """ This object represents pending friend invites.
-
-        Attributes:
-            TAG (str): 'Invite'
-            createdAt (datetime): Datetime the user was invited.
-            email (str): User's email address (user@gmail.com).
-            friend (bool): True or False if the user is invited as a friend.
-            friendlyName (str): The user's friendly name.
-            home (bool): True or False if the user is invited to a Plex Home.
-            id (int): User's Plex account ID.
-            server (bool): True or False if the user is invited to any servers.
-            servers (List<:class:`~plexapi.myplex.<MyPlexServerShare`>)): Servers shared with the user.
-            thumb (str): Link to the users avatar.
-            username (str): User's username.
-    """
-    TAG = 'Invite'
-    REQUESTS = 'https://plex.tv/api/invites/requests'
-    REQUESTED = 'https://plex.tv/api/invites/requested'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.createdAt = utils.toDatetime(data.attrib.get('createdAt'))
-        self.email = data.attrib.get('email')
-        self.friend = utils.cast(bool, data.attrib.get('friend'))
-        self.friendlyName = data.attrib.get('friendlyName')
-        self.home = utils.cast(bool, data.attrib.get('home'))
-        self.id = utils.cast(int, data.attrib.get('id'))
-        self.server = utils.cast(bool, data.attrib.get('server'))
-        self.thumb = data.attrib.get('thumb')
-        self.username = data.attrib.get('username', '')
-        for server in self.servers:
-            server.accountID = self.id
-
-    @cached_data_property
-    def servers(self):
-        return self.findItems(self._data, MyPlexServerShare)
-
-
-class Section(PlexObject):
-    """ This refers to a shared section. The raw xml for the data presented here
-        can be found at: https://plex.tv/api/servers/{machineId}/shared_servers
-
-        Attributes:
-            TAG (str): section
-            id (int): The shared section ID
-            key (int): The shared library section key
-            shared (bool): If this section is shared with the user
-            title (str): Title of the section
-            type (str): movie, tvshow, artist
-
-    """
-    TAG = 'Section'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.id = utils.cast(int, data.attrib.get('id'))
-        self.key = utils.cast(int, data.attrib.get('key'))
-        self.shared = utils.cast(bool, data.attrib.get('shared', '0'))
-        self.title = data.attrib.get('title')
-        self.type = data.attrib.get('type')
-        self.sectionId = self.id  # For backwards compatibility
-        self.sectionKey = self.key  # For backwards compatibility
-
-    def history(self, maxresults=None, mindate=None):
-        """ Get all Play History for a user for this section in this shared server.
-            Parameters:
-                maxresults (int): Only return the specified number of results (optional).
-                mindate (datetime): Min datetime to return results from.
-        """
-        server = self._server._server.resource(self._server.name).connect()
-        return server.history(maxresults=maxresults, mindate=mindate,
-                              accountID=self._server.accountID, librarySectionID=self.sectionKey)
-
-
-class MyPlexServerShare(PlexObject):
-    """ Represents a single user's server reference. Used for library sharing.
-
-        Attributes:
-            id (int): id for this share
-            serverId (str): what id plex uses for this.
-            machineIdentifier (str): The servers machineIdentifier
-            name (str): The servers name
-            lastSeenAt (datetime): Last connected to the server?
-            numLibraries (int): Total number of libraries
-            allLibraries (bool): True if all libraries is shared with this user.
-            owned (bool): 1 if the server is owned by the user
-            pending (bool): True if the invite is pending.
-
-    """
-    TAG = 'Server'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.id = utils.cast(int, data.attrib.get('id'))
-        self.accountID = utils.cast(int, data.attrib.get('accountID'))
-        self.serverId = utils.cast(int, data.attrib.get('serverId'))
-        self.machineIdentifier = data.attrib.get('machineIdentifier')
-        self.name = data.attrib.get('name')
-        self.lastSeenAt = utils.toDatetime(data.attrib.get('lastSeenAt'))
-        self.numLibraries = utils.cast(int, data.attrib.get('numLibraries'))
-        self.allLibraries = utils.cast(bool, data.attrib.get('allLibraries'))
-        self.owned = utils.cast(bool, data.attrib.get('owned'))
-        self.pending = utils.cast(bool, data.attrib.get('pending'))
-
-    def section(self, name):
-        """ Returns the :class:`~plexapi.myplex.Section` that matches the name specified.
-
-            Parameters:
-                name (str): Name of the section to return.
-        """
-        for section in self.sections():
-            if name.lower() == section.title.lower():
-                return section
-
-        raise NotFound(f'Unable to find section {name}')
-
-    def sections(self):
-        """ Returns a list of all :class:`~plexapi.myplex.Section` objects shared with this user.
-        """
-        url = MyPlexAccount.FRIENDSERVERS.format(machineId=self.machineIdentifier, serverId=self.id)
-        data = self._server.query(url)
-        return self.findItems(data, Section, rtag='SharedServer')
-
-    def history(self, maxresults=9999999, mindate=None):
-        """ Get all Play History for a user in this shared server.
-            Parameters:
-                maxresults (int): Only return the specified number of results (optional).
-                mindate (datetime): Min datetime to return results from.
-        """
-        server = self._server.resource(self.name).connect()
-        return server.history(maxresults=maxresults, mindate=mindate, accountID=self.accountID)
-
-
-class MyPlexResource(PlexObject):
-    """ This object represents resources connected to your Plex server that can provide
-        content such as Plex Media Servers, iPhone or Android clients, etc. The raw xml
-        for the data presented here can be found at:
-        https://plex.tv/api/v2/resources?includeHttps=1&includeRelay=1
-
-        Attributes:
-            TAG (str): 'Device'
-            key (str): 'https://plex.tv/api/v2/resources?includeHttps=1&includeRelay=1'
-            accessToken (str): This resource's Plex access token.
-            clientIdentifier (str): Unique ID for this resource.
-            connections (list): List of :class:`~plexapi.myplex.ResourceConnection` objects
-                for this resource.
-            createdAt (datetime): Timestamp this resource first connected to your server.
-            device (str): Best guess on the type of device this is (PS, iPhone, Linux, etc).
-            dnsRebindingProtection (bool): True if the server had DNS rebinding protection.
-            home (bool): Unknown
-            httpsRequired (bool): True if the resource requires https.
-            lastSeenAt (datetime): Timestamp this resource last connected.
-            name (str): Descriptive name of this resource.
-            natLoopbackSupported (bool): True if the resource supports NAT loopback.
-            owned (bool): True if this resource is one of your own (you logged into it).
-            ownerId (int): ID of the user that owns this resource (shared resources only).
-            platform (str): OS the resource is running (Linux, Windows, Chrome, etc.)
-            platformVersion (str): Version of the platform.
-            presence (bool): True if the resource is online
-            product (str): Plex product (Plex Media Server, Plex for iOS, Plex Web, etc.)
-            productVersion (str): Version of the product.
-            provides (str): List of services this resource provides (client, server,
-                player, pubsub-player, etc.)
-            publicAddressMatches (bool): True if the public IP address matches the client's public IP address.
-            relay (bool): True if this resource has the Plex Relay enabled.
-            sourceTitle (str): Username of the user that owns this resource (shared resources only).
-            synced (bool): Unknown (possibly True if the resource has synced content?)
-    """
-    TAG = 'resource'
-    key = 'https://plex.tv/api/v2/resources?includeHttps=1&includeRelay=1'
-
-    # Default order to prioritize available resource connections
-    DEFAULT_LOCATION_ORDER = ['local', 'remote', 'relay']
-    DEFAULT_SCHEME_ORDER = ['https', 'http']
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.accessToken = logfilter.add_secret(data.attrib.get('accessToken'))
-        self.clientIdentifier = data.attrib.get('clientIdentifier')
-        self.createdAt = utils.toDatetime(data.attrib.get('createdAt'), "%Y-%m-%dT%H:%M:%SZ")
-        self.device = data.attrib.get('device')
-        self.dnsRebindingProtection = utils.cast(bool, data.attrib.get('dnsRebindingProtection'))
-        self.home = utils.cast(bool, data.attrib.get('home'))
-        self.httpsRequired = utils.cast(bool, data.attrib.get('httpsRequired'))
-        self.lastSeenAt = utils.toDatetime(data.attrib.get('lastSeenAt'), "%Y-%m-%dT%H:%M:%SZ")
-        self.name = data.attrib.get('name')
-        self.natLoopbackSupported = utils.cast(bool, data.attrib.get('natLoopbackSupported'))
-        self.owned = utils.cast(bool, data.attrib.get('owned'))
-        self.ownerId = utils.cast(int, data.attrib.get('ownerId', 0))
-        self.platform = data.attrib.get('platform')
-        self.platformVersion = data.attrib.get('platformVersion')
-        self.presence = utils.cast(bool, data.attrib.get('presence'))
-        self.product = data.attrib.get('product')
-        self.productVersion = data.attrib.get('productVersion')
-        self.provides = data.attrib.get('provides')
-        self.publicAddressMatches = utils.cast(bool, data.attrib.get('publicAddressMatches'))
-        self.relay = utils.cast(bool, data.attrib.get('relay'))
-        self.sourceTitle = data.attrib.get('sourceTitle')
-        self.synced = utils.cast(bool, data.attrib.get('synced'))
-
-    @cached_data_property
-    def connections(self):
-        return self.findItems(self._data, ResourceConnection, rtag='connections')
-
-    def preferred_connections(
-        self,
-        ssl=None,
-        locations=None,
-        schemes=None,
-    ):
-        """ Returns a sorted list of the available connection addresses for this resource.
-            Often times there is more than one address specified for a server or client.
-            Default behavior will prioritize local connections before remote or relay and HTTPS before HTTP.
-
-            Parameters:
-                ssl (bool, optional): Set True to only connect to HTTPS connections. Set False to
-                    only connect to HTTP connections. Set None (default) to connect to any
-                    HTTP or HTTPS connection.
-        """
-        if locations is None:
-            locations = self.DEFAULT_LOCATION_ORDER[:]
-        if schemes is None:
-            schemes = self.DEFAULT_SCHEME_ORDER[:]
-
-        connections_dict = {location: {scheme: [] for scheme in schemes} for location in locations}
-        for connection in self.connections:
-            # Only check non-local connections unless we own the resource
-            if self.owned or (not self.owned and not connection.local):
-                location = 'relay' if connection.relay else ('local' if connection.local else 'remote')
-                if location not in locations:
-                    continue
-                if 'http' in schemes:
-                    connections_dict[location]['http'].append(connection.httpuri)
-                if 'https' in schemes:
-                    connections_dict[location]['https'].append(connection.uri)
-        if ssl is True: schemes.remove('http')
-        elif ssl is False: schemes.remove('https')
-        connections = []
-        for location in locations:
-            for scheme in schemes:
-                connections.extend(connections_dict[location][scheme])
-        return connections
-
-    def connect(
-        self,
-        ssl=None,
-        timeout=None,
-        locations=None,
-        schemes=None,
-    ):
-        """ Returns a new :class:`~plexapi.server.PlexServer` or :class:`~plexapi.client.PlexClient` object.
-            Uses `MyPlexResource.preferred_connections()` to generate the priority order of connection addresses.
-            After trying to connect to all available addresses for this resource and
-            assuming at least one connection was successful, the PlexServer object is built and returned.
-
-            Parameters:
-                ssl (bool, optional): Set True to only connect to HTTPS connections. Set False to
-                    only connect to HTTP connections. Set None (default) to connect to any
-                    HTTP or HTTPS connection.
-                timeout (int, optional): The timeout in seconds to attempt each connection.
-
-            Raises:
-                :exc:`~plexapi.exceptions.NotFound`: When unable to connect to any addresses for this resource.
-        """
-        if locations is None:
-            locations = self.DEFAULT_LOCATION_ORDER[:]
-        if schemes is None:
-            schemes = self.DEFAULT_SCHEME_ORDER[:]
-
-        connections = self.preferred_connections(ssl, locations, schemes)
-        # Try connecting to all known resource connections in parallel, but
-        # only return the first server (in order) that provides a response.
-        cls = PlexServer if 'server' in self.provides else PlexClient
-        listargs = [[cls, url, self.accessToken, self._server._session, timeout] for url in connections]
-        log.debug('Testing %s resource connections..', len(listargs))
-        results = utils.threaded(_connect, listargs)
-        return _chooseConnection('Resource', self.name, results)
-
-
-class ResourceConnection(PlexObject):
-    """ Represents a Resource Connection object found within the
-        :class:`~plexapi.myplex.MyPlexResource` objects.
-
-        Attributes:
-            TAG (str): 'Connection'
-            address (str): The connection IP address
-            httpuri (str): Full HTTP URL
-            ipv6 (bool): True if the address is IPv6
-            local (bool): True if the address is local
-            port (int): The connection port
-            protocol (str): HTTP or HTTPS
-            relay (bool): True if the address uses the Plex Relay
-            uri (str): Full connetion URL
-    """
-    TAG = 'connection'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.address = data.attrib.get('address')
-        self.ipv6 = utils.cast(bool, data.attrib.get('IPv6'))
-        self.local = utils.cast(bool, data.attrib.get('local'))
-        self.port = utils.cast(int, data.attrib.get('port'))
-        self.protocol = data.attrib.get('protocol')
-        self.relay = utils.cast(bool, data.attrib.get('relay'))
-        self.uri = data.attrib.get('uri')
-        self.httpuri = f'http://{self.address}:{self.port}'
-
-
-class MyPlexDevice(PlexObject):
-    """ This object represents resources connected to your Plex server that provide
-        playback ability from your Plex Server, iPhone or Android clients, Plex Web,
-        this API, etc. The raw xml for the data presented here can be found at:
-        https://plex.tv/devices.xml
-
-        Attributes:
-            TAG (str): 'Device'
-            key (str): 'https://plex.tv/devices.xml'
-            clientIdentifier (str): Unique ID for this resource.
-            connections (list): List of connection URIs for the device.
-            device (str): Best guess on the type of device this is (Linux, iPad, AFTB, etc).
-            id (str): MyPlex ID of the device.
-            model (str): Model of the device (bueller, Linux, x86_64, etc.)
-            name (str): Hostname of the device.
-            platform (str): OS the resource is running (Linux, Windows, Chrome, etc.)
-            platformVersion (str): Version of the platform.
-            product (str): Plex product (Plex Media Server, Plex for iOS, Plex Web, etc.)
-            productVersion (string): Version of the product.
-            provides (str): List of services this resource provides (client, controller,
-                sync-target, player, pubsub-player).
-            publicAddress (str): Public IP address.
-            screenDensity (str): Unknown
-            screenResolution (str): Screen resolution (750x1334, 1242x2208, etc.)
-            token (str): Plex authentication token for the device.
-            vendor (str): Device vendor (ubuntu, etc).
-            version (str): Unknown (1, 2, 1.3.3.3148-b38628e, 1.3.15, etc.)
-    """
-    TAG = 'Device'
-    key = 'https://plex.tv/devices.xml'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.name = data.attrib.get('name')
-        self.publicAddress = data.attrib.get('publicAddress')
-        self.product = data.attrib.get('product')
-        self.productVersion = data.attrib.get('productVersion')
-        self.platform = data.attrib.get('platform')
-        self.platformVersion = data.attrib.get('platformVersion')
-        self.device = data.attrib.get('device')
-        self.model = data.attrib.get('model')
-        self.vendor = data.attrib.get('vendor')
-        self.provides = data.attrib.get('provides')
-        self.clientIdentifier = data.attrib.get('clientIdentifier')
-        self.version = data.attrib.get('version')
-        self.id = data.attrib.get('id')
-        self.token = logfilter.add_secret(data.attrib.get('token'))
-        self.screenResolution = data.attrib.get('screenResolution')
-        self.screenDensity = data.attrib.get('screenDensity')
-        self.createdAt = utils.toDatetime(data.attrib.get('createdAt'))
-        self.lastSeenAt = utils.toDatetime(data.attrib.get('lastSeenAt'))
-
-    @cached_data_property
-    def connections(self):
-        return self.listAttrs(self._data, 'uri', etag='Connection')
-
-    def connect(self, timeout=None):
-        """ Returns a new :class:`~plexapi.client.PlexClient` or :class:`~plexapi.server.PlexServer`
-            Sometimes there is more than one address specified for a server or client.
-            After trying to connect to all available addresses for this client and assuming
-            at least one connection was successful, the PlexClient object is built and returned.
-
-            Raises:
-                :exc:`~plexapi.exceptions.NotFound`: When unable to connect to any addresses for this device.
-        """
-        cls = PlexServer if 'server' in self.provides else PlexClient
-        listargs = [[cls, url, self.token, self._server._session, timeout] for url in self.connections]
-        log.debug('Testing %s device connections..', len(listargs))
-        results = utils.threaded(_connect, listargs)
-        return _chooseConnection('Device', self.name, results)
-
-    def delete(self):
-        """ Remove this device from your account. """
-        key = f'https://plex.tv/devices/{self.id}.xml'
-        self._server.query(key, self._server._session.delete)
-
-    def syncItems(self):
-        """ Returns an instance of :class:`~plexapi.sync.SyncList` for current device.
-
-            Raises:
-                :exc:`~plexapi.exceptions.BadRequest`: when the device doesn't provides `sync-target`.
-        """
-        if 'sync-target' not in self.provides:
-            raise BadRequest('Requested syncList for device which do not provides sync-target')
-
-        return self._server.syncItems(client=self)
-
-
-class MyPlexPinLogin:
-    """
-        MyPlex PIN login class which supports getting the four character PIN which the user must
-        enter on https://plex.tv/link to authenticate the client and provide an access token to
-        create a :class:`~plexapi.myplex.MyPlexAccount` instance.
-        This helper class supports a polling, threaded and callback approach.
-
-        - The polling approach expects the developer to periodically check if the PIN login was
-          successful using :func:`~plexapi.myplex.MyPlexPinLogin.checkLogin`.
-        - The threaded approach expects the developer to call
-          :func:`~plexapi.myplex.MyPlexPinLogin.run` and then at a later time call
-          :func:`~plexapi.myplex.MyPlexPinLogin.waitForLogin` to wait for and check the result.
-        - The callback approach is an extension of the threaded approach and expects the developer
-          to pass the `callback` parameter to the call to :func:`~plexapi.myplex.MyPlexPinLogin.run`.
-          The callback will be called when the thread waiting for the PIN login to succeed either
-          finishes or expires. The parameter passed to the callback is the received authentication
-          token or `None` if the login expired.
-
-        Parameters:
-            session (requests.Session, optional): Use your own session object if you want to
-                cache the http responses from PMS
-            requestTimeout (int): timeout in seconds on initial connect to plex.tv (default config.TIMEOUT).
-            headers (dict): A dict of X-Plex headers to send with requests.
-            oauth (bool): True to use Plex OAuth instead of PIN login.
-
-        Attributes:
-            PINS (str): 'https://plex.tv/api/v2/pins'
-            CHECKPINS (str): 'https://plex.tv/api/v2/pins/{pinid}'
-            POLLINTERVAL (int): 1
-            finished (bool): Whether the pin login has finished or not.
-            expired (bool): Whether the pin login has expired or not.
-            token (str): Token retrieved through the pin login.
-            pin (str): Pin to use for the login on https://plex.tv/link.
-    """
-    PINS = 'https://plex.tv/api/v2/pins'               # get
-    CHECKPINS = 'https://plex.tv/api/v2/pins/{pinid}'  # get
-    POLLINTERVAL = 1
-
-    def __init__(self, session=None, requestTimeout=None, headers=None, oauth=False):
-        super(MyPlexPinLogin, self).__init__()
-        self._session = session or requests.Session()
-        self._requestTimeout = requestTimeout or TIMEOUT
-        self.headers = headers
-
-        self._oauth = oauth
-        self._loginTimeout = None
-        self._callback = None
-        self._thread = None
-        self._abort = False
-        self._id = None
-        self._code = None
-        self._getCode()
-
-        self.finished = False
-        self.expired = False
-        self.token = None
-
-    @property
-    def pin(self):
-        """ Return the 4 character PIN used for linking a device at
-            https://plex.tv/link.
-        """
-        if self._oauth:
-            raise BadRequest('Cannot use PIN for Plex OAuth login')
-        return self._code
-
-    def oauthUrl(self, forwardUrl=None):
-        """ Return the Plex OAuth url for login.
-
-            Parameters:
-                forwardUrl (str, optional): The url to redirect the client to after login.
-        """
-        if not self._oauth:
-            raise BadRequest('Must use "MyPlexPinLogin(oauth=True)" for Plex OAuth login.')
-
-        headers = self._headers()
-        params = {
-            'clientID': headers['X-Plex-Client-Identifier'],
-            'context[device][product]': headers['X-Plex-Product'],
-            'context[device][version]': headers['X-Plex-Version'],
-            'context[device][platform]': headers['X-Plex-Platform'],
-            'context[device][platformVersion]': headers['X-Plex-Platform-Version'],
-            'context[device][device]': headers['X-Plex-Device'],
-            'context[device][deviceName]': headers['X-Plex-Device-Name'],
-            'code': self._code
-        }
-        if forwardUrl:
-            params['forwardUrl'] = forwardUrl
-
-        return f'https://app.plex.tv/auth/#!?{urlencode(params)}'
-
-    def run(self, callback=None, timeout=None):
-        """ Starts the thread which monitors the PIN login state.
-
-            Parameters:
-                callback (Callable[str]): Callback called with the received authentication token (optional).
-                timeout (int): Timeout in seconds waiting for the PIN login to succeed (optional).
-
-            Raises:
-                :class:`RuntimeError`: If the thread is already running.
-                :class:`RuntimeError`: If the PIN login for the current PIN has expired.
-        """
-        if self._thread and not self._abort:
-            raise RuntimeError('MyPlexPinLogin thread is already running')
-        if self.expired:
-            raise RuntimeError('MyPlexPinLogin has expired')
-
-        self._loginTimeout = timeout
-        self._callback = callback
-        self._abort = False
-        self.finished = False
-        self._thread = threading.Thread(target=self._pollLogin, name='plexapi.myplex.MyPlexPinLogin')
-        self._thread.start()
-
-    def waitForLogin(self):
-        """ Waits for the PIN login to succeed or expire.
-
-            Parameters:
-                callback (Callable[str]): Callback called with the received authentication token (optional).
-                timeout (int): Timeout in seconds waiting for the PIN login to succeed (optional).
-
-            Returns:
-                `True` if the PIN login succeeded or `False` otherwise.
-        """
-        if not self._thread or self._abort:
-            return False
-
-        self._thread.join()
-        if self.expired or not self.token:
-            return False
-
-        return True
-
-    def stop(self):
-        """ Stops the thread monitoring the PIN login state. """
-        if not self._thread or self._abort:
-            return
-
-        self._abort = True
-        self._thread.join()
-
-    def checkLogin(self):
-        """ Returns `True` if the PIN login has succeeded. """
-        if self._thread:
-            return False
-
-        try:
-            return self._checkLogin()
-        except Exception:
-            self.expired = True
-            self.finished = True
-
-        return False
-
-    def _getCode(self):
-        url = self.PINS
-
-        if self._oauth:
-            params = {'strong': True}
-        else:
-            params = None
-
-        response = self._query(url, self._session.post, params=params)
-        if response is None:
-            return None
-
-        self._id = response.attrib.get('id')
-        self._code = response.attrib.get('code')
-
-        return self._code
-
-    def _checkLogin(self):
-        if not self._id:
-            return False
-
-        if self.token:
-            return True
-
-        url = self.CHECKPINS.format(pinid=self._id)
-        response = self._query(url)
-        if response is None:
-            return False
-
-        token = response.attrib.get('authToken')
-        if not token:
-            return False
-
-        self.token = token
-        self.finished = True
-        return True
-
-    def _pollLogin(self):
-        try:
-            start = time.time()
-            while not self._abort and (not self._loginTimeout or (time.time() - start) < self._loginTimeout):
-                try:
-                    result = self._checkLogin()
-                except Exception:
-                    self.expired = True
-                    break
-
-                if result:
-                    break
-
-                time.sleep(self.POLLINTERVAL)
-
-            if self.token and self._callback:
-                self._callback(self.token)
-        finally:
-            self.finished = True
-
-    def _headers(self, **kwargs):
-        """ Returns dict containing base headers for all requests for pin login. """
-        headers = BASE_HEADERS.copy()
-        if self.headers:
-            headers.update(self.headers)
-        headers.update(kwargs)
-        return headers
-
-    def _query(self, url, method=None, headers=None, **kwargs):
-        method = method or self._session.get
-        log.debug('%s %s', method.__name__.upper(), url)
-        headers = headers or self._headers()
-        response = method(url, headers=headers, timeout=self._requestTimeout, **kwargs)
-        if not response.ok:  # pragma: no cover
-            codename = codes.get(response.status_code)[0]
-            errtext = response.text.replace('\n', ' ')
-            raise BadRequest(f'({response.status_code}) {codename} {response.url}; {errtext}')
-        return utils.parseXMLString(response.text)
-
-
-def _connect(cls, url, token, session, timeout, results, i, job_is_done_event=None):
-    """ Connects to the specified cls with url and token. Stores the connection
-        information to results[i] in a threadsafe way.
-
-        Arguments:
-            cls: the class which is responsible for establishing connection, basically it's
-                 :class:`~plexapi.client.PlexClient` or :class:`~plexapi.server.PlexServer`
-            url (str): url which should be passed as `baseurl` argument to cls.__init__()
-            session (requests.Session): session which sould be passed as `session` argument to cls.__init()
-            token (str): authentication token which should be passed as `baseurl` argument to cls.__init__()
-            timeout (int): timeout which should be passed as `baseurl` argument to cls.__init__()
-            results (list): pre-filled list for results
-            i (int): index of current job, should be less than len(results)
-            job_is_done_event (:class:`~threading.Event`): is X_PLEX_ENABLE_FAST_CONNECT is True then the
-                  event would be set as soon the connection is established
-    """
-    starttime = time.time()
-    try:
-        device = cls(baseurl=url, token=token, session=session, timeout=timeout)
-        runtime = int(time.time() - starttime)
-        results[i] = (url, token, device, runtime)
-        if X_PLEX_ENABLE_FAST_CONNECT and job_is_done_event:
-            job_is_done_event.set()
-    except Exception as err:
-        runtime = int(time.time() - starttime)
-        log.error('%s: %s', url, err)
-        results[i] = (url, token, None, runtime)
-
-
-def _chooseConnection(ctype, name, results):
-    """ Chooses the first (best) connection from the given _connect results. """
-    # At this point we have a list of result tuples containing (url, token, PlexServer, runtime)
-    # or (url, token, None, runtime) in the case a connection could not be established.
-    for url, token, result, runtime in results:
-        okerr = 'OK' if result else 'ERR'
-        log.debug('%s connection %s (%ss): %s?X-Plex-Token=%s', ctype, okerr, runtime, url, token)
-    results = [r[2] for r in results if r and r[2] is not None]
-    if results:
-        log.debug('Connecting to %s: %s?X-Plex-Token=%s', ctype, results[0]._baseurl, results[0]._token)
-        return results[0]
-    raise NotFound(f'Unable to connect to {ctype.lower()}: {name}')
-
-
-class AccountOptOut(PlexObject):
-    """ Represents a single AccountOptOut
-        'https://plex.tv/api/v2/user/{userUUID}/settings/opt_outs'
-
-        Attributes:
-            TAG (str): optOut
-            key (str): Online Media Source key
-            value (str): Online Media Source opt_in, opt_out, or opt_out_managed
-    """
-    TAG = 'optOut'
-    CHOICES = {'opt_in', 'opt_out', 'opt_out_managed'}
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.key = data.attrib.get('key')
-        self.value = data.attrib.get('value')
-
-    def _updateOptOut(self, option):
-        """ Sets the Online Media Sources option.
-
-            Parameters:
-                option (str): see CHOICES
-
-            Raises:
-                :exc:`~plexapi.exceptions.NotFound`: ``option`` str not found in CHOICES.
-        """
-        if option not in self.CHOICES:
-            raise NotFound(f'{option} not found in available choices: {self.CHOICES}')
-        url = self._server.OPTOUTS.format(userUUID=self._server.uuid)
-        params = {'key': self.key, 'value': option}
-        self._server.query(url, method=self._server._session.post, params=params)
-        self.value = option  # assume query successful and set the value to option
-
-    def optIn(self):
-        """ Sets the Online Media Source to "Enabled". """
-        self._updateOptOut('opt_in')
-
-    def optOut(self):
-        """ Sets the Online Media Source to "Disabled". """
-        self._updateOptOut('opt_out')
-
-    def optOutManaged(self):
-        """ Sets the Online Media Source to "Disabled for Managed Users".
-
-            Raises:
-                :exc:`~plexapi.exceptions.BadRequest`: When trying to opt out music.
-        """
-        if self.key == 'tv.plex.provider.music':
-            raise BadRequest(f'{self.key} does not have the option to opt out managed users.')
-        self._updateOptOut('opt_out_managed')
-
-
-class UserState(PlexObject):
-    """ Represents a single UserState
-
-        Attributes:
-            TAG (str): UserState
-            lastViewedAt (datetime): Datetime the item was last played.
-            ratingKey (str): Unique key identifying the item.
-            type (str): The media type of the item.
-            viewCount (int): Count of times the item was played.
-            viewedLeafCount (int): Number of items marked as played in the show/season.
-            viewOffset (int): Time offset in milliseconds from the start of the content
-            viewState (bool): True or False if the item has been played.
-            watchlistedAt (datetime): Datetime the item was added to the watchlist.
-    """
-    TAG = 'UserState'
-
-    def __repr__(self):
-        return f'<{self.__class__.__name__}:{self.ratingKey}>'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.lastViewedAt = utils.toDatetime(data.attrib.get('lastViewedAt'))
-        self.ratingKey = data.attrib.get('ratingKey')
-        self.type = data.attrib.get('type')
-        self.viewCount = utils.cast(int, data.attrib.get('viewCount', 0))
-        self.viewedLeafCount = utils.cast(int, data.attrib.get('viewedLeafCount', 0))
-        self.viewOffset = utils.cast(int, data.attrib.get('viewOffset', 0))
-        self.viewState = data.attrib.get('viewState') == 'complete'
-        self.watchlistedAt = utils.toDatetime(data.attrib.get('watchlistedAt'))
-
-
-class GeoLocation(PlexObject):
-    """ Represents a signle IP address geolocation
-
-        Attributes:
-            TAG (str): location
-            city (str): City name
-            code (str): Country code
-            continentCode (str): Continent code
-            coordinates (Tuple<float>): Latitude and longitude
-            country (str): Country name
-            europeanUnionMember (bool): True if the country is a member of the European Union
-            inPrivacyRestrictedCountry (bool): True if the country is privacy restricted
-            postalCode (str): Postal code
-            subdivisions (str): Subdivision name
-            timezone (str): Timezone
-    """
-    TAG = 'location'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.city = data.attrib.get('city')
-        self.code = data.attrib.get('code')
-        self.continentCode = data.attrib.get('continent_code')
-        self.coordinates = tuple(
-            utils.cast(float, coord) for coord in (data.attrib.get('coordinates') or ',').split(','))
-        self.country = data.attrib.get('country')
-        self.postalCode = data.attrib.get('postal_code')
-        self.subdivisions = data.attrib.get('subdivisions')
-        self.timezone = data.attrib.get('time_zone')
-
-        europeanUnionMember = data.attrib.get('european_union_member')
-        self.europeanUnionMember = (
-            False if europeanUnionMember == 'Unknown' else utils.cast(bool, europeanUnionMember))
-
-        inPrivacyRestrictedCountry = data.attrib.get('in_privacy_restricted_country')
-        self.inPrivacyRestrictedCountry = (
-            False if inPrivacyRestrictedCountry == 'Unknown' else utils.cast(bool, inPrivacyRestrictedCountry))
diff --git a/lib/plexapi/photo.py b/lib/plexapi/photo.py
deleted file mode 100644
index e7c7239e..00000000
--- a/lib/plexapi/photo.py
+++ /dev/null
@@ -1,342 +0,0 @@
-# -*- coding: utf-8 -*-
-import os
-from pathlib import Path
-from urllib.parse import quote_plus
-
-from plexapi import media, utils, video
-from plexapi.base import Playable, PlexPartialObject, PlexSession, cached_data_property
-from plexapi.exceptions import BadRequest
-from plexapi.mixins import (
-    RatingMixin,
-    ArtUrlMixin, ArtMixin, PosterUrlMixin, PosterMixin,
-    PhotoalbumEditMixins, PhotoEditMixins
-)
-
-
-@utils.registerPlexObject
-class Photoalbum(
-    PlexPartialObject,
-    RatingMixin,
-    ArtMixin, PosterMixin,
-    PhotoalbumEditMixins
-):
-    """ Represents a single Photoalbum (collection of photos).
-
-        Attributes:
-            TAG (str): 'Directory'
-            TYPE (str): 'photo'
-            addedAt (datetime): Datetime the photo album was added to the library.
-            art (str): URL to artwork image (/library/metadata/<ratingKey>/art/<artid>).
-            composite (str): URL to composite image (/library/metadata/<ratingKey>/composite/<compositeid>)
-            fields (List<:class:`~plexapi.media.Field`>): List of field objects.
-            guid (str): Plex GUID for the photo album (local://229674).
-            images (List<:class:`~plexapi.media.Image`>): List of image objects.
-            index (sting): Plex index number for the photo album.
-            key (str): API URL (/library/metadata/<ratingkey>).
-            lastRatedAt (datetime): Datetime the photo album was last rated.
-            librarySectionID (int): :class:`~plexapi.library.LibrarySection` ID.
-            librarySectionKey (str): :class:`~plexapi.library.LibrarySection` key.
-            librarySectionTitle (str): :class:`~plexapi.library.LibrarySection` title.
-            listType (str): Hardcoded as 'photo' (useful for search filters).
-            ratingKey (int): Unique key identifying the photo album.
-            summary (str): Summary of the photoalbum.
-            thumb (str): URL to thumbnail image (/library/metadata/<ratingKey>/thumb/<thumbid>).
-            title (str): Name of the photo album. (Trip to Disney World)
-            titleSort (str): Title to use when sorting (defaults to title).
-            type (str): 'photo'
-            updatedAt (datetime): Datetime the photo album was updated.
-            userRating (float): Rating of the photo album (0.0 - 10.0) equaling (0 stars - 5 stars).
-    """
-    TAG = 'Directory'
-    TYPE = 'photo'
-    _searchType = 'photoalbum'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.addedAt = utils.toDatetime(data.attrib.get('addedAt'))
-        self.art = data.attrib.get('art')
-        self.composite = data.attrib.get('composite')
-        self.guid = data.attrib.get('guid')
-        self.index = utils.cast(int, data.attrib.get('index'))
-        self.key = data.attrib.get('key', '').replace('/children', '')  # FIX_BUG_50
-        self.lastRatedAt = utils.toDatetime(data.attrib.get('lastRatedAt'))
-        self.librarySectionID = utils.cast(int, data.attrib.get('librarySectionID'))
-        self.librarySectionKey = data.attrib.get('librarySectionKey')
-        self.librarySectionTitle = data.attrib.get('librarySectionTitle')
-        self.listType = 'photo'
-        self.ratingKey = utils.cast(int, data.attrib.get('ratingKey'))
-        self.summary = data.attrib.get('summary')
-        self.thumb = data.attrib.get('thumb')
-        self.title = data.attrib.get('title')
-        self.titleSort = data.attrib.get('titleSort', self.title)
-        self.type = data.attrib.get('type')
-        self.updatedAt = utils.toDatetime(data.attrib.get('updatedAt'))
-        self.userRating = utils.cast(float, data.attrib.get('userRating'))
-
-    @cached_data_property
-    def fields(self):
-        return self.findItems(self._data, media.Field)
-
-    @cached_data_property
-    def images(self):
-        return self.findItems(self._data, media.Image)
-
-    def album(self, title):
-        """ Returns the :class:`~plexapi.photo.Photoalbum` that matches the specified title.
-
-            Parameters:
-                title (str): Title of the photo album to return.
-        """
-        key = f'{self.key}/children'
-        return self.fetchItem(key, Photoalbum, title__iexact=title)
-
-    def albums(self, **kwargs):
-        """ Returns a list of :class:`~plexapi.photo.Photoalbum` objects in the album. """
-        key = f'{self.key}/children'
-        return self.fetchItems(key, Photoalbum, **kwargs)
-
-    def photo(self, title):
-        """ Returns the :class:`~plexapi.photo.Photo` that matches the specified title.
-
-            Parameters:
-                title (str): Title of the photo to return.
-        """
-        key = f'{self.key}/children'
-        return self.fetchItem(key, Photo, title__iexact=title)
-
-    def photos(self, **kwargs):
-        """ Returns a list of :class:`~plexapi.photo.Photo` objects in the album. """
-        key = f'{self.key}/children'
-        return self.fetchItems(key, Photo, **kwargs)
-
-    def clip(self, title):
-        """ Returns the :class:`~plexapi.video.Clip` that matches the specified title.
-
-            Parameters:
-                title (str): Title of the clip to return.
-        """
-        key = f'{self.key}/children'
-        return self.fetchItem(key, video.Clip, title__iexact=title)
-
-    def clips(self, **kwargs):
-        """ Returns a list of :class:`~plexapi.video.Clip` objects in the album. """
-        key = f'{self.key}/children'
-        return self.fetchItems(key, video.Clip, **kwargs)
-
-    def get(self, title):
-        """ Alias to :func:`~plexapi.photo.Photoalbum.photo`. """
-        return self.episode(title)
-
-    def download(self, savepath=None, keep_original_name=False, subfolders=False):
-        """ Download all photos and clips from the photo album. See :func:`~plexapi.base.Playable.download` for details.
-
-            Parameters:
-                savepath (str): Defaults to current working dir.
-                keep_original_name (bool): True to keep the original filename otherwise
-                    a friendlier filename is generated.
-                subfolders (bool): True to separate photos/clips in to photo album folders.
-        """
-        filepaths = []
-        for album in self.albums():
-            _savepath = os.path.join(savepath, album.title) if subfolders else savepath
-            filepaths += album.download(_savepath, keep_original_name)
-        for photo in self.photos() + self.clips():
-            filepaths += photo.download(savepath, keep_original_name)
-        return filepaths
-
-    def _getWebURL(self, base=None):
-        """ Get the Plex Web URL with the correct parameters. """
-        return self._server._buildWebURL(base=base, endpoint='details', key=self.key, legacy=1)
-
-    @property
-    def metadataDirectory(self):
-        """ Returns the Plex Media Server data directory where the metadata is stored. """
-        guid_hash = utils.sha1hash(self.guid)
-        return str(Path('Metadata') / 'Photos' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
-
-
-@utils.registerPlexObject
-class Photo(
-    PlexPartialObject, Playable,
-    RatingMixin,
-    ArtUrlMixin, PosterUrlMixin,
-    PhotoEditMixins
-):
-    """ Represents a single Photo.
-
-        Attributes:
-            TAG (str): 'Photo'
-            TYPE (str): 'photo'
-            addedAt (datetime): Datetime the photo was added to the library.
-            createdAtAccuracy (str): Unknown (local).
-            createdAtTZOffset (int): Unknown (-25200).
-            fields (List<:class:`~plexapi.media.Field`>): List of field objects.
-            guid (str): Plex GUID for the photo (com.plexapp.agents.none://231714?lang=xn).
-            images (List<:class:`~plexapi.media.Image`>): List of image objects.
-            index (sting): Plex index number for the photo.
-            key (str): API URL (/library/metadata/<ratingkey>).
-            lastRatedAt (datetime): Datetime the photo was last rated.
-            librarySectionID (int): :class:`~plexapi.library.LibrarySection` ID.
-            librarySectionKey (str): :class:`~plexapi.library.LibrarySection` key.
-            librarySectionTitle (str): :class:`~plexapi.library.LibrarySection` title.
-            listType (str): Hardcoded as 'photo' (useful for search filters).
-            media (List<:class:`~plexapi.media.Media`>): List of media objects.
-            originallyAvailableAt (datetime): Datetime the photo was added to Plex.
-            parentGuid (str): Plex GUID for the photo album (local://229674).
-            parentIndex (int): Plex index number for the photo album.
-            parentKey (str): API URL of the photo album (/library/metadata/<parentRatingKey>).
-            parentRatingKey (int): Unique key identifying the photo album.
-            parentThumb (str): URL to photo album thumbnail image (/library/metadata/<parentRatingKey>/thumb/<thumbid>).
-            parentTitle (str): Name of the photo album for the photo.
-            ratingKey (int): Unique key identifying the photo.
-            sourceURI (str): Remote server URI (server://<machineIdentifier>/com.plexapp.plugins.library)
-                (remote playlist item only).
-            summary (str): Summary of the photo.
-            tags (List<:class:`~plexapi.media.Tag`>): List of tag objects.
-            thumb (str): URL to thumbnail image (/library/metadata/<ratingKey>/thumb/<thumbid>).
-            title (str): Name of the photo.
-            titleSort (str): Title to use when sorting (defaults to title).
-            type (str): 'photo'
-            updatedAt (datetime): Datetime the photo was updated.
-            userRating (float): Rating of the photo (0.0 - 10.0) equaling (0 stars - 5 stars).
-            year (int): Year the photo was taken.
-    """
-    TAG = 'Photo'
-    TYPE = 'photo'
-    METADATA_TYPE = 'photo'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        Playable._loadData(self, data)
-        self.addedAt = utils.toDatetime(data.attrib.get('addedAt'))
-        self.createdAtAccuracy = data.attrib.get('createdAtAccuracy')
-        self.createdAtTZOffset = utils.cast(int, data.attrib.get('createdAtTZOffset'))
-        self.guid = data.attrib.get('guid')
-        self.index = utils.cast(int, data.attrib.get('index'))
-        self.key = data.attrib.get('key', '')
-        self.lastRatedAt = utils.toDatetime(data.attrib.get('lastRatedAt'))
-        self.librarySectionID = utils.cast(int, data.attrib.get('librarySectionID'))
-        self.librarySectionKey = data.attrib.get('librarySectionKey')
-        self.librarySectionTitle = data.attrib.get('librarySectionTitle')
-        self.listType = 'photo'
-        self.originallyAvailableAt = utils.toDatetime(data.attrib.get('originallyAvailableAt'), '%Y-%m-%d')
-        self.parentGuid = data.attrib.get('parentGuid')
-        self.parentIndex = utils.cast(int, data.attrib.get('parentIndex'))
-        self.parentKey = data.attrib.get('parentKey')
-        self.parentRatingKey = utils.cast(int, data.attrib.get('parentRatingKey'))
-        self.parentThumb = data.attrib.get('parentThumb')
-        self.parentTitle = data.attrib.get('parentTitle')
-        self.ratingKey = utils.cast(int, data.attrib.get('ratingKey'))
-        self.sourceURI = data.attrib.get('source')  # remote playlist item
-        self.summary = data.attrib.get('summary')
-        self.thumb = data.attrib.get('thumb')
-        self.title = data.attrib.get('title')
-        self.titleSort = data.attrib.get('titleSort', self.title)
-        self.type = data.attrib.get('type')
-        self.updatedAt = utils.toDatetime(data.attrib.get('updatedAt'))
-        self.userRating = utils.cast(float, data.attrib.get('userRating'))
-        self.year = utils.cast(int, data.attrib.get('year'))
-
-    @cached_data_property
-    def fields(self):
-        return self.findItems(self._data, media.Field)
-
-    @cached_data_property
-    def images(self):
-        return self.findItems(self._data, media.Image)
-
-    @cached_data_property
-    def media(self):
-        return self.findItems(self._data, media.Media)
-
-    @cached_data_property
-    def tags(self):
-        return self.findItems(self._data, media.Tag)
-
-    def _prettyfilename(self):
-        """ Returns a filename for use in download. """
-        if self.parentTitle:
-            return f'{self.parentTitle} - {self.title}'
-        return self.title
-
-    def photoalbum(self):
-        """ Return the photo's :class:`~plexapi.photo.Photoalbum`. """
-        return self.fetchItem(self.parentKey)
-
-    def section(self):
-        """ Returns the :class:`~plexapi.library.LibrarySection` the item belongs to. """
-        if hasattr(self, 'librarySectionID'):
-            return self._server.library.sectionByID(self.librarySectionID)
-        elif self.parentKey:
-            return self._server.library.sectionByID(self.photoalbum().librarySectionID)
-        else:
-            raise BadRequest("Unable to get section for photo, can't find librarySectionID")
-
-    @property
-    def locations(self):
-        """ This does not exist in plex xml response but is added to have a common
-            interface to get the locations of the photo.
-
-            Returns:
-                List<str> of file paths where the photo is found on disk.
-        """
-        return [part.file for item in self.media for part in item.parts if part]
-
-    def sync(self, resolution, client=None, clientId=None, limit=None, title=None):
-        """ Add current photo as sync item for specified device.
-            See :func:`~plexapi.myplex.MyPlexAccount.sync` for possible exceptions.
-
-            Parameters:
-                resolution (str): maximum allowed resolution for synchronized photos, see PHOTO_QUALITY_* values in the
-                                  module :mod:`~plexapi.sync`.
-                client (:class:`~plexapi.myplex.MyPlexDevice`): sync destination, see
-                                                               :func:`~plexapi.myplex.MyPlexAccount.sync`.
-                clientId (str): sync destination, see :func:`~plexapi.myplex.MyPlexAccount.sync`.
-                limit (int): maximum count of items to sync, unlimited if `None`.
-                title (str): descriptive title for the new :class:`~plexapi.sync.SyncItem`, if empty the value would be
-                             generated from metadata of current photo.
-
-            Returns:
-                :class:`~plexapi.sync.SyncItem`: an instance of created syncItem.
-        """
-
-        from plexapi.sync import SyncItem, Policy, MediaSettings
-
-        myplex = self._server.myPlexAccount()
-        sync_item = SyncItem(self._server, None)
-        sync_item.title = title if title else self.title
-        sync_item.rootTitle = self.title
-        sync_item.contentType = self.listType
-        sync_item.metadataType = self.METADATA_TYPE
-        sync_item.machineIdentifier = self._server.machineIdentifier
-
-        section = self.section()
-
-        sync_item.location = f'library://{section.uuid}/item/{quote_plus(self.key)}'
-        sync_item.policy = Policy.create(limit)
-        sync_item.mediaSettings = MediaSettings.createPhoto(resolution)
-
-        return myplex.sync(sync_item, client=client, clientId=clientId)
-
-    def _getWebURL(self, base=None):
-        """ Get the Plex Web URL with the correct parameters. """
-        return self._server._buildWebURL(base=base, endpoint='details', key=self.parentKey, legacy=1)
-
-    @property
-    def metadataDirectory(self):
-        """ Returns the Plex Media Server data directory where the metadata is stored. """
-        guid_hash = utils.sha1hash(self.parentGuid)
-        return str(Path('Metadata') / 'Photos' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
-
-
-@utils.registerPlexObject
-class PhotoSession(PlexSession, Photo):
-    """ Represents a single Photo session
-        loaded from :func:`~plexapi.server.PlexServer.sessions`.
-    """
-    _SESSIONTYPE = True
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        Photo._loadData(self, data)
-        PlexSession._loadData(self, data)
diff --git a/lib/plexapi/playlist.py b/lib/plexapi/playlist.py
deleted file mode 100644
index 0fc79bf5..00000000
--- a/lib/plexapi/playlist.py
+++ /dev/null
@@ -1,541 +0,0 @@
-# -*- coding: utf-8 -*-
-import re
-from itertools import groupby
-from pathlib import Path
-from urllib.parse import quote_plus, unquote
-
-from plexapi import media, utils
-from plexapi.base import Playable, PlexPartialObject, cached_data_property
-from plexapi.exceptions import BadRequest, NotFound, Unsupported
-from plexapi.library import LibrarySection, MusicSection
-from plexapi.mixins import SmartFilterMixin, ArtMixin, PosterMixin, PlaylistEditMixins
-from plexapi.utils import deprecated
-
-
-@utils.registerPlexObject
-class Playlist(
-    PlexPartialObject, Playable,
-    SmartFilterMixin,
-    ArtMixin, PosterMixin,
-    PlaylistEditMixins
-):
-    """ Represents a single Playlist.
-
-        Attributes:
-            TAG (str): 'Playlist'
-            TYPE (str): 'playlist'
-            addedAt (datetime): Datetime the playlist was added to the server.
-            allowSync (bool): True if you allow syncing playlists.
-            composite (str): URL to composite image (/playlist/<ratingKey>/composite/<compositeid>)
-            content (str): The filter URI string for smart playlists.
-            duration (int): Duration of the playlist in milliseconds.
-            durationInSeconds (int): Duration of the playlist in seconds.
-            fields (List<:class:`~plexapi.media.Field`>): List of field objects.
-            guid (str): Plex GUID for the playlist (com.plexapp.agents.none://XXXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXX).
-            icon (str): Icon URI string for smart playlists.
-            key (str): API URL (/playlist/<ratingkey>).
-            leafCount (int): Number of items in the playlist view.
-            librarySectionID (int): Library section identifier (radio only)
-            librarySectionKey (str): Library section key (radio only)
-            librarySectionTitle (str): Library section title (radio only)
-            playlistType (str): 'audio', 'video', or 'photo'
-            radio (bool): If this playlist represents a radio station
-            ratingKey (int): Unique key identifying the playlist.
-            smart (bool): True if the playlist is a smart playlist.
-            summary (str): Summary of the playlist.
-            title (str): Name of the playlist.
-            titleSort (str): Title to use when sorting (defaults to title).
-            type (str): 'playlist'
-            updatedAt (datetime): Datetime the playlist was updated.
-    """
-    TAG = 'Playlist'
-    TYPE = 'playlist'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        Playable._loadData(self, data)
-        self.addedAt = utils.toDatetime(data.attrib.get('addedAt'))
-        self.allowSync = utils.cast(bool, data.attrib.get('allowSync'))
-        self.composite = data.attrib.get('composite')  # url to thumbnail
-        self.content = data.attrib.get('content')
-        self.duration = utils.cast(int, data.attrib.get('duration'))
-        self.durationInSeconds = utils.cast(int, data.attrib.get('durationInSeconds'))
-        self.guid = data.attrib.get('guid')
-        self.icon = data.attrib.get('icon')
-        self.key = data.attrib.get('key', '').replace('/items', '')  # FIX_BUG_50
-        self.leafCount = utils.cast(int, data.attrib.get('leafCount'))
-        self.librarySectionID = utils.cast(int, data.attrib.get('librarySectionID'))
-        self.librarySectionKey = data.attrib.get('librarySectionKey')
-        self.librarySectionTitle = data.attrib.get('librarySectionTitle')
-        self.playlistType = data.attrib.get('playlistType')
-        self.radio = utils.cast(bool, data.attrib.get('radio', 0))
-        self.ratingKey = utils.cast(int, data.attrib.get('ratingKey'))
-        self.smart = utils.cast(bool, data.attrib.get('smart'))
-        self.summary = data.attrib.get('summary')
-        self.title = data.attrib.get('title')
-        self.titleSort = data.attrib.get('titleSort', self.title)
-        self.type = data.attrib.get('type')
-        self.updatedAt = utils.toDatetime(data.attrib.get('updatedAt'))
-
-    @cached_data_property
-    def fields(self):
-        return self.findItems(self._data, media.Field)
-
-    def __len__(self):  # pragma: no cover
-        return len(self.items())
-
-    def __iter__(self):  # pragma: no cover
-        for item in self.items():
-            yield item
-
-    def __contains__(self, other):  # pragma: no cover
-        return any(i.key == other.key for i in self.items())
-
-    def __getitem__(self, key):  # pragma: no cover
-        return self.items()[key]
-
-    @property
-    def thumb(self):
-        """ Alias to self.composite. """
-        return self.composite
-
-    @property
-    def metadataType(self):
-        """ Returns the type of metadata in the playlist (movie, track, or photo). """
-        if self.isVideo:
-            return 'movie'
-        elif self.isAudio:
-            return 'track'
-        elif self.isPhoto:
-            return 'photo'
-        else:
-            raise Unsupported('Unexpected playlist type')
-
-    @property
-    def isVideo(self):
-        """ Returns True if this is a video playlist. """
-        return self.playlistType == 'video'
-
-    @property
-    def isAudio(self):
-        """ Returns True if this is an audio playlist. """
-        return self.playlistType == 'audio'
-
-    @property
-    def isPhoto(self):
-        """ Returns True if this is a photo playlist. """
-        return self.playlistType == 'photo'
-
-    def _getPlaylistItemID(self, item):
-        """ Match an item to a playlist item and return the item playlistItemID. """
-        for _item in self.items():
-            if _item.ratingKey == item.ratingKey:
-                return _item.playlistItemID
-        raise NotFound(f'Item with title "{item.title}" not found in the playlist')
-
-    @cached_data_property
-    def _filters(self):
-        """ Cache for filters. """
-        return self._parseFilters(self.content)
-
-    def filters(self):
-        """ Returns the search filter dict for smart playlist.
-            The filter dict be passed back into :func:`~plexapi.library.LibrarySection.search`
-            to get the list of items.
-        """
-        return self._filters
-
-    @cached_data_property
-    def _section(self):
-        """ Cache for section. """
-        if not self.smart:
-            raise BadRequest('Regular playlists are not associated with a library.')
-
-        # Try to parse the library section from the content URI string
-        match = re.search(r'/library/sections/(\d+)/all', unquote(self.content or ''))
-        if match:
-            sectionKey = int(match.group(1))
-            return self._server.library.sectionByID(sectionKey)
-
-        # Try to get the library section from the first item in the playlist
-        if self.items():
-            return self.items()[0].section()
-
-        raise Unsupported('Unable to determine the library section')
-
-    def section(self):
-        """ Returns the :class:`~plexapi.library.LibrarySection` this smart playlist belongs to.
-
-            Raises:
-                :class:`plexapi.exceptions.BadRequest`: When trying to get the section for a regular playlist.
-                :class:`plexapi.exceptions.Unsupported`: When unable to determine the library section.
-        """
-        return self._section
-
-    def item(self, title):
-        """ Returns the item in the playlist that matches the specified title.
-
-            Parameters:
-                title (str): Title of the item to return.
-
-            Raises:
-                :class:`plexapi.exceptions.NotFound`: When the item is not found in the playlist.
-        """
-        for item in self.items():
-            if item.title.lower() == title.lower():
-                return item
-        raise NotFound(f'Item with title "{title}" not found in the playlist')
-
-    @cached_data_property
-    def _items(self):
-        """ Cache for items. """
-        if self.radio:
-            return []
-
-        key = f'{self.key}/items'
-        items = self.fetchItems(key)
-
-        # Cache server connections to avoid reconnecting for each item
-        _servers = {}
-        for item in items:
-            if item.sourceURI:
-                serverID = item.sourceURI.split('/')[2]
-                if serverID not in _servers:
-                    try:
-                        _servers[serverID] = self._server.myPlexAccount().resource(serverID).connect()
-                    except NotFound:
-                        # Override the server connection with None if the server is not found
-                        _servers[serverID] = None
-                item._server = _servers[serverID]
-
-        return items
-
-    def items(self):
-        """ Returns a list of all items in the playlist. """
-        return self._items
-
-    def get(self, title):
-        """ Alias to :func:`~plexapi.playlist.Playlist.item`. """
-        return self.item(title)
-
-    def addItems(self, items):
-        """ Add items to the playlist.
-
-            Parameters:
-                items (List): List of :class:`~plexapi.audio.Audio`, :class:`~plexapi.video.Video`,
-                    or :class:`~plexapi.photo.Photo` objects to be added to the playlist.
-
-            Raises:
-                :class:`plexapi.exceptions.BadRequest`: When trying to add items to a smart playlist.
-        """
-        if self.smart:
-            raise BadRequest('Cannot add items to a smart playlist.')
-
-        if items and not isinstance(items, (list, tuple)):
-            items = [items]
-
-        # Group items by server to maintain order when adding items from multiple servers
-        for server, _items in groupby(items, key=lambda item: item._server):
-
-            ratingKeys = []
-            for item in _items:
-                if item.listType != self.playlistType:  # pragma: no cover
-                    raise BadRequest(f'Can not mix media types when building a playlist: '
-                                     f'{self.playlistType} and {item.listType}')
-                ratingKeys.append(str(item.ratingKey))
-
-            ratingKeys = ','.join(ratingKeys)
-            uri = f'{server._uriRoot()}/library/metadata/{ratingKeys}'
-
-            args = {'uri': uri}
-            key = f"{self.key}/items{utils.joinArgs(args)}"
-            self._server.query(key, method=self._server._session.put)
-
-        return self
-
-    @deprecated('use "removeItems" instead')
-    def removeItem(self, item):
-        self.removeItems(item)
-
-    def removeItems(self, items):
-        """ Remove items from the playlist.
-
-            Parameters:
-                items (List): List of :class:`~plexapi.audio.Audio`, :class:`~plexapi.video.Video`,
-                    or :class:`~plexapi.photo.Photo` objects to be removed from the playlist.
-
-            Raises:
-                :class:`plexapi.exceptions.BadRequest`: When trying to remove items from a smart playlist.
-                :class:`plexapi.exceptions.NotFound`: When the item does not exist in the playlist.
-        """
-        if self.smart:
-            raise BadRequest('Cannot remove items from a smart playlist.')
-
-        if items and not isinstance(items, (list, tuple)):
-            items = [items]
-
-        for item in items:
-            playlistItemID = self._getPlaylistItemID(item)
-            key = f'{self.key}/items/{playlistItemID}'
-            self._server.query(key, method=self._server._session.delete)
-        return self
-
-    def moveItem(self, item, after=None):
-        """ Move an item to a new position in the playlist.
-
-            Parameters:
-                items (obj): :class:`~plexapi.audio.Audio`, :class:`~plexapi.video.Video`,
-                    or :class:`~plexapi.photo.Photo` objects to be moved in the playlist.
-                after (obj): :class:`~plexapi.audio.Audio`, :class:`~plexapi.video.Video`,
-                    or :class:`~plexapi.photo.Photo` objects to move the item after in the playlist.
-
-            Raises:
-                :class:`plexapi.exceptions.BadRequest`: When trying to move items in a smart playlist.
-                :class:`plexapi.exceptions.NotFound`: When the item or item after does not exist in the playlist.
-        """
-        if self.smart:
-            raise BadRequest('Cannot move items in a smart playlist.')
-
-        playlistItemID = self._getPlaylistItemID(item)
-        key = f'{self.key}/items/{playlistItemID}/move'
-
-        if after:
-            afterPlaylistItemID = self._getPlaylistItemID(after)
-            key += f'?after={afterPlaylistItemID}'
-
-        self._server.query(key, method=self._server._session.put)
-        return self
-
-    def updateFilters(self, limit=None, sort=None, filters=None, **kwargs):
-        """ Update the filters for a smart playlist.
-
-            Parameters:
-                limit (int): Limit the number of items in the playlist.
-                sort (str or list, optional): A string of comma separated sort fields
-                    or a list of sort fields in the format ``column:dir``.
-                    See :func:`~plexapi.library.LibrarySection.search` for more info.
-                filters (dict): A dictionary of advanced filters.
-                    See :func:`~plexapi.library.LibrarySection.search` for more info.
-                **kwargs (dict): Additional custom filters to apply to the search results.
-                    See :func:`~plexapi.library.LibrarySection.search` for more info.
-
-            Raises:
-                :class:`plexapi.exceptions.BadRequest`: When trying update filters for a regular playlist.
-        """
-        if not self.smart:
-            raise BadRequest('Cannot update filters for a regular playlist.')
-
-        section = self.section()
-        searchKey = section._buildSearchKey(
-            sort=sort, libtype=section.METADATA_TYPE, limit=limit, filters=filters, **kwargs)
-        uri = f'{self._server._uriRoot()}{searchKey}'
-
-        args = {'uri': uri}
-        key = f"{self.key}/items{utils.joinArgs(args)}"
-        self._server.query(key, method=self._server._session.put)
-        return self
-
-    def _edit(self, **kwargs):
-        """ Actually edit the playlist. """
-        if isinstance(self._edits, dict):
-            self._edits.update(kwargs)
-            return self
-
-        key = f'{self.key}{utils.joinArgs(kwargs)}'
-        self._server.query(key, method=self._server._session.put)
-        return self
-
-    @deprecated('use "editTitle" and "editSummary" instead')
-    def edit(self, title=None, summary=None):
-        """ Edit the playlist.
-
-            Parameters:
-                title (str, optional): The title of the playlist.
-                summary (str, optional): The summary of the playlist.
-        """
-        args = {}
-        if title:
-            args['title'] = title
-        if summary:
-            args['summary'] = summary
-        return self._edit(**args)
-
-    def delete(self):
-        """ Delete the playlist. """
-        self._server.query(self.key, method=self._server._session.delete)
-
-    @classmethod
-    def _create(cls, server, title, items):
-        """ Create a regular playlist. """
-        if not items:
-            raise BadRequest('Must include items to add when creating new playlist.')
-
-        if items and not isinstance(items, (list, tuple)):
-            items = [items]
-
-        listType = items[0].listType
-        ratingKeys = []
-        for item in items:
-            if item.listType != listType:  # pragma: no cover
-                raise BadRequest('Can not mix media types when building a playlist.')
-            ratingKeys.append(str(item.ratingKey))
-
-        ratingKeys = ','.join(ratingKeys)
-        uri = f'{server._uriRoot()}/library/metadata/{ratingKeys}'
-
-        args = {'uri': uri, 'type': listType, 'title': title, 'smart': 0}
-        key = f"/playlists{utils.joinArgs(args)}"
-        data = server.query(key, method=server._session.post)[0]
-        return cls(server, data, initpath=key)
-
-    @classmethod
-    def _createSmart(cls, server, title, section, limit=None, libtype=None, sort=None, filters=None, **kwargs):
-        """ Create a smart playlist. """
-        if not isinstance(section, LibrarySection):
-            section = server.library.section(section)
-
-        libtype = libtype or section.METADATA_TYPE
-
-        searchKey = section._buildSearchKey(
-            sort=sort, libtype=libtype, limit=limit, filters=filters, **kwargs)
-        uri = f'{server._uriRoot()}{searchKey}'
-
-        args = {'uri': uri, 'type': section.CONTENT_TYPE, 'title': title, 'smart': 1}
-        key = f"/playlists{utils.joinArgs(args)}"
-        data = server.query(key, method=server._session.post)[0]
-        return cls(server, data, initpath=key)
-
-    @classmethod
-    def _createFromM3U(cls, server, title, section, m3ufilepath):
-        """ Create a playlist from uploading an m3u file. """
-        if not isinstance(section, LibrarySection):
-            section = server.library.section(section)
-
-        if not isinstance(section, MusicSection):
-            raise BadRequest('Can only create playlists from m3u files in a music library.')
-
-        args = {'sectionID': section.key, 'path': m3ufilepath}
-        key = f"/playlists/upload{utils.joinArgs(args)}"
-        server.query(key, method=server._session.post)
-        try:
-            return server.playlists(sectionId=section.key, guid__endswith=m3ufilepath)[0].editTitle(title).reload()
-        except IndexError:
-            raise BadRequest('Failed to create playlist from m3u file.') from None
-
-    @classmethod
-    def create(cls, server, title, section=None, items=None, smart=False, limit=None,
-               libtype=None, sort=None, filters=None, m3ufilepath=None, **kwargs):
-        """ Create a playlist.
-
-            Parameters:
-                server (:class:`~plexapi.server.PlexServer`): Server to create the playlist on.
-                title (str): Title of the playlist.
-                section (:class:`~plexapi.library.LibrarySection`, str): Smart playlists and m3u import only,
-                    the library section to create the playlist in.
-                items (List): Regular playlists only, list of :class:`~plexapi.audio.Audio`,
-                    :class:`~plexapi.video.Video`, or :class:`~plexapi.photo.Photo` objects to be added to the playlist.
-                smart (bool): True to create a smart playlist. Default False.
-                limit (int): Smart playlists only, limit the number of items in the playlist.
-                libtype (str): Smart playlists only, the specific type of content to filter
-                    (movie, show, season, episode, artist, album, track, photoalbum, photo).
-                sort (str or list, optional): Smart playlists only, a string of comma separated sort fields
-                    or a list of sort fields in the format ``column:dir``.
-                    See :func:`~plexapi.library.LibrarySection.search` for more info.
-                filters (dict): Smart playlists only, a dictionary of advanced filters.
-                    See :func:`~plexapi.library.LibrarySection.search` for more info.
-                m3ufilepath (str): Music playlists only, the full file path to an m3u file to import.
-                    Note: This will overwrite any playlist previously created from the same m3u file.
-                **kwargs (dict): Smart playlists only, additional custom filters to apply to the
-                    search results. See :func:`~plexapi.library.LibrarySection.search` for more info.
-
-            Raises:
-                :class:`plexapi.exceptions.BadRequest`: When no items are included to create the playlist.
-                :class:`plexapi.exceptions.BadRequest`: When mixing media types in the playlist.
-                :class:`plexapi.exceptions.BadRequest`: When attempting to import m3u file into non-music library.
-                :class:`plexapi.exceptions.BadRequest`: When failed to import m3u file.
-
-            Returns:
-                :class:`~plexapi.playlist.Playlist`: A new instance of the created Playlist.
-        """
-        if m3ufilepath:
-            return cls._createFromM3U(server, title, section, m3ufilepath)
-        elif smart:
-            if items:
-                raise BadRequest('Cannot create a smart playlist with items.')
-            return cls._createSmart(server, title, section, limit, libtype, sort, filters, **kwargs)
-        else:
-            return cls._create(server, title, items)
-
-    def copyToUser(self, user):
-        """ Copy playlist to another user account.
-
-            Parameters:
-                user (:class:`~plexapi.myplex.MyPlexUser` or str): `MyPlexUser` object, username,
-                    email, or user id of the user to copy the playlist to.
-        """
-        userServer = self._server.switchUser(user)
-        return self.create(server=userServer, title=self.title, items=self.items())
-
-    def sync(self, videoQuality=None, photoResolution=None, audioBitrate=None, client=None, clientId=None, limit=None,
-             unwatched=False, title=None):
-        """ Add the playlist as a sync item for the specified device.
-            See :func:`~plexapi.myplex.MyPlexAccount.sync` for possible exceptions.
-
-            Parameters:
-                videoQuality (int): idx of quality of the video, one of VIDEO_QUALITY_* values defined in
-                                    :mod:`~plexapi.sync` module. Used only when playlist contains video.
-                photoResolution (str): maximum allowed resolution for synchronized photos, see PHOTO_QUALITY_* values in
-                                       the module :mod:`~plexapi.sync`. Used only when playlist contains photos.
-                audioBitrate (int): maximum bitrate for synchronized music, better use one of MUSIC_BITRATE_* values
-                                    from the module :mod:`~plexapi.sync`. Used only when playlist contains audio.
-                client (:class:`~plexapi.myplex.MyPlexDevice`): sync destination, see
-                                                               :func:`~plexapi.myplex.MyPlexAccount.sync`.
-                clientId (str): sync destination, see :func:`~plexapi.myplex.MyPlexAccount.sync`.
-                limit (int): maximum count of items to sync, unlimited if `None`.
-                unwatched (bool): if `True` watched videos wouldn't be synced.
-                title (str): descriptive title for the new :class:`~plexapi.sync.SyncItem`, if empty the value would be
-                             generated from metadata of current photo.
-
-            Raises:
-                :exc:`~plexapi.exceptions.BadRequest`: When playlist is not allowed to sync.
-                :exc:`~plexapi.exceptions.Unsupported`: When playlist content is unsupported.
-
-            Returns:
-                :class:`~plexapi.sync.SyncItem`: A new instance of the created sync item.
-        """
-        if not self.allowSync:
-            raise BadRequest('The playlist is not allowed to sync')
-
-        from plexapi.sync import SyncItem, Policy, MediaSettings
-
-        myplex = self._server.myPlexAccount()
-        sync_item = SyncItem(self._server, None)
-        sync_item.title = title if title else self.title
-        sync_item.rootTitle = self.title
-        sync_item.contentType = self.playlistType
-        sync_item.metadataType = self.metadataType
-        sync_item.machineIdentifier = self._server.machineIdentifier
-
-        sync_item.location = f'playlist:///{quote_plus(self.guid)}'
-        sync_item.policy = Policy.create(limit, unwatched)
-
-        if self.isVideo:
-            sync_item.mediaSettings = MediaSettings.createVideo(videoQuality)
-        elif self.isAudio:
-            sync_item.mediaSettings = MediaSettings.createMusic(audioBitrate)
-        elif self.isPhoto:
-            sync_item.mediaSettings = MediaSettings.createPhoto(photoResolution)
-        else:
-            raise Unsupported('Unsupported playlist content')
-
-        return myplex.sync(sync_item, client=client, clientId=clientId)
-
-    def _getWebURL(self, base=None):
-        """ Get the Plex Web URL with the correct parameters. """
-        return self._server._buildWebURL(base=base, endpoint='playlist', key=self.key)
-
-    @property
-    def metadataDirectory(self):
-        """ Returns the Plex Media Server data directory where the metadata is stored. """
-        guid_hash = utils.sha1hash(self.guid)
-        return str(Path('Metadata') / 'Playlists' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
diff --git a/lib/plexapi/playqueue.py b/lib/plexapi/playqueue.py
deleted file mode 100644
index 8875ef07..00000000
--- a/lib/plexapi/playqueue.py
+++ /dev/null
@@ -1,322 +0,0 @@
-# -*- coding: utf-8 -*-
-from urllib.parse import quote_plus
-
-from plexapi import utils
-from plexapi.base import PlexObject, cached_data_property
-from plexapi.exceptions import BadRequest
-
-
-class PlayQueue(PlexObject):
-    """Control a PlayQueue.
-
-    Attributes:
-        TAG (str): 'PlayQueue'
-        TYPE (str): 'playqueue'
-        identifier (str): com.plexapp.plugins.library
-        items (list): List of :class:`~plexapi.base.Playable` or :class:`~plexapi.playlist.Playlist`
-        mediaTagPrefix (str): Fx /system/bundle/media/flags/
-        mediaTagVersion (int): Fx 1485957738
-        playQueueID (int): ID of the PlayQueue.
-        playQueueLastAddedItemID (int):
-            Defines where the "Up Next" region starts. Empty unless PlayQueue is modified after creation.
-        playQueueSelectedItemID (int): The queue item ID of the currently selected item.
-        playQueueSelectedItemOffset (int):
-            The offset of the selected item in the PlayQueue, from the beginning of the queue.
-        playQueueSelectedMetadataItemID (int): ID of the currently selected item, matches ratingKey.
-        playQueueShuffled (bool): True if shuffled.
-        playQueueSourceURI (str): Original URI used to create the PlayQueue.
-        playQueueTotalCount (int): How many items in the PlayQueue.
-        playQueueVersion (int): Version of the PlayQueue. Increments every time a change is made to the PlayQueue.
-        selectedItem (:class:`~plexapi.base.Playable`): Media object for the currently selected item.
-        _server (:class:`~plexapi.server.PlexServer`): PlexServer associated with the PlayQueue.
-        size (int): Alias for playQueueTotalCount.
-    """
-
-    TAG = "PlayQueue"
-    TYPE = "playqueue"
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.identifier = data.attrib.get("identifier")
-        self.mediaTagPrefix = data.attrib.get("mediaTagPrefix")
-        self.mediaTagVersion = utils.cast(int, data.attrib.get("mediaTagVersion"))
-        self.playQueueID = utils.cast(int, data.attrib.get("playQueueID"))
-        self.playQueueLastAddedItemID = utils.cast(
-            int, data.attrib.get("playQueueLastAddedItemID")
-        )
-        self.playQueueSelectedItemID = utils.cast(
-            int, data.attrib.get("playQueueSelectedItemID")
-        )
-        self.playQueueSelectedItemOffset = utils.cast(
-            int, data.attrib.get("playQueueSelectedItemOffset")
-        )
-        self.playQueueSelectedMetadataItemID = utils.cast(
-            int, data.attrib.get("playQueueSelectedMetadataItemID")
-        )
-        self.playQueueShuffled = utils.cast(
-            bool, data.attrib.get("playQueueShuffled", 0)
-        )
-        self.playQueueSourceURI = data.attrib.get("playQueueSourceURI")
-        self.playQueueTotalCount = utils.cast(
-            int, data.attrib.get("playQueueTotalCount")
-        )
-        self.playQueueVersion = utils.cast(int, data.attrib.get("playQueueVersion"))
-        self.size = utils.cast(int, data.attrib.get("size", 0))
-        self.selectedItem = self[self.playQueueSelectedItemOffset]
-
-    @cached_data_property
-    def items(self):
-        return self.findItems(self._data)
-
-    def __getitem__(self, key):
-        if not self.items:
-            return None
-        return self.items[key]
-
-    def __len__(self):
-        return self.playQueueTotalCount
-
-    def __iter__(self):
-        yield from self.items
-
-    def __contains__(self, media):
-        """Returns True if the PlayQueue contains the provided media item."""
-        return any(x.playQueueItemID == media.playQueueItemID for x in self.items)
-
-    def getQueueItem(self, item):
-        """
-        Accepts a media item and returns a similar object from this PlayQueue.
-        Useful for looking up playQueueItemIDs using items obtained from the Library.
-        """
-        matches = [x for x in self.items if x == item]
-        if len(matches) == 1:
-            return matches[0]
-        elif len(matches) > 1:
-            raise BadRequest(
-                f"{item} occurs multiple times in this PlayQueue, provide exact item"
-            )
-        else:
-            raise BadRequest(f"{item} not valid for this PlayQueue")
-
-    @classmethod
-    def get(
-        cls,
-        server,
-        playQueueID,
-        own=False,
-        center=None,
-        window=50,
-        includeBefore=True,
-        includeAfter=True,
-    ):
-        """Retrieve an existing :class:`~plexapi.playqueue.PlayQueue` by identifier.
-
-        Parameters:
-            server (:class:`~plexapi.server.PlexServer`): Server you are connected to.
-            playQueueID (int): Identifier of an existing PlayQueue.
-            own (bool, optional): If server should transfer ownership.
-            center (int, optional): The playQueueItemID of the center of the window. Does not change selectedItem.
-            window (int, optional): Number of items to return from each side of the center item.
-            includeBefore (bool, optional):
-                Include items before the center, defaults True. Does not include center if False.
-            includeAfter (bool, optional):
-                Include items after the center, defaults True. Does not include center if False.
-        """
-        args = {
-            "own": utils.cast(int, own),
-            "window": window,
-            "includeBefore": utils.cast(int, includeBefore),
-            "includeAfter": utils.cast(int, includeAfter),
-        }
-        if center:
-            args["center"] = center
-
-        path = f"/playQueues/{playQueueID}{utils.joinArgs(args)}"
-        data = server.query(path, method=server._session.get)
-        c = cls(server, data, initpath=path)
-        c._server = server
-        return c
-
-    @classmethod
-    def create(
-        cls,
-        server,
-        items,
-        startItem=None,
-        shuffle=0,
-        repeat=0,
-        includeChapters=1,
-        includeRelated=1,
-        continuous=0,
-    ):
-        """Create and return a new :class:`~plexapi.playqueue.PlayQueue`.
-
-        Parameters:
-            server (:class:`~plexapi.server.PlexServer`): Server you are connected to.
-            items (:class:`~plexapi.base.PlexPartialObject`):
-                A media item or a list of media items.
-            startItem (:class:`~plexapi.base.Playable`, optional):
-                Media item in the PlayQueue where playback should begin.
-            shuffle (int, optional): Start the playqueue shuffled.
-            repeat (int, optional): Start the playqueue shuffled.
-            includeChapters (int, optional): include Chapters.
-            includeRelated (int, optional): include Related.
-            continuous (int, optional): include additional items after the initial item.
-                For a show this would be the next episodes, for a movie it does nothing.
-        """
-        args = {
-            "includeChapters": includeChapters,
-            "includeRelated": includeRelated,
-            "repeat": repeat,
-            "shuffle": shuffle,
-            "continuous": continuous,
-        }
-
-        if isinstance(items, list):
-            item_keys = ",".join(str(x.ratingKey) for x in items)
-            uri_args = quote_plus(f"/library/metadata/{item_keys}")
-            args["uri"] = f"library:///directory/{uri_args}"
-            args["type"] = items[0].listType
-        else:
-            if items.type == "playlist":
-                args["type"] = items.playlistType
-                args["playlistID"] = items.ratingKey
-            else:
-                args["type"] = items.listType
-            args["uri"] = f"server://{server.machineIdentifier}/{server.library.identifier}{items.key}"
-
-        if startItem:
-            args["key"] = startItem.key
-
-        path = f"/playQueues{utils.joinArgs(args)}"
-        data = server.query(path, method=server._session.post)
-        c = cls(server, data, initpath=path)
-        c._server = server
-        return c
-
-    @classmethod
-    def fromStationKey(cls, server, key):
-        """Create and return a new :class:`~plexapi.playqueue.PlayQueue`.
-
-        This is a convenience method to create a `PlayQueue` for
-        radio stations when only the `key` string is available.
-
-        Parameters:
-            server (:class:`~plexapi.server.PlexServer`): Server you are connected to.
-            key (str): A station key as provided by :func:`~plexapi.library.LibrarySection.hubs()`
-                or :func:`~plexapi.audio.Artist.station()`
-
-        Example:
-
-            .. code-block:: python
-
-                from plexapi.playqueue import PlayQueue
-                music = server.library.section("Music")
-                artist = music.get("Artist Name")
-                station = artist.station()
-                key = station.key  # "/library/metadata/12855/station/8bd39616-dbdb-459e-b8da-f46d0b170af4?type=10"
-                pq = PlayQueue.fromStationKey(server, key)
-                client = server.clients()[0]
-                client.playMedia(pq)
-        """
-        args = {
-            "type": "audio",
-            "uri": f"server://{server.machineIdentifier}/{server.library.identifier}{key}"
-        }
-        path = f"/playQueues{utils.joinArgs(args)}"
-        data = server.query(path, method=server._session.post)
-        c = cls(server, data, initpath=path)
-        c._server = server
-        return c
-
-    def addItem(self, item, playNext=False, refresh=True):
-        """
-        Append the provided item to the "Up Next" section of the PlayQueue.
-        Items can only be added to the section immediately following the current playing item.
-
-        Parameters:
-            item (:class:`~plexapi.base.Playable` or :class:`~plexapi.playlist.Playlist`): Single media item or Playlist.
-            playNext (bool, optional): If True, add this item to the front of the "Up Next" section.
-                If False, the item will be appended to the end of the "Up Next" section.
-                Only has an effect if an item has already been added to the "Up Next" section.
-                See https://support.plex.tv/articles/202188298-play-queues/ for more details.
-            refresh (bool, optional): Refresh the PlayQueue from the server before updating.
-        """
-        if refresh:
-            self.refresh()
-
-        args = {}
-        if item.type == "playlist":
-            args["playlistID"] = item.ratingKey
-        else:
-            uuid = item.section().uuid
-            args["uri"] = f"library://{uuid}/item{item.key}"
-
-        if playNext:
-            args["next"] = 1
-
-        path = f"/playQueues/{self.playQueueID}{utils.joinArgs(args)}"
-        data = self._server.query(path, method=self._server._session.put)
-        self._invalidateCacheAndLoadData(data)
-        return self
-
-    def moveItem(self, item, after=None, refresh=True):
-        """
-        Moves an item to the beginning of the PlayQueue.  If `after` is provided,
-        the item will be placed immediately after the specified item.
-
-        Parameters:
-            item (:class:`~plexapi.base.Playable`): An existing item in the PlayQueue to move.
-            afterItemID (:class:`~plexapi.base.Playable`, optional): A different item in the PlayQueue.
-                If provided, `item` will be placed in the PlayQueue after this item.
-            refresh (bool, optional): Refresh the PlayQueue from the server before updating.
-        """
-        args = {}
-
-        if refresh:
-            self.refresh()
-
-        if item not in self:
-            item = self.getQueueItem(item)
-
-        if after:
-            if after not in self:
-                after = self.getQueueItem(after)
-            args["after"] = after.playQueueItemID
-
-        path = f"/playQueues/{self.playQueueID}/items/{item.playQueueItemID}/move{utils.joinArgs(args)}"
-        data = self._server.query(path, method=self._server._session.put)
-        self._invalidateCacheAndLoadData(data)
-        return self
-
-    def removeItem(self, item, refresh=True):
-        """Remove an item from the PlayQueue.
-
-        Parameters:
-            item (:class:`~plexapi.base.Playable`): An existing item in the PlayQueue to move.
-            refresh (bool, optional): Refresh the PlayQueue from the server before updating.
-        """
-        if refresh:
-            self.refresh()
-
-        if item not in self:
-            item = self.getQueueItem(item)
-
-        path = f"/playQueues/{self.playQueueID}/items/{item.playQueueItemID}"
-        data = self._server.query(path, method=self._server._session.delete)
-        self._invalidateCacheAndLoadData(data)
-        return self
-
-    def clear(self):
-        """Remove all items from the PlayQueue."""
-        path = f"/playQueues/{self.playQueueID}/items"
-        data = self._server.query(path, method=self._server._session.delete)
-        self._invalidateCacheAndLoadData(data)
-        return self
-
-    def refresh(self):
-        """Refresh the PlayQueue from the Plex server."""
-        path = f"/playQueues/{self.playQueueID}"
-        data = self._server.query(path, method=self._server._session.get)
-        self._invalidateCacheAndLoadData(data)
-        return self
diff --git a/lib/plexapi/server.py b/lib/plexapi/server.py
deleted file mode 100644
index 239036c4..00000000
--- a/lib/plexapi/server.py
+++ /dev/null
@@ -1,1310 +0,0 @@
-# -*- coding: utf-8 -*-
-import os
-from urllib.parse import urlencode
-
-import requests
-
-from plexapi import BASE_HEADERS, CONFIG, TIMEOUT, log, logfilter
-from plexapi import utils
-from plexapi.alert import AlertListener
-from plexapi.base import PlexObject, cached_data_property
-from plexapi.client import PlexClient
-from plexapi.collection import Collection
-from plexapi.exceptions import BadRequest, NotFound, Unauthorized
-from plexapi.library import Hub, Library, Path, File
-from plexapi.media import Conversion, Optimized
-from plexapi.playlist import Playlist
-from plexapi.playqueue import PlayQueue
-from plexapi.settings import Settings
-from plexapi.utils import deprecated
-from requests.status_codes import _codes as codes
-
-# Need these imports to populate utils.PLEXOBJECTS
-from plexapi import audio as _audio  # noqa: F401
-from plexapi import collection as _collection  # noqa: F401
-from plexapi import media as _media  # noqa: F401
-from plexapi import photo as _photo  # noqa: F401
-from plexapi import playlist as _playlist  # noqa: F401
-from plexapi import video as _video  # noqa: F401
-
-
-class PlexServer(PlexObject):
-    """ This is the main entry point to interacting with a Plex server. It allows you to
-        list connected clients, browse your library sections and perform actions such as
-        emptying trash. If you do not know the auth token required to access your Plex
-        server, or simply want to access your server with your username and password, you
-        can also create an PlexServer instance from :class:`~plexapi.myplex.MyPlexAccount`.
-
-        Parameters:
-            baseurl (str): Base url for to access the Plex Media Server (default: 'http://localhost:32400').
-            token (str): Required Plex authentication token to access the server.
-            session (requests.Session, optional): Use your own session object if you want to
-                cache the http responses from the server.
-            timeout (int, optional): Timeout in seconds on initial connection to the server
-                (default config.TIMEOUT).
-
-        Attributes:
-            allowCameraUpload (bool): True if server allows camera upload.
-            allowChannelAccess (bool): True if server allows channel access (iTunes?).
-            allowMediaDeletion (bool): True is server allows media to be deleted.
-            allowSharing (bool): True is server allows sharing.
-            allowSync (bool): True is server allows sync.
-            backgroundProcessing (bool): Unknown
-            certificate (bool): True if server has an HTTPS certificate.
-            companionProxy (bool): Unknown
-            diagnostics (bool): Unknown
-            eventStream (bool): Unknown
-            friendlyName (str): Human friendly name for this server.
-            hubSearch (bool): True if `Hub Search <https://www.plex.tv/blog
-                /seek-plex-shall-find-leveling-web-app/>`_ is enabled. I believe this
-                is enabled for everyone
-            machineIdentifier (str): Unique ID for this server (looks like an md5).
-            multiuser (bool): True if `multiusers <https://support.plex.tv/hc/en-us/articles
-                /200250367-Multi-User-Support>`_ are enabled.
-            myPlex (bool): Unknown (True if logged into myPlex?).
-            myPlexMappingState (str): Unknown (ex: mapped).
-            myPlexSigninState (str): Unknown (ex: ok).
-            myPlexSubscription (bool): True if you have a myPlex subscription.
-            myPlexUsername (str): Email address if signed into myPlex (user@example.com)
-            ownerFeatures (list): List of features allowed by the server owner. This may be based
-                on your PlexPass subscription. Features include: camera_upload, cloudsync,
-                content_filter, dvr, hardware_transcoding, home, lyrics, music_videos, pass,
-                photo_autotags, premium_music_metadata, session_bandwidth_restrictions, sync,
-                trailers, webhooks (and maybe more).
-            photoAutoTag (bool): True if photo `auto-tagging <https://support.plex.tv/hc/en-us
-                /articles/234976627-Auto-Tagging-of-Photos>`_ is enabled.
-            platform (str): Platform the server is hosted on (ex: Linux)
-            platformVersion (str): Platform version (ex: '6.1 (Build 7601)', '4.4.0-59-generic').
-            pluginHost (bool): Unknown
-            readOnlyLibraries (bool): Unknown
-            requestParametersInCookie (bool): Unknown
-            streamingBrainVersion (bool): Current `Streaming Brain <https://www.plex.tv/blog
-                /mcstreamy-brain-take-world-two-easy-steps/>`_ version.
-            sync (bool): True if `syncing to a device <https://support.plex.tv/hc/en-us/articles
-                /201053678-Sync-Media-to-a-Device>`_ is enabled.
-            transcoderActiveVideoSessions (int): Number of active video transcoding sessions.
-            transcoderAudio (bool): True if audio transcoding audio is available.
-            transcoderLyrics (bool): True if audio transcoding lyrics is available.
-            transcoderPhoto (bool): True if audio transcoding photos is available.
-            transcoderSubtitles (bool): True if audio transcoding subtitles is available.
-            transcoderVideo (bool): True if audio transcoding video is available.
-            transcoderVideoBitrates (bool): List of video bitrates.
-            transcoderVideoQualities (bool): List of video qualities.
-            transcoderVideoResolutions (bool): List of video resolutions.
-            updatedAt (int): Datetime the server was updated.
-            updater (bool): Unknown
-            version (str): Current Plex version (ex: 1.3.2.3112-1751929)
-            voiceSearch (bool): True if voice search is enabled. (is this Google Voice search?)
-            _baseurl (str): HTTP address of the client.
-            _token (str): Token used to access this client.
-            _session (obj): Requests session object used to access this client.
-    """
-    key = '/'
-
-    def __init__(self, baseurl=None, token=None, session=None, timeout=None):
-        self._baseurl = baseurl or CONFIG.get('auth.server_baseurl', 'http://localhost:32400')
-        self._baseurl = self._baseurl.rstrip('/')
-        self._token = logfilter.add_secret(token or CONFIG.get('auth.server_token'))
-        self._showSecrets = CONFIG.get('log.show_secrets', '').lower() == 'true'
-        self._session = session or requests.Session()
-        self._timeout = timeout or TIMEOUT
-        data = self.query(self.key, timeout=self._timeout)
-        super(PlexServer, self).__init__(self, data, self.key)
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.allowCameraUpload = utils.cast(bool, data.attrib.get('allowCameraUpload'))
-        self.allowChannelAccess = utils.cast(bool, data.attrib.get('allowChannelAccess'))
-        self.allowMediaDeletion = utils.cast(bool, data.attrib.get('allowMediaDeletion'))
-        self.allowSharing = utils.cast(bool, data.attrib.get('allowSharing'))
-        self.allowSync = utils.cast(bool, data.attrib.get('allowSync'))
-        self.backgroundProcessing = utils.cast(bool, data.attrib.get('backgroundProcessing'))
-        self.certificate = utils.cast(bool, data.attrib.get('certificate'))
-        self.companionProxy = utils.cast(bool, data.attrib.get('companionProxy'))
-        self.diagnostics = utils.toList(data.attrib.get('diagnostics'))
-        self.eventStream = utils.cast(bool, data.attrib.get('eventStream'))
-        self.friendlyName = data.attrib.get('friendlyName')
-        self.hubSearch = utils.cast(bool, data.attrib.get('hubSearch'))
-        self.machineIdentifier = data.attrib.get('machineIdentifier')
-        self.multiuser = utils.cast(bool, data.attrib.get('multiuser'))
-        self.myPlex = utils.cast(bool, data.attrib.get('myPlex'))
-        self.myPlexMappingState = data.attrib.get('myPlexMappingState')
-        self.myPlexSigninState = data.attrib.get('myPlexSigninState')
-        self.myPlexSubscription = utils.cast(bool, data.attrib.get('myPlexSubscription'))
-        self.myPlexUsername = data.attrib.get('myPlexUsername')
-        self.ownerFeatures = utils.toList(data.attrib.get('ownerFeatures'))
-        self.photoAutoTag = utils.cast(bool, data.attrib.get('photoAutoTag'))
-        self.platform = data.attrib.get('platform')
-        self.platformVersion = data.attrib.get('platformVersion')
-        self.pluginHost = utils.cast(bool, data.attrib.get('pluginHost'))
-        self.readOnlyLibraries = utils.cast(int, data.attrib.get('readOnlyLibraries'))
-        self.requestParametersInCookie = utils.cast(bool, data.attrib.get('requestParametersInCookie'))
-        self.streamingBrainVersion = data.attrib.get('streamingBrainVersion')
-        self.sync = utils.cast(bool, data.attrib.get('sync'))
-        self.transcoderActiveVideoSessions = int(data.attrib.get('transcoderActiveVideoSessions', 0))
-        self.transcoderAudio = utils.cast(bool, data.attrib.get('transcoderAudio'))
-        self.transcoderLyrics = utils.cast(bool, data.attrib.get('transcoderLyrics'))
-        self.transcoderPhoto = utils.cast(bool, data.attrib.get('transcoderPhoto'))
-        self.transcoderSubtitles = utils.cast(bool, data.attrib.get('transcoderSubtitles'))
-        self.transcoderVideo = utils.cast(bool, data.attrib.get('transcoderVideo'))
-        self.transcoderVideoBitrates = utils.toList(data.attrib.get('transcoderVideoBitrates'))
-        self.transcoderVideoQualities = utils.toList(data.attrib.get('transcoderVideoQualities'))
-        self.transcoderVideoResolutions = utils.toList(data.attrib.get('transcoderVideoResolutions'))
-        self.updatedAt = utils.toDatetime(data.attrib.get('updatedAt'))
-        self.updater = utils.cast(bool, data.attrib.get('updater'))
-        self.version = data.attrib.get('version')
-        self.voiceSearch = utils.cast(bool, data.attrib.get('voiceSearch'))
-
-    def _headers(self, **kwargs):
-        """ Returns dict containing base headers for all requests to the server. """
-        headers = BASE_HEADERS.copy()
-        if self._token:
-            headers['X-Plex-Token'] = self._token
-        headers.update(kwargs)
-        return headers
-
-    def _uriRoot(self):
-        return f'server://{self.machineIdentifier}/com.plexapp.plugins.library'
-
-    @cached_data_property
-    def library(self):
-        """ Library to browse or search your media. """
-        try:
-            data = self.query(Library.key)
-        except BadRequest:
-            # Only the owner has access to /library
-            # so just return the library without the data.
-            data = self.query('/library/sections/')
-        return Library(self, data)
-
-    @cached_data_property
-    def settings(self):
-        """ Returns a list of all server settings. """
-        data = self.query(Settings.key)
-        return Settings(self, data)
-
-    def identity(self):
-        """ Returns the Plex server identity. """
-        data = self.query('/identity')
-        return Identity(self, data)
-
-    def account(self):
-        """ Returns the :class:`~plexapi.server.Account` object this server belongs to. """
-        data = self.query(Account.key)
-        return Account(self, data)
-
-    def claim(self, account):
-        """ Claim the Plex server using a :class:`~plexapi.myplex.MyPlexAccount`.
-            This will only work with an unclaimed server on localhost or the same subnet.
-
-            Parameters:
-                account (:class:`~plexapi.myplex.MyPlexAccount`): The account used to
-                    claim the server.
-        """
-        key = '/myplex/claim'
-        params = {'token': account.claimToken()}
-        data = self.query(key, method=self._session.post, params=params)
-        return Account(self, data)
-
-    def unclaim(self):
-        """ Unclaim the Plex server. This will remove the server from your
-            :class:`~plexapi.myplex.MyPlexAccount`.
-        """
-        data = self.query(Account.key, method=self._session.delete)
-        return Account(self, data)
-
-    @property
-    def activities(self):
-        """Returns all current PMS activities."""
-        activities = []
-        for elem in self.query(Activity.key):
-            activities.append(Activity(self, elem))
-        return activities
-
-    def agents(self, mediaType=None):
-        """ Returns a list of :class:`~plexapi.media.Agent` objects this server has available. """
-        key = '/system/agents'
-        if mediaType:
-            key += f'?mediaType={utils.searchType(mediaType)}'
-        return self.fetchItems(key)
-
-    def createToken(self, type='delegation', scope='all'):
-        """ Create a temp access token for the server. """
-        if not self._token:
-            # Handle unclaimed servers
-            return None
-        q = self.query(f'/security/token?type={type}&scope={scope}')
-        return q.attrib.get('token')
-
-    def switchUser(self, user, session=None, timeout=None):
-        """ Returns a new :class:`~plexapi.server.PlexServer` object logged in as the given username.
-            Note: Only the admin account can switch to other users.
-
-            Parameters:
-                user (:class:`~plexapi.myplex.MyPlexUser` or str): `MyPlexUser` object, username,
-                    email, or user id of the user to log in to the server.
-                session (requests.Session, optional): Use your own session object if you want to
-                    cache the http responses from the server. This will default to the same
-                    session as the admin account if no new session is provided.
-                timeout (int, optional): Timeout in seconds on initial connection to the server.
-                    This will default to the same timeout as the admin account if no new timeout
-                    is provided.
-
-            Example:
-
-                .. code-block:: python
-
-                    from plexapi.server import PlexServer
-                    # Login to the Plex server using the admin token
-                    plex = PlexServer('http://plexserver:32400', token='2ffLuB84dqLswk9skLos')
-                    # Login to the same Plex server using a different account
-                    userPlex = plex.switchUser("Username")
-
-        """
-        from plexapi.myplex import MyPlexUser
-        user = user if isinstance(user, MyPlexUser) else self.myPlexAccount().user(user)
-        userToken = user.get_token(self.machineIdentifier)
-        if session is None:
-            session = self._session
-        if timeout is None:
-            timeout = self._timeout
-        return PlexServer(self._baseurl, token=userToken, session=session, timeout=timeout)
-
-    @cached_data_property
-    def _systemAccounts(self):
-        """ Cache for systemAccounts. """
-        key = '/accounts'
-        return self.fetchItems(key, SystemAccount)
-
-    def systemAccounts(self):
-        """ Returns a list of :class:`~plexapi.server.SystemAccount` objects this server contains. """
-        return self._systemAccounts
-
-    def systemAccount(self, accountID):
-        """ Returns the :class:`~plexapi.server.SystemAccount` object for the specified account ID.
-
-            Parameters:
-                accountID (int): The :class:`~plexapi.server.SystemAccount` ID.
-        """
-        try:
-            return next(account for account in self.systemAccounts() if account.id == accountID)
-        except StopIteration:
-            raise NotFound(f'Unknown account with accountID={accountID}') from None
-
-    @cached_data_property
-    def _systemDevices(self):
-        """ Cache for systemDevices. """
-        key = '/devices'
-        return self.fetchItems(key, SystemDevice)
-
-    def systemDevices(self):
-        """ Returns a list of :class:`~plexapi.server.SystemDevice` objects this server contains. """
-        return self._systemDevices
-
-    def systemDevice(self, deviceID):
-        """ Returns the :class:`~plexapi.server.SystemDevice` object for the specified device ID.
-
-            Parameters:
-                deviceID (int): The :class:`~plexapi.server.SystemDevice` ID.
-        """
-        try:
-            return next(device for device in self.systemDevices() if device.id == deviceID)
-        except StopIteration:
-            raise NotFound(f'Unknown device with deviceID={deviceID}') from None
-
-    @cached_data_property
-    def _myPlexAccount(self):
-        """ Cache for myPlexAccount. """
-        from plexapi.myplex import MyPlexAccount
-        return MyPlexAccount(token=self._token, session=self._session)
-
-    def myPlexAccount(self):
-        """ Returns a :class:`~plexapi.myplex.MyPlexAccount` object using the same
-            token to access this server. If you are not the owner of this PlexServer
-            you're likely to receive an authentication error calling this.
-        """
-        return self._myPlexAccount
-
-    def _myPlexClientPorts(self):
-        """ Sometimes the PlexServer does not properly advertise port numbers required
-            to connect. This attempts to look up device port number from plex.tv.
-            See issue #126: Make PlexServer.clients() more user friendly.
-              https://github.com/pushingkarmaorg/python-plexapi/issues/126
-        """
-        try:
-            ports = {}
-            account = self.myPlexAccount()
-            for device in account.devices():
-                if device.connections and ':' in device.connections[0][6:]:
-                    ports[device.clientIdentifier] = device.connections[0].split(':')[-1]
-            return ports
-        except Exception as err:
-            log.warning('Unable to fetch client ports from myPlex: %s', err)
-            return ports
-
-    def browse(self, path=None, includeFiles=True):
-        """ Browse the system file path using the Plex API.
-            Returns list of :class:`~plexapi.library.Path` and :class:`~plexapi.library.File` objects.
-
-            Parameters:
-                path (:class:`~plexapi.library.Path` or str, optional): Full path to browse.
-                includeFiles (bool): True to include files when browsing (Default).
-                                     False to only return folders.
-        """
-        if isinstance(path, Path):
-            key = path.key
-        elif path is not None:
-            base64path = utils.base64str(path)
-            key = f'/services/browse/{base64path}'
-        else:
-            key = '/services/browse'
-        key += f'?includeFiles={int(includeFiles)}'  # starting with PMS v1.32.7.7621 this must set explicitly
-        return self.fetchItems(key)
-
-    def walk(self, path=None):
-        """ Walk the system file tree using the Plex API similar to `os.walk`.
-            Yields a 3-tuple `(path, paths, files)` where
-            `path` is a string of the directory path,
-            `paths` is a list of :class:`~plexapi.library.Path` objects, and
-            `files` is a list of :class:`~plexapi.library.File` objects.
-
-            Parameters:
-                path (:class:`~plexapi.library.Path` or str, optional): Full path to walk.
-        """
-        paths = []
-        files = []
-        for item in self.browse(path):
-            if isinstance(item, Path):
-                paths.append(item)
-            elif isinstance(item, File):
-                files.append(item)
-
-        if isinstance(path, Path):
-            path = path.path
-
-        yield path or '', paths, files
-
-        for _path in paths:
-            for path, paths, files in self.walk(_path):
-                yield path, paths, files
-
-    def isBrowsable(self, path):
-        """ Returns True if the Plex server can browse the given path.
-
-            Parameters:
-                path (:class:`~plexapi.library.Path` or str): Full path to browse.
-        """
-        if isinstance(path, Path):
-            path = path.path
-        paths = [p.path for p in self.browse(os.path.dirname(path), includeFiles=False)]
-        return path in paths
-
-    def clients(self):
-        """ Returns list of all :class:`~plexapi.client.PlexClient` objects connected to server. """
-        items = []
-        ports = None
-        for elem in self.query('/clients'):
-            port = elem.attrib.get('port')
-            if not port:
-                log.warning('%s did not advertise a port, checking plex.tv.', elem.attrib.get('name'))
-                ports = self._myPlexClientPorts() if ports is None else ports
-                port = ports.get(elem.attrib.get('machineIdentifier'))
-            baseurl = f"http://{elem.attrib['host']}:{port}"
-            items.append(PlexClient(baseurl=baseurl, server=self,
-                                    token=self._token, data=elem, connect=False))
-
-        return items
-
-    def client(self, name):
-        """ Returns the :class:`~plexapi.client.PlexClient` that matches the specified name
-            or machine identifier.
-
-            Parameters:
-                name (str): Name or machine identifier of the client to return.
-
-            Raises:
-                :exc:`~plexapi.exceptions.NotFound`: Unknown client name.
-        """
-        for client in self.clients():
-            if client and (client.title == name or client.machineIdentifier == name):
-                return client
-
-        raise NotFound(f'Unknown client name: {name}')
-
-    def createCollection(self, title, section, items=None, smart=False, limit=None,
-                         libtype=None, sort=None, filters=None, **kwargs):
-        """ Creates and returns a new :class:`~plexapi.collection.Collection`.
-
-            Parameters:
-                title (str): Title of the collection.
-                section (:class:`~plexapi.library.LibrarySection`, str): The library section to create the collection in.
-                items (List): Regular collections only, list of :class:`~plexapi.audio.Audio`,
-                    :class:`~plexapi.video.Video`, or :class:`~plexapi.photo.Photo` objects to be added to the collection.
-                smart (bool): True to create a smart collection. Default False.
-                limit (int): Smart collections only, limit the number of items in the collection.
-                libtype (str): Smart collections only, the specific type of content to filter
-                    (movie, show, season, episode, artist, album, track, photoalbum, photo).
-                sort (str or list, optional): Smart collections only, a string of comma separated sort fields
-                    or a list of sort fields in the format ``column:dir``.
-                    See :func:`~plexapi.library.LibrarySection.search` for more info.
-                filters (dict): Smart collections only, a dictionary of advanced filters.
-                    See :func:`~plexapi.library.LibrarySection.search` for more info.
-                **kwargs (dict): Smart collections only, additional custom filters to apply to the
-                    search results. See :func:`~plexapi.library.LibrarySection.search` for more info.
-
-            Raises:
-                :class:`plexapi.exceptions.BadRequest`: When no items are included to create the collection.
-                :class:`plexapi.exceptions.BadRequest`: When mixing media types in the collection.
-
-            Returns:
-                :class:`~plexapi.collection.Collection`: A new instance of the created Collection.
-
-            Example:
-
-                .. code-block:: python
-
-                    # Create a regular collection
-                    movies = plex.library.section("Movies")
-                    movie1 = movies.get("Big Buck Bunny")
-                    movie2 = movies.get("Sita Sings the Blues")
-                    collection = plex.createCollection(
-                        title="Favorite Movies",
-                        section=movies,
-                        items=[movie1, movie2]
-                    )
-
-                    # Create a smart collection
-                    collection = plex.createCollection(
-                        title="Recently Aired Comedy TV Shows",
-                        section="TV Shows",
-                        smart=True,
-                        sort="episode.originallyAvailableAt:desc",
-                        filters={"episode.originallyAvailableAt>>": "4w", "genre": "comedy"}
-                    )
-
-        """
-        return Collection.create(
-            self, title, section, items=items, smart=smart, limit=limit,
-            libtype=libtype, sort=sort, filters=filters, **kwargs)
-
-    def createPlaylist(self, title, section=None, items=None, smart=False, limit=None,
-                       libtype=None, sort=None, filters=None, m3ufilepath=None, **kwargs):
-        """ Creates and returns a new :class:`~plexapi.playlist.Playlist`.
-
-            Parameters:
-                title (str): Title of the playlist.
-                section (:class:`~plexapi.library.LibrarySection`, str): Smart playlists and m3u import only,
-                    the library section to create the playlist in.
-                items (List): Regular playlists only, list of :class:`~plexapi.audio.Audio`,
-                    :class:`~plexapi.video.Video`, or :class:`~plexapi.photo.Photo` objects to be added to the playlist.
-                smart (bool): True to create a smart playlist. Default False.
-                limit (int): Smart playlists only, limit the number of items in the playlist.
-                libtype (str): Smart playlists only, the specific type of content to filter
-                    (movie, show, season, episode, artist, album, track, photoalbum, photo).
-                sort (str or list, optional): Smart playlists only, a string of comma separated sort fields
-                    or a list of sort fields in the format ``column:dir``.
-                    See :func:`~plexapi.library.LibrarySection.search` for more info.
-                filters (dict): Smart playlists only, a dictionary of advanced filters.
-                    See :func:`~plexapi.library.LibrarySection.search` for more info.
-                m3ufilepath (str): Music playlists only, the full file path to an m3u file to import.
-                    Note: This will overwrite any playlist previously created from the same m3u file.
-                **kwargs (dict): Smart playlists only, additional custom filters to apply to the
-                    search results. See :func:`~plexapi.library.LibrarySection.search` for more info.
-
-            Raises:
-                :class:`plexapi.exceptions.BadRequest`: When no items are included to create the playlist.
-                :class:`plexapi.exceptions.BadRequest`: When mixing media types in the playlist.
-                :class:`plexapi.exceptions.BadRequest`: When attempting to import m3u file into non-music library.
-                :class:`plexapi.exceptions.BadRequest`: When failed to import m3u file.
-
-            Returns:
-                :class:`~plexapi.playlist.Playlist`: A new instance of the created Playlist.
-
-            Example:
-
-                .. code-block:: python
-
-                    # Create a regular playlist
-                    episodes = plex.library.section("TV Shows").get("Game of Thrones").episodes()
-                    playlist = plex.createPlaylist(
-                        title="GoT Episodes",
-                        items=episodes
-                    )
-
-                    # Create a smart playlist
-                    playlist = plex.createPlaylist(
-                        title="Top 10 Unwatched Movies",
-                        section="Movies",
-                        smart=True,
-                        limit=10,
-                        sort="audienceRating:desc",
-                        filters={"audienceRating>>": 8.0, "unwatched": True}
-                    )
-
-                    # Create a music playlist from an m3u file
-                    playlist = plex.createPlaylist(
-                        title="Favorite Tracks",
-                        section="Music",
-                        m3ufilepath="/path/to/playlist.m3u"
-                    )
-
-        """
-        return Playlist.create(
-            self, title, section=section, items=items, smart=smart, limit=limit,
-            libtype=libtype, sort=sort, filters=filters, m3ufilepath=m3ufilepath, **kwargs)
-
-    def createPlayQueue(self, item, **kwargs):
-        """ Creates and returns a new :class:`~plexapi.playqueue.PlayQueue`.
-
-            Parameters:
-                item (Media or Playlist): Media or playlist to add to PlayQueue.
-                kwargs (dict): See `~plexapi.playqueue.PlayQueue.create`.
-        """
-        return PlayQueue.create(self, item, **kwargs)
-
-    def downloadDatabases(self, savepath=None, unpack=False, showstatus=False):
-        """ Download databases.
-
-            Parameters:
-                savepath (str): Defaults to current working dir.
-                unpack (bool): Unpack the zip file.
-                showstatus(bool): Display a progressbar.
-        """
-        url = self.url('/diagnostics/databases')
-        filepath = utils.download(url, self._token, None, savepath, self._session, unpack=unpack, showstatus=showstatus)
-        return filepath
-
-    def downloadLogs(self, savepath=None, unpack=False, showstatus=False):
-        """ Download server logs.
-
-            Parameters:
-                savepath (str): Defaults to current working dir.
-                unpack (bool): Unpack the zip file.
-                showstatus(bool): Display a progressbar.
-        """
-        url = self.url('/diagnostics/logs')
-        filepath = utils.download(url, self._token, None, savepath, self._session, unpack=unpack, showstatus=showstatus)
-        return filepath
-
-    def butlerTasks(self):
-        """ Return a list of :class:`~plexapi.base.ButlerTask` objects. """
-        return self.fetchItems('/butler')
-
-    def runButlerTask(self, task):
-        """ Manually run a butler task immediately instead of waiting for the scheduled task to run.
-            Note: The butler task is run asynchronously. Check Plex Web to monitor activity.
-
-            Parameters:
-                task (str): The name of the task to run. (e.g. 'BackupDatabase')
-
-            Example:
-
-                .. code-block:: python
-
-                    availableTasks = [task.name for task in plex.butlerTasks()]
-                    print("Available butler tasks:", availableTasks)
-
-        """
-        validTasks = [_task.name for _task in self.butlerTasks()]
-        if task not in validTasks:
-            raise BadRequest(
-                f'Invalid butler task: {task}. Available tasks are: {validTasks}'
-            )
-        self.query(f'/butler/{task}', method=self._session.post)
-        return self
-
-    @deprecated('use "checkForUpdate" instead')
-    def check_for_update(self, force=True, download=False):
-        return self.checkForUpdate(force=force, download=download)
-
-    def checkForUpdate(self, force=True, download=False):
-        """ Returns a :class:`~plexapi.server.Release` object containing release info
-            if an update is available or None if no update is available.
-
-            Parameters:
-                force (bool): Force server to check for new releases
-                download (bool): Download if a update is available.
-        """
-        part = f'/updater/check?download={1 if download else 0}'
-        if force:
-            self.query(part, method=self._session.put)
-        releases = self.fetchItems('/updater/status')
-        if len(releases):
-            return releases[0]
-
-    def isLatest(self):
-        """ Returns True if the installed version of Plex Media Server is the latest. """
-        release = self.checkForUpdate(force=True)
-        return release is None
-
-    def canInstallUpdate(self):
-        """ Returns True if the newest version of Plex Media Server can be installed automatically.
-            (e.g. Windows and Mac can install updates automatically, but Docker and NAS devices cannot.)
-        """
-        release = self.query('/updater/status')
-        return utils.cast(bool, release.get('canInstall'))
-
-    def installUpdate(self):
-        """ Automatically install the newest version of Plex Media Server. """
-        # We can add this but dunno how useful this is since it sometimes
-        # requires user action using a gui.
-        part = '/updater/apply'
-        release = self.checkForUpdate(force=True, download=True)
-        if release and release.version != self.version:
-            # figure out what method this is..
-            return self.query(part, method=self._session.put)
-
-    def history(self, maxresults=None, mindate=None, ratingKey=None, accountID=None, librarySectionID=None):
-        """ Returns a list of media items from watched history. If there are many results, they will
-            be fetched from the server in batches of X_PLEX_CONTAINER_SIZE amounts. If you're only
-            looking for the first <num> results, it would be wise to set the maxresults option to that
-            amount so this functions doesn't iterate over all results on the server.
-
-            Parameters:
-                maxresults (int): Only return the specified number of results (optional).
-                mindate (datetime): Min datetime to return results from. This really helps speed
-                    up the result listing. For example: datetime.now() - timedelta(days=7)
-                ratingKey (int/str) Request history for a specific ratingKey item.
-                accountID (int/str) Request history for a specific account ID.
-                librarySectionID (int/str) Request history for a specific library section ID.
-        """
-        args = {'sort': 'viewedAt:desc'}
-        if ratingKey:
-            args['metadataItemID'] = ratingKey
-        if accountID:
-            args['accountID'] = accountID
-        if librarySectionID:
-            args['librarySectionID'] = librarySectionID
-        if mindate:
-            args['viewedAt>'] = int(mindate.timestamp())
-
-        key = f'/status/sessions/history/all{utils.joinArgs(args)}'
-        return self.fetchItems(key, maxresults=maxresults)
-
-    def playlists(self, playlistType=None, sectionId=None, title=None, sort=None, **kwargs):
-        """ Returns a list of all :class:`~plexapi.playlist.Playlist` objects on the server.
-
-            Parameters:
-                playlistType (str, optional): The type of playlists to return (audio, video, photo).
-                    Default returns all playlists.
-                sectionId (int, optional): The section ID (key) of the library to search within.
-                title (str, optional): General string query to search for. Partial string matches are allowed.
-                sort (str or list, optional): A string of comma separated sort fields in the format ``column:dir``.
-        """
-        args = {}
-        if playlistType is not None:
-            args['playlistType'] = playlistType
-        if sectionId is not None:
-            args['sectionID'] = sectionId
-        if title is not None:
-            args['title'] = title
-        if sort is not None:
-            # TODO: Automatically retrieve and validate sort field similar to LibrarySection.search()
-            args['sort'] = sort
-
-        key = f'/playlists{utils.joinArgs(args)}'
-        return self.fetchItems(key, **kwargs)
-
-    def playlist(self, title):
-        """ Returns the :class:`~plexapi.client.Playlist` that matches the specified title.
-
-            Parameters:
-                title (str): Title of the playlist to return.
-
-            Raises:
-                :exc:`~plexapi.exceptions.NotFound`: Unable to find playlist.
-        """
-        try:
-            return self.playlists(title=title, title__iexact=title)[0]
-        except IndexError:
-            raise NotFound(f'Unable to find playlist with title "{title}".') from None
-
-    def optimizedItems(self, removeAll=None):
-        """ Returns list of all :class:`~plexapi.media.Optimized` objects connected to server. """
-        if removeAll is True:
-            key = '/playlists/generators?type=42'
-            self.query(key, method=self._server._session.delete)
-        else:
-            backgroundProcessing = self.fetchItem('/playlists?type=42')
-            return self.fetchItems(f'{backgroundProcessing.key}/items', cls=Optimized)
-
-    @deprecated('use "plexapi.media.Optimized.items()" instead')
-    def optimizedItem(self, optimizedID):
-        """ Returns single queued optimized item :class:`~plexapi.media.Video` object.
-            Allows for using optimized item ID to connect back to source item.
-        """
-
-        backgroundProcessing = self.fetchItem('/playlists?type=42')
-        return self.fetchItem(f'{backgroundProcessing.key}/items/{optimizedID}/items')
-
-    def conversions(self, pause=None):
-        """ Returns list of all :class:`~plexapi.media.Conversion` objects connected to server. """
-        if pause is True:
-            self.query('/:/prefs?BackgroundQueueIdlePaused=1', method=self._server._session.put)
-        elif pause is False:
-            self.query('/:/prefs?BackgroundQueueIdlePaused=0', method=self._server._session.put)
-        else:
-            return self.fetchItems('/playQueues/1', cls=Conversion)
-
-    def currentBackgroundProcess(self):
-        """ Returns list of all :class:`~plexapi.media.TranscodeJob` objects running or paused on server. """
-        return self.fetchItems('/status/sessions/background')
-
-    def query(self, key, method=None, headers=None, params=None, timeout=None, **kwargs):
-        """ Main method used to handle HTTPS requests to the Plex server. This method helps
-            by encoding the response to utf-8 and parsing the returned XML into and
-            ElementTree object. Returns None if no data exists in the response.
-        """
-        url = self.url(key)
-        method = method or self._session.get
-        timeout = timeout or self._timeout
-        log.debug('%s %s', method.__name__.upper(), url)
-        headers = self._headers(**headers or {})
-        response = method(url, headers=headers, params=params, timeout=timeout, **kwargs)
-        if response.status_code not in (200, 201, 204):
-            codename = codes.get(response.status_code)[0]
-            errtext = response.text.replace('\n', ' ')
-            message = f'({response.status_code}) {codename}; {response.url} {errtext}'
-            if response.status_code == 401:
-                raise Unauthorized(message)
-            elif response.status_code == 404:
-                raise NotFound(message)
-            else:
-                raise BadRequest(message)
-        return utils.parseXMLString(response.text)
-
-    def search(self, query, mediatype=None, limit=None, sectionId=None):
-        """ Returns a list of media items or filter categories from the resulting
-            `Hub Search <https://www.plex.tv/blog/seek-plex-shall-find-leveling-web-app/>`_
-            against all items in your Plex library. This searches genres, actors, directors,
-            playlists, as well as all the obvious media titles. It performs spell-checking
-            against your search terms (because KUROSAWA is hard to spell). It also provides
-            contextual search results. So for example, if you search for 'Pernice', it’ll
-            return 'Pernice Brothers' as the artist result, but we’ll also go ahead and
-            return your most-listened to albums and tracks from the artist. If you type
-            'Arnold' you’ll get a result for the actor, but also the most recently added
-            movies he’s in.
-
-            Parameters:
-                query (str): Query to use when searching your library.
-                mediatype (str, optional): Limit your search to the specified media type.
-                    actor, album, artist, autotag, collection, director, episode, game, genre,
-                    movie, photo, photoalbum, place, playlist, shared, show, tag, track
-                limit (int, optional): Limit to the specified number of results per Hub.
-                sectionId (int, optional): The section ID (key) of the library to search within.
-        """
-        results = []
-        params = {
-            'query': query,
-            'includeCollections': 1,
-            'includeExternalMedia': 1}
-        if limit:
-            params['limit'] = limit
-        if sectionId:
-            params['sectionId'] = sectionId
-        key = f'/hubs/search?{urlencode(params)}'
-        for hub in self.fetchItems(key, Hub):
-            if mediatype:
-                if hub.type == mediatype:
-                    return hub._partialItems
-            else:
-                results += hub._partialItems
-        return results
-
-    def continueWatching(self):
-        """ Return a list of all items in the Continue Watching hub. """
-        return self.fetchItems('/hubs/continueWatching/items')
-
-    def sessions(self):
-        """ Returns a list of all active session (currently playing) media objects. """
-        return self.fetchItems('/status/sessions')
-
-    def transcodeSessions(self):
-        """ Returns a list of all active :class:`~plexapi.media.TranscodeSession` objects. """
-        return self.fetchItems('/transcode/sessions')
-
-    def startAlertListener(self, callback=None, callbackError=None):
-        """ Creates a websocket connection to the Plex Server to optionally receive
-            notifications. These often include messages from Plex about media scans
-            as well as updates to currently running Transcode Sessions.
-
-            Returns a new :class:`~plexapi.alert.AlertListener` object.
-
-            Note: ``websocket-client`` must be installed in order to use this feature.
-
-            .. code-block:: python
-
-                >> pip install websocket-client
-
-            Parameters:
-                callback (func): Callback function to call on received messages.
-                callbackError (func): Callback function to call on errors.
-
-            Raises:
-                :exc:`~plexapi.exception.Unsupported`: Websocket-client not installed.
-        """
-        notifier = AlertListener(self, callback, callbackError)
-        notifier.start()
-        return notifier
-
-    def transcodeImage(self, imageUrl, height, width,
-                       opacity=None, saturation=None, blur=None, background=None, blendColor=None,
-                       minSize=True, upscale=True, imageFormat=None):
-        """ Returns the URL for a transcoded image.
-
-            Parameters:
-                imageUrl (str): The URL to the image
-                    (eg. returned by :func:`~plexapi.mixins.PosterUrlMixin.thumbUrl`
-                    or :func:`~plexapi.mixins.ArtUrlMixin.artUrl`).
-                    The URL can be an online image.
-                height (int): Height to transcode the image to.
-                width (int): Width to transcode the image to.
-                opacity (int, optional): Change the opacity of the image (0 to 100)
-                saturation (int, optional): Change the saturation of the image (0 to 100).
-                blur (int, optional): The blur to apply to the image in pixels (e.g. 3).
-                background (str, optional): The background hex colour to apply behind the opacity (e.g. '000000').
-                blendColor (str, optional): The hex colour to blend the image with (e.g. '000000').
-                minSize (bool, optional): Maintain smallest dimension. Default True.
-                upscale (bool, optional): Upscale the image if required. Default True.
-                imageFormat (str, optional): 'jpeg' (default) or 'png'.
-        """
-        params = {
-            'url': imageUrl,
-            'height': height,
-            'width': width,
-            'minSize': int(bool(minSize)),
-            'upscale': int(bool(upscale))
-        }
-        if opacity is not None:
-            params['opacity'] = opacity
-        if saturation is not None:
-            params['saturation'] = saturation
-        if blur is not None:
-            params['blur'] = blur
-        if background is not None:
-            params['background'] = str(background).strip('#')
-        if blendColor is not None:
-            params['blendColor'] = str(blendColor).strip('#')
-        if imageFormat is not None:
-            params['format'] = imageFormat.lower()
-
-        key = f'/photo/:/transcode{utils.joinArgs(params)}'
-        return self.url(key, includeToken=True)
-
-    def url(self, key, includeToken=None):
-        """ Build a URL string with proper token argument.  Token will be appended to the URL
-            if either includeToken is True or CONFIG.log.show_secrets is 'true'.
-        """
-        if self._token and (includeToken or self._showSecrets):
-            delim = '&' if '?' in key else '?'
-            return f'{self._baseurl}{key}{delim}X-Plex-Token={self._token}'
-        return f'{self._baseurl}{key}'
-
-    def refreshSynclist(self):
-        """ Force PMS to download new SyncList from Plex.tv. """
-        return self.query('/sync/refreshSynclists', self._session.put)
-
-    def refreshContent(self):
-        """ Force PMS to refresh content for known SyncLists. """
-        return self.query('/sync/refreshContent', self._session.put)
-
-    def refreshSync(self):
-        """ Calls :func:`~plexapi.server.PlexServer.refreshSynclist` and
-            :func:`~plexapi.server.PlexServer.refreshContent`, just like the Plex Web UI does when you click 'refresh'.
-        """
-        self.refreshSynclist()
-        self.refreshContent()
-
-    def _allowMediaDeletion(self, toggle=False):
-        """ Toggle allowMediaDeletion.
-            Parameters:
-                toggle (bool): True enables Media Deletion
-                               False or None disable Media Deletion (Default)
-        """
-        if self.allowMediaDeletion and toggle is False:
-            log.debug('Plex is currently allowed to delete media. Toggling off.')
-        elif self.allowMediaDeletion and toggle is True:
-            log.debug('Plex is currently allowed to delete media. Toggle set to allow, exiting.')
-            raise BadRequest('Plex is currently allowed to delete media. Toggle set to allow, exiting.')
-        elif self.allowMediaDeletion is None and toggle is True:
-            log.debug('Plex is currently not allowed to delete media. Toggle set to allow.')
-        else:
-            log.debug('Plex is currently not allowed to delete media. Toggle set to not allow, exiting.')
-            raise BadRequest('Plex is currently not allowed to delete media. Toggle set to not allow, exiting.')
-        value = 1 if toggle is True else 0
-        return self.query(f'/:/prefs?allowMediaDeletion={value}', self._session.put)
-
-    def bandwidth(self, timespan=None, **kwargs):
-        """ Returns a list of :class:`~plexapi.server.StatisticsBandwidth` objects
-            with the Plex server dashboard bandwidth data.
-
-            Parameters:
-                timespan (str, optional): The timespan to bin the bandwidth data. Default is seconds.
-                    Available timespans: seconds, hours, days, weeks, months.
-                **kwargs (dict, optional): Any of the available filters that can be applied to the bandwidth data.
-                    The time frame (at) and bytes can also be filtered using less than or greater than (see examples below).
-
-                    * accountID (int): The :class:`~plexapi.server.SystemAccount` ID to filter.
-                    * at (datetime): The time frame to filter (inclusive). The time frame can be either:
-                        1. An exact time frame (e.g. Only December 1st 2020 `at=datetime(2020, 12, 1)`).
-                        2. Before a specific time (e.g. Before and including December 2020 `at<=datetime(2020, 12, 1)`).
-                        3. After a specific time (e.g. After and including January 2021 `at>=datetime(2021, 1, 1)`).
-                    * bytes (int): The amount of bytes to filter (inclusive). The bytes can be either:
-                        1. An exact number of bytes (not very useful) (e.g. `bytes=1024**3`).
-                        2. Less than or equal number of bytes (e.g. `bytes<=1024**3`).
-                        3. Greater than or equal number of bytes (e.g. `bytes>=1024**3`).
-                    * deviceID (int): The :class:`~plexapi.server.SystemDevice` ID to filter.
-                    * lan (bool): True to only retrieve local bandwidth, False to only retrieve remote bandwidth.
-                        Default returns all local and remote bandwidth.
-
-            Raises:
-                :exc:`~plexapi.exceptions.BadRequest`: When applying an invalid timespan or unknown filter.
-
-            Example:
-
-                .. code-block:: python
-
-                    from plexapi.server import PlexServer
-                    plex = PlexServer('http://localhost:32400', token='xxxxxxxxxxxxxxxxxxxx')
-
-                    # Filter bandwidth data for December 2020 and later, and more than 1 GB used.
-                    filters = {
-                        'at>': datetime(2020, 12, 1),
-                        'bytes>': 1024**3
-                    }
-
-                    # Retrieve bandwidth data in one day timespans.
-                    bandwidthData = plex.bandwidth(timespan='days', **filters)
-
-                    # Print out bandwidth usage for each account and device combination.
-                    for bandwidth in sorted(bandwidthData, key=lambda x: x.at):
-                        account = bandwidth.account()
-                        device = bandwidth.device()
-                        gigabytes = round(bandwidth.bytes / 1024**3, 3)
-                        local = 'local' if bandwidth.lan else 'remote'
-                        date = bandwidth.at.strftime('%Y-%m-%d')
-                        print(f'{account.name} used {gigabytes} GB of {local} bandwidth on {date} from {device.name}')
-
-        """
-        params = {}
-
-        if timespan is None:
-            params['timespan'] = 6  # Default to seconds
-        else:
-            timespans = {
-                'seconds': 6,
-                'hours': 4,
-                'days': 3,
-                'weeks': 2,
-                'months': 1
-            }
-            try:
-                params['timespan'] = timespans[timespan]
-            except KeyError:
-                raise BadRequest(f"Invalid timespan specified: {timespan}. "
-                                 f"Available timespans: {', '.join(timespans.keys())}")
-
-        filters = {'accountID', 'at', 'at<', 'at>', 'bytes', 'bytes<', 'bytes>', 'deviceID', 'lan'}
-
-        for key, value in kwargs.items():
-            if key not in filters:
-                raise BadRequest(f'Unknown filter: {key}={value}')
-            if key.startswith('at'):
-                try:
-                    value = utils.cast(int, value.timestamp())
-                except AttributeError:
-                    raise BadRequest(f'Time frame filter must be a datetime object: {key}={value}')
-            elif key.startswith('bytes') or key == 'lan':
-                value = utils.cast(int, value)
-            elif key == 'accountID':
-                if value == self.myPlexAccount().id:
-                    value = 1  # The admin account is accountID=1
-            params[key] = value
-
-        key = f'/statistics/bandwidth?{urlencode(params)}'
-        return self.fetchItems(key, StatisticsBandwidth)
-
-    def resources(self):
-        """ Returns a list of :class:`~plexapi.server.StatisticsResources` objects
-            with the Plex server dashboard resources data. """
-        key = '/statistics/resources?timespan=6'
-        return self.fetchItems(key, StatisticsResources)
-
-    def _buildWebURL(self, base=None, endpoint=None, **kwargs):
-        """ Build the Plex Web URL for the object.
-
-            Parameters:
-                base (str): The base URL before the fragment (``#!``).
-                    Default is https://app.plex.tv/desktop.
-                endpoint (str): The Plex Web URL endpoint.
-                    None for server, 'playlist' for playlists, 'details' for all other media types.
-                **kwargs (dict): Dictionary of URL parameters.
-        """
-        if base is None:
-            base = 'https://app.plex.tv/desktop/'
-
-        if endpoint:
-            return f'{base}#!/server/{self.machineIdentifier}/{endpoint}{utils.joinArgs(kwargs)}'
-        else:
-            return f'{base}#!/media/{self.machineIdentifier}/com.plexapp.plugins.library{utils.joinArgs(kwargs)}'
-
-    def getWebURL(self, base=None, playlistTab=None):
-        """ Returns the Plex Web URL for the server.
-
-            Parameters:
-                base (str): The base URL before the fragment (``#!``).
-                    Default is https://app.plex.tv/desktop.
-                playlistTab (str): The playlist tab (audio, video, photo). Only used for the playlist URL.
-        """
-        if playlistTab is not None:
-            params = {'source': 'playlists', 'pivot': f'playlists.{playlistTab}'}
-        else:
-            params = {'key': '/hubs', 'pageType': 'hub'}
-        return self._buildWebURL(base=base, **params)
-
-
-class Account(PlexObject):
-    """ Contains the locally cached MyPlex account information. The properties provided don't
-        match the :class:`~plexapi.myplex.MyPlexAccount` object very well. I believe this exists
-        because access to myplex is not required to get basic plex information. I can't imagine
-        object is terribly useful except unless you were needed this information while offline.
-
-        Parameters:
-            server (:class:`~plexapi.server.PlexServer`): PlexServer this account is connected to (optional)
-            data (ElementTree): Response from PlexServer used to build this object (optional).
-
-        Attributes:
-            authToken (str): Plex authentication token to access the server.
-            mappingError (str): Unknown
-            mappingErrorMessage (str): Unknown
-            mappingState (str): Unknown
-            privateAddress (str): Local IP address of the Plex server.
-            privatePort (str): Local port of the Plex server.
-            publicAddress (str): Public IP address of the Plex server.
-            publicPort (str): Public port of the Plex server.
-            signInState (str): Signin state for this account (ex: ok).
-            subscriptionActive (str): True if the account subscription is active.
-            subscriptionFeatures (str): List of features allowed by the server for this account.
-                This may be based on your PlexPass subscription. Features include: camera_upload,
-                cloudsync, content_filter, dvr, hardware_transcoding, home, lyrics, music_videos,
-                pass, photo_autotags, premium_music_metadata, session_bandwidth_restrictions,
-                sync, trailers, webhooks' (and maybe more).
-            subscriptionState (str): 'Active' if this subscription is active.
-            username (str): Plex account username (user@example.com).
-    """
-    key = '/myplex/account'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.authToken = data.attrib.get('authToken')
-        self.username = data.attrib.get('username')
-        self.mappingState = data.attrib.get('mappingState')
-        self.mappingError = data.attrib.get('mappingError')
-        self.mappingErrorMessage = data.attrib.get('mappingErrorMessage')
-        self.signInState = data.attrib.get('signInState')
-        self.publicAddress = data.attrib.get('publicAddress')
-        self.publicPort = data.attrib.get('publicPort')
-        self.privateAddress = data.attrib.get('privateAddress')
-        self.privatePort = data.attrib.get('privatePort')
-        self.subscriptionFeatures = utils.toList(data.attrib.get('subscriptionFeatures'))
-        self.subscriptionActive = utils.cast(bool, data.attrib.get('subscriptionActive'))
-        self.subscriptionState = data.attrib.get('subscriptionState')
-
-
-class Activity(PlexObject):
-    """A currently running activity on the PlexServer."""
-    key = '/activities'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.cancellable = utils.cast(bool, data.attrib.get('cancellable'))
-        self.progress = utils.cast(int, data.attrib.get('progress'))
-        self.title = data.attrib.get('title')
-        self.subtitle = data.attrib.get('subtitle')
-        self.type = data.attrib.get('type')
-        self.uuid = data.attrib.get('uuid')
-
-
-@utils.registerPlexObject
-class Release(PlexObject):
-    TAG = 'Release'
-    key = '/updater/status'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.download_key = data.attrib.get('key')
-        self.version = data.attrib.get('version')
-        self.added = data.attrib.get('added')
-        self.fixed = data.attrib.get('fixed')
-        self.downloadURL = data.attrib.get('downloadURL')
-        self.state = data.attrib.get('state')
-
-
-class SystemAccount(PlexObject):
-    """ Represents a single system account.
-
-        Attributes:
-            TAG (str): 'Account'
-            autoSelectAudio (bool): True or False if the account has automatic audio language enabled.
-            defaultAudioLanguage (str): The default audio language code for the account.
-            defaultSubtitleLanguage (str): The default subtitle language code for the account.
-            id (int): The Plex account ID.
-            key (str): API URL (/accounts/<id>)
-            name (str): The username of the account.
-            subtitleMode (bool): The subtitle mode for the account.
-            thumb (str): URL for the account thumbnail.
-    """
-    TAG = 'Account'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.autoSelectAudio = utils.cast(bool, data.attrib.get('autoSelectAudio'))
-        self.defaultAudioLanguage = data.attrib.get('defaultAudioLanguage')
-        self.defaultSubtitleLanguage = data.attrib.get('defaultSubtitleLanguage')
-        self.id = utils.cast(int, data.attrib.get('id'))
-        self.key = data.attrib.get('key')
-        self.name = data.attrib.get('name')
-        self.subtitleMode = utils.cast(int, data.attrib.get('subtitleMode'))
-        self.thumb = data.attrib.get('thumb')
-        # For backwards compatibility
-        self.accountID = self.id
-        self.accountKey = self.key
-
-
-class SystemDevice(PlexObject):
-    """ Represents a single system device.
-
-        Attributes:
-            TAG (str): 'Device'
-            clientIdentifier (str): The unique identifier for the device.
-            createdAt (datetime): Datetime the device was created.
-            id (int): The ID of the device (not the same as :class:`~plexapi.myplex.MyPlexDevice` ID).
-            key (str): API URL (/devices/<id>)
-            name (str): The name of the device.
-            platform (str): OS the device is running (Linux, Windows, Chrome, etc.)
-    """
-    TAG = 'Device'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.clientIdentifier = data.attrib.get('clientIdentifier')
-        self.createdAt = utils.toDatetime(data.attrib.get('createdAt'))
-        self.id = utils.cast(int, data.attrib.get('id'))
-        self.key = f'/devices/{self.id}'
-        self.name = data.attrib.get('name')
-        self.platform = data.attrib.get('platform')
-
-
-class StatisticsBandwidth(PlexObject):
-    """ Represents a single statistics bandwidth data.
-
-        Attributes:
-            TAG (str): 'StatisticsBandwidth'
-            accountID (int): The associated :class:`~plexapi.server.SystemAccount` ID.
-            at (datetime): Datetime of the bandwidth data.
-            bytes (int): The total number of bytes for the specified time span.
-            deviceID (int): The associated :class:`~plexapi.server.SystemDevice` ID.
-            lan (bool): True or False whether the bandwidth is local or remote.
-            timespan (int): The time span for the bandwidth data.
-                1: months, 2: weeks, 3: days, 4: hours, 6: seconds.
-
-    """
-    TAG = 'StatisticsBandwidth'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.accountID = utils.cast(int, data.attrib.get('accountID'))
-        self.at = utils.toDatetime(data.attrib.get('at'))
-        self.bytes = utils.cast(int, data.attrib.get('bytes'))
-        self.deviceID = utils.cast(int, data.attrib.get('deviceID'))
-        self.lan = utils.cast(bool, data.attrib.get('lan'))
-        self.timespan = utils.cast(int, data.attrib.get('timespan'))
-
-    def __repr__(self):
-        return '<{}>'.format(
-            ':'.join([p for p in [
-                self.__class__.__name__,
-                self._clean(self.accountID),
-                self._clean(self.deviceID),
-                self._clean(int(self.at.timestamp()))
-            ] if p])
-        )
-
-    def account(self):
-        """ Returns the :class:`~plexapi.server.SystemAccount` associated with the bandwidth data. """
-        return self._server.systemAccount(self.accountID)
-
-    def device(self):
-        """ Returns the :class:`~plexapi.server.SystemDevice` associated with the bandwidth data. """
-        return self._server.systemDevice(self.deviceID)
-
-
-class StatisticsResources(PlexObject):
-    """ Represents a single statistics resources data.
-
-        Attributes:
-            TAG (str): 'StatisticsResources'
-            at (datetime): Datetime of the resource data.
-            hostCpuUtilization (float): The system CPU usage %.
-            hostMemoryUtilization (float): The Plex Media Server CPU usage %.
-            processCpuUtilization (float): The system RAM usage %.
-            processMemoryUtilization (float): The Plex Media Server RAM usage %.
-            timespan (int): The time span for the resource data (6: seconds).
-    """
-    TAG = 'StatisticsResources'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.at = utils.toDatetime(data.attrib.get('at'))
-        self.hostCpuUtilization = utils.cast(float, data.attrib.get('hostCpuUtilization'))
-        self.hostMemoryUtilization = utils.cast(float, data.attrib.get('hostMemoryUtilization'))
-        self.processCpuUtilization = utils.cast(float, data.attrib.get('processCpuUtilization'))
-        self.processMemoryUtilization = utils.cast(float, data.attrib.get('processMemoryUtilization'))
-        self.timespan = utils.cast(int, data.attrib.get('timespan'))
-
-    def __repr__(self):
-        return f"<{':'.join([p for p in [self.__class__.__name__, self._clean(int(self.at.timestamp()))] if p])}>"
-
-
-@utils.registerPlexObject
-class ButlerTask(PlexObject):
-    """ Represents a single scheduled butler task.
-
-        Attributes:
-            TAG (str): 'ButlerTask'
-            description (str): The description of the task.
-            enabled (bool): Whether the task is enabled.
-            interval (int): The interval the task is run in days.
-            name (str): The name of the task.
-            scheduleRandomized (bool): Whether the task schedule is randomized.
-            title (str): The title of the task.
-    """
-    TAG = 'ButlerTask'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.description = data.attrib.get('description')
-        self.enabled = utils.cast(bool, data.attrib.get('enabled'))
-        self.interval = utils.cast(int, data.attrib.get('interval'))
-        self.name = data.attrib.get('name')
-        self.scheduleRandomized = utils.cast(bool, data.attrib.get('scheduleRandomized'))
-        self.title = data.attrib.get('title')
-
-
-class Identity(PlexObject):
-    """ Represents a server identity.
-
-        Attributes:
-            claimed (bool): True or False if the server is claimed.
-            machineIdentifier (str): The Plex server machine identifier.
-            version (str): The Plex server version.
-    """
-
-    def __repr__(self):
-        return f"<{self.__class__.__name__}:{self.machineIdentifier}>"
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.claimed = utils.cast(bool, data.attrib.get('claimed'))
-        self.machineIdentifier = data.attrib.get('machineIdentifier')
-        self.version = data.attrib.get('version')
diff --git a/lib/plexapi/settings.py b/lib/plexapi/settings.py
deleted file mode 100644
index 4e016e32..00000000
--- a/lib/plexapi/settings.py
+++ /dev/null
@@ -1,185 +0,0 @@
-# -*- coding: utf-8 -*-
-from collections import defaultdict
-from urllib.parse import quote
-
-from plexapi import log, utils
-from plexapi.base import PlexObject
-from plexapi.exceptions import BadRequest, NotFound
-
-
-class Settings(PlexObject):
-    """ Container class for all settings. Allows getting and setting PlexServer settings.
-
-        Attributes:
-            key (str): '/:/prefs'
-    """
-    key = '/:/prefs'
-
-    def __init__(self, server, data, initpath=None):
-        self._settings = {}
-        super(Settings, self).__init__(server, data, initpath)
-
-    def __getattr__(self, attr):
-        if attr.startswith('_'):
-            try:
-                return self.__dict__[attr]
-            except KeyError:
-                raise AttributeError
-        return self.get(attr).value
-
-    def __setattr__(self, attr, value):
-        if not attr.startswith('_'):
-            return self.get(attr).set(value)
-        self.__dict__[attr] = value
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        for elem in data:
-            id = utils.lowerFirst(elem.attrib['id'])
-            if id in self._settings:
-                self._settings[id]._invalidateCacheAndLoadData(elem)
-                continue
-            self._settings[id] = Setting(self._server, elem, self._initpath)
-
-    def all(self):
-        """ Returns a list of all :class:`~plexapi.settings.Setting` objects available. """
-        return [v for id, v in sorted(self._settings.items())]
-
-    def get(self, id):
-        """ Return the :class:`~plexapi.settings.Setting` object with the specified id. """
-        id = utils.lowerFirst(id)
-        if id in self._settings:
-            return self._settings[id]
-        raise NotFound(f'Invalid setting id: {id}')
-
-    def groups(self):
-        """ Returns a dict of lists for all :class:`~plexapi.settings.Setting`
-            objects grouped by setting group.
-        """
-        groups = defaultdict(list)
-        for setting in self.all():
-            groups[setting.group].append(setting)
-        return dict(groups)
-
-    def group(self, group):
-        """ Return a list of all :class:`~plexapi.settings.Setting` objects in the specified group.
-
-            Parameters:
-                group (str): Group to return all settings.
-        """
-        return self.groups().get(group, [])
-
-    def save(self):
-        """ Save any outstanding setting changes to the :class:`~plexapi.server.PlexServer`. This
-            performs a full reload() of Settings after complete.
-        """
-        params = {}
-        for setting in self.all():
-            if setting._setValue:
-                log.info('Saving PlexServer setting %s = %s', setting.id, setting._setValue)
-                params[setting.id] = quote(setting._setValue)
-        if not params:
-            raise BadRequest('No setting have been modified.')
-        querystr = '&'.join(f'{k}={v}' for k, v in params.items())
-        url = f'{self.key}?{querystr}'
-        self._server.query(url, self._server._session.put)
-        self.reload()
-
-
-class Setting(PlexObject):
-    """ Represents a single Plex setting.
-
-        Attributes:
-            id (str): Setting id (or name).
-            label (str): Short description of what this setting is.
-            summary (str): Long description of what this setting is.
-            type (str): Setting type (text, int, double, bool).
-            default (str): Default value for this setting.
-            value (str,bool,int,float): Current value for this setting.
-            hidden (bool): True if this is a hidden setting.
-            advanced (bool): True if this is an advanced setting.
-            group (str): Group name this setting is categorized as.
-            enumValues (list,dict): List or dictionary of valid values for this setting.
-    """
-    _bool_cast = lambda x: bool(x == 'true' or x == '1')
-    _bool_str = lambda x: str(x).lower()
-    TYPES = {
-        'bool': {'type': bool, 'cast': _bool_cast, 'tostr': _bool_str},
-        'double': {'type': float, 'cast': float, 'tostr': str},
-        'int': {'type': int, 'cast': int, 'tostr': str},
-        'text': {'type': str, 'cast': str, 'tostr': str},
-    }
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.type = data.attrib.get('type')
-        self.advanced = utils.cast(bool, data.attrib.get('advanced'))
-        self.default = self._cast(data.attrib.get('default'))
-        self.enumValues = self._getEnumValues(data)
-        self.group = data.attrib.get('group')
-        self.hidden = utils.cast(bool, data.attrib.get('hidden'))
-        self.id = data.attrib.get('id')
-        self.label = data.attrib.get('label')
-        self.option = data.attrib.get('option')
-        self.secure = utils.cast(bool, data.attrib.get('secure'))
-        self.summary = data.attrib.get('summary')
-        self.value = self._cast(data.attrib.get('value'))
-        self._setValue = None
-
-    def _cast(self, value):
-        """ Cast the specific value to the type of this setting. """
-        if self.type != 'enum':
-            value = utils.cast(self.TYPES.get(self.type)['cast'], value)
-        return value
-
-    def _getEnumValues(self, data):
-        """ Returns a list or dictionary of values for this setting. """
-        enumstr = data.attrib.get('enumValues') or data.attrib.get('values')
-        if not enumstr:
-            return None
-        if ':' in enumstr:
-            d = {}
-            for kv in enumstr.split('|'):
-                try:
-                    k, v = kv.split(':')
-                    d[self._cast(k)] = v
-                except ValueError:
-                    d[self._cast(kv)] = kv
-            return d
-        return enumstr.split('|')
-
-    def set(self, value):
-        """ Set a new value for this setting. NOTE: You must call plex.settings.save() for before
-            any changes to setting values are persisted to the :class:`~plexapi.server.PlexServer`.
-        """
-        # check a few things up front
-        if not isinstance(value, self.TYPES[self.type]['type']):
-            badtype = type(value).__name__
-            raise BadRequest(f'Invalid value for {self.id}: a {self.type} is required, not {badtype}')
-        if self.enumValues and value not in self.enumValues:
-            raise BadRequest(f'Invalid value for {self.id}: {value} not in {list(self.enumValues)}')
-        # store value off to the side until we call settings.save()
-        tostr = self.TYPES[self.type]['tostr']
-        self._setValue = tostr(value)
-
-    def toUrl(self):
-        """Helper for urls"""
-        return f'{self.id}={self._value or self.value}'
-
-
-@utils.registerPlexObject
-class Preferences(Setting):
-    """ Represents a single Preferences.
-
-        Attributes:
-            TAG (str): 'Setting'
-            FILTER (str): 'preferences'
-    """
-    TAG = 'Setting'
-    FILTER = 'preferences'
-
-    def _default(self):
-        """ Set the default value for this setting."""
-        key = f'{self._initpath}/prefs?'
-        url = key + f'{self.id}={self.default}'
-        self._server.query(url, method=self._server._session.put)
diff --git a/lib/plexapi/sonos.py b/lib/plexapi/sonos.py
deleted file mode 100644
index 1b61fd56..00000000
--- a/lib/plexapi/sonos.py
+++ /dev/null
@@ -1,115 +0,0 @@
-# -*- coding: utf-8 -*-
-import requests
-
-from plexapi import CONFIG, X_PLEX_IDENTIFIER, TIMEOUT
-from plexapi.client import PlexClient
-from plexapi.exceptions import BadRequest
-from plexapi.playqueue import PlayQueue
-
-
-class PlexSonosClient(PlexClient):
-    """ Class for interacting with a Sonos speaker via the Plex API. This class
-        makes requests to an external Plex API which then forwards the
-        Sonos-specific commands back to your Plex server & Sonos speakers. Use
-        of this feature requires an active Plex Pass subscription and Sonos
-        speakers linked to your Plex account. It also requires remote access to
-        be working properly.
-
-        More details on the Sonos integration are available here:
-        https://support.plex.tv/articles/218237558-requirements-for-using-plex-for-sonos/
-
-        The Sonos API emulates the Plex player control API closely:
-        https://github.com/plexinc/plex-media-player/wiki/Remote-control-API
-
-        Parameters:
-            account (:class:`~plexapi.myplex.PlexAccount`): PlexAccount instance this
-                Sonos speaker is associated with.
-            data (ElementTree): Response from Plex Sonos API used to build this client.
-
-        Attributes:
-            deviceClass (str): "speaker"
-            lanIP (str): Local IP address of speaker.
-            machineIdentifier (str): Unique ID for this device.
-            platform (str): "Sonos"
-            platformVersion (str): Build version of Sonos speaker firmware.
-            product (str): "Sonos"
-            protocol (str): "plex"
-            protocolCapabilities (list<str>): List of client capabilities (timeline, playback,
-                playqueues, provider-playback)
-            server (:class:`~plexapi.server.PlexServer`): Server this client is connected to.
-            session (:class:`~requests.Session`): Session object used for connection.
-            title (str): Name of this Sonos speaker.
-            token (str): X-Plex-Token used for authentication
-            _baseurl (str): Address of public Plex Sonos API endpoint.
-            _commandId (int): Counter for commands sent to Plex API.
-            _token (str): Token associated with linked Plex account.
-            _session (obj): Requests session object used to access this client.
-    """
-
-    def __init__(self, account, data, timeout=None):
-        self.deviceClass = data.attrib.get("deviceClass")
-        self.machineIdentifier = data.attrib.get("machineIdentifier")
-        self.product = data.attrib.get("product")
-        self.platform = data.attrib.get("platform")
-        self.platformVersion = data.attrib.get("platformVersion")
-        self.protocol = data.attrib.get("protocol")
-        self.protocolCapabilities = data.attrib.get("protocolCapabilities")
-        self.lanIP = data.attrib.get("lanIP")
-        self.title = data.attrib.get("title")
-        self._baseurl = "https://sonos.plex.tv"
-        self._commandId = 0
-        self._token = account._token
-        self._session = account._session or requests.Session()
-
-        # Dummy values for PlexClient inheritance
-        self._last_call = 0
-        self._proxyThroughServer = False
-        self._showSecrets = CONFIG.get("log.show_secrets", "").lower() == "true"
-        self._timeout = timeout or TIMEOUT
-
-    def playMedia(self, media, offset=0, **params):
-
-        if hasattr(media, "playlistType"):
-            mediatype = media.playlistType
-        else:
-            if isinstance(media, PlayQueue):
-                mediatype = media.items[0].listType
-            else:
-                mediatype = media.listType
-
-        if mediatype == "audio":
-            mediatype = "music"
-        else:
-            raise BadRequest("Sonos currently only supports music for playback")
-
-        server_protocol, server_address, server_port = media._server._baseurl.split(":")
-        server_address = server_address.strip("/")
-        server_port = server_port.strip("/")
-
-        playqueue = (
-            media
-            if isinstance(media, PlayQueue)
-            else media._server.createPlayQueue(media)
-        )
-        self.sendCommand(
-            "playback/playMedia",
-            **dict(
-                {
-                    "type": "music",
-                    "providerIdentifier": "com.plexapp.plugins.library",
-                    "containerKey": f"/playQueues/{playqueue.playQueueID}?own=1",
-                    "key": media.key,
-                    "offset": offset,
-                    "machineIdentifier": media._server.machineIdentifier,
-                    "protocol": server_protocol,
-                    "address": server_address,
-                    "port": server_port,
-                    "token": media._server.createToken(),
-                    "commandID": self._nextCommandId(),
-                    "X-Plex-Client-Identifier": X_PLEX_IDENTIFIER,
-                    "X-Plex-Token": media._server._token,
-                    "X-Plex-Target-Client-Identifier": self.machineIdentifier,
-                },
-                **params
-            )
-        )
diff --git a/lib/plexapi/sync.py b/lib/plexapi/sync.py
deleted file mode 100644
index 3b00653d..00000000
--- a/lib/plexapi/sync.py
+++ /dev/null
@@ -1,312 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-You can work with Mobile Sync on other devices straight away, but if you'd like to use your app as a `sync-target` (when
-you can set items to be synced to your app) you need to init some variables.
-
-.. code-block:: python
-
-    def init_sync():
-        import plexapi
-        plexapi.X_PLEX_PROVIDES = 'sync-target'
-        plexapi.BASE_HEADERS['X-Plex-Sync-Version'] = '2'
-        plexapi.BASE_HEADERS['X-Plex-Provides'] = plexapi.X_PLEX_PROVIDES
-
-        # mimic iPhone SE
-        plexapi.X_PLEX_PLATFORM = 'iOS'
-        plexapi.X_PLEX_PLATFORM_VERSION = '11.4.1'
-        plexapi.X_PLEX_DEVICE = 'iPhone'
-
-        plexapi.BASE_HEADERS['X-Plex-Platform'] = plexapi.X_PLEX_PLATFORM
-        plexapi.BASE_HEADERS['X-Plex-Platform-Version'] = plexapi.X_PLEX_PLATFORM_VERSION
-        plexapi.BASE_HEADERS['X-Plex-Device'] = plexapi.X_PLEX_DEVICE
-
-You have to fake platform/device/model because transcoding profiles are hardcoded in Plex, and you obviously have
-to explicitly specify that your app supports `sync-target`.
-"""
-import requests
-
-import plexapi
-from plexapi.base import PlexObject
-from plexapi.exceptions import NotFound, BadRequest
-
-
-class SyncItem(PlexObject):
-    """
-    Represents single sync item, for specified server and client. When you saying in the UI to sync "this" to "that"
-    you're basically creating a sync item.
-
-    Attributes:
-        id (int): unique id of the item.
-        clientIdentifier (str): an identifier of Plex Client device, to which the item is belongs.
-        machineIdentifier (str): the id of server which holds all this content.
-        version (int): current version of the item. Each time you modify the item (e.g. by changing amount if media to
-                       sync) the new version is created.
-        rootTitle (str): the title of library/media from which the sync item was created. E.g.:
-
-            * when you create an item for an episode 3 of season 3 of show Example, the value would be `Title of
-              Episode 3`
-            * when you create an item for a season 3 of show Example, the value would be `Season 3`
-            * when you set to sync all your movies in library named "My Movies" to value would be `My Movies`.
-
-        title (str): the title which you've set when created the sync item.
-        metadataType (str): the type of media which hides inside, can be `episode`, `movie`, etc.
-        contentType (str): basic type of the content: `video` or `audio`.
-        status (:class:`~plexapi.sync.Status`): current status of the sync.
-        mediaSettings (:class:`~plexapi.sync.MediaSettings`): media transcoding settings used for the item.
-        policy (:class:`~plexapi.sync.Policy`): the policy of which media to sync.
-        location (str): plex-style library url with all required filters / sorting.
-    """
-    TAG = 'SyncItem'
-
-    def __init__(self, server, data, initpath=None, clientIdentifier=None):
-        super(SyncItem, self).__init__(server, data, initpath)
-        self.clientIdentifier = clientIdentifier
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.id = plexapi.utils.cast(int, data.attrib.get('id'))
-        self.version = plexapi.utils.cast(int, data.attrib.get('version'))
-        self.rootTitle = data.attrib.get('rootTitle')
-        self.title = data.attrib.get('title')
-        self.metadataType = data.attrib.get('metadataType')
-        self.contentType = data.attrib.get('contentType')
-        self.machineIdentifier = data.find('Server').get('machineIdentifier')
-        self.status = Status(**data.find('Status').attrib)
-        self.mediaSettings = MediaSettings(**data.find('MediaSettings').attrib)
-        self.policy = Policy(**data.find('Policy').attrib)
-        self.location = data.find('Location').attrib.get('uri', '')
-
-    def server(self):
-        """ Returns :class:`~plexapi.myplex.MyPlexResource` with server of current item. """
-        server = [s for s in self._server.resources() if s.clientIdentifier == self.machineIdentifier]
-        if len(server) == 0:
-            raise NotFound(f'Unable to find server with uuid {self.machineIdentifier}')
-        return server[0]
-
-    def getMedia(self):
-        """ Returns list of :class:`~plexapi.base.Playable` which belong to this sync item. """
-        server = self.server().connect()
-        key = f'/sync/items/{self.id}'
-        return server.fetchItems(key)
-
-    def markDownloaded(self, media):
-        """ Mark the file as downloaded (by the nature of Plex it will be marked as downloaded within
-            any SyncItem where it presented).
-
-            Parameters:
-                media (base.Playable): the media to be marked as downloaded.
-        """
-        url = f'/sync/{self.clientIdentifier}/item/{media.ratingKey}/downloaded'
-        media._server.query(url, method=requests.put)
-
-    def delete(self):
-        """ Removes current SyncItem """
-        url = SyncList.key.format(clientId=self.clientIdentifier)
-        url += '/' + str(self.id)
-        self._server.query(url, self._server._session.delete)
-
-
-class SyncList(PlexObject):
-    """ Represents a Mobile Sync state, specific for single client, within one SyncList may be presented
-        items from different servers.
-
-        Attributes:
-            clientId (str): an identifier of the client.
-            items (List<:class:`~plexapi.sync.SyncItem`>): list of registered items to sync.
-    """
-    key = 'https://plex.tv/devices/{clientId}/sync_items'
-    TAG = 'SyncList'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.clientId = data.attrib.get('clientIdentifier')
-        self.items = []
-
-        syncItems = data.find('SyncItems')
-        if syncItems:
-            for sync_item in syncItems.iter('SyncItem'):
-                item = SyncItem(self._server, sync_item, clientIdentifier=self.clientId)
-                self.items.append(item)
-
-
-class Status:
-    """ Represents a current status of specific :class:`~plexapi.sync.SyncItem`.
-
-        Attributes:
-            failureCode: unknown, never got one yet.
-            failure: unknown.
-            state (str): server-side status of the item, can be `completed`, `pending`, empty, and probably something
-                         else.
-            itemsCount (int): total items count.
-            itemsCompleteCount (int): count of transcoded and/or downloaded items.
-            itemsDownloadedCount (int): count of downloaded items.
-            itemsReadyCount (int): count of transcoded items, which can be downloaded.
-            totalSize (int): total size in bytes of complete items.
-            itemsSuccessfulCount (int): unknown, in my experience it always was equal to `itemsCompleteCount`.
-    """
-
-    def __init__(self, itemsCount, itemsCompleteCount, state, totalSize, itemsDownloadedCount, itemsReadyCount,
-                 itemsSuccessfulCount, failureCode, failure):
-        self.itemsDownloadedCount = plexapi.utils.cast(int, itemsDownloadedCount)
-        self.totalSize = plexapi.utils.cast(int, totalSize)
-        self.itemsReadyCount = plexapi.utils.cast(int, itemsReadyCount)
-        self.failureCode = failureCode
-        self.failure = failure
-        self.itemsSuccessfulCount = plexapi.utils.cast(int, itemsSuccessfulCount)
-        self.state = state
-        self.itemsCompleteCount = plexapi.utils.cast(int, itemsCompleteCount)
-        self.itemsCount = plexapi.utils.cast(int, itemsCount)
-
-    def __repr__(self):
-        d = dict(
-            itemsCount=self.itemsCount,
-            itemsCompleteCount=self.itemsCompleteCount,
-            itemsDownloadedCount=self.itemsDownloadedCount,
-            itemsReadyCount=self.itemsReadyCount,
-            itemsSuccessfulCount=self.itemsSuccessfulCount
-        )
-        return f'<{self.__class__.__name__}>:{d}'
-
-
-class MediaSettings:
-    """ Transcoding settings used for all media within :class:`~plexapi.sync.SyncItem`.
-
-        Attributes:
-            audioBoost (int): unknown.
-            maxVideoBitrate (int|str): maximum bitrate for video, may be empty string.
-            musicBitrate (int|str): maximum bitrate for music, may be an empty string.
-            photoQuality (int): photo quality on scale 0 to 100.
-            photoResolution (str): maximum photo resolution, formatted as WxH (e.g. `1920x1080`).
-            videoResolution (str): maximum video resolution, formatted as WxH (e.g. `1280x720`, may be empty).
-            subtitleSize (int): subtitle size on scale 0 to 100.
-            videoQuality (int): video quality on scale 0 to 100.
-    """
-
-    def __init__(self, maxVideoBitrate=4000, videoQuality=100, videoResolution='1280x720', audioBoost=100,
-                 musicBitrate=192, photoQuality=74, photoResolution='1920x1080', subtitleSize=100):
-        self.audioBoost = plexapi.utils.cast(int, audioBoost)
-        self.maxVideoBitrate = plexapi.utils.cast(int, maxVideoBitrate) if maxVideoBitrate != '' else ''
-        self.musicBitrate = plexapi.utils.cast(int, musicBitrate) if musicBitrate != '' else ''
-        self.photoQuality = plexapi.utils.cast(int, photoQuality) if photoQuality != '' else ''
-        self.photoResolution = photoResolution
-        self.videoResolution = videoResolution
-        self.subtitleSize = plexapi.utils.cast(int, subtitleSize) if subtitleSize != '' else ''
-        self.videoQuality = plexapi.utils.cast(int, videoQuality) if videoQuality != '' else ''
-
-    @staticmethod
-    def createVideo(videoQuality):
-        """ Returns a :class:`~plexapi.sync.MediaSettings` object, based on provided video quality value.
-
-            Parameters:
-                videoQuality (int): idx of quality of the video, one of VIDEO_QUALITY_* values defined in this module.
-
-            Raises:
-                :exc:`~plexapi.exceptions.BadRequest`: When provided unknown video quality.
-        """
-        if videoQuality == VIDEO_QUALITY_ORIGINAL:
-            return MediaSettings('', '', '')
-        elif videoQuality < len(VIDEO_QUALITIES['bitrate']):
-            return MediaSettings(VIDEO_QUALITIES['bitrate'][videoQuality],
-                                 VIDEO_QUALITIES['videoQuality'][videoQuality],
-                                 VIDEO_QUALITIES['videoResolution'][videoQuality])
-        else:
-            raise BadRequest('Unexpected video quality')
-
-    @staticmethod
-    def createMusic(bitrate):
-        """ Returns a :class:`~plexapi.sync.MediaSettings` object, based on provided music quality value
-
-            Parameters:
-                bitrate (int): maximum bitrate for synchronized music, better use one of MUSIC_BITRATE_* values from the
-                               module
-        """
-        return MediaSettings(musicBitrate=bitrate)
-
-    @staticmethod
-    def createPhoto(resolution):
-        """ Returns a :class:`~plexapi.sync.MediaSettings` object, based on provided photo quality value.
-
-            Parameters:
-                resolution (str): maximum allowed resolution for synchronized photos, see PHOTO_QUALITY_* values in the
-                                  module.
-
-            Raises:
-                :exc:`~plexapi.exceptions.BadRequest`: When provided unknown video quality.
-        """
-        if resolution in PHOTO_QUALITIES:
-            return MediaSettings(photoQuality=PHOTO_QUALITIES[resolution], photoResolution=resolution)
-        else:
-            raise BadRequest('Unexpected photo quality')
-
-
-class Policy:
-    """ Policy of syncing the media (how many items to sync and process watched media or not).
-
-        Attributes:
-            scope (str): type of limitation policy, can be `count` or `all`.
-            value (int): amount of media to sync, valid only when `scope=count`.
-            unwatched (bool): True means disallow to sync watched media.
-    """
-
-    def __init__(self, scope, unwatched, value=0):
-        self.scope = scope
-        self.unwatched = plexapi.utils.cast(bool, unwatched)
-        self.value = plexapi.utils.cast(int, value)
-
-    @staticmethod
-    def create(limit=None, unwatched=False):
-        """ Creates a :class:`~plexapi.sync.Policy` object for provided options and automatically sets proper `scope`
-            value.
-
-            Parameters:
-                limit (int): limit items by count.
-                unwatched (bool): if True then watched items wouldn't be synced.
-
-            Returns:
-                :class:`~plexapi.sync.Policy`.
-        """
-        scope = 'all'
-        if limit is None:
-            limit = 0
-        else:
-            scope = 'count'
-
-        return Policy(scope, unwatched, limit)
-
-
-VIDEO_QUALITIES = {
-    'bitrate': [64, 96, 208, 320, 720, 1500, 2e3, 3e3, 4e3, 8e3, 1e4, 12e3, 2e4],
-    'videoResolution': ['220x128', '220x128', '284x160', '420x240', '576x320', '720x480', '1280x720', '1280x720',
-                        '1280x720', '1920x1080', '1920x1080', '1920x1080', '1920x1080'],
-    'videoQuality': [10, 20, 30, 30, 40, 60, 60, 75, 100, 60, 75, 90, 100],
-}
-
-VIDEO_QUALITY_0_2_MBPS = 2
-VIDEO_QUALITY_0_3_MBPS = 3
-VIDEO_QUALITY_0_7_MBPS = 4
-VIDEO_QUALITY_1_5_MBPS_480p = 5
-VIDEO_QUALITY_2_MBPS_720p = 6
-VIDEO_QUALITY_3_MBPS_720p = 7
-VIDEO_QUALITY_4_MBPS_720p = 8
-VIDEO_QUALITY_8_MBPS_1080p = 9
-VIDEO_QUALITY_10_MBPS_1080p = 10
-VIDEO_QUALITY_12_MBPS_1080p = 11
-VIDEO_QUALITY_20_MBPS_1080p = 12
-VIDEO_QUALITY_ORIGINAL = -1
-
-AUDIO_BITRATE_96_KBPS = 96
-AUDIO_BITRATE_128_KBPS = 128
-AUDIO_BITRATE_192_KBPS = 192
-AUDIO_BITRATE_320_KBPS = 320
-
-PHOTO_QUALITIES = {
-    '720x480': 24,
-    '1280x720': 49,
-    '1920x1080': 74,
-    '3840x2160': 99,
-}
-
-PHOTO_QUALITY_HIGHEST = PHOTO_QUALITY_2160p = '3840x2160'
-PHOTO_QUALITY_HIGH = PHOTO_QUALITY_1080p = '1920x1080'
-PHOTO_QUALITY_MEDIUM = PHOTO_QUALITY_720p = '1280x720'
-PHOTO_QUALITY_LOW = PHOTO_QUALITY_480p = '720x480'
diff --git a/lib/plexapi/utils.py b/lib/plexapi/utils.py
deleted file mode 100644
index bbff6a8e..00000000
--- a/lib/plexapi/utils.py
+++ /dev/null
@@ -1,731 +0,0 @@
-# -*- coding: utf-8 -*-
-import base64
-import functools
-import json
-import logging
-import os
-import re
-import string
-import sys
-import time
-import unicodedata
-import warnings
-import zipfile
-from collections import deque
-from datetime import datetime, timedelta
-from getpass import getpass
-from hashlib import sha1
-from threading import Event, Thread
-from urllib.parse import quote
-from xml.etree import ElementTree
-
-import requests
-from requests.status_codes import _codes as codes
-
-from plexapi.exceptions import BadRequest, NotFound, Unauthorized
-try:
-    from tqdm import tqdm
-except ImportError:
-    tqdm = None
-
-log = logging.getLogger('plexapi')
-
-# Search Types - Plex uses these to filter specific media types when searching.
-SEARCHTYPES = {
-    'movie': 1,
-    'show': 2,
-    'season': 3,
-    'episode': 4,
-    'trailer': 5,
-    'comic': 6,
-    'person': 7,
-    'artist': 8,
-    'album': 9,
-    'track': 10,
-    'picture': 11,
-    'clip': 12,
-    'photo': 13,
-    'photoalbum': 14,
-    'playlist': 15,
-    'playlistFolder': 16,
-    'collection': 18,
-    'optimizedVersion': 42,
-    'userPlaylistItem': 1001,
-}
-REVERSESEARCHTYPES = {v: k for k, v in SEARCHTYPES.items()}
-
-# Tag Types - Plex uses these to filter specific tags when searching.
-TAGTYPES = {
-    'tag': 0,
-    'genre': 1,
-    'collection': 2,
-    'director': 4,
-    'writer': 5,
-    'role': 6,
-    'producer': 7,
-    'country': 8,
-    'chapter': 9,
-    'review': 10,
-    'label': 11,
-    'marker': 12,
-    'mediaProcessingTarget': 42,
-    'make': 200,
-    'model': 201,
-    'aperture': 202,
-    'exposure': 203,
-    'iso': 204,
-    'lens': 205,
-    'device': 206,
-    'autotag': 207,
-    'mood': 300,
-    'style': 301,
-    'format': 302,
-    'similar': 305,
-    'concert': 306,
-    'banner': 311,
-    'poster': 312,
-    'art': 313,
-    'guid': 314,
-    'ratingImage': 316,
-    'theme': 317,
-    'studio': 318,
-    'network': 319,
-    'showOrdering': 322,
-    'clearLogo': 323,
-    'place': 400,
-}
-REVERSETAGTYPES = {v: k for k, v in TAGTYPES.items()}
-
-# Plex Objects - Populated at runtime
-PLEXOBJECTS = {}
-
-
-class SecretsFilter(logging.Filter):
-    """ Logging filter to hide secrets. """
-
-    def __init__(self, secrets=None):
-        self.secrets = secrets or set()
-
-    def add_secret(self, secret):
-        if secret is not None and secret != '':
-            self.secrets.add(secret)
-        return secret
-
-    def filter(self, record):
-        cleanargs = list(record.args)
-        for i in range(len(cleanargs)):
-            if isinstance(cleanargs[i], str):
-                for secret in self.secrets:
-                    cleanargs[i] = cleanargs[i].replace(secret, '<hidden>')
-        record.args = tuple(cleanargs)
-        return True
-
-
-def registerPlexObject(cls):
-    """ Registry of library types we may come across when parsing XML. This allows us to
-        define a few helper functions to dynamically convert the XML into objects. See
-        buildItem() below for an example.
-    """
-    etype = getattr(cls, 'STREAMTYPE', getattr(cls, 'TAGTYPE', cls.TYPE))
-    ehash = f'{cls.TAG}.{etype}' if etype else cls.TAG
-    if getattr(cls, '_SESSIONTYPE', None):
-        ehash = f"{ehash}.session"
-    elif getattr(cls, '_HISTORYTYPE', None):
-        ehash = f"{ehash}.history"
-    if ehash in PLEXOBJECTS:
-        raise Exception(f'Ambiguous PlexObject definition {cls.__name__}(tag={cls.TAG}, type={etype}) '
-                        f'with {PLEXOBJECTS[ehash].__name__}')
-    PLEXOBJECTS[ehash] = cls
-    return cls
-
-
-def getPlexObject(ehash, default):
-    """ Return the PlexObject class for the specified ehash. This recursively looks up the class
-        with the highest specificity, falling back to the default class if not found.
-    """
-    cls = PLEXOBJECTS.get(ehash)
-    if cls is not None:
-        return cls
-    if '.' in ehash:
-        ehash = ehash.rsplit('.', 1)[0]
-        return getPlexObject(ehash, default=default)
-    return PLEXOBJECTS.get(default)
-
-
-def cast(func, value):
-    """ Cast the specified value to the specified type (returned by func). Currently this
-        only support str, int, float, bool. Should be extended if needed.
-
-        Parameters:
-            func (func): Callback function to used cast to type (int, bool, float).
-            value (any): value to be cast and returned.
-    """
-    if value is None:
-        return value
-    if func == bool:
-        if value in (1, True, "1", "true"):
-            return True
-        if value in (0, False, "0", "false"):
-            return False
-        raise ValueError(value)
-
-    if func in (int, float):
-        try:
-            return func(value)
-        except ValueError:
-            return float('nan')
-    return func(value)
-
-
-def joinArgs(args):
-    """ Returns a query string (uses for HTTP URLs) where only the value is URL encoded.
-        Example return value: '?genre=action&type=1337'.
-
-        Parameters:
-            args (dict): Arguments to include in query string.
-    """
-    if not args:
-        return ''
-    arglist = []
-    for key in sorted(args, key=lambda x: x.lower()):
-        value = str(args[key])
-        arglist.append(f"{key}={quote(value, safe='')}")
-    return f"?{'&'.join(arglist)}"
-
-
-def lowerFirst(s):
-    return s[0].lower() + s[1:]
-
-
-def rget(obj, attrstr, default=None, delim='.'):  # pragma: no cover
-    """ Returns the value at the specified attrstr location within a nested tree of
-        dicts, lists, tuples, functions, classes, etc. The lookup is done recursively
-        for each key in attrstr (split by by the delimiter) This function is heavily
-        influenced by the lookups used in Django templates.
-
-        Parameters:
-            obj (any): Object to start the lookup in (dict, obj, list, tuple, etc).
-            attrstr (str): String to lookup (ex: 'foo.bar.baz.value')
-            default (any): Default value to return if not found.
-            delim (str): Delimiter separating keys in attrstr.
-    """
-    try:
-        parts = attrstr.split(delim, 1)
-        attr = parts[0]
-        attrstr = parts[1] if len(parts) == 2 else None
-        if isinstance(obj, dict):
-            value = obj[attr]
-        elif isinstance(obj, list):
-            value = obj[int(attr)]
-        elif isinstance(obj, tuple):
-            value = obj[int(attr)]
-        elif isinstance(obj, object):
-            value = getattr(obj, attr)
-        if attrstr:
-            return rget(value, attrstr, default, delim)
-        return value
-    except:  # noqa: E722
-        return default
-
-
-def searchType(libtype):
-    """ Returns the integer value of the library string type.
-
-        Parameters:
-            libtype (str): LibType to lookup (See :data:`~plexapi.utils.SEARCHTYPES`)
-
-        Raises:
-            :exc:`~plexapi.exceptions.NotFound`: Unknown libtype
-    """
-    libtype = str(libtype)
-    try:
-        return SEARCHTYPES[libtype]
-    except KeyError:
-        if libtype in [str(k) for k in REVERSESEARCHTYPES]:
-            return libtype
-        raise NotFound(f'Unknown libtype: {libtype}') from None
-
-
-def reverseSearchType(libtype):
-    """ Returns the string value of the library type.
-
-        Parameters:
-            libtype (int): Integer value of the library type.
-
-        Raises:
-            :exc:`~plexapi.exceptions.NotFound`: Unknown libtype
-    """
-    try:
-        return REVERSESEARCHTYPES[int(libtype)]
-    except (KeyError, ValueError):
-        if libtype in SEARCHTYPES:
-            return libtype
-        raise NotFound(f'Unknown libtype: {libtype}') from None
-
-
-def tagType(tag):
-    """ Returns the integer value of the library tag type.
-
-        Parameters:
-            tag (str): Tag to lookup (See :data:`~plexapi.utils.TAGTYPES`)
-
-        Raises:
-            :exc:`~plexapi.exceptions.NotFound`: Unknown tag
-    """
-    tag = str(tag)
-    try:
-        return TAGTYPES[tag]
-    except KeyError:
-        if tag in [str(k) for k in REVERSETAGTYPES]:
-            return tag
-        raise NotFound(f'Unknown tag: {tag}') from None
-
-
-def reverseTagType(tag):
-    """ Returns the string value of the library tag type.
-
-        Parameters:
-            tag (int): Integer value of the library tag type.
-
-        Raises:
-            :exc:`~plexapi.exceptions.NotFound`: Unknown tag
-    """
-    try:
-        return REVERSETAGTYPES[int(tag)]
-    except (KeyError, ValueError):
-        if tag in TAGTYPES:
-            return tag
-        raise NotFound(f'Unknown tag: {tag}') from None
-
-
-def threaded(callback, listargs):
-    """ Returns the result of <callback> for each set of `*args` in listargs. Each call
-        to <callback> is called concurrently in their own separate threads.
-
-        Parameters:
-            callback (func): Callback function to apply to each set of `*args`.
-            listargs (list): List of lists; `*args` to pass each thread.
-    """
-    threads, results = [], []
-    job_is_done_event = Event()
-    for args in listargs:
-        args += [results, len(results)]
-        results.append(None)
-        threads.append(Thread(target=callback, args=args, kwargs=dict(job_is_done_event=job_is_done_event)))
-        threads[-1].daemon = True
-        threads[-1].start()
-    while not job_is_done_event.is_set():
-        if all(not t.is_alive() for t in threads):
-            break
-        time.sleep(0.05)
-
-    return [r for r in results if r is not None]
-
-
-def toDatetime(value, format=None):
-    """ Returns a datetime object from the specified value.
-
-        Parameters:
-            value (str): value to return as a datetime
-            format (str): Format to pass strftime (optional; if value is a str).
-    """
-    if value is not None:
-        if format:
-            try:
-                return datetime.strptime(value, format)
-            except ValueError:
-                log.info('Failed to parse "%s" to datetime as format "%s", defaulting to None', value, format)
-                return None
-        else:
-            try:
-                value = int(value)
-            except ValueError:
-                log.info('Failed to parse "%s" to datetime as timestamp, defaulting to None', value)
-                return None
-            try:
-                return datetime.fromtimestamp(value)
-            except (OSError, OverflowError, ValueError):
-                try:
-                    return datetime.fromtimestamp(0) + timedelta(seconds=value)
-                except OverflowError:
-                    log.info('Failed to parse "%s" to datetime as timestamp (out-of-bounds), defaulting to None', value)
-                    return None
-    return value
-
-
-def millisecondToHumanstr(milliseconds):
-    """ Returns human readable time duration [D day[s], ]HH:MM:SS.UUU from milliseconds.
-
-        Parameters:
-            milliseconds (str, int): time duration in milliseconds.
-    """
-    milliseconds = int(milliseconds)
-    if milliseconds < 0:
-        return '-' + millisecondToHumanstr(abs(milliseconds))
-    secs, ms = divmod(milliseconds, 1000)
-    mins, secs = divmod(secs, 60)
-    hours, mins = divmod(mins, 60)
-    days, hours = divmod(hours, 24)
-    return ('' if days == 0 else f'{days} day{"s" if days > 1 else ""}, ') + f'{hours:02d}:{mins:02d}:{secs:02d}.{ms:03d}'
-
-
-def toList(value, itemcast=None, delim=','):
-    """ Returns a list of strings from the specified value.
-
-        Parameters:
-            value (str): comma delimited string to convert to list.
-            itemcast (func): Function to cast each list item to (default str).
-            delim (str): string delimiter (optional; default ',').
-    """
-    value = value or ''
-    itemcast = itemcast or str
-    return [itemcast(item) for item in value.split(delim) if item != '']
-
-
-def cleanFilename(filename, replace='_'):
-    whitelist = f"-_.()[] {string.ascii_letters}{string.digits}"
-    cleaned_filename = unicodedata.normalize('NFKD', filename).encode('ASCII', 'ignore').decode()
-    cleaned_filename = ''.join(c if c in whitelist else replace for c in cleaned_filename)
-    return cleaned_filename
-
-
-def downloadSessionImages(server, filename=None, height=150, width=150,
-                          opacity=100, saturation=100):  # pragma: no cover
-    """ Helper to download a bif image or thumb.url from plex.server.sessions.
-
-       Parameters:
-           filename (str): default to None,
-           height (int): Height of the image.
-           width (int): width of the image.
-           opacity (int): Opacity of the resulting image (possibly deprecated).
-           saturation (int): Saturating of the resulting image.
-
-       Returns:
-            {'hellowlol': {'filepath': '<filepath>', 'url': 'http://<url>'},
-            {'<username>': {filepath, url}}, ...
-    """
-    info = {}
-    for media in server.sessions():
-        url = None
-        for part in media.iterParts():
-            if media.thumb:
-                url = media.thumb
-            if part.indexes:  # always use bif images if available.
-                url = f'/library/parts/{part.id}/indexes/{part.indexes.lower()}/{media.viewOffset}'
-        if url:
-            if filename is None:
-                prettyname = media._prettyfilename()
-                filename = f'session_transcode_{media.usernames[0]}_{prettyname}_{int(time.time())}'
-            url = server.transcodeImage(url, height, width, opacity, saturation)
-            filepath = download(url, server._token, filename=filename)
-            info['username'] = {'filepath': filepath, 'url': url}
-    return info
-
-
-def download(url, token, filename=None, savepath=None, session=None, chunksize=4096,   # noqa: C901
-             unpack=False, mocked=False, showstatus=False):
-    """ Helper to download a thumb, videofile or other media item. Returns the local
-        path to the downloaded file.
-
-       Parameters:
-            url (str): URL where the content be reached.
-            token (str): Plex auth token to include in headers.
-            filename (str): Filename of the downloaded file, default None.
-            savepath (str): Defaults to current working dir.
-            chunksize (int): What chunksize read/write at the time.
-            mocked (bool): Helper to do everything except write the file.
-            unpack (bool): Unpack the zip file.
-            showstatus(bool): Display a progressbar.
-
-        Example:
-            >>> download(a_episode.getStreamURL(), a_episode.location)
-            /path/to/file
-    """
-    # fetch the data to be saved
-    session = session or requests.Session()
-    headers = {'X-Plex-Token': token}
-    response = session.get(url, headers=headers, stream=True)
-    if response.status_code not in (200, 201, 204):
-        codename = codes.get(response.status_code)[0]
-        errtext = response.text.replace('\n', ' ')
-        message = f'({response.status_code}) {codename}; {response.url} {errtext}'
-        if response.status_code == 401:
-            raise Unauthorized(message)
-        elif response.status_code == 404:
-            raise NotFound(message)
-        else:
-            raise BadRequest(message)
-
-    # make sure the savepath directory exists
-    savepath = savepath or os.getcwd()
-    os.makedirs(savepath, exist_ok=True)
-
-    # try getting filename from header if not specified in arguments (used for logs, db)
-    if not filename and response.headers.get('Content-Disposition'):
-        filename = re.findall(r'filename=\"(.+)\"', response.headers.get('Content-Disposition'))
-        filename = filename[0] if filename[0] else None
-
-    filename = os.path.basename(filename)
-    fullpath = os.path.join(savepath, filename)
-    # append file.ext from content-type if not already there
-    extension = os.path.splitext(fullpath)[-1]
-    if not extension:
-        contenttype = response.headers.get('content-type')
-        if contenttype and 'image' in contenttype:
-            fullpath += contenttype.split('/')[1]
-
-    # check this is a mocked download (testing)
-    if mocked:
-        log.debug('Mocked download %s', fullpath)
-        return fullpath
-
-    # save the file to disk
-    log.info('Downloading: %s', fullpath)
-    if showstatus and tqdm:  # pragma: no cover
-        total = int(response.headers.get('content-length', 0))
-        bar = tqdm(unit='B', unit_scale=True, total=total, desc=filename)
-
-    with open(fullpath, 'wb') as handle:
-        for chunk in response.iter_content(chunk_size=chunksize):
-            handle.write(chunk)
-            if showstatus and tqdm:
-                bar.update(len(chunk))
-
-    if showstatus and tqdm:  # pragma: no cover
-        bar.close()
-    # check we want to unzip the contents
-    if fullpath.endswith('zip') and unpack:
-        with zipfile.ZipFile(fullpath, 'r') as handle:
-            handle.extractall(savepath)
-
-    return fullpath
-
-
-def getMyPlexAccount(opts=None):  # pragma: no cover
-    """ Helper function tries to get a MyPlex Account instance by checking
-        the the following locations for a username and password. This is
-        useful to create user-friendly command line tools.
-        1. command-line options (opts).
-        2. environment variables and config.ini
-        3. Prompt on the command line.
-    """
-    from plexapi import CONFIG
-    from plexapi.myplex import MyPlexAccount
-    # 1. Check command-line options
-    if opts and opts.username and opts.password:
-        print(f'Authenticating with Plex.tv as {opts.username}..')
-        return MyPlexAccount(opts.username, opts.password)
-    # 2. Check Plexconfig (environment variables and config.ini)
-    config_username = CONFIG.get('auth.myplex_username')
-    config_password = CONFIG.get('auth.myplex_password')
-    if config_username and config_password:
-        print(f'Authenticating with Plex.tv as {config_username}..')
-        return MyPlexAccount(config_username, config_password)
-    config_token = CONFIG.get('auth.server_token')
-    if config_token:
-        print('Authenticating with Plex.tv with token')
-        return MyPlexAccount(token=config_token)
-    # 3. Prompt for username and password on the command line
-    username = input('What is your plex.tv username: ')
-    password = getpass('What is your plex.tv password: ')
-    print(f'Authenticating with Plex.tv as {username}..')
-    return MyPlexAccount(username, password)
-
-
-def createMyPlexDevice(headers, account, timeout=10):  # pragma: no cover
-    """ Helper function to create a new MyPlexDevice. Returns a new MyPlexDevice instance.
-
-        Parameters:
-            headers (dict): Provide the X-Plex- headers for the new device.
-                A unique X-Plex-Client-Identifier is required.
-            account (MyPlexAccount): The Plex account to create the device on.
-            timeout (int): Timeout in seconds to wait for device login.
-    """
-    from plexapi.myplex import MyPlexPinLogin
-
-    if 'X-Plex-Client-Identifier' not in headers:
-        raise BadRequest('The X-Plex-Client-Identifier header is required.')
-
-    clientIdentifier = headers['X-Plex-Client-Identifier']
-
-    pinlogin = MyPlexPinLogin(headers=headers)
-    pinlogin.run(timeout=timeout)
-    account.link(pinlogin.pin)
-    pinlogin.waitForLogin()
-
-    return account.device(clientId=clientIdentifier)
-
-
-def plexOAuth(headers, forwardUrl=None, timeout=120):  # pragma: no cover
-    """ Helper function for Plex OAuth login. Returns a new MyPlexAccount instance.
-
-        Parameters:
-            headers (dict): Provide the X-Plex- headers for the new device.
-                A unique X-Plex-Client-Identifier is required.
-            forwardUrl (str, optional): The url to redirect the client to after login.
-            timeout (int, optional): Timeout in seconds to wait for device login. Default 120 seconds.
-    """
-    from plexapi.myplex import MyPlexAccount, MyPlexPinLogin
-
-    if 'X-Plex-Client-Identifier' not in headers:
-        raise BadRequest('The X-Plex-Client-Identifier header is required.')
-
-    pinlogin = MyPlexPinLogin(headers=headers, oauth=True)
-    print('Login to Plex at the following url:')
-    print(pinlogin.oauthUrl(forwardUrl))
-    pinlogin.run(timeout=timeout)
-    pinlogin.waitForLogin()
-
-    if pinlogin.token:
-        print('Login successful!')
-        return MyPlexAccount(token=pinlogin.token)
-    else:
-        print('Login failed.')
-
-
-def choose(msg, items, attr):  # pragma: no cover
-    """ Command line helper to display a list of choices, asking the
-        user to choose one of the options.
-    """
-    # Return the first item if there is only one choice
-    if len(items) == 1:
-        return items[0]
-    # Print all choices to the command line
-    print()
-    for index, i in enumerate(items):
-        name = attr(i) if callable(attr) else getattr(i, attr)
-        print(f'  {index}: {name}')
-    print()
-    # Request choice from the user
-    while True:
-        try:
-            inp = input(f'{msg}: ')
-            if any(s in inp for s in (':', '::', '-')):
-                idx = slice(*map(lambda x: int(x.strip()) if x.strip() else None, inp.split(':')))
-                return items[idx]
-            else:
-                return items[int(inp)]
-
-        except (ValueError, IndexError):
-            pass
-
-
-def getAgentIdentifier(section, agent):
-    """ Return the full agent identifier from a short identifier, name, or confirm full identifier. """
-    agents = []
-    for ag in section.agents():
-        identifiers = [ag.identifier, ag.shortIdentifier, ag.name]
-        if agent in identifiers:
-            return ag.identifier
-        agents += identifiers
-    raise NotFound(f"Could not find \"{agent}\" in agents list ({', '.join(agents)})")
-
-
-def base64str(text):
-    return base64.b64encode(text.encode('utf-8')).decode('utf-8')
-
-
-def deprecated(message, stacklevel=2):
-    def decorator(func):
-        """This is a decorator which can be used to mark functions
-        as deprecated. It will result in a warning being emitted
-        when the function is used."""
-        @functools.wraps(func)
-        def wrapper(*args, **kwargs):
-            msg = f'Call to deprecated function or method "{func.__name__}", {message}.'
-            warnings.warn(msg, category=DeprecationWarning, stacklevel=stacklevel)
-            log.warning(msg)
-            return func(*args, **kwargs)
-        return wrapper
-    return decorator
-
-
-def iterXMLBFS(root, tag=None):
-    """ Iterate through an XML tree using a breadth-first search.
-        If tag is specified, only return nodes with that tag.
-    """
-    queue = deque([root])
-    while queue:
-        node = queue.popleft()
-        if tag is None or node.tag == tag:
-            yield node
-        queue.extend(list(node))
-
-
-def toJson(obj, **kwargs):
-    """ Convert an object to a JSON string.
-
-        Parameters:
-            obj (object): The object to convert.
-            **kwargs (dict): Keyword arguments to pass to ``json.dumps()``.
-    """
-    def serialize(obj):
-        if isinstance(obj, datetime):
-            return obj.isoformat()
-        return {k: v for k, v in obj.__dict__.items() if not k.startswith('_')}
-    return json.dumps(obj, default=serialize, **kwargs)
-
-
-def openOrRead(file):
-    if hasattr(file, 'read'):
-        return file.read()
-    with open(file, 'rb') as f:
-        return f.read()
-
-
-def sha1hash(guid):
-    """ Return the SHA1 hash of a guid. """
-    return sha1(guid.encode('utf-8')).hexdigest()
-
-
-# https://stackoverflow.com/a/64570125
-_illegal_XML_characters = [
-    (0x00, 0x08),
-    (0x0B, 0x0C),
-    (0x0E, 0x1F),
-    (0x7F, 0x84),
-    (0x86, 0x9F),
-    (0xFDD0, 0xFDDF),
-    (0xFFFE, 0xFFFF),
-]
-if sys.maxunicode >= 0x10000:  # not narrow build
-    _illegal_XML_characters.extend(
-        [
-            (0x1FFFE, 0x1FFFF),
-            (0x2FFFE, 0x2FFFF),
-            (0x3FFFE, 0x3FFFF),
-            (0x4FFFE, 0x4FFFF),
-            (0x5FFFE, 0x5FFFF),
-            (0x6FFFE, 0x6FFFF),
-            (0x7FFFE, 0x7FFFF),
-            (0x8FFFE, 0x8FFFF),
-            (0x9FFFE, 0x9FFFF),
-            (0xAFFFE, 0xAFFFF),
-            (0xBFFFE, 0xBFFFF),
-            (0xCFFFE, 0xCFFFF),
-            (0xDFFFE, 0xDFFFF),
-            (0xEFFFE, 0xEFFFF),
-            (0xFFFFE, 0xFFFFF),
-            (0x10FFFE, 0x10FFFF),
-        ]
-    )
-_illegal_XML_ranges = [
-    fr'{chr(low)}-{chr(high)}'
-    for (low, high) in _illegal_XML_characters
-]
-_illegal_XML_re = re.compile(fr'[{"".join(_illegal_XML_ranges)}]')
-
-
-def cleanXMLString(s):
-    return _illegal_XML_re.sub('', s)
-
-
-def parseXMLString(s: str):
-    """ Parse an XML string and return an ElementTree object. """
-    if not s.strip():
-        return None
-    try:  # Attempt to parse the string as-is without cleaning (which is expensive)
-        return ElementTree.fromstring(s.encode('utf-8'))
-    except ElementTree.ParseError:  # If it fails, clean the string and try again
-        cleaned_s = cleanXMLString(s).encode('utf-8')
-        return ElementTree.fromstring(cleaned_s) if cleaned_s.strip() else None
diff --git a/lib/plexapi/video.py b/lib/plexapi/video.py
deleted file mode 100644
index 597bbca7..00000000
--- a/lib/plexapi/video.py
+++ /dev/null
@@ -1,1407 +0,0 @@
-# -*- coding: utf-8 -*-
-import os
-from pathlib import Path
-from urllib.parse import quote_plus
-
-from plexapi import media, utils
-from plexapi.base import Playable, PlexPartialObject, PlexHistory, PlexSession, cached_data_property
-from plexapi.exceptions import BadRequest
-from plexapi.mixins import (
-    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, PlayedUnplayedMixin, RatingMixin,
-    ArtUrlMixin, ArtMixin, LogoMixin, PosterUrlMixin, PosterMixin, ThemeUrlMixin, ThemeMixin,
-    MovieEditMixins, ShowEditMixins, SeasonEditMixins, EpisodeEditMixins,
-    WatchlistMixin
-)
-
-
-class Video(PlexPartialObject, PlayedUnplayedMixin):
-    """ Base class for all video objects including :class:`~plexapi.video.Movie`,
-        :class:`~plexapi.video.Show`, :class:`~plexapi.video.Season`,
-        :class:`~plexapi.video.Episode`, and :class:`~plexapi.video.Clip`.
-
-        Attributes:
-            addedAt (datetime): Datetime the item was added to the library.
-            art (str): URL to artwork image (/library/metadata/<ratingKey>/art/<artid>).
-            artBlurHash (str): BlurHash string for artwork image.
-            fields (List<:class:`~plexapi.media.Field`>): List of field objects.
-            guid (str): Plex GUID for the movie, show, season, episode, or clip (plex://movie/5d776b59ad5437001f79c6f8).
-            images (List<:class:`~plexapi.media.Image`>): List of image objects.
-            key (str): API URL (/library/metadata/<ratingkey>).
-            lastRatedAt (datetime): Datetime the item was last rated.
-            lastViewedAt (datetime): Datetime the item was last played.
-            librarySectionID (int): :class:`~plexapi.library.LibrarySection` ID.
-            librarySectionKey (str): :class:`~plexapi.library.LibrarySection` key.
-            librarySectionTitle (str): :class:`~plexapi.library.LibrarySection` title.
-            listType (str): Hardcoded as 'video' (useful for search filters).
-            ratingKey (int): Unique key identifying the item.
-            summary (str): Summary of the movie, show, season, episode, or clip.
-            thumb (str): URL to thumbnail image (/library/metadata/<ratingKey>/thumb/<thumbid>).
-            thumbBlurHash (str): BlurHash string for thumbnail image.
-            title (str): Name of the movie, show, season, episode, or clip.
-            titleSort (str): Title to use when sorting (defaults to title).
-            type (str): 'movie', 'show', 'season', 'episode', or 'clip'.
-            updatedAt (datetime): Datetime the item was updated.
-            userRating (float): Rating of the item (0.0 - 10.0) equaling (0 stars - 5 stars).
-            viewCount (int): Count of times the item was played.
-    """
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        self.addedAt = utils.toDatetime(data.attrib.get('addedAt'))
-        self.art = data.attrib.get('art')
-        self.artBlurHash = data.attrib.get('artBlurHash')
-        self.guid = data.attrib.get('guid')
-        self.key = data.attrib.get('key', '')
-        self.lastRatedAt = utils.toDatetime(data.attrib.get('lastRatedAt'))
-        self.lastViewedAt = utils.toDatetime(data.attrib.get('lastViewedAt'))
-        self.librarySectionID = utils.cast(int, data.attrib.get('librarySectionID'))
-        self.librarySectionKey = data.attrib.get('librarySectionKey')
-        self.librarySectionTitle = data.attrib.get('librarySectionTitle')
-        self.listType = 'video'
-        self.ratingKey = utils.cast(int, data.attrib.get('ratingKey'))
-        self.summary = data.attrib.get('summary')
-        self.thumb = data.attrib.get('thumb')
-        self.thumbBlurHash = data.attrib.get('thumbBlurHash')
-        self.title = data.attrib.get('title')
-        self.titleSort = data.attrib.get('titleSort', self.title)
-        self.type = data.attrib.get('type')
-        self.updatedAt = utils.toDatetime(data.attrib.get('updatedAt'))
-        self.userRating = utils.cast(float, data.attrib.get('userRating'))
-        self.viewCount = utils.cast(int, data.attrib.get('viewCount', 0))
-
-    @cached_data_property
-    def fields(self):
-        return self.findItems(self._data, media.Field)
-
-    @cached_data_property
-    def images(self):
-        return self.findItems(self._data, media.Image)
-
-    def url(self, part):
-        """ Returns the full url for something. Typically used for getting a specific image. """
-        return self._server.url(part, includeToken=True) if part else None
-
-    def augmentation(self):
-        """ Returns a list of :class:`~plexapi.library.Hub` objects.
-            Augmentation returns hub items relating to online media sources
-            such as Tidal Music "Track from {item}" or "Soundtrack of {item}".
-            Plex Pass and linked Tidal account are required.
-        """
-        account = self._server.myPlexAccount()
-        tidalOptOut = next(
-            (service.value for service in account.onlineMediaSources()
-                if service.key == 'tv.plex.provider.music'),
-            None
-        )
-        if account.subscriptionStatus != 'Active' or tidalOptOut == 'opt_out':
-            raise BadRequest('Requires Plex Pass and Tidal Music enabled.')
-        data = self._server.query(self.key + '?asyncAugmentMetadata=1')
-        augmentationKey = data.attrib.get('augmentationKey')
-        return self.fetchItems(augmentationKey)
-
-    def _defaultSyncTitle(self):
-        """ Returns str, default title for a new syncItem. """
-        return self.title
-
-    def uploadSubtitles(self, filepath):
-        """ Upload a subtitle file for the video.
-
-            Parameters:
-                filepath (str): Path to subtitle file.
-        """
-        url = f'{self.key}/subtitles'
-        filename = os.path.basename(filepath)
-        subFormat = os.path.splitext(filepath)[1][1:]
-        params = {
-            'title': filename,
-            'format': subFormat,
-        }
-        headers = {'Accept': 'text/plain, */*'}
-        with open(filepath, 'rb') as subfile:
-            self._server.query(url, self._server._session.post, data=subfile, params=params, headers=headers)
-        return self
-
-    def searchSubtitles(self, language='en', hearingImpaired=0, forced=0):
-        """ Search for on-demand subtitles for the video.
-            See https://support.plex.tv/articles/subtitle-search/.
-
-            Parameters:
-                language (str, optional): Language code (ISO 639-1) of the subtitles to search for.
-                    Default 'en'.
-                hearingImpaired (int, optional): Search option for SDH subtitles.
-                    Default 0.
-                    (0 = Prefer non-SDH subtitles, 1 = Prefer SDH subtitles,
-                    2 = Only show SDH subtitles, 3 = Only show non-SDH subtitles)
-                forced (int, optional): Search option for forced subtitles.
-                    Default 0.
-                    (0 = Prefer non-forced subtitles, 1 = Prefer forced subtitles,
-                    2 = Only show forced subtitles, 3 = Only show non-forced subtitles)
-
-            Returns:
-                List<:class:`~plexapi.media.SubtitleStream`>: List of SubtitleStream objects.
-        """
-        params = {
-            'language': language,
-            'hearingImpaired': hearingImpaired,
-            'forced': forced,
-        }
-        key = f'{self.key}/subtitles{utils.joinArgs(params)}'
-        return self.fetchItems(key)
-
-    def downloadSubtitles(self, subtitleStream):
-        """ Download on-demand subtitles for the video.
-            See https://support.plex.tv/articles/subtitle-search/.
-
-            Note: This method is asynchronous and returns immediately before subtitles are fully downloaded.
-
-            Parameters:
-                subtitleStream (:class:`~plexapi.media.SubtitleStream`):
-                    Subtitle object returned from :func:`~plexapi.video.Video.searchSubtitles`.
-        """
-        key = f'{self.key}/subtitles'
-        params = {'key': subtitleStream.key}
-        self._server.query(key, self._server._session.put, params=params)
-        return self
-
-    def removeSubtitles(self, subtitleStream=None, streamID=None, streamTitle=None):
-        """ Remove an upload or downloaded subtitle from the video.
-
-            Note: If the subtitle file is located inside video directory it will be deleted.
-            Files outside of video directory are not affected.
-            Embedded subtitles cannot be removed.
-
-            Parameters:
-                subtitleStream (:class:`~plexapi.media.SubtitleStream`, optional): Subtitle object to remove.
-                streamID (int, optional): ID of the subtitle stream to remove.
-                streamTitle (str, optional): Title of the subtitle stream to remove.
-        """
-        if subtitleStream is None:
-            try:
-                subtitleStream = next(
-                    stream for stream in self.subtitleStreams()
-                    if streamID == stream.id or streamTitle == stream.title
-                )
-            except StopIteration:
-                raise BadRequest(f"Subtitle stream with ID '{streamID}' or title '{streamTitle}' not found.") from None
-
-        self._server.query(subtitleStream.key, self._server._session.delete)
-        return self
-
-    def optimize(self, title='', target='', deviceProfile='', videoQuality=None,
-                 locationID=-1, limit=None, unwatched=False):
-        """ Create an optimized version of the video.
-
-            Parameters:
-                title (str, optional): Title of the optimized video.
-                target (str, optional): Target quality profile:
-                    "Optimized for Mobile" ("mobile"), "Optimized for TV" ("tv"), "Original Quality" ("original"),
-                    or custom quality profile name (default  "Custom: {deviceProfile}").
-                deviceProfile (str, optional): Custom quality device profile:
-                    "Android", "iOS", "Universal Mobile", "Universal TV", "Windows Phone", "Windows", "Xbox One".
-                    Required if ``target`` is custom.
-                videoQuality (int, optional): Index of the quality profile, one of ``VIDEO_QUALITY_*``
-                    values defined in the :mod:`~plexapi.sync` module. Only used if ``target`` is custom.
-                locationID (int or :class:`~plexapi.library.Location`, optional): Default -1 for
-                    "In folder with original items", otherwise a :class:`~plexapi.library.Location` object or ID.
-                    See examples below.
-                limit (int, optional): Maximum count of items to optimize, unlimited if ``None``.
-                unwatched (bool, optional): ``True`` to only optimized unwatched videos.
-
-            Raises:
-                :exc:`~plexapi.exceptions.BadRequest`: Unknown quality profile target
-                    or missing deviceProfile and videoQuality.
-                :exc:`~plexapi.exceptions.BadRequest`: Unknown location ID.
-
-            Example:
-
-                .. code-block:: python
-
-                    # Optimize for mobile using defaults
-                    video.optimize(target="mobile")
-
-                    # Optimize for Android at 10 Mbps 1080p
-                    from plexapi.sync import VIDEO_QUALITY_10_MBPS_1080p
-                    video.optimize(deviceProfile="Android", videoQuality=sync.VIDEO_QUALITY_10_MBPS_1080p)
-
-                    # Optimize for iOS at original quality in library location
-                    from plexapi.sync import VIDEO_QUALITY_ORIGINAL
-                    locations = plex.library.section("Movies")._locations()
-                    video.optimize(deviceProfile="iOS", videoQuality=VIDEO_QUALITY_ORIGINAL, locationID=locations[0])
-
-                    # Optimize for tv the next 5 unwatched episodes
-                    show.optimize(target="tv", limit=5, unwatched=True)
-
-        """
-        from plexapi.library import Location
-        from plexapi.sync import Policy, MediaSettings
-
-        backgroundProcessing = self.fetchItem('/playlists?type=42')
-        key = f'{backgroundProcessing.key}/items'
-
-        tags = {t.tag.lower(): t.id for t in self._server.library.tags('mediaProcessingTarget')}
-        # Additional keys for shorthand values
-        tags['mobile'] = tags['optimized for mobile']
-        tags['tv'] = tags['optimized for tv']
-        tags['original'] = tags['original quality']
-
-        targetTagID = tags.get(target.lower(), '')
-        if not targetTagID and (not deviceProfile or videoQuality is None):
-            raise BadRequest('Unknown quality profile target or missing deviceProfile and videoQuality.')
-        if targetTagID:
-            target = ''
-        elif deviceProfile and not target:
-            target = f'Custom: {deviceProfile}'
-
-        section = self.section()
-        libraryLocationIDs = [-1] + [location.id for location in section._locations()]
-        if isinstance(locationID, Location):
-            locationID = locationID.id
-        if locationID not in libraryLocationIDs:
-            raise BadRequest(f'Unknown location ID "{locationID}" not in {libraryLocationIDs}')
-
-        if isinstance(self, (Show, Season)):
-            uri = f'library:///directory/{quote_plus(f"{self.key}/children")}'
-        else:
-            uri = f'library://{section.uuid}/item/{quote_plus(self.key)}'
-
-        policy = Policy.create(limit, unwatched)
-
-        params = {
-            'Item[type]': 42,
-            'Item[title]': title or self._defaultSyncTitle(),
-            'Item[target]': target,
-            'Item[targetTagID]': targetTagID,
-            'Item[locationID]': locationID,
-            'Item[Location][uri]': uri,
-            'Item[Policy][scope]': policy.scope,
-            'Item[Policy][value]': str(policy.value),
-            'Item[Policy][unwatched]': str(int(policy.unwatched)),
-        }
-
-        if deviceProfile:
-            params['Item[Device][profile]'] = deviceProfile
-
-        if videoQuality:
-            mediaSettings = MediaSettings.createVideo(videoQuality)
-            params['Item[MediaSettings][videoQuality]'] = mediaSettings.videoQuality
-            params['Item[MediaSettings][videoResolution]'] = mediaSettings.videoResolution
-            params['Item[MediaSettings][maxVideoBitrate]'] = mediaSettings.maxVideoBitrate
-            params['Item[MediaSettings][audioBoost]'] = ''
-            params['Item[MediaSettings][subtitleSize]'] = ''
-            params['Item[MediaSettings][musicBitrate]'] = ''
-            params['Item[MediaSettings][photoQuality]'] = ''
-            params['Item[MediaSettings][photoResolution]'] = ''
-
-        url = key + utils.joinArgs(params)
-        self._server.query(url, method=self._server._session.put)
-        return self
-
-    def sync(self, videoQuality, client=None, clientId=None, limit=None, unwatched=False, title=None):
-        """ Add current video (movie, tv-show, season or episode) as sync item for specified device.
-            See :func:`~plexapi.myplex.MyPlexAccount.sync` for possible exceptions.
-
-            Parameters:
-                videoQuality (int): idx of quality of the video, one of VIDEO_QUALITY_* values defined in
-                                    :mod:`~plexapi.sync` module.
-                client (:class:`~plexapi.myplex.MyPlexDevice`): sync destination, see
-                                                               :func:`~plexapi.myplex.MyPlexAccount.sync`.
-                clientId (str): sync destination, see :func:`~plexapi.myplex.MyPlexAccount.sync`.
-                limit (int): maximum count of items to sync, unlimited if `None`.
-                unwatched (bool): if `True` watched videos wouldn't be synced.
-                title (str): descriptive title for the new :class:`~plexapi.sync.SyncItem`, if empty the value would be
-                             generated from metadata of current media.
-
-            Returns:
-                :class:`~plexapi.sync.SyncItem`: an instance of created syncItem.
-        """
-
-        from plexapi.sync import SyncItem, Policy, MediaSettings
-
-        myplex = self._server.myPlexAccount()
-        sync_item = SyncItem(self._server, None)
-        sync_item.title = title if title else self._defaultSyncTitle()
-        sync_item.rootTitle = self.title
-        sync_item.contentType = self.listType
-        sync_item.metadataType = self.METADATA_TYPE
-        sync_item.machineIdentifier = self._server.machineIdentifier
-
-        section = self._server.library.sectionByID(self.librarySectionID)
-
-        sync_item.location = f'library://{section.uuid}/item/{quote_plus(self.key)}'
-        sync_item.policy = Policy.create(limit, unwatched)
-        sync_item.mediaSettings = MediaSettings.createVideo(videoQuality)
-
-        return myplex.sync(sync_item, client=client, clientId=clientId)
-
-
-@utils.registerPlexObject
-class Movie(
-    Video, Playable,
-    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, RatingMixin,
-    ArtMixin, LogoMixin, PosterMixin, ThemeMixin,
-    MovieEditMixins,
-    WatchlistMixin
-):
-    """ Represents a single Movie.
-
-        Attributes:
-            TAG (str): 'Video'
-            TYPE (str): 'movie'
-            audienceRating (float): Audience rating (usually from Rotten Tomatoes).
-            audienceRatingImage (str): Key to audience rating image (rottentomatoes://image.rating.spilled).
-            chapters (List<:class:`~plexapi.media.Chapter`>): List of Chapter objects.
-            chapterSource (str): Chapter source (agent; media; mixed).
-            collections (List<:class:`~plexapi.media.Collection`>): List of collection objects.
-            contentRating (str) Content rating (PG-13; NR; TV-G).
-            countries (List<:class:`~plexapi.media.Country`>): List of countries objects.
-            directors (List<:class:`~plexapi.media.Director`>): List of director objects.
-            duration (int): Duration of the movie in milliseconds.
-            editionTitle (str): The edition title of the movie (e.g. Director's Cut, Extended Edition, etc.).
-            enableCreditsMarkerGeneration (int): Setting that indicates if credits markers detection is enabled.
-                (-1 = Library default, 0 = Disabled)
-            genres (List<:class:`~plexapi.media.Genre`>): List of genre objects.
-            guids (List<:class:`~plexapi.media.Guid`>): List of guid objects.
-            labels (List<:class:`~plexapi.media.Label`>): List of label objects.
-            languageOverride (str): Setting that indicates if a language is used to override metadata
-                (eg. en-CA, None = Library default).
-            markers (List<:class:`~plexapi.media.Marker`>): List of marker objects.
-            media (List<:class:`~plexapi.media.Media`>): List of media objects.
-            originallyAvailableAt (datetime): Datetime the movie was released.
-            originalTitle (str): Original title, often the foreign title (転々; 엽기�� 그녀).
-            primaryExtraKey (str) Primary extra key (/library/metadata/66351).
-            producers (List<:class:`~plexapi.media.Producer`>): List of producers objects.
-            rating (float): Movie critic rating (7.9; 9.8; 8.1).
-            ratingImage (str): Key to critic rating image (rottentomatoes://image.rating.rotten).
-            ratings (List<:class:`~plexapi.media.Rating`>): List of rating objects.
-            roles (List<:class:`~plexapi.media.Role`>): List of role objects.
-            slug (str): The clean watch.plex.tv URL identifier for the movie.
-            similar (List<:class:`~plexapi.media.Similar`>): List of Similar objects.
-            sourceURI (str): Remote server URI (server://<machineIdentifier>/com.plexapp.plugins.library)
-                (remote playlist item only).
-            studio (str): Studio that created movie (Di Bonaventura Pictures; 21 Laps Entertainment).
-            tagline (str): Movie tag line (Back 2 Work; Who says men can't change?).
-            theme (str): URL to theme resource (/library/metadata/<ratingkey>/theme/<themeid>).
-            ultraBlurColors (:class:`~plexapi.media.UltraBlurColors`): Ultra blur color object.
-            useOriginalTitle (int): Setting that indicates if the original title is used for the movie
-                (-1 = Library default, 0 = No, 1 = Yes).
-            viewOffset (int): View offset in milliseconds.
-            writers (List<:class:`~plexapi.media.Writer`>): List of writers objects.
-            year (int): Year movie was released.
-    """
-    TAG = 'Video'
-    TYPE = 'movie'
-    METADATA_TYPE = 'movie'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        Video._loadData(self, data)
-        Playable._loadData(self, data)
-        self.audienceRating = utils.cast(float, data.attrib.get('audienceRating'))
-        self.audienceRatingImage = data.attrib.get('audienceRatingImage')
-        self.chapterSource = data.attrib.get('chapterSource')
-        self.contentRating = data.attrib.get('contentRating')
-        self.duration = utils.cast(int, data.attrib.get('duration'))
-        self.editionTitle = data.attrib.get('editionTitle')
-        self.enableCreditsMarkerGeneration = utils.cast(int, data.attrib.get('enableCreditsMarkerGeneration', '-1'))
-        self.languageOverride = data.attrib.get('languageOverride')
-        self.originallyAvailableAt = utils.toDatetime(data.attrib.get('originallyAvailableAt'), '%Y-%m-%d')
-        self.originalTitle = data.attrib.get('originalTitle')
-        self.primaryExtraKey = data.attrib.get('primaryExtraKey')
-        self.rating = utils.cast(float, data.attrib.get('rating'))
-        self.ratingImage = data.attrib.get('ratingImage')
-        self.slug = data.attrib.get('slug')
-        self.sourceURI = data.attrib.get('source')  # remote playlist item
-        self.studio = data.attrib.get('studio')
-        self.tagline = data.attrib.get('tagline')
-        self.theme = data.attrib.get('theme')
-        self.useOriginalTitle = utils.cast(int, data.attrib.get('useOriginalTitle', '-1'))
-        self.viewOffset = utils.cast(int, data.attrib.get('viewOffset', 0))
-        self.year = utils.cast(int, data.attrib.get('year'))
-
-    @cached_data_property
-    def chapters(self):
-        return self.findItems(self._data, media.Chapter)
-
-    @cached_data_property
-    def collections(self):
-        return self.findItems(self._data, media.Collection)
-
-    @cached_data_property
-    def countries(self):
-        return self.findItems(self._data, media.Country)
-
-    @cached_data_property
-    def directors(self):
-        return self.findItems(self._data, media.Director)
-
-    @cached_data_property
-    def genres(self):
-        return self.findItems(self._data, media.Genre)
-
-    @cached_data_property
-    def guids(self):
-        return self.findItems(self._data, media.Guid)
-
-    @cached_data_property
-    def labels(self):
-        return self.findItems(self._data, media.Label)
-
-    @cached_data_property
-    def markers(self):
-        return self.findItems(self._data, media.Marker)
-
-    @cached_data_property
-    def media(self):
-        return self.findItems(self._data, media.Media)
-
-    @cached_data_property
-    def producers(self):
-        return self.findItems(self._data, media.Producer)
-
-    @cached_data_property
-    def ratings(self):
-        return self.findItems(self._data, media.Rating)
-
-    @cached_data_property
-    def roles(self):
-        return self.findItems(self._data, media.Role)
-
-    @cached_data_property
-    def similar(self):
-        return self.findItems(self._data, media.Similar)
-
-    @cached_data_property
-    def ultraBlurColors(self):
-        return self.findItem(self._data, media.UltraBlurColors)
-
-    @cached_data_property
-    def writers(self):
-        return self.findItems(self._data, media.Writer)
-
-    @property
-    def actors(self):
-        """ Alias to self.roles. """
-        return self.roles
-
-    @property
-    def locations(self):
-        """ This does not exist in plex xml response but is added to have a common
-            interface to get the locations of the movie.
-
-            Returns:
-                List<str> of file paths where the movie is found on disk.
-        """
-        return [part.file for part in self.iterParts() if part]
-
-    @property
-    def hasCreditsMarker(self):
-        """ Returns True if the movie has a credits marker. """
-        return any(marker.type == 'credits' for marker in self.markers)
-
-    @property
-    def hasVoiceActivity(self):
-        """ Returns True if any of the media has voice activity analyzed. """
-        return any(media.hasVoiceActivity for media in self.media)
-
-    @property
-    def hasPreviewThumbnails(self):
-        """ Returns True if any of the media parts has generated preview (BIF) thumbnails. """
-        return any(part.hasPreviewThumbnails for media in self.media for part in media.parts)
-
-    def _prettyfilename(self):
-        """ Returns a filename for use in download. """
-        return f'{self.title} ({self.year})'
-
-    def reviews(self):
-        """ Returns a list of :class:`~plexapi.media.Review` objects. """
-        key = f'{self.key}?includeReviews=1'
-        return self.fetchItems(key, cls=media.Review, rtag='Video')
-
-    def editions(self):
-        """ Returns a list of :class:`~plexapi.video.Movie` objects
-            for other editions of the same movie.
-        """
-        filters = {
-            'guid': self.guid,
-            'id!': self.ratingKey
-        }
-        return self.section().search(filters=filters)
-
-    def removeFromContinueWatching(self):
-        """ Remove the movie from continue watching. """
-        key = '/actions/removeFromContinueWatching'
-        params = {'ratingKey': self.ratingKey}
-        self._server.query(key, params=params, method=self._server._session.put)
-        return self
-
-    @property
-    def metadataDirectory(self):
-        """ Returns the Plex Media Server data directory where the metadata is stored. """
-        guid_hash = utils.sha1hash(self.guid)
-        return str(Path('Metadata') / 'Movies' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
-
-
-@utils.registerPlexObject
-class Show(
-    Video,
-    AdvancedSettingsMixin, SplitMergeMixin, UnmatchMatchMixin, ExtrasMixin, HubsMixin, RatingMixin,
-    ArtMixin, LogoMixin, PosterMixin, ThemeMixin,
-    ShowEditMixins,
-    WatchlistMixin
-):
-    """ Represents a single Show (including all seasons and episodes).
-
-        Attributes:
-            TAG (str): 'Directory'
-            TYPE (str): 'show'
-            audienceRating (float): Audience rating (TMDB or TVDB).
-            audienceRatingImage (str): Key to audience rating image (tmdb://image.rating).
-            audioLanguage (str): Setting that indicates the preferred audio language.
-            autoDeletionItemPolicyUnwatchedLibrary (int): Setting that indicates the number of unplayed
-                episodes to keep for the show (0 = All episodes, 5 = 5 latest episodes, 3 = 3 latest episodes,
-                1 = 1 latest episode, -3 = Episodes added in the past 3 days, -7 = Episodes added in the
-                past 7 days, -30 = Episodes added in the past 30 days).
-            autoDeletionItemPolicyWatchedLibrary (int): Setting that indicates if episodes are deleted
-                after being watched for the show (0 = Never, 1 = After a day, 7 = After a week,
-                100 = On next refresh).
-            childCount (int): Number of seasons (including Specials) in the show.
-            collections (List<:class:`~plexapi.media.Collection`>): List of collection objects.
-            contentRating (str) Content rating (PG-13; NR; TV-G).
-            duration (int): Typical duration of the show episodes in milliseconds.
-            enableCreditsMarkerGeneration (int): Setting that indicates if credits markers detection is enabled.
-                (-1 = Library default, 0 = Disabled).
-            episodeSort (int): Setting that indicates how episodes are sorted for the show
-                (-1 = Library default, 0 = Oldest first, 1 = Newest first).
-            flattenSeasons (int): Setting that indicates if seasons are set to hidden for the show
-                (-1 = Library default, 0 = Hide, 1 = Show).
-            genres (List<:class:`~plexapi.media.Genre`>): List of genre objects.
-            guids (List<:class:`~plexapi.media.Guid`>): List of guid objects.
-            index (int): Plex index number for the show.
-            key (str): API URL (/library/metadata/<ratingkey>).
-            labels (List<:class:`~plexapi.media.Label`>): List of label objects.
-            languageOverride (str): Setting that indicates if a language is used to override metadata
-                (eg. en-CA, None = Library default).
-            leafCount (int): Number of items in the show view.
-            locations (List<str>): List of folder paths where the show is found on disk.
-            network (str): The network that distributed the show.
-            originallyAvailableAt (datetime): Datetime the show was released.
-            originalTitle (str): The original title of the show.
-            rating (float): Show rating (7.9; 9.8; 8.1).
-            ratings (List<:class:`~plexapi.media.Rating`>): List of rating objects.
-            roles (List<:class:`~plexapi.media.Role`>): List of role objects.
-            seasonCount (int): Number of seasons (excluding Specials) in the show.
-            showOrdering (str): Setting that indicates the episode ordering for the show
-                (None = Library default, tmdbAiring = The Movie Database (Aired),
-                aired = TheTVDB (Aired), dvd = TheTVDB (DVD), absolute = TheTVDB (Absolute)).
-            similar (List<:class:`~plexapi.media.Similar`>): List of Similar objects.
-            slug (str): The clean watch.plex.tv URL identifier for the show.
-            studio (str): Studio that created show (Di Bonaventura Pictures; 21 Laps Entertainment).
-            subtitleLanguage (str): Setting that indicates the preferred subtitle language.
-            subtitleMode (int): Setting that indicates the auto-select subtitle mode.
-                (-1 = Account default, 0 = Manually selected, 1 = Shown with foreign audio, 2 = Always enabled).
-            tagline (str): Show tag line.
-            theme (str): URL to theme resource (/library/metadata/<ratingkey>/theme/<themeid>).
-            ultraBlurColors (:class:`~plexapi.media.UltraBlurColors`): Ultra blur color object.
-            useOriginalTitle (int): Setting that indicates if the original title is used for the show
-                (-1 = Library default, 0 = No, 1 = Yes).
-            viewedLeafCount (int): Number of items marked as played in the show view.
-            year (int): Year the show was released.
-    """
-    TAG = 'Directory'
-    TYPE = 'show'
-    METADATA_TYPE = 'episode'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        Video._loadData(self, data)
-        self.audienceRating = utils.cast(float, data.attrib.get('audienceRating'))
-        self.audienceRatingImage = data.attrib.get('audienceRatingImage')
-        self.audioLanguage = data.attrib.get('audioLanguage', '')
-        self.autoDeletionItemPolicyUnwatchedLibrary = utils.cast(
-            int, data.attrib.get('autoDeletionItemPolicyUnwatchedLibrary', '0'))
-        self.autoDeletionItemPolicyWatchedLibrary = utils.cast(
-            int, data.attrib.get('autoDeletionItemPolicyWatchedLibrary', '0'))
-        self.childCount = utils.cast(int, data.attrib.get('childCount'))
-        self.contentRating = data.attrib.get('contentRating')
-        self.duration = utils.cast(int, data.attrib.get('duration'))
-        self.enableCreditsMarkerGeneration = utils.cast(int, data.attrib.get('enableCreditsMarkerGeneration', '-1'))
-        self.episodeSort = utils.cast(int, data.attrib.get('episodeSort', '-1'))
-        self.flattenSeasons = utils.cast(int, data.attrib.get('flattenSeasons', '-1'))
-        self.index = utils.cast(int, data.attrib.get('index'))
-        self.key = self.key.replace('/children', '')  # FIX_BUG_50
-        self.languageOverride = data.attrib.get('languageOverride')
-        self.leafCount = utils.cast(int, data.attrib.get('leafCount'))
-        self.network = data.attrib.get('network')
-        self.originallyAvailableAt = utils.toDatetime(data.attrib.get('originallyAvailableAt'), '%Y-%m-%d')
-        self.originalTitle = data.attrib.get('originalTitle')
-        self.rating = utils.cast(float, data.attrib.get('rating'))
-        self.seasonCount = utils.cast(int, data.attrib.get('seasonCount', self.childCount))
-        self.showOrdering = data.attrib.get('showOrdering')
-        self.slug = data.attrib.get('slug')
-        self.studio = data.attrib.get('studio')
-        self.subtitleLanguage = data.attrib.get('subtitleLanguage', '')
-        self.subtitleMode = utils.cast(int, data.attrib.get('subtitleMode', '-1'))
-        self.tagline = data.attrib.get('tagline')
-        self.theme = data.attrib.get('theme')
-        self.useOriginalTitle = utils.cast(int, data.attrib.get('useOriginalTitle', '-1'))
-        self.viewedLeafCount = utils.cast(int, data.attrib.get('viewedLeafCount'))
-        self.year = utils.cast(int, data.attrib.get('year'))
-
-    @cached_data_property
-    def collections(self):
-        return self.findItems(self._data, media.Collection)
-
-    @cached_data_property
-    def genres(self):
-        return self.findItems(self._data, media.Genre)
-
-    @cached_data_property
-    def guids(self):
-        return self.findItems(self._data, media.Guid)
-
-    @cached_data_property
-    def labels(self):
-        return self.findItems(self._data, media.Label)
-
-    @cached_data_property
-    def locations(self):
-        return self.listAttrs(self._data, 'path', etag='Location')
-
-    @cached_data_property
-    def ratings(self):
-        return self.findItems(self._data, media.Rating)
-
-    @cached_data_property
-    def roles(self):
-        return self.findItems(self._data, media.Role)
-
-    @cached_data_property
-    def similar(self):
-        return self.findItems(self._data, media.Similar)
-
-    @cached_data_property
-    def ultraBlurColors(self):
-        return self.findItem(self._data, media.UltraBlurColors)
-
-    def __iter__(self):
-        for season in self.seasons():
-            yield season
-
-    @property
-    def actors(self):
-        """ Alias to self.roles. """
-        return self.roles
-
-    @property
-    def isPlayed(self):
-        """ Returns True if the show is fully played. """
-        return bool(self.viewedLeafCount == self.leafCount)
-
-    def onDeck(self):
-        """ Returns show's On Deck :class:`~plexapi.video.Video` object or `None`.
-            If show is unwatched, return will likely be the first episode.
-        """
-        key = f'{self.key}?includeOnDeck=1'
-        return next(iter(self.fetchItems(key, cls=Episode, rtag='OnDeck')), None)
-
-    def season(self, title=None, season=None):
-        """ Returns the season with the specified title or number.
-
-            Parameters:
-                title (str): Title of the season to return.
-                season (int): Season number (default: None; required if title not specified).
-
-            Raises:
-                :exc:`~plexapi.exceptions.BadRequest`: If title or season parameter is missing.
-        """
-        key = f'{self.key}/children?excludeAllLeaves=1'
-        if title is not None and not isinstance(title, int):
-            return self.fetchItem(key, Season, title__iexact=title)
-        elif season is not None or isinstance(title, int):
-            if isinstance(title, int):
-                index = title
-            else:
-                index = season
-            return self.fetchItem(key, Season, index=index)
-        raise BadRequest('Missing argument: title or season is required')
-
-    def seasons(self, **kwargs):
-        """ Returns a list of :class:`~plexapi.video.Season` objects in the show. """
-        key = f'{self.key}/children?excludeAllLeaves=1'
-        return self.fetchItems(key, Season, container_size=self.childCount, **kwargs)
-
-    def episode(self, title=None, season=None, episode=None):
-        """ Find a episode using a title or season and episode.
-
-            Parameters:
-                title (str): Title of the episode to return
-                season (int): Season number (default: None; required if title not specified).
-                episode (int): Episode number (default: None; required if title not specified).
-
-            Raises:
-                :exc:`~plexapi.exceptions.BadRequest`: If title or season and episode parameters are missing.
-        """
-        key = f'{self.key}/allLeaves'
-        if title is not None:
-            return self.fetchItem(key, Episode, title__iexact=title)
-        elif season is not None and episode is not None:
-            return self.fetchItem(key, Episode, parentIndex=season, index=episode)
-        raise BadRequest('Missing argument: title or season and episode are required')
-
-    def episodes(self, **kwargs):
-        """ Returns a list of :class:`~plexapi.video.Episode` objects in the show. """
-        key = f'{self.key}/allLeaves'
-        return self.fetchItems(key, Episode, **kwargs)
-
-    def get(self, title=None, season=None, episode=None):
-        """ Alias to :func:`~plexapi.video.Show.episode`. """
-        return self.episode(title, season, episode)
-
-    def watched(self):
-        """ Returns list of watched :class:`~plexapi.video.Episode` objects. """
-        return self.episodes(viewCount__gt=0)
-
-    def unwatched(self):
-        """ Returns list of unwatched :class:`~plexapi.video.Episode` objects. """
-        return self.episodes(viewCount=0)
-
-    def download(self, savepath=None, keep_original_name=False, subfolders=False, **kwargs):
-        """ Download all episodes from the show. See :func:`~plexapi.base.Playable.download` for details.
-
-            Parameters:
-                savepath (str): Defaults to current working dir.
-                keep_original_name (bool): True to keep the original filename otherwise
-                    a friendlier filename is generated.
-                subfolders (bool): True to separate episodes in to season folders.
-                **kwargs: Additional options passed into :func:`~plexapi.base.PlexObject.getStreamURL`.
-        """
-        filepaths = []
-        for episode in self.episodes():
-            _savepath = os.path.join(savepath, f'Season {str(episode.seasonNumber).zfill(2)}') if subfolders else savepath
-            filepaths += episode.download(_savepath, keep_original_name, **kwargs)
-        return filepaths
-
-    @property
-    def metadataDirectory(self):
-        """ Returns the Plex Media Server data directory where the metadata is stored. """
-        guid_hash = utils.sha1hash(self.guid)
-        return str(Path('Metadata') / 'TV Shows' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
-
-
-@utils.registerPlexObject
-class Season(
-    Video,
-    AdvancedSettingsMixin, ExtrasMixin, RatingMixin,
-    ArtMixin, LogoMixin, PosterMixin, ThemeUrlMixin,
-    SeasonEditMixins
-):
-    """ Represents a single Season.
-
-        Attributes:
-            TAG (str): 'Directory'
-            TYPE (str): 'season'
-            audienceRating (float): Audience rating.
-            audioLanguage (str): Setting that indicates the preferred audio language.
-            collections (List<:class:`~plexapi.media.Collection`>): List of collection objects.
-            guids (List<:class:`~plexapi.media.Guid`>): List of guid objects.
-            index (int): Season number.
-            key (str): API URL (/library/metadata/<ratingkey>).
-            labels (List<:class:`~plexapi.media.Label`>): List of label objects.
-            leafCount (int): Number of items in the season view.
-            parentGuid (str): Plex GUID for the show (plex://show/5d9c086fe9d5a1001f4d9fe6).
-            parentIndex (int): Plex index number for the show.
-            parentKey (str): API URL of the show (/library/metadata/<parentRatingKey>).
-            parentRatingKey (int): Unique key identifying the show.
-            parentSlug (str): The clean watch.plex.tv URL identifier for the show.
-            parentStudio (str): Studio that created show.
-            parentTheme (str): URL to show theme resource (/library/metadata/<parentRatingkey>/theme/<themeid>).
-            parentThumb (str): URL to show thumbnail image (/library/metadata/<parentRatingKey>/thumb/<thumbid>).
-            parentTitle (str): Name of the show for the season.
-            rating (float): Season rating (7.9; 9.8; 8.1).
-            ratings (List<:class:`~plexapi.media.Rating`>): List of rating objects.
-            subtitleLanguage (str): Setting that indicates the preferred subtitle language.
-            subtitleMode (int): Setting that indicates the auto-select subtitle mode.
-                (-1 = Series default, 0 = Manually selected, 1 = Shown with foreign audio, 2 = Always enabled).
-            ultraBlurColors (:class:`~plexapi.media.UltraBlurColors`): Ultra blur color object.
-            viewedLeafCount (int): Number of items marked as played in the season view.
-            year (int): Year the season was released.
-    """
-    TAG = 'Directory'
-    TYPE = 'season'
-    METADATA_TYPE = 'episode'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        Video._loadData(self, data)
-        self.audienceRating = utils.cast(float, data.attrib.get('audienceRating'))
-        self.audioLanguage = data.attrib.get('audioLanguage', '')
-        self.index = utils.cast(int, data.attrib.get('index'))
-        self.key = self.key.replace('/children', '')  # FIX_BUG_50
-        self.leafCount = utils.cast(int, data.attrib.get('leafCount'))
-        self.parentGuid = data.attrib.get('parentGuid')
-        self.parentIndex = utils.cast(int, data.attrib.get('parentIndex'))
-        self.parentKey = data.attrib.get('parentKey')
-        self.parentRatingKey = utils.cast(int, data.attrib.get('parentRatingKey'))
-        self.parentSlug = data.attrib.get('parentSlug')
-        self.parentStudio = data.attrib.get('parentStudio')
-        self.parentTheme = data.attrib.get('parentTheme')
-        self.parentThumb = data.attrib.get('parentThumb')
-        self.parentTitle = data.attrib.get('parentTitle')
-        self.rating = utils.cast(float, data.attrib.get('rating'))
-        self.subtitleLanguage = data.attrib.get('subtitleLanguage', '')
-        self.subtitleMode = utils.cast(int, data.attrib.get('subtitleMode', '-1'))
-        self.viewedLeafCount = utils.cast(int, data.attrib.get('viewedLeafCount'))
-        self.year = utils.cast(int, data.attrib.get('year'))
-
-    @cached_data_property
-    def collections(self):
-        return self.findItems(self._data, media.Collection)
-
-    @cached_data_property
-    def guids(self):
-        return self.findItems(self._data, media.Guid)
-
-    @cached_data_property
-    def labels(self):
-        return self.findItems(self._data, media.Label)
-
-    @cached_data_property
-    def ratings(self):
-        return self.findItems(self._data, media.Rating)
-
-    @cached_data_property
-    def ultraBlurColors(self):
-        return self.findItem(self._data, media.UltraBlurColors)
-
-    def __iter__(self):
-        for episode in self.episodes():
-            yield episode
-
-    def __repr__(self):
-        return '<{}>'.format(
-            ':'.join([p for p in [
-                self.__class__.__name__,
-                self.key.replace('/library/metadata/', '').replace('/children', ''),
-                f"{self.parentTitle.replace(' ', '-')[:20]}-{self.seasonNumber}",
-            ] if p])
-        )
-
-    @property
-    def isPlayed(self):
-        """ Returns True if the season is fully played. """
-        return bool(self.viewedLeafCount == self.leafCount)
-
-    @property
-    def seasonNumber(self):
-        """ Returns the season number. """
-        return self.index
-
-    def onDeck(self):
-        """ Returns season's On Deck :class:`~plexapi.video.Video` object or `None`.
-            Will only return a match if the show's On Deck episode is in this season.
-        """
-        key = f'{self.key}?includeOnDeck=1'
-        return next(iter(self.fetchItems(key, cls=Episode, rtag='OnDeck')), None)
-
-    def episode(self, title=None, episode=None):
-        """ Returns the episode with the given title or number.
-
-            Parameters:
-                title (str): Title of the episode to return.
-                episode (int): Episode number (default: None; required if title not specified).
-
-            Raises:
-                :exc:`~plexapi.exceptions.BadRequest`: If title or episode parameter is missing.
-        """
-        key = f'{self.key}/children'
-        if title is not None and not isinstance(title, int):
-            return self.fetchItem(key, Episode, title__iexact=title)
-        elif episode is not None or isinstance(title, int):
-            if isinstance(title, int):
-                index = title
-            else:
-                index = episode
-            return self.fetchItem(key, Episode, parentIndex=self.index, index=index)
-        raise BadRequest('Missing argument: title or episode is required')
-
-    def episodes(self, **kwargs):
-        """ Returns a list of :class:`~plexapi.video.Episode` objects in the season. """
-        key = f'{self.key}/children'
-        return self.fetchItems(key, Episode, **kwargs)
-
-    def get(self, title=None, episode=None):
-        """ Alias to :func:`~plexapi.video.Season.episode`. """
-        return self.episode(title, episode)
-
-    def show(self):
-        """ Return the season's :class:`~plexapi.video.Show`. """
-        return self.fetchItem(self.parentKey)
-
-    def watched(self):
-        """ Returns list of watched :class:`~plexapi.video.Episode` objects. """
-        return self.episodes(viewCount__gt=0)
-
-    def unwatched(self):
-        """ Returns list of unwatched :class:`~plexapi.video.Episode` objects. """
-        return self.episodes(viewCount=0)
-
-    def download(self, savepath=None, keep_original_name=False, **kwargs):
-        """ Download all episodes from the season. See :func:`~plexapi.base.Playable.download` for details.
-
-            Parameters:
-                savepath (str): Defaults to current working dir.
-                keep_original_name (bool): True to keep the original filename otherwise
-                    a friendlier filename is generated.
-                **kwargs: Additional options passed into :func:`~plexapi.base.PlexObject.getStreamURL`.
-        """
-        filepaths = []
-        for episode in self.episodes():
-            filepaths += episode.download(savepath, keep_original_name, **kwargs)
-        return filepaths
-
-    def _defaultSyncTitle(self):
-        """ Returns str, default title for a new syncItem. """
-        return f'{self.parentTitle} - {self.title}'
-
-    @property
-    def metadataDirectory(self):
-        """ Returns the Plex Media Server data directory where the metadata is stored. """
-        guid_hash = utils.sha1hash(self.parentGuid)
-        return str(Path('Metadata') / 'TV Shows' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
-
-
-@utils.registerPlexObject
-class Episode(
-    Video, Playable,
-    ExtrasMixin, RatingMixin,
-    ArtMixin, LogoMixin, PosterMixin, ThemeUrlMixin,
-    EpisodeEditMixins
-):
-    """ Represents a single Episode.
-
-        Attributes:
-            TAG (str): 'Video'
-            TYPE (str): 'episode'
-            audienceRating (float): Audience rating (TMDB or TVDB).
-            audienceRatingImage (str): Key to audience rating image (tmdb://image.rating).
-            chapters (List<:class:`~plexapi.media.Chapter`>): List of Chapter objects.
-            chapterSource (str): Chapter source (agent; media; mixed).
-            collections (List<:class:`~plexapi.media.Collection`>): List of collection objects.
-            contentRating (str) Content rating (PG-13; NR; TV-G).
-            directors (List<:class:`~plexapi.media.Director`>): List of director objects.
-            duration (int): Duration of the episode in milliseconds.
-            grandparentArt (str): URL to show artwork (/library/metadata/<grandparentRatingKey>/art/<artid>).
-            grandparentGuid (str): Plex GUID for the show (plex://show/5d9c086fe9d5a1001f4d9fe6).
-            grandparentKey (str): API URL of the show (/library/metadata/<grandparentRatingKey>).
-            grandparentRatingKey (int): Unique key identifying the show.
-            grandparentSlug (str): The clean watch.plex.tv URL identifier for the show.
-            grandparentTheme (str): URL to show theme resource (/library/metadata/<grandparentRatingkey>/theme/<themeid>).
-            grandparentThumb (str): URL to show thumbnail image (/library/metadata/<grandparentRatingKey>/thumb/<thumbid>).
-            grandparentTitle (str): Name of the show for the episode.
-            guids (List<:class:`~plexapi.media.Guid`>): List of guid objects.
-            index (int): Episode number.
-            labels (List<:class:`~plexapi.media.Label`>): List of label objects.
-            markers (List<:class:`~plexapi.media.Marker`>): List of marker objects.
-            media (List<:class:`~plexapi.media.Media`>): List of media objects.
-            originallyAvailableAt (datetime): Datetime the episode was released.
-            parentGuid (str): Plex GUID for the season (plex://season/5d9c09e42df347001e3c2a72).
-            parentIndex (int): Season number of episode.
-            parentKey (str): API URL of the season (/library/metadata/<parentRatingKey>).
-            parentRatingKey (int): Unique key identifying the season.
-            parentThumb (str): URL to season thumbnail image (/library/metadata/<parentRatingKey>/thumb/<thumbid>).
-            parentTitle (str): Name of the season for the episode.
-            parentYear (int): Year the season was released.
-            producers (List<:class:`~plexapi.media.Producer`>): List of producers objects.
-            rating (float): Episode rating (7.9; 9.8; 8.1).
-            ratings (List<:class:`~plexapi.media.Rating`>): List of rating objects.
-            roles (List<:class:`~plexapi.media.Role`>): List of role objects.
-            skipParent (bool): True if the show's seasons are set to hidden.
-            sourceURI (str): Remote server URI (server://<machineIdentifier>/com.plexapp.plugins.library)
-                (remote playlist item only).
-            ultraBlurColors (:class:`~plexapi.media.UltraBlurColors`): Ultra blur color object.
-            viewOffset (int): View offset in milliseconds.
-            writers (List<:class:`~plexapi.media.Writer`>): List of writers objects.
-            year (int): Year the episode was released.
-    """
-    TAG = 'Video'
-    TYPE = 'episode'
-    METADATA_TYPE = 'episode'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        Video._loadData(self, data)
-        Playable._loadData(self, data)
-        self.audienceRating = utils.cast(float, data.attrib.get('audienceRating'))
-        self.audienceRatingImage = data.attrib.get('audienceRatingImage')
-        self.chapterSource = data.attrib.get('chapterSource')
-        self.contentRating = data.attrib.get('contentRating')
-        self.duration = utils.cast(int, data.attrib.get('duration'))
-        self.grandparentArt = data.attrib.get('grandparentArt')
-        self.grandparentGuid = data.attrib.get('grandparentGuid')
-        self.grandparentKey = data.attrib.get('grandparentKey')
-        self.grandparentRatingKey = utils.cast(int, data.attrib.get('grandparentRatingKey'))
-        self.grandparentSlug = data.attrib.get('grandparentSlug')
-        self.grandparentTheme = data.attrib.get('grandparentTheme')
-        self.grandparentThumb = data.attrib.get('grandparentThumb')
-        self.grandparentTitle = data.attrib.get('grandparentTitle')
-        self.index = utils.cast(int, data.attrib.get('index'))
-        self.originallyAvailableAt = utils.toDatetime(data.attrib.get('originallyAvailableAt'), '%Y-%m-%d')
-        self.parentGuid = data.attrib.get('parentGuid')
-        self.parentIndex = utils.cast(int, data.attrib.get('parentIndex'))
-        self.parentTitle = data.attrib.get('parentTitle')
-        self.parentYear = utils.cast(int, data.attrib.get('parentYear'))
-        self.rating = utils.cast(float, data.attrib.get('rating'))
-        self.skipParent = utils.cast(bool, data.attrib.get('skipParent', '0'))
-        self.sourceURI = data.attrib.get('source')  # remote playlist item
-        self.viewOffset = utils.cast(int, data.attrib.get('viewOffset', 0))
-        self.year = utils.cast(int, data.attrib.get('year'))
-
-        # If seasons are hidden, parentKey and parentRatingKey are missing from the XML response.
-        # https://forums.plex.tv/t/parentratingkey-not-in-episode-xml-when-seasons-are-hidden/300553
-        # Use cached properties below to return the correct values if they are missing to avoid auto-reloading.
-        self._parentKey = data.attrib.get('parentKey')
-        self._parentRatingKey = utils.cast(int, data.attrib.get('parentRatingKey'))
-        self._parentThumb = data.attrib.get('parentThumb')
-
-    @cached_data_property
-    def chapters(self):
-        return self.findItems(self._data, media.Chapter)
-
-    @cached_data_property
-    def collections(self):
-        return self.findItems(self._data, media.Collection)
-
-    @cached_data_property
-    def directors(self):
-        return self.findItems(self._data, media.Director)
-
-    @cached_data_property
-    def guids(self):
-        return self.findItems(self._data, media.Guid)
-
-    @cached_data_property
-    def labels(self):
-        return self.findItems(self._data, media.Label)
-
-    @cached_data_property
-    def markers(self):
-        return self.findItems(self._data, media.Marker)
-
-    @cached_data_property
-    def media(self):
-        return self.findItems(self._data, media.Media)
-
-    @cached_data_property
-    def producers(self):
-        return self.findItems(self._data, media.Producer)
-
-    @cached_data_property
-    def ratings(self):
-        return self.findItems(self._data, media.Rating)
-
-    @cached_data_property
-    def roles(self):
-        return self.findItems(self._data, media.Role)
-
-    @cached_data_property
-    def writers(self):
-        return self.findItems(self._data, media.Writer)
-
-    @cached_data_property
-    def ultraBlurColors(self):
-        return self.findItem(self._data, media.UltraBlurColors)
-
-    @cached_data_property
-    def parentKey(self):
-        """ Returns the parentKey. Refer to the Episode attributes. """
-        if self._parentKey:
-            return self._parentKey
-        if self.parentRatingKey:
-            return f'/library/metadata/{self.parentRatingKey}'
-        return None
-
-    @cached_data_property
-    def parentRatingKey(self):
-        """ Returns the parentRatingKey. Refer to the Episode attributes. """
-        if self._parentRatingKey is not None:
-            return self._parentRatingKey
-        # Parse the parentRatingKey from the parentThumb
-        if self._parentThumb and self._parentThumb.startswith('/library/metadata/'):
-            return utils.cast(int, self._parentThumb.split('/')[3])
-        # Get the parentRatingKey from the season's ratingKey if available
-        if self._season:
-            return self._season.ratingKey
-        return None
-
-    @cached_data_property
-    def parentThumb(self):
-        """ Returns the parentThumb. Refer to the Episode attributes. """
-        if self._parentThumb:
-            return self._parentThumb
-        if self._season:
-            return self._season.thumb
-        return None
-
-    @cached_data_property
-    def _season(self):
-        """ Returns the :class:`~plexapi.video.Season` object by querying for the show's children. """
-        if self.grandparentKey and self.parentIndex is not None:
-            return self.fetchItem(f'{self.grandparentKey}/children?excludeAllLeaves=1&index={self.parentIndex}')
-        return None
-
-    def __repr__(self):
-        return '<{}>'.format(
-            ':'.join([p for p in [
-                self.__class__.__name__,
-                self.key.replace('/library/metadata/', '').replace('/children', ''),
-                f"{self.grandparentTitle.replace(' ', '-')[:20]}-{self.seasonEpisode}",
-            ] if p])
-        )
-
-    def _prettyfilename(self):
-        """ Returns a filename for use in download. """
-        return f'{self.grandparentTitle} - {self.seasonEpisode} - {self.title}'
-
-    @property
-    def actors(self):
-        """ Alias to self.roles. """
-        return self.roles
-
-    @property
-    def locations(self):
-        """ This does not exist in plex xml response but is added to have a common
-            interface to get the locations of the episode.
-
-            Returns:
-                List<str> of file paths where the episode is found on disk.
-        """
-        return [part.file for part in self.iterParts() if part]
-
-    @property
-    def episodeNumber(self):
-        """ Returns the episode number. """
-        return self.index
-
-    @cached_data_property
-    def seasonNumber(self):
-        """ Returns the episode's season number. """
-        if isinstance(self.parentIndex, int):
-            return self.parentIndex
-        elif self._season:
-            return self._season.index
-        return None
-
-    @property
-    def seasonEpisode(self):
-        """ Returns the s00e00 string containing the season and episode numbers. """
-        return f's{str(self.seasonNumber).zfill(2)}e{str(self.episodeNumber).zfill(2)}'
-
-    @property
-    def hasCommercialMarker(self):
-        """ Returns True if the episode has a commercial marker. """
-        return any(marker.type == 'commercial' for marker in self.markers)
-
-    @property
-    def hasIntroMarker(self):
-        """ Returns True if the episode has an intro marker. """
-        return any(marker.type == 'intro' for marker in self.markers)
-
-    @property
-    def hasCreditsMarker(self):
-        """ Returns True if the episode has a credits marker. """
-        return any(marker.type == 'credits' for marker in self.markers)
-
-    @property
-    def hasVoiceActivity(self):
-        """ Returns True if any of the media has voice activity analyzed. """
-        return any(media.hasVoiceActivity for media in self.media)
-
-    @property
-    def hasPreviewThumbnails(self):
-        """ Returns True if any of the media parts has generated preview (BIF) thumbnails. """
-        return any(part.hasPreviewThumbnails for media in self.media for part in media.parts)
-
-    def season(self):
-        """" Return the episode's :class:`~plexapi.video.Season`. """
-        return self.fetchItem(self.parentKey)
-
-    def show(self):
-        """" Return the episode's :class:`~plexapi.video.Show`. """
-        return self.fetchItem(self.grandparentKey)
-
-    def _defaultSyncTitle(self):
-        """ Returns str, default title for a new syncItem. """
-        return f'{self.grandparentTitle} - {self.parentTitle} - ({self.seasonEpisode}) {self.title}'
-
-    def removeFromContinueWatching(self):
-        """ Remove the movie from continue watching. """
-        key = '/actions/removeFromContinueWatching'
-        params = {'ratingKey': self.ratingKey}
-        self._server.query(key, params=params, method=self._server._session.put)
-        return self
-
-    @property
-    def metadataDirectory(self):
-        """ Returns the Plex Media Server data directory where the metadata is stored. """
-        guid_hash = utils.sha1hash(self.grandparentGuid)
-        return str(Path('Metadata') / 'TV Shows' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
-
-
-@utils.registerPlexObject
-class Clip(
-    Video, Playable,
-    ArtUrlMixin, PosterUrlMixin
-):
-    """ Represents a single Clip.
-
-        Attributes:
-            TAG (str): 'Video'
-            TYPE (str): 'clip'
-            duration (int): Duration of the clip in milliseconds.
-            extraType (int): Unknown.
-            index (int): Plex index number for the clip.
-            media (List<:class:`~plexapi.media.Media`>): List of media objects.
-            originallyAvailableAt (datetime): Datetime the clip was released.
-            skipDetails (int): Unknown.
-            subtype (str): Type of clip (trailer, behindTheScenes, sceneOrSample, etc.).
-            thumbAspectRatio (str): Aspect ratio of the thumbnail image.
-            viewOffset (int): View offset in milliseconds.
-            year (int): Year clip was released.
-    """
-    TAG = 'Video'
-    TYPE = 'clip'
-    METADATA_TYPE = 'clip'
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        Video._loadData(self, data)
-        Playable._loadData(self, data)
-        self.addedAt = utils.toDatetime(data.attrib.get('addedAt'))
-        self.duration = utils.cast(int, data.attrib.get('duration'))
-        self.extraType = utils.cast(int, data.attrib.get('extraType'))
-        self.index = utils.cast(int, data.attrib.get('index'))
-        self.originallyAvailableAt = utils.toDatetime(
-            data.attrib.get('originallyAvailableAt'), '%Y-%m-%d')
-        self.skipDetails = utils.cast(int, data.attrib.get('skipDetails'))
-        self.subtype = data.attrib.get('subtype')
-        self.thumbAspectRatio = data.attrib.get('thumbAspectRatio')
-        self.viewOffset = utils.cast(int, data.attrib.get('viewOffset', 0))
-        self.year = utils.cast(int, data.attrib.get('year'))
-
-    @cached_data_property
-    def media(self):
-        return self.findItems(self._data, media.Media)
-
-    @property
-    def locations(self):
-        """ This does not exist in plex xml response but is added to have a common
-            interface to get the locations of the clip.
-
-            Returns:
-                List<str> of file paths where the clip is found on disk.
-        """
-        return [part.file for part in self.iterParts() if part]
-
-    def _prettyfilename(self):
-        """ Returns a filename for use in download. """
-        return self.title
-
-    @property
-    def metadataDirectory(self):
-        """ Returns the Plex Media Server data directory where the metadata is stored. """
-        guid_hash = utils.sha1hash(self.guid)
-        return str(Path('Metadata') / 'Movies' / guid_hash[0] / f'{guid_hash[1:]}.bundle')
-
-
-class Extra(Clip):
-    """ Represents a single Extra (trailer, behindTheScenes, etc). """
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        super(Extra, self)._loadData(data)
-        parent = self._parent()
-        self.librarySectionID = parent.librarySectionID
-        self.librarySectionKey = parent.librarySectionKey
-        self.librarySectionTitle = parent.librarySectionTitle
-
-    def _prettyfilename(self):
-        """ Returns a filename for use in download. """
-        return f'{self.title} ({self.subtype})'
-
-
-@utils.registerPlexObject
-class MovieSession(PlexSession, Movie):
-    """ Represents a single Movie session
-        loaded from :func:`~plexapi.server.PlexServer.sessions`.
-    """
-    _SESSIONTYPE = True
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        Movie._loadData(self, data)
-        PlexSession._loadData(self, data)
-
-
-@utils.registerPlexObject
-class EpisodeSession(PlexSession, Episode):
-    """ Represents a single Episode session
-        loaded from :func:`~plexapi.server.PlexServer.sessions`.
-    """
-    _SESSIONTYPE = True
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        Episode._loadData(self, data)
-        PlexSession._loadData(self, data)
-
-
-@utils.registerPlexObject
-class ClipSession(PlexSession, Clip):
-    """ Represents a single Clip session
-        loaded from :func:`~plexapi.server.PlexServer.sessions`.
-    """
-    _SESSIONTYPE = True
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        Clip._loadData(self, data)
-        PlexSession._loadData(self, data)
-
-
-@utils.registerPlexObject
-class MovieHistory(PlexHistory, Movie):
-    """ Represents a single Movie history entry
-        loaded from :func:`~plexapi.server.PlexServer.history`.
-    """
-    _HISTORYTYPE = True
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        Movie._loadData(self, data)
-        PlexHistory._loadData(self, data)
-
-
-@utils.registerPlexObject
-class EpisodeHistory(PlexHistory, Episode):
-    """ Represents a single Episode history entry
-        loaded from :func:`~plexapi.server.PlexServer.history`.
-    """
-    _HISTORYTYPE = True
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        Episode._loadData(self, data)
-        PlexHistory._loadData(self, data)
-
-
-@utils.registerPlexObject
-class ClipHistory(PlexHistory, Clip):
-    """ Represents a single Clip history entry
-        loaded from :func:`~plexapi.server.PlexServer.history`.
-    """
-    _HISTORYTYPE = True
-
-    def _loadData(self, data):
-        """ Load attribute values from Plex XML response. """
-        Clip._loadData(self, data)
-        PlexHistory._loadData(self, data)
diff --git a/lib/portend.py b/lib/portend.py
deleted file mode 100644
index a9f6787f..00000000
--- a/lib/portend.py
+++ /dev/null
@@ -1,240 +0,0 @@
-"""
-A simple library for managing the availability of ports.
-"""
-
-import time
-import socket
-import argparse
-import sys
-import itertools
-import contextlib
-import platform
-from collections import abc
-import urllib.parse
-
-from tempora import timing
-
-
-def client_host(server_host):
-    """
-    Return the host on which a client can connect to the given listener.
-
-    >>> client_host('192.168.0.1')
-    '192.168.0.1'
-    >>> client_host('0.0.0.0')
-    '127.0.0.1'
-    >>> client_host('::')
-    '::1'
-    """
-    if server_host == '0.0.0.0':
-        # 0.0.0.0 is INADDR_ANY, which should answer on localhost.
-        return '127.0.0.1'
-    if server_host in ('::', '::0', '::0.0.0.0'):
-        # :: is IN6ADDR_ANY, which should answer on localhost.
-        # ::0 and ::0.0.0.0 are non-canonical but common
-        # ways to write IN6ADDR_ANY.
-        return '::1'
-    return server_host
-
-
-class Checker(object):
-    def __init__(self, timeout=1.0):
-        self.timeout = timeout
-
-    def assert_free(self, host, port=None):
-        """
-        Assert that the given addr is free
-        in that all attempts to connect fail within the timeout
-        or raise a PortNotFree exception.
-
-        >>> free_port = find_available_local_port()
-
-        >>> Checker().assert_free('localhost', free_port)
-        >>> Checker().assert_free('127.0.0.1', free_port)
-        >>> Checker().assert_free('::1', free_port)
-
-        Also accepts an addr tuple
-
-        >>> addr = '::1', free_port, 0, 0
-        >>> Checker().assert_free(addr)
-
-        Host might refer to a server bind address like '::', which
-        should use localhost to perform the check.
-
-        >>> Checker().assert_free('::', free_port)
-        """
-        if port is None and isinstance(host, abc.Sequence):
-            host, port = host[:2]
-        if platform.system() == 'Windows':
-            host = client_host(host)  # pragma: nocover
-        info = socket.getaddrinfo(host, port, socket.AF_UNSPEC, socket.SOCK_STREAM)
-        list(itertools.starmap(self._connect, info))
-
-    def _connect(self, af, socktype, proto, canonname, sa):
-        s = socket.socket(af, socktype, proto)
-        # fail fast with a small timeout
-        s.settimeout(self.timeout)
-
-        with contextlib.closing(s):
-            try:
-                s.connect(sa)
-            except socket.error:
-                return
-
-        # the connect succeeded, so the port isn't free
-        host, port = sa[:2]
-        tmpl = "Port {port} is in use on {host}."
-        raise PortNotFree(tmpl.format(**locals()))
-
-
-class Timeout(IOError):
-    pass
-
-
-class PortNotFree(IOError):
-    pass
-
-
-def free(host, port, timeout=float('Inf')):
-    """
-    Wait for the specified port to become free (dropping or rejecting
-    requests). Return when the port is free or raise a Timeout if timeout has
-    elapsed.
-
-    Timeout may be specified in seconds or as a timedelta.
-    If timeout is None or ∞, the routine will run indefinitely.
-
-    >>> free('localhost', find_available_local_port())
-
-    >>> free(None, None)
-    Traceback (most recent call last):
-    ...
-    ValueError: Host values of '' or None are not allowed.
-    """
-    if not host:
-        raise ValueError("Host values of '' or None are not allowed.")
-
-    timer = timing.Timer(timeout)
-
-    while True:
-        try:
-            # Expect a free port, so use a small timeout
-            Checker(timeout=0.1).assert_free(host, port)
-            return
-        except PortNotFree:
-            if timer.expired():
-                raise Timeout("Port {port} not free on {host}.".format(**locals()))
-            # Politely wait.
-            time.sleep(0.1)
-
-
-def occupied(host, port, timeout=float('Inf')):
-    """
-    Wait for the specified port to become occupied (accepting requests).
-    Return when the port is occupied or raise a Timeout if timeout has
-    elapsed.
-
-    Timeout may be specified in seconds or as a timedelta.
-    If timeout is None or ∞, the routine will run indefinitely.
-
-    >>> occupied('localhost', find_available_local_port(), .1)
-    Traceback (most recent call last):
-    ...
-    Timeout: Port ... not bound on localhost.
-
-    >>> occupied(None, None)
-    Traceback (most recent call last):
-    ...
-    ValueError: Host values of '' or None are not allowed.
-    """
-    if not host:
-        raise ValueError("Host values of '' or None are not allowed.")
-
-    timer = timing.Timer(timeout)
-
-    while True:
-        try:
-            Checker(timeout=0.5).assert_free(host, port)
-            if timer.expired():
-                raise Timeout("Port {port} not bound on {host}.".format(**locals()))
-            # Politely wait
-            time.sleep(0.1)
-        except PortNotFree:
-            # port is occupied
-            return
-
-
-def find_available_local_port():
-    """
-    Find a free port on localhost.
-
-    >>> 0 < find_available_local_port() < 65536
-    True
-    """
-    infos = socket.getaddrinfo(None, 0, socket.AF_UNSPEC, socket.SOCK_STREAM)
-    family, proto, _, _, addr = next(iter(infos))
-    sock = socket.socket(family, proto)
-    sock.bind(addr)
-    addr, port = sock.getsockname()[:2]
-    sock.close()
-    return port
-
-
-class HostPort(str):
-    """
-    A simple representation of a host/port pair as a string
-
-    >>> hp = HostPort('localhost:32768')
-
-    >>> hp.host
-    'localhost'
-
-    >>> hp.port
-    32768
-
-    >>> len(hp)
-    15
-
-    >>> hp = HostPort('[::1]:32768')
-
-    >>> hp.host
-    '::1'
-
-    >>> hp.port
-    32768
-    """
-
-    @property
-    def host(self):
-        return urllib.parse.urlparse(f'//{self}').hostname
-
-    @property
-    def port(self):
-        return urllib.parse.urlparse(f'//{self}').port
-
-    @classmethod
-    def from_addr(cls, addr):
-        listen_host, port = addr[:2]
-        plain_host = client_host(listen_host)
-        host = f'[{plain_host}]' if ':' in plain_host else plain_host
-        return cls(':'.join([host, str(port)]))
-
-
-def _main(args=None):
-    parser = argparse.ArgumentParser()
-
-    def global_lookup(key):
-        return globals()[key]
-
-    parser.add_argument('target', metavar='host:port', type=HostPort)
-    parser.add_argument('func', metavar='state', type=global_lookup)
-    parser.add_argument('-t', '--timeout', default=None, type=float)
-    args = parser.parse_args(args)
-    try:
-        args.func(args.target.host, args.target.port, timeout=args.timeout)
-    except Timeout as timeout:
-        print(timeout, file=sys.stderr)
-        raise SystemExit(1)
-
-
-__name__ == '__main__' and _main()
diff --git a/lib/profilehooks.py b/lib/profilehooks.py
deleted file mode 100644
index 64c34382..00000000
--- a/lib/profilehooks.py
+++ /dev/null
@@ -1,651 +0,0 @@
-"""
-Profiling hooks
-
-This module contains a couple of decorators (`profile` and `coverage`) that
-can be used to wrap functions and/or methods to produce profiles and line
-coverage reports.  There's a third convenient decorator (`timecall`) that
-measures the duration of function execution without the extra profiling
-overhead.
-
-Usage example::
-
-    from profilehooks import profile, coverage
-
-    @profile    # or @coverage
-    def fn(n):
-        if n < 2: return 1
-        else: return n * fn(n-1)
-
-    print(fn(42))
-
-Or without imports, with some hack
-
-    $ python -m profilehooks yourmodule
-
-    @profile    # or @coverage
-    def fn(n):
-        if n < 2: return 1
-        else: return n * fn(n-1)
-
-    print(fn(42))
-
-Reports for all thusly decorated functions will be printed to sys.stdout
-on program termination.  You can alternatively request for immediate
-reports for each call by passing immediate=True to the profile decorator.
-
-There's also a @timecall decorator for printing the time to sys.stderr
-every time a function is called, when you just want to get a rough measure
-instead of a detailed (but costly) profile.
-
-Caveats
-
-  I don't know what will happen if a decorated function will try to call
-  another decorated function.  All decorators probably need to explicitly
-  support nested profiling (currently TraceFuncCoverage is the only one
-  that supports this.)
-
-Copyright (c) 2004--2023 Marius Gedminas <marius@gedmin.as>
-Copyright (c) 2007 Hanno Schlichting
-Copyright (c) 2008 Florian Schulze
-
-Released under the MIT licence since December 2006:
-
-    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.
-
-(Previously it was distributed under the GNU General Public Licence.)
-"""
-import atexit
-import dis
-import functools
-import inspect
-import logging
-import os
-import pstats
-import re
-import sys
-import timeit
-import token
-import tokenize
-import trace
-from profile import Profile
-
-
-# For cProfile profiling (best)
-try:
-    import cProfile
-except ImportError:
-    cProfile = None
-
-
-__author__ = "Marius Gedminas <marius@gedmin.as>"
-__copyright__ = "Copyright 2004-2020 Marius Gedminas and contributors"
-__license__ = "MIT"
-__version__ = '1.13.0'
-__date__ = "2024-10-09"
-
-
-# registry of available profilers
-AVAILABLE_PROFILERS = {}
-
-__all__ = ['coverage', 'profile', 'timecall']
-
-
-def _identify(fn):
-    fn = inspect.unwrap(fn)
-    funcname = fn.__name__
-    filename = fn.__code__.co_filename
-    lineno = fn.__code__.co_firstlineno
-    return (funcname, filename, lineno)
-
-
-def _is_file_like(o):
-    return hasattr(o, 'write')
-
-
-def profile(fn=None, skip=0, filename=None, immediate=False, dirs=False,
-            sort=None, entries=40,
-            profiler=('cProfile', 'profile'),
-            stdout=True):
-    """Mark `fn` for profiling.
-
-    If `skip` is > 0, first `skip` calls to `fn` will not be profiled.
-
-    If `stdout` is not file-like and truthy, output will be printed to
-    sys.stdout. If it is a file-like object, output will be printed to it
-    instead. `stdout` must be writable in text mode (as opposed to binary)
-    if it is file-like.
-
-    If `immediate` is False, profiling results will be printed to
-    self.stdout on program termination.  Otherwise results will be printed
-    after each call.  (If you don't want this, set stdout=False and specify a
-    `filename` to store profile data.)
-
-    If `dirs` is False only the name of the file will be printed.
-    Otherwise the full path is used.
-
-    `sort` can be a list of sort keys (defaulting to ['cumulative',
-    'time', 'calls']).  The following ones are recognized::
-
-        'calls'      -- call count
-        'cumulative' -- cumulative time
-        'file'       -- file name
-        'line'       -- line number
-        'module'     -- file name
-        'name'       -- function name
-        'nfl'        -- name/file/line
-        'pcalls'     -- call count
-        'stdname'    -- standard name
-        'time'       -- internal time
-
-    `entries` limits the output to the first N entries.
-
-    `profiler` can be used to select the preferred profiler, or specify a
-    sequence of them, in order of preference.  The default is ('cProfile'.
-    'profile').
-
-    If `filename` is specified, the profile stats will be stored in the
-    named file.  You can load them with pstats.Stats(filename) or use a
-    visualization tool like RunSnakeRun.
-
-    Usage::
-
-        def fn(...):
-            ...
-        fn = profile(fn, skip=1)
-
-    If you are using Python 2.4, you should be able to use the decorator
-    syntax::
-
-        @profile(skip=3)
-        def fn(...):
-            ...
-
-    or just ::
-
-        @profile
-        def fn(...):
-            ...
-
-    """
-    if fn is None:  # @profile() syntax -- we are a decorator maker
-        def decorator(fn):
-            return profile(fn, skip=skip, filename=filename,
-                           immediate=immediate, dirs=dirs,
-                           sort=sort, entries=entries,
-                           profiler=profiler, stdout=stdout)
-        return decorator
-    # @profile syntax -- we are a decorator.
-    if isinstance(profiler, str):
-        profiler = [profiler]
-    for p in profiler:
-        if p in AVAILABLE_PROFILERS:
-            profiler_class = AVAILABLE_PROFILERS[p]
-            break
-    else:
-        raise ValueError('only these profilers are available: %s'
-                         % ', '.join(sorted(AVAILABLE_PROFILERS)))
-    fp = profiler_class(fn, skip=skip, filename=filename,
-                        immediate=immediate, dirs=dirs,
-                        sort=sort, entries=entries, stdout=stdout)
-    # We cannot return fp or fp.__call__ directly as that would break method
-    # definitions, instead we need to return a plain function.
-
-    @functools.wraps(fn)
-    def new_fn(*args, **kw):
-        return fp(*args, **kw)
-    return new_fn
-
-
-def coverage(fn):
-    """Mark `fn` for line coverage analysis.
-
-    Results will be printed to sys.stdout on program termination.
-
-    Usage::
-
-        def fn(...):
-            ...
-        fn = coverage(fn)
-
-    If you are using Python 2.4, you should be able to use the decorator
-    syntax::
-
-        @coverage
-        def fn(...):
-            ...
-
-    """
-    fp = TraceFuncCoverage(fn)
-    # We cannot return fp or fp.__call__ directly as that would break method
-    # definitions, instead we need to return a plain function.
-
-    @functools.wraps(fn)
-    def new_fn(*args, **kw):
-        return fp(*args, **kw)
-    return new_fn
-
-
-class FuncProfile(object):
-    """Profiler for a function (uses profile)."""
-
-    # This flag is shared between all instances
-    in_profiler = False
-
-    Profile = Profile
-
-    def __init__(self, fn, skip=0, filename=None, immediate=False, dirs=False,
-                 sort=None, entries=40, stdout=True):
-        """Creates a profiler for a function.
-
-        Every profiler has its own log file (the name of which is derived
-        from the function name).
-
-        FuncProfile registers an atexit handler that prints profiling
-        information to sys.stderr when the program terminates.
-        """
-        self.fn = fn
-        self.skip = skip
-        self.filename = filename
-        self._immediate = immediate
-        self.stdout = stdout
-        self._stdout_is_fp = self.stdout and _is_file_like(self.stdout)
-        self.dirs = dirs
-        self.sort = sort or ('cumulative', 'time', 'calls')
-        if isinstance(self.sort, str):
-            self.sort = (self.sort, )
-        self.entries = entries
-        self.reset_stats()
-        if not self.immediate:
-            atexit.register(self.atexit)
-
-    @property
-    def immediate(self):
-        return self._immediate
-
-    def __call__(self, *args, **kw):
-        """Profile a singe call to the function."""
-        self.ncalls += 1
-        if self.skip > 0:
-            self.skip -= 1
-            self.skipped += 1
-            return self.fn(*args, **kw)
-        if FuncProfile.in_profiler:
-            # handle recursive calls
-            return self.fn(*args, **kw)
-        # You cannot reuse the same profiler for many calls and accumulate
-        # stats that way.  :-/
-        profiler = self.Profile()
-        try:
-            FuncProfile.in_profiler = True
-            return profiler.runcall(self.fn, *args, **kw)
-        finally:
-            FuncProfile.in_profiler = False
-            self.stats.add(profiler)
-            if self.immediate:
-                self.print_stats()
-                self.reset_stats()
-
-    def print_stats(self):
-        """Print profile information to sys.stdout."""
-        stats = self.stats
-        if self.filename:
-            stats.dump_stats(self.filename)
-        if self.stdout:
-            funcname, filename, lineno = _identify(self.fn)
-            print_f = print
-            if self._stdout_is_fp:
-                print_f = functools.partial(print, file=self.stdout)
-
-            print_f("")
-            print_f("*** PROFILER RESULTS ***")
-            print_f("%s (%s:%s)" % (funcname, filename, lineno))
-            if self.skipped:
-                skipped = " (%d calls not profiled)" % self.skipped
-            else:
-                skipped = ""
-            print_f("function called %d times%s" % (self.ncalls, skipped))
-            print_f("")
-            if not self.dirs:
-                stats.strip_dirs()
-            stats.sort_stats(*self.sort)
-            stats.print_stats(self.entries)
-
-    def reset_stats(self):
-        """Reset accumulated profiler statistics."""
-        # send stats printing to specified stdout if it's file-like
-        stream = self.stdout if self._stdout_is_fp else sys.stdout
-
-        # Note: not using self.Profile, since pstats.Stats() fails then
-        self.stats = pstats.Stats(Profile(), stream=stream)
-        self.ncalls = 0
-        self.skipped = 0
-
-    def atexit(self):
-        """Stop profiling and print profile information to sys.stdout or self.stdout.
-
-        This function is registered as an atexit hook.
-        """
-        self.print_stats()
-
-
-AVAILABLE_PROFILERS['profile'] = FuncProfile
-
-
-if cProfile is not None:
-
-    class CProfileFuncProfile(FuncProfile):
-        """Profiler for a function (uses cProfile)."""
-
-        Profile = cProfile.Profile
-
-    AVAILABLE_PROFILERS['cProfile'] = CProfileFuncProfile
-
-
-class TraceFuncCoverage:
-    """Coverage analysis for a function (uses trace module)."""
-
-    # Shared between all instances so that nested calls work
-    tracer = trace.Trace(count=True, trace=False,
-                         ignoredirs=[sys.prefix, sys.exec_prefix])
-
-    # This flag is also shared between all instances
-    tracing = False
-
-    def __init__(self, fn):
-        """Creates a profiler for a function.
-
-        Every profiler has its own log file (the name of which is derived
-        from the function name).
-
-        TraceFuncCoverage registers an atexit handler that prints
-        profiling information to sys.stderr when the program terminates.
-
-        The log file is not removed and remains there to clutter the
-        current working directory.
-        """
-        self.fn = fn
-        self.logfilename = "%s.%d.cprof" % (fn.__name__, os.getpid())
-        self.ncalls = 0
-        atexit.register(self.atexit)
-
-    def __call__(self, *args, **kw):
-        """Profile a singe call to the function."""
-        self.ncalls += 1
-        if TraceFuncCoverage.tracing:  # pragma: nocover
-            return self.fn(*args, **kw)
-        old_trace = sys.gettrace()
-        try:
-            TraceFuncCoverage.tracing = True
-            return self.tracer.runfunc(self.fn, *args, **kw)
-        finally:  # pragma: nocover
-            sys.settrace(old_trace)
-            TraceFuncCoverage.tracing = False
-
-    def atexit(self):
-        """Stop profiling and print profile information to sys.stderr.
-
-        This function is registered as an atexit hook.
-        """
-        funcname, filename, lineno = _identify(self.fn)
-        print("")
-        print("*** COVERAGE RESULTS ***")
-        print("%s (%s:%s)" % (funcname, filename, lineno))
-        print("function called %d times" % self.ncalls)
-        print("")
-        fs = FuncSource(self.fn)
-        for (filename, lineno), count in self.tracer.counts.items():
-            if filename != fs.filename:
-                continue
-            fs.mark(lineno, count)
-        print(fs)
-        never_executed = fs.count_never_executed()
-        if never_executed:
-            print("%d lines were not executed." % never_executed)
-
-
-class FuncSource:
-    """Source code annotator for a function."""
-
-    blank_rx = re.compile(r"^\s*finally:\s*(#.*)?$")
-
-    def __init__(self, fn):
-        self.fn = fn
-        self.filename = inspect.getsourcefile(fn)
-        self.sourcelines = {}
-        self.source = []
-        self.firstlineno = self.firstcodelineno = 0
-        try:
-            self.source, self.firstlineno = inspect.getsourcelines(fn)
-            self.firstcodelineno = self.firstlineno
-            self.find_source_lines()
-        except IOError:
-            self.filename = None
-
-    def find_source_lines(self):
-        """Mark all executable source lines in fn as executed 0 times."""
-        if self.filename is None:  # pragma: nocover
-            # I don't know how to make inspect.getsourcefile() return None in
-            # our test suite, but I've looked at its source and I know that it
-            # can do so.
-            return
-        strs = self._find_docstrings(self.filename)
-        lines = {
-            ln
-            for off, ln in dis.findlinestarts(inspect.unwrap(self.fn).__code__)
-            # skipping firstlineno because Python 3.11 adds a 'RESUME' opcode
-            # attributed to the `def` line, but then trace.py never sees it
-            # getting executed
-            if ln is not None and ln not in strs and ln != self.firstlineno
-        }
-        for lineno in lines:
-            self.sourcelines.setdefault(lineno, 0)
-        if lines:
-            self.firstcodelineno = min(lines)
-        else:  # pragma: nocover
-            # This branch cannot be reached, I'm just being paranoid.
-            self.firstcodelineno = self.firstlineno
-
-    def _find_docstrings(self, filename):
-        # A replacement for trace.find_strings() which was deprecated in
-        # Python 3.2 and removed in 3.6.
-        strs = set()
-        prev = token.INDENT  # so module docstring is detected as docstring
-        with tokenize.open(filename) as f:
-            tokens = tokenize.generate_tokens(f.readline)
-            for ttype, tstr, start, end, line in tokens:
-                if ttype == token.STRING and prev == token.INDENT:
-                    strs.update(range(start[0], end[0] + 1))
-                prev = ttype
-        return strs
-
-    def mark(self, lineno, count=1):
-        """Mark a given source line as executed count times.
-
-        Multiple calls to mark for the same lineno add up.
-        """
-        self.sourcelines[lineno] = self.sourcelines.get(lineno, 0) + count
-
-    def count_never_executed(self):
-        """Count statements that were never executed."""
-        lineno = self.firstlineno
-        counter = 0
-        for line in self.source:
-            if self.sourcelines.get(lineno) == 0:
-                if not self.blank_rx.match(line):
-                    counter += 1
-            lineno += 1
-        return counter
-
-    def __str__(self):
-        """Return annotated source code for the function."""
-        if self.filename is None:
-            return "cannot show coverage data since co_filename is None"
-        lines = []
-        lineno = self.firstlineno
-        for line in self.source:
-            counter = self.sourcelines.get(lineno)
-            if counter is None:
-                prefix = ' ' * 7
-            elif counter == 0:
-                if self.blank_rx.match(line):  # pragma: nocover
-                    # This is an workaround for an ancient bug I can't
-                    # reproduce, perhaps because it was fixed, or perhaps
-                    # because I can't remember all the details.
-                    prefix = ' ' * 7
-                else:
-                    prefix = '>' * 6 + ' '
-            else:
-                prefix = '%5d: ' % counter
-            lines.append(prefix + line)
-            lineno += 1
-        return ''.join(lines)
-
-
-def timecall(
-        fn=None, immediate=True, timer=None,
-        log_name=None, log_level=logging.DEBUG,
-):
-    """Wrap `fn` and print its execution time.
-
-    Example::
-
-        @timecall
-        def somefunc(x, y):
-            time.sleep(x * y)
-
-        somefunc(2, 3)
-
-    will print the time taken by somefunc on every call.  If you want just
-    a summary at program termination, use ::
-
-        @timecall(immediate=False)
-
-    You can also choose a timing method other than the default
-    ``timeit.default_timer()``, e.g.::
-
-        @timecall(timer=time.clock)
-
-    You can also log the output to a logger by specifying the name and level
-    of the logger to use, eg:
-
-        @timecall(immediate=True,
-                  log_name='profile_log',
-                  log_level=logging.DEBUG)
-
-    """
-    if fn is None:  # @timecall() syntax -- we are a decorator maker
-        def decorator(fn):
-            return timecall(
-                fn, immediate=immediate, timer=timer,
-                log_name=log_name, log_level=log_level,
-            )
-        return decorator
-    # @timecall syntax -- we are a decorator.
-    if timer is None:
-        timer = timeit.default_timer
-    fp = FuncTimer(
-        fn, immediate=immediate, timer=timer,
-        log_name=log_name, log_level=log_level,
-    )
-    # We cannot return fp or fp.__call__ directly as that would break method
-    # definitions, instead we need to return a plain function.
-
-    @functools.wraps(fn)
-    def new_fn(*args, **kw):
-        return fp(*args, **kw)
-    return new_fn
-
-
-class FuncTimer(object):
-
-    def __init__(
-            self, fn, immediate, timer,
-            log_name=None, log_level=logging.DEBUG,
-    ):
-        self.logger = None
-        if log_name:
-            self.logger = logging.getLogger(log_name)
-        self.log_level = log_level
-        self.fn = fn
-        self.ncalls = 0
-        self.totaltime = 0
-        self.immediate = immediate
-        self.timer = timer
-        if not immediate:
-            atexit.register(self.atexit)
-
-    def __call__(self, *args, **kw):
-        """Profile a singe call to the function."""
-        fn = self.fn
-        timer = self.timer
-        self.ncalls += 1
-        start = timer()
-        try:
-            return fn(*args, **kw)
-        finally:
-            duration = timer() - start
-            self.totaltime += duration
-            if self.immediate:
-                funcname, filename, lineno = _identify(fn)
-                message = "%s (%s:%s):\n    %.3f seconds\n\n" % (
-                    funcname, filename, lineno, duration,
-                )
-                if self.logger:
-                    self.logger.log(self.log_level, message)
-                else:
-                    sys.stderr.write("\n  " + message)
-                    sys.stderr.flush()
-
-    def atexit(self):
-        if not self.ncalls:
-            return
-        funcname, filename, lineno = _identify(self.fn)
-        message = "\n  %s (%s:%s):\n"\
-            "    %d calls, %.3f seconds (%.3f seconds per call)\n" % (
-                funcname, filename, lineno, self.ncalls,
-                self.totaltime, self.totaltime / self.ncalls)
-        if self.logger:
-            self.logger.log(self.log_level, message)
-        else:
-            print(message)
-
-
-if __name__ == '__main__':
-
-    local = dict((name, globals()[name]) for name in __all__)
-    message = """********
-Injected `profilehooks`
---------
-{}
-********
-""".format("\n".join(local.keys()))
-
-    def interact_():
-        from code import interact
-        interact(message, local=local)
-
-    def run_():
-        from runpy import run_module
-        print(message)
-        run_module(sys.argv[1], init_globals=local)
-
-    if len(sys.argv) == 1:
-        interact_()
-    else:
-        run_()
diff --git a/lib/pydantic/__init__.py b/lib/pydantic/__init__.py
deleted file mode 100644
index 85a8c18b..00000000
--- a/lib/pydantic/__init__.py
+++ /dev/null
@@ -1,388 +0,0 @@
-import typing
-
-from ._migration import getattr_migration
-from .version import VERSION
-
-if typing.TYPE_CHECKING:
-    # import of virtually everything is supported via `__getattr__` below,
-    # but we need them here for type checking and IDE support
-    import pydantic_core
-    from pydantic_core.core_schema import (
-        FieldSerializationInfo,
-        SerializationInfo,
-        SerializerFunctionWrapHandler,
-        ValidationInfo,
-        ValidatorFunctionWrapHandler,
-    )
-
-    from . import dataclasses
-    from ._internal._generate_schema import GenerateSchema as GenerateSchema
-    from .aliases import AliasChoices, AliasGenerator, AliasPath
-    from .annotated_handlers import GetCoreSchemaHandler, GetJsonSchemaHandler
-    from .config import ConfigDict
-    from .errors import *
-    from .fields import Field, PrivateAttr, computed_field
-    from .functional_serializers import (
-        PlainSerializer,
-        SerializeAsAny,
-        WrapSerializer,
-        field_serializer,
-        model_serializer,
-    )
-    from .functional_validators import (
-        AfterValidator,
-        BeforeValidator,
-        InstanceOf,
-        PlainValidator,
-        SkipValidation,
-        WrapValidator,
-        field_validator,
-        model_validator,
-    )
-    from .json_schema import WithJsonSchema
-    from .main import *
-    from .networks import *
-    from .type_adapter import TypeAdapter
-    from .types import *
-    from .validate_call_decorator import validate_call
-    from .warnings import PydanticDeprecatedSince20, PydanticDeprecatedSince26, PydanticDeprecationWarning
-
-    # this encourages pycharm to import `ValidationError` from here, not pydantic_core
-    ValidationError = pydantic_core.ValidationError
-    from .deprecated.class_validators import root_validator, validator
-    from .deprecated.config import BaseConfig, Extra
-    from .deprecated.tools import *
-    from .root_model import RootModel
-
-__version__ = VERSION
-__all__ = (
-    # dataclasses
-    'dataclasses',
-    # functional validators
-    'field_validator',
-    'model_validator',
-    'AfterValidator',
-    'BeforeValidator',
-    'PlainValidator',
-    'WrapValidator',
-    'SkipValidation',
-    'InstanceOf',
-    # JSON Schema
-    'WithJsonSchema',
-    # deprecated V1 functional validators, these are imported via `__getattr__` below
-    'root_validator',
-    'validator',
-    # functional serializers
-    'field_serializer',
-    'model_serializer',
-    'PlainSerializer',
-    'SerializeAsAny',
-    'WrapSerializer',
-    # config
-    'ConfigDict',
-    # deprecated V1 config, these are imported via `__getattr__` below
-    'BaseConfig',
-    'Extra',
-    # validate_call
-    'validate_call',
-    # errors
-    'PydanticErrorCodes',
-    'PydanticUserError',
-    'PydanticSchemaGenerationError',
-    'PydanticImportError',
-    'PydanticUndefinedAnnotation',
-    'PydanticInvalidForJsonSchema',
-    # fields
-    'Field',
-    'computed_field',
-    'PrivateAttr',
-    # alias
-    'AliasChoices',
-    'AliasGenerator',
-    'AliasPath',
-    # main
-    'BaseModel',
-    'create_model',
-    # network
-    'AnyUrl',
-    'AnyHttpUrl',
-    'FileUrl',
-    'HttpUrl',
-    'UrlConstraints',
-    'EmailStr',
-    'NameEmail',
-    'IPvAnyAddress',
-    'IPvAnyInterface',
-    'IPvAnyNetwork',
-    'PostgresDsn',
-    'CockroachDsn',
-    'AmqpDsn',
-    'RedisDsn',
-    'MongoDsn',
-    'KafkaDsn',
-    'NatsDsn',
-    'MySQLDsn',
-    'MariaDBDsn',
-    'validate_email',
-    # root_model
-    'RootModel',
-    # deprecated tools, these are imported via `__getattr__` below
-    'parse_obj_as',
-    'schema_of',
-    'schema_json_of',
-    # types
-    'Strict',
-    'StrictStr',
-    'conbytes',
-    'conlist',
-    'conset',
-    'confrozenset',
-    'constr',
-    'StringConstraints',
-    'ImportString',
-    'conint',
-    'PositiveInt',
-    'NegativeInt',
-    'NonNegativeInt',
-    'NonPositiveInt',
-    'confloat',
-    'PositiveFloat',
-    'NegativeFloat',
-    'NonNegativeFloat',
-    'NonPositiveFloat',
-    'FiniteFloat',
-    'condecimal',
-    'condate',
-    'UUID1',
-    'UUID3',
-    'UUID4',
-    'UUID5',
-    'FilePath',
-    'DirectoryPath',
-    'NewPath',
-    'Json',
-    'SecretStr',
-    'SecretBytes',
-    'StrictBool',
-    'StrictBytes',
-    'StrictInt',
-    'StrictFloat',
-    'PaymentCardNumber',
-    'ByteSize',
-    'PastDate',
-    'FutureDate',
-    'PastDatetime',
-    'FutureDatetime',
-    'AwareDatetime',
-    'NaiveDatetime',
-    'AllowInfNan',
-    'EncoderProtocol',
-    'EncodedBytes',
-    'EncodedStr',
-    'Base64Encoder',
-    'Base64Bytes',
-    'Base64Str',
-    'Base64UrlBytes',
-    'Base64UrlStr',
-    'GetPydanticSchema',
-    'Tag',
-    'Discriminator',
-    'JsonValue',
-    # type_adapter
-    'TypeAdapter',
-    # version
-    '__version__',
-    'VERSION',
-    # warnings
-    'PydanticDeprecatedSince20',
-    'PydanticDeprecatedSince26',
-    'PydanticDeprecationWarning',
-    # annotated handlers
-    'GetCoreSchemaHandler',
-    'GetJsonSchemaHandler',
-    # generate schema from ._internal
-    'GenerateSchema',
-    # pydantic_core
-    'ValidationError',
-    'ValidationInfo',
-    'SerializationInfo',
-    'ValidatorFunctionWrapHandler',
-    'FieldSerializationInfo',
-    'SerializerFunctionWrapHandler',
-    'OnErrorOmit',
-)
-
-# A mapping of {<member name>: (package, <module name>)} defining dynamic imports
-_dynamic_imports: 'dict[str, tuple[str, str]]' = {
-    'dataclasses': (__package__, '__module__'),
-    # functional validators
-    'field_validator': (__package__, '.functional_validators'),
-    'model_validator': (__package__, '.functional_validators'),
-    'AfterValidator': (__package__, '.functional_validators'),
-    'BeforeValidator': (__package__, '.functional_validators'),
-    'PlainValidator': (__package__, '.functional_validators'),
-    'WrapValidator': (__package__, '.functional_validators'),
-    'SkipValidation': (__package__, '.functional_validators'),
-    'InstanceOf': (__package__, '.functional_validators'),
-    # JSON Schema
-    'WithJsonSchema': (__package__, '.json_schema'),
-    # functional serializers
-    'field_serializer': (__package__, '.functional_serializers'),
-    'model_serializer': (__package__, '.functional_serializers'),
-    'PlainSerializer': (__package__, '.functional_serializers'),
-    'SerializeAsAny': (__package__, '.functional_serializers'),
-    'WrapSerializer': (__package__, '.functional_serializers'),
-    # config
-    'ConfigDict': (__package__, '.config'),
-    # validate call
-    'validate_call': (__package__, '.validate_call_decorator'),
-    # errors
-    'PydanticErrorCodes': (__package__, '.errors'),
-    'PydanticUserError': (__package__, '.errors'),
-    'PydanticSchemaGenerationError': (__package__, '.errors'),
-    'PydanticImportError': (__package__, '.errors'),
-    'PydanticUndefinedAnnotation': (__package__, '.errors'),
-    'PydanticInvalidForJsonSchema': (__package__, '.errors'),
-    # fields
-    'Field': (__package__, '.fields'),
-    'computed_field': (__package__, '.fields'),
-    'PrivateAttr': (__package__, '.fields'),
-    # alias
-    'AliasChoices': (__package__, '.aliases'),
-    'AliasGenerator': (__package__, '.aliases'),
-    'AliasPath': (__package__, '.aliases'),
-    # main
-    'BaseModel': (__package__, '.main'),
-    'create_model': (__package__, '.main'),
-    # network
-    'AnyUrl': (__package__, '.networks'),
-    'AnyHttpUrl': (__package__, '.networks'),
-    'FileUrl': (__package__, '.networks'),
-    'HttpUrl': (__package__, '.networks'),
-    'UrlConstraints': (__package__, '.networks'),
-    'EmailStr': (__package__, '.networks'),
-    'NameEmail': (__package__, '.networks'),
-    'IPvAnyAddress': (__package__, '.networks'),
-    'IPvAnyInterface': (__package__, '.networks'),
-    'IPvAnyNetwork': (__package__, '.networks'),
-    'PostgresDsn': (__package__, '.networks'),
-    'CockroachDsn': (__package__, '.networks'),
-    'AmqpDsn': (__package__, '.networks'),
-    'RedisDsn': (__package__, '.networks'),
-    'MongoDsn': (__package__, '.networks'),
-    'KafkaDsn': (__package__, '.networks'),
-    'NatsDsn': (__package__, '.networks'),
-    'MySQLDsn': (__package__, '.networks'),
-    'MariaDBDsn': (__package__, '.networks'),
-    'validate_email': (__package__, '.networks'),
-    # root_model
-    'RootModel': (__package__, '.root_model'),
-    # types
-    'Strict': (__package__, '.types'),
-    'StrictStr': (__package__, '.types'),
-    'conbytes': (__package__, '.types'),
-    'conlist': (__package__, '.types'),
-    'conset': (__package__, '.types'),
-    'confrozenset': (__package__, '.types'),
-    'constr': (__package__, '.types'),
-    'StringConstraints': (__package__, '.types'),
-    'ImportString': (__package__, '.types'),
-    'conint': (__package__, '.types'),
-    'PositiveInt': (__package__, '.types'),
-    'NegativeInt': (__package__, '.types'),
-    'NonNegativeInt': (__package__, '.types'),
-    'NonPositiveInt': (__package__, '.types'),
-    'confloat': (__package__, '.types'),
-    'PositiveFloat': (__package__, '.types'),
-    'NegativeFloat': (__package__, '.types'),
-    'NonNegativeFloat': (__package__, '.types'),
-    'NonPositiveFloat': (__package__, '.types'),
-    'FiniteFloat': (__package__, '.types'),
-    'condecimal': (__package__, '.types'),
-    'condate': (__package__, '.types'),
-    'UUID1': (__package__, '.types'),
-    'UUID3': (__package__, '.types'),
-    'UUID4': (__package__, '.types'),
-    'UUID5': (__package__, '.types'),
-    'FilePath': (__package__, '.types'),
-    'DirectoryPath': (__package__, '.types'),
-    'NewPath': (__package__, '.types'),
-    'Json': (__package__, '.types'),
-    'SecretStr': (__package__, '.types'),
-    'SecretBytes': (__package__, '.types'),
-    'StrictBool': (__package__, '.types'),
-    'StrictBytes': (__package__, '.types'),
-    'StrictInt': (__package__, '.types'),
-    'StrictFloat': (__package__, '.types'),
-    'PaymentCardNumber': (__package__, '.types'),
-    'ByteSize': (__package__, '.types'),
-    'PastDate': (__package__, '.types'),
-    'FutureDate': (__package__, '.types'),
-    'PastDatetime': (__package__, '.types'),
-    'FutureDatetime': (__package__, '.types'),
-    'AwareDatetime': (__package__, '.types'),
-    'NaiveDatetime': (__package__, '.types'),
-    'AllowInfNan': (__package__, '.types'),
-    'EncoderProtocol': (__package__, '.types'),
-    'EncodedBytes': (__package__, '.types'),
-    'EncodedStr': (__package__, '.types'),
-    'Base64Encoder': (__package__, '.types'),
-    'Base64Bytes': (__package__, '.types'),
-    'Base64Str': (__package__, '.types'),
-    'Base64UrlBytes': (__package__, '.types'),
-    'Base64UrlStr': (__package__, '.types'),
-    'GetPydanticSchema': (__package__, '.types'),
-    'Tag': (__package__, '.types'),
-    'Discriminator': (__package__, '.types'),
-    'JsonValue': (__package__, '.types'),
-    'OnErrorOmit': (__package__, '.types'),
-    # type_adapter
-    'TypeAdapter': (__package__, '.type_adapter'),
-    # warnings
-    'PydanticDeprecatedSince20': (__package__, '.warnings'),
-    'PydanticDeprecatedSince26': (__package__, '.warnings'),
-    'PydanticDeprecationWarning': (__package__, '.warnings'),
-    # annotated handlers
-    'GetCoreSchemaHandler': (__package__, '.annotated_handlers'),
-    'GetJsonSchemaHandler': (__package__, '.annotated_handlers'),
-    # generate schema from ._internal
-    'GenerateSchema': (__package__, '._internal._generate_schema'),
-    # pydantic_core stuff
-    'ValidationError': ('pydantic_core', '.'),
-    'ValidationInfo': ('pydantic_core', '.core_schema'),
-    'SerializationInfo': ('pydantic_core', '.core_schema'),
-    'ValidatorFunctionWrapHandler': ('pydantic_core', '.core_schema'),
-    'FieldSerializationInfo': ('pydantic_core', '.core_schema'),
-    'SerializerFunctionWrapHandler': ('pydantic_core', '.core_schema'),
-    # deprecated, mostly not included in __all__
-    'root_validator': (__package__, '.deprecated.class_validators'),
-    'validator': (__package__, '.deprecated.class_validators'),
-    'BaseConfig': (__package__, '.deprecated.config'),
-    'Extra': (__package__, '.deprecated.config'),
-    'parse_obj_as': (__package__, '.deprecated.tools'),
-    'schema_of': (__package__, '.deprecated.tools'),
-    'schema_json_of': (__package__, '.deprecated.tools'),
-    'FieldValidationInfo': ('pydantic_core', '.core_schema'),
-}
-
-_getattr_migration = getattr_migration(__name__)
-
-
-def __getattr__(attr_name: str) -> object:
-    dynamic_attr = _dynamic_imports.get(attr_name)
-    if dynamic_attr is None:
-        return _getattr_migration(attr_name)
-
-    package, module_name = dynamic_attr
-
-    from importlib import import_module
-
-    if module_name == '__module__':
-        return import_module(f'.{attr_name}', package=package)
-    else:
-        module = import_module(module_name, package=package)
-        return getattr(module, attr_name)
-
-
-def __dir__() -> 'list[str]':
-    return list(__all__)
diff --git a/lib/pydantic/_internal/__init__.py b/lib/pydantic/_internal/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/pydantic/_internal/_config.py b/lib/pydantic/_internal/_config.py
deleted file mode 100644
index 52c4cc42..00000000
--- a/lib/pydantic/_internal/_config.py
+++ /dev/null
@@ -1,322 +0,0 @@
-from __future__ import annotations as _annotations
-
-import warnings
-from contextlib import contextmanager
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Callable,
-    cast,
-)
-
-from pydantic_core import core_schema
-from typing_extensions import (
-    Literal,
-    Self,
-)
-
-from ..aliases import AliasGenerator
-from ..config import ConfigDict, ExtraValues, JsonDict, JsonEncoder, JsonSchemaExtraCallable
-from ..errors import PydanticUserError
-from ..warnings import PydanticDeprecatedSince20
-
-if not TYPE_CHECKING:
-    # See PyCharm issues https://youtrack.jetbrains.com/issue/PY-21915
-    # and https://youtrack.jetbrains.com/issue/PY-51428
-    DeprecationWarning = PydanticDeprecatedSince20
-
-if TYPE_CHECKING:
-    from .._internal._schema_generation_shared import GenerateSchema
-
-DEPRECATION_MESSAGE = 'Support for class-based `config` is deprecated, use ConfigDict instead.'
-
-
-class ConfigWrapper:
-    """Internal wrapper for Config which exposes ConfigDict items as attributes."""
-
-    __slots__ = ('config_dict',)
-
-    config_dict: ConfigDict
-
-    # all annotations are copied directly from ConfigDict, and should be kept up to date, a test will fail if they
-    # stop matching
-    title: str | None
-    str_to_lower: bool
-    str_to_upper: bool
-    str_strip_whitespace: bool
-    str_min_length: int
-    str_max_length: int | None
-    extra: ExtraValues | None
-    frozen: bool
-    populate_by_name: bool
-    use_enum_values: bool
-    validate_assignment: bool
-    arbitrary_types_allowed: bool
-    from_attributes: bool
-    # whether to use the actual key provided in the data (e.g. alias or first alias for "field required" errors) instead of field_names
-    # to construct error `loc`s, default `True`
-    loc_by_alias: bool
-    alias_generator: Callable[[str], str] | AliasGenerator | None
-    ignored_types: tuple[type, ...]
-    allow_inf_nan: bool
-    json_schema_extra: JsonDict | JsonSchemaExtraCallable | None
-    json_encoders: dict[type[object], JsonEncoder] | None
-
-    # new in V2
-    strict: bool
-    # whether instances of models and dataclasses (including subclass instances) should re-validate, default 'never'
-    revalidate_instances: Literal['always', 'never', 'subclass-instances']
-    ser_json_timedelta: Literal['iso8601', 'float']
-    ser_json_bytes: Literal['utf8', 'base64']
-    ser_json_inf_nan: Literal['null', 'constants']
-    # whether to validate default values during validation, default False
-    validate_default: bool
-    validate_return: bool
-    protected_namespaces: tuple[str, ...]
-    hide_input_in_errors: bool
-    defer_build: bool
-    plugin_settings: dict[str, object] | None
-    schema_generator: type[GenerateSchema] | None
-    json_schema_serialization_defaults_required: bool
-    json_schema_mode_override: Literal['validation', 'serialization', None]
-    coerce_numbers_to_str: bool
-    regex_engine: Literal['rust-regex', 'python-re']
-    validation_error_cause: bool
-
-    def __init__(self, config: ConfigDict | dict[str, Any] | type[Any] | None, *, check: bool = True):
-        if check:
-            self.config_dict = prepare_config(config)
-        else:
-            self.config_dict = cast(ConfigDict, config)
-
-    @classmethod
-    def for_model(cls, bases: tuple[type[Any], ...], namespace: dict[str, Any], kwargs: dict[str, Any]) -> Self:
-        """Build a new `ConfigWrapper` instance for a `BaseModel`.
-
-        The config wrapper built based on (in descending order of priority):
-        - options from `kwargs`
-        - options from the `namespace`
-        - options from the base classes (`bases`)
-
-        Args:
-            bases: A tuple of base classes.
-            namespace: The namespace of the class being created.
-            kwargs: The kwargs passed to the class being created.
-
-        Returns:
-            A `ConfigWrapper` instance for `BaseModel`.
-        """
-        config_new = ConfigDict()
-        for base in bases:
-            config = getattr(base, 'model_config', None)
-            if config:
-                config_new.update(config.copy())
-
-        config_class_from_namespace = namespace.get('Config')
-        config_dict_from_namespace = namespace.get('model_config')
-
-        if config_class_from_namespace and config_dict_from_namespace:
-            raise PydanticUserError('"Config" and "model_config" cannot be used together', code='config-both')
-
-        config_from_namespace = config_dict_from_namespace or prepare_config(config_class_from_namespace)
-
-        config_new.update(config_from_namespace)
-
-        for k in list(kwargs.keys()):
-            if k in config_keys:
-                config_new[k] = kwargs.pop(k)
-
-        return cls(config_new)
-
-    # we don't show `__getattr__` to type checkers so missing attributes cause errors
-    if not TYPE_CHECKING:  # pragma: no branch
-
-        def __getattr__(self, name: str) -> Any:
-            try:
-                return self.config_dict[name]
-            except KeyError:
-                try:
-                    return config_defaults[name]
-                except KeyError:
-                    raise AttributeError(f'Config has no attribute {name!r}') from None
-
-    def core_config(self, obj: Any) -> core_schema.CoreConfig:
-        """Create a pydantic-core config, `obj` is just used to populate `title` if not set in config.
-
-        Pass `obj=None` if you do not want to attempt to infer the `title`.
-
-        We don't use getattr here since we don't want to populate with defaults.
-
-        Args:
-            obj: An object used to populate `title` if not set in config.
-
-        Returns:
-            A `CoreConfig` object created from config.
-        """
-
-        def dict_not_none(**kwargs: Any) -> Any:
-            return {k: v for k, v in kwargs.items() if v is not None}
-
-        core_config = core_schema.CoreConfig(
-            **dict_not_none(
-                title=self.config_dict.get('title') or (obj and obj.__name__),
-                extra_fields_behavior=self.config_dict.get('extra'),
-                allow_inf_nan=self.config_dict.get('allow_inf_nan'),
-                populate_by_name=self.config_dict.get('populate_by_name'),
-                str_strip_whitespace=self.config_dict.get('str_strip_whitespace'),
-                str_to_lower=self.config_dict.get('str_to_lower'),
-                str_to_upper=self.config_dict.get('str_to_upper'),
-                strict=self.config_dict.get('strict'),
-                ser_json_timedelta=self.config_dict.get('ser_json_timedelta'),
-                ser_json_bytes=self.config_dict.get('ser_json_bytes'),
-                ser_json_inf_nan=self.config_dict.get('ser_json_inf_nan'),
-                from_attributes=self.config_dict.get('from_attributes'),
-                loc_by_alias=self.config_dict.get('loc_by_alias'),
-                revalidate_instances=self.config_dict.get('revalidate_instances'),
-                validate_default=self.config_dict.get('validate_default'),
-                str_max_length=self.config_dict.get('str_max_length'),
-                str_min_length=self.config_dict.get('str_min_length'),
-                hide_input_in_errors=self.config_dict.get('hide_input_in_errors'),
-                coerce_numbers_to_str=self.config_dict.get('coerce_numbers_to_str'),
-                regex_engine=self.config_dict.get('regex_engine'),
-                validation_error_cause=self.config_dict.get('validation_error_cause'),
-            )
-        )
-        return core_config
-
-    def __repr__(self):
-        c = ', '.join(f'{k}={v!r}' for k, v in self.config_dict.items())
-        return f'ConfigWrapper({c})'
-
-
-class ConfigWrapperStack:
-    """A stack of `ConfigWrapper` instances."""
-
-    def __init__(self, config_wrapper: ConfigWrapper):
-        self._config_wrapper_stack: list[ConfigWrapper] = [config_wrapper]
-
-    @property
-    def tail(self) -> ConfigWrapper:
-        return self._config_wrapper_stack[-1]
-
-    @contextmanager
-    def push(self, config_wrapper: ConfigWrapper | ConfigDict | None):
-        if config_wrapper is None:
-            yield
-            return
-
-        if not isinstance(config_wrapper, ConfigWrapper):
-            config_wrapper = ConfigWrapper(config_wrapper, check=False)
-
-        self._config_wrapper_stack.append(config_wrapper)
-        try:
-            yield
-        finally:
-            self._config_wrapper_stack.pop()
-
-
-config_defaults = ConfigDict(
-    title=None,
-    str_to_lower=False,
-    str_to_upper=False,
-    str_strip_whitespace=False,
-    str_min_length=0,
-    str_max_length=None,
-    # let the model / dataclass decide how to handle it
-    extra=None,
-    frozen=False,
-    populate_by_name=False,
-    use_enum_values=False,
-    validate_assignment=False,
-    arbitrary_types_allowed=False,
-    from_attributes=False,
-    loc_by_alias=True,
-    alias_generator=None,
-    ignored_types=(),
-    allow_inf_nan=True,
-    json_schema_extra=None,
-    strict=False,
-    revalidate_instances='never',
-    ser_json_timedelta='iso8601',
-    ser_json_bytes='utf8',
-    ser_json_inf_nan='null',
-    validate_default=False,
-    validate_return=False,
-    protected_namespaces=('model_',),
-    hide_input_in_errors=False,
-    json_encoders=None,
-    defer_build=False,
-    plugin_settings=None,
-    schema_generator=None,
-    json_schema_serialization_defaults_required=False,
-    json_schema_mode_override=None,
-    coerce_numbers_to_str=False,
-    regex_engine='rust-regex',
-    validation_error_cause=False,
-)
-
-
-def prepare_config(config: ConfigDict | dict[str, Any] | type[Any] | None) -> ConfigDict:
-    """Create a `ConfigDict` instance from an existing dict, a class (e.g. old class-based config) or None.
-
-    Args:
-        config: The input config.
-
-    Returns:
-        A ConfigDict object created from config.
-    """
-    if config is None:
-        return ConfigDict()
-
-    if not isinstance(config, dict):
-        warnings.warn(DEPRECATION_MESSAGE, DeprecationWarning)
-        config = {k: getattr(config, k) for k in dir(config) if not k.startswith('__')}
-
-    config_dict = cast(ConfigDict, config)
-    check_deprecated(config_dict)
-    return config_dict
-
-
-config_keys = set(ConfigDict.__annotations__.keys())
-
-
-V2_REMOVED_KEYS = {
-    'allow_mutation',
-    'error_msg_templates',
-    'fields',
-    'getter_dict',
-    'smart_union',
-    'underscore_attrs_are_private',
-    'json_loads',
-    'json_dumps',
-    'copy_on_model_validation',
-    'post_init_call',
-}
-V2_RENAMED_KEYS = {
-    'allow_population_by_field_name': 'populate_by_name',
-    'anystr_lower': 'str_to_lower',
-    'anystr_strip_whitespace': 'str_strip_whitespace',
-    'anystr_upper': 'str_to_upper',
-    'keep_untouched': 'ignored_types',
-    'max_anystr_length': 'str_max_length',
-    'min_anystr_length': 'str_min_length',
-    'orm_mode': 'from_attributes',
-    'schema_extra': 'json_schema_extra',
-    'validate_all': 'validate_default',
-}
-
-
-def check_deprecated(config_dict: ConfigDict) -> None:
-    """Check for deprecated config keys and warn the user.
-
-    Args:
-        config_dict: The input config.
-    """
-    deprecated_removed_keys = V2_REMOVED_KEYS & config_dict.keys()
-    deprecated_renamed_keys = V2_RENAMED_KEYS.keys() & config_dict.keys()
-    if deprecated_removed_keys or deprecated_renamed_keys:
-        renamings = {k: V2_RENAMED_KEYS[k] for k in sorted(deprecated_renamed_keys)}
-        renamed_bullets = [f'* {k!r} has been renamed to {v!r}' for k, v in renamings.items()]
-        removed_bullets = [f'* {k!r} has been removed' for k in sorted(deprecated_removed_keys)]
-        message = '\n'.join(['Valid config keys have changed in V2:'] + renamed_bullets + removed_bullets)
-        warnings.warn(message, UserWarning)
diff --git a/lib/pydantic/_internal/_core_metadata.py b/lib/pydantic/_internal/_core_metadata.py
deleted file mode 100644
index 296d49f5..00000000
--- a/lib/pydantic/_internal/_core_metadata.py
+++ /dev/null
@@ -1,92 +0,0 @@
-from __future__ import annotations as _annotations
-
-import typing
-from typing import Any
-
-import typing_extensions
-
-if typing.TYPE_CHECKING:
-    from ._schema_generation_shared import (
-        CoreSchemaOrField as CoreSchemaOrField,
-    )
-    from ._schema_generation_shared import (
-        GetJsonSchemaFunction,
-    )
-
-
-class CoreMetadata(typing_extensions.TypedDict, total=False):
-    """A `TypedDict` for holding the metadata dict of the schema.
-
-    Attributes:
-        pydantic_js_functions: List of JSON schema functions.
-        pydantic_js_prefer_positional_arguments: Whether JSON schema generator will
-            prefer positional over keyword arguments for an 'arguments' schema.
-    """
-
-    pydantic_js_functions: list[GetJsonSchemaFunction]
-    pydantic_js_annotation_functions: list[GetJsonSchemaFunction]
-
-    # If `pydantic_js_prefer_positional_arguments` is True, the JSON schema generator will
-    # prefer positional over keyword arguments for an 'arguments' schema.
-    pydantic_js_prefer_positional_arguments: bool | None
-
-    pydantic_typed_dict_cls: type[Any] | None  # TODO: Consider moving this into the pydantic-core TypedDictSchema
-
-
-class CoreMetadataHandler:
-    """Because the metadata field in pydantic_core is of type `Any`, we can't assume much about its contents.
-
-    This class is used to interact with the metadata field on a CoreSchema object in a consistent
-    way throughout pydantic.
-    """
-
-    __slots__ = ('_schema',)
-
-    def __init__(self, schema: CoreSchemaOrField):
-        self._schema = schema
-
-        metadata = schema.get('metadata')
-        if metadata is None:
-            schema['metadata'] = CoreMetadata()
-        elif not isinstance(metadata, dict):
-            raise TypeError(f'CoreSchema metadata should be a dict; got {metadata!r}.')
-
-    @property
-    def metadata(self) -> CoreMetadata:
-        """Retrieves the metadata dict from the schema, initializing it to a dict if it is None
-        and raises an error if it is not a dict.
-        """
-        metadata = self._schema.get('metadata')
-        if metadata is None:
-            self._schema['metadata'] = metadata = CoreMetadata()
-        if not isinstance(metadata, dict):
-            raise TypeError(f'CoreSchema metadata should be a dict; got {metadata!r}.')
-        return metadata
-
-
-def build_metadata_dict(
-    *,  # force keyword arguments to make it easier to modify this signature in a backwards-compatible way
-    js_functions: list[GetJsonSchemaFunction] | None = None,
-    js_annotation_functions: list[GetJsonSchemaFunction] | None = None,
-    js_prefer_positional_arguments: bool | None = None,
-    typed_dict_cls: type[Any] | None = None,
-    initial_metadata: Any | None = None,
-) -> Any:
-    """Builds a dict to use as the metadata field of a CoreSchema object in a manner that is consistent
-    with the CoreMetadataHandler class.
-    """
-    if initial_metadata is not None and not isinstance(initial_metadata, dict):
-        raise TypeError(f'CoreSchema metadata should be a dict; got {initial_metadata!r}.')
-
-    metadata = CoreMetadata(
-        pydantic_js_functions=js_functions or [],
-        pydantic_js_annotation_functions=js_annotation_functions or [],
-        pydantic_js_prefer_positional_arguments=js_prefer_positional_arguments,
-        pydantic_typed_dict_cls=typed_dict_cls,
-    )
-    metadata = {k: v for k, v in metadata.items() if v is not None}
-
-    if initial_metadata is not None:
-        metadata = {**initial_metadata, **metadata}
-
-    return metadata
diff --git a/lib/pydantic/_internal/_core_utils.py b/lib/pydantic/_internal/_core_utils.py
deleted file mode 100644
index e74c74ac..00000000
--- a/lib/pydantic/_internal/_core_utils.py
+++ /dev/null
@@ -1,570 +0,0 @@
-from __future__ import annotations
-
-import os
-from collections import defaultdict
-from typing import (
-    Any,
-    Callable,
-    Hashable,
-    TypeVar,
-    Union,
-)
-
-from pydantic_core import CoreSchema, core_schema
-from pydantic_core import validate_core_schema as _validate_core_schema
-from typing_extensions import TypeAliasType, TypeGuard, get_args, get_origin
-
-from . import _repr
-from ._typing_extra import is_generic_alias
-
-AnyFunctionSchema = Union[
-    core_schema.AfterValidatorFunctionSchema,
-    core_schema.BeforeValidatorFunctionSchema,
-    core_schema.WrapValidatorFunctionSchema,
-    core_schema.PlainValidatorFunctionSchema,
-]
-
-
-FunctionSchemaWithInnerSchema = Union[
-    core_schema.AfterValidatorFunctionSchema,
-    core_schema.BeforeValidatorFunctionSchema,
-    core_schema.WrapValidatorFunctionSchema,
-]
-
-CoreSchemaField = Union[
-    core_schema.ModelField, core_schema.DataclassField, core_schema.TypedDictField, core_schema.ComputedField
-]
-CoreSchemaOrField = Union[core_schema.CoreSchema, CoreSchemaField]
-
-_CORE_SCHEMA_FIELD_TYPES = {'typed-dict-field', 'dataclass-field', 'model-field', 'computed-field'}
-_FUNCTION_WITH_INNER_SCHEMA_TYPES = {'function-before', 'function-after', 'function-wrap'}
-_LIST_LIKE_SCHEMA_WITH_ITEMS_TYPES = {'list', 'set', 'frozenset'}
-
-_DEFINITIONS_CACHE_METADATA_KEY = 'pydantic.definitions_cache'
-
-TAGGED_UNION_TAG_KEY = 'pydantic.internal.tagged_union_tag'
-"""
-Used in a `Tag` schema to specify the tag used for a discriminated union.
-"""
-HAS_INVALID_SCHEMAS_METADATA_KEY = 'pydantic.internal.invalid'
-"""Used to mark a schema that is invalid because it refers to a definition that was not yet defined when the
-schema was first encountered.
-"""
-
-
-def is_core_schema(
-    schema: CoreSchemaOrField,
-) -> TypeGuard[CoreSchema]:
-    return schema['type'] not in _CORE_SCHEMA_FIELD_TYPES
-
-
-def is_core_schema_field(
-    schema: CoreSchemaOrField,
-) -> TypeGuard[CoreSchemaField]:
-    return schema['type'] in _CORE_SCHEMA_FIELD_TYPES
-
-
-def is_function_with_inner_schema(
-    schema: CoreSchemaOrField,
-) -> TypeGuard[FunctionSchemaWithInnerSchema]:
-    return schema['type'] in _FUNCTION_WITH_INNER_SCHEMA_TYPES
-
-
-def is_list_like_schema_with_items_schema(
-    schema: CoreSchema,
-) -> TypeGuard[core_schema.ListSchema | core_schema.SetSchema | core_schema.FrozenSetSchema]:
-    return schema['type'] in _LIST_LIKE_SCHEMA_WITH_ITEMS_TYPES
-
-
-def get_type_ref(type_: type[Any], args_override: tuple[type[Any], ...] | None = None) -> str:
-    """Produces the ref to be used for this type by pydantic_core's core schemas.
-
-    This `args_override` argument was added for the purpose of creating valid recursive references
-    when creating generic models without needing to create a concrete class.
-    """
-    origin = get_origin(type_) or type_
-
-    args = get_args(type_) if is_generic_alias(type_) else (args_override or ())
-    generic_metadata = getattr(type_, '__pydantic_generic_metadata__', None)
-    if generic_metadata:
-        origin = generic_metadata['origin'] or origin
-        args = generic_metadata['args'] or args
-
-    module_name = getattr(origin, '__module__', '<No __module__>')
-    if isinstance(origin, TypeAliasType):
-        type_ref = f'{module_name}.{origin.__name__}:{id(origin)}'
-    else:
-        try:
-            qualname = getattr(origin, '__qualname__', f'<No __qualname__: {origin}>')
-        except Exception:
-            qualname = getattr(origin, '__qualname__', '<No __qualname__>')
-        type_ref = f'{module_name}.{qualname}:{id(origin)}'
-
-    arg_refs: list[str] = []
-    for arg in args:
-        if isinstance(arg, str):
-            # Handle string literals as a special case; we may be able to remove this special handling if we
-            # wrap them in a ForwardRef at some point.
-            arg_ref = f'{arg}:str-{id(arg)}'
-        else:
-            arg_ref = f'{_repr.display_as_type(arg)}:{id(arg)}'
-        arg_refs.append(arg_ref)
-    if arg_refs:
-        type_ref = f'{type_ref}[{",".join(arg_refs)}]'
-    return type_ref
-
-
-def get_ref(s: core_schema.CoreSchema) -> None | str:
-    """Get the ref from the schema if it has one.
-    This exists just for type checking to work correctly.
-    """
-    return s.get('ref', None)
-
-
-def collect_definitions(schema: core_schema.CoreSchema) -> dict[str, core_schema.CoreSchema]:
-    defs: dict[str, CoreSchema] = {}
-
-    def _record_valid_refs(s: core_schema.CoreSchema, recurse: Recurse) -> core_schema.CoreSchema:
-        ref = get_ref(s)
-        if ref:
-            defs[ref] = s
-        return recurse(s, _record_valid_refs)
-
-    walk_core_schema(schema, _record_valid_refs)
-
-    return defs
-
-
-def define_expected_missing_refs(
-    schema: core_schema.CoreSchema, allowed_missing_refs: set[str]
-) -> core_schema.CoreSchema | None:
-    if not allowed_missing_refs:
-        # in this case, there are no missing refs to potentially substitute, so there's no need to walk the schema
-        # this is a common case (will be hit for all non-generic models), so it's worth optimizing for
-        return None
-
-    refs = collect_definitions(schema).keys()
-
-    expected_missing_refs = allowed_missing_refs.difference(refs)
-    if expected_missing_refs:
-        definitions: list[core_schema.CoreSchema] = [
-            # TODO: Replace this with a (new) CoreSchema that, if present at any level, makes validation fail
-            #   Issue: https://github.com/pydantic/pydantic-core/issues/619
-            core_schema.none_schema(ref=ref, metadata={HAS_INVALID_SCHEMAS_METADATA_KEY: True})
-            for ref in expected_missing_refs
-        ]
-        return core_schema.definitions_schema(schema, definitions)
-    return None
-
-
-def collect_invalid_schemas(schema: core_schema.CoreSchema) -> bool:
-    invalid = False
-
-    def _is_schema_valid(s: core_schema.CoreSchema, recurse: Recurse) -> core_schema.CoreSchema:
-        nonlocal invalid
-        if 'metadata' in s:
-            metadata = s['metadata']
-            if HAS_INVALID_SCHEMAS_METADATA_KEY in metadata:
-                invalid = metadata[HAS_INVALID_SCHEMAS_METADATA_KEY]
-                return s
-        return recurse(s, _is_schema_valid)
-
-    walk_core_schema(schema, _is_schema_valid)
-    return invalid
-
-
-T = TypeVar('T')
-
-
-Recurse = Callable[[core_schema.CoreSchema, 'Walk'], core_schema.CoreSchema]
-Walk = Callable[[core_schema.CoreSchema, Recurse], core_schema.CoreSchema]
-
-# TODO: Should we move _WalkCoreSchema into pydantic_core proper?
-#   Issue: https://github.com/pydantic/pydantic-core/issues/615
-
-
-class _WalkCoreSchema:
-    def __init__(self):
-        self._schema_type_to_method = self._build_schema_type_to_method()
-
-    def _build_schema_type_to_method(self) -> dict[core_schema.CoreSchemaType, Recurse]:
-        mapping: dict[core_schema.CoreSchemaType, Recurse] = {}
-        key: core_schema.CoreSchemaType
-        for key in get_args(core_schema.CoreSchemaType):
-            method_name = f"handle_{key.replace('-', '_')}_schema"
-            mapping[key] = getattr(self, method_name, self._handle_other_schemas)
-        return mapping
-
-    def walk(self, schema: core_schema.CoreSchema, f: Walk) -> core_schema.CoreSchema:
-        return f(schema, self._walk)
-
-    def _walk(self, schema: core_schema.CoreSchema, f: Walk) -> core_schema.CoreSchema:
-        schema = self._schema_type_to_method[schema['type']](schema.copy(), f)
-        ser_schema: core_schema.SerSchema | None = schema.get('serialization')  # type: ignore
-        if ser_schema:
-            schema['serialization'] = self._handle_ser_schemas(ser_schema, f)
-        return schema
-
-    def _handle_other_schemas(self, schema: core_schema.CoreSchema, f: Walk) -> core_schema.CoreSchema:
-        sub_schema = schema.get('schema', None)
-        if sub_schema is not None:
-            schema['schema'] = self.walk(sub_schema, f)  # type: ignore
-        return schema
-
-    def _handle_ser_schemas(self, ser_schema: core_schema.SerSchema, f: Walk) -> core_schema.SerSchema:
-        schema: core_schema.CoreSchema | None = ser_schema.get('schema', None)
-        if schema is not None:
-            ser_schema['schema'] = self.walk(schema, f)  # type: ignore
-        return_schema: core_schema.CoreSchema | None = ser_schema.get('return_schema', None)
-        if return_schema is not None:
-            ser_schema['return_schema'] = self.walk(return_schema, f)  # type: ignore
-        return ser_schema
-
-    def handle_definitions_schema(self, schema: core_schema.DefinitionsSchema, f: Walk) -> core_schema.CoreSchema:
-        new_definitions: list[core_schema.CoreSchema] = []
-        for definition in schema['definitions']:
-            if 'schema_ref' in definition and 'ref' in definition:
-                # This indicates a purposely indirect reference
-                # We want to keep such references around for implications related to JSON schema, etc.:
-                new_definitions.append(definition)
-                # However, we still need to walk the referenced definition:
-                self.walk(definition, f)
-                continue
-
-            updated_definition = self.walk(definition, f)
-            if 'ref' in updated_definition:
-                # If the updated definition schema doesn't have a 'ref', it shouldn't go in the definitions
-                # This is most likely to happen due to replacing something with a definition reference, in
-                # which case it should certainly not go in the definitions list
-                new_definitions.append(updated_definition)
-        new_inner_schema = self.walk(schema['schema'], f)
-
-        if not new_definitions and len(schema) == 3:
-            # This means we'd be returning a "trivial" definitions schema that just wrapped the inner schema
-            return new_inner_schema
-
-        new_schema = schema.copy()
-        new_schema['schema'] = new_inner_schema
-        new_schema['definitions'] = new_definitions
-        return new_schema
-
-    def handle_list_schema(self, schema: core_schema.ListSchema, f: Walk) -> core_schema.CoreSchema:
-        items_schema = schema.get('items_schema')
-        if items_schema is not None:
-            schema['items_schema'] = self.walk(items_schema, f)
-        return schema
-
-    def handle_set_schema(self, schema: core_schema.SetSchema, f: Walk) -> core_schema.CoreSchema:
-        items_schema = schema.get('items_schema')
-        if items_schema is not None:
-            schema['items_schema'] = self.walk(items_schema, f)
-        return schema
-
-    def handle_frozenset_schema(self, schema: core_schema.FrozenSetSchema, f: Walk) -> core_schema.CoreSchema:
-        items_schema = schema.get('items_schema')
-        if items_schema is not None:
-            schema['items_schema'] = self.walk(items_schema, f)
-        return schema
-
-    def handle_generator_schema(self, schema: core_schema.GeneratorSchema, f: Walk) -> core_schema.CoreSchema:
-        items_schema = schema.get('items_schema')
-        if items_schema is not None:
-            schema['items_schema'] = self.walk(items_schema, f)
-        return schema
-
-    def handle_tuple_schema(self, schema: core_schema.TupleSchema, f: Walk) -> core_schema.CoreSchema:
-        schema['items_schema'] = [self.walk(v, f) for v in schema['items_schema']]
-        return schema
-
-    def handle_dict_schema(self, schema: core_schema.DictSchema, f: Walk) -> core_schema.CoreSchema:
-        keys_schema = schema.get('keys_schema')
-        if keys_schema is not None:
-            schema['keys_schema'] = self.walk(keys_schema, f)
-        values_schema = schema.get('values_schema')
-        if values_schema:
-            schema['values_schema'] = self.walk(values_schema, f)
-        return schema
-
-    def handle_function_schema(self, schema: AnyFunctionSchema, f: Walk) -> core_schema.CoreSchema:
-        if not is_function_with_inner_schema(schema):
-            return schema
-        schema['schema'] = self.walk(schema['schema'], f)
-        return schema
-
-    def handle_union_schema(self, schema: core_schema.UnionSchema, f: Walk) -> core_schema.CoreSchema:
-        new_choices: list[CoreSchema | tuple[CoreSchema, str]] = []
-        for v in schema['choices']:
-            if isinstance(v, tuple):
-                new_choices.append((self.walk(v[0], f), v[1]))
-            else:
-                new_choices.append(self.walk(v, f))
-        schema['choices'] = new_choices
-        return schema
-
-    def handle_tagged_union_schema(self, schema: core_schema.TaggedUnionSchema, f: Walk) -> core_schema.CoreSchema:
-        new_choices: dict[Hashable, core_schema.CoreSchema] = {}
-        for k, v in schema['choices'].items():
-            new_choices[k] = v if isinstance(v, (str, int)) else self.walk(v, f)
-        schema['choices'] = new_choices
-        return schema
-
-    def handle_chain_schema(self, schema: core_schema.ChainSchema, f: Walk) -> core_schema.CoreSchema:
-        schema['steps'] = [self.walk(v, f) for v in schema['steps']]
-        return schema
-
-    def handle_lax_or_strict_schema(self, schema: core_schema.LaxOrStrictSchema, f: Walk) -> core_schema.CoreSchema:
-        schema['lax_schema'] = self.walk(schema['lax_schema'], f)
-        schema['strict_schema'] = self.walk(schema['strict_schema'], f)
-        return schema
-
-    def handle_json_or_python_schema(self, schema: core_schema.JsonOrPythonSchema, f: Walk) -> core_schema.CoreSchema:
-        schema['json_schema'] = self.walk(schema['json_schema'], f)
-        schema['python_schema'] = self.walk(schema['python_schema'], f)
-        return schema
-
-    def handle_model_fields_schema(self, schema: core_schema.ModelFieldsSchema, f: Walk) -> core_schema.CoreSchema:
-        extras_schema = schema.get('extras_schema')
-        if extras_schema is not None:
-            schema['extras_schema'] = self.walk(extras_schema, f)
-        replaced_fields: dict[str, core_schema.ModelField] = {}
-        replaced_computed_fields: list[core_schema.ComputedField] = []
-        for computed_field in schema.get('computed_fields', ()):
-            replaced_field = computed_field.copy()
-            replaced_field['return_schema'] = self.walk(computed_field['return_schema'], f)
-            replaced_computed_fields.append(replaced_field)
-        if replaced_computed_fields:
-            schema['computed_fields'] = replaced_computed_fields
-        for k, v in schema['fields'].items():
-            replaced_field = v.copy()
-            replaced_field['schema'] = self.walk(v['schema'], f)
-            replaced_fields[k] = replaced_field
-        schema['fields'] = replaced_fields
-        return schema
-
-    def handle_typed_dict_schema(self, schema: core_schema.TypedDictSchema, f: Walk) -> core_schema.CoreSchema:
-        extras_schema = schema.get('extras_schema')
-        if extras_schema is not None:
-            schema['extras_schema'] = self.walk(extras_schema, f)
-        replaced_computed_fields: list[core_schema.ComputedField] = []
-        for computed_field in schema.get('computed_fields', ()):
-            replaced_field = computed_field.copy()
-            replaced_field['return_schema'] = self.walk(computed_field['return_schema'], f)
-            replaced_computed_fields.append(replaced_field)
-        if replaced_computed_fields:
-            schema['computed_fields'] = replaced_computed_fields
-        replaced_fields: dict[str, core_schema.TypedDictField] = {}
-        for k, v in schema['fields'].items():
-            replaced_field = v.copy()
-            replaced_field['schema'] = self.walk(v['schema'], f)
-            replaced_fields[k] = replaced_field
-        schema['fields'] = replaced_fields
-        return schema
-
-    def handle_dataclass_args_schema(self, schema: core_schema.DataclassArgsSchema, f: Walk) -> core_schema.CoreSchema:
-        replaced_fields: list[core_schema.DataclassField] = []
-        replaced_computed_fields: list[core_schema.ComputedField] = []
-        for computed_field in schema.get('computed_fields', ()):
-            replaced_field = computed_field.copy()
-            replaced_field['return_schema'] = self.walk(computed_field['return_schema'], f)
-            replaced_computed_fields.append(replaced_field)
-        if replaced_computed_fields:
-            schema['computed_fields'] = replaced_computed_fields
-        for field in schema['fields']:
-            replaced_field = field.copy()
-            replaced_field['schema'] = self.walk(field['schema'], f)
-            replaced_fields.append(replaced_field)
-        schema['fields'] = replaced_fields
-        return schema
-
-    def handle_arguments_schema(self, schema: core_schema.ArgumentsSchema, f: Walk) -> core_schema.CoreSchema:
-        replaced_arguments_schema: list[core_schema.ArgumentsParameter] = []
-        for param in schema['arguments_schema']:
-            replaced_param = param.copy()
-            replaced_param['schema'] = self.walk(param['schema'], f)
-            replaced_arguments_schema.append(replaced_param)
-        schema['arguments_schema'] = replaced_arguments_schema
-        if 'var_args_schema' in schema:
-            schema['var_args_schema'] = self.walk(schema['var_args_schema'], f)
-        if 'var_kwargs_schema' in schema:
-            schema['var_kwargs_schema'] = self.walk(schema['var_kwargs_schema'], f)
-        return schema
-
-    def handle_call_schema(self, schema: core_schema.CallSchema, f: Walk) -> core_schema.CoreSchema:
-        schema['arguments_schema'] = self.walk(schema['arguments_schema'], f)
-        if 'return_schema' in schema:
-            schema['return_schema'] = self.walk(schema['return_schema'], f)
-        return schema
-
-
-_dispatch = _WalkCoreSchema().walk
-
-
-def walk_core_schema(schema: core_schema.CoreSchema, f: Walk) -> core_schema.CoreSchema:
-    """Recursively traverse a CoreSchema.
-
-    Args:
-        schema (core_schema.CoreSchema): The CoreSchema to process, it will not be modified.
-        f (Walk): A function to apply. This function takes two arguments:
-          1. The current CoreSchema that is being processed
-             (not the same one you passed into this function, one level down).
-          2. The "next" `f` to call. This lets you for example use `f=functools.partial(some_method, some_context)`
-             to pass data down the recursive calls without using globals or other mutable state.
-
-    Returns:
-        core_schema.CoreSchema: A processed CoreSchema.
-    """
-    return f(schema.copy(), _dispatch)
-
-
-def simplify_schema_references(schema: core_schema.CoreSchema) -> core_schema.CoreSchema:  # noqa: C901
-    definitions: dict[str, core_schema.CoreSchema] = {}
-    ref_counts: dict[str, int] = defaultdict(int)
-    involved_in_recursion: dict[str, bool] = {}
-    current_recursion_ref_count: dict[str, int] = defaultdict(int)
-
-    def collect_refs(s: core_schema.CoreSchema, recurse: Recurse) -> core_schema.CoreSchema:
-        if s['type'] == 'definitions':
-            for definition in s['definitions']:
-                ref = get_ref(definition)
-                assert ref is not None
-                if ref not in definitions:
-                    definitions[ref] = definition
-                recurse(definition, collect_refs)
-            return recurse(s['schema'], collect_refs)
-        else:
-            ref = get_ref(s)
-            if ref is not None:
-                new = recurse(s, collect_refs)
-                new_ref = get_ref(new)
-                if new_ref:
-                    definitions[new_ref] = new
-                return core_schema.definition_reference_schema(schema_ref=ref)
-            else:
-                return recurse(s, collect_refs)
-
-    schema = walk_core_schema(schema, collect_refs)
-
-    def count_refs(s: core_schema.CoreSchema, recurse: Recurse) -> core_schema.CoreSchema:
-        if s['type'] != 'definition-ref':
-            return recurse(s, count_refs)
-        ref = s['schema_ref']
-        ref_counts[ref] += 1
-
-        if ref_counts[ref] >= 2:
-            # If this model is involved in a recursion this should be detected
-            # on its second encounter, we can safely stop the walk here.
-            if current_recursion_ref_count[ref] != 0:
-                involved_in_recursion[ref] = True
-            return s
-
-        current_recursion_ref_count[ref] += 1
-        recurse(definitions[ref], count_refs)
-        current_recursion_ref_count[ref] -= 1
-        return s
-
-    schema = walk_core_schema(schema, count_refs)
-
-    assert all(c == 0 for c in current_recursion_ref_count.values()), 'this is a bug! please report it'
-
-    def can_be_inlined(s: core_schema.DefinitionReferenceSchema, ref: str) -> bool:
-        if ref_counts[ref] > 1:
-            return False
-        if involved_in_recursion.get(ref, False):
-            return False
-        if 'serialization' in s:
-            return False
-        if 'metadata' in s:
-            metadata = s['metadata']
-            for k in (
-                'pydantic_js_functions',
-                'pydantic_js_annotation_functions',
-                'pydantic.internal.union_discriminator',
-            ):
-                if k in metadata:
-                    # we need to keep this as a ref
-                    return False
-        return True
-
-    def inline_refs(s: core_schema.CoreSchema, recurse: Recurse) -> core_schema.CoreSchema:
-        if s['type'] == 'definition-ref':
-            ref = s['schema_ref']
-            # Check if the reference is only used once, not involved in recursion and does not have
-            # any extra keys (like 'serialization')
-            if can_be_inlined(s, ref):
-                # Inline the reference by replacing the reference with the actual schema
-                new = definitions.pop(ref)
-                ref_counts[ref] -= 1  # because we just replaced it!
-                # put all other keys that were on the def-ref schema into the inlined version
-                # in particular this is needed for `serialization`
-                if 'serialization' in s:
-                    new['serialization'] = s['serialization']
-                s = recurse(new, inline_refs)
-                return s
-            else:
-                return recurse(s, inline_refs)
-        else:
-            return recurse(s, inline_refs)
-
-    schema = walk_core_schema(schema, inline_refs)
-
-    def_values = [v for v in definitions.values() if ref_counts[v['ref']] > 0]  # type: ignore
-
-    if def_values:
-        schema = core_schema.definitions_schema(schema=schema, definitions=def_values)
-    return schema
-
-
-def _strip_metadata(schema: CoreSchema) -> CoreSchema:
-    def strip_metadata(s: CoreSchema, recurse: Recurse) -> CoreSchema:
-        s = s.copy()
-        s.pop('metadata', None)
-        if s['type'] == 'model-fields':
-            s = s.copy()
-            s['fields'] = {k: v.copy() for k, v in s['fields'].items()}
-            for field_name, field_schema in s['fields'].items():
-                field_schema.pop('metadata', None)
-                s['fields'][field_name] = field_schema
-            computed_fields = s.get('computed_fields', None)
-            if computed_fields:
-                s['computed_fields'] = [cf.copy() for cf in computed_fields]
-                for cf in computed_fields:
-                    cf.pop('metadata', None)
-            else:
-                s.pop('computed_fields', None)
-        elif s['type'] == 'model':
-            # remove some defaults
-            if s.get('custom_init', True) is False:
-                s.pop('custom_init')
-            if s.get('root_model', True) is False:
-                s.pop('root_model')
-            if {'title'}.issuperset(s.get('config', {}).keys()):
-                s.pop('config', None)
-
-        return recurse(s, strip_metadata)
-
-    return walk_core_schema(schema, strip_metadata)
-
-
-def pretty_print_core_schema(
-    schema: CoreSchema,
-    include_metadata: bool = False,
-) -> None:
-    """Pretty print a CoreSchema using rich.
-    This is intended for debugging purposes.
-
-    Args:
-        schema: The CoreSchema to print.
-        include_metadata: Whether to include metadata in the output. Defaults to `False`.
-    """
-    from rich import print  # type: ignore  # install it manually in your dev env
-
-    if not include_metadata:
-        schema = _strip_metadata(schema)
-
-    return print(schema)
-
-
-def validate_core_schema(schema: CoreSchema) -> CoreSchema:
-    if 'PYDANTIC_SKIP_VALIDATING_CORE_SCHEMAS' in os.environ:
-        return schema
-    return _validate_core_schema(schema)
diff --git a/lib/pydantic/_internal/_dataclasses.py b/lib/pydantic/_internal/_dataclasses.py
deleted file mode 100644
index 1ec23044..00000000
--- a/lib/pydantic/_internal/_dataclasses.py
+++ /dev/null
@@ -1,225 +0,0 @@
-"""Private logic for creating pydantic dataclasses."""
-from __future__ import annotations as _annotations
-
-import dataclasses
-import typing
-import warnings
-from functools import partial, wraps
-from typing import Any, Callable, ClassVar
-
-from pydantic_core import (
-    ArgsKwargs,
-    SchemaSerializer,
-    SchemaValidator,
-    core_schema,
-)
-from typing_extensions import TypeGuard
-
-from ..errors import PydanticUndefinedAnnotation
-from ..fields import FieldInfo
-from ..plugin._schema_validator import create_schema_validator
-from ..warnings import PydanticDeprecatedSince20
-from . import _config, _decorators, _typing_extra
-from ._fields import collect_dataclass_fields
-from ._generate_schema import GenerateSchema
-from ._generics import get_standard_typevars_map
-from ._mock_val_ser import set_dataclass_mocks
-from ._schema_generation_shared import CallbackGetCoreSchemaHandler
-from ._signature import generate_pydantic_signature
-
-if typing.TYPE_CHECKING:
-    from ..config import ConfigDict
-
-    class StandardDataclass(typing.Protocol):
-        __dataclass_fields__: ClassVar[dict[str, Any]]
-        __dataclass_params__: ClassVar[Any]  # in reality `dataclasses._DataclassParams`
-        __post_init__: ClassVar[Callable[..., None]]
-
-        def __init__(self, *args: object, **kwargs: object) -> None:
-            pass
-
-    class PydanticDataclass(StandardDataclass, typing.Protocol):
-        """A protocol containing attributes only available once a class has been decorated as a Pydantic dataclass.
-
-        Attributes:
-            __pydantic_config__: Pydantic-specific configuration settings for the dataclass.
-            __pydantic_complete__: Whether dataclass building is completed, or if there are still undefined fields.
-            __pydantic_core_schema__: The pydantic-core schema used to build the SchemaValidator and SchemaSerializer.
-            __pydantic_decorators__: Metadata containing the decorators defined on the dataclass.
-            __pydantic_fields__: Metadata about the fields defined on the dataclass.
-            __pydantic_serializer__: The pydantic-core SchemaSerializer used to dump instances of the dataclass.
-            __pydantic_validator__: The pydantic-core SchemaValidator used to validate instances of the dataclass.
-        """
-
-        __pydantic_config__: ClassVar[ConfigDict]
-        __pydantic_complete__: ClassVar[bool]
-        __pydantic_core_schema__: ClassVar[core_schema.CoreSchema]
-        __pydantic_decorators__: ClassVar[_decorators.DecoratorInfos]
-        __pydantic_fields__: ClassVar[dict[str, FieldInfo]]
-        __pydantic_serializer__: ClassVar[SchemaSerializer]
-        __pydantic_validator__: ClassVar[SchemaValidator]
-
-else:
-    # See PyCharm issues https://youtrack.jetbrains.com/issue/PY-21915
-    # and https://youtrack.jetbrains.com/issue/PY-51428
-    DeprecationWarning = PydanticDeprecatedSince20
-
-
-def set_dataclass_fields(cls: type[StandardDataclass], types_namespace: dict[str, Any] | None = None) -> None:
-    """Collect and set `cls.__pydantic_fields__`.
-
-    Args:
-        cls: The class.
-        types_namespace: The types namespace, defaults to `None`.
-    """
-    typevars_map = get_standard_typevars_map(cls)
-    fields = collect_dataclass_fields(cls, types_namespace, typevars_map=typevars_map)
-
-    cls.__pydantic_fields__ = fields  # type: ignore
-
-
-def complete_dataclass(
-    cls: type[Any],
-    config_wrapper: _config.ConfigWrapper,
-    *,
-    raise_errors: bool = True,
-    types_namespace: dict[str, Any] | None,
-) -> bool:
-    """Finish building a pydantic dataclass.
-
-    This logic is called on a class which has already been wrapped in `dataclasses.dataclass()`.
-
-    This is somewhat analogous to `pydantic._internal._model_construction.complete_model_class`.
-
-    Args:
-        cls: The class.
-        config_wrapper: The config wrapper instance.
-        raise_errors: Whether to raise errors, defaults to `True`.
-        types_namespace: The types namespace.
-
-    Returns:
-        `True` if building a pydantic dataclass is successfully completed, `False` otherwise.
-
-    Raises:
-        PydanticUndefinedAnnotation: If `raise_error` is `True` and there is an undefined annotations.
-    """
-    if hasattr(cls, '__post_init_post_parse__'):
-        warnings.warn(
-            'Support for `__post_init_post_parse__` has been dropped, the method will not be called', DeprecationWarning
-        )
-
-    if types_namespace is None:
-        types_namespace = _typing_extra.get_cls_types_namespace(cls)
-
-    set_dataclass_fields(cls, types_namespace)
-
-    typevars_map = get_standard_typevars_map(cls)
-    gen_schema = GenerateSchema(
-        config_wrapper,
-        types_namespace,
-        typevars_map,
-    )
-
-    # This needs to be called before we change the __init__
-    sig = generate_pydantic_signature(
-        init=cls.__init__,
-        fields=cls.__pydantic_fields__,  # type: ignore
-        config_wrapper=config_wrapper,
-        is_dataclass=True,
-    )
-
-    # dataclass.__init__ must be defined here so its `__qualname__` can be changed since functions can't be copied.
-    def __init__(__dataclass_self__: PydanticDataclass, *args: Any, **kwargs: Any) -> None:
-        __tracebackhide__ = True
-        s = __dataclass_self__
-        s.__pydantic_validator__.validate_python(ArgsKwargs(args, kwargs), self_instance=s)
-
-    __init__.__qualname__ = f'{cls.__qualname__}.__init__'
-
-    cls.__init__ = __init__  # type: ignore
-    cls.__pydantic_config__ = config_wrapper.config_dict  # type: ignore
-    cls.__signature__ = sig  # type: ignore
-    get_core_schema = getattr(cls, '__get_pydantic_core_schema__', None)
-    try:
-        if get_core_schema:
-            schema = get_core_schema(
-                cls,
-                CallbackGetCoreSchemaHandler(
-                    partial(gen_schema.generate_schema, from_dunder_get_core_schema=False),
-                    gen_schema,
-                    ref_mode='unpack',
-                ),
-            )
-        else:
-            schema = gen_schema.generate_schema(cls, from_dunder_get_core_schema=False)
-    except PydanticUndefinedAnnotation as e:
-        if raise_errors:
-            raise
-        set_dataclass_mocks(cls, cls.__name__, f'`{e.name}`')
-        return False
-
-    core_config = config_wrapper.core_config(cls)
-
-    try:
-        schema = gen_schema.clean_schema(schema)
-    except gen_schema.CollectedInvalid:
-        set_dataclass_mocks(cls, cls.__name__, 'all referenced types')
-        return False
-
-    # We are about to set all the remaining required properties expected for this cast;
-    # __pydantic_decorators__ and __pydantic_fields__ should already be set
-    cls = typing.cast('type[PydanticDataclass]', cls)
-    # debug(schema)
-
-    cls.__pydantic_core_schema__ = schema
-    cls.__pydantic_validator__ = validator = create_schema_validator(
-        schema, cls, cls.__module__, cls.__qualname__, 'dataclass', core_config, config_wrapper.plugin_settings
-    )
-    cls.__pydantic_serializer__ = SchemaSerializer(schema, core_config)
-
-    if config_wrapper.validate_assignment:
-
-        @wraps(cls.__setattr__)
-        def validated_setattr(instance: Any, __field: str, __value: str) -> None:
-            validator.validate_assignment(instance, __field, __value)
-
-        cls.__setattr__ = validated_setattr.__get__(None, cls)  # type: ignore
-
-    return True
-
-
-def is_builtin_dataclass(_cls: type[Any]) -> TypeGuard[type[StandardDataclass]]:
-    """Returns True if a class is a stdlib dataclass and *not* a pydantic dataclass.
-
-    We check that
-    - `_cls` is a dataclass
-    - `_cls` does not inherit from a processed pydantic dataclass (and thus have a `__pydantic_validator__`)
-    - `_cls` does not have any annotations that are not dataclass fields
-    e.g.
-    ```py
-    import dataclasses
-
-    import pydantic.dataclasses
-
-    @dataclasses.dataclass
-    class A:
-        x: int
-
-    @pydantic.dataclasses.dataclass
-    class B(A):
-        y: int
-    ```
-    In this case, when we first check `B`, we make an extra check and look at the annotations ('y'),
-    which won't be a superset of all the dataclass fields (only the stdlib fields i.e. 'x')
-
-    Args:
-        cls: The class.
-
-    Returns:
-        `True` if the class is a stdlib dataclass, `False` otherwise.
-    """
-    return (
-        dataclasses.is_dataclass(_cls)
-        and not hasattr(_cls, '__pydantic_validator__')
-        and set(_cls.__dataclass_fields__).issuperset(set(getattr(_cls, '__annotations__', {})))
-    )
diff --git a/lib/pydantic/_internal/_decorators.py b/lib/pydantic/_internal/_decorators.py
deleted file mode 100644
index 5672464c..00000000
--- a/lib/pydantic/_internal/_decorators.py
+++ /dev/null
@@ -1,791 +0,0 @@
-"""Logic related to validators applied to models etc. via the `@field_validator` and `@model_validator` decorators."""
-from __future__ import annotations as _annotations
-
-from collections import deque
-from dataclasses import dataclass, field
-from functools import cached_property, partial, partialmethod
-from inspect import Parameter, Signature, isdatadescriptor, ismethoddescriptor, signature
-from itertools import islice
-from typing import TYPE_CHECKING, Any, Callable, ClassVar, Generic, Iterable, TypeVar, Union
-
-from pydantic_core import PydanticUndefined, core_schema
-from typing_extensions import Literal, TypeAlias, is_typeddict
-
-from ..errors import PydanticUserError
-from ._core_utils import get_type_ref
-from ._internal_dataclass import slots_true
-from ._typing_extra import get_function_type_hints
-
-if TYPE_CHECKING:
-    from ..fields import ComputedFieldInfo
-    from ..functional_validators import FieldValidatorModes
-
-
-@dataclass(**slots_true)
-class ValidatorDecoratorInfo:
-    """A container for data from `@validator` so that we can access it
-    while building the pydantic-core schema.
-
-    Attributes:
-        decorator_repr: A class variable representing the decorator string, '@validator'.
-        fields: A tuple of field names the validator should be called on.
-        mode: The proposed validator mode.
-        each_item: For complex objects (sets, lists etc.) whether to validate individual
-            elements rather than the whole object.
-        always: Whether this method and other validators should be called even if the value is missing.
-        check_fields: Whether to check that the fields actually exist on the model.
-    """
-
-    decorator_repr: ClassVar[str] = '@validator'
-
-    fields: tuple[str, ...]
-    mode: Literal['before', 'after']
-    each_item: bool
-    always: bool
-    check_fields: bool | None
-
-
-@dataclass(**slots_true)
-class FieldValidatorDecoratorInfo:
-    """A container for data from `@field_validator` so that we can access it
-    while building the pydantic-core schema.
-
-    Attributes:
-        decorator_repr: A class variable representing the decorator string, '@field_validator'.
-        fields: A tuple of field names the validator should be called on.
-        mode: The proposed validator mode.
-        check_fields: Whether to check that the fields actually exist on the model.
-    """
-
-    decorator_repr: ClassVar[str] = '@field_validator'
-
-    fields: tuple[str, ...]
-    mode: FieldValidatorModes
-    check_fields: bool | None
-
-
-@dataclass(**slots_true)
-class RootValidatorDecoratorInfo:
-    """A container for data from `@root_validator` so that we can access it
-    while building the pydantic-core schema.
-
-    Attributes:
-        decorator_repr: A class variable representing the decorator string, '@root_validator'.
-        mode: The proposed validator mode.
-    """
-
-    decorator_repr: ClassVar[str] = '@root_validator'
-    mode: Literal['before', 'after']
-
-
-@dataclass(**slots_true)
-class FieldSerializerDecoratorInfo:
-    """A container for data from `@field_serializer` so that we can access it
-    while building the pydantic-core schema.
-
-    Attributes:
-        decorator_repr: A class variable representing the decorator string, '@field_serializer'.
-        fields: A tuple of field names the serializer should be called on.
-        mode: The proposed serializer mode.
-        return_type: The type of the serializer's return value.
-        when_used: The serialization condition. Accepts a string with values `'always'`, `'unless-none'`, `'json'`,
-            and `'json-unless-none'`.
-        check_fields: Whether to check that the fields actually exist on the model.
-    """
-
-    decorator_repr: ClassVar[str] = '@field_serializer'
-    fields: tuple[str, ...]
-    mode: Literal['plain', 'wrap']
-    return_type: Any
-    when_used: core_schema.WhenUsed
-    check_fields: bool | None
-
-
-@dataclass(**slots_true)
-class ModelSerializerDecoratorInfo:
-    """A container for data from `@model_serializer` so that we can access it
-    while building the pydantic-core schema.
-
-    Attributes:
-        decorator_repr: A class variable representing the decorator string, '@model_serializer'.
-        mode: The proposed serializer mode.
-        return_type: The type of the serializer's return value.
-        when_used: The serialization condition. Accepts a string with values `'always'`, `'unless-none'`, `'json'`,
-            and `'json-unless-none'`.
-    """
-
-    decorator_repr: ClassVar[str] = '@model_serializer'
-    mode: Literal['plain', 'wrap']
-    return_type: Any
-    when_used: core_schema.WhenUsed
-
-
-@dataclass(**slots_true)
-class ModelValidatorDecoratorInfo:
-    """A container for data from `@model_validator` so that we can access it
-    while building the pydantic-core schema.
-
-    Attributes:
-        decorator_repr: A class variable representing the decorator string, '@model_serializer'.
-        mode: The proposed serializer mode.
-    """
-
-    decorator_repr: ClassVar[str] = '@model_validator'
-    mode: Literal['wrap', 'before', 'after']
-
-
-DecoratorInfo: TypeAlias = """Union[
-    ValidatorDecoratorInfo,
-    FieldValidatorDecoratorInfo,
-    RootValidatorDecoratorInfo,
-    FieldSerializerDecoratorInfo,
-    ModelSerializerDecoratorInfo,
-    ModelValidatorDecoratorInfo,
-    ComputedFieldInfo,
-]"""
-
-ReturnType = TypeVar('ReturnType')
-DecoratedType: TypeAlias = (
-    'Union[classmethod[Any, Any, ReturnType], staticmethod[Any, ReturnType], Callable[..., ReturnType], property]'
-)
-
-
-@dataclass  # can't use slots here since we set attributes on `__post_init__`
-class PydanticDescriptorProxy(Generic[ReturnType]):
-    """Wrap a classmethod, staticmethod, property or unbound function
-    and act as a descriptor that allows us to detect decorated items
-    from the class' attributes.
-
-    This class' __get__ returns the wrapped item's __get__ result,
-    which makes it transparent for classmethods and staticmethods.
-
-    Attributes:
-        wrapped: The decorator that has to be wrapped.
-        decorator_info: The decorator info.
-        shim: A wrapper function to wrap V1 style function.
-    """
-
-    wrapped: DecoratedType[ReturnType]
-    decorator_info: DecoratorInfo
-    shim: Callable[[Callable[..., Any]], Callable[..., Any]] | None = None
-
-    def __post_init__(self):
-        for attr in 'setter', 'deleter':
-            if hasattr(self.wrapped, attr):
-                f = partial(self._call_wrapped_attr, name=attr)
-                setattr(self, attr, f)
-
-    def _call_wrapped_attr(self, func: Callable[[Any], None], *, name: str) -> PydanticDescriptorProxy[ReturnType]:
-        self.wrapped = getattr(self.wrapped, name)(func)
-        return self
-
-    def __get__(self, obj: object | None, obj_type: type[object] | None = None) -> PydanticDescriptorProxy[ReturnType]:
-        try:
-            return self.wrapped.__get__(obj, obj_type)
-        except AttributeError:
-            # not a descriptor, e.g. a partial object
-            return self.wrapped  # type: ignore[return-value]
-
-    def __set_name__(self, instance: Any, name: str) -> None:
-        if hasattr(self.wrapped, '__set_name__'):
-            self.wrapped.__set_name__(instance, name)  # pyright: ignore[reportFunctionMemberAccess]
-
-    def __getattr__(self, __name: str) -> Any:
-        """Forward checks for __isabstractmethod__ and such."""
-        return getattr(self.wrapped, __name)
-
-
-DecoratorInfoType = TypeVar('DecoratorInfoType', bound=DecoratorInfo)
-
-
-@dataclass(**slots_true)
-class Decorator(Generic[DecoratorInfoType]):
-    """A generic container class to join together the decorator metadata
-    (metadata from decorator itself, which we have when the
-    decorator is called but not when we are building the core-schema)
-    and the bound function (which we have after the class itself is created).
-
-    Attributes:
-        cls_ref: The class ref.
-        cls_var_name: The decorated function name.
-        func: The decorated function.
-        shim: A wrapper function to wrap V1 style function.
-        info: The decorator info.
-    """
-
-    cls_ref: str
-    cls_var_name: str
-    func: Callable[..., Any]
-    shim: Callable[[Any], Any] | None
-    info: DecoratorInfoType
-
-    @staticmethod
-    def build(
-        cls_: Any,
-        *,
-        cls_var_name: str,
-        shim: Callable[[Any], Any] | None,
-        info: DecoratorInfoType,
-    ) -> Decorator[DecoratorInfoType]:
-        """Build a new decorator.
-
-        Args:
-            cls_: The class.
-            cls_var_name: The decorated function name.
-            shim: A wrapper function to wrap V1 style function.
-            info: The decorator info.
-
-        Returns:
-            The new decorator instance.
-        """
-        func = get_attribute_from_bases(cls_, cls_var_name)
-        if shim is not None:
-            func = shim(func)
-        func = unwrap_wrapped_function(func, unwrap_partial=False)
-        if not callable(func):
-            # This branch will get hit for classmethod properties
-            attribute = get_attribute_from_base_dicts(cls_, cls_var_name)  # prevents the binding call to `__get__`
-            if isinstance(attribute, PydanticDescriptorProxy):
-                func = unwrap_wrapped_function(attribute.wrapped)
-        return Decorator(
-            cls_ref=get_type_ref(cls_),
-            cls_var_name=cls_var_name,
-            func=func,
-            shim=shim,
-            info=info,
-        )
-
-    def bind_to_cls(self, cls: Any) -> Decorator[DecoratorInfoType]:
-        """Bind the decorator to a class.
-
-        Args:
-            cls: the class.
-
-        Returns:
-            The new decorator instance.
-        """
-        return self.build(
-            cls,
-            cls_var_name=self.cls_var_name,
-            shim=self.shim,
-            info=self.info,
-        )
-
-
-def get_bases(tp: type[Any]) -> tuple[type[Any], ...]:
-    """Get the base classes of a class or typeddict.
-
-    Args:
-        tp: The type or class to get the bases.
-
-    Returns:
-        The base classes.
-    """
-    if is_typeddict(tp):
-        return tp.__orig_bases__  # type: ignore
-    try:
-        return tp.__bases__
-    except AttributeError:
-        return ()
-
-
-def mro(tp: type[Any]) -> tuple[type[Any], ...]:
-    """Calculate the Method Resolution Order of bases using the C3 algorithm.
-
-    See https://www.python.org/download/releases/2.3/mro/
-    """
-    # try to use the existing mro, for performance mainly
-    # but also because it helps verify the implementation below
-    if not is_typeddict(tp):
-        try:
-            return tp.__mro__
-        except AttributeError:
-            # GenericAlias and some other cases
-            pass
-
-    bases = get_bases(tp)
-    return (tp,) + mro_for_bases(bases)
-
-
-def mro_for_bases(bases: tuple[type[Any], ...]) -> tuple[type[Any], ...]:
-    def merge_seqs(seqs: list[deque[type[Any]]]) -> Iterable[type[Any]]:
-        while True:
-            non_empty = [seq for seq in seqs if seq]
-            if not non_empty:
-                # Nothing left to process, we're done.
-                return
-            candidate: type[Any] | None = None
-            for seq in non_empty:  # Find merge candidates among seq heads.
-                candidate = seq[0]
-                not_head = [s for s in non_empty if candidate in islice(s, 1, None)]
-                if not_head:
-                    # Reject the candidate.
-                    candidate = None
-                else:
-                    break
-            if not candidate:
-                raise TypeError('Inconsistent hierarchy, no C3 MRO is possible')
-            yield candidate
-            for seq in non_empty:
-                # Remove candidate.
-                if seq[0] == candidate:
-                    seq.popleft()
-
-    seqs = [deque(mro(base)) for base in bases] + [deque(bases)]
-    return tuple(merge_seqs(seqs))
-
-
-_sentinel = object()
-
-
-def get_attribute_from_bases(tp: type[Any] | tuple[type[Any], ...], name: str) -> Any:
-    """Get the attribute from the next class in the MRO that has it,
-    aiming to simulate calling the method on the actual class.
-
-    The reason for iterating over the mro instead of just getting
-    the attribute (which would do that for us) is to support TypedDict,
-    which lacks a real __mro__, but can have a virtual one constructed
-    from its bases (as done here).
-
-    Args:
-        tp: The type or class to search for the attribute. If a tuple, this is treated as a set of base classes.
-        name: The name of the attribute to retrieve.
-
-    Returns:
-        Any: The attribute value, if found.
-
-    Raises:
-        AttributeError: If the attribute is not found in any class in the MRO.
-    """
-    if isinstance(tp, tuple):
-        for base in mro_for_bases(tp):
-            attribute = base.__dict__.get(name, _sentinel)
-            if attribute is not _sentinel:
-                attribute_get = getattr(attribute, '__get__', None)
-                if attribute_get is not None:
-                    return attribute_get(None, tp)
-                return attribute
-        raise AttributeError(f'{name} not found in {tp}')
-    else:
-        try:
-            return getattr(tp, name)
-        except AttributeError:
-            return get_attribute_from_bases(mro(tp), name)
-
-
-def get_attribute_from_base_dicts(tp: type[Any], name: str) -> Any:
-    """Get an attribute out of the `__dict__` following the MRO.
-    This prevents the call to `__get__` on the descriptor, and allows
-    us to get the original function for classmethod properties.
-
-    Args:
-        tp: The type or class to search for the attribute.
-        name: The name of the attribute to retrieve.
-
-    Returns:
-        Any: The attribute value, if found.
-
-    Raises:
-        KeyError: If the attribute is not found in any class's `__dict__` in the MRO.
-    """
-    for base in reversed(mro(tp)):
-        if name in base.__dict__:
-            return base.__dict__[name]
-    return tp.__dict__[name]  # raise the error
-
-
-@dataclass(**slots_true)
-class DecoratorInfos:
-    """Mapping of name in the class namespace to decorator info.
-
-    note that the name in the class namespace is the function or attribute name
-    not the field name!
-    """
-
-    validators: dict[str, Decorator[ValidatorDecoratorInfo]] = field(default_factory=dict)
-    field_validators: dict[str, Decorator[FieldValidatorDecoratorInfo]] = field(default_factory=dict)
-    root_validators: dict[str, Decorator[RootValidatorDecoratorInfo]] = field(default_factory=dict)
-    field_serializers: dict[str, Decorator[FieldSerializerDecoratorInfo]] = field(default_factory=dict)
-    model_serializers: dict[str, Decorator[ModelSerializerDecoratorInfo]] = field(default_factory=dict)
-    model_validators: dict[str, Decorator[ModelValidatorDecoratorInfo]] = field(default_factory=dict)
-    computed_fields: dict[str, Decorator[ComputedFieldInfo]] = field(default_factory=dict)
-
-    @staticmethod
-    def build(model_dc: type[Any]) -> DecoratorInfos:  # noqa: C901 (ignore complexity)
-        """We want to collect all DecFunc instances that exist as
-        attributes in the namespace of the class (a BaseModel or dataclass)
-        that called us
-        But we want to collect these in the order of the bases
-        So instead of getting them all from the leaf class (the class that called us),
-        we traverse the bases from root (the oldest ancestor class) to leaf
-        and collect all of the instances as we go, taking care to replace
-        any duplicate ones with the last one we see to mimic how function overriding
-        works with inheritance.
-        If we do replace any functions we put the replacement into the position
-        the replaced function was in; that is, we maintain the order.
-        """
-        # reminder: dicts are ordered and replacement does not alter the order
-        res = DecoratorInfos()
-        for base in reversed(mro(model_dc)[1:]):
-            existing: DecoratorInfos | None = base.__dict__.get('__pydantic_decorators__')
-            if existing is None:
-                existing = DecoratorInfos.build(base)
-            res.validators.update({k: v.bind_to_cls(model_dc) for k, v in existing.validators.items()})
-            res.field_validators.update({k: v.bind_to_cls(model_dc) for k, v in existing.field_validators.items()})
-            res.root_validators.update({k: v.bind_to_cls(model_dc) for k, v in existing.root_validators.items()})
-            res.field_serializers.update({k: v.bind_to_cls(model_dc) for k, v in existing.field_serializers.items()})
-            res.model_serializers.update({k: v.bind_to_cls(model_dc) for k, v in existing.model_serializers.items()})
-            res.model_validators.update({k: v.bind_to_cls(model_dc) for k, v in existing.model_validators.items()})
-            res.computed_fields.update({k: v.bind_to_cls(model_dc) for k, v in existing.computed_fields.items()})
-
-        to_replace: list[tuple[str, Any]] = []
-
-        for var_name, var_value in vars(model_dc).items():
-            if isinstance(var_value, PydanticDescriptorProxy):
-                info = var_value.decorator_info
-                if isinstance(info, ValidatorDecoratorInfo):
-                    res.validators[var_name] = Decorator.build(
-                        model_dc, cls_var_name=var_name, shim=var_value.shim, info=info
-                    )
-                elif isinstance(info, FieldValidatorDecoratorInfo):
-                    res.field_validators[var_name] = Decorator.build(
-                        model_dc, cls_var_name=var_name, shim=var_value.shim, info=info
-                    )
-                elif isinstance(info, RootValidatorDecoratorInfo):
-                    res.root_validators[var_name] = Decorator.build(
-                        model_dc, cls_var_name=var_name, shim=var_value.shim, info=info
-                    )
-                elif isinstance(info, FieldSerializerDecoratorInfo):
-                    # check whether a serializer function is already registered for fields
-                    for field_serializer_decorator in res.field_serializers.values():
-                        # check that each field has at most one serializer function.
-                        # serializer functions for the same field in subclasses are allowed,
-                        # and are treated as overrides
-                        if field_serializer_decorator.cls_var_name == var_name:
-                            continue
-                        for f in info.fields:
-                            if f in field_serializer_decorator.info.fields:
-                                raise PydanticUserError(
-                                    'Multiple field serializer functions were defined '
-                                    f'for field {f!r}, this is not allowed.',
-                                    code='multiple-field-serializers',
-                                )
-                    res.field_serializers[var_name] = Decorator.build(
-                        model_dc, cls_var_name=var_name, shim=var_value.shim, info=info
-                    )
-                elif isinstance(info, ModelValidatorDecoratorInfo):
-                    res.model_validators[var_name] = Decorator.build(
-                        model_dc, cls_var_name=var_name, shim=var_value.shim, info=info
-                    )
-                elif isinstance(info, ModelSerializerDecoratorInfo):
-                    res.model_serializers[var_name] = Decorator.build(
-                        model_dc, cls_var_name=var_name, shim=var_value.shim, info=info
-                    )
-                else:
-                    from ..fields import ComputedFieldInfo
-
-                    isinstance(var_value, ComputedFieldInfo)
-                    res.computed_fields[var_name] = Decorator.build(
-                        model_dc, cls_var_name=var_name, shim=None, info=info
-                    )
-                to_replace.append((var_name, var_value.wrapped))
-        if to_replace:
-            # If we can save `__pydantic_decorators__` on the class we'll be able to check for it above
-            # so then we don't need to re-process the type, which means we can discard our descriptor wrappers
-            # and replace them with the thing they are wrapping (see the other setattr call below)
-            # which allows validator class methods to also function as regular class methods
-            setattr(model_dc, '__pydantic_decorators__', res)
-            for name, value in to_replace:
-                setattr(model_dc, name, value)
-        return res
-
-
-def inspect_validator(validator: Callable[..., Any], mode: FieldValidatorModes) -> bool:
-    """Look at a field or model validator function and determine whether it takes an info argument.
-
-    An error is raised if the function has an invalid signature.
-
-    Args:
-        validator: The validator function to inspect.
-        mode: The proposed validator mode.
-
-    Returns:
-        Whether the validator takes an info argument.
-    """
-    try:
-        sig = signature(validator)
-    except ValueError:
-        # builtins and some C extensions don't have signatures
-        # assume that they don't take an info argument and only take a single argument
-        # e.g. `str.strip` or `datetime.datetime`
-        return False
-    n_positional = count_positional_params(sig)
-    if mode == 'wrap':
-        if n_positional == 3:
-            return True
-        elif n_positional == 2:
-            return False
-    else:
-        assert mode in {'before', 'after', 'plain'}, f"invalid mode: {mode!r}, expected 'before', 'after' or 'plain"
-        if n_positional == 2:
-            return True
-        elif n_positional == 1:
-            return False
-
-    raise PydanticUserError(
-        f'Unrecognized field_validator function signature for {validator} with `mode={mode}`:{sig}',
-        code='validator-signature',
-    )
-
-
-def inspect_field_serializer(
-    serializer: Callable[..., Any], mode: Literal['plain', 'wrap'], computed_field: bool = False
-) -> tuple[bool, bool]:
-    """Look at a field serializer function and determine if it is a field serializer,
-    and whether it takes an info argument.
-
-    An error is raised if the function has an invalid signature.
-
-    Args:
-        serializer: The serializer function to inspect.
-        mode: The serializer mode, either 'plain' or 'wrap'.
-        computed_field: When serializer is applied on computed_field. It doesn't require
-            info signature.
-
-    Returns:
-        Tuple of (is_field_serializer, info_arg).
-    """
-    sig = signature(serializer)
-
-    first = next(iter(sig.parameters.values()), None)
-    is_field_serializer = first is not None and first.name == 'self'
-
-    n_positional = count_positional_params(sig)
-    if is_field_serializer:
-        # -1 to correct for self parameter
-        info_arg = _serializer_info_arg(mode, n_positional - 1)
-    else:
-        info_arg = _serializer_info_arg(mode, n_positional)
-
-    if info_arg is None:
-        raise PydanticUserError(
-            f'Unrecognized field_serializer function signature for {serializer} with `mode={mode}`:{sig}',
-            code='field-serializer-signature',
-        )
-    if info_arg and computed_field:
-        raise PydanticUserError(
-            'field_serializer on computed_field does not use info signature', code='field-serializer-signature'
-        )
-
-    else:
-        return is_field_serializer, info_arg
-
-
-def inspect_annotated_serializer(serializer: Callable[..., Any], mode: Literal['plain', 'wrap']) -> bool:
-    """Look at a serializer function used via `Annotated` and determine whether it takes an info argument.
-
-    An error is raised if the function has an invalid signature.
-
-    Args:
-        serializer: The serializer function to check.
-        mode: The serializer mode, either 'plain' or 'wrap'.
-
-    Returns:
-        info_arg
-    """
-    sig = signature(serializer)
-    info_arg = _serializer_info_arg(mode, count_positional_params(sig))
-    if info_arg is None:
-        raise PydanticUserError(
-            f'Unrecognized field_serializer function signature for {serializer} with `mode={mode}`:{sig}',
-            code='field-serializer-signature',
-        )
-    else:
-        return info_arg
-
-
-def inspect_model_serializer(serializer: Callable[..., Any], mode: Literal['plain', 'wrap']) -> bool:
-    """Look at a model serializer function and determine whether it takes an info argument.
-
-    An error is raised if the function has an invalid signature.
-
-    Args:
-        serializer: The serializer function to check.
-        mode: The serializer mode, either 'plain' or 'wrap'.
-
-    Returns:
-        `info_arg` - whether the function expects an info argument.
-    """
-    if isinstance(serializer, (staticmethod, classmethod)) or not is_instance_method_from_sig(serializer):
-        raise PydanticUserError(
-            '`@model_serializer` must be applied to instance methods', code='model-serializer-instance-method'
-        )
-
-    sig = signature(serializer)
-    info_arg = _serializer_info_arg(mode, count_positional_params(sig))
-    if info_arg is None:
-        raise PydanticUserError(
-            f'Unrecognized model_serializer function signature for {serializer} with `mode={mode}`:{sig}',
-            code='model-serializer-signature',
-        )
-    else:
-        return info_arg
-
-
-def _serializer_info_arg(mode: Literal['plain', 'wrap'], n_positional: int) -> bool | None:
-    if mode == 'plain':
-        if n_positional == 1:
-            # (__input_value: Any) -> Any
-            return False
-        elif n_positional == 2:
-            # (__model: Any, __input_value: Any) -> Any
-            return True
-    else:
-        assert mode == 'wrap', f"invalid mode: {mode!r}, expected 'plain' or 'wrap'"
-        if n_positional == 2:
-            # (__input_value: Any, __serializer: SerializerFunctionWrapHandler) -> Any
-            return False
-        elif n_positional == 3:
-            # (__input_value: Any, __serializer: SerializerFunctionWrapHandler, __info: SerializationInfo) -> Any
-            return True
-
-    return None
-
-
-AnyDecoratorCallable: TypeAlias = (
-    'Union[classmethod[Any, Any, Any], staticmethod[Any, Any], partialmethod[Any], Callable[..., Any]]'
-)
-
-
-def is_instance_method_from_sig(function: AnyDecoratorCallable) -> bool:
-    """Whether the function is an instance method.
-
-    It will consider a function as instance method if the first parameter of
-    function is `self`.
-
-    Args:
-        function: The function to check.
-
-    Returns:
-        `True` if the function is an instance method, `False` otherwise.
-    """
-    sig = signature(unwrap_wrapped_function(function))
-    first = next(iter(sig.parameters.values()), None)
-    if first and first.name == 'self':
-        return True
-    return False
-
-
-def ensure_classmethod_based_on_signature(function: AnyDecoratorCallable) -> Any:
-    """Apply the `@classmethod` decorator on the function.
-
-    Args:
-        function: The function to apply the decorator on.
-
-    Return:
-        The `@classmethod` decorator applied function.
-    """
-    if not isinstance(
-        unwrap_wrapped_function(function, unwrap_class_static_method=False), classmethod
-    ) and _is_classmethod_from_sig(function):
-        return classmethod(function)  # type: ignore[arg-type]
-    return function
-
-
-def _is_classmethod_from_sig(function: AnyDecoratorCallable) -> bool:
-    sig = signature(unwrap_wrapped_function(function))
-    first = next(iter(sig.parameters.values()), None)
-    if first and first.name == 'cls':
-        return True
-    return False
-
-
-def unwrap_wrapped_function(
-    func: Any,
-    *,
-    unwrap_partial: bool = True,
-    unwrap_class_static_method: bool = True,
-) -> Any:
-    """Recursively unwraps a wrapped function until the underlying function is reached.
-    This handles property, functools.partial, functools.partialmethod, staticmethod and classmethod.
-
-    Args:
-        func: The function to unwrap.
-        unwrap_partial: If True (default), unwrap partial and partialmethod decorators, otherwise don't.
-            decorators.
-        unwrap_class_static_method: If True (default), also unwrap classmethod and staticmethod
-            decorators. If False, only unwrap partial and partialmethod decorators.
-
-    Returns:
-        The underlying function of the wrapped function.
-    """
-    all: set[Any] = {property, cached_property}
-
-    if unwrap_partial:
-        all.update({partial, partialmethod})
-
-    if unwrap_class_static_method:
-        all.update({staticmethod, classmethod})
-
-    while isinstance(func, tuple(all)):
-        if unwrap_class_static_method and isinstance(func, (classmethod, staticmethod)):
-            func = func.__func__
-        elif isinstance(func, (partial, partialmethod)):
-            func = func.func
-        elif isinstance(func, property):
-            func = func.fget  # arbitrary choice, convenient for computed fields
-        else:
-            # Make coverage happy as it can only get here in the last possible case
-            assert isinstance(func, cached_property)
-            func = func.func  # type: ignore
-
-    return func
-
-
-def get_function_return_type(
-    func: Any, explicit_return_type: Any, types_namespace: dict[str, Any] | None = None
-) -> Any:
-    """Get the function return type.
-
-    It gets the return type from the type annotation if `explicit_return_type` is `None`.
-    Otherwise, it returns `explicit_return_type`.
-
-    Args:
-        func: The function to get its return type.
-        explicit_return_type: The explicit return type.
-        types_namespace: The types namespace, defaults to `None`.
-
-    Returns:
-        The function return type.
-    """
-    if explicit_return_type is PydanticUndefined:
-        # try to get it from the type annotation
-        hints = get_function_type_hints(
-            unwrap_wrapped_function(func), include_keys={'return'}, types_namespace=types_namespace
-        )
-        return hints.get('return', PydanticUndefined)
-    else:
-        return explicit_return_type
-
-
-def count_positional_params(sig: Signature) -> int:
-    return sum(1 for param in sig.parameters.values() if can_be_positional(param))
-
-
-def can_be_positional(param: Parameter) -> bool:
-    return param.kind in (Parameter.POSITIONAL_ONLY, Parameter.POSITIONAL_OR_KEYWORD)
-
-
-def ensure_property(f: Any) -> Any:
-    """Ensure that a function is a `property` or `cached_property`, or is a valid descriptor.
-
-    Args:
-        f: The function to check.
-
-    Returns:
-        The function, or a `property` or `cached_property` instance wrapping the function.
-    """
-    if ismethoddescriptor(f) or isdatadescriptor(f):
-        return f
-    else:
-        return property(f)
diff --git a/lib/pydantic/_internal/_decorators_v1.py b/lib/pydantic/_internal/_decorators_v1.py
deleted file mode 100644
index 4f81e6d4..00000000
--- a/lib/pydantic/_internal/_decorators_v1.py
+++ /dev/null
@@ -1,181 +0,0 @@
-"""Logic for V1 validators, e.g. `@validator` and `@root_validator`."""
-from __future__ import annotations as _annotations
-
-from inspect import Parameter, signature
-from typing import Any, Dict, Tuple, Union, cast
-
-from pydantic_core import core_schema
-from typing_extensions import Protocol
-
-from ..errors import PydanticUserError
-from ._decorators import can_be_positional
-
-
-class V1OnlyValueValidator(Protocol):
-    """A simple validator, supported for V1 validators and V2 validators."""
-
-    def __call__(self, __value: Any) -> Any:
-        ...
-
-
-class V1ValidatorWithValues(Protocol):
-    """A validator with `values` argument, supported for V1 validators and V2 validators."""
-
-    def __call__(self, __value: Any, values: dict[str, Any]) -> Any:
-        ...
-
-
-class V1ValidatorWithValuesKwOnly(Protocol):
-    """A validator with keyword only `values` argument, supported for V1 validators and V2 validators."""
-
-    def __call__(self, __value: Any, *, values: dict[str, Any]) -> Any:
-        ...
-
-
-class V1ValidatorWithKwargs(Protocol):
-    """A validator with `kwargs` argument, supported for V1 validators and V2 validators."""
-
-    def __call__(self, __value: Any, **kwargs: Any) -> Any:
-        ...
-
-
-class V1ValidatorWithValuesAndKwargs(Protocol):
-    """A validator with `values` and `kwargs` arguments, supported for V1 validators and V2 validators."""
-
-    def __call__(self, __value: Any, values: dict[str, Any], **kwargs: Any) -> Any:
-        ...
-
-
-V1Validator = Union[
-    V1ValidatorWithValues, V1ValidatorWithValuesKwOnly, V1ValidatorWithKwargs, V1ValidatorWithValuesAndKwargs
-]
-
-
-def can_be_keyword(param: Parameter) -> bool:
-    return param.kind in (Parameter.POSITIONAL_OR_KEYWORD, Parameter.KEYWORD_ONLY)
-
-
-def make_generic_v1_field_validator(validator: V1Validator) -> core_schema.WithInfoValidatorFunction:
-    """Wrap a V1 style field validator for V2 compatibility.
-
-    Args:
-        validator: The V1 style field validator.
-
-    Returns:
-        A wrapped V2 style field validator.
-
-    Raises:
-        PydanticUserError: If the signature is not supported or the parameters are
-            not available in Pydantic V2.
-    """
-    sig = signature(validator)
-
-    needs_values_kw = False
-
-    for param_num, (param_name, parameter) in enumerate(sig.parameters.items()):
-        if can_be_keyword(parameter) and param_name in ('field', 'config'):
-            raise PydanticUserError(
-                'The `field` and `config` parameters are not available in Pydantic V2, '
-                'please use the `info` parameter instead.',
-                code='validator-field-config-info',
-            )
-        if parameter.kind is Parameter.VAR_KEYWORD:
-            needs_values_kw = True
-        elif can_be_keyword(parameter) and param_name == 'values':
-            needs_values_kw = True
-        elif can_be_positional(parameter) and param_num == 0:
-            # value
-            continue
-        elif parameter.default is Parameter.empty:  # ignore params with defaults e.g. bound by functools.partial
-            raise PydanticUserError(
-                f'Unsupported signature for V1 style validator {validator}: {sig} is not supported.',
-                code='validator-v1-signature',
-            )
-
-    if needs_values_kw:
-        # (v, **kwargs), (v, values, **kwargs), (v, *, values, **kwargs) or (v, *, values)
-        val1 = cast(V1ValidatorWithValues, validator)
-
-        def wrapper1(value: Any, info: core_schema.ValidationInfo) -> Any:
-            return val1(value, values=info.data)
-
-        return wrapper1
-    else:
-        val2 = cast(V1OnlyValueValidator, validator)
-
-        def wrapper2(value: Any, _: core_schema.ValidationInfo) -> Any:
-            return val2(value)
-
-        return wrapper2
-
-
-RootValidatorValues = Dict[str, Any]
-# technically tuple[model_dict, model_extra, fields_set] | tuple[dataclass_dict, init_vars]
-RootValidatorFieldsTuple = Tuple[Any, ...]
-
-
-class V1RootValidatorFunction(Protocol):
-    """A simple root validator, supported for V1 validators and V2 validators."""
-
-    def __call__(self, __values: RootValidatorValues) -> RootValidatorValues:
-        ...
-
-
-class V2CoreBeforeRootValidator(Protocol):
-    """V2 validator with mode='before'."""
-
-    def __call__(self, __values: RootValidatorValues, __info: core_schema.ValidationInfo) -> RootValidatorValues:
-        ...
-
-
-class V2CoreAfterRootValidator(Protocol):
-    """V2 validator with mode='after'."""
-
-    def __call__(
-        self, __fields_tuple: RootValidatorFieldsTuple, __info: core_schema.ValidationInfo
-    ) -> RootValidatorFieldsTuple:
-        ...
-
-
-def make_v1_generic_root_validator(
-    validator: V1RootValidatorFunction, pre: bool
-) -> V2CoreBeforeRootValidator | V2CoreAfterRootValidator:
-    """Wrap a V1 style root validator for V2 compatibility.
-
-    Args:
-        validator: The V1 style field validator.
-        pre: Whether the validator is a pre validator.
-
-    Returns:
-        A wrapped V2 style validator.
-    """
-    if pre is True:
-        # mode='before' for pydantic-core
-        def _wrapper1(values: RootValidatorValues, _: core_schema.ValidationInfo) -> RootValidatorValues:
-            return validator(values)
-
-        return _wrapper1
-
-    # mode='after' for pydantic-core
-    def _wrapper2(fields_tuple: RootValidatorFieldsTuple, _: core_schema.ValidationInfo) -> RootValidatorFieldsTuple:
-        if len(fields_tuple) == 2:
-            # dataclass, this is easy
-            values, init_vars = fields_tuple
-            values = validator(values)
-            return values, init_vars
-        else:
-            # ugly hack: to match v1 behaviour, we merge values and model_extra, then split them up based on fields
-            # afterwards
-            model_dict, model_extra, fields_set = fields_tuple
-            if model_extra:
-                fields = set(model_dict.keys())
-                model_dict.update(model_extra)
-                model_dict_new = validator(model_dict)
-                for k in list(model_dict_new.keys()):
-                    if k not in fields:
-                        model_extra[k] = model_dict_new.pop(k)
-            else:
-                model_dict_new = validator(model_dict)
-            return model_dict_new, model_extra, fields_set
-
-    return _wrapper2
diff --git a/lib/pydantic/_internal/_discriminated_union.py b/lib/pydantic/_internal/_discriminated_union.py
deleted file mode 100644
index c40117d3..00000000
--- a/lib/pydantic/_internal/_discriminated_union.py
+++ /dev/null
@@ -1,506 +0,0 @@
-from __future__ import annotations as _annotations
-
-from typing import TYPE_CHECKING, Any, Hashable, Sequence
-
-from pydantic_core import CoreSchema, core_schema
-
-from ..errors import PydanticUserError
-from . import _core_utils
-from ._core_utils import (
-    CoreSchemaField,
-    collect_definitions,
-    simplify_schema_references,
-)
-
-if TYPE_CHECKING:
-    from ..types import Discriminator
-
-CORE_SCHEMA_METADATA_DISCRIMINATOR_PLACEHOLDER_KEY = 'pydantic.internal.union_discriminator'
-
-
-class MissingDefinitionForUnionRef(Exception):
-    """Raised when applying a discriminated union discriminator to a schema
-    requires a definition that is not yet defined
-    """
-
-    def __init__(self, ref: str) -> None:
-        self.ref = ref
-        super().__init__(f'Missing definition for ref {self.ref!r}')
-
-
-def set_discriminator_in_metadata(schema: CoreSchema, discriminator: Any) -> None:
-    schema.setdefault('metadata', {})
-    metadata = schema.get('metadata')
-    assert metadata is not None
-    metadata[CORE_SCHEMA_METADATA_DISCRIMINATOR_PLACEHOLDER_KEY] = discriminator
-
-
-def apply_discriminators(schema: core_schema.CoreSchema) -> core_schema.CoreSchema:
-    definitions: dict[str, CoreSchema] | None = None
-
-    def inner(s: core_schema.CoreSchema, recurse: _core_utils.Recurse) -> core_schema.CoreSchema:
-        nonlocal definitions
-
-        s = recurse(s, inner)
-        if s['type'] == 'tagged-union':
-            return s
-
-        metadata = s.get('metadata', {})
-        discriminator = metadata.pop(CORE_SCHEMA_METADATA_DISCRIMINATOR_PLACEHOLDER_KEY, None)
-        if discriminator is not None:
-            if definitions is None:
-                definitions = collect_definitions(schema)
-            s = apply_discriminator(s, discriminator, definitions)
-        return s
-
-    return simplify_schema_references(_core_utils.walk_core_schema(schema, inner))
-
-
-def apply_discriminator(
-    schema: core_schema.CoreSchema,
-    discriminator: str | Discriminator,
-    definitions: dict[str, core_schema.CoreSchema] | None = None,
-) -> core_schema.CoreSchema:
-    """Applies the discriminator and returns a new core schema.
-
-    Args:
-        schema: The input schema.
-        discriminator: The name of the field which will serve as the discriminator.
-        definitions: A mapping of schema ref to schema.
-
-    Returns:
-        The new core schema.
-
-    Raises:
-        TypeError:
-            - If `discriminator` is used with invalid union variant.
-            - If `discriminator` is used with `Union` type with one variant.
-            - If `discriminator` value mapped to multiple choices.
-        MissingDefinitionForUnionRef:
-            If the definition for ref is missing.
-        PydanticUserError:
-            - If a model in union doesn't have a discriminator field.
-            - If discriminator field has a non-string alias.
-            - If discriminator fields have different aliases.
-            - If discriminator field not of type `Literal`.
-    """
-    from ..types import Discriminator
-
-    if isinstance(discriminator, Discriminator):
-        if isinstance(discriminator.discriminator, str):
-            discriminator = discriminator.discriminator
-        else:
-            return discriminator._convert_schema(schema)
-
-    return _ApplyInferredDiscriminator(discriminator, definitions or {}).apply(schema)
-
-
-class _ApplyInferredDiscriminator:
-    """This class is used to convert an input schema containing a union schema into one where that union is
-    replaced with a tagged-union, with all the associated debugging and performance benefits.
-
-    This is done by:
-    * Validating that the input schema is compatible with the provided discriminator
-    * Introspecting the schema to determine which discriminator values should map to which union choices
-    * Handling various edge cases such as 'definitions', 'default', 'nullable' schemas, and more
-
-    I have chosen to implement the conversion algorithm in this class, rather than a function,
-    to make it easier to maintain state while recursively walking the provided CoreSchema.
-    """
-
-    def __init__(self, discriminator: str, definitions: dict[str, core_schema.CoreSchema]):
-        # `discriminator` should be the name of the field which will serve as the discriminator.
-        # It must be the python name of the field, and *not* the field's alias. Note that as of now,
-        # all members of a discriminated union _must_ use a field with the same name as the discriminator.
-        # This may change if/when we expose a way to manually specify the TaggedUnionSchema's choices.
-        self.discriminator = discriminator
-
-        # `definitions` should contain a mapping of schema ref to schema for all schemas which might
-        # be referenced by some choice
-        self.definitions = definitions
-
-        # `_discriminator_alias` will hold the value, if present, of the alias for the discriminator
-        #
-        # Note: following the v1 implementation, we currently disallow the use of different aliases
-        # for different choices. This is not a limitation of pydantic_core, but if we try to handle
-        # this, the inference logic gets complicated very quickly, and could result in confusing
-        # debugging challenges for users making subtle mistakes.
-        #
-        # Rather than trying to do the most powerful inference possible, I think we should eventually
-        # expose a way to more-manually control the way the TaggedUnionSchema is constructed through
-        # the use of a new type which would be placed as an Annotation on the Union type. This would
-        # provide the full flexibility/power of pydantic_core's TaggedUnionSchema where necessary for
-        # more complex cases, without over-complicating the inference logic for the common cases.
-        self._discriminator_alias: str | None = None
-
-        # `_should_be_nullable` indicates whether the converted union has `None` as an allowed value.
-        # If `None` is an acceptable value of the (possibly-wrapped) union, we ignore it while
-        # constructing the TaggedUnionSchema, but set the `_should_be_nullable` attribute to True.
-        # Once we have constructed the TaggedUnionSchema, if `_should_be_nullable` is True, we ensure
-        # that the final schema gets wrapped as a NullableSchema. This has the same semantics on the
-        # python side, but resolves the issue that `None` cannot correspond to any discriminator values.
-        self._should_be_nullable = False
-
-        # `_is_nullable` is used to track if the final produced schema will definitely be nullable;
-        # we set it to True if the input schema is wrapped in a nullable schema that we know will be preserved
-        # as an indication that, even if None is discovered as one of the union choices, we will not need to wrap
-        # the final value in another nullable schema.
-        #
-        # This is more complicated than just checking for the final outermost schema having type 'nullable' thanks
-        # to the possible presence of other wrapper schemas such as DefinitionsSchema, WithDefaultSchema, etc.
-        self._is_nullable = False
-
-        # `_choices_to_handle` serves as a stack of choices to add to the tagged union. Initially, choices
-        # from the union in the wrapped schema will be appended to this list, and the recursive choice-handling
-        # algorithm may add more choices to this stack as (nested) unions are encountered.
-        self._choices_to_handle: list[core_schema.CoreSchema] = []
-
-        # `_tagged_union_choices` is built during the call to `apply`, and will hold the choices to be included
-        # in the output TaggedUnionSchema that will replace the union from the input schema
-        self._tagged_union_choices: dict[Hashable, core_schema.CoreSchema] = {}
-
-        # `_used` is changed to True after applying the discriminator to prevent accidental re-use
-        self._used = False
-
-    def apply(self, schema: core_schema.CoreSchema) -> core_schema.CoreSchema:
-        """Return a new CoreSchema based on `schema` that uses a tagged-union with the discriminator provided
-        to this class.
-
-        Args:
-            schema: The input schema.
-
-        Returns:
-            The new core schema.
-
-        Raises:
-            TypeError:
-                - If `discriminator` is used with invalid union variant.
-                - If `discriminator` is used with `Union` type with one variant.
-                - If `discriminator` value mapped to multiple choices.
-            ValueError:
-                If the definition for ref is missing.
-            PydanticUserError:
-                - If a model in union doesn't have a discriminator field.
-                - If discriminator field has a non-string alias.
-                - If discriminator fields have different aliases.
-                - If discriminator field not of type `Literal`.
-        """
-        self.definitions.update(collect_definitions(schema))
-        assert not self._used
-        schema = self._apply_to_root(schema)
-        if self._should_be_nullable and not self._is_nullable:
-            schema = core_schema.nullable_schema(schema)
-        self._used = True
-        new_defs = collect_definitions(schema)
-        missing_defs = self.definitions.keys() - new_defs.keys()
-        if missing_defs:
-            schema = core_schema.definitions_schema(schema, [self.definitions[ref] for ref in missing_defs])
-        return schema
-
-    def _apply_to_root(self, schema: core_schema.CoreSchema) -> core_schema.CoreSchema:
-        """This method handles the outer-most stage of recursion over the input schema:
-        unwrapping nullable or definitions schemas, and calling the `_handle_choice`
-        method iteratively on the choices extracted (recursively) from the possibly-wrapped union.
-        """
-        if schema['type'] == 'nullable':
-            self._is_nullable = True
-            wrapped = self._apply_to_root(schema['schema'])
-            nullable_wrapper = schema.copy()
-            nullable_wrapper['schema'] = wrapped
-            return nullable_wrapper
-
-        if schema['type'] == 'definitions':
-            wrapped = self._apply_to_root(schema['schema'])
-            definitions_wrapper = schema.copy()
-            definitions_wrapper['schema'] = wrapped
-            return definitions_wrapper
-
-        if schema['type'] != 'union':
-            # If the schema is not a union, it probably means it just had a single member and
-            # was flattened by pydantic_core.
-            # However, it still may make sense to apply the discriminator to this schema,
-            # as a way to get discriminated-union-style error messages, so we allow this here.
-            schema = core_schema.union_schema([schema])
-
-        # Reverse the choices list before extending the stack so that they get handled in the order they occur
-        choices_schemas = [v[0] if isinstance(v, tuple) else v for v in schema['choices'][::-1]]
-        self._choices_to_handle.extend(choices_schemas)
-        while self._choices_to_handle:
-            choice = self._choices_to_handle.pop()
-            self._handle_choice(choice)
-
-        if self._discriminator_alias is not None and self._discriminator_alias != self.discriminator:
-            # * We need to annotate `discriminator` as a union here to handle both branches of this conditional
-            # * We need to annotate `discriminator` as list[list[str | int]] and not list[list[str]] due to the
-            #   invariance of list, and because list[list[str | int]] is the type of the discriminator argument
-            #   to tagged_union_schema below
-            # * See the docstring of pydantic_core.core_schema.tagged_union_schema for more details about how to
-            #   interpret the value of the discriminator argument to tagged_union_schema. (The list[list[str]] here
-            #   is the appropriate way to provide a list of fallback attributes to check for a discriminator value.)
-            discriminator: str | list[list[str | int]] = [[self.discriminator], [self._discriminator_alias]]
-        else:
-            discriminator = self.discriminator
-        return core_schema.tagged_union_schema(
-            choices=self._tagged_union_choices,
-            discriminator=discriminator,
-            custom_error_type=schema.get('custom_error_type'),
-            custom_error_message=schema.get('custom_error_message'),
-            custom_error_context=schema.get('custom_error_context'),
-            strict=False,
-            from_attributes=True,
-            ref=schema.get('ref'),
-            metadata=schema.get('metadata'),
-            serialization=schema.get('serialization'),
-        )
-
-    def _handle_choice(self, choice: core_schema.CoreSchema) -> None:
-        """This method handles the "middle" stage of recursion over the input schema.
-        Specifically, it is responsible for handling each choice of the outermost union
-        (and any "coalesced" choices obtained from inner unions).
-
-        Here, "handling" entails:
-        * Coalescing nested unions and compatible tagged-unions
-        * Tracking the presence of 'none' and 'nullable' schemas occurring as choices
-        * Validating that each allowed discriminator value maps to a unique choice
-        * Updating the _tagged_union_choices mapping that will ultimately be used to build the TaggedUnionSchema.
-        """
-        if choice['type'] == 'definition-ref':
-            if choice['schema_ref'] not in self.definitions:
-                raise MissingDefinitionForUnionRef(choice['schema_ref'])
-
-        if choice['type'] == 'none':
-            self._should_be_nullable = True
-        elif choice['type'] == 'definitions':
-            self._handle_choice(choice['schema'])
-        elif choice['type'] == 'nullable':
-            self._should_be_nullable = True
-            self._handle_choice(choice['schema'])  # unwrap the nullable schema
-        elif choice['type'] == 'union':
-            # Reverse the choices list before extending the stack so that they get handled in the order they occur
-            choices_schemas = [v[0] if isinstance(v, tuple) else v for v in choice['choices'][::-1]]
-            self._choices_to_handle.extend(choices_schemas)
-        elif choice['type'] not in {
-            'model',
-            'typed-dict',
-            'tagged-union',
-            'lax-or-strict',
-            'dataclass',
-            'dataclass-args',
-            'definition-ref',
-        } and not _core_utils.is_function_with_inner_schema(choice):
-            # We should eventually handle 'definition-ref' as well
-            raise TypeError(
-                f'{choice["type"]!r} is not a valid discriminated union variant;'
-                ' should be a `BaseModel` or `dataclass`'
-            )
-        else:
-            if choice['type'] == 'tagged-union' and self._is_discriminator_shared(choice):
-                # In this case, this inner tagged-union is compatible with the outer tagged-union,
-                # and its choices can be coalesced into the outer TaggedUnionSchema.
-                subchoices = [x for x in choice['choices'].values() if not isinstance(x, (str, int))]
-                # Reverse the choices list before extending the stack so that they get handled in the order they occur
-                self._choices_to_handle.extend(subchoices[::-1])
-                return
-
-            inferred_discriminator_values = self._infer_discriminator_values_for_choice(choice, source_name=None)
-            self._set_unique_choice_for_values(choice, inferred_discriminator_values)
-
-    def _is_discriminator_shared(self, choice: core_schema.TaggedUnionSchema) -> bool:
-        """This method returns a boolean indicating whether the discriminator for the `choice`
-        is the same as that being used for the outermost tagged union. This is used to
-        determine whether this TaggedUnionSchema choice should be "coalesced" into the top level,
-        or whether it should be treated as a separate (nested) choice.
-        """
-        inner_discriminator = choice['discriminator']
-        return inner_discriminator == self.discriminator or (
-            isinstance(inner_discriminator, list)
-            and (self.discriminator in inner_discriminator or [self.discriminator] in inner_discriminator)
-        )
-
-    def _infer_discriminator_values_for_choice(  # noqa C901
-        self, choice: core_schema.CoreSchema, source_name: str | None
-    ) -> list[str | int]:
-        """This function recurses over `choice`, extracting all discriminator values that should map to this choice.
-
-        `model_name` is accepted for the purpose of producing useful error messages.
-        """
-        if choice['type'] == 'definitions':
-            return self._infer_discriminator_values_for_choice(choice['schema'], source_name=source_name)
-        elif choice['type'] == 'function-plain':
-            raise TypeError(
-                f'{choice["type"]!r} is not a valid discriminated union variant;'
-                ' should be a `BaseModel` or `dataclass`'
-            )
-        elif _core_utils.is_function_with_inner_schema(choice):
-            return self._infer_discriminator_values_for_choice(choice['schema'], source_name=source_name)
-        elif choice['type'] == 'lax-or-strict':
-            return sorted(
-                set(
-                    self._infer_discriminator_values_for_choice(choice['lax_schema'], source_name=None)
-                    + self._infer_discriminator_values_for_choice(choice['strict_schema'], source_name=None)
-                )
-            )
-
-        elif choice['type'] == 'tagged-union':
-            values: list[str | int] = []
-            # Ignore str/int "choices" since these are just references to other choices
-            subchoices = [x for x in choice['choices'].values() if not isinstance(x, (str, int))]
-            for subchoice in subchoices:
-                subchoice_values = self._infer_discriminator_values_for_choice(subchoice, source_name=None)
-                values.extend(subchoice_values)
-            return values
-
-        elif choice['type'] == 'union':
-            values = []
-            for subchoice in choice['choices']:
-                subchoice_schema = subchoice[0] if isinstance(subchoice, tuple) else subchoice
-                subchoice_values = self._infer_discriminator_values_for_choice(subchoice_schema, source_name=None)
-                values.extend(subchoice_values)
-            return values
-
-        elif choice['type'] == 'nullable':
-            self._should_be_nullable = True
-            return self._infer_discriminator_values_for_choice(choice['schema'], source_name=None)
-
-        elif choice['type'] == 'model':
-            return self._infer_discriminator_values_for_choice(choice['schema'], source_name=choice['cls'].__name__)
-
-        elif choice['type'] == 'dataclass':
-            return self._infer_discriminator_values_for_choice(choice['schema'], source_name=choice['cls'].__name__)
-
-        elif choice['type'] == 'model-fields':
-            return self._infer_discriminator_values_for_model_choice(choice, source_name=source_name)
-
-        elif choice['type'] == 'dataclass-args':
-            return self._infer_discriminator_values_for_dataclass_choice(choice, source_name=source_name)
-
-        elif choice['type'] == 'typed-dict':
-            return self._infer_discriminator_values_for_typed_dict_choice(choice, source_name=source_name)
-
-        elif choice['type'] == 'definition-ref':
-            schema_ref = choice['schema_ref']
-            if schema_ref not in self.definitions:
-                raise MissingDefinitionForUnionRef(schema_ref)
-            return self._infer_discriminator_values_for_choice(self.definitions[schema_ref], source_name=source_name)
-        else:
-            raise TypeError(
-                f'{choice["type"]!r} is not a valid discriminated union variant;'
-                ' should be a `BaseModel` or `dataclass`'
-            )
-
-    def _infer_discriminator_values_for_typed_dict_choice(
-        self, choice: core_schema.TypedDictSchema, source_name: str | None = None
-    ) -> list[str | int]:
-        """This method just extracts the _infer_discriminator_values_for_choice logic specific to TypedDictSchema
-        for the sake of readability.
-        """
-        source = 'TypedDict' if source_name is None else f'TypedDict {source_name!r}'
-        field = choice['fields'].get(self.discriminator)
-        if field is None:
-            raise PydanticUserError(
-                f'{source} needs a discriminator field for key {self.discriminator!r}', code='discriminator-no-field'
-            )
-        return self._infer_discriminator_values_for_field(field, source)
-
-    def _infer_discriminator_values_for_model_choice(
-        self, choice: core_schema.ModelFieldsSchema, source_name: str | None = None
-    ) -> list[str | int]:
-        source = 'ModelFields' if source_name is None else f'Model {source_name!r}'
-        field = choice['fields'].get(self.discriminator)
-        if field is None:
-            raise PydanticUserError(
-                f'{source} needs a discriminator field for key {self.discriminator!r}', code='discriminator-no-field'
-            )
-        return self._infer_discriminator_values_for_field(field, source)
-
-    def _infer_discriminator_values_for_dataclass_choice(
-        self, choice: core_schema.DataclassArgsSchema, source_name: str | None = None
-    ) -> list[str | int]:
-        source = 'DataclassArgs' if source_name is None else f'Dataclass {source_name!r}'
-        for field in choice['fields']:
-            if field['name'] == self.discriminator:
-                break
-        else:
-            raise PydanticUserError(
-                f'{source} needs a discriminator field for key {self.discriminator!r}', code='discriminator-no-field'
-            )
-        return self._infer_discriminator_values_for_field(field, source)
-
-    def _infer_discriminator_values_for_field(self, field: CoreSchemaField, source: str) -> list[str | int]:
-        if field['type'] == 'computed-field':
-            # This should never occur as a discriminator, as it is only relevant to serialization
-            return []
-        alias = field.get('validation_alias', self.discriminator)
-        if not isinstance(alias, str):
-            raise PydanticUserError(
-                f'Alias {alias!r} is not supported in a discriminated union', code='discriminator-alias-type'
-            )
-        if self._discriminator_alias is None:
-            self._discriminator_alias = alias
-        elif self._discriminator_alias != alias:
-            raise PydanticUserError(
-                f'Aliases for discriminator {self.discriminator!r} must be the same '
-                f'(got {alias}, {self._discriminator_alias})',
-                code='discriminator-alias',
-            )
-        return self._infer_discriminator_values_for_inner_schema(field['schema'], source)
-
-    def _infer_discriminator_values_for_inner_schema(
-        self, schema: core_schema.CoreSchema, source: str
-    ) -> list[str | int]:
-        """When inferring discriminator values for a field, we typically extract the expected values from a literal
-        schema. This function does that, but also handles nested unions and defaults.
-        """
-        if schema['type'] == 'literal':
-            return schema['expected']
-
-        elif schema['type'] == 'union':
-            # Generally when multiple values are allowed they should be placed in a single `Literal`, but
-            # we add this case to handle the situation where a field is annotated as a `Union` of `Literal`s.
-            # For example, this lets us handle `Union[Literal['key'], Union[Literal['Key'], Literal['KEY']]]`
-            values: list[Any] = []
-            for choice in schema['choices']:
-                choice_schema = choice[0] if isinstance(choice, tuple) else choice
-                choice_values = self._infer_discriminator_values_for_inner_schema(choice_schema, source)
-                values.extend(choice_values)
-            return values
-
-        elif schema['type'] == 'default':
-            # This will happen if the field has a default value; we ignore it while extracting the discriminator values
-            return self._infer_discriminator_values_for_inner_schema(schema['schema'], source)
-
-        elif schema['type'] == 'function-after':
-            # After validators don't affect the discriminator values
-            return self._infer_discriminator_values_for_inner_schema(schema['schema'], source)
-
-        elif schema['type'] in {'function-before', 'function-wrap', 'function-plain'}:
-            validator_type = repr(schema['type'].split('-')[1])
-            raise PydanticUserError(
-                f'Cannot use a mode={validator_type} validator in the'
-                f' discriminator field {self.discriminator!r} of {source}',
-                code='discriminator-validator',
-            )
-
-        else:
-            raise PydanticUserError(
-                f'{source} needs field {self.discriminator!r} to be of type `Literal`',
-                code='discriminator-needs-literal',
-            )
-
-    def _set_unique_choice_for_values(self, choice: core_schema.CoreSchema, values: Sequence[str | int]) -> None:
-        """This method updates `self.tagged_union_choices` so that all provided (discriminator) `values` map to the
-        provided `choice`, validating that none of these values already map to another (different) choice.
-        """
-        for discriminator_value in values:
-            if discriminator_value in self._tagged_union_choices:
-                # It is okay if `value` is already in tagged_union_choices as long as it maps to the same value.
-                # Because tagged_union_choices may map values to other values, we need to walk the choices dict
-                # until we get to a "real" choice, and confirm that is equal to the one assigned.
-                existing_choice = self._tagged_union_choices[discriminator_value]
-                if existing_choice != choice:
-                    raise TypeError(
-                        f'Value {discriminator_value!r} for discriminator '
-                        f'{self.discriminator!r} mapped to multiple choices'
-                    )
-            else:
-                self._tagged_union_choices[discriminator_value] = choice
diff --git a/lib/pydantic/_internal/_fields.py b/lib/pydantic/_internal/_fields.py
deleted file mode 100644
index 94de3062..00000000
--- a/lib/pydantic/_internal/_fields.py
+++ /dev/null
@@ -1,319 +0,0 @@
-"""Private logic related to fields (the `Field()` function and `FieldInfo` class), and arguments to `Annotated`."""
-from __future__ import annotations as _annotations
-
-import dataclasses
-import sys
-import warnings
-from copy import copy
-from functools import lru_cache
-from typing import TYPE_CHECKING, Any
-
-from pydantic_core import PydanticUndefined
-
-from pydantic.errors import PydanticUserError
-
-from . import _typing_extra
-from ._config import ConfigWrapper
-from ._repr import Representation
-from ._typing_extra import get_cls_type_hints_lenient, get_type_hints, is_classvar, is_finalvar
-
-if TYPE_CHECKING:
-    from annotated_types import BaseMetadata
-
-    from ..fields import FieldInfo
-    from ..main import BaseModel
-    from ._dataclasses import StandardDataclass
-    from ._decorators import DecoratorInfos
-
-
-def get_type_hints_infer_globalns(
-    obj: Any,
-    localns: dict[str, Any] | None = None,
-    include_extras: bool = False,
-) -> dict[str, Any]:
-    """Gets type hints for an object by inferring the global namespace.
-
-    It uses the `typing.get_type_hints`, The only thing that we do here is fetching
-    global namespace from `obj.__module__` if it is not `None`.
-
-    Args:
-        obj: The object to get its type hints.
-        localns: The local namespaces.
-        include_extras: Whether to recursively include annotation metadata.
-
-    Returns:
-        The object type hints.
-    """
-    module_name = getattr(obj, '__module__', None)
-    globalns: dict[str, Any] | None = None
-    if module_name:
-        try:
-            globalns = sys.modules[module_name].__dict__
-        except KeyError:
-            # happens occasionally, see https://github.com/pydantic/pydantic/issues/2363
-            pass
-    return get_type_hints(obj, globalns=globalns, localns=localns, include_extras=include_extras)
-
-
-class PydanticMetadata(Representation):
-    """Base class for annotation markers like `Strict`."""
-
-    __slots__ = ()
-
-
-def pydantic_general_metadata(**metadata: Any) -> BaseMetadata:
-    """Create a new `_PydanticGeneralMetadata` class with the given metadata.
-
-    Args:
-        **metadata: The metadata to add.
-
-    Returns:
-        The new `_PydanticGeneralMetadata` class.
-    """
-    return _general_metadata_cls()(metadata)  # type: ignore
-
-
-@lru_cache(maxsize=None)
-def _general_metadata_cls() -> type[BaseMetadata]:
-    """Do it this way to avoid importing `annotated_types` at import time."""
-    from annotated_types import BaseMetadata
-
-    class _PydanticGeneralMetadata(PydanticMetadata, BaseMetadata):
-        """Pydantic general metadata like `max_digits`."""
-
-        def __init__(self, metadata: Any):
-            self.__dict__ = metadata
-
-    return _PydanticGeneralMetadata  # type: ignore
-
-
-def collect_model_fields(  # noqa: C901
-    cls: type[BaseModel],
-    bases: tuple[type[Any], ...],
-    config_wrapper: ConfigWrapper,
-    types_namespace: dict[str, Any] | None,
-    *,
-    typevars_map: dict[Any, Any] | None = None,
-) -> tuple[dict[str, FieldInfo], set[str]]:
-    """Collect the fields of a nascent pydantic model.
-
-    Also collect the names of any ClassVars present in the type hints.
-
-    The returned value is a tuple of two items: the fields dict, and the set of ClassVar names.
-
-    Args:
-        cls: BaseModel or dataclass.
-        bases: Parents of the class, generally `cls.__bases__`.
-        config_wrapper: The config wrapper instance.
-        types_namespace: Optional extra namespace to look for types in.
-        typevars_map: A dictionary mapping type variables to their concrete types.
-
-    Returns:
-        A tuple contains fields and class variables.
-
-    Raises:
-        NameError:
-            - If there is a conflict between a field name and protected namespaces.
-            - If there is a field other than `root` in `RootModel`.
-            - If a field shadows an attribute in the parent model.
-    """
-    from ..fields import FieldInfo
-
-    type_hints = get_cls_type_hints_lenient(cls, types_namespace)
-
-    # https://docs.python.org/3/howto/annotations.html#accessing-the-annotations-dict-of-an-object-in-python-3-9-and-older
-    # annotations is only used for finding fields in parent classes
-    annotations = cls.__dict__.get('__annotations__', {})
-    fields: dict[str, FieldInfo] = {}
-
-    class_vars: set[str] = set()
-    for ann_name, ann_type in type_hints.items():
-        if ann_name == 'model_config':
-            # We never want to treat `model_config` as a field
-            # Note: we may need to change this logic if/when we introduce a `BareModel` class with no
-            # protected namespaces (where `model_config` might be allowed as a field name)
-            continue
-        for protected_namespace in config_wrapper.protected_namespaces:
-            if ann_name.startswith(protected_namespace):
-                for b in bases:
-                    if hasattr(b, ann_name):
-                        from ..main import BaseModel
-
-                        if not (issubclass(b, BaseModel) and ann_name in b.model_fields):
-                            raise NameError(
-                                f'Field "{ann_name}" conflicts with member {getattr(b, ann_name)}'
-                                f' of protected namespace "{protected_namespace}".'
-                            )
-                else:
-                    valid_namespaces = tuple(
-                        x for x in config_wrapper.protected_namespaces if not ann_name.startswith(x)
-                    )
-                    warnings.warn(
-                        f'Field "{ann_name}" has conflict with protected namespace "{protected_namespace}".'
-                        '\n\nYou may be able to resolve this warning by setting'
-                        f" `model_config['protected_namespaces'] = {valid_namespaces}`.",
-                        UserWarning,
-                    )
-        if is_classvar(ann_type):
-            class_vars.add(ann_name)
-            continue
-        if _is_finalvar_with_default_val(ann_type, getattr(cls, ann_name, PydanticUndefined)):
-            class_vars.add(ann_name)
-            continue
-        if not is_valid_field_name(ann_name):
-            continue
-        if cls.__pydantic_root_model__ and ann_name != 'root':
-            raise NameError(
-                f"Unexpected field with name {ann_name!r}; only 'root' is allowed as a field of a `RootModel`"
-            )
-
-        # when building a generic model with `MyModel[int]`, the generic_origin check makes sure we don't get
-        # "... shadows an attribute" errors
-        generic_origin = getattr(cls, '__pydantic_generic_metadata__', {}).get('origin')
-        for base in bases:
-            dataclass_fields = {
-                field.name for field in (dataclasses.fields(base) if dataclasses.is_dataclass(base) else ())
-            }
-            if hasattr(base, ann_name):
-                if base is generic_origin:
-                    # Don't error when "shadowing" of attributes in parametrized generics
-                    continue
-
-                if ann_name in dataclass_fields:
-                    # Don't error when inheriting stdlib dataclasses whose fields are "shadowed" by defaults being set
-                    # on the class instance.
-                    continue
-                warnings.warn(
-                    f'Field name "{ann_name}" shadows an attribute in parent "{base.__qualname__}"; ',
-                    UserWarning,
-                )
-
-        try:
-            default = getattr(cls, ann_name, PydanticUndefined)
-            if default is PydanticUndefined:
-                raise AttributeError
-        except AttributeError:
-            if ann_name in annotations:
-                field_info = FieldInfo.from_annotation(ann_type)
-            else:
-                # if field has no default value and is not in __annotations__ this means that it is
-                # defined in a base class and we can take it from there
-                model_fields_lookup: dict[str, FieldInfo] = {}
-                for x in cls.__bases__[::-1]:
-                    model_fields_lookup.update(getattr(x, 'model_fields', {}))
-                if ann_name in model_fields_lookup:
-                    # The field was present on one of the (possibly multiple) base classes
-                    # copy the field to make sure typevar substitutions don't cause issues with the base classes
-                    field_info = copy(model_fields_lookup[ann_name])
-                else:
-                    # The field was not found on any base classes; this seems to be caused by fields not getting
-                    # generated thanks to models not being fully defined while initializing recursive models.
-                    # Nothing stops us from just creating a new FieldInfo for this type hint, so we do this.
-                    field_info = FieldInfo.from_annotation(ann_type)
-        else:
-            field_info = FieldInfo.from_annotated_attribute(ann_type, default)
-            # attributes which are fields are removed from the class namespace:
-            # 1. To match the behaviour of annotation-only fields
-            # 2. To avoid false positives in the NameError check above
-            try:
-                delattr(cls, ann_name)
-            except AttributeError:
-                pass  # indicates the attribute was on a parent class
-
-        # Use cls.__dict__['__pydantic_decorators__'] instead of cls.__pydantic_decorators__
-        # to make sure the decorators have already been built for this exact class
-        decorators: DecoratorInfos = cls.__dict__['__pydantic_decorators__']
-        if ann_name in decorators.computed_fields:
-            raise ValueError("you can't override a field with a computed field")
-        fields[ann_name] = field_info
-
-    if typevars_map:
-        for field in fields.values():
-            field.apply_typevars_map(typevars_map, types_namespace)
-
-    return fields, class_vars
-
-
-def _is_finalvar_with_default_val(type_: type[Any], val: Any) -> bool:
-    from ..fields import FieldInfo
-
-    if not is_finalvar(type_):
-        return False
-    elif val is PydanticUndefined:
-        return False
-    elif isinstance(val, FieldInfo) and (val.default is PydanticUndefined and val.default_factory is None):
-        return False
-    else:
-        return True
-
-
-def collect_dataclass_fields(
-    cls: type[StandardDataclass], types_namespace: dict[str, Any] | None, *, typevars_map: dict[Any, Any] | None = None
-) -> dict[str, FieldInfo]:
-    """Collect the fields of a dataclass.
-
-    Args:
-        cls: dataclass.
-        types_namespace: Optional extra namespace to look for types in.
-        typevars_map: A dictionary mapping type variables to their concrete types.
-
-    Returns:
-        The dataclass fields.
-    """
-    from ..fields import FieldInfo
-
-    fields: dict[str, FieldInfo] = {}
-    dataclass_fields: dict[str, dataclasses.Field] = cls.__dataclass_fields__
-    cls_localns = dict(vars(cls))  # this matches get_cls_type_hints_lenient, but all tests pass with `= None` instead
-
-    source_module = sys.modules.get(cls.__module__)
-    if source_module is not None:
-        types_namespace = {**source_module.__dict__, **(types_namespace or {})}
-
-    for ann_name, dataclass_field in dataclass_fields.items():
-        ann_type = _typing_extra.eval_type_lenient(dataclass_field.type, types_namespace, cls_localns)
-        if is_classvar(ann_type):
-            continue
-
-        if (
-            not dataclass_field.init
-            and dataclass_field.default == dataclasses.MISSING
-            and dataclass_field.default_factory == dataclasses.MISSING
-        ):
-            # TODO: We should probably do something with this so that validate_assignment behaves properly
-            #   Issue: https://github.com/pydantic/pydantic/issues/5470
-            continue
-
-        if isinstance(dataclass_field.default, FieldInfo):
-            if dataclass_field.default.init_var:
-                if dataclass_field.default.init is False:
-                    raise PydanticUserError(
-                        f'Dataclass field {ann_name} has init=False and init_var=True, but these are mutually exclusive.',
-                        code='clashing-init-and-init-var',
-                    )
-
-                # TODO: same note as above re validate_assignment
-                continue
-            field_info = FieldInfo.from_annotated_attribute(ann_type, dataclass_field.default)
-        else:
-            field_info = FieldInfo.from_annotated_attribute(ann_type, dataclass_field)
-
-        fields[ann_name] = field_info
-
-        if field_info.default is not PydanticUndefined and isinstance(getattr(cls, ann_name, field_info), FieldInfo):
-            # We need this to fix the default when the "default" from __dataclass_fields__ is a pydantic.FieldInfo
-            setattr(cls, ann_name, field_info.default)
-
-    if typevars_map:
-        for field in fields.values():
-            field.apply_typevars_map(typevars_map, types_namespace)
-
-    return fields
-
-
-def is_valid_field_name(name: str) -> bool:
-    return not name.startswith('_')
-
-
-def is_valid_privateattr_name(name: str) -> bool:
-    return name.startswith('_') and not name.startswith('__')
diff --git a/lib/pydantic/_internal/_forward_ref.py b/lib/pydantic/_internal/_forward_ref.py
deleted file mode 100644
index 231f81d1..00000000
--- a/lib/pydantic/_internal/_forward_ref.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from __future__ import annotations as _annotations
-
-from dataclasses import dataclass
-from typing import Union
-
-
-@dataclass
-class PydanticRecursiveRef:
-    type_ref: str
-
-    __name__ = 'PydanticRecursiveRef'
-    __hash__ = object.__hash__
-
-    def __call__(self) -> None:
-        """Defining __call__ is necessary for the `typing` module to let you use an instance of
-        this class as the result of resolving a standard ForwardRef.
-        """
-
-    def __or__(self, other):
-        return Union[self, other]  # type: ignore
-
-    def __ror__(self, other):
-        return Union[other, self]  # type: ignore
diff --git a/lib/pydantic/_internal/_generate_schema.py b/lib/pydantic/_internal/_generate_schema.py
deleted file mode 100644
index 6ab7ec19..00000000
--- a/lib/pydantic/_internal/_generate_schema.py
+++ /dev/null
@@ -1,2231 +0,0 @@
-"""Convert python types to pydantic-core schema."""
-from __future__ import annotations as _annotations
-
-import collections.abc
-import dataclasses
-import inspect
-import re
-import sys
-import typing
-import warnings
-from contextlib import contextmanager
-from copy import copy, deepcopy
-from enum import Enum
-from functools import partial
-from inspect import Parameter, _ParameterKind, signature
-from itertools import chain
-from operator import attrgetter
-from types import FunctionType, LambdaType, MethodType
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Callable,
-    Dict,
-    Final,
-    ForwardRef,
-    Iterable,
-    Iterator,
-    Mapping,
-    Type,
-    TypeVar,
-    Union,
-    cast,
-    overload,
-)
-from warnings import warn
-
-from pydantic_core import CoreSchema, PydanticUndefined, core_schema, to_jsonable_python
-from typing_extensions import Annotated, Literal, TypeAliasType, TypedDict, get_args, get_origin, is_typeddict
-
-from ..aliases import AliasGenerator
-from ..annotated_handlers import GetCoreSchemaHandler, GetJsonSchemaHandler
-from ..config import ConfigDict, JsonDict, JsonEncoder
-from ..errors import PydanticSchemaGenerationError, PydanticUndefinedAnnotation, PydanticUserError
-from ..json_schema import JsonSchemaValue
-from ..version import version_short
-from ..warnings import PydanticDeprecatedSince20
-from . import _core_utils, _decorators, _discriminated_union, _known_annotated_metadata, _typing_extra
-from ._config import ConfigWrapper, ConfigWrapperStack
-from ._core_metadata import CoreMetadataHandler, build_metadata_dict
-from ._core_utils import (
-    CoreSchemaOrField,
-    collect_invalid_schemas,
-    define_expected_missing_refs,
-    get_ref,
-    get_type_ref,
-    is_function_with_inner_schema,
-    is_list_like_schema_with_items_schema,
-    simplify_schema_references,
-    validate_core_schema,
-)
-from ._decorators import (
-    Decorator,
-    DecoratorInfos,
-    FieldSerializerDecoratorInfo,
-    FieldValidatorDecoratorInfo,
-    ModelSerializerDecoratorInfo,
-    ModelValidatorDecoratorInfo,
-    RootValidatorDecoratorInfo,
-    ValidatorDecoratorInfo,
-    get_attribute_from_bases,
-    inspect_field_serializer,
-    inspect_model_serializer,
-    inspect_validator,
-)
-from ._fields import collect_dataclass_fields, get_type_hints_infer_globalns
-from ._forward_ref import PydanticRecursiveRef
-from ._generics import get_standard_typevars_map, has_instance_in_type, recursively_defined_type_refs, replace_types
-from ._schema_generation_shared import (
-    CallbackGetCoreSchemaHandler,
-)
-from ._typing_extra import is_finalvar
-from ._utils import lenient_issubclass
-
-if TYPE_CHECKING:
-    from ..fields import ComputedFieldInfo, FieldInfo
-    from ..main import BaseModel
-    from ..types import Discriminator
-    from ..validators import FieldValidatorModes
-    from ._dataclasses import StandardDataclass
-    from ._schema_generation_shared import GetJsonSchemaFunction
-
-_SUPPORTS_TYPEDDICT = sys.version_info >= (3, 12)
-_AnnotatedType = type(Annotated[int, 123])
-
-FieldDecoratorInfo = Union[ValidatorDecoratorInfo, FieldValidatorDecoratorInfo, FieldSerializerDecoratorInfo]
-FieldDecoratorInfoType = TypeVar('FieldDecoratorInfoType', bound=FieldDecoratorInfo)
-AnyFieldDecorator = Union[
-    Decorator[ValidatorDecoratorInfo],
-    Decorator[FieldValidatorDecoratorInfo],
-    Decorator[FieldSerializerDecoratorInfo],
-]
-
-ModifyCoreSchemaWrapHandler = GetCoreSchemaHandler
-GetCoreSchemaFunction = Callable[[Any, ModifyCoreSchemaWrapHandler], core_schema.CoreSchema]
-
-
-TUPLE_TYPES: list[type] = [tuple, typing.Tuple]
-LIST_TYPES: list[type] = [list, typing.List, collections.abc.MutableSequence]
-SET_TYPES: list[type] = [set, typing.Set, collections.abc.MutableSet]
-FROZEN_SET_TYPES: list[type] = [frozenset, typing.FrozenSet, collections.abc.Set]
-DICT_TYPES: list[type] = [dict, typing.Dict, collections.abc.MutableMapping, collections.abc.Mapping]
-
-
-def check_validator_fields_against_field_name(
-    info: FieldDecoratorInfo,
-    field: str,
-) -> bool:
-    """Check if field name is in validator fields.
-
-    Args:
-        info: The field info.
-        field: The field name to check.
-
-    Returns:
-        `True` if field name is in validator fields, `False` otherwise.
-    """
-    if isinstance(info, (ValidatorDecoratorInfo, FieldValidatorDecoratorInfo)):
-        if '*' in info.fields:
-            return True
-    for v_field_name in info.fields:
-        if v_field_name == field:
-            return True
-    return False
-
-
-def check_decorator_fields_exist(decorators: Iterable[AnyFieldDecorator], fields: Iterable[str]) -> None:
-    """Check if the defined fields in decorators exist in `fields` param.
-
-    It ignores the check for a decorator if the decorator has `*` as field or `check_fields=False`.
-
-    Args:
-        decorators: An iterable of decorators.
-        fields: An iterable of fields name.
-
-    Raises:
-        PydanticUserError: If one of the field names does not exist in `fields` param.
-    """
-    fields = set(fields)
-    for dec in decorators:
-        if isinstance(dec.info, (ValidatorDecoratorInfo, FieldValidatorDecoratorInfo)) and '*' in dec.info.fields:
-            continue
-        if dec.info.check_fields is False:
-            continue
-        for field in dec.info.fields:
-            if field not in fields:
-                raise PydanticUserError(
-                    f'Decorators defined with incorrect fields: {dec.cls_ref}.{dec.cls_var_name}'
-                    " (use check_fields=False if you're inheriting from the model and intended this)",
-                    code='decorator-missing-field',
-                )
-
-
-def filter_field_decorator_info_by_field(
-    validator_functions: Iterable[Decorator[FieldDecoratorInfoType]], field: str
-) -> list[Decorator[FieldDecoratorInfoType]]:
-    return [dec for dec in validator_functions if check_validator_fields_against_field_name(dec.info, field)]
-
-
-def apply_each_item_validators(
-    schema: core_schema.CoreSchema,
-    each_item_validators: list[Decorator[ValidatorDecoratorInfo]],
-    field_name: str | None,
-) -> core_schema.CoreSchema:
-    # This V1 compatibility shim should eventually be removed
-
-    # push down any `each_item=True` validators
-    # note that this won't work for any Annotated types that get wrapped by a function validator
-    # but that's okay because that didn't exist in V1
-    if schema['type'] == 'nullable':
-        schema['schema'] = apply_each_item_validators(schema['schema'], each_item_validators, field_name)
-        return schema
-    elif schema['type'] == 'tuple':
-        if (variadic_item_index := schema.get('variadic_item_index')) is not None:
-            schema['items_schema'][variadic_item_index] = apply_validators(
-                schema['items_schema'][variadic_item_index], each_item_validators, field_name
-            )
-    elif is_list_like_schema_with_items_schema(schema):
-        inner_schema = schema.get('items_schema', None)
-        if inner_schema is None:
-            inner_schema = core_schema.any_schema()
-        schema['items_schema'] = apply_validators(inner_schema, each_item_validators, field_name)
-    elif schema['type'] == 'dict':
-        # push down any `each_item=True` validators onto dict _values_
-        # this is super arbitrary but it's the V1 behavior
-        inner_schema = schema.get('values_schema', None)
-        if inner_schema is None:
-            inner_schema = core_schema.any_schema()
-        schema['values_schema'] = apply_validators(inner_schema, each_item_validators, field_name)
-    elif each_item_validators:
-        raise TypeError(
-            f"`@validator(..., each_item=True)` cannot be applied to fields with a schema of {schema['type']}"
-        )
-    return schema
-
-
-def modify_model_json_schema(
-    schema_or_field: CoreSchemaOrField, handler: GetJsonSchemaHandler, *, cls: Any
-) -> JsonSchemaValue:
-    """Add title and description for model-like classes' JSON schema.
-
-    Args:
-        schema_or_field: The schema data to generate a JSON schema from.
-        handler: The `GetCoreSchemaHandler` instance.
-        cls: The model-like class.
-
-    Returns:
-        JsonSchemaValue: The updated JSON schema.
-    """
-    from ..main import BaseModel
-
-    json_schema = handler(schema_or_field)
-    original_schema = handler.resolve_ref_schema(json_schema)
-    # Preserve the fact that definitions schemas should never have sibling keys:
-    if '$ref' in original_schema:
-        ref = original_schema['$ref']
-        original_schema.clear()
-        original_schema['allOf'] = [{'$ref': ref}]
-    if 'title' not in original_schema:
-        original_schema['title'] = cls.__name__
-    # BaseModel; don't use cls.__doc__ as it will contain the verbose class signature by default
-    docstring = None if cls is BaseModel else cls.__doc__
-    if docstring and 'description' not in original_schema:
-        original_schema['description'] = inspect.cleandoc(docstring)
-    return json_schema
-
-
-JsonEncoders = Dict[Type[Any], JsonEncoder]
-
-
-def _add_custom_serialization_from_json_encoders(
-    json_encoders: JsonEncoders | None, tp: Any, schema: CoreSchema
-) -> CoreSchema:
-    """Iterate over the json_encoders and add the first matching encoder to the schema.
-
-    Args:
-        json_encoders: A dictionary of types and their encoder functions.
-        tp: The type to check for a matching encoder.
-        schema: The schema to add the encoder to.
-    """
-    if not json_encoders:
-        return schema
-    if 'serialization' in schema:
-        return schema
-    # Check the class type and its superclasses for a matching encoder
-    # Decimal.__class__.__mro__ (and probably other cases) doesn't include Decimal itself
-    # if the type is a GenericAlias (e.g. from list[int]) we need to use __class__ instead of .__mro__
-    for base in (tp, *getattr(tp, '__mro__', tp.__class__.__mro__)[:-1]):
-        encoder = json_encoders.get(base)
-        if encoder is None:
-            continue
-
-        warnings.warn(
-            f'`json_encoders` is deprecated. See https://docs.pydantic.dev/{version_short()}/concepts/serialization/#custom-serializers for alternatives',
-            PydanticDeprecatedSince20,
-        )
-
-        # TODO: in theory we should check that the schema accepts a serialization key
-        schema['serialization'] = core_schema.plain_serializer_function_ser_schema(encoder, when_used='json')
-        return schema
-
-    return schema
-
-
-TypesNamespace = Union[Dict[str, Any], None]
-
-
-class TypesNamespaceStack:
-    """A stack of types namespaces."""
-
-    def __init__(self, types_namespace: TypesNamespace):
-        self._types_namespace_stack: list[TypesNamespace] = [types_namespace]
-
-    @property
-    def tail(self) -> TypesNamespace:
-        return self._types_namespace_stack[-1]
-
-    @contextmanager
-    def push(self, for_type: type[Any]):
-        types_namespace = {**_typing_extra.get_cls_types_namespace(for_type), **(self.tail or {})}
-        self._types_namespace_stack.append(types_namespace)
-        try:
-            yield
-        finally:
-            self._types_namespace_stack.pop()
-
-
-class GenerateSchema:
-    """Generate core schema for a Pydantic model, dataclass and types like `str`, `datetime`, ... ."""
-
-    __slots__ = (
-        '_config_wrapper_stack',
-        '_types_namespace_stack',
-        '_typevars_map',
-        '_has_invalid_schema',
-        'field_name_stack',
-        'defs',
-    )
-
-    def __init__(
-        self,
-        config_wrapper: ConfigWrapper,
-        types_namespace: dict[str, Any] | None,
-        typevars_map: dict[Any, Any] | None = None,
-    ) -> None:
-        # we need a stack for recursing into child models
-        self._config_wrapper_stack = ConfigWrapperStack(config_wrapper)
-        self._types_namespace_stack = TypesNamespaceStack(types_namespace)
-        self._typevars_map = typevars_map
-        self._has_invalid_schema = False
-        self.field_name_stack = _FieldNameStack()
-        self.defs = _Definitions()
-
-    @classmethod
-    def __from_parent(
-        cls,
-        config_wrapper_stack: ConfigWrapperStack,
-        types_namespace_stack: TypesNamespaceStack,
-        typevars_map: dict[Any, Any] | None,
-        defs: _Definitions,
-    ) -> GenerateSchema:
-        obj = cls.__new__(cls)
-        obj._config_wrapper_stack = config_wrapper_stack
-        obj._types_namespace_stack = types_namespace_stack
-        obj._typevars_map = typevars_map
-        obj._has_invalid_schema = False
-        obj.field_name_stack = _FieldNameStack()
-        obj.defs = defs
-        return obj
-
-    @property
-    def _config_wrapper(self) -> ConfigWrapper:
-        return self._config_wrapper_stack.tail
-
-    @property
-    def _types_namespace(self) -> dict[str, Any] | None:
-        return self._types_namespace_stack.tail
-
-    @property
-    def _current_generate_schema(self) -> GenerateSchema:
-        cls = self._config_wrapper.schema_generator or GenerateSchema
-        return cls.__from_parent(
-            self._config_wrapper_stack,
-            self._types_namespace_stack,
-            self._typevars_map,
-            self.defs,
-        )
-
-    @property
-    def _arbitrary_types(self) -> bool:
-        return self._config_wrapper.arbitrary_types_allowed
-
-    def str_schema(self) -> CoreSchema:
-        """Generate a CoreSchema for `str`"""
-        return core_schema.str_schema()
-
-    # the following methods can be overridden but should be considered
-    # unstable / private APIs
-    def _list_schema(self, tp: Any, items_type: Any) -> CoreSchema:
-        return core_schema.list_schema(self.generate_schema(items_type))
-
-    def _dict_schema(self, tp: Any, keys_type: Any, values_type: Any) -> CoreSchema:
-        return core_schema.dict_schema(self.generate_schema(keys_type), self.generate_schema(values_type))
-
-    def _set_schema(self, tp: Any, items_type: Any) -> CoreSchema:
-        return core_schema.set_schema(self.generate_schema(items_type))
-
-    def _frozenset_schema(self, tp: Any, items_type: Any) -> CoreSchema:
-        return core_schema.frozenset_schema(self.generate_schema(items_type))
-
-    def _arbitrary_type_schema(self, tp: Any) -> CoreSchema:
-        if not isinstance(tp, type):
-            warn(
-                f'{tp!r} is not a Python type (it may be an instance of an object),'
-                ' Pydantic will allow any object with no validation since we cannot even'
-                ' enforce that the input is an instance of the given type.'
-                ' To get rid of this error wrap the type with `pydantic.SkipValidation`.',
-                UserWarning,
-            )
-            return core_schema.any_schema()
-        return core_schema.is_instance_schema(tp)
-
-    def _unknown_type_schema(self, obj: Any) -> CoreSchema:
-        raise PydanticSchemaGenerationError(
-            f'Unable to generate pydantic-core schema for {obj!r}. '
-            'Set `arbitrary_types_allowed=True` in the model_config to ignore this error'
-            ' or implement `__get_pydantic_core_schema__` on your type to fully support it.'
-            '\n\nIf you got this error by calling handler(<some type>) within'
-            ' `__get_pydantic_core_schema__` then you likely need to call'
-            ' `handler.generate_schema(<some type>)` since we do not call'
-            ' `__get_pydantic_core_schema__` on `<some type>` otherwise to avoid infinite recursion.'
-        )
-
-    def _apply_discriminator_to_union(
-        self, schema: CoreSchema, discriminator: str | Discriminator | None
-    ) -> CoreSchema:
-        if discriminator is None:
-            return schema
-        try:
-            return _discriminated_union.apply_discriminator(
-                schema,
-                discriminator,
-            )
-        except _discriminated_union.MissingDefinitionForUnionRef:
-            # defer until defs are resolved
-            _discriminated_union.set_discriminator_in_metadata(
-                schema,
-                discriminator,
-            )
-            return schema
-
-    class CollectedInvalid(Exception):
-        pass
-
-    def clean_schema(self, schema: CoreSchema) -> CoreSchema:
-        schema = self.collect_definitions(schema)
-        schema = simplify_schema_references(schema)
-        schema = _discriminated_union.apply_discriminators(schema)
-        if collect_invalid_schemas(schema):
-            raise self.CollectedInvalid()
-        schema = validate_core_schema(schema)
-        return schema
-
-    def collect_definitions(self, schema: CoreSchema) -> CoreSchema:
-        ref = cast('str | None', schema.get('ref', None))
-        if ref:
-            self.defs.definitions[ref] = schema
-        if 'ref' in schema:
-            schema = core_schema.definition_reference_schema(schema['ref'])
-        return core_schema.definitions_schema(
-            schema,
-            list(self.defs.definitions.values()),
-        )
-
-    def _add_js_function(self, metadata_schema: CoreSchema, js_function: Callable[..., Any]) -> None:
-        metadata = CoreMetadataHandler(metadata_schema).metadata
-        pydantic_js_functions = metadata.setdefault('pydantic_js_functions', [])
-        # because of how we generate core schemas for nested generic models
-        # we can end up adding `BaseModel.__get_pydantic_json_schema__` multiple times
-        # this check may fail to catch duplicates if the function is a `functools.partial`
-        # or something like that
-        # but if it does it'll fail by inserting the duplicate
-        if js_function not in pydantic_js_functions:
-            pydantic_js_functions.append(js_function)
-
-    def generate_schema(
-        self,
-        obj: Any,
-        from_dunder_get_core_schema: bool = True,
-    ) -> core_schema.CoreSchema:
-        """Generate core schema.
-
-        Args:
-            obj: The object to generate core schema for.
-            from_dunder_get_core_schema: Whether to generate schema from either the
-                `__get_pydantic_core_schema__` function or `__pydantic_core_schema__` property.
-
-        Returns:
-            The generated core schema.
-
-        Raises:
-            PydanticUndefinedAnnotation:
-                If it is not possible to evaluate forward reference.
-            PydanticSchemaGenerationError:
-                If it is not possible to generate pydantic-core schema.
-            TypeError:
-                - If `alias_generator` returns a disallowed type (must be str, AliasPath or AliasChoices).
-                - If V1 style validator with `each_item=True` applied on a wrong field.
-            PydanticUserError:
-                - If `typing.TypedDict` is used instead of `typing_extensions.TypedDict` on Python < 3.12.
-                - If `__modify_schema__` method is used instead of `__get_pydantic_json_schema__`.
-        """
-        schema: CoreSchema | None = None
-
-        if from_dunder_get_core_schema:
-            from_property = self._generate_schema_from_property(obj, obj)
-            if from_property is not None:
-                schema = from_property
-
-        if schema is None:
-            schema = self._generate_schema(obj)
-
-        metadata_js_function = _extract_get_pydantic_json_schema(obj, schema)
-        if metadata_js_function is not None:
-            metadata_schema = resolve_original_schema(schema, self.defs.definitions)
-            if metadata_schema:
-                self._add_js_function(metadata_schema, metadata_js_function)
-
-        schema = _add_custom_serialization_from_json_encoders(self._config_wrapper.json_encoders, obj, schema)
-
-        schema = self._post_process_generated_schema(schema)
-
-        return schema
-
-    def _model_schema(self, cls: type[BaseModel]) -> core_schema.CoreSchema:
-        """Generate schema for a Pydantic model."""
-        with self.defs.get_schema_or_ref(cls) as (model_ref, maybe_schema):
-            if maybe_schema is not None:
-                return maybe_schema
-
-            fields = cls.model_fields
-            decorators = cls.__pydantic_decorators__
-            computed_fields = decorators.computed_fields
-            check_decorator_fields_exist(
-                chain(
-                    decorators.field_validators.values(),
-                    decorators.field_serializers.values(),
-                    decorators.validators.values(),
-                ),
-                {*fields.keys(), *computed_fields.keys()},
-            )
-            config_wrapper = ConfigWrapper(cls.model_config, check=False)
-            core_config = config_wrapper.core_config(cls)
-            metadata = build_metadata_dict(js_functions=[partial(modify_model_json_schema, cls=cls)])
-
-            model_validators = decorators.model_validators.values()
-
-            extras_schema = None
-            if core_config.get('extra_fields_behavior') == 'allow':
-                for tp in (cls, *cls.__mro__):
-                    extras_annotation = cls.__annotations__.get('__pydantic_extra__', None)
-                    if extras_annotation is not None:
-                        tp = get_origin(extras_annotation)
-                        if tp not in (Dict, dict):
-                            raise PydanticSchemaGenerationError(
-                                'The type annotation for `__pydantic_extra__` must be `Dict[str, ...]`'
-                            )
-                        extra_items_type = self._get_args_resolving_forward_refs(
-                            cls.__annotations__['__pydantic_extra__'],
-                            required=True,
-                        )[1]
-                        if extra_items_type is not Any:
-                            extras_schema = self.generate_schema(extra_items_type)
-                            break
-
-            with self._config_wrapper_stack.push(config_wrapper), self._types_namespace_stack.push(cls):
-                self = self._current_generate_schema
-                if cls.__pydantic_root_model__:
-                    root_field = self._common_field_schema('root', fields['root'], decorators)
-                    inner_schema = root_field['schema']
-                    inner_schema = apply_model_validators(inner_schema, model_validators, 'inner')
-                    model_schema = core_schema.model_schema(
-                        cls,
-                        inner_schema,
-                        custom_init=getattr(cls, '__pydantic_custom_init__', None),
-                        root_model=True,
-                        post_init=getattr(cls, '__pydantic_post_init__', None),
-                        config=core_config,
-                        ref=model_ref,
-                        metadata=metadata,
-                    )
-                else:
-                    fields_schema: core_schema.CoreSchema = core_schema.model_fields_schema(
-                        {k: self._generate_md_field_schema(k, v, decorators) for k, v in fields.items()},
-                        computed_fields=[
-                            self._computed_field_schema(d, decorators.field_serializers)
-                            for d in computed_fields.values()
-                        ],
-                        extras_schema=extras_schema,
-                        model_name=cls.__name__,
-                    )
-                    inner_schema = apply_validators(fields_schema, decorators.root_validators.values(), None)
-                    new_inner_schema = define_expected_missing_refs(inner_schema, recursively_defined_type_refs())
-                    if new_inner_schema is not None:
-                        inner_schema = new_inner_schema
-                    inner_schema = apply_model_validators(inner_schema, model_validators, 'inner')
-
-                    model_schema = core_schema.model_schema(
-                        cls,
-                        inner_schema,
-                        custom_init=getattr(cls, '__pydantic_custom_init__', None),
-                        root_model=False,
-                        post_init=getattr(cls, '__pydantic_post_init__', None),
-                        config=core_config,
-                        ref=model_ref,
-                        metadata=metadata,
-                    )
-
-                schema = self._apply_model_serializers(model_schema, decorators.model_serializers.values())
-                schema = apply_model_validators(schema, model_validators, 'outer')
-                self.defs.definitions[model_ref] = self._post_process_generated_schema(schema)
-                return core_schema.definition_reference_schema(model_ref)
-
-    def _unpack_refs_defs(self, schema: CoreSchema) -> CoreSchema:
-        """Unpack all 'definitions' schemas into `GenerateSchema.defs.definitions`
-        and return the inner schema.
-        """
-
-        def get_ref(s: CoreSchema) -> str:
-            return s['ref']  # type: ignore
-
-        if schema['type'] == 'definitions':
-            self.defs.definitions.update({get_ref(s): s for s in schema['definitions']})
-            schema = schema['schema']
-        return schema
-
-    def _generate_schema_from_property(self, obj: Any, source: Any) -> core_schema.CoreSchema | None:
-        """Try to generate schema from either the `__get_pydantic_core_schema__` function or
-        `__pydantic_core_schema__` property.
-
-        Note: `__get_pydantic_core_schema__` takes priority so it can
-        decide whether to use a `__pydantic_core_schema__` attribute, or generate a fresh schema.
-        """
-        # avoid calling `__get_pydantic_core_schema__` if we've already visited this object
-        with self.defs.get_schema_or_ref(obj) as (_, maybe_schema):
-            if maybe_schema is not None:
-                return maybe_schema
-        if obj is source:
-            ref_mode = 'unpack'
-        else:
-            ref_mode = 'to-def'
-
-        schema: CoreSchema
-        get_schema = getattr(obj, '__get_pydantic_core_schema__', None)
-        if get_schema is None:
-            validators = getattr(obj, '__get_validators__', None)
-            if validators is None:
-                return None
-            warn(
-                '`__get_validators__` is deprecated and will be removed, use `__get_pydantic_core_schema__` instead.',
-                PydanticDeprecatedSince20,
-            )
-            schema = core_schema.chain_schema([core_schema.with_info_plain_validator_function(v) for v in validators()])
-        else:
-            if len(inspect.signature(get_schema).parameters) == 1:
-                # (source) -> CoreSchema
-                schema = get_schema(source)
-            else:
-                schema = get_schema(
-                    source, CallbackGetCoreSchemaHandler(self._generate_schema, self, ref_mode=ref_mode)
-                )
-
-        schema = self._unpack_refs_defs(schema)
-
-        if is_function_with_inner_schema(schema):
-            ref = schema['schema'].pop('ref', None)  # pyright: ignore[reportGeneralTypeIssues]
-            if ref:
-                schema['ref'] = ref
-        else:
-            ref = get_ref(schema)
-
-        if ref:
-            self.defs.definitions[ref] = self._post_process_generated_schema(schema)
-            return core_schema.definition_reference_schema(ref)
-
-        schema = self._post_process_generated_schema(schema)
-
-        return schema
-
-    def _resolve_forward_ref(self, obj: Any) -> Any:
-        # we assume that types_namespace has the target of forward references in its scope,
-        # but this could fail, for example, if calling Validator on an imported type which contains
-        # forward references to other types only defined in the module from which it was imported
-        # `Validator(SomeImportedTypeAliasWithAForwardReference)`
-        # or the equivalent for BaseModel
-        # class Model(BaseModel):
-        #   x: SomeImportedTypeAliasWithAForwardReference
-        try:
-            obj = _typing_extra.eval_type_backport(obj, globalns=self._types_namespace)
-        except NameError as e:
-            raise PydanticUndefinedAnnotation.from_name_error(e) from e
-
-        # if obj is still a ForwardRef, it means we can't evaluate it, raise PydanticUndefinedAnnotation
-        if isinstance(obj, ForwardRef):
-            raise PydanticUndefinedAnnotation(obj.__forward_arg__, f'Unable to evaluate forward reference {obj}')
-
-        if self._typevars_map:
-            obj = replace_types(obj, self._typevars_map)
-
-        return obj
-
-    @overload
-    def _get_args_resolving_forward_refs(self, obj: Any, required: Literal[True]) -> tuple[Any, ...]:
-        ...
-
-    @overload
-    def _get_args_resolving_forward_refs(self, obj: Any) -> tuple[Any, ...] | None:
-        ...
-
-    def _get_args_resolving_forward_refs(self, obj: Any, required: bool = False) -> tuple[Any, ...] | None:
-        args = get_args(obj)
-        if args:
-            args = tuple([self._resolve_forward_ref(a) if isinstance(a, ForwardRef) else a for a in args])
-        elif required:  # pragma: no cover
-            raise TypeError(f'Expected {obj} to have generic parameters but it had none')
-        return args
-
-    def _get_first_arg_or_any(self, obj: Any) -> Any:
-        args = self._get_args_resolving_forward_refs(obj)
-        if not args:
-            return Any
-        return args[0]
-
-    def _get_first_two_args_or_any(self, obj: Any) -> tuple[Any, Any]:
-        args = self._get_args_resolving_forward_refs(obj)
-        if not args:
-            return (Any, Any)
-        if len(args) < 2:
-            origin = get_origin(obj)
-            raise TypeError(f'Expected two type arguments for {origin}, got 1')
-        return args[0], args[1]
-
-    def _post_process_generated_schema(self, schema: core_schema.CoreSchema) -> core_schema.CoreSchema:
-        if 'metadata' not in schema:
-            schema['metadata'] = {}
-        return schema
-
-    def _generate_schema(self, obj: Any) -> core_schema.CoreSchema:
-        """Recursively generate a pydantic-core schema for any supported python type."""
-        has_invalid_schema = self._has_invalid_schema
-        self._has_invalid_schema = False
-        schema = self._generate_schema_inner(obj)
-        self._has_invalid_schema = self._has_invalid_schema or has_invalid_schema
-        return schema
-
-    def _generate_schema_inner(self, obj: Any) -> core_schema.CoreSchema:
-        if isinstance(obj, _AnnotatedType):
-            return self._annotated_schema(obj)
-
-        if isinstance(obj, dict):
-            # we assume this is already a valid schema
-            return obj  # type: ignore[return-value]
-
-        if isinstance(obj, str):
-            obj = ForwardRef(obj)
-
-        if isinstance(obj, ForwardRef):
-            return self.generate_schema(self._resolve_forward_ref(obj))
-
-        from ..main import BaseModel
-
-        if lenient_issubclass(obj, BaseModel):
-            return self._model_schema(obj)
-
-        if isinstance(obj, PydanticRecursiveRef):
-            return core_schema.definition_reference_schema(schema_ref=obj.type_ref)
-
-        return self.match_type(obj)
-
-    def match_type(self, obj: Any) -> core_schema.CoreSchema:  # noqa: C901
-        """Main mapping of types to schemas.
-
-        The general structure is a series of if statements starting with the simple cases
-        (non-generic primitive types) and then handling generics and other more complex cases.
-
-        Each case either generates a schema directly, calls into a public user-overridable method
-        (like `GenerateSchema.tuple_variable_schema`) or calls into a private method that handles some
-        boilerplate before calling into the user-facing method (e.g. `GenerateSchema._tuple_schema`).
-
-        The idea is that we'll evolve this into adding more and more user facing methods over time
-        as they get requested and we figure out what the right API for them is.
-        """
-        if obj is str:
-            return self.str_schema()
-        elif obj is bytes:
-            return core_schema.bytes_schema()
-        elif obj is int:
-            return core_schema.int_schema()
-        elif obj is float:
-            return core_schema.float_schema()
-        elif obj is bool:
-            return core_schema.bool_schema()
-        elif obj is Any or obj is object:
-            return core_schema.any_schema()
-        elif obj is None or obj is _typing_extra.NoneType:
-            return core_schema.none_schema()
-        elif obj in TUPLE_TYPES:
-            return self._tuple_schema(obj)
-        elif obj in LIST_TYPES:
-            return self._list_schema(obj, self._get_first_arg_or_any(obj))
-        elif obj in SET_TYPES:
-            return self._set_schema(obj, self._get_first_arg_or_any(obj))
-        elif obj in FROZEN_SET_TYPES:
-            return self._frozenset_schema(obj, self._get_first_arg_or_any(obj))
-        elif obj in DICT_TYPES:
-            return self._dict_schema(obj, *self._get_first_two_args_or_any(obj))
-        elif isinstance(obj, TypeAliasType):
-            return self._type_alias_type_schema(obj)
-        elif obj == type:
-            return self._type_schema()
-        elif _typing_extra.is_callable_type(obj):
-            return core_schema.callable_schema()
-        elif _typing_extra.is_literal_type(obj):
-            return self._literal_schema(obj)
-        elif is_typeddict(obj):
-            return self._typed_dict_schema(obj, None)
-        elif _typing_extra.is_namedtuple(obj):
-            return self._namedtuple_schema(obj, None)
-        elif _typing_extra.is_new_type(obj):
-            # NewType, can't use isinstance because it fails <3.10
-            return self.generate_schema(obj.__supertype__)
-        elif obj == re.Pattern:
-            return self._pattern_schema(obj)
-        elif obj is collections.abc.Hashable or obj is typing.Hashable:
-            return self._hashable_schema()
-        elif isinstance(obj, typing.TypeVar):
-            return self._unsubstituted_typevar_schema(obj)
-        elif is_finalvar(obj):
-            if obj is Final:
-                return core_schema.any_schema()
-            return self.generate_schema(
-                self._get_first_arg_or_any(obj),
-            )
-        elif isinstance(obj, (FunctionType, LambdaType, MethodType, partial)):
-            return self._callable_schema(obj)
-        elif inspect.isclass(obj) and issubclass(obj, Enum):
-            from ._std_types_schema import get_enum_core_schema
-
-            return get_enum_core_schema(obj, self._config_wrapper.config_dict)
-
-        if _typing_extra.is_dataclass(obj):
-            return self._dataclass_schema(obj, None)
-
-        res = self._get_prepare_pydantic_annotations_for_known_type(obj, ())
-        if res is not None:
-            source_type, annotations = res
-            return self._apply_annotations(source_type, annotations)
-
-        origin = get_origin(obj)
-        if origin is not None:
-            return self._match_generic_type(obj, origin)
-
-        if self._arbitrary_types:
-            return self._arbitrary_type_schema(obj)
-        return self._unknown_type_schema(obj)
-
-    def _match_generic_type(self, obj: Any, origin: Any) -> CoreSchema:  # noqa: C901
-        if isinstance(origin, TypeAliasType):
-            return self._type_alias_type_schema(obj)
-
-        # Need to handle generic dataclasses before looking for the schema properties because attribute accesses
-        # on _GenericAlias delegate to the origin type, so lose the information about the concrete parametrization
-        # As a result, currently, there is no way to cache the schema for generic dataclasses. This may be possible
-        # to resolve by modifying the value returned by `Generic.__class_getitem__`, but that is a dangerous game.
-        if _typing_extra.is_dataclass(origin):
-            return self._dataclass_schema(obj, origin)
-        if _typing_extra.is_namedtuple(origin):
-            return self._namedtuple_schema(obj, origin)
-
-        from_property = self._generate_schema_from_property(origin, obj)
-        if from_property is not None:
-            return from_property
-
-        if _typing_extra.origin_is_union(origin):
-            return self._union_schema(obj)
-        elif origin in TUPLE_TYPES:
-            return self._tuple_schema(obj)
-        elif origin in LIST_TYPES:
-            return self._list_schema(obj, self._get_first_arg_or_any(obj))
-        elif origin in SET_TYPES:
-            return self._set_schema(obj, self._get_first_arg_or_any(obj))
-        elif origin in FROZEN_SET_TYPES:
-            return self._frozenset_schema(obj, self._get_first_arg_or_any(obj))
-        elif origin in DICT_TYPES:
-            return self._dict_schema(obj, *self._get_first_two_args_or_any(obj))
-        elif is_typeddict(origin):
-            return self._typed_dict_schema(obj, origin)
-        elif origin in (typing.Type, type):
-            return self._subclass_schema(obj)
-        elif origin in {typing.Sequence, collections.abc.Sequence}:
-            return self._sequence_schema(obj)
-        elif origin in {typing.Iterable, collections.abc.Iterable, typing.Generator, collections.abc.Generator}:
-            return self._iterable_schema(obj)
-        elif origin in (re.Pattern, typing.Pattern):
-            return self._pattern_schema(obj)
-
-        if self._arbitrary_types:
-            return self._arbitrary_type_schema(origin)
-        return self._unknown_type_schema(obj)
-
-    def _generate_td_field_schema(
-        self,
-        name: str,
-        field_info: FieldInfo,
-        decorators: DecoratorInfos,
-        *,
-        required: bool = True,
-    ) -> core_schema.TypedDictField:
-        """Prepare a TypedDictField to represent a model or typeddict field."""
-        common_field = self._common_field_schema(name, field_info, decorators)
-        return core_schema.typed_dict_field(
-            common_field['schema'],
-            required=False if not field_info.is_required() else required,
-            serialization_exclude=common_field['serialization_exclude'],
-            validation_alias=common_field['validation_alias'],
-            serialization_alias=common_field['serialization_alias'],
-            metadata=common_field['metadata'],
-        )
-
-    def _generate_md_field_schema(
-        self,
-        name: str,
-        field_info: FieldInfo,
-        decorators: DecoratorInfos,
-    ) -> core_schema.ModelField:
-        """Prepare a ModelField to represent a model field."""
-        common_field = self._common_field_schema(name, field_info, decorators)
-        return core_schema.model_field(
-            common_field['schema'],
-            serialization_exclude=common_field['serialization_exclude'],
-            validation_alias=common_field['validation_alias'],
-            serialization_alias=common_field['serialization_alias'],
-            frozen=common_field['frozen'],
-            metadata=common_field['metadata'],
-        )
-
-    def _generate_dc_field_schema(
-        self,
-        name: str,
-        field_info: FieldInfo,
-        decorators: DecoratorInfos,
-    ) -> core_schema.DataclassField:
-        """Prepare a DataclassField to represent the parameter/field, of a dataclass."""
-        common_field = self._common_field_schema(name, field_info, decorators)
-        return core_schema.dataclass_field(
-            name,
-            common_field['schema'],
-            init=field_info.init,
-            init_only=field_info.init_var or None,
-            kw_only=None if field_info.kw_only else False,
-            serialization_exclude=common_field['serialization_exclude'],
-            validation_alias=common_field['validation_alias'],
-            serialization_alias=common_field['serialization_alias'],
-            frozen=common_field['frozen'],
-            metadata=common_field['metadata'],
-        )
-
-    @staticmethod
-    def _apply_alias_generator_to_field_info(
-        alias_generator: Callable[[str], str] | AliasGenerator, field_info: FieldInfo, field_name: str
-    ) -> None:
-        """Apply an alias_generator to aliases on a FieldInfo instance if appropriate.
-
-        Args:
-            alias_generator: A callable that takes a string and returns a string, or an AliasGenerator instance.
-            field_info: The FieldInfo instance to which the alias_generator is (maybe) applied.
-            field_name: The name of the field from which to generate the alias.
-        """
-        # Apply an alias_generator if
-        # 1. An alias is not specified
-        # 2. An alias is specified, but the priority is <= 1
-        if (
-            field_info.alias_priority is None
-            or field_info.alias_priority <= 1
-            or field_info.alias is None
-            or field_info.validation_alias is None
-            or field_info.serialization_alias is None
-        ):
-            alias, validation_alias, serialization_alias = None, None, None
-
-            if isinstance(alias_generator, AliasGenerator):
-                alias, validation_alias, serialization_alias = alias_generator.generate_aliases(field_name)
-            elif isinstance(alias_generator, Callable):
-                alias = alias_generator(field_name)
-                if not isinstance(alias, str):
-                    raise TypeError(f'alias_generator {alias_generator} must return str, not {alias.__class__}')
-
-            # if priority is not set, we set to 1
-            # which supports the case where the alias_generator from a child class is used
-            # to generate an alias for a field in a parent class
-            if field_info.alias_priority is None or field_info.alias_priority <= 1:
-                field_info.alias_priority = 1
-
-            # if the priority is 1, then we set the aliases to the generated alias
-            if field_info.alias_priority == 1:
-                field_info.serialization_alias = serialization_alias or alias
-                field_info.validation_alias = validation_alias or alias
-                field_info.alias = alias
-
-            # if any of the aliases are not set, then we set them to the corresponding generated alias
-            if field_info.alias is None:
-                field_info.alias = alias
-            if field_info.serialization_alias is None:
-                field_info.serialization_alias = serialization_alias or alias
-            if field_info.validation_alias is None:
-                field_info.validation_alias = validation_alias or alias
-
-    @staticmethod
-    def _apply_alias_generator_to_computed_field_info(
-        alias_generator: Callable[[str], str] | AliasGenerator,
-        computed_field_info: ComputedFieldInfo,
-        computed_field_name: str,
-    ):
-        """Apply an alias_generator to alias on a ComputedFieldInfo instance if appropriate.
-
-        Args:
-            alias_generator: A callable that takes a string and returns a string, or an AliasGenerator instance.
-            computed_field_info: The ComputedFieldInfo instance to which the alias_generator is (maybe) applied.
-            computed_field_name: The name of the computed field from which to generate the alias.
-        """
-        # Apply an alias_generator if
-        # 1. An alias is not specified
-        # 2. An alias is specified, but the priority is <= 1
-
-        if (
-            computed_field_info.alias_priority is None
-            or computed_field_info.alias_priority <= 1
-            or computed_field_info.alias is None
-        ):
-            alias, validation_alias, serialization_alias = None, None, None
-
-            if isinstance(alias_generator, AliasGenerator):
-                alias, validation_alias, serialization_alias = alias_generator.generate_aliases(computed_field_name)
-            elif isinstance(alias_generator, Callable):
-                alias = alias_generator(computed_field_name)
-                if not isinstance(alias, str):
-                    raise TypeError(f'alias_generator {alias_generator} must return str, not {alias.__class__}')
-
-            # if priority is not set, we set to 1
-            # which supports the case where the alias_generator from a child class is used
-            # to generate an alias for a field in a parent class
-            if computed_field_info.alias_priority is None or computed_field_info.alias_priority <= 1:
-                computed_field_info.alias_priority = 1
-
-            # if the priority is 1, then we set the aliases to the generated alias
-            # note that we use the serialization_alias with priority over alias, as computed_field
-            # aliases are used for serialization only (not validation)
-            if computed_field_info.alias_priority == 1:
-                computed_field_info.alias = serialization_alias or alias
-
-    def _common_field_schema(  # C901
-        self, name: str, field_info: FieldInfo, decorators: DecoratorInfos
-    ) -> _CommonField:
-        # Update FieldInfo annotation if appropriate:
-        from .. import AliasChoices, AliasPath
-        from ..fields import FieldInfo
-
-        if has_instance_in_type(field_info.annotation, (ForwardRef, str)):
-            types_namespace = self._types_namespace
-            if self._typevars_map:
-                types_namespace = (types_namespace or {}).copy()
-                # Ensure that typevars get mapped to their concrete types:
-                types_namespace.update({k.__name__: v for k, v in self._typevars_map.items()})
-
-            evaluated = _typing_extra.eval_type_lenient(field_info.annotation, types_namespace)
-            if evaluated is not field_info.annotation and not has_instance_in_type(evaluated, PydanticRecursiveRef):
-                new_field_info = FieldInfo.from_annotation(evaluated)
-                field_info.annotation = new_field_info.annotation
-
-                # Handle any field info attributes that may have been obtained from now-resolved annotations
-                for k, v in new_field_info._attributes_set.items():
-                    # If an attribute is already set, it means it was set by assigning to a call to Field (or just a
-                    # default value), and that should take the highest priority. So don't overwrite existing attributes.
-                    # We skip over "attributes" that are present in the metadata_lookup dict because these won't
-                    # actually end up as attributes of the `FieldInfo` instance.
-                    if k not in field_info._attributes_set and k not in field_info.metadata_lookup:
-                        setattr(field_info, k, v)
-
-                # Finally, ensure the field info also reflects all the `_attributes_set` that are actually metadata.
-                field_info.metadata = [*new_field_info.metadata, *field_info.metadata]
-
-        source_type, annotations = field_info.annotation, field_info.metadata
-
-        def set_discriminator(schema: CoreSchema) -> CoreSchema:
-            schema = self._apply_discriminator_to_union(schema, field_info.discriminator)
-            return schema
-
-        with self.field_name_stack.push(name):
-            if field_info.discriminator is not None:
-                schema = self._apply_annotations(source_type, annotations, transform_inner_schema=set_discriminator)
-            else:
-                schema = self._apply_annotations(
-                    source_type,
-                    annotations,
-                )
-
-        # This V1 compatibility shim should eventually be removed
-        # push down any `each_item=True` validators
-        # note that this won't work for any Annotated types that get wrapped by a function validator
-        # but that's okay because that didn't exist in V1
-        this_field_validators = filter_field_decorator_info_by_field(decorators.validators.values(), name)
-        if _validators_require_validate_default(this_field_validators):
-            field_info.validate_default = True
-        each_item_validators = [v for v in this_field_validators if v.info.each_item is True]
-        this_field_validators = [v for v in this_field_validators if v not in each_item_validators]
-        schema = apply_each_item_validators(schema, each_item_validators, name)
-
-        schema = apply_validators(schema, filter_field_decorator_info_by_field(this_field_validators, name), name)
-        schema = apply_validators(
-            schema, filter_field_decorator_info_by_field(decorators.field_validators.values(), name), name
-        )
-
-        # the default validator needs to go outside of any other validators
-        # so that it is the topmost validator for the field validator
-        # which uses it to check if the field has a default value or not
-        if not field_info.is_required():
-            schema = wrap_default(field_info, schema)
-
-        schema = self._apply_field_serializers(
-            schema, filter_field_decorator_info_by_field(decorators.field_serializers.values(), name)
-        )
-        json_schema_updates = {
-            'title': field_info.title,
-            'description': field_info.description,
-            'examples': to_jsonable_python(field_info.examples),
-        }
-        json_schema_updates = {k: v for k, v in json_schema_updates.items() if v is not None}
-
-        json_schema_extra = field_info.json_schema_extra
-
-        metadata = build_metadata_dict(
-            js_annotation_functions=[get_json_schema_update_func(json_schema_updates, json_schema_extra)]
-        )
-
-        alias_generator = self._config_wrapper.alias_generator
-        if alias_generator is not None:
-            self._apply_alias_generator_to_field_info(alias_generator, field_info, name)
-
-        if isinstance(field_info.validation_alias, (AliasChoices, AliasPath)):
-            validation_alias = field_info.validation_alias.convert_to_aliases()
-        else:
-            validation_alias = field_info.validation_alias
-
-        return _common_field(
-            schema,
-            serialization_exclude=True if field_info.exclude else None,
-            validation_alias=validation_alias,
-            serialization_alias=field_info.serialization_alias,
-            frozen=field_info.frozen,
-            metadata=metadata,
-        )
-
-    def _union_schema(self, union_type: Any) -> core_schema.CoreSchema:
-        """Generate schema for a Union."""
-        args = self._get_args_resolving_forward_refs(union_type, required=True)
-        choices: list[CoreSchema] = []
-        nullable = False
-        for arg in args:
-            if arg is None or arg is _typing_extra.NoneType:
-                nullable = True
-            else:
-                choices.append(self.generate_schema(arg))
-
-        if len(choices) == 1:
-            s = choices[0]
-        else:
-            choices_with_tags: list[CoreSchema | tuple[CoreSchema, str]] = []
-            for choice in choices:
-                metadata = choice.get('metadata')
-                if isinstance(metadata, dict):
-                    tag = metadata.get(_core_utils.TAGGED_UNION_TAG_KEY)
-                    if tag is not None:
-                        choices_with_tags.append((choice, tag))
-                    else:
-                        choices_with_tags.append(choice)
-            s = core_schema.union_schema(choices_with_tags)
-
-        if nullable:
-            s = core_schema.nullable_schema(s)
-        return s
-
-    def _type_alias_type_schema(
-        self,
-        obj: Any,  # TypeAliasType
-    ) -> CoreSchema:
-        with self.defs.get_schema_or_ref(obj) as (ref, maybe_schema):
-            if maybe_schema is not None:
-                return maybe_schema
-
-            origin = get_origin(obj) or obj
-
-            annotation = origin.__value__
-            typevars_map = get_standard_typevars_map(obj)
-
-            with self._types_namespace_stack.push(origin):
-                annotation = _typing_extra.eval_type_lenient(annotation, self._types_namespace)
-                annotation = replace_types(annotation, typevars_map)
-                schema = self.generate_schema(annotation)
-                assert schema['type'] != 'definitions'
-                schema['ref'] = ref  # type: ignore
-            self.defs.definitions[ref] = schema
-            return core_schema.definition_reference_schema(ref)
-
-    def _literal_schema(self, literal_type: Any) -> CoreSchema:
-        """Generate schema for a Literal."""
-        expected = _typing_extra.all_literal_values(literal_type)
-        assert expected, f'literal "expected" cannot be empty, obj={literal_type}'
-        return core_schema.literal_schema(expected)
-
-    def _typed_dict_schema(self, typed_dict_cls: Any, origin: Any) -> core_schema.CoreSchema:
-        """Generate schema for a TypedDict.
-
-        It is not possible to track required/optional keys in TypedDict without __required_keys__
-        since TypedDict.__new__ erases the base classes (it replaces them with just `dict`)
-        and thus we can track usage of total=True/False
-        __required_keys__ was added in Python 3.9
-        (https://github.com/miss-islington/cpython/blob/1e9939657dd1f8eb9f596f77c1084d2d351172fc/Doc/library/typing.rst?plain=1#L1546-L1548)
-        however it is buggy
-        (https://github.com/python/typing_extensions/blob/ac52ac5f2cb0e00e7988bae1e2a1b8257ac88d6d/src/typing_extensions.py#L657-L666).
-
-        On 3.11 but < 3.12 TypedDict does not preserve inheritance information.
-
-        Hence to avoid creating validators that do not do what users expect we only
-        support typing.TypedDict on Python >= 3.12 or typing_extension.TypedDict on all versions
-        """
-        from ..fields import FieldInfo
-
-        with self.defs.get_schema_or_ref(typed_dict_cls) as (typed_dict_ref, maybe_schema):
-            if maybe_schema is not None:
-                return maybe_schema
-
-            typevars_map = get_standard_typevars_map(typed_dict_cls)
-            if origin is not None:
-                typed_dict_cls = origin
-
-            if not _SUPPORTS_TYPEDDICT and type(typed_dict_cls).__module__ == 'typing':
-                raise PydanticUserError(
-                    'Please use `typing_extensions.TypedDict` instead of `typing.TypedDict` on Python < 3.12.',
-                    code='typed-dict-version',
-                )
-
-            try:
-                config: ConfigDict | None = get_attribute_from_bases(typed_dict_cls, '__pydantic_config__')
-            except AttributeError:
-                config = None
-
-            with self._config_wrapper_stack.push(config), self._types_namespace_stack.push(typed_dict_cls):
-                core_config = self._config_wrapper.core_config(typed_dict_cls)
-
-                self = self._current_generate_schema
-
-                required_keys: frozenset[str] = typed_dict_cls.__required_keys__
-
-                fields: dict[str, core_schema.TypedDictField] = {}
-
-                decorators = DecoratorInfos.build(typed_dict_cls)
-
-                for field_name, annotation in get_type_hints_infer_globalns(
-                    typed_dict_cls, localns=self._types_namespace, include_extras=True
-                ).items():
-                    annotation = replace_types(annotation, typevars_map)
-                    required = field_name in required_keys
-
-                    if get_origin(annotation) == _typing_extra.Required:
-                        required = True
-                        annotation = self._get_args_resolving_forward_refs(
-                            annotation,
-                            required=True,
-                        )[0]
-                    elif get_origin(annotation) == _typing_extra.NotRequired:
-                        required = False
-                        annotation = self._get_args_resolving_forward_refs(
-                            annotation,
-                            required=True,
-                        )[0]
-
-                    field_info = FieldInfo.from_annotation(annotation)
-                    fields[field_name] = self._generate_td_field_schema(
-                        field_name, field_info, decorators, required=required
-                    )
-
-                metadata = build_metadata_dict(
-                    js_functions=[partial(modify_model_json_schema, cls=typed_dict_cls)], typed_dict_cls=typed_dict_cls
-                )
-
-                td_schema = core_schema.typed_dict_schema(
-                    fields,
-                    computed_fields=[
-                        self._computed_field_schema(d, decorators.field_serializers)
-                        for d in decorators.computed_fields.values()
-                    ],
-                    ref=typed_dict_ref,
-                    metadata=metadata,
-                    config=core_config,
-                )
-
-                schema = self._apply_model_serializers(td_schema, decorators.model_serializers.values())
-                schema = apply_model_validators(schema, decorators.model_validators.values(), 'all')
-                self.defs.definitions[typed_dict_ref] = self._post_process_generated_schema(schema)
-                return core_schema.definition_reference_schema(typed_dict_ref)
-
-    def _namedtuple_schema(self, namedtuple_cls: Any, origin: Any) -> core_schema.CoreSchema:
-        """Generate schema for a NamedTuple."""
-        with self.defs.get_schema_or_ref(namedtuple_cls) as (namedtuple_ref, maybe_schema):
-            if maybe_schema is not None:
-                return maybe_schema
-            typevars_map = get_standard_typevars_map(namedtuple_cls)
-            if origin is not None:
-                namedtuple_cls = origin
-
-            annotations: dict[str, Any] = get_type_hints_infer_globalns(
-                namedtuple_cls, include_extras=True, localns=self._types_namespace
-            )
-            if not annotations:
-                # annotations is empty, happens if namedtuple_cls defined via collections.namedtuple(...)
-                annotations = {k: Any for k in namedtuple_cls._fields}
-
-            if typevars_map:
-                annotations = {
-                    field_name: replace_types(annotation, typevars_map)
-                    for field_name, annotation in annotations.items()
-                }
-
-            arguments_schema = core_schema.arguments_schema(
-                [
-                    self._generate_parameter_schema(
-                        field_name, annotation, default=namedtuple_cls._field_defaults.get(field_name, Parameter.empty)
-                    )
-                    for field_name, annotation in annotations.items()
-                ],
-                metadata=build_metadata_dict(js_prefer_positional_arguments=True),
-            )
-            return core_schema.call_schema(arguments_schema, namedtuple_cls, ref=namedtuple_ref)
-
-    def _generate_parameter_schema(
-        self,
-        name: str,
-        annotation: type[Any],
-        default: Any = Parameter.empty,
-        mode: Literal['positional_only', 'positional_or_keyword', 'keyword_only'] | None = None,
-    ) -> core_schema.ArgumentsParameter:
-        """Prepare a ArgumentsParameter to represent a field in a namedtuple or function signature."""
-        from ..fields import FieldInfo
-
-        if default is Parameter.empty:
-            field = FieldInfo.from_annotation(annotation)
-        else:
-            field = FieldInfo.from_annotated_attribute(annotation, default)
-        assert field.annotation is not None, 'field.annotation should not be None when generating a schema'
-        source_type, annotations = field.annotation, field.metadata
-        with self.field_name_stack.push(name):
-            schema = self._apply_annotations(source_type, annotations)
-
-        if not field.is_required():
-            schema = wrap_default(field, schema)
-
-        parameter_schema = core_schema.arguments_parameter(name, schema)
-        if mode is not None:
-            parameter_schema['mode'] = mode
-        if field.alias is not None:
-            parameter_schema['alias'] = field.alias
-        else:
-            alias_generator = self._config_wrapper.alias_generator
-            if isinstance(alias_generator, AliasGenerator) and alias_generator.alias is not None:
-                parameter_schema['alias'] = alias_generator.alias(name)
-            elif isinstance(alias_generator, Callable):
-                parameter_schema['alias'] = alias_generator(name)
-        return parameter_schema
-
-    def _tuple_schema(self, tuple_type: Any) -> core_schema.CoreSchema:
-        """Generate schema for a Tuple, e.g. `tuple[int, str]` or `tuple[int, ...]`."""
-        # TODO: do we really need to resolve type vars here?
-        typevars_map = get_standard_typevars_map(tuple_type)
-        params = self._get_args_resolving_forward_refs(tuple_type)
-
-        if typevars_map and params:
-            params = tuple(replace_types(param, typevars_map) for param in params)
-
-        # NOTE: subtle difference: `tuple[()]` gives `params=()`, whereas `typing.Tuple[()]` gives `params=((),)`
-        # This is only true for <3.11, on Python 3.11+ `typing.Tuple[()]` gives `params=()`
-        if not params:
-            if tuple_type in TUPLE_TYPES:
-                return core_schema.tuple_schema([core_schema.any_schema()], variadic_item_index=0)
-            else:
-                # special case for `tuple[()]` which means `tuple[]` - an empty tuple
-                return core_schema.tuple_schema([])
-        elif params[-1] is Ellipsis:
-            if len(params) == 2:
-                return core_schema.tuple_schema([self.generate_schema(params[0])], variadic_item_index=0)
-            else:
-                # TODO: something like https://github.com/pydantic/pydantic/issues/5952
-                raise ValueError('Variable tuples can only have one type')
-        elif len(params) == 1 and params[0] == ():
-            # special case for `Tuple[()]` which means `Tuple[]` - an empty tuple
-            # NOTE: This conditional can be removed when we drop support for Python 3.10.
-            return core_schema.tuple_schema([])
-        else:
-            return core_schema.tuple_schema([self.generate_schema(param) for param in params])
-
-    def _type_schema(self) -> core_schema.CoreSchema:
-        return core_schema.custom_error_schema(
-            core_schema.is_instance_schema(type),
-            custom_error_type='is_type',
-            custom_error_message='Input should be a type',
-        )
-
-    def _union_is_subclass_schema(self, union_type: Any) -> core_schema.CoreSchema:
-        """Generate schema for `Type[Union[X, ...]]`."""
-        args = self._get_args_resolving_forward_refs(union_type, required=True)
-        return core_schema.union_schema([self.generate_schema(typing.Type[args]) for args in args])
-
-    def _subclass_schema(self, type_: Any) -> core_schema.CoreSchema:
-        """Generate schema for a Type, e.g. `Type[int]`."""
-        type_param = self._get_first_arg_or_any(type_)
-        if type_param == Any:
-            return self._type_schema()
-        elif isinstance(type_param, typing.TypeVar):
-            if type_param.__bound__:
-                if _typing_extra.origin_is_union(get_origin(type_param.__bound__)):
-                    return self._union_is_subclass_schema(type_param.__bound__)
-                return core_schema.is_subclass_schema(type_param.__bound__)
-            elif type_param.__constraints__:
-                return core_schema.union_schema(
-                    [self.generate_schema(typing.Type[c]) for c in type_param.__constraints__]
-                )
-            else:
-                return self._type_schema()
-        elif _typing_extra.origin_is_union(get_origin(type_param)):
-            return self._union_is_subclass_schema(type_param)
-        else:
-            return core_schema.is_subclass_schema(type_param)
-
-    def _sequence_schema(self, sequence_type: Any) -> core_schema.CoreSchema:
-        """Generate schema for a Sequence, e.g. `Sequence[int]`."""
-        item_type = self._get_first_arg_or_any(sequence_type)
-
-        list_schema = core_schema.list_schema(self.generate_schema(item_type))
-        python_schema = core_schema.is_instance_schema(typing.Sequence, cls_repr='Sequence')
-        if item_type != Any:
-            from ._validators import sequence_validator
-
-            python_schema = core_schema.chain_schema(
-                [python_schema, core_schema.no_info_wrap_validator_function(sequence_validator, list_schema)],
-            )
-        return core_schema.json_or_python_schema(json_schema=list_schema, python_schema=python_schema)
-
-    def _iterable_schema(self, type_: Any) -> core_schema.GeneratorSchema:
-        """Generate a schema for an `Iterable`."""
-        item_type = self._get_first_arg_or_any(type_)
-
-        return core_schema.generator_schema(self.generate_schema(item_type))
-
-    def _pattern_schema(self, pattern_type: Any) -> core_schema.CoreSchema:
-        from . import _validators
-
-        metadata = build_metadata_dict(js_functions=[lambda _1, _2: {'type': 'string', 'format': 'regex'}])
-        ser = core_schema.plain_serializer_function_ser_schema(
-            attrgetter('pattern'), when_used='json', return_schema=core_schema.str_schema()
-        )
-        if pattern_type == typing.Pattern or pattern_type == re.Pattern:
-            # bare type
-            return core_schema.no_info_plain_validator_function(
-                _validators.pattern_either_validator, serialization=ser, metadata=metadata
-            )
-
-        param = self._get_args_resolving_forward_refs(
-            pattern_type,
-            required=True,
-        )[0]
-        if param == str:
-            return core_schema.no_info_plain_validator_function(
-                _validators.pattern_str_validator, serialization=ser, metadata=metadata
-            )
-        elif param == bytes:
-            return core_schema.no_info_plain_validator_function(
-                _validators.pattern_bytes_validator, serialization=ser, metadata=metadata
-            )
-        else:
-            raise PydanticSchemaGenerationError(f'Unable to generate pydantic-core schema for {pattern_type!r}.')
-
-    def _hashable_schema(self) -> core_schema.CoreSchema:
-        return core_schema.custom_error_schema(
-            core_schema.is_instance_schema(collections.abc.Hashable),
-            custom_error_type='is_hashable',
-            custom_error_message='Input should be hashable',
-        )
-
-    def _dataclass_schema(
-        self, dataclass: type[StandardDataclass], origin: type[StandardDataclass] | None
-    ) -> core_schema.CoreSchema:
-        """Generate schema for a dataclass."""
-        with self.defs.get_schema_or_ref(dataclass) as (dataclass_ref, maybe_schema):
-            if maybe_schema is not None:
-                return maybe_schema
-
-            typevars_map = get_standard_typevars_map(dataclass)
-            if origin is not None:
-                dataclass = origin
-
-            config = getattr(dataclass, '__pydantic_config__', None)
-            with self._config_wrapper_stack.push(config), self._types_namespace_stack.push(dataclass):
-                core_config = self._config_wrapper.core_config(dataclass)
-
-                self = self._current_generate_schema
-
-                from ..dataclasses import is_pydantic_dataclass
-
-                if is_pydantic_dataclass(dataclass):
-                    fields = deepcopy(dataclass.__pydantic_fields__)
-                    if typevars_map:
-                        for field in fields.values():
-                            field.apply_typevars_map(typevars_map, self._types_namespace)
-                else:
-                    fields = collect_dataclass_fields(
-                        dataclass,
-                        self._types_namespace,
-                        typevars_map=typevars_map,
-                    )
-
-                # disallow combination of init=False on a dataclass field and extra='allow' on a dataclass
-                if config and config.get('extra') == 'allow':
-                    # disallow combination of init=False on a dataclass field and extra='allow' on a dataclass
-                    for field_name, field in fields.items():
-                        if field.init is False:
-                            raise PydanticUserError(
-                                f'Field {field_name} has `init=False` and dataclass has config setting `extra="allow"`. '
-                                f'This combination is not allowed.',
-                                code='dataclass-init-false-extra-allow',
-                            )
-
-                decorators = dataclass.__dict__.get('__pydantic_decorators__') or DecoratorInfos.build(dataclass)
-                # Move kw_only=False args to the start of the list, as this is how vanilla dataclasses work.
-                # Note that when kw_only is missing or None, it is treated as equivalent to kw_only=True
-                args = sorted(
-                    (self._generate_dc_field_schema(k, v, decorators) for k, v in fields.items()),
-                    key=lambda a: a.get('kw_only') is not False,
-                )
-                has_post_init = hasattr(dataclass, '__post_init__')
-                has_slots = hasattr(dataclass, '__slots__')
-
-                args_schema = core_schema.dataclass_args_schema(
-                    dataclass.__name__,
-                    args,
-                    computed_fields=[
-                        self._computed_field_schema(d, decorators.field_serializers)
-                        for d in decorators.computed_fields.values()
-                    ],
-                    collect_init_only=has_post_init,
-                )
-
-                inner_schema = apply_validators(args_schema, decorators.root_validators.values(), None)
-
-                model_validators = decorators.model_validators.values()
-                inner_schema = apply_model_validators(inner_schema, model_validators, 'inner')
-
-                dc_schema = core_schema.dataclass_schema(
-                    dataclass,
-                    inner_schema,
-                    post_init=has_post_init,
-                    ref=dataclass_ref,
-                    fields=[field.name for field in dataclasses.fields(dataclass)],
-                    slots=has_slots,
-                    config=core_config,
-                )
-                schema = self._apply_model_serializers(dc_schema, decorators.model_serializers.values())
-                schema = apply_model_validators(schema, model_validators, 'outer')
-                self.defs.definitions[dataclass_ref] = self._post_process_generated_schema(schema)
-                return core_schema.definition_reference_schema(dataclass_ref)
-
-    def _callable_schema(self, function: Callable[..., Any]) -> core_schema.CallSchema:
-        """Generate schema for a Callable.
-
-        TODO support functional validators once we support them in Config
-        """
-        sig = signature(function)
-
-        type_hints = _typing_extra.get_function_type_hints(function)
-
-        mode_lookup: dict[_ParameterKind, Literal['positional_only', 'positional_or_keyword', 'keyword_only']] = {
-            Parameter.POSITIONAL_ONLY: 'positional_only',
-            Parameter.POSITIONAL_OR_KEYWORD: 'positional_or_keyword',
-            Parameter.KEYWORD_ONLY: 'keyword_only',
-        }
-
-        arguments_list: list[core_schema.ArgumentsParameter] = []
-        var_args_schema: core_schema.CoreSchema | None = None
-        var_kwargs_schema: core_schema.CoreSchema | None = None
-
-        for name, p in sig.parameters.items():
-            if p.annotation is sig.empty:
-                annotation = Any
-            else:
-                annotation = type_hints[name]
-
-            parameter_mode = mode_lookup.get(p.kind)
-            if parameter_mode is not None:
-                arg_schema = self._generate_parameter_schema(name, annotation, p.default, parameter_mode)
-                arguments_list.append(arg_schema)
-            elif p.kind == Parameter.VAR_POSITIONAL:
-                var_args_schema = self.generate_schema(annotation)
-            else:
-                assert p.kind == Parameter.VAR_KEYWORD, p.kind
-                var_kwargs_schema = self.generate_schema(annotation)
-
-        return_schema: core_schema.CoreSchema | None = None
-        config_wrapper = self._config_wrapper
-        if config_wrapper.validate_return:
-            return_hint = type_hints.get('return')
-            if return_hint is not None:
-                return_schema = self.generate_schema(return_hint)
-
-        return core_schema.call_schema(
-            core_schema.arguments_schema(
-                arguments_list,
-                var_args_schema=var_args_schema,
-                var_kwargs_schema=var_kwargs_schema,
-                populate_by_name=config_wrapper.populate_by_name,
-            ),
-            function,
-            return_schema=return_schema,
-        )
-
-    def _unsubstituted_typevar_schema(self, typevar: typing.TypeVar) -> core_schema.CoreSchema:
-        assert isinstance(typevar, typing.TypeVar)
-
-        bound = typevar.__bound__
-        constraints = typevar.__constraints__
-        default = getattr(typevar, '__default__', None)
-
-        if (bound is not None) + (len(constraints) != 0) + (default is not None) > 1:
-            raise NotImplementedError(
-                'Pydantic does not support mixing more than one of TypeVar bounds, constraints and defaults'
-            )
-
-        if default is not None:
-            return self.generate_schema(default)
-        elif constraints:
-            return self._union_schema(typing.Union[constraints])  # type: ignore
-        elif bound:
-            schema = self.generate_schema(bound)
-            schema['serialization'] = core_schema.wrap_serializer_function_ser_schema(
-                lambda x, h: h(x), schema=core_schema.any_schema()
-            )
-            return schema
-        else:
-            return core_schema.any_schema()
-
-    def _computed_field_schema(
-        self,
-        d: Decorator[ComputedFieldInfo],
-        field_serializers: dict[str, Decorator[FieldSerializerDecoratorInfo]],
-    ) -> core_schema.ComputedField:
-        try:
-            return_type = _decorators.get_function_return_type(d.func, d.info.return_type, self._types_namespace)
-        except NameError as e:
-            raise PydanticUndefinedAnnotation.from_name_error(e) from e
-        if return_type is PydanticUndefined:
-            raise PydanticUserError(
-                'Computed field is missing return type annotation or specifying `return_type`'
-                ' to the `@computed_field` decorator (e.g. `@computed_field(return_type=int|str)`)',
-                code='model-field-missing-annotation',
-            )
-
-        return_type = replace_types(return_type, self._typevars_map)
-        # Create a new ComputedFieldInfo so that different type parametrizations of the same
-        # generic model's computed field can have different return types.
-        d.info = dataclasses.replace(d.info, return_type=return_type)
-        return_type_schema = self.generate_schema(return_type)
-        # Apply serializers to computed field if there exist
-        return_type_schema = self._apply_field_serializers(
-            return_type_schema,
-            filter_field_decorator_info_by_field(field_serializers.values(), d.cls_var_name),
-            computed_field=True,
-        )
-
-        alias_generator = self._config_wrapper.alias_generator
-        if alias_generator is not None:
-            self._apply_alias_generator_to_computed_field_info(
-                alias_generator=alias_generator, computed_field_info=d.info, computed_field_name=d.cls_var_name
-            )
-
-        def set_computed_field_metadata(schema: CoreSchemaOrField, handler: GetJsonSchemaHandler) -> JsonSchemaValue:
-            json_schema = handler(schema)
-
-            json_schema['readOnly'] = True
-
-            title = d.info.title
-            if title is not None:
-                json_schema['title'] = title
-
-            description = d.info.description
-            if description is not None:
-                json_schema['description'] = description
-
-            examples = d.info.examples
-            if examples is not None:
-                json_schema['examples'] = to_jsonable_python(examples)
-
-            json_schema_extra = d.info.json_schema_extra
-            if json_schema_extra is not None:
-                add_json_schema_extra(json_schema, json_schema_extra)
-
-            return json_schema
-
-        metadata = build_metadata_dict(js_annotation_functions=[set_computed_field_metadata])
-        return core_schema.computed_field(
-            d.cls_var_name, return_schema=return_type_schema, alias=d.info.alias, metadata=metadata
-        )
-
-    def _annotated_schema(self, annotated_type: Any) -> core_schema.CoreSchema:
-        """Generate schema for an Annotated type, e.g. `Annotated[int, Field(...)]` or `Annotated[int, Gt(0)]`."""
-        from ..fields import FieldInfo
-
-        source_type, *annotations = self._get_args_resolving_forward_refs(
-            annotated_type,
-            required=True,
-        )
-        schema = self._apply_annotations(source_type, annotations)
-        # put the default validator last so that TypeAdapter.get_default_value() works
-        # even if there are function validators involved
-        for annotation in annotations:
-            if isinstance(annotation, FieldInfo):
-                schema = wrap_default(annotation, schema)
-        return schema
-
-    def _get_prepare_pydantic_annotations_for_known_type(
-        self, obj: Any, annotations: tuple[Any, ...]
-    ) -> tuple[Any, list[Any]] | None:
-        from ._std_types_schema import PREPARE_METHODS
-
-        # Check for hashability
-        try:
-            hash(obj)
-        except TypeError:
-            # obj is definitely not a known type if this fails
-            return None
-
-        for gen in PREPARE_METHODS:
-            res = gen(obj, annotations, self._config_wrapper.config_dict)
-            if res is not None:
-                return res
-
-        return None
-
-    def _apply_annotations(
-        self,
-        source_type: Any,
-        annotations: list[Any],
-        transform_inner_schema: Callable[[CoreSchema], CoreSchema] = lambda x: x,
-    ) -> CoreSchema:
-        """Apply arguments from `Annotated` or from `FieldInfo` to a schema.
-
-        This gets called by `GenerateSchema._annotated_schema` but differs from it in that it does
-        not expect `source_type` to be an `Annotated` object, it expects it to be  the first argument of that
-        (in other words, `GenerateSchema._annotated_schema` just unpacks `Annotated`, this process it).
-        """
-        annotations = list(_known_annotated_metadata.expand_grouped_metadata(annotations))
-        res = self._get_prepare_pydantic_annotations_for_known_type(source_type, tuple(annotations))
-        if res is not None:
-            source_type, annotations = res
-
-        pydantic_js_annotation_functions: list[GetJsonSchemaFunction] = []
-
-        def inner_handler(obj: Any) -> CoreSchema:
-            from_property = self._generate_schema_from_property(obj, obj)
-            if from_property is None:
-                schema = self._generate_schema(obj)
-            else:
-                schema = from_property
-            metadata_js_function = _extract_get_pydantic_json_schema(obj, schema)
-            if metadata_js_function is not None:
-                metadata_schema = resolve_original_schema(schema, self.defs.definitions)
-                if metadata_schema is not None:
-                    self._add_js_function(metadata_schema, metadata_js_function)
-            return transform_inner_schema(schema)
-
-        get_inner_schema = CallbackGetCoreSchemaHandler(inner_handler, self)
-
-        for annotation in annotations:
-            if annotation is None:
-                continue
-            get_inner_schema = self._get_wrapped_inner_schema(
-                get_inner_schema, annotation, pydantic_js_annotation_functions
-            )
-
-        schema = get_inner_schema(source_type)
-        if pydantic_js_annotation_functions:
-            metadata = CoreMetadataHandler(schema).metadata
-            metadata.setdefault('pydantic_js_annotation_functions', []).extend(pydantic_js_annotation_functions)
-        return _add_custom_serialization_from_json_encoders(self._config_wrapper.json_encoders, source_type, schema)
-
-    def _apply_single_annotation(self, schema: core_schema.CoreSchema, metadata: Any) -> core_schema.CoreSchema:
-        from ..fields import FieldInfo
-
-        if isinstance(metadata, FieldInfo):
-            for field_metadata in metadata.metadata:
-                schema = self._apply_single_annotation(schema, field_metadata)
-
-            if metadata.discriminator is not None:
-                schema = self._apply_discriminator_to_union(schema, metadata.discriminator)
-            return schema
-
-        if schema['type'] == 'nullable':
-            # for nullable schemas, metadata is automatically applied to the inner schema
-            inner = schema.get('schema', core_schema.any_schema())
-            inner = self._apply_single_annotation(inner, metadata)
-            if inner:
-                schema['schema'] = inner
-            return schema
-
-        original_schema = schema
-        ref = schema.get('ref', None)
-        if ref is not None:
-            schema = schema.copy()
-            new_ref = ref + f'_{repr(metadata)}'
-            if new_ref in self.defs.definitions:
-                return self.defs.definitions[new_ref]
-            schema['ref'] = new_ref  # type: ignore
-        elif schema['type'] == 'definition-ref':
-            ref = schema['schema_ref']
-            if ref in self.defs.definitions:
-                schema = self.defs.definitions[ref].copy()
-                new_ref = ref + f'_{repr(metadata)}'
-                if new_ref in self.defs.definitions:
-                    return self.defs.definitions[new_ref]
-                schema['ref'] = new_ref  # type: ignore
-
-        maybe_updated_schema = _known_annotated_metadata.apply_known_metadata(metadata, schema.copy())
-
-        if maybe_updated_schema is not None:
-            return maybe_updated_schema
-        return original_schema
-
-    def _apply_single_annotation_json_schema(
-        self, schema: core_schema.CoreSchema, metadata: Any
-    ) -> core_schema.CoreSchema:
-        from ..fields import FieldInfo
-
-        if isinstance(metadata, FieldInfo):
-            for field_metadata in metadata.metadata:
-                schema = self._apply_single_annotation_json_schema(schema, field_metadata)
-            json_schema_update: JsonSchemaValue = {}
-            if metadata.title:
-                json_schema_update['title'] = metadata.title
-            if metadata.description:
-                json_schema_update['description'] = metadata.description
-            if metadata.examples:
-                json_schema_update['examples'] = to_jsonable_python(metadata.examples)
-
-            json_schema_extra = metadata.json_schema_extra
-            if json_schema_update or json_schema_extra:
-                CoreMetadataHandler(schema).metadata.setdefault('pydantic_js_annotation_functions', []).append(
-                    get_json_schema_update_func(json_schema_update, json_schema_extra)
-                )
-        return schema
-
-    def _get_wrapped_inner_schema(
-        self,
-        get_inner_schema: GetCoreSchemaHandler,
-        annotation: Any,
-        pydantic_js_annotation_functions: list[GetJsonSchemaFunction],
-    ) -> CallbackGetCoreSchemaHandler:
-        metadata_get_schema: GetCoreSchemaFunction = getattr(annotation, '__get_pydantic_core_schema__', None) or (
-            lambda source, handler: handler(source)
-        )
-
-        def new_handler(source: Any) -> core_schema.CoreSchema:
-            schema = metadata_get_schema(source, get_inner_schema)
-            schema = self._apply_single_annotation(schema, annotation)
-            schema = self._apply_single_annotation_json_schema(schema, annotation)
-
-            metadata_js_function = _extract_get_pydantic_json_schema(annotation, schema)
-            if metadata_js_function is not None:
-                pydantic_js_annotation_functions.append(metadata_js_function)
-            return schema
-
-        return CallbackGetCoreSchemaHandler(new_handler, self)
-
-    def _apply_field_serializers(
-        self,
-        schema: core_schema.CoreSchema,
-        serializers: list[Decorator[FieldSerializerDecoratorInfo]],
-        computed_field: bool = False,
-    ) -> core_schema.CoreSchema:
-        """Apply field serializers to a schema."""
-        if serializers:
-            schema = copy(schema)
-            if schema['type'] == 'definitions':
-                inner_schema = schema['schema']
-                schema['schema'] = self._apply_field_serializers(inner_schema, serializers)
-                return schema
-            else:
-                ref = typing.cast('str|None', schema.get('ref', None))
-                if ref is not None:
-                    schema = core_schema.definition_reference_schema(ref)
-
-            # use the last serializer to make it easy to override a serializer set on a parent model
-            serializer = serializers[-1]
-            is_field_serializer, info_arg = inspect_field_serializer(
-                serializer.func, serializer.info.mode, computed_field=computed_field
-            )
-
-            try:
-                return_type = _decorators.get_function_return_type(
-                    serializer.func, serializer.info.return_type, self._types_namespace
-                )
-            except NameError as e:
-                raise PydanticUndefinedAnnotation.from_name_error(e) from e
-
-            if return_type is PydanticUndefined:
-                return_schema = None
-            else:
-                return_schema = self.generate_schema(return_type)
-
-            if serializer.info.mode == 'wrap':
-                schema['serialization'] = core_schema.wrap_serializer_function_ser_schema(
-                    serializer.func,
-                    is_field_serializer=is_field_serializer,
-                    info_arg=info_arg,
-                    return_schema=return_schema,
-                    when_used=serializer.info.when_used,
-                )
-            else:
-                assert serializer.info.mode == 'plain'
-                schema['serialization'] = core_schema.plain_serializer_function_ser_schema(
-                    serializer.func,
-                    is_field_serializer=is_field_serializer,
-                    info_arg=info_arg,
-                    return_schema=return_schema,
-                    when_used=serializer.info.when_used,
-                )
-        return schema
-
-    def _apply_model_serializers(
-        self, schema: core_schema.CoreSchema, serializers: Iterable[Decorator[ModelSerializerDecoratorInfo]]
-    ) -> core_schema.CoreSchema:
-        """Apply model serializers to a schema."""
-        ref: str | None = schema.pop('ref', None)  # type: ignore
-        if serializers:
-            serializer = list(serializers)[-1]
-            info_arg = inspect_model_serializer(serializer.func, serializer.info.mode)
-
-            try:
-                return_type = _decorators.get_function_return_type(
-                    serializer.func, serializer.info.return_type, self._types_namespace
-                )
-            except NameError as e:
-                raise PydanticUndefinedAnnotation.from_name_error(e) from e
-            if return_type is PydanticUndefined:
-                return_schema = None
-            else:
-                return_schema = self.generate_schema(return_type)
-
-            if serializer.info.mode == 'wrap':
-                ser_schema: core_schema.SerSchema = core_schema.wrap_serializer_function_ser_schema(
-                    serializer.func,
-                    info_arg=info_arg,
-                    return_schema=return_schema,
-                    when_used=serializer.info.when_used,
-                )
-            else:
-                # plain
-                ser_schema = core_schema.plain_serializer_function_ser_schema(
-                    serializer.func,
-                    info_arg=info_arg,
-                    return_schema=return_schema,
-                    when_used=serializer.info.when_used,
-                )
-            schema['serialization'] = ser_schema
-        if ref:
-            schema['ref'] = ref  # type: ignore
-        return schema
-
-
-_VALIDATOR_F_MATCH: Mapping[
-    tuple[FieldValidatorModes, Literal['no-info', 'with-info']],
-    Callable[[Callable[..., Any], core_schema.CoreSchema, str | None], core_schema.CoreSchema],
-] = {
-    ('before', 'no-info'): lambda f, schema, _: core_schema.no_info_before_validator_function(f, schema),
-    ('after', 'no-info'): lambda f, schema, _: core_schema.no_info_after_validator_function(f, schema),
-    ('plain', 'no-info'): lambda f, _1, _2: core_schema.no_info_plain_validator_function(f),
-    ('wrap', 'no-info'): lambda f, schema, _: core_schema.no_info_wrap_validator_function(f, schema),
-    ('before', 'with-info'): lambda f, schema, field_name: core_schema.with_info_before_validator_function(
-        f, schema, field_name=field_name
-    ),
-    ('after', 'with-info'): lambda f, schema, field_name: core_schema.with_info_after_validator_function(
-        f, schema, field_name=field_name
-    ),
-    ('plain', 'with-info'): lambda f, _, field_name: core_schema.with_info_plain_validator_function(
-        f, field_name=field_name
-    ),
-    ('wrap', 'with-info'): lambda f, schema, field_name: core_schema.with_info_wrap_validator_function(
-        f, schema, field_name=field_name
-    ),
-}
-
-
-def apply_validators(
-    schema: core_schema.CoreSchema,
-    validators: Iterable[Decorator[RootValidatorDecoratorInfo]]
-    | Iterable[Decorator[ValidatorDecoratorInfo]]
-    | Iterable[Decorator[FieldValidatorDecoratorInfo]],
-    field_name: str | None,
-) -> core_schema.CoreSchema:
-    """Apply validators to a schema.
-
-    Args:
-        schema: The schema to apply validators on.
-        validators: An iterable of validators.
-        field_name: The name of the field if validators are being applied to a model field.
-
-    Returns:
-        The updated schema.
-    """
-    for validator in validators:
-        info_arg = inspect_validator(validator.func, validator.info.mode)
-        val_type = 'with-info' if info_arg else 'no-info'
-
-        schema = _VALIDATOR_F_MATCH[(validator.info.mode, val_type)](validator.func, schema, field_name)
-    return schema
-
-
-def _validators_require_validate_default(validators: Iterable[Decorator[ValidatorDecoratorInfo]]) -> bool:
-    """In v1, if any of the validators for a field had `always=True`, the default value would be validated.
-
-    This serves as an auxiliary function for re-implementing that logic, by looping over a provided
-    collection of (v1-style) ValidatorDecoratorInfo's and checking if any of them have `always=True`.
-
-    We should be able to drop this function and the associated logic calling it once we drop support
-    for v1-style validator decorators. (Or we can extend it and keep it if we add something equivalent
-    to the v1-validator `always` kwarg to `field_validator`.)
-    """
-    for validator in validators:
-        if validator.info.always:
-            return True
-    return False
-
-
-def apply_model_validators(
-    schema: core_schema.CoreSchema,
-    validators: Iterable[Decorator[ModelValidatorDecoratorInfo]],
-    mode: Literal['inner', 'outer', 'all'],
-) -> core_schema.CoreSchema:
-    """Apply model validators to a schema.
-
-    If mode == 'inner', only "before" validators are applied
-    If mode == 'outer', validators other than "before" are applied
-    If mode == 'all', all validators are applied
-
-    Args:
-        schema: The schema to apply validators on.
-        validators: An iterable of validators.
-        mode: The validator mode.
-
-    Returns:
-        The updated schema.
-    """
-    ref: str | None = schema.pop('ref', None)  # type: ignore
-    for validator in validators:
-        if mode == 'inner' and validator.info.mode != 'before':
-            continue
-        if mode == 'outer' and validator.info.mode == 'before':
-            continue
-        info_arg = inspect_validator(validator.func, validator.info.mode)
-        if validator.info.mode == 'wrap':
-            if info_arg:
-                schema = core_schema.with_info_wrap_validator_function(function=validator.func, schema=schema)
-            else:
-                schema = core_schema.no_info_wrap_validator_function(function=validator.func, schema=schema)
-        elif validator.info.mode == 'before':
-            if info_arg:
-                schema = core_schema.with_info_before_validator_function(function=validator.func, schema=schema)
-            else:
-                schema = core_schema.no_info_before_validator_function(function=validator.func, schema=schema)
-        else:
-            assert validator.info.mode == 'after'
-            if info_arg:
-                schema = core_schema.with_info_after_validator_function(function=validator.func, schema=schema)
-            else:
-                schema = core_schema.no_info_after_validator_function(function=validator.func, schema=schema)
-    if ref:
-        schema['ref'] = ref  # type: ignore
-    return schema
-
-
-def wrap_default(field_info: FieldInfo, schema: core_schema.CoreSchema) -> core_schema.CoreSchema:
-    """Wrap schema with default schema if default value or `default_factory` are available.
-
-    Args:
-        field_info: The field info object.
-        schema: The schema to apply default on.
-
-    Returns:
-        Updated schema by default value or `default_factory`.
-    """
-    if field_info.default_factory:
-        return core_schema.with_default_schema(
-            schema, default_factory=field_info.default_factory, validate_default=field_info.validate_default
-        )
-    elif field_info.default is not PydanticUndefined:
-        return core_schema.with_default_schema(
-            schema, default=field_info.default, validate_default=field_info.validate_default
-        )
-    else:
-        return schema
-
-
-def _extract_get_pydantic_json_schema(tp: Any, schema: CoreSchema) -> GetJsonSchemaFunction | None:
-    """Extract `__get_pydantic_json_schema__` from a type, handling the deprecated `__modify_schema__`."""
-    js_modify_function = getattr(tp, '__get_pydantic_json_schema__', None)
-
-    if hasattr(tp, '__modify_schema__'):
-        from pydantic import BaseModel  # circular reference
-
-        has_custom_v2_modify_js_func = (
-            js_modify_function is not None
-            and BaseModel.__get_pydantic_json_schema__.__func__  # type: ignore
-            not in (js_modify_function, getattr(js_modify_function, '__func__', None))
-        )
-
-        if not has_custom_v2_modify_js_func:
-            raise PydanticUserError(
-                'The `__modify_schema__` method is not supported in Pydantic v2. '
-                'Use `__get_pydantic_json_schema__` instead.',
-                code='custom-json-schema',
-            )
-
-    # handle GenericAlias' but ignore Annotated which "lies" about its origin (in this case it would be `int`)
-    if hasattr(tp, '__origin__') and not isinstance(tp, type(Annotated[int, 'placeholder'])):
-        return _extract_get_pydantic_json_schema(tp.__origin__, schema)
-
-    if js_modify_function is None:
-        return None
-
-    return js_modify_function
-
-
-def get_json_schema_update_func(
-    json_schema_update: JsonSchemaValue, json_schema_extra: JsonDict | typing.Callable[[JsonDict], None] | None
-) -> GetJsonSchemaFunction:
-    def json_schema_update_func(
-        core_schema_or_field: CoreSchemaOrField, handler: GetJsonSchemaHandler
-    ) -> JsonSchemaValue:
-        json_schema = {**handler(core_schema_or_field), **json_schema_update}
-        add_json_schema_extra(json_schema, json_schema_extra)
-        return json_schema
-
-    return json_schema_update_func
-
-
-def add_json_schema_extra(
-    json_schema: JsonSchemaValue, json_schema_extra: JsonDict | typing.Callable[[JsonDict], None] | None
-):
-    if isinstance(json_schema_extra, dict):
-        json_schema.update(to_jsonable_python(json_schema_extra))
-    elif callable(json_schema_extra):
-        json_schema_extra(json_schema)
-
-
-class _CommonField(TypedDict):
-    schema: core_schema.CoreSchema
-    validation_alias: str | list[str | int] | list[list[str | int]] | None
-    serialization_alias: str | None
-    serialization_exclude: bool | None
-    frozen: bool | None
-    metadata: dict[str, Any]
-
-
-def _common_field(
-    schema: core_schema.CoreSchema,
-    *,
-    validation_alias: str | list[str | int] | list[list[str | int]] | None = None,
-    serialization_alias: str | None = None,
-    serialization_exclude: bool | None = None,
-    frozen: bool | None = None,
-    metadata: Any = None,
-) -> _CommonField:
-    return {
-        'schema': schema,
-        'validation_alias': validation_alias,
-        'serialization_alias': serialization_alias,
-        'serialization_exclude': serialization_exclude,
-        'frozen': frozen,
-        'metadata': metadata,
-    }
-
-
-class _Definitions:
-    """Keeps track of references and definitions."""
-
-    def __init__(self) -> None:
-        self.seen: set[str] = set()
-        self.definitions: dict[str, core_schema.CoreSchema] = {}
-
-    @contextmanager
-    def get_schema_or_ref(self, tp: Any) -> Iterator[tuple[str, None] | tuple[str, CoreSchema]]:
-        """Get a definition for `tp` if one exists.
-
-        If a definition exists, a tuple of `(ref_string, CoreSchema)` is returned.
-        If no definition exists yet, a tuple of `(ref_string, None)` is returned.
-
-        Note that the returned `CoreSchema` will always be a `DefinitionReferenceSchema`,
-        not the actual definition itself.
-
-        This should be called for any type that can be identified by reference.
-        This includes any recursive types.
-
-        At present the following types can be named/recursive:
-
-        - BaseModel
-        - Dataclasses
-        - TypedDict
-        - TypeAliasType
-        """
-        ref = get_type_ref(tp)
-        # return the reference if we're either (1) in a cycle or (2) it was already defined
-        if ref in self.seen or ref in self.definitions:
-            yield (ref, core_schema.definition_reference_schema(ref))
-        else:
-            self.seen.add(ref)
-            try:
-                yield (ref, None)
-            finally:
-                self.seen.discard(ref)
-
-
-def resolve_original_schema(schema: CoreSchema, definitions: dict[str, CoreSchema]) -> CoreSchema | None:
-    if schema['type'] == 'definition-ref':
-        return definitions.get(schema['schema_ref'], None)
-    elif schema['type'] == 'definitions':
-        return schema['schema']
-    else:
-        return schema
-
-
-class _FieldNameStack:
-    __slots__ = ('_stack',)
-
-    def __init__(self) -> None:
-        self._stack: list[str] = []
-
-    @contextmanager
-    def push(self, field_name: str) -> Iterator[None]:
-        self._stack.append(field_name)
-        yield
-        self._stack.pop()
-
-    def get(self) -> str | None:
-        if self._stack:
-            return self._stack[-1]
-        else:
-            return None
diff --git a/lib/pydantic/_internal/_generics.py b/lib/pydantic/_internal/_generics.py
deleted file mode 100644
index 5a66eaa9..00000000
--- a/lib/pydantic/_internal/_generics.py
+++ /dev/null
@@ -1,517 +0,0 @@
-from __future__ import annotations
-
-import sys
-import types
-import typing
-from collections import ChainMap
-from contextlib import contextmanager
-from contextvars import ContextVar
-from types import prepare_class
-from typing import TYPE_CHECKING, Any, Iterator, List, Mapping, MutableMapping, Tuple, TypeVar
-from weakref import WeakValueDictionary
-
-import typing_extensions
-
-from ._core_utils import get_type_ref
-from ._forward_ref import PydanticRecursiveRef
-from ._typing_extra import TypeVarType, typing_base
-from ._utils import all_identical, is_model_class
-
-if sys.version_info >= (3, 10):
-    from typing import _UnionGenericAlias  # type: ignore[attr-defined]
-
-if TYPE_CHECKING:
-    from ..main import BaseModel
-
-GenericTypesCacheKey = Tuple[Any, Any, Tuple[Any, ...]]
-
-# Note: We want to remove LimitedDict, but to do this, we'd need to improve the handling of generics caching.
-#   Right now, to handle recursive generics, we some types must remain cached for brief periods without references.
-#   By chaining the WeakValuesDict with a LimitedDict, we have a way to retain caching for all types with references,
-#   while also retaining a limited number of types even without references. This is generally enough to build
-#   specific recursive generic models without losing required items out of the cache.
-
-KT = TypeVar('KT')
-VT = TypeVar('VT')
-_LIMITED_DICT_SIZE = 100
-if TYPE_CHECKING:
-
-    class LimitedDict(dict, MutableMapping[KT, VT]):
-        def __init__(self, size_limit: int = _LIMITED_DICT_SIZE):
-            ...
-
-else:
-
-    class LimitedDict(dict):
-        """Limit the size/length of a dict used for caching to avoid unlimited increase in memory usage.
-
-        Since the dict is ordered, and we always remove elements from the beginning, this is effectively a FIFO cache.
-        """
-
-        def __init__(self, size_limit: int = _LIMITED_DICT_SIZE):
-            self.size_limit = size_limit
-            super().__init__()
-
-        def __setitem__(self, __key: Any, __value: Any) -> None:
-            super().__setitem__(__key, __value)
-            if len(self) > self.size_limit:
-                excess = len(self) - self.size_limit + self.size_limit // 10
-                to_remove = list(self.keys())[:excess]
-                for key in to_remove:
-                    del self[key]
-
-
-# weak dictionaries allow the dynamically created parametrized versions of generic models to get collected
-# once they are no longer referenced by the caller.
-if sys.version_info >= (3, 9):  # Typing for weak dictionaries available at 3.9
-    GenericTypesCache = WeakValueDictionary[GenericTypesCacheKey, 'type[BaseModel]']
-else:
-    GenericTypesCache = WeakValueDictionary
-
-if TYPE_CHECKING:
-
-    class DeepChainMap(ChainMap[KT, VT]):  # type: ignore
-        ...
-
-else:
-
-    class DeepChainMap(ChainMap):
-        """Variant of ChainMap that allows direct updates to inner scopes.
-
-        Taken from https://docs.python.org/3/library/collections.html#collections.ChainMap,
-        with some light modifications for this use case.
-        """
-
-        def clear(self) -> None:
-            for mapping in self.maps:
-                mapping.clear()
-
-        def __setitem__(self, key: KT, value: VT) -> None:
-            for mapping in self.maps:
-                mapping[key] = value
-
-        def __delitem__(self, key: KT) -> None:
-            hit = False
-            for mapping in self.maps:
-                if key in mapping:
-                    del mapping[key]
-                    hit = True
-            if not hit:
-                raise KeyError(key)
-
-
-# Despite the fact that LimitedDict _seems_ no longer necessary, I'm very nervous to actually remove it
-# and discover later on that we need to re-add all this infrastructure...
-# _GENERIC_TYPES_CACHE = DeepChainMap(GenericTypesCache(), LimitedDict())
-
-_GENERIC_TYPES_CACHE = GenericTypesCache()
-
-
-class PydanticGenericMetadata(typing_extensions.TypedDict):
-    origin: type[BaseModel] | None  # analogous to typing._GenericAlias.__origin__
-    args: tuple[Any, ...]  # analogous to typing._GenericAlias.__args__
-    parameters: tuple[type[Any], ...]  # analogous to typing.Generic.__parameters__
-
-
-def create_generic_submodel(
-    model_name: str, origin: type[BaseModel], args: tuple[Any, ...], params: tuple[Any, ...]
-) -> type[BaseModel]:
-    """Dynamically create a submodel of a provided (generic) BaseModel.
-
-    This is used when producing concrete parametrizations of generic models. This function
-    only *creates* the new subclass; the schema/validators/serialization must be updated to
-    reflect a concrete parametrization elsewhere.
-
-    Args:
-        model_name: The name of the newly created model.
-        origin: The base class for the new model to inherit from.
-        args: A tuple of generic metadata arguments.
-        params: A tuple of generic metadata parameters.
-
-    Returns:
-        The created submodel.
-    """
-    namespace: dict[str, Any] = {'__module__': origin.__module__}
-    bases = (origin,)
-    meta, ns, kwds = prepare_class(model_name, bases)
-    namespace.update(ns)
-    created_model = meta(
-        model_name,
-        bases,
-        namespace,
-        __pydantic_generic_metadata__={
-            'origin': origin,
-            'args': args,
-            'parameters': params,
-        },
-        __pydantic_reset_parent_namespace__=False,
-        **kwds,
-    )
-
-    model_module, called_globally = _get_caller_frame_info(depth=3)
-    if called_globally:  # create global reference and therefore allow pickling
-        object_by_reference = None
-        reference_name = model_name
-        reference_module_globals = sys.modules[created_model.__module__].__dict__
-        while object_by_reference is not created_model:
-            object_by_reference = reference_module_globals.setdefault(reference_name, created_model)
-            reference_name += '_'
-
-    return created_model
-
-
-def _get_caller_frame_info(depth: int = 2) -> tuple[str | None, bool]:
-    """Used inside a function to check whether it was called globally.
-
-    Args:
-        depth: The depth to get the frame.
-
-    Returns:
-        A tuple contains `module_name` and `called_globally`.
-
-    Raises:
-        RuntimeError: If the function is not called inside a function.
-    """
-    try:
-        previous_caller_frame = sys._getframe(depth)
-    except ValueError as e:
-        raise RuntimeError('This function must be used inside another function') from e
-    except AttributeError:  # sys module does not have _getframe function, so there's nothing we can do about it
-        return None, False
-    frame_globals = previous_caller_frame.f_globals
-    return frame_globals.get('__name__'), previous_caller_frame.f_locals is frame_globals
-
-
-DictValues: type[Any] = {}.values().__class__
-
-
-def iter_contained_typevars(v: Any) -> Iterator[TypeVarType]:
-    """Recursively iterate through all subtypes and type args of `v` and yield any typevars that are found.
-
-    This is inspired as an alternative to directly accessing the `__parameters__` attribute of a GenericAlias,
-    since __parameters__ of (nested) generic BaseModel subclasses won't show up in that list.
-    """
-    if isinstance(v, TypeVar):
-        yield v
-    elif is_model_class(v):
-        yield from v.__pydantic_generic_metadata__['parameters']
-    elif isinstance(v, (DictValues, list)):
-        for var in v:
-            yield from iter_contained_typevars(var)
-    else:
-        args = get_args(v)
-        for arg in args:
-            yield from iter_contained_typevars(arg)
-
-
-def get_args(v: Any) -> Any:
-    pydantic_generic_metadata: PydanticGenericMetadata | None = getattr(v, '__pydantic_generic_metadata__', None)
-    if pydantic_generic_metadata:
-        return pydantic_generic_metadata.get('args')
-    return typing_extensions.get_args(v)
-
-
-def get_origin(v: Any) -> Any:
-    pydantic_generic_metadata: PydanticGenericMetadata | None = getattr(v, '__pydantic_generic_metadata__', None)
-    if pydantic_generic_metadata:
-        return pydantic_generic_metadata.get('origin')
-    return typing_extensions.get_origin(v)
-
-
-def get_standard_typevars_map(cls: type[Any]) -> dict[TypeVarType, Any] | None:
-    """Package a generic type's typevars and parametrization (if present) into a dictionary compatible with the
-    `replace_types` function. Specifically, this works with standard typing generics and typing._GenericAlias.
-    """
-    origin = get_origin(cls)
-    if origin is None:
-        return None
-    if not hasattr(origin, '__parameters__'):
-        return None
-
-    # In this case, we know that cls is a _GenericAlias, and origin is the generic type
-    # So it is safe to access cls.__args__ and origin.__parameters__
-    args: tuple[Any, ...] = cls.__args__  # type: ignore
-    parameters: tuple[TypeVarType, ...] = origin.__parameters__
-    return dict(zip(parameters, args))
-
-
-def get_model_typevars_map(cls: type[BaseModel]) -> dict[TypeVarType, Any] | None:
-    """Package a generic BaseModel's typevars and concrete parametrization (if present) into a dictionary compatible
-    with the `replace_types` function.
-
-    Since BaseModel.__class_getitem__ does not produce a typing._GenericAlias, and the BaseModel generic info is
-    stored in the __pydantic_generic_metadata__ attribute, we need special handling here.
-    """
-    # TODO: This could be unified with `get_standard_typevars_map` if we stored the generic metadata
-    #   in the __origin__, __args__, and __parameters__ attributes of the model.
-    generic_metadata = cls.__pydantic_generic_metadata__
-    origin = generic_metadata['origin']
-    args = generic_metadata['args']
-    return dict(zip(iter_contained_typevars(origin), args))
-
-
-def replace_types(type_: Any, type_map: Mapping[Any, Any] | None) -> Any:
-    """Return type with all occurrences of `type_map` keys recursively replaced with their values.
-
-    Args:
-        type_: The class or generic alias.
-        type_map: Mapping from `TypeVar` instance to concrete types.
-
-    Returns:
-        A new type representing the basic structure of `type_` with all
-        `typevar_map` keys recursively replaced.
-
-    Example:
-        ```py
-        from typing import List, Tuple, Union
-
-        from pydantic._internal._generics import replace_types
-
-        replace_types(Tuple[str, Union[List[str], float]], {str: int})
-        #> Tuple[int, Union[List[int], float]]
-        ```
-    """
-    if not type_map:
-        return type_
-
-    type_args = get_args(type_)
-    origin_type = get_origin(type_)
-
-    if origin_type is typing_extensions.Annotated:
-        annotated_type, *annotations = type_args
-        annotated = replace_types(annotated_type, type_map)
-        for annotation in annotations:
-            annotated = typing_extensions.Annotated[annotated, annotation]
-        return annotated
-
-    # Having type args is a good indicator that this is a typing module
-    # class instantiation or a generic alias of some sort.
-    if type_args:
-        resolved_type_args = tuple(replace_types(arg, type_map) for arg in type_args)
-        if all_identical(type_args, resolved_type_args):
-            # If all arguments are the same, there is no need to modify the
-            # type or create a new object at all
-            return type_
-        if (
-            origin_type is not None
-            and isinstance(type_, typing_base)
-            and not isinstance(origin_type, typing_base)
-            and getattr(type_, '_name', None) is not None
-        ):
-            # In python < 3.9 generic aliases don't exist so any of these like `list`,
-            # `type` or `collections.abc.Callable` need to be translated.
-            # See: https://www.python.org/dev/peps/pep-0585
-            origin_type = getattr(typing, type_._name)
-        assert origin_type is not None
-        # PEP-604 syntax (Ex.: list | str) is represented with a types.UnionType object that does not have __getitem__.
-        # We also cannot use isinstance() since we have to compare types.
-        if sys.version_info >= (3, 10) and origin_type is types.UnionType:
-            return _UnionGenericAlias(origin_type, resolved_type_args)
-        # NotRequired[T] and Required[T] don't support tuple type resolved_type_args, hence the condition below
-        return origin_type[resolved_type_args[0] if len(resolved_type_args) == 1 else resolved_type_args]
-
-    # We handle pydantic generic models separately as they don't have the same
-    # semantics as "typing" classes or generic aliases
-
-    if not origin_type and is_model_class(type_):
-        parameters = type_.__pydantic_generic_metadata__['parameters']
-        if not parameters:
-            return type_
-        resolved_type_args = tuple(replace_types(t, type_map) for t in parameters)
-        if all_identical(parameters, resolved_type_args):
-            return type_
-        return type_[resolved_type_args]
-
-    # Handle special case for typehints that can have lists as arguments.
-    # `typing.Callable[[int, str], int]` is an example for this.
-    if isinstance(type_, (List, list)):
-        resolved_list = list(replace_types(element, type_map) for element in type_)
-        if all_identical(type_, resolved_list):
-            return type_
-        return resolved_list
-
-    # If all else fails, we try to resolve the type directly and otherwise just
-    # return the input with no modifications.
-    return type_map.get(type_, type_)
-
-
-def has_instance_in_type(type_: Any, isinstance_target: Any) -> bool:
-    """Checks if the type, or any of its arbitrary nested args, satisfy
-    `isinstance(<type>, isinstance_target)`.
-    """
-    if isinstance(type_, isinstance_target):
-        return True
-
-    type_args = get_args(type_)
-    origin_type = get_origin(type_)
-
-    if origin_type is typing_extensions.Annotated:
-        annotated_type, *annotations = type_args
-        return has_instance_in_type(annotated_type, isinstance_target)
-
-    # Having type args is a good indicator that this is a typing module
-    # class instantiation or a generic alias of some sort.
-    if any(has_instance_in_type(a, isinstance_target) for a in type_args):
-        return True
-
-    # Handle special case for typehints that can have lists as arguments.
-    # `typing.Callable[[int, str], int]` is an example for this.
-    if isinstance(type_, (List, list)) and not isinstance(type_, typing_extensions.ParamSpec):
-        if any(has_instance_in_type(element, isinstance_target) for element in type_):
-            return True
-
-    return False
-
-
-def check_parameters_count(cls: type[BaseModel], parameters: tuple[Any, ...]) -> None:
-    """Check the generic model parameters count is equal.
-
-    Args:
-        cls: The generic model.
-        parameters: A tuple of passed parameters to the generic model.
-
-    Raises:
-        TypeError: If the passed parameters count is not equal to generic model parameters count.
-    """
-    actual = len(parameters)
-    expected = len(cls.__pydantic_generic_metadata__['parameters'])
-    if actual != expected:
-        description = 'many' if actual > expected else 'few'
-        raise TypeError(f'Too {description} parameters for {cls}; actual {actual}, expected {expected}')
-
-
-_generic_recursion_cache: ContextVar[set[str] | None] = ContextVar('_generic_recursion_cache', default=None)
-
-
-@contextmanager
-def generic_recursion_self_type(
-    origin: type[BaseModel], args: tuple[Any, ...]
-) -> Iterator[PydanticRecursiveRef | None]:
-    """This contextmanager should be placed around the recursive calls used to build a generic type,
-    and accept as arguments the generic origin type and the type arguments being passed to it.
-
-    If the same origin and arguments are observed twice, it implies that a self-reference placeholder
-    can be used while building the core schema, and will produce a schema_ref that will be valid in the
-    final parent schema.
-    """
-    previously_seen_type_refs = _generic_recursion_cache.get()
-    if previously_seen_type_refs is None:
-        previously_seen_type_refs = set()
-        token = _generic_recursion_cache.set(previously_seen_type_refs)
-    else:
-        token = None
-
-    try:
-        type_ref = get_type_ref(origin, args_override=args)
-        if type_ref in previously_seen_type_refs:
-            self_type = PydanticRecursiveRef(type_ref=type_ref)
-            yield self_type
-        else:
-            previously_seen_type_refs.add(type_ref)
-            yield None
-    finally:
-        if token:
-            _generic_recursion_cache.reset(token)
-
-
-def recursively_defined_type_refs() -> set[str]:
-    visited = _generic_recursion_cache.get()
-    if not visited:
-        return set()  # not in a generic recursion, so there are no types
-
-    return visited.copy()  # don't allow modifications
-
-
-def get_cached_generic_type_early(parent: type[BaseModel], typevar_values: Any) -> type[BaseModel] | None:
-    """The use of a two-stage cache lookup approach was necessary to have the highest performance possible for
-    repeated calls to `__class_getitem__` on generic types (which may happen in tighter loops during runtime),
-    while still ensuring that certain alternative parametrizations ultimately resolve to the same type.
-
-    As a concrete example, this approach was necessary to make Model[List[T]][int] equal to Model[List[int]].
-    The approach could be modified to not use two different cache keys at different points, but the
-    _early_cache_key is optimized to be as quick to compute as possible (for repeated-access speed), and the
-    _late_cache_key is optimized to be as "correct" as possible, so that two types that will ultimately be the
-    same after resolving the type arguments will always produce cache hits.
-
-    If we wanted to move to only using a single cache key per type, we would either need to always use the
-    slower/more computationally intensive logic associated with _late_cache_key, or would need to accept
-    that Model[List[T]][int] is a different type than Model[List[T]][int]. Because we rely on subclass relationships
-    during validation, I think it is worthwhile to ensure that types that are functionally equivalent are actually
-    equal.
-    """
-    return _GENERIC_TYPES_CACHE.get(_early_cache_key(parent, typevar_values))
-
-
-def get_cached_generic_type_late(
-    parent: type[BaseModel], typevar_values: Any, origin: type[BaseModel], args: tuple[Any, ...]
-) -> type[BaseModel] | None:
-    """See the docstring of `get_cached_generic_type_early` for more information about the two-stage cache lookup."""
-    cached = _GENERIC_TYPES_CACHE.get(_late_cache_key(origin, args, typevar_values))
-    if cached is not None:
-        set_cached_generic_type(parent, typevar_values, cached, origin, args)
-    return cached
-
-
-def set_cached_generic_type(
-    parent: type[BaseModel],
-    typevar_values: tuple[Any, ...],
-    type_: type[BaseModel],
-    origin: type[BaseModel] | None = None,
-    args: tuple[Any, ...] | None = None,
-) -> None:
-    """See the docstring of `get_cached_generic_type_early` for more information about why items are cached with
-    two different keys.
-    """
-    _GENERIC_TYPES_CACHE[_early_cache_key(parent, typevar_values)] = type_
-    if len(typevar_values) == 1:
-        _GENERIC_TYPES_CACHE[_early_cache_key(parent, typevar_values[0])] = type_
-    if origin and args:
-        _GENERIC_TYPES_CACHE[_late_cache_key(origin, args, typevar_values)] = type_
-
-
-def _union_orderings_key(typevar_values: Any) -> Any:
-    """This is intended to help differentiate between Union types with the same arguments in different order.
-
-    Thanks to caching internal to the `typing` module, it is not possible to distinguish between
-    List[Union[int, float]] and List[Union[float, int]] (and similarly for other "parent" origins besides List)
-    because `typing` considers Union[int, float] to be equal to Union[float, int].
-
-    However, you _can_ distinguish between (top-level) Union[int, float] vs. Union[float, int].
-    Because we parse items as the first Union type that is successful, we get slightly more consistent behavior
-    if we make an effort to distinguish the ordering of items in a union. It would be best if we could _always_
-    get the exact-correct order of items in the union, but that would require a change to the `typing` module itself.
-    (See https://github.com/python/cpython/issues/86483 for reference.)
-    """
-    if isinstance(typevar_values, tuple):
-        args_data = []
-        for value in typevar_values:
-            args_data.append(_union_orderings_key(value))
-        return tuple(args_data)
-    elif typing_extensions.get_origin(typevar_values) is typing.Union:
-        return get_args(typevar_values)
-    else:
-        return ()
-
-
-def _early_cache_key(cls: type[BaseModel], typevar_values: Any) -> GenericTypesCacheKey:
-    """This is intended for minimal computational overhead during lookups of cached types.
-
-    Note that this is overly simplistic, and it's possible that two different cls/typevar_values
-    inputs would ultimately result in the same type being created in BaseModel.__class_getitem__.
-    To handle this, we have a fallback _late_cache_key that is checked later if the _early_cache_key
-    lookup fails, and should result in a cache hit _precisely_ when the inputs to __class_getitem__
-    would result in the same type.
-    """
-    return cls, typevar_values, _union_orderings_key(typevar_values)
-
-
-def _late_cache_key(origin: type[BaseModel], args: tuple[Any, ...], typevar_values: Any) -> GenericTypesCacheKey:
-    """This is intended for use later in the process of creating a new type, when we have more information
-    about the exact args that will be passed. If it turns out that a different set of inputs to
-    __class_getitem__ resulted in the same inputs to the generic type creation process, we can still
-    return the cached type, and update the cache with the _early_cache_key as well.
-    """
-    # The _union_orderings_key is placed at the start here to ensure there cannot be a collision with an
-    # _early_cache_key, as that function will always produce a BaseModel subclass as the first item in the key,
-    # whereas this function will always produce a tuple as the first item in the key.
-    return _union_orderings_key(typevar_values), origin, args
diff --git a/lib/pydantic/_internal/_git.py b/lib/pydantic/_internal/_git.py
deleted file mode 100644
index 9de7aaf9..00000000
--- a/lib/pydantic/_internal/_git.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""Git utilities, adopted from mypy's git utilities (https://github.com/python/mypy/blob/master/mypy/git.py)."""
-from __future__ import annotations
-
-import os
-import subprocess
-
-
-def is_git_repo(dir: str) -> bool:
-    """Is the given directory version-controlled with git?"""
-    return os.path.exists(os.path.join(dir, '.git'))
-
-
-def have_git() -> bool:
-    """Can we run the git executable?"""
-    try:
-        subprocess.check_output(['git', '--help'])
-        return True
-    except subprocess.CalledProcessError:
-        return False
-    except OSError:
-        return False
-
-
-def git_revision(dir: str) -> str:
-    """Get the SHA-1 of the HEAD of a git repository."""
-    return subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD'], cwd=dir).decode('utf-8').strip()
diff --git a/lib/pydantic/_internal/_internal_dataclass.py b/lib/pydantic/_internal/_internal_dataclass.py
deleted file mode 100644
index 317a3d9c..00000000
--- a/lib/pydantic/_internal/_internal_dataclass.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import sys
-from typing import Any, Dict
-
-dataclass_kwargs: Dict[str, Any]
-
-# `slots` is available on Python >= 3.10
-if sys.version_info >= (3, 10):
-    slots_true = {'slots': True}
-else:
-    slots_true = {}
diff --git a/lib/pydantic/_internal/_known_annotated_metadata.py b/lib/pydantic/_internal/_known_annotated_metadata.py
deleted file mode 100644
index 77caf705..00000000
--- a/lib/pydantic/_internal/_known_annotated_metadata.py
+++ /dev/null
@@ -1,410 +0,0 @@
-from __future__ import annotations
-
-from collections import defaultdict
-from copy import copy
-from functools import partial
-from typing import TYPE_CHECKING, Any, Callable, Iterable
-
-from pydantic_core import CoreSchema, PydanticCustomError, to_jsonable_python
-from pydantic_core import core_schema as cs
-
-from ._fields import PydanticMetadata
-
-if TYPE_CHECKING:
-    from ..annotated_handlers import GetJsonSchemaHandler
-
-
-STRICT = {'strict'}
-SEQUENCE_CONSTRAINTS = {'min_length', 'max_length'}
-INEQUALITY = {'le', 'ge', 'lt', 'gt'}
-NUMERIC_CONSTRAINTS = {'multiple_of', 'allow_inf_nan', *INEQUALITY}
-
-STR_CONSTRAINTS = {*SEQUENCE_CONSTRAINTS, *STRICT, 'strip_whitespace', 'to_lower', 'to_upper', 'pattern'}
-BYTES_CONSTRAINTS = {*SEQUENCE_CONSTRAINTS, *STRICT}
-
-LIST_CONSTRAINTS = {*SEQUENCE_CONSTRAINTS, *STRICT}
-TUPLE_CONSTRAINTS = {*SEQUENCE_CONSTRAINTS, *STRICT}
-SET_CONSTRAINTS = {*SEQUENCE_CONSTRAINTS, *STRICT}
-DICT_CONSTRAINTS = {*SEQUENCE_CONSTRAINTS, *STRICT}
-GENERATOR_CONSTRAINTS = {*SEQUENCE_CONSTRAINTS, *STRICT}
-
-FLOAT_CONSTRAINTS = {*NUMERIC_CONSTRAINTS, *STRICT}
-INT_CONSTRAINTS = {*NUMERIC_CONSTRAINTS, *STRICT}
-BOOL_CONSTRAINTS = STRICT
-UUID_CONSTRAINTS = STRICT
-
-DATE_TIME_CONSTRAINTS = {*NUMERIC_CONSTRAINTS, *STRICT}
-TIMEDELTA_CONSTRAINTS = {*NUMERIC_CONSTRAINTS, *STRICT}
-TIME_CONSTRAINTS = {*NUMERIC_CONSTRAINTS, *STRICT}
-LAX_OR_STRICT_CONSTRAINTS = STRICT
-
-UNION_CONSTRAINTS = {'union_mode'}
-URL_CONSTRAINTS = {
-    'max_length',
-    'allowed_schemes',
-    'host_required',
-    'default_host',
-    'default_port',
-    'default_path',
-}
-
-TEXT_SCHEMA_TYPES = ('str', 'bytes', 'url', 'multi-host-url')
-SEQUENCE_SCHEMA_TYPES = ('list', 'tuple', 'set', 'frozenset', 'generator', *TEXT_SCHEMA_TYPES)
-NUMERIC_SCHEMA_TYPES = ('float', 'int', 'date', 'time', 'timedelta', 'datetime')
-
-CONSTRAINTS_TO_ALLOWED_SCHEMAS: dict[str, set[str]] = defaultdict(set)
-for constraint in STR_CONSTRAINTS:
-    CONSTRAINTS_TO_ALLOWED_SCHEMAS[constraint].update(TEXT_SCHEMA_TYPES)
-for constraint in BYTES_CONSTRAINTS:
-    CONSTRAINTS_TO_ALLOWED_SCHEMAS[constraint].update(('bytes',))
-for constraint in LIST_CONSTRAINTS:
-    CONSTRAINTS_TO_ALLOWED_SCHEMAS[constraint].update(('list',))
-for constraint in TUPLE_CONSTRAINTS:
-    CONSTRAINTS_TO_ALLOWED_SCHEMAS[constraint].update(('tuple',))
-for constraint in SET_CONSTRAINTS:
-    CONSTRAINTS_TO_ALLOWED_SCHEMAS[constraint].update(('set', 'frozenset'))
-for constraint in DICT_CONSTRAINTS:
-    CONSTRAINTS_TO_ALLOWED_SCHEMAS[constraint].update(('dict',))
-for constraint in GENERATOR_CONSTRAINTS:
-    CONSTRAINTS_TO_ALLOWED_SCHEMAS[constraint].update(('generator',))
-for constraint in FLOAT_CONSTRAINTS:
-    CONSTRAINTS_TO_ALLOWED_SCHEMAS[constraint].update(('float',))
-for constraint in INT_CONSTRAINTS:
-    CONSTRAINTS_TO_ALLOWED_SCHEMAS[constraint].update(('int',))
-for constraint in DATE_TIME_CONSTRAINTS:
-    CONSTRAINTS_TO_ALLOWED_SCHEMAS[constraint].update(('date', 'time', 'datetime'))
-for constraint in TIMEDELTA_CONSTRAINTS:
-    CONSTRAINTS_TO_ALLOWED_SCHEMAS[constraint].update(('timedelta',))
-for constraint in TIME_CONSTRAINTS:
-    CONSTRAINTS_TO_ALLOWED_SCHEMAS[constraint].update(('time',))
-for schema_type in (*TEXT_SCHEMA_TYPES, *SEQUENCE_SCHEMA_TYPES, *NUMERIC_SCHEMA_TYPES, 'typed-dict', 'model'):
-    CONSTRAINTS_TO_ALLOWED_SCHEMAS['strict'].add(schema_type)
-for constraint in UNION_CONSTRAINTS:
-    CONSTRAINTS_TO_ALLOWED_SCHEMAS[constraint].update(('union',))
-for constraint in URL_CONSTRAINTS:
-    CONSTRAINTS_TO_ALLOWED_SCHEMAS[constraint].update(('url', 'multi-host-url'))
-for constraint in BOOL_CONSTRAINTS:
-    CONSTRAINTS_TO_ALLOWED_SCHEMAS[constraint].update(('bool',))
-for constraint in UUID_CONSTRAINTS:
-    CONSTRAINTS_TO_ALLOWED_SCHEMAS[constraint].update(('uuid',))
-for constraint in LAX_OR_STRICT_CONSTRAINTS:
-    CONSTRAINTS_TO_ALLOWED_SCHEMAS[constraint].update(('lax-or-strict',))
-
-
-def add_js_update_schema(s: cs.CoreSchema, f: Callable[[], dict[str, Any]]) -> None:
-    def update_js_schema(s: cs.CoreSchema, handler: GetJsonSchemaHandler) -> dict[str, Any]:
-        js_schema = handler(s)
-        js_schema.update(f())
-        return js_schema
-
-    if 'metadata' in s:
-        metadata = s['metadata']
-        if 'pydantic_js_functions' in s:
-            metadata['pydantic_js_functions'].append(update_js_schema)
-        else:
-            metadata['pydantic_js_functions'] = [update_js_schema]
-    else:
-        s['metadata'] = {'pydantic_js_functions': [update_js_schema]}
-
-
-def as_jsonable_value(v: Any) -> Any:
-    if type(v) not in (int, str, float, bytes, bool, type(None)):
-        return to_jsonable_python(v)
-    return v
-
-
-def expand_grouped_metadata(annotations: Iterable[Any]) -> Iterable[Any]:
-    """Expand the annotations.
-
-    Args:
-        annotations: An iterable of annotations.
-
-    Returns:
-        An iterable of expanded annotations.
-
-    Example:
-        ```py
-        from annotated_types import Ge, Len
-
-        from pydantic._internal._known_annotated_metadata import expand_grouped_metadata
-
-        print(list(expand_grouped_metadata([Ge(4), Len(5)])))
-        #> [Ge(ge=4), MinLen(min_length=5)]
-        ```
-    """
-    import annotated_types as at
-
-    from pydantic.fields import FieldInfo  # circular import
-
-    for annotation in annotations:
-        if isinstance(annotation, at.GroupedMetadata):
-            yield from annotation
-        elif isinstance(annotation, FieldInfo):
-            yield from annotation.metadata
-            # this is a bit problematic in that it results in duplicate metadata
-            # all of our "consumers" can handle it, but it is not ideal
-            # we probably should split up FieldInfo into:
-            # - annotated types metadata
-            # - individual metadata known only to Pydantic
-            annotation = copy(annotation)
-            annotation.metadata = []
-            yield annotation
-        else:
-            yield annotation
-
-
-def apply_known_metadata(annotation: Any, schema: CoreSchema) -> CoreSchema | None:  # noqa: C901
-    """Apply `annotation` to `schema` if it is an annotation we know about (Gt, Le, etc.).
-    Otherwise return `None`.
-
-    This does not handle all known annotations. If / when it does, it can always
-    return a CoreSchema and return the unmodified schema if the annotation should be ignored.
-
-    Assumes that GroupedMetadata has already been expanded via `expand_grouped_metadata`.
-
-    Args:
-        annotation: The annotation.
-        schema: The schema.
-
-    Returns:
-        An updated schema with annotation if it is an annotation we know about, `None` otherwise.
-
-    Raises:
-        PydanticCustomError: If `Predicate` fails.
-    """
-    import annotated_types as at
-
-    from . import _validators
-
-    schema = schema.copy()
-    schema_update, other_metadata = collect_known_metadata([annotation])
-    schema_type = schema['type']
-    for constraint, value in schema_update.items():
-        if constraint not in CONSTRAINTS_TO_ALLOWED_SCHEMAS:
-            raise ValueError(f'Unknown constraint {constraint}')
-        allowed_schemas = CONSTRAINTS_TO_ALLOWED_SCHEMAS[constraint]
-
-        if schema_type in allowed_schemas:
-            if constraint == 'union_mode' and schema_type == 'union':
-                schema['mode'] = value  # type: ignore  # schema is UnionSchema
-            else:
-                schema[constraint] = value
-            continue
-
-        if constraint == 'allow_inf_nan' and value is False:
-            return cs.no_info_after_validator_function(
-                _validators.forbid_inf_nan_check,
-                schema,
-            )
-        elif constraint == 'pattern':
-            # insert a str schema to make sure the regex engine matches
-            return cs.chain_schema(
-                [
-                    schema,
-                    cs.str_schema(pattern=value),
-                ]
-            )
-        elif constraint == 'gt':
-            s = cs.no_info_after_validator_function(
-                partial(_validators.greater_than_validator, gt=value),
-                schema,
-            )
-            add_js_update_schema(s, lambda: {'gt': as_jsonable_value(value)})
-            return s
-        elif constraint == 'ge':
-            return cs.no_info_after_validator_function(
-                partial(_validators.greater_than_or_equal_validator, ge=value),
-                schema,
-            )
-        elif constraint == 'lt':
-            return cs.no_info_after_validator_function(
-                partial(_validators.less_than_validator, lt=value),
-                schema,
-            )
-        elif constraint == 'le':
-            return cs.no_info_after_validator_function(
-                partial(_validators.less_than_or_equal_validator, le=value),
-                schema,
-            )
-        elif constraint == 'multiple_of':
-            return cs.no_info_after_validator_function(
-                partial(_validators.multiple_of_validator, multiple_of=value),
-                schema,
-            )
-        elif constraint == 'min_length':
-            s = cs.no_info_after_validator_function(
-                partial(_validators.min_length_validator, min_length=value),
-                schema,
-            )
-            add_js_update_schema(s, lambda: {'minLength': (as_jsonable_value(value))})
-            return s
-        elif constraint == 'max_length':
-            s = cs.no_info_after_validator_function(
-                partial(_validators.max_length_validator, max_length=value),
-                schema,
-            )
-            add_js_update_schema(s, lambda: {'maxLength': (as_jsonable_value(value))})
-            return s
-        elif constraint == 'strip_whitespace':
-            return cs.chain_schema(
-                [
-                    schema,
-                    cs.str_schema(strip_whitespace=True),
-                ]
-            )
-        elif constraint == 'to_lower':
-            return cs.chain_schema(
-                [
-                    schema,
-                    cs.str_schema(to_lower=True),
-                ]
-            )
-        elif constraint == 'to_upper':
-            return cs.chain_schema(
-                [
-                    schema,
-                    cs.str_schema(to_upper=True),
-                ]
-            )
-        elif constraint == 'min_length':
-            return cs.no_info_after_validator_function(
-                partial(_validators.min_length_validator, min_length=annotation.min_length),
-                schema,
-            )
-        elif constraint == 'max_length':
-            return cs.no_info_after_validator_function(
-                partial(_validators.max_length_validator, max_length=annotation.max_length),
-                schema,
-            )
-        else:
-            raise RuntimeError(f'Unable to apply constraint {constraint} to schema {schema_type}')
-
-    for annotation in other_metadata:
-        if isinstance(annotation, at.Gt):
-            return cs.no_info_after_validator_function(
-                partial(_validators.greater_than_validator, gt=annotation.gt),
-                schema,
-            )
-        elif isinstance(annotation, at.Ge):
-            return cs.no_info_after_validator_function(
-                partial(_validators.greater_than_or_equal_validator, ge=annotation.ge),
-                schema,
-            )
-        elif isinstance(annotation, at.Lt):
-            return cs.no_info_after_validator_function(
-                partial(_validators.less_than_validator, lt=annotation.lt),
-                schema,
-            )
-        elif isinstance(annotation, at.Le):
-            return cs.no_info_after_validator_function(
-                partial(_validators.less_than_or_equal_validator, le=annotation.le),
-                schema,
-            )
-        elif isinstance(annotation, at.MultipleOf):
-            return cs.no_info_after_validator_function(
-                partial(_validators.multiple_of_validator, multiple_of=annotation.multiple_of),
-                schema,
-            )
-        elif isinstance(annotation, at.MinLen):
-            return cs.no_info_after_validator_function(
-                partial(_validators.min_length_validator, min_length=annotation.min_length),
-                schema,
-            )
-        elif isinstance(annotation, at.MaxLen):
-            return cs.no_info_after_validator_function(
-                partial(_validators.max_length_validator, max_length=annotation.max_length),
-                schema,
-            )
-        elif isinstance(annotation, at.Predicate):
-            predicate_name = f'{annotation.func.__qualname__} ' if hasattr(annotation.func, '__qualname__') else ''
-
-            def val_func(v: Any) -> Any:
-                # annotation.func may also raise an exception, let it pass through
-                if not annotation.func(v):
-                    raise PydanticCustomError(
-                        'predicate_failed',
-                        f'Predicate {predicate_name}failed',  # type: ignore
-                    )
-                return v
-
-            return cs.no_info_after_validator_function(val_func, schema)
-        # ignore any other unknown metadata
-        return None
-
-    return schema
-
-
-def collect_known_metadata(annotations: Iterable[Any]) -> tuple[dict[str, Any], list[Any]]:
-    """Split `annotations` into known metadata and unknown annotations.
-
-    Args:
-        annotations: An iterable of annotations.
-
-    Returns:
-        A tuple contains a dict of known metadata and a list of unknown annotations.
-
-    Example:
-        ```py
-        from annotated_types import Gt, Len
-
-        from pydantic._internal._known_annotated_metadata import collect_known_metadata
-
-        print(collect_known_metadata([Gt(1), Len(42), ...]))
-        #> ({'gt': 1, 'min_length': 42}, [Ellipsis])
-        ```
-    """
-    import annotated_types as at
-
-    annotations = expand_grouped_metadata(annotations)
-
-    res: dict[str, Any] = {}
-    remaining: list[Any] = []
-    for annotation in annotations:
-        # isinstance(annotation, PydanticMetadata) also covers ._fields:_PydanticGeneralMetadata
-        if isinstance(annotation, PydanticMetadata):
-            res.update(annotation.__dict__)
-        # we don't use dataclasses.asdict because that recursively calls asdict on the field values
-        elif isinstance(annotation, at.MinLen):
-            res.update({'min_length': annotation.min_length})
-        elif isinstance(annotation, at.MaxLen):
-            res.update({'max_length': annotation.max_length})
-        elif isinstance(annotation, at.Gt):
-            res.update({'gt': annotation.gt})
-        elif isinstance(annotation, at.Ge):
-            res.update({'ge': annotation.ge})
-        elif isinstance(annotation, at.Lt):
-            res.update({'lt': annotation.lt})
-        elif isinstance(annotation, at.Le):
-            res.update({'le': annotation.le})
-        elif isinstance(annotation, at.MultipleOf):
-            res.update({'multiple_of': annotation.multiple_of})
-        elif isinstance(annotation, type) and issubclass(annotation, PydanticMetadata):
-            # also support PydanticMetadata classes being used without initialisation,
-            # e.g. `Annotated[int, Strict]` as well as `Annotated[int, Strict()]`
-            res.update({k: v for k, v in vars(annotation).items() if not k.startswith('_')})
-        else:
-            remaining.append(annotation)
-    # Nones can sneak in but pydantic-core will reject them
-    # it'd be nice to clean things up so we don't put in None (we probably don't _need_ to, it was just easier)
-    # but this is simple enough to kick that can down the road
-    res = {k: v for k, v in res.items() if v is not None}
-    return res, remaining
-
-
-def check_metadata(metadata: dict[str, Any], allowed: Iterable[str], source_type: Any) -> None:
-    """A small utility function to validate that the given metadata can be applied to the target.
-    More than saving lines of code, this gives us a consistent error message for all of our internal implementations.
-
-    Args:
-        metadata: A dict of metadata.
-        allowed: An iterable of allowed metadata.
-        source_type: The source type.
-
-    Raises:
-        TypeError: If there is metadatas that can't be applied on source type.
-    """
-    unknown = metadata.keys() - set(allowed)
-    if unknown:
-        raise TypeError(
-            f'The following constraints cannot be applied to {source_type!r}: {", ".join([f"{k!r}" for k in unknown])}'
-        )
diff --git a/lib/pydantic/_internal/_mock_val_ser.py b/lib/pydantic/_internal/_mock_val_ser.py
deleted file mode 100644
index b303fed2..00000000
--- a/lib/pydantic/_internal/_mock_val_ser.py
+++ /dev/null
@@ -1,140 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING, Callable, Generic, TypeVar
-
-from pydantic_core import SchemaSerializer, SchemaValidator
-from typing_extensions import Literal
-
-from ..errors import PydanticErrorCodes, PydanticUserError
-
-if TYPE_CHECKING:
-    from ..dataclasses import PydanticDataclass
-    from ..main import BaseModel
-
-
-ValSer = TypeVar('ValSer', SchemaValidator, SchemaSerializer)
-
-
-class MockValSer(Generic[ValSer]):
-    """Mocker for `pydantic_core.SchemaValidator` or `pydantic_core.SchemaSerializer` which optionally attempts to
-    rebuild the thing it's mocking when one of its methods is accessed and raises an error if that fails.
-    """
-
-    __slots__ = '_error_message', '_code', '_val_or_ser', '_attempt_rebuild'
-
-    def __init__(
-        self,
-        error_message: str,
-        *,
-        code: PydanticErrorCodes,
-        val_or_ser: Literal['validator', 'serializer'],
-        attempt_rebuild: Callable[[], ValSer | None] | None = None,
-    ) -> None:
-        self._error_message = error_message
-        self._val_or_ser = SchemaValidator if val_or_ser == 'validator' else SchemaSerializer
-        self._code: PydanticErrorCodes = code
-        self._attempt_rebuild = attempt_rebuild
-
-    def __getattr__(self, item: str) -> None:
-        __tracebackhide__ = True
-        if self._attempt_rebuild:
-            val_ser = self._attempt_rebuild()
-            if val_ser is not None:
-                return getattr(val_ser, item)
-
-        # raise an AttributeError if `item` doesn't exist
-        getattr(self._val_or_ser, item)
-        raise PydanticUserError(self._error_message, code=self._code)
-
-    def rebuild(self) -> ValSer | None:
-        if self._attempt_rebuild:
-            val_ser = self._attempt_rebuild()
-            if val_ser is not None:
-                return val_ser
-            else:
-                raise PydanticUserError(self._error_message, code=self._code)
-        return None
-
-
-def set_model_mocks(cls: type[BaseModel], cls_name: str, undefined_name: str = 'all referenced types') -> None:
-    """Set `__pydantic_validator__` and `__pydantic_serializer__` to `MockValSer`s on a model.
-
-    Args:
-        cls: The model class to set the mocks on
-        cls_name: Name of the model class, used in error messages
-        undefined_name: Name of the undefined thing, used in error messages
-    """
-    undefined_type_error_message = (
-        f'`{cls_name}` is not fully defined; you should define {undefined_name},'
-        f' then call `{cls_name}.model_rebuild()`.'
-    )
-
-    def attempt_rebuild_validator() -> SchemaValidator | None:
-        if cls.model_rebuild(raise_errors=False, _parent_namespace_depth=5) is not False:
-            return cls.__pydantic_validator__
-        else:
-            return None
-
-    cls.__pydantic_validator__ = MockValSer(  # type: ignore[assignment]
-        undefined_type_error_message,
-        code='class-not-fully-defined',
-        val_or_ser='validator',
-        attempt_rebuild=attempt_rebuild_validator,
-    )
-
-    def attempt_rebuild_serializer() -> SchemaSerializer | None:
-        if cls.model_rebuild(raise_errors=False, _parent_namespace_depth=5) is not False:
-            return cls.__pydantic_serializer__
-        else:
-            return None
-
-    cls.__pydantic_serializer__ = MockValSer(  # type: ignore[assignment]
-        undefined_type_error_message,
-        code='class-not-fully-defined',
-        val_or_ser='serializer',
-        attempt_rebuild=attempt_rebuild_serializer,
-    )
-
-
-def set_dataclass_mocks(
-    cls: type[PydanticDataclass], cls_name: str, undefined_name: str = 'all referenced types'
-) -> None:
-    """Set `__pydantic_validator__` and `__pydantic_serializer__` to `MockValSer`s on a dataclass.
-
-    Args:
-        cls: The model class to set the mocks on
-        cls_name: Name of the model class, used in error messages
-        undefined_name: Name of the undefined thing, used in error messages
-    """
-    from ..dataclasses import rebuild_dataclass
-
-    undefined_type_error_message = (
-        f'`{cls_name}` is not fully defined; you should define {undefined_name},'
-        f' then call `pydantic.dataclasses.rebuild_dataclass({cls_name})`.'
-    )
-
-    def attempt_rebuild_validator() -> SchemaValidator | None:
-        if rebuild_dataclass(cls, raise_errors=False, _parent_namespace_depth=5) is not False:
-            return cls.__pydantic_validator__
-        else:
-            return None
-
-    cls.__pydantic_validator__ = MockValSer(  # type: ignore[assignment]
-        undefined_type_error_message,
-        code='class-not-fully-defined',
-        val_or_ser='validator',
-        attempt_rebuild=attempt_rebuild_validator,
-    )
-
-    def attempt_rebuild_serializer() -> SchemaSerializer | None:
-        if rebuild_dataclass(cls, raise_errors=False, _parent_namespace_depth=5) is not False:
-            return cls.__pydantic_serializer__
-        else:
-            return None
-
-    cls.__pydantic_serializer__ = MockValSer(  # type: ignore[assignment]
-        undefined_type_error_message,
-        code='class-not-fully-defined',
-        val_or_ser='validator',
-        attempt_rebuild=attempt_rebuild_serializer,
-    )
diff --git a/lib/pydantic/_internal/_model_construction.py b/lib/pydantic/_internal/_model_construction.py
deleted file mode 100644
index 543f73e9..00000000
--- a/lib/pydantic/_internal/_model_construction.py
+++ /dev/null
@@ -1,637 +0,0 @@
-"""Private logic for creating models."""
-from __future__ import annotations as _annotations
-
-import operator
-import typing
-import warnings
-import weakref
-from abc import ABCMeta
-from functools import partial
-from types import FunctionType
-from typing import Any, Callable, Generic
-
-import typing_extensions
-from pydantic_core import PydanticUndefined, SchemaSerializer
-from typing_extensions import dataclass_transform, deprecated
-
-from ..errors import PydanticUndefinedAnnotation, PydanticUserError
-from ..plugin._schema_validator import create_schema_validator
-from ..warnings import GenericBeforeBaseModelWarning, PydanticDeprecatedSince20
-from ._config import ConfigWrapper
-from ._decorators import DecoratorInfos, PydanticDescriptorProxy, get_attribute_from_bases
-from ._fields import collect_model_fields, is_valid_field_name, is_valid_privateattr_name
-from ._generate_schema import GenerateSchema
-from ._generics import PydanticGenericMetadata, get_model_typevars_map
-from ._mock_val_ser import MockValSer, set_model_mocks
-from ._schema_generation_shared import CallbackGetCoreSchemaHandler
-from ._signature import generate_pydantic_signature
-from ._typing_extra import get_cls_types_namespace, is_annotated, is_classvar, parent_frame_namespace
-from ._utils import ClassAttribute, SafeGetItemProxy
-from ._validate_call import ValidateCallWrapper
-
-if typing.TYPE_CHECKING:
-    from ..fields import Field as PydanticModelField
-    from ..fields import FieldInfo, ModelPrivateAttr
-    from ..main import BaseModel
-else:
-    # See PyCharm issues https://youtrack.jetbrains.com/issue/PY-21915
-    # and https://youtrack.jetbrains.com/issue/PY-51428
-    DeprecationWarning = PydanticDeprecatedSince20
-    PydanticModelField = object()
-
-object_setattr = object.__setattr__
-
-
-class _ModelNamespaceDict(dict):
-    """A dictionary subclass that intercepts attribute setting on model classes and
-    warns about overriding of decorators.
-    """
-
-    def __setitem__(self, k: str, v: object) -> None:
-        existing: Any = self.get(k, None)
-        if existing and v is not existing and isinstance(existing, PydanticDescriptorProxy):
-            warnings.warn(f'`{k}` overrides an existing Pydantic `{existing.decorator_info.decorator_repr}` decorator')
-
-        return super().__setitem__(k, v)
-
-
-@dataclass_transform(kw_only_default=True, field_specifiers=(PydanticModelField,))
-class ModelMetaclass(ABCMeta):
-    def __new__(
-        mcs,
-        cls_name: str,
-        bases: tuple[type[Any], ...],
-        namespace: dict[str, Any],
-        __pydantic_generic_metadata__: PydanticGenericMetadata | None = None,
-        __pydantic_reset_parent_namespace__: bool = True,
-        _create_model_module: str | None = None,
-        **kwargs: Any,
-    ) -> type:
-        """Metaclass for creating Pydantic models.
-
-        Args:
-            cls_name: The name of the class to be created.
-            bases: The base classes of the class to be created.
-            namespace: The attribute dictionary of the class to be created.
-            __pydantic_generic_metadata__: Metadata for generic models.
-            __pydantic_reset_parent_namespace__: Reset parent namespace.
-            _create_model_module: The module of the class to be created, if created by `create_model`.
-            **kwargs: Catch-all for any other keyword arguments.
-
-        Returns:
-            The new class created by the metaclass.
-        """
-        # Note `ModelMetaclass` refers to `BaseModel`, but is also used to *create* `BaseModel`, so we rely on the fact
-        # that `BaseModel` itself won't have any bases, but any subclass of it will, to determine whether the `__new__`
-        # call we're in the middle of is for the `BaseModel` class.
-        if bases:
-            base_field_names, class_vars, base_private_attributes = mcs._collect_bases_data(bases)
-
-            config_wrapper = ConfigWrapper.for_model(bases, namespace, kwargs)
-            namespace['model_config'] = config_wrapper.config_dict
-            private_attributes = inspect_namespace(
-                namespace, config_wrapper.ignored_types, class_vars, base_field_names
-            )
-            if private_attributes:
-                original_model_post_init = get_model_post_init(namespace, bases)
-                if original_model_post_init is not None:
-                    # if there are private_attributes and a model_post_init function, we handle both
-
-                    def wrapped_model_post_init(self: BaseModel, __context: Any) -> None:
-                        """We need to both initialize private attributes and call the user-defined model_post_init
-                        method.
-                        """
-                        init_private_attributes(self, __context)
-                        original_model_post_init(self, __context)
-
-                    namespace['model_post_init'] = wrapped_model_post_init
-                else:
-                    namespace['model_post_init'] = init_private_attributes
-
-            namespace['__class_vars__'] = class_vars
-            namespace['__private_attributes__'] = {**base_private_attributes, **private_attributes}
-
-            cls: type[BaseModel] = super().__new__(mcs, cls_name, bases, namespace, **kwargs)  # type: ignore
-
-            from ..main import BaseModel
-
-            mro = cls.__mro__
-            if Generic in mro and mro.index(Generic) < mro.index(BaseModel):
-                warnings.warn(
-                    GenericBeforeBaseModelWarning(
-                        'Classes should inherit from `BaseModel` before generic classes (e.g. `typing.Generic[T]`) '
-                        'for pydantic generics to work properly.'
-                    ),
-                    stacklevel=2,
-                )
-
-            cls.__pydantic_custom_init__ = not getattr(cls.__init__, '__pydantic_base_init__', False)
-            cls.__pydantic_post_init__ = None if cls.model_post_init is BaseModel.model_post_init else 'model_post_init'
-
-            cls.__pydantic_decorators__ = DecoratorInfos.build(cls)
-
-            # Use the getattr below to grab the __parameters__ from the `typing.Generic` parent class
-            if __pydantic_generic_metadata__:
-                cls.__pydantic_generic_metadata__ = __pydantic_generic_metadata__
-            else:
-                parent_parameters = getattr(cls, '__pydantic_generic_metadata__', {}).get('parameters', ())
-                parameters = getattr(cls, '__parameters__', None) or parent_parameters
-                if parameters and parent_parameters and not all(x in parameters for x in parent_parameters):
-                    combined_parameters = parent_parameters + tuple(x for x in parameters if x not in parent_parameters)
-                    parameters_str = ', '.join([str(x) for x in combined_parameters])
-                    generic_type_label = f'typing.Generic[{parameters_str}]'
-                    error_message = (
-                        f'All parameters must be present on typing.Generic;'
-                        f' you should inherit from {generic_type_label}.'
-                    )
-                    if Generic not in bases:  # pragma: no cover
-                        # We raise an error here not because it is desirable, but because some cases are mishandled.
-                        # It would be nice to remove this error and still have things behave as expected, it's just
-                        # challenging because we are using a custom `__class_getitem__` to parametrize generic models,
-                        # and not returning a typing._GenericAlias from it.
-                        bases_str = ', '.join([x.__name__ for x in bases] + [generic_type_label])
-                        error_message += (
-                            f' Note: `typing.Generic` must go last: `class {cls.__name__}({bases_str}): ...`)'
-                        )
-                    raise TypeError(error_message)
-
-                cls.__pydantic_generic_metadata__ = {
-                    'origin': None,
-                    'args': (),
-                    'parameters': parameters,
-                }
-
-            cls.__pydantic_complete__ = False  # Ensure this specific class gets completed
-
-            # preserve `__set_name__` protocol defined in https://peps.python.org/pep-0487
-            # for attributes not in `new_namespace` (e.g. private attributes)
-            for name, obj in private_attributes.items():
-                obj.__set_name__(cls, name)
-
-            if __pydantic_reset_parent_namespace__:
-                cls.__pydantic_parent_namespace__ = build_lenient_weakvaluedict(parent_frame_namespace())
-            parent_namespace = getattr(cls, '__pydantic_parent_namespace__', None)
-            if isinstance(parent_namespace, dict):
-                parent_namespace = unpack_lenient_weakvaluedict(parent_namespace)
-
-            types_namespace = get_cls_types_namespace(cls, parent_namespace)
-            set_model_fields(cls, bases, config_wrapper, types_namespace)
-
-            if config_wrapper.frozen and '__hash__' not in namespace:
-                set_default_hash_func(cls, bases)
-
-            complete_model_class(
-                cls,
-                cls_name,
-                config_wrapper,
-                raise_errors=False,
-                types_namespace=types_namespace,
-                create_model_module=_create_model_module,
-            )
-
-            # If this is placed before the complete_model_class call above,
-            # the generic computed fields return type is set to PydanticUndefined
-            cls.model_computed_fields = {k: v.info for k, v in cls.__pydantic_decorators__.computed_fields.items()}
-
-            # using super(cls, cls) on the next line ensures we only call the parent class's __pydantic_init_subclass__
-            # I believe the `type: ignore` is only necessary because mypy doesn't realize that this code branch is
-            # only hit for _proper_ subclasses of BaseModel
-            super(cls, cls).__pydantic_init_subclass__(**kwargs)  # type: ignore[misc]
-            return cls
-        else:
-            # this is the BaseModel class itself being created, no logic required
-            return super().__new__(mcs, cls_name, bases, namespace, **kwargs)
-
-    if not typing.TYPE_CHECKING:  # pragma: no branch
-        # We put `__getattr__` in a non-TYPE_CHECKING block because otherwise, mypy allows arbitrary attribute access
-
-        def __getattr__(self, item: str) -> Any:
-            """This is necessary to keep attribute access working for class attribute access."""
-            private_attributes = self.__dict__.get('__private_attributes__')
-            if private_attributes and item in private_attributes:
-                return private_attributes[item]
-            if item == '__pydantic_core_schema__':
-                # This means the class didn't get a schema generated for it, likely because there was an undefined reference
-                maybe_mock_validator = getattr(self, '__pydantic_validator__', None)
-                if isinstance(maybe_mock_validator, MockValSer):
-                    rebuilt_validator = maybe_mock_validator.rebuild()
-                    if rebuilt_validator is not None:
-                        # In this case, a validator was built, and so `__pydantic_core_schema__` should now be set
-                        return getattr(self, '__pydantic_core_schema__')
-            raise AttributeError(item)
-
-    @classmethod
-    def __prepare__(cls, *args: Any, **kwargs: Any) -> dict[str, object]:
-        return _ModelNamespaceDict()
-
-    def __instancecheck__(self, instance: Any) -> bool:
-        """Avoid calling ABC _abc_subclasscheck unless we're pretty sure.
-
-        See #3829 and python/cpython#92810
-        """
-        return hasattr(instance, '__pydantic_validator__') and super().__instancecheck__(instance)
-
-    @staticmethod
-    def _collect_bases_data(bases: tuple[type[Any], ...]) -> tuple[set[str], set[str], dict[str, ModelPrivateAttr]]:
-        from ..main import BaseModel
-
-        field_names: set[str] = set()
-        class_vars: set[str] = set()
-        private_attributes: dict[str, ModelPrivateAttr] = {}
-        for base in bases:
-            if issubclass(base, BaseModel) and base is not BaseModel:
-                # model_fields might not be defined yet in the case of generics, so we use getattr here:
-                field_names.update(getattr(base, 'model_fields', {}).keys())
-                class_vars.update(base.__class_vars__)
-                private_attributes.update(base.__private_attributes__)
-        return field_names, class_vars, private_attributes
-
-    @property
-    @deprecated('The `__fields__` attribute is deprecated, use `model_fields` instead.', category=None)
-    def __fields__(self) -> dict[str, FieldInfo]:
-        warnings.warn(
-            'The `__fields__` attribute is deprecated, use `model_fields` instead.', PydanticDeprecatedSince20
-        )
-        return self.model_fields  # type: ignore
-
-    def __dir__(self) -> list[str]:
-        attributes = list(super().__dir__())
-        if '__fields__' in attributes:
-            attributes.remove('__fields__')
-        return attributes
-
-
-def init_private_attributes(self: BaseModel, __context: Any) -> None:
-    """This function is meant to behave like a BaseModel method to initialise private attributes.
-
-    It takes context as an argument since that's what pydantic-core passes when calling it.
-
-    Args:
-        self: The BaseModel instance.
-        __context: The context.
-    """
-    if getattr(self, '__pydantic_private__', None) is None:
-        pydantic_private = {}
-        for name, private_attr in self.__private_attributes__.items():
-            default = private_attr.get_default()
-            if default is not PydanticUndefined:
-                pydantic_private[name] = default
-        object_setattr(self, '__pydantic_private__', pydantic_private)
-
-
-def get_model_post_init(namespace: dict[str, Any], bases: tuple[type[Any], ...]) -> Callable[..., Any] | None:
-    """Get the `model_post_init` method from the namespace or the class bases, or `None` if not defined."""
-    if 'model_post_init' in namespace:
-        return namespace['model_post_init']
-
-    from ..main import BaseModel
-
-    model_post_init = get_attribute_from_bases(bases, 'model_post_init')
-    if model_post_init is not BaseModel.model_post_init:
-        return model_post_init
-
-
-def inspect_namespace(  # noqa C901
-    namespace: dict[str, Any],
-    ignored_types: tuple[type[Any], ...],
-    base_class_vars: set[str],
-    base_class_fields: set[str],
-) -> dict[str, ModelPrivateAttr]:
-    """Iterate over the namespace and:
-    * gather private attributes
-    * check for items which look like fields but are not (e.g. have no annotation) and warn.
-
-    Args:
-        namespace: The attribute dictionary of the class to be created.
-        ignored_types: A tuple of ignore types.
-        base_class_vars: A set of base class class variables.
-        base_class_fields: A set of base class fields.
-
-    Returns:
-        A dict contains private attributes info.
-
-    Raises:
-        TypeError: If there is a `__root__` field in model.
-        NameError: If private attribute name is invalid.
-        PydanticUserError:
-            - If a field does not have a type annotation.
-            - If a field on base class was overridden by a non-annotated attribute.
-    """
-    from ..fields import FieldInfo, ModelPrivateAttr, PrivateAttr
-
-    all_ignored_types = ignored_types + default_ignored_types()
-
-    private_attributes: dict[str, ModelPrivateAttr] = {}
-    raw_annotations = namespace.get('__annotations__', {})
-
-    if '__root__' in raw_annotations or '__root__' in namespace:
-        raise TypeError("To define root models, use `pydantic.RootModel` rather than a field called '__root__'")
-
-    ignored_names: set[str] = set()
-    for var_name, value in list(namespace.items()):
-        if var_name == 'model_config':
-            continue
-        elif (
-            isinstance(value, type)
-            and value.__module__ == namespace['__module__']
-            and value.__qualname__.startswith(namespace['__qualname__'])
-        ):
-            # `value` is a nested type defined in this namespace; don't error
-            continue
-        elif isinstance(value, all_ignored_types) or value.__class__.__module__ == 'functools':
-            ignored_names.add(var_name)
-            continue
-        elif isinstance(value, ModelPrivateAttr):
-            if var_name.startswith('__'):
-                raise NameError(
-                    'Private attributes must not use dunder names;'
-                    f' use a single underscore prefix instead of {var_name!r}.'
-                )
-            elif is_valid_field_name(var_name):
-                raise NameError(
-                    'Private attributes must not use valid field names;'
-                    f' use sunder names, e.g. {"_" + var_name!r} instead of {var_name!r}.'
-                )
-            private_attributes[var_name] = value
-            del namespace[var_name]
-        elif isinstance(value, FieldInfo) and not is_valid_field_name(var_name):
-            suggested_name = var_name.lstrip('_') or 'my_field'  # don't suggest '' for all-underscore name
-            raise NameError(
-                f'Fields must not use names with leading underscores;'
-                f' e.g., use {suggested_name!r} instead of {var_name!r}.'
-            )
-
-        elif var_name.startswith('__'):
-            continue
-        elif is_valid_privateattr_name(var_name):
-            if var_name not in raw_annotations or not is_classvar(raw_annotations[var_name]):
-                private_attributes[var_name] = PrivateAttr(default=value)
-                del namespace[var_name]
-        elif var_name in base_class_vars:
-            continue
-        elif var_name not in raw_annotations:
-            if var_name in base_class_fields:
-                raise PydanticUserError(
-                    f'Field {var_name!r} defined on a base class was overridden by a non-annotated attribute. '
-                    f'All field definitions, including overrides, require a type annotation.',
-                    code='model-field-overridden',
-                )
-            elif isinstance(value, FieldInfo):
-                raise PydanticUserError(
-                    f'Field {var_name!r} requires a type annotation', code='model-field-missing-annotation'
-                )
-            else:
-                raise PydanticUserError(
-                    f'A non-annotated attribute was detected: `{var_name} = {value!r}`. All model fields require a '
-                    f'type annotation; if `{var_name}` is not meant to be a field, you may be able to resolve this '
-                    f"error by annotating it as a `ClassVar` or updating `model_config['ignored_types']`.",
-                    code='model-field-missing-annotation',
-                )
-
-    for ann_name, ann_type in raw_annotations.items():
-        if (
-            is_valid_privateattr_name(ann_name)
-            and ann_name not in private_attributes
-            and ann_name not in ignored_names
-            and not is_classvar(ann_type)
-            and ann_type not in all_ignored_types
-            and getattr(ann_type, '__module__', None) != 'functools'
-        ):
-            if is_annotated(ann_type):
-                _, *metadata = typing_extensions.get_args(ann_type)
-                private_attr = next((v for v in metadata if isinstance(v, ModelPrivateAttr)), None)
-                if private_attr is not None:
-                    private_attributes[ann_name] = private_attr
-                    continue
-            private_attributes[ann_name] = PrivateAttr()
-
-    return private_attributes
-
-
-def set_default_hash_func(cls: type[BaseModel], bases: tuple[type[Any], ...]) -> None:
-    base_hash_func = get_attribute_from_bases(bases, '__hash__')
-    new_hash_func = make_hash_func(cls)
-    if base_hash_func in {None, object.__hash__} or getattr(base_hash_func, '__code__', None) == new_hash_func.__code__:
-        # If `__hash__` is some default, we generate a hash function.
-        # It will be `None` if not overridden from BaseModel.
-        # It may be `object.__hash__` if there is another
-        # parent class earlier in the bases which doesn't override `__hash__` (e.g. `typing.Generic`).
-        # It may be a value set by `set_default_hash_func` if `cls` is a subclass of another frozen model.
-        # In the last case we still need a new hash function to account for new `model_fields`.
-        cls.__hash__ = new_hash_func
-
-
-def make_hash_func(cls: type[BaseModel]) -> Any:
-    getter = operator.itemgetter(*cls.model_fields.keys()) if cls.model_fields else lambda _: 0
-
-    def hash_func(self: Any) -> int:
-        try:
-            return hash(getter(self.__dict__))
-        except KeyError:
-            # In rare cases (such as when using the deprecated copy method), the __dict__ may not contain
-            # all model fields, which is how we can get here.
-            # getter(self.__dict__) is much faster than any 'safe' method that accounts for missing keys,
-            # and wrapping it in a `try` doesn't slow things down much in the common case.
-            return hash(getter(SafeGetItemProxy(self.__dict__)))
-
-    return hash_func
-
-
-def set_model_fields(
-    cls: type[BaseModel], bases: tuple[type[Any], ...], config_wrapper: ConfigWrapper, types_namespace: dict[str, Any]
-) -> None:
-    """Collect and set `cls.model_fields` and `cls.__class_vars__`.
-
-    Args:
-        cls: BaseModel or dataclass.
-        bases: Parents of the class, generally `cls.__bases__`.
-        config_wrapper: The config wrapper instance.
-        types_namespace: Optional extra namespace to look for types in.
-    """
-    typevars_map = get_model_typevars_map(cls)
-    fields, class_vars = collect_model_fields(cls, bases, config_wrapper, types_namespace, typevars_map=typevars_map)
-
-    cls.model_fields = fields
-    cls.__class_vars__.update(class_vars)
-
-    for k in class_vars:
-        # Class vars should not be private attributes
-        #     We remove them _here_ and not earlier because we rely on inspecting the class to determine its classvars,
-        #     but private attributes are determined by inspecting the namespace _prior_ to class creation.
-        #     In the case that a classvar with a leading-'_' is defined via a ForwardRef (e.g., when using
-        #     `__future__.annotations`), we want to remove the private attribute which was detected _before_ we knew it
-        #     evaluated to a classvar
-
-        value = cls.__private_attributes__.pop(k, None)
-        if value is not None and value.default is not PydanticUndefined:
-            setattr(cls, k, value.default)
-
-
-def complete_model_class(
-    cls: type[BaseModel],
-    cls_name: str,
-    config_wrapper: ConfigWrapper,
-    *,
-    raise_errors: bool = True,
-    types_namespace: dict[str, Any] | None,
-    create_model_module: str | None = None,
-) -> bool:
-    """Finish building a model class.
-
-    This logic must be called after class has been created since validation functions must be bound
-    and `get_type_hints` requires a class object.
-
-    Args:
-        cls: BaseModel or dataclass.
-        cls_name: The model or dataclass name.
-        config_wrapper: The config wrapper instance.
-        raise_errors: Whether to raise errors.
-        types_namespace: Optional extra namespace to look for types in.
-        create_model_module: The module of the class to be created, if created by `create_model`.
-
-    Returns:
-        `True` if the model is successfully completed, else `False`.
-
-    Raises:
-        PydanticUndefinedAnnotation: If `PydanticUndefinedAnnotation` occurs in`__get_pydantic_core_schema__`
-            and `raise_errors=True`.
-    """
-    typevars_map = get_model_typevars_map(cls)
-    gen_schema = GenerateSchema(
-        config_wrapper,
-        types_namespace,
-        typevars_map,
-    )
-
-    handler = CallbackGetCoreSchemaHandler(
-        partial(gen_schema.generate_schema, from_dunder_get_core_schema=False),
-        gen_schema,
-        ref_mode='unpack',
-    )
-
-    if config_wrapper.defer_build:
-        set_model_mocks(cls, cls_name)
-        return False
-
-    try:
-        schema = cls.__get_pydantic_core_schema__(cls, handler)
-    except PydanticUndefinedAnnotation as e:
-        if raise_errors:
-            raise
-        set_model_mocks(cls, cls_name, f'`{e.name}`')
-        return False
-
-    core_config = config_wrapper.core_config(cls)
-
-    try:
-        schema = gen_schema.clean_schema(schema)
-    except gen_schema.CollectedInvalid:
-        set_model_mocks(cls, cls_name)
-        return False
-
-    # debug(schema)
-    cls.__pydantic_core_schema__ = schema
-
-    cls.__pydantic_validator__ = create_schema_validator(
-        schema,
-        cls,
-        create_model_module or cls.__module__,
-        cls.__qualname__,
-        'create_model' if create_model_module else 'BaseModel',
-        core_config,
-        config_wrapper.plugin_settings,
-    )
-    cls.__pydantic_serializer__ = SchemaSerializer(schema, core_config)
-    cls.__pydantic_complete__ = True
-
-    # set __signature__ attr only for model class, but not for its instances
-    cls.__signature__ = ClassAttribute(
-        '__signature__',
-        generate_pydantic_signature(init=cls.__init__, fields=cls.model_fields, config_wrapper=config_wrapper),
-    )
-    return True
-
-
-class _PydanticWeakRef:
-    """Wrapper for `weakref.ref` that enables `pickle` serialization.
-
-    Cloudpickle fails to serialize `weakref.ref` objects due to an arcane error related
-    to abstract base classes (`abc.ABC`). This class works around the issue by wrapping
-    `weakref.ref` instead of subclassing it.
-
-    See https://github.com/pydantic/pydantic/issues/6763 for context.
-
-    Semantics:
-        - If not pickled, behaves the same as a `weakref.ref`.
-        - If pickled along with the referenced object, the same `weakref.ref` behavior
-          will be maintained between them after unpickling.
-        - If pickled without the referenced object, after unpickling the underlying
-          reference will be cleared (`__call__` will always return `None`).
-    """
-
-    def __init__(self, obj: Any):
-        if obj is None:
-            # The object will be `None` upon deserialization if the serialized weakref
-            # had lost its underlying object.
-            self._wr = None
-        else:
-            self._wr = weakref.ref(obj)
-
-    def __call__(self) -> Any:
-        if self._wr is None:
-            return None
-        else:
-            return self._wr()
-
-    def __reduce__(self) -> tuple[Callable, tuple[weakref.ReferenceType | None]]:
-        return _PydanticWeakRef, (self(),)
-
-
-def build_lenient_weakvaluedict(d: dict[str, Any] | None) -> dict[str, Any] | None:
-    """Takes an input dictionary, and produces a new value that (invertibly) replaces the values with weakrefs.
-
-    We can't just use a WeakValueDictionary because many types (including int, str, etc.) can't be stored as values
-    in a WeakValueDictionary.
-
-    The `unpack_lenient_weakvaluedict` function can be used to reverse this operation.
-    """
-    if d is None:
-        return None
-    result = {}
-    for k, v in d.items():
-        try:
-            proxy = _PydanticWeakRef(v)
-        except TypeError:
-            proxy = v
-        result[k] = proxy
-    return result
-
-
-def unpack_lenient_weakvaluedict(d: dict[str, Any] | None) -> dict[str, Any] | None:
-    """Inverts the transform performed by `build_lenient_weakvaluedict`."""
-    if d is None:
-        return None
-
-    result = {}
-    for k, v in d.items():
-        if isinstance(v, _PydanticWeakRef):
-            v = v()
-            if v is not None:
-                result[k] = v
-        else:
-            result[k] = v
-    return result
-
-
-def default_ignored_types() -> tuple[type[Any], ...]:
-    from ..fields import ComputedFieldInfo
-
-    return (
-        FunctionType,
-        property,
-        classmethod,
-        staticmethod,
-        PydanticDescriptorProxy,
-        ComputedFieldInfo,
-        ValidateCallWrapper,
-    )
diff --git a/lib/pydantic/_internal/_repr.py b/lib/pydantic/_internal/_repr.py
deleted file mode 100644
index 479b4479..00000000
--- a/lib/pydantic/_internal/_repr.py
+++ /dev/null
@@ -1,117 +0,0 @@
-"""Tools to provide pretty/human-readable display of objects."""
-from __future__ import annotations as _annotations
-
-import types
-import typing
-from typing import Any
-
-import typing_extensions
-
-from . import _typing_extra
-
-if typing.TYPE_CHECKING:
-    ReprArgs: typing_extensions.TypeAlias = 'typing.Iterable[tuple[str | None, Any]]'
-    RichReprResult: typing_extensions.TypeAlias = (
-        'typing.Iterable[Any | tuple[Any] | tuple[str, Any] | tuple[str, Any, Any]]'
-    )
-
-
-class PlainRepr(str):
-    """String class where repr doesn't include quotes. Useful with Representation when you want to return a string
-    representation of something that is valid (or pseudo-valid) python.
-    """
-
-    def __repr__(self) -> str:
-        return str(self)
-
-
-class Representation:
-    # Mixin to provide `__str__`, `__repr__`, and `__pretty__` and `__rich_repr__` methods.
-    # `__pretty__` is used by [devtools](https://python-devtools.helpmanual.io/).
-    # `__rich_repr__` is used by [rich](https://rich.readthedocs.io/en/stable/pretty.html).
-    # (this is not a docstring to avoid adding a docstring to classes which inherit from Representation)
-
-    # we don't want to use a type annotation here as it can break get_type_hints
-    __slots__ = tuple()  # type: typing.Collection[str]
-
-    def __repr_args__(self) -> ReprArgs:
-        """Returns the attributes to show in __str__, __repr__, and __pretty__ this is generally overridden.
-
-        Can either return:
-        * name - value pairs, e.g.: `[('foo_name', 'foo'), ('bar_name', ['b', 'a', 'r'])]`
-        * or, just values, e.g.: `[(None, 'foo'), (None, ['b', 'a', 'r'])]`
-        """
-        attrs_names = self.__slots__
-        if not attrs_names and hasattr(self, '__dict__'):
-            attrs_names = self.__dict__.keys()
-        attrs = ((s, getattr(self, s)) for s in attrs_names)
-        return [(a, v) for a, v in attrs if v is not None]
-
-    def __repr_name__(self) -> str:
-        """Name of the instance's class, used in __repr__."""
-        return self.__class__.__name__
-
-    def __repr_str__(self, join_str: str) -> str:
-        return join_str.join(repr(v) if a is None else f'{a}={v!r}' for a, v in self.__repr_args__())
-
-    def __pretty__(self, fmt: typing.Callable[[Any], Any], **kwargs: Any) -> typing.Generator[Any, None, None]:
-        """Used by devtools (https://python-devtools.helpmanual.io/) to pretty print objects."""
-        yield self.__repr_name__() + '('
-        yield 1
-        for name, value in self.__repr_args__():
-            if name is not None:
-                yield name + '='
-            yield fmt(value)
-            yield ','
-            yield 0
-        yield -1
-        yield ')'
-
-    def __rich_repr__(self) -> RichReprResult:
-        """Used by Rich (https://rich.readthedocs.io/en/stable/pretty.html) to pretty print objects."""
-        for name, field_repr in self.__repr_args__():
-            if name is None:
-                yield field_repr
-            else:
-                yield name, field_repr
-
-    def __str__(self) -> str:
-        return self.__repr_str__(' ')
-
-    def __repr__(self) -> str:
-        return f'{self.__repr_name__()}({self.__repr_str__(", ")})'
-
-
-def display_as_type(obj: Any) -> str:
-    """Pretty representation of a type, should be as close as possible to the original type definition string.
-
-    Takes some logic from `typing._type_repr`.
-    """
-    if isinstance(obj, types.FunctionType):
-        return obj.__name__
-    elif obj is ...:
-        return '...'
-    elif isinstance(obj, Representation):
-        return repr(obj)
-    elif isinstance(obj, typing_extensions.TypeAliasType):
-        return str(obj)
-
-    if not isinstance(obj, (_typing_extra.typing_base, _typing_extra.WithArgsTypes, type)):
-        obj = obj.__class__
-
-    if _typing_extra.origin_is_union(typing_extensions.get_origin(obj)):
-        args = ', '.join(map(display_as_type, typing_extensions.get_args(obj)))
-        return f'Union[{args}]'
-    elif isinstance(obj, _typing_extra.WithArgsTypes):
-        if typing_extensions.get_origin(obj) == typing_extensions.Literal:
-            args = ', '.join(map(repr, typing_extensions.get_args(obj)))
-        else:
-            args = ', '.join(map(display_as_type, typing_extensions.get_args(obj)))
-        try:
-            return f'{obj.__qualname__}[{args}]'
-        except AttributeError:
-            return str(obj)  # handles TypeAliasType in 3.12
-    elif isinstance(obj, type):
-        return obj.__qualname__
-    else:
-        return repr(obj).replace('typing.', '').replace('typing_extensions.', '')
diff --git a/lib/pydantic/_internal/_schema_generation_shared.py b/lib/pydantic/_internal/_schema_generation_shared.py
deleted file mode 100644
index 1a9aa852..00000000
--- a/lib/pydantic/_internal/_schema_generation_shared.py
+++ /dev/null
@@ -1,124 +0,0 @@
-"""Types and utility functions used by various other internal tools."""
-from __future__ import annotations
-
-from typing import TYPE_CHECKING, Any, Callable
-
-from pydantic_core import core_schema
-from typing_extensions import Literal
-
-from ..annotated_handlers import GetCoreSchemaHandler, GetJsonSchemaHandler
-
-if TYPE_CHECKING:
-    from ..json_schema import GenerateJsonSchema, JsonSchemaValue
-    from ._core_utils import CoreSchemaOrField
-    from ._generate_schema import GenerateSchema
-
-    GetJsonSchemaFunction = Callable[[CoreSchemaOrField, GetJsonSchemaHandler], JsonSchemaValue]
-    HandlerOverride = Callable[[CoreSchemaOrField], JsonSchemaValue]
-
-
-class GenerateJsonSchemaHandler(GetJsonSchemaHandler):
-    """JsonSchemaHandler implementation that doesn't do ref unwrapping by default.
-
-    This is used for any Annotated metadata so that we don't end up with conflicting
-    modifications to the definition schema.
-
-    Used internally by Pydantic, please do not rely on this implementation.
-    See `GetJsonSchemaHandler` for the handler API.
-    """
-
-    def __init__(self, generate_json_schema: GenerateJsonSchema, handler_override: HandlerOverride | None) -> None:
-        self.generate_json_schema = generate_json_schema
-        self.handler = handler_override or generate_json_schema.generate_inner
-        self.mode = generate_json_schema.mode
-
-    def __call__(self, __core_schema: CoreSchemaOrField) -> JsonSchemaValue:
-        return self.handler(__core_schema)
-
-    def resolve_ref_schema(self, maybe_ref_json_schema: JsonSchemaValue) -> JsonSchemaValue:
-        """Resolves `$ref` in the json schema.
-
-        This returns the input json schema if there is no `$ref` in json schema.
-
-        Args:
-            maybe_ref_json_schema: The input json schema that may contains `$ref`.
-
-        Returns:
-            Resolved json schema.
-
-        Raises:
-            LookupError: If it can't find the definition for `$ref`.
-        """
-        if '$ref' not in maybe_ref_json_schema:
-            return maybe_ref_json_schema
-        ref = maybe_ref_json_schema['$ref']
-        json_schema = self.generate_json_schema.get_schema_from_definitions(ref)
-        if json_schema is None:
-            raise LookupError(
-                f'Could not find a ref for {ref}.'
-                ' Maybe you tried to call resolve_ref_schema from within a recursive model?'
-            )
-        return json_schema
-
-
-class CallbackGetCoreSchemaHandler(GetCoreSchemaHandler):
-    """Wrapper to use an arbitrary function as a `GetCoreSchemaHandler`.
-
-    Used internally by Pydantic, please do not rely on this implementation.
-    See `GetCoreSchemaHandler` for the handler API.
-    """
-
-    def __init__(
-        self,
-        handler: Callable[[Any], core_schema.CoreSchema],
-        generate_schema: GenerateSchema,
-        ref_mode: Literal['to-def', 'unpack'] = 'to-def',
-    ) -> None:
-        self._handler = handler
-        self._generate_schema = generate_schema
-        self._ref_mode = ref_mode
-
-    def __call__(self, __source_type: Any) -> core_schema.CoreSchema:
-        schema = self._handler(__source_type)
-        ref = schema.get('ref')
-        if self._ref_mode == 'to-def':
-            if ref is not None:
-                self._generate_schema.defs.definitions[ref] = schema
-                return core_schema.definition_reference_schema(ref)
-            return schema
-        else:  # ref_mode = 'unpack
-            return self.resolve_ref_schema(schema)
-
-    def _get_types_namespace(self) -> dict[str, Any] | None:
-        return self._generate_schema._types_namespace
-
-    def generate_schema(self, __source_type: Any) -> core_schema.CoreSchema:
-        return self._generate_schema.generate_schema(__source_type)
-
-    @property
-    def field_name(self) -> str | None:
-        return self._generate_schema.field_name_stack.get()
-
-    def resolve_ref_schema(self, maybe_ref_schema: core_schema.CoreSchema) -> core_schema.CoreSchema:
-        """Resolves reference in the core schema.
-
-        Args:
-            maybe_ref_schema: The input core schema that may contains reference.
-
-        Returns:
-            Resolved core schema.
-
-        Raises:
-            LookupError: If it can't find the definition for reference.
-        """
-        if maybe_ref_schema['type'] == 'definition-ref':
-            ref = maybe_ref_schema['schema_ref']
-            if ref not in self._generate_schema.defs.definitions:
-                raise LookupError(
-                    f'Could not find a ref for {ref}.'
-                    ' Maybe you tried to call resolve_ref_schema from within a recursive model?'
-                )
-            return self._generate_schema.defs.definitions[ref]
-        elif maybe_ref_schema['type'] == 'definitions':
-            return self.resolve_ref_schema(maybe_ref_schema['schema'])
-        return maybe_ref_schema
diff --git a/lib/pydantic/_internal/_signature.py b/lib/pydantic/_internal/_signature.py
deleted file mode 100644
index 816a1651..00000000
--- a/lib/pydantic/_internal/_signature.py
+++ /dev/null
@@ -1,164 +0,0 @@
-from __future__ import annotations
-
-import dataclasses
-from inspect import Parameter, Signature, signature
-from typing import TYPE_CHECKING, Any, Callable
-
-from pydantic_core import PydanticUndefined
-
-from ._config import ConfigWrapper
-from ._utils import is_valid_identifier
-
-if TYPE_CHECKING:
-    from ..fields import FieldInfo
-
-
-def _field_name_for_signature(field_name: str, field_info: FieldInfo) -> str:
-    """Extract the correct name to use for the field when generating a signature.
-
-    Assuming the field has a valid alias, this will return the alias. Otherwise, it will return the field name.
-    First priority is given to the validation_alias, then the alias, then the field name.
-
-    Args:
-        field_name: The name of the field
-        field_info: The corresponding FieldInfo object.
-
-    Returns:
-        The correct name to use when generating a signature.
-    """
-
-    def _alias_if_valid(x: Any) -> str | None:
-        """Return the alias if it is a valid alias and identifier, else None."""
-        return x if isinstance(x, str) and is_valid_identifier(x) else None
-
-    return _alias_if_valid(field_info.alias) or _alias_if_valid(field_info.validation_alias) or field_name
-
-
-def _process_param_defaults(param: Parameter) -> Parameter:
-    """Modify the signature for a parameter in a dataclass where the default value is a FieldInfo instance.
-
-    Args:
-        param (Parameter): The parameter
-
-    Returns:
-        Parameter: The custom processed parameter
-    """
-    from ..fields import FieldInfo
-
-    param_default = param.default
-    if isinstance(param_default, FieldInfo):
-        annotation = param.annotation
-        # Replace the annotation if appropriate
-        # inspect does "clever" things to show annotations as strings because we have
-        # `from __future__ import annotations` in main, we don't want that
-        if annotation == 'Any':
-            annotation = Any
-
-        # Replace the field default
-        default = param_default.default
-        if default is PydanticUndefined:
-            if param_default.default_factory is PydanticUndefined:
-                default = Signature.empty
-            else:
-                # this is used by dataclasses to indicate a factory exists:
-                default = dataclasses._HAS_DEFAULT_FACTORY  # type: ignore
-        return param.replace(
-            annotation=annotation, name=_field_name_for_signature(param.name, param_default), default=default
-        )
-    return param
-
-
-def _generate_signature_parameters(  # noqa: C901 (ignore complexity, could use a refactor)
-    init: Callable[..., None],
-    fields: dict[str, FieldInfo],
-    config_wrapper: ConfigWrapper,
-) -> dict[str, Parameter]:
-    """Generate a mapping of parameter names to Parameter objects for a pydantic BaseModel or dataclass."""
-    from itertools import islice
-
-    present_params = signature(init).parameters.values()
-    merged_params: dict[str, Parameter] = {}
-    var_kw = None
-    use_var_kw = False
-
-    for param in islice(present_params, 1, None):  # skip self arg
-        # inspect does "clever" things to show annotations as strings because we have
-        # `from __future__ import annotations` in main, we don't want that
-        if fields.get(param.name):
-            # exclude params with init=False
-            if getattr(fields[param.name], 'init', True) is False:
-                continue
-            param = param.replace(name=_field_name_for_signature(param.name, fields[param.name]))
-        if param.annotation == 'Any':
-            param = param.replace(annotation=Any)
-        if param.kind is param.VAR_KEYWORD:
-            var_kw = param
-            continue
-        merged_params[param.name] = param
-
-    if var_kw:  # if custom init has no var_kw, fields which are not declared in it cannot be passed through
-        allow_names = config_wrapper.populate_by_name
-        for field_name, field in fields.items():
-            # when alias is a str it should be used for signature generation
-            param_name = _field_name_for_signature(field_name, field)
-
-            if field_name in merged_params or param_name in merged_params:
-                continue
-
-            if not is_valid_identifier(param_name):
-                if allow_names:
-                    param_name = field_name
-                else:
-                    use_var_kw = True
-                    continue
-
-            kwargs = {} if field.is_required() else {'default': field.get_default(call_default_factory=False)}
-            merged_params[param_name] = Parameter(
-                param_name, Parameter.KEYWORD_ONLY, annotation=field.rebuild_annotation(), **kwargs
-            )
-
-    if config_wrapper.extra == 'allow':
-        use_var_kw = True
-
-    if var_kw and use_var_kw:
-        # Make sure the parameter for extra kwargs
-        # does not have the same name as a field
-        default_model_signature = [
-            ('self', Parameter.POSITIONAL_ONLY),
-            ('data', Parameter.VAR_KEYWORD),
-        ]
-        if [(p.name, p.kind) for p in present_params] == default_model_signature:
-            # if this is the standard model signature, use extra_data as the extra args name
-            var_kw_name = 'extra_data'
-        else:
-            # else start from var_kw
-            var_kw_name = var_kw.name
-
-        # generate a name that's definitely unique
-        while var_kw_name in fields:
-            var_kw_name += '_'
-        merged_params[var_kw_name] = var_kw.replace(name=var_kw_name)
-
-    return merged_params
-
-
-def generate_pydantic_signature(
-    init: Callable[..., None], fields: dict[str, FieldInfo], config_wrapper: ConfigWrapper, is_dataclass: bool = False
-) -> Signature:
-    """Generate signature for a pydantic BaseModel or dataclass.
-
-    Args:
-        init: The class init.
-        fields: The model fields.
-        config_wrapper: The config wrapper instance.
-        is_dataclass: Whether the model is a dataclass.
-
-    Returns:
-        The dataclass/BaseModel subclass signature.
-    """
-    merged_params = _generate_signature_parameters(init, fields, config_wrapper)
-
-    if is_dataclass:
-        merged_params = {k: _process_param_defaults(v) for k, v in merged_params.items()}
-
-    return Signature(parameters=list(merged_params.values()), return_annotation=None)
diff --git a/lib/pydantic/_internal/_std_types_schema.py b/lib/pydantic/_internal/_std_types_schema.py
deleted file mode 100644
index c8523bf4..00000000
--- a/lib/pydantic/_internal/_std_types_schema.py
+++ /dev/null
@@ -1,714 +0,0 @@
-"""Logic for generating pydantic-core schemas for standard library types.
-
-Import of this module is deferred since it contains imports of many standard library modules.
-"""
-from __future__ import annotations as _annotations
-
-import collections
-import collections.abc
-import dataclasses
-import decimal
-import inspect
-import os
-import typing
-from enum import Enum
-from functools import partial
-from ipaddress import IPv4Address, IPv4Interface, IPv4Network, IPv6Address, IPv6Interface, IPv6Network
-from typing import Any, Callable, Iterable, TypeVar
-
-import typing_extensions
-from pydantic_core import (
-    CoreSchema,
-    MultiHostUrl,
-    PydanticCustomError,
-    PydanticOmit,
-    Url,
-    core_schema,
-)
-from typing_extensions import get_args, get_origin
-
-from pydantic.errors import PydanticSchemaGenerationError
-from pydantic.fields import FieldInfo
-from pydantic.types import Strict
-
-from ..config import ConfigDict
-from ..json_schema import JsonSchemaValue, update_json_schema
-from . import _known_annotated_metadata, _typing_extra, _validators
-from ._core_utils import get_type_ref
-from ._internal_dataclass import slots_true
-from ._schema_generation_shared import GetCoreSchemaHandler, GetJsonSchemaHandler
-
-if typing.TYPE_CHECKING:
-    from ._generate_schema import GenerateSchema
-
-    StdSchemaFunction = Callable[[GenerateSchema, type[Any]], core_schema.CoreSchema]
-
-
-@dataclasses.dataclass(**slots_true)
-class SchemaTransformer:
-    get_core_schema: Callable[[Any, GetCoreSchemaHandler], CoreSchema]
-    get_json_schema: Callable[[CoreSchema, GetJsonSchemaHandler], JsonSchemaValue]
-
-    def __get_pydantic_core_schema__(self, source_type: Any, handler: GetCoreSchemaHandler) -> CoreSchema:
-        return self.get_core_schema(source_type, handler)
-
-    def __get_pydantic_json_schema__(self, schema: CoreSchema, handler: GetJsonSchemaHandler) -> JsonSchemaValue:
-        return self.get_json_schema(schema, handler)
-
-
-def get_enum_core_schema(enum_type: type[Enum], config: ConfigDict) -> CoreSchema:
-    cases: list[Any] = list(enum_type.__members__.values())
-
-    enum_ref = get_type_ref(enum_type)
-    description = None if not enum_type.__doc__ else inspect.cleandoc(enum_type.__doc__)
-    if description == 'An enumeration.':  # This is the default value provided by enum.EnumMeta.__new__; don't use it
-        description = None
-    updates = {'title': enum_type.__name__, 'description': description}
-    updates = {k: v for k, v in updates.items() if v is not None}
-
-    def get_json_schema(_, handler: GetJsonSchemaHandler) -> JsonSchemaValue:
-        json_schema = handler(core_schema.literal_schema([x.value for x in cases], ref=enum_ref))
-        original_schema = handler.resolve_ref_schema(json_schema)
-        update_json_schema(original_schema, updates)
-        return json_schema
-
-    if not cases:
-        # Use an isinstance check for enums with no cases.
-        # The most important use case for this is creating TypeVar bounds for generics that should
-        # be restricted to enums. This is more consistent than it might seem at first, since you can only
-        # subclass enum.Enum (or subclasses of enum.Enum) if all parent classes have no cases.
-        # We use the get_json_schema function when an Enum subclass has been declared with no cases
-        # so that we can still generate a valid json schema.
-        return core_schema.is_instance_schema(enum_type, metadata={'pydantic_js_functions': [get_json_schema]})
-
-    use_enum_values = config.get('use_enum_values', False)
-
-    if len(cases) == 1:
-        expected = repr(cases[0].value)
-    else:
-        expected = ', '.join([repr(case.value) for case in cases[:-1]]) + f' or {cases[-1].value!r}'
-
-    def to_enum(__input_value: Any) -> Enum:
-        try:
-            enum_field = enum_type(__input_value)
-            if use_enum_values:
-                return enum_field.value
-            return enum_field
-        except ValueError:
-            # The type: ignore on the next line is to ignore the requirement of LiteralString
-            raise PydanticCustomError('enum', f'Input should be {expected}', {'expected': expected})  # type: ignore
-
-    strict_python_schema = core_schema.is_instance_schema(enum_type)
-    if use_enum_values:
-        strict_python_schema = core_schema.chain_schema(
-            [strict_python_schema, core_schema.no_info_plain_validator_function(lambda x: x.value)]
-        )
-
-    to_enum_validator = core_schema.no_info_plain_validator_function(to_enum)
-    if issubclass(enum_type, int):
-        # this handles `IntEnum`, and also `Foobar(int, Enum)`
-        updates['type'] = 'integer'
-        lax = core_schema.chain_schema([core_schema.int_schema(), to_enum_validator])
-        # Disallow float from JSON due to strict mode
-        strict = core_schema.json_or_python_schema(
-            json_schema=core_schema.no_info_after_validator_function(to_enum, core_schema.int_schema()),
-            python_schema=strict_python_schema,
-        )
-    elif issubclass(enum_type, str):
-        # this handles `StrEnum` (3.11 only), and also `Foobar(str, Enum)`
-        updates['type'] = 'string'
-        lax = core_schema.chain_schema([core_schema.str_schema(), to_enum_validator])
-        strict = core_schema.json_or_python_schema(
-            json_schema=core_schema.no_info_after_validator_function(to_enum, core_schema.str_schema()),
-            python_schema=strict_python_schema,
-        )
-    elif issubclass(enum_type, float):
-        updates['type'] = 'numeric'
-        lax = core_schema.chain_schema([core_schema.float_schema(), to_enum_validator])
-        strict = core_schema.json_or_python_schema(
-            json_schema=core_schema.no_info_after_validator_function(to_enum, core_schema.float_schema()),
-            python_schema=strict_python_schema,
-        )
-    else:
-        lax = to_enum_validator
-        strict = core_schema.json_or_python_schema(json_schema=to_enum_validator, python_schema=strict_python_schema)
-    return core_schema.lax_or_strict_schema(
-        lax_schema=lax, strict_schema=strict, ref=enum_ref, metadata={'pydantic_js_functions': [get_json_schema]}
-    )
-
-
-@dataclasses.dataclass(**slots_true)
-class InnerSchemaValidator:
-    """Use a fixed CoreSchema, avoiding interference from outward annotations."""
-
-    core_schema: CoreSchema
-    js_schema: JsonSchemaValue | None = None
-    js_core_schema: CoreSchema | None = None
-    js_schema_update: JsonSchemaValue | None = None
-
-    def __get_pydantic_json_schema__(self, _schema: CoreSchema, handler: GetJsonSchemaHandler) -> JsonSchemaValue:
-        if self.js_schema is not None:
-            return self.js_schema
-        js_schema = handler(self.js_core_schema or self.core_schema)
-        if self.js_schema_update is not None:
-            js_schema.update(self.js_schema_update)
-        return js_schema
-
-    def __get_pydantic_core_schema__(self, _source_type: Any, _handler: GetCoreSchemaHandler) -> CoreSchema:
-        return self.core_schema
-
-
-def decimal_prepare_pydantic_annotations(
-    source: Any, annotations: Iterable[Any], config: ConfigDict
-) -> tuple[Any, list[Any]] | None:
-    if source is not decimal.Decimal:
-        return None
-
-    metadata, remaining_annotations = _known_annotated_metadata.collect_known_metadata(annotations)
-
-    config_allow_inf_nan = config.get('allow_inf_nan')
-    if config_allow_inf_nan is not None:
-        metadata.setdefault('allow_inf_nan', config_allow_inf_nan)
-
-    _known_annotated_metadata.check_metadata(
-        metadata, {*_known_annotated_metadata.FLOAT_CONSTRAINTS, 'max_digits', 'decimal_places'}, decimal.Decimal
-    )
-    return source, [InnerSchemaValidator(core_schema.decimal_schema(**metadata)), *remaining_annotations]
-
-
-def datetime_prepare_pydantic_annotations(
-    source_type: Any, annotations: Iterable[Any], _config: ConfigDict
-) -> tuple[Any, list[Any]] | None:
-    import datetime
-
-    metadata, remaining_annotations = _known_annotated_metadata.collect_known_metadata(annotations)
-    if source_type is datetime.date:
-        sv = InnerSchemaValidator(core_schema.date_schema(**metadata))
-    elif source_type is datetime.datetime:
-        sv = InnerSchemaValidator(core_schema.datetime_schema(**metadata))
-    elif source_type is datetime.time:
-        sv = InnerSchemaValidator(core_schema.time_schema(**metadata))
-    elif source_type is datetime.timedelta:
-        sv = InnerSchemaValidator(core_schema.timedelta_schema(**metadata))
-    else:
-        return None
-    # check now that we know the source type is correct
-    _known_annotated_metadata.check_metadata(metadata, _known_annotated_metadata.DATE_TIME_CONSTRAINTS, source_type)
-    return (source_type, [sv, *remaining_annotations])
-
-
-def uuid_prepare_pydantic_annotations(
-    source_type: Any, annotations: Iterable[Any], _config: ConfigDict
-) -> tuple[Any, list[Any]] | None:
-    # UUIDs have no constraints - they are fixed length, constructing a UUID instance checks the length
-
-    from uuid import UUID
-
-    if source_type is not UUID:
-        return None
-
-    return (source_type, [InnerSchemaValidator(core_schema.uuid_schema()), *annotations])
-
-
-def path_schema_prepare_pydantic_annotations(
-    source_type: Any, annotations: Iterable[Any], _config: ConfigDict
-) -> tuple[Any, list[Any]] | None:
-    import pathlib
-
-    if source_type not in {
-        os.PathLike,
-        pathlib.Path,
-        pathlib.PurePath,
-        pathlib.PosixPath,
-        pathlib.PurePosixPath,
-        pathlib.PureWindowsPath,
-    }:
-        return None
-
-    metadata, remaining_annotations = _known_annotated_metadata.collect_known_metadata(annotations)
-    _known_annotated_metadata.check_metadata(metadata, _known_annotated_metadata.STR_CONSTRAINTS, source_type)
-
-    construct_path = pathlib.PurePath if source_type is os.PathLike else source_type
-
-    def path_validator(input_value: str) -> os.PathLike[Any]:
-        try:
-            return construct_path(input_value)
-        except TypeError as e:
-            raise PydanticCustomError('path_type', 'Input is not a valid path') from e
-
-    constrained_str_schema = core_schema.str_schema(**metadata)
-
-    instance_schema = core_schema.json_or_python_schema(
-        json_schema=core_schema.no_info_after_validator_function(path_validator, constrained_str_schema),
-        python_schema=core_schema.is_instance_schema(source_type),
-    )
-
-    strict: bool | None = None
-    for annotation in annotations:
-        if isinstance(annotation, Strict):
-            strict = annotation.strict
-
-    schema = core_schema.lax_or_strict_schema(
-        lax_schema=core_schema.union_schema(
-            [
-                instance_schema,
-                core_schema.no_info_after_validator_function(path_validator, constrained_str_schema),
-            ],
-            custom_error_type='path_type',
-            custom_error_message='Input is not a valid path',
-            strict=True,
-        ),
-        strict_schema=instance_schema,
-        serialization=core_schema.to_string_ser_schema(),
-        strict=strict,
-    )
-
-    return (
-        source_type,
-        [
-            InnerSchemaValidator(schema, js_core_schema=constrained_str_schema, js_schema_update={'format': 'path'}),
-            *remaining_annotations,
-        ],
-    )
-
-
-def dequeue_validator(
-    input_value: Any, handler: core_schema.ValidatorFunctionWrapHandler, maxlen: None | int
-) -> collections.deque[Any]:
-    if isinstance(input_value, collections.deque):
-        maxlens = [v for v in (input_value.maxlen, maxlen) if v is not None]
-        if maxlens:
-            maxlen = min(maxlens)
-        return collections.deque(handler(input_value), maxlen=maxlen)
-    else:
-        return collections.deque(handler(input_value), maxlen=maxlen)
-
-
-@dataclasses.dataclass(**slots_true)
-class SequenceValidator:
-    mapped_origin: type[Any]
-    item_source_type: type[Any]
-    min_length: int | None = None
-    max_length: int | None = None
-    strict: bool = False
-
-    def serialize_sequence_via_list(
-        self, v: Any, handler: core_schema.SerializerFunctionWrapHandler, info: core_schema.SerializationInfo
-    ) -> Any:
-        items: list[Any] = []
-        for index, item in enumerate(v):
-            try:
-                v = handler(item, index)
-            except PydanticOmit:
-                pass
-            else:
-                items.append(v)
-
-        if info.mode_is_json():
-            return items
-        else:
-            return self.mapped_origin(items)
-
-    def __get_pydantic_core_schema__(self, source_type: Any, handler: GetCoreSchemaHandler) -> CoreSchema:
-        if self.item_source_type is Any:
-            items_schema = None
-        else:
-            items_schema = handler.generate_schema(self.item_source_type)
-
-        metadata = {'min_length': self.min_length, 'max_length': self.max_length, 'strict': self.strict}
-
-        if self.mapped_origin in (list, set, frozenset):
-            if self.mapped_origin is list:
-                constrained_schema = core_schema.list_schema(items_schema, **metadata)
-            elif self.mapped_origin is set:
-                constrained_schema = core_schema.set_schema(items_schema, **metadata)
-            else:
-                assert self.mapped_origin is frozenset  # safety check in case we forget to add a case
-                constrained_schema = core_schema.frozenset_schema(items_schema, **metadata)
-
-            schema = constrained_schema
-        else:
-            # safety check in case we forget to add a case
-            assert self.mapped_origin in (collections.deque, collections.Counter)
-
-            if self.mapped_origin is collections.deque:
-                # if we have a MaxLen annotation might as well set that as the default maxlen on the deque
-                # this lets us re-use existing metadata annotations to let users set the maxlen on a dequeue
-                # that e.g. comes from JSON
-                coerce_instance_wrap = partial(
-                    core_schema.no_info_wrap_validator_function,
-                    partial(dequeue_validator, maxlen=metadata.get('max_length', None)),
-                )
-            else:
-                coerce_instance_wrap = partial(core_schema.no_info_after_validator_function, self.mapped_origin)
-
-            constrained_schema = core_schema.list_schema(items_schema, **metadata)
-
-            check_instance = core_schema.json_or_python_schema(
-                json_schema=core_schema.list_schema(),
-                python_schema=core_schema.is_instance_schema(self.mapped_origin),
-            )
-
-            serialization = core_schema.wrap_serializer_function_ser_schema(
-                self.serialize_sequence_via_list, schema=items_schema or core_schema.any_schema(), info_arg=True
-            )
-
-            strict = core_schema.chain_schema([check_instance, coerce_instance_wrap(constrained_schema)])
-
-            if metadata.get('strict', False):
-                schema = strict
-            else:
-                lax = coerce_instance_wrap(constrained_schema)
-                schema = core_schema.lax_or_strict_schema(lax_schema=lax, strict_schema=strict)
-            schema['serialization'] = serialization
-
-        return schema
-
-
-SEQUENCE_ORIGIN_MAP: dict[Any, Any] = {
-    typing.Deque: collections.deque,
-    collections.deque: collections.deque,
-    list: list,
-    typing.List: list,
-    set: set,
-    typing.AbstractSet: set,
-    typing.Set: set,
-    frozenset: frozenset,
-    typing.FrozenSet: frozenset,
-    typing.Sequence: list,
-    typing.MutableSequence: list,
-    typing.MutableSet: set,
-    # this doesn't handle subclasses of these
-    # parametrized typing.Set creates one of these
-    collections.abc.MutableSet: set,
-    collections.abc.Set: frozenset,
-}
-
-
-def identity(s: CoreSchema) -> CoreSchema:
-    return s
-
-
-def sequence_like_prepare_pydantic_annotations(
-    source_type: Any, annotations: Iterable[Any], _config: ConfigDict
-) -> tuple[Any, list[Any]] | None:
-    origin: Any = get_origin(source_type)
-
-    mapped_origin = SEQUENCE_ORIGIN_MAP.get(origin, None) if origin else SEQUENCE_ORIGIN_MAP.get(source_type, None)
-    if mapped_origin is None:
-        return None
-
-    args = get_args(source_type)
-
-    if not args:
-        args = (Any,)
-    elif len(args) != 1:
-        raise ValueError('Expected sequence to have exactly 1 generic parameter')
-
-    item_source_type = args[0]
-
-    metadata, remaining_annotations = _known_annotated_metadata.collect_known_metadata(annotations)
-    _known_annotated_metadata.check_metadata(metadata, _known_annotated_metadata.SEQUENCE_CONSTRAINTS, source_type)
-
-    return (source_type, [SequenceValidator(mapped_origin, item_source_type, **metadata), *remaining_annotations])
-
-
-MAPPING_ORIGIN_MAP: dict[Any, Any] = {
-    typing.DefaultDict: collections.defaultdict,
-    collections.defaultdict: collections.defaultdict,
-    collections.OrderedDict: collections.OrderedDict,
-    typing_extensions.OrderedDict: collections.OrderedDict,
-    dict: dict,
-    typing.Dict: dict,
-    collections.Counter: collections.Counter,
-    typing.Counter: collections.Counter,
-    # this doesn't handle subclasses of these
-    typing.Mapping: dict,
-    typing.MutableMapping: dict,
-    # parametrized typing.{Mutable}Mapping creates one of these
-    collections.abc.MutableMapping: dict,
-    collections.abc.Mapping: dict,
-}
-
-
-def defaultdict_validator(
-    input_value: Any, handler: core_schema.ValidatorFunctionWrapHandler, default_default_factory: Callable[[], Any]
-) -> collections.defaultdict[Any, Any]:
-    if isinstance(input_value, collections.defaultdict):
-        default_factory = input_value.default_factory
-        return collections.defaultdict(default_factory, handler(input_value))
-    else:
-        return collections.defaultdict(default_default_factory, handler(input_value))
-
-
-def get_defaultdict_default_default_factory(values_source_type: Any) -> Callable[[], Any]:
-    def infer_default() -> Callable[[], Any]:
-        allowed_default_types: dict[Any, Any] = {
-            typing.Tuple: tuple,
-            tuple: tuple,
-            collections.abc.Sequence: tuple,
-            collections.abc.MutableSequence: list,
-            typing.List: list,
-            list: list,
-            typing.Sequence: list,
-            typing.Set: set,
-            set: set,
-            typing.MutableSet: set,
-            collections.abc.MutableSet: set,
-            collections.abc.Set: frozenset,
-            typing.MutableMapping: dict,
-            typing.Mapping: dict,
-            collections.abc.Mapping: dict,
-            collections.abc.MutableMapping: dict,
-            float: float,
-            int: int,
-            str: str,
-            bool: bool,
-        }
-        values_type_origin = get_origin(values_source_type) or values_source_type
-        instructions = 'set using `DefaultDict[..., Annotated[..., Field(default_factory=...)]]`'
-        if isinstance(values_type_origin, TypeVar):
-
-            def type_var_default_factory() -> None:
-                raise RuntimeError(
-                    'Generic defaultdict cannot be used without a concrete value type or an'
-                    ' explicit default factory, ' + instructions
-                )
-
-            return type_var_default_factory
-        elif values_type_origin not in allowed_default_types:
-            # a somewhat subjective set of types that have reasonable default values
-            allowed_msg = ', '.join([t.__name__ for t in set(allowed_default_types.values())])
-            raise PydanticSchemaGenerationError(
-                f'Unable to infer a default factory for keys of type {values_source_type}.'
-                f' Only {allowed_msg} are supported, other types require an explicit default factory'
-                ' ' + instructions
-            )
-        return allowed_default_types[values_type_origin]
-
-    # Assume Annotated[..., Field(...)]
-    if _typing_extra.is_annotated(values_source_type):
-        field_info = next((v for v in get_args(values_source_type) if isinstance(v, FieldInfo)), None)
-    else:
-        field_info = None
-    if field_info and field_info.default_factory:
-        default_default_factory = field_info.default_factory
-    else:
-        default_default_factory = infer_default()
-    return default_default_factory
-
-
-@dataclasses.dataclass(**slots_true)
-class MappingValidator:
-    mapped_origin: type[Any]
-    keys_source_type: type[Any]
-    values_source_type: type[Any]
-    min_length: int | None = None
-    max_length: int | None = None
-    strict: bool = False
-
-    def serialize_mapping_via_dict(self, v: Any, handler: core_schema.SerializerFunctionWrapHandler) -> Any:
-        return handler(v)
-
-    def __get_pydantic_core_schema__(self, source_type: Any, handler: GetCoreSchemaHandler) -> CoreSchema:
-        if self.keys_source_type is Any:
-            keys_schema = None
-        else:
-            keys_schema = handler.generate_schema(self.keys_source_type)
-        if self.values_source_type is Any:
-            values_schema = None
-        else:
-            values_schema = handler.generate_schema(self.values_source_type)
-
-        metadata = {'min_length': self.min_length, 'max_length': self.max_length, 'strict': self.strict}
-
-        if self.mapped_origin is dict:
-            schema = core_schema.dict_schema(keys_schema, values_schema, **metadata)
-        else:
-            constrained_schema = core_schema.dict_schema(keys_schema, values_schema, **metadata)
-            check_instance = core_schema.json_or_python_schema(
-                json_schema=core_schema.dict_schema(),
-                python_schema=core_schema.is_instance_schema(self.mapped_origin),
-            )
-
-            if self.mapped_origin is collections.defaultdict:
-                default_default_factory = get_defaultdict_default_default_factory(self.values_source_type)
-                coerce_instance_wrap = partial(
-                    core_schema.no_info_wrap_validator_function,
-                    partial(defaultdict_validator, default_default_factory=default_default_factory),
-                )
-            else:
-                coerce_instance_wrap = partial(core_schema.no_info_after_validator_function, self.mapped_origin)
-
-            serialization = core_schema.wrap_serializer_function_ser_schema(
-                self.serialize_mapping_via_dict,
-                schema=core_schema.dict_schema(
-                    keys_schema or core_schema.any_schema(), values_schema or core_schema.any_schema()
-                ),
-                info_arg=False,
-            )
-
-            strict = core_schema.chain_schema([check_instance, coerce_instance_wrap(constrained_schema)])
-
-            if metadata.get('strict', False):
-                schema = strict
-            else:
-                lax = coerce_instance_wrap(constrained_schema)
-                schema = core_schema.lax_or_strict_schema(lax_schema=lax, strict_schema=strict)
-                schema['serialization'] = serialization
-
-        return schema
-
-
-def mapping_like_prepare_pydantic_annotations(
-    source_type: Any, annotations: Iterable[Any], _config: ConfigDict
-) -> tuple[Any, list[Any]] | None:
-    origin: Any = get_origin(source_type)
-
-    mapped_origin = MAPPING_ORIGIN_MAP.get(origin, None) if origin else MAPPING_ORIGIN_MAP.get(source_type, None)
-    if mapped_origin is None:
-        return None
-
-    args = get_args(source_type)
-
-    if not args:
-        args = (Any, Any)
-    elif mapped_origin is collections.Counter:
-        # a single generic
-        if len(args) != 1:
-            raise ValueError('Expected Counter to have exactly 1 generic parameter')
-        args = (args[0], int)  # keys are always an int
-    elif len(args) != 2:
-        raise ValueError('Expected mapping to have exactly 2 generic parameters')
-
-    keys_source_type, values_source_type = args
-
-    metadata, remaining_annotations = _known_annotated_metadata.collect_known_metadata(annotations)
-    _known_annotated_metadata.check_metadata(metadata, _known_annotated_metadata.SEQUENCE_CONSTRAINTS, source_type)
-
-    return (
-        source_type,
-        [
-            MappingValidator(mapped_origin, keys_source_type, values_source_type, **metadata),
-            *remaining_annotations,
-        ],
-    )
-
-
-def ip_prepare_pydantic_annotations(
-    source_type: Any, annotations: Iterable[Any], _config: ConfigDict
-) -> tuple[Any, list[Any]] | None:
-    def make_strict_ip_schema(tp: type[Any]) -> CoreSchema:
-        return core_schema.json_or_python_schema(
-            json_schema=core_schema.no_info_after_validator_function(tp, core_schema.str_schema()),
-            python_schema=core_schema.is_instance_schema(tp),
-        )
-
-    if source_type is IPv4Address:
-        return source_type, [
-            SchemaTransformer(
-                lambda _1, _2: core_schema.lax_or_strict_schema(
-                    lax_schema=core_schema.no_info_plain_validator_function(_validators.ip_v4_address_validator),
-                    strict_schema=make_strict_ip_schema(IPv4Address),
-                    serialization=core_schema.to_string_ser_schema(),
-                ),
-                lambda _1, _2: {'type': 'string', 'format': 'ipv4'},
-            ),
-            *annotations,
-        ]
-    if source_type is IPv4Network:
-        return source_type, [
-            SchemaTransformer(
-                lambda _1, _2: core_schema.lax_or_strict_schema(
-                    lax_schema=core_schema.no_info_plain_validator_function(_validators.ip_v4_network_validator),
-                    strict_schema=make_strict_ip_schema(IPv4Network),
-                    serialization=core_schema.to_string_ser_schema(),
-                ),
-                lambda _1, _2: {'type': 'string', 'format': 'ipv4network'},
-            ),
-            *annotations,
-        ]
-    if source_type is IPv4Interface:
-        return source_type, [
-            SchemaTransformer(
-                lambda _1, _2: core_schema.lax_or_strict_schema(
-                    lax_schema=core_schema.no_info_plain_validator_function(_validators.ip_v4_interface_validator),
-                    strict_schema=make_strict_ip_schema(IPv4Interface),
-                    serialization=core_schema.to_string_ser_schema(),
-                ),
-                lambda _1, _2: {'type': 'string', 'format': 'ipv4interface'},
-            ),
-            *annotations,
-        ]
-
-    if source_type is IPv6Address:
-        return source_type, [
-            SchemaTransformer(
-                lambda _1, _2: core_schema.lax_or_strict_schema(
-                    lax_schema=core_schema.no_info_plain_validator_function(_validators.ip_v6_address_validator),
-                    strict_schema=make_strict_ip_schema(IPv6Address),
-                    serialization=core_schema.to_string_ser_schema(),
-                ),
-                lambda _1, _2: {'type': 'string', 'format': 'ipv6'},
-            ),
-            *annotations,
-        ]
-    if source_type is IPv6Network:
-        return source_type, [
-            SchemaTransformer(
-                lambda _1, _2: core_schema.lax_or_strict_schema(
-                    lax_schema=core_schema.no_info_plain_validator_function(_validators.ip_v6_network_validator),
-                    strict_schema=make_strict_ip_schema(IPv6Network),
-                    serialization=core_schema.to_string_ser_schema(),
-                ),
-                lambda _1, _2: {'type': 'string', 'format': 'ipv6network'},
-            ),
-            *annotations,
-        ]
-    if source_type is IPv6Interface:
-        return source_type, [
-            SchemaTransformer(
-                lambda _1, _2: core_schema.lax_or_strict_schema(
-                    lax_schema=core_schema.no_info_plain_validator_function(_validators.ip_v6_interface_validator),
-                    strict_schema=make_strict_ip_schema(IPv6Interface),
-                    serialization=core_schema.to_string_ser_schema(),
-                ),
-                lambda _1, _2: {'type': 'string', 'format': 'ipv6interface'},
-            ),
-            *annotations,
-        ]
-
-    return None
-
-
-def url_prepare_pydantic_annotations(
-    source_type: Any, annotations: Iterable[Any], _config: ConfigDict
-) -> tuple[Any, list[Any]] | None:
-    if source_type is Url:
-        return source_type, [
-            SchemaTransformer(
-                lambda _1, _2: core_schema.url_schema(),
-                lambda cs, handler: handler(cs),
-            ),
-            *annotations,
-        ]
-    if source_type is MultiHostUrl:
-        return source_type, [
-            SchemaTransformer(
-                lambda _1, _2: core_schema.multi_host_url_schema(),
-                lambda cs, handler: handler(cs),
-            ),
-            *annotations,
-        ]
-
-
-PREPARE_METHODS: tuple[Callable[[Any, Iterable[Any], ConfigDict], tuple[Any, list[Any]] | None], ...] = (
-    decimal_prepare_pydantic_annotations,
-    sequence_like_prepare_pydantic_annotations,
-    datetime_prepare_pydantic_annotations,
-    uuid_prepare_pydantic_annotations,
-    path_schema_prepare_pydantic_annotations,
-    mapping_like_prepare_pydantic_annotations,
-    ip_prepare_pydantic_annotations,
-    url_prepare_pydantic_annotations,
-)
diff --git a/lib/pydantic/_internal/_typing_extra.py b/lib/pydantic/_internal/_typing_extra.py
deleted file mode 100644
index 1d5d3b3f..00000000
--- a/lib/pydantic/_internal/_typing_extra.py
+++ /dev/null
@@ -1,469 +0,0 @@
-"""Logic for interacting with type annotations, mostly extensions, shims and hacks to wrap python's typing module."""
-from __future__ import annotations as _annotations
-
-import dataclasses
-import sys
-import types
-import typing
-from collections.abc import Callable
-from functools import partial
-from types import GetSetDescriptorType
-from typing import TYPE_CHECKING, Any, Final
-
-from typing_extensions import Annotated, Literal, TypeAliasType, TypeGuard, get_args, get_origin
-
-if TYPE_CHECKING:
-    from ._dataclasses import StandardDataclass
-
-try:
-    from typing import _TypingBase  # type: ignore[attr-defined]
-except ImportError:
-    from typing import _Final as _TypingBase  # type: ignore[attr-defined]
-
-typing_base = _TypingBase
-
-
-if sys.version_info < (3, 9):
-    # python < 3.9 does not have GenericAlias (list[int], tuple[str, ...] and so on)
-    TypingGenericAlias = ()
-else:
-    from typing import GenericAlias as TypingGenericAlias  # type: ignore
-
-
-if sys.version_info < (3, 11):
-    from typing_extensions import NotRequired, Required
-else:
-    from typing import NotRequired, Required  # noqa: F401
-
-
-if sys.version_info < (3, 10):
-
-    def origin_is_union(tp: type[Any] | None) -> bool:
-        return tp is typing.Union
-
-    WithArgsTypes = (TypingGenericAlias,)
-
-else:
-
-    def origin_is_union(tp: type[Any] | None) -> bool:
-        return tp is typing.Union or tp is types.UnionType
-
-    WithArgsTypes = typing._GenericAlias, types.GenericAlias, types.UnionType  # type: ignore[attr-defined]
-
-
-if sys.version_info < (3, 10):
-    NoneType = type(None)
-    EllipsisType = type(Ellipsis)
-else:
-    from types import NoneType as NoneType
-
-
-LITERAL_TYPES: set[Any] = {Literal}
-if hasattr(typing, 'Literal'):
-    LITERAL_TYPES.add(typing.Literal)  # type: ignore
-
-NONE_TYPES: tuple[Any, ...] = (None, NoneType, *(tp[None] for tp in LITERAL_TYPES))
-
-
-TypeVarType = Any  # since mypy doesn't allow the use of TypeVar as a type
-
-
-def is_none_type(type_: Any) -> bool:
-    return type_ in NONE_TYPES
-
-
-def is_callable_type(type_: type[Any]) -> bool:
-    return type_ is Callable or get_origin(type_) is Callable
-
-
-def is_literal_type(type_: type[Any]) -> bool:
-    return Literal is not None and get_origin(type_) in LITERAL_TYPES
-
-
-def literal_values(type_: type[Any]) -> tuple[Any, ...]:
-    return get_args(type_)
-
-
-def all_literal_values(type_: type[Any]) -> list[Any]:
-    """This method is used to retrieve all Literal values as
-    Literal can be used recursively (see https://www.python.org/dev/peps/pep-0586)
-    e.g. `Literal[Literal[Literal[1, 2, 3], "foo"], 5, None]`.
-    """
-    if not is_literal_type(type_):
-        return [type_]
-
-    values = literal_values(type_)
-    return list(x for value in values for x in all_literal_values(value))
-
-
-def is_annotated(ann_type: Any) -> bool:
-    from ._utils import lenient_issubclass
-
-    origin = get_origin(ann_type)
-    return origin is not None and lenient_issubclass(origin, Annotated)
-
-
-def is_namedtuple(type_: type[Any]) -> bool:
-    """Check if a given class is a named tuple.
-    It can be either a `typing.NamedTuple` or `collections.namedtuple`.
-    """
-    from ._utils import lenient_issubclass
-
-    return lenient_issubclass(type_, tuple) and hasattr(type_, '_fields')
-
-
-test_new_type = typing.NewType('test_new_type', str)
-
-
-def is_new_type(type_: type[Any]) -> bool:
-    """Check whether type_ was created using typing.NewType.
-
-    Can't use isinstance because it fails <3.10.
-    """
-    return isinstance(type_, test_new_type.__class__) and hasattr(type_, '__supertype__')  # type: ignore[arg-type]
-
-
-def _check_classvar(v: type[Any] | None) -> bool:
-    if v is None:
-        return False
-
-    return v.__class__ == typing.ClassVar.__class__ and getattr(v, '_name', None) == 'ClassVar'
-
-
-def is_classvar(ann_type: type[Any]) -> bool:
-    if _check_classvar(ann_type) or _check_classvar(get_origin(ann_type)):
-        return True
-
-    # this is an ugly workaround for class vars that contain forward references and are therefore themselves
-    # forward references, see #3679
-    if ann_type.__class__ == typing.ForwardRef and ann_type.__forward_arg__.startswith('ClassVar['):  # type: ignore
-        return True
-
-    return False
-
-
-def _check_finalvar(v: type[Any] | None) -> bool:
-    """Check if a given type is a `typing.Final` type."""
-    if v is None:
-        return False
-
-    return v.__class__ == Final.__class__ and (sys.version_info < (3, 8) or getattr(v, '_name', None) == 'Final')
-
-
-def is_finalvar(ann_type: Any) -> bool:
-    return _check_finalvar(ann_type) or _check_finalvar(get_origin(ann_type))
-
-
-def parent_frame_namespace(*, parent_depth: int = 2) -> dict[str, Any] | None:
-    """We allow use of items in parent namespace to get around the issue with `get_type_hints` only looking in the
-    global module namespace. See https://github.com/pydantic/pydantic/issues/2678#issuecomment-1008139014 -> Scope
-    and suggestion at the end of the next comment by @gvanrossum.
-
-    WARNING 1: it matters exactly where this is called. By default, this function will build a namespace from the
-    parent of where it is called.
-
-    WARNING 2: this only looks in the parent namespace, not other parents since (AFAIK) there's no way to collect a
-    dict of exactly what's in scope. Using `f_back` would work sometimes but would be very wrong and confusing in many
-    other cases. See https://discuss.python.org/t/is-there-a-way-to-access-parent-nested-namespaces/20659.
-    """
-    frame = sys._getframe(parent_depth)
-    # if f_back is None, it's the global module namespace and we don't need to include it here
-    if frame.f_back is None:
-        return None
-    else:
-        return frame.f_locals
-
-
-def add_module_globals(obj: Any, globalns: dict[str, Any] | None = None) -> dict[str, Any]:
-    module_name = getattr(obj, '__module__', None)
-    if module_name:
-        try:
-            module_globalns = sys.modules[module_name].__dict__
-        except KeyError:
-            # happens occasionally, see https://github.com/pydantic/pydantic/issues/2363
-            pass
-        else:
-            if globalns:
-                return {**module_globalns, **globalns}
-            else:
-                # copy module globals to make sure it can't be updated later
-                return module_globalns.copy()
-
-    return globalns or {}
-
-
-def get_cls_types_namespace(cls: type[Any], parent_namespace: dict[str, Any] | None = None) -> dict[str, Any]:
-    ns = add_module_globals(cls, parent_namespace)
-    ns[cls.__name__] = cls
-    return ns
-
-
-def get_cls_type_hints_lenient(obj: Any, globalns: dict[str, Any] | None = None) -> dict[str, Any]:
-    """Collect annotations from a class, including those from parent classes.
-
-    Unlike `typing.get_type_hints`, this function will not error if a forward reference is not resolvable.
-    """
-    hints = {}
-    for base in reversed(obj.__mro__):
-        ann = base.__dict__.get('__annotations__')
-        localns = dict(vars(base))
-        if ann is not None and ann is not GetSetDescriptorType:
-            for name, value in ann.items():
-                hints[name] = eval_type_lenient(value, globalns, localns)
-    return hints
-
-
-def eval_type_lenient(value: Any, globalns: dict[str, Any] | None = None, localns: dict[str, Any] | None = None) -> Any:
-    """Behaves like typing._eval_type, except it won't raise an error if a forward reference can't be resolved."""
-    if value is None:
-        value = NoneType
-    elif isinstance(value, str):
-        value = _make_forward_ref(value, is_argument=False, is_class=True)
-
-    try:
-        return eval_type_backport(value, globalns, localns)
-    except NameError:
-        # the point of this function is to be tolerant to this case
-        return value
-
-
-def eval_type_backport(
-    value: Any, globalns: dict[str, Any] | None = None, localns: dict[str, Any] | None = None
-) -> Any:
-    """Like `typing._eval_type`, but falls back to the `eval_type_backport` package if it's
-    installed to let older Python versions use newer typing features.
-    Specifically, this transforms `X | Y` into `typing.Union[X, Y]`
-    and `list[X]` into `typing.List[X]` etc. (for all the types made generic in PEP 585)
-    if the original syntax is not supported in the current Python version.
-    """
-    try:
-        return typing._eval_type(  # type: ignore
-            value, globalns, localns
-        )
-    except TypeError as e:
-        if not (isinstance(value, typing.ForwardRef) and is_backport_fixable_error(e)):
-            raise
-        try:
-            from eval_type_backport import eval_type_backport
-        except ImportError:
-            raise TypeError(
-                f'You have a type annotation {value.__forward_arg__!r} '
-                f'which makes use of newer typing features than are supported in your version of Python. '
-                f'To handle this error, you should either remove the use of new syntax '
-                f'or install the `eval_type_backport` package.'
-            ) from e
-
-        return eval_type_backport(value, globalns, localns, try_default=False)
-
-
-def is_backport_fixable_error(e: TypeError) -> bool:
-    msg = str(e)
-    return msg.startswith('unsupported operand type(s) for |: ') or "' object is not subscriptable" in msg
-
-
-def get_function_type_hints(
-    function: Callable[..., Any], *, include_keys: set[str] | None = None, types_namespace: dict[str, Any] | None = None
-) -> dict[str, Any]:
-    """Like `typing.get_type_hints`, but doesn't convert `X` to `Optional[X]` if the default value is `None`, also
-    copes with `partial`.
-    """
-    if isinstance(function, partial):
-        annotations = function.func.__annotations__
-    else:
-        annotations = function.__annotations__
-
-    globalns = add_module_globals(function)
-    type_hints = {}
-    for name, value in annotations.items():
-        if include_keys is not None and name not in include_keys:
-            continue
-        if value is None:
-            value = NoneType
-        elif isinstance(value, str):
-            value = _make_forward_ref(value)
-
-        type_hints[name] = eval_type_backport(value, globalns, types_namespace)
-
-    return type_hints
-
-
-if sys.version_info < (3, 9, 8) or (3, 10) <= sys.version_info < (3, 10, 1):
-
-    def _make_forward_ref(
-        arg: Any,
-        is_argument: bool = True,
-        *,
-        is_class: bool = False,
-    ) -> typing.ForwardRef:
-        """Wrapper for ForwardRef that accounts for the `is_class` argument missing in older versions.
-        The `module` argument is omitted as it breaks <3.9.8, =3.10.0 and isn't used in the calls below.
-
-        See https://github.com/python/cpython/pull/28560 for some background.
-        The backport happened on 3.9.8, see:
-        https://github.com/pydantic/pydantic/discussions/6244#discussioncomment-6275458,
-        and on 3.10.1 for the 3.10 branch, see:
-        https://github.com/pydantic/pydantic/issues/6912
-
-        Implemented as EAFP with memory.
-        """
-        return typing.ForwardRef(arg, is_argument)
-
-else:
-    _make_forward_ref = typing.ForwardRef
-
-
-if sys.version_info >= (3, 10):
-    get_type_hints = typing.get_type_hints
-
-else:
-    """
-    For older versions of python, we have a custom implementation of `get_type_hints` which is a close as possible to
-    the implementation in CPython 3.10.8.
-    """
-
-    @typing.no_type_check
-    def get_type_hints(  # noqa: C901
-        obj: Any,
-        globalns: dict[str, Any] | None = None,
-        localns: dict[str, Any] | None = None,
-        include_extras: bool = False,
-    ) -> dict[str, Any]:  # pragma: no cover
-        """Taken verbatim from python 3.10.8 unchanged, except:
-        * type annotations of the function definition above.
-        * prefixing `typing.` where appropriate
-        * Use `_make_forward_ref` instead of `typing.ForwardRef` to handle the `is_class` argument.
-
-        https://github.com/python/cpython/blob/aaaf5174241496afca7ce4d4584570190ff972fe/Lib/typing.py#L1773-L1875
-
-        DO NOT CHANGE THIS METHOD UNLESS ABSOLUTELY NECESSARY.
-        ======================================================
-
-        Return type hints for an object.
-
-        This is often the same as obj.__annotations__, but it handles
-        forward references encoded as string literals, adds Optional[t] if a
-        default value equal to None is set and recursively replaces all
-        'Annotated[T, ...]' with 'T' (unless 'include_extras=True').
-
-        The argument may be a module, class, method, or function. The annotations
-        are returned as a dictionary. For classes, annotations include also
-        inherited members.
-
-        TypeError is raised if the argument is not of a type that can contain
-        annotations, and an empty dictionary is returned if no annotations are
-        present.
-
-        BEWARE -- the behavior of globalns and localns is counterintuitive
-        (unless you are familiar with how eval() and exec() work).  The
-        search order is locals first, then globals.
-
-        - If no dict arguments are passed, an attempt is made to use the
-          globals from obj (or the respective module's globals for classes),
-          and these are also used as the locals.  If the object does not appear
-          to have globals, an empty dictionary is used.  For classes, the search
-          order is globals first then locals.
-
-        - If one dict argument is passed, it is used for both globals and
-          locals.
-
-        - If two dict arguments are passed, they specify globals and
-          locals, respectively.
-        """
-        if getattr(obj, '__no_type_check__', None):
-            return {}
-        # Classes require a special treatment.
-        if isinstance(obj, type):
-            hints = {}
-            for base in reversed(obj.__mro__):
-                if globalns is None:
-                    base_globals = getattr(sys.modules.get(base.__module__, None), '__dict__', {})
-                else:
-                    base_globals = globalns
-                ann = base.__dict__.get('__annotations__', {})
-                if isinstance(ann, types.GetSetDescriptorType):
-                    ann = {}
-                base_locals = dict(vars(base)) if localns is None else localns
-                if localns is None and globalns is None:
-                    # This is surprising, but required.  Before Python 3.10,
-                    # get_type_hints only evaluated the globalns of
-                    # a class.  To maintain backwards compatibility, we reverse
-                    # the globalns and localns order so that eval() looks into
-                    # *base_globals* first rather than *base_locals*.
-                    # This only affects ForwardRefs.
-                    base_globals, base_locals = base_locals, base_globals
-                for name, value in ann.items():
-                    if value is None:
-                        value = type(None)
-                    if isinstance(value, str):
-                        value = _make_forward_ref(value, is_argument=False, is_class=True)
-
-                    value = eval_type_backport(value, base_globals, base_locals)
-                    hints[name] = value
-            if not include_extras and hasattr(typing, '_strip_annotations'):
-                return {
-                    k: typing._strip_annotations(t)  # type: ignore
-                    for k, t in hints.items()
-                }
-            else:
-                return hints
-
-        if globalns is None:
-            if isinstance(obj, types.ModuleType):
-                globalns = obj.__dict__
-            else:
-                nsobj = obj
-                # Find globalns for the unwrapped object.
-                while hasattr(nsobj, '__wrapped__'):
-                    nsobj = nsobj.__wrapped__
-                globalns = getattr(nsobj, '__globals__', {})
-            if localns is None:
-                localns = globalns
-        elif localns is None:
-            localns = globalns
-        hints = getattr(obj, '__annotations__', None)
-        if hints is None:
-            # Return empty annotations for something that _could_ have them.
-            if isinstance(obj, typing._allowed_types):  # type: ignore
-                return {}
-            else:
-                raise TypeError(f'{obj!r} is not a module, class, method, ' 'or function.')
-        defaults = typing._get_defaults(obj)  # type: ignore
-        hints = dict(hints)
-        for name, value in hints.items():
-            if value is None:
-                value = type(None)
-            if isinstance(value, str):
-                # class-level forward refs were handled above, this must be either
-                # a module-level annotation or a function argument annotation
-
-                value = _make_forward_ref(
-                    value,
-                    is_argument=not isinstance(obj, types.ModuleType),
-                    is_class=False,
-                )
-            value = eval_type_backport(value, globalns, localns)
-            if name in defaults and defaults[name] is None:
-                value = typing.Optional[value]
-            hints[name] = value
-        return hints if include_extras else {k: typing._strip_annotations(t) for k, t in hints.items()}  # type: ignore
-
-
-def is_dataclass(_cls: type[Any]) -> TypeGuard[type[StandardDataclass]]:
-    # The dataclasses.is_dataclass function doesn't seem to provide TypeGuard functionality,
-    # so I created this convenience function
-    return dataclasses.is_dataclass(_cls)
-
-
-def origin_is_type_alias_type(origin: Any) -> TypeGuard[TypeAliasType]:
-    return isinstance(origin, TypeAliasType)
-
-
-if sys.version_info >= (3, 10):
-
-    def is_generic_alias(type_: type[Any]) -> bool:
-        return isinstance(type_, (types.GenericAlias, typing._GenericAlias))  # type: ignore[attr-defined]
-
-else:
-
-    def is_generic_alias(type_: type[Any]) -> bool:
-        return isinstance(type_, typing._GenericAlias)  # type: ignore
diff --git a/lib/pydantic/_internal/_utils.py b/lib/pydantic/_internal/_utils.py
deleted file mode 100644
index 31f5b2c5..00000000
--- a/lib/pydantic/_internal/_utils.py
+++ /dev/null
@@ -1,362 +0,0 @@
-"""Bucket of reusable internal utilities.
-
-This should be reduced as much as possible with functions only used in one place, moved to that place.
-"""
-from __future__ import annotations as _annotations
-
-import dataclasses
-import keyword
-import typing
-import weakref
-from collections import OrderedDict, defaultdict, deque
-from copy import deepcopy
-from itertools import zip_longest
-from types import BuiltinFunctionType, CodeType, FunctionType, GeneratorType, LambdaType, ModuleType
-from typing import Any, Mapping, TypeVar
-
-from typing_extensions import TypeAlias, TypeGuard
-
-from . import _repr, _typing_extra
-
-if typing.TYPE_CHECKING:
-    MappingIntStrAny: TypeAlias = 'typing.Mapping[int, Any] | typing.Mapping[str, Any]'
-    AbstractSetIntStr: TypeAlias = 'typing.AbstractSet[int] | typing.AbstractSet[str]'
-    from ..main import BaseModel
-
-
-# these are types that are returned unchanged by deepcopy
-IMMUTABLE_NON_COLLECTIONS_TYPES: set[type[Any]] = {
-    int,
-    float,
-    complex,
-    str,
-    bool,
-    bytes,
-    type,
-    _typing_extra.NoneType,
-    FunctionType,
-    BuiltinFunctionType,
-    LambdaType,
-    weakref.ref,
-    CodeType,
-    # note: including ModuleType will differ from behaviour of deepcopy by not producing error.
-    # It might be not a good idea in general, but considering that this function used only internally
-    # against default values of fields, this will allow to actually have a field with module as default value
-    ModuleType,
-    NotImplemented.__class__,
-    Ellipsis.__class__,
-}
-
-# these are types that if empty, might be copied with simple copy() instead of deepcopy()
-BUILTIN_COLLECTIONS: set[type[Any]] = {
-    list,
-    set,
-    tuple,
-    frozenset,
-    dict,
-    OrderedDict,
-    defaultdict,
-    deque,
-}
-
-
-def sequence_like(v: Any) -> bool:
-    return isinstance(v, (list, tuple, set, frozenset, GeneratorType, deque))
-
-
-def lenient_isinstance(o: Any, class_or_tuple: type[Any] | tuple[type[Any], ...] | None) -> bool:  # pragma: no cover
-    try:
-        return isinstance(o, class_or_tuple)  # type: ignore[arg-type]
-    except TypeError:
-        return False
-
-
-def lenient_issubclass(cls: Any, class_or_tuple: Any) -> bool:  # pragma: no cover
-    try:
-        return isinstance(cls, type) and issubclass(cls, class_or_tuple)
-    except TypeError:
-        if isinstance(cls, _typing_extra.WithArgsTypes):
-            return False
-        raise  # pragma: no cover
-
-
-def is_model_class(cls: Any) -> TypeGuard[type[BaseModel]]:
-    """Returns true if cls is a _proper_ subclass of BaseModel, and provides proper type-checking,
-    unlike raw calls to lenient_issubclass.
-    """
-    from ..main import BaseModel
-
-    return lenient_issubclass(cls, BaseModel) and cls is not BaseModel
-
-
-def is_valid_identifier(identifier: str) -> bool:
-    """Checks that a string is a valid identifier and not a Python keyword.
-    :param identifier: The identifier to test.
-    :return: True if the identifier is valid.
-    """
-    return identifier.isidentifier() and not keyword.iskeyword(identifier)
-
-
-KeyType = TypeVar('KeyType')
-
-
-def deep_update(mapping: dict[KeyType, Any], *updating_mappings: dict[KeyType, Any]) -> dict[KeyType, Any]:
-    updated_mapping = mapping.copy()
-    for updating_mapping in updating_mappings:
-        for k, v in updating_mapping.items():
-            if k in updated_mapping and isinstance(updated_mapping[k], dict) and isinstance(v, dict):
-                updated_mapping[k] = deep_update(updated_mapping[k], v)
-            else:
-                updated_mapping[k] = v
-    return updated_mapping
-
-
-def update_not_none(mapping: dict[Any, Any], **update: Any) -> None:
-    mapping.update({k: v for k, v in update.items() if v is not None})
-
-
-T = TypeVar('T')
-
-
-def unique_list(
-    input_list: list[T] | tuple[T, ...],
-    *,
-    name_factory: typing.Callable[[T], str] = str,
-) -> list[T]:
-    """Make a list unique while maintaining order.
-    We update the list if another one with the same name is set
-    (e.g. model validator overridden in subclass).
-    """
-    result: list[T] = []
-    result_names: list[str] = []
-    for v in input_list:
-        v_name = name_factory(v)
-        if v_name not in result_names:
-            result_names.append(v_name)
-            result.append(v)
-        else:
-            result[result_names.index(v_name)] = v
-
-    return result
-
-
-class ValueItems(_repr.Representation):
-    """Class for more convenient calculation of excluded or included fields on values."""
-
-    __slots__ = ('_items', '_type')
-
-    def __init__(self, value: Any, items: AbstractSetIntStr | MappingIntStrAny) -> None:
-        items = self._coerce_items(items)
-
-        if isinstance(value, (list, tuple)):
-            items = self._normalize_indexes(items, len(value))  # type: ignore
-
-        self._items: MappingIntStrAny = items  # type: ignore
-
-    def is_excluded(self, item: Any) -> bool:
-        """Check if item is fully excluded.
-
-        :param item: key or index of a value
-        """
-        return self.is_true(self._items.get(item))
-
-    def is_included(self, item: Any) -> bool:
-        """Check if value is contained in self._items.
-
-        :param item: key or index of value
-        """
-        return item in self._items
-
-    def for_element(self, e: int | str) -> AbstractSetIntStr | MappingIntStrAny | None:
-        """:param e: key or index of element on value
-        :return: raw values for element if self._items is dict and contain needed element
-        """
-        item = self._items.get(e)  # type: ignore
-        return item if not self.is_true(item) else None
-
-    def _normalize_indexes(self, items: MappingIntStrAny, v_length: int) -> dict[int | str, Any]:
-        """:param items: dict or set of indexes which will be normalized
-        :param v_length: length of sequence indexes of which will be
-
-        >>> self._normalize_indexes({0: True, -2: True, -1: True}, 4)
-        {0: True, 2: True, 3: True}
-        >>> self._normalize_indexes({'__all__': True}, 4)
-        {0: True, 1: True, 2: True, 3: True}
-        """
-        normalized_items: dict[int | str, Any] = {}
-        all_items = None
-        for i, v in items.items():
-            if not (isinstance(v, typing.Mapping) or isinstance(v, typing.AbstractSet) or self.is_true(v)):
-                raise TypeError(f'Unexpected type of exclude value for index "{i}" {v.__class__}')
-            if i == '__all__':
-                all_items = self._coerce_value(v)
-                continue
-            if not isinstance(i, int):
-                raise TypeError(
-                    'Excluding fields from a sequence of sub-models or dicts must be performed index-wise: '
-                    'expected integer keys or keyword "__all__"'
-                )
-            normalized_i = v_length + i if i < 0 else i
-            normalized_items[normalized_i] = self.merge(v, normalized_items.get(normalized_i))
-
-        if not all_items:
-            return normalized_items
-        if self.is_true(all_items):
-            for i in range(v_length):
-                normalized_items.setdefault(i, ...)
-            return normalized_items
-        for i in range(v_length):
-            normalized_item = normalized_items.setdefault(i, {})
-            if not self.is_true(normalized_item):
-                normalized_items[i] = self.merge(all_items, normalized_item)
-        return normalized_items
-
-    @classmethod
-    def merge(cls, base: Any, override: Any, intersect: bool = False) -> Any:
-        """Merge a `base` item with an `override` item.
-
-        Both `base` and `override` are converted to dictionaries if possible.
-        Sets are converted to dictionaries with the sets entries as keys and
-        Ellipsis as values.
-
-        Each key-value pair existing in `base` is merged with `override`,
-        while the rest of the key-value pairs are updated recursively with this function.
-
-        Merging takes place based on the "union" of keys if `intersect` is
-        set to `False` (default) and on the intersection of keys if
-        `intersect` is set to `True`.
-        """
-        override = cls._coerce_value(override)
-        base = cls._coerce_value(base)
-        if override is None:
-            return base
-        if cls.is_true(base) or base is None:
-            return override
-        if cls.is_true(override):
-            return base if intersect else override
-
-        # intersection or union of keys while preserving ordering:
-        if intersect:
-            merge_keys = [k for k in base if k in override] + [k for k in override if k in base]
-        else:
-            merge_keys = list(base) + [k for k in override if k not in base]
-
-        merged: dict[int | str, Any] = {}
-        for k in merge_keys:
-            merged_item = cls.merge(base.get(k), override.get(k), intersect=intersect)
-            if merged_item is not None:
-                merged[k] = merged_item
-
-        return merged
-
-    @staticmethod
-    def _coerce_items(items: AbstractSetIntStr | MappingIntStrAny) -> MappingIntStrAny:
-        if isinstance(items, typing.Mapping):
-            pass
-        elif isinstance(items, typing.AbstractSet):
-            items = dict.fromkeys(items, ...)  # type: ignore
-        else:
-            class_name = getattr(items, '__class__', '???')
-            raise TypeError(f'Unexpected type of exclude value {class_name}')
-        return items  # type: ignore
-
-    @classmethod
-    def _coerce_value(cls, value: Any) -> Any:
-        if value is None or cls.is_true(value):
-            return value
-        return cls._coerce_items(value)
-
-    @staticmethod
-    def is_true(v: Any) -> bool:
-        return v is True or v is ...
-
-    def __repr_args__(self) -> _repr.ReprArgs:
-        return [(None, self._items)]
-
-
-if typing.TYPE_CHECKING:
-
-    def ClassAttribute(name: str, value: T) -> T:
-        ...
-
-else:
-
-    class ClassAttribute:
-        """Hide class attribute from its instances."""
-
-        __slots__ = 'name', 'value'
-
-        def __init__(self, name: str, value: Any) -> None:
-            self.name = name
-            self.value = value
-
-        def __get__(self, instance: Any, owner: type[Any]) -> None:
-            if instance is None:
-                return self.value
-            raise AttributeError(f'{self.name!r} attribute of {owner.__name__!r} is class-only')
-
-
-Obj = TypeVar('Obj')
-
-
-def smart_deepcopy(obj: Obj) -> Obj:
-    """Return type as is for immutable built-in types
-    Use obj.copy() for built-in empty collections
-    Use copy.deepcopy() for non-empty collections and unknown objects.
-    """
-    obj_type = obj.__class__
-    if obj_type in IMMUTABLE_NON_COLLECTIONS_TYPES:
-        return obj  # fastest case: obj is immutable and not collection therefore will not be copied anyway
-    try:
-        if not obj and obj_type in BUILTIN_COLLECTIONS:
-            # faster way for empty collections, no need to copy its members
-            return obj if obj_type is tuple else obj.copy()  # tuple doesn't have copy method  # type: ignore
-    except (TypeError, ValueError, RuntimeError):
-        # do we really dare to catch ALL errors? Seems a bit risky
-        pass
-
-    return deepcopy(obj)  # slowest way when we actually might need a deepcopy
-
-
-_SENTINEL = object()
-
-
-def all_identical(left: typing.Iterable[Any], right: typing.Iterable[Any]) -> bool:
-    """Check that the items of `left` are the same objects as those in `right`.
-
-    >>> a, b = object(), object()
-    >>> all_identical([a, b, a], [a, b, a])
-    True
-    >>> all_identical([a, b, [a]], [a, b, [a]])  # new list object, while "equal" is not "identical"
-    False
-    """
-    for left_item, right_item in zip_longest(left, right, fillvalue=_SENTINEL):
-        if left_item is not right_item:
-            return False
-    return True
-
-
-@dataclasses.dataclass(frozen=True)
-class SafeGetItemProxy:
-    """Wrapper redirecting `__getitem__` to `get` with a sentinel value as default
-
-    This makes is safe to use in `operator.itemgetter` when some keys may be missing
-    """
-
-    # Define __slots__manually for performances
-    # @dataclasses.dataclass() only support slots=True in python>=3.10
-    __slots__ = ('wrapped',)
-
-    wrapped: Mapping[str, Any]
-
-    def __getitem__(self, __key: str) -> Any:
-        return self.wrapped.get(__key, _SENTINEL)
-
-    # required to pass the object to operator.itemgetter() instances due to a quirk of typeshed
-    # https://github.com/python/mypy/issues/13713
-    # https://github.com/python/typeshed/pull/8785
-    # Since this is typing-only, hide it in a typing.TYPE_CHECKING block
-    if typing.TYPE_CHECKING:
-
-        def __contains__(self, __key: str) -> bool:
-            return self.wrapped.__contains__(__key)
diff --git a/lib/pydantic/_internal/_validate_call.py b/lib/pydantic/_internal/_validate_call.py
deleted file mode 100644
index 664c0630..00000000
--- a/lib/pydantic/_internal/_validate_call.py
+++ /dev/null
@@ -1,84 +0,0 @@
-from __future__ import annotations as _annotations
-
-import inspect
-from functools import partial
-from typing import Any, Awaitable, Callable
-
-import pydantic_core
-
-from ..config import ConfigDict
-from ..plugin._schema_validator import create_schema_validator
-from . import _generate_schema, _typing_extra
-from ._config import ConfigWrapper
-
-
-class ValidateCallWrapper:
-    """This is a wrapper around a function that validates the arguments passed to it, and optionally the return value."""
-
-    __slots__ = (
-        '__pydantic_validator__',
-        '__name__',
-        '__qualname__',
-        '__annotations__',
-        '__dict__',  # required for __module__
-    )
-
-    def __init__(self, function: Callable[..., Any], config: ConfigDict | None, validate_return: bool):
-        if isinstance(function, partial):
-            func = function.func
-            schema_type = func
-            self.__name__ = f'partial({func.__name__})'
-            self.__qualname__ = f'partial({func.__qualname__})'
-            self.__module__ = func.__module__
-        else:
-            schema_type = function
-            self.__name__ = function.__name__
-            self.__qualname__ = function.__qualname__
-            self.__module__ = function.__module__
-
-        namespace = _typing_extra.add_module_globals(function, None)
-        config_wrapper = ConfigWrapper(config)
-        gen_schema = _generate_schema.GenerateSchema(config_wrapper, namespace)
-        schema = gen_schema.clean_schema(gen_schema.generate_schema(function))
-        core_config = config_wrapper.core_config(self)
-
-        self.__pydantic_validator__ = create_schema_validator(
-            schema,
-            schema_type,
-            self.__module__,
-            self.__qualname__,
-            'validate_call',
-            core_config,
-            config_wrapper.plugin_settings,
-        )
-
-        if validate_return:
-            signature = inspect.signature(function)
-            return_type = signature.return_annotation if signature.return_annotation is not signature.empty else Any
-            gen_schema = _generate_schema.GenerateSchema(config_wrapper, namespace)
-            schema = gen_schema.clean_schema(gen_schema.generate_schema(return_type))
-            validator = create_schema_validator(
-                schema,
-                schema_type,
-                self.__module__,
-                self.__qualname__,
-                'validate_call',
-                core_config,
-                config_wrapper.plugin_settings,
-            )
-            if inspect.iscoroutinefunction(function):
-
-                async def return_val_wrapper(aw: Awaitable[Any]) -> None:
-                    return validator.validate_python(await aw)
-
-                self.__return_pydantic_validator__ = return_val_wrapper
-            else:
-                self.__return_pydantic_validator__ = validator.validate_python
-        else:
-            self.__return_pydantic_validator__ = None
-
-    def __call__(self, *args: Any, **kwargs: Any) -> Any:
-        res = self.__pydantic_validator__.validate_python(pydantic_core.ArgsKwargs(args, kwargs))
-        if self.__return_pydantic_validator__:
-            return self.__return_pydantic_validator__(res)
-        return res
diff --git a/lib/pydantic/_internal/_validators.py b/lib/pydantic/_internal/_validators.py
deleted file mode 100644
index 7193fe5c..00000000
--- a/lib/pydantic/_internal/_validators.py
+++ /dev/null
@@ -1,278 +0,0 @@
-"""Validator functions for standard library types.
-
-Import of this module is deferred since it contains imports of many standard library modules.
-"""
-
-from __future__ import annotations as _annotations
-
-import math
-import re
-import typing
-from ipaddress import IPv4Address, IPv4Interface, IPv4Network, IPv6Address, IPv6Interface, IPv6Network
-from typing import Any
-
-from pydantic_core import PydanticCustomError, core_schema
-from pydantic_core._pydantic_core import PydanticKnownError
-
-
-def sequence_validator(
-    __input_value: typing.Sequence[Any],
-    validator: core_schema.ValidatorFunctionWrapHandler,
-) -> typing.Sequence[Any]:
-    """Validator for `Sequence` types, isinstance(v, Sequence) has already been called."""
-    value_type = type(__input_value)
-
-    # We don't accept any plain string as a sequence
-    # Relevant issue: https://github.com/pydantic/pydantic/issues/5595
-    if issubclass(value_type, (str, bytes)):
-        raise PydanticCustomError(
-            'sequence_str',
-            "'{type_name}' instances are not allowed as a Sequence value",
-            {'type_name': value_type.__name__},
-        )
-
-    v_list = validator(__input_value)
-
-    # the rest of the logic is just re-creating the original type from `v_list`
-    if value_type == list:
-        return v_list
-    elif issubclass(value_type, range):
-        # return the list as we probably can't re-create the range
-        return v_list
-    else:
-        # best guess at how to re-create the original type, more custom construction logic might be required
-        return value_type(v_list)  # type: ignore[call-arg]
-
-
-def import_string(value: Any) -> Any:
-    if isinstance(value, str):
-        try:
-            return _import_string_logic(value)
-        except ImportError as e:
-            raise PydanticCustomError('import_error', 'Invalid python path: {error}', {'error': str(e)}) from e
-    else:
-        # otherwise we just return the value and let the next validator do the rest of the work
-        return value
-
-
-def _import_string_logic(dotted_path: str) -> Any:
-    """Inspired by uvicorn — dotted paths should include a colon before the final item if that item is not a module.
-    (This is necessary to distinguish between a submodule and an attribute when there is a conflict.).
-
-    If the dotted path does not include a colon and the final item is not a valid module, importing as an attribute
-    rather than a submodule will be attempted automatically.
-
-    So, for example, the following values of `dotted_path` result in the following returned values:
-    * 'collections': <module 'collections'>
-    * 'collections.abc': <module 'collections.abc'>
-    * 'collections.abc:Mapping': <class 'collections.abc.Mapping'>
-    * `collections.abc.Mapping`: <class 'collections.abc.Mapping'> (though this is a bit slower than the previous line)
-
-    An error will be raised under any of the following scenarios:
-    * `dotted_path` contains more than one colon (e.g., 'collections:abc:Mapping')
-    * the substring of `dotted_path` before the colon is not a valid module in the environment (e.g., '123:Mapping')
-    * the substring of `dotted_path` after the colon is not an attribute of the module (e.g., 'collections:abc123')
-    """
-    from importlib import import_module
-
-    components = dotted_path.strip().split(':')
-    if len(components) > 2:
-        raise ImportError(f"Import strings should have at most one ':'; received {dotted_path!r}")
-
-    module_path = components[0]
-    if not module_path:
-        raise ImportError(f'Import strings should have a nonempty module name; received {dotted_path!r}')
-
-    try:
-        module = import_module(module_path)
-    except ModuleNotFoundError as e:
-        if '.' in module_path:
-            # Check if it would be valid if the final item was separated from its module with a `:`
-            maybe_module_path, maybe_attribute = dotted_path.strip().rsplit('.', 1)
-            try:
-                return _import_string_logic(f'{maybe_module_path}:{maybe_attribute}')
-            except ImportError:
-                pass
-            raise ImportError(f'No module named {module_path!r}') from e
-        raise e
-
-    if len(components) > 1:
-        attribute = components[1]
-        try:
-            return getattr(module, attribute)
-        except AttributeError as e:
-            raise ImportError(f'cannot import name {attribute!r} from {module_path!r}') from e
-    else:
-        return module
-
-
-def pattern_either_validator(__input_value: Any) -> typing.Pattern[Any]:
-    if isinstance(__input_value, typing.Pattern):
-        return __input_value
-    elif isinstance(__input_value, (str, bytes)):
-        # todo strict mode
-        return compile_pattern(__input_value)  # type: ignore
-    else:
-        raise PydanticCustomError('pattern_type', 'Input should be a valid pattern')
-
-
-def pattern_str_validator(__input_value: Any) -> typing.Pattern[str]:
-    if isinstance(__input_value, typing.Pattern):
-        if isinstance(__input_value.pattern, str):
-            return __input_value
-        else:
-            raise PydanticCustomError('pattern_str_type', 'Input should be a string pattern')
-    elif isinstance(__input_value, str):
-        return compile_pattern(__input_value)
-    elif isinstance(__input_value, bytes):
-        raise PydanticCustomError('pattern_str_type', 'Input should be a string pattern')
-    else:
-        raise PydanticCustomError('pattern_type', 'Input should be a valid pattern')
-
-
-def pattern_bytes_validator(__input_value: Any) -> typing.Pattern[bytes]:
-    if isinstance(__input_value, typing.Pattern):
-        if isinstance(__input_value.pattern, bytes):
-            return __input_value
-        else:
-            raise PydanticCustomError('pattern_bytes_type', 'Input should be a bytes pattern')
-    elif isinstance(__input_value, bytes):
-        return compile_pattern(__input_value)
-    elif isinstance(__input_value, str):
-        raise PydanticCustomError('pattern_bytes_type', 'Input should be a bytes pattern')
-    else:
-        raise PydanticCustomError('pattern_type', 'Input should be a valid pattern')
-
-
-PatternType = typing.TypeVar('PatternType', str, bytes)
-
-
-def compile_pattern(pattern: PatternType) -> typing.Pattern[PatternType]:
-    try:
-        return re.compile(pattern)
-    except re.error:
-        raise PydanticCustomError('pattern_regex', 'Input should be a valid regular expression')
-
-
-def ip_v4_address_validator(__input_value: Any) -> IPv4Address:
-    if isinstance(__input_value, IPv4Address):
-        return __input_value
-
-    try:
-        return IPv4Address(__input_value)
-    except ValueError:
-        raise PydanticCustomError('ip_v4_address', 'Input is not a valid IPv4 address')
-
-
-def ip_v6_address_validator(__input_value: Any) -> IPv6Address:
-    if isinstance(__input_value, IPv6Address):
-        return __input_value
-
-    try:
-        return IPv6Address(__input_value)
-    except ValueError:
-        raise PydanticCustomError('ip_v6_address', 'Input is not a valid IPv6 address')
-
-
-def ip_v4_network_validator(__input_value: Any) -> IPv4Network:
-    """Assume IPv4Network initialised with a default `strict` argument.
-
-    See more:
-    https://docs.python.org/library/ipaddress.html#ipaddress.IPv4Network
-    """
-    if isinstance(__input_value, IPv4Network):
-        return __input_value
-
-    try:
-        return IPv4Network(__input_value)
-    except ValueError:
-        raise PydanticCustomError('ip_v4_network', 'Input is not a valid IPv4 network')
-
-
-def ip_v6_network_validator(__input_value: Any) -> IPv6Network:
-    """Assume IPv6Network initialised with a default `strict` argument.
-
-    See more:
-    https://docs.python.org/library/ipaddress.html#ipaddress.IPv6Network
-    """
-    if isinstance(__input_value, IPv6Network):
-        return __input_value
-
-    try:
-        return IPv6Network(__input_value)
-    except ValueError:
-        raise PydanticCustomError('ip_v6_network', 'Input is not a valid IPv6 network')
-
-
-def ip_v4_interface_validator(__input_value: Any) -> IPv4Interface:
-    if isinstance(__input_value, IPv4Interface):
-        return __input_value
-
-    try:
-        return IPv4Interface(__input_value)
-    except ValueError:
-        raise PydanticCustomError('ip_v4_interface', 'Input is not a valid IPv4 interface')
-
-
-def ip_v6_interface_validator(__input_value: Any) -> IPv6Interface:
-    if isinstance(__input_value, IPv6Interface):
-        return __input_value
-
-    try:
-        return IPv6Interface(__input_value)
-    except ValueError:
-        raise PydanticCustomError('ip_v6_interface', 'Input is not a valid IPv6 interface')
-
-
-def greater_than_validator(x: Any, gt: Any) -> Any:
-    if not (x > gt):
-        raise PydanticKnownError('greater_than', {'gt': gt})
-    return x
-
-
-def greater_than_or_equal_validator(x: Any, ge: Any) -> Any:
-    if not (x >= ge):
-        raise PydanticKnownError('greater_than_equal', {'ge': ge})
-    return x
-
-
-def less_than_validator(x: Any, lt: Any) -> Any:
-    if not (x < lt):
-        raise PydanticKnownError('less_than', {'lt': lt})
-    return x
-
-
-def less_than_or_equal_validator(x: Any, le: Any) -> Any:
-    if not (x <= le):
-        raise PydanticKnownError('less_than_equal', {'le': le})
-    return x
-
-
-def multiple_of_validator(x: Any, multiple_of: Any) -> Any:
-    if not (x % multiple_of == 0):
-        raise PydanticKnownError('multiple_of', {'multiple_of': multiple_of})
-    return x
-
-
-def min_length_validator(x: Any, min_length: Any) -> Any:
-    if not (len(x) >= min_length):
-        raise PydanticKnownError(
-            'too_short',
-            {'field_type': 'Value', 'min_length': min_length, 'actual_length': len(x)},
-        )
-    return x
-
-
-def max_length_validator(x: Any, max_length: Any) -> Any:
-    if len(x) > max_length:
-        raise PydanticKnownError(
-            'too_long',
-            {'field_type': 'Value', 'max_length': max_length, 'actual_length': len(x)},
-        )
-    return x
-
-
-def forbid_inf_nan_check(x: Any) -> Any:
-    if not math.isfinite(x):
-        raise PydanticKnownError('finite_number')
-    return x
diff --git a/lib/pydantic/_migration.py b/lib/pydantic/_migration.py
deleted file mode 100644
index c8478a62..00000000
--- a/lib/pydantic/_migration.py
+++ /dev/null
@@ -1,308 +0,0 @@
-import sys
-from typing import Any, Callable, Dict
-
-from .version import version_short
-
-MOVED_IN_V2 = {
-    'pydantic.utils:version_info': 'pydantic.version:version_info',
-    'pydantic.error_wrappers:ValidationError': 'pydantic:ValidationError',
-    'pydantic.utils:to_camel': 'pydantic.alias_generators:to_pascal',
-    'pydantic.utils:to_lower_camel': 'pydantic.alias_generators:to_camel',
-    'pydantic:PyObject': 'pydantic.types:ImportString',
-    'pydantic.types:PyObject': 'pydantic.types:ImportString',
-    'pydantic.generics:GenericModel': 'pydantic.BaseModel',
-}
-
-DEPRECATED_MOVED_IN_V2 = {
-    'pydantic.tools:schema_of': 'pydantic.deprecated.tools:schema_of',
-    'pydantic.tools:parse_obj_as': 'pydantic.deprecated.tools:parse_obj_as',
-    'pydantic.tools:schema_json_of': 'pydantic.deprecated.tools:schema_json_of',
-    'pydantic.json:pydantic_encoder': 'pydantic.deprecated.json:pydantic_encoder',
-    'pydantic:validate_arguments': 'pydantic.deprecated.decorator:validate_arguments',
-    'pydantic.json:custom_pydantic_encoder': 'pydantic.deprecated.json:custom_pydantic_encoder',
-    'pydantic.json:timedelta_isoformat': 'pydantic.deprecated.json:timedelta_isoformat',
-    'pydantic.decorator:validate_arguments': 'pydantic.deprecated.decorator:validate_arguments',
-    'pydantic.class_validators:validator': 'pydantic.deprecated.class_validators:validator',
-    'pydantic.class_validators:root_validator': 'pydantic.deprecated.class_validators:root_validator',
-    'pydantic.config:BaseConfig': 'pydantic.deprecated.config:BaseConfig',
-    'pydantic.config:Extra': 'pydantic.deprecated.config:Extra',
-}
-
-REDIRECT_TO_V1 = {
-    f'pydantic.utils:{obj}': f'pydantic.v1.utils:{obj}'
-    for obj in (
-        'deep_update',
-        'GetterDict',
-        'lenient_issubclass',
-        'lenient_isinstance',
-        'is_valid_field',
-        'update_not_none',
-        'import_string',
-        'Representation',
-        'ROOT_KEY',
-        'smart_deepcopy',
-        'sequence_like',
-    )
-}
-
-
-REMOVED_IN_V2 = {
-    'pydantic:ConstrainedBytes',
-    'pydantic:ConstrainedDate',
-    'pydantic:ConstrainedDecimal',
-    'pydantic:ConstrainedFloat',
-    'pydantic:ConstrainedFrozenSet',
-    'pydantic:ConstrainedInt',
-    'pydantic:ConstrainedList',
-    'pydantic:ConstrainedSet',
-    'pydantic:ConstrainedStr',
-    'pydantic:JsonWrapper',
-    'pydantic:NoneBytes',
-    'pydantic:NoneStr',
-    'pydantic:NoneStrBytes',
-    'pydantic:Protocol',
-    'pydantic:Required',
-    'pydantic:StrBytes',
-    'pydantic:compiled',
-    'pydantic.config:get_config',
-    'pydantic.config:inherit_config',
-    'pydantic.config:prepare_config',
-    'pydantic:create_model_from_namedtuple',
-    'pydantic:create_model_from_typeddict',
-    'pydantic.dataclasses:create_pydantic_model_from_dataclass',
-    'pydantic.dataclasses:make_dataclass_validator',
-    'pydantic.dataclasses:set_validation',
-    'pydantic.datetime_parse:parse_date',
-    'pydantic.datetime_parse:parse_time',
-    'pydantic.datetime_parse:parse_datetime',
-    'pydantic.datetime_parse:parse_duration',
-    'pydantic.error_wrappers:ErrorWrapper',
-    'pydantic.errors:AnyStrMaxLengthError',
-    'pydantic.errors:AnyStrMinLengthError',
-    'pydantic.errors:ArbitraryTypeError',
-    'pydantic.errors:BoolError',
-    'pydantic.errors:BytesError',
-    'pydantic.errors:CallableError',
-    'pydantic.errors:ClassError',
-    'pydantic.errors:ColorError',
-    'pydantic.errors:ConfigError',
-    'pydantic.errors:DataclassTypeError',
-    'pydantic.errors:DateError',
-    'pydantic.errors:DateNotInTheFutureError',
-    'pydantic.errors:DateNotInThePastError',
-    'pydantic.errors:DateTimeError',
-    'pydantic.errors:DecimalError',
-    'pydantic.errors:DecimalIsNotFiniteError',
-    'pydantic.errors:DecimalMaxDigitsError',
-    'pydantic.errors:DecimalMaxPlacesError',
-    'pydantic.errors:DecimalWholeDigitsError',
-    'pydantic.errors:DictError',
-    'pydantic.errors:DurationError',
-    'pydantic.errors:EmailError',
-    'pydantic.errors:EnumError',
-    'pydantic.errors:EnumMemberError',
-    'pydantic.errors:ExtraError',
-    'pydantic.errors:FloatError',
-    'pydantic.errors:FrozenSetError',
-    'pydantic.errors:FrozenSetMaxLengthError',
-    'pydantic.errors:FrozenSetMinLengthError',
-    'pydantic.errors:HashableError',
-    'pydantic.errors:IPv4AddressError',
-    'pydantic.errors:IPv4InterfaceError',
-    'pydantic.errors:IPv4NetworkError',
-    'pydantic.errors:IPv6AddressError',
-    'pydantic.errors:IPv6InterfaceError',
-    'pydantic.errors:IPv6NetworkError',
-    'pydantic.errors:IPvAnyAddressError',
-    'pydantic.errors:IPvAnyInterfaceError',
-    'pydantic.errors:IPvAnyNetworkError',
-    'pydantic.errors:IntEnumError',
-    'pydantic.errors:IntegerError',
-    'pydantic.errors:InvalidByteSize',
-    'pydantic.errors:InvalidByteSizeUnit',
-    'pydantic.errors:InvalidDiscriminator',
-    'pydantic.errors:InvalidLengthForBrand',
-    'pydantic.errors:JsonError',
-    'pydantic.errors:JsonTypeError',
-    'pydantic.errors:ListError',
-    'pydantic.errors:ListMaxLengthError',
-    'pydantic.errors:ListMinLengthError',
-    'pydantic.errors:ListUniqueItemsError',
-    'pydantic.errors:LuhnValidationError',
-    'pydantic.errors:MissingDiscriminator',
-    'pydantic.errors:MissingError',
-    'pydantic.errors:NoneIsAllowedError',
-    'pydantic.errors:NoneIsNotAllowedError',
-    'pydantic.errors:NotDigitError',
-    'pydantic.errors:NotNoneError',
-    'pydantic.errors:NumberNotGeError',
-    'pydantic.errors:NumberNotGtError',
-    'pydantic.errors:NumberNotLeError',
-    'pydantic.errors:NumberNotLtError',
-    'pydantic.errors:NumberNotMultipleError',
-    'pydantic.errors:PathError',
-    'pydantic.errors:PathNotADirectoryError',
-    'pydantic.errors:PathNotAFileError',
-    'pydantic.errors:PathNotExistsError',
-    'pydantic.errors:PatternError',
-    'pydantic.errors:PyObjectError',
-    'pydantic.errors:PydanticTypeError',
-    'pydantic.errors:PydanticValueError',
-    'pydantic.errors:SequenceError',
-    'pydantic.errors:SetError',
-    'pydantic.errors:SetMaxLengthError',
-    'pydantic.errors:SetMinLengthError',
-    'pydantic.errors:StrError',
-    'pydantic.errors:StrRegexError',
-    'pydantic.errors:StrictBoolError',
-    'pydantic.errors:SubclassError',
-    'pydantic.errors:TimeError',
-    'pydantic.errors:TupleError',
-    'pydantic.errors:TupleLengthError',
-    'pydantic.errors:UUIDError',
-    'pydantic.errors:UUIDVersionError',
-    'pydantic.errors:UrlError',
-    'pydantic.errors:UrlExtraError',
-    'pydantic.errors:UrlHostError',
-    'pydantic.errors:UrlHostTldError',
-    'pydantic.errors:UrlPortError',
-    'pydantic.errors:UrlSchemeError',
-    'pydantic.errors:UrlSchemePermittedError',
-    'pydantic.errors:UrlUserInfoError',
-    'pydantic.errors:WrongConstantError',
-    'pydantic.main:validate_model',
-    'pydantic.networks:stricturl',
-    'pydantic:parse_file_as',
-    'pydantic:parse_raw_as',
-    'pydantic:stricturl',
-    'pydantic.tools:parse_file_as',
-    'pydantic.tools:parse_raw_as',
-    'pydantic.types:ConstrainedBytes',
-    'pydantic.types:ConstrainedDate',
-    'pydantic.types:ConstrainedDecimal',
-    'pydantic.types:ConstrainedFloat',
-    'pydantic.types:ConstrainedFrozenSet',
-    'pydantic.types:ConstrainedInt',
-    'pydantic.types:ConstrainedList',
-    'pydantic.types:ConstrainedSet',
-    'pydantic.types:ConstrainedStr',
-    'pydantic.types:JsonWrapper',
-    'pydantic.types:NoneBytes',
-    'pydantic.types:NoneStr',
-    'pydantic.types:NoneStrBytes',
-    'pydantic.types:StrBytes',
-    'pydantic.typing:evaluate_forwardref',
-    'pydantic.typing:AbstractSetIntStr',
-    'pydantic.typing:AnyCallable',
-    'pydantic.typing:AnyClassMethod',
-    'pydantic.typing:CallableGenerator',
-    'pydantic.typing:DictAny',
-    'pydantic.typing:DictIntStrAny',
-    'pydantic.typing:DictStrAny',
-    'pydantic.typing:IntStr',
-    'pydantic.typing:ListStr',
-    'pydantic.typing:MappingIntStrAny',
-    'pydantic.typing:NoArgAnyCallable',
-    'pydantic.typing:NoneType',
-    'pydantic.typing:ReprArgs',
-    'pydantic.typing:SetStr',
-    'pydantic.typing:StrPath',
-    'pydantic.typing:TupleGenerator',
-    'pydantic.typing:WithArgsTypes',
-    'pydantic.typing:all_literal_values',
-    'pydantic.typing:display_as_type',
-    'pydantic.typing:get_all_type_hints',
-    'pydantic.typing:get_args',
-    'pydantic.typing:get_origin',
-    'pydantic.typing:get_sub_types',
-    'pydantic.typing:is_callable_type',
-    'pydantic.typing:is_classvar',
-    'pydantic.typing:is_finalvar',
-    'pydantic.typing:is_literal_type',
-    'pydantic.typing:is_namedtuple',
-    'pydantic.typing:is_new_type',
-    'pydantic.typing:is_none_type',
-    'pydantic.typing:is_typeddict',
-    'pydantic.typing:is_typeddict_special',
-    'pydantic.typing:is_union',
-    'pydantic.typing:new_type_supertype',
-    'pydantic.typing:resolve_annotations',
-    'pydantic.typing:typing_base',
-    'pydantic.typing:update_field_forward_refs',
-    'pydantic.typing:update_model_forward_refs',
-    'pydantic.utils:ClassAttribute',
-    'pydantic.utils:DUNDER_ATTRIBUTES',
-    'pydantic.utils:PyObjectStr',
-    'pydantic.utils:ValueItems',
-    'pydantic.utils:almost_equal_floats',
-    'pydantic.utils:get_discriminator_alias_and_values',
-    'pydantic.utils:get_model',
-    'pydantic.utils:get_unique_discriminator_alias',
-    'pydantic.utils:in_ipython',
-    'pydantic.utils:is_valid_identifier',
-    'pydantic.utils:path_type',
-    'pydantic.utils:validate_field_name',
-    'pydantic:validate_model',
-}
-
-
-def getattr_migration(module: str) -> Callable[[str], Any]:
-    """Implement PEP 562 for objects that were either moved or removed on the migration
-    to V2.
-
-    Args:
-        module: The module name.
-
-    Returns:
-        A callable that will raise an error if the object is not found.
-    """
-    # This avoids circular import with errors.py.
-    from .errors import PydanticImportError
-
-    def wrapper(name: str) -> object:
-        """Raise an error if the object is not found, or warn if it was moved.
-
-        In case it was moved, it still returns the object.
-
-        Args:
-            name: The object name.
-
-        Returns:
-            The object.
-        """
-        if name == '__path__':
-            raise AttributeError(f'module {module!r} has no attribute {name!r}')
-
-        import warnings
-
-        from ._internal._validators import import_string
-
-        import_path = f'{module}:{name}'
-        if import_path in MOVED_IN_V2.keys():
-            new_location = MOVED_IN_V2[import_path]
-            warnings.warn(f'`{import_path}` has been moved to `{new_location}`.')
-            return import_string(MOVED_IN_V2[import_path])
-        if import_path in DEPRECATED_MOVED_IN_V2:
-            # skip the warning here because a deprecation warning will be raised elsewhere
-            return import_string(DEPRECATED_MOVED_IN_V2[import_path])
-        if import_path in REDIRECT_TO_V1:
-            new_location = REDIRECT_TO_V1[import_path]
-            warnings.warn(
-                f'`{import_path}` has been removed. We are importing from `{new_location}` instead.'
-                'See the migration guide for more details: https://docs.pydantic.dev/latest/migration/'
-            )
-            return import_string(REDIRECT_TO_V1[import_path])
-        if import_path == 'pydantic:BaseSettings':
-            raise PydanticImportError(
-                '`BaseSettings` has been moved to the `pydantic-settings` package. '
-                f'See https://docs.pydantic.dev/{version_short()}/migration/#basesettings-has-moved-to-pydantic-settings '
-                'for more details.'
-            )
-        if import_path in REMOVED_IN_V2:
-            raise PydanticImportError(f'`{import_path}` has been removed in V2.')
-        globals: Dict[str, Any] = sys.modules[module].__dict__
-        if name in globals:
-            return globals[name]
-        raise AttributeError(f'module {module!r} has no attribute {name!r}')
-
-    return wrapper
diff --git a/lib/pydantic/alias_generators.py b/lib/pydantic/alias_generators.py
deleted file mode 100644
index 155e66e0..00000000
--- a/lib/pydantic/alias_generators.py
+++ /dev/null
@@ -1,50 +0,0 @@
-"""Alias generators for converting between different capitalization conventions."""
-import re
-
-__all__ = ('to_pascal', 'to_camel', 'to_snake')
-
-
-def to_pascal(snake: str) -> str:
-    """Convert a snake_case string to PascalCase.
-
-    Args:
-        snake: The string to convert.
-
-    Returns:
-        The PascalCase string.
-    """
-    camel = snake.title()
-    return re.sub('([0-9A-Za-z])_(?=[0-9A-Z])', lambda m: m.group(1), camel)
-
-
-def to_camel(snake: str) -> str:
-    """Convert a snake_case string to camelCase.
-
-    Args:
-        snake: The string to convert.
-
-    Returns:
-        The converted camelCase string.
-    """
-    camel = to_pascal(snake)
-    return re.sub('(^_*[A-Z])', lambda m: m.group(1).lower(), camel)
-
-
-def to_snake(camel: str) -> str:
-    """Convert a PascalCase or camelCase string to snake_case.
-
-    Args:
-        camel: The string to convert.
-
-    Returns:
-        The converted string in snake_case.
-    """
-    # Handle the sequence of uppercase letters followed by a lowercase letter
-    snake = re.sub(r'([A-Z]+)([A-Z][a-z])', lambda m: f'{m.group(1)}_{m.group(2)}', camel)
-    # Insert an underscore between a lowercase letter and an uppercase letter
-    snake = re.sub(r'([a-z])([A-Z])', lambda m: f'{m.group(1)}_{m.group(2)}', snake)
-    # Insert an underscore between a digit and an uppercase letter
-    snake = re.sub(r'([0-9])([A-Z])', lambda m: f'{m.group(1)}_{m.group(2)}', snake)
-    # Insert an underscore between a lowercase letter and a digit
-    snake = re.sub(r'([a-z])([0-9])', lambda m: f'{m.group(1)}_{m.group(2)}', snake)
-    return snake.lower()
diff --git a/lib/pydantic/aliases.py b/lib/pydantic/aliases.py
deleted file mode 100644
index b53557b1..00000000
--- a/lib/pydantic/aliases.py
+++ /dev/null
@@ -1,112 +0,0 @@
-"""Support for alias configurations."""
-from __future__ import annotations
-
-import dataclasses
-from typing import Callable, Literal
-
-from ._internal import _internal_dataclass
-
-__all__ = ('AliasGenerator', 'AliasPath', 'AliasChoices')
-
-
-@dataclasses.dataclass(**_internal_dataclass.slots_true)
-class AliasPath:
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/alias#aliaspath-and-aliaschoices
-
-    A data class used by `validation_alias` as a convenience to create aliases.
-
-    Attributes:
-        path: A list of string or integer aliases.
-    """
-
-    path: list[int | str]
-
-    def __init__(self, first_arg: str, *args: str | int) -> None:
-        self.path = [first_arg] + list(args)
-
-    def convert_to_aliases(self) -> list[str | int]:
-        """Converts arguments to a list of string or integer aliases.
-
-        Returns:
-            The list of aliases.
-        """
-        return self.path
-
-
-@dataclasses.dataclass(**_internal_dataclass.slots_true)
-class AliasChoices:
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/alias#aliaspath-and-aliaschoices
-
-    A data class used by `validation_alias` as a convenience to create aliases.
-
-    Attributes:
-        choices: A list containing a string or `AliasPath`.
-    """
-
-    choices: list[str | AliasPath]
-
-    def __init__(self, first_choice: str | AliasPath, *choices: str | AliasPath) -> None:
-        self.choices = [first_choice] + list(choices)
-
-    def convert_to_aliases(self) -> list[list[str | int]]:
-        """Converts arguments to a list of lists containing string or integer aliases.
-
-        Returns:
-            The list of aliases.
-        """
-        aliases: list[list[str | int]] = []
-        for c in self.choices:
-            if isinstance(c, AliasPath):
-                aliases.append(c.convert_to_aliases())
-            else:
-                aliases.append([c])
-        return aliases
-
-
-@dataclasses.dataclass(**_internal_dataclass.slots_true)
-class AliasGenerator:
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/alias#using-an-aliasgenerator
-
-    A data class used by `alias_generator` as a convenience to create various aliases.
-
-    Attributes:
-        alias: A callable that takes a field name and returns an alias for it.
-        validation_alias: A callable that takes a field name and returns a validation alias for it.
-        serialization_alias: A callable that takes a field name and returns a serialization alias for it.
-    """
-
-    alias: Callable[[str], str] | None = None
-    validation_alias: Callable[[str], str | AliasPath | AliasChoices] | None = None
-    serialization_alias: Callable[[str], str] | None = None
-
-    def _generate_alias(
-        self,
-        alias_kind: Literal['alias', 'validation_alias', 'serialization_alias'],
-        allowed_types: tuple[type[str] | type[AliasPath] | type[AliasChoices], ...],
-        field_name: str,
-    ) -> str | AliasPath | AliasChoices | None:
-        """Generate an alias of the specified kind. Returns None if the alias generator is None.
-
-        Raises:
-            TypeError: If the alias generator produces an invalid type.
-        """
-        alias = None
-        if alias_generator := getattr(self, alias_kind):
-            alias = alias_generator(field_name)
-            if alias and not isinstance(alias, allowed_types):
-                raise TypeError(
-                    f'Invalid `{alias_kind}` type. `{alias_kind}` generator must produce one of `{allowed_types}`'
-                )
-        return alias
-
-    def generate_aliases(self, field_name: str) -> tuple[str | None, str | AliasPath | AliasChoices | None, str | None]:
-        """Generate `alias`, `validation_alias`, and `serialization_alias` for a field.
-
-        Returns:
-            A tuple of three aliases - validation, alias, and serialization.
-        """
-        alias = self._generate_alias('alias', (str,), field_name)
-        validation_alias = self._generate_alias('validation_alias', (str, AliasChoices, AliasPath), field_name)
-        serialization_alias = self._generate_alias('serialization_alias', (str,), field_name)
-
-        return alias, validation_alias, serialization_alias  # type: ignore
diff --git a/lib/pydantic/annotated_handlers.py b/lib/pydantic/annotated_handlers.py
deleted file mode 100644
index 081949a8..00000000
--- a/lib/pydantic/annotated_handlers.py
+++ /dev/null
@@ -1,120 +0,0 @@
-"""Type annotations to use with `__get_pydantic_core_schema__` and `__get_pydantic_json_schema__`."""
-from __future__ import annotations as _annotations
-
-from typing import TYPE_CHECKING, Any, Union
-
-from pydantic_core import core_schema
-
-if TYPE_CHECKING:
-    from .json_schema import JsonSchemaMode, JsonSchemaValue
-
-    CoreSchemaOrField = Union[
-        core_schema.CoreSchema,
-        core_schema.ModelField,
-        core_schema.DataclassField,
-        core_schema.TypedDictField,
-        core_schema.ComputedField,
-    ]
-
-__all__ = 'GetJsonSchemaHandler', 'GetCoreSchemaHandler'
-
-
-class GetJsonSchemaHandler:
-    """Handler to call into the next JSON schema generation function.
-
-    Attributes:
-        mode: Json schema mode, can be `validation` or `serialization`.
-    """
-
-    mode: JsonSchemaMode
-
-    def __call__(self, __core_schema: CoreSchemaOrField) -> JsonSchemaValue:
-        """Call the inner handler and get the JsonSchemaValue it returns.
-        This will call the next JSON schema modifying function up until it calls
-        into `pydantic.json_schema.GenerateJsonSchema`, which will raise a
-        `pydantic.errors.PydanticInvalidForJsonSchema` error if it cannot generate
-        a JSON schema.
-
-        Args:
-            __core_schema: A `pydantic_core.core_schema.CoreSchema`.
-
-        Returns:
-            JsonSchemaValue: The JSON schema generated by the inner JSON schema modify
-            functions.
-        """
-        raise NotImplementedError
-
-    def resolve_ref_schema(self, __maybe_ref_json_schema: JsonSchemaValue) -> JsonSchemaValue:
-        """Get the real schema for a `{"$ref": ...}` schema.
-        If the schema given is not a `$ref` schema, it will be returned as is.
-        This means you don't have to check before calling this function.
-
-        Args:
-            __maybe_ref_json_schema: A JsonSchemaValue which may be a `$ref` schema.
-
-        Raises:
-            LookupError: If the ref is not found.
-
-        Returns:
-            JsonSchemaValue: A JsonSchemaValue that has no `$ref`.
-        """
-        raise NotImplementedError
-
-
-class GetCoreSchemaHandler:
-    """Handler to call into the next CoreSchema schema generation function."""
-
-    def __call__(self, __source_type: Any) -> core_schema.CoreSchema:
-        """Call the inner handler and get the CoreSchema it returns.
-        This will call the next CoreSchema modifying function up until it calls
-        into Pydantic's internal schema generation machinery, which will raise a
-        `pydantic.errors.PydanticSchemaGenerationError` error if it cannot generate
-        a CoreSchema for the given source type.
-
-        Args:
-            __source_type: The input type.
-
-        Returns:
-            CoreSchema: The `pydantic-core` CoreSchema generated.
-        """
-        raise NotImplementedError
-
-    def generate_schema(self, __source_type: Any) -> core_schema.CoreSchema:
-        """Generate a schema unrelated to the current context.
-        Use this function if e.g. you are handling schema generation for a sequence
-        and want to generate a schema for its items.
-        Otherwise, you may end up doing something like applying a `min_length` constraint
-        that was intended for the sequence itself to its items!
-
-        Args:
-            __source_type: The input type.
-
-        Returns:
-            CoreSchema: The `pydantic-core` CoreSchema generated.
-        """
-        raise NotImplementedError
-
-    def resolve_ref_schema(self, __maybe_ref_schema: core_schema.CoreSchema) -> core_schema.CoreSchema:
-        """Get the real schema for a `definition-ref` schema.
-        If the schema given is not a `definition-ref` schema, it will be returned as is.
-        This means you don't have to check before calling this function.
-
-        Args:
-            __maybe_ref_schema: A `CoreSchema`, `ref`-based or not.
-
-        Raises:
-            LookupError: If the `ref` is not found.
-
-        Returns:
-            A concrete `CoreSchema`.
-        """
-        raise NotImplementedError
-
-    @property
-    def field_name(self) -> str | None:
-        """Get the name of the closest field to this validator."""
-        raise NotImplementedError
-
-    def _get_types_namespace(self) -> dict[str, Any] | None:
-        """Internal method used during type resolution for serializer annotations."""
-        raise NotImplementedError
diff --git a/lib/pydantic/class_validators.py b/lib/pydantic/class_validators.py
deleted file mode 100644
index 2ff72ae5..00000000
--- a/lib/pydantic/class_validators.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""`class_validators` module is a backport module from V1."""
-from ._migration import getattr_migration
-
-__getattr__ = getattr_migration(__name__)
diff --git a/lib/pydantic/color.py b/lib/pydantic/color.py
deleted file mode 100644
index 108bb8fa..00000000
--- a/lib/pydantic/color.py
+++ /dev/null
@@ -1,603 +0,0 @@
-"""Color definitions are used as per the CSS3
-[CSS Color Module Level 3](http://www.w3.org/TR/css3-color/#svg-color) specification.
-
-A few colors have multiple names referring to the sames colors, eg. `grey` and `gray` or `aqua` and `cyan`.
-
-In these cases the _last_ color when sorted alphabetically takes preferences,
-eg. `Color((0, 255, 255)).as_named() == 'cyan'` because "cyan" comes after "aqua".
-
-Warning: Deprecated
-    The `Color` class is deprecated, use `pydantic_extra_types` instead.
-    See [`pydantic-extra-types.Color`](../usage/types/extra_types/color_types.md)
-    for more information.
-"""
-import math
-import re
-from colorsys import hls_to_rgb, rgb_to_hls
-from typing import Any, Callable, Optional, Tuple, Type, Union, cast
-
-from pydantic_core import CoreSchema, PydanticCustomError, core_schema
-from typing_extensions import deprecated
-
-from ._internal import _repr
-from ._internal._schema_generation_shared import GetJsonSchemaHandler as _GetJsonSchemaHandler
-from .json_schema import JsonSchemaValue
-from .warnings import PydanticDeprecatedSince20
-
-ColorTuple = Union[Tuple[int, int, int], Tuple[int, int, int, float]]
-ColorType = Union[ColorTuple, str]
-HslColorTuple = Union[Tuple[float, float, float], Tuple[float, float, float, float]]
-
-
-class RGBA:
-    """Internal use only as a representation of a color."""
-
-    __slots__ = 'r', 'g', 'b', 'alpha', '_tuple'
-
-    def __init__(self, r: float, g: float, b: float, alpha: Optional[float]):
-        self.r = r
-        self.g = g
-        self.b = b
-        self.alpha = alpha
-
-        self._tuple: Tuple[float, float, float, Optional[float]] = (r, g, b, alpha)
-
-    def __getitem__(self, item: Any) -> Any:
-        return self._tuple[item]
-
-
-# these are not compiled here to avoid import slowdown, they'll be compiled the first time they're used, then cached
-_r_255 = r'(\d{1,3}(?:\.\d+)?)'
-_r_comma = r'\s*,\s*'
-_r_alpha = r'(\d(?:\.\d+)?|\.\d+|\d{1,2}%)'
-_r_h = r'(-?\d+(?:\.\d+)?|-?\.\d+)(deg|rad|turn)?'
-_r_sl = r'(\d{1,3}(?:\.\d+)?)%'
-r_hex_short = r'\s*(?:#|0x)?([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])?\s*'
-r_hex_long = r'\s*(?:#|0x)?([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})?\s*'
-# CSS3 RGB examples: rgb(0, 0, 0), rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 50%)
-r_rgb = rf'\s*rgba?\(\s*{_r_255}{_r_comma}{_r_255}{_r_comma}{_r_255}(?:{_r_comma}{_r_alpha})?\s*\)\s*'
-# CSS3 HSL examples: hsl(270, 60%, 50%), hsla(270, 60%, 50%, 0.5), hsla(270, 60%, 50%, 50%)
-r_hsl = rf'\s*hsla?\(\s*{_r_h}{_r_comma}{_r_sl}{_r_comma}{_r_sl}(?:{_r_comma}{_r_alpha})?\s*\)\s*'
-# CSS4 RGB examples: rgb(0 0 0), rgb(0 0 0 / 0.5), rgb(0 0 0 / 50%), rgba(0 0 0 / 50%)
-r_rgb_v4_style = rf'\s*rgba?\(\s*{_r_255}\s+{_r_255}\s+{_r_255}(?:\s*/\s*{_r_alpha})?\s*\)\s*'
-# CSS4 HSL examples: hsl(270 60% 50%), hsl(270 60% 50% / 0.5), hsl(270 60% 50% / 50%), hsla(270 60% 50% / 50%)
-r_hsl_v4_style = rf'\s*hsla?\(\s*{_r_h}\s+{_r_sl}\s+{_r_sl}(?:\s*/\s*{_r_alpha})?\s*\)\s*'
-
-# colors where the two hex characters are the same, if all colors match this the short version of hex colors can be used
-repeat_colors = {int(c * 2, 16) for c in '0123456789abcdef'}
-rads = 2 * math.pi
-
-
-@deprecated(
-    'The `Color` class is deprecated, use `pydantic_extra_types` instead. '
-    'See https://docs.pydantic.dev/latest/api/pydantic_extra_types_color/.',
-    category=PydanticDeprecatedSince20,
-)
-class Color(_repr.Representation):
-    """Represents a color."""
-
-    __slots__ = '_original', '_rgba'
-
-    def __init__(self, value: ColorType) -> None:
-        self._rgba: RGBA
-        self._original: ColorType
-        if isinstance(value, (tuple, list)):
-            self._rgba = parse_tuple(value)
-        elif isinstance(value, str):
-            self._rgba = parse_str(value)
-        elif isinstance(value, Color):
-            self._rgba = value._rgba
-            value = value._original
-        else:
-            raise PydanticCustomError(
-                'color_error', 'value is not a valid color: value must be a tuple, list or string'
-            )
-
-        # if we've got here value must be a valid color
-        self._original = value
-
-    @classmethod
-    def __get_pydantic_json_schema__(
-        cls, core_schema: core_schema.CoreSchema, handler: _GetJsonSchemaHandler
-    ) -> JsonSchemaValue:
-        field_schema = {}
-        field_schema.update(type='string', format='color')
-        return field_schema
-
-    def original(self) -> ColorType:
-        """Original value passed to `Color`."""
-        return self._original
-
-    def as_named(self, *, fallback: bool = False) -> str:
-        """Returns the name of the color if it can be found in `COLORS_BY_VALUE` dictionary,
-        otherwise returns the hexadecimal representation of the color or raises `ValueError`.
-
-        Args:
-            fallback: If True, falls back to returning the hexadecimal representation of
-                the color instead of raising a ValueError when no named color is found.
-
-        Returns:
-            The name of the color, or the hexadecimal representation of the color.
-
-        Raises:
-            ValueError: When no named color is found and fallback is `False`.
-        """
-        if self._rgba.alpha is None:
-            rgb = cast(Tuple[int, int, int], self.as_rgb_tuple())
-            try:
-                return COLORS_BY_VALUE[rgb]
-            except KeyError as e:
-                if fallback:
-                    return self.as_hex()
-                else:
-                    raise ValueError('no named color found, use fallback=True, as_hex() or as_rgb()') from e
-        else:
-            return self.as_hex()
-
-    def as_hex(self) -> str:
-        """Returns the hexadecimal representation of the color.
-
-        Hex string representing the color can be 3, 4, 6, or 8 characters depending on whether the string
-        a "short" representation of the color is possible and whether there's an alpha channel.
-
-        Returns:
-            The hexadecimal representation of the color.
-        """
-        values = [float_to_255(c) for c in self._rgba[:3]]
-        if self._rgba.alpha is not None:
-            values.append(float_to_255(self._rgba.alpha))
-
-        as_hex = ''.join(f'{v:02x}' for v in values)
-        if all(c in repeat_colors for c in values):
-            as_hex = ''.join(as_hex[c] for c in range(0, len(as_hex), 2))
-        return '#' + as_hex
-
-    def as_rgb(self) -> str:
-        """Color as an `rgb(<r>, <g>, <b>)` or `rgba(<r>, <g>, <b>, <a>)` string."""
-        if self._rgba.alpha is None:
-            return f'rgb({float_to_255(self._rgba.r)}, {float_to_255(self._rgba.g)}, {float_to_255(self._rgba.b)})'
-        else:
-            return (
-                f'rgba({float_to_255(self._rgba.r)}, {float_to_255(self._rgba.g)}, {float_to_255(self._rgba.b)}, '
-                f'{round(self._alpha_float(), 2)})'
-            )
-
-    def as_rgb_tuple(self, *, alpha: Optional[bool] = None) -> ColorTuple:
-        """Returns the color as an RGB or RGBA tuple.
-
-        Args:
-            alpha: Whether to include the alpha channel. There are three options for this input:
-
-                - `None` (default): Include alpha only if it's set. (e.g. not `None`)
-                - `True`: Always include alpha.
-                - `False`: Always omit alpha.
-
-        Returns:
-            A tuple that contains the values of the red, green, and blue channels in the range 0 to 255.
-                If alpha is included, it is in the range 0 to 1.
-        """
-        r, g, b = (float_to_255(c) for c in self._rgba[:3])
-        if alpha is None:
-            if self._rgba.alpha is None:
-                return r, g, b
-            else:
-                return r, g, b, self._alpha_float()
-        elif alpha:
-            return r, g, b, self._alpha_float()
-        else:
-            # alpha is False
-            return r, g, b
-
-    def as_hsl(self) -> str:
-        """Color as an `hsl(<h>, <s>, <l>)` or `hsl(<h>, <s>, <l>, <a>)` string."""
-        if self._rgba.alpha is None:
-            h, s, li = self.as_hsl_tuple(alpha=False)  # type: ignore
-            return f'hsl({h * 360:0.0f}, {s:0.0%}, {li:0.0%})'
-        else:
-            h, s, li, a = self.as_hsl_tuple(alpha=True)  # type: ignore
-            return f'hsl({h * 360:0.0f}, {s:0.0%}, {li:0.0%}, {round(a, 2)})'
-
-    def as_hsl_tuple(self, *, alpha: Optional[bool] = None) -> HslColorTuple:
-        """Returns the color as an HSL or HSLA tuple.
-
-        Args:
-            alpha: Whether to include the alpha channel.
-
-                - `None` (default): Include the alpha channel only if it's set (e.g. not `None`).
-                - `True`: Always include alpha.
-                - `False`: Always omit alpha.
-
-        Returns:
-            The color as a tuple of hue, saturation, lightness, and alpha (if included).
-                All elements are in the range 0 to 1.
-
-        Note:
-            This is HSL as used in HTML and most other places, not HLS as used in Python's `colorsys`.
-        """
-        h, l, s = rgb_to_hls(self._rgba.r, self._rgba.g, self._rgba.b)  # noqa: E741
-        if alpha is None:
-            if self._rgba.alpha is None:
-                return h, s, l
-            else:
-                return h, s, l, self._alpha_float()
-        if alpha:
-            return h, s, l, self._alpha_float()
-        else:
-            # alpha is False
-            return h, s, l
-
-    def _alpha_float(self) -> float:
-        return 1 if self._rgba.alpha is None else self._rgba.alpha
-
-    @classmethod
-    def __get_pydantic_core_schema__(
-        cls, source: Type[Any], handler: Callable[[Any], CoreSchema]
-    ) -> core_schema.CoreSchema:
-        return core_schema.with_info_plain_validator_function(
-            cls._validate, serialization=core_schema.to_string_ser_schema()
-        )
-
-    @classmethod
-    def _validate(cls, __input_value: Any, _: Any) -> 'Color':
-        return cls(__input_value)
-
-    def __str__(self) -> str:
-        return self.as_named(fallback=True)
-
-    def __repr_args__(self) -> '_repr.ReprArgs':
-        return [(None, self.as_named(fallback=True))] + [('rgb', self.as_rgb_tuple())]
-
-    def __eq__(self, other: Any) -> bool:
-        return isinstance(other, Color) and self.as_rgb_tuple() == other.as_rgb_tuple()
-
-    def __hash__(self) -> int:
-        return hash(self.as_rgb_tuple())
-
-
-def parse_tuple(value: Tuple[Any, ...]) -> RGBA:
-    """Parse a tuple or list to get RGBA values.
-
-    Args:
-        value: A tuple or list.
-
-    Returns:
-        An `RGBA` tuple parsed from the input tuple.
-
-    Raises:
-        PydanticCustomError: If tuple is not valid.
-    """
-    if len(value) == 3:
-        r, g, b = (parse_color_value(v) for v in value)
-        return RGBA(r, g, b, None)
-    elif len(value) == 4:
-        r, g, b = (parse_color_value(v) for v in value[:3])
-        return RGBA(r, g, b, parse_float_alpha(value[3]))
-    else:
-        raise PydanticCustomError('color_error', 'value is not a valid color: tuples must have length 3 or 4')
-
-
-def parse_str(value: str) -> RGBA:
-    """Parse a string representing a color to an RGBA tuple.
-
-    Possible formats for the input string include:
-
-    * named color, see `COLORS_BY_NAME`
-    * hex short eg. `<prefix>fff` (prefix can be `#`, `0x` or nothing)
-    * hex long eg. `<prefix>ffffff` (prefix can be `#`, `0x` or nothing)
-    * `rgb(<r>, <g>, <b>)`
-    * `rgba(<r>, <g>, <b>, <a>)`
-
-    Args:
-        value: A string representing a color.
-
-    Returns:
-        An `RGBA` tuple parsed from the input string.
-
-    Raises:
-        ValueError: If the input string cannot be parsed to an RGBA tuple.
-    """
-    value_lower = value.lower()
-    try:
-        r, g, b = COLORS_BY_NAME[value_lower]
-    except KeyError:
-        pass
-    else:
-        return ints_to_rgba(r, g, b, None)
-
-    m = re.fullmatch(r_hex_short, value_lower)
-    if m:
-        *rgb, a = m.groups()
-        r, g, b = (int(v * 2, 16) for v in rgb)
-        if a:
-            alpha: Optional[float] = int(a * 2, 16) / 255
-        else:
-            alpha = None
-        return ints_to_rgba(r, g, b, alpha)
-
-    m = re.fullmatch(r_hex_long, value_lower)
-    if m:
-        *rgb, a = m.groups()
-        r, g, b = (int(v, 16) for v in rgb)
-        if a:
-            alpha = int(a, 16) / 255
-        else:
-            alpha = None
-        return ints_to_rgba(r, g, b, alpha)
-
-    m = re.fullmatch(r_rgb, value_lower) or re.fullmatch(r_rgb_v4_style, value_lower)
-    if m:
-        return ints_to_rgba(*m.groups())  # type: ignore
-
-    m = re.fullmatch(r_hsl, value_lower) or re.fullmatch(r_hsl_v4_style, value_lower)
-    if m:
-        return parse_hsl(*m.groups())  # type: ignore
-
-    raise PydanticCustomError('color_error', 'value is not a valid color: string not recognised as a valid color')
-
-
-def ints_to_rgba(r: Union[int, str], g: Union[int, str], b: Union[int, str], alpha: Optional[float] = None) -> RGBA:
-    """Converts integer or string values for RGB color and an optional alpha value to an `RGBA` object.
-
-    Args:
-        r: An integer or string representing the red color value.
-        g: An integer or string representing the green color value.
-        b: An integer or string representing the blue color value.
-        alpha: A float representing the alpha value. Defaults to None.
-
-    Returns:
-        An instance of the `RGBA` class with the corresponding color and alpha values.
-    """
-    return RGBA(parse_color_value(r), parse_color_value(g), parse_color_value(b), parse_float_alpha(alpha))
-
-
-def parse_color_value(value: Union[int, str], max_val: int = 255) -> float:
-    """Parse the color value provided and return a number between 0 and 1.
-
-    Args:
-        value: An integer or string color value.
-        max_val: Maximum range value. Defaults to 255.
-
-    Raises:
-        PydanticCustomError: If the value is not a valid color.
-
-    Returns:
-        A number between 0 and 1.
-    """
-    try:
-        color = float(value)
-    except ValueError:
-        raise PydanticCustomError('color_error', 'value is not a valid color: color values must be a valid number')
-    if 0 <= color <= max_val:
-        return color / max_val
-    else:
-        raise PydanticCustomError(
-            'color_error',
-            'value is not a valid color: color values must be in the range 0 to {max_val}',
-            {'max_val': max_val},
-        )
-
-
-def parse_float_alpha(value: Union[None, str, float, int]) -> Optional[float]:
-    """Parse an alpha value checking it's a valid float in the range 0 to 1.
-
-    Args:
-        value: The input value to parse.
-
-    Returns:
-        The parsed value as a float, or `None` if the value was None or equal 1.
-
-    Raises:
-        PydanticCustomError: If the input value cannot be successfully parsed as a float in the expected range.
-    """
-    if value is None:
-        return None
-    try:
-        if isinstance(value, str) and value.endswith('%'):
-            alpha = float(value[:-1]) / 100
-        else:
-            alpha = float(value)
-    except ValueError:
-        raise PydanticCustomError('color_error', 'value is not a valid color: alpha values must be a valid float')
-
-    if math.isclose(alpha, 1):
-        return None
-    elif 0 <= alpha <= 1:
-        return alpha
-    else:
-        raise PydanticCustomError('color_error', 'value is not a valid color: alpha values must be in the range 0 to 1')
-
-
-def parse_hsl(h: str, h_units: str, sat: str, light: str, alpha: Optional[float] = None) -> RGBA:
-    """Parse raw hue, saturation, lightness, and alpha values and convert to RGBA.
-
-    Args:
-        h: The hue value.
-        h_units: The unit for hue value.
-        sat: The saturation value.
-        light: The lightness value.
-        alpha: Alpha value.
-
-    Returns:
-        An instance of `RGBA`.
-    """
-    s_value, l_value = parse_color_value(sat, 100), parse_color_value(light, 100)
-
-    h_value = float(h)
-    if h_units in {None, 'deg'}:
-        h_value = h_value % 360 / 360
-    elif h_units == 'rad':
-        h_value = h_value % rads / rads
-    else:
-        # turns
-        h_value = h_value % 1
-
-    r, g, b = hls_to_rgb(h_value, l_value, s_value)
-    return RGBA(r, g, b, parse_float_alpha(alpha))
-
-
-def float_to_255(c: float) -> int:
-    """Converts a float value between 0 and 1 (inclusive) to an integer between 0 and 255 (inclusive).
-
-    Args:
-        c: The float value to be converted. Must be between 0 and 1 (inclusive).
-
-    Returns:
-        The integer equivalent of the given float value rounded to the nearest whole number.
-
-    Raises:
-        ValueError: If the given float value is outside the acceptable range of 0 to 1 (inclusive).
-    """
-    return int(round(c * 255))
-
-
-COLORS_BY_NAME = {
-    'aliceblue': (240, 248, 255),
-    'antiquewhite': (250, 235, 215),
-    'aqua': (0, 255, 255),
-    'aquamarine': (127, 255, 212),
-    'azure': (240, 255, 255),
-    'beige': (245, 245, 220),
-    'bisque': (255, 228, 196),
-    'black': (0, 0, 0),
-    'blanchedalmond': (255, 235, 205),
-    'blue': (0, 0, 255),
-    'blueviolet': (138, 43, 226),
-    'brown': (165, 42, 42),
-    'burlywood': (222, 184, 135),
-    'cadetblue': (95, 158, 160),
-    'chartreuse': (127, 255, 0),
-    'chocolate': (210, 105, 30),
-    'coral': (255, 127, 80),
-    'cornflowerblue': (100, 149, 237),
-    'cornsilk': (255, 248, 220),
-    'crimson': (220, 20, 60),
-    'cyan': (0, 255, 255),
-    'darkblue': (0, 0, 139),
-    'darkcyan': (0, 139, 139),
-    'darkgoldenrod': (184, 134, 11),
-    'darkgray': (169, 169, 169),
-    'darkgreen': (0, 100, 0),
-    'darkgrey': (169, 169, 169),
-    'darkkhaki': (189, 183, 107),
-    'darkmagenta': (139, 0, 139),
-    'darkolivegreen': (85, 107, 47),
-    'darkorange': (255, 140, 0),
-    'darkorchid': (153, 50, 204),
-    'darkred': (139, 0, 0),
-    'darksalmon': (233, 150, 122),
-    'darkseagreen': (143, 188, 143),
-    'darkslateblue': (72, 61, 139),
-    'darkslategray': (47, 79, 79),
-    'darkslategrey': (47, 79, 79),
-    'darkturquoise': (0, 206, 209),
-    'darkviolet': (148, 0, 211),
-    'deeppink': (255, 20, 147),
-    'deepskyblue': (0, 191, 255),
-    'dimgray': (105, 105, 105),
-    'dimgrey': (105, 105, 105),
-    'dodgerblue': (30, 144, 255),
-    'firebrick': (178, 34, 34),
-    'floralwhite': (255, 250, 240),
-    'forestgreen': (34, 139, 34),
-    'fuchsia': (255, 0, 255),
-    'gainsboro': (220, 220, 220),
-    'ghostwhite': (248, 248, 255),
-    'gold': (255, 215, 0),
-    'goldenrod': (218, 165, 32),
-    'gray': (128, 128, 128),
-    'green': (0, 128, 0),
-    'greenyellow': (173, 255, 47),
-    'grey': (128, 128, 128),
-    'honeydew': (240, 255, 240),
-    'hotpink': (255, 105, 180),
-    'indianred': (205, 92, 92),
-    'indigo': (75, 0, 130),
-    'ivory': (255, 255, 240),
-    'khaki': (240, 230, 140),
-    'lavender': (230, 230, 250),
-    'lavenderblush': (255, 240, 245),
-    'lawngreen': (124, 252, 0),
-    'lemonchiffon': (255, 250, 205),
-    'lightblue': (173, 216, 230),
-    'lightcoral': (240, 128, 128),
-    'lightcyan': (224, 255, 255),
-    'lightgoldenrodyellow': (250, 250, 210),
-    'lightgray': (211, 211, 211),
-    'lightgreen': (144, 238, 144),
-    'lightgrey': (211, 211, 211),
-    'lightpink': (255, 182, 193),
-    'lightsalmon': (255, 160, 122),
-    'lightseagreen': (32, 178, 170),
-    'lightskyblue': (135, 206, 250),
-    'lightslategray': (119, 136, 153),
-    'lightslategrey': (119, 136, 153),
-    'lightsteelblue': (176, 196, 222),
-    'lightyellow': (255, 255, 224),
-    'lime': (0, 255, 0),
-    'limegreen': (50, 205, 50),
-    'linen': (250, 240, 230),
-    'magenta': (255, 0, 255),
-    'maroon': (128, 0, 0),
-    'mediumaquamarine': (102, 205, 170),
-    'mediumblue': (0, 0, 205),
-    'mediumorchid': (186, 85, 211),
-    'mediumpurple': (147, 112, 219),
-    'mediumseagreen': (60, 179, 113),
-    'mediumslateblue': (123, 104, 238),
-    'mediumspringgreen': (0, 250, 154),
-    'mediumturquoise': (72, 209, 204),
-    'mediumvioletred': (199, 21, 133),
-    'midnightblue': (25, 25, 112),
-    'mintcream': (245, 255, 250),
-    'mistyrose': (255, 228, 225),
-    'moccasin': (255, 228, 181),
-    'navajowhite': (255, 222, 173),
-    'navy': (0, 0, 128),
-    'oldlace': (253, 245, 230),
-    'olive': (128, 128, 0),
-    'olivedrab': (107, 142, 35),
-    'orange': (255, 165, 0),
-    'orangered': (255, 69, 0),
-    'orchid': (218, 112, 214),
-    'palegoldenrod': (238, 232, 170),
-    'palegreen': (152, 251, 152),
-    'paleturquoise': (175, 238, 238),
-    'palevioletred': (219, 112, 147),
-    'papayawhip': (255, 239, 213),
-    'peachpuff': (255, 218, 185),
-    'peru': (205, 133, 63),
-    'pink': (255, 192, 203),
-    'plum': (221, 160, 221),
-    'powderblue': (176, 224, 230),
-    'purple': (128, 0, 128),
-    'red': (255, 0, 0),
-    'rosybrown': (188, 143, 143),
-    'royalblue': (65, 105, 225),
-    'saddlebrown': (139, 69, 19),
-    'salmon': (250, 128, 114),
-    'sandybrown': (244, 164, 96),
-    'seagreen': (46, 139, 87),
-    'seashell': (255, 245, 238),
-    'sienna': (160, 82, 45),
-    'silver': (192, 192, 192),
-    'skyblue': (135, 206, 235),
-    'slateblue': (106, 90, 205),
-    'slategray': (112, 128, 144),
-    'slategrey': (112, 128, 144),
-    'snow': (255, 250, 250),
-    'springgreen': (0, 255, 127),
-    'steelblue': (70, 130, 180),
-    'tan': (210, 180, 140),
-    'teal': (0, 128, 128),
-    'thistle': (216, 191, 216),
-    'tomato': (255, 99, 71),
-    'turquoise': (64, 224, 208),
-    'violet': (238, 130, 238),
-    'wheat': (245, 222, 179),
-    'white': (255, 255, 255),
-    'whitesmoke': (245, 245, 245),
-    'yellow': (255, 255, 0),
-    'yellowgreen': (154, 205, 50),
-}
-
-COLORS_BY_VALUE = {v: k for k, v in COLORS_BY_NAME.items()}
diff --git a/lib/pydantic/config.py b/lib/pydantic/config.py
deleted file mode 100644
index 6b22586b..00000000
--- a/lib/pydantic/config.py
+++ /dev/null
@@ -1,912 +0,0 @@
-"""Configuration for Pydantic models."""
-from __future__ import annotations as _annotations
-
-from typing import TYPE_CHECKING, Any, Callable, Dict, List, Type, Union
-
-from typing_extensions import Literal, TypeAlias, TypedDict
-
-from ._migration import getattr_migration
-from .aliases import AliasGenerator
-
-if TYPE_CHECKING:
-    from ._internal._generate_schema import GenerateSchema as _GenerateSchema
-
-__all__ = ('ConfigDict',)
-
-
-JsonValue: TypeAlias = Union[int, float, str, bool, None, List['JsonValue'], 'JsonDict']
-JsonDict: TypeAlias = Dict[str, JsonValue]
-
-JsonEncoder = Callable[[Any], Any]
-
-JsonSchemaExtraCallable: TypeAlias = Union[
-    Callable[[JsonDict], None],
-    Callable[[JsonDict, Type[Any]], None],
-]
-
-ExtraValues = Literal['allow', 'ignore', 'forbid']
-
-
-class ConfigDict(TypedDict, total=False):
-    """A TypedDict for configuring Pydantic behaviour."""
-
-    title: str | None
-    """The title for the generated JSON schema, defaults to the model's name"""
-
-    str_to_lower: bool
-    """Whether to convert all characters to lowercase for str types. Defaults to `False`."""
-
-    str_to_upper: bool
-    """Whether to convert all characters to uppercase for str types. Defaults to `False`."""
-    str_strip_whitespace: bool
-    """Whether to strip leading and trailing whitespace for str types."""
-
-    str_min_length: int
-    """The minimum length for str types. Defaults to `None`."""
-
-    str_max_length: int | None
-    """The maximum length for str types. Defaults to `None`."""
-
-    extra: ExtraValues | None
-    """
-    Whether to ignore, allow, or forbid extra attributes during model initialization. Defaults to `'ignore'`.
-
-    You can configure how pydantic handles the attributes that are not defined in the model:
-
-    * `allow` - Allow any extra attributes.
-    * `forbid` - Forbid any extra attributes.
-    * `ignore` - Ignore any extra attributes.
-
-    ```py
-    from pydantic import BaseModel, ConfigDict
-
-
-    class User(BaseModel):
-        model_config = ConfigDict(extra='ignore')  # (1)!
-
-        name: str
-
-
-    user = User(name='John Doe', age=20)  # (2)!
-    print(user)
-    #> name='John Doe'
-    ```
-
-    1. This is the default behaviour.
-    2. The `age` argument is ignored.
-
-    Instead, with `extra='allow'`, the `age` argument is included:
-
-    ```py
-    from pydantic import BaseModel, ConfigDict
-
-
-    class User(BaseModel):
-        model_config = ConfigDict(extra='allow')
-
-        name: str
-
-
-    user = User(name='John Doe', age=20)  # (1)!
-    print(user)
-    #> name='John Doe' age=20
-    ```
-
-    1. The `age` argument is included.
-
-    With `extra='forbid'`, an error is raised:
-
-    ```py
-    from pydantic import BaseModel, ConfigDict, ValidationError
-
-
-    class User(BaseModel):
-        model_config = ConfigDict(extra='forbid')
-
-        name: str
-
-
-    try:
-        User(name='John Doe', age=20)
-    except ValidationError as e:
-        print(e)
-        '''
-        1 validation error for User
-        age
-        Extra inputs are not permitted [type=extra_forbidden, input_value=20, input_type=int]
-        '''
-    ```
-    """
-
-    frozen: bool
-    """
-    Whether models are faux-immutable, i.e. whether `__setattr__` is allowed, and also generates
-    a `__hash__()` method for the model. This makes instances of the model potentially hashable if all the
-    attributes are hashable. Defaults to `False`.
-
-    Note:
-        On V1, the inverse of this setting was called `allow_mutation`, and was `True` by default.
-    """
-
-    populate_by_name: bool
-    """
-    Whether an aliased field may be populated by its name as given by the model
-    attribute, as well as the alias. Defaults to `False`.
-
-    Note:
-        The name of this configuration setting was changed in **v2.0** from
-        `allow_population_by_field_name` to `populate_by_name`.
-
-    ```py
-    from pydantic import BaseModel, ConfigDict, Field
-
-
-    class User(BaseModel):
-        model_config = ConfigDict(populate_by_name=True)
-
-        name: str = Field(alias='full_name')  # (1)!
-        age: int
-
-
-    user = User(full_name='John Doe', age=20)  # (2)!
-    print(user)
-    #> name='John Doe' age=20
-    user = User(name='John Doe', age=20)  # (3)!
-    print(user)
-    #> name='John Doe' age=20
-    ```
-
-    1. The field `'name'` has an alias `'full_name'`.
-    2. The model is populated by the alias `'full_name'`.
-    3. The model is populated by the field name `'name'`.
-    """
-
-    use_enum_values: bool
-    """
-    Whether to populate models with the `value` property of enums, rather than the raw enum.
-    This may be useful if you want to serialize `model.model_dump()` later. Defaults to `False`.
-
-    !!! note
-        If you have an `Optional[Enum]` value that you set a default for, you need to use `validate_default=True`
-        for said Field to ensure that the `use_enum_values` flag takes effect on the default, as extracting an
-        enum's value occurs during validation, not serialization.
-
-    ```py
-    from enum import Enum
-    from typing import Optional
-
-    from pydantic import BaseModel, ConfigDict, Field
-
-
-    class SomeEnum(Enum):
-        FOO = 'foo'
-        BAR = 'bar'
-        BAZ = 'baz'
-
-
-    class SomeModel(BaseModel):
-        model_config = ConfigDict(use_enum_values=True)
-
-        some_enum: SomeEnum
-        another_enum: Optional[SomeEnum] = Field(default=SomeEnum.FOO, validate_default=True)
-
-
-    model1 = SomeModel(some_enum=SomeEnum.BAR)
-    print(model1.model_dump())
-    # {'some_enum': 'bar', 'another_enum': 'foo'}
-
-    model2 = SomeModel(some_enum=SomeEnum.BAR, another_enum=SomeEnum.BAZ)
-    print(model2.model_dump())
-    #> {'some_enum': 'bar', 'another_enum': 'baz'}
-    ```
-    """
-
-    validate_assignment: bool
-    """
-    Whether to validate the data when the model is changed. Defaults to `False`.
-
-    The default behavior of Pydantic is to validate the data when the model is created.
-
-    In case the user changes the data after the model is created, the model is _not_ revalidated.
-
-    ```py
-    from pydantic import BaseModel
-
-    class User(BaseModel):
-        name: str
-
-    user = User(name='John Doe')  # (1)!
-    print(user)
-    #> name='John Doe'
-    user.name = 123  # (1)!
-    print(user)
-    #> name=123
-    ```
-
-    1. The validation happens only when the model is created.
-    2. The validation does not happen when the data is changed.
-
-    In case you want to revalidate the model when the data is changed, you can use `validate_assignment=True`:
-
-    ```py
-    from pydantic import BaseModel, ValidationError
-
-    class User(BaseModel, validate_assignment=True):  # (1)!
-        name: str
-
-    user = User(name='John Doe')  # (2)!
-    print(user)
-    #> name='John Doe'
-    try:
-        user.name = 123  # (3)!
-    except ValidationError as e:
-        print(e)
-        '''
-        1 validation error for User
-        name
-          Input should be a valid string [type=string_type, input_value=123, input_type=int]
-        '''
-    ```
-
-    1. You can either use class keyword arguments, or `model_config` to set `validate_assignment=True`.
-    2. The validation happens when the model is created.
-    3. The validation _also_ happens when the data is changed.
-    """
-
-    arbitrary_types_allowed: bool
-    """
-    Whether arbitrary types are allowed for field types. Defaults to `False`.
-
-    ```py
-    from pydantic import BaseModel, ConfigDict, ValidationError
-
-    # This is not a pydantic model, it's an arbitrary class
-    class Pet:
-        def __init__(self, name: str):
-            self.name = name
-
-    class Model(BaseModel):
-        model_config = ConfigDict(arbitrary_types_allowed=True)
-
-        pet: Pet
-        owner: str
-
-    pet = Pet(name='Hedwig')
-    # A simple check of instance type is used to validate the data
-    model = Model(owner='Harry', pet=pet)
-    print(model)
-    #> pet=<__main__.Pet object at 0x0123456789ab> owner='Harry'
-    print(model.pet)
-    #> <__main__.Pet object at 0x0123456789ab>
-    print(model.pet.name)
-    #> Hedwig
-    print(type(model.pet))
-    #> <class '__main__.Pet'>
-    try:
-        # If the value is not an instance of the type, it's invalid
-        Model(owner='Harry', pet='Hedwig')
-    except ValidationError as e:
-        print(e)
-        '''
-        1 validation error for Model
-        pet
-          Input should be an instance of Pet [type=is_instance_of, input_value='Hedwig', input_type=str]
-        '''
-
-    # Nothing in the instance of the arbitrary type is checked
-    # Here name probably should have been a str, but it's not validated
-    pet2 = Pet(name=42)
-    model2 = Model(owner='Harry', pet=pet2)
-    print(model2)
-    #> pet=<__main__.Pet object at 0x0123456789ab> owner='Harry'
-    print(model2.pet)
-    #> <__main__.Pet object at 0x0123456789ab>
-    print(model2.pet.name)
-    #> 42
-    print(type(model2.pet))
-    #> <class '__main__.Pet'>
-    ```
-    """
-
-    from_attributes: bool
-    """
-    Whether to build models and look up discriminators of tagged unions using python object attributes.
-    """
-
-    loc_by_alias: bool
-    """Whether to use the actual key provided in the data (e.g. alias) for error `loc`s rather than the field's name. Defaults to `True`."""
-
-    alias_generator: Callable[[str], str] | AliasGenerator | None
-    """
-    A callable that takes a field name and returns an alias for it
-    or an instance of [`AliasGenerator`][pydantic.aliases.AliasGenerator]. Defaults to `None`.
-
-    When using a callable, the alias generator is used for both validation and serialization.
-    If you want to use different alias generators for validation and serialization, you can use
-    [`AliasGenerator`][pydantic.aliases.AliasGenerator] instead.
-
-    If data source field names do not match your code style (e. g. CamelCase fields),
-    you can automatically generate aliases using `alias_generator`. Here's an example with
-    a basic callable:
-
-    ```py
-    from pydantic import BaseModel, ConfigDict
-    from pydantic.alias_generators import to_pascal
-
-    class Voice(BaseModel):
-        model_config = ConfigDict(alias_generator=to_pascal)
-
-        name: str
-        language_code: str
-
-    voice = Voice(Name='Filiz', LanguageCode='tr-TR')
-    print(voice.language_code)
-    #> tr-TR
-    print(voice.model_dump(by_alias=True))
-    #> {'Name': 'Filiz', 'LanguageCode': 'tr-TR'}
-    ```
-
-    If you want to use different alias generators for validation and serialization, you can use
-    [`AliasGenerator`][pydantic.aliases.AliasGenerator].
-
-    ```py
-    from pydantic import AliasGenerator, BaseModel, ConfigDict
-    from pydantic.alias_generators import to_camel, to_pascal
-
-    class Athlete(BaseModel):
-        first_name: str
-        last_name: str
-        sport: str
-
-        model_config = ConfigDict(
-            alias_generator=AliasGenerator(
-                validation_alias=to_camel,
-                serialization_alias=to_pascal,
-            )
-        )
-
-    athlete = Athlete(firstName='John', lastName='Doe', sport='track')
-    print(athlete.model_dump(by_alias=True))
-    #> {'FirstName': 'John', 'LastName': 'Doe', 'Sport': 'track'}
-    ```
-
-    Note:
-        Pydantic offers three built-in alias generators: [`to_pascal`][pydantic.alias_generators.to_pascal],
-        [`to_camel`][pydantic.alias_generators.to_camel], and [`to_snake`][pydantic.alias_generators.to_snake].
-    """
-
-    ignored_types: tuple[type, ...]
-    """A tuple of types that may occur as values of class attributes without annotations. This is
-    typically used for custom descriptors (classes that behave like `property`). If an attribute is set on a
-    class without an annotation and has a type that is not in this tuple (or otherwise recognized by
-    _pydantic_), an error will be raised. Defaults to `()`.
-    """
-
-    allow_inf_nan: bool
-    """Whether to allow infinity (`+inf` an `-inf`) and NaN values to float fields. Defaults to `True`."""
-
-    json_schema_extra: JsonDict | JsonSchemaExtraCallable | None
-    """A dict or callable to provide extra JSON schema properties. Defaults to `None`."""
-
-    json_encoders: dict[type[object], JsonEncoder] | None
-    """
-    A `dict` of custom JSON encoders for specific types. Defaults to `None`.
-
-    !!! warning "Deprecated"
-        This config option is a carryover from v1.
-        We originally planned to remove it in v2 but didn't have a 1:1 replacement so we are keeping it for now.
-        It is still deprecated and will likely be removed in the future.
-    """
-
-    # new in V2
-    strict: bool
-    """
-    _(new in V2)_ If `True`, strict validation is applied to all fields on the model.
-
-    By default, Pydantic attempts to coerce values to the correct type, when possible.
-
-    There are situations in which you may want to disable this behavior, and instead raise an error if a value's type
-    does not match the field's type annotation.
-
-    To configure strict mode for all fields on a model, you can set `strict=True` on the model.
-
-    ```py
-    from pydantic import BaseModel, ConfigDict
-
-    class Model(BaseModel):
-        model_config = ConfigDict(strict=True)
-
-        name: str
-        age: int
-    ```
-
-    See [Strict Mode](../concepts/strict_mode.md) for more details.
-
-    See the [Conversion Table](../concepts/conversion_table.md) for more details on how Pydantic converts data in both
-    strict and lax modes.
-    """
-    # whether instances of models and dataclasses (including subclass instances) should re-validate, default 'never'
-    revalidate_instances: Literal['always', 'never', 'subclass-instances']
-    """
-    When and how to revalidate models and dataclasses during validation. Accepts the string
-    values of `'never'`, `'always'` and `'subclass-instances'`. Defaults to `'never'`.
-
-    - `'never'` will not revalidate models and dataclasses during validation
-    - `'always'` will revalidate models and dataclasses during validation
-    - `'subclass-instances'` will revalidate models and dataclasses during validation if the instance is a
-        subclass of the model or dataclass
-
-    By default, model and dataclass instances are not revalidated during validation.
-
-    ```py
-    from typing import List
-
-    from pydantic import BaseModel
-
-    class User(BaseModel, revalidate_instances='never'):  # (1)!
-        hobbies: List[str]
-
-    class SubUser(User):
-        sins: List[str]
-
-    class Transaction(BaseModel):
-        user: User
-
-    my_user = User(hobbies=['reading'])
-    t = Transaction(user=my_user)
-    print(t)
-    #> user=User(hobbies=['reading'])
-
-    my_user.hobbies = [1]  # (2)!
-    t = Transaction(user=my_user)  # (3)!
-    print(t)
-    #> user=User(hobbies=[1])
-
-    my_sub_user = SubUser(hobbies=['scuba diving'], sins=['lying'])
-    t = Transaction(user=my_sub_user)
-    print(t)
-    #> user=SubUser(hobbies=['scuba diving'], sins=['lying'])
-    ```
-
-    1. `revalidate_instances` is set to `'never'` by **default.
-    2. The assignment is not validated, unless you set `validate_assignment` to `True` in the model's config.
-    3. Since `revalidate_instances` is set to `never`, this is not revalidated.
-
-    If you want to revalidate instances during validation, you can set `revalidate_instances` to `'always'`
-    in the model's config.
-
-    ```py
-    from typing import List
-
-    from pydantic import BaseModel, ValidationError
-
-    class User(BaseModel, revalidate_instances='always'):  # (1)!
-        hobbies: List[str]
-
-    class SubUser(User):
-        sins: List[str]
-
-    class Transaction(BaseModel):
-        user: User
-
-    my_user = User(hobbies=['reading'])
-    t = Transaction(user=my_user)
-    print(t)
-    #> user=User(hobbies=['reading'])
-
-    my_user.hobbies = [1]
-    try:
-        t = Transaction(user=my_user)  # (2)!
-    except ValidationError as e:
-        print(e)
-        '''
-        1 validation error for Transaction
-        user.hobbies.0
-          Input should be a valid string [type=string_type, input_value=1, input_type=int]
-        '''
-
-    my_sub_user = SubUser(hobbies=['scuba diving'], sins=['lying'])
-    t = Transaction(user=my_sub_user)
-    print(t)  # (3)!
-    #> user=User(hobbies=['scuba diving'])
-    ```
-
-    1. `revalidate_instances` is set to `'always'`.
-    2. The model is revalidated, since `revalidate_instances` is set to `'always'`.
-    3. Using `'never'` we would have gotten `user=SubUser(hobbies=['scuba diving'], sins=['lying'])`.
-
-    It's also possible to set `revalidate_instances` to `'subclass-instances'` to only revalidate instances
-    of subclasses of the model.
-
-    ```py
-    from typing import List
-
-    from pydantic import BaseModel
-
-    class User(BaseModel, revalidate_instances='subclass-instances'):  # (1)!
-        hobbies: List[str]
-
-    class SubUser(User):
-        sins: List[str]
-
-    class Transaction(BaseModel):
-        user: User
-
-    my_user = User(hobbies=['reading'])
-    t = Transaction(user=my_user)
-    print(t)
-    #> user=User(hobbies=['reading'])
-
-    my_user.hobbies = [1]
-    t = Transaction(user=my_user)  # (2)!
-    print(t)
-    #> user=User(hobbies=[1])
-
-    my_sub_user = SubUser(hobbies=['scuba diving'], sins=['lying'])
-    t = Transaction(user=my_sub_user)
-    print(t)  # (3)!
-    #> user=User(hobbies=['scuba diving'])
-    ```
-
-    1. `revalidate_instances` is set to `'subclass-instances'`.
-    2. This is not revalidated, since `my_user` is not a subclass of `User`.
-    3. Using `'never'` we would have gotten `user=SubUser(hobbies=['scuba diving'], sins=['lying'])`.
-    """
-
-    ser_json_timedelta: Literal['iso8601', 'float']
-    """
-    The format of JSON serialized timedeltas. Accepts the string values of `'iso8601'` and
-    `'float'`. Defaults to `'iso8601'`.
-
-    - `'iso8601'` will serialize timedeltas to ISO 8601 durations.
-    - `'float'` will serialize timedeltas to the total number of seconds.
-    """
-
-    ser_json_bytes: Literal['utf8', 'base64']
-    """
-    The encoding of JSON serialized bytes. Accepts the string values of `'utf8'` and `'base64'`.
-    Defaults to `'utf8'`.
-
-    - `'utf8'` will serialize bytes to UTF-8 strings.
-    - `'base64'` will serialize bytes to URL safe base64 strings.
-    """
-
-    ser_json_inf_nan: Literal['null', 'constants']
-    """
-    The encoding of JSON serialized infinity and NaN float values. Accepts the string values of `'null'` and `'constants'`.
-    Defaults to `'null'`.
-
-    - `'null'` will serialize infinity and NaN values as `null`.
-    - `'constants'` will serialize infinity and NaN values as `Infinity` and `NaN`.
-    """
-
-    # whether to validate default values during validation, default False
-    validate_default: bool
-    """Whether to validate default values during validation. Defaults to `False`."""
-
-    validate_return: bool
-    """whether to validate the return value from call validators. Defaults to `False`."""
-
-    protected_namespaces: tuple[str, ...]
-    """
-    A `tuple` of strings that prevent model to have field which conflict with them.
-    Defaults to `('model_', )`).
-
-    Pydantic prevents collisions between model attributes and `BaseModel`'s own methods by
-    namespacing them with the prefix `model_`.
-
-    ```py
-    import warnings
-
-    from pydantic import BaseModel
-
-    warnings.filterwarnings('error')  # Raise warnings as errors
-
-    try:
-
-        class Model(BaseModel):
-            model_prefixed_field: str
-
-    except UserWarning as e:
-        print(e)
-        '''
-        Field "model_prefixed_field" has conflict with protected namespace "model_".
-
-        You may be able to resolve this warning by setting `model_config['protected_namespaces'] = ()`.
-        '''
-    ```
-
-    You can customize this behavior using the `protected_namespaces` setting:
-
-    ```py
-    import warnings
-
-    from pydantic import BaseModel, ConfigDict
-
-    warnings.filterwarnings('error')  # Raise warnings as errors
-
-    try:
-
-        class Model(BaseModel):
-            model_prefixed_field: str
-            also_protect_field: str
-
-            model_config = ConfigDict(
-                protected_namespaces=('protect_me_', 'also_protect_')
-            )
-
-    except UserWarning as e:
-        print(e)
-        '''
-        Field "also_protect_field" has conflict with protected namespace "also_protect_".
-
-        You may be able to resolve this warning by setting `model_config['protected_namespaces'] = ('protect_me_',)`.
-        '''
-    ```
-
-    While Pydantic will only emit a warning when an item is in a protected namespace but does not actually have a collision,
-    an error _is_ raised if there is an actual collision with an existing attribute:
-
-    ```py
-    from pydantic import BaseModel
-
-    try:
-
-        class Model(BaseModel):
-            model_validate: str
-
-    except NameError as e:
-        print(e)
-        '''
-        Field "model_validate" conflicts with member <bound method BaseModel.model_validate of <class 'pydantic.main.BaseModel'>> of protected namespace "model_".
-        '''
-    ```
-    """
-
-    hide_input_in_errors: bool
-    """
-    Whether to hide inputs when printing errors. Defaults to `False`.
-
-    Pydantic shows the input value and type when it raises `ValidationError` during the validation.
-
-    ```py
-    from pydantic import BaseModel, ValidationError
-
-    class Model(BaseModel):
-        a: str
-
-    try:
-        Model(a=123)
-    except ValidationError as e:
-        print(e)
-        '''
-        1 validation error for Model
-        a
-          Input should be a valid string [type=string_type, input_value=123, input_type=int]
-        '''
-    ```
-
-    You can hide the input value and type by setting the `hide_input_in_errors` config to `True`.
-
-    ```py
-    from pydantic import BaseModel, ConfigDict, ValidationError
-
-    class Model(BaseModel):
-        a: str
-        model_config = ConfigDict(hide_input_in_errors=True)
-
-    try:
-        Model(a=123)
-    except ValidationError as e:
-        print(e)
-        '''
-        1 validation error for Model
-        a
-          Input should be a valid string [type=string_type]
-        '''
-    ```
-    """
-
-    defer_build: bool
-    """
-    Whether to defer model validator and serializer construction until the first model validation.
-
-    This can be useful to avoid the overhead of building models which are only
-    used nested within other models, or when you want to manually define type namespace via
-    [`Model.model_rebuild(_types_namespace=...)`][pydantic.BaseModel.model_rebuild]. Defaults to False.
-    """
-
-    plugin_settings: dict[str, object] | None
-    """A `dict` of settings for plugins. Defaults to `None`.
-
-    See [Pydantic Plugins](../concepts/plugins.md) for details.
-    """
-
-    schema_generator: type[_GenerateSchema] | None
-    """
-    A custom core schema generator class to use when generating JSON schemas.
-    Useful if you want to change the way types are validated across an entire model/schema. Defaults to `None`.
-
-    The `GenerateSchema` interface is subject to change, currently only the `string_schema` method is public.
-
-    See [#6737](https://github.com/pydantic/pydantic/pull/6737) for details.
-    """
-
-    json_schema_serialization_defaults_required: bool
-    """
-    Whether fields with default values should be marked as required in the serialization schema. Defaults to `False`.
-
-    This ensures that the serialization schema will reflect the fact a field with a default will always be present
-    when serializing the model, even though it is not required for validation.
-
-    However, there are scenarios where this may be undesirable — in particular, if you want to share the schema
-    between validation and serialization, and don't mind fields with defaults being marked as not required during
-    serialization. See [#7209](https://github.com/pydantic/pydantic/issues/7209) for more details.
-
-    ```py
-    from pydantic import BaseModel, ConfigDict
-
-    class Model(BaseModel):
-        a: str = 'a'
-
-        model_config = ConfigDict(json_schema_serialization_defaults_required=True)
-
-    print(Model.model_json_schema(mode='validation'))
-    '''
-    {
-        'properties': {'a': {'default': 'a', 'title': 'A', 'type': 'string'}},
-        'title': 'Model',
-        'type': 'object',
-    }
-    '''
-    print(Model.model_json_schema(mode='serialization'))
-    '''
-    {
-        'properties': {'a': {'default': 'a', 'title': 'A', 'type': 'string'}},
-        'required': ['a'],
-        'title': 'Model',
-        'type': 'object',
-    }
-    '''
-    ```
-    """
-
-    json_schema_mode_override: Literal['validation', 'serialization', None]
-    """
-    If not `None`, the specified mode will be used to generate the JSON schema regardless of what `mode` was passed to
-    the function call. Defaults to `None`.
-
-    This provides a way to force the JSON schema generation to reflect a specific mode, e.g., to always use the
-    validation schema.
-
-    It can be useful when using frameworks (such as FastAPI) that may generate different schemas for validation
-    and serialization that must both be referenced from the same schema; when this happens, we automatically append
-    `-Input` to the definition reference for the validation schema and `-Output` to the definition reference for the
-    serialization schema. By specifying a `json_schema_mode_override` though, this prevents the conflict between
-    the validation and serialization schemas (since both will use the specified schema), and so prevents the suffixes
-    from being added to the definition references.
-
-    ```py
-    from pydantic import BaseModel, ConfigDict, Json
-
-    class Model(BaseModel):
-        a: Json[int]  # requires a string to validate, but will dump an int
-
-    print(Model.model_json_schema(mode='serialization'))
-    '''
-    {
-        'properties': {'a': {'title': 'A', 'type': 'integer'}},
-        'required': ['a'],
-        'title': 'Model',
-        'type': 'object',
-    }
-    '''
-
-    class ForceInputModel(Model):
-        # the following ensures that even with mode='serialization', we
-        # will get the schema that would be generated for validation.
-        model_config = ConfigDict(json_schema_mode_override='validation')
-
-    print(ForceInputModel.model_json_schema(mode='serialization'))
-    '''
-    {
-        'properties': {
-            'a': {
-                'contentMediaType': 'application/json',
-                'contentSchema': {'type': 'integer'},
-                'title': 'A',
-                'type': 'string',
-            }
-        },
-        'required': ['a'],
-        'title': 'ForceInputModel',
-        'type': 'object',
-    }
-    '''
-    ```
-    """
-
-    coerce_numbers_to_str: bool
-    """
-    If `True`, enables automatic coercion of any `Number` type to `str` in "lax" (non-strict) mode. Defaults to `False`.
-
-    Pydantic doesn't allow number types (`int`, `float`, `Decimal`) to be coerced as type `str` by default.
-
-    ```py
-    from decimal import Decimal
-
-    from pydantic import BaseModel, ConfigDict, ValidationError
-
-    class Model(BaseModel):
-        value: str
-
-    try:
-        print(Model(value=42))
-    except ValidationError as e:
-        print(e)
-        '''
-        1 validation error for Model
-        value
-          Input should be a valid string [type=string_type, input_value=42, input_type=int]
-        '''
-
-    class Model(BaseModel):
-        model_config = ConfigDict(coerce_numbers_to_str=True)
-
-        value: str
-
-    repr(Model(value=42).value)
-    #> "42"
-    repr(Model(value=42.13).value)
-    #> "42.13"
-    repr(Model(value=Decimal('42.13')).value)
-    #> "42.13"
-    ```
-    """
-
-    regex_engine: Literal['rust-regex', 'python-re']
-    """
-    The regex engine to used for pattern validation
-    Defaults to `'rust-regex'`.
-
-    - `rust-regex` uses the [`regex`](https://docs.rs/regex) Rust crate,
-      which is non-backtracking and therefore more DDoS resistant, but does not support all regex features.
-    - `python-re` use the [`re`](https://docs.python.org/3/library/re.html) module,
-      which supports all regex features, but may be slower.
-
-    ```py
-    from pydantic import BaseModel, ConfigDict, Field, ValidationError
-
-    class Model(BaseModel):
-        model_config = ConfigDict(regex_engine='python-re')
-
-        value: str = Field(pattern=r'^abc(?=def)')
-
-    print(Model(value='abcdef').value)
-    #> abcdef
-
-    try:
-        print(Model(value='abxyzcdef'))
-    except ValidationError as e:
-        print(e)
-        '''
-        1 validation error for Model
-        value
-          String should match pattern '^abc(?=def)' [type=string_pattern_mismatch, input_value='abxyzcdef', input_type=str]
-        '''
-    ```
-    """
-
-    validation_error_cause: bool
-    """
-    If `True`, python exceptions that were part of a validation failure will be shown as an exception group as a cause. Can be useful for debugging. Defaults to `False`.
-
-    Note:
-        Python 3.10 and older don't support exception groups natively. <=3.10, backport must be installed: `pip install exceptiongroup`.
-
-    Note:
-        The structure of validation errors are likely to change in future pydantic versions. Pydantic offers no guarantees about the structure of validation errors. Should be used for visual traceback debugging only.
-    """
-
-
-__getattr__ = getattr_migration(__name__)
diff --git a/lib/pydantic/dataclasses.py b/lib/pydantic/dataclasses.py
deleted file mode 100644
index d9c9c903..00000000
--- a/lib/pydantic/dataclasses.py
+++ /dev/null
@@ -1,327 +0,0 @@
-"""Provide an enhanced dataclass that performs validation."""
-from __future__ import annotations as _annotations
-
-import dataclasses
-import sys
-import types
-from typing import TYPE_CHECKING, Any, Callable, Generic, NoReturn, TypeVar, overload
-
-from typing_extensions import Literal, TypeGuard, dataclass_transform
-
-from ._internal import _config, _decorators, _typing_extra
-from ._internal import _dataclasses as _pydantic_dataclasses
-from ._migration import getattr_migration
-from .config import ConfigDict
-from .fields import Field, FieldInfo
-
-if TYPE_CHECKING:
-    from ._internal._dataclasses import PydanticDataclass
-
-__all__ = 'dataclass', 'rebuild_dataclass'
-
-_T = TypeVar('_T')
-
-if sys.version_info >= (3, 10):
-
-    @dataclass_transform(field_specifiers=(dataclasses.field, Field))
-    @overload
-    def dataclass(
-        *,
-        init: Literal[False] = False,
-        repr: bool = True,
-        eq: bool = True,
-        order: bool = False,
-        unsafe_hash: bool = False,
-        frozen: bool = False,
-        config: ConfigDict | type[object] | None = None,
-        validate_on_init: bool | None = None,
-        kw_only: bool = ...,
-        slots: bool = ...,
-    ) -> Callable[[type[_T]], type[PydanticDataclass]]:  # type: ignore
-        ...
-
-    @dataclass_transform(field_specifiers=(dataclasses.field, Field))
-    @overload
-    def dataclass(
-        _cls: type[_T],  # type: ignore
-        *,
-        init: Literal[False] = False,
-        repr: bool = True,
-        eq: bool = True,
-        order: bool = False,
-        unsafe_hash: bool = False,
-        frozen: bool = False,
-        config: ConfigDict | type[object] | None = None,
-        validate_on_init: bool | None = None,
-        kw_only: bool = ...,
-        slots: bool = ...,
-    ) -> type[PydanticDataclass]:
-        ...
-
-else:
-
-    @dataclass_transform(field_specifiers=(dataclasses.field, Field))
-    @overload
-    def dataclass(
-        *,
-        init: Literal[False] = False,
-        repr: bool = True,
-        eq: bool = True,
-        order: bool = False,
-        unsafe_hash: bool = False,
-        frozen: bool = False,
-        config: ConfigDict | type[object] | None = None,
-        validate_on_init: bool | None = None,
-    ) -> Callable[[type[_T]], type[PydanticDataclass]]:  # type: ignore
-        ...
-
-    @dataclass_transform(field_specifiers=(dataclasses.field, Field))
-    @overload
-    def dataclass(
-        _cls: type[_T],  # type: ignore
-        *,
-        init: Literal[False] = False,
-        repr: bool = True,
-        eq: bool = True,
-        order: bool = False,
-        unsafe_hash: bool = False,
-        frozen: bool = False,
-        config: ConfigDict | type[object] | None = None,
-        validate_on_init: bool | None = None,
-    ) -> type[PydanticDataclass]:
-        ...
-
-
-@dataclass_transform(field_specifiers=(dataclasses.field, Field))
-def dataclass(  # noqa: C901
-    _cls: type[_T] | None = None,
-    *,
-    init: Literal[False] = False,
-    repr: bool = True,
-    eq: bool = True,
-    order: bool = False,
-    unsafe_hash: bool = False,
-    frozen: bool = False,
-    config: ConfigDict | type[object] | None = None,
-    validate_on_init: bool | None = None,
-    kw_only: bool = False,
-    slots: bool = False,
-) -> Callable[[type[_T]], type[PydanticDataclass]] | type[PydanticDataclass]:
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/dataclasses/
-
-    A decorator used to create a Pydantic-enhanced dataclass, similar to the standard Python `dataclass`,
-    but with added validation.
-
-    This function should be used similarly to `dataclasses.dataclass`.
-
-    Args:
-        _cls: The target `dataclass`.
-        init: Included for signature compatibility with `dataclasses.dataclass`, and is passed through to
-            `dataclasses.dataclass` when appropriate. If specified, must be set to `False`, as pydantic inserts its
-            own  `__init__` function.
-        repr: A boolean indicating whether to include the field in the `__repr__` output.
-        eq: Determines if a `__eq__` method should be generated for the class.
-        order: Determines if comparison magic methods should be generated, such as `__lt__`, but not `__eq__`.
-        unsafe_hash: Determines if a `__hash__` method should be included in the class, as in `dataclasses.dataclass`.
-        frozen: Determines if the generated class should be a 'frozen' `dataclass`, which does not allow its
-            attributes to be modified after it has been initialized.
-        config: The Pydantic config to use for the `dataclass`.
-        validate_on_init: A deprecated parameter included for backwards compatibility; in V2, all Pydantic dataclasses
-            are validated on init.
-        kw_only: Determines if `__init__` method parameters must be specified by keyword only. Defaults to `False`.
-        slots: Determines if the generated class should be a 'slots' `dataclass`, which does not allow the addition of
-            new attributes after instantiation.
-
-    Returns:
-        A decorator that accepts a class as its argument and returns a Pydantic `dataclass`.
-
-    Raises:
-        AssertionError: Raised if `init` is not `False` or `validate_on_init` is `False`.
-    """
-    assert init is False, 'pydantic.dataclasses.dataclass only supports init=False'
-    assert validate_on_init is not False, 'validate_on_init=False is no longer supported'
-
-    if sys.version_info >= (3, 10):
-        kwargs = dict(kw_only=kw_only, slots=slots)
-    else:
-        kwargs = {}
-
-    def make_pydantic_fields_compatible(cls: type[Any]) -> None:
-        """Make sure that stdlib `dataclasses` understands `Field` kwargs like `kw_only`
-        To do that, we simply change
-          `x: int = pydantic.Field(..., kw_only=True)`
-        into
-          `x: int = dataclasses.field(default=pydantic.Field(..., kw_only=True), kw_only=True)`
-        """
-        for annotation_cls in cls.__mro__:
-            # In Python < 3.9, `__annotations__` might not be present if there are no fields.
-            # we therefore need to use `getattr` to avoid an `AttributeError`.
-            annotations = getattr(annotation_cls, '__annotations__', [])
-            for field_name in annotations:
-                field_value = getattr(cls, field_name, None)
-                # Process only if this is an instance of `FieldInfo`.
-                if not isinstance(field_value, FieldInfo):
-                    continue
-
-                # Initialize arguments for the standard `dataclasses.field`.
-                field_args: dict = {'default': field_value}
-
-                # Handle `kw_only` for Python 3.10+
-                if sys.version_info >= (3, 10) and field_value.kw_only:
-                    field_args['kw_only'] = True
-
-                # Set `repr` attribute if it's explicitly specified to be not `True`.
-                if field_value.repr is not True:
-                    field_args['repr'] = field_value.repr
-
-                setattr(cls, field_name, dataclasses.field(**field_args))
-                # In Python 3.8, dataclasses checks cls.__dict__['__annotations__'] for annotations,
-                # so we must make sure it's initialized before we add to it.
-                if cls.__dict__.get('__annotations__') is None:
-                    cls.__annotations__ = {}
-                cls.__annotations__[field_name] = annotations[field_name]
-
-    def create_dataclass(cls: type[Any]) -> type[PydanticDataclass]:
-        """Create a Pydantic dataclass from a regular dataclass.
-
-        Args:
-            cls: The class to create the Pydantic dataclass from.
-
-        Returns:
-            A Pydantic dataclass.
-        """
-        original_cls = cls
-
-        config_dict = config
-        if config_dict is None:
-            # if not explicitly provided, read from the type
-            cls_config = getattr(cls, '__pydantic_config__', None)
-            if cls_config is not None:
-                config_dict = cls_config
-        config_wrapper = _config.ConfigWrapper(config_dict)
-        decorators = _decorators.DecoratorInfos.build(cls)
-
-        # Keep track of the original __doc__ so that we can restore it after applying the dataclasses decorator
-        # Otherwise, classes with no __doc__ will have their signature added into the JSON schema description,
-        # since dataclasses.dataclass will set this as the __doc__
-        original_doc = cls.__doc__
-
-        if _pydantic_dataclasses.is_builtin_dataclass(cls):
-            # Don't preserve the docstring for vanilla dataclasses, as it may include the signature
-            # This matches v1 behavior, and there was an explicit test for it
-            original_doc = None
-
-            # We don't want to add validation to the existing std lib dataclass, so we will subclass it
-            #   If the class is generic, we need to make sure the subclass also inherits from Generic
-            #   with all the same parameters.
-            bases = (cls,)
-            if issubclass(cls, Generic):
-                generic_base = Generic[cls.__parameters__]  # type: ignore
-                bases = bases + (generic_base,)
-            cls = types.new_class(cls.__name__, bases)
-
-        make_pydantic_fields_compatible(cls)
-
-        cls = dataclasses.dataclass(  # type: ignore[call-overload]
-            cls,
-            # the value of init here doesn't affect anything except that it makes it easier to generate a signature
-            init=True,
-            repr=repr,
-            eq=eq,
-            order=order,
-            unsafe_hash=unsafe_hash,
-            frozen=frozen,
-            **kwargs,
-        )
-
-        cls.__pydantic_decorators__ = decorators  # type: ignore
-        cls.__doc__ = original_doc
-        cls.__module__ = original_cls.__module__
-        cls.__qualname__ = original_cls.__qualname__
-        pydantic_complete = _pydantic_dataclasses.complete_dataclass(
-            cls, config_wrapper, raise_errors=False, types_namespace=None
-        )
-        cls.__pydantic_complete__ = pydantic_complete  # type: ignore
-        return cls
-
-    if _cls is None:
-        return create_dataclass
-
-    return create_dataclass(_cls)
-
-
-__getattr__ = getattr_migration(__name__)
-
-if (3, 8) <= sys.version_info < (3, 11):
-    # Monkeypatch dataclasses.InitVar so that typing doesn't error if it occurs as a type when evaluating type hints
-    # Starting in 3.11, typing.get_type_hints will not raise an error if the retrieved type hints are not callable.
-
-    def _call_initvar(*args: Any, **kwargs: Any) -> NoReturn:
-        """This function does nothing but raise an error that is as similar as possible to what you'd get
-        if you were to try calling `InitVar[int]()` without this monkeypatch. The whole purpose is just
-        to ensure typing._type_check does not error if the type hint evaluates to `InitVar[<parameter>]`.
-        """
-        raise TypeError("'InitVar' object is not callable")
-
-    dataclasses.InitVar.__call__ = _call_initvar
-
-
-def rebuild_dataclass(
-    cls: type[PydanticDataclass],
-    *,
-    force: bool = False,
-    raise_errors: bool = True,
-    _parent_namespace_depth: int = 2,
-    _types_namespace: dict[str, Any] | None = None,
-) -> bool | None:
-    """Try to rebuild the pydantic-core schema for the dataclass.
-
-    This may be necessary when one of the annotations is a ForwardRef which could not be resolved during
-    the initial attempt to build the schema, and automatic rebuilding fails.
-
-    This is analogous to `BaseModel.model_rebuild`.
-
-    Args:
-        cls: The class to rebuild the pydantic-core schema for.
-        force: Whether to force the rebuilding of the schema, defaults to `False`.
-        raise_errors: Whether to raise errors, defaults to `True`.
-        _parent_namespace_depth: The depth level of the parent namespace, defaults to 2.
-        _types_namespace: The types namespace, defaults to `None`.
-
-    Returns:
-        Returns `None` if the schema is already "complete" and rebuilding was not required.
-        If rebuilding _was_ required, returns `True` if rebuilding was successful, otherwise `False`.
-    """
-    if not force and cls.__pydantic_complete__:
-        return None
-    else:
-        if _types_namespace is not None:
-            types_namespace: dict[str, Any] | None = _types_namespace.copy()
-        else:
-            if _parent_namespace_depth > 0:
-                frame_parent_ns = _typing_extra.parent_frame_namespace(parent_depth=_parent_namespace_depth) or {}
-                # Note: we may need to add something similar to cls.__pydantic_parent_namespace__ from BaseModel
-                #   here when implementing handling of recursive generics. See BaseModel.model_rebuild for reference.
-                types_namespace = frame_parent_ns
-            else:
-                types_namespace = {}
-
-            types_namespace = _typing_extra.get_cls_types_namespace(cls, types_namespace)
-        return _pydantic_dataclasses.complete_dataclass(
-            cls,
-            _config.ConfigWrapper(cls.__pydantic_config__, check=False),
-            raise_errors=raise_errors,
-            types_namespace=types_namespace,
-        )
-
-
-def is_pydantic_dataclass(__cls: type[Any]) -> TypeGuard[type[PydanticDataclass]]:
-    """Whether a class is a pydantic dataclass.
-
-    Args:
-        __cls: The class.
-
-    Returns:
-        `True` if the class is a pydantic dataclass, `False` otherwise.
-    """
-    return dataclasses.is_dataclass(__cls) and '__pydantic_validator__' in __cls.__dict__
diff --git a/lib/pydantic/datetime_parse.py b/lib/pydantic/datetime_parse.py
deleted file mode 100644
index 902219df..00000000
--- a/lib/pydantic/datetime_parse.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""The `datetime_parse` module is a backport module from V1."""
-from ._migration import getattr_migration
-
-__getattr__ = getattr_migration(__name__)
diff --git a/lib/pydantic/decorator.py b/lib/pydantic/decorator.py
deleted file mode 100644
index c3643468..00000000
--- a/lib/pydantic/decorator.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""The `decorator` module is a backport module from V1."""
-from ._migration import getattr_migration
-
-__getattr__ = getattr_migration(__name__)
diff --git a/lib/pydantic/deprecated/__init__.py b/lib/pydantic/deprecated/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/pydantic/deprecated/class_validators.py b/lib/pydantic/deprecated/class_validators.py
deleted file mode 100644
index 7b48afd2..00000000
--- a/lib/pydantic/deprecated/class_validators.py
+++ /dev/null
@@ -1,253 +0,0 @@
-"""Old `@validator` and `@root_validator` function validators from V1."""
-
-from __future__ import annotations as _annotations
-
-from functools import partial, partialmethod
-from types import FunctionType
-from typing import TYPE_CHECKING, Any, Callable, TypeVar, Union, overload
-from warnings import warn
-
-from typing_extensions import Literal, Protocol, TypeAlias
-
-from .._internal import _decorators, _decorators_v1
-from ..errors import PydanticUserError
-from ..warnings import PydanticDeprecatedSince20
-
-_ALLOW_REUSE_WARNING_MESSAGE = '`allow_reuse` is deprecated and will be ignored; it should no longer be necessary'
-
-
-if TYPE_CHECKING:
-
-    class _OnlyValueValidatorClsMethod(Protocol):
-        def __call__(self, __cls: Any, __value: Any) -> Any:
-            ...
-
-    class _V1ValidatorWithValuesClsMethod(Protocol):
-        def __call__(self, __cls: Any, __value: Any, values: dict[str, Any]) -> Any:
-            ...
-
-    class _V1ValidatorWithValuesKwOnlyClsMethod(Protocol):
-        def __call__(self, __cls: Any, __value: Any, *, values: dict[str, Any]) -> Any:
-            ...
-
-    class _V1ValidatorWithKwargsClsMethod(Protocol):
-        def __call__(self, __cls: Any, **kwargs: Any) -> Any:
-            ...
-
-    class _V1ValidatorWithValuesAndKwargsClsMethod(Protocol):
-        def __call__(self, __cls: Any, values: dict[str, Any], **kwargs: Any) -> Any:
-            ...
-
-    class _V1RootValidatorClsMethod(Protocol):
-        def __call__(
-            self, __cls: Any, __values: _decorators_v1.RootValidatorValues
-        ) -> _decorators_v1.RootValidatorValues:
-            ...
-
-    V1Validator = Union[
-        _OnlyValueValidatorClsMethod,
-        _V1ValidatorWithValuesClsMethod,
-        _V1ValidatorWithValuesKwOnlyClsMethod,
-        _V1ValidatorWithKwargsClsMethod,
-        _V1ValidatorWithValuesAndKwargsClsMethod,
-        _decorators_v1.V1ValidatorWithValues,
-        _decorators_v1.V1ValidatorWithValuesKwOnly,
-        _decorators_v1.V1ValidatorWithKwargs,
-        _decorators_v1.V1ValidatorWithValuesAndKwargs,
-    ]
-
-    V1RootValidator = Union[
-        _V1RootValidatorClsMethod,
-        _decorators_v1.V1RootValidatorFunction,
-    ]
-
-    _PartialClsOrStaticMethod: TypeAlias = Union[classmethod[Any, Any, Any], staticmethod[Any, Any], partialmethod[Any]]
-
-    # Allow both a V1 (assumed pre=False) or V2 (assumed mode='after') validator
-    # We lie to type checkers and say we return the same thing we get
-    # but in reality we return a proxy object that _mostly_ behaves like the wrapped thing
-    _V1ValidatorType = TypeVar('_V1ValidatorType', V1Validator, _PartialClsOrStaticMethod)
-    _V1RootValidatorFunctionType = TypeVar(
-        '_V1RootValidatorFunctionType',
-        _decorators_v1.V1RootValidatorFunction,
-        _V1RootValidatorClsMethod,
-        _PartialClsOrStaticMethod,
-    )
-else:
-    # See PyCharm issues https://youtrack.jetbrains.com/issue/PY-21915
-    # and https://youtrack.jetbrains.com/issue/PY-51428
-    DeprecationWarning = PydanticDeprecatedSince20
-
-
-def validator(
-    __field: str,
-    *fields: str,
-    pre: bool = False,
-    each_item: bool = False,
-    always: bool = False,
-    check_fields: bool | None = None,
-    allow_reuse: bool = False,
-) -> Callable[[_V1ValidatorType], _V1ValidatorType]:
-    """Decorate methods on the class indicating that they should be used to validate fields.
-
-    Args:
-        __field (str): The first field the validator should be called on; this is separate
-            from `fields` to ensure an error is raised if you don't pass at least one.
-        *fields (str): Additional field(s) the validator should be called on.
-        pre (bool, optional): Whether this validator should be called before the standard
-            validators (else after). Defaults to False.
-        each_item (bool, optional): For complex objects (sets, lists etc.) whether to validate
-            individual elements rather than the whole object. Defaults to False.
-        always (bool, optional): Whether this method and other validators should be called even if
-            the value is missing. Defaults to False.
-        check_fields (bool | None, optional): Whether to check that the fields actually exist on the model.
-            Defaults to None.
-        allow_reuse (bool, optional): Whether to track and raise an error if another validator refers to
-            the decorated function. Defaults to False.
-
-    Returns:
-        Callable: A decorator that can be used to decorate a
-            function to be used as a validator.
-    """
-    if allow_reuse is True:  # pragma: no cover
-        warn(_ALLOW_REUSE_WARNING_MESSAGE, DeprecationWarning)
-    fields = tuple((__field, *fields))
-    if isinstance(fields[0], FunctionType):
-        raise PydanticUserError(
-            '`@validator` should be used with fields and keyword arguments, not bare. '
-            "E.g. usage should be `@validator('<field_name>', ...)`",
-            code='validator-no-fields',
-        )
-    elif not all(isinstance(field, str) for field in fields):
-        raise PydanticUserError(
-            '`@validator` fields should be passed as separate string args. '
-            "E.g. usage should be `@validator('<field_name_1>', '<field_name_2>', ...)`",
-            code='validator-invalid-fields',
-        )
-
-    warn(
-        'Pydantic V1 style `@validator` validators are deprecated.'
-        ' You should migrate to Pydantic V2 style `@field_validator` validators,'
-        ' see the migration guide for more details',
-        DeprecationWarning,
-        stacklevel=2,
-    )
-
-    mode: Literal['before', 'after'] = 'before' if pre is True else 'after'
-
-    def dec(f: Any) -> _decorators.PydanticDescriptorProxy[Any]:
-        if _decorators.is_instance_method_from_sig(f):
-            raise PydanticUserError(
-                '`@validator` cannot be applied to instance methods', code='validator-instance-method'
-            )
-        # auto apply the @classmethod decorator
-        f = _decorators.ensure_classmethod_based_on_signature(f)
-        wrap = _decorators_v1.make_generic_v1_field_validator
-        validator_wrapper_info = _decorators.ValidatorDecoratorInfo(
-            fields=fields,
-            mode=mode,
-            each_item=each_item,
-            always=always,
-            check_fields=check_fields,
-        )
-        return _decorators.PydanticDescriptorProxy(f, validator_wrapper_info, shim=wrap)
-
-    return dec  # type: ignore[return-value]
-
-
-@overload
-def root_validator(
-    *,
-    # if you don't specify `pre` the default is `pre=False`
-    # which means you need to specify `skip_on_failure=True`
-    skip_on_failure: Literal[True],
-    allow_reuse: bool = ...,
-) -> Callable[
-    [_V1RootValidatorFunctionType],
-    _V1RootValidatorFunctionType,
-]:
-    ...
-
-
-@overload
-def root_validator(
-    *,
-    # if you specify `pre=True` then you don't need to specify
-    # `skip_on_failure`, in fact it is not allowed as an argument!
-    pre: Literal[True],
-    allow_reuse: bool = ...,
-) -> Callable[
-    [_V1RootValidatorFunctionType],
-    _V1RootValidatorFunctionType,
-]:
-    ...
-
-
-@overload
-def root_validator(
-    *,
-    # if you explicitly specify `pre=False` then you
-    # MUST specify `skip_on_failure=True`
-    pre: Literal[False],
-    skip_on_failure: Literal[True],
-    allow_reuse: bool = ...,
-) -> Callable[
-    [_V1RootValidatorFunctionType],
-    _V1RootValidatorFunctionType,
-]:
-    ...
-
-
-def root_validator(
-    *__args,
-    pre: bool = False,
-    skip_on_failure: bool = False,
-    allow_reuse: bool = False,
-) -> Any:
-    """Decorate methods on a model indicating that they should be used to validate (and perhaps
-    modify) data either before or after standard model parsing/validation is performed.
-
-    Args:
-        pre (bool, optional): Whether this validator should be called before the standard
-            validators (else after). Defaults to False.
-        skip_on_failure (bool, optional): Whether to stop validation and return as soon as a
-            failure is encountered. Defaults to False.
-        allow_reuse (bool, optional): Whether to track and raise an error if another validator
-            refers to the decorated function. Defaults to False.
-
-    Returns:
-        Any: A decorator that can be used to decorate a function to be used as a root_validator.
-    """
-    warn(
-        'Pydantic V1 style `@root_validator` validators are deprecated.'
-        ' You should migrate to Pydantic V2 style `@model_validator` validators,'
-        ' see the migration guide for more details',
-        DeprecationWarning,
-        stacklevel=2,
-    )
-
-    if __args:
-        # Ensure a nice error is raised if someone attempts to use the bare decorator
-        return root_validator()(*__args)  # type: ignore
-
-    if allow_reuse is True:  # pragma: no cover
-        warn(_ALLOW_REUSE_WARNING_MESSAGE, DeprecationWarning)
-    mode: Literal['before', 'after'] = 'before' if pre is True else 'after'
-    if pre is False and skip_on_failure is not True:
-        raise PydanticUserError(
-            'If you use `@root_validator` with pre=False (the default) you MUST specify `skip_on_failure=True`.'
-            ' Note that `@root_validator` is deprecated and should be replaced with `@model_validator`.',
-            code='root-validator-pre-skip',
-        )
-
-    wrap = partial(_decorators_v1.make_v1_generic_root_validator, pre=pre)
-
-    def dec(f: Callable[..., Any] | classmethod[Any, Any, Any] | staticmethod[Any, Any]) -> Any:
-        if _decorators.is_instance_method_from_sig(f):
-            raise TypeError('`@root_validator` cannot be applied to instance methods')
-        # auto apply the @classmethod decorator
-        res = _decorators.ensure_classmethod_based_on_signature(f)
-        dec_info = _decorators.RootValidatorDecoratorInfo(mode=mode)
-        return _decorators.PydanticDescriptorProxy(res, dec_info, shim=wrap)
-
-    return dec
diff --git a/lib/pydantic/deprecated/config.py b/lib/pydantic/deprecated/config.py
deleted file mode 100644
index 45400c65..00000000
--- a/lib/pydantic/deprecated/config.py
+++ /dev/null
@@ -1,72 +0,0 @@
-from __future__ import annotations as _annotations
-
-import warnings
-from typing import TYPE_CHECKING, Any
-
-from typing_extensions import Literal, deprecated
-
-from .._internal import _config
-from ..warnings import PydanticDeprecatedSince20
-
-if not TYPE_CHECKING:
-    # See PyCharm issues https://youtrack.jetbrains.com/issue/PY-21915
-    # and https://youtrack.jetbrains.com/issue/PY-51428
-    DeprecationWarning = PydanticDeprecatedSince20
-
-__all__ = 'BaseConfig', 'Extra'
-
-
-class _ConfigMetaclass(type):
-    def __getattr__(self, item: str) -> Any:
-        try:
-            obj = _config.config_defaults[item]
-            warnings.warn(_config.DEPRECATION_MESSAGE, DeprecationWarning)
-            return obj
-        except KeyError as exc:
-            raise AttributeError(f"type object '{self.__name__}' has no attribute {exc}") from exc
-
-
-@deprecated('BaseConfig is deprecated. Use the `pydantic.ConfigDict` instead.', category=PydanticDeprecatedSince20)
-class BaseConfig(metaclass=_ConfigMetaclass):
-    """This class is only retained for backwards compatibility.
-
-    !!! Warning "Deprecated"
-        BaseConfig is deprecated. Use the [`pydantic.ConfigDict`][pydantic.ConfigDict] instead.
-    """
-
-    def __getattr__(self, item: str) -> Any:
-        try:
-            obj = super().__getattribute__(item)
-            warnings.warn(_config.DEPRECATION_MESSAGE, DeprecationWarning)
-            return obj
-        except AttributeError as exc:
-            try:
-                return getattr(type(self), item)
-            except AttributeError:
-                # re-raising changes the displayed text to reflect that `self` is not a type
-                raise AttributeError(str(exc)) from exc
-
-    def __init_subclass__(cls, **kwargs: Any) -> None:
-        warnings.warn(_config.DEPRECATION_MESSAGE, DeprecationWarning)
-        return super().__init_subclass__(**kwargs)
-
-
-class _ExtraMeta(type):
-    def __getattribute__(self, __name: str) -> Any:
-        # The @deprecated decorator accesses other attributes, so we only emit a warning for the expected ones
-        if __name in {'allow', 'ignore', 'forbid'}:
-            warnings.warn(
-                "`pydantic.config.Extra` is deprecated, use literal values instead (e.g. `extra='allow'`)",
-                DeprecationWarning,
-                stacklevel=2,
-            )
-        return super().__getattribute__(__name)
-
-
-@deprecated(
-    "Extra is deprecated. Use literal values instead (e.g. `extra='allow'`)", category=PydanticDeprecatedSince20
-)
-class Extra(metaclass=_ExtraMeta):
-    allow: Literal['allow'] = 'allow'
-    ignore: Literal['ignore'] = 'ignore'
-    forbid: Literal['forbid'] = 'forbid'
diff --git a/lib/pydantic/deprecated/copy_internals.py b/lib/pydantic/deprecated/copy_internals.py
deleted file mode 100644
index efe5de28..00000000
--- a/lib/pydantic/deprecated/copy_internals.py
+++ /dev/null
@@ -1,224 +0,0 @@
-from __future__ import annotations as _annotations
-
-import typing
-from copy import deepcopy
-from enum import Enum
-from typing import Any, Tuple
-
-import typing_extensions
-
-from .._internal import (
-    _model_construction,
-    _typing_extra,
-    _utils,
-)
-
-if typing.TYPE_CHECKING:
-    from .. import BaseModel
-    from .._internal._utils import AbstractSetIntStr, MappingIntStrAny
-
-    AnyClassMethod = classmethod[Any, Any, Any]
-    TupleGenerator = typing.Generator[Tuple[str, Any], None, None]
-    Model = typing.TypeVar('Model', bound='BaseModel')
-    # should be `set[int] | set[str] | dict[int, IncEx] | dict[str, IncEx] | None`, but mypy can't cope
-    IncEx: typing_extensions.TypeAlias = 'set[int] | set[str] | dict[int, Any] | dict[str, Any] | None'
-
-_object_setattr = _model_construction.object_setattr
-
-
-def _iter(
-    self: BaseModel,
-    to_dict: bool = False,
-    by_alias: bool = False,
-    include: AbstractSetIntStr | MappingIntStrAny | None = None,
-    exclude: AbstractSetIntStr | MappingIntStrAny | None = None,
-    exclude_unset: bool = False,
-    exclude_defaults: bool = False,
-    exclude_none: bool = False,
-) -> TupleGenerator:
-    # Merge field set excludes with explicit exclude parameter with explicit overriding field set options.
-    # The extra "is not None" guards are not logically necessary but optimizes performance for the simple case.
-    if exclude is not None:
-        exclude = _utils.ValueItems.merge(
-            {k: v.exclude for k, v in self.model_fields.items() if v.exclude is not None}, exclude
-        )
-
-    if include is not None:
-        include = _utils.ValueItems.merge({k: True for k in self.model_fields}, include, intersect=True)
-
-    allowed_keys = _calculate_keys(self, include=include, exclude=exclude, exclude_unset=exclude_unset)  # type: ignore
-    if allowed_keys is None and not (to_dict or by_alias or exclude_unset or exclude_defaults or exclude_none):
-        # huge boost for plain _iter()
-        yield from self.__dict__.items()
-        if self.__pydantic_extra__:
-            yield from self.__pydantic_extra__.items()
-        return
-
-    value_exclude = _utils.ValueItems(self, exclude) if exclude is not None else None
-    value_include = _utils.ValueItems(self, include) if include is not None else None
-
-    if self.__pydantic_extra__ is None:
-        items = self.__dict__.items()
-    else:
-        items = list(self.__dict__.items()) + list(self.__pydantic_extra__.items())
-
-    for field_key, v in items:
-        if (allowed_keys is not None and field_key not in allowed_keys) or (exclude_none and v is None):
-            continue
-
-        if exclude_defaults:
-            try:
-                field = self.model_fields[field_key]
-            except KeyError:
-                pass
-            else:
-                if not field.is_required() and field.default == v:
-                    continue
-
-        if by_alias and field_key in self.model_fields:
-            dict_key = self.model_fields[field_key].alias or field_key
-        else:
-            dict_key = field_key
-
-        if to_dict or value_include or value_exclude:
-            v = _get_value(
-                type(self),
-                v,
-                to_dict=to_dict,
-                by_alias=by_alias,
-                include=value_include and value_include.for_element(field_key),
-                exclude=value_exclude and value_exclude.for_element(field_key),
-                exclude_unset=exclude_unset,
-                exclude_defaults=exclude_defaults,
-                exclude_none=exclude_none,
-            )
-        yield dict_key, v
-
-
-def _copy_and_set_values(
-    self: Model,
-    values: dict[str, Any],
-    fields_set: set[str],
-    extra: dict[str, Any] | None = None,
-    private: dict[str, Any] | None = None,
-    *,
-    deep: bool,  # UP006
-) -> Model:
-    if deep:
-        # chances of having empty dict here are quite low for using smart_deepcopy
-        values = deepcopy(values)
-        extra = deepcopy(extra)
-        private = deepcopy(private)
-
-    cls = self.__class__
-    m = cls.__new__(cls)
-    _object_setattr(m, '__dict__', values)
-    _object_setattr(m, '__pydantic_extra__', extra)
-    _object_setattr(m, '__pydantic_fields_set__', fields_set)
-    _object_setattr(m, '__pydantic_private__', private)
-
-    return m
-
-
-@typing.no_type_check
-def _get_value(
-    cls: type[BaseModel],
-    v: Any,
-    to_dict: bool,
-    by_alias: bool,
-    include: AbstractSetIntStr | MappingIntStrAny | None,
-    exclude: AbstractSetIntStr | MappingIntStrAny | None,
-    exclude_unset: bool,
-    exclude_defaults: bool,
-    exclude_none: bool,
-) -> Any:
-    from .. import BaseModel
-
-    if isinstance(v, BaseModel):
-        if to_dict:
-            return v.model_dump(
-                by_alias=by_alias,
-                exclude_unset=exclude_unset,
-                exclude_defaults=exclude_defaults,
-                include=include,  # type: ignore
-                exclude=exclude,  # type: ignore
-                exclude_none=exclude_none,
-            )
-        else:
-            return v.copy(include=include, exclude=exclude)
-
-    value_exclude = _utils.ValueItems(v, exclude) if exclude else None
-    value_include = _utils.ValueItems(v, include) if include else None
-
-    if isinstance(v, dict):
-        return {
-            k_: _get_value(
-                cls,
-                v_,
-                to_dict=to_dict,
-                by_alias=by_alias,
-                exclude_unset=exclude_unset,
-                exclude_defaults=exclude_defaults,
-                include=value_include and value_include.for_element(k_),
-                exclude=value_exclude and value_exclude.for_element(k_),
-                exclude_none=exclude_none,
-            )
-            for k_, v_ in v.items()
-            if (not value_exclude or not value_exclude.is_excluded(k_))
-            and (not value_include or value_include.is_included(k_))
-        }
-
-    elif _utils.sequence_like(v):
-        seq_args = (
-            _get_value(
-                cls,
-                v_,
-                to_dict=to_dict,
-                by_alias=by_alias,
-                exclude_unset=exclude_unset,
-                exclude_defaults=exclude_defaults,
-                include=value_include and value_include.for_element(i),
-                exclude=value_exclude and value_exclude.for_element(i),
-                exclude_none=exclude_none,
-            )
-            for i, v_ in enumerate(v)
-            if (not value_exclude or not value_exclude.is_excluded(i))
-            and (not value_include or value_include.is_included(i))
-        )
-
-        return v.__class__(*seq_args) if _typing_extra.is_namedtuple(v.__class__) else v.__class__(seq_args)
-
-    elif isinstance(v, Enum) and getattr(cls.model_config, 'use_enum_values', False):
-        return v.value
-
-    else:
-        return v
-
-
-def _calculate_keys(
-    self: BaseModel,
-    include: MappingIntStrAny | None,
-    exclude: MappingIntStrAny | None,
-    exclude_unset: bool,
-    update: typing.Dict[str, Any] | None = None,  # noqa UP006
-) -> typing.AbstractSet[str] | None:
-    if include is None and exclude is None and exclude_unset is False:
-        return None
-
-    keys: typing.AbstractSet[str]
-    if exclude_unset:
-        keys = self.__pydantic_fields_set__.copy()
-    else:
-        keys = set(self.__dict__.keys())
-        keys = keys | (self.__pydantic_extra__ or {}).keys()
-
-    if include is not None:
-        keys &= include.keys()
-
-    if update:
-        keys -= update.keys()
-
-    if exclude:
-        keys -= {k for k, v in exclude.items() if _utils.ValueItems.is_true(v)}
-
-    return keys
diff --git a/lib/pydantic/deprecated/decorator.py b/lib/pydantic/deprecated/decorator.py
deleted file mode 100644
index 36bd0690..00000000
--- a/lib/pydantic/deprecated/decorator.py
+++ /dev/null
@@ -1,279 +0,0 @@
-import warnings
-from functools import wraps
-from typing import TYPE_CHECKING, Any, Callable, Dict, List, Mapping, Optional, Tuple, Type, TypeVar, Union, overload
-
-from typing_extensions import deprecated
-
-from .._internal import _config, _typing_extra
-from ..alias_generators import to_pascal
-from ..errors import PydanticUserError
-from ..functional_validators import field_validator
-from ..main import BaseModel, create_model
-from ..warnings import PydanticDeprecatedSince20
-
-if not TYPE_CHECKING:
-    # See PyCharm issues https://youtrack.jetbrains.com/issue/PY-21915
-    # and https://youtrack.jetbrains.com/issue/PY-51428
-    DeprecationWarning = PydanticDeprecatedSince20
-
-__all__ = ('validate_arguments',)
-
-if TYPE_CHECKING:
-    AnyCallable = Callable[..., Any]
-
-    AnyCallableT = TypeVar('AnyCallableT', bound=AnyCallable)
-    ConfigType = Union[None, Type[Any], Dict[str, Any]]
-
-
-@overload
-def validate_arguments(func: None = None, *, config: 'ConfigType' = None) -> Callable[['AnyCallableT'], 'AnyCallableT']:
-    ...
-
-
-@overload
-def validate_arguments(func: 'AnyCallableT') -> 'AnyCallableT':
-    ...
-
-
-@deprecated(
-    'The `validate_arguments` method is deprecated; use `validate_call` instead.',
-    category=None,
-)
-def validate_arguments(func: Optional['AnyCallableT'] = None, *, config: 'ConfigType' = None) -> Any:
-    """Decorator to validate the arguments passed to a function."""
-    warnings.warn(
-        'The `validate_arguments` method is deprecated; use `validate_call` instead.',
-        PydanticDeprecatedSince20,
-        stacklevel=2,
-    )
-
-    def validate(_func: 'AnyCallable') -> 'AnyCallable':
-        vd = ValidatedFunction(_func, config)
-
-        @wraps(_func)
-        def wrapper_function(*args: Any, **kwargs: Any) -> Any:
-            return vd.call(*args, **kwargs)
-
-        wrapper_function.vd = vd  # type: ignore
-        wrapper_function.validate = vd.init_model_instance  # type: ignore
-        wrapper_function.raw_function = vd.raw_function  # type: ignore
-        wrapper_function.model = vd.model  # type: ignore
-        return wrapper_function
-
-    if func:
-        return validate(func)
-    else:
-        return validate
-
-
-ALT_V_ARGS = 'v__args'
-ALT_V_KWARGS = 'v__kwargs'
-V_POSITIONAL_ONLY_NAME = 'v__positional_only'
-V_DUPLICATE_KWARGS = 'v__duplicate_kwargs'
-
-
-class ValidatedFunction:
-    def __init__(self, function: 'AnyCallable', config: 'ConfigType'):
-        from inspect import Parameter, signature
-
-        parameters: Mapping[str, Parameter] = signature(function).parameters
-
-        if parameters.keys() & {ALT_V_ARGS, ALT_V_KWARGS, V_POSITIONAL_ONLY_NAME, V_DUPLICATE_KWARGS}:
-            raise PydanticUserError(
-                f'"{ALT_V_ARGS}", "{ALT_V_KWARGS}", "{V_POSITIONAL_ONLY_NAME}" and "{V_DUPLICATE_KWARGS}" '
-                f'are not permitted as argument names when using the "{validate_arguments.__name__}" decorator',
-                code=None,
-            )
-
-        self.raw_function = function
-        self.arg_mapping: Dict[int, str] = {}
-        self.positional_only_args: set[str] = set()
-        self.v_args_name = 'args'
-        self.v_kwargs_name = 'kwargs'
-
-        type_hints = _typing_extra.get_type_hints(function, include_extras=True)
-        takes_args = False
-        takes_kwargs = False
-        fields: Dict[str, Tuple[Any, Any]] = {}
-        for i, (name, p) in enumerate(parameters.items()):
-            if p.annotation is p.empty:
-                annotation = Any
-            else:
-                annotation = type_hints[name]
-
-            default = ... if p.default is p.empty else p.default
-            if p.kind == Parameter.POSITIONAL_ONLY:
-                self.arg_mapping[i] = name
-                fields[name] = annotation, default
-                fields[V_POSITIONAL_ONLY_NAME] = List[str], None
-                self.positional_only_args.add(name)
-            elif p.kind == Parameter.POSITIONAL_OR_KEYWORD:
-                self.arg_mapping[i] = name
-                fields[name] = annotation, default
-                fields[V_DUPLICATE_KWARGS] = List[str], None
-            elif p.kind == Parameter.KEYWORD_ONLY:
-                fields[name] = annotation, default
-            elif p.kind == Parameter.VAR_POSITIONAL:
-                self.v_args_name = name
-                fields[name] = Tuple[annotation, ...], None
-                takes_args = True
-            else:
-                assert p.kind == Parameter.VAR_KEYWORD, p.kind
-                self.v_kwargs_name = name
-                fields[name] = Dict[str, annotation], None
-                takes_kwargs = True
-
-        # these checks avoid a clash between "args" and a field with that name
-        if not takes_args and self.v_args_name in fields:
-            self.v_args_name = ALT_V_ARGS
-
-        # same with "kwargs"
-        if not takes_kwargs and self.v_kwargs_name in fields:
-            self.v_kwargs_name = ALT_V_KWARGS
-
-        if not takes_args:
-            # we add the field so validation below can raise the correct exception
-            fields[self.v_args_name] = List[Any], None
-
-        if not takes_kwargs:
-            # same with kwargs
-            fields[self.v_kwargs_name] = Dict[Any, Any], None
-
-        self.create_model(fields, takes_args, takes_kwargs, config)
-
-    def init_model_instance(self, *args: Any, **kwargs: Any) -> BaseModel:
-        values = self.build_values(args, kwargs)
-        return self.model(**values)
-
-    def call(self, *args: Any, **kwargs: Any) -> Any:
-        m = self.init_model_instance(*args, **kwargs)
-        return self.execute(m)
-
-    def build_values(self, args: Tuple[Any, ...], kwargs: Dict[str, Any]) -> Dict[str, Any]:
-        values: Dict[str, Any] = {}
-        if args:
-            arg_iter = enumerate(args)
-            while True:
-                try:
-                    i, a = next(arg_iter)
-                except StopIteration:
-                    break
-                arg_name = self.arg_mapping.get(i)
-                if arg_name is not None:
-                    values[arg_name] = a
-                else:
-                    values[self.v_args_name] = [a] + [a for _, a in arg_iter]
-                    break
-
-        var_kwargs: Dict[str, Any] = {}
-        wrong_positional_args = []
-        duplicate_kwargs = []
-        fields_alias = [
-            field.alias
-            for name, field in self.model.model_fields.items()
-            if name not in (self.v_args_name, self.v_kwargs_name)
-        ]
-        non_var_fields = set(self.model.model_fields) - {self.v_args_name, self.v_kwargs_name}
-        for k, v in kwargs.items():
-            if k in non_var_fields or k in fields_alias:
-                if k in self.positional_only_args:
-                    wrong_positional_args.append(k)
-                if k in values:
-                    duplicate_kwargs.append(k)
-                values[k] = v
-            else:
-                var_kwargs[k] = v
-
-        if var_kwargs:
-            values[self.v_kwargs_name] = var_kwargs
-        if wrong_positional_args:
-            values[V_POSITIONAL_ONLY_NAME] = wrong_positional_args
-        if duplicate_kwargs:
-            values[V_DUPLICATE_KWARGS] = duplicate_kwargs
-        return values
-
-    def execute(self, m: BaseModel) -> Any:
-        d = {k: v for k, v in m.__dict__.items() if k in m.__pydantic_fields_set__ or m.model_fields[k].default_factory}
-        var_kwargs = d.pop(self.v_kwargs_name, {})
-
-        if self.v_args_name in d:
-            args_: List[Any] = []
-            in_kwargs = False
-            kwargs = {}
-            for name, value in d.items():
-                if in_kwargs:
-                    kwargs[name] = value
-                elif name == self.v_args_name:
-                    args_ += value
-                    in_kwargs = True
-                else:
-                    args_.append(value)
-            return self.raw_function(*args_, **kwargs, **var_kwargs)
-        elif self.positional_only_args:
-            args_ = []
-            kwargs = {}
-            for name, value in d.items():
-                if name in self.positional_only_args:
-                    args_.append(value)
-                else:
-                    kwargs[name] = value
-            return self.raw_function(*args_, **kwargs, **var_kwargs)
-        else:
-            return self.raw_function(**d, **var_kwargs)
-
-    def create_model(self, fields: Dict[str, Any], takes_args: bool, takes_kwargs: bool, config: 'ConfigType') -> None:
-        pos_args = len(self.arg_mapping)
-
-        config_wrapper = _config.ConfigWrapper(config)
-
-        if config_wrapper.alias_generator:
-            raise PydanticUserError(
-                'Setting the "alias_generator" property on custom Config for '
-                '@validate_arguments is not yet supported, please remove.',
-                code=None,
-            )
-        if config_wrapper.extra is None:
-            config_wrapper.config_dict['extra'] = 'forbid'
-
-        class DecoratorBaseModel(BaseModel):
-            @field_validator(self.v_args_name, check_fields=False)
-            @classmethod
-            def check_args(cls, v: Optional[List[Any]]) -> Optional[List[Any]]:
-                if takes_args or v is None:
-                    return v
-
-                raise TypeError(f'{pos_args} positional arguments expected but {pos_args + len(v)} given')
-
-            @field_validator(self.v_kwargs_name, check_fields=False)
-            @classmethod
-            def check_kwargs(cls, v: Optional[Dict[str, Any]]) -> Optional[Dict[str, Any]]:
-                if takes_kwargs or v is None:
-                    return v
-
-                plural = '' if len(v) == 1 else 's'
-                keys = ', '.join(map(repr, v.keys()))
-                raise TypeError(f'unexpected keyword argument{plural}: {keys}')
-
-            @field_validator(V_POSITIONAL_ONLY_NAME, check_fields=False)
-            @classmethod
-            def check_positional_only(cls, v: Optional[List[str]]) -> None:
-                if v is None:
-                    return
-
-                plural = '' if len(v) == 1 else 's'
-                keys = ', '.join(map(repr, v))
-                raise TypeError(f'positional-only argument{plural} passed as keyword argument{plural}: {keys}')
-
-            @field_validator(V_DUPLICATE_KWARGS, check_fields=False)
-            @classmethod
-            def check_duplicate_kwargs(cls, v: Optional[List[str]]) -> None:
-                if v is None:
-                    return
-
-                plural = '' if len(v) == 1 else 's'
-                keys = ', '.join(map(repr, v))
-                raise TypeError(f'multiple values for argument{plural}: {keys}')
-
-            model_config = config_wrapper.config_dict
-
-        self.model = create_model(to_pascal(self.raw_function.__name__), __base__=DecoratorBaseModel, **fields)
diff --git a/lib/pydantic/deprecated/json.py b/lib/pydantic/deprecated/json.py
deleted file mode 100644
index 79e2f44a..00000000
--- a/lib/pydantic/deprecated/json.py
+++ /dev/null
@@ -1,140 +0,0 @@
-import datetime
-import warnings
-from collections import deque
-from decimal import Decimal
-from enum import Enum
-from ipaddress import IPv4Address, IPv4Interface, IPv4Network, IPv6Address, IPv6Interface, IPv6Network
-from pathlib import Path
-from re import Pattern
-from types import GeneratorType
-from typing import TYPE_CHECKING, Any, Callable, Dict, Type, Union
-from uuid import UUID
-
-from typing_extensions import deprecated
-
-from ..color import Color
-from ..networks import NameEmail
-from ..types import SecretBytes, SecretStr
-from ..warnings import PydanticDeprecatedSince20
-
-if not TYPE_CHECKING:
-    # See PyCharm issues https://youtrack.jetbrains.com/issue/PY-21915
-    # and https://youtrack.jetbrains.com/issue/PY-51428
-    DeprecationWarning = PydanticDeprecatedSince20
-
-__all__ = 'pydantic_encoder', 'custom_pydantic_encoder', 'timedelta_isoformat'
-
-
-def isoformat(o: Union[datetime.date, datetime.time]) -> str:
-    return o.isoformat()
-
-
-def decimal_encoder(dec_value: Decimal) -> Union[int, float]:
-    """Encodes a Decimal as int of there's no exponent, otherwise float.
-
-    This is useful when we use ConstrainedDecimal to represent Numeric(x,0)
-    where a integer (but not int typed) is used. Encoding this as a float
-    results in failed round-tripping between encode and parse.
-    Our Id type is a prime example of this.
-
-    >>> decimal_encoder(Decimal("1.0"))
-    1.0
-
-    >>> decimal_encoder(Decimal("1"))
-    1
-    """
-    exponent = dec_value.as_tuple().exponent
-    if isinstance(exponent, int) and exponent >= 0:
-        return int(dec_value)
-    else:
-        return float(dec_value)
-
-
-ENCODERS_BY_TYPE: Dict[Type[Any], Callable[[Any], Any]] = {
-    bytes: lambda o: o.decode(),
-    Color: str,
-    datetime.date: isoformat,
-    datetime.datetime: isoformat,
-    datetime.time: isoformat,
-    datetime.timedelta: lambda td: td.total_seconds(),
-    Decimal: decimal_encoder,
-    Enum: lambda o: o.value,
-    frozenset: list,
-    deque: list,
-    GeneratorType: list,
-    IPv4Address: str,
-    IPv4Interface: str,
-    IPv4Network: str,
-    IPv6Address: str,
-    IPv6Interface: str,
-    IPv6Network: str,
-    NameEmail: str,
-    Path: str,
-    Pattern: lambda o: o.pattern,
-    SecretBytes: str,
-    SecretStr: str,
-    set: list,
-    UUID: str,
-}
-
-
-@deprecated(
-    '`pydantic_encoder` is deprecated, use `pydantic_core.to_jsonable_python` instead.',
-    category=None,
-)
-def pydantic_encoder(obj: Any) -> Any:
-    warnings.warn(
-        '`pydantic_encoder` is deprecated, use `pydantic_core.to_jsonable_python` instead.',
-        category=PydanticDeprecatedSince20,
-        stacklevel=2,
-    )
-    from dataclasses import asdict, is_dataclass
-
-    from ..main import BaseModel
-
-    if isinstance(obj, BaseModel):
-        return obj.model_dump()
-    elif is_dataclass(obj):
-        return asdict(obj)
-
-    # Check the class type and its superclasses for a matching encoder
-    for base in obj.__class__.__mro__[:-1]:
-        try:
-            encoder = ENCODERS_BY_TYPE[base]
-        except KeyError:
-            continue
-        return encoder(obj)
-    else:  # We have exited the for loop without finding a suitable encoder
-        raise TypeError(f"Object of type '{obj.__class__.__name__}' is not JSON serializable")
-
-
-# TODO: Add a suggested migration path once there is a way to use custom encoders
-@deprecated(
-    '`custom_pydantic_encoder` is deprecated, use `BaseModel.model_dump` instead.',
-    category=None,
-)
-def custom_pydantic_encoder(type_encoders: Dict[Any, Callable[[Type[Any]], Any]], obj: Any) -> Any:
-    warnings.warn(
-        '`custom_pydantic_encoder` is deprecated, use `BaseModel.model_dump` instead.',
-        category=PydanticDeprecatedSince20,
-        stacklevel=2,
-    )
-    # Check the class type and its superclasses for a matching encoder
-    for base in obj.__class__.__mro__[:-1]:
-        try:
-            encoder = type_encoders[base]
-        except KeyError:
-            continue
-
-        return encoder(obj)
-    else:  # We have exited the for loop without finding a suitable encoder
-        return pydantic_encoder(obj)
-
-
-@deprecated('`timedelta_isoformat` is deprecated.', category=None)
-def timedelta_isoformat(td: datetime.timedelta) -> str:
-    """ISO 8601 encoding for Python timedelta object."""
-    warnings.warn('`timedelta_isoformat` is deprecated.', category=PydanticDeprecatedSince20, stacklevel=2)
-    minutes, seconds = divmod(td.seconds, 60)
-    hours, minutes = divmod(minutes, 60)
-    return f'{"-" if td.days < 0 else ""}P{abs(td.days)}DT{hours:d}H{minutes:d}M{seconds:d}.{td.microseconds:06d}S'
diff --git a/lib/pydantic/deprecated/parse.py b/lib/pydantic/deprecated/parse.py
deleted file mode 100644
index 2a92e62b..00000000
--- a/lib/pydantic/deprecated/parse.py
+++ /dev/null
@@ -1,80 +0,0 @@
-from __future__ import annotations
-
-import json
-import pickle
-import warnings
-from enum import Enum
-from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable
-
-from typing_extensions import deprecated
-
-from ..warnings import PydanticDeprecatedSince20
-
-if not TYPE_CHECKING:
-    # See PyCharm issues https://youtrack.jetbrains.com/issue/PY-21915
-    # and https://youtrack.jetbrains.com/issue/PY-51428
-    DeprecationWarning = PydanticDeprecatedSince20
-
-
-class Protocol(str, Enum):
-    json = 'json'
-    pickle = 'pickle'
-
-
-@deprecated('`load_str_bytes` is deprecated.', category=None)
-def load_str_bytes(
-    b: str | bytes,
-    *,
-    content_type: str | None = None,
-    encoding: str = 'utf8',
-    proto: Protocol | None = None,
-    allow_pickle: bool = False,
-    json_loads: Callable[[str], Any] = json.loads,
-) -> Any:
-    warnings.warn('`load_str_bytes` is deprecated.', category=PydanticDeprecatedSince20, stacklevel=2)
-    if proto is None and content_type:
-        if content_type.endswith(('json', 'javascript')):
-            pass
-        elif allow_pickle and content_type.endswith('pickle'):
-            proto = Protocol.pickle
-        else:
-            raise TypeError(f'Unknown content-type: {content_type}')
-
-    proto = proto or Protocol.json
-
-    if proto == Protocol.json:
-        if isinstance(b, bytes):
-            b = b.decode(encoding)
-        return json_loads(b)  # type: ignore
-    elif proto == Protocol.pickle:
-        if not allow_pickle:
-            raise RuntimeError('Trying to decode with pickle with allow_pickle=False')
-        bb = b if isinstance(b, bytes) else b.encode()  # type: ignore
-        return pickle.loads(bb)
-    else:
-        raise TypeError(f'Unknown protocol: {proto}')
-
-
-@deprecated('`load_file` is deprecated.', category=None)
-def load_file(
-    path: str | Path,
-    *,
-    content_type: str | None = None,
-    encoding: str = 'utf8',
-    proto: Protocol | None = None,
-    allow_pickle: bool = False,
-    json_loads: Callable[[str], Any] = json.loads,
-) -> Any:
-    warnings.warn('`load_file` is deprecated.', category=PydanticDeprecatedSince20, stacklevel=2)
-    path = Path(path)
-    b = path.read_bytes()
-    if content_type is None:
-        if path.suffix in ('.js', '.json'):
-            proto = Protocol.json
-        elif path.suffix == '.pkl':
-            proto = Protocol.pickle
-
-    return load_str_bytes(
-        b, proto=proto, content_type=content_type, encoding=encoding, allow_pickle=allow_pickle, json_loads=json_loads
-    )
diff --git a/lib/pydantic/deprecated/tools.py b/lib/pydantic/deprecated/tools.py
deleted file mode 100644
index b04eae40..00000000
--- a/lib/pydantic/deprecated/tools.py
+++ /dev/null
@@ -1,103 +0,0 @@
-from __future__ import annotations
-
-import json
-import warnings
-from typing import TYPE_CHECKING, Any, Callable, Type, TypeVar, Union
-
-from typing_extensions import deprecated
-
-from ..json_schema import DEFAULT_REF_TEMPLATE, GenerateJsonSchema
-from ..type_adapter import TypeAdapter
-from ..warnings import PydanticDeprecatedSince20
-
-if not TYPE_CHECKING:
-    # See PyCharm issues https://youtrack.jetbrains.com/issue/PY-21915
-    # and https://youtrack.jetbrains.com/issue/PY-51428
-    DeprecationWarning = PydanticDeprecatedSince20
-
-__all__ = 'parse_obj_as', 'schema_of', 'schema_json_of'
-
-NameFactory = Union[str, Callable[[Type[Any]], str]]
-
-
-T = TypeVar('T')
-
-
-@deprecated(
-    '`parse_obj_as` is deprecated. Use `pydantic.TypeAdapter.validate_python` instead.',
-    category=None,
-)
-def parse_obj_as(type_: type[T], obj: Any, type_name: NameFactory | None = None) -> T:
-    warnings.warn(
-        '`parse_obj_as` is deprecated. Use `pydantic.TypeAdapter.validate_python` instead.',
-        category=PydanticDeprecatedSince20,
-        stacklevel=2,
-    )
-    if type_name is not None:  # pragma: no cover
-        warnings.warn(
-            'The type_name parameter is deprecated. parse_obj_as no longer creates temporary models',
-            DeprecationWarning,
-            stacklevel=2,
-        )
-    return TypeAdapter(type_).validate_python(obj)
-
-
-@deprecated(
-    '`schema_of` is deprecated. Use `pydantic.TypeAdapter.json_schema` instead.',
-    category=None,
-)
-def schema_of(
-    type_: Any,
-    *,
-    title: NameFactory | None = None,
-    by_alias: bool = True,
-    ref_template: str = DEFAULT_REF_TEMPLATE,
-    schema_generator: type[GenerateJsonSchema] = GenerateJsonSchema,
-) -> dict[str, Any]:
-    """Generate a JSON schema (as dict) for the passed model or dynamically generated one."""
-    warnings.warn(
-        '`schema_of` is deprecated. Use `pydantic.TypeAdapter.json_schema` instead.',
-        category=PydanticDeprecatedSince20,
-        stacklevel=2,
-    )
-    res = TypeAdapter(type_).json_schema(
-        by_alias=by_alias,
-        schema_generator=schema_generator,
-        ref_template=ref_template,
-    )
-    if title is not None:
-        if isinstance(title, str):
-            res['title'] = title
-        else:
-            warnings.warn(
-                'Passing a callable for the `title` parameter is deprecated and no longer supported',
-                DeprecationWarning,
-                stacklevel=2,
-            )
-            res['title'] = title(type_)
-    return res
-
-
-@deprecated(
-    '`schema_json_of` is deprecated. Use `pydantic.TypeAdapter.json_schema` instead.',
-    category=None,
-)
-def schema_json_of(
-    type_: Any,
-    *,
-    title: NameFactory | None = None,
-    by_alias: bool = True,
-    ref_template: str = DEFAULT_REF_TEMPLATE,
-    schema_generator: type[GenerateJsonSchema] = GenerateJsonSchema,
-    **dumps_kwargs: Any,
-) -> str:
-    """Generate a JSON schema (as JSON) for the passed model or dynamically generated one."""
-    warnings.warn(
-        '`schema_json_of` is deprecated. Use `pydantic.TypeAdapter.json_schema` instead.',
-        category=PydanticDeprecatedSince20,
-        stacklevel=2,
-    )
-    return json.dumps(
-        schema_of(type_, title=title, by_alias=by_alias, ref_template=ref_template, schema_generator=schema_generator),
-        **dumps_kwargs,
-    )
diff --git a/lib/pydantic/env_settings.py b/lib/pydantic/env_settings.py
deleted file mode 100644
index 662f5900..00000000
--- a/lib/pydantic/env_settings.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""The `env_settings` module is a backport module from V1."""
-from ._migration import getattr_migration
-
-__getattr__ = getattr_migration(__name__)
diff --git a/lib/pydantic/error_wrappers.py b/lib/pydantic/error_wrappers.py
deleted file mode 100644
index 5144eeee..00000000
--- a/lib/pydantic/error_wrappers.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""The `error_wrappers` module is a backport module from V1."""
-from ._migration import getattr_migration
-
-__getattr__ = getattr_migration(__name__)
diff --git a/lib/pydantic/errors.py b/lib/pydantic/errors.py
deleted file mode 100644
index c5fa9612..00000000
--- a/lib/pydantic/errors.py
+++ /dev/null
@@ -1,152 +0,0 @@
-"""Pydantic-specific errors."""
-from __future__ import annotations as _annotations
-
-import re
-
-from typing_extensions import Literal, Self
-
-from ._migration import getattr_migration
-from .version import version_short
-
-__all__ = (
-    'PydanticUserError',
-    'PydanticUndefinedAnnotation',
-    'PydanticImportError',
-    'PydanticSchemaGenerationError',
-    'PydanticInvalidForJsonSchema',
-    'PydanticErrorCodes',
-)
-
-# We use this URL to allow for future flexibility about how we host the docs, while allowing for Pydantic
-# code in the while with "old" URLs to still work.
-# 'u' refers to "user errors" - e.g. errors caused by developers using pydantic, as opposed to validation errors.
-DEV_ERROR_DOCS_URL = f'https://errors.pydantic.dev/{version_short()}/u/'
-PydanticErrorCodes = Literal[
-    'class-not-fully-defined',
-    'custom-json-schema',
-    'decorator-missing-field',
-    'discriminator-no-field',
-    'discriminator-alias-type',
-    'discriminator-needs-literal',
-    'discriminator-alias',
-    'discriminator-validator',
-    'callable-discriminator-no-tag',
-    'typed-dict-version',
-    'model-field-overridden',
-    'model-field-missing-annotation',
-    'config-both',
-    'removed-kwargs',
-    'invalid-for-json-schema',
-    'json-schema-already-used',
-    'base-model-instantiated',
-    'undefined-annotation',
-    'schema-for-unknown-type',
-    'import-error',
-    'create-model-field-definitions',
-    'create-model-config-base',
-    'validator-no-fields',
-    'validator-invalid-fields',
-    'validator-instance-method',
-    'root-validator-pre-skip',
-    'model-serializer-instance-method',
-    'validator-field-config-info',
-    'validator-v1-signature',
-    'validator-signature',
-    'field-serializer-signature',
-    'model-serializer-signature',
-    'multiple-field-serializers',
-    'invalid_annotated_type',
-    'type-adapter-config-unused',
-    'root-model-extra',
-    'unevaluable-type-annotation',
-    'dataclass-init-false-extra-allow',
-    'clashing-init-and-init-var',
-]
-
-
-class PydanticErrorMixin:
-    """A mixin class for common functionality shared by all Pydantic-specific errors.
-
-    Attributes:
-        message: A message describing the error.
-        code: An optional error code from PydanticErrorCodes enum.
-    """
-
-    def __init__(self, message: str, *, code: PydanticErrorCodes | None) -> None:
-        self.message = message
-        self.code = code
-
-    def __str__(self) -> str:
-        if self.code is None:
-            return self.message
-        else:
-            return f'{self.message}\n\nFor further information visit {DEV_ERROR_DOCS_URL}{self.code}'
-
-
-class PydanticUserError(PydanticErrorMixin, TypeError):
-    """An error raised due to incorrect use of Pydantic."""
-
-
-class PydanticUndefinedAnnotation(PydanticErrorMixin, NameError):
-    """A subclass of `NameError` raised when handling undefined annotations during `CoreSchema` generation.
-
-    Attributes:
-        name: Name of the error.
-        message: Description of the error.
-    """
-
-    def __init__(self, name: str, message: str) -> None:
-        self.name = name
-        super().__init__(message=message, code='undefined-annotation')
-
-    @classmethod
-    def from_name_error(cls, name_error: NameError) -> Self:
-        """Convert a `NameError` to a `PydanticUndefinedAnnotation` error.
-
-        Args:
-            name_error: `NameError` to be converted.
-
-        Returns:
-            Converted `PydanticUndefinedAnnotation` error.
-        """
-        try:
-            name = name_error.name  # type: ignore  # python > 3.10
-        except AttributeError:
-            name = re.search(r".*'(.+?)'", str(name_error)).group(1)  # type: ignore[union-attr]
-        return cls(name=name, message=str(name_error))
-
-
-class PydanticImportError(PydanticErrorMixin, ImportError):
-    """An error raised when an import fails due to module changes between V1 and V2.
-
-    Attributes:
-        message: Description of the error.
-    """
-
-    def __init__(self, message: str) -> None:
-        super().__init__(message, code='import-error')
-
-
-class PydanticSchemaGenerationError(PydanticUserError):
-    """An error raised during failures to generate a `CoreSchema` for some type.
-
-    Attributes:
-        message: Description of the error.
-    """
-
-    def __init__(self, message: str) -> None:
-        super().__init__(message, code='schema-for-unknown-type')
-
-
-class PydanticInvalidForJsonSchema(PydanticUserError):
-    """An error raised during failures to generate a JSON schema for some `CoreSchema`.
-
-    Attributes:
-        message: Description of the error.
-    """
-
-    def __init__(self, message: str) -> None:
-        super().__init__(message, code='invalid-for-json-schema')
-
-
-__getattr__ = getattr_migration(__name__)
diff --git a/lib/pydantic/fields.py b/lib/pydantic/fields.py
deleted file mode 100644
index b416bb7d..00000000
--- a/lib/pydantic/fields.py
+++ /dev/null
@@ -1,1154 +0,0 @@
-"""Defining fields on models."""
-from __future__ import annotations as _annotations
-
-import dataclasses
-import inspect
-import typing
-from copy import copy
-from dataclasses import Field as DataclassField
-from functools import cached_property
-from typing import Any, ClassVar
-from warnings import warn
-
-import annotated_types
-import typing_extensions
-from pydantic_core import PydanticUndefined
-from typing_extensions import Literal, Unpack
-
-from . import types
-from ._internal import _decorators, _fields, _generics, _internal_dataclass, _repr, _typing_extra, _utils
-from .aliases import AliasChoices, AliasPath
-from .config import JsonDict
-from .errors import PydanticUserError
-from .warnings import PydanticDeprecatedSince20
-
-if typing.TYPE_CHECKING:
-    from ._internal._repr import ReprArgs
-else:
-    # See PyCharm issues https://youtrack.jetbrains.com/issue/PY-21915
-    # and https://youtrack.jetbrains.com/issue/PY-51428
-    DeprecationWarning = PydanticDeprecatedSince20
-
-
-_Unset: Any = PydanticUndefined
-
-
-class _FromFieldInfoInputs(typing_extensions.TypedDict, total=False):
-    """This class exists solely to add type checking for the `**kwargs` in `FieldInfo.from_field`."""
-
-    annotation: type[Any] | None
-    default_factory: typing.Callable[[], Any] | None
-    alias: str | None
-    alias_priority: int | None
-    validation_alias: str | AliasPath | AliasChoices | None
-    serialization_alias: str | None
-    title: str | None
-    description: str | None
-    examples: list[Any] | None
-    exclude: bool | None
-    gt: float | None
-    ge: float | None
-    lt: float | None
-    le: float | None
-    multiple_of: float | None
-    strict: bool | None
-    min_length: int | None
-    max_length: int | None
-    pattern: str | None
-    allow_inf_nan: bool | None
-    max_digits: int | None
-    decimal_places: int | None
-    union_mode: Literal['smart', 'left_to_right'] | None
-    discriminator: str | types.Discriminator | None
-    json_schema_extra: JsonDict | typing.Callable[[JsonDict], None] | None
-    frozen: bool | None
-    validate_default: bool | None
-    repr: bool
-    init: bool | None
-    init_var: bool | None
-    kw_only: bool | None
-
-
-class _FieldInfoInputs(_FromFieldInfoInputs, total=False):
-    """This class exists solely to add type checking for the `**kwargs` in `FieldInfo.__init__`."""
-
-    default: Any
-
-
-class FieldInfo(_repr.Representation):
-    """This class holds information about a field.
-
-    `FieldInfo` is used for any field definition regardless of whether the [`Field()`][pydantic.fields.Field]
-    function is explicitly used.
-
-    !!! warning
-        You generally shouldn't be creating `FieldInfo` directly, you'll only need to use it when accessing
-        [`BaseModel`][pydantic.main.BaseModel] `.model_fields` internals.
-
-    Attributes:
-        annotation: The type annotation of the field.
-        default: The default value of the field.
-        default_factory: The factory function used to construct the default for the field.
-        alias: The alias name of the field.
-        alias_priority: The priority of the field's alias.
-        validation_alias: The validation alias of the field.
-        serialization_alias: The serialization alias of the field.
-        title: The title of the field.
-        description: The description of the field.
-        examples: List of examples of the field.
-        exclude: Whether to exclude the field from the model serialization.
-        discriminator: Field name or Discriminator for discriminating the type in a tagged union.
-        json_schema_extra: A dict or callable to provide extra JSON schema properties.
-        frozen: Whether the field is frozen.
-        validate_default: Whether to validate the default value of the field.
-        repr: Whether to include the field in representation of the model.
-        init: Whether the field should be included in the constructor of the dataclass.
-        init_var: Whether the field should _only_ be included in the constructor of the dataclass, and not stored.
-        kw_only: Whether the field should be a keyword-only argument in the constructor of the dataclass.
-        metadata: List of metadata constraints.
-    """
-
-    annotation: type[Any] | None
-    default: Any
-    default_factory: typing.Callable[[], Any] | None
-    alias: str | None
-    alias_priority: int | None
-    validation_alias: str | AliasPath | AliasChoices | None
-    serialization_alias: str | None
-    title: str | None
-    description: str | None
-    examples: list[Any] | None
-    exclude: bool | None
-    discriminator: str | types.Discriminator | None
-    json_schema_extra: JsonDict | typing.Callable[[JsonDict], None] | None
-    frozen: bool | None
-    validate_default: bool | None
-    repr: bool
-    init: bool | None
-    init_var: bool | None
-    kw_only: bool | None
-    metadata: list[Any]
-
-    __slots__ = (
-        'annotation',
-        'default',
-        'default_factory',
-        'alias',
-        'alias_priority',
-        'validation_alias',
-        'serialization_alias',
-        'title',
-        'description',
-        'examples',
-        'exclude',
-        'discriminator',
-        'json_schema_extra',
-        'frozen',
-        'validate_default',
-        'repr',
-        'init',
-        'init_var',
-        'kw_only',
-        'metadata',
-        '_attributes_set',
-    )
-
-    # used to convert kwargs to metadata/constraints,
-    # None has a special meaning - these items are collected into a `PydanticGeneralMetadata`
-    metadata_lookup: ClassVar[dict[str, typing.Callable[[Any], Any] | None]] = {
-        'strict': types.Strict,
-        'gt': annotated_types.Gt,
-        'ge': annotated_types.Ge,
-        'lt': annotated_types.Lt,
-        'le': annotated_types.Le,
-        'multiple_of': annotated_types.MultipleOf,
-        'min_length': annotated_types.MinLen,
-        'max_length': annotated_types.MaxLen,
-        'pattern': None,
-        'allow_inf_nan': None,
-        'max_digits': None,
-        'decimal_places': None,
-        'union_mode': None,
-    }
-
-    def __init__(self, **kwargs: Unpack[_FieldInfoInputs]) -> None:
-        """This class should generally not be initialized directly; instead, use the `pydantic.fields.Field` function
-        or one of the constructor classmethods.
-
-        See the signature of `pydantic.fields.Field` for more details about the expected arguments.
-        """
-        self._attributes_set = {k: v for k, v in kwargs.items() if v is not _Unset}
-        kwargs = {k: _DefaultValues.get(k) if v is _Unset else v for k, v in kwargs.items()}  # type: ignore
-        self.annotation, annotation_metadata = self._extract_metadata(kwargs.get('annotation'))
-
-        default = kwargs.pop('default', PydanticUndefined)
-        if default is Ellipsis:
-            self.default = PydanticUndefined
-        else:
-            self.default = default
-
-        self.default_factory = kwargs.pop('default_factory', None)
-
-        if self.default is not PydanticUndefined and self.default_factory is not None:
-            raise TypeError('cannot specify both default and default_factory')
-
-        self.title = kwargs.pop('title', None)
-        self.alias = kwargs.pop('alias', None)
-        self.validation_alias = kwargs.pop('validation_alias', None)
-        self.serialization_alias = kwargs.pop('serialization_alias', None)
-        alias_is_set = any(alias is not None for alias in (self.alias, self.validation_alias, self.serialization_alias))
-        self.alias_priority = kwargs.pop('alias_priority', None) or 2 if alias_is_set else None
-        self.description = kwargs.pop('description', None)
-        self.examples = kwargs.pop('examples', None)
-        self.exclude = kwargs.pop('exclude', None)
-        self.discriminator = kwargs.pop('discriminator', None)
-        self.repr = kwargs.pop('repr', True)
-        self.json_schema_extra = kwargs.pop('json_schema_extra', None)
-        self.validate_default = kwargs.pop('validate_default', None)
-        self.frozen = kwargs.pop('frozen', None)
-        # currently only used on dataclasses
-        self.init = kwargs.pop('init', None)
-        self.init_var = kwargs.pop('init_var', None)
-        self.kw_only = kwargs.pop('kw_only', None)
-
-        self.metadata = self._collect_metadata(kwargs) + annotation_metadata  # type: ignore
-
-    @staticmethod
-    def from_field(default: Any = PydanticUndefined, **kwargs: Unpack[_FromFieldInfoInputs]) -> FieldInfo:
-        """Create a new `FieldInfo` object with the `Field` function.
-
-        Args:
-            default: The default value for the field. Defaults to Undefined.
-            **kwargs: Additional arguments dictionary.
-
-        Raises:
-            TypeError: If 'annotation' is passed as a keyword argument.
-
-        Returns:
-            A new FieldInfo object with the given parameters.
-
-        Example:
-            This is how you can create a field with default value like this:
-
-            ```python
-            import pydantic
-
-            class MyModel(pydantic.BaseModel):
-                foo: int = pydantic.Field(4)
-            ```
-        """
-        if 'annotation' in kwargs:
-            raise TypeError('"annotation" is not permitted as a Field keyword argument')
-        return FieldInfo(default=default, **kwargs)
-
-    @staticmethod
-    def from_annotation(annotation: type[Any]) -> FieldInfo:
-        """Creates a `FieldInfo` instance from a bare annotation.
-
-        This function is used internally to create a `FieldInfo` from a bare annotation like this:
-
-        ```python
-        import pydantic
-
-        class MyModel(pydantic.BaseModel):
-            foo: int  # <-- like this
-        ```
-
-        We also account for the case where the annotation can be an instance of `Annotated` and where
-        one of the (not first) arguments in `Annotated` is an instance of `FieldInfo`, e.g.:
-
-        ```python
-        import annotated_types
-        from typing_extensions import Annotated
-
-        import pydantic
-
-        class MyModel(pydantic.BaseModel):
-            foo: Annotated[int, annotated_types.Gt(42)]
-            bar: Annotated[int, pydantic.Field(gt=42)]
-        ```
-
-        Args:
-            annotation: An annotation object.
-
-        Returns:
-            An instance of the field metadata.
-        """
-        final = False
-        if _typing_extra.is_finalvar(annotation):
-            final = True
-            if annotation is not typing_extensions.Final:
-                annotation = typing_extensions.get_args(annotation)[0]
-
-        if _typing_extra.is_annotated(annotation):
-            first_arg, *extra_args = typing_extensions.get_args(annotation)
-            if _typing_extra.is_finalvar(first_arg):
-                final = True
-            field_info_annotations = [a for a in extra_args if isinstance(a, FieldInfo)]
-            field_info = FieldInfo.merge_field_infos(*field_info_annotations, annotation=first_arg)
-            if field_info:
-                new_field_info = copy(field_info)
-                new_field_info.annotation = first_arg
-                new_field_info.frozen = final or field_info.frozen
-                metadata: list[Any] = []
-                for a in extra_args:
-                    if not isinstance(a, FieldInfo):
-                        metadata.append(a)
-                    else:
-                        metadata.extend(a.metadata)
-                new_field_info.metadata = metadata
-                return new_field_info
-
-        return FieldInfo(annotation=annotation, frozen=final or None)
-
-    @staticmethod
-    def from_annotated_attribute(annotation: type[Any], default: Any) -> FieldInfo:
-        """Create `FieldInfo` from an annotation with a default value.
-
-        This is used in cases like the following:
-
-        ```python
-        import annotated_types
-        from typing_extensions import Annotated
-
-        import pydantic
-
-        class MyModel(pydantic.BaseModel):
-            foo: int = 4  # <-- like this
-            bar: Annotated[int, annotated_types.Gt(4)] = 4  # <-- or this
-            spam: Annotated[int, pydantic.Field(gt=4)] = 4  # <-- or this
-        ```
-
-        Args:
-            annotation: The type annotation of the field.
-            default: The default value of the field.
-
-        Returns:
-            A field object with the passed values.
-        """
-        if annotation is default:
-            raise PydanticUserError(
-                'Error when building FieldInfo from annotated attribute. '
-                "Make sure you don't have any field name clashing with a type annotation ",
-                code='unevaluable-type-annotation',
-            )
-
-        final = False
-        if _typing_extra.is_finalvar(annotation):
-            final = True
-            if annotation is not typing_extensions.Final:
-                annotation = typing_extensions.get_args(annotation)[0]
-
-        if isinstance(default, FieldInfo):
-            default.annotation, annotation_metadata = FieldInfo._extract_metadata(annotation)
-            default.metadata += annotation_metadata
-            default = default.merge_field_infos(
-                *[x for x in annotation_metadata if isinstance(x, FieldInfo)], default, annotation=default.annotation
-            )
-            default.frozen = final or default.frozen
-            return default
-        elif isinstance(default, dataclasses.Field):
-            init_var = False
-            if annotation is dataclasses.InitVar:
-                init_var = True
-                annotation = Any
-            elif isinstance(annotation, dataclasses.InitVar):
-                init_var = True
-                annotation = annotation.type
-            pydantic_field = FieldInfo._from_dataclass_field(default)
-            pydantic_field.annotation, annotation_metadata = FieldInfo._extract_metadata(annotation)
-            pydantic_field.metadata += annotation_metadata
-            pydantic_field = pydantic_field.merge_field_infos(
-                *[x for x in annotation_metadata if isinstance(x, FieldInfo)],
-                pydantic_field,
-                annotation=pydantic_field.annotation,
-            )
-            pydantic_field.frozen = final or pydantic_field.frozen
-            pydantic_field.init_var = init_var
-            pydantic_field.init = getattr(default, 'init', None)
-            pydantic_field.kw_only = getattr(default, 'kw_only', None)
-            return pydantic_field
-        else:
-            if _typing_extra.is_annotated(annotation):
-                first_arg, *extra_args = typing_extensions.get_args(annotation)
-                field_infos = [a for a in extra_args if isinstance(a, FieldInfo)]
-                field_info = FieldInfo.merge_field_infos(*field_infos, annotation=first_arg, default=default)
-                metadata: list[Any] = []
-                for a in extra_args:
-                    if not isinstance(a, FieldInfo):
-                        metadata.append(a)
-                    else:
-                        metadata.extend(a.metadata)
-                field_info.metadata = metadata
-                return field_info
-
-            return FieldInfo(annotation=annotation, default=default, frozen=final or None)
-
-    @staticmethod
-    def merge_field_infos(*field_infos: FieldInfo, **overrides: Any) -> FieldInfo:
-        """Merge `FieldInfo` instances keeping only explicitly set attributes.
-
-        Later `FieldInfo` instances override earlier ones.
-
-        Returns:
-            FieldInfo: A merged FieldInfo instance.
-        """
-        flattened_field_infos: list[FieldInfo] = []
-        for field_info in field_infos:
-            flattened_field_infos.extend(x for x in field_info.metadata if isinstance(x, FieldInfo))
-            flattened_field_infos.append(field_info)
-        field_infos = tuple(flattened_field_infos)
-        if len(field_infos) == 1:
-            # No merging necessary, but we still need to make a copy and apply the overrides
-            field_info = copy(field_infos[0])
-            field_info._attributes_set.update(overrides)
-            for k, v in overrides.items():
-                setattr(field_info, k, v)
-            return field_info  # type: ignore
-
-        new_kwargs: dict[str, Any] = {}
-        metadata = {}
-        for field_info in field_infos:
-            new_kwargs.update(field_info._attributes_set)
-            for x in field_info.metadata:
-                if not isinstance(x, FieldInfo):
-                    metadata[type(x)] = x
-        new_kwargs.update(overrides)
-        field_info = FieldInfo(**new_kwargs)
-        field_info.metadata = list(metadata.values())
-        return field_info
-
-    @staticmethod
-    def _from_dataclass_field(dc_field: DataclassField[Any]) -> FieldInfo:
-        """Return a new `FieldInfo` instance from a `dataclasses.Field` instance.
-
-        Args:
-            dc_field: The `dataclasses.Field` instance to convert.
-
-        Returns:
-            The corresponding `FieldInfo` instance.
-
-        Raises:
-            TypeError: If any of the `FieldInfo` kwargs does not match the `dataclass.Field` kwargs.
-        """
-        default = dc_field.default
-        if default is dataclasses.MISSING:
-            default = PydanticUndefined
-
-        if dc_field.default_factory is dataclasses.MISSING:
-            default_factory: typing.Callable[[], Any] | None = None
-        else:
-            default_factory = dc_field.default_factory
-
-        # use the `Field` function so in correct kwargs raise the correct `TypeError`
-        dc_field_metadata = {k: v for k, v in dc_field.metadata.items() if k in _FIELD_ARG_NAMES}
-        return Field(default=default, default_factory=default_factory, repr=dc_field.repr, **dc_field_metadata)
-
-    @staticmethod
-    def _extract_metadata(annotation: type[Any] | None) -> tuple[type[Any] | None, list[Any]]:
-        """Tries to extract metadata/constraints from an annotation if it uses `Annotated`.
-
-        Args:
-            annotation: The type hint annotation for which metadata has to be extracted.
-
-        Returns:
-            A tuple containing the extracted metadata type and the list of extra arguments.
-        """
-        if annotation is not None:
-            if _typing_extra.is_annotated(annotation):
-                first_arg, *extra_args = typing_extensions.get_args(annotation)
-                return first_arg, list(extra_args)
-
-        return annotation, []
-
-    @staticmethod
-    def _collect_metadata(kwargs: dict[str, Any]) -> list[Any]:
-        """Collect annotations from kwargs.
-
-        Args:
-            kwargs: Keyword arguments passed to the function.
-
-        Returns:
-            A list of metadata objects - a combination of `annotated_types.BaseMetadata` and
-                `PydanticMetadata`.
-        """
-        metadata: list[Any] = []
-        general_metadata = {}
-        for key, value in list(kwargs.items()):
-            try:
-                marker = FieldInfo.metadata_lookup[key]
-            except KeyError:
-                continue
-
-            del kwargs[key]
-            if value is not None:
-                if marker is None:
-                    general_metadata[key] = value
-                else:
-                    metadata.append(marker(value))
-        if general_metadata:
-            metadata.append(_fields.pydantic_general_metadata(**general_metadata))
-        return metadata
-
-    def get_default(self, *, call_default_factory: bool = False) -> Any:
-        """Get the default value.
-
-        We expose an option for whether to call the default_factory (if present), as calling it may
-        result in side effects that we want to avoid. However, there are times when it really should
-        be called (namely, when instantiating a model via `model_construct`).
-
-        Args:
-            call_default_factory: Whether to call the default_factory or not. Defaults to `False`.
-
-        Returns:
-            The default value, calling the default factory if requested or `None` if not set.
-        """
-        if self.default_factory is None:
-            return _utils.smart_deepcopy(self.default)
-        elif call_default_factory:
-            return self.default_factory()
-        else:
-            return None
-
-    def is_required(self) -> bool:
-        """Check if the field is required (i.e., does not have a default value or factory).
-
-        Returns:
-            `True` if the field is required, `False` otherwise.
-        """
-        return self.default is PydanticUndefined and self.default_factory is None
-
-    def rebuild_annotation(self) -> Any:
-        """Attempts to rebuild the original annotation for use in function signatures.
-
-        If metadata is present, it adds it to the original annotation using
-        `Annotated`. Otherwise, it returns the original annotation as-is.
-
-        Note that because the metadata has been flattened, the original annotation
-        may not be reconstructed exactly as originally provided, e.g. if the original
-        type had unrecognized annotations, or was annotated with a call to `pydantic.Field`.
-
-        Returns:
-            The rebuilt annotation.
-        """
-        if not self.metadata:
-            return self.annotation
-        else:
-            # Annotated arguments must be a tuple
-            return typing_extensions.Annotated[(self.annotation, *self.metadata)]  # type: ignore
-
-    def apply_typevars_map(self, typevars_map: dict[Any, Any] | None, types_namespace: dict[str, Any] | None) -> None:
-        """Apply a `typevars_map` to the annotation.
-
-        This method is used when analyzing parametrized generic types to replace typevars with their concrete types.
-
-        This method applies the `typevars_map` to the annotation in place.
-
-        Args:
-            typevars_map: A dictionary mapping type variables to their concrete types.
-            types_namespace (dict | None): A dictionary containing related types to the annotated type.
-
-        See Also:
-            pydantic._internal._generics.replace_types is used for replacing the typevars with
-                their concrete types.
-        """
-        annotation = _typing_extra.eval_type_lenient(self.annotation, types_namespace)
-        self.annotation = _generics.replace_types(annotation, typevars_map)
-
-    def __repr_args__(self) -> ReprArgs:
-        yield 'annotation', _repr.PlainRepr(_repr.display_as_type(self.annotation))
-        yield 'required', self.is_required()
-
-        for s in self.__slots__:
-            if s == '_attributes_set':
-                continue
-            if s == 'annotation':
-                continue
-            elif s == 'metadata' and not self.metadata:
-                continue
-            elif s == 'repr' and self.repr is True:
-                continue
-            if s == 'frozen' and self.frozen is False:
-                continue
-            if s == 'validation_alias' and self.validation_alias == self.alias:
-                continue
-            if s == 'serialization_alias' and self.serialization_alias == self.alias:
-                continue
-            if s == 'default_factory' and self.default_factory is not None:
-                yield 'default_factory', _repr.PlainRepr(_repr.display_as_type(self.default_factory))
-            else:
-                value = getattr(self, s)
-                if value is not None and value is not PydanticUndefined:
-                    yield s, value
-
-
-class _EmptyKwargs(typing_extensions.TypedDict):
-    """This class exists solely to ensure that type checking warns about passing `**extra` in `Field`."""
-
-
-_DefaultValues = dict(
-    default=...,
-    default_factory=None,
-    alias=None,
-    alias_priority=None,
-    validation_alias=None,
-    serialization_alias=None,
-    title=None,
-    description=None,
-    examples=None,
-    exclude=None,
-    discriminator=None,
-    json_schema_extra=None,
-    frozen=None,
-    validate_default=None,
-    repr=True,
-    init=None,
-    init_var=None,
-    kw_only=None,
-    pattern=None,
-    strict=None,
-    gt=None,
-    ge=None,
-    lt=None,
-    le=None,
-    multiple_of=None,
-    allow_inf_nan=None,
-    max_digits=None,
-    decimal_places=None,
-    min_length=None,
-    max_length=None,
-)
-
-
-def Field(  # noqa: C901
-    default: Any = PydanticUndefined,
-    *,
-    default_factory: typing.Callable[[], Any] | None = _Unset,
-    alias: str | None = _Unset,
-    alias_priority: int | None = _Unset,
-    validation_alias: str | AliasPath | AliasChoices | None = _Unset,
-    serialization_alias: str | None = _Unset,
-    title: str | None = _Unset,
-    description: str | None = _Unset,
-    examples: list[Any] | None = _Unset,
-    exclude: bool | None = _Unset,
-    discriminator: str | types.Discriminator | None = _Unset,
-    json_schema_extra: JsonDict | typing.Callable[[JsonDict], None] | None = _Unset,
-    frozen: bool | None = _Unset,
-    validate_default: bool | None = _Unset,
-    repr: bool = _Unset,
-    init: bool | None = _Unset,
-    init_var: bool | None = _Unset,
-    kw_only: bool | None = _Unset,
-    pattern: str | None = _Unset,
-    strict: bool | None = _Unset,
-    gt: float | None = _Unset,
-    ge: float | None = _Unset,
-    lt: float | None = _Unset,
-    le: float | None = _Unset,
-    multiple_of: float | None = _Unset,
-    allow_inf_nan: bool | None = _Unset,
-    max_digits: int | None = _Unset,
-    decimal_places: int | None = _Unset,
-    min_length: int | None = _Unset,
-    max_length: int | None = _Unset,
-    union_mode: Literal['smart', 'left_to_right'] = _Unset,
-    **extra: Unpack[_EmptyKwargs],
-) -> Any:
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/fields
-
-    Create a field for objects that can be configured.
-
-    Used to provide extra information about a field, either for the model schema or complex validation. Some arguments
-    apply only to number fields (`int`, `float`, `Decimal`) and some apply only to `str`.
-
-    Note:
-        - Any `_Unset` objects will be replaced by the corresponding value defined in the `_DefaultValues` dictionary. If a key for the `_Unset` object is not found in the `_DefaultValues` dictionary, it will default to `None`
-
-    Args:
-        default: Default value if the field is not set.
-        default_factory: A callable to generate the default value, such as :func:`~datetime.utcnow`.
-        alias: The name to use for the attribute when validating or serializing by alias.
-            This is often used for things like converting between snake and camel case.
-        alias_priority: Priority of the alias. This affects whether an alias generator is used.
-        validation_alias: Like `alias`, but only affects validation, not serialization.
-        serialization_alias: Like `alias`, but only affects serialization, not validation.
-        title: Human-readable title.
-        description: Human-readable description.
-        examples: Example values for this field.
-        exclude: Whether to exclude the field from the model serialization.
-        discriminator: Field name or Discriminator for discriminating the type in a tagged union.
-        json_schema_extra: A dict or callable to provide extra JSON schema properties.
-        frozen: Whether the field is frozen. If true, attempts to change the value on an instance will raise an error.
-        validate_default: If `True`, apply validation to the default value every time you create an instance.
-            Otherwise, for performance reasons, the default value of the field is trusted and not validated.
-        repr: A boolean indicating whether to include the field in the `__repr__` output.
-        init: Whether the field should be included in the constructor of the dataclass.
-            (Only applies to dataclasses.)
-        init_var: Whether the field should _only_ be included in the constructor of the dataclass.
-            (Only applies to dataclasses.)
-        kw_only: Whether the field should be a keyword-only argument in the constructor of the dataclass.
-            (Only applies to dataclasses.)
-        strict: If `True`, strict validation is applied to the field.
-            See [Strict Mode](../concepts/strict_mode.md) for details.
-        gt: Greater than. If set, value must be greater than this. Only applicable to numbers.
-        ge: Greater than or equal. If set, value must be greater than or equal to this. Only applicable to numbers.
-        lt: Less than. If set, value must be less than this. Only applicable to numbers.
-        le: Less than or equal. If set, value must be less than or equal to this. Only applicable to numbers.
-        multiple_of: Value must be a multiple of this. Only applicable to numbers.
-        min_length: Minimum length for strings.
-        max_length: Maximum length for strings.
-        pattern: Pattern for strings (a regular expression).
-        allow_inf_nan: Allow `inf`, `-inf`, `nan`. Only applicable to numbers.
-        max_digits: Maximum number of allow digits for strings.
-        decimal_places: Maximum number of decimal places allowed for numbers.
-        union_mode: The strategy to apply when validating a union. Can be `smart` (the default), or `left_to_right`.
-            See [Union Mode](standard_library_types.md#union-mode) for details.
-        extra: (Deprecated) Extra fields that will be included in the JSON schema.
-
-            !!! warning Deprecated
-                The `extra` kwargs is deprecated. Use `json_schema_extra` instead.
-
-    Returns:
-        A new [`FieldInfo`][pydantic.fields.FieldInfo]. The return annotation is `Any` so `Field` can be used on
-            type-annotated fields without causing a type error.
-    """
-    # Check deprecated and removed params from V1. This logic should eventually be removed.
-    const = extra.pop('const', None)  # type: ignore
-    if const is not None:
-        raise PydanticUserError('`const` is removed, use `Literal` instead', code='removed-kwargs')
-
-    min_items = extra.pop('min_items', None)  # type: ignore
-    if min_items is not None:
-        warn('`min_items` is deprecated and will be removed, use `min_length` instead', DeprecationWarning)
-        if min_length in (None, _Unset):
-            min_length = min_items  # type: ignore
-
-    max_items = extra.pop('max_items', None)  # type: ignore
-    if max_items is not None:
-        warn('`max_items` is deprecated and will be removed, use `max_length` instead', DeprecationWarning)
-        if max_length in (None, _Unset):
-            max_length = max_items  # type: ignore
-
-    unique_items = extra.pop('unique_items', None)  # type: ignore
-    if unique_items is not None:
-        raise PydanticUserError(
-            (
-                '`unique_items` is removed, use `Set` instead'
-                '(this feature is discussed in https://github.com/pydantic/pydantic-core/issues/296)'
-            ),
-            code='removed-kwargs',
-        )
-
-    allow_mutation = extra.pop('allow_mutation', None)  # type: ignore
-    if allow_mutation is not None:
-        warn('`allow_mutation` is deprecated and will be removed. use `frozen` instead', DeprecationWarning)
-        if allow_mutation is False:
-            frozen = True
-
-    regex = extra.pop('regex', None)  # type: ignore
-    if regex is not None:
-        raise PydanticUserError('`regex` is removed. use `pattern` instead', code='removed-kwargs')
-
-    if extra:
-        warn(
-            'Using extra keyword arguments on `Field` is deprecated and will be removed.'
-            ' Use `json_schema_extra` instead.'
-            f' (Extra keys: {", ".join(k.__repr__() for k in extra.keys())})',
-            DeprecationWarning,
-        )
-        if not json_schema_extra or json_schema_extra is _Unset:
-            json_schema_extra = extra  # type: ignore
-
-    if (
-        validation_alias
-        and validation_alias is not _Unset
-        and not isinstance(validation_alias, (str, AliasChoices, AliasPath))
-    ):
-        raise TypeError('Invalid `validation_alias` type. it should be `str`, `AliasChoices`, or `AliasPath`')
-
-    if serialization_alias in (_Unset, None) and isinstance(alias, str):
-        serialization_alias = alias
-
-    if validation_alias in (_Unset, None):
-        validation_alias = alias
-
-    include = extra.pop('include', None)  # type: ignore
-    if include is not None:
-        warn('`include` is deprecated and does nothing. It will be removed, use `exclude` instead', DeprecationWarning)
-
-    return FieldInfo.from_field(
-        default,
-        default_factory=default_factory,
-        alias=alias,
-        alias_priority=alias_priority,
-        validation_alias=validation_alias,
-        serialization_alias=serialization_alias,
-        title=title,
-        description=description,
-        examples=examples,
-        exclude=exclude,
-        discriminator=discriminator,
-        json_schema_extra=json_schema_extra,
-        frozen=frozen,
-        pattern=pattern,
-        validate_default=validate_default,
-        repr=repr,
-        init=init,
-        init_var=init_var,
-        kw_only=kw_only,
-        strict=strict,
-        gt=gt,
-        ge=ge,
-        lt=lt,
-        le=le,
-        multiple_of=multiple_of,
-        min_length=min_length,
-        max_length=max_length,
-        allow_inf_nan=allow_inf_nan,
-        max_digits=max_digits,
-        decimal_places=decimal_places,
-        union_mode=union_mode,
-    )
-
-
-_FIELD_ARG_NAMES = set(inspect.signature(Field).parameters)
-_FIELD_ARG_NAMES.remove('extra')  # do not include the varkwargs parameter
-
-
-class ModelPrivateAttr(_repr.Representation):
-    """A descriptor for private attributes in class models.
-
-    !!! warning
-        You generally shouldn't be creating `ModelPrivateAttr` instances directly, instead use
-        `pydantic.fields.PrivateAttr`. (This is similar to `FieldInfo` vs. `Field`.)
-
-    Attributes:
-        default: The default value of the attribute if not provided.
-        default_factory: A callable function that generates the default value of the
-            attribute if not provided.
-    """
-
-    __slots__ = 'default', 'default_factory'
-
-    def __init__(
-        self, default: Any = PydanticUndefined, *, default_factory: typing.Callable[[], Any] | None = None
-    ) -> None:
-        self.default = default
-        self.default_factory = default_factory
-
-    if not typing.TYPE_CHECKING:
-        # We put `__getattr__` in a non-TYPE_CHECKING block because otherwise, mypy allows arbitrary attribute access
-
-        def __getattr__(self, item: str) -> Any:
-            """This function improves compatibility with custom descriptors by ensuring delegation happens
-            as expected when the default value of a private attribute is a descriptor.
-            """
-            if item in {'__get__', '__set__', '__delete__'}:
-                if hasattr(self.default, item):
-                    return getattr(self.default, item)
-            raise AttributeError(f'{type(self).__name__!r} object has no attribute {item!r}')
-
-    def __set_name__(self, cls: type[Any], name: str) -> None:
-        """Preserve `__set_name__` protocol defined in https://peps.python.org/pep-0487."""
-        if self.default is PydanticUndefined:
-            return
-        if not hasattr(self.default, '__set_name__'):
-            return
-        set_name = self.default.__set_name__
-        if callable(set_name):
-            set_name(cls, name)
-
-    def get_default(self) -> Any:
-        """Retrieve the default value of the object.
-
-        If `self.default_factory` is `None`, the method will return a deep copy of the `self.default` object.
-
-        If `self.default_factory` is not `None`, it will call `self.default_factory` and return the value returned.
-
-        Returns:
-            The default value of the object.
-        """
-        return _utils.smart_deepcopy(self.default) if self.default_factory is None else self.default_factory()
-
-    def __eq__(self, other: Any) -> bool:
-        return isinstance(other, self.__class__) and (self.default, self.default_factory) == (
-            other.default,
-            other.default_factory,
-        )
-
-
-def PrivateAttr(
-    default: Any = PydanticUndefined,
-    *,
-    default_factory: typing.Callable[[], Any] | None = None,
-) -> Any:
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/models/#private-model-attributes
-
-    Indicates that an attribute is intended for private use and not handled during normal validation/serialization.
-
-    Private attributes are not validated by Pydantic, so it's up to you to ensure they are used in a type-safe manner.
-
-    Private attributes are stored in `__private_attributes__` on the model.
-
-    Args:
-        default: The attribute's default value. Defaults to Undefined.
-        default_factory: Callable that will be
-            called when a default value is needed for this attribute.
-            If both `default` and `default_factory` are set, an error will be raised.
-
-    Returns:
-        An instance of [`ModelPrivateAttr`][pydantic.fields.ModelPrivateAttr] class.
-
-    Raises:
-        ValueError: If both `default` and `default_factory` are set.
-    """
-    if default is not PydanticUndefined and default_factory is not None:
-        raise TypeError('cannot specify both default and default_factory')
-
-    return ModelPrivateAttr(
-        default,
-        default_factory=default_factory,
-    )
-
-
-@dataclasses.dataclass(**_internal_dataclass.slots_true)
-class ComputedFieldInfo:
-    """A container for data from `@computed_field` so that we can access it while building the pydantic-core schema.
-
-    Attributes:
-        decorator_repr: A class variable representing the decorator string, '@computed_field'.
-        wrapped_property: The wrapped computed field property.
-        return_type: The type of the computed field property's return value.
-        alias: The alias of the property to be used during serialization.
-        alias_priority: The priority of the alias. This affects whether an alias generator is used.
-        title: Title of the computed field to include in the serialization JSON schema.
-        description: Description of the computed field to include in the serialization JSON schema.
-        examples: Example values of the computed field to include in the serialization JSON schema.
-        json_schema_extra: A dict or callable to provide extra JSON schema properties.
-        repr: A boolean indicating whether to include the field in the __repr__ output.
-    """
-
-    decorator_repr: ClassVar[str] = '@computed_field'
-    wrapped_property: property
-    return_type: Any
-    alias: str | None
-    alias_priority: int | None
-    title: str | None
-    description: str | None
-    examples: list[Any] | None
-    json_schema_extra: JsonDict | typing.Callable[[JsonDict], None] | None
-    repr: bool
-
-
-def _wrapped_property_is_private(property_: cached_property | property) -> bool:  # type: ignore
-    """Returns true if provided property is private, False otherwise."""
-    wrapped_name: str = ''
-
-    if isinstance(property_, property):
-        wrapped_name = getattr(property_.fget, '__name__', '')
-    elif isinstance(property_, cached_property):  # type: ignore
-        wrapped_name = getattr(property_.func, '__name__', '')  # type: ignore
-
-    return wrapped_name.startswith('_') and not wrapped_name.startswith('__')
-
-
-# this should really be `property[T], cached_property[T]` but property is not generic unlike cached_property
-# See https://github.com/python/typing/issues/985 and linked issues
-PropertyT = typing.TypeVar('PropertyT')
-
-
-@typing.overload
-def computed_field(
-    *,
-    alias: str | None = None,
-    alias_priority: int | None = None,
-    title: str | None = None,
-    description: str | None = None,
-    examples: list[Any] | None = None,
-    json_schema_extra: JsonDict | typing.Callable[[JsonDict], None] | None = None,
-    repr: bool = True,
-    return_type: Any = PydanticUndefined,
-) -> typing.Callable[[PropertyT], PropertyT]:
-    ...
-
-
-@typing.overload
-def computed_field(__func: PropertyT) -> PropertyT:
-    ...
-
-
-def computed_field(
-    __f: PropertyT | None = None,
-    *,
-    alias: str | None = None,
-    alias_priority: int | None = None,
-    title: str | None = None,
-    description: str | None = None,
-    examples: list[Any] | None = None,
-    json_schema_extra: JsonDict | typing.Callable[[JsonDict], None] | None = None,
-    repr: bool | None = None,
-    return_type: Any = PydanticUndefined,
-) -> PropertyT | typing.Callable[[PropertyT], PropertyT]:
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/fields#the-computed_field-decorator
-
-    Decorator to include `property` and `cached_property` when serializing models or dataclasses.
-
-    This is useful for fields that are computed from other fields, or for fields that are expensive to compute and should be cached.
-
-    ```py
-    from pydantic import BaseModel, computed_field
-
-    class Rectangle(BaseModel):
-        width: int
-        length: int
-
-        @computed_field
-        @property
-        def area(self) -> int:
-            return self.width * self.length
-
-    print(Rectangle(width=3, length=2).model_dump())
-    #> {'width': 3, 'length': 2, 'area': 6}
-    ```
-
-    If applied to functions not yet decorated with `@property` or `@cached_property`, the function is
-    automatically wrapped with `property`. Although this is more concise, you will lose IntelliSense in your IDE,
-    and confuse static type checkers, thus explicit use of `@property` is recommended.
-
-    !!! warning "Mypy Warning"
-        Even with the `@property` or `@cached_property` applied to your function before `@computed_field`,
-        mypy may throw a `Decorated property not supported` error.
-        See [mypy issue #1362](https://github.com/python/mypy/issues/1362), for more information.
-        To avoid this error message, add `# type: ignore[misc]` to the `@computed_field` line.
-
-        [pyright](https://github.com/microsoft/pyright) supports `@computed_field` without error.
-
-    ```py
-    import random
-
-    from pydantic import BaseModel, computed_field
-
-    class Square(BaseModel):
-        width: float
-
-        @computed_field
-        def area(self) -> float:  # converted to a `property` by `computed_field`
-            return round(self.width**2, 2)
-
-        @area.setter
-        def area(self, new_area: float) -> None:
-            self.width = new_area**0.5
-
-        @computed_field(alias='the magic number', repr=False)
-        def random_number(self) -> int:
-            return random.randint(0, 1_000)
-
-    square = Square(width=1.3)
-
-    # `random_number` does not appear in representation
-    print(repr(square))
-    #> Square(width=1.3, area=1.69)
-
-    print(square.random_number)
-    #> 3
-
-    square.area = 4
-
-    print(square.model_dump_json(by_alias=True))
-    #> {"width":2.0,"area":4.0,"the magic number":3}
-    ```
-
-    !!! warning "Overriding with `computed_field`"
-        You can't override a field from a parent class with a `computed_field` in the child class.
-        `mypy` complains about this behavior if allowed, and `dataclasses` doesn't allow this pattern either.
-        See the example below:
-
-    ```py
-    from pydantic import BaseModel, computed_field
-
-    class Parent(BaseModel):
-        a: str
-
-    try:
-
-        class Child(Parent):
-            @computed_field
-            @property
-            def a(self) -> str:
-                return 'new a'
-
-    except ValueError as e:
-        print(repr(e))
-        #> ValueError("you can't override a field with a computed field")
-    ```
-
-    Private properties decorated with `@computed_field` have `repr=False` by default.
-
-    ```py
-    from functools import cached_property
-
-    from pydantic import BaseModel, computed_field
-
-    class Model(BaseModel):
-        foo: int
-
-        @computed_field
-        @cached_property
-        def _private_cached_property(self) -> int:
-            return -self.foo
-
-        @computed_field
-        @property
-        def _private_property(self) -> int:
-            return -self.foo
-
-    m = Model(foo=1)
-    print(repr(m))
-    #> M(foo=1)
-    ```
-
-    Args:
-        __f: the function to wrap.
-        alias: alias to use when serializing this computed field, only used when `by_alias=True`
-        alias_priority: priority of the alias. This affects whether an alias generator is used
-        title: Title to use when including this computed field in JSON Schema
-        description: Description to use when including this computed field in JSON Schema, defaults to the function's
-            docstring
-        examples: Example values to use when including this computed field in JSON Schema
-        json_schema_extra: A dict or callable to provide extra JSON schema properties.
-        repr: whether to include this computed field in model repr.
-            Default is `False` for private properties and `True` for public properties.
-        return_type: optional return for serialization logic to expect when serializing to JSON, if included
-            this must be correct, otherwise a `TypeError` is raised.
-            If you don't include a return type Any is used, which does runtime introspection to handle arbitrary
-            objects.
-
-    Returns:
-        A proxy wrapper for the property.
-    """
-
-    def dec(f: Any) -> Any:
-        nonlocal description, return_type, alias_priority
-        unwrapped = _decorators.unwrap_wrapped_function(f)
-        if description is None and unwrapped.__doc__:
-            description = inspect.cleandoc(unwrapped.__doc__)
-
-        # if the function isn't already decorated with `@property` (or another descriptor), then we wrap it now
-        f = _decorators.ensure_property(f)
-        alias_priority = (alias_priority or 2) if alias is not None else None
-
-        if repr is None:
-            repr_: bool = False if _wrapped_property_is_private(property_=f) else True
-        else:
-            repr_ = repr
-
-        dec_info = ComputedFieldInfo(
-            f, return_type, alias, alias_priority, title, description, examples, json_schema_extra, repr_
-        )
-        return _decorators.PydanticDescriptorProxy(f, dec_info)
-
-    if __f is None:
-        return dec
-    else:
-        return dec(__f)
diff --git a/lib/pydantic/functional_serializers.py b/lib/pydantic/functional_serializers.py
deleted file mode 100644
index 6e31bf67..00000000
--- a/lib/pydantic/functional_serializers.py
+++ /dev/null
@@ -1,395 +0,0 @@
-"""This module contains related classes and functions for serialization."""
-from __future__ import annotations
-
-import dataclasses
-from functools import partialmethod
-from typing import TYPE_CHECKING, Any, Callable, TypeVar, Union, overload
-
-from pydantic_core import PydanticUndefined, core_schema
-from pydantic_core import core_schema as _core_schema
-from typing_extensions import Annotated, Literal, TypeAlias
-
-from . import PydanticUndefinedAnnotation
-from ._internal import _decorators, _internal_dataclass
-from .annotated_handlers import GetCoreSchemaHandler
-
-
-@dataclasses.dataclass(**_internal_dataclass.slots_true, frozen=True)
-class PlainSerializer:
-    """Plain serializers use a function to modify the output of serialization.
-
-    This is particularly helpful when you want to customize the serialization for annotated types.
-    Consider an input of `list`, which will be serialized into a space-delimited string.
-
-    ```python
-    from typing import List
-
-    from typing_extensions import Annotated
-
-    from pydantic import BaseModel, PlainSerializer
-
-    CustomStr = Annotated[
-        List, PlainSerializer(lambda x: ' '.join(x), return_type=str)
-    ]
-
-    class StudentModel(BaseModel):
-        courses: CustomStr
-
-    student = StudentModel(courses=['Math', 'Chemistry', 'English'])
-    print(student.model_dump())
-    #> {'courses': 'Math Chemistry English'}
-    ```
-
-    Attributes:
-        func: The serializer function.
-        return_type: The return type for the function. If omitted it will be inferred from the type annotation.
-        when_used: Determines when this serializer should be used. Accepts a string with values `'always'`,
-            `'unless-none'`, `'json'`, and `'json-unless-none'`. Defaults to 'always'.
-    """
-
-    func: core_schema.SerializerFunction
-    return_type: Any = PydanticUndefined
-    when_used: Literal['always', 'unless-none', 'json', 'json-unless-none'] = 'always'
-
-    def __get_pydantic_core_schema__(self, source_type: Any, handler: GetCoreSchemaHandler) -> core_schema.CoreSchema:
-        """Gets the Pydantic core schema.
-
-        Args:
-            source_type: The source type.
-            handler: The `GetCoreSchemaHandler` instance.
-
-        Returns:
-            The Pydantic core schema.
-        """
-        schema = handler(source_type)
-        try:
-            return_type = _decorators.get_function_return_type(
-                self.func, self.return_type, handler._get_types_namespace()
-            )
-        except NameError as e:
-            raise PydanticUndefinedAnnotation.from_name_error(e) from e
-        return_schema = None if return_type is PydanticUndefined else handler.generate_schema(return_type)
-        schema['serialization'] = core_schema.plain_serializer_function_ser_schema(
-            function=self.func,
-            info_arg=_decorators.inspect_annotated_serializer(self.func, 'plain'),
-            return_schema=return_schema,
-            when_used=self.when_used,
-        )
-        return schema
-
-
-@dataclasses.dataclass(**_internal_dataclass.slots_true, frozen=True)
-class WrapSerializer:
-    """Wrap serializers receive the raw inputs along with a handler function that applies the standard serialization
-    logic, and can modify the resulting value before returning it as the final output of serialization.
-
-    For example, here's a scenario in which a wrap serializer transforms timezones to UTC **and** utilizes the existing `datetime` serialization logic.
-
-    ```python
-    from datetime import datetime, timezone
-    from typing import Any, Dict
-
-    from typing_extensions import Annotated
-
-    from pydantic import BaseModel, WrapSerializer
-
-    class EventDatetime(BaseModel):
-        start: datetime
-        end: datetime
-
-    def convert_to_utc(value: Any, handler, info) -> Dict[str, datetime]:
-        # Note that `helper` can actually help serialize the `value` for further custom serialization in case it's a subclass.
-        partial_result = handler(value, info)
-        if info.mode == 'json':
-            return {
-                k: datetime.fromisoformat(v).astimezone(timezone.utc)
-                for k, v in partial_result.items()
-            }
-        return {k: v.astimezone(timezone.utc) for k, v in partial_result.items()}
-
-    UTCEventDatetime = Annotated[EventDatetime, WrapSerializer(convert_to_utc)]
-
-    class EventModel(BaseModel):
-        event_datetime: UTCEventDatetime
-
-    dt = EventDatetime(
-        start='2024-01-01T07:00:00-08:00', end='2024-01-03T20:00:00+06:00'
-    )
-    event = EventModel(event_datetime=dt)
-    print(event.model_dump())
-    '''
-    {
-        'event_datetime': {
-            'start': datetime.datetime(
-                2024, 1, 1, 15, 0, tzinfo=datetime.timezone.utc
-            ),
-            'end': datetime.datetime(
-                2024, 1, 3, 14, 0, tzinfo=datetime.timezone.utc
-            ),
-        }
-    }
-    '''
-
-    print(event.model_dump_json())
-    '''
-    {"event_datetime":{"start":"2024-01-01T15:00:00Z","end":"2024-01-03T14:00:00Z"}}
-    '''
-    ```
-
-    Attributes:
-        func: The serializer function to be wrapped.
-        return_type: The return type for the function. If omitted it will be inferred from the type annotation.
-        when_used: Determines when this serializer should be used. Accepts a string with values `'always'`,
-            `'unless-none'`, `'json'`, and `'json-unless-none'`. Defaults to 'always'.
-    """
-
-    func: core_schema.WrapSerializerFunction
-    return_type: Any = PydanticUndefined
-    when_used: Literal['always', 'unless-none', 'json', 'json-unless-none'] = 'always'
-
-    def __get_pydantic_core_schema__(self, source_type: Any, handler: GetCoreSchemaHandler) -> core_schema.CoreSchema:
-        """This method is used to get the Pydantic core schema of the class.
-
-        Args:
-            source_type: Source type.
-            handler: Core schema handler.
-
-        Returns:
-            The generated core schema of the class.
-        """
-        schema = handler(source_type)
-        try:
-            return_type = _decorators.get_function_return_type(
-                self.func, self.return_type, handler._get_types_namespace()
-            )
-        except NameError as e:
-            raise PydanticUndefinedAnnotation.from_name_error(e) from e
-        return_schema = None if return_type is PydanticUndefined else handler.generate_schema(return_type)
-        schema['serialization'] = core_schema.wrap_serializer_function_ser_schema(
-            function=self.func,
-            info_arg=_decorators.inspect_annotated_serializer(self.func, 'wrap'),
-            return_schema=return_schema,
-            when_used=self.when_used,
-        )
-        return schema
-
-
-if TYPE_CHECKING:
-    _PartialClsOrStaticMethod: TypeAlias = Union[classmethod[Any, Any, Any], staticmethod[Any, Any], partialmethod[Any]]
-    _PlainSerializationFunction = Union[_core_schema.SerializerFunction, _PartialClsOrStaticMethod]
-    _WrapSerializationFunction = Union[_core_schema.WrapSerializerFunction, _PartialClsOrStaticMethod]
-    _PlainSerializeMethodType = TypeVar('_PlainSerializeMethodType', bound=_PlainSerializationFunction)
-    _WrapSerializeMethodType = TypeVar('_WrapSerializeMethodType', bound=_WrapSerializationFunction)
-
-
-@overload
-def field_serializer(
-    __field: str,
-    *fields: str,
-    return_type: Any = ...,
-    when_used: Literal['always', 'unless-none', 'json', 'json-unless-none'] = ...,
-    check_fields: bool | None = ...,
-) -> Callable[[_PlainSerializeMethodType], _PlainSerializeMethodType]:
-    ...
-
-
-@overload
-def field_serializer(
-    __field: str,
-    *fields: str,
-    mode: Literal['plain'],
-    return_type: Any = ...,
-    when_used: Literal['always', 'unless-none', 'json', 'json-unless-none'] = ...,
-    check_fields: bool | None = ...,
-) -> Callable[[_PlainSerializeMethodType], _PlainSerializeMethodType]:
-    ...
-
-
-@overload
-def field_serializer(
-    __field: str,
-    *fields: str,
-    mode: Literal['wrap'],
-    return_type: Any = ...,
-    when_used: Literal['always', 'unless-none', 'json', 'json-unless-none'] = ...,
-    check_fields: bool | None = ...,
-) -> Callable[[_WrapSerializeMethodType], _WrapSerializeMethodType]:
-    ...
-
-
-def field_serializer(
-    *fields: str,
-    mode: Literal['plain', 'wrap'] = 'plain',
-    return_type: Any = PydanticUndefined,
-    when_used: Literal['always', 'unless-none', 'json', 'json-unless-none'] = 'always',
-    check_fields: bool | None = None,
-) -> Callable[[Any], Any]:
-    """Decorator that enables custom field serialization.
-
-    In the below example, a field of type `set` is used to mitigate duplication. A `field_serializer` is used to serialize the data as a sorted list.
-
-    ```python
-    from typing import Set
-
-    from pydantic import BaseModel, field_serializer
-
-    class StudentModel(BaseModel):
-        name: str = 'Jane'
-        courses: Set[str]
-
-        @field_serializer('courses', when_used='json')
-        def serialize_courses_in_order(courses: Set[str]):
-            return sorted(courses)
-
-    student = StudentModel(courses={'Math', 'Chemistry', 'English'})
-    print(student.model_dump_json())
-    #> {"name":"Jane","courses":["Chemistry","English","Math"]}
-    ```
-
-    See [Custom serializers](../concepts/serialization.md#custom-serializers) for more information.
-
-    Four signatures are supported:
-
-    - `(self, value: Any, info: FieldSerializationInfo)`
-    - `(self, value: Any, nxt: SerializerFunctionWrapHandler, info: FieldSerializationInfo)`
-    - `(value: Any, info: SerializationInfo)`
-    - `(value: Any, nxt: SerializerFunctionWrapHandler, info: SerializationInfo)`
-
-    Args:
-        fields: Which field(s) the method should be called on.
-        mode: The serialization mode.
-
-            - `plain` means the function will be called instead of the default serialization logic,
-            - `wrap` means the function will be called with an argument to optionally call the
-               default serialization logic.
-        return_type: Optional return type for the function, if omitted it will be inferred from the type annotation.
-        when_used: Determines the serializer will be used for serialization.
-        check_fields: Whether to check that the fields actually exist on the model.
-
-    Returns:
-        The decorator function.
-    """
-
-    def dec(
-        f: Callable[..., Any] | staticmethod[Any, Any] | classmethod[Any, Any, Any],
-    ) -> _decorators.PydanticDescriptorProxy[Any]:
-        dec_info = _decorators.FieldSerializerDecoratorInfo(
-            fields=fields,
-            mode=mode,
-            return_type=return_type,
-            when_used=when_used,
-            check_fields=check_fields,
-        )
-        return _decorators.PydanticDescriptorProxy(f, dec_info)
-
-    return dec
-
-
-FuncType = TypeVar('FuncType', bound=Callable[..., Any])
-
-
-@overload
-def model_serializer(__f: FuncType) -> FuncType:
-    ...
-
-
-@overload
-def model_serializer(
-    *,
-    mode: Literal['plain', 'wrap'] = ...,
-    when_used: Literal['always', 'unless-none', 'json', 'json-unless-none'] = 'always',
-    return_type: Any = ...,
-) -> Callable[[FuncType], FuncType]:
-    ...
-
-
-def model_serializer(
-    __f: Callable[..., Any] | None = None,
-    *,
-    mode: Literal['plain', 'wrap'] = 'plain',
-    when_used: Literal['always', 'unless-none', 'json', 'json-unless-none'] = 'always',
-    return_type: Any = PydanticUndefined,
-) -> Callable[[Any], Any]:
-    """Decorator that enables custom model serialization.
-
-    This is useful when a model need to be serialized in a customized manner, allowing for flexibility beyond just specific fields.
-
-    An example would be to serialize temperature to the same temperature scale, such as degrees Celsius.
-
-    ```python
-    from typing import Literal
-
-    from pydantic import BaseModel, model_serializer
-
-    class TemperatureModel(BaseModel):
-        unit: Literal['C', 'F']
-        value: int
-
-        @model_serializer()
-        def serialize_model(self):
-            if self.unit == 'F':
-                return {'unit': 'C', 'value': int((self.value - 32) / 1.8)}
-            return {'unit': self.unit, 'value': self.value}
-
-    temperature = TemperatureModel(unit='F', value=212)
-    print(temperature.model_dump())
-    #> {'unit': 'C', 'value': 100}
-    ```
-
-    See [Custom serializers](../concepts/serialization.md#custom-serializers) for more information.
-
-    Args:
-        __f: The function to be decorated.
-        mode: The serialization mode.
-
-            - `'plain'` means the function will be called instead of the default serialization logic
-            - `'wrap'` means the function will be called with an argument to optionally call the default
-                serialization logic.
-        when_used: Determines when this serializer should be used.
-        return_type: The return type for the function. If omitted it will be inferred from the type annotation.
-
-    Returns:
-        The decorator function.
-    """
-
-    def dec(f: Callable[..., Any]) -> _decorators.PydanticDescriptorProxy[Any]:
-        dec_info = _decorators.ModelSerializerDecoratorInfo(mode=mode, return_type=return_type, when_used=when_used)
-        return _decorators.PydanticDescriptorProxy(f, dec_info)
-
-    if __f is None:
-        return dec
-    else:
-        return dec(__f)  # type: ignore
-
-
-AnyType = TypeVar('AnyType')
-
-
-if TYPE_CHECKING:
-    SerializeAsAny = Annotated[AnyType, ...]  # SerializeAsAny[list[str]] will be treated by type checkers as list[str]
-    """Force serialization to ignore whatever is defined in the schema and instead ask the object
-    itself how it should be serialized.
-    In particular, this means that when model subclasses are serialized, fields present in the subclass
-    but not in the original schema will be included.
-    """
-else:
-
-    @dataclasses.dataclass(**_internal_dataclass.slots_true)
-    class SerializeAsAny:  # noqa: D101
-        def __class_getitem__(cls, item: Any) -> Any:
-            return Annotated[item, SerializeAsAny()]
-
-        def __get_pydantic_core_schema__(
-            self, source_type: Any, handler: GetCoreSchemaHandler
-        ) -> core_schema.CoreSchema:
-            schema = handler(source_type)
-            schema_to_update = schema
-            while schema_to_update['type'] == 'definitions':
-                schema_to_update = schema_to_update.copy()
-                schema_to_update = schema_to_update['schema']
-            schema_to_update['serialization'] = core_schema.wrap_serializer_function_ser_schema(
-                lambda x, h: h(x), schema=core_schema.any_schema()
-            )
-            return schema
-
-        __hash__ = object.__hash__
diff --git a/lib/pydantic/functional_validators.py b/lib/pydantic/functional_validators.py
deleted file mode 100644
index b547755b..00000000
--- a/lib/pydantic/functional_validators.py
+++ /dev/null
@@ -1,706 +0,0 @@
-"""This module contains related classes and functions for validation."""
-
-from __future__ import annotations as _annotations
-
-import dataclasses
-import sys
-from functools import partialmethod
-from types import FunctionType
-from typing import TYPE_CHECKING, Any, Callable, TypeVar, Union, cast, overload
-
-from pydantic_core import core_schema
-from pydantic_core import core_schema as _core_schema
-from typing_extensions import Annotated, Literal, TypeAlias
-
-from . import GetCoreSchemaHandler as _GetCoreSchemaHandler
-from ._internal import _core_metadata, _decorators, _generics, _internal_dataclass
-from .annotated_handlers import GetCoreSchemaHandler
-from .errors import PydanticUserError
-
-if sys.version_info < (3, 11):
-    from typing_extensions import Protocol
-else:
-    from typing import Protocol
-
-_inspect_validator = _decorators.inspect_validator
-
-
-@dataclasses.dataclass(frozen=True, **_internal_dataclass.slots_true)
-class AfterValidator:
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/validators/#annotated-validators
-
-    A metadata class that indicates that a validation should be applied **after** the inner validation logic.
-
-    Attributes:
-        func: The validator function.
-
-    Example:
-        ```py
-        from typing_extensions import Annotated
-
-        from pydantic import AfterValidator, BaseModel, ValidationError
-
-        MyInt = Annotated[int, AfterValidator(lambda v: v + 1)]
-
-        class Model(BaseModel):
-            a: MyInt
-
-        print(Model(a=1).a)
-        #> 2
-
-        try:
-            Model(a='a')
-        except ValidationError as e:
-            print(e.json(indent=2))
-            '''
-            [
-              {
-                "type": "int_parsing",
-                "loc": [
-                  "a"
-                ],
-                "msg": "Input should be a valid integer, unable to parse string as an integer",
-                "input": "a",
-                "url": "https://errors.pydantic.dev/2/v/int_parsing"
-              }
-            ]
-            '''
-        ```
-    """
-
-    func: core_schema.NoInfoValidatorFunction | core_schema.WithInfoValidatorFunction
-
-    def __get_pydantic_core_schema__(self, source_type: Any, handler: _GetCoreSchemaHandler) -> core_schema.CoreSchema:
-        schema = handler(source_type)
-        info_arg = _inspect_validator(self.func, 'after')
-        if info_arg:
-            func = cast(core_schema.WithInfoValidatorFunction, self.func)
-            return core_schema.with_info_after_validator_function(func, schema=schema, field_name=handler.field_name)
-        else:
-            func = cast(core_schema.NoInfoValidatorFunction, self.func)
-            return core_schema.no_info_after_validator_function(func, schema=schema)
-
-
-@dataclasses.dataclass(frozen=True, **_internal_dataclass.slots_true)
-class BeforeValidator:
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/validators/#annotated-validators
-
-    A metadata class that indicates that a validation should be applied **before** the inner validation logic.
-
-    Attributes:
-        func: The validator function.
-
-    Example:
-        ```py
-        from typing_extensions import Annotated
-
-        from pydantic import BaseModel, BeforeValidator
-
-        MyInt = Annotated[int, BeforeValidator(lambda v: v + 1)]
-
-        class Model(BaseModel):
-            a: MyInt
-
-        print(Model(a=1).a)
-        #> 2
-
-        try:
-            Model(a='a')
-        except TypeError as e:
-            print(e)
-            #> can only concatenate str (not "int") to str
-        ```
-    """
-
-    func: core_schema.NoInfoValidatorFunction | core_schema.WithInfoValidatorFunction
-
-    def __get_pydantic_core_schema__(self, source_type: Any, handler: _GetCoreSchemaHandler) -> core_schema.CoreSchema:
-        schema = handler(source_type)
-        info_arg = _inspect_validator(self.func, 'before')
-        if info_arg:
-            func = cast(core_schema.WithInfoValidatorFunction, self.func)
-            return core_schema.with_info_before_validator_function(func, schema=schema, field_name=handler.field_name)
-        else:
-            func = cast(core_schema.NoInfoValidatorFunction, self.func)
-            return core_schema.no_info_before_validator_function(func, schema=schema)
-
-
-@dataclasses.dataclass(frozen=True, **_internal_dataclass.slots_true)
-class PlainValidator:
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/validators/#annotated-validators
-
-    A metadata class that indicates that a validation should be applied **instead** of the inner validation logic.
-
-    Attributes:
-        func: The validator function.
-
-    Example:
-        ```py
-        from typing_extensions import Annotated
-
-        from pydantic import BaseModel, PlainValidator
-
-        MyInt = Annotated[int, PlainValidator(lambda v: int(v) + 1)]
-
-        class Model(BaseModel):
-            a: MyInt
-
-        print(Model(a='1').a)
-        #> 2
-        ```
-    """
-
-    func: core_schema.NoInfoValidatorFunction | core_schema.WithInfoValidatorFunction
-
-    def __get_pydantic_core_schema__(self, source_type: Any, handler: _GetCoreSchemaHandler) -> core_schema.CoreSchema:
-        # Note that for some valid uses of PlainValidator, it is not possible to generate a core schema for the
-        # source_type, so calling `handler(source_type)` will error, which prevents us from generating a proper
-        # serialization schema. To work around this for use cases that will not involve serialization, we simply
-        # catch any PydanticSchemaGenerationError that may be raised while attempting to build the serialization schema
-        # and abort any attempts to handle special serialization.
-        from pydantic import PydanticSchemaGenerationError
-
-        try:
-            schema = handler(source_type)
-            serialization = core_schema.wrap_serializer_function_ser_schema(function=lambda v, h: h(v), schema=schema)
-        except PydanticSchemaGenerationError:
-            serialization = None
-
-        info_arg = _inspect_validator(self.func, 'plain')
-        if info_arg:
-            func = cast(core_schema.WithInfoValidatorFunction, self.func)
-            return core_schema.with_info_plain_validator_function(
-                func, field_name=handler.field_name, serialization=serialization
-            )
-        else:
-            func = cast(core_schema.NoInfoValidatorFunction, self.func)
-            return core_schema.no_info_plain_validator_function(func, serialization=serialization)
-
-
-@dataclasses.dataclass(frozen=True, **_internal_dataclass.slots_true)
-class WrapValidator:
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/validators/#annotated-validators
-
-    A metadata class that indicates that a validation should be applied **around** the inner validation logic.
-
-    Attributes:
-        func: The validator function.
-
-    ```py
-    from datetime import datetime
-
-    from typing_extensions import Annotated
-
-    from pydantic import BaseModel, ValidationError, WrapValidator
-
-    def validate_timestamp(v, handler):
-        if v == 'now':
-            # we don't want to bother with further validation, just return the new value
-            return datetime.now()
-        try:
-            return handler(v)
-        except ValidationError:
-            # validation failed, in this case we want to return a default value
-            return datetime(2000, 1, 1)
-
-    MyTimestamp = Annotated[datetime, WrapValidator(validate_timestamp)]
-
-    class Model(BaseModel):
-        a: MyTimestamp
-
-    print(Model(a='now').a)
-    #> 2032-01-02 03:04:05.000006
-    print(Model(a='invalid').a)
-    #> 2000-01-01 00:00:00
-    ```
-    """
-
-    func: core_schema.NoInfoWrapValidatorFunction | core_schema.WithInfoWrapValidatorFunction
-
-    def __get_pydantic_core_schema__(self, source_type: Any, handler: _GetCoreSchemaHandler) -> core_schema.CoreSchema:
-        schema = handler(source_type)
-        info_arg = _inspect_validator(self.func, 'wrap')
-        if info_arg:
-            func = cast(core_schema.WithInfoWrapValidatorFunction, self.func)
-            return core_schema.with_info_wrap_validator_function(func, schema=schema, field_name=handler.field_name)
-        else:
-            func = cast(core_schema.NoInfoWrapValidatorFunction, self.func)
-            return core_schema.no_info_wrap_validator_function(func, schema=schema)
-
-
-if TYPE_CHECKING:
-
-    class _OnlyValueValidatorClsMethod(Protocol):
-        def __call__(self, cls: Any, value: Any, /) -> Any:
-            ...
-
-    class _V2ValidatorClsMethod(Protocol):
-        def __call__(self, cls: Any, value: Any, info: _core_schema.ValidationInfo, /) -> Any:
-            ...
-
-    class _V2WrapValidatorClsMethod(Protocol):
-        def __call__(
-            self,
-            cls: Any,
-            value: Any,
-            handler: _core_schema.ValidatorFunctionWrapHandler,
-            info: _core_schema.ValidationInfo,
-            /,
-        ) -> Any:
-            ...
-
-    _V2Validator = Union[
-        _V2ValidatorClsMethod,
-        _core_schema.WithInfoValidatorFunction,
-        _OnlyValueValidatorClsMethod,
-        _core_schema.NoInfoValidatorFunction,
-    ]
-
-    _V2WrapValidator = Union[
-        _V2WrapValidatorClsMethod,
-        _core_schema.WithInfoWrapValidatorFunction,
-    ]
-
-    _PartialClsOrStaticMethod: TypeAlias = Union[classmethod[Any, Any, Any], staticmethod[Any, Any], partialmethod[Any]]
-
-    _V2BeforeAfterOrPlainValidatorType = TypeVar(
-        '_V2BeforeAfterOrPlainValidatorType',
-        _V2Validator,
-        _PartialClsOrStaticMethod,
-    )
-    _V2WrapValidatorType = TypeVar('_V2WrapValidatorType', _V2WrapValidator, _PartialClsOrStaticMethod)
-
-
-@overload
-def field_validator(
-    __field: str,
-    *fields: str,
-    mode: Literal['before', 'after', 'plain'] = ...,
-    check_fields: bool | None = ...,
-) -> Callable[[_V2BeforeAfterOrPlainValidatorType], _V2BeforeAfterOrPlainValidatorType]:
-    ...
-
-
-@overload
-def field_validator(
-    __field: str,
-    *fields: str,
-    mode: Literal['wrap'],
-    check_fields: bool | None = ...,
-) -> Callable[[_V2WrapValidatorType], _V2WrapValidatorType]:
-    ...
-
-
-FieldValidatorModes: TypeAlias = Literal['before', 'after', 'wrap', 'plain']
-
-
-def field_validator(
-    __field: str,
-    *fields: str,
-    mode: FieldValidatorModes = 'after',
-    check_fields: bool | None = None,
-) -> Callable[[Any], Any]:
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/validators/#field-validators
-
-    Decorate methods on the class indicating that they should be used to validate fields.
-
-    Example usage:
-    ```py
-    from typing import Any
-
-    from pydantic import (
-        BaseModel,
-        ValidationError,
-        field_validator,
-    )
-
-    class Model(BaseModel):
-        a: str
-
-        @field_validator('a')
-        @classmethod
-        def ensure_foobar(cls, v: Any):
-            if 'foobar' not in v:
-                raise ValueError('"foobar" not found in a')
-            return v
-
-    print(repr(Model(a='this is foobar good')))
-    #> Model(a='this is foobar good')
-
-    try:
-        Model(a='snap')
-    except ValidationError as exc_info:
-        print(exc_info)
-        '''
-        1 validation error for Model
-        a
-          Value error, "foobar" not found in a [type=value_error, input_value='snap', input_type=str]
-        '''
-    ```
-
-    For more in depth examples, see [Field Validators](../concepts/validators.md#field-validators).
-
-    Args:
-        __field: The first field the `field_validator` should be called on; this is separate
-            from `fields` to ensure an error is raised if you don't pass at least one.
-        *fields: Additional field(s) the `field_validator` should be called on.
-        mode: Specifies whether to validate the fields before or after validation.
-        check_fields: Whether to check that the fields actually exist on the model.
-
-    Returns:
-        A decorator that can be used to decorate a function to be used as a field_validator.
-
-    Raises:
-        PydanticUserError:
-            - If `@field_validator` is used bare (with no fields).
-            - If the args passed to `@field_validator` as fields are not strings.
-            - If `@field_validator` applied to instance methods.
-    """
-    if isinstance(__field, FunctionType):
-        raise PydanticUserError(
-            '`@field_validator` should be used with fields and keyword arguments, not bare. '
-            "E.g. usage should be `@validator('<field_name>', ...)`",
-            code='validator-no-fields',
-        )
-    fields = __field, *fields
-    if not all(isinstance(field, str) for field in fields):
-        raise PydanticUserError(
-            '`@field_validator` fields should be passed as separate string args. '
-            "E.g. usage should be `@validator('<field_name_1>', '<field_name_2>', ...)`",
-            code='validator-invalid-fields',
-        )
-
-    def dec(
-        f: Callable[..., Any] | staticmethod[Any, Any] | classmethod[Any, Any, Any],
-    ) -> _decorators.PydanticDescriptorProxy[Any]:
-        if _decorators.is_instance_method_from_sig(f):
-            raise PydanticUserError(
-                '`@field_validator` cannot be applied to instance methods', code='validator-instance-method'
-            )
-
-        # auto apply the @classmethod decorator
-        f = _decorators.ensure_classmethod_based_on_signature(f)
-
-        dec_info = _decorators.FieldValidatorDecoratorInfo(fields=fields, mode=mode, check_fields=check_fields)
-        return _decorators.PydanticDescriptorProxy(f, dec_info)
-
-    return dec
-
-
-_ModelType = TypeVar('_ModelType')
-_ModelTypeCo = TypeVar('_ModelTypeCo', covariant=True)
-
-
-class ModelWrapValidatorHandler(_core_schema.ValidatorFunctionWrapHandler, Protocol[_ModelTypeCo]):
-    """@model_validator decorated function handler argument type. This is used when `mode='wrap'`."""
-
-    def __call__(  # noqa: D102
-        self,
-        value: Any,
-        outer_location: str | int | None = None,
-        /,
-    ) -> _ModelTypeCo:  # pragma: no cover
-        ...
-
-
-class ModelWrapValidatorWithoutInfo(Protocol[_ModelType]):
-    """A @model_validator decorated function signature.
-    This is used when `mode='wrap'` and the function does not have info argument.
-    """
-
-    def __call__(  # noqa: D102
-        self,
-        cls: type[_ModelType],
-        # this can be a dict, a model instance
-        # or anything else that gets passed to validate_python
-        # thus validators _must_ handle all cases
-        value: Any,
-        handler: ModelWrapValidatorHandler[_ModelType],
-        /,
-    ) -> _ModelType:
-        ...
-
-
-class ModelWrapValidator(Protocol[_ModelType]):
-    """A @model_validator decorated function signature. This is used when `mode='wrap'`."""
-
-    def __call__(  # noqa: D102
-        self,
-        cls: type[_ModelType],
-        # this can be a dict, a model instance
-        # or anything else that gets passed to validate_python
-        # thus validators _must_ handle all cases
-        value: Any,
-        handler: ModelWrapValidatorHandler[_ModelType],
-        info: _core_schema.ValidationInfo,
-        /,
-    ) -> _ModelType:
-        ...
-
-
-class FreeModelBeforeValidatorWithoutInfo(Protocol):
-    """A @model_validator decorated function signature.
-    This is used when `mode='before'` and the function does not have info argument.
-    """
-
-    def __call__(  # noqa: D102
-        self,
-        # this can be a dict, a model instance
-        # or anything else that gets passed to validate_python
-        # thus validators _must_ handle all cases
-        value: Any,
-        /,
-    ) -> Any:
-        ...
-
-
-class ModelBeforeValidatorWithoutInfo(Protocol):
-    """A @model_validator decorated function signature.
-    This is used when `mode='before'` and the function does not have info argument.
-    """
-
-    def __call__(  # noqa: D102
-        self,
-        cls: Any,
-        # this can be a dict, a model instance
-        # or anything else that gets passed to validate_python
-        # thus validators _must_ handle all cases
-        value: Any,
-        /,
-    ) -> Any:
-        ...
-
-
-class FreeModelBeforeValidator(Protocol):
-    """A `@model_validator` decorated function signature. This is used when `mode='before'`."""
-
-    def __call__(  # noqa: D102
-        self,
-        # this can be a dict, a model instance
-        # or anything else that gets passed to validate_python
-        # thus validators _must_ handle all cases
-        value: Any,
-        info: _core_schema.ValidationInfo,
-        /,
-    ) -> Any:
-        ...
-
-
-class ModelBeforeValidator(Protocol):
-    """A `@model_validator` decorated function signature. This is used when `mode='before'`."""
-
-    def __call__(  # noqa: D102
-        self,
-        cls: Any,
-        # this can be a dict, a model instance
-        # or anything else that gets passed to validate_python
-        # thus validators _must_ handle all cases
-        value: Any,
-        info: _core_schema.ValidationInfo,
-        /,
-    ) -> Any:
-        ...
-
-
-ModelAfterValidatorWithoutInfo = Callable[[_ModelType], _ModelType]
-"""A `@model_validator` decorated function signature. This is used when `mode='after'` and the function does not
-have info argument.
-"""
-
-ModelAfterValidator = Callable[[_ModelType, _core_schema.ValidationInfo], _ModelType]
-"""A `@model_validator` decorated function signature. This is used when `mode='after'`."""
-
-_AnyModelWrapValidator = Union[ModelWrapValidator[_ModelType], ModelWrapValidatorWithoutInfo[_ModelType]]
-_AnyModeBeforeValidator = Union[
-    FreeModelBeforeValidator, ModelBeforeValidator, FreeModelBeforeValidatorWithoutInfo, ModelBeforeValidatorWithoutInfo
-]
-_AnyModelAfterValidator = Union[ModelAfterValidator[_ModelType], ModelAfterValidatorWithoutInfo[_ModelType]]
-
-
-@overload
-def model_validator(
-    *,
-    mode: Literal['wrap'],
-) -> Callable[
-    [_AnyModelWrapValidator[_ModelType]], _decorators.PydanticDescriptorProxy[_decorators.ModelValidatorDecoratorInfo]
-]:
-    ...
-
-
-@overload
-def model_validator(
-    *,
-    mode: Literal['before'],
-) -> Callable[[_AnyModeBeforeValidator], _decorators.PydanticDescriptorProxy[_decorators.ModelValidatorDecoratorInfo]]:
-    ...
-
-
-@overload
-def model_validator(
-    *,
-    mode: Literal['after'],
-) -> Callable[
-    [_AnyModelAfterValidator[_ModelType]], _decorators.PydanticDescriptorProxy[_decorators.ModelValidatorDecoratorInfo]
-]:
-    ...
-
-
-def model_validator(
-    *,
-    mode: Literal['wrap', 'before', 'after'],
-) -> Any:
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/validators/#model-validators
-
-    Decorate model methods for validation purposes.
-
-    Example usage:
-    ```py
-    from typing_extensions import Self
-
-    from pydantic import BaseModel, ValidationError, model_validator
-
-    class Square(BaseModel):
-        width: float
-        height: float
-
-        @model_validator(mode='after')
-        def verify_square(self) -> Self:
-            if self.width != self.height:
-                raise ValueError('width and height do not match')
-            return self
-
-    s = Square(width=1, height=1)
-    print(repr(s))
-    #> Square(width=1.0, height=1.0)
-
-    try:
-        Square(width=1, height=2)
-    except ValidationError as e:
-        print(e)
-        '''
-        1 validation error for Square
-          Value error, width and height do not match [type=value_error, input_value={'width': 1, 'height': 2}, input_type=dict]
-        '''
-    ```
-
-    For more in depth examples, see [Model Validators](../concepts/validators.md#model-validators).
-
-    Args:
-        mode: A required string literal that specifies the validation mode.
-            It can be one of the following: 'wrap', 'before', or 'after'.
-
-    Returns:
-        A decorator that can be used to decorate a function to be used as a model validator.
-    """
-
-    def dec(f: Any) -> _decorators.PydanticDescriptorProxy[Any]:
-        # auto apply the @classmethod decorator
-        f = _decorators.ensure_classmethod_based_on_signature(f)
-        dec_info = _decorators.ModelValidatorDecoratorInfo(mode=mode)
-        return _decorators.PydanticDescriptorProxy(f, dec_info)
-
-    return dec
-
-
-AnyType = TypeVar('AnyType')
-
-
-if TYPE_CHECKING:
-    # If we add configurable attributes to IsInstance, we'd probably need to stop hiding it from type checkers like this
-    InstanceOf = Annotated[AnyType, ...]  # `IsInstance[Sequence]` will be recognized by type checkers as `Sequence`
-
-else:
-
-    @dataclasses.dataclass(**_internal_dataclass.slots_true)
-    class InstanceOf:
-        '''Generic type for annotating a type that is an instance of a given class.
-
-        Example:
-            ```py
-            from pydantic import BaseModel, InstanceOf
-
-            class Foo:
-                ...
-
-            class Bar(BaseModel):
-                foo: InstanceOf[Foo]
-
-            Bar(foo=Foo())
-            try:
-                Bar(foo=42)
-            except ValidationError as e:
-                print(e)
-                """
-                [
-                │   {
-                │   │   'type': 'is_instance_of',
-                │   │   'loc': ('foo',),
-                │   │   'msg': 'Input should be an instance of Foo',
-                │   │   'input': 42,
-                │   │   'ctx': {'class': 'Foo'},
-                │   │   'url': 'https://errors.pydantic.dev/0.38.0/v/is_instance_of'
-                │   }
-                ]
-                """
-            ```
-        '''
-
-        @classmethod
-        def __class_getitem__(cls, item: AnyType) -> AnyType:
-            return Annotated[item, cls()]
-
-        @classmethod
-        def __get_pydantic_core_schema__(cls, source: Any, handler: GetCoreSchemaHandler) -> core_schema.CoreSchema:
-            from pydantic import PydanticSchemaGenerationError
-
-            # use the generic _origin_ as the second argument to isinstance when appropriate
-            instance_of_schema = core_schema.is_instance_schema(_generics.get_origin(source) or source)
-
-            try:
-                # Try to generate the "standard" schema, which will be used when loading from JSON
-                original_schema = handler(source)
-            except PydanticSchemaGenerationError:
-                # If that fails, just produce a schema that can validate from python
-                return instance_of_schema
-            else:
-                # Use the "original" approach to serialization
-                instance_of_schema['serialization'] = core_schema.wrap_serializer_function_ser_schema(
-                    function=lambda v, h: h(v), schema=original_schema
-                )
-                return core_schema.json_or_python_schema(python_schema=instance_of_schema, json_schema=original_schema)
-
-        __hash__ = object.__hash__
-
-
-if TYPE_CHECKING:
-    SkipValidation = Annotated[AnyType, ...]  # SkipValidation[list[str]] will be treated by type checkers as list[str]
-else:
-
-    @dataclasses.dataclass(**_internal_dataclass.slots_true)
-    class SkipValidation:
-        """If this is applied as an annotation (e.g., via `x: Annotated[int, SkipValidation]`), validation will be
-            skipped. You can also use `SkipValidation[int]` as a shorthand for `Annotated[int, SkipValidation]`.
-
-        This can be useful if you want to use a type annotation for documentation/IDE/type-checking purposes,
-        and know that it is safe to skip validation for one or more of the fields.
-
-        Because this converts the validation schema to `any_schema`, subsequent annotation-applied transformations
-        may not have the expected effects. Therefore, when used, this annotation should generally be the final
-        annotation applied to a type.
-        """
-
-        def __class_getitem__(cls, item: Any) -> Any:
-            return Annotated[item, SkipValidation()]
-
-        @classmethod
-        def __get_pydantic_core_schema__(cls, source: Any, handler: GetCoreSchemaHandler) -> core_schema.CoreSchema:
-            original_schema = handler(source)
-            metadata = _core_metadata.build_metadata_dict(js_annotation_functions=[lambda _c, h: h(original_schema)])
-            return core_schema.any_schema(
-                metadata=metadata,
-                serialization=core_schema.wrap_serializer_function_ser_schema(
-                    function=lambda v, h: h(v), schema=original_schema
-                ),
-            )
-
-        __hash__ = object.__hash__
diff --git a/lib/pydantic/generics.py b/lib/pydantic/generics.py
deleted file mode 100644
index 5f6f7f7a..00000000
--- a/lib/pydantic/generics.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""The `generics` module is a backport module from V1."""
-from ._migration import getattr_migration
-
-__getattr__ = getattr_migration(__name__)
diff --git a/lib/pydantic/json.py b/lib/pydantic/json.py
deleted file mode 100644
index 020fb6d2..00000000
--- a/lib/pydantic/json.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""The `json` module is a backport module from V1."""
-from ._migration import getattr_migration
-
-__getattr__ = getattr_migration(__name__)
diff --git a/lib/pydantic/json_schema.py b/lib/pydantic/json_schema.py
deleted file mode 100644
index eee9e60e..00000000
--- a/lib/pydantic/json_schema.py
+++ /dev/null
@@ -1,2425 +0,0 @@
-"""
-Usage docs: https://docs.pydantic.dev/2.5/concepts/json_schema/
-
-The `json_schema` module contains classes and functions to allow the way [JSON Schema](https://json-schema.org/)
-is generated to be customized.
-
-In general you shouldn't need to use this module directly; instead, you can
-[`BaseModel.model_json_schema`][pydantic.BaseModel.model_json_schema] and
-[`TypeAdapter.json_schema`][pydantic.TypeAdapter.json_schema].
-"""
-from __future__ import annotations as _annotations
-
-import dataclasses
-import inspect
-import math
-import re
-import warnings
-from collections import defaultdict
-from copy import deepcopy
-from dataclasses import is_dataclass
-from enum import Enum
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Callable,
-    Counter,
-    Dict,
-    Hashable,
-    Iterable,
-    NewType,
-    Sequence,
-    Tuple,
-    TypeVar,
-    Union,
-    cast,
-)
-
-import pydantic_core
-from pydantic_core import CoreSchema, PydanticOmit, core_schema, to_jsonable_python
-from pydantic_core.core_schema import ComputedField
-from typing_extensions import Annotated, Literal, TypeAlias, assert_never, deprecated, final
-
-from pydantic.warnings import PydanticDeprecatedSince26
-
-from ._internal import (
-    _config,
-    _core_metadata,
-    _core_utils,
-    _decorators,
-    _internal_dataclass,
-    _mock_val_ser,
-    _schema_generation_shared,
-    _typing_extra,
-)
-from .annotated_handlers import GetJsonSchemaHandler
-from .config import JsonDict, JsonSchemaExtraCallable, JsonValue
-from .errors import PydanticInvalidForJsonSchema, PydanticUserError
-
-if TYPE_CHECKING:
-    from . import ConfigDict
-    from ._internal._core_utils import CoreSchemaField, CoreSchemaOrField
-    from ._internal._dataclasses import PydanticDataclass
-    from ._internal._schema_generation_shared import GetJsonSchemaFunction
-    from .main import BaseModel
-
-
-CoreSchemaOrFieldType = Literal[core_schema.CoreSchemaType, core_schema.CoreSchemaFieldType]
-"""
-A type alias for defined schema types that represents a union of
-`core_schema.CoreSchemaType` and
-`core_schema.CoreSchemaFieldType`.
-"""
-
-JsonSchemaValue = Dict[str, Any]
-"""
-A type alias for a JSON schema value. This is a dictionary of string keys to arbitrary JSON values.
-"""
-
-JsonSchemaMode = Literal['validation', 'serialization']
-"""
-A type alias that represents the mode of a JSON schema; either 'validation' or 'serialization'.
-
-For some types, the inputs to validation differ from the outputs of serialization. For example,
-computed fields will only be present when serializing, and should not be provided when
-validating. This flag provides a way to indicate whether you want the JSON schema required
-for validation inputs, or that will be matched by serialization outputs.
-"""
-
-_MODE_TITLE_MAPPING: dict[JsonSchemaMode, str] = {'validation': 'Input', 'serialization': 'Output'}
-
-
-def update_json_schema(schema: JsonSchemaValue, updates: dict[str, Any]) -> JsonSchemaValue:
-    """Update a JSON schema in-place by providing a dictionary of updates.
-
-    This function sets the provided key-value pairs in the schema and returns the updated schema.
-
-    Args:
-        schema: The JSON schema to update.
-        updates: A dictionary of key-value pairs to set in the schema.
-
-    Returns:
-        The updated JSON schema.
-    """
-    schema.update(updates)
-    return schema
-
-
-JsonSchemaWarningKind = Literal['skipped-choice', 'non-serializable-default']
-"""
-A type alias representing the kinds of warnings that can be emitted during JSON schema generation.
-
-See [`GenerateJsonSchema.render_warning_message`][pydantic.json_schema.GenerateJsonSchema.render_warning_message]
-for more details.
-"""
-
-
-class PydanticJsonSchemaWarning(UserWarning):
-    """This class is used to emit warnings produced during JSON schema generation.
-    See the [`GenerateJsonSchema.emit_warning`][pydantic.json_schema.GenerateJsonSchema.emit_warning] and
-    [`GenerateJsonSchema.render_warning_message`][pydantic.json_schema.GenerateJsonSchema.render_warning_message]
-    methods for more details; these can be overridden to control warning behavior.
-    """
-
-
-# ##### JSON Schema Generation #####
-DEFAULT_REF_TEMPLATE = '#/$defs/{model}'
-"""The default format string used to generate reference names."""
-
-# There are three types of references relevant to building JSON schemas:
-#   1. core_schema "ref" values; these are not exposed as part of the JSON schema
-#       * these might look like the fully qualified path of a model, its id, or something similar
-CoreRef = NewType('CoreRef', str)
-#   2. keys of the "definitions" object that will eventually go into the JSON schema
-#       * by default, these look like "MyModel", though may change in the presence of collisions
-#       * eventually, we may want to make it easier to modify the way these names are generated
-DefsRef = NewType('DefsRef', str)
-#   3. the values corresponding to the "$ref" key in the schema
-#       * By default, these look like "#/$defs/MyModel", as in {"$ref": "#/$defs/MyModel"}
-JsonRef = NewType('JsonRef', str)
-
-CoreModeRef = Tuple[CoreRef, JsonSchemaMode]
-JsonSchemaKeyT = TypeVar('JsonSchemaKeyT', bound=Hashable)
-
-
-@dataclasses.dataclass(**_internal_dataclass.slots_true)
-class _DefinitionsRemapping:
-    defs_remapping: dict[DefsRef, DefsRef]
-    json_remapping: dict[JsonRef, JsonRef]
-
-    @staticmethod
-    def from_prioritized_choices(
-        prioritized_choices: dict[DefsRef, list[DefsRef]],
-        defs_to_json: dict[DefsRef, JsonRef],
-        definitions: dict[DefsRef, JsonSchemaValue],
-    ) -> _DefinitionsRemapping:
-        """
-        This function should produce a remapping that replaces complex DefsRef with the simpler ones from the
-        prioritized_choices such that applying the name remapping would result in an equivalent JSON schema.
-        """
-        # We need to iteratively simplify the definitions until we reach a fixed point.
-        # The reason for this is that outer definitions may reference inner definitions that get simplified
-        # into an equivalent reference, and the outer definitions won't be equivalent until we've simplified
-        # the inner definitions.
-        copied_definitions = deepcopy(definitions)
-        definitions_schema = {'$defs': copied_definitions}
-        for _iter in range(100):  # prevent an infinite loop in the case of a bug, 100 iterations should be enough
-            # For every possible remapped DefsRef, collect all schemas that that DefsRef might be used for:
-            schemas_for_alternatives: dict[DefsRef, list[JsonSchemaValue]] = defaultdict(list)
-            for defs_ref in copied_definitions:
-                alternatives = prioritized_choices[defs_ref]
-                for alternative in alternatives:
-                    schemas_for_alternatives[alternative].append(copied_definitions[defs_ref])
-
-            # Deduplicate the schemas for each alternative; the idea is that we only want to remap to a new DefsRef
-            # if it introduces no ambiguity, i.e., there is only one distinct schema for that DefsRef.
-            for defs_ref, schemas in schemas_for_alternatives.items():
-                schemas_for_alternatives[defs_ref] = _deduplicate_schemas(schemas_for_alternatives[defs_ref])
-
-            # Build the remapping
-            defs_remapping: dict[DefsRef, DefsRef] = {}
-            json_remapping: dict[JsonRef, JsonRef] = {}
-            for original_defs_ref in definitions:
-                alternatives = prioritized_choices[original_defs_ref]
-                # Pick the first alternative that has only one schema, since that means there is no collision
-                remapped_defs_ref = next(x for x in alternatives if len(schemas_for_alternatives[x]) == 1)
-                defs_remapping[original_defs_ref] = remapped_defs_ref
-                json_remapping[defs_to_json[original_defs_ref]] = defs_to_json[remapped_defs_ref]
-            remapping = _DefinitionsRemapping(defs_remapping, json_remapping)
-            new_definitions_schema = remapping.remap_json_schema({'$defs': copied_definitions})
-            if definitions_schema == new_definitions_schema:
-                # We've reached the fixed point
-                return remapping
-            definitions_schema = new_definitions_schema
-
-        raise PydanticInvalidForJsonSchema('Failed to simplify the JSON schema definitions')
-
-    def remap_defs_ref(self, ref: DefsRef) -> DefsRef:
-        return self.defs_remapping.get(ref, ref)
-
-    def remap_json_ref(self, ref: JsonRef) -> JsonRef:
-        return self.json_remapping.get(ref, ref)
-
-    def remap_json_schema(self, schema: Any) -> Any:
-        """
-        Recursively update the JSON schema replacing all $refs
-        """
-        if isinstance(schema, str):
-            # Note: this may not really be a JsonRef; we rely on having no collisions between JsonRefs and other strings
-            return self.remap_json_ref(JsonRef(schema))
-        elif isinstance(schema, list):
-            return [self.remap_json_schema(item) for item in schema]
-        elif isinstance(schema, dict):
-            for key, value in schema.items():
-                if key == '$ref' and isinstance(value, str):
-                    schema['$ref'] = self.remap_json_ref(JsonRef(value))
-                elif key == '$defs':
-                    schema['$defs'] = {
-                        self.remap_defs_ref(DefsRef(key)): self.remap_json_schema(value)
-                        for key, value in schema['$defs'].items()
-                    }
-                else:
-                    schema[key] = self.remap_json_schema(value)
-        return schema
-
-
-class GenerateJsonSchema:
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/json_schema/#customizing-the-json-schema-generation-process
-
-    A class for generating JSON schemas.
-
-    This class generates JSON schemas based on configured parameters. The default schema dialect
-    is [https://json-schema.org/draft/2020-12/schema](https://json-schema.org/draft/2020-12/schema).
-    The class uses `by_alias` to configure how fields with
-    multiple names are handled and `ref_template` to format reference names.
-
-    Attributes:
-        schema_dialect: The JSON schema dialect used to generate the schema. See
-            [Declaring a Dialect](https://json-schema.org/understanding-json-schema/reference/schema.html#id4)
-            in the JSON Schema documentation for more information about dialects.
-        ignored_warning_kinds: Warnings to ignore when generating the schema. `self.render_warning_message` will
-            do nothing if its argument `kind` is in `ignored_warning_kinds`;
-            this value can be modified on subclasses to easily control which warnings are emitted.
-        by_alias: Whether to use field aliases when generating the schema.
-        ref_template: The format string used when generating reference names.
-        core_to_json_refs: A mapping of core refs to JSON refs.
-        core_to_defs_refs: A mapping of core refs to definition refs.
-        defs_to_core_refs: A mapping of definition refs to core refs.
-        json_to_defs_refs: A mapping of JSON refs to definition refs.
-        definitions: Definitions in the schema.
-
-    Args:
-        by_alias: Whether to use field aliases in the generated schemas.
-        ref_template: The format string to use when generating reference names.
-
-    Raises:
-        JsonSchemaError: If the instance of the class is inadvertently re-used after generating a schema.
-    """
-
-    schema_dialect = 'https://json-schema.org/draft/2020-12/schema'
-
-    # `self.render_warning_message` will do nothing if its argument `kind` is in `ignored_warning_kinds`;
-    # this value can be modified on subclasses to easily control which warnings are emitted
-    ignored_warning_kinds: set[JsonSchemaWarningKind] = {'skipped-choice'}
-
-    def __init__(self, by_alias: bool = True, ref_template: str = DEFAULT_REF_TEMPLATE):
-        self.by_alias = by_alias
-        self.ref_template = ref_template
-
-        self.core_to_json_refs: dict[CoreModeRef, JsonRef] = {}
-        self.core_to_defs_refs: dict[CoreModeRef, DefsRef] = {}
-        self.defs_to_core_refs: dict[DefsRef, CoreModeRef] = {}
-        self.json_to_defs_refs: dict[JsonRef, DefsRef] = {}
-
-        self.definitions: dict[DefsRef, JsonSchemaValue] = {}
-        self._config_wrapper_stack = _config.ConfigWrapperStack(_config.ConfigWrapper({}))
-
-        self._mode: JsonSchemaMode = 'validation'
-
-        # The following includes a mapping of a fully-unique defs ref choice to a list of preferred
-        # alternatives, which are generally simpler, such as only including the class name.
-        # At the end of schema generation, we use these to produce a JSON schema with more human-readable
-        # definitions, which would also work better in a generated OpenAPI client, etc.
-        self._prioritized_defsref_choices: dict[DefsRef, list[DefsRef]] = {}
-        self._collision_counter: dict[str, int] = defaultdict(int)
-        self._collision_index: dict[str, int] = {}
-
-        self._schema_type_to_method = self.build_schema_type_to_method()
-
-        # When we encounter definitions we need to try to build them immediately
-        # so that they are available schemas that reference them
-        # But it's possible that CoreSchema was never going to be used
-        # (e.g. because the CoreSchema that references short circuits is JSON schema generation without needing
-        #  the reference) so instead of failing altogether if we can't build a definition we
-        # store the error raised and re-throw it if we end up needing that def
-        self._core_defs_invalid_for_json_schema: dict[DefsRef, PydanticInvalidForJsonSchema] = {}
-
-        # This changes to True after generating a schema, to prevent issues caused by accidental re-use
-        # of a single instance of a schema generator
-        self._used = False
-
-    @property
-    def _config(self) -> _config.ConfigWrapper:
-        return self._config_wrapper_stack.tail
-
-    @property
-    def mode(self) -> JsonSchemaMode:
-        if self._config.json_schema_mode_override is not None:
-            return self._config.json_schema_mode_override
-        else:
-            return self._mode
-
-    def build_schema_type_to_method(
-        self,
-    ) -> dict[CoreSchemaOrFieldType, Callable[[CoreSchemaOrField], JsonSchemaValue]]:
-        """Builds a dictionary mapping fields to methods for generating JSON schemas.
-
-        Returns:
-            A dictionary containing the mapping of `CoreSchemaOrFieldType` to a handler method.
-
-        Raises:
-            TypeError: If no method has been defined for generating a JSON schema for a given pydantic core schema type.
-        """
-        mapping: dict[CoreSchemaOrFieldType, Callable[[CoreSchemaOrField], JsonSchemaValue]] = {}
-        core_schema_types: list[CoreSchemaOrFieldType] = _typing_extra.all_literal_values(
-            CoreSchemaOrFieldType  # type: ignore
-        )
-        for key in core_schema_types:
-            method_name = f"{key.replace('-', '_')}_schema"
-            try:
-                mapping[key] = getattr(self, method_name)
-            except AttributeError as e:  # pragma: no cover
-                raise TypeError(
-                    f'No method for generating JsonSchema for core_schema.type={key!r} '
-                    f'(expected: {type(self).__name__}.{method_name})'
-                ) from e
-        return mapping
-
-    def generate_definitions(
-        self, inputs: Sequence[tuple[JsonSchemaKeyT, JsonSchemaMode, core_schema.CoreSchema]]
-    ) -> tuple[dict[tuple[JsonSchemaKeyT, JsonSchemaMode], JsonSchemaValue], dict[DefsRef, JsonSchemaValue]]:
-        """Generates JSON schema definitions from a list of core schemas, pairing the generated definitions with a
-        mapping that links the input keys to the definition references.
-
-        Args:
-            inputs: A sequence of tuples, where:
-
-                - The first element is a JSON schema key type.
-                - The second element is the JSON mode: either 'validation' or 'serialization'.
-                - The third element is a core schema.
-
-        Returns:
-            A tuple where:
-
-                - The first element is a dictionary whose keys are tuples of JSON schema key type and JSON mode, and
-                    whose values are the JSON schema corresponding to that pair of inputs. (These schemas may have
-                    JsonRef references to definitions that are defined in the second returned element.)
-                - The second element is a dictionary whose keys are definition references for the JSON schemas
-                    from the first returned element, and whose values are the actual JSON schema definitions.
-
-        Raises:
-            PydanticUserError: Raised if the JSON schema generator has already been used to generate a JSON schema.
-        """
-        if self._used:
-            raise PydanticUserError(
-                'This JSON schema generator has already been used to generate a JSON schema. '
-                f'You must create a new instance of {type(self).__name__} to generate a new JSON schema.',
-                code='json-schema-already-used',
-            )
-
-        for key, mode, schema in inputs:
-            self._mode = mode
-            self.generate_inner(schema)
-
-        definitions_remapping = self._build_definitions_remapping()
-
-        json_schemas_map: dict[tuple[JsonSchemaKeyT, JsonSchemaMode], DefsRef] = {}
-        for key, mode, schema in inputs:
-            self._mode = mode
-            json_schema = self.generate_inner(schema)
-            json_schemas_map[(key, mode)] = definitions_remapping.remap_json_schema(json_schema)
-
-        json_schema = {'$defs': self.definitions}
-        json_schema = definitions_remapping.remap_json_schema(json_schema)
-        self._used = True
-        return json_schemas_map, _sort_json_schema(json_schema['$defs'])  # type: ignore
-
-    def generate(self, schema: CoreSchema, mode: JsonSchemaMode = 'validation') -> JsonSchemaValue:
-        """Generates a JSON schema for a specified schema in a specified mode.
-
-        Args:
-            schema: A Pydantic model.
-            mode: The mode in which to generate the schema. Defaults to 'validation'.
-
-        Returns:
-            A JSON schema representing the specified schema.
-
-        Raises:
-            PydanticUserError: If the JSON schema generator has already been used to generate a JSON schema.
-        """
-        self._mode = mode
-        if self._used:
-            raise PydanticUserError(
-                'This JSON schema generator has already been used to generate a JSON schema. '
-                f'You must create a new instance of {type(self).__name__} to generate a new JSON schema.',
-                code='json-schema-already-used',
-            )
-
-        json_schema: JsonSchemaValue = self.generate_inner(schema)
-        json_ref_counts = self.get_json_ref_counts(json_schema)
-
-        # Remove the top-level $ref if present; note that the _generate method already ensures there are no sibling keys
-        ref = cast(JsonRef, json_schema.get('$ref'))
-        while ref is not None:  # may need to unpack multiple levels
-            ref_json_schema = self.get_schema_from_definitions(ref)
-            if json_ref_counts[ref] > 1 or ref_json_schema is None:
-                # Keep the ref, but use an allOf to remove the top level $ref
-                json_schema = {'allOf': [{'$ref': ref}]}
-            else:
-                # "Unpack" the ref since this is the only reference
-                json_schema = ref_json_schema.copy()  # copy to prevent recursive dict reference
-                json_ref_counts[ref] -= 1
-            ref = cast(JsonRef, json_schema.get('$ref'))
-
-        self._garbage_collect_definitions(json_schema)
-        definitions_remapping = self._build_definitions_remapping()
-
-        if self.definitions:
-            json_schema['$defs'] = self.definitions
-
-        json_schema = definitions_remapping.remap_json_schema(json_schema)
-
-        # For now, we will not set the $schema key. However, if desired, this can be easily added by overriding
-        # this method and adding the following line after a call to super().generate(schema):
-        # json_schema['$schema'] = self.schema_dialect
-
-        self._used = True
-        return _sort_json_schema(json_schema)
-
-    def generate_inner(self, schema: CoreSchemaOrField) -> JsonSchemaValue:  # noqa: C901
-        """Generates a JSON schema for a given core schema.
-
-        Args:
-            schema: The given core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        # If a schema with the same CoreRef has been handled, just return a reference to it
-        # Note that this assumes that it will _never_ be the case that the same CoreRef is used
-        # on types that should have different JSON schemas
-        if 'ref' in schema:
-            core_ref = CoreRef(schema['ref'])  # type: ignore[typeddict-item]
-            core_mode_ref = (core_ref, self.mode)
-            if core_mode_ref in self.core_to_defs_refs and self.core_to_defs_refs[core_mode_ref] in self.definitions:
-                return {'$ref': self.core_to_json_refs[core_mode_ref]}
-
-        # Generate the JSON schema, accounting for the json_schema_override and core_schema_override
-        metadata_handler = _core_metadata.CoreMetadataHandler(schema)
-
-        def populate_defs(core_schema: CoreSchema, json_schema: JsonSchemaValue) -> JsonSchemaValue:
-            if 'ref' in core_schema:
-                core_ref = CoreRef(core_schema['ref'])  # type: ignore[typeddict-item]
-                defs_ref, ref_json_schema = self.get_cache_defs_ref_schema(core_ref)
-                json_ref = JsonRef(ref_json_schema['$ref'])
-                self.json_to_defs_refs[json_ref] = defs_ref
-                # Replace the schema if it's not a reference to itself
-                # What we want to avoid is having the def be just a ref to itself
-                # which is what would happen if we blindly assigned any
-                if json_schema.get('$ref', None) != json_ref:
-                    self.definitions[defs_ref] = json_schema
-                    self._core_defs_invalid_for_json_schema.pop(defs_ref, None)
-                json_schema = ref_json_schema
-            return json_schema
-
-        def convert_to_all_of(json_schema: JsonSchemaValue) -> JsonSchemaValue:
-            if '$ref' in json_schema and len(json_schema.keys()) > 1:
-                # technically you can't have any other keys next to a "$ref"
-                # but it's an easy mistake to make and not hard to correct automatically here
-                json_schema = json_schema.copy()
-                ref = json_schema.pop('$ref')
-                json_schema = {'allOf': [{'$ref': ref}], **json_schema}
-            return json_schema
-
-        def handler_func(schema_or_field: CoreSchemaOrField) -> JsonSchemaValue:
-            """Generate a JSON schema based on the input schema.
-
-            Args:
-                schema_or_field: The core schema to generate a JSON schema from.
-
-            Returns:
-                The generated JSON schema.
-
-            Raises:
-                TypeError: If an unexpected schema type is encountered.
-            """
-            # Generate the core-schema-type-specific bits of the schema generation:
-            json_schema: JsonSchemaValue | None = None
-            if self.mode == 'serialization' and 'serialization' in schema_or_field:
-                ser_schema = schema_or_field['serialization']  # type: ignore
-                json_schema = self.ser_schema(ser_schema)
-            if json_schema is None:
-                if _core_utils.is_core_schema(schema_or_field) or _core_utils.is_core_schema_field(schema_or_field):
-                    generate_for_schema_type = self._schema_type_to_method[schema_or_field['type']]
-                    json_schema = generate_for_schema_type(schema_or_field)
-                else:
-                    raise TypeError(f'Unexpected schema type: schema={schema_or_field}')
-            if _core_utils.is_core_schema(schema_or_field):
-                json_schema = populate_defs(schema_or_field, json_schema)
-                json_schema = convert_to_all_of(json_schema)
-            return json_schema
-
-        current_handler = _schema_generation_shared.GenerateJsonSchemaHandler(self, handler_func)
-
-        for js_modify_function in metadata_handler.metadata.get('pydantic_js_functions', ()):
-
-            def new_handler_func(
-                schema_or_field: CoreSchemaOrField,
-                current_handler: GetJsonSchemaHandler = current_handler,
-                js_modify_function: GetJsonSchemaFunction = js_modify_function,
-            ) -> JsonSchemaValue:
-                json_schema = js_modify_function(schema_or_field, current_handler)
-                if _core_utils.is_core_schema(schema_or_field):
-                    json_schema = populate_defs(schema_or_field, json_schema)
-                original_schema = current_handler.resolve_ref_schema(json_schema)
-                ref = json_schema.pop('$ref', None)
-                if ref and json_schema:
-                    original_schema.update(json_schema)
-                return original_schema
-
-            current_handler = _schema_generation_shared.GenerateJsonSchemaHandler(self, new_handler_func)
-
-        for js_modify_function in metadata_handler.metadata.get('pydantic_js_annotation_functions', ()):
-
-            def new_handler_func(
-                schema_or_field: CoreSchemaOrField,
-                current_handler: GetJsonSchemaHandler = current_handler,
-                js_modify_function: GetJsonSchemaFunction = js_modify_function,
-            ) -> JsonSchemaValue:
-                json_schema = js_modify_function(schema_or_field, current_handler)
-                if _core_utils.is_core_schema(schema_or_field):
-                    json_schema = populate_defs(schema_or_field, json_schema)
-                    json_schema = convert_to_all_of(json_schema)
-                return json_schema
-
-            current_handler = _schema_generation_shared.GenerateJsonSchemaHandler(self, new_handler_func)
-
-        json_schema = current_handler(schema)
-        if _core_utils.is_core_schema(schema):
-            json_schema = populate_defs(schema, json_schema)
-            json_schema = convert_to_all_of(json_schema)
-        return json_schema
-
-    # ### Schema generation methods
-    def any_schema(self, schema: core_schema.AnySchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches any value.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        return {}
-
-    def none_schema(self, schema: core_schema.NoneSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches `None`.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        return {'type': 'null'}
-
-    def bool_schema(self, schema: core_schema.BoolSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a bool value.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        return {'type': 'boolean'}
-
-    def int_schema(self, schema: core_schema.IntSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches an int value.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        json_schema: dict[str, Any] = {'type': 'integer'}
-        self.update_with_validations(json_schema, schema, self.ValidationsMapping.numeric)
-        json_schema = {k: v for k, v in json_schema.items() if v not in {math.inf, -math.inf}}
-        return json_schema
-
-    def float_schema(self, schema: core_schema.FloatSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a float value.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        json_schema: dict[str, Any] = {'type': 'number'}
-        self.update_with_validations(json_schema, schema, self.ValidationsMapping.numeric)
-        json_schema = {k: v for k, v in json_schema.items() if v not in {math.inf, -math.inf}}
-        return json_schema
-
-    def decimal_schema(self, schema: core_schema.DecimalSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a decimal value.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        json_schema = self.str_schema(core_schema.str_schema())
-        if self.mode == 'validation':
-            multiple_of = schema.get('multiple_of')
-            le = schema.get('le')
-            ge = schema.get('ge')
-            lt = schema.get('lt')
-            gt = schema.get('gt')
-            json_schema = {
-                'anyOf': [
-                    self.float_schema(
-                        core_schema.float_schema(
-                            allow_inf_nan=schema.get('allow_inf_nan'),
-                            multiple_of=None if multiple_of is None else float(multiple_of),
-                            le=None if le is None else float(le),
-                            ge=None if ge is None else float(ge),
-                            lt=None if lt is None else float(lt),
-                            gt=None if gt is None else float(gt),
-                        )
-                    ),
-                    json_schema,
-                ],
-            }
-        return json_schema
-
-    def str_schema(self, schema: core_schema.StringSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a string value.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        json_schema = {'type': 'string'}
-        self.update_with_validations(json_schema, schema, self.ValidationsMapping.string)
-        return json_schema
-
-    def bytes_schema(self, schema: core_schema.BytesSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a bytes value.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        json_schema = {'type': 'string', 'format': 'base64url' if self._config.ser_json_bytes == 'base64' else 'binary'}
-        self.update_with_validations(json_schema, schema, self.ValidationsMapping.bytes)
-        return json_schema
-
-    def date_schema(self, schema: core_schema.DateSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a date value.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        json_schema = {'type': 'string', 'format': 'date'}
-        self.update_with_validations(json_schema, schema, self.ValidationsMapping.date)
-        return json_schema
-
-    def time_schema(self, schema: core_schema.TimeSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a time value.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        return {'type': 'string', 'format': 'time'}
-
-    def datetime_schema(self, schema: core_schema.DatetimeSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a datetime value.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        return {'type': 'string', 'format': 'date-time'}
-
-    def timedelta_schema(self, schema: core_schema.TimedeltaSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a timedelta value.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        if self._config.ser_json_timedelta == 'float':
-            return {'type': 'number'}
-        return {'type': 'string', 'format': 'duration'}
-
-    def literal_schema(self, schema: core_schema.LiteralSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a literal value.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        expected = [v.value if isinstance(v, Enum) else v for v in schema['expected']]
-        # jsonify the expected values
-        expected = [to_jsonable_python(v) for v in expected]
-
-        if len(expected) == 1:
-            return {'const': expected[0]}
-
-        types = {type(e) for e in expected}
-        if types == {str}:
-            return {'enum': expected, 'type': 'string'}
-        elif types == {int}:
-            return {'enum': expected, 'type': 'integer'}
-        elif types == {float}:
-            return {'enum': expected, 'type': 'number'}
-        elif types == {bool}:
-            return {'enum': expected, 'type': 'boolean'}
-        elif types == {list}:
-            return {'enum': expected, 'type': 'array'}
-        # there is not None case because if it's mixed it hits the final `else`
-        # if it's a single Literal[None] then it becomes a `const` schema above
-        else:
-            return {'enum': expected}
-
-    def is_instance_schema(self, schema: core_schema.IsInstanceSchema) -> JsonSchemaValue:
-        """Handles JSON schema generation for a core schema that checks if a value is an instance of a class.
-
-        Unless overridden in a subclass, this raises an error.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        return self.handle_invalid_for_json_schema(schema, f'core_schema.IsInstanceSchema ({schema["cls"]})')
-
-    def is_subclass_schema(self, schema: core_schema.IsSubclassSchema) -> JsonSchemaValue:
-        """Handles JSON schema generation for a core schema that checks if a value is a subclass of a class.
-
-        For backwards compatibility with v1, this does not raise an error, but can be overridden to change this.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        # Note: This is for compatibility with V1; you can override if you want different behavior.
-        return {}
-
-    def callable_schema(self, schema: core_schema.CallableSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a callable value.
-
-        Unless overridden in a subclass, this raises an error.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        return self.handle_invalid_for_json_schema(schema, 'core_schema.CallableSchema')
-
-    def list_schema(self, schema: core_schema.ListSchema) -> JsonSchemaValue:
-        """Returns a schema that matches a list schema.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        items_schema = {} if 'items_schema' not in schema else self.generate_inner(schema['items_schema'])
-        json_schema = {'type': 'array', 'items': items_schema}
-        self.update_with_validations(json_schema, schema, self.ValidationsMapping.array)
-        return json_schema
-
-    @deprecated('`tuple_positional_schema` is deprecated. Use `tuple_schema` instead.', category=None)
-    @final
-    def tuple_positional_schema(self, schema: core_schema.TupleSchema) -> JsonSchemaValue:
-        """Replaced by `tuple_schema`."""
-        warnings.warn(
-            '`tuple_positional_schema` is deprecated. Use `tuple_schema` instead.',
-            PydanticDeprecatedSince26,
-            stacklevel=2,
-        )
-        return self.tuple_schema(schema)
-
-    @deprecated('`tuple_variable_schema` is deprecated. Use `tuple_schema` instead.', category=None)
-    @final
-    def tuple_variable_schema(self, schema: core_schema.TupleSchema) -> JsonSchemaValue:
-        """Replaced by `tuple_schema`."""
-        warnings.warn(
-            '`tuple_variable_schema` is deprecated. Use `tuple_schema` instead.',
-            PydanticDeprecatedSince26,
-            stacklevel=2,
-        )
-        return self.tuple_schema(schema)
-
-    def tuple_schema(self, schema: core_schema.TupleSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a tuple schema e.g. `Tuple[int,
-        str, bool]` or `Tuple[int, ...]`.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        json_schema: JsonSchemaValue = {'type': 'array'}
-        if 'variadic_item_index' in schema:
-            variadic_item_index = schema['variadic_item_index']
-            if variadic_item_index > 0:
-                json_schema['minItems'] = variadic_item_index
-                json_schema['prefixItems'] = [
-                    self.generate_inner(item) for item in schema['items_schema'][:variadic_item_index]
-                ]
-            if variadic_item_index + 1 == len(schema['items_schema']):
-                # if the variadic item is the last item, then represent it faithfully
-                json_schema['items'] = self.generate_inner(schema['items_schema'][variadic_item_index])
-            else:
-                # otherwise, 'items' represents the schema for the variadic
-                # item plus the suffix, so just allow anything for simplicity
-                # for now
-                json_schema['items'] = True
-        else:
-            prefixItems = [self.generate_inner(item) for item in schema['items_schema']]
-            if prefixItems:
-                json_schema['prefixItems'] = prefixItems
-            json_schema['minItems'] = len(prefixItems)
-            json_schema['maxItems'] = len(prefixItems)
-        self.update_with_validations(json_schema, schema, self.ValidationsMapping.array)
-        return json_schema
-
-    def set_schema(self, schema: core_schema.SetSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a set schema.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        return self._common_set_schema(schema)
-
-    def frozenset_schema(self, schema: core_schema.FrozenSetSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a frozenset schema.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        return self._common_set_schema(schema)
-
-    def _common_set_schema(self, schema: core_schema.SetSchema | core_schema.FrozenSetSchema) -> JsonSchemaValue:
-        items_schema = {} if 'items_schema' not in schema else self.generate_inner(schema['items_schema'])
-        json_schema = {'type': 'array', 'uniqueItems': True, 'items': items_schema}
-        self.update_with_validations(json_schema, schema, self.ValidationsMapping.array)
-        return json_schema
-
-    def generator_schema(self, schema: core_schema.GeneratorSchema) -> JsonSchemaValue:
-        """Returns a JSON schema that represents the provided GeneratorSchema.
-
-        Args:
-            schema: The schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        items_schema = {} if 'items_schema' not in schema else self.generate_inner(schema['items_schema'])
-        json_schema = {'type': 'array', 'items': items_schema}
-        self.update_with_validations(json_schema, schema, self.ValidationsMapping.array)
-        return json_schema
-
-    def dict_schema(self, schema: core_schema.DictSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a dict schema.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        json_schema: JsonSchemaValue = {'type': 'object'}
-
-        keys_schema = self.generate_inner(schema['keys_schema']).copy() if 'keys_schema' in schema else {}
-        keys_pattern = keys_schema.pop('pattern', None)
-
-        values_schema = self.generate_inner(schema['values_schema']).copy() if 'values_schema' in schema else {}
-        values_schema.pop('title', None)  # don't give a title to the additionalProperties
-        if values_schema or keys_pattern is not None:  # don't add additionalProperties if it's empty
-            if keys_pattern is None:
-                json_schema['additionalProperties'] = values_schema
-            else:
-                json_schema['patternProperties'] = {keys_pattern: values_schema}
-
-        self.update_with_validations(json_schema, schema, self.ValidationsMapping.object)
-        return json_schema
-
-    def _function_schema(
-        self,
-        schema: _core_utils.AnyFunctionSchema,
-    ) -> JsonSchemaValue:
-        if _core_utils.is_function_with_inner_schema(schema):
-            # This could be wrong if the function's mode is 'before', but in practice will often be right, and when it
-            # isn't, I think it would be hard to automatically infer what the desired schema should be.
-            return self.generate_inner(schema['schema'])
-
-        # function-plain
-        return self.handle_invalid_for_json_schema(
-            schema, f'core_schema.PlainValidatorFunctionSchema ({schema["function"]})'
-        )
-
-    def function_before_schema(self, schema: core_schema.BeforeValidatorFunctionSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a function-before schema.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        return self._function_schema(schema)
-
-    def function_after_schema(self, schema: core_schema.AfterValidatorFunctionSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a function-after schema.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        return self._function_schema(schema)
-
-    def function_plain_schema(self, schema: core_schema.PlainValidatorFunctionSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a function-plain schema.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        return self._function_schema(schema)
-
-    def function_wrap_schema(self, schema: core_schema.WrapValidatorFunctionSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a function-wrap schema.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        return self._function_schema(schema)
-
-    def default_schema(self, schema: core_schema.WithDefaultSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema with a default value.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        json_schema = self.generate_inner(schema['schema'])
-
-        if 'default' not in schema:
-            return json_schema
-        default = schema['default']
-        # Note: if you want to include the value returned by the default_factory,
-        # override this method and replace the code above with:
-        # if 'default' in schema:
-        #     default = schema['default']
-        # elif 'default_factory' in schema:
-        #     default = schema['default_factory']()
-        # else:
-        #     return json_schema
-
-        try:
-            encoded_default = self.encode_default(default)
-        except pydantic_core.PydanticSerializationError:
-            self.emit_warning(
-                'non-serializable-default',
-                f'Default value {default} is not JSON serializable; excluding default from JSON schema',
-            )
-            # Return the inner schema, as though there was no default
-            return json_schema
-
-        if '$ref' in json_schema:
-            # Since reference schemas do not support child keys, we wrap the reference schema in a single-case allOf:
-            return {'allOf': [json_schema], 'default': encoded_default}
-        else:
-            json_schema['default'] = encoded_default
-            return json_schema
-
-    def nullable_schema(self, schema: core_schema.NullableSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that allows null values.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        null_schema = {'type': 'null'}
-        inner_json_schema = self.generate_inner(schema['schema'])
-
-        if inner_json_schema == null_schema:
-            return null_schema
-        else:
-            # Thanks to the equality check against `null_schema` above, I think 'oneOf' would also be valid here;
-            # I'll use 'anyOf' for now, but it could be changed it if it would work better with some external tooling
-            return self.get_flattened_anyof([inner_json_schema, null_schema])
-
-    def union_schema(self, schema: core_schema.UnionSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that allows values matching any of the given schemas.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        generated: list[JsonSchemaValue] = []
-
-        choices = schema['choices']
-        for choice in choices:
-            # choice will be a tuple if an explicit label was provided
-            choice_schema = choice[0] if isinstance(choice, tuple) else choice
-            try:
-                generated.append(self.generate_inner(choice_schema))
-            except PydanticOmit:
-                continue
-            except PydanticInvalidForJsonSchema as exc:
-                self.emit_warning('skipped-choice', exc.message)
-        if len(generated) == 1:
-            return generated[0]
-        return self.get_flattened_anyof(generated)
-
-    def tagged_union_schema(self, schema: core_schema.TaggedUnionSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that allows values matching any of the given schemas, where
-        the schemas are tagged with a discriminator field that indicates which schema should be used to validate
-        the value.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        generated: dict[str, JsonSchemaValue] = {}
-        for k, v in schema['choices'].items():
-            if isinstance(k, Enum):
-                k = k.value
-            try:
-                # Use str(k) since keys must be strings for json; while not technically correct,
-                # it's the closest that can be represented in valid JSON
-                generated[str(k)] = self.generate_inner(v).copy()
-            except PydanticOmit:
-                continue
-            except PydanticInvalidForJsonSchema as exc:
-                self.emit_warning('skipped-choice', exc.message)
-
-        one_of_choices = _deduplicate_schemas(generated.values())
-        json_schema: JsonSchemaValue = {'oneOf': one_of_choices}
-
-        # This reflects the v1 behavior; TODO: we should make it possible to exclude OpenAPI stuff from the JSON schema
-        openapi_discriminator = self._extract_discriminator(schema, one_of_choices)
-        if openapi_discriminator is not None:
-            json_schema['discriminator'] = {
-                'propertyName': openapi_discriminator,
-                'mapping': {k: v.get('$ref', v) for k, v in generated.items()},
-            }
-
-        return json_schema
-
-    def _extract_discriminator(
-        self, schema: core_schema.TaggedUnionSchema, one_of_choices: list[JsonDict]
-    ) -> str | None:
-        """Extract a compatible OpenAPI discriminator from the schema and one_of choices that end up in the final
-        schema."""
-        openapi_discriminator: str | None = None
-
-        if isinstance(schema['discriminator'], str):
-            return schema['discriminator']
-
-        if isinstance(schema['discriminator'], list):
-            # If the discriminator is a single item list containing a string, that is equivalent to the string case
-            if len(schema['discriminator']) == 1 and isinstance(schema['discriminator'][0], str):
-                return schema['discriminator'][0]
-            # When an alias is used that is different from the field name, the discriminator will be a list of single
-            # str lists, one for the attribute and one for the actual alias. The logic here will work even if there is
-            # more than one possible attribute, and looks for whether a single alias choice is present as a documented
-            # property on all choices. If so, that property will be used as the OpenAPI discriminator.
-            for alias_path in schema['discriminator']:
-                if not isinstance(alias_path, list):
-                    break  # this means that the discriminator is not a list of alias paths
-                if len(alias_path) != 1:
-                    continue  # this means that the "alias" does not represent a single field
-                alias = alias_path[0]
-                if not isinstance(alias, str):
-                    continue  # this means that the "alias" does not represent a field
-                alias_is_present_on_all_choices = True
-                for choice in one_of_choices:
-                    while '$ref' in choice:
-                        assert isinstance(choice['$ref'], str)
-                        choice = self.get_schema_from_definitions(JsonRef(choice['$ref'])) or {}
-                    properties = choice.get('properties', {})
-                    if not isinstance(properties, dict) or alias not in properties:
-                        alias_is_present_on_all_choices = False
-                        break
-                if alias_is_present_on_all_choices:
-                    openapi_discriminator = alias
-                    break
-        return openapi_discriminator
-
-    def chain_schema(self, schema: core_schema.ChainSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a core_schema.ChainSchema.
-
-        When generating a schema for validation, we return the validation JSON schema for the first step in the chain.
-        For serialization, we return the serialization JSON schema for the last step in the chain.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        step_index = 0 if self.mode == 'validation' else -1  # use first step for validation, last for serialization
-        return self.generate_inner(schema['steps'][step_index])
-
-    def lax_or_strict_schema(self, schema: core_schema.LaxOrStrictSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that allows values matching either the lax schema or the
-        strict schema.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        # TODO: Need to read the default value off of model config or whatever
-        use_strict = schema.get('strict', False)  # TODO: replace this default False
-        # If your JSON schema fails to generate it is probably
-        # because one of the following two branches failed.
-        if use_strict:
-            return self.generate_inner(schema['strict_schema'])
-        else:
-            return self.generate_inner(schema['lax_schema'])
-
-    def json_or_python_schema(self, schema: core_schema.JsonOrPythonSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that allows values matching either the JSON schema or the
-        Python schema.
-
-        The JSON schema is used instead of the Python schema. If you want to use the Python schema, you should override
-        this method.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        return self.generate_inner(schema['json_schema'])
-
-    def typed_dict_schema(self, schema: core_schema.TypedDictSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that defines a typed dict.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        total = schema.get('total', True)
-        named_required_fields: list[tuple[str, bool, CoreSchemaField]] = [
-            (name, self.field_is_required(field, total), field)
-            for name, field in schema['fields'].items()
-            if self.field_is_present(field)
-        ]
-        if self.mode == 'serialization':
-            named_required_fields.extend(self._name_required_computed_fields(schema.get('computed_fields', [])))
-
-        config = _get_typed_dict_config(schema)
-        with self._config_wrapper_stack.push(config):
-            json_schema = self._named_required_fields_schema(named_required_fields)
-
-        extra = schema.get('extra_behavior')
-        if extra is None:
-            extra = config.get('extra', 'ignore')
-        if extra == 'forbid':
-            json_schema['additionalProperties'] = False
-        elif extra == 'allow':
-            json_schema['additionalProperties'] = True
-
-        return json_schema
-
-    @staticmethod
-    def _name_required_computed_fields(
-        computed_fields: list[ComputedField],
-    ) -> list[tuple[str, bool, core_schema.ComputedField]]:
-        return [(field['property_name'], True, field) for field in computed_fields]
-
-    def _named_required_fields_schema(
-        self, named_required_fields: Sequence[tuple[str, bool, CoreSchemaField]]
-    ) -> JsonSchemaValue:
-        properties: dict[str, JsonSchemaValue] = {}
-        required_fields: list[str] = []
-        for name, required, field in named_required_fields:
-            if self.by_alias:
-                name = self._get_alias_name(field, name)
-            try:
-                field_json_schema = self.generate_inner(field).copy()
-            except PydanticOmit:
-                continue
-            if 'title' not in field_json_schema and self.field_title_should_be_set(field):
-                title = self.get_title_from_name(name)
-                field_json_schema['title'] = title
-            field_json_schema = self.handle_ref_overrides(field_json_schema)
-            properties[name] = field_json_schema
-            if required:
-                required_fields.append(name)
-
-        json_schema = {'type': 'object', 'properties': properties}
-        if required_fields:
-            json_schema['required'] = required_fields
-        return json_schema
-
-    def _get_alias_name(self, field: CoreSchemaField, name: str) -> str:
-        if field['type'] == 'computed-field':
-            alias: Any = field.get('alias', name)
-        elif self.mode == 'validation':
-            alias = field.get('validation_alias', name)
-        else:
-            alias = field.get('serialization_alias', name)
-        if isinstance(alias, str):
-            name = alias
-        elif isinstance(alias, list):
-            alias = cast('list[str] | str', alias)
-            for path in alias:
-                if isinstance(path, list) and len(path) == 1 and isinstance(path[0], str):
-                    # Use the first valid single-item string path; the code that constructs the alias array
-                    # should ensure the first such item is what belongs in the JSON schema
-                    name = path[0]
-                    break
-        else:
-            assert_never(alias)
-        return name
-
-    def typed_dict_field_schema(self, schema: core_schema.TypedDictField) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that defines a typed dict field.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        return self.generate_inner(schema['schema'])
-
-    def dataclass_field_schema(self, schema: core_schema.DataclassField) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that defines a dataclass field.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        return self.generate_inner(schema['schema'])
-
-    def model_field_schema(self, schema: core_schema.ModelField) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that defines a model field.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        return self.generate_inner(schema['schema'])
-
-    def computed_field_schema(self, schema: core_schema.ComputedField) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that defines a computed field.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        return self.generate_inner(schema['return_schema'])
-
-    def model_schema(self, schema: core_schema.ModelSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that defines a model.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        # We do not use schema['model'].model_json_schema() here
-        # because it could lead to inconsistent refs handling, etc.
-        cls = cast('type[BaseModel]', schema['cls'])
-        config = cls.model_config
-        title = config.get('title')
-
-        with self._config_wrapper_stack.push(config):
-            json_schema = self.generate_inner(schema['schema'])
-
-        json_schema_extra = config.get('json_schema_extra')
-        if cls.__pydantic_root_model__:
-            root_json_schema_extra = cls.model_fields['root'].json_schema_extra
-            if json_schema_extra and root_json_schema_extra:
-                raise ValueError(
-                    '"model_config[\'json_schema_extra\']" and "Field.json_schema_extra" on "RootModel.root"'
-                    ' field must not be set simultaneously'
-                )
-            if root_json_schema_extra:
-                json_schema_extra = root_json_schema_extra
-
-        json_schema = self._update_class_schema(json_schema, title, config.get('extra', None), cls, json_schema_extra)
-
-        return json_schema
-
-    def _update_class_schema(
-        self,
-        json_schema: JsonSchemaValue,
-        title: str | None,
-        extra: Literal['allow', 'ignore', 'forbid'] | None,
-        cls: type[Any],
-        json_schema_extra: JsonDict | JsonSchemaExtraCallable | None,
-    ) -> JsonSchemaValue:
-        if '$ref' in json_schema:
-            schema_to_update = self.get_schema_from_definitions(JsonRef(json_schema['$ref'])) or json_schema
-        else:
-            schema_to_update = json_schema
-
-        if title is not None:
-            # referenced_schema['title'] = title
-            schema_to_update.setdefault('title', title)
-
-        if 'additionalProperties' not in schema_to_update:
-            if extra == 'allow':
-                schema_to_update['additionalProperties'] = True
-            elif extra == 'forbid':
-                schema_to_update['additionalProperties'] = False
-
-        if isinstance(json_schema_extra, (staticmethod, classmethod)):
-            # In older versions of python, this is necessary to ensure staticmethod/classmethods are callable
-            json_schema_extra = json_schema_extra.__get__(cls)
-
-        if isinstance(json_schema_extra, dict):
-            schema_to_update.update(json_schema_extra)
-        elif callable(json_schema_extra):
-            if len(inspect.signature(json_schema_extra).parameters) > 1:
-                json_schema_extra(schema_to_update, cls)  # type: ignore
-            else:
-                json_schema_extra(schema_to_update)  # type: ignore
-        elif json_schema_extra is not None:
-            raise ValueError(
-                f"model_config['json_schema_extra']={json_schema_extra} should be a dict, callable, or None"
-            )
-
-        return json_schema
-
-    def resolve_schema_to_update(self, json_schema: JsonSchemaValue) -> JsonSchemaValue:
-        """Resolve a JsonSchemaValue to the non-ref schema if it is a $ref schema.
-
-        Args:
-            json_schema: The schema to resolve.
-
-        Returns:
-            The resolved schema.
-        """
-        if '$ref' in json_schema:
-            schema_to_update = self.get_schema_from_definitions(JsonRef(json_schema['$ref']))
-            if schema_to_update is None:
-                raise RuntimeError(f'Cannot update undefined schema for $ref={json_schema["$ref"]}')
-            return self.resolve_schema_to_update(schema_to_update)
-        else:
-            schema_to_update = json_schema
-        return schema_to_update
-
-    def model_fields_schema(self, schema: core_schema.ModelFieldsSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that defines a model's fields.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        named_required_fields: list[tuple[str, bool, CoreSchemaField]] = [
-            (name, self.field_is_required(field, total=True), field)
-            for name, field in schema['fields'].items()
-            if self.field_is_present(field)
-        ]
-        if self.mode == 'serialization':
-            named_required_fields.extend(self._name_required_computed_fields(schema.get('computed_fields', [])))
-        json_schema = self._named_required_fields_schema(named_required_fields)
-        extras_schema = schema.get('extras_schema', None)
-        if extras_schema is not None:
-            schema_to_update = self.resolve_schema_to_update(json_schema)
-            schema_to_update['additionalProperties'] = self.generate_inner(extras_schema)
-        return json_schema
-
-    def field_is_present(self, field: CoreSchemaField) -> bool:
-        """Whether the field should be included in the generated JSON schema.
-
-        Args:
-            field: The schema for the field itself.
-
-        Returns:
-            `True` if the field should be included in the generated JSON schema, `False` otherwise.
-        """
-        if self.mode == 'serialization':
-            # If you still want to include the field in the generated JSON schema,
-            # override this method and return True
-            return not field.get('serialization_exclude')
-        elif self.mode == 'validation':
-            return True
-        else:
-            assert_never(self.mode)
-
-    def field_is_required(
-        self,
-        field: core_schema.ModelField | core_schema.DataclassField | core_schema.TypedDictField,
-        total: bool,
-    ) -> bool:
-        """Whether the field should be marked as required in the generated JSON schema.
-        (Note that this is irrelevant if the field is not present in the JSON schema.).
-
-        Args:
-            field: The schema for the field itself.
-            total: Only applies to `TypedDictField`s.
-                Indicates if the `TypedDict` this field belongs to is total, in which case any fields that don't
-                explicitly specify `required=False` are required.
-
-        Returns:
-            `True` if the field should be marked as required in the generated JSON schema, `False` otherwise.
-        """
-        if self.mode == 'serialization' and self._config.json_schema_serialization_defaults_required:
-            return not field.get('serialization_exclude')
-        else:
-            if field['type'] == 'typed-dict-field':
-                return field.get('required', total)
-            else:
-                return field['schema']['type'] != 'default'
-
-    def dataclass_args_schema(self, schema: core_schema.DataclassArgsSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that defines a dataclass's constructor arguments.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        named_required_fields: list[tuple[str, bool, CoreSchemaField]] = [
-            (field['name'], self.field_is_required(field, total=True), field)
-            for field in schema['fields']
-            if self.field_is_present(field)
-        ]
-        if self.mode == 'serialization':
-            named_required_fields.extend(self._name_required_computed_fields(schema.get('computed_fields', [])))
-        return self._named_required_fields_schema(named_required_fields)
-
-    def dataclass_schema(self, schema: core_schema.DataclassSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that defines a dataclass.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        cls = schema['cls']
-        config: ConfigDict = getattr(cls, '__pydantic_config__', cast('ConfigDict', {}))
-        title = config.get('title') or cls.__name__
-
-        with self._config_wrapper_stack.push(config):
-            json_schema = self.generate_inner(schema['schema']).copy()
-
-        json_schema_extra = config.get('json_schema_extra')
-        json_schema = self._update_class_schema(json_schema, title, config.get('extra', None), cls, json_schema_extra)
-
-        # Dataclass-specific handling of description
-        if is_dataclass(cls) and not hasattr(cls, '__pydantic_validator__'):
-            # vanilla dataclass; don't use cls.__doc__ as it will contain the class signature by default
-            description = None
-        else:
-            description = None if cls.__doc__ is None else inspect.cleandoc(cls.__doc__)
-        if description:
-            json_schema['description'] = description
-
-        return json_schema
-
-    def arguments_schema(self, schema: core_schema.ArgumentsSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that defines a function's arguments.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        metadata = _core_metadata.CoreMetadataHandler(schema).metadata
-        prefer_positional = metadata.get('pydantic_js_prefer_positional_arguments')
-
-        arguments = schema['arguments_schema']
-        kw_only_arguments = [a for a in arguments if a.get('mode') == 'keyword_only']
-        kw_or_p_arguments = [a for a in arguments if a.get('mode') in {'positional_or_keyword', None}]
-        p_only_arguments = [a for a in arguments if a.get('mode') == 'positional_only']
-        var_args_schema = schema.get('var_args_schema')
-        var_kwargs_schema = schema.get('var_kwargs_schema')
-
-        if prefer_positional:
-            positional_possible = not kw_only_arguments and not var_kwargs_schema
-            if positional_possible:
-                return self.p_arguments_schema(p_only_arguments + kw_or_p_arguments, var_args_schema)
-
-        keyword_possible = not p_only_arguments and not var_args_schema
-        if keyword_possible:
-            return self.kw_arguments_schema(kw_or_p_arguments + kw_only_arguments, var_kwargs_schema)
-
-        if not prefer_positional:
-            positional_possible = not kw_only_arguments and not var_kwargs_schema
-            if positional_possible:
-                return self.p_arguments_schema(p_only_arguments + kw_or_p_arguments, var_args_schema)
-
-        raise PydanticInvalidForJsonSchema(
-            'Unable to generate JSON schema for arguments validator with positional-only and keyword-only arguments'
-        )
-
-    def kw_arguments_schema(
-        self, arguments: list[core_schema.ArgumentsParameter], var_kwargs_schema: CoreSchema | None
-    ) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that defines a function's keyword arguments.
-
-        Args:
-            arguments: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        properties: dict[str, JsonSchemaValue] = {}
-        required: list[str] = []
-        for argument in arguments:
-            name = self.get_argument_name(argument)
-            argument_schema = self.generate_inner(argument['schema']).copy()
-            argument_schema['title'] = self.get_title_from_name(name)
-            properties[name] = argument_schema
-
-            if argument['schema']['type'] != 'default':
-                # This assumes that if the argument has a default value,
-                # the inner schema must be of type WithDefaultSchema.
-                # I believe this is true, but I am not 100% sure
-                required.append(name)
-
-        json_schema: JsonSchemaValue = {'type': 'object', 'properties': properties}
-        if required:
-            json_schema['required'] = required
-
-        if var_kwargs_schema:
-            additional_properties_schema = self.generate_inner(var_kwargs_schema)
-            if additional_properties_schema:
-                json_schema['additionalProperties'] = additional_properties_schema
-        else:
-            json_schema['additionalProperties'] = False
-        return json_schema
-
-    def p_arguments_schema(
-        self, arguments: list[core_schema.ArgumentsParameter], var_args_schema: CoreSchema | None
-    ) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that defines a function's positional arguments.
-
-        Args:
-            arguments: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        prefix_items: list[JsonSchemaValue] = []
-        min_items = 0
-
-        for argument in arguments:
-            name = self.get_argument_name(argument)
-
-            argument_schema = self.generate_inner(argument['schema']).copy()
-            argument_schema['title'] = self.get_title_from_name(name)
-            prefix_items.append(argument_schema)
-
-            if argument['schema']['type'] != 'default':
-                # This assumes that if the argument has a default value,
-                # the inner schema must be of type WithDefaultSchema.
-                # I believe this is true, but I am not 100% sure
-                min_items += 1
-
-        json_schema: JsonSchemaValue = {'type': 'array', 'prefixItems': prefix_items}
-        if min_items:
-            json_schema['minItems'] = min_items
-
-        if var_args_schema:
-            items_schema = self.generate_inner(var_args_schema)
-            if items_schema:
-                json_schema['items'] = items_schema
-        else:
-            json_schema['maxItems'] = len(prefix_items)
-
-        return json_schema
-
-    def get_argument_name(self, argument: core_schema.ArgumentsParameter) -> str:
-        """Retrieves the name of an argument.
-
-        Args:
-            argument: The core schema.
-
-        Returns:
-            The name of the argument.
-        """
-        name = argument['name']
-        if self.by_alias:
-            alias = argument.get('alias')
-            if isinstance(alias, str):
-                name = alias
-            else:
-                pass  # might want to do something else?
-        return name
-
-    def call_schema(self, schema: core_schema.CallSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that defines a function call.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        return self.generate_inner(schema['arguments_schema'])
-
-    def custom_error_schema(self, schema: core_schema.CustomErrorSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that defines a custom error.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        return self.generate_inner(schema['schema'])
-
-    def json_schema(self, schema: core_schema.JsonSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that defines a JSON object.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        content_core_schema = schema.get('schema') or core_schema.any_schema()
-        content_json_schema = self.generate_inner(content_core_schema)
-        if self.mode == 'validation':
-            return {'type': 'string', 'contentMediaType': 'application/json', 'contentSchema': content_json_schema}
-        else:
-            # self.mode == 'serialization'
-            return content_json_schema
-
-    def url_schema(self, schema: core_schema.UrlSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that defines a URL.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        json_schema = {'type': 'string', 'format': 'uri', 'minLength': 1}
-        self.update_with_validations(json_schema, schema, self.ValidationsMapping.string)
-        return json_schema
-
-    def multi_host_url_schema(self, schema: core_schema.MultiHostUrlSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that defines a URL that can be used with multiple hosts.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        # Note: 'multi-host-uri' is a custom/pydantic-specific format, not part of the JSON Schema spec
-        json_schema = {'type': 'string', 'format': 'multi-host-uri', 'minLength': 1}
-        self.update_with_validations(json_schema, schema, self.ValidationsMapping.string)
-        return json_schema
-
-    def uuid_schema(self, schema: core_schema.UuidSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a UUID.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        return {'type': 'string', 'format': 'uuid'}
-
-    def definitions_schema(self, schema: core_schema.DefinitionsSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that defines a JSON object with definitions.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        for definition in schema['definitions']:
-            try:
-                self.generate_inner(definition)
-            except PydanticInvalidForJsonSchema as e:
-                core_ref: CoreRef = CoreRef(definition['ref'])  # type: ignore
-                self._core_defs_invalid_for_json_schema[self.get_defs_ref((core_ref, self.mode))] = e
-                continue
-        return self.generate_inner(schema['schema'])
-
-    def definition_ref_schema(self, schema: core_schema.DefinitionReferenceSchema) -> JsonSchemaValue:
-        """Generates a JSON schema that matches a schema that references a definition.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        core_ref = CoreRef(schema['schema_ref'])
-        _, ref_json_schema = self.get_cache_defs_ref_schema(core_ref)
-        return ref_json_schema
-
-    def ser_schema(
-        self, schema: core_schema.SerSchema | core_schema.IncExSeqSerSchema | core_schema.IncExDictSerSchema
-    ) -> JsonSchemaValue | None:
-        """Generates a JSON schema that matches a schema that defines a serialized object.
-
-        Args:
-            schema: The core schema.
-
-        Returns:
-            The generated JSON schema.
-        """
-        schema_type = schema['type']
-        if schema_type == 'function-plain' or schema_type == 'function-wrap':
-            # PlainSerializerFunctionSerSchema or WrapSerializerFunctionSerSchema
-            return_schema = schema.get('return_schema')
-            if return_schema is not None:
-                return self.generate_inner(return_schema)
-        elif schema_type == 'format' or schema_type == 'to-string':
-            # FormatSerSchema or ToStringSerSchema
-            return self.str_schema(core_schema.str_schema())
-        elif schema['type'] == 'model':
-            # ModelSerSchema
-            return self.generate_inner(schema['schema'])
-        return None
-
-    # ### Utility methods
-
-    def get_title_from_name(self, name: str) -> str:
-        """Retrieves a title from a name.
-
-        Args:
-            name: The name to retrieve a title from.
-
-        Returns:
-            The title.
-        """
-        return name.title().replace('_', ' ')
-
-    def field_title_should_be_set(self, schema: CoreSchemaOrField) -> bool:
-        """Returns true if a field with the given schema should have a title set based on the field name.
-
-        Intuitively, we want this to return true for schemas that wouldn't otherwise provide their own title
-        (e.g., int, float, str), and false for those that would (e.g., BaseModel subclasses).
-
-        Args:
-            schema: The schema to check.
-
-        Returns:
-            `True` if the field should have a title set, `False` otherwise.
-        """
-        if _core_utils.is_core_schema_field(schema):
-            if schema['type'] == 'computed-field':
-                field_schema = schema['return_schema']
-            else:
-                field_schema = schema['schema']
-            return self.field_title_should_be_set(field_schema)
-
-        elif _core_utils.is_core_schema(schema):
-            if schema.get('ref'):  # things with refs, such as models and enums, should not have titles set
-                return False
-            if schema['type'] in {'default', 'nullable', 'definitions'}:
-                return self.field_title_should_be_set(schema['schema'])  # type: ignore[typeddict-item]
-            if _core_utils.is_function_with_inner_schema(schema):
-                return self.field_title_should_be_set(schema['schema'])
-            if schema['type'] == 'definition-ref':
-                # Referenced schemas should not have titles set for the same reason
-                # schemas with refs should not
-                return False
-            return True  # anything else should have title set
-
-        else:
-            raise PydanticInvalidForJsonSchema(f'Unexpected schema type: schema={schema}')  # pragma: no cover
-
-    def normalize_name(self, name: str) -> str:
-        """Normalizes a name to be used as a key in a dictionary.
-
-        Args:
-            name: The name to normalize.
-
-        Returns:
-            The normalized name.
-        """
-        return re.sub(r'[^a-zA-Z0-9.\-_]', '_', name).replace('.', '__')
-
-    def get_defs_ref(self, core_mode_ref: CoreModeRef) -> DefsRef:
-        """Override this method to change the way that definitions keys are generated from a core reference.
-
-        Args:
-            core_mode_ref: The core reference.
-
-        Returns:
-            The definitions key.
-        """
-        # Split the core ref into "components"; generic origins and arguments are each separate components
-        core_ref, mode = core_mode_ref
-        components = re.split(r'([\][,])', core_ref)
-        # Remove IDs from each component
-        components = [x.rsplit(':', 1)[0] for x in components]
-        core_ref_no_id = ''.join(components)
-        # Remove everything before the last period from each "component"
-        components = [re.sub(r'(?:[^.[\]]+\.)+((?:[^.[\]]+))', r'\1', x) for x in components]
-        short_ref = ''.join(components)
-
-        mode_title = _MODE_TITLE_MAPPING[mode]
-
-        # It is important that the generated defs_ref values be such that at least one choice will not
-        # be generated for any other core_ref. Currently, this should be the case because we include
-        # the id of the source type in the core_ref
-        name = DefsRef(self.normalize_name(short_ref))
-        name_mode = DefsRef(self.normalize_name(short_ref) + f'-{mode_title}')
-        module_qualname = DefsRef(self.normalize_name(core_ref_no_id))
-        module_qualname_mode = DefsRef(f'{module_qualname}-{mode_title}')
-        module_qualname_id = DefsRef(self.normalize_name(core_ref))
-        occurrence_index = self._collision_index.get(module_qualname_id)
-        if occurrence_index is None:
-            self._collision_counter[module_qualname] += 1
-            occurrence_index = self._collision_index[module_qualname_id] = self._collision_counter[module_qualname]
-
-        module_qualname_occurrence = DefsRef(f'{module_qualname}__{occurrence_index}')
-        module_qualname_occurrence_mode = DefsRef(f'{module_qualname_mode}__{occurrence_index}')
-
-        self._prioritized_defsref_choices[module_qualname_occurrence_mode] = [
-            name,
-            name_mode,
-            module_qualname,
-            module_qualname_mode,
-            module_qualname_occurrence,
-            module_qualname_occurrence_mode,
-        ]
-
-        return module_qualname_occurrence_mode
-
-    def get_cache_defs_ref_schema(self, core_ref: CoreRef) -> tuple[DefsRef, JsonSchemaValue]:
-        """This method wraps the get_defs_ref method with some cache-lookup/population logic,
-        and returns both the produced defs_ref and the JSON schema that will refer to the right definition.
-
-        Args:
-            core_ref: The core reference to get the definitions reference for.
-
-        Returns:
-            A tuple of the definitions reference and the JSON schema that will refer to it.
-        """
-        core_mode_ref = (core_ref, self.mode)
-        maybe_defs_ref = self.core_to_defs_refs.get(core_mode_ref)
-        if maybe_defs_ref is not None:
-            json_ref = self.core_to_json_refs[core_mode_ref]
-            return maybe_defs_ref, {'$ref': json_ref}
-
-        defs_ref = self.get_defs_ref(core_mode_ref)
-
-        # populate the ref translation mappings
-        self.core_to_defs_refs[core_mode_ref] = defs_ref
-        self.defs_to_core_refs[defs_ref] = core_mode_ref
-
-        json_ref = JsonRef(self.ref_template.format(model=defs_ref))
-        self.core_to_json_refs[core_mode_ref] = json_ref
-        self.json_to_defs_refs[json_ref] = defs_ref
-        ref_json_schema = {'$ref': json_ref}
-        return defs_ref, ref_json_schema
-
-    def handle_ref_overrides(self, json_schema: JsonSchemaValue) -> JsonSchemaValue:
-        """It is not valid for a schema with a top-level $ref to have sibling keys.
-
-        During our own schema generation, we treat sibling keys as overrides to the referenced schema,
-        but this is not how the official JSON schema spec works.
-
-        Because of this, we first remove any sibling keys that are redundant with the referenced schema, then if
-        any remain, we transform the schema from a top-level '$ref' to use allOf to move the $ref out of the top level.
-        (See bottom of https://swagger.io/docs/specification/using-ref/ for a reference about this behavior)
-        """
-        if '$ref' in json_schema:
-            # prevent modifications to the input; this copy may be safe to drop if there is significant overhead
-            json_schema = json_schema.copy()
-
-            referenced_json_schema = self.get_schema_from_definitions(JsonRef(json_schema['$ref']))
-            if referenced_json_schema is None:
-                # This can happen when building schemas for models with not-yet-defined references.
-                # It may be a good idea to do a recursive pass at the end of the generation to remove
-                # any redundant override keys.
-                if len(json_schema) > 1:
-                    # Make it an allOf to at least resolve the sibling keys issue
-                    json_schema = json_schema.copy()
-                    json_schema.setdefault('allOf', [])
-                    json_schema['allOf'].append({'$ref': json_schema['$ref']})
-                    del json_schema['$ref']
-
-                return json_schema
-            for k, v in list(json_schema.items()):
-                if k == '$ref':
-                    continue
-                if k in referenced_json_schema and referenced_json_schema[k] == v:
-                    del json_schema[k]  # redundant key
-            if len(json_schema) > 1:
-                # There is a remaining "override" key, so we need to move $ref out of the top level
-                json_ref = JsonRef(json_schema['$ref'])
-                del json_schema['$ref']
-                assert 'allOf' not in json_schema  # this should never happen, but just in case
-                json_schema['allOf'] = [{'$ref': json_ref}]
-
-        return json_schema
-
-    def get_schema_from_definitions(self, json_ref: JsonRef) -> JsonSchemaValue | None:
-        def_ref = self.json_to_defs_refs[json_ref]
-        if def_ref in self._core_defs_invalid_for_json_schema:
-            raise self._core_defs_invalid_for_json_schema[def_ref]
-        return self.definitions.get(def_ref, None)
-
-    def encode_default(self, dft: Any) -> Any:
-        """Encode a default value to a JSON-serializable value.
-
-        This is used to encode default values for fields in the generated JSON schema.
-
-        Args:
-            dft: The default value to encode.
-
-        Returns:
-            The encoded default value.
-        """
-        config = self._config
-        return pydantic_core.to_jsonable_python(
-            dft,
-            timedelta_mode=config.ser_json_timedelta,
-            bytes_mode=config.ser_json_bytes,
-        )
-
-    def update_with_validations(
-        self, json_schema: JsonSchemaValue, core_schema: CoreSchema, mapping: dict[str, str]
-    ) -> None:
-        """Update the json_schema with the corresponding validations specified in the core_schema,
-        using the provided mapping to translate keys in core_schema to the appropriate keys for a JSON schema.
-
-        Args:
-            json_schema: The JSON schema to update.
-            core_schema: The core schema to get the validations from.
-            mapping: A mapping from core_schema attribute names to the corresponding JSON schema attribute names.
-        """
-        for core_key, json_schema_key in mapping.items():
-            if core_key in core_schema:
-                json_schema[json_schema_key] = core_schema[core_key]
-
-    class ValidationsMapping:
-        """This class just contains mappings from core_schema attribute names to the corresponding
-        JSON schema attribute names. While I suspect it is unlikely to be necessary, you can in
-        principle override this class in a subclass of GenerateJsonSchema (by inheriting from
-        GenerateJsonSchema.ValidationsMapping) to change these mappings.
-        """
-
-        numeric = {
-            'multiple_of': 'multipleOf',
-            'le': 'maximum',
-            'ge': 'minimum',
-            'lt': 'exclusiveMaximum',
-            'gt': 'exclusiveMinimum',
-        }
-        bytes = {
-            'min_length': 'minLength',
-            'max_length': 'maxLength',
-        }
-        string = {
-            'min_length': 'minLength',
-            'max_length': 'maxLength',
-            'pattern': 'pattern',
-        }
-        array = {
-            'min_length': 'minItems',
-            'max_length': 'maxItems',
-        }
-        object = {
-            'min_length': 'minProperties',
-            'max_length': 'maxProperties',
-        }
-        date = {
-            'le': 'maximum',
-            'ge': 'minimum',
-            'lt': 'exclusiveMaximum',
-            'gt': 'exclusiveMinimum',
-        }
-
-    def get_flattened_anyof(self, schemas: list[JsonSchemaValue]) -> JsonSchemaValue:
-        members = []
-        for schema in schemas:
-            if len(schema) == 1 and 'anyOf' in schema:
-                members.extend(schema['anyOf'])
-            else:
-                members.append(schema)
-        members = _deduplicate_schemas(members)
-        if len(members) == 1:
-            return members[0]
-        return {'anyOf': members}
-
-    def get_json_ref_counts(self, json_schema: JsonSchemaValue) -> dict[JsonRef, int]:
-        """Get all values corresponding to the key '$ref' anywhere in the json_schema."""
-        json_refs: dict[JsonRef, int] = Counter()
-
-        def _add_json_refs(schema: Any) -> None:
-            if isinstance(schema, dict):
-                if '$ref' in schema:
-                    json_ref = JsonRef(schema['$ref'])
-                    if not isinstance(json_ref, str):
-                        return  # in this case, '$ref' might have been the name of a property
-                    already_visited = json_ref in json_refs
-                    json_refs[json_ref] += 1
-                    if already_visited:
-                        return  # prevent recursion on a definition that was already visited
-                    defs_ref = self.json_to_defs_refs[json_ref]
-                    if defs_ref in self._core_defs_invalid_for_json_schema:
-                        raise self._core_defs_invalid_for_json_schema[defs_ref]
-                    _add_json_refs(self.definitions[defs_ref])
-
-                for v in schema.values():
-                    _add_json_refs(v)
-            elif isinstance(schema, list):
-                for v in schema:
-                    _add_json_refs(v)
-
-        _add_json_refs(json_schema)
-        return json_refs
-
-    def handle_invalid_for_json_schema(self, schema: CoreSchemaOrField, error_info: str) -> JsonSchemaValue:
-        raise PydanticInvalidForJsonSchema(f'Cannot generate a JsonSchema for {error_info}')
-
-    def emit_warning(self, kind: JsonSchemaWarningKind, detail: str) -> None:
-        """This method simply emits PydanticJsonSchemaWarnings based on handling in the `warning_message` method."""
-        message = self.render_warning_message(kind, detail)
-        if message is not None:
-            warnings.warn(message, PydanticJsonSchemaWarning)
-
-    def render_warning_message(self, kind: JsonSchemaWarningKind, detail: str) -> str | None:
-        """This method is responsible for ignoring warnings as desired, and for formatting the warning messages.
-
-        You can override the value of `ignored_warning_kinds` in a subclass of GenerateJsonSchema
-        to modify what warnings are generated. If you want more control, you can override this method;
-        just return None in situations where you don't want warnings to be emitted.
-
-        Args:
-            kind: The kind of warning to render. It can be one of the following:
-
-                - 'skipped-choice': A choice field was skipped because it had no valid choices.
-                - 'non-serializable-default': A default value was skipped because it was not JSON-serializable.
-            detail: A string with additional details about the warning.
-
-        Returns:
-            The formatted warning message, or `None` if no warning should be emitted.
-        """
-        if kind in self.ignored_warning_kinds:
-            return None
-        return f'{detail} [{kind}]'
-
-    def _build_definitions_remapping(self) -> _DefinitionsRemapping:
-        defs_to_json: dict[DefsRef, JsonRef] = {}
-        for defs_refs in self._prioritized_defsref_choices.values():
-            for defs_ref in defs_refs:
-                json_ref = JsonRef(self.ref_template.format(model=defs_ref))
-                defs_to_json[defs_ref] = json_ref
-
-        return _DefinitionsRemapping.from_prioritized_choices(
-            self._prioritized_defsref_choices, defs_to_json, self.definitions
-        )
-
-    def _garbage_collect_definitions(self, schema: JsonSchemaValue) -> None:
-        visited_defs_refs: set[DefsRef] = set()
-        unvisited_json_refs = _get_all_json_refs(schema)
-        while unvisited_json_refs:
-            next_json_ref = unvisited_json_refs.pop()
-            next_defs_ref = self.json_to_defs_refs[next_json_ref]
-            if next_defs_ref in visited_defs_refs:
-                continue
-            visited_defs_refs.add(next_defs_ref)
-            unvisited_json_refs.update(_get_all_json_refs(self.definitions[next_defs_ref]))
-
-        self.definitions = {k: v for k, v in self.definitions.items() if k in visited_defs_refs}
-
-
-# ##### Start JSON Schema Generation Functions #####
-
-
-def model_json_schema(
-    cls: type[BaseModel] | type[PydanticDataclass],
-    by_alias: bool = True,
-    ref_template: str = DEFAULT_REF_TEMPLATE,
-    schema_generator: type[GenerateJsonSchema] = GenerateJsonSchema,
-    mode: JsonSchemaMode = 'validation',
-) -> dict[str, Any]:
-    """Utility function to generate a JSON Schema for a model.
-
-    Args:
-        cls: The model class to generate a JSON Schema for.
-        by_alias: If `True` (the default), fields will be serialized according to their alias.
-            If `False`, fields will be serialized according to their attribute name.
-        ref_template: The template to use for generating JSON Schema references.
-        schema_generator: The class to use for generating the JSON Schema.
-        mode: The mode to use for generating the JSON Schema. It can be one of the following:
-
-            - 'validation': Generate a JSON Schema for validating data.
-            - 'serialization': Generate a JSON Schema for serializing data.
-
-    Returns:
-        The generated JSON Schema.
-    """
-    schema_generator_instance = schema_generator(by_alias=by_alias, ref_template=ref_template)
-    if isinstance(cls.__pydantic_validator__, _mock_val_ser.MockValSer):
-        cls.__pydantic_validator__.rebuild()
-    assert '__pydantic_core_schema__' in cls.__dict__, 'this is a bug! please report it'
-    return schema_generator_instance.generate(cls.__pydantic_core_schema__, mode=mode)
-
-
-def models_json_schema(
-    models: Sequence[tuple[type[BaseModel] | type[PydanticDataclass], JsonSchemaMode]],
-    *,
-    by_alias: bool = True,
-    title: str | None = None,
-    description: str | None = None,
-    ref_template: str = DEFAULT_REF_TEMPLATE,
-    schema_generator: type[GenerateJsonSchema] = GenerateJsonSchema,
-) -> tuple[dict[tuple[type[BaseModel] | type[PydanticDataclass], JsonSchemaMode], JsonSchemaValue], JsonSchemaValue]:
-    """Utility function to generate a JSON Schema for multiple models.
-
-    Args:
-        models: A sequence of tuples of the form (model, mode).
-        by_alias: Whether field aliases should be used as keys in the generated JSON Schema.
-        title: The title of the generated JSON Schema.
-        description: The description of the generated JSON Schema.
-        ref_template: The reference template to use for generating JSON Schema references.
-        schema_generator: The schema generator to use for generating the JSON Schema.
-
-    Returns:
-        A tuple where:
-            - The first element is a dictionary whose keys are tuples of JSON schema key type and JSON mode, and
-                whose values are the JSON schema corresponding to that pair of inputs. (These schemas may have
-                JsonRef references to definitions that are defined in the second returned element.)
-            - The second element is a JSON schema containing all definitions referenced in the first returned
-                    element, along with the optional title and description keys.
-    """
-    for cls, _ in models:
-        if isinstance(cls.__pydantic_validator__, _mock_val_ser.MockValSer):
-            cls.__pydantic_validator__.rebuild()
-
-    instance = schema_generator(by_alias=by_alias, ref_template=ref_template)
-    inputs = [(m, mode, m.__pydantic_core_schema__) for m, mode in models]
-    json_schemas_map, definitions = instance.generate_definitions(inputs)
-
-    json_schema: dict[str, Any] = {}
-    if definitions:
-        json_schema['$defs'] = definitions
-    if title:
-        json_schema['title'] = title
-    if description:
-        json_schema['description'] = description
-
-    return json_schemas_map, json_schema
-
-
-# ##### End JSON Schema Generation Functions #####
-
-
-_HashableJsonValue: TypeAlias = Union[
-    int, float, str, bool, None, Tuple['_HashableJsonValue', ...], Tuple[Tuple[str, '_HashableJsonValue'], ...]
-]
-
-
-def _deduplicate_schemas(schemas: Iterable[JsonDict]) -> list[JsonDict]:
-    return list({_make_json_hashable(schema): schema for schema in schemas}.values())
-
-
-def _make_json_hashable(value: JsonValue) -> _HashableJsonValue:
-    if isinstance(value, dict):
-        return tuple(sorted((k, _make_json_hashable(v)) for k, v in value.items()))
-    elif isinstance(value, list):
-        return tuple(_make_json_hashable(v) for v in value)
-    else:
-        return value
-
-
-def _sort_json_schema(value: JsonSchemaValue, parent_key: str | None = None) -> JsonSchemaValue:
-    if isinstance(value, dict):
-        sorted_dict: dict[str, JsonSchemaValue] = {}
-        keys = value.keys()
-        if (parent_key != 'properties') and (parent_key != 'default'):
-            keys = sorted(keys)
-        for key in keys:
-            sorted_dict[key] = _sort_json_schema(value[key], parent_key=key)
-        return sorted_dict
-    elif isinstance(value, list):
-        sorted_list: list[JsonSchemaValue] = []
-        for item in value:  # type: ignore
-            sorted_list.append(_sort_json_schema(item, parent_key))
-        return sorted_list  # type: ignore
-    else:
-        return value
-
-
-@dataclasses.dataclass(**_internal_dataclass.slots_true)
-class WithJsonSchema:
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/json_schema/#withjsonschema-annotation
-
-    Add this as an annotation on a field to override the (base) JSON schema that would be generated for that field.
-    This provides a way to set a JSON schema for types that would otherwise raise errors when producing a JSON schema,
-    such as Callable, or types that have an is-instance core schema, without needing to go so far as creating a
-    custom subclass of pydantic.json_schema.GenerateJsonSchema.
-    Note that any _modifications_ to the schema that would normally be made (such as setting the title for model fields)
-    will still be performed.
-
-    If `mode` is set this will only apply to that schema generation mode, allowing you
-    to set different json schemas for validation and serialization.
-    """
-
-    json_schema: JsonSchemaValue | None
-    mode: Literal['validation', 'serialization'] | None = None
-
-    def __get_pydantic_json_schema__(
-        self, core_schema: core_schema.CoreSchema, handler: GetJsonSchemaHandler
-    ) -> JsonSchemaValue:
-        mode = self.mode or handler.mode
-        if mode != handler.mode:
-            return handler(core_schema)
-        if self.json_schema is None:
-            # This exception is handled in pydantic.json_schema.GenerateJsonSchema._named_required_fields_schema
-            raise PydanticOmit
-        else:
-            return self.json_schema
-
-    def __hash__(self) -> int:
-        return hash(type(self.mode))
-
-
-@dataclasses.dataclass(**_internal_dataclass.slots_true)
-class Examples:
-    """Add examples to a JSON schema.
-
-    Examples should be a map of example names (strings)
-    to example values (any valid JSON).
-
-    If `mode` is set this will only apply to that schema generation mode,
-    allowing you to add different examples for validation and serialization.
-    """
-
-    examples: dict[str, Any]
-    mode: Literal['validation', 'serialization'] | None = None
-
-    def __get_pydantic_json_schema__(
-        self, core_schema: core_schema.CoreSchema, handler: GetJsonSchemaHandler
-    ) -> JsonSchemaValue:
-        mode = self.mode or handler.mode
-        json_schema = handler(core_schema)
-        if mode != handler.mode:
-            return json_schema
-        examples = json_schema.get('examples', {})
-        examples.update(to_jsonable_python(self.examples))
-        json_schema['examples'] = examples
-        return json_schema
-
-    def __hash__(self) -> int:
-        return hash(type(self.mode))
-
-
-def _get_all_json_refs(item: Any) -> set[JsonRef]:
-    """Get all the definitions references from a JSON schema."""
-    refs: set[JsonRef] = set()
-    if isinstance(item, dict):
-        for key, value in item.items():
-            if key == '$ref' and isinstance(value, str):
-                # the isinstance check ensures that '$ref' isn't the name of a property, etc.
-                refs.add(JsonRef(value))
-            elif isinstance(value, dict):
-                refs.update(_get_all_json_refs(value))
-            elif isinstance(value, list):
-                for item in value:
-                    refs.update(_get_all_json_refs(item))
-    elif isinstance(item, list):
-        for item in item:
-            refs.update(_get_all_json_refs(item))
-    return refs
-
-
-AnyType = TypeVar('AnyType')
-
-if TYPE_CHECKING:
-    SkipJsonSchema = Annotated[AnyType, ...]
-else:
-
-    @dataclasses.dataclass(**_internal_dataclass.slots_true)
-    class SkipJsonSchema:
-        """Usage docs: https://docs.pydantic.dev/2.6/concepts/json_schema/#skipjsonschema-annotation
-
-        Add this as an annotation on a field to skip generating a JSON schema for that field.
-
-        Example:
-            ```py
-            from typing import Union
-
-            from pydantic import BaseModel
-            from pydantic.json_schema import SkipJsonSchema
-
-            from pprint import pprint
-
-
-            class Model(BaseModel):
-                a: Union[int, None] = None  # (1)!
-                b: Union[int, SkipJsonSchema[None]] = None  # (2)!
-                c: SkipJsonSchema[Union[int, None]] = None  # (3)!
-
-
-            pprint(Model.model_json_schema())
-            '''
-            {
-                'properties': {
-                    'a': {
-                        'anyOf': [
-                            {'type': 'integer'},
-                            {'type': 'null'}
-                        ],
-                        'default': None,
-                        'title': 'A'
-                    },
-                    'b': {
-                        'default': None,
-                        'title': 'B',
-                        'type': 'integer'
-                    }
-                },
-                'title': 'Model',
-                'type': 'object'
-            }
-            '''
-            ```
-
-            1. The integer and null types are both included in the schema for `a`.
-            2. The integer type is the only type included in the schema for `b`.
-            3. The entirety of the `c` field is omitted from the schema.
-        """
-
-        def __class_getitem__(cls, item: AnyType) -> AnyType:
-            return Annotated[item, cls()]
-
-        def __get_pydantic_json_schema__(
-            self, core_schema: CoreSchema, handler: GetJsonSchemaHandler
-        ) -> JsonSchemaValue:
-            raise PydanticOmit
-
-        def __hash__(self) -> int:
-            return hash(type(self))
-
-
-def _get_typed_dict_config(schema: core_schema.TypedDictSchema) -> ConfigDict:
-    metadata = _core_metadata.CoreMetadataHandler(schema).metadata
-    cls = metadata.get('pydantic_typed_dict_cls')
-    if cls is not None:
-        try:
-            return _decorators.get_attribute_from_bases(cls, '__pydantic_config__')
-        except AttributeError:
-            pass
-    return {}
diff --git a/lib/pydantic/main.py b/lib/pydantic/main.py
deleted file mode 100644
index 8c7ebbbf..00000000
--- a/lib/pydantic/main.py
+++ /dev/null
@@ -1,1500 +0,0 @@
-"""Logic for creating models."""
-from __future__ import annotations as _annotations
-
-import operator
-import sys
-import types
-import typing
-import warnings
-from copy import copy, deepcopy
-from typing import Any, ClassVar
-
-import pydantic_core
-import typing_extensions
-from pydantic_core import PydanticUndefined
-
-from ._internal import (
-    _config,
-    _decorators,
-    _fields,
-    _forward_ref,
-    _generics,
-    _mock_val_ser,
-    _model_construction,
-    _repr,
-    _typing_extra,
-    _utils,
-)
-from ._migration import getattr_migration
-from .annotated_handlers import GetCoreSchemaHandler, GetJsonSchemaHandler
-from .config import ConfigDict
-from .errors import PydanticUndefinedAnnotation, PydanticUserError
-from .json_schema import DEFAULT_REF_TEMPLATE, GenerateJsonSchema, JsonSchemaMode, JsonSchemaValue, model_json_schema
-from .warnings import PydanticDeprecatedSince20
-
-if typing.TYPE_CHECKING:
-    from inspect import Signature
-    from pathlib import Path
-
-    from pydantic_core import CoreSchema, SchemaSerializer, SchemaValidator
-    from typing_extensions import Literal, Unpack
-
-    from ._internal._utils import AbstractSetIntStr, MappingIntStrAny
-    from .deprecated.parse import Protocol as DeprecatedParseProtocol
-    from .fields import ComputedFieldInfo, FieldInfo, ModelPrivateAttr
-    from .fields import Field as _Field
-
-    TupleGenerator = typing.Generator[typing.Tuple[str, Any], None, None]
-    Model = typing.TypeVar('Model', bound='BaseModel')
-    # should be `set[int] | set[str] | dict[int, IncEx] | dict[str, IncEx] | None`, but mypy can't cope
-    IncEx: typing_extensions.TypeAlias = 'set[int] | set[str] | dict[int, Any] | dict[str, Any] | None'
-else:
-    # See PyCharm issues https://youtrack.jetbrains.com/issue/PY-21915
-    # and https://youtrack.jetbrains.com/issue/PY-51428
-    DeprecationWarning = PydanticDeprecatedSince20
-
-__all__ = 'BaseModel', 'create_model'
-
-_object_setattr = _model_construction.object_setattr
-
-
-class BaseModel(metaclass=_model_construction.ModelMetaclass):
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/models/
-
-    A base class for creating Pydantic models.
-
-    Attributes:
-        __class_vars__: The names of classvars defined on the model.
-        __private_attributes__: Metadata about the private attributes of the model.
-        __signature__: The signature for instantiating the model.
-
-        __pydantic_complete__: Whether model building is completed, or if there are still undefined fields.
-        __pydantic_core_schema__: The pydantic-core schema used to build the SchemaValidator and SchemaSerializer.
-        __pydantic_custom_init__: Whether the model has a custom `__init__` function.
-        __pydantic_decorators__: Metadata containing the decorators defined on the model.
-            This replaces `Model.__validators__` and `Model.__root_validators__` from Pydantic V1.
-        __pydantic_generic_metadata__: Metadata for generic models; contains data used for a similar purpose to
-            __args__, __origin__, __parameters__ in typing-module generics. May eventually be replaced by these.
-        __pydantic_parent_namespace__: Parent namespace of the model, used for automatic rebuilding of models.
-        __pydantic_post_init__: The name of the post-init method for the model, if defined.
-        __pydantic_root_model__: Whether the model is a `RootModel`.
-        __pydantic_serializer__: The pydantic-core SchemaSerializer used to dump instances of the model.
-        __pydantic_validator__: The pydantic-core SchemaValidator used to validate instances of the model.
-
-        __pydantic_extra__: An instance attribute with the values of extra fields from validation when
-            `model_config['extra'] == 'allow'`.
-        __pydantic_fields_set__: An instance attribute with the names of fields explicitly set.
-        __pydantic_private__: Instance attribute with the values of private attributes set on the model instance.
-    """
-
-    if typing.TYPE_CHECKING:
-        # Here we provide annotations for the attributes of BaseModel.
-        # Many of these are populated by the metaclass, which is why this section is in a `TYPE_CHECKING` block.
-        # However, for the sake of easy review, we have included type annotations of all class and instance attributes
-        # of `BaseModel` here:
-
-        # Class attributes
-        model_config: ClassVar[ConfigDict]
-        """
-        Configuration for the model, should be a dictionary conforming to [`ConfigDict`][pydantic.config.ConfigDict].
-        """
-
-        model_fields: ClassVar[dict[str, FieldInfo]]
-        """
-        Metadata about the fields defined on the model,
-        mapping of field names to [`FieldInfo`][pydantic.fields.FieldInfo].
-
-        This replaces `Model.__fields__` from Pydantic V1.
-        """
-
-        model_computed_fields: ClassVar[dict[str, ComputedFieldInfo]]
-        """A dictionary of computed field names and their corresponding `ComputedFieldInfo` objects."""
-
-        __class_vars__: ClassVar[set[str]]
-        __private_attributes__: ClassVar[dict[str, ModelPrivateAttr]]
-        __signature__: ClassVar[Signature]
-
-        __pydantic_complete__: ClassVar[bool]
-        __pydantic_core_schema__: ClassVar[CoreSchema]
-        __pydantic_custom_init__: ClassVar[bool]
-        __pydantic_decorators__: ClassVar[_decorators.DecoratorInfos]
-        __pydantic_generic_metadata__: ClassVar[_generics.PydanticGenericMetadata]
-        __pydantic_parent_namespace__: ClassVar[dict[str, Any] | None]
-        __pydantic_post_init__: ClassVar[None | Literal['model_post_init']]
-        __pydantic_root_model__: ClassVar[bool]
-        __pydantic_serializer__: ClassVar[SchemaSerializer]
-        __pydantic_validator__: ClassVar[SchemaValidator]
-
-        # Instance attributes
-        # Note: we use the non-existent kwarg `init=False` in pydantic.fields.Field below so that @dataclass_transform
-        # doesn't think these are valid as keyword arguments to the class initializer.
-        __pydantic_extra__: dict[str, Any] | None = _Field(init=False)  # type: ignore
-        __pydantic_fields_set__: set[str] = _Field(init=False)  # type: ignore
-        __pydantic_private__: dict[str, Any] | None = _Field(init=False)  # type: ignore
-
-    else:
-        # `model_fields` and `__pydantic_decorators__` must be set for
-        # pydantic._internal._generate_schema.GenerateSchema.model_schema to work for a plain BaseModel annotation
-        model_fields = {}
-        model_computed_fields = {}
-
-        __pydantic_decorators__ = _decorators.DecoratorInfos()
-        __pydantic_parent_namespace__ = None
-        # Prevent `BaseModel` from being instantiated directly:
-        __pydantic_validator__ = _mock_val_ser.MockValSer(
-            'Pydantic models should inherit from BaseModel, BaseModel cannot be instantiated directly',
-            val_or_ser='validator',
-            code='base-model-instantiated',
-        )
-        __pydantic_serializer__ = _mock_val_ser.MockValSer(
-            'Pydantic models should inherit from BaseModel, BaseModel cannot be instantiated directly',
-            val_or_ser='serializer',
-            code='base-model-instantiated',
-        )
-
-    __slots__ = '__dict__', '__pydantic_fields_set__', '__pydantic_extra__', '__pydantic_private__'
-
-    model_config = ConfigDict()
-    __pydantic_complete__ = False
-    __pydantic_root_model__ = False
-
-    def __init__(self, /, **data: Any) -> None:  # type: ignore
-        """Create a new model by parsing and validating input data from keyword arguments.
-
-        Raises [`ValidationError`][pydantic_core.ValidationError] if the input data cannot be
-        validated to form a valid model.
-
-        `self` is explicitly positional-only to allow `self` as a field name.
-        """
-        # `__tracebackhide__` tells pytest and some other tools to omit this function from tracebacks
-        __tracebackhide__ = True
-        self.__pydantic_validator__.validate_python(data, self_instance=self)
-
-    # The following line sets a flag that we use to determine when `__init__` gets overridden by the user
-    __init__.__pydantic_base_init__ = True  # pyright: ignore[reportFunctionMemberAccess]
-
-    @property
-    def model_extra(self) -> dict[str, Any] | None:
-        """Get extra fields set during validation.
-
-        Returns:
-            A dictionary of extra fields, or `None` if `config.extra` is not set to `"allow"`.
-        """
-        return self.__pydantic_extra__
-
-    @property
-    def model_fields_set(self) -> set[str]:
-        """Returns the set of fields that have been explicitly set on this model instance.
-
-        Returns:
-            A set of strings representing the fields that have been set,
-                i.e. that were not filled from defaults.
-        """
-        return self.__pydantic_fields_set__
-
-    @classmethod
-    def model_construct(cls: type[Model], _fields_set: set[str] | None = None, **values: Any) -> Model:
-        """Creates a new instance of the `Model` class with validated data.
-
-        Creates a new model setting `__dict__` and `__pydantic_fields_set__` from trusted or pre-validated data.
-        Default values are respected, but no other validation is performed.
-        Behaves as if `Config.extra = 'allow'` was set since it adds all passed values
-
-        Args:
-            _fields_set: The set of field names accepted for the Model instance.
-            values: Trusted or pre-validated data dictionary.
-
-        Returns:
-            A new instance of the `Model` class with validated data.
-        """
-        m = cls.__new__(cls)
-        fields_values: dict[str, Any] = {}
-        fields_set = set()
-
-        for name, field in cls.model_fields.items():
-            if field.alias and field.alias in values:
-                fields_values[name] = values.pop(field.alias)
-                fields_set.add(name)
-            elif name in values:
-                fields_values[name] = values.pop(name)
-                fields_set.add(name)
-            elif not field.is_required():
-                fields_values[name] = field.get_default(call_default_factory=True)
-        if _fields_set is None:
-            _fields_set = fields_set
-
-        _extra: dict[str, Any] | None = None
-        if cls.model_config.get('extra') == 'allow':
-            _extra = {}
-            for k, v in values.items():
-                _extra[k] = v
-        else:
-            fields_values.update(values)
-        _object_setattr(m, '__dict__', fields_values)
-        _object_setattr(m, '__pydantic_fields_set__', _fields_set)
-        if not cls.__pydantic_root_model__:
-            _object_setattr(m, '__pydantic_extra__', _extra)
-
-        if cls.__pydantic_post_init__:
-            m.model_post_init(None)
-            # update private attributes with values set
-            if hasattr(m, '__pydantic_private__') and m.__pydantic_private__ is not None:
-                for k, v in values.items():
-                    if k in m.__private_attributes__:
-                        m.__pydantic_private__[k] = v
-
-        elif not cls.__pydantic_root_model__:
-            # Note: if there are any private attributes, cls.__pydantic_post_init__ would exist
-            # Since it doesn't, that means that `__pydantic_private__` should be set to None
-            _object_setattr(m, '__pydantic_private__', None)
-
-        return m
-
-    def model_copy(self: Model, *, update: dict[str, Any] | None = None, deep: bool = False) -> Model:
-        """Usage docs: https://docs.pydantic.dev/2.6/concepts/serialization/#model_copy
-
-        Returns a copy of the model.
-
-        Args:
-            update: Values to change/add in the new model. Note: the data is not validated
-                before creating the new model. You should trust this data.
-            deep: Set to `True` to make a deep copy of the model.
-
-        Returns:
-            New model instance.
-        """
-        copied = self.__deepcopy__() if deep else self.__copy__()
-        if update:
-            if self.model_config.get('extra') == 'allow':
-                for k, v in update.items():
-                    if k in self.model_fields:
-                        copied.__dict__[k] = v
-                    else:
-                        if copied.__pydantic_extra__ is None:
-                            copied.__pydantic_extra__ = {}
-                        copied.__pydantic_extra__[k] = v
-            else:
-                copied.__dict__.update(update)
-            copied.__pydantic_fields_set__.update(update.keys())
-        return copied
-
-    def model_dump(
-        self,
-        *,
-        mode: Literal['json', 'python'] | str = 'python',
-        include: IncEx = None,
-        exclude: IncEx = None,
-        by_alias: bool = False,
-        exclude_unset: bool = False,
-        exclude_defaults: bool = False,
-        exclude_none: bool = False,
-        round_trip: bool = False,
-        warnings: bool = True,
-    ) -> dict[str, Any]:
-        """Usage docs: https://docs.pydantic.dev/2.6/concepts/serialization/#modelmodel_dump
-
-        Generate a dictionary representation of the model, optionally specifying which fields to include or exclude.
-
-        Args:
-            mode: The mode in which `to_python` should run.
-                If mode is 'json', the output will only contain JSON serializable types.
-                If mode is 'python', the output may contain non-JSON-serializable Python objects.
-            include: A list of fields to include in the output.
-            exclude: A list of fields to exclude from the output.
-            by_alias: Whether to use the field's alias in the dictionary key if defined.
-            exclude_unset: Whether to exclude fields that have not been explicitly set.
-            exclude_defaults: Whether to exclude fields that are set to their default value.
-            exclude_none: Whether to exclude fields that have a value of `None`.
-            round_trip: If True, dumped values should be valid as input for non-idempotent types such as Json[T].
-            warnings: Whether to log warnings when invalid fields are encountered.
-
-        Returns:
-            A dictionary representation of the model.
-        """
-        return self.__pydantic_serializer__.to_python(
-            self,
-            mode=mode,
-            by_alias=by_alias,
-            include=include,
-            exclude=exclude,
-            exclude_unset=exclude_unset,
-            exclude_defaults=exclude_defaults,
-            exclude_none=exclude_none,
-            round_trip=round_trip,
-            warnings=warnings,
-        )
-
-    def model_dump_json(
-        self,
-        *,
-        indent: int | None = None,
-        include: IncEx = None,
-        exclude: IncEx = None,
-        by_alias: bool = False,
-        exclude_unset: bool = False,
-        exclude_defaults: bool = False,
-        exclude_none: bool = False,
-        round_trip: bool = False,
-        warnings: bool = True,
-    ) -> str:
-        """Usage docs: https://docs.pydantic.dev/2.6/concepts/serialization/#modelmodel_dump_json
-
-        Generates a JSON representation of the model using Pydantic's `to_json` method.
-
-        Args:
-            indent: Indentation to use in the JSON output. If None is passed, the output will be compact.
-            include: Field(s) to include in the JSON output.
-            exclude: Field(s) to exclude from the JSON output.
-            by_alias: Whether to serialize using field aliases.
-            exclude_unset: Whether to exclude fields that have not been explicitly set.
-            exclude_defaults: Whether to exclude fields that are set to their default value.
-            exclude_none: Whether to exclude fields that have a value of `None`.
-            round_trip: If True, dumped values should be valid as input for non-idempotent types such as Json[T].
-            warnings: Whether to log warnings when invalid fields are encountered.
-
-        Returns:
-            A JSON string representation of the model.
-        """
-        return self.__pydantic_serializer__.to_json(
-            self,
-            indent=indent,
-            include=include,
-            exclude=exclude,
-            by_alias=by_alias,
-            exclude_unset=exclude_unset,
-            exclude_defaults=exclude_defaults,
-            exclude_none=exclude_none,
-            round_trip=round_trip,
-            warnings=warnings,
-        ).decode()
-
-    @classmethod
-    def model_json_schema(
-        cls,
-        by_alias: bool = True,
-        ref_template: str = DEFAULT_REF_TEMPLATE,
-        schema_generator: type[GenerateJsonSchema] = GenerateJsonSchema,
-        mode: JsonSchemaMode = 'validation',
-    ) -> dict[str, Any]:
-        """Generates a JSON schema for a model class.
-
-        Args:
-            by_alias: Whether to use attribute aliases or not.
-            ref_template: The reference template.
-            schema_generator: To override the logic used to generate the JSON schema, as a subclass of
-                `GenerateJsonSchema` with your desired modifications
-            mode: The mode in which to generate the schema.
-
-        Returns:
-            The JSON schema for the given model class.
-        """
-        return model_json_schema(
-            cls, by_alias=by_alias, ref_template=ref_template, schema_generator=schema_generator, mode=mode
-        )
-
-    @classmethod
-    def model_parametrized_name(cls, params: tuple[type[Any], ...]) -> str:
-        """Compute the class name for parametrizations of generic classes.
-
-        This method can be overridden to achieve a custom naming scheme for generic BaseModels.
-
-        Args:
-            params: Tuple of types of the class. Given a generic class
-                `Model` with 2 type variables and a concrete model `Model[str, int]`,
-                the value `(str, int)` would be passed to `params`.
-
-        Returns:
-            String representing the new class where `params` are passed to `cls` as type variables.
-
-        Raises:
-            TypeError: Raised when trying to generate concrete names for non-generic models.
-        """
-        if not issubclass(cls, typing.Generic):
-            raise TypeError('Concrete names should only be generated for generic models.')
-
-        # Any strings received should represent forward references, so we handle them specially below.
-        # If we eventually move toward wrapping them in a ForwardRef in __class_getitem__ in the future,
-        # we may be able to remove this special case.
-        param_names = [param if isinstance(param, str) else _repr.display_as_type(param) for param in params]
-        params_component = ', '.join(param_names)
-        return f'{cls.__name__}[{params_component}]'
-
-    def model_post_init(self, __context: Any) -> None:
-        """Override this method to perform additional initialization after `__init__` and `model_construct`.
-        This is useful if you want to do some validation that requires the entire model to be initialized.
-        """
-        pass
-
-    @classmethod
-    def model_rebuild(
-        cls,
-        *,
-        force: bool = False,
-        raise_errors: bool = True,
-        _parent_namespace_depth: int = 2,
-        _types_namespace: dict[str, Any] | None = None,
-    ) -> bool | None:
-        """Try to rebuild the pydantic-core schema for the model.
-
-        This may be necessary when one of the annotations is a ForwardRef which could not be resolved during
-        the initial attempt to build the schema, and automatic rebuilding fails.
-
-        Args:
-            force: Whether to force the rebuilding of the model schema, defaults to `False`.
-            raise_errors: Whether to raise errors, defaults to `True`.
-            _parent_namespace_depth: The depth level of the parent namespace, defaults to 2.
-            _types_namespace: The types namespace, defaults to `None`.
-
-        Returns:
-            Returns `None` if the schema is already "complete" and rebuilding was not required.
-            If rebuilding _was_ required, returns `True` if rebuilding was successful, otherwise `False`.
-        """
-        if not force and cls.__pydantic_complete__:
-            return None
-        else:
-            if '__pydantic_core_schema__' in cls.__dict__:
-                delattr(cls, '__pydantic_core_schema__')  # delete cached value to ensure full rebuild happens
-            if _types_namespace is not None:
-                types_namespace: dict[str, Any] | None = _types_namespace.copy()
-            else:
-                if _parent_namespace_depth > 0:
-                    frame_parent_ns = _typing_extra.parent_frame_namespace(parent_depth=_parent_namespace_depth) or {}
-                    cls_parent_ns = (
-                        _model_construction.unpack_lenient_weakvaluedict(cls.__pydantic_parent_namespace__) or {}
-                    )
-                    types_namespace = {**cls_parent_ns, **frame_parent_ns}
-                    cls.__pydantic_parent_namespace__ = _model_construction.build_lenient_weakvaluedict(types_namespace)
-                else:
-                    types_namespace = _model_construction.unpack_lenient_weakvaluedict(
-                        cls.__pydantic_parent_namespace__
-                    )
-
-                types_namespace = _typing_extra.get_cls_types_namespace(cls, types_namespace)
-
-            # manually override defer_build so complete_model_class doesn't skip building the model again
-            config = {**cls.model_config, 'defer_build': False}
-            return _model_construction.complete_model_class(
-                cls,
-                cls.__name__,
-                _config.ConfigWrapper(config, check=False),
-                raise_errors=raise_errors,
-                types_namespace=types_namespace,
-            )
-
-    @classmethod
-    def model_validate(
-        cls: type[Model],
-        obj: Any,
-        *,
-        strict: bool | None = None,
-        from_attributes: bool | None = None,
-        context: dict[str, Any] | None = None,
-    ) -> Model:
-        """Validate a pydantic model instance.
-
-        Args:
-            obj: The object to validate.
-            strict: Whether to enforce types strictly.
-            from_attributes: Whether to extract data from object attributes.
-            context: Additional context to pass to the validator.
-
-        Raises:
-            ValidationError: If the object could not be validated.
-
-        Returns:
-            The validated model instance.
-        """
-        # `__tracebackhide__` tells pytest and some other tools to omit this function from tracebacks
-        __tracebackhide__ = True
-        return cls.__pydantic_validator__.validate_python(
-            obj, strict=strict, from_attributes=from_attributes, context=context
-        )
-
-    @classmethod
-    def model_validate_json(
-        cls: type[Model],
-        json_data: str | bytes | bytearray,
-        *,
-        strict: bool | None = None,
-        context: dict[str, Any] | None = None,
-    ) -> Model:
-        """Usage docs: https://docs.pydantic.dev/2.6/concepts/json/#json-parsing
-
-        Validate the given JSON data against the Pydantic model.
-
-        Args:
-            json_data: The JSON data to validate.
-            strict: Whether to enforce types strictly.
-            context: Extra variables to pass to the validator.
-
-        Returns:
-            The validated Pydantic model.
-
-        Raises:
-            ValueError: If `json_data` is not a JSON string.
-        """
-        # `__tracebackhide__` tells pytest and some other tools to omit this function from tracebacks
-        __tracebackhide__ = True
-        return cls.__pydantic_validator__.validate_json(json_data, strict=strict, context=context)
-
-    @classmethod
-    def model_validate_strings(
-        cls: type[Model],
-        obj: Any,
-        *,
-        strict: bool | None = None,
-        context: dict[str, Any] | None = None,
-    ) -> Model:
-        """Validate the given object contains string data against the Pydantic model.
-
-        Args:
-            obj: The object contains string data to validate.
-            strict: Whether to enforce types strictly.
-            context: Extra variables to pass to the validator.
-
-        Returns:
-            The validated Pydantic model.
-        """
-        # `__tracebackhide__` tells pytest and some other tools to omit this function from tracebacks
-        __tracebackhide__ = True
-        return cls.__pydantic_validator__.validate_strings(obj, strict=strict, context=context)
-
-    @classmethod
-    def __get_pydantic_core_schema__(cls, __source: type[BaseModel], __handler: GetCoreSchemaHandler) -> CoreSchema:
-        """Hook into generating the model's CoreSchema.
-
-        Args:
-            __source: The class we are generating a schema for.
-                This will generally be the same as the `cls` argument if this is a classmethod.
-            __handler: Call into Pydantic's internal JSON schema generation.
-                A callable that calls into Pydantic's internal CoreSchema generation logic.
-
-        Returns:
-            A `pydantic-core` `CoreSchema`.
-        """
-        # Only use the cached value from this _exact_ class; we don't want one from a parent class
-        # This is why we check `cls.__dict__` and don't use `cls.__pydantic_core_schema__` or similar.
-        if '__pydantic_core_schema__' in cls.__dict__:
-            # Due to the way generic classes are built, it's possible that an invalid schema may be temporarily
-            # set on generic classes. I think we could resolve this to ensure that we get proper schema caching
-            # for generics, but for simplicity for now, we just always rebuild if the class has a generic origin.
-            if not cls.__pydantic_generic_metadata__['origin']:
-                return cls.__pydantic_core_schema__
-
-        return __handler(__source)
-
-    @classmethod
-    def __get_pydantic_json_schema__(
-        cls,
-        __core_schema: CoreSchema,
-        __handler: GetJsonSchemaHandler,
-    ) -> JsonSchemaValue:
-        """Hook into generating the model's JSON schema.
-
-        Args:
-            __core_schema: A `pydantic-core` CoreSchema.
-                You can ignore this argument and call the handler with a new CoreSchema,
-                wrap this CoreSchema (`{'type': 'nullable', 'schema': current_schema}`),
-                or just call the handler with the original schema.
-            __handler: Call into Pydantic's internal JSON schema generation.
-                This will raise a `pydantic.errors.PydanticInvalidForJsonSchema` if JSON schema
-                generation fails.
-                Since this gets called by `BaseModel.model_json_schema` you can override the
-                `schema_generator` argument to that function to change JSON schema generation globally
-                for a type.
-
-        Returns:
-            A JSON schema, as a Python object.
-        """
-        return __handler(__core_schema)
-
-    @classmethod
-    def __pydantic_init_subclass__(cls, **kwargs: Any) -> None:
-        """This is intended to behave just like `__init_subclass__`, but is called by `ModelMetaclass`
-        only after the class is actually fully initialized. In particular, attributes like `model_fields` will
-        be present when this is called.
-
-        This is necessary because `__init_subclass__` will always be called by `type.__new__`,
-        and it would require a prohibitively large refactor to the `ModelMetaclass` to ensure that
-        `type.__new__` was called in such a manner that the class would already be sufficiently initialized.
-
-        This will receive the same `kwargs` that would be passed to the standard `__init_subclass__`, namely,
-        any kwargs passed to the class definition that aren't used internally by pydantic.
-
-        Args:
-            **kwargs: Any keyword arguments passed to the class definition that aren't used internally
-                by pydantic.
-        """
-        pass
-
-    def __class_getitem__(
-        cls, typevar_values: type[Any] | tuple[type[Any], ...]
-    ) -> type[BaseModel] | _forward_ref.PydanticRecursiveRef:
-        cached = _generics.get_cached_generic_type_early(cls, typevar_values)
-        if cached is not None:
-            return cached
-
-        if cls is BaseModel:
-            raise TypeError('Type parameters should be placed on typing.Generic, not BaseModel')
-        if not hasattr(cls, '__parameters__'):
-            raise TypeError(f'{cls} cannot be parametrized because it does not inherit from typing.Generic')
-        if not cls.__pydantic_generic_metadata__['parameters'] and typing.Generic not in cls.__bases__:
-            raise TypeError(f'{cls} is not a generic class')
-
-        if not isinstance(typevar_values, tuple):
-            typevar_values = (typevar_values,)
-        _generics.check_parameters_count(cls, typevar_values)
-
-        # Build map from generic typevars to passed params
-        typevars_map: dict[_typing_extra.TypeVarType, type[Any]] = dict(
-            zip(cls.__pydantic_generic_metadata__['parameters'], typevar_values)
-        )
-
-        if _utils.all_identical(typevars_map.keys(), typevars_map.values()) and typevars_map:
-            submodel = cls  # if arguments are equal to parameters it's the same object
-            _generics.set_cached_generic_type(cls, typevar_values, submodel)
-        else:
-            parent_args = cls.__pydantic_generic_metadata__['args']
-            if not parent_args:
-                args = typevar_values
-            else:
-                args = tuple(_generics.replace_types(arg, typevars_map) for arg in parent_args)
-
-            origin = cls.__pydantic_generic_metadata__['origin'] or cls
-            model_name = origin.model_parametrized_name(args)
-            params = tuple(
-                {param: None for param in _generics.iter_contained_typevars(typevars_map.values())}
-            )  # use dict as ordered set
-
-            with _generics.generic_recursion_self_type(origin, args) as maybe_self_type:
-                if maybe_self_type is not None:
-                    return maybe_self_type
-
-                cached = _generics.get_cached_generic_type_late(cls, typevar_values, origin, args)
-                if cached is not None:
-                    return cached
-
-                # Attempt to rebuild the origin in case new types have been defined
-                try:
-                    # depth 3 gets you above this __class_getitem__ call
-                    origin.model_rebuild(_parent_namespace_depth=3)
-                except PydanticUndefinedAnnotation:
-                    # It's okay if it fails, it just means there are still undefined types
-                    # that could be evaluated later.
-                    # TODO: Make sure validation fails if there are still undefined types, perhaps using MockValidator
-                    pass
-
-                submodel = _generics.create_generic_submodel(model_name, origin, args, params)
-
-                # Update cache
-                _generics.set_cached_generic_type(cls, typevar_values, submodel, origin, args)
-
-        return submodel
-
-    def __copy__(self: Model) -> Model:
-        """Returns a shallow copy of the model."""
-        cls = type(self)
-        m = cls.__new__(cls)
-        _object_setattr(m, '__dict__', copy(self.__dict__))
-        _object_setattr(m, '__pydantic_extra__', copy(self.__pydantic_extra__))
-        _object_setattr(m, '__pydantic_fields_set__', copy(self.__pydantic_fields_set__))
-
-        if self.__pydantic_private__ is None:
-            _object_setattr(m, '__pydantic_private__', None)
-        else:
-            _object_setattr(
-                m,
-                '__pydantic_private__',
-                {k: v for k, v in self.__pydantic_private__.items() if v is not PydanticUndefined},
-            )
-
-        return m
-
-    def __deepcopy__(self: Model, memo: dict[int, Any] | None = None) -> Model:
-        """Returns a deep copy of the model."""
-        cls = type(self)
-        m = cls.__new__(cls)
-        _object_setattr(m, '__dict__', deepcopy(self.__dict__, memo=memo))
-        _object_setattr(m, '__pydantic_extra__', deepcopy(self.__pydantic_extra__, memo=memo))
-        # This next line doesn't need a deepcopy because __pydantic_fields_set__ is a set[str],
-        # and attempting a deepcopy would be marginally slower.
-        _object_setattr(m, '__pydantic_fields_set__', copy(self.__pydantic_fields_set__))
-
-        if self.__pydantic_private__ is None:
-            _object_setattr(m, '__pydantic_private__', None)
-        else:
-            _object_setattr(
-                m,
-                '__pydantic_private__',
-                deepcopy({k: v for k, v in self.__pydantic_private__.items() if v is not PydanticUndefined}, memo=memo),
-            )
-
-        return m
-
-    if not typing.TYPE_CHECKING:
-        # We put `__getattr__` in a non-TYPE_CHECKING block because otherwise, mypy allows arbitrary attribute access
-
-        def __getattr__(self, item: str) -> Any:
-            private_attributes = object.__getattribute__(self, '__private_attributes__')
-            if item in private_attributes:
-                attribute = private_attributes[item]
-                if hasattr(attribute, '__get__'):
-                    return attribute.__get__(self, type(self))  # type: ignore
-
-                try:
-                    # Note: self.__pydantic_private__ cannot be None if self.__private_attributes__ has items
-                    return self.__pydantic_private__[item]  # type: ignore
-                except KeyError as exc:
-                    raise AttributeError(f'{type(self).__name__!r} object has no attribute {item!r}') from exc
-            else:
-                # `__pydantic_extra__` can fail to be set if the model is not yet fully initialized.
-                # See `BaseModel.__repr_args__` for more details
-                try:
-                    pydantic_extra = object.__getattribute__(self, '__pydantic_extra__')
-                except AttributeError:
-                    pydantic_extra = None
-
-                if pydantic_extra is not None:
-                    try:
-                        return pydantic_extra[item]
-                    except KeyError as exc:
-                        raise AttributeError(f'{type(self).__name__!r} object has no attribute {item!r}') from exc
-                else:
-                    if hasattr(self.__class__, item):
-                        return super().__getattribute__(item)  # Raises AttributeError if appropriate
-                    else:
-                        # this is the current error
-                        raise AttributeError(f'{type(self).__name__!r} object has no attribute {item!r}')
-
-    def __setattr__(self, name: str, value: Any) -> None:
-        if name in self.__class_vars__:
-            raise AttributeError(
-                f'{name!r} is a ClassVar of `{self.__class__.__name__}` and cannot be set on an instance. '
-                f'If you want to set a value on the class, use `{self.__class__.__name__}.{name} = value`.'
-            )
-        elif not _fields.is_valid_field_name(name):
-            if self.__pydantic_private__ is None or name not in self.__private_attributes__:
-                _object_setattr(self, name, value)
-            else:
-                attribute = self.__private_attributes__[name]
-                if hasattr(attribute, '__set__'):
-                    attribute.__set__(self, value)  # type: ignore
-                else:
-                    self.__pydantic_private__[name] = value
-            return
-
-        self._check_frozen(name, value)
-
-        attr = getattr(self.__class__, name, None)
-        if isinstance(attr, property):
-            attr.__set__(self, value)
-        elif self.model_config.get('validate_assignment', None):
-            self.__pydantic_validator__.validate_assignment(self, name, value)
-        elif self.model_config.get('extra') != 'allow' and name not in self.model_fields:
-            # TODO - matching error
-            raise ValueError(f'"{self.__class__.__name__}" object has no field "{name}"')
-        elif self.model_config.get('extra') == 'allow' and name not in self.model_fields:
-            if self.model_extra and name in self.model_extra:
-                self.__pydantic_extra__[name] = value  # type: ignore
-            else:
-                try:
-                    getattr(self, name)
-                except AttributeError:
-                    # attribute does not already exist on instance, so put it in extra
-                    self.__pydantic_extra__[name] = value  # type: ignore
-                else:
-                    # attribute _does_ already exist on instance, and was not in extra, so update it
-                    _object_setattr(self, name, value)
-        else:
-            self.__dict__[name] = value
-            self.__pydantic_fields_set__.add(name)
-
-    def __delattr__(self, item: str) -> Any:
-        if item in self.__private_attributes__:
-            attribute = self.__private_attributes__[item]
-            if hasattr(attribute, '__delete__'):
-                attribute.__delete__(self)  # type: ignore
-                return
-
-            try:
-                # Note: self.__pydantic_private__ cannot be None if self.__private_attributes__ has items
-                del self.__pydantic_private__[item]  # type: ignore
-                return
-            except KeyError as exc:
-                raise AttributeError(f'{type(self).__name__!r} object has no attribute {item!r}') from exc
-
-        self._check_frozen(item, None)
-
-        if item in self.model_fields:
-            object.__delattr__(self, item)
-        elif self.__pydantic_extra__ is not None and item in self.__pydantic_extra__:
-            del self.__pydantic_extra__[item]
-        else:
-            try:
-                object.__delattr__(self, item)
-            except AttributeError:
-                raise AttributeError(f'{type(self).__name__!r} object has no attribute {item!r}')
-
-    def _check_frozen(self, name: str, value: Any) -> None:
-        if self.model_config.get('frozen', None):
-            typ = 'frozen_instance'
-        elif getattr(self.model_fields.get(name), 'frozen', False):
-            typ = 'frozen_field'
-        else:
-            return
-        error: pydantic_core.InitErrorDetails = {
-            'type': typ,
-            'loc': (name,),
-            'input': value,
-        }
-        raise pydantic_core.ValidationError.from_exception_data(self.__class__.__name__, [error])
-
-    def __getstate__(self) -> dict[Any, Any]:
-        private = self.__pydantic_private__
-        if private:
-            private = {k: v for k, v in private.items() if v is not PydanticUndefined}
-        return {
-            '__dict__': self.__dict__,
-            '__pydantic_extra__': self.__pydantic_extra__,
-            '__pydantic_fields_set__': self.__pydantic_fields_set__,
-            '__pydantic_private__': private,
-        }
-
-    def __setstate__(self, state: dict[Any, Any]) -> None:
-        _object_setattr(self, '__pydantic_fields_set__', state['__pydantic_fields_set__'])
-        _object_setattr(self, '__pydantic_extra__', state['__pydantic_extra__'])
-        _object_setattr(self, '__pydantic_private__', state['__pydantic_private__'])
-        _object_setattr(self, '__dict__', state['__dict__'])
-
-    def __eq__(self, other: Any) -> bool:
-        if isinstance(other, BaseModel):
-            # When comparing instances of generic types for equality, as long as all field values are equal,
-            # only require their generic origin types to be equal, rather than exact type equality.
-            # This prevents headaches like MyGeneric(x=1) != MyGeneric[Any](x=1).
-            self_type = self.__pydantic_generic_metadata__['origin'] or self.__class__
-            other_type = other.__pydantic_generic_metadata__['origin'] or other.__class__
-
-            # Perform common checks first
-            if not (
-                self_type == other_type
-                and self.__pydantic_private__ == other.__pydantic_private__
-                and self.__pydantic_extra__ == other.__pydantic_extra__
-            ):
-                return False
-
-            # We only want to compare pydantic fields but ignoring fields is costly.
-            # We'll perform a fast check first, and fallback only when needed
-            # See GH-7444 and GH-7825 for rationale and a performance benchmark
-
-            # First, do the fast (and sometimes faulty) __dict__ comparison
-            if self.__dict__ == other.__dict__:
-                # If the check above passes, then pydantic fields are equal, we can return early
-                return True
-
-            # We don't want to trigger unnecessary costly filtering of __dict__ on all unequal objects, so we return
-            # early if there are no keys to ignore (we would just return False later on anyway)
-            model_fields = type(self).model_fields.keys()
-            if self.__dict__.keys() <= model_fields and other.__dict__.keys() <= model_fields:
-                return False
-
-            # If we reach here, there are non-pydantic-fields keys, mapped to unequal values, that we need to ignore
-            # Resort to costly filtering of the __dict__ objects
-            # We use operator.itemgetter because it is much faster than dict comprehensions
-            # NOTE: Contrary to standard python class and instances, when the Model class has a default value for an
-            # attribute and the model instance doesn't have a corresponding attribute, accessing the missing attribute
-            # raises an error in BaseModel.__getattr__ instead of returning the class attribute
-            # So we can use operator.itemgetter() instead of operator.attrgetter()
-            getter = operator.itemgetter(*model_fields) if model_fields else lambda _: _utils._SENTINEL
-            try:
-                return getter(self.__dict__) == getter(other.__dict__)
-            except KeyError:
-                # In rare cases (such as when using the deprecated BaseModel.copy() method),
-                # the __dict__ may not contain all model fields, which is how we can get here.
-                # getter(self.__dict__) is much faster than any 'safe' method that accounts
-                # for missing keys, and wrapping it in a `try` doesn't slow things down much
-                # in the common case.
-                self_fields_proxy = _utils.SafeGetItemProxy(self.__dict__)
-                other_fields_proxy = _utils.SafeGetItemProxy(other.__dict__)
-                return getter(self_fields_proxy) == getter(other_fields_proxy)
-
-        # other instance is not a BaseModel
-        else:
-            return NotImplemented  # delegate to the other item in the comparison
-
-    if typing.TYPE_CHECKING:
-        # We put `__init_subclass__` in a TYPE_CHECKING block because, even though we want the type-checking benefits
-        # described in the signature of `__init_subclass__` below, we don't want to modify the default behavior of
-        # subclass initialization.
-
-        def __init_subclass__(cls, **kwargs: Unpack[ConfigDict]):
-            """This signature is included purely to help type-checkers check arguments to class declaration, which
-            provides a way to conveniently set model_config key/value pairs.
-
-            ```py
-            from pydantic import BaseModel
-
-            class MyModel(BaseModel, extra='allow'):
-                ...
-            ```
-
-            However, this may be deceiving, since the _actual_ calls to `__init_subclass__` will not receive any
-            of the config arguments, and will only receive any keyword arguments passed during class initialization
-            that are _not_ expected keys in ConfigDict. (This is due to the way `ModelMetaclass.__new__` works.)
-
-            Args:
-                **kwargs: Keyword arguments passed to the class definition, which set model_config
-
-            Note:
-                You may want to override `__pydantic_init_subclass__` instead, which behaves similarly but is called
-                *after* the class is fully initialized.
-            """
-
-    def __iter__(self) -> TupleGenerator:
-        """So `dict(model)` works."""
-        yield from [(k, v) for (k, v) in self.__dict__.items() if not k.startswith('_')]
-        extra = self.__pydantic_extra__
-        if extra:
-            yield from extra.items()
-
-    def __repr__(self) -> str:
-        return f'{self.__repr_name__()}({self.__repr_str__(", ")})'
-
-    def __repr_args__(self) -> _repr.ReprArgs:
-        for k, v in self.__dict__.items():
-            field = self.model_fields.get(k)
-            if field and field.repr:
-                yield k, v
-
-        # `__pydantic_extra__` can fail to be set if the model is not yet fully initialized.
-        # This can happen if a `ValidationError` is raised during initialization and the instance's
-        # repr is generated as part of the exception handling. Therefore, we use `getattr` here
-        # with a fallback, even though the type hints indicate the attribute will always be present.
-        try:
-            pydantic_extra = object.__getattribute__(self, '__pydantic_extra__')
-        except AttributeError:
-            pydantic_extra = None
-
-        if pydantic_extra is not None:
-            yield from ((k, v) for k, v in pydantic_extra.items())
-        yield from ((k, getattr(self, k)) for k, v in self.model_computed_fields.items() if v.repr)
-
-    # take logic from `_repr.Representation` without the side effects of inheritance, see #5740
-    __repr_name__ = _repr.Representation.__repr_name__
-    __repr_str__ = _repr.Representation.__repr_str__
-    __pretty__ = _repr.Representation.__pretty__
-    __rich_repr__ = _repr.Representation.__rich_repr__
-
-    def __str__(self) -> str:
-        return self.__repr_str__(' ')
-
-    # ##### Deprecated methods from v1 #####
-    @property
-    @typing_extensions.deprecated(
-        'The `__fields__` attribute is deprecated, use `model_fields` instead.', category=None
-    )
-    def __fields__(self) -> dict[str, FieldInfo]:
-        warnings.warn(
-            'The `__fields__` attribute is deprecated, use `model_fields` instead.', category=PydanticDeprecatedSince20
-        )
-        return self.model_fields
-
-    @property
-    @typing_extensions.deprecated(
-        'The `__fields_set__` attribute is deprecated, use `model_fields_set` instead.',
-        category=None,
-    )
-    def __fields_set__(self) -> set[str]:
-        warnings.warn(
-            'The `__fields_set__` attribute is deprecated, use `model_fields_set` instead.',
-            category=PydanticDeprecatedSince20,
-        )
-        return self.__pydantic_fields_set__
-
-    @typing_extensions.deprecated('The `dict` method is deprecated; use `model_dump` instead.', category=None)
-    def dict(  # noqa: D102
-        self,
-        *,
-        include: IncEx = None,
-        exclude: IncEx = None,
-        by_alias: bool = False,
-        exclude_unset: bool = False,
-        exclude_defaults: bool = False,
-        exclude_none: bool = False,
-    ) -> typing.Dict[str, Any]:  # noqa UP006
-        warnings.warn('The `dict` method is deprecated; use `model_dump` instead.', category=PydanticDeprecatedSince20)
-        return self.model_dump(
-            include=include,
-            exclude=exclude,
-            by_alias=by_alias,
-            exclude_unset=exclude_unset,
-            exclude_defaults=exclude_defaults,
-            exclude_none=exclude_none,
-        )
-
-    @typing_extensions.deprecated('The `json` method is deprecated; use `model_dump_json` instead.', category=None)
-    def json(  # noqa: D102
-        self,
-        *,
-        include: IncEx = None,
-        exclude: IncEx = None,
-        by_alias: bool = False,
-        exclude_unset: bool = False,
-        exclude_defaults: bool = False,
-        exclude_none: bool = False,
-        encoder: typing.Callable[[Any], Any] | None = PydanticUndefined,  # type: ignore[assignment]
-        models_as_dict: bool = PydanticUndefined,  # type: ignore[assignment]
-        **dumps_kwargs: Any,
-    ) -> str:
-        warnings.warn(
-            'The `json` method is deprecated; use `model_dump_json` instead.', category=PydanticDeprecatedSince20
-        )
-        if encoder is not PydanticUndefined:
-            raise TypeError('The `encoder` argument is no longer supported; use field serializers instead.')
-        if models_as_dict is not PydanticUndefined:
-            raise TypeError('The `models_as_dict` argument is no longer supported; use a model serializer instead.')
-        if dumps_kwargs:
-            raise TypeError('`dumps_kwargs` keyword arguments are no longer supported.')
-        return self.model_dump_json(
-            include=include,
-            exclude=exclude,
-            by_alias=by_alias,
-            exclude_unset=exclude_unset,
-            exclude_defaults=exclude_defaults,
-            exclude_none=exclude_none,
-        )
-
-    @classmethod
-    @typing_extensions.deprecated('The `parse_obj` method is deprecated; use `model_validate` instead.', category=None)
-    def parse_obj(cls: type[Model], obj: Any) -> Model:  # noqa: D102
-        warnings.warn(
-            'The `parse_obj` method is deprecated; use `model_validate` instead.', category=PydanticDeprecatedSince20
-        )
-        return cls.model_validate(obj)
-
-    @classmethod
-    @typing_extensions.deprecated(
-        'The `parse_raw` method is deprecated; if your data is JSON use `model_validate_json`, '
-        'otherwise load the data then use `model_validate` instead.',
-        category=None,
-    )
-    def parse_raw(  # noqa: D102
-        cls: type[Model],
-        b: str | bytes,
-        *,
-        content_type: str | None = None,
-        encoding: str = 'utf8',
-        proto: DeprecatedParseProtocol | None = None,
-        allow_pickle: bool = False,
-    ) -> Model:  # pragma: no cover
-        warnings.warn(
-            'The `parse_raw` method is deprecated; if your data is JSON use `model_validate_json`, '
-            'otherwise load the data then use `model_validate` instead.',
-            category=PydanticDeprecatedSince20,
-        )
-        from .deprecated import parse
-
-        try:
-            obj = parse.load_str_bytes(
-                b,
-                proto=proto,
-                content_type=content_type,
-                encoding=encoding,
-                allow_pickle=allow_pickle,
-            )
-        except (ValueError, TypeError) as exc:
-            import json
-
-            # try to match V1
-            if isinstance(exc, UnicodeDecodeError):
-                type_str = 'value_error.unicodedecode'
-            elif isinstance(exc, json.JSONDecodeError):
-                type_str = 'value_error.jsondecode'
-            elif isinstance(exc, ValueError):
-                type_str = 'value_error'
-            else:
-                type_str = 'type_error'
-
-            # ctx is missing here, but since we've added `input` to the error, we're not pretending it's the same
-            error: pydantic_core.InitErrorDetails = {
-                # The type: ignore on the next line is to ignore the requirement of LiteralString
-                'type': pydantic_core.PydanticCustomError(type_str, str(exc)),  # type: ignore
-                'loc': ('__root__',),
-                'input': b,
-            }
-            raise pydantic_core.ValidationError.from_exception_data(cls.__name__, [error])
-        return cls.model_validate(obj)
-
-    @classmethod
-    @typing_extensions.deprecated(
-        'The `parse_file` method is deprecated; load the data from file, then if your data is JSON '
-        'use `model_validate_json`, otherwise `model_validate` instead.',
-        category=None,
-    )
-    def parse_file(  # noqa: D102
-        cls: type[Model],
-        path: str | Path,
-        *,
-        content_type: str | None = None,
-        encoding: str = 'utf8',
-        proto: DeprecatedParseProtocol | None = None,
-        allow_pickle: bool = False,
-    ) -> Model:
-        warnings.warn(
-            'The `parse_file` method is deprecated; load the data from file, then if your data is JSON '
-            'use `model_validate_json`, otherwise `model_validate` instead.',
-            category=PydanticDeprecatedSince20,
-        )
-        from .deprecated import parse
-
-        obj = parse.load_file(
-            path,
-            proto=proto,
-            content_type=content_type,
-            encoding=encoding,
-            allow_pickle=allow_pickle,
-        )
-        return cls.parse_obj(obj)
-
-    @classmethod
-    @typing_extensions.deprecated(
-        'The `from_orm` method is deprecated; set '
-        "`model_config['from_attributes']=True` and use `model_validate` instead.",
-        category=None,
-    )
-    def from_orm(cls: type[Model], obj: Any) -> Model:  # noqa: D102
-        warnings.warn(
-            'The `from_orm` method is deprecated; set '
-            "`model_config['from_attributes']=True` and use `model_validate` instead.",
-            category=PydanticDeprecatedSince20,
-        )
-        if not cls.model_config.get('from_attributes', None):
-            raise PydanticUserError(
-                'You must set the config attribute `from_attributes=True` to use from_orm', code=None
-            )
-        return cls.model_validate(obj)
-
-    @classmethod
-    @typing_extensions.deprecated('The `construct` method is deprecated; use `model_construct` instead.', category=None)
-    def construct(cls: type[Model], _fields_set: set[str] | None = None, **values: Any) -> Model:  # noqa: D102
-        warnings.warn(
-            'The `construct` method is deprecated; use `model_construct` instead.', category=PydanticDeprecatedSince20
-        )
-        return cls.model_construct(_fields_set=_fields_set, **values)
-
-    @typing_extensions.deprecated(
-        'The `copy` method is deprecated; use `model_copy` instead. '
-        'See the docstring of `BaseModel.copy` for details about how to handle `include` and `exclude`.',
-        category=None,
-    )
-    def copy(
-        self: Model,
-        *,
-        include: AbstractSetIntStr | MappingIntStrAny | None = None,
-        exclude: AbstractSetIntStr | MappingIntStrAny | None = None,
-        update: typing.Dict[str, Any] | None = None,  # noqa UP006
-        deep: bool = False,
-    ) -> Model:  # pragma: no cover
-        """Returns a copy of the model.
-
-        !!! warning "Deprecated"
-            This method is now deprecated; use `model_copy` instead.
-
-        If you need `include` or `exclude`, use:
-
-        ```py
-        data = self.model_dump(include=include, exclude=exclude, round_trip=True)
-        data = {**data, **(update or {})}
-        copied = self.model_validate(data)
-        ```
-
-        Args:
-            include: Optional set or mapping specifying which fields to include in the copied model.
-            exclude: Optional set or mapping specifying which fields to exclude in the copied model.
-            update: Optional dictionary of field-value pairs to override field values in the copied model.
-            deep: If True, the values of fields that are Pydantic models will be deep-copied.
-
-        Returns:
-            A copy of the model with included, excluded and updated fields as specified.
-        """
-        warnings.warn(
-            'The `copy` method is deprecated; use `model_copy` instead. '
-            'See the docstring of `BaseModel.copy` for details about how to handle `include` and `exclude`.',
-            category=PydanticDeprecatedSince20,
-        )
-        from .deprecated import copy_internals
-
-        values = dict(
-            copy_internals._iter(
-                self, to_dict=False, by_alias=False, include=include, exclude=exclude, exclude_unset=False
-            ),
-            **(update or {}),
-        )
-        if self.__pydantic_private__ is None:
-            private = None
-        else:
-            private = {k: v for k, v in self.__pydantic_private__.items() if v is not PydanticUndefined}
-
-        if self.__pydantic_extra__ is None:
-            extra: dict[str, Any] | None = None
-        else:
-            extra = self.__pydantic_extra__.copy()
-            for k in list(self.__pydantic_extra__):
-                if k not in values:  # k was in the exclude
-                    extra.pop(k)
-            for k in list(values):
-                if k in self.__pydantic_extra__:  # k must have come from extra
-                    extra[k] = values.pop(k)
-
-        # new `__pydantic_fields_set__` can have unset optional fields with a set value in `update` kwarg
-        if update:
-            fields_set = self.__pydantic_fields_set__ | update.keys()
-        else:
-            fields_set = set(self.__pydantic_fields_set__)
-
-        # removing excluded fields from `__pydantic_fields_set__`
-        if exclude:
-            fields_set -= set(exclude)
-
-        return copy_internals._copy_and_set_values(self, values, fields_set, extra, private, deep=deep)
-
-    @classmethod
-    @typing_extensions.deprecated('The `schema` method is deprecated; use `model_json_schema` instead.', category=None)
-    def schema(  # noqa: D102
-        cls, by_alias: bool = True, ref_template: str = DEFAULT_REF_TEMPLATE
-    ) -> typing.Dict[str, Any]:  # noqa UP006
-        warnings.warn(
-            'The `schema` method is deprecated; use `model_json_schema` instead.', category=PydanticDeprecatedSince20
-        )
-        return cls.model_json_schema(by_alias=by_alias, ref_template=ref_template)
-
-    @classmethod
-    @typing_extensions.deprecated(
-        'The `schema_json` method is deprecated; use `model_json_schema` and json.dumps instead.',
-        category=None,
-    )
-    def schema_json(  # noqa: D102
-        cls, *, by_alias: bool = True, ref_template: str = DEFAULT_REF_TEMPLATE, **dumps_kwargs: Any
-    ) -> str:  # pragma: no cover
-        warnings.warn(
-            'The `schema_json` method is deprecated; use `model_json_schema` and json.dumps instead.',
-            category=PydanticDeprecatedSince20,
-        )
-        import json
-
-        from .deprecated.json import pydantic_encoder
-
-        return json.dumps(
-            cls.model_json_schema(by_alias=by_alias, ref_template=ref_template),
-            default=pydantic_encoder,
-            **dumps_kwargs,
-        )
-
-    @classmethod
-    @typing_extensions.deprecated('The `validate` method is deprecated; use `model_validate` instead.', category=None)
-    def validate(cls: type[Model], value: Any) -> Model:  # noqa: D102
-        warnings.warn(
-            'The `validate` method is deprecated; use `model_validate` instead.', category=PydanticDeprecatedSince20
-        )
-        return cls.model_validate(value)
-
-    @classmethod
-    @typing_extensions.deprecated(
-        'The `update_forward_refs` method is deprecated; use `model_rebuild` instead.',
-        category=None,
-    )
-    def update_forward_refs(cls, **localns: Any) -> None:  # noqa: D102
-        warnings.warn(
-            'The `update_forward_refs` method is deprecated; use `model_rebuild` instead.',
-            category=PydanticDeprecatedSince20,
-        )
-        if localns:  # pragma: no cover
-            raise TypeError('`localns` arguments are not longer accepted.')
-        cls.model_rebuild(force=True)
-
-    @typing_extensions.deprecated(
-        'The private method `_iter` will be removed and should no longer be used.', category=None
-    )
-    def _iter(self, *args: Any, **kwargs: Any) -> Any:
-        warnings.warn(
-            'The private method `_iter` will be removed and should no longer be used.',
-            category=PydanticDeprecatedSince20,
-        )
-        from .deprecated import copy_internals
-
-        return copy_internals._iter(self, *args, **kwargs)
-
-    @typing_extensions.deprecated(
-        'The private method `_copy_and_set_values` will be removed and should no longer be used.',
-        category=None,
-    )
-    def _copy_and_set_values(self, *args: Any, **kwargs: Any) -> Any:
-        warnings.warn(
-            'The private method `_copy_and_set_values` will be removed and should no longer be used.',
-            category=PydanticDeprecatedSince20,
-        )
-        from .deprecated import copy_internals
-
-        return copy_internals._copy_and_set_values(self, *args, **kwargs)
-
-    @classmethod
-    @typing_extensions.deprecated(
-        'The private method `_get_value` will be removed and should no longer be used.',
-        category=None,
-    )
-    def _get_value(cls, *args: Any, **kwargs: Any) -> Any:
-        warnings.warn(
-            'The private method `_get_value` will be removed and should no longer be used.',
-            category=PydanticDeprecatedSince20,
-        )
-        from .deprecated import copy_internals
-
-        return copy_internals._get_value(cls, *args, **kwargs)
-
-    @typing_extensions.deprecated(
-        'The private method `_calculate_keys` will be removed and should no longer be used.',
-        category=None,
-    )
-    def _calculate_keys(self, *args: Any, **kwargs: Any) -> Any:
-        warnings.warn(
-            'The private method `_calculate_keys` will be removed and should no longer be used.',
-            category=PydanticDeprecatedSince20,
-        )
-        from .deprecated import copy_internals
-
-        return copy_internals._calculate_keys(self, *args, **kwargs)
-
-
-@typing.overload
-def create_model(
-    __model_name: str,
-    *,
-    __config__: ConfigDict | None = None,
-    __doc__: str | None = None,
-    __base__: None = None,
-    __module__: str = __name__,
-    __validators__: dict[str, classmethod] | None = None,
-    __cls_kwargs__: dict[str, Any] | None = None,
-    **field_definitions: Any,
-) -> type[BaseModel]:
-    ...
-
-
-@typing.overload
-def create_model(
-    __model_name: str,
-    *,
-    __config__: ConfigDict | None = None,
-    __doc__: str | None = None,
-    __base__: type[Model] | tuple[type[Model], ...],
-    __module__: str = __name__,
-    __validators__: dict[str, classmethod] | None = None,
-    __cls_kwargs__: dict[str, Any] | None = None,
-    **field_definitions: Any,
-) -> type[Model]:
-    ...
-
-
-def create_model(  # noqa: C901
-    __model_name: str,
-    *,
-    __config__: ConfigDict | None = None,
-    __doc__: str | None = None,
-    __base__: type[Model] | tuple[type[Model], ...] | None = None,
-    __module__: str | None = None,
-    __validators__: dict[str, classmethod] | None = None,
-    __cls_kwargs__: dict[str, Any] | None = None,
-    __slots__: tuple[str, ...] | None = None,
-    **field_definitions: Any,
-) -> type[Model]:
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/models/#dynamic-model-creation
-
-    Dynamically creates and returns a new Pydantic model, in other words, `create_model` dynamically creates a
-    subclass of [`BaseModel`][pydantic.BaseModel].
-
-    Args:
-        __model_name: The name of the newly created model.
-        __config__: The configuration of the new model.
-        __doc__: The docstring of the new model.
-        __base__: The base class or classes for the new model.
-        __module__: The name of the module that the model belongs to;
-            if `None`, the value is taken from `sys._getframe(1)`
-        __validators__: A dictionary of methods that validate fields.
-        __cls_kwargs__: A dictionary of keyword arguments for class creation, such as `metaclass`.
-        __slots__: Deprecated. Should not be passed to `create_model`.
-        **field_definitions: Attributes of the new model. They should be passed in the format:
-            `<name>=(<type>, <default value>)` or `<name>=(<type>, <FieldInfo>)`.
-
-    Returns:
-        The new [model][pydantic.BaseModel].
-
-    Raises:
-        PydanticUserError: If `__base__` and `__config__` are both passed.
-    """
-    if __slots__ is not None:
-        # __slots__ will be ignored from here on
-        warnings.warn('__slots__ should not be passed to create_model', RuntimeWarning)
-
-    if __base__ is not None:
-        if __config__ is not None:
-            raise PydanticUserError(
-                'to avoid confusion `__config__` and `__base__` cannot be used together',
-                code='create-model-config-base',
-            )
-        if not isinstance(__base__, tuple):
-            __base__ = (__base__,)
-    else:
-        __base__ = (typing.cast(typing.Type['Model'], BaseModel),)
-
-    __cls_kwargs__ = __cls_kwargs__ or {}
-
-    fields = {}
-    annotations = {}
-
-    for f_name, f_def in field_definitions.items():
-        if not _fields.is_valid_field_name(f_name):
-            warnings.warn(f'fields may not start with an underscore, ignoring "{f_name}"', RuntimeWarning)
-        if isinstance(f_def, tuple):
-            f_def = typing.cast('tuple[str, Any]', f_def)
-            try:
-                f_annotation, f_value = f_def
-            except ValueError as e:
-                raise PydanticUserError(
-                    'Field definitions should be a `(<type>, <default>)`.',
-                    code='create-model-field-definitions',
-                ) from e
-        else:
-            f_annotation, f_value = None, f_def
-
-        if f_annotation:
-            annotations[f_name] = f_annotation
-        fields[f_name] = f_value
-
-    if __module__ is None:
-        f = sys._getframe(1)
-        __module__ = f.f_globals['__name__']
-
-    namespace: dict[str, Any] = {'__annotations__': annotations, '__module__': __module__}
-    if __doc__:
-        namespace.update({'__doc__': __doc__})
-    if __validators__:
-        namespace.update(__validators__)
-    namespace.update(fields)
-    if __config__:
-        namespace['model_config'] = _config.ConfigWrapper(__config__).config_dict
-    resolved_bases = types.resolve_bases(__base__)
-    meta, ns, kwds = types.prepare_class(__model_name, resolved_bases, kwds=__cls_kwargs__)
-    if resolved_bases is not __base__:
-        ns['__orig_bases__'] = __base__
-    namespace.update(ns)
-
-    return meta(
-        __model_name,
-        resolved_bases,
-        namespace,
-        __pydantic_reset_parent_namespace__=False,
-        _create_model_module=__module__,
-        **kwds,
-    )
-
-
-__getattr__ = getattr_migration(__name__)
diff --git a/lib/pydantic/mypy.py b/lib/pydantic/mypy.py
deleted file mode 100644
index 0e70eab5..00000000
--- a/lib/pydantic/mypy.py
+++ /dev/null
@@ -1,1287 +0,0 @@
-"""This module includes classes and functions designed specifically for use with the mypy plugin."""
-
-from __future__ import annotations
-
-import sys
-from configparser import ConfigParser
-from typing import Any, Callable, Iterator
-
-from mypy.errorcodes import ErrorCode
-from mypy.expandtype import expand_type, expand_type_by_instance
-from mypy.nodes import (
-    ARG_NAMED,
-    ARG_NAMED_OPT,
-    ARG_OPT,
-    ARG_POS,
-    ARG_STAR2,
-    MDEF,
-    Argument,
-    AssignmentStmt,
-    Block,
-    CallExpr,
-    ClassDef,
-    Context,
-    Decorator,
-    DictExpr,
-    EllipsisExpr,
-    Expression,
-    FuncDef,
-    IfStmt,
-    JsonDict,
-    MemberExpr,
-    NameExpr,
-    PassStmt,
-    PlaceholderNode,
-    RefExpr,
-    Statement,
-    StrExpr,
-    SymbolTableNode,
-    TempNode,
-    TypeAlias,
-    TypeInfo,
-    Var,
-)
-from mypy.options import Options
-from mypy.plugin import (
-    CheckerPluginInterface,
-    ClassDefContext,
-    FunctionContext,
-    MethodContext,
-    Plugin,
-    ReportConfigContext,
-    SemanticAnalyzerPluginInterface,
-)
-from mypy.plugins import dataclasses
-from mypy.plugins.common import (
-    deserialize_and_fixup_type,
-)
-from mypy.semanal import set_callable_name
-from mypy.server.trigger import make_wildcard_trigger
-from mypy.state import state
-from mypy.typeops import map_type_from_supertype
-from mypy.types import (
-    AnyType,
-    CallableType,
-    Instance,
-    NoneType,
-    Overloaded,
-    Type,
-    TypeOfAny,
-    TypeType,
-    TypeVarType,
-    UnionType,
-    get_proper_type,
-)
-from mypy.typevars import fill_typevars
-from mypy.util import get_unique_redefinition_name
-from mypy.version import __version__ as mypy_version
-
-from pydantic._internal import _fields
-from pydantic.version import parse_mypy_version
-
-try:
-    from mypy.types import TypeVarDef  # type: ignore[attr-defined]
-except ImportError:  # pragma: no cover
-    # Backward-compatible with TypeVarDef from Mypy 0.930.
-    from mypy.types import TypeVarType as TypeVarDef
-
-CONFIGFILE_KEY = 'pydantic-mypy'
-METADATA_KEY = 'pydantic-mypy-metadata'
-BASEMODEL_FULLNAME = 'pydantic.main.BaseModel'
-BASESETTINGS_FULLNAME = 'pydantic_settings.main.BaseSettings'
-ROOT_MODEL_FULLNAME = 'pydantic.root_model.RootModel'
-MODEL_METACLASS_FULLNAME = 'pydantic._internal._model_construction.ModelMetaclass'
-FIELD_FULLNAME = 'pydantic.fields.Field'
-DATACLASS_FULLNAME = 'pydantic.dataclasses.dataclass'
-MODEL_VALIDATOR_FULLNAME = 'pydantic.functional_validators.model_validator'
-DECORATOR_FULLNAMES = {
-    'pydantic.functional_validators.field_validator',
-    'pydantic.functional_validators.model_validator',
-    'pydantic.functional_serializers.serializer',
-    'pydantic.functional_serializers.model_serializer',
-    'pydantic.deprecated.class_validators.validator',
-    'pydantic.deprecated.class_validators.root_validator',
-}
-
-
-MYPY_VERSION_TUPLE = parse_mypy_version(mypy_version)
-BUILTINS_NAME = 'builtins' if MYPY_VERSION_TUPLE >= (0, 930) else '__builtins__'
-
-# Increment version if plugin changes and mypy caches should be invalidated
-__version__ = 2
-
-
-def plugin(version: str) -> type[Plugin]:
-    """`version` is the mypy version string.
-
-    We might want to use this to print a warning if the mypy version being used is
-    newer, or especially older, than we expect (or need).
-
-    Args:
-        version: The mypy version string.
-
-    Return:
-        The Pydantic mypy plugin type.
-    """
-    return PydanticPlugin
-
-
-class _DeferAnalysis(Exception):
-    pass
-
-
-class PydanticPlugin(Plugin):
-    """The Pydantic mypy plugin."""
-
-    def __init__(self, options: Options) -> None:
-        self.plugin_config = PydanticPluginConfig(options)
-        self._plugin_data = self.plugin_config.to_data()
-        super().__init__(options)
-
-    def get_base_class_hook(self, fullname: str) -> Callable[[ClassDefContext], bool] | None:
-        """Update Pydantic model class."""
-        sym = self.lookup_fully_qualified(fullname)
-        if sym and isinstance(sym.node, TypeInfo):  # pragma: no branch
-            # No branching may occur if the mypy cache has not been cleared
-            if any(base.fullname == BASEMODEL_FULLNAME for base in sym.node.mro):
-                return self._pydantic_model_class_maker_callback
-        return None
-
-    def get_metaclass_hook(self, fullname: str) -> Callable[[ClassDefContext], None] | None:
-        """Update Pydantic `ModelMetaclass` definition."""
-        if fullname == MODEL_METACLASS_FULLNAME:
-            return self._pydantic_model_metaclass_marker_callback
-        return None
-
-    def get_function_hook(self, fullname: str) -> Callable[[FunctionContext], Type] | None:
-        """Adjust the return type of the `Field` function."""
-        sym = self.lookup_fully_qualified(fullname)
-        if sym and sym.fullname == FIELD_FULLNAME:
-            return self._pydantic_field_callback
-        return None
-
-    def get_method_hook(self, fullname: str) -> Callable[[MethodContext], Type] | None:
-        """Adjust return type of `from_orm` method call."""
-        if fullname.endswith('.from_orm'):
-            return from_attributes_callback
-        return None
-
-    def get_class_decorator_hook(self, fullname: str) -> Callable[[ClassDefContext], None] | None:
-        """Mark pydantic.dataclasses as dataclass.
-
-        Mypy version 1.1.1 added support for `@dataclass_transform` decorator.
-        """
-        if fullname == DATACLASS_FULLNAME and MYPY_VERSION_TUPLE < (1, 1):
-            return dataclasses.dataclass_class_maker_callback  # type: ignore[return-value]
-        return None
-
-    def report_config_data(self, ctx: ReportConfigContext) -> dict[str, Any]:
-        """Return all plugin config data.
-
-        Used by mypy to determine if cache needs to be discarded.
-        """
-        return self._plugin_data
-
-    def _pydantic_model_class_maker_callback(self, ctx: ClassDefContext) -> bool:
-        transformer = PydanticModelTransformer(ctx.cls, ctx.reason, ctx.api, self.plugin_config)
-        return transformer.transform()
-
-    def _pydantic_model_metaclass_marker_callback(self, ctx: ClassDefContext) -> None:
-        """Reset dataclass_transform_spec attribute of ModelMetaclass.
-
-        Let the plugin handle it. This behavior can be disabled
-        if 'debug_dataclass_transform' is set to True', for testing purposes.
-        """
-        if self.plugin_config.debug_dataclass_transform:
-            return
-        info_metaclass = ctx.cls.info.declared_metaclass
-        assert info_metaclass, "callback not passed from 'get_metaclass_hook'"
-        if getattr(info_metaclass.type, 'dataclass_transform_spec', None):
-            info_metaclass.type.dataclass_transform_spec = None
-
-    def _pydantic_field_callback(self, ctx: FunctionContext) -> Type:
-        """Extract the type of the `default` argument from the Field function, and use it as the return type.
-
-        In particular:
-        * Check whether the default and default_factory argument is specified.
-        * Output an error if both are specified.
-        * Retrieve the type of the argument which is specified, and use it as return type for the function.
-        """
-        default_any_type = ctx.default_return_type
-
-        assert ctx.callee_arg_names[0] == 'default', '"default" is no longer first argument in Field()'
-        assert ctx.callee_arg_names[1] == 'default_factory', '"default_factory" is no longer second argument in Field()'
-        default_args = ctx.args[0]
-        default_factory_args = ctx.args[1]
-
-        if default_args and default_factory_args:
-            error_default_and_default_factory_specified(ctx.api, ctx.context)
-            return default_any_type
-
-        if default_args:
-            default_type = ctx.arg_types[0][0]
-            default_arg = default_args[0]
-
-            # Fallback to default Any type if the field is required
-            if not isinstance(default_arg, EllipsisExpr):
-                return default_type
-
-        elif default_factory_args:
-            default_factory_type = ctx.arg_types[1][0]
-
-            # Functions which use `ParamSpec` can be overloaded, exposing the callable's types as a parameter
-            # Pydantic calls the default factory without any argument, so we retrieve the first item
-            if isinstance(default_factory_type, Overloaded):
-                default_factory_type = default_factory_type.items[0]
-
-            if isinstance(default_factory_type, CallableType):
-                ret_type = default_factory_type.ret_type
-                # mypy doesn't think `ret_type` has `args`, you'd think mypy should know,
-                # add this check in case it varies by version
-                args = getattr(ret_type, 'args', None)
-                if args:
-                    if all(isinstance(arg, TypeVarType) for arg in args):
-                        # Looks like the default factory is a type like `list` or `dict`, replace all args with `Any`
-                        ret_type.args = tuple(default_any_type for _ in args)  # type: ignore[attr-defined]
-                return ret_type
-
-        return default_any_type
-
-
-class PydanticPluginConfig:
-    """A Pydantic mypy plugin config holder.
-
-    Attributes:
-        init_forbid_extra: Whether to add a `**kwargs` at the end of the generated `__init__` signature.
-        init_typed: Whether to annotate fields in the generated `__init__`.
-        warn_required_dynamic_aliases: Whether to raise required dynamic aliases error.
-        debug_dataclass_transform: Whether to not reset `dataclass_transform_spec` attribute
-            of `ModelMetaclass` for testing purposes.
-    """
-
-    __slots__ = (
-        'init_forbid_extra',
-        'init_typed',
-        'warn_required_dynamic_aliases',
-        'debug_dataclass_transform',
-    )
-    init_forbid_extra: bool
-    init_typed: bool
-    warn_required_dynamic_aliases: bool
-    debug_dataclass_transform: bool  # undocumented
-
-    def __init__(self, options: Options) -> None:
-        if options.config_file is None:  # pragma: no cover
-            return
-
-        toml_config = parse_toml(options.config_file)
-        if toml_config is not None:
-            config = toml_config.get('tool', {}).get('pydantic-mypy', {})
-            for key in self.__slots__:
-                setting = config.get(key, False)
-                if not isinstance(setting, bool):
-                    raise ValueError(f'Configuration value must be a boolean for key: {key}')
-                setattr(self, key, setting)
-        else:
-            plugin_config = ConfigParser()
-            plugin_config.read(options.config_file)
-            for key in self.__slots__:
-                setting = plugin_config.getboolean(CONFIGFILE_KEY, key, fallback=False)
-                setattr(self, key, setting)
-
-    def to_data(self) -> dict[str, Any]:
-        """Returns a dict of config names to their values."""
-        return {key: getattr(self, key) for key in self.__slots__}
-
-
-def from_attributes_callback(ctx: MethodContext) -> Type:
-    """Raise an error if from_attributes is not enabled."""
-    model_type: Instance
-    ctx_type = ctx.type
-    if isinstance(ctx_type, TypeType):
-        ctx_type = ctx_type.item
-    if isinstance(ctx_type, CallableType) and isinstance(ctx_type.ret_type, Instance):
-        model_type = ctx_type.ret_type  # called on the class
-    elif isinstance(ctx_type, Instance):
-        model_type = ctx_type  # called on an instance (unusual, but still valid)
-    else:  # pragma: no cover
-        detail = f'ctx.type: {ctx_type} (of type {ctx_type.__class__.__name__})'
-        error_unexpected_behavior(detail, ctx.api, ctx.context)
-        return ctx.default_return_type
-    pydantic_metadata = model_type.type.metadata.get(METADATA_KEY)
-    if pydantic_metadata is None:
-        return ctx.default_return_type
-    from_attributes = pydantic_metadata.get('config', {}).get('from_attributes')
-    if from_attributes is not True:
-        error_from_attributes(model_type.type.name, ctx.api, ctx.context)
-    return ctx.default_return_type
-
-
-class PydanticModelField:
-    """Based on mypy.plugins.dataclasses.DataclassAttribute."""
-
-    def __init__(
-        self,
-        name: str,
-        alias: str | None,
-        has_dynamic_alias: bool,
-        has_default: bool,
-        line: int,
-        column: int,
-        type: Type | None,
-        info: TypeInfo,
-    ):
-        self.name = name
-        self.alias = alias
-        self.has_dynamic_alias = has_dynamic_alias
-        self.has_default = has_default
-        self.line = line
-        self.column = column
-        self.type = type
-        self.info = info
-
-    def to_argument(
-        self,
-        current_info: TypeInfo,
-        typed: bool,
-        force_optional: bool,
-        use_alias: bool,
-        api: SemanticAnalyzerPluginInterface,
-    ) -> Argument:
-        """Based on mypy.plugins.dataclasses.DataclassAttribute.to_argument."""
-        variable = self.to_var(current_info, api, use_alias)
-        type_annotation = self.expand_type(current_info, api) if typed else AnyType(TypeOfAny.explicit)
-        return Argument(
-            variable=variable,
-            type_annotation=type_annotation,
-            initializer=None,
-            kind=ARG_NAMED_OPT if force_optional or self.has_default else ARG_NAMED,
-        )
-
-    def expand_type(self, current_info: TypeInfo, api: SemanticAnalyzerPluginInterface) -> Type | None:
-        """Based on mypy.plugins.dataclasses.DataclassAttribute.expand_type."""
-        # The getattr in the next line is used to prevent errors in legacy versions of mypy without this attribute
-        if self.type is not None and getattr(self.info, 'self_type', None) is not None:
-            # In general, it is not safe to call `expand_type()` during semantic analyzis,
-            # however this plugin is called very late, so all types should be fully ready.
-            # Also, it is tricky to avoid eager expansion of Self types here (e.g. because
-            # we serialize attributes).
-            expanded_type = expand_type(self.type, {self.info.self_type.id: fill_typevars(current_info)})
-            if isinstance(self.type, UnionType) and not isinstance(expanded_type, UnionType):
-                if not api.final_iteration:
-                    raise _DeferAnalysis()
-            return expanded_type
-        return self.type
-
-    def to_var(self, current_info: TypeInfo, api: SemanticAnalyzerPluginInterface, use_alias: bool) -> Var:
-        """Based on mypy.plugins.dataclasses.DataclassAttribute.to_var."""
-        if use_alias and self.alias is not None:
-            name = self.alias
-        else:
-            name = self.name
-
-        return Var(name, self.expand_type(current_info, api))
-
-    def serialize(self) -> JsonDict:
-        """Based on mypy.plugins.dataclasses.DataclassAttribute.serialize."""
-        assert self.type
-        return {
-            'name': self.name,
-            'alias': self.alias,
-            'has_dynamic_alias': self.has_dynamic_alias,
-            'has_default': self.has_default,
-            'line': self.line,
-            'column': self.column,
-            'type': self.type.serialize(),
-        }
-
-    @classmethod
-    def deserialize(cls, info: TypeInfo, data: JsonDict, api: SemanticAnalyzerPluginInterface) -> PydanticModelField:
-        """Based on mypy.plugins.dataclasses.DataclassAttribute.deserialize."""
-        data = data.copy()
-        typ = deserialize_and_fixup_type(data.pop('type'), api)
-        return cls(type=typ, info=info, **data)
-
-    def expand_typevar_from_subtype(self, sub_type: TypeInfo) -> None:
-        """Expands type vars in the context of a subtype when an attribute is inherited
-        from a generic super type.
-        """
-        if self.type is not None:
-            self.type = map_type_from_supertype(self.type, sub_type, self.info)
-
-
-class PydanticModelClassVar:
-    """Based on mypy.plugins.dataclasses.DataclassAttribute.
-
-    ClassVars are ignored by subclasses.
-
-    Attributes:
-        name: the ClassVar name
-    """
-
-    def __init__(self, name):
-        self.name = name
-
-    @classmethod
-    def deserialize(cls, data: JsonDict) -> PydanticModelClassVar:
-        """Based on mypy.plugins.dataclasses.DataclassAttribute.deserialize."""
-        data = data.copy()
-        return cls(**data)
-
-    def serialize(self) -> JsonDict:
-        """Based on mypy.plugins.dataclasses.DataclassAttribute.serialize."""
-        return {
-            'name': self.name,
-        }
-
-
-class PydanticModelTransformer:
-    """Transform the BaseModel subclass according to the plugin settings.
-
-    Attributes:
-        tracked_config_fields: A set of field configs that the plugin has to track their value.
-    """
-
-    tracked_config_fields: set[str] = {
-        'extra',
-        'frozen',
-        'from_attributes',
-        'populate_by_name',
-        'alias_generator',
-    }
-
-    def __init__(
-        self,
-        cls: ClassDef,
-        reason: Expression | Statement,
-        api: SemanticAnalyzerPluginInterface,
-        plugin_config: PydanticPluginConfig,
-    ) -> None:
-        self._cls = cls
-        self._reason = reason
-        self._api = api
-
-        self.plugin_config = plugin_config
-
-    def transform(self) -> bool:
-        """Configures the BaseModel subclass according to the plugin settings.
-
-        In particular:
-
-        * determines the model config and fields,
-        * adds a fields-aware signature for the initializer and construct methods
-        * freezes the class if frozen = True
-        * stores the fields, config, and if the class is settings in the mypy metadata for access by subclasses
-        """
-        info = self._cls.info
-        is_root_model = any(ROOT_MODEL_FULLNAME in base.fullname for base in info.mro[:-1])
-        config = self.collect_config()
-        fields, class_vars = self.collect_fields_and_class_vars(config, is_root_model)
-        if fields is None or class_vars is None:
-            # Some definitions are not ready. We need another pass.
-            return False
-        for field in fields:
-            if field.type is None:
-                return False
-
-        is_settings = any(base.fullname == BASESETTINGS_FULLNAME for base in info.mro[:-1])
-        try:
-            self.add_initializer(fields, config, is_settings, is_root_model)
-            self.add_model_construct_method(fields, config, is_settings)
-            self.set_frozen(fields, self._api, frozen=config.frozen is True)
-        except _DeferAnalysis:
-            if not self._api.final_iteration:
-                self._api.defer()
-
-        self.adjust_decorator_signatures()
-
-        info.metadata[METADATA_KEY] = {
-            'fields': {field.name: field.serialize() for field in fields},
-            'class_vars': {class_var.name: class_var.serialize() for class_var in class_vars},
-            'config': config.get_values_dict(),
-        }
-
-        return True
-
-    def adjust_decorator_signatures(self) -> None:
-        """When we decorate a function `f` with `pydantic.validator(...)`, `pydantic.field_validator`
-        or `pydantic.serializer(...)`, mypy sees `f` as a regular method taking a `self` instance,
-        even though pydantic internally wraps `f` with `classmethod` if necessary.
-
-        Teach mypy this by marking any function whose outermost decorator is a `validator()`,
-        `field_validator()` or `serializer()` call as a `classmethod`.
-        """
-        for name, sym in self._cls.info.names.items():
-            if isinstance(sym.node, Decorator):
-                first_dec = sym.node.original_decorators[0]
-                if (
-                    isinstance(first_dec, CallExpr)
-                    and isinstance(first_dec.callee, NameExpr)
-                    and first_dec.callee.fullname in DECORATOR_FULLNAMES
-                    # @model_validator(mode="after") is an exception, it expects a regular method
-                    and not (
-                        first_dec.callee.fullname == MODEL_VALIDATOR_FULLNAME
-                        and any(
-                            first_dec.arg_names[i] == 'mode' and isinstance(arg, StrExpr) and arg.value == 'after'
-                            for i, arg in enumerate(first_dec.args)
-                        )
-                    )
-                ):
-                    # TODO: Only do this if the first argument of the decorated function is `cls`
-                    sym.node.func.is_class = True
-
-    def collect_config(self) -> ModelConfigData:  # noqa: C901 (ignore complexity)
-        """Collects the values of the config attributes that are used by the plugin, accounting for parent classes."""
-        cls = self._cls
-        config = ModelConfigData()
-
-        has_config_kwargs = False
-        has_config_from_namespace = False
-
-        # Handle `class MyModel(BaseModel, <name>=<expr>, ...):`
-        for name, expr in cls.keywords.items():
-            config_data = self.get_config_update(name, expr)
-            if config_data:
-                has_config_kwargs = True
-                config.update(config_data)
-
-        # Handle `model_config`
-        stmt: Statement | None = None
-        for stmt in cls.defs.body:
-            if not isinstance(stmt, (AssignmentStmt, ClassDef)):
-                continue
-
-            if isinstance(stmt, AssignmentStmt):
-                lhs = stmt.lvalues[0]
-                if not isinstance(lhs, NameExpr) or lhs.name != 'model_config':
-                    continue
-
-                if isinstance(stmt.rvalue, CallExpr):  # calls to `dict` or `ConfigDict`
-                    for arg_name, arg in zip(stmt.rvalue.arg_names, stmt.rvalue.args):
-                        if arg_name is None:
-                            continue
-                        config.update(self.get_config_update(arg_name, arg))
-                elif isinstance(stmt.rvalue, DictExpr):  # dict literals
-                    for key_expr, value_expr in stmt.rvalue.items:
-                        if not isinstance(key_expr, StrExpr):
-                            continue
-                        config.update(self.get_config_update(key_expr.value, value_expr))
-
-            elif isinstance(stmt, ClassDef):
-                if stmt.name != 'Config':  # 'deprecated' Config-class
-                    continue
-                for substmt in stmt.defs.body:
-                    if not isinstance(substmt, AssignmentStmt):
-                        continue
-                    lhs = substmt.lvalues[0]
-                    if not isinstance(lhs, NameExpr):
-                        continue
-                    config.update(self.get_config_update(lhs.name, substmt.rvalue))
-
-            if has_config_kwargs:
-                self._api.fail(
-                    'Specifying config in two places is ambiguous, use either Config attribute or class kwargs',
-                    cls,
-                )
-                break
-
-            has_config_from_namespace = True
-
-        if has_config_kwargs or has_config_from_namespace:
-            if (
-                stmt
-                and config.has_alias_generator
-                and not config.populate_by_name
-                and self.plugin_config.warn_required_dynamic_aliases
-            ):
-                error_required_dynamic_aliases(self._api, stmt)
-
-        for info in cls.info.mro[1:]:  # 0 is the current class
-            if METADATA_KEY not in info.metadata:
-                continue
-
-            # Each class depends on the set of fields in its ancestors
-            self._api.add_plugin_dependency(make_wildcard_trigger(info.fullname))
-            for name, value in info.metadata[METADATA_KEY]['config'].items():
-                config.setdefault(name, value)
-        return config
-
-    def collect_fields_and_class_vars(
-        self, model_config: ModelConfigData, is_root_model: bool
-    ) -> tuple[list[PydanticModelField] | None, list[PydanticModelClassVar] | None]:
-        """Collects the fields for the model, accounting for parent classes."""
-        cls = self._cls
-
-        # First, collect fields and ClassVars belonging to any class in the MRO, ignoring duplicates.
-        #
-        # We iterate through the MRO in reverse because attrs defined in the parent must appear
-        # earlier in the attributes list than attrs defined in the child. See:
-        # https://docs.python.org/3/library/dataclasses.html#inheritance
-        #
-        # However, we also want fields defined in the subtype to override ones defined
-        # in the parent. We can implement this via a dict without disrupting the attr order
-        # because dicts preserve insertion order in Python 3.7+.
-        found_fields: dict[str, PydanticModelField] = {}
-        found_class_vars: dict[str, PydanticModelClassVar] = {}
-        for info in reversed(cls.info.mro[1:-1]):  # 0 is the current class, -2 is BaseModel, -1 is object
-            # if BASEMODEL_METADATA_TAG_KEY in info.metadata and BASEMODEL_METADATA_KEY not in info.metadata:
-            #     # We haven't processed the base class yet. Need another pass.
-            #     return None, None
-            if METADATA_KEY not in info.metadata:
-                continue
-
-            # Each class depends on the set of attributes in its dataclass ancestors.
-            self._api.add_plugin_dependency(make_wildcard_trigger(info.fullname))
-
-            for name, data in info.metadata[METADATA_KEY]['fields'].items():
-                field = PydanticModelField.deserialize(info, data, self._api)
-                # (The following comment comes directly from the dataclasses plugin)
-                # TODO: We shouldn't be performing type operations during the main
-                #       semantic analysis pass, since some TypeInfo attributes might
-                #       still be in flux. This should be performed in a later phase.
-                with state.strict_optional_set(self._api.options.strict_optional):
-                    field.expand_typevar_from_subtype(cls.info)
-                found_fields[name] = field
-
-                sym_node = cls.info.names.get(name)
-                if sym_node and sym_node.node and not isinstance(sym_node.node, Var):
-                    self._api.fail(
-                        'BaseModel field may only be overridden by another field',
-                        sym_node.node,
-                    )
-            # Collect ClassVars
-            for name, data in info.metadata[METADATA_KEY]['class_vars'].items():
-                found_class_vars[name] = PydanticModelClassVar.deserialize(data)
-
-        # Second, collect fields and ClassVars belonging to the current class.
-        current_field_names: set[str] = set()
-        current_class_vars_names: set[str] = set()
-        for stmt in self._get_assignment_statements_from_block(cls.defs):
-            maybe_field = self.collect_field_or_class_var_from_stmt(stmt, model_config, found_class_vars)
-            if isinstance(maybe_field, PydanticModelField):
-                lhs = stmt.lvalues[0]
-                if is_root_model and lhs.name != 'root':
-                    error_extra_fields_on_root_model(self._api, stmt)
-                else:
-                    current_field_names.add(lhs.name)
-                    found_fields[lhs.name] = maybe_field
-            elif isinstance(maybe_field, PydanticModelClassVar):
-                lhs = stmt.lvalues[0]
-                current_class_vars_names.add(lhs.name)
-                found_class_vars[lhs.name] = maybe_field
-
-        return list(found_fields.values()), list(found_class_vars.values())
-
-    def _get_assignment_statements_from_if_statement(self, stmt: IfStmt) -> Iterator[AssignmentStmt]:
-        for body in stmt.body:
-            if not body.is_unreachable:
-                yield from self._get_assignment_statements_from_block(body)
-        if stmt.else_body is not None and not stmt.else_body.is_unreachable:
-            yield from self._get_assignment_statements_from_block(stmt.else_body)
-
-    def _get_assignment_statements_from_block(self, block: Block) -> Iterator[AssignmentStmt]:
-        for stmt in block.body:
-            if isinstance(stmt, AssignmentStmt):
-                yield stmt
-            elif isinstance(stmt, IfStmt):
-                yield from self._get_assignment_statements_from_if_statement(stmt)
-
-    def collect_field_or_class_var_from_stmt(  # noqa C901
-        self, stmt: AssignmentStmt, model_config: ModelConfigData, class_vars: dict[str, PydanticModelClassVar]
-    ) -> PydanticModelField | PydanticModelClassVar | None:
-        """Get pydantic model field from statement.
-
-        Args:
-            stmt: The statement.
-            model_config: Configuration settings for the model.
-            class_vars: ClassVars already known to be defined on the model.
-
-        Returns:
-            A pydantic model field if it could find the field in statement. Otherwise, `None`.
-        """
-        cls = self._cls
-
-        lhs = stmt.lvalues[0]
-        if not isinstance(lhs, NameExpr) or not _fields.is_valid_field_name(lhs.name) or lhs.name == 'model_config':
-            return None
-
-        if not stmt.new_syntax:
-            if (
-                isinstance(stmt.rvalue, CallExpr)
-                and isinstance(stmt.rvalue.callee, CallExpr)
-                and isinstance(stmt.rvalue.callee.callee, NameExpr)
-                and stmt.rvalue.callee.callee.fullname in DECORATOR_FULLNAMES
-            ):
-                # This is a (possibly-reused) validator or serializer, not a field
-                # In particular, it looks something like: my_validator = validator('my_field')(f)
-                # Eventually, we may want to attempt to respect model_config['ignored_types']
-                return None
-
-            if lhs.name in class_vars:
-                # Class vars are not fields and are not required to be annotated
-                return None
-
-            # The assignment does not have an annotation, and it's not anything else we recognize
-            error_untyped_fields(self._api, stmt)
-            return None
-
-        lhs = stmt.lvalues[0]
-        if not isinstance(lhs, NameExpr):
-            return None
-
-        if not _fields.is_valid_field_name(lhs.name) or lhs.name == 'model_config':
-            return None
-
-        sym = cls.info.names.get(lhs.name)
-        if sym is None:  # pragma: no cover
-            # This is likely due to a star import (see the dataclasses plugin for a more detailed explanation)
-            # This is the same logic used in the dataclasses plugin
-            return None
-
-        node = sym.node
-        if isinstance(node, PlaceholderNode):  # pragma: no cover
-            # See the PlaceholderNode docstring for more detail about how this can occur
-            # Basically, it is an edge case when dealing with complex import logic
-
-            # The dataclasses plugin now asserts this cannot happen, but I'd rather not error if it does..
-            return None
-
-        if isinstance(node, TypeAlias):
-            self._api.fail(
-                'Type aliases inside BaseModel definitions are not supported at runtime',
-                node,
-            )
-            # Skip processing this node. This doesn't match the runtime behaviour,
-            # but the only alternative would be to modify the SymbolTable,
-            # and it's a little hairy to do that in a plugin.
-            return None
-
-        if not isinstance(node, Var):  # pragma: no cover
-            # Don't know if this edge case still happens with the `is_valid_field` check above
-            # but better safe than sorry
-
-            # The dataclasses plugin now asserts this cannot happen, but I'd rather not error if it does..
-            return None
-
-        # x: ClassVar[int] is not a field
-        if node.is_classvar:
-            return PydanticModelClassVar(lhs.name)
-
-        # x: InitVar[int] is not supported in BaseModel
-        node_type = get_proper_type(node.type)
-        if isinstance(node_type, Instance) and node_type.type.fullname == 'dataclasses.InitVar':
-            self._api.fail(
-                'InitVar is not supported in BaseModel',
-                node,
-            )
-
-        has_default = self.get_has_default(stmt)
-
-        if sym.type is None and node.is_final and node.is_inferred:
-            # This follows the logic from the dataclasses plugin. The following comment is taken verbatim:
-            #
-            # This is a special case, assignment like x: Final = 42 is classified
-            # annotated above, but mypy strips the `Final` turning it into x = 42.
-            # We do not support inferred types in dataclasses, so we can try inferring
-            # type for simple literals, and otherwise require an explicit type
-            # argument for Final[...].
-            typ = self._api.analyze_simple_literal_type(stmt.rvalue, is_final=True)
-            if typ:
-                node.type = typ
-            else:
-                self._api.fail(
-                    'Need type argument for Final[...] with non-literal default in BaseModel',
-                    stmt,
-                )
-                node.type = AnyType(TypeOfAny.from_error)
-
-        alias, has_dynamic_alias = self.get_alias_info(stmt)
-        if has_dynamic_alias and not model_config.populate_by_name and self.plugin_config.warn_required_dynamic_aliases:
-            error_required_dynamic_aliases(self._api, stmt)
-
-        init_type = self._infer_dataclass_attr_init_type(sym, lhs.name, stmt)
-        return PydanticModelField(
-            name=lhs.name,
-            has_dynamic_alias=has_dynamic_alias,
-            has_default=has_default,
-            alias=alias,
-            line=stmt.line,
-            column=stmt.column,
-            type=init_type,
-            info=cls.info,
-        )
-
-    def _infer_dataclass_attr_init_type(self, sym: SymbolTableNode, name: str, context: Context) -> Type | None:
-        """Infer __init__ argument type for an attribute.
-
-        In particular, possibly use the signature of __set__.
-        """
-        default = sym.type
-        if sym.implicit:
-            return default
-        t = get_proper_type(sym.type)
-
-        # Perform a simple-minded inference from the signature of __set__, if present.
-        # We can't use mypy.checkmember here, since this plugin runs before type checking.
-        # We only support some basic scanerios here, which is hopefully sufficient for
-        # the vast majority of use cases.
-        if not isinstance(t, Instance):
-            return default
-        setter = t.type.get('__set__')
-        if setter:
-            if isinstance(setter.node, FuncDef):
-                super_info = t.type.get_containing_type_info('__set__')
-                assert super_info
-                if setter.type:
-                    setter_type = get_proper_type(map_type_from_supertype(setter.type, t.type, super_info))
-                else:
-                    return AnyType(TypeOfAny.unannotated)
-                if isinstance(setter_type, CallableType) and setter_type.arg_kinds == [
-                    ARG_POS,
-                    ARG_POS,
-                    ARG_POS,
-                ]:
-                    return expand_type_by_instance(setter_type.arg_types[2], t)
-                else:
-                    self._api.fail(f'Unsupported signature for "__set__" in "{t.type.name}"', context)
-            else:
-                self._api.fail(f'Unsupported "__set__" in "{t.type.name}"', context)
-
-        return default
-
-    def add_initializer(
-        self, fields: list[PydanticModelField], config: ModelConfigData, is_settings: bool, is_root_model: bool
-    ) -> None:
-        """Adds a fields-aware `__init__` method to the class.
-
-        The added `__init__` will be annotated with types vs. all `Any` depending on the plugin settings.
-        """
-        if '__init__' in self._cls.info.names and not self._cls.info.names['__init__'].plugin_generated:
-            return  # Don't generate an __init__ if one already exists
-
-        typed = self.plugin_config.init_typed
-        use_alias = config.populate_by_name is not True
-        requires_dynamic_aliases = bool(config.has_alias_generator and not config.populate_by_name)
-        with state.strict_optional_set(self._api.options.strict_optional):
-            args = self.get_field_arguments(
-                fields,
-                typed=typed,
-                requires_dynamic_aliases=requires_dynamic_aliases,
-                use_alias=use_alias,
-                is_settings=is_settings,
-            )
-
-            if is_root_model and MYPY_VERSION_TUPLE <= (1, 0, 1):
-                # convert root argument to positional argument
-                # This is needed because mypy support for `dataclass_transform` isn't complete on 1.0.1
-                args[0].kind = ARG_POS if args[0].kind == ARG_NAMED else ARG_OPT
-
-            if is_settings:
-                base_settings_node = self._api.lookup_fully_qualified(BASESETTINGS_FULLNAME).node
-                if '__init__' in base_settings_node.names:
-                    base_settings_init_node = base_settings_node.names['__init__'].node
-                    if base_settings_init_node is not None and base_settings_init_node.type is not None:
-                        func_type = base_settings_init_node.type
-                        for arg_idx, arg_name in enumerate(func_type.arg_names):
-                            if arg_name.startswith('__') or not arg_name.startswith('_'):
-                                continue
-                            analyzed_variable_type = self._api.anal_type(func_type.arg_types[arg_idx])
-                            variable = Var(arg_name, analyzed_variable_type)
-                            args.append(Argument(variable, analyzed_variable_type, None, ARG_OPT))
-
-        if not self.should_init_forbid_extra(fields, config):
-            var = Var('kwargs')
-            args.append(Argument(var, AnyType(TypeOfAny.explicit), None, ARG_STAR2))
-
-        add_method(self._api, self._cls, '__init__', args=args, return_type=NoneType())
-
-    def add_model_construct_method(
-        self, fields: list[PydanticModelField], config: ModelConfigData, is_settings: bool
-    ) -> None:
-        """Adds a fully typed `model_construct` classmethod to the class.
-
-        Similar to the fields-aware __init__ method, but always uses the field names (not aliases),
-        and does not treat settings fields as optional.
-        """
-        set_str = self._api.named_type(f'{BUILTINS_NAME}.set', [self._api.named_type(f'{BUILTINS_NAME}.str')])
-        optional_set_str = UnionType([set_str, NoneType()])
-        fields_set_argument = Argument(Var('_fields_set', optional_set_str), optional_set_str, None, ARG_OPT)
-        with state.strict_optional_set(self._api.options.strict_optional):
-            args = self.get_field_arguments(
-                fields, typed=True, requires_dynamic_aliases=False, use_alias=False, is_settings=is_settings
-            )
-        if not self.should_init_forbid_extra(fields, config):
-            var = Var('kwargs')
-            args.append(Argument(var, AnyType(TypeOfAny.explicit), None, ARG_STAR2))
-
-        args = [fields_set_argument] + args
-
-        add_method(
-            self._api,
-            self._cls,
-            'model_construct',
-            args=args,
-            return_type=fill_typevars(self._cls.info),
-            is_classmethod=True,
-        )
-
-    def set_frozen(self, fields: list[PydanticModelField], api: SemanticAnalyzerPluginInterface, frozen: bool) -> None:
-        """Marks all fields as properties so that attempts to set them trigger mypy errors.
-
-        This is the same approach used by the attrs and dataclasses plugins.
-        """
-        info = self._cls.info
-        for field in fields:
-            sym_node = info.names.get(field.name)
-            if sym_node is not None:
-                var = sym_node.node
-                if isinstance(var, Var):
-                    var.is_property = frozen
-                elif isinstance(var, PlaceholderNode) and not self._api.final_iteration:
-                    # See https://github.com/pydantic/pydantic/issues/5191 to hit this branch for test coverage
-                    self._api.defer()
-                else:  # pragma: no cover
-                    # I don't know whether it's possible to hit this branch, but I've added it for safety
-                    try:
-                        var_str = str(var)
-                    except TypeError:
-                        # This happens for PlaceholderNode; perhaps it will happen for other types in the future..
-                        var_str = repr(var)
-                    detail = f'sym_node.node: {var_str} (of type {var.__class__})'
-                    error_unexpected_behavior(detail, self._api, self._cls)
-            else:
-                var = field.to_var(info, api, use_alias=False)
-                var.info = info
-                var.is_property = frozen
-                var._fullname = info.fullname + '.' + var.name
-                info.names[var.name] = SymbolTableNode(MDEF, var)
-
-    def get_config_update(self, name: str, arg: Expression) -> ModelConfigData | None:
-        """Determines the config update due to a single kwarg in the ConfigDict definition.
-
-        Warns if a tracked config attribute is set to a value the plugin doesn't know how to interpret (e.g., an int)
-        """
-        if name not in self.tracked_config_fields:
-            return None
-        if name == 'extra':
-            if isinstance(arg, StrExpr):
-                forbid_extra = arg.value == 'forbid'
-            elif isinstance(arg, MemberExpr):
-                forbid_extra = arg.name == 'forbid'
-            else:
-                error_invalid_config_value(name, self._api, arg)
-                return None
-            return ModelConfigData(forbid_extra=forbid_extra)
-        if name == 'alias_generator':
-            has_alias_generator = True
-            if isinstance(arg, NameExpr) and arg.fullname == 'builtins.None':
-                has_alias_generator = False
-            return ModelConfigData(has_alias_generator=has_alias_generator)
-        if isinstance(arg, NameExpr) and arg.fullname in ('builtins.True', 'builtins.False'):
-            return ModelConfigData(**{name: arg.fullname == 'builtins.True'})
-        error_invalid_config_value(name, self._api, arg)
-        return None
-
-    @staticmethod
-    def get_has_default(stmt: AssignmentStmt) -> bool:
-        """Returns a boolean indicating whether the field defined in `stmt` is a required field."""
-        expr = stmt.rvalue
-        if isinstance(expr, TempNode):
-            # TempNode means annotation-only, so has no default
-            return False
-        if isinstance(expr, CallExpr) and isinstance(expr.callee, RefExpr) and expr.callee.fullname == FIELD_FULLNAME:
-            # The "default value" is a call to `Field`; at this point, the field has a default if and only if:
-            # * there is a positional argument that is not `...`
-            # * there is a keyword argument named "default" that is not `...`
-            # * there is a "default_factory" that is not `None`
-            for arg, name in zip(expr.args, expr.arg_names):
-                # If name is None, then this arg is the default because it is the only positional argument.
-                if name is None or name == 'default':
-                    return arg.__class__ is not EllipsisExpr
-                if name == 'default_factory':
-                    return not (isinstance(arg, NameExpr) and arg.fullname == 'builtins.None')
-            return False
-        # Has no default if the "default value" is Ellipsis (i.e., `field_name: Annotation = ...`)
-        return not isinstance(expr, EllipsisExpr)
-
-    @staticmethod
-    def get_alias_info(stmt: AssignmentStmt) -> tuple[str | None, bool]:
-        """Returns a pair (alias, has_dynamic_alias), extracted from the declaration of the field defined in `stmt`.
-
-        `has_dynamic_alias` is True if and only if an alias is provided, but not as a string literal.
-        If `has_dynamic_alias` is True, `alias` will be None.
-        """
-        expr = stmt.rvalue
-        if isinstance(expr, TempNode):
-            # TempNode means annotation-only
-            return None, False
-
-        if not (
-            isinstance(expr, CallExpr) and isinstance(expr.callee, RefExpr) and expr.callee.fullname == FIELD_FULLNAME
-        ):
-            # Assigned value is not a call to pydantic.fields.Field
-            return None, False
-
-        for i, arg_name in enumerate(expr.arg_names):
-            if arg_name != 'alias':
-                continue
-            arg = expr.args[i]
-            if isinstance(arg, StrExpr):
-                return arg.value, False
-            else:
-                return None, True
-        return None, False
-
-    def get_field_arguments(
-        self,
-        fields: list[PydanticModelField],
-        typed: bool,
-        use_alias: bool,
-        requires_dynamic_aliases: bool,
-        is_settings: bool,
-    ) -> list[Argument]:
-        """Helper function used during the construction of the `__init__` and `model_construct` method signatures.
-
-        Returns a list of mypy Argument instances for use in the generated signatures.
-        """
-        info = self._cls.info
-        arguments = [
-            field.to_argument(
-                info,
-                typed=typed,
-                force_optional=requires_dynamic_aliases or is_settings,
-                use_alias=use_alias,
-                api=self._api,
-            )
-            for field in fields
-            if not (use_alias and field.has_dynamic_alias)
-        ]
-        return arguments
-
-    def should_init_forbid_extra(self, fields: list[PydanticModelField], config: ModelConfigData) -> bool:
-        """Indicates whether the generated `__init__` should get a `**kwargs` at the end of its signature.
-
-        We disallow arbitrary kwargs if the extra config setting is "forbid", or if the plugin config says to,
-        *unless* a required dynamic alias is present (since then we can't determine a valid signature).
-        """
-        if not config.populate_by_name:
-            if self.is_dynamic_alias_present(fields, bool(config.has_alias_generator)):
-                return False
-        if config.forbid_extra:
-            return True
-        return self.plugin_config.init_forbid_extra
-
-    @staticmethod
-    def is_dynamic_alias_present(fields: list[PydanticModelField], has_alias_generator: bool) -> bool:
-        """Returns whether any fields on the model have a "dynamic alias", i.e., an alias that cannot be
-        determined during static analysis.
-        """
-        for field in fields:
-            if field.has_dynamic_alias:
-                return True
-        if has_alias_generator:
-            for field in fields:
-                if field.alias is None:
-                    return True
-        return False
-
-
-class ModelConfigData:
-    """Pydantic mypy plugin model config class."""
-
-    def __init__(
-        self,
-        forbid_extra: bool | None = None,
-        frozen: bool | None = None,
-        from_attributes: bool | None = None,
-        populate_by_name: bool | None = None,
-        has_alias_generator: bool | None = None,
-    ):
-        self.forbid_extra = forbid_extra
-        self.frozen = frozen
-        self.from_attributes = from_attributes
-        self.populate_by_name = populate_by_name
-        self.has_alias_generator = has_alias_generator
-
-    def get_values_dict(self) -> dict[str, Any]:
-        """Returns a dict of Pydantic model config names to their values.
-
-        It includes the config if config value is not `None`.
-        """
-        return {k: v for k, v in self.__dict__.items() if v is not None}
-
-    def update(self, config: ModelConfigData | None) -> None:
-        """Update Pydantic model config values."""
-        if config is None:
-            return
-        for k, v in config.get_values_dict().items():
-            setattr(self, k, v)
-
-    def setdefault(self, key: str, value: Any) -> None:
-        """Set default value for Pydantic model config if config value is `None`."""
-        if getattr(self, key) is None:
-            setattr(self, key, value)
-
-
-ERROR_ORM = ErrorCode('pydantic-orm', 'Invalid from_attributes call', 'Pydantic')
-ERROR_CONFIG = ErrorCode('pydantic-config', 'Invalid config value', 'Pydantic')
-ERROR_ALIAS = ErrorCode('pydantic-alias', 'Dynamic alias disallowed', 'Pydantic')
-ERROR_UNEXPECTED = ErrorCode('pydantic-unexpected', 'Unexpected behavior', 'Pydantic')
-ERROR_UNTYPED = ErrorCode('pydantic-field', 'Untyped field disallowed', 'Pydantic')
-ERROR_FIELD_DEFAULTS = ErrorCode('pydantic-field', 'Invalid Field defaults', 'Pydantic')
-ERROR_EXTRA_FIELD_ROOT_MODEL = ErrorCode('pydantic-field', 'Extra field on RootModel subclass', 'Pydantic')
-
-
-def error_from_attributes(model_name: str, api: CheckerPluginInterface, context: Context) -> None:
-    """Emits an error when the model does not have `from_attributes=True`."""
-    api.fail(f'"{model_name}" does not have from_attributes=True', context, code=ERROR_ORM)
-
-
-def error_invalid_config_value(name: str, api: SemanticAnalyzerPluginInterface, context: Context) -> None:
-    """Emits an error when the config value is invalid."""
-    api.fail(f'Invalid value for "Config.{name}"', context, code=ERROR_CONFIG)
-
-
-def error_required_dynamic_aliases(api: SemanticAnalyzerPluginInterface, context: Context) -> None:
-    """Emits required dynamic aliases error.
-
-    This will be called when `warn_required_dynamic_aliases=True`.
-    """
-    api.fail('Required dynamic aliases disallowed', context, code=ERROR_ALIAS)
-
-
-def error_unexpected_behavior(
-    detail: str, api: CheckerPluginInterface | SemanticAnalyzerPluginInterface, context: Context
-) -> None:  # pragma: no cover
-    """Emits unexpected behavior error."""
-    # Can't think of a good way to test this, but I confirmed it renders as desired by adding to a non-error path
-    link = 'https://github.com/pydantic/pydantic/issues/new/choose'
-    full_message = f'The pydantic mypy plugin ran into unexpected behavior: {detail}\n'
-    full_message += f'Please consider reporting this bug at {link} so we can try to fix it!'
-    api.fail(full_message, context, code=ERROR_UNEXPECTED)
-
-
-def error_untyped_fields(api: SemanticAnalyzerPluginInterface, context: Context) -> None:
-    """Emits an error when there is an untyped field in the model."""
-    api.fail('Untyped fields disallowed', context, code=ERROR_UNTYPED)
-
-
-def error_extra_fields_on_root_model(api: CheckerPluginInterface, context: Context) -> None:
-    """Emits an error when there is more than just a root field defined for a subclass of RootModel."""
-    api.fail('Only `root` is allowed as a field of a `RootModel`', context, code=ERROR_EXTRA_FIELD_ROOT_MODEL)
-
-
-def error_default_and_default_factory_specified(api: CheckerPluginInterface, context: Context) -> None:
-    """Emits an error when `Field` has both `default` and `default_factory` together."""
-    api.fail('Field default and default_factory cannot be specified together', context, code=ERROR_FIELD_DEFAULTS)
-
-
-def add_method(
-    api: SemanticAnalyzerPluginInterface | CheckerPluginInterface,
-    cls: ClassDef,
-    name: str,
-    args: list[Argument],
-    return_type: Type,
-    self_type: Type | None = None,
-    tvar_def: TypeVarDef | None = None,
-    is_classmethod: bool = False,
-) -> None:
-    """Very closely related to `mypy.plugins.common.add_method_to_class`, with a few pydantic-specific changes."""
-    info = cls.info
-
-    # First remove any previously generated methods with the same name
-    # to avoid clashes and problems in the semantic analyzer.
-    if name in info.names:
-        sym = info.names[name]
-        if sym.plugin_generated and isinstance(sym.node, FuncDef):
-            cls.defs.body.remove(sym.node)  # pragma: no cover
-
-    if isinstance(api, SemanticAnalyzerPluginInterface):
-        function_type = api.named_type('builtins.function')
-    else:
-        function_type = api.named_generic_type('builtins.function', [])
-
-    if is_classmethod:
-        self_type = self_type or TypeType(fill_typevars(info))
-        first = [Argument(Var('_cls'), self_type, None, ARG_POS, True)]
-    else:
-        self_type = self_type or fill_typevars(info)
-        # `self` is positional *ONLY* here, but this can't be expressed
-        # fully in the mypy internal API. ARG_POS is the closest we can get.
-        # Using ARG_POS will, however, give mypy errors if a `self` field
-        # is present on a model:
-        #
-        #     Name "self" already defined (possibly by an import)  [no-redef]
-        #
-        # As a workaround, we give this argument a name that will
-        # never conflict. By its positional nature, this name will not
-        # be used or exposed to users.
-        first = [Argument(Var('__pydantic_self__'), self_type, None, ARG_POS)]
-    args = first + args
-
-    arg_types, arg_names, arg_kinds = [], [], []
-    for arg in args:
-        assert arg.type_annotation, 'All arguments must be fully typed.'
-        arg_types.append(arg.type_annotation)
-        arg_names.append(arg.variable.name)
-        arg_kinds.append(arg.kind)
-
-    signature = CallableType(arg_types, arg_kinds, arg_names, return_type, function_type)
-    if tvar_def:
-        signature.variables = [tvar_def]
-
-    func = FuncDef(name, args, Block([PassStmt()]))
-    func.info = info
-    func.type = set_callable_name(signature, func)
-    func.is_class = is_classmethod
-    func._fullname = info.fullname + '.' + name
-    func.line = info.line
-
-    # NOTE: we would like the plugin generated node to dominate, but we still
-    # need to keep any existing definitions so they get semantically analyzed.
-    if name in info.names:
-        # Get a nice unique name instead.
-        r_name = get_unique_redefinition_name(name, info.names)
-        info.names[r_name] = info.names[name]
-
-    # Add decorator for is_classmethod
-    # The dataclasses plugin claims this is unnecessary for classmethods, but not including it results in a
-    # signature incompatible with the superclass, which causes mypy errors to occur for every subclass of BaseModel.
-    if is_classmethod:
-        func.is_decorated = True
-        v = Var(name, func.type)
-        v.info = info
-        v._fullname = func._fullname
-        v.is_classmethod = True
-        dec = Decorator(func, [NameExpr('classmethod')], v)
-        dec.line = info.line
-        sym = SymbolTableNode(MDEF, dec)
-    else:
-        sym = SymbolTableNode(MDEF, func)
-    sym.plugin_generated = True
-    info.names[name] = sym
-
-    info.defn.defs.body.append(func)
-
-
-def parse_toml(config_file: str) -> dict[str, Any] | None:
-    """Returns a dict of config keys to values.
-
-    It reads configs from toml file and returns `None` if the file is not a toml file.
-    """
-    if not config_file.endswith('.toml'):
-        return None
-
-    if sys.version_info >= (3, 11):
-        import tomllib as toml_
-    else:
-        try:
-            import tomli as toml_
-        except ImportError:  # pragma: no cover
-            import warnings
-
-            warnings.warn('No TOML parser installed, cannot read configuration from `pyproject.toml`.')
-            return None
-
-    with open(config_file, 'rb') as rf:
-        return toml_.load(rf)
diff --git a/lib/pydantic/networks.py b/lib/pydantic/networks.py
deleted file mode 100644
index 6d9d292f..00000000
--- a/lib/pydantic/networks.py
+++ /dev/null
@@ -1,708 +0,0 @@
-"""The networks module contains types for common network-related fields."""
-from __future__ import annotations as _annotations
-
-import dataclasses as _dataclasses
-import re
-from importlib.metadata import version
-from ipaddress import IPv4Address, IPv4Interface, IPv4Network, IPv6Address, IPv6Interface, IPv6Network
-from typing import TYPE_CHECKING, Any
-
-from pydantic_core import MultiHostUrl, PydanticCustomError, Url, core_schema
-from typing_extensions import Annotated, TypeAlias
-
-from ._internal import _fields, _repr, _schema_generation_shared
-from ._migration import getattr_migration
-from .annotated_handlers import GetCoreSchemaHandler
-from .json_schema import JsonSchemaValue
-
-if TYPE_CHECKING:
-    import email_validator
-
-    NetworkType: TypeAlias = 'str | bytes | int | tuple[str | bytes | int, str | int]'
-
-else:
-    email_validator = None
-
-
-__all__ = [
-    'AnyUrl',
-    'AnyHttpUrl',
-    'FileUrl',
-    'HttpUrl',
-    'UrlConstraints',
-    'EmailStr',
-    'NameEmail',
-    'IPvAnyAddress',
-    'IPvAnyInterface',
-    'IPvAnyNetwork',
-    'PostgresDsn',
-    'CockroachDsn',
-    'AmqpDsn',
-    'RedisDsn',
-    'MongoDsn',
-    'KafkaDsn',
-    'NatsDsn',
-    'validate_email',
-    'MySQLDsn',
-    'MariaDBDsn',
-]
-
-
-@_dataclasses.dataclass
-class UrlConstraints(_fields.PydanticMetadata):
-    """Url constraints.
-
-    Attributes:
-        max_length: The maximum length of the url. Defaults to `None`.
-        allowed_schemes: The allowed schemes. Defaults to `None`.
-        host_required: Whether the host is required. Defaults to `None`.
-        default_host: The default host. Defaults to `None`.
-        default_port: The default port. Defaults to `None`.
-        default_path: The default path. Defaults to `None`.
-    """
-
-    max_length: int | None = None
-    allowed_schemes: list[str] | None = None
-    host_required: bool | None = None
-    default_host: str | None = None
-    default_port: int | None = None
-    default_path: str | None = None
-
-    def __hash__(self) -> int:
-        return hash(
-            (
-                self.max_length,
-                tuple(self.allowed_schemes) if self.allowed_schemes is not None else None,
-                self.host_required,
-                self.default_host,
-                self.default_port,
-                self.default_path,
-            )
-        )
-
-
-AnyUrl = Url
-"""Base type for all URLs.
-
-* Any scheme allowed
-* Top-level domain (TLD) not required
-* Host required
-
-Assuming an input URL of `http://samuel:pass@example.com:8000/the/path/?query=here#fragment=is;this=bit`,
-the types export the following properties:
-
-- `scheme`: the URL scheme (`http`), always set.
-- `host`: the URL host (`example.com`), always set.
-- `username`: optional username if included (`samuel`).
-- `password`: optional password if included (`pass`).
-- `port`: optional port (`8000`).
-- `path`: optional path (`/the/path/`).
-- `query`: optional URL query (for example, `GET` arguments or "search string", such as `query=here`).
-- `fragment`: optional fragment (`fragment=is;this=bit`).
-"""
-AnyHttpUrl = Annotated[Url, UrlConstraints(allowed_schemes=['http', 'https'])]
-"""A type that will accept any http or https URL.
-
-* TLD not required
-* Host required
-"""
-HttpUrl = Annotated[Url, UrlConstraints(max_length=2083, allowed_schemes=['http', 'https'])]
-"""A type that will accept any http or https URL.
-
-* TLD required
-* Host required
-* Max length 2083
-
-```py
-from pydantic import BaseModel, HttpUrl, ValidationError
-
-class MyModel(BaseModel):
-    url: HttpUrl
-
-m = MyModel(url='http://www.example.com')
-print(m.url)
-#> http://www.example.com/
-
-try:
-    MyModel(url='ftp://invalid.url')
-except ValidationError as e:
-    print(e)
-    '''
-    1 validation error for MyModel
-    url
-      URL scheme should be 'http' or 'https' [type=url_scheme, input_value='ftp://invalid.url', input_type=str]
-    '''
-
-try:
-    MyModel(url='not a url')
-except ValidationError as e:
-    print(e)
-    '''
-    1 validation error for MyModel
-    url
-      Input should be a valid URL, relative URL without a base [type=url_parsing, input_value='not a url', input_type=str]
-    '''
-```
-
-"International domains" (e.g. a URL where the host or TLD includes non-ascii characters) will be encoded via
-[punycode](https://en.wikipedia.org/wiki/Punycode) (see
-[this article](https://www.xudongz.com/blog/2017/idn-phishing/) for a good description of why this is important):
-
-```py
-from pydantic import BaseModel, HttpUrl
-
-class MyModel(BaseModel):
-    url: HttpUrl
-
-m1 = MyModel(url='http://puny£code.com')
-print(m1.url)
-#> http://xn--punycode-eja.com/
-m2 = MyModel(url='https://www.арр�е.com/')
-print(m2.url)
-#> https://www.xn--80ak6aa92e.com/
-m3 = MyModel(url='https://www.example.��/')
-print(m3.url)
-#> https://www.example.xn--pbt977c/
-```
-
-
-!!! warning "Underscores in Hostnames"
-    In Pydantic, underscores are allowed in all parts of a domain except the TLD.
-    Technically this might be wrong - in theory the hostname cannot have underscores, but subdomains can.
-
-    To explain this; consider the following two cases:
-
-    - `exam_ple.co.uk`: the hostname is `exam_ple`, which should not be allowed since it contains an underscore.
-    - `foo_bar.example.com` the hostname is `example`, which should be allowed since the underscore is in the subdomain.
-
-    Without having an exhaustive list of TLDs, it would be impossible to differentiate between these two. Therefore
-    underscores are allowed, but you can always do further validation in a validator if desired.
-
-    Also, Chrome, Firefox, and Safari all currently accept `http://exam_ple.com` as a URL, so we're in good
-    (or at least big) company.
-"""
-FileUrl = Annotated[Url, UrlConstraints(allowed_schemes=['file'])]
-"""A type that will accept any file URL.
-
-* Host not required
-"""
-PostgresDsn = Annotated[
-    MultiHostUrl,
-    UrlConstraints(
-        host_required=True,
-        allowed_schemes=[
-            'postgres',
-            'postgresql',
-            'postgresql+asyncpg',
-            'postgresql+pg8000',
-            'postgresql+psycopg',
-            'postgresql+psycopg2',
-            'postgresql+psycopg2cffi',
-            'postgresql+py-postgresql',
-            'postgresql+pygresql',
-        ],
-    ),
-]
-"""A type that will accept any Postgres DSN.
-
-* User info required
-* TLD not required
-* Host required
-* Supports multiple hosts
-
-If further validation is required, these properties can be used by validators to enforce specific behaviour:
-
-```py
-from pydantic import (
-    BaseModel,
-    HttpUrl,
-    PostgresDsn,
-    ValidationError,
-    field_validator,
-)
-
-class MyModel(BaseModel):
-    url: HttpUrl
-
-m = MyModel(url='http://www.example.com')
-
-# the repr() method for a url will display all properties of the url
-print(repr(m.url))
-#> Url('http://www.example.com/')
-print(m.url.scheme)
-#> http
-print(m.url.host)
-#> www.example.com
-print(m.url.port)
-#> 80
-
-class MyDatabaseModel(BaseModel):
-    db: PostgresDsn
-
-    @field_validator('db')
-    def check_db_name(cls, v):
-        assert v.path and len(v.path) > 1, 'database must be provided'
-        return v
-
-m = MyDatabaseModel(db='postgres://user:pass@localhost:5432/foobar')
-print(m.db)
-#> postgres://user:pass@localhost:5432/foobar
-
-try:
-    MyDatabaseModel(db='postgres://user:pass@localhost:5432')
-except ValidationError as e:
-    print(e)
-    '''
-    1 validation error for MyDatabaseModel
-    db
-      Assertion failed, database must be provided
-    assert (None)
-     +  where None = MultiHostUrl('postgres://user:pass@localhost:5432').path [type=assertion_error, input_value='postgres://user:pass@localhost:5432', input_type=str]
-    '''
-```
-"""
-
-CockroachDsn = Annotated[
-    Url,
-    UrlConstraints(
-        host_required=True,
-        allowed_schemes=[
-            'cockroachdb',
-            'cockroachdb+psycopg2',
-            'cockroachdb+asyncpg',
-        ],
-    ),
-]
-"""A type that will accept any Cockroach DSN.
-
-* User info required
-* TLD not required
-* Host required
-"""
-AmqpDsn = Annotated[Url, UrlConstraints(allowed_schemes=['amqp', 'amqps'])]
-"""A type that will accept any AMQP DSN.
-
-* User info required
-* TLD not required
-* Host required
-"""
-RedisDsn = Annotated[
-    Url,
-    UrlConstraints(allowed_schemes=['redis', 'rediss'], default_host='localhost', default_port=6379, default_path='/0'),
-]
-"""A type that will accept any Redis DSN.
-
-* User info required
-* TLD not required
-* Host required (e.g., `rediss://:pass@localhost`)
-"""
-MongoDsn = Annotated[MultiHostUrl, UrlConstraints(allowed_schemes=['mongodb', 'mongodb+srv'], default_port=27017)]
-"""A type that will accept any MongoDB DSN.
-
-* User info not required
-* Database name not required
-* Port not required
-* User info may be passed without user part (e.g., `mongodb://mongodb0.example.com:27017`).
-"""
-KafkaDsn = Annotated[Url, UrlConstraints(allowed_schemes=['kafka'], default_host='localhost', default_port=9092)]
-"""A type that will accept any Kafka DSN.
-
-* User info required
-* TLD not required
-* Host required
-"""
-NatsDsn = Annotated[
-    MultiHostUrl, UrlConstraints(allowed_schemes=['nats', 'tls', 'ws'], default_host='localhost', default_port=4222)
-]
-"""A type that will accept any NATS DSN.
-
-NATS is a connective technology built for the ever increasingly hyper-connected world.
-It is a single technology that enables applications to securely communicate across
-any combination of cloud vendors, on-premise, edge, web and mobile, and devices.
-More: https://nats.io
-"""
-MySQLDsn = Annotated[
-    Url,
-    UrlConstraints(
-        allowed_schemes=[
-            'mysql',
-            'mysql+mysqlconnector',
-            'mysql+aiomysql',
-            'mysql+asyncmy',
-            'mysql+mysqldb',
-            'mysql+pymysql',
-            'mysql+cymysql',
-            'mysql+pyodbc',
-        ],
-        default_port=3306,
-    ),
-]
-"""A type that will accept any MySQL DSN.
-
-* User info required
-* TLD not required
-* Host required
-"""
-MariaDBDsn = Annotated[
-    Url,
-    UrlConstraints(
-        allowed_schemes=['mariadb', 'mariadb+mariadbconnector', 'mariadb+pymysql'],
-        default_port=3306,
-    ),
-]
-"""A type that will accept any MariaDB DSN.
-
-* User info required
-* TLD not required
-* Host required
-"""
-
-
-def import_email_validator() -> None:
-    global email_validator
-    try:
-        import email_validator
-    except ImportError as e:
-        raise ImportError('email-validator is not installed, run `pip install pydantic[email]`') from e
-    if not version('email-validator').partition('.')[0] == '2':
-        raise ImportError('email-validator version >= 2.0 required, run pip install -U email-validator')
-
-
-if TYPE_CHECKING:
-    EmailStr = Annotated[str, ...]
-else:
-
-    class EmailStr:
-        """
-        Info:
-            To use this type, you need to install the optional
-            [`email-validator`](https://github.com/JoshData/python-email-validator) package:
-
-            ```bash
-            pip install email-validator
-            ```
-
-        Validate email addresses.
-
-        ```py
-        from pydantic import BaseModel, EmailStr
-
-        class Model(BaseModel):
-            email: EmailStr
-
-        print(Model(email='contact@mail.com'))
-        #> email='contact@mail.com'
-        ```
-        """  # noqa: D212
-
-        @classmethod
-        def __get_pydantic_core_schema__(
-            cls,
-            _source: type[Any],
-            _handler: GetCoreSchemaHandler,
-        ) -> core_schema.CoreSchema:
-            import_email_validator()
-            return core_schema.no_info_after_validator_function(cls._validate, core_schema.str_schema())
-
-        @classmethod
-        def __get_pydantic_json_schema__(
-            cls, core_schema: core_schema.CoreSchema, handler: _schema_generation_shared.GetJsonSchemaHandler
-        ) -> JsonSchemaValue:
-            field_schema = handler(core_schema)
-            field_schema.update(type='string', format='email')
-            return field_schema
-
-        @classmethod
-        def _validate(cls, __input_value: str) -> str:
-            return validate_email(__input_value)[1]
-
-
-class NameEmail(_repr.Representation):
-    """
-    Info:
-        To use this type, you need to install the optional
-        [`email-validator`](https://github.com/JoshData/python-email-validator) package:
-
-        ```bash
-        pip install email-validator
-        ```
-
-    Validate a name and email address combination, as specified by
-    [RFC 5322](https://datatracker.ietf.org/doc/html/rfc5322#section-3.4).
-
-    The `NameEmail` has two properties: `name` and `email`.
-    In case the `name` is not provided, it's inferred from the email address.
-
-    ```py
-    from pydantic import BaseModel, NameEmail
-
-    class User(BaseModel):
-        email: NameEmail
-
-    user = User(email='Fred Bloggs <fred.bloggs@example.com>')
-    print(user.email)
-    #> Fred Bloggs <fred.bloggs@example.com>
-    print(user.email.name)
-    #> Fred Bloggs
-
-    user = User(email='fred.bloggs@example.com')
-    print(user.email)
-    #> fred.bloggs <fred.bloggs@example.com>
-    print(user.email.name)
-    #> fred.bloggs
-    ```
-    """  # noqa: D212
-
-    __slots__ = 'name', 'email'
-
-    def __init__(self, name: str, email: str):
-        self.name = name
-        self.email = email
-
-    def __eq__(self, other: Any) -> bool:
-        return isinstance(other, NameEmail) and (self.name, self.email) == (other.name, other.email)
-
-    @classmethod
-    def __get_pydantic_json_schema__(
-        cls, core_schema: core_schema.CoreSchema, handler: _schema_generation_shared.GetJsonSchemaHandler
-    ) -> JsonSchemaValue:
-        field_schema = handler(core_schema)
-        field_schema.update(type='string', format='name-email')
-        return field_schema
-
-    @classmethod
-    def __get_pydantic_core_schema__(
-        cls,
-        _source: type[Any],
-        _handler: GetCoreSchemaHandler,
-    ) -> core_schema.CoreSchema:
-        import_email_validator()
-        return core_schema.no_info_after_validator_function(
-            cls._validate,
-            core_schema.union_schema(
-                [core_schema.is_instance_schema(cls), core_schema.str_schema()],
-                custom_error_type='name_email_type',
-                custom_error_message='Input is not a valid NameEmail',
-            ),
-            serialization=core_schema.to_string_ser_schema(),
-        )
-
-    @classmethod
-    def _validate(cls, __input_value: NameEmail | str) -> NameEmail:
-        if isinstance(__input_value, cls):
-            return __input_value
-        else:
-            name, email = validate_email(__input_value)  # type: ignore[arg-type]
-            return cls(name, email)
-
-    def __str__(self) -> str:
-        return f'{self.name} <{self.email}>'
-
-
-class IPvAnyAddress:
-    """Validate an IPv4 or IPv6 address.
-
-    ```py
-    from pydantic import BaseModel
-    from pydantic.networks import IPvAnyAddress
-
-    class IpModel(BaseModel):
-        ip: IPvAnyAddress
-
-    print(IpModel(ip='127.0.0.1'))
-    #> ip=IPv4Address('127.0.0.1')
-
-    try:
-        IpModel(ip='http://www.example.com')
-    except ValueError as e:
-        print(e.errors())
-        '''
-        [
-            {
-                'type': 'ip_any_address',
-                'loc': ('ip',),
-                'msg': 'value is not a valid IPv4 or IPv6 address',
-                'input': 'http://www.example.com',
-            }
-        ]
-        '''
-    ```
-    """
-
-    __slots__ = ()
-
-    def __new__(cls, value: Any) -> IPv4Address | IPv6Address:
-        """Validate an IPv4 or IPv6 address."""
-        try:
-            return IPv4Address(value)
-        except ValueError:
-            pass
-
-        try:
-            return IPv6Address(value)
-        except ValueError:
-            raise PydanticCustomError('ip_any_address', 'value is not a valid IPv4 or IPv6 address')
-
-    @classmethod
-    def __get_pydantic_json_schema__(
-        cls, core_schema: core_schema.CoreSchema, handler: _schema_generation_shared.GetJsonSchemaHandler
-    ) -> JsonSchemaValue:
-        field_schema = {}
-        field_schema.update(type='string', format='ipvanyaddress')
-        return field_schema
-
-    @classmethod
-    def __get_pydantic_core_schema__(
-        cls,
-        _source: type[Any],
-        _handler: GetCoreSchemaHandler,
-    ) -> core_schema.CoreSchema:
-        return core_schema.no_info_plain_validator_function(
-            cls._validate, serialization=core_schema.to_string_ser_schema()
-        )
-
-    @classmethod
-    def _validate(cls, __input_value: Any) -> IPv4Address | IPv6Address:
-        return cls(__input_value)  # type: ignore[return-value]
-
-
-class IPvAnyInterface:
-    """Validate an IPv4 or IPv6 interface."""
-
-    __slots__ = ()
-
-    def __new__(cls, value: NetworkType) -> IPv4Interface | IPv6Interface:
-        """Validate an IPv4 or IPv6 interface."""
-        try:
-            return IPv4Interface(value)
-        except ValueError:
-            pass
-
-        try:
-            return IPv6Interface(value)
-        except ValueError:
-            raise PydanticCustomError('ip_any_interface', 'value is not a valid IPv4 or IPv6 interface')
-
-    @classmethod
-    def __get_pydantic_json_schema__(
-        cls, core_schema: core_schema.CoreSchema, handler: _schema_generation_shared.GetJsonSchemaHandler
-    ) -> JsonSchemaValue:
-        field_schema = {}
-        field_schema.update(type='string', format='ipvanyinterface')
-        return field_schema
-
-    @classmethod
-    def __get_pydantic_core_schema__(
-        cls,
-        _source: type[Any],
-        _handler: GetCoreSchemaHandler,
-    ) -> core_schema.CoreSchema:
-        return core_schema.no_info_plain_validator_function(
-            cls._validate, serialization=core_schema.to_string_ser_schema()
-        )
-
-    @classmethod
-    def _validate(cls, __input_value: NetworkType) -> IPv4Interface | IPv6Interface:
-        return cls(__input_value)  # type: ignore[return-value]
-
-
-class IPvAnyNetwork:
-    """Validate an IPv4 or IPv6 network."""
-
-    __slots__ = ()
-
-    def __new__(cls, value: NetworkType) -> IPv4Network | IPv6Network:
-        """Validate an IPv4 or IPv6 network."""
-        # Assume IP Network is defined with a default value for `strict` argument.
-        # Define your own class if you want to specify network address check strictness.
-        try:
-            return IPv4Network(value)
-        except ValueError:
-            pass
-
-        try:
-            return IPv6Network(value)
-        except ValueError:
-            raise PydanticCustomError('ip_any_network', 'value is not a valid IPv4 or IPv6 network')
-
-    @classmethod
-    def __get_pydantic_json_schema__(
-        cls, core_schema: core_schema.CoreSchema, handler: _schema_generation_shared.GetJsonSchemaHandler
-    ) -> JsonSchemaValue:
-        field_schema = {}
-        field_schema.update(type='string', format='ipvanynetwork')
-        return field_schema
-
-    @classmethod
-    def __get_pydantic_core_schema__(
-        cls,
-        _source: type[Any],
-        _handler: GetCoreSchemaHandler,
-    ) -> core_schema.CoreSchema:
-        return core_schema.no_info_plain_validator_function(
-            cls._validate, serialization=core_schema.to_string_ser_schema()
-        )
-
-    @classmethod
-    def _validate(cls, __input_value: NetworkType) -> IPv4Network | IPv6Network:
-        return cls(__input_value)  # type: ignore[return-value]
-
-
-def _build_pretty_email_regex() -> re.Pattern[str]:
-    name_chars = r'[\w!#$%&\'*+\-/=?^_`{|}~]'
-    unquoted_name_group = rf'((?:{name_chars}+\s+)*{name_chars}+)'
-    quoted_name_group = r'"((?:[^"]|\")+)"'
-    email_group = r'<\s*(.+)\s*>'
-    return re.compile(rf'\s*(?:{unquoted_name_group}|{quoted_name_group})?\s*{email_group}\s*')
-
-
-pretty_email_regex = _build_pretty_email_regex()
-
-MAX_EMAIL_LENGTH = 2048
-"""Maximum length for an email.
-A somewhat arbitrary but very generous number compared to what is allowed by most implementations.
-"""
-
-
-def validate_email(value: str) -> tuple[str, str]:
-    """Email address validation using [email-validator](https://pypi.org/project/email-validator/).
-
-    Note:
-        Note that:
-
-        * Raw IP address (literal) domain parts are not allowed.
-        * `"John Doe <local_part@domain.com>"` style "pretty" email addresses are processed.
-        * Spaces are striped from the beginning and end of addresses, but no error is raised.
-    """
-    if email_validator is None:
-        import_email_validator()
-
-    if len(value) > MAX_EMAIL_LENGTH:
-        raise PydanticCustomError(
-            'value_error',
-            'value is not a valid email address: {reason}',
-            {'reason': f'Length must not exceed {MAX_EMAIL_LENGTH} characters'},
-        )
-
-    m = pretty_email_regex.fullmatch(value)
-    name: str | None = None
-    if m:
-        unquoted_name, quoted_name, value = m.groups()
-        name = unquoted_name or quoted_name
-
-    email = value.strip()
-
-    try:
-        parts = email_validator.validate_email(email, check_deliverability=False)
-    except email_validator.EmailNotValidError as e:
-        raise PydanticCustomError(
-            'value_error', 'value is not a valid email address: {reason}', {'reason': str(e.args[0])}
-        ) from e
-
-    email = parts.normalized
-    assert email is not None
-    name = name or parts.local_part
-    return name, email
-
-
-__getattr__ = getattr_migration(__name__)
diff --git a/lib/pydantic/parse.py b/lib/pydantic/parse.py
deleted file mode 100644
index ceee6342..00000000
--- a/lib/pydantic/parse.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""The `parse` module is a backport module from V1."""
-from ._migration import getattr_migration
-
-__getattr__ = getattr_migration(__name__)
diff --git a/lib/pydantic/plugin/__init__.py b/lib/pydantic/plugin/__init__.py
deleted file mode 100644
index 84197006..00000000
--- a/lib/pydantic/plugin/__init__.py
+++ /dev/null
@@ -1,170 +0,0 @@
-"""Usage docs: https://docs.pydantic.dev/2.6/concepts/plugins#build-a-plugin
-
-Plugin interface for Pydantic plugins, and related types.
-"""
-from __future__ import annotations
-
-from typing import Any, Callable, NamedTuple
-
-from pydantic_core import CoreConfig, CoreSchema, ValidationError
-from typing_extensions import Literal, Protocol, TypeAlias
-
-__all__ = (
-    'PydanticPluginProtocol',
-    'BaseValidateHandlerProtocol',
-    'ValidatePythonHandlerProtocol',
-    'ValidateJsonHandlerProtocol',
-    'ValidateStringsHandlerProtocol',
-    'NewSchemaReturns',
-    'SchemaTypePath',
-    'SchemaKind',
-)
-
-NewSchemaReturns: TypeAlias = 'tuple[ValidatePythonHandlerProtocol | None, ValidateJsonHandlerProtocol | None, ValidateStringsHandlerProtocol | None]'
-
-
-class SchemaTypePath(NamedTuple):
-    """Path defining where `schema_type` was defined, or where `TypeAdapter` was called."""
-
-    module: str
-    name: str
-
-
-SchemaKind: TypeAlias = Literal['BaseModel', 'TypeAdapter', 'dataclass', 'create_model', 'validate_call']
-
-
-class PydanticPluginProtocol(Protocol):
-    """Protocol defining the interface for Pydantic plugins."""
-
-    def new_schema_validator(
-        self,
-        schema: CoreSchema,
-        schema_type: Any,
-        schema_type_path: SchemaTypePath,
-        schema_kind: SchemaKind,
-        config: CoreConfig | None,
-        plugin_settings: dict[str, object],
-    ) -> tuple[
-        ValidatePythonHandlerProtocol | None, ValidateJsonHandlerProtocol | None, ValidateStringsHandlerProtocol | None
-    ]:
-        """This method is called for each plugin every time a new [`SchemaValidator`][pydantic_core.SchemaValidator]
-        is created.
-
-        It should return an event handler for each of the three validation methods, or `None` if the plugin does not
-        implement that method.
-
-        Args:
-            schema: The schema to validate against.
-            schema_type: The original type which the schema was created from, e.g. the model class.
-            schema_type_path: Path defining where `schema_type` was defined, or where `TypeAdapter` was called.
-            schema_kind: The kind of schema to validate against.
-            config: The config to use for validation.
-            plugin_settings: Any plugin settings.
-
-        Returns:
-            A tuple of optional event handlers for each of the three validation methods -
-                `validate_python`, `validate_json`, `validate_strings`.
-        """
-        raise NotImplementedError('Pydantic plugins should implement `new_schema_validator`.')
-
-
-class BaseValidateHandlerProtocol(Protocol):
-    """Base class for plugin callbacks protocols.
-
-    You shouldn't implement this protocol directly, instead use one of the subclasses with adds the correctly
-    typed `on_error` method.
-    """
-
-    on_enter: Callable[..., None]
-    """`on_enter` is changed to be more specific on all subclasses"""
-
-    def on_success(self, result: Any) -> None:
-        """Callback to be notified of successful validation.
-
-        Args:
-            result: The result of the validation.
-        """
-        return
-
-    def on_error(self, error: ValidationError) -> None:
-        """Callback to be notified of validation errors.
-
-        Args:
-            error: The validation error.
-        """
-        return
-
-    def on_exception(self, exception: Exception) -> None:
-        """Callback to be notified of validation exceptions.
-
-        Args:
-            exception: The exception raised during validation.
-        """
-        return
-
-
-class ValidatePythonHandlerProtocol(BaseValidateHandlerProtocol, Protocol):
-    """Event handler for `SchemaValidator.validate_python`."""
-
-    def on_enter(
-        self,
-        input: Any,
-        *,
-        strict: bool | None = None,
-        from_attributes: bool | None = None,
-        context: dict[str, Any] | None = None,
-        self_instance: Any | None = None,
-    ) -> None:
-        """Callback to be notified of validation start, and create an instance of the event handler.
-
-        Args:
-            input: The input to be validated.
-            strict: Whether to validate the object in strict mode.
-            from_attributes: Whether to validate objects as inputs by extracting attributes.
-            context: The context to use for validation, this is passed to functional validators.
-            self_instance: An instance of a model to set attributes on from validation, this is used when running
-                validation from the `__init__` method of a model.
-        """
-        pass
-
-
-class ValidateJsonHandlerProtocol(BaseValidateHandlerProtocol, Protocol):
-    """Event handler for `SchemaValidator.validate_json`."""
-
-    def on_enter(
-        self,
-        input: str | bytes | bytearray,
-        *,
-        strict: bool | None = None,
-        context: dict[str, Any] | None = None,
-        self_instance: Any | None = None,
-    ) -> None:
-        """Callback to be notified of validation start, and create an instance of the event handler.
-
-        Args:
-            input: The JSON data to be validated.
-            strict: Whether to validate the object in strict mode.
-            context: The context to use for validation, this is passed to functional validators.
-            self_instance: An instance of a model to set attributes on from validation, this is used when running
-                validation from the `__init__` method of a model.
-        """
-        pass
-
-
-StringInput: TypeAlias = 'dict[str, StringInput]'
-
-
-class ValidateStringsHandlerProtocol(BaseValidateHandlerProtocol, Protocol):
-    """Event handler for `SchemaValidator.validate_strings`."""
-
-    def on_enter(
-        self, input: StringInput, *, strict: bool | None = None, context: dict[str, Any] | None = None
-    ) -> None:
-        """Callback to be notified of validation start, and create an instance of the event handler.
-
-        Args:
-            input: The string data to be validated.
-            strict: Whether to validate the object in strict mode.
-            context: The context to use for validation, this is passed to functional validators.
-        """
-        pass
diff --git a/lib/pydantic/plugin/_loader.py b/lib/pydantic/plugin/_loader.py
deleted file mode 100644
index 9e0e33ca..00000000
--- a/lib/pydantic/plugin/_loader.py
+++ /dev/null
@@ -1,50 +0,0 @@
-from __future__ import annotations
-
-import importlib.metadata as importlib_metadata
-import warnings
-from typing import TYPE_CHECKING, Final, Iterable
-
-if TYPE_CHECKING:
-    from . import PydanticPluginProtocol
-
-
-PYDANTIC_ENTRY_POINT_GROUP: Final[str] = 'pydantic'
-
-# cache of plugins
-_plugins: dict[str, PydanticPluginProtocol] | None = None
-# return no plugins while loading plugins to avoid recursion and errors while import plugins
-# this means that if plugins use pydantic
-_loading_plugins: bool = False
-
-
-def get_plugins() -> Iterable[PydanticPluginProtocol]:
-    """Load plugins for Pydantic.
-
-    Inspired by: https://github.com/pytest-dev/pluggy/blob/1.3.0/src/pluggy/_manager.py#L376-L402
-    """
-    global _plugins, _loading_plugins
-    if _loading_plugins:
-        # this happens when plugins themselves use pydantic, we return no plugins
-        return ()
-    elif _plugins is None:
-        _plugins = {}
-        # set _loading_plugins so any plugins that use pydantic don't themselves use plugins
-        _loading_plugins = True
-        try:
-            for dist in importlib_metadata.distributions():
-                for entry_point in dist.entry_points:
-                    if entry_point.group != PYDANTIC_ENTRY_POINT_GROUP:
-                        continue
-                    if entry_point.value in _plugins:
-                        continue
-                    try:
-                        _plugins[entry_point.value] = entry_point.load()
-                    except (ImportError, AttributeError) as e:
-                        warnings.warn(
-                            f'{e.__class__.__name__} while loading the `{entry_point.name}` Pydantic plugin, '
-                            f'this plugin will not be installed.\n\n{e!r}'
-                        )
-        finally:
-            _loading_plugins = False
-
-    return _plugins.values()
diff --git a/lib/pydantic/plugin/_schema_validator.py b/lib/pydantic/plugin/_schema_validator.py
deleted file mode 100644
index 7186ece6..00000000
--- a/lib/pydantic/plugin/_schema_validator.py
+++ /dev/null
@@ -1,138 +0,0 @@
-"""Pluggable schema validator for pydantic."""
-from __future__ import annotations
-
-import functools
-from typing import TYPE_CHECKING, Any, Callable, Iterable, TypeVar
-
-from pydantic_core import CoreConfig, CoreSchema, SchemaValidator, ValidationError
-from typing_extensions import Literal, ParamSpec
-
-if TYPE_CHECKING:
-    from . import BaseValidateHandlerProtocol, PydanticPluginProtocol, SchemaKind, SchemaTypePath
-
-
-P = ParamSpec('P')
-R = TypeVar('R')
-Event = Literal['on_validate_python', 'on_validate_json', 'on_validate_strings']
-events: list[Event] = list(Event.__args__)  # type: ignore
-
-
-def create_schema_validator(
-    schema: CoreSchema,
-    schema_type: Any,
-    schema_type_module: str,
-    schema_type_name: str,
-    schema_kind: SchemaKind,
-    config: CoreConfig | None = None,
-    plugin_settings: dict[str, Any] | None = None,
-) -> SchemaValidator:
-    """Create a `SchemaValidator` or `PluggableSchemaValidator` if plugins are installed.
-
-    Returns:
-        If plugins are installed then return `PluggableSchemaValidator`, otherwise return `SchemaValidator`.
-    """
-    from . import SchemaTypePath
-    from ._loader import get_plugins
-
-    plugins = get_plugins()
-    if plugins:
-        return PluggableSchemaValidator(
-            schema,
-            schema_type,
-            SchemaTypePath(schema_type_module, schema_type_name),
-            schema_kind,
-            config,
-            plugins,
-            plugin_settings or {},
-        )  # type: ignore
-    else:
-        return SchemaValidator(schema, config)
-
-
-class PluggableSchemaValidator:
-    """Pluggable schema validator."""
-
-    __slots__ = '_schema_validator', 'validate_json', 'validate_python', 'validate_strings'
-
-    def __init__(
-        self,
-        schema: CoreSchema,
-        schema_type: Any,
-        schema_type_path: SchemaTypePath,
-        schema_kind: SchemaKind,
-        config: CoreConfig | None,
-        plugins: Iterable[PydanticPluginProtocol],
-        plugin_settings: dict[str, Any],
-    ) -> None:
-        self._schema_validator = SchemaValidator(schema, config)
-
-        python_event_handlers: list[BaseValidateHandlerProtocol] = []
-        json_event_handlers: list[BaseValidateHandlerProtocol] = []
-        strings_event_handlers: list[BaseValidateHandlerProtocol] = []
-        for plugin in plugins:
-            try:
-                p, j, s = plugin.new_schema_validator(
-                    schema, schema_type, schema_type_path, schema_kind, config, plugin_settings
-                )
-            except TypeError as e:  # pragma: no cover
-                raise TypeError(f'Error using plugin `{plugin.__module__}:{plugin.__class__.__name__}`: {e}') from e
-            if p is not None:
-                python_event_handlers.append(p)
-            if j is not None:
-                json_event_handlers.append(j)
-            if s is not None:
-                strings_event_handlers.append(s)
-
-        self.validate_python = build_wrapper(self._schema_validator.validate_python, python_event_handlers)
-        self.validate_json = build_wrapper(self._schema_validator.validate_json, json_event_handlers)
-        self.validate_strings = build_wrapper(self._schema_validator.validate_strings, strings_event_handlers)
-
-    def __getattr__(self, name: str) -> Any:
-        return getattr(self._schema_validator, name)
-
-
-def build_wrapper(func: Callable[P, R], event_handlers: list[BaseValidateHandlerProtocol]) -> Callable[P, R]:
-    if not event_handlers:
-        return func
-    else:
-        on_enters = tuple(h.on_enter for h in event_handlers if filter_handlers(h, 'on_enter'))
-        on_successes = tuple(h.on_success for h in event_handlers if filter_handlers(h, 'on_success'))
-        on_errors = tuple(h.on_error for h in event_handlers if filter_handlers(h, 'on_error'))
-        on_exceptions = tuple(h.on_exception for h in event_handlers if filter_handlers(h, 'on_exception'))
-
-        @functools.wraps(func)
-        def wrapper(*args: P.args, **kwargs: P.kwargs) -> R:
-            for on_enter_handler in on_enters:
-                on_enter_handler(*args, **kwargs)
-
-            try:
-                result = func(*args, **kwargs)
-            except ValidationError as error:
-                for on_error_handler in on_errors:
-                    on_error_handler(error)
-                raise
-            except Exception as exception:
-                for on_exception_handler in on_exceptions:
-                    on_exception_handler(exception)
-                raise
-            else:
-                for on_success_handler in on_successes:
-                    on_success_handler(result)
-                return result
-
-        return wrapper
-
-
-def filter_handlers(handler_cls: BaseValidateHandlerProtocol, method_name: str) -> bool:
-    """Filter out handler methods which are not implemented by the plugin directly - e.g. are missing
-    or are inherited from the protocol.
-    """
-    handler = getattr(handler_cls, method_name, None)
-    if handler is None:
-        return False
-    elif handler.__module__ == 'pydantic.plugin':
-        # this is the original handler, from the protocol due to runtime inheritance
-        # we don't want to call it
-        return False
-    else:
-        return True
diff --git a/lib/pydantic/py.typed b/lib/pydantic/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/pydantic/root_model.py b/lib/pydantic/root_model.py
deleted file mode 100644
index 42186b9d..00000000
--- a/lib/pydantic/root_model.py
+++ /dev/null
@@ -1,149 +0,0 @@
-"""RootModel class and type definitions."""
-
-from __future__ import annotations as _annotations
-
-import typing
-from copy import copy, deepcopy
-
-from pydantic_core import PydanticUndefined
-
-from . import PydanticUserError
-from ._internal import _model_construction, _repr
-from .main import BaseModel, _object_setattr
-
-if typing.TYPE_CHECKING:
-    from typing import Any
-
-    from typing_extensions import Literal, dataclass_transform
-
-    from .fields import Field as PydanticModelField
-
-    # dataclass_transform could be applied to RootModel directly, but `ModelMetaclass`'s dataclass_transform
-    # takes priority (at least with pyright). We trick type checkers into thinking we apply dataclass_transform
-    # on a new metaclass.
-    @dataclass_transform(kw_only_default=False, field_specifiers=(PydanticModelField,))
-    class _RootModelMetaclass(_model_construction.ModelMetaclass):
-        ...
-
-    Model = typing.TypeVar('Model', bound='BaseModel')
-else:
-    _RootModelMetaclass = _model_construction.ModelMetaclass
-
-__all__ = ('RootModel',)
-
-
-RootModelRootType = typing.TypeVar('RootModelRootType')
-
-
-class RootModel(BaseModel, typing.Generic[RootModelRootType], metaclass=_RootModelMetaclass):
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/models/#rootmodel-and-custom-root-types
-
-    A Pydantic `BaseModel` for the root object of the model.
-
-    Attributes:
-        root: The root object of the model.
-        __pydantic_root_model__: Whether the model is a RootModel.
-        __pydantic_private__: Private fields in the model.
-        __pydantic_extra__: Extra fields in the model.
-
-    """
-
-    __pydantic_root_model__ = True
-    __pydantic_private__ = None
-    __pydantic_extra__ = None
-
-    root: RootModelRootType
-
-    def __init_subclass__(cls, **kwargs):
-        extra = cls.model_config.get('extra')
-        if extra is not None:
-            raise PydanticUserError(
-                "`RootModel` does not support setting `model_config['extra']`", code='root-model-extra'
-            )
-        super().__init_subclass__(**kwargs)
-
-    def __init__(self, /, root: RootModelRootType = PydanticUndefined, **data) -> None:  # type: ignore
-        __tracebackhide__ = True
-        if data:
-            if root is not PydanticUndefined:
-                raise ValueError(
-                    '"RootModel.__init__" accepts either a single positional argument or arbitrary keyword arguments'
-                )
-            root = data  # type: ignore
-        self.__pydantic_validator__.validate_python(root, self_instance=self)
-
-    __init__.__pydantic_base_init__ = True  # pyright: ignore[reportFunctionMemberAccess]
-
-    @classmethod
-    def model_construct(cls: type[Model], root: RootModelRootType, _fields_set: set[str] | None = None) -> Model:  # type: ignore
-        """Create a new model using the provided root object and update fields set.
-
-        Args:
-            root: The root object of the model.
-            _fields_set: The set of fields to be updated.
-
-        Returns:
-            The new model.
-
-        Raises:
-            NotImplemented: If the model is not a subclass of `RootModel`.
-        """
-        return super().model_construct(root=root, _fields_set=_fields_set)
-
-    def __getstate__(self) -> dict[Any, Any]:
-        return {
-            '__dict__': self.__dict__,
-            '__pydantic_fields_set__': self.__pydantic_fields_set__,
-        }
-
-    def __setstate__(self, state: dict[Any, Any]) -> None:
-        _object_setattr(self, '__pydantic_fields_set__', state['__pydantic_fields_set__'])
-        _object_setattr(self, '__dict__', state['__dict__'])
-
-    def __copy__(self: Model) -> Model:
-        """Returns a shallow copy of the model."""
-        cls = type(self)
-        m = cls.__new__(cls)
-        _object_setattr(m, '__dict__', copy(self.__dict__))
-        _object_setattr(m, '__pydantic_fields_set__', copy(self.__pydantic_fields_set__))
-        return m
-
-    def __deepcopy__(self: Model, memo: dict[int, Any] | None = None) -> Model:
-        """Returns a deep copy of the model."""
-        cls = type(self)
-        m = cls.__new__(cls)
-        _object_setattr(m, '__dict__', deepcopy(self.__dict__, memo=memo))
-        # This next line doesn't need a deepcopy because __pydantic_fields_set__ is a set[str],
-        # and attempting a deepcopy would be marginally slower.
-        _object_setattr(m, '__pydantic_fields_set__', copy(self.__pydantic_fields_set__))
-        return m
-
-    if typing.TYPE_CHECKING:
-
-        def model_dump(  # type: ignore
-            self,
-            *,
-            mode: Literal['json', 'python'] | str = 'python',
-            include: Any = None,
-            exclude: Any = None,
-            by_alias: bool = False,
-            exclude_unset: bool = False,
-            exclude_defaults: bool = False,
-            exclude_none: bool = False,
-            round_trip: bool = False,
-            warnings: bool = True,
-        ) -> RootModelRootType:
-            """This method is included just to get a more accurate return type for type checkers.
-            It is included in this `if TYPE_CHECKING:` block since no override is actually necessary.
-
-            See the documentation of `BaseModel.model_dump` for more details about the arguments.
-            """
-            ...
-
-    def __eq__(self, other: Any) -> bool:
-        if not isinstance(other, RootModel):
-            return NotImplemented
-        return self.model_fields['root'].annotation == other.model_fields['root'].annotation and super().__eq__(other)
-
-    def __repr_args__(self) -> _repr.ReprArgs:
-        yield 'root', self.root
diff --git a/lib/pydantic/schema.py b/lib/pydantic/schema.py
deleted file mode 100644
index e290aed9..00000000
--- a/lib/pydantic/schema.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""The `schema` module is a backport module from V1."""
-from ._migration import getattr_migration
-
-__getattr__ = getattr_migration(__name__)
diff --git a/lib/pydantic/tools.py b/lib/pydantic/tools.py
deleted file mode 100644
index 8e317c92..00000000
--- a/lib/pydantic/tools.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""The `tools` module is a backport module from V1."""
-from ._migration import getattr_migration
-
-__getattr__ = getattr_migration(__name__)
diff --git a/lib/pydantic/type_adapter.py b/lib/pydantic/type_adapter.py
deleted file mode 100644
index 366262fe..00000000
--- a/lib/pydantic/type_adapter.py
+++ /dev/null
@@ -1,460 +0,0 @@
-"""Type adapter specification."""
-from __future__ import annotations as _annotations
-
-import sys
-from dataclasses import is_dataclass
-from typing import TYPE_CHECKING, Any, Dict, Generic, Iterable, Set, TypeVar, Union, cast, final, overload
-
-from pydantic_core import CoreSchema, SchemaSerializer, SchemaValidator, Some
-from typing_extensions import Literal, get_args, is_typeddict
-
-from pydantic.errors import PydanticUserError
-from pydantic.main import BaseModel
-
-from ._internal import _config, _generate_schema, _typing_extra
-from .config import ConfigDict
-from .json_schema import (
-    DEFAULT_REF_TEMPLATE,
-    GenerateJsonSchema,
-    JsonSchemaKeyT,
-    JsonSchemaMode,
-    JsonSchemaValue,
-)
-from .plugin._schema_validator import create_schema_validator
-
-T = TypeVar('T')
-
-
-if TYPE_CHECKING:
-    # should be `set[int] | set[str] | dict[int, IncEx] | dict[str, IncEx] | None`, but mypy can't cope
-    IncEx = Union[Set[int], Set[str], Dict[int, Any], Dict[str, Any]]
-
-
-def _get_schema(type_: Any, config_wrapper: _config.ConfigWrapper, parent_depth: int) -> CoreSchema:
-    """`BaseModel` uses its own `__module__` to find out where it was defined
-    and then looks for symbols to resolve forward references in those globals.
-    On the other hand this function can be called with arbitrary objects,
-    including type aliases, where `__module__` (always `typing.py`) is not useful.
-    So instead we look at the globals in our parent stack frame.
-
-    This works for the case where this function is called in a module that
-    has the target of forward references in its scope, but
-    does not always work for more complex cases.
-
-    For example, take the following:
-
-    a.py
-    ```python
-    from typing import Dict, List
-
-    IntList = List[int]
-    OuterDict = Dict[str, 'IntList']
-    ```
-
-    b.py
-    ```python test="skip"
-    from a import OuterDict
-
-    from pydantic import TypeAdapter
-
-    IntList = int  # replaces the symbol the forward reference is looking for
-    v = TypeAdapter(OuterDict)
-    v({'x': 1})  # should fail but doesn't
-    ```
-
-    If `OuterDict` were a `BaseModel`, this would work because it would resolve
-    the forward reference within the `a.py` namespace.
-    But `TypeAdapter(OuterDict)` can't determine what module `OuterDict` came from.
-
-    In other words, the assumption that _all_ forward references exist in the
-    module we are being called from is not technically always true.
-    Although most of the time it is and it works fine for recursive models and such,
-    `BaseModel`'s behavior isn't perfect either and _can_ break in similar ways,
-    so there is no right or wrong between the two.
-
-    But at the very least this behavior is _subtly_ different from `BaseModel`'s.
-    """
-    local_ns = _typing_extra.parent_frame_namespace(parent_depth=parent_depth)
-    global_ns = sys._getframe(max(parent_depth - 1, 1)).f_globals.copy()
-    global_ns.update(local_ns or {})
-    gen = _generate_schema.GenerateSchema(config_wrapper, types_namespace=global_ns, typevars_map={})
-    schema = gen.generate_schema(type_)
-    schema = gen.clean_schema(schema)
-    return schema
-
-
-def _getattr_no_parents(obj: Any, attribute: str) -> Any:
-    """Returns the attribute value without attempting to look up attributes from parent types."""
-    if hasattr(obj, '__dict__'):
-        try:
-            return obj.__dict__[attribute]
-        except KeyError:
-            pass
-
-    slots = getattr(obj, '__slots__', None)
-    if slots is not None and attribute in slots:
-        return getattr(obj, attribute)
-    else:
-        raise AttributeError(attribute)
-
-
-def _type_has_config(type_: Any) -> bool:
-    """Returns whether the type has config."""
-    try:
-        return issubclass(type_, BaseModel) or is_dataclass(type_) or is_typeddict(type_)
-    except TypeError:
-        # type is not a class
-        return False
-
-
-@final
-class TypeAdapter(Generic[T]):
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/type_adapter/
-
-    Type adapters provide a flexible way to perform validation and serialization based on a Python type.
-
-    A `TypeAdapter` instance exposes some of the functionality from `BaseModel` instance methods
-    for types that do not have such methods (such as dataclasses, primitive types, and more).
-
-    **Note:** `TypeAdapter` instances are not types, and cannot be used as type annotations for fields.
-
-    Attributes:
-        core_schema: The core schema for the type.
-        validator (SchemaValidator): The schema validator for the type.
-        serializer: The schema serializer for the type.
-    """
-
-    @overload
-    def __init__(
-        self,
-        type: type[T],
-        *,
-        config: ConfigDict | None = ...,
-        _parent_depth: int = ...,
-        module: str | None = ...,
-    ) -> None:
-        ...
-
-    # This second overload is for unsupported special forms (such as Union). `pyright` handles them fine, but `mypy` does not match
-    # them against `type: type[T]`, so an explicit overload with `type: T` is needed.
-    @overload
-    def __init__(  # pyright: ignore[reportOverlappingOverload]
-        self,
-        type: T,
-        *,
-        config: ConfigDict | None = ...,
-        _parent_depth: int = ...,
-        module: str | None = ...,
-    ) -> None:
-        ...
-
-    def __init__(
-        self,
-        type: type[T] | T,
-        *,
-        config: ConfigDict | None = None,
-        _parent_depth: int = 2,
-        module: str | None = None,
-    ) -> None:
-        """Initializes the TypeAdapter object.
-
-        Args:
-            type: The type associated with the `TypeAdapter`.
-            config: Configuration for the `TypeAdapter`, should be a dictionary conforming to [`ConfigDict`][pydantic.config.ConfigDict].
-            _parent_depth: depth at which to search the parent namespace to construct the local namespace.
-            module: The module that passes to plugin if provided.
-
-        !!! note
-            You cannot use the `config` argument when instantiating a `TypeAdapter` if the type you're using has its own
-            config that cannot be overridden (ex: `BaseModel`, `TypedDict`, and `dataclass`). A
-            [`type-adapter-config-unused`](../errors/usage_errors.md#type-adapter-config-unused) error will be raised in this case.
-
-        !!! note
-            The `_parent_depth` argument is named with an underscore to suggest its private nature and discourage use.
-            It may be deprecated in a minor version, so we only recommend using it if you're
-            comfortable with potential change in behavior / support.
-
-        ??? tip "Compatibility with `mypy`"
-            Depending on the type used, `mypy` might raise an error when instantiating a `TypeAdapter`. As a workaround, you can explicitly
-            annotate your variable:
-
-            ```py
-            from typing import Union
-
-            from pydantic import TypeAdapter
-
-            ta: TypeAdapter[Union[str, int]] = TypeAdapter(Union[str, int])  # type: ignore[arg-type]
-            ```
-
-        Returns:
-            A type adapter configured for the specified `type`.
-        """
-        type_is_annotated: bool = _typing_extra.is_annotated(type)
-        annotated_type: Any = get_args(type)[0] if type_is_annotated else None
-        type_has_config: bool = _type_has_config(annotated_type if type_is_annotated else type)
-
-        if type_has_config and config is not None:
-            raise PydanticUserError(
-                'Cannot use `config` when the type is a BaseModel, dataclass or TypedDict.'
-                ' These types can have their own config and setting the config via the `config`'
-                ' parameter to TypeAdapter will not override it, thus the `config` you passed to'
-                ' TypeAdapter becomes meaningless, which is probably not what you want.',
-                code='type-adapter-config-unused',
-            )
-
-        config_wrapper = _config.ConfigWrapper(config)
-
-        core_schema: CoreSchema
-        try:
-            core_schema = _getattr_no_parents(type, '__pydantic_core_schema__')
-        except AttributeError:
-            core_schema = _get_schema(type, config_wrapper, parent_depth=_parent_depth + 1)
-
-        core_config = config_wrapper.core_config(None)
-        validator: SchemaValidator
-        try:
-            validator = _getattr_no_parents(type, '__pydantic_validator__')
-        except AttributeError:
-            if module is None:
-                f = sys._getframe(1)
-                module = cast(str, f.f_globals.get('__name__', ''))
-            validator = create_schema_validator(
-                core_schema, type, module, str(type), 'TypeAdapter', core_config, config_wrapper.plugin_settings
-            )  # type: ignore
-
-        serializer: SchemaSerializer
-        try:
-            serializer = _getattr_no_parents(type, '__pydantic_serializer__')
-        except AttributeError:
-            serializer = SchemaSerializer(core_schema, core_config)
-
-        self.core_schema = core_schema
-        self.validator = validator
-        self.serializer = serializer
-
-    def validate_python(
-        self,
-        __object: Any,
-        *,
-        strict: bool | None = None,
-        from_attributes: bool | None = None,
-        context: dict[str, Any] | None = None,
-    ) -> T:
-        """Validate a Python object against the model.
-
-        Args:
-            __object: The Python object to validate against the model.
-            strict: Whether to strictly check types.
-            from_attributes: Whether to extract data from object attributes.
-            context: Additional context to pass to the validator.
-
-        !!! note
-            When using `TypeAdapter` with a Pydantic `dataclass`, the use of the `from_attributes`
-            argument is not supported.
-
-        Returns:
-            The validated object.
-        """
-        return self.validator.validate_python(__object, strict=strict, from_attributes=from_attributes, context=context)
-
-    def validate_json(
-        self, __data: str | bytes, *, strict: bool | None = None, context: dict[str, Any] | None = None
-    ) -> T:
-        """Usage docs: https://docs.pydantic.dev/2.6/concepts/json/#json-parsing
-
-        Validate a JSON string or bytes against the model.
-
-        Args:
-            __data: The JSON data to validate against the model.
-            strict: Whether to strictly check types.
-            context: Additional context to use during validation.
-
-        Returns:
-            The validated object.
-        """
-        return self.validator.validate_json(__data, strict=strict, context=context)
-
-    def validate_strings(self, __obj: Any, *, strict: bool | None = None, context: dict[str, Any] | None = None) -> T:
-        """Validate object contains string data against the model.
-
-        Args:
-            __obj: The object contains string data to validate.
-            strict: Whether to strictly check types.
-            context: Additional context to use during validation.
-
-        Returns:
-            The validated object.
-        """
-        return self.validator.validate_strings(__obj, strict=strict, context=context)
-
-    def get_default_value(self, *, strict: bool | None = None, context: dict[str, Any] | None = None) -> Some[T] | None:
-        """Get the default value for the wrapped type.
-
-        Args:
-            strict: Whether to strictly check types.
-            context: Additional context to pass to the validator.
-
-        Returns:
-            The default value wrapped in a `Some` if there is one or None if not.
-        """
-        return self.validator.get_default_value(strict=strict, context=context)
-
-    def dump_python(
-        self,
-        __instance: T,
-        *,
-        mode: Literal['json', 'python'] = 'python',
-        include: IncEx | None = None,
-        exclude: IncEx | None = None,
-        by_alias: bool = False,
-        exclude_unset: bool = False,
-        exclude_defaults: bool = False,
-        exclude_none: bool = False,
-        round_trip: bool = False,
-        warnings: bool = True,
-    ) -> Any:
-        """Dump an instance of the adapted type to a Python object.
-
-        Args:
-            __instance: The Python object to serialize.
-            mode: The output format.
-            include: Fields to include in the output.
-            exclude: Fields to exclude from the output.
-            by_alias: Whether to use alias names for field names.
-            exclude_unset: Whether to exclude unset fields.
-            exclude_defaults: Whether to exclude fields with default values.
-            exclude_none: Whether to exclude fields with None values.
-            round_trip: Whether to output the serialized data in a way that is compatible with deserialization.
-            warnings: Whether to display serialization warnings.
-
-        Returns:
-            The serialized object.
-        """
-        return self.serializer.to_python(
-            __instance,
-            mode=mode,
-            by_alias=by_alias,
-            include=include,
-            exclude=exclude,
-            exclude_unset=exclude_unset,
-            exclude_defaults=exclude_defaults,
-            exclude_none=exclude_none,
-            round_trip=round_trip,
-            warnings=warnings,
-        )
-
-    def dump_json(
-        self,
-        __instance: T,
-        *,
-        indent: int | None = None,
-        include: IncEx | None = None,
-        exclude: IncEx | None = None,
-        by_alias: bool = False,
-        exclude_unset: bool = False,
-        exclude_defaults: bool = False,
-        exclude_none: bool = False,
-        round_trip: bool = False,
-        warnings: bool = True,
-    ) -> bytes:
-        """Usage docs: https://docs.pydantic.dev/2.6/concepts/json/#json-serialization
-
-        Serialize an instance of the adapted type to JSON.
-
-        Args:
-            __instance: The instance to be serialized.
-            indent: Number of spaces for JSON indentation.
-            include: Fields to include.
-            exclude: Fields to exclude.
-            by_alias: Whether to use alias names for field names.
-            exclude_unset: Whether to exclude unset fields.
-            exclude_defaults: Whether to exclude fields with default values.
-            exclude_none: Whether to exclude fields with a value of `None`.
-            round_trip: Whether to serialize and deserialize the instance to ensure round-tripping.
-            warnings: Whether to emit serialization warnings.
-
-        Returns:
-            The JSON representation of the given instance as bytes.
-        """
-        return self.serializer.to_json(
-            __instance,
-            indent=indent,
-            include=include,
-            exclude=exclude,
-            by_alias=by_alias,
-            exclude_unset=exclude_unset,
-            exclude_defaults=exclude_defaults,
-            exclude_none=exclude_none,
-            round_trip=round_trip,
-            warnings=warnings,
-        )
-
-    def json_schema(
-        self,
-        *,
-        by_alias: bool = True,
-        ref_template: str = DEFAULT_REF_TEMPLATE,
-        schema_generator: type[GenerateJsonSchema] = GenerateJsonSchema,
-        mode: JsonSchemaMode = 'validation',
-    ) -> dict[str, Any]:
-        """Generate a JSON schema for the adapted type.
-
-        Args:
-            by_alias: Whether to use alias names for field names.
-            ref_template: The format string used for generating $ref strings.
-            schema_generator: The generator class used for creating the schema.
-            mode: The mode to use for schema generation.
-
-        Returns:
-            The JSON schema for the model as a dictionary.
-        """
-        schema_generator_instance = schema_generator(by_alias=by_alias, ref_template=ref_template)
-        return schema_generator_instance.generate(self.core_schema, mode=mode)
-
-    @staticmethod
-    def json_schemas(
-        __inputs: Iterable[tuple[JsonSchemaKeyT, JsonSchemaMode, TypeAdapter[Any]]],
-        *,
-        by_alias: bool = True,
-        title: str | None = None,
-        description: str | None = None,
-        ref_template: str = DEFAULT_REF_TEMPLATE,
-        schema_generator: type[GenerateJsonSchema] = GenerateJsonSchema,
-    ) -> tuple[dict[tuple[JsonSchemaKeyT, JsonSchemaMode], JsonSchemaValue], JsonSchemaValue]:
-        """Generate a JSON schema including definitions from multiple type adapters.
-
-        Args:
-            __inputs: Inputs to schema generation. The first two items will form the keys of the (first)
-                output mapping; the type adapters will provide the core schemas that get converted into
-                definitions in the output JSON schema.
-            by_alias: Whether to use alias names.
-            title: The title for the schema.
-            description: The description for the schema.
-            ref_template: The format string used for generating $ref strings.
-            schema_generator: The generator class used for creating the schema.
-
-        Returns:
-            A tuple where:
-
-                - The first element is a dictionary whose keys are tuples of JSON schema key type and JSON mode, and
-                    whose values are the JSON schema corresponding to that pair of inputs. (These schemas may have
-                    JsonRef references to definitions that are defined in the second returned element.)
-                - The second element is a JSON schema containing all definitions referenced in the first returned
-                    element, along with the optional title and description keys.
-
-        """
-        schema_generator_instance = schema_generator(by_alias=by_alias, ref_template=ref_template)
-
-        inputs = [(key, mode, adapter.core_schema) for key, mode, adapter in __inputs]
-
-        json_schemas_map, definitions = schema_generator_instance.generate_definitions(inputs)
-
-        json_schema: dict[str, Any] = {}
-        if definitions:
-            json_schema['$defs'] = definitions
-        if title:
-            json_schema['title'] = title
-        if description:
-            json_schema['description'] = description
-
-        return json_schemas_map, json_schema
diff --git a/lib/pydantic/types.py b/lib/pydantic/types.py
deleted file mode 100644
index c2534c88..00000000
--- a/lib/pydantic/types.py
+++ /dev/null
@@ -1,2879 +0,0 @@
-"""The types module contains custom types used by pydantic."""
-from __future__ import annotations as _annotations
-
-import base64
-import dataclasses as _dataclasses
-import re
-from datetime import date, datetime
-from decimal import Decimal
-from enum import Enum
-from pathlib import Path
-from types import ModuleType
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Callable,
-    ClassVar,
-    Dict,
-    FrozenSet,
-    Generic,
-    Hashable,
-    Iterator,
-    List,
-    Set,
-    TypeVar,
-    Union,
-    cast,
-)
-from uuid import UUID
-
-import annotated_types
-from annotated_types import BaseMetadata, MaxLen, MinLen
-from pydantic_core import CoreSchema, PydanticCustomError, core_schema
-from typing_extensions import Annotated, Literal, Protocol, TypeAlias, TypeAliasType, deprecated
-
-from ._internal import (
-    _core_utils,
-    _fields,
-    _internal_dataclass,
-    _typing_extra,
-    _utils,
-    _validators,
-)
-from ._migration import getattr_migration
-from .annotated_handlers import GetCoreSchemaHandler, GetJsonSchemaHandler
-from .errors import PydanticUserError
-from .json_schema import JsonSchemaValue
-from .warnings import PydanticDeprecatedSince20
-
-__all__ = (
-    'Strict',
-    'StrictStr',
-    'conbytes',
-    'conlist',
-    'conset',
-    'confrozenset',
-    'constr',
-    'ImportString',
-    'conint',
-    'PositiveInt',
-    'NegativeInt',
-    'NonNegativeInt',
-    'NonPositiveInt',
-    'confloat',
-    'PositiveFloat',
-    'NegativeFloat',
-    'NonNegativeFloat',
-    'NonPositiveFloat',
-    'FiniteFloat',
-    'condecimal',
-    'UUID1',
-    'UUID3',
-    'UUID4',
-    'UUID5',
-    'FilePath',
-    'DirectoryPath',
-    'NewPath',
-    'Json',
-    'SecretStr',
-    'SecretBytes',
-    'StrictBool',
-    'StrictBytes',
-    'StrictInt',
-    'StrictFloat',
-    'PaymentCardNumber',
-    'ByteSize',
-    'PastDate',
-    'FutureDate',
-    'PastDatetime',
-    'FutureDatetime',
-    'condate',
-    'AwareDatetime',
-    'NaiveDatetime',
-    'AllowInfNan',
-    'EncoderProtocol',
-    'EncodedBytes',
-    'EncodedStr',
-    'Base64Encoder',
-    'Base64Bytes',
-    'Base64Str',
-    'Base64UrlBytes',
-    'Base64UrlStr',
-    'GetPydanticSchema',
-    'StringConstraints',
-    'Tag',
-    'Discriminator',
-    'JsonValue',
-    'OnErrorOmit',
-)
-
-
-T = TypeVar('T')
-
-
-@_dataclasses.dataclass
-class Strict(_fields.PydanticMetadata, BaseMetadata):
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/strict_mode/#strict-mode-with-annotated-strict
-
-    A field metadata class to indicate that a field should be validated in strict mode.
-
-    Attributes:
-        strict: Whether to validate the field in strict mode.
-
-    Example:
-        ```python
-        from typing_extensions import Annotated
-
-        from pydantic.types import Strict
-
-        StrictBool = Annotated[bool, Strict()]
-        ```
-    """
-
-    strict: bool = True
-
-    def __hash__(self) -> int:
-        return hash(self.strict)
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ BOOLEAN TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-StrictBool = Annotated[bool, Strict()]
-"""A boolean that must be either ``True`` or ``False``."""
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ INTEGER TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-def conint(
-    *,
-    strict: bool | None = None,
-    gt: int | None = None,
-    ge: int | None = None,
-    lt: int | None = None,
-    le: int | None = None,
-    multiple_of: int | None = None,
-) -> type[int]:
-    """
-    !!! warning "Discouraged"
-        This function is **discouraged** in favor of using
-        [`Annotated`](https://docs.python.org/3/library/typing.html#typing.Annotated) with
-        [`Field`][pydantic.fields.Field] instead.
-
-        This function will be **deprecated** in Pydantic 3.0.
-
-        The reason is that `conint` returns a type, which doesn't play well with static analysis tools.
-
-        === ":x: Don't do this"
-            ```py
-            from pydantic import BaseModel, conint
-
-            class Foo(BaseModel):
-                bar: conint(strict=True, gt=0)
-            ```
-
-        === ":white_check_mark: Do this"
-            ```py
-            from typing_extensions import Annotated
-
-            from pydantic import BaseModel, Field
-
-            class Foo(BaseModel):
-                bar: Annotated[int, Field(strict=True, gt=0)]
-            ```
-
-    A wrapper around `int` that allows for additional constraints.
-
-    Args:
-        strict: Whether to validate the integer in strict mode. Defaults to `None`.
-        gt: The value must be greater than this.
-        ge: The value must be greater than or equal to this.
-        lt: The value must be less than this.
-        le: The value must be less than or equal to this.
-        multiple_of: The value must be a multiple of this.
-
-    Returns:
-        The wrapped integer type.
-
-    ```py
-    from pydantic import BaseModel, ValidationError, conint
-
-    class ConstrainedExample(BaseModel):
-        constrained_int: conint(gt=1)
-
-    m = ConstrainedExample(constrained_int=2)
-    print(repr(m))
-    #> ConstrainedExample(constrained_int=2)
-
-    try:
-        ConstrainedExample(constrained_int=0)
-    except ValidationError as e:
-        print(e.errors())
-        '''
-        [
-            {
-                'type': 'greater_than',
-                'loc': ('constrained_int',),
-                'msg': 'Input should be greater than 1',
-                'input': 0,
-                'ctx': {'gt': 1},
-                'url': 'https://errors.pydantic.dev/2/v/greater_than',
-            }
-        ]
-        '''
-    ```
-
-    """  # noqa: D212
-    return Annotated[
-        int,
-        Strict(strict) if strict is not None else None,
-        annotated_types.Interval(gt=gt, ge=ge, lt=lt, le=le),
-        annotated_types.MultipleOf(multiple_of) if multiple_of is not None else None,
-    ]
-
-
-PositiveInt = Annotated[int, annotated_types.Gt(0)]
-"""An integer that must be greater than zero.
-
-```py
-from pydantic import BaseModel, PositiveInt, ValidationError
-
-class Model(BaseModel):
-    positive_int: PositiveInt
-
-m = Model(positive_int=1)
-print(repr(m))
-#> Model(positive_int=1)
-
-try:
-    Model(positive_int=-1)
-except ValidationError as e:
-    print(e.errors())
-    '''
-    [
-        {
-            'type': 'greater_than',
-            'loc': ('positive_int',),
-            'msg': 'Input should be greater than 0',
-            'input': -1,
-            'ctx': {'gt': 0},
-            'url': 'https://errors.pydantic.dev/2/v/greater_than',
-        }
-    ]
-    '''
-```
-"""
-NegativeInt = Annotated[int, annotated_types.Lt(0)]
-"""An integer that must be less than zero.
-
-```py
-from pydantic import BaseModel, NegativeInt, ValidationError
-
-class Model(BaseModel):
-    negative_int: NegativeInt
-
-m = Model(negative_int=-1)
-print(repr(m))
-#> Model(negative_int=-1)
-
-try:
-    Model(negative_int=1)
-except ValidationError as e:
-    print(e.errors())
-    '''
-    [
-        {
-            'type': 'less_than',
-            'loc': ('negative_int',),
-            'msg': 'Input should be less than 0',
-            'input': 1,
-            'ctx': {'lt': 0},
-            'url': 'https://errors.pydantic.dev/2/v/less_than',
-        }
-    ]
-    '''
-```
-"""
-NonPositiveInt = Annotated[int, annotated_types.Le(0)]
-"""An integer that must be less than or equal to zero.
-
-```py
-from pydantic import BaseModel, NonPositiveInt, ValidationError
-
-class Model(BaseModel):
-    non_positive_int: NonPositiveInt
-
-m = Model(non_positive_int=0)
-print(repr(m))
-#> Model(non_positive_int=0)
-
-try:
-    Model(non_positive_int=1)
-except ValidationError as e:
-    print(e.errors())
-    '''
-    [
-        {
-            'type': 'less_than_equal',
-            'loc': ('non_positive_int',),
-            'msg': 'Input should be less than or equal to 0',
-            'input': 1,
-            'ctx': {'le': 0},
-            'url': 'https://errors.pydantic.dev/2/v/less_than_equal',
-        }
-    ]
-    '''
-```
-"""
-NonNegativeInt = Annotated[int, annotated_types.Ge(0)]
-"""An integer that must be greater than or equal to zero.
-
-```py
-from pydantic import BaseModel, NonNegativeInt, ValidationError
-
-class Model(BaseModel):
-    non_negative_int: NonNegativeInt
-
-m = Model(non_negative_int=0)
-print(repr(m))
-#> Model(non_negative_int=0)
-
-try:
-    Model(non_negative_int=-1)
-except ValidationError as e:
-    print(e.errors())
-    '''
-    [
-        {
-            'type': 'greater_than_equal',
-            'loc': ('non_negative_int',),
-            'msg': 'Input should be greater than or equal to 0',
-            'input': -1,
-            'ctx': {'ge': 0},
-            'url': 'https://errors.pydantic.dev/2/v/greater_than_equal',
-        }
-    ]
-    '''
-```
-"""
-StrictInt = Annotated[int, Strict()]
-"""An integer that must be validated in strict mode.
-
-```py
-from pydantic import BaseModel, StrictInt, ValidationError
-
-class StrictIntModel(BaseModel):
-    strict_int: StrictInt
-
-try:
-    StrictIntModel(strict_int=3.14159)
-except ValidationError as e:
-    print(e)
-    '''
-    1 validation error for StrictIntModel
-    strict_int
-      Input should be a valid integer [type=int_type, input_value=3.14159, input_type=float]
-    '''
-```
-"""
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ FLOAT TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-@_dataclasses.dataclass
-class AllowInfNan(_fields.PydanticMetadata):
-    """A field metadata class to indicate that a field should allow ``-inf``, ``inf``, and ``nan``."""
-
-    allow_inf_nan: bool = True
-
-    def __hash__(self) -> int:
-        return hash(self.allow_inf_nan)
-
-
-def confloat(
-    *,
-    strict: bool | None = None,
-    gt: float | None = None,
-    ge: float | None = None,
-    lt: float | None = None,
-    le: float | None = None,
-    multiple_of: float | None = None,
-    allow_inf_nan: bool | None = None,
-) -> type[float]:
-    """
-    !!! warning "Discouraged"
-        This function is **discouraged** in favor of using
-        [`Annotated`](https://docs.python.org/3/library/typing.html#typing.Annotated) with
-        [`Field`][pydantic.fields.Field] instead.
-
-        This function will be **deprecated** in Pydantic 3.0.
-
-        The reason is that `confloat` returns a type, which doesn't play well with static analysis tools.
-
-        === ":x: Don't do this"
-            ```py
-            from pydantic import BaseModel, confloat
-
-            class Foo(BaseModel):
-                bar: confloat(strict=True, gt=0)
-            ```
-
-        === ":white_check_mark: Do this"
-            ```py
-            from typing_extensions import Annotated
-
-            from pydantic import BaseModel, Field
-
-            class Foo(BaseModel):
-                bar: Annotated[float, Field(strict=True, gt=0)]
-            ```
-
-    A wrapper around `float` that allows for additional constraints.
-
-    Args:
-        strict: Whether to validate the float in strict mode.
-        gt: The value must be greater than this.
-        ge: The value must be greater than or equal to this.
-        lt: The value must be less than this.
-        le: The value must be less than or equal to this.
-        multiple_of: The value must be a multiple of this.
-        allow_inf_nan: Whether to allow `-inf`, `inf`, and `nan`.
-
-    Returns:
-        The wrapped float type.
-
-    ```py
-    from pydantic import BaseModel, ValidationError, confloat
-
-    class ConstrainedExample(BaseModel):
-        constrained_float: confloat(gt=1.0)
-
-    m = ConstrainedExample(constrained_float=1.1)
-    print(repr(m))
-    #> ConstrainedExample(constrained_float=1.1)
-
-    try:
-        ConstrainedExample(constrained_float=0.9)
-    except ValidationError as e:
-        print(e.errors())
-        '''
-        [
-            {
-                'type': 'greater_than',
-                'loc': ('constrained_float',),
-                'msg': 'Input should be greater than 1',
-                'input': 0.9,
-                'ctx': {'gt': 1.0},
-                'url': 'https://errors.pydantic.dev/2/v/greater_than',
-            }
-        ]
-        '''
-    ```
-    """  # noqa: D212
-    return Annotated[
-        float,
-        Strict(strict) if strict is not None else None,
-        annotated_types.Interval(gt=gt, ge=ge, lt=lt, le=le),
-        annotated_types.MultipleOf(multiple_of) if multiple_of is not None else None,
-        AllowInfNan(allow_inf_nan) if allow_inf_nan is not None else None,
-    ]
-
-
-PositiveFloat = Annotated[float, annotated_types.Gt(0)]
-"""A float that must be greater than zero.
-
-```py
-from pydantic import BaseModel, PositiveFloat, ValidationError
-
-class Model(BaseModel):
-    positive_float: PositiveFloat
-
-m = Model(positive_float=1.0)
-print(repr(m))
-#> Model(positive_float=1.0)
-
-try:
-    Model(positive_float=-1.0)
-except ValidationError as e:
-    print(e.errors())
-    '''
-    [
-        {
-            'type': 'greater_than',
-            'loc': ('positive_float',),
-            'msg': 'Input should be greater than 0',
-            'input': -1.0,
-            'ctx': {'gt': 0.0},
-            'url': 'https://errors.pydantic.dev/2/v/greater_than',
-        }
-    ]
-    '''
-```
-"""
-NegativeFloat = Annotated[float, annotated_types.Lt(0)]
-"""A float that must be less than zero.
-
-```py
-from pydantic import BaseModel, NegativeFloat, ValidationError
-
-class Model(BaseModel):
-    negative_float: NegativeFloat
-
-m = Model(negative_float=-1.0)
-print(repr(m))
-#> Model(negative_float=-1.0)
-
-try:
-    Model(negative_float=1.0)
-except ValidationError as e:
-    print(e.errors())
-    '''
-    [
-        {
-            'type': 'less_than',
-            'loc': ('negative_float',),
-            'msg': 'Input should be less than 0',
-            'input': 1.0,
-            'ctx': {'lt': 0.0},
-            'url': 'https://errors.pydantic.dev/2/v/less_than',
-        }
-    ]
-    '''
-```
-"""
-NonPositiveFloat = Annotated[float, annotated_types.Le(0)]
-"""A float that must be less than or equal to zero.
-
-```py
-from pydantic import BaseModel, NonPositiveFloat, ValidationError
-
-class Model(BaseModel):
-    non_positive_float: NonPositiveFloat
-
-m = Model(non_positive_float=0.0)
-print(repr(m))
-#> Model(non_positive_float=0.0)
-
-try:
-    Model(non_positive_float=1.0)
-except ValidationError as e:
-    print(e.errors())
-    '''
-    [
-        {
-            'type': 'less_than_equal',
-            'loc': ('non_positive_float',),
-            'msg': 'Input should be less than or equal to 0',
-            'input': 1.0,
-            'ctx': {'le': 0.0},
-            'url': 'https://errors.pydantic.dev/2/v/less_than_equal',
-        }
-    ]
-    '''
-```
-"""
-NonNegativeFloat = Annotated[float, annotated_types.Ge(0)]
-"""A float that must be greater than or equal to zero.
-
-```py
-from pydantic import BaseModel, NonNegativeFloat, ValidationError
-
-class Model(BaseModel):
-    non_negative_float: NonNegativeFloat
-
-m = Model(non_negative_float=0.0)
-print(repr(m))
-#> Model(non_negative_float=0.0)
-
-try:
-    Model(non_negative_float=-1.0)
-except ValidationError as e:
-    print(e.errors())
-    '''
-    [
-        {
-            'type': 'greater_than_equal',
-            'loc': ('non_negative_float',),
-            'msg': 'Input should be greater than or equal to 0',
-            'input': -1.0,
-            'ctx': {'ge': 0.0},
-            'url': 'https://errors.pydantic.dev/2/v/greater_than_equal',
-        }
-    ]
-    '''
-```
-"""
-StrictFloat = Annotated[float, Strict(True)]
-"""A float that must be validated in strict mode.
-
-```py
-from pydantic import BaseModel, StrictFloat, ValidationError
-
-class StrictFloatModel(BaseModel):
-    strict_float: StrictFloat
-
-try:
-    StrictFloatModel(strict_float='1.0')
-except ValidationError as e:
-    print(e)
-    '''
-    1 validation error for StrictFloatModel
-    strict_float
-      Input should be a valid number [type=float_type, input_value='1.0', input_type=str]
-    '''
-```
-"""
-FiniteFloat = Annotated[float, AllowInfNan(False)]
-"""A float that must be finite (not ``-inf``, ``inf``, or ``nan``).
-
-```py
-from pydantic import BaseModel, FiniteFloat
-
-class Model(BaseModel):
-    finite: FiniteFloat
-
-m = Model(finite=1.0)
-print(m)
-#> finite=1.0
-```
-"""
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ BYTES TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-def conbytes(
-    *,
-    min_length: int | None = None,
-    max_length: int | None = None,
-    strict: bool | None = None,
-) -> type[bytes]:
-    """A wrapper around `bytes` that allows for additional constraints.
-
-    Args:
-        min_length: The minimum length of the bytes.
-        max_length: The maximum length of the bytes.
-        strict: Whether to validate the bytes in strict mode.
-
-    Returns:
-        The wrapped bytes type.
-    """
-    return Annotated[
-        bytes,
-        Strict(strict) if strict is not None else None,
-        annotated_types.Len(min_length or 0, max_length),
-    ]
-
-
-StrictBytes = Annotated[bytes, Strict()]
-"""A bytes that must be validated in strict mode."""
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ STRING TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-@_dataclasses.dataclass(frozen=True)
-class StringConstraints(annotated_types.GroupedMetadata):
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/fields/#string-constraints
-
-    Apply constraints to `str` types.
-
-    Attributes:
-        strip_whitespace: Whether to strip whitespace from the string.
-        to_upper: Whether to convert the string to uppercase.
-        to_lower: Whether to convert the string to lowercase.
-        strict: Whether to validate the string in strict mode.
-        min_length: The minimum length of the string.
-        max_length: The maximum length of the string.
-        pattern: A regex pattern that the string must match.
-    """
-
-    strip_whitespace: bool | None = None
-    to_upper: bool | None = None
-    to_lower: bool | None = None
-    strict: bool | None = None
-    min_length: int | None = None
-    max_length: int | None = None
-    pattern: str | None = None
-
-    def __iter__(self) -> Iterator[BaseMetadata]:
-        if self.min_length is not None:
-            yield MinLen(self.min_length)
-        if self.max_length is not None:
-            yield MaxLen(self.max_length)
-        if self.strict is not None:
-            yield Strict()
-        if (
-            self.strip_whitespace is not None
-            or self.pattern is not None
-            or self.to_lower is not None
-            or self.to_upper is not None
-        ):
-            yield _fields.pydantic_general_metadata(
-                strip_whitespace=self.strip_whitespace,
-                to_upper=self.to_upper,
-                to_lower=self.to_lower,
-                pattern=self.pattern,
-            )
-
-
-def constr(
-    *,
-    strip_whitespace: bool | None = None,
-    to_upper: bool | None = None,
-    to_lower: bool | None = None,
-    strict: bool | None = None,
-    min_length: int | None = None,
-    max_length: int | None = None,
-    pattern: str | None = None,
-) -> type[str]:
-    """
-    !!! warning "Discouraged"
-        This function is **discouraged** in favor of using
-        [`Annotated`](https://docs.python.org/3/library/typing.html#typing.Annotated) with
-        [`StringConstraints`][pydantic.types.StringConstraints] instead.
-
-        This function will be **deprecated** in Pydantic 3.0.
-
-        The reason is that `constr` returns a type, which doesn't play well with static analysis tools.
-
-        === ":x: Don't do this"
-            ```py
-            from pydantic import BaseModel, constr
-
-            class Foo(BaseModel):
-                bar: constr(strip_whitespace=True, to_upper=True, pattern=r'^[A-Z]+$')
-            ```
-
-        === ":white_check_mark: Do this"
-            ```py
-            from typing_extensions import Annotated
-
-            from pydantic import BaseModel, StringConstraints
-
-            class Foo(BaseModel):
-                bar: Annotated[str, StringConstraints(strip_whitespace=True, to_upper=True, pattern=r'^[A-Z]+$')]
-            ```
-
-    A wrapper around `str` that allows for additional constraints.
-
-    ```py
-    from pydantic import BaseModel, constr
-
-    class Foo(BaseModel):
-        bar: constr(strip_whitespace=True, to_upper=True, pattern=r'^[A-Z]+$')
-
-
-    foo = Foo(bar='  hello  ')
-    print(foo)
-    #> bar='HELLO'
-    ```
-
-    Args:
-        strip_whitespace: Whether to remove leading and trailing whitespace.
-        to_upper: Whether to turn all characters to uppercase.
-        to_lower: Whether to turn all characters to lowercase.
-        strict: Whether to validate the string in strict mode.
-        min_length: The minimum length of the string.
-        max_length: The maximum length of the string.
-        pattern: A regex pattern to validate the string against.
-
-    Returns:
-        The wrapped string type.
-    """  # noqa: D212
-    return Annotated[
-        str,
-        StringConstraints(
-            strip_whitespace=strip_whitespace,
-            to_upper=to_upper,
-            to_lower=to_lower,
-            strict=strict,
-            min_length=min_length,
-            max_length=max_length,
-            pattern=pattern,
-        ),
-    ]
-
-
-StrictStr = Annotated[str, Strict()]
-"""A string that must be validated in strict mode."""
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~ COLLECTION TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-HashableItemType = TypeVar('HashableItemType', bound=Hashable)
-
-
-def conset(
-    item_type: type[HashableItemType], *, min_length: int | None = None, max_length: int | None = None
-) -> type[set[HashableItemType]]:
-    """A wrapper around `typing.Set` that allows for additional constraints.
-
-    Args:
-        item_type: The type of the items in the set.
-        min_length: The minimum length of the set.
-        max_length: The maximum length of the set.
-
-    Returns:
-        The wrapped set type.
-    """
-    return Annotated[Set[item_type], annotated_types.Len(min_length or 0, max_length)]
-
-
-def confrozenset(
-    item_type: type[HashableItemType], *, min_length: int | None = None, max_length: int | None = None
-) -> type[frozenset[HashableItemType]]:
-    """A wrapper around `typing.FrozenSet` that allows for additional constraints.
-
-    Args:
-        item_type: The type of the items in the frozenset.
-        min_length: The minimum length of the frozenset.
-        max_length: The maximum length of the frozenset.
-
-    Returns:
-        The wrapped frozenset type.
-    """
-    return Annotated[FrozenSet[item_type], annotated_types.Len(min_length or 0, max_length)]
-
-
-AnyItemType = TypeVar('AnyItemType')
-
-
-def conlist(
-    item_type: type[AnyItemType],
-    *,
-    min_length: int | None = None,
-    max_length: int | None = None,
-    unique_items: bool | None = None,
-) -> type[list[AnyItemType]]:
-    """A wrapper around typing.List that adds validation.
-
-    Args:
-        item_type: The type of the items in the list.
-        min_length: The minimum length of the list. Defaults to None.
-        max_length: The maximum length of the list. Defaults to None.
-        unique_items: Whether the items in the list must be unique. Defaults to None.
-            !!! warning Deprecated
-                The `unique_items` parameter is deprecated, use `Set` instead.
-                See [this issue](https://github.com/pydantic/pydantic-core/issues/296) for more details.
-
-    Returns:
-        The wrapped list type.
-    """
-    if unique_items is not None:
-        raise PydanticUserError(
-            (
-                '`unique_items` is removed, use `Set` instead'
-                '(this feature is discussed in https://github.com/pydantic/pydantic-core/issues/296)'
-            ),
-            code='removed-kwargs',
-        )
-    return Annotated[List[item_type], annotated_types.Len(min_length or 0, max_length)]
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~ IMPORT STRING TYPE ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-AnyType = TypeVar('AnyType')
-if TYPE_CHECKING:
-    ImportString = Annotated[AnyType, ...]
-else:
-
-    class ImportString:
-        """A type that can be used to import a type from a string.
-
-        `ImportString` expects a string and loads the Python object importable at that dotted path.
-        Attributes of modules may be separated from the module by `:` or `.`, e.g. if `'math:cos'` was provided,
-        the resulting field value would be the function`cos`. If a `.` is used and both an attribute and submodule
-        are present at the same path, the module will be preferred.
-
-        On model instantiation, pointers will be evaluated and imported. There is
-        some nuance to this behavior, demonstrated in the examples below.
-
-        **Good behavior:**
-        ```py
-        from math import cos
-
-        from pydantic import BaseModel, Field, ImportString, ValidationError
-
-
-        class ImportThings(BaseModel):
-            obj: ImportString
-
-
-        # A string value will cause an automatic import
-        my_cos = ImportThings(obj='math.cos')
-
-        # You can use the imported function as you would expect
-        cos_of_0 = my_cos.obj(0)
-        assert cos_of_0 == 1
-
-
-        # A string whose value cannot be imported will raise an error
-        try:
-            ImportThings(obj='foo.bar')
-        except ValidationError as e:
-            print(e)
-            '''
-            1 validation error for ImportThings
-            obj
-            Invalid python path: No module named 'foo.bar' [type=import_error, input_value='foo.bar', input_type=str]
-            '''
-
-
-        # Actual python objects can be assigned as well
-        my_cos = ImportThings(obj=cos)
-        my_cos_2 = ImportThings(obj='math.cos')
-        my_cos_3 = ImportThings(obj='math:cos')
-        assert my_cos == my_cos_2 == my_cos_3
-
-
-        # You can set default field value either as Python object:
-        class ImportThingsDefaultPyObj(BaseModel):
-            obj: ImportString = math.cos
-
-
-        # or as a string value (but only if used with `validate_default=True`)
-        class ImportThingsDefaultString(BaseModel):
-            obj: ImportString = Field(default='math.cos', validate_default=True)
-
-
-        my_cos_default1 = ImportThingsDefaultPyObj()
-        my_cos_default2 = ImportThingsDefaultString()
-        assert my_cos_default1.obj == my_cos_default2.obj == math.cos
-
-
-        # note: this will not work!
-        class ImportThingsMissingValidateDefault(BaseModel):
-            obj: ImportString = 'math.cos'
-
-        my_cos_default3 = ImportThingsMissingValidateDefault()
-        assert my_cos_default3.obj == 'math.cos'  # just string, not evaluated
-        ```
-
-        Serializing an `ImportString` type to json is also possible.
-
-        ```py
-        from pydantic import BaseModel, ImportString
-
-
-        class ImportThings(BaseModel):
-            obj: ImportString
-
-
-        # Create an instance
-        m = ImportThings(obj='math.cos')
-        print(m)
-        #> obj=<built-in function cos>
-        print(m.model_dump_json())
-        #> {"obj":"math.cos"}
-        ```
-        """
-
-        @classmethod
-        def __class_getitem__(cls, item: AnyType) -> AnyType:
-            return Annotated[item, cls()]
-
-        @classmethod
-        def __get_pydantic_core_schema__(
-            cls, source: type[Any], handler: GetCoreSchemaHandler
-        ) -> core_schema.CoreSchema:
-            serializer = core_schema.plain_serializer_function_ser_schema(cls._serialize, when_used='json')
-            if cls is source:
-                # Treat bare usage of ImportString (`schema is None`) as the same as ImportString[Any]
-                return core_schema.no_info_plain_validator_function(
-                    function=_validators.import_string, serialization=serializer
-                )
-            else:
-                return core_schema.no_info_before_validator_function(
-                    function=_validators.import_string, schema=handler(source), serialization=serializer
-                )
-
-        @staticmethod
-        def _serialize(v: Any) -> str:
-            if isinstance(v, ModuleType):
-                return v.__name__
-            elif hasattr(v, '__module__') and hasattr(v, '__name__'):
-                return f'{v.__module__}.{v.__name__}'
-            else:
-                return v
-
-        def __repr__(self) -> str:
-            return 'ImportString'
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ DECIMAL TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-def condecimal(
-    *,
-    strict: bool | None = None,
-    gt: int | Decimal | None = None,
-    ge: int | Decimal | None = None,
-    lt: int | Decimal | None = None,
-    le: int | Decimal | None = None,
-    multiple_of: int | Decimal | None = None,
-    max_digits: int | None = None,
-    decimal_places: int | None = None,
-    allow_inf_nan: bool | None = None,
-) -> type[Decimal]:
-    """
-    !!! warning "Discouraged"
-        This function is **discouraged** in favor of using
-        [`Annotated`](https://docs.python.org/3/library/typing.html#typing.Annotated) with
-        [`Field`][pydantic.fields.Field] instead.
-
-        This function will be **deprecated** in Pydantic 3.0.
-
-        The reason is that `condecimal` returns a type, which doesn't play well with static analysis tools.
-
-        === ":x: Don't do this"
-            ```py
-            from pydantic import BaseModel, condecimal
-
-            class Foo(BaseModel):
-                bar: condecimal(strict=True, allow_inf_nan=True)
-            ```
-
-        === ":white_check_mark: Do this"
-            ```py
-            from decimal import Decimal
-
-            from typing_extensions import Annotated
-
-            from pydantic import BaseModel, Field
-
-            class Foo(BaseModel):
-                bar: Annotated[Decimal, Field(strict=True, allow_inf_nan=True)]
-            ```
-
-    A wrapper around Decimal that adds validation.
-
-    Args:
-        strict: Whether to validate the value in strict mode. Defaults to `None`.
-        gt: The value must be greater than this. Defaults to `None`.
-        ge: The value must be greater than or equal to this. Defaults to `None`.
-        lt: The value must be less than this. Defaults to `None`.
-        le: The value must be less than or equal to this. Defaults to `None`.
-        multiple_of: The value must be a multiple of this. Defaults to `None`.
-        max_digits: The maximum number of digits. Defaults to `None`.
-        decimal_places: The number of decimal places. Defaults to `None`.
-        allow_inf_nan: Whether to allow infinity and NaN. Defaults to `None`.
-
-    ```py
-    from decimal import Decimal
-
-    from pydantic import BaseModel, ValidationError, condecimal
-
-    class ConstrainedExample(BaseModel):
-        constrained_decimal: condecimal(gt=Decimal('1.0'))
-
-    m = ConstrainedExample(constrained_decimal=Decimal('1.1'))
-    print(repr(m))
-    #> ConstrainedExample(constrained_decimal=Decimal('1.1'))
-
-    try:
-        ConstrainedExample(constrained_decimal=Decimal('0.9'))
-    except ValidationError as e:
-        print(e.errors())
-        '''
-        [
-            {
-                'type': 'greater_than',
-                'loc': ('constrained_decimal',),
-                'msg': 'Input should be greater than 1.0',
-                'input': Decimal('0.9'),
-                'ctx': {'gt': Decimal('1.0')},
-                'url': 'https://errors.pydantic.dev/2/v/greater_than',
-            }
-        ]
-        '''
-    ```
-    """  # noqa: D212
-    return Annotated[
-        Decimal,
-        Strict(strict) if strict is not None else None,
-        annotated_types.Interval(gt=gt, ge=ge, lt=lt, le=le),
-        annotated_types.MultipleOf(multiple_of) if multiple_of is not None else None,
-        _fields.pydantic_general_metadata(max_digits=max_digits, decimal_places=decimal_places),
-        AllowInfNan(allow_inf_nan) if allow_inf_nan is not None else None,
-    ]
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UUID TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-@_dataclasses.dataclass(**_internal_dataclass.slots_true)
-class UuidVersion:
-    """A field metadata class to indicate a [UUID](https://docs.python.org/3/library/uuid.html) version."""
-
-    uuid_version: Literal[1, 3, 4, 5]
-
-    def __get_pydantic_json_schema__(
-        self, core_schema: core_schema.CoreSchema, handler: GetJsonSchemaHandler
-    ) -> JsonSchemaValue:
-        field_schema = handler(core_schema)
-        field_schema.pop('anyOf', None)  # remove the bytes/str union
-        field_schema.update(type='string', format=f'uuid{self.uuid_version}')
-        return field_schema
-
-    def __get_pydantic_core_schema__(self, source: Any, handler: GetCoreSchemaHandler) -> core_schema.CoreSchema:
-        if isinstance(self, source):
-            # used directly as a type
-            return core_schema.uuid_schema(version=self.uuid_version)
-        else:
-            # update existing schema with self.uuid_version
-            schema = handler(source)
-            _check_annotated_type(schema['type'], 'uuid', self.__class__.__name__)
-            schema['version'] = self.uuid_version  # type: ignore
-            return schema
-
-    def __hash__(self) -> int:
-        return hash(type(self.uuid_version))
-
-
-UUID1 = Annotated[UUID, UuidVersion(1)]
-"""A [UUID](https://docs.python.org/3/library/uuid.html) that must be version 1.
-
-```py
-import uuid
-
-from pydantic import UUID1, BaseModel
-
-class Model(BaseModel):
-    uuid1: UUID1
-
-Model(uuid1=uuid.uuid1())
-```
-"""
-UUID3 = Annotated[UUID, UuidVersion(3)]
-"""A [UUID](https://docs.python.org/3/library/uuid.html) that must be version 3.
-
-```py
-import uuid
-
-from pydantic import UUID3, BaseModel
-
-class Model(BaseModel):
-    uuid3: UUID3
-
-Model(uuid3=uuid.uuid3(uuid.NAMESPACE_DNS, 'pydantic.org'))
-```
-"""
-UUID4 = Annotated[UUID, UuidVersion(4)]
-"""A [UUID](https://docs.python.org/3/library/uuid.html) that must be version 4.
-
-```py
-import uuid
-
-from pydantic import UUID4, BaseModel
-
-class Model(BaseModel):
-    uuid4: UUID4
-
-Model(uuid4=uuid.uuid4())
-```
-"""
-UUID5 = Annotated[UUID, UuidVersion(5)]
-"""A [UUID](https://docs.python.org/3/library/uuid.html) that must be version 5.
-
-```py
-import uuid
-
-from pydantic import UUID5, BaseModel
-
-class Model(BaseModel):
-    uuid5: UUID5
-
-Model(uuid5=uuid.uuid5(uuid.NAMESPACE_DNS, 'pydantic.org'))
-```
-"""
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PATH TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-@_dataclasses.dataclass
-class PathType:
-    path_type: Literal['file', 'dir', 'new']
-
-    def __get_pydantic_json_schema__(
-        self, core_schema: core_schema.CoreSchema, handler: GetJsonSchemaHandler
-    ) -> JsonSchemaValue:
-        field_schema = handler(core_schema)
-        format_conversion = {'file': 'file-path', 'dir': 'directory-path'}
-        field_schema.update(format=format_conversion.get(self.path_type, 'path'), type='string')
-        return field_schema
-
-    def __get_pydantic_core_schema__(self, source: Any, handler: GetCoreSchemaHandler) -> core_schema.CoreSchema:
-        function_lookup = {
-            'file': cast(core_schema.WithInfoValidatorFunction, self.validate_file),
-            'dir': cast(core_schema.WithInfoValidatorFunction, self.validate_directory),
-            'new': cast(core_schema.WithInfoValidatorFunction, self.validate_new),
-        }
-
-        return core_schema.with_info_after_validator_function(
-            function_lookup[self.path_type],
-            handler(source),
-        )
-
-    @staticmethod
-    def validate_file(path: Path, _: core_schema.ValidationInfo) -> Path:
-        if path.is_file():
-            return path
-        else:
-            raise PydanticCustomError('path_not_file', 'Path does not point to a file')
-
-    @staticmethod
-    def validate_directory(path: Path, _: core_schema.ValidationInfo) -> Path:
-        if path.is_dir():
-            return path
-        else:
-            raise PydanticCustomError('path_not_directory', 'Path does not point to a directory')
-
-    @staticmethod
-    def validate_new(path: Path, _: core_schema.ValidationInfo) -> Path:
-        if path.exists():
-            raise PydanticCustomError('path_exists', 'Path already exists')
-        elif not path.parent.exists():
-            raise PydanticCustomError('parent_does_not_exist', 'Parent directory does not exist')
-        else:
-            return path
-
-    def __hash__(self) -> int:
-        return hash(type(self.path_type))
-
-
-FilePath = Annotated[Path, PathType('file')]
-"""A path that must point to a file.
-
-```py
-from pathlib import Path
-
-from pydantic import BaseModel, FilePath, ValidationError
-
-class Model(BaseModel):
-    f: FilePath
-
-path = Path('text.txt')
-path.touch()
-m = Model(f='text.txt')
-print(m.model_dump())
-#> {'f': PosixPath('text.txt')}
-path.unlink()
-
-path = Path('directory')
-path.mkdir(exist_ok=True)
-try:
-    Model(f='directory')  # directory
-except ValidationError as e:
-    print(e)
-    '''
-    1 validation error for Model
-    f
-      Path does not point to a file [type=path_not_file, input_value='directory', input_type=str]
-    '''
-path.rmdir()
-
-try:
-    Model(f='not-exists-file')
-except ValidationError as e:
-    print(e)
-    '''
-    1 validation error for Model
-    f
-      Path does not point to a file [type=path_not_file, input_value='not-exists-file', input_type=str]
-    '''
-```
-"""
-DirectoryPath = Annotated[Path, PathType('dir')]
-"""A path that must point to a directory.
-
-```py
-from pathlib import Path
-
-from pydantic import BaseModel, DirectoryPath, ValidationError
-
-class Model(BaseModel):
-    f: DirectoryPath
-
-path = Path('directory/')
-path.mkdir()
-m = Model(f='directory/')
-print(m.model_dump())
-#> {'f': PosixPath('directory')}
-path.rmdir()
-
-path = Path('file.txt')
-path.touch()
-try:
-    Model(f='file.txt')  # file
-except ValidationError as e:
-    print(e)
-    '''
-    1 validation error for Model
-    f
-      Path does not point to a directory [type=path_not_directory, input_value='file.txt', input_type=str]
-    '''
-path.unlink()
-
-try:
-    Model(f='not-exists-directory')
-except ValidationError as e:
-    print(e)
-    '''
-    1 validation error for Model
-    f
-      Path does not point to a directory [type=path_not_directory, input_value='not-exists-directory', input_type=str]
-    '''
-```
-"""
-NewPath = Annotated[Path, PathType('new')]
-"""A path for a new file or directory that must not already exist."""
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ JSON TYPE ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-if TYPE_CHECKING:
-    Json = Annotated[AnyType, ...]  # Json[list[str]] will be recognized by type checkers as list[str]
-
-else:
-
-    class Json:
-        """A special type wrapper which loads JSON before parsing.
-
-        You can use the `Json` data type to make Pydantic first load a raw JSON string before
-        validating the loaded data into the parametrized type:
-
-        ```py
-        from typing import Any, List
-
-        from pydantic import BaseModel, Json, ValidationError
-
-
-        class AnyJsonModel(BaseModel):
-            json_obj: Json[Any]
-
-
-        class ConstrainedJsonModel(BaseModel):
-            json_obj: Json[List[int]]
-
-
-        print(AnyJsonModel(json_obj='{"b": 1}'))
-        #> json_obj={'b': 1}
-        print(ConstrainedJsonModel(json_obj='[1, 2, 3]'))
-        #> json_obj=[1, 2, 3]
-
-        try:
-            ConstrainedJsonModel(json_obj=12)
-        except ValidationError as e:
-            print(e)
-            '''
-            1 validation error for ConstrainedJsonModel
-            json_obj
-            JSON input should be string, bytes or bytearray [type=json_type, input_value=12, input_type=int]
-            '''
-
-        try:
-            ConstrainedJsonModel(json_obj='[a, b]')
-        except ValidationError as e:
-            print(e)
-            '''
-            1 validation error for ConstrainedJsonModel
-            json_obj
-            Invalid JSON: expected value at line 1 column 2 [type=json_invalid, input_value='[a, b]', input_type=str]
-            '''
-
-        try:
-            ConstrainedJsonModel(json_obj='["a", "b"]')
-        except ValidationError as e:
-            print(e)
-            '''
-            2 validation errors for ConstrainedJsonModel
-            json_obj.0
-            Input should be a valid integer, unable to parse string as an integer [type=int_parsing, input_value='a', input_type=str]
-            json_obj.1
-            Input should be a valid integer, unable to parse string as an integer [type=int_parsing, input_value='b', input_type=str]
-            '''
-        ```
-
-        When you dump the model using `model_dump` or `model_dump_json`, the dumped value will be the result of validation,
-        not the original JSON string. However, you can use the argument `round_trip=True` to get the original JSON string back:
-
-        ```py
-        from typing import List
-
-        from pydantic import BaseModel, Json
-
-
-        class ConstrainedJsonModel(BaseModel):
-            json_obj: Json[List[int]]
-
-
-        print(ConstrainedJsonModel(json_obj='[1, 2, 3]').model_dump_json())
-        #> {"json_obj":[1,2,3]}
-        print(
-            ConstrainedJsonModel(json_obj='[1, 2, 3]').model_dump_json(round_trip=True)
-        )
-        #> {"json_obj":"[1,2,3]"}
-        ```
-        """
-
-        @classmethod
-        def __class_getitem__(cls, item: AnyType) -> AnyType:
-            return Annotated[item, cls()]
-
-        @classmethod
-        def __get_pydantic_core_schema__(cls, source: Any, handler: GetCoreSchemaHandler) -> core_schema.CoreSchema:
-            if cls is source:
-                return core_schema.json_schema(None)
-            else:
-                return core_schema.json_schema(handler(source))
-
-        def __repr__(self) -> str:
-            return 'Json'
-
-        def __hash__(self) -> int:
-            return hash(type(self))
-
-        def __eq__(self, other: Any) -> bool:
-            return type(other) == type(self)
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SECRET TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-SecretType = TypeVar('SecretType', str, bytes)
-
-
-class _SecretField(Generic[SecretType]):
-    def __init__(self, secret_value: SecretType) -> None:
-        self._secret_value: SecretType = secret_value
-
-    def get_secret_value(self) -> SecretType:
-        """Get the secret value.
-
-        Returns:
-            The secret value.
-        """
-        return self._secret_value
-
-    def __eq__(self, other: Any) -> bool:
-        return isinstance(other, self.__class__) and self.get_secret_value() == other.get_secret_value()
-
-    def __hash__(self) -> int:
-        return hash(self.get_secret_value())
-
-    def __len__(self) -> int:
-        return len(self._secret_value)
-
-    def __str__(self) -> str:
-        return str(self._display())
-
-    def __repr__(self) -> str:
-        return f'{self.__class__.__name__}({self._display()!r})'
-
-    def _display(self) -> SecretType:
-        raise NotImplementedError
-
-    @classmethod
-    def __get_pydantic_core_schema__(cls, source: type[Any], handler: GetCoreSchemaHandler) -> core_schema.CoreSchema:
-        if issubclass(source, SecretStr):
-            field_type = str
-            inner_schema = core_schema.str_schema()
-        else:
-            assert issubclass(source, SecretBytes)
-            field_type = bytes
-            inner_schema = core_schema.bytes_schema()
-        error_kind = 'string_type' if field_type is str else 'bytes_type'
-
-        def serialize(
-            value: _SecretField[SecretType], info: core_schema.SerializationInfo
-        ) -> str | _SecretField[SecretType]:
-            if info.mode == 'json':
-                # we want the output to always be string without the `b'` prefix for bytes,
-                # hence we just use `secret_display`
-                return _secret_display(value.get_secret_value())
-            else:
-                return value
-
-        def get_json_schema(_core_schema: core_schema.CoreSchema, handler: GetJsonSchemaHandler) -> JsonSchemaValue:
-            json_schema = handler(inner_schema)
-            _utils.update_not_none(
-                json_schema,
-                type='string',
-                writeOnly=True,
-                format='password',
-            )
-            return json_schema
-
-        json_schema = core_schema.no_info_after_validator_function(
-            source,  # construct the type
-            inner_schema,
-        )
-        s = core_schema.json_or_python_schema(
-            python_schema=core_schema.union_schema(
-                [
-                    core_schema.is_instance_schema(source),
-                    json_schema,
-                ],
-                strict=True,
-                custom_error_type=error_kind,
-            ),
-            json_schema=json_schema,
-            serialization=core_schema.plain_serializer_function_ser_schema(
-                serialize,
-                info_arg=True,
-                return_schema=core_schema.str_schema(),
-                when_used='json',
-            ),
-        )
-        s.setdefault('metadata', {}).setdefault('pydantic_js_functions', []).append(get_json_schema)
-        return s
-
-
-def _secret_display(value: str | bytes) -> str:
-    return '**********' if value else ''
-
-
-class SecretStr(_SecretField[str]):
-    """A string used for storing sensitive information that you do not want to be visible in logging or tracebacks.
-
-    When the secret value is nonempty, it is displayed as `'**********'` instead of the underlying value in
-    calls to `repr()` and `str()`. If the value _is_ empty, it is displayed as `''`.
-
-    ```py
-    from pydantic import BaseModel, SecretStr
-
-    class User(BaseModel):
-        username: str
-        password: SecretStr
-
-    user = User(username='scolvin', password='password1')
-
-    print(user)
-    #> username='scolvin' password=SecretStr('**********')
-    print(user.password.get_secret_value())
-    #> password1
-    print((SecretStr('password'), SecretStr('')))
-    #> (SecretStr('**********'), SecretStr(''))
-    ```
-    """
-
-    def _display(self) -> str:
-        return _secret_display(self.get_secret_value())
-
-
-class SecretBytes(_SecretField[bytes]):
-    """A bytes used for storing sensitive information that you do not want to be visible in logging or tracebacks.
-
-    It displays `b'**********'` instead of the string value on `repr()` and `str()` calls.
-    When the secret value is nonempty, it is displayed as `b'**********'` instead of the underlying value in
-    calls to `repr()` and `str()`. If the value _is_ empty, it is displayed as `b''`.
-
-    ```py
-    from pydantic import BaseModel, SecretBytes
-
-    class User(BaseModel):
-        username: str
-        password: SecretBytes
-
-    user = User(username='scolvin', password=b'password1')
-    #> username='scolvin' password=SecretBytes(b'**********')
-    print(user.password.get_secret_value())
-    #> b'password1'
-    print((SecretBytes(b'password'), SecretBytes(b'')))
-    #> (SecretBytes(b'**********'), SecretBytes(b''))
-    ```
-    """
-
-    def _display(self) -> bytes:
-        return _secret_display(self.get_secret_value()).encode()
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PAYMENT CARD TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-class PaymentCardBrand(str, Enum):
-    amex = 'American Express'
-    mastercard = 'Mastercard'
-    visa = 'Visa'
-    other = 'other'
-
-    def __str__(self) -> str:
-        return self.value
-
-
-@deprecated(
-    'The `PaymentCardNumber` class is deprecated, use `pydantic_extra_types` instead. '
-    'See https://docs.pydantic.dev/latest/api/pydantic_extra_types_payment/#pydantic_extra_types.payment.PaymentCardNumber.',
-    category=PydanticDeprecatedSince20,
-)
-class PaymentCardNumber(str):
-    """Based on: https://en.wikipedia.org/wiki/Payment_card_number."""
-
-    strip_whitespace: ClassVar[bool] = True
-    min_length: ClassVar[int] = 12
-    max_length: ClassVar[int] = 19
-    bin: str
-    last4: str
-    brand: PaymentCardBrand
-
-    def __init__(self, card_number: str):
-        self.validate_digits(card_number)
-
-        card_number = self.validate_luhn_check_digit(card_number)
-
-        self.bin = card_number[:6]
-        self.last4 = card_number[-4:]
-        self.brand = self.validate_brand(card_number)
-
-    @classmethod
-    def __get_pydantic_core_schema__(cls, source: type[Any], handler: GetCoreSchemaHandler) -> core_schema.CoreSchema:
-        return core_schema.with_info_after_validator_function(
-            cls.validate,
-            core_schema.str_schema(
-                min_length=cls.min_length, max_length=cls.max_length, strip_whitespace=cls.strip_whitespace
-            ),
-        )
-
-    @classmethod
-    def validate(cls, __input_value: str, _: core_schema.ValidationInfo) -> PaymentCardNumber:
-        """Validate the card number and return a `PaymentCardNumber` instance."""
-        return cls(__input_value)
-
-    @property
-    def masked(self) -> str:
-        """Mask all but the last 4 digits of the card number.
-
-        Returns:
-            A masked card number string.
-        """
-        num_masked = len(self) - 10  # len(bin) + len(last4) == 10
-        return f'{self.bin}{"*" * num_masked}{self.last4}'
-
-    @classmethod
-    def validate_digits(cls, card_number: str) -> None:
-        """Validate that the card number is all digits."""
-        if not card_number.isdigit():
-            raise PydanticCustomError('payment_card_number_digits', 'Card number is not all digits')
-
-    @classmethod
-    def validate_luhn_check_digit(cls, card_number: str) -> str:
-        """Based on: https://en.wikipedia.org/wiki/Luhn_algorithm."""
-        sum_ = int(card_number[-1])
-        length = len(card_number)
-        parity = length % 2
-        for i in range(length - 1):
-            digit = int(card_number[i])
-            if i % 2 == parity:
-                digit *= 2
-            if digit > 9:
-                digit -= 9
-            sum_ += digit
-        valid = sum_ % 10 == 0
-        if not valid:
-            raise PydanticCustomError('payment_card_number_luhn', 'Card number is not luhn valid')
-        return card_number
-
-    @staticmethod
-    def validate_brand(card_number: str) -> PaymentCardBrand:
-        """Validate length based on BIN for major brands:
-        https://en.wikipedia.org/wiki/Payment_card_number#Issuer_identification_number_(IIN).
-        """
-        if card_number[0] == '4':
-            brand = PaymentCardBrand.visa
-        elif 51 <= int(card_number[:2]) <= 55:
-            brand = PaymentCardBrand.mastercard
-        elif card_number[:2] in {'34', '37'}:
-            brand = PaymentCardBrand.amex
-        else:
-            brand = PaymentCardBrand.other
-
-        required_length: None | int | str = None
-        if brand in PaymentCardBrand.mastercard:
-            required_length = 16
-            valid = len(card_number) == required_length
-        elif brand == PaymentCardBrand.visa:
-            required_length = '13, 16 or 19'
-            valid = len(card_number) in {13, 16, 19}
-        elif brand == PaymentCardBrand.amex:
-            required_length = 15
-            valid = len(card_number) == required_length
-        else:
-            valid = True
-
-        if not valid:
-            raise PydanticCustomError(
-                'payment_card_number_brand',
-                'Length for a {brand} card must be {required_length}',
-                {'brand': brand, 'required_length': required_length},
-            )
-        return brand
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ BYTE SIZE TYPE ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-class ByteSize(int):
-    """Converts a string representing a number of bytes with units (such as `'1KB'` or `'11.5MiB'`) into an integer.
-
-    You can use the `ByteSize` data type to (case-insensitively) convert a string representation of a number of bytes into
-    an integer, and also to print out human-readable strings representing a number of bytes.
-
-    In conformance with [IEC 80000-13 Standard](https://en.wikipedia.org/wiki/ISO/IEC_80000) we interpret `'1KB'` to mean 1000 bytes,
-    and `'1KiB'` to mean 1024 bytes. In general, including a middle `'i'` will cause the unit to be interpreted as a power of 2,
-    rather than a power of 10 (so, for example, `'1 MB'` is treated as `1_000_000` bytes, whereas `'1 MiB'` is treated as `1_048_576` bytes).
-
-    !!! info
-        Note that `1b` will be parsed as "1 byte" and not "1 bit".
-
-    ```py
-    from pydantic import BaseModel, ByteSize
-
-    class MyModel(BaseModel):
-        size: ByteSize
-
-    print(MyModel(size=52000).size)
-    #> 52000
-    print(MyModel(size='3000 KiB').size)
-    #> 3072000
-
-    m = MyModel(size='50 PB')
-    print(m.size.human_readable())
-    #> 44.4PiB
-    print(m.size.human_readable(decimal=True))
-    #> 50.0PB
-
-    print(m.size.to('TiB'))
-    #> 45474.73508864641
-    ```
-    """
-
-    byte_sizes = {
-        'b': 1,
-        'kb': 10**3,
-        'mb': 10**6,
-        'gb': 10**9,
-        'tb': 10**12,
-        'pb': 10**15,
-        'eb': 10**18,
-        'kib': 2**10,
-        'mib': 2**20,
-        'gib': 2**30,
-        'tib': 2**40,
-        'pib': 2**50,
-        'eib': 2**60,
-        'bit': 1 / 8,
-        'kbit': 10**3 / 8,
-        'mbit': 10**6 / 8,
-        'gbit': 10**9 / 8,
-        'tbit': 10**12 / 8,
-        'pbit': 10**15 / 8,
-        'ebit': 10**18 / 8,
-        'kibit': 2**10 / 8,
-        'mibit': 2**20 / 8,
-        'gibit': 2**30 / 8,
-        'tibit': 2**40 / 8,
-        'pibit': 2**50 / 8,
-        'eibit': 2**60 / 8,
-    }
-    byte_sizes.update({k.lower()[0]: v for k, v in byte_sizes.items() if 'i' not in k})
-
-    byte_string_pattern = r'^\s*(\d*\.?\d+)\s*(\w+)?'
-    byte_string_re = re.compile(byte_string_pattern, re.IGNORECASE)
-
-    @classmethod
-    def __get_pydantic_core_schema__(cls, source: type[Any], handler: GetCoreSchemaHandler) -> core_schema.CoreSchema:
-        return core_schema.with_info_after_validator_function(
-            function=cls._validate,
-            schema=core_schema.union_schema(
-                [
-                    core_schema.str_schema(pattern=cls.byte_string_pattern),
-                    core_schema.int_schema(ge=0),
-                ],
-                custom_error_type='byte_size',
-                custom_error_message='could not parse value and unit from byte string',
-            ),
-            serialization=core_schema.plain_serializer_function_ser_schema(
-                int, return_schema=core_schema.int_schema(ge=0)
-            ),
-        )
-
-    @classmethod
-    def _validate(cls, __input_value: Any, _: core_schema.ValidationInfo) -> ByteSize:
-        try:
-            return cls(int(__input_value))
-        except ValueError:
-            pass
-
-        str_match = cls.byte_string_re.match(str(__input_value))
-        if str_match is None:
-            raise PydanticCustomError('byte_size', 'could not parse value and unit from byte string')
-
-        scalar, unit = str_match.groups()
-        if unit is None:
-            unit = 'b'
-
-        try:
-            unit_mult = cls.byte_sizes[unit.lower()]
-        except KeyError:
-            raise PydanticCustomError('byte_size_unit', 'could not interpret byte unit: {unit}', {'unit': unit})
-
-        return cls(int(float(scalar) * unit_mult))
-
-    def human_readable(self, decimal: bool = False) -> str:
-        """Converts a byte size to a human readable string.
-
-        Args:
-            decimal: If True, use decimal units (e.g. 1000 bytes per KB). If False, use binary units
-                (e.g. 1024 bytes per KiB).
-
-        Returns:
-            A human readable string representation of the byte size.
-        """
-        if decimal:
-            divisor = 1000
-            units = 'B', 'KB', 'MB', 'GB', 'TB', 'PB'
-            final_unit = 'EB'
-        else:
-            divisor = 1024
-            units = 'B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB'
-            final_unit = 'EiB'
-
-        num = float(self)
-        for unit in units:
-            if abs(num) < divisor:
-                if unit == 'B':
-                    return f'{num:0.0f}{unit}'
-                else:
-                    return f'{num:0.1f}{unit}'
-            num /= divisor
-
-        return f'{num:0.1f}{final_unit}'
-
-    def to(self, unit: str) -> float:
-        """Converts a byte size to another unit, including both byte and bit units.
-
-        Args:
-            unit: The unit to convert to. Must be one of the following: B, KB, MB, GB, TB, PB, EB,
-                KiB, MiB, GiB, TiB, PiB, EiB (byte units) and
-                bit, kbit, mbit, gbit, tbit, pbit, ebit,
-                kibit, mibit, gibit, tibit, pibit, eibit (bit units).
-
-        Returns:
-            The byte size in the new unit.
-        """
-        try:
-            unit_div = self.byte_sizes[unit.lower()]
-        except KeyError:
-            raise PydanticCustomError('byte_size_unit', 'Could not interpret byte unit: {unit}', {'unit': unit})
-
-        return self / unit_div
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ DATE TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-def _check_annotated_type(annotated_type: str, expected_type: str, annotation: str) -> None:
-    if annotated_type != expected_type:
-        raise PydanticUserError(f"'{annotation}' cannot annotate '{annotated_type}'.", code='invalid_annotated_type')
-
-
-if TYPE_CHECKING:
-    PastDate = Annotated[date, ...]
-    FutureDate = Annotated[date, ...]
-else:
-
-    class PastDate:
-        """A date in the past."""
-
-        @classmethod
-        def __get_pydantic_core_schema__(
-            cls, source: type[Any], handler: GetCoreSchemaHandler
-        ) -> core_schema.CoreSchema:
-            if cls is source:
-                # used directly as a type
-                return core_schema.date_schema(now_op='past')
-            else:
-                schema = handler(source)
-                _check_annotated_type(schema['type'], 'date', cls.__name__)
-                schema['now_op'] = 'past'
-                return schema
-
-        def __repr__(self) -> str:
-            return 'PastDate'
-
-    class FutureDate:
-        """A date in the future."""
-
-        @classmethod
-        def __get_pydantic_core_schema__(
-            cls, source: type[Any], handler: GetCoreSchemaHandler
-        ) -> core_schema.CoreSchema:
-            if cls is source:
-                # used directly as a type
-                return core_schema.date_schema(now_op='future')
-            else:
-                schema = handler(source)
-                _check_annotated_type(schema['type'], 'date', cls.__name__)
-                schema['now_op'] = 'future'
-                return schema
-
-        def __repr__(self) -> str:
-            return 'FutureDate'
-
-
-def condate(
-    *,
-    strict: bool | None = None,
-    gt: date | None = None,
-    ge: date | None = None,
-    lt: date | None = None,
-    le: date | None = None,
-) -> type[date]:
-    """A wrapper for date that adds constraints.
-
-    Args:
-        strict: Whether to validate the date value in strict mode. Defaults to `None`.
-        gt: The value must be greater than this. Defaults to `None`.
-        ge: The value must be greater than or equal to this. Defaults to `None`.
-        lt: The value must be less than this. Defaults to `None`.
-        le: The value must be less than or equal to this. Defaults to `None`.
-
-    Returns:
-        A date type with the specified constraints.
-    """
-    return Annotated[
-        date,
-        Strict(strict) if strict is not None else None,
-        annotated_types.Interval(gt=gt, ge=ge, lt=lt, le=le),
-    ]
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ DATETIME TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-if TYPE_CHECKING:
-    AwareDatetime = Annotated[datetime, ...]
-    NaiveDatetime = Annotated[datetime, ...]
-    PastDatetime = Annotated[datetime, ...]
-    FutureDatetime = Annotated[datetime, ...]
-
-else:
-
-    class AwareDatetime:
-        """A datetime that requires timezone info."""
-
-        @classmethod
-        def __get_pydantic_core_schema__(
-            cls, source: type[Any], handler: GetCoreSchemaHandler
-        ) -> core_schema.CoreSchema:
-            if cls is source:
-                # used directly as a type
-                return core_schema.datetime_schema(tz_constraint='aware')
-            else:
-                schema = handler(source)
-                _check_annotated_type(schema['type'], 'datetime', cls.__name__)
-                schema['tz_constraint'] = 'aware'
-                return schema
-
-        def __repr__(self) -> str:
-            return 'AwareDatetime'
-
-    class NaiveDatetime:
-        """A datetime that doesn't require timezone info."""
-
-        @classmethod
-        def __get_pydantic_core_schema__(
-            cls, source: type[Any], handler: GetCoreSchemaHandler
-        ) -> core_schema.CoreSchema:
-            if cls is source:
-                # used directly as a type
-                return core_schema.datetime_schema(tz_constraint='naive')
-            else:
-                schema = handler(source)
-                _check_annotated_type(schema['type'], 'datetime', cls.__name__)
-                schema['tz_constraint'] = 'naive'
-                return schema
-
-        def __repr__(self) -> str:
-            return 'NaiveDatetime'
-
-    class PastDatetime:
-        """A datetime that must be in the past."""
-
-        @classmethod
-        def __get_pydantic_core_schema__(
-            cls, source: type[Any], handler: GetCoreSchemaHandler
-        ) -> core_schema.CoreSchema:
-            if cls is source:
-                # used directly as a type
-                return core_schema.datetime_schema(now_op='past')
-            else:
-                schema = handler(source)
-                _check_annotated_type(schema['type'], 'datetime', cls.__name__)
-                schema['now_op'] = 'past'
-                return schema
-
-        def __repr__(self) -> str:
-            return 'PastDatetime'
-
-    class FutureDatetime:
-        """A datetime that must be in the future."""
-
-        @classmethod
-        def __get_pydantic_core_schema__(
-            cls, source: type[Any], handler: GetCoreSchemaHandler
-        ) -> core_schema.CoreSchema:
-            if cls is source:
-                # used directly as a type
-                return core_schema.datetime_schema(now_op='future')
-            else:
-                schema = handler(source)
-                _check_annotated_type(schema['type'], 'datetime', cls.__name__)
-                schema['now_op'] = 'future'
-                return schema
-
-        def __repr__(self) -> str:
-            return 'FutureDatetime'
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Encoded TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-class EncoderProtocol(Protocol):
-    """Protocol for encoding and decoding data to and from bytes."""
-
-    @classmethod
-    def decode(cls, data: bytes) -> bytes:
-        """Decode the data using the encoder.
-
-        Args:
-            data: The data to decode.
-
-        Returns:
-            The decoded data.
-        """
-        ...
-
-    @classmethod
-    def encode(cls, value: bytes) -> bytes:
-        """Encode the data using the encoder.
-
-        Args:
-            value: The data to encode.
-
-        Returns:
-            The encoded data.
-        """
-        ...
-
-    @classmethod
-    def get_json_format(cls) -> str:
-        """Get the JSON format for the encoded data.
-
-        Returns:
-            The JSON format for the encoded data.
-        """
-        ...
-
-
-class Base64Encoder(EncoderProtocol):
-    """Standard (non-URL-safe) Base64 encoder."""
-
-    @classmethod
-    def decode(cls, data: bytes) -> bytes:
-        """Decode the data from base64 encoded bytes to original bytes data.
-
-        Args:
-            data: The data to decode.
-
-        Returns:
-            The decoded data.
-        """
-        try:
-            return base64.decodebytes(data)
-        except ValueError as e:
-            raise PydanticCustomError('base64_decode', "Base64 decoding error: '{error}'", {'error': str(e)})
-
-    @classmethod
-    def encode(cls, value: bytes) -> bytes:
-        """Encode the data from bytes to a base64 encoded bytes.
-
-        Args:
-            value: The data to encode.
-
-        Returns:
-            The encoded data.
-        """
-        return base64.encodebytes(value)
-
-    @classmethod
-    def get_json_format(cls) -> Literal['base64']:
-        """Get the JSON format for the encoded data.
-
-        Returns:
-            The JSON format for the encoded data.
-        """
-        return 'base64'
-
-
-class Base64UrlEncoder(EncoderProtocol):
-    """URL-safe Base64 encoder."""
-
-    @classmethod
-    def decode(cls, data: bytes) -> bytes:
-        """Decode the data from base64 encoded bytes to original bytes data.
-
-        Args:
-            data: The data to decode.
-
-        Returns:
-            The decoded data.
-        """
-        try:
-            return base64.urlsafe_b64decode(data)
-        except ValueError as e:
-            raise PydanticCustomError('base64_decode', "Base64 decoding error: '{error}'", {'error': str(e)})
-
-    @classmethod
-    def encode(cls, value: bytes) -> bytes:
-        """Encode the data from bytes to a base64 encoded bytes.
-
-        Args:
-            value: The data to encode.
-
-        Returns:
-            The encoded data.
-        """
-        return base64.urlsafe_b64encode(value)
-
-    @classmethod
-    def get_json_format(cls) -> Literal['base64url']:
-        """Get the JSON format for the encoded data.
-
-        Returns:
-            The JSON format for the encoded data.
-        """
-        return 'base64url'
-
-
-@_dataclasses.dataclass(**_internal_dataclass.slots_true)
-class EncodedBytes:
-    """A bytes type that is encoded and decoded using the specified encoder.
-
-    `EncodedBytes` needs an encoder that implements `EncoderProtocol` to operate.
-
-    ```py
-    from typing_extensions import Annotated
-
-    from pydantic import BaseModel, EncodedBytes, EncoderProtocol, ValidationError
-
-    class MyEncoder(EncoderProtocol):
-        @classmethod
-        def decode(cls, data: bytes) -> bytes:
-            if data == b'**undecodable**':
-                raise ValueError('Cannot decode data')
-            return data[13:]
-
-        @classmethod
-        def encode(cls, value: bytes) -> bytes:
-            return b'**encoded**: ' + value
-
-        @classmethod
-        def get_json_format(cls) -> str:
-            return 'my-encoder'
-
-    MyEncodedBytes = Annotated[bytes, EncodedBytes(encoder=MyEncoder)]
-
-    class Model(BaseModel):
-        my_encoded_bytes: MyEncodedBytes
-
-    # Initialize the model with encoded data
-    m = Model(my_encoded_bytes=b'**encoded**: some bytes')
-
-    # Access decoded value
-    print(m.my_encoded_bytes)
-    #> b'some bytes'
-
-    # Serialize into the encoded form
-    print(m.model_dump())
-    #> {'my_encoded_bytes': b'**encoded**: some bytes'}
-
-    # Validate encoded data
-    try:
-        Model(my_encoded_bytes=b'**undecodable**')
-    except ValidationError as e:
-        print(e)
-        '''
-        1 validation error for Model
-        my_encoded_bytes
-          Value error, Cannot decode data [type=value_error, input_value=b'**undecodable**', input_type=bytes]
-        '''
-    ```
-    """
-
-    encoder: type[EncoderProtocol]
-
-    def __get_pydantic_json_schema__(
-        self, core_schema: core_schema.CoreSchema, handler: GetJsonSchemaHandler
-    ) -> JsonSchemaValue:
-        field_schema = handler(core_schema)
-        field_schema.update(type='string', format=self.encoder.get_json_format())
-        return field_schema
-
-    def __get_pydantic_core_schema__(self, source: type[Any], handler: GetCoreSchemaHandler) -> core_schema.CoreSchema:
-        return core_schema.with_info_after_validator_function(
-            function=self.decode,
-            schema=core_schema.bytes_schema(),
-            serialization=core_schema.plain_serializer_function_ser_schema(function=self.encode),
-        )
-
-    def decode(self, data: bytes, _: core_schema.ValidationInfo) -> bytes:
-        """Decode the data using the specified encoder.
-
-        Args:
-            data: The data to decode.
-
-        Returns:
-            The decoded data.
-        """
-        return self.encoder.decode(data)
-
-    def encode(self, value: bytes) -> bytes:
-        """Encode the data using the specified encoder.
-
-        Args:
-            value: The data to encode.
-
-        Returns:
-            The encoded data.
-        """
-        return self.encoder.encode(value)
-
-    def __hash__(self) -> int:
-        return hash(self.encoder)
-
-
-@_dataclasses.dataclass(**_internal_dataclass.slots_true)
-class EncodedStr(EncodedBytes):
-    """A str type that is encoded and decoded using the specified encoder.
-
-    `EncodedStr` needs an encoder that implements `EncoderProtocol` to operate.
-
-    ```py
-    from typing_extensions import Annotated
-
-    from pydantic import BaseModel, EncodedStr, EncoderProtocol, ValidationError
-
-    class MyEncoder(EncoderProtocol):
-        @classmethod
-        def decode(cls, data: bytes) -> bytes:
-            if data == b'**undecodable**':
-                raise ValueError('Cannot decode data')
-            return data[13:]
-
-        @classmethod
-        def encode(cls, value: bytes) -> bytes:
-            return b'**encoded**: ' + value
-
-        @classmethod
-        def get_json_format(cls) -> str:
-            return 'my-encoder'
-
-    MyEncodedStr = Annotated[str, EncodedStr(encoder=MyEncoder)]
-
-    class Model(BaseModel):
-        my_encoded_str: MyEncodedStr
-
-    # Initialize the model with encoded data
-    m = Model(my_encoded_str='**encoded**: some str')
-
-    # Access decoded value
-    print(m.my_encoded_str)
-    #> some str
-
-    # Serialize into the encoded form
-    print(m.model_dump())
-    #> {'my_encoded_str': '**encoded**: some str'}
-
-    # Validate encoded data
-    try:
-        Model(my_encoded_str='**undecodable**')
-    except ValidationError as e:
-        print(e)
-        '''
-        1 validation error for Model
-        my_encoded_str
-          Value error, Cannot decode data [type=value_error, input_value='**undecodable**', input_type=str]
-        '''
-    ```
-    """
-
-    def __get_pydantic_core_schema__(self, source: type[Any], handler: GetCoreSchemaHandler) -> core_schema.CoreSchema:
-        return core_schema.with_info_after_validator_function(
-            function=self.decode_str,
-            schema=super(EncodedStr, self).__get_pydantic_core_schema__(source=source, handler=handler),  # noqa: UP008
-            serialization=core_schema.plain_serializer_function_ser_schema(function=self.encode_str),
-        )
-
-    def decode_str(self, data: bytes, _: core_schema.ValidationInfo) -> str:
-        """Decode the data using the specified encoder.
-
-        Args:
-            data: The data to decode.
-
-        Returns:
-            The decoded data.
-        """
-        return data.decode()
-
-    def encode_str(self, value: str) -> str:
-        """Encode the data using the specified encoder.
-
-        Args:
-            value: The data to encode.
-
-        Returns:
-            The encoded data.
-        """
-        return super(EncodedStr, self).encode(value=value.encode()).decode()  # noqa: UP008
-
-    def __hash__(self) -> int:
-        return hash(self.encoder)
-
-
-Base64Bytes = Annotated[bytes, EncodedBytes(encoder=Base64Encoder)]
-"""A bytes type that is encoded and decoded using the standard (non-URL-safe) base64 encoder.
-
-Note:
-    Under the hood, `Base64Bytes` use standard library `base64.encodebytes` and `base64.decodebytes` functions.
-
-    As a result, attempting to decode url-safe base64 data using the `Base64Bytes` type may fail or produce an incorrect
-    decoding.
-
-```py
-from pydantic import Base64Bytes, BaseModel, ValidationError
-
-class Model(BaseModel):
-    base64_bytes: Base64Bytes
-
-# Initialize the model with base64 data
-m = Model(base64_bytes=b'VGhpcyBpcyB0aGUgd2F5')
-
-# Access decoded value
-print(m.base64_bytes)
-#> b'This is the way'
-
-# Serialize into the base64 form
-print(m.model_dump())
-#> {'base64_bytes': b'VGhpcyBpcyB0aGUgd2F5\n'}
-
-# Validate base64 data
-try:
-    print(Model(base64_bytes=b'undecodable').base64_bytes)
-except ValidationError as e:
-    print(e)
-    '''
-    1 validation error for Model
-    base64_bytes
-      Base64 decoding error: 'Incorrect padding' [type=base64_decode, input_value=b'undecodable', input_type=bytes]
-    '''
-```
-"""
-Base64Str = Annotated[str, EncodedStr(encoder=Base64Encoder)]
-"""A str type that is encoded and decoded using the standard (non-URL-safe) base64 encoder.
-
-Note:
-    Under the hood, `Base64Bytes` use standard library `base64.encodebytes` and `base64.decodebytes` functions.
-
-    As a result, attempting to decode url-safe base64 data using the `Base64Str` type may fail or produce an incorrect
-    decoding.
-
-```py
-from pydantic import Base64Str, BaseModel, ValidationError
-
-class Model(BaseModel):
-    base64_str: Base64Str
-
-# Initialize the model with base64 data
-m = Model(base64_str='VGhlc2UgYXJlbid0IHRoZSBkcm9pZHMgeW91J3JlIGxvb2tpbmcgZm9y')
-
-# Access decoded value
-print(m.base64_str)
-#> These aren't the droids you're looking for
-
-# Serialize into the base64 form
-print(m.model_dump())
-#> {'base64_str': 'VGhlc2UgYXJlbid0IHRoZSBkcm9pZHMgeW91J3JlIGxvb2tpbmcgZm9y\n'}
-
-# Validate base64 data
-try:
-    print(Model(base64_str='undecodable').base64_str)
-except ValidationError as e:
-    print(e)
-    '''
-    1 validation error for Model
-    base64_str
-      Base64 decoding error: 'Incorrect padding' [type=base64_decode, input_value='undecodable', input_type=str]
-    '''
-```
-"""
-Base64UrlBytes = Annotated[bytes, EncodedBytes(encoder=Base64UrlEncoder)]
-"""A bytes type that is encoded and decoded using the URL-safe base64 encoder.
-
-Note:
-    Under the hood, `Base64UrlBytes` use standard library `base64.urlsafe_b64encode` and `base64.urlsafe_b64decode`
-    functions.
-
-    As a result, the `Base64UrlBytes` type can be used to faithfully decode "vanilla" base64 data
-    (using `'+'` and `'/'`).
-
-```py
-from pydantic import Base64UrlBytes, BaseModel
-
-class Model(BaseModel):
-    base64url_bytes: Base64UrlBytes
-
-# Initialize the model with base64 data
-m = Model(base64url_bytes=b'SHc_dHc-TXc==')
-print(m)
-#> base64url_bytes=b'Hw?tw>Mw'
-```
-"""
-Base64UrlStr = Annotated[str, EncodedStr(encoder=Base64UrlEncoder)]
-"""A str type that is encoded and decoded using the URL-safe base64 encoder.
-
-Note:
-    Under the hood, `Base64UrlStr` use standard library `base64.urlsafe_b64encode` and `base64.urlsafe_b64decode`
-    functions.
-
-    As a result, the `Base64UrlStr` type can be used to faithfully decode "vanilla" base64 data (using `'+'` and `'/'`).
-
-```py
-from pydantic import Base64UrlStr, BaseModel
-
-class Model(BaseModel):
-    base64url_str: Base64UrlStr
-
-# Initialize the model with base64 data
-m = Model(base64url_str='SHc_dHc-TXc==')
-print(m)
-#> base64url_str='Hw?tw>Mw'
-```
-"""
-
-
-__getattr__ = getattr_migration(__name__)
-
-
-@_dataclasses.dataclass(**_internal_dataclass.slots_true)
-class GetPydanticSchema:
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/types/#using-getpydanticschema-to-reduce-boilerplate
-
-    A convenience class for creating an annotation that provides pydantic custom type hooks.
-
-    This class is intended to eliminate the need to create a custom "marker" which defines the
-     `__get_pydantic_core_schema__` and `__get_pydantic_json_schema__` custom hook methods.
-
-    For example, to have a field treated by type checkers as `int`, but by pydantic as `Any`, you can do:
-    ```python
-    from typing import Any
-
-    from typing_extensions import Annotated
-
-    from pydantic import BaseModel, GetPydanticSchema
-
-    HandleAsAny = GetPydanticSchema(lambda _s, h: h(Any))
-
-    class Model(BaseModel):
-        x: Annotated[int, HandleAsAny]  # pydantic sees `x: Any`
-
-    print(repr(Model(x='abc').x))
-    #> 'abc'
-    ```
-    """
-
-    get_pydantic_core_schema: Callable[[Any, GetCoreSchemaHandler], CoreSchema] | None = None
-    get_pydantic_json_schema: Callable[[Any, GetJsonSchemaHandler], JsonSchemaValue] | None = None
-
-    # Note: we may want to consider adding a convenience staticmethod `def for_type(type_: Any) -> GetPydanticSchema:`
-    #   which returns `GetPydanticSchema(lambda _s, h: h(type_))`
-
-    if not TYPE_CHECKING:
-        # We put `__getattr__` in a non-TYPE_CHECKING block because otherwise, mypy allows arbitrary attribute access
-
-        def __getattr__(self, item: str) -> Any:
-            """Use this rather than defining `__get_pydantic_core_schema__` etc. to reduce the number of nested calls."""
-            if item == '__get_pydantic_core_schema__' and self.get_pydantic_core_schema:
-                return self.get_pydantic_core_schema
-            elif item == '__get_pydantic_json_schema__' and self.get_pydantic_json_schema:
-                return self.get_pydantic_json_schema
-            else:
-                return object.__getattribute__(self, item)
-
-    __hash__ = object.__hash__
-
-
-@_dataclasses.dataclass(**_internal_dataclass.slots_true, frozen=True)
-class Tag:
-    """Provides a way to specify the expected tag to use for a case of a (callable) discriminated union.
-
-    Also provides a way to label a union case in error messages.
-
-    When using a callable `Discriminator`, attach a `Tag` to each case in the `Union` to specify the tag that
-    should be used to identify that case. For example, in the below example, the `Tag` is used to specify that
-    if `get_discriminator_value` returns `'apple'`, the input should be validated as an `ApplePie`, and if it
-    returns `'pumpkin'`, the input should be validated as a `PumpkinPie`.
-
-    The primary role of the `Tag` here is to map the return value from the callable `Discriminator` function to
-    the appropriate member of the `Union` in question.
-
-    ```py
-    from typing import Any, Union
-
-    from typing_extensions import Annotated, Literal
-
-    from pydantic import BaseModel, Discriminator, Tag
-
-    class Pie(BaseModel):
-        time_to_cook: int
-        num_ingredients: int
-
-    class ApplePie(Pie):
-        fruit: Literal['apple'] = 'apple'
-
-    class PumpkinPie(Pie):
-        filling: Literal['pumpkin'] = 'pumpkin'
-
-    def get_discriminator_value(v: Any) -> str:
-        if isinstance(v, dict):
-            return v.get('fruit', v.get('filling'))
-        return getattr(v, 'fruit', getattr(v, 'filling', None))
-
-    class ThanksgivingDinner(BaseModel):
-        dessert: Annotated[
-            Union[
-                Annotated[ApplePie, Tag('apple')],
-                Annotated[PumpkinPie, Tag('pumpkin')],
-            ],
-            Discriminator(get_discriminator_value),
-        ]
-
-    apple_variation = ThanksgivingDinner.model_validate(
-        {'dessert': {'fruit': 'apple', 'time_to_cook': 60, 'num_ingredients': 8}}
-    )
-    print(repr(apple_variation))
-    '''
-    ThanksgivingDinner(dessert=ApplePie(time_to_cook=60, num_ingredients=8, fruit='apple'))
-    '''
-
-    pumpkin_variation = ThanksgivingDinner.model_validate(
-        {
-            'dessert': {
-                'filling': 'pumpkin',
-                'time_to_cook': 40,
-                'num_ingredients': 6,
-            }
-        }
-    )
-    print(repr(pumpkin_variation))
-    '''
-    ThanksgivingDinner(dessert=PumpkinPie(time_to_cook=40, num_ingredients=6, filling='pumpkin'))
-    '''
-    ```
-
-    !!! note
-        You must specify a `Tag` for every case in a `Tag` that is associated with a
-        callable `Discriminator`. Failing to do so will result in a `PydanticUserError` with code
-        [`callable-discriminator-no-tag`](../errors/usage_errors.md#callable-discriminator-no-tag).
-
-    See the [Discriminated Unions] concepts docs for more details on how to use `Tag`s.
-
-    [Discriminated Unions]: ../concepts/unions.md#discriminated-unions
-    """
-
-    tag: str
-
-    def __get_pydantic_core_schema__(self, source_type: Any, handler: GetCoreSchemaHandler) -> CoreSchema:
-        schema = handler(source_type)
-        metadata = schema.setdefault('metadata', {})
-        assert isinstance(metadata, dict)
-        metadata[_core_utils.TAGGED_UNION_TAG_KEY] = self.tag
-        return schema
-
-
-@_dataclasses.dataclass(**_internal_dataclass.slots_true, frozen=True)
-class Discriminator:
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/unions/#discriminated-unions-with-callable-discriminator
-
-    Provides a way to use a custom callable as the way to extract the value of a union discriminator.
-
-    This allows you to get validation behavior like you'd get from `Field(discriminator=<field_name>)`,
-    but without needing to have a single shared field across all the union choices. This also makes it
-    possible to handle unions of models and primitive types with discriminated-union-style validation errors.
-    Finally, this allows you to use a custom callable as the way to identify which member of a union a value
-    belongs to, while still seeing all the performance benefits of a discriminated union.
-
-    Consider this example, which is much more performant with the use of `Discriminator` and thus a `TaggedUnion`
-    than it would be as a normal `Union`.
-
-    ```py
-    from typing import Any, Union
-
-    from typing_extensions import Annotated, Literal
-
-    from pydantic import BaseModel, Discriminator, Tag
-
-    class Pie(BaseModel):
-        time_to_cook: int
-        num_ingredients: int
-
-    class ApplePie(Pie):
-        fruit: Literal['apple'] = 'apple'
-
-    class PumpkinPie(Pie):
-        filling: Literal['pumpkin'] = 'pumpkin'
-
-    def get_discriminator_value(v: Any) -> str:
-        if isinstance(v, dict):
-            return v.get('fruit', v.get('filling'))
-        return getattr(v, 'fruit', getattr(v, 'filling', None))
-
-    class ThanksgivingDinner(BaseModel):
-        dessert: Annotated[
-            Union[
-                Annotated[ApplePie, Tag('apple')],
-                Annotated[PumpkinPie, Tag('pumpkin')],
-            ],
-            Discriminator(get_discriminator_value),
-        ]
-
-    apple_variation = ThanksgivingDinner.model_validate(
-        {'dessert': {'fruit': 'apple', 'time_to_cook': 60, 'num_ingredients': 8}}
-    )
-    print(repr(apple_variation))
-    '''
-    ThanksgivingDinner(dessert=ApplePie(time_to_cook=60, num_ingredients=8, fruit='apple'))
-    '''
-
-    pumpkin_variation = ThanksgivingDinner.model_validate(
-        {
-            'dessert': {
-                'filling': 'pumpkin',
-                'time_to_cook': 40,
-                'num_ingredients': 6,
-            }
-        }
-    )
-    print(repr(pumpkin_variation))
-    '''
-    ThanksgivingDinner(dessert=PumpkinPie(time_to_cook=40, num_ingredients=6, filling='pumpkin'))
-    '''
-    ```
-
-    See the [Discriminated Unions] concepts docs for more details on how to use `Discriminator`s.
-
-    [Discriminated Unions]: ../concepts/unions.md#discriminated-unions
-    """
-
-    discriminator: str | Callable[[Any], Hashable]
-    """The callable or field name for discriminating the type in a tagged union.
-
-    A `Callable` discriminator must extract the value of the discriminator from the input.
-    A `str` discriminator must be the name of a field to discriminate against.
-    """
-    custom_error_type: str | None = None
-    """Type to use in [custom errors](../errors/errors.md#custom-errors) replacing the standard discriminated union
-    validation errors.
-    """
-    custom_error_message: str | None = None
-    """Message to use in custom errors."""
-    custom_error_context: dict[str, int | str | float] | None = None
-    """Context to use in custom errors."""
-
-    def __get_pydantic_core_schema__(self, source_type: Any, handler: GetCoreSchemaHandler) -> CoreSchema:
-        origin = _typing_extra.get_origin(source_type)
-        if not origin or not _typing_extra.origin_is_union(origin):
-            raise TypeError(f'{type(self).__name__} must be used with a Union type, not {source_type}')
-
-        if isinstance(self.discriminator, str):
-            from pydantic import Field
-
-            return handler(Annotated[source_type, Field(discriminator=self.discriminator)])
-        else:
-            original_schema = handler(source_type)
-            return self._convert_schema(original_schema)
-
-    def _convert_schema(self, original_schema: core_schema.CoreSchema) -> core_schema.TaggedUnionSchema:
-        if original_schema['type'] != 'union':
-            # This likely indicates that the schema was a single-item union that was simplified.
-            # In this case, we do the same thing we do in
-            # `pydantic._internal._discriminated_union._ApplyInferredDiscriminator._apply_to_root`, namely,
-            # package the generated schema back into a single-item union.
-            original_schema = core_schema.union_schema([original_schema])
-
-        tagged_union_choices = {}
-        for i, choice in enumerate(original_schema['choices']):
-            tag = None
-            if isinstance(choice, tuple):
-                choice, tag = choice
-            metadata = choice.get('metadata')
-            if metadata is not None:
-                metadata_tag = metadata.get(_core_utils.TAGGED_UNION_TAG_KEY)
-                if metadata_tag is not None:
-                    tag = metadata_tag
-            if tag is None:
-                raise PydanticUserError(
-                    f'`Tag` not provided for choice {choice} used with `Discriminator`',
-                    code='callable-discriminator-no-tag',
-                )
-            tagged_union_choices[tag] = choice
-
-        # Have to do these verbose checks to ensure falsy values ('' and {}) don't get ignored
-        custom_error_type = self.custom_error_type
-        if custom_error_type is None:
-            custom_error_type = original_schema.get('custom_error_type')
-
-        custom_error_message = self.custom_error_message
-        if custom_error_message is None:
-            custom_error_message = original_schema.get('custom_error_message')
-
-        custom_error_context = self.custom_error_context
-        if custom_error_context is None:
-            custom_error_context = original_schema.get('custom_error_context')
-
-        custom_error_type = original_schema.get('custom_error_type') if custom_error_type is None else custom_error_type
-        return core_schema.tagged_union_schema(
-            tagged_union_choices,
-            self.discriminator,
-            custom_error_type=custom_error_type,
-            custom_error_message=custom_error_message,
-            custom_error_context=custom_error_context,
-            strict=original_schema.get('strict'),
-            ref=original_schema.get('ref'),
-            metadata=original_schema.get('metadata'),
-            serialization=original_schema.get('serialization'),
-        )
-
-
-_JSON_TYPES = {int, float, str, bool, list, dict, type(None)}
-
-
-def _get_type_name(x: Any) -> str:
-    type_ = type(x)
-    if type_ in _JSON_TYPES:
-        return type_.__name__
-
-    # Handle proper subclasses; note we don't need to handle None or bool here
-    if isinstance(x, int):
-        return 'int'
-    if isinstance(x, float):
-        return 'float'
-    if isinstance(x, str):
-        return 'str'
-    if isinstance(x, list):
-        return 'list'
-    if isinstance(x, dict):
-        return 'dict'
-
-    # Fail by returning the type's actual name
-    return getattr(type_, '__name__', '<no type name>')
-
-
-class _AllowAnyJson:
-    @classmethod
-    def __get_pydantic_core_schema__(cls, source_type: Any, handler: GetCoreSchemaHandler) -> CoreSchema:
-        python_schema = handler(source_type)
-        return core_schema.json_or_python_schema(json_schema=core_schema.any_schema(), python_schema=python_schema)
-
-
-if TYPE_CHECKING:
-    # This seems to only be necessary for mypy
-    JsonValue: TypeAlias = Union[
-        List['JsonValue'],
-        Dict[str, 'JsonValue'],
-        str,
-        bool,
-        int,
-        float,
-        None,
-    ]
-    """A `JsonValue` is used to represent a value that can be serialized to JSON.
-
-    It may be one of:
-
-    * `List['JsonValue']`
-    * `Dict[str, 'JsonValue']`
-    * `str`
-    * `bool`
-    * `int`
-    * `float`
-    * `None`
-
-    The following example demonstrates how to use `JsonValue` to validate JSON data,
-    and what kind of errors to expect when input data is not json serializable.
-
-    ```py
-    import json
-
-    from pydantic import BaseModel, JsonValue, ValidationError
-
-    class Model(BaseModel):
-        j: JsonValue
-
-    valid_json_data = {'j': {'a': {'b': {'c': 1, 'd': [2, None]}}}}
-    invalid_json_data = {'j': {'a': {'b': ...}}}
-
-    print(repr(Model.model_validate(valid_json_data)))
-    #> Model(j={'a': {'b': {'c': 1, 'd': [2, None]}}})
-    print(repr(Model.model_validate_json(json.dumps(valid_json_data))))
-    #> Model(j={'a': {'b': {'c': 1, 'd': [2, None]}}})
-
-    try:
-        Model.model_validate(invalid_json_data)
-    except ValidationError as e:
-        print(e)
-        '''
-        1 validation error for Model
-        j.dict.a.dict.b
-          input was not a valid JSON value [type=invalid-json-value, input_value=Ellipsis, input_type=ellipsis]
-        '''
-    ```
-    """
-
-else:
-    JsonValue = TypeAliasType(
-        'JsonValue',
-        Annotated[
-            Union[
-                Annotated[List['JsonValue'], Tag('list')],
-                Annotated[Dict[str, 'JsonValue'], Tag('dict')],
-                Annotated[str, Tag('str')],
-                Annotated[bool, Tag('bool')],
-                Annotated[int, Tag('int')],
-                Annotated[float, Tag('float')],
-                Annotated[None, Tag('NoneType')],
-            ],
-            Discriminator(
-                _get_type_name,
-                custom_error_type='invalid-json-value',
-                custom_error_message='input was not a valid JSON value',
-            ),
-            _AllowAnyJson,
-        ],
-    )
-
-
-class _OnErrorOmit:
-    @classmethod
-    def __get_pydantic_core_schema__(cls, source_type: Any, handler: GetCoreSchemaHandler) -> CoreSchema:
-        # there is no actual default value here but we use with_default_schema since it already has the on_error
-        # behavior implemented and it would be no more efficient to implement it on every other validator
-        # or as a standalone validator
-        return core_schema.with_default_schema(schema=handler(source_type), on_error='omit')
-
-
-OnErrorOmit = Annotated[T, _OnErrorOmit]
-"""
-When used as an item in a list, the key type in a dict, optional values of a TypedDict, etc.
-this annotation omits the item from the iteration if there is any error validating it.
-That is, instead of a [`ValidationError`][pydantic_core.ValidationError] being propagated up and the entire iterable being discarded
-any invalid items are discarded and the valid ones are returned.
-"""
diff --git a/lib/pydantic/typing.py b/lib/pydantic/typing.py
deleted file mode 100644
index f1b32ba2..00000000
--- a/lib/pydantic/typing.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""`typing` module is a backport module from V1."""
-from ._migration import getattr_migration
-
-__getattr__ = getattr_migration(__name__)
diff --git a/lib/pydantic/utils.py b/lib/pydantic/utils.py
deleted file mode 100644
index 1619d1db..00000000
--- a/lib/pydantic/utils.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""The `utils` module is a backport module from V1."""
-from ._migration import getattr_migration
-
-__getattr__ = getattr_migration(__name__)
diff --git a/lib/pydantic/v1/__init__.py b/lib/pydantic/v1/__init__.py
deleted file mode 100644
index 3bf1418f..00000000
--- a/lib/pydantic/v1/__init__.py
+++ /dev/null
@@ -1,131 +0,0 @@
-# flake8: noqa
-from . import dataclasses
-from .annotated_types import create_model_from_namedtuple, create_model_from_typeddict
-from .class_validators import root_validator, validator
-from .config import BaseConfig, ConfigDict, Extra
-from .decorator import validate_arguments
-from .env_settings import BaseSettings
-from .error_wrappers import ValidationError
-from .errors import *
-from .fields import Field, PrivateAttr, Required
-from .main import *
-from .networks import *
-from .parse import Protocol
-from .tools import *
-from .types import *
-from .version import VERSION, compiled
-
-__version__ = VERSION
-
-# WARNING __all__ from .errors is not included here, it will be removed as an export here in v2
-# please use "from pydantic.errors import ..." instead
-__all__ = [
-    # annotated types utils
-    'create_model_from_namedtuple',
-    'create_model_from_typeddict',
-    # dataclasses
-    'dataclasses',
-    # class_validators
-    'root_validator',
-    'validator',
-    # config
-    'BaseConfig',
-    'ConfigDict',
-    'Extra',
-    # decorator
-    'validate_arguments',
-    # env_settings
-    'BaseSettings',
-    # error_wrappers
-    'ValidationError',
-    # fields
-    'Field',
-    'Required',
-    # main
-    'BaseModel',
-    'create_model',
-    'validate_model',
-    # network
-    'AnyUrl',
-    'AnyHttpUrl',
-    'FileUrl',
-    'HttpUrl',
-    'stricturl',
-    'EmailStr',
-    'NameEmail',
-    'IPvAnyAddress',
-    'IPvAnyInterface',
-    'IPvAnyNetwork',
-    'PostgresDsn',
-    'CockroachDsn',
-    'AmqpDsn',
-    'RedisDsn',
-    'MongoDsn',
-    'KafkaDsn',
-    'validate_email',
-    # parse
-    'Protocol',
-    # tools
-    'parse_file_as',
-    'parse_obj_as',
-    'parse_raw_as',
-    'schema_of',
-    'schema_json_of',
-    # types
-    'NoneStr',
-    'NoneBytes',
-    'StrBytes',
-    'NoneStrBytes',
-    'StrictStr',
-    'ConstrainedBytes',
-    'conbytes',
-    'ConstrainedList',
-    'conlist',
-    'ConstrainedSet',
-    'conset',
-    'ConstrainedFrozenSet',
-    'confrozenset',
-    'ConstrainedStr',
-    'constr',
-    'PyObject',
-    'ConstrainedInt',
-    'conint',
-    'PositiveInt',
-    'NegativeInt',
-    'NonNegativeInt',
-    'NonPositiveInt',
-    'ConstrainedFloat',
-    'confloat',
-    'PositiveFloat',
-    'NegativeFloat',
-    'NonNegativeFloat',
-    'NonPositiveFloat',
-    'FiniteFloat',
-    'ConstrainedDecimal',
-    'condecimal',
-    'ConstrainedDate',
-    'condate',
-    'UUID1',
-    'UUID3',
-    'UUID4',
-    'UUID5',
-    'FilePath',
-    'DirectoryPath',
-    'Json',
-    'JsonWrapper',
-    'SecretField',
-    'SecretStr',
-    'SecretBytes',
-    'StrictBool',
-    'StrictBytes',
-    'StrictInt',
-    'StrictFloat',
-    'PaymentCardNumber',
-    'PrivateAttr',
-    'ByteSize',
-    'PastDate',
-    'FutureDate',
-    # version
-    'compiled',
-    'VERSION',
-]
diff --git a/lib/pydantic/v1/_hypothesis_plugin.py b/lib/pydantic/v1/_hypothesis_plugin.py
deleted file mode 100644
index 0c529620..00000000
--- a/lib/pydantic/v1/_hypothesis_plugin.py
+++ /dev/null
@@ -1,391 +0,0 @@
-"""
-Register Hypothesis strategies for Pydantic custom types.
-
-This enables fully-automatic generation of test data for most Pydantic classes.
-
-Note that this module has *no* runtime impact on Pydantic itself; instead it
-is registered as a setuptools entry point and Hypothesis will import it if
-Pydantic is installed.  See also:
-
-https://hypothesis.readthedocs.io/en/latest/strategies.html#registering-strategies-via-setuptools-entry-points
-https://hypothesis.readthedocs.io/en/latest/data.html#hypothesis.strategies.register_type_strategy
-https://hypothesis.readthedocs.io/en/latest/strategies.html#interaction-with-pytest-cov
-https://docs.pydantic.dev/usage/types/#pydantic-types
-
-Note that because our motivation is to *improve user experience*, the strategies
-are always sound (never generate invalid data) but sacrifice completeness for
-maintainability (ie may be unable to generate some tricky but valid data).
-
-Finally, this module makes liberal use of `# type: ignore[<code>]` pragmas.
-This is because Hypothesis annotates `register_type_strategy()` with
-`(T, SearchStrategy[T])`, but in most cases we register e.g. `ConstrainedInt`
-to generate instances of the builtin `int` type which match the constraints.
-"""
-
-import contextlib
-import datetime
-import ipaddress
-import json
-import math
-from fractions import Fraction
-from typing import Callable, Dict, Type, Union, cast, overload
-
-import hypothesis.strategies as st
-
-import pydantic
-import pydantic.color
-import pydantic.types
-from pydantic.utils import lenient_issubclass
-
-# FilePath and DirectoryPath are explicitly unsupported, as we'd have to create
-# them on-disk, and that's unsafe in general without being told *where* to do so.
-#
-# URLs are unsupported because it's easy for users to define their own strategy for
-# "normal" URLs, and hard for us to define a general strategy which includes "weird"
-# URLs but doesn't also have unpredictable performance problems.
-#
-# conlist() and conset() are unsupported for now, because the workarounds for
-# Cython and Hypothesis to handle parametrized generic types are incompatible.
-# We are rethinking Hypothesis compatibility in Pydantic v2.
-
-# Emails
-try:
-    import email_validator
-except ImportError:  # pragma: no cover
-    pass
-else:
-
-    def is_valid_email(s: str) -> bool:
-        # Hypothesis' st.emails() occasionally generates emails like 0@A0--0.ac
-        # that are invalid according to email-validator, so we filter those out.
-        try:
-            email_validator.validate_email(s, check_deliverability=False)
-            return True
-        except email_validator.EmailNotValidError:  # pragma: no cover
-            return False
-
-    # Note that these strategies deliberately stay away from any tricky Unicode
-    # or other encoding issues; we're just trying to generate *something* valid.
-    st.register_type_strategy(pydantic.EmailStr, st.emails().filter(is_valid_email))  # type: ignore[arg-type]
-    st.register_type_strategy(
-        pydantic.NameEmail,
-        st.builds(
-            '{} <{}>'.format,  # type: ignore[arg-type]
-            st.from_regex('[A-Za-z0-9_]+( [A-Za-z0-9_]+){0,5}', fullmatch=True),
-            st.emails().filter(is_valid_email),
-        ),
-    )
-
-# PyObject - dotted names, in this case taken from the math module.
-st.register_type_strategy(
-    pydantic.PyObject,  # type: ignore[arg-type]
-    st.sampled_from(
-        [cast(pydantic.PyObject, f'math.{name}') for name in sorted(vars(math)) if not name.startswith('_')]
-    ),
-)
-
-# CSS3 Colors; as name, hex, rgb(a) tuples or strings, or hsl strings
-_color_regexes = (
-    '|'.join(
-        (
-            pydantic.color.r_hex_short,
-            pydantic.color.r_hex_long,
-            pydantic.color.r_rgb,
-            pydantic.color.r_rgba,
-            pydantic.color.r_hsl,
-            pydantic.color.r_hsla,
-        )
-    )
-    # Use more precise regex patterns to avoid value-out-of-range errors
-    .replace(pydantic.color._r_sl, r'(?:(\d\d?(?:\.\d+)?|100(?:\.0+)?)%)')
-    .replace(pydantic.color._r_alpha, r'(?:(0(?:\.\d+)?|1(?:\.0+)?|\.\d+|\d{1,2}%))')
-    .replace(pydantic.color._r_255, r'(?:((?:\d|\d\d|[01]\d\d|2[0-4]\d|25[0-4])(?:\.\d+)?|255(?:\.0+)?))')
-)
-st.register_type_strategy(
-    pydantic.color.Color,
-    st.one_of(
-        st.sampled_from(sorted(pydantic.color.COLORS_BY_NAME)),
-        st.tuples(
-            st.integers(0, 255),
-            st.integers(0, 255),
-            st.integers(0, 255),
-            st.none() | st.floats(0, 1) | st.floats(0, 100).map('{}%'.format),
-        ),
-        st.from_regex(_color_regexes, fullmatch=True),
-    ),
-)
-
-
-# Card numbers, valid according to the Luhn algorithm
-
-
-def add_luhn_digit(card_number: str) -> str:
-    # See https://en.wikipedia.org/wiki/Luhn_algorithm
-    for digit in '0123456789':
-        with contextlib.suppress(Exception):
-            pydantic.PaymentCardNumber.validate_luhn_check_digit(card_number + digit)
-            return card_number + digit
-    raise AssertionError('Unreachable')  # pragma: no cover
-
-
-card_patterns = (
-    # Note that these patterns omit the Luhn check digit; that's added by the function above
-    '4[0-9]{14}',  # Visa
-    '5[12345][0-9]{13}',  # Mastercard
-    '3[47][0-9]{12}',  # American Express
-    '[0-26-9][0-9]{10,17}',  # other (incomplete to avoid overlap)
-)
-st.register_type_strategy(
-    pydantic.PaymentCardNumber,
-    st.from_regex('|'.join(card_patterns), fullmatch=True).map(add_luhn_digit),  # type: ignore[arg-type]
-)
-
-# UUIDs
-st.register_type_strategy(pydantic.UUID1, st.uuids(version=1))
-st.register_type_strategy(pydantic.UUID3, st.uuids(version=3))
-st.register_type_strategy(pydantic.UUID4, st.uuids(version=4))
-st.register_type_strategy(pydantic.UUID5, st.uuids(version=5))
-
-# Secrets
-st.register_type_strategy(pydantic.SecretBytes, st.binary().map(pydantic.SecretBytes))
-st.register_type_strategy(pydantic.SecretStr, st.text().map(pydantic.SecretStr))
-
-# IP addresses, networks, and interfaces
-st.register_type_strategy(pydantic.IPvAnyAddress, st.ip_addresses())  # type: ignore[arg-type]
-st.register_type_strategy(
-    pydantic.IPvAnyInterface,
-    st.from_type(ipaddress.IPv4Interface) | st.from_type(ipaddress.IPv6Interface),  # type: ignore[arg-type]
-)
-st.register_type_strategy(
-    pydantic.IPvAnyNetwork,
-    st.from_type(ipaddress.IPv4Network) | st.from_type(ipaddress.IPv6Network),  # type: ignore[arg-type]
-)
-
-# We hook into the con***() functions and the ConstrainedNumberMeta metaclass,
-# so here we only have to register subclasses for other constrained types which
-# don't go via those mechanisms.  Then there are the registration hooks below.
-st.register_type_strategy(pydantic.StrictBool, st.booleans())
-st.register_type_strategy(pydantic.StrictStr, st.text())
-
-
-# FutureDate, PastDate
-st.register_type_strategy(pydantic.FutureDate, st.dates(min_value=datetime.date.today() + datetime.timedelta(days=1)))
-st.register_type_strategy(pydantic.PastDate, st.dates(max_value=datetime.date.today() - datetime.timedelta(days=1)))
-
-
-# Constrained-type resolver functions
-#
-# For these ones, we actually want to inspect the type in order to work out a
-# satisfying strategy.  First up, the machinery for tracking resolver functions:
-
-RESOLVERS: Dict[type, Callable[[type], st.SearchStrategy]] = {}  # type: ignore[type-arg]
-
-
-@overload
-def _registered(typ: Type[pydantic.types.T]) -> Type[pydantic.types.T]:
-    pass
-
-
-@overload
-def _registered(typ: pydantic.types.ConstrainedNumberMeta) -> pydantic.types.ConstrainedNumberMeta:
-    pass
-
-
-def _registered(
-    typ: Union[Type[pydantic.types.T], pydantic.types.ConstrainedNumberMeta]
-) -> Union[Type[pydantic.types.T], pydantic.types.ConstrainedNumberMeta]:
-    # This function replaces the version in `pydantic.types`, in order to
-    # effect the registration of new constrained types so that Hypothesis
-    # can generate valid examples.
-    pydantic.types._DEFINED_TYPES.add(typ)
-    for supertype, resolver in RESOLVERS.items():
-        if issubclass(typ, supertype):
-            st.register_type_strategy(typ, resolver(typ))  # type: ignore
-            return typ
-    raise NotImplementedError(f'Unknown type {typ!r} has no resolver to register')  # pragma: no cover
-
-
-def resolves(
-    typ: Union[type, pydantic.types.ConstrainedNumberMeta]
-) -> Callable[[Callable[..., st.SearchStrategy]], Callable[..., st.SearchStrategy]]:  # type: ignore[type-arg]
-    def inner(f):  # type: ignore
-        assert f not in RESOLVERS
-        RESOLVERS[typ] = f
-        return f
-
-    return inner
-
-
-# Type-to-strategy resolver functions
-
-
-@resolves(pydantic.JsonWrapper)
-def resolve_json(cls):  # type: ignore[no-untyped-def]
-    try:
-        inner = st.none() if cls.inner_type is None else st.from_type(cls.inner_type)
-    except Exception:  # pragma: no cover
-        finite = st.floats(allow_infinity=False, allow_nan=False)
-        inner = st.recursive(
-            base=st.one_of(st.none(), st.booleans(), st.integers(), finite, st.text()),
-            extend=lambda x: st.lists(x) | st.dictionaries(st.text(), x),  # type: ignore
-        )
-    inner_type = getattr(cls, 'inner_type', None)
-    return st.builds(
-        cls.inner_type.json if lenient_issubclass(inner_type, pydantic.BaseModel) else json.dumps,
-        inner,
-        ensure_ascii=st.booleans(),
-        indent=st.none() | st.integers(0, 16),
-        sort_keys=st.booleans(),
-    )
-
-
-@resolves(pydantic.ConstrainedBytes)
-def resolve_conbytes(cls):  # type: ignore[no-untyped-def]  # pragma: no cover
-    min_size = cls.min_length or 0
-    max_size = cls.max_length
-    if not cls.strip_whitespace:
-        return st.binary(min_size=min_size, max_size=max_size)
-    # Fun with regex to ensure we neither start nor end with whitespace
-    repeats = '{{{},{}}}'.format(
-        min_size - 2 if min_size > 2 else 0,
-        max_size - 2 if (max_size or 0) > 2 else '',
-    )
-    if min_size >= 2:
-        pattern = rf'\W.{repeats}\W'
-    elif min_size == 1:
-        pattern = rf'\W(.{repeats}\W)?'
-    else:
-        assert min_size == 0
-        pattern = rf'(\W(.{repeats}\W)?)?'
-    return st.from_regex(pattern.encode(), fullmatch=True)
-
-
-@resolves(pydantic.ConstrainedDecimal)
-def resolve_condecimal(cls):  # type: ignore[no-untyped-def]
-    min_value = cls.ge
-    max_value = cls.le
-    if cls.gt is not None:
-        assert min_value is None, 'Set `gt` or `ge`, but not both'
-        min_value = cls.gt
-    if cls.lt is not None:
-        assert max_value is None, 'Set `lt` or `le`, but not both'
-        max_value = cls.lt
-    s = st.decimals(min_value, max_value, allow_nan=False, places=cls.decimal_places)
-    if cls.lt is not None:
-        s = s.filter(lambda d: d < cls.lt)
-    if cls.gt is not None:
-        s = s.filter(lambda d: cls.gt < d)
-    return s
-
-
-@resolves(pydantic.ConstrainedFloat)
-def resolve_confloat(cls):  # type: ignore[no-untyped-def]
-    min_value = cls.ge
-    max_value = cls.le
-    exclude_min = False
-    exclude_max = False
-
-    if cls.gt is not None:
-        assert min_value is None, 'Set `gt` or `ge`, but not both'
-        min_value = cls.gt
-        exclude_min = True
-    if cls.lt is not None:
-        assert max_value is None, 'Set `lt` or `le`, but not both'
-        max_value = cls.lt
-        exclude_max = True
-
-    if cls.multiple_of is None:
-        return st.floats(min_value, max_value, exclude_min=exclude_min, exclude_max=exclude_max, allow_nan=False)
-
-    if min_value is not None:
-        min_value = math.ceil(min_value / cls.multiple_of)
-        if exclude_min:
-            min_value = min_value + 1
-    if max_value is not None:
-        assert max_value >= cls.multiple_of, 'Cannot build model with max value smaller than multiple of'
-        max_value = math.floor(max_value / cls.multiple_of)
-        if exclude_max:
-            max_value = max_value - 1
-
-    return st.integers(min_value, max_value).map(lambda x: x * cls.multiple_of)
-
-
-@resolves(pydantic.ConstrainedInt)
-def resolve_conint(cls):  # type: ignore[no-untyped-def]
-    min_value = cls.ge
-    max_value = cls.le
-    if cls.gt is not None:
-        assert min_value is None, 'Set `gt` or `ge`, but not both'
-        min_value = cls.gt + 1
-    if cls.lt is not None:
-        assert max_value is None, 'Set `lt` or `le`, but not both'
-        max_value = cls.lt - 1
-
-    if cls.multiple_of is None or cls.multiple_of == 1:
-        return st.integers(min_value, max_value)
-
-    # These adjustments and the .map handle integer-valued multiples, while the
-    # .filter handles trickier cases as for confloat.
-    if min_value is not None:
-        min_value = math.ceil(Fraction(min_value) / Fraction(cls.multiple_of))
-    if max_value is not None:
-        max_value = math.floor(Fraction(max_value) / Fraction(cls.multiple_of))
-    return st.integers(min_value, max_value).map(lambda x: x * cls.multiple_of)
-
-
-@resolves(pydantic.ConstrainedDate)
-def resolve_condate(cls):  # type: ignore[no-untyped-def]
-    if cls.ge is not None:
-        assert cls.gt is None, 'Set `gt` or `ge`, but not both'
-        min_value = cls.ge
-    elif cls.gt is not None:
-        min_value = cls.gt + datetime.timedelta(days=1)
-    else:
-        min_value = datetime.date.min
-    if cls.le is not None:
-        assert cls.lt is None, 'Set `lt` or `le`, but not both'
-        max_value = cls.le
-    elif cls.lt is not None:
-        max_value = cls.lt - datetime.timedelta(days=1)
-    else:
-        max_value = datetime.date.max
-    return st.dates(min_value, max_value)
-
-
-@resolves(pydantic.ConstrainedStr)
-def resolve_constr(cls):  # type: ignore[no-untyped-def]  # pragma: no cover
-    min_size = cls.min_length or 0
-    max_size = cls.max_length
-
-    if cls.regex is None and not cls.strip_whitespace:
-        return st.text(min_size=min_size, max_size=max_size)
-
-    if cls.regex is not None:
-        strategy = st.from_regex(cls.regex)
-        if cls.strip_whitespace:
-            strategy = strategy.filter(lambda s: s == s.strip())
-    elif cls.strip_whitespace:
-        repeats = '{{{},{}}}'.format(
-            min_size - 2 if min_size > 2 else 0,
-            max_size - 2 if (max_size or 0) > 2 else '',
-        )
-        if min_size >= 2:
-            strategy = st.from_regex(rf'\W.{repeats}\W')
-        elif min_size == 1:
-            strategy = st.from_regex(rf'\W(.{repeats}\W)?')
-        else:
-            assert min_size == 0
-            strategy = st.from_regex(rf'(\W(.{repeats}\W)?)?')
-
-    if min_size == 0 and max_size is None:
-        return strategy
-    elif max_size is None:
-        return strategy.filter(lambda s: min_size <= len(s))
-    return strategy.filter(lambda s: min_size <= len(s) <= max_size)
-
-
-# Finally, register all previously-defined types, and patch in our new function
-for typ in list(pydantic.types._DEFINED_TYPES):
-    _registered(typ)
-pydantic.types._registered = _registered
-st.register_type_strategy(pydantic.Json, resolve_json)
diff --git a/lib/pydantic/v1/annotated_types.py b/lib/pydantic/v1/annotated_types.py
deleted file mode 100644
index d333457f..00000000
--- a/lib/pydantic/v1/annotated_types.py
+++ /dev/null
@@ -1,72 +0,0 @@
-import sys
-from typing import TYPE_CHECKING, Any, Dict, FrozenSet, NamedTuple, Type
-
-from .fields import Required
-from .main import BaseModel, create_model
-from .typing import is_typeddict, is_typeddict_special
-
-if TYPE_CHECKING:
-    from typing_extensions import TypedDict
-
-if sys.version_info < (3, 11):
-
-    def is_legacy_typeddict(typeddict_cls: Type['TypedDict']) -> bool:  # type: ignore[valid-type]
-        return is_typeddict(typeddict_cls) and type(typeddict_cls).__module__ == 'typing'
-
-else:
-
-    def is_legacy_typeddict(_: Any) -> Any:
-        return False
-
-
-def create_model_from_typeddict(
-    # Mypy bug: `Type[TypedDict]` is resolved as `Any` https://github.com/python/mypy/issues/11030
-    typeddict_cls: Type['TypedDict'],  # type: ignore[valid-type]
-    **kwargs: Any,
-) -> Type['BaseModel']:
-    """
-    Create a `BaseModel` based on the fields of a `TypedDict`.
-    Since `typing.TypedDict` in Python 3.8 does not store runtime information about optional keys,
-    we raise an error if this happens (see https://bugs.python.org/issue38834).
-    """
-    field_definitions: Dict[str, Any]
-
-    # Best case scenario: with python 3.9+ or when `TypedDict` is imported from `typing_extensions`
-    if not hasattr(typeddict_cls, '__required_keys__'):
-        raise TypeError(
-            'You should use `typing_extensions.TypedDict` instead of `typing.TypedDict` with Python < 3.9.2. '
-            'Without it, there is no way to differentiate required and optional fields when subclassed.'
-        )
-
-    if is_legacy_typeddict(typeddict_cls) and any(
-        is_typeddict_special(t) for t in typeddict_cls.__annotations__.values()
-    ):
-        raise TypeError(
-            'You should use `typing_extensions.TypedDict` instead of `typing.TypedDict` with Python < 3.11. '
-            'Without it, there is no way to reflect Required/NotRequired keys.'
-        )
-
-    required_keys: FrozenSet[str] = typeddict_cls.__required_keys__  # type: ignore[attr-defined]
-    field_definitions = {
-        field_name: (field_type, Required if field_name in required_keys else None)
-        for field_name, field_type in typeddict_cls.__annotations__.items()
-    }
-
-    return create_model(typeddict_cls.__name__, **kwargs, **field_definitions)
-
-
-def create_model_from_namedtuple(namedtuple_cls: Type['NamedTuple'], **kwargs: Any) -> Type['BaseModel']:
-    """
-    Create a `BaseModel` based on the fields of a named tuple.
-    A named tuple can be created with `typing.NamedTuple` and declared annotations
-    but also with `collections.namedtuple`, in this case we consider all fields
-    to have type `Any`.
-    """
-    # With python 3.10+, `__annotations__` always exists but can be empty hence the `getattr... or...` logic
-    namedtuple_annotations: Dict[str, Type[Any]] = getattr(namedtuple_cls, '__annotations__', None) or {
-        k: Any for k in namedtuple_cls._fields
-    }
-    field_definitions: Dict[str, Any] = {
-        field_name: (field_type, Required) for field_name, field_type in namedtuple_annotations.items()
-    }
-    return create_model(namedtuple_cls.__name__, **kwargs, **field_definitions)
diff --git a/lib/pydantic/v1/class_validators.py b/lib/pydantic/v1/class_validators.py
deleted file mode 100644
index 71e66509..00000000
--- a/lib/pydantic/v1/class_validators.py
+++ /dev/null
@@ -1,361 +0,0 @@
-import warnings
-from collections import ChainMap
-from functools import partial, partialmethod, wraps
-from itertools import chain
-from types import FunctionType
-from typing import TYPE_CHECKING, Any, Callable, Dict, Iterable, List, Optional, Set, Tuple, Type, Union, overload
-
-from .errors import ConfigError
-from .typing import AnyCallable
-from .utils import ROOT_KEY, in_ipython
-
-if TYPE_CHECKING:
-    from .typing import AnyClassMethod
-
-
-class Validator:
-    __slots__ = 'func', 'pre', 'each_item', 'always', 'check_fields', 'skip_on_failure'
-
-    def __init__(
-        self,
-        func: AnyCallable,
-        pre: bool = False,
-        each_item: bool = False,
-        always: bool = False,
-        check_fields: bool = False,
-        skip_on_failure: bool = False,
-    ):
-        self.func = func
-        self.pre = pre
-        self.each_item = each_item
-        self.always = always
-        self.check_fields = check_fields
-        self.skip_on_failure = skip_on_failure
-
-
-if TYPE_CHECKING:
-    from inspect import Signature
-
-    from .config import BaseConfig
-    from .fields import ModelField
-    from .types import ModelOrDc
-
-    ValidatorCallable = Callable[[Optional[ModelOrDc], Any, Dict[str, Any], ModelField, Type[BaseConfig]], Any]
-    ValidatorsList = List[ValidatorCallable]
-    ValidatorListDict = Dict[str, List[Validator]]
-
-_FUNCS: Set[str] = set()
-VALIDATOR_CONFIG_KEY = '__validator_config__'
-ROOT_VALIDATOR_CONFIG_KEY = '__root_validator_config__'
-
-
-def validator(
-    *fields: str,
-    pre: bool = False,
-    each_item: bool = False,
-    always: bool = False,
-    check_fields: bool = True,
-    whole: Optional[bool] = None,
-    allow_reuse: bool = False,
-) -> Callable[[AnyCallable], 'AnyClassMethod']:
-    """
-    Decorate methods on the class indicating that they should be used to validate fields
-    :param fields: which field(s) the method should be called on
-    :param pre: whether or not this validator should be called before the standard validators (else after)
-    :param each_item: for complex objects (sets, lists etc.) whether to validate individual elements rather than the
-      whole object
-    :param always: whether this method and other validators should be called even if the value is missing
-    :param check_fields: whether to check that the fields actually exist on the model
-    :param allow_reuse: whether to track and raise an error if another validator refers to the decorated function
-    """
-    if not fields:
-        raise ConfigError('validator with no fields specified')
-    elif isinstance(fields[0], FunctionType):
-        raise ConfigError(
-            "validators should be used with fields and keyword arguments, not bare. "  # noqa: Q000
-            "E.g. usage should be `@validator('<field_name>', ...)`"
-        )
-    elif not all(isinstance(field, str) for field in fields):
-        raise ConfigError(
-            "validator fields should be passed as separate string args. "  # noqa: Q000
-            "E.g. usage should be `@validator('<field_name_1>', '<field_name_2>', ...)`"
-        )
-
-    if whole is not None:
-        warnings.warn(
-            'The "whole" keyword argument is deprecated, use "each_item" (inverse meaning, default False) instead',
-            DeprecationWarning,
-        )
-        assert each_item is False, '"each_item" and "whole" conflict, remove "whole"'
-        each_item = not whole
-
-    def dec(f: AnyCallable) -> 'AnyClassMethod':
-        f_cls = _prepare_validator(f, allow_reuse)
-        setattr(
-            f_cls,
-            VALIDATOR_CONFIG_KEY,
-            (
-                fields,
-                Validator(func=f_cls.__func__, pre=pre, each_item=each_item, always=always, check_fields=check_fields),
-            ),
-        )
-        return f_cls
-
-    return dec
-
-
-@overload
-def root_validator(_func: AnyCallable) -> 'AnyClassMethod':
-    ...
-
-
-@overload
-def root_validator(
-    *, pre: bool = False, allow_reuse: bool = False, skip_on_failure: bool = False
-) -> Callable[[AnyCallable], 'AnyClassMethod']:
-    ...
-
-
-def root_validator(
-    _func: Optional[AnyCallable] = None, *, pre: bool = False, allow_reuse: bool = False, skip_on_failure: bool = False
-) -> Union['AnyClassMethod', Callable[[AnyCallable], 'AnyClassMethod']]:
-    """
-    Decorate methods on a model indicating that they should be used to validate (and perhaps modify) data either
-    before or after standard model parsing/validation is performed.
-    """
-    if _func:
-        f_cls = _prepare_validator(_func, allow_reuse)
-        setattr(
-            f_cls, ROOT_VALIDATOR_CONFIG_KEY, Validator(func=f_cls.__func__, pre=pre, skip_on_failure=skip_on_failure)
-        )
-        return f_cls
-
-    def dec(f: AnyCallable) -> 'AnyClassMethod':
-        f_cls = _prepare_validator(f, allow_reuse)
-        setattr(
-            f_cls, ROOT_VALIDATOR_CONFIG_KEY, Validator(func=f_cls.__func__, pre=pre, skip_on_failure=skip_on_failure)
-        )
-        return f_cls
-
-    return dec
-
-
-def _prepare_validator(function: AnyCallable, allow_reuse: bool) -> 'AnyClassMethod':
-    """
-    Avoid validators with duplicated names since without this, validators can be overwritten silently
-    which generally isn't the intended behaviour, don't run in ipython (see #312) or if allow_reuse is False.
-    """
-    f_cls = function if isinstance(function, classmethod) else classmethod(function)
-    if not in_ipython() and not allow_reuse:
-        ref = (
-            getattr(f_cls.__func__, '__module__', '<No __module__>')
-            + '.'
-            + getattr(f_cls.__func__, '__qualname__', f'<No __qualname__: id:{id(f_cls.__func__)}>')
-        )
-        if ref in _FUNCS:
-            raise ConfigError(f'duplicate validator function "{ref}"; if this is intended, set `allow_reuse=True`')
-        _FUNCS.add(ref)
-    return f_cls
-
-
-class ValidatorGroup:
-    def __init__(self, validators: 'ValidatorListDict') -> None:
-        self.validators = validators
-        self.used_validators = {'*'}
-
-    def get_validators(self, name: str) -> Optional[Dict[str, Validator]]:
-        self.used_validators.add(name)
-        validators = self.validators.get(name, [])
-        if name != ROOT_KEY:
-            validators += self.validators.get('*', [])
-        if validators:
-            return {getattr(v.func, '__name__', f'<No __name__: id:{id(v.func)}>'): v for v in validators}
-        else:
-            return None
-
-    def check_for_unused(self) -> None:
-        unused_validators = set(
-            chain.from_iterable(
-                (
-                    getattr(v.func, '__name__', f'<No __name__: id:{id(v.func)}>')
-                    for v in self.validators[f]
-                    if v.check_fields
-                )
-                for f in (self.validators.keys() - self.used_validators)
-            )
-        )
-        if unused_validators:
-            fn = ', '.join(unused_validators)
-            raise ConfigError(
-                f"Validators defined with incorrect fields: {fn} "  # noqa: Q000
-                f"(use check_fields=False if you're inheriting from the model and intended this)"
-            )
-
-
-def extract_validators(namespace: Dict[str, Any]) -> Dict[str, List[Validator]]:
-    validators: Dict[str, List[Validator]] = {}
-    for var_name, value in namespace.items():
-        validator_config = getattr(value, VALIDATOR_CONFIG_KEY, None)
-        if validator_config:
-            fields, v = validator_config
-            for field in fields:
-                if field in validators:
-                    validators[field].append(v)
-                else:
-                    validators[field] = [v]
-    return validators
-
-
-def extract_root_validators(namespace: Dict[str, Any]) -> Tuple[List[AnyCallable], List[Tuple[bool, AnyCallable]]]:
-    from inspect import signature
-
-    pre_validators: List[AnyCallable] = []
-    post_validators: List[Tuple[bool, AnyCallable]] = []
-    for name, value in namespace.items():
-        validator_config: Optional[Validator] = getattr(value, ROOT_VALIDATOR_CONFIG_KEY, None)
-        if validator_config:
-            sig = signature(validator_config.func)
-            args = list(sig.parameters.keys())
-            if args[0] == 'self':
-                raise ConfigError(
-                    f'Invalid signature for root validator {name}: {sig}, "self" not permitted as first argument, '
-                    f'should be: (cls, values).'
-                )
-            if len(args) != 2:
-                raise ConfigError(f'Invalid signature for root validator {name}: {sig}, should be: (cls, values).')
-            # check function signature
-            if validator_config.pre:
-                pre_validators.append(validator_config.func)
-            else:
-                post_validators.append((validator_config.skip_on_failure, validator_config.func))
-    return pre_validators, post_validators
-
-
-def inherit_validators(base_validators: 'ValidatorListDict', validators: 'ValidatorListDict') -> 'ValidatorListDict':
-    for field, field_validators in base_validators.items():
-        if field not in validators:
-            validators[field] = []
-        validators[field] += field_validators
-    return validators
-
-
-def make_generic_validator(validator: AnyCallable) -> 'ValidatorCallable':
-    """
-    Make a generic function which calls a validator with the right arguments.
-
-    Unfortunately other approaches (eg. return a partial of a function that builds the arguments) is slow,
-    hence this laborious way of doing things.
-
-    It's done like this so validators don't all need **kwargs in their signature, eg. any combination of
-    the arguments "values", "fields" and/or "config" are permitted.
-    """
-    from inspect import signature
-
-    if not isinstance(validator, (partial, partialmethod)):
-        # This should be the default case, so overhead is reduced
-        sig = signature(validator)
-        args = list(sig.parameters.keys())
-    else:
-        # Fix the generated argument lists of partial methods
-        sig = signature(validator.func)
-        args = [
-            k
-            for k in signature(validator.func).parameters.keys()
-            if k not in validator.args | validator.keywords.keys()
-        ]
-
-    first_arg = args.pop(0)
-    if first_arg == 'self':
-        raise ConfigError(
-            f'Invalid signature for validator {validator}: {sig}, "self" not permitted as first argument, '
-            f'should be: (cls, value, values, config, field), "values", "config" and "field" are all optional.'
-        )
-    elif first_arg == 'cls':
-        # assume the second argument is value
-        return wraps(validator)(_generic_validator_cls(validator, sig, set(args[1:])))
-    else:
-        # assume the first argument was value which has already been removed
-        return wraps(validator)(_generic_validator_basic(validator, sig, set(args)))
-
-
-def prep_validators(v_funcs: Iterable[AnyCallable]) -> 'ValidatorsList':
-    return [make_generic_validator(f) for f in v_funcs if f]
-
-
-all_kwargs = {'values', 'field', 'config'}
-
-
-def _generic_validator_cls(validator: AnyCallable, sig: 'Signature', args: Set[str]) -> 'ValidatorCallable':
-    # assume the first argument is value
-    has_kwargs = False
-    if 'kwargs' in args:
-        has_kwargs = True
-        args -= {'kwargs'}
-
-    if not args.issubset(all_kwargs):
-        raise ConfigError(
-            f'Invalid signature for validator {validator}: {sig}, should be: '
-            f'(cls, value, values, config, field), "values", "config" and "field" are all optional.'
-        )
-
-    if has_kwargs:
-        return lambda cls, v, values, field, config: validator(cls, v, values=values, field=field, config=config)
-    elif args == set():
-        return lambda cls, v, values, field, config: validator(cls, v)
-    elif args == {'values'}:
-        return lambda cls, v, values, field, config: validator(cls, v, values=values)
-    elif args == {'field'}:
-        return lambda cls, v, values, field, config: validator(cls, v, field=field)
-    elif args == {'config'}:
-        return lambda cls, v, values, field, config: validator(cls, v, config=config)
-    elif args == {'values', 'field'}:
-        return lambda cls, v, values, field, config: validator(cls, v, values=values, field=field)
-    elif args == {'values', 'config'}:
-        return lambda cls, v, values, field, config: validator(cls, v, values=values, config=config)
-    elif args == {'field', 'config'}:
-        return lambda cls, v, values, field, config: validator(cls, v, field=field, config=config)
-    else:
-        # args == {'values', 'field', 'config'}
-        return lambda cls, v, values, field, config: validator(cls, v, values=values, field=field, config=config)
-
-
-def _generic_validator_basic(validator: AnyCallable, sig: 'Signature', args: Set[str]) -> 'ValidatorCallable':
-    has_kwargs = False
-    if 'kwargs' in args:
-        has_kwargs = True
-        args -= {'kwargs'}
-
-    if not args.issubset(all_kwargs):
-        raise ConfigError(
-            f'Invalid signature for validator {validator}: {sig}, should be: '
-            f'(value, values, config, field), "values", "config" and "field" are all optional.'
-        )
-
-    if has_kwargs:
-        return lambda cls, v, values, field, config: validator(v, values=values, field=field, config=config)
-    elif args == set():
-        return lambda cls, v, values, field, config: validator(v)
-    elif args == {'values'}:
-        return lambda cls, v, values, field, config: validator(v, values=values)
-    elif args == {'field'}:
-        return lambda cls, v, values, field, config: validator(v, field=field)
-    elif args == {'config'}:
-        return lambda cls, v, values, field, config: validator(v, config=config)
-    elif args == {'values', 'field'}:
-        return lambda cls, v, values, field, config: validator(v, values=values, field=field)
-    elif args == {'values', 'config'}:
-        return lambda cls, v, values, field, config: validator(v, values=values, config=config)
-    elif args == {'field', 'config'}:
-        return lambda cls, v, values, field, config: validator(v, field=field, config=config)
-    else:
-        # args == {'values', 'field', 'config'}
-        return lambda cls, v, values, field, config: validator(v, values=values, field=field, config=config)
-
-
-def gather_all_validators(type_: 'ModelOrDc') -> Dict[str, 'AnyClassMethod']:
-    all_attributes = ChainMap(*[cls.__dict__ for cls in type_.__mro__])  # type: ignore[arg-type,var-annotated]
-    return {
-        k: v
-        for k, v in all_attributes.items()
-        if hasattr(v, VALIDATOR_CONFIG_KEY) or hasattr(v, ROOT_VALIDATOR_CONFIG_KEY)
-    }
diff --git a/lib/pydantic/v1/color.py b/lib/pydantic/v1/color.py
deleted file mode 100644
index 6fdc9fb1..00000000
--- a/lib/pydantic/v1/color.py
+++ /dev/null
@@ -1,494 +0,0 @@
-"""
-Color definitions are  used as per CSS3 specification:
-http://www.w3.org/TR/css3-color/#svg-color
-
-A few colors have multiple names referring to the sames colors, eg. `grey` and `gray` or `aqua` and `cyan`.
-
-In these cases the LAST color when sorted alphabetically takes preferences,
-eg. Color((0, 255, 255)).as_named() == 'cyan' because "cyan" comes after "aqua".
-"""
-import math
-import re
-from colorsys import hls_to_rgb, rgb_to_hls
-from typing import TYPE_CHECKING, Any, Dict, Optional, Tuple, Union, cast
-
-from .errors import ColorError
-from .utils import Representation, almost_equal_floats
-
-if TYPE_CHECKING:
-    from .typing import CallableGenerator, ReprArgs
-
-ColorTuple = Union[Tuple[int, int, int], Tuple[int, int, int, float]]
-ColorType = Union[ColorTuple, str]
-HslColorTuple = Union[Tuple[float, float, float], Tuple[float, float, float, float]]
-
-
-class RGBA:
-    """
-    Internal use only as a representation of a color.
-    """
-
-    __slots__ = 'r', 'g', 'b', 'alpha', '_tuple'
-
-    def __init__(self, r: float, g: float, b: float, alpha: Optional[float]):
-        self.r = r
-        self.g = g
-        self.b = b
-        self.alpha = alpha
-
-        self._tuple: Tuple[float, float, float, Optional[float]] = (r, g, b, alpha)
-
-    def __getitem__(self, item: Any) -> Any:
-        return self._tuple[item]
-
-
-# these are not compiled here to avoid import slowdown, they'll be compiled the first time they're used, then cached
-r_hex_short = r'\s*(?:#|0x)?([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])?\s*'
-r_hex_long = r'\s*(?:#|0x)?([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})?\s*'
-_r_255 = r'(\d{1,3}(?:\.\d+)?)'
-_r_comma = r'\s*,\s*'
-r_rgb = fr'\s*rgb\(\s*{_r_255}{_r_comma}{_r_255}{_r_comma}{_r_255}\)\s*'
-_r_alpha = r'(\d(?:\.\d+)?|\.\d+|\d{1,2}%)'
-r_rgba = fr'\s*rgba\(\s*{_r_255}{_r_comma}{_r_255}{_r_comma}{_r_255}{_r_comma}{_r_alpha}\s*\)\s*'
-_r_h = r'(-?\d+(?:\.\d+)?|-?\.\d+)(deg|rad|turn)?'
-_r_sl = r'(\d{1,3}(?:\.\d+)?)%'
-r_hsl = fr'\s*hsl\(\s*{_r_h}{_r_comma}{_r_sl}{_r_comma}{_r_sl}\s*\)\s*'
-r_hsla = fr'\s*hsl\(\s*{_r_h}{_r_comma}{_r_sl}{_r_comma}{_r_sl}{_r_comma}{_r_alpha}\s*\)\s*'
-
-# colors where the two hex characters are the same, if all colors match this the short version of hex colors can be used
-repeat_colors = {int(c * 2, 16) for c in '0123456789abcdef'}
-rads = 2 * math.pi
-
-
-class Color(Representation):
-    __slots__ = '_original', '_rgba'
-
-    def __init__(self, value: ColorType) -> None:
-        self._rgba: RGBA
-        self._original: ColorType
-        if isinstance(value, (tuple, list)):
-            self._rgba = parse_tuple(value)
-        elif isinstance(value, str):
-            self._rgba = parse_str(value)
-        elif isinstance(value, Color):
-            self._rgba = value._rgba
-            value = value._original
-        else:
-            raise ColorError(reason='value must be a tuple, list or string')
-
-        # if we've got here value must be a valid color
-        self._original = value
-
-    @classmethod
-    def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
-        field_schema.update(type='string', format='color')
-
-    def original(self) -> ColorType:
-        """
-        Original value passed to Color
-        """
-        return self._original
-
-    def as_named(self, *, fallback: bool = False) -> str:
-        if self._rgba.alpha is None:
-            rgb = cast(Tuple[int, int, int], self.as_rgb_tuple())
-            try:
-                return COLORS_BY_VALUE[rgb]
-            except KeyError as e:
-                if fallback:
-                    return self.as_hex()
-                else:
-                    raise ValueError('no named color found, use fallback=True, as_hex() or as_rgb()') from e
-        else:
-            return self.as_hex()
-
-    def as_hex(self) -> str:
-        """
-        Hex string representing the color can be 3, 4, 6 or 8 characters depending on whether the string
-        a "short" representation of the color is possible and whether there's an alpha channel.
-        """
-        values = [float_to_255(c) for c in self._rgba[:3]]
-        if self._rgba.alpha is not None:
-            values.append(float_to_255(self._rgba.alpha))
-
-        as_hex = ''.join(f'{v:02x}' for v in values)
-        if all(c in repeat_colors for c in values):
-            as_hex = ''.join(as_hex[c] for c in range(0, len(as_hex), 2))
-        return '#' + as_hex
-
-    def as_rgb(self) -> str:
-        """
-        Color as an rgb(<r>, <g>, <b>) or rgba(<r>, <g>, <b>, <a>) string.
-        """
-        if self._rgba.alpha is None:
-            return f'rgb({float_to_255(self._rgba.r)}, {float_to_255(self._rgba.g)}, {float_to_255(self._rgba.b)})'
-        else:
-            return (
-                f'rgba({float_to_255(self._rgba.r)}, {float_to_255(self._rgba.g)}, {float_to_255(self._rgba.b)}, '
-                f'{round(self._alpha_float(), 2)})'
-            )
-
-    def as_rgb_tuple(self, *, alpha: Optional[bool] = None) -> ColorTuple:
-        """
-        Color as an RGB or RGBA tuple; red, green and blue are in the range 0 to 255, alpha if included is
-        in the range 0 to 1.
-
-        :param alpha: whether to include the alpha channel, options are
-          None - (default) include alpha only if it's set (e.g. not None)
-          True - always include alpha,
-          False - always omit alpha,
-        """
-        r, g, b = (float_to_255(c) for c in self._rgba[:3])
-        if alpha is None:
-            if self._rgba.alpha is None:
-                return r, g, b
-            else:
-                return r, g, b, self._alpha_float()
-        elif alpha:
-            return r, g, b, self._alpha_float()
-        else:
-            # alpha is False
-            return r, g, b
-
-    def as_hsl(self) -> str:
-        """
-        Color as an hsl(<h>, <s>, <l>) or hsl(<h>, <s>, <l>, <a>) string.
-        """
-        if self._rgba.alpha is None:
-            h, s, li = self.as_hsl_tuple(alpha=False)  # type: ignore
-            return f'hsl({h * 360:0.0f}, {s:0.0%}, {li:0.0%})'
-        else:
-            h, s, li, a = self.as_hsl_tuple(alpha=True)  # type: ignore
-            return f'hsl({h * 360:0.0f}, {s:0.0%}, {li:0.0%}, {round(a, 2)})'
-
-    def as_hsl_tuple(self, *, alpha: Optional[bool] = None) -> HslColorTuple:
-        """
-        Color as an HSL or HSLA tuple, e.g. hue, saturation, lightness and optionally alpha; all elements are in
-        the range 0 to 1.
-
-        NOTE: this is HSL as used in HTML and most other places, not HLS as used in python's colorsys.
-
-        :param alpha: whether to include the alpha channel, options are
-          None - (default) include alpha only if it's set (e.g. not None)
-          True - always include alpha,
-          False - always omit alpha,
-        """
-        h, l, s = rgb_to_hls(self._rgba.r, self._rgba.g, self._rgba.b)
-        if alpha is None:
-            if self._rgba.alpha is None:
-                return h, s, l
-            else:
-                return h, s, l, self._alpha_float()
-        if alpha:
-            return h, s, l, self._alpha_float()
-        else:
-            # alpha is False
-            return h, s, l
-
-    def _alpha_float(self) -> float:
-        return 1 if self._rgba.alpha is None else self._rgba.alpha
-
-    @classmethod
-    def __get_validators__(cls) -> 'CallableGenerator':
-        yield cls
-
-    def __str__(self) -> str:
-        return self.as_named(fallback=True)
-
-    def __repr_args__(self) -> 'ReprArgs':
-        return [(None, self.as_named(fallback=True))] + [('rgb', self.as_rgb_tuple())]  # type: ignore
-
-    def __eq__(self, other: Any) -> bool:
-        return isinstance(other, Color) and self.as_rgb_tuple() == other.as_rgb_tuple()
-
-    def __hash__(self) -> int:
-        return hash(self.as_rgb_tuple())
-
-
-def parse_tuple(value: Tuple[Any, ...]) -> RGBA:
-    """
-    Parse a tuple or list as a color.
-    """
-    if len(value) == 3:
-        r, g, b = (parse_color_value(v) for v in value)
-        return RGBA(r, g, b, None)
-    elif len(value) == 4:
-        r, g, b = (parse_color_value(v) for v in value[:3])
-        return RGBA(r, g, b, parse_float_alpha(value[3]))
-    else:
-        raise ColorError(reason='tuples must have length 3 or 4')
-
-
-def parse_str(value: str) -> RGBA:
-    """
-    Parse a string to an RGBA tuple, trying the following formats (in this order):
-    * named color, see COLORS_BY_NAME below
-    * hex short eg. `<prefix>fff` (prefix can be `#`, `0x` or nothing)
-    * hex long eg. `<prefix>ffffff` (prefix can be `#`, `0x` or nothing)
-    * `rgb(<r>, <g>, <b>) `
-    * `rgba(<r>, <g>, <b>, <a>)`
-    """
-    value_lower = value.lower()
-    try:
-        r, g, b = COLORS_BY_NAME[value_lower]
-    except KeyError:
-        pass
-    else:
-        return ints_to_rgba(r, g, b, None)
-
-    m = re.fullmatch(r_hex_short, value_lower)
-    if m:
-        *rgb, a = m.groups()
-        r, g, b = (int(v * 2, 16) for v in rgb)
-        if a:
-            alpha: Optional[float] = int(a * 2, 16) / 255
-        else:
-            alpha = None
-        return ints_to_rgba(r, g, b, alpha)
-
-    m = re.fullmatch(r_hex_long, value_lower)
-    if m:
-        *rgb, a = m.groups()
-        r, g, b = (int(v, 16) for v in rgb)
-        if a:
-            alpha = int(a, 16) / 255
-        else:
-            alpha = None
-        return ints_to_rgba(r, g, b, alpha)
-
-    m = re.fullmatch(r_rgb, value_lower)
-    if m:
-        return ints_to_rgba(*m.groups(), None)  # type: ignore
-
-    m = re.fullmatch(r_rgba, value_lower)
-    if m:
-        return ints_to_rgba(*m.groups())  # type: ignore
-
-    m = re.fullmatch(r_hsl, value_lower)
-    if m:
-        h, h_units, s, l_ = m.groups()
-        return parse_hsl(h, h_units, s, l_)
-
-    m = re.fullmatch(r_hsla, value_lower)
-    if m:
-        h, h_units, s, l_, a = m.groups()
-        return parse_hsl(h, h_units, s, l_, parse_float_alpha(a))
-
-    raise ColorError(reason='string not recognised as a valid color')
-
-
-def ints_to_rgba(r: Union[int, str], g: Union[int, str], b: Union[int, str], alpha: Optional[float]) -> RGBA:
-    return RGBA(parse_color_value(r), parse_color_value(g), parse_color_value(b), parse_float_alpha(alpha))
-
-
-def parse_color_value(value: Union[int, str], max_val: int = 255) -> float:
-    """
-    Parse a value checking it's a valid int in the range 0 to max_val and divide by max_val to give a number
-    in the range 0 to 1
-    """
-    try:
-        color = float(value)
-    except ValueError:
-        raise ColorError(reason='color values must be a valid number')
-    if 0 <= color <= max_val:
-        return color / max_val
-    else:
-        raise ColorError(reason=f'color values must be in the range 0 to {max_val}')
-
-
-def parse_float_alpha(value: Union[None, str, float, int]) -> Optional[float]:
-    """
-    Parse a value checking it's a valid float in the range 0 to 1
-    """
-    if value is None:
-        return None
-    try:
-        if isinstance(value, str) and value.endswith('%'):
-            alpha = float(value[:-1]) / 100
-        else:
-            alpha = float(value)
-    except ValueError:
-        raise ColorError(reason='alpha values must be a valid float')
-
-    if almost_equal_floats(alpha, 1):
-        return None
-    elif 0 <= alpha <= 1:
-        return alpha
-    else:
-        raise ColorError(reason='alpha values must be in the range 0 to 1')
-
-
-def parse_hsl(h: str, h_units: str, sat: str, light: str, alpha: Optional[float] = None) -> RGBA:
-    """
-    Parse raw hue, saturation, lightness and alpha values and convert to RGBA.
-    """
-    s_value, l_value = parse_color_value(sat, 100), parse_color_value(light, 100)
-
-    h_value = float(h)
-    if h_units in {None, 'deg'}:
-        h_value = h_value % 360 / 360
-    elif h_units == 'rad':
-        h_value = h_value % rads / rads
-    else:
-        # turns
-        h_value = h_value % 1
-
-    r, g, b = hls_to_rgb(h_value, l_value, s_value)
-    return RGBA(r, g, b, alpha)
-
-
-def float_to_255(c: float) -> int:
-    return int(round(c * 255))
-
-
-COLORS_BY_NAME = {
-    'aliceblue': (240, 248, 255),
-    'antiquewhite': (250, 235, 215),
-    'aqua': (0, 255, 255),
-    'aquamarine': (127, 255, 212),
-    'azure': (240, 255, 255),
-    'beige': (245, 245, 220),
-    'bisque': (255, 228, 196),
-    'black': (0, 0, 0),
-    'blanchedalmond': (255, 235, 205),
-    'blue': (0, 0, 255),
-    'blueviolet': (138, 43, 226),
-    'brown': (165, 42, 42),
-    'burlywood': (222, 184, 135),
-    'cadetblue': (95, 158, 160),
-    'chartreuse': (127, 255, 0),
-    'chocolate': (210, 105, 30),
-    'coral': (255, 127, 80),
-    'cornflowerblue': (100, 149, 237),
-    'cornsilk': (255, 248, 220),
-    'crimson': (220, 20, 60),
-    'cyan': (0, 255, 255),
-    'darkblue': (0, 0, 139),
-    'darkcyan': (0, 139, 139),
-    'darkgoldenrod': (184, 134, 11),
-    'darkgray': (169, 169, 169),
-    'darkgreen': (0, 100, 0),
-    'darkgrey': (169, 169, 169),
-    'darkkhaki': (189, 183, 107),
-    'darkmagenta': (139, 0, 139),
-    'darkolivegreen': (85, 107, 47),
-    'darkorange': (255, 140, 0),
-    'darkorchid': (153, 50, 204),
-    'darkred': (139, 0, 0),
-    'darksalmon': (233, 150, 122),
-    'darkseagreen': (143, 188, 143),
-    'darkslateblue': (72, 61, 139),
-    'darkslategray': (47, 79, 79),
-    'darkslategrey': (47, 79, 79),
-    'darkturquoise': (0, 206, 209),
-    'darkviolet': (148, 0, 211),
-    'deeppink': (255, 20, 147),
-    'deepskyblue': (0, 191, 255),
-    'dimgray': (105, 105, 105),
-    'dimgrey': (105, 105, 105),
-    'dodgerblue': (30, 144, 255),
-    'firebrick': (178, 34, 34),
-    'floralwhite': (255, 250, 240),
-    'forestgreen': (34, 139, 34),
-    'fuchsia': (255, 0, 255),
-    'gainsboro': (220, 220, 220),
-    'ghostwhite': (248, 248, 255),
-    'gold': (255, 215, 0),
-    'goldenrod': (218, 165, 32),
-    'gray': (128, 128, 128),
-    'green': (0, 128, 0),
-    'greenyellow': (173, 255, 47),
-    'grey': (128, 128, 128),
-    'honeydew': (240, 255, 240),
-    'hotpink': (255, 105, 180),
-    'indianred': (205, 92, 92),
-    'indigo': (75, 0, 130),
-    'ivory': (255, 255, 240),
-    'khaki': (240, 230, 140),
-    'lavender': (230, 230, 250),
-    'lavenderblush': (255, 240, 245),
-    'lawngreen': (124, 252, 0),
-    'lemonchiffon': (255, 250, 205),
-    'lightblue': (173, 216, 230),
-    'lightcoral': (240, 128, 128),
-    'lightcyan': (224, 255, 255),
-    'lightgoldenrodyellow': (250, 250, 210),
-    'lightgray': (211, 211, 211),
-    'lightgreen': (144, 238, 144),
-    'lightgrey': (211, 211, 211),
-    'lightpink': (255, 182, 193),
-    'lightsalmon': (255, 160, 122),
-    'lightseagreen': (32, 178, 170),
-    'lightskyblue': (135, 206, 250),
-    'lightslategray': (119, 136, 153),
-    'lightslategrey': (119, 136, 153),
-    'lightsteelblue': (176, 196, 222),
-    'lightyellow': (255, 255, 224),
-    'lime': (0, 255, 0),
-    'limegreen': (50, 205, 50),
-    'linen': (250, 240, 230),
-    'magenta': (255, 0, 255),
-    'maroon': (128, 0, 0),
-    'mediumaquamarine': (102, 205, 170),
-    'mediumblue': (0, 0, 205),
-    'mediumorchid': (186, 85, 211),
-    'mediumpurple': (147, 112, 219),
-    'mediumseagreen': (60, 179, 113),
-    'mediumslateblue': (123, 104, 238),
-    'mediumspringgreen': (0, 250, 154),
-    'mediumturquoise': (72, 209, 204),
-    'mediumvioletred': (199, 21, 133),
-    'midnightblue': (25, 25, 112),
-    'mintcream': (245, 255, 250),
-    'mistyrose': (255, 228, 225),
-    'moccasin': (255, 228, 181),
-    'navajowhite': (255, 222, 173),
-    'navy': (0, 0, 128),
-    'oldlace': (253, 245, 230),
-    'olive': (128, 128, 0),
-    'olivedrab': (107, 142, 35),
-    'orange': (255, 165, 0),
-    'orangered': (255, 69, 0),
-    'orchid': (218, 112, 214),
-    'palegoldenrod': (238, 232, 170),
-    'palegreen': (152, 251, 152),
-    'paleturquoise': (175, 238, 238),
-    'palevioletred': (219, 112, 147),
-    'papayawhip': (255, 239, 213),
-    'peachpuff': (255, 218, 185),
-    'peru': (205, 133, 63),
-    'pink': (255, 192, 203),
-    'plum': (221, 160, 221),
-    'powderblue': (176, 224, 230),
-    'purple': (128, 0, 128),
-    'red': (255, 0, 0),
-    'rosybrown': (188, 143, 143),
-    'royalblue': (65, 105, 225),
-    'saddlebrown': (139, 69, 19),
-    'salmon': (250, 128, 114),
-    'sandybrown': (244, 164, 96),
-    'seagreen': (46, 139, 87),
-    'seashell': (255, 245, 238),
-    'sienna': (160, 82, 45),
-    'silver': (192, 192, 192),
-    'skyblue': (135, 206, 235),
-    'slateblue': (106, 90, 205),
-    'slategray': (112, 128, 144),
-    'slategrey': (112, 128, 144),
-    'snow': (255, 250, 250),
-    'springgreen': (0, 255, 127),
-    'steelblue': (70, 130, 180),
-    'tan': (210, 180, 140),
-    'teal': (0, 128, 128),
-    'thistle': (216, 191, 216),
-    'tomato': (255, 99, 71),
-    'turquoise': (64, 224, 208),
-    'violet': (238, 130, 238),
-    'wheat': (245, 222, 179),
-    'white': (255, 255, 255),
-    'whitesmoke': (245, 245, 245),
-    'yellow': (255, 255, 0),
-    'yellowgreen': (154, 205, 50),
-}
-
-COLORS_BY_VALUE = {v: k for k, v in COLORS_BY_NAME.items()}
diff --git a/lib/pydantic/v1/config.py b/lib/pydantic/v1/config.py
deleted file mode 100644
index a25973af..00000000
--- a/lib/pydantic/v1/config.py
+++ /dev/null
@@ -1,191 +0,0 @@
-import json
-from enum import Enum
-from typing import TYPE_CHECKING, Any, Callable, Dict, ForwardRef, Optional, Tuple, Type, Union
-
-from typing_extensions import Literal, Protocol
-
-from .typing import AnyArgTCallable, AnyCallable
-from .utils import GetterDict
-from .version import compiled
-
-if TYPE_CHECKING:
-    from typing import overload
-
-    from .fields import ModelField
-    from .main import BaseModel
-
-    ConfigType = Type['BaseConfig']
-
-    class SchemaExtraCallable(Protocol):
-        @overload
-        def __call__(self, schema: Dict[str, Any]) -> None:
-            pass
-
-        @overload
-        def __call__(self, schema: Dict[str, Any], model_class: Type[BaseModel]) -> None:
-            pass
-
-else:
-    SchemaExtraCallable = Callable[..., None]
-
-__all__ = 'BaseConfig', 'ConfigDict', 'get_config', 'Extra', 'inherit_config', 'prepare_config'
-
-
-class Extra(str, Enum):
-    allow = 'allow'
-    ignore = 'ignore'
-    forbid = 'forbid'
-
-
-# https://github.com/cython/cython/issues/4003
-# Fixed in Cython 3 and Pydantic v1 won't support Cython 3.
-# Pydantic v2 doesn't depend on Cython at all.
-if not compiled:
-    from typing_extensions import TypedDict
-
-    class ConfigDict(TypedDict, total=False):
-        title: Optional[str]
-        anystr_lower: bool
-        anystr_strip_whitespace: bool
-        min_anystr_length: int
-        max_anystr_length: Optional[int]
-        validate_all: bool
-        extra: Extra
-        allow_mutation: bool
-        frozen: bool
-        allow_population_by_field_name: bool
-        use_enum_values: bool
-        fields: Dict[str, Union[str, Dict[str, str]]]
-        validate_assignment: bool
-        error_msg_templates: Dict[str, str]
-        arbitrary_types_allowed: bool
-        orm_mode: bool
-        getter_dict: Type[GetterDict]
-        alias_generator: Optional[Callable[[str], str]]
-        keep_untouched: Tuple[type, ...]
-        schema_extra: Union[Dict[str, object], 'SchemaExtraCallable']
-        json_loads: Callable[[str], object]
-        json_dumps: AnyArgTCallable[str]
-        json_encoders: Dict[Type[object], AnyCallable]
-        underscore_attrs_are_private: bool
-        allow_inf_nan: bool
-        copy_on_model_validation: Literal['none', 'deep', 'shallow']
-        # whether dataclass `__post_init__` should be run after validation
-        post_init_call: Literal['before_validation', 'after_validation']
-
-else:
-    ConfigDict = dict  # type: ignore
-
-
-class BaseConfig:
-    title: Optional[str] = None
-    anystr_lower: bool = False
-    anystr_upper: bool = False
-    anystr_strip_whitespace: bool = False
-    min_anystr_length: int = 0
-    max_anystr_length: Optional[int] = None
-    validate_all: bool = False
-    extra: Extra = Extra.ignore
-    allow_mutation: bool = True
-    frozen: bool = False
-    allow_population_by_field_name: bool = False
-    use_enum_values: bool = False
-    fields: Dict[str, Union[str, Dict[str, str]]] = {}
-    validate_assignment: bool = False
-    error_msg_templates: Dict[str, str] = {}
-    arbitrary_types_allowed: bool = False
-    orm_mode: bool = False
-    getter_dict: Type[GetterDict] = GetterDict
-    alias_generator: Optional[Callable[[str], str]] = None
-    keep_untouched: Tuple[type, ...] = ()
-    schema_extra: Union[Dict[str, Any], 'SchemaExtraCallable'] = {}
-    json_loads: Callable[[str], Any] = json.loads
-    json_dumps: Callable[..., str] = json.dumps
-    json_encoders: Dict[Union[Type[Any], str, ForwardRef], AnyCallable] = {}
-    underscore_attrs_are_private: bool = False
-    allow_inf_nan: bool = True
-
-    # whether inherited models as fields should be reconstructed as base model,
-    # and whether such a copy should be shallow or deep
-    copy_on_model_validation: Literal['none', 'deep', 'shallow'] = 'shallow'
-
-    # whether `Union` should check all allowed types before even trying to coerce
-    smart_union: bool = False
-    # whether dataclass `__post_init__` should be run before or after validation
-    post_init_call: Literal['before_validation', 'after_validation'] = 'before_validation'
-
-    @classmethod
-    def get_field_info(cls, name: str) -> Dict[str, Any]:
-        """
-        Get properties of FieldInfo from the `fields` property of the config class.
-        """
-
-        fields_value = cls.fields.get(name)
-
-        if isinstance(fields_value, str):
-            field_info: Dict[str, Any] = {'alias': fields_value}
-        elif isinstance(fields_value, dict):
-            field_info = fields_value
-        else:
-            field_info = {}
-
-        if 'alias' in field_info:
-            field_info.setdefault('alias_priority', 2)
-
-        if field_info.get('alias_priority', 0) <= 1 and cls.alias_generator:
-            alias = cls.alias_generator(name)
-            if not isinstance(alias, str):
-                raise TypeError(f'Config.alias_generator must return str, not {alias.__class__}')
-            field_info.update(alias=alias, alias_priority=1)
-        return field_info
-
-    @classmethod
-    def prepare_field(cls, field: 'ModelField') -> None:
-        """
-        Optional hook to check or modify fields during model creation.
-        """
-        pass
-
-
-def get_config(config: Union[ConfigDict, Type[object], None]) -> Type[BaseConfig]:
-    if config is None:
-        return BaseConfig
-
-    else:
-        config_dict = (
-            config
-            if isinstance(config, dict)
-            else {k: getattr(config, k) for k in dir(config) if not k.startswith('__')}
-        )
-
-        class Config(BaseConfig):
-            ...
-
-        for k, v in config_dict.items():
-            setattr(Config, k, v)
-        return Config
-
-
-def inherit_config(self_config: 'ConfigType', parent_config: 'ConfigType', **namespace: Any) -> 'ConfigType':
-    if not self_config:
-        base_classes: Tuple['ConfigType', ...] = (parent_config,)
-    elif self_config == parent_config:
-        base_classes = (self_config,)
-    else:
-        base_classes = self_config, parent_config
-
-    namespace['json_encoders'] = {
-        **getattr(parent_config, 'json_encoders', {}),
-        **getattr(self_config, 'json_encoders', {}),
-        **namespace.get('json_encoders', {}),
-    }
-
-    return type('Config', base_classes, namespace)
-
-
-def prepare_config(config: Type[BaseConfig], cls_name: str) -> None:
-    if not isinstance(config.extra, Extra):
-        try:
-            config.extra = Extra(config.extra)
-        except ValueError:
-            raise ValueError(f'"{cls_name}": {config.extra} is not a valid value for "extra"')
diff --git a/lib/pydantic/v1/dataclasses.py b/lib/pydantic/v1/dataclasses.py
deleted file mode 100644
index 2df3987a..00000000
--- a/lib/pydantic/v1/dataclasses.py
+++ /dev/null
@@ -1,500 +0,0 @@
-"""
-The main purpose is to enhance stdlib dataclasses by adding validation
-A pydantic dataclass can be generated from scratch or from a stdlib one.
-
-Behind the scene, a pydantic dataclass is just like a regular one on which we attach
-a `BaseModel` and magic methods to trigger the validation of the data.
-`__init__` and `__post_init__` are hence overridden and have extra logic to be
-able to validate input data.
-
-When a pydantic dataclass is generated from scratch, it's just a plain dataclass
-with validation triggered at initialization
-
-The tricky part if for stdlib dataclasses that are converted after into pydantic ones e.g.
-
-```py
-@dataclasses.dataclass
-class M:
-    x: int
-
-ValidatedM = pydantic.dataclasses.dataclass(M)
-```
-
-We indeed still want to support equality, hashing, repr, ... as if it was the stdlib one!
-
-```py
-assert isinstance(ValidatedM(x=1), M)
-assert ValidatedM(x=1) == M(x=1)
-```
-
-This means we **don't want to create a new dataclass that inherits from it**
-The trick is to create a wrapper around `M` that will act as a proxy to trigger
-validation without altering default `M` behaviour.
-"""
-import copy
-import dataclasses
-import sys
-from contextlib import contextmanager
-from functools import wraps
-
-try:
-    from functools import cached_property
-except ImportError:
-    # cached_property available only for python3.8+
-    pass
-
-from typing import TYPE_CHECKING, Any, Callable, ClassVar, Dict, Generator, Optional, Type, TypeVar, Union, overload
-
-from typing_extensions import dataclass_transform
-
-from .class_validators import gather_all_validators
-from .config import BaseConfig, ConfigDict, Extra, get_config
-from .error_wrappers import ValidationError
-from .errors import DataclassTypeError
-from .fields import Field, FieldInfo, Required, Undefined
-from .main import create_model, validate_model
-from .utils import ClassAttribute
-
-if TYPE_CHECKING:
-    from .main import BaseModel
-    from .typing import CallableGenerator, NoArgAnyCallable
-
-    DataclassT = TypeVar('DataclassT', bound='Dataclass')
-
-    DataclassClassOrWrapper = Union[Type['Dataclass'], 'DataclassProxy']
-
-    class Dataclass:
-        # stdlib attributes
-        __dataclass_fields__: ClassVar[Dict[str, Any]]
-        __dataclass_params__: ClassVar[Any]  # in reality `dataclasses._DataclassParams`
-        __post_init__: ClassVar[Callable[..., None]]
-
-        # Added by pydantic
-        __pydantic_run_validation__: ClassVar[bool]
-        __post_init_post_parse__: ClassVar[Callable[..., None]]
-        __pydantic_initialised__: ClassVar[bool]
-        __pydantic_model__: ClassVar[Type[BaseModel]]
-        __pydantic_validate_values__: ClassVar[Callable[['Dataclass'], None]]
-        __pydantic_has_field_info_default__: ClassVar[bool]  # whether a `pydantic.Field` is used as default value
-
-        def __init__(self, *args: object, **kwargs: object) -> None:
-            pass
-
-        @classmethod
-        def __get_validators__(cls: Type['Dataclass']) -> 'CallableGenerator':
-            pass
-
-        @classmethod
-        def __validate__(cls: Type['DataclassT'], v: Any) -> 'DataclassT':
-            pass
-
-
-__all__ = [
-    'dataclass',
-    'set_validation',
-    'create_pydantic_model_from_dataclass',
-    'is_builtin_dataclass',
-    'make_dataclass_validator',
-]
-
-_T = TypeVar('_T')
-
-if sys.version_info >= (3, 10):
-
-    @dataclass_transform(field_specifiers=(dataclasses.field, Field))
-    @overload
-    def dataclass(
-        *,
-        init: bool = True,
-        repr: bool = True,
-        eq: bool = True,
-        order: bool = False,
-        unsafe_hash: bool = False,
-        frozen: bool = False,
-        config: Union[ConfigDict, Type[object], None] = None,
-        validate_on_init: Optional[bool] = None,
-        use_proxy: Optional[bool] = None,
-        kw_only: bool = ...,
-    ) -> Callable[[Type[_T]], 'DataclassClassOrWrapper']:
-        ...
-
-    @dataclass_transform(field_specifiers=(dataclasses.field, Field))
-    @overload
-    def dataclass(
-        _cls: Type[_T],
-        *,
-        init: bool = True,
-        repr: bool = True,
-        eq: bool = True,
-        order: bool = False,
-        unsafe_hash: bool = False,
-        frozen: bool = False,
-        config: Union[ConfigDict, Type[object], None] = None,
-        validate_on_init: Optional[bool] = None,
-        use_proxy: Optional[bool] = None,
-        kw_only: bool = ...,
-    ) -> 'DataclassClassOrWrapper':
-        ...
-
-else:
-
-    @dataclass_transform(field_specifiers=(dataclasses.field, Field))
-    @overload
-    def dataclass(
-        *,
-        init: bool = True,
-        repr: bool = True,
-        eq: bool = True,
-        order: bool = False,
-        unsafe_hash: bool = False,
-        frozen: bool = False,
-        config: Union[ConfigDict, Type[object], None] = None,
-        validate_on_init: Optional[bool] = None,
-        use_proxy: Optional[bool] = None,
-    ) -> Callable[[Type[_T]], 'DataclassClassOrWrapper']:
-        ...
-
-    @dataclass_transform(field_specifiers=(dataclasses.field, Field))
-    @overload
-    def dataclass(
-        _cls: Type[_T],
-        *,
-        init: bool = True,
-        repr: bool = True,
-        eq: bool = True,
-        order: bool = False,
-        unsafe_hash: bool = False,
-        frozen: bool = False,
-        config: Union[ConfigDict, Type[object], None] = None,
-        validate_on_init: Optional[bool] = None,
-        use_proxy: Optional[bool] = None,
-    ) -> 'DataclassClassOrWrapper':
-        ...
-
-
-@dataclass_transform(field_specifiers=(dataclasses.field, Field))
-def dataclass(
-    _cls: Optional[Type[_T]] = None,
-    *,
-    init: bool = True,
-    repr: bool = True,
-    eq: bool = True,
-    order: bool = False,
-    unsafe_hash: bool = False,
-    frozen: bool = False,
-    config: Union[ConfigDict, Type[object], None] = None,
-    validate_on_init: Optional[bool] = None,
-    use_proxy: Optional[bool] = None,
-    kw_only: bool = False,
-) -> Union[Callable[[Type[_T]], 'DataclassClassOrWrapper'], 'DataclassClassOrWrapper']:
-    """
-    Like the python standard lib dataclasses but with type validation.
-    The result is either a pydantic dataclass that will validate input data
-    or a wrapper that will trigger validation around a stdlib dataclass
-    to avoid modifying it directly
-    """
-    the_config = get_config(config)
-
-    def wrap(cls: Type[Any]) -> 'DataclassClassOrWrapper':
-        should_use_proxy = (
-            use_proxy
-            if use_proxy is not None
-            else (
-                is_builtin_dataclass(cls)
-                and (cls.__bases__[0] is object or set(dir(cls)) == set(dir(cls.__bases__[0])))
-            )
-        )
-        if should_use_proxy:
-            dc_cls_doc = ''
-            dc_cls = DataclassProxy(cls)
-            default_validate_on_init = False
-        else:
-            dc_cls_doc = cls.__doc__ or ''  # needs to be done before generating dataclass
-            if sys.version_info >= (3, 10):
-                dc_cls = dataclasses.dataclass(
-                    cls,
-                    init=init,
-                    repr=repr,
-                    eq=eq,
-                    order=order,
-                    unsafe_hash=unsafe_hash,
-                    frozen=frozen,
-                    kw_only=kw_only,
-                )
-            else:
-                dc_cls = dataclasses.dataclass(  # type: ignore
-                    cls, init=init, repr=repr, eq=eq, order=order, unsafe_hash=unsafe_hash, frozen=frozen
-                )
-            default_validate_on_init = True
-
-        should_validate_on_init = default_validate_on_init if validate_on_init is None else validate_on_init
-        _add_pydantic_validation_attributes(cls, the_config, should_validate_on_init, dc_cls_doc)
-        dc_cls.__pydantic_model__.__try_update_forward_refs__(**{cls.__name__: cls})
-        return dc_cls
-
-    if _cls is None:
-        return wrap
-
-    return wrap(_cls)
-
-
-@contextmanager
-def set_validation(cls: Type['DataclassT'], value: bool) -> Generator[Type['DataclassT'], None, None]:
-    original_run_validation = cls.__pydantic_run_validation__
-    try:
-        cls.__pydantic_run_validation__ = value
-        yield cls
-    finally:
-        cls.__pydantic_run_validation__ = original_run_validation
-
-
-class DataclassProxy:
-    __slots__ = '__dataclass__'
-
-    def __init__(self, dc_cls: Type['Dataclass']) -> None:
-        object.__setattr__(self, '__dataclass__', dc_cls)
-
-    def __call__(self, *args: Any, **kwargs: Any) -> Any:
-        with set_validation(self.__dataclass__, True):
-            return self.__dataclass__(*args, **kwargs)
-
-    def __getattr__(self, name: str) -> Any:
-        return getattr(self.__dataclass__, name)
-
-    def __setattr__(self, __name: str, __value: Any) -> None:
-        return setattr(self.__dataclass__, __name, __value)
-
-    def __instancecheck__(self, instance: Any) -> bool:
-        return isinstance(instance, self.__dataclass__)
-
-    def __copy__(self) -> 'DataclassProxy':
-        return DataclassProxy(copy.copy(self.__dataclass__))
-
-    def __deepcopy__(self, memo: Any) -> 'DataclassProxy':
-        return DataclassProxy(copy.deepcopy(self.__dataclass__, memo))
-
-
-def _add_pydantic_validation_attributes(  # noqa: C901 (ignore complexity)
-    dc_cls: Type['Dataclass'],
-    config: Type[BaseConfig],
-    validate_on_init: bool,
-    dc_cls_doc: str,
-) -> None:
-    """
-    We need to replace the right method. If no `__post_init__` has been set in the stdlib dataclass
-    it won't even exist (code is generated on the fly by `dataclasses`)
-    By default, we run validation after `__init__` or `__post_init__` if defined
-    """
-    init = dc_cls.__init__
-
-    @wraps(init)
-    def handle_extra_init(self: 'Dataclass', *args: Any, **kwargs: Any) -> None:
-        if config.extra == Extra.ignore:
-            init(self, *args, **{k: v for k, v in kwargs.items() if k in self.__dataclass_fields__})
-
-        elif config.extra == Extra.allow:
-            for k, v in kwargs.items():
-                self.__dict__.setdefault(k, v)
-            init(self, *args, **{k: v for k, v in kwargs.items() if k in self.__dataclass_fields__})
-
-        else:
-            init(self, *args, **kwargs)
-
-    if hasattr(dc_cls, '__post_init__'):
-        try:
-            post_init = dc_cls.__post_init__.__wrapped__  # type: ignore[attr-defined]
-        except AttributeError:
-            post_init = dc_cls.__post_init__
-
-        @wraps(post_init)
-        def new_post_init(self: 'Dataclass', *args: Any, **kwargs: Any) -> None:
-            if config.post_init_call == 'before_validation':
-                post_init(self, *args, **kwargs)
-
-            if self.__class__.__pydantic_run_validation__:
-                self.__pydantic_validate_values__()
-                if hasattr(self, '__post_init_post_parse__'):
-                    self.__post_init_post_parse__(*args, **kwargs)
-
-            if config.post_init_call == 'after_validation':
-                post_init(self, *args, **kwargs)
-
-        setattr(dc_cls, '__init__', handle_extra_init)
-        setattr(dc_cls, '__post_init__', new_post_init)
-
-    else:
-
-        @wraps(init)
-        def new_init(self: 'Dataclass', *args: Any, **kwargs: Any) -> None:
-            handle_extra_init(self, *args, **kwargs)
-
-            if self.__class__.__pydantic_run_validation__:
-                self.__pydantic_validate_values__()
-
-            if hasattr(self, '__post_init_post_parse__'):
-                # We need to find again the initvars. To do that we use `__dataclass_fields__` instead of
-                # public method `dataclasses.fields`
-
-                # get all initvars and their default values
-                initvars_and_values: Dict[str, Any] = {}
-                for i, f in enumerate(self.__class__.__dataclass_fields__.values()):
-                    if f._field_type is dataclasses._FIELD_INITVAR:  # type: ignore[attr-defined]
-                        try:
-                            # set arg value by default
-                            initvars_and_values[f.name] = args[i]
-                        except IndexError:
-                            initvars_and_values[f.name] = kwargs.get(f.name, f.default)
-
-                self.__post_init_post_parse__(**initvars_and_values)
-
-        setattr(dc_cls, '__init__', new_init)
-
-    setattr(dc_cls, '__pydantic_run_validation__', ClassAttribute('__pydantic_run_validation__', validate_on_init))
-    setattr(dc_cls, '__pydantic_initialised__', False)
-    setattr(dc_cls, '__pydantic_model__', create_pydantic_model_from_dataclass(dc_cls, config, dc_cls_doc))
-    setattr(dc_cls, '__pydantic_validate_values__', _dataclass_validate_values)
-    setattr(dc_cls, '__validate__', classmethod(_validate_dataclass))
-    setattr(dc_cls, '__get_validators__', classmethod(_get_validators))
-
-    if dc_cls.__pydantic_model__.__config__.validate_assignment and not dc_cls.__dataclass_params__.frozen:
-        setattr(dc_cls, '__setattr__', _dataclass_validate_assignment_setattr)
-
-
-def _get_validators(cls: 'DataclassClassOrWrapper') -> 'CallableGenerator':
-    yield cls.__validate__
-
-
-def _validate_dataclass(cls: Type['DataclassT'], v: Any) -> 'DataclassT':
-    with set_validation(cls, True):
-        if isinstance(v, cls):
-            v.__pydantic_validate_values__()
-            return v
-        elif isinstance(v, (list, tuple)):
-            return cls(*v)
-        elif isinstance(v, dict):
-            return cls(**v)
-        else:
-            raise DataclassTypeError(class_name=cls.__name__)
-
-
-def create_pydantic_model_from_dataclass(
-    dc_cls: Type['Dataclass'],
-    config: Type[Any] = BaseConfig,
-    dc_cls_doc: Optional[str] = None,
-) -> Type['BaseModel']:
-    field_definitions: Dict[str, Any] = {}
-    for field in dataclasses.fields(dc_cls):
-        default: Any = Undefined
-        default_factory: Optional['NoArgAnyCallable'] = None
-        field_info: FieldInfo
-
-        if field.default is not dataclasses.MISSING:
-            default = field.default
-        elif field.default_factory is not dataclasses.MISSING:
-            default_factory = field.default_factory
-        else:
-            default = Required
-
-        if isinstance(default, FieldInfo):
-            field_info = default
-            dc_cls.__pydantic_has_field_info_default__ = True
-        else:
-            field_info = Field(default=default, default_factory=default_factory, **field.metadata)
-
-        field_definitions[field.name] = (field.type, field_info)
-
-    validators = gather_all_validators(dc_cls)
-    model: Type['BaseModel'] = create_model(
-        dc_cls.__name__,
-        __config__=config,
-        __module__=dc_cls.__module__,
-        __validators__=validators,
-        __cls_kwargs__={'__resolve_forward_refs__': False},
-        **field_definitions,
-    )
-    model.__doc__ = dc_cls_doc if dc_cls_doc is not None else dc_cls.__doc__ or ''
-    return model
-
-
-if sys.version_info >= (3, 8):
-
-    def _is_field_cached_property(obj: 'Dataclass', k: str) -> bool:
-        return isinstance(getattr(type(obj), k, None), cached_property)
-
-else:
-
-    def _is_field_cached_property(obj: 'Dataclass', k: str) -> bool:
-        return False
-
-
-def _dataclass_validate_values(self: 'Dataclass') -> None:
-    # validation errors can occur if this function is called twice on an already initialised dataclass.
-    # for example if Extra.forbid is enabled, it would consider __pydantic_initialised__ an invalid extra property
-    if getattr(self, '__pydantic_initialised__'):
-        return
-    if getattr(self, '__pydantic_has_field_info_default__', False):
-        # We need to remove `FieldInfo` values since they are not valid as input
-        # It's ok to do that because they are obviously the default values!
-        input_data = {
-            k: v
-            for k, v in self.__dict__.items()
-            if not (isinstance(v, FieldInfo) or _is_field_cached_property(self, k))
-        }
-    else:
-        input_data = {k: v for k, v in self.__dict__.items() if not _is_field_cached_property(self, k)}
-    d, _, validation_error = validate_model(self.__pydantic_model__, input_data, cls=self.__class__)
-    if validation_error:
-        raise validation_error
-    self.__dict__.update(d)
-    object.__setattr__(self, '__pydantic_initialised__', True)
-
-
-def _dataclass_validate_assignment_setattr(self: 'Dataclass', name: str, value: Any) -> None:
-    if self.__pydantic_initialised__:
-        d = dict(self.__dict__)
-        d.pop(name, None)
-        known_field = self.__pydantic_model__.__fields__.get(name, None)
-        if known_field:
-            value, error_ = known_field.validate(value, d, loc=name, cls=self.__class__)
-            if error_:
-                raise ValidationError([error_], self.__class__)
-
-    object.__setattr__(self, name, value)
-
-
-def is_builtin_dataclass(_cls: Type[Any]) -> bool:
-    """
-    Whether a class is a stdlib dataclass
-    (useful to discriminated a pydantic dataclass that is actually a wrapper around a stdlib dataclass)
-
-    we check that
-    - `_cls` is a dataclass
-    - `_cls` is not a processed pydantic dataclass (with a basemodel attached)
-    - `_cls` is not a pydantic dataclass inheriting directly from a stdlib dataclass
-    e.g.
-    ```
-    @dataclasses.dataclass
-    class A:
-        x: int
-
-    @pydantic.dataclasses.dataclass
-    class B(A):
-        y: int
-    ```
-    In this case, when we first check `B`, we make an extra check and look at the annotations ('y'),
-    which won't be a superset of all the dataclass fields (only the stdlib fields i.e. 'x')
-    """
-    return (
-        dataclasses.is_dataclass(_cls)
-        and not hasattr(_cls, '__pydantic_model__')
-        and set(_cls.__dataclass_fields__).issuperset(set(getattr(_cls, '__annotations__', {})))
-    )
-
-
-def make_dataclass_validator(dc_cls: Type['Dataclass'], config: Type[BaseConfig]) -> 'CallableGenerator':
-    """
-    Create a pydantic.dataclass from a builtin dataclass to add type validation
-    and yield the validators
-    It retrieves the parameters of the dataclass and forwards them to the newly created dataclass
-    """
-    yield from _get_validators(dataclass(dc_cls, config=config, use_proxy=True))
diff --git a/lib/pydantic/v1/datetime_parse.py b/lib/pydantic/v1/datetime_parse.py
deleted file mode 100644
index cfd54593..00000000
--- a/lib/pydantic/v1/datetime_parse.py
+++ /dev/null
@@ -1,248 +0,0 @@
-"""
-Functions to parse datetime objects.
-
-We're using regular expressions rather than time.strptime because:
-- They provide both validation and parsing.
-- They're more flexible for datetimes.
-- The date/datetime/time constructors produce friendlier error messages.
-
-Stolen from https://raw.githubusercontent.com/django/django/main/django/utils/dateparse.py at
-9718fa2e8abe430c3526a9278dd976443d4ae3c6
-
-Changed to:
-* use standard python datetime types not django.utils.timezone
-* raise ValueError when regex doesn't match rather than returning None
-* support parsing unix timestamps for dates and datetimes
-"""
-import re
-from datetime import date, datetime, time, timedelta, timezone
-from typing import Dict, Optional, Type, Union
-
-from . import errors
-
-date_expr = r'(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})'
-time_expr = (
-    r'(?P<hour>\d{1,2}):(?P<minute>\d{1,2})'
-    r'(?::(?P<second>\d{1,2})(?:\.(?P<microsecond>\d{1,6})\d{0,6})?)?'
-    r'(?P<tzinfo>Z|[+-]\d{2}(?::?\d{2})?)?$'
-)
-
-date_re = re.compile(f'{date_expr}$')
-time_re = re.compile(time_expr)
-datetime_re = re.compile(f'{date_expr}[T ]{time_expr}')
-
-standard_duration_re = re.compile(
-    r'^'
-    r'(?:(?P<days>-?\d+) (days?, )?)?'
-    r'((?:(?P<hours>-?\d+):)(?=\d+:\d+))?'
-    r'(?:(?P<minutes>-?\d+):)?'
-    r'(?P<seconds>-?\d+)'
-    r'(?:\.(?P<microseconds>\d{1,6})\d{0,6})?'
-    r'$'
-)
-
-# Support the sections of ISO 8601 date representation that are accepted by timedelta
-iso8601_duration_re = re.compile(
-    r'^(?P<sign>[-+]?)'
-    r'P'
-    r'(?:(?P<days>\d+(.\d+)?)D)?'
-    r'(?:T'
-    r'(?:(?P<hours>\d+(.\d+)?)H)?'
-    r'(?:(?P<minutes>\d+(.\d+)?)M)?'
-    r'(?:(?P<seconds>\d+(.\d+)?)S)?'
-    r')?'
-    r'$'
-)
-
-EPOCH = datetime(1970, 1, 1)
-# if greater than this, the number is in ms, if less than or equal it's in seconds
-# (in seconds this is 11th October 2603, in ms it's 20th August 1970)
-MS_WATERSHED = int(2e10)
-# slightly more than datetime.max in ns - (datetime.max - EPOCH).total_seconds() * 1e9
-MAX_NUMBER = int(3e20)
-StrBytesIntFloat = Union[str, bytes, int, float]
-
-
-def get_numeric(value: StrBytesIntFloat, native_expected_type: str) -> Union[None, int, float]:
-    if isinstance(value, (int, float)):
-        return value
-    try:
-        return float(value)
-    except ValueError:
-        return None
-    except TypeError:
-        raise TypeError(f'invalid type; expected {native_expected_type}, string, bytes, int or float')
-
-
-def from_unix_seconds(seconds: Union[int, float]) -> datetime:
-    if seconds > MAX_NUMBER:
-        return datetime.max
-    elif seconds < -MAX_NUMBER:
-        return datetime.min
-
-    while abs(seconds) > MS_WATERSHED:
-        seconds /= 1000
-    dt = EPOCH + timedelta(seconds=seconds)
-    return dt.replace(tzinfo=timezone.utc)
-
-
-def _parse_timezone(value: Optional[str], error: Type[Exception]) -> Union[None, int, timezone]:
-    if value == 'Z':
-        return timezone.utc
-    elif value is not None:
-        offset_mins = int(value[-2:]) if len(value) > 3 else 0
-        offset = 60 * int(value[1:3]) + offset_mins
-        if value[0] == '-':
-            offset = -offset
-        try:
-            return timezone(timedelta(minutes=offset))
-        except ValueError:
-            raise error()
-    else:
-        return None
-
-
-def parse_date(value: Union[date, StrBytesIntFloat]) -> date:
-    """
-    Parse a date/int/float/string and return a datetime.date.
-
-    Raise ValueError if the input is well formatted but not a valid date.
-    Raise ValueError if the input isn't well formatted.
-    """
-    if isinstance(value, date):
-        if isinstance(value, datetime):
-            return value.date()
-        else:
-            return value
-
-    number = get_numeric(value, 'date')
-    if number is not None:
-        return from_unix_seconds(number).date()
-
-    if isinstance(value, bytes):
-        value = value.decode()
-
-    match = date_re.match(value)  # type: ignore
-    if match is None:
-        raise errors.DateError()
-
-    kw = {k: int(v) for k, v in match.groupdict().items()}
-
-    try:
-        return date(**kw)
-    except ValueError:
-        raise errors.DateError()
-
-
-def parse_time(value: Union[time, StrBytesIntFloat]) -> time:
-    """
-    Parse a time/string and return a datetime.time.
-
-    Raise ValueError if the input is well formatted but not a valid time.
-    Raise ValueError if the input isn't well formatted, in particular if it contains an offset.
-    """
-    if isinstance(value, time):
-        return value
-
-    number = get_numeric(value, 'time')
-    if number is not None:
-        if number >= 86400:
-            # doesn't make sense since the time time loop back around to 0
-            raise errors.TimeError()
-        return (datetime.min + timedelta(seconds=number)).time()
-
-    if isinstance(value, bytes):
-        value = value.decode()
-
-    match = time_re.match(value)  # type: ignore
-    if match is None:
-        raise errors.TimeError()
-
-    kw = match.groupdict()
-    if kw['microsecond']:
-        kw['microsecond'] = kw['microsecond'].ljust(6, '0')
-
-    tzinfo = _parse_timezone(kw.pop('tzinfo'), errors.TimeError)
-    kw_: Dict[str, Union[None, int, timezone]] = {k: int(v) for k, v in kw.items() if v is not None}
-    kw_['tzinfo'] = tzinfo
-
-    try:
-        return time(**kw_)  # type: ignore
-    except ValueError:
-        raise errors.TimeError()
-
-
-def parse_datetime(value: Union[datetime, StrBytesIntFloat]) -> datetime:
-    """
-    Parse a datetime/int/float/string and return a datetime.datetime.
-
-    This function supports time zone offsets. When the input contains one,
-    the output uses a timezone with a fixed offset from UTC.
-
-    Raise ValueError if the input is well formatted but not a valid datetime.
-    Raise ValueError if the input isn't well formatted.
-    """
-    if isinstance(value, datetime):
-        return value
-
-    number = get_numeric(value, 'datetime')
-    if number is not None:
-        return from_unix_seconds(number)
-
-    if isinstance(value, bytes):
-        value = value.decode()
-
-    match = datetime_re.match(value)  # type: ignore
-    if match is None:
-        raise errors.DateTimeError()
-
-    kw = match.groupdict()
-    if kw['microsecond']:
-        kw['microsecond'] = kw['microsecond'].ljust(6, '0')
-
-    tzinfo = _parse_timezone(kw.pop('tzinfo'), errors.DateTimeError)
-    kw_: Dict[str, Union[None, int, timezone]] = {k: int(v) for k, v in kw.items() if v is not None}
-    kw_['tzinfo'] = tzinfo
-
-    try:
-        return datetime(**kw_)  # type: ignore
-    except ValueError:
-        raise errors.DateTimeError()
-
-
-def parse_duration(value: StrBytesIntFloat) -> timedelta:
-    """
-    Parse a duration int/float/string and return a datetime.timedelta.
-
-    The preferred format for durations in Django is '%d %H:%M:%S.%f'.
-
-    Also supports ISO 8601 representation.
-    """
-    if isinstance(value, timedelta):
-        return value
-
-    if isinstance(value, (int, float)):
-        # below code requires a string
-        value = f'{value:f}'
-    elif isinstance(value, bytes):
-        value = value.decode()
-
-    try:
-        match = standard_duration_re.match(value) or iso8601_duration_re.match(value)
-    except TypeError:
-        raise TypeError('invalid type; expected timedelta, string, bytes, int or float')
-
-    if not match:
-        raise errors.DurationError()
-
-    kw = match.groupdict()
-    sign = -1 if kw.pop('sign', '+') == '-' else 1
-    if kw.get('microseconds'):
-        kw['microseconds'] = kw['microseconds'].ljust(6, '0')
-
-    if kw.get('seconds') and kw.get('microseconds') and kw['seconds'].startswith('-'):
-        kw['microseconds'] = '-' + kw['microseconds']
-
-    kw_ = {k: float(v) for k, v in kw.items() if v is not None}
-
-    return sign * timedelta(**kw_)
diff --git a/lib/pydantic/v1/decorator.py b/lib/pydantic/v1/decorator.py
deleted file mode 100644
index 089aab65..00000000
--- a/lib/pydantic/v1/decorator.py
+++ /dev/null
@@ -1,264 +0,0 @@
-from functools import wraps
-from typing import TYPE_CHECKING, Any, Callable, Dict, List, Mapping, Optional, Tuple, Type, TypeVar, Union, overload
-
-from . import validator
-from .config import Extra
-from .errors import ConfigError
-from .main import BaseModel, create_model
-from .typing import get_all_type_hints
-from .utils import to_camel
-
-__all__ = ('validate_arguments',)
-
-if TYPE_CHECKING:
-    from .typing import AnyCallable
-
-    AnyCallableT = TypeVar('AnyCallableT', bound=AnyCallable)
-    ConfigType = Union[None, Type[Any], Dict[str, Any]]
-
-
-@overload
-def validate_arguments(func: None = None, *, config: 'ConfigType' = None) -> Callable[['AnyCallableT'], 'AnyCallableT']:
-    ...
-
-
-@overload
-def validate_arguments(func: 'AnyCallableT') -> 'AnyCallableT':
-    ...
-
-
-def validate_arguments(func: Optional['AnyCallableT'] = None, *, config: 'ConfigType' = None) -> Any:
-    """
-    Decorator to validate the arguments passed to a function.
-    """
-
-    def validate(_func: 'AnyCallable') -> 'AnyCallable':
-        vd = ValidatedFunction(_func, config)
-
-        @wraps(_func)
-        def wrapper_function(*args: Any, **kwargs: Any) -> Any:
-            return vd.call(*args, **kwargs)
-
-        wrapper_function.vd = vd  # type: ignore
-        wrapper_function.validate = vd.init_model_instance  # type: ignore
-        wrapper_function.raw_function = vd.raw_function  # type: ignore
-        wrapper_function.model = vd.model  # type: ignore
-        return wrapper_function
-
-    if func:
-        return validate(func)
-    else:
-        return validate
-
-
-ALT_V_ARGS = 'v__args'
-ALT_V_KWARGS = 'v__kwargs'
-V_POSITIONAL_ONLY_NAME = 'v__positional_only'
-V_DUPLICATE_KWARGS = 'v__duplicate_kwargs'
-
-
-class ValidatedFunction:
-    def __init__(self, function: 'AnyCallableT', config: 'ConfigType'):  # noqa C901
-        from inspect import Parameter, signature
-
-        parameters: Mapping[str, Parameter] = signature(function).parameters
-
-        if parameters.keys() & {ALT_V_ARGS, ALT_V_KWARGS, V_POSITIONAL_ONLY_NAME, V_DUPLICATE_KWARGS}:
-            raise ConfigError(
-                f'"{ALT_V_ARGS}", "{ALT_V_KWARGS}", "{V_POSITIONAL_ONLY_NAME}" and "{V_DUPLICATE_KWARGS}" '
-                f'are not permitted as argument names when using the "{validate_arguments.__name__}" decorator'
-            )
-
-        self.raw_function = function
-        self.arg_mapping: Dict[int, str] = {}
-        self.positional_only_args = set()
-        self.v_args_name = 'args'
-        self.v_kwargs_name = 'kwargs'
-
-        type_hints = get_all_type_hints(function)
-        takes_args = False
-        takes_kwargs = False
-        fields: Dict[str, Tuple[Any, Any]] = {}
-        for i, (name, p) in enumerate(parameters.items()):
-            if p.annotation is p.empty:
-                annotation = Any
-            else:
-                annotation = type_hints[name]
-
-            default = ... if p.default is p.empty else p.default
-            if p.kind == Parameter.POSITIONAL_ONLY:
-                self.arg_mapping[i] = name
-                fields[name] = annotation, default
-                fields[V_POSITIONAL_ONLY_NAME] = List[str], None
-                self.positional_only_args.add(name)
-            elif p.kind == Parameter.POSITIONAL_OR_KEYWORD:
-                self.arg_mapping[i] = name
-                fields[name] = annotation, default
-                fields[V_DUPLICATE_KWARGS] = List[str], None
-            elif p.kind == Parameter.KEYWORD_ONLY:
-                fields[name] = annotation, default
-            elif p.kind == Parameter.VAR_POSITIONAL:
-                self.v_args_name = name
-                fields[name] = Tuple[annotation, ...], None
-                takes_args = True
-            else:
-                assert p.kind == Parameter.VAR_KEYWORD, p.kind
-                self.v_kwargs_name = name
-                fields[name] = Dict[str, annotation], None  # type: ignore
-                takes_kwargs = True
-
-        # these checks avoid a clash between "args" and a field with that name
-        if not takes_args and self.v_args_name in fields:
-            self.v_args_name = ALT_V_ARGS
-
-        # same with "kwargs"
-        if not takes_kwargs and self.v_kwargs_name in fields:
-            self.v_kwargs_name = ALT_V_KWARGS
-
-        if not takes_args:
-            # we add the field so validation below can raise the correct exception
-            fields[self.v_args_name] = List[Any], None
-
-        if not takes_kwargs:
-            # same with kwargs
-            fields[self.v_kwargs_name] = Dict[Any, Any], None
-
-        self.create_model(fields, takes_args, takes_kwargs, config)
-
-    def init_model_instance(self, *args: Any, **kwargs: Any) -> BaseModel:
-        values = self.build_values(args, kwargs)
-        return self.model(**values)
-
-    def call(self, *args: Any, **kwargs: Any) -> Any:
-        m = self.init_model_instance(*args, **kwargs)
-        return self.execute(m)
-
-    def build_values(self, args: Tuple[Any, ...], kwargs: Dict[str, Any]) -> Dict[str, Any]:
-        values: Dict[str, Any] = {}
-        if args:
-            arg_iter = enumerate(args)
-            while True:
-                try:
-                    i, a = next(arg_iter)
-                except StopIteration:
-                    break
-                arg_name = self.arg_mapping.get(i)
-                if arg_name is not None:
-                    values[arg_name] = a
-                else:
-                    values[self.v_args_name] = [a] + [a for _, a in arg_iter]
-                    break
-
-        var_kwargs: Dict[str, Any] = {}
-        wrong_positional_args = []
-        duplicate_kwargs = []
-        fields_alias = [
-            field.alias
-            for name, field in self.model.__fields__.items()
-            if name not in (self.v_args_name, self.v_kwargs_name)
-        ]
-        non_var_fields = set(self.model.__fields__) - {self.v_args_name, self.v_kwargs_name}
-        for k, v in kwargs.items():
-            if k in non_var_fields or k in fields_alias:
-                if k in self.positional_only_args:
-                    wrong_positional_args.append(k)
-                if k in values:
-                    duplicate_kwargs.append(k)
-                values[k] = v
-            else:
-                var_kwargs[k] = v
-
-        if var_kwargs:
-            values[self.v_kwargs_name] = var_kwargs
-        if wrong_positional_args:
-            values[V_POSITIONAL_ONLY_NAME] = wrong_positional_args
-        if duplicate_kwargs:
-            values[V_DUPLICATE_KWARGS] = duplicate_kwargs
-        return values
-
-    def execute(self, m: BaseModel) -> Any:
-        d = {k: v for k, v in m._iter() if k in m.__fields_set__ or m.__fields__[k].default_factory}
-        var_kwargs = d.pop(self.v_kwargs_name, {})
-
-        if self.v_args_name in d:
-            args_: List[Any] = []
-            in_kwargs = False
-            kwargs = {}
-            for name, value in d.items():
-                if in_kwargs:
-                    kwargs[name] = value
-                elif name == self.v_args_name:
-                    args_ += value
-                    in_kwargs = True
-                else:
-                    args_.append(value)
-            return self.raw_function(*args_, **kwargs, **var_kwargs)
-        elif self.positional_only_args:
-            args_ = []
-            kwargs = {}
-            for name, value in d.items():
-                if name in self.positional_only_args:
-                    args_.append(value)
-                else:
-                    kwargs[name] = value
-            return self.raw_function(*args_, **kwargs, **var_kwargs)
-        else:
-            return self.raw_function(**d, **var_kwargs)
-
-    def create_model(self, fields: Dict[str, Any], takes_args: bool, takes_kwargs: bool, config: 'ConfigType') -> None:
-        pos_args = len(self.arg_mapping)
-
-        class CustomConfig:
-            pass
-
-        if not TYPE_CHECKING:  # pragma: no branch
-            if isinstance(config, dict):
-                CustomConfig = type('Config', (), config)  # noqa: F811
-            elif config is not None:
-                CustomConfig = config  # noqa: F811
-
-        if hasattr(CustomConfig, 'fields') or hasattr(CustomConfig, 'alias_generator'):
-            raise ConfigError(
-                'Setting the "fields" and "alias_generator" property on custom Config for '
-                '@validate_arguments is not yet supported, please remove.'
-            )
-
-        class DecoratorBaseModel(BaseModel):
-            @validator(self.v_args_name, check_fields=False, allow_reuse=True)
-            def check_args(cls, v: Optional[List[Any]]) -> Optional[List[Any]]:
-                if takes_args or v is None:
-                    return v
-
-                raise TypeError(f'{pos_args} positional arguments expected but {pos_args + len(v)} given')
-
-            @validator(self.v_kwargs_name, check_fields=False, allow_reuse=True)
-            def check_kwargs(cls, v: Optional[Dict[str, Any]]) -> Optional[Dict[str, Any]]:
-                if takes_kwargs or v is None:
-                    return v
-
-                plural = '' if len(v) == 1 else 's'
-                keys = ', '.join(map(repr, v.keys()))
-                raise TypeError(f'unexpected keyword argument{plural}: {keys}')
-
-            @validator(V_POSITIONAL_ONLY_NAME, check_fields=False, allow_reuse=True)
-            def check_positional_only(cls, v: Optional[List[str]]) -> None:
-                if v is None:
-                    return
-
-                plural = '' if len(v) == 1 else 's'
-                keys = ', '.join(map(repr, v))
-                raise TypeError(f'positional-only argument{plural} passed as keyword argument{plural}: {keys}')
-
-            @validator(V_DUPLICATE_KWARGS, check_fields=False, allow_reuse=True)
-            def check_duplicate_kwargs(cls, v: Optional[List[str]]) -> None:
-                if v is None:
-                    return
-
-                plural = '' if len(v) == 1 else 's'
-                keys = ', '.join(map(repr, v))
-                raise TypeError(f'multiple values for argument{plural}: {keys}')
-
-            class Config(CustomConfig):
-                extra = getattr(CustomConfig, 'extra', Extra.forbid)
-
-        self.model = create_model(to_camel(self.raw_function.__name__), __base__=DecoratorBaseModel, **fields)
diff --git a/lib/pydantic/v1/env_settings.py b/lib/pydantic/v1/env_settings.py
deleted file mode 100644
index 6c446e51..00000000
--- a/lib/pydantic/v1/env_settings.py
+++ /dev/null
@@ -1,350 +0,0 @@
-import os
-import warnings
-from pathlib import Path
-from typing import AbstractSet, Any, Callable, ClassVar, Dict, List, Mapping, Optional, Tuple, Type, Union
-
-from .config import BaseConfig, Extra
-from .fields import ModelField
-from .main import BaseModel
-from .types import JsonWrapper
-from .typing import StrPath, display_as_type, get_origin, is_union
-from .utils import deep_update, lenient_issubclass, path_type, sequence_like
-
-env_file_sentinel = str(object())
-
-SettingsSourceCallable = Callable[['BaseSettings'], Dict[str, Any]]
-DotenvType = Union[StrPath, List[StrPath], Tuple[StrPath, ...]]
-
-
-class SettingsError(ValueError):
-    pass
-
-
-class BaseSettings(BaseModel):
-    """
-    Base class for settings, allowing values to be overridden by environment variables.
-
-    This is useful in production for secrets you do not wish to save in code, it plays nicely with docker(-compose),
-    Heroku and any 12 factor app design.
-    """
-
-    def __init__(
-        __pydantic_self__,
-        _env_file: Optional[DotenvType] = env_file_sentinel,
-        _env_file_encoding: Optional[str] = None,
-        _env_nested_delimiter: Optional[str] = None,
-        _secrets_dir: Optional[StrPath] = None,
-        **values: Any,
-    ) -> None:
-        # Uses something other than `self` the first arg to allow "self" as a settable attribute
-        super().__init__(
-            **__pydantic_self__._build_values(
-                values,
-                _env_file=_env_file,
-                _env_file_encoding=_env_file_encoding,
-                _env_nested_delimiter=_env_nested_delimiter,
-                _secrets_dir=_secrets_dir,
-            )
-        )
-
-    def _build_values(
-        self,
-        init_kwargs: Dict[str, Any],
-        _env_file: Optional[DotenvType] = None,
-        _env_file_encoding: Optional[str] = None,
-        _env_nested_delimiter: Optional[str] = None,
-        _secrets_dir: Optional[StrPath] = None,
-    ) -> Dict[str, Any]:
-        # Configure built-in sources
-        init_settings = InitSettingsSource(init_kwargs=init_kwargs)
-        env_settings = EnvSettingsSource(
-            env_file=(_env_file if _env_file != env_file_sentinel else self.__config__.env_file),
-            env_file_encoding=(
-                _env_file_encoding if _env_file_encoding is not None else self.__config__.env_file_encoding
-            ),
-            env_nested_delimiter=(
-                _env_nested_delimiter if _env_nested_delimiter is not None else self.__config__.env_nested_delimiter
-            ),
-            env_prefix_len=len(self.__config__.env_prefix),
-        )
-        file_secret_settings = SecretsSettingsSource(secrets_dir=_secrets_dir or self.__config__.secrets_dir)
-        # Provide a hook to set built-in sources priority and add / remove sources
-        sources = self.__config__.customise_sources(
-            init_settings=init_settings, env_settings=env_settings, file_secret_settings=file_secret_settings
-        )
-        if sources:
-            return deep_update(*reversed([source(self) for source in sources]))
-        else:
-            # no one should mean to do this, but I think returning an empty dict is marginally preferable
-            # to an informative error and much better than a confusing error
-            return {}
-
-    class Config(BaseConfig):
-        env_prefix: str = ''
-        env_file: Optional[DotenvType] = None
-        env_file_encoding: Optional[str] = None
-        env_nested_delimiter: Optional[str] = None
-        secrets_dir: Optional[StrPath] = None
-        validate_all: bool = True
-        extra: Extra = Extra.forbid
-        arbitrary_types_allowed: bool = True
-        case_sensitive: bool = False
-
-        @classmethod
-        def prepare_field(cls, field: ModelField) -> None:
-            env_names: Union[List[str], AbstractSet[str]]
-            field_info_from_config = cls.get_field_info(field.name)
-
-            env = field_info_from_config.get('env') or field.field_info.extra.get('env')
-            if env is None:
-                if field.has_alias:
-                    warnings.warn(
-                        'aliases are no longer used by BaseSettings to define which environment variables to read. '
-                        'Instead use the "env" field setting. '
-                        'See https://pydantic-docs.helpmanual.io/usage/settings/#environment-variable-names',
-                        FutureWarning,
-                    )
-                env_names = {cls.env_prefix + field.name}
-            elif isinstance(env, str):
-                env_names = {env}
-            elif isinstance(env, (set, frozenset)):
-                env_names = env
-            elif sequence_like(env):
-                env_names = list(env)
-            else:
-                raise TypeError(f'invalid field env: {env!r} ({display_as_type(env)}); should be string, list or set')
-
-            if not cls.case_sensitive:
-                env_names = env_names.__class__(n.lower() for n in env_names)
-            field.field_info.extra['env_names'] = env_names
-
-        @classmethod
-        def customise_sources(
-            cls,
-            init_settings: SettingsSourceCallable,
-            env_settings: SettingsSourceCallable,
-            file_secret_settings: SettingsSourceCallable,
-        ) -> Tuple[SettingsSourceCallable, ...]:
-            return init_settings, env_settings, file_secret_settings
-
-        @classmethod
-        def parse_env_var(cls, field_name: str, raw_val: str) -> Any:
-            return cls.json_loads(raw_val)
-
-    # populated by the metaclass using the Config class defined above, annotated here to help IDEs only
-    __config__: ClassVar[Type[Config]]
-
-
-class InitSettingsSource:
-    __slots__ = ('init_kwargs',)
-
-    def __init__(self, init_kwargs: Dict[str, Any]):
-        self.init_kwargs = init_kwargs
-
-    def __call__(self, settings: BaseSettings) -> Dict[str, Any]:
-        return self.init_kwargs
-
-    def __repr__(self) -> str:
-        return f'InitSettingsSource(init_kwargs={self.init_kwargs!r})'
-
-
-class EnvSettingsSource:
-    __slots__ = ('env_file', 'env_file_encoding', 'env_nested_delimiter', 'env_prefix_len')
-
-    def __init__(
-        self,
-        env_file: Optional[DotenvType],
-        env_file_encoding: Optional[str],
-        env_nested_delimiter: Optional[str] = None,
-        env_prefix_len: int = 0,
-    ):
-        self.env_file: Optional[DotenvType] = env_file
-        self.env_file_encoding: Optional[str] = env_file_encoding
-        self.env_nested_delimiter: Optional[str] = env_nested_delimiter
-        self.env_prefix_len: int = env_prefix_len
-
-    def __call__(self, settings: BaseSettings) -> Dict[str, Any]:  # noqa C901
-        """
-        Build environment variables suitable for passing to the Model.
-        """
-        d: Dict[str, Any] = {}
-
-        if settings.__config__.case_sensitive:
-            env_vars: Mapping[str, Optional[str]] = os.environ
-        else:
-            env_vars = {k.lower(): v for k, v in os.environ.items()}
-
-        dotenv_vars = self._read_env_files(settings.__config__.case_sensitive)
-        if dotenv_vars:
-            env_vars = {**dotenv_vars, **env_vars}
-
-        for field in settings.__fields__.values():
-            env_val: Optional[str] = None
-            for env_name in field.field_info.extra['env_names']:
-                env_val = env_vars.get(env_name)
-                if env_val is not None:
-                    break
-
-            is_complex, allow_parse_failure = self.field_is_complex(field)
-            if is_complex:
-                if env_val is None:
-                    # field is complex but no value found so far, try explode_env_vars
-                    env_val_built = self.explode_env_vars(field, env_vars)
-                    if env_val_built:
-                        d[field.alias] = env_val_built
-                else:
-                    # field is complex and there's a value, decode that as JSON, then add explode_env_vars
-                    try:
-                        env_val = settings.__config__.parse_env_var(field.name, env_val)
-                    except ValueError as e:
-                        if not allow_parse_failure:
-                            raise SettingsError(f'error parsing env var "{env_name}"') from e
-
-                    if isinstance(env_val, dict):
-                        d[field.alias] = deep_update(env_val, self.explode_env_vars(field, env_vars))
-                    else:
-                        d[field.alias] = env_val
-            elif env_val is not None:
-                # simplest case, field is not complex, we only need to add the value if it was found
-                d[field.alias] = env_val
-
-        return d
-
-    def _read_env_files(self, case_sensitive: bool) -> Dict[str, Optional[str]]:
-        env_files = self.env_file
-        if env_files is None:
-            return {}
-
-        if isinstance(env_files, (str, os.PathLike)):
-            env_files = [env_files]
-
-        dotenv_vars = {}
-        for env_file in env_files:
-            env_path = Path(env_file).expanduser()
-            if env_path.is_file():
-                dotenv_vars.update(
-                    read_env_file(env_path, encoding=self.env_file_encoding, case_sensitive=case_sensitive)
-                )
-
-        return dotenv_vars
-
-    def field_is_complex(self, field: ModelField) -> Tuple[bool, bool]:
-        """
-        Find out if a field is complex, and if so whether JSON errors should be ignored
-        """
-        if lenient_issubclass(field.annotation, JsonWrapper):
-            return False, False
-
-        if field.is_complex():
-            allow_parse_failure = False
-        elif is_union(get_origin(field.type_)) and field.sub_fields and any(f.is_complex() for f in field.sub_fields):
-            allow_parse_failure = True
-        else:
-            return False, False
-
-        return True, allow_parse_failure
-
-    def explode_env_vars(self, field: ModelField, env_vars: Mapping[str, Optional[str]]) -> Dict[str, Any]:
-        """
-        Process env_vars and extract the values of keys containing env_nested_delimiter into nested dictionaries.
-
-        This is applied to a single field, hence filtering by env_var prefix.
-        """
-        prefixes = [f'{env_name}{self.env_nested_delimiter}' for env_name in field.field_info.extra['env_names']]
-        result: Dict[str, Any] = {}
-        for env_name, env_val in env_vars.items():
-            if not any(env_name.startswith(prefix) for prefix in prefixes):
-                continue
-            # we remove the prefix before splitting in case the prefix has characters in common with the delimiter
-            env_name_without_prefix = env_name[self.env_prefix_len :]
-            _, *keys, last_key = env_name_without_prefix.split(self.env_nested_delimiter)
-            env_var = result
-            for key in keys:
-                env_var = env_var.setdefault(key, {})
-            env_var[last_key] = env_val
-
-        return result
-
-    def __repr__(self) -> str:
-        return (
-            f'EnvSettingsSource(env_file={self.env_file!r}, env_file_encoding={self.env_file_encoding!r}, '
-            f'env_nested_delimiter={self.env_nested_delimiter!r})'
-        )
-
-
-class SecretsSettingsSource:
-    __slots__ = ('secrets_dir',)
-
-    def __init__(self, secrets_dir: Optional[StrPath]):
-        self.secrets_dir: Optional[StrPath] = secrets_dir
-
-    def __call__(self, settings: BaseSettings) -> Dict[str, Any]:
-        """
-        Build fields from "secrets" files.
-        """
-        secrets: Dict[str, Optional[str]] = {}
-
-        if self.secrets_dir is None:
-            return secrets
-
-        secrets_path = Path(self.secrets_dir).expanduser()
-
-        if not secrets_path.exists():
-            warnings.warn(f'directory "{secrets_path}" does not exist')
-            return secrets
-
-        if not secrets_path.is_dir():
-            raise SettingsError(f'secrets_dir must reference a directory, not a {path_type(secrets_path)}')
-
-        for field in settings.__fields__.values():
-            for env_name in field.field_info.extra['env_names']:
-                path = find_case_path(secrets_path, env_name, settings.__config__.case_sensitive)
-                if not path:
-                    # path does not exist, we currently don't return a warning for this
-                    continue
-
-                if path.is_file():
-                    secret_value = path.read_text().strip()
-                    if field.is_complex():
-                        try:
-                            secret_value = settings.__config__.parse_env_var(field.name, secret_value)
-                        except ValueError as e:
-                            raise SettingsError(f'error parsing env var "{env_name}"') from e
-
-                    secrets[field.alias] = secret_value
-                else:
-                    warnings.warn(
-                        f'attempted to load secret file "{path}" but found a {path_type(path)} instead.',
-                        stacklevel=4,
-                    )
-        return secrets
-
-    def __repr__(self) -> str:
-        return f'SecretsSettingsSource(secrets_dir={self.secrets_dir!r})'
-
-
-def read_env_file(
-    file_path: StrPath, *, encoding: str = None, case_sensitive: bool = False
-) -> Dict[str, Optional[str]]:
-    try:
-        from dotenv import dotenv_values
-    except ImportError as e:
-        raise ImportError('python-dotenv is not installed, run `pip install pydantic[dotenv]`') from e
-
-    file_vars: Dict[str, Optional[str]] = dotenv_values(file_path, encoding=encoding or 'utf8')
-    if not case_sensitive:
-        return {k.lower(): v for k, v in file_vars.items()}
-    else:
-        return file_vars
-
-
-def find_case_path(dir_path: Path, file_name: str, case_sensitive: bool) -> Optional[Path]:
-    """
-    Find a file within path's directory matching filename, optionally ignoring case.
-    """
-    for f in dir_path.iterdir():
-        if f.name == file_name:
-            return f
-        elif not case_sensitive and f.name.lower() == file_name.lower():
-            return f
-    return None
diff --git a/lib/pydantic/v1/error_wrappers.py b/lib/pydantic/v1/error_wrappers.py
deleted file mode 100644
index d89a500c..00000000
--- a/lib/pydantic/v1/error_wrappers.py
+++ /dev/null
@@ -1,161 +0,0 @@
-import json
-from typing import TYPE_CHECKING, Any, Dict, Generator, List, Optional, Sequence, Tuple, Type, Union
-
-from .json import pydantic_encoder
-from .utils import Representation
-
-if TYPE_CHECKING:
-    from typing_extensions import TypedDict
-
-    from .config import BaseConfig
-    from .types import ModelOrDc
-    from .typing import ReprArgs
-
-    Loc = Tuple[Union[int, str], ...]
-
-    class _ErrorDictRequired(TypedDict):
-        loc: Loc
-        msg: str
-        type: str
-
-    class ErrorDict(_ErrorDictRequired, total=False):
-        ctx: Dict[str, Any]
-
-
-__all__ = 'ErrorWrapper', 'ValidationError'
-
-
-class ErrorWrapper(Representation):
-    __slots__ = 'exc', '_loc'
-
-    def __init__(self, exc: Exception, loc: Union[str, 'Loc']) -> None:
-        self.exc = exc
-        self._loc = loc
-
-    def loc_tuple(self) -> 'Loc':
-        if isinstance(self._loc, tuple):
-            return self._loc
-        else:
-            return (self._loc,)
-
-    def __repr_args__(self) -> 'ReprArgs':
-        return [('exc', self.exc), ('loc', self.loc_tuple())]
-
-
-# ErrorList is something like Union[List[Union[List[ErrorWrapper], ErrorWrapper]], ErrorWrapper]
-# but recursive, therefore just use:
-ErrorList = Union[Sequence[Any], ErrorWrapper]
-
-
-class ValidationError(Representation, ValueError):
-    __slots__ = 'raw_errors', 'model', '_error_cache'
-
-    def __init__(self, errors: Sequence[ErrorList], model: 'ModelOrDc') -> None:
-        self.raw_errors = errors
-        self.model = model
-        self._error_cache: Optional[List['ErrorDict']] = None
-
-    def errors(self) -> List['ErrorDict']:
-        if self._error_cache is None:
-            try:
-                config = self.model.__config__  # type: ignore
-            except AttributeError:
-                config = self.model.__pydantic_model__.__config__  # type: ignore
-            self._error_cache = list(flatten_errors(self.raw_errors, config))
-        return self._error_cache
-
-    def json(self, *, indent: Union[None, int, str] = 2) -> str:
-        return json.dumps(self.errors(), indent=indent, default=pydantic_encoder)
-
-    def __str__(self) -> str:
-        errors = self.errors()
-        no_errors = len(errors)
-        return (
-            f'{no_errors} validation error{"" if no_errors == 1 else "s"} for {self.model.__name__}\n'
-            f'{display_errors(errors)}'
-        )
-
-    def __repr_args__(self) -> 'ReprArgs':
-        return [('model', self.model.__name__), ('errors', self.errors())]
-
-
-def display_errors(errors: List['ErrorDict']) -> str:
-    return '\n'.join(f'{_display_error_loc(e)}\n  {e["msg"]} ({_display_error_type_and_ctx(e)})' for e in errors)
-
-
-def _display_error_loc(error: 'ErrorDict') -> str:
-    return ' -> '.join(str(e) for e in error['loc'])
-
-
-def _display_error_type_and_ctx(error: 'ErrorDict') -> str:
-    t = 'type=' + error['type']
-    ctx = error.get('ctx')
-    if ctx:
-        return t + ''.join(f'; {k}={v}' for k, v in ctx.items())
-    else:
-        return t
-
-
-def flatten_errors(
-    errors: Sequence[Any], config: Type['BaseConfig'], loc: Optional['Loc'] = None
-) -> Generator['ErrorDict', None, None]:
-    for error in errors:
-        if isinstance(error, ErrorWrapper):
-            if loc:
-                error_loc = loc + error.loc_tuple()
-            else:
-                error_loc = error.loc_tuple()
-
-            if isinstance(error.exc, ValidationError):
-                yield from flatten_errors(error.exc.raw_errors, config, error_loc)
-            else:
-                yield error_dict(error.exc, config, error_loc)
-        elif isinstance(error, list):
-            yield from flatten_errors(error, config, loc=loc)
-        else:
-            raise RuntimeError(f'Unknown error object: {error}')
-
-
-def error_dict(exc: Exception, config: Type['BaseConfig'], loc: 'Loc') -> 'ErrorDict':
-    type_ = get_exc_type(exc.__class__)
-    msg_template = config.error_msg_templates.get(type_) or getattr(exc, 'msg_template', None)
-    ctx = exc.__dict__
-    if msg_template:
-        msg = msg_template.format(**ctx)
-    else:
-        msg = str(exc)
-
-    d: 'ErrorDict' = {'loc': loc, 'msg': msg, 'type': type_}
-
-    if ctx:
-        d['ctx'] = ctx
-
-    return d
-
-
-_EXC_TYPE_CACHE: Dict[Type[Exception], str] = {}
-
-
-def get_exc_type(cls: Type[Exception]) -> str:
-    # slightly more efficient than using lru_cache since we don't need to worry about the cache filling up
-    try:
-        return _EXC_TYPE_CACHE[cls]
-    except KeyError:
-        r = _get_exc_type(cls)
-        _EXC_TYPE_CACHE[cls] = r
-        return r
-
-
-def _get_exc_type(cls: Type[Exception]) -> str:
-    if issubclass(cls, AssertionError):
-        return 'assertion_error'
-
-    base_name = 'type_error' if issubclass(cls, TypeError) else 'value_error'
-    if cls in (TypeError, ValueError):
-        # just TypeError or ValueError, no extra code
-        return base_name
-
-    # if it's not a TypeError or ValueError, we just take the lowercase of the exception name
-    # no chaining or snake case logic, use "code" for more complex error types.
-    code = getattr(cls, 'code', None) or cls.__name__.replace('Error', '').lower()
-    return base_name + '.' + code
diff --git a/lib/pydantic/v1/errors.py b/lib/pydantic/v1/errors.py
deleted file mode 100644
index 7bdafdd1..00000000
--- a/lib/pydantic/v1/errors.py
+++ /dev/null
@@ -1,646 +0,0 @@
-from decimal import Decimal
-from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, Sequence, Set, Tuple, Type, Union
-
-from .typing import display_as_type
-
-if TYPE_CHECKING:
-    from .typing import DictStrAny
-
-# explicitly state exports to avoid "from .errors import *" also importing Decimal, Path etc.
-__all__ = (
-    'PydanticTypeError',
-    'PydanticValueError',
-    'ConfigError',
-    'MissingError',
-    'ExtraError',
-    'NoneIsNotAllowedError',
-    'NoneIsAllowedError',
-    'WrongConstantError',
-    'NotNoneError',
-    'BoolError',
-    'BytesError',
-    'DictError',
-    'EmailError',
-    'UrlError',
-    'UrlSchemeError',
-    'UrlSchemePermittedError',
-    'UrlUserInfoError',
-    'UrlHostError',
-    'UrlHostTldError',
-    'UrlPortError',
-    'UrlExtraError',
-    'EnumError',
-    'IntEnumError',
-    'EnumMemberError',
-    'IntegerError',
-    'FloatError',
-    'PathError',
-    'PathNotExistsError',
-    'PathNotAFileError',
-    'PathNotADirectoryError',
-    'PyObjectError',
-    'SequenceError',
-    'ListError',
-    'SetError',
-    'FrozenSetError',
-    'TupleError',
-    'TupleLengthError',
-    'ListMinLengthError',
-    'ListMaxLengthError',
-    'ListUniqueItemsError',
-    'SetMinLengthError',
-    'SetMaxLengthError',
-    'FrozenSetMinLengthError',
-    'FrozenSetMaxLengthError',
-    'AnyStrMinLengthError',
-    'AnyStrMaxLengthError',
-    'StrError',
-    'StrRegexError',
-    'NumberNotGtError',
-    'NumberNotGeError',
-    'NumberNotLtError',
-    'NumberNotLeError',
-    'NumberNotMultipleError',
-    'DecimalError',
-    'DecimalIsNotFiniteError',
-    'DecimalMaxDigitsError',
-    'DecimalMaxPlacesError',
-    'DecimalWholeDigitsError',
-    'DateTimeError',
-    'DateError',
-    'DateNotInThePastError',
-    'DateNotInTheFutureError',
-    'TimeError',
-    'DurationError',
-    'HashableError',
-    'UUIDError',
-    'UUIDVersionError',
-    'ArbitraryTypeError',
-    'ClassError',
-    'SubclassError',
-    'JsonError',
-    'JsonTypeError',
-    'PatternError',
-    'DataclassTypeError',
-    'CallableError',
-    'IPvAnyAddressError',
-    'IPvAnyInterfaceError',
-    'IPvAnyNetworkError',
-    'IPv4AddressError',
-    'IPv6AddressError',
-    'IPv4NetworkError',
-    'IPv6NetworkError',
-    'IPv4InterfaceError',
-    'IPv6InterfaceError',
-    'ColorError',
-    'StrictBoolError',
-    'NotDigitError',
-    'LuhnValidationError',
-    'InvalidLengthForBrand',
-    'InvalidByteSize',
-    'InvalidByteSizeUnit',
-    'MissingDiscriminator',
-    'InvalidDiscriminator',
-)
-
-
-def cls_kwargs(cls: Type['PydanticErrorMixin'], ctx: 'DictStrAny') -> 'PydanticErrorMixin':
-    """
-    For built-in exceptions like ValueError or TypeError, we need to implement
-    __reduce__ to override the default behaviour (instead of __getstate__/__setstate__)
-    By default pickle protocol 2 calls `cls.__new__(cls, *args)`.
-    Since we only use kwargs, we need a little constructor to change that.
-    Note: the callable can't be a lambda as pickle looks in the namespace to find it
-    """
-    return cls(**ctx)
-
-
-class PydanticErrorMixin:
-    code: str
-    msg_template: str
-
-    def __init__(self, **ctx: Any) -> None:
-        self.__dict__ = ctx
-
-    def __str__(self) -> str:
-        return self.msg_template.format(**self.__dict__)
-
-    def __reduce__(self) -> Tuple[Callable[..., 'PydanticErrorMixin'], Tuple[Type['PydanticErrorMixin'], 'DictStrAny']]:
-        return cls_kwargs, (self.__class__, self.__dict__)
-
-
-class PydanticTypeError(PydanticErrorMixin, TypeError):
-    pass
-
-
-class PydanticValueError(PydanticErrorMixin, ValueError):
-    pass
-
-
-class ConfigError(RuntimeError):
-    pass
-
-
-class MissingError(PydanticValueError):
-    msg_template = 'field required'
-
-
-class ExtraError(PydanticValueError):
-    msg_template = 'extra fields not permitted'
-
-
-class NoneIsNotAllowedError(PydanticTypeError):
-    code = 'none.not_allowed'
-    msg_template = 'none is not an allowed value'
-
-
-class NoneIsAllowedError(PydanticTypeError):
-    code = 'none.allowed'
-    msg_template = 'value is not none'
-
-
-class WrongConstantError(PydanticValueError):
-    code = 'const'
-
-    def __str__(self) -> str:
-        permitted = ', '.join(repr(v) for v in self.permitted)  # type: ignore
-        return f'unexpected value; permitted: {permitted}'
-
-
-class NotNoneError(PydanticTypeError):
-    code = 'not_none'
-    msg_template = 'value is not None'
-
-
-class BoolError(PydanticTypeError):
-    msg_template = 'value could not be parsed to a boolean'
-
-
-class BytesError(PydanticTypeError):
-    msg_template = 'byte type expected'
-
-
-class DictError(PydanticTypeError):
-    msg_template = 'value is not a valid dict'
-
-
-class EmailError(PydanticValueError):
-    msg_template = 'value is not a valid email address'
-
-
-class UrlError(PydanticValueError):
-    code = 'url'
-
-
-class UrlSchemeError(UrlError):
-    code = 'url.scheme'
-    msg_template = 'invalid or missing URL scheme'
-
-
-class UrlSchemePermittedError(UrlError):
-    code = 'url.scheme'
-    msg_template = 'URL scheme not permitted'
-
-    def __init__(self, allowed_schemes: Set[str]):
-        super().__init__(allowed_schemes=allowed_schemes)
-
-
-class UrlUserInfoError(UrlError):
-    code = 'url.userinfo'
-    msg_template = 'userinfo required in URL but missing'
-
-
-class UrlHostError(UrlError):
-    code = 'url.host'
-    msg_template = 'URL host invalid'
-
-
-class UrlHostTldError(UrlError):
-    code = 'url.host'
-    msg_template = 'URL host invalid, top level domain required'
-
-
-class UrlPortError(UrlError):
-    code = 'url.port'
-    msg_template = 'URL port invalid, port cannot exceed 65535'
-
-
-class UrlExtraError(UrlError):
-    code = 'url.extra'
-    msg_template = 'URL invalid, extra characters found after valid URL: {extra!r}'
-
-
-class EnumMemberError(PydanticTypeError):
-    code = 'enum'
-
-    def __str__(self) -> str:
-        permitted = ', '.join(repr(v.value) for v in self.enum_values)  # type: ignore
-        return f'value is not a valid enumeration member; permitted: {permitted}'
-
-
-class IntegerError(PydanticTypeError):
-    msg_template = 'value is not a valid integer'
-
-
-class FloatError(PydanticTypeError):
-    msg_template = 'value is not a valid float'
-
-
-class PathError(PydanticTypeError):
-    msg_template = 'value is not a valid path'
-
-
-class _PathValueError(PydanticValueError):
-    def __init__(self, *, path: Path) -> None:
-        super().__init__(path=str(path))
-
-
-class PathNotExistsError(_PathValueError):
-    code = 'path.not_exists'
-    msg_template = 'file or directory at path "{path}" does not exist'
-
-
-class PathNotAFileError(_PathValueError):
-    code = 'path.not_a_file'
-    msg_template = 'path "{path}" does not point to a file'
-
-
-class PathNotADirectoryError(_PathValueError):
-    code = 'path.not_a_directory'
-    msg_template = 'path "{path}" does not point to a directory'
-
-
-class PyObjectError(PydanticTypeError):
-    msg_template = 'ensure this value contains valid import path or valid callable: {error_message}'
-
-
-class SequenceError(PydanticTypeError):
-    msg_template = 'value is not a valid sequence'
-
-
-class IterableError(PydanticTypeError):
-    msg_template = 'value is not a valid iterable'
-
-
-class ListError(PydanticTypeError):
-    msg_template = 'value is not a valid list'
-
-
-class SetError(PydanticTypeError):
-    msg_template = 'value is not a valid set'
-
-
-class FrozenSetError(PydanticTypeError):
-    msg_template = 'value is not a valid frozenset'
-
-
-class DequeError(PydanticTypeError):
-    msg_template = 'value is not a valid deque'
-
-
-class TupleError(PydanticTypeError):
-    msg_template = 'value is not a valid tuple'
-
-
-class TupleLengthError(PydanticValueError):
-    code = 'tuple.length'
-    msg_template = 'wrong tuple length {actual_length}, expected {expected_length}'
-
-    def __init__(self, *, actual_length: int, expected_length: int) -> None:
-        super().__init__(actual_length=actual_length, expected_length=expected_length)
-
-
-class ListMinLengthError(PydanticValueError):
-    code = 'list.min_items'
-    msg_template = 'ensure this value has at least {limit_value} items'
-
-    def __init__(self, *, limit_value: int) -> None:
-        super().__init__(limit_value=limit_value)
-
-
-class ListMaxLengthError(PydanticValueError):
-    code = 'list.max_items'
-    msg_template = 'ensure this value has at most {limit_value} items'
-
-    def __init__(self, *, limit_value: int) -> None:
-        super().__init__(limit_value=limit_value)
-
-
-class ListUniqueItemsError(PydanticValueError):
-    code = 'list.unique_items'
-    msg_template = 'the list has duplicated items'
-
-
-class SetMinLengthError(PydanticValueError):
-    code = 'set.min_items'
-    msg_template = 'ensure this value has at least {limit_value} items'
-
-    def __init__(self, *, limit_value: int) -> None:
-        super().__init__(limit_value=limit_value)
-
-
-class SetMaxLengthError(PydanticValueError):
-    code = 'set.max_items'
-    msg_template = 'ensure this value has at most {limit_value} items'
-
-    def __init__(self, *, limit_value: int) -> None:
-        super().__init__(limit_value=limit_value)
-
-
-class FrozenSetMinLengthError(PydanticValueError):
-    code = 'frozenset.min_items'
-    msg_template = 'ensure this value has at least {limit_value} items'
-
-    def __init__(self, *, limit_value: int) -> None:
-        super().__init__(limit_value=limit_value)
-
-
-class FrozenSetMaxLengthError(PydanticValueError):
-    code = 'frozenset.max_items'
-    msg_template = 'ensure this value has at most {limit_value} items'
-
-    def __init__(self, *, limit_value: int) -> None:
-        super().__init__(limit_value=limit_value)
-
-
-class AnyStrMinLengthError(PydanticValueError):
-    code = 'any_str.min_length'
-    msg_template = 'ensure this value has at least {limit_value} characters'
-
-    def __init__(self, *, limit_value: int) -> None:
-        super().__init__(limit_value=limit_value)
-
-
-class AnyStrMaxLengthError(PydanticValueError):
-    code = 'any_str.max_length'
-    msg_template = 'ensure this value has at most {limit_value} characters'
-
-    def __init__(self, *, limit_value: int) -> None:
-        super().__init__(limit_value=limit_value)
-
-
-class StrError(PydanticTypeError):
-    msg_template = 'str type expected'
-
-
-class StrRegexError(PydanticValueError):
-    code = 'str.regex'
-    msg_template = 'string does not match regex "{pattern}"'
-
-    def __init__(self, *, pattern: str) -> None:
-        super().__init__(pattern=pattern)
-
-
-class _NumberBoundError(PydanticValueError):
-    def __init__(self, *, limit_value: Union[int, float, Decimal]) -> None:
-        super().__init__(limit_value=limit_value)
-
-
-class NumberNotGtError(_NumberBoundError):
-    code = 'number.not_gt'
-    msg_template = 'ensure this value is greater than {limit_value}'
-
-
-class NumberNotGeError(_NumberBoundError):
-    code = 'number.not_ge'
-    msg_template = 'ensure this value is greater than or equal to {limit_value}'
-
-
-class NumberNotLtError(_NumberBoundError):
-    code = 'number.not_lt'
-    msg_template = 'ensure this value is less than {limit_value}'
-
-
-class NumberNotLeError(_NumberBoundError):
-    code = 'number.not_le'
-    msg_template = 'ensure this value is less than or equal to {limit_value}'
-
-
-class NumberNotFiniteError(PydanticValueError):
-    code = 'number.not_finite_number'
-    msg_template = 'ensure this value is a finite number'
-
-
-class NumberNotMultipleError(PydanticValueError):
-    code = 'number.not_multiple'
-    msg_template = 'ensure this value is a multiple of {multiple_of}'
-
-    def __init__(self, *, multiple_of: Union[int, float, Decimal]) -> None:
-        super().__init__(multiple_of=multiple_of)
-
-
-class DecimalError(PydanticTypeError):
-    msg_template = 'value is not a valid decimal'
-
-
-class DecimalIsNotFiniteError(PydanticValueError):
-    code = 'decimal.not_finite'
-    msg_template = 'value is not a valid decimal'
-
-
-class DecimalMaxDigitsError(PydanticValueError):
-    code = 'decimal.max_digits'
-    msg_template = 'ensure that there are no more than {max_digits} digits in total'
-
-    def __init__(self, *, max_digits: int) -> None:
-        super().__init__(max_digits=max_digits)
-
-
-class DecimalMaxPlacesError(PydanticValueError):
-    code = 'decimal.max_places'
-    msg_template = 'ensure that there are no more than {decimal_places} decimal places'
-
-    def __init__(self, *, decimal_places: int) -> None:
-        super().__init__(decimal_places=decimal_places)
-
-
-class DecimalWholeDigitsError(PydanticValueError):
-    code = 'decimal.whole_digits'
-    msg_template = 'ensure that there are no more than {whole_digits} digits before the decimal point'
-
-    def __init__(self, *, whole_digits: int) -> None:
-        super().__init__(whole_digits=whole_digits)
-
-
-class DateTimeError(PydanticValueError):
-    msg_template = 'invalid datetime format'
-
-
-class DateError(PydanticValueError):
-    msg_template = 'invalid date format'
-
-
-class DateNotInThePastError(PydanticValueError):
-    code = 'date.not_in_the_past'
-    msg_template = 'date is not in the past'
-
-
-class DateNotInTheFutureError(PydanticValueError):
-    code = 'date.not_in_the_future'
-    msg_template = 'date is not in the future'
-
-
-class TimeError(PydanticValueError):
-    msg_template = 'invalid time format'
-
-
-class DurationError(PydanticValueError):
-    msg_template = 'invalid duration format'
-
-
-class HashableError(PydanticTypeError):
-    msg_template = 'value is not a valid hashable'
-
-
-class UUIDError(PydanticTypeError):
-    msg_template = 'value is not a valid uuid'
-
-
-class UUIDVersionError(PydanticValueError):
-    code = 'uuid.version'
-    msg_template = 'uuid version {required_version} expected'
-
-    def __init__(self, *, required_version: int) -> None:
-        super().__init__(required_version=required_version)
-
-
-class ArbitraryTypeError(PydanticTypeError):
-    code = 'arbitrary_type'
-    msg_template = 'instance of {expected_arbitrary_type} expected'
-
-    def __init__(self, *, expected_arbitrary_type: Type[Any]) -> None:
-        super().__init__(expected_arbitrary_type=display_as_type(expected_arbitrary_type))
-
-
-class ClassError(PydanticTypeError):
-    code = 'class'
-    msg_template = 'a class is expected'
-
-
-class SubclassError(PydanticTypeError):
-    code = 'subclass'
-    msg_template = 'subclass of {expected_class} expected'
-
-    def __init__(self, *, expected_class: Type[Any]) -> None:
-        super().__init__(expected_class=display_as_type(expected_class))
-
-
-class JsonError(PydanticValueError):
-    msg_template = 'Invalid JSON'
-
-
-class JsonTypeError(PydanticTypeError):
-    code = 'json'
-    msg_template = 'JSON object must be str, bytes or bytearray'
-
-
-class PatternError(PydanticValueError):
-    code = 'regex_pattern'
-    msg_template = 'Invalid regular expression'
-
-
-class DataclassTypeError(PydanticTypeError):
-    code = 'dataclass'
-    msg_template = 'instance of {class_name}, tuple or dict expected'
-
-
-class CallableError(PydanticTypeError):
-    msg_template = '{value} is not callable'
-
-
-class EnumError(PydanticTypeError):
-    code = 'enum_instance'
-    msg_template = '{value} is not a valid Enum instance'
-
-
-class IntEnumError(PydanticTypeError):
-    code = 'int_enum_instance'
-    msg_template = '{value} is not a valid IntEnum instance'
-
-
-class IPvAnyAddressError(PydanticValueError):
-    msg_template = 'value is not a valid IPv4 or IPv6 address'
-
-
-class IPvAnyInterfaceError(PydanticValueError):
-    msg_template = 'value is not a valid IPv4 or IPv6 interface'
-
-
-class IPvAnyNetworkError(PydanticValueError):
-    msg_template = 'value is not a valid IPv4 or IPv6 network'
-
-
-class IPv4AddressError(PydanticValueError):
-    msg_template = 'value is not a valid IPv4 address'
-
-
-class IPv6AddressError(PydanticValueError):
-    msg_template = 'value is not a valid IPv6 address'
-
-
-class IPv4NetworkError(PydanticValueError):
-    msg_template = 'value is not a valid IPv4 network'
-
-
-class IPv6NetworkError(PydanticValueError):
-    msg_template = 'value is not a valid IPv6 network'
-
-
-class IPv4InterfaceError(PydanticValueError):
-    msg_template = 'value is not a valid IPv4 interface'
-
-
-class IPv6InterfaceError(PydanticValueError):
-    msg_template = 'value is not a valid IPv6 interface'
-
-
-class ColorError(PydanticValueError):
-    msg_template = 'value is not a valid color: {reason}'
-
-
-class StrictBoolError(PydanticValueError):
-    msg_template = 'value is not a valid boolean'
-
-
-class NotDigitError(PydanticValueError):
-    code = 'payment_card_number.digits'
-    msg_template = 'card number is not all digits'
-
-
-class LuhnValidationError(PydanticValueError):
-    code = 'payment_card_number.luhn_check'
-    msg_template = 'card number is not luhn valid'
-
-
-class InvalidLengthForBrand(PydanticValueError):
-    code = 'payment_card_number.invalid_length_for_brand'
-    msg_template = 'Length for a {brand} card must be {required_length}'
-
-
-class InvalidByteSize(PydanticValueError):
-    msg_template = 'could not parse value and unit from byte string'
-
-
-class InvalidByteSizeUnit(PydanticValueError):
-    msg_template = 'could not interpret byte unit: {unit}'
-
-
-class MissingDiscriminator(PydanticValueError):
-    code = 'discriminated_union.missing_discriminator'
-    msg_template = 'Discriminator {discriminator_key!r} is missing in value'
-
-
-class InvalidDiscriminator(PydanticValueError):
-    code = 'discriminated_union.invalid_discriminator'
-    msg_template = (
-        'No match for discriminator {discriminator_key!r} and value {discriminator_value!r} '
-        '(allowed values: {allowed_values})'
-    )
-
-    def __init__(self, *, discriminator_key: str, discriminator_value: Any, allowed_values: Sequence[Any]) -> None:
-        super().__init__(
-            discriminator_key=discriminator_key,
-            discriminator_value=discriminator_value,
-            allowed_values=', '.join(map(repr, allowed_values)),
-        )
diff --git a/lib/pydantic/v1/fields.py b/lib/pydantic/v1/fields.py
deleted file mode 100644
index 60d260e9..00000000
--- a/lib/pydantic/v1/fields.py
+++ /dev/null
@@ -1,1253 +0,0 @@
-import copy
-import re
-from collections import Counter as CollectionCounter, defaultdict, deque
-from collections.abc import Callable, Hashable as CollectionsHashable, Iterable as CollectionsIterable
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Counter,
-    DefaultDict,
-    Deque,
-    Dict,
-    ForwardRef,
-    FrozenSet,
-    Generator,
-    Iterable,
-    Iterator,
-    List,
-    Mapping,
-    Optional,
-    Pattern,
-    Sequence,
-    Set,
-    Tuple,
-    Type,
-    TypeVar,
-    Union,
-)
-
-from typing_extensions import Annotated, Final
-
-from . import errors as errors_
-from .class_validators import Validator, make_generic_validator, prep_validators
-from .error_wrappers import ErrorWrapper
-from .errors import ConfigError, InvalidDiscriminator, MissingDiscriminator, NoneIsNotAllowedError
-from .types import Json, JsonWrapper
-from .typing import (
-    NoArgAnyCallable,
-    convert_generics,
-    display_as_type,
-    get_args,
-    get_origin,
-    is_finalvar,
-    is_literal_type,
-    is_new_type,
-    is_none_type,
-    is_typeddict,
-    is_typeddict_special,
-    is_union,
-    new_type_supertype,
-)
-from .utils import (
-    PyObjectStr,
-    Representation,
-    ValueItems,
-    get_discriminator_alias_and_values,
-    get_unique_discriminator_alias,
-    lenient_isinstance,
-    lenient_issubclass,
-    sequence_like,
-    smart_deepcopy,
-)
-from .validators import constant_validator, dict_validator, find_validators, validate_json
-
-Required: Any = Ellipsis
-
-T = TypeVar('T')
-
-
-class UndefinedType:
-    def __repr__(self) -> str:
-        return 'PydanticUndefined'
-
-    def __copy__(self: T) -> T:
-        return self
-
-    def __reduce__(self) -> str:
-        return 'Undefined'
-
-    def __deepcopy__(self: T, _: Any) -> T:
-        return self
-
-
-Undefined = UndefinedType()
-
-if TYPE_CHECKING:
-    from .class_validators import ValidatorsList
-    from .config import BaseConfig
-    from .error_wrappers import ErrorList
-    from .types import ModelOrDc
-    from .typing import AbstractSetIntStr, MappingIntStrAny, ReprArgs
-
-    ValidateReturn = Tuple[Optional[Any], Optional[ErrorList]]
-    LocStr = Union[Tuple[Union[int, str], ...], str]
-    BoolUndefined = Union[bool, UndefinedType]
-
-
-class FieldInfo(Representation):
-    """
-    Captures extra information about a field.
-    """
-
-    __slots__ = (
-        'default',
-        'default_factory',
-        'alias',
-        'alias_priority',
-        'title',
-        'description',
-        'exclude',
-        'include',
-        'const',
-        'gt',
-        'ge',
-        'lt',
-        'le',
-        'multiple_of',
-        'allow_inf_nan',
-        'max_digits',
-        'decimal_places',
-        'min_items',
-        'max_items',
-        'unique_items',
-        'min_length',
-        'max_length',
-        'allow_mutation',
-        'repr',
-        'regex',
-        'discriminator',
-        'extra',
-    )
-
-    # field constraints with the default value, it's also used in update_from_config below
-    __field_constraints__ = {
-        'min_length': None,
-        'max_length': None,
-        'regex': None,
-        'gt': None,
-        'lt': None,
-        'ge': None,
-        'le': None,
-        'multiple_of': None,
-        'allow_inf_nan': None,
-        'max_digits': None,
-        'decimal_places': None,
-        'min_items': None,
-        'max_items': None,
-        'unique_items': None,
-        'allow_mutation': True,
-    }
-
-    def __init__(self, default: Any = Undefined, **kwargs: Any) -> None:
-        self.default = default
-        self.default_factory = kwargs.pop('default_factory', None)
-        self.alias = kwargs.pop('alias', None)
-        self.alias_priority = kwargs.pop('alias_priority', 2 if self.alias is not None else None)
-        self.title = kwargs.pop('title', None)
-        self.description = kwargs.pop('description', None)
-        self.exclude = kwargs.pop('exclude', None)
-        self.include = kwargs.pop('include', None)
-        self.const = kwargs.pop('const', None)
-        self.gt = kwargs.pop('gt', None)
-        self.ge = kwargs.pop('ge', None)
-        self.lt = kwargs.pop('lt', None)
-        self.le = kwargs.pop('le', None)
-        self.multiple_of = kwargs.pop('multiple_of', None)
-        self.allow_inf_nan = kwargs.pop('allow_inf_nan', None)
-        self.max_digits = kwargs.pop('max_digits', None)
-        self.decimal_places = kwargs.pop('decimal_places', None)
-        self.min_items = kwargs.pop('min_items', None)
-        self.max_items = kwargs.pop('max_items', None)
-        self.unique_items = kwargs.pop('unique_items', None)
-        self.min_length = kwargs.pop('min_length', None)
-        self.max_length = kwargs.pop('max_length', None)
-        self.allow_mutation = kwargs.pop('allow_mutation', True)
-        self.regex = kwargs.pop('regex', None)
-        self.discriminator = kwargs.pop('discriminator', None)
-        self.repr = kwargs.pop('repr', True)
-        self.extra = kwargs
-
-    def __repr_args__(self) -> 'ReprArgs':
-        field_defaults_to_hide: Dict[str, Any] = {
-            'repr': True,
-            **self.__field_constraints__,
-        }
-
-        attrs = ((s, getattr(self, s)) for s in self.__slots__)
-        return [(a, v) for a, v in attrs if v != field_defaults_to_hide.get(a, None)]
-
-    def get_constraints(self) -> Set[str]:
-        """
-        Gets the constraints set on the field by comparing the constraint value with its default value
-
-        :return: the constraints set on field_info
-        """
-        return {attr for attr, default in self.__field_constraints__.items() if getattr(self, attr) != default}
-
-    def update_from_config(self, from_config: Dict[str, Any]) -> None:
-        """
-        Update this FieldInfo based on a dict from get_field_info, only fields which have not been set are dated.
-        """
-        for attr_name, value in from_config.items():
-            try:
-                current_value = getattr(self, attr_name)
-            except AttributeError:
-                # attr_name is not an attribute of FieldInfo, it should therefore be added to extra
-                # (except if extra already has this value!)
-                self.extra.setdefault(attr_name, value)
-            else:
-                if current_value is self.__field_constraints__.get(attr_name, None):
-                    setattr(self, attr_name, value)
-                elif attr_name == 'exclude':
-                    self.exclude = ValueItems.merge(value, current_value)
-                elif attr_name == 'include':
-                    self.include = ValueItems.merge(value, current_value, intersect=True)
-
-    def _validate(self) -> None:
-        if self.default is not Undefined and self.default_factory is not None:
-            raise ValueError('cannot specify both default and default_factory')
-
-
-def Field(
-    default: Any = Undefined,
-    *,
-    default_factory: Optional[NoArgAnyCallable] = None,
-    alias: Optional[str] = None,
-    title: Optional[str] = None,
-    description: Optional[str] = None,
-    exclude: Optional[Union['AbstractSetIntStr', 'MappingIntStrAny', Any]] = None,
-    include: Optional[Union['AbstractSetIntStr', 'MappingIntStrAny', Any]] = None,
-    const: Optional[bool] = None,
-    gt: Optional[float] = None,
-    ge: Optional[float] = None,
-    lt: Optional[float] = None,
-    le: Optional[float] = None,
-    multiple_of: Optional[float] = None,
-    allow_inf_nan: Optional[bool] = None,
-    max_digits: Optional[int] = None,
-    decimal_places: Optional[int] = None,
-    min_items: Optional[int] = None,
-    max_items: Optional[int] = None,
-    unique_items: Optional[bool] = None,
-    min_length: Optional[int] = None,
-    max_length: Optional[int] = None,
-    allow_mutation: bool = True,
-    regex: Optional[str] = None,
-    discriminator: Optional[str] = None,
-    repr: bool = True,
-    **extra: Any,
-) -> Any:
-    """
-    Used to provide extra information about a field, either for the model schema or complex validation. Some arguments
-    apply only to number fields (``int``, ``float``, ``Decimal``) and some apply only to ``str``.
-
-    :param default: since this is replacing the field’s default, its first argument is used
-      to set the default, use ellipsis (``...``) to indicate the field is required
-    :param default_factory: callable that will be called when a default value is needed for this field
-      If both `default` and `default_factory` are set, an error is raised.
-    :param alias: the public name of the field
-    :param title: can be any string, used in the schema
-    :param description: can be any string, used in the schema
-    :param exclude: exclude this field while dumping.
-      Takes same values as the ``include`` and ``exclude`` arguments on the ``.dict`` method.
-    :param include: include this field while dumping.
-      Takes same values as the ``include`` and ``exclude`` arguments on the ``.dict`` method.
-    :param const: this field is required and *must* take it's default value
-    :param gt: only applies to numbers, requires the field to be "greater than". The schema
-      will have an ``exclusiveMinimum`` validation keyword
-    :param ge: only applies to numbers, requires the field to be "greater than or equal to". The
-      schema will have a ``minimum`` validation keyword
-    :param lt: only applies to numbers, requires the field to be "less than". The schema
-      will have an ``exclusiveMaximum`` validation keyword
-    :param le: only applies to numbers, requires the field to be "less than or equal to". The
-      schema will have a ``maximum`` validation keyword
-    :param multiple_of: only applies to numbers, requires the field to be "a multiple of". The
-      schema will have a ``multipleOf`` validation keyword
-    :param allow_inf_nan: only applies to numbers, allows the field to be NaN or infinity (+inf or -inf),
-        which is a valid Python float. Default True, set to False for compatibility with JSON.
-    :param max_digits: only applies to Decimals, requires the field to have a maximum number
-      of digits within the decimal. It does not include a zero before the decimal point or trailing decimal zeroes.
-    :param decimal_places: only applies to Decimals, requires the field to have at most a number of decimal places
-      allowed. It does not include trailing decimal zeroes.
-    :param min_items: only applies to lists, requires the field to have a minimum number of
-      elements. The schema will have a ``minItems`` validation keyword
-    :param max_items: only applies to lists, requires the field to have a maximum number of
-      elements. The schema will have a ``maxItems`` validation keyword
-    :param unique_items: only applies to lists, requires the field not to have duplicated
-      elements. The schema will have a ``uniqueItems`` validation keyword
-    :param min_length: only applies to strings, requires the field to have a minimum length. The
-      schema will have a ``minLength`` validation keyword
-    :param max_length: only applies to strings, requires the field to have a maximum length. The
-      schema will have a ``maxLength`` validation keyword
-    :param allow_mutation: a boolean which defaults to True. When False, the field raises a TypeError if the field is
-      assigned on an instance.  The BaseModel Config must set validate_assignment to True
-    :param regex: only applies to strings, requires the field match against a regular expression
-      pattern string. The schema will have a ``pattern`` validation keyword
-    :param discriminator: only useful with a (discriminated a.k.a. tagged) `Union` of sub models with a common field.
-      The `discriminator` is the name of this common field to shorten validation and improve generated schema
-    :param repr: show this field in the representation
-    :param **extra: any additional keyword arguments will be added as is to the schema
-    """
-    field_info = FieldInfo(
-        default,
-        default_factory=default_factory,
-        alias=alias,
-        title=title,
-        description=description,
-        exclude=exclude,
-        include=include,
-        const=const,
-        gt=gt,
-        ge=ge,
-        lt=lt,
-        le=le,
-        multiple_of=multiple_of,
-        allow_inf_nan=allow_inf_nan,
-        max_digits=max_digits,
-        decimal_places=decimal_places,
-        min_items=min_items,
-        max_items=max_items,
-        unique_items=unique_items,
-        min_length=min_length,
-        max_length=max_length,
-        allow_mutation=allow_mutation,
-        regex=regex,
-        discriminator=discriminator,
-        repr=repr,
-        **extra,
-    )
-    field_info._validate()
-    return field_info
-
-
-# used to be an enum but changed to int's for small performance improvement as less access overhead
-SHAPE_SINGLETON = 1
-SHAPE_LIST = 2
-SHAPE_SET = 3
-SHAPE_MAPPING = 4
-SHAPE_TUPLE = 5
-SHAPE_TUPLE_ELLIPSIS = 6
-SHAPE_SEQUENCE = 7
-SHAPE_FROZENSET = 8
-SHAPE_ITERABLE = 9
-SHAPE_GENERIC = 10
-SHAPE_DEQUE = 11
-SHAPE_DICT = 12
-SHAPE_DEFAULTDICT = 13
-SHAPE_COUNTER = 14
-SHAPE_NAME_LOOKUP = {
-    SHAPE_LIST: 'List[{}]',
-    SHAPE_SET: 'Set[{}]',
-    SHAPE_TUPLE_ELLIPSIS: 'Tuple[{}, ...]',
-    SHAPE_SEQUENCE: 'Sequence[{}]',
-    SHAPE_FROZENSET: 'FrozenSet[{}]',
-    SHAPE_ITERABLE: 'Iterable[{}]',
-    SHAPE_DEQUE: 'Deque[{}]',
-    SHAPE_DICT: 'Dict[{}]',
-    SHAPE_DEFAULTDICT: 'DefaultDict[{}]',
-    SHAPE_COUNTER: 'Counter[{}]',
-}
-
-MAPPING_LIKE_SHAPES: Set[int] = {SHAPE_DEFAULTDICT, SHAPE_DICT, SHAPE_MAPPING, SHAPE_COUNTER}
-
-
-class ModelField(Representation):
-    __slots__ = (
-        'type_',
-        'outer_type_',
-        'annotation',
-        'sub_fields',
-        'sub_fields_mapping',
-        'key_field',
-        'validators',
-        'pre_validators',
-        'post_validators',
-        'default',
-        'default_factory',
-        'required',
-        'final',
-        'model_config',
-        'name',
-        'alias',
-        'has_alias',
-        'field_info',
-        'discriminator_key',
-        'discriminator_alias',
-        'validate_always',
-        'allow_none',
-        'shape',
-        'class_validators',
-        'parse_json',
-    )
-
-    def __init__(
-        self,
-        *,
-        name: str,
-        type_: Type[Any],
-        class_validators: Optional[Dict[str, Validator]],
-        model_config: Type['BaseConfig'],
-        default: Any = None,
-        default_factory: Optional[NoArgAnyCallable] = None,
-        required: 'BoolUndefined' = Undefined,
-        final: bool = False,
-        alias: Optional[str] = None,
-        field_info: Optional[FieldInfo] = None,
-    ) -> None:
-        self.name: str = name
-        self.has_alias: bool = alias is not None
-        self.alias: str = alias if alias is not None else name
-        self.annotation = type_
-        self.type_: Any = convert_generics(type_)
-        self.outer_type_: Any = type_
-        self.class_validators = class_validators or {}
-        self.default: Any = default
-        self.default_factory: Optional[NoArgAnyCallable] = default_factory
-        self.required: 'BoolUndefined' = required
-        self.final: bool = final
-        self.model_config = model_config
-        self.field_info: FieldInfo = field_info or FieldInfo(default)
-        self.discriminator_key: Optional[str] = self.field_info.discriminator
-        self.discriminator_alias: Optional[str] = self.discriminator_key
-
-        self.allow_none: bool = False
-        self.validate_always: bool = False
-        self.sub_fields: Optional[List[ModelField]] = None
-        self.sub_fields_mapping: Optional[Dict[str, 'ModelField']] = None  # used for discriminated union
-        self.key_field: Optional[ModelField] = None
-        self.validators: 'ValidatorsList' = []
-        self.pre_validators: Optional['ValidatorsList'] = None
-        self.post_validators: Optional['ValidatorsList'] = None
-        self.parse_json: bool = False
-        self.shape: int = SHAPE_SINGLETON
-        self.model_config.prepare_field(self)
-        self.prepare()
-
-    def get_default(self) -> Any:
-        return smart_deepcopy(self.default) if self.default_factory is None else self.default_factory()
-
-    @staticmethod
-    def _get_field_info(
-        field_name: str, annotation: Any, value: Any, config: Type['BaseConfig']
-    ) -> Tuple[FieldInfo, Any]:
-        """
-        Get a FieldInfo from a root typing.Annotated annotation, value, or config default.
-
-        The FieldInfo may be set in typing.Annotated or the value, but not both. If neither contain
-        a FieldInfo, a new one will be created using the config.
-
-        :param field_name: name of the field for use in error messages
-        :param annotation: a type hint such as `str` or `Annotated[str, Field(..., min_length=5)]`
-        :param value: the field's assigned value
-        :param config: the model's config object
-        :return: the FieldInfo contained in the `annotation`, the value, or a new one from the config.
-        """
-        field_info_from_config = config.get_field_info(field_name)
-
-        field_info = None
-        if get_origin(annotation) is Annotated:
-            field_infos = [arg for arg in get_args(annotation)[1:] if isinstance(arg, FieldInfo)]
-            if len(field_infos) > 1:
-                raise ValueError(f'cannot specify multiple `Annotated` `Field`s for {field_name!r}')
-            field_info = next(iter(field_infos), None)
-            if field_info is not None:
-                field_info = copy.copy(field_info)
-                field_info.update_from_config(field_info_from_config)
-                if field_info.default not in (Undefined, Required):
-                    raise ValueError(f'`Field` default cannot be set in `Annotated` for {field_name!r}')
-                if value is not Undefined and value is not Required:
-                    # check also `Required` because of `validate_arguments` that sets `...` as default value
-                    field_info.default = value
-
-        if isinstance(value, FieldInfo):
-            if field_info is not None:
-                raise ValueError(f'cannot specify `Annotated` and value `Field`s together for {field_name!r}')
-            field_info = value
-            field_info.update_from_config(field_info_from_config)
-        elif field_info is None:
-            field_info = FieldInfo(value, **field_info_from_config)
-        value = None if field_info.default_factory is not None else field_info.default
-        field_info._validate()
-        return field_info, value
-
-    @classmethod
-    def infer(
-        cls,
-        *,
-        name: str,
-        value: Any,
-        annotation: Any,
-        class_validators: Optional[Dict[str, Validator]],
-        config: Type['BaseConfig'],
-    ) -> 'ModelField':
-        from .schema import get_annotation_from_field_info
-
-        field_info, value = cls._get_field_info(name, annotation, value, config)
-        required: 'BoolUndefined' = Undefined
-        if value is Required:
-            required = True
-            value = None
-        elif value is not Undefined:
-            required = False
-        annotation = get_annotation_from_field_info(annotation, field_info, name, config.validate_assignment)
-
-        return cls(
-            name=name,
-            type_=annotation,
-            alias=field_info.alias,
-            class_validators=class_validators,
-            default=value,
-            default_factory=field_info.default_factory,
-            required=required,
-            model_config=config,
-            field_info=field_info,
-        )
-
-    def set_config(self, config: Type['BaseConfig']) -> None:
-        self.model_config = config
-        info_from_config = config.get_field_info(self.name)
-        config.prepare_field(self)
-        new_alias = info_from_config.get('alias')
-        new_alias_priority = info_from_config.get('alias_priority') or 0
-        if new_alias and new_alias_priority >= (self.field_info.alias_priority or 0):
-            self.field_info.alias = new_alias
-            self.field_info.alias_priority = new_alias_priority
-            self.alias = new_alias
-        new_exclude = info_from_config.get('exclude')
-        if new_exclude is not None:
-            self.field_info.exclude = ValueItems.merge(self.field_info.exclude, new_exclude)
-        new_include = info_from_config.get('include')
-        if new_include is not None:
-            self.field_info.include = ValueItems.merge(self.field_info.include, new_include, intersect=True)
-
-    @property
-    def alt_alias(self) -> bool:
-        return self.name != self.alias
-
-    def prepare(self) -> None:
-        """
-        Prepare the field but inspecting self.default, self.type_ etc.
-
-        Note: this method is **not** idempotent (because _type_analysis is not idempotent),
-        e.g. calling it it multiple times may modify the field and configure it incorrectly.
-        """
-        self._set_default_and_type()
-        if self.type_.__class__ is ForwardRef or self.type_.__class__ is DeferredType:
-            # self.type_ is currently a ForwardRef and there's nothing we can do now,
-            # user will need to call model.update_forward_refs()
-            return
-
-        self._type_analysis()
-        if self.required is Undefined:
-            self.required = True
-        if self.default is Undefined and self.default_factory is None:
-            self.default = None
-        self.populate_validators()
-
-    def _set_default_and_type(self) -> None:
-        """
-        Set the default value, infer the type if needed and check if `None` value is valid.
-        """
-        if self.default_factory is not None:
-            if self.type_ is Undefined:
-                raise errors_.ConfigError(
-                    f'you need to set the type of field {self.name!r} when using `default_factory`'
-                )
-            return
-
-        default_value = self.get_default()
-
-        if default_value is not None and self.type_ is Undefined:
-            self.type_ = default_value.__class__
-            self.outer_type_ = self.type_
-            self.annotation = self.type_
-
-        if self.type_ is Undefined:
-            raise errors_.ConfigError(f'unable to infer type for attribute "{self.name}"')
-
-        if self.required is False and default_value is None:
-            self.allow_none = True
-
-    def _type_analysis(self) -> None:  # noqa: C901 (ignore complexity)
-        # typing interface is horrible, we have to do some ugly checks
-        if lenient_issubclass(self.type_, JsonWrapper):
-            self.type_ = self.type_.inner_type
-            self.parse_json = True
-        elif lenient_issubclass(self.type_, Json):
-            self.type_ = Any
-            self.parse_json = True
-        elif isinstance(self.type_, TypeVar):
-            if self.type_.__bound__:
-                self.type_ = self.type_.__bound__
-            elif self.type_.__constraints__:
-                self.type_ = Union[self.type_.__constraints__]
-            else:
-                self.type_ = Any
-        elif is_new_type(self.type_):
-            self.type_ = new_type_supertype(self.type_)
-
-        if self.type_ is Any or self.type_ is object:
-            if self.required is Undefined:
-                self.required = False
-            self.allow_none = True
-            return
-        elif self.type_ is Pattern or self.type_ is re.Pattern:
-            # python 3.7 only, Pattern is a typing object but without sub fields
-            return
-        elif is_literal_type(self.type_):
-            return
-        elif is_typeddict(self.type_):
-            return
-
-        if is_finalvar(self.type_):
-            self.final = True
-
-            if self.type_ is Final:
-                self.type_ = Any
-            else:
-                self.type_ = get_args(self.type_)[0]
-
-            self._type_analysis()
-            return
-
-        origin = get_origin(self.type_)
-
-        if origin is Annotated or is_typeddict_special(origin):
-            self.type_ = get_args(self.type_)[0]
-            self._type_analysis()
-            return
-
-        if self.discriminator_key is not None and not is_union(origin):
-            raise TypeError('`discriminator` can only be used with `Union` type with more than one variant')
-
-        # add extra check for `collections.abc.Hashable` for python 3.10+ where origin is not `None`
-        if origin is None or origin is CollectionsHashable:
-            # field is not "typing" object eg. Union, Dict, List etc.
-            # allow None for virtual superclasses of NoneType, e.g. Hashable
-            if isinstance(self.type_, type) and isinstance(None, self.type_):
-                self.allow_none = True
-            return
-        elif origin is Callable:
-            return
-        elif is_union(origin):
-            types_ = []
-            for type_ in get_args(self.type_):
-                if is_none_type(type_) or type_ is Any or type_ is object:
-                    if self.required is Undefined:
-                        self.required = False
-                    self.allow_none = True
-                if is_none_type(type_):
-                    continue
-                types_.append(type_)
-
-            if len(types_) == 1:
-                # Optional[]
-                self.type_ = types_[0]
-                # this is the one case where the "outer type" isn't just the original type
-                self.outer_type_ = self.type_
-                # re-run to correctly interpret the new self.type_
-                self._type_analysis()
-            else:
-                self.sub_fields = [self._create_sub_type(t, f'{self.name}_{display_as_type(t)}') for t in types_]
-
-                if self.discriminator_key is not None:
-                    self.prepare_discriminated_union_sub_fields()
-            return
-        elif issubclass(origin, Tuple):  # type: ignore
-            # origin == Tuple without item type
-            args = get_args(self.type_)
-            if not args:  # plain tuple
-                self.type_ = Any
-                self.shape = SHAPE_TUPLE_ELLIPSIS
-            elif len(args) == 2 and args[1] is Ellipsis:  # e.g. Tuple[int, ...]
-                self.type_ = args[0]
-                self.shape = SHAPE_TUPLE_ELLIPSIS
-                self.sub_fields = [self._create_sub_type(args[0], f'{self.name}_0')]
-            elif args == ((),):  # Tuple[()] means empty tuple
-                self.shape = SHAPE_TUPLE
-                self.type_ = Any
-                self.sub_fields = []
-            else:
-                self.shape = SHAPE_TUPLE
-                self.sub_fields = [self._create_sub_type(t, f'{self.name}_{i}') for i, t in enumerate(args)]
-            return
-        elif issubclass(origin, List):
-            # Create self validators
-            get_validators = getattr(self.type_, '__get_validators__', None)
-            if get_validators:
-                self.class_validators.update(
-                    {f'list_{i}': Validator(validator, pre=True) for i, validator in enumerate(get_validators())}
-                )
-
-            self.type_ = get_args(self.type_)[0]
-            self.shape = SHAPE_LIST
-        elif issubclass(origin, Set):
-            # Create self validators
-            get_validators = getattr(self.type_, '__get_validators__', None)
-            if get_validators:
-                self.class_validators.update(
-                    {f'set_{i}': Validator(validator, pre=True) for i, validator in enumerate(get_validators())}
-                )
-
-            self.type_ = get_args(self.type_)[0]
-            self.shape = SHAPE_SET
-        elif issubclass(origin, FrozenSet):
-            # Create self validators
-            get_validators = getattr(self.type_, '__get_validators__', None)
-            if get_validators:
-                self.class_validators.update(
-                    {f'frozenset_{i}': Validator(validator, pre=True) for i, validator in enumerate(get_validators())}
-                )
-
-            self.type_ = get_args(self.type_)[0]
-            self.shape = SHAPE_FROZENSET
-        elif issubclass(origin, Deque):
-            self.type_ = get_args(self.type_)[0]
-            self.shape = SHAPE_DEQUE
-        elif issubclass(origin, Sequence):
-            self.type_ = get_args(self.type_)[0]
-            self.shape = SHAPE_SEQUENCE
-        # priority to most common mapping: dict
-        elif origin is dict or origin is Dict:
-            self.key_field = self._create_sub_type(get_args(self.type_)[0], 'key_' + self.name, for_keys=True)
-            self.type_ = get_args(self.type_)[1]
-            self.shape = SHAPE_DICT
-        elif issubclass(origin, DefaultDict):
-            self.key_field = self._create_sub_type(get_args(self.type_)[0], 'key_' + self.name, for_keys=True)
-            self.type_ = get_args(self.type_)[1]
-            self.shape = SHAPE_DEFAULTDICT
-        elif issubclass(origin, Counter):
-            self.key_field = self._create_sub_type(get_args(self.type_)[0], 'key_' + self.name, for_keys=True)
-            self.type_ = int
-            self.shape = SHAPE_COUNTER
-        elif issubclass(origin, Mapping):
-            self.key_field = self._create_sub_type(get_args(self.type_)[0], 'key_' + self.name, for_keys=True)
-            self.type_ = get_args(self.type_)[1]
-            self.shape = SHAPE_MAPPING
-        # Equality check as almost everything inherits form Iterable, including str
-        # check for Iterable and CollectionsIterable, as it could receive one even when declared with the other
-        elif origin in {Iterable, CollectionsIterable}:
-            self.type_ = get_args(self.type_)[0]
-            self.shape = SHAPE_ITERABLE
-            self.sub_fields = [self._create_sub_type(self.type_, f'{self.name}_type')]
-        elif issubclass(origin, Type):  # type: ignore
-            return
-        elif hasattr(origin, '__get_validators__') or self.model_config.arbitrary_types_allowed:
-            # Is a Pydantic-compatible generic that handles itself
-            # or we have arbitrary_types_allowed = True
-            self.shape = SHAPE_GENERIC
-            self.sub_fields = [self._create_sub_type(t, f'{self.name}_{i}') for i, t in enumerate(get_args(self.type_))]
-            self.type_ = origin
-            return
-        else:
-            raise TypeError(f'Fields of type "{origin}" are not supported.')
-
-        # type_ has been refined eg. as the type of a List and sub_fields needs to be populated
-        self.sub_fields = [self._create_sub_type(self.type_, '_' + self.name)]
-
-    def prepare_discriminated_union_sub_fields(self) -> None:
-        """
-        Prepare the mapping <discriminator key> -> <ModelField> and update `sub_fields`
-        Note that this process can be aborted if a `ForwardRef` is encountered
-        """
-        assert self.discriminator_key is not None
-
-        if self.type_.__class__ is DeferredType:
-            return
-
-        assert self.sub_fields is not None
-        sub_fields_mapping: Dict[str, 'ModelField'] = {}
-        all_aliases: Set[str] = set()
-
-        for sub_field in self.sub_fields:
-            t = sub_field.type_
-            if t.__class__ is ForwardRef:
-                # Stopping everything...will need to call `update_forward_refs`
-                return
-
-            alias, discriminator_values = get_discriminator_alias_and_values(t, self.discriminator_key)
-            all_aliases.add(alias)
-            for discriminator_value in discriminator_values:
-                sub_fields_mapping[discriminator_value] = sub_field
-
-        self.sub_fields_mapping = sub_fields_mapping
-        self.discriminator_alias = get_unique_discriminator_alias(all_aliases, self.discriminator_key)
-
-    def _create_sub_type(self, type_: Type[Any], name: str, *, for_keys: bool = False) -> 'ModelField':
-        if for_keys:
-            class_validators = None
-        else:
-            # validators for sub items should not have `each_item` as we want to check only the first sublevel
-            class_validators = {
-                k: Validator(
-                    func=v.func,
-                    pre=v.pre,
-                    each_item=False,
-                    always=v.always,
-                    check_fields=v.check_fields,
-                    skip_on_failure=v.skip_on_failure,
-                )
-                for k, v in self.class_validators.items()
-                if v.each_item
-            }
-
-        field_info, _ = self._get_field_info(name, type_, None, self.model_config)
-
-        return self.__class__(
-            type_=type_,
-            name=name,
-            class_validators=class_validators,
-            model_config=self.model_config,
-            field_info=field_info,
-        )
-
-    def populate_validators(self) -> None:
-        """
-        Prepare self.pre_validators, self.validators, and self.post_validators based on self.type_'s  __get_validators__
-        and class validators. This method should be idempotent, e.g. it should be safe to call multiple times
-        without mis-configuring the field.
-        """
-        self.validate_always = getattr(self.type_, 'validate_always', False) or any(
-            v.always for v in self.class_validators.values()
-        )
-
-        class_validators_ = self.class_validators.values()
-        if not self.sub_fields or self.shape == SHAPE_GENERIC:
-            get_validators = getattr(self.type_, '__get_validators__', None)
-            v_funcs = (
-                *[v.func for v in class_validators_ if v.each_item and v.pre],
-                *(get_validators() if get_validators else list(find_validators(self.type_, self.model_config))),
-                *[v.func for v in class_validators_ if v.each_item and not v.pre],
-            )
-            self.validators = prep_validators(v_funcs)
-
-        self.pre_validators = []
-        self.post_validators = []
-
-        if self.field_info and self.field_info.const:
-            self.post_validators.append(make_generic_validator(constant_validator))
-
-        if class_validators_:
-            self.pre_validators += prep_validators(v.func for v in class_validators_ if not v.each_item and v.pre)
-            self.post_validators += prep_validators(v.func for v in class_validators_ if not v.each_item and not v.pre)
-
-        if self.parse_json:
-            self.pre_validators.append(make_generic_validator(validate_json))
-
-        self.pre_validators = self.pre_validators or None
-        self.post_validators = self.post_validators or None
-
-    def validate(
-        self, v: Any, values: Dict[str, Any], *, loc: 'LocStr', cls: Optional['ModelOrDc'] = None
-    ) -> 'ValidateReturn':
-        assert self.type_.__class__ is not DeferredType
-
-        if self.type_.__class__ is ForwardRef:
-            assert cls is not None
-            raise ConfigError(
-                f'field "{self.name}" not yet prepared so type is still a ForwardRef, '
-                f'you might need to call {cls.__name__}.update_forward_refs().'
-            )
-
-        errors: Optional['ErrorList']
-        if self.pre_validators:
-            v, errors = self._apply_validators(v, values, loc, cls, self.pre_validators)
-            if errors:
-                return v, errors
-
-        if v is None:
-            if is_none_type(self.type_):
-                # keep validating
-                pass
-            elif self.allow_none:
-                if self.post_validators:
-                    return self._apply_validators(v, values, loc, cls, self.post_validators)
-                else:
-                    return None, None
-            else:
-                return v, ErrorWrapper(NoneIsNotAllowedError(), loc)
-
-        if self.shape == SHAPE_SINGLETON:
-            v, errors = self._validate_singleton(v, values, loc, cls)
-        elif self.shape in MAPPING_LIKE_SHAPES:
-            v, errors = self._validate_mapping_like(v, values, loc, cls)
-        elif self.shape == SHAPE_TUPLE:
-            v, errors = self._validate_tuple(v, values, loc, cls)
-        elif self.shape == SHAPE_ITERABLE:
-            v, errors = self._validate_iterable(v, values, loc, cls)
-        elif self.shape == SHAPE_GENERIC:
-            v, errors = self._apply_validators(v, values, loc, cls, self.validators)
-        else:
-            #  sequence, list, set, generator, tuple with ellipsis, frozen set
-            v, errors = self._validate_sequence_like(v, values, loc, cls)
-
-        if not errors and self.post_validators:
-            v, errors = self._apply_validators(v, values, loc, cls, self.post_validators)
-        return v, errors
-
-    def _validate_sequence_like(  # noqa: C901 (ignore complexity)
-        self, v: Any, values: Dict[str, Any], loc: 'LocStr', cls: Optional['ModelOrDc']
-    ) -> 'ValidateReturn':
-        """
-        Validate sequence-like containers: lists, tuples, sets and generators
-        Note that large if-else blocks are necessary to enable Cython
-        optimization, which is why we disable the complexity check above.
-        """
-        if not sequence_like(v):
-            e: errors_.PydanticTypeError
-            if self.shape == SHAPE_LIST:
-                e = errors_.ListError()
-            elif self.shape in (SHAPE_TUPLE, SHAPE_TUPLE_ELLIPSIS):
-                e = errors_.TupleError()
-            elif self.shape == SHAPE_SET:
-                e = errors_.SetError()
-            elif self.shape == SHAPE_FROZENSET:
-                e = errors_.FrozenSetError()
-            else:
-                e = errors_.SequenceError()
-            return v, ErrorWrapper(e, loc)
-
-        loc = loc if isinstance(loc, tuple) else (loc,)
-        result = []
-        errors: List[ErrorList] = []
-        for i, v_ in enumerate(v):
-            v_loc = *loc, i
-            r, ee = self._validate_singleton(v_, values, v_loc, cls)
-            if ee:
-                errors.append(ee)
-            else:
-                result.append(r)
-
-        if errors:
-            return v, errors
-
-        converted: Union[List[Any], Set[Any], FrozenSet[Any], Tuple[Any, ...], Iterator[Any], Deque[Any]] = result
-
-        if self.shape == SHAPE_SET:
-            converted = set(result)
-        elif self.shape == SHAPE_FROZENSET:
-            converted = frozenset(result)
-        elif self.shape == SHAPE_TUPLE_ELLIPSIS:
-            converted = tuple(result)
-        elif self.shape == SHAPE_DEQUE:
-            converted = deque(result, maxlen=getattr(v, 'maxlen', None))
-        elif self.shape == SHAPE_SEQUENCE:
-            if isinstance(v, tuple):
-                converted = tuple(result)
-            elif isinstance(v, set):
-                converted = set(result)
-            elif isinstance(v, Generator):
-                converted = iter(result)
-            elif isinstance(v, deque):
-                converted = deque(result, maxlen=getattr(v, 'maxlen', None))
-        return converted, None
-
-    def _validate_iterable(
-        self, v: Any, values: Dict[str, Any], loc: 'LocStr', cls: Optional['ModelOrDc']
-    ) -> 'ValidateReturn':
-        """
-        Validate Iterables.
-
-        This intentionally doesn't validate values to allow infinite generators.
-        """
-
-        try:
-            iterable = iter(v)
-        except TypeError:
-            return v, ErrorWrapper(errors_.IterableError(), loc)
-        return iterable, None
-
-    def _validate_tuple(
-        self, v: Any, values: Dict[str, Any], loc: 'LocStr', cls: Optional['ModelOrDc']
-    ) -> 'ValidateReturn':
-        e: Optional[Exception] = None
-        if not sequence_like(v):
-            e = errors_.TupleError()
-        else:
-            actual_length, expected_length = len(v), len(self.sub_fields)  # type: ignore
-            if actual_length != expected_length:
-                e = errors_.TupleLengthError(actual_length=actual_length, expected_length=expected_length)
-
-        if e:
-            return v, ErrorWrapper(e, loc)
-
-        loc = loc if isinstance(loc, tuple) else (loc,)
-        result = []
-        errors: List[ErrorList] = []
-        for i, (v_, field) in enumerate(zip(v, self.sub_fields)):  # type: ignore
-            v_loc = *loc, i
-            r, ee = field.validate(v_, values, loc=v_loc, cls=cls)
-            if ee:
-                errors.append(ee)
-            else:
-                result.append(r)
-
-        if errors:
-            return v, errors
-        else:
-            return tuple(result), None
-
-    def _validate_mapping_like(
-        self, v: Any, values: Dict[str, Any], loc: 'LocStr', cls: Optional['ModelOrDc']
-    ) -> 'ValidateReturn':
-        try:
-            v_iter = dict_validator(v)
-        except TypeError as exc:
-            return v, ErrorWrapper(exc, loc)
-
-        loc = loc if isinstance(loc, tuple) else (loc,)
-        result, errors = {}, []
-        for k, v_ in v_iter.items():
-            v_loc = *loc, '__key__'
-            key_result, key_errors = self.key_field.validate(k, values, loc=v_loc, cls=cls)  # type: ignore
-            if key_errors:
-                errors.append(key_errors)
-                continue
-
-            v_loc = *loc, k
-            value_result, value_errors = self._validate_singleton(v_, values, v_loc, cls)
-            if value_errors:
-                errors.append(value_errors)
-                continue
-
-            result[key_result] = value_result
-        if errors:
-            return v, errors
-        elif self.shape == SHAPE_DICT:
-            return result, None
-        elif self.shape == SHAPE_DEFAULTDICT:
-            return defaultdict(self.type_, result), None
-        elif self.shape == SHAPE_COUNTER:
-            return CollectionCounter(result), None
-        else:
-            return self._get_mapping_value(v, result), None
-
-    def _get_mapping_value(self, original: T, converted: Dict[Any, Any]) -> Union[T, Dict[Any, Any]]:
-        """
-        When type is `Mapping[KT, KV]` (or another unsupported mapping), we try to avoid
-        coercing to `dict` unwillingly.
-        """
-        original_cls = original.__class__
-
-        if original_cls == dict or original_cls == Dict:
-            return converted
-        elif original_cls in {defaultdict, DefaultDict}:
-            return defaultdict(self.type_, converted)
-        else:
-            try:
-                # Counter, OrderedDict, UserDict, ...
-                return original_cls(converted)  # type: ignore
-            except TypeError:
-                raise RuntimeError(f'Could not convert dictionary to {original_cls.__name__!r}') from None
-
-    def _validate_singleton(
-        self, v: Any, values: Dict[str, Any], loc: 'LocStr', cls: Optional['ModelOrDc']
-    ) -> 'ValidateReturn':
-        if self.sub_fields:
-            if self.discriminator_key is not None:
-                return self._validate_discriminated_union(v, values, loc, cls)
-
-            errors = []
-
-            if self.model_config.smart_union and is_union(get_origin(self.type_)):
-                # 1st pass: check if the value is an exact instance of one of the Union types
-                # (e.g. to avoid coercing a bool into an int)
-                for field in self.sub_fields:
-                    if v.__class__ is field.outer_type_:
-                        return v, None
-
-                # 2nd pass: check if the value is an instance of any subclass of the Union types
-                for field in self.sub_fields:
-                    # This whole logic will be improved later on to support more complex `isinstance` checks
-                    # It will probably be done once a strict mode is added and be something like:
-                    # ```
-                    #     value, error = field.validate(v, values, strict=True)
-                    #     if error is None:
-                    #         return value, None
-                    # ```
-                    try:
-                        if isinstance(v, field.outer_type_):
-                            return v, None
-                    except TypeError:
-                        # compound type
-                        if lenient_isinstance(v, get_origin(field.outer_type_)):
-                            value, error = field.validate(v, values, loc=loc, cls=cls)
-                            if not error:
-                                return value, None
-
-            # 1st pass by default or 3rd pass with `smart_union` enabled:
-            # check if the value can be coerced into one of the Union types
-            for field in self.sub_fields:
-                value, error = field.validate(v, values, loc=loc, cls=cls)
-                if error:
-                    errors.append(error)
-                else:
-                    return value, None
-            return v, errors
-        else:
-            return self._apply_validators(v, values, loc, cls, self.validators)
-
-    def _validate_discriminated_union(
-        self, v: Any, values: Dict[str, Any], loc: 'LocStr', cls: Optional['ModelOrDc']
-    ) -> 'ValidateReturn':
-        assert self.discriminator_key is not None
-        assert self.discriminator_alias is not None
-
-        try:
-            try:
-                discriminator_value = v[self.discriminator_alias]
-            except KeyError:
-                if self.model_config.allow_population_by_field_name:
-                    discriminator_value = v[self.discriminator_key]
-                else:
-                    raise
-        except KeyError:
-            return v, ErrorWrapper(MissingDiscriminator(discriminator_key=self.discriminator_key), loc)
-        except TypeError:
-            try:
-                # BaseModel or dataclass
-                discriminator_value = getattr(v, self.discriminator_key)
-            except (AttributeError, TypeError):
-                return v, ErrorWrapper(MissingDiscriminator(discriminator_key=self.discriminator_key), loc)
-
-        if self.sub_fields_mapping is None:
-            assert cls is not None
-            raise ConfigError(
-                f'field "{self.name}" not yet prepared so type is still a ForwardRef, '
-                f'you might need to call {cls.__name__}.update_forward_refs().'
-            )
-
-        try:
-            sub_field = self.sub_fields_mapping[discriminator_value]
-        except (KeyError, TypeError):
-            # KeyError: `discriminator_value` is not in the dictionary.
-            # TypeError: `discriminator_value` is unhashable.
-            assert self.sub_fields_mapping is not None
-            return v, ErrorWrapper(
-                InvalidDiscriminator(
-                    discriminator_key=self.discriminator_key,
-                    discriminator_value=discriminator_value,
-                    allowed_values=list(self.sub_fields_mapping),
-                ),
-                loc,
-            )
-        else:
-            if not isinstance(loc, tuple):
-                loc = (loc,)
-            return sub_field.validate(v, values, loc=(*loc, display_as_type(sub_field.type_)), cls=cls)
-
-    def _apply_validators(
-        self, v: Any, values: Dict[str, Any], loc: 'LocStr', cls: Optional['ModelOrDc'], validators: 'ValidatorsList'
-    ) -> 'ValidateReturn':
-        for validator in validators:
-            try:
-                v = validator(cls, v, values, self, self.model_config)
-            except (ValueError, TypeError, AssertionError) as exc:
-                return v, ErrorWrapper(exc, loc)
-        return v, None
-
-    def is_complex(self) -> bool:
-        """
-        Whether the field is "complex" eg. env variables should be parsed as JSON.
-        """
-        from .main import BaseModel
-
-        return (
-            self.shape != SHAPE_SINGLETON
-            or hasattr(self.type_, '__pydantic_model__')
-            or lenient_issubclass(self.type_, (BaseModel, list, set, frozenset, dict))
-        )
-
-    def _type_display(self) -> PyObjectStr:
-        t = display_as_type(self.type_)
-
-        if self.shape in MAPPING_LIKE_SHAPES:
-            t = f'Mapping[{display_as_type(self.key_field.type_)}, {t}]'  # type: ignore
-        elif self.shape == SHAPE_TUPLE:
-            t = 'Tuple[{}]'.format(', '.join(display_as_type(f.type_) for f in self.sub_fields))  # type: ignore
-        elif self.shape == SHAPE_GENERIC:
-            assert self.sub_fields
-            t = '{}[{}]'.format(
-                display_as_type(self.type_), ', '.join(display_as_type(f.type_) for f in self.sub_fields)
-            )
-        elif self.shape != SHAPE_SINGLETON:
-            t = SHAPE_NAME_LOOKUP[self.shape].format(t)
-
-        if self.allow_none and (self.shape != SHAPE_SINGLETON or not self.sub_fields):
-            t = f'Optional[{t}]'
-        return PyObjectStr(t)
-
-    def __repr_args__(self) -> 'ReprArgs':
-        args = [('name', self.name), ('type', self._type_display()), ('required', self.required)]
-
-        if not self.required:
-            if self.default_factory is not None:
-                args.append(('default_factory', f'<function {self.default_factory.__name__}>'))
-            else:
-                args.append(('default', self.default))
-
-        if self.alt_alias:
-            args.append(('alias', self.alias))
-        return args
-
-
-class ModelPrivateAttr(Representation):
-    __slots__ = ('default', 'default_factory')
-
-    def __init__(self, default: Any = Undefined, *, default_factory: Optional[NoArgAnyCallable] = None) -> None:
-        self.default = default
-        self.default_factory = default_factory
-
-    def get_default(self) -> Any:
-        return smart_deepcopy(self.default) if self.default_factory is None else self.default_factory()
-
-    def __eq__(self, other: Any) -> bool:
-        return isinstance(other, self.__class__) and (self.default, self.default_factory) == (
-            other.default,
-            other.default_factory,
-        )
-
-
-def PrivateAttr(
-    default: Any = Undefined,
-    *,
-    default_factory: Optional[NoArgAnyCallable] = None,
-) -> Any:
-    """
-    Indicates that attribute is only used internally and never mixed with regular fields.
-
-    Types or values of private attrs are not checked by pydantic and it's up to you to keep them relevant.
-
-    Private attrs are stored in model __slots__.
-
-    :param default: the attribute’s default value
-    :param default_factory: callable that will be called when a default value is needed for this attribute
-      If both `default` and `default_factory` are set, an error is raised.
-    """
-    if default is not Undefined and default_factory is not None:
-        raise ValueError('cannot specify both default and default_factory')
-
-    return ModelPrivateAttr(
-        default,
-        default_factory=default_factory,
-    )
-
-
-class DeferredType:
-    """
-    Used to postpone field preparation, while creating recursive generic models.
-    """
-
-
-def is_finalvar_with_default_val(type_: Type[Any], val: Any) -> bool:
-    return is_finalvar(type_) and val is not Undefined and not isinstance(val, FieldInfo)
diff --git a/lib/pydantic/v1/generics.py b/lib/pydantic/v1/generics.py
deleted file mode 100644
index a75b6b98..00000000
--- a/lib/pydantic/v1/generics.py
+++ /dev/null
@@ -1,400 +0,0 @@
-import sys
-import types
-import typing
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    ClassVar,
-    Dict,
-    ForwardRef,
-    Generic,
-    Iterator,
-    List,
-    Mapping,
-    Optional,
-    Tuple,
-    Type,
-    TypeVar,
-    Union,
-    cast,
-)
-from weakref import WeakKeyDictionary, WeakValueDictionary
-
-from typing_extensions import Annotated, Literal as ExtLiteral
-
-from .class_validators import gather_all_validators
-from .fields import DeferredType
-from .main import BaseModel, create_model
-from .types import JsonWrapper
-from .typing import display_as_type, get_all_type_hints, get_args, get_origin, typing_base
-from .utils import all_identical, lenient_issubclass
-
-if sys.version_info >= (3, 10):
-    from typing import _UnionGenericAlias
-if sys.version_info >= (3, 8):
-    from typing import Literal
-
-GenericModelT = TypeVar('GenericModelT', bound='GenericModel')
-TypeVarType = Any  # since mypy doesn't allow the use of TypeVar as a type
-
-CacheKey = Tuple[Type[Any], Any, Tuple[Any, ...]]
-Parametrization = Mapping[TypeVarType, Type[Any]]
-
-# weak dictionaries allow the dynamically created parametrized versions of generic models to get collected
-# once they are no longer referenced by the caller.
-if sys.version_info >= (3, 9):  # Typing for weak dictionaries available at 3.9
-    GenericTypesCache = WeakValueDictionary[CacheKey, Type[BaseModel]]
-    AssignedParameters = WeakKeyDictionary[Type[BaseModel], Parametrization]
-else:
-    GenericTypesCache = WeakValueDictionary
-    AssignedParameters = WeakKeyDictionary
-
-# _generic_types_cache is a Mapping from __class_getitem__ arguments to the parametrized version of generic models.
-# This ensures multiple calls of e.g. A[B] return always the same class.
-_generic_types_cache = GenericTypesCache()
-
-# _assigned_parameters is a Mapping from parametrized version of generic models to assigned types of parametrizations
-# as captured during construction of the class (not instances).
-# E.g., for generic model `Model[A, B]`, when parametrized model `Model[int, str]` is created,
-# `Model[int, str]`: {A: int, B: str}` will be stored in `_assigned_parameters`.
-# (This information is only otherwise available after creation from the class name string).
-_assigned_parameters = AssignedParameters()
-
-
-class GenericModel(BaseModel):
-    __slots__ = ()
-    __concrete__: ClassVar[bool] = False
-
-    if TYPE_CHECKING:
-        # Putting this in a TYPE_CHECKING block allows us to replace `if Generic not in cls.__bases__` with
-        # `not hasattr(cls, "__parameters__")`. This means we don't need to force non-concrete subclasses of
-        # `GenericModel` to also inherit from `Generic`, which would require changes to the use of `create_model` below.
-        __parameters__: ClassVar[Tuple[TypeVarType, ...]]
-
-    # Setting the return type as Type[Any] instead of Type[BaseModel] prevents PyCharm warnings
-    def __class_getitem__(cls: Type[GenericModelT], params: Union[Type[Any], Tuple[Type[Any], ...]]) -> Type[Any]:
-        """Instantiates a new class from a generic class `cls` and type variables `params`.
-
-        :param params: Tuple of types the class . Given a generic class
-            `Model` with 2 type variables and a concrete model `Model[str, int]`,
-            the value `(str, int)` would be passed to `params`.
-        :return: New model class inheriting from `cls` with instantiated
-            types described by `params`. If no parameters are given, `cls` is
-            returned as is.
-
-        """
-
-        def _cache_key(_params: Any) -> CacheKey:
-            args = get_args(_params)
-            # python returns a list for Callables, which is not hashable
-            if len(args) == 2 and isinstance(args[0], list):
-                args = (tuple(args[0]), args[1])
-            return cls, _params, args
-
-        cached = _generic_types_cache.get(_cache_key(params))
-        if cached is not None:
-            return cached
-        if cls.__concrete__ and Generic not in cls.__bases__:
-            raise TypeError('Cannot parameterize a concrete instantiation of a generic model')
-        if not isinstance(params, tuple):
-            params = (params,)
-        if cls is GenericModel and any(isinstance(param, TypeVar) for param in params):
-            raise TypeError('Type parameters should be placed on typing.Generic, not GenericModel')
-        if not hasattr(cls, '__parameters__'):
-            raise TypeError(f'Type {cls.__name__} must inherit from typing.Generic before being parameterized')
-
-        check_parameters_count(cls, params)
-        # Build map from generic typevars to passed params
-        typevars_map: Dict[TypeVarType, Type[Any]] = dict(zip(cls.__parameters__, params))
-        if all_identical(typevars_map.keys(), typevars_map.values()) and typevars_map:
-            return cls  # if arguments are equal to parameters it's the same object
-
-        # Create new model with original model as parent inserting fields with DeferredType.
-        model_name = cls.__concrete_name__(params)
-        validators = gather_all_validators(cls)
-
-        type_hints = get_all_type_hints(cls).items()
-        instance_type_hints = {k: v for k, v in type_hints if get_origin(v) is not ClassVar}
-
-        fields = {k: (DeferredType(), cls.__fields__[k].field_info) for k in instance_type_hints if k in cls.__fields__}
-
-        model_module, called_globally = get_caller_frame_info()
-        created_model = cast(
-            Type[GenericModel],  # casting ensures mypy is aware of the __concrete__ and __parameters__ attributes
-            create_model(
-                model_name,
-                __module__=model_module or cls.__module__,
-                __base__=(cls,) + tuple(cls.__parameterized_bases__(typevars_map)),
-                __config__=None,
-                __validators__=validators,
-                __cls_kwargs__=None,
-                **fields,
-            ),
-        )
-
-        _assigned_parameters[created_model] = typevars_map
-
-        if called_globally:  # create global reference and therefore allow pickling
-            object_by_reference = None
-            reference_name = model_name
-            reference_module_globals = sys.modules[created_model.__module__].__dict__
-            while object_by_reference is not created_model:
-                object_by_reference = reference_module_globals.setdefault(reference_name, created_model)
-                reference_name += '_'
-
-        created_model.Config = cls.Config
-
-        # Find any typevars that are still present in the model.
-        # If none are left, the model is fully "concrete", otherwise the new
-        # class is a generic class as well taking the found typevars as
-        # parameters.
-        new_params = tuple(
-            {param: None for param in iter_contained_typevars(typevars_map.values())}
-        )  # use dict as ordered set
-        created_model.__concrete__ = not new_params
-        if new_params:
-            created_model.__parameters__ = new_params
-
-        # Save created model in cache so we don't end up creating duplicate
-        # models that should be identical.
-        _generic_types_cache[_cache_key(params)] = created_model
-        if len(params) == 1:
-            _generic_types_cache[_cache_key(params[0])] = created_model
-
-        # Recursively walk class type hints and replace generic typevars
-        # with concrete types that were passed.
-        _prepare_model_fields(created_model, fields, instance_type_hints, typevars_map)
-
-        return created_model
-
-    @classmethod
-    def __concrete_name__(cls: Type[Any], params: Tuple[Type[Any], ...]) -> str:
-        """Compute class name for child classes.
-
-        :param params: Tuple of types the class . Given a generic class
-            `Model` with 2 type variables and a concrete model `Model[str, int]`,
-            the value `(str, int)` would be passed to `params`.
-        :return: String representing a the new class where `params` are
-            passed to `cls` as type variables.
-
-        This method can be overridden to achieve a custom naming scheme for GenericModels.
-        """
-        param_names = [display_as_type(param) for param in params]
-        params_component = ', '.join(param_names)
-        return f'{cls.__name__}[{params_component}]'
-
-    @classmethod
-    def __parameterized_bases__(cls, typevars_map: Parametrization) -> Iterator[Type[Any]]:
-        """
-        Returns unbound bases of cls parameterised to given type variables
-
-        :param typevars_map: Dictionary of type applications for binding subclasses.
-            Given a generic class `Model` with 2 type variables [S, T]
-            and a concrete model `Model[str, int]`,
-            the value `{S: str, T: int}` would be passed to `typevars_map`.
-        :return: an iterator of generic sub classes, parameterised by `typevars_map`
-            and other assigned parameters of `cls`
-
-        e.g.:
-        ```
-        class A(GenericModel, Generic[T]):
-            ...
-
-        class B(A[V], Generic[V]):
-            ...
-
-        assert A[int] in B.__parameterized_bases__({V: int})
-        ```
-        """
-
-        def build_base_model(
-            base_model: Type[GenericModel], mapped_types: Parametrization
-        ) -> Iterator[Type[GenericModel]]:
-            base_parameters = tuple(mapped_types[param] for param in base_model.__parameters__)
-            parameterized_base = base_model.__class_getitem__(base_parameters)
-            if parameterized_base is base_model or parameterized_base is cls:
-                # Avoid duplication in MRO
-                return
-            yield parameterized_base
-
-        for base_model in cls.__bases__:
-            if not issubclass(base_model, GenericModel):
-                # not a class that can be meaningfully parameterized
-                continue
-            elif not getattr(base_model, '__parameters__', None):
-                # base_model is "GenericModel"  (and has no __parameters__)
-                # or
-                # base_model is already concrete, and will be included transitively via cls.
-                continue
-            elif cls in _assigned_parameters:
-                if base_model in _assigned_parameters:
-                    # cls is partially parameterised but not from base_model
-                    # e.g. cls = B[S], base_model = A[S]
-                    # B[S][int] should subclass A[int],  (and will be transitively via B[int])
-                    # but it's not viable to consistently subclass types with arbitrary construction
-                    # So don't attempt to include A[S][int]
-                    continue
-                else:  # base_model not in _assigned_parameters:
-                    # cls is partially parameterized, base_model is original generic
-                    # e.g.  cls = B[str, T], base_model = B[S, T]
-                    # Need to determine the mapping for the base_model parameters
-                    mapped_types: Parametrization = {
-                        key: typevars_map.get(value, value) for key, value in _assigned_parameters[cls].items()
-                    }
-                    yield from build_base_model(base_model, mapped_types)
-            else:
-                # cls is base generic, so base_class has a distinct base
-                # can construct the Parameterised base model using typevars_map directly
-                yield from build_base_model(base_model, typevars_map)
-
-
-def replace_types(type_: Any, type_map: Mapping[Any, Any]) -> Any:
-    """Return type with all occurrences of `type_map` keys recursively replaced with their values.
-
-    :param type_: Any type, class or generic alias
-    :param type_map: Mapping from `TypeVar` instance to concrete types.
-    :return: New type representing the basic structure of `type_` with all
-        `typevar_map` keys recursively replaced.
-
-    >>> replace_types(Tuple[str, Union[List[str], float]], {str: int})
-    Tuple[int, Union[List[int], float]]
-
-    """
-    if not type_map:
-        return type_
-
-    type_args = get_args(type_)
-    origin_type = get_origin(type_)
-
-    if origin_type is Annotated:
-        annotated_type, *annotations = type_args
-        return Annotated[replace_types(annotated_type, type_map), tuple(annotations)]
-
-    if (origin_type is ExtLiteral) or (sys.version_info >= (3, 8) and origin_type is Literal):
-        return type_map.get(type_, type_)
-    # Having type args is a good indicator that this is a typing module
-    # class instantiation or a generic alias of some sort.
-    if type_args:
-        resolved_type_args = tuple(replace_types(arg, type_map) for arg in type_args)
-        if all_identical(type_args, resolved_type_args):
-            # If all arguments are the same, there is no need to modify the
-            # type or create a new object at all
-            return type_
-        if (
-            origin_type is not None
-            and isinstance(type_, typing_base)
-            and not isinstance(origin_type, typing_base)
-            and getattr(type_, '_name', None) is not None
-        ):
-            # In python < 3.9 generic aliases don't exist so any of these like `list`,
-            # `type` or `collections.abc.Callable` need to be translated.
-            # See: https://www.python.org/dev/peps/pep-0585
-            origin_type = getattr(typing, type_._name)
-        assert origin_type is not None
-        # PEP-604 syntax (Ex.: list | str) is represented with a types.UnionType object that does not have __getitem__.
-        # We also cannot use isinstance() since we have to compare types.
-        if sys.version_info >= (3, 10) and origin_type is types.UnionType:  # noqa: E721
-            return _UnionGenericAlias(origin_type, resolved_type_args)
-        return origin_type[resolved_type_args]
-
-    # We handle pydantic generic models separately as they don't have the same
-    # semantics as "typing" classes or generic aliases
-    if not origin_type and lenient_issubclass(type_, GenericModel) and not type_.__concrete__:
-        type_args = type_.__parameters__
-        resolved_type_args = tuple(replace_types(t, type_map) for t in type_args)
-        if all_identical(type_args, resolved_type_args):
-            return type_
-        return type_[resolved_type_args]
-
-    # Handle special case for typehints that can have lists as arguments.
-    # `typing.Callable[[int, str], int]` is an example for this.
-    if isinstance(type_, (List, list)):
-        resolved_list = list(replace_types(element, type_map) for element in type_)
-        if all_identical(type_, resolved_list):
-            return type_
-        return resolved_list
-
-    # For JsonWrapperValue, need to handle its inner type to allow correct parsing
-    # of generic Json arguments like Json[T]
-    if not origin_type and lenient_issubclass(type_, JsonWrapper):
-        type_.inner_type = replace_types(type_.inner_type, type_map)
-        return type_
-
-    # If all else fails, we try to resolve the type directly and otherwise just
-    # return the input with no modifications.
-    new_type = type_map.get(type_, type_)
-    # Convert string to ForwardRef
-    if isinstance(new_type, str):
-        return ForwardRef(new_type)
-    else:
-        return new_type
-
-
-def check_parameters_count(cls: Type[GenericModel], parameters: Tuple[Any, ...]) -> None:
-    actual = len(parameters)
-    expected = len(cls.__parameters__)
-    if actual != expected:
-        description = 'many' if actual > expected else 'few'
-        raise TypeError(f'Too {description} parameters for {cls.__name__}; actual {actual}, expected {expected}')
-
-
-DictValues: Type[Any] = {}.values().__class__
-
-
-def iter_contained_typevars(v: Any) -> Iterator[TypeVarType]:
-    """Recursively iterate through all subtypes and type args of `v` and yield any typevars that are found."""
-    if isinstance(v, TypeVar):
-        yield v
-    elif hasattr(v, '__parameters__') and not get_origin(v) and lenient_issubclass(v, GenericModel):
-        yield from v.__parameters__
-    elif isinstance(v, (DictValues, list)):
-        for var in v:
-            yield from iter_contained_typevars(var)
-    else:
-        args = get_args(v)
-        for arg in args:
-            yield from iter_contained_typevars(arg)
-
-
-def get_caller_frame_info() -> Tuple[Optional[str], bool]:
-    """
-    Used inside a function to check whether it was called globally
-
-    Will only work against non-compiled code, therefore used only in pydantic.generics
-
-    :returns Tuple[module_name, called_globally]
-    """
-    try:
-        previous_caller_frame = sys._getframe(2)
-    except ValueError as e:
-        raise RuntimeError('This function must be used inside another function') from e
-    except AttributeError:  # sys module does not have _getframe function, so there's nothing we can do about it
-        return None, False
-    frame_globals = previous_caller_frame.f_globals
-    return frame_globals.get('__name__'), previous_caller_frame.f_locals is frame_globals
-
-
-def _prepare_model_fields(
-    created_model: Type[GenericModel],
-    fields: Mapping[str, Any],
-    instance_type_hints: Mapping[str, type],
-    typevars_map: Mapping[Any, type],
-) -> None:
-    """
-    Replace DeferredType fields with concrete type hints and prepare them.
-    """
-
-    for key, field in created_model.__fields__.items():
-        if key not in fields:
-            assert field.type_.__class__ is not DeferredType
-            # https://github.com/nedbat/coveragepy/issues/198
-            continue  # pragma: no cover
-
-        assert field.type_.__class__ is DeferredType, field.type_.__class__
-
-        field_type_hint = instance_type_hints[key]
-        concrete_type = replace_types(field_type_hint, typevars_map)
-        field.type_ = concrete_type
-        field.outer_type_ = concrete_type
-        field.prepare()
-        created_model.__annotations__[key] = concrete_type
diff --git a/lib/pydantic/v1/json.py b/lib/pydantic/v1/json.py
deleted file mode 100644
index b358b850..00000000
--- a/lib/pydantic/v1/json.py
+++ /dev/null
@@ -1,112 +0,0 @@
-import datetime
-from collections import deque
-from decimal import Decimal
-from enum import Enum
-from ipaddress import IPv4Address, IPv4Interface, IPv4Network, IPv6Address, IPv6Interface, IPv6Network
-from pathlib import Path
-from re import Pattern
-from types import GeneratorType
-from typing import Any, Callable, Dict, Type, Union
-from uuid import UUID
-
-from .color import Color
-from .networks import NameEmail
-from .types import SecretBytes, SecretStr
-
-__all__ = 'pydantic_encoder', 'custom_pydantic_encoder', 'timedelta_isoformat'
-
-
-def isoformat(o: Union[datetime.date, datetime.time]) -> str:
-    return o.isoformat()
-
-
-def decimal_encoder(dec_value: Decimal) -> Union[int, float]:
-    """
-    Encodes a Decimal as int of there's no exponent, otherwise float
-
-    This is useful when we use ConstrainedDecimal to represent Numeric(x,0)
-    where a integer (but not int typed) is used. Encoding this as a float
-    results in failed round-tripping between encode and parse.
-    Our Id type is a prime example of this.
-
-    >>> decimal_encoder(Decimal("1.0"))
-    1.0
-
-    >>> decimal_encoder(Decimal("1"))
-    1
-    """
-    if dec_value.as_tuple().exponent >= 0:
-        return int(dec_value)
-    else:
-        return float(dec_value)
-
-
-ENCODERS_BY_TYPE: Dict[Type[Any], Callable[[Any], Any]] = {
-    bytes: lambda o: o.decode(),
-    Color: str,
-    datetime.date: isoformat,
-    datetime.datetime: isoformat,
-    datetime.time: isoformat,
-    datetime.timedelta: lambda td: td.total_seconds(),
-    Decimal: decimal_encoder,
-    Enum: lambda o: o.value,
-    frozenset: list,
-    deque: list,
-    GeneratorType: list,
-    IPv4Address: str,
-    IPv4Interface: str,
-    IPv4Network: str,
-    IPv6Address: str,
-    IPv6Interface: str,
-    IPv6Network: str,
-    NameEmail: str,
-    Path: str,
-    Pattern: lambda o: o.pattern,
-    SecretBytes: str,
-    SecretStr: str,
-    set: list,
-    UUID: str,
-}
-
-
-def pydantic_encoder(obj: Any) -> Any:
-    from dataclasses import asdict, is_dataclass
-
-    from .main import BaseModel
-
-    if isinstance(obj, BaseModel):
-        return obj.dict()
-    elif is_dataclass(obj):
-        return asdict(obj)
-
-    # Check the class type and its superclasses for a matching encoder
-    for base in obj.__class__.__mro__[:-1]:
-        try:
-            encoder = ENCODERS_BY_TYPE[base]
-        except KeyError:
-            continue
-        return encoder(obj)
-    else:  # We have exited the for loop without finding a suitable encoder
-        raise TypeError(f"Object of type '{obj.__class__.__name__}' is not JSON serializable")
-
-
-def custom_pydantic_encoder(type_encoders: Dict[Any, Callable[[Type[Any]], Any]], obj: Any) -> Any:
-    # Check the class type and its superclasses for a matching encoder
-    for base in obj.__class__.__mro__[:-1]:
-        try:
-            encoder = type_encoders[base]
-        except KeyError:
-            continue
-
-        return encoder(obj)
-    else:  # We have exited the for loop without finding a suitable encoder
-        return pydantic_encoder(obj)
-
-
-def timedelta_isoformat(td: datetime.timedelta) -> str:
-    """
-    ISO 8601 encoding for Python timedelta object.
-    """
-    minutes, seconds = divmod(td.seconds, 60)
-    hours, minutes = divmod(minutes, 60)
-    return f'{"-" if td.days < 0 else ""}P{abs(td.days)}DT{hours:d}H{minutes:d}M{seconds:d}.{td.microseconds:06d}S'
diff --git a/lib/pydantic/v1/main.py b/lib/pydantic/v1/main.py
deleted file mode 100644
index 08b8af55..00000000
--- a/lib/pydantic/v1/main.py
+++ /dev/null
@@ -1,1107 +0,0 @@
-import warnings
-from abc import ABCMeta
-from copy import deepcopy
-from enum import Enum
-from functools import partial
-from pathlib import Path
-from types import FunctionType, prepare_class, resolve_bases
-from typing import (
-    TYPE_CHECKING,
-    AbstractSet,
-    Any,
-    Callable,
-    ClassVar,
-    Dict,
-    List,
-    Mapping,
-    Optional,
-    Tuple,
-    Type,
-    TypeVar,
-    Union,
-    cast,
-    no_type_check,
-    overload,
-)
-
-from typing_extensions import dataclass_transform
-
-from .class_validators import ValidatorGroup, extract_root_validators, extract_validators, inherit_validators
-from .config import BaseConfig, Extra, inherit_config, prepare_config
-from .error_wrappers import ErrorWrapper, ValidationError
-from .errors import ConfigError, DictError, ExtraError, MissingError
-from .fields import (
-    MAPPING_LIKE_SHAPES,
-    Field,
-    ModelField,
-    ModelPrivateAttr,
-    PrivateAttr,
-    Undefined,
-    is_finalvar_with_default_val,
-)
-from .json import custom_pydantic_encoder, pydantic_encoder
-from .parse import Protocol, load_file, load_str_bytes
-from .schema import default_ref_template, model_schema
-from .types import PyObject, StrBytes
-from .typing import (
-    AnyCallable,
-    get_args,
-    get_origin,
-    is_classvar,
-    is_namedtuple,
-    is_union,
-    resolve_annotations,
-    update_model_forward_refs,
-)
-from .utils import (
-    DUNDER_ATTRIBUTES,
-    ROOT_KEY,
-    ClassAttribute,
-    GetterDict,
-    Representation,
-    ValueItems,
-    generate_model_signature,
-    is_valid_field,
-    is_valid_private_name,
-    lenient_issubclass,
-    sequence_like,
-    smart_deepcopy,
-    unique_list,
-    validate_field_name,
-)
-
-if TYPE_CHECKING:
-    from inspect import Signature
-
-    from .class_validators import ValidatorListDict
-    from .types import ModelOrDc
-    from .typing import (
-        AbstractSetIntStr,
-        AnyClassMethod,
-        CallableGenerator,
-        DictAny,
-        DictStrAny,
-        MappingIntStrAny,
-        ReprArgs,
-        SetStr,
-        TupleGenerator,
-    )
-
-    Model = TypeVar('Model', bound='BaseModel')
-
-__all__ = 'BaseModel', 'create_model', 'validate_model'
-
-_T = TypeVar('_T')
-
-
-def validate_custom_root_type(fields: Dict[str, ModelField]) -> None:
-    if len(fields) > 1:
-        raise ValueError(f'{ROOT_KEY} cannot be mixed with other fields')
-
-
-def generate_hash_function(frozen: bool) -> Optional[Callable[[Any], int]]:
-    def hash_function(self_: Any) -> int:
-        return hash(self_.__class__) + hash(tuple(self_.__dict__.values()))
-
-    return hash_function if frozen else None
-
-
-# If a field is of type `Callable`, its default value should be a function and cannot to ignored.
-ANNOTATED_FIELD_UNTOUCHED_TYPES: Tuple[Any, ...] = (property, type, classmethod, staticmethod)
-# When creating a `BaseModel` instance, we bypass all the methods, properties... added to the model
-UNTOUCHED_TYPES: Tuple[Any, ...] = (FunctionType,) + ANNOTATED_FIELD_UNTOUCHED_TYPES
-# Note `ModelMetaclass` refers to `BaseModel`, but is also used to *create* `BaseModel`, so we need to add this extra
-# (somewhat hacky) boolean to keep track of whether we've created the `BaseModel` class yet, and therefore whether it's
-# safe to refer to it. If it *hasn't* been created, we assume that the `__new__` call we're in the middle of is for
-# the `BaseModel` class, since that's defined immediately after the metaclass.
-_is_base_model_class_defined = False
-
-
-@dataclass_transform(kw_only_default=True, field_specifiers=(Field,))
-class ModelMetaclass(ABCMeta):
-    @no_type_check  # noqa C901
-    def __new__(mcs, name, bases, namespace, **kwargs):  # noqa C901
-        fields: Dict[str, ModelField] = {}
-        config = BaseConfig
-        validators: 'ValidatorListDict' = {}
-
-        pre_root_validators, post_root_validators = [], []
-        private_attributes: Dict[str, ModelPrivateAttr] = {}
-        base_private_attributes: Dict[str, ModelPrivateAttr] = {}
-        slots: SetStr = namespace.get('__slots__', ())
-        slots = {slots} if isinstance(slots, str) else set(slots)
-        class_vars: SetStr = set()
-        hash_func: Optional[Callable[[Any], int]] = None
-
-        for base in reversed(bases):
-            if _is_base_model_class_defined and issubclass(base, BaseModel) and base != BaseModel:
-                fields.update(smart_deepcopy(base.__fields__))
-                config = inherit_config(base.__config__, config)
-                validators = inherit_validators(base.__validators__, validators)
-                pre_root_validators += base.__pre_root_validators__
-                post_root_validators += base.__post_root_validators__
-                base_private_attributes.update(base.__private_attributes__)
-                class_vars.update(base.__class_vars__)
-                hash_func = base.__hash__
-
-        resolve_forward_refs = kwargs.pop('__resolve_forward_refs__', True)
-        allowed_config_kwargs: SetStr = {
-            key
-            for key in dir(config)
-            if not (key.startswith('__') and key.endswith('__'))  # skip dunder methods and attributes
-        }
-        config_kwargs = {key: kwargs.pop(key) for key in kwargs.keys() & allowed_config_kwargs}
-        config_from_namespace = namespace.get('Config')
-        if config_kwargs and config_from_namespace:
-            raise TypeError('Specifying config in two places is ambiguous, use either Config attribute or class kwargs')
-        config = inherit_config(config_from_namespace, config, **config_kwargs)
-
-        validators = inherit_validators(extract_validators(namespace), validators)
-        vg = ValidatorGroup(validators)
-
-        for f in fields.values():
-            f.set_config(config)
-            extra_validators = vg.get_validators(f.name)
-            if extra_validators:
-                f.class_validators.update(extra_validators)
-                # re-run prepare to add extra validators
-                f.populate_validators()
-
-        prepare_config(config, name)
-
-        untouched_types = ANNOTATED_FIELD_UNTOUCHED_TYPES
-
-        def is_untouched(v: Any) -> bool:
-            return isinstance(v, untouched_types) or v.__class__.__name__ == 'cython_function_or_method'
-
-        if (namespace.get('__module__'), namespace.get('__qualname__')) != ('pydantic.main', 'BaseModel'):
-            annotations = resolve_annotations(namespace.get('__annotations__', {}), namespace.get('__module__', None))
-            # annotation only fields need to come first in fields
-            for ann_name, ann_type in annotations.items():
-                if is_classvar(ann_type):
-                    class_vars.add(ann_name)
-                elif is_finalvar_with_default_val(ann_type, namespace.get(ann_name, Undefined)):
-                    class_vars.add(ann_name)
-                elif is_valid_field(ann_name):
-                    validate_field_name(bases, ann_name)
-                    value = namespace.get(ann_name, Undefined)
-                    allowed_types = get_args(ann_type) if is_union(get_origin(ann_type)) else (ann_type,)
-                    if (
-                        is_untouched(value)
-                        and ann_type != PyObject
-                        and not any(
-                            lenient_issubclass(get_origin(allowed_type), Type) for allowed_type in allowed_types
-                        )
-                    ):
-                        continue
-                    fields[ann_name] = ModelField.infer(
-                        name=ann_name,
-                        value=value,
-                        annotation=ann_type,
-                        class_validators=vg.get_validators(ann_name),
-                        config=config,
-                    )
-                elif ann_name not in namespace and config.underscore_attrs_are_private:
-                    private_attributes[ann_name] = PrivateAttr()
-
-            untouched_types = UNTOUCHED_TYPES + config.keep_untouched
-            for var_name, value in namespace.items():
-                can_be_changed = var_name not in class_vars and not is_untouched(value)
-                if isinstance(value, ModelPrivateAttr):
-                    if not is_valid_private_name(var_name):
-                        raise NameError(
-                            f'Private attributes "{var_name}" must not be a valid field name; '
-                            f'Use sunder or dunder names, e. g. "_{var_name}" or "__{var_name}__"'
-                        )
-                    private_attributes[var_name] = value
-                elif config.underscore_attrs_are_private and is_valid_private_name(var_name) and can_be_changed:
-                    private_attributes[var_name] = PrivateAttr(default=value)
-                elif is_valid_field(var_name) and var_name not in annotations and can_be_changed:
-                    validate_field_name(bases, var_name)
-                    inferred = ModelField.infer(
-                        name=var_name,
-                        value=value,
-                        annotation=annotations.get(var_name, Undefined),
-                        class_validators=vg.get_validators(var_name),
-                        config=config,
-                    )
-                    if var_name in fields:
-                        if lenient_issubclass(inferred.type_, fields[var_name].type_):
-                            inferred.type_ = fields[var_name].type_
-                        else:
-                            raise TypeError(
-                                f'The type of {name}.{var_name} differs from the new default value; '
-                                f'if you wish to change the type of this field, please use a type annotation'
-                            )
-                    fields[var_name] = inferred
-
-        _custom_root_type = ROOT_KEY in fields
-        if _custom_root_type:
-            validate_custom_root_type(fields)
-        vg.check_for_unused()
-        if config.json_encoders:
-            json_encoder = partial(custom_pydantic_encoder, config.json_encoders)
-        else:
-            json_encoder = pydantic_encoder
-        pre_rv_new, post_rv_new = extract_root_validators(namespace)
-
-        if hash_func is None:
-            hash_func = generate_hash_function(config.frozen)
-
-        exclude_from_namespace = fields | private_attributes.keys() | {'__slots__'}
-        new_namespace = {
-            '__config__': config,
-            '__fields__': fields,
-            '__exclude_fields__': {
-                name: field.field_info.exclude for name, field in fields.items() if field.field_info.exclude is not None
-            }
-            or None,
-            '__include_fields__': {
-                name: field.field_info.include for name, field in fields.items() if field.field_info.include is not None
-            }
-            or None,
-            '__validators__': vg.validators,
-            '__pre_root_validators__': unique_list(
-                pre_root_validators + pre_rv_new,
-                name_factory=lambda v: v.__name__,
-            ),
-            '__post_root_validators__': unique_list(
-                post_root_validators + post_rv_new,
-                name_factory=lambda skip_on_failure_and_v: skip_on_failure_and_v[1].__name__,
-            ),
-            '__schema_cache__': {},
-            '__json_encoder__': staticmethod(json_encoder),
-            '__custom_root_type__': _custom_root_type,
-            '__private_attributes__': {**base_private_attributes, **private_attributes},
-            '__slots__': slots | private_attributes.keys(),
-            '__hash__': hash_func,
-            '__class_vars__': class_vars,
-            **{n: v for n, v in namespace.items() if n not in exclude_from_namespace},
-        }
-
-        cls = super().__new__(mcs, name, bases, new_namespace, **kwargs)
-        # set __signature__ attr only for model class, but not for its instances
-        cls.__signature__ = ClassAttribute('__signature__', generate_model_signature(cls.__init__, fields, config))
-        if resolve_forward_refs:
-            cls.__try_update_forward_refs__()
-
-        # preserve `__set_name__` protocol defined in https://peps.python.org/pep-0487
-        # for attributes not in `new_namespace` (e.g. private attributes)
-        for name, obj in namespace.items():
-            if name not in new_namespace:
-                set_name = getattr(obj, '__set_name__', None)
-                if callable(set_name):
-                    set_name(cls, name)
-
-        return cls
-
-    def __instancecheck__(self, instance: Any) -> bool:
-        """
-        Avoid calling ABC _abc_subclasscheck unless we're pretty sure.
-
-        See #3829 and python/cpython#92810
-        """
-        return hasattr(instance, '__fields__') and super().__instancecheck__(instance)
-
-
-object_setattr = object.__setattr__
-
-
-class BaseModel(Representation, metaclass=ModelMetaclass):
-    if TYPE_CHECKING:
-        # populated by the metaclass, defined here to help IDEs only
-        __fields__: ClassVar[Dict[str, ModelField]] = {}
-        __include_fields__: ClassVar[Optional[Mapping[str, Any]]] = None
-        __exclude_fields__: ClassVar[Optional[Mapping[str, Any]]] = None
-        __validators__: ClassVar[Dict[str, AnyCallable]] = {}
-        __pre_root_validators__: ClassVar[List[AnyCallable]]
-        __post_root_validators__: ClassVar[List[Tuple[bool, AnyCallable]]]
-        __config__: ClassVar[Type[BaseConfig]] = BaseConfig
-        __json_encoder__: ClassVar[Callable[[Any], Any]] = lambda x: x
-        __schema_cache__: ClassVar['DictAny'] = {}
-        __custom_root_type__: ClassVar[bool] = False
-        __signature__: ClassVar['Signature']
-        __private_attributes__: ClassVar[Dict[str, ModelPrivateAttr]]
-        __class_vars__: ClassVar[SetStr]
-        __fields_set__: ClassVar[SetStr] = set()
-
-    Config = BaseConfig
-    __slots__ = ('__dict__', '__fields_set__')
-    __doc__ = ''  # Null out the Representation docstring
-
-    def __init__(__pydantic_self__, **data: Any) -> None:
-        """
-        Create a new model by parsing and validating input data from keyword arguments.
-
-        Raises ValidationError if the input data cannot be parsed to form a valid model.
-        """
-        # Uses something other than `self` the first arg to allow "self" as a settable attribute
-        values, fields_set, validation_error = validate_model(__pydantic_self__.__class__, data)
-        if validation_error:
-            raise validation_error
-        try:
-            object_setattr(__pydantic_self__, '__dict__', values)
-        except TypeError as e:
-            raise TypeError(
-                'Model values must be a dict; you may not have returned a dictionary from a root validator'
-            ) from e
-        object_setattr(__pydantic_self__, '__fields_set__', fields_set)
-        __pydantic_self__._init_private_attributes()
-
-    @no_type_check
-    def __setattr__(self, name, value):  # noqa: C901 (ignore complexity)
-        if name in self.__private_attributes__ or name in DUNDER_ATTRIBUTES:
-            return object_setattr(self, name, value)
-
-        if self.__config__.extra is not Extra.allow and name not in self.__fields__:
-            raise ValueError(f'"{self.__class__.__name__}" object has no field "{name}"')
-        elif not self.__config__.allow_mutation or self.__config__.frozen:
-            raise TypeError(f'"{self.__class__.__name__}" is immutable and does not support item assignment')
-        elif name in self.__fields__ and self.__fields__[name].final:
-            raise TypeError(
-                f'"{self.__class__.__name__}" object "{name}" field is final and does not support reassignment'
-            )
-        elif self.__config__.validate_assignment:
-            new_values = {**self.__dict__, name: value}
-
-            for validator in self.__pre_root_validators__:
-                try:
-                    new_values = validator(self.__class__, new_values)
-                except (ValueError, TypeError, AssertionError) as exc:
-                    raise ValidationError([ErrorWrapper(exc, loc=ROOT_KEY)], self.__class__)
-
-            known_field = self.__fields__.get(name, None)
-            if known_field:
-                # We want to
-                # - make sure validators are called without the current value for this field inside `values`
-                # - keep other values (e.g. submodels) untouched (using `BaseModel.dict()` will change them into dicts)
-                # - keep the order of the fields
-                if not known_field.field_info.allow_mutation:
-                    raise TypeError(f'"{known_field.name}" has allow_mutation set to False and cannot be assigned')
-                dict_without_original_value = {k: v for k, v in self.__dict__.items() if k != name}
-                value, error_ = known_field.validate(value, dict_without_original_value, loc=name, cls=self.__class__)
-                if error_:
-                    raise ValidationError([error_], self.__class__)
-                else:
-                    new_values[name] = value
-
-            errors = []
-            for skip_on_failure, validator in self.__post_root_validators__:
-                if skip_on_failure and errors:
-                    continue
-                try:
-                    new_values = validator(self.__class__, new_values)
-                except (ValueError, TypeError, AssertionError) as exc:
-                    errors.append(ErrorWrapper(exc, loc=ROOT_KEY))
-            if errors:
-                raise ValidationError(errors, self.__class__)
-
-            # update the whole __dict__ as other values than just `value`
-            # may be changed (e.g. with `root_validator`)
-            object_setattr(self, '__dict__', new_values)
-        else:
-            self.__dict__[name] = value
-
-        self.__fields_set__.add(name)
-
-    def __getstate__(self) -> 'DictAny':
-        private_attrs = ((k, getattr(self, k, Undefined)) for k in self.__private_attributes__)
-        return {
-            '__dict__': self.__dict__,
-            '__fields_set__': self.__fields_set__,
-            '__private_attribute_values__': {k: v for k, v in private_attrs if v is not Undefined},
-        }
-
-    def __setstate__(self, state: 'DictAny') -> None:
-        object_setattr(self, '__dict__', state['__dict__'])
-        object_setattr(self, '__fields_set__', state['__fields_set__'])
-        for name, value in state.get('__private_attribute_values__', {}).items():
-            object_setattr(self, name, value)
-
-    def _init_private_attributes(self) -> None:
-        for name, private_attr in self.__private_attributes__.items():
-            default = private_attr.get_default()
-            if default is not Undefined:
-                object_setattr(self, name, default)
-
-    def dict(
-        self,
-        *,
-        include: Optional[Union['AbstractSetIntStr', 'MappingIntStrAny']] = None,
-        exclude: Optional[Union['AbstractSetIntStr', 'MappingIntStrAny']] = None,
-        by_alias: bool = False,
-        skip_defaults: Optional[bool] = None,
-        exclude_unset: bool = False,
-        exclude_defaults: bool = False,
-        exclude_none: bool = False,
-    ) -> 'DictStrAny':
-        """
-        Generate a dictionary representation of the model, optionally specifying which fields to include or exclude.
-
-        """
-        if skip_defaults is not None:
-            warnings.warn(
-                f'{self.__class__.__name__}.dict(): "skip_defaults" is deprecated and replaced by "exclude_unset"',
-                DeprecationWarning,
-            )
-            exclude_unset = skip_defaults
-
-        return dict(
-            self._iter(
-                to_dict=True,
-                by_alias=by_alias,
-                include=include,
-                exclude=exclude,
-                exclude_unset=exclude_unset,
-                exclude_defaults=exclude_defaults,
-                exclude_none=exclude_none,
-            )
-        )
-
-    def json(
-        self,
-        *,
-        include: Optional[Union['AbstractSetIntStr', 'MappingIntStrAny']] = None,
-        exclude: Optional[Union['AbstractSetIntStr', 'MappingIntStrAny']] = None,
-        by_alias: bool = False,
-        skip_defaults: Optional[bool] = None,
-        exclude_unset: bool = False,
-        exclude_defaults: bool = False,
-        exclude_none: bool = False,
-        encoder: Optional[Callable[[Any], Any]] = None,
-        models_as_dict: bool = True,
-        **dumps_kwargs: Any,
-    ) -> str:
-        """
-        Generate a JSON representation of the model, `include` and `exclude` arguments as per `dict()`.
-
-        `encoder` is an optional function to supply as `default` to json.dumps(), other arguments as per `json.dumps()`.
-        """
-        if skip_defaults is not None:
-            warnings.warn(
-                f'{self.__class__.__name__}.json(): "skip_defaults" is deprecated and replaced by "exclude_unset"',
-                DeprecationWarning,
-            )
-            exclude_unset = skip_defaults
-        encoder = cast(Callable[[Any], Any], encoder or self.__json_encoder__)
-
-        # We don't directly call `self.dict()`, which does exactly this with `to_dict=True`
-        # because we want to be able to keep raw `BaseModel` instances and not as `dict`.
-        # This allows users to write custom JSON encoders for given `BaseModel` classes.
-        data = dict(
-            self._iter(
-                to_dict=models_as_dict,
-                by_alias=by_alias,
-                include=include,
-                exclude=exclude,
-                exclude_unset=exclude_unset,
-                exclude_defaults=exclude_defaults,
-                exclude_none=exclude_none,
-            )
-        )
-        if self.__custom_root_type__:
-            data = data[ROOT_KEY]
-        return self.__config__.json_dumps(data, default=encoder, **dumps_kwargs)
-
-    @classmethod
-    def _enforce_dict_if_root(cls, obj: Any) -> Any:
-        if cls.__custom_root_type__ and (
-            not (isinstance(obj, dict) and obj.keys() == {ROOT_KEY})
-            and not (isinstance(obj, BaseModel) and obj.__fields__.keys() == {ROOT_KEY})
-            or cls.__fields__[ROOT_KEY].shape in MAPPING_LIKE_SHAPES
-        ):
-            return {ROOT_KEY: obj}
-        else:
-            return obj
-
-    @classmethod
-    def parse_obj(cls: Type['Model'], obj: Any) -> 'Model':
-        obj = cls._enforce_dict_if_root(obj)
-        if not isinstance(obj, dict):
-            try:
-                obj = dict(obj)
-            except (TypeError, ValueError) as e:
-                exc = TypeError(f'{cls.__name__} expected dict not {obj.__class__.__name__}')
-                raise ValidationError([ErrorWrapper(exc, loc=ROOT_KEY)], cls) from e
-        return cls(**obj)
-
-    @classmethod
-    def parse_raw(
-        cls: Type['Model'],
-        b: StrBytes,
-        *,
-        content_type: str = None,
-        encoding: str = 'utf8',
-        proto: Protocol = None,
-        allow_pickle: bool = False,
-    ) -> 'Model':
-        try:
-            obj = load_str_bytes(
-                b,
-                proto=proto,
-                content_type=content_type,
-                encoding=encoding,
-                allow_pickle=allow_pickle,
-                json_loads=cls.__config__.json_loads,
-            )
-        except (ValueError, TypeError, UnicodeDecodeError) as e:
-            raise ValidationError([ErrorWrapper(e, loc=ROOT_KEY)], cls)
-        return cls.parse_obj(obj)
-
-    @classmethod
-    def parse_file(
-        cls: Type['Model'],
-        path: Union[str, Path],
-        *,
-        content_type: str = None,
-        encoding: str = 'utf8',
-        proto: Protocol = None,
-        allow_pickle: bool = False,
-    ) -> 'Model':
-        obj = load_file(
-            path,
-            proto=proto,
-            content_type=content_type,
-            encoding=encoding,
-            allow_pickle=allow_pickle,
-            json_loads=cls.__config__.json_loads,
-        )
-        return cls.parse_obj(obj)
-
-    @classmethod
-    def from_orm(cls: Type['Model'], obj: Any) -> 'Model':
-        if not cls.__config__.orm_mode:
-            raise ConfigError('You must have the config attribute orm_mode=True to use from_orm')
-        obj = {ROOT_KEY: obj} if cls.__custom_root_type__ else cls._decompose_class(obj)
-        m = cls.__new__(cls)
-        values, fields_set, validation_error = validate_model(cls, obj)
-        if validation_error:
-            raise validation_error
-        object_setattr(m, '__dict__', values)
-        object_setattr(m, '__fields_set__', fields_set)
-        m._init_private_attributes()
-        return m
-
-    @classmethod
-    def construct(cls: Type['Model'], _fields_set: Optional['SetStr'] = None, **values: Any) -> 'Model':
-        """
-        Creates a new model setting __dict__ and __fields_set__ from trusted or pre-validated data.
-        Default values are respected, but no other validation is performed.
-        Behaves as if `Config.extra = 'allow'` was set since it adds all passed values
-        """
-        m = cls.__new__(cls)
-        fields_values: Dict[str, Any] = {}
-        for name, field in cls.__fields__.items():
-            if field.alt_alias and field.alias in values:
-                fields_values[name] = values[field.alias]
-            elif name in values:
-                fields_values[name] = values[name]
-            elif not field.required:
-                fields_values[name] = field.get_default()
-        fields_values.update(values)
-        object_setattr(m, '__dict__', fields_values)
-        if _fields_set is None:
-            _fields_set = set(values.keys())
-        object_setattr(m, '__fields_set__', _fields_set)
-        m._init_private_attributes()
-        return m
-
-    def _copy_and_set_values(self: 'Model', values: 'DictStrAny', fields_set: 'SetStr', *, deep: bool) -> 'Model':
-        if deep:
-            # chances of having empty dict here are quite low for using smart_deepcopy
-            values = deepcopy(values)
-
-        cls = self.__class__
-        m = cls.__new__(cls)
-        object_setattr(m, '__dict__', values)
-        object_setattr(m, '__fields_set__', fields_set)
-        for name in self.__private_attributes__:
-            value = getattr(self, name, Undefined)
-            if value is not Undefined:
-                if deep:
-                    value = deepcopy(value)
-                object_setattr(m, name, value)
-
-        return m
-
-    def copy(
-        self: 'Model',
-        *,
-        include: Optional[Union['AbstractSetIntStr', 'MappingIntStrAny']] = None,
-        exclude: Optional[Union['AbstractSetIntStr', 'MappingIntStrAny']] = None,
-        update: Optional['DictStrAny'] = None,
-        deep: bool = False,
-    ) -> 'Model':
-        """
-        Duplicate a model, optionally choose which fields to include, exclude and change.
-
-        :param include: fields to include in new model
-        :param exclude: fields to exclude from new model, as with values this takes precedence over include
-        :param update: values to change/add in the new model. Note: the data is not validated before creating
-            the new model: you should trust this data
-        :param deep: set to `True` to make a deep copy of the model
-        :return: new model instance
-        """
-
-        values = dict(
-            self._iter(to_dict=False, by_alias=False, include=include, exclude=exclude, exclude_unset=False),
-            **(update or {}),
-        )
-
-        # new `__fields_set__` can have unset optional fields with a set value in `update` kwarg
-        if update:
-            fields_set = self.__fields_set__ | update.keys()
-        else:
-            fields_set = set(self.__fields_set__)
-
-        return self._copy_and_set_values(values, fields_set, deep=deep)
-
-    @classmethod
-    def schema(cls, by_alias: bool = True, ref_template: str = default_ref_template) -> 'DictStrAny':
-        cached = cls.__schema_cache__.get((by_alias, ref_template))
-        if cached is not None:
-            return cached
-        s = model_schema(cls, by_alias=by_alias, ref_template=ref_template)
-        cls.__schema_cache__[(by_alias, ref_template)] = s
-        return s
-
-    @classmethod
-    def schema_json(
-        cls, *, by_alias: bool = True, ref_template: str = default_ref_template, **dumps_kwargs: Any
-    ) -> str:
-        from .json import pydantic_encoder
-
-        return cls.__config__.json_dumps(
-            cls.schema(by_alias=by_alias, ref_template=ref_template), default=pydantic_encoder, **dumps_kwargs
-        )
-
-    @classmethod
-    def __get_validators__(cls) -> 'CallableGenerator':
-        yield cls.validate
-
-    @classmethod
-    def validate(cls: Type['Model'], value: Any) -> 'Model':
-        if isinstance(value, cls):
-            copy_on_model_validation = cls.__config__.copy_on_model_validation
-            # whether to deep or shallow copy the model on validation, None means do not copy
-            deep_copy: Optional[bool] = None
-            if copy_on_model_validation not in {'deep', 'shallow', 'none'}:
-                # Warn about deprecated behavior
-                warnings.warn(
-                    "`copy_on_model_validation` should be a string: 'deep', 'shallow' or 'none'", DeprecationWarning
-                )
-                if copy_on_model_validation:
-                    deep_copy = False
-
-            if copy_on_model_validation == 'shallow':
-                # shallow copy
-                deep_copy = False
-            elif copy_on_model_validation == 'deep':
-                # deep copy
-                deep_copy = True
-
-            if deep_copy is None:
-                return value
-            else:
-                return value._copy_and_set_values(value.__dict__, value.__fields_set__, deep=deep_copy)
-
-        value = cls._enforce_dict_if_root(value)
-
-        if isinstance(value, dict):
-            return cls(**value)
-        elif cls.__config__.orm_mode:
-            return cls.from_orm(value)
-        else:
-            try:
-                value_as_dict = dict(value)
-            except (TypeError, ValueError) as e:
-                raise DictError() from e
-            return cls(**value_as_dict)
-
-    @classmethod
-    def _decompose_class(cls: Type['Model'], obj: Any) -> GetterDict:
-        if isinstance(obj, GetterDict):
-            return obj
-        return cls.__config__.getter_dict(obj)
-
-    @classmethod
-    @no_type_check
-    def _get_value(
-        cls,
-        v: Any,
-        to_dict: bool,
-        by_alias: bool,
-        include: Optional[Union['AbstractSetIntStr', 'MappingIntStrAny']],
-        exclude: Optional[Union['AbstractSetIntStr', 'MappingIntStrAny']],
-        exclude_unset: bool,
-        exclude_defaults: bool,
-        exclude_none: bool,
-    ) -> Any:
-        if isinstance(v, BaseModel):
-            if to_dict:
-                v_dict = v.dict(
-                    by_alias=by_alias,
-                    exclude_unset=exclude_unset,
-                    exclude_defaults=exclude_defaults,
-                    include=include,
-                    exclude=exclude,
-                    exclude_none=exclude_none,
-                )
-                if ROOT_KEY in v_dict:
-                    return v_dict[ROOT_KEY]
-                return v_dict
-            else:
-                return v.copy(include=include, exclude=exclude)
-
-        value_exclude = ValueItems(v, exclude) if exclude else None
-        value_include = ValueItems(v, include) if include else None
-
-        if isinstance(v, dict):
-            return {
-                k_: cls._get_value(
-                    v_,
-                    to_dict=to_dict,
-                    by_alias=by_alias,
-                    exclude_unset=exclude_unset,
-                    exclude_defaults=exclude_defaults,
-                    include=value_include and value_include.for_element(k_),
-                    exclude=value_exclude and value_exclude.for_element(k_),
-                    exclude_none=exclude_none,
-                )
-                for k_, v_ in v.items()
-                if (not value_exclude or not value_exclude.is_excluded(k_))
-                and (not value_include or value_include.is_included(k_))
-            }
-
-        elif sequence_like(v):
-            seq_args = (
-                cls._get_value(
-                    v_,
-                    to_dict=to_dict,
-                    by_alias=by_alias,
-                    exclude_unset=exclude_unset,
-                    exclude_defaults=exclude_defaults,
-                    include=value_include and value_include.for_element(i),
-                    exclude=value_exclude and value_exclude.for_element(i),
-                    exclude_none=exclude_none,
-                )
-                for i, v_ in enumerate(v)
-                if (not value_exclude or not value_exclude.is_excluded(i))
-                and (not value_include or value_include.is_included(i))
-            )
-
-            return v.__class__(*seq_args) if is_namedtuple(v.__class__) else v.__class__(seq_args)
-
-        elif isinstance(v, Enum) and getattr(cls.Config, 'use_enum_values', False):
-            return v.value
-
-        else:
-            return v
-
-    @classmethod
-    def __try_update_forward_refs__(cls, **localns: Any) -> None:
-        """
-        Same as update_forward_refs but will not raise exception
-        when forward references are not defined.
-        """
-        update_model_forward_refs(cls, cls.__fields__.values(), cls.__config__.json_encoders, localns, (NameError,))
-
-    @classmethod
-    def update_forward_refs(cls, **localns: Any) -> None:
-        """
-        Try to update ForwardRefs on fields based on this Model, globalns and localns.
-        """
-        update_model_forward_refs(cls, cls.__fields__.values(), cls.__config__.json_encoders, localns)
-
-    def __iter__(self) -> 'TupleGenerator':
-        """
-        so `dict(model)` works
-        """
-        yield from self.__dict__.items()
-
-    def _iter(
-        self,
-        to_dict: bool = False,
-        by_alias: bool = False,
-        include: Optional[Union['AbstractSetIntStr', 'MappingIntStrAny']] = None,
-        exclude: Optional[Union['AbstractSetIntStr', 'MappingIntStrAny']] = None,
-        exclude_unset: bool = False,
-        exclude_defaults: bool = False,
-        exclude_none: bool = False,
-    ) -> 'TupleGenerator':
-        # Merge field set excludes with explicit exclude parameter with explicit overriding field set options.
-        # The extra "is not None" guards are not logically necessary but optimizes performance for the simple case.
-        if exclude is not None or self.__exclude_fields__ is not None:
-            exclude = ValueItems.merge(self.__exclude_fields__, exclude)
-
-        if include is not None or self.__include_fields__ is not None:
-            include = ValueItems.merge(self.__include_fields__, include, intersect=True)
-
-        allowed_keys = self._calculate_keys(
-            include=include, exclude=exclude, exclude_unset=exclude_unset  # type: ignore
-        )
-        if allowed_keys is None and not (to_dict or by_alias or exclude_unset or exclude_defaults or exclude_none):
-            # huge boost for plain _iter()
-            yield from self.__dict__.items()
-            return
-
-        value_exclude = ValueItems(self, exclude) if exclude is not None else None
-        value_include = ValueItems(self, include) if include is not None else None
-
-        for field_key, v in self.__dict__.items():
-            if (allowed_keys is not None and field_key not in allowed_keys) or (exclude_none and v is None):
-                continue
-
-            if exclude_defaults:
-                model_field = self.__fields__.get(field_key)
-                if not getattr(model_field, 'required', True) and getattr(model_field, 'default', _missing) == v:
-                    continue
-
-            if by_alias and field_key in self.__fields__:
-                dict_key = self.__fields__[field_key].alias
-            else:
-                dict_key = field_key
-
-            if to_dict or value_include or value_exclude:
-                v = self._get_value(
-                    v,
-                    to_dict=to_dict,
-                    by_alias=by_alias,
-                    include=value_include and value_include.for_element(field_key),
-                    exclude=value_exclude and value_exclude.for_element(field_key),
-                    exclude_unset=exclude_unset,
-                    exclude_defaults=exclude_defaults,
-                    exclude_none=exclude_none,
-                )
-            yield dict_key, v
-
-    def _calculate_keys(
-        self,
-        include: Optional['MappingIntStrAny'],
-        exclude: Optional['MappingIntStrAny'],
-        exclude_unset: bool,
-        update: Optional['DictStrAny'] = None,
-    ) -> Optional[AbstractSet[str]]:
-        if include is None and exclude is None and exclude_unset is False:
-            return None
-
-        keys: AbstractSet[str]
-        if exclude_unset:
-            keys = self.__fields_set__.copy()
-        else:
-            keys = self.__dict__.keys()
-
-        if include is not None:
-            keys &= include.keys()
-
-        if update:
-            keys -= update.keys()
-
-        if exclude:
-            keys -= {k for k, v in exclude.items() if ValueItems.is_true(v)}
-
-        return keys
-
-    def __eq__(self, other: Any) -> bool:
-        if isinstance(other, BaseModel):
-            return self.dict() == other.dict()
-        else:
-            return self.dict() == other
-
-    def __repr_args__(self) -> 'ReprArgs':
-        return [
-            (k, v)
-            for k, v in self.__dict__.items()
-            if k not in DUNDER_ATTRIBUTES and (k not in self.__fields__ or self.__fields__[k].field_info.repr)
-        ]
-
-
-_is_base_model_class_defined = True
-
-
-@overload
-def create_model(
-    __model_name: str,
-    *,
-    __config__: Optional[Type[BaseConfig]] = None,
-    __base__: None = None,
-    __module__: str = __name__,
-    __validators__: Dict[str, 'AnyClassMethod'] = None,
-    __cls_kwargs__: Dict[str, Any] = None,
-    **field_definitions: Any,
-) -> Type['BaseModel']:
-    ...
-
-
-@overload
-def create_model(
-    __model_name: str,
-    *,
-    __config__: Optional[Type[BaseConfig]] = None,
-    __base__: Union[Type['Model'], Tuple[Type['Model'], ...]],
-    __module__: str = __name__,
-    __validators__: Dict[str, 'AnyClassMethod'] = None,
-    __cls_kwargs__: Dict[str, Any] = None,
-    **field_definitions: Any,
-) -> Type['Model']:
-    ...
-
-
-def create_model(
-    __model_name: str,
-    *,
-    __config__: Optional[Type[BaseConfig]] = None,
-    __base__: Union[None, Type['Model'], Tuple[Type['Model'], ...]] = None,
-    __module__: str = __name__,
-    __validators__: Dict[str, 'AnyClassMethod'] = None,
-    __cls_kwargs__: Dict[str, Any] = None,
-    __slots__: Optional[Tuple[str, ...]] = None,
-    **field_definitions: Any,
-) -> Type['Model']:
-    """
-    Dynamically create a model.
-    :param __model_name: name of the created model
-    :param __config__: config class to use for the new model
-    :param __base__: base class for the new model to inherit from
-    :param __module__: module of the created model
-    :param __validators__: a dict of method names and @validator class methods
-    :param __cls_kwargs__: a dict for class creation
-    :param __slots__: Deprecated, `__slots__` should not be passed to `create_model`
-    :param field_definitions: fields of the model (or extra fields if a base is supplied)
-        in the format `<name>=(<type>, <default default>)` or `<name>=<default value>, e.g.
-        `foobar=(str, ...)` or `foobar=123`, or, for complex use-cases, in the format
-        `<name>=<Field>` or `<name>=(<type>, <FieldInfo>)`, e.g.
-        `foo=Field(datetime, default_factory=datetime.utcnow, alias='bar')` or
-        `foo=(str, FieldInfo(title='Foo'))`
-    """
-    if __slots__ is not None:
-        # __slots__ will be ignored from here on
-        warnings.warn('__slots__ should not be passed to create_model', RuntimeWarning)
-
-    if __base__ is not None:
-        if __config__ is not None:
-            raise ConfigError('to avoid confusion __config__ and __base__ cannot be used together')
-        if not isinstance(__base__, tuple):
-            __base__ = (__base__,)
-    else:
-        __base__ = (cast(Type['Model'], BaseModel),)
-
-    __cls_kwargs__ = __cls_kwargs__ or {}
-
-    fields = {}
-    annotations = {}
-
-    for f_name, f_def in field_definitions.items():
-        if not is_valid_field(f_name):
-            warnings.warn(f'fields may not start with an underscore, ignoring "{f_name}"', RuntimeWarning)
-        if isinstance(f_def, tuple):
-            try:
-                f_annotation, f_value = f_def
-            except ValueError as e:
-                raise ConfigError(
-                    'field definitions should either be a tuple of (<type>, <default>) or just a '
-                    'default value, unfortunately this means tuples as '
-                    'default values are not allowed'
-                ) from e
-        else:
-            f_annotation, f_value = None, f_def
-
-        if f_annotation:
-            annotations[f_name] = f_annotation
-        fields[f_name] = f_value
-
-    namespace: 'DictStrAny' = {'__annotations__': annotations, '__module__': __module__}
-    if __validators__:
-        namespace.update(__validators__)
-    namespace.update(fields)
-    if __config__:
-        namespace['Config'] = inherit_config(__config__, BaseConfig)
-    resolved_bases = resolve_bases(__base__)
-    meta, ns, kwds = prepare_class(__model_name, resolved_bases, kwds=__cls_kwargs__)
-    if resolved_bases is not __base__:
-        ns['__orig_bases__'] = __base__
-    namespace.update(ns)
-    return meta(__model_name, resolved_bases, namespace, **kwds)
-
-
-_missing = object()
-
-
-def validate_model(  # noqa: C901 (ignore complexity)
-    model: Type[BaseModel], input_data: 'DictStrAny', cls: 'ModelOrDc' = None
-) -> Tuple['DictStrAny', 'SetStr', Optional[ValidationError]]:
-    """
-    validate data against a model.
-    """
-    values = {}
-    errors = []
-    # input_data names, possibly alias
-    names_used = set()
-    # field names, never aliases
-    fields_set = set()
-    config = model.__config__
-    check_extra = config.extra is not Extra.ignore
-    cls_ = cls or model
-
-    for validator in model.__pre_root_validators__:
-        try:
-            input_data = validator(cls_, input_data)
-        except (ValueError, TypeError, AssertionError) as exc:
-            return {}, set(), ValidationError([ErrorWrapper(exc, loc=ROOT_KEY)], cls_)
-
-    for name, field in model.__fields__.items():
-        value = input_data.get(field.alias, _missing)
-        using_name = False
-        if value is _missing and config.allow_population_by_field_name and field.alt_alias:
-            value = input_data.get(field.name, _missing)
-            using_name = True
-
-        if value is _missing:
-            if field.required:
-                errors.append(ErrorWrapper(MissingError(), loc=field.alias))
-                continue
-
-            value = field.get_default()
-
-            if not config.validate_all and not field.validate_always:
-                values[name] = value
-                continue
-        else:
-            fields_set.add(name)
-            if check_extra:
-                names_used.add(field.name if using_name else field.alias)
-
-        v_, errors_ = field.validate(value, values, loc=field.alias, cls=cls_)
-        if isinstance(errors_, ErrorWrapper):
-            errors.append(errors_)
-        elif isinstance(errors_, list):
-            errors.extend(errors_)
-        else:
-            values[name] = v_
-
-    if check_extra:
-        if isinstance(input_data, GetterDict):
-            extra = input_data.extra_keys() - names_used
-        else:
-            extra = input_data.keys() - names_used
-        if extra:
-            fields_set |= extra
-            if config.extra is Extra.allow:
-                for f in extra:
-                    values[f] = input_data[f]
-            else:
-                for f in sorted(extra):
-                    errors.append(ErrorWrapper(ExtraError(), loc=f))
-
-    for skip_on_failure, validator in model.__post_root_validators__:
-        if skip_on_failure and errors:
-            continue
-        try:
-            values = validator(cls_, values)
-        except (ValueError, TypeError, AssertionError) as exc:
-            errors.append(ErrorWrapper(exc, loc=ROOT_KEY))
-
-    if errors:
-        return values, fields_set, ValidationError(errors, cls_)
-    else:
-        return values, fields_set, None
diff --git a/lib/pydantic/v1/mypy.py b/lib/pydantic/v1/mypy.py
deleted file mode 100644
index 1d6d5ae2..00000000
--- a/lib/pydantic/v1/mypy.py
+++ /dev/null
@@ -1,944 +0,0 @@
-import sys
-from configparser import ConfigParser
-from typing import Any, Callable, Dict, List, Optional, Set, Tuple, Type as TypingType, Union
-
-from mypy.errorcodes import ErrorCode
-from mypy.nodes import (
-    ARG_NAMED,
-    ARG_NAMED_OPT,
-    ARG_OPT,
-    ARG_POS,
-    ARG_STAR2,
-    MDEF,
-    Argument,
-    AssignmentStmt,
-    Block,
-    CallExpr,
-    ClassDef,
-    Context,
-    Decorator,
-    EllipsisExpr,
-    FuncBase,
-    FuncDef,
-    JsonDict,
-    MemberExpr,
-    NameExpr,
-    PassStmt,
-    PlaceholderNode,
-    RefExpr,
-    StrExpr,
-    SymbolNode,
-    SymbolTableNode,
-    TempNode,
-    TypeInfo,
-    TypeVarExpr,
-    Var,
-)
-from mypy.options import Options
-from mypy.plugin import (
-    CheckerPluginInterface,
-    ClassDefContext,
-    FunctionContext,
-    MethodContext,
-    Plugin,
-    ReportConfigContext,
-    SemanticAnalyzerPluginInterface,
-)
-from mypy.plugins import dataclasses
-from mypy.semanal import set_callable_name  # type: ignore
-from mypy.server.trigger import make_wildcard_trigger
-from mypy.types import (
-    AnyType,
-    CallableType,
-    Instance,
-    NoneType,
-    Overloaded,
-    ProperType,
-    Type,
-    TypeOfAny,
-    TypeType,
-    TypeVarType,
-    UnionType,
-    get_proper_type,
-)
-from mypy.typevars import fill_typevars
-from mypy.util import get_unique_redefinition_name
-from mypy.version import __version__ as mypy_version
-
-from pydantic.utils import is_valid_field
-
-try:
-    from mypy.types import TypeVarDef  # type: ignore[attr-defined]
-except ImportError:  # pragma: no cover
-    # Backward-compatible with TypeVarDef from Mypy 0.910.
-    from mypy.types import TypeVarType as TypeVarDef
-
-CONFIGFILE_KEY = 'pydantic-mypy'
-METADATA_KEY = 'pydantic-mypy-metadata'
-_NAMESPACE = __name__[:-5]  # 'pydantic' in 1.10.X, 'pydantic.v1' in v2.X
-BASEMODEL_FULLNAME = f'{_NAMESPACE}.main.BaseModel'
-BASESETTINGS_FULLNAME = f'{_NAMESPACE}.env_settings.BaseSettings'
-MODEL_METACLASS_FULLNAME = f'{_NAMESPACE}.main.ModelMetaclass'
-FIELD_FULLNAME = f'{_NAMESPACE}.fields.Field'
-DATACLASS_FULLNAME = f'{_NAMESPACE}.dataclasses.dataclass'
-
-
-def parse_mypy_version(version: str) -> Tuple[int, ...]:
-    return tuple(map(int, version.partition('+')[0].split('.')))
-
-
-MYPY_VERSION_TUPLE = parse_mypy_version(mypy_version)
-BUILTINS_NAME = 'builtins' if MYPY_VERSION_TUPLE >= (0, 930) else '__builtins__'
-
-# Increment version if plugin changes and mypy caches should be invalidated
-__version__ = 2
-
-
-def plugin(version: str) -> 'TypingType[Plugin]':
-    """
-    `version` is the mypy version string
-
-    We might want to use this to print a warning if the mypy version being used is
-    newer, or especially older, than we expect (or need).
-    """
-    return PydanticPlugin
-
-
-class PydanticPlugin(Plugin):
-    def __init__(self, options: Options) -> None:
-        self.plugin_config = PydanticPluginConfig(options)
-        self._plugin_data = self.plugin_config.to_data()
-        super().__init__(options)
-
-    def get_base_class_hook(self, fullname: str) -> 'Optional[Callable[[ClassDefContext], None]]':
-        sym = self.lookup_fully_qualified(fullname)
-        if sym and isinstance(sym.node, TypeInfo):  # pragma: no branch
-            # No branching may occur if the mypy cache has not been cleared
-            if any(get_fullname(base) == BASEMODEL_FULLNAME for base in sym.node.mro):
-                return self._pydantic_model_class_maker_callback
-        return None
-
-    def get_metaclass_hook(self, fullname: str) -> Optional[Callable[[ClassDefContext], None]]:
-        if fullname == MODEL_METACLASS_FULLNAME:
-            return self._pydantic_model_metaclass_marker_callback
-        return None
-
-    def get_function_hook(self, fullname: str) -> 'Optional[Callable[[FunctionContext], Type]]':
-        sym = self.lookup_fully_qualified(fullname)
-        if sym and sym.fullname == FIELD_FULLNAME:
-            return self._pydantic_field_callback
-        return None
-
-    def get_method_hook(self, fullname: str) -> Optional[Callable[[MethodContext], Type]]:
-        if fullname.endswith('.from_orm'):
-            return from_orm_callback
-        return None
-
-    def get_class_decorator_hook(self, fullname: str) -> Optional[Callable[[ClassDefContext], None]]:
-        """Mark pydantic.dataclasses as dataclass.
-
-        Mypy version 1.1.1 added support for `@dataclass_transform` decorator.
-        """
-        if fullname == DATACLASS_FULLNAME and MYPY_VERSION_TUPLE < (1, 1):
-            return dataclasses.dataclass_class_maker_callback  # type: ignore[return-value]
-        return None
-
-    def report_config_data(self, ctx: ReportConfigContext) -> Dict[str, Any]:
-        """Return all plugin config data.
-
-        Used by mypy to determine if cache needs to be discarded.
-        """
-        return self._plugin_data
-
-    def _pydantic_model_class_maker_callback(self, ctx: ClassDefContext) -> None:
-        transformer = PydanticModelTransformer(ctx, self.plugin_config)
-        transformer.transform()
-
-    def _pydantic_model_metaclass_marker_callback(self, ctx: ClassDefContext) -> None:
-        """Reset dataclass_transform_spec attribute of ModelMetaclass.
-
-        Let the plugin handle it. This behavior can be disabled
-        if 'debug_dataclass_transform' is set to True', for testing purposes.
-        """
-        if self.plugin_config.debug_dataclass_transform:
-            return
-        info_metaclass = ctx.cls.info.declared_metaclass
-        assert info_metaclass, "callback not passed from 'get_metaclass_hook'"
-        if getattr(info_metaclass.type, 'dataclass_transform_spec', None):
-            info_metaclass.type.dataclass_transform_spec = None  # type: ignore[attr-defined]
-
-    def _pydantic_field_callback(self, ctx: FunctionContext) -> 'Type':
-        """
-        Extract the type of the `default` argument from the Field function, and use it as the return type.
-
-        In particular:
-        * Check whether the default and default_factory argument is specified.
-        * Output an error if both are specified.
-        * Retrieve the type of the argument which is specified, and use it as return type for the function.
-        """
-        default_any_type = ctx.default_return_type
-
-        assert ctx.callee_arg_names[0] == 'default', '"default" is no longer first argument in Field()'
-        assert ctx.callee_arg_names[1] == 'default_factory', '"default_factory" is no longer second argument in Field()'
-        default_args = ctx.args[0]
-        default_factory_args = ctx.args[1]
-
-        if default_args and default_factory_args:
-            error_default_and_default_factory_specified(ctx.api, ctx.context)
-            return default_any_type
-
-        if default_args:
-            default_type = ctx.arg_types[0][0]
-            default_arg = default_args[0]
-
-            # Fallback to default Any type if the field is required
-            if not isinstance(default_arg, EllipsisExpr):
-                return default_type
-
-        elif default_factory_args:
-            default_factory_type = ctx.arg_types[1][0]
-
-            # Functions which use `ParamSpec` can be overloaded, exposing the callable's types as a parameter
-            # Pydantic calls the default factory without any argument, so we retrieve the first item
-            if isinstance(default_factory_type, Overloaded):
-                if MYPY_VERSION_TUPLE > (0, 910):
-                    default_factory_type = default_factory_type.items[0]
-                else:
-                    # Mypy0.910 exposes the items of overloaded types in a function
-                    default_factory_type = default_factory_type.items()[0]  # type: ignore[operator]
-
-            if isinstance(default_factory_type, CallableType):
-                ret_type = default_factory_type.ret_type
-                # mypy doesn't think `ret_type` has `args`, you'd think mypy should know,
-                # add this check in case it varies by version
-                args = getattr(ret_type, 'args', None)
-                if args:
-                    if all(isinstance(arg, TypeVarType) for arg in args):
-                        # Looks like the default factory is a type like `list` or `dict`, replace all args with `Any`
-                        ret_type.args = tuple(default_any_type for _ in args)  # type: ignore[attr-defined]
-                return ret_type
-
-        return default_any_type
-
-
-class PydanticPluginConfig:
-    __slots__ = (
-        'init_forbid_extra',
-        'init_typed',
-        'warn_required_dynamic_aliases',
-        'warn_untyped_fields',
-        'debug_dataclass_transform',
-    )
-    init_forbid_extra: bool
-    init_typed: bool
-    warn_required_dynamic_aliases: bool
-    warn_untyped_fields: bool
-    debug_dataclass_transform: bool  # undocumented
-
-    def __init__(self, options: Options) -> None:
-        if options.config_file is None:  # pragma: no cover
-            return
-
-        toml_config = parse_toml(options.config_file)
-        if toml_config is not None:
-            config = toml_config.get('tool', {}).get('pydantic-mypy', {})
-            for key in self.__slots__:
-                setting = config.get(key, False)
-                if not isinstance(setting, bool):
-                    raise ValueError(f'Configuration value must be a boolean for key: {key}')
-                setattr(self, key, setting)
-        else:
-            plugin_config = ConfigParser()
-            plugin_config.read(options.config_file)
-            for key in self.__slots__:
-                setting = plugin_config.getboolean(CONFIGFILE_KEY, key, fallback=False)
-                setattr(self, key, setting)
-
-    def to_data(self) -> Dict[str, Any]:
-        return {key: getattr(self, key) for key in self.__slots__}
-
-
-def from_orm_callback(ctx: MethodContext) -> Type:
-    """
-    Raise an error if orm_mode is not enabled
-    """
-    model_type: Instance
-    ctx_type = ctx.type
-    if isinstance(ctx_type, TypeType):
-        ctx_type = ctx_type.item
-    if isinstance(ctx_type, CallableType) and isinstance(ctx_type.ret_type, Instance):
-        model_type = ctx_type.ret_type  # called on the class
-    elif isinstance(ctx_type, Instance):
-        model_type = ctx_type  # called on an instance (unusual, but still valid)
-    else:  # pragma: no cover
-        detail = f'ctx.type: {ctx_type} (of type {ctx_type.__class__.__name__})'
-        error_unexpected_behavior(detail, ctx.api, ctx.context)
-        return ctx.default_return_type
-    pydantic_metadata = model_type.type.metadata.get(METADATA_KEY)
-    if pydantic_metadata is None:
-        return ctx.default_return_type
-    orm_mode = pydantic_metadata.get('config', {}).get('orm_mode')
-    if orm_mode is not True:
-        error_from_orm(get_name(model_type.type), ctx.api, ctx.context)
-    return ctx.default_return_type
-
-
-class PydanticModelTransformer:
-    tracked_config_fields: Set[str] = {
-        'extra',
-        'allow_mutation',
-        'frozen',
-        'orm_mode',
-        'allow_population_by_field_name',
-        'alias_generator',
-    }
-
-    def __init__(self, ctx: ClassDefContext, plugin_config: PydanticPluginConfig) -> None:
-        self._ctx = ctx
-        self.plugin_config = plugin_config
-
-    def transform(self) -> None:
-        """
-        Configures the BaseModel subclass according to the plugin settings.
-
-        In particular:
-        * determines the model config and fields,
-        * adds a fields-aware signature for the initializer and construct methods
-        * freezes the class if allow_mutation = False or frozen = True
-        * stores the fields, config, and if the class is settings in the mypy metadata for access by subclasses
-        """
-        ctx = self._ctx
-        info = ctx.cls.info
-
-        self.adjust_validator_signatures()
-        config = self.collect_config()
-        fields = self.collect_fields(config)
-        is_settings = any(get_fullname(base) == BASESETTINGS_FULLNAME for base in info.mro[:-1])
-        self.add_initializer(fields, config, is_settings)
-        self.add_construct_method(fields)
-        self.set_frozen(fields, frozen=config.allow_mutation is False or config.frozen is True)
-        info.metadata[METADATA_KEY] = {
-            'fields': {field.name: field.serialize() for field in fields},
-            'config': config.set_values_dict(),
-        }
-
-    def adjust_validator_signatures(self) -> None:
-        """When we decorate a function `f` with `pydantic.validator(...), mypy sees
-        `f` as a regular method taking a `self` instance, even though pydantic
-        internally wraps `f` with `classmethod` if necessary.
-
-        Teach mypy this by marking any function whose outermost decorator is a
-        `validator()` call as a classmethod.
-        """
-        for name, sym in self._ctx.cls.info.names.items():
-            if isinstance(sym.node, Decorator):
-                first_dec = sym.node.original_decorators[0]
-                if (
-                    isinstance(first_dec, CallExpr)
-                    and isinstance(first_dec.callee, NameExpr)
-                    and first_dec.callee.fullname == f'{_NAMESPACE}.class_validators.validator'
-                ):
-                    sym.node.func.is_class = True
-
-    def collect_config(self) -> 'ModelConfigData':
-        """
-        Collects the values of the config attributes that are used by the plugin, accounting for parent classes.
-        """
-        ctx = self._ctx
-        cls = ctx.cls
-        config = ModelConfigData()
-        for stmt in cls.defs.body:
-            if not isinstance(stmt, ClassDef):
-                continue
-            if stmt.name == 'Config':
-                for substmt in stmt.defs.body:
-                    if not isinstance(substmt, AssignmentStmt):
-                        continue
-                    config.update(self.get_config_update(substmt))
-                if (
-                    config.has_alias_generator
-                    and not config.allow_population_by_field_name
-                    and self.plugin_config.warn_required_dynamic_aliases
-                ):
-                    error_required_dynamic_aliases(ctx.api, stmt)
-        for info in cls.info.mro[1:]:  # 0 is the current class
-            if METADATA_KEY not in info.metadata:
-                continue
-
-            # Each class depends on the set of fields in its ancestors
-            ctx.api.add_plugin_dependency(make_wildcard_trigger(get_fullname(info)))
-            for name, value in info.metadata[METADATA_KEY]['config'].items():
-                config.setdefault(name, value)
-        return config
-
-    def collect_fields(self, model_config: 'ModelConfigData') -> List['PydanticModelField']:
-        """
-        Collects the fields for the model, accounting for parent classes
-        """
-        # First, collect fields belonging to the current class.
-        ctx = self._ctx
-        cls = self._ctx.cls
-        fields = []  # type: List[PydanticModelField]
-        known_fields = set()  # type: Set[str]
-        for stmt in cls.defs.body:
-            if not isinstance(stmt, AssignmentStmt):  # `and stmt.new_syntax` to require annotation
-                continue
-
-            lhs = stmt.lvalues[0]
-            if not isinstance(lhs, NameExpr) or not is_valid_field(lhs.name):
-                continue
-
-            if not stmt.new_syntax and self.plugin_config.warn_untyped_fields:
-                error_untyped_fields(ctx.api, stmt)
-
-            # if lhs.name == '__config__':  # BaseConfig not well handled; I'm not sure why yet
-            #     continue
-
-            sym = cls.info.names.get(lhs.name)
-            if sym is None:  # pragma: no cover
-                # This is likely due to a star import (see the dataclasses plugin for a more detailed explanation)
-                # This is the same logic used in the dataclasses plugin
-                continue
-
-            node = sym.node
-            if isinstance(node, PlaceholderNode):  # pragma: no cover
-                # See the PlaceholderNode docstring for more detail about how this can occur
-                # Basically, it is an edge case when dealing with complex import logic
-                # This is the same logic used in the dataclasses plugin
-                continue
-            if not isinstance(node, Var):  # pragma: no cover
-                # Don't know if this edge case still happens with the `is_valid_field` check above
-                # but better safe than sorry
-                continue
-
-            # x: ClassVar[int] is ignored by dataclasses.
-            if node.is_classvar:
-                continue
-
-            is_required = self.get_is_required(cls, stmt, lhs)
-            alias, has_dynamic_alias = self.get_alias_info(stmt)
-            if (
-                has_dynamic_alias
-                and not model_config.allow_population_by_field_name
-                and self.plugin_config.warn_required_dynamic_aliases
-            ):
-                error_required_dynamic_aliases(ctx.api, stmt)
-            fields.append(
-                PydanticModelField(
-                    name=lhs.name,
-                    is_required=is_required,
-                    alias=alias,
-                    has_dynamic_alias=has_dynamic_alias,
-                    line=stmt.line,
-                    column=stmt.column,
-                )
-            )
-            known_fields.add(lhs.name)
-        all_fields = fields.copy()
-        for info in cls.info.mro[1:]:  # 0 is the current class, -2 is BaseModel, -1 is object
-            if METADATA_KEY not in info.metadata:
-                continue
-
-            superclass_fields = []
-            # Each class depends on the set of fields in its ancestors
-            ctx.api.add_plugin_dependency(make_wildcard_trigger(get_fullname(info)))
-
-            for name, data in info.metadata[METADATA_KEY]['fields'].items():
-                if name not in known_fields:
-                    field = PydanticModelField.deserialize(info, data)
-                    known_fields.add(name)
-                    superclass_fields.append(field)
-                else:
-                    (field,) = (a for a in all_fields if a.name == name)
-                    all_fields.remove(field)
-                    superclass_fields.append(field)
-            all_fields = superclass_fields + all_fields
-        return all_fields
-
-    def add_initializer(self, fields: List['PydanticModelField'], config: 'ModelConfigData', is_settings: bool) -> None:
-        """
-        Adds a fields-aware `__init__` method to the class.
-
-        The added `__init__` will be annotated with types vs. all `Any` depending on the plugin settings.
-        """
-        ctx = self._ctx
-        typed = self.plugin_config.init_typed
-        use_alias = config.allow_population_by_field_name is not True
-        force_all_optional = is_settings or bool(
-            config.has_alias_generator and not config.allow_population_by_field_name
-        )
-        init_arguments = self.get_field_arguments(
-            fields, typed=typed, force_all_optional=force_all_optional, use_alias=use_alias
-        )
-        if not self.should_init_forbid_extra(fields, config):
-            var = Var('kwargs')
-            init_arguments.append(Argument(var, AnyType(TypeOfAny.explicit), None, ARG_STAR2))
-
-        if '__init__' not in ctx.cls.info.names:
-            add_method(ctx, '__init__', init_arguments, NoneType())
-
-    def add_construct_method(self, fields: List['PydanticModelField']) -> None:
-        """
-        Adds a fully typed `construct` classmethod to the class.
-
-        Similar to the fields-aware __init__ method, but always uses the field names (not aliases),
-        and does not treat settings fields as optional.
-        """
-        ctx = self._ctx
-        set_str = ctx.api.named_type(f'{BUILTINS_NAME}.set', [ctx.api.named_type(f'{BUILTINS_NAME}.str')])
-        optional_set_str = UnionType([set_str, NoneType()])
-        fields_set_argument = Argument(Var('_fields_set', optional_set_str), optional_set_str, None, ARG_OPT)
-        construct_arguments = self.get_field_arguments(fields, typed=True, force_all_optional=False, use_alias=False)
-        construct_arguments = [fields_set_argument] + construct_arguments
-
-        obj_type = ctx.api.named_type(f'{BUILTINS_NAME}.object')
-        self_tvar_name = '_PydanticBaseModel'  # Make sure it does not conflict with other names in the class
-        tvar_fullname = ctx.cls.fullname + '.' + self_tvar_name
-        if MYPY_VERSION_TUPLE >= (1, 4):
-            tvd = TypeVarType(
-                self_tvar_name,
-                tvar_fullname,
-                -1,
-                [],
-                obj_type,
-                AnyType(TypeOfAny.from_omitted_generics),  # type: ignore[arg-type]
-            )
-            self_tvar_expr = TypeVarExpr(
-                self_tvar_name,
-                tvar_fullname,
-                [],
-                obj_type,
-                AnyType(TypeOfAny.from_omitted_generics),  # type: ignore[arg-type]
-            )
-        else:
-            tvd = TypeVarDef(self_tvar_name, tvar_fullname, -1, [], obj_type)
-            self_tvar_expr = TypeVarExpr(self_tvar_name, tvar_fullname, [], obj_type)
-        ctx.cls.info.names[self_tvar_name] = SymbolTableNode(MDEF, self_tvar_expr)
-
-        # Backward-compatible with TypeVarDef from Mypy 0.910.
-        if isinstance(tvd, TypeVarType):
-            self_type = tvd
-        else:
-            self_type = TypeVarType(tvd)
-
-        add_method(
-            ctx,
-            'construct',
-            construct_arguments,
-            return_type=self_type,
-            self_type=self_type,
-            tvar_def=tvd,
-            is_classmethod=True,
-        )
-
-    def set_frozen(self, fields: List['PydanticModelField'], frozen: bool) -> None:
-        """
-        Marks all fields as properties so that attempts to set them trigger mypy errors.
-
-        This is the same approach used by the attrs and dataclasses plugins.
-        """
-        ctx = self._ctx
-        info = ctx.cls.info
-        for field in fields:
-            sym_node = info.names.get(field.name)
-            if sym_node is not None:
-                var = sym_node.node
-                if isinstance(var, Var):
-                    var.is_property = frozen
-                elif isinstance(var, PlaceholderNode) and not ctx.api.final_iteration:
-                    # See https://github.com/pydantic/pydantic/issues/5191 to hit this branch for test coverage
-                    ctx.api.defer()
-                else:  # pragma: no cover
-                    # I don't know whether it's possible to hit this branch, but I've added it for safety
-                    try:
-                        var_str = str(var)
-                    except TypeError:
-                        # This happens for PlaceholderNode; perhaps it will happen for other types in the future..
-                        var_str = repr(var)
-                    detail = f'sym_node.node: {var_str} (of type {var.__class__})'
-                    error_unexpected_behavior(detail, ctx.api, ctx.cls)
-            else:
-                var = field.to_var(info, use_alias=False)
-                var.info = info
-                var.is_property = frozen
-                var._fullname = get_fullname(info) + '.' + get_name(var)
-                info.names[get_name(var)] = SymbolTableNode(MDEF, var)
-
-    def get_config_update(self, substmt: AssignmentStmt) -> Optional['ModelConfigData']:
-        """
-        Determines the config update due to a single statement in the Config class definition.
-
-        Warns if a tracked config attribute is set to a value the plugin doesn't know how to interpret (e.g., an int)
-        """
-        lhs = substmt.lvalues[0]
-        if not (isinstance(lhs, NameExpr) and lhs.name in self.tracked_config_fields):
-            return None
-        if lhs.name == 'extra':
-            if isinstance(substmt.rvalue, StrExpr):
-                forbid_extra = substmt.rvalue.value == 'forbid'
-            elif isinstance(substmt.rvalue, MemberExpr):
-                forbid_extra = substmt.rvalue.name == 'forbid'
-            else:
-                error_invalid_config_value(lhs.name, self._ctx.api, substmt)
-                return None
-            return ModelConfigData(forbid_extra=forbid_extra)
-        if lhs.name == 'alias_generator':
-            has_alias_generator = True
-            if isinstance(substmt.rvalue, NameExpr) and substmt.rvalue.fullname == 'builtins.None':
-                has_alias_generator = False
-            return ModelConfigData(has_alias_generator=has_alias_generator)
-        if isinstance(substmt.rvalue, NameExpr) and substmt.rvalue.fullname in ('builtins.True', 'builtins.False'):
-            return ModelConfigData(**{lhs.name: substmt.rvalue.fullname == 'builtins.True'})
-        error_invalid_config_value(lhs.name, self._ctx.api, substmt)
-        return None
-
-    @staticmethod
-    def get_is_required(cls: ClassDef, stmt: AssignmentStmt, lhs: NameExpr) -> bool:
-        """
-        Returns a boolean indicating whether the field defined in `stmt` is a required field.
-        """
-        expr = stmt.rvalue
-        if isinstance(expr, TempNode):
-            # TempNode means annotation-only, so only non-required if Optional
-            value_type = get_proper_type(cls.info[lhs.name].type)
-            return not PydanticModelTransformer.type_has_implicit_default(value_type)
-        if isinstance(expr, CallExpr) and isinstance(expr.callee, RefExpr) and expr.callee.fullname == FIELD_FULLNAME:
-            # The "default value" is a call to `Field`; at this point, the field is
-            # only required if default is Ellipsis (i.e., `field_name: Annotation = Field(...)`) or if default_factory
-            # is specified.
-            for arg, name in zip(expr.args, expr.arg_names):
-                # If name is None, then this arg is the default because it is the only positional argument.
-                if name is None or name == 'default':
-                    return arg.__class__ is EllipsisExpr
-                if name == 'default_factory':
-                    return False
-            # In this case, default and default_factory are not specified, so we need to look at the annotation
-            value_type = get_proper_type(cls.info[lhs.name].type)
-            return not PydanticModelTransformer.type_has_implicit_default(value_type)
-        # Only required if the "default value" is Ellipsis (i.e., `field_name: Annotation = ...`)
-        return isinstance(expr, EllipsisExpr)
-
-    @staticmethod
-    def type_has_implicit_default(type_: Optional[ProperType]) -> bool:
-        """
-        Returns True if the passed type will be given an implicit default value.
-
-        In pydantic v1, this is the case for Optional types and Any (with default value None).
-        """
-        if isinstance(type_, AnyType):
-            # Annotated as Any
-            return True
-        if isinstance(type_, UnionType) and any(
-            isinstance(item, NoneType) or isinstance(item, AnyType) for item in type_.items
-        ):
-            # Annotated as Optional, or otherwise having NoneType or AnyType in the union
-            return True
-        return False
-
-    @staticmethod
-    def get_alias_info(stmt: AssignmentStmt) -> Tuple[Optional[str], bool]:
-        """
-        Returns a pair (alias, has_dynamic_alias), extracted from the declaration of the field defined in `stmt`.
-
-        `has_dynamic_alias` is True if and only if an alias is provided, but not as a string literal.
-        If `has_dynamic_alias` is True, `alias` will be None.
-        """
-        expr = stmt.rvalue
-        if isinstance(expr, TempNode):
-            # TempNode means annotation-only
-            return None, False
-
-        if not (
-            isinstance(expr, CallExpr) and isinstance(expr.callee, RefExpr) and expr.callee.fullname == FIELD_FULLNAME
-        ):
-            # Assigned value is not a call to pydantic.fields.Field
-            return None, False
-
-        for i, arg_name in enumerate(expr.arg_names):
-            if arg_name != 'alias':
-                continue
-            arg = expr.args[i]
-            if isinstance(arg, StrExpr):
-                return arg.value, False
-            else:
-                return None, True
-        return None, False
-
-    def get_field_arguments(
-        self, fields: List['PydanticModelField'], typed: bool, force_all_optional: bool, use_alias: bool
-    ) -> List[Argument]:
-        """
-        Helper function used during the construction of the `__init__` and `construct` method signatures.
-
-        Returns a list of mypy Argument instances for use in the generated signatures.
-        """
-        info = self._ctx.cls.info
-        arguments = [
-            field.to_argument(info, typed=typed, force_optional=force_all_optional, use_alias=use_alias)
-            for field in fields
-            if not (use_alias and field.has_dynamic_alias)
-        ]
-        return arguments
-
-    def should_init_forbid_extra(self, fields: List['PydanticModelField'], config: 'ModelConfigData') -> bool:
-        """
-        Indicates whether the generated `__init__` should get a `**kwargs` at the end of its signature
-
-        We disallow arbitrary kwargs if the extra config setting is "forbid", or if the plugin config says to,
-        *unless* a required dynamic alias is present (since then we can't determine a valid signature).
-        """
-        if not config.allow_population_by_field_name:
-            if self.is_dynamic_alias_present(fields, bool(config.has_alias_generator)):
-                return False
-        if config.forbid_extra:
-            return True
-        return self.plugin_config.init_forbid_extra
-
-    @staticmethod
-    def is_dynamic_alias_present(fields: List['PydanticModelField'], has_alias_generator: bool) -> bool:
-        """
-        Returns whether any fields on the model have a "dynamic alias", i.e., an alias that cannot be
-        determined during static analysis.
-        """
-        for field in fields:
-            if field.has_dynamic_alias:
-                return True
-        if has_alias_generator:
-            for field in fields:
-                if field.alias is None:
-                    return True
-        return False
-
-
-class PydanticModelField:
-    def __init__(
-        self, name: str, is_required: bool, alias: Optional[str], has_dynamic_alias: bool, line: int, column: int
-    ):
-        self.name = name
-        self.is_required = is_required
-        self.alias = alias
-        self.has_dynamic_alias = has_dynamic_alias
-        self.line = line
-        self.column = column
-
-    def to_var(self, info: TypeInfo, use_alias: bool) -> Var:
-        name = self.name
-        if use_alias and self.alias is not None:
-            name = self.alias
-        return Var(name, info[self.name].type)
-
-    def to_argument(self, info: TypeInfo, typed: bool, force_optional: bool, use_alias: bool) -> Argument:
-        if typed and info[self.name].type is not None:
-            type_annotation = info[self.name].type
-        else:
-            type_annotation = AnyType(TypeOfAny.explicit)
-        return Argument(
-            variable=self.to_var(info, use_alias),
-            type_annotation=type_annotation,
-            initializer=None,
-            kind=ARG_NAMED_OPT if force_optional or not self.is_required else ARG_NAMED,
-        )
-
-    def serialize(self) -> JsonDict:
-        return self.__dict__
-
-    @classmethod
-    def deserialize(cls, info: TypeInfo, data: JsonDict) -> 'PydanticModelField':
-        return cls(**data)
-
-
-class ModelConfigData:
-    def __init__(
-        self,
-        forbid_extra: Optional[bool] = None,
-        allow_mutation: Optional[bool] = None,
-        frozen: Optional[bool] = None,
-        orm_mode: Optional[bool] = None,
-        allow_population_by_field_name: Optional[bool] = None,
-        has_alias_generator: Optional[bool] = None,
-    ):
-        self.forbid_extra = forbid_extra
-        self.allow_mutation = allow_mutation
-        self.frozen = frozen
-        self.orm_mode = orm_mode
-        self.allow_population_by_field_name = allow_population_by_field_name
-        self.has_alias_generator = has_alias_generator
-
-    def set_values_dict(self) -> Dict[str, Any]:
-        return {k: v for k, v in self.__dict__.items() if v is not None}
-
-    def update(self, config: Optional['ModelConfigData']) -> None:
-        if config is None:
-            return
-        for k, v in config.set_values_dict().items():
-            setattr(self, k, v)
-
-    def setdefault(self, key: str, value: Any) -> None:
-        if getattr(self, key) is None:
-            setattr(self, key, value)
-
-
-ERROR_ORM = ErrorCode('pydantic-orm', 'Invalid from_orm call', 'Pydantic')
-ERROR_CONFIG = ErrorCode('pydantic-config', 'Invalid config value', 'Pydantic')
-ERROR_ALIAS = ErrorCode('pydantic-alias', 'Dynamic alias disallowed', 'Pydantic')
-ERROR_UNEXPECTED = ErrorCode('pydantic-unexpected', 'Unexpected behavior', 'Pydantic')
-ERROR_UNTYPED = ErrorCode('pydantic-field', 'Untyped field disallowed', 'Pydantic')
-ERROR_FIELD_DEFAULTS = ErrorCode('pydantic-field', 'Invalid Field defaults', 'Pydantic')
-
-
-def error_from_orm(model_name: str, api: CheckerPluginInterface, context: Context) -> None:
-    api.fail(f'"{model_name}" does not have orm_mode=True', context, code=ERROR_ORM)
-
-
-def error_invalid_config_value(name: str, api: SemanticAnalyzerPluginInterface, context: Context) -> None:
-    api.fail(f'Invalid value for "Config.{name}"', context, code=ERROR_CONFIG)
-
-
-def error_required_dynamic_aliases(api: SemanticAnalyzerPluginInterface, context: Context) -> None:
-    api.fail('Required dynamic aliases disallowed', context, code=ERROR_ALIAS)
-
-
-def error_unexpected_behavior(
-    detail: str, api: Union[CheckerPluginInterface, SemanticAnalyzerPluginInterface], context: Context
-) -> None:  # pragma: no cover
-    # Can't think of a good way to test this, but I confirmed it renders as desired by adding to a non-error path
-    link = 'https://github.com/pydantic/pydantic/issues/new/choose'
-    full_message = f'The pydantic mypy plugin ran into unexpected behavior: {detail}\n'
-    full_message += f'Please consider reporting this bug at {link} so we can try to fix it!'
-    api.fail(full_message, context, code=ERROR_UNEXPECTED)
-
-
-def error_untyped_fields(api: SemanticAnalyzerPluginInterface, context: Context) -> None:
-    api.fail('Untyped fields disallowed', context, code=ERROR_UNTYPED)
-
-
-def error_default_and_default_factory_specified(api: CheckerPluginInterface, context: Context) -> None:
-    api.fail('Field default and default_factory cannot be specified together', context, code=ERROR_FIELD_DEFAULTS)
-
-
-def add_method(
-    ctx: ClassDefContext,
-    name: str,
-    args: List[Argument],
-    return_type: Type,
-    self_type: Optional[Type] = None,
-    tvar_def: Optional[TypeVarDef] = None,
-    is_classmethod: bool = False,
-    is_new: bool = False,
-    # is_staticmethod: bool = False,
-) -> None:
-    """
-    Adds a new method to a class.
-
-    This can be dropped if/when https://github.com/python/mypy/issues/7301 is merged
-    """
-    info = ctx.cls.info
-
-    # First remove any previously generated methods with the same name
-    # to avoid clashes and problems in the semantic analyzer.
-    if name in info.names:
-        sym = info.names[name]
-        if sym.plugin_generated and isinstance(sym.node, FuncDef):
-            ctx.cls.defs.body.remove(sym.node)  # pragma: no cover
-
-    self_type = self_type or fill_typevars(info)
-    if is_classmethod or is_new:
-        first = [Argument(Var('_cls'), TypeType.make_normalized(self_type), None, ARG_POS)]
-    # elif is_staticmethod:
-    #     first = []
-    else:
-        self_type = self_type or fill_typevars(info)
-        first = [Argument(Var('__pydantic_self__'), self_type, None, ARG_POS)]
-    args = first + args
-    arg_types, arg_names, arg_kinds = [], [], []
-    for arg in args:
-        assert arg.type_annotation, 'All arguments must be fully typed.'
-        arg_types.append(arg.type_annotation)
-        arg_names.append(get_name(arg.variable))
-        arg_kinds.append(arg.kind)
-
-    function_type = ctx.api.named_type(f'{BUILTINS_NAME}.function')
-    signature = CallableType(arg_types, arg_kinds, arg_names, return_type, function_type)
-    if tvar_def:
-        signature.variables = [tvar_def]
-
-    func = FuncDef(name, args, Block([PassStmt()]))
-    func.info = info
-    func.type = set_callable_name(signature, func)
-    func.is_class = is_classmethod
-    # func.is_static = is_staticmethod
-    func._fullname = get_fullname(info) + '.' + name
-    func.line = info.line
-
-    # NOTE: we would like the plugin generated node to dominate, but we still
-    # need to keep any existing definitions so they get semantically analyzed.
-    if name in info.names:
-        # Get a nice unique name instead.
-        r_name = get_unique_redefinition_name(name, info.names)
-        info.names[r_name] = info.names[name]
-
-    if is_classmethod:  # or is_staticmethod:
-        func.is_decorated = True
-        v = Var(name, func.type)
-        v.info = info
-        v._fullname = func._fullname
-        # if is_classmethod:
-        v.is_classmethod = True
-        dec = Decorator(func, [NameExpr('classmethod')], v)
-        # else:
-        #     v.is_staticmethod = True
-        #     dec = Decorator(func, [NameExpr('staticmethod')], v)
-
-        dec.line = info.line
-        sym = SymbolTableNode(MDEF, dec)
-    else:
-        sym = SymbolTableNode(MDEF, func)
-    sym.plugin_generated = True
-
-    info.names[name] = sym
-    info.defn.defs.body.append(func)
-
-
-def get_fullname(x: Union[FuncBase, SymbolNode]) -> str:
-    """
-    Used for compatibility with mypy 0.740; can be dropped once support for 0.740 is dropped.
-    """
-    fn = x.fullname
-    if callable(fn):  # pragma: no cover
-        return fn()
-    return fn
-
-
-def get_name(x: Union[FuncBase, SymbolNode]) -> str:
-    """
-    Used for compatibility with mypy 0.740; can be dropped once support for 0.740 is dropped.
-    """
-    fn = x.name
-    if callable(fn):  # pragma: no cover
-        return fn()
-    return fn
-
-
-def parse_toml(config_file: str) -> Optional[Dict[str, Any]]:
-    if not config_file.endswith('.toml'):
-        return None
-
-    read_mode = 'rb'
-    if sys.version_info >= (3, 11):
-        import tomllib as toml_
-    else:
-        try:
-            import tomli as toml_
-        except ImportError:
-            # older versions of mypy have toml as a dependency, not tomli
-            read_mode = 'r'
-            try:
-                import toml as toml_  # type: ignore[no-redef]
-            except ImportError:  # pragma: no cover
-                import warnings
-
-                warnings.warn('No TOML parser installed, cannot read configuration from `pyproject.toml`.')
-                return None
-
-    with open(config_file, read_mode) as rf:
-        return toml_.load(rf)  # type: ignore[arg-type]
diff --git a/lib/pydantic/v1/networks.py b/lib/pydantic/v1/networks.py
deleted file mode 100644
index cfebe588..00000000
--- a/lib/pydantic/v1/networks.py
+++ /dev/null
@@ -1,747 +0,0 @@
-import re
-from ipaddress import (
-    IPv4Address,
-    IPv4Interface,
-    IPv4Network,
-    IPv6Address,
-    IPv6Interface,
-    IPv6Network,
-    _BaseAddress,
-    _BaseNetwork,
-)
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Collection,
-    Dict,
-    Generator,
-    List,
-    Match,
-    Optional,
-    Pattern,
-    Set,
-    Tuple,
-    Type,
-    Union,
-    cast,
-    no_type_check,
-)
-
-from . import errors
-from .utils import Representation, update_not_none
-from .validators import constr_length_validator, str_validator
-
-if TYPE_CHECKING:
-    import email_validator
-    from typing_extensions import TypedDict
-
-    from .config import BaseConfig
-    from .fields import ModelField
-    from .typing import AnyCallable
-
-    CallableGenerator = Generator[AnyCallable, None, None]
-
-    class Parts(TypedDict, total=False):
-        scheme: str
-        user: Optional[str]
-        password: Optional[str]
-        ipv4: Optional[str]
-        ipv6: Optional[str]
-        domain: Optional[str]
-        port: Optional[str]
-        path: Optional[str]
-        query: Optional[str]
-        fragment: Optional[str]
-
-    class HostParts(TypedDict, total=False):
-        host: str
-        tld: Optional[str]
-        host_type: Optional[str]
-        port: Optional[str]
-        rebuild: bool
-
-else:
-    email_validator = None
-
-    class Parts(dict):
-        pass
-
-
-NetworkType = Union[str, bytes, int, Tuple[Union[str, bytes, int], Union[str, int]]]
-
-__all__ = [
-    'AnyUrl',
-    'AnyHttpUrl',
-    'FileUrl',
-    'HttpUrl',
-    'stricturl',
-    'EmailStr',
-    'NameEmail',
-    'IPvAnyAddress',
-    'IPvAnyInterface',
-    'IPvAnyNetwork',
-    'PostgresDsn',
-    'CockroachDsn',
-    'AmqpDsn',
-    'RedisDsn',
-    'MongoDsn',
-    'KafkaDsn',
-    'validate_email',
-]
-
-_url_regex_cache = None
-_multi_host_url_regex_cache = None
-_ascii_domain_regex_cache = None
-_int_domain_regex_cache = None
-_host_regex_cache = None
-
-_host_regex = (
-    r'(?:'
-    r'(?P<ipv4>(?:\d{1,3}\.){3}\d{1,3})(?=$|[/:#?])|'  # ipv4
-    r'(?P<ipv6>\[[A-F0-9]*:[A-F0-9:]+\])(?=$|[/:#?])|'  # ipv6
-    r'(?P<domain>[^\s/:?#]+)'  # domain, validation occurs later
-    r')?'
-    r'(?::(?P<port>\d+))?'  # port
-)
-_scheme_regex = r'(?:(?P<scheme>[a-z][a-z0-9+\-.]+)://)?'  # scheme https://tools.ietf.org/html/rfc3986#appendix-A
-_user_info_regex = r'(?:(?P<user>[^\s:/]*)(?::(?P<password>[^\s/]*))?@)?'
-_path_regex = r'(?P<path>/[^\s?#]*)?'
-_query_regex = r'(?:\?(?P<query>[^\s#]*))?'
-_fragment_regex = r'(?:#(?P<fragment>[^\s#]*))?'
-
-
-def url_regex() -> Pattern[str]:
-    global _url_regex_cache
-    if _url_regex_cache is None:
-        _url_regex_cache = re.compile(
-            rf'{_scheme_regex}{_user_info_regex}{_host_regex}{_path_regex}{_query_regex}{_fragment_regex}',
-            re.IGNORECASE,
-        )
-    return _url_regex_cache
-
-
-def multi_host_url_regex() -> Pattern[str]:
-    """
-    Compiled multi host url regex.
-
-    Additionally to `url_regex` it allows to match multiple hosts.
-    E.g. host1.db.net,host2.db.net
-    """
-    global _multi_host_url_regex_cache
-    if _multi_host_url_regex_cache is None:
-        _multi_host_url_regex_cache = re.compile(
-            rf'{_scheme_regex}{_user_info_regex}'
-            r'(?P<hosts>([^/]*))'  # validation occurs later
-            rf'{_path_regex}{_query_regex}{_fragment_regex}',
-            re.IGNORECASE,
-        )
-    return _multi_host_url_regex_cache
-
-
-def ascii_domain_regex() -> Pattern[str]:
-    global _ascii_domain_regex_cache
-    if _ascii_domain_regex_cache is None:
-        ascii_chunk = r'[_0-9a-z](?:[-_0-9a-z]{0,61}[_0-9a-z])?'
-        ascii_domain_ending = r'(?P<tld>\.[a-z]{2,63})?\.?'
-        _ascii_domain_regex_cache = re.compile(
-            fr'(?:{ascii_chunk}\.)*?{ascii_chunk}{ascii_domain_ending}', re.IGNORECASE
-        )
-    return _ascii_domain_regex_cache
-
-
-def int_domain_regex() -> Pattern[str]:
-    global _int_domain_regex_cache
-    if _int_domain_regex_cache is None:
-        int_chunk = r'[_0-9a-\U00040000](?:[-_0-9a-\U00040000]{0,61}[_0-9a-\U00040000])?'
-        int_domain_ending = r'(?P<tld>(\.[^\W\d_]{2,63})|(\.(?:xn--)[_0-9a-z-]{2,63}))?\.?'
-        _int_domain_regex_cache = re.compile(fr'(?:{int_chunk}\.)*?{int_chunk}{int_domain_ending}', re.IGNORECASE)
-    return _int_domain_regex_cache
-
-
-def host_regex() -> Pattern[str]:
-    global _host_regex_cache
-    if _host_regex_cache is None:
-        _host_regex_cache = re.compile(
-            _host_regex,
-            re.IGNORECASE,
-        )
-    return _host_regex_cache
-
-
-class AnyUrl(str):
-    strip_whitespace = True
-    min_length = 1
-    max_length = 2**16
-    allowed_schemes: Optional[Collection[str]] = None
-    tld_required: bool = False
-    user_required: bool = False
-    host_required: bool = True
-    hidden_parts: Set[str] = set()
-
-    __slots__ = ('scheme', 'user', 'password', 'host', 'tld', 'host_type', 'port', 'path', 'query', 'fragment')
-
-    @no_type_check
-    def __new__(cls, url: Optional[str], **kwargs) -> object:
-        return str.__new__(cls, cls.build(**kwargs) if url is None else url)
-
-    def __init__(
-        self,
-        url: str,
-        *,
-        scheme: str,
-        user: Optional[str] = None,
-        password: Optional[str] = None,
-        host: Optional[str] = None,
-        tld: Optional[str] = None,
-        host_type: str = 'domain',
-        port: Optional[str] = None,
-        path: Optional[str] = None,
-        query: Optional[str] = None,
-        fragment: Optional[str] = None,
-    ) -> None:
-        str.__init__(url)
-        self.scheme = scheme
-        self.user = user
-        self.password = password
-        self.host = host
-        self.tld = tld
-        self.host_type = host_type
-        self.port = port
-        self.path = path
-        self.query = query
-        self.fragment = fragment
-
-    @classmethod
-    def build(
-        cls,
-        *,
-        scheme: str,
-        user: Optional[str] = None,
-        password: Optional[str] = None,
-        host: str,
-        port: Optional[str] = None,
-        path: Optional[str] = None,
-        query: Optional[str] = None,
-        fragment: Optional[str] = None,
-        **_kwargs: str,
-    ) -> str:
-        parts = Parts(
-            scheme=scheme,
-            user=user,
-            password=password,
-            host=host,
-            port=port,
-            path=path,
-            query=query,
-            fragment=fragment,
-            **_kwargs,  # type: ignore[misc]
-        )
-
-        url = scheme + '://'
-        if user:
-            url += user
-        if password:
-            url += ':' + password
-        if user or password:
-            url += '@'
-        url += host
-        if port and ('port' not in cls.hidden_parts or cls.get_default_parts(parts).get('port') != port):
-            url += ':' + port
-        if path:
-            url += path
-        if query:
-            url += '?' + query
-        if fragment:
-            url += '#' + fragment
-        return url
-
-    @classmethod
-    def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
-        update_not_none(field_schema, minLength=cls.min_length, maxLength=cls.max_length, format='uri')
-
-    @classmethod
-    def __get_validators__(cls) -> 'CallableGenerator':
-        yield cls.validate
-
-    @classmethod
-    def validate(cls, value: Any, field: 'ModelField', config: 'BaseConfig') -> 'AnyUrl':
-        if value.__class__ == cls:
-            return value
-        value = str_validator(value)
-        if cls.strip_whitespace:
-            value = value.strip()
-        url: str = cast(str, constr_length_validator(value, field, config))
-
-        m = cls._match_url(url)
-        # the regex should always match, if it doesn't please report with details of the URL tried
-        assert m, 'URL regex failed unexpectedly'
-
-        original_parts = cast('Parts', m.groupdict())
-        parts = cls.apply_default_parts(original_parts)
-        parts = cls.validate_parts(parts)
-
-        if m.end() != len(url):
-            raise errors.UrlExtraError(extra=url[m.end() :])
-
-        return cls._build_url(m, url, parts)
-
-    @classmethod
-    def _build_url(cls, m: Match[str], url: str, parts: 'Parts') -> 'AnyUrl':
-        """
-        Validate hosts and build the AnyUrl object. Split from `validate` so this method
-        can be altered in `MultiHostDsn`.
-        """
-        host, tld, host_type, rebuild = cls.validate_host(parts)
-
-        return cls(
-            None if rebuild else url,
-            scheme=parts['scheme'],
-            user=parts['user'],
-            password=parts['password'],
-            host=host,
-            tld=tld,
-            host_type=host_type,
-            port=parts['port'],
-            path=parts['path'],
-            query=parts['query'],
-            fragment=parts['fragment'],
-        )
-
-    @staticmethod
-    def _match_url(url: str) -> Optional[Match[str]]:
-        return url_regex().match(url)
-
-    @staticmethod
-    def _validate_port(port: Optional[str]) -> None:
-        if port is not None and int(port) > 65_535:
-            raise errors.UrlPortError()
-
-    @classmethod
-    def validate_parts(cls, parts: 'Parts', validate_port: bool = True) -> 'Parts':
-        """
-        A method used to validate parts of a URL.
-        Could be overridden to set default values for parts if missing
-        """
-        scheme = parts['scheme']
-        if scheme is None:
-            raise errors.UrlSchemeError()
-
-        if cls.allowed_schemes and scheme.lower() not in cls.allowed_schemes:
-            raise errors.UrlSchemePermittedError(set(cls.allowed_schemes))
-
-        if validate_port:
-            cls._validate_port(parts['port'])
-
-        user = parts['user']
-        if cls.user_required and user is None:
-            raise errors.UrlUserInfoError()
-
-        return parts
-
-    @classmethod
-    def validate_host(cls, parts: 'Parts') -> Tuple[str, Optional[str], str, bool]:
-        tld, host_type, rebuild = None, None, False
-        for f in ('domain', 'ipv4', 'ipv6'):
-            host = parts[f]  # type: ignore[literal-required]
-            if host:
-                host_type = f
-                break
-
-        if host is None:
-            if cls.host_required:
-                raise errors.UrlHostError()
-        elif host_type == 'domain':
-            is_international = False
-            d = ascii_domain_regex().fullmatch(host)
-            if d is None:
-                d = int_domain_regex().fullmatch(host)
-                if d is None:
-                    raise errors.UrlHostError()
-                is_international = True
-
-            tld = d.group('tld')
-            if tld is None and not is_international:
-                d = int_domain_regex().fullmatch(host)
-                assert d is not None
-                tld = d.group('tld')
-                is_international = True
-
-            if tld is not None:
-                tld = tld[1:]
-            elif cls.tld_required:
-                raise errors.UrlHostTldError()
-
-            if is_international:
-                host_type = 'int_domain'
-                rebuild = True
-                host = host.encode('idna').decode('ascii')
-                if tld is not None:
-                    tld = tld.encode('idna').decode('ascii')
-
-        return host, tld, host_type, rebuild  # type: ignore
-
-    @staticmethod
-    def get_default_parts(parts: 'Parts') -> 'Parts':
-        return {}
-
-    @classmethod
-    def apply_default_parts(cls, parts: 'Parts') -> 'Parts':
-        for key, value in cls.get_default_parts(parts).items():
-            if not parts[key]:  # type: ignore[literal-required]
-                parts[key] = value  # type: ignore[literal-required]
-        return parts
-
-    def __repr__(self) -> str:
-        extra = ', '.join(f'{n}={getattr(self, n)!r}' for n in self.__slots__ if getattr(self, n) is not None)
-        return f'{self.__class__.__name__}({super().__repr__()}, {extra})'
-
-
-class AnyHttpUrl(AnyUrl):
-    allowed_schemes = {'http', 'https'}
-
-    __slots__ = ()
-
-
-class HttpUrl(AnyHttpUrl):
-    tld_required = True
-    # https://stackoverflow.com/questions/417142/what-is-the-maximum-length-of-a-url-in-different-browsers
-    max_length = 2083
-    hidden_parts = {'port'}
-
-    @staticmethod
-    def get_default_parts(parts: 'Parts') -> 'Parts':
-        return {'port': '80' if parts['scheme'] == 'http' else '443'}
-
-
-class FileUrl(AnyUrl):
-    allowed_schemes = {'file'}
-    host_required = False
-
-    __slots__ = ()
-
-
-class MultiHostDsn(AnyUrl):
-    __slots__ = AnyUrl.__slots__ + ('hosts',)
-
-    def __init__(self, *args: Any, hosts: Optional[List['HostParts']] = None, **kwargs: Any):
-        super().__init__(*args, **kwargs)
-        self.hosts = hosts
-
-    @staticmethod
-    def _match_url(url: str) -> Optional[Match[str]]:
-        return multi_host_url_regex().match(url)
-
-    @classmethod
-    def validate_parts(cls, parts: 'Parts', validate_port: bool = True) -> 'Parts':
-        return super().validate_parts(parts, validate_port=False)
-
-    @classmethod
-    def _build_url(cls, m: Match[str], url: str, parts: 'Parts') -> 'MultiHostDsn':
-        hosts_parts: List['HostParts'] = []
-        host_re = host_regex()
-        for host in m.groupdict()['hosts'].split(','):
-            d: Parts = host_re.match(host).groupdict()  # type: ignore
-            host, tld, host_type, rebuild = cls.validate_host(d)
-            port = d.get('port')
-            cls._validate_port(port)
-            hosts_parts.append(
-                {
-                    'host': host,
-                    'host_type': host_type,
-                    'tld': tld,
-                    'rebuild': rebuild,
-                    'port': port,
-                }
-            )
-
-        if len(hosts_parts) > 1:
-            return cls(
-                None if any([hp['rebuild'] for hp in hosts_parts]) else url,
-                scheme=parts['scheme'],
-                user=parts['user'],
-                password=parts['password'],
-                path=parts['path'],
-                query=parts['query'],
-                fragment=parts['fragment'],
-                host_type=None,
-                hosts=hosts_parts,
-            )
-        else:
-            # backwards compatibility with single host
-            host_part = hosts_parts[0]
-            return cls(
-                None if host_part['rebuild'] else url,
-                scheme=parts['scheme'],
-                user=parts['user'],
-                password=parts['password'],
-                host=host_part['host'],
-                tld=host_part['tld'],
-                host_type=host_part['host_type'],
-                port=host_part.get('port'),
-                path=parts['path'],
-                query=parts['query'],
-                fragment=parts['fragment'],
-            )
-
-
-class PostgresDsn(MultiHostDsn):
-    allowed_schemes = {
-        'postgres',
-        'postgresql',
-        'postgresql+asyncpg',
-        'postgresql+pg8000',
-        'postgresql+psycopg',
-        'postgresql+psycopg2',
-        'postgresql+psycopg2cffi',
-        'postgresql+py-postgresql',
-        'postgresql+pygresql',
-    }
-    user_required = True
-
-    __slots__ = ()
-
-
-class CockroachDsn(AnyUrl):
-    allowed_schemes = {
-        'cockroachdb',
-        'cockroachdb+psycopg2',
-        'cockroachdb+asyncpg',
-    }
-    user_required = True
-
-
-class AmqpDsn(AnyUrl):
-    allowed_schemes = {'amqp', 'amqps'}
-    host_required = False
-
-
-class RedisDsn(AnyUrl):
-    __slots__ = ()
-    allowed_schemes = {'redis', 'rediss'}
-    host_required = False
-
-    @staticmethod
-    def get_default_parts(parts: 'Parts') -> 'Parts':
-        return {
-            'domain': 'localhost' if not (parts['ipv4'] or parts['ipv6']) else '',
-            'port': '6379',
-            'path': '/0',
-        }
-
-
-class MongoDsn(AnyUrl):
-    allowed_schemes = {'mongodb'}
-
-    # TODO: Needed to generic "Parts" for "Replica Set", "Sharded Cluster", and other mongodb deployment modes
-    @staticmethod
-    def get_default_parts(parts: 'Parts') -> 'Parts':
-        return {
-            'port': '27017',
-        }
-
-
-class KafkaDsn(AnyUrl):
-    allowed_schemes = {'kafka'}
-
-    @staticmethod
-    def get_default_parts(parts: 'Parts') -> 'Parts':
-        return {
-            'domain': 'localhost',
-            'port': '9092',
-        }
-
-
-def stricturl(
-    *,
-    strip_whitespace: bool = True,
-    min_length: int = 1,
-    max_length: int = 2**16,
-    tld_required: bool = True,
-    host_required: bool = True,
-    allowed_schemes: Optional[Collection[str]] = None,
-) -> Type[AnyUrl]:
-    # use kwargs then define conf in a dict to aid with IDE type hinting
-    namespace = dict(
-        strip_whitespace=strip_whitespace,
-        min_length=min_length,
-        max_length=max_length,
-        tld_required=tld_required,
-        host_required=host_required,
-        allowed_schemes=allowed_schemes,
-    )
-    return type('UrlValue', (AnyUrl,), namespace)
-
-
-def import_email_validator() -> None:
-    global email_validator
-    try:
-        import email_validator
-    except ImportError as e:
-        raise ImportError('email-validator is not installed, run `pip install pydantic[email]`') from e
-
-
-class EmailStr(str):
-    @classmethod
-    def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
-        field_schema.update(type='string', format='email')
-
-    @classmethod
-    def __get_validators__(cls) -> 'CallableGenerator':
-        # included here and below so the error happens straight away
-        import_email_validator()
-
-        yield str_validator
-        yield cls.validate
-
-    @classmethod
-    def validate(cls, value: Union[str]) -> str:
-        return validate_email(value)[1]
-
-
-class NameEmail(Representation):
-    __slots__ = 'name', 'email'
-
-    def __init__(self, name: str, email: str):
-        self.name = name
-        self.email = email
-
-    def __eq__(self, other: Any) -> bool:
-        return isinstance(other, NameEmail) and (self.name, self.email) == (other.name, other.email)
-
-    @classmethod
-    def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
-        field_schema.update(type='string', format='name-email')
-
-    @classmethod
-    def __get_validators__(cls) -> 'CallableGenerator':
-        import_email_validator()
-
-        yield cls.validate
-
-    @classmethod
-    def validate(cls, value: Any) -> 'NameEmail':
-        if value.__class__ == cls:
-            return value
-        value = str_validator(value)
-        return cls(*validate_email(value))
-
-    def __str__(self) -> str:
-        return f'{self.name} <{self.email}>'
-
-
-class IPvAnyAddress(_BaseAddress):
-    __slots__ = ()
-
-    @classmethod
-    def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
-        field_schema.update(type='string', format='ipvanyaddress')
-
-    @classmethod
-    def __get_validators__(cls) -> 'CallableGenerator':
-        yield cls.validate
-
-    @classmethod
-    def validate(cls, value: Union[str, bytes, int]) -> Union[IPv4Address, IPv6Address]:
-        try:
-            return IPv4Address(value)
-        except ValueError:
-            pass
-
-        try:
-            return IPv6Address(value)
-        except ValueError:
-            raise errors.IPvAnyAddressError()
-
-
-class IPvAnyInterface(_BaseAddress):
-    __slots__ = ()
-
-    @classmethod
-    def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
-        field_schema.update(type='string', format='ipvanyinterface')
-
-    @classmethod
-    def __get_validators__(cls) -> 'CallableGenerator':
-        yield cls.validate
-
-    @classmethod
-    def validate(cls, value: NetworkType) -> Union[IPv4Interface, IPv6Interface]:
-        try:
-            return IPv4Interface(value)
-        except ValueError:
-            pass
-
-        try:
-            return IPv6Interface(value)
-        except ValueError:
-            raise errors.IPvAnyInterfaceError()
-
-
-class IPvAnyNetwork(_BaseNetwork):  # type: ignore
-    @classmethod
-    def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
-        field_schema.update(type='string', format='ipvanynetwork')
-
-    @classmethod
-    def __get_validators__(cls) -> 'CallableGenerator':
-        yield cls.validate
-
-    @classmethod
-    def validate(cls, value: NetworkType) -> Union[IPv4Network, IPv6Network]:
-        # Assume IP Network is defined with a default value for ``strict`` argument.
-        # Define your own class if you want to specify network address check strictness.
-        try:
-            return IPv4Network(value)
-        except ValueError:
-            pass
-
-        try:
-            return IPv6Network(value)
-        except ValueError:
-            raise errors.IPvAnyNetworkError()
-
-
-pretty_email_regex = re.compile(r'([\w ]*?) *<(.*)> *')
-MAX_EMAIL_LENGTH = 2048
-"""Maximum length for an email.
-A somewhat arbitrary but very generous number compared to what is allowed by most implementations.
-"""
-
-
-def validate_email(value: Union[str]) -> Tuple[str, str]:
-    """
-    Email address validation using https://pypi.org/project/email-validator/
-    Notes:
-    * raw ip address (literal) domain parts are not allowed.
-    * "John Doe <local_part@domain.com>" style "pretty" email addresses are processed
-    * spaces are striped from the beginning and end of addresses but no error is raised
-    """
-    if email_validator is None:
-        import_email_validator()
-
-    if len(value) > MAX_EMAIL_LENGTH:
-        raise errors.EmailError()
-
-    m = pretty_email_regex.fullmatch(value)
-    name: Union[str, None] = None
-    if m:
-        name, value = m.groups()
-    email = value.strip()
-    try:
-        parts = email_validator.validate_email(email, check_deliverability=False)
-    except email_validator.EmailNotValidError as e:
-        raise errors.EmailError from e
-
-    if hasattr(parts, 'normalized'):
-        # email-validator >= 2
-        email = parts.normalized
-        assert email is not None
-        name = name or parts.local_part
-        return name, email
-    else:
-        # email-validator >1, <2
-        at_index = email.index('@')
-        local_part = email[:at_index]  # RFC 5321, local part must be case-sensitive.
-        global_part = email[at_index:].lower()
-
-        return name or local_part, local_part + global_part
diff --git a/lib/pydantic/v1/parse.py b/lib/pydantic/v1/parse.py
deleted file mode 100644
index 7ac330ca..00000000
--- a/lib/pydantic/v1/parse.py
+++ /dev/null
@@ -1,66 +0,0 @@
-import json
-import pickle
-from enum import Enum
-from pathlib import Path
-from typing import Any, Callable, Union
-
-from .types import StrBytes
-
-
-class Protocol(str, Enum):
-    json = 'json'
-    pickle = 'pickle'
-
-
-def load_str_bytes(
-    b: StrBytes,
-    *,
-    content_type: str = None,
-    encoding: str = 'utf8',
-    proto: Protocol = None,
-    allow_pickle: bool = False,
-    json_loads: Callable[[str], Any] = json.loads,
-) -> Any:
-    if proto is None and content_type:
-        if content_type.endswith(('json', 'javascript')):
-            pass
-        elif allow_pickle and content_type.endswith('pickle'):
-            proto = Protocol.pickle
-        else:
-            raise TypeError(f'Unknown content-type: {content_type}')
-
-    proto = proto or Protocol.json
-
-    if proto == Protocol.json:
-        if isinstance(b, bytes):
-            b = b.decode(encoding)
-        return json_loads(b)
-    elif proto == Protocol.pickle:
-        if not allow_pickle:
-            raise RuntimeError('Trying to decode with pickle with allow_pickle=False')
-        bb = b if isinstance(b, bytes) else b.encode()
-        return pickle.loads(bb)
-    else:
-        raise TypeError(f'Unknown protocol: {proto}')
-
-
-def load_file(
-    path: Union[str, Path],
-    *,
-    content_type: str = None,
-    encoding: str = 'utf8',
-    proto: Protocol = None,
-    allow_pickle: bool = False,
-    json_loads: Callable[[str], Any] = json.loads,
-) -> Any:
-    path = Path(path)
-    b = path.read_bytes()
-    if content_type is None:
-        if path.suffix in ('.js', '.json'):
-            proto = Protocol.json
-        elif path.suffix == '.pkl':
-            proto = Protocol.pickle
-
-    return load_str_bytes(
-        b, proto=proto, content_type=content_type, encoding=encoding, allow_pickle=allow_pickle, json_loads=json_loads
-    )
diff --git a/lib/pydantic/v1/py.typed b/lib/pydantic/v1/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/pydantic/v1/schema.py b/lib/pydantic/v1/schema.py
deleted file mode 100644
index ea16a72a..00000000
--- a/lib/pydantic/v1/schema.py
+++ /dev/null
@@ -1,1163 +0,0 @@
-import re
-import warnings
-from collections import defaultdict
-from dataclasses import is_dataclass
-from datetime import date, datetime, time, timedelta
-from decimal import Decimal
-from enum import Enum
-from ipaddress import IPv4Address, IPv4Interface, IPv4Network, IPv6Address, IPv6Interface, IPv6Network
-from pathlib import Path
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Callable,
-    Dict,
-    ForwardRef,
-    FrozenSet,
-    Generic,
-    Iterable,
-    List,
-    Optional,
-    Pattern,
-    Sequence,
-    Set,
-    Tuple,
-    Type,
-    TypeVar,
-    Union,
-    cast,
-)
-from uuid import UUID
-
-from typing_extensions import Annotated, Literal
-
-from .fields import (
-    MAPPING_LIKE_SHAPES,
-    SHAPE_DEQUE,
-    SHAPE_FROZENSET,
-    SHAPE_GENERIC,
-    SHAPE_ITERABLE,
-    SHAPE_LIST,
-    SHAPE_SEQUENCE,
-    SHAPE_SET,
-    SHAPE_SINGLETON,
-    SHAPE_TUPLE,
-    SHAPE_TUPLE_ELLIPSIS,
-    FieldInfo,
-    ModelField,
-)
-from .json import pydantic_encoder
-from .networks import AnyUrl, EmailStr
-from .types import (
-    ConstrainedDecimal,
-    ConstrainedFloat,
-    ConstrainedFrozenSet,
-    ConstrainedInt,
-    ConstrainedList,
-    ConstrainedSet,
-    ConstrainedStr,
-    SecretBytes,
-    SecretStr,
-    StrictBytes,
-    StrictStr,
-    conbytes,
-    condecimal,
-    confloat,
-    confrozenset,
-    conint,
-    conlist,
-    conset,
-    constr,
-)
-from .typing import (
-    all_literal_values,
-    get_args,
-    get_origin,
-    get_sub_types,
-    is_callable_type,
-    is_literal_type,
-    is_namedtuple,
-    is_none_type,
-    is_union,
-)
-from .utils import ROOT_KEY, get_model, lenient_issubclass
-
-if TYPE_CHECKING:
-    from .dataclasses import Dataclass
-    from .main import BaseModel
-
-default_prefix = '#/definitions/'
-default_ref_template = '#/definitions/{model}'
-
-TypeModelOrEnum = Union[Type['BaseModel'], Type[Enum]]
-TypeModelSet = Set[TypeModelOrEnum]
-
-
-def _apply_modify_schema(
-    modify_schema: Callable[..., None], field: Optional[ModelField], field_schema: Dict[str, Any]
-) -> None:
-    from inspect import signature
-
-    sig = signature(modify_schema)
-    args = set(sig.parameters.keys())
-    if 'field' in args or 'kwargs' in args:
-        modify_schema(field_schema, field=field)
-    else:
-        modify_schema(field_schema)
-
-
-def schema(
-    models: Sequence[Union[Type['BaseModel'], Type['Dataclass']]],
-    *,
-    by_alias: bool = True,
-    title: Optional[str] = None,
-    description: Optional[str] = None,
-    ref_prefix: Optional[str] = None,
-    ref_template: str = default_ref_template,
-) -> Dict[str, Any]:
-    """
-    Process a list of models and generate a single JSON Schema with all of them defined in the ``definitions``
-    top-level JSON key, including their sub-models.
-
-    :param models: a list of models to include in the generated JSON Schema
-    :param by_alias: generate the schemas using the aliases defined, if any
-    :param title: title for the generated schema that includes the definitions
-    :param description: description for the generated schema
-    :param ref_prefix: the JSON Pointer prefix for schema references with ``$ref``, if None, will be set to the
-      default of ``#/definitions/``. Update it if you want the schemas to reference the definitions somewhere
-      else, e.g. for OpenAPI use ``#/components/schemas/``. The resulting generated schemas will still be at the
-      top-level key ``definitions``, so you can extract them from there. But all the references will have the set
-      prefix.
-    :param ref_template: Use a ``string.format()`` template for ``$ref`` instead of a prefix. This can be useful
-      for references that cannot be represented by ``ref_prefix`` such as a definition stored in another file. For
-      a sibling json file in a ``/schemas`` directory use ``"/schemas/${model}.json#"``.
-    :return: dict with the JSON Schema with a ``definitions`` top-level key including the schema definitions for
-      the models and sub-models passed in ``models``.
-    """
-    clean_models = [get_model(model) for model in models]
-    flat_models = get_flat_models_from_models(clean_models)
-    model_name_map = get_model_name_map(flat_models)
-    definitions = {}
-    output_schema: Dict[str, Any] = {}
-    if title:
-        output_schema['title'] = title
-    if description:
-        output_schema['description'] = description
-    for model in clean_models:
-        m_schema, m_definitions, m_nested_models = model_process_schema(
-            model,
-            by_alias=by_alias,
-            model_name_map=model_name_map,
-            ref_prefix=ref_prefix,
-            ref_template=ref_template,
-        )
-        definitions.update(m_definitions)
-        model_name = model_name_map[model]
-        definitions[model_name] = m_schema
-    if definitions:
-        output_schema['definitions'] = definitions
-    return output_schema
-
-
-def model_schema(
-    model: Union[Type['BaseModel'], Type['Dataclass']],
-    by_alias: bool = True,
-    ref_prefix: Optional[str] = None,
-    ref_template: str = default_ref_template,
-) -> Dict[str, Any]:
-    """
-    Generate a JSON Schema for one model. With all the sub-models defined in the ``definitions`` top-level
-    JSON key.
-
-    :param model: a Pydantic model (a class that inherits from BaseModel)
-    :param by_alias: generate the schemas using the aliases defined, if any
-    :param ref_prefix: the JSON Pointer prefix for schema references with ``$ref``, if None, will be set to the
-      default of ``#/definitions/``. Update it if you want the schemas to reference the definitions somewhere
-      else, e.g. for OpenAPI use ``#/components/schemas/``. The resulting generated schemas will still be at the
-      top-level key ``definitions``, so you can extract them from there. But all the references will have the set
-      prefix.
-    :param ref_template: Use a ``string.format()`` template for ``$ref`` instead of a prefix. This can be useful for
-      references that cannot be represented by ``ref_prefix`` such as a definition stored in another file. For a
-      sibling json file in a ``/schemas`` directory use ``"/schemas/${model}.json#"``.
-    :return: dict with the JSON Schema for the passed ``model``
-    """
-    model = get_model(model)
-    flat_models = get_flat_models_from_model(model)
-    model_name_map = get_model_name_map(flat_models)
-    model_name = model_name_map[model]
-    m_schema, m_definitions, nested_models = model_process_schema(
-        model, by_alias=by_alias, model_name_map=model_name_map, ref_prefix=ref_prefix, ref_template=ref_template
-    )
-    if model_name in nested_models:
-        # model_name is in Nested models, it has circular references
-        m_definitions[model_name] = m_schema
-        m_schema = get_schema_ref(model_name, ref_prefix, ref_template, False)
-    if m_definitions:
-        m_schema.update({'definitions': m_definitions})
-    return m_schema
-
-
-def get_field_info_schema(field: ModelField, schema_overrides: bool = False) -> Tuple[Dict[str, Any], bool]:
-    # If no title is explicitly set, we don't set title in the schema for enums.
-    # The behaviour is the same as `BaseModel` reference, where the default title
-    # is in the definitions part of the schema.
-    schema_: Dict[str, Any] = {}
-    if field.field_info.title or not lenient_issubclass(field.type_, Enum):
-        schema_['title'] = field.field_info.title or field.alias.title().replace('_', ' ')
-
-    if field.field_info.title:
-        schema_overrides = True
-
-    if field.field_info.description:
-        schema_['description'] = field.field_info.description
-        schema_overrides = True
-
-    if not field.required and field.default is not None and not is_callable_type(field.outer_type_):
-        schema_['default'] = encode_default(field.default)
-        schema_overrides = True
-
-    return schema_, schema_overrides
-
-
-def field_schema(
-    field: ModelField,
-    *,
-    by_alias: bool = True,
-    model_name_map: Dict[TypeModelOrEnum, str],
-    ref_prefix: Optional[str] = None,
-    ref_template: str = default_ref_template,
-    known_models: Optional[TypeModelSet] = None,
-) -> Tuple[Dict[str, Any], Dict[str, Any], Set[str]]:
-    """
-    Process a Pydantic field and return a tuple with a JSON Schema for it as the first item.
-    Also return a dictionary of definitions with models as keys and their schemas as values. If the passed field
-    is a model and has sub-models, and those sub-models don't have overrides (as ``title``, ``default``, etc), they
-    will be included in the definitions and referenced in the schema instead of included recursively.
-
-    :param field: a Pydantic ``ModelField``
-    :param by_alias: use the defined alias (if any) in the returned schema
-    :param model_name_map: used to generate the JSON Schema references to other models included in the definitions
-    :param ref_prefix: the JSON Pointer prefix to use for references to other schemas, if None, the default of
-      #/definitions/ will be used
-    :param ref_template: Use a ``string.format()`` template for ``$ref`` instead of a prefix. This can be useful for
-      references that cannot be represented by ``ref_prefix`` such as a definition stored in another file. For a
-      sibling json file in a ``/schemas`` directory use ``"/schemas/${model}.json#"``.
-    :param known_models: used to solve circular references
-    :return: tuple of the schema for this field and additional definitions
-    """
-    s, schema_overrides = get_field_info_schema(field)
-
-    validation_schema = get_field_schema_validations(field)
-    if validation_schema:
-        s.update(validation_schema)
-        schema_overrides = True
-
-    f_schema, f_definitions, f_nested_models = field_type_schema(
-        field,
-        by_alias=by_alias,
-        model_name_map=model_name_map,
-        schema_overrides=schema_overrides,
-        ref_prefix=ref_prefix,
-        ref_template=ref_template,
-        known_models=known_models or set(),
-    )
-
-    # $ref will only be returned when there are no schema_overrides
-    if '$ref' in f_schema:
-        return f_schema, f_definitions, f_nested_models
-    else:
-        s.update(f_schema)
-        return s, f_definitions, f_nested_models
-
-
-numeric_types = (int, float, Decimal)
-_str_types_attrs: Tuple[Tuple[str, Union[type, Tuple[type, ...]], str], ...] = (
-    ('max_length', numeric_types, 'maxLength'),
-    ('min_length', numeric_types, 'minLength'),
-    ('regex', str, 'pattern'),
-)
-
-_numeric_types_attrs: Tuple[Tuple[str, Union[type, Tuple[type, ...]], str], ...] = (
-    ('gt', numeric_types, 'exclusiveMinimum'),
-    ('lt', numeric_types, 'exclusiveMaximum'),
-    ('ge', numeric_types, 'minimum'),
-    ('le', numeric_types, 'maximum'),
-    ('multiple_of', numeric_types, 'multipleOf'),
-)
-
-
-def get_field_schema_validations(field: ModelField) -> Dict[str, Any]:
-    """
-    Get the JSON Schema validation keywords for a ``field`` with an annotation of
-    a Pydantic ``FieldInfo`` with validation arguments.
-    """
-    f_schema: Dict[str, Any] = {}
-
-    if lenient_issubclass(field.type_, Enum):
-        # schema is already updated by `enum_process_schema`; just update with field extra
-        if field.field_info.extra:
-            f_schema.update(field.field_info.extra)
-        return f_schema
-
-    if lenient_issubclass(field.type_, (str, bytes)):
-        for attr_name, t, keyword in _str_types_attrs:
-            attr = getattr(field.field_info, attr_name, None)
-            if isinstance(attr, t):
-                f_schema[keyword] = attr
-    if lenient_issubclass(field.type_, numeric_types) and not issubclass(field.type_, bool):
-        for attr_name, t, keyword in _numeric_types_attrs:
-            attr = getattr(field.field_info, attr_name, None)
-            if isinstance(attr, t):
-                f_schema[keyword] = attr
-    if field.field_info is not None and field.field_info.const:
-        f_schema['const'] = field.default
-    if field.field_info.extra:
-        f_schema.update(field.field_info.extra)
-    modify_schema = getattr(field.outer_type_, '__modify_schema__', None)
-    if modify_schema:
-        _apply_modify_schema(modify_schema, field, f_schema)
-    return f_schema
-
-
-def get_model_name_map(unique_models: TypeModelSet) -> Dict[TypeModelOrEnum, str]:
-    """
-    Process a set of models and generate unique names for them to be used as keys in the JSON Schema
-    definitions. By default the names are the same as the class name. But if two models in different Python
-    modules have the same name (e.g. "users.Model" and "items.Model"), the generated names will be
-    based on the Python module path for those conflicting models to prevent name collisions.
-
-    :param unique_models: a Python set of models
-    :return: dict mapping models to names
-    """
-    name_model_map = {}
-    conflicting_names: Set[str] = set()
-    for model in unique_models:
-        model_name = normalize_name(model.__name__)
-        if model_name in conflicting_names:
-            model_name = get_long_model_name(model)
-            name_model_map[model_name] = model
-        elif model_name in name_model_map:
-            conflicting_names.add(model_name)
-            conflicting_model = name_model_map.pop(model_name)
-            name_model_map[get_long_model_name(conflicting_model)] = conflicting_model
-            name_model_map[get_long_model_name(model)] = model
-        else:
-            name_model_map[model_name] = model
-    return {v: k for k, v in name_model_map.items()}
-
-
-def get_flat_models_from_model(model: Type['BaseModel'], known_models: Optional[TypeModelSet] = None) -> TypeModelSet:
-    """
-    Take a single ``model`` and generate a set with itself and all the sub-models in the tree. I.e. if you pass
-    model ``Foo`` (subclass of Pydantic ``BaseModel``) as ``model``, and it has a field of type ``Bar`` (also
-    subclass of ``BaseModel``) and that model ``Bar`` has a field of type ``Baz`` (also subclass of ``BaseModel``),
-    the return value will be ``set([Foo, Bar, Baz])``.
-
-    :param model: a Pydantic ``BaseModel`` subclass
-    :param known_models: used to solve circular references
-    :return: a set with the initial model and all its sub-models
-    """
-    known_models = known_models or set()
-    flat_models: TypeModelSet = set()
-    flat_models.add(model)
-    known_models |= flat_models
-    fields = cast(Sequence[ModelField], model.__fields__.values())
-    flat_models |= get_flat_models_from_fields(fields, known_models=known_models)
-    return flat_models
-
-
-def get_flat_models_from_field(field: ModelField, known_models: TypeModelSet) -> TypeModelSet:
-    """
-    Take a single Pydantic ``ModelField`` (from a model) that could have been declared as a subclass of BaseModel
-    (so, it could be a submodel), and generate a set with its model and all the sub-models in the tree.
-    I.e. if you pass a field that was declared to be of type ``Foo`` (subclass of BaseModel) as ``field``, and that
-    model ``Foo`` has a field of type ``Bar`` (also subclass of ``BaseModel``) and that model ``Bar`` has a field of
-    type ``Baz`` (also subclass of ``BaseModel``), the return value will be ``set([Foo, Bar, Baz])``.
-
-    :param field: a Pydantic ``ModelField``
-    :param known_models: used to solve circular references
-    :return: a set with the model used in the declaration for this field, if any, and all its sub-models
-    """
-    from .main import BaseModel
-
-    flat_models: TypeModelSet = set()
-
-    field_type = field.type_
-    if lenient_issubclass(getattr(field_type, '__pydantic_model__', None), BaseModel):
-        field_type = field_type.__pydantic_model__
-
-    if field.sub_fields and not lenient_issubclass(field_type, BaseModel):
-        flat_models |= get_flat_models_from_fields(field.sub_fields, known_models=known_models)
-    elif lenient_issubclass(field_type, BaseModel) and field_type not in known_models:
-        flat_models |= get_flat_models_from_model(field_type, known_models=known_models)
-    elif lenient_issubclass(field_type, Enum):
-        flat_models.add(field_type)
-    return flat_models
-
-
-def get_flat_models_from_fields(fields: Sequence[ModelField], known_models: TypeModelSet) -> TypeModelSet:
-    """
-    Take a list of Pydantic  ``ModelField``s (from a model) that could have been declared as subclasses of ``BaseModel``
-    (so, any of them could be a submodel), and generate a set with their models and all the sub-models in the tree.
-    I.e. if you pass a the fields of a model ``Foo`` (subclass of ``BaseModel``) as ``fields``, and on of them has a
-    field of type ``Bar`` (also subclass of ``BaseModel``) and that model ``Bar`` has a field of type ``Baz`` (also
-    subclass of ``BaseModel``), the return value will be ``set([Foo, Bar, Baz])``.
-
-    :param fields: a list of Pydantic ``ModelField``s
-    :param known_models: used to solve circular references
-    :return: a set with any model declared in the fields, and all their sub-models
-    """
-    flat_models: TypeModelSet = set()
-    for field in fields:
-        flat_models |= get_flat_models_from_field(field, known_models=known_models)
-    return flat_models
-
-
-def get_flat_models_from_models(models: Sequence[Type['BaseModel']]) -> TypeModelSet:
-    """
-    Take a list of ``models`` and generate a set with them and all their sub-models in their trees. I.e. if you pass
-    a list of two models, ``Foo`` and ``Bar``, both subclasses of Pydantic ``BaseModel`` as models, and ``Bar`` has
-    a field of type ``Baz`` (also subclass of ``BaseModel``), the return value will be ``set([Foo, Bar, Baz])``.
-    """
-    flat_models: TypeModelSet = set()
-    for model in models:
-        flat_models |= get_flat_models_from_model(model)
-    return flat_models
-
-
-def get_long_model_name(model: TypeModelOrEnum) -> str:
-    return f'{model.__module__}__{model.__qualname__}'.replace('.', '__')
-
-
-def field_type_schema(
-    field: ModelField,
-    *,
-    by_alias: bool,
-    model_name_map: Dict[TypeModelOrEnum, str],
-    ref_template: str,
-    schema_overrides: bool = False,
-    ref_prefix: Optional[str] = None,
-    known_models: TypeModelSet,
-) -> Tuple[Dict[str, Any], Dict[str, Any], Set[str]]:
-    """
-    Used by ``field_schema()``, you probably should be using that function.
-
-    Take a single ``field`` and generate the schema for its type only, not including additional
-    information as title, etc. Also return additional schema definitions, from sub-models.
-    """
-    from .main import BaseModel  # noqa: F811
-
-    definitions = {}
-    nested_models: Set[str] = set()
-    f_schema: Dict[str, Any]
-    if field.shape in {
-        SHAPE_LIST,
-        SHAPE_TUPLE_ELLIPSIS,
-        SHAPE_SEQUENCE,
-        SHAPE_SET,
-        SHAPE_FROZENSET,
-        SHAPE_ITERABLE,
-        SHAPE_DEQUE,
-    }:
-        items_schema, f_definitions, f_nested_models = field_singleton_schema(
-            field,
-            by_alias=by_alias,
-            model_name_map=model_name_map,
-            ref_prefix=ref_prefix,
-            ref_template=ref_template,
-            known_models=known_models,
-        )
-        definitions.update(f_definitions)
-        nested_models.update(f_nested_models)
-        f_schema = {'type': 'array', 'items': items_schema}
-        if field.shape in {SHAPE_SET, SHAPE_FROZENSET}:
-            f_schema['uniqueItems'] = True
-
-    elif field.shape in MAPPING_LIKE_SHAPES:
-        f_schema = {'type': 'object'}
-        key_field = cast(ModelField, field.key_field)
-        regex = getattr(key_field.type_, 'regex', None)
-        items_schema, f_definitions, f_nested_models = field_singleton_schema(
-            field,
-            by_alias=by_alias,
-            model_name_map=model_name_map,
-            ref_prefix=ref_prefix,
-            ref_template=ref_template,
-            known_models=known_models,
-        )
-        definitions.update(f_definitions)
-        nested_models.update(f_nested_models)
-        if regex:
-            # Dict keys have a regex pattern
-            # items_schema might be a schema or empty dict, add it either way
-            f_schema['patternProperties'] = {ConstrainedStr._get_pattern(regex): items_schema}
-        if items_schema:
-            # The dict values are not simply Any, so they need a schema
-            f_schema['additionalProperties'] = items_schema
-    elif field.shape == SHAPE_TUPLE or (field.shape == SHAPE_GENERIC and not issubclass(field.type_, BaseModel)):
-        sub_schema = []
-        sub_fields = cast(List[ModelField], field.sub_fields)
-        for sf in sub_fields:
-            sf_schema, sf_definitions, sf_nested_models = field_type_schema(
-                sf,
-                by_alias=by_alias,
-                model_name_map=model_name_map,
-                ref_prefix=ref_prefix,
-                ref_template=ref_template,
-                known_models=known_models,
-            )
-            definitions.update(sf_definitions)
-            nested_models.update(sf_nested_models)
-            sub_schema.append(sf_schema)
-
-        sub_fields_len = len(sub_fields)
-        if field.shape == SHAPE_GENERIC:
-            all_of_schemas = sub_schema[0] if sub_fields_len == 1 else {'type': 'array', 'items': sub_schema}
-            f_schema = {'allOf': [all_of_schemas]}
-        else:
-            f_schema = {
-                'type': 'array',
-                'minItems': sub_fields_len,
-                'maxItems': sub_fields_len,
-            }
-            if sub_fields_len >= 1:
-                f_schema['items'] = sub_schema
-    else:
-        assert field.shape in {SHAPE_SINGLETON, SHAPE_GENERIC}, field.shape
-        f_schema, f_definitions, f_nested_models = field_singleton_schema(
-            field,
-            by_alias=by_alias,
-            model_name_map=model_name_map,
-            schema_overrides=schema_overrides,
-            ref_prefix=ref_prefix,
-            ref_template=ref_template,
-            known_models=known_models,
-        )
-        definitions.update(f_definitions)
-        nested_models.update(f_nested_models)
-
-    # check field type to avoid repeated calls to the same __modify_schema__ method
-    if field.type_ != field.outer_type_:
-        if field.shape == SHAPE_GENERIC:
-            field_type = field.type_
-        else:
-            field_type = field.outer_type_
-        modify_schema = getattr(field_type, '__modify_schema__', None)
-        if modify_schema:
-            _apply_modify_schema(modify_schema, field, f_schema)
-    return f_schema, definitions, nested_models
-
-
-def model_process_schema(
-    model: TypeModelOrEnum,
-    *,
-    by_alias: bool = True,
-    model_name_map: Dict[TypeModelOrEnum, str],
-    ref_prefix: Optional[str] = None,
-    ref_template: str = default_ref_template,
-    known_models: Optional[TypeModelSet] = None,
-    field: Optional[ModelField] = None,
-) -> Tuple[Dict[str, Any], Dict[str, Any], Set[str]]:
-    """
-    Used by ``model_schema()``, you probably should be using that function.
-
-    Take a single ``model`` and generate its schema. Also return additional schema definitions, from sub-models. The
-    sub-models of the returned schema will be referenced, but their definitions will not be included in the schema. All
-    the definitions are returned as the second value.
-    """
-    from inspect import getdoc, signature
-
-    known_models = known_models or set()
-    if lenient_issubclass(model, Enum):
-        model = cast(Type[Enum], model)
-        s = enum_process_schema(model, field=field)
-        return s, {}, set()
-    model = cast(Type['BaseModel'], model)
-    s = {'title': model.__config__.title or model.__name__}
-    doc = getdoc(model)
-    if doc:
-        s['description'] = doc
-    known_models.add(model)
-    m_schema, m_definitions, nested_models = model_type_schema(
-        model,
-        by_alias=by_alias,
-        model_name_map=model_name_map,
-        ref_prefix=ref_prefix,
-        ref_template=ref_template,
-        known_models=known_models,
-    )
-    s.update(m_schema)
-    schema_extra = model.__config__.schema_extra
-    if callable(schema_extra):
-        if len(signature(schema_extra).parameters) == 1:
-            schema_extra(s)
-        else:
-            schema_extra(s, model)
-    else:
-        s.update(schema_extra)
-    return s, m_definitions, nested_models
-
-
-def model_type_schema(
-    model: Type['BaseModel'],
-    *,
-    by_alias: bool,
-    model_name_map: Dict[TypeModelOrEnum, str],
-    ref_template: str,
-    ref_prefix: Optional[str] = None,
-    known_models: TypeModelSet,
-) -> Tuple[Dict[str, Any], Dict[str, Any], Set[str]]:
-    """
-    You probably should be using ``model_schema()``, this function is indirectly used by that function.
-
-    Take a single ``model`` and generate the schema for its type only, not including additional
-    information as title, etc. Also return additional schema definitions, from sub-models.
-    """
-    properties = {}
-    required = []
-    definitions: Dict[str, Any] = {}
-    nested_models: Set[str] = set()
-    for k, f in model.__fields__.items():
-        try:
-            f_schema, f_definitions, f_nested_models = field_schema(
-                f,
-                by_alias=by_alias,
-                model_name_map=model_name_map,
-                ref_prefix=ref_prefix,
-                ref_template=ref_template,
-                known_models=known_models,
-            )
-        except SkipField as skip:
-            warnings.warn(skip.message, UserWarning)
-            continue
-        definitions.update(f_definitions)
-        nested_models.update(f_nested_models)
-        if by_alias:
-            properties[f.alias] = f_schema
-            if f.required:
-                required.append(f.alias)
-        else:
-            properties[k] = f_schema
-            if f.required:
-                required.append(k)
-    if ROOT_KEY in properties:
-        out_schema = properties[ROOT_KEY]
-        out_schema['title'] = model.__config__.title or model.__name__
-    else:
-        out_schema = {'type': 'object', 'properties': properties}
-        if required:
-            out_schema['required'] = required
-    if model.__config__.extra == 'forbid':
-        out_schema['additionalProperties'] = False
-    return out_schema, definitions, nested_models
-
-
-def enum_process_schema(enum: Type[Enum], *, field: Optional[ModelField] = None) -> Dict[str, Any]:
-    """
-    Take a single `enum` and generate its schema.
-
-    This is similar to the `model_process_schema` function, but applies to ``Enum`` objects.
-    """
-    import inspect
-
-    schema_: Dict[str, Any] = {
-        'title': enum.__name__,
-        # Python assigns all enums a default docstring value of 'An enumeration', so
-        # all enums will have a description field even if not explicitly provided.
-        'description': inspect.cleandoc(enum.__doc__ or 'An enumeration.'),
-        # Add enum values and the enum field type to the schema.
-        'enum': [item.value for item in cast(Iterable[Enum], enum)],
-    }
-
-    add_field_type_to_schema(enum, schema_)
-
-    modify_schema = getattr(enum, '__modify_schema__', None)
-    if modify_schema:
-        _apply_modify_schema(modify_schema, field, schema_)
-
-    return schema_
-
-
-def field_singleton_sub_fields_schema(
-    field: ModelField,
-    *,
-    by_alias: bool,
-    model_name_map: Dict[TypeModelOrEnum, str],
-    ref_template: str,
-    schema_overrides: bool = False,
-    ref_prefix: Optional[str] = None,
-    known_models: TypeModelSet,
-) -> Tuple[Dict[str, Any], Dict[str, Any], Set[str]]:
-    """
-    This function is indirectly used by ``field_schema()``, you probably should be using that function.
-
-    Take a list of Pydantic ``ModelField`` from the declaration of a type with parameters, and generate their
-    schema. I.e., fields used as "type parameters", like ``str`` and ``int`` in ``Tuple[str, int]``.
-    """
-    sub_fields = cast(List[ModelField], field.sub_fields)
-    definitions = {}
-    nested_models: Set[str] = set()
-    if len(sub_fields) == 1:
-        return field_type_schema(
-            sub_fields[0],
-            by_alias=by_alias,
-            model_name_map=model_name_map,
-            schema_overrides=schema_overrides,
-            ref_prefix=ref_prefix,
-            ref_template=ref_template,
-            known_models=known_models,
-        )
-    else:
-        s: Dict[str, Any] = {}
-        # https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#discriminator-object
-        field_has_discriminator: bool = field.discriminator_key is not None
-        if field_has_discriminator:
-            assert field.sub_fields_mapping is not None
-
-            discriminator_models_refs: Dict[str, Union[str, Dict[str, Any]]] = {}
-
-            for discriminator_value, sub_field in field.sub_fields_mapping.items():
-                if isinstance(discriminator_value, Enum):
-                    discriminator_value = str(discriminator_value.value)
-                # sub_field is either a `BaseModel` or directly an `Annotated` `Union` of many
-                if is_union(get_origin(sub_field.type_)):
-                    sub_models = get_sub_types(sub_field.type_)
-                    discriminator_models_refs[discriminator_value] = {
-                        model_name_map[sub_model]: get_schema_ref(
-                            model_name_map[sub_model], ref_prefix, ref_template, False
-                        )
-                        for sub_model in sub_models
-                    }
-                else:
-                    sub_field_type = sub_field.type_
-                    if hasattr(sub_field_type, '__pydantic_model__'):
-                        sub_field_type = sub_field_type.__pydantic_model__
-
-                    discriminator_model_name = model_name_map[sub_field_type]
-                    discriminator_model_ref = get_schema_ref(discriminator_model_name, ref_prefix, ref_template, False)
-                    discriminator_models_refs[discriminator_value] = discriminator_model_ref['$ref']
-
-            s['discriminator'] = {
-                'propertyName': field.discriminator_alias,
-                'mapping': discriminator_models_refs,
-            }
-
-        sub_field_schemas = []
-        for sf in sub_fields:
-            sub_schema, sub_definitions, sub_nested_models = field_type_schema(
-                sf,
-                by_alias=by_alias,
-                model_name_map=model_name_map,
-                schema_overrides=schema_overrides,
-                ref_prefix=ref_prefix,
-                ref_template=ref_template,
-                known_models=known_models,
-            )
-            definitions.update(sub_definitions)
-            if schema_overrides and 'allOf' in sub_schema:
-                # if the sub_field is a referenced schema we only need the referenced
-                # object. Otherwise we will end up with several allOf inside anyOf/oneOf.
-                # See https://github.com/pydantic/pydantic/issues/1209
-                sub_schema = sub_schema['allOf'][0]
-
-            if sub_schema.keys() == {'discriminator', 'oneOf'}:
-                # we don't want discriminator information inside oneOf choices, this is dealt with elsewhere
-                sub_schema.pop('discriminator')
-            sub_field_schemas.append(sub_schema)
-            nested_models.update(sub_nested_models)
-        s['oneOf' if field_has_discriminator else 'anyOf'] = sub_field_schemas
-        return s, definitions, nested_models
-
-
-# Order is important, e.g. subclasses of str must go before str
-# this is used only for standard library types, custom types should use __modify_schema__ instead
-field_class_to_schema: Tuple[Tuple[Any, Dict[str, Any]], ...] = (
-    (Path, {'type': 'string', 'format': 'path'}),
-    (datetime, {'type': 'string', 'format': 'date-time'}),
-    (date, {'type': 'string', 'format': 'date'}),
-    (time, {'type': 'string', 'format': 'time'}),
-    (timedelta, {'type': 'number', 'format': 'time-delta'}),
-    (IPv4Network, {'type': 'string', 'format': 'ipv4network'}),
-    (IPv6Network, {'type': 'string', 'format': 'ipv6network'}),
-    (IPv4Interface, {'type': 'string', 'format': 'ipv4interface'}),
-    (IPv6Interface, {'type': 'string', 'format': 'ipv6interface'}),
-    (IPv4Address, {'type': 'string', 'format': 'ipv4'}),
-    (IPv6Address, {'type': 'string', 'format': 'ipv6'}),
-    (Pattern, {'type': 'string', 'format': 'regex'}),
-    (str, {'type': 'string'}),
-    (bytes, {'type': 'string', 'format': 'binary'}),
-    (bool, {'type': 'boolean'}),
-    (int, {'type': 'integer'}),
-    (float, {'type': 'number'}),
-    (Decimal, {'type': 'number'}),
-    (UUID, {'type': 'string', 'format': 'uuid'}),
-    (dict, {'type': 'object'}),
-    (list, {'type': 'array', 'items': {}}),
-    (tuple, {'type': 'array', 'items': {}}),
-    (set, {'type': 'array', 'items': {}, 'uniqueItems': True}),
-    (frozenset, {'type': 'array', 'items': {}, 'uniqueItems': True}),
-)
-
-json_scheme = {'type': 'string', 'format': 'json-string'}
-
-
-def add_field_type_to_schema(field_type: Any, schema_: Dict[str, Any]) -> None:
-    """
-    Update the given `schema` with the type-specific metadata for the given `field_type`.
-
-    This function looks through `field_class_to_schema` for a class that matches the given `field_type`,
-    and then modifies the given `schema` with the information from that type.
-    """
-    for type_, t_schema in field_class_to_schema:
-        # Fallback for `typing.Pattern` and `re.Pattern` as they are not a valid class
-        if lenient_issubclass(field_type, type_) or field_type is type_ is Pattern:
-            schema_.update(t_schema)
-            break
-
-
-def get_schema_ref(name: str, ref_prefix: Optional[str], ref_template: str, schema_overrides: bool) -> Dict[str, Any]:
-    if ref_prefix:
-        schema_ref = {'$ref': ref_prefix + name}
-    else:
-        schema_ref = {'$ref': ref_template.format(model=name)}
-    return {'allOf': [schema_ref]} if schema_overrides else schema_ref
-
-
-def field_singleton_schema(  # noqa: C901 (ignore complexity)
-    field: ModelField,
-    *,
-    by_alias: bool,
-    model_name_map: Dict[TypeModelOrEnum, str],
-    ref_template: str,
-    schema_overrides: bool = False,
-    ref_prefix: Optional[str] = None,
-    known_models: TypeModelSet,
-) -> Tuple[Dict[str, Any], Dict[str, Any], Set[str]]:
-    """
-    This function is indirectly used by ``field_schema()``, you should probably be using that function.
-
-    Take a single Pydantic ``ModelField``, and return its schema and any additional definitions from sub-models.
-    """
-    from .main import BaseModel
-
-    definitions: Dict[str, Any] = {}
-    nested_models: Set[str] = set()
-    field_type = field.type_
-
-    # Recurse into this field if it contains sub_fields and is NOT a
-    # BaseModel OR that BaseModel is a const
-    if field.sub_fields and (
-        (field.field_info and field.field_info.const) or not lenient_issubclass(field_type, BaseModel)
-    ):
-        return field_singleton_sub_fields_schema(
-            field,
-            by_alias=by_alias,
-            model_name_map=model_name_map,
-            schema_overrides=schema_overrides,
-            ref_prefix=ref_prefix,
-            ref_template=ref_template,
-            known_models=known_models,
-        )
-    if field_type is Any or field_type is object or field_type.__class__ == TypeVar or get_origin(field_type) is type:
-        return {}, definitions, nested_models  # no restrictions
-    if is_none_type(field_type):
-        return {'type': 'null'}, definitions, nested_models
-    if is_callable_type(field_type):
-        raise SkipField(f'Callable {field.name} was excluded from schema since JSON schema has no equivalent type.')
-    f_schema: Dict[str, Any] = {}
-    if field.field_info is not None and field.field_info.const:
-        f_schema['const'] = field.default
-
-    if is_literal_type(field_type):
-        values = tuple(x.value if isinstance(x, Enum) else x for x in all_literal_values(field_type))
-
-        if len({v.__class__ for v in values}) > 1:
-            return field_schema(
-                multitypes_literal_field_for_schema(values, field),
-                by_alias=by_alias,
-                model_name_map=model_name_map,
-                ref_prefix=ref_prefix,
-                ref_template=ref_template,
-                known_models=known_models,
-            )
-
-        # All values have the same type
-        field_type = values[0].__class__
-        f_schema['enum'] = list(values)
-        add_field_type_to_schema(field_type, f_schema)
-    elif lenient_issubclass(field_type, Enum):
-        enum_name = model_name_map[field_type]
-        f_schema, schema_overrides = get_field_info_schema(field, schema_overrides)
-        f_schema.update(get_schema_ref(enum_name, ref_prefix, ref_template, schema_overrides))
-        definitions[enum_name] = enum_process_schema(field_type, field=field)
-    elif is_namedtuple(field_type):
-        sub_schema, *_ = model_process_schema(
-            field_type.__pydantic_model__,
-            by_alias=by_alias,
-            model_name_map=model_name_map,
-            ref_prefix=ref_prefix,
-            ref_template=ref_template,
-            known_models=known_models,
-            field=field,
-        )
-        items_schemas = list(sub_schema['properties'].values())
-        f_schema.update(
-            {
-                'type': 'array',
-                'items': items_schemas,
-                'minItems': len(items_schemas),
-                'maxItems': len(items_schemas),
-            }
-        )
-    elif not hasattr(field_type, '__pydantic_model__'):
-        add_field_type_to_schema(field_type, f_schema)
-
-        modify_schema = getattr(field_type, '__modify_schema__', None)
-        if modify_schema:
-            _apply_modify_schema(modify_schema, field, f_schema)
-
-    if f_schema:
-        return f_schema, definitions, nested_models
-
-    # Handle dataclass-based models
-    if lenient_issubclass(getattr(field_type, '__pydantic_model__', None), BaseModel):
-        field_type = field_type.__pydantic_model__
-
-    if issubclass(field_type, BaseModel):
-        model_name = model_name_map[field_type]
-        if field_type not in known_models:
-            sub_schema, sub_definitions, sub_nested_models = model_process_schema(
-                field_type,
-                by_alias=by_alias,
-                model_name_map=model_name_map,
-                ref_prefix=ref_prefix,
-                ref_template=ref_template,
-                known_models=known_models,
-                field=field,
-            )
-            definitions.update(sub_definitions)
-            definitions[model_name] = sub_schema
-            nested_models.update(sub_nested_models)
-        else:
-            nested_models.add(model_name)
-        schema_ref = get_schema_ref(model_name, ref_prefix, ref_template, schema_overrides)
-        return schema_ref, definitions, nested_models
-
-    # For generics with no args
-    args = get_args(field_type)
-    if args is not None and not args and Generic in field_type.__bases__:
-        return f_schema, definitions, nested_models
-
-    raise ValueError(f'Value not declarable with JSON Schema, field: {field}')
-
-
-def multitypes_literal_field_for_schema(values: Tuple[Any, ...], field: ModelField) -> ModelField:
-    """
-    To support `Literal` with values of different types, we split it into multiple `Literal` with same type
-    e.g. `Literal['qwe', 'asd', 1, 2]` becomes `Union[Literal['qwe', 'asd'], Literal[1, 2]]`
-    """
-    literal_distinct_types = defaultdict(list)
-    for v in values:
-        literal_distinct_types[v.__class__].append(v)
-    distinct_literals = (Literal[tuple(same_type_values)] for same_type_values in literal_distinct_types.values())
-
-    return ModelField(
-        name=field.name,
-        type_=Union[tuple(distinct_literals)],  # type: ignore
-        class_validators=field.class_validators,
-        model_config=field.model_config,
-        default=field.default,
-        required=field.required,
-        alias=field.alias,
-        field_info=field.field_info,
-    )
-
-
-def encode_default(dft: Any) -> Any:
-    from .main import BaseModel
-
-    if isinstance(dft, BaseModel) or is_dataclass(dft):
-        dft = cast('dict[str, Any]', pydantic_encoder(dft))
-
-    if isinstance(dft, dict):
-        return {encode_default(k): encode_default(v) for k, v in dft.items()}
-    elif isinstance(dft, Enum):
-        return dft.value
-    elif isinstance(dft, (int, float, str)):
-        return dft
-    elif isinstance(dft, (list, tuple)):
-        t = dft.__class__
-        seq_args = (encode_default(v) for v in dft)
-        return t(*seq_args) if is_namedtuple(t) else t(seq_args)
-    elif dft is None:
-        return None
-    else:
-        return pydantic_encoder(dft)
-
-
-_map_types_constraint: Dict[Any, Callable[..., type]] = {int: conint, float: confloat, Decimal: condecimal}
-
-
-def get_annotation_from_field_info(
-    annotation: Any, field_info: FieldInfo, field_name: str, validate_assignment: bool = False
-) -> Type[Any]:
-    """
-    Get an annotation with validation implemented for numbers and strings based on the field_info.
-    :param annotation: an annotation from a field specification, as ``str``, ``ConstrainedStr``
-    :param field_info: an instance of FieldInfo, possibly with declarations for validations and JSON Schema
-    :param field_name: name of the field for use in error messages
-    :param validate_assignment: default False, flag for BaseModel Config value of validate_assignment
-    :return: the same ``annotation`` if unmodified or a new annotation with validation in place
-    """
-    constraints = field_info.get_constraints()
-    used_constraints: Set[str] = set()
-    if constraints:
-        annotation, used_constraints = get_annotation_with_constraints(annotation, field_info)
-    if validate_assignment:
-        used_constraints.add('allow_mutation')
-
-    unused_constraints = constraints - used_constraints
-    if unused_constraints:
-        raise ValueError(
-            f'On field "{field_name}" the following field constraints are set but not enforced: '
-            f'{", ".join(unused_constraints)}. '
-            f'\nFor more details see https://docs.pydantic.dev/usage/schema/#unenforced-field-constraints'
-        )
-
-    return annotation
-
-
-def get_annotation_with_constraints(annotation: Any, field_info: FieldInfo) -> Tuple[Type[Any], Set[str]]:  # noqa: C901
-    """
-    Get an annotation with used constraints implemented for numbers and strings based on the field_info.
-
-    :param annotation: an annotation from a field specification, as ``str``, ``ConstrainedStr``
-    :param field_info: an instance of FieldInfo, possibly with declarations for validations and JSON Schema
-    :return: the same ``annotation`` if unmodified or a new annotation along with the used constraints.
-    """
-    used_constraints: Set[str] = set()
-
-    def go(type_: Any) -> Type[Any]:
-        if (
-            is_literal_type(type_)
-            or isinstance(type_, ForwardRef)
-            or lenient_issubclass(type_, (ConstrainedList, ConstrainedSet, ConstrainedFrozenSet))
-        ):
-            return type_
-        origin = get_origin(type_)
-        if origin is not None:
-            args: Tuple[Any, ...] = get_args(type_)
-            if any(isinstance(a, ForwardRef) for a in args):
-                # forward refs cause infinite recursion below
-                return type_
-
-            if origin is Annotated:
-                return go(args[0])
-            if is_union(origin):
-                return Union[tuple(go(a) for a in args)]  # type: ignore
-
-            if issubclass(origin, List) and (
-                field_info.min_items is not None
-                or field_info.max_items is not None
-                or field_info.unique_items is not None
-            ):
-                used_constraints.update({'min_items', 'max_items', 'unique_items'})
-                return conlist(
-                    go(args[0]),
-                    min_items=field_info.min_items,
-                    max_items=field_info.max_items,
-                    unique_items=field_info.unique_items,
-                )
-
-            if issubclass(origin, Set) and (field_info.min_items is not None or field_info.max_items is not None):
-                used_constraints.update({'min_items', 'max_items'})
-                return conset(go(args[0]), min_items=field_info.min_items, max_items=field_info.max_items)
-
-            if issubclass(origin, FrozenSet) and (field_info.min_items is not None or field_info.max_items is not None):
-                used_constraints.update({'min_items', 'max_items'})
-                return confrozenset(go(args[0]), min_items=field_info.min_items, max_items=field_info.max_items)
-
-            for t in (Tuple, List, Set, FrozenSet, Sequence):
-                if issubclass(origin, t):  # type: ignore
-                    return t[tuple(go(a) for a in args)]  # type: ignore
-
-            if issubclass(origin, Dict):
-                return Dict[args[0], go(args[1])]  # type: ignore
-
-        attrs: Optional[Tuple[str, ...]] = None
-        constraint_func: Optional[Callable[..., type]] = None
-        if isinstance(type_, type):
-            if issubclass(type_, (SecretStr, SecretBytes)):
-                attrs = ('max_length', 'min_length')
-
-                def constraint_func(**kw: Any) -> Type[Any]:
-                    return type(type_.__name__, (type_,), kw)
-
-            elif issubclass(type_, str) and not issubclass(type_, (EmailStr, AnyUrl)):
-                attrs = ('max_length', 'min_length', 'regex')
-                if issubclass(type_, StrictStr):
-
-                    def constraint_func(**kw: Any) -> Type[Any]:
-                        return type(type_.__name__, (type_,), kw)
-
-                else:
-                    constraint_func = constr
-            elif issubclass(type_, bytes):
-                attrs = ('max_length', 'min_length', 'regex')
-                if issubclass(type_, StrictBytes):
-
-                    def constraint_func(**kw: Any) -> Type[Any]:
-                        return type(type_.__name__, (type_,), kw)
-
-                else:
-                    constraint_func = conbytes
-            elif issubclass(type_, numeric_types) and not issubclass(
-                type_,
-                (
-                    ConstrainedInt,
-                    ConstrainedFloat,
-                    ConstrainedDecimal,
-                    ConstrainedList,
-                    ConstrainedSet,
-                    ConstrainedFrozenSet,
-                    bool,
-                ),
-            ):
-                # Is numeric type
-                attrs = ('gt', 'lt', 'ge', 'le', 'multiple_of')
-                if issubclass(type_, float):
-                    attrs += ('allow_inf_nan',)
-                if issubclass(type_, Decimal):
-                    attrs += ('max_digits', 'decimal_places')
-                numeric_type = next(t for t in numeric_types if issubclass(type_, t))  # pragma: no branch
-                constraint_func = _map_types_constraint[numeric_type]
-
-        if attrs:
-            used_constraints.update(set(attrs))
-            kwargs = {
-                attr_name: attr
-                for attr_name, attr in ((attr_name, getattr(field_info, attr_name)) for attr_name in attrs)
-                if attr is not None
-            }
-            if kwargs:
-                constraint_func = cast(Callable[..., type], constraint_func)
-                return constraint_func(**kwargs)
-        return type_
-
-    return go(annotation), used_constraints
-
-
-def normalize_name(name: str) -> str:
-    """
-    Normalizes the given name. This can be applied to either a model *or* enum.
-    """
-    return re.sub(r'[^a-zA-Z0-9.\-_]', '_', name)
-
-
-class SkipField(Exception):
-    """
-    Utility exception used to exclude fields from schema.
-    """
-
-    def __init__(self, message: str) -> None:
-        self.message = message
diff --git a/lib/pydantic/v1/tools.py b/lib/pydantic/v1/tools.py
deleted file mode 100644
index 45be2770..00000000
--- a/lib/pydantic/v1/tools.py
+++ /dev/null
@@ -1,92 +0,0 @@
-import json
-from functools import lru_cache
-from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, Optional, Type, TypeVar, Union
-
-from .parse import Protocol, load_file, load_str_bytes
-from .types import StrBytes
-from .typing import display_as_type
-
-__all__ = ('parse_file_as', 'parse_obj_as', 'parse_raw_as', 'schema_of', 'schema_json_of')
-
-NameFactory = Union[str, Callable[[Type[Any]], str]]
-
-if TYPE_CHECKING:
-    from .typing import DictStrAny
-
-
-def _generate_parsing_type_name(type_: Any) -> str:
-    return f'ParsingModel[{display_as_type(type_)}]'
-
-
-@lru_cache(maxsize=2048)
-def _get_parsing_type(type_: Any, *, type_name: Optional[NameFactory] = None) -> Any:
-    from .main import create_model
-
-    if type_name is None:
-        type_name = _generate_parsing_type_name
-    if not isinstance(type_name, str):
-        type_name = type_name(type_)
-    return create_model(type_name, __root__=(type_, ...))
-
-
-T = TypeVar('T')
-
-
-def parse_obj_as(type_: Type[T], obj: Any, *, type_name: Optional[NameFactory] = None) -> T:
-    model_type = _get_parsing_type(type_, type_name=type_name)  # type: ignore[arg-type]
-    return model_type(__root__=obj).__root__
-
-
-def parse_file_as(
-    type_: Type[T],
-    path: Union[str, Path],
-    *,
-    content_type: str = None,
-    encoding: str = 'utf8',
-    proto: Protocol = None,
-    allow_pickle: bool = False,
-    json_loads: Callable[[str], Any] = json.loads,
-    type_name: Optional[NameFactory] = None,
-) -> T:
-    obj = load_file(
-        path,
-        proto=proto,
-        content_type=content_type,
-        encoding=encoding,
-        allow_pickle=allow_pickle,
-        json_loads=json_loads,
-    )
-    return parse_obj_as(type_, obj, type_name=type_name)
-
-
-def parse_raw_as(
-    type_: Type[T],
-    b: StrBytes,
-    *,
-    content_type: str = None,
-    encoding: str = 'utf8',
-    proto: Protocol = None,
-    allow_pickle: bool = False,
-    json_loads: Callable[[str], Any] = json.loads,
-    type_name: Optional[NameFactory] = None,
-) -> T:
-    obj = load_str_bytes(
-        b,
-        proto=proto,
-        content_type=content_type,
-        encoding=encoding,
-        allow_pickle=allow_pickle,
-        json_loads=json_loads,
-    )
-    return parse_obj_as(type_, obj, type_name=type_name)
-
-
-def schema_of(type_: Any, *, title: Optional[NameFactory] = None, **schema_kwargs: Any) -> 'DictStrAny':
-    """Generate a JSON schema (as dict) for the passed model or dynamically generated one"""
-    return _get_parsing_type(type_, type_name=title).schema(**schema_kwargs)
-
-
-def schema_json_of(type_: Any, *, title: Optional[NameFactory] = None, **schema_json_kwargs: Any) -> str:
-    """Generate a JSON schema (as JSON) for the passed model or dynamically generated one"""
-    return _get_parsing_type(type_, type_name=title).schema_json(**schema_json_kwargs)
diff --git a/lib/pydantic/v1/types.py b/lib/pydantic/v1/types.py
deleted file mode 100644
index 754e58ff..00000000
--- a/lib/pydantic/v1/types.py
+++ /dev/null
@@ -1,1205 +0,0 @@
-import abc
-import math
-import re
-import warnings
-from datetime import date
-from decimal import Decimal, InvalidOperation
-from enum import Enum
-from pathlib import Path
-from types import new_class
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Callable,
-    ClassVar,
-    Dict,
-    FrozenSet,
-    List,
-    Optional,
-    Pattern,
-    Set,
-    Tuple,
-    Type,
-    TypeVar,
-    Union,
-    cast,
-    overload,
-)
-from uuid import UUID
-from weakref import WeakSet
-
-from . import errors
-from .datetime_parse import parse_date
-from .utils import import_string, update_not_none
-from .validators import (
-    bytes_validator,
-    constr_length_validator,
-    constr_lower,
-    constr_strip_whitespace,
-    constr_upper,
-    decimal_validator,
-    float_finite_validator,
-    float_validator,
-    frozenset_validator,
-    int_validator,
-    list_validator,
-    number_multiple_validator,
-    number_size_validator,
-    path_exists_validator,
-    path_validator,
-    set_validator,
-    str_validator,
-    strict_bytes_validator,
-    strict_float_validator,
-    strict_int_validator,
-    strict_str_validator,
-)
-
-__all__ = [
-    'NoneStr',
-    'NoneBytes',
-    'StrBytes',
-    'NoneStrBytes',
-    'StrictStr',
-    'ConstrainedBytes',
-    'conbytes',
-    'ConstrainedList',
-    'conlist',
-    'ConstrainedSet',
-    'conset',
-    'ConstrainedFrozenSet',
-    'confrozenset',
-    'ConstrainedStr',
-    'constr',
-    'PyObject',
-    'ConstrainedInt',
-    'conint',
-    'PositiveInt',
-    'NegativeInt',
-    'NonNegativeInt',
-    'NonPositiveInt',
-    'ConstrainedFloat',
-    'confloat',
-    'PositiveFloat',
-    'NegativeFloat',
-    'NonNegativeFloat',
-    'NonPositiveFloat',
-    'FiniteFloat',
-    'ConstrainedDecimal',
-    'condecimal',
-    'UUID1',
-    'UUID3',
-    'UUID4',
-    'UUID5',
-    'FilePath',
-    'DirectoryPath',
-    'Json',
-    'JsonWrapper',
-    'SecretField',
-    'SecretStr',
-    'SecretBytes',
-    'StrictBool',
-    'StrictBytes',
-    'StrictInt',
-    'StrictFloat',
-    'PaymentCardNumber',
-    'ByteSize',
-    'PastDate',
-    'FutureDate',
-    'ConstrainedDate',
-    'condate',
-]
-
-NoneStr = Optional[str]
-NoneBytes = Optional[bytes]
-StrBytes = Union[str, bytes]
-NoneStrBytes = Optional[StrBytes]
-OptionalInt = Optional[int]
-OptionalIntFloat = Union[OptionalInt, float]
-OptionalIntFloatDecimal = Union[OptionalIntFloat, Decimal]
-OptionalDate = Optional[date]
-StrIntFloat = Union[str, int, float]
-
-if TYPE_CHECKING:
-    from typing_extensions import Annotated
-
-    from .dataclasses import Dataclass
-    from .main import BaseModel
-    from .typing import CallableGenerator
-
-    ModelOrDc = Type[Union[BaseModel, Dataclass]]
-
-T = TypeVar('T')
-_DEFINED_TYPES: 'WeakSet[type]' = WeakSet()
-
-
-@overload
-def _registered(typ: Type[T]) -> Type[T]:
-    pass
-
-
-@overload
-def _registered(typ: 'ConstrainedNumberMeta') -> 'ConstrainedNumberMeta':
-    pass
-
-
-def _registered(typ: Union[Type[T], 'ConstrainedNumberMeta']) -> Union[Type[T], 'ConstrainedNumberMeta']:
-    # In order to generate valid examples of constrained types, Hypothesis needs
-    # to inspect the type object - so we keep a weakref to each contype object
-    # until it can be registered.  When (or if) our Hypothesis plugin is loaded,
-    # it monkeypatches this function.
-    # If Hypothesis is never used, the total effect is to keep a weak reference
-    # which has minimal memory usage and doesn't even affect garbage collection.
-    _DEFINED_TYPES.add(typ)
-    return typ
-
-
-class ConstrainedNumberMeta(type):
-    def __new__(cls, name: str, bases: Any, dct: Dict[str, Any]) -> 'ConstrainedInt':  # type: ignore
-        new_cls = cast('ConstrainedInt', type.__new__(cls, name, bases, dct))
-
-        if new_cls.gt is not None and new_cls.ge is not None:
-            raise errors.ConfigError('bounds gt and ge cannot be specified at the same time')
-        if new_cls.lt is not None and new_cls.le is not None:
-            raise errors.ConfigError('bounds lt and le cannot be specified at the same time')
-
-        return _registered(new_cls)  # type: ignore
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ BOOLEAN TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-if TYPE_CHECKING:
-    StrictBool = bool
-else:
-
-    class StrictBool(int):
-        """
-        StrictBool to allow for bools which are not type-coerced.
-        """
-
-        @classmethod
-        def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
-            field_schema.update(type='boolean')
-
-        @classmethod
-        def __get_validators__(cls) -> 'CallableGenerator':
-            yield cls.validate
-
-        @classmethod
-        def validate(cls, value: Any) -> bool:
-            """
-            Ensure that we only allow bools.
-            """
-            if isinstance(value, bool):
-                return value
-
-            raise errors.StrictBoolError()
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ INTEGER TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-class ConstrainedInt(int, metaclass=ConstrainedNumberMeta):
-    strict: bool = False
-    gt: OptionalInt = None
-    ge: OptionalInt = None
-    lt: OptionalInt = None
-    le: OptionalInt = None
-    multiple_of: OptionalInt = None
-
-    @classmethod
-    def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
-        update_not_none(
-            field_schema,
-            exclusiveMinimum=cls.gt,
-            exclusiveMaximum=cls.lt,
-            minimum=cls.ge,
-            maximum=cls.le,
-            multipleOf=cls.multiple_of,
-        )
-
-    @classmethod
-    def __get_validators__(cls) -> 'CallableGenerator':
-        yield strict_int_validator if cls.strict else int_validator
-        yield number_size_validator
-        yield number_multiple_validator
-
-
-def conint(
-    *,
-    strict: bool = False,
-    gt: Optional[int] = None,
-    ge: Optional[int] = None,
-    lt: Optional[int] = None,
-    le: Optional[int] = None,
-    multiple_of: Optional[int] = None,
-) -> Type[int]:
-    # use kwargs then define conf in a dict to aid with IDE type hinting
-    namespace = dict(strict=strict, gt=gt, ge=ge, lt=lt, le=le, multiple_of=multiple_of)
-    return type('ConstrainedIntValue', (ConstrainedInt,), namespace)
-
-
-if TYPE_CHECKING:
-    PositiveInt = int
-    NegativeInt = int
-    NonPositiveInt = int
-    NonNegativeInt = int
-    StrictInt = int
-else:
-
-    class PositiveInt(ConstrainedInt):
-        gt = 0
-
-    class NegativeInt(ConstrainedInt):
-        lt = 0
-
-    class NonPositiveInt(ConstrainedInt):
-        le = 0
-
-    class NonNegativeInt(ConstrainedInt):
-        ge = 0
-
-    class StrictInt(ConstrainedInt):
-        strict = True
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ FLOAT TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-class ConstrainedFloat(float, metaclass=ConstrainedNumberMeta):
-    strict: bool = False
-    gt: OptionalIntFloat = None
-    ge: OptionalIntFloat = None
-    lt: OptionalIntFloat = None
-    le: OptionalIntFloat = None
-    multiple_of: OptionalIntFloat = None
-    allow_inf_nan: Optional[bool] = None
-
-    @classmethod
-    def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
-        update_not_none(
-            field_schema,
-            exclusiveMinimum=cls.gt,
-            exclusiveMaximum=cls.lt,
-            minimum=cls.ge,
-            maximum=cls.le,
-            multipleOf=cls.multiple_of,
-        )
-        # Modify constraints to account for differences between IEEE floats and JSON
-        if field_schema.get('exclusiveMinimum') == -math.inf:
-            del field_schema['exclusiveMinimum']
-        if field_schema.get('minimum') == -math.inf:
-            del field_schema['minimum']
-        if field_schema.get('exclusiveMaximum') == math.inf:
-            del field_schema['exclusiveMaximum']
-        if field_schema.get('maximum') == math.inf:
-            del field_schema['maximum']
-
-    @classmethod
-    def __get_validators__(cls) -> 'CallableGenerator':
-        yield strict_float_validator if cls.strict else float_validator
-        yield number_size_validator
-        yield number_multiple_validator
-        yield float_finite_validator
-
-
-def confloat(
-    *,
-    strict: bool = False,
-    gt: float = None,
-    ge: float = None,
-    lt: float = None,
-    le: float = None,
-    multiple_of: float = None,
-    allow_inf_nan: Optional[bool] = None,
-) -> Type[float]:
-    # use kwargs then define conf in a dict to aid with IDE type hinting
-    namespace = dict(strict=strict, gt=gt, ge=ge, lt=lt, le=le, multiple_of=multiple_of, allow_inf_nan=allow_inf_nan)
-    return type('ConstrainedFloatValue', (ConstrainedFloat,), namespace)
-
-
-if TYPE_CHECKING:
-    PositiveFloat = float
-    NegativeFloat = float
-    NonPositiveFloat = float
-    NonNegativeFloat = float
-    StrictFloat = float
-    FiniteFloat = float
-else:
-
-    class PositiveFloat(ConstrainedFloat):
-        gt = 0
-
-    class NegativeFloat(ConstrainedFloat):
-        lt = 0
-
-    class NonPositiveFloat(ConstrainedFloat):
-        le = 0
-
-    class NonNegativeFloat(ConstrainedFloat):
-        ge = 0
-
-    class StrictFloat(ConstrainedFloat):
-        strict = True
-
-    class FiniteFloat(ConstrainedFloat):
-        allow_inf_nan = False
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ BYTES TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-class ConstrainedBytes(bytes):
-    strip_whitespace = False
-    to_upper = False
-    to_lower = False
-    min_length: OptionalInt = None
-    max_length: OptionalInt = None
-    strict: bool = False
-
-    @classmethod
-    def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
-        update_not_none(field_schema, minLength=cls.min_length, maxLength=cls.max_length)
-
-    @classmethod
-    def __get_validators__(cls) -> 'CallableGenerator':
-        yield strict_bytes_validator if cls.strict else bytes_validator
-        yield constr_strip_whitespace
-        yield constr_upper
-        yield constr_lower
-        yield constr_length_validator
-
-
-def conbytes(
-    *,
-    strip_whitespace: bool = False,
-    to_upper: bool = False,
-    to_lower: bool = False,
-    min_length: Optional[int] = None,
-    max_length: Optional[int] = None,
-    strict: bool = False,
-) -> Type[bytes]:
-    # use kwargs then define conf in a dict to aid with IDE type hinting
-    namespace = dict(
-        strip_whitespace=strip_whitespace,
-        to_upper=to_upper,
-        to_lower=to_lower,
-        min_length=min_length,
-        max_length=max_length,
-        strict=strict,
-    )
-    return _registered(type('ConstrainedBytesValue', (ConstrainedBytes,), namespace))
-
-
-if TYPE_CHECKING:
-    StrictBytes = bytes
-else:
-
-    class StrictBytes(ConstrainedBytes):
-        strict = True
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ STRING TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-class ConstrainedStr(str):
-    strip_whitespace = False
-    to_upper = False
-    to_lower = False
-    min_length: OptionalInt = None
-    max_length: OptionalInt = None
-    curtail_length: OptionalInt = None
-    regex: Optional[Union[str, Pattern[str]]] = None
-    strict = False
-
-    @classmethod
-    def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
-        update_not_none(
-            field_schema,
-            minLength=cls.min_length,
-            maxLength=cls.max_length,
-            pattern=cls.regex and cls._get_pattern(cls.regex),
-        )
-
-    @classmethod
-    def __get_validators__(cls) -> 'CallableGenerator':
-        yield strict_str_validator if cls.strict else str_validator
-        yield constr_strip_whitespace
-        yield constr_upper
-        yield constr_lower
-        yield constr_length_validator
-        yield cls.validate
-
-    @classmethod
-    def validate(cls, value: Union[str]) -> Union[str]:
-        if cls.curtail_length and len(value) > cls.curtail_length:
-            value = value[: cls.curtail_length]
-
-        if cls.regex:
-            if not re.match(cls.regex, value):
-                raise errors.StrRegexError(pattern=cls._get_pattern(cls.regex))
-
-        return value
-
-    @staticmethod
-    def _get_pattern(regex: Union[str, Pattern[str]]) -> str:
-        return regex if isinstance(regex, str) else regex.pattern
-
-
-def constr(
-    *,
-    strip_whitespace: bool = False,
-    to_upper: bool = False,
-    to_lower: bool = False,
-    strict: bool = False,
-    min_length: Optional[int] = None,
-    max_length: Optional[int] = None,
-    curtail_length: Optional[int] = None,
-    regex: Optional[str] = None,
-) -> Type[str]:
-    # use kwargs then define conf in a dict to aid with IDE type hinting
-    namespace = dict(
-        strip_whitespace=strip_whitespace,
-        to_upper=to_upper,
-        to_lower=to_lower,
-        strict=strict,
-        min_length=min_length,
-        max_length=max_length,
-        curtail_length=curtail_length,
-        regex=regex and re.compile(regex),
-    )
-    return _registered(type('ConstrainedStrValue', (ConstrainedStr,), namespace))
-
-
-if TYPE_CHECKING:
-    StrictStr = str
-else:
-
-    class StrictStr(ConstrainedStr):
-        strict = True
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SET TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-# This types superclass should be Set[T], but cython chokes on that...
-class ConstrainedSet(set):  # type: ignore
-    # Needed for pydantic to detect that this is a set
-    __origin__ = set
-    __args__: Set[Type[T]]  # type: ignore
-
-    min_items: Optional[int] = None
-    max_items: Optional[int] = None
-    item_type: Type[T]  # type: ignore
-
-    @classmethod
-    def __get_validators__(cls) -> 'CallableGenerator':
-        yield cls.set_length_validator
-
-    @classmethod
-    def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
-        update_not_none(field_schema, minItems=cls.min_items, maxItems=cls.max_items)
-
-    @classmethod
-    def set_length_validator(cls, v: 'Optional[Set[T]]') -> 'Optional[Set[T]]':
-        if v is None:
-            return None
-
-        v = set_validator(v)
-        v_len = len(v)
-
-        if cls.min_items is not None and v_len < cls.min_items:
-            raise errors.SetMinLengthError(limit_value=cls.min_items)
-
-        if cls.max_items is not None and v_len > cls.max_items:
-            raise errors.SetMaxLengthError(limit_value=cls.max_items)
-
-        return v
-
-
-def conset(item_type: Type[T], *, min_items: Optional[int] = None, max_items: Optional[int] = None) -> Type[Set[T]]:
-    # __args__ is needed to conform to typing generics api
-    namespace = {'min_items': min_items, 'max_items': max_items, 'item_type': item_type, '__args__': [item_type]}
-    # We use new_class to be able to deal with Generic types
-    return new_class('ConstrainedSetValue', (ConstrainedSet,), {}, lambda ns: ns.update(namespace))
-
-
-# This types superclass should be FrozenSet[T], but cython chokes on that...
-class ConstrainedFrozenSet(frozenset):  # type: ignore
-    # Needed for pydantic to detect that this is a set
-    __origin__ = frozenset
-    __args__: FrozenSet[Type[T]]  # type: ignore
-
-    min_items: Optional[int] = None
-    max_items: Optional[int] = None
-    item_type: Type[T]  # type: ignore
-
-    @classmethod
-    def __get_validators__(cls) -> 'CallableGenerator':
-        yield cls.frozenset_length_validator
-
-    @classmethod
-    def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
-        update_not_none(field_schema, minItems=cls.min_items, maxItems=cls.max_items)
-
-    @classmethod
-    def frozenset_length_validator(cls, v: 'Optional[FrozenSet[T]]') -> 'Optional[FrozenSet[T]]':
-        if v is None:
-            return None
-
-        v = frozenset_validator(v)
-        v_len = len(v)
-
-        if cls.min_items is not None and v_len < cls.min_items:
-            raise errors.FrozenSetMinLengthError(limit_value=cls.min_items)
-
-        if cls.max_items is not None and v_len > cls.max_items:
-            raise errors.FrozenSetMaxLengthError(limit_value=cls.max_items)
-
-        return v
-
-
-def confrozenset(
-    item_type: Type[T], *, min_items: Optional[int] = None, max_items: Optional[int] = None
-) -> Type[FrozenSet[T]]:
-    # __args__ is needed to conform to typing generics api
-    namespace = {'min_items': min_items, 'max_items': max_items, 'item_type': item_type, '__args__': [item_type]}
-    # We use new_class to be able to deal with Generic types
-    return new_class('ConstrainedFrozenSetValue', (ConstrainedFrozenSet,), {}, lambda ns: ns.update(namespace))
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ LIST TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-# This types superclass should be List[T], but cython chokes on that...
-class ConstrainedList(list):  # type: ignore
-    # Needed for pydantic to detect that this is a list
-    __origin__ = list
-    __args__: Tuple[Type[T], ...]  # type: ignore
-
-    min_items: Optional[int] = None
-    max_items: Optional[int] = None
-    unique_items: Optional[bool] = None
-    item_type: Type[T]  # type: ignore
-
-    @classmethod
-    def __get_validators__(cls) -> 'CallableGenerator':
-        yield cls.list_length_validator
-        if cls.unique_items:
-            yield cls.unique_items_validator
-
-    @classmethod
-    def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
-        update_not_none(field_schema, minItems=cls.min_items, maxItems=cls.max_items, uniqueItems=cls.unique_items)
-
-    @classmethod
-    def list_length_validator(cls, v: 'Optional[List[T]]') -> 'Optional[List[T]]':
-        if v is None:
-            return None
-
-        v = list_validator(v)
-        v_len = len(v)
-
-        if cls.min_items is not None and v_len < cls.min_items:
-            raise errors.ListMinLengthError(limit_value=cls.min_items)
-
-        if cls.max_items is not None and v_len > cls.max_items:
-            raise errors.ListMaxLengthError(limit_value=cls.max_items)
-
-        return v
-
-    @classmethod
-    def unique_items_validator(cls, v: 'Optional[List[T]]') -> 'Optional[List[T]]':
-        if v is None:
-            return None
-
-        for i, value in enumerate(v, start=1):
-            if value in v[i:]:
-                raise errors.ListUniqueItemsError()
-
-        return v
-
-
-def conlist(
-    item_type: Type[T], *, min_items: Optional[int] = None, max_items: Optional[int] = None, unique_items: bool = None
-) -> Type[List[T]]:
-    # __args__ is needed to conform to typing generics api
-    namespace = dict(
-        min_items=min_items, max_items=max_items, unique_items=unique_items, item_type=item_type, __args__=(item_type,)
-    )
-    # We use new_class to be able to deal with Generic types
-    return new_class('ConstrainedListValue', (ConstrainedList,), {}, lambda ns: ns.update(namespace))
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PYOBJECT TYPE ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-if TYPE_CHECKING:
-    PyObject = Callable[..., Any]
-else:
-
-    class PyObject:
-        validate_always = True
-
-        @classmethod
-        def __get_validators__(cls) -> 'CallableGenerator':
-            yield cls.validate
-
-        @classmethod
-        def validate(cls, value: Any) -> Any:
-            if isinstance(value, Callable):
-                return value
-
-            try:
-                value = str_validator(value)
-            except errors.StrError:
-                raise errors.PyObjectError(error_message='value is neither a valid import path not a valid callable')
-
-            try:
-                return import_string(value)
-            except ImportError as e:
-                raise errors.PyObjectError(error_message=str(e))
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ DECIMAL TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-class ConstrainedDecimal(Decimal, metaclass=ConstrainedNumberMeta):
-    gt: OptionalIntFloatDecimal = None
-    ge: OptionalIntFloatDecimal = None
-    lt: OptionalIntFloatDecimal = None
-    le: OptionalIntFloatDecimal = None
-    max_digits: OptionalInt = None
-    decimal_places: OptionalInt = None
-    multiple_of: OptionalIntFloatDecimal = None
-
-    @classmethod
-    def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
-        update_not_none(
-            field_schema,
-            exclusiveMinimum=cls.gt,
-            exclusiveMaximum=cls.lt,
-            minimum=cls.ge,
-            maximum=cls.le,
-            multipleOf=cls.multiple_of,
-        )
-
-    @classmethod
-    def __get_validators__(cls) -> 'CallableGenerator':
-        yield decimal_validator
-        yield number_size_validator
-        yield number_multiple_validator
-        yield cls.validate
-
-    @classmethod
-    def validate(cls, value: Decimal) -> Decimal:
-        try:
-            normalized_value = value.normalize()
-        except InvalidOperation:
-            normalized_value = value
-        digit_tuple, exponent = normalized_value.as_tuple()[1:]
-        if exponent in {'F', 'n', 'N'}:
-            raise errors.DecimalIsNotFiniteError()
-
-        if exponent >= 0:
-            # A positive exponent adds that many trailing zeros.
-            digits = len(digit_tuple) + exponent
-            decimals = 0
-        else:
-            # If the absolute value of the negative exponent is larger than the
-            # number of digits, then it's the same as the number of digits,
-            # because it'll consume all of the digits in digit_tuple and then
-            # add abs(exponent) - len(digit_tuple) leading zeros after the
-            # decimal point.
-            if abs(exponent) > len(digit_tuple):
-                digits = decimals = abs(exponent)
-            else:
-                digits = len(digit_tuple)
-                decimals = abs(exponent)
-        whole_digits = digits - decimals
-
-        if cls.max_digits is not None and digits > cls.max_digits:
-            raise errors.DecimalMaxDigitsError(max_digits=cls.max_digits)
-
-        if cls.decimal_places is not None and decimals > cls.decimal_places:
-            raise errors.DecimalMaxPlacesError(decimal_places=cls.decimal_places)
-
-        if cls.max_digits is not None and cls.decimal_places is not None:
-            expected = cls.max_digits - cls.decimal_places
-            if whole_digits > expected:
-                raise errors.DecimalWholeDigitsError(whole_digits=expected)
-
-        return value
-
-
-def condecimal(
-    *,
-    gt: Decimal = None,
-    ge: Decimal = None,
-    lt: Decimal = None,
-    le: Decimal = None,
-    max_digits: Optional[int] = None,
-    decimal_places: Optional[int] = None,
-    multiple_of: Decimal = None,
-) -> Type[Decimal]:
-    # use kwargs then define conf in a dict to aid with IDE type hinting
-    namespace = dict(
-        gt=gt, ge=ge, lt=lt, le=le, max_digits=max_digits, decimal_places=decimal_places, multiple_of=multiple_of
-    )
-    return type('ConstrainedDecimalValue', (ConstrainedDecimal,), namespace)
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ UUID TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-if TYPE_CHECKING:
-    UUID1 = UUID
-    UUID3 = UUID
-    UUID4 = UUID
-    UUID5 = UUID
-else:
-
-    class UUID1(UUID):
-        _required_version = 1
-
-        @classmethod
-        def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
-            field_schema.update(type='string', format=f'uuid{cls._required_version}')
-
-    class UUID3(UUID1):
-        _required_version = 3
-
-    class UUID4(UUID1):
-        _required_version = 4
-
-    class UUID5(UUID1):
-        _required_version = 5
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PATH TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-if TYPE_CHECKING:
-    FilePath = Path
-    DirectoryPath = Path
-else:
-
-    class FilePath(Path):
-        @classmethod
-        def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
-            field_schema.update(format='file-path')
-
-        @classmethod
-        def __get_validators__(cls) -> 'CallableGenerator':
-            yield path_validator
-            yield path_exists_validator
-            yield cls.validate
-
-        @classmethod
-        def validate(cls, value: Path) -> Path:
-            if not value.is_file():
-                raise errors.PathNotAFileError(path=value)
-
-            return value
-
-    class DirectoryPath(Path):
-        @classmethod
-        def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
-            field_schema.update(format='directory-path')
-
-        @classmethod
-        def __get_validators__(cls) -> 'CallableGenerator':
-            yield path_validator
-            yield path_exists_validator
-            yield cls.validate
-
-        @classmethod
-        def validate(cls, value: Path) -> Path:
-            if not value.is_dir():
-                raise errors.PathNotADirectoryError(path=value)
-
-            return value
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ JSON TYPE ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-class JsonWrapper:
-    pass
-
-
-class JsonMeta(type):
-    def __getitem__(self, t: Type[Any]) -> Type[JsonWrapper]:
-        if t is Any:
-            return Json  # allow Json[Any] to replecate plain Json
-        return _registered(type('JsonWrapperValue', (JsonWrapper,), {'inner_type': t}))
-
-
-if TYPE_CHECKING:
-    Json = Annotated[T, ...]  # Json[list[str]] will be recognized by type checkers as list[str]
-
-else:
-
-    class Json(metaclass=JsonMeta):
-        @classmethod
-        def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
-            field_schema.update(type='string', format='json-string')
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ SECRET TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-class SecretField(abc.ABC):
-    """
-    Note: this should be implemented as a generic like `SecretField(ABC, Generic[T])`,
-          the `__init__()` should be part of the abstract class and the
-          `get_secret_value()` method should use the generic `T` type.
-
-          However Cython doesn't support very well generics at the moment and
-          the generated code fails to be imported (see
-          https://github.com/cython/cython/issues/2753).
-    """
-
-    def __eq__(self, other: Any) -> bool:
-        return isinstance(other, self.__class__) and self.get_secret_value() == other.get_secret_value()
-
-    def __str__(self) -> str:
-        return '**********' if self.get_secret_value() else ''
-
-    def __hash__(self) -> int:
-        return hash(self.get_secret_value())
-
-    @abc.abstractmethod
-    def get_secret_value(self) -> Any:  # pragma: no cover
-        ...
-
-
-class SecretStr(SecretField):
-    min_length: OptionalInt = None
-    max_length: OptionalInt = None
-
-    @classmethod
-    def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
-        update_not_none(
-            field_schema,
-            type='string',
-            writeOnly=True,
-            format='password',
-            minLength=cls.min_length,
-            maxLength=cls.max_length,
-        )
-
-    @classmethod
-    def __get_validators__(cls) -> 'CallableGenerator':
-        yield cls.validate
-        yield constr_length_validator
-
-    @classmethod
-    def validate(cls, value: Any) -> 'SecretStr':
-        if isinstance(value, cls):
-            return value
-        value = str_validator(value)
-        return cls(value)
-
-    def __init__(self, value: str):
-        self._secret_value = value
-
-    def __repr__(self) -> str:
-        return f"SecretStr('{self}')"
-
-    def __len__(self) -> int:
-        return len(self._secret_value)
-
-    def display(self) -> str:
-        warnings.warn('`secret_str.display()` is deprecated, use `str(secret_str)` instead', DeprecationWarning)
-        return str(self)
-
-    def get_secret_value(self) -> str:
-        return self._secret_value
-
-
-class SecretBytes(SecretField):
-    min_length: OptionalInt = None
-    max_length: OptionalInt = None
-
-    @classmethod
-    def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
-        update_not_none(
-            field_schema,
-            type='string',
-            writeOnly=True,
-            format='password',
-            minLength=cls.min_length,
-            maxLength=cls.max_length,
-        )
-
-    @classmethod
-    def __get_validators__(cls) -> 'CallableGenerator':
-        yield cls.validate
-        yield constr_length_validator
-
-    @classmethod
-    def validate(cls, value: Any) -> 'SecretBytes':
-        if isinstance(value, cls):
-            return value
-        value = bytes_validator(value)
-        return cls(value)
-
-    def __init__(self, value: bytes):
-        self._secret_value = value
-
-    def __repr__(self) -> str:
-        return f"SecretBytes(b'{self}')"
-
-    def __len__(self) -> int:
-        return len(self._secret_value)
-
-    def display(self) -> str:
-        warnings.warn('`secret_bytes.display()` is deprecated, use `str(secret_bytes)` instead', DeprecationWarning)
-        return str(self)
-
-    def get_secret_value(self) -> bytes:
-        return self._secret_value
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PAYMENT CARD TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-class PaymentCardBrand(str, Enum):
-    # If you add another card type, please also add it to the
-    # Hypothesis strategy in `pydantic._hypothesis_plugin`.
-    amex = 'American Express'
-    mastercard = 'Mastercard'
-    visa = 'Visa'
-    other = 'other'
-
-    def __str__(self) -> str:
-        return self.value
-
-
-class PaymentCardNumber(str):
-    """
-    Based on: https://en.wikipedia.org/wiki/Payment_card_number
-    """
-
-    strip_whitespace: ClassVar[bool] = True
-    min_length: ClassVar[int] = 12
-    max_length: ClassVar[int] = 19
-    bin: str
-    last4: str
-    brand: PaymentCardBrand
-
-    def __init__(self, card_number: str):
-        self.bin = card_number[:6]
-        self.last4 = card_number[-4:]
-        self.brand = self._get_brand(card_number)
-
-    @classmethod
-    def __get_validators__(cls) -> 'CallableGenerator':
-        yield str_validator
-        yield constr_strip_whitespace
-        yield constr_length_validator
-        yield cls.validate_digits
-        yield cls.validate_luhn_check_digit
-        yield cls
-        yield cls.validate_length_for_brand
-
-    @property
-    def masked(self) -> str:
-        num_masked = len(self) - 10  # len(bin) + len(last4) == 10
-        return f'{self.bin}{"*" * num_masked}{self.last4}'
-
-    @classmethod
-    def validate_digits(cls, card_number: str) -> str:
-        if not card_number.isdigit():
-            raise errors.NotDigitError
-        return card_number
-
-    @classmethod
-    def validate_luhn_check_digit(cls, card_number: str) -> str:
-        """
-        Based on: https://en.wikipedia.org/wiki/Luhn_algorithm
-        """
-        sum_ = int(card_number[-1])
-        length = len(card_number)
-        parity = length % 2
-        for i in range(length - 1):
-            digit = int(card_number[i])
-            if i % 2 == parity:
-                digit *= 2
-            if digit > 9:
-                digit -= 9
-            sum_ += digit
-        valid = sum_ % 10 == 0
-        if not valid:
-            raise errors.LuhnValidationError
-        return card_number
-
-    @classmethod
-    def validate_length_for_brand(cls, card_number: 'PaymentCardNumber') -> 'PaymentCardNumber':
-        """
-        Validate length based on BIN for major brands:
-        https://en.wikipedia.org/wiki/Payment_card_number#Issuer_identification_number_(IIN)
-        """
-        required_length: Union[None, int, str] = None
-        if card_number.brand in PaymentCardBrand.mastercard:
-            required_length = 16
-            valid = len(card_number) == required_length
-        elif card_number.brand == PaymentCardBrand.visa:
-            required_length = '13, 16 or 19'
-            valid = len(card_number) in {13, 16, 19}
-        elif card_number.brand == PaymentCardBrand.amex:
-            required_length = 15
-            valid = len(card_number) == required_length
-        else:
-            valid = True
-        if not valid:
-            raise errors.InvalidLengthForBrand(brand=card_number.brand, required_length=required_length)
-        return card_number
-
-    @staticmethod
-    def _get_brand(card_number: str) -> PaymentCardBrand:
-        if card_number[0] == '4':
-            brand = PaymentCardBrand.visa
-        elif 51 <= int(card_number[:2]) <= 55:
-            brand = PaymentCardBrand.mastercard
-        elif card_number[:2] in {'34', '37'}:
-            brand = PaymentCardBrand.amex
-        else:
-            brand = PaymentCardBrand.other
-        return brand
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ BYTE SIZE TYPE ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-BYTE_SIZES = {
-    'b': 1,
-    'kb': 10**3,
-    'mb': 10**6,
-    'gb': 10**9,
-    'tb': 10**12,
-    'pb': 10**15,
-    'eb': 10**18,
-    'kib': 2**10,
-    'mib': 2**20,
-    'gib': 2**30,
-    'tib': 2**40,
-    'pib': 2**50,
-    'eib': 2**60,
-}
-BYTE_SIZES.update({k.lower()[0]: v for k, v in BYTE_SIZES.items() if 'i' not in k})
-byte_string_re = re.compile(r'^\s*(\d*\.?\d+)\s*(\w+)?', re.IGNORECASE)
-
-
-class ByteSize(int):
-    @classmethod
-    def __get_validators__(cls) -> 'CallableGenerator':
-        yield cls.validate
-
-    @classmethod
-    def validate(cls, v: StrIntFloat) -> 'ByteSize':
-        try:
-            return cls(int(v))
-        except ValueError:
-            pass
-
-        str_match = byte_string_re.match(str(v))
-        if str_match is None:
-            raise errors.InvalidByteSize()
-
-        scalar, unit = str_match.groups()
-        if unit is None:
-            unit = 'b'
-
-        try:
-            unit_mult = BYTE_SIZES[unit.lower()]
-        except KeyError:
-            raise errors.InvalidByteSizeUnit(unit=unit)
-
-        return cls(int(float(scalar) * unit_mult))
-
-    def human_readable(self, decimal: bool = False) -> str:
-        if decimal:
-            divisor = 1000
-            units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB']
-            final_unit = 'EB'
-        else:
-            divisor = 1024
-            units = ['B', 'KiB', 'MiB', 'GiB', 'TiB', 'PiB']
-            final_unit = 'EiB'
-
-        num = float(self)
-        for unit in units:
-            if abs(num) < divisor:
-                return f'{num:0.1f}{unit}'
-            num /= divisor
-
-        return f'{num:0.1f}{final_unit}'
-
-    def to(self, unit: str) -> float:
-        try:
-            unit_div = BYTE_SIZES[unit.lower()]
-        except KeyError:
-            raise errors.InvalidByteSizeUnit(unit=unit)
-
-        return self / unit_div
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ DATE TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-if TYPE_CHECKING:
-    PastDate = date
-    FutureDate = date
-else:
-
-    class PastDate(date):
-        @classmethod
-        def __get_validators__(cls) -> 'CallableGenerator':
-            yield parse_date
-            yield cls.validate
-
-        @classmethod
-        def validate(cls, value: date) -> date:
-            if value >= date.today():
-                raise errors.DateNotInThePastError()
-
-            return value
-
-    class FutureDate(date):
-        @classmethod
-        def __get_validators__(cls) -> 'CallableGenerator':
-            yield parse_date
-            yield cls.validate
-
-        @classmethod
-        def validate(cls, value: date) -> date:
-            if value <= date.today():
-                raise errors.DateNotInTheFutureError()
-
-            return value
-
-
-class ConstrainedDate(date, metaclass=ConstrainedNumberMeta):
-    gt: OptionalDate = None
-    ge: OptionalDate = None
-    lt: OptionalDate = None
-    le: OptionalDate = None
-
-    @classmethod
-    def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
-        update_not_none(field_schema, exclusiveMinimum=cls.gt, exclusiveMaximum=cls.lt, minimum=cls.ge, maximum=cls.le)
-
-    @classmethod
-    def __get_validators__(cls) -> 'CallableGenerator':
-        yield parse_date
-        yield number_size_validator
-
-
-def condate(
-    *,
-    gt: date = None,
-    ge: date = None,
-    lt: date = None,
-    le: date = None,
-) -> Type[date]:
-    # use kwargs then define conf in a dict to aid with IDE type hinting
-    namespace = dict(gt=gt, ge=ge, lt=lt, le=le)
-    return type('ConstrainedDateValue', (ConstrainedDate,), namespace)
diff --git a/lib/pydantic/v1/typing.py b/lib/pydantic/v1/typing.py
deleted file mode 100644
index a690a053..00000000
--- a/lib/pydantic/v1/typing.py
+++ /dev/null
@@ -1,603 +0,0 @@
-import sys
-import typing
-from collections.abc import Callable
-from os import PathLike
-from typing import (  # type: ignore
-    TYPE_CHECKING,
-    AbstractSet,
-    Any,
-    Callable as TypingCallable,
-    ClassVar,
-    Dict,
-    ForwardRef,
-    Generator,
-    Iterable,
-    List,
-    Mapping,
-    NewType,
-    Optional,
-    Sequence,
-    Set,
-    Tuple,
-    Type,
-    TypeVar,
-    Union,
-    _eval_type,
-    cast,
-    get_type_hints,
-)
-
-from typing_extensions import (
-    Annotated,
-    Final,
-    Literal,
-    NotRequired as TypedDictNotRequired,
-    Required as TypedDictRequired,
-)
-
-try:
-    from typing import _TypingBase as typing_base  # type: ignore
-except ImportError:
-    from typing import _Final as typing_base  # type: ignore
-
-try:
-    from typing import GenericAlias as TypingGenericAlias  # type: ignore
-except ImportError:
-    # python < 3.9 does not have GenericAlias (list[int], tuple[str, ...] and so on)
-    TypingGenericAlias = ()
-
-try:
-    from types import UnionType as TypesUnionType  # type: ignore
-except ImportError:
-    # python < 3.10 does not have UnionType (str | int, byte | bool and so on)
-    TypesUnionType = ()
-
-
-if sys.version_info < (3, 9):
-
-    def evaluate_forwardref(type_: ForwardRef, globalns: Any, localns: Any) -> Any:
-        return type_._evaluate(globalns, localns)
-
-else:
-
-    def evaluate_forwardref(type_: ForwardRef, globalns: Any, localns: Any) -> Any:
-        # Even though it is the right signature for python 3.9, mypy complains with
-        # `error: Too many arguments for "_evaluate" of "ForwardRef"` hence the cast...
-        return cast(Any, type_)._evaluate(globalns, localns, set())
-
-
-if sys.version_info < (3, 9):
-    # Ensure we always get all the whole `Annotated` hint, not just the annotated type.
-    # For 3.7 to 3.8, `get_type_hints` doesn't recognize `typing_extensions.Annotated`,
-    # so it already returns the full annotation
-    get_all_type_hints = get_type_hints
-
-else:
-
-    def get_all_type_hints(obj: Any, globalns: Any = None, localns: Any = None) -> Any:
-        return get_type_hints(obj, globalns, localns, include_extras=True)
-
-
-_T = TypeVar('_T')
-
-AnyCallable = TypingCallable[..., Any]
-NoArgAnyCallable = TypingCallable[[], Any]
-
-# workaround for https://github.com/python/mypy/issues/9496
-AnyArgTCallable = TypingCallable[..., _T]
-
-
-# Annotated[...] is implemented by returning an instance of one of these classes, depending on
-# python/typing_extensions version.
-AnnotatedTypeNames = {'AnnotatedMeta', '_AnnotatedAlias'}
-
-
-LITERAL_TYPES: Set[Any] = {Literal}
-if hasattr(typing, 'Literal'):
-    LITERAL_TYPES.add(typing.Literal)
-
-
-if sys.version_info < (3, 8):
-
-    def get_origin(t: Type[Any]) -> Optional[Type[Any]]:
-        if type(t).__name__ in AnnotatedTypeNames:
-            # weirdly this is a runtime requirement, as well as for mypy
-            return cast(Type[Any], Annotated)
-        return getattr(t, '__origin__', None)
-
-else:
-    from typing import get_origin as _typing_get_origin
-
-    def get_origin(tp: Type[Any]) -> Optional[Type[Any]]:
-        """
-        We can't directly use `typing.get_origin` since we need a fallback to support
-        custom generic classes like `ConstrainedList`
-        It should be useless once https://github.com/cython/cython/issues/3537 is
-        solved and https://github.com/pydantic/pydantic/pull/1753 is merged.
-        """
-        if type(tp).__name__ in AnnotatedTypeNames:
-            return cast(Type[Any], Annotated)  # mypy complains about _SpecialForm
-        return _typing_get_origin(tp) or getattr(tp, '__origin__', None)
-
-
-if sys.version_info < (3, 8):
-    from typing import _GenericAlias
-
-    def get_args(t: Type[Any]) -> Tuple[Any, ...]:
-        """Compatibility version of get_args for python 3.7.
-
-        Mostly compatible with the python 3.8 `typing` module version
-        and able to handle almost all use cases.
-        """
-        if type(t).__name__ in AnnotatedTypeNames:
-            return t.__args__ + t.__metadata__
-        if isinstance(t, _GenericAlias):
-            res = t.__args__
-            if t.__origin__ is Callable and res and res[0] is not Ellipsis:
-                res = (list(res[:-1]), res[-1])
-            return res
-        return getattr(t, '__args__', ())
-
-else:
-    from typing import get_args as _typing_get_args
-
-    def _generic_get_args(tp: Type[Any]) -> Tuple[Any, ...]:
-        """
-        In python 3.9, `typing.Dict`, `typing.List`, ...
-        do have an empty `__args__` by default (instead of the generic ~T for example).
-        In order to still support `Dict` for example and consider it as `Dict[Any, Any]`,
-        we retrieve the `_nparams` value that tells us how many parameters it needs.
-        """
-        if hasattr(tp, '_nparams'):
-            return (Any,) * tp._nparams
-        # Special case for `tuple[()]`, which used to return ((),) with `typing.Tuple`
-        # in python 3.10- but now returns () for `tuple` and `Tuple`.
-        # This will probably be clarified in pydantic v2
-        try:
-            if tp == Tuple[()] or sys.version_info >= (3, 9) and tp == tuple[()]:  # type: ignore[misc]
-                return ((),)
-        # there is a TypeError when compiled with cython
-        except TypeError:  # pragma: no cover
-            pass
-        return ()
-
-    def get_args(tp: Type[Any]) -> Tuple[Any, ...]:
-        """Get type arguments with all substitutions performed.
-
-        For unions, basic simplifications used by Union constructor are performed.
-        Examples::
-            get_args(Dict[str, int]) == (str, int)
-            get_args(int) == ()
-            get_args(Union[int, Union[T, int], str][int]) == (int, str)
-            get_args(Union[int, Tuple[T, int]][str]) == (int, Tuple[str, int])
-            get_args(Callable[[], T][int]) == ([], int)
-        """
-        if type(tp).__name__ in AnnotatedTypeNames:
-            return tp.__args__ + tp.__metadata__
-        # the fallback is needed for the same reasons as `get_origin` (see above)
-        return _typing_get_args(tp) or getattr(tp, '__args__', ()) or _generic_get_args(tp)
-
-
-if sys.version_info < (3, 9):
-
-    def convert_generics(tp: Type[Any]) -> Type[Any]:
-        """Python 3.9 and older only supports generics from `typing` module.
-        They convert strings to ForwardRef automatically.
-
-        Examples::
-            typing.List['Hero'] == typing.List[ForwardRef('Hero')]
-        """
-        return tp
-
-else:
-    from typing import _UnionGenericAlias  # type: ignore
-
-    from typing_extensions import _AnnotatedAlias
-
-    def convert_generics(tp: Type[Any]) -> Type[Any]:
-        """
-        Recursively searches for `str` type hints and replaces them with ForwardRef.
-
-        Examples::
-            convert_generics(list['Hero']) == list[ForwardRef('Hero')]
-            convert_generics(dict['Hero', 'Team']) == dict[ForwardRef('Hero'), ForwardRef('Team')]
-            convert_generics(typing.Dict['Hero', 'Team']) == typing.Dict[ForwardRef('Hero'), ForwardRef('Team')]
-            convert_generics(list[str | 'Hero'] | int) == list[str | ForwardRef('Hero')] | int
-        """
-        origin = get_origin(tp)
-        if not origin or not hasattr(tp, '__args__'):
-            return tp
-
-        args = get_args(tp)
-
-        # typing.Annotated needs special treatment
-        if origin is Annotated:
-            return _AnnotatedAlias(convert_generics(args[0]), args[1:])
-
-        # recursively replace `str` instances inside of `GenericAlias` with `ForwardRef(arg)`
-        converted = tuple(
-            ForwardRef(arg) if isinstance(arg, str) and isinstance(tp, TypingGenericAlias) else convert_generics(arg)
-            for arg in args
-        )
-
-        if converted == args:
-            return tp
-        elif isinstance(tp, TypingGenericAlias):
-            return TypingGenericAlias(origin, converted)
-        elif isinstance(tp, TypesUnionType):
-            # recreate types.UnionType (PEP604, Python >= 3.10)
-            return _UnionGenericAlias(origin, converted)
-        else:
-            try:
-                setattr(tp, '__args__', converted)
-            except AttributeError:
-                pass
-            return tp
-
-
-if sys.version_info < (3, 10):
-
-    def is_union(tp: Optional[Type[Any]]) -> bool:
-        return tp is Union
-
-    WithArgsTypes = (TypingGenericAlias,)
-
-else:
-    import types
-    import typing
-
-    def is_union(tp: Optional[Type[Any]]) -> bool:
-        return tp is Union or tp is types.UnionType  # noqa: E721
-
-    WithArgsTypes = (typing._GenericAlias, types.GenericAlias, types.UnionType)
-
-
-StrPath = Union[str, PathLike]
-
-
-if TYPE_CHECKING:
-    from .fields import ModelField
-
-    TupleGenerator = Generator[Tuple[str, Any], None, None]
-    DictStrAny = Dict[str, Any]
-    DictAny = Dict[Any, Any]
-    SetStr = Set[str]
-    ListStr = List[str]
-    IntStr = Union[int, str]
-    AbstractSetIntStr = AbstractSet[IntStr]
-    DictIntStrAny = Dict[IntStr, Any]
-    MappingIntStrAny = Mapping[IntStr, Any]
-    CallableGenerator = Generator[AnyCallable, None, None]
-    ReprArgs = Sequence[Tuple[Optional[str], Any]]
-
-    MYPY = False
-    if MYPY:
-        AnyClassMethod = classmethod[Any]
-    else:
-        # classmethod[TargetType, CallableParamSpecType, CallableReturnType]
-        AnyClassMethod = classmethod[Any, Any, Any]
-
-__all__ = (
-    'AnyCallable',
-    'NoArgAnyCallable',
-    'NoneType',
-    'is_none_type',
-    'display_as_type',
-    'resolve_annotations',
-    'is_callable_type',
-    'is_literal_type',
-    'all_literal_values',
-    'is_namedtuple',
-    'is_typeddict',
-    'is_typeddict_special',
-    'is_new_type',
-    'new_type_supertype',
-    'is_classvar',
-    'is_finalvar',
-    'update_field_forward_refs',
-    'update_model_forward_refs',
-    'TupleGenerator',
-    'DictStrAny',
-    'DictAny',
-    'SetStr',
-    'ListStr',
-    'IntStr',
-    'AbstractSetIntStr',
-    'DictIntStrAny',
-    'CallableGenerator',
-    'ReprArgs',
-    'AnyClassMethod',
-    'CallableGenerator',
-    'WithArgsTypes',
-    'get_args',
-    'get_origin',
-    'get_sub_types',
-    'typing_base',
-    'get_all_type_hints',
-    'is_union',
-    'StrPath',
-    'MappingIntStrAny',
-)
-
-
-NoneType = None.__class__
-
-
-NONE_TYPES: Tuple[Any, Any, Any] = (None, NoneType, Literal[None])
-
-
-if sys.version_info < (3, 8):
-    # Even though this implementation is slower, we need it for python 3.7:
-    # In python 3.7 "Literal" is not a builtin type and uses a different
-    # mechanism.
-    # for this reason `Literal[None] is Literal[None]` evaluates to `False`,
-    # breaking the faster implementation used for the other python versions.
-
-    def is_none_type(type_: Any) -> bool:
-        return type_ in NONE_TYPES
-
-elif sys.version_info[:2] == (3, 8):
-
-    def is_none_type(type_: Any) -> bool:
-        for none_type in NONE_TYPES:
-            if type_ is none_type:
-                return True
-        # With python 3.8, specifically 3.8.10, Literal "is" check sare very flakey
-        # can change on very subtle changes like use of types in other modules,
-        # hopefully this check avoids that issue.
-        if is_literal_type(type_):  # pragma: no cover
-            return all_literal_values(type_) == (None,)
-        return False
-
-else:
-
-    def is_none_type(type_: Any) -> bool:
-        return type_ in NONE_TYPES
-
-
-def display_as_type(v: Type[Any]) -> str:
-    if not isinstance(v, typing_base) and not isinstance(v, WithArgsTypes) and not isinstance(v, type):
-        v = v.__class__
-
-    if is_union(get_origin(v)):
-        return f'Union[{", ".join(map(display_as_type, get_args(v)))}]'
-
-    if isinstance(v, WithArgsTypes):
-        # Generic alias are constructs like `list[int]`
-        return str(v).replace('typing.', '')
-
-    try:
-        return v.__name__
-    except AttributeError:
-        # happens with typing objects
-        return str(v).replace('typing.', '')
-
-
-def resolve_annotations(raw_annotations: Dict[str, Type[Any]], module_name: Optional[str]) -> Dict[str, Type[Any]]:
-    """
-    Partially taken from typing.get_type_hints.
-
-    Resolve string or ForwardRef annotations into type objects if possible.
-    """
-    base_globals: Optional[Dict[str, Any]] = None
-    if module_name:
-        try:
-            module = sys.modules[module_name]
-        except KeyError:
-            # happens occasionally, see https://github.com/pydantic/pydantic/issues/2363
-            pass
-        else:
-            base_globals = module.__dict__
-
-    annotations = {}
-    for name, value in raw_annotations.items():
-        if isinstance(value, str):
-            if (3, 10) > sys.version_info >= (3, 9, 8) or sys.version_info >= (3, 10, 1):
-                value = ForwardRef(value, is_argument=False, is_class=True)
-            else:
-                value = ForwardRef(value, is_argument=False)
-        try:
-            value = _eval_type(value, base_globals, None)
-        except NameError:
-            # this is ok, it can be fixed with update_forward_refs
-            pass
-        annotations[name] = value
-    return annotations
-
-
-def is_callable_type(type_: Type[Any]) -> bool:
-    return type_ is Callable or get_origin(type_) is Callable
-
-
-def is_literal_type(type_: Type[Any]) -> bool:
-    return Literal is not None and get_origin(type_) in LITERAL_TYPES
-
-
-def literal_values(type_: Type[Any]) -> Tuple[Any, ...]:
-    return get_args(type_)
-
-
-def all_literal_values(type_: Type[Any]) -> Tuple[Any, ...]:
-    """
-    This method is used to retrieve all Literal values as
-    Literal can be used recursively (see https://www.python.org/dev/peps/pep-0586)
-    e.g. `Literal[Literal[Literal[1, 2, 3], "foo"], 5, None]`
-    """
-    if not is_literal_type(type_):
-        return (type_,)
-
-    values = literal_values(type_)
-    return tuple(x for value in values for x in all_literal_values(value))
-
-
-def is_namedtuple(type_: Type[Any]) -> bool:
-    """
-    Check if a given class is a named tuple.
-    It can be either a `typing.NamedTuple` or `collections.namedtuple`
-    """
-    from .utils import lenient_issubclass
-
-    return lenient_issubclass(type_, tuple) and hasattr(type_, '_fields')
-
-
-def is_typeddict(type_: Type[Any]) -> bool:
-    """
-    Check if a given class is a typed dict (from `typing` or `typing_extensions`)
-    In 3.10, there will be a public method (https://docs.python.org/3.10/library/typing.html#typing.is_typeddict)
-    """
-    from .utils import lenient_issubclass
-
-    return lenient_issubclass(type_, dict) and hasattr(type_, '__total__')
-
-
-def _check_typeddict_special(type_: Any) -> bool:
-    return type_ is TypedDictRequired or type_ is TypedDictNotRequired
-
-
-def is_typeddict_special(type_: Any) -> bool:
-    """
-    Check if type is a TypedDict special form (Required or NotRequired).
-    """
-    return _check_typeddict_special(type_) or _check_typeddict_special(get_origin(type_))
-
-
-test_type = NewType('test_type', str)
-
-
-def is_new_type(type_: Type[Any]) -> bool:
-    """
-    Check whether type_ was created using typing.NewType
-    """
-    return isinstance(type_, test_type.__class__) and hasattr(type_, '__supertype__')  # type: ignore
-
-
-def new_type_supertype(type_: Type[Any]) -> Type[Any]:
-    while hasattr(type_, '__supertype__'):
-        type_ = type_.__supertype__
-    return type_
-
-
-def _check_classvar(v: Optional[Type[Any]]) -> bool:
-    if v is None:
-        return False
-
-    return v.__class__ == ClassVar.__class__ and getattr(v, '_name', None) == 'ClassVar'
-
-
-def _check_finalvar(v: Optional[Type[Any]]) -> bool:
-    """
-    Check if a given type is a `typing.Final` type.
-    """
-    if v is None:
-        return False
-
-    return v.__class__ == Final.__class__ and (sys.version_info < (3, 8) or getattr(v, '_name', None) == 'Final')
-
-
-def is_classvar(ann_type: Type[Any]) -> bool:
-    if _check_classvar(ann_type) or _check_classvar(get_origin(ann_type)):
-        return True
-
-    # this is an ugly workaround for class vars that contain forward references and are therefore themselves
-    # forward references, see #3679
-    if ann_type.__class__ == ForwardRef and ann_type.__forward_arg__.startswith('ClassVar['):
-        return True
-
-    return False
-
-
-def is_finalvar(ann_type: Type[Any]) -> bool:
-    return _check_finalvar(ann_type) or _check_finalvar(get_origin(ann_type))
-
-
-def update_field_forward_refs(field: 'ModelField', globalns: Any, localns: Any) -> None:
-    """
-    Try to update ForwardRefs on fields based on this ModelField, globalns and localns.
-    """
-    prepare = False
-    if field.type_.__class__ == ForwardRef:
-        prepare = True
-        field.type_ = evaluate_forwardref(field.type_, globalns, localns or None)
-    if field.outer_type_.__class__ == ForwardRef:
-        prepare = True
-        field.outer_type_ = evaluate_forwardref(field.outer_type_, globalns, localns or None)
-    if prepare:
-        field.prepare()
-
-    if field.sub_fields:
-        for sub_f in field.sub_fields:
-            update_field_forward_refs(sub_f, globalns=globalns, localns=localns)
-
-    if field.discriminator_key is not None:
-        field.prepare_discriminated_union_sub_fields()
-
-
-def update_model_forward_refs(
-    model: Type[Any],
-    fields: Iterable['ModelField'],
-    json_encoders: Dict[Union[Type[Any], str, ForwardRef], AnyCallable],
-    localns: 'DictStrAny',
-    exc_to_suppress: Tuple[Type[BaseException], ...] = (),
-) -> None:
-    """
-    Try to update model fields ForwardRefs based on model and localns.
-    """
-    if model.__module__ in sys.modules:
-        globalns = sys.modules[model.__module__].__dict__.copy()
-    else:
-        globalns = {}
-
-    globalns.setdefault(model.__name__, model)
-
-    for f in fields:
-        try:
-            update_field_forward_refs(f, globalns=globalns, localns=localns)
-        except exc_to_suppress:
-            pass
-
-    for key in set(json_encoders.keys()):
-        if isinstance(key, str):
-            fr: ForwardRef = ForwardRef(key)
-        elif isinstance(key, ForwardRef):
-            fr = key
-        else:
-            continue
-
-        try:
-            new_key = evaluate_forwardref(fr, globalns, localns or None)
-        except exc_to_suppress:  # pragma: no cover
-            continue
-
-        json_encoders[new_key] = json_encoders.pop(key)
-
-
-def get_class(type_: Type[Any]) -> Union[None, bool, Type[Any]]:
-    """
-    Tries to get the class of a Type[T] annotation. Returns True if Type is used
-    without brackets. Otherwise returns None.
-    """
-    if type_ is type:
-        return True
-
-    if get_origin(type_) is None:
-        return None
-
-    args = get_args(type_)
-    if not args or not isinstance(args[0], type):
-        return True
-    else:
-        return args[0]
-
-
-def get_sub_types(tp: Any) -> List[Any]:
-    """
-    Return all the types that are allowed by type `tp`
-    `tp` can be a `Union` of allowed types or an `Annotated` type
-    """
-    origin = get_origin(tp)
-    if origin is Annotated:
-        return get_sub_types(get_args(tp)[0])
-    elif is_union(origin):
-        return [x for t in get_args(tp) for x in get_sub_types(t)]
-    else:
-        return [tp]
diff --git a/lib/pydantic/v1/utils.py b/lib/pydantic/v1/utils.py
deleted file mode 100644
index 4d0f68ed..00000000
--- a/lib/pydantic/v1/utils.py
+++ /dev/null
@@ -1,803 +0,0 @@
-import keyword
-import warnings
-import weakref
-from collections import OrderedDict, defaultdict, deque
-from copy import deepcopy
-from itertools import islice, zip_longest
-from types import BuiltinFunctionType, CodeType, FunctionType, GeneratorType, LambdaType, ModuleType
-from typing import (
-    TYPE_CHECKING,
-    AbstractSet,
-    Any,
-    Callable,
-    Collection,
-    Dict,
-    Generator,
-    Iterable,
-    Iterator,
-    List,
-    Mapping,
-    NoReturn,
-    Optional,
-    Set,
-    Tuple,
-    Type,
-    TypeVar,
-    Union,
-)
-
-from typing_extensions import Annotated
-
-from .errors import ConfigError
-from .typing import (
-    NoneType,
-    WithArgsTypes,
-    all_literal_values,
-    display_as_type,
-    get_args,
-    get_origin,
-    is_literal_type,
-    is_union,
-)
-from .version import version_info
-
-if TYPE_CHECKING:
-    from inspect import Signature
-    from pathlib import Path
-
-    from .config import BaseConfig
-    from .dataclasses import Dataclass
-    from .fields import ModelField
-    from .main import BaseModel
-    from .typing import AbstractSetIntStr, DictIntStrAny, IntStr, MappingIntStrAny, ReprArgs
-
-    RichReprResult = Iterable[Union[Any, Tuple[Any], Tuple[str, Any], Tuple[str, Any, Any]]]
-
-__all__ = (
-    'import_string',
-    'sequence_like',
-    'validate_field_name',
-    'lenient_isinstance',
-    'lenient_issubclass',
-    'in_ipython',
-    'is_valid_identifier',
-    'deep_update',
-    'update_not_none',
-    'almost_equal_floats',
-    'get_model',
-    'to_camel',
-    'is_valid_field',
-    'smart_deepcopy',
-    'PyObjectStr',
-    'Representation',
-    'GetterDict',
-    'ValueItems',
-    'version_info',  # required here to match behaviour in v1.3
-    'ClassAttribute',
-    'path_type',
-    'ROOT_KEY',
-    'get_unique_discriminator_alias',
-    'get_discriminator_alias_and_values',
-    'DUNDER_ATTRIBUTES',
-)
-
-ROOT_KEY = '__root__'
-# these are types that are returned unchanged by deepcopy
-IMMUTABLE_NON_COLLECTIONS_TYPES: Set[Type[Any]] = {
-    int,
-    float,
-    complex,
-    str,
-    bool,
-    bytes,
-    type,
-    NoneType,
-    FunctionType,
-    BuiltinFunctionType,
-    LambdaType,
-    weakref.ref,
-    CodeType,
-    # note: including ModuleType will differ from behaviour of deepcopy by not producing error.
-    # It might be not a good idea in general, but considering that this function used only internally
-    # against default values of fields, this will allow to actually have a field with module as default value
-    ModuleType,
-    NotImplemented.__class__,
-    Ellipsis.__class__,
-}
-
-# these are types that if empty, might be copied with simple copy() instead of deepcopy()
-BUILTIN_COLLECTIONS: Set[Type[Any]] = {
-    list,
-    set,
-    tuple,
-    frozenset,
-    dict,
-    OrderedDict,
-    defaultdict,
-    deque,
-}
-
-
-def import_string(dotted_path: str) -> Any:
-    """
-    Stolen approximately from django. Import a dotted module path and return the attribute/class designated by the
-    last name in the path. Raise ImportError if the import fails.
-    """
-    from importlib import import_module
-
-    try:
-        module_path, class_name = dotted_path.strip(' ').rsplit('.', 1)
-    except ValueError as e:
-        raise ImportError(f'"{dotted_path}" doesn\'t look like a module path') from e
-
-    module = import_module(module_path)
-    try:
-        return getattr(module, class_name)
-    except AttributeError as e:
-        raise ImportError(f'Module "{module_path}" does not define a "{class_name}" attribute') from e
-
-
-def truncate(v: Union[str], *, max_len: int = 80) -> str:
-    """
-    Truncate a value and add a unicode ellipsis (three dots) to the end if it was too long
-    """
-    warnings.warn('`truncate` is no-longer used by pydantic and is deprecated', DeprecationWarning)
-    if isinstance(v, str) and len(v) > (max_len - 2):
-        # -3 so quote + string + … + quote has correct length
-        return (v[: (max_len - 3)] + '…').__repr__()
-    try:
-        v = v.__repr__()
-    except TypeError:
-        v = v.__class__.__repr__(v)  # in case v is a type
-    if len(v) > max_len:
-        v = v[: max_len - 1] + '…'
-    return v
-
-
-def sequence_like(v: Any) -> bool:
-    return isinstance(v, (list, tuple, set, frozenset, GeneratorType, deque))
-
-
-def validate_field_name(bases: List[Type['BaseModel']], field_name: str) -> None:
-    """
-    Ensure that the field's name does not shadow an existing attribute of the model.
-    """
-    for base in bases:
-        if getattr(base, field_name, None):
-            raise NameError(
-                f'Field name "{field_name}" shadows a BaseModel attribute; '
-                f'use a different field name with "alias=\'{field_name}\'".'
-            )
-
-
-def lenient_isinstance(o: Any, class_or_tuple: Union[Type[Any], Tuple[Type[Any], ...], None]) -> bool:
-    try:
-        return isinstance(o, class_or_tuple)  # type: ignore[arg-type]
-    except TypeError:
-        return False
-
-
-def lenient_issubclass(cls: Any, class_or_tuple: Union[Type[Any], Tuple[Type[Any], ...], None]) -> bool:
-    try:
-        return isinstance(cls, type) and issubclass(cls, class_or_tuple)  # type: ignore[arg-type]
-    except TypeError:
-        if isinstance(cls, WithArgsTypes):
-            return False
-        raise  # pragma: no cover
-
-
-def in_ipython() -> bool:
-    """
-    Check whether we're in an ipython environment, including jupyter notebooks.
-    """
-    try:
-        eval('__IPYTHON__')
-    except NameError:
-        return False
-    else:  # pragma: no cover
-        return True
-
-
-def is_valid_identifier(identifier: str) -> bool:
-    """
-    Checks that a string is a valid identifier and not a Python keyword.
-    :param identifier: The identifier to test.
-    :return: True if the identifier is valid.
-    """
-    return identifier.isidentifier() and not keyword.iskeyword(identifier)
-
-
-KeyType = TypeVar('KeyType')
-
-
-def deep_update(mapping: Dict[KeyType, Any], *updating_mappings: Dict[KeyType, Any]) -> Dict[KeyType, Any]:
-    updated_mapping = mapping.copy()
-    for updating_mapping in updating_mappings:
-        for k, v in updating_mapping.items():
-            if k in updated_mapping and isinstance(updated_mapping[k], dict) and isinstance(v, dict):
-                updated_mapping[k] = deep_update(updated_mapping[k], v)
-            else:
-                updated_mapping[k] = v
-    return updated_mapping
-
-
-def update_not_none(mapping: Dict[Any, Any], **update: Any) -> None:
-    mapping.update({k: v for k, v in update.items() if v is not None})
-
-
-def almost_equal_floats(value_1: float, value_2: float, *, delta: float = 1e-8) -> bool:
-    """
-    Return True if two floats are almost equal
-    """
-    return abs(value_1 - value_2) <= delta
-
-
-def generate_model_signature(
-    init: Callable[..., None], fields: Dict[str, 'ModelField'], config: Type['BaseConfig']
-) -> 'Signature':
-    """
-    Generate signature for model based on its fields
-    """
-    from inspect import Parameter, Signature, signature
-
-    from .config import Extra
-
-    present_params = signature(init).parameters.values()
-    merged_params: Dict[str, Parameter] = {}
-    var_kw = None
-    use_var_kw = False
-
-    for param in islice(present_params, 1, None):  # skip self arg
-        if param.kind is param.VAR_KEYWORD:
-            var_kw = param
-            continue
-        merged_params[param.name] = param
-
-    if var_kw:  # if custom init has no var_kw, fields which are not declared in it cannot be passed through
-        allow_names = config.allow_population_by_field_name
-        for field_name, field in fields.items():
-            param_name = field.alias
-            if field_name in merged_params or param_name in merged_params:
-                continue
-            elif not is_valid_identifier(param_name):
-                if allow_names and is_valid_identifier(field_name):
-                    param_name = field_name
-                else:
-                    use_var_kw = True
-                    continue
-
-            # TODO: replace annotation with actual expected types once #1055 solved
-            kwargs = {'default': field.default} if not field.required else {}
-            merged_params[param_name] = Parameter(
-                param_name, Parameter.KEYWORD_ONLY, annotation=field.annotation, **kwargs
-            )
-
-    if config.extra is Extra.allow:
-        use_var_kw = True
-
-    if var_kw and use_var_kw:
-        # Make sure the parameter for extra kwargs
-        # does not have the same name as a field
-        default_model_signature = [
-            ('__pydantic_self__', Parameter.POSITIONAL_OR_KEYWORD),
-            ('data', Parameter.VAR_KEYWORD),
-        ]
-        if [(p.name, p.kind) for p in present_params] == default_model_signature:
-            # if this is the standard model signature, use extra_data as the extra args name
-            var_kw_name = 'extra_data'
-        else:
-            # else start from var_kw
-            var_kw_name = var_kw.name
-
-        # generate a name that's definitely unique
-        while var_kw_name in fields:
-            var_kw_name += '_'
-        merged_params[var_kw_name] = var_kw.replace(name=var_kw_name)
-
-    return Signature(parameters=list(merged_params.values()), return_annotation=None)
-
-
-def get_model(obj: Union[Type['BaseModel'], Type['Dataclass']]) -> Type['BaseModel']:
-    from .main import BaseModel
-
-    try:
-        model_cls = obj.__pydantic_model__  # type: ignore
-    except AttributeError:
-        model_cls = obj
-
-    if not issubclass(model_cls, BaseModel):
-        raise TypeError('Unsupported type, must be either BaseModel or dataclass')
-    return model_cls
-
-
-def to_camel(string: str) -> str:
-    return ''.join(word.capitalize() for word in string.split('_'))
-
-
-def to_lower_camel(string: str) -> str:
-    if len(string) >= 1:
-        pascal_string = to_camel(string)
-        return pascal_string[0].lower() + pascal_string[1:]
-    return string.lower()
-
-
-T = TypeVar('T')
-
-
-def unique_list(
-    input_list: Union[List[T], Tuple[T, ...]],
-    *,
-    name_factory: Callable[[T], str] = str,
-) -> List[T]:
-    """
-    Make a list unique while maintaining order.
-    We update the list if another one with the same name is set
-    (e.g. root validator overridden in subclass)
-    """
-    result: List[T] = []
-    result_names: List[str] = []
-    for v in input_list:
-        v_name = name_factory(v)
-        if v_name not in result_names:
-            result_names.append(v_name)
-            result.append(v)
-        else:
-            result[result_names.index(v_name)] = v
-
-    return result
-
-
-class PyObjectStr(str):
-    """
-    String class where repr doesn't include quotes. Useful with Representation when you want to return a string
-    representation of something that valid (or pseudo-valid) python.
-    """
-
-    def __repr__(self) -> str:
-        return str(self)
-
-
-class Representation:
-    """
-    Mixin to provide __str__, __repr__, and __pretty__ methods. See #884 for more details.
-
-    __pretty__ is used by [devtools](https://python-devtools.helpmanual.io/) to provide human readable representations
-    of objects.
-    """
-
-    __slots__: Tuple[str, ...] = tuple()
-
-    def __repr_args__(self) -> 'ReprArgs':
-        """
-        Returns the attributes to show in __str__, __repr__, and __pretty__ this is generally overridden.
-
-        Can either return:
-        * name - value pairs, e.g.: `[('foo_name', 'foo'), ('bar_name', ['b', 'a', 'r'])]`
-        * or, just values, e.g.: `[(None, 'foo'), (None, ['b', 'a', 'r'])]`
-        """
-        attrs = ((s, getattr(self, s)) for s in self.__slots__)
-        return [(a, v) for a, v in attrs if v is not None]
-
-    def __repr_name__(self) -> str:
-        """
-        Name of the instance's class, used in __repr__.
-        """
-        return self.__class__.__name__
-
-    def __repr_str__(self, join_str: str) -> str:
-        return join_str.join(repr(v) if a is None else f'{a}={v!r}' for a, v in self.__repr_args__())
-
-    def __pretty__(self, fmt: Callable[[Any], Any], **kwargs: Any) -> Generator[Any, None, None]:
-        """
-        Used by devtools (https://python-devtools.helpmanual.io/) to provide a human readable representations of objects
-        """
-        yield self.__repr_name__() + '('
-        yield 1
-        for name, value in self.__repr_args__():
-            if name is not None:
-                yield name + '='
-            yield fmt(value)
-            yield ','
-            yield 0
-        yield -1
-        yield ')'
-
-    def __str__(self) -> str:
-        return self.__repr_str__(' ')
-
-    def __repr__(self) -> str:
-        return f'{self.__repr_name__()}({self.__repr_str__(", ")})'
-
-    def __rich_repr__(self) -> 'RichReprResult':
-        """Get fields for Rich library"""
-        for name, field_repr in self.__repr_args__():
-            if name is None:
-                yield field_repr
-            else:
-                yield name, field_repr
-
-
-class GetterDict(Representation):
-    """
-    Hack to make object's smell just enough like dicts for validate_model.
-
-    We can't inherit from Mapping[str, Any] because it upsets cython so we have to implement all methods ourselves.
-    """
-
-    __slots__ = ('_obj',)
-
-    def __init__(self, obj: Any):
-        self._obj = obj
-
-    def __getitem__(self, key: str) -> Any:
-        try:
-            return getattr(self._obj, key)
-        except AttributeError as e:
-            raise KeyError(key) from e
-
-    def get(self, key: Any, default: Any = None) -> Any:
-        return getattr(self._obj, key, default)
-
-    def extra_keys(self) -> Set[Any]:
-        """
-        We don't want to get any other attributes of obj if the model didn't explicitly ask for them
-        """
-        return set()
-
-    def keys(self) -> List[Any]:
-        """
-        Keys of the pseudo dictionary, uses a list not set so order information can be maintained like python
-        dictionaries.
-        """
-        return list(self)
-
-    def values(self) -> List[Any]:
-        return [self[k] for k in self]
-
-    def items(self) -> Iterator[Tuple[str, Any]]:
-        for k in self:
-            yield k, self.get(k)
-
-    def __iter__(self) -> Iterator[str]:
-        for name in dir(self._obj):
-            if not name.startswith('_'):
-                yield name
-
-    def __len__(self) -> int:
-        return sum(1 for _ in self)
-
-    def __contains__(self, item: Any) -> bool:
-        return item in self.keys()
-
-    def __eq__(self, other: Any) -> bool:
-        return dict(self) == dict(other.items())
-
-    def __repr_args__(self) -> 'ReprArgs':
-        return [(None, dict(self))]
-
-    def __repr_name__(self) -> str:
-        return f'GetterDict[{display_as_type(self._obj)}]'
-
-
-class ValueItems(Representation):
-    """
-    Class for more convenient calculation of excluded or included fields on values.
-    """
-
-    __slots__ = ('_items', '_type')
-
-    def __init__(self, value: Any, items: Union['AbstractSetIntStr', 'MappingIntStrAny']) -> None:
-        items = self._coerce_items(items)
-
-        if isinstance(value, (list, tuple)):
-            items = self._normalize_indexes(items, len(value))
-
-        self._items: 'MappingIntStrAny' = items
-
-    def is_excluded(self, item: Any) -> bool:
-        """
-        Check if item is fully excluded.
-
-        :param item: key or index of a value
-        """
-        return self.is_true(self._items.get(item))
-
-    def is_included(self, item: Any) -> bool:
-        """
-        Check if value is contained in self._items
-
-        :param item: key or index of value
-        """
-        return item in self._items
-
-    def for_element(self, e: 'IntStr') -> Optional[Union['AbstractSetIntStr', 'MappingIntStrAny']]:
-        """
-        :param e: key or index of element on value
-        :return: raw values for element if self._items is dict and contain needed element
-        """
-
-        item = self._items.get(e)
-        return item if not self.is_true(item) else None
-
-    def _normalize_indexes(self, items: 'MappingIntStrAny', v_length: int) -> 'DictIntStrAny':
-        """
-        :param items: dict or set of indexes which will be normalized
-        :param v_length: length of sequence indexes of which will be
-
-        >>> self._normalize_indexes({0: True, -2: True, -1: True}, 4)
-        {0: True, 2: True, 3: True}
-        >>> self._normalize_indexes({'__all__': True}, 4)
-        {0: True, 1: True, 2: True, 3: True}
-        """
-
-        normalized_items: 'DictIntStrAny' = {}
-        all_items = None
-        for i, v in items.items():
-            if not (isinstance(v, Mapping) or isinstance(v, AbstractSet) or self.is_true(v)):
-                raise TypeError(f'Unexpected type of exclude value for index "{i}" {v.__class__}')
-            if i == '__all__':
-                all_items = self._coerce_value(v)
-                continue
-            if not isinstance(i, int):
-                raise TypeError(
-                    'Excluding fields from a sequence of sub-models or dicts must be performed index-wise: '
-                    'expected integer keys or keyword "__all__"'
-                )
-            normalized_i = v_length + i if i < 0 else i
-            normalized_items[normalized_i] = self.merge(v, normalized_items.get(normalized_i))
-
-        if not all_items:
-            return normalized_items
-        if self.is_true(all_items):
-            for i in range(v_length):
-                normalized_items.setdefault(i, ...)
-            return normalized_items
-        for i in range(v_length):
-            normalized_item = normalized_items.setdefault(i, {})
-            if not self.is_true(normalized_item):
-                normalized_items[i] = self.merge(all_items, normalized_item)
-        return normalized_items
-
-    @classmethod
-    def merge(cls, base: Any, override: Any, intersect: bool = False) -> Any:
-        """
-        Merge a ``base`` item with an ``override`` item.
-
-        Both ``base`` and ``override`` are converted to dictionaries if possible.
-        Sets are converted to dictionaries with the sets entries as keys and
-        Ellipsis as values.
-
-        Each key-value pair existing in ``base`` is merged with ``override``,
-        while the rest of the key-value pairs are updated recursively with this function.
-
-        Merging takes place based on the "union" of keys if ``intersect`` is
-        set to ``False`` (default) and on the intersection of keys if
-        ``intersect`` is set to ``True``.
-        """
-        override = cls._coerce_value(override)
-        base = cls._coerce_value(base)
-        if override is None:
-            return base
-        if cls.is_true(base) or base is None:
-            return override
-        if cls.is_true(override):
-            return base if intersect else override
-
-        # intersection or union of keys while preserving ordering:
-        if intersect:
-            merge_keys = [k for k in base if k in override] + [k for k in override if k in base]
-        else:
-            merge_keys = list(base) + [k for k in override if k not in base]
-
-        merged: 'DictIntStrAny' = {}
-        for k in merge_keys:
-            merged_item = cls.merge(base.get(k), override.get(k), intersect=intersect)
-            if merged_item is not None:
-                merged[k] = merged_item
-
-        return merged
-
-    @staticmethod
-    def _coerce_items(items: Union['AbstractSetIntStr', 'MappingIntStrAny']) -> 'MappingIntStrAny':
-        if isinstance(items, Mapping):
-            pass
-        elif isinstance(items, AbstractSet):
-            items = dict.fromkeys(items, ...)
-        else:
-            class_name = getattr(items, '__class__', '???')
-            assert_never(
-                items,
-                f'Unexpected type of exclude value {class_name}',
-            )
-        return items
-
-    @classmethod
-    def _coerce_value(cls, value: Any) -> Any:
-        if value is None or cls.is_true(value):
-            return value
-        return cls._coerce_items(value)
-
-    @staticmethod
-    def is_true(v: Any) -> bool:
-        return v is True or v is ...
-
-    def __repr_args__(self) -> 'ReprArgs':
-        return [(None, self._items)]
-
-
-class ClassAttribute:
-    """
-    Hide class attribute from its instances
-    """
-
-    __slots__ = (
-        'name',
-        'value',
-    )
-
-    def __init__(self, name: str, value: Any) -> None:
-        self.name = name
-        self.value = value
-
-    def __get__(self, instance: Any, owner: Type[Any]) -> None:
-        if instance is None:
-            return self.value
-        raise AttributeError(f'{self.name!r} attribute of {owner.__name__!r} is class-only')
-
-
-path_types = {
-    'is_dir': 'directory',
-    'is_file': 'file',
-    'is_mount': 'mount point',
-    'is_symlink': 'symlink',
-    'is_block_device': 'block device',
-    'is_char_device': 'char device',
-    'is_fifo': 'FIFO',
-    'is_socket': 'socket',
-}
-
-
-def path_type(p: 'Path') -> str:
-    """
-    Find out what sort of thing a path is.
-    """
-    assert p.exists(), 'path does not exist'
-    for method, name in path_types.items():
-        if getattr(p, method)():
-            return name
-
-    return 'unknown'
-
-
-Obj = TypeVar('Obj')
-
-
-def smart_deepcopy(obj: Obj) -> Obj:
-    """
-    Return type as is for immutable built-in types
-    Use obj.copy() for built-in empty collections
-    Use copy.deepcopy() for non-empty collections and unknown objects
-    """
-
-    obj_type = obj.__class__
-    if obj_type in IMMUTABLE_NON_COLLECTIONS_TYPES:
-        return obj  # fastest case: obj is immutable and not collection therefore will not be copied anyway
-    try:
-        if not obj and obj_type in BUILTIN_COLLECTIONS:
-            # faster way for empty collections, no need to copy its members
-            return obj if obj_type is tuple else obj.copy()  # type: ignore  # tuple doesn't have copy method
-    except (TypeError, ValueError, RuntimeError):
-        # do we really dare to catch ALL errors? Seems a bit risky
-        pass
-
-    return deepcopy(obj)  # slowest way when we actually might need a deepcopy
-
-
-def is_valid_field(name: str) -> bool:
-    if not name.startswith('_'):
-        return True
-    return ROOT_KEY == name
-
-
-DUNDER_ATTRIBUTES = {
-    '__annotations__',
-    '__classcell__',
-    '__doc__',
-    '__module__',
-    '__orig_bases__',
-    '__orig_class__',
-    '__qualname__',
-}
-
-
-def is_valid_private_name(name: str) -> bool:
-    return not is_valid_field(name) and name not in DUNDER_ATTRIBUTES
-
-
-_EMPTY = object()
-
-
-def all_identical(left: Iterable[Any], right: Iterable[Any]) -> bool:
-    """
-    Check that the items of `left` are the same objects as those in `right`.
-
-    >>> a, b = object(), object()
-    >>> all_identical([a, b, a], [a, b, a])
-    True
-    >>> all_identical([a, b, [a]], [a, b, [a]])  # new list object, while "equal" is not "identical"
-    False
-    """
-    for left_item, right_item in zip_longest(left, right, fillvalue=_EMPTY):
-        if left_item is not right_item:
-            return False
-    return True
-
-
-def assert_never(obj: NoReturn, msg: str) -> NoReturn:
-    """
-    Helper to make sure that we have covered all possible types.
-
-    This is mostly useful for ``mypy``, docs:
-    https://mypy.readthedocs.io/en/latest/literal_types.html#exhaustive-checks
-    """
-    raise TypeError(msg)
-
-
-def get_unique_discriminator_alias(all_aliases: Collection[str], discriminator_key: str) -> str:
-    """Validate that all aliases are the same and if that's the case return the alias"""
-    unique_aliases = set(all_aliases)
-    if len(unique_aliases) > 1:
-        raise ConfigError(
-            f'Aliases for discriminator {discriminator_key!r} must be the same (got {", ".join(sorted(all_aliases))})'
-        )
-    return unique_aliases.pop()
-
-
-def get_discriminator_alias_and_values(tp: Any, discriminator_key: str) -> Tuple[str, Tuple[str, ...]]:
-    """
-    Get alias and all valid values in the `Literal` type of the discriminator field
-    `tp` can be a `BaseModel` class or directly an `Annotated` `Union` of many.
-    """
-    is_root_model = getattr(tp, '__custom_root_type__', False)
-
-    if get_origin(tp) is Annotated:
-        tp = get_args(tp)[0]
-
-    if hasattr(tp, '__pydantic_model__'):
-        tp = tp.__pydantic_model__
-
-    if is_union(get_origin(tp)):
-        alias, all_values = _get_union_alias_and_all_values(tp, discriminator_key)
-        return alias, tuple(v for values in all_values for v in values)
-    elif is_root_model:
-        union_type = tp.__fields__[ROOT_KEY].type_
-        alias, all_values = _get_union_alias_and_all_values(union_type, discriminator_key)
-
-        if len(set(all_values)) > 1:
-            raise ConfigError(
-                f'Field {discriminator_key!r} is not the same for all submodels of {display_as_type(tp)!r}'
-            )
-
-        return alias, all_values[0]
-
-    else:
-        try:
-            t_discriminator_type = tp.__fields__[discriminator_key].type_
-        except AttributeError as e:
-            raise TypeError(f'Type {tp.__name__!r} is not a valid `BaseModel` or `dataclass`') from e
-        except KeyError as e:
-            raise ConfigError(f'Model {tp.__name__!r} needs a discriminator field for key {discriminator_key!r}') from e
-
-        if not is_literal_type(t_discriminator_type):
-            raise ConfigError(f'Field {discriminator_key!r} of model {tp.__name__!r} needs to be a `Literal`')
-
-        return tp.__fields__[discriminator_key].alias, all_literal_values(t_discriminator_type)
-
-
-def _get_union_alias_and_all_values(
-    union_type: Type[Any], discriminator_key: str
-) -> Tuple[str, Tuple[Tuple[str, ...], ...]]:
-    zipped_aliases_values = [get_discriminator_alias_and_values(t, discriminator_key) for t in get_args(union_type)]
-    # unzip: [('alias_a',('v1', 'v2)), ('alias_b', ('v3',))] => [('alias_a', 'alias_b'), (('v1', 'v2'), ('v3',))]
-    all_aliases, all_values = zip(*zipped_aliases_values)
-    return get_unique_discriminator_alias(all_aliases, discriminator_key), all_values
diff --git a/lib/pydantic/v1/validators.py b/lib/pydantic/v1/validators.py
deleted file mode 100644
index 549a235e..00000000
--- a/lib/pydantic/v1/validators.py
+++ /dev/null
@@ -1,765 +0,0 @@
-import math
-import re
-from collections import OrderedDict, deque
-from collections.abc import Hashable as CollectionsHashable
-from datetime import date, datetime, time, timedelta
-from decimal import Decimal, DecimalException
-from enum import Enum, IntEnum
-from ipaddress import IPv4Address, IPv4Interface, IPv4Network, IPv6Address, IPv6Interface, IPv6Network
-from pathlib import Path
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Callable,
-    Deque,
-    Dict,
-    ForwardRef,
-    FrozenSet,
-    Generator,
-    Hashable,
-    List,
-    NamedTuple,
-    Pattern,
-    Set,
-    Tuple,
-    Type,
-    TypeVar,
-    Union,
-)
-from uuid import UUID
-
-from . import errors
-from .datetime_parse import parse_date, parse_datetime, parse_duration, parse_time
-from .typing import (
-    AnyCallable,
-    all_literal_values,
-    display_as_type,
-    get_class,
-    is_callable_type,
-    is_literal_type,
-    is_namedtuple,
-    is_none_type,
-    is_typeddict,
-)
-from .utils import almost_equal_floats, lenient_issubclass, sequence_like
-
-if TYPE_CHECKING:
-    from typing_extensions import Literal, TypedDict
-
-    from .config import BaseConfig
-    from .fields import ModelField
-    from .types import ConstrainedDecimal, ConstrainedFloat, ConstrainedInt
-
-    ConstrainedNumber = Union[ConstrainedDecimal, ConstrainedFloat, ConstrainedInt]
-    AnyOrderedDict = OrderedDict[Any, Any]
-    Number = Union[int, float, Decimal]
-    StrBytes = Union[str, bytes]
-
-
-def str_validator(v: Any) -> Union[str]:
-    if isinstance(v, str):
-        if isinstance(v, Enum):
-            return v.value
-        else:
-            return v
-    elif isinstance(v, (float, int, Decimal)):
-        # is there anything else we want to add here? If you think so, create an issue.
-        return str(v)
-    elif isinstance(v, (bytes, bytearray)):
-        return v.decode()
-    else:
-        raise errors.StrError()
-
-
-def strict_str_validator(v: Any) -> Union[str]:
-    if isinstance(v, str) and not isinstance(v, Enum):
-        return v
-    raise errors.StrError()
-
-
-def bytes_validator(v: Any) -> Union[bytes]:
-    if isinstance(v, bytes):
-        return v
-    elif isinstance(v, bytearray):
-        return bytes(v)
-    elif isinstance(v, str):
-        return v.encode()
-    elif isinstance(v, (float, int, Decimal)):
-        return str(v).encode()
-    else:
-        raise errors.BytesError()
-
-
-def strict_bytes_validator(v: Any) -> Union[bytes]:
-    if isinstance(v, bytes):
-        return v
-    elif isinstance(v, bytearray):
-        return bytes(v)
-    else:
-        raise errors.BytesError()
-
-
-BOOL_FALSE = {0, '0', 'off', 'f', 'false', 'n', 'no'}
-BOOL_TRUE = {1, '1', 'on', 't', 'true', 'y', 'yes'}
-
-
-def bool_validator(v: Any) -> bool:
-    if v is True or v is False:
-        return v
-    if isinstance(v, bytes):
-        v = v.decode()
-    if isinstance(v, str):
-        v = v.lower()
-    try:
-        if v in BOOL_TRUE:
-            return True
-        if v in BOOL_FALSE:
-            return False
-    except TypeError:
-        raise errors.BoolError()
-    raise errors.BoolError()
-
-
-# matches the default limit cpython, see https://github.com/python/cpython/pull/96500
-max_str_int = 4_300
-
-
-def int_validator(v: Any) -> int:
-    if isinstance(v, int) and not (v is True or v is False):
-        return v
-
-    # see https://github.com/pydantic/pydantic/issues/1477 and in turn, https://github.com/python/cpython/issues/95778
-    # this check should be unnecessary once patch releases are out for 3.7, 3.8, 3.9 and 3.10
-    # but better to check here until then.
-    # NOTICE: this does not fully protect user from the DOS risk since the standard library JSON implementation
-    # (and other std lib modules like xml) use `int()` and are likely called before this, the best workaround is to
-    # 1. update to the latest patch release of python once released, 2. use a different JSON library like ujson
-    if isinstance(v, (str, bytes, bytearray)) and len(v) > max_str_int:
-        raise errors.IntegerError()
-
-    try:
-        return int(v)
-    except (TypeError, ValueError, OverflowError):
-        raise errors.IntegerError()
-
-
-def strict_int_validator(v: Any) -> int:
-    if isinstance(v, int) and not (v is True or v is False):
-        return v
-    raise errors.IntegerError()
-
-
-def float_validator(v: Any) -> float:
-    if isinstance(v, float):
-        return v
-
-    try:
-        return float(v)
-    except (TypeError, ValueError):
-        raise errors.FloatError()
-
-
-def strict_float_validator(v: Any) -> float:
-    if isinstance(v, float):
-        return v
-    raise errors.FloatError()
-
-
-def float_finite_validator(v: 'Number', field: 'ModelField', config: 'BaseConfig') -> 'Number':
-    allow_inf_nan = getattr(field.type_, 'allow_inf_nan', None)
-    if allow_inf_nan is None:
-        allow_inf_nan = config.allow_inf_nan
-
-    if allow_inf_nan is False and (math.isnan(v) or math.isinf(v)):
-        raise errors.NumberNotFiniteError()
-    return v
-
-
-def number_multiple_validator(v: 'Number', field: 'ModelField') -> 'Number':
-    field_type: ConstrainedNumber = field.type_
-    if field_type.multiple_of is not None:
-        mod = float(v) / float(field_type.multiple_of) % 1
-        if not almost_equal_floats(mod, 0.0) and not almost_equal_floats(mod, 1.0):
-            raise errors.NumberNotMultipleError(multiple_of=field_type.multiple_of)
-    return v
-
-
-def number_size_validator(v: 'Number', field: 'ModelField') -> 'Number':
-    field_type: ConstrainedNumber = field.type_
-    if field_type.gt is not None and not v > field_type.gt:
-        raise errors.NumberNotGtError(limit_value=field_type.gt)
-    elif field_type.ge is not None and not v >= field_type.ge:
-        raise errors.NumberNotGeError(limit_value=field_type.ge)
-
-    if field_type.lt is not None and not v < field_type.lt:
-        raise errors.NumberNotLtError(limit_value=field_type.lt)
-    if field_type.le is not None and not v <= field_type.le:
-        raise errors.NumberNotLeError(limit_value=field_type.le)
-
-    return v
-
-
-def constant_validator(v: 'Any', field: 'ModelField') -> 'Any':
-    """Validate ``const`` fields.
-
-    The value provided for a ``const`` field must be equal to the default value
-    of the field. This is to support the keyword of the same name in JSON
-    Schema.
-    """
-    if v != field.default:
-        raise errors.WrongConstantError(given=v, permitted=[field.default])
-
-    return v
-
-
-def anystr_length_validator(v: 'StrBytes', config: 'BaseConfig') -> 'StrBytes':
-    v_len = len(v)
-
-    min_length = config.min_anystr_length
-    if v_len < min_length:
-        raise errors.AnyStrMinLengthError(limit_value=min_length)
-
-    max_length = config.max_anystr_length
-    if max_length is not None and v_len > max_length:
-        raise errors.AnyStrMaxLengthError(limit_value=max_length)
-
-    return v
-
-
-def anystr_strip_whitespace(v: 'StrBytes') -> 'StrBytes':
-    return v.strip()
-
-
-def anystr_upper(v: 'StrBytes') -> 'StrBytes':
-    return v.upper()
-
-
-def anystr_lower(v: 'StrBytes') -> 'StrBytes':
-    return v.lower()
-
-
-def ordered_dict_validator(v: Any) -> 'AnyOrderedDict':
-    if isinstance(v, OrderedDict):
-        return v
-
-    try:
-        return OrderedDict(v)
-    except (TypeError, ValueError):
-        raise errors.DictError()
-
-
-def dict_validator(v: Any) -> Dict[Any, Any]:
-    if isinstance(v, dict):
-        return v
-
-    try:
-        return dict(v)
-    except (TypeError, ValueError):
-        raise errors.DictError()
-
-
-def list_validator(v: Any) -> List[Any]:
-    if isinstance(v, list):
-        return v
-    elif sequence_like(v):
-        return list(v)
-    else:
-        raise errors.ListError()
-
-
-def tuple_validator(v: Any) -> Tuple[Any, ...]:
-    if isinstance(v, tuple):
-        return v
-    elif sequence_like(v):
-        return tuple(v)
-    else:
-        raise errors.TupleError()
-
-
-def set_validator(v: Any) -> Set[Any]:
-    if isinstance(v, set):
-        return v
-    elif sequence_like(v):
-        return set(v)
-    else:
-        raise errors.SetError()
-
-
-def frozenset_validator(v: Any) -> FrozenSet[Any]:
-    if isinstance(v, frozenset):
-        return v
-    elif sequence_like(v):
-        return frozenset(v)
-    else:
-        raise errors.FrozenSetError()
-
-
-def deque_validator(v: Any) -> Deque[Any]:
-    if isinstance(v, deque):
-        return v
-    elif sequence_like(v):
-        return deque(v)
-    else:
-        raise errors.DequeError()
-
-
-def enum_member_validator(v: Any, field: 'ModelField', config: 'BaseConfig') -> Enum:
-    try:
-        enum_v = field.type_(v)
-    except ValueError:
-        # field.type_ should be an enum, so will be iterable
-        raise errors.EnumMemberError(enum_values=list(field.type_))
-    return enum_v.value if config.use_enum_values else enum_v
-
-
-def uuid_validator(v: Any, field: 'ModelField') -> UUID:
-    try:
-        if isinstance(v, str):
-            v = UUID(v)
-        elif isinstance(v, (bytes, bytearray)):
-            try:
-                v = UUID(v.decode())
-            except ValueError:
-                # 16 bytes in big-endian order as the bytes argument fail
-                # the above check
-                v = UUID(bytes=v)
-    except ValueError:
-        raise errors.UUIDError()
-
-    if not isinstance(v, UUID):
-        raise errors.UUIDError()
-
-    required_version = getattr(field.type_, '_required_version', None)
-    if required_version and v.version != required_version:
-        raise errors.UUIDVersionError(required_version=required_version)
-
-    return v
-
-
-def decimal_validator(v: Any) -> Decimal:
-    if isinstance(v, Decimal):
-        return v
-    elif isinstance(v, (bytes, bytearray)):
-        v = v.decode()
-
-    v = str(v).strip()
-
-    try:
-        v = Decimal(v)
-    except DecimalException:
-        raise errors.DecimalError()
-
-    if not v.is_finite():
-        raise errors.DecimalIsNotFiniteError()
-
-    return v
-
-
-def hashable_validator(v: Any) -> Hashable:
-    if isinstance(v, Hashable):
-        return v
-
-    raise errors.HashableError()
-
-
-def ip_v4_address_validator(v: Any) -> IPv4Address:
-    if isinstance(v, IPv4Address):
-        return v
-
-    try:
-        return IPv4Address(v)
-    except ValueError:
-        raise errors.IPv4AddressError()
-
-
-def ip_v6_address_validator(v: Any) -> IPv6Address:
-    if isinstance(v, IPv6Address):
-        return v
-
-    try:
-        return IPv6Address(v)
-    except ValueError:
-        raise errors.IPv6AddressError()
-
-
-def ip_v4_network_validator(v: Any) -> IPv4Network:
-    """
-    Assume IPv4Network initialised with a default ``strict`` argument
-
-    See more:
-    https://docs.python.org/library/ipaddress.html#ipaddress.IPv4Network
-    """
-    if isinstance(v, IPv4Network):
-        return v
-
-    try:
-        return IPv4Network(v)
-    except ValueError:
-        raise errors.IPv4NetworkError()
-
-
-def ip_v6_network_validator(v: Any) -> IPv6Network:
-    """
-    Assume IPv6Network initialised with a default ``strict`` argument
-
-    See more:
-    https://docs.python.org/library/ipaddress.html#ipaddress.IPv6Network
-    """
-    if isinstance(v, IPv6Network):
-        return v
-
-    try:
-        return IPv6Network(v)
-    except ValueError:
-        raise errors.IPv6NetworkError()
-
-
-def ip_v4_interface_validator(v: Any) -> IPv4Interface:
-    if isinstance(v, IPv4Interface):
-        return v
-
-    try:
-        return IPv4Interface(v)
-    except ValueError:
-        raise errors.IPv4InterfaceError()
-
-
-def ip_v6_interface_validator(v: Any) -> IPv6Interface:
-    if isinstance(v, IPv6Interface):
-        return v
-
-    try:
-        return IPv6Interface(v)
-    except ValueError:
-        raise errors.IPv6InterfaceError()
-
-
-def path_validator(v: Any) -> Path:
-    if isinstance(v, Path):
-        return v
-
-    try:
-        return Path(v)
-    except TypeError:
-        raise errors.PathError()
-
-
-def path_exists_validator(v: Any) -> Path:
-    if not v.exists():
-        raise errors.PathNotExistsError(path=v)
-
-    return v
-
-
-def callable_validator(v: Any) -> AnyCallable:
-    """
-    Perform a simple check if the value is callable.
-
-    Note: complete matching of argument type hints and return types is not performed
-    """
-    if callable(v):
-        return v
-
-    raise errors.CallableError(value=v)
-
-
-def enum_validator(v: Any) -> Enum:
-    if isinstance(v, Enum):
-        return v
-
-    raise errors.EnumError(value=v)
-
-
-def int_enum_validator(v: Any) -> IntEnum:
-    if isinstance(v, IntEnum):
-        return v
-
-    raise errors.IntEnumError(value=v)
-
-
-def make_literal_validator(type_: Any) -> Callable[[Any], Any]:
-    permitted_choices = all_literal_values(type_)
-
-    # To have a O(1) complexity and still return one of the values set inside the `Literal`,
-    # we create a dict with the set values (a set causes some problems with the way intersection works).
-    # In some cases the set value and checked value can indeed be different (see `test_literal_validator_str_enum`)
-    allowed_choices = {v: v for v in permitted_choices}
-
-    def literal_validator(v: Any) -> Any:
-        try:
-            return allowed_choices[v]
-        except (KeyError, TypeError):
-            raise errors.WrongConstantError(given=v, permitted=permitted_choices)
-
-    return literal_validator
-
-
-def constr_length_validator(v: 'StrBytes', field: 'ModelField', config: 'BaseConfig') -> 'StrBytes':
-    v_len = len(v)
-
-    min_length = field.type_.min_length if field.type_.min_length is not None else config.min_anystr_length
-    if v_len < min_length:
-        raise errors.AnyStrMinLengthError(limit_value=min_length)
-
-    max_length = field.type_.max_length if field.type_.max_length is not None else config.max_anystr_length
-    if max_length is not None and v_len > max_length:
-        raise errors.AnyStrMaxLengthError(limit_value=max_length)
-
-    return v
-
-
-def constr_strip_whitespace(v: 'StrBytes', field: 'ModelField', config: 'BaseConfig') -> 'StrBytes':
-    strip_whitespace = field.type_.strip_whitespace or config.anystr_strip_whitespace
-    if strip_whitespace:
-        v = v.strip()
-
-    return v
-
-
-def constr_upper(v: 'StrBytes', field: 'ModelField', config: 'BaseConfig') -> 'StrBytes':
-    upper = field.type_.to_upper or config.anystr_upper
-    if upper:
-        v = v.upper()
-
-    return v
-
-
-def constr_lower(v: 'StrBytes', field: 'ModelField', config: 'BaseConfig') -> 'StrBytes':
-    lower = field.type_.to_lower or config.anystr_lower
-    if lower:
-        v = v.lower()
-    return v
-
-
-def validate_json(v: Any, config: 'BaseConfig') -> Any:
-    if v is None:
-        # pass None through to other validators
-        return v
-    try:
-        return config.json_loads(v)  # type: ignore
-    except ValueError:
-        raise errors.JsonError()
-    except TypeError:
-        raise errors.JsonTypeError()
-
-
-T = TypeVar('T')
-
-
-def make_arbitrary_type_validator(type_: Type[T]) -> Callable[[T], T]:
-    def arbitrary_type_validator(v: Any) -> T:
-        if isinstance(v, type_):
-            return v
-        raise errors.ArbitraryTypeError(expected_arbitrary_type=type_)
-
-    return arbitrary_type_validator
-
-
-def make_class_validator(type_: Type[T]) -> Callable[[Any], Type[T]]:
-    def class_validator(v: Any) -> Type[T]:
-        if lenient_issubclass(v, type_):
-            return v
-        raise errors.SubclassError(expected_class=type_)
-
-    return class_validator
-
-
-def any_class_validator(v: Any) -> Type[T]:
-    if isinstance(v, type):
-        return v
-    raise errors.ClassError()
-
-
-def none_validator(v: Any) -> 'Literal[None]':
-    if v is None:
-        return v
-    raise errors.NotNoneError()
-
-
-def pattern_validator(v: Any) -> Pattern[str]:
-    if isinstance(v, Pattern):
-        return v
-
-    str_value = str_validator(v)
-
-    try:
-        return re.compile(str_value)
-    except re.error:
-        raise errors.PatternError()
-
-
-NamedTupleT = TypeVar('NamedTupleT', bound=NamedTuple)
-
-
-def make_namedtuple_validator(
-    namedtuple_cls: Type[NamedTupleT], config: Type['BaseConfig']
-) -> Callable[[Tuple[Any, ...]], NamedTupleT]:
-    from .annotated_types import create_model_from_namedtuple
-
-    NamedTupleModel = create_model_from_namedtuple(
-        namedtuple_cls,
-        __config__=config,
-        __module__=namedtuple_cls.__module__,
-    )
-    namedtuple_cls.__pydantic_model__ = NamedTupleModel  # type: ignore[attr-defined]
-
-    def namedtuple_validator(values: Tuple[Any, ...]) -> NamedTupleT:
-        annotations = NamedTupleModel.__annotations__
-
-        if len(values) > len(annotations):
-            raise errors.ListMaxLengthError(limit_value=len(annotations))
-
-        dict_values: Dict[str, Any] = dict(zip(annotations, values))
-        validated_dict_values: Dict[str, Any] = dict(NamedTupleModel(**dict_values))
-        return namedtuple_cls(**validated_dict_values)
-
-    return namedtuple_validator
-
-
-def make_typeddict_validator(
-    typeddict_cls: Type['TypedDict'], config: Type['BaseConfig']  # type: ignore[valid-type]
-) -> Callable[[Any], Dict[str, Any]]:
-    from .annotated_types import create_model_from_typeddict
-
-    TypedDictModel = create_model_from_typeddict(
-        typeddict_cls,
-        __config__=config,
-        __module__=typeddict_cls.__module__,
-    )
-    typeddict_cls.__pydantic_model__ = TypedDictModel  # type: ignore[attr-defined]
-
-    def typeddict_validator(values: 'TypedDict') -> Dict[str, Any]:  # type: ignore[valid-type]
-        return TypedDictModel.parse_obj(values).dict(exclude_unset=True)
-
-    return typeddict_validator
-
-
-class IfConfig:
-    def __init__(self, validator: AnyCallable, *config_attr_names: str, ignored_value: Any = False) -> None:
-        self.validator = validator
-        self.config_attr_names = config_attr_names
-        self.ignored_value = ignored_value
-
-    def check(self, config: Type['BaseConfig']) -> bool:
-        return any(getattr(config, name) not in {None, self.ignored_value} for name in self.config_attr_names)
-
-
-# order is important here, for example: bool is a subclass of int so has to come first, datetime before date same,
-# IPv4Interface before IPv4Address, etc
-_VALIDATORS: List[Tuple[Type[Any], List[Any]]] = [
-    (IntEnum, [int_validator, enum_member_validator]),
-    (Enum, [enum_member_validator]),
-    (
-        str,
-        [
-            str_validator,
-            IfConfig(anystr_strip_whitespace, 'anystr_strip_whitespace'),
-            IfConfig(anystr_upper, 'anystr_upper'),
-            IfConfig(anystr_lower, 'anystr_lower'),
-            IfConfig(anystr_length_validator, 'min_anystr_length', 'max_anystr_length'),
-        ],
-    ),
-    (
-        bytes,
-        [
-            bytes_validator,
-            IfConfig(anystr_strip_whitespace, 'anystr_strip_whitespace'),
-            IfConfig(anystr_upper, 'anystr_upper'),
-            IfConfig(anystr_lower, 'anystr_lower'),
-            IfConfig(anystr_length_validator, 'min_anystr_length', 'max_anystr_length'),
-        ],
-    ),
-    (bool, [bool_validator]),
-    (int, [int_validator]),
-    (float, [float_validator, IfConfig(float_finite_validator, 'allow_inf_nan', ignored_value=True)]),
-    (Path, [path_validator]),
-    (datetime, [parse_datetime]),
-    (date, [parse_date]),
-    (time, [parse_time]),
-    (timedelta, [parse_duration]),
-    (OrderedDict, [ordered_dict_validator]),
-    (dict, [dict_validator]),
-    (list, [list_validator]),
-    (tuple, [tuple_validator]),
-    (set, [set_validator]),
-    (frozenset, [frozenset_validator]),
-    (deque, [deque_validator]),
-    (UUID, [uuid_validator]),
-    (Decimal, [decimal_validator]),
-    (IPv4Interface, [ip_v4_interface_validator]),
-    (IPv6Interface, [ip_v6_interface_validator]),
-    (IPv4Address, [ip_v4_address_validator]),
-    (IPv6Address, [ip_v6_address_validator]),
-    (IPv4Network, [ip_v4_network_validator]),
-    (IPv6Network, [ip_v6_network_validator]),
-]
-
-
-def find_validators(  # noqa: C901 (ignore complexity)
-    type_: Type[Any], config: Type['BaseConfig']
-) -> Generator[AnyCallable, None, None]:
-    from .dataclasses import is_builtin_dataclass, make_dataclass_validator
-
-    if type_ is Any or type_ is object:
-        return
-    type_type = type_.__class__
-    if type_type == ForwardRef or type_type == TypeVar:
-        return
-
-    if is_none_type(type_):
-        yield none_validator
-        return
-    if type_ is Pattern or type_ is re.Pattern:
-        yield pattern_validator
-        return
-    if type_ is Hashable or type_ is CollectionsHashable:
-        yield hashable_validator
-        return
-    if is_callable_type(type_):
-        yield callable_validator
-        return
-    if is_literal_type(type_):
-        yield make_literal_validator(type_)
-        return
-    if is_builtin_dataclass(type_):
-        yield from make_dataclass_validator(type_, config)
-        return
-    if type_ is Enum:
-        yield enum_validator
-        return
-    if type_ is IntEnum:
-        yield int_enum_validator
-        return
-    if is_namedtuple(type_):
-        yield tuple_validator
-        yield make_namedtuple_validator(type_, config)
-        return
-    if is_typeddict(type_):
-        yield make_typeddict_validator(type_, config)
-        return
-
-    class_ = get_class(type_)
-    if class_ is not None:
-        if class_ is not Any and isinstance(class_, type):
-            yield make_class_validator(class_)
-        else:
-            yield any_class_validator
-        return
-
-    for val_type, validators in _VALIDATORS:
-        try:
-            if issubclass(type_, val_type):
-                for v in validators:
-                    if isinstance(v, IfConfig):
-                        if v.check(config):
-                            yield v.validator
-                    else:
-                        yield v
-                return
-        except TypeError:
-            raise RuntimeError(f'error checking inheritance of {type_!r} (type: {display_as_type(type_)})')
-
-    if config.arbitrary_types_allowed:
-        yield make_arbitrary_type_validator(type_)
-    else:
-        raise RuntimeError(f'no validator found for {type_}, see `arbitrary_types_allowed` in Config')
diff --git a/lib/pydantic/v1/version.py b/lib/pydantic/v1/version.py
deleted file mode 100644
index ec982ba7..00000000
--- a/lib/pydantic/v1/version.py
+++ /dev/null
@@ -1,38 +0,0 @@
-__all__ = 'compiled', 'VERSION', 'version_info'
-
-VERSION = '1.10.14'
-
-try:
-    import cython  # type: ignore
-except ImportError:
-    compiled: bool = False
-else:  # pragma: no cover
-    try:
-        compiled = cython.compiled
-    except AttributeError:
-        compiled = False
-
-
-def version_info() -> str:
-    import platform
-    import sys
-    from importlib import import_module
-    from pathlib import Path
-
-    optional_deps = []
-    for p in ('devtools', 'dotenv', 'email-validator', 'typing-extensions'):
-        try:
-            import_module(p.replace('-', '_'))
-        except ImportError:
-            continue
-        optional_deps.append(p)
-
-    info = {
-        'pydantic version': VERSION,
-        'pydantic compiled': compiled,
-        'install path': Path(__file__).resolve().parent,
-        'python version': sys.version,
-        'platform': platform.platform(),
-        'optional deps. installed': optional_deps,
-    }
-    return '\n'.join('{:>30} {}'.format(k + ':', str(v).replace('\n', ' ')) for k, v in info.items())
diff --git a/lib/pydantic/validate_call_decorator.py b/lib/pydantic/validate_call_decorator.py
deleted file mode 100644
index b95fa3b6..00000000
--- a/lib/pydantic/validate_call_decorator.py
+++ /dev/null
@@ -1,67 +0,0 @@
-"""Decorator for validating function calls."""
-from __future__ import annotations as _annotations
-
-import functools
-from typing import TYPE_CHECKING, Any, Callable, TypeVar, overload
-
-from ._internal import _validate_call
-
-__all__ = ('validate_call',)
-
-if TYPE_CHECKING:
-    from .config import ConfigDict
-
-    AnyCallableT = TypeVar('AnyCallableT', bound=Callable[..., Any])
-
-
-@overload
-def validate_call(
-    *, config: ConfigDict | None = None, validate_return: bool = False
-) -> Callable[[AnyCallableT], AnyCallableT]:
-    ...
-
-
-@overload
-def validate_call(__func: AnyCallableT) -> AnyCallableT:
-    ...
-
-
-def validate_call(
-    __func: AnyCallableT | None = None,
-    *,
-    config: ConfigDict | None = None,
-    validate_return: bool = False,
-) -> AnyCallableT | Callable[[AnyCallableT], AnyCallableT]:
-    """Usage docs: https://docs.pydantic.dev/2.6/concepts/validation_decorator/
-
-    Returns a decorated wrapper around the function that validates the arguments and, optionally, the return value.
-
-    Usage may be either as a plain decorator `@validate_call` or with arguments `@validate_call(...)`.
-
-    Args:
-        __func: The function to be decorated.
-        config: The configuration dictionary.
-        validate_return: Whether to validate the return value.
-
-    Returns:
-        The decorated function.
-    """
-
-    def validate(function: AnyCallableT) -> AnyCallableT:
-        if isinstance(function, (classmethod, staticmethod)):
-            name = type(function).__name__
-            raise TypeError(f'The `@{name}` decorator should be applied after `@validate_call` (put `@{name}` on top)')
-        validate_call_wrapper = _validate_call.ValidateCallWrapper(function, config, validate_return)
-
-        @functools.wraps(function)
-        def wrapper_function(*args, **kwargs):
-            return validate_call_wrapper(*args, **kwargs)
-
-        wrapper_function.raw_function = function  # type: ignore
-
-        return wrapper_function  # type: ignore
-
-    if __func:
-        return validate(__func)
-    else:
-        return validate
diff --git a/lib/pydantic/validators.py b/lib/pydantic/validators.py
deleted file mode 100644
index 55b0339e..00000000
--- a/lib/pydantic/validators.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""The `validators` module is a backport module from V1."""
-from ._migration import getattr_migration
-
-__getattr__ = getattr_migration(__name__)
diff --git a/lib/pydantic/version.py b/lib/pydantic/version.py
deleted file mode 100644
index 3e233771..00000000
--- a/lib/pydantic/version.py
+++ /dev/null
@@ -1,80 +0,0 @@
-"""The `version` module holds the version information for Pydantic."""
-from __future__ import annotations as _annotations
-
-__all__ = 'VERSION', 'version_info'
-
-VERSION = '2.6.4'
-"""The version of Pydantic."""
-
-
-def version_short() -> str:
-    """Return the `major.minor` part of Pydantic version.
-
-    It returns '2.1' if Pydantic version is '2.1.1'.
-    """
-    return '.'.join(VERSION.split('.')[:2])
-
-
-def version_info() -> str:
-    """Return complete version information for Pydantic and its dependencies."""
-    import importlib.metadata as importlib_metadata
-    import os
-    import platform
-    import sys
-    from pathlib import Path
-
-    import pydantic_core._pydantic_core as pdc
-
-    from ._internal import _git as git
-
-    # get data about packages that are closely related to pydantic, use pydantic or often conflict with pydantic
-    package_names = {
-        'email-validator',
-        'fastapi',
-        'mypy',
-        'pydantic-extra-types',
-        'pydantic-settings',
-        'pyright',
-        'typing_extensions',
-    }
-    related_packages = []
-
-    for dist in importlib_metadata.distributions():
-        name = dist.metadata['Name']
-        if name in package_names:
-            related_packages.append(f'{name}-{dist.version}')
-
-    pydantic_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
-    most_recent_commit = (
-        git.git_revision(pydantic_dir) if git.is_git_repo(pydantic_dir) and git.have_git() else 'unknown'
-    )
-
-    info = {
-        'pydantic version': VERSION,
-        'pydantic-core version': pdc.__version__,
-        'pydantic-core build': getattr(pdc, 'build_info', None) or pdc.build_profile,
-        'install path': Path(__file__).resolve().parent,
-        'python version': sys.version,
-        'platform': platform.platform(),
-        'related packages': ' '.join(related_packages),
-        'commit': most_recent_commit,
-    }
-    return '\n'.join('{:>30} {}'.format(k + ':', str(v).replace('\n', ' ')) for k, v in info.items())
-
-
-def parse_mypy_version(version: str) -> tuple[int, ...]:
-    """Parse mypy string version to tuple of ints.
-
-    This function is included here rather than the mypy plugin file because the mypy plugin file cannot be imported
-    outside a mypy run.
-
-    It parses normal version like `0.930` and dev version
-    like `0.940+dev.04cac4b5d911c4f9529e6ce86a27b44f28846f5d.dirty`.
-
-    Args:
-        version: The mypy version string.
-
-    Returns:
-        A tuple of ints. e.g. (0, 930).
-    """
-    return tuple(map(int, version.partition('+')[0].split('.')))
diff --git a/lib/pydantic/warnings.py b/lib/pydantic/warnings.py
deleted file mode 100644
index aedd4fba..00000000
--- a/lib/pydantic/warnings.py
+++ /dev/null
@@ -1,58 +0,0 @@
-"""Pydantic-specific warnings."""
-from __future__ import annotations as _annotations
-
-from .version import version_short
-
-__all__ = 'PydanticDeprecatedSince20', 'PydanticDeprecationWarning'
-
-
-class PydanticDeprecationWarning(DeprecationWarning):
-    """A Pydantic specific deprecation warning.
-
-    This warning is raised when using deprecated functionality in Pydantic. It provides information on when the
-    deprecation was introduced and the expected version in which the corresponding functionality will be removed.
-
-    Attributes:
-        message: Description of the warning.
-        since: Pydantic version in what the deprecation was introduced.
-        expected_removal: Pydantic version in what the corresponding functionality expected to be removed.
-    """
-
-    message: str
-    since: tuple[int, int]
-    expected_removal: tuple[int, int]
-
-    def __init__(
-        self, message: str, *args: object, since: tuple[int, int], expected_removal: tuple[int, int] | None = None
-    ) -> None:
-        super().__init__(message, *args)
-        self.message = message.rstrip('.')
-        self.since = since
-        self.expected_removal = expected_removal if expected_removal is not None else (since[0] + 1, 0)
-
-    def __str__(self) -> str:
-        message = (
-            f'{self.message}. Deprecated in Pydantic V{self.since[0]}.{self.since[1]}'
-            f' to be removed in V{self.expected_removal[0]}.{self.expected_removal[1]}.'
-        )
-        if self.since == (2, 0):
-            message += f' See Pydantic V2 Migration Guide at https://errors.pydantic.dev/{version_short()}/migration/'
-        return message
-
-
-class PydanticDeprecatedSince20(PydanticDeprecationWarning):
-    """A specific `PydanticDeprecationWarning` subclass defining functionality deprecated since Pydantic 2.0."""
-
-    def __init__(self, message: str, *args: object) -> None:
-        super().__init__(message, *args, since=(2, 0), expected_removal=(3, 0))
-
-
-class PydanticDeprecatedSince26(PydanticDeprecationWarning):
-    """A specific `PydanticDeprecationWarning` subclass defining functionality deprecated since Pydantic 2.6."""
-
-    def __init__(self, message: str, *args: object) -> None:
-        super().__init__(message, *args, since=(2, 0), expected_removal=(3, 0))
-
-
-class GenericBeforeBaseModelWarning(Warning):
-    pass
diff --git a/lib/pydantic_core/__init__.py b/lib/pydantic_core/__init__.py
deleted file mode 100644
index 5b2655c9..00000000
--- a/lib/pydantic_core/__init__.py
+++ /dev/null
@@ -1,139 +0,0 @@
-from __future__ import annotations
-
-import sys as _sys
-from typing import Any as _Any
-
-from ._pydantic_core import (
-    ArgsKwargs,
-    MultiHostUrl,
-    PydanticCustomError,
-    PydanticKnownError,
-    PydanticOmit,
-    PydanticSerializationError,
-    PydanticSerializationUnexpectedValue,
-    PydanticUndefined,
-    PydanticUndefinedType,
-    PydanticUseDefault,
-    SchemaError,
-    SchemaSerializer,
-    SchemaValidator,
-    Some,
-    TzInfo,
-    Url,
-    ValidationError,
-    __version__,
-    from_json,
-    to_json,
-    to_jsonable_python,
-    validate_core_schema,
-)
-from .core_schema import CoreConfig, CoreSchema, CoreSchemaType, ErrorType
-
-if _sys.version_info < (3, 11):
-    from typing_extensions import NotRequired as _NotRequired
-else:
-    from typing import NotRequired as _NotRequired
-
-if _sys.version_info < (3, 9):
-    from typing_extensions import TypedDict as _TypedDict
-else:
-    from typing import TypedDict as _TypedDict
-
-__all__ = [
-    '__version__',
-    'CoreConfig',
-    'CoreSchema',
-    'CoreSchemaType',
-    'SchemaValidator',
-    'SchemaSerializer',
-    'Some',
-    'Url',
-    'MultiHostUrl',
-    'ArgsKwargs',
-    'PydanticUndefined',
-    'PydanticUndefinedType',
-    'SchemaError',
-    'ErrorDetails',
-    'InitErrorDetails',
-    'ValidationError',
-    'PydanticCustomError',
-    'PydanticKnownError',
-    'PydanticOmit',
-    'PydanticUseDefault',
-    'PydanticSerializationError',
-    'PydanticSerializationUnexpectedValue',
-    'TzInfo',
-    'to_json',
-    'from_json',
-    'to_jsonable_python',
-    'validate_core_schema',
-]
-
-
-class ErrorDetails(_TypedDict):
-    type: str
-    """
-    The type of error that occurred, this is an identifier designed for
-    programmatic use that will change rarely or never.
-
-    `type` is unique for each error message, and can hence be used as an identifier to build custom error messages.
-    """
-    loc: tuple[int | str, ...]
-    """Tuple of strings and ints identifying where in the schema the error occurred."""
-    msg: str
-    """A human readable error message."""
-    input: _Any
-    """The input data at this `loc` that caused the error."""
-    ctx: _NotRequired[dict[str, _Any]]
-    """
-    Values which are required to render the error message, and could hence be useful in rendering custom error messages.
-    Also useful for passing custom error data forward.
-    """
-
-
-class InitErrorDetails(_TypedDict):
-    type: str | PydanticCustomError
-    """The type of error that occurred, this should a "slug" identifier that changes rarely or never."""
-    loc: _NotRequired[tuple[int | str, ...]]
-    """Tuple of strings and ints identifying where in the schema the error occurred."""
-    input: _Any
-    """The input data at this `loc` that caused the error."""
-    ctx: _NotRequired[dict[str, _Any]]
-    """
-    Values which are required to render the error message, and could hence be useful in rendering custom error messages.
-    Also useful for passing custom error data forward.
-    """
-
-
-class ErrorTypeInfo(_TypedDict):
-    """
-    Gives information about errors.
-    """
-
-    type: ErrorType
-    """The type of error that occurred, this should a "slug" identifier that changes rarely or never."""
-    message_template_python: str
-    """String template to render a human readable error message from using context, when the input is Python."""
-    example_message_python: str
-    """Example of a human readable error message, when the input is Python."""
-    message_template_json: _NotRequired[str]
-    """String template to render a human readable error message from using context, when the input is JSON data."""
-    example_message_json: _NotRequired[str]
-    """Example of a human readable error message, when the input is JSON data."""
-    example_context: dict[str, _Any] | None
-    """Example of context values."""
-
-
-class MultiHostHost(_TypedDict):
-    """
-    A host part of a multi-host URL.
-    """
-
-    username: str | None
-    """The username part of this host, or `None`."""
-    password: str | None
-    """The password part of this host, or `None`."""
-    host: str | None
-    """The host part of this host, or `None`."""
-    port: int | None
-    """The port part of this host, or `None`."""
diff --git a/lib/pydantic_core/_pydantic_core.pyi b/lib/pydantic_core/_pydantic_core.pyi
deleted file mode 100644
index a7b727f8..00000000
--- a/lib/pydantic_core/_pydantic_core.pyi
+++ /dev/null
@@ -1,882 +0,0 @@
-from __future__ import annotations
-
-import datetime
-import sys
-from typing import Any, Callable, Generic, Optional, Type, TypeVar
-
-from pydantic_core import ErrorDetails, ErrorTypeInfo, InitErrorDetails, MultiHostHost
-from pydantic_core.core_schema import CoreConfig, CoreSchema, ErrorType
-
-if sys.version_info < (3, 8):
-    from typing_extensions import final
-else:
-    from typing import final
-
-if sys.version_info < (3, 11):
-    from typing_extensions import Literal, LiteralString, Self, TypeAlias
-else:
-    from typing import Literal, LiteralString, Self, TypeAlias
-
-from _typeshed import SupportsAllComparisons
-
-__all__ = [
-    '__version__',
-    'build_profile',
-    'build_info',
-    '_recursion_limit',
-    'ArgsKwargs',
-    'SchemaValidator',
-    'SchemaSerializer',
-    'Url',
-    'MultiHostUrl',
-    'SchemaError',
-    'ValidationError',
-    'PydanticCustomError',
-    'PydanticKnownError',
-    'PydanticOmit',
-    'PydanticUseDefault',
-    'PydanticSerializationError',
-    'PydanticSerializationUnexpectedValue',
-    'PydanticUndefined',
-    'PydanticUndefinedType',
-    'Some',
-    'to_json',
-    'from_json',
-    'to_jsonable_python',
-    'list_all_errors',
-    'TzInfo',
-    'validate_core_schema',
-]
-__version__: str
-build_profile: str
-build_info: str
-_recursion_limit: int
-
-_T = TypeVar('_T', default=Any, covariant=True)
-
-_StringInput: TypeAlias = 'dict[str, _StringInput]'
-
-@final
-class Some(Generic[_T]):
-    """
-    Similar to Rust's [`Option::Some`](https://doc.rust-lang.org/std/option/enum.Option.html) type, this
-    identifies a value as being present, and provides a way to access it.
-
-    Generally used in a union with `None` to different between "some value which could be None" and no value.
-    """
-
-    __match_args__ = ('value',)
-
-    @property
-    def value(self) -> _T:
-        """
-        Returns the value wrapped by `Some`.
-        """
-    @classmethod
-    def __class_getitem__(cls, __item: Any) -> Type[Self]: ...
-
-@final
-class SchemaValidator:
-    """
-    `SchemaValidator` is the Python wrapper for `pydantic-core`'s Rust validation logic, internally it owns one
-    `CombinedValidator` which may in turn own more `CombinedValidator`s which make up the full schema validator.
-    """
-
-    def __new__(cls, schema: CoreSchema, config: CoreConfig | None = None) -> Self:
-        """
-        Create a new SchemaValidator.
-
-        Arguments:
-            schema: The [`CoreSchema`][pydantic_core.core_schema.CoreSchema] to use for validation.
-            config: Optionally a [`CoreConfig`][pydantic_core.core_schema.CoreConfig] to configure validation.
-        """
-    @property
-    def title(self) -> str:
-        """
-        The title of the schema, as used in the heading of [`ValidationError.__str__()`][pydantic_core.ValidationError].
-        """
-    def validate_python(
-        self,
-        input: Any,
-        *,
-        strict: bool | None = None,
-        from_attributes: bool | None = None,
-        context: 'dict[str, Any] | None' = None,
-        self_instance: Any | None = None,
-    ) -> Any:
-        """
-        Validate a Python object against the schema and return the validated object.
-
-        Arguments:
-            input: The Python object to validate.
-            strict: Whether to validate the object in strict mode.
-                If `None`, the value of [`CoreConfig.strict`][pydantic_core.core_schema.CoreConfig] is used.
-            from_attributes: Whether to validate objects as inputs to models by extracting attributes.
-                If `None`, the value of [`CoreConfig.from_attributes`][pydantic_core.core_schema.CoreConfig] is used.
-            context: The context to use for validation, this is passed to functional validators as
-                [`info.context`][pydantic_core.core_schema.ValidationInfo.context].
-            self_instance: An instance of a model set attributes on from validation, this is used when running
-                validation from the `__init__` method of a model.
-
-        Raises:
-            ValidationError: If validation fails.
-            Exception: Other error types maybe raised if internal errors occur.
-
-        Returns:
-            The validated object.
-        """
-    def isinstance_python(
-        self,
-        input: Any,
-        *,
-        strict: bool | None = None,
-        from_attributes: bool | None = None,
-        context: 'dict[str, Any] | None' = None,
-        self_instance: Any | None = None,
-    ) -> bool:
-        """
-        Similar to [`validate_python()`][pydantic_core.SchemaValidator.validate_python] but returns a boolean.
-
-        Arguments match `validate_python()`. This method will not raise `ValidationError`s but will raise internal
-        errors.
-
-        Returns:
-            `True` if validation succeeds, `False` if validation fails.
-        """
-    def validate_json(
-        self,
-        input: str | bytes | bytearray,
-        *,
-        strict: bool | None = None,
-        context: 'dict[str, Any] | None' = None,
-        self_instance: Any | None = None,
-    ) -> Any:
-        """
-        Validate JSON data directly against the schema and return the validated Python object.
-
-        This method should be significantly faster than `validate_python(json.loads(json_data))` as it avoids the
-        need to create intermediate Python objects
-
-        It also handles constructing the correct Python type even in strict mode, where
-        `validate_python(json.loads(json_data))` would fail validation.
-
-        Arguments:
-            input: The JSON data to validate.
-            strict: Whether to validate the object in strict mode.
-                If `None`, the value of [`CoreConfig.strict`][pydantic_core.core_schema.CoreConfig] is used.
-            context: The context to use for validation, this is passed to functional validators as
-                [`info.context`][pydantic_core.core_schema.ValidationInfo.context].
-            self_instance: An instance of a model set attributes on from validation.
-
-        Raises:
-            ValidationError: If validation fails or if the JSON data is invalid.
-            Exception: Other error types maybe raised if internal errors occur.
-
-        Returns:
-            The validated Python object.
-        """
-    def validate_strings(
-        self, input: _StringInput, *, strict: bool | None = None, context: 'dict[str, Any] | None' = None
-    ) -> Any:
-        """
-        Validate a string against the schema and return the validated Python object.
-
-        This is similar to `validate_json` but applies to scenarios where the input will be a string but not
-        JSON data, e.g. URL fragments, query parameters, etc.
-
-        Arguments:
-            input: The input as a string, or bytes/bytearray if `strict=False`.
-            strict: Whether to validate the object in strict mode.
-                If `None`, the value of [`CoreConfig.strict`][pydantic_core.core_schema.CoreConfig] is used.
-            context: The context to use for validation, this is passed to functional validators as
-                [`info.context`][pydantic_core.core_schema.ValidationInfo.context].
-
-        Raises:
-            ValidationError: If validation fails or if the JSON data is invalid.
-            Exception: Other error types maybe raised if internal errors occur.
-
-        Returns:
-            The validated Python object.
-        """
-    def validate_assignment(
-        self,
-        obj: Any,
-        field_name: str,
-        field_value: Any,
-        *,
-        strict: bool | None = None,
-        from_attributes: bool | None = None,
-        context: 'dict[str, Any] | None' = None,
-    ) -> dict[str, Any] | tuple[dict[str, Any], dict[str, Any] | None, set[str]]:
-        """
-        Validate an assignment to a field on a model.
-
-        Arguments:
-            obj: The model instance being assigned to.
-            field_name: The name of the field to validate assignment for.
-            field_value: The value to assign to the field.
-            strict: Whether to validate the object in strict mode.
-                If `None`, the value of [`CoreConfig.strict`][pydantic_core.core_schema.CoreConfig] is used.
-            from_attributes: Whether to validate objects as inputs to models by extracting attributes.
-                If `None`, the value of [`CoreConfig.from_attributes`][pydantic_core.core_schema.CoreConfig] is used.
-            context: The context to use for validation, this is passed to functional validators as
-                [`info.context`][pydantic_core.core_schema.ValidationInfo.context].
-
-        Raises:
-            ValidationError: If validation fails.
-            Exception: Other error types maybe raised if internal errors occur.
-
-        Returns:
-            Either the model dict or a tuple of `(model_data, model_extra, fields_set)`
-        """
-    def get_default_value(self, *, strict: bool | None = None, context: Any = None) -> Some | None:
-        """
-        Get the default value for the schema, including running default value validation.
-
-        Arguments:
-            strict: Whether to validate the default value in strict mode.
-                If `None`, the value of [`CoreConfig.strict`][pydantic_core.core_schema.CoreConfig] is used.
-            context: The context to use for validation, this is passed to functional validators as
-                [`info.context`][pydantic_core.core_schema.ValidationInfo.context].
-
-        Raises:
-            ValidationError: If validation fails.
-            Exception: Other error types maybe raised if internal errors occur.
-
-        Returns:
-            `None` if the schema has no default value, otherwise a [`Some`][pydantic_core.Some] containing the default.
-        """
-
-_IncEx: TypeAlias = set[int] | set[str] | dict[int, _IncEx] | dict[str, _IncEx] | None
-
-@final
-class SchemaSerializer:
-    """
-    `SchemaSerializer` is the Python wrapper for `pydantic-core`'s Rust serialization logic, internally it owns one
-    `CombinedSerializer` which may in turn own more `CombinedSerializer`s which make up the full schema serializer.
-    """
-
-    def __new__(cls, schema: CoreSchema, config: CoreConfig | None = None) -> Self:
-        """
-        Create a new SchemaSerializer.
-
-        Arguments:
-            schema: The [`CoreSchema`][pydantic_core.core_schema.CoreSchema] to use for serialization.
-            config: Optionally a [`CoreConfig`][pydantic_core.core_schema.CoreConfig] to to configure serialization.
-        """
-    def to_python(
-        self,
-        value: Any,
-        *,
-        mode: str | None = None,
-        include: _IncEx = None,
-        exclude: _IncEx = None,
-        by_alias: bool = True,
-        exclude_unset: bool = False,
-        exclude_defaults: bool = False,
-        exclude_none: bool = False,
-        round_trip: bool = False,
-        warnings: bool = True,
-        fallback: Callable[[Any], Any] | None = None,
-    ) -> Any:
-        """
-        Serialize/marshal a Python object to a Python object including transforming and filtering data.
-
-        Arguments:
-            value: The Python object to serialize.
-            mode: The serialization mode to use, either `'python'` or `'json'`, defaults to `'python'`. In JSON mode,
-                all values are converted to JSON compatible types, e.g. `None`, `int`, `float`, `str`, `list`, `dict`.
-            include: A set of fields to include, if `None` all fields are included.
-            exclude: A set of fields to exclude, if `None` no fields are excluded.
-            by_alias: Whether to use the alias names of fields.
-            exclude_unset: Whether to exclude fields that are not set,
-                e.g. are not included in `__pydantic_fields_set__`.
-            exclude_defaults: Whether to exclude fields that are equal to their default value.
-            exclude_none: Whether to exclude fields that have a value of `None`.
-            round_trip: Whether to enable serialization and validation round-trip support.
-            warnings: Whether to log warnings when invalid fields are encountered.
-            fallback: A function to call when an unknown value is encountered,
-                if `None` a [`PydanticSerializationError`][pydantic_core.PydanticSerializationError] error is raised.
-
-        Raises:
-            PydanticSerializationError: If serialization fails and no `fallback` function is provided.
-
-        Returns:
-            The serialized Python object.
-        """
-    def to_json(
-        self,
-        value: Any,
-        *,
-        indent: int | None = None,
-        include: _IncEx = None,
-        exclude: _IncEx = None,
-        by_alias: bool = True,
-        exclude_unset: bool = False,
-        exclude_defaults: bool = False,
-        exclude_none: bool = False,
-        round_trip: bool = False,
-        warnings: bool = True,
-        fallback: Callable[[Any], Any] | None = None,
-    ) -> bytes:
-        """
-        Serialize a Python object to JSON including transforming and filtering data.
-
-        Arguments:
-            value: The Python object to serialize.
-            indent: If `None`, the JSON will be compact, otherwise it will be pretty-printed with the indent provided.
-            include: A set of fields to include, if `None` all fields are included.
-            exclude: A set of fields to exclude, if `None` no fields are excluded.
-            by_alias: Whether to use the alias names of fields.
-            exclude_unset: Whether to exclude fields that are not set,
-                e.g. are not included in `__pydantic_fields_set__`.
-            exclude_defaults: Whether to exclude fields that are equal to their default value.
-            exclude_none: Whether to exclude fields that have a value of `None`.
-            round_trip: Whether to enable serialization and validation round-trip support.
-            warnings: Whether to log warnings when invalid fields are encountered.
-            fallback: A function to call when an unknown value is encountered,
-                if `None` a [`PydanticSerializationError`][pydantic_core.PydanticSerializationError] error is raised.
-
-        Raises:
-            PydanticSerializationError: If serialization fails and no `fallback` function is provided.
-
-        Returns:
-           JSON bytes.
-        """
-
-def to_json(
-    value: Any,
-    *,
-    indent: int | None = None,
-    include: _IncEx = None,
-    exclude: _IncEx = None,
-    by_alias: bool = True,
-    exclude_none: bool = False,
-    round_trip: bool = False,
-    timedelta_mode: Literal['iso8601', 'float'] = 'iso8601',
-    bytes_mode: Literal['utf8', 'base64'] = 'utf8',
-    inf_nan_mode: Literal['null', 'constants'] = 'constants',
-    serialize_unknown: bool = False,
-    fallback: Callable[[Any], Any] | None = None,
-) -> bytes:
-    """
-    Serialize a Python object to JSON including transforming and filtering data.
-
-    This is effectively a standalone version of [`SchemaSerializer.to_json`][pydantic_core.SchemaSerializer.to_json].
-
-    Arguments:
-        value: The Python object to serialize.
-        indent: If `None`, the JSON will be compact, otherwise it will be pretty-printed with the indent provided.
-        include: A set of fields to include, if `None` all fields are included.
-        exclude: A set of fields to exclude, if `None` no fields are excluded.
-        by_alias: Whether to use the alias names of fields.
-        exclude_none: Whether to exclude fields that have a value of `None`.
-        round_trip: Whether to enable serialization and validation round-trip support.
-        timedelta_mode: How to serialize `timedelta` objects, either `'iso8601'` or `'float'`.
-        bytes_mode: How to serialize `bytes` objects, either `'utf8'` or `'base64'`.
-        inf_nan_mode: How to serialize `Infinity`, `-Infinity` and `NaN` values, either `'null'` or `'constants'`.
-        serialize_unknown: Attempt to serialize unknown types, `str(value)` will be used, if that fails
-            `"<Unserializable {value_type} object>"` will be used.
-        fallback: A function to call when an unknown value is encountered,
-            if `None` a [`PydanticSerializationError`][pydantic_core.PydanticSerializationError] error is raised.
-
-    Raises:
-        PydanticSerializationError: If serialization fails and no `fallback` function is provided.
-
-    Returns:
-       JSON bytes.
-    """
-
-def from_json(data: str | bytes | bytearray, *, allow_inf_nan: bool = True, cache_strings: bool = True) -> Any:
-    """
-    Deserialize JSON data to a Python object.
-
-    This is effectively a faster version of `json.loads()`.
-
-    Arguments:
-        data: The JSON data to deserialize.
-        allow_inf_nan: Whether to allow `Infinity`, `-Infinity` and `NaN` values as `json.loads()` does by default.
-        cache_strings: Whether to cache strings to avoid constructing new Python objects,
-            this should have a significant impact on performance while increasing memory usage slightly.
-
-    Raises:
-        ValueError: If deserialization fails.
-
-    Returns:
-        The deserialized Python object.
-    """
-
-def to_jsonable_python(
-    value: Any,
-    *,
-    include: _IncEx = None,
-    exclude: _IncEx = None,
-    by_alias: bool = True,
-    exclude_none: bool = False,
-    round_trip: bool = False,
-    timedelta_mode: Literal['iso8601', 'float'] = 'iso8601',
-    bytes_mode: Literal['utf8', 'base64'] = 'utf8',
-    inf_nan_mode: Literal['null', 'constants'] = 'constants',
-    serialize_unknown: bool = False,
-    fallback: Callable[[Any], Any] | None = None,
-) -> Any:
-    """
-    Serialize/marshal a Python object to a JSON-serializable Python object including transforming and filtering data.
-
-    This is effectively a standalone version of
-    [`SchemaSerializer.to_python(mode='json')`][pydantic_core.SchemaSerializer.to_python].
-
-    Args:
-        value: The Python object to serialize.
-        include: A set of fields to include, if `None` all fields are included.
-        exclude: A set of fields to exclude, if `None` no fields are excluded.
-        by_alias: Whether to use the alias names of fields.
-        exclude_none: Whether to exclude fields that have a value of `None`.
-        round_trip: Whether to enable serialization and validation round-trip support.
-        timedelta_mode: How to serialize `timedelta` objects, either `'iso8601'` or `'float'`.
-        bytes_mode: How to serialize `bytes` objects, either `'utf8'` or `'base64'`.
-        inf_nan_mode: How to serialize `Infinity`, `-Infinity` and `NaN` values, either `'null'` or `'constants'`.
-        serialize_unknown: Attempt to serialize unknown types, `str(value)` will be used, if that fails
-            `"<Unserializable {value_type} object>"` will be used.
-        fallback: A function to call when an unknown value is encountered,
-            if `None` a [`PydanticSerializationError`][pydantic_core.PydanticSerializationError] error is raised.
-
-    Raises:
-        PydanticSerializationError: If serialization fails and no `fallback` function is provided.
-
-    Returns:
-        The serialized Python object.
-    """
-
-class Url(SupportsAllComparisons):
-    """
-    A URL type, internal logic uses the [url rust crate](https://docs.rs/url/latest/url/) originally developed
-    by Mozilla.
-    """
-
-    def __new__(cls, url: str) -> Self:
-        """
-        Create a new `Url` instance.
-
-        Args:
-            url: String representation of a URL.
-
-        Returns:
-            A new `Url` instance.
-
-        Raises:
-            ValidationError: If the URL is invalid.
-        """
-    @property
-    def scheme(self) -> str:
-        """
-        The scheme part of the URL.
-
-        e.g. `https` in `https://user:pass@host:port/path?query#fragment`
-        """
-    @property
-    def username(self) -> str | None:
-        """
-        The username part of the URL, or `None`.
-
-        e.g. `user` in `https://user:pass@host:port/path?query#fragment`
-        """
-    @property
-    def password(self) -> str | None:
-        """
-        The password part of the URL, or `None`.
-
-        e.g. `pass` in `https://user:pass@host:port/path?query#fragment`
-        """
-    @property
-    def host(self) -> str | None:
-        """
-        The host part of the URL, or `None`.
-
-        If the URL must be punycode encoded, this is the encoded host, e.g if the input URL is `https://£££.com`,
-        `host` will be `xn--9aaa.com`
-        """
-    def unicode_host(self) -> str | None:
-        """
-        The host part of the URL as a unicode string, or `None`.
-
-        e.g. `host` in `https://user:pass@host:port/path?query#fragment`
-
-        If the URL must be punycode encoded, this is the decoded host, e.g if the input URL is `https://£££.com`,
-        `unicode_host()` will be `£££.com`
-        """
-    @property
-    def port(self) -> int | None:
-        """
-        The port part of the URL, or `None`.
-
-        e.g. `port` in `https://user:pass@host:port/path?query#fragment`
-        """
-    @property
-    def path(self) -> str | None:
-        """
-        The path part of the URL, or `None`.
-
-        e.g. `/path` in `https://user:pass@host:port/path?query#fragment`
-        """
-    @property
-    def query(self) -> str | None:
-        """
-        The query part of the URL, or `None`.
-
-        e.g. `query` in `https://user:pass@host:port/path?query#fragment`
-        """
-    def query_params(self) -> list[tuple[str, str]]:
-        """
-        The query part of the URL as a list of key-value pairs.
-
-        e.g. `[('foo', 'bar')]` in `https://user:pass@host:port/path?foo=bar#fragment`
-        """
-    @property
-    def fragment(self) -> str | None:
-        """
-        The fragment part of the URL, or `None`.
-
-        e.g. `fragment` in `https://user:pass@host:port/path?query#fragment`
-        """
-    def unicode_string(self) -> str:
-        """
-        The URL as a unicode string, unlike `__str__()` this will not punycode encode the host.
-
-        If the URL must be punycode encoded, this is the decoded string, e.g if the input URL is `https://£££.com`,
-        `unicode_string()` will be `https://£££.com`
-        """
-    def __repr__(self) -> str: ...
-    def __str__(self) -> str:
-        """
-        The URL as a string, this will punycode encode the host if required.
-        """
-    def __deepcopy__(self, memo: dict) -> str: ...
-    @classmethod
-    def build(
-        cls,
-        *,
-        scheme: str,
-        username: Optional[str] = None,
-        password: Optional[str] = None,
-        host: str,
-        port: Optional[int] = None,
-        path: Optional[str] = None,
-        query: Optional[str] = None,
-        fragment: Optional[str] = None,
-    ) -> Self:
-        """
-        Build a new `Url` instance from its component parts.
-
-        Args:
-            scheme: The scheme part of the URL.
-            username: The username part of the URL, or omit for no username.
-            password: The password part of the URL, or omit for no password.
-            host: The host part of the URL.
-            port: The port part of the URL, or omit for no port.
-            path: The path part of the URL, or omit for no path.
-            query: The query part of the URL, or omit for no query.
-            fragment: The fragment part of the URL, or omit for no fragment.
-
-        Returns:
-            An instance of URL
-        """
-
-class MultiHostUrl(SupportsAllComparisons):
-    """
-    A URL type with support for multiple hosts, as used by some databases for DSNs, e.g. `https://foo.com,bar.com/path`.
-
-    Internal URL logic uses the [url rust crate](https://docs.rs/url/latest/url/) originally developed
-    by Mozilla.
-    """
-
-    def __new__(cls, url: str) -> Self:
-        """
-        Create a new `MultiHostUrl` instance.
-
-        Args:
-            url: String representation of a URL.
-
-        Returns:
-            A new `MultiHostUrl` instance.
-
-        Raises:
-            ValidationError: If the URL is invalid.
-        """
-    @property
-    def scheme(self) -> str:
-        """
-        The scheme part of the URL.
-
-        e.g. `https` in `https://foo.com,bar.com/path?query#fragment`
-        """
-    @property
-    def path(self) -> str | None:
-        """
-        The path part of the URL, or `None`.
-
-        e.g. `/path` in `https://foo.com,bar.com/path?query#fragment`
-        """
-    @property
-    def query(self) -> str | None:
-        """
-        The query part of the URL, or `None`.
-
-        e.g. `query` in `https://foo.com,bar.com/path?query#fragment`
-        """
-    def query_params(self) -> list[tuple[str, str]]:
-        """
-        The query part of the URL as a list of key-value pairs.
-
-        e.g. `[('foo', 'bar')]` in `https://foo.com,bar.com/path?query#fragment`
-        """
-    @property
-    def fragment(self) -> str | None:
-        """
-        The fragment part of the URL, or `None`.
-
-        e.g. `fragment` in `https://foo.com,bar.com/path?query#fragment`
-        """
-    def hosts(self) -> list[MultiHostHost]:
-        '''
-
-        The hosts of the `MultiHostUrl` as [`MultiHostHost`][pydantic_core.MultiHostHost] typed dicts.
-
-        ```py
-        from pydantic_core import MultiHostUrl
-
-        mhu = MultiHostUrl('https://foo.com:123,foo:bar@bar.com/path')
-        print(mhu.hosts())
-        """
-        [
-            {'username': None, 'password': None, 'host': 'foo.com', 'port': 123},
-            {'username': 'foo', 'password': 'bar', 'host': 'bar.com', 'port': 443}
-        ]
-        ```
-        Returns:
-            A list of dicts, each representing a host.
-        '''
-    def unicode_string(self) -> str:
-        """
-        The URL as a unicode string, unlike `__str__()` this will not punycode encode the hosts.
-        """
-    def __repr__(self) -> str: ...
-    def __str__(self) -> str:
-        """
-        The URL as a string, this will punycode encode the hosts if required.
-        """
-    def __deepcopy__(self, memo: dict) -> Self: ...
-    @classmethod
-    def build(
-        cls,
-        *,
-        scheme: str,
-        hosts: Optional[list[MultiHostHost]] = None,
-        username: Optional[str] = None,
-        password: Optional[str] = None,
-        host: Optional[str] = None,
-        port: Optional[int] = None,
-        path: Optional[str] = None,
-        query: Optional[str] = None,
-        fragment: Optional[str] = None,
-    ) -> Self:
-        """
-        Build a new `MultiHostUrl` instance from its component parts.
-
-        This method takes either `hosts` - a list of `MultiHostHost` typed dicts, or the individual components
-        `username`, `password`, `host` and `port`.
-
-        Args:
-            scheme: The scheme part of the URL.
-            hosts: Multiple hosts to build the URL from.
-            username: The username part of the URL.
-            password: The password part of the URL.
-            host: The host part of the URL.
-            port: The port part of the URL.
-            path: The path part of the URL.
-            query: The query part of the URL, or omit for no query.
-            fragment: The fragment part of the URL, or omit for no fragment.
-
-        Returns:
-            An instance of `MultiHostUrl`
-        """
-
-@final
-class SchemaError(Exception):
-    """
-    Information about errors that occur while building a [`SchemaValidator`][pydantic_core.SchemaValidator]
-    or [`SchemaSerializer`][pydantic_core.SchemaSerializer].
-    """
-
-    def error_count(self) -> int:
-        """
-        Returns:
-            The number of errors in the schema.
-        """
-    def errors(self) -> list[ErrorDetails]:
-        """
-        Returns:
-            A list of [`ErrorDetails`][pydantic_core.ErrorDetails] for each error in the schema.
-        """
-
-@final
-class ValidationError(ValueError):
-    """
-    `ValidationError` is the exception raised by `pydantic-core` when validation fails, it contains a list of errors
-    which detail why validation failed.
-    """
-
-    @staticmethod
-    def from_exception_data(
-        title: str,
-        line_errors: list[InitErrorDetails],
-        input_type: Literal['python', 'json'] = 'python',
-        hide_input: bool = False,
-    ) -> ValidationError:
-        """
-        Python constructor for a Validation Error.
-
-        The API for constructing validation errors will probably change in the future,
-        hence the static method rather than `__init__`.
-
-        Arguments:
-            title: The title of the error, as used in the heading of `str(validation_error)`
-            line_errors: A list of [`InitErrorDetails`][pydantic_core.InitErrorDetails] which contain information
-                about errors that occurred during validation.
-            input_type: Whether the error is for a Python object or JSON.
-            hide_input: Whether to hide the input value in the error message.
-        """
-    @property
-    def title(self) -> str:
-        """
-        The title of the error, as used in the heading of `str(validation_error)`.
-        """
-    def error_count(self) -> int:
-        """
-        Returns:
-            The number of errors in the validation error.
-        """
-    def errors(
-        self, *, include_url: bool = True, include_context: bool = True, include_input: bool = True
-    ) -> list[ErrorDetails]:
-        """
-        Details about each error in the validation error.
-
-        Args:
-            include_url: Whether to include a URL to documentation on the error each error.
-            include_context: Whether to include the context of each error.
-            include_input: Whether to include the input value of each error.
-
-        Returns:
-            A list of [`ErrorDetails`][pydantic_core.ErrorDetails] for each error in the validation error.
-        """
-    def json(
-        self,
-        *,
-        indent: int | None = None,
-        include_url: bool = True,
-        include_context: bool = True,
-        include_input: bool = True,
-    ) -> str:
-        """
-        Same as [`errors()`][pydantic_core.ValidationError.errors] but returns a JSON string.
-
-        Args:
-            indent: The number of spaces to indent the JSON by, or `None` for no indentation - compact JSON.
-            include_url: Whether to include a URL to documentation on the error each error.
-            include_context: Whether to include the context of each error.
-            include_input: Whether to include the input value of each error.
-
-        Returns:
-            a JSON string.
-        """
-
-    def __repr__(self) -> str:
-        """
-        A string representation of the validation error.
-
-        Whether or not documentation URLs are included in the repr is controlled by the
-        environment variable `PYDANTIC_ERRORS_INCLUDE_URL` being set to `1` or
-        `true`; by default, URLs are shown.
-
-        Due to implementation details, this environment variable can only be set once,
-        before the first validation error is created.
-        """
-
-@final
-class PydanticCustomError(ValueError):
-    def __new__(
-        cls, error_type: LiteralString, message_template: LiteralString, context: dict[str, Any] | None = None
-    ) -> Self: ...
-    @property
-    def context(self) -> dict[str, Any] | None: ...
-    @property
-    def type(self) -> str: ...
-    @property
-    def message_template(self) -> str: ...
-    def message(self) -> str: ...
-
-@final
-class PydanticKnownError(ValueError):
-    def __new__(cls, error_type: ErrorType, context: dict[str, Any] | None = None) -> Self: ...
-    @property
-    def context(self) -> dict[str, Any] | None: ...
-    @property
-    def type(self) -> ErrorType: ...
-    @property
-    def message_template(self) -> str: ...
-    def message(self) -> str: ...
-
-@final
-class PydanticOmit(Exception):
-    def __new__(cls) -> Self: ...
-
-@final
-class PydanticUseDefault(Exception):
-    def __new__(cls) -> Self: ...
-
-@final
-class PydanticSerializationError(ValueError):
-    def __new__(cls, message: str) -> Self: ...
-
-@final
-class PydanticSerializationUnexpectedValue(ValueError):
-    def __new__(cls, message: str | None = None) -> Self: ...
-
-@final
-class ArgsKwargs:
-    def __new__(cls, args: tuple[Any, ...], kwargs: dict[str, Any] | None = None) -> Self: ...
-    @property
-    def args(self) -> tuple[Any, ...]: ...
-    @property
-    def kwargs(self) -> dict[str, Any] | None: ...
-
-@final
-class PydanticUndefinedType:
-    def __copy__(self) -> Self: ...
-    def __deepcopy__(self, memo: Any) -> Self: ...
-
-PydanticUndefined: PydanticUndefinedType
-
-def list_all_errors() -> list[ErrorTypeInfo]:
-    """
-    Get information about all built-in errors.
-
-    Returns:
-        A list of `ErrorTypeInfo` typed dicts.
-    """
-@final
-class TzInfo(datetime.tzinfo):
-    def tzname(self, _dt: datetime.datetime | None) -> str | None: ...
-    def utcoffset(self, _dt: datetime.datetime | None) -> datetime.timedelta: ...
-    def dst(self, _dt: datetime.datetime | None) -> datetime.timedelta: ...
-    def fromutc(self, dt: datetime.datetime) -> datetime.datetime: ...
-    def __deepcopy__(self, _memo: dict[Any, Any]) -> 'TzInfo': ...
-
-def validate_core_schema(schema: CoreSchema, *, strict: bool | None = None) -> CoreSchema:
-    """Validate a CoreSchema
-    This currently uses lax mode for validation (i.e. will coerce strings to dates and such)
-    but may use strict mode in the future.
-    We may also remove this function altogether, do not rely on it being present if you are
-    using pydantic-core directly.
-    """
diff --git a/lib/pydantic_core/core_schema.py b/lib/pydantic_core/core_schema.py
deleted file mode 100644
index 31bf4878..00000000
--- a/lib/pydantic_core/core_schema.py
+++ /dev/null
@@ -1,3980 +0,0 @@
-"""
-This module contains definitions to build schemas which `pydantic_core` can
-validate and serialize.
-"""
-
-from __future__ import annotations as _annotations
-
-import sys
-import warnings
-from collections.abc import Mapping
-from datetime import date, datetime, time, timedelta
-from decimal import Decimal
-from typing import TYPE_CHECKING, Any, Callable, Dict, Hashable, List, Set, Tuple, Type, Union
-
-from typing_extensions import deprecated
-
-if sys.version_info < (3, 12):
-    from typing_extensions import TypedDict
-else:
-    from typing import TypedDict
-
-if sys.version_info < (3, 11):
-    from typing_extensions import Protocol, Required, TypeAlias
-else:
-    from typing import Protocol, Required, TypeAlias
-
-if sys.version_info < (3, 9):
-    from typing_extensions import Literal
-else:
-    from typing import Literal
-
-if TYPE_CHECKING:
-    from pydantic_core import PydanticUndefined
-else:
-    # The initial build of pydantic_core requires PydanticUndefined to generate
-    # the core schema; so we need to conditionally skip it. mypy doesn't like
-    # this at all, hence the TYPE_CHECKING branch above.
-    try:
-        from pydantic_core import PydanticUndefined
-    except ImportError:
-        PydanticUndefined = object()
-
-
-ExtraBehavior = Literal['allow', 'forbid', 'ignore']
-
-
-class CoreConfig(TypedDict, total=False):
-    """
-    Base class for schema configuration options.
-
-    Attributes:
-        title: The name of the configuration.
-        strict: Whether the configuration should strictly adhere to specified rules.
-        extra_fields_behavior: The behavior for handling extra fields.
-        typed_dict_total: Whether the TypedDict should be considered total. Default is `True`.
-        from_attributes: Whether to use attributes for models, dataclasses, and tagged union keys.
-        loc_by_alias: Whether to use the used alias (or first alias for "field required" errors) instead of
-            `field_names` to construct error `loc`s. Default is `True`.
-        revalidate_instances: Whether instances of models and dataclasses should re-validate. Default is 'never'.
-        validate_default: Whether to validate default values during validation. Default is `False`.
-        populate_by_name: Whether an aliased field may be populated by its name as given by the model attribute,
-            as well as the alias. (Replaces 'allow_population_by_field_name' in Pydantic v1.) Default is `False`.
-        str_max_length: The maximum length for string fields.
-        str_min_length: The minimum length for string fields.
-        str_strip_whitespace: Whether to strip whitespace from string fields.
-        str_to_lower: Whether to convert string fields to lowercase.
-        str_to_upper: Whether to convert string fields to uppercase.
-        allow_inf_nan: Whether to allow infinity and NaN values for float fields. Default is `True`.
-        ser_json_timedelta: The serialization option for `timedelta` values. Default is 'iso8601'.
-        ser_json_bytes: The serialization option for `bytes` values. Default is 'utf8'.
-        ser_json_inf_nan: The serialization option for infinity and NaN values
-            in float fields. Default is 'null'.
-        hide_input_in_errors: Whether to hide input data from `ValidationError` representation.
-        validation_error_cause: Whether to add user-python excs to the __cause__ of a ValidationError.
-            Requires exceptiongroup backport pre Python 3.11.
-        coerce_numbers_to_str: Whether to enable coercion of any `Number` type to `str` (not applicable in `strict` mode).
-        regex_engine: The regex engine to use for regex pattern validation. Default is 'rust-regex'. See `StringSchema`.
-    """
-
-    title: str
-    strict: bool
-    # settings related to typed dicts, model fields, dataclass fields
-    extra_fields_behavior: ExtraBehavior
-    typed_dict_total: bool  # default: True
-    # used for models, dataclasses, and tagged union keys
-    from_attributes: bool
-    # whether to use the used alias (or first alias for "field required" errors) instead of field_names
-    # to construct error `loc`s, default True
-    loc_by_alias: bool
-    # whether instances of models and dataclasses (including subclass instances) should re-validate, default 'never'
-    revalidate_instances: Literal['always', 'never', 'subclass-instances']
-    # whether to validate default values during validation, default False
-    validate_default: bool
-    # used on typed-dicts and arguments
-    populate_by_name: bool  # replaces `allow_population_by_field_name` in pydantic v1
-    # fields related to string fields only
-    str_max_length: int
-    str_min_length: int
-    str_strip_whitespace: bool
-    str_to_lower: bool
-    str_to_upper: bool
-    # fields related to float fields only
-    allow_inf_nan: bool  # default: True
-    # the config options are used to customise serialization to JSON
-    ser_json_timedelta: Literal['iso8601', 'float']  # default: 'iso8601'
-    ser_json_bytes: Literal['utf8', 'base64', 'hex']  # default: 'utf8'
-    ser_json_inf_nan: Literal['null', 'constants']  # default: 'null'
-    # used to hide input data from ValidationError repr
-    hide_input_in_errors: bool
-    validation_error_cause: bool  # default: False
-    coerce_numbers_to_str: bool  # default: False
-    regex_engine: Literal['rust-regex', 'python-re']  # default: 'rust-regex'
-
-
-IncExCall: TypeAlias = 'set[int | str] | dict[int | str, IncExCall] | None'
-
-
-class SerializationInfo(Protocol):
-    @property
-    def include(self) -> IncExCall:
-        ...
-
-    @property
-    def exclude(self) -> IncExCall:
-        ...
-
-    @property
-    def mode(self) -> str:
-        ...
-
-    @property
-    def by_alias(self) -> bool:
-        ...
-
-    @property
-    def exclude_unset(self) -> bool:
-        ...
-
-    @property
-    def exclude_defaults(self) -> bool:
-        ...
-
-    @property
-    def exclude_none(self) -> bool:
-        ...
-
-    @property
-    def round_trip(self) -> bool:
-        ...
-
-    def mode_is_json(self) -> bool:
-        ...
-
-    def __str__(self) -> str:
-        ...
-
-    def __repr__(self) -> str:
-        ...
-
-
-class FieldSerializationInfo(SerializationInfo, Protocol):
-    @property
-    def field_name(self) -> str:
-        ...
-
-
-class ValidationInfo(Protocol):
-    """
-    Argument passed to validation functions.
-    """
-
-    @property
-    def context(self) -> Any | None:
-        """Current validation context."""
-        ...
-
-    @property
-    def config(self) -> CoreConfig | None:
-        """The CoreConfig that applies to this validation."""
-        ...
-
-    @property
-    def mode(self) -> Literal['python', 'json']:
-        """The type of input data we are currently validating"""
-        ...
-
-    @property
-    def data(self) -> Dict[str, Any]:
-        """The data being validated for this model."""
-        ...
-
-    @property
-    def field_name(self) -> str | None:
-        """
-        The name of the current field being validated if this validator is
-        attached to a model field.
-        """
-        ...
-
-
-ExpectedSerializationTypes = Literal[
-    'none',
-    'int',
-    'bool',
-    'float',
-    'str',
-    'bytes',
-    'bytearray',
-    'list',
-    'tuple',
-    'set',
-    'frozenset',
-    'generator',
-    'dict',
-    'datetime',
-    'date',
-    'time',
-    'timedelta',
-    'url',
-    'multi-host-url',
-    'json',
-    'uuid',
-]
-
-
-class SimpleSerSchema(TypedDict, total=False):
-    type: Required[ExpectedSerializationTypes]
-
-
-def simple_ser_schema(type: ExpectedSerializationTypes) -> SimpleSerSchema:
-    """
-    Returns a schema for serialization with a custom type.
-
-    Args:
-        type: The type to use for serialization
-    """
-    return SimpleSerSchema(type=type)
-
-
-# (__input_value: Any) -> Any
-GeneralPlainNoInfoSerializerFunction = Callable[[Any], Any]
-# (__input_value: Any, __info: FieldSerializationInfo) -> Any
-GeneralPlainInfoSerializerFunction = Callable[[Any, SerializationInfo], Any]
-# (__model: Any, __input_value: Any) -> Any
-FieldPlainNoInfoSerializerFunction = Callable[[Any, Any], Any]
-# (__model: Any, __input_value: Any, __info: FieldSerializationInfo) -> Any
-FieldPlainInfoSerializerFunction = Callable[[Any, Any, FieldSerializationInfo], Any]
-SerializerFunction = Union[
-    GeneralPlainNoInfoSerializerFunction,
-    GeneralPlainInfoSerializerFunction,
-    FieldPlainNoInfoSerializerFunction,
-    FieldPlainInfoSerializerFunction,
-]
-
-WhenUsed = Literal['always', 'unless-none', 'json', 'json-unless-none']
-"""
-Values have the following meanings:
-
-* `'always'` means always use
-* `'unless-none'` means use unless the value is `None`
-* `'json'` means use when serializing to JSON
-* `'json-unless-none'` means use when serializing to JSON and the value is not `None`
-"""
-
-
-class PlainSerializerFunctionSerSchema(TypedDict, total=False):
-    type: Required[Literal['function-plain']]
-    function: Required[SerializerFunction]
-    is_field_serializer: bool  # default False
-    info_arg: bool  # default False
-    return_schema: CoreSchema  # if omitted, AnySchema is used
-    when_used: WhenUsed  # default: 'always'
-
-
-def plain_serializer_function_ser_schema(
-    function: SerializerFunction,
-    *,
-    is_field_serializer: bool | None = None,
-    info_arg: bool | None = None,
-    return_schema: CoreSchema | None = None,
-    when_used: WhenUsed = 'always',
-) -> PlainSerializerFunctionSerSchema:
-    """
-    Returns a schema for serialization with a function, can be either a "general" or "field" function.
-
-    Args:
-        function: The function to use for serialization
-        is_field_serializer: Whether the serializer is for a field, e.g. takes `model` as the first argument,
-            and `info` includes `field_name`
-        info_arg: Whether the function takes an `__info` argument
-        return_schema: Schema to use for serializing return value
-        when_used: When the function should be called
-    """
-    if when_used == 'always':
-        # just to avoid extra elements in schema, and to use the actual default defined in rust
-        when_used = None  # type: ignore
-    return _dict_not_none(
-        type='function-plain',
-        function=function,
-        is_field_serializer=is_field_serializer,
-        info_arg=info_arg,
-        return_schema=return_schema,
-        when_used=when_used,
-    )
-
-
-class SerializerFunctionWrapHandler(Protocol):  # pragma: no cover
-    def __call__(self, __input_value: Any, __index_key: int | str | None = None) -> Any:
-        ...
-
-
-# (__input_value: Any, __serializer: SerializerFunctionWrapHandler) -> Any
-GeneralWrapNoInfoSerializerFunction = Callable[[Any, SerializerFunctionWrapHandler], Any]
-# (__input_value: Any, __serializer: SerializerFunctionWrapHandler, __info: SerializationInfo) -> Any
-GeneralWrapInfoSerializerFunction = Callable[[Any, SerializerFunctionWrapHandler, SerializationInfo], Any]
-# (__model: Any, __input_value: Any, __serializer: SerializerFunctionWrapHandler) -> Any
-FieldWrapNoInfoSerializerFunction = Callable[[Any, Any, SerializerFunctionWrapHandler], Any]
-# (__model: Any, __input_value: Any, __serializer: SerializerFunctionWrapHandler, __info: FieldSerializationInfo) -> Any
-FieldWrapInfoSerializerFunction = Callable[[Any, Any, SerializerFunctionWrapHandler, FieldSerializationInfo], Any]
-WrapSerializerFunction = Union[
-    GeneralWrapNoInfoSerializerFunction,
-    GeneralWrapInfoSerializerFunction,
-    FieldWrapNoInfoSerializerFunction,
-    FieldWrapInfoSerializerFunction,
-]
-
-
-class WrapSerializerFunctionSerSchema(TypedDict, total=False):
-    type: Required[Literal['function-wrap']]
-    function: Required[WrapSerializerFunction]
-    is_field_serializer: bool  # default False
-    info_arg: bool  # default False
-    schema: CoreSchema  # if omitted, the schema on which this serializer is defined is used
-    return_schema: CoreSchema  # if omitted, AnySchema is used
-    when_used: WhenUsed  # default: 'always'
-
-
-def wrap_serializer_function_ser_schema(
-    function: WrapSerializerFunction,
-    *,
-    is_field_serializer: bool | None = None,
-    info_arg: bool | None = None,
-    schema: CoreSchema | None = None,
-    return_schema: CoreSchema | None = None,
-    when_used: WhenUsed = 'always',
-) -> WrapSerializerFunctionSerSchema:
-    """
-    Returns a schema for serialization with a wrap function, can be either a "general" or "field" function.
-
-    Args:
-        function: The function to use for serialization
-        is_field_serializer: Whether the serializer is for a field, e.g. takes `model` as the first argument,
-            and `info` includes `field_name`
-        info_arg: Whether the function takes an `__info` argument
-        schema: The schema to use for the inner serialization
-        return_schema: Schema to use for serializing return value
-        when_used: When the function should be called
-    """
-    if when_used == 'always':
-        # just to avoid extra elements in schema, and to use the actual default defined in rust
-        when_used = None  # type: ignore
-    return _dict_not_none(
-        type='function-wrap',
-        function=function,
-        is_field_serializer=is_field_serializer,
-        info_arg=info_arg,
-        schema=schema,
-        return_schema=return_schema,
-        when_used=when_used,
-    )
-
-
-class FormatSerSchema(TypedDict, total=False):
-    type: Required[Literal['format']]
-    formatting_string: Required[str]
-    when_used: WhenUsed  # default: 'json-unless-none'
-
-
-def format_ser_schema(formatting_string: str, *, when_used: WhenUsed = 'json-unless-none') -> FormatSerSchema:
-    """
-    Returns a schema for serialization using python's `format` method.
-
-    Args:
-        formatting_string: String defining the format to use
-        when_used: Same meaning as for [general_function_plain_ser_schema], but with a different default
-    """
-    if when_used == 'json-unless-none':
-        # just to avoid extra elements in schema, and to use the actual default defined in rust
-        when_used = None  # type: ignore
-    return _dict_not_none(type='format', formatting_string=formatting_string, when_used=when_used)
-
-
-class ToStringSerSchema(TypedDict, total=False):
-    type: Required[Literal['to-string']]
-    when_used: WhenUsed  # default: 'json-unless-none'
-
-
-def to_string_ser_schema(*, when_used: WhenUsed = 'json-unless-none') -> ToStringSerSchema:
-    """
-    Returns a schema for serialization using python's `str()` / `__str__` method.
-
-    Args:
-        when_used: Same meaning as for [general_function_plain_ser_schema], but with a different default
-    """
-    s = dict(type='to-string')
-    if when_used != 'json-unless-none':
-        # just to avoid extra elements in schema, and to use the actual default defined in rust
-        s['when_used'] = when_used
-    return s  # type: ignore
-
-
-class ModelSerSchema(TypedDict, total=False):
-    type: Required[Literal['model']]
-    cls: Required[Type[Any]]
-    schema: Required[CoreSchema]
-
-
-def model_ser_schema(cls: Type[Any], schema: CoreSchema) -> ModelSerSchema:
-    """
-    Returns a schema for serialization using a model.
-
-    Args:
-        cls: The expected class type, used to generate warnings if the wrong type is passed
-        schema: Internal schema to use to serialize the model dict
-    """
-    return ModelSerSchema(type='model', cls=cls, schema=schema)
-
-
-SerSchema = Union[
-    SimpleSerSchema,
-    PlainSerializerFunctionSerSchema,
-    WrapSerializerFunctionSerSchema,
-    FormatSerSchema,
-    ToStringSerSchema,
-    ModelSerSchema,
-]
-
-
-class ComputedField(TypedDict, total=False):
-    type: Required[Literal['computed-field']]
-    property_name: Required[str]
-    return_schema: Required[CoreSchema]
-    alias: str
-    metadata: Any
-
-
-def computed_field(
-    property_name: str, return_schema: CoreSchema, *, alias: str | None = None, metadata: Any = None
-) -> ComputedField:
-    """
-    ComputedFields are properties of a model or dataclass that are included in serialization.
-
-    Args:
-        property_name: The name of the property on the model or dataclass
-        return_schema: The schema used for the type returned by the computed field
-        alias: The name to use in the serialized output
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-    """
-    return _dict_not_none(
-        type='computed-field', property_name=property_name, return_schema=return_schema, alias=alias, metadata=metadata
-    )
-
-
-class AnySchema(TypedDict, total=False):
-    type: Required[Literal['any']]
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def any_schema(*, ref: str | None = None, metadata: Any = None, serialization: SerSchema | None = None) -> AnySchema:
-    """
-    Returns a schema that matches any value, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.any_schema()
-    v = SchemaValidator(schema)
-    assert v.validate_python(1) == 1
-    ```
-
-    Args:
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(type='any', ref=ref, metadata=metadata, serialization=serialization)
-
-
-class NoneSchema(TypedDict, total=False):
-    type: Required[Literal['none']]
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def none_schema(*, ref: str | None = None, metadata: Any = None, serialization: SerSchema | None = None) -> NoneSchema:
-    """
-    Returns a schema that matches a None value, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.none_schema()
-    v = SchemaValidator(schema)
-    assert v.validate_python(None) is None
-    ```
-
-    Args:
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(type='none', ref=ref, metadata=metadata, serialization=serialization)
-
-
-class BoolSchema(TypedDict, total=False):
-    type: Required[Literal['bool']]
-    strict: bool
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def bool_schema(
-    strict: bool | None = None, ref: str | None = None, metadata: Any = None, serialization: SerSchema | None = None
-) -> BoolSchema:
-    """
-    Returns a schema that matches a bool value, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.bool_schema()
-    v = SchemaValidator(schema)
-    assert v.validate_python('True') is True
-    ```
-
-    Args:
-        strict: Whether the value should be a bool or a value that can be converted to a bool
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(type='bool', strict=strict, ref=ref, metadata=metadata, serialization=serialization)
-
-
-class IntSchema(TypedDict, total=False):
-    type: Required[Literal['int']]
-    multiple_of: int
-    le: int
-    ge: int
-    lt: int
-    gt: int
-    strict: bool
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def int_schema(
-    *,
-    multiple_of: int | None = None,
-    le: int | None = None,
-    ge: int | None = None,
-    lt: int | None = None,
-    gt: int | None = None,
-    strict: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> IntSchema:
-    """
-    Returns a schema that matches a int value, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.int_schema(multiple_of=2, le=6, ge=2)
-    v = SchemaValidator(schema)
-    assert v.validate_python('4') == 4
-    ```
-
-    Args:
-        multiple_of: The value must be a multiple of this number
-        le: The value must be less than or equal to this number
-        ge: The value must be greater than or equal to this number
-        lt: The value must be strictly less than this number
-        gt: The value must be strictly greater than this number
-        strict: Whether the value should be a int or a value that can be converted to a int
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='int',
-        multiple_of=multiple_of,
-        le=le,
-        ge=ge,
-        lt=lt,
-        gt=gt,
-        strict=strict,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class FloatSchema(TypedDict, total=False):
-    type: Required[Literal['float']]
-    allow_inf_nan: bool  # whether 'NaN', '+inf', '-inf' should be forbidden. default: True
-    multiple_of: float
-    le: float
-    ge: float
-    lt: float
-    gt: float
-    strict: bool
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def float_schema(
-    *,
-    allow_inf_nan: bool | None = None,
-    multiple_of: float | None = None,
-    le: float | None = None,
-    ge: float | None = None,
-    lt: float | None = None,
-    gt: float | None = None,
-    strict: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> FloatSchema:
-    """
-    Returns a schema that matches a float value, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.float_schema(le=0.8, ge=0.2)
-    v = SchemaValidator(schema)
-    assert v.validate_python('0.5') == 0.5
-    ```
-
-    Args:
-        allow_inf_nan: Whether to allow inf and nan values
-        multiple_of: The value must be a multiple of this number
-        le: The value must be less than or equal to this number
-        ge: The value must be greater than or equal to this number
-        lt: The value must be strictly less than this number
-        gt: The value must be strictly greater than this number
-        strict: Whether the value should be a float or a value that can be converted to a float
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='float',
-        allow_inf_nan=allow_inf_nan,
-        multiple_of=multiple_of,
-        le=le,
-        ge=ge,
-        lt=lt,
-        gt=gt,
-        strict=strict,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class DecimalSchema(TypedDict, total=False):
-    type: Required[Literal['decimal']]
-    allow_inf_nan: bool  # whether 'NaN', '+inf', '-inf' should be forbidden. default: False
-    multiple_of: Decimal
-    le: Decimal
-    ge: Decimal
-    lt: Decimal
-    gt: Decimal
-    max_digits: int
-    decimal_places: int
-    strict: bool
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def decimal_schema(
-    *,
-    allow_inf_nan: bool = None,
-    multiple_of: Decimal | None = None,
-    le: Decimal | None = None,
-    ge: Decimal | None = None,
-    lt: Decimal | None = None,
-    gt: Decimal | None = None,
-    max_digits: int | None = None,
-    decimal_places: int | None = None,
-    strict: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> DecimalSchema:
-    """
-    Returns a schema that matches a decimal value, e.g.:
-
-    ```py
-    from decimal import Decimal
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.decimal_schema(le=0.8, ge=0.2)
-    v = SchemaValidator(schema)
-    assert v.validate_python('0.5') == Decimal('0.5')
-    ```
-
-    Args:
-        allow_inf_nan: Whether to allow inf and nan values
-        multiple_of: The value must be a multiple of this number
-        le: The value must be less than or equal to this number
-        ge: The value must be greater than or equal to this number
-        lt: The value must be strictly less than this number
-        gt: The value must be strictly greater than this number
-        max_digits: The maximum number of decimal digits allowed
-        decimal_places: The maximum number of decimal places allowed
-        strict: Whether the value should be a float or a value that can be converted to a float
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='decimal',
-        gt=gt,
-        ge=ge,
-        lt=lt,
-        le=le,
-        max_digits=max_digits,
-        decimal_places=decimal_places,
-        multiple_of=multiple_of,
-        allow_inf_nan=allow_inf_nan,
-        strict=strict,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class StringSchema(TypedDict, total=False):
-    type: Required[Literal['str']]
-    pattern: str
-    max_length: int
-    min_length: int
-    strip_whitespace: bool
-    to_lower: bool
-    to_upper: bool
-    regex_engine: Literal['rust-regex', 'python-re']  # default: 'rust-regex'
-    strict: bool
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def str_schema(
-    *,
-    pattern: str | None = None,
-    max_length: int | None = None,
-    min_length: int | None = None,
-    strip_whitespace: bool | None = None,
-    to_lower: bool | None = None,
-    to_upper: bool | None = None,
-    regex_engine: Literal['rust-regex', 'python-re'] | None = None,
-    strict: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> StringSchema:
-    """
-    Returns a schema that matches a string value, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.str_schema(max_length=10, min_length=2)
-    v = SchemaValidator(schema)
-    assert v.validate_python('hello') == 'hello'
-    ```
-
-    Args:
-        pattern: A regex pattern that the value must match
-        max_length: The value must be at most this length
-        min_length: The value must be at least this length
-        strip_whitespace: Whether to strip whitespace from the value
-        to_lower: Whether to convert the value to lowercase
-        to_upper: Whether to convert the value to uppercase
-        regex_engine: The regex engine to use for pattern validation. Default is 'rust-regex'.
-            - `rust-regex` uses the [`regex`](https://docs.rs/regex) Rust
-              crate, which is non-backtracking and therefore more DDoS
-              resistant, but does not support all regex features.
-            - `python-re` use the [`re`](https://docs.python.org/3/library/re.html) module,
-              which supports all regex features, but may be slower.
-        strict: Whether the value should be a string or a value that can be converted to a string
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='str',
-        pattern=pattern,
-        max_length=max_length,
-        min_length=min_length,
-        strip_whitespace=strip_whitespace,
-        to_lower=to_lower,
-        to_upper=to_upper,
-        regex_engine=regex_engine,
-        strict=strict,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class BytesSchema(TypedDict, total=False):
-    type: Required[Literal['bytes']]
-    max_length: int
-    min_length: int
-    strict: bool
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def bytes_schema(
-    *,
-    max_length: int | None = None,
-    min_length: int | None = None,
-    strict: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> BytesSchema:
-    """
-    Returns a schema that matches a bytes value, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.bytes_schema(max_length=10, min_length=2)
-    v = SchemaValidator(schema)
-    assert v.validate_python(b'hello') == b'hello'
-    ```
-
-    Args:
-        max_length: The value must be at most this length
-        min_length: The value must be at least this length
-        strict: Whether the value should be a bytes or a value that can be converted to a bytes
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='bytes',
-        max_length=max_length,
-        min_length=min_length,
-        strict=strict,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class DateSchema(TypedDict, total=False):
-    type: Required[Literal['date']]
-    strict: bool
-    le: date
-    ge: date
-    lt: date
-    gt: date
-    now_op: Literal['past', 'future']
-    # defaults to current local utc offset from `time.localtime().tm_gmtoff`
-    # value is restricted to -86_400 < offset < 86_400 by bounds in generate_self_schema.py
-    now_utc_offset: int
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def date_schema(
-    *,
-    strict: bool | None = None,
-    le: date | None = None,
-    ge: date | None = None,
-    lt: date | None = None,
-    gt: date | None = None,
-    now_op: Literal['past', 'future'] | None = None,
-    now_utc_offset: int | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> DateSchema:
-    """
-    Returns a schema that matches a date value, e.g.:
-
-    ```py
-    from datetime import date
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.date_schema(le=date(2020, 1, 1), ge=date(2019, 1, 1))
-    v = SchemaValidator(schema)
-    assert v.validate_python(date(2019, 6, 1)) == date(2019, 6, 1)
-    ```
-
-    Args:
-        strict: Whether the value should be a date or a value that can be converted to a date
-        le: The value must be less than or equal to this date
-        ge: The value must be greater than or equal to this date
-        lt: The value must be strictly less than this date
-        gt: The value must be strictly greater than this date
-        now_op: The value must be in the past or future relative to the current date
-        now_utc_offset: The value must be in the past or future relative to the current date with this utc offset
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='date',
-        strict=strict,
-        le=le,
-        ge=ge,
-        lt=lt,
-        gt=gt,
-        now_op=now_op,
-        now_utc_offset=now_utc_offset,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class TimeSchema(TypedDict, total=False):
-    type: Required[Literal['time']]
-    strict: bool
-    le: time
-    ge: time
-    lt: time
-    gt: time
-    tz_constraint: Union[Literal['aware', 'naive'], int]
-    microseconds_precision: Literal['truncate', 'error']
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def time_schema(
-    *,
-    strict: bool | None = None,
-    le: time | None = None,
-    ge: time | None = None,
-    lt: time | None = None,
-    gt: time | None = None,
-    tz_constraint: Literal['aware', 'naive'] | int | None = None,
-    microseconds_precision: Literal['truncate', 'error'] = 'truncate',
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> TimeSchema:
-    """
-    Returns a schema that matches a time value, e.g.:
-
-    ```py
-    from datetime import time
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.time_schema(le=time(12, 0, 0), ge=time(6, 0, 0))
-    v = SchemaValidator(schema)
-    assert v.validate_python(time(9, 0, 0)) == time(9, 0, 0)
-    ```
-
-    Args:
-        strict: Whether the value should be a time or a value that can be converted to a time
-        le: The value must be less than or equal to this time
-        ge: The value must be greater than or equal to this time
-        lt: The value must be strictly less than this time
-        gt: The value must be strictly greater than this time
-        tz_constraint: The value must be timezone aware or naive, or an int to indicate required tz offset
-        microseconds_precision: The behavior when seconds have more than 6 digits or microseconds is too large
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='time',
-        strict=strict,
-        le=le,
-        ge=ge,
-        lt=lt,
-        gt=gt,
-        tz_constraint=tz_constraint,
-        microseconds_precision=microseconds_precision,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class DatetimeSchema(TypedDict, total=False):
-    type: Required[Literal['datetime']]
-    strict: bool
-    le: datetime
-    ge: datetime
-    lt: datetime
-    gt: datetime
-    now_op: Literal['past', 'future']
-    tz_constraint: Union[Literal['aware', 'naive'], int]
-    # defaults to current local utc offset from `time.localtime().tm_gmtoff`
-    # value is restricted to -86_400 < offset < 86_400 by bounds in generate_self_schema.py
-    now_utc_offset: int
-    microseconds_precision: Literal['truncate', 'error']  # default: 'truncate'
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def datetime_schema(
-    *,
-    strict: bool | None = None,
-    le: datetime | None = None,
-    ge: datetime | None = None,
-    lt: datetime | None = None,
-    gt: datetime | None = None,
-    now_op: Literal['past', 'future'] | None = None,
-    tz_constraint: Literal['aware', 'naive'] | int | None = None,
-    now_utc_offset: int | None = None,
-    microseconds_precision: Literal['truncate', 'error'] = 'truncate',
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> DatetimeSchema:
-    """
-    Returns a schema that matches a datetime value, e.g.:
-
-    ```py
-    from datetime import datetime
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.datetime_schema()
-    v = SchemaValidator(schema)
-    now = datetime.now()
-    assert v.validate_python(str(now)) == now
-    ```
-
-    Args:
-        strict: Whether the value should be a datetime or a value that can be converted to a datetime
-        le: The value must be less than or equal to this datetime
-        ge: The value must be greater than or equal to this datetime
-        lt: The value must be strictly less than this datetime
-        gt: The value must be strictly greater than this datetime
-        now_op: The value must be in the past or future relative to the current datetime
-        tz_constraint: The value must be timezone aware or naive, or an int to indicate required tz offset
-            TODO: use of a tzinfo where offset changes based on the datetime is not yet supported
-        now_utc_offset: The value must be in the past or future relative to the current datetime with this utc offset
-        microseconds_precision: The behavior when seconds have more than 6 digits or microseconds is too large
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='datetime',
-        strict=strict,
-        le=le,
-        ge=ge,
-        lt=lt,
-        gt=gt,
-        now_op=now_op,
-        tz_constraint=tz_constraint,
-        now_utc_offset=now_utc_offset,
-        microseconds_precision=microseconds_precision,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class TimedeltaSchema(TypedDict, total=False):
-    type: Required[Literal['timedelta']]
-    strict: bool
-    le: timedelta
-    ge: timedelta
-    lt: timedelta
-    gt: timedelta
-    microseconds_precision: Literal['truncate', 'error']
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def timedelta_schema(
-    *,
-    strict: bool | None = None,
-    le: timedelta | None = None,
-    ge: timedelta | None = None,
-    lt: timedelta | None = None,
-    gt: timedelta | None = None,
-    microseconds_precision: Literal['truncate', 'error'] = 'truncate',
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> TimedeltaSchema:
-    """
-    Returns a schema that matches a timedelta value, e.g.:
-
-    ```py
-    from datetime import timedelta
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.timedelta_schema(le=timedelta(days=1), ge=timedelta(days=0))
-    v = SchemaValidator(schema)
-    assert v.validate_python(timedelta(hours=12)) == timedelta(hours=12)
-    ```
-
-    Args:
-        strict: Whether the value should be a timedelta or a value that can be converted to a timedelta
-        le: The value must be less than or equal to this timedelta
-        ge: The value must be greater than or equal to this timedelta
-        lt: The value must be strictly less than this timedelta
-        gt: The value must be strictly greater than this timedelta
-        microseconds_precision: The behavior when seconds have more than 6 digits or microseconds is too large
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='timedelta',
-        strict=strict,
-        le=le,
-        ge=ge,
-        lt=lt,
-        gt=gt,
-        microseconds_precision=microseconds_precision,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class LiteralSchema(TypedDict, total=False):
-    type: Required[Literal['literal']]
-    expected: Required[List[Any]]
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def literal_schema(
-    expected: list[Any], *, ref: str | None = None, metadata: Any = None, serialization: SerSchema | None = None
-) -> LiteralSchema:
-    """
-    Returns a schema that matches a literal value, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.literal_schema(['hello', 'world'])
-    v = SchemaValidator(schema)
-    assert v.validate_python('hello') == 'hello'
-    ```
-
-    Args:
-        expected: The value must be one of these values
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(type='literal', expected=expected, ref=ref, metadata=metadata, serialization=serialization)
-
-
-# must match input/parse_json.rs::JsonType::try_from
-JsonType = Literal['null', 'bool', 'int', 'float', 'str', 'list', 'dict']
-
-
-class IsInstanceSchema(TypedDict, total=False):
-    type: Required[Literal['is-instance']]
-    cls: Required[Any]
-    cls_repr: str
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def is_instance_schema(
-    cls: Any,
-    *,
-    cls_repr: str | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> IsInstanceSchema:
-    """
-    Returns a schema that checks if a value is an instance of a class, equivalent to python's `isinstance` method, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    class A:
-        pass
-
-    schema = core_schema.is_instance_schema(cls=A)
-    v = SchemaValidator(schema)
-    v.validate_python(A())
-    ```
-
-    Args:
-        cls: The value must be an instance of this class
-        cls_repr: If provided this string is used in the validator name instead of `repr(cls)`
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='is-instance', cls=cls, cls_repr=cls_repr, ref=ref, metadata=metadata, serialization=serialization
-    )
-
-
-class IsSubclassSchema(TypedDict, total=False):
-    type: Required[Literal['is-subclass']]
-    cls: Required[Type[Any]]
-    cls_repr: str
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def is_subclass_schema(
-    cls: Type[Any],
-    *,
-    cls_repr: str | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> IsInstanceSchema:
-    """
-    Returns a schema that checks if a value is a subtype of a class, equivalent to python's `issubclass` method, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    class A:
-        pass
-
-    class B(A):
-        pass
-
-    schema = core_schema.is_subclass_schema(cls=A)
-    v = SchemaValidator(schema)
-    v.validate_python(B)
-    ```
-
-    Args:
-        cls: The value must be a subclass of this class
-        cls_repr: If provided this string is used in the validator name instead of `repr(cls)`
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='is-subclass', cls=cls, cls_repr=cls_repr, ref=ref, metadata=metadata, serialization=serialization
-    )
-
-
-class CallableSchema(TypedDict, total=False):
-    type: Required[Literal['callable']]
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def callable_schema(
-    *, ref: str | None = None, metadata: Any = None, serialization: SerSchema | None = None
-) -> CallableSchema:
-    """
-    Returns a schema that checks if a value is callable, equivalent to python's `callable` method, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.callable_schema()
-    v = SchemaValidator(schema)
-    v.validate_python(min)
-    ```
-
-    Args:
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(type='callable', ref=ref, metadata=metadata, serialization=serialization)
-
-
-class UuidSchema(TypedDict, total=False):
-    type: Required[Literal['uuid']]
-    version: Literal[1, 3, 4, 5]
-    strict: bool
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def uuid_schema(
-    *,
-    version: Literal[1, 3, 4, 5] | None = None,
-    strict: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> UuidSchema:
-    return _dict_not_none(
-        type='uuid', version=version, strict=strict, ref=ref, metadata=metadata, serialization=serialization
-    )
-
-
-class IncExSeqSerSchema(TypedDict, total=False):
-    type: Required[Literal['include-exclude-sequence']]
-    include: Set[int]
-    exclude: Set[int]
-
-
-def filter_seq_schema(*, include: Set[int] | None = None, exclude: Set[int] | None = None) -> IncExSeqSerSchema:
-    return _dict_not_none(type='include-exclude-sequence', include=include, exclude=exclude)
-
-
-IncExSeqOrElseSerSchema = Union[IncExSeqSerSchema, SerSchema]
-
-
-class ListSchema(TypedDict, total=False):
-    type: Required[Literal['list']]
-    items_schema: CoreSchema
-    min_length: int
-    max_length: int
-    strict: bool
-    ref: str
-    metadata: Any
-    serialization: IncExSeqOrElseSerSchema
-
-
-def list_schema(
-    items_schema: CoreSchema | None = None,
-    *,
-    min_length: int | None = None,
-    max_length: int | None = None,
-    strict: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: IncExSeqOrElseSerSchema | None = None,
-) -> ListSchema:
-    """
-    Returns a schema that matches a list value, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.list_schema(core_schema.int_schema(), min_length=0, max_length=10)
-    v = SchemaValidator(schema)
-    assert v.validate_python(['4']) == [4]
-    ```
-
-    Args:
-        items_schema: The value must be a list of items that match this schema
-        min_length: The value must be a list with at least this many items
-        max_length: The value must be a list with at most this many items
-        strict: The value must be a list with exactly this many items
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='list',
-        items_schema=items_schema,
-        min_length=min_length,
-        max_length=max_length,
-        strict=strict,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-# @deprecated('tuple_positional_schema is deprecated. Use pydantic_core.core_schema.tuple_schema instead.')
-def tuple_positional_schema(
-    items_schema: list[CoreSchema],
-    *,
-    extras_schema: CoreSchema | None = None,
-    strict: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: IncExSeqOrElseSerSchema | None = None,
-) -> TupleSchema:
-    """
-    Returns a schema that matches a tuple of schemas, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.tuple_positional_schema(
-        [core_schema.int_schema(), core_schema.str_schema()]
-    )
-    v = SchemaValidator(schema)
-    assert v.validate_python((1, 'hello')) == (1, 'hello')
-    ```
-
-    Args:
-        items_schema: The value must be a tuple with items that match these schemas
-        extras_schema: The value must be a tuple with items that match this schema
-            This was inspired by JSON schema's `prefixItems` and `items` fields.
-            In python's `typing.Tuple`, you can't specify a type for "extra" items -- they must all be the same type
-            if the length is variable. So this field won't be set from a `typing.Tuple` annotation on a pydantic model.
-        strict: The value must be a tuple with exactly this many items
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    if extras_schema is not None:
-        variadic_item_index = len(items_schema)
-        items_schema = items_schema + [extras_schema]
-    else:
-        variadic_item_index = None
-    return tuple_schema(
-        items_schema=items_schema,
-        variadic_item_index=variadic_item_index,
-        strict=strict,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-# @deprecated('tuple_variable_schema is deprecated. Use pydantic_core.core_schema.tuple_schema instead.')
-def tuple_variable_schema(
-    items_schema: CoreSchema | None = None,
-    *,
-    min_length: int | None = None,
-    max_length: int | None = None,
-    strict: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: IncExSeqOrElseSerSchema | None = None,
-) -> TupleSchema:
-    """
-    Returns a schema that matches a tuple of a given schema, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.tuple_variable_schema(
-        items_schema=core_schema.int_schema(), min_length=0, max_length=10
-    )
-    v = SchemaValidator(schema)
-    assert v.validate_python(('1', 2, 3)) == (1, 2, 3)
-    ```
-
-    Args:
-        items_schema: The value must be a tuple with items that match this schema
-        min_length: The value must be a tuple with at least this many items
-        max_length: The value must be a tuple with at most this many items
-        strict: The value must be a tuple with exactly this many items
-        ref: Optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return tuple_schema(
-        items_schema=[items_schema or any_schema()],
-        variadic_item_index=0,
-        min_length=min_length,
-        max_length=max_length,
-        strict=strict,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class TupleSchema(TypedDict, total=False):
-    type: Required[Literal['tuple']]
-    items_schema: Required[List[CoreSchema]]
-    variadic_item_index: int
-    min_length: int
-    max_length: int
-    strict: bool
-    ref: str
-    metadata: Any
-    serialization: IncExSeqOrElseSerSchema
-
-
-def tuple_schema(
-    items_schema: list[CoreSchema],
-    *,
-    variadic_item_index: int | None = None,
-    min_length: int | None = None,
-    max_length: int | None = None,
-    strict: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: IncExSeqOrElseSerSchema | None = None,
-) -> TupleSchema:
-    """
-    Returns a schema that matches a tuple of schemas, with an optional variadic item, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.tuple_schema(
-        [core_schema.int_schema(), core_schema.str_schema(), core_schema.float_schema()],
-        variadic_item_index=1,
-    )
-    v = SchemaValidator(schema)
-    assert v.validate_python((1, 'hello', 'world', 1.5)) == (1, 'hello', 'world', 1.5)
-    ```
-
-    Args:
-        items_schema: The value must be a tuple with items that match these schemas
-        variadic_item_index: The index of the schema in `items_schema` to be treated as variadic (following PEP 646)
-        min_length: The value must be a tuple with at least this many items
-        max_length: The value must be a tuple with at most this many items
-        strict: The value must be a tuple with exactly this many items
-        ref: Optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='tuple',
-        items_schema=items_schema,
-        variadic_item_index=variadic_item_index,
-        min_length=min_length,
-        max_length=max_length,
-        strict=strict,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class SetSchema(TypedDict, total=False):
-    type: Required[Literal['set']]
-    items_schema: CoreSchema
-    min_length: int
-    max_length: int
-    strict: bool
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def set_schema(
-    items_schema: CoreSchema | None = None,
-    *,
-    min_length: int | None = None,
-    max_length: int | None = None,
-    strict: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> SetSchema:
-    """
-    Returns a schema that matches a set of a given schema, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.set_schema(
-        items_schema=core_schema.int_schema(), min_length=0, max_length=10
-    )
-    v = SchemaValidator(schema)
-    assert v.validate_python({1, '2', 3}) == {1, 2, 3}
-    ```
-
-    Args:
-        items_schema: The value must be a set with items that match this schema
-        min_length: The value must be a set with at least this many items
-        max_length: The value must be a set with at most this many items
-        strict: The value must be a set with exactly this many items
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='set',
-        items_schema=items_schema,
-        min_length=min_length,
-        max_length=max_length,
-        strict=strict,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class FrozenSetSchema(TypedDict, total=False):
-    type: Required[Literal['frozenset']]
-    items_schema: CoreSchema
-    min_length: int
-    max_length: int
-    strict: bool
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def frozenset_schema(
-    items_schema: CoreSchema | None = None,
-    *,
-    min_length: int | None = None,
-    max_length: int | None = None,
-    strict: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> FrozenSetSchema:
-    """
-    Returns a schema that matches a frozenset of a given schema, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.frozenset_schema(
-        items_schema=core_schema.int_schema(), min_length=0, max_length=10
-    )
-    v = SchemaValidator(schema)
-    assert v.validate_python(frozenset(range(3))) == frozenset({0, 1, 2})
-    ```
-
-    Args:
-        items_schema: The value must be a frozenset with items that match this schema
-        min_length: The value must be a frozenset with at least this many items
-        max_length: The value must be a frozenset with at most this many items
-        strict: The value must be a frozenset with exactly this many items
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='frozenset',
-        items_schema=items_schema,
-        min_length=min_length,
-        max_length=max_length,
-        strict=strict,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class GeneratorSchema(TypedDict, total=False):
-    type: Required[Literal['generator']]
-    items_schema: CoreSchema
-    min_length: int
-    max_length: int
-    ref: str
-    metadata: Any
-    serialization: IncExSeqOrElseSerSchema
-
-
-def generator_schema(
-    items_schema: CoreSchema | None = None,
-    *,
-    min_length: int | None = None,
-    max_length: int | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: IncExSeqOrElseSerSchema | None = None,
-) -> GeneratorSchema:
-    """
-    Returns a schema that matches a generator value, e.g.:
-
-    ```py
-    from typing import Iterator
-    from pydantic_core import SchemaValidator, core_schema
-
-    def gen() -> Iterator[int]:
-        yield 1
-
-    schema = core_schema.generator_schema(items_schema=core_schema.int_schema())
-    v = SchemaValidator(schema)
-    v.validate_python(gen())
-    ```
-
-    Unlike other types, validated generators do not raise ValidationErrors eagerly,
-    but instead will raise a ValidationError when a violating value is actually read from the generator.
-    This is to ensure that "validated" generators retain the benefit of lazy evaluation.
-
-    Args:
-        items_schema: The value must be a generator with items that match this schema
-        min_length: The value must be a generator that yields at least this many items
-        max_length: The value must be a generator that yields at most this many items
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='generator',
-        items_schema=items_schema,
-        min_length=min_length,
-        max_length=max_length,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-IncExDict = Set[Union[int, str]]
-
-
-class IncExDictSerSchema(TypedDict, total=False):
-    type: Required[Literal['include-exclude-dict']]
-    include: IncExDict
-    exclude: IncExDict
-
-
-def filter_dict_schema(*, include: IncExDict | None = None, exclude: IncExDict | None = None) -> IncExDictSerSchema:
-    return _dict_not_none(type='include-exclude-dict', include=include, exclude=exclude)
-
-
-IncExDictOrElseSerSchema = Union[IncExDictSerSchema, SerSchema]
-
-
-class DictSchema(TypedDict, total=False):
-    type: Required[Literal['dict']]
-    keys_schema: CoreSchema  # default: AnySchema
-    values_schema: CoreSchema  # default: AnySchema
-    min_length: int
-    max_length: int
-    strict: bool
-    ref: str
-    metadata: Any
-    serialization: IncExDictOrElseSerSchema
-
-
-def dict_schema(
-    keys_schema: CoreSchema | None = None,
-    values_schema: CoreSchema | None = None,
-    *,
-    min_length: int | None = None,
-    max_length: int | None = None,
-    strict: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> DictSchema:
-    """
-    Returns a schema that matches a dict value, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.dict_schema(
-        keys_schema=core_schema.str_schema(), values_schema=core_schema.int_schema()
-    )
-    v = SchemaValidator(schema)
-    assert v.validate_python({'a': '1', 'b': 2}) == {'a': 1, 'b': 2}
-    ```
-
-    Args:
-        keys_schema: The value must be a dict with keys that match this schema
-        values_schema: The value must be a dict with values that match this schema
-        min_length: The value must be a dict with at least this many items
-        max_length: The value must be a dict with at most this many items
-        strict: Whether the keys and values should be validated with strict mode
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='dict',
-        keys_schema=keys_schema,
-        values_schema=values_schema,
-        min_length=min_length,
-        max_length=max_length,
-        strict=strict,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-# (__input_value: Any) -> Any
-NoInfoValidatorFunction = Callable[[Any], Any]
-
-
-class NoInfoValidatorFunctionSchema(TypedDict):
-    type: Literal['no-info']
-    function: NoInfoValidatorFunction
-
-
-# (__input_value: Any, __info: ValidationInfo) -> Any
-WithInfoValidatorFunction = Callable[[Any, ValidationInfo], Any]
-
-
-class WithInfoValidatorFunctionSchema(TypedDict, total=False):
-    type: Required[Literal['with-info']]
-    function: Required[WithInfoValidatorFunction]
-    field_name: str
-
-
-ValidationFunction = Union[NoInfoValidatorFunctionSchema, WithInfoValidatorFunctionSchema]
-
-
-class _ValidatorFunctionSchema(TypedDict, total=False):
-    function: Required[ValidationFunction]
-    schema: Required[CoreSchema]
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-class BeforeValidatorFunctionSchema(_ValidatorFunctionSchema, total=False):
-    type: Required[Literal['function-before']]
-
-
-def no_info_before_validator_function(
-    function: NoInfoValidatorFunction,
-    schema: CoreSchema,
-    *,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> BeforeValidatorFunctionSchema:
-    """
-    Returns a schema that calls a validator function before validating, no `info` argument is provided, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    def fn(v: bytes) -> str:
-        return v.decode() + 'world'
-
-    func_schema = core_schema.no_info_before_validator_function(
-        function=fn, schema=core_schema.str_schema()
-    )
-    schema = core_schema.typed_dict_schema({'a': core_schema.typed_dict_field(func_schema)})
-
-    v = SchemaValidator(schema)
-    assert v.validate_python({'a': b'hello '}) == {'a': 'hello world'}
-    ```
-
-    Args:
-        function: The validator function to call
-        schema: The schema to validate the output of the validator function
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='function-before',
-        function={'type': 'no-info', 'function': function},
-        schema=schema,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-def with_info_before_validator_function(
-    function: WithInfoValidatorFunction,
-    schema: CoreSchema,
-    *,
-    field_name: str | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> BeforeValidatorFunctionSchema:
-    """
-    Returns a schema that calls a validator function before validation, the function is called with
-    an `info` argument, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    def fn(v: bytes, info: core_schema.ValidationInfo) -> str:
-        assert info.data is not None
-        assert info.field_name is not None
-        return v.decode() + 'world'
-
-    func_schema = core_schema.with_info_before_validator_function(
-        function=fn, schema=core_schema.str_schema(), field_name='a'
-    )
-    schema = core_schema.typed_dict_schema({'a': core_schema.typed_dict_field(func_schema)})
-
-    v = SchemaValidator(schema)
-    assert v.validate_python({'a': b'hello '}) == {'a': 'hello world'}
-    ```
-
-    Args:
-        function: The validator function to call
-        field_name: The name of the field
-        schema: The schema to validate the output of the validator function
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='function-before',
-        function=_dict_not_none(type='with-info', function=function, field_name=field_name),
-        schema=schema,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class AfterValidatorFunctionSchema(_ValidatorFunctionSchema, total=False):
-    type: Required[Literal['function-after']]
-
-
-def no_info_after_validator_function(
-    function: NoInfoValidatorFunction,
-    schema: CoreSchema,
-    *,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> AfterValidatorFunctionSchema:
-    """
-    Returns a schema that calls a validator function after validating, no `info` argument is provided, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    def fn(v: str) -> str:
-        return v + 'world'
-
-    func_schema = core_schema.no_info_after_validator_function(fn, core_schema.str_schema())
-    schema = core_schema.typed_dict_schema({'a': core_schema.typed_dict_field(func_schema)})
-
-    v = SchemaValidator(schema)
-    assert v.validate_python({'a': b'hello '}) == {'a': 'hello world'}
-    ```
-
-    Args:
-        function: The validator function to call after the schema is validated
-        schema: The schema to validate before the validator function
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='function-after',
-        function={'type': 'no-info', 'function': function},
-        schema=schema,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-def with_info_after_validator_function(
-    function: WithInfoValidatorFunction,
-    schema: CoreSchema,
-    *,
-    field_name: str | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> AfterValidatorFunctionSchema:
-    """
-    Returns a schema that calls a validator function after validation, the function is called with
-    an `info` argument, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    def fn(v: str, info: core_schema.ValidationInfo) -> str:
-        assert info.data is not None
-        assert info.field_name is not None
-        return v + 'world'
-
-    func_schema = core_schema.with_info_after_validator_function(
-        function=fn, schema=core_schema.str_schema(), field_name='a'
-    )
-    schema = core_schema.typed_dict_schema({'a': core_schema.typed_dict_field(func_schema)})
-
-    v = SchemaValidator(schema)
-    assert v.validate_python({'a': b'hello '}) == {'a': 'hello world'}
-    ```
-
-    Args:
-        function: The validator function to call after the schema is validated
-        schema: The schema to validate before the validator function
-        field_name: The name of the field this validators is applied to, if any
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='function-after',
-        function=_dict_not_none(type='with-info', function=function, field_name=field_name),
-        schema=schema,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class ValidatorFunctionWrapHandler(Protocol):
-    def __call__(self, input_value: Any, outer_location: str | int | None = None) -> Any:  # pragma: no cover
-        ...
-
-
-# (__input_value: Any, __validator: ValidatorFunctionWrapHandler) -> Any
-NoInfoWrapValidatorFunction = Callable[[Any, ValidatorFunctionWrapHandler], Any]
-
-
-class NoInfoWrapValidatorFunctionSchema(TypedDict):
-    type: Literal['no-info']
-    function: NoInfoWrapValidatorFunction
-
-
-# (__input_value: Any, __validator: ValidatorFunctionWrapHandler, __info: ValidationInfo) -> Any
-WithInfoWrapValidatorFunction = Callable[[Any, ValidatorFunctionWrapHandler, ValidationInfo], Any]
-
-
-class WithInfoWrapValidatorFunctionSchema(TypedDict, total=False):
-    type: Required[Literal['with-info']]
-    function: Required[WithInfoWrapValidatorFunction]
-    field_name: str
-
-
-WrapValidatorFunction = Union[NoInfoWrapValidatorFunctionSchema, WithInfoWrapValidatorFunctionSchema]
-
-
-class WrapValidatorFunctionSchema(TypedDict, total=False):
-    type: Required[Literal['function-wrap']]
-    function: Required[WrapValidatorFunction]
-    schema: Required[CoreSchema]
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def no_info_wrap_validator_function(
-    function: NoInfoWrapValidatorFunction,
-    schema: CoreSchema,
-    *,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> WrapValidatorFunctionSchema:
-    """
-    Returns a schema which calls a function with a `validator` callable argument which can
-    optionally be used to call inner validation with the function logic, this is much like the
-    "onion" implementation of middleware in many popular web frameworks, no `info` argument is passed, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    def fn(
-        v: str,
-        validator: core_schema.ValidatorFunctionWrapHandler,
-    ) -> str:
-        return validator(input_value=v) + 'world'
-
-    schema = core_schema.no_info_wrap_validator_function(
-        function=fn, schema=core_schema.str_schema()
-    )
-    v = SchemaValidator(schema)
-    assert v.validate_python('hello ') == 'hello world'
-    ```
-
-    Args:
-        function: The validator function to call
-        schema: The schema to validate the output of the validator function
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='function-wrap',
-        function={'type': 'no-info', 'function': function},
-        schema=schema,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-def with_info_wrap_validator_function(
-    function: WithInfoWrapValidatorFunction,
-    schema: CoreSchema,
-    *,
-    field_name: str | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> WrapValidatorFunctionSchema:
-    """
-    Returns a schema which calls a function with a `validator` callable argument which can
-    optionally be used to call inner validation with the function logic, this is much like the
-    "onion" implementation of middleware in many popular web frameworks, an `info` argument is also passed, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    def fn(
-        v: str,
-        validator: core_schema.ValidatorFunctionWrapHandler,
-        info: core_schema.ValidationInfo,
-    ) -> str:
-        return validator(input_value=v) + 'world'
-
-    schema = core_schema.with_info_wrap_validator_function(
-        function=fn, schema=core_schema.str_schema()
-    )
-    v = SchemaValidator(schema)
-    assert v.validate_python('hello ') == 'hello world'
-    ```
-
-    Args:
-        function: The validator function to call
-        schema: The schema to validate the output of the validator function
-        field_name: The name of the field this validators is applied to, if any
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='function-wrap',
-        function=_dict_not_none(type='with-info', function=function, field_name=field_name),
-        schema=schema,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class PlainValidatorFunctionSchema(TypedDict, total=False):
-    type: Required[Literal['function-plain']]
-    function: Required[ValidationFunction]
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def no_info_plain_validator_function(
-    function: NoInfoValidatorFunction,
-    *,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> PlainValidatorFunctionSchema:
-    """
-    Returns a schema that uses the provided function for validation, no `info` argument is passed, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    def fn(v: str) -> str:
-        assert 'hello' in v
-        return v + 'world'
-
-    schema = core_schema.no_info_plain_validator_function(function=fn)
-    v = SchemaValidator(schema)
-    assert v.validate_python('hello ') == 'hello world'
-    ```
-
-    Args:
-        function: The validator function to call
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='function-plain',
-        function={'type': 'no-info', 'function': function},
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-def with_info_plain_validator_function(
-    function: WithInfoValidatorFunction,
-    *,
-    field_name: str | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> PlainValidatorFunctionSchema:
-    """
-    Returns a schema that uses the provided function for validation, an `info` argument is passed, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    def fn(v: str, info: core_schema.ValidationInfo) -> str:
-        assert 'hello' in v
-        return v + 'world'
-
-    schema = core_schema.with_info_plain_validator_function(function=fn)
-    v = SchemaValidator(schema)
-    assert v.validate_python('hello ') == 'hello world'
-    ```
-
-    Args:
-        function: The validator function to call
-        field_name: The name of the field this validators is applied to, if any
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='function-plain',
-        function=_dict_not_none(type='with-info', function=function, field_name=field_name),
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class WithDefaultSchema(TypedDict, total=False):
-    type: Required[Literal['default']]
-    schema: Required[CoreSchema]
-    default: Any
-    default_factory: Callable[[], Any]
-    on_error: Literal['raise', 'omit', 'default']  # default: 'raise'
-    validate_default: bool  # default: False
-    strict: bool
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def with_default_schema(
-    schema: CoreSchema,
-    *,
-    default: Any = PydanticUndefined,
-    default_factory: Callable[[], Any] | None = None,
-    on_error: Literal['raise', 'omit', 'default'] | None = None,
-    validate_default: bool | None = None,
-    strict: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> WithDefaultSchema:
-    """
-    Returns a schema that adds a default value to the given schema, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.with_default_schema(core_schema.str_schema(), default='hello')
-    wrapper_schema = core_schema.typed_dict_schema(
-        {'a': core_schema.typed_dict_field(schema)}
-    )
-    v = SchemaValidator(wrapper_schema)
-    assert v.validate_python({}) == v.validate_python({'a': 'hello'})
-    ```
-
-    Args:
-        schema: The schema to add a default value to
-        default: The default value to use
-        default_factory: A function that returns the default value to use
-        on_error: What to do if the schema validation fails. One of 'raise', 'omit', 'default'
-        validate_default: Whether the default value should be validated
-        strict: Whether the underlying schema should be validated with strict mode
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    s = _dict_not_none(
-        type='default',
-        schema=schema,
-        default_factory=default_factory,
-        on_error=on_error,
-        validate_default=validate_default,
-        strict=strict,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-    if default is not PydanticUndefined:
-        s['default'] = default
-    return s
-
-
-class NullableSchema(TypedDict, total=False):
-    type: Required[Literal['nullable']]
-    schema: Required[CoreSchema]
-    strict: bool
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def nullable_schema(
-    schema: CoreSchema,
-    *,
-    strict: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> NullableSchema:
-    """
-    Returns a schema that matches a nullable value, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.nullable_schema(core_schema.str_schema())
-    v = SchemaValidator(schema)
-    assert v.validate_python(None) is None
-    ```
-
-    Args:
-        schema: The schema to wrap
-        strict: Whether the underlying schema should be validated with strict mode
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='nullable', schema=schema, strict=strict, ref=ref, metadata=metadata, serialization=serialization
-    )
-
-
-class UnionSchema(TypedDict, total=False):
-    type: Required[Literal['union']]
-    choices: Required[List[Union[CoreSchema, Tuple[CoreSchema, str]]]]
-    # default true, whether to automatically collapse unions with one element to the inner validator
-    auto_collapse: bool
-    custom_error_type: str
-    custom_error_message: str
-    custom_error_context: Dict[str, Union[str, int, float]]
-    mode: Literal['smart', 'left_to_right']  # default: 'smart'
-    strict: bool
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def union_schema(
-    choices: list[CoreSchema | tuple[CoreSchema, str]],
-    *,
-    auto_collapse: bool | None = None,
-    custom_error_type: str | None = None,
-    custom_error_message: str | None = None,
-    custom_error_context: dict[str, str | int] | None = None,
-    mode: Literal['smart', 'left_to_right'] | None = None,
-    strict: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> UnionSchema:
-    """
-    Returns a schema that matches a union value, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.union_schema([core_schema.str_schema(), core_schema.int_schema()])
-    v = SchemaValidator(schema)
-    assert v.validate_python('hello') == 'hello'
-    assert v.validate_python(1) == 1
-    ```
-
-    Args:
-        choices: The schemas to match. If a tuple, the second item is used as the label for the case.
-        auto_collapse: whether to automatically collapse unions with one element to the inner validator, default true
-        custom_error_type: The custom error type to use if the validation fails
-        custom_error_message: The custom error message to use if the validation fails
-        custom_error_context: The custom error context to use if the validation fails
-        mode: How to select which choice to return
-            * `smart` (default) will try to return the choice which is the closest match to the input value
-            * `left_to_right` will return the first choice in `choices` which succeeds validation
-        strict: Whether the underlying schemas should be validated with strict mode
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='union',
-        choices=choices,
-        auto_collapse=auto_collapse,
-        custom_error_type=custom_error_type,
-        custom_error_message=custom_error_message,
-        custom_error_context=custom_error_context,
-        mode=mode,
-        strict=strict,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class TaggedUnionSchema(TypedDict, total=False):
-    type: Required[Literal['tagged-union']]
-    choices: Required[Dict[Hashable, CoreSchema]]
-    discriminator: Required[Union[str, List[Union[str, int]], List[List[Union[str, int]]], Callable[[Any], Hashable]]]
-    custom_error_type: str
-    custom_error_message: str
-    custom_error_context: Dict[str, Union[str, int, float]]
-    strict: bool
-    from_attributes: bool  # default: True
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def tagged_union_schema(
-    choices: Dict[Hashable, CoreSchema],
-    discriminator: str | list[str | int] | list[list[str | int]] | Callable[[Any], Hashable],
-    *,
-    custom_error_type: str | None = None,
-    custom_error_message: str | None = None,
-    custom_error_context: dict[str, int | str | float] | None = None,
-    strict: bool | None = None,
-    from_attributes: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> TaggedUnionSchema:
-    """
-    Returns a schema that matches a tagged union value, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    apple_schema = core_schema.typed_dict_schema(
-        {
-            'foo': core_schema.typed_dict_field(core_schema.str_schema()),
-            'bar': core_schema.typed_dict_field(core_schema.int_schema()),
-        }
-    )
-    banana_schema = core_schema.typed_dict_schema(
-        {
-            'foo': core_schema.typed_dict_field(core_schema.str_schema()),
-            'spam': core_schema.typed_dict_field(
-                core_schema.list_schema(items_schema=core_schema.int_schema())
-            ),
-        }
-    )
-    schema = core_schema.tagged_union_schema(
-        choices={
-            'apple': apple_schema,
-            'banana': banana_schema,
-        },
-        discriminator='foo',
-    )
-    v = SchemaValidator(schema)
-    assert v.validate_python({'foo': 'apple', 'bar': '123'}) == {'foo': 'apple', 'bar': 123}
-    assert v.validate_python({'foo': 'banana', 'spam': [1, 2, 3]}) == {
-        'foo': 'banana',
-        'spam': [1, 2, 3],
-    }
-    ```
-
-    Args:
-        choices: The schemas to match
-            When retrieving a schema from `choices` using the discriminator value, if the value is a str,
-            it should be fed back into the `choices` map until a schema is obtained
-            (This approach is to prevent multiple ownership of a single schema in Rust)
-        discriminator: The discriminator to use to determine the schema to use
-            * If `discriminator` is a str, it is the name of the attribute to use as the discriminator
-            * If `discriminator` is a list of int/str, it should be used as a "path" to access the discriminator
-            * If `discriminator` is a list of lists, each inner list is a path, and the first path that exists is used
-            * If `discriminator` is a callable, it should return the discriminator when called on the value to validate;
-              the callable can return `None` to indicate that there is no matching discriminator present on the input
-        custom_error_type: The custom error type to use if the validation fails
-        custom_error_message: The custom error message to use if the validation fails
-        custom_error_context: The custom error context to use if the validation fails
-        strict: Whether the underlying schemas should be validated with strict mode
-        from_attributes: Whether to use the attributes of the object to retrieve the discriminator value
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='tagged-union',
-        choices=choices,
-        discriminator=discriminator,
-        custom_error_type=custom_error_type,
-        custom_error_message=custom_error_message,
-        custom_error_context=custom_error_context,
-        strict=strict,
-        from_attributes=from_attributes,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class ChainSchema(TypedDict, total=False):
-    type: Required[Literal['chain']]
-    steps: Required[List[CoreSchema]]
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def chain_schema(
-    steps: list[CoreSchema], *, ref: str | None = None, metadata: Any = None, serialization: SerSchema | None = None
-) -> ChainSchema:
-    """
-    Returns a schema that chains the provided validation schemas, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    def fn(v: str, info: core_schema.ValidationInfo) -> str:
-        assert 'hello' in v
-        return v + ' world'
-
-    fn_schema = core_schema.with_info_plain_validator_function(function=fn)
-    schema = core_schema.chain_schema(
-        [fn_schema, fn_schema, fn_schema, core_schema.str_schema()]
-    )
-    v = SchemaValidator(schema)
-    assert v.validate_python('hello') == 'hello world world world'
-    ```
-
-    Args:
-        steps: The schemas to chain
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(type='chain', steps=steps, ref=ref, metadata=metadata, serialization=serialization)
-
-
-class LaxOrStrictSchema(TypedDict, total=False):
-    type: Required[Literal['lax-or-strict']]
-    lax_schema: Required[CoreSchema]
-    strict_schema: Required[CoreSchema]
-    strict: bool
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def lax_or_strict_schema(
-    lax_schema: CoreSchema,
-    strict_schema: CoreSchema,
-    *,
-    strict: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> LaxOrStrictSchema:
-    """
-    Returns a schema that uses the lax or strict schema, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    def fn(v: str, info: core_schema.ValidationInfo) -> str:
-        assert 'hello' in v
-        return v + ' world'
-
-    lax_schema = core_schema.int_schema(strict=False)
-    strict_schema = core_schema.int_schema(strict=True)
-
-    schema = core_schema.lax_or_strict_schema(
-        lax_schema=lax_schema, strict_schema=strict_schema, strict=True
-    )
-    v = SchemaValidator(schema)
-    assert v.validate_python(123) == 123
-
-    schema = core_schema.lax_or_strict_schema(
-        lax_schema=lax_schema, strict_schema=strict_schema, strict=False
-    )
-    v = SchemaValidator(schema)
-    assert v.validate_python('123') == 123
-    ```
-
-    Args:
-        lax_schema: The lax schema to use
-        strict_schema: The strict schema to use
-        strict: Whether the strict schema should be used
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='lax-or-strict',
-        lax_schema=lax_schema,
-        strict_schema=strict_schema,
-        strict=strict,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class JsonOrPythonSchema(TypedDict, total=False):
-    type: Required[Literal['json-or-python']]
-    json_schema: Required[CoreSchema]
-    python_schema: Required[CoreSchema]
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def json_or_python_schema(
-    json_schema: CoreSchema,
-    python_schema: CoreSchema,
-    *,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> JsonOrPythonSchema:
-    """
-    Returns a schema that uses the Json or Python schema depending on the input:
-
-    ```py
-    from pydantic_core import SchemaValidator, ValidationError, core_schema
-
-    v = SchemaValidator(
-        core_schema.json_or_python_schema(
-            json_schema=core_schema.int_schema(),
-            python_schema=core_schema.int_schema(strict=True),
-        )
-    )
-
-    assert v.validate_json('"123"') == 123
-
-    try:
-        v.validate_python('123')
-    except ValidationError:
-        pass
-    else:
-        raise AssertionError('Validation should have failed')
-    ```
-
-    Args:
-        json_schema: The schema to use for Json inputs
-        python_schema: The schema to use for Python inputs
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='json-or-python',
-        json_schema=json_schema,
-        python_schema=python_schema,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class TypedDictField(TypedDict, total=False):
-    type: Required[Literal['typed-dict-field']]
-    schema: Required[CoreSchema]
-    required: bool
-    validation_alias: Union[str, List[Union[str, int]], List[List[Union[str, int]]]]
-    serialization_alias: str
-    serialization_exclude: bool  # default: False
-    metadata: Any
-
-
-def typed_dict_field(
-    schema: CoreSchema,
-    *,
-    required: bool | None = None,
-    validation_alias: str | list[str | int] | list[list[str | int]] | None = None,
-    serialization_alias: str | None = None,
-    serialization_exclude: bool | None = None,
-    metadata: Any = None,
-) -> TypedDictField:
-    """
-    Returns a schema that matches a typed dict field, e.g.:
-
-    ```py
-    from pydantic_core import core_schema
-
-    field = core_schema.typed_dict_field(schema=core_schema.int_schema(), required=True)
-    ```
-
-    Args:
-        schema: The schema to use for the field
-        required: Whether the field is required
-        validation_alias: The alias(es) to use to find the field in the validation data
-        serialization_alias: The alias to use as a key when serializing
-        serialization_exclude: Whether to exclude the field when serializing
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-    """
-    return _dict_not_none(
-        type='typed-dict-field',
-        schema=schema,
-        required=required,
-        validation_alias=validation_alias,
-        serialization_alias=serialization_alias,
-        serialization_exclude=serialization_exclude,
-        metadata=metadata,
-    )
-
-
-class TypedDictSchema(TypedDict, total=False):
-    type: Required[Literal['typed-dict']]
-    fields: Required[Dict[str, TypedDictField]]
-    computed_fields: List[ComputedField]
-    strict: bool
-    extras_schema: CoreSchema
-    # all these values can be set via config, equivalent fields have `typed_dict_` prefix
-    extra_behavior: ExtraBehavior
-    total: bool  # default: True
-    populate_by_name: bool  # replaces `allow_population_by_field_name` in pydantic v1
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-    config: CoreConfig
-
-
-def typed_dict_schema(
-    fields: Dict[str, TypedDictField],
-    *,
-    computed_fields: list[ComputedField] | None = None,
-    strict: bool | None = None,
-    extras_schema: CoreSchema | None = None,
-    extra_behavior: ExtraBehavior | None = None,
-    total: bool | None = None,
-    populate_by_name: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-    config: CoreConfig | None = None,
-) -> TypedDictSchema:
-    """
-    Returns a schema that matches a typed dict, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    wrapper_schema = core_schema.typed_dict_schema(
-        {'a': core_schema.typed_dict_field(core_schema.str_schema())}
-    )
-    v = SchemaValidator(wrapper_schema)
-    assert v.validate_python({'a': 'hello'}) == {'a': 'hello'}
-    ```
-
-    Args:
-        fields: The fields to use for the typed dict
-        computed_fields: Computed fields to use when serializing the model, only applies when directly inside a model
-        strict: Whether the typed dict is strict
-        extras_schema: The extra validator to use for the typed dict
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        extra_behavior: The extra behavior to use for the typed dict
-        total: Whether the typed dict is total
-        populate_by_name: Whether the typed dict should populate by name
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='typed-dict',
-        fields=fields,
-        computed_fields=computed_fields,
-        strict=strict,
-        extras_schema=extras_schema,
-        extra_behavior=extra_behavior,
-        total=total,
-        populate_by_name=populate_by_name,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-        config=config,
-    )
-
-
-class ModelField(TypedDict, total=False):
-    type: Required[Literal['model-field']]
-    schema: Required[CoreSchema]
-    validation_alias: Union[str, List[Union[str, int]], List[List[Union[str, int]]]]
-    serialization_alias: str
-    serialization_exclude: bool  # default: False
-    frozen: bool
-    metadata: Any
-
-
-def model_field(
-    schema: CoreSchema,
-    *,
-    validation_alias: str | list[str | int] | list[list[str | int]] | None = None,
-    serialization_alias: str | None = None,
-    serialization_exclude: bool | None = None,
-    frozen: bool | None = None,
-    metadata: Any = None,
-) -> ModelField:
-    """
-    Returns a schema for a model field, e.g.:
-
-    ```py
-    from pydantic_core import core_schema
-
-    field = core_schema.model_field(schema=core_schema.int_schema())
-    ```
-
-    Args:
-        schema: The schema to use for the field
-        validation_alias: The alias(es) to use to find the field in the validation data
-        serialization_alias: The alias to use as a key when serializing
-        serialization_exclude: Whether to exclude the field when serializing
-        frozen: Whether the field is frozen
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-    """
-    return _dict_not_none(
-        type='model-field',
-        schema=schema,
-        validation_alias=validation_alias,
-        serialization_alias=serialization_alias,
-        serialization_exclude=serialization_exclude,
-        frozen=frozen,
-        metadata=metadata,
-    )
-
-
-class ModelFieldsSchema(TypedDict, total=False):
-    type: Required[Literal['model-fields']]
-    fields: Required[Dict[str, ModelField]]
-    model_name: str
-    computed_fields: List[ComputedField]
-    strict: bool
-    extras_schema: CoreSchema
-    # all these values can be set via config, equivalent fields have `typed_dict_` prefix
-    extra_behavior: ExtraBehavior
-    populate_by_name: bool  # replaces `allow_population_by_field_name` in pydantic v1
-    from_attributes: bool
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def model_fields_schema(
-    fields: Dict[str, ModelField],
-    *,
-    model_name: str | None = None,
-    computed_fields: list[ComputedField] | None = None,
-    strict: bool | None = None,
-    extras_schema: CoreSchema | None = None,
-    extra_behavior: ExtraBehavior | None = None,
-    populate_by_name: bool | None = None,
-    from_attributes: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> ModelFieldsSchema:
-    """
-    Returns a schema that matches a typed dict, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    wrapper_schema = core_schema.model_fields_schema(
-        {'a': core_schema.model_field(core_schema.str_schema())}
-    )
-    v = SchemaValidator(wrapper_schema)
-    print(v.validate_python({'a': 'hello'}))
-    #> ({'a': 'hello'}, None, {'a'})
-    ```
-
-    Args:
-        fields: The fields to use for the typed dict
-        model_name: The name of the model, used for error messages, defaults to "Model"
-        computed_fields: Computed fields to use when serializing the model, only applies when directly inside a model
-        strict: Whether the typed dict is strict
-        extras_schema: The extra validator to use for the typed dict
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        extra_behavior: The extra behavior to use for the typed dict
-        populate_by_name: Whether the typed dict should populate by name
-        from_attributes: Whether the typed dict should be populated from attributes
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='model-fields',
-        fields=fields,
-        model_name=model_name,
-        computed_fields=computed_fields,
-        strict=strict,
-        extras_schema=extras_schema,
-        extra_behavior=extra_behavior,
-        populate_by_name=populate_by_name,
-        from_attributes=from_attributes,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class ModelSchema(TypedDict, total=False):
-    type: Required[Literal['model']]
-    cls: Required[Type[Any]]
-    schema: Required[CoreSchema]
-    custom_init: bool
-    root_model: bool
-    post_init: str
-    revalidate_instances: Literal['always', 'never', 'subclass-instances']  # default: 'never'
-    strict: bool
-    frozen: bool
-    extra_behavior: ExtraBehavior
-    config: CoreConfig
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def model_schema(
-    cls: Type[Any],
-    schema: CoreSchema,
-    *,
-    custom_init: bool | None = None,
-    root_model: bool | None = None,
-    post_init: str | None = None,
-    revalidate_instances: Literal['always', 'never', 'subclass-instances'] | None = None,
-    strict: bool | None = None,
-    frozen: bool | None = None,
-    extra_behavior: ExtraBehavior | None = None,
-    config: CoreConfig | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> ModelSchema:
-    """
-    A model schema generally contains a typed-dict schema.
-    It will run the typed dict validator, then create a new class
-    and set the dict and fields set returned from the typed dict validator
-    to `__dict__` and `__pydantic_fields_set__` respectively.
-
-    Example:
-
-    ```py
-    from pydantic_core import CoreConfig, SchemaValidator, core_schema
-
-    class MyModel:
-        __slots__ = (
-            '__dict__',
-            '__pydantic_fields_set__',
-            '__pydantic_extra__',
-            '__pydantic_private__',
-        )
-
-    schema = core_schema.model_schema(
-        cls=MyModel,
-        config=CoreConfig(str_max_length=5),
-        schema=core_schema.model_fields_schema(
-            fields={'a': core_schema.model_field(core_schema.str_schema())},
-        ),
-    )
-    v = SchemaValidator(schema)
-    assert v.isinstance_python({'a': 'hello'}) is True
-    assert v.isinstance_python({'a': 'too long'}) is False
-    ```
-
-    Args:
-        cls: The class to use for the model
-        schema: The schema to use for the model
-        custom_init: Whether the model has a custom init method
-        root_model: Whether the model is a `RootModel`
-        post_init: The call after init to use for the model
-        revalidate_instances: whether instances of models and dataclasses (including subclass instances)
-            should re-validate defaults to config.revalidate_instances, else 'never'
-        strict: Whether the model is strict
-        frozen: Whether the model is frozen
-        extra_behavior: The extra behavior to use for the model, used in serialization
-        config: The config to use for the model
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='model',
-        cls=cls,
-        schema=schema,
-        custom_init=custom_init,
-        root_model=root_model,
-        post_init=post_init,
-        revalidate_instances=revalidate_instances,
-        strict=strict,
-        frozen=frozen,
-        extra_behavior=extra_behavior,
-        config=config,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class DataclassField(TypedDict, total=False):
-    type: Required[Literal['dataclass-field']]
-    name: Required[str]
-    schema: Required[CoreSchema]
-    kw_only: bool  # default: True
-    init: bool  # default: True
-    init_only: bool  # default: False
-    frozen: bool  # default: False
-    validation_alias: Union[str, List[Union[str, int]], List[List[Union[str, int]]]]
-    serialization_alias: str
-    serialization_exclude: bool  # default: False
-    metadata: Any
-
-
-def dataclass_field(
-    name: str,
-    schema: CoreSchema,
-    *,
-    kw_only: bool | None = None,
-    init: bool | None = None,
-    init_only: bool | None = None,
-    validation_alias: str | list[str | int] | list[list[str | int]] | None = None,
-    serialization_alias: str | None = None,
-    serialization_exclude: bool | None = None,
-    metadata: Any = None,
-    frozen: bool | None = None,
-) -> DataclassField:
-    """
-    Returns a schema for a dataclass field, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    field = core_schema.dataclass_field(
-        name='a', schema=core_schema.str_schema(), kw_only=False
-    )
-    schema = core_schema.dataclass_args_schema('Foobar', [field])
-    v = SchemaValidator(schema)
-    assert v.validate_python({'a': 'hello'}) == ({'a': 'hello'}, None)
-    ```
-
-    Args:
-        name: The name to use for the argument parameter
-        schema: The schema to use for the argument parameter
-        kw_only: Whether the field can be set with a positional argument as well as a keyword argument
-        init: Whether the field should be validated during initialization
-        init_only: Whether the field should be omitted  from `__dict__` and passed to `__post_init__`
-        validation_alias: The alias(es) to use to find the field in the validation data
-        serialization_alias: The alias to use as a key when serializing
-        serialization_exclude: Whether to exclude the field when serializing
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        frozen: Whether the field is frozen
-    """
-    return _dict_not_none(
-        type='dataclass-field',
-        name=name,
-        schema=schema,
-        kw_only=kw_only,
-        init=init,
-        init_only=init_only,
-        validation_alias=validation_alias,
-        serialization_alias=serialization_alias,
-        serialization_exclude=serialization_exclude,
-        metadata=metadata,
-        frozen=frozen,
-    )
-
-
-class DataclassArgsSchema(TypedDict, total=False):
-    type: Required[Literal['dataclass-args']]
-    dataclass_name: Required[str]
-    fields: Required[List[DataclassField]]
-    computed_fields: List[ComputedField]
-    populate_by_name: bool  # default: False
-    collect_init_only: bool  # default: False
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-    extra_behavior: ExtraBehavior
-
-
-def dataclass_args_schema(
-    dataclass_name: str,
-    fields: list[DataclassField],
-    *,
-    computed_fields: List[ComputedField] | None = None,
-    populate_by_name: bool | None = None,
-    collect_init_only: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-    extra_behavior: ExtraBehavior | None = None,
-) -> DataclassArgsSchema:
-    """
-    Returns a schema for validating dataclass arguments, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    field_a = core_schema.dataclass_field(
-        name='a', schema=core_schema.str_schema(), kw_only=False
-    )
-    field_b = core_schema.dataclass_field(
-        name='b', schema=core_schema.bool_schema(), kw_only=False
-    )
-    schema = core_schema.dataclass_args_schema('Foobar', [field_a, field_b])
-    v = SchemaValidator(schema)
-    assert v.validate_python({'a': 'hello', 'b': True}) == ({'a': 'hello', 'b': True}, None)
-    ```
-
-    Args:
-        dataclass_name: The name of the dataclass being validated
-        fields: The fields to use for the dataclass
-        computed_fields: Computed fields to use when serializing the dataclass
-        populate_by_name: Whether to populate by name
-        collect_init_only: Whether to collect init only fields into a dict to pass to `__post_init__`
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-        extra_behavior: How to handle extra fields
-    """
-    return _dict_not_none(
-        type='dataclass-args',
-        dataclass_name=dataclass_name,
-        fields=fields,
-        computed_fields=computed_fields,
-        populate_by_name=populate_by_name,
-        collect_init_only=collect_init_only,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-        extra_behavior=extra_behavior,
-    )
-
-
-class DataclassSchema(TypedDict, total=False):
-    type: Required[Literal['dataclass']]
-    cls: Required[Type[Any]]
-    schema: Required[CoreSchema]
-    fields: Required[List[str]]
-    cls_name: str
-    post_init: bool  # default: False
-    revalidate_instances: Literal['always', 'never', 'subclass-instances']  # default: 'never'
-    strict: bool  # default: False
-    frozen: bool  # default False
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-    slots: bool
-    config: CoreConfig
-
-
-def dataclass_schema(
-    cls: Type[Any],
-    schema: CoreSchema,
-    fields: List[str],
-    *,
-    cls_name: str | None = None,
-    post_init: bool | None = None,
-    revalidate_instances: Literal['always', 'never', 'subclass-instances'] | None = None,
-    strict: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-    frozen: bool | None = None,
-    slots: bool | None = None,
-    config: CoreConfig | None = None,
-) -> DataclassSchema:
-    """
-    Returns a schema for a dataclass. As with `ModelSchema`, this schema can only be used as a field within
-    another schema, not as the root type.
-
-    Args:
-        cls: The dataclass type, used to perform subclass checks
-        schema: The schema to use for the dataclass fields
-        fields: Fields of the dataclass, this is used in serialization and in validation during re-validation
-            and while validating assignment
-        cls_name: The name to use in error locs, etc; this is useful for generics (default: `cls.__name__`)
-        post_init: Whether to call `__post_init__` after validation
-        revalidate_instances: whether instances of models and dataclasses (including subclass instances)
-            should re-validate defaults to config.revalidate_instances, else 'never'
-        strict: Whether to require an exact instance of `cls`
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-        frozen: Whether the dataclass is frozen
-        slots: Whether `slots=True` on the dataclass, means each field is assigned independently, rather than
-            simply setting `__dict__`, default false
-    """
-    return _dict_not_none(
-        type='dataclass',
-        cls=cls,
-        fields=fields,
-        cls_name=cls_name,
-        schema=schema,
-        post_init=post_init,
-        revalidate_instances=revalidate_instances,
-        strict=strict,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-        frozen=frozen,
-        slots=slots,
-        config=config,
-    )
-
-
-class ArgumentsParameter(TypedDict, total=False):
-    name: Required[str]
-    schema: Required[CoreSchema]
-    mode: Literal['positional_only', 'positional_or_keyword', 'keyword_only']  # default positional_or_keyword
-    alias: Union[str, List[Union[str, int]], List[List[Union[str, int]]]]
-
-
-def arguments_parameter(
-    name: str,
-    schema: CoreSchema,
-    *,
-    mode: Literal['positional_only', 'positional_or_keyword', 'keyword_only'] | None = None,
-    alias: str | list[str | int] | list[list[str | int]] | None = None,
-) -> ArgumentsParameter:
-    """
-    Returns a schema that matches an argument parameter, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    param = core_schema.arguments_parameter(
-        name='a', schema=core_schema.str_schema(), mode='positional_only'
-    )
-    schema = core_schema.arguments_schema([param])
-    v = SchemaValidator(schema)
-    assert v.validate_python(('hello',)) == (('hello',), {})
-    ```
-
-    Args:
-        name: The name to use for the argument parameter
-        schema: The schema to use for the argument parameter
-        mode: The mode to use for the argument parameter
-        alias: The alias to use for the argument parameter
-    """
-    return _dict_not_none(name=name, schema=schema, mode=mode, alias=alias)
-
-
-class ArgumentsSchema(TypedDict, total=False):
-    type: Required[Literal['arguments']]
-    arguments_schema: Required[List[ArgumentsParameter]]
-    populate_by_name: bool
-    var_args_schema: CoreSchema
-    var_kwargs_schema: CoreSchema
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def arguments_schema(
-    arguments: list[ArgumentsParameter],
-    *,
-    populate_by_name: bool | None = None,
-    var_args_schema: CoreSchema | None = None,
-    var_kwargs_schema: CoreSchema | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> ArgumentsSchema:
-    """
-    Returns a schema that matches an arguments schema, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    param_a = core_schema.arguments_parameter(
-        name='a', schema=core_schema.str_schema(), mode='positional_only'
-    )
-    param_b = core_schema.arguments_parameter(
-        name='b', schema=core_schema.bool_schema(), mode='positional_only'
-    )
-    schema = core_schema.arguments_schema([param_a, param_b])
-    v = SchemaValidator(schema)
-    assert v.validate_python(('hello', True)) == (('hello', True), {})
-    ```
-
-    Args:
-        arguments: The arguments to use for the arguments schema
-        populate_by_name: Whether to populate by name
-        var_args_schema: The variable args schema to use for the arguments schema
-        var_kwargs_schema: The variable kwargs schema to use for the arguments schema
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='arguments',
-        arguments_schema=arguments,
-        populate_by_name=populate_by_name,
-        var_args_schema=var_args_schema,
-        var_kwargs_schema=var_kwargs_schema,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class CallSchema(TypedDict, total=False):
-    type: Required[Literal['call']]
-    arguments_schema: Required[CoreSchema]
-    function: Required[Callable[..., Any]]
-    function_name: str  # default function.__name__
-    return_schema: CoreSchema
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def call_schema(
-    arguments: CoreSchema,
-    function: Callable[..., Any],
-    *,
-    function_name: str | None = None,
-    return_schema: CoreSchema | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> CallSchema:
-    """
-    Returns a schema that matches an arguments schema, then calls a function, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    param_a = core_schema.arguments_parameter(
-        name='a', schema=core_schema.str_schema(), mode='positional_only'
-    )
-    param_b = core_schema.arguments_parameter(
-        name='b', schema=core_schema.bool_schema(), mode='positional_only'
-    )
-    args_schema = core_schema.arguments_schema([param_a, param_b])
-
-    schema = core_schema.call_schema(
-        arguments=args_schema,
-        function=lambda a, b: a + str(not b),
-        return_schema=core_schema.str_schema(),
-    )
-    v = SchemaValidator(schema)
-    assert v.validate_python((('hello', True))) == 'helloFalse'
-    ```
-
-    Args:
-        arguments: The arguments to use for the arguments schema
-        function: The function to use for the call schema
-        function_name: The function name to use for the call schema, if not provided `function.__name__` is used
-        return_schema: The return schema to use for the call schema
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='call',
-        arguments_schema=arguments,
-        function=function,
-        function_name=function_name,
-        return_schema=return_schema,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class CustomErrorSchema(TypedDict, total=False):
-    type: Required[Literal['custom-error']]
-    schema: Required[CoreSchema]
-    custom_error_type: Required[str]
-    custom_error_message: str
-    custom_error_context: Dict[str, Union[str, int, float]]
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def custom_error_schema(
-    schema: CoreSchema,
-    custom_error_type: str,
-    *,
-    custom_error_message: str | None = None,
-    custom_error_context: dict[str, Any] | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> CustomErrorSchema:
-    """
-    Returns a schema that matches a custom error value, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.custom_error_schema(
-        schema=core_schema.int_schema(),
-        custom_error_type='MyError',
-        custom_error_message='Error msg',
-    )
-    v = SchemaValidator(schema)
-    v.validate_python(1)
-    ```
-
-    Args:
-        schema: The schema to use for the custom error schema
-        custom_error_type: The custom error type to use for the custom error schema
-        custom_error_message: The custom error message to use for the custom error schema
-        custom_error_context: The custom error context to use for the custom error schema
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='custom-error',
-        schema=schema,
-        custom_error_type=custom_error_type,
-        custom_error_message=custom_error_message,
-        custom_error_context=custom_error_context,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class JsonSchema(TypedDict, total=False):
-    type: Required[Literal['json']]
-    schema: CoreSchema
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def json_schema(
-    schema: CoreSchema | None = None,
-    *,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> JsonSchema:
-    """
-    Returns a schema that matches a JSON value, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    dict_schema = core_schema.model_fields_schema(
-        {
-            'field_a': core_schema.model_field(core_schema.str_schema()),
-            'field_b': core_schema.model_field(core_schema.bool_schema()),
-        },
-    )
-
-    class MyModel:
-        __slots__ = (
-            '__dict__',
-            '__pydantic_fields_set__',
-            '__pydantic_extra__',
-            '__pydantic_private__',
-        )
-        field_a: str
-        field_b: bool
-
-    json_schema = core_schema.json_schema(schema=dict_schema)
-    schema = core_schema.model_schema(cls=MyModel, schema=json_schema)
-    v = SchemaValidator(schema)
-    m = v.validate_python('{"field_a": "hello", "field_b": true}')
-    assert isinstance(m, MyModel)
-    ```
-
-    Args:
-        schema: The schema to use for the JSON schema
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(type='json', schema=schema, ref=ref, metadata=metadata, serialization=serialization)
-
-
-class UrlSchema(TypedDict, total=False):
-    type: Required[Literal['url']]
-    max_length: int
-    allowed_schemes: List[str]
-    host_required: bool  # default False
-    default_host: str
-    default_port: int
-    default_path: str
-    strict: bool
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def url_schema(
-    *,
-    max_length: int | None = None,
-    allowed_schemes: list[str] | None = None,
-    host_required: bool | None = None,
-    default_host: str | None = None,
-    default_port: int | None = None,
-    default_path: str | None = None,
-    strict: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> UrlSchema:
-    """
-    Returns a schema that matches a URL value, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.url_schema()
-    v = SchemaValidator(schema)
-    print(v.validate_python('https://example.com'))
-    #> https://example.com/
-    ```
-
-    Args:
-        max_length: The maximum length of the URL
-        allowed_schemes: The allowed URL schemes
-        host_required: Whether the URL must have a host
-        default_host: The default host to use if the URL does not have a host
-        default_port: The default port to use if the URL does not have a port
-        default_path: The default path to use if the URL does not have a path
-        strict: Whether to use strict URL parsing
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='url',
-        max_length=max_length,
-        allowed_schemes=allowed_schemes,
-        host_required=host_required,
-        default_host=default_host,
-        default_port=default_port,
-        default_path=default_path,
-        strict=strict,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class MultiHostUrlSchema(TypedDict, total=False):
-    type: Required[Literal['multi-host-url']]
-    max_length: int
-    allowed_schemes: List[str]
-    host_required: bool  # default False
-    default_host: str
-    default_port: int
-    default_path: str
-    strict: bool
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def multi_host_url_schema(
-    *,
-    max_length: int | None = None,
-    allowed_schemes: list[str] | None = None,
-    host_required: bool | None = None,
-    default_host: str | None = None,
-    default_port: int | None = None,
-    default_path: str | None = None,
-    strict: bool | None = None,
-    ref: str | None = None,
-    metadata: Any = None,
-    serialization: SerSchema | None = None,
-) -> MultiHostUrlSchema:
-    """
-    Returns a schema that matches a URL value with possibly multiple hosts, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.multi_host_url_schema()
-    v = SchemaValidator(schema)
-    print(v.validate_python('redis://localhost,0.0.0.0,127.0.0.1'))
-    #> redis://localhost,0.0.0.0,127.0.0.1
-    ```
-
-    Args:
-        max_length: The maximum length of the URL
-        allowed_schemes: The allowed URL schemes
-        host_required: Whether the URL must have a host
-        default_host: The default host to use if the URL does not have a host
-        default_port: The default port to use if the URL does not have a port
-        default_path: The default path to use if the URL does not have a path
-        strict: Whether to use strict URL parsing
-        ref: optional unique identifier of the schema, used to reference the schema in other places
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='multi-host-url',
-        max_length=max_length,
-        allowed_schemes=allowed_schemes,
-        host_required=host_required,
-        default_host=default_host,
-        default_port=default_port,
-        default_path=default_path,
-        strict=strict,
-        ref=ref,
-        metadata=metadata,
-        serialization=serialization,
-    )
-
-
-class DefinitionsSchema(TypedDict, total=False):
-    type: Required[Literal['definitions']]
-    schema: Required[CoreSchema]
-    definitions: Required[List[CoreSchema]]
-    metadata: Any
-    serialization: SerSchema
-
-
-def definitions_schema(schema: CoreSchema, definitions: list[CoreSchema]) -> DefinitionsSchema:
-    """
-    Build a schema that contains both an inner schema and a list of definitions which can be used
-    within the inner schema.
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema = core_schema.definitions_schema(
-        core_schema.list_schema(core_schema.definition_reference_schema('foobar')),
-        [core_schema.int_schema(ref='foobar')],
-    )
-    v = SchemaValidator(schema)
-    assert v.validate_python([1, 2, '3']) == [1, 2, 3]
-    ```
-
-    Args:
-        schema: The inner schema
-        definitions: List of definitions which can be referenced within inner schema
-    """
-    return DefinitionsSchema(type='definitions', schema=schema, definitions=definitions)
-
-
-class DefinitionReferenceSchema(TypedDict, total=False):
-    type: Required[Literal['definition-ref']]
-    schema_ref: Required[str]
-    ref: str
-    metadata: Any
-    serialization: SerSchema
-
-
-def definition_reference_schema(
-    schema_ref: str, ref: str | None = None, metadata: Any = None, serialization: SerSchema | None = None
-) -> DefinitionReferenceSchema:
-    """
-    Returns a schema that points to a schema stored in "definitions", this is useful for nested recursive
-    models and also when you want to define validators separately from the main schema, e.g.:
-
-    ```py
-    from pydantic_core import SchemaValidator, core_schema
-
-    schema_definition = core_schema.definition_reference_schema('list-schema')
-    schema = core_schema.definitions_schema(
-        schema=schema_definition,
-        definitions=[
-            core_schema.list_schema(items_schema=schema_definition, ref='list-schema'),
-        ],
-    )
-    v = SchemaValidator(schema)
-    assert v.validate_python([()]) == [[]]
-    ```
-
-    Args:
-        schema_ref: The schema ref to use for the definition reference schema
-        metadata: Any other information you want to include with the schema, not used by pydantic-core
-        serialization: Custom serialization schema
-    """
-    return _dict_not_none(
-        type='definition-ref', schema_ref=schema_ref, ref=ref, metadata=metadata, serialization=serialization
-    )
-
-
-MYPY = False
-# See https://github.com/python/mypy/issues/14034 for details, in summary mypy is extremely slow to process this
-# union which kills performance not just for pydantic, but even for code using pydantic
-if not MYPY:
-    CoreSchema = Union[
-        AnySchema,
-        NoneSchema,
-        BoolSchema,
-        IntSchema,
-        FloatSchema,
-        DecimalSchema,
-        StringSchema,
-        BytesSchema,
-        DateSchema,
-        TimeSchema,
-        DatetimeSchema,
-        TimedeltaSchema,
-        LiteralSchema,
-        IsInstanceSchema,
-        IsSubclassSchema,
-        CallableSchema,
-        ListSchema,
-        TupleSchema,
-        SetSchema,
-        FrozenSetSchema,
-        GeneratorSchema,
-        DictSchema,
-        AfterValidatorFunctionSchema,
-        BeforeValidatorFunctionSchema,
-        WrapValidatorFunctionSchema,
-        PlainValidatorFunctionSchema,
-        WithDefaultSchema,
-        NullableSchema,
-        UnionSchema,
-        TaggedUnionSchema,
-        ChainSchema,
-        LaxOrStrictSchema,
-        JsonOrPythonSchema,
-        TypedDictSchema,
-        ModelFieldsSchema,
-        ModelSchema,
-        DataclassArgsSchema,
-        DataclassSchema,
-        ArgumentsSchema,
-        CallSchema,
-        CustomErrorSchema,
-        JsonSchema,
-        UrlSchema,
-        MultiHostUrlSchema,
-        DefinitionsSchema,
-        DefinitionReferenceSchema,
-        UuidSchema,
-    ]
-elif False:
-    CoreSchema: TypeAlias = Mapping[str, Any]
-
-
-# to update this, call `pytest -k test_core_schema_type_literal` and copy the output
-CoreSchemaType = Literal[
-    'any',
-    'none',
-    'bool',
-    'int',
-    'float',
-    'decimal',
-    'str',
-    'bytes',
-    'date',
-    'time',
-    'datetime',
-    'timedelta',
-    'literal',
-    'is-instance',
-    'is-subclass',
-    'callable',
-    'list',
-    'tuple',
-    'set',
-    'frozenset',
-    'generator',
-    'dict',
-    'function-after',
-    'function-before',
-    'function-wrap',
-    'function-plain',
-    'default',
-    'nullable',
-    'union',
-    'tagged-union',
-    'chain',
-    'lax-or-strict',
-    'json-or-python',
-    'typed-dict',
-    'model-fields',
-    'model',
-    'dataclass-args',
-    'dataclass',
-    'arguments',
-    'call',
-    'custom-error',
-    'json',
-    'url',
-    'multi-host-url',
-    'definitions',
-    'definition-ref',
-    'uuid',
-]
-
-CoreSchemaFieldType = Literal['model-field', 'dataclass-field', 'typed-dict-field', 'computed-field']
-
-
-# used in _pydantic_core.pyi::PydanticKnownError
-# to update this, call `pytest -k test_all_errors` and copy the output
-ErrorType = Literal[
-    'no_such_attribute',
-    'json_invalid',
-    'json_type',
-    'recursion_loop',
-    'missing',
-    'frozen_field',
-    'frozen_instance',
-    'extra_forbidden',
-    'invalid_key',
-    'get_attribute_error',
-    'model_type',
-    'model_attributes_type',
-    'dataclass_type',
-    'dataclass_exact_type',
-    'none_required',
-    'greater_than',
-    'greater_than_equal',
-    'less_than',
-    'less_than_equal',
-    'multiple_of',
-    'finite_number',
-    'too_short',
-    'too_long',
-    'iterable_type',
-    'iteration_error',
-    'string_type',
-    'string_sub_type',
-    'string_unicode',
-    'string_too_short',
-    'string_too_long',
-    'string_pattern_mismatch',
-    'enum',
-    'dict_type',
-    'mapping_type',
-    'list_type',
-    'tuple_type',
-    'set_type',
-    'bool_type',
-    'bool_parsing',
-    'int_type',
-    'int_parsing',
-    'int_parsing_size',
-    'int_from_float',
-    'float_type',
-    'float_parsing',
-    'bytes_type',
-    'bytes_too_short',
-    'bytes_too_long',
-    'value_error',
-    'assertion_error',
-    'literal_error',
-    'date_type',
-    'date_parsing',
-    'date_from_datetime_parsing',
-    'date_from_datetime_inexact',
-    'date_past',
-    'date_future',
-    'time_type',
-    'time_parsing',
-    'datetime_type',
-    'datetime_parsing',
-    'datetime_object_invalid',
-    'datetime_from_date_parsing',
-    'datetime_past',
-    'datetime_future',
-    'timezone_naive',
-    'timezone_aware',
-    'timezone_offset',
-    'time_delta_type',
-    'time_delta_parsing',
-    'frozen_set_type',
-    'is_instance_of',
-    'is_subclass_of',
-    'callable_type',
-    'union_tag_invalid',
-    'union_tag_not_found',
-    'arguments_type',
-    'missing_argument',
-    'unexpected_keyword_argument',
-    'missing_keyword_only_argument',
-    'unexpected_positional_argument',
-    'missing_positional_only_argument',
-    'multiple_argument_values',
-    'url_type',
-    'url_parsing',
-    'url_syntax_violation',
-    'url_too_long',
-    'url_scheme',
-    'uuid_type',
-    'uuid_parsing',
-    'uuid_version',
-    'decimal_type',
-    'decimal_parsing',
-    'decimal_max_digits',
-    'decimal_max_places',
-    'decimal_whole_digits',
-]
-
-
-def _dict_not_none(**kwargs: Any) -> Any:
-    return {k: v for k, v in kwargs.items() if v is not None}
-
-
-###############################################################################
-# All this stuff is deprecated by #980 and will be removed eventually
-# They're kept because some code external code will be using them
-
-
-@deprecated('`field_before_validator_function` is deprecated, use `with_info_before_validator_function` instead.')
-def field_before_validator_function(function: WithInfoValidatorFunction, field_name: str, schema: CoreSchema, **kwargs):
-    warnings.warn(
-        '`field_before_validator_function` is deprecated, use `with_info_before_validator_function` instead.',
-        DeprecationWarning,
-    )
-    return with_info_before_validator_function(function, schema, field_name=field_name, **kwargs)
-
-
-@deprecated('`general_before_validator_function` is deprecated, use `with_info_before_validator_function` instead.')
-def general_before_validator_function(*args, **kwargs):
-    warnings.warn(
-        '`general_before_validator_function` is deprecated, use `with_info_before_validator_function` instead.',
-        DeprecationWarning,
-    )
-    return with_info_before_validator_function(*args, **kwargs)
-
-
-@deprecated('`field_after_validator_function` is deprecated, use `with_info_after_validator_function` instead.')
-def field_after_validator_function(function: WithInfoValidatorFunction, field_name: str, schema: CoreSchema, **kwargs):
-    warnings.warn(
-        '`field_after_validator_function` is deprecated, use `with_info_after_validator_function` instead.',
-        DeprecationWarning,
-    )
-    return with_info_after_validator_function(function, schema, field_name=field_name, **kwargs)
-
-
-@deprecated('`general_after_validator_function` is deprecated, use `with_info_after_validator_function` instead.')
-def general_after_validator_function(*args, **kwargs):
-    warnings.warn(
-        '`general_after_validator_function` is deprecated, use `with_info_after_validator_function` instead.',
-        DeprecationWarning,
-    )
-    return with_info_after_validator_function(*args, **kwargs)
-
-
-@deprecated('`field_wrap_validator_function` is deprecated, use `with_info_wrap_validator_function` instead.')
-def field_wrap_validator_function(
-    function: WithInfoWrapValidatorFunction, field_name: str, schema: CoreSchema, **kwargs
-):
-    warnings.warn(
-        '`field_wrap_validator_function` is deprecated, use `with_info_wrap_validator_function` instead.',
-        DeprecationWarning,
-    )
-    return with_info_wrap_validator_function(function, schema, field_name=field_name, **kwargs)
-
-
-@deprecated('`general_wrap_validator_function` is deprecated, use `with_info_wrap_validator_function` instead.')
-def general_wrap_validator_function(*args, **kwargs):
-    warnings.warn(
-        '`general_wrap_validator_function` is deprecated, use `with_info_wrap_validator_function` instead.',
-        DeprecationWarning,
-    )
-    return with_info_wrap_validator_function(*args, **kwargs)
-
-
-@deprecated('`field_plain_validator_function` is deprecated, use `with_info_plain_validator_function` instead.')
-def field_plain_validator_function(function: WithInfoValidatorFunction, field_name: str, **kwargs):
-    warnings.warn(
-        '`field_plain_validator_function` is deprecated, use `with_info_plain_validator_function` instead.',
-        DeprecationWarning,
-    )
-    return with_info_plain_validator_function(function, field_name=field_name, **kwargs)
-
-
-@deprecated('`general_plain_validator_function` is deprecated, use `with_info_plain_validator_function` instead.')
-def general_plain_validator_function(*args, **kwargs):
-    warnings.warn(
-        '`general_plain_validator_function` is deprecated, use `with_info_plain_validator_function` instead.',
-        DeprecationWarning,
-    )
-    return with_info_plain_validator_function(*args, **kwargs)
-
-
-_deprecated_import_lookup = {
-    'FieldValidationInfo': ValidationInfo,
-    'FieldValidatorFunction': WithInfoValidatorFunction,
-    'GeneralValidatorFunction': WithInfoValidatorFunction,
-    'FieldWrapValidatorFunction': WithInfoWrapValidatorFunction,
-}
-
-if TYPE_CHECKING:
-    FieldValidationInfo = ValidationInfo
-
-
-def __getattr__(attr_name: str) -> object:
-    new_attr = _deprecated_import_lookup.get(attr_name)
-    if new_attr is None:
-        raise AttributeError(f"module 'pydantic_core' has no attribute '{attr_name}'")
-    else:
-        import warnings
-
-        msg = f'`{attr_name}` is deprecated, use `{new_attr.__name__}` instead.'
-        warnings.warn(msg, DeprecationWarning, stacklevel=1)
-        return new_attr
diff --git a/lib/pydantic_core/py.typed b/lib/pydantic_core/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/backports/tarfile/compat/__init__.py b/lib/pygazelle/__init__.py
similarity index 100%
rename from lib/backports/tarfile/compat/__init__.py
rename to lib/pygazelle/__init__.py
diff --git a/lib/pygazelle/api.py b/lib/pygazelle/api.py
new file mode 100644
index 00000000..b3dba2bb
--- /dev/null
+++ b/lib/pygazelle/api.py
@@ -0,0 +1,419 @@
+#!/usr/bin/env python
+#
+# PyGazelle - https://github.com/cohena/pygazelle
+# A Python implementation of the What.cd Gazelle JSON API
+#
+# Loosely based on the API implementation from 'whatbetter', by Zachary Denton
+# See https://github.com/zacharydenton/whatbetter
+from HTMLParser import HTMLParser
+
+import sys
+import json
+import time
+import requests as requests
+
+from .user import User
+from .artist import Artist
+from .tag import Tag
+from .request import Request
+from .torrent_group import TorrentGroup
+from .torrent import Torrent
+from .category import Category
+from .inbox import Mailbox
+
+class LoginException(Exception):
+    pass
+
+class RequestException(Exception):
+    pass
+
+class GazelleAPI(object):
+    last_request = time.time() # share amongst all api objects
+    default_headers = {
+        'Connection': 'keep-alive',
+        'Cache-Control': 'max-age=0',
+        'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3)'\
+                      'AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.79'\
+                      'Safari/535.11',
+        'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9'\
+                  ',*/*;q=0.8',
+        'Accept-Encoding': 'gzip,deflate,sdch',
+        'Accept-Language': 'en-US,en;q=0.8',
+        'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.3'}
+
+
+    def __init__(self, username=None, password=None):
+        self.session = requests.session()
+        self.session.headers = self.default_headers
+        self.username = username
+        self.password = password
+        self.authkey = None
+        self.passkey = None
+        self.userid = None
+        self.logged_in_user = None
+        self.default_timeout = 30
+        self.cached_users = {}
+        self.cached_artists = {}
+        self.cached_tags = {}
+        self.cached_torrent_groups = {}
+        self.cached_torrents = {}
+        self.cached_requests = {}
+        self.cached_categories = {}
+        self.site = "https://what.cd/"
+        self.past_request_timestamps = []
+
+    def wait_for_rate_limit(self):
+        # maximum is 5 requests within 10 secs
+        time_frame = 10
+        max_reqs = 5
+
+        slice_point = 0
+
+        while len(self.past_request_timestamps) >= max_reqs:
+            for i, timestamp in enumerate(self.past_request_timestamps):
+                if timestamp < time.time() - time_frame:
+                    slice_point = i + 1
+                else:
+                    break
+
+            if slice_point:
+                self.past_request_timestamps = self.past_request_timestamps[slice_point:]
+            else:
+                time.sleep(0.1)
+
+    def logged_in(self):
+        return self.logged_in_user is not None and self.logged_in_user.id == self.userid
+
+    def _login(self):
+        """
+        Private method.
+        Logs in user and gets authkey from server.
+        """
+
+        if self.logged_in():
+            return
+
+        self.wait_for_rate_limit()
+
+        loginpage = 'https://what.cd/login.php'
+        data = {'username': self.username,
+                'password': self.password,
+                'keeplogged': '1'}
+        r = self.session.post(loginpage, data=data, timeout=self.default_timeout, headers=self.default_headers)
+        self.past_request_timestamps.append(time.time())
+        if r.status_code != 200:
+            raise LoginException("Login returned status code %s" % r.status_code)
+
+        try:
+            accountinfo = self.request('index', autologin=False)
+        except RequestException as e:
+            raise LoginException("Login probably incorrect")
+        if not accountinfo or 'id' not in accountinfo:
+            raise LoginException("Login probably incorrect")
+        self.userid = accountinfo['id']
+        self.authkey = accountinfo['authkey']
+        self.passkey = accountinfo['passkey']
+        self.logged_in_user = User(self.userid, self)
+        self.logged_in_user.set_index_data(accountinfo)
+
+    def request(self, action, autologin=True, **kwargs):
+        """
+        Makes an AJAX request at a given action.
+        Pass an action and relevant arguments for that action.
+        """
+        def make_request(action, **kwargs):
+            ajaxpage = 'ajax.php'
+            content = self.unparsed_request(ajaxpage, action, **kwargs)
+            try:
+                if not isinstance(content, text_type):
+                    content = content.decode('utf-8')
+                parsed = json.loads(content)
+                if parsed['status'] != 'success':
+                    raise RequestException
+                return parsed['response']
+            except ValueError:
+                raise RequestException
+
+        try:
+            return make_request(action, **kwargs)
+        except Exception as e:
+            if autologin and not self.logged_in():
+                self._login()
+                return make_request(action, **kwargs)
+            else:
+                raise e
+
+    def unparsed_request(self, sitepage, action, **kwargs):
+        """
+        Makes a generic HTTP request at a given page with a given action.
+        Also pass relevant arguments for that action.
+        """
+        self.wait_for_rate_limit()
+
+        url = "%s%s" % (self.site, sitepage)
+        params = {'action': action}
+        if self.authkey:
+            params['auth'] = self.authkey
+        params.update(kwargs)
+        r = self.session.get(url, params=params, allow_redirects=False, timeout=self.default_timeout)
+
+        if r.status_code == 302 and r.raw.headers['location'] == 'login.php':
+            self.logged_in_user = None
+            raise LoginException("User login expired")
+
+        self.past_request_timestamps.append(time.time())
+        return r.content
+
+    def get_user(self, id):
+        """
+        Returns a User for the passed ID, associated with this API object. If the ID references the currently logged in
+        user, the user returned will be pre-populated with the information from an 'index' API call. Otherwise, you'll
+        need to call User.update_user_data(). This is done on demand to reduce unnecessary API calls.
+        """
+        id = int(id)
+        if id == self.userid:
+            return self.logged_in_user
+        elif id in self.cached_users.keys():
+            return self.cached_users[id]
+        else:
+            return User(id, self)
+
+    def search_users(self, search_query):
+        """
+        Returns a list of users returned for the search query. You can search by name, part of name, and ID number. If
+        one of the returned users is the currently logged-in user, that user object will be pre-populated with the
+        information from an 'index' API call. Otherwise only the limited info returned by the search will be pre-pop'd.
+        You can query more information with User.update_user_data(). This is done on demand to reduce unnecessary API calls.
+        """
+        response = self.request(action='usersearch', search=search_query)
+        results = response['results']
+
+        found_users = []
+        for result in results:
+            user = self.get_user(result['userId'])
+            user.set_search_result_data(result)
+            found_users.append(user)
+
+        return found_users
+
+    def get_inbox(self, page='1', sort='unread'):
+        """
+        Returns the inbox Mailbox for the logged in user
+        """
+        return Mailbox(self, 'inbox', page, sort)
+
+    def get_sentbox(self, page='1', sort='unread'):
+        """
+        Returns the sentbox Mailbox for the logged in user
+        """
+        return Mailbox(self, 'sentbox', page, sort)
+
+    def get_artist(self, id=None, name=None):
+        """
+        Returns an Artist for the passed ID, associated with this API object. You'll need to call Artist.update_data()
+        if the artist hasn't already been cached. This is done on demand to reduce unnecessary API calls.
+        """
+        if id:
+            id = int(id)
+            if id in self.cached_artists.keys():
+                artist = self.cached_artists[id]
+            else:
+                artist = Artist(id, self)
+            if name:
+                artist.name = HTMLParser().unescape(name)
+        elif name:
+            artist = Artist(-1, self)
+            artist.name = HTMLParser().unescape(name)
+        else:
+            raise Exception("You must specify either an ID or a Name to get an artist.")
+
+        return artist
+
+    def get_tag(self, name):
+        """
+        Returns a Tag for the passed name, associated with this API object. If you know the count value for this tag,
+        pass it to update the object. There is no way to query the count directly from the API, but it can be retrieved
+        from other calls such as 'artist', however.
+        """
+        if name in self.cached_tags.keys():
+            return self.cached_tags[name]
+        else:
+            return Tag(name, self)
+
+    def get_request(self, id):
+        """
+        Returns a Request for the passed ID, associated with this API object. You'll need to call Request.update_data()
+        if the request hasn't already been cached. This is done on demand to reduce unnecessary API calls.
+        """
+        id = int(id)
+        if id in self.cached_requests.keys():
+            return self.cached_requests[id]
+        else:
+            return Request(id, self)
+
+    def get_torrent_group(self, id):
+        """
+        Returns a TorrentGroup for the passed ID, associated with this API object.
+        """
+        id = int(id)
+        if id in self.cached_torrent_groups.keys():
+            return self.cached_torrent_groups[id]
+        else:
+            return TorrentGroup(id, self)
+
+    def get_torrent(self, id):
+        """
+        Returns a Torrent for the passed ID, associated with this API object.
+        """
+        id = int(id)
+        if id in self.cached_torrents.keys():
+            return self.cached_torrents[id]
+        else:
+            return Torrent(id, self)
+
+    def get_torrent_from_info_hash(self, info_hash):
+        """
+        Returns a Torrent for the passed info hash (if one exists), associated with this API object.
+        """
+        try:
+            response = self.request(action='torrent', hash=info_hash.upper())
+        except RequestException:
+            return None
+
+        id = int(response['torrent']['id'])
+        if id in self.cached_torrents.keys():
+            torrent = self.cached_torrents[id]
+        else:
+            torrent = Torrent(id, self)
+
+        torrent.set_torrent_complete_data(response)
+        return torrent
+
+    def get_category(self, id, name=None):
+        """
+        Returns a Category for the passed ID, associated with this API object.
+        """
+        id = int(id)
+        if id in self.cached_categories.keys():
+            cat = self.cached_categories[id]
+        else:
+            cat = Category(id, self)
+        if name:
+            cat.name = name
+        return cat
+
+    def get_top_10(self, type="torrents", limit=25):
+        """
+        Lists the top <limit> items of <type>. Type can be "torrents", "tags", or "users". Limit MUST be
+        10, 25, or 100...it can't just be an arbitrary number (unfortunately). Results are organized into a list of hashes.
+        Each hash contains the results for a specific time frame, like 'day', or 'week'. In the hash, the 'results' key
+        contains a list of objects appropriate to the passed <type>.
+        """
+
+        response = self.request(action='top10', type=type, limit=limit)
+        top_items = []
+        if not response:
+            raise RequestException
+        for category in response:
+            results = []
+            if type == "torrents":
+                for item in category['results']:
+                    torrent = self.get_torrent(item['torrentId'])
+                    torrent.set_torrent_top_10_data(item)
+                    results.append(torrent)
+            elif type == "tags":
+                for item in category['results']:
+                    tag = self.get_tag(item['name'])
+                    results.append(tag)
+            elif type == "users":
+                for item in category['results']:
+                    user = self.get_user(item['id'])
+                    results.append(user)
+            else:
+                raise Exception("%s is an invalid type argument for GazelleAPI.get_top_ten()" % type)
+
+            top_items.append({
+                "caption": category['caption'],
+                "tag": category['tag'],
+                "limit": category['limit'],
+                "results": results
+            })
+
+        return top_items
+
+    def search_torrents(self, **kwargs):
+        """
+        Searches based on the args you pass and returns torrent groups filled with torrents.
+        Pass strings unless otherwise specified.
+        Valid search args:
+            searchstr (any arbitrary string to search for)
+            page (page to display -- default: 1)
+            artistname (self explanatory)
+            groupname (torrent group name, equivalent to album)
+            recordlabel (self explanatory)
+            cataloguenumber (self explanatory)
+            year (self explanatory)
+            remastertitle (self explanatory)
+            remasteryear (self explanatory)
+            remasterrecordlabel (self explanatory)
+            remastercataloguenumber (self explanatory)
+            filelist (can search for filenames found in torrent...unsure of formatting for multiple files)
+            encoding (use constants in pygazelle.Encoding module)
+            format (use constants in pygazelle.Format module)
+            media (use constants in pygazelle.Media module)
+            releasetype (use constants in pygazelle.ReleaseType module)
+            haslog (int 1 or 0 to represent boolean, 100 for 100% only, -1 for < 100% / unscored)
+            hascue (int 1 or 0 to represent boolean)
+            scene (int 1 or 0 to represent boolean)
+            vanityhouse (int 1 or 0 to represent boolean)
+            freetorrent (int 1 or 0 to represent boolean)
+            taglist (comma separated tag names)
+            tags_type (0 for 'any' matching, 1 for 'all' matching)
+            order_by (use constants in pygazelle.order module that start with by_ in their name)
+            order_way (use way_ascending or way_descending constants in pygazelle.order)
+            filter_cat (for each category you want to search, the param name must be filter_cat[catnum] and the value 1)
+                        ex. filter_cat[1]=1 turns on Music.
+                        filter_cat[1]=1, filter_cat[2]=1 turns on music and applications. (two separate params and vals!)
+                        Category object ids return the correct int value for these. (verify?)
+
+        Returns a dict containing keys 'curr_page', 'pages', and 'results'. Results contains a matching list of Torrents
+        (they have a reference to their parent TorrentGroup).
+        """
+
+        response = self.request(action='browse', **kwargs)
+        results = response['results']
+        if len(results):
+            curr_page = response['currentPage']
+            pages = response['pages']
+        else:
+            curr_page = 1
+            pages = 1
+
+        matching_torrents = []
+        for torrent_group_dict in results:
+            torrent_group = self.get_torrent_group(torrent_group_dict['groupId'])
+            torrent_group.set_torrent_search_data(torrent_group_dict)
+
+            for torrent_dict in torrent_group_dict['torrents']:
+                torrent_dict['groupId'] = torrent_group.id
+                torrent = self.get_torrent(torrent_dict['torrentId'])
+                torrent.set_torrent_search_data(torrent_dict)
+                matching_torrents.append(torrent)
+
+        return {'curr_page': curr_page, 'pages': pages, 'results': matching_torrents}
+
+    def generate_torrent_link(self, id):
+        url = "%storrents.php?action=download&id=%s&authkey=%s&torrent_pass=%s" %\
+              (self.site, id, self.logged_in_user.authkey, self.logged_in_user.passkey)
+        return url
+
+    def save_torrent_file(self, id, dest):
+        file_data = self.unparsed_request("torrents.php", 'download',
+            id=id, authkey=self.logged_in_user.authkey, torrent_pass=self.logged_in_user.passkey)
+        with open(dest, 'w+') as dest_file:
+            dest_file.write(file_data)
+
+if sys.version_info[0] == 3:
+    text_type = str
+else:
+    text_type = unicode
diff --git a/lib/pygazelle/artist.py b/lib/pygazelle/artist.py
new file mode 100644
index 00000000..60779db1
--- /dev/null
+++ b/lib/pygazelle/artist.py
@@ -0,0 +1,85 @@
+from HTMLParser import HTMLParser
+
+class InvalidArtistException(Exception):
+    pass
+
+class Artist(object):
+    """
+    This class represents an Artist. It is created knowing only its ID. To reduce API accesses, load information using
+    Artist.update_data() only as needed.
+    """
+    def __init__(self, id, parent_api):
+        self.id = id
+        self.parent_api = parent_api
+        self.name = None
+        self.notifications_enabled = None
+        self.has_bookmarked = None
+        self.image = None
+        self.body = None
+        self.vanity_house = None
+        self.tags = []
+        self.similar_artists_and_score = {}
+        self.statistics = None
+        self.torrent_groups = []
+        self.requests = []
+
+        self.parent_api.cached_artists[self.id] = self # add self to cache of known Artist objects
+
+    def update_data(self):
+        if self.id > 0:
+            response = self.parent_api.request(action='artist', id=self.id)
+        elif self.name:
+            self.name = HTMLParser().unescape(self.name)
+            try:
+                response = self.parent_api.request(action='artist', artistname=self.name)
+            except Exception:
+                self.name = self.name.split(" & ")[0]
+                response = self.parent_api.request(action='artist', artistname=self.name)
+        else:
+            raise InvalidArtistException("Neither ID or Artist Name is valid, can't update data.")
+        self.set_data(response)
+
+    def set_data(self, artist_json_response):
+        if self.id > 0 and self.id != artist_json_response['id']:
+            raise InvalidArtistException("Tried to update an artists's information from an 'artist' API call with a different id." +
+                               " Should be %s, got %s" % (self.id, artist_json_response['id']) )
+        elif self.name:
+            self.id = artist_json_response['id']
+            self.parent_api.cached_artists[self.id] = self
+
+        self.name = HTMLParser().unescape(artist_json_response['name'])
+        self.notifications_enabled = artist_json_response['notificationsEnabled']
+        self.has_bookmarked = artist_json_response['hasBookmarked']
+        self.image = artist_json_response['image']
+        self.body = artist_json_response['body']
+        self.vanity_house = artist_json_response['vanityHouse']
+
+        self.tags = []
+        for tag_dict in artist_json_response['tags']:
+            tag = self.parent_api.get_tag(tag_dict['name'])
+            tag.set_artist_count(self, tag_dict['count'])
+            self.tags.append(tag)
+
+        self.similar_artists_and_score = {}
+        for similar_artist_dict in artist_json_response['similarArtists']:
+            similar_artist = self.parent_api.get_artist(similar_artist_dict['artistId'])
+            similar_artist.name = similar_artist_dict['name']
+            self.similar_artists_and_score[similar_artist] = similar_artist_dict['score']
+
+        self.statistics = artist_json_response['statistics']
+
+        self.torrent_groups = []
+        for torrent_group_item in artist_json_response['torrentgroup']:
+            torrent_group = self.parent_api.get_torrent_group(torrent_group_item['groupId'])
+            torrent_group.set_artist_group_data(torrent_group_item)
+            self.torrent_groups.append(torrent_group)
+
+        self.requests = []
+        for request_json_item in artist_json_response['requests']:
+            request = self.parent_api.get_request(request_json_item['requestId'])
+            request.set_data(request_json_item)
+            self.requests.append(request)
+
+    def __repr__(self):
+        return "Artist: %s - ID: %s" % (self.name, self.id)
+
diff --git a/lib/pygazelle/category.py b/lib/pygazelle/category.py
new file mode 100644
index 00000000..7f63e127
--- /dev/null
+++ b/lib/pygazelle/category.py
@@ -0,0 +1,13 @@
+class InvalidCategoryException(Exception):
+    pass
+
+class Category(object):
+    def __init__(self, id, parent_api):
+        self.id = id
+        self.parent_api = parent_api
+        self.name = None
+
+        self.parent_api.cached_categories[self.id] = self # add self to cache of known Category objects
+
+    def __repr__(self):
+        return "Category: %s - id: %s" % (self.name, self.id)
\ No newline at end of file
diff --git a/lib/pygazelle/encoding.py b/lib/pygazelle/encoding.py
new file mode 100644
index 00000000..290229d4
--- /dev/null
+++ b/lib/pygazelle/encoding.py
@@ -0,0 +1,13 @@
+C192 = "192"
+APS = "APS (VBR)"
+V2 = "V2 (VBR)"
+V1 = "V1 (VBR)"
+C256 = "256"
+APX = "APX (VBR)"
+V0 = "V0 (VBR)"
+C320 = "320"
+LOSSLESS = "Lossless"
+LOSSLESS_24 = "24bit Lossless"
+V8 = "V8 (VBR)"
+
+ALL_ENCODINGS = [C192, APS, V2, V1, C256, APX, V0, C320, LOSSLESS, LOSSLESS_24, V8]
\ No newline at end of file
diff --git a/lib/pygazelle/format.py b/lib/pygazelle/format.py
new file mode 100644
index 00000000..12c2614c
--- /dev/null
+++ b/lib/pygazelle/format.py
@@ -0,0 +1,8 @@
+MP3 = "MP3"
+FLAC = "FLAC"
+AAC = "AAC"
+AC3 = "AC3"
+DTS = "DTS"
+OGG_VORBIS = "Ogg Vorbis"
+
+ALL_FORMATS = [MP3, FLAC, AAC, AC3, DTS, OGG_VORBIS]
\ No newline at end of file
diff --git a/lib/pygazelle/inbox.py b/lib/pygazelle/inbox.py
new file mode 100644
index 00000000..a26c9a26
--- /dev/null
+++ b/lib/pygazelle/inbox.py
@@ -0,0 +1,107 @@
+class MailboxMessage(object):
+    def __init__(self, api, message):
+        self.id = message['convId']
+        self.conv = Conversation(api, self.id)
+        self.subject = message['subject']
+        self.unread = message['unread']
+        self.sticky = message['sticky']
+        self.fwd_id = message['forwardedId']
+        self.fwd_name = message['forwardedName']
+        self.sender_id = message['senderId']
+        self.username = message['username']
+        self.donor = message['donor']
+        self.warned = message['warned']
+        self.enabled = message['enabled']
+        self.date = message['date']
+
+    def __repr__(self):
+        return "MailboxMessage ID %s - %s %s %s" % (self.id, self.subject, self.sender_id, self.username)
+
+
+class ConversationMessage(object):
+    def __init__(self, msg_resp):
+        self.id = msg_resp['messageId']
+        self.sender_id = msg_resp['senderId']
+        self.sender_name = msg_resp['senderName']
+        self.sent_date = msg_resp['sentDate']
+        self.bb_body = msg_resp['bbBody']
+        self.body = msg_resp['body']
+
+    def __repr__(self):
+        return "ConversationMessage ID %s - %s %s" % (self.id, self.sender_name, self.sent_date)
+
+
+class Conversation(object):
+    def __init__(self, api, conv_id):
+        self.id = conv_id
+        self.parent_api = api
+        self.subject = None
+        self.sticky = None
+        self.messages = []
+
+    def __repr__(self):
+        return "Conversation ID %s - %s" % (self.id, self.subject)
+
+    def set_conv_data(self, conv_resp):
+        assert self.id == conv_resp['convId']
+        self.subject = conv_resp['subject']
+        self.sticky = conv_resp['sticky']
+        self.messages = [ConversationMessage(m) for m in conv_resp['messages']]
+
+    def update_conv_data(self):
+        response = self.parent_api.request(action='inbox',
+                                           type='viewconv', id=self.id)
+        self.set_conv_data(response)
+
+
+class Mailbox(object):
+    """
+    This class represents the logged in user's inbox/sentbox
+    """
+    def __init__(self, parent_api, boxtype='inbox', page='1', sort='unread'):
+        self.parent_api = parent_api
+        self.boxtype = boxtype
+        self.current_page = page
+        self.total_pages = None
+        self.sort = sort
+        self.messages = None
+
+    def set_mbox_data(self, mbox_resp):
+        """
+        Takes parsed JSON response from 'inbox' action on api
+        and updates the available subset of mailbox information.
+        """
+        self.current_page = mbox_resp['currentPage']
+        self.total_pages = mbox_resp['pages']
+        self.messages = \
+          [MailboxMessage(self.parent_api, m) for m in mbox_resp['messages']]
+
+    def update_mbox_data(self):
+        response = self.parent_api.request(action='inbox',
+                     type=self.boxtype, page=self.current_page, sort=self.sort)
+        self.set_mbox_data(response)
+
+    def next_page(self):
+        if not self.total_pages:
+            raise ValueError("call update_mbox_data() first")
+        total_pages = int(self.total_pages)
+        cur_page = int(self.current_page)
+        if cur_page < total_pages:
+            return Mailbox(self.parent_api, self.boxtype,
+                           str(cur_page + 1), self.sort)
+        raise ValueError("Already at page %d/%d" % (cur_page, total_pages))
+
+    def prev_page(self):
+        if not self.total_pages:
+            raise ValueError("call update_mbox_data() first")
+        total_pages = int(self.total_pages)
+        cur_page = int(self.current_page)
+        if cur_page > 1:
+            return Mailbox(self.parent_api, self.boxtype,
+                           str(cur_page - 1), self.sort)
+        raise ValueError("Already at page %d/%d" % (cur_page, total_pages))
+
+    def __repr__(self):
+        return "Mailbox: %s %s Page %s/%s" \
+                 % (self.boxtype, self.sort,
+                    self.current_page, self.total_pages)
diff --git a/lib/pygazelle/media.py b/lib/pygazelle/media.py
new file mode 100644
index 00000000..995f088e
--- /dev/null
+++ b/lib/pygazelle/media.py
@@ -0,0 +1,11 @@
+CD = "CD"
+DVD = "DVD"
+VINYL = "Vinyl"
+SOUNDBOARD = "Soundboard"
+SACD = "SACD"
+DAT = "DAT"
+CASETTE = "Casette"
+WEB = "WEB"
+BLU_RAY = "Blu-ray"
+
+ALL_MEDIAS = [CD, DVD, VINYL, SOUNDBOARD, SACD, DAT, CASETTE, WEB, BLU_RAY]
\ No newline at end of file
diff --git a/lib/pygazelle/release_type.py b/lib/pygazelle/release_type.py
new file mode 100644
index 00000000..31351195
--- /dev/null
+++ b/lib/pygazelle/release_type.py
@@ -0,0 +1,19 @@
+ALBUM = "Album"
+SOUNDTRACK = "Soundtrack"
+EP = "EP"
+ANTHOLOGY = "Anthology"
+COMPILATION = "Compilation"
+DJ_MIX = "DJ Mix"
+SINGLE = "Single"
+LIVE_ALBUM = "Live album"
+REMIX = "Remix"
+BOOTLEG = "Bootleg"
+INTERVIEW = "Interview"
+MIXTAPE = "Mixtape"
+UNKNOWN = "Unknown"
+
+ALL_RELEASE_TYPES = [ALBUM, SOUNDTRACK, EP, ANTHOLOGY, COMPILATION, DJ_MIX, SINGLE, LIVE_ALBUM, REMIX, BOOTLEG,
+                     INTERVIEW, MIXTAPE, UNKNOWN]
+
+def get_int_val(release_type):
+    return ALL_RELEASE_TYPES.index(release_type) + 1
\ No newline at end of file
diff --git a/lib/pygazelle/request.py b/lib/pygazelle/request.py
new file mode 100644
index 00000000..52b750e2
--- /dev/null
+++ b/lib/pygazelle/request.py
@@ -0,0 +1,29 @@
+class InvalidRequestException(Exception):
+    pass
+
+class Request(object):
+    def __init__(self, id, parent_api):
+        self.id = id
+        self.parent_api = parent_api
+        self.category = None
+        self.title = None
+        self.year = None
+        self.time_added = None
+        self.votes = None
+        self.bounty = None
+
+        self.parent_api.cached_requests[self.id] = self # add self to cache of known Request objects
+
+    def set_data(self, request_item_json_data):
+        if self.id != request_item_json_data['requestId']:
+            raise InvalidRequestException("Tried to update a Request's information from a request JSON item with a different id." +
+                                         " Should be %s, got %s" % (self.id, request_item_json_data['requestId']) )
+        self.category = self.parent_api.get_category(request_item_json_data['categoryId'])
+        self.title = request_item_json_data['title']
+        self.year = request_item_json_data['year']
+        self.time_added = request_item_json_data['timeAdded']
+        self.votes = request_item_json_data['votes']
+        self.bounty = request_item_json_data['bounty']
+
+    def __repr__(self):
+        return "Request: %s - ID: %s" % (self.title, self.id)
\ No newline at end of file
diff --git a/lib/pygazelle/tag.py b/lib/pygazelle/tag.py
new file mode 100644
index 00000000..91caab2c
--- /dev/null
+++ b/lib/pygazelle/tag.py
@@ -0,0 +1,17 @@
+class Tag(object):
+    def __init__(self, name, parent_api):
+        self.name = name
+        self.artist_counts = {}
+        self.parent_api = parent_api
+
+        self.parent_api.cached_tags[self.name] = self # add self to cache of known Tag objects
+
+    def set_artist_count(self, artist, count):
+        """
+        Adds an artist to the known list of artists tagged with this tag (if necessary), and sets the count of times
+        that that artist has been known to be tagged with this tag.
+        """
+        self.artist_counts[artist] = count
+
+    def __repr__(self):
+        return "Tag: %s" % self.name
\ No newline at end of file
diff --git a/lib/pygazelle/torrent.py b/lib/pygazelle/torrent.py
new file mode 100644
index 00000000..730cb841
--- /dev/null
+++ b/lib/pygazelle/torrent.py
@@ -0,0 +1,183 @@
+from HTMLParser import HTMLParser
+import re
+
+class InvalidTorrentException(Exception):
+    pass
+
+class Torrent(object):
+    def __init__(self, id, parent_api):
+        self.id = id
+        self.parent_api = parent_api
+        self.group = None
+        self.media = None
+        self.format = None
+        self.encoding = None
+        self.remaster_year = None
+        self.remastered = None
+        self.remaster_title = None
+        self.remaster_record_label = None
+        self.remaster_catalogue_number = None
+        self.scene = None
+        self.has_log = None
+        self.has_cue = None
+        self.log_score = None
+        self.file_count = None
+        self.free_torrent = None
+        self.size = None
+        self.leechers = None
+        self.seeders = None
+        self.snatched = None
+        self.time = None
+        self.has_file = None
+        self.description = None
+        self.file_list = []
+        self.file_path = None
+        self.user = None
+
+        self.parent_api.cached_torrents[self.id] = self
+
+    def set_torrent_complete_data(self, torrent_json_response):
+        if self.id != torrent_json_response['torrent']['id']:
+            raise InvalidTorrentException("Tried to update a Torrent's information from an 'artist' API call with a different id." +
+                                       " Should be %s, got %s" % (self.id, torrent_json_response['id']) )
+
+        self.group = self.parent_api.get_torrent_group(torrent_json_response['group']['id'])
+        had_complete_list = self.group.has_complete_torrent_list
+        self.group.set_group_data(torrent_json_response)
+        self.group.has_complete_torrent_list = had_complete_list
+
+        self.media = torrent_json_response['torrent']['media']
+        self.format = torrent_json_response['torrent']['format']
+        self.encoding = torrent_json_response['torrent']['encoding']
+        self.remaster_year = torrent_json_response['torrent']['remasterYear']
+        self.remastered = torrent_json_response['torrent']['remastered']
+        self.remaster_title = torrent_json_response['torrent']['remasterTitle']
+        self.remaster_record_label = torrent_json_response['torrent']['remasterRecordLabel']
+        self.scene = torrent_json_response['torrent']['scene']
+        self.has_log = torrent_json_response['torrent']['hasLog']
+        self.has_cue = torrent_json_response['torrent']['hasCue']
+        self.log_score = torrent_json_response['torrent']['logScore']
+        self.file_count = torrent_json_response['torrent']['fileCount']
+        self.free_torrent = torrent_json_response['torrent']['freeTorrent']
+        self.size = torrent_json_response['torrent']['size']
+        self.leechers = torrent_json_response['torrent']['leechers']
+        self.seeders = torrent_json_response['torrent']['seeders']
+        self.snatched = torrent_json_response['torrent']['snatched']
+        self.time = torrent_json_response['torrent']['time']
+        self.description = torrent_json_response['torrent']['description']
+        self.file_list = [ re.match("(.+){{{(\d+)}}}", item).groups()
+                           for item in torrent_json_response['torrent']['fileList'].split("|||") ] # tuple ( filename, filesize )
+        self.file_path = torrent_json_response['torrent']['filePath']
+        self.user = self.parent_api.get_user(torrent_json_response['torrent']['userId'])
+
+    def set_torrent_artist_data(self, artist_torrent_json_response):
+        if self.id != artist_torrent_json_response['id']:
+            raise InvalidTorrentException("Tried to update a Torrent's information from an 'artist' API call with a different id." +
+                                       " Should be %s, got %s" % (self.id, artist_torrent_json_response['id']) )
+
+        self.group = self.parent_api.get_torrent_group(artist_torrent_json_response['groupId'])
+        self.media = artist_torrent_json_response['media']
+        self.format = artist_torrent_json_response['format']
+        self.encoding = artist_torrent_json_response['encoding']
+        self.remaster_year = artist_torrent_json_response['remasterYear']
+        self.remastered = artist_torrent_json_response['remastered']
+        self.remaster_title = artist_torrent_json_response['remasterTitle']
+        self.remaster_record_label = artist_torrent_json_response['remasterRecordLabel']
+        self.scene = artist_torrent_json_response['scene']
+        self.has_log = artist_torrent_json_response['hasLog']
+        self.has_cue = artist_torrent_json_response['hasCue']
+        self.log_score = artist_torrent_json_response['logScore']
+        self.file_count = artist_torrent_json_response['fileCount']
+        self.free_torrent = artist_torrent_json_response['freeTorrent']
+        self.size = artist_torrent_json_response['size']
+        self.leechers = artist_torrent_json_response['leechers']
+        self.seeders = artist_torrent_json_response['seeders']
+        self.snatched = artist_torrent_json_response['snatched']
+        self.time = artist_torrent_json_response['time']
+        self.has_file = artist_torrent_json_response['hasFile']
+
+    def set_torrent_group_data(self, group_torrent_json_response):
+        if self.id != group_torrent_json_response['id']:
+            raise InvalidTorrentException("Tried to update a Torrent's information from a 'torrentgroup' API call with a different id." +
+                                          " Should be %s, got %s" % (self.id, group_torrent_json_response['id']) )
+
+        self.group = self.parent_api.get_torrent_group(group_torrent_json_response['groupId'])
+        self.media = group_torrent_json_response['media']
+        self.format = group_torrent_json_response['format']
+        self.encoding = group_torrent_json_response['encoding']
+        self.remastered = group_torrent_json_response['remastered']
+        self.remaster_year = group_torrent_json_response['remasterYear']
+        self.remaster_title = group_torrent_json_response['remasterTitle']
+        self.remaster_record_label = group_torrent_json_response['remasterRecordLabel']
+        self.remaster_catalogue_number = group_torrent_json_response['remasterCatalogueNumber']
+        self.scene = group_torrent_json_response['scene']
+        self.has_log = group_torrent_json_response['hasLog']
+        self.has_cue = group_torrent_json_response['hasCue']
+        self.log_score = group_torrent_json_response['logScore']
+        self.file_count = group_torrent_json_response['fileCount']
+        self.size = group_torrent_json_response['size']
+        self.seeders = group_torrent_json_response['seeders']
+        self.leechers = group_torrent_json_response['leechers']
+        self.snatched = group_torrent_json_response['snatched']
+        self.free_torrent = group_torrent_json_response['freeTorrent']
+        self.time = group_torrent_json_response['time']
+        self.description = group_torrent_json_response['description']
+        self.file_list = [ re.match("(.+){{{(\d+)}}}", item).groups()
+                           for item in group_torrent_json_response['fileList'].split("|||") ] # tuple ( filename, filesize )
+        self.file_path = group_torrent_json_response['filePath']
+        self.user = self.parent_api.get_user(group_torrent_json_response['userId'])
+
+    def set_torrent_search_data(self, search_torrent_json_response):
+        if self.id != search_torrent_json_response['torrentId']:
+            raise InvalidTorrentException("Tried to update a Torrent's information from a 'browse'/search API call with a different id." +
+                                  " Should be %s, got %s" % (self.id, search_torrent_json_response['torrentId']) )
+
+        # TODO: Add conditionals to handle torrents that aren't music
+        self.group = self.parent_api.get_torrent_group(search_torrent_json_response['groupId'])
+        self.remastered = search_torrent_json_response['remastered']
+        self.remaster_year = search_torrent_json_response['remasterYear']
+        self.remaster_title = search_torrent_json_response['remasterTitle']
+        self.remaster_catalogue_number = search_torrent_json_response['remasterCatalogueNumber']
+        self.media = search_torrent_json_response['media']
+        self.format = search_torrent_json_response['format']
+        self.encoding = search_torrent_json_response['encoding']
+        self.has_log = search_torrent_json_response['hasLog']
+        self.has_cue = search_torrent_json_response['hasCue']
+        self.log_score = search_torrent_json_response['logScore']
+        self.scene = search_torrent_json_response['scene']
+        self.file_count = search_torrent_json_response['fileCount']
+        self.size = search_torrent_json_response['size']
+        self.seeders = search_torrent_json_response['seeders']
+        self.leechers = search_torrent_json_response['leechers']
+        self.snatched = search_torrent_json_response['snatches']
+        self.free_torrent = search_torrent_json_response['isFreeleech'] or search_torrent_json_response['isPersonalFreeleech']
+        self.time = search_torrent_json_response['time']
+
+    def set_torrent_top_10_data(self, top_10_json_response):
+        if self.id != top_10_json_response['torrentId']:
+            raise InvalidTorrentException("Tried to update a Torrent's information from a 'browse'/search API call with a different id." +
+                                          " Should be %s, got %s" % (self.id, top_10_json_response['torrentId']) )
+
+        # TODO: Add conditionals to handle torrents that aren't music
+        self.group = self.parent_api.get_torrent_group(top_10_json_response['groupId'])
+        self.group.name = top_10_json_response['groupName']
+        if not self.group.music_info and top_10_json_response['artist']:
+            self.group.music_info = {'artists': [self.parent_api.get_artist(name=HTMLParser().unescape(top_10_json_response['artist']))]}
+        self.remaster_title = top_10_json_response['remasterTitle']
+        self.media = top_10_json_response['media']
+        self.format = top_10_json_response['format']
+        self.encoding = top_10_json_response['encoding']
+        self.has_log = top_10_json_response['hasLog']
+        self.has_cue = top_10_json_response['hasCue']
+        self.scene = top_10_json_response['scene']
+        self.seeders = top_10_json_response['seeders']
+        self.leechers = top_10_json_response['leechers']
+        self.snatched = top_10_json_response['snatched']
+
+
+    def __repr__(self):
+        if self.group:
+            groupname = self.group.name
+        else:
+            groupname = "Unknown Group"
+        return "Torrent: %s - %s - ID: %s" % (groupname, self.encoding, self.id)
diff --git a/lib/pygazelle/torrent_group.py b/lib/pygazelle/torrent_group.py
new file mode 100644
index 00000000..e9d15625
--- /dev/null
+++ b/lib/pygazelle/torrent_group.py
@@ -0,0 +1,139 @@
+from .torrent import Torrent
+
+class InvalidTorrentGroupException(Exception):
+    pass
+
+class TorrentGroup(object):
+    """
+    Represents a Torrent Group (usually an album). Note that TorrentGroup.torrents may not be comprehensive if you
+    haven't called TorrentGroup.update_group_data()...it may have only been populated with filtered search results.
+    Check TorrentGroup.has_complete_torrent_list (boolean) to be sure.
+    """
+    def __init__(self, id, parent_api):
+        self.id = id
+        self.parent_api = parent_api
+        self.name = None
+        self.wiki_body = None
+        self.wiki_image = None
+        self.year = None
+        self.record_label = None
+        self.catalogue_number = None
+        self.tags = []
+        self.release_type = None
+        self.vanity_house = None
+        self.has_bookmarked = None
+        self.category = None
+        self.time = None
+        self.music_info = None
+        self.torrents = []
+        self.has_complete_torrent_list = False
+
+        self.parent_api.cached_torrent_groups[self.id] = self
+
+    def update_group_data(self):
+        response = self.parent_api.request(action='torrentgroup', id=self.id)
+        self.set_group_data(response)
+
+    def set_group_data(self, torrent_group_json_response):
+        """
+        Takes parsed JSON response from 'torrentgroup' action on api, and updates relevant information.
+        To avoid problems, only pass in data from an API call that used this torrentgroup's ID as an argument.
+        """
+        if self.id != torrent_group_json_response['group']['id']:
+            raise InvalidTorrentGroupException("Tried to update a TorrentGroup's information from an 'artist' API call with a different id." +
+                                               " Should be %s, got %s" % (self.id, torrent_group_json_response['group']['groupId']) )
+
+        self.name = torrent_group_json_response['group']['name']
+        self.year = torrent_group_json_response['group']['year']
+        self.wiki_body = torrent_group_json_response['group']['wikiBody']
+        self.wiki_image = torrent_group_json_response['group']['wikiImage']
+        self.record_label = torrent_group_json_response['group']['recordLabel']
+        self.catalogue_number = torrent_group_json_response['group']['catalogueNumber']
+
+        self.release_type = torrent_group_json_response['group']['releaseType']
+        self.category = self.parent_api.get_category(torrent_group_json_response['group']['categoryId'],
+                                                     torrent_group_json_response['group']['categoryName'])
+        self.time = torrent_group_json_response['group']['time']
+        self.vanity_house = torrent_group_json_response['group']['vanityHouse']
+
+        self.music_info = torrent_group_json_response['group']['musicInfo']
+        self.music_info['artists'] = [ self.parent_api.get_artist(artist['id'], artist['name'])
+                                       for artist in self.music_info['artists'] ]
+        self.music_info['with'] = [ self.parent_api.get_artist(artist['id'], artist['name'])
+                                       for artist in self.music_info['with'] ]
+
+        if 'torrents' in torrent_group_json_response:
+            self.torrents = []
+            for torrent_dict in torrent_group_json_response['torrents']:
+                torrent_dict['groupId'] = self.id
+                torrent = self.parent_api.get_torrent(torrent_dict['id'])
+                torrent.set_torrent_group_data(torrent_dict)
+                self.torrents.append(torrent)
+            self.has_complete_torrent_list = True
+        elif 'torrent' in torrent_group_json_response:
+            torrent = self.parent_api.get_torrent(torrent_group_json_response['torrent']['id'])
+            self.torrents.append(torrent)
+
+    def set_artist_group_data(self, artist_group_json_response):
+        """
+        Takes torrentgroup section from parsed JSON response from 'artist' action on api, and updates relevant information.
+        """
+        if self.id != artist_group_json_response['groupId']:
+            raise InvalidTorrentGroupException("Tried to update a TorrentGroup's information from an 'artist' API call with a different id." +
+                               " Should be %s, got %s" % (self.id, artist_group_json_response['groupId']) )
+
+        self.name = artist_group_json_response['groupName']
+        self.year = artist_group_json_response['groupYear']
+        self.record_label = artist_group_json_response['groupRecordLabel']
+        self.catalogue_number = artist_group_json_response['groupCatalogueNumber']
+
+        self.tags = []
+        for tag_name in artist_group_json_response['tags']:
+            tag = self.parent_api.get_tag(tag_name)
+            self.tags.append(tag)
+
+        self.release_type = artist_group_json_response['releaseType']
+        self.has_bookmarked = artist_group_json_response['hasBookmarked']
+
+        self.torrents = []
+        for torrent_dict in artist_group_json_response['torrent']:
+            torrent = self.parent_api.get_torrent(torrent_dict['id'])
+            torrent.set_torrent_artist_data(torrent_dict)
+            self.torrents.append(torrent)
+        self.has_complete_torrent_list = True
+
+    def set_torrent_search_data(self, search_json_response):
+        if self.id != search_json_response['groupId']:
+            raise InvalidTorrentGroupException("Tried to update a TorrentGroup's information from an 'browse'/search API call with a different id." +
+                                       " Should be %s, got %s" % (self.id, search_json_response['groupId']) )
+
+        self.name = search_json_response['groupName']
+        # purposefully ignoring search_json_response['artist']...the other data updates don't include it, would just get confusing
+        self.tags = []
+        for tag_name in search_json_response['tags']:
+            tag = self.parent_api.get_tag(tag_name)
+            self.tags.append(tag)
+        # some of the below keys aren't in things like comics...should probably watch out for this elsewhere
+        if 'bookmarked' in search_json_response.keys():
+            self.has_bookmarked = search_json_response['bookmarked']
+        if 'vanityHouse' in search_json_response.keys():
+            self.vanity_house = search_json_response['vanityHouse']
+        if 'groupYear' in search_json_response.keys():
+            self.year = search_json_response['groupYear']
+        if 'releaseType' in search_json_response.keys():
+            self.release_type = search_json_response['releaseType']
+        self.time = search_json_response['groupTime']
+        if 'torrentId' in search_json_response.keys():
+            search_json_response['torrents'] = [{'torrentId': search_json_response['torrentId']}]
+
+        new_torrents = []
+        for torrent_dict in search_json_response['torrents']:
+            torrent_dict['groupId'] = self.id
+            torrent = self.parent_api.get_torrent(torrent_dict['torrentId'])
+            new_torrents.append(torrent)
+        # torrent information gets populated in API search call, no need to duplicate that here
+        self.torrents = self.torrents + new_torrents
+
+
+    def __repr__(self):
+        return "TorrentGroup: %s - ID: %s" % (self.name, self.id)
diff --git a/lib/pygazelle/user.py b/lib/pygazelle/user.py
new file mode 100644
index 00000000..fc1d6a9a
--- /dev/null
+++ b/lib/pygazelle/user.py
@@ -0,0 +1,108 @@
+
+
+class InvalidUserException(Exception):
+    pass
+
+class User(object):
+    """
+    This class represents a User, whether your own or someone else's. It is created knowing only its ID. To reduce
+    API accesses, load information using User.update_index_data() or User.update_user_data only as needed.
+    """
+    def __init__(self, id, parent_api):
+        self.id = id
+        self.parent_api = parent_api
+        self.username = None
+        self.authkey = None
+        self.passkey = None
+        self.avatar = None
+        self.is_friend = None
+        self.profile_text = None
+        self.notifications = None
+        self.stats = None
+        self.ranks = None
+        self.personal = None
+        self.community = None
+
+        self.parent_api.cached_users[self.id] = self # add self to cache of known User objects
+
+    def update_index_data(self):
+        """
+        Calls 'index' API action, then updates this User objects information with it.
+        NOTE: Only call if this user is the logged-in user...throws InvalidUserException otherwise.
+        """
+        response = self.parent_api.request(action='index')
+        self.set_index_data(response)
+
+    def set_index_data(self, index_json_response):
+        """
+        Takes parsed JSON response from 'index' action on api, and updates the available subset of user information.
+        ONLY callable if this User object represents the currently logged in user. Throws InvalidUserException otherwise.
+        """
+        if self.id != index_json_response['id']:
+            raise InvalidUserException("Tried to update non-logged-in User's information from 'index' API call." +
+                                       " Should be %s, got %s" % (self.id, index_json_response['id']) )
+
+        self.username = index_json_response['username']
+
+        self.authkey = index_json_response['authkey']
+        self.passkey = index_json_response['passkey']
+        self.notifications = index_json_response['notifications']
+        if self.stats:
+            self.stats = dict(self.stats.items() + index_json_response['userstats'].items()) # merge in new info
+        else:
+            self.stats = index_json_response['userstats']
+
+        # cross pollinate some data that is located in multiple locations in API
+        if self.personal:
+            self.personal['class'] = self.stats['class']
+            self.personal['passkey'] = self.passkey
+
+
+    def update_user_data(self):
+        response = self.parent_api.request(action='user', id=self.id)
+        self.set_user_data(response)
+
+    def set_user_data(self, user_json_response):
+        """
+        Takes parsed JSON response from 'user' action on api, and updates relevant user information.
+        To avoid problems, only pass in user data from an API call that used this user's ID as an argument.
+        """
+        if self.username and self.username != user_json_response['username']:
+            raise InvalidUserException("Tried to update a user's information from a 'user' API call with a different username." +
+                                       " Should be %s, got %s" % (self.username, user_json_response['username']) )
+
+        self.username = user_json_response['username']
+        self.avatar = user_json_response['avatar']
+        self.is_friend = user_json_response['isFriend']
+        self.profile_text = user_json_response['profileText']
+        if self.stats:
+            self.stats = dict(self.stats.items() + user_json_response['stats'].items()) # merge in new info
+        else:
+            self.stats = user_json_response['stats']
+        self.ranks = user_json_response['ranks']
+        self.personal = user_json_response['personal']
+        self.community = user_json_response['community']
+
+        # cross pollinate some data that is located in multiple locations in API
+        self.stats['class'] = self.personal['class']
+        self.passkey = self.personal['passkey']
+
+    def set_search_result_data(self, search_result_item):
+        """
+        Takes a single user result item from a 'usersearch' API call and updates user info.
+        """
+        if self.id != search_result_item['userId']:
+            raise InvalidUserException("Tried to update existing user with another user's search result data (IDs don't match).")
+
+        self.username = search_result_item['username']
+
+        if not self.personal:
+            self.personal = {}
+
+        self.personal['donor'] = search_result_item['donor']
+        self.personal['warned'] = search_result_item['warned']
+        self.personal['enabled'] = search_result_item['enabled']
+        self.personal['class'] = search_result_item['class']
+
+    def __repr__(self):
+        return "User: %s - ID: %s" % (self.username, self.id)
diff --git a/lib/pynma/__init__.py b/lib/pynma/__init__.py
new file mode 100644
index 00000000..cbd82cfd
--- /dev/null
+++ b/lib/pynma/__init__.py
@@ -0,0 +1,4 @@
+#!/usr/bin/python
+
+from pynma import PyNMA
+
diff --git a/lib/pynma/pynma.py b/lib/pynma/pynma.py
new file mode 100644
index 00000000..2bbe3f42
--- /dev/null
+++ b/lib/pynma/pynma.py
@@ -0,0 +1,137 @@
+#!/usr/bin/python
+
+from xml.dom.minidom import parseString
+from httplib import HTTPSConnection
+from urllib import urlencode
+
+__version__ = "0.1"
+
+API_SERVER = 'www.notifymyandroid.com'
+ADD_PATH   = '/publicapi/notify'
+
+USER_AGENT="PyNMA/v%s"%__version__
+
+def uniq_preserve(seq): # Dave Kirby
+    # Order preserving
+    seen = set()
+    return [x for x in seq if x not in seen and not seen.add(x)]
+
+def uniq(seq):
+    # Not order preserving
+    return {}.fromkeys(seq).keys()
+
+class PyNMA(object):
+    """PyNMA(apikey=[], developerkey=None)
+        takes 2 optional arguments:
+            - (opt) apykey:      might me a string containing 1 key or an array of keys
+            - (opt) developerkey: where you can store your developer key
+    """
+
+    def __init__(self, apikey=[], developerkey=None):
+        self._developerkey = None
+        self.developerkey(developerkey)
+        if apikey:
+            if type(apikey) == str:
+                apikey = [apikey]
+        self._apikey          = uniq(apikey)
+
+    def addkey(self, key):
+        "Add a key (register ?)"
+        if type(key) == str:
+            if not key in self._apikey:
+                self._apikey.append(key)
+        elif type(key) == list:
+            for k in key:
+                if not k in self._apikey:
+                    self._apikey.append(k)
+
+    def delkey(self, key):
+        "Removes a key (unregister ?)"
+        if type(key) == str:
+            if key in self._apikey:
+                self._apikey.remove(key)
+        elif type(key) == list:
+            for k in key:
+                if key in self._apikey:
+                    self._apikey.remove(k)
+
+    def developerkey(self, developerkey):
+        "Sets the developer key (and check it has the good length)"
+        if type(developerkey) == str and len(developerkey) == 48:
+            self._developerkey = developerkey
+
+    def push(self, application="", event="", description="", url="", priority=0, batch_mode=False):
+        """Pushes a message on the registered API keys.
+            takes 5 arguments:
+                - (req) application: application name [256]
+                - (req) event:       event name       [1000]
+                - (req) description: description      [10000]
+                - (opt) url:         url              [512]
+                - (opt) priority:    from -2 (lowest) to 2 (highest) (def:0)
+                - (opt) batch_mode:  call API 5 by 5 (def:False)
+
+            Warning: using batch_mode will return error only if all API keys are bad
+            cf: http://nma.usk.bz/api.php
+        """
+        datas = {
+            'application': application[:256].encode('utf8'),
+            'event':       event[:1024].encode('utf8'),
+            'description': description[:10000].encode('utf8'),
+            'priority':    priority
+        }
+
+        if url:
+            datas['url'] = url[:512]
+
+        if self._developerkey:
+            datas['developerkey'] = self._developerkey
+
+        results = {}
+
+        if not batch_mode:
+            for key in self._apikey:
+                datas['apikey'] = key
+                res = self.callapi('POST', ADD_PATH, datas)
+                results[key] = res
+        else:
+            for i in range(0, len(self._apikey), 5):
+                datas['apikey'] = ",".join(self._apikey[i:i+5])
+                res = self.callapi('POST', ADD_PATH, datas)
+                results[datas['apikey']] = res
+        return results
+
+    def callapi(self, method, path, args):
+        headers = { 'User-Agent': USER_AGENT }
+        if method == "POST":
+            headers['Content-type'] = "application/x-www-form-urlencoded"
+        http_handler = HTTPSConnection(API_SERVER)
+        http_handler.request(method, path, urlencode(args), headers)
+        resp = http_handler.getresponse()
+
+        try:
+            res = self._parse_reponse(resp.read())
+        except Exception, e:
+            res = {'type':    "pynmaerror",
+                   'code':    600,
+                   'message': str(e)
+                   }
+            pass
+
+        return res
+
+    def _parse_reponse(self, response):
+        root = parseString(response).firstChild
+        for elem in root.childNodes:
+            if elem.nodeType == elem.TEXT_NODE: continue
+            if elem.tagName == 'success':
+                res = dict(elem.attributes.items())
+                res['message'] = ""
+                res['type']    = elem.tagName
+                return res
+            if elem.tagName == 'error':
+                res = dict(elem.attributes.items())
+                res['message'] = elem.firstChild.nodeValue
+                res['type']    = elem.tagName
+                return res
+
+
diff --git a/lib/pyparsing/__init__.py b/lib/pyparsing/__init__.py
deleted file mode 100644
index 543ceb62..00000000
--- a/lib/pyparsing/__init__.py
+++ /dev/null
@@ -1,326 +0,0 @@
-# module pyparsing.py
-#
-# Copyright (c) 2003-2022  Paul T. McGuire
-#
-# 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.
-#
-
-__doc__ = """
-pyparsing module - Classes and methods to define and execute parsing grammars
-=============================================================================
-
-The pyparsing module is an alternative approach to creating and
-executing simple grammars, vs. the traditional lex/yacc approach, or the
-use of regular expressions.  With pyparsing, you don't need to learn
-a new syntax for defining grammars or matching expressions - the parsing
-module provides a library of classes that you use to construct the
-grammar directly in Python.
-
-Here is a program to parse "Hello, World!" (or any greeting of the form
-``"<salutation>, <addressee>!"``), built up using :class:`Word`,
-:class:`Literal`, and :class:`And` elements
-(the :meth:`'+'<ParserElement.__add__>` operators create :class:`And` expressions,
-and the strings are auto-converted to :class:`Literal` expressions)::
-
-    from pyparsing import Word, alphas
-
-    # define grammar of a greeting
-    greet = Word(alphas) + "," + Word(alphas) + "!"
-
-    hello = "Hello, World!"
-    print(hello, "->", greet.parse_string(hello))
-
-The program outputs the following::
-
-    Hello, World! -> ['Hello', ',', 'World', '!']
-
-The Python representation of the grammar is quite readable, owing to the
-self-explanatory class names, and the use of :class:`'+'<And>`,
-:class:`'|'<MatchFirst>`, :class:`'^'<Or>` and :class:`'&'<Each>` operators.
-
-The :class:`ParseResults` object returned from
-:class:`ParserElement.parse_string` can be
-accessed as a nested list, a dictionary, or an object with named
-attributes.
-
-The pyparsing module handles some of the problems that are typically
-vexing when writing text parsers:
-
-  - extra or missing whitespace (the above program will also handle
-    "Hello,World!", "Hello  ,  World  !", etc.)
-  - quoted strings
-  - embedded comments
-
-
-Getting Started -
------------------
-Visit the classes :class:`ParserElement` and :class:`ParseResults` to
-see the base classes that most other pyparsing
-classes inherit from. Use the docstrings for examples of how to:
-
- - construct literal match expressions from :class:`Literal` and
-   :class:`CaselessLiteral` classes
- - construct character word-group expressions using the :class:`Word`
-   class
- - see how to create repetitive expressions using :class:`ZeroOrMore`
-   and :class:`OneOrMore` classes
- - use :class:`'+'<And>`, :class:`'|'<MatchFirst>`, :class:`'^'<Or>`,
-   and :class:`'&'<Each>` operators to combine simple expressions into
-   more complex ones
- - associate names with your parsed results using
-   :class:`ParserElement.set_results_name`
- - access the parsed data, which is returned as a :class:`ParseResults`
-   object
- - find some helpful expression short-cuts like :class:`DelimitedList`
-   and :class:`one_of`
- - find more useful common expressions in the :class:`pyparsing_common`
-   namespace class
-"""
-from typing import NamedTuple
-
-
-class version_info(NamedTuple):
-    major: int
-    minor: int
-    micro: int
-    releaselevel: str
-    serial: int
-
-    @property
-    def __version__(self):
-        return (
-            f"{self.major}.{self.minor}.{self.micro}"
-            + (
-                f"{'r' if self.releaselevel[0] == 'c' else ''}{self.releaselevel[0]}{self.serial}",
-                "",
-            )[self.releaselevel == "final"]
-        )
-
-    def __str__(self):
-        return f"{__name__} {self.__version__} / {__version_time__}"
-
-    def __repr__(self):
-        return f"{__name__}.{type(self).__name__}({', '.join('{}={!r}'.format(*nv) for nv in zip(self._fields, self))})"
-
-
-__version_info__ = version_info(3, 2, 0, "final", 1)
-__version_time__ = "13 Oct 2024 09:46 UTC"
-__version__ = __version_info__.__version__
-__versionTime__ = __version_time__
-__author__ = "Paul McGuire <ptmcg.gm+pyparsing@gmail.com>"
-
-from .util import *
-from .exceptions import *
-from .actions import *
-from .core import __diag__, __compat__
-from .results import *
-from .core import *
-from .core import _builtin_exprs as core_builtin_exprs
-from .helpers import *
-from .helpers import _builtin_exprs as helper_builtin_exprs
-
-from .unicode import unicode_set, UnicodeRangeList, pyparsing_unicode as unicode
-from .testing import pyparsing_test as testing
-from .common import (
-    pyparsing_common as common,
-    _builtin_exprs as common_builtin_exprs,
-)
-
-# Compatibility synonyms
-if "pyparsing_unicode" not in globals():
-    pyparsing_unicode = unicode  # type: ignore[misc]
-if "pyparsing_common" not in globals():
-    pyparsing_common = common
-if "pyparsing_test" not in globals():
-    pyparsing_test = testing
-
-core_builtin_exprs += common_builtin_exprs + helper_builtin_exprs
-
-
-__all__ = [
-    "__version__",
-    "__version_time__",
-    "__author__",
-    "__compat__",
-    "__diag__",
-    "And",
-    "AtLineStart",
-    "AtStringStart",
-    "CaselessKeyword",
-    "CaselessLiteral",
-    "CharsNotIn",
-    "CloseMatch",
-    "Combine",
-    "DelimitedList",
-    "Dict",
-    "Each",
-    "Empty",
-    "FollowedBy",
-    "Forward",
-    "GoToColumn",
-    "Group",
-    "IndentedBlock",
-    "Keyword",
-    "LineEnd",
-    "LineStart",
-    "Literal",
-    "Located",
-    "PrecededBy",
-    "MatchFirst",
-    "NoMatch",
-    "NotAny",
-    "OneOrMore",
-    "OnlyOnce",
-    "OpAssoc",
-    "Opt",
-    "Optional",
-    "Or",
-    "ParseBaseException",
-    "ParseElementEnhance",
-    "ParseException",
-    "ParseExpression",
-    "ParseFatalException",
-    "ParseResults",
-    "ParseSyntaxException",
-    "ParserElement",
-    "PositionToken",
-    "QuotedString",
-    "RecursiveGrammarException",
-    "Regex",
-    "SkipTo",
-    "StringEnd",
-    "StringStart",
-    "Suppress",
-    "Tag",
-    "Token",
-    "TokenConverter",
-    "White",
-    "Word",
-    "WordEnd",
-    "WordStart",
-    "ZeroOrMore",
-    "Char",
-    "alphanums",
-    "alphas",
-    "alphas8bit",
-    "any_close_tag",
-    "any_open_tag",
-    "autoname_elements",
-    "c_style_comment",
-    "col",
-    "common_html_entity",
-    "condition_as_parse_action",
-    "counted_array",
-    "cpp_style_comment",
-    "dbl_quoted_string",
-    "dbl_slash_comment",
-    "delimited_list",
-    "dict_of",
-    "empty",
-    "hexnums",
-    "html_comment",
-    "identchars",
-    "identbodychars",
-    "infix_notation",
-    "java_style_comment",
-    "line",
-    "line_end",
-    "line_start",
-    "lineno",
-    "make_html_tags",
-    "make_xml_tags",
-    "match_only_at_col",
-    "match_previous_expr",
-    "match_previous_literal",
-    "nested_expr",
-    "null_debug_action",
-    "nums",
-    "one_of",
-    "original_text_for",
-    "printables",
-    "punc8bit",
-    "pyparsing_common",
-    "pyparsing_test",
-    "pyparsing_unicode",
-    "python_style_comment",
-    "quoted_string",
-    "remove_quotes",
-    "replace_with",
-    "replace_html_entity",
-    "rest_of_line",
-    "sgl_quoted_string",
-    "srange",
-    "string_end",
-    "string_start",
-    "token_map",
-    "trace_parse_action",
-    "ungroup",
-    "unicode_set",
-    "unicode_string",
-    "with_attribute",
-    "with_class",
-    # pre-PEP8 compatibility names
-    "__versionTime__",
-    "anyCloseTag",
-    "anyOpenTag",
-    "cStyleComment",
-    "commonHTMLEntity",
-    "conditionAsParseAction",
-    "countedArray",
-    "cppStyleComment",
-    "dblQuotedString",
-    "dblSlashComment",
-    "delimitedList",
-    "dictOf",
-    "htmlComment",
-    "indentedBlock",
-    "infixNotation",
-    "javaStyleComment",
-    "lineEnd",
-    "lineStart",
-    "locatedExpr",
-    "makeHTMLTags",
-    "makeXMLTags",
-    "matchOnlyAtCol",
-    "matchPreviousExpr",
-    "matchPreviousLiteral",
-    "nestedExpr",
-    "nullDebugAction",
-    "oneOf",
-    "opAssoc",
-    "originalTextFor",
-    "pythonStyleComment",
-    "quotedString",
-    "removeQuotes",
-    "replaceHTMLEntity",
-    "replaceWith",
-    "restOfLine",
-    "sglQuotedString",
-    "stringEnd",
-    "stringStart",
-    "tokenMap",
-    "traceParseAction",
-    "unicodeString",
-    "withAttribute",
-    "withClass",
-    "common",
-    "unicode",
-    "testing",
-]
diff --git a/lib/pyparsing/actions.py b/lib/pyparsing/actions.py
deleted file mode 100644
index 1d2dce99..00000000
--- a/lib/pyparsing/actions.py
+++ /dev/null
@@ -1,206 +0,0 @@
-# actions.py
-
-from .exceptions import ParseException
-from .util import col, replaced_by_pep8
-
-
-class OnlyOnce:
-    """
-    Wrapper for parse actions, to ensure they are only called once.
-    """
-
-    def __init__(self, method_call):
-        from .core import _trim_arity
-
-        self.callable = _trim_arity(method_call)
-        self.called = False
-
-    def __call__(self, s, l, t):
-        if not self.called:
-            results = self.callable(s, l, t)
-            self.called = True
-            return results
-        raise ParseException(s, l, "OnlyOnce obj called multiple times w/out reset")
-
-    def reset(self):
-        """
-        Allow the associated parse action to be called once more.
-        """
-
-        self.called = False
-
-
-def match_only_at_col(n):
-    """
-    Helper method for defining parse actions that require matching at
-    a specific column in the input text.
-    """
-
-    def verify_col(strg, locn, toks):
-        if col(locn, strg) != n:
-            raise ParseException(strg, locn, f"matched token not at column {n}")
-
-    return verify_col
-
-
-def replace_with(repl_str):
-    """
-    Helper method for common parse actions that simply return
-    a literal value.  Especially useful when used with
-    :class:`transform_string<ParserElement.transform_string>` ().
-
-    Example::
-
-        num = Word(nums).set_parse_action(lambda toks: int(toks[0]))
-        na = one_of("N/A NA").set_parse_action(replace_with(math.nan))
-        term = na | num
-
-        term[1, ...].parse_string("324 234 N/A 234") # -> [324, 234, nan, 234]
-    """
-    return lambda s, l, t: [repl_str]
-
-
-def remove_quotes(s, l, t):
-    """
-    Helper parse action for removing quotation marks from parsed
-    quoted strings.
-
-    Example::
-
-        # by default, quotation marks are included in parsed results
-        quoted_string.parse_string("'Now is the Winter of our Discontent'") # -> ["'Now is the Winter of our Discontent'"]
-
-        # use remove_quotes to strip quotation marks from parsed results
-        quoted_string.set_parse_action(remove_quotes)
-        quoted_string.parse_string("'Now is the Winter of our Discontent'") # -> ["Now is the Winter of our Discontent"]
-    """
-    return t[0][1:-1]
-
-
-def with_attribute(*args, **attr_dict):
-    """
-    Helper to create a validating parse action to be used with start
-    tags created with :class:`make_xml_tags` or
-    :class:`make_html_tags`. Use ``with_attribute`` to qualify
-    a starting tag with a required attribute value, to avoid false
-    matches on common tags such as ``<TD>`` or ``<DIV>``.
-
-    Call ``with_attribute`` with a series of attribute names and
-    values. Specify the list of filter attributes names and values as:
-
-    - keyword arguments, as in ``(align="right")``, or
-    - as an explicit dict with ``**`` operator, when an attribute
-      name is also a Python reserved word, as in ``**{"class":"Customer", "align":"right"}``
-    - a list of name-value tuples, as in ``(("ns1:class", "Customer"), ("ns2:align", "right"))``
-
-    For attribute names with a namespace prefix, you must use the second
-    form.  Attribute names are matched insensitive to upper/lower case.
-
-    If just testing for ``class`` (with or without a namespace), use
-    :class:`with_class`.
-
-    To verify that the attribute exists, but without specifying a value,
-    pass ``with_attribute.ANY_VALUE`` as the value.
-
-    Example::
-
-        html = '''
-            <div>
-            Some text
-            <div type="grid">1 4 0 1 0</div>
-            <div type="graph">1,3 2,3 1,1</div>
-            <div>this has no type</div>
-            </div>
-        '''
-        div,div_end = make_html_tags("div")
-
-        # only match div tag having a type attribute with value "grid"
-        div_grid = div().set_parse_action(with_attribute(type="grid"))
-        grid_expr = div_grid + SkipTo(div | div_end)("body")
-        for grid_header in grid_expr.search_string(html):
-            print(grid_header.body)
-
-        # construct a match with any div tag having a type attribute, regardless of the value
-        div_any_type = div().set_parse_action(with_attribute(type=with_attribute.ANY_VALUE))
-        div_expr = div_any_type + SkipTo(div | div_end)("body")
-        for div_header in div_expr.search_string(html):
-            print(div_header.body)
-
-    prints::
-
-        1 4 0 1 0
-
-        1 4 0 1 0
-        1,3 2,3 1,1
-    """
-    if args:
-        attrs = args[:]
-    else:
-        attrs = attr_dict.items()
-    attrs = [(k, v) for k, v in attrs]
-
-    def pa(s, l, tokens):
-        for attrName, attrValue in attrs:
-            if attrName not in tokens:
-                raise ParseException(s, l, "no matching attribute " + attrName)
-            if attrValue != with_attribute.ANY_VALUE and tokens[attrName] != attrValue:
-                raise ParseException(
-                    s,
-                    l,
-                    f"attribute {attrName!r} has value {tokens[attrName]!r}, must be {attrValue!r}",
-                )
-
-    return pa
-
-
-with_attribute.ANY_VALUE = object()  # type: ignore [attr-defined]
-
-
-def with_class(classname, namespace=""):
-    """
-    Simplified version of :class:`with_attribute` when
-    matching on a div class - made difficult because ``class`` is
-    a reserved word in Python.
-
-    Example::
-
-        html = '''
-            <div>
-            Some text
-            <div class="grid">1 4 0 1 0</div>
-            <div class="graph">1,3 2,3 1,1</div>
-            <div>this &lt;div&gt; has no class</div>
-            </div>
-
-        '''
-        div,div_end = make_html_tags("div")
-        div_grid = div().set_parse_action(with_class("grid"))
-
-        grid_expr = div_grid + SkipTo(div | div_end)("body")
-        for grid_header in grid_expr.search_string(html):
-            print(grid_header.body)
-
-        div_any_type = div().set_parse_action(with_class(withAttribute.ANY_VALUE))
-        div_expr = div_any_type + SkipTo(div | div_end)("body")
-        for div_header in div_expr.search_string(html):
-            print(div_header.body)
-
-    prints::
-
-        1 4 0 1 0
-
-        1 4 0 1 0
-        1,3 2,3 1,1
-    """
-    classattr = f"{namespace}:class" if namespace else "class"
-    return with_attribute(**{classattr: classname})
-
-
-# Compatibility synonyms
-# fmt: off
-replaceWith = replaced_by_pep8("replaceWith", replace_with)
-removeQuotes = replaced_by_pep8("removeQuotes", remove_quotes)
-withAttribute = replaced_by_pep8("withAttribute", with_attribute)
-withClass = replaced_by_pep8("withClass", with_class)
-matchOnlyAtCol = replaced_by_pep8("matchOnlyAtCol", match_only_at_col)
-# fmt: on
diff --git a/lib/pyparsing/common.py b/lib/pyparsing/common.py
deleted file mode 100644
index 649aad00..00000000
--- a/lib/pyparsing/common.py
+++ /dev/null
@@ -1,434 +0,0 @@
-# common.py
-from .core import *
-from .helpers import DelimitedList, any_open_tag, any_close_tag
-from datetime import datetime
-
-
-# some other useful expressions - using lower-case class name since we are really using this as a namespace
-class pyparsing_common:
-    """Here are some common low-level expressions that may be useful in
-    jump-starting parser development:
-
-    - numeric forms (:class:`integers<integer>`, :class:`reals<real>`,
-      :class:`scientific notation<sci_real>`)
-    - common :class:`programming identifiers<identifier>`
-    - network addresses (:class:`MAC<mac_address>`,
-      :class:`IPv4<ipv4_address>`, :class:`IPv6<ipv6_address>`)
-    - ISO8601 :class:`dates<iso8601_date>` and
-      :class:`datetime<iso8601_datetime>`
-    - :class:`UUID<uuid>`
-    - :class:`comma-separated list<comma_separated_list>`
-    - :class:`url`
-
-    Parse actions:
-
-    - :class:`convert_to_integer`
-    - :class:`convert_to_float`
-    - :class:`convert_to_date`
-    - :class:`convert_to_datetime`
-    - :class:`strip_html_tags`
-    - :class:`upcase_tokens`
-    - :class:`downcase_tokens`
-
-    Example::
-
-        pyparsing_common.number.run_tests('''
-            # any int or real number, returned as the appropriate type
-            100
-            -100
-            +100
-            3.14159
-            6.02e23
-            1e-12
-            ''')
-
-        pyparsing_common.fnumber.run_tests('''
-            # any int or real number, returned as float
-            100
-            -100
-            +100
-            3.14159
-            6.02e23
-            1e-12
-            ''')
-
-        pyparsing_common.hex_integer.run_tests('''
-            # hex numbers
-            100
-            FF
-            ''')
-
-        pyparsing_common.fraction.run_tests('''
-            # fractions
-            1/2
-            -3/4
-            ''')
-
-        pyparsing_common.mixed_integer.run_tests('''
-            # mixed fractions
-            1
-            1/2
-            -3/4
-            1-3/4
-            ''')
-
-        import uuid
-        pyparsing_common.uuid.set_parse_action(token_map(uuid.UUID))
-        pyparsing_common.uuid.run_tests('''
-            # uuid
-            12345678-1234-5678-1234-567812345678
-            ''')
-
-    prints::
-
-        # any int or real number, returned as the appropriate type
-        100
-        [100]
-
-        -100
-        [-100]
-
-        +100
-        [100]
-
-        3.14159
-        [3.14159]
-
-        6.02e23
-        [6.02e+23]
-
-        1e-12
-        [1e-12]
-
-        # any int or real number, returned as float
-        100
-        [100.0]
-
-        -100
-        [-100.0]
-
-        +100
-        [100.0]
-
-        3.14159
-        [3.14159]
-
-        6.02e23
-        [6.02e+23]
-
-        1e-12
-        [1e-12]
-
-        # hex numbers
-        100
-        [256]
-
-        FF
-        [255]
-
-        # fractions
-        1/2
-        [0.5]
-
-        -3/4
-        [-0.75]
-
-        # mixed fractions
-        1
-        [1]
-
-        1/2
-        [0.5]
-
-        -3/4
-        [-0.75]
-
-        1-3/4
-        [1.75]
-
-        # uuid
-        12345678-1234-5678-1234-567812345678
-        [UUID('12345678-1234-5678-1234-567812345678')]
-    """
-
-    convert_to_integer = token_map(int)
-    """
-    Parse action for converting parsed integers to Python int
-    """
-
-    convert_to_float = token_map(float)
-    """
-    Parse action for converting parsed numbers to Python float
-    """
-
-    integer = Word(nums).set_name("integer").set_parse_action(convert_to_integer)
-    """expression that parses an unsigned integer, returns an int"""
-
-    hex_integer = (
-        Word(hexnums).set_name("hex integer").set_parse_action(token_map(int, 16))
-    )
-    """expression that parses a hexadecimal integer, returns an int"""
-
-    signed_integer = (
-        Regex(r"[+-]?\d+")
-        .set_name("signed integer")
-        .set_parse_action(convert_to_integer)
-    )
-    """expression that parses an integer with optional leading sign, returns an int"""
-
-    fraction = (
-        signed_integer().set_parse_action(convert_to_float)
-        + "/"
-        + signed_integer().set_parse_action(convert_to_float)
-    ).set_name("fraction")
-    """fractional expression of an integer divided by an integer, returns a float"""
-    fraction.add_parse_action(lambda tt: tt[0] / tt[-1])
-
-    mixed_integer = (
-        fraction | signed_integer + Opt(Opt("-").suppress() + fraction)
-    ).set_name("fraction or mixed integer-fraction")
-    """mixed integer of the form 'integer - fraction', with optional leading integer, returns float"""
-    mixed_integer.add_parse_action(sum)
-
-    real = (
-        Regex(r"[+-]?(?:\d+\.\d*|\.\d+)")
-        .set_name("real number")
-        .set_parse_action(convert_to_float)
-    )
-    """expression that parses a floating point number and returns a float"""
-
-    sci_real = (
-        Regex(r"[+-]?(?:\d+(?:[eE][+-]?\d+)|(?:\d+\.\d*|\.\d+)(?:[eE][+-]?\d+)?)")
-        .set_name("real number with scientific notation")
-        .set_parse_action(convert_to_float)
-    )
-    """expression that parses a floating point number with optional
-    scientific notation and returns a float"""
-
-    # streamlining this expression makes the docs nicer-looking
-    number = (sci_real | real | signed_integer).set_name("number").streamline()
-    """any numeric expression, returns the corresponding Python type"""
-
-    fnumber = (
-        Regex(r"[+-]?\d+\.?\d*([eE][+-]?\d+)?")
-        .set_name("fnumber")
-        .set_parse_action(convert_to_float)
-    )
-    """any int or real number, returned as float"""
-
-    ieee_float = (
-        Regex(r"(?i)[+-]?((\d+\.?\d*(e[+-]?\d+)?)|nan|inf(inity)?)")
-        .set_name("ieee_float")
-        .set_parse_action(convert_to_float)
-    )
-    """any floating-point literal (int, real number, infinity, or NaN), returned as float"""
-
-    identifier = Word(identchars, identbodychars).set_name("identifier")
-    """typical code identifier (leading alpha or '_', followed by 0 or more alphas, nums, or '_')"""
-
-    ipv4_address = Regex(
-        r"(25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})(\.(25[0-5]|2[0-4][0-9]|1?[0-9]{1,2})){3}"
-    ).set_name("IPv4 address")
-    "IPv4 address (``0.0.0.0 - 255.255.255.255``)"
-
-    _ipv6_part = Regex(r"[0-9a-fA-F]{1,4}").set_name("hex_integer")
-    _full_ipv6_address = (_ipv6_part + (":" + _ipv6_part) * 7).set_name(
-        "full IPv6 address"
-    )
-    _short_ipv6_address = (
-        Opt(_ipv6_part + (":" + _ipv6_part) * (0, 6))
-        + "::"
-        + Opt(_ipv6_part + (":" + _ipv6_part) * (0, 6))
-    ).set_name("short IPv6 address")
-    _short_ipv6_address.add_condition(
-        lambda t: sum(1 for tt in t if pyparsing_common._ipv6_part.matches(tt)) < 8
-    )
-    _mixed_ipv6_address = ("::ffff:" + ipv4_address).set_name("mixed IPv6 address")
-    ipv6_address = Combine(
-        (_full_ipv6_address | _mixed_ipv6_address | _short_ipv6_address).set_name(
-            "IPv6 address"
-        )
-    ).set_name("IPv6 address")
-    "IPv6 address (long, short, or mixed form)"
-
-    mac_address = Regex(
-        r"[0-9a-fA-F]{2}([:.-])[0-9a-fA-F]{2}(?:\1[0-9a-fA-F]{2}){4}"
-    ).set_name("MAC address")
-    "MAC address xx:xx:xx:xx:xx (may also have '-' or '.' delimiters)"
-
-    @staticmethod
-    def convert_to_date(fmt: str = "%Y-%m-%d"):
-        """
-        Helper to create a parse action for converting parsed date string to Python datetime.date
-
-        Params -
-        - fmt - format to be passed to datetime.strptime (default= ``"%Y-%m-%d"``)
-
-        Example::
-
-            date_expr = pyparsing_common.iso8601_date.copy()
-            date_expr.set_parse_action(pyparsing_common.convert_to_date())
-            print(date_expr.parse_string("1999-12-31"))
-
-        prints::
-
-            [datetime.date(1999, 12, 31)]
-        """
-
-        def cvt_fn(ss, ll, tt):
-            try:
-                return datetime.strptime(tt[0], fmt).date()
-            except ValueError as ve:
-                raise ParseException(ss, ll, str(ve))
-
-        return cvt_fn
-
-    @staticmethod
-    def convert_to_datetime(fmt: str = "%Y-%m-%dT%H:%M:%S.%f"):
-        """Helper to create a parse action for converting parsed
-        datetime string to Python datetime.datetime
-
-        Params -
-        - fmt - format to be passed to datetime.strptime (default= ``"%Y-%m-%dT%H:%M:%S.%f"``)
-
-        Example::
-
-            dt_expr = pyparsing_common.iso8601_datetime.copy()
-            dt_expr.set_parse_action(pyparsing_common.convert_to_datetime())
-            print(dt_expr.parse_string("1999-12-31T23:59:59.999"))
-
-        prints::
-
-            [datetime.datetime(1999, 12, 31, 23, 59, 59, 999000)]
-        """
-
-        def cvt_fn(s, l, t):
-            try:
-                return datetime.strptime(t[0], fmt)
-            except ValueError as ve:
-                raise ParseException(s, l, str(ve))
-
-        return cvt_fn
-
-    iso8601_date = Regex(
-        r"(?P<year>\d{4})(?:-(?P<month>\d\d)(?:-(?P<day>\d\d))?)?"
-    ).set_name("ISO8601 date")
-    "ISO8601 date (``yyyy-mm-dd``)"
-
-    iso8601_datetime = Regex(
-        r"(?P<year>\d{4})-(?P<month>\d\d)-(?P<day>\d\d)[T ](?P<hour>\d\d):(?P<minute>\d\d)(:(?P<second>\d\d(\.\d*)?)?)?(?P<tz>Z|[+-]\d\d:?\d\d)?"
-    ).set_name("ISO8601 datetime")
-    "ISO8601 datetime (``yyyy-mm-ddThh:mm:ss.s(Z|+-00:00)``) - trailing seconds, milliseconds, and timezone optional; accepts separating ``'T'`` or ``' '``"
-
-    uuid = Regex(r"[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}").set_name("UUID")
-    "UUID (``xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx``)"
-
-    _html_stripper = any_open_tag.suppress() | any_close_tag.suppress()
-
-    @staticmethod
-    def strip_html_tags(s: str, l: int, tokens: ParseResults):
-        """Parse action to remove HTML tags from web page HTML source
-
-        Example::
-
-            # strip HTML links from normal text
-            text = '<td>More info at the <a href="https://github.com/pyparsing/pyparsing/wiki">pyparsing</a> wiki page</td>'
-            td, td_end = make_html_tags("TD")
-            table_text = td + SkipTo(td_end).set_parse_action(pyparsing_common.strip_html_tags)("body") + td_end
-            print(table_text.parse_string(text).body)
-
-        Prints::
-
-            More info at the pyparsing wiki page
-        """
-        return pyparsing_common._html_stripper.transform_string(tokens[0])
-
-    _commasepitem = (
-        Combine(
-            OneOrMore(
-                ~Literal(",")
-                + ~LineEnd()
-                + Word(printables, exclude_chars=",")
-                + Opt(White(" \t") + ~FollowedBy(LineEnd() | ","))
-            )
-        )
-        .streamline()
-        .set_name("commaItem")
-    )
-    comma_separated_list = DelimitedList(
-        Opt(quoted_string.copy() | _commasepitem, default="")
-    ).set_name("comma separated list")
-    """Predefined expression of 1 or more printable words or quoted strings, separated by commas."""
-
-    upcase_tokens = staticmethod(token_map(lambda t: t.upper()))
-    """Parse action to convert tokens to upper case."""
-
-    downcase_tokens = staticmethod(token_map(lambda t: t.lower()))
-    """Parse action to convert tokens to lower case."""
-
-    # fmt: off
-    url = Regex(
-        # https://mathiasbynens.be/demo/url-regex
-        # https://gist.github.com/dperini/729294
-        r"(?P<url>" +
-        # protocol identifier (optional)
-        # short syntax // still required
-        r"(?:(?:(?P<scheme>https?|ftp):)?\/\/)" +
-        # user:pass BasicAuth (optional)
-        r"(?:(?P<auth>\S+(?::\S*)?)@)?" +
-        r"(?P<host>" +
-        # IP address exclusion
-        # private & local networks
-        r"(?!(?:10|127)(?:\.\d{1,3}){3})" +
-        r"(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})" +
-        r"(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})" +
-        # IP address dotted notation octets
-        # excludes loopback network 0.0.0.0
-        # excludes reserved space >= 224.0.0.0
-        # excludes network & broadcast addresses
-        # (first & last IP address of each class)
-        r"(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])" +
-        r"(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}" +
-        r"(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))" +
-        r"|" +
-        # host & domain names, may end with dot
-        # can be replaced by a shortest alternative
-        # (?![-_])(?:[-\w\u00a1-\uffff]{0,63}[^-_]\.)+
-        r"(?:" +
-        r"(?:" +
-        r"[a-z0-9\u00a1-\uffff]" +
-        r"[a-z0-9\u00a1-\uffff_-]{0,62}" +
-        r")?" +
-        r"[a-z0-9\u00a1-\uffff]\." +
-        r")+" +
-        # TLD identifier name, may end with dot
-        r"(?:[a-z\u00a1-\uffff]{2,}\.?)" +
-        r")" +
-        # port number (optional)
-        r"(:(?P<port>\d{2,5}))?" +
-        # resource path (optional)
-        r"(?P<path>\/[^?# ]*)?" +
-        # query string (optional)
-        r"(\?(?P<query>[^#]*))?" +
-        # fragment (optional)
-        r"(#(?P<fragment>\S*))?" +
-        r")"
-    ).set_name("url")
-    """URL (http/https/ftp scheme)"""
-    # fmt: on
-
-    # pre-PEP8 compatibility names
-    # fmt: off
-    convertToInteger = staticmethod(replaced_by_pep8("convertToInteger", convert_to_integer))
-    convertToFloat = staticmethod(replaced_by_pep8("convertToFloat", convert_to_float))
-    convertToDate = staticmethod(replaced_by_pep8("convertToDate", convert_to_date))
-    convertToDatetime = staticmethod(replaced_by_pep8("convertToDatetime", convert_to_datetime))
-    stripHTMLTags = staticmethod(replaced_by_pep8("stripHTMLTags", strip_html_tags))
-    upcaseTokens = staticmethod(replaced_by_pep8("upcaseTokens", upcase_tokens))
-    downcaseTokens = staticmethod(replaced_by_pep8("downcaseTokens", downcase_tokens))
-    # fmt: on
-
-
-_builtin_exprs = [
-    v for v in vars(pyparsing_common).values() if isinstance(v, ParserElement)
-]
diff --git a/lib/pyparsing/core.py b/lib/pyparsing/core.py
deleted file mode 100644
index 4f43c3bf..00000000
--- a/lib/pyparsing/core.py
+++ /dev/null
@@ -1,6227 +0,0 @@
-#
-# core.py
-#
-from __future__ import annotations
-
-import collections.abc
-from collections import deque
-import os
-import typing
-from typing import (
-    Any,
-    Callable,
-    Generator,
-    NamedTuple,
-    Sequence,
-    TextIO,
-    Union,
-    cast,
-)
-from abc import ABC, abstractmethod
-from enum import Enum
-import string
-import copy
-import warnings
-import re
-import sys
-from collections.abc import Iterable
-import traceback
-import types
-from operator import itemgetter
-from functools import wraps
-from threading import RLock
-from pathlib import Path
-
-from .util import (
-    _FifoCache,
-    _UnboundedCache,
-    __config_flags,
-    _collapse_string_to_ranges,
-    _escape_regex_range_chars,
-    _bslash,
-    _flatten,
-    LRUMemo as _LRUMemo,
-    UnboundedMemo as _UnboundedMemo,
-    replaced_by_pep8,
-)
-from .exceptions import *
-from .actions import *
-from .results import ParseResults, _ParseResultsWithOffset
-from .unicode import pyparsing_unicode
-
-_MAX_INT = sys.maxsize
-str_type: tuple[type, ...] = (str, bytes)
-
-#
-# Copyright (c) 2003-2022  Paul T. McGuire
-#
-# 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.
-#
-
-from functools import cached_property
-
-
-class __compat__(__config_flags):
-    """
-    A cross-version compatibility configuration for pyparsing features that will be
-    released in a future version. By setting values in this configuration to True,
-    those features can be enabled in prior versions for compatibility development
-    and testing.
-
-    - ``collect_all_And_tokens`` - flag to enable fix for Issue #63 that fixes erroneous grouping
-      of results names when an :class:`And` expression is nested within an :class:`Or` or :class:`MatchFirst`;
-      maintained for compatibility, but setting to ``False`` no longer restores pre-2.3.1
-      behavior
-    """
-
-    _type_desc = "compatibility"
-
-    collect_all_And_tokens = True
-
-    _all_names = [__ for __ in locals() if not __.startswith("_")]
-    _fixed_names = """
-        collect_all_And_tokens
-        """.split()
-
-
-class __diag__(__config_flags):
-    _type_desc = "diagnostic"
-
-    warn_multiple_tokens_in_named_alternation = False
-    warn_ungrouped_named_tokens_in_collection = False
-    warn_name_set_on_empty_Forward = False
-    warn_on_parse_using_empty_Forward = False
-    warn_on_assignment_to_Forward = False
-    warn_on_multiple_string_args_to_oneof = False
-    warn_on_match_first_with_lshift_operator = False
-    enable_debug_on_named_expressions = False
-
-    _all_names = [__ for __ in locals() if not __.startswith("_")]
-    _warning_names = [name for name in _all_names if name.startswith("warn")]
-    _debug_names = [name for name in _all_names if name.startswith("enable_debug")]
-
-    @classmethod
-    def enable_all_warnings(cls) -> None:
-        for name in cls._warning_names:
-            cls.enable(name)
-
-
-class Diagnostics(Enum):
-    """
-    Diagnostic configuration (all default to disabled)
-
-    - ``warn_multiple_tokens_in_named_alternation`` - flag to enable warnings when a results
-      name is defined on a :class:`MatchFirst` or :class:`Or` expression with one or more :class:`And` subexpressions
-    - ``warn_ungrouped_named_tokens_in_collection`` - flag to enable warnings when a results
-      name is defined on a containing expression with ungrouped subexpressions that also
-      have results names
-    - ``warn_name_set_on_empty_Forward`` - flag to enable warnings when a :class:`Forward` is defined
-      with a results name, but has no contents defined
-    - ``warn_on_parse_using_empty_Forward`` - flag to enable warnings when a :class:`Forward` is
-      defined in a grammar but has never had an expression attached to it
-    - ``warn_on_assignment_to_Forward`` - flag to enable warnings when a :class:`Forward` is defined
-      but is overwritten by assigning using ``'='`` instead of ``'<<='`` or ``'<<'``
-    - ``warn_on_multiple_string_args_to_oneof`` - flag to enable warnings when :class:`one_of` is
-      incorrectly called with multiple str arguments
-    - ``enable_debug_on_named_expressions`` - flag to auto-enable debug on all subsequent
-      calls to :class:`ParserElement.set_name`
-
-    Diagnostics are enabled/disabled by calling :class:`enable_diag` and :class:`disable_diag`.
-    All warnings can be enabled by calling :class:`enable_all_warnings`.
-    """
-
-    warn_multiple_tokens_in_named_alternation = 0
-    warn_ungrouped_named_tokens_in_collection = 1
-    warn_name_set_on_empty_Forward = 2
-    warn_on_parse_using_empty_Forward = 3
-    warn_on_assignment_to_Forward = 4
-    warn_on_multiple_string_args_to_oneof = 5
-    warn_on_match_first_with_lshift_operator = 6
-    enable_debug_on_named_expressions = 7
-
-
-def enable_diag(diag_enum: Diagnostics) -> None:
-    """
-    Enable a global pyparsing diagnostic flag (see :class:`Diagnostics`).
-    """
-    __diag__.enable(diag_enum.name)
-
-
-def disable_diag(diag_enum: Diagnostics) -> None:
-    """
-    Disable a global pyparsing diagnostic flag (see :class:`Diagnostics`).
-    """
-    __diag__.disable(diag_enum.name)
-
-
-def enable_all_warnings() -> None:
-    """
-    Enable all global pyparsing diagnostic warnings (see :class:`Diagnostics`).
-    """
-    __diag__.enable_all_warnings()
-
-
-# hide abstract class
-del __config_flags
-
-
-def _should_enable_warnings(
-    cmd_line_warn_options: typing.Iterable[str], warn_env_var: typing.Optional[str]
-) -> bool:
-    enable = bool(warn_env_var)
-    for warn_opt in cmd_line_warn_options:
-        w_action, w_message, w_category, w_module, w_line = (warn_opt + "::::").split(
-            ":"
-        )[:5]
-        if not w_action.lower().startswith("i") and (
-            not (w_message or w_category or w_module) or w_module == "pyparsing"
-        ):
-            enable = True
-        elif w_action.lower().startswith("i") and w_module in ("pyparsing", ""):
-            enable = False
-    return enable
-
-
-if _should_enable_warnings(
-    sys.warnoptions, os.environ.get("PYPARSINGENABLEALLWARNINGS")
-):
-    enable_all_warnings()
-
-
-# build list of single arg builtins, that can be used as parse actions
-# fmt: off
-_single_arg_builtins = {
-    sum, len, sorted, reversed, list, tuple, set, any, all, min, max
-}
-# fmt: on
-
-_generatorType = types.GeneratorType
-ParseImplReturnType = tuple[int, Any]
-PostParseReturnType = Union[ParseResults, Sequence[ParseResults]]
-ParseAction = Union[
-    Callable[[], Any],
-    Callable[[ParseResults], Any],
-    Callable[[int, ParseResults], Any],
-    Callable[[str, int, ParseResults], Any],
-]
-ParseCondition = Union[
-    Callable[[], bool],
-    Callable[[ParseResults], bool],
-    Callable[[int, ParseResults], bool],
-    Callable[[str, int, ParseResults], bool],
-]
-ParseFailAction = Callable[[str, int, "ParserElement", Exception], None]
-DebugStartAction = Callable[[str, int, "ParserElement", bool], None]
-DebugSuccessAction = Callable[
-    [str, int, int, "ParserElement", ParseResults, bool], None
-]
-DebugExceptionAction = Callable[[str, int, "ParserElement", Exception, bool], None]
-
-
-alphas: str = string.ascii_uppercase + string.ascii_lowercase
-identchars: str = pyparsing_unicode.Latin1.identchars
-identbodychars: str = pyparsing_unicode.Latin1.identbodychars
-nums: str = "0123456789"
-hexnums: str = nums + "ABCDEFabcdef"
-alphanums: str = alphas + nums
-printables: str = "".join([c for c in string.printable if c not in string.whitespace])
-
-
-class _ParseActionIndexError(Exception):
-    """
-    Internal wrapper around IndexError so that IndexErrors raised inside
-    parse actions aren't misinterpreted as IndexErrors raised inside
-    ParserElement parseImpl methods.
-    """
-
-    def __init__(self, msg: str, exc: BaseException):
-        self.msg: str = msg
-        self.exc: BaseException = exc
-
-
-_trim_arity_call_line: traceback.StackSummary = None  # type: ignore[assignment]
-pa_call_line_synth = ()
-
-
-def _trim_arity(func, max_limit=3):
-    """decorator to trim function calls to match the arity of the target"""
-    global _trim_arity_call_line, pa_call_line_synth
-
-    if func in _single_arg_builtins:
-        return lambda s, l, t: func(t)
-
-    limit = 0
-    found_arity = False
-
-    # synthesize what would be returned by traceback.extract_stack at the call to
-    # user's parse action 'func', so that we don't incur call penalty at parse time
-
-    # fmt: off
-    LINE_DIFF = 9
-    # IF ANY CODE CHANGES, EVEN JUST COMMENTS OR BLANK LINES, BETWEEN THE NEXT LINE AND
-    # THE CALL TO FUNC INSIDE WRAPPER, LINE_DIFF MUST BE MODIFIED!!!!
-    _trim_arity_call_line = _trim_arity_call_line or traceback.extract_stack(limit=2)[-1]
-    pa_call_line_synth = pa_call_line_synth or (_trim_arity_call_line[0], _trim_arity_call_line[1] + LINE_DIFF)
-
-    def wrapper(*args):
-        nonlocal found_arity, limit
-        if found_arity:
-            return func(*args[limit:])
-        while 1:
-            try:
-                ret = func(*args[limit:])
-                found_arity = True
-                return ret
-            except TypeError as te:
-                # re-raise TypeErrors if they did not come from our arity testing
-                if found_arity:
-                    raise
-                else:
-                    tb = te.__traceback__
-                    frames = traceback.extract_tb(tb, limit=2)
-                    frame_summary = frames[-1]
-                    trim_arity_type_error = (
-                        [frame_summary[:2]][-1][:2] == pa_call_line_synth
-                    )
-                    del tb
-
-                    if trim_arity_type_error:
-                        if limit < max_limit:
-                            limit += 1
-                            continue
-
-                    raise
-            except IndexError as ie:
-                # wrap IndexErrors inside a _ParseActionIndexError
-                raise _ParseActionIndexError(
-                    "IndexError raised in parse action", ie
-                ).with_traceback(None)
-    # fmt: on
-
-    # copy func name to wrapper for sensible debug output
-    # (can't use functools.wraps, since that messes with function signature)
-    func_name = getattr(func, "__name__", getattr(func, "__class__").__name__)
-    wrapper.__name__ = func_name
-    wrapper.__doc__ = func.__doc__
-
-    return wrapper
-
-
-def condition_as_parse_action(
-    fn: ParseCondition, message: typing.Optional[str] = None, fatal: bool = False
-) -> ParseAction:
-    """
-    Function to convert a simple predicate function that returns ``True`` or ``False``
-    into a parse action. Can be used in places when a parse action is required
-    and :class:`ParserElement.add_condition` cannot be used (such as when adding a condition
-    to an operator level in :class:`infix_notation`).
-
-    Optional keyword arguments:
-
-    - ``message`` - define a custom message to be used in the raised exception
-    - ``fatal`` - if True, will raise :class:`ParseFatalException` to stop parsing immediately;
-      otherwise will raise :class:`ParseException`
-
-    """
-    msg = message if message is not None else "failed user-defined condition"
-    exc_type = ParseFatalException if fatal else ParseException
-    fn = _trim_arity(fn)
-
-    @wraps(fn)
-    def pa(s, l, t):
-        if not bool(fn(s, l, t)):
-            raise exc_type(s, l, msg)
-
-    return pa
-
-
-def _default_start_debug_action(
-    instring: str, loc: int, expr: ParserElement, cache_hit: bool = False
-):
-    cache_hit_str = "*" if cache_hit else ""
-    print(
-        (
-            f"{cache_hit_str}Match {expr} at loc {loc}({lineno(loc, instring)},{col(loc, instring)})\n"
-            f"  {line(loc, instring)}\n"
-            f"  {' ' * (col(loc, instring) - 1)}^"
-        )
-    )
-
-
-def _default_success_debug_action(
-    instring: str,
-    startloc: int,
-    endloc: int,
-    expr: ParserElement,
-    toks: ParseResults,
-    cache_hit: bool = False,
-):
-    cache_hit_str = "*" if cache_hit else ""
-    print(f"{cache_hit_str}Matched {expr} -> {toks.as_list()}")
-
-
-def _default_exception_debug_action(
-    instring: str,
-    loc: int,
-    expr: ParserElement,
-    exc: Exception,
-    cache_hit: bool = False,
-):
-    cache_hit_str = "*" if cache_hit else ""
-    print(f"{cache_hit_str}Match {expr} failed, {type(exc).__name__} raised: {exc}")
-
-
-def null_debug_action(*args):
-    """'Do-nothing' debug action, to suppress debugging output during parsing."""
-
-
-class ParserElement(ABC):
-    """Abstract base level parser element class."""
-
-    DEFAULT_WHITE_CHARS: str = " \n\t\r"
-    verbose_stacktrace: bool = False
-    _literalStringClass: type = None  # type: ignore[assignment]
-
-    @staticmethod
-    def set_default_whitespace_chars(chars: str) -> None:
-        r"""
-        Overrides the default whitespace chars
-
-        Example::
-
-            # default whitespace chars are space, <TAB> and newline
-            Word(alphas)[1, ...].parse_string("abc def\nghi jkl")  # -> ['abc', 'def', 'ghi', 'jkl']
-
-            # change to just treat newline as significant
-            ParserElement.set_default_whitespace_chars(" \t")
-            Word(alphas)[1, ...].parse_string("abc def\nghi jkl")  # -> ['abc', 'def']
-        """
-        ParserElement.DEFAULT_WHITE_CHARS = chars
-
-        # update whitespace all parse expressions defined in this module
-        for expr in _builtin_exprs:
-            if expr.copyDefaultWhiteChars:
-                expr.whiteChars = set(chars)
-
-    @staticmethod
-    def inline_literals_using(cls: type) -> None:
-        """
-        Set class to be used for inclusion of string literals into a parser.
-
-        Example::
-
-            # default literal class used is Literal
-            integer = Word(nums)
-            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
-
-            date_str.parse_string("1999/12/31")  # -> ['1999', '/', '12', '/', '31']
-
-
-            # change to Suppress
-            ParserElement.inline_literals_using(Suppress)
-            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
-
-            date_str.parse_string("1999/12/31")  # -> ['1999', '12', '31']
-        """
-        ParserElement._literalStringClass = cls
-
-    @classmethod
-    def using_each(cls, seq, **class_kwargs):
-        """
-        Yields a sequence of ``class(obj, **class_kwargs)`` for obj in seq.
-
-        Example::
-
-            LPAR, RPAR, LBRACE, RBRACE, SEMI = Suppress.using_each("(){};")
-
-        """
-        yield from (cls(obj, **class_kwargs) for obj in seq)
-
-    class DebugActions(NamedTuple):
-        debug_try: typing.Optional[DebugStartAction]
-        debug_match: typing.Optional[DebugSuccessAction]
-        debug_fail: typing.Optional[DebugExceptionAction]
-
-    def __init__(self, savelist: bool = False):
-        self.parseAction: list[ParseAction] = list()
-        self.failAction: typing.Optional[ParseFailAction] = None
-        self.customName: str = None  # type: ignore[assignment]
-        self._defaultName: typing.Optional[str] = None
-        self.resultsName: str = None  # type: ignore[assignment]
-        self.saveAsList = savelist
-        self.skipWhitespace = True
-        self.whiteChars = set(ParserElement.DEFAULT_WHITE_CHARS)
-        self.copyDefaultWhiteChars = True
-        # used when checking for left-recursion
-        self.mayReturnEmpty = False
-        self.keepTabs = False
-        self.ignoreExprs: list[ParserElement] = list()
-        self.debug = False
-        self.streamlined = False
-        # optimize exception handling for subclasses that don't advance parse index
-        self.mayIndexError = True
-        self.errmsg: Union[str, None] = ""
-        # mark results names as modal (report only last) or cumulative (list all)
-        self.modalResults = True
-        # custom debug actions
-        self.debugActions = self.DebugActions(None, None, None)
-        # avoid redundant calls to preParse
-        self.callPreparse = True
-        self.callDuringTry = False
-        self.suppress_warnings_: list[Diagnostics] = []
-
-    def suppress_warning(self, warning_type: Diagnostics) -> ParserElement:
-        """
-        Suppress warnings emitted for a particular diagnostic on this expression.
-
-        Example::
-
-            base = pp.Forward()
-            base.suppress_warning(Diagnostics.warn_on_parse_using_empty_Forward)
-
-            # statement would normally raise a warning, but is now suppressed
-            print(base.parse_string("x"))
-
-        """
-        self.suppress_warnings_.append(warning_type)
-        return self
-
-    def visit_all(self):
-        """General-purpose method to yield all expressions and sub-expressions
-        in a grammar. Typically just for internal use.
-        """
-        to_visit = deque([self])
-        seen = set()
-        while to_visit:
-            cur = to_visit.popleft()
-
-            # guard against looping forever through recursive grammars
-            if cur in seen:
-                continue
-            seen.add(cur)
-
-            to_visit.extend(cur.recurse())
-            yield cur
-
-    def copy(self) -> ParserElement:
-        """
-        Make a copy of this :class:`ParserElement`.  Useful for defining
-        different parse actions for the same parsing pattern, using copies of
-        the original parse element.
-
-        Example::
-
-            integer = Word(nums).set_parse_action(lambda toks: int(toks[0]))
-            integerK = integer.copy().add_parse_action(lambda toks: toks[0] * 1024) + Suppress("K")
-            integerM = integer.copy().add_parse_action(lambda toks: toks[0] * 1024 * 1024) + Suppress("M")
-
-            print((integerK | integerM | integer)[1, ...].parse_string("5K 100 640K 256M"))
-
-        prints::
-
-            [5120, 100, 655360, 268435456]
-
-        Equivalent form of ``expr.copy()`` is just ``expr()``::
-
-            integerM = integer().add_parse_action(lambda toks: toks[0] * 1024 * 1024) + Suppress("M")
-        """
-        cpy = copy.copy(self)
-        cpy.parseAction = self.parseAction[:]
-        cpy.ignoreExprs = self.ignoreExprs[:]
-        if self.copyDefaultWhiteChars:
-            cpy.whiteChars = set(ParserElement.DEFAULT_WHITE_CHARS)
-        return cpy
-
-    def set_results_name(
-        self, name: str, list_all_matches: bool = False, *, listAllMatches: bool = False
-    ) -> ParserElement:
-        """
-        Define name for referencing matching tokens as a nested attribute
-        of the returned parse results.
-
-        Normally, results names are assigned as you would assign keys in a dict:
-        any existing value is overwritten by later values. If it is necessary to
-        keep all values captured for a particular results name, call ``set_results_name``
-        with ``list_all_matches`` = True.
-
-        NOTE: ``set_results_name`` returns a *copy* of the original :class:`ParserElement` object;
-        this is so that the client can define a basic element, such as an
-        integer, and reference it in multiple places with different names.
-
-        You can also set results names using the abbreviated syntax,
-        ``expr("name")`` in place of ``expr.set_results_name("name")``
-        - see :class:`__call__`. If ``list_all_matches`` is required, use
-        ``expr("name*")``.
-
-        Example::
-
-            integer = Word(nums)
-            date_str = (integer.set_results_name("year") + '/'
-                        + integer.set_results_name("month") + '/'
-                        + integer.set_results_name("day"))
-
-            # equivalent form:
-            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
-        """
-        listAllMatches = listAllMatches or list_all_matches
-        return self._setResultsName(name, listAllMatches)
-
-    def _setResultsName(self, name, list_all_matches=False) -> ParserElement:
-        if name is None:
-            return self
-        newself = self.copy()
-        if name.endswith("*"):
-            name = name[:-1]
-            list_all_matches = True
-        newself.resultsName = name
-        newself.modalResults = not list_all_matches
-        return newself
-
-    def set_break(self, break_flag: bool = True) -> ParserElement:
-        """
-        Method to invoke the Python pdb debugger when this element is
-        about to be parsed. Set ``break_flag`` to ``True`` to enable, ``False`` to
-        disable.
-        """
-        if break_flag:
-            _parseMethod = self._parse
-
-            def breaker(instring, loc, do_actions=True, callPreParse=True):
-                # this call to breakpoint() is intentional, not a checkin error
-                breakpoint()
-                return _parseMethod(instring, loc, do_actions, callPreParse)
-
-            breaker._originalParseMethod = _parseMethod  # type: ignore [attr-defined]
-            self._parse = breaker  # type: ignore [method-assign]
-        elif hasattr(self._parse, "_originalParseMethod"):
-            self._parse = self._parse._originalParseMethod  # type: ignore [method-assign]
-        return self
-
-    def set_parse_action(self, *fns: ParseAction, **kwargs: Any) -> ParserElement:
-        """
-        Define one or more actions to perform when successfully matching parse element definition.
-
-        Parse actions can be called to perform data conversions, do extra validation,
-        update external data structures, or enhance or replace the parsed tokens.
-        Each parse action ``fn`` is a callable method with 0-3 arguments, called as
-        ``fn(s, loc, toks)`` , ``fn(loc, toks)`` , ``fn(toks)`` , or just ``fn()`` , where:
-
-        - ``s``    = the original string being parsed (see note below)
-        - ``loc``  = the location of the matching substring
-        - ``toks`` = a list of the matched tokens, packaged as a :class:`ParseResults` object
-
-        The parsed tokens are passed to the parse action as ParseResults. They can be
-        modified in place using list-style append, extend, and pop operations to update
-        the parsed list elements; and with dictionary-style item set and del operations
-        to add, update, or remove any named results. If the tokens are modified in place,
-        it is not necessary to return them with a return statement.
-
-        Parse actions can also completely replace the given tokens, with another ``ParseResults``
-        object, or with some entirely different object (common for parse actions that perform data
-        conversions). A convenient way to build a new parse result is to define the values
-        using a dict, and then create the return value using :class:`ParseResults.from_dict`.
-
-        If None is passed as the ``fn`` parse action, all previously added parse actions for this
-        expression are cleared.
-
-        Optional keyword arguments:
-
-        - ``call_during_try`` = (default= ``False``) indicate if parse action should be run during
-          lookaheads and alternate testing. For parse actions that have side effects, it is
-          important to only call the parse action once it is determined that it is being
-          called as part of a successful parse. For parse actions that perform additional
-          validation, then call_during_try should be passed as True, so that the validation
-          code is included in the preliminary "try" parses.
-
-        Note: the default parsing behavior is to expand tabs in the input string
-        before starting the parsing process.  See :class:`parse_string` for more
-        information on parsing strings containing ``<TAB>`` s, and suggested
-        methods to maintain a consistent view of the parsed string, the parse
-        location, and line and column positions within the parsed string.
-
-        Example::
-
-            # parse dates in the form YYYY/MM/DD
-
-            # use parse action to convert toks from str to int at parse time
-            def convert_to_int(toks):
-                return int(toks[0])
-
-            # use a parse action to verify that the date is a valid date
-            def is_valid_date(instring, loc, toks):
-                from datetime import date
-                year, month, day = toks[::2]
-                try:
-                    date(year, month, day)
-                except ValueError:
-                    raise ParseException(instring, loc, "invalid date given")
-
-            integer = Word(nums)
-            date_str = integer + '/' + integer + '/' + integer
-
-            # add parse actions
-            integer.set_parse_action(convert_to_int)
-            date_str.set_parse_action(is_valid_date)
-
-            # note that integer fields are now ints, not strings
-            date_str.run_tests('''
-                # successful parse - note that integer fields were converted to ints
-                1999/12/31
-
-                # fail - invalid date
-                1999/13/31
-                ''')
-        """
-        if list(fns) == [None]:
-            self.parseAction.clear()
-            return self
-
-        if not all(callable(fn) for fn in fns):
-            raise TypeError("parse actions must be callable")
-        self.parseAction[:] = [_trim_arity(fn) for fn in fns]
-        self.callDuringTry = kwargs.get(
-            "call_during_try", kwargs.get("callDuringTry", False)
-        )
-
-        return self
-
-    def add_parse_action(self, *fns: ParseAction, **kwargs: Any) -> ParserElement:
-        """
-        Add one or more parse actions to expression's list of parse actions. See :class:`set_parse_action`.
-
-        See examples in :class:`copy`.
-        """
-        self.parseAction += [_trim_arity(fn) for fn in fns]
-        self.callDuringTry = self.callDuringTry or kwargs.get(
-            "call_during_try", kwargs.get("callDuringTry", False)
-        )
-        return self
-
-    def add_condition(self, *fns: ParseCondition, **kwargs: Any) -> ParserElement:
-        """Add a boolean predicate function to expression's list of parse actions. See
-        :class:`set_parse_action` for function call signatures. Unlike ``set_parse_action``,
-        functions passed to ``add_condition`` need to return boolean success/fail of the condition.
-
-        Optional keyword arguments:
-
-        - ``message`` = define a custom message to be used in the raised exception
-        - ``fatal`` = if True, will raise ParseFatalException to stop parsing immediately; otherwise will raise
-          ParseException
-        - ``call_during_try`` = boolean to indicate if this method should be called during internal tryParse calls,
-          default=False
-
-        Example::
-
-            integer = Word(nums).set_parse_action(lambda toks: int(toks[0]))
-            year_int = integer.copy()
-            year_int.add_condition(lambda toks: toks[0] >= 2000, message="Only support years 2000 and later")
-            date_str = year_int + '/' + integer + '/' + integer
-
-            result = date_str.parse_string("1999/12/31")  # -> Exception: Only support years 2000 and later (at char 0),
-                                                                         (line:1, col:1)
-        """
-        for fn in fns:
-            self.parseAction.append(
-                condition_as_parse_action(
-                    fn,
-                    message=str(kwargs.get("message")),
-                    fatal=bool(kwargs.get("fatal", False)),
-                )
-            )
-
-        self.callDuringTry = self.callDuringTry or kwargs.get(
-            "call_during_try", kwargs.get("callDuringTry", False)
-        )
-        return self
-
-    def set_fail_action(self, fn: ParseFailAction) -> ParserElement:
-        """
-        Define action to perform if parsing fails at this expression.
-        Fail acton fn is a callable function that takes the arguments
-        ``fn(s, loc, expr, err)`` where:
-
-        - ``s`` = string being parsed
-        - ``loc`` = location where expression match was attempted and failed
-        - ``expr`` = the parse expression that failed
-        - ``err`` = the exception thrown
-
-        The function returns no value.  It may throw :class:`ParseFatalException`
-        if it is desired to stop parsing immediately."""
-        self.failAction = fn
-        return self
-
-    def _skipIgnorables(self, instring: str, loc: int) -> int:
-        if not self.ignoreExprs:
-            return loc
-        exprsFound = True
-        ignore_expr_fns = [e._parse for e in self.ignoreExprs]
-        last_loc = loc
-        while exprsFound:
-            exprsFound = False
-            for ignore_fn in ignore_expr_fns:
-                try:
-                    while 1:
-                        loc, dummy = ignore_fn(instring, loc)
-                        exprsFound = True
-                except ParseException:
-                    pass
-            # check if all ignore exprs matched but didn't actually advance the parse location
-            if loc == last_loc:
-                break
-            last_loc = loc
-        return loc
-
-    def preParse(self, instring: str, loc: int) -> int:
-        if self.ignoreExprs:
-            loc = self._skipIgnorables(instring, loc)
-
-        if self.skipWhitespace:
-            instrlen = len(instring)
-            white_chars = self.whiteChars
-            while loc < instrlen and instring[loc] in white_chars:
-                loc += 1
-
-        return loc
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        return loc, []
-
-    def postParse(self, instring, loc, tokenlist):
-        return tokenlist
-
-    # @profile
-    def _parseNoCache(
-        self, instring, loc, do_actions=True, callPreParse=True
-    ) -> tuple[int, ParseResults]:
-        debugging = self.debug  # and do_actions)
-        len_instring = len(instring)
-
-        if debugging or self.failAction:
-            # print("Match {} at loc {}({}, {})".format(self, loc, lineno(loc, instring), col(loc, instring)))
-            try:
-                if callPreParse and self.callPreparse:
-                    pre_loc = self.preParse(instring, loc)
-                else:
-                    pre_loc = loc
-                tokens_start = pre_loc
-                if self.debugActions.debug_try:
-                    self.debugActions.debug_try(instring, tokens_start, self, False)
-                if self.mayIndexError or pre_loc >= len_instring:
-                    try:
-                        loc, tokens = self.parseImpl(instring, pre_loc, do_actions)
-                    except IndexError:
-                        raise ParseException(instring, len_instring, self.errmsg, self)
-                else:
-                    loc, tokens = self.parseImpl(instring, pre_loc, do_actions)
-            except Exception as err:
-                # print("Exception raised:", err)
-                if self.debugActions.debug_fail:
-                    self.debugActions.debug_fail(
-                        instring, tokens_start, self, err, False
-                    )
-                if self.failAction:
-                    self.failAction(instring, tokens_start, self, err)
-                raise
-        else:
-            if callPreParse and self.callPreparse:
-                pre_loc = self.preParse(instring, loc)
-            else:
-                pre_loc = loc
-            tokens_start = pre_loc
-            if self.mayIndexError or pre_loc >= len_instring:
-                try:
-                    loc, tokens = self.parseImpl(instring, pre_loc, do_actions)
-                except IndexError:
-                    raise ParseException(instring, len_instring, self.errmsg, self)
-            else:
-                loc, tokens = self.parseImpl(instring, pre_loc, do_actions)
-
-        tokens = self.postParse(instring, loc, tokens)
-
-        ret_tokens = ParseResults(
-            tokens, self.resultsName, asList=self.saveAsList, modal=self.modalResults
-        )
-        if self.parseAction and (do_actions or self.callDuringTry):
-            if debugging:
-                try:
-                    for fn in self.parseAction:
-                        try:
-                            tokens = fn(instring, tokens_start, ret_tokens)  # type: ignore [call-arg, arg-type]
-                        except IndexError as parse_action_exc:
-                            exc = ParseException("exception raised in parse action")
-                            raise exc from parse_action_exc
-
-                        if tokens is not None and tokens is not ret_tokens:
-                            ret_tokens = ParseResults(
-                                tokens,
-                                self.resultsName,
-                                asList=self.saveAsList
-                                and isinstance(tokens, (ParseResults, list)),
-                                modal=self.modalResults,
-                            )
-                except Exception as err:
-                    # print "Exception raised in user parse action:", err
-                    if self.debugActions.debug_fail:
-                        self.debugActions.debug_fail(
-                            instring, tokens_start, self, err, False
-                        )
-                    raise
-            else:
-                for fn in self.parseAction:
-                    try:
-                        tokens = fn(instring, tokens_start, ret_tokens)  # type: ignore [call-arg, arg-type]
-                    except IndexError as parse_action_exc:
-                        exc = ParseException("exception raised in parse action")
-                        raise exc from parse_action_exc
-
-                    if tokens is not None and tokens is not ret_tokens:
-                        ret_tokens = ParseResults(
-                            tokens,
-                            self.resultsName,
-                            asList=self.saveAsList
-                            and isinstance(tokens, (ParseResults, list)),
-                            modal=self.modalResults,
-                        )
-        if debugging:
-            # print("Matched", self, "->", ret_tokens.as_list())
-            if self.debugActions.debug_match:
-                self.debugActions.debug_match(
-                    instring, tokens_start, loc, self, ret_tokens, False
-                )
-
-        return loc, ret_tokens
-
-    def try_parse(
-        self,
-        instring: str,
-        loc: int,
-        *,
-        raise_fatal: bool = False,
-        do_actions: bool = False,
-    ) -> int:
-        try:
-            return self._parse(instring, loc, do_actions=do_actions)[0]
-        except ParseFatalException:
-            if raise_fatal:
-                raise
-            raise ParseException(instring, loc, self.errmsg, self)
-
-    def can_parse_next(self, instring: str, loc: int, do_actions: bool = False) -> bool:
-        try:
-            self.try_parse(instring, loc, do_actions=do_actions)
-        except (ParseException, IndexError):
-            return False
-        else:
-            return True
-
-    # cache for left-recursion in Forward references
-    recursion_lock = RLock()
-    recursion_memos: collections.abc.MutableMapping[
-        tuple[int, Forward, bool], tuple[int, Union[ParseResults, Exception]]
-    ] = {}
-
-    class _CacheType(typing.Protocol):
-        """
-        Class to be used for packrat and left-recursion cacheing of results
-        and exceptions.
-        """
-
-        not_in_cache: bool
-
-        def get(self, *args) -> typing.Any: ...
-
-        def set(self, *args) -> None: ...
-
-        def clear(self) -> None: ...
-
-    class NullCache(dict):
-        """
-        A null cache type for initialization of the packrat_cache class variable.
-        If/when enable_packrat() is called, this null cache will be replaced by a
-        proper _CacheType class instance.
-        """
-
-        not_in_cache: bool = True
-
-        def get(self, *args) -> typing.Any: ...
-
-        def set(self, *args) -> None: ...
-
-        def clear(self) -> None: ...
-
-    # class-level argument cache for optimizing repeated calls when backtracking
-    # through recursive expressions
-    packrat_cache: _CacheType = NullCache()
-    packrat_cache_lock = RLock()
-    packrat_cache_stats = [0, 0]
-
-    # this method gets repeatedly called during backtracking with the same arguments -
-    # we can cache these arguments and save ourselves the trouble of re-parsing the contained expression
-    def _parseCache(
-        self, instring, loc, do_actions=True, callPreParse=True
-    ) -> tuple[int, ParseResults]:
-        HIT, MISS = 0, 1
-        lookup = (self, instring, loc, callPreParse, do_actions)
-        with ParserElement.packrat_cache_lock:
-            cache = ParserElement.packrat_cache
-            value = cache.get(lookup)
-            if value is cache.not_in_cache:
-                ParserElement.packrat_cache_stats[MISS] += 1
-                try:
-                    value = self._parseNoCache(instring, loc, do_actions, callPreParse)
-                except ParseBaseException as pe:
-                    # cache a copy of the exception, without the traceback
-                    cache.set(lookup, pe.__class__(*pe.args))
-                    raise
-                else:
-                    cache.set(lookup, (value[0], value[1].copy(), loc))
-                    return value
-            else:
-                ParserElement.packrat_cache_stats[HIT] += 1
-                if self.debug and self.debugActions.debug_try:
-                    try:
-                        self.debugActions.debug_try(instring, loc, self, cache_hit=True)  # type: ignore [call-arg]
-                    except TypeError:
-                        pass
-                if isinstance(value, Exception):
-                    if self.debug and self.debugActions.debug_fail:
-                        try:
-                            self.debugActions.debug_fail(
-                                instring, loc, self, value, cache_hit=True  # type: ignore [call-arg]
-                            )
-                        except TypeError:
-                            pass
-                    raise value
-
-                value = cast(tuple[int, ParseResults, int], value)
-                loc_, result, endloc = value[0], value[1].copy(), value[2]
-                if self.debug and self.debugActions.debug_match:
-                    try:
-                        self.debugActions.debug_match(
-                            instring, loc_, endloc, self, result, cache_hit=True  # type: ignore [call-arg]
-                        )
-                    except TypeError:
-                        pass
-
-                return loc_, result
-
-    _parse = _parseNoCache
-
-    @staticmethod
-    def reset_cache() -> None:
-        ParserElement.packrat_cache.clear()
-        ParserElement.packrat_cache_stats[:] = [0] * len(
-            ParserElement.packrat_cache_stats
-        )
-        ParserElement.recursion_memos.clear()
-
-    _packratEnabled = False
-    _left_recursion_enabled = False
-
-    @staticmethod
-    def disable_memoization() -> None:
-        """
-        Disables active Packrat or Left Recursion parsing and their memoization
-
-        This method also works if neither Packrat nor Left Recursion are enabled.
-        This makes it safe to call before activating Packrat nor Left Recursion
-        to clear any previous settings.
-        """
-        ParserElement.reset_cache()
-        ParserElement._left_recursion_enabled = False
-        ParserElement._packratEnabled = False
-        ParserElement._parse = ParserElement._parseNoCache
-
-    @staticmethod
-    def enable_left_recursion(
-        cache_size_limit: typing.Optional[int] = None, *, force=False
-    ) -> None:
-        """
-        Enables "bounded recursion" parsing, which allows for both direct and indirect
-        left-recursion. During parsing, left-recursive :class:`Forward` elements are
-        repeatedly matched with a fixed recursion depth that is gradually increased
-        until finding the longest match.
-
-        Example::
-
-            import pyparsing as pp
-            pp.ParserElement.enable_left_recursion()
-
-            E = pp.Forward("E")
-            num = pp.Word(pp.nums)
-            # match `num`, or `num '+' num`, or `num '+' num '+' num`, ...
-            E <<= E + '+' - num | num
-
-            print(E.parse_string("1+2+3"))
-
-        Recursion search naturally memoizes matches of ``Forward`` elements and may
-        thus skip reevaluation of parse actions during backtracking. This may break
-        programs with parse actions which rely on strict ordering of side-effects.
-
-        Parameters:
-
-        - ``cache_size_limit`` - (default=``None``) - memoize at most this many
-          ``Forward`` elements during matching; if ``None`` (the default),
-          memoize all ``Forward`` elements.
-
-        Bounded Recursion parsing works similar but not identical to Packrat parsing,
-        thus the two cannot be used together. Use ``force=True`` to disable any
-        previous, conflicting settings.
-        """
-        if force:
-            ParserElement.disable_memoization()
-        elif ParserElement._packratEnabled:
-            raise RuntimeError("Packrat and Bounded Recursion are not compatible")
-        if cache_size_limit is None:
-            ParserElement.recursion_memos = _UnboundedMemo()
-        elif cache_size_limit > 0:
-            ParserElement.recursion_memos = _LRUMemo(capacity=cache_size_limit)  # type: ignore[assignment]
-        else:
-            raise NotImplementedError(f"Memo size of {cache_size_limit}")
-        ParserElement._left_recursion_enabled = True
-
-    @staticmethod
-    def enable_packrat(
-        cache_size_limit: Union[int, None] = 128, *, force: bool = False
-    ) -> None:
-        """
-        Enables "packrat" parsing, which adds memoizing to the parsing logic.
-        Repeated parse attempts at the same string location (which happens
-        often in many complex grammars) can immediately return a cached value,
-        instead of re-executing parsing/validating code.  Memoizing is done of
-        both valid results and parsing exceptions.
-
-        Parameters:
-
-        - ``cache_size_limit`` - (default= ``128``) - if an integer value is provided
-          will limit the size of the packrat cache; if None is passed, then
-          the cache size will be unbounded; if 0 is passed, the cache will
-          be effectively disabled.
-
-        This speedup may break existing programs that use parse actions that
-        have side-effects.  For this reason, packrat parsing is disabled when
-        you first import pyparsing.  To activate the packrat feature, your
-        program must call the class method :class:`ParserElement.enable_packrat`.
-        For best results, call ``enable_packrat()`` immediately after
-        importing pyparsing.
-
-        Example::
-
-            import pyparsing
-            pyparsing.ParserElement.enable_packrat()
-
-        Packrat parsing works similar but not identical to Bounded Recursion parsing,
-        thus the two cannot be used together. Use ``force=True`` to disable any
-        previous, conflicting settings.
-        """
-        if force:
-            ParserElement.disable_memoization()
-        elif ParserElement._left_recursion_enabled:
-            raise RuntimeError("Packrat and Bounded Recursion are not compatible")
-
-        if ParserElement._packratEnabled:
-            return
-
-        ParserElement._packratEnabled = True
-        if cache_size_limit is None:
-            ParserElement.packrat_cache = _UnboundedCache()
-        else:
-            ParserElement.packrat_cache = _FifoCache(cache_size_limit)
-        ParserElement._parse = ParserElement._parseCache
-
-    def parse_string(
-        self, instring: str, parse_all: bool = False, *, parseAll: bool = False
-    ) -> ParseResults:
-        """
-        Parse a string with respect to the parser definition. This function is intended as the primary interface to the
-        client code.
-
-        :param instring: The input string to be parsed.
-        :param parse_all: If set, the entire input string must match the grammar.
-        :param parseAll: retained for pre-PEP8 compatibility, will be removed in a future release.
-        :raises ParseException: Raised if ``parse_all`` is set and the input string does not match the whole grammar.
-        :returns: the parsed data as a :class:`ParseResults` object, which may be accessed as a `list`, a `dict`, or
-          an object with attributes if the given parser includes results names.
-
-        If the input string is required to match the entire grammar, ``parse_all`` flag must be set to ``True``. This
-        is also equivalent to ending the grammar with :class:`StringEnd`\\ ().
-
-        To report proper column numbers, ``parse_string`` operates on a copy of the input string where all tabs are
-        converted to spaces (8 spaces per tab, as per the default in ``string.expandtabs``). If the input string
-        contains tabs and the grammar uses parse actions that use the ``loc`` argument to index into the string
-        being parsed, one can ensure a consistent view of the input string by doing one of the following:
-
-        - calling ``parse_with_tabs`` on your grammar before calling ``parse_string`` (see :class:`parse_with_tabs`),
-        - define your parse action using the full ``(s,loc,toks)`` signature, and reference the input string using the
-          parse action's ``s`` argument, or
-        - explicitly expand the tabs in your input string before calling ``parse_string``.
-
-        Examples:
-
-        By default, partial matches are OK.
-
-        >>> res = Word('a').parse_string('aaaaabaaa')
-        >>> print(res)
-        ['aaaaa']
-
-        The parsing behavior varies by the inheriting class of this abstract class. Please refer to the children
-        directly to see more examples.
-
-        It raises an exception if parse_all flag is set and instring does not match the whole grammar.
-
-        >>> res = Word('a').parse_string('aaaaabaaa', parse_all=True)
-        Traceback (most recent call last):
-        ...
-        pyparsing.ParseException: Expected end of text, found 'b'  (at char 5), (line:1, col:6)
-        """
-        parseAll = parse_all or parseAll
-
-        ParserElement.reset_cache()
-        if not self.streamlined:
-            self.streamline()
-        for e in self.ignoreExprs:
-            e.streamline()
-        if not self.keepTabs:
-            instring = instring.expandtabs()
-        try:
-            loc, tokens = self._parse(instring, 0)
-            if parseAll:
-                loc = self.preParse(instring, loc)
-                se = Empty() + StringEnd().set_debug(False)
-                se._parse(instring, loc)
-        except _ParseActionIndexError as pa_exc:
-            raise pa_exc.exc
-        except ParseBaseException as exc:
-            if ParserElement.verbose_stacktrace:
-                raise
-
-            # catch and re-raise exception from here, clearing out pyparsing internal stack trace
-            raise exc.with_traceback(None)
-        else:
-            return tokens
-
-    def scan_string(
-        self,
-        instring: str,
-        max_matches: int = _MAX_INT,
-        overlap: bool = False,
-        always_skip_whitespace=True,
-        *,
-        debug: bool = False,
-        maxMatches: int = _MAX_INT,
-    ) -> Generator[tuple[ParseResults, int, int], None, None]:
-        """
-        Scan the input string for expression matches.  Each match will return the
-        matching tokens, start location, and end location.  May be called with optional
-        ``max_matches`` argument, to clip scanning after 'n' matches are found.  If
-        ``overlap`` is specified, then overlapping matches will be reported.
-
-        Note that the start and end locations are reported relative to the string
-        being parsed.  See :class:`parse_string` for more information on parsing
-        strings with embedded tabs.
-
-        Example::
-
-            source = "sldjf123lsdjjkf345sldkjf879lkjsfd987"
-            print(source)
-            for tokens, start, end in Word(alphas).scan_string(source):
-                print(' '*start + '^'*(end-start))
-                print(' '*start + tokens[0])
-
-        prints::
-
-            sldjf123lsdjjkf345sldkjf879lkjsfd987
-            ^^^^^
-            sldjf
-                    ^^^^^^^
-                    lsdjjkf
-                              ^^^^^^
-                              sldkjf
-                                       ^^^^^^
-                                       lkjsfd
-        """
-        maxMatches = min(maxMatches, max_matches)
-        if not self.streamlined:
-            self.streamline()
-        for e in self.ignoreExprs:
-            e.streamline()
-
-        if not self.keepTabs:
-            instring = str(instring).expandtabs()
-        instrlen = len(instring)
-        loc = 0
-        if always_skip_whitespace:
-            preparser = Empty()
-            preparser.ignoreExprs = self.ignoreExprs
-            preparser.whiteChars = self.whiteChars
-            preparseFn = preparser.preParse
-        else:
-            preparseFn = self.preParse
-        parseFn = self._parse
-        ParserElement.resetCache()
-        matches = 0
-        try:
-            while loc <= instrlen and matches < maxMatches:
-                try:
-                    preloc: int = preparseFn(instring, loc)
-                    nextLoc: int
-                    tokens: ParseResults
-                    nextLoc, tokens = parseFn(instring, preloc, callPreParse=False)
-                except ParseException:
-                    loc = preloc + 1
-                else:
-                    if nextLoc > loc:
-                        matches += 1
-                        if debug:
-                            print(
-                                {
-                                    "tokens": tokens.asList(),
-                                    "start": preloc,
-                                    "end": nextLoc,
-                                }
-                            )
-                        yield tokens, preloc, nextLoc
-                        if overlap:
-                            nextloc = preparseFn(instring, loc)
-                            if nextloc > loc:
-                                loc = nextLoc
-                            else:
-                                loc += 1
-                        else:
-                            loc = nextLoc
-                    else:
-                        loc = preloc + 1
-        except ParseBaseException as exc:
-            if ParserElement.verbose_stacktrace:
-                raise
-
-            # catch and re-raise exception from here, clears out pyparsing internal stack trace
-            raise exc.with_traceback(None)
-
-    def transform_string(self, instring: str, *, debug: bool = False) -> str:
-        """
-        Extension to :class:`scan_string`, to modify matching text with modified tokens that may
-        be returned from a parse action.  To use ``transform_string``, define a grammar and
-        attach a parse action to it that modifies the returned token list.
-        Invoking ``transform_string()`` on a target string will then scan for matches,
-        and replace the matched text patterns according to the logic in the parse
-        action.  ``transform_string()`` returns the resulting transformed string.
-
-        Example::
-
-            wd = Word(alphas)
-            wd.set_parse_action(lambda toks: toks[0].title())
-
-            print(wd.transform_string("now is the winter of our discontent made glorious summer by this sun of york."))
-
-        prints::
-
-            Now Is The Winter Of Our Discontent Made Glorious Summer By This Sun Of York.
-        """
-        out: list[str] = []
-        lastE = 0
-        # force preservation of <TAB>s, to minimize unwanted transformation of string, and to
-        # keep string locs straight between transform_string and scan_string
-        self.keepTabs = True
-        try:
-            for t, s, e in self.scan_string(instring, debug=debug):
-                if s > lastE:
-                    out.append(instring[lastE:s])
-                lastE = e
-
-                if not t:
-                    continue
-
-                if isinstance(t, ParseResults):
-                    out += t.as_list()
-                elif isinstance(t, Iterable) and not isinstance(t, str_type):
-                    out.extend(t)
-                else:
-                    out.append(t)
-
-            out.append(instring[lastE:])
-            out = [o for o in out if o]
-            return "".join([str(s) for s in _flatten(out)])
-        except ParseBaseException as exc:
-            if ParserElement.verbose_stacktrace:
-                raise
-
-            # catch and re-raise exception from here, clears out pyparsing internal stack trace
-            raise exc.with_traceback(None)
-
-    def search_string(
-        self,
-        instring: str,
-        max_matches: int = _MAX_INT,
-        *,
-        debug: bool = False,
-        maxMatches: int = _MAX_INT,
-    ) -> ParseResults:
-        """
-        Another extension to :class:`scan_string`, simplifying the access to the tokens found
-        to match the given parse expression.  May be called with optional
-        ``max_matches`` argument, to clip searching after 'n' matches are found.
-
-        Example::
-
-            # a capitalized word starts with an uppercase letter, followed by zero or more lowercase letters
-            cap_word = Word(alphas.upper(), alphas.lower())
-
-            print(cap_word.search_string("More than Iron, more than Lead, more than Gold I need Electricity"))
-
-            # the sum() builtin can be used to merge results into a single ParseResults object
-            print(sum(cap_word.search_string("More than Iron, more than Lead, more than Gold I need Electricity")))
-
-        prints::
-
-            [['More'], ['Iron'], ['Lead'], ['Gold'], ['I'], ['Electricity']]
-            ['More', 'Iron', 'Lead', 'Gold', 'I', 'Electricity']
-        """
-        maxMatches = min(maxMatches, max_matches)
-        try:
-            return ParseResults(
-                [
-                    t
-                    for t, s, e in self.scan_string(
-                        instring, maxMatches, always_skip_whitespace=False, debug=debug
-                    )
-                ]
-            )
-        except ParseBaseException as exc:
-            if ParserElement.verbose_stacktrace:
-                raise
-
-            # catch and re-raise exception from here, clears out pyparsing internal stack trace
-            raise exc.with_traceback(None)
-
-    def split(
-        self,
-        instring: str,
-        maxsplit: int = _MAX_INT,
-        include_separators: bool = False,
-        *,
-        includeSeparators=False,
-    ) -> Generator[str, None, None]:
-        """
-        Generator method to split a string using the given expression as a separator.
-        May be called with optional ``maxsplit`` argument, to limit the number of splits;
-        and the optional ``include_separators`` argument (default= ``False``), if the separating
-        matching text should be included in the split results.
-
-        Example::
-
-            punc = one_of(list(".,;:/-!?"))
-            print(list(punc.split("This, this?, this sentence, is badly punctuated!")))
-
-        prints::
-
-            ['This', ' this', '', ' this sentence', ' is badly punctuated', '']
-        """
-        includeSeparators = includeSeparators or include_separators
-        last = 0
-        for t, s, e in self.scan_string(instring, max_matches=maxsplit):
-            yield instring[last:s]
-            if includeSeparators:
-                yield t[0]
-            last = e
-        yield instring[last:]
-
-    def __add__(self, other) -> ParserElement:
-        """
-        Implementation of ``+`` operator - returns :class:`And`. Adding strings to a :class:`ParserElement`
-        converts them to :class:`Literal`\\ s by default.
-
-        Example::
-
-            greet = Word(alphas) + "," + Word(alphas) + "!"
-            hello = "Hello, World!"
-            print(hello, "->", greet.parse_string(hello))
-
-        prints::
-
-            Hello, World! -> ['Hello', ',', 'World', '!']
-
-        ``...`` may be used as a parse expression as a short form of :class:`SkipTo`::
-
-            Literal('start') + ... + Literal('end')
-
-        is equivalent to::
-
-            Literal('start') + SkipTo('end')("_skipped*") + Literal('end')
-
-        Note that the skipped text is returned with '_skipped' as a results name,
-        and to support having multiple skips in the same parser, the value returned is
-        a list of all skipped text.
-        """
-        if other is Ellipsis:
-            return _PendingSkip(self)
-
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return And([self, other])
-
-    def __radd__(self, other) -> ParserElement:
-        """
-        Implementation of ``+`` operator when left operand is not a :class:`ParserElement`
-        """
-        if other is Ellipsis:
-            return SkipTo(self)("_skipped*") + self
-
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return other + self
-
-    def __sub__(self, other) -> ParserElement:
-        """
-        Implementation of ``-`` operator, returns :class:`And` with error stop
-        """
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return self + And._ErrorStop() + other
-
-    def __rsub__(self, other) -> ParserElement:
-        """
-        Implementation of ``-`` operator when left operand is not a :class:`ParserElement`
-        """
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return other - self
-
-    def __mul__(self, other) -> ParserElement:
-        """
-        Implementation of ``*`` operator, allows use of ``expr * 3`` in place of
-        ``expr + expr + expr``.  Expressions may also be multiplied by a 2-integer
-        tuple, similar to ``{min, max}`` multipliers in regular expressions.  Tuples
-        may also include ``None`` as in:
-
-        - ``expr*(n, None)`` or ``expr*(n, )`` is equivalent
-          to ``expr*n + ZeroOrMore(expr)``
-          (read as "at least n instances of ``expr``")
-        - ``expr*(None, n)`` is equivalent to ``expr*(0, n)``
-          (read as "0 to n instances of ``expr``")
-        - ``expr*(None, None)`` is equivalent to ``ZeroOrMore(expr)``
-        - ``expr*(1, None)`` is equivalent to ``OneOrMore(expr)``
-
-        Note that ``expr*(None, n)`` does not raise an exception if
-        more than n exprs exist in the input stream; that is,
-        ``expr*(None, n)`` does not enforce a maximum number of expr
-        occurrences.  If this behavior is desired, then write
-        ``expr*(None, n) + ~expr``
-        """
-        if other is Ellipsis:
-            other = (0, None)
-        elif isinstance(other, tuple) and other[:1] == (Ellipsis,):
-            other = ((0,) + other[1:] + (None,))[:2]
-
-        if not isinstance(other, (int, tuple)):
-            return NotImplemented
-
-        if isinstance(other, int):
-            minElements, optElements = other, 0
-        else:
-            other = tuple(o if o is not Ellipsis else None for o in other)
-            other = (other + (None, None))[:2]
-            if other[0] is None:
-                other = (0, other[1])
-            if isinstance(other[0], int) and other[1] is None:
-                if other[0] == 0:
-                    return ZeroOrMore(self)
-                if other[0] == 1:
-                    return OneOrMore(self)
-                else:
-                    return self * other[0] + ZeroOrMore(self)
-            elif isinstance(other[0], int) and isinstance(other[1], int):
-                minElements, optElements = other
-                optElements -= minElements
-            else:
-                return NotImplemented
-
-        if minElements < 0:
-            raise ValueError("cannot multiply ParserElement by negative value")
-        if optElements < 0:
-            raise ValueError(
-                "second tuple value must be greater or equal to first tuple value"
-            )
-        if minElements == optElements == 0:
-            return And([])
-
-        if optElements:
-
-            def makeOptionalList(n):
-                if n > 1:
-                    return Opt(self + makeOptionalList(n - 1))
-                else:
-                    return Opt(self)
-
-            if minElements:
-                if minElements == 1:
-                    ret = self + makeOptionalList(optElements)
-                else:
-                    ret = And([self] * minElements) + makeOptionalList(optElements)
-            else:
-                ret = makeOptionalList(optElements)
-        else:
-            if minElements == 1:
-                ret = self
-            else:
-                ret = And([self] * minElements)
-        return ret
-
-    def __rmul__(self, other) -> ParserElement:
-        return self.__mul__(other)
-
-    def __or__(self, other) -> ParserElement:
-        """
-        Implementation of ``|`` operator - returns :class:`MatchFirst`
-        """
-        if other is Ellipsis:
-            return _PendingSkip(self, must_skip=True)
-
-        if isinstance(other, str_type):
-            # `expr | ""` is equivalent to `Opt(expr)`
-            if other == "":
-                return Opt(self)
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return MatchFirst([self, other])
-
-    def __ror__(self, other) -> ParserElement:
-        """
-        Implementation of ``|`` operator when left operand is not a :class:`ParserElement`
-        """
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return other | self
-
-    def __xor__(self, other) -> ParserElement:
-        """
-        Implementation of ``^`` operator - returns :class:`Or`
-        """
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return Or([self, other])
-
-    def __rxor__(self, other) -> ParserElement:
-        """
-        Implementation of ``^`` operator when left operand is not a :class:`ParserElement`
-        """
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return other ^ self
-
-    def __and__(self, other) -> ParserElement:
-        """
-        Implementation of ``&`` operator - returns :class:`Each`
-        """
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return Each([self, other])
-
-    def __rand__(self, other) -> ParserElement:
-        """
-        Implementation of ``&`` operator when left operand is not a :class:`ParserElement`
-        """
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return other & self
-
-    def __invert__(self) -> ParserElement:
-        """
-        Implementation of ``~`` operator - returns :class:`NotAny`
-        """
-        return NotAny(self)
-
-    # disable __iter__ to override legacy use of sequential access to __getitem__ to
-    # iterate over a sequence
-    __iter__ = None
-
-    def __getitem__(self, key):
-        """
-        use ``[]`` indexing notation as a short form for expression repetition:
-
-        - ``expr[n]`` is equivalent to ``expr*n``
-        - ``expr[m, n]`` is equivalent to ``expr*(m, n)``
-        - ``expr[n, ...]`` or ``expr[n,]`` is equivalent
-             to ``expr*n + ZeroOrMore(expr)``
-             (read as "at least n instances of ``expr``")
-        - ``expr[..., n]`` is equivalent to ``expr*(0, n)``
-             (read as "0 to n instances of ``expr``")
-        - ``expr[...]`` and ``expr[0, ...]`` are equivalent to ``ZeroOrMore(expr)``
-        - ``expr[1, ...]`` is equivalent to ``OneOrMore(expr)``
-
-        ``None`` may be used in place of ``...``.
-
-        Note that ``expr[..., n]`` and ``expr[m, n]`` do not raise an exception
-        if more than ``n`` ``expr``\\ s exist in the input stream.  If this behavior is
-        desired, then write ``expr[..., n] + ~expr``.
-
-        For repetition with a stop_on expression, use slice notation:
-
-        - ``expr[...: end_expr]`` and ``expr[0, ...: end_expr]`` are equivalent to ``ZeroOrMore(expr, stop_on=end_expr)``
-        - ``expr[1, ...: end_expr]`` is equivalent to ``OneOrMore(expr, stop_on=end_expr)``
-
-        """
-
-        stop_on_defined = False
-        stop_on = NoMatch()
-        if isinstance(key, slice):
-            key, stop_on = key.start, key.stop
-            if key is None:
-                key = ...
-            stop_on_defined = True
-        elif isinstance(key, tuple) and isinstance(key[-1], slice):
-            key, stop_on = (key[0], key[1].start), key[1].stop
-            stop_on_defined = True
-
-        # convert single arg keys to tuples
-        if isinstance(key, str_type):
-            key = (key,)
-        try:
-            iter(key)
-        except TypeError:
-            key = (key, key)
-
-        if len(key) > 2:
-            raise TypeError(
-                f"only 1 or 2 index arguments supported ({key[:5]}{f'... [{len(key)}]' if len(key) > 5 else ''})"
-            )
-
-        # clip to 2 elements
-        ret = self * tuple(key[:2])
-        ret = typing.cast(_MultipleMatch, ret)
-
-        if stop_on_defined:
-            ret.stopOn(stop_on)
-
-        return ret
-
-    def __call__(self, name: typing.Optional[str] = None) -> ParserElement:
-        """
-        Shortcut for :class:`set_results_name`, with ``list_all_matches=False``.
-
-        If ``name`` is given with a trailing ``'*'`` character, then ``list_all_matches`` will be
-        passed as ``True``.
-
-        If ``name`` is omitted, same as calling :class:`copy`.
-
-        Example::
-
-            # these are equivalent
-            userdata = Word(alphas).set_results_name("name") + Word(nums + "-").set_results_name("socsecno")
-            userdata = Word(alphas)("name") + Word(nums + "-")("socsecno")
-        """
-        if name is not None:
-            return self._setResultsName(name)
-
-        return self.copy()
-
-    def suppress(self) -> ParserElement:
-        """
-        Suppresses the output of this :class:`ParserElement`; useful to keep punctuation from
-        cluttering up returned output.
-        """
-        return Suppress(self)
-
-    def ignore_whitespace(self, recursive: bool = True) -> ParserElement:
-        """
-        Enables the skipping of whitespace before matching the characters in the
-        :class:`ParserElement`'s defined pattern.
-
-        :param recursive: If ``True`` (the default), also enable whitespace skipping in child elements (if any)
-        """
-        self.skipWhitespace = True
-        return self
-
-    def leave_whitespace(self, recursive: bool = True) -> ParserElement:
-        """
-        Disables the skipping of whitespace before matching the characters in the
-        :class:`ParserElement`'s defined pattern.  This is normally only used internally by
-        the pyparsing module, but may be needed in some whitespace-sensitive grammars.
-
-        :param recursive: If true (the default), also disable whitespace skipping in child elements (if any)
-        """
-        self.skipWhitespace = False
-        return self
-
-    def set_whitespace_chars(
-        self, chars: Union[set[str], str], copy_defaults: bool = False
-    ) -> ParserElement:
-        """
-        Overrides the default whitespace chars
-        """
-        self.skipWhitespace = True
-        self.whiteChars = set(chars)
-        self.copyDefaultWhiteChars = copy_defaults
-        return self
-
-    def parse_with_tabs(self) -> ParserElement:
-        """
-        Overrides default behavior to expand ``<TAB>`` s to spaces before parsing the input string.
-        Must be called before ``parse_string`` when the input grammar contains elements that
-        match ``<TAB>`` characters.
-        """
-        self.keepTabs = True
-        return self
-
-    def ignore(self, other: ParserElement) -> ParserElement:
-        """
-        Define expression to be ignored (e.g., comments) while doing pattern
-        matching; may be called repeatedly, to define multiple comment or other
-        ignorable patterns.
-
-        Example::
-
-            patt = Word(alphas)[...]
-            patt.parse_string('ablaj /* comment */ lskjd')
-            # -> ['ablaj']
-
-            patt.ignore(c_style_comment)
-            patt.parse_string('ablaj /* comment */ lskjd')
-            # -> ['ablaj', 'lskjd']
-        """
-        if isinstance(other, str_type):
-            other = Suppress(other)
-
-        if isinstance(other, Suppress):
-            if other not in self.ignoreExprs:
-                self.ignoreExprs.append(other)
-        else:
-            self.ignoreExprs.append(Suppress(other.copy()))
-        return self
-
-    def set_debug_actions(
-        self,
-        start_action: DebugStartAction,
-        success_action: DebugSuccessAction,
-        exception_action: DebugExceptionAction,
-    ) -> ParserElement:
-        """
-        Customize display of debugging messages while doing pattern matching:
-
-        - ``start_action`` - method to be called when an expression is about to be parsed;
-          should have the signature ``fn(input_string: str, location: int, expression: ParserElement, cache_hit: bool)``
-
-        - ``success_action`` - method to be called when an expression has successfully parsed;
-          should have the signature ``fn(input_string: str, start_location: int, end_location: int, expression: ParserELement, parsed_tokens: ParseResults, cache_hit: bool)``
-
-        - ``exception_action`` - method to be called when expression fails to parse;
-          should have the signature ``fn(input_string: str, location: int, expression: ParserElement, exception: Exception, cache_hit: bool)``
-        """
-        self.debugActions = self.DebugActions(
-            start_action or _default_start_debug_action,  # type: ignore[truthy-function]
-            success_action or _default_success_debug_action,  # type: ignore[truthy-function]
-            exception_action or _default_exception_debug_action,  # type: ignore[truthy-function]
-        )
-        self.debug = True
-        return self
-
-    def set_debug(self, flag: bool = True, recurse: bool = False) -> ParserElement:
-        """
-        Enable display of debugging messages while doing pattern matching.
-        Set ``flag`` to ``True`` to enable, ``False`` to disable.
-        Set ``recurse`` to ``True`` to set the debug flag on this expression and all sub-expressions.
-
-        Example::
-
-            wd = Word(alphas).set_name("alphaword")
-            integer = Word(nums).set_name("numword")
-            term = wd | integer
-
-            # turn on debugging for wd
-            wd.set_debug()
-
-            term[1, ...].parse_string("abc 123 xyz 890")
-
-        prints::
-
-            Match alphaword at loc 0(1,1)
-            Matched alphaword -> ['abc']
-            Match alphaword at loc 3(1,4)
-            Exception raised:Expected alphaword (at char 4), (line:1, col:5)
-            Match alphaword at loc 7(1,8)
-            Matched alphaword -> ['xyz']
-            Match alphaword at loc 11(1,12)
-            Exception raised:Expected alphaword (at char 12), (line:1, col:13)
-            Match alphaword at loc 15(1,16)
-            Exception raised:Expected alphaword (at char 15), (line:1, col:16)
-
-        The output shown is that produced by the default debug actions - custom debug actions can be
-        specified using :class:`set_debug_actions`. Prior to attempting
-        to match the ``wd`` expression, the debugging message ``"Match <exprname> at loc <n>(<line>,<col>)"``
-        is shown. Then if the parse succeeds, a ``"Matched"`` message is shown, or an ``"Exception raised"``
-        message is shown. Also note the use of :class:`set_name` to assign a human-readable name to the expression,
-        which makes debugging and exception messages easier to understand - for instance, the default
-        name created for the :class:`Word` expression without calling ``set_name`` is ``"W:(A-Za-z)"``.
-        """
-        if recurse:
-            for expr in self.visit_all():
-                expr.set_debug(flag, recurse=False)
-            return self
-
-        if flag:
-            self.set_debug_actions(
-                _default_start_debug_action,
-                _default_success_debug_action,
-                _default_exception_debug_action,
-            )
-        else:
-            self.debug = False
-        return self
-
-    @property
-    def default_name(self) -> str:
-        if self._defaultName is None:
-            self._defaultName = self._generateDefaultName()
-        return self._defaultName
-
-    @abstractmethod
-    def _generateDefaultName(self) -> str:
-        """
-        Child classes must define this method, which defines how the ``default_name`` is set.
-        """
-
-    def set_name(self, name: typing.Optional[str]) -> ParserElement:
-        """
-        Define name for this expression, makes debugging and exception messages clearer. If
-        `__diag__.enable_debug_on_named_expressions` is set to True, setting a name will also
-        enable debug for this expression.
-
-        If `name` is None, clears any custom name for this expression, and clears the
-        debug flag is it was enabled via `__diag__.enable_debug_on_named_expressions`.
-
-        Example::
-
-            integer = Word(nums)
-            integer.parse_string("ABC")  # -> Exception: Expected W:(0-9) (at char 0), (line:1, col:1)
-
-            integer.set_name("integer")
-            integer.parse_string("ABC")  # -> Exception: Expected integer (at char 0), (line:1, col:1)
-        """
-        self.customName = name  # type: ignore[assignment]
-        self.errmsg = f"Expected {str(self)}"
-
-        if __diag__.enable_debug_on_named_expressions:
-            self.set_debug(name is not None)
-
-        return self
-
-    @property
-    def name(self) -> str:
-        # This will use a user-defined name if available, but otherwise defaults back to the auto-generated name
-        return self.customName if self.customName is not None else self.default_name
-
-    @name.setter
-    def name(self, new_name) -> None:
-        self.set_name(new_name)
-
-    def __str__(self) -> str:
-        return self.name
-
-    def __repr__(self) -> str:
-        return str(self)
-
-    def streamline(self) -> ParserElement:
-        self.streamlined = True
-        self._defaultName = None
-        return self
-
-    def recurse(self) -> list[ParserElement]:
-        return []
-
-    def _checkRecursion(self, parseElementList):
-        subRecCheckList = parseElementList[:] + [self]
-        for e in self.recurse():
-            e._checkRecursion(subRecCheckList)
-
-    def validate(self, validateTrace=None) -> None:
-        """
-        Check defined expressions for valid structure, check for infinite recursive definitions.
-        """
-        warnings.warn(
-            "ParserElement.validate() is deprecated, and should not be used to check for left recursion",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        self._checkRecursion([])
-
-    def parse_file(
-        self,
-        file_or_filename: Union[str, Path, TextIO],
-        encoding: str = "utf-8",
-        parse_all: bool = False,
-        *,
-        parseAll: bool = False,
-    ) -> ParseResults:
-        """
-        Execute the parse expression on the given file or filename.
-        If a filename is specified (instead of a file object),
-        the entire file is opened, read, and closed before parsing.
-        """
-        parseAll = parseAll or parse_all
-        try:
-            file_or_filename = typing.cast(TextIO, file_or_filename)
-            file_contents = file_or_filename.read()
-        except AttributeError:
-            file_or_filename = typing.cast(str, file_or_filename)
-            with open(file_or_filename, "r", encoding=encoding) as f:
-                file_contents = f.read()
-        try:
-            return self.parse_string(file_contents, parseAll)
-        except ParseBaseException as exc:
-            if ParserElement.verbose_stacktrace:
-                raise
-
-            # catch and re-raise exception from here, clears out pyparsing internal stack trace
-            raise exc.with_traceback(None)
-
-    def __eq__(self, other):
-        if self is other:
-            return True
-        elif isinstance(other, str_type):
-            return self.matches(other, parse_all=True)
-        elif isinstance(other, ParserElement):
-            return vars(self) == vars(other)
-        return False
-
-    def __hash__(self):
-        return id(self)
-
-    def matches(
-        self, test_string: str, parse_all: bool = True, *, parseAll: bool = True
-    ) -> bool:
-        """
-        Method for quick testing of a parser against a test string. Good for simple
-        inline microtests of sub expressions while building up larger parser.
-
-        Parameters:
-
-        - ``test_string`` - to test against this expression for a match
-        - ``parse_all`` - (default= ``True``) - flag to pass to :class:`parse_string` when running tests
-
-        Example::
-
-            expr = Word(nums)
-            assert expr.matches("100")
-        """
-        parseAll = parseAll and parse_all
-        try:
-            self.parse_string(str(test_string), parse_all=parseAll)
-            return True
-        except ParseBaseException:
-            return False
-
-    def run_tests(
-        self,
-        tests: Union[str, list[str]],
-        parse_all: bool = True,
-        comment: typing.Optional[Union[ParserElement, str]] = "#",
-        full_dump: bool = True,
-        print_results: bool = True,
-        failure_tests: bool = False,
-        post_parse: typing.Optional[
-            Callable[[str, ParseResults], typing.Optional[str]]
-        ] = None,
-        file: typing.Optional[TextIO] = None,
-        with_line_numbers: bool = False,
-        *,
-        parseAll: bool = True,
-        fullDump: bool = True,
-        printResults: bool = True,
-        failureTests: bool = False,
-        postParse: typing.Optional[
-            Callable[[str, ParseResults], typing.Optional[str]]
-        ] = None,
-    ) -> tuple[bool, list[tuple[str, Union[ParseResults, Exception]]]]:
-        """
-        Execute the parse expression on a series of test strings, showing each
-        test, the parsed results or where the parse failed. Quick and easy way to
-        run a parse expression against a list of sample strings.
-
-        Parameters:
-
-        - ``tests`` - a list of separate test strings, or a multiline string of test strings
-        - ``parse_all`` - (default= ``True``) - flag to pass to :class:`parse_string` when running tests
-        - ``comment`` - (default= ``'#'``) - expression for indicating embedded comments in the test
-          string; pass None to disable comment filtering
-        - ``full_dump`` - (default= ``True``) - dump results as list followed by results names in nested outline;
-          if False, only dump nested list
-        - ``print_results`` - (default= ``True``) prints test output to stdout
-        - ``failure_tests`` - (default= ``False``) indicates if these tests are expected to fail parsing
-        - ``post_parse`` - (default= ``None``) optional callback for successful parse results; called as
-          `fn(test_string, parse_results)` and returns a string to be added to the test output
-        - ``file`` - (default= ``None``) optional file-like object to which test output will be written;
-          if None, will default to ``sys.stdout``
-        - ``with_line_numbers`` - default= ``False``) show test strings with line and column numbers
-
-        Returns: a (success, results) tuple, where success indicates that all tests succeeded
-        (or failed if ``failure_tests`` is True), and the results contain a list of lines of each
-        test's output
-
-        Example::
-
-            number_expr = pyparsing_common.number.copy()
-
-            result = number_expr.run_tests('''
-                # unsigned integer
-                100
-                # negative integer
-                -100
-                # float with scientific notation
-                6.02e23
-                # integer with scientific notation
-                1e-12
-                ''')
-            print("Success" if result[0] else "Failed!")
-
-            result = number_expr.run_tests('''
-                # stray character
-                100Z
-                # missing leading digit before '.'
-                -.100
-                # too many '.'
-                3.14.159
-                ''', failure_tests=True)
-            print("Success" if result[0] else "Failed!")
-
-        prints::
-
-            # unsigned integer
-            100
-            [100]
-
-            # negative integer
-            -100
-            [-100]
-
-            # float with scientific notation
-            6.02e23
-            [6.02e+23]
-
-            # integer with scientific notation
-            1e-12
-            [1e-12]
-
-            Success
-
-            # stray character
-            100Z
-               ^
-            FAIL: Expected end of text (at char 3), (line:1, col:4)
-
-            # missing leading digit before '.'
-            -.100
-            ^
-            FAIL: Expected {real number with scientific notation | real number | signed integer} (at char 0), (line:1, col:1)
-
-            # too many '.'
-            3.14.159
-                ^
-            FAIL: Expected end of text (at char 4), (line:1, col:5)
-
-            Success
-
-        Each test string must be on a single line. If you want to test a string that spans multiple
-        lines, create a test like this::
-
-            expr.run_tests(r"this is a test\\n of strings that spans \\n 3 lines")
-
-        (Note that this is a raw string literal, you must include the leading ``'r'``.)
-        """
-        from .testing import pyparsing_test
-
-        parseAll = parseAll and parse_all
-        fullDump = fullDump and full_dump
-        printResults = printResults and print_results
-        failureTests = failureTests or failure_tests
-        postParse = postParse or post_parse
-        if isinstance(tests, str_type):
-            tests = typing.cast(str, tests)
-            line_strip = type(tests).strip
-            tests = [line_strip(test_line) for test_line in tests.rstrip().splitlines()]
-        comment_specified = comment is not None
-        if comment_specified:
-            if isinstance(comment, str_type):
-                comment = typing.cast(str, comment)
-                comment = Literal(comment)
-        comment = typing.cast(ParserElement, comment)
-        if file is None:
-            file = sys.stdout
-        print_ = file.write
-
-        result: Union[ParseResults, Exception]
-        allResults: list[tuple[str, Union[ParseResults, Exception]]] = []
-        comments: list[str] = []
-        success = True
-        NL = Literal(r"\n").add_parse_action(replace_with("\n")).ignore(quoted_string)
-        BOM = "\ufeff"
-        nlstr = "\n"
-        for t in tests:
-            if comment_specified and comment.matches(t, False) or comments and not t:
-                comments.append(
-                    pyparsing_test.with_line_numbers(t) if with_line_numbers else t
-                )
-                continue
-            if not t:
-                continue
-            out = [
-                f"{nlstr}{nlstr.join(comments) if comments else ''}",
-                pyparsing_test.with_line_numbers(t) if with_line_numbers else t,
-            ]
-            comments.clear()
-            try:
-                # convert newline marks to actual newlines, and strip leading BOM if present
-                t = NL.transform_string(t.lstrip(BOM))
-                result = self.parse_string(t, parse_all=parseAll)
-            except ParseBaseException as pe:
-                fatal = "(FATAL) " if isinstance(pe, ParseFatalException) else ""
-                out.append(pe.explain())
-                out.append(f"FAIL: {fatal}{pe}")
-                if ParserElement.verbose_stacktrace:
-                    out.extend(traceback.format_tb(pe.__traceback__))
-                success = success and failureTests
-                result = pe
-            except Exception as exc:
-                tag = "FAIL-EXCEPTION"
-
-                # see if this exception was raised in a parse action
-                tb = exc.__traceback__
-                it = iter(traceback.walk_tb(tb))
-                for f, line in it:
-                    if (f.f_code.co_filename, line) == pa_call_line_synth:
-                        next_f = next(it)[0]
-                        tag += f" (raised in parse action {next_f.f_code.co_name!r})"
-                        break
-
-                out.append(f"{tag}: {type(exc).__name__}: {exc}")
-                if ParserElement.verbose_stacktrace:
-                    out.extend(traceback.format_tb(exc.__traceback__))
-                success = success and failureTests
-                result = exc
-            else:
-                success = success and not failureTests
-                if postParse is not None:
-                    try:
-                        pp_value = postParse(t, result)
-                        if pp_value is not None:
-                            if isinstance(pp_value, ParseResults):
-                                out.append(pp_value.dump())
-                            else:
-                                out.append(str(pp_value))
-                        else:
-                            out.append(result.dump())
-                    except Exception as e:
-                        out.append(result.dump(full=fullDump))
-                        out.append(
-                            f"{postParse.__name__} failed: {type(e).__name__}: {e}"
-                        )
-                else:
-                    out.append(result.dump(full=fullDump))
-            out.append("")
-
-            if printResults:
-                print_("\n".join(out))
-
-            allResults.append((t, result))
-
-        return success, allResults
-
-    def create_diagram(
-        self,
-        output_html: Union[TextIO, Path, str],
-        vertical: int = 3,
-        show_results_names: bool = False,
-        show_groups: bool = False,
-        embed: bool = False,
-        **kwargs,
-    ) -> None:
-        """
-        Create a railroad diagram for the parser.
-
-        Parameters:
-
-        - ``output_html`` (str or file-like object) - output target for generated
-          diagram HTML
-        - ``vertical`` (int) - threshold for formatting multiple alternatives vertically
-          instead of horizontally (default=3)
-        - ``show_results_names`` - bool flag whether diagram should show annotations for
-          defined results names
-        - ``show_groups`` - bool flag whether groups should be highlighted with an unlabeled surrounding box
-        - ``embed`` - bool flag whether generated HTML should omit <HEAD>, <BODY>, and <DOCTYPE> tags to embed
-          the resulting HTML in an enclosing HTML source
-        - ``head`` - str containing additional HTML to insert into the <HEAD> section of the generated code;
-          can be used to insert custom CSS styling
-        - ``body`` - str containing additional HTML to insert at the beginning of the <BODY> section of the
-          generated code
-
-        Additional diagram-formatting keyword arguments can also be included;
-        see railroad.Diagram class.
-        """
-
-        try:
-            from .diagram import to_railroad, railroad_to_html
-        except ImportError as ie:
-            raise Exception(
-                "must ``pip install pyparsing[diagrams]`` to generate parser railroad diagrams"
-            ) from ie
-
-        self.streamline()
-
-        railroad = to_railroad(
-            self,
-            vertical=vertical,
-            show_results_names=show_results_names,
-            show_groups=show_groups,
-            diagram_kwargs=kwargs,
-        )
-        if not isinstance(output_html, (str, Path)):
-            # we were passed a file-like object, just write to it
-            output_html.write(railroad_to_html(railroad, embed=embed, **kwargs))
-            return
-
-        with open(output_html, "w", encoding="utf-8") as diag_file:
-            diag_file.write(railroad_to_html(railroad, embed=embed, **kwargs))
-
-    # Compatibility synonyms
-    # fmt: off
-    inlineLiteralsUsing = staticmethod(replaced_by_pep8("inlineLiteralsUsing", inline_literals_using))
-    setDefaultWhitespaceChars = staticmethod(replaced_by_pep8(
-        "setDefaultWhitespaceChars", set_default_whitespace_chars
-    ))
-    disableMemoization = staticmethod(replaced_by_pep8("disableMemoization", disable_memoization))
-    enableLeftRecursion = staticmethod(replaced_by_pep8("enableLeftRecursion", enable_left_recursion))
-    enablePackrat = staticmethod(replaced_by_pep8("enablePackrat", enable_packrat))
-    resetCache = staticmethod(replaced_by_pep8("resetCache", reset_cache))
-
-    setResultsName = replaced_by_pep8("setResultsName", set_results_name)
-    setBreak = replaced_by_pep8("setBreak", set_break)
-    setParseAction = replaced_by_pep8("setParseAction", set_parse_action)
-    addParseAction = replaced_by_pep8("addParseAction", add_parse_action)
-    addCondition = replaced_by_pep8("addCondition", add_condition)
-    setFailAction = replaced_by_pep8("setFailAction", set_fail_action)
-    tryParse = replaced_by_pep8("tryParse", try_parse)
-    parseString = replaced_by_pep8("parseString", parse_string)
-    scanString = replaced_by_pep8("scanString", scan_string)
-    transformString = replaced_by_pep8("transformString", transform_string)
-    searchString = replaced_by_pep8("searchString", search_string)
-    ignoreWhitespace = replaced_by_pep8("ignoreWhitespace", ignore_whitespace)
-    leaveWhitespace = replaced_by_pep8("leaveWhitespace", leave_whitespace)
-    setWhitespaceChars = replaced_by_pep8("setWhitespaceChars", set_whitespace_chars)
-    parseWithTabs = replaced_by_pep8("parseWithTabs", parse_with_tabs)
-    setDebugActions = replaced_by_pep8("setDebugActions", set_debug_actions)
-    setDebug = replaced_by_pep8("setDebug", set_debug)
-    setName = replaced_by_pep8("setName", set_name)
-    parseFile = replaced_by_pep8("parseFile", parse_file)
-    runTests = replaced_by_pep8("runTests", run_tests)
-    canParseNext = replaced_by_pep8("canParseNext", can_parse_next)
-    defaultName = default_name
-    # fmt: on
-
-
-class _PendingSkip(ParserElement):
-    # internal placeholder class to hold a place were '...' is added to a parser element,
-    # once another ParserElement is added, this placeholder will be replaced with a SkipTo
-    def __init__(self, expr: ParserElement, must_skip: bool = False):
-        super().__init__()
-        self.anchor = expr
-        self.must_skip = must_skip
-
-    def _generateDefaultName(self) -> str:
-        return str(self.anchor + Empty()).replace("Empty", "...")
-
-    def __add__(self, other) -> ParserElement:
-        skipper = SkipTo(other).set_name("...")("_skipped*")
-        if self.must_skip:
-
-            def must_skip(t):
-                if not t._skipped or t._skipped.as_list() == [""]:
-                    del t[0]
-                    t.pop("_skipped", None)
-
-            def show_skip(t):
-                if t._skipped.as_list()[-1:] == [""]:
-                    t.pop("_skipped")
-                    t["_skipped"] = f"missing <{self.anchor!r}>"
-
-            return (
-                self.anchor + skipper().add_parse_action(must_skip)
-                | skipper().add_parse_action(show_skip)
-            ) + other
-
-        return self.anchor + skipper + other
-
-    def __repr__(self):
-        return self.defaultName
-
-    def parseImpl(self, *args) -> ParseImplReturnType:
-        raise Exception(
-            "use of `...` expression without following SkipTo target expression"
-        )
-
-
-class Token(ParserElement):
-    """Abstract :class:`ParserElement` subclass, for defining atomic
-    matching patterns.
-    """
-
-    def __init__(self):
-        super().__init__(savelist=False)
-
-    def _generateDefaultName(self) -> str:
-        return type(self).__name__
-
-
-class NoMatch(Token):
-    """
-    A token that will never match.
-    """
-
-    def __init__(self):
-        super().__init__()
-        self.mayReturnEmpty = True
-        self.mayIndexError = False
-        self.errmsg = "Unmatchable token"
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        raise ParseException(instring, loc, self.errmsg, self)
-
-
-class Literal(Token):
-    """
-    Token to exactly match a specified string.
-
-    Example::
-
-        Literal('abc').parse_string('abc')  # -> ['abc']
-        Literal('abc').parse_string('abcdef')  # -> ['abc']
-        Literal('abc').parse_string('ab')  # -> Exception: Expected "abc"
-
-    For case-insensitive matching, use :class:`CaselessLiteral`.
-
-    For keyword matching (force word break before and after the matched string),
-    use :class:`Keyword` or :class:`CaselessKeyword`.
-    """
-
-    def __new__(cls, match_string: str = "", *, matchString: str = ""):
-        # Performance tuning: select a subclass with optimized parseImpl
-        if cls is Literal:
-            match_string = matchString or match_string
-            if not match_string:
-                return super().__new__(Empty)
-            if len(match_string) == 1:
-                return super().__new__(_SingleCharLiteral)
-
-        # Default behavior
-        return super().__new__(cls)
-
-    # Needed to make copy.copy() work correctly if we customize __new__
-    def __getnewargs__(self):
-        return (self.match,)
-
-    def __init__(self, match_string: str = "", *, matchString: str = ""):
-        super().__init__()
-        match_string = matchString or match_string
-        self.match = match_string
-        self.matchLen = len(match_string)
-        self.firstMatchChar = match_string[:1]
-        self.errmsg = f"Expected {self.name}"
-        self.mayReturnEmpty = False
-        self.mayIndexError = False
-
-    def _generateDefaultName(self) -> str:
-        return repr(self.match)
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        if instring[loc] == self.firstMatchChar and instring.startswith(
-            self.match, loc
-        ):
-            return loc + self.matchLen, self.match
-        raise ParseException(instring, loc, self.errmsg, self)
-
-
-class Empty(Literal):
-    """
-    An empty token, will always match.
-    """
-
-    def __init__(self, match_string="", *, matchString=""):
-        super().__init__("")
-        self.mayReturnEmpty = True
-        self.mayIndexError = False
-
-    def _generateDefaultName(self) -> str:
-        return "Empty"
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        return loc, []
-
-
-class _SingleCharLiteral(Literal):
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        if instring[loc] == self.firstMatchChar:
-            return loc + 1, self.match
-        raise ParseException(instring, loc, self.errmsg, self)
-
-
-ParserElement._literalStringClass = Literal
-
-
-class Keyword(Token):
-    """
-    Token to exactly match a specified string as a keyword, that is,
-    it must be immediately preceded and followed by whitespace or
-    non-keyword characters. Compare with :class:`Literal`:
-
-    - ``Literal("if")`` will match the leading ``'if'`` in
-      ``'ifAndOnlyIf'``.
-    - ``Keyword("if")`` will not; it will only match the leading
-      ``'if'`` in ``'if x=1'``, or ``'if(y==2)'``
-
-    Accepts two optional constructor arguments in addition to the
-    keyword string:
-
-    - ``ident_chars`` is a string of characters that would be valid
-      identifier characters, defaulting to all alphanumerics + "_" and
-      "$"
-    - ``caseless`` allows case-insensitive matching, default is ``False``.
-
-    Example::
-
-        Keyword("start").parse_string("start")  # -> ['start']
-        Keyword("start").parse_string("starting")  # -> Exception
-
-    For case-insensitive matching, use :class:`CaselessKeyword`.
-    """
-
-    DEFAULT_KEYWORD_CHARS = alphanums + "_$"
-
-    def __init__(
-        self,
-        match_string: str = "",
-        ident_chars: typing.Optional[str] = None,
-        caseless: bool = False,
-        *,
-        matchString: str = "",
-        identChars: typing.Optional[str] = None,
-    ):
-        super().__init__()
-        identChars = identChars or ident_chars
-        if identChars is None:
-            identChars = Keyword.DEFAULT_KEYWORD_CHARS
-        match_string = matchString or match_string
-        self.match = match_string
-        self.matchLen = len(match_string)
-        self.firstMatchChar = match_string[:1]
-        if not self.firstMatchChar:
-            raise ValueError("null string passed to Keyword; use Empty() instead")
-        self.errmsg = f"Expected {type(self).__name__} {self.name}"
-        self.mayReturnEmpty = False
-        self.mayIndexError = False
-        self.caseless = caseless
-        if caseless:
-            self.caselessmatch = match_string.upper()
-            identChars = identChars.upper()
-        self.identChars = set(identChars)
-
-    def _generateDefaultName(self) -> str:
-        return repr(self.match)
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        errmsg = self.errmsg or ""
-        errloc = loc
-        if self.caseless:
-            if instring[loc : loc + self.matchLen].upper() == self.caselessmatch:
-                if loc == 0 or instring[loc - 1].upper() not in self.identChars:
-                    if (
-                        loc >= len(instring) - self.matchLen
-                        or instring[loc + self.matchLen].upper() not in self.identChars
-                    ):
-                        return loc + self.matchLen, self.match
-
-                    # followed by keyword char
-                    errmsg += ", was immediately followed by keyword character"
-                    errloc = loc + self.matchLen
-                else:
-                    # preceded by keyword char
-                    errmsg += ", keyword was immediately preceded by keyword character"
-                    errloc = loc - 1
-            # else no match just raise plain exception
-
-        elif (
-            instring[loc] == self.firstMatchChar
-            and self.matchLen == 1
-            or instring.startswith(self.match, loc)
-        ):
-            if loc == 0 or instring[loc - 1] not in self.identChars:
-                if (
-                    loc >= len(instring) - self.matchLen
-                    or instring[loc + self.matchLen] not in self.identChars
-                ):
-                    return loc + self.matchLen, self.match
-
-                # followed by keyword char
-                errmsg += ", keyword was immediately followed by keyword character"
-                errloc = loc + self.matchLen
-            else:
-                # preceded by keyword char
-                errmsg += ", keyword was immediately preceded by keyword character"
-                errloc = loc - 1
-        # else no match just raise plain exception
-
-        raise ParseException(instring, errloc, errmsg, self)
-
-    @staticmethod
-    def set_default_keyword_chars(chars) -> None:
-        """
-        Overrides the default characters used by :class:`Keyword` expressions.
-        """
-        Keyword.DEFAULT_KEYWORD_CHARS = chars
-
-    # Compatibility synonyms
-    setDefaultKeywordChars = staticmethod(
-        replaced_by_pep8("setDefaultKeywordChars", set_default_keyword_chars)
-    )
-
-
-class CaselessLiteral(Literal):
-    """
-    Token to match a specified string, ignoring case of letters.
-    Note: the matched results will always be in the case of the given
-    match string, NOT the case of the input text.
-
-    Example::
-
-        CaselessLiteral("CMD")[1, ...].parse_string("cmd CMD Cmd10")
-        # -> ['CMD', 'CMD', 'CMD']
-
-    (Contrast with example for :class:`CaselessKeyword`.)
-    """
-
-    def __init__(self, match_string: str = "", *, matchString: str = ""):
-        match_string = matchString or match_string
-        super().__init__(match_string.upper())
-        # Preserve the defining literal.
-        self.returnString = match_string
-        self.errmsg = f"Expected {self.name}"
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        if instring[loc : loc + self.matchLen].upper() == self.match:
-            return loc + self.matchLen, self.returnString
-        raise ParseException(instring, loc, self.errmsg, self)
-
-
-class CaselessKeyword(Keyword):
-    """
-    Caseless version of :class:`Keyword`.
-
-    Example::
-
-        CaselessKeyword("CMD")[1, ...].parse_string("cmd CMD Cmd10")
-        # -> ['CMD', 'CMD']
-
-    (Contrast with example for :class:`CaselessLiteral`.)
-    """
-
-    def __init__(
-        self,
-        match_string: str = "",
-        ident_chars: typing.Optional[str] = None,
-        *,
-        matchString: str = "",
-        identChars: typing.Optional[str] = None,
-    ):
-        identChars = identChars or ident_chars
-        match_string = matchString or match_string
-        super().__init__(match_string, identChars, caseless=True)
-
-
-class CloseMatch(Token):
-    """A variation on :class:`Literal` which matches "close" matches,
-    that is, strings with at most 'n' mismatching characters.
-    :class:`CloseMatch` takes parameters:
-
-    - ``match_string`` - string to be matched
-    - ``caseless`` - a boolean indicating whether to ignore casing when comparing characters
-    - ``max_mismatches`` - (``default=1``) maximum number of
-      mismatches allowed to count as a match
-
-    The results from a successful parse will contain the matched text
-    from the input string and the following named results:
-
-    - ``mismatches`` - a list of the positions within the
-      match_string where mismatches were found
-    - ``original`` - the original match_string used to compare
-      against the input string
-
-    If ``mismatches`` is an empty list, then the match was an exact
-    match.
-
-    Example::
-
-        patt = CloseMatch("ATCATCGAATGGA")
-        patt.parse_string("ATCATCGAAXGGA") # -> (['ATCATCGAAXGGA'], {'mismatches': [[9]], 'original': ['ATCATCGAATGGA']})
-        patt.parse_string("ATCAXCGAAXGGA") # -> Exception: Expected 'ATCATCGAATGGA' (with up to 1 mismatches) (at char 0), (line:1, col:1)
-
-        # exact match
-        patt.parse_string("ATCATCGAATGGA") # -> (['ATCATCGAATGGA'], {'mismatches': [[]], 'original': ['ATCATCGAATGGA']})
-
-        # close match allowing up to 2 mismatches
-        patt = CloseMatch("ATCATCGAATGGA", max_mismatches=2)
-        patt.parse_string("ATCAXCGAAXGGA") # -> (['ATCAXCGAAXGGA'], {'mismatches': [[4, 9]], 'original': ['ATCATCGAATGGA']})
-    """
-
-    def __init__(
-        self,
-        match_string: str,
-        max_mismatches: typing.Optional[int] = None,
-        *,
-        maxMismatches: int = 1,
-        caseless=False,
-    ):
-        maxMismatches = max_mismatches if max_mismatches is not None else maxMismatches
-        super().__init__()
-        self.match_string = match_string
-        self.maxMismatches = maxMismatches
-        self.errmsg = f"Expected {self.match_string!r} (with up to {self.maxMismatches} mismatches)"
-        self.caseless = caseless
-        self.mayIndexError = False
-        self.mayReturnEmpty = False
-
-    def _generateDefaultName(self) -> str:
-        return f"{type(self).__name__}:{self.match_string!r}"
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        start = loc
-        instrlen = len(instring)
-        maxloc = start + len(self.match_string)
-
-        if maxloc <= instrlen:
-            match_string = self.match_string
-            match_stringloc = 0
-            mismatches = []
-            maxMismatches = self.maxMismatches
-
-            for match_stringloc, s_m in enumerate(
-                zip(instring[loc:maxloc], match_string)
-            ):
-                src, mat = s_m
-                if self.caseless:
-                    src, mat = src.lower(), mat.lower()
-
-                if src != mat:
-                    mismatches.append(match_stringloc)
-                    if len(mismatches) > maxMismatches:
-                        break
-            else:
-                loc = start + match_stringloc + 1
-                results = ParseResults([instring[start:loc]])
-                results["original"] = match_string
-                results["mismatches"] = mismatches
-                return loc, results
-
-        raise ParseException(instring, loc, self.errmsg, self)
-
-
-class Word(Token):
-    """Token for matching words composed of allowed character sets.
-
-    Parameters:
-
-    - ``init_chars`` - string of all characters that should be used to
-      match as a word; "ABC" will match "AAA", "ABAB", "CBAC", etc.;
-      if ``body_chars`` is also specified, then this is the string of
-      initial characters
-    - ``body_chars`` - string of characters that
-      can be used for matching after a matched initial character as
-      given in ``init_chars``; if omitted, same as the initial characters
-      (default=``None``)
-    - ``min`` - minimum number of characters to match (default=1)
-    - ``max`` - maximum number of characters to match (default=0)
-    - ``exact`` - exact number of characters to match (default=0)
-    - ``as_keyword`` - match as a keyword (default=``False``)
-    - ``exclude_chars`` - characters that might be
-      found in the input ``body_chars`` string but which should not be
-      accepted for matching ;useful to define a word of all
-      printables except for one or two characters, for instance
-      (default=``None``)
-
-    :class:`srange` is useful for defining custom character set strings
-    for defining :class:`Word` expressions, using range notation from
-    regular expression character sets.
-
-    A common mistake is to use :class:`Word` to match a specific literal
-    string, as in ``Word("Address")``. Remember that :class:`Word`
-    uses the string argument to define *sets* of matchable characters.
-    This expression would match "Add", "AAA", "dAred", or any other word
-    made up of the characters 'A', 'd', 'r', 'e', and 's'. To match an
-    exact literal string, use :class:`Literal` or :class:`Keyword`.
-
-    pyparsing includes helper strings for building Words:
-
-    - :class:`alphas`
-    - :class:`nums`
-    - :class:`alphanums`
-    - :class:`hexnums`
-    - :class:`alphas8bit` (alphabetic characters in ASCII range 128-255
-      - accented, tilded, umlauted, etc.)
-    - :class:`punc8bit` (non-alphabetic characters in ASCII range
-      128-255 - currency, symbols, superscripts, diacriticals, etc.)
-    - :class:`printables` (any non-whitespace character)
-
-    ``alphas``, ``nums``, and ``printables`` are also defined in several
-    Unicode sets - see :class:`pyparsing_unicode``.
-
-    Example::
-
-        # a word composed of digits
-        integer = Word(nums) # equivalent to Word("0123456789") or Word(srange("0-9"))
-
-        # a word with a leading capital, and zero or more lowercase
-        capitalized_word = Word(alphas.upper(), alphas.lower())
-
-        # hostnames are alphanumeric, with leading alpha, and '-'
-        hostname = Word(alphas, alphanums + '-')
-
-        # roman numeral (not a strict parser, accepts invalid mix of characters)
-        roman = Word("IVXLCDM")
-
-        # any string of non-whitespace characters, except for ','
-        csv_value = Word(printables, exclude_chars=",")
-    """
-
-    def __init__(
-        self,
-        init_chars: str = "",
-        body_chars: typing.Optional[str] = None,
-        min: int = 1,
-        max: int = 0,
-        exact: int = 0,
-        as_keyword: bool = False,
-        exclude_chars: typing.Optional[str] = None,
-        *,
-        initChars: typing.Optional[str] = None,
-        bodyChars: typing.Optional[str] = None,
-        asKeyword: bool = False,
-        excludeChars: typing.Optional[str] = None,
-    ):
-        initChars = initChars or init_chars
-        bodyChars = bodyChars or body_chars
-        asKeyword = asKeyword or as_keyword
-        excludeChars = excludeChars or exclude_chars
-        super().__init__()
-        if not initChars:
-            raise ValueError(
-                f"invalid {type(self).__name__}, initChars cannot be empty string"
-            )
-
-        initChars_set = set(initChars)
-        if excludeChars:
-            excludeChars_set = set(excludeChars)
-            initChars_set -= excludeChars_set
-            if bodyChars:
-                bodyChars = "".join(set(bodyChars) - excludeChars_set)
-        self.initChars = initChars_set
-        self.initCharsOrig = "".join(sorted(initChars_set))
-
-        if bodyChars:
-            self.bodyChars = set(bodyChars)
-            self.bodyCharsOrig = "".join(sorted(bodyChars))
-        else:
-            self.bodyChars = initChars_set
-            self.bodyCharsOrig = self.initCharsOrig
-
-        self.maxSpecified = max > 0
-
-        if min < 1:
-            raise ValueError(
-                "cannot specify a minimum length < 1; use Opt(Word()) if zero-length word is permitted"
-            )
-
-        if self.maxSpecified and min > max:
-            raise ValueError(
-                f"invalid args, if min and max both specified min must be <= max (min={min}, max={max})"
-            )
-
-        self.minLen = min
-
-        if max > 0:
-            self.maxLen = max
-        else:
-            self.maxLen = _MAX_INT
-
-        if exact > 0:
-            min = max = exact
-            self.maxLen = exact
-            self.minLen = exact
-
-        self.errmsg = f"Expected {self.name}"
-        self.mayIndexError = False
-        self.asKeyword = asKeyword
-        if self.asKeyword:
-            self.errmsg += " as a keyword"
-
-        # see if we can make a regex for this Word
-        if " " not in (self.initChars | self.bodyChars):
-            if len(self.initChars) == 1:
-                re_leading_fragment = re.escape(self.initCharsOrig)
-            else:
-                re_leading_fragment = f"[{_collapse_string_to_ranges(self.initChars)}]"
-
-            if self.bodyChars == self.initChars:
-                if max == 0 and self.minLen == 1:
-                    repeat = "+"
-                elif max == 1:
-                    repeat = ""
-                else:
-                    if self.minLen != self.maxLen:
-                        repeat = f"{{{self.minLen},{'' if self.maxLen == _MAX_INT else self.maxLen}}}"
-                    else:
-                        repeat = f"{{{self.minLen}}}"
-                self.reString = f"{re_leading_fragment}{repeat}"
-            else:
-                if max == 1:
-                    re_body_fragment = ""
-                    repeat = ""
-                else:
-                    re_body_fragment = f"[{_collapse_string_to_ranges(self.bodyChars)}]"
-                    if max == 0 and self.minLen == 1:
-                        repeat = "*"
-                    elif max == 2:
-                        repeat = "?" if min <= 1 else ""
-                    else:
-                        if min != max:
-                            repeat = f"{{{min - 1 if min > 0 else ''},{max - 1 if max > 0 else ''}}}"
-                        else:
-                            repeat = f"{{{min - 1 if min > 0 else ''}}}"
-
-                self.reString = f"{re_leading_fragment}{re_body_fragment}{repeat}"
-
-            if self.asKeyword:
-                self.reString = rf"\b{self.reString}\b"
-
-            try:
-                self.re = re.compile(self.reString)
-            except re.error:
-                self.re = None  # type: ignore[assignment]
-            else:
-                self.re_match = self.re.match
-                self.parseImpl = self.parseImpl_regex  # type: ignore[method-assign]
-
-    def _generateDefaultName(self) -> str:
-        def charsAsStr(s):
-            max_repr_len = 16
-            s = _collapse_string_to_ranges(s, re_escape=False)
-
-            if len(s) > max_repr_len:
-                return s[: max_repr_len - 3] + "..."
-
-            return s
-
-        if self.initChars != self.bodyChars:
-            base = f"W:({charsAsStr(self.initChars)}, {charsAsStr(self.bodyChars)})"
-        else:
-            base = f"W:({charsAsStr(self.initChars)})"
-
-        # add length specification
-        if self.minLen > 1 or self.maxLen != _MAX_INT:
-            if self.minLen == self.maxLen:
-                if self.minLen == 1:
-                    return base[2:]
-                else:
-                    return base + f"{{{self.minLen}}}"
-            elif self.maxLen == _MAX_INT:
-                return base + f"{{{self.minLen},...}}"
-            else:
-                return base + f"{{{self.minLen},{self.maxLen}}}"
-        return base
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        if instring[loc] not in self.initChars:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        start = loc
-        loc += 1
-        instrlen = len(instring)
-        body_chars: set[str] = self.bodyChars
-        maxloc = start + self.maxLen
-        maxloc = min(maxloc, instrlen)
-        while loc < maxloc and instring[loc] in body_chars:
-            loc += 1
-
-        throw_exception = False
-        if loc - start < self.minLen:
-            throw_exception = True
-        elif self.maxSpecified and loc < instrlen and instring[loc] in body_chars:
-            throw_exception = True
-        elif self.asKeyword and (
-            (start > 0 and instring[start - 1] in body_chars)
-            or (loc < instrlen and instring[loc] in body_chars)
-        ):
-            throw_exception = True
-
-        if throw_exception:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        return loc, instring[start:loc]
-
-    def parseImpl_regex(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        result = self.re_match(instring, loc)
-        if not result:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        loc = result.end()
-        return loc, result.group()
-
-
-class Char(Word):
-    """A short-cut class for defining :class:`Word` ``(characters, exact=1)``,
-    when defining a match of any single character in a string of
-    characters.
-    """
-
-    def __init__(
-        self,
-        charset: str,
-        as_keyword: bool = False,
-        exclude_chars: typing.Optional[str] = None,
-        *,
-        asKeyword: bool = False,
-        excludeChars: typing.Optional[str] = None,
-    ):
-        asKeyword = asKeyword or as_keyword
-        excludeChars = excludeChars or exclude_chars
-        super().__init__(
-            charset, exact=1, as_keyword=asKeyword, exclude_chars=excludeChars
-        )
-
-
-class Regex(Token):
-    r"""Token for matching strings that match a given regular
-    expression. Defined with string specifying the regular expression in
-    a form recognized by the stdlib Python  `re module <https://docs.python.org/3/library/re.html>`_.
-    If the given regex contains named groups (defined using ``(?P<name>...)``),
-    these will be preserved as named :class:`ParseResults`.
-
-    If instead of the Python stdlib ``re`` module you wish to use a different RE module
-    (such as the ``regex`` module), you can do so by building your ``Regex`` object with
-    a compiled RE that was compiled using ``regex``.
-
-    Example::
-
-        realnum = Regex(r"[+-]?\d+\.\d*")
-        # ref: https://stackoverflow.com/questions/267399/how-do-you-match-only-valid-roman-numerals-with-a-regular-expression
-        roman = Regex(r"M{0,4}(CM|CD|D?{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})")
-
-        # named fields in a regex will be returned as named results
-        date = Regex(r'(?P<year>\d{4})-(?P<month>\d\d?)-(?P<day>\d\d?)')
-
-        # the Regex class will accept re's compiled using the regex module
-        import regex
-        parser = pp.Regex(regex.compile(r'[0-9]'))
-    """
-
-    def __init__(
-        self,
-        pattern: Any,
-        flags: Union[re.RegexFlag, int] = 0,
-        as_group_list: bool = False,
-        as_match: bool = False,
-        *,
-        asGroupList: bool = False,
-        asMatch: bool = False,
-    ):
-        """The parameters ``pattern`` and ``flags`` are passed
-        to the ``re.compile()`` function as-is. See the Python
-        `re module <https://docs.python.org/3/library/re.html>`_ module for an
-        explanation of the acceptable patterns and flags.
-        """
-        super().__init__()
-        asGroupList = asGroupList or as_group_list
-        asMatch = asMatch or as_match
-
-        if isinstance(pattern, str_type):
-            if not pattern:
-                raise ValueError("null string passed to Regex; use Empty() instead")
-
-            self._re = None
-            self.reString = self.pattern = pattern
-
-        elif hasattr(pattern, "pattern") and hasattr(pattern, "match"):
-            self._re = pattern
-            self.pattern = self.reString = pattern.pattern
-
-        elif callable(pattern):
-            # defer creating this pattern until we really need it
-            self.pattern = pattern
-            self._re = None
-
-        else:
-            raise TypeError(
-                "Regex may only be constructed with a string or a compiled RE object,"
-                " or a callable that takes no arguments and returns a string or a"
-                " compiled RE object"
-            )
-
-        self.flags = flags
-        self.errmsg = f"Expected {self.name}"
-        self.mayIndexError = False
-        self.asGroupList = asGroupList
-        self.asMatch = asMatch
-        if self.asGroupList:
-            self.parseImpl = self.parseImplAsGroupList  # type: ignore [method-assign]
-        if self.asMatch:
-            self.parseImpl = self.parseImplAsMatch  # type: ignore [method-assign]
-
-    @cached_property
-    def re(self) -> re.Pattern:
-        if self._re:
-            return self._re
-
-        if callable(self.pattern):
-            # replace self.pattern with the string returned by calling self.pattern()
-            self.pattern = cast(Callable[[], str], self.pattern)()
-
-            # see if we got a compiled RE back instead of a str - if so, we're done
-            if hasattr(self.pattern, "pattern") and hasattr(self.pattern, "match"):
-                self._re = cast(re.Pattern[str], self.pattern)
-                self.pattern = self.reString = self._re.pattern
-                return self._re
-
-        try:
-            self._re = re.compile(self.pattern, self.flags)
-            return self._re
-        except re.error:
-            raise ValueError(f"invalid pattern ({self.pattern!r}) passed to Regex")
-
-    @cached_property
-    def re_match(self) -> Callable[[str, int], Any]:
-        return self.re.match
-
-    @cached_property
-    def mayReturnEmpty(self) -> bool:  # type: ignore[override]
-        return self.re_match("", 0) is not None
-
-    def _generateDefaultName(self) -> str:
-        unescaped = repr(self.pattern).replace("\\\\", "\\")
-        return f"Re:({unescaped})"
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        result = self.re_match(instring, loc)
-        if not result:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        loc = result.end()
-        ret = ParseResults(result.group())
-        d = result.groupdict()
-
-        for k, v in d.items():
-            ret[k] = v
-
-        return loc, ret
-
-    def parseImplAsGroupList(self, instring, loc, do_actions=True):
-        result = self.re_match(instring, loc)
-        if not result:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        loc = result.end()
-        ret = result.groups()
-        return loc, ret
-
-    def parseImplAsMatch(self, instring, loc, do_actions=True):
-        result = self.re_match(instring, loc)
-        if not result:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        loc = result.end()
-        ret = result
-        return loc, ret
-
-    def sub(self, repl: str) -> ParserElement:
-        r"""
-        Return :class:`Regex` with an attached parse action to transform the parsed
-        result as if called using `re.sub(expr, repl, string) <https://docs.python.org/3/library/re.html#re.sub>`_.
-
-        Example::
-
-            make_html = Regex(r"(\w+):(.*?):").sub(r"<\1>\2</\1>")
-            print(make_html.transform_string("h1:main title:"))
-            # prints "<h1>main title</h1>"
-        """
-        if self.asGroupList:
-            raise TypeError("cannot use sub() with Regex(as_group_list=True)")
-
-        if self.asMatch and callable(repl):
-            raise TypeError(
-                "cannot use sub() with a callable with Regex(as_match=True)"
-            )
-
-        if self.asMatch:
-
-            def pa(tokens):
-                return tokens[0].expand(repl)
-
-        else:
-
-            def pa(tokens):
-                return self.re.sub(repl, tokens[0])
-
-        return self.add_parse_action(pa)
-
-
-class QuotedString(Token):
-    r"""
-    Token for matching strings that are delimited by quoting characters.
-
-    Defined with the following parameters:
-
-    - ``quote_char`` - string of one or more characters defining the
-      quote delimiting string
-    - ``esc_char`` - character to re_escape quotes, typically backslash
-      (default= ``None``)
-    - ``esc_quote`` - special quote sequence to re_escape an embedded quote
-      string (such as SQL's ``""`` to re_escape an embedded ``"``)
-      (default= ``None``)
-    - ``multiline`` - boolean indicating whether quotes can span
-      multiple lines (default= ``False``)
-    - ``unquote_results`` - boolean indicating whether the matched text
-      should be unquoted (default= ``True``)
-    - ``end_quote_char`` - string of one or more characters defining the
-      end of the quote delimited string (default= ``None``  => same as
-      quote_char)
-    - ``convert_whitespace_escapes`` - convert escaped whitespace
-      (``'\t'``, ``'\n'``, etc.) to actual whitespace
-      (default= ``True``)
-
-    Example::
-
-        qs = QuotedString('"')
-        print(qs.search_string('lsjdf "This is the quote" sldjf'))
-        complex_qs = QuotedString('{{', end_quote_char='}}')
-        print(complex_qs.search_string('lsjdf {{This is the "quote"}} sldjf'))
-        sql_qs = QuotedString('"', esc_quote='""')
-        print(sql_qs.search_string('lsjdf "This is the quote with ""embedded"" quotes" sldjf'))
-
-    prints::
-
-        [['This is the quote']]
-        [['This is the "quote"']]
-        [['This is the quote with "embedded" quotes']]
-    """
-
-    ws_map = dict(((r"\t", "\t"), (r"\n", "\n"), (r"\f", "\f"), (r"\r", "\r")))
-
-    def __init__(
-        self,
-        quote_char: str = "",
-        esc_char: typing.Optional[str] = None,
-        esc_quote: typing.Optional[str] = None,
-        multiline: bool = False,
-        unquote_results: bool = True,
-        end_quote_char: typing.Optional[str] = None,
-        convert_whitespace_escapes: bool = True,
-        *,
-        quoteChar: str = "",
-        escChar: typing.Optional[str] = None,
-        escQuote: typing.Optional[str] = None,
-        unquoteResults: bool = True,
-        endQuoteChar: typing.Optional[str] = None,
-        convertWhitespaceEscapes: bool = True,
-    ):
-        super().__init__()
-        esc_char = escChar or esc_char
-        esc_quote = escQuote or esc_quote
-        unquote_results = unquoteResults and unquote_results
-        end_quote_char = endQuoteChar or end_quote_char
-        convert_whitespace_escapes = (
-            convertWhitespaceEscapes and convert_whitespace_escapes
-        )
-        quote_char = quoteChar or quote_char
-
-        # remove white space from quote chars
-        quote_char = quote_char.strip()
-        if not quote_char:
-            raise ValueError("quote_char cannot be the empty string")
-
-        if end_quote_char is None:
-            end_quote_char = quote_char
-        else:
-            end_quote_char = end_quote_char.strip()
-            if not end_quote_char:
-                raise ValueError("end_quote_char cannot be the empty string")
-
-        self.quote_char: str = quote_char
-        self.quote_char_len: int = len(quote_char)
-        self.first_quote_char: str = quote_char[0]
-        self.end_quote_char: str = end_quote_char
-        self.end_quote_char_len: int = len(end_quote_char)
-        self.esc_char: str = esc_char or ""
-        self.has_esc_char: bool = esc_char is not None
-        self.esc_quote: str = esc_quote or ""
-        self.unquote_results: bool = unquote_results
-        self.convert_whitespace_escapes: bool = convert_whitespace_escapes
-        self.multiline = multiline
-        self.re_flags = re.RegexFlag(0)
-
-        # fmt: off
-        # build up re pattern for the content between the quote delimiters
-        inner_pattern: list[str] = []
-
-        if esc_quote:
-            inner_pattern.append(rf"(?:{re.escape(esc_quote)})")
-
-        if esc_char:
-            inner_pattern.append(rf"(?:{re.escape(esc_char)}.)")
-
-        if len(self.end_quote_char) > 1:
-            inner_pattern.append(
-                "(?:"
-                + "|".join(
-                    f"(?:{re.escape(self.end_quote_char[:i])}(?!{re.escape(self.end_quote_char[i:])}))"
-                    for i in range(len(self.end_quote_char) - 1, 0, -1)
-                )
-                + ")"
-            )
-
-        if self.multiline:
-            self.re_flags |= re.MULTILINE | re.DOTALL
-            inner_pattern.append(
-                rf"(?:[^{_escape_regex_range_chars(self.end_quote_char[0])}"
-                rf"{(_escape_regex_range_chars(self.esc_char) if self.has_esc_char else '')}])"
-            )
-        else:
-            inner_pattern.append(
-                rf"(?:[^{_escape_regex_range_chars(self.end_quote_char[0])}\n\r"
-                rf"{(_escape_regex_range_chars(self.esc_char) if self.has_esc_char else '')}])"
-            )
-
-        self.pattern = "".join(
-            [
-                re.escape(self.quote_char),
-                "(?:",
-                '|'.join(inner_pattern),
-                ")*",
-                re.escape(self.end_quote_char),
-            ]
-        )
-
-        if self.unquote_results:
-            if self.convert_whitespace_escapes:
-                self.unquote_scan_re = re.compile(
-                    rf"({'|'.join(re.escape(k) for k in self.ws_map)})"
-                    rf"|(\\[0-7]{3}|\\0|\\x[0-9a-fA-F]{2}|\\u[0-9a-fA-F]{4})"
-                    rf"|({re.escape(self.esc_char)}.)"
-                    rf"|(\n|.)",
-                    flags=self.re_flags,
-                )
-            else:
-                self.unquote_scan_re = re.compile(
-                    rf"({re.escape(self.esc_char)}.)"
-                    rf"|(\n|.)",
-                    flags=self.re_flags
-                )
-        # fmt: on
-
-        try:
-            self.re = re.compile(self.pattern, self.re_flags)
-            self.reString = self.pattern
-            self.re_match = self.re.match
-        except re.error:
-            raise ValueError(f"invalid pattern {self.pattern!r} passed to Regex")
-
-        self.errmsg = f"Expected {self.name}"
-        self.mayIndexError = False
-        self.mayReturnEmpty = True
-
-    def _generateDefaultName(self) -> str:
-        if self.quote_char == self.end_quote_char and isinstance(
-            self.quote_char, str_type
-        ):
-            return f"string enclosed in {self.quote_char!r}"
-
-        return f"quoted string, starting with {self.quote_char} ending with {self.end_quote_char}"
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        # check first character of opening quote to see if that is a match
-        # before doing the more complicated regex match
-        result = (
-            instring[loc] == self.first_quote_char
-            and self.re_match(instring, loc)
-            or None
-        )
-        if not result:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        # get ending loc and matched string from regex matching result
-        loc = result.end()
-        ret = result.group()
-
-        def convert_escaped_numerics(s: str) -> str:
-            if s == "0":
-                return "\0"
-            if s.isdigit() and len(s) == 3:
-                return chr(int(s, base=8))
-            elif s.startswith(("u", "x")):
-                return chr(int(s[1:], base=16))
-            else:
-                return s
-
-        if self.unquote_results:
-            # strip off quotes
-            ret = ret[self.quote_char_len : -self.end_quote_char_len]
-
-            if isinstance(ret, str_type):
-                # fmt: off
-                if self.convert_whitespace_escapes:
-                    # as we iterate over matches in the input string,
-                    # collect from whichever match group of the unquote_scan_re
-                    # regex matches (only 1 group will match at any given time)
-                    ret = "".join(
-                        # match group 1 matches \t, \n, etc.
-                        self.ws_map[match.group(1)] if match.group(1)
-                        # match group 2 matches escaped octal, null, hex, and Unicode
-                        # sequences
-                        else convert_escaped_numerics(match.group(2)[1:]) if match.group(2)
-                        # match group 3 matches escaped characters
-                        else match.group(3)[-1] if match.group(3)
-                        # match group 4 matches any character
-                        else match.group(4)
-                        for match in self.unquote_scan_re.finditer(ret)
-                    )
-                else:
-                    ret = "".join(
-                        # match group 1 matches escaped characters
-                        match.group(1)[-1] if match.group(1)
-                        # match group 2 matches any character
-                        else match.group(2)
-                        for match in self.unquote_scan_re.finditer(ret)
-                    )
-                # fmt: on
-
-                # replace escaped quotes
-                if self.esc_quote:
-                    ret = ret.replace(self.esc_quote, self.end_quote_char)
-
-        return loc, ret
-
-
-class CharsNotIn(Token):
-    """Token for matching words composed of characters *not* in a given
-    set (will include whitespace in matched characters if not listed in
-    the provided exclusion set - see example). Defined with string
-    containing all disallowed characters, and an optional minimum,
-    maximum, and/or exact length.  The default value for ``min`` is
-    1 (a minimum value < 1 is not valid); the default values for
-    ``max`` and ``exact`` are 0, meaning no maximum or exact
-    length restriction.
-
-    Example::
-
-        # define a comma-separated-value as anything that is not a ','
-        csv_value = CharsNotIn(',')
-        print(DelimitedList(csv_value).parse_string("dkls,lsdkjf,s12 34,@!#,213"))
-
-    prints::
-
-        ['dkls', 'lsdkjf', 's12 34', '@!#', '213']
-    """
-
-    def __init__(
-        self,
-        not_chars: str = "",
-        min: int = 1,
-        max: int = 0,
-        exact: int = 0,
-        *,
-        notChars: str = "",
-    ):
-        super().__init__()
-        self.skipWhitespace = False
-        self.notChars = not_chars or notChars
-        self.notCharsSet = set(self.notChars)
-
-        if min < 1:
-            raise ValueError(
-                "cannot specify a minimum length < 1; use"
-                " Opt(CharsNotIn()) if zero-length char group is permitted"
-            )
-
-        self.minLen = min
-
-        if max > 0:
-            self.maxLen = max
-        else:
-            self.maxLen = _MAX_INT
-
-        if exact > 0:
-            self.maxLen = exact
-            self.minLen = exact
-
-        self.errmsg = f"Expected {self.name}"
-        self.mayReturnEmpty = self.minLen == 0
-        self.mayIndexError = False
-
-    def _generateDefaultName(self) -> str:
-        not_chars_str = _collapse_string_to_ranges(self.notChars)
-        if len(not_chars_str) > 16:
-            return f"!W:({self.notChars[: 16 - 3]}...)"
-        else:
-            return f"!W:({self.notChars})"
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        notchars = self.notCharsSet
-        if instring[loc] in notchars:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        start = loc
-        loc += 1
-        maxlen = min(start + self.maxLen, len(instring))
-        while loc < maxlen and instring[loc] not in notchars:
-            loc += 1
-
-        if loc - start < self.minLen:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        return loc, instring[start:loc]
-
-
-class White(Token):
-    """Special matching class for matching whitespace.  Normally,
-    whitespace is ignored by pyparsing grammars.  This class is included
-    when some whitespace structures are significant.  Define with
-    a string containing the whitespace characters to be matched; default
-    is ``" \\t\\r\\n"``.  Also takes optional ``min``,
-    ``max``, and ``exact`` arguments, as defined for the
-    :class:`Word` class.
-    """
-
-    whiteStrs = {
-        " ": "<SP>",
-        "\t": "<TAB>",
-        "\n": "<LF>",
-        "\r": "<CR>",
-        "\f": "<FF>",
-        "\u00A0": "<NBSP>",
-        "\u1680": "<OGHAM_SPACE_MARK>",
-        "\u180E": "<MONGOLIAN_VOWEL_SEPARATOR>",
-        "\u2000": "<EN_QUAD>",
-        "\u2001": "<EM_QUAD>",
-        "\u2002": "<EN_SPACE>",
-        "\u2003": "<EM_SPACE>",
-        "\u2004": "<THREE-PER-EM_SPACE>",
-        "\u2005": "<FOUR-PER-EM_SPACE>",
-        "\u2006": "<SIX-PER-EM_SPACE>",
-        "\u2007": "<FIGURE_SPACE>",
-        "\u2008": "<PUNCTUATION_SPACE>",
-        "\u2009": "<THIN_SPACE>",
-        "\u200A": "<HAIR_SPACE>",
-        "\u200B": "<ZERO_WIDTH_SPACE>",
-        "\u202F": "<NNBSP>",
-        "\u205F": "<MMSP>",
-        "\u3000": "<IDEOGRAPHIC_SPACE>",
-    }
-
-    def __init__(self, ws: str = " \t\r\n", min: int = 1, max: int = 0, exact: int = 0):
-        super().__init__()
-        self.matchWhite = ws
-        self.set_whitespace_chars(
-            "".join(c for c in self.whiteStrs if c not in self.matchWhite),
-            copy_defaults=True,
-        )
-        # self.leave_whitespace()
-        self.mayReturnEmpty = True
-        self.errmsg = f"Expected {self.name}"
-
-        self.minLen = min
-
-        if max > 0:
-            self.maxLen = max
-        else:
-            self.maxLen = _MAX_INT
-
-        if exact > 0:
-            self.maxLen = exact
-            self.minLen = exact
-
-    def _generateDefaultName(self) -> str:
-        return "".join(White.whiteStrs[c] for c in self.matchWhite)
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        if instring[loc] not in self.matchWhite:
-            raise ParseException(instring, loc, self.errmsg, self)
-        start = loc
-        loc += 1
-        maxloc = start + self.maxLen
-        maxloc = min(maxloc, len(instring))
-        while loc < maxloc and instring[loc] in self.matchWhite:
-            loc += 1
-
-        if loc - start < self.minLen:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        return loc, instring[start:loc]
-
-
-class PositionToken(Token):
-    def __init__(self):
-        super().__init__()
-        self.mayReturnEmpty = True
-        self.mayIndexError = False
-
-
-class GoToColumn(PositionToken):
-    """Token to advance to a specific column of input text; useful for
-    tabular report scraping.
-    """
-
-    def __init__(self, colno: int):
-        super().__init__()
-        self.col = colno
-
-    def preParse(self, instring: str, loc: int) -> int:
-        if col(loc, instring) == self.col:
-            return loc
-
-        instrlen = len(instring)
-        if self.ignoreExprs:
-            loc = self._skipIgnorables(instring, loc)
-        while (
-            loc < instrlen
-            and instring[loc].isspace()
-            and col(loc, instring) != self.col
-        ):
-            loc += 1
-
-        return loc
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        thiscol = col(loc, instring)
-        if thiscol > self.col:
-            raise ParseException(instring, loc, "Text not in expected column", self)
-        newloc = loc + self.col - thiscol
-        ret = instring[loc:newloc]
-        return newloc, ret
-
-
-class LineStart(PositionToken):
-    r"""Matches if current position is at the beginning of a line within
-    the parse string
-
-    Example::
-
-        test = '''\
-        AAA this line
-        AAA and this line
-          AAA but not this one
-        B AAA and definitely not this one
-        '''
-
-        for t in (LineStart() + 'AAA' + rest_of_line).search_string(test):
-            print(t)
-
-    prints::
-
-        ['AAA', ' this line']
-        ['AAA', ' and this line']
-
-    """
-
-    def __init__(self):
-        super().__init__()
-        self.leave_whitespace()
-        self.orig_whiteChars = set() | self.whiteChars
-        self.whiteChars.discard("\n")
-        self.skipper = Empty().set_whitespace_chars(self.whiteChars)
-        self.set_name("start of line")
-
-    def preParse(self, instring: str, loc: int) -> int:
-        if loc == 0:
-            return loc
-
-        ret = self.skipper.preParse(instring, loc)
-
-        if "\n" in self.orig_whiteChars:
-            while instring[ret : ret + 1] == "\n":
-                ret = self.skipper.preParse(instring, ret + 1)
-
-        return ret
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        if col(loc, instring) == 1:
-            return loc, []
-        raise ParseException(instring, loc, self.errmsg, self)
-
-
-class LineEnd(PositionToken):
-    """Matches if current position is at the end of a line within the
-    parse string
-    """
-
-    def __init__(self):
-        super().__init__()
-        self.whiteChars.discard("\n")
-        self.set_whitespace_chars(self.whiteChars, copy_defaults=False)
-        self.set_name("end of line")
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        if loc < len(instring):
-            if instring[loc] == "\n":
-                return loc + 1, "\n"
-            else:
-                raise ParseException(instring, loc, self.errmsg, self)
-        elif loc == len(instring):
-            return loc + 1, []
-        else:
-            raise ParseException(instring, loc, self.errmsg, self)
-
-
-class StringStart(PositionToken):
-    """Matches if current position is at the beginning of the parse
-    string
-    """
-
-    def __init__(self):
-        super().__init__()
-        self.set_name("start of text")
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        # see if entire string up to here is just whitespace and ignoreables
-        if loc != 0 and loc != self.preParse(instring, 0):
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        return loc, []
-
-
-class StringEnd(PositionToken):
-    """
-    Matches if current position is at the end of the parse string
-    """
-
-    def __init__(self):
-        super().__init__()
-        self.set_name("end of text")
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        if loc < len(instring):
-            raise ParseException(instring, loc, self.errmsg, self)
-        if loc == len(instring):
-            return loc + 1, []
-        if loc > len(instring):
-            return loc, []
-
-        raise ParseException(instring, loc, self.errmsg, self)
-
-
-class WordStart(PositionToken):
-    """Matches if the current position is at the beginning of a
-    :class:`Word`, and is not preceded by any character in a given
-    set of ``word_chars`` (default= ``printables``). To emulate the
-    ``\b`` behavior of regular expressions, use
-    ``WordStart(alphanums)``. ``WordStart`` will also match at
-    the beginning of the string being parsed, or at the beginning of
-    a line.
-    """
-
-    def __init__(self, word_chars: str = printables, *, wordChars: str = printables):
-        wordChars = word_chars if wordChars == printables else wordChars
-        super().__init__()
-        self.wordChars = set(wordChars)
-        self.set_name("start of a word")
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        if loc != 0:
-            if (
-                instring[loc - 1] in self.wordChars
-                or instring[loc] not in self.wordChars
-            ):
-                raise ParseException(instring, loc, self.errmsg, self)
-        return loc, []
-
-
-class WordEnd(PositionToken):
-    """Matches if the current position is at the end of a :class:`Word`,
-    and is not followed by any character in a given set of ``word_chars``
-    (default= ``printables``). To emulate the ``\b`` behavior of
-    regular expressions, use ``WordEnd(alphanums)``. ``WordEnd``
-    will also match at the end of the string being parsed, or at the end
-    of a line.
-    """
-
-    def __init__(self, word_chars: str = printables, *, wordChars: str = printables):
-        wordChars = word_chars if wordChars == printables else wordChars
-        super().__init__()
-        self.wordChars = set(wordChars)
-        self.skipWhitespace = False
-        self.set_name("end of a word")
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        instrlen = len(instring)
-        if instrlen > 0 and loc < instrlen:
-            if (
-                instring[loc] in self.wordChars
-                or instring[loc - 1] not in self.wordChars
-            ):
-                raise ParseException(instring, loc, self.errmsg, self)
-        return loc, []
-
-
-class Tag(Token):
-    """
-    A meta-element for inserting a named result into the parsed
-    tokens that may be checked later in a parse action or while
-    processing the parsed results. Accepts an optional tag value,
-    defaulting to `True`.
-
-    Example::
-
-        end_punc = "." | ("!" + Tag("enthusiastic")))
-        greeting = "Hello," + Word(alphas) + end_punc
-
-        result = greeting.parse_string("Hello, World.")
-        print(result.dump())
-
-        result = greeting.parse_string("Hello, World!")
-        print(result.dump())
-
-    prints::
-
-        ['Hello,', 'World', '.']
-
-        ['Hello,', 'World', '!']
-        - enthusiastic: True
-    """
-
-    def __init__(self, tag_name: str, value: Any = True):
-        super().__init__()
-        self.mayReturnEmpty = True
-        self.mayIndexError = False
-        self.leave_whitespace()
-        self.tag_name = tag_name
-        self.tag_value = value
-        self.add_parse_action(self._add_tag)
-
-    def _add_tag(self, tokens: ParseResults):
-        tokens[self.tag_name] = self.tag_value
-
-    def _generateDefaultName(self) -> str:
-        return f"{type(self).__name__}:{self.tag_name}={self.tag_value!r}"
-
-
-class ParseExpression(ParserElement):
-    """Abstract subclass of ParserElement, for combining and
-    post-processing parsed tokens.
-    """
-
-    def __init__(self, exprs: typing.Iterable[ParserElement], savelist: bool = False):
-        super().__init__(savelist)
-        self.exprs: list[ParserElement]
-        if isinstance(exprs, _generatorType):
-            exprs = list(exprs)
-
-        if isinstance(exprs, str_type):
-            self.exprs = [self._literalStringClass(exprs)]
-        elif isinstance(exprs, ParserElement):
-            self.exprs = [exprs]
-        elif isinstance(exprs, Iterable):
-            exprs = list(exprs)
-            # if sequence of strings provided, wrap with Literal
-            if any(isinstance(expr, str_type) for expr in exprs):
-                exprs = (
-                    self._literalStringClass(e) if isinstance(e, str_type) else e
-                    for e in exprs
-                )
-            self.exprs = list(exprs)
-        else:
-            try:
-                self.exprs = list(exprs)
-            except TypeError:
-                self.exprs = [exprs]
-        self.callPreparse = False
-
-    def recurse(self) -> list[ParserElement]:
-        return self.exprs[:]
-
-    def append(self, other) -> ParserElement:
-        self.exprs.append(other)
-        self._defaultName = None
-        return self
-
-    def leave_whitespace(self, recursive: bool = True) -> ParserElement:
-        """
-        Extends ``leave_whitespace`` defined in base class, and also invokes ``leave_whitespace`` on
-           all contained expressions.
-        """
-        super().leave_whitespace(recursive)
-
-        if recursive:
-            self.exprs = [e.copy() for e in self.exprs]
-            for e in self.exprs:
-                e.leave_whitespace(recursive)
-        return self
-
-    def ignore_whitespace(self, recursive: bool = True) -> ParserElement:
-        """
-        Extends ``ignore_whitespace`` defined in base class, and also invokes ``leave_whitespace`` on
-           all contained expressions.
-        """
-        super().ignore_whitespace(recursive)
-        if recursive:
-            self.exprs = [e.copy() for e in self.exprs]
-            for e in self.exprs:
-                e.ignore_whitespace(recursive)
-        return self
-
-    def ignore(self, other) -> ParserElement:
-        if isinstance(other, Suppress):
-            if other not in self.ignoreExprs:
-                super().ignore(other)
-                for e in self.exprs:
-                    e.ignore(self.ignoreExprs[-1])
-        else:
-            super().ignore(other)
-            for e in self.exprs:
-                e.ignore(self.ignoreExprs[-1])
-        return self
-
-    def _generateDefaultName(self) -> str:
-        return f"{type(self).__name__}:({self.exprs})"
-
-    def streamline(self) -> ParserElement:
-        if self.streamlined:
-            return self
-
-        super().streamline()
-
-        for e in self.exprs:
-            e.streamline()
-
-        # collapse nested :class:`And`'s of the form ``And(And(And(a, b), c), d)`` to ``And(a, b, c, d)``
-        # but only if there are no parse actions or resultsNames on the nested And's
-        # (likewise for :class:`Or`'s and :class:`MatchFirst`'s)
-        if len(self.exprs) == 2:
-            other = self.exprs[0]
-            if (
-                isinstance(other, self.__class__)
-                and not other.parseAction
-                and other.resultsName is None
-                and not other.debug
-            ):
-                self.exprs = other.exprs[:] + [self.exprs[1]]
-                self._defaultName = None
-                self.mayReturnEmpty |= other.mayReturnEmpty
-                self.mayIndexError |= other.mayIndexError
-
-            other = self.exprs[-1]
-            if (
-                isinstance(other, self.__class__)
-                and not other.parseAction
-                and other.resultsName is None
-                and not other.debug
-            ):
-                self.exprs = self.exprs[:-1] + other.exprs[:]
-                self._defaultName = None
-                self.mayReturnEmpty |= other.mayReturnEmpty
-                self.mayIndexError |= other.mayIndexError
-
-        self.errmsg = f"Expected {self}"
-
-        return self
-
-    def validate(self, validateTrace=None) -> None:
-        warnings.warn(
-            "ParserElement.validate() is deprecated, and should not be used to check for left recursion",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        tmp = (validateTrace if validateTrace is not None else [])[:] + [self]
-        for e in self.exprs:
-            e.validate(tmp)
-        self._checkRecursion([])
-
-    def copy(self) -> ParserElement:
-        ret = super().copy()
-        ret = typing.cast(ParseExpression, ret)
-        ret.exprs = [e.copy() for e in self.exprs]
-        return ret
-
-    def _setResultsName(self, name, list_all_matches=False) -> ParserElement:
-        if not (
-            __diag__.warn_ungrouped_named_tokens_in_collection
-            and Diagnostics.warn_ungrouped_named_tokens_in_collection
-            not in self.suppress_warnings_
-        ):
-            return super()._setResultsName(name, list_all_matches)
-
-        for e in self.exprs:
-            if (
-                isinstance(e, ParserElement)
-                and e.resultsName
-                and (
-                    Diagnostics.warn_ungrouped_named_tokens_in_collection
-                    not in e.suppress_warnings_
-                )
-            ):
-                warning = (
-                    "warn_ungrouped_named_tokens_in_collection:"
-                    f" setting results name {name!r} on {type(self).__name__} expression"
-                    f" collides with {e.resultsName!r} on contained expression"
-                )
-                warnings.warn(warning, stacklevel=3)
-                break
-
-        return super()._setResultsName(name, list_all_matches)
-
-    # Compatibility synonyms
-    # fmt: off
-    leaveWhitespace = replaced_by_pep8("leaveWhitespace", leave_whitespace)
-    ignoreWhitespace = replaced_by_pep8("ignoreWhitespace", ignore_whitespace)
-    # fmt: on
-
-
-class And(ParseExpression):
-    """
-    Requires all given :class:`ParserElement` s to be found in the given order.
-    Expressions may be separated by whitespace.
-    May be constructed using the ``'+'`` operator.
-    May also be constructed using the ``'-'`` operator, which will
-    suppress backtracking.
-
-    Example::
-
-        integer = Word(nums)
-        name_expr = Word(alphas)[1, ...]
-
-        expr = And([integer("id"), name_expr("name"), integer("age")])
-        # more easily written as:
-        expr = integer("id") + name_expr("name") + integer("age")
-    """
-
-    class _ErrorStop(Empty):
-        def __init__(self, *args, **kwargs):
-            super().__init__(*args, **kwargs)
-            self.leave_whitespace()
-
-        def _generateDefaultName(self) -> str:
-            return "-"
-
-    def __init__(
-        self, exprs_arg: typing.Iterable[ParserElement], savelist: bool = True
-    ):
-        exprs: list[ParserElement] = list(exprs_arg)
-        if exprs and Ellipsis in exprs:
-            tmp: list[ParserElement] = []
-            for i, expr in enumerate(exprs):
-                if expr is not Ellipsis:
-                    tmp.append(expr)
-                    continue
-
-                if i < len(exprs) - 1:
-                    skipto_arg: ParserElement = typing.cast(
-                        ParseExpression, (Empty() + exprs[i + 1])
-                    ).exprs[-1]
-                    tmp.append(SkipTo(skipto_arg)("_skipped*"))
-                    continue
-
-                raise Exception("cannot construct And with sequence ending in ...")
-            exprs[:] = tmp
-        super().__init__(exprs, savelist)
-        if self.exprs:
-            self.mayReturnEmpty = all(e.mayReturnEmpty for e in self.exprs)
-            if not isinstance(self.exprs[0], White):
-                self.set_whitespace_chars(
-                    self.exprs[0].whiteChars,
-                    copy_defaults=self.exprs[0].copyDefaultWhiteChars,
-                )
-                self.skipWhitespace = self.exprs[0].skipWhitespace
-            else:
-                self.skipWhitespace = False
-        else:
-            self.mayReturnEmpty = True
-        self.callPreparse = True
-
-    def streamline(self) -> ParserElement:
-        # collapse any _PendingSkip's
-        if self.exprs and any(
-            isinstance(e, ParseExpression)
-            and e.exprs
-            and isinstance(e.exprs[-1], _PendingSkip)
-            for e in self.exprs[:-1]
-        ):
-            deleted_expr_marker = NoMatch()
-            for i, e in enumerate(self.exprs[:-1]):
-                if e is deleted_expr_marker:
-                    continue
-                if (
-                    isinstance(e, ParseExpression)
-                    and e.exprs
-                    and isinstance(e.exprs[-1], _PendingSkip)
-                ):
-                    e.exprs[-1] = e.exprs[-1] + self.exprs[i + 1]
-                    self.exprs[i + 1] = deleted_expr_marker
-            self.exprs = [e for e in self.exprs if e is not deleted_expr_marker]
-
-        super().streamline()
-
-        # link any IndentedBlocks to the prior expression
-        prev: ParserElement
-        cur: ParserElement
-        for prev, cur in zip(self.exprs, self.exprs[1:]):
-            # traverse cur or any first embedded expr of cur looking for an IndentedBlock
-            # (but watch out for recursive grammar)
-            seen = set()
-            while True:
-                if id(cur) in seen:
-                    break
-                seen.add(id(cur))
-                if isinstance(cur, IndentedBlock):
-                    prev.add_parse_action(
-                        lambda s, l, t, cur_=cur: setattr(
-                            cur_, "parent_anchor", col(l, s)
-                        )
-                    )
-                    break
-                subs = cur.recurse()
-                next_first = next(iter(subs), None)
-                if next_first is None:
-                    break
-                cur = typing.cast(ParserElement, next_first)
-
-        self.mayReturnEmpty = all(e.mayReturnEmpty for e in self.exprs)
-        return self
-
-    def parseImpl(self, instring, loc, do_actions=True):
-        # pass False as callPreParse arg to _parse for first element, since we already
-        # pre-parsed the string as part of our And pre-parsing
-        loc, resultlist = self.exprs[0]._parse(
-            instring, loc, do_actions, callPreParse=False
-        )
-        errorStop = False
-        for e in self.exprs[1:]:
-            # if isinstance(e, And._ErrorStop):
-            if type(e) is And._ErrorStop:
-                errorStop = True
-                continue
-            if errorStop:
-                try:
-                    loc, exprtokens = e._parse(instring, loc, do_actions)
-                except ParseSyntaxException:
-                    raise
-                except ParseBaseException as pe:
-                    pe.__traceback__ = None
-                    raise ParseSyntaxException._from_exception(pe)
-                except IndexError:
-                    raise ParseSyntaxException(
-                        instring, len(instring), self.errmsg, self
-                    )
-            else:
-                loc, exprtokens = e._parse(instring, loc, do_actions)
-            resultlist += exprtokens
-        return loc, resultlist
-
-    def __iadd__(self, other):
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return self.append(other)  # And([self, other])
-
-    def _checkRecursion(self, parseElementList):
-        subRecCheckList = parseElementList[:] + [self]
-        for e in self.exprs:
-            e._checkRecursion(subRecCheckList)
-            if not e.mayReturnEmpty:
-                break
-
-    def _generateDefaultName(self) -> str:
-        inner = " ".join(str(e) for e in self.exprs)
-        # strip off redundant inner {}'s
-        while len(inner) > 1 and inner[0 :: len(inner) - 1] == "{}":
-            inner = inner[1:-1]
-        return f"{{{inner}}}"
-
-
-class Or(ParseExpression):
-    """Requires that at least one :class:`ParserElement` is found. If
-    two expressions match, the expression that matches the longest
-    string will be used. May be constructed using the ``'^'``
-    operator.
-
-    Example::
-
-        # construct Or using '^' operator
-
-        number = Word(nums) ^ Combine(Word(nums) + '.' + Word(nums))
-        print(number.search_string("123 3.1416 789"))
-
-    prints::
-
-        [['123'], ['3.1416'], ['789']]
-    """
-
-    def __init__(self, exprs: typing.Iterable[ParserElement], savelist: bool = False):
-        super().__init__(exprs, savelist)
-        if self.exprs:
-            self.mayReturnEmpty = any(e.mayReturnEmpty for e in self.exprs)
-            self.skipWhitespace = all(e.skipWhitespace for e in self.exprs)
-        else:
-            self.mayReturnEmpty = True
-
-    def streamline(self) -> ParserElement:
-        super().streamline()
-        if self.exprs:
-            self.mayReturnEmpty = any(e.mayReturnEmpty for e in self.exprs)
-            self.saveAsList = any(e.saveAsList for e in self.exprs)
-            self.skipWhitespace = all(
-                e.skipWhitespace and not isinstance(e, White) for e in self.exprs
-            )
-        else:
-            self.saveAsList = False
-        return self
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        maxExcLoc = -1
-        maxException = None
-        matches: list[tuple[int, ParserElement]] = []
-        fatals: list[ParseFatalException] = []
-        if all(e.callPreparse for e in self.exprs):
-            loc = self.preParse(instring, loc)
-        for e in self.exprs:
-            try:
-                loc2 = e.try_parse(instring, loc, raise_fatal=True)
-            except ParseFatalException as pfe:
-                pfe.__traceback__ = None
-                pfe.parser_element = e
-                fatals.append(pfe)
-                maxException = None
-                maxExcLoc = -1
-            except ParseException as err:
-                if not fatals:
-                    err.__traceback__ = None
-                    if err.loc > maxExcLoc:
-                        maxException = err
-                        maxExcLoc = err.loc
-            except IndexError:
-                if len(instring) > maxExcLoc:
-                    maxException = ParseException(
-                        instring, len(instring), e.errmsg, self
-                    )
-                    maxExcLoc = len(instring)
-            else:
-                # save match among all matches, to retry longest to shortest
-                matches.append((loc2, e))
-
-        if matches:
-            # re-evaluate all matches in descending order of length of match, in case attached actions
-            # might change whether or how much they match of the input.
-            matches.sort(key=itemgetter(0), reverse=True)
-
-            if not do_actions:
-                # no further conditions or parse actions to change the selection of
-                # alternative, so the first match will be the best match
-                best_expr = matches[0][1]
-                return best_expr._parse(instring, loc, do_actions)
-
-            longest: tuple[int, typing.Optional[ParseResults]] = -1, None
-            for loc1, expr1 in matches:
-                if loc1 <= longest[0]:
-                    # already have a longer match than this one will deliver, we are done
-                    return longest
-
-                try:
-                    loc2, toks = expr1._parse(instring, loc, do_actions)
-                except ParseException as err:
-                    err.__traceback__ = None
-                    if err.loc > maxExcLoc:
-                        maxException = err
-                        maxExcLoc = err.loc
-                else:
-                    if loc2 >= loc1:
-                        return loc2, toks
-                    # didn't match as much as before
-                    elif loc2 > longest[0]:
-                        longest = loc2, toks
-
-            if longest != (-1, None):
-                return longest
-
-        if fatals:
-            if len(fatals) > 1:
-                fatals.sort(key=lambda e: -e.loc)
-                if fatals[0].loc == fatals[1].loc:
-                    fatals.sort(key=lambda e: (-e.loc, -len(str(e.parser_element))))
-            max_fatal = fatals[0]
-            raise max_fatal
-
-        if maxException is not None:
-            # infer from this check that all alternatives failed at the current position
-            # so emit this collective error message instead of any single error message
-            if maxExcLoc == loc:
-                maxException.msg = self.errmsg or ""
-            raise maxException
-
-        raise ParseException(instring, loc, "no defined alternatives to match", self)
-
-    def __ixor__(self, other):
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return self.append(other)  # Or([self, other])
-
-    def _generateDefaultName(self) -> str:
-        return f"{{{' ^ '.join(str(e) for e in self.exprs)}}}"
-
-    def _setResultsName(self, name, list_all_matches=False) -> ParserElement:
-        if (
-            __diag__.warn_multiple_tokens_in_named_alternation
-            and Diagnostics.warn_multiple_tokens_in_named_alternation
-            not in self.suppress_warnings_
-        ):
-            if any(
-                isinstance(e, And)
-                and Diagnostics.warn_multiple_tokens_in_named_alternation
-                not in e.suppress_warnings_
-                for e in self.exprs
-            ):
-                warning = (
-                    "warn_multiple_tokens_in_named_alternation:"
-                    f" setting results name {name!r} on {type(self).__name__} expression"
-                    " will return a list of all parsed tokens in an And alternative,"
-                    " in prior versions only the first token was returned; enclose"
-                    " contained argument in Group"
-                )
-                warnings.warn(warning, stacklevel=3)
-
-        return super()._setResultsName(name, list_all_matches)
-
-
-class MatchFirst(ParseExpression):
-    """Requires that at least one :class:`ParserElement` is found. If
-    more than one expression matches, the first one listed is the one that will
-    match. May be constructed using the ``'|'`` operator.
-
-    Example::
-
-        # construct MatchFirst using '|' operator
-
-        # watch the order of expressions to match
-        number = Word(nums) | Combine(Word(nums) + '.' + Word(nums))
-        print(number.search_string("123 3.1416 789")) #  Fail! -> [['123'], ['3'], ['1416'], ['789']]
-
-        # put more selective expression first
-        number = Combine(Word(nums) + '.' + Word(nums)) | Word(nums)
-        print(number.search_string("123 3.1416 789")) #  Better -> [['123'], ['3.1416'], ['789']]
-    """
-
-    def __init__(self, exprs: typing.Iterable[ParserElement], savelist: bool = False):
-        super().__init__(exprs, savelist)
-        if self.exprs:
-            self.mayReturnEmpty = any(e.mayReturnEmpty for e in self.exprs)
-            self.skipWhitespace = all(e.skipWhitespace for e in self.exprs)
-        else:
-            self.mayReturnEmpty = True
-
-    def streamline(self) -> ParserElement:
-        if self.streamlined:
-            return self
-
-        super().streamline()
-        if self.exprs:
-            self.saveAsList = any(e.saveAsList for e in self.exprs)
-            self.mayReturnEmpty = any(e.mayReturnEmpty for e in self.exprs)
-            self.skipWhitespace = all(
-                e.skipWhitespace and not isinstance(e, White) for e in self.exprs
-            )
-        else:
-            self.saveAsList = False
-            self.mayReturnEmpty = True
-        return self
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        maxExcLoc = -1
-        maxException = None
-
-        for e in self.exprs:
-            try:
-                return e._parse(instring, loc, do_actions)
-            except ParseFatalException as pfe:
-                pfe.__traceback__ = None
-                pfe.parser_element = e
-                raise
-            except ParseException as err:
-                if err.loc > maxExcLoc:
-                    maxException = err
-                    maxExcLoc = err.loc
-            except IndexError:
-                if len(instring) > maxExcLoc:
-                    maxException = ParseException(
-                        instring, len(instring), e.errmsg, self
-                    )
-                    maxExcLoc = len(instring)
-
-        if maxException is not None:
-            # infer from this check that all alternatives failed at the current position
-            # so emit this collective error message instead of any individual error message
-            if maxExcLoc == loc:
-                maxException.msg = self.errmsg or ""
-            raise maxException
-
-        raise ParseException(instring, loc, "no defined alternatives to match", self)
-
-    def __ior__(self, other):
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return self.append(other)  # MatchFirst([self, other])
-
-    def _generateDefaultName(self) -> str:
-        return f"{{{' | '.join(str(e) for e in self.exprs)}}}"
-
-    def _setResultsName(self, name, list_all_matches=False) -> ParserElement:
-        if (
-            __diag__.warn_multiple_tokens_in_named_alternation
-            and Diagnostics.warn_multiple_tokens_in_named_alternation
-            not in self.suppress_warnings_
-        ):
-            if any(
-                isinstance(e, And)
-                and Diagnostics.warn_multiple_tokens_in_named_alternation
-                not in e.suppress_warnings_
-                for e in self.exprs
-            ):
-                warning = (
-                    "warn_multiple_tokens_in_named_alternation:"
-                    f" setting results name {name!r} on {type(self).__name__} expression"
-                    " will return a list of all parsed tokens in an And alternative,"
-                    " in prior versions only the first token was returned; enclose"
-                    " contained argument in Group"
-                )
-                warnings.warn(warning, stacklevel=3)
-
-        return super()._setResultsName(name, list_all_matches)
-
-
-class Each(ParseExpression):
-    """Requires all given :class:`ParserElement` s to be found, but in
-    any order. Expressions may be separated by whitespace.
-
-    May be constructed using the ``'&'`` operator.
-
-    Example::
-
-        color = one_of("RED ORANGE YELLOW GREEN BLUE PURPLE BLACK WHITE BROWN")
-        shape_type = one_of("SQUARE CIRCLE TRIANGLE STAR HEXAGON OCTAGON")
-        integer = Word(nums)
-        shape_attr = "shape:" + shape_type("shape")
-        posn_attr = "posn:" + Group(integer("x") + ',' + integer("y"))("posn")
-        color_attr = "color:" + color("color")
-        size_attr = "size:" + integer("size")
-
-        # use Each (using operator '&') to accept attributes in any order
-        # (shape and posn are required, color and size are optional)
-        shape_spec = shape_attr & posn_attr & Opt(color_attr) & Opt(size_attr)
-
-        shape_spec.run_tests('''
-            shape: SQUARE color: BLACK posn: 100, 120
-            shape: CIRCLE size: 50 color: BLUE posn: 50,80
-            color:GREEN size:20 shape:TRIANGLE posn:20,40
-            '''
-            )
-
-    prints::
-
-        shape: SQUARE color: BLACK posn: 100, 120
-        ['shape:', 'SQUARE', 'color:', 'BLACK', 'posn:', ['100', ',', '120']]
-        - color: BLACK
-        - posn: ['100', ',', '120']
-          - x: 100
-          - y: 120
-        - shape: SQUARE
-
-
-        shape: CIRCLE size: 50 color: BLUE posn: 50,80
-        ['shape:', 'CIRCLE', 'size:', '50', 'color:', 'BLUE', 'posn:', ['50', ',', '80']]
-        - color: BLUE
-        - posn: ['50', ',', '80']
-          - x: 50
-          - y: 80
-        - shape: CIRCLE
-        - size: 50
-
-
-        color: GREEN size: 20 shape: TRIANGLE posn: 20,40
-        ['color:', 'GREEN', 'size:', '20', 'shape:', 'TRIANGLE', 'posn:', ['20', ',', '40']]
-        - color: GREEN
-        - posn: ['20', ',', '40']
-          - x: 20
-          - y: 40
-        - shape: TRIANGLE
-        - size: 20
-    """
-
-    def __init__(self, exprs: typing.Iterable[ParserElement], savelist: bool = True):
-        super().__init__(exprs, savelist)
-        if self.exprs:
-            self.mayReturnEmpty = all(e.mayReturnEmpty for e in self.exprs)
-        else:
-            self.mayReturnEmpty = True
-        self.skipWhitespace = True
-        self.initExprGroups = True
-        self.saveAsList = True
-
-    def __iand__(self, other):
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-        return self.append(other)  # Each([self, other])
-
-    def streamline(self) -> ParserElement:
-        super().streamline()
-        if self.exprs:
-            self.mayReturnEmpty = all(e.mayReturnEmpty for e in self.exprs)
-        else:
-            self.mayReturnEmpty = True
-        return self
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        if self.initExprGroups:
-            self.opt1map = dict(
-                (id(e.expr), e) for e in self.exprs if isinstance(e, Opt)
-            )
-            opt1 = [e.expr for e in self.exprs if isinstance(e, Opt)]
-            opt2 = [
-                e
-                for e in self.exprs
-                if e.mayReturnEmpty and not isinstance(e, (Opt, Regex, ZeroOrMore))
-            ]
-            self.optionals = opt1 + opt2
-            self.multioptionals = [
-                e.expr.set_results_name(e.resultsName, list_all_matches=True)
-                for e in self.exprs
-                if isinstance(e, _MultipleMatch)
-            ]
-            self.multirequired = [
-                e.expr.set_results_name(e.resultsName, list_all_matches=True)
-                for e in self.exprs
-                if isinstance(e, OneOrMore)
-            ]
-            self.required = [
-                e for e in self.exprs if not isinstance(e, (Opt, ZeroOrMore, OneOrMore))
-            ]
-            self.required += self.multirequired
-            self.initExprGroups = False
-
-        tmpLoc = loc
-        tmpReqd = self.required[:]
-        tmpOpt = self.optionals[:]
-        multis = self.multioptionals[:]
-        matchOrder: list[ParserElement] = []
-
-        keepMatching = True
-        failed: list[ParserElement] = []
-        fatals: list[ParseFatalException] = []
-        while keepMatching:
-            tmpExprs = tmpReqd + tmpOpt + multis
-            failed.clear()
-            fatals.clear()
-            for e in tmpExprs:
-                try:
-                    tmpLoc = e.try_parse(instring, tmpLoc, raise_fatal=True)
-                except ParseFatalException as pfe:
-                    pfe.__traceback__ = None
-                    pfe.parser_element = e
-                    fatals.append(pfe)
-                    failed.append(e)
-                except ParseException:
-                    failed.append(e)
-                else:
-                    matchOrder.append(self.opt1map.get(id(e), e))
-                    if e in tmpReqd:
-                        tmpReqd.remove(e)
-                    elif e in tmpOpt:
-                        tmpOpt.remove(e)
-            if len(failed) == len(tmpExprs):
-                keepMatching = False
-
-        # look for any ParseFatalExceptions
-        if fatals:
-            if len(fatals) > 1:
-                fatals.sort(key=lambda e: -e.loc)
-                if fatals[0].loc == fatals[1].loc:
-                    fatals.sort(key=lambda e: (-e.loc, -len(str(e.parser_element))))
-            max_fatal = fatals[0]
-            raise max_fatal
-
-        if tmpReqd:
-            missing = ", ".join([str(e) for e in tmpReqd])
-            raise ParseException(
-                instring,
-                loc,
-                f"Missing one or more required elements ({missing})",
-            )
-
-        # add any unmatched Opts, in case they have default values defined
-        matchOrder += [e for e in self.exprs if isinstance(e, Opt) and e.expr in tmpOpt]
-
-        total_results = ParseResults([])
-        for e in matchOrder:
-            loc, results = e._parse(instring, loc, do_actions)
-            total_results += results
-
-        return loc, total_results
-
-    def _generateDefaultName(self) -> str:
-        return f"{{{' & '.join(str(e) for e in self.exprs)}}}"
-
-
-class ParseElementEnhance(ParserElement):
-    """Abstract subclass of :class:`ParserElement`, for combining and
-    post-processing parsed tokens.
-    """
-
-    def __init__(self, expr: Union[ParserElement, str], savelist: bool = False):
-        super().__init__(savelist)
-        if isinstance(expr, str_type):
-            expr_str = typing.cast(str, expr)
-            if issubclass(self._literalStringClass, Token):
-                expr = self._literalStringClass(expr_str)  # type: ignore[call-arg]
-            elif issubclass(type(self), self._literalStringClass):
-                expr = Literal(expr_str)
-            else:
-                expr = self._literalStringClass(Literal(expr_str))  # type: ignore[assignment, call-arg]
-        expr = typing.cast(ParserElement, expr)
-        self.expr = expr
-        if expr is not None:
-            self.mayIndexError = expr.mayIndexError
-            self.mayReturnEmpty = expr.mayReturnEmpty
-            self.set_whitespace_chars(
-                expr.whiteChars, copy_defaults=expr.copyDefaultWhiteChars
-            )
-            self.skipWhitespace = expr.skipWhitespace
-            self.saveAsList = expr.saveAsList
-            self.callPreparse = expr.callPreparse
-            self.ignoreExprs.extend(expr.ignoreExprs)
-
-    def recurse(self) -> list[ParserElement]:
-        return [self.expr] if self.expr is not None else []
-
-    def parseImpl(self, instring, loc, do_actions=True):
-        if self.expr is None:
-            raise ParseException(instring, loc, "No expression defined", self)
-
-        try:
-            return self.expr._parse(instring, loc, do_actions, callPreParse=False)
-        except ParseSyntaxException:
-            raise
-        except ParseBaseException as pbe:
-            pbe.pstr = pbe.pstr or instring
-            pbe.loc = pbe.loc or loc
-            pbe.parser_element = pbe.parser_element or self
-            if not isinstance(self, Forward) and self.customName is not None:
-                if self.errmsg:
-                    pbe.msg = self.errmsg
-            raise
-
-    def leave_whitespace(self, recursive: bool = True) -> ParserElement:
-        super().leave_whitespace(recursive)
-
-        if recursive:
-            if self.expr is not None:
-                self.expr = self.expr.copy()
-                self.expr.leave_whitespace(recursive)
-        return self
-
-    def ignore_whitespace(self, recursive: bool = True) -> ParserElement:
-        super().ignore_whitespace(recursive)
-
-        if recursive:
-            if self.expr is not None:
-                self.expr = self.expr.copy()
-                self.expr.ignore_whitespace(recursive)
-        return self
-
-    def ignore(self, other) -> ParserElement:
-        if not isinstance(other, Suppress) or other not in self.ignoreExprs:
-            super().ignore(other)
-            if self.expr is not None:
-                self.expr.ignore(self.ignoreExprs[-1])
-
-        return self
-
-    def streamline(self) -> ParserElement:
-        super().streamline()
-        if self.expr is not None:
-            self.expr.streamline()
-        return self
-
-    def _checkRecursion(self, parseElementList):
-        if self in parseElementList:
-            raise RecursiveGrammarException(parseElementList + [self])
-        subRecCheckList = parseElementList[:] + [self]
-        if self.expr is not None:
-            self.expr._checkRecursion(subRecCheckList)
-
-    def validate(self, validateTrace=None) -> None:
-        warnings.warn(
-            "ParserElement.validate() is deprecated, and should not be used to check for left recursion",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        if validateTrace is None:
-            validateTrace = []
-        tmp = validateTrace[:] + [self]
-        if self.expr is not None:
-            self.expr.validate(tmp)
-        self._checkRecursion([])
-
-    def _generateDefaultName(self) -> str:
-        return f"{type(self).__name__}:({self.expr})"
-
-    # Compatibility synonyms
-    # fmt: off
-    leaveWhitespace = replaced_by_pep8("leaveWhitespace", leave_whitespace)
-    ignoreWhitespace = replaced_by_pep8("ignoreWhitespace", ignore_whitespace)
-    # fmt: on
-
-
-class IndentedBlock(ParseElementEnhance):
-    """
-    Expression to match one or more expressions at a given indentation level.
-    Useful for parsing text where structure is implied by indentation (like Python source code).
-    """
-
-    class _Indent(Empty):
-        def __init__(self, ref_col: int):
-            super().__init__()
-            self.errmsg = f"expected indent at column {ref_col}"
-            self.add_condition(lambda s, l, t: col(l, s) == ref_col)
-
-    class _IndentGreater(Empty):
-        def __init__(self, ref_col: int):
-            super().__init__()
-            self.errmsg = f"expected indent at column greater than {ref_col}"
-            self.add_condition(lambda s, l, t: col(l, s) > ref_col)
-
-    def __init__(
-        self, expr: ParserElement, *, recursive: bool = False, grouped: bool = True
-    ):
-        super().__init__(expr, savelist=True)
-        # if recursive:
-        #     raise NotImplementedError("IndentedBlock with recursive is not implemented")
-        self._recursive = recursive
-        self._grouped = grouped
-        self.parent_anchor = 1
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        # advance parse position to non-whitespace by using an Empty()
-        # this should be the column to be used for all subsequent indented lines
-        anchor_loc = Empty().preParse(instring, loc)
-
-        # see if self.expr matches at the current location - if not it will raise an exception
-        # and no further work is necessary
-        self.expr.try_parse(instring, anchor_loc, do_actions=do_actions)
-
-        indent_col = col(anchor_loc, instring)
-        peer_detect_expr = self._Indent(indent_col)
-
-        inner_expr = Empty() + peer_detect_expr + self.expr
-        if self._recursive:
-            sub_indent = self._IndentGreater(indent_col)
-            nested_block = IndentedBlock(
-                self.expr, recursive=self._recursive, grouped=self._grouped
-            )
-            nested_block.set_debug(self.debug)
-            nested_block.parent_anchor = indent_col
-            inner_expr += Opt(sub_indent + nested_block)
-
-        inner_expr.set_name(f"inner {hex(id(inner_expr))[-4:].upper()}@{indent_col}")
-        block = OneOrMore(inner_expr)
-
-        trailing_undent = self._Indent(self.parent_anchor) | StringEnd()
-
-        if self._grouped:
-            wrapper = Group
-        else:
-            wrapper = lambda expr: expr  # type: ignore[misc, assignment]
-        return (wrapper(block) + Optional(trailing_undent)).parseImpl(
-            instring, anchor_loc, do_actions
-        )
-
-
-class AtStringStart(ParseElementEnhance):
-    """Matches if expression matches at the beginning of the parse
-    string::
-
-        AtStringStart(Word(nums)).parse_string("123")
-        # prints ["123"]
-
-        AtStringStart(Word(nums)).parse_string("    123")
-        # raises ParseException
-    """
-
-    def __init__(self, expr: Union[ParserElement, str]):
-        super().__init__(expr)
-        self.callPreparse = False
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        if loc != 0:
-            raise ParseException(instring, loc, "not found at string start")
-        return super().parseImpl(instring, loc, do_actions)
-
-
-class AtLineStart(ParseElementEnhance):
-    r"""Matches if an expression matches at the beginning of a line within
-    the parse string
-
-    Example::
-
-        test = '''\
-        AAA this line
-        AAA and this line
-          AAA but not this one
-        B AAA and definitely not this one
-        '''
-
-        for t in (AtLineStart('AAA') + rest_of_line).search_string(test):
-            print(t)
-
-    prints::
-
-        ['AAA', ' this line']
-        ['AAA', ' and this line']
-
-    """
-
-    def __init__(self, expr: Union[ParserElement, str]):
-        super().__init__(expr)
-        self.callPreparse = False
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        if col(loc, instring) != 1:
-            raise ParseException(instring, loc, "not found at line start")
-        return super().parseImpl(instring, loc, do_actions)
-
-
-class FollowedBy(ParseElementEnhance):
-    """Lookahead matching of the given parse expression.
-    ``FollowedBy`` does *not* advance the parsing position within
-    the input string, it only verifies that the specified parse
-    expression matches at the current position.  ``FollowedBy``
-    always returns a null token list. If any results names are defined
-    in the lookahead expression, those *will* be returned for access by
-    name.
-
-    Example::
-
-        # use FollowedBy to match a label only if it is followed by a ':'
-        data_word = Word(alphas)
-        label = data_word + FollowedBy(':')
-        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word, stop_on=label).set_parse_action(' '.join))
-
-        attr_expr[1, ...].parse_string("shape: SQUARE color: BLACK posn: upper left").pprint()
-
-    prints::
-
-        [['shape', 'SQUARE'], ['color', 'BLACK'], ['posn', 'upper left']]
-    """
-
-    def __init__(self, expr: Union[ParserElement, str]):
-        super().__init__(expr)
-        self.mayReturnEmpty = True
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        # by using self._expr.parse and deleting the contents of the returned ParseResults list
-        # we keep any named results that were defined in the FollowedBy expression
-        _, ret = self.expr._parse(instring, loc, do_actions=do_actions)
-        del ret[:]
-
-        return loc, ret
-
-
-class PrecededBy(ParseElementEnhance):
-    """Lookbehind matching of the given parse expression.
-    ``PrecededBy`` does not advance the parsing position within the
-    input string, it only verifies that the specified parse expression
-    matches prior to the current position.  ``PrecededBy`` always
-    returns a null token list, but if a results name is defined on the
-    given expression, it is returned.
-
-    Parameters:
-
-    - ``expr`` - expression that must match prior to the current parse
-      location
-    - ``retreat`` - (default= ``None``) - (int) maximum number of characters
-      to lookbehind prior to the current parse location
-
-    If the lookbehind expression is a string, :class:`Literal`,
-    :class:`Keyword`, or a :class:`Word` or :class:`CharsNotIn`
-    with a specified exact or maximum length, then the retreat
-    parameter is not required. Otherwise, retreat must be specified to
-    give a maximum number of characters to look back from
-    the current parse position for a lookbehind match.
-
-    Example::
-
-        # VB-style variable names with type prefixes
-        int_var = PrecededBy("#") + pyparsing_common.identifier
-        str_var = PrecededBy("$") + pyparsing_common.identifier
-
-    """
-
-    def __init__(self, expr: Union[ParserElement, str], retreat: int = 0):
-        super().__init__(expr)
-        self.expr = self.expr().leave_whitespace()
-        self.mayReturnEmpty = True
-        self.mayIndexError = False
-        self.exact = False
-        if isinstance(expr, str_type):
-            expr = typing.cast(str, expr)
-            retreat = len(expr)
-            self.exact = True
-        elif isinstance(expr, (Literal, Keyword)):
-            retreat = expr.matchLen
-            self.exact = True
-        elif isinstance(expr, (Word, CharsNotIn)) and expr.maxLen != _MAX_INT:
-            retreat = expr.maxLen
-            self.exact = True
-        elif isinstance(expr, PositionToken):
-            retreat = 0
-            self.exact = True
-        self.retreat = retreat
-        self.errmsg = f"not preceded by {expr}"
-        self.skipWhitespace = False
-        self.parseAction.append(lambda s, l, t: t.__delitem__(slice(None, None)))
-
-    def parseImpl(self, instring, loc=0, do_actions=True) -> ParseImplReturnType:
-        if self.exact:
-            if loc < self.retreat:
-                raise ParseException(instring, loc, self.errmsg, self)
-            start = loc - self.retreat
-            _, ret = self.expr._parse(instring, start)
-            return loc, ret
-
-        # retreat specified a maximum lookbehind window, iterate
-        test_expr = self.expr + StringEnd()
-        instring_slice = instring[max(0, loc - self.retreat) : loc]
-        last_expr: ParseBaseException = ParseException(instring, loc, self.errmsg, self)
-
-        for offset in range(1, min(loc, self.retreat + 1) + 1):
-            try:
-                # print('trying', offset, instring_slice, repr(instring_slice[loc - offset:]))
-                _, ret = test_expr._parse(instring_slice, len(instring_slice) - offset)
-            except ParseBaseException as pbe:
-                last_expr = pbe
-            else:
-                break
-        else:
-            raise last_expr
-
-        return loc, ret
-
-
-class Located(ParseElementEnhance):
-    """
-    Decorates a returned token with its starting and ending
-    locations in the input string.
-
-    This helper adds the following results names:
-
-    - ``locn_start`` - location where matched expression begins
-    - ``locn_end`` - location where matched expression ends
-    - ``value`` - the actual parsed results
-
-    Be careful if the input text contains ``<TAB>`` characters, you
-    may want to call :class:`ParserElement.parse_with_tabs`
-
-    Example::
-
-        wd = Word(alphas)
-        for match in Located(wd).search_string("ljsdf123lksdjjf123lkkjj1222"):
-            print(match)
-
-    prints::
-
-        [0, ['ljsdf'], 5]
-        [8, ['lksdjjf'], 15]
-        [18, ['lkkjj'], 23]
-
-    """
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        start = loc
-        loc, tokens = self.expr._parse(instring, start, do_actions, callPreParse=False)
-        ret_tokens = ParseResults([start, tokens, loc])
-        ret_tokens["locn_start"] = start
-        ret_tokens["value"] = tokens
-        ret_tokens["locn_end"] = loc
-        if self.resultsName:
-            # must return as a list, so that the name will be attached to the complete group
-            return loc, [ret_tokens]
-        else:
-            return loc, ret_tokens
-
-
-class NotAny(ParseElementEnhance):
-    """
-    Lookahead to disallow matching with the given parse expression.
-    ``NotAny`` does *not* advance the parsing position within the
-    input string, it only verifies that the specified parse expression
-    does *not* match at the current position.  Also, ``NotAny`` does
-    *not* skip over leading whitespace. ``NotAny`` always returns
-    a null token list.  May be constructed using the ``'~'`` operator.
-
-    Example::
-
-        AND, OR, NOT = map(CaselessKeyword, "AND OR NOT".split())
-
-        # take care not to mistake keywords for identifiers
-        ident = ~(AND | OR | NOT) + Word(alphas)
-        boolean_term = Opt(NOT) + ident
-
-        # very crude boolean expression - to support parenthesis groups and
-        # operation hierarchy, use infix_notation
-        boolean_expr = boolean_term + ((AND | OR) + boolean_term)[...]
-
-        # integers that are followed by "." are actually floats
-        integer = Word(nums) + ~Char(".")
-    """
-
-    def __init__(self, expr: Union[ParserElement, str]):
-        super().__init__(expr)
-        # do NOT use self.leave_whitespace(), don't want to propagate to exprs
-        # self.leave_whitespace()
-        self.skipWhitespace = False
-
-        self.mayReturnEmpty = True
-        self.errmsg = f"Found unwanted token, {self.expr}"
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        if self.expr.can_parse_next(instring, loc, do_actions=do_actions):
-            raise ParseException(instring, loc, self.errmsg, self)
-        return loc, []
-
-    def _generateDefaultName(self) -> str:
-        return f"~{{{self.expr}}}"
-
-
-class _MultipleMatch(ParseElementEnhance):
-    def __init__(
-        self,
-        expr: Union[str, ParserElement],
-        stop_on: typing.Optional[Union[ParserElement, str]] = None,
-        *,
-        stopOn: typing.Optional[Union[ParserElement, str]] = None,
-    ):
-        super().__init__(expr)
-        stopOn = stopOn or stop_on
-        self.saveAsList = True
-        ender = stopOn
-        if isinstance(ender, str_type):
-            ender = self._literalStringClass(ender)
-        self.stopOn(ender)
-
-    def stopOn(self, ender) -> ParserElement:
-        if isinstance(ender, str_type):
-            ender = self._literalStringClass(ender)
-        self.not_ender = ~ender if ender is not None else None
-        return self
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        self_expr_parse = self.expr._parse
-        self_skip_ignorables = self._skipIgnorables
-        check_ender = self.not_ender is not None
-        if check_ender:
-            try_not_ender = self.not_ender.try_parse
-
-        # must be at least one (but first see if we are the stopOn sentinel;
-        # if so, fail)
-        if check_ender:
-            try_not_ender(instring, loc)
-        loc, tokens = self_expr_parse(instring, loc, do_actions)
-        try:
-            hasIgnoreExprs = not not self.ignoreExprs
-            while 1:
-                if check_ender:
-                    try_not_ender(instring, loc)
-                if hasIgnoreExprs:
-                    preloc = self_skip_ignorables(instring, loc)
-                else:
-                    preloc = loc
-                loc, tmptokens = self_expr_parse(instring, preloc, do_actions)
-                tokens += tmptokens
-        except (ParseException, IndexError):
-            pass
-
-        return loc, tokens
-
-    def _setResultsName(self, name, list_all_matches=False) -> ParserElement:
-        if (
-            __diag__.warn_ungrouped_named_tokens_in_collection
-            and Diagnostics.warn_ungrouped_named_tokens_in_collection
-            not in self.suppress_warnings_
-        ):
-            for e in [self.expr] + self.expr.recurse():
-                if (
-                    isinstance(e, ParserElement)
-                    and e.resultsName
-                    and (
-                        Diagnostics.warn_ungrouped_named_tokens_in_collection
-                        not in e.suppress_warnings_
-                    )
-                ):
-                    warning = (
-                        "warn_ungrouped_named_tokens_in_collection:"
-                        f" setting results name {name!r} on {type(self).__name__} expression"
-                        f" collides with {e.resultsName!r} on contained expression"
-                    )
-                    warnings.warn(warning, stacklevel=3)
-                    break
-
-        return super()._setResultsName(name, list_all_matches)
-
-
-class OneOrMore(_MultipleMatch):
-    """
-    Repetition of one or more of the given expression.
-
-    Parameters:
-
-    - ``expr`` - expression that must match one or more times
-    - ``stop_on`` - (default= ``None``) - expression for a terminating sentinel
-      (only required if the sentinel would ordinarily match the repetition
-      expression)
-
-    Example::
-
-        data_word = Word(alphas)
-        label = data_word + FollowedBy(':')
-        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word).set_parse_action(' '.join))
-
-        text = "shape: SQUARE posn: upper left color: BLACK"
-        attr_expr[1, ...].parse_string(text).pprint()  # Fail! read 'color' as data instead of next label -> [['shape', 'SQUARE color']]
-
-        # use stop_on attribute for OneOrMore to avoid reading label string as part of the data
-        attr_expr = Group(label + Suppress(':') + OneOrMore(data_word, stop_on=label).set_parse_action(' '.join))
-        OneOrMore(attr_expr).parse_string(text).pprint() # Better -> [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'BLACK']]
-
-        # could also be written as
-        (attr_expr * (1,)).parse_string(text).pprint()
-    """
-
-    def _generateDefaultName(self) -> str:
-        return f"{{{self.expr}}}..."
-
-
-class ZeroOrMore(_MultipleMatch):
-    """
-    Optional repetition of zero or more of the given expression.
-
-    Parameters:
-
-    - ``expr`` - expression that must match zero or more times
-    - ``stop_on`` - expression for a terminating sentinel
-      (only required if the sentinel would ordinarily match the repetition
-      expression) - (default= ``None``)
-
-    Example: similar to :class:`OneOrMore`
-    """
-
-    def __init__(
-        self,
-        expr: Union[str, ParserElement],
-        stop_on: typing.Optional[Union[ParserElement, str]] = None,
-        *,
-        stopOn: typing.Optional[Union[ParserElement, str]] = None,
-    ):
-        super().__init__(expr, stopOn=stopOn or stop_on)
-        self.mayReturnEmpty = True
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        try:
-            return super().parseImpl(instring, loc, do_actions)
-        except (ParseException, IndexError):
-            return loc, ParseResults([], name=self.resultsName)
-
-    def _generateDefaultName(self) -> str:
-        return f"[{self.expr}]..."
-
-
-class DelimitedList(ParseElementEnhance):
-    def __init__(
-        self,
-        expr: Union[str, ParserElement],
-        delim: Union[str, ParserElement] = ",",
-        combine: bool = False,
-        min: typing.Optional[int] = None,
-        max: typing.Optional[int] = None,
-        *,
-        allow_trailing_delim: bool = False,
-    ):
-        """Helper to define a delimited list of expressions - the delimiter
-        defaults to ','. By default, the list elements and delimiters can
-        have intervening whitespace, and comments, but this can be
-        overridden by passing ``combine=True`` in the constructor. If
-        ``combine`` is set to ``True``, the matching tokens are
-        returned as a single token string, with the delimiters included;
-        otherwise, the matching tokens are returned as a list of tokens,
-        with the delimiters suppressed.
-
-        If ``allow_trailing_delim`` is set to True, then the list may end with
-        a delimiter.
-
-        Example::
-
-            DelimitedList(Word(alphas)).parse_string("aa,bb,cc") # -> ['aa', 'bb', 'cc']
-            DelimitedList(Word(hexnums), delim=':', combine=True).parse_string("AA:BB:CC:DD:EE") # -> ['AA:BB:CC:DD:EE']
-        """
-        if isinstance(expr, str_type):
-            expr = ParserElement._literalStringClass(expr)
-        expr = typing.cast(ParserElement, expr)
-
-        if min is not None and min < 1:
-            raise ValueError("min must be greater than 0")
-
-        if max is not None and min is not None and max < min:
-            raise ValueError("max must be greater than, or equal to min")
-
-        self.content = expr
-        self.raw_delim = str(delim)
-        self.delim = delim
-        self.combine = combine
-        if not combine:
-            self.delim = Suppress(delim)
-        self.min = min or 1
-        self.max = max
-        self.allow_trailing_delim = allow_trailing_delim
-
-        delim_list_expr = self.content + (self.delim + self.content) * (
-            self.min - 1,
-            None if self.max is None else self.max - 1,
-        )
-        if self.allow_trailing_delim:
-            delim_list_expr += Opt(self.delim)
-
-        if self.combine:
-            delim_list_expr = Combine(delim_list_expr)
-
-        super().__init__(delim_list_expr, savelist=True)
-
-    def _generateDefaultName(self) -> str:
-        content_expr = self.content.streamline()
-        return f"{content_expr} [{self.raw_delim} {content_expr}]..."
-
-
-class _NullToken:
-    def __bool__(self):
-        return False
-
-    def __str__(self):
-        return ""
-
-
-class Opt(ParseElementEnhance):
-    """
-    Optional matching of the given expression.
-
-    Parameters:
-
-    - ``expr`` - expression that must match zero or more times
-    - ``default`` (optional) - value to be returned if the optional expression is not found.
-
-    Example::
-
-        # US postal code can be a 5-digit zip, plus optional 4-digit qualifier
-        zip = Combine(Word(nums, exact=5) + Opt('-' + Word(nums, exact=4)))
-        zip.run_tests('''
-            # traditional ZIP code
-            12345
-
-            # ZIP+4 form
-            12101-0001
-
-            # invalid ZIP
-            98765-
-            ''')
-
-    prints::
-
-        # traditional ZIP code
-        12345
-        ['12345']
-
-        # ZIP+4 form
-        12101-0001
-        ['12101-0001']
-
-        # invalid ZIP
-        98765-
-             ^
-        FAIL: Expected end of text (at char 5), (line:1, col:6)
-    """
-
-    __optionalNotMatched = _NullToken()
-
-    def __init__(
-        self, expr: Union[ParserElement, str], default: Any = __optionalNotMatched
-    ):
-        super().__init__(expr, savelist=False)
-        self.saveAsList = self.expr.saveAsList
-        self.defaultValue = default
-        self.mayReturnEmpty = True
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        self_expr = self.expr
-        try:
-            loc, tokens = self_expr._parse(
-                instring, loc, do_actions, callPreParse=False
-            )
-        except (ParseException, IndexError):
-            default_value = self.defaultValue
-            if default_value is not self.__optionalNotMatched:
-                if self_expr.resultsName:
-                    tokens = ParseResults([default_value])
-                    tokens[self_expr.resultsName] = default_value
-                else:
-                    tokens = [default_value]  # type: ignore[assignment]
-            else:
-                tokens = []  # type: ignore[assignment]
-        return loc, tokens
-
-    def _generateDefaultName(self) -> str:
-        inner = str(self.expr)
-        # strip off redundant inner {}'s
-        while len(inner) > 1 and inner[0 :: len(inner) - 1] == "{}":
-            inner = inner[1:-1]
-        return f"[{inner}]"
-
-
-Optional = Opt
-
-
-class SkipTo(ParseElementEnhance):
-    """
-    Token for skipping over all undefined text until the matched
-    expression is found.
-
-    Parameters:
-
-    - ``expr`` - target expression marking the end of the data to be skipped
-    - ``include`` - if ``True``, the target expression is also parsed
-      (the skipped text and target expression are returned as a 2-element
-      list) (default= ``False``).
-    - ``ignore`` - (default= ``None``) used to define grammars (typically quoted strings and
-      comments) that might contain false matches to the target expression
-    - ``fail_on`` - (default= ``None``) define expressions that are not allowed to be
-      included in the skipped test; if found before the target expression is found,
-      the :class:`SkipTo` is not a match
-
-    Example::
-
-        report = '''
-            Outstanding Issues Report - 1 Jan 2000
-
-               # | Severity | Description                               |  Days Open
-            -----+----------+-------------------------------------------+-----------
-             101 | Critical | Intermittent system crash                 |          6
-              94 | Cosmetic | Spelling error on Login ('log|n')         |         14
-              79 | Minor    | System slow when running too many reports |         47
-            '''
-        integer = Word(nums)
-        SEP = Suppress('|')
-        # use SkipTo to simply match everything up until the next SEP
-        # - ignore quoted strings, so that a '|' character inside a quoted string does not match
-        # - parse action will call token.strip() for each matched token, i.e., the description body
-        string_data = SkipTo(SEP, ignore=quoted_string)
-        string_data.set_parse_action(token_map(str.strip))
-        ticket_expr = (integer("issue_num") + SEP
-                      + string_data("sev") + SEP
-                      + string_data("desc") + SEP
-                      + integer("days_open"))
-
-        for tkt in ticket_expr.search_string(report):
-            print tkt.dump()
-
-    prints::
-
-        ['101', 'Critical', 'Intermittent system crash', '6']
-        - days_open: '6'
-        - desc: 'Intermittent system crash'
-        - issue_num: '101'
-        - sev: 'Critical'
-        ['94', 'Cosmetic', "Spelling error on Login ('log|n')", '14']
-        - days_open: '14'
-        - desc: "Spelling error on Login ('log|n')"
-        - issue_num: '94'
-        - sev: 'Cosmetic'
-        ['79', 'Minor', 'System slow when running too many reports', '47']
-        - days_open: '47'
-        - desc: 'System slow when running too many reports'
-        - issue_num: '79'
-        - sev: 'Minor'
-    """
-
-    def __init__(
-        self,
-        other: Union[ParserElement, str],
-        include: bool = False,
-        ignore: typing.Optional[Union[ParserElement, str]] = None,
-        fail_on: typing.Optional[Union[ParserElement, str]] = None,
-        *,
-        failOn: typing.Optional[Union[ParserElement, str]] = None,
-    ):
-        super().__init__(other)
-        failOn = failOn or fail_on
-        self.ignoreExpr = ignore
-        self.mayReturnEmpty = True
-        self.mayIndexError = False
-        self.includeMatch = include
-        self.saveAsList = False
-        if isinstance(failOn, str_type):
-            self.failOn = self._literalStringClass(failOn)
-        else:
-            self.failOn = failOn
-        self.errmsg = f"No match found for {self.expr}"
-        self.ignorer = Empty().leave_whitespace()
-        self._update_ignorer()
-
-    def _update_ignorer(self):
-        # rebuild internal ignore expr from current ignore exprs and assigned ignoreExpr
-        self.ignorer.ignoreExprs.clear()
-        for e in self.expr.ignoreExprs:
-            self.ignorer.ignore(e)
-        if self.ignoreExpr:
-            self.ignorer.ignore(self.ignoreExpr)
-
-    def ignore(self, expr):
-        super().ignore(expr)
-        self._update_ignorer()
-
-    def parseImpl(self, instring, loc, do_actions=True):
-        startloc = loc
-        instrlen = len(instring)
-        self_expr_parse = self.expr._parse
-        self_failOn_canParseNext = (
-            self.failOn.canParseNext if self.failOn is not None else None
-        )
-        ignorer_try_parse = self.ignorer.try_parse if self.ignorer.ignoreExprs else None
-
-        tmploc = loc
-        while tmploc <= instrlen:
-            if self_failOn_canParseNext is not None:
-                # break if failOn expression matches
-                if self_failOn_canParseNext(instring, tmploc):
-                    break
-
-            if ignorer_try_parse is not None:
-                # advance past ignore expressions
-                prev_tmploc = tmploc
-                while 1:
-                    try:
-                        tmploc = ignorer_try_parse(instring, tmploc)
-                    except ParseBaseException:
-                        break
-                    # see if all ignorers matched, but didn't actually ignore anything
-                    if tmploc == prev_tmploc:
-                        break
-                    prev_tmploc = tmploc
-
-            try:
-                self_expr_parse(instring, tmploc, do_actions=False, callPreParse=False)
-            except (ParseException, IndexError):
-                # no match, advance loc in string
-                tmploc += 1
-            else:
-                # matched skipto expr, done
-                break
-
-        else:
-            # ran off the end of the input string without matching skipto expr, fail
-            raise ParseException(instring, loc, self.errmsg, self)
-
-        # build up return values
-        loc = tmploc
-        skiptext = instring[startloc:loc]
-        skipresult = ParseResults(skiptext)
-
-        if self.includeMatch:
-            loc, mat = self_expr_parse(instring, loc, do_actions, callPreParse=False)
-            skipresult += mat
-
-        return loc, skipresult
-
-
-class Forward(ParseElementEnhance):
-    """
-    Forward declaration of an expression to be defined later -
-    used for recursive grammars, such as algebraic infix notation.
-    When the expression is known, it is assigned to the ``Forward``
-    variable using the ``'<<'`` operator.
-
-    Note: take care when assigning to ``Forward`` not to overlook
-    precedence of operators.
-
-    Specifically, ``'|'`` has a lower precedence than ``'<<'``, so that::
-
-        fwd_expr << a | b | c
-
-    will actually be evaluated as::
-
-        (fwd_expr << a) | b | c
-
-    thereby leaving b and c out as parseable alternatives.  It is recommended that you
-    explicitly group the values inserted into the ``Forward``::
-
-        fwd_expr << (a | b | c)
-
-    Converting to use the ``'<<='`` operator instead will avoid this problem.
-
-    See :class:`ParseResults.pprint` for an example of a recursive
-    parser created using ``Forward``.
-    """
-
-    def __init__(self, other: typing.Optional[Union[ParserElement, str]] = None):
-        self.caller_frame = traceback.extract_stack(limit=2)[0]
-        super().__init__(other, savelist=False)  # type: ignore[arg-type]
-        self.lshift_line = None
-
-    def __lshift__(self, other) -> Forward:
-        if hasattr(self, "caller_frame"):
-            del self.caller_frame
-        if isinstance(other, str_type):
-            other = self._literalStringClass(other)
-
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-
-        self.expr = other
-        self.streamlined = other.streamlined
-        self.mayIndexError = self.expr.mayIndexError
-        self.mayReturnEmpty = self.expr.mayReturnEmpty
-        self.set_whitespace_chars(
-            self.expr.whiteChars, copy_defaults=self.expr.copyDefaultWhiteChars
-        )
-        self.skipWhitespace = self.expr.skipWhitespace
-        self.saveAsList = self.expr.saveAsList
-        self.ignoreExprs.extend(self.expr.ignoreExprs)
-        self.lshift_line = traceback.extract_stack(limit=2)[-2]  # type: ignore[assignment]
-        return self
-
-    def __ilshift__(self, other) -> Forward:
-        if not isinstance(other, ParserElement):
-            return NotImplemented
-
-        return self << other
-
-    def __or__(self, other) -> ParserElement:
-        caller_line = traceback.extract_stack(limit=2)[-2]
-        if (
-            __diag__.warn_on_match_first_with_lshift_operator
-            and caller_line == self.lshift_line
-            and Diagnostics.warn_on_match_first_with_lshift_operator
-            not in self.suppress_warnings_
-        ):
-            warnings.warn(
-                "using '<<' operator with '|' is probably an error, use '<<='",
-                stacklevel=2,
-            )
-        ret = super().__or__(other)
-        return ret
-
-    def __del__(self):
-        # see if we are getting dropped because of '=' reassignment of var instead of '<<=' or '<<'
-        if (
-            self.expr is None
-            and __diag__.warn_on_assignment_to_Forward
-            and Diagnostics.warn_on_assignment_to_Forward not in self.suppress_warnings_
-        ):
-            warnings.warn_explicit(
-                "Forward defined here but no expression attached later using '<<=' or '<<'",
-                UserWarning,
-                filename=self.caller_frame.filename,
-                lineno=self.caller_frame.lineno,
-            )
-
-    def parseImpl(self, instring, loc, do_actions=True) -> ParseImplReturnType:
-        if (
-            self.expr is None
-            and __diag__.warn_on_parse_using_empty_Forward
-            and Diagnostics.warn_on_parse_using_empty_Forward
-            not in self.suppress_warnings_
-        ):
-            # walk stack until parse_string, scan_string, search_string, or transform_string is found
-            parse_fns = (
-                "parse_string",
-                "scan_string",
-                "search_string",
-                "transform_string",
-            )
-            tb = traceback.extract_stack(limit=200)
-            for i, frm in enumerate(reversed(tb), start=1):
-                if frm.name in parse_fns:
-                    stacklevel = i + 1
-                    break
-            else:
-                stacklevel = 2
-            warnings.warn(
-                "Forward expression was never assigned a value, will not parse any input",
-                stacklevel=stacklevel,
-            )
-        if not ParserElement._left_recursion_enabled:
-            return super().parseImpl(instring, loc, do_actions)
-        # ## Bounded Recursion algorithm ##
-        # Recursion only needs to be processed at ``Forward`` elements, since they are
-        # the only ones that can actually refer to themselves. The general idea is
-        # to handle recursion stepwise: We start at no recursion, then recurse once,
-        # recurse twice, ..., until more recursion offers no benefit (we hit the bound).
-        #
-        # The "trick" here is that each ``Forward`` gets evaluated in two contexts
-        # - to *match* a specific recursion level, and
-        # - to *search* the bounded recursion level
-        # and the two run concurrently. The *search* must *match* each recursion level
-        # to find the best possible match. This is handled by a memo table, which
-        # provides the previous match to the next level match attempt.
-        #
-        # See also "Left Recursion in Parsing Expression Grammars", Medeiros et al.
-        #
-        # There is a complication since we not only *parse* but also *transform* via
-        # actions: We do not want to run the actions too often while expanding. Thus,
-        # we expand using `do_actions=False` and only run `do_actions=True` if the next
-        # recursion level is acceptable.
-        with ParserElement.recursion_lock:
-            memo = ParserElement.recursion_memos
-            try:
-                # we are parsing at a specific recursion expansion - use it as-is
-                prev_loc, prev_result = memo[loc, self, do_actions]
-                if isinstance(prev_result, Exception):
-                    raise prev_result
-                return prev_loc, prev_result.copy()
-            except KeyError:
-                act_key = (loc, self, True)
-                peek_key = (loc, self, False)
-                # we are searching for the best recursion expansion - keep on improving
-                # both `do_actions` cases must be tracked separately here!
-                prev_loc, prev_peek = memo[peek_key] = (
-                    loc - 1,
-                    ParseException(
-                        instring, loc, "Forward recursion without base case", self
-                    ),
-                )
-                if do_actions:
-                    memo[act_key] = memo[peek_key]
-                while True:
-                    try:
-                        new_loc, new_peek = super().parseImpl(instring, loc, False)
-                    except ParseException:
-                        # we failed before getting any match – do not hide the error
-                        if isinstance(prev_peek, Exception):
-                            raise
-                        new_loc, new_peek = prev_loc, prev_peek
-                    # the match did not get better: we are done
-                    if new_loc <= prev_loc:
-                        if do_actions:
-                            # replace the match for do_actions=False as well,
-                            # in case the action did backtrack
-                            prev_loc, prev_result = memo[peek_key] = memo[act_key]
-                            del memo[peek_key], memo[act_key]
-                            return prev_loc, copy.copy(prev_result)
-                        del memo[peek_key]
-                        return prev_loc, copy.copy(prev_peek)
-                    # the match did get better: see if we can improve further
-                    if do_actions:
-                        try:
-                            memo[act_key] = super().parseImpl(instring, loc, True)
-                        except ParseException as e:
-                            memo[peek_key] = memo[act_key] = (new_loc, e)
-                            raise
-                    prev_loc, prev_peek = memo[peek_key] = new_loc, new_peek
-
-    def leave_whitespace(self, recursive: bool = True) -> ParserElement:
-        self.skipWhitespace = False
-        return self
-
-    def ignore_whitespace(self, recursive: bool = True) -> ParserElement:
-        self.skipWhitespace = True
-        return self
-
-    def streamline(self) -> ParserElement:
-        if not self.streamlined:
-            self.streamlined = True
-            if self.expr is not None:
-                self.expr.streamline()
-        return self
-
-    def validate(self, validateTrace=None) -> None:
-        warnings.warn(
-            "ParserElement.validate() is deprecated, and should not be used to check for left recursion",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        if validateTrace is None:
-            validateTrace = []
-
-        if self not in validateTrace:
-            tmp = validateTrace[:] + [self]
-            if self.expr is not None:
-                self.expr.validate(tmp)
-        self._checkRecursion([])
-
-    def _generateDefaultName(self) -> str:
-        # Avoid infinite recursion by setting a temporary _defaultName
-        self._defaultName = ": ..."
-
-        # Use the string representation of main expression.
-        retString = "..."
-        try:
-            if self.expr is not None:
-                retString = str(self.expr)[:1000]
-            else:
-                retString = "None"
-        finally:
-            return f"{type(self).__name__}: {retString}"
-
-    def copy(self) -> ParserElement:
-        if self.expr is not None:
-            return super().copy()
-        else:
-            ret = Forward()
-            ret <<= self
-            return ret
-
-    def _setResultsName(self, name, list_all_matches=False) -> ParserElement:
-        # fmt: off
-        if (
-            __diag__.warn_name_set_on_empty_Forward
-            and Diagnostics.warn_name_set_on_empty_Forward not in self.suppress_warnings_
-            and self.expr is None
-        ):
-            warning = (
-                "warn_name_set_on_empty_Forward:"
-                f" setting results name {name!r} on {type(self).__name__} expression"
-                " that has no contained expression"
-            )
-            warnings.warn(warning, stacklevel=3)
-        # fmt: on
-
-        return super()._setResultsName(name, list_all_matches)
-
-    # Compatibility synonyms
-    # fmt: off
-    leaveWhitespace = replaced_by_pep8("leaveWhitespace", leave_whitespace)
-    ignoreWhitespace = replaced_by_pep8("ignoreWhitespace", ignore_whitespace)
-    # fmt: on
-
-
-class TokenConverter(ParseElementEnhance):
-    """
-    Abstract subclass of :class:`ParseElementEnhance`, for converting parsed results.
-    """
-
-    def __init__(self, expr: Union[ParserElement, str], savelist=False):
-        super().__init__(expr)  # , savelist)
-        self.saveAsList = False
-
-
-class Combine(TokenConverter):
-    """Converter to concatenate all matching tokens to a single string.
-    By default, the matching patterns must also be contiguous in the
-    input string; this can be disabled by specifying
-    ``'adjacent=False'`` in the constructor.
-
-    Example::
-
-        real = Word(nums) + '.' + Word(nums)
-        print(real.parse_string('3.1416')) # -> ['3', '.', '1416']
-        # will also erroneously match the following
-        print(real.parse_string('3. 1416')) # -> ['3', '.', '1416']
-
-        real = Combine(Word(nums) + '.' + Word(nums))
-        print(real.parse_string('3.1416')) # -> ['3.1416']
-        # no match when there are internal spaces
-        print(real.parse_string('3. 1416')) # -> Exception: Expected W:(0123...)
-    """
-
-    def __init__(
-        self,
-        expr: ParserElement,
-        join_string: str = "",
-        adjacent: bool = True,
-        *,
-        joinString: typing.Optional[str] = None,
-    ):
-        super().__init__(expr)
-        joinString = joinString if joinString is not None else join_string
-        # suppress whitespace-stripping in contained parse expressions, but re-enable it on the Combine itself
-        if adjacent:
-            self.leave_whitespace()
-        self.adjacent = adjacent
-        self.skipWhitespace = True
-        self.joinString = joinString
-        self.callPreparse = True
-
-    def ignore(self, other) -> ParserElement:
-        if self.adjacent:
-            ParserElement.ignore(self, other)
-        else:
-            super().ignore(other)
-        return self
-
-    def postParse(self, instring, loc, tokenlist):
-        retToks = tokenlist.copy()
-        del retToks[:]
-        retToks += ParseResults(
-            ["".join(tokenlist._asStringList(self.joinString))], modal=self.modalResults
-        )
-
-        if self.resultsName and retToks.haskeys():
-            return [retToks]
-        else:
-            return retToks
-
-
-class Group(TokenConverter):
-    """Converter to return the matched tokens as a list - useful for
-    returning tokens of :class:`ZeroOrMore` and :class:`OneOrMore` expressions.
-
-    The optional ``aslist`` argument when set to True will return the
-    parsed tokens as a Python list instead of a pyparsing ParseResults.
-
-    Example::
-
-        ident = Word(alphas)
-        num = Word(nums)
-        term = ident | num
-        func = ident + Opt(DelimitedList(term))
-        print(func.parse_string("fn a, b, 100"))
-        # -> ['fn', 'a', 'b', '100']
-
-        func = ident + Group(Opt(DelimitedList(term)))
-        print(func.parse_string("fn a, b, 100"))
-        # -> ['fn', ['a', 'b', '100']]
-    """
-
-    def __init__(self, expr: ParserElement, aslist: bool = False):
-        super().__init__(expr)
-        self.saveAsList = True
-        self._asPythonList = aslist
-
-    def postParse(self, instring, loc, tokenlist):
-        if self._asPythonList:
-            return ParseResults.List(
-                tokenlist.asList()
-                if isinstance(tokenlist, ParseResults)
-                else list(tokenlist)
-            )
-
-        return [tokenlist]
-
-
-class Dict(TokenConverter):
-    """Converter to return a repetitive expression as a list, but also
-    as a dictionary. Each element can also be referenced using the first
-    token in the expression as its key. Useful for tabular report
-    scraping when the first column can be used as a item key.
-
-    The optional ``asdict`` argument when set to True will return the
-    parsed tokens as a Python dict instead of a pyparsing ParseResults.
-
-    Example::
-
-        data_word = Word(alphas)
-        label = data_word + FollowedBy(':')
-
-        text = "shape: SQUARE posn: upper left color: light blue texture: burlap"
-        attr_expr = (label + Suppress(':') + OneOrMore(data_word, stop_on=label).set_parse_action(' '.join))
-
-        # print attributes as plain groups
-        print(attr_expr[1, ...].parse_string(text).dump())
-
-        # instead of OneOrMore(expr), parse using Dict(Group(expr)[1, ...]) - Dict will auto-assign names
-        result = Dict(Group(attr_expr)[1, ...]).parse_string(text)
-        print(result.dump())
-
-        # access named fields as dict entries, or output as dict
-        print(result['shape'])
-        print(result.as_dict())
-
-    prints::
-
-        ['shape', 'SQUARE', 'posn', 'upper left', 'color', 'light blue', 'texture', 'burlap']
-        [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'light blue'], ['texture', 'burlap']]
-        - color: 'light blue'
-        - posn: 'upper left'
-        - shape: 'SQUARE'
-        - texture: 'burlap'
-        SQUARE
-        {'color': 'light blue', 'posn': 'upper left', 'texture': 'burlap', 'shape': 'SQUARE'}
-
-    See more examples at :class:`ParseResults` of accessing fields by results name.
-    """
-
-    def __init__(self, expr: ParserElement, asdict: bool = False):
-        super().__init__(expr)
-        self.saveAsList = True
-        self._asPythonDict = asdict
-
-    def postParse(self, instring, loc, tokenlist):
-        for i, tok in enumerate(tokenlist):
-            if len(tok) == 0:
-                continue
-
-            ikey = tok[0]
-            if isinstance(ikey, int):
-                ikey = str(ikey).strip()
-
-            if len(tok) == 1:
-                tokenlist[ikey] = _ParseResultsWithOffset("", i)
-
-            elif len(tok) == 2 and not isinstance(tok[1], ParseResults):
-                tokenlist[ikey] = _ParseResultsWithOffset(tok[1], i)
-
-            else:
-                try:
-                    dictvalue = tok.copy()  # ParseResults(i)
-                except Exception:
-                    exc = TypeError(
-                        "could not extract dict values from parsed results"
-                        " - Dict expression must contain Grouped expressions"
-                    )
-                    raise exc from None
-
-                del dictvalue[0]
-
-                if len(dictvalue) != 1 or (
-                    isinstance(dictvalue, ParseResults) and dictvalue.haskeys()
-                ):
-                    tokenlist[ikey] = _ParseResultsWithOffset(dictvalue, i)
-                else:
-                    tokenlist[ikey] = _ParseResultsWithOffset(dictvalue[0], i)
-
-        if self._asPythonDict:
-            return [tokenlist.as_dict()] if self.resultsName else tokenlist.as_dict()
-
-        return [tokenlist] if self.resultsName else tokenlist
-
-
-class Suppress(TokenConverter):
-    """Converter for ignoring the results of a parsed expression.
-
-    Example::
-
-        source = "a, b, c,d"
-        wd = Word(alphas)
-        wd_list1 = wd + (',' + wd)[...]
-        print(wd_list1.parse_string(source))
-
-        # often, delimiters that are useful during parsing are just in the
-        # way afterward - use Suppress to keep them out of the parsed output
-        wd_list2 = wd + (Suppress(',') + wd)[...]
-        print(wd_list2.parse_string(source))
-
-        # Skipped text (using '...') can be suppressed as well
-        source = "lead in START relevant text END trailing text"
-        start_marker = Keyword("START")
-        end_marker = Keyword("END")
-        find_body = Suppress(...) + start_marker + ... + end_marker
-        print(find_body.parse_string(source)
-
-    prints::
-
-        ['a', ',', 'b', ',', 'c', ',', 'd']
-        ['a', 'b', 'c', 'd']
-        ['START', 'relevant text ', 'END']
-
-    (See also :class:`DelimitedList`.)
-    """
-
-    def __init__(self, expr: Union[ParserElement, str], savelist: bool = False):
-        if expr is ...:
-            expr = _PendingSkip(NoMatch())
-        super().__init__(expr)
-
-    def __add__(self, other) -> ParserElement:
-        if isinstance(self.expr, _PendingSkip):
-            return Suppress(SkipTo(other)) + other
-
-        return super().__add__(other)
-
-    def __sub__(self, other) -> ParserElement:
-        if isinstance(self.expr, _PendingSkip):
-            return Suppress(SkipTo(other)) - other
-
-        return super().__sub__(other)
-
-    def postParse(self, instring, loc, tokenlist):
-        return []
-
-    def suppress(self) -> ParserElement:
-        return self
-
-
-def trace_parse_action(f: ParseAction) -> ParseAction:
-    """Decorator for debugging parse actions.
-
-    When the parse action is called, this decorator will print
-    ``">> entering method-name(line:<current_source_line>, <parse_location>, <matched_tokens>)"``.
-    When the parse action completes, the decorator will print
-    ``"<<"`` followed by the returned value, or any exception that the parse action raised.
-
-    Example::
-
-        wd = Word(alphas)
-
-        @trace_parse_action
-        def remove_duplicate_chars(tokens):
-            return ''.join(sorted(set(''.join(tokens))))
-
-        wds = wd[1, ...].set_parse_action(remove_duplicate_chars)
-        print(wds.parse_string("slkdjs sld sldd sdlf sdljf"))
-
-    prints::
-
-        >>entering remove_duplicate_chars(line: 'slkdjs sld sldd sdlf sdljf', 0, (['slkdjs', 'sld', 'sldd', 'sdlf', 'sdljf'], {}))
-        <<leaving remove_duplicate_chars (ret: 'dfjkls')
-        ['dfjkls']
-    """
-    f = _trim_arity(f)
-
-    def z(*paArgs):
-        thisFunc = f.__name__
-        s, l, t = paArgs[-3:]
-        if len(paArgs) > 3:
-            thisFunc = f"{type(paArgs[0]).__name__}.{thisFunc}"
-        sys.stderr.write(f">>entering {thisFunc}(line: {line(l, s)!r}, {l}, {t!r})\n")
-        try:
-            ret = f(*paArgs)
-        except Exception as exc:
-            sys.stderr.write(
-                f"<<leaving {thisFunc} (exception: {type(exc).__name__}: {exc})\n"
-            )
-            raise
-        sys.stderr.write(f"<<leaving {thisFunc} (ret: {ret!r})\n")
-        return ret
-
-    z.__name__ = f.__name__
-    return z
-
-
-# convenience constants for positional expressions
-empty = Empty().set_name("empty")
-line_start = LineStart().set_name("line_start")
-line_end = LineEnd().set_name("line_end")
-string_start = StringStart().set_name("string_start")
-string_end = StringEnd().set_name("string_end")
-
-_escapedPunc = Regex(r"\\[\\[\]\/\-\*\.\$\+\^\?()~ ]").set_parse_action(
-    lambda s, l, t: t[0][1]
-)
-_escapedHexChar = Regex(r"\\0?[xX][0-9a-fA-F]+").set_parse_action(
-    lambda s, l, t: chr(int(t[0].lstrip(r"\0x"), 16))
-)
-_escapedOctChar = Regex(r"\\0[0-7]+").set_parse_action(
-    lambda s, l, t: chr(int(t[0][1:], 8))
-)
-_singleChar = (
-    _escapedPunc | _escapedHexChar | _escapedOctChar | CharsNotIn(r"\]", exact=1)
-)
-_charRange = Group(_singleChar + Suppress("-") + _singleChar)
-_reBracketExpr = (
-    Literal("[")
-    + Opt("^").set_results_name("negate")
-    + Group(OneOrMore(_charRange | _singleChar)).set_results_name("body")
-    + Literal("]")
-)
-
-
-def srange(s: str) -> str:
-    r"""Helper to easily define string ranges for use in :class:`Word`
-    construction. Borrows syntax from regexp ``'[]'`` string range
-    definitions::
-
-        srange("[0-9]")   -> "0123456789"
-        srange("[a-z]")   -> "abcdefghijklmnopqrstuvwxyz"
-        srange("[a-z$_]") -> "abcdefghijklmnopqrstuvwxyz$_"
-
-    The input string must be enclosed in []'s, and the returned string
-    is the expanded character set joined into a single string. The
-    values enclosed in the []'s may be:
-
-    - a single character
-    - an escaped character with a leading backslash (such as ``\-``
-      or ``\]``)
-    - an escaped hex character with a leading ``'\x'``
-      (``\x21``, which is a ``'!'`` character) (``\0x##``
-      is also supported for backwards compatibility)
-    - an escaped octal character with a leading ``'\0'``
-      (``\041``, which is a ``'!'`` character)
-    - a range of any of the above, separated by a dash (``'a-z'``,
-      etc.)
-    - any combination of the above (``'aeiouy'``,
-      ``'a-zA-Z0-9_$'``, etc.)
-    """
-    _expanded = lambda p: (
-        p
-        if not isinstance(p, ParseResults)
-        else "".join(chr(c) for c in range(ord(p[0]), ord(p[1]) + 1))
-    )
-    try:
-        return "".join(_expanded(part) for part in _reBracketExpr.parse_string(s).body)
-    except Exception as e:
-        return ""
-
-
-def token_map(func, *args) -> ParseAction:
-    """Helper to define a parse action by mapping a function to all
-    elements of a :class:`ParseResults` list. If any additional args are passed,
-    they are forwarded to the given function as additional arguments
-    after the token, as in
-    ``hex_integer = Word(hexnums).set_parse_action(token_map(int, 16))``,
-    which will convert the parsed data to an integer using base 16.
-
-    Example (compare the last to example in :class:`ParserElement.transform_string`::
-
-        hex_ints = Word(hexnums)[1, ...].set_parse_action(token_map(int, 16))
-        hex_ints.run_tests('''
-            00 11 22 aa FF 0a 0d 1a
-            ''')
-
-        upperword = Word(alphas).set_parse_action(token_map(str.upper))
-        upperword[1, ...].run_tests('''
-            my kingdom for a horse
-            ''')
-
-        wd = Word(alphas).set_parse_action(token_map(str.title))
-        wd[1, ...].set_parse_action(' '.join).run_tests('''
-            now is the winter of our discontent made glorious summer by this sun of york
-            ''')
-
-    prints::
-
-        00 11 22 aa FF 0a 0d 1a
-        [0, 17, 34, 170, 255, 10, 13, 26]
-
-        my kingdom for a horse
-        ['MY', 'KINGDOM', 'FOR', 'A', 'HORSE']
-
-        now is the winter of our discontent made glorious summer by this sun of york
-        ['Now Is The Winter Of Our Discontent Made Glorious Summer By This Sun Of York']
-    """
-
-    def pa(s, l, t):
-        return [func(tokn, *args) for tokn in t]
-
-    func_name = getattr(func, "__name__", getattr(func, "__class__").__name__)
-    pa.__name__ = func_name
-
-    return pa
-
-
-def autoname_elements() -> None:
-    """
-    Utility to simplify mass-naming of parser elements, for
-    generating railroad diagram with named subdiagrams.
-    """
-    calling_frame = sys._getframe().f_back
-    if calling_frame is None:
-        return
-    calling_frame = typing.cast(types.FrameType, calling_frame)
-    for name, var in calling_frame.f_locals.items():
-        if isinstance(var, ParserElement) and not var.customName:
-            var.set_name(name)
-
-
-dbl_quoted_string = Combine(
-    Regex(r'"(?:[^"\n\r\\]|(?:"")|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*') + '"'
-).set_name("string enclosed in double quotes")
-
-sgl_quoted_string = Combine(
-    Regex(r"'(?:[^'\n\r\\]|(?:'')|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*") + "'"
-).set_name("string enclosed in single quotes")
-
-quoted_string = Combine(
-    (Regex(r'"(?:[^"\n\r\\]|(?:"")|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*') + '"').set_name(
-        "double quoted string"
-    )
-    | (Regex(r"'(?:[^'\n\r\\]|(?:'')|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*") + "'").set_name(
-        "single quoted string"
-    )
-).set_name("quoted string using single or double quotes")
-
-python_quoted_string = Combine(
-    (Regex(r'"""(?:[^"\\]|""(?!")|"(?!"")|\\.)*', flags=re.MULTILINE) + '"""').set_name(
-        "multiline double quoted string"
-    )
-    ^ (
-        Regex(r"'''(?:[^'\\]|''(?!')|'(?!'')|\\.)*", flags=re.MULTILINE) + "'''"
-    ).set_name("multiline single quoted string")
-    ^ (Regex(r'"(?:[^"\n\r\\]|(?:\\")|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*') + '"').set_name(
-        "double quoted string"
-    )
-    ^ (Regex(r"'(?:[^'\n\r\\]|(?:\\')|(?:\\(?:[^x]|x[0-9a-fA-F]+)))*") + "'").set_name(
-        "single quoted string"
-    )
-).set_name("Python quoted string")
-
-unicode_string = Combine("u" + quoted_string.copy()).set_name("unicode string literal")
-
-
-alphas8bit = srange(r"[\0xc0-\0xd6\0xd8-\0xf6\0xf8-\0xff]")
-punc8bit = srange(r"[\0xa1-\0xbf\0xd7\0xf7]")
-
-# build list of built-in expressions, for future reference if a global default value
-# gets updated
-_builtin_exprs: list[ParserElement] = [
-    v for v in vars().values() if isinstance(v, ParserElement)
-]
-
-# Compatibility synonyms
-# fmt: off
-sglQuotedString = sgl_quoted_string
-dblQuotedString = dbl_quoted_string
-quotedString = quoted_string
-unicodeString = unicode_string
-lineStart = line_start
-lineEnd = line_end
-stringStart = string_start
-stringEnd = string_end
-nullDebugAction = replaced_by_pep8("nullDebugAction", null_debug_action)
-traceParseAction = replaced_by_pep8("traceParseAction", trace_parse_action)
-conditionAsParseAction = replaced_by_pep8("conditionAsParseAction", condition_as_parse_action)
-tokenMap = replaced_by_pep8("tokenMap", token_map)
-# fmt: on
diff --git a/lib/pyparsing/diagram/__init__.py b/lib/pyparsing/diagram/__init__.py
deleted file mode 100644
index 7926f2c3..00000000
--- a/lib/pyparsing/diagram/__init__.py
+++ /dev/null
@@ -1,692 +0,0 @@
-# mypy: ignore-errors
-from __future__ import annotations
-
-import railroad
-import pyparsing
-import dataclasses
-import typing
-from typing import (
-    Generic,
-    TypeVar,
-    Callable,
-    Iterable,
-)
-from jinja2 import Template
-from io import StringIO
-import inspect
-import re
-
-
-jinja2_template_source = """\
-{% if not embed %}
-<!DOCTYPE html>
-<html>
-<head>
-{% endif %}
-    {% if not head %}
-        <style>
-            .railroad-heading {
-                font-family: monospace;
-            }
-        </style>
-    {% else %}
-        {{ head | safe }}
-    {% endif %}
-{% if not embed %}
-</head>
-<body>
-{% endif %}
-<meta charset="UTF-8"/>
-{{ body | safe }}
-{% for diagram in diagrams %}
-    <div class="railroad-group">
-        <h1 class="railroad-heading">{{ diagram.title }}</h1>
-        <div class="railroad-description">{{ diagram.text }}</div>
-        <div class="railroad-svg">
-            {{ diagram.svg }}
-        </div>
-    </div>
-{% endfor %}
-{% if not embed %}
-</body>
-</html>
-{% endif %}
-"""
-
-template = Template(jinja2_template_source)
-
-
-def _collapse_verbose_regex(regex_str: str) -> str:
-    collapsed = pyparsing.Regex(r"#.*").suppress().transform_string(regex_str)
-    collapsed = re.sub(r"\s*\n\s*", "", collapsed)
-    return collapsed
-
-
-@dataclasses.dataclass
-class NamedDiagram:
-    """
-    A simple structure for associating a name with a railroad diagram
-    """
-
-    name: str
-    index: int
-    diagram: railroad.DiagramItem = None
-
-
-T = TypeVar("T")
-
-
-class EachItem(railroad.Group):
-    """
-    Custom railroad item to compose a:
-    - Group containing a
-      - OneOrMore containing a
-        - Choice of the elements in the Each
-    with the group label indicating that all must be matched
-    """
-
-    all_label = "[ALL]"
-
-    def __init__(self, *items):
-        choice_item = railroad.Choice(len(items) - 1, *items)
-        one_or_more_item = railroad.OneOrMore(item=choice_item)
-        super().__init__(one_or_more_item, label=self.all_label)
-
-
-class AnnotatedItem(railroad.Group):
-    """
-    Simple subclass of Group that creates an annotation label
-    """
-
-    def __init__(self, label: str, item):
-        super().__init__(item=item, label=f"[{label}]")
-
-
-class EditablePartial(Generic[T]):
-    """
-    Acts like a functools.partial, but can be edited. In other words, it represents a type that hasn't yet been
-    constructed.
-    """
-
-    # We need this here because the railroad constructors actually transform the data, so can't be called until the
-    # entire tree is assembled
-
-    def __init__(self, func: Callable[..., T], args: list, kwargs: dict):
-        self.func = func
-        self.args = args
-        self.kwargs = kwargs
-
-    @classmethod
-    def from_call(cls, func: Callable[..., T], *args, **kwargs) -> EditablePartial[T]:
-        """
-        If you call this function in the same way that you would call the constructor, it will store the arguments
-        as you expect. For example EditablePartial.from_call(Fraction, 1, 3)() == Fraction(1, 3)
-        """
-        return EditablePartial(func=func, args=list(args), kwargs=kwargs)
-
-    @property
-    def name(self):
-        return self.kwargs["name"]
-
-    def __call__(self) -> T:
-        """
-        Evaluate the partial and return the result
-        """
-        args = self.args.copy()
-        kwargs = self.kwargs.copy()
-
-        # This is a helpful hack to allow you to specify varargs parameters (e.g. *args) as keyword args (e.g.
-        # args=['list', 'of', 'things'])
-        arg_spec = inspect.getfullargspec(self.func)
-        if arg_spec.varargs in self.kwargs:
-            args += kwargs.pop(arg_spec.varargs)
-
-        return self.func(*args, **kwargs)
-
-
-def railroad_to_html(diagrams: list[NamedDiagram], embed=False, **kwargs) -> str:
-    """
-    Given a list of NamedDiagram, produce a single HTML string that visualises those diagrams
-    :params kwargs: kwargs to be passed in to the template
-    """
-    data = []
-    for diagram in diagrams:
-        if diagram.diagram is None:
-            continue
-        io = StringIO()
-        try:
-            css = kwargs.get("css")
-            diagram.diagram.writeStandalone(io.write, css=css)
-        except AttributeError:
-            diagram.diagram.writeSvg(io.write)
-        title = diagram.name
-        if diagram.index == 0:
-            title += " (root)"
-        data.append({"title": title, "text": "", "svg": io.getvalue()})
-
-    return template.render(diagrams=data, embed=embed, **kwargs)
-
-
-def resolve_partial(partial: EditablePartial[T]) -> T:
-    """
-    Recursively resolves a collection of Partials into whatever type they are
-    """
-    if isinstance(partial, EditablePartial):
-        partial.args = resolve_partial(partial.args)
-        partial.kwargs = resolve_partial(partial.kwargs)
-        return partial()
-    elif isinstance(partial, list):
-        return [resolve_partial(x) for x in partial]
-    elif isinstance(partial, dict):
-        return {key: resolve_partial(x) for key, x in partial.items()}
-    else:
-        return partial
-
-
-def to_railroad(
-    element: pyparsing.ParserElement,
-    diagram_kwargs: typing.Optional[dict] = None,
-    vertical: int = 3,
-    show_results_names: bool = False,
-    show_groups: bool = False,
-) -> list[NamedDiagram]:
-    """
-    Convert a pyparsing element tree into a list of diagrams. This is the recommended entrypoint to diagram
-    creation if you want to access the Railroad tree before it is converted to HTML
-    :param element: base element of the parser being diagrammed
-    :param diagram_kwargs: kwargs to pass to the Diagram() constructor
-    :param vertical: (optional) - int - limit at which number of alternatives should be
-       shown vertically instead of horizontally
-    :param show_results_names - bool to indicate whether results name annotations should be
-       included in the diagram
-    :param show_groups - bool to indicate whether groups should be highlighted with an unlabeled
-       surrounding box
-    """
-    # Convert the whole tree underneath the root
-    lookup = ConverterState(diagram_kwargs=diagram_kwargs or {})
-    _to_diagram_element(
-        element,
-        lookup=lookup,
-        parent=None,
-        vertical=vertical,
-        show_results_names=show_results_names,
-        show_groups=show_groups,
-    )
-
-    root_id = id(element)
-    # Convert the root if it hasn't been already
-    if root_id in lookup:
-        if not element.customName:
-            lookup[root_id].name = ""
-        lookup[root_id].mark_for_extraction(root_id, lookup, force=True)
-
-    # Now that we're finished, we can convert from intermediate structures into Railroad elements
-    diags = list(lookup.diagrams.values())
-    if len(diags) > 1:
-        # collapse out duplicate diags with the same name
-        seen = set()
-        deduped_diags = []
-        for d in diags:
-            # don't extract SkipTo elements, they are uninformative as subdiagrams
-            if d.name == "...":
-                continue
-            if d.name is not None and d.name not in seen:
-                seen.add(d.name)
-                deduped_diags.append(d)
-        resolved = [resolve_partial(partial) for partial in deduped_diags]
-    else:
-        # special case - if just one diagram, always display it, even if
-        # it has no name
-        resolved = [resolve_partial(partial) for partial in diags]
-    return sorted(resolved, key=lambda diag: diag.index)
-
-
-def _should_vertical(
-    specification: int, exprs: Iterable[pyparsing.ParserElement]
-) -> bool:
-    """
-    Returns true if we should return a vertical list of elements
-    """
-    if specification is None:
-        return False
-    else:
-        return len(_visible_exprs(exprs)) >= specification
-
-
-@dataclasses.dataclass
-class ElementState:
-    """
-    State recorded for an individual pyparsing Element
-    """
-
-    #: The pyparsing element that this represents
-    element: pyparsing.ParserElement
-    #: The output Railroad element in an unconverted state
-    converted: EditablePartial
-    #: The parent Railroad element, which we store so that we can extract this if it's duplicated
-    parent: EditablePartial
-    #: The order in which we found this element, used for sorting diagrams if this is extracted into a diagram
-    number: int
-    #: The name of the element
-    name: str = None
-    #: The index of this inside its parent
-    parent_index: typing.Optional[int] = None
-    #: If true, we should extract this out into a subdiagram
-    extract: bool = False
-    #: If true, all of this element's children have been filled out
-    complete: bool = False
-
-    def mark_for_extraction(
-        self, el_id: int, state: ConverterState, name: str = None, force: bool = False
-    ):
-        """
-        Called when this instance has been seen twice, and thus should eventually be extracted into a sub-diagram
-        :param el_id: id of the element
-        :param state: element/diagram state tracker
-        :param name: name to use for this element's text
-        :param force: If true, force extraction now, regardless of the state of this. Only useful for extracting the
-        root element when we know we're finished
-        """
-        self.extract = True
-
-        # Set the name
-        if not self.name:
-            if name:
-                # Allow forcing a custom name
-                self.name = name
-            elif self.element.customName:
-                self.name = self.element.customName
-            else:
-                self.name = ""
-
-        # Just because this is marked for extraction doesn't mean we can do it yet. We may have to wait for children
-        # to be added
-        # Also, if this is just a string literal etc, don't bother extracting it
-        if force or (self.complete and _worth_extracting(self.element)):
-            state.extract_into_diagram(el_id)
-
-
-class ConverterState:
-    """
-    Stores some state that persists between recursions into the element tree
-    """
-
-    def __init__(self, diagram_kwargs: typing.Optional[dict] = None):
-        #: A dictionary mapping ParserElements to state relating to them
-        self._element_diagram_states: dict[int, ElementState] = {}
-        #: A dictionary mapping ParserElement IDs to subdiagrams generated from them
-        self.diagrams: dict[int, EditablePartial[NamedDiagram]] = {}
-        #: The index of the next unnamed element
-        self.unnamed_index: int = 1
-        #: The index of the next element. This is used for sorting
-        self.index: int = 0
-        #: Shared kwargs that are used to customize the construction of diagrams
-        self.diagram_kwargs: dict = diagram_kwargs or {}
-        self.extracted_diagram_names: set[str] = set()
-
-    def __setitem__(self, key: int, value: ElementState):
-        self._element_diagram_states[key] = value
-
-    def __getitem__(self, key: int) -> ElementState:
-        return self._element_diagram_states[key]
-
-    def __delitem__(self, key: int):
-        del self._element_diagram_states[key]
-
-    def __contains__(self, key: int):
-        return key in self._element_diagram_states
-
-    def generate_unnamed(self) -> int:
-        """
-        Generate a number used in the name of an otherwise unnamed diagram
-        """
-        self.unnamed_index += 1
-        return self.unnamed_index
-
-    def generate_index(self) -> int:
-        """
-        Generate a number used to index a diagram
-        """
-        self.index += 1
-        return self.index
-
-    def extract_into_diagram(self, el_id: int):
-        """
-        Used when we encounter the same token twice in the same tree. When this
-        happens, we replace all instances of that token with a terminal, and
-        create a new subdiagram for the token
-        """
-        position = self[el_id]
-
-        # Replace the original definition of this element with a regular block
-        if position.parent:
-            ret = EditablePartial.from_call(railroad.NonTerminal, text=position.name)
-            if "item" in position.parent.kwargs:
-                position.parent.kwargs["item"] = ret
-            elif "items" in position.parent.kwargs:
-                position.parent.kwargs["items"][position.parent_index] = ret
-
-        # If the element we're extracting is a group, skip to its content but keep the title
-        if position.converted.func == railroad.Group:
-            content = position.converted.kwargs["item"]
-        else:
-            content = position.converted
-
-        self.diagrams[el_id] = EditablePartial.from_call(
-            NamedDiagram,
-            name=position.name,
-            diagram=EditablePartial.from_call(
-                railroad.Diagram, content, **self.diagram_kwargs
-            ),
-            index=position.number,
-        )
-
-        del self[el_id]
-
-
-def _worth_extracting(element: pyparsing.ParserElement) -> bool:
-    """
-    Returns true if this element is worth having its own sub-diagram. Simply, if any of its children
-    themselves have children, then its complex enough to extract
-    """
-    children = element.recurse()
-    return any(child.recurse() for child in children)
-
-
-def _apply_diagram_item_enhancements(fn):
-    """
-    decorator to ensure enhancements to a diagram item (such as results name annotations)
-    get applied on return from _to_diagram_element (we do this since there are several
-    returns in _to_diagram_element)
-    """
-
-    def _inner(
-        element: pyparsing.ParserElement,
-        parent: typing.Optional[EditablePartial],
-        lookup: ConverterState = None,
-        vertical: int = None,
-        index: int = 0,
-        name_hint: str = None,
-        show_results_names: bool = False,
-        show_groups: bool = False,
-    ) -> typing.Optional[EditablePartial]:
-        ret = fn(
-            element,
-            parent,
-            lookup,
-            vertical,
-            index,
-            name_hint,
-            show_results_names,
-            show_groups,
-        )
-
-        # apply annotation for results name, if present
-        if show_results_names and ret is not None:
-            element_results_name = element.resultsName
-            if element_results_name:
-                # add "*" to indicate if this is a "list all results" name
-                modal_tag = "" if element.modalResults else "*"
-                ret = EditablePartial.from_call(
-                    railroad.Group,
-                    item=ret,
-                    label=f"{repr(element_results_name)}{modal_tag}",
-                )
-
-        return ret
-
-    return _inner
-
-
-def _visible_exprs(exprs: Iterable[pyparsing.ParserElement]):
-    non_diagramming_exprs = (
-        pyparsing.ParseElementEnhance,
-        pyparsing.PositionToken,
-        pyparsing.And._ErrorStop,
-    )
-    return [
-        e
-        for e in exprs
-        if not (e.customName or e.resultsName or isinstance(e, non_diagramming_exprs))
-    ]
-
-
-@_apply_diagram_item_enhancements
-def _to_diagram_element(
-    element: pyparsing.ParserElement,
-    parent: typing.Optional[EditablePartial],
-    lookup: ConverterState = None,
-    vertical: int = None,
-    index: int = 0,
-    name_hint: str = None,
-    show_results_names: bool = False,
-    show_groups: bool = False,
-) -> typing.Optional[EditablePartial]:
-    """
-    Recursively converts a PyParsing Element to a railroad Element
-    :param lookup: The shared converter state that keeps track of useful things
-    :param index: The index of this element within the parent
-    :param parent: The parent of this element in the output tree
-    :param vertical: Controls at what point we make a list of elements vertical. If this is an integer (the default),
-    it sets the threshold of the number of items before we go vertical. If True, always go vertical, if False, never
-    do so
-    :param name_hint: If provided, this will override the generated name
-    :param show_results_names: bool flag indicating whether to add annotations for results names
-    :returns: The converted version of the input element, but as a Partial that hasn't yet been constructed
-    :param show_groups: bool flag indicating whether to show groups using bounding box
-    """
-    exprs = element.recurse()
-    name = name_hint or element.customName or type(element).__name__
-
-    # Python's id() is used to provide a unique identifier for elements
-    el_id = id(element)
-
-    element_results_name = element.resultsName
-
-    # Here we basically bypass processing certain wrapper elements if they contribute nothing to the diagram
-    if not element.customName:
-        if isinstance(
-            element,
-            (
-                # pyparsing.TokenConverter,
-                # pyparsing.Forward,
-                pyparsing.Located,
-            ),
-        ):
-            # However, if this element has a useful custom name, and its child does not, we can pass it on to the child
-            if exprs:
-                if not exprs[0].customName:
-                    propagated_name = name
-                else:
-                    propagated_name = None
-
-                return _to_diagram_element(
-                    element.expr,
-                    parent=parent,
-                    lookup=lookup,
-                    vertical=vertical,
-                    index=index,
-                    name_hint=propagated_name,
-                    show_results_names=show_results_names,
-                    show_groups=show_groups,
-                )
-
-    # If the element isn't worth extracting, we always treat it as the first time we say it
-    if _worth_extracting(element):
-        if el_id in lookup and lookup[el_id].name is not None:
-            # If we've seen this element exactly once before, we are only just now finding out that it's a duplicate,
-            # so we have to extract it into a new diagram.
-            looked_up = lookup[el_id]
-            looked_up.mark_for_extraction(el_id, lookup, name=name_hint)
-            ret = EditablePartial.from_call(railroad.NonTerminal, text=looked_up.name)
-            return ret
-
-        elif el_id in lookup.diagrams:
-            # If we have seen the element at least twice before, and have already extracted it into a subdiagram, we
-            # just put in a marker element that refers to the sub-diagram
-            ret = EditablePartial.from_call(
-                railroad.NonTerminal, text=lookup.diagrams[el_id].kwargs["name"]
-            )
-            return ret
-
-    # Recursively convert child elements
-    # Here we find the most relevant Railroad element for matching pyparsing Element
-    # We use ``items=[]`` here to hold the place for where the child elements will go once created
-    if isinstance(element, pyparsing.And):
-        # detect And's created with ``expr*N`` notation - for these use a OneOrMore with a repeat
-        # (all will have the same name, and resultsName)
-        if not exprs:
-            return None
-        if len(set((e.name, e.resultsName) for e in exprs)) == 1 and len(exprs) > 2:
-            ret = EditablePartial.from_call(
-                railroad.OneOrMore, item="", repeat=str(len(exprs))
-            )
-        elif _should_vertical(vertical, exprs):
-            ret = EditablePartial.from_call(railroad.Stack, items=[])
-        else:
-            ret = EditablePartial.from_call(railroad.Sequence, items=[])
-    elif isinstance(element, (pyparsing.Or, pyparsing.MatchFirst)):
-        if not exprs:
-            return None
-        if _should_vertical(vertical, exprs):
-            ret = EditablePartial.from_call(railroad.Choice, 0, items=[])
-        else:
-            ret = EditablePartial.from_call(railroad.HorizontalChoice, items=[])
-    elif isinstance(element, pyparsing.Each):
-        if not exprs:
-            return None
-        ret = EditablePartial.from_call(EachItem, items=[])
-    elif isinstance(element, pyparsing.NotAny):
-        ret = EditablePartial.from_call(AnnotatedItem, label="NOT", item="")
-    elif isinstance(element, pyparsing.FollowedBy):
-        ret = EditablePartial.from_call(AnnotatedItem, label="LOOKAHEAD", item="")
-    elif isinstance(element, pyparsing.PrecededBy):
-        ret = EditablePartial.from_call(AnnotatedItem, label="LOOKBEHIND", item="")
-    elif isinstance(element, pyparsing.Group):
-        if show_groups:
-            ret = EditablePartial.from_call(AnnotatedItem, label="", item="")
-        else:
-            ret = EditablePartial.from_call(railroad.Sequence, items=[])
-    elif isinstance(element, pyparsing.TokenConverter):
-        label = type(element).__name__.lower()
-        if label == "tokenconverter":
-            ret = EditablePartial.from_call(railroad.Sequence, items=[])
-        else:
-            ret = EditablePartial.from_call(AnnotatedItem, label=label, item="")
-    elif isinstance(element, pyparsing.Opt):
-        ret = EditablePartial.from_call(railroad.Optional, item="")
-    elif isinstance(element, pyparsing.OneOrMore):
-        if element.not_ender is not None:
-            args = [
-                parent,
-                lookup,
-                vertical,
-                index,
-                name_hint,
-                show_results_names,
-                show_groups,
-            ]
-            return _to_diagram_element(
-                (~element.not_ender.expr + element.expr)[1, ...].set_name(element.name),
-                *args,
-            )
-        ret = EditablePartial.from_call(railroad.OneOrMore, item=None)
-    elif isinstance(element, pyparsing.ZeroOrMore):
-        if element.not_ender is not None:
-            args = [
-                parent,
-                lookup,
-                vertical,
-                index,
-                name_hint,
-                show_results_names,
-                show_groups,
-            ]
-            return _to_diagram_element(
-                (~element.not_ender.expr + element.expr)[...].set_name(element.name),
-                *args,
-            )
-        ret = EditablePartial.from_call(railroad.ZeroOrMore, item="")
-    elif isinstance(element, pyparsing.Group):
-        ret = EditablePartial.from_call(
-            railroad.Group, item=None, label=element_results_name
-        )
-    elif isinstance(element, pyparsing.Empty) and not element.customName:
-        # Skip unnamed "Empty" elements
-        ret = None
-    elif isinstance(element, pyparsing.ParseElementEnhance):
-        ret = EditablePartial.from_call(railroad.Sequence, items=[])
-    elif len(exprs) > 0 and not element_results_name:
-        ret = EditablePartial.from_call(railroad.Group, item="", label=name)
-    elif isinstance(element, pyparsing.Regex):
-        patt = _collapse_verbose_regex(element.pattern)
-        element.pattern = patt
-        element._defaultName = None
-        ret = EditablePartial.from_call(railroad.Terminal, element.defaultName)
-    elif len(exprs) > 0:
-        ret = EditablePartial.from_call(railroad.Sequence, items=[])
-    else:
-        terminal = EditablePartial.from_call(railroad.Terminal, element.defaultName)
-        ret = terminal
-
-    if ret is None:
-        return
-
-    # Indicate this element's position in the tree so we can extract it if necessary
-    lookup[el_id] = ElementState(
-        element=element,
-        converted=ret,
-        parent=parent,
-        parent_index=index,
-        number=lookup.generate_index(),
-    )
-    if element.customName:
-        lookup[el_id].mark_for_extraction(el_id, lookup, element.customName)
-
-    i = 0
-    for expr in exprs:
-        # Add a placeholder index in case we have to extract the child before we even add it to the parent
-        if "items" in ret.kwargs:
-            ret.kwargs["items"].insert(i, None)
-
-        item = _to_diagram_element(
-            expr,
-            parent=ret,
-            lookup=lookup,
-            vertical=vertical,
-            index=i,
-            show_results_names=show_results_names,
-            show_groups=show_groups,
-        )
-
-        # Some elements don't need to be shown in the diagram
-        if item is not None:
-            if "item" in ret.kwargs:
-                ret.kwargs["item"] = item
-            elif "items" in ret.kwargs:
-                # If we've already extracted the child, don't touch this index, since it's occupied by a nonterminal
-                ret.kwargs["items"][i] = item
-                i += 1
-        elif "items" in ret.kwargs:
-            # If we're supposed to skip this element, remove it from the parent
-            del ret.kwargs["items"][i]
-
-    # If all this items children are none, skip this item
-    if ret and (
-        ("items" in ret.kwargs and len(ret.kwargs["items"]) == 0)
-        or ("item" in ret.kwargs and ret.kwargs["item"] is None)
-    ):
-        ret = EditablePartial.from_call(railroad.Terminal, name)
-
-    # Mark this element as "complete", ie it has all of its children
-    if el_id in lookup:
-        lookup[el_id].complete = True
-
-    if el_id in lookup and lookup[el_id].extract and lookup[el_id].complete:
-        lookup.extract_into_diagram(el_id)
-        if ret is not None:
-            ret = EditablePartial.from_call(
-                railroad.NonTerminal, text=lookup.diagrams[el_id].kwargs["name"]
-            )
-
-    return ret
diff --git a/lib/pyparsing/exceptions.py b/lib/pyparsing/exceptions.py
deleted file mode 100644
index 57a1579d..00000000
--- a/lib/pyparsing/exceptions.py
+++ /dev/null
@@ -1,314 +0,0 @@
-# exceptions.py
-from __future__ import annotations
-
-import copy
-import re
-import sys
-import typing
-from functools import cached_property
-
-from .unicode import pyparsing_unicode as ppu
-from .util import (
-    _collapse_string_to_ranges,
-    col,
-    line,
-    lineno,
-    replaced_by_pep8,
-)
-
-
-class _ExceptionWordUnicodeSet(
-    ppu.Latin1, ppu.LatinA, ppu.LatinB, ppu.Greek, ppu.Cyrillic
-):
-    pass
-
-
-_extract_alphanums = _collapse_string_to_ranges(_ExceptionWordUnicodeSet.alphanums)
-_exception_word_extractor = re.compile("([" + _extract_alphanums + "]{1,16})|.")
-
-
-class ParseBaseException(Exception):
-    """base exception class for all parsing runtime exceptions"""
-
-    loc: int
-    msg: str
-    pstr: str
-    parser_element: typing.Any  # "ParserElement"
-    args: tuple[str, int, typing.Optional[str]]
-
-    __slots__ = (
-        "loc",
-        "msg",
-        "pstr",
-        "parser_element",
-        "args",
-    )
-
-    # Performance tuning: we construct a *lot* of these, so keep this
-    # constructor as small and fast as possible
-    def __init__(
-        self,
-        pstr: str,
-        loc: int = 0,
-        msg: typing.Optional[str] = None,
-        elem=None,
-    ):
-        if msg is None:
-            msg, pstr = pstr, ""
-
-        self.loc = loc
-        self.msg = msg
-        self.pstr = pstr
-        self.parser_element = elem
-        self.args = (pstr, loc, msg)
-
-    @staticmethod
-    def explain_exception(exc: Exception, depth: int = 16) -> str:
-        """
-        Method to take an exception and translate the Python internal traceback into a list
-        of the pyparsing expressions that caused the exception to be raised.
-
-        Parameters:
-
-        - exc - exception raised during parsing (need not be a ParseException, in support
-          of Python exceptions that might be raised in a parse action)
-        - depth (default=16) - number of levels back in the stack trace to list expression
-          and function names; if None, the full stack trace names will be listed; if 0, only
-          the failing input line, marker, and exception string will be shown
-
-        Returns a multi-line string listing the ParserElements and/or function names in the
-        exception's stack trace.
-        """
-        import inspect
-        from .core import ParserElement
-
-        if depth is None:
-            depth = sys.getrecursionlimit()
-        ret: list[str] = []
-        if isinstance(exc, ParseBaseException):
-            ret.append(exc.line)
-            ret.append(f"{' ' * (exc.column - 1)}^")
-        ret.append(f"{type(exc).__name__}: {exc}")
-
-        if depth <= 0 or exc.__traceback__ is None:
-            return "\n".join(ret)
-
-        callers = inspect.getinnerframes(exc.__traceback__, context=depth)
-        seen: set[int] = set()
-        for ff in callers[-depth:]:
-            frm = ff[0]
-
-            f_self = frm.f_locals.get("self", None)
-            if isinstance(f_self, ParserElement):
-                if not frm.f_code.co_name.startswith(("parseImpl", "_parseNoCache")):
-                    continue
-                if id(f_self) in seen:
-                    continue
-                seen.add(id(f_self))
-
-                self_type = type(f_self)
-                ret.append(f"{self_type.__module__}.{self_type.__name__} - {f_self}")
-
-            elif f_self is not None:
-                self_type = type(f_self)
-                ret.append(f"{self_type.__module__}.{self_type.__name__}")
-
-            else:
-                code = frm.f_code
-                if code.co_name in ("wrapper", "<module>"):
-                    continue
-
-                ret.append(code.co_name)
-
-            depth -= 1
-            if not depth:
-                break
-
-        return "\n".join(ret)
-
-    @classmethod
-    def _from_exception(cls, pe) -> ParseBaseException:
-        """
-        internal factory method to simplify creating one type of ParseException
-        from another - avoids having __init__ signature conflicts among subclasses
-        """
-        return cls(pe.pstr, pe.loc, pe.msg, pe.parser_element)
-
-    @cached_property
-    def line(self) -> str:
-        """
-        Return the line of text where the exception occurred.
-        """
-        return line(self.loc, self.pstr)
-
-    @cached_property
-    def lineno(self) -> int:
-        """
-        Return the 1-based line number of text where the exception occurred.
-        """
-        return lineno(self.loc, self.pstr)
-
-    @cached_property
-    def col(self) -> int:
-        """
-        Return the 1-based column on the line of text where the exception occurred.
-        """
-        return col(self.loc, self.pstr)
-
-    @cached_property
-    def column(self) -> int:
-        """
-        Return the 1-based column on the line of text where the exception occurred.
-        """
-        return col(self.loc, self.pstr)
-
-    @cached_property
-    def found(self) -> str:
-        if not self.pstr:
-            return ""
-
-        if self.loc >= len(self.pstr):
-            return "end of text"
-
-        # pull out next word at error location
-        found_match = _exception_word_extractor.match(self.pstr, self.loc)
-        if found_match is not None:
-            found_text = found_match.group(0)
-        else:
-            found_text = self.pstr[self.loc : self.loc + 1]
-
-        return repr(found_text).replace(r"\\", "\\")
-
-    # pre-PEP8 compatibility
-    @property
-    def parserElement(self):
-        return self.parser_element
-
-    @parserElement.setter
-    def parserElement(self, elem):
-        self.parser_element = elem
-
-    def copy(self):
-        return copy.copy(self)
-
-    def formatted_message(self) -> str:
-        found_phrase = f", found {self.found}" if self.found else ""
-        return f"{self.msg}{found_phrase}  (at char {self.loc}), (line:{self.lineno}, col:{self.column})"
-
-    def __str__(self) -> str:
-        return self.formatted_message()
-
-    def __repr__(self):
-        return str(self)
-
-    def mark_input_line(
-        self, marker_string: typing.Optional[str] = None, *, markerString: str = ">!<"
-    ) -> str:
-        """
-        Extracts the exception line from the input string, and marks
-        the location of the exception with a special symbol.
-        """
-        markerString = marker_string if marker_string is not None else markerString
-        line_str = self.line
-        line_column = self.column - 1
-        if markerString:
-            line_str = f"{line_str[:line_column]}{markerString}{line_str[line_column:]}"
-        return line_str.strip()
-
-    def explain(self, depth: int = 16) -> str:
-        """
-        Method to translate the Python internal traceback into a list
-        of the pyparsing expressions that caused the exception to be raised.
-
-        Parameters:
-
-        - depth (default=16) - number of levels back in the stack trace to list expression
-          and function names; if None, the full stack trace names will be listed; if 0, only
-          the failing input line, marker, and exception string will be shown
-
-        Returns a multi-line string listing the ParserElements and/or function names in the
-        exception's stack trace.
-
-        Example::
-
-            # an expression to parse 3 integers
-            expr = pp.Word(pp.nums) * 3
-            try:
-                # a failing parse - the third integer is prefixed with "A"
-                expr.parse_string("123 456 A789")
-            except pp.ParseException as pe:
-                print(pe.explain(depth=0))
-
-        prints::
-
-            123 456 A789
-                    ^
-            ParseException: Expected W:(0-9), found 'A'  (at char 8), (line:1, col:9)
-
-        Note: the diagnostic output will include string representations of the expressions
-        that failed to parse. These representations will be more helpful if you use `set_name` to
-        give identifiable names to your expressions. Otherwise they will use the default string
-        forms, which may be cryptic to read.
-
-        Note: pyparsing's default truncation of exception tracebacks may also truncate the
-        stack of expressions that are displayed in the ``explain`` output. To get the full listing
-        of parser expressions, you may have to set ``ParserElement.verbose_stacktrace = True``
-        """
-        return self.explain_exception(self, depth)
-
-    # Compatibility synonyms
-    # fmt: off
-    markInputline = replaced_by_pep8("markInputline", mark_input_line)
-    # fmt: on
-
-
-class ParseException(ParseBaseException):
-    """
-    Exception thrown when a parse expression doesn't match the input string
-
-    Example::
-
-        integer = Word(nums).set_name("integer")
-        try:
-            integer.parse_string("ABC")
-        except ParseException as pe:
-            print(pe)
-            print(f"column: {pe.column}")
-
-    prints::
-
-       Expected integer (at char 0), (line:1, col:1) column: 1
-
-    """
-
-
-class ParseFatalException(ParseBaseException):
-    """
-    User-throwable exception thrown when inconsistent parse content
-    is found; stops all parsing immediately
-    """
-
-
-class ParseSyntaxException(ParseFatalException):
-    """
-    Just like :class:`ParseFatalException`, but thrown internally
-    when an :class:`ErrorStop<And._ErrorStop>` ('-' operator) indicates
-    that parsing is to stop immediately because an unbacktrackable
-    syntax error has been found.
-    """
-
-
-class RecursiveGrammarException(Exception):
-    """
-    Exception thrown by :class:`ParserElement.validate` if the
-    grammar could be left-recursive; parser may need to enable
-    left recursion using :class:`ParserElement.enable_left_recursion<ParserElement.enable_left_recursion>`
-
-    Deprecated: only used by deprecated method ParserElement.validate.
-    """
-
-    def __init__(self, parseElementList):
-        self.parseElementTrace = parseElementList
-
-    def __str__(self) -> str:
-        return f"RecursiveGrammarException: {self.parseElementTrace}"
diff --git a/lib/pyparsing/helpers.py b/lib/pyparsing/helpers.py
deleted file mode 100644
index d2bd05f3..00000000
--- a/lib/pyparsing/helpers.py
+++ /dev/null
@@ -1,1086 +0,0 @@
-# helpers.py
-import html.entities
-import operator
-import re
-import sys
-import typing
-
-from . import __diag__
-from .core import *
-from .util import (
-    _bslash,
-    _flatten,
-    _escape_regex_range_chars,
-    make_compressed_re,
-    replaced_by_pep8,
-)
-
-
-#
-# global helpers
-#
-def counted_array(
-    expr: ParserElement,
-    int_expr: typing.Optional[ParserElement] = None,
-    *,
-    intExpr: typing.Optional[ParserElement] = None,
-) -> ParserElement:
-    """Helper to define a counted list of expressions.
-
-    This helper defines a pattern of the form::
-
-        integer expr expr expr...
-
-    where the leading integer tells how many expr expressions follow.
-    The matched tokens returns the array of expr tokens as a list - the
-    leading count token is suppressed.
-
-    If ``int_expr`` is specified, it should be a pyparsing expression
-    that produces an integer value.
-
-    Example::
-
-        counted_array(Word(alphas)).parse_string('2 ab cd ef')  # -> ['ab', 'cd']
-
-        # in this parser, the leading integer value is given in binary,
-        # '10' indicating that 2 values are in the array
-        binary_constant = Word('01').set_parse_action(lambda t: int(t[0], 2))
-        counted_array(Word(alphas), int_expr=binary_constant).parse_string('10 ab cd ef')  # -> ['ab', 'cd']
-
-        # if other fields must be parsed after the count but before the
-        # list items, give the fields results names and they will
-        # be preserved in the returned ParseResults:
-        count_with_metadata = integer + Word(alphas)("type")
-        typed_array = counted_array(Word(alphanums), int_expr=count_with_metadata)("items")
-        result = typed_array.parse_string("3 bool True True False")
-        print(result.dump())
-
-        # prints
-        # ['True', 'True', 'False']
-        # - items: ['True', 'True', 'False']
-        # - type: 'bool'
-    """
-    intExpr = intExpr or int_expr
-    array_expr = Forward()
-
-    def count_field_parse_action(s, l, t):
-        nonlocal array_expr
-        n = t[0]
-        array_expr <<= (expr * n) if n else Empty()
-        # clear list contents, but keep any named results
-        del t[:]
-
-    if intExpr is None:
-        intExpr = Word(nums).set_parse_action(lambda t: int(t[0]))
-    else:
-        intExpr = intExpr.copy()
-    intExpr.set_name("arrayLen")
-    intExpr.add_parse_action(count_field_parse_action, call_during_try=True)
-    return (intExpr + array_expr).set_name(f"(len) {expr}...")
-
-
-def match_previous_literal(expr: ParserElement) -> ParserElement:
-    """Helper to define an expression that is indirectly defined from
-    the tokens matched in a previous expression, that is, it looks for
-    a 'repeat' of a previous expression.  For example::
-
-        first = Word(nums)
-        second = match_previous_literal(first)
-        match_expr = first + ":" + second
-
-    will match ``"1:1"``, but not ``"1:2"``.  Because this
-    matches a previous literal, will also match the leading
-    ``"1:1"`` in ``"1:10"``. If this is not desired, use
-    :class:`match_previous_expr`. Do *not* use with packrat parsing
-    enabled.
-    """
-    rep = Forward()
-
-    def copy_token_to_repeater(s, l, t):
-        if not t:
-            rep << Empty()
-            return
-
-        if len(t) == 1:
-            rep << t[0]
-            return
-
-        # flatten t tokens
-        tflat = _flatten(t.as_list())
-        rep << And(Literal(tt) for tt in tflat)
-
-    expr.add_parse_action(copy_token_to_repeater, callDuringTry=True)
-    rep.set_name("(prev) " + str(expr))
-    return rep
-
-
-def match_previous_expr(expr: ParserElement) -> ParserElement:
-    """Helper to define an expression that is indirectly defined from
-    the tokens matched in a previous expression, that is, it looks for
-    a 'repeat' of a previous expression.  For example::
-
-        first = Word(nums)
-        second = match_previous_expr(first)
-        match_expr = first + ":" + second
-
-    will match ``"1:1"``, but not ``"1:2"``.  Because this
-    matches by expressions, will *not* match the leading ``"1:1"``
-    in ``"1:10"``; the expressions are evaluated first, and then
-    compared, so ``"1"`` is compared with ``"10"``. Do *not* use
-    with packrat parsing enabled.
-    """
-    rep = Forward()
-    e2 = expr.copy()
-    rep <<= e2
-
-    def copy_token_to_repeater(s, l, t):
-        matchTokens = _flatten(t.as_list())
-
-        def must_match_these_tokens(s, l, t):
-            theseTokens = _flatten(t.as_list())
-            if theseTokens != matchTokens:
-                raise ParseException(
-                    s, l, f"Expected {matchTokens}, found{theseTokens}"
-                )
-
-        rep.set_parse_action(must_match_these_tokens, callDuringTry=True)
-
-    expr.add_parse_action(copy_token_to_repeater, callDuringTry=True)
-    rep.set_name("(prev) " + str(expr))
-    return rep
-
-
-def one_of(
-    strs: Union[typing.Iterable[str], str],
-    caseless: bool = False,
-    use_regex: bool = True,
-    as_keyword: bool = False,
-    *,
-    useRegex: bool = True,
-    asKeyword: bool = False,
-) -> ParserElement:
-    """Helper to quickly define a set of alternative :class:`Literal` s,
-    and makes sure to do longest-first testing when there is a conflict,
-    regardless of the input order, but returns
-    a :class:`MatchFirst` for best performance.
-
-    Parameters:
-
-    - ``strs`` - a string of space-delimited literals, or a collection of
-      string literals
-    - ``caseless`` - treat all literals as caseless - (default= ``False``)
-    - ``use_regex`` - as an optimization, will
-      generate a :class:`Regex` object; otherwise, will generate
-      a :class:`MatchFirst` object (if ``caseless=True`` or ``as_keyword=True``, or if
-      creating a :class:`Regex` raises an exception) - (default= ``True``)
-    - ``as_keyword`` - enforce :class:`Keyword`-style matching on the
-      generated expressions - (default= ``False``)
-    - ``asKeyword`` and ``useRegex`` are retained for pre-PEP8 compatibility,
-      but will be removed in a future release
-
-    Example::
-
-        comp_oper = one_of("< = > <= >= !=")
-        var = Word(alphas)
-        number = Word(nums)
-        term = var | number
-        comparison_expr = term + comp_oper + term
-        print(comparison_expr.search_string("B = 12  AA=23 B<=AA AA>12"))
-
-    prints::
-
-        [['B', '=', '12'], ['AA', '=', '23'], ['B', '<=', 'AA'], ['AA', '>', '12']]
-    """
-    asKeyword = asKeyword or as_keyword
-    useRegex = useRegex and use_regex
-
-    if (
-        isinstance(caseless, str_type)
-        and __diag__.warn_on_multiple_string_args_to_oneof
-    ):
-        warnings.warn(
-            "More than one string argument passed to one_of, pass"
-            " choices as a list or space-delimited string",
-            stacklevel=2,
-        )
-
-    if caseless:
-        is_equal = lambda a, b: a.upper() == b.upper()
-        masks = lambda a, b: b.upper().startswith(a.upper())
-        parse_element_class = CaselessKeyword if asKeyword else CaselessLiteral
-    else:
-        is_equal = operator.eq
-        masks = lambda a, b: b.startswith(a)
-        parse_element_class = Keyword if asKeyword else Literal
-
-    symbols: list[str]
-    if isinstance(strs, str_type):
-        strs = typing.cast(str, strs)
-        symbols = strs.split()
-    elif isinstance(strs, Iterable):
-        symbols = list(strs)
-    else:
-        raise TypeError("Invalid argument to one_of, expected string or iterable")
-    if not symbols:
-        return NoMatch()
-
-    # reorder given symbols to take care to avoid masking longer choices with shorter ones
-    # (but only if the given symbols are not just single characters)
-    i = 0
-    while i < len(symbols) - 1:
-        cur = symbols[i]
-        for j, other in enumerate(symbols[i + 1 :]):
-            if is_equal(other, cur):
-                del symbols[i + j + 1]
-                break
-            if len(other) > len(cur) and masks(cur, other):
-                del symbols[i + j + 1]
-                symbols.insert(i, other)
-                break
-        else:
-            i += 1
-
-    if useRegex:
-        re_flags: int = re.IGNORECASE if caseless else 0
-
-        try:
-            if all(len(sym) == 1 for sym in symbols):
-                # symbols are just single characters, create range regex pattern
-                patt = f"[{''.join(_escape_regex_range_chars(sym) for sym in symbols)}]"
-            else:
-                patt = "|".join(re.escape(sym) for sym in symbols)
-
-            # wrap with \b word break markers if defining as keywords
-            if asKeyword:
-                patt = rf"\b(?:{patt})\b"
-
-            ret = Regex(patt, flags=re_flags).set_name(" | ".join(symbols))
-
-            if caseless:
-                # add parse action to return symbols as specified, not in random
-                # casing as found in input string
-                symbol_map = {sym.lower(): sym for sym in symbols}
-                ret.add_parse_action(lambda s, l, t: symbol_map[t[0].lower()])
-
-            return ret
-
-        except re.error:
-            warnings.warn(
-                "Exception creating Regex for one_of, building MatchFirst", stacklevel=2
-            )
-
-    # last resort, just use MatchFirst
-    return MatchFirst(parse_element_class(sym) for sym in symbols).set_name(
-        " | ".join(symbols)
-    )
-
-
-def dict_of(key: ParserElement, value: ParserElement) -> ParserElement:
-    """Helper to easily and clearly define a dictionary by specifying
-    the respective patterns for the key and value.  Takes care of
-    defining the :class:`Dict`, :class:`ZeroOrMore`, and
-    :class:`Group` tokens in the proper order.  The key pattern
-    can include delimiting markers or punctuation, as long as they are
-    suppressed, thereby leaving the significant key text.  The value
-    pattern can include named results, so that the :class:`Dict` results
-    can include named token fields.
-
-    Example::
-
-        text = "shape: SQUARE posn: upper left color: light blue texture: burlap"
-        attr_expr = (label + Suppress(':') + OneOrMore(data_word, stop_on=label).set_parse_action(' '.join))
-        print(attr_expr[1, ...].parse_string(text).dump())
-
-        attr_label = label
-        attr_value = Suppress(':') + OneOrMore(data_word, stop_on=label).set_parse_action(' '.join)
-
-        # similar to Dict, but simpler call format
-        result = dict_of(attr_label, attr_value).parse_string(text)
-        print(result.dump())
-        print(result['shape'])
-        print(result.shape)  # object attribute access works too
-        print(result.as_dict())
-
-    prints::
-
-        [['shape', 'SQUARE'], ['posn', 'upper left'], ['color', 'light blue'], ['texture', 'burlap']]
-        - color: 'light blue'
-        - posn: 'upper left'
-        - shape: 'SQUARE'
-        - texture: 'burlap'
-        SQUARE
-        SQUARE
-        {'color': 'light blue', 'shape': 'SQUARE', 'posn': 'upper left', 'texture': 'burlap'}
-    """
-    return Dict(OneOrMore(Group(key + value)))
-
-
-def original_text_for(
-    expr: ParserElement, as_string: bool = True, *, asString: bool = True
-) -> ParserElement:
-    """Helper to return the original, untokenized text for a given
-    expression.  Useful to restore the parsed fields of an HTML start
-    tag into the raw tag text itself, or to revert separate tokens with
-    intervening whitespace back to the original matching input text. By
-    default, returns a string containing the original parsed text.
-
-    If the optional ``as_string`` argument is passed as
-    ``False``, then the return value is
-    a :class:`ParseResults` containing any results names that
-    were originally matched, and a single token containing the original
-    matched text from the input string.  So if the expression passed to
-    :class:`original_text_for` contains expressions with defined
-    results names, you must set ``as_string`` to ``False`` if you
-    want to preserve those results name values.
-
-    The ``asString`` pre-PEP8 argument is retained for compatibility,
-    but will be removed in a future release.
-
-    Example::
-
-        src = "this is test <b> bold <i>text</i> </b> normal text "
-        for tag in ("b", "i"):
-            opener, closer = make_html_tags(tag)
-            patt = original_text_for(opener + ... + closer)
-            print(patt.search_string(src)[0])
-
-    prints::
-
-        ['<b> bold <i>text</i> </b>']
-        ['<i>text</i>']
-    """
-    asString = asString and as_string
-
-    locMarker = Empty().set_parse_action(lambda s, loc, t: loc)
-    endlocMarker = locMarker.copy()
-    endlocMarker.callPreparse = False
-    matchExpr = locMarker("_original_start") + expr + endlocMarker("_original_end")
-    if asString:
-        extractText = lambda s, l, t: s[t._original_start : t._original_end]
-    else:
-
-        def extractText(s, l, t):
-            t[:] = [s[t.pop("_original_start") : t.pop("_original_end")]]
-
-    matchExpr.set_parse_action(extractText)
-    matchExpr.ignoreExprs = expr.ignoreExprs
-    matchExpr.suppress_warning(Diagnostics.warn_ungrouped_named_tokens_in_collection)
-    return matchExpr
-
-
-def ungroup(expr: ParserElement) -> ParserElement:
-    """Helper to undo pyparsing's default grouping of And expressions,
-    even if all but one are non-empty.
-    """
-    return TokenConverter(expr).add_parse_action(lambda t: t[0])
-
-
-def locatedExpr(expr: ParserElement) -> ParserElement:
-    """
-    (DEPRECATED - future code should use the :class:`Located` class)
-    Helper to decorate a returned token with its starting and ending
-    locations in the input string.
-
-    This helper adds the following results names:
-
-    - ``locn_start`` - location where matched expression begins
-    - ``locn_end`` - location where matched expression ends
-    - ``value`` - the actual parsed results
-
-    Be careful if the input text contains ``<TAB>`` characters, you
-    may want to call :class:`ParserElement.parse_with_tabs`
-
-    Example::
-
-        wd = Word(alphas)
-        for match in locatedExpr(wd).search_string("ljsdf123lksdjjf123lkkjj1222"):
-            print(match)
-
-    prints::
-
-        [[0, 'ljsdf', 5]]
-        [[8, 'lksdjjf', 15]]
-        [[18, 'lkkjj', 23]]
-    """
-    locator = Empty().set_parse_action(lambda ss, ll, tt: ll)
-    return Group(
-        locator("locn_start")
-        + expr("value")
-        + locator.copy().leaveWhitespace()("locn_end")
-    )
-
-
-def nested_expr(
-    opener: Union[str, ParserElement] = "(",
-    closer: Union[str, ParserElement] = ")",
-    content: typing.Optional[ParserElement] = None,
-    ignore_expr: ParserElement = quoted_string(),
-    *,
-    ignoreExpr: ParserElement = quoted_string(),
-) -> ParserElement:
-    """Helper method for defining nested lists enclosed in opening and
-    closing delimiters (``"("`` and ``")"`` are the default).
-
-    Parameters:
-
-    - ``opener`` - opening character for a nested list
-      (default= ``"("``); can also be a pyparsing expression
-    - ``closer`` - closing character for a nested list
-      (default= ``")"``); can also be a pyparsing expression
-    - ``content`` - expression for items within the nested lists
-      (default= ``None``)
-    - ``ignore_expr`` - expression for ignoring opening and closing delimiters
-      (default= :class:`quoted_string`)
-    - ``ignoreExpr`` - this pre-PEP8 argument is retained for compatibility
-      but will be removed in a future release
-
-    If an expression is not provided for the content argument, the
-    nested expression will capture all whitespace-delimited content
-    between delimiters as a list of separate values.
-
-    Use the ``ignore_expr`` argument to define expressions that may
-    contain opening or closing characters that should not be treated as
-    opening or closing characters for nesting, such as quoted_string or
-    a comment expression.  Specify multiple expressions using an
-    :class:`Or` or :class:`MatchFirst`. The default is
-    :class:`quoted_string`, but if no expressions are to be ignored, then
-    pass ``None`` for this argument.
-
-    Example::
-
-        data_type = one_of("void int short long char float double")
-        decl_data_type = Combine(data_type + Opt(Word('*')))
-        ident = Word(alphas+'_', alphanums+'_')
-        number = pyparsing_common.number
-        arg = Group(decl_data_type + ident)
-        LPAR, RPAR = map(Suppress, "()")
-
-        code_body = nested_expr('{', '}', ignore_expr=(quoted_string | c_style_comment))
-
-        c_function = (decl_data_type("type")
-                      + ident("name")
-                      + LPAR + Opt(DelimitedList(arg), [])("args") + RPAR
-                      + code_body("body"))
-        c_function.ignore(c_style_comment)
-
-        source_code = '''
-            int is_odd(int x) {
-                return (x%2);
-            }
-
-            int dec_to_hex(char hchar) {
-                if (hchar >= '0' && hchar <= '9') {
-                    return (ord(hchar)-ord('0'));
-                } else {
-                    return (10+ord(hchar)-ord('A'));
-                }
-            }
-        '''
-        for func in c_function.search_string(source_code):
-            print("%(name)s (%(type)s) args: %(args)s" % func)
-
-
-    prints::
-
-        is_odd (int) args: [['int', 'x']]
-        dec_to_hex (int) args: [['char', 'hchar']]
-    """
-    if ignoreExpr != ignore_expr:
-        ignoreExpr = ignore_expr if ignoreExpr == quoted_string() else ignoreExpr
-    if opener == closer:
-        raise ValueError("opening and closing strings cannot be the same")
-    if content is None:
-        if isinstance(opener, str_type) and isinstance(closer, str_type):
-            opener = typing.cast(str, opener)
-            closer = typing.cast(str, closer)
-            if len(opener) == 1 and len(closer) == 1:
-                if ignoreExpr is not None:
-                    content = Combine(
-                        OneOrMore(
-                            ~ignoreExpr
-                            + CharsNotIn(
-                                opener + closer + ParserElement.DEFAULT_WHITE_CHARS,
-                                exact=1,
-                            )
-                        )
-                    ).set_parse_action(lambda t: t[0].strip())
-                else:
-                    content = empty.copy() + CharsNotIn(
-                        opener + closer + ParserElement.DEFAULT_WHITE_CHARS
-                    ).set_parse_action(lambda t: t[0].strip())
-            else:
-                if ignoreExpr is not None:
-                    content = Combine(
-                        OneOrMore(
-                            ~ignoreExpr
-                            + ~Literal(opener)
-                            + ~Literal(closer)
-                            + CharsNotIn(ParserElement.DEFAULT_WHITE_CHARS, exact=1)
-                        )
-                    ).set_parse_action(lambda t: t[0].strip())
-                else:
-                    content = Combine(
-                        OneOrMore(
-                            ~Literal(opener)
-                            + ~Literal(closer)
-                            + CharsNotIn(ParserElement.DEFAULT_WHITE_CHARS, exact=1)
-                        )
-                    ).set_parse_action(lambda t: t[0].strip())
-        else:
-            raise ValueError(
-                "opening and closing arguments must be strings if no content expression is given"
-            )
-    ret = Forward()
-    if ignoreExpr is not None:
-        ret <<= Group(
-            Suppress(opener) + ZeroOrMore(ignoreExpr | ret | content) + Suppress(closer)
-        )
-    else:
-        ret <<= Group(Suppress(opener) + ZeroOrMore(ret | content) + Suppress(closer))
-    ret.set_name(f"nested {opener}{closer} expression")
-    # don't override error message from content expressions
-    ret.errmsg = None
-    return ret
-
-
-def _makeTags(tagStr, xml, suppress_LT=Suppress("<"), suppress_GT=Suppress(">")):
-    """Internal helper to construct opening and closing tag expressions, given a tag name"""
-    if isinstance(tagStr, str_type):
-        resname = tagStr
-        tagStr = Keyword(tagStr, caseless=not xml)
-    else:
-        resname = tagStr.name
-
-    tagAttrName = Word(alphas, alphanums + "_-:")
-    if xml:
-        tagAttrValue = dbl_quoted_string.copy().set_parse_action(remove_quotes)
-        openTag = (
-            suppress_LT
-            + tagStr("tag")
-            + Dict(ZeroOrMore(Group(tagAttrName + Suppress("=") + tagAttrValue)))
-            + Opt("/", default=[False])("empty").set_parse_action(
-                lambda s, l, t: t[0] == "/"
-            )
-            + suppress_GT
-        )
-    else:
-        tagAttrValue = quoted_string.copy().set_parse_action(remove_quotes) | Word(
-            printables, exclude_chars=">"
-        )
-        openTag = (
-            suppress_LT
-            + tagStr("tag")
-            + Dict(
-                ZeroOrMore(
-                    Group(
-                        tagAttrName.set_parse_action(lambda t: t[0].lower())
-                        + Opt(Suppress("=") + tagAttrValue)
-                    )
-                )
-            )
-            + Opt("/", default=[False])("empty").set_parse_action(
-                lambda s, l, t: t[0] == "/"
-            )
-            + suppress_GT
-        )
-    closeTag = Combine(Literal("</") + tagStr + ">", adjacent=False)
-
-    openTag.set_name(f"<{resname}>")
-    # add start<tagname> results name in parse action now that ungrouped names are not reported at two levels
-    openTag.add_parse_action(
-        lambda t: t.__setitem__(
-            "start" + "".join(resname.replace(":", " ").title().split()), t.copy()
-        )
-    )
-    closeTag = closeTag(
-        "end" + "".join(resname.replace(":", " ").title().split())
-    ).set_name(f"</{resname}>")
-    openTag.tag = resname
-    closeTag.tag = resname
-    openTag.tag_body = SkipTo(closeTag())
-    return openTag, closeTag
-
-
-def make_html_tags(
-    tag_str: Union[str, ParserElement]
-) -> tuple[ParserElement, ParserElement]:
-    """Helper to construct opening and closing tag expressions for HTML,
-    given a tag name. Matches tags in either upper or lower case,
-    attributes with namespaces and with quoted or unquoted values.
-
-    Example::
-
-        text = '<td>More info at the <a href="https://github.com/pyparsing/pyparsing/wiki">pyparsing</a> wiki page</td>'
-        # make_html_tags returns pyparsing expressions for the opening and
-        # closing tags as a 2-tuple
-        a, a_end = make_html_tags("A")
-        link_expr = a + SkipTo(a_end)("link_text") + a_end
-
-        for link in link_expr.search_string(text):
-            # attributes in the <A> tag (like "href" shown here) are
-            # also accessible as named results
-            print(link.link_text, '->', link.href)
-
-    prints::
-
-        pyparsing -> https://github.com/pyparsing/pyparsing/wiki
-    """
-    return _makeTags(tag_str, False)
-
-
-def make_xml_tags(
-    tag_str: Union[str, ParserElement]
-) -> tuple[ParserElement, ParserElement]:
-    """Helper to construct opening and closing tag expressions for XML,
-    given a tag name. Matches tags only in the given upper/lower case.
-
-    Example: similar to :class:`make_html_tags`
-    """
-    return _makeTags(tag_str, True)
-
-
-any_open_tag: ParserElement
-any_close_tag: ParserElement
-any_open_tag, any_close_tag = make_html_tags(
-    Word(alphas, alphanums + "_:").set_name("any tag")
-)
-
-_htmlEntityMap = {k.rstrip(";"): v for k, v in html.entities.html5.items()}
-_most_common_entities = "nbsp lt gt amp quot apos cent pound euro copy".replace(
-    " ", "|"
-)
-common_html_entity = Regex(
-    lambda: f"&(?P<entity>{_most_common_entities}|{make_compressed_re(_htmlEntityMap)});"
-).set_name("common HTML entity")
-
-
-def replace_html_entity(s, l, t):
-    """Helper parser action to replace common HTML entities with their special characters"""
-    return _htmlEntityMap.get(t.entity)
-
-
-class OpAssoc(Enum):
-    """Enumeration of operator associativity
-    - used in constructing InfixNotationOperatorSpec for :class:`infix_notation`"""
-
-    LEFT = 1
-    RIGHT = 2
-
-
-InfixNotationOperatorArgType = Union[
-    ParserElement, str, tuple[Union[ParserElement, str], Union[ParserElement, str]]
-]
-InfixNotationOperatorSpec = Union[
-    tuple[
-        InfixNotationOperatorArgType,
-        int,
-        OpAssoc,
-        typing.Optional[ParseAction],
-    ],
-    tuple[
-        InfixNotationOperatorArgType,
-        int,
-        OpAssoc,
-    ],
-]
-
-
-def infix_notation(
-    base_expr: ParserElement,
-    op_list: list[InfixNotationOperatorSpec],
-    lpar: Union[str, ParserElement] = Suppress("("),
-    rpar: Union[str, ParserElement] = Suppress(")"),
-) -> ParserElement:
-    """Helper method for constructing grammars of expressions made up of
-    operators working in a precedence hierarchy.  Operators may be unary
-    or binary, left- or right-associative.  Parse actions can also be
-    attached to operator expressions. The generated parser will also
-    recognize the use of parentheses to override operator precedences
-    (see example below).
-
-    Note: if you define a deep operator list, you may see performance
-    issues when using infix_notation. See
-    :class:`ParserElement.enable_packrat` for a mechanism to potentially
-    improve your parser performance.
-
-    Parameters:
-
-    - ``base_expr`` - expression representing the most basic operand to
-      be used in the expression
-    - ``op_list`` - list of tuples, one for each operator precedence level
-      in the expression grammar; each tuple is of the form ``(op_expr,
-      num_operands, right_left_assoc, (optional)parse_action)``, where:
-
-      - ``op_expr`` is the pyparsing expression for the operator; may also
-        be a string, which will be converted to a Literal; if ``num_operands``
-        is 3, ``op_expr`` is a tuple of two expressions, for the two
-        operators separating the 3 terms
-      - ``num_operands`` is the number of terms for this operator (must be 1,
-        2, or 3)
-      - ``right_left_assoc`` is the indicator whether the operator is right
-        or left associative, using the pyparsing-defined constants
-        ``OpAssoc.RIGHT`` and ``OpAssoc.LEFT``.
-      - ``parse_action`` is the parse action to be associated with
-        expressions matching this operator expression (the parse action
-        tuple member may be omitted); if the parse action is passed
-        a tuple or list of functions, this is equivalent to calling
-        ``set_parse_action(*fn)``
-        (:class:`ParserElement.set_parse_action`)
-    - ``lpar`` - expression for matching left-parentheses; if passed as a
-      str, then will be parsed as ``Suppress(lpar)``. If lpar is passed as
-      an expression (such as ``Literal('(')``), then it will be kept in
-      the parsed results, and grouped with them. (default= ``Suppress('(')``)
-    - ``rpar`` - expression for matching right-parentheses; if passed as a
-      str, then will be parsed as ``Suppress(rpar)``. If rpar is passed as
-      an expression (such as ``Literal(')')``), then it will be kept in
-      the parsed results, and grouped with them. (default= ``Suppress(')')``)
-
-    Example::
-
-        # simple example of four-function arithmetic with ints and
-        # variable names
-        integer = pyparsing_common.signed_integer
-        varname = pyparsing_common.identifier
-
-        arith_expr = infix_notation(integer | varname,
-            [
-            ('-', 1, OpAssoc.RIGHT),
-            (one_of('* /'), 2, OpAssoc.LEFT),
-            (one_of('+ -'), 2, OpAssoc.LEFT),
-            ])
-
-        arith_expr.run_tests('''
-            5+3*6
-            (5+3)*6
-            -2--11
-            ''', full_dump=False)
-
-    prints::
-
-        5+3*6
-        [[5, '+', [3, '*', 6]]]
-
-        (5+3)*6
-        [[[5, '+', 3], '*', 6]]
-
-        (5+x)*y
-        [[[5, '+', 'x'], '*', 'y']]
-
-        -2--11
-        [[['-', 2], '-', ['-', 11]]]
-    """
-
-    # captive version of FollowedBy that does not do parse actions or capture results names
-    class _FB(FollowedBy):
-        def parseImpl(self, instring, loc, doActions=True):
-            self.expr.try_parse(instring, loc)
-            return loc, []
-
-    _FB.__name__ = "FollowedBy>"
-
-    ret = Forward()
-    if isinstance(lpar, str):
-        lpar = Suppress(lpar)
-    if isinstance(rpar, str):
-        rpar = Suppress(rpar)
-
-    # if lpar and rpar are not suppressed, wrap in group
-    if not (isinstance(lpar, Suppress) and isinstance(rpar, Suppress)):
-        lastExpr = base_expr | Group(lpar + ret + rpar).set_name(
-            f"nested_{base_expr.name}"
-        )
-    else:
-        lastExpr = base_expr | (lpar + ret + rpar).set_name(f"nested_{base_expr.name}")
-    root_expr = lastExpr
-
-    arity: int
-    rightLeftAssoc: opAssoc
-    pa: typing.Optional[ParseAction]
-    opExpr1: ParserElement
-    opExpr2: ParserElement
-    for operDef in op_list:
-        opExpr, arity, rightLeftAssoc, pa = (operDef + (None,))[:4]  # type: ignore[assignment]
-        if isinstance(opExpr, str_type):
-            opExpr = ParserElement._literalStringClass(opExpr)
-        opExpr = typing.cast(ParserElement, opExpr)
-        if arity == 3:
-            if not isinstance(opExpr, (tuple, list)) or len(opExpr) != 2:
-                raise ValueError(
-                    "if numterms=3, opExpr must be a tuple or list of two expressions"
-                )
-            opExpr1, opExpr2 = opExpr
-            term_name = f"{opExpr1}{opExpr2} term"
-        else:
-            term_name = f"{opExpr} term"
-
-        if not 1 <= arity <= 3:
-            raise ValueError("operator must be unary (1), binary (2), or ternary (3)")
-
-        if rightLeftAssoc not in (OpAssoc.LEFT, OpAssoc.RIGHT):
-            raise ValueError("operator must indicate right or left associativity")
-
-        thisExpr: ParserElement = Forward().set_name(term_name)
-        thisExpr = typing.cast(Forward, thisExpr)
-        if rightLeftAssoc is OpAssoc.LEFT:
-            if arity == 1:
-                matchExpr = _FB(lastExpr + opExpr) + Group(lastExpr + opExpr[1, ...])
-            elif arity == 2:
-                if opExpr is not None:
-                    matchExpr = _FB(lastExpr + opExpr + lastExpr) + Group(
-                        lastExpr + (opExpr + lastExpr)[1, ...]
-                    )
-                else:
-                    matchExpr = _FB(lastExpr + lastExpr) + Group(lastExpr[2, ...])
-            elif arity == 3:
-                matchExpr = _FB(
-                    lastExpr + opExpr1 + lastExpr + opExpr2 + lastExpr
-                ) + Group(lastExpr + OneOrMore(opExpr1 + lastExpr + opExpr2 + lastExpr))
-        elif rightLeftAssoc is OpAssoc.RIGHT:
-            if arity == 1:
-                # try to avoid LR with this extra test
-                if not isinstance(opExpr, Opt):
-                    opExpr = Opt(opExpr)
-                matchExpr = _FB(opExpr.expr + thisExpr) + Group(opExpr + thisExpr)
-            elif arity == 2:
-                if opExpr is not None:
-                    matchExpr = _FB(lastExpr + opExpr + thisExpr) + Group(
-                        lastExpr + (opExpr + thisExpr)[1, ...]
-                    )
-                else:
-                    matchExpr = _FB(lastExpr + thisExpr) + Group(
-                        lastExpr + thisExpr[1, ...]
-                    )
-            elif arity == 3:
-                matchExpr = _FB(
-                    lastExpr + opExpr1 + thisExpr + opExpr2 + thisExpr
-                ) + Group(lastExpr + opExpr1 + thisExpr + opExpr2 + thisExpr)
-        if pa:
-            if isinstance(pa, (tuple, list)):
-                matchExpr.set_parse_action(*pa)
-            else:
-                matchExpr.set_parse_action(pa)
-        thisExpr <<= (matchExpr | lastExpr).setName(term_name)
-        lastExpr = thisExpr
-    ret <<= lastExpr
-    root_expr.set_name("base_expr")
-    return ret
-
-
-def indentedBlock(blockStatementExpr, indentStack, indent=True, backup_stacks=[]):
-    """
-    (DEPRECATED - use :class:`IndentedBlock` class instead)
-    Helper method for defining space-delimited indentation blocks,
-    such as those used to define block statements in Python source code.
-
-    Parameters:
-
-    - ``blockStatementExpr`` - expression defining syntax of statement that
-      is repeated within the indented block
-    - ``indentStack`` - list created by caller to manage indentation stack
-      (multiple ``statementWithIndentedBlock`` expressions within a single
-      grammar should share a common ``indentStack``)
-    - ``indent`` - boolean indicating whether block must be indented beyond
-      the current level; set to ``False`` for block of left-most statements
-      (default= ``True``)
-
-    A valid block must contain at least one ``blockStatement``.
-
-    (Note that indentedBlock uses internal parse actions which make it
-    incompatible with packrat parsing.)
-
-    Example::
-
-        data = '''
-        def A(z):
-          A1
-          B = 100
-          G = A2
-          A2
-          A3
-        B
-        def BB(a,b,c):
-          BB1
-          def BBA():
-            bba1
-            bba2
-            bba3
-        C
-        D
-        def spam(x,y):
-             def eggs(z):
-                 pass
-        '''
-
-
-        indentStack = [1]
-        stmt = Forward()
-
-        identifier = Word(alphas, alphanums)
-        funcDecl = ("def" + identifier + Group("(" + Opt(delimitedList(identifier)) + ")") + ":")
-        func_body = indentedBlock(stmt, indentStack)
-        funcDef = Group(funcDecl + func_body)
-
-        rvalue = Forward()
-        funcCall = Group(identifier + "(" + Opt(delimitedList(rvalue)) + ")")
-        rvalue << (funcCall | identifier | Word(nums))
-        assignment = Group(identifier + "=" + rvalue)
-        stmt << (funcDef | assignment | identifier)
-
-        module_body = stmt[1, ...]
-
-        parseTree = module_body.parseString(data)
-        parseTree.pprint()
-
-    prints::
-
-        [['def',
-          'A',
-          ['(', 'z', ')'],
-          ':',
-          [['A1'], [['B', '=', '100']], [['G', '=', 'A2']], ['A2'], ['A3']]],
-         'B',
-         ['def',
-          'BB',
-          ['(', 'a', 'b', 'c', ')'],
-          ':',
-          [['BB1'], [['def', 'BBA', ['(', ')'], ':', [['bba1'], ['bba2'], ['bba3']]]]]],
-         'C',
-         'D',
-         ['def',
-          'spam',
-          ['(', 'x', 'y', ')'],
-          ':',
-          [[['def', 'eggs', ['(', 'z', ')'], ':', [['pass']]]]]]]
-    """
-    backup_stacks.append(indentStack[:])
-
-    def reset_stack():
-        indentStack[:] = backup_stacks[-1]
-
-    def checkPeerIndent(s, l, t):
-        if l >= len(s):
-            return
-        curCol = col(l, s)
-        if curCol != indentStack[-1]:
-            if curCol > indentStack[-1]:
-                raise ParseException(s, l, "illegal nesting")
-            raise ParseException(s, l, "not a peer entry")
-
-    def checkSubIndent(s, l, t):
-        curCol = col(l, s)
-        if curCol > indentStack[-1]:
-            indentStack.append(curCol)
-        else:
-            raise ParseException(s, l, "not a subentry")
-
-    def checkUnindent(s, l, t):
-        if l >= len(s):
-            return
-        curCol = col(l, s)
-        if not (indentStack and curCol in indentStack):
-            raise ParseException(s, l, "not an unindent")
-        if curCol < indentStack[-1]:
-            indentStack.pop()
-
-    NL = OneOrMore(LineEnd().set_whitespace_chars("\t ").suppress())
-    INDENT = (Empty() + Empty().set_parse_action(checkSubIndent)).set_name("INDENT")
-    PEER = Empty().set_parse_action(checkPeerIndent).set_name("")
-    UNDENT = Empty().set_parse_action(checkUnindent).set_name("UNINDENT")
-    if indent:
-        smExpr = Group(
-            Opt(NL)
-            + INDENT
-            + OneOrMore(PEER + Group(blockStatementExpr) + Opt(NL))
-            + UNDENT
-        )
-    else:
-        smExpr = Group(
-            Opt(NL)
-            + OneOrMore(PEER + Group(blockStatementExpr) + Opt(NL))
-            + Opt(UNDENT)
-        )
-
-    # add a parse action to remove backup_stack from list of backups
-    smExpr.add_parse_action(
-        lambda: backup_stacks.pop(-1) and None if backup_stacks else None
-    )
-    smExpr.set_fail_action(lambda a, b, c, d: reset_stack())
-    blockStatementExpr.ignore(_bslash + LineEnd())
-    return smExpr.set_name("indented block")
-
-
-# it's easy to get these comment structures wrong - they're very common, so may as well make them available
-c_style_comment = Combine(Regex(r"/\*(?:[^*]|\*(?!/))*") + "*/").set_name(
-    "C style comment"
-)
-"Comment of the form ``/* ... */``"
-
-html_comment = Regex(r"<!--[\s\S]*?-->").set_name("HTML comment")
-"Comment of the form ``<!-- ... -->``"
-
-rest_of_line = Regex(r".*").leave_whitespace().set_name("rest of line")
-dbl_slash_comment = Regex(r"//(?:\\\n|[^\n])*").set_name("// comment")
-"Comment of the form ``// ... (to end of line)``"
-
-cpp_style_comment = Combine(
-    Regex(r"/\*(?:[^*]|\*(?!/))*") + "*/" | dbl_slash_comment
-).set_name("C++ style comment")
-"Comment of either form :class:`c_style_comment` or :class:`dbl_slash_comment`"
-
-java_style_comment = cpp_style_comment
-"Same as :class:`cpp_style_comment`"
-
-python_style_comment = Regex(r"#.*").set_name("Python style comment")
-"Comment of the form ``# ... (to end of line)``"
-
-
-# build list of built-in expressions, for future reference if a global default value
-# gets updated
-_builtin_exprs: list[ParserElement] = [
-    v for v in vars().values() if isinstance(v, ParserElement)
-]
-
-
-# compatibility function, superseded by DelimitedList class
-def delimited_list(
-    expr: Union[str, ParserElement],
-    delim: Union[str, ParserElement] = ",",
-    combine: bool = False,
-    min: typing.Optional[int] = None,
-    max: typing.Optional[int] = None,
-    *,
-    allow_trailing_delim: bool = False,
-) -> ParserElement:
-    """(DEPRECATED - use :class:`DelimitedList` class)"""
-    return DelimitedList(
-        expr, delim, combine, min, max, allow_trailing_delim=allow_trailing_delim
-    )
-
-
-# Compatibility synonyms
-# fmt: off
-opAssoc = OpAssoc
-anyOpenTag = any_open_tag
-anyCloseTag = any_close_tag
-commonHTMLEntity = common_html_entity
-cStyleComment = c_style_comment
-htmlComment = html_comment
-restOfLine = rest_of_line
-dblSlashComment = dbl_slash_comment
-cppStyleComment = cpp_style_comment
-javaStyleComment = java_style_comment
-pythonStyleComment = python_style_comment
-delimitedList = replaced_by_pep8("delimitedList", DelimitedList)
-delimited_list = replaced_by_pep8("delimited_list", DelimitedList)
-countedArray = replaced_by_pep8("countedArray", counted_array)
-matchPreviousLiteral = replaced_by_pep8("matchPreviousLiteral", match_previous_literal)
-matchPreviousExpr = replaced_by_pep8("matchPreviousExpr", match_previous_expr)
-oneOf = replaced_by_pep8("oneOf", one_of)
-dictOf = replaced_by_pep8("dictOf", dict_of)
-originalTextFor = replaced_by_pep8("originalTextFor", original_text_for)
-nestedExpr = replaced_by_pep8("nestedExpr", nested_expr)
-makeHTMLTags = replaced_by_pep8("makeHTMLTags", make_html_tags)
-makeXMLTags = replaced_by_pep8("makeXMLTags", make_xml_tags)
-replaceHTMLEntity = replaced_by_pep8("replaceHTMLEntity", replace_html_entity)
-infixNotation = replaced_by_pep8("infixNotation", infix_notation)
-# fmt: on
diff --git a/lib/pyparsing/py.typed b/lib/pyparsing/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/pyparsing/results.py b/lib/pyparsing/results.py
deleted file mode 100644
index 24584783..00000000
--- a/lib/pyparsing/results.py
+++ /dev/null
@@ -1,815 +0,0 @@
-# results.py
-from __future__ import annotations
-
-import collections
-from collections.abc import (
-    MutableMapping,
-    Mapping,
-    MutableSequence,
-    Iterator,
-    Iterable,
-)
-import pprint
-from typing import Any
-
-from .util import replaced_by_pep8
-
-
-str_type: tuple[type, ...] = (str, bytes)
-_generator_type = type((_ for _ in ()))
-
-
-class _ParseResultsWithOffset:
-    tup: tuple[ParseResults, int]
-    __slots__ = ["tup"]
-
-    def __init__(self, p1: ParseResults, p2: int):
-        self.tup: tuple[ParseResults, int] = (p1, p2)
-
-    def __getitem__(self, i):
-        return self.tup[i]
-
-    def __getstate__(self):
-        return self.tup
-
-    def __setstate__(self, *args):
-        self.tup = args[0]
-
-
-class ParseResults:
-    """Structured parse results, to provide multiple means of access to
-    the parsed data:
-
-    - as a list (``len(results)``)
-    - by list index (``results[0], results[1]``, etc.)
-    - by attribute (``results.<results_name>`` - see :class:`ParserElement.set_results_name`)
-
-    Example::
-
-        integer = Word(nums)
-        date_str = (integer.set_results_name("year") + '/'
-                    + integer.set_results_name("month") + '/'
-                    + integer.set_results_name("day"))
-        # equivalent form:
-        # date_str = (integer("year") + '/'
-        #             + integer("month") + '/'
-        #             + integer("day"))
-
-        # parse_string returns a ParseResults object
-        result = date_str.parse_string("1999/12/31")
-
-        def test(s, fn=repr):
-            print(f"{s} -> {fn(eval(s))}")
-        test("list(result)")
-        test("result[0]")
-        test("result['month']")
-        test("result.day")
-        test("'month' in result")
-        test("'minutes' in result")
-        test("result.dump()", str)
-
-    prints::
-
-        list(result) -> ['1999', '/', '12', '/', '31']
-        result[0] -> '1999'
-        result['month'] -> '12'
-        result.day -> '31'
-        'month' in result -> True
-        'minutes' in result -> False
-        result.dump() -> ['1999', '/', '12', '/', '31']
-        - day: '31'
-        - month: '12'
-        - year: '1999'
-    """
-
-    _null_values: tuple[Any, ...] = (None, [], ())
-
-    _name: str
-    _parent: ParseResults
-    _all_names: set[str]
-    _modal: bool
-    _toklist: list[Any]
-    _tokdict: dict[str, Any]
-
-    __slots__ = (
-        "_name",
-        "_parent",
-        "_all_names",
-        "_modal",
-        "_toklist",
-        "_tokdict",
-    )
-
-    class List(list):
-        """
-        Simple wrapper class to distinguish parsed list results that should be preserved
-        as actual Python lists, instead of being converted to :class:`ParseResults`::
-
-            LBRACK, RBRACK = map(pp.Suppress, "[]")
-            element = pp.Forward()
-            item = ppc.integer
-            element_list = LBRACK + pp.DelimitedList(element) + RBRACK
-
-            # add parse actions to convert from ParseResults to actual Python collection types
-            def as_python_list(t):
-                return pp.ParseResults.List(t.as_list())
-            element_list.add_parse_action(as_python_list)
-
-            element <<= item | element_list
-
-            element.run_tests('''
-                100
-                [2,3,4]
-                [[2, 1],3,4]
-                [(2, 1),3,4]
-                (2,3,4)
-                ''', post_parse=lambda s, r: (r[0], type(r[0])))
-
-        prints::
-
-            100
-            (100, <class 'int'>)
-
-            [2,3,4]
-            ([2, 3, 4], <class 'list'>)
-
-            [[2, 1],3,4]
-            ([[2, 1], 3, 4], <class 'list'>)
-
-        (Used internally by :class:`Group` when `aslist=True`.)
-        """
-
-        def __new__(cls, contained=None):
-            if contained is None:
-                contained = []
-
-            if not isinstance(contained, list):
-                raise TypeError(
-                    f"{cls.__name__} may only be constructed with a list, not {type(contained).__name__}"
-                )
-
-            return list.__new__(cls)
-
-    def __new__(cls, toklist=None, name=None, **kwargs):
-        if isinstance(toklist, ParseResults):
-            return toklist
-        self = object.__new__(cls)
-        self._name = None
-        self._parent = None
-        self._all_names = set()
-
-        if toklist is None:
-            self._toklist = []
-        elif isinstance(toklist, (list, _generator_type)):
-            self._toklist = (
-                [toklist[:]]
-                if isinstance(toklist, ParseResults.List)
-                else list(toklist)
-            )
-        else:
-            self._toklist = [toklist]
-        self._tokdict = dict()
-        return self
-
-    # Performance tuning: we construct a *lot* of these, so keep this
-    # constructor as small and fast as possible
-    def __init__(
-        self, toklist=None, name=None, asList=True, modal=True, isinstance=isinstance
-    ) -> None:
-        self._tokdict: dict[str, _ParseResultsWithOffset]
-        self._modal = modal
-
-        if name is None or name == "":
-            return
-
-        if isinstance(name, int):
-            name = str(name)
-
-        if not modal:
-            self._all_names = {name}
-
-        self._name = name
-
-        if toklist in self._null_values:
-            return
-
-        if isinstance(toklist, (str_type, type)):
-            toklist = [toklist]
-
-        if asList:
-            if isinstance(toklist, ParseResults):
-                self[name] = _ParseResultsWithOffset(ParseResults(toklist._toklist), 0)
-            else:
-                self[name] = _ParseResultsWithOffset(ParseResults(toklist[0]), 0)
-            self[name]._name = name
-            return
-
-        try:
-            self[name] = toklist[0]
-        except (KeyError, TypeError, IndexError):
-            if toklist is not self:
-                self[name] = toklist
-            else:
-                self._name = name
-
-    def __getitem__(self, i):
-        if isinstance(i, (int, slice)):
-            return self._toklist[i]
-
-        if i not in self._all_names:
-            return self._tokdict[i][-1][0]
-
-        return ParseResults([v[0] for v in self._tokdict[i]])
-
-    def __setitem__(self, k, v, isinstance=isinstance):
-        if isinstance(v, _ParseResultsWithOffset):
-            self._tokdict[k] = self._tokdict.get(k, list()) + [v]
-            sub = v[0]
-        elif isinstance(k, (int, slice)):
-            self._toklist[k] = v
-            sub = v
-        else:
-            self._tokdict[k] = self._tokdict.get(k, []) + [
-                _ParseResultsWithOffset(v, 0)
-            ]
-            sub = v
-        if isinstance(sub, ParseResults):
-            sub._parent = self
-
-    def __delitem__(self, i):
-        if not isinstance(i, (int, slice)):
-            del self._tokdict[i]
-            return
-
-        mylen = len(self._toklist)
-        del self._toklist[i]
-
-        # convert int to slice
-        if isinstance(i, int):
-            if i < 0:
-                i += mylen
-            i = slice(i, i + 1)
-        # get removed indices
-        removed = list(range(*i.indices(mylen)))
-        removed.reverse()
-        # fixup indices in token dictionary
-        for occurrences in self._tokdict.values():
-            for j in removed:
-                for k, (value, position) in enumerate(occurrences):
-                    occurrences[k] = _ParseResultsWithOffset(
-                        value, position - (position > j)
-                    )
-
-    def __contains__(self, k) -> bool:
-        return k in self._tokdict
-
-    def __len__(self) -> int:
-        return len(self._toklist)
-
-    def __bool__(self) -> bool:
-        return not not (self._toklist or self._tokdict)
-
-    def __iter__(self) -> Iterator:
-        return iter(self._toklist)
-
-    def __reversed__(self) -> Iterator:
-        return iter(self._toklist[::-1])
-
-    def keys(self):
-        return iter(self._tokdict)
-
-    def values(self):
-        return (self[k] for k in self.keys())
-
-    def items(self):
-        return ((k, self[k]) for k in self.keys())
-
-    def haskeys(self) -> bool:
-        """
-        Since ``keys()`` returns an iterator, this method is helpful in bypassing
-        code that looks for the existence of any defined results names."""
-        return not not self._tokdict
-
-    def pop(self, *args, **kwargs):
-        """
-        Removes and returns item at specified index (default= ``last``).
-        Supports both ``list`` and ``dict`` semantics for ``pop()``. If
-        passed no argument or an integer argument, it will use ``list``
-        semantics and pop tokens from the list of parsed tokens. If passed
-        a non-integer argument (most likely a string), it will use ``dict``
-        semantics and pop the corresponding value from any defined results
-        names. A second default return value argument is supported, just as in
-        ``dict.pop()``.
-
-        Example::
-
-            numlist = Word(nums)[...]
-            print(numlist.parse_string("0 123 321")) # -> ['0', '123', '321']
-
-            def remove_first(tokens):
-                tokens.pop(0)
-            numlist.add_parse_action(remove_first)
-            print(numlist.parse_string("0 123 321")) # -> ['123', '321']
-
-            label = Word(alphas)
-            patt = label("LABEL") + Word(nums)[1, ...]
-            print(patt.parse_string("AAB 123 321").dump())
-
-            # Use pop() in a parse action to remove named result (note that corresponding value is not
-            # removed from list form of results)
-            def remove_LABEL(tokens):
-                tokens.pop("LABEL")
-                return tokens
-            patt.add_parse_action(remove_LABEL)
-            print(patt.parse_string("AAB 123 321").dump())
-
-        prints::
-
-            ['AAB', '123', '321']
-            - LABEL: 'AAB'
-
-            ['AAB', '123', '321']
-        """
-        if not args:
-            args = [-1]
-        for k, v in kwargs.items():
-            if k == "default":
-                args = (args[0], v)
-            else:
-                raise TypeError(f"pop() got an unexpected keyword argument {k!r}")
-        if isinstance(args[0], int) or len(args) == 1 or args[0] in self:
-            index = args[0]
-            ret = self[index]
-            del self[index]
-            return ret
-        else:
-            defaultvalue = args[1]
-            return defaultvalue
-
-    def get(self, key, default_value=None):
-        """
-        Returns named result matching the given key, or if there is no
-        such name, then returns the given ``default_value`` or ``None`` if no
-        ``default_value`` is specified.
-
-        Similar to ``dict.get()``.
-
-        Example::
-
-            integer = Word(nums)
-            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
-
-            result = date_str.parse_string("1999/12/31")
-            print(result.get("year")) # -> '1999'
-            print(result.get("hour", "not specified")) # -> 'not specified'
-            print(result.get("hour")) # -> None
-        """
-        if key in self:
-            return self[key]
-        else:
-            return default_value
-
-    def insert(self, index, ins_string):
-        """
-        Inserts new element at location index in the list of parsed tokens.
-
-        Similar to ``list.insert()``.
-
-        Example::
-
-            numlist = Word(nums)[...]
-            print(numlist.parse_string("0 123 321")) # -> ['0', '123', '321']
-
-            # use a parse action to insert the parse location in the front of the parsed results
-            def insert_locn(locn, tokens):
-                tokens.insert(0, locn)
-            numlist.add_parse_action(insert_locn)
-            print(numlist.parse_string("0 123 321")) # -> [0, '0', '123', '321']
-        """
-        self._toklist.insert(index, ins_string)
-        # fixup indices in token dictionary
-        for occurrences in self._tokdict.values():
-            for k, (value, position) in enumerate(occurrences):
-                occurrences[k] = _ParseResultsWithOffset(
-                    value, position + (position > index)
-                )
-
-    def append(self, item):
-        """
-        Add single element to end of ``ParseResults`` list of elements.
-
-        Example::
-
-            numlist = Word(nums)[...]
-            print(numlist.parse_string("0 123 321")) # -> ['0', '123', '321']
-
-            # use a parse action to compute the sum of the parsed integers, and add it to the end
-            def append_sum(tokens):
-                tokens.append(sum(map(int, tokens)))
-            numlist.add_parse_action(append_sum)
-            print(numlist.parse_string("0 123 321")) # -> ['0', '123', '321', 444]
-        """
-        self._toklist.append(item)
-
-    def extend(self, itemseq):
-        """
-        Add sequence of elements to end of ``ParseResults`` list of elements.
-
-        Example::
-
-            patt = Word(alphas)[1, ...]
-
-            # use a parse action to append the reverse of the matched strings, to make a palindrome
-            def make_palindrome(tokens):
-                tokens.extend(reversed([t[::-1] for t in tokens]))
-                return ''.join(tokens)
-            patt.add_parse_action(make_palindrome)
-            print(patt.parse_string("lskdj sdlkjf lksd")) # -> 'lskdjsdlkjflksddsklfjkldsjdksl'
-        """
-        if isinstance(itemseq, ParseResults):
-            self.__iadd__(itemseq)
-        else:
-            self._toklist.extend(itemseq)
-
-    def clear(self):
-        """
-        Clear all elements and results names.
-        """
-        del self._toklist[:]
-        self._tokdict.clear()
-
-    def __getattr__(self, name):
-        try:
-            return self[name]
-        except KeyError:
-            if name.startswith("__"):
-                raise AttributeError(name)
-            return ""
-
-    def __add__(self, other: ParseResults) -> ParseResults:
-        ret = self.copy()
-        ret += other
-        return ret
-
-    def __iadd__(self, other: ParseResults) -> ParseResults:
-        if not other:
-            return self
-
-        if other._tokdict:
-            offset = len(self._toklist)
-            addoffset = lambda a: offset if a < 0 else a + offset
-            otheritems = other._tokdict.items()
-            otherdictitems = [
-                (k, _ParseResultsWithOffset(v[0], addoffset(v[1])))
-                for k, vlist in otheritems
-                for v in vlist
-            ]
-            for k, v in otherdictitems:
-                self[k] = v
-                if isinstance(v[0], ParseResults):
-                    v[0]._parent = self
-
-        self._toklist += other._toklist
-        self._all_names |= other._all_names
-        return self
-
-    def __radd__(self, other) -> ParseResults:
-        if isinstance(other, int) and other == 0:
-            # useful for merging many ParseResults using sum() builtin
-            return self.copy()
-        else:
-            # this may raise a TypeError - so be it
-            return other + self
-
-    def __repr__(self) -> str:
-        return f"{type(self).__name__}({self._toklist!r}, {self.as_dict()})"
-
-    def __str__(self) -> str:
-        return (
-            "["
-            + ", ".join(
-                [
-                    str(i) if isinstance(i, ParseResults) else repr(i)
-                    for i in self._toklist
-                ]
-            )
-            + "]"
-        )
-
-    def _asStringList(self, sep=""):
-        out = []
-        for item in self._toklist:
-            if out and sep:
-                out.append(sep)
-            if isinstance(item, ParseResults):
-                out += item._asStringList()
-            else:
-                out.append(str(item))
-        return out
-
-    def as_list(self, *, flatten: bool = False) -> list:
-        """
-        Returns the parse results as a nested list of matching tokens, all converted to strings.
-        If flatten is True, all the nesting levels in the returned list are collapsed.
-
-        Example::
-
-            patt = Word(alphas)[1, ...]
-            result = patt.parse_string("sldkj lsdkj sldkj")
-            # even though the result prints in string-like form, it is actually a pyparsing ParseResults
-            print(type(result), result) # -> <class 'pyparsing.ParseResults'> ['sldkj', 'lsdkj', 'sldkj']
-
-            # Use as_list() to create an actual list
-            result_list = result.as_list()
-            print(type(result_list), result_list) # -> <class 'list'> ['sldkj', 'lsdkj', 'sldkj']
-        """
-        def flattened(pr):
-            to_visit = collections.deque([*self])
-            while to_visit:
-                to_do = to_visit.popleft()
-                if isinstance(to_do, ParseResults):
-                    to_visit.extendleft(to_do[::-1])
-                else:
-                    yield to_do
-
-        if flatten:
-            return [*flattened(self)]
-        else:
-            return [
-                res.as_list() if isinstance(res, ParseResults) else res
-                for res in self._toklist
-            ]
-
-    def as_dict(self) -> dict:
-        """
-        Returns the named parse results as a nested dictionary.
-
-        Example::
-
-            integer = Word(nums)
-            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
-
-            result = date_str.parse_string('12/31/1999')
-            print(type(result), repr(result)) # -> <class 'pyparsing.ParseResults'> (['12', '/', '31', '/', '1999'], {'day': [('1999', 4)], 'year': [('12', 0)], 'month': [('31', 2)]})
-
-            result_dict = result.as_dict()
-            print(type(result_dict), repr(result_dict)) # -> <class 'dict'> {'day': '1999', 'year': '12', 'month': '31'}
-
-            # even though a ParseResults supports dict-like access, sometime you just need to have a dict
-            import json
-            print(json.dumps(result)) # -> Exception: TypeError: ... is not JSON serializable
-            print(json.dumps(result.as_dict())) # -> {"month": "31", "day": "1999", "year": "12"}
-        """
-
-        def to_item(obj):
-            if isinstance(obj, ParseResults):
-                return obj.as_dict() if obj.haskeys() else [to_item(v) for v in obj]
-            else:
-                return obj
-
-        return dict((k, to_item(v)) for k, v in self.items())
-
-    def copy(self) -> ParseResults:
-        """
-        Returns a new shallow copy of a :class:`ParseResults` object. `ParseResults`
-        items contained within the source are shared with the copy. Use
-        :class:`ParseResults.deepcopy()` to create a copy with its own separate
-        content values.
-        """
-        ret = ParseResults(self._toklist)
-        ret._tokdict = self._tokdict.copy()
-        ret._parent = self._parent
-        ret._all_names |= self._all_names
-        ret._name = self._name
-        return ret
-
-    def deepcopy(self) -> ParseResults:
-        """
-        Returns a new deep copy of a :class:`ParseResults` object.
-        """
-        ret = self.copy()
-        # replace values with copies if they are of known mutable types
-        for i, obj in enumerate(self._toklist):
-            if isinstance(obj, ParseResults):
-                ret._toklist[i] = obj.deepcopy()
-            elif isinstance(obj, (str, bytes)):
-                pass
-            elif isinstance(obj, MutableMapping):
-                ret._toklist[i] = dest = type(obj)()
-                for k, v in obj.items():
-                    dest[k] = v.deepcopy() if isinstance(v, ParseResults) else v
-            elif isinstance(obj, Iterable):
-                ret._toklist[i] = type(obj)(
-                    v.deepcopy() if isinstance(v, ParseResults) else v for v in obj  # type: ignore[call-arg]
-                )
-        return ret
-
-    def get_name(self) -> str | None:
-        r"""
-        Returns the results name for this token expression. Useful when several
-        different expressions might match at a particular location.
-
-        Example::
-
-            integer = Word(nums)
-            ssn_expr = Regex(r"\d\d\d-\d\d-\d\d\d\d")
-            house_number_expr = Suppress('#') + Word(nums, alphanums)
-            user_data = (Group(house_number_expr)("house_number")
-                        | Group(ssn_expr)("ssn")
-                        | Group(integer)("age"))
-            user_info = user_data[1, ...]
-
-            result = user_info.parse_string("22 111-22-3333 #221B")
-            for item in result:
-                print(item.get_name(), ':', item[0])
-
-        prints::
-
-            age : 22
-            ssn : 111-22-3333
-            house_number : 221B
-        """
-        if self._name:
-            return self._name
-        elif self._parent:
-            par: ParseResults = self._parent
-            parent_tokdict_items = par._tokdict.items()
-            return next(
-                (
-                    k
-                    for k, vlist in parent_tokdict_items
-                    for v, loc in vlist
-                    if v is self
-                ),
-                None,
-            )
-        elif (
-            len(self) == 1
-            and len(self._tokdict) == 1
-            and next(iter(self._tokdict.values()))[0][1] in (0, -1)
-        ):
-            return next(iter(self._tokdict.keys()))
-        else:
-            return None
-
-    def dump(self, indent="", full=True, include_list=True, _depth=0) -> str:
-        """
-        Diagnostic method for listing out the contents of
-        a :class:`ParseResults`. Accepts an optional ``indent`` argument so
-        that this string can be embedded in a nested display of other data.
-
-        Example::
-
-            integer = Word(nums)
-            date_str = integer("year") + '/' + integer("month") + '/' + integer("day")
-
-            result = date_str.parse_string('1999/12/31')
-            print(result.dump())
-
-        prints::
-
-            ['1999', '/', '12', '/', '31']
-            - day: '31'
-            - month: '12'
-            - year: '1999'
-        """
-        out = []
-        NL = "\n"
-        out.append(indent + str(self.as_list()) if include_list else "")
-
-        if not full:
-            return "".join(out)
-
-        if self.haskeys():
-            items = sorted((str(k), v) for k, v in self.items())
-            for k, v in items:
-                if out:
-                    out.append(NL)
-                out.append(f"{indent}{('  ' * _depth)}- {k}: ")
-                if not isinstance(v, ParseResults):
-                    out.append(repr(v))
-                    continue
-
-                if not v:
-                    out.append(str(v))
-                    continue
-
-                out.append(
-                    v.dump(
-                        indent=indent,
-                        full=full,
-                        include_list=include_list,
-                        _depth=_depth + 1,
-                    )
-                )
-        if not any(isinstance(vv, ParseResults) for vv in self):
-            return "".join(out)
-
-        v = self
-        incr = "  "
-        nl = "\n"
-        for i, vv in enumerate(v):
-            if isinstance(vv, ParseResults):
-                vv_dump = vv.dump(
-                    indent=indent,
-                    full=full,
-                    include_list=include_list,
-                    _depth=_depth + 1,
-                )
-                out.append(
-                    f"{nl}{indent}{incr * _depth}[{i}]:{nl}{indent}{incr * (_depth + 1)}{vv_dump}"
-                )
-            else:
-                out.append(
-                    f"{nl}{indent}{incr * _depth}[{i}]:{nl}{indent}{incr * (_depth + 1)}{vv}"
-                )
-
-        return "".join(out)
-
-    def pprint(self, *args, **kwargs):
-        """
-        Pretty-printer for parsed results as a list, using the
-        `pprint <https://docs.python.org/3/library/pprint.html>`_ module.
-        Accepts additional positional or keyword args as defined for
-        `pprint.pprint <https://docs.python.org/3/library/pprint.html#pprint.pprint>`_ .
-
-        Example::
-
-            ident = Word(alphas, alphanums)
-            num = Word(nums)
-            func = Forward()
-            term = ident | num | Group('(' + func + ')')
-            func <<= ident + Group(Optional(DelimitedList(term)))
-            result = func.parse_string("fna a,b,(fnb c,d,200),100")
-            result.pprint(width=40)
-
-        prints::
-
-            ['fna',
-             ['a',
-              'b',
-              ['(', 'fnb', ['c', 'd', '200'], ')'],
-              '100']]
-        """
-        pprint.pprint(self.as_list(), *args, **kwargs)
-
-    # add support for pickle protocol
-    def __getstate__(self):
-        return (
-            self._toklist,
-            (
-                self._tokdict.copy(),
-                None,
-                self._all_names,
-                self._name,
-            ),
-        )
-
-    def __setstate__(self, state):
-        self._toklist, (self._tokdict, par, inAccumNames, self._name) = state
-        self._all_names = set(inAccumNames)
-        self._parent = None
-
-    def __getnewargs__(self):
-        return self._toklist, self._name
-
-    def __dir__(self):
-        return dir(type(self)) + list(self.keys())
-
-    @classmethod
-    def from_dict(cls, other, name=None) -> ParseResults:
-        """
-        Helper classmethod to construct a ``ParseResults`` from a ``dict``, preserving the
-        name-value relations as results names. If an optional ``name`` argument is
-        given, a nested ``ParseResults`` will be returned.
-        """
-
-        def is_iterable(obj):
-            try:
-                iter(obj)
-            except Exception:
-                return False
-            # str's are iterable, but in pyparsing, we don't want to iterate over them
-            else:
-                return not isinstance(obj, str_type)
-
-        ret = cls([])
-        for k, v in other.items():
-            if isinstance(v, Mapping):
-                ret += cls.from_dict(v, name=k)
-            else:
-                ret += cls([v], name=k, asList=is_iterable(v))
-        if name is not None:
-            ret = cls([ret], name=name)
-        return ret
-
-    asList = as_list
-    """Deprecated - use :class:`as_list`"""
-    asDict = as_dict
-    """Deprecated - use :class:`as_dict`"""
-    getName = get_name
-    """Deprecated - use :class:`get_name`"""
-
-
-MutableMapping.register(ParseResults)
-MutableSequence.register(ParseResults)
diff --git a/lib/pyparsing/testing.py b/lib/pyparsing/testing.py
deleted file mode 100644
index 836b2f86..00000000
--- a/lib/pyparsing/testing.py
+++ /dev/null
@@ -1,362 +0,0 @@
-# testing.py
-
-from contextlib import contextmanager
-import re
-import typing
-
-
-from .core import (
-    ParserElement,
-    ParseException,
-    Keyword,
-    __diag__,
-    __compat__,
-)
-
-
-class pyparsing_test:
-    """
-    namespace class for classes useful in writing unit tests
-    """
-
-    class reset_pyparsing_context:
-        """
-        Context manager to be used when writing unit tests that modify pyparsing config values:
-        - packrat parsing
-        - bounded recursion parsing
-        - default whitespace characters.
-        - default keyword characters
-        - literal string auto-conversion class
-        - __diag__ settings
-
-        Example::
-
-            with reset_pyparsing_context():
-                # test that literals used to construct a grammar are automatically suppressed
-                ParserElement.inlineLiteralsUsing(Suppress)
-
-                term = Word(alphas) | Word(nums)
-                group = Group('(' + term[...] + ')')
-
-                # assert that the '()' characters are not included in the parsed tokens
-                self.assertParseAndCheckList(group, "(abc 123 def)", ['abc', '123', 'def'])
-
-            # after exiting context manager, literals are converted to Literal expressions again
-        """
-
-        def __init__(self):
-            self._save_context = {}
-
-        def save(self):
-            self._save_context["default_whitespace"] = ParserElement.DEFAULT_WHITE_CHARS
-            self._save_context["default_keyword_chars"] = Keyword.DEFAULT_KEYWORD_CHARS
-
-            self._save_context["literal_string_class"] = (
-                ParserElement._literalStringClass
-            )
-
-            self._save_context["verbose_stacktrace"] = ParserElement.verbose_stacktrace
-
-            self._save_context["packrat_enabled"] = ParserElement._packratEnabled
-            if ParserElement._packratEnabled:
-                self._save_context["packrat_cache_size"] = (
-                    ParserElement.packrat_cache.size
-                )
-            else:
-                self._save_context["packrat_cache_size"] = None
-            self._save_context["packrat_parse"] = ParserElement._parse
-            self._save_context["recursion_enabled"] = (
-                ParserElement._left_recursion_enabled
-            )
-
-            self._save_context["__diag__"] = {
-                name: getattr(__diag__, name) for name in __diag__._all_names
-            }
-
-            self._save_context["__compat__"] = {
-                "collect_all_And_tokens": __compat__.collect_all_And_tokens
-            }
-
-            return self
-
-        def restore(self):
-            # reset pyparsing global state
-            if (
-                ParserElement.DEFAULT_WHITE_CHARS
-                != self._save_context["default_whitespace"]
-            ):
-                ParserElement.set_default_whitespace_chars(
-                    self._save_context["default_whitespace"]
-                )
-
-            ParserElement.verbose_stacktrace = self._save_context["verbose_stacktrace"]
-
-            Keyword.DEFAULT_KEYWORD_CHARS = self._save_context["default_keyword_chars"]
-            ParserElement.inlineLiteralsUsing(
-                self._save_context["literal_string_class"]
-            )
-
-            for name, value in self._save_context["__diag__"].items():
-                (__diag__.enable if value else __diag__.disable)(name)
-
-            ParserElement._packratEnabled = False
-            if self._save_context["packrat_enabled"]:
-                ParserElement.enable_packrat(self._save_context["packrat_cache_size"])
-            else:
-                ParserElement._parse = self._save_context["packrat_parse"]
-            ParserElement._left_recursion_enabled = self._save_context[
-                "recursion_enabled"
-            ]
-
-            __compat__.collect_all_And_tokens = self._save_context["__compat__"]
-
-            return self
-
-        def copy(self):
-            ret = type(self)()
-            ret._save_context.update(self._save_context)
-            return ret
-
-        def __enter__(self):
-            return self.save()
-
-        def __exit__(self, *args):
-            self.restore()
-
-    class TestParseResultsAsserts:
-        """
-        A mixin class to add parse results assertion methods to normal unittest.TestCase classes.
-        """
-
-        def assertParseResultsEquals(
-            self, result, expected_list=None, expected_dict=None, msg=None
-        ):
-            """
-            Unit test assertion to compare a :class:`ParseResults` object with an optional ``expected_list``,
-            and compare any defined results names with an optional ``expected_dict``.
-            """
-            if expected_list is not None:
-                self.assertEqual(expected_list, result.as_list(), msg=msg)
-            if expected_dict is not None:
-                self.assertEqual(expected_dict, result.as_dict(), msg=msg)
-
-        def assertParseAndCheckList(
-            self, expr, test_string, expected_list, msg=None, verbose=True
-        ):
-            """
-            Convenience wrapper assert to test a parser element and input string, and assert that
-            the resulting ``ParseResults.asList()`` is equal to the ``expected_list``.
-            """
-            result = expr.parse_string(test_string, parse_all=True)
-            if verbose:
-                print(result.dump())
-            else:
-                print(result.as_list())
-            self.assertParseResultsEquals(result, expected_list=expected_list, msg=msg)
-
-        def assertParseAndCheckDict(
-            self, expr, test_string, expected_dict, msg=None, verbose=True
-        ):
-            """
-            Convenience wrapper assert to test a parser element and input string, and assert that
-            the resulting ``ParseResults.asDict()`` is equal to the ``expected_dict``.
-            """
-            result = expr.parse_string(test_string, parseAll=True)
-            if verbose:
-                print(result.dump())
-            else:
-                print(result.as_list())
-            self.assertParseResultsEquals(result, expected_dict=expected_dict, msg=msg)
-
-        def assertRunTestResults(
-            self, run_tests_report, expected_parse_results=None, msg=None
-        ):
-            """
-            Unit test assertion to evaluate output of ``ParserElement.runTests()``. If a list of
-            list-dict tuples is given as the ``expected_parse_results`` argument, then these are zipped
-            with the report tuples returned by ``runTests`` and evaluated using ``assertParseResultsEquals``.
-            Finally, asserts that the overall ``runTests()`` success value is ``True``.
-
-            :param run_tests_report: tuple(bool, [tuple(str, ParseResults or Exception)]) returned from runTests
-            :param expected_parse_results (optional): [tuple(str, list, dict, Exception)]
-            """
-            run_test_success, run_test_results = run_tests_report
-
-            if expected_parse_results is None:
-                self.assertTrue(
-                    run_test_success, msg=msg if msg is not None else "failed runTests"
-                )
-                return
-
-            merged = [
-                (*rpt, expected)
-                for rpt, expected in zip(run_test_results, expected_parse_results)
-            ]
-            for test_string, result, expected in merged:
-                # expected should be a tuple containing a list and/or a dict or an exception,
-                # and optional failure message string
-                # an empty tuple will skip any result validation
-                fail_msg = next((exp for exp in expected if isinstance(exp, str)), None)
-                expected_exception = next(
-                    (
-                        exp
-                        for exp in expected
-                        if isinstance(exp, type) and issubclass(exp, Exception)
-                    ),
-                    None,
-                )
-                if expected_exception is not None:
-                    with self.assertRaises(
-                        expected_exception=expected_exception, msg=fail_msg or msg
-                    ):
-                        if isinstance(result, Exception):
-                            raise result
-                else:
-                    expected_list = next(
-                        (exp for exp in expected if isinstance(exp, list)), None
-                    )
-                    expected_dict = next(
-                        (exp for exp in expected if isinstance(exp, dict)), None
-                    )
-                    if (expected_list, expected_dict) != (None, None):
-                        self.assertParseResultsEquals(
-                            result,
-                            expected_list=expected_list,
-                            expected_dict=expected_dict,
-                            msg=fail_msg or msg,
-                        )
-                    else:
-                        # warning here maybe?
-                        print(f"no validation for {test_string!r}")
-
-            # do this last, in case some specific test results can be reported instead
-            self.assertTrue(
-                run_test_success, msg=msg if msg is not None else "failed runTests"
-            )
-
-        @contextmanager
-        def assertRaisesParseException(
-            self, exc_type=ParseException, expected_msg=None, msg=None
-        ):
-            if expected_msg is not None:
-                if isinstance(expected_msg, str):
-                    expected_msg = re.escape(expected_msg)
-                with self.assertRaisesRegex(exc_type, expected_msg, msg=msg) as ctx:
-                    yield ctx
-
-            else:
-                with self.assertRaises(exc_type, msg=msg) as ctx:
-                    yield ctx
-
-    @staticmethod
-    def with_line_numbers(
-        s: str,
-        start_line: typing.Optional[int] = None,
-        end_line: typing.Optional[int] = None,
-        expand_tabs: bool = True,
-        eol_mark: str = "|",
-        mark_spaces: typing.Optional[str] = None,
-        mark_control: typing.Optional[str] = None,
-        *,
-        indent: typing.Union[str, int] = "",
-        base_1: bool = True,
-    ) -> str:
-        """
-        Helpful method for debugging a parser - prints a string with line and column numbers.
-        (Line and column numbers are 1-based by default - if debugging a parse action,
-        pass base_1=False, to correspond to the loc value passed to the parse action.)
-
-        :param s: tuple(bool, str - string to be printed with line and column numbers
-        :param start_line: int - (optional) starting line number in s to print (default=1)
-        :param end_line: int - (optional) ending line number in s to print (default=len(s))
-        :param expand_tabs: bool - (optional) expand tabs to spaces, to match the pyparsing default
-        :param eol_mark: str - (optional) string to mark the end of lines, helps visualize trailing spaces (default="|")
-        :param mark_spaces: str - (optional) special character to display in place of spaces
-        :param mark_control: str - (optional) convert non-printing control characters to a placeholding
-                                 character; valid values:
-                                 - "unicode" - replaces control chars with Unicode symbols, such as "�" and "�"
-                                 - any single character string - replace control characters with given string
-                                 - None (default) - string is displayed as-is
-        :param indent: str | int - (optional) string to indent with line and column numbers; if an int
-                                   is passed, converted to " " * indent
-        :param base_1: bool - (optional) whether to label string using base 1; if False, string will be
-                              labeled based at 0 (default=True)
-
-        :return: str - input string with leading line numbers and column number headers
-        """
-        if expand_tabs:
-            s = s.expandtabs()
-        if isinstance(indent, int):
-            indent = " " * indent
-        indent = indent.expandtabs()
-        if mark_control is not None:
-            mark_control = typing.cast(str, mark_control)
-            if mark_control == "unicode":
-                transtable_map = {
-                    c: u for c, u in zip(range(0, 33), range(0x2400, 0x2433))
-                }
-                transtable_map[127] = 0x2421
-                tbl = str.maketrans(transtable_map)
-                eol_mark = ""
-            else:
-                ord_mark_control = ord(mark_control)
-                tbl = str.maketrans(
-                    {c: ord_mark_control for c in list(range(0, 32)) + [127]}
-                )
-            s = s.translate(tbl)
-        if mark_spaces is not None and mark_spaces != " ":
-            if mark_spaces == "unicode":
-                tbl = str.maketrans({9: 0x2409, 32: 0x2423})
-                s = s.translate(tbl)
-            else:
-                s = s.replace(" ", mark_spaces)
-        if start_line is None:
-            start_line = 0
-        if end_line is None:
-            end_line = len(s)
-        end_line = min(end_line, len(s))
-        start_line = min(max(0, start_line), end_line)
-
-        if mark_control != "unicode":
-            s_lines = s.splitlines()[start_line - base_1 : end_line]
-        else:
-            s_lines = [
-                line + "�" for line in s.split("�")[start_line - base_1 : end_line]
-            ]
-        if not s_lines:
-            return ""
-
-        lineno_width = len(str(end_line))
-        max_line_len = max(len(line) for line in s_lines)
-        lead = indent + " " * (lineno_width + 1)
-        if max_line_len >= 99:
-            header0 = (
-                lead
-                + ("" if base_1 else " ")
-                + "".join(
-                    f"{' ' * 99}{(i + 1) % 100}"
-                    for i in range(1 if base_1 else 0, max(max_line_len // 100, 1))
-                )
-                + "\n"
-            )
-        else:
-            header0 = ""
-        header1 = (
-            ("" if base_1 else " ")
-            + lead
-            + "".join(f"         {(i + 1) % 10}" for i in range(-(-max_line_len // 10)))
-            + "\n"
-        )
-        digits = "1234567890"
-        header2 = (
-            lead + ("" if base_1 else "0") + digits * (-(-max_line_len // 10)) + "\n"
-        )
-        return (
-            header1
-            + header2
-            + "\n".join(
-                f"{indent}{i:{lineno_width}d}:{line}{eol_mark}"
-                for i, line in enumerate(s_lines, start=start_line + base_1)
-            )
-            + "\n"
-        )
diff --git a/lib/pyparsing/unicode.py b/lib/pyparsing/unicode.py
deleted file mode 100644
index 066486c2..00000000
--- a/lib/pyparsing/unicode.py
+++ /dev/null
@@ -1,356 +0,0 @@
-# unicode.py
-
-import sys
-from itertools import filterfalse
-from typing import Union
-
-
-class _lazyclassproperty:
-    def __init__(self, fn):
-        self.fn = fn
-        self.__doc__ = fn.__doc__
-        self.__name__ = fn.__name__
-
-    def __get__(self, obj, cls):
-        if cls is None:
-            cls = type(obj)
-        if not hasattr(cls, "_intern") or any(
-            cls._intern is getattr(superclass, "_intern", [])
-            for superclass in cls.__mro__[1:]
-        ):
-            cls._intern = {}
-        attrname = self.fn.__name__
-        if attrname not in cls._intern:
-            cls._intern[attrname] = self.fn(cls)
-        return cls._intern[attrname]
-
-
-UnicodeRangeList = list[Union[tuple[int, int], tuple[int]]]
-
-
-class unicode_set:
-    """
-    A set of Unicode characters, for language-specific strings for
-    ``alphas``, ``nums``, ``alphanums``, and ``printables``.
-    A unicode_set is defined by a list of ranges in the Unicode character
-    set, in a class attribute ``_ranges``. Ranges can be specified using
-    2-tuples or a 1-tuple, such as::
-
-        _ranges = [
-            (0x0020, 0x007e),
-            (0x00a0, 0x00ff),
-            (0x0100,),
-            ]
-
-    Ranges are left- and right-inclusive. A 1-tuple of (x,) is treated as (x, x).
-
-    A unicode set can also be defined using multiple inheritance of other unicode sets::
-
-        class CJK(Chinese, Japanese, Korean):
-            pass
-    """
-
-    _ranges: UnicodeRangeList = []
-
-    @_lazyclassproperty
-    def _chars_for_ranges(cls) -> list[str]:
-        ret: list[int] = []
-        for cc in cls.__mro__:  # type: ignore[attr-defined]
-            if cc is unicode_set:
-                break
-            for rr in getattr(cc, "_ranges", ()):
-                ret.extend(range(rr[0], rr[-1] + 1))
-        return sorted(chr(c) for c in set(ret))
-
-    @_lazyclassproperty
-    def printables(cls) -> str:
-        """all non-whitespace characters in this range"""
-        return "".join(filterfalse(str.isspace, cls._chars_for_ranges))
-
-    @_lazyclassproperty
-    def alphas(cls) -> str:
-        """all alphabetic characters in this range"""
-        return "".join(filter(str.isalpha, cls._chars_for_ranges))
-
-    @_lazyclassproperty
-    def nums(cls) -> str:
-        """all numeric digit characters in this range"""
-        return "".join(filter(str.isdigit, cls._chars_for_ranges))
-
-    @_lazyclassproperty
-    def alphanums(cls) -> str:
-        """all alphanumeric characters in this range"""
-        return cls.alphas + cls.nums
-
-    @_lazyclassproperty
-    def identchars(cls) -> str:
-        """all characters in this range that are valid identifier characters, plus underscore '_'"""
-        return "".join(
-            sorted(
-                set(filter(str.isidentifier, cls._chars_for_ranges))
-                | set(
-                    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyzªµº"
-                    "À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ"
-                    "_"
-                )
-            )
-        )
-
-    @_lazyclassproperty
-    def identbodychars(cls) -> str:
-        """
-        all characters in this range that are valid identifier body characters,
-        plus the digits 0-9, and · (Unicode MIDDLE DOT)
-        """
-        identifier_chars = set(
-            c for c in cls._chars_for_ranges if ("_" + c).isidentifier()
-        )
-        return "".join(
-            sorted(identifier_chars | set(cls.identchars) | set("0123456789·"))
-        )
-
-    @_lazyclassproperty
-    def identifier(cls):
-        """
-        a pyparsing Word expression for an identifier using this range's definitions for
-        identchars and identbodychars
-        """
-        from pyparsing import Word
-
-        return Word(cls.identchars, cls.identbodychars)
-
-
-class pyparsing_unicode(unicode_set):
-    """
-    A namespace class for defining common language unicode_sets.
-    """
-
-    # fmt: off
-
-    # define ranges in language character sets
-    _ranges: UnicodeRangeList = [
-        (0x0020, sys.maxunicode),
-    ]
-
-    class BasicMultilingualPlane(unicode_set):
-        """Unicode set for the Basic Multilingual Plane"""
-        _ranges: UnicodeRangeList = [
-            (0x0020, 0xFFFF),
-        ]
-
-    class Latin1(unicode_set):
-        """Unicode set for Latin-1 Unicode Character Range"""
-        _ranges: UnicodeRangeList = [
-            (0x0020, 0x007E),
-            (0x00A0, 0x00FF),
-        ]
-
-    class LatinA(unicode_set):
-        """Unicode set for Latin-A Unicode Character Range"""
-        _ranges: UnicodeRangeList = [
-            (0x0100, 0x017F),
-        ]
-
-    class LatinB(unicode_set):
-        """Unicode set for Latin-B Unicode Character Range"""
-        _ranges: UnicodeRangeList = [
-            (0x0180, 0x024F),
-        ]
-
-    class Greek(unicode_set):
-        """Unicode set for Greek Unicode Character Ranges"""
-        _ranges: UnicodeRangeList = [
-            (0x0342, 0x0345),
-            (0x0370, 0x0377),
-            (0x037A, 0x037F),
-            (0x0384, 0x038A),
-            (0x038C,),
-            (0x038E, 0x03A1),
-            (0x03A3, 0x03E1),
-            (0x03F0, 0x03FF),
-            (0x1D26, 0x1D2A),
-            (0x1D5E,),
-            (0x1D60,),
-            (0x1D66, 0x1D6A),
-            (0x1F00, 0x1F15),
-            (0x1F18, 0x1F1D),
-            (0x1F20, 0x1F45),
-            (0x1F48, 0x1F4D),
-            (0x1F50, 0x1F57),
-            (0x1F59,),
-            (0x1F5B,),
-            (0x1F5D,),
-            (0x1F5F, 0x1F7D),
-            (0x1F80, 0x1FB4),
-            (0x1FB6, 0x1FC4),
-            (0x1FC6, 0x1FD3),
-            (0x1FD6, 0x1FDB),
-            (0x1FDD, 0x1FEF),
-            (0x1FF2, 0x1FF4),
-            (0x1FF6, 0x1FFE),
-            (0x2129,),
-            (0x2719, 0x271A),
-            (0xAB65,),
-            (0x10140, 0x1018D),
-            (0x101A0,),
-            (0x1D200, 0x1D245),
-            (0x1F7A1, 0x1F7A7),
-        ]
-
-    class Cyrillic(unicode_set):
-        """Unicode set for Cyrillic Unicode Character Range"""
-        _ranges: UnicodeRangeList = [
-            (0x0400, 0x052F),
-            (0x1C80, 0x1C88),
-            (0x1D2B,),
-            (0x1D78,),
-            (0x2DE0, 0x2DFF),
-            (0xA640, 0xA672),
-            (0xA674, 0xA69F),
-            (0xFE2E, 0xFE2F),
-        ]
-
-    class Chinese(unicode_set):
-        """Unicode set for Chinese Unicode Character Range"""
-        _ranges: UnicodeRangeList = [
-            (0x2E80, 0x2E99),
-            (0x2E9B, 0x2EF3),
-            (0x31C0, 0x31E3),
-            (0x3400, 0x4DB5),
-            (0x4E00, 0x9FEF),
-            (0xA700, 0xA707),
-            (0xF900, 0xFA6D),
-            (0xFA70, 0xFAD9),
-            (0x16FE2, 0x16FE3),
-            (0x1F210, 0x1F212),
-            (0x1F214, 0x1F23B),
-            (0x1F240, 0x1F248),
-            (0x20000, 0x2A6D6),
-            (0x2A700, 0x2B734),
-            (0x2B740, 0x2B81D),
-            (0x2B820, 0x2CEA1),
-            (0x2CEB0, 0x2EBE0),
-            (0x2F800, 0x2FA1D),
-        ]
-
-    class Japanese(unicode_set):
-        """Unicode set for Japanese Unicode Character Range, combining Kanji, Hiragana, and Katakana ranges"""
-
-        class Kanji(unicode_set):
-            "Unicode set for Kanji Unicode Character Range"
-            _ranges: UnicodeRangeList = [
-                (0x4E00, 0x9FBF),
-                (0x3000, 0x303F),
-            ]
-
-        class Hiragana(unicode_set):
-            """Unicode set for Hiragana Unicode Character Range"""
-            _ranges: UnicodeRangeList = [
-                (0x3041, 0x3096),
-                (0x3099, 0x30A0),
-                (0x30FC,),
-                (0xFF70,),
-                (0x1B001,),
-                (0x1B150, 0x1B152),
-                (0x1F200,),
-            ]
-
-        class Katakana(unicode_set):
-            """Unicode set for Katakana  Unicode Character Range"""
-            _ranges: UnicodeRangeList = [
-                (0x3099, 0x309C),
-                (0x30A0, 0x30FF),
-                (0x31F0, 0x31FF),
-                (0x32D0, 0x32FE),
-                (0xFF65, 0xFF9F),
-                (0x1B000,),
-                (0x1B164, 0x1B167),
-                (0x1F201, 0x1F202),
-                (0x1F213,),
-            ]
-
-        漢字 = Kanji
-        カタカナ = Katakana
-        �ら�� = Hiragana
-
-        _ranges = (
-            Kanji._ranges
-            + Hiragana._ranges
-            + Katakana._ranges
-        )
-
-    class Hangul(unicode_set):
-        """Unicode set for Hangul (Korean) Unicode Character Range"""
-        _ranges: UnicodeRangeList = [
-            (0x1100, 0x11FF),
-            (0x302E, 0x302F),
-            (0x3131, 0x318E),
-            (0x3200, 0x321C),
-            (0x3260, 0x327B),
-            (0x327E,),
-            (0xA960, 0xA97C),
-            (0xAC00, 0xD7A3),
-            (0xD7B0, 0xD7C6),
-            (0xD7CB, 0xD7FB),
-            (0xFFA0, 0xFFBE),
-            (0xFFC2, 0xFFC7),
-            (0xFFCA, 0xFFCF),
-            (0xFFD2, 0xFFD7),
-            (0xFFDA, 0xFFDC),
-        ]
-
-    Korean = Hangul
-
-    class CJK(Chinese, Japanese, Hangul):
-        """Unicode set for combined Chinese, Japanese, and Korean (CJK) Unicode Character Range"""
-
-    class Thai(unicode_set):
-        """Unicode set for Thai Unicode Character Range"""
-        _ranges: UnicodeRangeList = [
-            (0x0E01, 0x0E3A),
-            (0x0E3F, 0x0E5B)
-        ]
-
-    class Arabic(unicode_set):
-        """Unicode set for Arabic Unicode Character Range"""
-        _ranges: UnicodeRangeList = [
-            (0x0600, 0x061B),
-            (0x061E, 0x06FF),
-            (0x0700, 0x077F),
-        ]
-
-    class Hebrew(unicode_set):
-        """Unicode set for Hebrew Unicode Character Range"""
-        _ranges: UnicodeRangeList = [
-            (0x0591, 0x05C7),
-            (0x05D0, 0x05EA),
-            (0x05EF, 0x05F4),
-            (0xFB1D, 0xFB36),
-            (0xFB38, 0xFB3C),
-            (0xFB3E,),
-            (0xFB40, 0xFB41),
-            (0xFB43, 0xFB44),
-            (0xFB46, 0xFB4F),
-        ]
-
-    class Devanagari(unicode_set):
-        """Unicode set for Devanagari Unicode Character Range"""
-        _ranges: UnicodeRangeList = [
-            (0x0900, 0x097F),
-            (0xA8E0, 0xA8FF)
-        ]
-
-    BMP = BasicMultilingualPlane
-
-    # add language identifiers using language Unicode
-    العربية = Arabic
-    中文 = Chinese
-    кириллица = Cyrillic
-    Ελληνικά = Greek
-    עִברִית = Hebrew
-    日本語 = Japanese
-    한국어 = Korean
-    ไทย = Thai
-    देवनागरी = Devanagari
-
-    # fmt: on
diff --git a/lib/pyparsing/util.py b/lib/pyparsing/util.py
deleted file mode 100644
index 1487019c..00000000
--- a/lib/pyparsing/util.py
+++ /dev/null
@@ -1,397 +0,0 @@
-# util.py
-import contextlib
-from functools import lru_cache, wraps
-import inspect
-import itertools
-import types
-from typing import Callable, Union, Iterable, TypeVar, cast
-import warnings
-
-_bslash = chr(92)
-C = TypeVar("C", bound=Callable)
-
-
-class __config_flags:
-    """Internal class for defining compatibility and debugging flags"""
-
-    _all_names: list[str] = []
-    _fixed_names: list[str] = []
-    _type_desc = "configuration"
-
-    @classmethod
-    def _set(cls, dname, value):
-        if dname in cls._fixed_names:
-            warnings.warn(
-                f"{cls.__name__}.{dname} {cls._type_desc} is {str(getattr(cls, dname)).upper()}"
-                f" and cannot be overridden",
-                stacklevel=3,
-            )
-            return
-        if dname in cls._all_names:
-            setattr(cls, dname, value)
-        else:
-            raise ValueError(f"no such {cls._type_desc} {dname!r}")
-
-    enable = classmethod(lambda cls, name: cls._set(name, True))
-    disable = classmethod(lambda cls, name: cls._set(name, False))
-
-
-@lru_cache(maxsize=128)
-def col(loc: int, strg: str) -> int:
-    """
-    Returns current column within a string, counting newlines as line separators.
-    The first column is number 1.
-
-    Note: the default parsing behavior is to expand tabs in the input string
-    before starting the parsing process.  See
-    :class:`ParserElement.parse_string` for more
-    information on parsing strings containing ``<TAB>`` s, and suggested
-    methods to maintain a consistent view of the parsed string, the parse
-    location, and line and column positions within the parsed string.
-    """
-    s = strg
-    return 1 if 0 < loc < len(s) and s[loc - 1] == "\n" else loc - s.rfind("\n", 0, loc)
-
-
-@lru_cache(maxsize=128)
-def lineno(loc: int, strg: str) -> int:
-    """Returns current line number within a string, counting newlines as line separators.
-    The first line is number 1.
-
-    Note - the default parsing behavior is to expand tabs in the input string
-    before starting the parsing process.  See :class:`ParserElement.parse_string`
-    for more information on parsing strings containing ``<TAB>`` s, and
-    suggested methods to maintain a consistent view of the parsed string, the
-    parse location, and line and column positions within the parsed string.
-    """
-    return strg.count("\n", 0, loc) + 1
-
-
-@lru_cache(maxsize=128)
-def line(loc: int, strg: str) -> str:
-    """
-    Returns the line of text containing loc within a string, counting newlines as line separators.
-    """
-    last_cr = strg.rfind("\n", 0, loc)
-    next_cr = strg.find("\n", loc)
-    return strg[last_cr + 1 : next_cr] if next_cr >= 0 else strg[last_cr + 1 :]
-
-
-class _UnboundedCache:
-    def __init__(self):
-        cache = {}
-        cache_get = cache.get
-        self.not_in_cache = not_in_cache = object()
-
-        def get(_, key):
-            return cache_get(key, not_in_cache)
-
-        def set_(_, key, value):
-            cache[key] = value
-
-        def clear(_):
-            cache.clear()
-
-        self.size = None
-        self.get = types.MethodType(get, self)
-        self.set = types.MethodType(set_, self)
-        self.clear = types.MethodType(clear, self)
-
-
-class _FifoCache:
-    def __init__(self, size):
-        cache = {}
-        self.size = size
-        self.not_in_cache = not_in_cache = object()
-        cache_get = cache.get
-        cache_pop = cache.pop
-
-        def get(_, key):
-            return cache_get(key, not_in_cache)
-
-        def set_(_, key, value):
-            cache[key] = value
-            while len(cache) > size:
-                # pop oldest element in cache by getting the first key
-                cache_pop(next(iter(cache)))
-
-        def clear(_):
-            cache.clear()
-
-        self.get = types.MethodType(get, self)
-        self.set = types.MethodType(set_, self)
-        self.clear = types.MethodType(clear, self)
-
-
-class LRUMemo:
-    """
-    A memoizing mapping that retains `capacity` deleted items
-
-    The memo tracks retained items by their access order; once `capacity` items
-    are retained, the least recently used item is discarded.
-    """
-
-    def __init__(self, capacity):
-        self._capacity = capacity
-        self._active = {}
-        self._memory = {}
-
-    def __getitem__(self, key):
-        try:
-            return self._active[key]
-        except KeyError:
-            self._memory[key] = self._memory.pop(key)
-            return self._memory[key]
-
-    def __setitem__(self, key, value):
-        self._memory.pop(key, None)
-        self._active[key] = value
-
-    def __delitem__(self, key):
-        try:
-            value = self._active.pop(key)
-        except KeyError:
-            pass
-        else:
-            oldest_keys = list(self._memory)[: -(self._capacity + 1)]
-            for key_to_delete in oldest_keys:
-                self._memory.pop(key_to_delete)
-            self._memory[key] = value
-
-    def clear(self):
-        self._active.clear()
-        self._memory.clear()
-
-
-class UnboundedMemo(dict):
-    """
-    A memoizing mapping that retains all deleted items
-    """
-
-    def __delitem__(self, key):
-        pass
-
-
-def _escape_regex_range_chars(s: str) -> str:
-    # escape these chars: ^-[]
-    for c in r"\^-[]":
-        s = s.replace(c, _bslash + c)
-    s = s.replace("\n", r"\n")
-    s = s.replace("\t", r"\t")
-    return str(s)
-
-
-class _GroupConsecutive:
-    """
-    Used as a callable `key` for itertools.groupby to group
-    characters that are consecutive:
-        itertools.groupby("abcdejkmpqrs", key=IsConsecutive())
-        yields:
-            (0, iter(['a', 'b', 'c', 'd', 'e']))
-            (1, iter(['j', 'k']))
-            (2, iter(['m']))
-            (3, iter(['p', 'q', 'r', 's']))
-    """
-    def __init__(self):
-        self.prev = 0
-        self.counter = itertools.count()
-        self.value = -1
-
-    def __call__(self, char: str) -> int:
-        c_int = ord(char)
-        self.prev, prev = c_int, self.prev
-        if c_int - prev > 1:
-            self.value = next(self.counter)
-        return self.value
-
-
-def _collapse_string_to_ranges(
-    s: Union[str, Iterable[str]], re_escape: bool = True
-) -> str:
-    r"""
-    Take a string or list of single-character strings, and return
-    a string of the consecutive characters in that string collapsed
-    into groups, as might be used in a regular expression '[a-z]'
-    character set:
-        'a' -> 'a' -> '[a]'
-        'bc' -> 'bc' -> '[bc]'
-        'defgh' -> 'd-h' -> '[d-h]'
-        'fdgeh' -> 'd-h' -> '[d-h]'
-        'jklnpqrtu' -> 'j-lnp-rtu' -> '[j-lnp-rtu]'
-    Duplicates get collapsed out:
-        'aaa' -> 'a' -> '[a]'
-        'bcbccb' -> 'bc' -> '[bc]'
-        'defghhgf' -> 'd-h' -> '[d-h]'
-        'jklnpqrjjjtu' -> 'j-lnp-rtu' -> '[j-lnp-rtu]'
-    Spaces are preserved:
-        'ab c' -> ' a-c' -> '[ a-c]'
-    Characters that are significant when defining regex ranges
-    get escaped:
-        'acde[]-' -> r'\-\[\]ac-e' -> r'[\-\[\]ac-e]'
-    """
-
-    # Developer notes:
-    # - Do not optimize this code assuming that the given input string
-    #   or internal lists will be short (such as in loading generators into
-    #   lists to make it easier to find the last element); this method is also
-    #   used to generate regex ranges for character sets in the pyparsing.unicode
-    #   classes, and these can be _very_ long lists of strings
-
-    def escape_re_range_char(c: str) -> str:
-        return "\\" + c if c in r"\^-][" else c
-
-    def no_escape_re_range_char(c: str) -> str:
-        return c
-
-    if not re_escape:
-        escape_re_range_char = no_escape_re_range_char
-
-    ret = []
-
-    # reduce input string to remove duplicates, and put in sorted order
-    s_chars: list[str] = sorted(set(s))
-
-    if len(s_chars) > 2:
-        # find groups of characters that are consecutive (can be collapsed
-        # down to "<first>-<last>")
-        for _, chars in itertools.groupby(s_chars, key=_GroupConsecutive()):
-            # _ is unimportant, is just used to identify groups
-            # chars is an iterator of one or more consecutive characters
-            # that comprise the current group
-            first = last = next(chars)
-            with contextlib.suppress(ValueError):
-                *_, last = chars
-
-            if first == last:
-                # there was only a single char in this group
-                ret.append(escape_re_range_char(first))
-
-            elif last == chr(ord(first) + 1):
-                # there were only 2 characters in this group
-                #   'a','b' -> 'ab'
-                ret.append(f"{escape_re_range_char(first)}{escape_re_range_char(last)}")
-
-            else:
-                # there were > 2 characters in this group, make into a range
-                #   'c','d','e' -> 'c-e'
-                ret.append(
-                    f"{escape_re_range_char(first)}-{escape_re_range_char(last)}"
-                )
-    else:
-        # only 1 or 2 chars were given to form into groups
-        #   'a' -> ['a']
-        #   'bc' -> ['b', 'c']
-        #   'dg' -> ['d', 'g']
-        # no need to list them with "-", just return as a list
-        # (after escaping)
-        ret = [escape_re_range_char(c) for c in s_chars]
-
-    return "".join(ret)
-
-
-def _flatten(ll: Iterable) -> list:
-    ret = []
-    to_visit = [*ll]
-    while to_visit:
-        i = to_visit.pop(0)
-        if isinstance(i, Iterable) and not isinstance(i, str):
-            to_visit[:0] = i
-        else:
-            ret.append(i)
-    return ret
-
-
-def make_compressed_re(
-    word_list: Iterable[str], max_level: int = 2, _level: int = 1
-) -> str:
-    """
-    Create a regular expression string from a list of words, collapsing by common
-    prefixes and optional suffixes.
-
-    Calls itself recursively to build nested sublists for each group of suffixes
-    that have a shared prefix.
-    """
-
-    def get_suffixes_from_common_prefixes(namelist: list[str]):
-        if len(namelist) > 1:
-            for prefix, suffixes in itertools.groupby(namelist, key=lambda s: s[:1]):
-                yield prefix, sorted([s[1:] for s in suffixes], key=len, reverse=True)
-        else:
-            yield namelist[0][0], [namelist[0][1:]]
-
-    if max_level == 0:
-        return "|".join(sorted(word_list, key=len, reverse=True))
-
-    ret = []
-    sep = ""
-    for initial, suffixes in get_suffixes_from_common_prefixes(sorted(word_list)):
-        ret.append(sep)
-        sep = "|"
-
-        trailing = ""
-        if "" in suffixes:
-            trailing = "?"
-            suffixes.remove("")
-
-        if len(suffixes) > 1:
-            if all(len(s) == 1 for s in suffixes):
-                ret.append(f"{initial}[{''.join(suffixes)}]{trailing}")
-            else:
-                if _level < max_level:
-                    suffix_re = make_compressed_re(
-                        sorted(suffixes), max_level, _level + 1
-                    )
-                    ret.append(f"{initial}({suffix_re}){trailing}")
-                else:
-                    suffixes.sort(key=len, reverse=True)
-                    ret.append(f"{initial}({'|'.join(suffixes)}){trailing}")
-        else:
-            if suffixes:
-                suffix = suffixes[0]
-                if len(suffix) > 1 and trailing:
-                    ret.append(f"{initial}({suffix}){trailing}")
-                else:
-                    ret.append(f"{initial}{suffix}{trailing}")
-            else:
-                ret.append(initial)
-    return "".join(ret)
-
-
-def replaced_by_pep8(compat_name: str, fn: C) -> C:
-    # In a future version, uncomment the code in the internal _inner() functions
-    # to begin emitting DeprecationWarnings.
-
-    # Unwrap staticmethod/classmethod
-    fn = getattr(fn, "__func__", fn)
-
-    # (Presence of 'self' arg in signature is used by explain_exception() methods, so we take
-    # some extra steps to add it if present in decorated function.)
-    if ["self"] == list(inspect.signature(fn).parameters)[:1]:
-
-        @wraps(fn)
-        def _inner(self, *args, **kwargs):
-            # warnings.warn(
-            #     f"Deprecated - use {fn.__name__}", DeprecationWarning, stacklevel=2
-            # )
-            return fn(self, *args, **kwargs)
-
-    else:
-
-        @wraps(fn)
-        def _inner(*args, **kwargs):
-            # warnings.warn(
-            #     f"Deprecated - use {fn.__name__}", DeprecationWarning, stacklevel=2
-            # )
-            return fn(*args, **kwargs)
-
-    _inner.__doc__ = f"""Deprecated - use :class:`{fn.__name__}`"""
-    _inner.__name__ = compat_name
-    _inner.__annotations__ = fn.__annotations__
-    if isinstance(fn, types.FunctionType):
-        _inner.__kwdefaults__ = fn.__kwdefaults__  # type: ignore [attr-defined]
-    elif isinstance(fn, type) and hasattr(fn, "__init__"):
-        _inner.__kwdefaults__ = fn.__init__.__kwdefaults__  # type: ignore [misc,attr-defined]
-    else:
-        _inner.__kwdefaults__ = None  # type: ignore [attr-defined]
-    _inner.__qualname__ = fn.__qualname__
-    return cast(C, _inner)
diff --git a/lib/pythontwitter/__init__.py b/lib/pythontwitter/__init__.py
new file mode 100644
index 00000000..b13b46d9
--- /dev/null
+++ b/lib/pythontwitter/__init__.py
@@ -0,0 +1,4651 @@
+#!/usr/bin/env python
+#
+# vim: sw=2 ts=2 sts=2
+#
+# Copyright 2007 The Python-Twitter Developers
+#
+# 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.
+
+'''A library that provides a Python interface to the Twitter API'''
+
+__author__ = 'python-twitter@googlegroups.com'
+__version__ = '1.0.1'
+
+
+import base64
+import calendar
+import datetime
+import httplib
+import os
+import rfc822
+import sys
+import tempfile
+import textwrap
+import time
+import urllib
+import urllib2
+import urlparse
+import gzip
+import StringIO
+
+try:
+  # Python >= 2.6
+  import json as simplejson
+except ImportError:
+  try:
+    # Python < 2.6
+    import simplejson as simplejson
+  except ImportError:
+    try:
+      # Google App Engine
+      from django.utils import simplejson
+    except ImportError:
+      raise ImportError, "Unable to load a json library"
+
+# parse_qsl moved to urlparse module in v2.6
+try:
+  from urlparse import parse_qsl, parse_qs
+except ImportError:
+  from cgi import parse_qsl, parse_qs
+
+try:
+  from hashlib import md5
+except ImportError:
+  from md5 import md5
+
+import oauth2 as oauth
+
+
+CHARACTER_LIMIT = 140
+
+# A singleton representing a lazily instantiated FileCache.
+DEFAULT_CACHE = object()
+
+REQUEST_TOKEN_URL = 'https://api.twitter.com/oauth/request_token'
+ACCESS_TOKEN_URL  = 'https://api.twitter.com/oauth/access_token'
+AUTHORIZATION_URL = 'https://api.twitter.com/oauth/authorize'
+SIGNIN_URL        = 'https://api.twitter.com/oauth/authenticate'
+
+
+class TwitterError(Exception):
+  '''Base class for Twitter errors'''
+
+  @property
+  def message(self):
+    '''Returns the first argument used to construct this error.'''
+    return self.args[0]
+
+
+class Status(object):
+  '''A class representing the Status structure used by the twitter API.
+
+  The Status structure exposes the following properties:
+
+    status.created_at
+    status.created_at_in_seconds # read only
+    status.favorited
+    status.favorite_count
+    status.in_reply_to_screen_name
+    status.in_reply_to_user_id
+    status.in_reply_to_status_id
+    status.truncated
+    status.source
+    status.id
+    status.text
+    status.location
+    status.relative_created_at # read only
+    status.user
+    status.urls
+    status.user_mentions
+    status.hashtags
+    status.geo
+    status.place
+    status.coordinates
+    status.contributors
+  '''
+  def __init__(self,
+               created_at=None,
+               favorited=None,
+               favorite_count=None,
+               id=None,
+               text=None,
+               location=None,
+               user=None,
+               in_reply_to_screen_name=None,
+               in_reply_to_user_id=None,
+               in_reply_to_status_id=None,
+               truncated=None,
+               source=None,
+               now=None,
+               urls=None,
+               user_mentions=None,
+               hashtags=None,
+               media=None,
+               geo=None,
+               place=None,
+               coordinates=None,
+               contributors=None,
+               retweeted=None,
+               retweeted_status=None,
+               current_user_retweet=None,
+               retweet_count=None,
+               possibly_sensitive=None,
+               scopes=None,
+               withheld_copyright=None,
+               withheld_in_countries=None,
+               withheld_scope=None):
+    '''An object to hold a Twitter status message.
+
+    This class is normally instantiated by the twitter.Api class and
+    returned in a sequence.
+
+    Note: Dates are posted in the form "Sat Jan 27 04:17:38 +0000 2007"
+
+    Args:
+      created_at:
+        The time this status message was posted. [Optional]
+      favorited:
+        Whether this is a favorite of the authenticated user. [Optional]
+      favorite_count:
+        Number of times this status message has been favorited. [Optional]
+      id:
+        The unique id of this status message. [Optional]
+      text:
+        The text of this status message. [Optional]
+      location:
+        the geolocation string associated with this message. [Optional]
+      relative_created_at:
+        A human readable string representing the posting time. [Optional]
+      user:
+        A twitter.User instance representing the person posting the
+        message. [Optional]
+      now:
+        The current time, if the client chooses to set it.
+        Defaults to the wall clock time. [Optional]
+      urls:
+      user_mentions:
+      hashtags:
+      geo:
+      place:
+      coordinates:
+      contributors:
+      retweeted:
+      retweeted_status:
+      current_user_retweet:
+      retweet_count:
+      possibly_sensitive:
+      scopes:
+      withheld_copyright:
+      withheld_in_countries:
+      withheld_scope:
+    '''
+    self.created_at = created_at
+    self.favorited = favorited
+    self.favorite_count = favorite_count
+    self.id = id
+    self.text = text
+    self.location = location
+    self.user = user
+    self.now = now
+    self.in_reply_to_screen_name = in_reply_to_screen_name
+    self.in_reply_to_user_id = in_reply_to_user_id
+    self.in_reply_to_status_id = in_reply_to_status_id
+    self.truncated = truncated
+    self.retweeted = retweeted
+    self.source = source
+    self.urls = urls
+    self.user_mentions = user_mentions
+    self.hashtags = hashtags
+    self.media = media
+    self.geo = geo
+    self.place = place
+    self.coordinates = coordinates
+    self.contributors = contributors
+    self.retweeted_status = retweeted_status
+    self.current_user_retweet = current_user_retweet
+    self.retweet_count = retweet_count
+    self.possibly_sensitive = possibly_sensitive
+    self.scopes = scopes
+    self.withheld_copyright = withheld_copyright
+    self.withheld_in_countries = withheld_in_countries
+    self.withheld_scope = withheld_scope
+
+  def GetCreatedAt(self):
+    '''Get the time this status message was posted.
+
+    Returns:
+      The time this status message was posted
+    '''
+    return self._created_at
+
+  def SetCreatedAt(self, created_at):
+    '''Set the time this status message was posted.
+
+    Args:
+      created_at:
+        The time this status message was created
+    '''
+    self._created_at = created_at
+
+  created_at = property(GetCreatedAt, SetCreatedAt,
+                        doc='The time this status message was posted.')
+
+  def GetCreatedAtInSeconds(self):
+    '''Get the time this status message was posted, in seconds since the epoch.
+
+    Returns:
+      The time this status message was posted, in seconds since the epoch.
+    '''
+    return calendar.timegm(rfc822.parsedate(self.created_at))
+
+  created_at_in_seconds = property(GetCreatedAtInSeconds,
+                                   doc="The time this status message was "
+                                       "posted, in seconds since the epoch")
+
+  def GetFavorited(self):
+    '''Get the favorited setting of this status message.
+
+    Returns:
+      True if this status message is favorited; False otherwise
+    '''
+    return self._favorited
+
+  def SetFavorited(self, favorited):
+    '''Set the favorited state of this status message.
+
+    Args:
+      favorited:
+        boolean True/False favorited state of this status message
+    '''
+    self._favorited = favorited
+
+  favorited = property(GetFavorited, SetFavorited,
+                       doc='The favorited state of this status message.')
+
+  def GetFavoriteCount(self):
+    '''Get the favorite count of this status message.
+
+    Returns:
+      number of times this status message has been favorited
+    '''
+    return self._favorite_count
+
+  def SetFavoriteCount(self, favorite_count):
+    '''Set the favorited state of this status message.
+
+    Args:
+      favorite_count:
+        int number of favorites for this status message
+    '''
+    self._favorite_count = favorite_count
+
+  favorite_count = property(GetFavoriteCount, SetFavoriteCount,
+                       doc='The number of favorites for this status message.')
+
+  def GetId(self):
+    '''Get the unique id of this status message.
+
+    Returns:
+      The unique id of this status message
+    '''
+    return self._id
+
+  def SetId(self, id):
+    '''Set the unique id of this status message.
+
+    Args:
+      id:
+        The unique id of this status message
+    '''
+    self._id = id
+
+  id = property(GetId, SetId,
+                doc='The unique id of this status message.')
+
+  def GetInReplyToScreenName(self):
+    return self._in_reply_to_screen_name
+
+  def SetInReplyToScreenName(self, in_reply_to_screen_name):
+    self._in_reply_to_screen_name = in_reply_to_screen_name
+
+  in_reply_to_screen_name = property(GetInReplyToScreenName, SetInReplyToScreenName,
+                                     doc='')
+
+  def GetInReplyToUserId(self):
+    return self._in_reply_to_user_id
+
+  def SetInReplyToUserId(self, in_reply_to_user_id):
+    self._in_reply_to_user_id = in_reply_to_user_id
+
+  in_reply_to_user_id = property(GetInReplyToUserId, SetInReplyToUserId,
+                                 doc='')
+
+  def GetInReplyToStatusId(self):
+    return self._in_reply_to_status_id
+
+  def SetInReplyToStatusId(self, in_reply_to_status_id):
+    self._in_reply_to_status_id = in_reply_to_status_id
+
+  in_reply_to_status_id = property(GetInReplyToStatusId, SetInReplyToStatusId,
+                                   doc='')
+
+  def GetTruncated(self):
+    return self._truncated
+
+  def SetTruncated(self, truncated):
+    self._truncated = truncated
+
+  truncated = property(GetTruncated, SetTruncated,
+                       doc='')
+
+  def GetRetweeted(self):
+    return self._retweeted
+
+  def SetRetweeted(self, retweeted):
+    self._retweeted = retweeted
+
+  retweeted = property(GetRetweeted, SetRetweeted,
+                       doc='')
+
+  def GetSource(self):
+    return self._source
+
+  def SetSource(self, source):
+    self._source = source
+
+  source = property(GetSource, SetSource,
+                    doc='')
+
+  def GetText(self):
+    '''Get the text of this status message.
+
+    Returns:
+      The text of this status message.
+    '''
+    return self._text
+
+  def SetText(self, text):
+    '''Set the text of this status message.
+
+    Args:
+      text:
+        The text of this status message
+    '''
+    self._text = text
+
+  text = property(GetText, SetText,
+                  doc='The text of this status message')
+
+  def GetLocation(self):
+    '''Get the geolocation associated with this status message
+
+    Returns:
+      The geolocation string of this status message.
+    '''
+    return self._location
+
+  def SetLocation(self, location):
+    '''Set the geolocation associated with this status message
+
+    Args:
+      location:
+        The geolocation string of this status message
+    '''
+    self._location = location
+
+  location = property(GetLocation, SetLocation,
+                      doc='The geolocation string of this status message')
+
+  def GetRelativeCreatedAt(self):
+    '''Get a human readable string representing the posting time
+
+    Returns:
+      A human readable string representing the posting time
+    '''
+    fudge = 1.25
+    delta  = long(self.now) - long(self.created_at_in_seconds)
+
+    if delta < (1 * fudge):
+      return 'about a second ago'
+    elif delta < (60 * (1/fudge)):
+      return 'about %d seconds ago' % (delta)
+    elif delta < (60 * fudge):
+      return 'about a minute ago'
+    elif delta < (60 * 60 * (1/fudge)):
+      return 'about %d minutes ago' % (delta / 60)
+    elif delta < (60 * 60 * fudge) or delta / (60 * 60) == 1:
+      return 'about an hour ago'
+    elif delta < (60 * 60 * 24 * (1/fudge)):
+      return 'about %d hours ago' % (delta / (60 * 60))
+    elif delta < (60 * 60 * 24 * fudge) or delta / (60 * 60 * 24) == 1:
+      return 'about a day ago'
+    else:
+      return 'about %d days ago' % (delta / (60 * 60 * 24))
+
+  relative_created_at = property(GetRelativeCreatedAt,
+                                 doc='Get a human readable string representing '
+                                     'the posting time')
+
+  def GetUser(self):
+    '''Get a twitter.User representing the entity posting this status message.
+
+    Returns:
+      A twitter.User representing the entity posting this status message
+    '''
+    return self._user
+
+  def SetUser(self, user):
+    '''Set a twitter.User representing the entity posting this status message.
+
+    Args:
+      user:
+        A twitter.User representing the entity posting this status message
+    '''
+    self._user = user
+
+  user = property(GetUser, SetUser,
+                  doc='A twitter.User representing the entity posting this '
+                      'status message')
+
+  def GetNow(self):
+    '''Get the wallclock time for this status message.
+
+    Used to calculate relative_created_at.  Defaults to the time
+    the object was instantiated.
+
+    Returns:
+      Whatever the status instance believes the current time to be,
+      in seconds since the epoch.
+    '''
+    if self._now is None:
+      self._now = time.time()
+    return self._now
+
+  def SetNow(self, now):
+    '''Set the wallclock time for this status message.
+
+    Used to calculate relative_created_at.  Defaults to the time
+    the object was instantiated.
+
+    Args:
+      now:
+        The wallclock time for this instance.
+    '''
+    self._now = now
+
+  now = property(GetNow, SetNow,
+                 doc='The wallclock time for this status instance.')
+
+  def GetGeo(self):
+    return self._geo
+
+  def SetGeo(self, geo):
+    self._geo = geo
+
+  geo = property(GetGeo, SetGeo,
+                 doc='')
+
+  def GetPlace(self):
+    return self._place
+
+  def SetPlace(self, place):
+    self._place = place
+
+  place = property(GetPlace, SetPlace,
+                   doc='')
+
+  def GetCoordinates(self):
+    return self._coordinates
+
+  def SetCoordinates(self, coordinates):
+    self._coordinates = coordinates
+
+  coordinates = property(GetCoordinates, SetCoordinates,
+                         doc='')
+
+  def GetContributors(self):
+    return self._contributors
+
+  def SetContributors(self, contributors):
+    self._contributors = contributors
+
+  contributors = property(GetContributors, SetContributors,
+                          doc='')
+
+  def GetRetweeted_status(self):
+    return self._retweeted_status
+
+  def SetRetweeted_status(self, retweeted_status):
+    self._retweeted_status = retweeted_status
+
+  retweeted_status = property(GetRetweeted_status, SetRetweeted_status,
+                              doc='')
+
+  def GetRetweetCount(self):
+    return self._retweet_count
+
+  def SetRetweetCount(self, retweet_count):
+    self._retweet_count = retweet_count
+
+  retweet_count = property(GetRetweetCount, SetRetweetCount,
+                           doc='')
+
+  def GetCurrent_user_retweet(self):
+    return self._current_user_retweet
+
+  def SetCurrent_user_retweet(self, current_user_retweet):
+    self._current_user_retweet = current_user_retweet
+
+  current_user_retweet = property(GetCurrent_user_retweet, SetCurrent_user_retweet,
+                                  doc='')
+
+  def GetPossibly_sensitive(self):
+    return self._possibly_sensitive
+
+  def SetPossibly_sensitive(self, possibly_sensitive):
+    self._possibly_sensitive = possibly_sensitive
+
+  possibly_sensitive = property(GetPossibly_sensitive, SetPossibly_sensitive,
+                                doc='')
+
+  def GetScopes(self):
+    return self._scopes
+
+  def SetScopes(self, scopes):
+    self._scopes = scopes
+
+  scopes = property(GetScopes, SetScopes, doc='')
+
+  def GetWithheld_copyright(self):
+    return self._withheld_copyright
+
+  def SetWithheld_copyright(self, withheld_copyright):
+    self._withheld_copyright = withheld_copyright
+
+  withheld_copyright = property(GetWithheld_copyright, SetWithheld_copyright,
+                                doc='')
+
+  def GetWithheld_in_countries(self):
+    return self._withheld_in_countries
+
+  def SetWithheld_in_countries(self, withheld_in_countries):
+    self._withheld_in_countries = withheld_in_countries
+
+  withheld_in_countries = property(GetWithheld_in_countries, SetWithheld_in_countries,
+                                doc='')
+
+  def GetWithheld_scope(self):
+    return self._withheld_scope
+
+  def SetWithheld_scope(self, withheld_scope):
+    self._withheld_scope = withheld_scope
+
+  withheld_scope = property(GetWithheld_scope, SetWithheld_scope,
+                                doc='')
+
+  def __ne__(self, other):
+    return not self.__eq__(other)
+
+  def __eq__(self, other):
+    try:
+      return other and \
+             self.created_at == other.created_at and \
+             self.id == other.id and \
+             self.text == other.text and \
+             self.location == other.location and \
+             self.user == other.user and \
+             self.in_reply_to_screen_name == other.in_reply_to_screen_name and \
+             self.in_reply_to_user_id == other.in_reply_to_user_id and \
+             self.in_reply_to_status_id == other.in_reply_to_status_id and \
+             self.truncated == other.truncated and \
+             self.retweeted == other.retweeted and \
+             self.favorited == other.favorited and \
+             self.favorite_count == other.favorite_count and \
+             self.source == other.source and \
+             self.geo == other.geo and \
+             self.place == other.place and \
+             self.coordinates == other.coordinates and \
+             self.contributors == other.contributors and \
+             self.retweeted_status == other.retweeted_status and \
+             self.retweet_count == other.retweet_count and \
+             self.current_user_retweet == other.current_user_retweet and \
+             self.possibly_sensitive == other.possibly_sensitive and \
+             self.scopes == other.scopes and \
+             self.withheld_copyright == other.withheld_copyright and \
+             self.withheld_in_countries == other.withheld_in_countries and \
+             self.withheld_scope == other.withheld_scope
+    except AttributeError:
+      return False
+
+  def __str__(self):
+    '''A string representation of this twitter.Status instance.
+
+    The return value is the same as the JSON string representation.
+
+    Returns:
+      A string representation of this twitter.Status instance.
+    '''
+    return self.AsJsonString()
+
+  def AsJsonString(self):
+    '''A JSON string representation of this twitter.Status instance.
+
+    Returns:
+      A JSON string representation of this twitter.Status instance
+   '''
+    return simplejson.dumps(self.AsDict(), sort_keys=True)
+
+  def AsDict(self):
+    '''A dict representation of this twitter.Status instance.
+
+    The return value uses the same key names as the JSON representation.
+
+    Return:
+      A dict representing this twitter.Status instance
+    '''
+    data = {}
+    if self.created_at:
+      data['created_at'] = self.created_at
+    if self.favorited:
+      data['favorited'] = self.favorited
+    if self.favorite_count:
+      data['favorite_count'] = self.favorite_count
+    if self.id:
+      data['id'] = self.id
+    if self.text:
+      data['text'] = self.text
+    if self.location:
+      data['location'] = self.location
+    if self.user:
+      data['user'] = self.user.AsDict()
+    if self.in_reply_to_screen_name:
+      data['in_reply_to_screen_name'] = self.in_reply_to_screen_name
+    if self.in_reply_to_user_id:
+      data['in_reply_to_user_id'] = self.in_reply_to_user_id
+    if self.in_reply_to_status_id:
+      data['in_reply_to_status_id'] = self.in_reply_to_status_id
+    if self.truncated is not None:
+      data['truncated'] = self.truncated
+    if self.retweeted is not None:
+      data['retweeted'] = self.retweeted
+    if self.favorited is not None:
+      data['favorited'] = self.favorited
+    if self.source:
+      data['source'] = self.source
+    if self.geo:
+      data['geo'] = self.geo
+    if self.place:
+      data['place'] = self.place
+    if self.coordinates:
+      data['coordinates'] = self.coordinates
+    if self.contributors:
+      data['contributors'] = self.contributors
+    if self.hashtags:
+      data['hashtags'] = [h.text for h in self.hashtags]
+    if self.retweeted_status:
+      data['retweeted_status'] = self.retweeted_status.AsDict()
+    if self.retweet_count:
+      data['retweet_count'] = self.retweet_count
+    if self.urls:
+      data['urls'] = dict([(url.url, url.expanded_url) for url in self.urls])
+    if self.user_mentions:
+      data['user_mentions'] = [um.AsDict() for um in self.user_mentions]
+    if self.current_user_retweet:
+      data['current_user_retweet'] = self.current_user_retweet
+    if self.possibly_sensitive:
+      data['possibly_sensitive'] = self.possibly_sensitive
+    if self.scopes:
+      data['scopes'] = self.scopes
+    if self.withheld_copyright:
+      data['withheld_copyright'] = self.withheld_copyright
+    if self.withheld_in_countries:
+      data['withheld_in_countries'] = self.withheld_in_countries
+    if self.withheld_scope:
+      data['withheld_scope'] = self.withheld_scope
+    return data
+
+  @staticmethod
+  def NewFromJsonDict(data):
+    '''Create a new instance based on a JSON dict.
+
+    Args:
+      data: A JSON dict, as converted from the JSON in the twitter API
+    Returns:
+      A twitter.Status instance
+    '''
+    if 'user' in data:
+      user = User.NewFromJsonDict(data['user'])
+    else:
+      user = None
+    if 'retweeted_status' in data:
+      retweeted_status = Status.NewFromJsonDict(data['retweeted_status'])
+    else:
+      retweeted_status = None
+
+    if 'current_user_retweet' in data:
+      current_user_retweet = data['current_user_retweet']['id']
+    else:
+      current_user_retweet = None
+
+    urls = None
+    user_mentions = None
+    hashtags = None
+    media = None
+    if 'entities' in data:
+      if 'urls' in data['entities']:
+        urls = [Url.NewFromJsonDict(u) for u in data['entities']['urls']]
+      if 'user_mentions' in data['entities']:
+        user_mentions = [User.NewFromJsonDict(u) for u in data['entities']['user_mentions']]
+      if 'hashtags' in data['entities']:
+        hashtags = [Hashtag.NewFromJsonDict(h) for h in data['entities']['hashtags']]
+      if 'media' in data['entities']:
+        media = data['entities']['media']
+      else:
+        media = []
+    return Status(created_at=data.get('created_at', None),
+                  favorited=data.get('favorited', None),
+                  favorite_count=data.get('favorite_count', None),
+                  id=data.get('id', None),
+                  text=data.get('text', None),
+                  location=data.get('location', None),
+                  in_reply_to_screen_name=data.get('in_reply_to_screen_name', None),
+                  in_reply_to_user_id=data.get('in_reply_to_user_id', None),
+                  in_reply_to_status_id=data.get('in_reply_to_status_id', None),
+                  truncated=data.get('truncated', None),
+                  retweeted=data.get('retweeted', None),
+                  source=data.get('source', None),
+                  user=user,
+                  urls=urls,
+                  user_mentions=user_mentions,
+                  hashtags=hashtags,
+                  media=media,
+                  geo=data.get('geo', None),
+                  place=data.get('place', None),
+                  coordinates=data.get('coordinates', None),
+                  contributors=data.get('contributors', None),
+                  retweeted_status=retweeted_status,
+                  current_user_retweet=current_user_retweet,
+                  retweet_count=data.get('retweet_count', None),
+                  possibly_sensitive=data.get('possibly_sensitive', None),
+                  scopes=data.get('scopes', None),
+                  withheld_copyright=data.get('withheld_copyright', None),
+                  withheld_in_countries=data.get('withheld_in_countries', None),
+                  withheld_scope=data.get('withheld_scope', None))
+
+
+class User(object):
+  '''A class representing the User structure used by the twitter API.
+
+  The User structure exposes the following properties:
+
+    user.id
+    user.name
+    user.screen_name
+    user.location
+    user.description
+    user.profile_image_url
+    user.profile_background_tile
+    user.profile_background_image_url
+    user.profile_sidebar_fill_color
+    user.profile_background_color
+    user.profile_link_color
+    user.profile_text_color
+    user.protected
+    user.utc_offset
+    user.time_zone
+    user.url
+    user.status
+    user.statuses_count
+    user.followers_count
+    user.friends_count
+    user.favourites_count
+    user.geo_enabled
+    user.verified
+    user.lang
+    user.notifications
+    user.contributors_enabled
+    user.created_at
+    user.listed_count
+  '''
+  def __init__(self,
+               id=None,
+               name=None,
+               screen_name=None,
+               location=None,
+               description=None,
+               profile_image_url=None,
+               profile_background_tile=None,
+               profile_background_image_url=None,
+               profile_sidebar_fill_color=None,
+               profile_background_color=None,
+               profile_link_color=None,
+               profile_text_color=None,
+               protected=None,
+               utc_offset=None,
+               time_zone=None,
+               followers_count=None,
+               friends_count=None,
+               statuses_count=None,
+               favourites_count=None,
+               url=None,
+               status=None,
+               geo_enabled=None,
+               verified=None,
+               lang=None,
+               notifications=None,
+               contributors_enabled=None,
+               created_at=None,
+               listed_count=None):
+    self.id = id
+    self.name = name
+    self.screen_name = screen_name
+    self.location = location
+    self.description = description
+    self.profile_image_url = profile_image_url
+    self.profile_background_tile = profile_background_tile
+    self.profile_background_image_url = profile_background_image_url
+    self.profile_sidebar_fill_color = profile_sidebar_fill_color
+    self.profile_background_color = profile_background_color
+    self.profile_link_color = profile_link_color
+    self.profile_text_color = profile_text_color
+    self.protected = protected
+    self.utc_offset = utc_offset
+    self.time_zone = time_zone
+    self.followers_count = followers_count
+    self.friends_count = friends_count
+    self.statuses_count = statuses_count
+    self.favourites_count = favourites_count
+    self.url = url
+    self.status = status
+    self.geo_enabled = geo_enabled
+    self.verified = verified
+    self.lang = lang
+    self.notifications = notifications
+    self.contributors_enabled = contributors_enabled
+    self.created_at = created_at
+    self.listed_count = listed_count
+
+  def GetId(self):
+    '''Get the unique id of this user.
+
+    Returns:
+      The unique id of this user
+    '''
+    return self._id
+
+  def SetId(self, id):
+    '''Set the unique id of this user.
+
+    Args:
+      id: The unique id of this user.
+    '''
+    self._id = id
+
+  id = property(GetId, SetId,
+                doc='The unique id of this user.')
+
+  def GetName(self):
+    '''Get the real name of this user.
+
+    Returns:
+      The real name of this user
+    '''
+    return self._name
+
+  def SetName(self, name):
+    '''Set the real name of this user.
+
+    Args:
+      name: The real name of this user
+    '''
+    self._name = name
+
+  name = property(GetName, SetName,
+                  doc='The real name of this user.')
+
+  def GetScreenName(self):
+    '''Get the short twitter name of this user.
+
+    Returns:
+      The short twitter name of this user
+    '''
+    return self._screen_name
+
+  def SetScreenName(self, screen_name):
+    '''Set the short twitter name of this user.
+
+    Args:
+      screen_name: the short twitter name of this user
+    '''
+    self._screen_name = screen_name
+
+  screen_name = property(GetScreenName, SetScreenName,
+                         doc='The short twitter name of this user.')
+
+  def GetLocation(self):
+    '''Get the geographic location of this user.
+
+    Returns:
+      The geographic location of this user
+    '''
+    return self._location
+
+  def SetLocation(self, location):
+    '''Set the geographic location of this user.
+
+    Args:
+      location: The geographic location of this user
+    '''
+    self._location = location
+
+  location = property(GetLocation, SetLocation,
+                      doc='The geographic location of this user.')
+
+  def GetDescription(self):
+    '''Get the short text description of this user.
+
+    Returns:
+      The short text description of this user
+    '''
+    return self._description
+
+  def SetDescription(self, description):
+    '''Set the short text description of this user.
+
+    Args:
+      description: The short text description of this user
+    '''
+    self._description = description
+
+  description = property(GetDescription, SetDescription,
+                         doc='The short text description of this user.')
+
+  def GetUrl(self):
+    '''Get the homepage url of this user.
+
+    Returns:
+      The homepage url of this user
+    '''
+    return self._url
+
+  def SetUrl(self, url):
+    '''Set the homepage url of this user.
+
+    Args:
+      url: The homepage url of this user
+    '''
+    self._url = url
+
+  url = property(GetUrl, SetUrl,
+                 doc='The homepage url of this user.')
+
+  def GetProfileImageUrl(self):
+    '''Get the url of the thumbnail of this user.
+
+    Returns:
+      The url of the thumbnail of this user
+    '''
+    return self._profile_image_url
+
+  def SetProfileImageUrl(self, profile_image_url):
+    '''Set the url of the thumbnail of this user.
+
+    Args:
+      profile_image_url: The url of the thumbnail of this user
+    '''
+    self._profile_image_url = profile_image_url
+
+  profile_image_url= property(GetProfileImageUrl, SetProfileImageUrl,
+                              doc='The url of the thumbnail of this user.')
+
+  def GetProfileBackgroundTile(self):
+    '''Boolean for whether to tile the profile background image.
+
+    Returns:
+      True if the background is to be tiled, False if not, None if unset.
+    '''
+    return self._profile_background_tile
+
+  def SetProfileBackgroundTile(self, profile_background_tile):
+    '''Set the boolean flag for whether to tile the profile background image.
+
+    Args:
+      profile_background_tile: Boolean flag for whether to tile or not.
+    '''
+    self._profile_background_tile = profile_background_tile
+
+  profile_background_tile = property(GetProfileBackgroundTile, SetProfileBackgroundTile,
+                                     doc='Boolean for whether to tile the background image.')
+
+  def GetProfileBackgroundImageUrl(self):
+    return self._profile_background_image_url
+
+  def SetProfileBackgroundImageUrl(self, profile_background_image_url):
+    self._profile_background_image_url = profile_background_image_url
+
+  profile_background_image_url = property(GetProfileBackgroundImageUrl, SetProfileBackgroundImageUrl,
+                                          doc='The url of the profile background of this user.')
+
+  def GetProfileSidebarFillColor(self):
+    return self._profile_sidebar_fill_color
+
+  def SetProfileSidebarFillColor(self, profile_sidebar_fill_color):
+    self._profile_sidebar_fill_color = profile_sidebar_fill_color
+
+  profile_sidebar_fill_color = property(GetProfileSidebarFillColor, SetProfileSidebarFillColor)
+
+  def GetProfileBackgroundColor(self):
+    return self._profile_background_color
+
+  def SetProfileBackgroundColor(self, profile_background_color):
+    self._profile_background_color = profile_background_color
+
+  profile_background_color = property(GetProfileBackgroundColor, SetProfileBackgroundColor)
+
+  def GetProfileLinkColor(self):
+    return self._profile_link_color
+
+  def SetProfileLinkColor(self, profile_link_color):
+    self._profile_link_color = profile_link_color
+
+  profile_link_color = property(GetProfileLinkColor, SetProfileLinkColor)
+
+  def GetProfileTextColor(self):
+    return self._profile_text_color
+
+  def SetProfileTextColor(self, profile_text_color):
+    self._profile_text_color = profile_text_color
+
+  profile_text_color = property(GetProfileTextColor, SetProfileTextColor)
+
+  def GetProtected(self):
+    return self._protected
+
+  def SetProtected(self, protected):
+    self._protected = protected
+
+  protected = property(GetProtected, SetProtected)
+
+  def GetUtcOffset(self):
+    return self._utc_offset
+
+  def SetUtcOffset(self, utc_offset):
+    self._utc_offset = utc_offset
+
+  utc_offset = property(GetUtcOffset, SetUtcOffset)
+
+  def GetTimeZone(self):
+    '''Returns the current time zone string for the user.
+
+    Returns:
+      The descriptive time zone string for the user.
+    '''
+    return self._time_zone
+
+  def SetTimeZone(self, time_zone):
+    '''Sets the user's time zone string.
+
+    Args:
+      time_zone:
+        The descriptive time zone to assign for the user.
+    '''
+    self._time_zone = time_zone
+
+  time_zone = property(GetTimeZone, SetTimeZone)
+
+  def GetStatus(self):
+    '''Get the latest twitter.Status of this user.
+
+    Returns:
+      The latest twitter.Status of this user
+    '''
+    return self._status
+
+  def SetStatus(self, status):
+    '''Set the latest twitter.Status of this user.
+
+    Args:
+      status:
+        The latest twitter.Status of this user
+    '''
+    self._status = status
+
+  status = property(GetStatus, SetStatus,
+                    doc='The latest twitter.Status of this user.')
+
+  def GetFriendsCount(self):
+    '''Get the friend count for this user.
+
+    Returns:
+      The number of users this user has befriended.
+    '''
+    return self._friends_count
+
+  def SetFriendsCount(self, count):
+    '''Set the friend count for this user.
+
+    Args:
+      count:
+        The number of users this user has befriended.
+    '''
+    self._friends_count = count
+
+  friends_count = property(GetFriendsCount, SetFriendsCount,
+                           doc='The number of friends for this user.')
+
+  def GetListedCount(self):
+    '''Get the listed count for this user.
+
+    Returns:
+      The number of lists this user belongs to.
+    '''
+    return self._listed_count
+
+  def SetListedCount(self, count):
+    '''Set the listed count for this user.
+
+    Args:
+      count:
+        The number of lists this user belongs to.
+    '''
+    self._listed_count = count
+
+  listed_count = property(GetListedCount, SetListedCount,
+                          doc='The number of lists this user belongs to.')
+
+  def GetFollowersCount(self):
+    '''Get the follower count for this user.
+
+    Returns:
+      The number of users following this user.
+    '''
+    return self._followers_count
+
+  def SetFollowersCount(self, count):
+    '''Set the follower count for this user.
+
+    Args:
+      count:
+        The number of users following this user.
+    '''
+    self._followers_count = count
+
+  followers_count = property(GetFollowersCount, SetFollowersCount,
+                             doc='The number of users following this user.')
+
+  def GetStatusesCount(self):
+    '''Get the number of status updates for this user.
+
+    Returns:
+      The number of status updates for this user.
+    '''
+    return self._statuses_count
+
+  def SetStatusesCount(self, count):
+    '''Set the status update count for this user.
+
+    Args:
+      count:
+        The number of updates for this user.
+    '''
+    self._statuses_count = count
+
+  statuses_count = property(GetStatusesCount, SetStatusesCount,
+                            doc='The number of updates for this user.')
+
+  def GetFavouritesCount(self):
+    '''Get the number of favourites for this user.
+
+    Returns:
+      The number of favourites for this user.
+    '''
+    return self._favourites_count
+
+  def SetFavouritesCount(self, count):
+    '''Set the favourite count for this user.
+
+    Args:
+      count:
+        The number of favourites for this user.
+    '''
+    self._favourites_count = count
+
+  favourites_count = property(GetFavouritesCount, SetFavouritesCount,
+                              doc='The number of favourites for this user.')
+
+  def GetGeoEnabled(self):
+    '''Get the setting of geo_enabled for this user.
+
+    Returns:
+      True/False if Geo tagging is enabled
+    '''
+    return self._geo_enabled
+
+  def SetGeoEnabled(self, geo_enabled):
+    '''Set the latest twitter.geo_enabled of this user.
+
+    Args:
+      geo_enabled:
+        True/False if Geo tagging is to be enabled
+    '''
+    self._geo_enabled = geo_enabled
+
+  geo_enabled = property(GetGeoEnabled, SetGeoEnabled,
+                         doc='The value of twitter.geo_enabled for this user.')
+
+  def GetVerified(self):
+    '''Get the setting of verified for this user.
+
+    Returns:
+      True/False if user is a verified account
+    '''
+    return self._verified
+
+  def SetVerified(self, verified):
+    '''Set twitter.verified for this user.
+
+    Args:
+      verified:
+        True/False if user is a verified account
+    '''
+    self._verified = verified
+
+  verified = property(GetVerified, SetVerified,
+                      doc='The value of twitter.verified for this user.')
+
+  def GetLang(self):
+    '''Get the setting of lang for this user.
+
+    Returns:
+      language code of the user
+    '''
+    return self._lang
+
+  def SetLang(self, lang):
+    '''Set twitter.lang for this user.
+
+    Args:
+      lang:
+        language code for the user
+    '''
+    self._lang = lang
+
+  lang = property(GetLang, SetLang,
+                  doc='The value of twitter.lang for this user.')
+
+  def GetNotifications(self):
+    '''Get the setting of notifications for this user.
+
+    Returns:
+      True/False for the notifications setting of the user
+    '''
+    return self._notifications
+
+  def SetNotifications(self, notifications):
+    '''Set twitter.notifications for this user.
+
+    Args:
+      notifications:
+        True/False notifications setting for the user
+    '''
+    self._notifications = notifications
+
+  notifications = property(GetNotifications, SetNotifications,
+                           doc='The value of twitter.notifications for this user.')
+
+  def GetContributorsEnabled(self):
+    '''Get the setting of contributors_enabled for this user.
+
+    Returns:
+      True/False contributors_enabled of the user
+    '''
+    return self._contributors_enabled
+
+  def SetContributorsEnabled(self, contributors_enabled):
+    '''Set twitter.contributors_enabled for this user.
+
+    Args:
+      contributors_enabled:
+        True/False contributors_enabled setting for the user
+    '''
+    self._contributors_enabled = contributors_enabled
+
+  contributors_enabled = property(GetContributorsEnabled, SetContributorsEnabled,
+                                  doc='The value of twitter.contributors_enabled for this user.')
+
+  def GetCreatedAt(self):
+    '''Get the setting of created_at for this user.
+
+    Returns:
+      created_at value of the user
+    '''
+    return self._created_at
+
+  def SetCreatedAt(self, created_at):
+    '''Set twitter.created_at for this user.
+
+    Args:
+      created_at:
+        created_at value for the user
+    '''
+    self._created_at = created_at
+
+  created_at = property(GetCreatedAt, SetCreatedAt,
+                        doc='The value of twitter.created_at for this user.')
+
+  def __ne__(self, other):
+    return not self.__eq__(other)
+
+  def __eq__(self, other):
+    try:
+      return other and \
+             self.id == other.id and \
+             self.name == other.name and \
+             self.screen_name == other.screen_name and \
+             self.location == other.location and \
+             self.description == other.description and \
+             self.profile_image_url == other.profile_image_url and \
+             self.profile_background_tile == other.profile_background_tile and \
+             self.profile_background_image_url == other.profile_background_image_url and \
+             self.profile_sidebar_fill_color == other.profile_sidebar_fill_color and \
+             self.profile_background_color == other.profile_background_color and \
+             self.profile_link_color == other.profile_link_color and \
+             self.profile_text_color == other.profile_text_color and \
+             self.protected == other.protected and \
+             self.utc_offset == other.utc_offset and \
+             self.time_zone == other.time_zone and \
+             self.url == other.url and \
+             self.statuses_count == other.statuses_count and \
+             self.followers_count == other.followers_count and \
+             self.favourites_count == other.favourites_count and \
+             self.friends_count == other.friends_count and \
+             self.status == other.status and \
+             self.geo_enabled == other.geo_enabled and \
+             self.verified == other.verified and \
+             self.lang == other.lang and \
+             self.notifications == other.notifications and \
+             self.contributors_enabled == other.contributors_enabled and \
+             self.created_at == other.created_at and \
+             self.listed_count == other.listed_count
+
+    except AttributeError:
+      return False
+
+  def __str__(self):
+    '''A string representation of this twitter.User instance.
+
+    The return value is the same as the JSON string representation.
+
+    Returns:
+      A string representation of this twitter.User instance.
+    '''
+    return self.AsJsonString()
+
+  def AsJsonString(self):
+    '''A JSON string representation of this twitter.User instance.
+
+    Returns:
+      A JSON string representation of this twitter.User instance
+   '''
+    return simplejson.dumps(self.AsDict(), sort_keys=True)
+
+  def AsDict(self):
+    '''A dict representation of this twitter.User instance.
+
+    The return value uses the same key names as the JSON representation.
+
+    Return:
+      A dict representing this twitter.User instance
+    '''
+    data = {}
+    if self.id:
+      data['id'] = self.id
+    if self.name:
+      data['name'] = self.name
+    if self.screen_name:
+      data['screen_name'] = self.screen_name
+    if self.location:
+      data['location'] = self.location
+    if self.description:
+      data['description'] = self.description
+    if self.profile_image_url:
+      data['profile_image_url'] = self.profile_image_url
+    if self.profile_background_tile is not None:
+      data['profile_background_tile'] = self.profile_background_tile
+    if self.profile_background_image_url:
+      data['profile_sidebar_fill_color'] = self.profile_background_image_url
+    if self.profile_background_color:
+      data['profile_background_color'] = self.profile_background_color
+    if self.profile_link_color:
+      data['profile_link_color'] = self.profile_link_color
+    if self.profile_text_color:
+      data['profile_text_color'] = self.profile_text_color
+    if self.protected is not None:
+      data['protected'] = self.protected
+    if self.utc_offset:
+      data['utc_offset'] = self.utc_offset
+    if self.time_zone:
+      data['time_zone'] = self.time_zone
+    if self.url:
+      data['url'] = self.url
+    if self.status:
+      data['status'] = self.status.AsDict()
+    if self.friends_count:
+      data['friends_count'] = self.friends_count
+    if self.followers_count:
+      data['followers_count'] = self.followers_count
+    if self.statuses_count:
+      data['statuses_count'] = self.statuses_count
+    if self.favourites_count:
+      data['favourites_count'] = self.favourites_count
+    if self.geo_enabled:
+      data['geo_enabled'] = self.geo_enabled
+    if self.verified:
+      data['verified'] = self.verified
+    if self.lang:
+      data['lang'] = self.lang
+    if self.notifications:
+      data['notifications'] = self.notifications
+    if self.contributors_enabled:
+      data['contributors_enabled'] = self.contributors_enabled
+    if self.created_at:
+      data['created_at'] = self.created_at
+    if self.listed_count:
+      data['listed_count'] = self.listed_count
+
+    return data
+
+  @staticmethod
+  def NewFromJsonDict(data):
+    '''Create a new instance based on a JSON dict.
+
+    Args:
+      data:
+        A JSON dict, as converted from the JSON in the twitter API
+
+    Returns:
+      A twitter.User instance
+    '''
+    if 'status' in data:
+      status = Status.NewFromJsonDict(data['status'])
+    else:
+      status = None
+    return User(id=data.get('id', None),
+                name=data.get('name', None),
+                screen_name=data.get('screen_name', None),
+                location=data.get('location', None),
+                description=data.get('description', None),
+                statuses_count=data.get('statuses_count', None),
+                followers_count=data.get('followers_count', None),
+                favourites_count=data.get('favourites_count', None),
+                friends_count=data.get('friends_count', None),
+                profile_image_url=data.get('profile_image_url_https', data.get('profile_image_url', None)),
+                profile_background_tile = data.get('profile_background_tile', None),
+                profile_background_image_url = data.get('profile_background_image_url', None),
+                profile_sidebar_fill_color = data.get('profile_sidebar_fill_color', None),
+                profile_background_color = data.get('profile_background_color', None),
+                profile_link_color = data.get('profile_link_color', None),
+                profile_text_color = data.get('profile_text_color', None),
+                protected = data.get('protected', None),
+                utc_offset = data.get('utc_offset', None),
+                time_zone = data.get('time_zone', None),
+                url=data.get('url', None),
+                status=status,
+                geo_enabled=data.get('geo_enabled', None),
+                verified=data.get('verified', None),
+                lang=data.get('lang', None),
+                notifications=data.get('notifications', None),
+                contributors_enabled=data.get('contributors_enabled', None),
+                created_at=data.get('created_at', None),
+                listed_count=data.get('listed_count', None))
+
+class List(object):
+  '''A class representing the List structure used by the twitter API.
+
+  The List structure exposes the following properties:
+
+    list.id
+    list.name
+    list.slug
+    list.description
+    list.full_name
+    list.mode
+    list.uri
+    list.member_count
+    list.subscriber_count
+    list.following
+  '''
+  def __init__(self,
+               id=None,
+               name=None,
+               slug=None,
+               description=None,
+               full_name=None,
+               mode=None,
+               uri=None,
+               member_count=None,
+               subscriber_count=None,
+               following=None,
+               user=None):
+    self.id = id
+    self.name = name
+    self.slug = slug
+    self.description = description
+    self.full_name = full_name
+    self.mode = mode
+    self.uri = uri
+    self.member_count = member_count
+    self.subscriber_count = subscriber_count
+    self.following = following
+    self.user = user
+
+  def GetId(self):
+    '''Get the unique id of this list.
+
+    Returns:
+      The unique id of this list
+    '''
+    return self._id
+
+  def SetId(self, id):
+    '''Set the unique id of this list.
+
+    Args:
+      id:
+        The unique id of this list.
+    '''
+    self._id = id
+
+  id = property(GetId, SetId,
+                doc='The unique id of this list.')
+
+  def GetName(self):
+    '''Get the real name of this list.
+
+    Returns:
+      The real name of this list
+    '''
+    return self._name
+
+  def SetName(self, name):
+    '''Set the real name of this list.
+
+    Args:
+      name:
+        The real name of this list
+    '''
+    self._name = name
+
+  name = property(GetName, SetName,
+                  doc='The real name of this list.')
+
+  def GetSlug(self):
+    '''Get the slug of this list.
+
+    Returns:
+      The slug of this list
+    '''
+    return self._slug
+
+  def SetSlug(self, slug):
+    '''Set the slug of this list.
+
+    Args:
+      slug:
+        The slug of this list.
+    '''
+    self._slug = slug
+
+  slug = property(GetSlug, SetSlug,
+                  doc='The slug of this list.')
+
+  def GetDescription(self):
+    '''Get the description of this list.
+
+    Returns:
+      The description of this list
+    '''
+    return self._description
+
+  def SetDescription(self, description):
+    '''Set the description of this list.
+
+    Args:
+      description:
+        The description of this list.
+    '''
+    self._description = description
+
+  description = property(GetDescription, SetDescription,
+                         doc='The description of this list.')
+
+  def GetFull_name(self):
+    '''Get the full_name of this list.
+
+    Returns:
+      The full_name of this list
+    '''
+    return self._full_name
+
+  def SetFull_name(self, full_name):
+    '''Set the full_name of this list.
+
+    Args:
+      full_name:
+        The full_name of this list.
+    '''
+    self._full_name = full_name
+
+  full_name = property(GetFull_name, SetFull_name,
+                       doc='The full_name of this list.')
+
+  def GetMode(self):
+    '''Get the mode of this list.
+
+    Returns:
+      The mode of this list
+    '''
+    return self._mode
+
+  def SetMode(self, mode):
+    '''Set the mode of this list.
+
+    Args:
+      mode:
+        The mode of this list.
+    '''
+    self._mode = mode
+
+  mode = property(GetMode, SetMode,
+                  doc='The mode of this list.')
+
+  def GetUri(self):
+    '''Get the uri of this list.
+
+    Returns:
+      The uri of this list
+    '''
+    return self._uri
+
+  def SetUri(self, uri):
+    '''Set the uri of this list.
+
+    Args:
+      uri:
+        The uri of this list.
+    '''
+    self._uri = uri
+
+  uri = property(GetUri, SetUri,
+                 doc='The uri of this list.')
+
+  def GetMember_count(self):
+    '''Get the member_count of this list.
+
+    Returns:
+      The member_count of this list
+    '''
+    return self._member_count
+
+  def SetMember_count(self, member_count):
+    '''Set the member_count of this list.
+
+    Args:
+      member_count:
+        The member_count of this list.
+    '''
+    self._member_count = member_count
+
+  member_count = property(GetMember_count, SetMember_count,
+                          doc='The member_count of this list.')
+
+  def GetSubscriber_count(self):
+    '''Get the subscriber_count of this list.
+
+    Returns:
+      The subscriber_count of this list
+    '''
+    return self._subscriber_count
+
+  def SetSubscriber_count(self, subscriber_count):
+    '''Set the subscriber_count of this list.
+
+    Args:
+      subscriber_count:
+        The subscriber_count of this list.
+    '''
+    self._subscriber_count = subscriber_count
+
+  subscriber_count = property(GetSubscriber_count, SetSubscriber_count,
+                              doc='The subscriber_count of this list.')
+
+  def GetFollowing(self):
+    '''Get the following status of this list.
+
+    Returns:
+      The following status of this list
+    '''
+    return self._following
+
+  def SetFollowing(self, following):
+    '''Set the following status of this list.
+
+    Args:
+      following:
+        The following of this list.
+    '''
+    self._following = following
+
+  following = property(GetFollowing, SetFollowing,
+                       doc='The following status of this list.')
+
+  def GetUser(self):
+    '''Get the user of this list.
+
+    Returns:
+      The owner of this list
+    '''
+    return self._user
+
+  def SetUser(self, user):
+    '''Set the user of this list.
+
+    Args:
+      user:
+        The owner of this list.
+    '''
+    self._user = user
+
+  user = property(GetUser, SetUser,
+                  doc='The owner of this list.')
+
+  def __ne__(self, other):
+    return not self.__eq__(other)
+
+  def __eq__(self, other):
+    try:
+      return other and \
+             self.id == other.id and \
+             self.name == other.name and \
+             self.slug == other.slug and \
+             self.description == other.description and \
+             self.full_name == other.full_name and \
+             self.mode == other.mode and \
+             self.uri == other.uri and \
+             self.member_count == other.member_count and \
+             self.subscriber_count == other.subscriber_count and \
+             self.following == other.following and \
+             self.user == other.user
+
+    except AttributeError:
+      return False
+
+  def __str__(self):
+    '''A string representation of this twitter.List instance.
+
+    The return value is the same as the JSON string representation.
+
+    Returns:
+      A string representation of this twitter.List instance.
+    '''
+    return self.AsJsonString()
+
+  def AsJsonString(self):
+    '''A JSON string representation of this twitter.List instance.
+
+    Returns:
+      A JSON string representation of this twitter.List instance
+   '''
+    return simplejson.dumps(self.AsDict(), sort_keys=True)
+
+  def AsDict(self):
+    '''A dict representation of this twitter.List instance.
+
+    The return value uses the same key names as the JSON representation.
+
+    Return:
+      A dict representing this twitter.List instance
+    '''
+    data = {}
+    if self.id:
+      data['id'] = self.id
+    if self.name:
+      data['name'] = self.name
+    if self.slug:
+      data['slug'] = self.slug
+    if self.description:
+      data['description'] = self.description
+    if self.full_name:
+      data['full_name'] = self.full_name
+    if self.mode:
+      data['mode'] = self.mode
+    if self.uri:
+      data['uri'] = self.uri
+    if self.member_count is not None:
+      data['member_count'] = self.member_count
+    if self.subscriber_count is not None:
+      data['subscriber_count'] = self.subscriber_count
+    if self.following is not None:
+      data['following'] = self.following
+    if self.user is not None:
+      data['user'] = self.user.AsDict()
+    return data
+
+  @staticmethod
+  def NewFromJsonDict(data):
+    '''Create a new instance based on a JSON dict.
+
+    Args:
+      data:
+        A JSON dict, as converted from the JSON in the twitter API
+
+    Returns:
+      A twitter.List instance
+    '''
+    if 'user' in data:
+      user = User.NewFromJsonDict(data['user'])
+    else:
+      user = None
+    return List(id=data.get('id', None),
+                name=data.get('name', None),
+                slug=data.get('slug', None),
+                description=data.get('description', None),
+                full_name=data.get('full_name', None),
+                mode=data.get('mode', None),
+                uri=data.get('uri', None),
+                member_count=data.get('member_count', None),
+                subscriber_count=data.get('subscriber_count', None),
+                following=data.get('following', None),
+                user=user)
+
+class DirectMessage(object):
+  '''A class representing the DirectMessage structure used by the twitter API.
+
+  The DirectMessage structure exposes the following properties:
+
+    direct_message.id
+    direct_message.created_at
+    direct_message.created_at_in_seconds # read only
+    direct_message.sender_id
+    direct_message.sender_screen_name
+    direct_message.recipient_id
+    direct_message.recipient_screen_name
+    direct_message.text
+  '''
+
+  def __init__(self,
+               id=None,
+               created_at=None,
+               sender_id=None,
+               sender_screen_name=None,
+               recipient_id=None,
+               recipient_screen_name=None,
+               text=None):
+    '''An object to hold a Twitter direct message.
+
+    This class is normally instantiated by the twitter.Api class and
+    returned in a sequence.
+
+    Note: Dates are posted in the form "Sat Jan 27 04:17:38 +0000 2007"
+
+    Args:
+      id:
+        The unique id of this direct message. [Optional]
+      created_at:
+        The time this direct message was posted. [Optional]
+      sender_id:
+        The id of the twitter user that sent this message. [Optional]
+      sender_screen_name:
+        The name of the twitter user that sent this message. [Optional]
+      recipient_id:
+        The id of the twitter that received this message. [Optional]
+      recipient_screen_name:
+        The name of the twitter that received this message. [Optional]
+      text:
+        The text of this direct message. [Optional]
+    '''
+    self.id = id
+    self.created_at = created_at
+    self.sender_id = sender_id
+    self.sender_screen_name = sender_screen_name
+    self.recipient_id = recipient_id
+    self.recipient_screen_name = recipient_screen_name
+    self.text = text
+
+  def GetId(self):
+    '''Get the unique id of this direct message.
+
+    Returns:
+      The unique id of this direct message
+    '''
+    return self._id
+
+  def SetId(self, id):
+    '''Set the unique id of this direct message.
+
+    Args:
+      id:
+        The unique id of this direct message
+    '''
+    self._id = id
+
+  id = property(GetId, SetId,
+                doc='The unique id of this direct message.')
+
+  def GetCreatedAt(self):
+    '''Get the time this direct message was posted.
+
+    Returns:
+      The time this direct message was posted
+    '''
+    return self._created_at
+
+  def SetCreatedAt(self, created_at):
+    '''Set the time this direct message was posted.
+
+    Args:
+      created_at:
+        The time this direct message was created
+    '''
+    self._created_at = created_at
+
+  created_at = property(GetCreatedAt, SetCreatedAt,
+                        doc='The time this direct message was posted.')
+
+  def GetCreatedAtInSeconds(self):
+    '''Get the time this direct message was posted, in seconds since the epoch.
+
+    Returns:
+      The time this direct message was posted, in seconds since the epoch.
+    '''
+    return calendar.timegm(rfc822.parsedate(self.created_at))
+
+  created_at_in_seconds = property(GetCreatedAtInSeconds,
+                                   doc="The time this direct message was "
+                                       "posted, in seconds since the epoch")
+
+  def GetSenderId(self):
+    '''Get the unique sender id of this direct message.
+
+    Returns:
+      The unique sender id of this direct message
+    '''
+    return self._sender_id
+
+  def SetSenderId(self, sender_id):
+    '''Set the unique sender id of this direct message.
+
+    Args:
+      sender_id:
+        The unique sender id of this direct message
+    '''
+    self._sender_id = sender_id
+
+  sender_id = property(GetSenderId, SetSenderId,
+                doc='The unique sender id of this direct message.')
+
+  def GetSenderScreenName(self):
+    '''Get the unique sender screen name of this direct message.
+
+    Returns:
+      The unique sender screen name of this direct message
+    '''
+    return self._sender_screen_name
+
+  def SetSenderScreenName(self, sender_screen_name):
+    '''Set the unique sender screen name of this direct message.
+
+    Args:
+      sender_screen_name:
+        The unique sender screen name of this direct message
+    '''
+    self._sender_screen_name = sender_screen_name
+
+  sender_screen_name = property(GetSenderScreenName, SetSenderScreenName,
+                doc='The unique sender screen name of this direct message.')
+
+  def GetRecipientId(self):
+    '''Get the unique recipient id of this direct message.
+
+    Returns:
+      The unique recipient id of this direct message
+    '''
+    return self._recipient_id
+
+  def SetRecipientId(self, recipient_id):
+    '''Set the unique recipient id of this direct message.
+
+    Args:
+      recipient_id:
+        The unique recipient id of this direct message
+    '''
+    self._recipient_id = recipient_id
+
+  recipient_id = property(GetRecipientId, SetRecipientId,
+                doc='The unique recipient id of this direct message.')
+
+  def GetRecipientScreenName(self):
+    '''Get the unique recipient screen name of this direct message.
+
+    Returns:
+      The unique recipient screen name of this direct message
+    '''
+    return self._recipient_screen_name
+
+  def SetRecipientScreenName(self, recipient_screen_name):
+    '''Set the unique recipient screen name of this direct message.
+
+    Args:
+      recipient_screen_name:
+        The unique recipient screen name of this direct message
+    '''
+    self._recipient_screen_name = recipient_screen_name
+
+  recipient_screen_name = property(GetRecipientScreenName, SetRecipientScreenName,
+                doc='The unique recipient screen name of this direct message.')
+
+  def GetText(self):
+    '''Get the text of this direct message.
+
+    Returns:
+      The text of this direct message.
+    '''
+    return self._text
+
+  def SetText(self, text):
+    '''Set the text of this direct message.
+
+    Args:
+      text:
+        The text of this direct message
+    '''
+    self._text = text
+
+  text = property(GetText, SetText,
+                  doc='The text of this direct message')
+
+  def __ne__(self, other):
+    return not self.__eq__(other)
+
+  def __eq__(self, other):
+    try:
+      return other and \
+          self.id == other.id and \
+          self.created_at == other.created_at and \
+          self.sender_id == other.sender_id and \
+          self.sender_screen_name == other.sender_screen_name and \
+          self.recipient_id == other.recipient_id and \
+          self.recipient_screen_name == other.recipient_screen_name and \
+          self.text == other.text
+    except AttributeError:
+      return False
+
+  def __str__(self):
+    '''A string representation of this twitter.DirectMessage instance.
+
+    The return value is the same as the JSON string representation.
+
+    Returns:
+      A string representation of this twitter.DirectMessage instance.
+    '''
+    return self.AsJsonString()
+
+  def AsJsonString(self):
+    '''A JSON string representation of this twitter.DirectMessage instance.
+
+    Returns:
+      A JSON string representation of this twitter.DirectMessage instance
+   '''
+    return simplejson.dumps(self.AsDict(), sort_keys=True)
+
+  def AsDict(self):
+    '''A dict representation of this twitter.DirectMessage instance.
+
+    The return value uses the same key names as the JSON representation.
+
+    Return:
+      A dict representing this twitter.DirectMessage instance
+    '''
+    data = {}
+    if self.id:
+      data['id'] = self.id
+    if self.created_at:
+      data['created_at'] = self.created_at
+    if self.sender_id:
+      data['sender_id'] = self.sender_id
+    if self.sender_screen_name:
+      data['sender_screen_name'] = self.sender_screen_name
+    if self.recipient_id:
+      data['recipient_id'] = self.recipient_id
+    if self.recipient_screen_name:
+      data['recipient_screen_name'] = self.recipient_screen_name
+    if self.text:
+      data['text'] = self.text
+    return data
+
+  @staticmethod
+  def NewFromJsonDict(data):
+    '''Create a new instance based on a JSON dict.
+
+    Args:
+      data:
+        A JSON dict, as converted from the JSON in the twitter API
+
+    Returns:
+      A twitter.DirectMessage instance
+    '''
+    return DirectMessage(created_at=data.get('created_at', None),
+                         recipient_id=data.get('recipient_id', None),
+                         sender_id=data.get('sender_id', None),
+                         text=data.get('text', None),
+                         sender_screen_name=data.get('sender_screen_name', None),
+                         id=data.get('id', None),
+                         recipient_screen_name=data.get('recipient_screen_name', None))
+
+class Hashtag(object):
+  ''' A class representing a twitter hashtag
+  '''
+  def __init__(self,
+               text=None):
+    self.text = text
+
+  @staticmethod
+  def NewFromJsonDict(data):
+    '''Create a new instance based on a JSON dict.
+
+    Args:
+      data:
+        A JSON dict, as converted from the JSON in the twitter API
+
+    Returns:
+      A twitter.Hashtag instance
+    '''
+    return Hashtag(text = data.get('text', None))
+
+class Trend(object):
+  ''' A class representing a trending topic
+  '''
+  def __init__(self, name=None, query=None, timestamp=None, url=None):
+    self.name = name
+    self.query = query
+    self.timestamp = timestamp
+    self.url = url
+
+  def __str__(self):
+    return 'Name: %s\nQuery: %s\nTimestamp: %s\nSearch URL: %s\n' % (self.name, self.query, self.timestamp, self.url)
+
+  def __ne__(self, other):
+    return not self.__eq__(other)
+
+  def __eq__(self, other):
+    try:
+      return other and \
+          self.name == other.name and \
+          self.query == other.query and \
+          self.timestamp == other.timestamp and \
+          self.url == self.url
+    except AttributeError:
+      return False
+
+  @staticmethod
+  def NewFromJsonDict(data, timestamp = None):
+    '''Create a new instance based on a JSON dict
+
+    Args:
+      data:
+        A JSON dict
+      timestamp:
+        Gets set as the timestamp property of the new object
+
+    Returns:
+      A twitter.Trend object
+    '''
+    return Trend(name=data.get('name', None),
+                 query=data.get('query', None),
+                 url=data.get('url', None),
+                 timestamp=timestamp)
+
+class Url(object):
+  '''A class representing an URL contained in a tweet'''
+  def __init__(self,
+               url=None,
+               expanded_url=None):
+    self.url = url
+    self.expanded_url = expanded_url
+
+  @staticmethod
+  def NewFromJsonDict(data):
+    '''Create a new instance based on a JSON dict.
+
+    Args:
+      data:
+        A JSON dict, as converted from the JSON in the twitter API
+
+    Returns:
+      A twitter.Url instance
+    '''
+    return Url(url=data.get('url', None),
+               expanded_url=data.get('expanded_url', None))
+
+class Api(object):
+  '''A python interface into the Twitter API
+
+  By default, the Api caches results for 1 minute.
+
+  Example usage:
+
+    To create an instance of the twitter.Api class, with no authentication:
+
+      >>> import twitter
+      >>> api = twitter.Api()
+
+    To fetch the most recently posted public twitter status messages:
+
+      >>> statuses = api.GetPublicTimeline()
+      >>> print [s.user.name for s in statuses]
+      [u'DeWitt', u'Kesuke Miyagi', u'ev', u'Buzz Andersen', u'Biz Stone'] #...
+
+    To fetch a single user's public status messages, where "user" is either
+    a Twitter "short name" or their user id.
+
+      >>> statuses = api.GetUserTimeline(user)
+      >>> print [s.text for s in statuses]
+
+    To use authentication, instantiate the twitter.Api class with a
+    consumer key and secret; and the oAuth key and secret:
+
+      >>> api = twitter.Api(consumer_key='twitter consumer key',
+                            consumer_secret='twitter consumer secret',
+                            access_token_key='the_key_given',
+                            access_token_secret='the_key_secret')
+
+    To fetch your friends (after being authenticated):
+
+      >>> users = api.GetFriends()
+      >>> print [u.name for u in users]
+
+    To post a twitter status message (after being authenticated):
+
+      >>> status = api.PostUpdate('I love python-twitter!')
+      >>> print status.text
+      I love python-twitter!
+
+    There are many other methods, including:
+
+      >>> api.PostUpdates(status)
+      >>> api.PostDirectMessage(user, text)
+      >>> api.GetUser(user)
+      >>> api.GetReplies()
+      >>> api.GetUserTimeline(user)
+      >>> api.GetHomeTimeLine()
+      >>> api.GetStatus(id)
+      >>> api.DestroyStatus(id)
+      >>> api.GetFriendsTimeline(user)
+      >>> api.GetFriends(user)
+      >>> api.GetFollowers()
+      >>> api.GetFeatured()
+      >>> api.GetDirectMessages()
+      >>> api.GetSentDirectMessages()
+      >>> api.PostDirectMessage(user, text)
+      >>> api.DestroyDirectMessage(id)
+      >>> api.DestroyFriendship(user)
+      >>> api.CreateFriendship(user)
+      >>> api.GetUserByEmail(email)
+      >>> api.VerifyCredentials()
+  '''
+
+  DEFAULT_CACHE_TIMEOUT = 60 # cache for 1 minute
+  _API_REALM = 'Twitter API'
+
+  def __init__(self,
+               consumer_key=None,
+               consumer_secret=None,
+               access_token_key=None,
+               access_token_secret=None,
+               input_encoding=None,
+               request_headers=None,
+               cache=DEFAULT_CACHE,
+               shortner=None,
+               base_url=None,
+               use_gzip_compression=False,
+               debugHTTP=False):
+    '''Instantiate a new twitter.Api object.
+
+    Args:
+      consumer_key:
+        Your Twitter user's consumer_key.
+      consumer_secret:
+        Your Twitter user's consumer_secret.
+      access_token_key:
+        The oAuth access token key value you retrieved
+        from running get_access_token.py.
+      access_token_secret:
+        The oAuth access token's secret, also retrieved
+        from the get_access_token.py run.
+      input_encoding:
+        The encoding used to encode input strings. [Optional]
+      request_header:
+        A dictionary of additional HTTP request headers. [Optional]
+      cache:
+        The cache instance to use. Defaults to DEFAULT_CACHE.
+        Use None to disable caching. [Optional]
+      shortner:
+        The shortner instance to use.  Defaults to None.
+        See shorten_url.py for an example shortner. [Optional]
+      base_url:
+        The base URL to use to contact the Twitter API.
+        Defaults to https://api.twitter.com. [Optional]
+      use_gzip_compression:
+        Set to True to tell enable gzip compression for any call
+        made to Twitter.  Defaults to False. [Optional]
+      debugHTTP:
+        Set to True to enable debug output from urllib2 when performing
+        any HTTP requests.  Defaults to False. [Optional]
+    '''
+    self.SetCache(cache)
+    self._urllib         = urllib2
+    self._cache_timeout  = Api.DEFAULT_CACHE_TIMEOUT
+    self._input_encoding = input_encoding
+    self._use_gzip       = use_gzip_compression
+    self._debugHTTP      = debugHTTP
+    self._oauth_consumer = None
+    self._shortlink_size = 19
+
+    self._InitializeRequestHeaders(request_headers)
+    self._InitializeUserAgent()
+    self._InitializeDefaultParameters()
+
+    if base_url is None:
+      self.base_url = 'https://api.twitter.com/1.1'
+    else:
+      self.base_url = base_url
+
+    if consumer_key is not None and (access_token_key is None or
+                                     access_token_secret is None):
+      print >> sys.stderr, 'Twitter now requires an oAuth Access Token for API calls.'
+      print >> sys.stderr, 'If your using this library from a command line utility, please'
+      print >> sys.stderr, 'run the the included get_access_token.py tool to generate one.'
+
+      raise TwitterError('Twitter requires oAuth Access Token for all API access')
+
+    self.SetCredentials(consumer_key, consumer_secret, access_token_key, access_token_secret)
+
+  def SetCredentials(self,
+                     consumer_key,
+                     consumer_secret,
+                     access_token_key=None,
+                     access_token_secret=None):
+    '''Set the consumer_key and consumer_secret for this instance
+
+    Args:
+      consumer_key:
+        The consumer_key of the twitter account.
+      consumer_secret:
+        The consumer_secret for the twitter account.
+      access_token_key:
+        The oAuth access token key value you retrieved
+        from running get_access_token.py.
+      access_token_secret:
+        The oAuth access token's secret, also retrieved
+        from the get_access_token.py run.
+    '''
+    self._consumer_key        = consumer_key
+    self._consumer_secret     = consumer_secret
+    self._access_token_key    = access_token_key
+    self._access_token_secret = access_token_secret
+    self._oauth_consumer      = None
+
+    if consumer_key is not None and consumer_secret is not None and \
+       access_token_key is not None and access_token_secret is not None:
+      self._signature_method_plaintext = oauth.SignatureMethod_PLAINTEXT()
+      self._signature_method_hmac_sha1 = oauth.SignatureMethod_HMAC_SHA1()
+
+      self._oauth_token    = oauth.Token(key=access_token_key, secret=access_token_secret)
+      self._oauth_consumer = oauth.Consumer(key=consumer_key, secret=consumer_secret)
+
+  def ClearCredentials(self):
+    '''Clear the any credentials for this instance
+    '''
+    self._consumer_key        = None
+    self._consumer_secret     = None
+    self._access_token_key    = None
+    self._access_token_secret = None
+    self._oauth_consumer      = None
+
+  def GetSearch(self,
+                term=None,
+                geocode=None,
+                since_id=None,
+                max_id=None,
+                until=None,
+                count=15,
+                lang=None,
+                locale=None,
+                result_type="mixed",
+                include_entities=None):
+    '''Return twitter search results for a given term.
+
+    Args:
+      term:
+        Term to search by. Optional if you include geocode.
+      since_id:
+        Returns results with an ID greater than (that is, more recent
+        than) the specified ID. There are limits to the number of
+        Tweets which can be accessed through the API. If the limit of
+        Tweets has occurred since the since_id, the since_id will be
+        forced to the oldest ID available. [Optional]
+      max_id:
+        Returns only statuses with an ID less than (that is, older
+        than) or equal to the specified ID. [Optional]
+      until:
+        Returns tweets generated before the given date. Date should be
+        formatted as YYYY-MM-DD. [Optional]
+      geocode:
+        Geolocation information in the form (latitude, longitude, radius)
+        [Optional]
+      count:
+        Number of results to return.  Default is 15 [Optional]
+      lang:
+        Language for results as ISO 639-1 code.  Default is None (all languages)
+        [Optional]
+      locale:
+        Language of the search query. Currently only 'ja' is effective. This is
+        intended for language-specific consumers and the default should work in
+        the majority of cases.
+      result_type:
+        Type of result which should be returned.  Default is "mixed".  Other
+        valid options are "recent" and "popular". [Optional]
+      include_entities:
+        If True, each tweet will include a node called "entities,".
+        This node offers a variety of metadata about the tweet in a
+        discrete structure, including: user_mentions, urls, and
+        hashtags. [Optional]
+
+    Returns:
+      A sequence of twitter.Status instances, one for each message containing
+      the term
+    '''
+    # Build request parameters
+    parameters = {}
+
+    if since_id:
+      try:
+        parameters['since_id'] = long(since_id)
+      except:
+        raise TwitterError("since_id must be an integer")
+
+    if max_id:
+      try:
+        parameters['max_id'] = long(max_id)
+      except:
+        raise TwitterError("max_id must be an integer")
+
+    if until:
+        parameters['until'] = until
+
+    if lang:
+      parameters['lang'] = lang
+
+    if locale:
+      parameters['locale'] = locale
+
+    if term is None and geocode is None:
+      return []
+
+    if term is not None:
+      parameters['q'] = term
+
+    if geocode is not None:
+      parameters['geocode'] = ','.join(map(str, geocode))
+
+    if include_entities:
+      parameters['include_entities'] = 1
+
+    try:
+        parameters['count'] = int(count)
+    except:
+        raise TwitterError("count must be an integer")
+
+    if result_type in ["mixed", "popular", "recent"]:
+      parameters['result_type'] = result_type
+
+    # Make and send requests
+    url  = '%s/search/tweets.json' % self.base_url
+    json = self._FetchUrl(url, parameters=parameters)
+    data = self._ParseAndCheckTwitter(json)
+
+    # Return built list of statuses
+    return [Status.NewFromJsonDict(x) for x in data['statuses']]
+
+  def GetUsersSearch(self,
+                     term=None,
+                     page=1,
+                     count=20,
+                     include_entities=None):
+    '''Return twitter user search results for a given term.
+
+    Args:
+      term:
+        Term to search by.
+      page:
+        Page of results to return. Default is 1
+        [Optional]
+      count:
+        Number of results to return.  Default is 20
+        [Optional]
+      include_entities:
+        If True, each tweet will include a node called "entities,".
+        This node offers a variety of metadata about the tweet in a
+        discrete structure, including: user_mentions, urls, and hashtags.
+        [Optional]
+
+    Returns:
+      A sequence of twitter.User instances, one for each message containing
+      the term
+    '''
+    # Build request parameters
+    parameters = {}
+
+    if term is not None:
+      parameters['q'] = term
+
+    if include_entities:
+      parameters['include_entities'] = 1
+
+    try:
+      parameters['count'] = int(count)
+    except:
+      raise TwitterError("count must be an integer")
+
+    # Make and send requests
+    url  = '%s/users/search.json' % self.base_url
+    json = self._FetchUrl(url, parameters=parameters)
+    data = self._ParseAndCheckTwitter(json)
+    return [User.NewFromJsonDict(x) for x in data]
+
+  def GetTrendsCurrent(self, exclude=None):
+    '''Get the current top trending topics (global)
+
+    Args:
+      exclude:
+        Appends the exclude parameter as a request parameter.
+        Currently only exclude=hashtags is supported. [Optional]
+
+    Returns:
+      A list with 10 entries. Each entry contains a trend.
+    '''
+    return self.GetTrendsWoeid(id=1, exclude=exclude)
+
+  def GetTrendsWoeid(self, id, exclude=None):
+    '''Return the top 10 trending topics for a specific WOEID, if trending
+    information is available for it.
+
+    Args:
+      woeid:
+        the Yahoo! Where On Earth ID for a location.
+      exclude:
+        Appends the exclude parameter as a request parameter.
+        Currently only exclude=hashtags is supported. [Optional]
+
+    Returns:
+      A list with 10 entries. Each entry contains a trend.
+    '''
+    url  = '%s/trends/place.json' % (self.base_url)
+    parameters = {'id': id}
+
+    if exclude:
+      parameters['exclude'] = exclude
+
+    json = self._FetchUrl(url, parameters=parameters)
+    data = self._ParseAndCheckTwitter(json)
+
+    trends = []
+    timestamp = data[0]['as_of']
+
+    for trend in data[0]['trends']:
+        trends.append(Trend.NewFromJsonDict(trend, timestamp = timestamp))
+    return trends
+
+  def GetHomeTimeline(self,
+                         count=None,
+                         since_id=None,
+                         max_id=None,
+                         trim_user=False,
+                         exclude_replies=False,
+                         contributor_details=False,
+                         include_entities=True):
+    '''
+    Fetch a collection of the most recent Tweets and retweets posted by the
+    authenticating user and the users they follow.
+
+    The home timeline is central to how most users interact with the Twitter
+    service.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      count:
+        Specifies the number of statuses to retrieve. May not be
+        greater than 200. Defaults to 20. [Optional]
+      since_id:
+        Returns results with an ID greater than (that is, more recent
+        than) the specified ID. There are limits to the number of
+        Tweets which can be accessed through the API. If the limit of
+        Tweets has occurred since the since_id, the since_id will be
+        forced to the oldest ID available. [Optional]
+      max_id:
+        Returns results with an ID less than (that is, older than) or
+        equal to the specified ID. [Optional]
+      trim_user:
+        When True, each tweet returned in a timeline will include a user
+        object including only the status authors numerical ID. Omit this
+        parameter to receive the complete user object. [Optional]
+      exclude_replies:
+        This parameter will prevent replies from appearing in the
+        returned timeline. Using exclude_replies with the count
+        parameter will mean you will receive up-to count tweets -
+        this is because the count parameter retrieves that many
+        tweets before filtering out retweets and replies.
+        [Optional]
+      contributor_details:
+        This parameter enhances the contributors element of the
+        status response to include the screen_name of the contributor.
+        By default only the user_id of the contributor is included.
+        [Optional]
+      include_entities:
+        The entities node will be disincluded when set to false.
+        This node offers a variety of metadata about the tweet in a
+        discreet structure, including: user_mentions, urls, and
+        hashtags. [Optional]
+
+    Returns:
+      A sequence of twitter.Status instances, one for each message
+    '''
+    url = '%s/statuses/home_timeline.json' % self.base_url
+
+    if not self._oauth_consumer:
+      raise TwitterError("API must be authenticated.")
+    parameters = {}
+    if count is not None:
+      try:
+        if int(count) > 200:
+          raise TwitterError("'count' may not be greater than 200")
+      except ValueError:
+        raise TwitterError("'count' must be an integer")
+      parameters['count'] = count
+    if since_id:
+      try:
+        parameters['since_id'] = long(since_id)
+      except ValueError:
+        raise TwitterError("'since_id' must be an integer")
+    if max_id:
+      try:
+        parameters['max_id'] = long(max_id)
+      except ValueError:
+        raise TwitterError("'max_id' must be an integer")
+    if trim_user:
+      parameters['trim_user'] = 1
+    if exclude_replies:
+      parameters['exclude_replies'] = 1
+    if contributor_details:
+      parameters['contributor_details'] = 1
+    if not include_entities:
+      parameters['include_entities'] = 'false'
+    json = self._FetchUrl(url, parameters=parameters)
+    data = self._ParseAndCheckTwitter(json)
+    return [Status.NewFromJsonDict(x) for x in data]
+
+  def GetUserTimeline(self,
+                      user_id=None,
+                      screen_name=None,
+                      since_id=None,
+                      max_id=None,
+                      count=None,
+                      include_rts=None,
+                      trim_user=None,
+                      exclude_replies=None):
+    '''Fetch the sequence of public Status messages for a single user.
+
+    The twitter.Api instance must be authenticated if the user is private.
+
+    Args:
+      user_id:
+        Specifies the ID of the user for whom to return the
+        user_timeline. Helpful for disambiguating when a valid user ID
+        is also a valid screen name. [Optional]
+      screen_name:
+        Specifies the screen name of the user for whom to return the
+        user_timeline. Helpful for disambiguating when a valid screen
+        name is also a user ID. [Optional]
+      since_id:
+        Returns results with an ID greater than (that is, more recent
+        than) the specified ID. There are limits to the number of
+        Tweets which can be accessed through the API. If the limit of
+        Tweets has occurred since the since_id, the since_id will be
+        forced to the oldest ID available. [Optional]
+      max_id:
+        Returns only statuses with an ID less than (that is, older
+        than) or equal to the specified ID. [Optional]
+      count:
+        Specifies the number of statuses to retrieve. May not be
+        greater than 200.  [Optional]
+      include_rts:
+        If True, the timeline will contain native retweets (if they
+        exist) in addition to the standard stream of tweets. [Optional]
+      trim_user:
+        If True, statuses will only contain the numerical user ID only.
+        Otherwise a full user object will be returned for each status.
+        [Optional]
+      exclude_replies:
+        If True, this will prevent replies from appearing in the returned
+        timeline. Using exclude_replies with the count parameter will mean you
+        will receive up-to count tweets - this is because the count parameter
+        retrieves that many tweets before filtering out retweets and replies.
+        This parameter is only supported for JSON and XML responses. [Optional]
+
+    Returns:
+      A sequence of Status instances, one for each message up to count
+    '''
+    parameters = {}
+
+    url = '%s/statuses/user_timeline.json' % (self.base_url)
+
+    if user_id:
+      parameters['user_id'] = user_id
+    elif screen_name:
+      parameters['screen_name'] = screen_name
+
+    if since_id:
+      try:
+        parameters['since_id'] = long(since_id)
+      except:
+        raise TwitterError("since_id must be an integer")
+
+    if max_id:
+      try:
+        parameters['max_id'] = long(max_id)
+      except:
+        raise TwitterError("max_id must be an integer")
+
+    if count:
+      try:
+        parameters['count'] = int(count)
+      except:
+        raise TwitterError("count must be an integer")
+
+    if include_rts:
+      parameters['include_rts'] = 1
+
+    if trim_user:
+      parameters['trim_user'] = 1
+
+    if exclude_replies:
+      parameters['exclude_replies'] = 1
+
+    json = self._FetchUrl(url, parameters=parameters)
+    data = self._ParseAndCheckTwitter(json)
+    return [Status.NewFromJsonDict(x) for x in data]
+
+  def GetStatus(self,
+                id,
+                trim_user=False,
+                include_my_retweet=True,
+                include_entities=True):
+    '''Returns a single status message, specified by the id parameter.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      id:
+        The numeric ID of the status you are trying to retrieve.
+      trim_user:
+        When set to True, each tweet returned in a timeline will include
+        a user object including only the status authors numerical ID.
+        Omit this parameter to receive the complete user object.
+        [Optional]
+      include_my_retweet:
+        When set to True, any Tweets returned that have been retweeted by
+        the authenticating user will include an additional
+        current_user_retweet node, containing the ID of the source status
+        for the retweet. [Optional]
+      include_entities:
+        If False, the entities node will be disincluded.
+        This node offers a variety of metadata about the tweet in a
+        discreet structure, including: user_mentions, urls, and
+        hashtags. [Optional]
+    Returns:
+      A twitter.Status instance representing that status message
+    '''
+    url  = '%s/statuses/show.json' % (self.base_url)
+
+    if not self._oauth_consumer:
+      raise TwitterError("API must be authenticated.")
+
+    parameters = {}
+
+    try:
+      parameters['id'] = long(id)
+    except ValueError:
+      raise TwitterError("'id' must be an integer.")
+
+    if trim_user:
+      parameters['trim_user'] = 1
+    if include_my_retweet:
+      parameters['include_my_retweet'] = 1
+    if not include_entities:
+      parameters['include_entities'] = 'none'
+
+    json = self._FetchUrl(url, parameters=parameters)
+    data = self._ParseAndCheckTwitter(json)
+    return Status.NewFromJsonDict(data)
+
+  def DestroyStatus(self, id, trim_user=False):
+    '''Destroys the status specified by the required ID parameter.
+
+    The twitter.Api instance must be authenticated and the
+    authenticating user must be the author of the specified status.
+
+    Args:
+      id:
+        The numerical ID of the status you're trying to destroy.
+
+    Returns:
+      A twitter.Status instance representing the destroyed status message
+    '''
+    if not self._oauth_consumer:
+      raise TwitterError("API must be authenticated.")
+
+    try:
+      post_data = {'id': long(id)}
+    except:
+      raise TwitterError("id must be an integer")
+    url  = '%s/statuses/destroy/%s.json' % (self.base_url, id)
+    if trim_user:
+      post_data['trim_user'] = 1
+    json = self._FetchUrl(url, post_data=post_data)
+    data = self._ParseAndCheckTwitter(json)
+    return Status.NewFromJsonDict(data)
+
+  @classmethod
+  def _calculate_status_length(cls, status, linksize=19):
+    dummy_link_replacement = 'https://-%d-chars%s/' % (linksize, '-'*(linksize - 18))
+    shortened = ' '.join([x if not (x.startswith('http://') or
+                                    x.startswith('https://'))
+                            else
+                                dummy_link_replacement
+                            for x in status.split(' ')])
+    return len(shortened)
+
+  def PostUpdate(self, status, in_reply_to_status_id=None, latitude=None, longitude=None, place_id=None, display_coordinates=False, trim_user=False):
+    '''Post a twitter status message from the authenticated user.
+
+    The twitter.Api instance must be authenticated.
+
+    https://dev.twitter.com/docs/api/1.1/post/statuses/update
+
+    Args:
+      status:
+        The message text to be posted.
+        Must be less than or equal to 140 characters.
+      in_reply_to_status_id:
+        The ID of an existing status that the status to be posted is
+        in reply to.  This implicitly sets the in_reply_to_user_id
+        attribute of the resulting status to the user ID of the
+        message being replied to.  Invalid/missing status IDs will be
+        ignored. [Optional]
+      latitude:
+        Latitude coordinate of the tweet in degrees. Will only work
+        in conjunction with longitude argument. Both longitude and
+        latitude will be ignored by twitter if the user has a false
+        geo_enabled setting. [Optional]
+      longitude:
+        Longitude coordinate of the tweet in degrees. Will only work
+        in conjunction with latitude argument. Both longitude and
+        latitude will be ignored by twitter if the user has a false
+        geo_enabled setting. [Optional]
+      place_id:
+        A place in the world. These IDs can be retrieved from
+        GET geo/reverse_geocode. [Optional]
+      display_coordinates:
+        Whether or not to put a pin on the exact coordinates a tweet
+        has been sent from. [Optional]
+      trim_user:
+        If True the returned payload will only contain the user IDs,
+        otherwise the payload will contain the full user data item.
+        [Optional]
+    Returns:
+      A twitter.Status instance representing the message posted.
+    '''
+    if not self._oauth_consumer:
+      raise TwitterError("The twitter.Api instance must be authenticated.")
+
+    url = '%s/statuses/update.json' % self.base_url
+
+    if isinstance(status, unicode) or self._input_encoding is None:
+      u_status = status
+    else:
+      u_status = unicode(status, self._input_encoding)
+
+    #if self._calculate_status_length(u_status, self._shortlink_size) > CHARACTER_LIMIT:
+    #  raise TwitterError("Text must be less than or equal to %d characters. "
+    #                     "Consider using PostUpdates." % CHARACTER_LIMIT)
+
+    data = {'status': status}
+    if in_reply_to_status_id:
+      data['in_reply_to_status_id'] = in_reply_to_status_id
+    if latitude is not None and longitude is not None:
+      data['lat']     = str(latitude)
+      data['long']    = str(longitude)
+    if place_id is not None:
+      data['place_id'] = str(place_id)
+    if display_coordinates:
+      data['display_coordinates'] = 'true'
+    if trim_user:
+      data['trim_user'] = 'true'
+    json = self._FetchUrl(url, post_data=data)
+    data = self._ParseAndCheckTwitter(json)
+    return Status.NewFromJsonDict(data)
+
+  def PostUpdates(self, status, continuation=None, **kwargs):
+    '''Post one or more twitter status messages from the authenticated user.
+
+    Unlike api.PostUpdate, this method will post multiple status updates
+    if the message is longer than 140 characters.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      status:
+        The message text to be posted.
+        May be longer than 140 characters.
+      continuation:
+        The character string, if any, to be appended to all but the
+        last message.  Note that Twitter strips trailing '...' strings
+        from messages.  Consider using the unicode \u2026 character
+        (horizontal ellipsis) instead. [Defaults to None]
+      **kwargs:
+        See api.PostUpdate for a list of accepted parameters.
+
+    Returns:
+      A of list twitter.Status instance representing the messages posted.
+    '''
+    results = list()
+    if continuation is None:
+      continuation = ''
+    line_length = CHARACTER_LIMIT - len(continuation)
+    lines = textwrap.wrap(status, line_length)
+    for line in lines[0:-1]:
+      results.append(self.PostUpdate(line + continuation, **kwargs))
+    results.append(self.PostUpdate(lines[-1], **kwargs))
+    return results
+
+  def PostRetweet(self, original_id, trim_user=False):
+    '''Retweet a tweet with the Retweet API.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      original_id:
+        The numerical id of the tweet that will be retweeted
+      trim_user:
+        If True the returned payload will only contain the user IDs,
+        otherwise the payload will contain the full user data item.
+        [Optional]
+
+    Returns:
+      A twitter.Status instance representing the original tweet with retweet details embedded.
+    '''
+    if not self._oauth_consumer:
+      raise TwitterError("The twitter.Api instance must be authenticated.")
+
+    try:
+      if int(original_id) <= 0:
+        raise TwitterError("'original_id' must be a positive number")
+    except ValueError:
+        raise TwitterError("'original_id' must be an integer")
+
+    url = '%s/statuses/retweet/%s.json' % (self.base_url, original_id)
+
+    data = {'id': original_id}
+    if trim_user:
+      data['trim_user'] = 'true'
+    json = self._FetchUrl(url, post_data=data)
+    data = self._ParseAndCheckTwitter(json)
+    return Status.NewFromJsonDict(data)
+
+  def GetUserRetweets(self, count=None, since_id=None, max_id=None, trim_user=False):
+    '''Fetch the sequence of retweets made by the authenticated user.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      count:
+        The number of status messages to retrieve. [Optional]
+      since_id:
+        Returns results with an ID greater than (that is, more recent
+        than) the specified ID. There are limits to the number of
+        Tweets which can be accessed through the API. If the limit of
+        Tweets has occurred since the since_id, the since_id will be
+        forced to the oldest ID available. [Optional]
+      max_id:
+        Returns results with an ID less than (that is, older than) or
+        equal to the specified ID. [Optional]
+      trim_user:
+        If True the returned payload will only contain the user IDs,
+        otherwise the payload will contain the full user data item.
+        [Optional]
+
+    Returns:
+      A sequence of twitter.Status instances, one for each message up to count
+    '''
+    return self.GetUserTimeline(since_id=since_id, count=count, max_id=max_id, trim_user=trim_user, exclude_replies=True, include_rts=True)
+
+  def GetReplies(self, since_id=None, count=None, max_id=None, trim_user=False):
+    '''Get a sequence of status messages representing the 20 most
+    recent replies (status updates prefixed with @twitterID) to the
+    authenticating user.
+
+    Args:
+      since_id:
+        Returns results with an ID greater than (that is, more recent
+        than) the specified ID. There are limits to the number of
+        Tweets which can be accessed through the API. If the limit of
+        Tweets has occurred since the since_id, the since_id will be
+        forced to the oldest ID available. [Optional]
+      max_id:
+        Returns results with an ID less than (that is, older than) or
+        equal to the specified ID. [Optional]
+      trim_user:
+        If True the returned payload will only contain the user IDs,
+        otherwise the payload will contain the full user data item.
+        [Optional]
+
+    Returns:
+      A sequence of twitter.Status instances, one for each reply to the user.
+    '''
+    return self.GetUserTimeline(since_id=since_id, count=count, max_id=max_id, trim_user=trim_user, exclude_replies=False, include_rts=False)
+
+  def GetRetweets(self, statusid, count=None, trim_user=False):
+    '''Returns up to 100 of the first retweets of the tweet identified
+    by statusid
+
+    Args:
+      statusid:
+        The ID of the tweet for which retweets should be searched for
+      count:
+        The number of status messages to retrieve. [Optional]
+      trim_user:
+        If True the returned payload will only contain the user IDs,
+        otherwise the payload will contain the full user data item.
+        [Optional]
+
+    Returns:
+      A list of twitter.Status instances, which are retweets of statusid
+    '''
+    if not self._oauth_consumer:
+      raise TwitterError("The twitter.Api instsance must be authenticated.")
+    url = '%s/statuses/retweets/%s.json' % (self.base_url, statusid)
+    parameters = {}
+    if trim_user:
+      parameters['trim_user'] = 'true'
+    if count:
+      try:
+        parameters['count'] = int(count)
+      except:
+        raise TwitterError("count must be an integer")
+    json = self._FetchUrl(url, parameters=parameters)
+    data = self._ParseAndCheckTwitter(json)
+    return [Status.NewFromJsonDict(s) for s in data]
+
+  def GetRetweetsOfMe(self,
+                      count=None,
+                      since_id=None,
+                      max_id=None,
+                      trim_user=False,
+                      include_entities=True,
+                      include_user_entities=True):
+    '''Returns up to 100 of the most recent tweets of the user that have been
+    retweeted by others.
+
+    Args:
+      count:
+        The number of retweets to retrieve, up to 100. If omitted, 20 is
+        assumed.
+      since_id:
+        Returns results with an ID greater than (newer than) this ID.
+      max_id:
+        Returns results with an ID less than or equal to this ID.
+      trim_user:
+        When True, the user object for each tweet will only be an ID.
+      include_entities:
+        When True, the tweet entities will be included.
+      include_user_entities:
+        When True, the user entities will be included.
+    '''
+    if not self._oauth_consumer:
+      raise TwitterError("The twitter.Api instance must be authenticated.")
+    url = '%s/statuses/retweets_of_me.json' % self.base_url
+    parameters = {}
+    if count is not None:
+      try:
+        if int(count) > 100:
+          raise TwitterError("'count' may not be greater than 100")
+      except ValueError:
+        raise TwitterError("'count' must be an integer")
+    if count:
+      parameters['count'] = count
+    if since_id:
+      parameters['since_id'] = since_id
+    if max_id:
+      parameters['max_id'] = max_id
+    if trim_user:
+      parameters['trim_user'] = trim_user
+    if not include_entities:
+      parameters['include_entities'] = include_entities
+    if not include_user_entities:
+      parameters['include_user_entities'] = include_user_entities
+    json = self._FetchUrl(url, parameters=parameters)
+    data = self._ParseAndCheckTwitter(json)
+    return [Status.NewFromJsonDict(s) for s in data]
+
+  def GetFriends(self, user_id=None, screen_name=None, cursor=-1, skip_status=False, include_user_entities=False):
+    '''Fetch the sequence of twitter.User instances, one for each friend.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      user_id:
+        The twitter id of the user whose friends you are fetching.
+        If not specified, defaults to the authenticated user. [Optional]
+      screen_name:
+        The twitter name of the user whose friends you are fetching.
+        If not specified, defaults to the authenticated user. [Optional]
+      cursor:
+        Should be set to -1 for the initial call and then is used to
+        control what result page Twitter returns [Optional(ish)]
+      skip_status:
+        If True the statuses will not be returned in the user items.
+        [Optional]
+      include_user_entities:
+        When True, the user entities will be included.
+
+    Returns:
+      A sequence of twitter.User instances, one for each friend
+    '''
+    if not self._oauth_consumer:
+      raise TwitterError("twitter.Api instance must be authenticated")
+    url = '%s/friends/list.json' % self.base_url
+    result = []
+    parameters = {}
+    if user_id is not None:
+      parameters['user_id'] = user_id
+    if screen_name is not None:
+      parameters['screen_name'] = screen_name
+    if skip_status:
+      parameters['skip_status'] = True
+    if include_user_entities:
+      parameters['include_user_entities'] = True
+    while True:
+      parameters['cursor'] = cursor
+      json = self._FetchUrl(url, parameters=parameters)
+      data = self._ParseAndCheckTwitter(json)
+      result += [User.NewFromJsonDict(x) for x in data['users']]
+      if 'next_cursor' in data:
+        if data['next_cursor'] == 0 or data['next_cursor'] == data['previous_cursor']:
+          break
+        else:
+          cursor = data['next_cursor']
+      else:
+        break
+    return result
+
+  def GetFriendIDs(self, user_id=None, screen_name=None, cursor=-1, stringify_ids=False, count=None):
+      '''Returns a list of twitter user id's for every person
+      the specified user is following.
+
+      Args:
+        user_id:
+          The id of the user to retrieve the id list for
+          [Optional]
+        screen_name:
+          The screen_name of the user to retrieve the id list for
+          [Optional]
+        cursor:
+          Specifies the Twitter API Cursor location to start at.
+          Note: there are pagination limits.
+          [Optional]
+        stringify_ids:
+          if True then twitter will return the ids as strings instead of integers.
+          [Optional]
+        count:
+          The number of status messages to retrieve. [Optional]
+
+      Returns:
+        A list of integers, one for each user id.
+      '''
+      url = '%s/friends/ids.json' % self.base_url
+      if not self._oauth_consumer:
+          raise TwitterError("twitter.Api instance must be authenticated")
+      parameters = {}
+      if user_id is not None:
+        parameters['user_id'] = user_id
+      if screen_name is not None:
+        parameters['screen_name'] = screen_name
+      if stringify_ids:
+        parameters['stringify_ids'] = True
+      if count is not None:
+        parameters['count'] = count
+      result = []
+      while True:
+        parameters['cursor'] = cursor
+        json = self._FetchUrl(url, parameters=parameters)
+        data = self._ParseAndCheckTwitter(json)
+        result += [x for x in data['ids']]
+        if 'next_cursor' in data:
+          if data['next_cursor'] == 0 or data['next_cursor'] == data['previous_cursor']:
+            break
+          else:
+            cursor = data['next_cursor']
+        else:
+          break
+      return result
+
+
+  def GetFollowerIDs(self, user_id=None, screen_name=None, cursor=-1, stringify_ids=False, count=None, total_count=None):
+      '''Returns a list of twitter user id's for every person
+      that is following the specified user.
+
+      Args:
+        user_id:
+          The id of the user to retrieve the id list for
+          [Optional]
+        screen_name:
+          The screen_name of the user to retrieve the id list for
+          [Optional]
+        cursor:
+          Specifies the Twitter API Cursor location to start at.
+          Note: there are pagination limits.
+          [Optional]
+        stringify_ids:
+          if True then twitter will return the ids as strings instead of integers.
+          [Optional]
+        count:
+          The number of user id's to retrieve per API request. Please be aware that
+          this might get you rate-limited if set to a small number. By default Twitter
+          will retrieve 5000 UIDs per call.
+          [Optional]
+        total_count:
+          The total amount of UIDs to retrieve. Good if the account has many followers
+          and you don't want to get rate limited. The data returned might contain more
+          UIDs if total_count is not a multiple of count (5000 by default).
+          [Optional]
+
+
+      Returns:
+        A list of integers, one for each user id.
+      '''
+      url = '%s/followers/ids.json' % self.base_url
+      if not self._oauth_consumer:
+          raise TwitterError("twitter.Api instance must be authenticated")
+      parameters = {}
+      if user_id is not None:
+        parameters['user_id'] = user_id
+      if screen_name is not None:
+        parameters['screen_name'] = screen_name
+      if stringify_ids:
+        parameters['stringify_ids'] = True
+      if count is not None:
+        parameters['count'] = count
+      result = []
+      while True:
+        if total_count and total_count < count:
+          parameters['count'] = total_count
+        parameters['cursor'] = cursor
+        json = self._FetchUrl(url, parameters=parameters)
+        data = self._ParseAndCheckTwitter(json)
+        result += [x for x in data['ids']]
+        if 'next_cursor' in data:
+          if data['next_cursor'] == 0 or data['next_cursor'] == data['previous_cursor']:
+            break
+          else:
+            cursor = data['next_cursor']
+            total_count -= len(data['ids'])
+            if total_count < 1:
+              break
+        else:
+          break
+      return result
+
+  def GetFollowers(self, user_id=None, screen_name=None, cursor=-1, skip_status=False, include_user_entities=False):
+    '''Fetch the sequence of twitter.User instances, one for each follower
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      user_id:
+        The twitter id of the user whose followers you are fetching.
+        If not specified, defaults to the authenticated user. [Optional]
+      screen_name:
+        The twitter name of the user whose followers you are fetching.
+        If not specified, defaults to the authenticated user. [Optional]
+      cursor:
+        Should be set to -1 for the initial call and then is used to
+        control what result page Twitter returns [Optional(ish)]
+      skip_status:
+        If True the statuses will not be returned in the user items.
+        [Optional]
+      include_user_entities:
+        When True, the user entities will be included.
+
+    Returns:
+      A sequence of twitter.User instances, one for each follower
+    '''
+    if not self._oauth_consumer:
+      raise TwitterError("twitter.Api instance must be authenticated")
+    url = '%s/followers/list.json' % self.base_url
+    result = []
+    parameters = {}
+    if user_id is not None:
+      parameters['user_id'] = user_id
+    if screen_name is not None:
+      parameters['screen_name'] = screen_name
+    if skip_status:
+      parameters['skip_status'] = True
+    if include_user_entities:
+      parameters['include_user_entities'] = True
+    while True:
+      parameters['cursor'] = cursor
+      json = self._FetchUrl(url, parameters=parameters)
+      data = self._ParseAndCheckTwitter(json)
+      result += [User.NewFromJsonDict(x) for x in data['users']]
+      if 'next_cursor' in data:
+        if data['next_cursor'] == 0 or data['next_cursor'] == data['previous_cursor']:
+          break
+        else:
+          cursor = data['next_cursor']
+      else:
+        break
+    return result
+
+  def UsersLookup(self, user_id=None, screen_name=None, users=None, include_entities=True):
+    '''Fetch extended information for the specified users.
+
+    Users may be specified either as lists of either user_ids,
+    screen_names, or twitter.User objects. The list of users that
+    are queried is the union of all specified parameters.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      user_id:
+        A list of user_ids to retrieve extended information.
+        [Optional]
+      screen_name:
+        A list of screen_names to retrieve extended information.
+        [Optional]
+      users:
+        A list of twitter.User objects to retrieve extended information.
+        [Optional]
+      include_entities:
+        The entities node that may appear within embedded statuses will be
+        disincluded when set to False.
+        [Optional]
+
+    Returns:
+      A list of twitter.User objects for the requested users
+    '''
+
+    if not self._oauth_consumer:
+      raise TwitterError("The twitter.Api instance must be authenticated.")
+    if not user_id and not screen_name and not users:
+      raise TwitterError("Specify at least one of user_id, screen_name, or users.")
+    url = '%s/users/lookup.json' % self.base_url
+    parameters = {}
+    uids = list()
+    if user_id:
+      uids.extend(user_id)
+    if users:
+      uids.extend([u.id for u in users])
+    if len(uids):
+      parameters['user_id'] = ','.join(["%s" % u for u in uids])
+    if screen_name:
+      parameters['screen_name'] = ','.join(screen_name)
+    if not include_entities:
+      parameters['include_entities'] = 'false'
+    json = self._FetchUrl(url, parameters=parameters)
+    try:
+      data = self._ParseAndCheckTwitter(json)
+    except TwitterError, e:
+        _, e, _ = sys.exc_info()
+        t = e.args[0]
+        if len(t) == 1 and ('code' in t[0]) and (t[0]['code'] == 34):
+          data = []
+        else:
+            raise
+
+    return [User.NewFromJsonDict(u) for u in data]
+
+  def GetUser(self, user_id=None, screen_name=None, include_entities=True):
+    '''Returns a single user.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      user_id:
+        The id of the user to retrieve.
+        [Optional]
+      screen_name:
+        The screen name of the user for whom to return results for. Either a
+        user_id or screen_name is required for this method.
+        [Optional]
+      include_entities:
+        if set to False, the 'entities' node will not be included.
+        [Optional]
+
+
+    Returns:
+      A twitter.User instance representing that user
+    '''
+    url  = '%s/users/show.json' % (self.base_url)
+    parameters = {}
+
+    if not self._oauth_consumer:
+      raise TwitterError("The twitter.Api instance must be authenticated.")
+
+    if user_id:
+      parameters['user_id'] = user_id
+    elif screen_name:
+      parameters['screen_name'] = screen_name
+    else:
+      raise TwitterError("Specify at least one of user_id or screen_name.")
+
+    if not include_entities:
+      parameters['include_entities'] = 'false'
+
+    json = self._FetchUrl(url, parameters=parameters)
+    data = self._ParseAndCheckTwitter(json)
+    return User.NewFromJsonDict(data)
+
+  def GetDirectMessages(self, since_id=None, max_id=None, count=None, include_entities=True, skip_status=False):
+    '''Returns a list of the direct messages sent to the authenticating user.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      since_id:
+        Returns results with an ID greater than (that is, more recent
+        than) the specified ID. There are limits to the number of
+        Tweets which can be accessed through the API. If the limit of
+        Tweets has occurred since the since_id, the since_id will be
+        forced to the oldest ID available. [Optional]
+      max_id:
+        Returns results with an ID less than (that is, older than) or
+        equal to the specified ID. [Optional]
+      count:
+        Specifies the number of direct messages to try and retrieve, up to a
+        maximum of 200. The value of count is best thought of as a limit to the
+        number of Tweets to return because suspended or deleted content is
+        removed after the count has been applied. [Optional]
+      include_entities:
+        The entities node will not be included when set to False.
+        [Optional]
+      skip_status:
+        When set to True statuses will not be included in the returned user
+        objects. [Optional]
+
+    Returns:
+      A sequence of twitter.DirectMessage instances
+    '''
+    url = '%s/direct_messages.json' % self.base_url
+    if not self._oauth_consumer:
+      raise TwitterError("The twitter.Api instance must be authenticated.")
+    parameters = {}
+    if since_id:
+      parameters['since_id'] = since_id
+    if max_id:
+      parameters['max_id'] = max_id
+    if count:
+      try:
+        parameters['count'] = int(count)
+      except:
+        raise TwitterError("count must be an integer")
+    if not include_entities:
+      parameters['include_entities'] = 'false'
+    if skip_status:
+      parameters['skip_status'] = 1
+    json = self._FetchUrl(url, parameters=parameters)
+    data = self._ParseAndCheckTwitter(json)
+    return [DirectMessage.NewFromJsonDict(x) for x in data]
+
+  def GetSentDirectMessages(self, since_id=None, max_id=None, count=None, page=None, include_entities=True):
+    '''Returns a list of the direct messages sent by the authenticating user.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      since_id:
+        Returns results with an ID greater than (that is, more recent
+        than) the specified ID. There are limits to the number of
+        Tweets which can be accessed through the API. If the limit of
+        Tweets has occured since the since_id, the since_id will be
+        forced to the oldest ID available. [Optional]
+      max_id:
+        Returns results with an ID less than (that is, older than) or
+        equal to the specified ID. [Optional]
+      count:
+        Specifies the number of direct messages to try and retrieve, up to a
+        maximum of 200. The value of count is best thought of as a limit to the
+        number of Tweets to return because suspended or deleted content is
+        removed after the count has been applied. [Optional]
+      page:
+        Specifies the page of results to retrieve.
+        Note: there are pagination limits. [Optional]
+      include_entities:
+        The entities node will not be included when set to False.
+        [Optional]
+
+    Returns:
+      A sequence of twitter.DirectMessage instances
+    '''
+    url = '%s/direct_messages/sent.json' % self.base_url
+    if not self._oauth_consumer:
+      raise TwitterError("The twitter.Api instance must be authenticated.")
+    parameters = {}
+    if since_id:
+      parameters['since_id'] = since_id
+    if page:
+      parameters['page'] = page
+    if max_id:
+      parameters['max_id'] = max_id
+    if count:
+      try:
+        parameters['count'] = int(count)
+      except:
+        raise TwitterError("count must be an integer")
+    if not include_entities:
+      parameters['include_entities'] = 'false'
+    json = self._FetchUrl(url, parameters=parameters)
+    data = self._ParseAndCheckTwitter(json)
+    return [DirectMessage.NewFromJsonDict(x) for x in data]
+
+  def PostDirectMessage(self, text, user_id=None, screen_name=None):
+    '''Post a twitter direct message from the authenticated user
+
+    The twitter.Api instance must be authenticated. user_id or screen_name
+    must be specified.
+
+    Args:
+      text: The message text to be posted.  Must be less than 140 characters.
+      user_id:
+        The ID of the user who should receive the direct message.
+        [Optional]
+      screen_name:
+        The screen name of the user who should receive the direct message.
+        [Optional]
+
+    Returns:
+      A twitter.DirectMessage instance representing the message posted
+    '''
+    if not self._oauth_consumer:
+      raise TwitterError("The twitter.Api instance must be authenticated.")
+    url  = '%s/direct_messages/new.json' % self.base_url
+    data = {'text': text}
+    if user_id:
+      data['user_id'] = user_id
+    elif screen_name:
+      data['screen_name'] = screen_name
+    else:
+      raise TwitterError("Specify at least one of user_id or screen_name.")
+    json = self._FetchUrl(url, post_data=data)
+    data = self._ParseAndCheckTwitter(json)
+    return DirectMessage.NewFromJsonDict(data)
+
+  def DestroyDirectMessage(self, id, include_entities=True):
+    '''Destroys the direct message specified in the required ID parameter.
+
+    The twitter.Api instance must be authenticated, and the
+    authenticating user must be the recipient of the specified direct
+    message.
+
+    Args:
+      id: The id of the direct message to be destroyed
+
+    Returns:
+      A twitter.DirectMessage instance representing the message destroyed
+    '''
+    url  = '%s/direct_messages/destroy.json' % self.base_url
+    data = {'id': id}
+    if not include_entities:
+      data['include_entities'] = 'false'
+    json = self._FetchUrl(url, post_data=data)
+    data = self._ParseAndCheckTwitter(json)
+    return DirectMessage.NewFromJsonDict(data)
+
+  def CreateFriendship(self, user_id=None, screen_name=None, follow=True):
+    '''Befriends the user specified by the user_id or screen_name.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      user_id:
+        A user_id to follow [Optional]
+      screen_name:
+        A screen_name to follow [Optional]
+      follow:
+        Set to False to disable notifications for the target user
+    Returns:
+      A twitter.User instance representing the befriended user.
+    '''
+    url  = '%s/friendships/create.json' % (self.base_url)
+    data = {}
+    if user_id:
+      data['user_id'] = user_id
+    elif screen_name:
+      data['screen_name'] = screen_name
+    else:
+      raise TwitterError("Specify at least one of user_id or screen_name.")
+    if follow:
+      data['follow'] = 'true'
+    else:
+      data['follow'] = 'false'
+    json = self._FetchUrl(url, post_data=data)
+    data = self._ParseAndCheckTwitter(json)
+    return User.NewFromJsonDict(data)
+
+  def DestroyFriendship(self, user_id=None, screen_name=None):
+    '''Discontinues friendship with a user_id or screen_name.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      user_id:
+        A user_id to unfollow [Optional]
+      screen_name:
+        A screen_name to unfollow [Optional]
+    Returns:
+      A twitter.User instance representing the discontinued friend.
+    '''
+    url  = '%s/friendships/destroy.json' % self.base_url
+    data = {}
+    if user_id:
+      data['user_id'] = user_id
+    elif screen_name:
+      data['screen_name'] = screen_name
+    else:
+      raise TwitterError("Specify at least one of user_id or screen_name.")
+    json = self._FetchUrl(url, post_data=data)
+    data = self._ParseAndCheckTwitter(json)
+    return User.NewFromJsonDict(data)
+
+  def CreateFavorite(self, status=None, id=None, include_entities=True):
+    '''Favorites the specified status object or id as the authenticating user.
+    Returns the favorite status when successful.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      id:
+        The id of the twitter status to mark as a favorite.
+        [Optional]
+      status:
+        The twitter.Status object to mark as a favorite.
+        [Optional]
+      include_entities:
+        The entities node will be omitted when set to False.
+    Returns:
+      A twitter.Status instance representing the newly-marked favorite.
+    '''
+    url  = '%s/favorites/create.json' % self.base_url
+    data = {}
+    if id:
+      data['id'] = id
+    elif status:
+      data['id'] = status.id
+    else:
+      raise TwitterError("Specify id or status")
+    if not include_entities:
+      data['include_entities'] = 'false'
+    json = self._FetchUrl(url, post_data=data)
+    data = self._ParseAndCheckTwitter(json)
+    return Status.NewFromJsonDict(data)
+
+  def DestroyFavorite(self, status=None, id=None, include_entities=True):
+    '''Un-Favorites the specified status object or id as the authenticating user.
+    Returns the un-favorited status when successful.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      id:
+        The id of the twitter status to unmark as a favorite.
+        [Optional]
+      status:
+        The twitter.Status object to unmark as a favorite.
+        [Optional]
+      include_entities:
+        The entities node will be omitted when set to False.
+    Returns:
+      A twitter.Status instance representing the newly-unmarked favorite.
+    '''
+    url  = '%s/favorites/destroy.json' % self.base_url
+    data = {}
+    if id:
+      data['id'] = id
+    elif status:
+      data['id'] = status.id
+    else:
+      raise TwitterError("Specify id or status")
+    if not include_entities:
+      data['include_entities'] = 'false'
+    json = self._FetchUrl(url, post_data=data)
+    data = self._ParseAndCheckTwitter(json)
+    return Status.NewFromJsonDict(data)
+
+  def GetFavorites(self,
+                   user_id=None,
+                   screen_name=None,
+                   count=None,
+                   since_id=None,
+                   max_id=None,
+                   include_entities=True):
+    '''Return a list of Status objects representing favorited tweets.
+    By default, returns the (up to) 20 most recent tweets for the
+    authenticated user.
+
+    Args:
+      user:
+        The twitter name or id of the user whose favorites you are fetching.
+        If not specified, defaults to the authenticated user. [Optional]
+      page:
+        Specifies the page of results to retrieve.
+        Note: there are pagination limits. [Optional]
+    '''
+    parameters = {}
+
+    url = '%s/favorites/list.json' % self.base_url
+
+    if user_id:
+      parameters['user_id'] = user_id
+    elif screen_name:
+      parameters['screen_name'] = user_id
+
+    if since_id:
+      try:
+        parameters['since_id'] = long(since_id)
+      except:
+        raise TwitterError("since_id must be an integer")
+
+    if max_id:
+      try:
+        parameters['max_id'] = long(max_id)
+      except:
+        raise TwitterError("max_id must be an integer")
+
+    if count:
+      try:
+        parameters['count'] = int(count)
+      except:
+        raise TwitterError("count must be an integer")
+
+    if include_entities:
+        parameters['include_entities'] = True
+
+
+    json = self._FetchUrl(url, parameters=parameters)
+    data = self._ParseAndCheckTwitter(json)
+    return [Status.NewFromJsonDict(x) for x in data]
+
+  def GetMentions(self,
+                  count=None,
+                  since_id=None,
+                  max_id=None,
+                  trim_user=False,
+                  contributor_details=False,
+                  include_entities=True):
+    '''Returns the 20 most recent mentions (status containing @screen_name)
+    for the authenticating user.
+
+    Args:
+      count:
+        Specifies the number of tweets to try and retrieve, up to a maximum of
+        200. The value of count is best thought of as a limit to the number of
+        tweets to return because suspended or deleted content is removed after
+        the count has been applied. [Optional]
+      since_id:
+        Returns results with an ID greater than (that is, more recent
+        than) the specified ID. There are limits to the number of
+        Tweets which can be accessed through the API. If the limit of
+        Tweets has occurred since the since_id, the since_id will be
+        forced to the oldest ID available. [Optional]
+      max_id:
+        Returns only statuses with an ID less than
+        (that is, older than) the specified ID.  [Optional]
+      trim_user:
+        When set to True, each tweet returned in a timeline will include a user
+        object including only the status authors numerical ID. Omit this
+        parameter to receive the complete user object.
+      contributor_details:
+        If set to True, this parameter enhances the contributors element of the
+        status response to include the screen_name of the contributor. By
+        default only the user_id of the contributor is included.
+      include_entities:
+        The entities node will be disincluded when set to False.
+
+    Returns:
+      A sequence of twitter.Status instances, one for each mention of the user.
+    '''
+
+    url = '%s/statuses/mentions_timeline.json' % self.base_url
+
+    if not self._oauth_consumer:
+      raise TwitterError("The twitter.Api instance must be authenticated.")
+
+    parameters = {}
+
+    if count:
+      try:
+        parameters['count'] = int(count)
+      except:
+        raise TwitterError("count must be an integer")
+    if since_id:
+      try:
+        parameters['since_id'] = long(since_id)
+      except:
+        raise TwitterError("since_id must be an integer")
+    if max_id:
+      try:
+        parameters['max_id'] = long(max_id)
+      except:
+        raise TwitterError("max_id must be an integer")
+    if trim_user:
+      parameters['trim_user'] = 1
+    if contributor_details:
+      parameters['contributor_details'] = 'true'
+    if not include_entities:
+      parameters['include_entities'] = 'false'
+
+    json = self._FetchUrl(url, parameters=parameters)
+    data = self._ParseAndCheckTwitter(json)
+    return [Status.NewFromJsonDict(x) for x in data]
+
+  def CreateList(self, name, mode=None, description=None):
+    '''Creates a new list with the give name for the authenticated user.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      name:
+        New name for the list
+      mode:
+        'public' or 'private'.
+        Defaults to 'public'. [Optional]
+      description:
+        Description of the list. [Optional]
+
+    Returns:
+      A twitter.List instance representing the new list
+    '''
+    url = '%s/lists/create.json' % self.base_url
+
+    if not self._oauth_consumer:
+      raise TwitterError("The twitter.Api instance must be authenticated.")
+    parameters = {'name': name}
+    if mode is not None:
+      parameters['mode'] = mode
+    if description is not None:
+      parameters['description'] = description
+    json = self._FetchUrl(url, post_data=parameters)
+    data = self._ParseAndCheckTwitter(json)
+    return List.NewFromJsonDict(data)
+
+  def DestroyList(self,
+                  owner_screen_name=False,
+                  owner_id=False,
+                  list_id=None,
+                  slug=None):
+    '''
+    Destroys the list identified by list_id or owner_screen_name/owner_id and
+    slug.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      owner_screen_name:
+        The screen_name of the user who owns the list being requested by a slug.
+      owner_id:
+        The user ID of the user who owns the list being requested by a slug.
+      list_id:
+        The numerical id of the list.
+      slug:
+        You can identify a list by its slug instead of its numerical id. If you
+        decide to do so, note that you'll also have to specify the list owner
+        using the owner_id or owner_screen_name parameters.
+    Returns:
+      A twitter.List instance representing the removed list.
+    '''
+    url  = '%s/lists/destroy.json' % self.base_url
+    data = {}
+    if list_id:
+      try:
+        data['list_id']= long(list_id)
+      except:
+        raise TwitterError("list_id must be an integer")
+    elif slug:
+      data['slug'] = slug
+      if owner_id:
+        try:
+          data['owner_id'] = long(owner_id)
+        except:
+          raise TwitterError("owner_id must be an integer")
+      elif owner_screen_name:
+        data['owner_screen_name'] = owner_screen_name
+      else:
+        raise TwitterError("Identify list by list_id or owner_screen_name/owner_id and slug")
+    else:
+      raise TwitterError("Identify list by list_id or owner_screen_name/owner_id and slug")
+
+    json = self._FetchUrl(url, post_data=data)
+    data = self._ParseAndCheckTwitter(json)
+    return List.NewFromJsonDict(data)
+
+  def CreateSubscription(self,
+                  owner_screen_name=False,
+                  owner_id=False,
+                  list_id=None,
+                  slug=None):
+    '''Creates a subscription to a list by the authenticated user
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      owner_screen_name:
+        The screen_name of the user who owns the list being requested by a slug.
+      owner_id:
+        The user ID of the user who owns the list being requested by a slug.
+      list_id:
+        The numerical id of the list.
+      slug:
+        You can identify a list by its slug instead of its numerical id. If you
+        decide to do so, note that you'll also have to specify the list owner
+        using the owner_id or owner_screen_name parameters.
+    Returns:
+      A twitter.List instance representing the list subscribed to
+    '''
+    url  = '%s/lists/subscribers/create.json' % (self.base_url)
+    if not self._oauth_consumer:
+      raise TwitterError("The twitter.Api instance must be authenticated.")
+    data = {}
+    if list_id:
+      try:
+        data['list_id']= long(list_id)
+      except:
+        raise TwitterError("list_id must be an integer")
+    elif slug:
+      data['slug'] = slug
+      if owner_id:
+        try:
+          data['owner_id'] = long(owner_id)
+        except:
+          raise TwitterError("owner_id must be an integer")
+      elif owner_screen_name:
+        data['owner_screen_name'] = owner_screen_name
+      else:
+        raise TwitterError("Identify list by list_id or owner_screen_name/owner_id and slug")
+    else:
+      raise TwitterError("Identify list by list_id or owner_screen_name/owner_id and slug")
+    json = self._FetchUrl(url, post_data=data)
+    data = self._ParseAndCheckTwitter(json)
+    return List.NewFromJsonDict(data)
+
+  def DestroySubscription(self,
+                  owner_screen_name=False,
+                  owner_id=False,
+                  list_id=None,
+                  slug=None):
+    '''Destroys the subscription to a list for the authenticated user
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      owner_screen_name:
+        The screen_name of the user who owns the list being requested by a slug.
+      owner_id:
+        The user ID of the user who owns the list being requested by a slug.
+      list_id:
+        The numerical id of the list.
+      slug:
+        You can identify a list by its slug instead of its numerical id. If you
+        decide to do so, note that you'll also have to specify the list owner
+        using the owner_id or owner_screen_name parameters.
+    Returns:
+      A twitter.List instance representing the removed list.
+    '''
+    url  = '%s/lists/subscribers/destroy.json' % (self.base_url)
+    if not self._oauth_consumer:
+      raise TwitterError("The twitter.Api instance must be authenticated.")
+    data = {}
+    if list_id:
+      try:
+        data['list_id']= long(list_id)
+      except:
+        raise TwitterError("list_id must be an integer")
+    elif slug:
+      data['slug'] = slug
+      if owner_id:
+        try:
+          data['owner_id'] = long(owner_id)
+        except:
+          raise TwitterError("owner_id must be an integer")
+      elif owner_screen_name:
+        data['owner_screen_name'] = owner_screen_name
+      else:
+        raise TwitterError("Identify list by list_id or owner_screen_name/owner_id and slug")
+    else:
+      raise TwitterError("Identify list by list_id or owner_screen_name/owner_id and slug")
+    json = self._FetchUrl(url, post_data=data)
+    data = self._ParseAndCheckTwitter(json)
+    return List.NewFromJsonDict(data)
+
+  def GetSubscriptions(self, user_id=None, screen_name=None, count=20, cursor=-1):
+    '''
+    Obtain a collection of the lists the specified user is subscribed to, 20
+    lists per page by default. Does not include the user's own lists.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      user_id:
+        The ID of the user for whom to return results for. [Optional]
+      screen_name:
+        The screen name of the user for whom to return results for.
+        [Optional]
+      count:
+       The amount of results to return per page. Defaults to 20.
+       No more than 1000 results will ever be returned in a single page.
+      cursor:
+        "page" value that Twitter will use to start building the
+        list sequence from.  -1 to start at the beginning.
+        Twitter will return in the result the values for next_cursor
+        and previous_cursor. [Optional]
+
+    Returns:
+      A sequence of twitter.List instances, one for each list
+    '''
+    if not self._oauth_consumer:
+      raise TwitterError("twitter.Api instance must be authenticated")
+
+    url = '%s/lists/subscriptions.json' % (self.base_url)
+    parameters = {}
+
+    try:
+      parameters['cursor'] = int(cursor)
+    except:
+      raise TwitterError("cursor must be an integer")
+
+    try:
+      parameters['count'] = int(count)
+    except:
+      raise TwitterError("count must be an integer")
+
+    if user_id is not None:
+      try:
+        parameters['user_id'] = long(user_id)
+      except:
+        raise TwitterError('user_id must be an integer')
+    elif screen_name is not None:
+      parameters['screen_name'] = screen_name
+    else:
+      raise TwitterError('Specify user_id or screen_name')
+
+    json = self._FetchUrl(url, parameters=parameters)
+    data = self._ParseAndCheckTwitter(json)
+    return [List.NewFromJsonDict(x) for x in data['lists']]
+
+  def GetLists(self, user_id=None, screen_name=None, count=None, cursor=-1):
+    '''Fetch the sequence of lists for a user.
+
+    The twitter.Api instance must be authenticated.
+
+    Args:
+      user_id:
+        The ID of the user for whom to return results for. [Optional]
+      screen_name:
+        The screen name of the user for whom to return results for.
+        [Optional]
+      count:
+        The amount of results to return per page. Defaults to 20. No more than
+        1000 results will ever be returned in a single page.
+        [Optional]
+      cursor:
+        "page" value that Twitter will use to start building the
+        list sequence from.  -1 to start at the beginning.
+        Twitter will return in the result the values for next_cursor
+        and previous_cursor. [Optional]
+
+    Returns:
+      A sequence of twitter.List instances, one for each list
+    '''
+    if not self._oauth_consumer:
+      raise TwitterError("twitter.Api instance must be authenticated")
+
+    url = '%s/lists/ownerships.json' % self.base_url
+    result = []
+    parameters = {}
+    if user_id is not None:
+      try:
+        parameters['user_id'] = long(user_id)
+      except:
+        raise TwitterError('user_id must be an integer')
+    elif screen_name is not None:
+      parameters['screen_name'] = screen_name
+    else:
+      raise TwitterError('Specify user_id or screen_name')
+    if count is not None:
+      parameters['count'] = count
+
+    while True:
+      parameters['cursor'] = cursor
+      json = self._FetchUrl(url, parameters=parameters)
+      data = self._ParseAndCheckTwitter(json)
+      result += [List.NewFromJsonDict(x) for x in data['lists']]
+      if 'next_cursor' in data:
+        if data['next_cursor'] == 0 or data['next_cursor'] == data['previous_cursor']:
+          break
+        else:
+          cursor = data['next_cursor']
+      else:
+        break
+    return result
+
+  def VerifyCredentials(self):
+    '''Returns a twitter.User instance if the authenticating user is valid.
+
+    Returns:
+      A twitter.User instance representing that user if the
+      credentials are valid, None otherwise.
+    '''
+    if not self._oauth_consumer:
+      raise TwitterError("Api instance must first be given user credentials.")
+    url = '%s/account/verify_credentials.json' % self.base_url
+    try:
+      json = self._FetchUrl(url, no_cache=True)
+    except urllib2.HTTPError, http_error:
+      if http_error.code == httplib.UNAUTHORIZED:
+        return None
+      else:
+        raise http_error
+    data = self._ParseAndCheckTwitter(json)
+    return User.NewFromJsonDict(data)
+
+  def SetCache(self, cache):
+    '''Override the default cache.  Set to None to prevent caching.
+
+    Args:
+      cache:
+        An instance that supports the same API as the twitter._FileCache
+    '''
+    if cache == DEFAULT_CACHE:
+      self._cache = _FileCache()
+    else:
+      self._cache = cache
+
+  def SetUrllib(self, urllib):
+    '''Override the default urllib implementation.
+
+    Args:
+      urllib:
+        An instance that supports the same API as the urllib2 module
+    '''
+    self._urllib = urllib
+
+  def SetCacheTimeout(self, cache_timeout):
+    '''Override the default cache timeout.
+
+    Args:
+      cache_timeout:
+        Time, in seconds, that responses should be reused.
+    '''
+    self._cache_timeout = cache_timeout
+
+  def SetUserAgent(self, user_agent):
+    '''Override the default user agent
+
+    Args:
+      user_agent:
+        A string that should be send to the server as the User-agent
+    '''
+    self._request_headers['User-Agent'] = user_agent
+
+  def SetXTwitterHeaders(self, client, url, version):
+    '''Set the X-Twitter HTTP headers that will be sent to the server.
+
+    Args:
+      client:
+         The client name as a string.  Will be sent to the server as
+         the 'X-Twitter-Client' header.
+      url:
+         The URL of the meta.xml as a string.  Will be sent to the server
+         as the 'X-Twitter-Client-URL' header.
+      version:
+         The client version as a string.  Will be sent to the server
+         as the 'X-Twitter-Client-Version' header.
+    '''
+    self._request_headers['X-Twitter-Client'] = client
+    self._request_headers['X-Twitter-Client-URL'] = url
+    self._request_headers['X-Twitter-Client-Version'] = version
+
+  def SetSource(self, source):
+    '''Suggest the "from source" value to be displayed on the Twitter web site.
+
+    The value of the 'source' parameter must be first recognized by
+    the Twitter server.  New source values are authorized on a case by
+    case basis by the Twitter development team.
+
+    Args:
+      source:
+        The source name as a string.  Will be sent to the server as
+        the 'source' parameter.
+    '''
+    self._default_params['source'] = source
+
+  def GetRateLimitStatus(self, resources=None):
+    '''Fetch the rate limit status for the currently authorized user.
+
+    Args:
+      resources:
+        A comma seperated list of resource families you want to know the current
+        rate limit disposition of.
+        [Optional]
+
+    Returns:
+      A dictionary containing the time the limit will reset (reset_time),
+      the number of remaining hits allowed before the reset (remaining_hits),
+      the number of hits allowed in a 60-minute period (hourly_limit), and
+      the time of the reset in seconds since The Epoch (reset_time_in_seconds).
+    '''
+    parameters = {}
+    if resources is not None:
+      parameters['resources'] = resources
+
+    url  = '%s/application/rate_limit_status.json' % self.base_url
+    json = self._FetchUrl(url, parameters=parameters, no_cache=True)
+    data = self._ParseAndCheckTwitter(json)
+    return data
+
+  def MaximumHitFrequency(self):
+    '''Determines the minimum number of seconds that a program must wait
+    before hitting the server again without exceeding the rate_limit
+    imposed for the currently authenticated user.
+
+    Returns:
+      The minimum second interval that a program must use so as to not
+      exceed the rate_limit imposed for the user.
+    '''
+    rate_status = self.GetRateLimitStatus()
+    reset_time  = rate_status.get('reset_time', None)
+    limit       = rate_status.get('remaining_hits', None)
+
+    if reset_time:
+      # put the reset time into a datetime object
+      reset = datetime.datetime(*rfc822.parsedate(reset_time)[:7])
+
+      # find the difference in time between now and the reset time + 1 hour
+      delta = reset + datetime.timedelta(hours=1) - datetime.datetime.utcnow()
+
+      if not limit:
+          return int(delta.seconds)
+
+      # determine the minimum number of seconds allowed as a regular interval
+      max_frequency = int(delta.seconds / limit) + 1
+
+      # return the number of seconds
+      return max_frequency
+
+    return 60
+
+  def _BuildUrl(self, url, path_elements=None, extra_params=None):
+    # Break url into constituent parts
+    (scheme, netloc, path, params, query, fragment) = urlparse.urlparse(url)
+
+    # Add any additional path elements to the path
+    if path_elements:
+      # Filter out the path elements that have a value of None
+      p = [i for i in path_elements if i]
+      if not path.endswith('/'):
+        path += '/'
+      path += '/'.join(p)
+
+    # Add any additional query parameters to the query string
+    if extra_params and len(extra_params) > 0:
+      extra_query = self._EncodeParameters(extra_params)
+      # Add it to the existing query
+      if query:
+        query += '&' + extra_query
+      else:
+        query = extra_query
+
+    # Return the rebuilt URL
+    return urlparse.urlunparse((scheme, netloc, path, params, query, fragment))
+
+  def _InitializeRequestHeaders(self, request_headers):
+    if request_headers:
+      self._request_headers = request_headers
+    else:
+      self._request_headers = {}
+
+  def _InitializeUserAgent(self):
+    user_agent = 'Python-urllib/%s (python-twitter/%s)' % \
+                 (self._urllib.__version__, __version__)
+    self.SetUserAgent(user_agent)
+
+  def _InitializeDefaultParameters(self):
+    self._default_params = {}
+
+  def _DecompressGzippedResponse(self, response):
+    raw_data = response.read()
+    if response.headers.get('content-encoding', None) == 'gzip':
+      url_data = gzip.GzipFile(fileobj=StringIO.StringIO(raw_data)).read()
+    else:
+      url_data = raw_data
+    return url_data
+
+  def _Encode(self, s):
+    if self._input_encoding:
+      return unicode(s, self._input_encoding).encode('utf-8')
+    else:
+      return unicode(s).encode('utf-8')
+
+  def _EncodeParameters(self, parameters):
+    '''Return a string in key=value&key=value form
+
+    Values of None are not included in the output string.
+
+    Args:
+      parameters:
+        A dict of (key, value) tuples, where value is encoded as
+        specified by self._encoding
+
+    Returns:
+      A URL-encoded string in "key=value&key=value" form
+    '''
+    if parameters is None:
+      return None
+    else:
+      return urllib.urlencode(dict([(k, self._Encode(v)) for k, v in parameters.items() if v is not None]))
+
+  def _EncodePostData(self, post_data):
+    '''Return a string in key=value&key=value form
+
+    Values are assumed to be encoded in the format specified by self._encoding,
+    and are subsequently URL encoded.
+
+    Args:
+      post_data:
+        A dict of (key, value) tuples, where value is encoded as
+        specified by self._encoding
+
+    Returns:
+      A URL-encoded string in "key=value&key=value" form
+    '''
+    if post_data is None:
+      return None
+    else:
+      return urllib.urlencode(dict([(k, self._Encode(v)) for k, v in post_data.items()]))
+
+  def _ParseAndCheckTwitter(self, json):
+    """Try and parse the JSON returned from Twitter and return
+    an empty dictionary if there is any error. This is a purely
+    defensive check because during some Twitter network outages
+    it will return an HTML failwhale page."""
+    try:
+      data = simplejson.loads(json)
+      self._CheckForTwitterError(data)
+    except ValueError:
+      if "<title>Twitter / Over capacity</title>" in json:
+        raise TwitterError("Capacity Error")
+      if "<title>Twitter / Error</title>" in json:
+        raise TwitterError("Technical Error")
+      raise TwitterError("json decoding")
+
+    return data
+
+  def _CheckForTwitterError(self, data):
+    """Raises a TwitterError if twitter returns an error message.
+
+    Args:
+      data:
+        A python dict created from the Twitter json response
+
+    Raises:
+      TwitterError wrapping the twitter error message if one exists.
+    """
+    # Twitter errors are relatively unlikely, so it is faster
+    # to check first, rather than try and catch the exception
+    if 'error' in data:
+      raise TwitterError(data['error'])
+    if 'errors' in data:
+      raise TwitterError(data['errors'])
+
+  def _FetchUrl(self,
+                url,
+                post_data=None,
+                parameters=None,
+                no_cache=None,
+                use_gzip_compression=None):
+    '''Fetch a URL, optionally caching for a specified time.
+
+    Args:
+      url:
+        The URL to retrieve
+      post_data:
+        A dict of (str, unicode) key/value pairs.
+        If set, POST will be used.
+      parameters:
+        A dict whose key/value pairs should encoded and added
+        to the query string. [Optional]
+      no_cache:
+        If true, overrides the cache on the current request
+      use_gzip_compression:
+        If True, tells the server to gzip-compress the response.
+        It does not apply to POST requests.
+        Defaults to None, which will get the value to use from
+        the instance variable self._use_gzip [Optional]
+
+    Returns:
+      A string containing the body of the response.
+    '''
+    # Build the extra parameters dict
+    extra_params = {}
+    if self._default_params:
+      extra_params.update(self._default_params)
+    if parameters:
+      extra_params.update(parameters)
+
+    if post_data:
+      http_method = "POST"
+    else:
+      http_method = "GET"
+
+    if self._debugHTTP:
+      _debug = 1
+    else:
+      _debug = 0
+
+    http_handler  = self._urllib.HTTPHandler(debuglevel=_debug)
+    https_handler = self._urllib.HTTPSHandler(debuglevel=_debug)
+    http_proxy = os.environ.get('http_proxy')
+    https_proxy = os.environ.get('https_proxy')
+
+    if http_proxy is None or  https_proxy is None :
+      proxy_status = False
+    else :
+      proxy_status = True
+
+    opener = self._urllib.OpenerDirector()
+    opener.add_handler(http_handler)
+    opener.add_handler(https_handler)
+
+    if proxy_status is True :
+      proxy_handler = self._urllib.ProxyHandler({'http':str(http_proxy),'https': str(https_proxy)})
+      opener.add_handler(proxy_handler)
+
+    if use_gzip_compression is None:
+      use_gzip = self._use_gzip
+    else:
+      use_gzip = use_gzip_compression
+
+    # Set up compression
+    if use_gzip and not post_data:
+      opener.addheaders.append(('Accept-Encoding', 'gzip'))
+
+    if self._oauth_consumer is not None:
+      if post_data and http_method == "POST":
+        parameters = post_data.copy()
+
+      req = oauth.Request.from_consumer_and_token(self._oauth_consumer,
+                                                  token=self._oauth_token,
+                                                  http_method=http_method,
+                                                  http_url=url, parameters=parameters)
+
+      req.sign_request(self._signature_method_hmac_sha1, self._oauth_consumer, self._oauth_token)
+
+      headers = req.to_header()
+
+      if http_method == "POST":
+        encoded_post_data = req.to_postdata()
+      else:
+        encoded_post_data = None
+        url = req.to_url()
+    else:
+      url = self._BuildUrl(url, extra_params=extra_params)
+      encoded_post_data = self._EncodePostData(post_data)
+
+    # Open and return the URL immediately if we're not going to cache
+    if encoded_post_data or no_cache or not self._cache or not self._cache_timeout:
+      response = opener.open(url, encoded_post_data)
+      url_data = self._DecompressGzippedResponse(response)
+      opener.close()
+    else:
+      # Unique keys are a combination of the url and the oAuth Consumer Key
+      if self._consumer_key:
+        key = self._consumer_key + ':' + url
+      else:
+        key = url
+
+      # See if it has been cached before
+      last_cached = self._cache.GetCachedTime(key)
+
+      # If the cached version is outdated then fetch another and store it
+      if not last_cached or time.time() >= last_cached + self._cache_timeout:
+        try:
+          response = opener.open(url, encoded_post_data)
+          url_data = self._DecompressGzippedResponse(response)
+          self._cache.Set(key, url_data)
+        except urllib2.HTTPError, e:
+          print e
+        opener.close()
+      else:
+        url_data = self._cache.Get(key)
+
+    # Always return the latest version
+    return url_data
+
+class _FileCacheError(Exception):
+  '''Base exception class for FileCache related errors'''
+
+class _FileCache(object):
+
+  DEPTH = 3
+
+  def __init__(self,root_directory=None):
+    self._InitializeRootDirectory(root_directory)
+
+  def Get(self,key):
+    path = self._GetPath(key)
+    if os.path.exists(path):
+      return open(path).read()
+    else:
+      return None
+
+  def Set(self,key,data):
+    path = self._GetPath(key)
+    directory = os.path.dirname(path)
+    if not os.path.exists(directory):
+      os.makedirs(directory)
+    if not os.path.isdir(directory):
+      raise _FileCacheError('%s exists but is not a directory' % directory)
+    temp_fd, temp_path = tempfile.mkstemp()
+    temp_fp = os.fdopen(temp_fd, 'w')
+    temp_fp.write(data)
+    temp_fp.close()
+    if not path.startswith(self._root_directory):
+      raise _FileCacheError('%s does not appear to live under %s' %
+                            (path, self._root_directory))
+    if os.path.exists(path):
+      os.remove(path)
+    os.rename(temp_path, path)
+
+  def Remove(self,key):
+    path = self._GetPath(key)
+    if not path.startswith(self._root_directory):
+      raise _FileCacheError('%s does not appear to live under %s' %
+                            (path, self._root_directory ))
+    if os.path.exists(path):
+      os.remove(path)
+
+  def GetCachedTime(self,key):
+    path = self._GetPath(key)
+    if os.path.exists(path):
+      return os.path.getmtime(path)
+    else:
+      return None
+
+  def _GetUsername(self):
+    '''Attempt to find the username in a cross-platform fashion.'''
+    try:
+      return os.getenv('USER') or \
+             os.getenv('LOGNAME') or \
+             os.getenv('USERNAME') or \
+             os.getlogin() or \
+             'nobody'
+    except (AttributeError, IOError, OSError), e:
+      return 'nobody'
+
+  def _GetTmpCachePath(self):
+    username = self._GetUsername()
+    cache_directory = 'python.cache_' + username
+    return os.path.join(tempfile.gettempdir(), cache_directory)
+
+  def _InitializeRootDirectory(self, root_directory):
+    if not root_directory:
+      root_directory = self._GetTmpCachePath()
+    root_directory = os.path.abspath(root_directory)
+    if not os.path.exists(root_directory):
+      os.mkdir(root_directory)
+    if not os.path.isdir(root_directory):
+      raise _FileCacheError('%s exists but is not a directory' %
+                            root_directory)
+    self._root_directory = root_directory
+
+  def _GetPath(self,key):
+    try:
+        hashed_key = md5(key).hexdigest()
+    except TypeError:
+        hashed_key = md5.new(key).hexdigest()
+
+    return os.path.join(self._root_directory,
+                        self._GetPrefix(hashed_key),
+                        hashed_key)
+
+  def _GetPrefix(self,hashed_key):
+    return os.path.sep.join(hashed_key[0:_FileCache.DEPTH])
diff --git a/lib/pytz/LICENSE.txt b/lib/pytz/LICENSE.txt
new file mode 100644
index 00000000..5e12fcca
--- /dev/null
+++ b/lib/pytz/LICENSE.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2003-2009 Stuart Bishop <stuart@stuartbishop.net>
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/lib/pytz/README.txt b/lib/pytz/README.txt
new file mode 100644
index 00000000..8b216960
--- /dev/null
+++ b/lib/pytz/README.txt
@@ -0,0 +1,575 @@
+pytz - World Timezone Definitions for Python
+============================================
+
+:Author: Stuart Bishop <stuart@stuartbishop.net>
+
+Introduction
+~~~~~~~~~~~~
+
+pytz brings the Olson tz database into Python. This library allows
+accurate and cross platform timezone calculations using Python 2.4
+or higher. It also solves the issue of ambiguous times at the end
+of daylight saving time, which you can read more about in the Python
+Library Reference (``datetime.tzinfo``).
+
+Almost all of the Olson timezones are supported.
+
+.. note::
+
+    This library differs from the documented Python API for
+    tzinfo implementations; if you want to create local wallclock
+    times you need to use the ``localize()`` method documented in this
+    document. In addition, if you perform date arithmetic on local
+    times that cross DST boundaries, the result may be in an incorrect
+    timezone (ie. subtract 1 minute from 2002-10-27 1:00 EST and you get
+    2002-10-27 0:59 EST instead of the correct 2002-10-27 1:59 EDT). A
+    ``normalize()`` method is provided to correct this. Unfortunately these
+    issues cannot be resolved without modifying the Python datetime
+    implementation (see PEP-431).
+
+
+Installation
+~~~~~~~~~~~~
+
+This package can either be installed from a .egg file using setuptools,
+or from the tarball using the standard Python distutils.
+
+If you are installing from a tarball, run the following command as an
+administrative user::
+
+    python setup.py install
+
+If you are installing using setuptools, you don't even need to download
+anything as the latest version will be downloaded for you
+from the Python package index::
+
+    easy_install --upgrade pytz
+
+If you already have the .egg file, you can use that too::
+
+    easy_install pytz-2008g-py2.6.egg
+
+
+Example & Usage
+~~~~~~~~~~~~~~~
+
+Localized times and date arithmetic
+-----------------------------------
+
+>>> from datetime import datetime, timedelta
+>>> from pytz import timezone
+>>> import pytz
+>>> utc = pytz.utc
+>>> utc.zone
+'UTC'
+>>> eastern = timezone('US/Eastern')
+>>> eastern.zone
+'US/Eastern'
+>>> amsterdam = timezone('Europe/Amsterdam')
+>>> fmt = '%Y-%m-%d %H:%M:%S %Z%z'
+
+This library only supports two ways of building a localized time. The
+first is to use the ``localize()`` method provided by the pytz library.
+This is used to localize a naive datetime (datetime with no timezone
+information):
+
+>>> loc_dt = eastern.localize(datetime(2002, 10, 27, 6, 0, 0))
+>>> print(loc_dt.strftime(fmt))
+2002-10-27 06:00:00 EST-0500
+
+The second way of building a localized time is by converting an existing
+localized time using the standard ``astimezone()`` method:
+
+>>> ams_dt = loc_dt.astimezone(amsterdam)
+>>> ams_dt.strftime(fmt)
+'2002-10-27 12:00:00 CET+0100'
+
+Unfortunately using the tzinfo argument of the standard datetime
+constructors ''does not work'' with pytz for many timezones.
+
+>>> datetime(2002, 10, 27, 12, 0, 0, tzinfo=amsterdam).strftime(fmt)
+'2002-10-27 12:00:00 LMT+0020'
+
+It is safe for timezones without daylight saving transitions though, such
+as UTC:
+
+>>> datetime(2002, 10, 27, 12, 0, 0, tzinfo=pytz.utc).strftime(fmt)
+'2002-10-27 12:00:00 UTC+0000'
+
+The preferred way of dealing with times is to always work in UTC,
+converting to localtime only when generating output to be read
+by humans.
+
+>>> utc_dt = datetime(2002, 10, 27, 6, 0, 0, tzinfo=utc)
+>>> loc_dt = utc_dt.astimezone(eastern)
+>>> loc_dt.strftime(fmt)
+'2002-10-27 01:00:00 EST-0500'
+
+This library also allows you to do date arithmetic using local
+times, although it is more complicated than working in UTC as you
+need to use the ``normalize()`` method to handle daylight saving time
+and other timezone transitions. In this example, ``loc_dt`` is set
+to the instant when daylight saving time ends in the US/Eastern
+timezone.
+
+>>> before = loc_dt - timedelta(minutes=10)
+>>> before.strftime(fmt)
+'2002-10-27 00:50:00 EST-0500'
+>>> eastern.normalize(before).strftime(fmt)
+'2002-10-27 01:50:00 EDT-0400'
+>>> after = eastern.normalize(before + timedelta(minutes=20))
+>>> after.strftime(fmt)
+'2002-10-27 01:10:00 EST-0500'
+
+Creating local times is also tricky, and the reason why working with
+local times is not recommended. Unfortunately, you cannot just pass
+a ``tzinfo`` argument when constructing a datetime (see the next
+section for more details)
+
+>>> dt = datetime(2002, 10, 27, 1, 30, 0)
+>>> dt1 = eastern.localize(dt, is_dst=True)
+>>> dt1.strftime(fmt)
+'2002-10-27 01:30:00 EDT-0400'
+>>> dt2 = eastern.localize(dt, is_dst=False)
+>>> dt2.strftime(fmt)
+'2002-10-27 01:30:00 EST-0500'
+
+Converting between timezones also needs special attention. We also need
+to use the ``normalize()`` method to ensure the conversion is correct.
+
+>>> utc_dt = utc.localize(datetime.utcfromtimestamp(1143408899))
+>>> utc_dt.strftime(fmt)
+'2006-03-26 21:34:59 UTC+0000'
+>>> au_tz = timezone('Australia/Sydney')
+>>> au_dt = au_tz.normalize(utc_dt.astimezone(au_tz))
+>>> au_dt.strftime(fmt)
+'2006-03-27 08:34:59 AEDT+1100'
+>>> utc_dt2 = utc.normalize(au_dt.astimezone(utc))
+>>> utc_dt2.strftime(fmt)
+'2006-03-26 21:34:59 UTC+0000'
+
+You can take shortcuts when dealing with the UTC side of timezone
+conversions. ``normalize()`` and ``localize()`` are not really
+necessary when there are no daylight saving time transitions to
+deal with.
+
+>>> utc_dt = datetime.utcfromtimestamp(1143408899).replace(tzinfo=utc)
+>>> utc_dt.strftime(fmt)
+'2006-03-26 21:34:59 UTC+0000'
+>>> au_tz = timezone('Australia/Sydney')
+>>> au_dt = au_tz.normalize(utc_dt.astimezone(au_tz))
+>>> au_dt.strftime(fmt)
+'2006-03-27 08:34:59 AEDT+1100'
+>>> utc_dt2 = au_dt.astimezone(utc)
+>>> utc_dt2.strftime(fmt)
+'2006-03-26 21:34:59 UTC+0000'
+
+
+``tzinfo`` API
+--------------
+
+The ``tzinfo`` instances returned by the ``timezone()`` function have
+been extended to cope with ambiguous times by adding an ``is_dst``
+parameter to the ``utcoffset()``, ``dst()`` && ``tzname()`` methods.
+
+>>> tz = timezone('America/St_Johns')
+
+>>> normal = datetime(2009, 9, 1)
+>>> ambiguous = datetime(2009, 10, 31, 23, 30)
+
+The ``is_dst`` parameter is ignored for most timestamps. It is only used
+during DST transition ambiguous periods to resulve that ambiguity.
+
+>>> tz.utcoffset(normal, is_dst=True)
+datetime.timedelta(-1, 77400)
+>>> tz.dst(normal, is_dst=True)
+datetime.timedelta(0, 3600)
+>>> tz.tzname(normal, is_dst=True)
+'NDT'
+
+>>> tz.utcoffset(ambiguous, is_dst=True)
+datetime.timedelta(-1, 77400)
+>>> tz.dst(ambiguous, is_dst=True)
+datetime.timedelta(0, 3600)
+>>> tz.tzname(ambiguous, is_dst=True)
+'NDT'
+
+>>> tz.utcoffset(normal, is_dst=False)
+datetime.timedelta(-1, 77400)
+>>> tz.dst(normal, is_dst=False)
+datetime.timedelta(0, 3600)
+>>> tz.tzname(normal, is_dst=False)
+'NDT'
+
+>>> tz.utcoffset(ambiguous, is_dst=False)
+datetime.timedelta(-1, 73800)
+>>> tz.dst(ambiguous, is_dst=False)
+datetime.timedelta(0)
+>>> tz.tzname(ambiguous, is_dst=False)
+'NST'
+
+If ``is_dst`` is not specified, ambiguous timestamps will raise
+an ``pytz.exceptions.AmbiguousTimeError`` exception.
+
+>>> tz.utcoffset(normal)
+datetime.timedelta(-1, 77400)
+>>> tz.dst(normal)
+datetime.timedelta(0, 3600)
+>>> tz.tzname(normal)
+'NDT'
+
+>>> import pytz.exceptions
+>>> try:
+...     tz.utcoffset(ambiguous)
+... except pytz.exceptions.AmbiguousTimeError:
+...     print('pytz.exceptions.AmbiguousTimeError: %s' % ambiguous)
+pytz.exceptions.AmbiguousTimeError: 2009-10-31 23:30:00
+>>> try:
+...     tz.dst(ambiguous)
+... except pytz.exceptions.AmbiguousTimeError:
+...     print('pytz.exceptions.AmbiguousTimeError: %s' % ambiguous)
+pytz.exceptions.AmbiguousTimeError: 2009-10-31 23:30:00
+>>> try:
+...     tz.tzname(ambiguous)
+... except pytz.exceptions.AmbiguousTimeError:
+...     print('pytz.exceptions.AmbiguousTimeError: %s' % ambiguous)
+pytz.exceptions.AmbiguousTimeError: 2009-10-31 23:30:00
+
+
+Problems with Localtime
+~~~~~~~~~~~~~~~~~~~~~~~
+
+The major problem we have to deal with is that certain datetimes
+may occur twice in a year. For example, in the US/Eastern timezone
+on the last Sunday morning in October, the following sequence
+happens:
+
+    - 01:00 EDT occurs
+    - 1 hour later, instead of 2:00am the clock is turned back 1 hour
+      and 01:00 happens again (this time 01:00 EST)
+
+In fact, every instant between 01:00 and 02:00 occurs twice. This means
+that if you try and create a time in the 'US/Eastern' timezone
+the standard datetime syntax, there is no way to specify if you meant
+before of after the end-of-daylight-saving-time transition. Using the
+pytz custom syntax, the best you can do is make an educated guess:
+
+>>> loc_dt = eastern.localize(datetime(2002, 10, 27, 1, 30, 00))
+>>> loc_dt.strftime(fmt)
+'2002-10-27 01:30:00 EST-0500'
+
+As you can see, the system has chosen one for you and there is a 50%
+chance of it being out by one hour. For some applications, this does
+not matter. However, if you are trying to schedule meetings with people
+in different timezones or analyze log files it is not acceptable. 
+
+The best and simplest solution is to stick with using UTC.  The pytz
+package encourages using UTC for internal timezone representation by
+including a special UTC implementation based on the standard Python
+reference implementation in the Python documentation.
+
+The UTC timezone unpickles to be the same instance, and pickles to a
+smaller size than other pytz tzinfo instances.  The UTC implementation
+can be obtained as pytz.utc, pytz.UTC, or pytz.timezone('UTC').
+
+>>> import pickle, pytz
+>>> dt = datetime(2005, 3, 1, 14, 13, 21, tzinfo=utc)
+>>> naive = dt.replace(tzinfo=None)
+>>> p = pickle.dumps(dt, 1)
+>>> naive_p = pickle.dumps(naive, 1)
+>>> len(p) - len(naive_p)
+17
+>>> new = pickle.loads(p)
+>>> new == dt
+True
+>>> new is dt
+False
+>>> new.tzinfo is dt.tzinfo
+True
+>>> pytz.utc is pytz.UTC is pytz.timezone('UTC')
+True
+
+Note that some other timezones are commonly thought of as the same (GMT,
+Greenwich, Universal, etc.). The definition of UTC is distinct from these
+other timezones, and they are not equivalent. For this reason, they will
+not compare the same in Python.
+
+>>> utc == pytz.timezone('GMT')
+False
+
+See the section `What is UTC`_, below.
+
+If you insist on working with local times, this library provides a
+facility for constructing them unambiguously:
+
+>>> loc_dt = datetime(2002, 10, 27, 1, 30, 00)
+>>> est_dt = eastern.localize(loc_dt, is_dst=True)
+>>> edt_dt = eastern.localize(loc_dt, is_dst=False)
+>>> print(est_dt.strftime(fmt) + ' / ' + edt_dt.strftime(fmt))
+2002-10-27 01:30:00 EDT-0400 / 2002-10-27 01:30:00 EST-0500
+
+If you pass None as the is_dst flag to localize(), pytz will refuse to
+guess and raise exceptions if you try to build ambiguous or non-existent
+times.
+
+For example, 1:30am on 27th Oct 2002 happened twice in the US/Eastern
+timezone when the clocks where put back at the end of Daylight Saving
+Time:
+
+>>> dt = datetime(2002, 10, 27, 1, 30, 00)
+>>> try:
+...     eastern.localize(dt, is_dst=None)
+... except pytz.exceptions.AmbiguousTimeError:
+...     print('pytz.exceptions.AmbiguousTimeError: %s' % dt)
+pytz.exceptions.AmbiguousTimeError: 2002-10-27 01:30:00
+
+Similarly, 2:30am on 7th April 2002 never happened at all in the
+US/Eastern timezone, as the clocks where put forward at 2:00am skipping
+the entire hour:
+
+>>> dt = datetime(2002, 4, 7, 2, 30, 00)
+>>> try:
+...     eastern.localize(dt, is_dst=None)
+... except pytz.exceptions.NonExistentTimeError:
+...     print('pytz.exceptions.NonExistentTimeError: %s' % dt)
+pytz.exceptions.NonExistentTimeError: 2002-04-07 02:30:00
+
+Both of these exceptions share a common base class to make error handling
+easier:
+
+>>> isinstance(pytz.AmbiguousTimeError(), pytz.InvalidTimeError)
+True
+>>> isinstance(pytz.NonExistentTimeError(), pytz.InvalidTimeError)
+True
+
+
+A special case is where countries change their timezone definitions
+with no daylight savings time switch. For example, in 1915 Warsaw
+switched from Warsaw time to Central European time with no daylight savings
+transition. So at the stroke of midnight on August 5th 1915 the clocks
+were wound back 24 minutes creating an ambiguous time period that cannot
+be specified without referring to the timezone abbreviation or the
+actual UTC offset. In this case midnight happened twice, neither time
+during a daylight saving time period. pytz handles this transition by
+treating the ambiguous period before the switch as daylight savings
+time, and the ambiguous period after as standard time.
+
+
+>>> warsaw = pytz.timezone('Europe/Warsaw')
+>>> amb_dt1 = warsaw.localize(datetime(1915, 8, 4, 23, 59, 59), is_dst=True)
+>>> amb_dt1.strftime(fmt)
+'1915-08-04 23:59:59 WMT+0124'
+>>> amb_dt2 = warsaw.localize(datetime(1915, 8, 4, 23, 59, 59), is_dst=False)
+>>> amb_dt2.strftime(fmt)
+'1915-08-04 23:59:59 CET+0100'
+>>> switch_dt = warsaw.localize(datetime(1915, 8, 5, 00, 00, 00), is_dst=False)
+>>> switch_dt.strftime(fmt)
+'1915-08-05 00:00:00 CET+0100'
+>>> str(switch_dt - amb_dt1)
+'0:24:01'
+>>> str(switch_dt - amb_dt2)
+'0:00:01'
+
+The best way of creating a time during an ambiguous time period is
+by converting from another timezone such as UTC:
+
+>>> utc_dt = datetime(1915, 8, 4, 22, 36, tzinfo=pytz.utc)
+>>> utc_dt.astimezone(warsaw).strftime(fmt)
+'1915-08-04 23:36:00 CET+0100'
+
+The standard Python way of handling all these ambiguities is not to
+handle them, such as demonstrated in this example using the US/Eastern
+timezone definition from the Python documentation (Note that this
+implementation only works for dates between 1987 and 2006 - it is
+included for tests only!):
+
+>>> from pytz.reference import Eastern # pytz.reference only for tests
+>>> dt = datetime(2002, 10, 27, 0, 30, tzinfo=Eastern)
+>>> str(dt)
+'2002-10-27 00:30:00-04:00'
+>>> str(dt + timedelta(hours=1))
+'2002-10-27 01:30:00-05:00'
+>>> str(dt + timedelta(hours=2))
+'2002-10-27 02:30:00-05:00'
+>>> str(dt + timedelta(hours=3))
+'2002-10-27 03:30:00-05:00'
+
+Notice the first two results? At first glance you might think they are
+correct, but taking the UTC offset into account you find that they are
+actually two hours appart instead of the 1 hour we asked for.
+
+>>> from pytz.reference import UTC # pytz.reference only for tests
+>>> str(dt.astimezone(UTC))
+'2002-10-27 04:30:00+00:00'
+>>> str((dt + timedelta(hours=1)).astimezone(UTC))
+'2002-10-27 06:30:00+00:00'
+
+
+Country Information
+~~~~~~~~~~~~~~~~~~~
+
+A mechanism is provided to access the timezones commonly in use
+for a particular country, looked up using the ISO 3166 country code.
+It returns a list of strings that can be used to retrieve the relevant
+tzinfo instance using ``pytz.timezone()``:
+
+>>> print(' '.join(pytz.country_timezones['nz']))
+Pacific/Auckland Pacific/Chatham
+
+The Olson database comes with a ISO 3166 country code to English country
+name mapping that pytz exposes as a dictionary:
+
+>>> print(pytz.country_names['nz'])
+New Zealand
+
+
+What is UTC
+~~~~~~~~~~~
+
+'UTC' is `Coordinated Universal Time`_. It is a successor to, but distinct
+from, Greenwich Mean Time (GMT) and the various definitions of Universal
+Time. UTC is now the worldwide standard for regulating clocks and time
+measurement.
+
+All other timezones are defined relative to UTC, and include offsets like
+UTC+0800 - hours to add or subtract from UTC to derive the local time. No
+daylight saving time occurs in UTC, making it a useful timezone to perform
+date arithmetic without worrying about the confusion and ambiguities caused
+by daylight saving time transitions, your country changing its timezone, or
+mobile computers that roam through multiple timezones.
+
+..  _Coordinated Universal Time: https://en.wikipedia.org/wiki/Coordinated_Universal_Time
+
+
+Helpers
+~~~~~~~
+
+There are two lists of timezones provided.
+
+``all_timezones`` is the exhaustive list of the timezone names that can
+be used.
+
+>>> from pytz import all_timezones
+>>> len(all_timezones) >= 500
+True
+>>> 'Etc/Greenwich' in all_timezones
+True
+
+``common_timezones`` is a list of useful, current timezones. It doesn't
+contain deprecated zones or historical zones, except for a few I've
+deemed in common usage, such as US/Eastern (open a bug report if you
+think other timezones are deserving of being included here). It is also
+a sequence of strings.
+
+>>> from pytz import common_timezones
+>>> len(common_timezones) < len(all_timezones)
+True
+>>> 'Etc/Greenwich' in common_timezones
+False
+>>> 'Australia/Melbourne' in common_timezones
+True
+>>> 'US/Eastern' in common_timezones
+True
+>>> 'Canada/Eastern' in common_timezones
+True
+>>> 'US/Pacific-New' in all_timezones
+True
+>>> 'US/Pacific-New' in common_timezones
+False
+
+Both ``common_timezones`` and ``all_timezones`` are alphabetically
+sorted:
+
+>>> common_timezones_dupe = common_timezones[:]
+>>> common_timezones_dupe.sort()
+>>> common_timezones == common_timezones_dupe
+True
+>>> all_timezones_dupe = all_timezones[:]
+>>> all_timezones_dupe.sort()
+>>> all_timezones == all_timezones_dupe
+True
+
+``all_timezones`` and ``common_timezones`` are also available as sets.
+
+>>> from pytz import all_timezones_set, common_timezones_set
+>>> 'US/Eastern' in all_timezones_set
+True
+>>> 'US/Eastern' in common_timezones_set
+True
+>>> 'Australia/Victoria' in common_timezones_set
+False
+
+You can also retrieve lists of timezones used by particular countries
+using the ``country_timezones()`` function. It requires an ISO-3166
+two letter country code.
+
+>>> from pytz import country_timezones
+>>> print(' '.join(country_timezones('ch')))
+Europe/Zurich
+>>> print(' '.join(country_timezones('CH')))
+Europe/Zurich
+
+
+License
+~~~~~~~
+
+MIT license.
+
+This code is also available as part of Zope 3 under the Zope Public
+License,  Version 2.1 (ZPL).
+
+I'm happy to relicense this code if necessary for inclusion in other
+open source projects.
+
+
+Latest Versions
+~~~~~~~~~~~~~~~
+
+This package will be updated after releases of the Olson timezone
+database.  The latest version can be downloaded from the `Python Package
+Index <http://pypi.python.org/pypi/pytz/>`_.  The code that is used
+to generate this distribution is hosted on launchpad.net and available
+using the `Bazaar version control system <http://bazaar-vcs.org>`_
+using::
+
+    bzr branch lp:pytz
+
+Announcements of new releases are made on
+`Launchpad <https://launchpad.net/pytz>`_, and the
+`Atom feed <http://feeds.launchpad.net/pytz/announcements.atom>`_
+hosted there.
+
+
+Bugs, Feature Requests & Patches
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Bugs can be reported using `Launchpad <https://bugs.launchpad.net/pytz>`_.
+
+
+Issues & Limitations
+~~~~~~~~~~~~~~~~~~~~
+
+- Offsets from UTC are rounded to the nearest whole minute, so timezones
+  such as Europe/Amsterdam pre 1937 will be up to 30 seconds out. This
+  is a limitation of the Python datetime library.
+
+- If you think a timezone definition is incorrect, I probably can't fix
+  it. pytz is a direct translation of the Olson timezone database, and
+  changes to the timezone definitions need to be made to this source.
+  If you find errors they should be reported to the time zone mailing
+  list, linked from http://www.iana.org/time-zones.
+
+
+Further Reading
+~~~~~~~~~~~~~~~
+
+More info than you want to know about timezones:
+http://www.twinsun.com/tz/tz-link.htm
+
+
+Contact
+~~~~~~~
+
+Stuart Bishop <stuart@stuartbishop.net>
+
+
diff --git a/lib/pytz/__init__.py b/lib/pytz/__init__.py
index 96409e2d..e5cbe56d 100644
--- a/lib/pytz/__init__.py
+++ b/lib/pytz/__init__.py
@@ -8,25 +8,12 @@ See the datetime section of the Python Library Reference for information
 on how to use these modules.
 '''
 
-import sys
-import datetime
-import os.path
-
-from pytz.exceptions import AmbiguousTimeError
-from pytz.exceptions import InvalidTimeError
-from pytz.exceptions import NonExistentTimeError
-from pytz.exceptions import UnknownTimeZoneError
-from pytz.lazy import LazyDict, LazyList, LazySet  # noqa
-from pytz.tzinfo import unpickler, BaseTzInfo
-from pytz.tzfile import build_tzinfo
-
-
-# The IANA (nee Olson) database is updated several times a year.
-OLSON_VERSION = '2024b'
-VERSION = '2024.2'  # pip compatible version number.
+# The Olson database is updated several times a year.
+OLSON_VERSION = '2014j'
+VERSION = '2014.10'  # Switching to pip compatible version numbering.
 __version__ = VERSION
 
-OLSEN_VERSION = OLSON_VERSION  # Old releases had this misspelling
+OLSEN_VERSION = OLSON_VERSION # Old releases had this misspelling
 
 __all__ = [
     'timezone', 'utc', 'country_timezones', 'country_names',
@@ -34,11 +21,28 @@ __all__ = [
     'NonExistentTimeError', 'UnknownTimeZoneError',
     'all_timezones', 'all_timezones_set',
     'common_timezones', 'common_timezones_set',
-    'BaseTzInfo', 'FixedOffset',
-]
+    ]
+
+import sys, datetime, os.path, gettext
+
+try:
+    from pkg_resources import resource_stream
+except ImportError:
+    resource_stream = None
+
+from pytz.exceptions import AmbiguousTimeError
+from pytz.exceptions import InvalidTimeError
+from pytz.exceptions import NonExistentTimeError
+from pytz.exceptions import UnknownTimeZoneError
+from pytz.lazy import LazyDict, LazyList, LazySet
+from pytz.tzinfo import unpickler
+from pytz.tzfile import build_tzinfo, _byte_string
 
 
-if sys.version_info[0] > 2:  # Python 3.x
+try:
+    unicode
+
+except NameError: # Python 3.x
 
     # Python 3.x doesn't have unicode(), making writing code
     # for Python 2.3 and Python 3.x a pain.
@@ -53,13 +57,10 @@ if sys.version_info[0] > 2:  # Python 3.x
             ...
         UnicodeEncodeError: ...
         """
-        if type(s) == bytes:
-            s = s.decode('ASCII')
-        else:
-            s.encode('ASCII')  # Raise an exception if not ASCII
-        return s  # But the string - not a byte string.
+        s.encode('US-ASCII') # Raise an exception if not ASCII
+        return s # But return the original string - not a byte string.
 
-else:  # Python 2.x
+else: # Python 2.x
 
     def ascii(s):
         r"""
@@ -72,7 +73,7 @@ else:  # Python 2.x
             ...
         UnicodeEncodeError: ...
         """
-        return s.encode('ASCII')
+        return s.encode('US-ASCII')
 
 
 def open_resource(name):
@@ -80,55 +81,49 @@ def open_resource(name):
 
     Uses the pkg_resources module if available and no standard file
     found at the calculated location.
-
-    It is possible to specify different location for zoneinfo
-    subdir by using the PYTZ_TZDATADIR environment variable.
     """
     name_parts = name.lstrip('/').split('/')
     for part in name_parts:
-        if part == os.path.pardir or os.sep in part:
+        if part == os.path.pardir or os.path.sep in part:
             raise ValueError('Bad path segment: %r' % part)
-    zoneinfo_dir = os.environ.get('PYTZ_TZDATADIR', None)
-    if zoneinfo_dir is not None:
-        filename = os.path.join(zoneinfo_dir, *name_parts)
-    else:
-        filename = os.path.join(os.path.dirname(__file__),
-                                'zoneinfo', *name_parts)
-        if not os.path.exists(filename):
-            # http://bugs.launchpad.net/bugs/383171 - we avoid using this
-            # unless absolutely necessary to help when a broken version of
-            # pkg_resources is installed.
-            try:
-                from pkg_resources import resource_stream
-            except ImportError:
-                resource_stream = None
-
-            if resource_stream is not None:
-                return resource_stream(__name__, 'zoneinfo/' + name)
+    filename = os.path.join(os.path.dirname(__file__),
+                            'zoneinfo', *name_parts)
+    if not os.path.exists(filename) and resource_stream is not None:
+        # http://bugs.launchpad.net/bugs/383171 - we avoid using this
+        # unless absolutely necessary to help when a broken version of
+        # pkg_resources is installed.
+        return resource_stream(__name__, 'zoneinfo/' + name)
     return open(filename, 'rb')
 
 
 def resource_exists(name):
     """Return true if the given resource exists"""
     try:
-        if os.environ.get('PYTZ_SKIPEXISTSCHECK', ''):
-            # In "standard" distributions, we can assume that
-            # all the listed timezones are present. As an
-            # import-speed optimization, you can set the
-            # PYTZ_SKIPEXISTSCHECK flag to skip checking
-            # for the presence of the resource file on disk.
-            return True
         open_resource(name).close()
         return True
     except IOError:
         return False
 
 
+# Enable this when we get some translations?
+# We want an i18n API that is useful to programs using Python's gettext
+# module, as well as the Zope3 i18n package. Perhaps we should just provide
+# the POT file and translations, and leave it up to callers to make use
+# of them.
+# 
+# t = gettext.translation(
+#         'pytz', os.path.join(os.path.dirname(__file__), 'locales'),
+#         fallback=True
+#         )
+# def _(timezone_name):
+#     """Translate a timezone name using the current locale, returning Unicode"""
+#     return t.ugettext(timezone_name)
+
+
 _tzinfo_cache = {}
 
-
 def timezone(zone):
-    r''' Return a datetime.tzinfo implementation for the given timezone
+    r''' Return a datetime.tzinfo implementation for the given timezone 
 
     >>> from datetime import datetime, timedelta
     >>> utc = timezone('UTC')
@@ -164,9 +159,6 @@ def timezone(zone):
     Unknown
 
     '''
-    if zone is None:
-        raise UnknownTimeZoneError(None)
-
     if zone.upper() == 'UTC':
         return utc
 
@@ -176,9 +168,9 @@ def timezone(zone):
         # All valid timezones are ASCII
         raise UnknownTimeZoneError(zone)
 
-    zone = _case_insensitive_zone_lookup(_unmunge_zone(zone))
+    zone = _unmunge_zone(zone)
     if zone not in _tzinfo_cache:
-        if zone in all_timezones_set:  # noqa
+        if zone in all_timezones_set:
             fp = open_resource(zone)
             try:
                 _tzinfo_cache[zone] = build_tzinfo(zone, fp)
@@ -195,22 +187,11 @@ def _unmunge_zone(zone):
     return zone.replace('_plus_', '+').replace('_minus_', '-')
 
 
-_all_timezones_lower_to_standard = None
-
-
-def _case_insensitive_zone_lookup(zone):
-    """case-insensitively matching timezone, else return zone unchanged"""
-    global _all_timezones_lower_to_standard
-    if _all_timezones_lower_to_standard is None:
-        _all_timezones_lower_to_standard = dict((tz.lower(), tz) for tz in _all_timezones_unchecked)  # noqa
-    return _all_timezones_lower_to_standard.get(zone.lower()) or zone  # noqa
-
-
 ZERO = datetime.timedelta(0)
 HOUR = datetime.timedelta(hours=1)
 
 
-class UTC(BaseTzInfo):
+class UTC(datetime.tzinfo):
     """UTC
 
     Optimized UTC implementation. It unpickles using the single module global
@@ -260,18 +241,18 @@ class UTC(BaseTzInfo):
         return "UTC"
 
 
-UTC = utc = UTC()  # UTC is a singleton
+UTC = utc = UTC() # UTC is a singleton
 
 
 def _UTC():
     """Factory function for utc unpickling.
 
-    Makes sure that unpickling a utc instance always returns the same
+    Makes sure that unpickling a utc instance always returns the same 
     module global.
 
     These examples belong in the UTC class above, but it is obscured; or in
-    the README.rst, but we are not depending on Python 2.4 so integrating
-    the README.rst examples with the unit tests is not trivial.
+    the README.txt, but we are not depending on Python 2.4 so integrating
+    the README.txt examples with the unit tests is not trivial.
 
     >>> import datetime, pickle
     >>> dt = datetime.datetime(2005, 3, 1, 14, 13, 21, tzinfo=utc)
@@ -293,8 +274,6 @@ def _UTC():
     False
     """
     return utc
-
-
 _UTC.__safe_for_unpickling__ = True
 
 
@@ -305,11 +284,10 @@ def _p(*args):
     by shortening the path.
     """
     return unpickler(*args)
-
-
 _p.__safe_for_unpickling__ = True
 
 
+
 class _CountryTimezoneDict(LazyDict):
     """Map ISO 3166 country code to a list of timezone names commonly used
     in that country.
@@ -351,11 +329,11 @@ class _CountryTimezoneDict(LazyDict):
         zone_tab = open_resource('zone.tab')
         try:
             for line in zone_tab:
-                line = line.decode('UTF-8')
+                line = line.decode('US-ASCII')
                 if line.startswith('#'):
                     continue
                 code, coordinates, zone = line.split(None, 4)[:3]
-                if zone not in all_timezones_set:  # noqa
+                if zone not in all_timezones_set:
                     continue
                 try:
                     data[code].append(zone)
@@ -365,7 +343,6 @@ class _CountryTimezoneDict(LazyDict):
         finally:
             zone_tab.close()
 
-
 country_timezones = _CountryTimezoneDict()
 
 
@@ -380,7 +357,7 @@ class _CountryNameDict(LazyDict):
         zone_tab = open_resource('iso3166.tab')
         try:
             for line in zone_tab.readlines():
-                line = line.decode('UTF-8')
+                line = line.decode('US-ASCII')
                 if line.startswith('#'):
                     continue
                 code, name = line.split(None, 1)
@@ -389,7 +366,6 @@ class _CountryNameDict(LazyDict):
         finally:
             zone_tab.close()
 
-
 country_names = _CountryNameDict()
 
 
@@ -397,7 +373,7 @@ country_names = _CountryNameDict()
 
 class _FixedOffset(datetime.tzinfo):
 
-    zone = None  # to match the standard pytz API
+    zone = None # to match the standard pytz API
 
     def __init__(self, minutes):
         if abs(minutes) >= 1440:
@@ -428,31 +404,29 @@ class _FixedOffset(datetime.tzinfo):
 
     def normalize(self, dt, is_dst=False):
         '''Correct the timezone information on the given datetime'''
-        if dt.tzinfo is self:
-            return dt
         if dt.tzinfo is None:
             raise ValueError('Naive time - no tzinfo set')
-        return dt.astimezone(self)
+        return dt.replace(tzinfo=self)
 
 
-def FixedOffset(offset, _tzinfos={}):
+def FixedOffset(offset, _tzinfos = {}):
     """return a fixed-offset timezone based off a number of minutes.
 
         >>> one = FixedOffset(-330)
         >>> one
         pytz.FixedOffset(-330)
-        >>> str(one.utcoffset(datetime.datetime.now()))
-        '-1 day, 18:30:00'
-        >>> str(one.dst(datetime.datetime.now()))
-        '0:00:00'
+        >>> one.utcoffset(datetime.datetime.now())
+        datetime.timedelta(-1, 66600)
+        >>> one.dst(datetime.datetime.now())
+        datetime.timedelta(0)
 
         >>> two = FixedOffset(1380)
         >>> two
         pytz.FixedOffset(1380)
-        >>> str(two.utcoffset(datetime.datetime.now()))
-        '23:00:00'
-        >>> str(two.dst(datetime.datetime.now()))
-        '0:00:00'
+        >>> two.utcoffset(datetime.datetime.now())
+        datetime.timedelta(0, 82800)
+        >>> two.dst(datetime.datetime.now())
+        datetime.timedelta(0)
 
     The datetime.timedelta must be between the range of -1 and 1 day,
     non-inclusive.
@@ -501,20 +475,19 @@ def FixedOffset(offset, _tzinfos={}):
 
     return info
 
-
 FixedOffset.__safe_for_unpickling__ = True
 
 
 def _test():
-    import doctest
+    import doctest, os, sys
     sys.path.insert(0, os.pardir)
     import pytz
     return doctest.testmod(pytz)
 
-
 if __name__ == '__main__':
     _test()
-_all_timezones_unchecked = \
+
+all_timezones = \
 ['Africa/Abidjan',
  'Africa/Accra',
  'Africa/Addis_Ababa',
@@ -610,7 +583,6 @@ _all_timezones_unchecked = \
  'America/Cayman',
  'America/Chicago',
  'America/Chihuahua',
- 'America/Ciudad_Juarez',
  'America/Coral_Harbour',
  'America/Cordoba',
  'America/Costa_Rica',
@@ -627,7 +599,6 @@ _all_timezones_unchecked = \
  'America/Eirunepe',
  'America/El_Salvador',
  'America/Ensenada',
- 'America/Fort_Nelson',
  'America/Fort_Wayne',
  'America/Fortaleza',
  'America/Glace_Bay',
@@ -691,7 +662,6 @@ _all_timezones_unchecked = \
  'America/North_Dakota/Beulah',
  'America/North_Dakota/Center',
  'America/North_Dakota/New_Salem',
- 'America/Nuuk',
  'America/Ojinaga',
  'America/Panama',
  'America/Pangnirtung',
@@ -702,7 +672,6 @@ _all_timezones_unchecked = \
  'America/Porto_Acre',
  'America/Porto_Velho',
  'America/Puerto_Rico',
- 'America/Punta_Arenas',
  'America/Rainy_River',
  'America/Rankin_Inlet',
  'America/Recife',
@@ -758,12 +727,10 @@ _all_timezones_unchecked = \
  'Asia/Aqtobe',
  'Asia/Ashgabat',
  'Asia/Ashkhabad',
- 'Asia/Atyrau',
  'Asia/Baghdad',
  'Asia/Bahrain',
  'Asia/Baku',
  'Asia/Bangkok',
- 'Asia/Barnaul',
  'Asia/Beirut',
  'Asia/Bishkek',
  'Asia/Brunei',
@@ -779,7 +746,6 @@ _all_timezones_unchecked = \
  'Asia/Dili',
  'Asia/Dubai',
  'Asia/Dushanbe',
- 'Asia/Famagusta',
  'Asia/Gaza',
  'Asia/Harbin',
  'Asia/Hebron',
@@ -818,7 +784,6 @@ _all_timezones_unchecked = \
  'Asia/Pontianak',
  'Asia/Pyongyang',
  'Asia/Qatar',
- 'Asia/Qostanay',
  'Asia/Qyzylorda',
  'Asia/Rangoon',
  'Asia/Riyadh',
@@ -837,7 +802,6 @@ _all_timezones_unchecked = \
  'Asia/Thimbu',
  'Asia/Thimphu',
  'Asia/Tokyo',
- 'Asia/Tomsk',
  'Asia/Ujung_Pandang',
  'Asia/Ulaanbaatar',
  'Asia/Ulan_Bator',
@@ -846,7 +810,6 @@ _all_timezones_unchecked = \
  'Asia/Vientiane',
  'Asia/Vladivostok',
  'Asia/Yakutsk',
- 'Asia/Yangon',
  'Asia/Yekaterinburg',
  'Asia/Yerevan',
  'Atlantic/Azores',
@@ -892,6 +855,7 @@ _all_timezones_unchecked = \
  'CST6CDT',
  'Canada/Atlantic',
  'Canada/Central',
+ 'Canada/East-Saskatchewan',
  'Canada/Eastern',
  'Canada/Mountain',
  'Canada/Newfoundland',
@@ -943,7 +907,6 @@ _all_timezones_unchecked = \
  'Etc/Zulu',
  'Europe/Amsterdam',
  'Europe/Andorra',
- 'Europe/Astrakhan',
  'Europe/Athens',
  'Europe/Belfast',
  'Europe/Belgrade',
@@ -964,8 +927,6 @@ _all_timezones_unchecked = \
  'Europe/Jersey',
  'Europe/Kaliningrad',
  'Europe/Kiev',
- 'Europe/Kirov',
- 'Europe/Kyiv',
  'Europe/Lisbon',
  'Europe/Ljubljana',
  'Europe/London',
@@ -986,7 +947,6 @@ _all_timezones_unchecked = \
  'Europe/Samara',
  'Europe/San_Marino',
  'Europe/Sarajevo',
- 'Europe/Saratov',
  'Europe/Simferopol',
  'Europe/Skopje',
  'Europe/Sofia',
@@ -994,7 +954,6 @@ _all_timezones_unchecked = \
  'Europe/Tallinn',
  'Europe/Tirane',
  'Europe/Tiraspol',
- 'Europe/Ulyanovsk',
  'Europe/Uzhgorod',
  'Europe/Vaduz',
  'Europe/Vatican',
@@ -1060,7 +1019,6 @@ _all_timezones_unchecked = \
  'Pacific/Guam',
  'Pacific/Honolulu',
  'Pacific/Johnston',
- 'Pacific/Kanton',
  'Pacific/Kiritimati',
  'Pacific/Kosrae',
  'Pacific/Kwajalein',
@@ -1105,6 +1063,7 @@ _all_timezones_unchecked = \
  'US/Michigan',
  'US/Mountain',
  'US/Pacific',
+ 'US/Pacific-New',
  'US/Samoa',
  'UTC',
  'Universal',
@@ -1112,7 +1071,7 @@ _all_timezones_unchecked = \
  'WET',
  'Zulu']
 all_timezones = LazyList(
-        tz for tz in _all_timezones_unchecked if resource_exists(tz))
+        tz for tz in all_timezones if resource_exists(tz))
         
 all_timezones_set = LazySet(all_timezones)
 common_timezones = \
@@ -1205,7 +1164,6 @@ common_timezones = \
  'America/Cayman',
  'America/Chicago',
  'America/Chihuahua',
- 'America/Ciudad_Juarez',
  'America/Costa_Rica',
  'America/Creston',
  'America/Cuiaba',
@@ -1219,9 +1177,9 @@ common_timezones = \
  'America/Edmonton',
  'America/Eirunepe',
  'America/El_Salvador',
- 'America/Fort_Nelson',
  'America/Fortaleza',
  'America/Glace_Bay',
+ 'America/Godthab',
  'America/Goose_Bay',
  'America/Grand_Turk',
  'America/Grenada',
@@ -1266,29 +1224,32 @@ common_timezones = \
  'America/Moncton',
  'America/Monterrey',
  'America/Montevideo',
+ 'America/Montreal',
  'America/Montserrat',
  'America/Nassau',
  'America/New_York',
+ 'America/Nipigon',
  'America/Nome',
  'America/Noronha',
  'America/North_Dakota/Beulah',
  'America/North_Dakota/Center',
  'America/North_Dakota/New_Salem',
- 'America/Nuuk',
  'America/Ojinaga',
  'America/Panama',
+ 'America/Pangnirtung',
  'America/Paramaribo',
  'America/Phoenix',
  'America/Port-au-Prince',
  'America/Port_of_Spain',
  'America/Porto_Velho',
  'America/Puerto_Rico',
- 'America/Punta_Arenas',
+ 'America/Rainy_River',
  'America/Rankin_Inlet',
  'America/Recife',
  'America/Regina',
  'America/Resolute',
  'America/Rio_Branco',
+ 'America/Santa_Isabel',
  'America/Santarem',
  'America/Santiago',
  'America/Santo_Domingo',
@@ -1304,6 +1265,7 @@ common_timezones = \
  'America/Swift_Current',
  'America/Tegucigalpa',
  'America/Thule',
+ 'America/Thunder_Bay',
  'America/Tijuana',
  'America/Toronto',
  'America/Tortola',
@@ -1311,6 +1273,7 @@ common_timezones = \
  'America/Whitehorse',
  'America/Winnipeg',
  'America/Yakutat',
+ 'America/Yellowknife',
  'Antarctica/Casey',
  'Antarctica/Davis',
  'Antarctica/DumontDUrville',
@@ -1330,23 +1293,21 @@ common_timezones = \
  'Asia/Aqtau',
  'Asia/Aqtobe',
  'Asia/Ashgabat',
- 'Asia/Atyrau',
  'Asia/Baghdad',
  'Asia/Bahrain',
  'Asia/Baku',
  'Asia/Bangkok',
- 'Asia/Barnaul',
  'Asia/Beirut',
  'Asia/Bishkek',
  'Asia/Brunei',
  'Asia/Chita',
+ 'Asia/Choibalsan',
  'Asia/Colombo',
  'Asia/Damascus',
  'Asia/Dhaka',
  'Asia/Dili',
  'Asia/Dubai',
  'Asia/Dushanbe',
- 'Asia/Famagusta',
  'Asia/Gaza',
  'Asia/Hebron',
  'Asia/Ho_Chi_Minh',
@@ -1380,8 +1341,8 @@ common_timezones = \
  'Asia/Pontianak',
  'Asia/Pyongyang',
  'Asia/Qatar',
- 'Asia/Qostanay',
  'Asia/Qyzylorda',
+ 'Asia/Rangoon',
  'Asia/Riyadh',
  'Asia/Sakhalin',
  'Asia/Samarkand',
@@ -1395,14 +1356,12 @@ common_timezones = \
  'Asia/Tehran',
  'Asia/Thimphu',
  'Asia/Tokyo',
- 'Asia/Tomsk',
  'Asia/Ulaanbaatar',
  'Asia/Urumqi',
  'Asia/Ust-Nera',
  'Asia/Vientiane',
  'Asia/Vladivostok',
  'Asia/Yakutsk',
- 'Asia/Yangon',
  'Asia/Yekaterinburg',
  'Asia/Yerevan',
  'Atlantic/Azores',
@@ -1418,6 +1377,7 @@ common_timezones = \
  'Australia/Adelaide',
  'Australia/Brisbane',
  'Australia/Broken_Hill',
+ 'Australia/Currie',
  'Australia/Darwin',
  'Australia/Eucla',
  'Australia/Hobart',
@@ -1434,7 +1394,6 @@ common_timezones = \
  'Canada/Pacific',
  'Europe/Amsterdam',
  'Europe/Andorra',
- 'Europe/Astrakhan',
  'Europe/Athens',
  'Europe/Belgrade',
  'Europe/Berlin',
@@ -1453,8 +1412,7 @@ common_timezones = \
  'Europe/Istanbul',
  'Europe/Jersey',
  'Europe/Kaliningrad',
- 'Europe/Kirov',
- 'Europe/Kyiv',
+ 'Europe/Kiev',
  'Europe/Lisbon',
  'Europe/Ljubljana',
  'Europe/London',
@@ -1474,14 +1432,13 @@ common_timezones = \
  'Europe/Samara',
  'Europe/San_Marino',
  'Europe/Sarajevo',
- 'Europe/Saratov',
  'Europe/Simferopol',
  'Europe/Skopje',
  'Europe/Sofia',
  'Europe/Stockholm',
  'Europe/Tallinn',
  'Europe/Tirane',
- 'Europe/Ulyanovsk',
+ 'Europe/Uzhgorod',
  'Europe/Vaduz',
  'Europe/Vatican',
  'Europe/Vienna',
@@ -1489,6 +1446,7 @@ common_timezones = \
  'Europe/Volgograd',
  'Europe/Warsaw',
  'Europe/Zagreb',
+ 'Europe/Zaporozhye',
  'Europe/Zurich',
  'GMT',
  'Indian/Antananarivo',
@@ -1509,6 +1467,7 @@ common_timezones = \
  'Pacific/Chuuk',
  'Pacific/Easter',
  'Pacific/Efate',
+ 'Pacific/Enderbury',
  'Pacific/Fakaofo',
  'Pacific/Fiji',
  'Pacific/Funafuti',
@@ -1517,7 +1476,7 @@ common_timezones = \
  'Pacific/Guadalcanal',
  'Pacific/Guam',
  'Pacific/Honolulu',
- 'Pacific/Kanton',
+ 'Pacific/Johnston',
  'Pacific/Kiritimati',
  'Pacific/Kosrae',
  'Pacific/Kwajalein',
diff --git a/lib/pytz/exceptions.py b/lib/pytz/exceptions.py
index 4b20bde9..0376108e 100644
--- a/lib/pytz/exceptions.py
+++ b/lib/pytz/exceptions.py
@@ -5,14 +5,10 @@ Custom exceptions raised by pytz.
 __all__ = [
     'UnknownTimeZoneError', 'InvalidTimeError', 'AmbiguousTimeError',
     'NonExistentTimeError',
-]
+    ]
 
 
-class Error(Exception):
-    '''Base class for all exceptions raised by the pytz library'''
-
-
-class UnknownTimeZoneError(KeyError, Error):
+class UnknownTimeZoneError(KeyError):
     '''Exception raised when pytz is passed an unknown timezone.
 
     >>> isinstance(UnknownTimeZoneError(), LookupError)
@@ -24,18 +20,11 @@ class UnknownTimeZoneError(KeyError, Error):
 
     >>> isinstance(UnknownTimeZoneError(), KeyError)
     True
-
-    And also a subclass of pytz.exceptions.Error, as are other pytz
-    exceptions.
-
-    >>> isinstance(UnknownTimeZoneError(), Error)
-    True
-
     '''
     pass
 
 
-class InvalidTimeError(Error):
+class InvalidTimeError(Exception):
     '''Base class for invalid time exceptions.'''
 
 
diff --git a/lib/pytz/lazy.py b/lib/pytz/lazy.py
index 39344fc1..f7fc597c 100644
--- a/lib/pytz/lazy.py
+++ b/lib/pytz/lazy.py
@@ -1,11 +1,8 @@
 from threading import RLock
 try:
-    from collections.abc import Mapping as DictMixin
-except ImportError:  # Python < 3.3
-    try:
-        from UserDict import DictMixin  # Python 2
-    except ImportError:  # Python 3.0-3.3
-        from collections import Mapping as DictMixin
+    from UserDict import DictMixin
+except ImportError:
+    from collections import Mapping as DictMixin
 
 
 # With lazy loading, we might end up with multiple threads triggering
@@ -16,7 +13,6 @@ _fill_lock = RLock()
 class LazyDict(DictMixin):
     """Dictionary populated on first use."""
     data = None
-
     def __getitem__(self, key):
         if self.data is None:
             _fill_lock.acquire()
diff --git a/lib/pytz/reference.py b/lib/pytz/reference.py
index f765ca0a..3dda13e7 100644
--- a/lib/pytz/reference.py
+++ b/lib/pytz/reference.py
@@ -5,28 +5,17 @@ Used for testing against as they are only correct for the years
 '''
 
 from datetime import tzinfo, timedelta, datetime
-from pytz import HOUR, ZERO, UTC
-
-__all__ = [
-    'FixedOffset',
-    'LocalTimezone',
-    'USTimeZone',
-    'Eastern',
-    'Central',
-    'Mountain',
-    'Pacific',
-    'UTC'
-]
-
+from pytz import utc, UTC, HOUR, ZERO
 
 # A class building tzinfo objects for fixed-offset time zones.
 # Note that FixedOffset(0, "UTC") is a different way to build a
 # UTC tzinfo object.
+
 class FixedOffset(tzinfo):
     """Fixed offset in minutes east from UTC."""
 
     def __init__(self, offset, name):
-        self.__offset = timedelta(minutes=offset)
+        self.__offset = timedelta(minutes = offset)
         self.__name = name
 
     def utcoffset(self, dt):
@@ -38,19 +27,18 @@ class FixedOffset(tzinfo):
     def dst(self, dt):
         return ZERO
 
+# A class capturing the platform's idea of local time.
 
 import time as _time
 
-STDOFFSET = timedelta(seconds=-_time.timezone)
+STDOFFSET = timedelta(seconds = -_time.timezone)
 if _time.daylight:
-    DSTOFFSET = timedelta(seconds=-_time.altzone)
+    DSTOFFSET = timedelta(seconds = -_time.altzone)
 else:
     DSTOFFSET = STDOFFSET
 
 DSTDIFF = DSTOFFSET - STDOFFSET
 
-
-# A class capturing the platform's idea of local time.
 class LocalTimezone(tzinfo):
 
     def utcoffset(self, dt):
@@ -78,6 +66,7 @@ class LocalTimezone(tzinfo):
 
 Local = LocalTimezone()
 
+# A complete implementation of current DST rules for major US time zones.
 
 def first_sunday_on_or_after(dt):
     days_to_go = 6 - dt.weekday()
@@ -85,15 +74,12 @@ def first_sunday_on_or_after(dt):
         dt += timedelta(days_to_go)
     return dt
 
-
 # In the US, DST starts at 2am (standard time) on the first Sunday in April.
 DSTSTART = datetime(1, 4, 1, 2)
 # and ends at 2am (DST time; 1am standard time) on the last Sunday of Oct.
 # which is the first Sunday on or after Oct 25.
 DSTEND = datetime(1, 10, 25, 1)
 
-
-# A complete implementation of current DST rules for major US time zones.
 class USTimeZone(tzinfo):
 
     def __init__(self, hours, reprname, stdname, dstname):
@@ -134,7 +120,8 @@ class USTimeZone(tzinfo):
         else:
             return ZERO
 
-Eastern = USTimeZone(-5, "Eastern", "EST", "EDT")
-Central = USTimeZone(-6, "Central", "CST", "CDT")
+Eastern  = USTimeZone(-5, "Eastern",  "EST", "EDT")
+Central  = USTimeZone(-6, "Central",  "CST", "CDT")
 Mountain = USTimeZone(-7, "Mountain", "MST", "MDT")
-Pacific = USTimeZone(-8, "Pacific", "PST", "PDT")
+Pacific  = USTimeZone(-8, "Pacific",  "PST", "PDT")
+
diff --git a/lib/pytz/tzfile.py b/lib/pytz/tzfile.py
index 99e74489..9c007c80 100644
--- a/lib/pytz/tzfile.py
+++ b/lib/pytz/tzfile.py
@@ -1,38 +1,40 @@
+#!/usr/bin/env python
 '''
 $Id: tzfile.py,v 1.8 2004/06/03 00:15:24 zenzen Exp $
 '''
 
-from datetime import datetime
+try:
+    from cStringIO import StringIO
+except ImportError:
+    from io import StringIO
+from datetime import datetime, timedelta
 from struct import unpack, calcsize
 
 from pytz.tzinfo import StaticTzInfo, DstTzInfo, memorized_ttinfo
 from pytz.tzinfo import memorized_datetime, memorized_timedelta
 
-
 def _byte_string(s):
     """Cast a string or byte string to an ASCII byte string."""
-    return s.encode('ASCII')
+    return s.encode('US-ASCII')
 
 _NULL = _byte_string('\0')
 
-
 def _std_string(s):
     """Cast a string or byte string to an ASCII string."""
-    return str(s.decode('ASCII'))
-
+    return str(s.decode('US-ASCII'))
 
 def build_tzinfo(zone, fp):
     head_fmt = '>4s c 15x 6l'
     head_size = calcsize(head_fmt)
-    (magic, format, ttisgmtcnt, ttisstdcnt, leapcnt, timecnt,
-        typecnt, charcnt) = unpack(head_fmt, fp.read(head_size))
+    (magic, format, ttisgmtcnt, ttisstdcnt,leapcnt, timecnt,
+        typecnt, charcnt) =  unpack(head_fmt, fp.read(head_size))
 
     # Make sure it is a tzfile(5) file
     assert magic == _byte_string('TZif'), 'Got magic %s' % repr(magic)
 
     # Read out the transition times, localtime indices and ttinfo structures.
     data_fmt = '>%(timecnt)dl %(timecnt)dB %(ttinfo)s %(charcnt)ds' % dict(
-        timecnt=timecnt, ttinfo='lBB' * typecnt, charcnt=charcnt)
+        timecnt=timecnt, ttinfo='lBB'*typecnt, charcnt=charcnt)
     data_size = calcsize(data_fmt)
     data = unpack(data_fmt, fp.read(data_size))
 
@@ -51,7 +53,7 @@ def build_tzinfo(zone, fp):
     i = 0
     while i < len(ttinfo_raw):
         # have we looked up this timezone name yet?
-        tzname_offset = ttinfo_raw[i + 2]
+        tzname_offset = ttinfo_raw[i+2]
         if tzname_offset not in tznames:
             nul = tznames_raw.find(_NULL, tzname_offset)
             if nul < 0:
@@ -59,12 +61,12 @@ def build_tzinfo(zone, fp):
             tznames[tzname_offset] = _std_string(
                 tznames_raw[tzname_offset:nul])
         ttinfo.append((ttinfo_raw[i],
-                       bool(ttinfo_raw[i + 1]),
+                       bool(ttinfo_raw[i+1]),
                        tznames[tzname_offset]))
         i += 3
 
     # Now build the timezone object
-    if len(ttinfo) == 1 or len(transitions) == 0:
+    if len(transitions) == 0:
         ttinfo[0][0], ttinfo[0][2]
         cls = type(zone, (StaticTzInfo,), dict(
             zone=zone,
@@ -89,21 +91,21 @@ def build_tzinfo(zone, fp):
             if not inf[1]:
                 dst = 0
             else:
-                for j in range(i - 1, -1, -1):
+                for j in range(i-1, -1, -1):
                     prev_inf = ttinfo[lindexes[j]]
                     if not prev_inf[1]:
                         break
-                dst = inf[0] - prev_inf[0]  # dst offset
+                dst = inf[0] - prev_inf[0] # dst offset
 
                 # Bad dst? Look further. DST > 24 hours happens when
                 # a timzone has moved across the international dateline.
-                if dst <= 0 or dst > 3600 * 3:
-                    for j in range(i + 1, len(transitions)):
+                if dst <= 0 or dst > 3600*3:
+                    for j in range(i+1, len(transitions)):
                         stdinf = ttinfo[lindexes[j]]
                         if not stdinf[1]:
                             dst = inf[0] - stdinf[0]
                             if dst > 0:
-                                break  # Found a useful std time.
+                                break # Found a useful std time.
 
             tzname = inf[2]
 
@@ -127,7 +129,9 @@ if __name__ == '__main__':
     from pprint import pprint
     base = os.path.join(os.path.dirname(__file__), 'zoneinfo')
     tz = build_tzinfo('Australia/Melbourne',
-                      open(os.path.join(base, 'Australia', 'Melbourne'), 'rb'))
+                      open(os.path.join(base,'Australia','Melbourne'), 'rb'))
     tz = build_tzinfo('US/Eastern',
-                      open(os.path.join(base, 'US', 'Eastern'), 'rb'))
+                      open(os.path.join(base,'US','Eastern'), 'rb'))
     pprint(tz._utc_transition_times)
+    #print tz.asPython(4)
+    #print tz.transitions_mapping
diff --git a/lib/pytz/tzinfo.py b/lib/pytz/tzinfo.py
index 49b5c3fe..1318872d 100644
--- a/lib/pytz/tzinfo.py
+++ b/lib/pytz/tzinfo.py
@@ -13,8 +13,6 @@ from pytz.exceptions import AmbiguousTimeError, NonExistentTimeError
 __all__ = []
 
 _timedelta_cache = {}
-
-
 def memorized_timedelta(seconds):
     '''Create only one instance of each distinct timedelta'''
     try:
@@ -24,43 +22,35 @@ def memorized_timedelta(seconds):
         _timedelta_cache[seconds] = delta
         return delta
 
-
-_epoch = datetime(1970, 1, 1, 0, 0) # datetime.utcfromtimestamp(0)
+_epoch = datetime.utcfromtimestamp(0)
 _datetime_cache = {0: _epoch}
-
-
 def memorized_datetime(seconds):
     '''Create only one instance of each distinct datetime'''
     try:
         return _datetime_cache[seconds]
     except KeyError:
-        # NB. We can't just do datetime.fromtimestamp(seconds, tz=timezone.utc).replace(tzinfo=None)
-        # as this fails with negative values under Windows (Bug #90096)
+        # NB. We can't just do datetime.utcfromtimestamp(seconds) as this
+        # fails with negative values under Windows (Bug #90096)
         dt = _epoch + timedelta(seconds=seconds)
         _datetime_cache[seconds] = dt
         return dt
 
-
 _ttinfo_cache = {}
-
-
 def memorized_ttinfo(*args):
     '''Create only one instance of each distinct tuple'''
     try:
         return _ttinfo_cache[args]
     except KeyError:
         ttinfo = (
-            memorized_timedelta(args[0]),
-            memorized_timedelta(args[1]),
-            args[2]
-        )
+                memorized_timedelta(args[0]),
+                memorized_timedelta(args[1]),
+                args[2]
+                )
         _ttinfo_cache[args] = ttinfo
         return ttinfo
 
-
 _notime = memorized_timedelta(0)
 
-
 def _to_seconds(td):
     '''Convert a timedelta to seconds'''
     return td.seconds + td.days * 24 * 60 * 60
@@ -164,20 +154,14 @@ class DstTzInfo(BaseTzInfo):
     timezone definition.
     '''
     # Overridden in subclass
-
-    # Sorted list of DST transition times, UTC
-    _utc_transition_times = None
-
-    # [(utcoffset, dstoffset, tzname)] corresponding to
-    # _utc_transition_times entries
-    _transition_info = None
-
+    _utc_transition_times = None # Sorted list of DST transition times in UTC
+    _transition_info = None # [(utcoffset, dstoffset, tzname)] corresponding
+                            # to _utc_transition_times entries
     zone = None
 
     # Set in __init__
-
     _tzinfos = None
-    _dst = None  # DST offset
+    _dst = None # DST offset
 
     def __init__(self, _inf=None, _tzinfos=None):
         if _inf:
@@ -186,8 +170,7 @@ class DstTzInfo(BaseTzInfo):
         else:
             _tzinfos = {}
             self._tzinfos = _tzinfos
-            self._utcoffset, self._dst, self._tzname = (
-                self._transition_info[0])
+            self._utcoffset, self._dst, self._tzname = self._transition_info[0]
             _tzinfos[self._transition_info[0]] = self
             for inf in self._transition_info[1:]:
                 if inf not in _tzinfos:
@@ -195,8 +178,8 @@ class DstTzInfo(BaseTzInfo):
 
     def fromutc(self, dt):
         '''See datetime.tzinfo.fromutc'''
-        if (dt.tzinfo is not None and
-                getattr(dt.tzinfo, '_tzinfos', None) is not self._tzinfos):
+        if (dt.tzinfo is not None
+            and getattr(dt.tzinfo, '_tzinfos', None) is not self._tzinfos):
             raise ValueError('fromutc: dt.tzinfo is not self')
         dt = dt.replace(tzinfo=None)
         idx = max(0, bisect_right(self._utc_transition_times, dt) - 1)
@@ -354,11 +337,11 @@ class DstTzInfo(BaseTzInfo):
             # obtain the correct timezone by winding the clock back.
             else:
                 return self.localize(
-                    dt - timedelta(hours=6),
-                    is_dst=False) + timedelta(hours=6)
+                    dt - timedelta(hours=6), is_dst=False) + timedelta(hours=6)
+
 
         # If we get this far, we have multiple possible timezones - this
-        # is an ambiguous case occurring during the end-of-DST transition.
+        # is an ambiguous case occuring during the end-of-DST transition.
 
         # If told to be strict, raise an exception since we have an
         # ambiguous case
@@ -368,8 +351,9 @@ class DstTzInfo(BaseTzInfo):
         # Filter out the possiblilities that don't match the requested
         # is_dst
         filtered_possible_loc_dt = [
-            p for p in possible_loc_dt if bool(p.tzinfo._dst) == is_dst
-        ]
+            p for p in possible_loc_dt
+                if bool(p.tzinfo._dst) == is_dst
+            ]
 
         # Hopefully we only have one possibility left. Return it.
         if len(filtered_possible_loc_dt) == 1:
@@ -388,10 +372,9 @@ class DstTzInfo(BaseTzInfo):
         # Choose the earliest (by UTC) applicable timezone if is_dst=True
         # Choose the latest (by UTC) applicable timezone if is_dst=False
         # i.e., behave like end-of-DST transition
-        dates = {}  # utc -> local
+        dates = {} # utc -> local
         for local_dt in filtered_possible_loc_dt:
-            utc_time = (
-                local_dt.replace(tzinfo=None) - local_dt.tzinfo._utcoffset)
+            utc_time = local_dt.replace(tzinfo=None) - local_dt.tzinfo._utcoffset
             assert utc_time not in dates
             dates[utc_time] = local_dt
         return dates[[min, max][not is_dst](dates)]
@@ -406,11 +389,11 @@ class DstTzInfo(BaseTzInfo):
         >>> tz = timezone('America/St_Johns')
         >>> ambiguous = datetime(2009, 10, 31, 23, 30)
 
-        >>> str(tz.utcoffset(ambiguous, is_dst=False))
-        '-1 day, 20:30:00'
+        >>> tz.utcoffset(ambiguous, is_dst=False)
+        datetime.timedelta(-1, 73800)
 
-        >>> str(tz.utcoffset(ambiguous, is_dst=True))
-        '-1 day, 21:30:00'
+        >>> tz.utcoffset(ambiguous, is_dst=True)
+        datetime.timedelta(-1, 77400)
 
         >>> try:
         ...     tz.utcoffset(ambiguous)
@@ -438,19 +421,19 @@ class DstTzInfo(BaseTzInfo):
 
         >>> normal = datetime(2009, 9, 1)
 
-        >>> str(tz.dst(normal))
-        '1:00:00'
-        >>> str(tz.dst(normal, is_dst=False))
-        '1:00:00'
-        >>> str(tz.dst(normal, is_dst=True))
-        '1:00:00'
+        >>> tz.dst(normal)
+        datetime.timedelta(0, 3600)
+        >>> tz.dst(normal, is_dst=False)
+        datetime.timedelta(0, 3600)
+        >>> tz.dst(normal, is_dst=True)
+        datetime.timedelta(0, 3600)
 
         >>> ambiguous = datetime(2009, 10, 31, 23, 30)
 
-        >>> str(tz.dst(ambiguous, is_dst=False))
-        '0:00:00'
-        >>> str(tz.dst(ambiguous, is_dst=True))
-        '1:00:00'
+        >>> tz.dst(ambiguous, is_dst=False)
+        datetime.timedelta(0)
+        >>> tz.dst(ambiguous, is_dst=True)
+        datetime.timedelta(0, 3600)
         >>> try:
         ...     tz.dst(ambiguous)
         ... except AmbiguousTimeError:
@@ -511,22 +494,23 @@ class DstTzInfo(BaseTzInfo):
             dst = 'STD'
         if self._utcoffset > _notime:
             return '<DstTzInfo %r %s+%s %s>' % (
-                self.zone, self._tzname, self._utcoffset, dst
-            )
+                    self.zone, self._tzname, self._utcoffset, dst
+                )
         else:
             return '<DstTzInfo %r %s%s %s>' % (
-                self.zone, self._tzname, self._utcoffset, dst
-            )
+                    self.zone, self._tzname, self._utcoffset, dst
+                )
 
     def __reduce__(self):
         # Special pickle to zone remains a singleton and to cope with
         # database changes.
         return pytz._p, (
-            self.zone,
-            _to_seconds(self._utcoffset),
-            _to_seconds(self._dst),
-            self._tzname
-        )
+                self.zone,
+                _to_seconds(self._utcoffset),
+                _to_seconds(self._dst),
+                self._tzname
+                )
+
 
 
 def unpickler(zone, utcoffset=None, dstoffset=None, tzname=None):
@@ -565,8 +549,8 @@ def unpickler(zone, utcoffset=None, dstoffset=None, tzname=None):
     # get changed from the initial guess by the database maintainers to
     # match reality when this information is discovered.
     for localized_tz in tz._tzinfos.values():
-        if (localized_tz._utcoffset == utcoffset and
-                localized_tz._dst == dstoffset):
+        if (localized_tz._utcoffset == utcoffset
+                and localized_tz._dst == dstoffset):
             return localized_tz
 
     # This (utcoffset, dstoffset) information has been removed from the
diff --git a/lib/pytz/zoneinfo/Africa/Abidjan b/lib/pytz/zoneinfo/Africa/Abidjan
index 28b32ab2..6fd1af32 100644
Binary files a/lib/pytz/zoneinfo/Africa/Abidjan and b/lib/pytz/zoneinfo/Africa/Abidjan differ
diff --git a/lib/pytz/zoneinfo/Africa/Accra b/lib/pytz/zoneinfo/Africa/Accra
index 28b32ab2..6ff8fb6b 100644
Binary files a/lib/pytz/zoneinfo/Africa/Accra and b/lib/pytz/zoneinfo/Africa/Accra differ
diff --git a/lib/pytz/zoneinfo/Africa/Addis_Ababa b/lib/pytz/zoneinfo/Africa/Addis_Ababa
index 9dcfc19c..750d3dc1 100644
Binary files a/lib/pytz/zoneinfo/Africa/Addis_Ababa and b/lib/pytz/zoneinfo/Africa/Addis_Ababa differ
diff --git a/lib/pytz/zoneinfo/Africa/Algiers b/lib/pytz/zoneinfo/Africa/Algiers
index 6cfd8a16..2a25f3ac 100644
Binary files a/lib/pytz/zoneinfo/Africa/Algiers and b/lib/pytz/zoneinfo/Africa/Algiers differ
diff --git a/lib/pytz/zoneinfo/Africa/Asmara b/lib/pytz/zoneinfo/Africa/Asmara
index 9dcfc19c..750d3dc1 100644
Binary files a/lib/pytz/zoneinfo/Africa/Asmara and b/lib/pytz/zoneinfo/Africa/Asmara differ
diff --git a/lib/pytz/zoneinfo/Africa/Asmera b/lib/pytz/zoneinfo/Africa/Asmera
index 9dcfc19c..750d3dc1 100644
Binary files a/lib/pytz/zoneinfo/Africa/Asmera and b/lib/pytz/zoneinfo/Africa/Asmera differ
diff --git a/lib/pytz/zoneinfo/Africa/Bamako b/lib/pytz/zoneinfo/Africa/Bamako
index 28b32ab2..6fd1af32 100644
Binary files a/lib/pytz/zoneinfo/Africa/Bamako and b/lib/pytz/zoneinfo/Africa/Bamako differ
diff --git a/lib/pytz/zoneinfo/Africa/Bangui b/lib/pytz/zoneinfo/Africa/Bangui
index afb6a4a8..b1c97cc5 100644
Binary files a/lib/pytz/zoneinfo/Africa/Bangui and b/lib/pytz/zoneinfo/Africa/Bangui differ
diff --git a/lib/pytz/zoneinfo/Africa/Banjul b/lib/pytz/zoneinfo/Africa/Banjul
index 28b32ab2..6fd1af32 100644
Binary files a/lib/pytz/zoneinfo/Africa/Banjul and b/lib/pytz/zoneinfo/Africa/Banjul differ
diff --git a/lib/pytz/zoneinfo/Africa/Bissau b/lib/pytz/zoneinfo/Africa/Bissau
index 82ea5aaf..0696667c 100644
Binary files a/lib/pytz/zoneinfo/Africa/Bissau and b/lib/pytz/zoneinfo/Africa/Bissau differ
diff --git a/lib/pytz/zoneinfo/Africa/Blantyre b/lib/pytz/zoneinfo/Africa/Blantyre
index 65f043f1..5b871dba 100644
Binary files a/lib/pytz/zoneinfo/Africa/Blantyre and b/lib/pytz/zoneinfo/Africa/Blantyre differ
diff --git a/lib/pytz/zoneinfo/Africa/Brazzaville b/lib/pytz/zoneinfo/Africa/Brazzaville
index afb6a4a8..b1c97cc5 100644
Binary files a/lib/pytz/zoneinfo/Africa/Brazzaville and b/lib/pytz/zoneinfo/Africa/Brazzaville differ
diff --git a/lib/pytz/zoneinfo/Africa/Bujumbura b/lib/pytz/zoneinfo/Africa/Bujumbura
index 65f043f1..5b871dba 100644
Binary files a/lib/pytz/zoneinfo/Africa/Bujumbura and b/lib/pytz/zoneinfo/Africa/Bujumbura differ
diff --git a/lib/pytz/zoneinfo/Africa/Cairo b/lib/pytz/zoneinfo/Africa/Cairo
index dd538c65..0eeed113 100644
Binary files a/lib/pytz/zoneinfo/Africa/Cairo and b/lib/pytz/zoneinfo/Africa/Cairo differ
diff --git a/lib/pytz/zoneinfo/Africa/Casablanca b/lib/pytz/zoneinfo/Africa/Casablanca
index d39016b8..c001c375 100644
Binary files a/lib/pytz/zoneinfo/Africa/Casablanca and b/lib/pytz/zoneinfo/Africa/Casablanca differ
diff --git a/lib/pytz/zoneinfo/Africa/Ceuta b/lib/pytz/zoneinfo/Africa/Ceuta
index b41ec4f8..6227e2bb 100644
Binary files a/lib/pytz/zoneinfo/Africa/Ceuta and b/lib/pytz/zoneinfo/Africa/Ceuta differ
diff --git a/lib/pytz/zoneinfo/Africa/Conakry b/lib/pytz/zoneinfo/Africa/Conakry
index 28b32ab2..6fd1af32 100644
Binary files a/lib/pytz/zoneinfo/Africa/Conakry and b/lib/pytz/zoneinfo/Africa/Conakry differ
diff --git a/lib/pytz/zoneinfo/Africa/Dakar b/lib/pytz/zoneinfo/Africa/Dakar
index 28b32ab2..6fd1af32 100644
Binary files a/lib/pytz/zoneinfo/Africa/Dakar and b/lib/pytz/zoneinfo/Africa/Dakar differ
diff --git a/lib/pytz/zoneinfo/Africa/Dar_es_Salaam b/lib/pytz/zoneinfo/Africa/Dar_es_Salaam
index 9dcfc19c..750d3dc1 100644
Binary files a/lib/pytz/zoneinfo/Africa/Dar_es_Salaam and b/lib/pytz/zoneinfo/Africa/Dar_es_Salaam differ
diff --git a/lib/pytz/zoneinfo/Africa/Djibouti b/lib/pytz/zoneinfo/Africa/Djibouti
index 9dcfc19c..750d3dc1 100644
Binary files a/lib/pytz/zoneinfo/Africa/Djibouti and b/lib/pytz/zoneinfo/Africa/Djibouti differ
diff --git a/lib/pytz/zoneinfo/Africa/Douala b/lib/pytz/zoneinfo/Africa/Douala
index afb6a4a8..b1c97cc5 100644
Binary files a/lib/pytz/zoneinfo/Africa/Douala and b/lib/pytz/zoneinfo/Africa/Douala differ
diff --git a/lib/pytz/zoneinfo/Africa/El_Aaiun b/lib/pytz/zoneinfo/Africa/El_Aaiun
index 066fbed0..805d39e4 100644
Binary files a/lib/pytz/zoneinfo/Africa/El_Aaiun and b/lib/pytz/zoneinfo/Africa/El_Aaiun differ
diff --git a/lib/pytz/zoneinfo/Africa/Freetown b/lib/pytz/zoneinfo/Africa/Freetown
index 28b32ab2..6fd1af32 100644
Binary files a/lib/pytz/zoneinfo/Africa/Freetown and b/lib/pytz/zoneinfo/Africa/Freetown differ
diff --git a/lib/pytz/zoneinfo/Africa/Gaborone b/lib/pytz/zoneinfo/Africa/Gaborone
index 65f043f1..5b871dba 100644
Binary files a/lib/pytz/zoneinfo/Africa/Gaborone and b/lib/pytz/zoneinfo/Africa/Gaborone differ
diff --git a/lib/pytz/zoneinfo/Africa/Harare b/lib/pytz/zoneinfo/Africa/Harare
index 65f043f1..5b871dba 100644
Binary files a/lib/pytz/zoneinfo/Africa/Harare and b/lib/pytz/zoneinfo/Africa/Harare differ
diff --git a/lib/pytz/zoneinfo/Africa/Johannesburg b/lib/pytz/zoneinfo/Africa/Johannesburg
index b1c425da..ddf3652e 100644
Binary files a/lib/pytz/zoneinfo/Africa/Johannesburg and b/lib/pytz/zoneinfo/Africa/Johannesburg differ
diff --git a/lib/pytz/zoneinfo/Africa/Juba b/lib/pytz/zoneinfo/Africa/Juba
index 06482943..36291882 100644
Binary files a/lib/pytz/zoneinfo/Africa/Juba and b/lib/pytz/zoneinfo/Africa/Juba differ
diff --git a/lib/pytz/zoneinfo/Africa/Kampala b/lib/pytz/zoneinfo/Africa/Kampala
index 9dcfc19c..750d3dc1 100644
Binary files a/lib/pytz/zoneinfo/Africa/Kampala and b/lib/pytz/zoneinfo/Africa/Kampala differ
diff --git a/lib/pytz/zoneinfo/Africa/Khartoum b/lib/pytz/zoneinfo/Africa/Khartoum
index 8ee8cb92..36291882 100644
Binary files a/lib/pytz/zoneinfo/Africa/Khartoum and b/lib/pytz/zoneinfo/Africa/Khartoum differ
diff --git a/lib/pytz/zoneinfo/Africa/Kigali b/lib/pytz/zoneinfo/Africa/Kigali
index 65f043f1..5b871dba 100644
Binary files a/lib/pytz/zoneinfo/Africa/Kigali and b/lib/pytz/zoneinfo/Africa/Kigali differ
diff --git a/lib/pytz/zoneinfo/Africa/Kinshasa b/lib/pytz/zoneinfo/Africa/Kinshasa
index afb6a4a8..b1c97cc5 100644
Binary files a/lib/pytz/zoneinfo/Africa/Kinshasa and b/lib/pytz/zoneinfo/Africa/Kinshasa differ
diff --git a/lib/pytz/zoneinfo/Africa/Lagos b/lib/pytz/zoneinfo/Africa/Lagos
index afb6a4a8..b1c97cc5 100644
Binary files a/lib/pytz/zoneinfo/Africa/Lagos and b/lib/pytz/zoneinfo/Africa/Lagos differ
diff --git a/lib/pytz/zoneinfo/Africa/Libreville b/lib/pytz/zoneinfo/Africa/Libreville
index afb6a4a8..b1c97cc5 100644
Binary files a/lib/pytz/zoneinfo/Africa/Libreville and b/lib/pytz/zoneinfo/Africa/Libreville differ
diff --git a/lib/pytz/zoneinfo/Africa/Lome b/lib/pytz/zoneinfo/Africa/Lome
index 28b32ab2..6fd1af32 100644
Binary files a/lib/pytz/zoneinfo/Africa/Lome and b/lib/pytz/zoneinfo/Africa/Lome differ
diff --git a/lib/pytz/zoneinfo/Africa/Luanda b/lib/pytz/zoneinfo/Africa/Luanda
index afb6a4a8..b1c97cc5 100644
Binary files a/lib/pytz/zoneinfo/Africa/Luanda and b/lib/pytz/zoneinfo/Africa/Luanda differ
diff --git a/lib/pytz/zoneinfo/Africa/Lubumbashi b/lib/pytz/zoneinfo/Africa/Lubumbashi
index 65f043f1..5b871dba 100644
Binary files a/lib/pytz/zoneinfo/Africa/Lubumbashi and b/lib/pytz/zoneinfo/Africa/Lubumbashi differ
diff --git a/lib/pytz/zoneinfo/Africa/Lusaka b/lib/pytz/zoneinfo/Africa/Lusaka
index 65f043f1..5b871dba 100644
Binary files a/lib/pytz/zoneinfo/Africa/Lusaka and b/lib/pytz/zoneinfo/Africa/Lusaka differ
diff --git a/lib/pytz/zoneinfo/Africa/Malabo b/lib/pytz/zoneinfo/Africa/Malabo
index afb6a4a8..b1c97cc5 100644
Binary files a/lib/pytz/zoneinfo/Africa/Malabo and b/lib/pytz/zoneinfo/Africa/Malabo differ
diff --git a/lib/pytz/zoneinfo/Africa/Maputo b/lib/pytz/zoneinfo/Africa/Maputo
index 65f043f1..5b871dba 100644
Binary files a/lib/pytz/zoneinfo/Africa/Maputo and b/lib/pytz/zoneinfo/Africa/Maputo differ
diff --git a/lib/pytz/zoneinfo/Africa/Maseru b/lib/pytz/zoneinfo/Africa/Maseru
index b1c425da..ddf3652e 100644
Binary files a/lib/pytz/zoneinfo/Africa/Maseru and b/lib/pytz/zoneinfo/Africa/Maseru differ
diff --git a/lib/pytz/zoneinfo/Africa/Mbabane b/lib/pytz/zoneinfo/Africa/Mbabane
index b1c425da..ddf3652e 100644
Binary files a/lib/pytz/zoneinfo/Africa/Mbabane and b/lib/pytz/zoneinfo/Africa/Mbabane differ
diff --git a/lib/pytz/zoneinfo/Africa/Mogadishu b/lib/pytz/zoneinfo/Africa/Mogadishu
index 9dcfc19c..750d3dc1 100644
Binary files a/lib/pytz/zoneinfo/Africa/Mogadishu and b/lib/pytz/zoneinfo/Africa/Mogadishu differ
diff --git a/lib/pytz/zoneinfo/Africa/Monrovia b/lib/pytz/zoneinfo/Africa/Monrovia
index 6d688502..0f2294ea 100644
Binary files a/lib/pytz/zoneinfo/Africa/Monrovia and b/lib/pytz/zoneinfo/Africa/Monrovia differ
diff --git a/lib/pytz/zoneinfo/Africa/Nairobi b/lib/pytz/zoneinfo/Africa/Nairobi
index 9dcfc19c..750d3dc1 100644
Binary files a/lib/pytz/zoneinfo/Africa/Nairobi and b/lib/pytz/zoneinfo/Africa/Nairobi differ
diff --git a/lib/pytz/zoneinfo/Africa/Ndjamena b/lib/pytz/zoneinfo/Africa/Ndjamena
index a968845e..bbfe19d6 100644
Binary files a/lib/pytz/zoneinfo/Africa/Ndjamena and b/lib/pytz/zoneinfo/Africa/Ndjamena differ
diff --git a/lib/pytz/zoneinfo/Africa/Niamey b/lib/pytz/zoneinfo/Africa/Niamey
index afb6a4a8..b1c97cc5 100644
Binary files a/lib/pytz/zoneinfo/Africa/Niamey and b/lib/pytz/zoneinfo/Africa/Niamey differ
diff --git a/lib/pytz/zoneinfo/Africa/Nouakchott b/lib/pytz/zoneinfo/Africa/Nouakchott
index 28b32ab2..6fd1af32 100644
Binary files a/lib/pytz/zoneinfo/Africa/Nouakchott and b/lib/pytz/zoneinfo/Africa/Nouakchott differ
diff --git a/lib/pytz/zoneinfo/Africa/Ouagadougou b/lib/pytz/zoneinfo/Africa/Ouagadougou
index 28b32ab2..6fd1af32 100644
Binary files a/lib/pytz/zoneinfo/Africa/Ouagadougou and b/lib/pytz/zoneinfo/Africa/Ouagadougou differ
diff --git a/lib/pytz/zoneinfo/Africa/Porto-Novo b/lib/pytz/zoneinfo/Africa/Porto-Novo
index afb6a4a8..b1c97cc5 100644
Binary files a/lib/pytz/zoneinfo/Africa/Porto-Novo and b/lib/pytz/zoneinfo/Africa/Porto-Novo differ
diff --git a/lib/pytz/zoneinfo/Africa/Sao_Tome b/lib/pytz/zoneinfo/Africa/Sao_Tome
index 59f3759c..6fd1af32 100644
Binary files a/lib/pytz/zoneinfo/Africa/Sao_Tome and b/lib/pytz/zoneinfo/Africa/Sao_Tome differ
diff --git a/lib/pytz/zoneinfo/Africa/Timbuktu b/lib/pytz/zoneinfo/Africa/Timbuktu
index 28b32ab2..6fd1af32 100644
Binary files a/lib/pytz/zoneinfo/Africa/Timbuktu and b/lib/pytz/zoneinfo/Africa/Timbuktu differ
diff --git a/lib/pytz/zoneinfo/Africa/Tripoli b/lib/pytz/zoneinfo/Africa/Tripoli
index 07b393bb..b32e2202 100644
Binary files a/lib/pytz/zoneinfo/Africa/Tripoli and b/lib/pytz/zoneinfo/Africa/Tripoli differ
diff --git a/lib/pytz/zoneinfo/Africa/Tunis b/lib/pytz/zoneinfo/Africa/Tunis
index 427fa563..4bd3885a 100644
Binary files a/lib/pytz/zoneinfo/Africa/Tunis and b/lib/pytz/zoneinfo/Africa/Tunis differ
diff --git a/lib/pytz/zoneinfo/Africa/Windhoek b/lib/pytz/zoneinfo/Africa/Windhoek
index abecd137..33bdfdf2 100644
Binary files a/lib/pytz/zoneinfo/Africa/Windhoek and b/lib/pytz/zoneinfo/Africa/Windhoek differ
diff --git a/lib/pytz/zoneinfo/America/Adak b/lib/pytz/zoneinfo/America/Adak
index 43236498..b0a5dd60 100644
Binary files a/lib/pytz/zoneinfo/America/Adak and b/lib/pytz/zoneinfo/America/Adak differ
diff --git a/lib/pytz/zoneinfo/America/Anchorage b/lib/pytz/zoneinfo/America/Anchorage
index 9bbb2fd3..a4627cac 100644
Binary files a/lib/pytz/zoneinfo/America/Anchorage and b/lib/pytz/zoneinfo/America/Anchorage differ
diff --git a/lib/pytz/zoneinfo/America/Anguilla b/lib/pytz/zoneinfo/America/Anguilla
index a662a571..447efbe2 100644
Binary files a/lib/pytz/zoneinfo/America/Anguilla and b/lib/pytz/zoneinfo/America/Anguilla differ
diff --git a/lib/pytz/zoneinfo/America/Antigua b/lib/pytz/zoneinfo/America/Antigua
index a662a571..66ab1474 100644
Binary files a/lib/pytz/zoneinfo/America/Antigua and b/lib/pytz/zoneinfo/America/Antigua differ
diff --git a/lib/pytz/zoneinfo/America/Araguaina b/lib/pytz/zoneinfo/America/Araguaina
index 919723dc..507ea469 100644
Binary files a/lib/pytz/zoneinfo/America/Araguaina and b/lib/pytz/zoneinfo/America/Araguaina differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Buenos_Aires b/lib/pytz/zoneinfo/America/Argentina/Buenos_Aires
index cc82e698..a1fae8c8 100644
Binary files a/lib/pytz/zoneinfo/America/Argentina/Buenos_Aires and b/lib/pytz/zoneinfo/America/Argentina/Buenos_Aires differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Catamarca b/lib/pytz/zoneinfo/America/Argentina/Catamarca
index 7268eb37..7cbc9f4b 100644
Binary files a/lib/pytz/zoneinfo/America/Argentina/Catamarca and b/lib/pytz/zoneinfo/America/Argentina/Catamarca differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/ComodRivadavia b/lib/pytz/zoneinfo/America/Argentina/ComodRivadavia
index 7268eb37..7cbc9f4b 100644
Binary files a/lib/pytz/zoneinfo/America/Argentina/ComodRivadavia and b/lib/pytz/zoneinfo/America/Argentina/ComodRivadavia differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Cordoba b/lib/pytz/zoneinfo/America/Argentina/Cordoba
index 2ad6ea5d..cd97a24b 100644
Binary files a/lib/pytz/zoneinfo/America/Argentina/Cordoba and b/lib/pytz/zoneinfo/America/Argentina/Cordoba differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Jujuy b/lib/pytz/zoneinfo/America/Argentina/Jujuy
index 7ca0b46f..7be3eeb6 100644
Binary files a/lib/pytz/zoneinfo/America/Argentina/Jujuy and b/lib/pytz/zoneinfo/America/Argentina/Jujuy differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/La_Rioja b/lib/pytz/zoneinfo/America/Argentina/La_Rioja
index a6a6694f..1296ed44 100644
Binary files a/lib/pytz/zoneinfo/America/Argentina/La_Rioja and b/lib/pytz/zoneinfo/America/Argentina/La_Rioja differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Mendoza b/lib/pytz/zoneinfo/America/Argentina/Mendoza
index 3232c80e..f9eb526c 100644
Binary files a/lib/pytz/zoneinfo/America/Argentina/Mendoza and b/lib/pytz/zoneinfo/America/Argentina/Mendoza differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Rio_Gallegos b/lib/pytz/zoneinfo/America/Argentina/Rio_Gallegos
index 8b1a2816..8fd203d1 100644
Binary files a/lib/pytz/zoneinfo/America/Argentina/Rio_Gallegos and b/lib/pytz/zoneinfo/America/Argentina/Rio_Gallegos differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Salta b/lib/pytz/zoneinfo/America/Argentina/Salta
index 7072dec2..5778059f 100644
Binary files a/lib/pytz/zoneinfo/America/Argentina/Salta and b/lib/pytz/zoneinfo/America/Argentina/Salta differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/San_Juan b/lib/pytz/zoneinfo/America/Argentina/San_Juan
index f3e185c3..8670279e 100644
Binary files a/lib/pytz/zoneinfo/America/Argentina/San_Juan and b/lib/pytz/zoneinfo/America/Argentina/San_Juan differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/San_Luis b/lib/pytz/zoneinfo/America/Argentina/San_Luis
index 2d1da3ae..51eb1d84 100644
Binary files a/lib/pytz/zoneinfo/America/Argentina/San_Luis and b/lib/pytz/zoneinfo/America/Argentina/San_Luis differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Tucuman b/lib/pytz/zoneinfo/America/Argentina/Tucuman
index c6449f58..694093e7 100644
Binary files a/lib/pytz/zoneinfo/America/Argentina/Tucuman and b/lib/pytz/zoneinfo/America/Argentina/Tucuman differ
diff --git a/lib/pytz/zoneinfo/America/Argentina/Ushuaia b/lib/pytz/zoneinfo/America/Argentina/Ushuaia
index e74ce049..dc42621d 100644
Binary files a/lib/pytz/zoneinfo/America/Argentina/Ushuaia and b/lib/pytz/zoneinfo/America/Argentina/Ushuaia differ
diff --git a/lib/pytz/zoneinfo/America/Aruba b/lib/pytz/zoneinfo/America/Aruba
index a662a571..05e77ab4 100644
Binary files a/lib/pytz/zoneinfo/America/Aruba and b/lib/pytz/zoneinfo/America/Aruba differ
diff --git a/lib/pytz/zoneinfo/America/Asuncion b/lib/pytz/zoneinfo/America/Asuncion
index 891279d4..79541fdd 100644
Binary files a/lib/pytz/zoneinfo/America/Asuncion and b/lib/pytz/zoneinfo/America/Asuncion differ
diff --git a/lib/pytz/zoneinfo/America/Atikokan b/lib/pytz/zoneinfo/America/Atikokan
index 9964b9a3..5708b55a 100644
Binary files a/lib/pytz/zoneinfo/America/Atikokan and b/lib/pytz/zoneinfo/America/Atikokan differ
diff --git a/lib/pytz/zoneinfo/America/Atka b/lib/pytz/zoneinfo/America/Atka
index 43236498..b0a5dd60 100644
Binary files a/lib/pytz/zoneinfo/America/Atka and b/lib/pytz/zoneinfo/America/Atka differ
diff --git a/lib/pytz/zoneinfo/America/Bahia b/lib/pytz/zoneinfo/America/Bahia
index 0b65e49f..3b599585 100644
Binary files a/lib/pytz/zoneinfo/America/Bahia and b/lib/pytz/zoneinfo/America/Bahia differ
diff --git a/lib/pytz/zoneinfo/America/Bahia_Banderas b/lib/pytz/zoneinfo/America/Bahia_Banderas
index 3a493e3d..21e2b719 100644
Binary files a/lib/pytz/zoneinfo/America/Bahia_Banderas and b/lib/pytz/zoneinfo/America/Bahia_Banderas differ
diff --git a/lib/pytz/zoneinfo/America/Barbados b/lib/pytz/zoneinfo/America/Barbados
index 00cd045a..63399360 100644
Binary files a/lib/pytz/zoneinfo/America/Barbados and b/lib/pytz/zoneinfo/America/Barbados differ
diff --git a/lib/pytz/zoneinfo/America/Belem b/lib/pytz/zoneinfo/America/Belem
index 0ae12026..d85c0f72 100644
Binary files a/lib/pytz/zoneinfo/America/Belem and b/lib/pytz/zoneinfo/America/Belem differ
diff --git a/lib/pytz/zoneinfo/America/Belize b/lib/pytz/zoneinfo/America/Belize
index e6f5dfa6..eada52e7 100644
Binary files a/lib/pytz/zoneinfo/America/Belize and b/lib/pytz/zoneinfo/America/Belize differ
diff --git a/lib/pytz/zoneinfo/America/Blanc-Sablon b/lib/pytz/zoneinfo/America/Blanc-Sablon
index a662a571..abcde7d9 100644
Binary files a/lib/pytz/zoneinfo/America/Blanc-Sablon and b/lib/pytz/zoneinfo/America/Blanc-Sablon differ
diff --git a/lib/pytz/zoneinfo/America/Boa_Vista b/lib/pytz/zoneinfo/America/Boa_Vista
index 08d518b1..2466a25f 100644
Binary files a/lib/pytz/zoneinfo/America/Boa_Vista and b/lib/pytz/zoneinfo/America/Boa_Vista differ
diff --git a/lib/pytz/zoneinfo/America/Bogota b/lib/pytz/zoneinfo/America/Bogota
index 331a1b7c..7a5a445a 100644
Binary files a/lib/pytz/zoneinfo/America/Bogota and b/lib/pytz/zoneinfo/America/Bogota differ
diff --git a/lib/pytz/zoneinfo/America/Boise b/lib/pytz/zoneinfo/America/Boise
index aad1d991..ada6d64b 100644
Binary files a/lib/pytz/zoneinfo/America/Boise and b/lib/pytz/zoneinfo/America/Boise differ
diff --git a/lib/pytz/zoneinfo/America/Buenos_Aires b/lib/pytz/zoneinfo/America/Buenos_Aires
index cc82e698..a1fae8c8 100644
Binary files a/lib/pytz/zoneinfo/America/Buenos_Aires and b/lib/pytz/zoneinfo/America/Buenos_Aires differ
diff --git a/lib/pytz/zoneinfo/America/Cambridge_Bay b/lib/pytz/zoneinfo/America/Cambridge_Bay
index 7e58a203..58e21baa 100644
Binary files a/lib/pytz/zoneinfo/America/Cambridge_Bay and b/lib/pytz/zoneinfo/America/Cambridge_Bay differ
diff --git a/lib/pytz/zoneinfo/America/Campo_Grande b/lib/pytz/zoneinfo/America/Campo_Grande
index 53b3330f..d810ae56 100644
Binary files a/lib/pytz/zoneinfo/America/Campo_Grande and b/lib/pytz/zoneinfo/America/Campo_Grande differ
diff --git a/lib/pytz/zoneinfo/America/Cancun b/lib/pytz/zoneinfo/America/Cancun
index 0f7771e8..a99eedd7 100644
Binary files a/lib/pytz/zoneinfo/America/Cancun and b/lib/pytz/zoneinfo/America/Cancun differ
diff --git a/lib/pytz/zoneinfo/America/Caracas b/lib/pytz/zoneinfo/America/Caracas
index 3f3ebc9c..15b9a52c 100644
Binary files a/lib/pytz/zoneinfo/America/Caracas and b/lib/pytz/zoneinfo/America/Caracas differ
diff --git a/lib/pytz/zoneinfo/America/Catamarca b/lib/pytz/zoneinfo/America/Catamarca
index 7268eb37..7cbc9f4b 100644
Binary files a/lib/pytz/zoneinfo/America/Catamarca and b/lib/pytz/zoneinfo/America/Catamarca differ
diff --git a/lib/pytz/zoneinfo/America/Cayenne b/lib/pytz/zoneinfo/America/Cayenne
index e8985942..bffe9b02 100644
Binary files a/lib/pytz/zoneinfo/America/Cayenne and b/lib/pytz/zoneinfo/America/Cayenne differ
diff --git a/lib/pytz/zoneinfo/America/Cayman b/lib/pytz/zoneinfo/America/Cayman
index 9964b9a3..0eb14b75 100644
Binary files a/lib/pytz/zoneinfo/America/Cayman and b/lib/pytz/zoneinfo/America/Cayman differ
diff --git a/lib/pytz/zoneinfo/America/Chicago b/lib/pytz/zoneinfo/America/Chicago
index c6981a06..3dd8f0fa 100644
Binary files a/lib/pytz/zoneinfo/America/Chicago and b/lib/pytz/zoneinfo/America/Chicago differ
diff --git a/lib/pytz/zoneinfo/America/Chihuahua b/lib/pytz/zoneinfo/America/Chihuahua
index 667a2191..e3adbdbf 100644
Binary files a/lib/pytz/zoneinfo/America/Chihuahua and b/lib/pytz/zoneinfo/America/Chihuahua differ
diff --git a/lib/pytz/zoneinfo/America/Ciudad_Juarez b/lib/pytz/zoneinfo/America/Ciudad_Juarez
deleted file mode 100644
index 29af5982..00000000
Binary files a/lib/pytz/zoneinfo/America/Ciudad_Juarez and /dev/null differ
diff --git a/lib/pytz/zoneinfo/America/Coral_Harbour b/lib/pytz/zoneinfo/America/Coral_Harbour
index 9964b9a3..5708b55a 100644
Binary files a/lib/pytz/zoneinfo/America/Coral_Harbour and b/lib/pytz/zoneinfo/America/Coral_Harbour differ
diff --git a/lib/pytz/zoneinfo/America/Cordoba b/lib/pytz/zoneinfo/America/Cordoba
index 2ad6ea5d..cd97a24b 100644
Binary files a/lib/pytz/zoneinfo/America/Cordoba and b/lib/pytz/zoneinfo/America/Cordoba differ
diff --git a/lib/pytz/zoneinfo/America/Costa_Rica b/lib/pytz/zoneinfo/America/Costa_Rica
index 37cb85e4..c247133e 100644
Binary files a/lib/pytz/zoneinfo/America/Costa_Rica and b/lib/pytz/zoneinfo/America/Costa_Rica differ
diff --git a/lib/pytz/zoneinfo/America/Creston b/lib/pytz/zoneinfo/America/Creston
index ab37e845..798f627a 100644
Binary files a/lib/pytz/zoneinfo/America/Creston and b/lib/pytz/zoneinfo/America/Creston differ
diff --git a/lib/pytz/zoneinfo/America/Cuiaba b/lib/pytz/zoneinfo/America/Cuiaba
index 26e97f6e..e3aec8cc 100644
Binary files a/lib/pytz/zoneinfo/America/Cuiaba and b/lib/pytz/zoneinfo/America/Cuiaba differ
diff --git a/lib/pytz/zoneinfo/America/Curacao b/lib/pytz/zoneinfo/America/Curacao
index a662a571..05e77ab4 100644
Binary files a/lib/pytz/zoneinfo/America/Curacao and b/lib/pytz/zoneinfo/America/Curacao differ
diff --git a/lib/pytz/zoneinfo/America/Danmarkshavn b/lib/pytz/zoneinfo/America/Danmarkshavn
index 9549adcb..a8b58ada 100644
Binary files a/lib/pytz/zoneinfo/America/Danmarkshavn and b/lib/pytz/zoneinfo/America/Danmarkshavn differ
diff --git a/lib/pytz/zoneinfo/America/Dawson b/lib/pytz/zoneinfo/America/Dawson
index 343b6322..61c96889 100644
Binary files a/lib/pytz/zoneinfo/America/Dawson and b/lib/pytz/zoneinfo/America/Dawson differ
diff --git a/lib/pytz/zoneinfo/America/Dawson_Creek b/lib/pytz/zoneinfo/America/Dawson_Creek
index db9e3396..78f90763 100644
Binary files a/lib/pytz/zoneinfo/America/Dawson_Creek and b/lib/pytz/zoneinfo/America/Dawson_Creek differ
diff --git a/lib/pytz/zoneinfo/America/Denver b/lib/pytz/zoneinfo/America/Denver
index abb2b974..7fc66917 100644
Binary files a/lib/pytz/zoneinfo/America/Denver and b/lib/pytz/zoneinfo/America/Denver differ
diff --git a/lib/pytz/zoneinfo/America/Detroit b/lib/pytz/zoneinfo/America/Detroit
index e104faa4..a123b331 100644
Binary files a/lib/pytz/zoneinfo/America/Detroit and b/lib/pytz/zoneinfo/America/Detroit differ
diff --git a/lib/pytz/zoneinfo/America/Dominica b/lib/pytz/zoneinfo/America/Dominica
index a662a571..447efbe2 100644
Binary files a/lib/pytz/zoneinfo/America/Dominica and b/lib/pytz/zoneinfo/America/Dominica differ
diff --git a/lib/pytz/zoneinfo/America/Edmonton b/lib/pytz/zoneinfo/America/Edmonton
index cd78a6f8..d02fbcd4 100644
Binary files a/lib/pytz/zoneinfo/America/Edmonton and b/lib/pytz/zoneinfo/America/Edmonton differ
diff --git a/lib/pytz/zoneinfo/America/Eirunepe b/lib/pytz/zoneinfo/America/Eirunepe
index d4c46e30..3359731e 100644
Binary files a/lib/pytz/zoneinfo/America/Eirunepe and b/lib/pytz/zoneinfo/America/Eirunepe differ
diff --git a/lib/pytz/zoneinfo/America/El_Salvador b/lib/pytz/zoneinfo/America/El_Salvador
index e2f22304..9b8bc7a8 100644
Binary files a/lib/pytz/zoneinfo/America/El_Salvador and b/lib/pytz/zoneinfo/America/El_Salvador differ
diff --git a/lib/pytz/zoneinfo/America/Ensenada b/lib/pytz/zoneinfo/America/Ensenada
index 0fe73912..13874753 100644
Binary files a/lib/pytz/zoneinfo/America/Ensenada and b/lib/pytz/zoneinfo/America/Ensenada differ
diff --git a/lib/pytz/zoneinfo/America/Fort_Nelson b/lib/pytz/zoneinfo/America/Fort_Nelson
deleted file mode 100644
index 5a0b7f1c..00000000
Binary files a/lib/pytz/zoneinfo/America/Fort_Nelson and /dev/null differ
diff --git a/lib/pytz/zoneinfo/America/Fort_Wayne b/lib/pytz/zoneinfo/America/Fort_Wayne
index a84b6e99..4a92c065 100644
Binary files a/lib/pytz/zoneinfo/America/Fort_Wayne and b/lib/pytz/zoneinfo/America/Fort_Wayne differ
diff --git a/lib/pytz/zoneinfo/America/Fortaleza b/lib/pytz/zoneinfo/America/Fortaleza
index bee1a951..c0bcf4dc 100644
Binary files a/lib/pytz/zoneinfo/America/Fortaleza and b/lib/pytz/zoneinfo/America/Fortaleza differ
diff --git a/lib/pytz/zoneinfo/America/Glace_Bay b/lib/pytz/zoneinfo/America/Glace_Bay
index 48412a4c..f58522b6 100644
Binary files a/lib/pytz/zoneinfo/America/Glace_Bay and b/lib/pytz/zoneinfo/America/Glace_Bay differ
diff --git a/lib/pytz/zoneinfo/America/Godthab b/lib/pytz/zoneinfo/America/Godthab
index 29958cf1..111d9a81 100644
Binary files a/lib/pytz/zoneinfo/America/Godthab and b/lib/pytz/zoneinfo/America/Godthab differ
diff --git a/lib/pytz/zoneinfo/America/Goose_Bay b/lib/pytz/zoneinfo/America/Goose_Bay
index a3f29907..b4b945e8 100644
Binary files a/lib/pytz/zoneinfo/America/Goose_Bay and b/lib/pytz/zoneinfo/America/Goose_Bay differ
diff --git a/lib/pytz/zoneinfo/America/Grand_Turk b/lib/pytz/zoneinfo/America/Grand_Turk
index 06da1a6d..331aeac2 100644
Binary files a/lib/pytz/zoneinfo/America/Grand_Turk and b/lib/pytz/zoneinfo/America/Grand_Turk differ
diff --git a/lib/pytz/zoneinfo/America/Grenada b/lib/pytz/zoneinfo/America/Grenada
index a662a571..447efbe2 100644
Binary files a/lib/pytz/zoneinfo/America/Grenada and b/lib/pytz/zoneinfo/America/Grenada differ
diff --git a/lib/pytz/zoneinfo/America/Guadeloupe b/lib/pytz/zoneinfo/America/Guadeloupe
index a662a571..447efbe2 100644
Binary files a/lib/pytz/zoneinfo/America/Guadeloupe and b/lib/pytz/zoneinfo/America/Guadeloupe differ
diff --git a/lib/pytz/zoneinfo/America/Guatemala b/lib/pytz/zoneinfo/America/Guatemala
index 407138ca..abf943be 100644
Binary files a/lib/pytz/zoneinfo/America/Guatemala and b/lib/pytz/zoneinfo/America/Guatemala differ
diff --git a/lib/pytz/zoneinfo/America/Guayaquil b/lib/pytz/zoneinfo/America/Guayaquil
index 40831be1..08289046 100644
Binary files a/lib/pytz/zoneinfo/America/Guayaquil and b/lib/pytz/zoneinfo/America/Guayaquil differ
diff --git a/lib/pytz/zoneinfo/America/Guyana b/lib/pytz/zoneinfo/America/Guyana
index 9b703672..036dbe06 100644
Binary files a/lib/pytz/zoneinfo/America/Guyana and b/lib/pytz/zoneinfo/America/Guyana differ
diff --git a/lib/pytz/zoneinfo/America/Halifax b/lib/pytz/zoneinfo/America/Halifax
index 756099ab..f86ece4c 100644
Binary files a/lib/pytz/zoneinfo/America/Halifax and b/lib/pytz/zoneinfo/America/Halifax differ
diff --git a/lib/pytz/zoneinfo/America/Havana b/lib/pytz/zoneinfo/America/Havana
index b69ac451..1a58fcdc 100644
Binary files a/lib/pytz/zoneinfo/America/Havana and b/lib/pytz/zoneinfo/America/Havana differ
diff --git a/lib/pytz/zoneinfo/America/Hermosillo b/lib/pytz/zoneinfo/America/Hermosillo
index 441fe3f2..ec435c23 100644
Binary files a/lib/pytz/zoneinfo/America/Hermosillo and b/lib/pytz/zoneinfo/America/Hermosillo differ
diff --git a/lib/pytz/zoneinfo/America/Indiana/Indianapolis b/lib/pytz/zoneinfo/America/Indiana/Indianapolis
index a84b6e99..4a92c065 100644
Binary files a/lib/pytz/zoneinfo/America/Indiana/Indianapolis and b/lib/pytz/zoneinfo/America/Indiana/Indianapolis differ
diff --git a/lib/pytz/zoneinfo/America/Indiana/Knox b/lib/pytz/zoneinfo/America/Indiana/Knox
index 025d132d..cc785da9 100644
Binary files a/lib/pytz/zoneinfo/America/Indiana/Knox and b/lib/pytz/zoneinfo/America/Indiana/Knox differ
diff --git a/lib/pytz/zoneinfo/America/Indiana/Marengo b/lib/pytz/zoneinfo/America/Indiana/Marengo
index 677bbff6..a23d7b75 100644
Binary files a/lib/pytz/zoneinfo/America/Indiana/Marengo and b/lib/pytz/zoneinfo/America/Indiana/Marengo differ
diff --git a/lib/pytz/zoneinfo/America/Indiana/Petersburg b/lib/pytz/zoneinfo/America/Indiana/Petersburg
index 3082de00..f16cb304 100644
Binary files a/lib/pytz/zoneinfo/America/Indiana/Petersburg and b/lib/pytz/zoneinfo/America/Indiana/Petersburg differ
diff --git a/lib/pytz/zoneinfo/America/Indiana/Tell_City b/lib/pytz/zoneinfo/America/Indiana/Tell_City
index 103c5cb3..0250bf90 100644
Binary files a/lib/pytz/zoneinfo/America/Indiana/Tell_City and b/lib/pytz/zoneinfo/America/Indiana/Tell_City differ
diff --git a/lib/pytz/zoneinfo/America/Indiana/Vevay b/lib/pytz/zoneinfo/America/Indiana/Vevay
index 315b4c45..e934de61 100644
Binary files a/lib/pytz/zoneinfo/America/Indiana/Vevay and b/lib/pytz/zoneinfo/America/Indiana/Vevay differ
diff --git a/lib/pytz/zoneinfo/America/Indiana/Vincennes b/lib/pytz/zoneinfo/America/Indiana/Vincennes
index 35a24133..adbdbeee 100644
Binary files a/lib/pytz/zoneinfo/America/Indiana/Vincennes and b/lib/pytz/zoneinfo/America/Indiana/Vincennes differ
diff --git a/lib/pytz/zoneinfo/America/Indiana/Winamac b/lib/pytz/zoneinfo/America/Indiana/Winamac
index 6d4e1937..b34f7b27 100644
Binary files a/lib/pytz/zoneinfo/America/Indiana/Winamac and b/lib/pytz/zoneinfo/America/Indiana/Winamac differ
diff --git a/lib/pytz/zoneinfo/America/Indianapolis b/lib/pytz/zoneinfo/America/Indianapolis
index a84b6e99..4a92c065 100644
Binary files a/lib/pytz/zoneinfo/America/Indianapolis and b/lib/pytz/zoneinfo/America/Indianapolis differ
diff --git a/lib/pytz/zoneinfo/America/Inuvik b/lib/pytz/zoneinfo/America/Inuvik
index 04c2df45..077fad4f 100644
Binary files a/lib/pytz/zoneinfo/America/Inuvik and b/lib/pytz/zoneinfo/America/Inuvik differ
diff --git a/lib/pytz/zoneinfo/America/Iqaluit b/lib/pytz/zoneinfo/America/Iqaluit
index 0b47b903..e67b71fe 100644
Binary files a/lib/pytz/zoneinfo/America/Iqaluit and b/lib/pytz/zoneinfo/America/Iqaluit differ
diff --git a/lib/pytz/zoneinfo/America/Jamaica b/lib/pytz/zoneinfo/America/Jamaica
index 2a9b7fd5..006689bc 100644
Binary files a/lib/pytz/zoneinfo/America/Jamaica and b/lib/pytz/zoneinfo/America/Jamaica differ
diff --git a/lib/pytz/zoneinfo/America/Jujuy b/lib/pytz/zoneinfo/America/Jujuy
index 7ca0b46f..7be3eeb6 100644
Binary files a/lib/pytz/zoneinfo/America/Jujuy and b/lib/pytz/zoneinfo/America/Jujuy differ
diff --git a/lib/pytz/zoneinfo/America/Juneau b/lib/pytz/zoneinfo/America/Juneau
index 451f3490..ade50a8e 100644
Binary files a/lib/pytz/zoneinfo/America/Juneau and b/lib/pytz/zoneinfo/America/Juneau differ
diff --git a/lib/pytz/zoneinfo/America/Kentucky/Louisville b/lib/pytz/zoneinfo/America/Kentucky/Louisville
index 3a335b37..fdf2e88b 100644
Binary files a/lib/pytz/zoneinfo/America/Kentucky/Louisville and b/lib/pytz/zoneinfo/America/Kentucky/Louisville differ
diff --git a/lib/pytz/zoneinfo/America/Kentucky/Monticello b/lib/pytz/zoneinfo/America/Kentucky/Monticello
index 576f16bb..60991aa3 100644
Binary files a/lib/pytz/zoneinfo/America/Kentucky/Monticello and b/lib/pytz/zoneinfo/America/Kentucky/Monticello differ
diff --git a/lib/pytz/zoneinfo/America/Knox_IN b/lib/pytz/zoneinfo/America/Knox_IN
index 025d132d..cc785da9 100644
Binary files a/lib/pytz/zoneinfo/America/Knox_IN and b/lib/pytz/zoneinfo/America/Knox_IN differ
diff --git a/lib/pytz/zoneinfo/America/Kralendijk b/lib/pytz/zoneinfo/America/Kralendijk
index a662a571..05e77ab4 100644
Binary files a/lib/pytz/zoneinfo/America/Kralendijk and b/lib/pytz/zoneinfo/America/Kralendijk differ
diff --git a/lib/pytz/zoneinfo/America/La_Paz b/lib/pytz/zoneinfo/America/La_Paz
index 374586ea..cedf0b3a 100644
Binary files a/lib/pytz/zoneinfo/America/La_Paz and b/lib/pytz/zoneinfo/America/La_Paz differ
diff --git a/lib/pytz/zoneinfo/America/Lima b/lib/pytz/zoneinfo/America/Lima
index c13bb6be..789fa5c2 100644
Binary files a/lib/pytz/zoneinfo/America/Lima and b/lib/pytz/zoneinfo/America/Lima differ
diff --git a/lib/pytz/zoneinfo/America/Los_Angeles b/lib/pytz/zoneinfo/America/Los_Angeles
index 610e7af5..1fa9149f 100644
Binary files a/lib/pytz/zoneinfo/America/Los_Angeles and b/lib/pytz/zoneinfo/America/Los_Angeles differ
diff --git a/lib/pytz/zoneinfo/America/Louisville b/lib/pytz/zoneinfo/America/Louisville
index 3a335b37..fdf2e88b 100644
Binary files a/lib/pytz/zoneinfo/America/Louisville and b/lib/pytz/zoneinfo/America/Louisville differ
diff --git a/lib/pytz/zoneinfo/America/Lower_Princes b/lib/pytz/zoneinfo/America/Lower_Princes
index a662a571..05e77ab4 100644
Binary files a/lib/pytz/zoneinfo/America/Lower_Princes and b/lib/pytz/zoneinfo/America/Lower_Princes differ
diff --git a/lib/pytz/zoneinfo/America/Maceio b/lib/pytz/zoneinfo/America/Maceio
index 437a4731..de749909 100644
Binary files a/lib/pytz/zoneinfo/America/Maceio and b/lib/pytz/zoneinfo/America/Maceio differ
diff --git a/lib/pytz/zoneinfo/America/Managua b/lib/pytz/zoneinfo/America/Managua
index e0242bff..c543ffd4 100644
Binary files a/lib/pytz/zoneinfo/America/Managua and b/lib/pytz/zoneinfo/America/Managua differ
diff --git a/lib/pytz/zoneinfo/America/Manaus b/lib/pytz/zoneinfo/America/Manaus
index 2708baea..e0222f18 100644
Binary files a/lib/pytz/zoneinfo/America/Manaus and b/lib/pytz/zoneinfo/America/Manaus differ
diff --git a/lib/pytz/zoneinfo/America/Marigot b/lib/pytz/zoneinfo/America/Marigot
index a662a571..447efbe2 100644
Binary files a/lib/pytz/zoneinfo/America/Marigot and b/lib/pytz/zoneinfo/America/Marigot differ
diff --git a/lib/pytz/zoneinfo/America/Martinique b/lib/pytz/zoneinfo/America/Martinique
index 8df43dcf..f9e2399c 100644
Binary files a/lib/pytz/zoneinfo/America/Martinique and b/lib/pytz/zoneinfo/America/Martinique differ
diff --git a/lib/pytz/zoneinfo/America/Matamoros b/lib/pytz/zoneinfo/America/Matamoros
index bbe04e86..5671d258 100644
Binary files a/lib/pytz/zoneinfo/America/Matamoros and b/lib/pytz/zoneinfo/America/Matamoros differ
diff --git a/lib/pytz/zoneinfo/America/Mazatlan b/lib/pytz/zoneinfo/America/Mazatlan
index 386616a5..afa94c2a 100644
Binary files a/lib/pytz/zoneinfo/America/Mazatlan and b/lib/pytz/zoneinfo/America/Mazatlan differ
diff --git a/lib/pytz/zoneinfo/America/Mendoza b/lib/pytz/zoneinfo/America/Mendoza
index 3232c80e..f9eb526c 100644
Binary files a/lib/pytz/zoneinfo/America/Mendoza and b/lib/pytz/zoneinfo/America/Mendoza differ
diff --git a/lib/pytz/zoneinfo/America/Menominee b/lib/pytz/zoneinfo/America/Menominee
index 31461386..55d6e326 100644
Binary files a/lib/pytz/zoneinfo/America/Menominee and b/lib/pytz/zoneinfo/America/Menominee differ
diff --git a/lib/pytz/zoneinfo/America/Merida b/lib/pytz/zoneinfo/America/Merida
index c4b9b4e8..ecc1856e 100644
Binary files a/lib/pytz/zoneinfo/America/Merida and b/lib/pytz/zoneinfo/America/Merida differ
diff --git a/lib/pytz/zoneinfo/America/Metlakatla b/lib/pytz/zoneinfo/America/Metlakatla
index 1e94be3d..e66cc341 100644
Binary files a/lib/pytz/zoneinfo/America/Metlakatla and b/lib/pytz/zoneinfo/America/Metlakatla differ
diff --git a/lib/pytz/zoneinfo/America/Mexico_City b/lib/pytz/zoneinfo/America/Mexico_City
index ad70cf3e..f11e3d2d 100644
Binary files a/lib/pytz/zoneinfo/America/Mexico_City and b/lib/pytz/zoneinfo/America/Mexico_City differ
diff --git a/lib/pytz/zoneinfo/America/Miquelon b/lib/pytz/zoneinfo/America/Miquelon
index f780ea99..36f66961 100644
Binary files a/lib/pytz/zoneinfo/America/Miquelon and b/lib/pytz/zoneinfo/America/Miquelon differ
diff --git a/lib/pytz/zoneinfo/America/Moncton b/lib/pytz/zoneinfo/America/Moncton
index 9df8d0f2..51cb1ba3 100644
Binary files a/lib/pytz/zoneinfo/America/Moncton and b/lib/pytz/zoneinfo/America/Moncton differ
diff --git a/lib/pytz/zoneinfo/America/Monterrey b/lib/pytz/zoneinfo/America/Monterrey
index 2d7993a0..dcac92ba 100644
Binary files a/lib/pytz/zoneinfo/America/Monterrey and b/lib/pytz/zoneinfo/America/Monterrey differ
diff --git a/lib/pytz/zoneinfo/America/Montevideo b/lib/pytz/zoneinfo/America/Montevideo
index e7bbfbb8..ab3d6807 100644
Binary files a/lib/pytz/zoneinfo/America/Montevideo and b/lib/pytz/zoneinfo/America/Montevideo differ
diff --git a/lib/pytz/zoneinfo/America/Montreal b/lib/pytz/zoneinfo/America/Montreal
index 17013733..89b9f493 100644
Binary files a/lib/pytz/zoneinfo/America/Montreal and b/lib/pytz/zoneinfo/America/Montreal differ
diff --git a/lib/pytz/zoneinfo/America/Montserrat b/lib/pytz/zoneinfo/America/Montserrat
index a662a571..447efbe2 100644
Binary files a/lib/pytz/zoneinfo/America/Montserrat and b/lib/pytz/zoneinfo/America/Montserrat differ
diff --git a/lib/pytz/zoneinfo/America/Nassau b/lib/pytz/zoneinfo/America/Nassau
index 17013733..e5d0289b 100644
Binary files a/lib/pytz/zoneinfo/America/Nassau and b/lib/pytz/zoneinfo/America/Nassau differ
diff --git a/lib/pytz/zoneinfo/America/New_York b/lib/pytz/zoneinfo/America/New_York
index a8b9ab19..7553fee3 100644
Binary files a/lib/pytz/zoneinfo/America/New_York and b/lib/pytz/zoneinfo/America/New_York differ
diff --git a/lib/pytz/zoneinfo/America/Nipigon b/lib/pytz/zoneinfo/America/Nipigon
index 17013733..f8a0292b 100644
Binary files a/lib/pytz/zoneinfo/America/Nipigon and b/lib/pytz/zoneinfo/America/Nipigon differ
diff --git a/lib/pytz/zoneinfo/America/Nome b/lib/pytz/zoneinfo/America/Nome
index 10998df3..d370ab14 100644
Binary files a/lib/pytz/zoneinfo/America/Nome and b/lib/pytz/zoneinfo/America/Nome differ
diff --git a/lib/pytz/zoneinfo/America/Noronha b/lib/pytz/zoneinfo/America/Noronha
index 73b4b336..774b14e6 100644
Binary files a/lib/pytz/zoneinfo/America/Noronha and b/lib/pytz/zoneinfo/America/Noronha differ
diff --git a/lib/pytz/zoneinfo/America/North_Dakota/Beulah b/lib/pytz/zoneinfo/America/North_Dakota/Beulah
index 33e317e2..8174c882 100644
Binary files a/lib/pytz/zoneinfo/America/North_Dakota/Beulah and b/lib/pytz/zoneinfo/America/North_Dakota/Beulah differ
diff --git a/lib/pytz/zoneinfo/America/North_Dakota/Center b/lib/pytz/zoneinfo/America/North_Dakota/Center
index 17fe13bc..8035b24f 100644
Binary files a/lib/pytz/zoneinfo/America/North_Dakota/Center and b/lib/pytz/zoneinfo/America/North_Dakota/Center differ
diff --git a/lib/pytz/zoneinfo/America/North_Dakota/New_Salem b/lib/pytz/zoneinfo/America/North_Dakota/New_Salem
index 12dbe801..5b630ee6 100644
Binary files a/lib/pytz/zoneinfo/America/North_Dakota/New_Salem and b/lib/pytz/zoneinfo/America/North_Dakota/New_Salem differ
diff --git a/lib/pytz/zoneinfo/America/Nuuk b/lib/pytz/zoneinfo/America/Nuuk
deleted file mode 100644
index 29958cf1..00000000
Binary files a/lib/pytz/zoneinfo/America/Nuuk and /dev/null differ
diff --git a/lib/pytz/zoneinfo/America/Ojinaga b/lib/pytz/zoneinfo/America/Ojinaga
index 45118a4f..190c5c86 100644
Binary files a/lib/pytz/zoneinfo/America/Ojinaga and b/lib/pytz/zoneinfo/America/Ojinaga differ
diff --git a/lib/pytz/zoneinfo/America/Panama b/lib/pytz/zoneinfo/America/Panama
index 9964b9a3..5c1c0637 100644
Binary files a/lib/pytz/zoneinfo/America/Panama and b/lib/pytz/zoneinfo/America/Panama differ
diff --git a/lib/pytz/zoneinfo/America/Pangnirtung b/lib/pytz/zoneinfo/America/Pangnirtung
index 0b47b903..994da430 100644
Binary files a/lib/pytz/zoneinfo/America/Pangnirtung and b/lib/pytz/zoneinfo/America/Pangnirtung differ
diff --git a/lib/pytz/zoneinfo/America/Paramaribo b/lib/pytz/zoneinfo/America/Paramaribo
index f1b82b4f..2f05b236 100644
Binary files a/lib/pytz/zoneinfo/America/Paramaribo and b/lib/pytz/zoneinfo/America/Paramaribo differ
diff --git a/lib/pytz/zoneinfo/America/Phoenix b/lib/pytz/zoneinfo/America/Phoenix
index ab37e845..adf28236 100644
Binary files a/lib/pytz/zoneinfo/America/Phoenix and b/lib/pytz/zoneinfo/America/Phoenix differ
diff --git a/lib/pytz/zoneinfo/America/Port-au-Prince b/lib/pytz/zoneinfo/America/Port-au-Prince
index 287f1439..dd8895c0 100644
Binary files a/lib/pytz/zoneinfo/America/Port-au-Prince and b/lib/pytz/zoneinfo/America/Port-au-Prince differ
diff --git a/lib/pytz/zoneinfo/America/Port_of_Spain b/lib/pytz/zoneinfo/America/Port_of_Spain
index a662a571..447efbe2 100644
Binary files a/lib/pytz/zoneinfo/America/Port_of_Spain and b/lib/pytz/zoneinfo/America/Port_of_Spain differ
diff --git a/lib/pytz/zoneinfo/America/Porto_Acre b/lib/pytz/zoneinfo/America/Porto_Acre
index cdda168c..788d0e9c 100644
Binary files a/lib/pytz/zoneinfo/America/Porto_Acre and b/lib/pytz/zoneinfo/America/Porto_Acre differ
diff --git a/lib/pytz/zoneinfo/America/Porto_Velho b/lib/pytz/zoneinfo/America/Porto_Velho
index e0039860..aa8cf315 100644
Binary files a/lib/pytz/zoneinfo/America/Porto_Velho and b/lib/pytz/zoneinfo/America/Porto_Velho differ
diff --git a/lib/pytz/zoneinfo/America/Puerto_Rico b/lib/pytz/zoneinfo/America/Puerto_Rico
index a662a571..d4525a68 100644
Binary files a/lib/pytz/zoneinfo/America/Puerto_Rico and b/lib/pytz/zoneinfo/America/Puerto_Rico differ
diff --git a/lib/pytz/zoneinfo/America/Punta_Arenas b/lib/pytz/zoneinfo/America/Punta_Arenas
deleted file mode 100644
index 411a839b..00000000
Binary files a/lib/pytz/zoneinfo/America/Punta_Arenas and /dev/null differ
diff --git a/lib/pytz/zoneinfo/America/Rainy_River b/lib/pytz/zoneinfo/America/Rainy_River
index ac40299f..70dcd2d8 100644
Binary files a/lib/pytz/zoneinfo/America/Rainy_River and b/lib/pytz/zoneinfo/America/Rainy_River differ
diff --git a/lib/pytz/zoneinfo/America/Rankin_Inlet b/lib/pytz/zoneinfo/America/Rankin_Inlet
index e2714921..cc15d831 100644
Binary files a/lib/pytz/zoneinfo/America/Rankin_Inlet and b/lib/pytz/zoneinfo/America/Rankin_Inlet differ
diff --git a/lib/pytz/zoneinfo/America/Recife b/lib/pytz/zoneinfo/America/Recife
index 5bf6c211..f0ad7b98 100644
Binary files a/lib/pytz/zoneinfo/America/Recife and b/lib/pytz/zoneinfo/America/Recife differ
diff --git a/lib/pytz/zoneinfo/America/Regina b/lib/pytz/zoneinfo/America/Regina
index 20c9c84d..5fe8d6b6 100644
Binary files a/lib/pytz/zoneinfo/America/Regina and b/lib/pytz/zoneinfo/America/Regina differ
diff --git a/lib/pytz/zoneinfo/America/Resolute b/lib/pytz/zoneinfo/America/Resolute
index 19668900..53079413 100644
Binary files a/lib/pytz/zoneinfo/America/Resolute and b/lib/pytz/zoneinfo/America/Resolute differ
diff --git a/lib/pytz/zoneinfo/America/Rio_Branco b/lib/pytz/zoneinfo/America/Rio_Branco
index cdda168c..788d0e9c 100644
Binary files a/lib/pytz/zoneinfo/America/Rio_Branco and b/lib/pytz/zoneinfo/America/Rio_Branco differ
diff --git a/lib/pytz/zoneinfo/America/Rosario b/lib/pytz/zoneinfo/America/Rosario
index 2ad6ea5d..cd97a24b 100644
Binary files a/lib/pytz/zoneinfo/America/Rosario and b/lib/pytz/zoneinfo/America/Rosario differ
diff --git a/lib/pytz/zoneinfo/America/Santa_Isabel b/lib/pytz/zoneinfo/America/Santa_Isabel
index 0fe73912..e1c4d161 100644
Binary files a/lib/pytz/zoneinfo/America/Santa_Isabel and b/lib/pytz/zoneinfo/America/Santa_Isabel differ
diff --git a/lib/pytz/zoneinfo/America/Santarem b/lib/pytz/zoneinfo/America/Santarem
index 001638c2..bb469d39 100644
Binary files a/lib/pytz/zoneinfo/America/Santarem and b/lib/pytz/zoneinfo/America/Santarem differ
diff --git a/lib/pytz/zoneinfo/America/Santiago b/lib/pytz/zoneinfo/America/Santiago
index 010c6bd0..92cf5597 100644
Binary files a/lib/pytz/zoneinfo/America/Santiago and b/lib/pytz/zoneinfo/America/Santiago differ
diff --git a/lib/pytz/zoneinfo/America/Santo_Domingo b/lib/pytz/zoneinfo/America/Santo_Domingo
index 4fe36fd4..77eab315 100644
Binary files a/lib/pytz/zoneinfo/America/Santo_Domingo and b/lib/pytz/zoneinfo/America/Santo_Domingo differ
diff --git a/lib/pytz/zoneinfo/America/Sao_Paulo b/lib/pytz/zoneinfo/America/Sao_Paulo
index 67935ff4..552ce7c2 100644
Binary files a/lib/pytz/zoneinfo/America/Sao_Paulo and b/lib/pytz/zoneinfo/America/Sao_Paulo differ
diff --git a/lib/pytz/zoneinfo/America/Scoresbysund b/lib/pytz/zoneinfo/America/Scoresbysund
index 9bf411ef..85676ca3 100644
Binary files a/lib/pytz/zoneinfo/America/Scoresbysund and b/lib/pytz/zoneinfo/America/Scoresbysund differ
diff --git a/lib/pytz/zoneinfo/America/Shiprock b/lib/pytz/zoneinfo/America/Shiprock
index abb2b974..7fc66917 100644
Binary files a/lib/pytz/zoneinfo/America/Shiprock and b/lib/pytz/zoneinfo/America/Shiprock differ
diff --git a/lib/pytz/zoneinfo/America/Sitka b/lib/pytz/zoneinfo/America/Sitka
index 31f70613..48fc6aff 100644
Binary files a/lib/pytz/zoneinfo/America/Sitka and b/lib/pytz/zoneinfo/America/Sitka differ
diff --git a/lib/pytz/zoneinfo/America/St_Barthelemy b/lib/pytz/zoneinfo/America/St_Barthelemy
index a662a571..447efbe2 100644
Binary files a/lib/pytz/zoneinfo/America/St_Barthelemy and b/lib/pytz/zoneinfo/America/St_Barthelemy differ
diff --git a/lib/pytz/zoneinfo/America/St_Johns b/lib/pytz/zoneinfo/America/St_Johns
index 65a5b0c7..a1d14854 100644
Binary files a/lib/pytz/zoneinfo/America/St_Johns and b/lib/pytz/zoneinfo/America/St_Johns differ
diff --git a/lib/pytz/zoneinfo/America/St_Kitts b/lib/pytz/zoneinfo/America/St_Kitts
index a662a571..447efbe2 100644
Binary files a/lib/pytz/zoneinfo/America/St_Kitts and b/lib/pytz/zoneinfo/America/St_Kitts differ
diff --git a/lib/pytz/zoneinfo/America/St_Lucia b/lib/pytz/zoneinfo/America/St_Lucia
index a662a571..447efbe2 100644
Binary files a/lib/pytz/zoneinfo/America/St_Lucia and b/lib/pytz/zoneinfo/America/St_Lucia differ
diff --git a/lib/pytz/zoneinfo/America/St_Thomas b/lib/pytz/zoneinfo/America/St_Thomas
index a662a571..447efbe2 100644
Binary files a/lib/pytz/zoneinfo/America/St_Thomas and b/lib/pytz/zoneinfo/America/St_Thomas differ
diff --git a/lib/pytz/zoneinfo/America/St_Vincent b/lib/pytz/zoneinfo/America/St_Vincent
index a662a571..447efbe2 100644
Binary files a/lib/pytz/zoneinfo/America/St_Vincent and b/lib/pytz/zoneinfo/America/St_Vincent differ
diff --git a/lib/pytz/zoneinfo/America/Swift_Current b/lib/pytz/zoneinfo/America/Swift_Current
index 8e9ef255..4db1300a 100644
Binary files a/lib/pytz/zoneinfo/America/Swift_Current and b/lib/pytz/zoneinfo/America/Swift_Current differ
diff --git a/lib/pytz/zoneinfo/America/Tegucigalpa b/lib/pytz/zoneinfo/America/Tegucigalpa
index 2adacb2e..7aea8f99 100644
Binary files a/lib/pytz/zoneinfo/America/Tegucigalpa and b/lib/pytz/zoneinfo/America/Tegucigalpa differ
diff --git a/lib/pytz/zoneinfo/America/Thule b/lib/pytz/zoneinfo/America/Thule
index 6f802f1c..deefcc8d 100644
Binary files a/lib/pytz/zoneinfo/America/Thule and b/lib/pytz/zoneinfo/America/Thule differ
diff --git a/lib/pytz/zoneinfo/America/Thunder_Bay b/lib/pytz/zoneinfo/America/Thunder_Bay
index 17013733..aa1d4860 100644
Binary files a/lib/pytz/zoneinfo/America/Thunder_Bay and b/lib/pytz/zoneinfo/America/Thunder_Bay differ
diff --git a/lib/pytz/zoneinfo/America/Tijuana b/lib/pytz/zoneinfo/America/Tijuana
index 0fe73912..13874753 100644
Binary files a/lib/pytz/zoneinfo/America/Tijuana and b/lib/pytz/zoneinfo/America/Tijuana differ
diff --git a/lib/pytz/zoneinfo/America/Toronto b/lib/pytz/zoneinfo/America/Toronto
index 17013733..7b4682a3 100644
Binary files a/lib/pytz/zoneinfo/America/Toronto and b/lib/pytz/zoneinfo/America/Toronto differ
diff --git a/lib/pytz/zoneinfo/America/Tortola b/lib/pytz/zoneinfo/America/Tortola
index a662a571..447efbe2 100644
Binary files a/lib/pytz/zoneinfo/America/Tortola and b/lib/pytz/zoneinfo/America/Tortola differ
diff --git a/lib/pytz/zoneinfo/America/Vancouver b/lib/pytz/zoneinfo/America/Vancouver
index bb60cbce..9b5d9241 100644
Binary files a/lib/pytz/zoneinfo/America/Vancouver and b/lib/pytz/zoneinfo/America/Vancouver differ
diff --git a/lib/pytz/zoneinfo/America/Virgin b/lib/pytz/zoneinfo/America/Virgin
index a662a571..447efbe2 100644
Binary files a/lib/pytz/zoneinfo/America/Virgin and b/lib/pytz/zoneinfo/America/Virgin differ
diff --git a/lib/pytz/zoneinfo/America/Whitehorse b/lib/pytz/zoneinfo/America/Whitehorse
index 318c4a8e..8604c5c5 100644
Binary files a/lib/pytz/zoneinfo/America/Whitehorse and b/lib/pytz/zoneinfo/America/Whitehorse differ
diff --git a/lib/pytz/zoneinfo/America/Winnipeg b/lib/pytz/zoneinfo/America/Winnipeg
index ac40299f..2ffe3d8d 100644
Binary files a/lib/pytz/zoneinfo/America/Winnipeg and b/lib/pytz/zoneinfo/America/Winnipeg differ
diff --git a/lib/pytz/zoneinfo/America/Yakutat b/lib/pytz/zoneinfo/America/Yakutat
index da209f9f..f3d73990 100644
Binary files a/lib/pytz/zoneinfo/America/Yakutat and b/lib/pytz/zoneinfo/America/Yakutat differ
diff --git a/lib/pytz/zoneinfo/America/Yellowknife b/lib/pytz/zoneinfo/America/Yellowknife
index cd78a6f8..21cba6e4 100644
Binary files a/lib/pytz/zoneinfo/America/Yellowknife and b/lib/pytz/zoneinfo/America/Yellowknife differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Casey b/lib/pytz/zoneinfo/Antarctica/Casey
index 586a7653..c2a99056 100644
Binary files a/lib/pytz/zoneinfo/Antarctica/Casey and b/lib/pytz/zoneinfo/Antarctica/Casey differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Davis b/lib/pytz/zoneinfo/Antarctica/Davis
index d4d47b24..7321c67f 100644
Binary files a/lib/pytz/zoneinfo/Antarctica/Davis and b/lib/pytz/zoneinfo/Antarctica/Davis differ
diff --git a/lib/pytz/zoneinfo/Antarctica/DumontDUrville b/lib/pytz/zoneinfo/Antarctica/DumontDUrville
index 7be2474d..c406b8d5 100644
Binary files a/lib/pytz/zoneinfo/Antarctica/DumontDUrville and b/lib/pytz/zoneinfo/Antarctica/DumontDUrville differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Macquarie b/lib/pytz/zoneinfo/Antarctica/Macquarie
index 9e7cc687..fc7b96fe 100644
Binary files a/lib/pytz/zoneinfo/Antarctica/Macquarie and b/lib/pytz/zoneinfo/Antarctica/Macquarie differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Mawson b/lib/pytz/zoneinfo/Antarctica/Mawson
index 6d93f6e1..6c5b0fa1 100644
Binary files a/lib/pytz/zoneinfo/Antarctica/Mawson and b/lib/pytz/zoneinfo/Antarctica/Mawson differ
diff --git a/lib/pytz/zoneinfo/Antarctica/McMurdo b/lib/pytz/zoneinfo/Antarctica/McMurdo
index 6575fdce..a5f5b6d5 100644
Binary files a/lib/pytz/zoneinfo/Antarctica/McMurdo and b/lib/pytz/zoneinfo/Antarctica/McMurdo differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Palmer b/lib/pytz/zoneinfo/Antarctica/Palmer
index 9c8fd317..9e9cdd0b 100644
Binary files a/lib/pytz/zoneinfo/Antarctica/Palmer and b/lib/pytz/zoneinfo/Antarctica/Palmer differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Rothera b/lib/pytz/zoneinfo/Antarctica/Rothera
index 241cc44d..28f82baa 100644
Binary files a/lib/pytz/zoneinfo/Antarctica/Rothera and b/lib/pytz/zoneinfo/Antarctica/Rothera differ
diff --git a/lib/pytz/zoneinfo/Antarctica/South_Pole b/lib/pytz/zoneinfo/Antarctica/South_Pole
index 6575fdce..a5f5b6d5 100644
Binary files a/lib/pytz/zoneinfo/Antarctica/South_Pole and b/lib/pytz/zoneinfo/Antarctica/South_Pole differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Syowa b/lib/pytz/zoneinfo/Antarctica/Syowa
index 8c806247..b837b071 100644
Binary files a/lib/pytz/zoneinfo/Antarctica/Syowa and b/lib/pytz/zoneinfo/Antarctica/Syowa differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Troll b/lib/pytz/zoneinfo/Antarctica/Troll
index a1dcea14..d973a122 100644
Binary files a/lib/pytz/zoneinfo/Antarctica/Troll and b/lib/pytz/zoneinfo/Antarctica/Troll differ
diff --git a/lib/pytz/zoneinfo/Antarctica/Vostok b/lib/pytz/zoneinfo/Antarctica/Vostok
index 016e06b1..cbec909e 100644
Binary files a/lib/pytz/zoneinfo/Antarctica/Vostok and b/lib/pytz/zoneinfo/Antarctica/Vostok differ
diff --git a/lib/pytz/zoneinfo/Arctic/Longyearbyen b/lib/pytz/zoneinfo/Arctic/Longyearbyen
index 7f6d958f..239c0174 100644
Binary files a/lib/pytz/zoneinfo/Arctic/Longyearbyen and b/lib/pytz/zoneinfo/Arctic/Longyearbyen differ
diff --git a/lib/pytz/zoneinfo/Asia/Aden b/lib/pytz/zoneinfo/Asia/Aden
index 8c806247..505e1d22 100644
Binary files a/lib/pytz/zoneinfo/Asia/Aden and b/lib/pytz/zoneinfo/Asia/Aden differ
diff --git a/lib/pytz/zoneinfo/Asia/Almaty b/lib/pytz/zoneinfo/Asia/Almaty
index 855abbd6..75a007de 100644
Binary files a/lib/pytz/zoneinfo/Asia/Almaty and b/lib/pytz/zoneinfo/Asia/Almaty differ
diff --git a/lib/pytz/zoneinfo/Asia/Amman b/lib/pytz/zoneinfo/Asia/Amman
index 0a8e350a..c3f0994a 100644
Binary files a/lib/pytz/zoneinfo/Asia/Amman and b/lib/pytz/zoneinfo/Asia/Amman differ
diff --git a/lib/pytz/zoneinfo/Asia/Anadyr b/lib/pytz/zoneinfo/Asia/Anadyr
index 35c531c0..766594bc 100644
Binary files a/lib/pytz/zoneinfo/Asia/Anadyr and b/lib/pytz/zoneinfo/Asia/Anadyr differ
diff --git a/lib/pytz/zoneinfo/Asia/Aqtau b/lib/pytz/zoneinfo/Asia/Aqtau
index 0e1c16d3..811ed2f9 100644
Binary files a/lib/pytz/zoneinfo/Asia/Aqtau and b/lib/pytz/zoneinfo/Asia/Aqtau differ
diff --git a/lib/pytz/zoneinfo/Asia/Aqtobe b/lib/pytz/zoneinfo/Asia/Aqtobe
index 3b5d6eb4..ff3b96b3 100644
Binary files a/lib/pytz/zoneinfo/Asia/Aqtobe and b/lib/pytz/zoneinfo/Asia/Aqtobe differ
diff --git a/lib/pytz/zoneinfo/Asia/Ashgabat b/lib/pytz/zoneinfo/Asia/Ashgabat
index 2bd1cb3d..f79fe046 100644
Binary files a/lib/pytz/zoneinfo/Asia/Ashgabat and b/lib/pytz/zoneinfo/Asia/Ashgabat differ
diff --git a/lib/pytz/zoneinfo/Asia/Ashkhabad b/lib/pytz/zoneinfo/Asia/Ashkhabad
index 2bd1cb3d..f79fe046 100644
Binary files a/lib/pytz/zoneinfo/Asia/Ashkhabad and b/lib/pytz/zoneinfo/Asia/Ashkhabad differ
diff --git a/lib/pytz/zoneinfo/Asia/Atyrau b/lib/pytz/zoneinfo/Asia/Atyrau
deleted file mode 100644
index e7ea9c54..00000000
Binary files a/lib/pytz/zoneinfo/Asia/Atyrau and /dev/null differ
diff --git a/lib/pytz/zoneinfo/Asia/Baghdad b/lib/pytz/zoneinfo/Asia/Baghdad
index c0e60723..f0a96ec3 100644
Binary files a/lib/pytz/zoneinfo/Asia/Baghdad and b/lib/pytz/zoneinfo/Asia/Baghdad differ
diff --git a/lib/pytz/zoneinfo/Asia/Bahrain b/lib/pytz/zoneinfo/Asia/Bahrain
index 098997e7..cda04a15 100644
Binary files a/lib/pytz/zoneinfo/Asia/Bahrain and b/lib/pytz/zoneinfo/Asia/Bahrain differ
diff --git a/lib/pytz/zoneinfo/Asia/Baku b/lib/pytz/zoneinfo/Asia/Baku
index ae0ce4e7..f78e7645 100644
Binary files a/lib/pytz/zoneinfo/Asia/Baku and b/lib/pytz/zoneinfo/Asia/Baku differ
diff --git a/lib/pytz/zoneinfo/Asia/Bangkok b/lib/pytz/zoneinfo/Asia/Bangkok
index fa799db3..e8e76276 100644
Binary files a/lib/pytz/zoneinfo/Asia/Bangkok and b/lib/pytz/zoneinfo/Asia/Bangkok differ
diff --git a/lib/pytz/zoneinfo/Asia/Barnaul b/lib/pytz/zoneinfo/Asia/Barnaul
deleted file mode 100644
index 2f6b8101..00000000
Binary files a/lib/pytz/zoneinfo/Asia/Barnaul and /dev/null differ
diff --git a/lib/pytz/zoneinfo/Asia/Beirut b/lib/pytz/zoneinfo/Asia/Beirut
index fb266ede..72f08963 100644
Binary files a/lib/pytz/zoneinfo/Asia/Beirut and b/lib/pytz/zoneinfo/Asia/Beirut differ
diff --git a/lib/pytz/zoneinfo/Asia/Bishkek b/lib/pytz/zoneinfo/Asia/Bishkek
index 547fd5e1..eee8278a 100644
Binary files a/lib/pytz/zoneinfo/Asia/Bishkek and b/lib/pytz/zoneinfo/Asia/Bishkek differ
diff --git a/lib/pytz/zoneinfo/Asia/Brunei b/lib/pytz/zoneinfo/Asia/Brunei
index 098c6a0b..1ac3115a 100644
Binary files a/lib/pytz/zoneinfo/Asia/Brunei and b/lib/pytz/zoneinfo/Asia/Brunei differ
diff --git a/lib/pytz/zoneinfo/Asia/Calcutta b/lib/pytz/zoneinfo/Asia/Calcutta
index 0014046d..3c0d5abc 100644
Binary files a/lib/pytz/zoneinfo/Asia/Calcutta and b/lib/pytz/zoneinfo/Asia/Calcutta differ
diff --git a/lib/pytz/zoneinfo/Asia/Chita b/lib/pytz/zoneinfo/Asia/Chita
index 75b3d7b3..c0906547 100644
Binary files a/lib/pytz/zoneinfo/Asia/Chita and b/lib/pytz/zoneinfo/Asia/Chita differ
diff --git a/lib/pytz/zoneinfo/Asia/Choibalsan b/lib/pytz/zoneinfo/Asia/Choibalsan
index 2aa5cc4b..f0990926 100644
Binary files a/lib/pytz/zoneinfo/Asia/Choibalsan and b/lib/pytz/zoneinfo/Asia/Choibalsan differ
diff --git a/lib/pytz/zoneinfo/Asia/Chongqing b/lib/pytz/zoneinfo/Asia/Chongqing
index 91f6f8bc..dbd132f2 100644
Binary files a/lib/pytz/zoneinfo/Asia/Chongqing and b/lib/pytz/zoneinfo/Asia/Chongqing differ
diff --git a/lib/pytz/zoneinfo/Asia/Chungking b/lib/pytz/zoneinfo/Asia/Chungking
index 91f6f8bc..dbd132f2 100644
Binary files a/lib/pytz/zoneinfo/Asia/Chungking and b/lib/pytz/zoneinfo/Asia/Chungking differ
diff --git a/lib/pytz/zoneinfo/Asia/Colombo b/lib/pytz/zoneinfo/Asia/Colombo
index 353fe2aa..d10439af 100644
Binary files a/lib/pytz/zoneinfo/Asia/Colombo and b/lib/pytz/zoneinfo/Asia/Colombo differ
diff --git a/lib/pytz/zoneinfo/Asia/Dacca b/lib/pytz/zoneinfo/Asia/Dacca
index 3cf597d8..b6b326b2 100644
Binary files a/lib/pytz/zoneinfo/Asia/Dacca and b/lib/pytz/zoneinfo/Asia/Dacca differ
diff --git a/lib/pytz/zoneinfo/Asia/Damascus b/lib/pytz/zoneinfo/Asia/Damascus
index afd956c8..ac457646 100644
Binary files a/lib/pytz/zoneinfo/Asia/Damascus and b/lib/pytz/zoneinfo/Asia/Damascus differ
diff --git a/lib/pytz/zoneinfo/Asia/Dhaka b/lib/pytz/zoneinfo/Asia/Dhaka
index 3cf597d8..b6b326b2 100644
Binary files a/lib/pytz/zoneinfo/Asia/Dhaka and b/lib/pytz/zoneinfo/Asia/Dhaka differ
diff --git a/lib/pytz/zoneinfo/Asia/Dili b/lib/pytz/zoneinfo/Asia/Dili
index 4614e4fc..8124fb70 100644
Binary files a/lib/pytz/zoneinfo/Asia/Dili and b/lib/pytz/zoneinfo/Asia/Dili differ
diff --git a/lib/pytz/zoneinfo/Asia/Dubai b/lib/pytz/zoneinfo/Asia/Dubai
index b3ac791a..415e443c 100644
Binary files a/lib/pytz/zoneinfo/Asia/Dubai and b/lib/pytz/zoneinfo/Asia/Dubai differ
diff --git a/lib/pytz/zoneinfo/Asia/Dushanbe b/lib/pytz/zoneinfo/Asia/Dushanbe
index 89e875be..3b1e978b 100644
Binary files a/lib/pytz/zoneinfo/Asia/Dushanbe and b/lib/pytz/zoneinfo/Asia/Dushanbe differ
diff --git a/lib/pytz/zoneinfo/Asia/Famagusta b/lib/pytz/zoneinfo/Asia/Famagusta
deleted file mode 100644
index 653b146a..00000000
Binary files a/lib/pytz/zoneinfo/Asia/Famagusta and /dev/null differ
diff --git a/lib/pytz/zoneinfo/Asia/Gaza b/lib/pytz/zoneinfo/Asia/Gaza
index dd5781e8..bd683e83 100644
Binary files a/lib/pytz/zoneinfo/Asia/Gaza and b/lib/pytz/zoneinfo/Asia/Gaza differ
diff --git a/lib/pytz/zoneinfo/Asia/Harbin b/lib/pytz/zoneinfo/Asia/Harbin
index 91f6f8bc..dbd132f2 100644
Binary files a/lib/pytz/zoneinfo/Asia/Harbin and b/lib/pytz/zoneinfo/Asia/Harbin differ
diff --git a/lib/pytz/zoneinfo/Asia/Hebron b/lib/pytz/zoneinfo/Asia/Hebron
index a64fc9e7..0bc7674b 100644
Binary files a/lib/pytz/zoneinfo/Asia/Hebron and b/lib/pytz/zoneinfo/Asia/Hebron differ
diff --git a/lib/pytz/zoneinfo/Asia/Ho_Chi_Minh b/lib/pytz/zoneinfo/Asia/Ho_Chi_Minh
index 9c45ed99..c1422657 100644
Binary files a/lib/pytz/zoneinfo/Asia/Ho_Chi_Minh and b/lib/pytz/zoneinfo/Asia/Ho_Chi_Minh differ
diff --git a/lib/pytz/zoneinfo/Asia/Hong_Kong b/lib/pytz/zoneinfo/Asia/Hong_Kong
index f9f7b134..dc9058e4 100644
Binary files a/lib/pytz/zoneinfo/Asia/Hong_Kong and b/lib/pytz/zoneinfo/Asia/Hong_Kong differ
diff --git a/lib/pytz/zoneinfo/Asia/Hovd b/lib/pytz/zoneinfo/Asia/Hovd
index 8b9abca3..71c3cad4 100644
Binary files a/lib/pytz/zoneinfo/Asia/Hovd and b/lib/pytz/zoneinfo/Asia/Hovd differ
diff --git a/lib/pytz/zoneinfo/Asia/Irkutsk b/lib/pytz/zoneinfo/Asia/Irkutsk
index e74a4d3f..1e94a479 100644
Binary files a/lib/pytz/zoneinfo/Asia/Irkutsk and b/lib/pytz/zoneinfo/Asia/Irkutsk differ
diff --git a/lib/pytz/zoneinfo/Asia/Istanbul b/lib/pytz/zoneinfo/Asia/Istanbul
index 7c2336dd..d89aa3a8 100644
Binary files a/lib/pytz/zoneinfo/Asia/Istanbul and b/lib/pytz/zoneinfo/Asia/Istanbul differ
diff --git a/lib/pytz/zoneinfo/Asia/Jakarta b/lib/pytz/zoneinfo/Asia/Jakarta
index ec4bd574..3130bff5 100644
Binary files a/lib/pytz/zoneinfo/Asia/Jakarta and b/lib/pytz/zoneinfo/Asia/Jakarta differ
diff --git a/lib/pytz/zoneinfo/Asia/Jayapura b/lib/pytz/zoneinfo/Asia/Jayapura
index 3002c820..a9d12177 100644
Binary files a/lib/pytz/zoneinfo/Asia/Jayapura and b/lib/pytz/zoneinfo/Asia/Jayapura differ
diff --git a/lib/pytz/zoneinfo/Asia/Jerusalem b/lib/pytz/zoneinfo/Asia/Jerusalem
index 1ebd0664..df511993 100644
Binary files a/lib/pytz/zoneinfo/Asia/Jerusalem and b/lib/pytz/zoneinfo/Asia/Jerusalem differ
diff --git a/lib/pytz/zoneinfo/Asia/Kabul b/lib/pytz/zoneinfo/Asia/Kabul
index 661efc83..266cc7e9 100644
Binary files a/lib/pytz/zoneinfo/Asia/Kabul and b/lib/pytz/zoneinfo/Asia/Kabul differ
diff --git a/lib/pytz/zoneinfo/Asia/Kamchatka b/lib/pytz/zoneinfo/Asia/Kamchatka
index 99776f51..a0541cfa 100644
Binary files a/lib/pytz/zoneinfo/Asia/Kamchatka and b/lib/pytz/zoneinfo/Asia/Kamchatka differ
diff --git a/lib/pytz/zoneinfo/Asia/Karachi b/lib/pytz/zoneinfo/Asia/Karachi
index ba65c0e8..6a6de1b2 100644
Binary files a/lib/pytz/zoneinfo/Asia/Karachi and b/lib/pytz/zoneinfo/Asia/Karachi differ
diff --git a/lib/pytz/zoneinfo/Asia/Kashgar b/lib/pytz/zoneinfo/Asia/Kashgar
index 62bdcac1..964a5c24 100644
Binary files a/lib/pytz/zoneinfo/Asia/Kashgar and b/lib/pytz/zoneinfo/Asia/Kashgar differ
diff --git a/lib/pytz/zoneinfo/Asia/Kathmandu b/lib/pytz/zoneinfo/Asia/Kathmandu
index 751cf4a8..28247098 100644
Binary files a/lib/pytz/zoneinfo/Asia/Kathmandu and b/lib/pytz/zoneinfo/Asia/Kathmandu differ
diff --git a/lib/pytz/zoneinfo/Asia/Katmandu b/lib/pytz/zoneinfo/Asia/Katmandu
index 751cf4a8..28247098 100644
Binary files a/lib/pytz/zoneinfo/Asia/Katmandu and b/lib/pytz/zoneinfo/Asia/Katmandu differ
diff --git a/lib/pytz/zoneinfo/Asia/Khandyga b/lib/pytz/zoneinfo/Asia/Khandyga
index 7cdc99a9..26becb32 100644
Binary files a/lib/pytz/zoneinfo/Asia/Khandyga and b/lib/pytz/zoneinfo/Asia/Khandyga differ
diff --git a/lib/pytz/zoneinfo/Asia/Kolkata b/lib/pytz/zoneinfo/Asia/Kolkata
index 0014046d..3c0d5abc 100644
Binary files a/lib/pytz/zoneinfo/Asia/Kolkata and b/lib/pytz/zoneinfo/Asia/Kolkata differ
diff --git a/lib/pytz/zoneinfo/Asia/Krasnoyarsk b/lib/pytz/zoneinfo/Asia/Krasnoyarsk
index 4c27b2de..31078090 100644
Binary files a/lib/pytz/zoneinfo/Asia/Krasnoyarsk and b/lib/pytz/zoneinfo/Asia/Krasnoyarsk differ
diff --git a/lib/pytz/zoneinfo/Asia/Kuala_Lumpur b/lib/pytz/zoneinfo/Asia/Kuala_Lumpur
index 3d9f191e..35b987d2 100644
Binary files a/lib/pytz/zoneinfo/Asia/Kuala_Lumpur and b/lib/pytz/zoneinfo/Asia/Kuala_Lumpur differ
diff --git a/lib/pytz/zoneinfo/Asia/Kuching b/lib/pytz/zoneinfo/Asia/Kuching
index 098c6a0b..4f891db7 100644
Binary files a/lib/pytz/zoneinfo/Asia/Kuching and b/lib/pytz/zoneinfo/Asia/Kuching differ
diff --git a/lib/pytz/zoneinfo/Asia/Kuwait b/lib/pytz/zoneinfo/Asia/Kuwait
index 8c806247..5623811d 100644
Binary files a/lib/pytz/zoneinfo/Asia/Kuwait and b/lib/pytz/zoneinfo/Asia/Kuwait differ
diff --git a/lib/pytz/zoneinfo/Asia/Macao b/lib/pytz/zoneinfo/Asia/Macao
index cac65063..b8f9c369 100644
Binary files a/lib/pytz/zoneinfo/Asia/Macao and b/lib/pytz/zoneinfo/Asia/Macao differ
diff --git a/lib/pytz/zoneinfo/Asia/Macau b/lib/pytz/zoneinfo/Asia/Macau
index cac65063..b8f9c369 100644
Binary files a/lib/pytz/zoneinfo/Asia/Macau and b/lib/pytz/zoneinfo/Asia/Macau differ
diff --git a/lib/pytz/zoneinfo/Asia/Magadan b/lib/pytz/zoneinfo/Asia/Magadan
index 70c198ba..e09c4dc2 100644
Binary files a/lib/pytz/zoneinfo/Asia/Magadan and b/lib/pytz/zoneinfo/Asia/Magadan differ
diff --git a/lib/pytz/zoneinfo/Asia/Makassar b/lib/pytz/zoneinfo/Asia/Makassar
index 556ba866..0d689236 100644
Binary files a/lib/pytz/zoneinfo/Asia/Makassar and b/lib/pytz/zoneinfo/Asia/Makassar differ
diff --git a/lib/pytz/zoneinfo/Asia/Manila b/lib/pytz/zoneinfo/Asia/Manila
index f4f4b04e..ac0f3a63 100644
Binary files a/lib/pytz/zoneinfo/Asia/Manila and b/lib/pytz/zoneinfo/Asia/Manila differ
diff --git a/lib/pytz/zoneinfo/Asia/Muscat b/lib/pytz/zoneinfo/Asia/Muscat
index b3ac791a..53a22190 100644
Binary files a/lib/pytz/zoneinfo/Asia/Muscat and b/lib/pytz/zoneinfo/Asia/Muscat differ
diff --git a/lib/pytz/zoneinfo/Asia/Nicosia b/lib/pytz/zoneinfo/Asia/Nicosia
index f7f10ab7..3e663b21 100644
Binary files a/lib/pytz/zoneinfo/Asia/Nicosia and b/lib/pytz/zoneinfo/Asia/Nicosia differ
diff --git a/lib/pytz/zoneinfo/Asia/Novokuznetsk b/lib/pytz/zoneinfo/Asia/Novokuznetsk
index a5e1b796..11768662 100644
Binary files a/lib/pytz/zoneinfo/Asia/Novokuznetsk and b/lib/pytz/zoneinfo/Asia/Novokuznetsk differ
diff --git a/lib/pytz/zoneinfo/Asia/Novosibirsk b/lib/pytz/zoneinfo/Asia/Novosibirsk
index 4ac7582a..ed6d7dc5 100644
Binary files a/lib/pytz/zoneinfo/Asia/Novosibirsk and b/lib/pytz/zoneinfo/Asia/Novosibirsk differ
diff --git a/lib/pytz/zoneinfo/Asia/Omsk b/lib/pytz/zoneinfo/Asia/Omsk
index 16c5f3cf..760c3910 100644
Binary files a/lib/pytz/zoneinfo/Asia/Omsk and b/lib/pytz/zoneinfo/Asia/Omsk differ
diff --git a/lib/pytz/zoneinfo/Asia/Oral b/lib/pytz/zoneinfo/Asia/Oral
index 3b9ecacf..1467cafc 100644
Binary files a/lib/pytz/zoneinfo/Asia/Oral and b/lib/pytz/zoneinfo/Asia/Oral differ
diff --git a/lib/pytz/zoneinfo/Asia/Phnom_Penh b/lib/pytz/zoneinfo/Asia/Phnom_Penh
index fa799db3..e8e76276 100644
Binary files a/lib/pytz/zoneinfo/Asia/Phnom_Penh and b/lib/pytz/zoneinfo/Asia/Phnom_Penh differ
diff --git a/lib/pytz/zoneinfo/Asia/Pontianak b/lib/pytz/zoneinfo/Asia/Pontianak
index 12ce24cb..dcd70140 100644
Binary files a/lib/pytz/zoneinfo/Asia/Pontianak and b/lib/pytz/zoneinfo/Asia/Pontianak differ
diff --git a/lib/pytz/zoneinfo/Asia/Pyongyang b/lib/pytz/zoneinfo/Asia/Pyongyang
index 7ad7e0b2..b04bf74e 100644
Binary files a/lib/pytz/zoneinfo/Asia/Pyongyang and b/lib/pytz/zoneinfo/Asia/Pyongyang differ
diff --git a/lib/pytz/zoneinfo/Asia/Qatar b/lib/pytz/zoneinfo/Asia/Qatar
index 098997e7..3e203739 100644
Binary files a/lib/pytz/zoneinfo/Asia/Qatar and b/lib/pytz/zoneinfo/Asia/Qatar differ
diff --git a/lib/pytz/zoneinfo/Asia/Qostanay b/lib/pytz/zoneinfo/Asia/Qostanay
deleted file mode 100644
index 2ee9ef7e..00000000
Binary files a/lib/pytz/zoneinfo/Asia/Qostanay and /dev/null differ
diff --git a/lib/pytz/zoneinfo/Asia/Qyzylorda b/lib/pytz/zoneinfo/Asia/Qyzylorda
index 27b522a7..ce535161 100644
Binary files a/lib/pytz/zoneinfo/Asia/Qyzylorda and b/lib/pytz/zoneinfo/Asia/Qyzylorda differ
diff --git a/lib/pytz/zoneinfo/Asia/Rangoon b/lib/pytz/zoneinfo/Asia/Rangoon
index eef37b42..934ca7ef 100644
Binary files a/lib/pytz/zoneinfo/Asia/Rangoon and b/lib/pytz/zoneinfo/Asia/Rangoon differ
diff --git a/lib/pytz/zoneinfo/Asia/Riyadh b/lib/pytz/zoneinfo/Asia/Riyadh
index 8c806247..c35e42a1 100644
Binary files a/lib/pytz/zoneinfo/Asia/Riyadh and b/lib/pytz/zoneinfo/Asia/Riyadh differ
diff --git a/lib/pytz/zoneinfo/Asia/Saigon b/lib/pytz/zoneinfo/Asia/Saigon
index 9c45ed99..c1422657 100644
Binary files a/lib/pytz/zoneinfo/Asia/Saigon and b/lib/pytz/zoneinfo/Asia/Saigon differ
diff --git a/lib/pytz/zoneinfo/Asia/Sakhalin b/lib/pytz/zoneinfo/Asia/Sakhalin
index beb77b44..ec62afc5 100644
Binary files a/lib/pytz/zoneinfo/Asia/Sakhalin and b/lib/pytz/zoneinfo/Asia/Sakhalin differ
diff --git a/lib/pytz/zoneinfo/Asia/Samarkand b/lib/pytz/zoneinfo/Asia/Samarkand
index 8a93767b..65fb5b03 100644
Binary files a/lib/pytz/zoneinfo/Asia/Samarkand and b/lib/pytz/zoneinfo/Asia/Samarkand differ
diff --git a/lib/pytz/zoneinfo/Asia/Seoul b/lib/pytz/zoneinfo/Asia/Seoul
index 96199e73..fd91d5b7 100644
Binary files a/lib/pytz/zoneinfo/Asia/Seoul and b/lib/pytz/zoneinfo/Asia/Seoul differ
diff --git a/lib/pytz/zoneinfo/Asia/Shanghai b/lib/pytz/zoneinfo/Asia/Shanghai
index 91f6f8bc..dbd132f2 100644
Binary files a/lib/pytz/zoneinfo/Asia/Shanghai and b/lib/pytz/zoneinfo/Asia/Shanghai differ
diff --git a/lib/pytz/zoneinfo/Asia/Singapore b/lib/pytz/zoneinfo/Asia/Singapore
index 3d9f191e..9dd49cb7 100644
Binary files a/lib/pytz/zoneinfo/Asia/Singapore and b/lib/pytz/zoneinfo/Asia/Singapore differ
diff --git a/lib/pytz/zoneinfo/Asia/Srednekolymsk b/lib/pytz/zoneinfo/Asia/Srednekolymsk
index d21e7eee..0929f66d 100644
Binary files a/lib/pytz/zoneinfo/Asia/Srednekolymsk and b/lib/pytz/zoneinfo/Asia/Srednekolymsk differ
diff --git a/lib/pytz/zoneinfo/Asia/Taipei b/lib/pytz/zoneinfo/Asia/Taipei
index 24c43444..4810a0b6 100644
Binary files a/lib/pytz/zoneinfo/Asia/Taipei and b/lib/pytz/zoneinfo/Asia/Taipei differ
diff --git a/lib/pytz/zoneinfo/Asia/Tashkent b/lib/pytz/zoneinfo/Asia/Tashkent
index a9f6cd93..1f59faa5 100644
Binary files a/lib/pytz/zoneinfo/Asia/Tashkent and b/lib/pytz/zoneinfo/Asia/Tashkent differ
diff --git a/lib/pytz/zoneinfo/Asia/Tbilisi b/lib/pytz/zoneinfo/Asia/Tbilisi
index 3b131bb1..0d7081e9 100644
Binary files a/lib/pytz/zoneinfo/Asia/Tbilisi and b/lib/pytz/zoneinfo/Asia/Tbilisi differ
diff --git a/lib/pytz/zoneinfo/Asia/Tehran b/lib/pytz/zoneinfo/Asia/Tehran
index cc2a2c21..87107811 100644
Binary files a/lib/pytz/zoneinfo/Asia/Tehran and b/lib/pytz/zoneinfo/Asia/Tehran differ
diff --git a/lib/pytz/zoneinfo/Asia/Tel_Aviv b/lib/pytz/zoneinfo/Asia/Tel_Aviv
index 1ebd0664..df511993 100644
Binary files a/lib/pytz/zoneinfo/Asia/Tel_Aviv and b/lib/pytz/zoneinfo/Asia/Tel_Aviv differ
diff --git a/lib/pytz/zoneinfo/Asia/Thimbu b/lib/pytz/zoneinfo/Asia/Thimbu
index 95a9de96..0bd94cb4 100644
Binary files a/lib/pytz/zoneinfo/Asia/Thimbu and b/lib/pytz/zoneinfo/Asia/Thimbu differ
diff --git a/lib/pytz/zoneinfo/Asia/Thimphu b/lib/pytz/zoneinfo/Asia/Thimphu
index 95a9de96..0bd94cb4 100644
Binary files a/lib/pytz/zoneinfo/Asia/Thimphu and b/lib/pytz/zoneinfo/Asia/Thimphu differ
diff --git a/lib/pytz/zoneinfo/Asia/Tokyo b/lib/pytz/zoneinfo/Asia/Tokyo
index 26f4d34d..02441403 100644
Binary files a/lib/pytz/zoneinfo/Asia/Tokyo and b/lib/pytz/zoneinfo/Asia/Tokyo differ
diff --git a/lib/pytz/zoneinfo/Asia/Tomsk b/lib/pytz/zoneinfo/Asia/Tomsk
deleted file mode 100644
index a6e494a7..00000000
Binary files a/lib/pytz/zoneinfo/Asia/Tomsk and /dev/null differ
diff --git a/lib/pytz/zoneinfo/Asia/Ujung_Pandang b/lib/pytz/zoneinfo/Asia/Ujung_Pandang
index 556ba866..0d689236 100644
Binary files a/lib/pytz/zoneinfo/Asia/Ujung_Pandang and b/lib/pytz/zoneinfo/Asia/Ujung_Pandang differ
diff --git a/lib/pytz/zoneinfo/Asia/Ulaanbaatar b/lib/pytz/zoneinfo/Asia/Ulaanbaatar
index 2aa5cc4b..61505e95 100644
Binary files a/lib/pytz/zoneinfo/Asia/Ulaanbaatar and b/lib/pytz/zoneinfo/Asia/Ulaanbaatar differ
diff --git a/lib/pytz/zoneinfo/Asia/Ulan_Bator b/lib/pytz/zoneinfo/Asia/Ulan_Bator
index 2aa5cc4b..61505e95 100644
Binary files a/lib/pytz/zoneinfo/Asia/Ulan_Bator and b/lib/pytz/zoneinfo/Asia/Ulan_Bator differ
diff --git a/lib/pytz/zoneinfo/Asia/Urumqi b/lib/pytz/zoneinfo/Asia/Urumqi
index 62bdcac1..964a5c24 100644
Binary files a/lib/pytz/zoneinfo/Asia/Urumqi and b/lib/pytz/zoneinfo/Asia/Urumqi differ
diff --git a/lib/pytz/zoneinfo/Asia/Ust-Nera b/lib/pytz/zoneinfo/Asia/Ust-Nera
index d05726ab..0efacd6b 100644
Binary files a/lib/pytz/zoneinfo/Asia/Ust-Nera and b/lib/pytz/zoneinfo/Asia/Ust-Nera differ
diff --git a/lib/pytz/zoneinfo/Asia/Vientiane b/lib/pytz/zoneinfo/Asia/Vientiane
index fa799db3..e8e76276 100644
Binary files a/lib/pytz/zoneinfo/Asia/Vientiane and b/lib/pytz/zoneinfo/Asia/Vientiane differ
diff --git a/lib/pytz/zoneinfo/Asia/Vladivostok b/lib/pytz/zoneinfo/Asia/Vladivostok
index 274a10b4..156c8e6f 100644
Binary files a/lib/pytz/zoneinfo/Asia/Vladivostok and b/lib/pytz/zoneinfo/Asia/Vladivostok differ
diff --git a/lib/pytz/zoneinfo/Asia/Yakutsk b/lib/pytz/zoneinfo/Asia/Yakutsk
index ae65a5f9..58ff25ea 100644
Binary files a/lib/pytz/zoneinfo/Asia/Yakutsk and b/lib/pytz/zoneinfo/Asia/Yakutsk differ
diff --git a/lib/pytz/zoneinfo/Asia/Yangon b/lib/pytz/zoneinfo/Asia/Yangon
deleted file mode 100644
index eef37b42..00000000
Binary files a/lib/pytz/zoneinfo/Asia/Yangon and /dev/null differ
diff --git a/lib/pytz/zoneinfo/Asia/Yekaterinburg b/lib/pytz/zoneinfo/Asia/Yekaterinburg
index d4d19ccf..a1baafae 100644
Binary files a/lib/pytz/zoneinfo/Asia/Yekaterinburg and b/lib/pytz/zoneinfo/Asia/Yekaterinburg differ
diff --git a/lib/pytz/zoneinfo/Asia/Yerevan b/lib/pytz/zoneinfo/Asia/Yerevan
index 0d5f6853..fa62c249 100644
Binary files a/lib/pytz/zoneinfo/Asia/Yerevan and b/lib/pytz/zoneinfo/Asia/Yerevan differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Azores b/lib/pytz/zoneinfo/Atlantic/Azores
index dd2c235b..1f532532 100644
Binary files a/lib/pytz/zoneinfo/Atlantic/Azores and b/lib/pytz/zoneinfo/Atlantic/Azores differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Bermuda b/lib/pytz/zoneinfo/Atlantic/Bermuda
index 527524ed..548d979b 100644
Binary files a/lib/pytz/zoneinfo/Atlantic/Bermuda and b/lib/pytz/zoneinfo/Atlantic/Bermuda differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Canary b/lib/pytz/zoneinfo/Atlantic/Canary
index f3192156..007dcf49 100644
Binary files a/lib/pytz/zoneinfo/Atlantic/Canary and b/lib/pytz/zoneinfo/Atlantic/Canary differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Cape_Verde b/lib/pytz/zoneinfo/Atlantic/Cape_Verde
index 0d0d31a2..18b676ce 100644
Binary files a/lib/pytz/zoneinfo/Atlantic/Cape_Verde and b/lib/pytz/zoneinfo/Atlantic/Cape_Verde differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Faeroe b/lib/pytz/zoneinfo/Atlantic/Faeroe
index 4dab7ef0..c4865186 100644
Binary files a/lib/pytz/zoneinfo/Atlantic/Faeroe and b/lib/pytz/zoneinfo/Atlantic/Faeroe differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Faroe b/lib/pytz/zoneinfo/Atlantic/Faroe
index 4dab7ef0..c4865186 100644
Binary files a/lib/pytz/zoneinfo/Atlantic/Faroe and b/lib/pytz/zoneinfo/Atlantic/Faroe differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Jan_Mayen b/lib/pytz/zoneinfo/Atlantic/Jan_Mayen
index 7f6d958f..239c0174 100644
Binary files a/lib/pytz/zoneinfo/Atlantic/Jan_Mayen and b/lib/pytz/zoneinfo/Atlantic/Jan_Mayen differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Madeira b/lib/pytz/zoneinfo/Atlantic/Madeira
index 6725a0ff..3687fd66 100644
Binary files a/lib/pytz/zoneinfo/Atlantic/Madeira and b/lib/pytz/zoneinfo/Atlantic/Madeira differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Reykjavik b/lib/pytz/zoneinfo/Atlantic/Reykjavik
index 28b32ab2..35ba7a15 100644
Binary files a/lib/pytz/zoneinfo/Atlantic/Reykjavik and b/lib/pytz/zoneinfo/Atlantic/Reykjavik differ
diff --git a/lib/pytz/zoneinfo/Atlantic/South_Georgia b/lib/pytz/zoneinfo/Atlantic/South_Georgia
index a2b59a9d..b1191c9f 100644
Binary files a/lib/pytz/zoneinfo/Atlantic/South_Georgia and b/lib/pytz/zoneinfo/Atlantic/South_Georgia differ
diff --git a/lib/pytz/zoneinfo/Atlantic/St_Helena b/lib/pytz/zoneinfo/Atlantic/St_Helena
index 28b32ab2..6fd1af32 100644
Binary files a/lib/pytz/zoneinfo/Atlantic/St_Helena and b/lib/pytz/zoneinfo/Atlantic/St_Helena differ
diff --git a/lib/pytz/zoneinfo/Atlantic/Stanley b/lib/pytz/zoneinfo/Atlantic/Stanley
index 1527d0e1..aec7a5d3 100644
Binary files a/lib/pytz/zoneinfo/Atlantic/Stanley and b/lib/pytz/zoneinfo/Atlantic/Stanley differ
diff --git a/lib/pytz/zoneinfo/Australia/ACT b/lib/pytz/zoneinfo/Australia/ACT
index 0aea4c3d..aaed12ca 100644
Binary files a/lib/pytz/zoneinfo/Australia/ACT and b/lib/pytz/zoneinfo/Australia/ACT differ
diff --git a/lib/pytz/zoneinfo/Australia/Adelaide b/lib/pytz/zoneinfo/Australia/Adelaide
index f5dedca5..4f331a87 100644
Binary files a/lib/pytz/zoneinfo/Australia/Adelaide and b/lib/pytz/zoneinfo/Australia/Adelaide differ
diff --git a/lib/pytz/zoneinfo/Australia/Brisbane b/lib/pytz/zoneinfo/Australia/Brisbane
index 7ff9949f..a327d83b 100644
Binary files a/lib/pytz/zoneinfo/Australia/Brisbane and b/lib/pytz/zoneinfo/Australia/Brisbane differ
diff --git a/lib/pytz/zoneinfo/Australia/Broken_Hill b/lib/pytz/zoneinfo/Australia/Broken_Hill
index 698c76e3..768b1678 100644
Binary files a/lib/pytz/zoneinfo/Australia/Broken_Hill and b/lib/pytz/zoneinfo/Australia/Broken_Hill differ
diff --git a/lib/pytz/zoneinfo/Australia/Canberra b/lib/pytz/zoneinfo/Australia/Canberra
index 0aea4c3d..aaed12ca 100644
Binary files a/lib/pytz/zoneinfo/Australia/Canberra and b/lib/pytz/zoneinfo/Australia/Canberra differ
diff --git a/lib/pytz/zoneinfo/Australia/Currie b/lib/pytz/zoneinfo/Australia/Currie
index 3adb8e1b..a3f6f29a 100644
Binary files a/lib/pytz/zoneinfo/Australia/Currie and b/lib/pytz/zoneinfo/Australia/Currie differ
diff --git a/lib/pytz/zoneinfo/Australia/Darwin b/lib/pytz/zoneinfo/Australia/Darwin
index 74a30879..c6ae9a7b 100644
Binary files a/lib/pytz/zoneinfo/Australia/Darwin and b/lib/pytz/zoneinfo/Australia/Darwin differ
diff --git a/lib/pytz/zoneinfo/Australia/Eucla b/lib/pytz/zoneinfo/Australia/Eucla
index 1551e96c..baba07a3 100644
Binary files a/lib/pytz/zoneinfo/Australia/Eucla and b/lib/pytz/zoneinfo/Australia/Eucla differ
diff --git a/lib/pytz/zoneinfo/Australia/Hobart b/lib/pytz/zoneinfo/Australia/Hobart
index 3adb8e1b..07784ce5 100644
Binary files a/lib/pytz/zoneinfo/Australia/Hobart and b/lib/pytz/zoneinfo/Australia/Hobart differ
diff --git a/lib/pytz/zoneinfo/Australia/LHI b/lib/pytz/zoneinfo/Australia/LHI
index 069a95ad..a653e516 100644
Binary files a/lib/pytz/zoneinfo/Australia/LHI and b/lib/pytz/zoneinfo/Australia/LHI differ
diff --git a/lib/pytz/zoneinfo/Australia/Lindeman b/lib/pytz/zoneinfo/Australia/Lindeman
index 4ee1825a..71ca143f 100644
Binary files a/lib/pytz/zoneinfo/Australia/Lindeman and b/lib/pytz/zoneinfo/Australia/Lindeman differ
diff --git a/lib/pytz/zoneinfo/Australia/Lord_Howe b/lib/pytz/zoneinfo/Australia/Lord_Howe
index 069a95ad..a653e516 100644
Binary files a/lib/pytz/zoneinfo/Australia/Lord_Howe and b/lib/pytz/zoneinfo/Australia/Lord_Howe differ
diff --git a/lib/pytz/zoneinfo/Australia/Melbourne b/lib/pytz/zoneinfo/Australia/Melbourne
index ee903f4b..ec8dfe03 100644
Binary files a/lib/pytz/zoneinfo/Australia/Melbourne and b/lib/pytz/zoneinfo/Australia/Melbourne differ
diff --git a/lib/pytz/zoneinfo/Australia/NSW b/lib/pytz/zoneinfo/Australia/NSW
index 0aea4c3d..aaed12ca 100644
Binary files a/lib/pytz/zoneinfo/Australia/NSW and b/lib/pytz/zoneinfo/Australia/NSW differ
diff --git a/lib/pytz/zoneinfo/Australia/North b/lib/pytz/zoneinfo/Australia/North
index 74a30879..c6ae9a7b 100644
Binary files a/lib/pytz/zoneinfo/Australia/North and b/lib/pytz/zoneinfo/Australia/North differ
diff --git a/lib/pytz/zoneinfo/Australia/Perth b/lib/pytz/zoneinfo/Australia/Perth
index f8ddbdf2..85c26d50 100644
Binary files a/lib/pytz/zoneinfo/Australia/Perth and b/lib/pytz/zoneinfo/Australia/Perth differ
diff --git a/lib/pytz/zoneinfo/Australia/Queensland b/lib/pytz/zoneinfo/Australia/Queensland
index 7ff9949f..a327d83b 100644
Binary files a/lib/pytz/zoneinfo/Australia/Queensland and b/lib/pytz/zoneinfo/Australia/Queensland differ
diff --git a/lib/pytz/zoneinfo/Australia/South b/lib/pytz/zoneinfo/Australia/South
index f5dedca5..4f331a87 100644
Binary files a/lib/pytz/zoneinfo/Australia/South and b/lib/pytz/zoneinfo/Australia/South differ
diff --git a/lib/pytz/zoneinfo/Australia/Sydney b/lib/pytz/zoneinfo/Australia/Sydney
index 0aea4c3d..aaed12ca 100644
Binary files a/lib/pytz/zoneinfo/Australia/Sydney and b/lib/pytz/zoneinfo/Australia/Sydney differ
diff --git a/lib/pytz/zoneinfo/Australia/Tasmania b/lib/pytz/zoneinfo/Australia/Tasmania
index 3adb8e1b..07784ce5 100644
Binary files a/lib/pytz/zoneinfo/Australia/Tasmania and b/lib/pytz/zoneinfo/Australia/Tasmania differ
diff --git a/lib/pytz/zoneinfo/Australia/Victoria b/lib/pytz/zoneinfo/Australia/Victoria
index ee903f4b..ec8dfe03 100644
Binary files a/lib/pytz/zoneinfo/Australia/Victoria and b/lib/pytz/zoneinfo/Australia/Victoria differ
diff --git a/lib/pytz/zoneinfo/Australia/West b/lib/pytz/zoneinfo/Australia/West
index f8ddbdf2..85c26d50 100644
Binary files a/lib/pytz/zoneinfo/Australia/West and b/lib/pytz/zoneinfo/Australia/West differ
diff --git a/lib/pytz/zoneinfo/Australia/Yancowinna b/lib/pytz/zoneinfo/Australia/Yancowinna
index 698c76e3..768b1678 100644
Binary files a/lib/pytz/zoneinfo/Australia/Yancowinna and b/lib/pytz/zoneinfo/Australia/Yancowinna differ
diff --git a/lib/pytz/zoneinfo/Brazil/Acre b/lib/pytz/zoneinfo/Brazil/Acre
index cdda168c..788d0e9c 100644
Binary files a/lib/pytz/zoneinfo/Brazil/Acre and b/lib/pytz/zoneinfo/Brazil/Acre differ
diff --git a/lib/pytz/zoneinfo/Brazil/DeNoronha b/lib/pytz/zoneinfo/Brazil/DeNoronha
index 73b4b336..774b14e6 100644
Binary files a/lib/pytz/zoneinfo/Brazil/DeNoronha and b/lib/pytz/zoneinfo/Brazil/DeNoronha differ
diff --git a/lib/pytz/zoneinfo/Brazil/East b/lib/pytz/zoneinfo/Brazil/East
index 67935ff4..552ce7c2 100644
Binary files a/lib/pytz/zoneinfo/Brazil/East and b/lib/pytz/zoneinfo/Brazil/East differ
diff --git a/lib/pytz/zoneinfo/Brazil/West b/lib/pytz/zoneinfo/Brazil/West
index 2708baea..e0222f18 100644
Binary files a/lib/pytz/zoneinfo/Brazil/West and b/lib/pytz/zoneinfo/Brazil/West differ
diff --git a/lib/pytz/zoneinfo/CET b/lib/pytz/zoneinfo/CET
index 40d7124e..4c4f8ef9 100644
Binary files a/lib/pytz/zoneinfo/CET and b/lib/pytz/zoneinfo/CET differ
diff --git a/lib/pytz/zoneinfo/CST6CDT b/lib/pytz/zoneinfo/CST6CDT
index c6981a06..5c8a1d9a 100644
Binary files a/lib/pytz/zoneinfo/CST6CDT and b/lib/pytz/zoneinfo/CST6CDT differ
diff --git a/lib/pytz/zoneinfo/Canada/Atlantic b/lib/pytz/zoneinfo/Canada/Atlantic
index 756099ab..f86ece4c 100644
Binary files a/lib/pytz/zoneinfo/Canada/Atlantic and b/lib/pytz/zoneinfo/Canada/Atlantic differ
diff --git a/lib/pytz/zoneinfo/Canada/Central b/lib/pytz/zoneinfo/Canada/Central
index ac40299f..2ffe3d8d 100644
Binary files a/lib/pytz/zoneinfo/Canada/Central and b/lib/pytz/zoneinfo/Canada/Central differ
diff --git a/lib/pytz/zoneinfo/Canada/East-Saskatchewan b/lib/pytz/zoneinfo/Canada/East-Saskatchewan
new file mode 100644
index 00000000..5fe8d6b6
Binary files /dev/null and b/lib/pytz/zoneinfo/Canada/East-Saskatchewan differ
diff --git a/lib/pytz/zoneinfo/Canada/Eastern b/lib/pytz/zoneinfo/Canada/Eastern
index 17013733..7b4682a3 100644
Binary files a/lib/pytz/zoneinfo/Canada/Eastern and b/lib/pytz/zoneinfo/Canada/Eastern differ
diff --git a/lib/pytz/zoneinfo/Canada/Mountain b/lib/pytz/zoneinfo/Canada/Mountain
index cd78a6f8..d02fbcd4 100644
Binary files a/lib/pytz/zoneinfo/Canada/Mountain and b/lib/pytz/zoneinfo/Canada/Mountain differ
diff --git a/lib/pytz/zoneinfo/Canada/Newfoundland b/lib/pytz/zoneinfo/Canada/Newfoundland
index 65a5b0c7..a1d14854 100644
Binary files a/lib/pytz/zoneinfo/Canada/Newfoundland and b/lib/pytz/zoneinfo/Canada/Newfoundland differ
diff --git a/lib/pytz/zoneinfo/Canada/Pacific b/lib/pytz/zoneinfo/Canada/Pacific
index bb60cbce..9b5d9241 100644
Binary files a/lib/pytz/zoneinfo/Canada/Pacific and b/lib/pytz/zoneinfo/Canada/Pacific differ
diff --git a/lib/pytz/zoneinfo/Canada/Saskatchewan b/lib/pytz/zoneinfo/Canada/Saskatchewan
index 20c9c84d..5fe8d6b6 100644
Binary files a/lib/pytz/zoneinfo/Canada/Saskatchewan and b/lib/pytz/zoneinfo/Canada/Saskatchewan differ
diff --git a/lib/pytz/zoneinfo/Canada/Yukon b/lib/pytz/zoneinfo/Canada/Yukon
index 318c4a8e..8604c5c5 100644
Binary files a/lib/pytz/zoneinfo/Canada/Yukon and b/lib/pytz/zoneinfo/Canada/Yukon differ
diff --git a/lib/pytz/zoneinfo/Chile/Continental b/lib/pytz/zoneinfo/Chile/Continental
index 010c6bd0..92cf5597 100644
Binary files a/lib/pytz/zoneinfo/Chile/Continental and b/lib/pytz/zoneinfo/Chile/Continental differ
diff --git a/lib/pytz/zoneinfo/Chile/EasterIsland b/lib/pytz/zoneinfo/Chile/EasterIsland
index 184cb6a8..8c8a6c7d 100644
Binary files a/lib/pytz/zoneinfo/Chile/EasterIsland and b/lib/pytz/zoneinfo/Chile/EasterIsland differ
diff --git a/lib/pytz/zoneinfo/Cuba b/lib/pytz/zoneinfo/Cuba
index b69ac451..1a58fcdc 100644
Binary files a/lib/pytz/zoneinfo/Cuba and b/lib/pytz/zoneinfo/Cuba differ
diff --git a/lib/pytz/zoneinfo/EET b/lib/pytz/zoneinfo/EET
index 9f3a0678..beb273a2 100644
Binary files a/lib/pytz/zoneinfo/EET and b/lib/pytz/zoneinfo/EET differ
diff --git a/lib/pytz/zoneinfo/EST b/lib/pytz/zoneinfo/EST
index 9964b9a3..ae346633 100644
Binary files a/lib/pytz/zoneinfo/EST and b/lib/pytz/zoneinfo/EST differ
diff --git a/lib/pytz/zoneinfo/EST5EDT b/lib/pytz/zoneinfo/EST5EDT
index a8b9ab19..54541fc2 100644
Binary files a/lib/pytz/zoneinfo/EST5EDT and b/lib/pytz/zoneinfo/EST5EDT differ
diff --git a/lib/pytz/zoneinfo/Egypt b/lib/pytz/zoneinfo/Egypt
index dd538c65..0eeed113 100644
Binary files a/lib/pytz/zoneinfo/Egypt and b/lib/pytz/zoneinfo/Egypt differ
diff --git a/lib/pytz/zoneinfo/Eire b/lib/pytz/zoneinfo/Eire
index c729def4..a7cffbbb 100644
Binary files a/lib/pytz/zoneinfo/Eire and b/lib/pytz/zoneinfo/Eire differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT b/lib/pytz/zoneinfo/Etc/GMT
index c6347466..c05e45fd 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT and b/lib/pytz/zoneinfo/Etc/GMT differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+0 b/lib/pytz/zoneinfo/Etc/GMT+0
index c6347466..c05e45fd 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT+0 and b/lib/pytz/zoneinfo/Etc/GMT+0 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+1 b/lib/pytz/zoneinfo/Etc/GMT+1
index 4dab6f90..2f40cc76 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT+1 and b/lib/pytz/zoneinfo/Etc/GMT+1 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+10 b/lib/pytz/zoneinfo/Etc/GMT+10
index c749290a..2087965e 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT+10 and b/lib/pytz/zoneinfo/Etc/GMT+10 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+11 b/lib/pytz/zoneinfo/Etc/GMT+11
index d9699823..af4a6b34 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT+11 and b/lib/pytz/zoneinfo/Etc/GMT+11 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+12 b/lib/pytz/zoneinfo/Etc/GMT+12
index cdeec909..f0955345 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT+12 and b/lib/pytz/zoneinfo/Etc/GMT+12 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+2 b/lib/pytz/zoneinfo/Etc/GMT+2
index fbd2a941..85a1fc1d 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT+2 and b/lib/pytz/zoneinfo/Etc/GMT+2 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+3 b/lib/pytz/zoneinfo/Etc/GMT+3
index ee246ef5..a24f5870 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT+3 and b/lib/pytz/zoneinfo/Etc/GMT+3 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+4 b/lib/pytz/zoneinfo/Etc/GMT+4
index 5a25ff2a..ab745174 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT+4 and b/lib/pytz/zoneinfo/Etc/GMT+4 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+5 b/lib/pytz/zoneinfo/Etc/GMT+5
index c0b745f1..01f1d775 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT+5 and b/lib/pytz/zoneinfo/Etc/GMT+5 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+6 b/lib/pytz/zoneinfo/Etc/GMT+6
index 06e777d5..3ced48bb 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT+6 and b/lib/pytz/zoneinfo/Etc/GMT+6 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+7 b/lib/pytz/zoneinfo/Etc/GMT+7
index 4e0b53a0..5f58127e 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT+7 and b/lib/pytz/zoneinfo/Etc/GMT+7 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+8 b/lib/pytz/zoneinfo/Etc/GMT+8
index 714b0c56..be23d966 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT+8 and b/lib/pytz/zoneinfo/Etc/GMT+8 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT+9 b/lib/pytz/zoneinfo/Etc/GMT+9
index 78b9daa3..d00c50c5 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT+9 and b/lib/pytz/zoneinfo/Etc/GMT+9 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-0 b/lib/pytz/zoneinfo/Etc/GMT-0
index c6347466..c05e45fd 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT-0 and b/lib/pytz/zoneinfo/Etc/GMT-0 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-1 b/lib/pytz/zoneinfo/Etc/GMT-1
index a838bebf..088a76ed 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT-1 and b/lib/pytz/zoneinfo/Etc/GMT-1 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-10 b/lib/pytz/zoneinfo/Etc/GMT-10
index 68ff77db..a4da44f5 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT-10 and b/lib/pytz/zoneinfo/Etc/GMT-10 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-11 b/lib/pytz/zoneinfo/Etc/GMT-11
index 66af5a42..e0112a9c 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT-11 and b/lib/pytz/zoneinfo/Etc/GMT-11 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-12 b/lib/pytz/zoneinfo/Etc/GMT-12
index 17ba5057..c1e08b77 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT-12 and b/lib/pytz/zoneinfo/Etc/GMT-12 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-13 b/lib/pytz/zoneinfo/Etc/GMT-13
index 5f3706ce..1ab05199 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT-13 and b/lib/pytz/zoneinfo/Etc/GMT-13 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-14 b/lib/pytz/zoneinfo/Etc/GMT-14
index 7e9f9c46..afaf3fa9 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT-14 and b/lib/pytz/zoneinfo/Etc/GMT-14 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-2 b/lib/pytz/zoneinfo/Etc/GMT-2
index fcef6d9a..6289cad8 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT-2 and b/lib/pytz/zoneinfo/Etc/GMT-2 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-3 b/lib/pytz/zoneinfo/Etc/GMT-3
index 27973bc8..27434cdb 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT-3 and b/lib/pytz/zoneinfo/Etc/GMT-3 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-4 b/lib/pytz/zoneinfo/Etc/GMT-4
index 1efd8412..2fc69663 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT-4 and b/lib/pytz/zoneinfo/Etc/GMT-4 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-5 b/lib/pytz/zoneinfo/Etc/GMT-5
index 1f761844..8508e723 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT-5 and b/lib/pytz/zoneinfo/Etc/GMT-5 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-6 b/lib/pytz/zoneinfo/Etc/GMT-6
index 952681ed..5b9678ea 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT-6 and b/lib/pytz/zoneinfo/Etc/GMT-6 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-7 b/lib/pytz/zoneinfo/Etc/GMT-7
index cefc9126..ccf4c394 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT-7 and b/lib/pytz/zoneinfo/Etc/GMT-7 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-8 b/lib/pytz/zoneinfo/Etc/GMT-8
index afb093da..db4cfa6a 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT-8 and b/lib/pytz/zoneinfo/Etc/GMT-8 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT-9 b/lib/pytz/zoneinfo/Etc/GMT-9
index 9265fb7c..56ea1174 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT-9 and b/lib/pytz/zoneinfo/Etc/GMT-9 differ
diff --git a/lib/pytz/zoneinfo/Etc/GMT0 b/lib/pytz/zoneinfo/Etc/GMT0
index c6347466..c05e45fd 100644
Binary files a/lib/pytz/zoneinfo/Etc/GMT0 and b/lib/pytz/zoneinfo/Etc/GMT0 differ
diff --git a/lib/pytz/zoneinfo/Etc/Greenwich b/lib/pytz/zoneinfo/Etc/Greenwich
index c6347466..c05e45fd 100644
Binary files a/lib/pytz/zoneinfo/Etc/Greenwich and b/lib/pytz/zoneinfo/Etc/Greenwich differ
diff --git a/lib/pytz/zoneinfo/Etc/UCT b/lib/pytz/zoneinfo/Etc/UCT
index 91558be0..40147b9e 100644
Binary files a/lib/pytz/zoneinfo/Etc/UCT and b/lib/pytz/zoneinfo/Etc/UCT differ
diff --git a/lib/pytz/zoneinfo/Etc/UTC b/lib/pytz/zoneinfo/Etc/UTC
index 91558be0..c3b97f1a 100644
Binary files a/lib/pytz/zoneinfo/Etc/UTC and b/lib/pytz/zoneinfo/Etc/UTC differ
diff --git a/lib/pytz/zoneinfo/Etc/Universal b/lib/pytz/zoneinfo/Etc/Universal
index 91558be0..c3b97f1a 100644
Binary files a/lib/pytz/zoneinfo/Etc/Universal and b/lib/pytz/zoneinfo/Etc/Universal differ
diff --git a/lib/pytz/zoneinfo/Etc/Zulu b/lib/pytz/zoneinfo/Etc/Zulu
index 91558be0..c3b97f1a 100644
Binary files a/lib/pytz/zoneinfo/Etc/Zulu and b/lib/pytz/zoneinfo/Etc/Zulu differ
diff --git a/lib/pytz/zoneinfo/Europe/Amsterdam b/lib/pytz/zoneinfo/Europe/Amsterdam
index 40d7124e..f74769d4 100644
Binary files a/lib/pytz/zoneinfo/Europe/Amsterdam and b/lib/pytz/zoneinfo/Europe/Amsterdam differ
diff --git a/lib/pytz/zoneinfo/Europe/Andorra b/lib/pytz/zoneinfo/Europe/Andorra
index 59625503..b06de7a5 100644
Binary files a/lib/pytz/zoneinfo/Europe/Andorra and b/lib/pytz/zoneinfo/Europe/Andorra differ
diff --git a/lib/pytz/zoneinfo/Europe/Astrakhan b/lib/pytz/zoneinfo/Europe/Astrakhan
deleted file mode 100644
index a41624f5..00000000
Binary files a/lib/pytz/zoneinfo/Europe/Astrakhan and /dev/null differ
diff --git a/lib/pytz/zoneinfo/Europe/Athens b/lib/pytz/zoneinfo/Europe/Athens
index 9f3a0678..0001602f 100644
Binary files a/lib/pytz/zoneinfo/Europe/Athens and b/lib/pytz/zoneinfo/Europe/Athens differ
diff --git a/lib/pytz/zoneinfo/Europe/Belfast b/lib/pytz/zoneinfo/Europe/Belfast
index 5ad74220..4527515c 100644
Binary files a/lib/pytz/zoneinfo/Europe/Belfast and b/lib/pytz/zoneinfo/Europe/Belfast differ
diff --git a/lib/pytz/zoneinfo/Europe/Belgrade b/lib/pytz/zoneinfo/Europe/Belgrade
index 27de456f..79c25d70 100644
Binary files a/lib/pytz/zoneinfo/Europe/Belgrade and b/lib/pytz/zoneinfo/Europe/Belgrade differ
diff --git a/lib/pytz/zoneinfo/Europe/Berlin b/lib/pytz/zoneinfo/Europe/Berlin
index 7f6d958f..b4f2a2af 100644
Binary files a/lib/pytz/zoneinfo/Europe/Berlin and b/lib/pytz/zoneinfo/Europe/Berlin differ
diff --git a/lib/pytz/zoneinfo/Europe/Bratislava b/lib/pytz/zoneinfo/Europe/Bratislava
index ce8f433e..4eabe5c8 100644
Binary files a/lib/pytz/zoneinfo/Europe/Bratislava and b/lib/pytz/zoneinfo/Europe/Bratislava differ
diff --git a/lib/pytz/zoneinfo/Europe/Brussels b/lib/pytz/zoneinfo/Europe/Brussels
index 40d7124e..d8f19a63 100644
Binary files a/lib/pytz/zoneinfo/Europe/Brussels and b/lib/pytz/zoneinfo/Europe/Brussels differ
diff --git a/lib/pytz/zoneinfo/Europe/Bucharest b/lib/pytz/zoneinfo/Europe/Bucharest
index 4303b903..e0eac4ce 100644
Binary files a/lib/pytz/zoneinfo/Europe/Bucharest and b/lib/pytz/zoneinfo/Europe/Bucharest differ
diff --git a/lib/pytz/zoneinfo/Europe/Budapest b/lib/pytz/zoneinfo/Europe/Budapest
index b76c873d..3ddf6a52 100644
Binary files a/lib/pytz/zoneinfo/Europe/Budapest and b/lib/pytz/zoneinfo/Europe/Budapest differ
diff --git a/lib/pytz/zoneinfo/Europe/Busingen b/lib/pytz/zoneinfo/Europe/Busingen
index ad6cf592..9c2b600b 100644
Binary files a/lib/pytz/zoneinfo/Europe/Busingen and b/lib/pytz/zoneinfo/Europe/Busingen differ
diff --git a/lib/pytz/zoneinfo/Europe/Chisinau b/lib/pytz/zoneinfo/Europe/Chisinau
index 5ee23fe0..7998b2d8 100644
Binary files a/lib/pytz/zoneinfo/Europe/Chisinau and b/lib/pytz/zoneinfo/Europe/Chisinau differ
diff --git a/lib/pytz/zoneinfo/Europe/Copenhagen b/lib/pytz/zoneinfo/Europe/Copenhagen
index 7f6d958f..be87cf16 100644
Binary files a/lib/pytz/zoneinfo/Europe/Copenhagen and b/lib/pytz/zoneinfo/Europe/Copenhagen differ
diff --git a/lib/pytz/zoneinfo/Europe/Dublin b/lib/pytz/zoneinfo/Europe/Dublin
index c729def4..a7cffbbb 100644
Binary files a/lib/pytz/zoneinfo/Europe/Dublin and b/lib/pytz/zoneinfo/Europe/Dublin differ
diff --git a/lib/pytz/zoneinfo/Europe/Gibraltar b/lib/pytz/zoneinfo/Europe/Gibraltar
index a38f11ff..a7105faa 100644
Binary files a/lib/pytz/zoneinfo/Europe/Gibraltar and b/lib/pytz/zoneinfo/Europe/Gibraltar differ
diff --git a/lib/pytz/zoneinfo/Europe/Guernsey b/lib/pytz/zoneinfo/Europe/Guernsey
index 5ad74220..4527515c 100644
Binary files a/lib/pytz/zoneinfo/Europe/Guernsey and b/lib/pytz/zoneinfo/Europe/Guernsey differ
diff --git a/lib/pytz/zoneinfo/Europe/Helsinki b/lib/pytz/zoneinfo/Europe/Helsinki
index b4f8f9cb..29b3c817 100644
Binary files a/lib/pytz/zoneinfo/Europe/Helsinki and b/lib/pytz/zoneinfo/Europe/Helsinki differ
diff --git a/lib/pytz/zoneinfo/Europe/Isle_of_Man b/lib/pytz/zoneinfo/Europe/Isle_of_Man
index 5ad74220..4527515c 100644
Binary files a/lib/pytz/zoneinfo/Europe/Isle_of_Man and b/lib/pytz/zoneinfo/Europe/Isle_of_Man differ
diff --git a/lib/pytz/zoneinfo/Europe/Istanbul b/lib/pytz/zoneinfo/Europe/Istanbul
index 7c2336dd..d89aa3a8 100644
Binary files a/lib/pytz/zoneinfo/Europe/Istanbul and b/lib/pytz/zoneinfo/Europe/Istanbul differ
diff --git a/lib/pytz/zoneinfo/Europe/Jersey b/lib/pytz/zoneinfo/Europe/Jersey
index 5ad74220..4527515c 100644
Binary files a/lib/pytz/zoneinfo/Europe/Jersey and b/lib/pytz/zoneinfo/Europe/Jersey differ
diff --git a/lib/pytz/zoneinfo/Europe/Kaliningrad b/lib/pytz/zoneinfo/Europe/Kaliningrad
index cc99beab..4805fe42 100644
Binary files a/lib/pytz/zoneinfo/Europe/Kaliningrad and b/lib/pytz/zoneinfo/Europe/Kaliningrad differ
diff --git a/lib/pytz/zoneinfo/Europe/Kiev b/lib/pytz/zoneinfo/Europe/Kiev
index 52efea88..b3e20a7e 100644
Binary files a/lib/pytz/zoneinfo/Europe/Kiev and b/lib/pytz/zoneinfo/Europe/Kiev differ
diff --git a/lib/pytz/zoneinfo/Europe/Kirov b/lib/pytz/zoneinfo/Europe/Kirov
deleted file mode 100644
index 0cfb956b..00000000
Binary files a/lib/pytz/zoneinfo/Europe/Kirov and /dev/null differ
diff --git a/lib/pytz/zoneinfo/Europe/Kyiv b/lib/pytz/zoneinfo/Europe/Kyiv
deleted file mode 100644
index 52efea88..00000000
Binary files a/lib/pytz/zoneinfo/Europe/Kyiv and /dev/null differ
diff --git a/lib/pytz/zoneinfo/Europe/Lisbon b/lib/pytz/zoneinfo/Europe/Lisbon
index 616de167..b9aff3a5 100644
Binary files a/lib/pytz/zoneinfo/Europe/Lisbon and b/lib/pytz/zoneinfo/Europe/Lisbon differ
diff --git a/lib/pytz/zoneinfo/Europe/Ljubljana b/lib/pytz/zoneinfo/Europe/Ljubljana
index 27de456f..79c25d70 100644
Binary files a/lib/pytz/zoneinfo/Europe/Ljubljana and b/lib/pytz/zoneinfo/Europe/Ljubljana differ
diff --git a/lib/pytz/zoneinfo/Europe/London b/lib/pytz/zoneinfo/Europe/London
index 5ad74220..4527515c 100644
Binary files a/lib/pytz/zoneinfo/Europe/London and b/lib/pytz/zoneinfo/Europe/London differ
diff --git a/lib/pytz/zoneinfo/Europe/Luxembourg b/lib/pytz/zoneinfo/Europe/Luxembourg
index 40d7124e..6fae86c5 100644
Binary files a/lib/pytz/zoneinfo/Europe/Luxembourg and b/lib/pytz/zoneinfo/Europe/Luxembourg differ
diff --git a/lib/pytz/zoneinfo/Europe/Madrid b/lib/pytz/zoneinfo/Europe/Madrid
index 53f4cd10..af474328 100644
Binary files a/lib/pytz/zoneinfo/Europe/Madrid and b/lib/pytz/zoneinfo/Europe/Madrid differ
diff --git a/lib/pytz/zoneinfo/Europe/Malta b/lib/pytz/zoneinfo/Europe/Malta
index 1d1a7bcf..d2519389 100644
Binary files a/lib/pytz/zoneinfo/Europe/Malta and b/lib/pytz/zoneinfo/Europe/Malta differ
diff --git a/lib/pytz/zoneinfo/Europe/Mariehamn b/lib/pytz/zoneinfo/Europe/Mariehamn
index b4f8f9cb..29b3c817 100644
Binary files a/lib/pytz/zoneinfo/Europe/Mariehamn and b/lib/pytz/zoneinfo/Europe/Mariehamn differ
diff --git a/lib/pytz/zoneinfo/Europe/Minsk b/lib/pytz/zoneinfo/Europe/Minsk
index 3731e40d..28ef30a3 100644
Binary files a/lib/pytz/zoneinfo/Europe/Minsk and b/lib/pytz/zoneinfo/Europe/Minsk differ
diff --git a/lib/pytz/zoneinfo/Europe/Monaco b/lib/pytz/zoneinfo/Europe/Monaco
index 7d366c60..0b40f1ec 100644
Binary files a/lib/pytz/zoneinfo/Europe/Monaco and b/lib/pytz/zoneinfo/Europe/Monaco differ
diff --git a/lib/pytz/zoneinfo/Europe/Moscow b/lib/pytz/zoneinfo/Europe/Moscow
index ddb3f4e9..bdbbaebe 100644
Binary files a/lib/pytz/zoneinfo/Europe/Moscow and b/lib/pytz/zoneinfo/Europe/Moscow differ
diff --git a/lib/pytz/zoneinfo/Europe/Nicosia b/lib/pytz/zoneinfo/Europe/Nicosia
index f7f10ab7..3e663b21 100644
Binary files a/lib/pytz/zoneinfo/Europe/Nicosia and b/lib/pytz/zoneinfo/Europe/Nicosia differ
diff --git a/lib/pytz/zoneinfo/Europe/Oslo b/lib/pytz/zoneinfo/Europe/Oslo
index 7f6d958f..239c0174 100644
Binary files a/lib/pytz/zoneinfo/Europe/Oslo and b/lib/pytz/zoneinfo/Europe/Oslo differ
diff --git a/lib/pytz/zoneinfo/Europe/Paris b/lib/pytz/zoneinfo/Europe/Paris
index 7d366c60..cf6e2e2e 100644
Binary files a/lib/pytz/zoneinfo/Europe/Paris and b/lib/pytz/zoneinfo/Europe/Paris differ
diff --git a/lib/pytz/zoneinfo/Europe/Podgorica b/lib/pytz/zoneinfo/Europe/Podgorica
index 27de456f..79c25d70 100644
Binary files a/lib/pytz/zoneinfo/Europe/Podgorica and b/lib/pytz/zoneinfo/Europe/Podgorica differ
diff --git a/lib/pytz/zoneinfo/Europe/Prague b/lib/pytz/zoneinfo/Europe/Prague
index ce8f433e..4eabe5c8 100644
Binary files a/lib/pytz/zoneinfo/Europe/Prague and b/lib/pytz/zoneinfo/Europe/Prague differ
diff --git a/lib/pytz/zoneinfo/Europe/Riga b/lib/pytz/zoneinfo/Europe/Riga
index 8db477d0..b729ee8c 100644
Binary files a/lib/pytz/zoneinfo/Europe/Riga and b/lib/pytz/zoneinfo/Europe/Riga differ
diff --git a/lib/pytz/zoneinfo/Europe/Rome b/lib/pytz/zoneinfo/Europe/Rome
index 32b2899a..5cc30403 100644
Binary files a/lib/pytz/zoneinfo/Europe/Rome and b/lib/pytz/zoneinfo/Europe/Rome differ
diff --git a/lib/pytz/zoneinfo/Europe/Samara b/lib/pytz/zoneinfo/Europe/Samara
index d0ea2f25..79759f53 100644
Binary files a/lib/pytz/zoneinfo/Europe/Samara and b/lib/pytz/zoneinfo/Europe/Samara differ
diff --git a/lib/pytz/zoneinfo/Europe/San_Marino b/lib/pytz/zoneinfo/Europe/San_Marino
index 32b2899a..5cc30403 100644
Binary files a/lib/pytz/zoneinfo/Europe/San_Marino and b/lib/pytz/zoneinfo/Europe/San_Marino differ
diff --git a/lib/pytz/zoneinfo/Europe/Sarajevo b/lib/pytz/zoneinfo/Europe/Sarajevo
index 27de456f..79c25d70 100644
Binary files a/lib/pytz/zoneinfo/Europe/Sarajevo and b/lib/pytz/zoneinfo/Europe/Sarajevo differ
diff --git a/lib/pytz/zoneinfo/Europe/Saratov b/lib/pytz/zoneinfo/Europe/Saratov
deleted file mode 100644
index a8639133..00000000
Binary files a/lib/pytz/zoneinfo/Europe/Saratov and /dev/null differ
diff --git a/lib/pytz/zoneinfo/Europe/Simferopol b/lib/pytz/zoneinfo/Europe/Simferopol
index 4bf24de1..ebe9017d 100644
Binary files a/lib/pytz/zoneinfo/Europe/Simferopol and b/lib/pytz/zoneinfo/Europe/Simferopol differ
diff --git a/lib/pytz/zoneinfo/Europe/Skopje b/lib/pytz/zoneinfo/Europe/Skopje
index 27de456f..79c25d70 100644
Binary files a/lib/pytz/zoneinfo/Europe/Skopje and b/lib/pytz/zoneinfo/Europe/Skopje differ
diff --git a/lib/pytz/zoneinfo/Europe/Sofia b/lib/pytz/zoneinfo/Europe/Sofia
index 0e4d8793..763e0747 100644
Binary files a/lib/pytz/zoneinfo/Europe/Sofia and b/lib/pytz/zoneinfo/Europe/Sofia differ
diff --git a/lib/pytz/zoneinfo/Europe/Stockholm b/lib/pytz/zoneinfo/Europe/Stockholm
index 7f6d958f..43c7f2e2 100644
Binary files a/lib/pytz/zoneinfo/Europe/Stockholm and b/lib/pytz/zoneinfo/Europe/Stockholm differ
diff --git a/lib/pytz/zoneinfo/Europe/Tallinn b/lib/pytz/zoneinfo/Europe/Tallinn
index b5acca3c..8a4f1240 100644
Binary files a/lib/pytz/zoneinfo/Europe/Tallinn and b/lib/pytz/zoneinfo/Europe/Tallinn differ
diff --git a/lib/pytz/zoneinfo/Europe/Tirane b/lib/pytz/zoneinfo/Europe/Tirane
index 0b86017d..52c16a42 100644
Binary files a/lib/pytz/zoneinfo/Europe/Tirane and b/lib/pytz/zoneinfo/Europe/Tirane differ
diff --git a/lib/pytz/zoneinfo/Europe/Tiraspol b/lib/pytz/zoneinfo/Europe/Tiraspol
index 5ee23fe0..7998b2d8 100644
Binary files a/lib/pytz/zoneinfo/Europe/Tiraspol and b/lib/pytz/zoneinfo/Europe/Tiraspol differ
diff --git a/lib/pytz/zoneinfo/Europe/Ulyanovsk b/lib/pytz/zoneinfo/Europe/Ulyanovsk
deleted file mode 100644
index d668233b..00000000
Binary files a/lib/pytz/zoneinfo/Europe/Ulyanovsk and /dev/null differ
diff --git a/lib/pytz/zoneinfo/Europe/Uzhgorod b/lib/pytz/zoneinfo/Europe/Uzhgorod
index 52efea88..8ddba909 100644
Binary files a/lib/pytz/zoneinfo/Europe/Uzhgorod and b/lib/pytz/zoneinfo/Europe/Uzhgorod differ
diff --git a/lib/pytz/zoneinfo/Europe/Vaduz b/lib/pytz/zoneinfo/Europe/Vaduz
index ad6cf592..9c2b600b 100644
Binary files a/lib/pytz/zoneinfo/Europe/Vaduz and b/lib/pytz/zoneinfo/Europe/Vaduz differ
diff --git a/lib/pytz/zoneinfo/Europe/Vatican b/lib/pytz/zoneinfo/Europe/Vatican
index 32b2899a..5cc30403 100644
Binary files a/lib/pytz/zoneinfo/Europe/Vatican and b/lib/pytz/zoneinfo/Europe/Vatican differ
diff --git a/lib/pytz/zoneinfo/Europe/Vienna b/lib/pytz/zoneinfo/Europe/Vienna
index 3582bb15..9c0fac53 100644
Binary files a/lib/pytz/zoneinfo/Europe/Vienna and b/lib/pytz/zoneinfo/Europe/Vienna differ
diff --git a/lib/pytz/zoneinfo/Europe/Vilnius b/lib/pytz/zoneinfo/Europe/Vilnius
index 7abd63fa..3b11880d 100644
Binary files a/lib/pytz/zoneinfo/Europe/Vilnius and b/lib/pytz/zoneinfo/Europe/Vilnius differ
diff --git a/lib/pytz/zoneinfo/Europe/Volgograd b/lib/pytz/zoneinfo/Europe/Volgograd
index 9d51a38c..c62c32a6 100644
Binary files a/lib/pytz/zoneinfo/Europe/Volgograd and b/lib/pytz/zoneinfo/Europe/Volgograd differ
diff --git a/lib/pytz/zoneinfo/Europe/Warsaw b/lib/pytz/zoneinfo/Europe/Warsaw
index e33cf671..5cbba412 100644
Binary files a/lib/pytz/zoneinfo/Europe/Warsaw and b/lib/pytz/zoneinfo/Europe/Warsaw differ
diff --git a/lib/pytz/zoneinfo/Europe/Zagreb b/lib/pytz/zoneinfo/Europe/Zagreb
index 27de456f..79c25d70 100644
Binary files a/lib/pytz/zoneinfo/Europe/Zagreb and b/lib/pytz/zoneinfo/Europe/Zagreb differ
diff --git a/lib/pytz/zoneinfo/Europe/Zaporozhye b/lib/pytz/zoneinfo/Europe/Zaporozhye
index 52efea88..49b568e7 100644
Binary files a/lib/pytz/zoneinfo/Europe/Zaporozhye and b/lib/pytz/zoneinfo/Europe/Zaporozhye differ
diff --git a/lib/pytz/zoneinfo/Europe/Zurich b/lib/pytz/zoneinfo/Europe/Zurich
index ad6cf592..9c2b600b 100644
Binary files a/lib/pytz/zoneinfo/Europe/Zurich and b/lib/pytz/zoneinfo/Europe/Zurich differ
diff --git a/lib/pytz/zoneinfo/Factory b/lib/pytz/zoneinfo/Factory
index 60aa2a0d..6e6c452e 100644
Binary files a/lib/pytz/zoneinfo/Factory and b/lib/pytz/zoneinfo/Factory differ
diff --git a/lib/pytz/zoneinfo/GB b/lib/pytz/zoneinfo/GB
index 5ad74220..4527515c 100644
Binary files a/lib/pytz/zoneinfo/GB and b/lib/pytz/zoneinfo/GB differ
diff --git a/lib/pytz/zoneinfo/GB-Eire b/lib/pytz/zoneinfo/GB-Eire
index 5ad74220..4527515c 100644
Binary files a/lib/pytz/zoneinfo/GB-Eire and b/lib/pytz/zoneinfo/GB-Eire differ
diff --git a/lib/pytz/zoneinfo/GMT b/lib/pytz/zoneinfo/GMT
index c6347466..c05e45fd 100644
Binary files a/lib/pytz/zoneinfo/GMT and b/lib/pytz/zoneinfo/GMT differ
diff --git a/lib/pytz/zoneinfo/GMT+0 b/lib/pytz/zoneinfo/GMT+0
index c6347466..c05e45fd 100644
Binary files a/lib/pytz/zoneinfo/GMT+0 and b/lib/pytz/zoneinfo/GMT+0 differ
diff --git a/lib/pytz/zoneinfo/GMT-0 b/lib/pytz/zoneinfo/GMT-0
index c6347466..c05e45fd 100644
Binary files a/lib/pytz/zoneinfo/GMT-0 and b/lib/pytz/zoneinfo/GMT-0 differ
diff --git a/lib/pytz/zoneinfo/GMT0 b/lib/pytz/zoneinfo/GMT0
index c6347466..c05e45fd 100644
Binary files a/lib/pytz/zoneinfo/GMT0 and b/lib/pytz/zoneinfo/GMT0 differ
diff --git a/lib/pytz/zoneinfo/Greenwich b/lib/pytz/zoneinfo/Greenwich
index c6347466..c05e45fd 100644
Binary files a/lib/pytz/zoneinfo/Greenwich and b/lib/pytz/zoneinfo/Greenwich differ
diff --git a/lib/pytz/zoneinfo/HST b/lib/pytz/zoneinfo/HST
index c7cd0601..03e4db07 100644
Binary files a/lib/pytz/zoneinfo/HST and b/lib/pytz/zoneinfo/HST differ
diff --git a/lib/pytz/zoneinfo/Hongkong b/lib/pytz/zoneinfo/Hongkong
index f9f7b134..dc9058e4 100644
Binary files a/lib/pytz/zoneinfo/Hongkong and b/lib/pytz/zoneinfo/Hongkong differ
diff --git a/lib/pytz/zoneinfo/Iceland b/lib/pytz/zoneinfo/Iceland
index 28b32ab2..35ba7a15 100644
Binary files a/lib/pytz/zoneinfo/Iceland and b/lib/pytz/zoneinfo/Iceland differ
diff --git a/lib/pytz/zoneinfo/Indian/Antananarivo b/lib/pytz/zoneinfo/Indian/Antananarivo
index 9dcfc19c..750d3dc1 100644
Binary files a/lib/pytz/zoneinfo/Indian/Antananarivo and b/lib/pytz/zoneinfo/Indian/Antananarivo differ
diff --git a/lib/pytz/zoneinfo/Indian/Chagos b/lib/pytz/zoneinfo/Indian/Chagos
index a5554816..a616bdfb 100644
Binary files a/lib/pytz/zoneinfo/Indian/Chagos and b/lib/pytz/zoneinfo/Indian/Chagos differ
diff --git a/lib/pytz/zoneinfo/Indian/Christmas b/lib/pytz/zoneinfo/Indian/Christmas
index fa799db3..ebcd2624 100644
Binary files a/lib/pytz/zoneinfo/Indian/Christmas and b/lib/pytz/zoneinfo/Indian/Christmas differ
diff --git a/lib/pytz/zoneinfo/Indian/Cocos b/lib/pytz/zoneinfo/Indian/Cocos
index eef37b42..cd603f24 100644
Binary files a/lib/pytz/zoneinfo/Indian/Cocos and b/lib/pytz/zoneinfo/Indian/Cocos differ
diff --git a/lib/pytz/zoneinfo/Indian/Comoro b/lib/pytz/zoneinfo/Indian/Comoro
index 9dcfc19c..750d3dc1 100644
Binary files a/lib/pytz/zoneinfo/Indian/Comoro and b/lib/pytz/zoneinfo/Indian/Comoro differ
diff --git a/lib/pytz/zoneinfo/Indian/Kerguelen b/lib/pytz/zoneinfo/Indian/Kerguelen
index 555728b1..462851eb 100644
Binary files a/lib/pytz/zoneinfo/Indian/Kerguelen and b/lib/pytz/zoneinfo/Indian/Kerguelen differ
diff --git a/lib/pytz/zoneinfo/Indian/Mahe b/lib/pytz/zoneinfo/Indian/Mahe
index b3ac791a..5f42819b 100644
Binary files a/lib/pytz/zoneinfo/Indian/Mahe and b/lib/pytz/zoneinfo/Indian/Mahe differ
diff --git a/lib/pytz/zoneinfo/Indian/Maldives b/lib/pytz/zoneinfo/Indian/Maldives
index 555728b1..cec224ff 100644
Binary files a/lib/pytz/zoneinfo/Indian/Maldives and b/lib/pytz/zoneinfo/Indian/Maldives differ
diff --git a/lib/pytz/zoneinfo/Indian/Mauritius b/lib/pytz/zoneinfo/Indian/Mauritius
index 212d4b2e..66ecc8f5 100644
Binary files a/lib/pytz/zoneinfo/Indian/Mauritius and b/lib/pytz/zoneinfo/Indian/Mauritius differ
diff --git a/lib/pytz/zoneinfo/Indian/Mayotte b/lib/pytz/zoneinfo/Indian/Mayotte
index 9dcfc19c..750d3dc1 100644
Binary files a/lib/pytz/zoneinfo/Indian/Mayotte and b/lib/pytz/zoneinfo/Indian/Mayotte differ
diff --git a/lib/pytz/zoneinfo/Indian/Reunion b/lib/pytz/zoneinfo/Indian/Reunion
index b3ac791a..c4d0da90 100644
Binary files a/lib/pytz/zoneinfo/Indian/Reunion and b/lib/pytz/zoneinfo/Indian/Reunion differ
diff --git a/lib/pytz/zoneinfo/Iran b/lib/pytz/zoneinfo/Iran
index cc2a2c21..87107811 100644
Binary files a/lib/pytz/zoneinfo/Iran and b/lib/pytz/zoneinfo/Iran differ
diff --git a/lib/pytz/zoneinfo/Israel b/lib/pytz/zoneinfo/Israel
index 1ebd0664..df511993 100644
Binary files a/lib/pytz/zoneinfo/Israel and b/lib/pytz/zoneinfo/Israel differ
diff --git a/lib/pytz/zoneinfo/Jamaica b/lib/pytz/zoneinfo/Jamaica
index 2a9b7fd5..006689bc 100644
Binary files a/lib/pytz/zoneinfo/Jamaica and b/lib/pytz/zoneinfo/Jamaica differ
diff --git a/lib/pytz/zoneinfo/Japan b/lib/pytz/zoneinfo/Japan
index 26f4d34d..02441403 100644
Binary files a/lib/pytz/zoneinfo/Japan and b/lib/pytz/zoneinfo/Japan differ
diff --git a/lib/pytz/zoneinfo/Kwajalein b/lib/pytz/zoneinfo/Kwajalein
index 1887a607..094c3cfd 100644
Binary files a/lib/pytz/zoneinfo/Kwajalein and b/lib/pytz/zoneinfo/Kwajalein differ
diff --git a/lib/pytz/zoneinfo/Libya b/lib/pytz/zoneinfo/Libya
index 07b393bb..b32e2202 100644
Binary files a/lib/pytz/zoneinfo/Libya and b/lib/pytz/zoneinfo/Libya differ
diff --git a/lib/pytz/zoneinfo/MET b/lib/pytz/zoneinfo/MET
index 40d7124e..71963d53 100644
Binary files a/lib/pytz/zoneinfo/MET and b/lib/pytz/zoneinfo/MET differ
diff --git a/lib/pytz/zoneinfo/MST b/lib/pytz/zoneinfo/MST
index ab37e845..a1bee7c6 100644
Binary files a/lib/pytz/zoneinfo/MST and b/lib/pytz/zoneinfo/MST differ
diff --git a/lib/pytz/zoneinfo/MST7MDT b/lib/pytz/zoneinfo/MST7MDT
index abb2b974..726a7e57 100644
Binary files a/lib/pytz/zoneinfo/MST7MDT and b/lib/pytz/zoneinfo/MST7MDT differ
diff --git a/lib/pytz/zoneinfo/Mexico/BajaNorte b/lib/pytz/zoneinfo/Mexico/BajaNorte
index 0fe73912..13874753 100644
Binary files a/lib/pytz/zoneinfo/Mexico/BajaNorte and b/lib/pytz/zoneinfo/Mexico/BajaNorte differ
diff --git a/lib/pytz/zoneinfo/Mexico/BajaSur b/lib/pytz/zoneinfo/Mexico/BajaSur
index 386616a5..afa94c2a 100644
Binary files a/lib/pytz/zoneinfo/Mexico/BajaSur and b/lib/pytz/zoneinfo/Mexico/BajaSur differ
diff --git a/lib/pytz/zoneinfo/Mexico/General b/lib/pytz/zoneinfo/Mexico/General
index ad70cf3e..f11e3d2d 100644
Binary files a/lib/pytz/zoneinfo/Mexico/General and b/lib/pytz/zoneinfo/Mexico/General differ
diff --git a/lib/pytz/zoneinfo/NZ b/lib/pytz/zoneinfo/NZ
index 6575fdce..a5f5b6d5 100644
Binary files a/lib/pytz/zoneinfo/NZ and b/lib/pytz/zoneinfo/NZ differ
diff --git a/lib/pytz/zoneinfo/NZ-CHAT b/lib/pytz/zoneinfo/NZ-CHAT
index bde46cf7..59bc4ede 100644
Binary files a/lib/pytz/zoneinfo/NZ-CHAT and b/lib/pytz/zoneinfo/NZ-CHAT differ
diff --git a/lib/pytz/zoneinfo/Navajo b/lib/pytz/zoneinfo/Navajo
index abb2b974..7fc66917 100644
Binary files a/lib/pytz/zoneinfo/Navajo and b/lib/pytz/zoneinfo/Navajo differ
diff --git a/lib/pytz/zoneinfo/PRC b/lib/pytz/zoneinfo/PRC
index 91f6f8bc..dbd132f2 100644
Binary files a/lib/pytz/zoneinfo/PRC and b/lib/pytz/zoneinfo/PRC differ
diff --git a/lib/pytz/zoneinfo/PST8PDT b/lib/pytz/zoneinfo/PST8PDT
index 610e7af5..6242ac04 100644
Binary files a/lib/pytz/zoneinfo/PST8PDT and b/lib/pytz/zoneinfo/PST8PDT differ
diff --git a/lib/pytz/zoneinfo/Pacific/Apia b/lib/pytz/zoneinfo/Pacific/Apia
index e592a68e..cc5d2cd2 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Apia and b/lib/pytz/zoneinfo/Pacific/Apia differ
diff --git a/lib/pytz/zoneinfo/Pacific/Auckland b/lib/pytz/zoneinfo/Pacific/Auckland
index 6575fdce..a5f5b6d5 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Auckland and b/lib/pytz/zoneinfo/Pacific/Auckland differ
diff --git a/lib/pytz/zoneinfo/Pacific/Bougainville b/lib/pytz/zoneinfo/Pacific/Bougainville
index c535acda..219c78cd 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Bougainville and b/lib/pytz/zoneinfo/Pacific/Bougainville differ
diff --git a/lib/pytz/zoneinfo/Pacific/Chatham b/lib/pytz/zoneinfo/Pacific/Chatham
index bde46cf7..59bc4ede 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Chatham and b/lib/pytz/zoneinfo/Pacific/Chatham differ
diff --git a/lib/pytz/zoneinfo/Pacific/Chuuk b/lib/pytz/zoneinfo/Pacific/Chuuk
index 7be2474d..28356bbf 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Chuuk and b/lib/pytz/zoneinfo/Pacific/Chuuk differ
diff --git a/lib/pytz/zoneinfo/Pacific/Easter b/lib/pytz/zoneinfo/Pacific/Easter
index 184cb6a8..8c8a6c7d 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Easter and b/lib/pytz/zoneinfo/Pacific/Easter differ
diff --git a/lib/pytz/zoneinfo/Pacific/Efate b/lib/pytz/zoneinfo/Pacific/Efate
index 777325fc..1d99519b 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Efate and b/lib/pytz/zoneinfo/Pacific/Efate differ
diff --git a/lib/pytz/zoneinfo/Pacific/Enderbury b/lib/pytz/zoneinfo/Pacific/Enderbury
index b1c4b073..48610523 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Enderbury and b/lib/pytz/zoneinfo/Pacific/Enderbury differ
diff --git a/lib/pytz/zoneinfo/Pacific/Fakaofo b/lib/pytz/zoneinfo/Pacific/Fakaofo
index 4905ea72..e02e18e2 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Fakaofo and b/lib/pytz/zoneinfo/Pacific/Fakaofo differ
diff --git a/lib/pytz/zoneinfo/Pacific/Fiji b/lib/pytz/zoneinfo/Pacific/Fiji
index acf8091a..b75f194e 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Fiji and b/lib/pytz/zoneinfo/Pacific/Fiji differ
diff --git a/lib/pytz/zoneinfo/Pacific/Funafuti b/lib/pytz/zoneinfo/Pacific/Funafuti
index 47661d40..576dea30 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Funafuti and b/lib/pytz/zoneinfo/Pacific/Funafuti differ
diff --git a/lib/pytz/zoneinfo/Pacific/Galapagos b/lib/pytz/zoneinfo/Pacific/Galapagos
index 40051ddf..c9a7371d 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Galapagos and b/lib/pytz/zoneinfo/Pacific/Galapagos differ
diff --git a/lib/pytz/zoneinfo/Pacific/Gambier b/lib/pytz/zoneinfo/Pacific/Gambier
index 84acaf41..4ab6c206 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Gambier and b/lib/pytz/zoneinfo/Pacific/Gambier differ
diff --git a/lib/pytz/zoneinfo/Pacific/Guadalcanal b/lib/pytz/zoneinfo/Pacific/Guadalcanal
index 1ab83534..b183d1ea 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Guadalcanal and b/lib/pytz/zoneinfo/Pacific/Guadalcanal differ
diff --git a/lib/pytz/zoneinfo/Pacific/Guam b/lib/pytz/zoneinfo/Pacific/Guam
index 66490d25..4286e6ba 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Guam and b/lib/pytz/zoneinfo/Pacific/Guam differ
diff --git a/lib/pytz/zoneinfo/Pacific/Honolulu b/lib/pytz/zoneinfo/Pacific/Honolulu
index c7cd0601..bd855772 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Honolulu and b/lib/pytz/zoneinfo/Pacific/Honolulu differ
diff --git a/lib/pytz/zoneinfo/Pacific/Johnston b/lib/pytz/zoneinfo/Pacific/Johnston
index c7cd0601..bd855772 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Johnston and b/lib/pytz/zoneinfo/Pacific/Johnston differ
diff --git a/lib/pytz/zoneinfo/Pacific/Kanton b/lib/pytz/zoneinfo/Pacific/Kanton
deleted file mode 100644
index b1c4b073..00000000
Binary files a/lib/pytz/zoneinfo/Pacific/Kanton and /dev/null differ
diff --git a/lib/pytz/zoneinfo/Pacific/Kiritimati b/lib/pytz/zoneinfo/Pacific/Kiritimati
index b4c6037a..c2eafbc7 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Kiritimati and b/lib/pytz/zoneinfo/Pacific/Kiritimati differ
diff --git a/lib/pytz/zoneinfo/Pacific/Kosrae b/lib/pytz/zoneinfo/Pacific/Kosrae
index 0666fb0d..66c4d658 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Kosrae and b/lib/pytz/zoneinfo/Pacific/Kosrae differ
diff --git a/lib/pytz/zoneinfo/Pacific/Kwajalein b/lib/pytz/zoneinfo/Pacific/Kwajalein
index 1887a607..094c3cfd 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Kwajalein and b/lib/pytz/zoneinfo/Pacific/Kwajalein differ
diff --git a/lib/pytz/zoneinfo/Pacific/Majuro b/lib/pytz/zoneinfo/Pacific/Majuro
index 47661d40..d53b7c2d 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Majuro and b/lib/pytz/zoneinfo/Pacific/Majuro differ
diff --git a/lib/pytz/zoneinfo/Pacific/Marquesas b/lib/pytz/zoneinfo/Pacific/Marquesas
index f546c03f..c717c122 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Marquesas and b/lib/pytz/zoneinfo/Pacific/Marquesas differ
diff --git a/lib/pytz/zoneinfo/Pacific/Midway b/lib/pytz/zoneinfo/Pacific/Midway
index cb56709a..f2a2f63c 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Midway and b/lib/pytz/zoneinfo/Pacific/Midway differ
diff --git a/lib/pytz/zoneinfo/Pacific/Nauru b/lib/pytz/zoneinfo/Pacific/Nauru
index 3339b6cf..896ffeee 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Nauru and b/lib/pytz/zoneinfo/Pacific/Nauru differ
diff --git a/lib/pytz/zoneinfo/Pacific/Niue b/lib/pytz/zoneinfo/Pacific/Niue
index f76972f8..d772edf5 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Niue and b/lib/pytz/zoneinfo/Pacific/Niue differ
diff --git a/lib/pytz/zoneinfo/Pacific/Norfolk b/lib/pytz/zoneinfo/Pacific/Norfolk
index 3b4186d6..3a286be3 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Norfolk and b/lib/pytz/zoneinfo/Pacific/Norfolk differ
diff --git a/lib/pytz/zoneinfo/Pacific/Noumea b/lib/pytz/zoneinfo/Pacific/Noumea
index 959cc8cd..fcc44e60 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Noumea and b/lib/pytz/zoneinfo/Pacific/Noumea differ
diff --git a/lib/pytz/zoneinfo/Pacific/Pago_Pago b/lib/pytz/zoneinfo/Pacific/Pago_Pago
index cb56709a..1d7649ff 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Pago_Pago and b/lib/pytz/zoneinfo/Pacific/Pago_Pago differ
diff --git a/lib/pytz/zoneinfo/Pacific/Palau b/lib/pytz/zoneinfo/Pacific/Palau
index 1cbebe28..28992d2d 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Palau and b/lib/pytz/zoneinfo/Pacific/Palau differ
diff --git a/lib/pytz/zoneinfo/Pacific/Pitcairn b/lib/pytz/zoneinfo/Pacific/Pitcairn
index 5ee90e70..d62c648b 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Pitcairn and b/lib/pytz/zoneinfo/Pacific/Pitcairn differ
diff --git a/lib/pytz/zoneinfo/Pacific/Pohnpei b/lib/pytz/zoneinfo/Pacific/Pohnpei
index 1ab83534..59bd7646 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Pohnpei and b/lib/pytz/zoneinfo/Pacific/Pohnpei differ
diff --git a/lib/pytz/zoneinfo/Pacific/Ponape b/lib/pytz/zoneinfo/Pacific/Ponape
index 1ab83534..59bd7646 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Ponape and b/lib/pytz/zoneinfo/Pacific/Ponape differ
diff --git a/lib/pytz/zoneinfo/Pacific/Port_Moresby b/lib/pytz/zoneinfo/Pacific/Port_Moresby
index 7be2474d..dffa4573 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Port_Moresby and b/lib/pytz/zoneinfo/Pacific/Port_Moresby differ
diff --git a/lib/pytz/zoneinfo/Pacific/Rarotonga b/lib/pytz/zoneinfo/Pacific/Rarotonga
index 184a87c1..2a254902 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Rarotonga and b/lib/pytz/zoneinfo/Pacific/Rarotonga differ
diff --git a/lib/pytz/zoneinfo/Pacific/Saipan b/lib/pytz/zoneinfo/Pacific/Saipan
index 66490d25..c54473cd 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Saipan and b/lib/pytz/zoneinfo/Pacific/Saipan differ
diff --git a/lib/pytz/zoneinfo/Pacific/Samoa b/lib/pytz/zoneinfo/Pacific/Samoa
index cb56709a..1d7649ff 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Samoa and b/lib/pytz/zoneinfo/Pacific/Samoa differ
diff --git a/lib/pytz/zoneinfo/Pacific/Tahiti b/lib/pytz/zoneinfo/Pacific/Tahiti
index 481edd30..bfc9a7c9 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Tahiti and b/lib/pytz/zoneinfo/Pacific/Tahiti differ
diff --git a/lib/pytz/zoneinfo/Pacific/Tarawa b/lib/pytz/zoneinfo/Pacific/Tarawa
index 47661d40..1e8189ce 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Tarawa and b/lib/pytz/zoneinfo/Pacific/Tarawa differ
diff --git a/lib/pytz/zoneinfo/Pacific/Tongatapu b/lib/pytz/zoneinfo/Pacific/Tongatapu
index c8824ab5..71d899bb 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Tongatapu and b/lib/pytz/zoneinfo/Pacific/Tongatapu differ
diff --git a/lib/pytz/zoneinfo/Pacific/Truk b/lib/pytz/zoneinfo/Pacific/Truk
index 7be2474d..28356bbf 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Truk and b/lib/pytz/zoneinfo/Pacific/Truk differ
diff --git a/lib/pytz/zoneinfo/Pacific/Wake b/lib/pytz/zoneinfo/Pacific/Wake
index 47661d40..9e2a37cc 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Wake and b/lib/pytz/zoneinfo/Pacific/Wake differ
diff --git a/lib/pytz/zoneinfo/Pacific/Wallis b/lib/pytz/zoneinfo/Pacific/Wallis
index 47661d40..b8944715 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Wallis and b/lib/pytz/zoneinfo/Pacific/Wallis differ
diff --git a/lib/pytz/zoneinfo/Pacific/Yap b/lib/pytz/zoneinfo/Pacific/Yap
index 7be2474d..28356bbf 100644
Binary files a/lib/pytz/zoneinfo/Pacific/Yap and b/lib/pytz/zoneinfo/Pacific/Yap differ
diff --git a/lib/pytz/zoneinfo/Poland b/lib/pytz/zoneinfo/Poland
index e33cf671..5cbba412 100644
Binary files a/lib/pytz/zoneinfo/Poland and b/lib/pytz/zoneinfo/Poland differ
diff --git a/lib/pytz/zoneinfo/Portugal b/lib/pytz/zoneinfo/Portugal
index 616de167..b9aff3a5 100644
Binary files a/lib/pytz/zoneinfo/Portugal and b/lib/pytz/zoneinfo/Portugal differ
diff --git a/lib/pytz/zoneinfo/ROC b/lib/pytz/zoneinfo/ROC
index 24c43444..4810a0b6 100644
Binary files a/lib/pytz/zoneinfo/ROC and b/lib/pytz/zoneinfo/ROC differ
diff --git a/lib/pytz/zoneinfo/ROK b/lib/pytz/zoneinfo/ROK
index 96199e73..fd91d5b7 100644
Binary files a/lib/pytz/zoneinfo/ROK and b/lib/pytz/zoneinfo/ROK differ
diff --git a/lib/pytz/zoneinfo/Singapore b/lib/pytz/zoneinfo/Singapore
index 3d9f191e..9dd49cb7 100644
Binary files a/lib/pytz/zoneinfo/Singapore and b/lib/pytz/zoneinfo/Singapore differ
diff --git a/lib/pytz/zoneinfo/Turkey b/lib/pytz/zoneinfo/Turkey
index 7c2336dd..d89aa3a8 100644
Binary files a/lib/pytz/zoneinfo/Turkey and b/lib/pytz/zoneinfo/Turkey differ
diff --git a/lib/pytz/zoneinfo/UCT b/lib/pytz/zoneinfo/UCT
index 91558be0..40147b9e 100644
Binary files a/lib/pytz/zoneinfo/UCT and b/lib/pytz/zoneinfo/UCT differ
diff --git a/lib/pytz/zoneinfo/US/Alaska b/lib/pytz/zoneinfo/US/Alaska
index 9bbb2fd3..a4627cac 100644
Binary files a/lib/pytz/zoneinfo/US/Alaska and b/lib/pytz/zoneinfo/US/Alaska differ
diff --git a/lib/pytz/zoneinfo/US/Aleutian b/lib/pytz/zoneinfo/US/Aleutian
index 43236498..b0a5dd60 100644
Binary files a/lib/pytz/zoneinfo/US/Aleutian and b/lib/pytz/zoneinfo/US/Aleutian differ
diff --git a/lib/pytz/zoneinfo/US/Arizona b/lib/pytz/zoneinfo/US/Arizona
index ab37e845..adf28236 100644
Binary files a/lib/pytz/zoneinfo/US/Arizona and b/lib/pytz/zoneinfo/US/Arizona differ
diff --git a/lib/pytz/zoneinfo/US/Central b/lib/pytz/zoneinfo/US/Central
index c6981a06..3dd8f0fa 100644
Binary files a/lib/pytz/zoneinfo/US/Central and b/lib/pytz/zoneinfo/US/Central differ
diff --git a/lib/pytz/zoneinfo/US/East-Indiana b/lib/pytz/zoneinfo/US/East-Indiana
index a84b6e99..4a92c065 100644
Binary files a/lib/pytz/zoneinfo/US/East-Indiana and b/lib/pytz/zoneinfo/US/East-Indiana differ
diff --git a/lib/pytz/zoneinfo/US/Eastern b/lib/pytz/zoneinfo/US/Eastern
index a8b9ab19..7553fee3 100644
Binary files a/lib/pytz/zoneinfo/US/Eastern and b/lib/pytz/zoneinfo/US/Eastern differ
diff --git a/lib/pytz/zoneinfo/US/Hawaii b/lib/pytz/zoneinfo/US/Hawaii
index c7cd0601..bd855772 100644
Binary files a/lib/pytz/zoneinfo/US/Hawaii and b/lib/pytz/zoneinfo/US/Hawaii differ
diff --git a/lib/pytz/zoneinfo/US/Indiana-Starke b/lib/pytz/zoneinfo/US/Indiana-Starke
index 025d132d..cc785da9 100644
Binary files a/lib/pytz/zoneinfo/US/Indiana-Starke and b/lib/pytz/zoneinfo/US/Indiana-Starke differ
diff --git a/lib/pytz/zoneinfo/US/Michigan b/lib/pytz/zoneinfo/US/Michigan
index e104faa4..a123b331 100644
Binary files a/lib/pytz/zoneinfo/US/Michigan and b/lib/pytz/zoneinfo/US/Michigan differ
diff --git a/lib/pytz/zoneinfo/US/Mountain b/lib/pytz/zoneinfo/US/Mountain
index abb2b974..7fc66917 100644
Binary files a/lib/pytz/zoneinfo/US/Mountain and b/lib/pytz/zoneinfo/US/Mountain differ
diff --git a/lib/pytz/zoneinfo/US/Pacific b/lib/pytz/zoneinfo/US/Pacific
index 610e7af5..1fa9149f 100644
Binary files a/lib/pytz/zoneinfo/US/Pacific and b/lib/pytz/zoneinfo/US/Pacific differ
diff --git a/lib/pytz/zoneinfo/US/Pacific-New b/lib/pytz/zoneinfo/US/Pacific-New
new file mode 100644
index 00000000..1fa9149f
Binary files /dev/null and b/lib/pytz/zoneinfo/US/Pacific-New differ
diff --git a/lib/pytz/zoneinfo/US/Samoa b/lib/pytz/zoneinfo/US/Samoa
index cb56709a..1d7649ff 100644
Binary files a/lib/pytz/zoneinfo/US/Samoa and b/lib/pytz/zoneinfo/US/Samoa differ
diff --git a/lib/pytz/zoneinfo/UTC b/lib/pytz/zoneinfo/UTC
index 91558be0..c3b97f1a 100644
Binary files a/lib/pytz/zoneinfo/UTC and b/lib/pytz/zoneinfo/UTC differ
diff --git a/lib/pytz/zoneinfo/Universal b/lib/pytz/zoneinfo/Universal
index 91558be0..c3b97f1a 100644
Binary files a/lib/pytz/zoneinfo/Universal and b/lib/pytz/zoneinfo/Universal differ
diff --git a/lib/pytz/zoneinfo/W-SU b/lib/pytz/zoneinfo/W-SU
index ddb3f4e9..bdbbaebe 100644
Binary files a/lib/pytz/zoneinfo/W-SU and b/lib/pytz/zoneinfo/W-SU differ
diff --git a/lib/pytz/zoneinfo/WET b/lib/pytz/zoneinfo/WET
index 616de167..444a1933 100644
Binary files a/lib/pytz/zoneinfo/WET and b/lib/pytz/zoneinfo/WET differ
diff --git a/lib/pytz/zoneinfo/Zulu b/lib/pytz/zoneinfo/Zulu
index 91558be0..c3b97f1a 100644
Binary files a/lib/pytz/zoneinfo/Zulu and b/lib/pytz/zoneinfo/Zulu differ
diff --git a/lib/pytz/zoneinfo/iso3166.tab b/lib/pytz/zoneinfo/iso3166.tab
index 402c015e..0b0b8426 100644
--- a/lib/pytz/zoneinfo/iso3166.tab
+++ b/lib/pytz/zoneinfo/iso3166.tab
@@ -3,22 +3,18 @@
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
-# From Paul Eggert (2023-09-06):
+# From Paul Eggert (2014-07-18):
 # This file contains a table of two-letter country codes.  Columns are
 # separated by a single tab.  Lines beginning with '#' are comments.
-# All text uses UTF-8 encoding.  The columns of the table are as follows:
+# Although all text currently uses ASCII encoding, this is planned to
+# change to UTF-8 soon.  The columns of the table are as follows:
 #
 # 1.  ISO 3166-1 alpha-2 country code, current as of
-#     ISO/TC 46 N1108 (2023-04-05).  See: ISO/TC 46 Documents
-#     https://www.iso.org/committee/48750.html?view=documents
-# 2.  The usual English name for the coded region.  This sometimes
-#     departs from ISO-listed names, sometimes so that sorted subsets
-#     of names are useful (e.g., "Samoa (American)" and "Samoa
-#     (western)" rather than "American Samoa" and "Samoa"),
-#     sometimes to avoid confusion among non-experts (e.g.,
-#     "Czech Republic" and "Turkey" rather than "Czechia" and "Türkiye"),
-#     and sometimes to omit needless detail or churn (e.g., "Netherlands"
-#     rather than "Netherlands (the)" or "Netherlands (Kingdom of the)").
+#     ISO 3166-1 Newsletter VI-16 (2013-07-11).  See: Updates on ISO 3166
+#   http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm
+# 2.  The usual English name for the coded region,
+#     chosen so that alphabetic sorting of subsets produces helpful lists.
+#     This is not the same as the English name in the ISO 3166 tables.
 #
 # The table is sorted by country code.
 #
@@ -42,7 +38,7 @@ AS	Samoa (American)
 AT	Austria
 AU	Australia
 AW	Aruba
-AX	Ã…land Islands
+AX	Aaland Islands
 AZ	Azerbaijan
 BA	Bosnia & Herzegovina
 BB	Barbados
@@ -57,7 +53,7 @@ BL	St Barthelemy
 BM	Bermuda
 BN	Brunei
 BO	Bolivia
-BQ	Caribbean NL
+BQ	Caribbean Netherlands
 BR	Brazil
 BS	Bahamas
 BT	Bhutan
@@ -71,7 +67,7 @@ CD	Congo (Dem. Rep.)
 CF	Central African Rep.
 CG	Congo (Rep.)
 CH	Switzerland
-CI	Côte d'Ivoire
+CI	Cote d'Ivoire
 CK	Cook Islands
 CL	Chile
 CM	Cameroon
@@ -80,7 +76,7 @@ CO	Colombia
 CR	Costa Rica
 CU	Cuba
 CV	Cape Verde
-CW	Curaçao
+CW	Curacao
 CX	Christmas Island
 CY	Cyprus
 CZ	Czech Republic
@@ -168,10 +164,10 @@ MA	Morocco
 MC	Monaco
 MD	Moldova
 ME	Montenegro
-MF	St Martin (French)
+MF	St Martin (French part)
 MG	Madagascar
 MH	Marshall Islands
-MK	North Macedonia
+MK	Macedonia
 ML	Mali
 MM	Myanmar (Burma)
 MN	Mongolia
@@ -215,7 +211,7 @@ PT	Portugal
 PW	Palau
 PY	Paraguay
 QA	Qatar
-RE	Réunion
+RE	Reunion
 RO	Romania
 RS	Serbia
 RU	Russia
@@ -238,12 +234,12 @@ SR	Suriname
 SS	South Sudan
 ST	Sao Tome & Principe
 SV	El Salvador
-SX	St Maarten (Dutch)
+SX	St Maarten (Dutch part)
 SY	Syria
-SZ	Eswatini (Swaziland)
+SZ	Swaziland
 TC	Turks & Caicos Is
 TD	Chad
-TF	French S. Terr.
+TF	French Southern & Antarctic Lands
 TG	Togo
 TH	Thailand
 TJ	Tajikistan
diff --git a/lib/pytz/zoneinfo/leapseconds b/lib/pytz/zoneinfo/leapseconds
deleted file mode 100644
index 6c715cb2..00000000
--- a/lib/pytz/zoneinfo/leapseconds
+++ /dev/null
@@ -1,79 +0,0 @@
-# Allowance for leap seconds added to each time zone file.
-
-# This file is in the public domain.
-
-# This file is generated automatically from the data in the public-domain
-# NIST/IERS format leap-seconds.list file, which can be copied from
-# <https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list>
-# or, in a variant with different comments, from
-# <ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.list>.
-# For more about leap-seconds.list, please see
-# The NTP Timescale and Leap Seconds
-# <https://www.eecis.udel.edu/~mills/leap.html>.
-
-# The rules for leap seconds are specified in Annex 1 (Time scales) of:
-# Standard-frequency and time-signal emissions.
-# International Telecommunication Union - Radiocommunication Sector
-# (ITU-R) Recommendation TF.460-6 (02/2002)
-# <https://www.itu.int/rec/R-REC-TF.460-6-200202-I/>.
-# The International Earth Rotation and Reference Systems Service (IERS)
-# periodically uses leap seconds to keep UTC to within 0.9 s of UT1
-# (a proxy for Earth's angle in space as measured by astronomers)
-# and publishes leap second data in a copyrighted file
-# <https://hpiers.obspm.fr/iers/bul/bulc/Leap_Second.dat>.
-# See: Levine J. Coordinated Universal Time and the leap second.
-# URSI Radio Sci Bull. 2016;89(4):30-6. doi:10.23919/URSIRSB.2016.7909995
-# <https://ieeexplore.ieee.org/document/7909995>.
-
-# There were no leap seconds before 1972, as no official mechanism
-# accounted for the discrepancy between atomic time (TAI) and the earth's
-# rotation.  The first ("1 Jan 1972") data line in leap-seconds.list
-# does not denote a leap second; it denotes the start of the current definition
-# of UTC.
-
-# All leap-seconds are Stationary (S) at the given UTC time.
-# The correction (+ or -) is made at the given time, so in the unlikely
-# event of a negative leap second, a line would look like this:
-# Leap	YEAR	MON	DAY	23:59:59	-	S
-# Typical lines look like this:
-# Leap	YEAR	MON	DAY	23:59:60	+	S
-Leap	1972	Jun	30	23:59:60	+	S
-Leap	1972	Dec	31	23:59:60	+	S
-Leap	1973	Dec	31	23:59:60	+	S
-Leap	1974	Dec	31	23:59:60	+	S
-Leap	1975	Dec	31	23:59:60	+	S
-Leap	1976	Dec	31	23:59:60	+	S
-Leap	1977	Dec	31	23:59:60	+	S
-Leap	1978	Dec	31	23:59:60	+	S
-Leap	1979	Dec	31	23:59:60	+	S
-Leap	1981	Jun	30	23:59:60	+	S
-Leap	1982	Jun	30	23:59:60	+	S
-Leap	1983	Jun	30	23:59:60	+	S
-Leap	1985	Jun	30	23:59:60	+	S
-Leap	1987	Dec	31	23:59:60	+	S
-Leap	1989	Dec	31	23:59:60	+	S
-Leap	1990	Dec	31	23:59:60	+	S
-Leap	1992	Jun	30	23:59:60	+	S
-Leap	1993	Jun	30	23:59:60	+	S
-Leap	1994	Jun	30	23:59:60	+	S
-Leap	1995	Dec	31	23:59:60	+	S
-Leap	1997	Jun	30	23:59:60	+	S
-Leap	1998	Dec	31	23:59:60	+	S
-Leap	2005	Dec	31	23:59:60	+	S
-Leap	2008	Dec	31	23:59:60	+	S
-Leap	2012	Jun	30	23:59:60	+	S
-Leap	2015	Jun	30	23:59:60	+	S
-Leap	2016	Dec	31	23:59:60	+	S
-
-# UTC timestamp when this leap second list expires.
-# Any additional leap seconds will come after this.
-# This Expires line is commented out for now,
-# so that pre-2020a zic implementations do not reject this file.
-#Expires 2025	Jun	28	00:00:00
-
-# POSIX timestamps for the data in this file:
-#updated 1720104763 (2024-07-04 14:52:43 UTC)
-#expires 1751068800 (2025-06-28 00:00:00 UTC)
-
-#	Updated through IERS Bulletin C (https://hpiers.obspm.fr/iers/bul/bulc/bulletinc.dat)
-#	File expires on 28 June 2025
diff --git a/lib/pytz/zoneinfo/localtime b/lib/pytz/zoneinfo/localtime
new file mode 100644
index 00000000..c05e45fd
Binary files /dev/null and b/lib/pytz/zoneinfo/localtime differ
diff --git a/lib/pytz/zoneinfo/posixrules b/lib/pytz/zoneinfo/posixrules
new file mode 100644
index 00000000..7553fee3
Binary files /dev/null and b/lib/pytz/zoneinfo/posixrules differ
diff --git a/lib/pytz/zoneinfo/tzdata.zi b/lib/pytz/zoneinfo/tzdata.zi
deleted file mode 100644
index b89326a7..00000000
--- a/lib/pytz/zoneinfo/tzdata.zi
+++ /dev/null
@@ -1,4281 +0,0 @@
-# version unknown
-# This zic input file is in the public domain.
-R d 1916 o - Jun 14 23s 1 S
-R d 1916 1919 - O Su>=1 23s 0 -
-R d 1917 o - Mar 24 23s 1 S
-R d 1918 o - Mar 9 23s 1 S
-R d 1919 o - Mar 1 23s 1 S
-R d 1920 o - F 14 23s 1 S
-R d 1920 o - O 23 23s 0 -
-R d 1921 o - Mar 14 23s 1 S
-R d 1921 o - Jun 21 23s 0 -
-R d 1939 o - S 11 23s 1 S
-R d 1939 o - N 19 1 0 -
-R d 1944 1945 - Ap M>=1 2 1 S
-R d 1944 o - O 8 2 0 -
-R d 1945 o - S 16 1 0 -
-R d 1971 o - Ap 25 23s 1 S
-R d 1971 o - S 26 23s 0 -
-R d 1977 o - May 6 0 1 S
-R d 1977 o - O 21 0 0 -
-R d 1978 o - Mar 24 1 1 S
-R d 1978 o - S 22 3 0 -
-R d 1980 o - Ap 25 0 1 S
-R d 1980 o - O 31 2 0 -
-R K 1940 o - Jul 15 0 1 S
-R K 1940 o - O 1 0 0 -
-R K 1941 o - Ap 15 0 1 S
-R K 1941 o - S 16 0 0 -
-R K 1942 1944 - Ap 1 0 1 S
-R K 1942 o - O 27 0 0 -
-R K 1943 1945 - N 1 0 0 -
-R K 1945 o - Ap 16 0 1 S
-R K 1957 o - May 10 0 1 S
-R K 1957 1958 - O 1 0 0 -
-R K 1958 o - May 1 0 1 S
-R K 1959 1981 - May 1 1 1 S
-R K 1959 1965 - S 30 3 0 -
-R K 1966 1994 - O 1 3 0 -
-R K 1982 o - Jul 25 1 1 S
-R K 1983 o - Jul 12 1 1 S
-R K 1984 1988 - May 1 1 1 S
-R K 1989 o - May 6 1 1 S
-R K 1990 1994 - May 1 1 1 S
-R K 1995 2010 - Ap lastF 0s 1 S
-R K 1995 2005 - S lastTh 24 0 -
-R K 2006 o - S 21 24 0 -
-R K 2007 o - S Th>=1 24 0 -
-R K 2008 o - Au lastTh 24 0 -
-R K 2009 o - Au 20 24 0 -
-R K 2010 o - Au 10 24 0 -
-R K 2010 o - S 9 24 1 S
-R K 2010 o - S lastTh 24 0 -
-R K 2014 o - May 15 24 1 S
-R K 2014 o - Jun 26 24 0 -
-R K 2014 o - Jul 31 24 1 S
-R K 2014 o - S lastTh 24 0 -
-R K 2023 ma - Ap lastF 0 1 S
-R K 2023 ma - O lastTh 24 0 -
-R L 1951 o - O 14 2 1 S
-R L 1952 o - Ja 1 0 0 -
-R L 1953 o - O 9 2 1 S
-R L 1954 o - Ja 1 0 0 -
-R L 1955 o - S 30 0 1 S
-R L 1956 o - Ja 1 0 0 -
-R L 1982 1984 - Ap 1 0 1 S
-R L 1982 1985 - O 1 0 0 -
-R L 1985 o - Ap 6 0 1 S
-R L 1986 o - Ap 4 0 1 S
-R L 1986 o - O 3 0 0 -
-R L 1987 1989 - Ap 1 0 1 S
-R L 1987 1989 - O 1 0 0 -
-R L 1997 o - Ap 4 0 1 S
-R L 1997 o - O 4 0 0 -
-R L 2013 o - Mar lastF 1 1 S
-R L 2013 o - O lastF 2 0 -
-R MU 1982 o - O 10 0 1 -
-R MU 1983 o - Mar 21 0 0 -
-R MU 2008 o - O lastSu 2 1 -
-R MU 2009 o - Mar lastSu 2 0 -
-R M 1939 o - S 12 0 1 -
-R M 1939 o - N 19 0 0 -
-R M 1940 o - F 25 0 1 -
-R M 1945 o - N 18 0 0 -
-R M 1950 o - Jun 11 0 1 -
-R M 1950 o - O 29 0 0 -
-R M 1967 o - Jun 3 12 1 -
-R M 1967 o - O 1 0 0 -
-R M 1974 o - Jun 24 0 1 -
-R M 1974 o - S 1 0 0 -
-R M 1976 1977 - May 1 0 1 -
-R M 1976 o - Au 1 0 0 -
-R M 1977 o - S 28 0 0 -
-R M 1978 o - Jun 1 0 1 -
-R M 1978 o - Au 4 0 0 -
-R M 2008 o - Jun 1 0 1 -
-R M 2008 o - S 1 0 0 -
-R M 2009 o - Jun 1 0 1 -
-R M 2009 o - Au 21 0 0 -
-R M 2010 o - May 2 0 1 -
-R M 2010 o - Au 8 0 0 -
-R M 2011 o - Ap 3 0 1 -
-R M 2011 o - Jul 31 0 0 -
-R M 2012 2013 - Ap lastSu 2 1 -
-R M 2012 o - Jul 20 3 0 -
-R M 2012 o - Au 20 2 1 -
-R M 2012 o - S 30 3 0 -
-R M 2013 o - Jul 7 3 0 -
-R M 2013 o - Au 10 2 1 -
-R M 2013 2018 - O lastSu 3 0 -
-R M 2014 2018 - Mar lastSu 2 1 -
-R M 2014 o - Jun 28 3 0 -
-R M 2014 o - Au 2 2 1 -
-R M 2015 o - Jun 14 3 0 -
-R M 2015 o - Jul 19 2 1 -
-R M 2016 o - Jun 5 3 0 -
-R M 2016 o - Jul 10 2 1 -
-R M 2017 o - May 21 3 0 -
-R M 2017 o - Jul 2 2 1 -
-R M 2018 o - May 13 3 0 -
-R M 2018 o - Jun 17 2 1 -
-R M 2019 o - May 5 3 -1 -
-R M 2019 o - Jun 9 2 0 -
-R M 2020 o - Ap 19 3 -1 -
-R M 2020 o - May 31 2 0 -
-R M 2021 o - Ap 11 3 -1 -
-R M 2021 o - May 16 2 0 -
-R M 2022 o - Mar 27 3 -1 -
-R M 2022 o - May 8 2 0 -
-R M 2023 o - Mar 19 3 -1 -
-R M 2023 o - Ap 23 2 0 -
-R M 2024 o - Mar 10 3 -1 -
-R M 2024 o - Ap 14 2 0 -
-R M 2025 o - F 23 3 -1 -
-R M 2025 o - Ap 6 2 0 -
-R M 2026 o - F 15 3 -1 -
-R M 2026 o - Mar 22 2 0 -
-R M 2027 o - F 7 3 -1 -
-R M 2027 o - Mar 14 2 0 -
-R M 2028 o - Ja 23 3 -1 -
-R M 2028 o - Mar 5 2 0 -
-R M 2029 o - Ja 14 3 -1 -
-R M 2029 o - F 18 2 0 -
-R M 2029 o - D 30 3 -1 -
-R M 2030 o - F 10 2 0 -
-R M 2030 o - D 22 3 -1 -
-R M 2031 o - Ja 26 2 0 -
-R M 2031 o - D 14 3 -1 -
-R M 2032 o - Ja 18 2 0 -
-R M 2032 o - N 28 3 -1 -
-R M 2033 o - Ja 9 2 0 -
-R M 2033 o - N 20 3 -1 -
-R M 2033 o - D 25 2 0 -
-R M 2034 o - N 5 3 -1 -
-R M 2034 o - D 17 2 0 -
-R M 2035 o - O 28 3 -1 -
-R M 2035 o - D 9 2 0 -
-R M 2036 o - O 19 3 -1 -
-R M 2036 o - N 23 2 0 -
-R M 2037 o - O 4 3 -1 -
-R M 2037 o - N 15 2 0 -
-R M 2038 o - S 26 3 -1 -
-R M 2038 o - O 31 2 0 -
-R M 2039 o - S 18 3 -1 -
-R M 2039 o - O 23 2 0 -
-R M 2040 o - S 2 3 -1 -
-R M 2040 o - O 14 2 0 -
-R M 2041 o - Au 25 3 -1 -
-R M 2041 o - S 29 2 0 -
-R M 2042 o - Au 10 3 -1 -
-R M 2042 o - S 21 2 0 -
-R M 2043 o - Au 2 3 -1 -
-R M 2043 o - S 13 2 0 -
-R M 2044 o - Jul 24 3 -1 -
-R M 2044 o - Au 28 2 0 -
-R M 2045 o - Jul 9 3 -1 -
-R M 2045 o - Au 20 2 0 -
-R M 2046 o - Jul 1 3 -1 -
-R M 2046 o - Au 5 2 0 -
-R M 2047 o - Jun 23 3 -1 -
-R M 2047 o - Jul 28 2 0 -
-R M 2048 o - Jun 7 3 -1 -
-R M 2048 o - Jul 19 2 0 -
-R M 2049 o - May 30 3 -1 -
-R M 2049 o - Jul 4 2 0 -
-R M 2050 o - May 15 3 -1 -
-R M 2050 o - Jun 26 2 0 -
-R M 2051 o - May 7 3 -1 -
-R M 2051 o - Jun 18 2 0 -
-R M 2052 o - Ap 28 3 -1 -
-R M 2052 o - Jun 2 2 0 -
-R M 2053 o - Ap 13 3 -1 -
-R M 2053 o - May 25 2 0 -
-R M 2054 o - Ap 5 3 -1 -
-R M 2054 o - May 10 2 0 -
-R M 2055 o - Mar 28 3 -1 -
-R M 2055 o - May 2 2 0 -
-R M 2056 o - Mar 12 3 -1 -
-R M 2056 o - Ap 23 2 0 -
-R M 2057 o - Mar 4 3 -1 -
-R M 2057 o - Ap 8 2 0 -
-R M 2058 o - F 17 3 -1 -
-R M 2058 o - Mar 31 2 0 -
-R M 2059 o - F 9 3 -1 -
-R M 2059 o - Mar 23 2 0 -
-R M 2060 o - F 1 3 -1 -
-R M 2060 o - Mar 7 2 0 -
-R M 2061 o - Ja 16 3 -1 -
-R M 2061 o - F 27 2 0 -
-R M 2062 o - Ja 8 3 -1 -
-R M 2062 o - F 12 2 0 -
-R M 2062 o - D 31 3 -1 -
-R M 2063 o - F 4 2 0 -
-R M 2063 o - D 16 3 -1 -
-R M 2064 o - Ja 27 2 0 -
-R M 2064 o - D 7 3 -1 -
-R M 2065 o - Ja 11 2 0 -
-R M 2065 o - N 22 3 -1 -
-R M 2066 o - Ja 3 2 0 -
-R M 2066 o - N 14 3 -1 -
-R M 2066 o - D 26 2 0 -
-R M 2067 o - N 6 3 -1 -
-R M 2067 o - D 11 2 0 -
-R M 2068 o - O 21 3 -1 -
-R M 2068 o - D 2 2 0 -
-R M 2069 o - O 13 3 -1 -
-R M 2069 o - N 17 2 0 -
-R M 2070 o - O 5 3 -1 -
-R M 2070 o - N 9 2 0 -
-R M 2071 o - S 20 3 -1 -
-R M 2071 o - N 1 2 0 -
-R M 2072 o - S 11 3 -1 -
-R M 2072 o - O 16 2 0 -
-R M 2073 o - Au 27 3 -1 -
-R M 2073 o - O 8 2 0 -
-R M 2074 o - Au 19 3 -1 -
-R M 2074 o - S 30 2 0 -
-R M 2075 o - Au 11 3 -1 -
-R M 2075 o - S 15 2 0 -
-R M 2076 o - Jul 26 3 -1 -
-R M 2076 o - S 6 2 0 -
-R M 2077 o - Jul 18 3 -1 -
-R M 2077 o - Au 22 2 0 -
-R M 2078 o - Jul 10 3 -1 -
-R M 2078 o - Au 14 2 0 -
-R M 2079 o - Jun 25 3 -1 -
-R M 2079 o - Au 6 2 0 -
-R M 2080 o - Jun 16 3 -1 -
-R M 2080 o - Jul 21 2 0 -
-R M 2081 o - Jun 1 3 -1 -
-R M 2081 o - Jul 13 2 0 -
-R M 2082 o - May 24 3 -1 -
-R M 2082 o - Jun 28 2 0 -
-R M 2083 o - May 16 3 -1 -
-R M 2083 o - Jun 20 2 0 -
-R M 2084 o - Ap 30 3 -1 -
-R M 2084 o - Jun 11 2 0 -
-R M 2085 o - Ap 22 3 -1 -
-R M 2085 o - May 27 2 0 -
-R M 2086 o - Ap 14 3 -1 -
-R M 2086 o - May 19 2 0 -
-R M 2087 o - Mar 30 3 -1 -
-R M 2087 o - May 11 2 0 -
-R NA 1994 o - Mar 21 0 -1 WAT
-R NA 1994 2017 - S Su>=1 2 0 CAT
-R NA 1995 2017 - Ap Su>=1 2 -1 WAT
-R SA 1942 1943 - S Su>=15 2 1 -
-R SA 1943 1944 - Mar Su>=15 2 0 -
-R SD 1970 o - May 1 0 1 S
-R SD 1970 1985 - O 15 0 0 -
-R SD 1971 o - Ap 30 0 1 S
-R SD 1972 1985 - Ap lastSu 0 1 S
-R n 1939 o - Ap 15 23s 1 S
-R n 1939 o - N 18 23s 0 -
-R n 1940 o - F 25 23s 1 S
-R n 1941 o - O 6 0 0 -
-R n 1942 o - Mar 9 0 1 S
-R n 1942 o - N 2 3 0 -
-R n 1943 o - Mar 29 2 1 S
-R n 1943 o - Ap 17 2 0 -
-R n 1943 o - Ap 25 2 1 S
-R n 1943 o - O 4 2 0 -
-R n 1944 1945 - Ap M>=1 2 1 S
-R n 1944 o - O 8 0 0 -
-R n 1945 o - S 16 0 0 -
-R n 1977 o - Ap 30 0s 1 S
-R n 1977 o - S 24 0s 0 -
-R n 1978 o - May 1 0s 1 S
-R n 1978 o - O 1 0s 0 -
-R n 1988 o - Jun 1 0s 1 S
-R n 1988 1990 - S lastSu 0s 0 -
-R n 1989 o - Mar 26 0s 1 S
-R n 1990 o - May 1 0s 1 S
-R n 2005 o - May 1 0s 1 S
-R n 2005 o - S 30 1s 0 -
-R n 2006 2008 - Mar lastSu 2s 1 S
-R n 2006 2008 - O lastSu 2s 0 -
-R Tr 2005 ma - Mar lastSu 1u 2 +02
-R Tr 2004 ma - O lastSu 1u 0 +00
-R AM 2011 o - Mar lastSu 2s 1 -
-R AM 2011 o - O lastSu 2s 0 -
-R AZ 1997 2015 - Mar lastSu 4 1 -
-R AZ 1997 2015 - O lastSu 5 0 -
-R BD 2009 o - Jun 19 23 1 -
-R BD 2009 o - D 31 24 0 -
-R Sh 1919 o - Ap 12 24 1 D
-R Sh 1919 o - S 30 24 0 S
-R Sh 1940 o - Jun 1 0 1 D
-R Sh 1940 o - O 12 24 0 S
-R Sh 1941 o - Mar 15 0 1 D
-R Sh 1941 o - N 1 24 0 S
-R Sh 1942 o - Ja 31 0 1 D
-R Sh 1945 o - S 1 24 0 S
-R Sh 1946 o - May 15 0 1 D
-R Sh 1946 o - S 30 24 0 S
-R Sh 1947 o - Ap 15 0 1 D
-R Sh 1947 o - O 31 24 0 S
-R Sh 1948 1949 - May 1 0 1 D
-R Sh 1948 1949 - S 30 24 0 S
-R CN 1986 o - May 4 2 1 D
-R CN 1986 1991 - S Su>=11 2 0 S
-R CN 1987 1991 - Ap Su>=11 2 1 D
-R HK 1946 o - Ap 21 0 1 S
-R HK 1946 o - D 1 3:30s 0 -
-R HK 1947 o - Ap 13 3:30s 1 S
-R HK 1947 o - N 30 3:30s 0 -
-R HK 1948 o - May 2 3:30s 1 S
-R HK 1948 1952 - O Su>=28 3:30s 0 -
-R HK 1949 1953 - Ap Su>=1 3:30 1 S
-R HK 1953 1964 - O Su>=31 3:30 0 -
-R HK 1954 1964 - Mar Su>=18 3:30 1 S
-R HK 1965 1976 - Ap Su>=16 3:30 1 S
-R HK 1965 1976 - O Su>=16 3:30 0 -
-R HK 1973 o - D 30 3:30 1 S
-R HK 1979 o - May 13 3:30 1 S
-R HK 1979 o - O 21 3:30 0 -
-R f 1946 o - May 15 0 1 D
-R f 1946 o - O 1 0 0 S
-R f 1947 o - Ap 15 0 1 D
-R f 1947 o - N 1 0 0 S
-R f 1948 1951 - May 1 0 1 D
-R f 1948 1951 - O 1 0 0 S
-R f 1952 o - Mar 1 0 1 D
-R f 1952 1954 - N 1 0 0 S
-R f 1953 1959 - Ap 1 0 1 D
-R f 1955 1961 - O 1 0 0 S
-R f 1960 1961 - Jun 1 0 1 D
-R f 1974 1975 - Ap 1 0 1 D
-R f 1974 1975 - O 1 0 0 S
-R f 1979 o - Jul 1 0 1 D
-R f 1979 o - O 1 0 0 S
-R _ 1942 1943 - Ap 30 23 1 -
-R _ 1942 o - N 17 23 0 -
-R _ 1943 o - S 30 23 0 S
-R _ 1946 o - Ap 30 23s 1 D
-R _ 1946 o - S 30 23s 0 S
-R _ 1947 o - Ap 19 23s 1 D
-R _ 1947 o - N 30 23s 0 S
-R _ 1948 o - May 2 23s 1 D
-R _ 1948 o - O 31 23s 0 S
-R _ 1949 1950 - Ap Sa>=1 23s 1 D
-R _ 1949 1950 - O lastSa 23s 0 S
-R _ 1951 o - Mar 31 23s 1 D
-R _ 1951 o - O 28 23s 0 S
-R _ 1952 1953 - Ap Sa>=1 23s 1 D
-R _ 1952 o - N 1 23s 0 S
-R _ 1953 1954 - O lastSa 23s 0 S
-R _ 1954 1956 - Mar Sa>=17 23s 1 D
-R _ 1955 o - N 5 23s 0 S
-R _ 1956 1964 - N Su>=1 3:30 0 S
-R _ 1957 1964 - Mar Su>=18 3:30 1 D
-R _ 1965 1973 - Ap Su>=16 3:30 1 D
-R _ 1965 1966 - O Su>=16 2:30 0 S
-R _ 1967 1976 - O Su>=16 3:30 0 S
-R _ 1973 o - D 30 3:30 1 D
-R _ 1975 1976 - Ap Su>=16 3:30 1 D
-R _ 1979 o - May 13 3:30 1 D
-R _ 1979 o - O Su>=16 3:30 0 S
-R CY 1975 o - Ap 13 0 1 S
-R CY 1975 o - O 12 0 0 -
-R CY 1976 o - May 15 0 1 S
-R CY 1976 o - O 11 0 0 -
-R CY 1977 1980 - Ap Su>=1 0 1 S
-R CY 1977 o - S 25 0 0 -
-R CY 1978 o - O 2 0 0 -
-R CY 1979 1997 - S lastSu 0 0 -
-R CY 1981 1998 - Mar lastSu 0 1 S
-R i 1910 o - Ja 1 0 0 -
-R i 1977 o - Mar 21 23 1 -
-R i 1977 o - O 20 24 0 -
-R i 1978 o - Mar 24 24 1 -
-R i 1978 o - Au 5 1 0 -
-R i 1979 o - May 26 24 1 -
-R i 1979 o - S 18 24 0 -
-R i 1980 o - Mar 20 24 1 -
-R i 1980 o - S 22 24 0 -
-R i 1991 o - May 2 24 1 -
-R i 1992 1995 - Mar 21 24 1 -
-R i 1991 1995 - S 21 24 0 -
-R i 1996 o - Mar 20 24 1 -
-R i 1996 o - S 20 24 0 -
-R i 1997 1999 - Mar 21 24 1 -
-R i 1997 1999 - S 21 24 0 -
-R i 2000 o - Mar 20 24 1 -
-R i 2000 o - S 20 24 0 -
-R i 2001 2003 - Mar 21 24 1 -
-R i 2001 2003 - S 21 24 0 -
-R i 2004 o - Mar 20 24 1 -
-R i 2004 o - S 20 24 0 -
-R i 2005 o - Mar 21 24 1 -
-R i 2005 o - S 21 24 0 -
-R i 2008 o - Mar 20 24 1 -
-R i 2008 o - S 20 24 0 -
-R i 2009 2011 - Mar 21 24 1 -
-R i 2009 2011 - S 21 24 0 -
-R i 2012 o - Mar 20 24 1 -
-R i 2012 o - S 20 24 0 -
-R i 2013 2015 - Mar 21 24 1 -
-R i 2013 2015 - S 21 24 0 -
-R i 2016 o - Mar 20 24 1 -
-R i 2016 o - S 20 24 0 -
-R i 2017 2019 - Mar 21 24 1 -
-R i 2017 2019 - S 21 24 0 -
-R i 2020 o - Mar 20 24 1 -
-R i 2020 o - S 20 24 0 -
-R i 2021 2022 - Mar 21 24 1 -
-R i 2021 2022 - S 21 24 0 -
-R IQ 1982 o - May 1 0 1 -
-R IQ 1982 1984 - O 1 0 0 -
-R IQ 1983 o - Mar 31 0 1 -
-R IQ 1984 1985 - Ap 1 0 1 -
-R IQ 1985 1990 - S lastSu 1s 0 -
-R IQ 1986 1990 - Mar lastSu 1s 1 -
-R IQ 1991 2007 - Ap 1 3s 1 -
-R IQ 1991 2007 - O 1 3s 0 -
-R Z 1940 o - May 31 24u 1 D
-R Z 1940 o - S 30 24u 0 S
-R Z 1940 o - N 16 24u 1 D
-R Z 1942 1946 - O 31 24u 0 S
-R Z 1943 1944 - Mar 31 24u 1 D
-R Z 1945 1946 - Ap 15 24u 1 D
-R Z 1948 o - May 22 24u 2 DD
-R Z 1948 o - Au 31 24u 1 D
-R Z 1948 1949 - O 31 24u 0 S
-R Z 1949 o - Ap 30 24u 1 D
-R Z 1950 o - Ap 15 24u 1 D
-R Z 1950 o - S 14 24u 0 S
-R Z 1951 o - Mar 31 24u 1 D
-R Z 1951 o - N 10 24u 0 S
-R Z 1952 o - Ap 19 24u 1 D
-R Z 1952 o - O 18 24u 0 S
-R Z 1953 o - Ap 11 24u 1 D
-R Z 1953 o - S 12 24u 0 S
-R Z 1954 o - Jun 12 24u 1 D
-R Z 1954 o - S 11 24u 0 S
-R Z 1955 o - Jun 11 24u 1 D
-R Z 1955 o - S 10 24u 0 S
-R Z 1956 o - Jun 2 24u 1 D
-R Z 1956 o - S 29 24u 0 S
-R Z 1957 o - Ap 27 24u 1 D
-R Z 1957 o - S 21 24u 0 S
-R Z 1974 o - Jul 6 24 1 D
-R Z 1974 o - O 12 24 0 S
-R Z 1975 o - Ap 19 24 1 D
-R Z 1975 o - Au 30 24 0 S
-R Z 1980 o - Au 2 24s 1 D
-R Z 1980 o - S 13 24s 0 S
-R Z 1984 o - May 5 24s 1 D
-R Z 1984 o - Au 25 24s 0 S
-R Z 1985 o - Ap 13 24 1 D
-R Z 1985 o - Au 31 24 0 S
-R Z 1986 o - May 17 24 1 D
-R Z 1986 o - S 6 24 0 S
-R Z 1987 o - Ap 14 24 1 D
-R Z 1987 o - S 12 24 0 S
-R Z 1988 o - Ap 9 24 1 D
-R Z 1988 o - S 3 24 0 S
-R Z 1989 o - Ap 29 24 1 D
-R Z 1989 o - S 2 24 0 S
-R Z 1990 o - Mar 24 24 1 D
-R Z 1990 o - Au 25 24 0 S
-R Z 1991 o - Mar 23 24 1 D
-R Z 1991 o - Au 31 24 0 S
-R Z 1992 o - Mar 28 24 1 D
-R Z 1992 o - S 5 24 0 S
-R Z 1993 o - Ap 2 0 1 D
-R Z 1993 o - S 5 0 0 S
-R Z 1994 o - Ap 1 0 1 D
-R Z 1994 o - Au 28 0 0 S
-R Z 1995 o - Mar 31 0 1 D
-R Z 1995 o - S 3 0 0 S
-R Z 1996 o - Mar 14 24 1 D
-R Z 1996 o - S 15 24 0 S
-R Z 1997 o - Mar 20 24 1 D
-R Z 1997 o - S 13 24 0 S
-R Z 1998 o - Mar 20 0 1 D
-R Z 1998 o - S 6 0 0 S
-R Z 1999 o - Ap 2 2 1 D
-R Z 1999 o - S 3 2 0 S
-R Z 2000 o - Ap 14 2 1 D
-R Z 2000 o - O 6 1 0 S
-R Z 2001 o - Ap 9 1 1 D
-R Z 2001 o - S 24 1 0 S
-R Z 2002 o - Mar 29 1 1 D
-R Z 2002 o - O 7 1 0 S
-R Z 2003 o - Mar 28 1 1 D
-R Z 2003 o - O 3 1 0 S
-R Z 2004 o - Ap 7 1 1 D
-R Z 2004 o - S 22 1 0 S
-R Z 2005 2012 - Ap F<=1 2 1 D
-R Z 2005 o - O 9 2 0 S
-R Z 2006 o - O 1 2 0 S
-R Z 2007 o - S 16 2 0 S
-R Z 2008 o - O 5 2 0 S
-R Z 2009 o - S 27 2 0 S
-R Z 2010 o - S 12 2 0 S
-R Z 2011 o - O 2 2 0 S
-R Z 2012 o - S 23 2 0 S
-R Z 2013 ma - Mar F>=23 2 1 D
-R Z 2013 ma - O lastSu 2 0 S
-R JP 1948 o - May Sa>=1 24 1 D
-R JP 1948 1951 - S Sa>=8 25 0 S
-R JP 1949 o - Ap Sa>=1 24 1 D
-R JP 1950 1951 - May Sa>=1 24 1 D
-R J 1973 o - Jun 6 0 1 S
-R J 1973 1975 - O 1 0 0 -
-R J 1974 1977 - May 1 0 1 S
-R J 1976 o - N 1 0 0 -
-R J 1977 o - O 1 0 0 -
-R J 1978 o - Ap 30 0 1 S
-R J 1978 o - S 30 0 0 -
-R J 1985 o - Ap 1 0 1 S
-R J 1985 o - O 1 0 0 -
-R J 1986 1988 - Ap F>=1 0 1 S
-R J 1986 1990 - O F>=1 0 0 -
-R J 1989 o - May 8 0 1 S
-R J 1990 o - Ap 27 0 1 S
-R J 1991 o - Ap 17 0 1 S
-R J 1991 o - S 27 0 0 -
-R J 1992 o - Ap 10 0 1 S
-R J 1992 1993 - O F>=1 0 0 -
-R J 1993 1998 - Ap F>=1 0 1 S
-R J 1994 o - S F>=15 0 0 -
-R J 1995 1998 - S F>=15 0s 0 -
-R J 1999 o - Jul 1 0s 1 S
-R J 1999 2002 - S lastF 0s 0 -
-R J 2000 2001 - Mar lastTh 0s 1 S
-R J 2002 2012 - Mar lastTh 24 1 S
-R J 2003 o - O 24 0s 0 -
-R J 2004 o - O 15 0s 0 -
-R J 2005 o - S lastF 0s 0 -
-R J 2006 2011 - O lastF 0s 0 -
-R J 2013 o - D 20 0 0 -
-R J 2014 2021 - Mar lastTh 24 1 S
-R J 2014 2022 - O lastF 0s 0 -
-R J 2022 o - F lastTh 24 1 S
-R KG 1992 1996 - Ap Su>=7 0s 1 -
-R KG 1992 1996 - S lastSu 0 0 -
-R KG 1997 2005 - Mar lastSu 2:30 1 -
-R KG 1997 2004 - O lastSu 2:30 0 -
-R KR 1948 o - Jun 1 0 1 D
-R KR 1948 o - S 12 24 0 S
-R KR 1949 o - Ap 3 0 1 D
-R KR 1949 1951 - S Sa>=7 24 0 S
-R KR 1950 o - Ap 1 0 1 D
-R KR 1951 o - May 6 0 1 D
-R KR 1955 o - May 5 0 1 D
-R KR 1955 o - S 8 24 0 S
-R KR 1956 o - May 20 0 1 D
-R KR 1956 o - S 29 24 0 S
-R KR 1957 1960 - May Su>=1 0 1 D
-R KR 1957 1960 - S Sa>=17 24 0 S
-R KR 1987 1988 - May Su>=8 2 1 D
-R KR 1987 1988 - O Su>=8 3 0 S
-R l 1920 o - Mar 28 0 1 S
-R l 1920 o - O 25 0 0 -
-R l 1921 o - Ap 3 0 1 S
-R l 1921 o - O 3 0 0 -
-R l 1922 o - Mar 26 0 1 S
-R l 1922 o - O 8 0 0 -
-R l 1923 o - Ap 22 0 1 S
-R l 1923 o - S 16 0 0 -
-R l 1957 1961 - May 1 0 1 S
-R l 1957 1961 - O 1 0 0 -
-R l 1972 o - Jun 22 0 1 S
-R l 1972 1977 - O 1 0 0 -
-R l 1973 1977 - May 1 0 1 S
-R l 1978 o - Ap 30 0 1 S
-R l 1978 o - S 30 0 0 -
-R l 1984 1987 - May 1 0 1 S
-R l 1984 1991 - O 16 0 0 -
-R l 1988 o - Jun 1 0 1 S
-R l 1989 o - May 10 0 1 S
-R l 1990 1992 - May 1 0 1 S
-R l 1992 o - O 4 0 0 -
-R l 1993 ma - Mar lastSu 0 1 S
-R l 1993 1998 - S lastSu 0 0 -
-R l 1999 ma - O lastSu 0 0 -
-R NB 1935 1941 - S 14 0 0:20 -
-R NB 1935 1941 - D 14 0 0 -
-R X 1983 1984 - Ap 1 0 1 -
-R X 1983 o - O 1 0 0 -
-R X 1985 1998 - Mar lastSu 0 1 -
-R X 1984 1998 - S lastSu 0 0 -
-R X 2001 o - Ap lastSa 2 1 -
-R X 2001 2006 - S lastSa 2 0 -
-R X 2002 2006 - Mar lastSa 2 1 -
-R X 2015 2016 - Mar lastSa 2 1 -
-R X 2015 2016 - S lastSa 0 0 -
-R PK 2002 o - Ap Su>=2 0 1 S
-R PK 2002 o - O Su>=2 0 0 -
-R PK 2008 o - Jun 1 0 1 S
-R PK 2008 2009 - N 1 0 0 -
-R PK 2009 o - Ap 15 0 1 S
-R P 1999 2005 - Ap F>=15 0 1 S
-R P 1999 2003 - O F>=15 0 0 -
-R P 2004 o - O 1 1 0 -
-R P 2005 o - O 4 2 0 -
-R P 2006 2007 - Ap 1 0 1 S
-R P 2006 o - S 22 0 0 -
-R P 2007 o - S 13 2 0 -
-R P 2008 2009 - Mar lastF 0 1 S
-R P 2008 o - S 1 0 0 -
-R P 2009 o - S 4 1 0 -
-R P 2010 o - Mar 26 0 1 S
-R P 2010 o - Au 11 0 0 -
-R P 2011 o - Ap 1 0:1 1 S
-R P 2011 o - Au 1 0 0 -
-R P 2011 o - Au 30 0 1 S
-R P 2011 o - S 30 0 0 -
-R P 2012 2014 - Mar lastTh 24 1 S
-R P 2012 o - S 21 1 0 -
-R P 2013 o - S 27 0 0 -
-R P 2014 o - O 24 0 0 -
-R P 2015 o - Mar 28 0 1 S
-R P 2015 o - O 23 1 0 -
-R P 2016 2018 - Mar Sa<=30 1 1 S
-R P 2016 2018 - O Sa<=30 1 0 -
-R P 2019 o - Mar 29 0 1 S
-R P 2019 o - O Sa<=30 0 0 -
-R P 2020 2021 - Mar Sa<=30 0 1 S
-R P 2020 o - O 24 1 0 -
-R P 2021 o - O 29 1 0 -
-R P 2022 o - Mar 27 0 1 S
-R P 2022 2035 - O Sa<=30 2 0 -
-R P 2023 o - Ap 29 2 1 S
-R P 2024 o - Ap 20 2 1 S
-R P 2025 o - Ap 12 2 1 S
-R P 2026 2054 - Mar Sa<=30 2 1 S
-R P 2036 o - O 18 2 0 -
-R P 2037 o - O 10 2 0 -
-R P 2038 o - S 25 2 0 -
-R P 2039 o - S 17 2 0 -
-R P 2040 o - S 1 2 0 -
-R P 2040 o - O 20 2 1 S
-R P 2040 2067 - O Sa<=30 2 0 -
-R P 2041 o - Au 24 2 0 -
-R P 2041 o - O 5 2 1 S
-R P 2042 o - Au 16 2 0 -
-R P 2042 o - S 27 2 1 S
-R P 2043 o - Au 1 2 0 -
-R P 2043 o - S 19 2 1 S
-R P 2044 o - Jul 23 2 0 -
-R P 2044 o - S 3 2 1 S
-R P 2045 o - Jul 15 2 0 -
-R P 2045 o - Au 26 2 1 S
-R P 2046 o - Jun 30 2 0 -
-R P 2046 o - Au 18 2 1 S
-R P 2047 o - Jun 22 2 0 -
-R P 2047 o - Au 3 2 1 S
-R P 2048 o - Jun 6 2 0 -
-R P 2048 o - Jul 25 2 1 S
-R P 2049 o - May 29 2 0 -
-R P 2049 o - Jul 10 2 1 S
-R P 2050 o - May 21 2 0 -
-R P 2050 o - Jul 2 2 1 S
-R P 2051 o - May 6 2 0 -
-R P 2051 o - Jun 24 2 1 S
-R P 2052 o - Ap 27 2 0 -
-R P 2052 o - Jun 8 2 1 S
-R P 2053 o - Ap 12 2 0 -
-R P 2053 o - May 31 2 1 S
-R P 2054 o - Ap 4 2 0 -
-R P 2054 o - May 23 2 1 S
-R P 2055 o - May 8 2 1 S
-R P 2056 o - Ap 29 2 1 S
-R P 2057 o - Ap 14 2 1 S
-R P 2058 o - Ap 6 2 1 S
-R P 2059 ma - Mar Sa<=30 2 1 S
-R P 2068 o - O 20 2 0 -
-R P 2069 o - O 12 2 0 -
-R P 2070 o - O 4 2 0 -
-R P 2071 o - S 19 2 0 -
-R P 2072 o - S 10 2 0 -
-R P 2072 o - O 22 2 1 S
-R P 2072 ma - O Sa<=30 2 0 -
-R P 2073 o - S 2 2 0 -
-R P 2073 o - O 14 2 1 S
-R P 2074 o - Au 18 2 0 -
-R P 2074 o - O 6 2 1 S
-R P 2075 o - Au 10 2 0 -
-R P 2075 o - S 21 2 1 S
-R P 2076 o - Jul 25 2 0 -
-R P 2076 o - S 12 2 1 S
-R P 2077 o - Jul 17 2 0 -
-R P 2077 o - S 4 2 1 S
-R P 2078 o - Jul 9 2 0 -
-R P 2078 o - Au 20 2 1 S
-R P 2079 o - Jun 24 2 0 -
-R P 2079 o - Au 12 2 1 S
-R P 2080 o - Jun 15 2 0 -
-R P 2080 o - Jul 27 2 1 S
-R P 2081 o - Jun 7 2 0 -
-R P 2081 o - Jul 19 2 1 S
-R P 2082 o - May 23 2 0 -
-R P 2082 o - Jul 11 2 1 S
-R P 2083 o - May 15 2 0 -
-R P 2083 o - Jun 26 2 1 S
-R P 2084 o - Ap 29 2 0 -
-R P 2084 o - Jun 17 2 1 S
-R P 2085 o - Ap 21 2 0 -
-R P 2085 o - Jun 9 2 1 S
-R P 2086 o - Ap 13 2 0 -
-R P 2086 o - May 25 2 1 S
-R PH 1936 o - N 1 0 1 D
-R PH 1937 o - F 1 0 0 S
-R PH 1954 o - Ap 12 0 1 D
-R PH 1954 o - Jul 1 0 0 S
-R PH 1978 o - Mar 22 0 1 D
-R PH 1978 o - S 21 0 0 S
-R S 1920 1923 - Ap Su>=15 2 1 S
-R S 1920 1923 - O Su>=1 2 0 -
-R S 1962 o - Ap 29 2 1 S
-R S 1962 o - O 1 2 0 -
-R S 1963 1965 - May 1 2 1 S
-R S 1963 o - S 30 2 0 -
-R S 1964 o - O 1 2 0 -
-R S 1965 o - S 30 2 0 -
-R S 1966 o - Ap 24 2 1 S
-R S 1966 1976 - O 1 2 0 -
-R S 1967 1978 - May 1 2 1 S
-R S 1977 1978 - S 1 2 0 -
-R S 1983 1984 - Ap 9 2 1 S
-R S 1983 1984 - O 1 2 0 -
-R S 1986 o - F 16 2 1 S
-R S 1986 o - O 9 2 0 -
-R S 1987 o - Mar 1 2 1 S
-R S 1987 1988 - O 31 2 0 -
-R S 1988 o - Mar 15 2 1 S
-R S 1989 o - Mar 31 2 1 S
-R S 1989 o - O 1 2 0 -
-R S 1990 o - Ap 1 2 1 S
-R S 1990 o - S 30 2 0 -
-R S 1991 o - Ap 1 0 1 S
-R S 1991 1992 - O 1 0 0 -
-R S 1992 o - Ap 8 0 1 S
-R S 1993 o - Mar 26 0 1 S
-R S 1993 o - S 25 0 0 -
-R S 1994 1996 - Ap 1 0 1 S
-R S 1994 2005 - O 1 0 0 -
-R S 1997 1998 - Mar lastM 0 1 S
-R S 1999 2006 - Ap 1 0 1 S
-R S 2006 o - S 22 0 0 -
-R S 2007 o - Mar lastF 0 1 S
-R S 2007 o - N F>=1 0 0 -
-R S 2008 o - Ap F>=1 0 1 S
-R S 2008 o - N 1 0 0 -
-R S 2009 o - Mar lastF 0 1 S
-R S 2010 2011 - Ap F>=1 0 1 S
-R S 2012 2022 - Mar lastF 0 1 S
-R S 2009 2022 - O lastF 0 0 -
-R AU 1917 o - Ja 1 2s 1 D
-R AU 1917 o - Mar lastSu 2s 0 S
-R AU 1942 o - Ja 1 2s 1 D
-R AU 1942 o - Mar lastSu 2s 0 S
-R AU 1942 o - S 27 2s 1 D
-R AU 1943 1944 - Mar lastSu 2s 0 S
-R AU 1943 o - O 3 2s 1 D
-R AW 1974 o - O lastSu 2s 1 D
-R AW 1975 o - Mar Su>=1 2s 0 S
-R AW 1983 o - O lastSu 2s 1 D
-R AW 1984 o - Mar Su>=1 2s 0 S
-R AW 1991 o - N 17 2s 1 D
-R AW 1992 o - Mar Su>=1 2s 0 S
-R AW 2006 o - D 3 2s 1 D
-R AW 2007 2009 - Mar lastSu 2s 0 S
-R AW 2007 2008 - O lastSu 2s 1 D
-R AQ 1971 o - O lastSu 2s 1 D
-R AQ 1972 o - F lastSu 2s 0 S
-R AQ 1989 1991 - O lastSu 2s 1 D
-R AQ 1990 1992 - Mar Su>=1 2s 0 S
-R Ho 1992 1993 - O lastSu 2s 1 D
-R Ho 1993 1994 - Mar Su>=1 2s 0 S
-R AS 1971 1985 - O lastSu 2s 1 D
-R AS 1986 o - O 19 2s 1 D
-R AS 1987 2007 - O lastSu 2s 1 D
-R AS 1972 o - F 27 2s 0 S
-R AS 1973 1985 - Mar Su>=1 2s 0 S
-R AS 1986 1990 - Mar Su>=15 2s 0 S
-R AS 1991 o - Mar 3 2s 0 S
-R AS 1992 o - Mar 22 2s 0 S
-R AS 1993 o - Mar 7 2s 0 S
-R AS 1994 o - Mar 20 2s 0 S
-R AS 1995 2005 - Mar lastSu 2s 0 S
-R AS 2006 o - Ap 2 2s 0 S
-R AS 2007 o - Mar lastSu 2s 0 S
-R AS 2008 ma - Ap Su>=1 2s 0 S
-R AS 2008 ma - O Su>=1 2s 1 D
-R AT 1916 o - O Su>=1 2s 1 D
-R AT 1917 o - Mar lastSu 2s 0 S
-R AT 1917 1918 - O Su>=22 2s 1 D
-R AT 1918 1919 - Mar Su>=1 2s 0 S
-R AT 1967 o - O Su>=1 2s 1 D
-R AT 1968 o - Mar Su>=29 2s 0 S
-R AT 1968 1985 - O lastSu 2s 1 D
-R AT 1969 1971 - Mar Su>=8 2s 0 S
-R AT 1972 o - F lastSu 2s 0 S
-R AT 1973 1981 - Mar Su>=1 2s 0 S
-R AT 1982 1983 - Mar lastSu 2s 0 S
-R AT 1984 1986 - Mar Su>=1 2s 0 S
-R AT 1986 o - O Su>=15 2s 1 D
-R AT 1987 1990 - Mar Su>=15 2s 0 S
-R AT 1987 o - O Su>=22 2s 1 D
-R AT 1988 1990 - O lastSu 2s 1 D
-R AT 1991 1999 - O Su>=1 2s 1 D
-R AT 1991 2005 - Mar lastSu 2s 0 S
-R AT 2000 o - Au lastSu 2s 1 D
-R AT 2001 ma - O Su>=1 2s 1 D
-R AT 2006 o - Ap Su>=1 2s 0 S
-R AT 2007 o - Mar lastSu 2s 0 S
-R AT 2008 ma - Ap Su>=1 2s 0 S
-R AV 1971 1985 - O lastSu 2s 1 D
-R AV 1972 o - F lastSu 2s 0 S
-R AV 1973 1985 - Mar Su>=1 2s 0 S
-R AV 1986 1990 - Mar Su>=15 2s 0 S
-R AV 1986 1987 - O Su>=15 2s 1 D
-R AV 1988 1999 - O lastSu 2s 1 D
-R AV 1991 1994 - Mar Su>=1 2s 0 S
-R AV 1995 2005 - Mar lastSu 2s 0 S
-R AV 2000 o - Au lastSu 2s 1 D
-R AV 2001 2007 - O lastSu 2s 1 D
-R AV 2006 o - Ap Su>=1 2s 0 S
-R AV 2007 o - Mar lastSu 2s 0 S
-R AV 2008 ma - Ap Su>=1 2s 0 S
-R AV 2008 ma - O Su>=1 2s 1 D
-R AN 1971 1985 - O lastSu 2s 1 D
-R AN 1972 o - F 27 2s 0 S
-R AN 1973 1981 - Mar Su>=1 2s 0 S
-R AN 1982 o - Ap Su>=1 2s 0 S
-R AN 1983 1985 - Mar Su>=1 2s 0 S
-R AN 1986 1989 - Mar Su>=15 2s 0 S
-R AN 1986 o - O 19 2s 1 D
-R AN 1987 1999 - O lastSu 2s 1 D
-R AN 1990 1995 - Mar Su>=1 2s 0 S
-R AN 1996 2005 - Mar lastSu 2s 0 S
-R AN 2000 o - Au lastSu 2s 1 D
-R AN 2001 2007 - O lastSu 2s 1 D
-R AN 2006 o - Ap Su>=1 2s 0 S
-R AN 2007 o - Mar lastSu 2s 0 S
-R AN 2008 ma - Ap Su>=1 2s 0 S
-R AN 2008 ma - O Su>=1 2s 1 D
-R LH 1981 1984 - O lastSu 2 1 -
-R LH 1982 1985 - Mar Su>=1 2 0 -
-R LH 1985 o - O lastSu 2 0:30 -
-R LH 1986 1989 - Mar Su>=15 2 0 -
-R LH 1986 o - O 19 2 0:30 -
-R LH 1987 1999 - O lastSu 2 0:30 -
-R LH 1990 1995 - Mar Su>=1 2 0 -
-R LH 1996 2005 - Mar lastSu 2 0 -
-R LH 2000 o - Au lastSu 2 0:30 -
-R LH 2001 2007 - O lastSu 2 0:30 -
-R LH 2006 o - Ap Su>=1 2 0 -
-R LH 2007 o - Mar lastSu 2 0 -
-R LH 2008 ma - Ap Su>=1 2 0 -
-R LH 2008 ma - O Su>=1 2 0:30 -
-R FJ 1998 1999 - N Su>=1 2 1 -
-R FJ 1999 2000 - F lastSu 3 0 -
-R FJ 2009 o - N 29 2 1 -
-R FJ 2010 o - Mar lastSu 3 0 -
-R FJ 2010 2013 - O Su>=21 2 1 -
-R FJ 2011 o - Mar Su>=1 3 0 -
-R FJ 2012 2013 - Ja Su>=18 3 0 -
-R FJ 2014 o - Ja Su>=18 2 0 -
-R FJ 2014 2018 - N Su>=1 2 1 -
-R FJ 2015 2021 - Ja Su>=12 3 0 -
-R FJ 2019 o - N Su>=8 2 1 -
-R FJ 2020 o - D 20 2 1 -
-R Gu 1959 o - Jun 27 2 1 D
-R Gu 1961 o - Ja 29 2 0 S
-R Gu 1967 o - S 1 2 1 D
-R Gu 1969 o - Ja 26 0:1 0 S
-R Gu 1969 o - Jun 22 2 1 D
-R Gu 1969 o - Au 31 2 0 S
-R Gu 1970 1971 - Ap lastSu 2 1 D
-R Gu 1970 1971 - S Su>=1 2 0 S
-R Gu 1973 o - D 16 2 1 D
-R Gu 1974 o - F 24 2 0 S
-R Gu 1976 o - May 26 2 1 D
-R Gu 1976 o - Au 22 2:1 0 S
-R Gu 1977 o - Ap 24 2 1 D
-R Gu 1977 o - Au 28 2 0 S
-R NC 1977 1978 - D Su>=1 0 1 -
-R NC 1978 1979 - F 27 0 0 -
-R NC 1996 o - D 1 2s 1 -
-R NC 1997 o - Mar 2 2s 0 -
-R NZ 1927 o - N 6 2 1 S
-R NZ 1928 o - Mar 4 2 0 M
-R NZ 1928 1933 - O Su>=8 2 0:30 S
-R NZ 1929 1933 - Mar Su>=15 2 0 M
-R NZ 1934 1940 - Ap lastSu 2 0 M
-R NZ 1934 1940 - S lastSu 2 0:30 S
-R NZ 1946 o - Ja 1 0 0 S
-R NZ 1974 o - N Su>=1 2s 1 D
-R k 1974 o - N Su>=1 2:45s 1 -
-R NZ 1975 o - F lastSu 2s 0 S
-R k 1975 o - F lastSu 2:45s 0 -
-R NZ 1975 1988 - O lastSu 2s 1 D
-R k 1975 1988 - O lastSu 2:45s 1 -
-R NZ 1976 1989 - Mar Su>=1 2s 0 S
-R k 1976 1989 - Mar Su>=1 2:45s 0 -
-R NZ 1989 o - O Su>=8 2s 1 D
-R k 1989 o - O Su>=8 2:45s 1 -
-R NZ 1990 2006 - O Su>=1 2s 1 D
-R k 1990 2006 - O Su>=1 2:45s 1 -
-R NZ 1990 2007 - Mar Su>=15 2s 0 S
-R k 1990 2007 - Mar Su>=15 2:45s 0 -
-R NZ 2007 ma - S lastSu 2s 1 D
-R k 2007 ma - S lastSu 2:45s 1 -
-R NZ 2008 ma - Ap Su>=1 2s 0 S
-R k 2008 ma - Ap Su>=1 2:45s 0 -
-R CK 1978 o - N 12 0 0:30 -
-R CK 1979 1991 - Mar Su>=1 0 0 -
-R CK 1979 1990 - O lastSu 0 0:30 -
-R WS 2010 o - S lastSu 0 1 -
-R WS 2011 o - Ap Sa>=1 4 0 -
-R WS 2011 o - S lastSa 3 1 -
-R WS 2012 2021 - Ap Su>=1 4 0 -
-R WS 2012 2020 - S lastSu 3 1 -
-R TO 1999 o - O 7 2s 1 -
-R TO 2000 o - Mar 19 2s 0 -
-R TO 2000 2001 - N Su>=1 2 1 -
-R TO 2001 2002 - Ja lastSu 2 0 -
-R TO 2016 o - N Su>=1 2 1 -
-R TO 2017 o - Ja Su>=15 3 0 -
-R VU 1973 o - D 22 12u 1 -
-R VU 1974 o - Mar 30 12u 0 -
-R VU 1983 1991 - S Sa>=22 24 1 -
-R VU 1984 1991 - Mar Sa>=22 24 0 -
-R VU 1992 1993 - Ja Sa>=22 24 0 -
-R VU 1992 o - O Sa>=22 24 1 -
-R G 1916 o - May 21 2s 1 BST
-R G 1916 o - O 1 2s 0 GMT
-R G 1917 o - Ap 8 2s 1 BST
-R G 1917 o - S 17 2s 0 GMT
-R G 1918 o - Mar 24 2s 1 BST
-R G 1918 o - S 30 2s 0 GMT
-R G 1919 o - Mar 30 2s 1 BST
-R G 1919 o - S 29 2s 0 GMT
-R G 1920 o - Mar 28 2s 1 BST
-R G 1920 o - O 25 2s 0 GMT
-R G 1921 o - Ap 3 2s 1 BST
-R G 1921 o - O 3 2s 0 GMT
-R G 1922 o - Mar 26 2s 1 BST
-R G 1922 o - O 8 2s 0 GMT
-R G 1923 o - Ap Su>=16 2s 1 BST
-R G 1923 1924 - S Su>=16 2s 0 GMT
-R G 1924 o - Ap Su>=9 2s 1 BST
-R G 1925 1926 - Ap Su>=16 2s 1 BST
-R G 1925 1938 - O Su>=2 2s 0 GMT
-R G 1927 o - Ap Su>=9 2s 1 BST
-R G 1928 1929 - Ap Su>=16 2s 1 BST
-R G 1930 o - Ap Su>=9 2s 1 BST
-R G 1931 1932 - Ap Su>=16 2s 1 BST
-R G 1933 o - Ap Su>=9 2s 1 BST
-R G 1934 o - Ap Su>=16 2s 1 BST
-R G 1935 o - Ap Su>=9 2s 1 BST
-R G 1936 1937 - Ap Su>=16 2s 1 BST
-R G 1938 o - Ap Su>=9 2s 1 BST
-R G 1939 o - Ap Su>=16 2s 1 BST
-R G 1939 o - N Su>=16 2s 0 GMT
-R G 1940 o - F Su>=23 2s 1 BST
-R G 1941 o - May Su>=2 1s 2 BDST
-R G 1941 1943 - Au Su>=9 1s 1 BST
-R G 1942 1944 - Ap Su>=2 1s 2 BDST
-R G 1944 o - S Su>=16 1s 1 BST
-R G 1945 o - Ap M>=2 1s 2 BDST
-R G 1945 o - Jul Su>=9 1s 1 BST
-R G 1945 1946 - O Su>=2 2s 0 GMT
-R G 1946 o - Ap Su>=9 2s 1 BST
-R G 1947 o - Mar 16 2s 1 BST
-R G 1947 o - Ap 13 1s 2 BDST
-R G 1947 o - Au 10 1s 1 BST
-R G 1947 o - N 2 2s 0 GMT
-R G 1948 o - Mar 14 2s 1 BST
-R G 1948 o - O 31 2s 0 GMT
-R G 1949 o - Ap 3 2s 1 BST
-R G 1949 o - O 30 2s 0 GMT
-R G 1950 1952 - Ap Su>=14 2s 1 BST
-R G 1950 1952 - O Su>=21 2s 0 GMT
-R G 1953 o - Ap Su>=16 2s 1 BST
-R G 1953 1960 - O Su>=2 2s 0 GMT
-R G 1954 o - Ap Su>=9 2s 1 BST
-R G 1955 1956 - Ap Su>=16 2s 1 BST
-R G 1957 o - Ap Su>=9 2s 1 BST
-R G 1958 1959 - Ap Su>=16 2s 1 BST
-R G 1960 o - Ap Su>=9 2s 1 BST
-R G 1961 1963 - Mar lastSu 2s 1 BST
-R G 1961 1968 - O Su>=23 2s 0 GMT
-R G 1964 1967 - Mar Su>=19 2s 1 BST
-R G 1968 o - F 18 2s 1 BST
-R G 1972 1980 - Mar Su>=16 2s 1 BST
-R G 1972 1980 - O Su>=23 2s 0 GMT
-R G 1981 1995 - Mar lastSu 1u 1 BST
-R G 1981 1989 - O Su>=23 1u 0 GMT
-R G 1990 1995 - O Su>=22 1u 0 GMT
-R IE 1971 o - O 31 2u -1 -
-R IE 1972 1980 - Mar Su>=16 2u 0 -
-R IE 1972 1980 - O Su>=23 2u -1 -
-R IE 1981 ma - Mar lastSu 1u 0 -
-R IE 1981 1989 - O Su>=23 1u -1 -
-R IE 1990 1995 - O Su>=22 1u -1 -
-R IE 1996 ma - O lastSu 1u -1 -
-R E 1977 1980 - Ap Su>=1 1u 1 S
-R E 1977 o - S lastSu 1u 0 -
-R E 1978 o - O 1 1u 0 -
-R E 1979 1995 - S lastSu 1u 0 -
-R E 1981 ma - Mar lastSu 1u 1 S
-R E 1996 ma - O lastSu 1u 0 -
-R W- 1977 1980 - Ap Su>=1 1s 1 S
-R W- 1977 o - S lastSu 1s 0 -
-R W- 1978 o - O 1 1s 0 -
-R W- 1979 1995 - S lastSu 1s 0 -
-R W- 1981 ma - Mar lastSu 1s 1 S
-R W- 1996 ma - O lastSu 1s 0 -
-R c 1916 o - Ap 30 23 1 S
-R c 1916 o - O 1 1 0 -
-R c 1917 1918 - Ap M>=15 2s 1 S
-R c 1917 1918 - S M>=15 2s 0 -
-R c 1940 o - Ap 1 2s 1 S
-R c 1942 o - N 2 2s 0 -
-R c 1943 o - Mar 29 2s 1 S
-R c 1943 o - O 4 2s 0 -
-R c 1944 1945 - Ap M>=1 2s 1 S
-R c 1944 o - O 2 2s 0 -
-R c 1945 o - S 16 2s 0 -
-R c 1977 1980 - Ap Su>=1 2s 1 S
-R c 1977 o - S lastSu 2s 0 -
-R c 1978 o - O 1 2s 0 -
-R c 1979 1995 - S lastSu 2s 0 -
-R c 1981 ma - Mar lastSu 2s 1 S
-R c 1996 ma - O lastSu 2s 0 -
-R e 1977 1980 - Ap Su>=1 0 1 S
-R e 1977 o - S lastSu 0 0 -
-R e 1978 o - O 1 0 0 -
-R e 1979 1995 - S lastSu 0 0 -
-R e 1981 ma - Mar lastSu 0 1 S
-R e 1996 ma - O lastSu 0 0 -
-R R 1917 o - Jul 1 23 1 MST
-R R 1917 o - D 28 0 0 MMT
-R R 1918 o - May 31 22 2 MDST
-R R 1918 o - S 16 1 1 MST
-R R 1919 o - May 31 23 2 MDST
-R R 1919 o - Jul 1 0u 1 MSD
-R R 1919 o - Au 16 0 0 MSK
-R R 1921 o - F 14 23 1 MSD
-R R 1921 o - Mar 20 23 2 +05
-R R 1921 o - S 1 0 1 MSD
-R R 1921 o - O 1 0 0 -
-R R 1981 1984 - Ap 1 0 1 S
-R R 1981 1983 - O 1 0 0 -
-R R 1984 1995 - S lastSu 2s 0 -
-R R 1985 2010 - Mar lastSu 2s 1 S
-R R 1996 2010 - O lastSu 2s 0 -
-R q 1940 o - Jun 16 0 1 S
-R q 1942 o - N 2 3 0 -
-R q 1943 o - Mar 29 2 1 S
-R q 1943 o - Ap 10 3 0 -
-R q 1974 o - May 4 0 1 S
-R q 1974 o - O 2 0 0 -
-R q 1975 o - May 1 0 1 S
-R q 1975 o - O 2 0 0 -
-R q 1976 o - May 2 0 1 S
-R q 1976 o - O 3 0 0 -
-R q 1977 o - May 8 0 1 S
-R q 1977 o - O 2 0 0 -
-R q 1978 o - May 6 0 1 S
-R q 1978 o - O 1 0 0 -
-R q 1979 o - May 5 0 1 S
-R q 1979 o - S 30 0 0 -
-R q 1980 o - May 3 0 1 S
-R q 1980 o - O 4 0 0 -
-R q 1981 o - Ap 26 0 1 S
-R q 1981 o - S 27 0 0 -
-R q 1982 o - May 2 0 1 S
-R q 1982 o - O 3 0 0 -
-R q 1983 o - Ap 18 0 1 S
-R q 1983 o - O 1 0 0 -
-R q 1984 o - Ap 1 0 1 S
-R a 1920 o - Ap 5 2s 1 S
-R a 1920 o - S 13 2s 0 -
-R a 1946 o - Ap 14 2s 1 S
-R a 1946 o - O 7 2s 0 -
-R a 1947 1948 - O Su>=1 2s 0 -
-R a 1947 o - Ap 6 2s 1 S
-R a 1948 o - Ap 18 2s 1 S
-R a 1980 o - Ap 6 0 1 S
-R a 1980 o - S 28 0 0 -
-R b 1918 o - Mar 9 0s 1 S
-R b 1918 1919 - O Sa>=1 23s 0 -
-R b 1919 o - Mar 1 23s 1 S
-R b 1920 o - F 14 23s 1 S
-R b 1920 o - O 23 23s 0 -
-R b 1921 o - Mar 14 23s 1 S
-R b 1921 o - O 25 23s 0 -
-R b 1922 o - Mar 25 23s 1 S
-R b 1922 1927 - O Sa>=1 23s 0 -
-R b 1923 o - Ap 21 23s 1 S
-R b 1924 o - Mar 29 23s 1 S
-R b 1925 o - Ap 4 23s 1 S
-R b 1926 o - Ap 17 23s 1 S
-R b 1927 o - Ap 9 23s 1 S
-R b 1928 o - Ap 14 23s 1 S
-R b 1928 1938 - O Su>=2 2s 0 -
-R b 1929 o - Ap 21 2s 1 S
-R b 1930 o - Ap 13 2s 1 S
-R b 1931 o - Ap 19 2s 1 S
-R b 1932 o - Ap 3 2s 1 S
-R b 1933 o - Mar 26 2s 1 S
-R b 1934 o - Ap 8 2s 1 S
-R b 1935 o - Mar 31 2s 1 S
-R b 1936 o - Ap 19 2s 1 S
-R b 1937 o - Ap 4 2s 1 S
-R b 1938 o - Mar 27 2s 1 S
-R b 1939 o - Ap 16 2s 1 S
-R b 1939 o - N 19 2s 0 -
-R b 1940 o - F 25 2s 1 S
-R b 1944 o - S 17 2s 0 -
-R b 1945 o - Ap 2 2s 1 S
-R b 1945 o - S 16 2s 0 -
-R b 1946 o - May 19 2s 1 S
-R b 1946 o - O 7 2s 0 -
-R BG 1979 o - Mar 31 23 1 S
-R BG 1979 o - O 1 1 0 -
-R BG 1980 1982 - Ap Sa>=1 23 1 S
-R BG 1980 o - S 29 1 0 -
-R BG 1981 o - S 27 2 0 -
-R CZ 1945 o - Ap M>=1 2s 1 S
-R CZ 1945 o - O 1 2s 0 -
-R CZ 1946 o - May 6 2s 1 S
-R CZ 1946 1949 - O Su>=1 2s 0 -
-R CZ 1947 1948 - Ap Su>=15 2s 1 S
-R CZ 1949 o - Ap 9 2s 1 S
-R Th 1991 1992 - Mar lastSu 2 1 D
-R Th 1991 1992 - S lastSu 2 0 S
-R Th 1993 2006 - Ap Su>=1 2 1 D
-R Th 1993 2006 - O lastSu 2 0 S
-R Th 2007 ma - Mar Su>=8 2 1 D
-R Th 2007 ma - N Su>=1 2 0 S
-R FI 1942 o - Ap 2 24 1 S
-R FI 1942 o - O 4 1 0 -
-R FI 1981 1982 - Mar lastSu 2 1 S
-R FI 1981 1982 - S lastSu 3 0 -
-R F 1916 o - Jun 14 23s 1 S
-R F 1916 1919 - O Su>=1 23s 0 -
-R F 1917 o - Mar 24 23s 1 S
-R F 1918 o - Mar 9 23s 1 S
-R F 1919 o - Mar 1 23s 1 S
-R F 1920 o - F 14 23s 1 S
-R F 1920 o - O 23 23s 0 -
-R F 1921 o - Mar 14 23s 1 S
-R F 1921 o - O 25 23s 0 -
-R F 1922 o - Mar 25 23s 1 S
-R F 1922 1938 - O Sa>=1 23s 0 -
-R F 1923 o - May 26 23s 1 S
-R F 1924 o - Mar 29 23s 1 S
-R F 1925 o - Ap 4 23s 1 S
-R F 1926 o - Ap 17 23s 1 S
-R F 1927 o - Ap 9 23s 1 S
-R F 1928 o - Ap 14 23s 1 S
-R F 1929 o - Ap 20 23s 1 S
-R F 1930 o - Ap 12 23s 1 S
-R F 1931 o - Ap 18 23s 1 S
-R F 1932 o - Ap 2 23s 1 S
-R F 1933 o - Mar 25 23s 1 S
-R F 1934 o - Ap 7 23s 1 S
-R F 1935 o - Mar 30 23s 1 S
-R F 1936 o - Ap 18 23s 1 S
-R F 1937 o - Ap 3 23s 1 S
-R F 1938 o - Mar 26 23s 1 S
-R F 1939 o - Ap 15 23s 1 S
-R F 1939 o - N 18 23s 0 -
-R F 1940 o - F 25 2 1 S
-R F 1941 o - May 5 0 2 M
-R F 1941 o - O 6 0 1 S
-R F 1942 o - Mar 9 0 2 M
-R F 1942 o - N 2 3 1 S
-R F 1943 o - Mar 29 2 2 M
-R F 1943 o - O 4 3 1 S
-R F 1944 o - Ap 3 2 2 M
-R F 1944 o - O 8 1 1 S
-R F 1945 o - Ap 2 2 2 M
-R F 1945 o - S 16 3 0 -
-R F 1976 o - Mar 28 1 1 S
-R F 1976 o - S 26 1 0 -
-R DE 1946 o - Ap 14 2s 1 S
-R DE 1946 o - O 7 2s 0 -
-R DE 1947 1949 - O Su>=1 2s 0 -
-R DE 1947 o - Ap 6 3s 1 S
-R DE 1947 o - May 11 2s 2 M
-R DE 1947 o - Jun 29 3 1 S
-R DE 1948 o - Ap 18 2s 1 S
-R DE 1949 o - Ap 10 2s 1 S
-R So 1945 o - May 24 2 2 M
-R So 1945 o - S 24 3 1 S
-R So 1945 o - N 18 2s 0 -
-R g 1932 o - Jul 7 0 1 S
-R g 1932 o - S 1 0 0 -
-R g 1941 o - Ap 7 0 1 S
-R g 1942 o - N 2 3 0 -
-R g 1943 o - Mar 30 0 1 S
-R g 1943 o - O 4 0 0 -
-R g 1952 o - Jul 1 0 1 S
-R g 1952 o - N 2 0 0 -
-R g 1975 o - Ap 12 0s 1 S
-R g 1975 o - N 26 0s 0 -
-R g 1976 o - Ap 11 2s 1 S
-R g 1976 o - O 10 2s 0 -
-R g 1977 1978 - Ap Su>=1 2s 1 S
-R g 1977 o - S 26 2s 0 -
-R g 1978 o - S 24 4 0 -
-R g 1979 o - Ap 1 9 1 S
-R g 1979 o - S 29 2 0 -
-R g 1980 o - Ap 1 0 1 S
-R g 1980 o - S 28 0 0 -
-R h 1918 1919 - Ap 15 2 1 S
-R h 1918 1920 - S M>=15 3 0 -
-R h 1920 o - Ap 5 2 1 S
-R h 1945 o - May 1 23 1 S
-R h 1945 o - N 1 1 0 -
-R h 1946 o - Mar 31 2s 1 S
-R h 1946 o - O 7 2 0 -
-R h 1947 1949 - Ap Su>=4 2s 1 S
-R h 1947 1949 - O Su>=1 2s 0 -
-R h 1954 o - May 23 0 1 S
-R h 1954 o - O 3 0 0 -
-R h 1955 o - May 22 2 1 S
-R h 1955 o - O 2 3 0 -
-R h 1956 1957 - Jun Su>=1 2 1 S
-R h 1956 1957 - S lastSu 3 0 -
-R h 1980 o - Ap 6 0 1 S
-R h 1980 o - S 28 1 0 -
-R h 1981 1983 - Mar lastSu 0 1 S
-R h 1981 1983 - S lastSu 1 0 -
-R I 1916 o - Jun 3 24 1 S
-R I 1916 1917 - S 30 24 0 -
-R I 1917 o - Mar 31 24 1 S
-R I 1918 o - Mar 9 24 1 S
-R I 1918 o - O 6 24 0 -
-R I 1919 o - Mar 1 24 1 S
-R I 1919 o - O 4 24 0 -
-R I 1920 o - Mar 20 24 1 S
-R I 1920 o - S 18 24 0 -
-R I 1940 o - Jun 14 24 1 S
-R I 1942 o - N 2 2s 0 -
-R I 1943 o - Mar 29 2s 1 S
-R I 1943 o - O 4 2s 0 -
-R I 1944 o - Ap 2 2s 1 S
-R I 1944 o - S 17 2s 0 -
-R I 1945 o - Ap 2 2 1 S
-R I 1945 o - S 15 1 0 -
-R I 1946 o - Mar 17 2s 1 S
-R I 1946 o - O 6 2s 0 -
-R I 1947 o - Mar 16 0s 1 S
-R I 1947 o - O 5 0s 0 -
-R I 1948 o - F 29 2s 1 S
-R I 1948 o - O 3 2s 0 -
-R I 1966 1968 - May Su>=22 0s 1 S
-R I 1966 o - S 24 24 0 -
-R I 1967 1969 - S Su>=22 0s 0 -
-R I 1969 o - Jun 1 0s 1 S
-R I 1970 o - May 31 0s 1 S
-R I 1970 o - S lastSu 0s 0 -
-R I 1971 1972 - May Su>=22 0s 1 S
-R I 1971 o - S lastSu 0s 0 -
-R I 1972 o - O 1 0s 0 -
-R I 1973 o - Jun 3 0s 1 S
-R I 1973 1974 - S lastSu 0s 0 -
-R I 1974 o - May 26 0s 1 S
-R I 1975 o - Jun 1 0s 1 S
-R I 1975 1977 - S lastSu 0s 0 -
-R I 1976 o - May 30 0s 1 S
-R I 1977 1979 - May Su>=22 0s 1 S
-R I 1978 o - O 1 0s 0 -
-R I 1979 o - S 30 0s 0 -
-R LV 1989 1996 - Mar lastSu 2s 1 S
-R LV 1989 1996 - S lastSu 2s 0 -
-R MT 1973 o - Mar 31 0s 1 S
-R MT 1973 o - S 29 0s 0 -
-R MT 1974 o - Ap 21 0s 1 S
-R MT 1974 o - S 16 0s 0 -
-R MT 1975 1979 - Ap Su>=15 2 1 S
-R MT 1975 1980 - S Su>=15 2 0 -
-R MT 1980 o - Mar 31 2 1 S
-R MD 1997 ma - Mar lastSu 2 1 S
-R MD 1997 ma - O lastSu 3 0 -
-R O 1918 1919 - S 16 2s 0 -
-R O 1919 o - Ap 15 2s 1 S
-R O 1944 o - Ap 3 2s 1 S
-R O 1944 o - O 4 2 0 -
-R O 1945 o - Ap 29 0 1 S
-R O 1945 o - N 1 0 0 -
-R O 1946 o - Ap 14 0s 1 S
-R O 1946 o - O 7 2s 0 -
-R O 1947 o - May 4 2s 1 S
-R O 1947 1949 - O Su>=1 2s 0 -
-R O 1948 o - Ap 18 2s 1 S
-R O 1949 o - Ap 10 2s 1 S
-R O 1957 o - Jun 2 1s 1 S
-R O 1957 1958 - S lastSu 1s 0 -
-R O 1958 o - Mar 30 1s 1 S
-R O 1959 o - May 31 1s 1 S
-R O 1959 1961 - O Su>=1 1s 0 -
-R O 1960 o - Ap 3 1s 1 S
-R O 1961 1964 - May lastSu 1s 1 S
-R O 1962 1964 - S lastSu 1s 0 -
-R p 1916 o - Jun 17 23 1 S
-R p 1916 o - N 1 1 0 -
-R p 1917 1921 - Mar 1 0 1 S
-R p 1917 1921 - O 14 24 0 -
-R p 1924 o - Ap 16 23s 1 S
-R p 1924 o - O 4 23s 0 -
-R p 1926 o - Ap 17 23s 1 S
-R p 1926 1929 - O Sa>=1 23s 0 -
-R p 1927 o - Ap 9 23s 1 S
-R p 1928 o - Ap 14 23s 1 S
-R p 1929 o - Ap 20 23s 1 S
-R p 1931 o - Ap 18 23s 1 S
-R p 1931 1932 - O Sa>=1 23s 0 -
-R p 1932 o - Ap 2 23s 1 S
-R p 1934 o - Ap 7 23s 1 S
-R p 1934 1938 - O Sa>=1 23s 0 -
-R p 1935 o - Mar 30 23s 1 S
-R p 1936 o - Ap 18 23s 1 S
-R p 1937 o - Ap 3 23s 1 S
-R p 1938 o - Mar 26 23s 1 S
-R p 1939 o - Ap 15 23s 1 S
-R p 1939 o - N 18 23s 0 -
-R p 1940 o - F 24 23s 1 S
-R p 1940 o - O 7 23s 0 -
-R p 1941 o - Ap 5 23s 1 S
-R p 1941 o - O 5 23s 0 -
-R p 1942 1945 - Mar Sa>=8 23s 1 S
-R p 1942 o - Ap 25 22s 2 M
-R p 1942 o - Au 15 22s 1 S
-R p 1942 1945 - O Sa>=24 23s 0 -
-R p 1943 o - Ap 17 22s 2 M
-R p 1943 1945 - Au Sa>=25 22s 1 S
-R p 1944 1945 - Ap Sa>=21 22s 2 M
-R p 1946 o - Ap Sa>=1 23s 1 S
-R p 1946 o - O Sa>=1 23s 0 -
-R p 1947 1966 - Ap Su>=1 2s 1 S
-R p 1947 1965 - O Su>=1 2s 0 -
-R p 1976 o - S lastSu 1 0 -
-R p 1977 o - Mar lastSu 0s 1 S
-R p 1977 o - S lastSu 0s 0 -
-R p 1978 1980 - Ap Su>=1 1s 1 S
-R p 1978 o - O 1 1s 0 -
-R p 1979 1980 - S lastSu 1s 0 -
-R p 1981 1986 - Mar lastSu 0s 1 S
-R p 1981 1985 - S lastSu 0s 0 -
-R z 1932 o - May 21 0s 1 S
-R z 1932 1939 - O Su>=1 0s 0 -
-R z 1933 1939 - Ap Su>=2 0s 1 S
-R z 1979 o - May 27 0 1 S
-R z 1979 o - S lastSu 0 0 -
-R z 1980 o - Ap 5 23 1 S
-R z 1980 o - S lastSu 1 0 -
-R z 1991 1993 - Mar lastSu 0s 1 S
-R z 1991 1993 - S lastSu 0s 0 -
-R s 1918 o - Ap 15 23 1 S
-R s 1918 1919 - O 6 24s 0 -
-R s 1919 o - Ap 6 23 1 S
-R s 1924 o - Ap 16 23 1 S
-R s 1924 o - O 4 24s 0 -
-R s 1926 o - Ap 17 23 1 S
-R s 1926 1929 - O Sa>=1 24s 0 -
-R s 1927 o - Ap 9 23 1 S
-R s 1928 o - Ap 15 0 1 S
-R s 1929 o - Ap 20 23 1 S
-R s 1937 o - Jun 16 23 1 S
-R s 1937 o - O 2 24s 0 -
-R s 1938 o - Ap 2 23 1 S
-R s 1938 o - Ap 30 23 2 M
-R s 1938 o - O 2 24 1 S
-R s 1939 o - O 7 24s 0 -
-R s 1942 o - May 2 23 1 S
-R s 1942 o - S 1 1 0 -
-R s 1943 1946 - Ap Sa>=13 23 1 S
-R s 1943 1944 - O Su>=1 1 0 -
-R s 1945 1946 - S lastSu 1 0 -
-R s 1949 o - Ap 30 23 1 S
-R s 1949 o - O 2 1 0 -
-R s 1974 1975 - Ap Sa>=12 23 1 S
-R s 1974 1975 - O Su>=1 1 0 -
-R s 1976 o - Mar 27 23 1 S
-R s 1976 1977 - S lastSu 1 0 -
-R s 1977 o - Ap 2 23 1 S
-R s 1978 o - Ap 2 2s 1 S
-R s 1978 o - O 1 2s 0 -
-R Sp 1967 o - Jun 3 12 1 S
-R Sp 1967 o - O 1 0 0 -
-R Sp 1974 o - Jun 24 0 1 S
-R Sp 1974 o - S 1 0 0 -
-R Sp 1976 1977 - May 1 0 1 S
-R Sp 1976 o - Au 1 0 0 -
-R Sp 1977 o - S 28 0 0 -
-R Sp 1978 o - Jun 1 0 1 S
-R Sp 1978 o - Au 4 0 0 -
-R CH 1941 1942 - May M>=1 1 1 S
-R CH 1941 1942 - O M>=1 2 0 -
-R T 1916 o - May 1 0 1 S
-R T 1916 o - O 1 0 0 -
-R T 1920 o - Mar 28 0 1 S
-R T 1920 o - O 25 0 0 -
-R T 1921 o - Ap 3 0 1 S
-R T 1921 o - O 3 0 0 -
-R T 1922 o - Mar 26 0 1 S
-R T 1922 o - O 8 0 0 -
-R T 1924 o - May 13 0 1 S
-R T 1924 1925 - O 1 0 0 -
-R T 1925 o - May 1 0 1 S
-R T 1940 o - Jul 1 0 1 S
-R T 1940 o - O 6 0 0 -
-R T 1940 o - D 1 0 1 S
-R T 1941 o - S 21 0 0 -
-R T 1942 o - Ap 1 0 1 S
-R T 1945 o - O 8 0 0 -
-R T 1946 o - Jun 1 0 1 S
-R T 1946 o - O 1 0 0 -
-R T 1947 1948 - Ap Su>=16 0 1 S
-R T 1947 1951 - O Su>=2 0 0 -
-R T 1949 o - Ap 10 0 1 S
-R T 1950 o - Ap 16 0 1 S
-R T 1951 o - Ap 22 0 1 S
-R T 1962 o - Jul 15 0 1 S
-R T 1963 o - O 30 0 0 -
-R T 1964 o - May 15 0 1 S
-R T 1964 o - O 1 0 0 -
-R T 1973 o - Jun 3 1 1 S
-R T 1973 1976 - O Su>=31 2 0 -
-R T 1974 o - Mar 31 2 1 S
-R T 1975 o - Mar 22 2 1 S
-R T 1976 o - Mar 21 2 1 S
-R T 1977 1978 - Ap Su>=1 2 1 S
-R T 1977 1978 - O Su>=15 2 0 -
-R T 1978 o - Jun 29 0 0 -
-R T 1983 o - Jul 31 2 1 S
-R T 1983 o - O 2 2 0 -
-R T 1985 o - Ap 20 1s 1 S
-R T 1985 o - S 28 1s 0 -
-R T 1986 1993 - Mar lastSu 1s 1 S
-R T 1986 1995 - S lastSu 1s 0 -
-R T 1994 o - Mar 20 1s 1 S
-R T 1995 2006 - Mar lastSu 1s 1 S
-R T 1996 2006 - O lastSu 1s 0 -
-R u 1918 1919 - Mar lastSu 2 1 D
-R u 1918 1919 - O lastSu 2 0 S
-R u 1942 o - F 9 2 1 W
-R u 1945 o - Au 14 23u 1 P
-R u 1945 o - S 30 2 0 S
-R u 1967 2006 - O lastSu 2 0 S
-R u 1967 1973 - Ap lastSu 2 1 D
-R u 1974 o - Ja 6 2 1 D
-R u 1975 o - F lastSu 2 1 D
-R u 1976 1986 - Ap lastSu 2 1 D
-R u 1987 2006 - Ap Su>=1 2 1 D
-R u 2007 ma - Mar Su>=8 2 1 D
-R u 2007 ma - N Su>=1 2 0 S
-R NY 1920 o - Mar lastSu 2 1 D
-R NY 1920 o - O lastSu 2 0 S
-R NY 1921 1966 - Ap lastSu 2 1 D
-R NY 1921 1954 - S lastSu 2 0 S
-R NY 1955 1966 - O lastSu 2 0 S
-R Ch 1920 o - Jun 13 2 1 D
-R Ch 1920 1921 - O lastSu 2 0 S
-R Ch 1921 o - Mar lastSu 2 1 D
-R Ch 1922 1966 - Ap lastSu 2 1 D
-R Ch 1922 1954 - S lastSu 2 0 S
-R Ch 1955 1966 - O lastSu 2 0 S
-R De 1920 1921 - Mar lastSu 2 1 D
-R De 1920 o - O lastSu 2 0 S
-R De 1921 o - May 22 2 0 S
-R De 1965 1966 - Ap lastSu 2 1 D
-R De 1965 1966 - O lastSu 2 0 S
-R CA 1948 o - Mar 14 2:1 1 D
-R CA 1949 o - Ja 1 2 0 S
-R CA 1950 1966 - Ap lastSu 1 1 D
-R CA 1950 1961 - S lastSu 2 0 S
-R CA 1962 1966 - O lastSu 2 0 S
-R In 1941 o - Jun 22 2 1 D
-R In 1941 1954 - S lastSu 2 0 S
-R In 1946 1954 - Ap lastSu 2 1 D
-R Ma 1951 o - Ap lastSu 2 1 D
-R Ma 1951 o - S lastSu 2 0 S
-R Ma 1954 1960 - Ap lastSu 2 1 D
-R Ma 1954 1960 - S lastSu 2 0 S
-R V 1946 o - Ap lastSu 2 1 D
-R V 1946 o - S lastSu 2 0 S
-R V 1953 1954 - Ap lastSu 2 1 D
-R V 1953 1959 - S lastSu 2 0 S
-R V 1955 o - May 1 0 1 D
-R V 1956 1963 - Ap lastSu 2 1 D
-R V 1960 o - O lastSu 2 0 S
-R V 1961 o - S lastSu 2 0 S
-R V 1962 1963 - O lastSu 2 0 S
-R Pe 1955 o - May 1 0 1 D
-R Pe 1955 1960 - S lastSu 2 0 S
-R Pe 1956 1963 - Ap lastSu 2 1 D
-R Pe 1961 1963 - O lastSu 2 0 S
-R Pi 1955 o - May 1 0 1 D
-R Pi 1955 1960 - S lastSu 2 0 S
-R Pi 1956 1964 - Ap lastSu 2 1 D
-R Pi 1961 1964 - O lastSu 2 0 S
-R St 1947 1961 - Ap lastSu 2 1 D
-R St 1947 1954 - S lastSu 2 0 S
-R St 1955 1956 - O lastSu 2 0 S
-R St 1957 1958 - S lastSu 2 0 S
-R St 1959 1961 - O lastSu 2 0 S
-R Pu 1946 1960 - Ap lastSu 2 1 D
-R Pu 1946 1954 - S lastSu 2 0 S
-R Pu 1955 1956 - O lastSu 2 0 S
-R Pu 1957 1960 - S lastSu 2 0 S
-R v 1921 o - May 1 2 1 D
-R v 1921 o - S 1 2 0 S
-R v 1941 o - Ap lastSu 2 1 D
-R v 1941 o - S lastSu 2 0 S
-R v 1946 o - Ap lastSu 0:1 1 D
-R v 1946 o - Jun 2 2 0 S
-R v 1950 1961 - Ap lastSu 2 1 D
-R v 1950 1955 - S lastSu 2 0 S
-R v 1956 1961 - O lastSu 2 0 S
-R Dt 1948 o - Ap lastSu 2 1 D
-R Dt 1948 o - S lastSu 2 0 S
-R Me 1946 o - Ap lastSu 2 1 D
-R Me 1946 o - S lastSu 2 0 S
-R Me 1966 o - Ap lastSu 2 1 D
-R Me 1966 o - O lastSu 2 0 S
-R C 1918 o - Ap 14 2 1 D
-R C 1918 o - O 27 2 0 S
-R C 1942 o - F 9 2 1 W
-R C 1945 o - Au 14 23u 1 P
-R C 1945 o - S 30 2 0 S
-R C 1974 1986 - Ap lastSu 2 1 D
-R C 1974 2006 - O lastSu 2 0 S
-R C 1987 2006 - Ap Su>=1 2 1 D
-R C 2007 ma - Mar Su>=8 2 1 D
-R C 2007 ma - N Su>=1 2 0 S
-R j 1917 o - Ap 8 2 1 D
-R j 1917 o - S 17 2 0 S
-R j 1919 o - May 5 23 1 D
-R j 1919 o - Au 12 23 0 S
-R j 1920 1935 - May Su>=1 23 1 D
-R j 1920 1935 - O lastSu 23 0 S
-R j 1936 1941 - May M>=9 0 1 D
-R j 1936 1941 - O M>=2 0 0 S
-R j 1946 1950 - May Su>=8 2 1 D
-R j 1946 1950 - O Su>=2 2 0 S
-R j 1951 1986 - Ap lastSu 2 1 D
-R j 1951 1959 - S lastSu 2 0 S
-R j 1960 1986 - O lastSu 2 0 S
-R j 1987 o - Ap Su>=1 0:1 1 D
-R j 1987 2006 - O lastSu 0:1 0 S
-R j 1988 o - Ap Su>=1 0:1 2 DD
-R j 1989 2006 - Ap Su>=1 0:1 1 D
-R j 2007 2011 - Mar Su>=8 0:1 1 D
-R j 2007 2010 - N Su>=1 0:1 0 S
-R H 1916 o - Ap 1 0 1 D
-R H 1916 o - O 1 0 0 S
-R H 1920 o - May 9 0 1 D
-R H 1920 o - Au 29 0 0 S
-R H 1921 o - May 6 0 1 D
-R H 1921 1922 - S 5 0 0 S
-R H 1922 o - Ap 30 0 1 D
-R H 1923 1925 - May Su>=1 0 1 D
-R H 1923 o - S 4 0 0 S
-R H 1924 o - S 15 0 0 S
-R H 1925 o - S 28 0 0 S
-R H 1926 o - May 16 0 1 D
-R H 1926 o - S 13 0 0 S
-R H 1927 o - May 1 0 1 D
-R H 1927 o - S 26 0 0 S
-R H 1928 1931 - May Su>=8 0 1 D
-R H 1928 o - S 9 0 0 S
-R H 1929 o - S 3 0 0 S
-R H 1930 o - S 15 0 0 S
-R H 1931 1932 - S M>=24 0 0 S
-R H 1932 o - May 1 0 1 D
-R H 1933 o - Ap 30 0 1 D
-R H 1933 o - O 2 0 0 S
-R H 1934 o - May 20 0 1 D
-R H 1934 o - S 16 0 0 S
-R H 1935 o - Jun 2 0 1 D
-R H 1935 o - S 30 0 0 S
-R H 1936 o - Jun 1 0 1 D
-R H 1936 o - S 14 0 0 S
-R H 1937 1938 - May Su>=1 0 1 D
-R H 1937 1941 - S M>=24 0 0 S
-R H 1939 o - May 28 0 1 D
-R H 1940 1941 - May Su>=1 0 1 D
-R H 1946 1949 - Ap lastSu 2 1 D
-R H 1946 1949 - S lastSu 2 0 S
-R H 1951 1954 - Ap lastSu 2 1 D
-R H 1951 1954 - S lastSu 2 0 S
-R H 1956 1959 - Ap lastSu 2 1 D
-R H 1956 1959 - S lastSu 2 0 S
-R H 1962 1973 - Ap lastSu 2 1 D
-R H 1962 1973 - O lastSu 2 0 S
-R o 1933 1935 - Jun Su>=8 1 1 D
-R o 1933 1935 - S Su>=8 1 0 S
-R o 1936 1938 - Jun Su>=1 1 1 D
-R o 1936 1938 - S Su>=1 1 0 S
-R o 1939 o - May 27 1 1 D
-R o 1939 1941 - S Sa>=21 1 0 S
-R o 1940 o - May 19 1 1 D
-R o 1941 o - May 4 1 1 D
-R o 1946 1972 - Ap lastSu 2 1 D
-R o 1946 1956 - S lastSu 2 0 S
-R o 1957 1972 - O lastSu 2 0 S
-R o 1993 2006 - Ap Su>=1 0:1 1 D
-R o 1993 2006 - O lastSu 0:1 0 S
-R t 1919 o - Mar 30 23:30 1 D
-R t 1919 o - O 26 0 0 S
-R t 1920 o - May 2 2 1 D
-R t 1920 o - S 26 0 0 S
-R t 1921 o - May 15 2 1 D
-R t 1921 o - S 15 2 0 S
-R t 1922 1923 - May Su>=8 2 1 D
-R t 1922 1926 - S Su>=15 2 0 S
-R t 1924 1927 - May Su>=1 2 1 D
-R t 1927 1937 - S Su>=25 2 0 S
-R t 1928 1937 - Ap Su>=25 2 1 D
-R t 1938 1940 - Ap lastSu 2 1 D
-R t 1938 1939 - S lastSu 2 0 S
-R t 1945 1948 - S lastSu 2 0 S
-R t 1946 1973 - Ap lastSu 2 1 D
-R t 1949 1950 - N lastSu 2 0 S
-R t 1951 1956 - S lastSu 2 0 S
-R t 1957 1973 - O lastSu 2 0 S
-R W 1916 o - Ap 23 0 1 D
-R W 1916 o - S 17 0 0 S
-R W 1918 o - Ap 14 2 1 D
-R W 1918 o - O 27 2 0 S
-R W 1937 o - May 16 2 1 D
-R W 1937 o - S 26 2 0 S
-R W 1942 o - F 9 2 1 W
-R W 1945 o - Au 14 23u 1 P
-R W 1945 o - S lastSu 2 0 S
-R W 1946 o - May 12 2 1 D
-R W 1946 o - O 13 2 0 S
-R W 1947 1949 - Ap lastSu 2 1 D
-R W 1947 1949 - S lastSu 2 0 S
-R W 1950 o - May 1 2 1 D
-R W 1950 o - S 30 2 0 S
-R W 1951 1960 - Ap lastSu 2 1 D
-R W 1951 1958 - S lastSu 2 0 S
-R W 1959 o - O lastSu 2 0 S
-R W 1960 o - S lastSu 2 0 S
-R W 1963 o - Ap lastSu 2 1 D
-R W 1963 o - S 22 2 0 S
-R W 1966 1986 - Ap lastSu 2s 1 D
-R W 1966 2005 - O lastSu 2s 0 S
-R W 1987 2005 - Ap Su>=1 2s 1 D
-R r 1918 o - Ap 14 2 1 D
-R r 1918 o - O 27 2 0 S
-R r 1930 1934 - May Su>=1 0 1 D
-R r 1930 1934 - O Su>=1 0 0 S
-R r 1937 1941 - Ap Su>=8 0 1 D
-R r 1937 o - O Su>=8 0 0 S
-R r 1938 o - O Su>=1 0 0 S
-R r 1939 1941 - O Su>=8 0 0 S
-R r 1942 o - F 9 2 1 W
-R r 1945 o - Au 14 23u 1 P
-R r 1945 o - S lastSu 2 0 S
-R r 1946 o - Ap Su>=8 2 1 D
-R r 1946 o - O Su>=8 2 0 S
-R r 1947 1957 - Ap lastSu 2 1 D
-R r 1947 1957 - S lastSu 2 0 S
-R r 1959 o - Ap lastSu 2 1 D
-R r 1959 o - O lastSu 2 0 S
-R Sw 1957 o - Ap lastSu 2 1 D
-R Sw 1957 o - O lastSu 2 0 S
-R Sw 1959 1961 - Ap lastSu 2 1 D
-R Sw 1959 o - O lastSu 2 0 S
-R Sw 1960 1961 - S lastSu 2 0 S
-R Ed 1918 1919 - Ap Su>=8 2 1 D
-R Ed 1918 o - O 27 2 0 S
-R Ed 1919 o - May 27 2 0 S
-R Ed 1920 1923 - Ap lastSu 2 1 D
-R Ed 1920 o - O lastSu 2 0 S
-R Ed 1921 1923 - S lastSu 2 0 S
-R Ed 1942 o - F 9 2 1 W
-R Ed 1945 o - Au 14 23u 1 P
-R Ed 1945 o - S lastSu 2 0 S
-R Ed 1947 o - Ap lastSu 2 1 D
-R Ed 1947 o - S lastSu 2 0 S
-R Ed 1972 1986 - Ap lastSu 2 1 D
-R Ed 1972 2006 - O lastSu 2 0 S
-R Va 1918 o - Ap 14 2 1 D
-R Va 1918 o - O 27 2 0 S
-R Va 1942 o - F 9 2 1 W
-R Va 1945 o - Au 14 23u 1 P
-R Va 1945 o - S 30 2 0 S
-R Va 1946 1986 - Ap lastSu 2 1 D
-R Va 1946 o - S 29 2 0 S
-R Va 1947 1961 - S lastSu 2 0 S
-R Va 1962 2006 - O lastSu 2 0 S
-R Y 1918 o - Ap 14 2 1 D
-R Y 1918 o - O 27 2 0 S
-R Y 1919 o - May 25 2 1 D
-R Y 1919 o - N 1 0 0 S
-R Y 1942 o - F 9 2 1 W
-R Y 1945 o - Au 14 23u 1 P
-R Y 1945 o - S 30 2 0 S
-R Y 1972 1986 - Ap lastSu 2 1 D
-R Y 1972 2006 - O lastSu 2 0 S
-R Y 1987 2006 - Ap Su>=1 2 1 D
-R Yu 1965 o - Ap lastSu 0 2 DD
-R Yu 1965 o - O lastSu 2 0 S
-R m 1931 o - April 30 0 1 D
-R m 1931 o - O 1 0 0 S
-R m 1939 o - F 5 0 1 D
-R m 1939 o - Jun 25 0 0 S
-R m 1940 o - D 9 0 1 D
-R m 1941 o - Ap 1 0 0 S
-R m 1943 o - D 16 0 1 W
-R m 1944 o - May 1 0 0 S
-R m 1950 o - F 12 0 1 D
-R m 1950 o - Jul 30 0 0 S
-R m 1996 2000 - Ap Su>=1 2 1 D
-R m 1996 2000 - O lastSu 2 0 S
-R m 2001 o - May Su>=1 2 1 D
-R m 2001 o - S lastSu 2 0 S
-R m 2002 2022 - Ap Su>=1 2 1 D
-R m 2002 2022 - O lastSu 2 0 S
-R BB 1942 o - Ap 19 5u 1 D
-R BB 1942 o - Au 31 6u 0 S
-R BB 1943 o - May 2 5u 1 D
-R BB 1943 o - S 5 6u 0 S
-R BB 1944 o - Ap 10 5u 0:30 -
-R BB 1944 o - S 10 6u 0 S
-R BB 1977 o - Jun 12 2 1 D
-R BB 1977 1978 - O Su>=1 2 0 S
-R BB 1978 1980 - Ap Su>=15 2 1 D
-R BB 1979 o - S 30 2 0 S
-R BB 1980 o - S 25 2 0 S
-R BZ 1918 1941 - O Sa>=1 24 0:30 -0530
-R BZ 1919 1942 - F Sa>=8 24 0 CST
-R BZ 1942 o - Jun 27 24 1 CWT
-R BZ 1945 o - Au 14 23u 1 CPT
-R BZ 1945 o - D 15 24 0 CST
-R BZ 1947 1967 - O Sa>=1 24 0:30 -0530
-R BZ 1948 1968 - F Sa>=8 24 0 CST
-R BZ 1973 o - D 5 0 1 CDT
-R BZ 1974 o - F 9 0 0 CST
-R BZ 1982 o - D 18 0 1 CDT
-R BZ 1983 o - F 12 0 0 CST
-R Be 1917 o - Ap 5 24 1 -
-R Be 1917 o - S 30 24 0 -
-R Be 1918 o - Ap 13 24 1 -
-R Be 1918 o - S 15 24 0 S
-R Be 1942 o - Ja 11 2 1 D
-R Be 1942 o - O 18 2 0 S
-R Be 1943 o - Mar 21 2 1 D
-R Be 1943 o - O 31 2 0 S
-R Be 1944 1945 - Mar Su>=8 2 1 D
-R Be 1944 1945 - N Su>=1 2 0 S
-R Be 1947 o - May Su>=15 2 1 D
-R Be 1947 o - S Su>=8 2 0 S
-R Be 1948 1952 - May Su>=22 2 1 D
-R Be 1948 1952 - S Su>=1 2 0 S
-R Be 1956 o - May Su>=22 2 1 D
-R Be 1956 o - O lastSu 2 0 S
-R CR 1979 1980 - F lastSu 0 1 D
-R CR 1979 1980 - Jun Su>=1 0 0 S
-R CR 1991 1992 - Ja Sa>=15 0 1 D
-R CR 1991 o - Jul 1 0 0 S
-R CR 1992 o - Mar 15 0 0 S
-R Q 1928 o - Jun 10 0 1 D
-R Q 1928 o - O 10 0 0 S
-R Q 1940 1942 - Jun Su>=1 0 1 D
-R Q 1940 1942 - S Su>=1 0 0 S
-R Q 1945 1946 - Jun Su>=1 0 1 D
-R Q 1945 1946 - S Su>=1 0 0 S
-R Q 1965 o - Jun 1 0 1 D
-R Q 1965 o - S 30 0 0 S
-R Q 1966 o - May 29 0 1 D
-R Q 1966 o - O 2 0 0 S
-R Q 1967 o - Ap 8 0 1 D
-R Q 1967 1968 - S Su>=8 0 0 S
-R Q 1968 o - Ap 14 0 1 D
-R Q 1969 1977 - Ap lastSu 0 1 D
-R Q 1969 1971 - O lastSu 0 0 S
-R Q 1972 1974 - O 8 0 0 S
-R Q 1975 1977 - O lastSu 0 0 S
-R Q 1978 o - May 7 0 1 D
-R Q 1978 1990 - O Su>=8 0 0 S
-R Q 1979 1980 - Mar Su>=15 0 1 D
-R Q 1981 1985 - May Su>=5 0 1 D
-R Q 1986 1989 - Mar Su>=14 0 1 D
-R Q 1990 1997 - Ap Su>=1 0 1 D
-R Q 1991 1995 - O Su>=8 0s 0 S
-R Q 1996 o - O 6 0s 0 S
-R Q 1997 o - O 12 0s 0 S
-R Q 1998 1999 - Mar lastSu 0s 1 D
-R Q 1998 2003 - O lastSu 0s 0 S
-R Q 2000 2003 - Ap Su>=1 0s 1 D
-R Q 2004 o - Mar lastSu 0s 1 D
-R Q 2006 2010 - O lastSu 0s 0 S
-R Q 2007 o - Mar Su>=8 0s 1 D
-R Q 2008 o - Mar Su>=15 0s 1 D
-R Q 2009 2010 - Mar Su>=8 0s 1 D
-R Q 2011 o - Mar Su>=15 0s 1 D
-R Q 2011 o - N 13 0s 0 S
-R Q 2012 o - Ap 1 0s 1 D
-R Q 2012 ma - N Su>=1 0s 0 S
-R Q 2013 ma - Mar Su>=8 0s 1 D
-R DO 1966 o - O 30 0 1 EDT
-R DO 1967 o - F 28 0 0 EST
-R DO 1969 1973 - O lastSu 0 0:30 -0430
-R DO 1970 o - F 21 0 0 EST
-R DO 1971 o - Ja 20 0 0 EST
-R DO 1972 1974 - Ja 21 0 0 EST
-R SV 1987 1988 - May Su>=1 0 1 D
-R SV 1987 1988 - S lastSu 0 0 S
-R GT 1973 o - N 25 0 1 D
-R GT 1974 o - F 24 0 0 S
-R GT 1983 o - May 21 0 1 D
-R GT 1983 o - S 22 0 0 S
-R GT 1991 o - Mar 23 0 1 D
-R GT 1991 o - S 7 0 0 S
-R GT 2006 o - Ap 30 0 1 D
-R GT 2006 o - O 1 0 0 S
-R HT 1983 o - May 8 0 1 D
-R HT 1984 1987 - Ap lastSu 0 1 D
-R HT 1983 1987 - O lastSu 0 0 S
-R HT 1988 1997 - Ap Su>=1 1s 1 D
-R HT 1988 1997 - O lastSu 1s 0 S
-R HT 2005 2006 - Ap Su>=1 0 1 D
-R HT 2005 2006 - O lastSu 0 0 S
-R HT 2012 2015 - Mar Su>=8 2 1 D
-R HT 2012 2015 - N Su>=1 2 0 S
-R HT 2017 ma - Mar Su>=8 2 1 D
-R HT 2017 ma - N Su>=1 2 0 S
-R HN 1987 1988 - May Su>=1 0 1 D
-R HN 1987 1988 - S lastSu 0 0 S
-R HN 2006 o - May Su>=1 0 1 D
-R HN 2006 o - Au M>=1 0 0 S
-R NI 1979 1980 - Mar Su>=16 0 1 D
-R NI 1979 1980 - Jun M>=23 0 0 S
-R NI 2005 o - Ap 10 0 1 D
-R NI 2005 o - O Su>=1 0 0 S
-R NI 2006 o - Ap 30 2 1 D
-R NI 2006 o - O Su>=1 1 0 S
-R A 1930 o - D 1 0 1 -
-R A 1931 o - Ap 1 0 0 -
-R A 1931 o - O 15 0 1 -
-R A 1932 1940 - Mar 1 0 0 -
-R A 1932 1939 - N 1 0 1 -
-R A 1940 o - Jul 1 0 1 -
-R A 1941 o - Jun 15 0 0 -
-R A 1941 o - O 15 0 1 -
-R A 1943 o - Au 1 0 0 -
-R A 1943 o - O 15 0 1 -
-R A 1946 o - Mar 1 0 0 -
-R A 1946 o - O 1 0 1 -
-R A 1963 o - O 1 0 0 -
-R A 1963 o - D 15 0 1 -
-R A 1964 1966 - Mar 1 0 0 -
-R A 1964 1966 - O 15 0 1 -
-R A 1967 o - Ap 2 0 0 -
-R A 1967 1968 - O Su>=1 0 1 -
-R A 1968 1969 - Ap Su>=1 0 0 -
-R A 1974 o - Ja 23 0 1 -
-R A 1974 o - May 1 0 0 -
-R A 1988 o - D 1 0 1 -
-R A 1989 1993 - Mar Su>=1 0 0 -
-R A 1989 1992 - O Su>=15 0 1 -
-R A 1999 o - O Su>=1 0 1 -
-R A 2000 o - Mar 3 0 0 -
-R A 2007 o - D 30 0 1 -
-R A 2008 2009 - Mar Su>=15 0 0 -
-R A 2008 o - O Su>=15 0 1 -
-R Sa 2008 2009 - Mar Su>=8 0 0 -
-R Sa 2007 2008 - O Su>=8 0 1 -
-R B 1931 o - O 3 11 1 -
-R B 1932 1933 - Ap 1 0 0 -
-R B 1932 o - O 3 0 1 -
-R B 1949 1952 - D 1 0 1 -
-R B 1950 o - Ap 16 1 0 -
-R B 1951 1952 - Ap 1 0 0 -
-R B 1953 o - Mar 1 0 0 -
-R B 1963 o - D 9 0 1 -
-R B 1964 o - Mar 1 0 0 -
-R B 1965 o - Ja 31 0 1 -
-R B 1965 o - Mar 31 0 0 -
-R B 1965 o - D 1 0 1 -
-R B 1966 1968 - Mar 1 0 0 -
-R B 1966 1967 - N 1 0 1 -
-R B 1985 o - N 2 0 1 -
-R B 1986 o - Mar 15 0 0 -
-R B 1986 o - O 25 0 1 -
-R B 1987 o - F 14 0 0 -
-R B 1987 o - O 25 0 1 -
-R B 1988 o - F 7 0 0 -
-R B 1988 o - O 16 0 1 -
-R B 1989 o - Ja 29 0 0 -
-R B 1989 o - O 15 0 1 -
-R B 1990 o - F 11 0 0 -
-R B 1990 o - O 21 0 1 -
-R B 1991 o - F 17 0 0 -
-R B 1991 o - O 20 0 1 -
-R B 1992 o - F 9 0 0 -
-R B 1992 o - O 25 0 1 -
-R B 1993 o - Ja 31 0 0 -
-R B 1993 1995 - O Su>=11 0 1 -
-R B 1994 1995 - F Su>=15 0 0 -
-R B 1996 o - F 11 0 0 -
-R B 1996 o - O 6 0 1 -
-R B 1997 o - F 16 0 0 -
-R B 1997 o - O 6 0 1 -
-R B 1998 o - Mar 1 0 0 -
-R B 1998 o - O 11 0 1 -
-R B 1999 o - F 21 0 0 -
-R B 1999 o - O 3 0 1 -
-R B 2000 o - F 27 0 0 -
-R B 2000 2001 - O Su>=8 0 1 -
-R B 2001 2006 - F Su>=15 0 0 -
-R B 2002 o - N 3 0 1 -
-R B 2003 o - O 19 0 1 -
-R B 2004 o - N 2 0 1 -
-R B 2005 o - O 16 0 1 -
-R B 2006 o - N 5 0 1 -
-R B 2007 o - F 25 0 0 -
-R B 2007 o - O Su>=8 0 1 -
-R B 2008 2017 - O Su>=15 0 1 -
-R B 2008 2011 - F Su>=15 0 0 -
-R B 2012 o - F Su>=22 0 0 -
-R B 2013 2014 - F Su>=15 0 0 -
-R B 2015 o - F Su>=22 0 0 -
-R B 2016 2019 - F Su>=15 0 0 -
-R B 2018 o - N Su>=1 0 1 -
-R x 1927 1931 - S 1 0 1 -
-R x 1928 1932 - Ap 1 0 0 -
-R x 1968 o - N 3 4u 1 -
-R x 1969 o - Mar 30 3u 0 -
-R x 1969 o - N 23 4u 1 -
-R x 1970 o - Mar 29 3u 0 -
-R x 1971 o - Mar 14 3u 0 -
-R x 1970 1972 - O Su>=9 4u 1 -
-R x 1972 1986 - Mar Su>=9 3u 0 -
-R x 1973 o - S 30 4u 1 -
-R x 1974 1987 - O Su>=9 4u 1 -
-R x 1987 o - Ap 12 3u 0 -
-R x 1988 1990 - Mar Su>=9 3u 0 -
-R x 1988 1989 - O Su>=9 4u 1 -
-R x 1990 o - S 16 4u 1 -
-R x 1991 1996 - Mar Su>=9 3u 0 -
-R x 1991 1997 - O Su>=9 4u 1 -
-R x 1997 o - Mar 30 3u 0 -
-R x 1998 o - Mar Su>=9 3u 0 -
-R x 1998 o - S 27 4u 1 -
-R x 1999 o - Ap 4 3u 0 -
-R x 1999 2010 - O Su>=9 4u 1 -
-R x 2000 2007 - Mar Su>=9 3u 0 -
-R x 2008 o - Mar 30 3u 0 -
-R x 2009 o - Mar Su>=9 3u 0 -
-R x 2010 o - Ap Su>=1 3u 0 -
-R x 2011 o - May Su>=2 3u 0 -
-R x 2011 o - Au Su>=16 4u 1 -
-R x 2012 2014 - Ap Su>=23 3u 0 -
-R x 2012 2014 - S Su>=2 4u 1 -
-R x 2016 2018 - May Su>=9 3u 0 -
-R x 2016 2018 - Au Su>=9 4u 1 -
-R x 2019 ma - Ap Su>=2 3u 0 -
-R x 2019 2021 - S Su>=2 4u 1 -
-R x 2022 o - S Su>=9 4u 1 -
-R x 2023 ma - S Su>=2 4u 1 -
-R CO 1992 o - May 3 0 1 -
-R CO 1993 o - F 6 24 0 -
-R EC 1992 o - N 28 0 1 -
-R EC 1993 o - F 5 0 0 -
-R FK 1937 1938 - S lastSu 0 1 -
-R FK 1938 1942 - Mar Su>=19 0 0 -
-R FK 1939 o - O 1 0 1 -
-R FK 1940 1942 - S lastSu 0 1 -
-R FK 1943 o - Ja 1 0 0 -
-R FK 1983 o - S lastSu 0 1 -
-R FK 1984 1985 - Ap lastSu 0 0 -
-R FK 1984 o - S 16 0 1 -
-R FK 1985 2000 - S Su>=9 0 1 -
-R FK 1986 2000 - Ap Su>=16 0 0 -
-R FK 2001 2010 - Ap Su>=15 2 0 -
-R FK 2001 2010 - S Su>=1 2 1 -
-R y 1975 1988 - O 1 0 1 -
-R y 1975 1978 - Mar 1 0 0 -
-R y 1979 1991 - Ap 1 0 0 -
-R y 1989 o - O 22 0 1 -
-R y 1990 o - O 1 0 1 -
-R y 1991 o - O 6 0 1 -
-R y 1992 o - Mar 1 0 0 -
-R y 1992 o - O 5 0 1 -
-R y 1993 o - Mar 31 0 0 -
-R y 1993 1995 - O 1 0 1 -
-R y 1994 1995 - F lastSu 0 0 -
-R y 1996 o - Mar 1 0 0 -
-R y 1996 2001 - O Su>=1 0 1 -
-R y 1997 o - F lastSu 0 0 -
-R y 1998 2001 - Mar Su>=1 0 0 -
-R y 2002 2004 - Ap Su>=1 0 0 -
-R y 2002 2003 - S Su>=1 0 1 -
-R y 2004 2009 - O Su>=15 0 1 -
-R y 2005 2009 - Mar Su>=8 0 0 -
-R y 2010 ma - O Su>=1 0 1 -
-R y 2010 2012 - Ap Su>=8 0 0 -
-R y 2013 ma - Mar Su>=22 0 0 -
-R PE 1938 o - Ja 1 0 1 -
-R PE 1938 o - Ap 1 0 0 -
-R PE 1938 1939 - S lastSu 0 1 -
-R PE 1939 1940 - Mar Su>=24 0 0 -
-R PE 1986 1987 - Ja 1 0 1 -
-R PE 1986 1987 - Ap 1 0 0 -
-R PE 1990 o - Ja 1 0 1 -
-R PE 1990 o - Ap 1 0 0 -
-R PE 1994 o - Ja 1 0 1 -
-R PE 1994 o - Ap 1 0 0 -
-R U 1923 1925 - O 1 0 0:30 -
-R U 1924 1926 - Ap 1 0 0 -
-R U 1933 1938 - O lastSu 0 0:30 -
-R U 1934 1941 - Mar lastSa 24 0 -
-R U 1939 o - O 1 0 0:30 -
-R U 1940 o - O 27 0 0:30 -
-R U 1941 o - Au 1 0 0:30 -
-R U 1942 o - D 14 0 0:30 -
-R U 1943 o - Mar 14 0 0 -
-R U 1959 o - May 24 0 0:30 -
-R U 1959 o - N 15 0 0 -
-R U 1960 o - Ja 17 0 1 -
-R U 1960 o - Mar 6 0 0 -
-R U 1965 o - Ap 4 0 1 -
-R U 1965 o - S 26 0 0 -
-R U 1968 o - May 27 0 0:30 -
-R U 1968 o - D 1 0 0 -
-R U 1970 o - Ap 25 0 1 -
-R U 1970 o - Jun 14 0 0 -
-R U 1972 o - Ap 23 0 1 -
-R U 1972 o - Jul 16 0 0 -
-R U 1974 o - Ja 13 0 1:30 -
-R U 1974 o - Mar 10 0 0:30 -
-R U 1974 o - S 1 0 0 -
-R U 1974 o - D 22 0 1 -
-R U 1975 o - Mar 30 0 0 -
-R U 1976 o - D 19 0 1 -
-R U 1977 o - Mar 6 0 0 -
-R U 1977 o - D 4 0 1 -
-R U 1978 1979 - Mar Su>=1 0 0 -
-R U 1978 o - D 17 0 1 -
-R U 1979 o - Ap 29 0 1 -
-R U 1980 o - Mar 16 0 0 -
-R U 1987 o - D 14 0 1 -
-R U 1988 o - F 28 0 0 -
-R U 1988 o - D 11 0 1 -
-R U 1989 o - Mar 5 0 0 -
-R U 1989 o - O 29 0 1 -
-R U 1990 o - F 25 0 0 -
-R U 1990 1991 - O Su>=21 0 1 -
-R U 1991 1992 - Mar Su>=1 0 0 -
-R U 1992 o - O 18 0 1 -
-R U 1993 o - F 28 0 0 -
-R U 2004 o - S 19 0 1 -
-R U 2005 o - Mar 27 2 0 -
-R U 2005 o - O 9 2 1 -
-R U 2006 2015 - Mar Su>=8 2 0 -
-R U 2006 2014 - O Su>=1 2 1 -
-Z Africa/Abidjan -0:16:8 - LMT 1912
-0 - GMT
-Z Africa/Algiers 0:12:12 - LMT 1891 Mar 16
-0:9:21 - PMT 1911 Mar 11
-0 d WE%sT 1940 F 25 2
-1 d CE%sT 1946 O 7
-0 - WET 1956 Ja 29
-1 - CET 1963 Ap 14
-0 d WE%sT 1977 O 21
-1 d CE%sT 1979 O 26
-0 d WE%sT 1981 May
-1 - CET
-Z Africa/Bissau -1:2:20 - LMT 1912 Ja 1 1u
--1 - %z 1975
-0 - GMT
-Z Africa/Cairo 2:5:9 - LMT 1900 O
-2 K EE%sT
-Z Africa/Casablanca -0:30:20 - LMT 1913 O 26
-0 M %z 1984 Mar 16
-1 - %z 1986
-0 M %z 2018 O 28 3
-1 M %z
-Z Africa/Ceuta -0:21:16 - LMT 1901 Ja 1 0u
-0 - WET 1918 May 6 23
-0 1 WEST 1918 O 7 23
-0 - WET 1924
-0 s WE%sT 1929
-0 - WET 1967
-0 Sp WE%sT 1984 Mar 16
-1 - CET 1986
-1 E CE%sT
-Z Africa/El_Aaiun -0:52:48 - LMT 1934
--1 - %z 1976 Ap 14
-0 M %z 2018 O 28 3
-1 M %z
-Z Africa/Johannesburg 1:52 - LMT 1892 F 8
-1:30 - SAST 1903 Mar
-2 SA SAST
-Z Africa/Juba 2:6:28 - LMT 1931
-2 SD CA%sT 2000 Ja 15 12
-3 - EAT 2021 F
-2 - CAT
-Z Africa/Khartoum 2:10:8 - LMT 1931
-2 SD CA%sT 2000 Ja 15 12
-3 - EAT 2017 N
-2 - CAT
-Z Africa/Lagos 0:13:35 - LMT 1905 Jul
-0 - GMT 1908 Jul
-0:13:35 - LMT 1914
-0:30 - %z 1919 S
-1 - WAT
-Z Africa/Maputo 2:10:18 - LMT 1909
-2 - CAT
-Z Africa/Monrovia -0:43:8 - LMT 1882
--0:43:8 - MMT 1919 Mar
--0:44:30 - MMT 1972 Ja 7
-0 - GMT
-Z Africa/Nairobi 2:27:16 - LMT 1908 May
-2:30 - %z 1928 Jun 30 24
-3 - EAT 1930 Ja 4 24
-2:30 - %z 1936 D 31 24
-2:45 - %z 1942 Jul 31 24
-3 - EAT
-Z Africa/Ndjamena 1:0:12 - LMT 1912
-1 - WAT 1979 O 14
-1 1 WAST 1980 Mar 8
-1 - WAT
-Z Africa/Sao_Tome 0:26:56 - LMT 1884
--0:36:45 - LMT 1912 Ja 1 0u
-0 - GMT 2018 Ja 1 1
-1 - WAT 2019 Ja 1 2
-0 - GMT
-Z Africa/Tripoli 0:52:44 - LMT 1920
-1 L CE%sT 1959
-2 - EET 1982
-1 L CE%sT 1990 May 4
-2 - EET 1996 S 30
-1 L CE%sT 1997 O 4
-2 - EET 2012 N 10 2
-1 L CE%sT 2013 O 25 2
-2 - EET
-Z Africa/Tunis 0:40:44 - LMT 1881 May 12
-0:9:21 - PMT 1911 Mar 11
-1 n CE%sT
-Z Africa/Windhoek 1:8:24 - LMT 1892 F 8
-1:30 - %z 1903 Mar
-2 - SAST 1942 S 20 2
-2 1 SAST 1943 Mar 21 2
-2 - SAST 1990 Mar 21
-2 NA %s
-Z America/Adak 12:13:22 - LMT 1867 O 19 12:44:35
--11:46:38 - LMT 1900 Au 20 12
--11 - NST 1942
--11 u N%sT 1946
--11 - NST 1967 Ap
--11 - BST 1969
--11 u B%sT 1983 O 30 2
--10 u AH%sT 1983 N 30
--10 u H%sT
-Z America/Anchorage 14:0:24 - LMT 1867 O 19 14:31:37
--9:59:36 - LMT 1900 Au 20 12
--10 - AST 1942
--10 u A%sT 1967 Ap
--10 - AHST 1969
--10 u AH%sT 1983 O 30 2
--9 u Y%sT 1983 N 30
--9 u AK%sT
-Z America/Araguaina -3:12:48 - LMT 1914
--3 B %z 1990 S 17
--3 - %z 1995 S 14
--3 B %z 2003 S 24
--3 - %z 2012 O 21
--3 B %z 2013 S
--3 - %z
-Z America/Argentina/Buenos_Aires -3:53:48 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 A %z
-Z America/Argentina/Catamarca -4:23:8 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1991 Mar 3
--4 - %z 1991 O 20
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 - %z 2004 Jun
--4 - %z 2004 Jun 20
--3 A %z 2008 O 18
--3 - %z
-Z America/Argentina/Cordoba -4:16:48 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1991 Mar 3
--4 - %z 1991 O 20
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 A %z
-Z America/Argentina/Jujuy -4:21:12 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1990 Mar 4
--4 - %z 1990 O 28
--4 1 %z 1991 Mar 17
--4 - %z 1991 O 6
--3 1 %z 1992
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 A %z 2008 O 18
--3 - %z
-Z America/Argentina/La_Rioja -4:27:24 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1991 Mar
--4 - %z 1991 May 7
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 - %z 2004 Jun
--4 - %z 2004 Jun 20
--3 A %z 2008 O 18
--3 - %z
-Z America/Argentina/Mendoza -4:35:16 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1990 Mar 4
--4 - %z 1990 O 15
--4 1 %z 1991 Mar
--4 - %z 1991 O 15
--4 1 %z 1992 Mar
--4 - %z 1992 O 18
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 - %z 2004 May 23
--4 - %z 2004 S 26
--3 A %z 2008 O 18
--3 - %z
-Z America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 - %z 2004 Jun
--4 - %z 2004 Jun 20
--3 A %z 2008 O 18
--3 - %z
-Z America/Argentina/Salta -4:21:40 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1991 Mar 3
--4 - %z 1991 O 20
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 A %z 2008 O 18
--3 - %z
-Z America/Argentina/San_Juan -4:34:4 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1991 Mar
--4 - %z 1991 May 7
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 - %z 2004 May 31
--4 - %z 2004 Jul 25
--3 A %z 2008 O 18
--3 - %z
-Z America/Argentina/San_Luis -4:25:24 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1990
--3 1 %z 1990 Mar 14
--4 - %z 1990 O 15
--4 1 %z 1991 Mar
--4 - %z 1991 Jun
--3 - %z 1999 O 3
--4 1 %z 2000 Mar 3
--3 - %z 2004 May 31
--4 - %z 2004 Jul 25
--3 A %z 2008 Ja 21
--4 Sa %z 2009 O 11
--3 - %z
-Z America/Argentina/Tucuman -4:20:52 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1991 Mar 3
--4 - %z 1991 O 20
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 - %z 2004 Jun
--4 - %z 2004 Jun 13
--3 A %z
-Z America/Argentina/Ushuaia -4:33:12 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 - %z 2004 May 30
--4 - %z 2004 Jun 20
--3 A %z 2008 O 18
--3 - %z
-Z America/Asuncion -3:50:40 - LMT 1890
--3:50:40 - AMT 1931 O 10
--4 - %z 1972 O
--3 - %z 1974 Ap
--4 y %z
-Z America/Bahia -2:34:4 - LMT 1914
--3 B %z 2003 S 24
--3 - %z 2011 O 16
--3 B %z 2012 O 21
--3 - %z
-Z America/Bahia_Banderas -7:1 - LMT 1922 Ja 1 7u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 - CST 1942 Ap 24
--7 - MST 1970
--7 m M%sT 2010 Ap 4 2
--6 m C%sT
-Z America/Barbados -3:58:29 - LMT 1911 Au 28
--4 BB A%sT 1944
--4 BB AST/-0330 1945
--4 BB A%sT
-Z America/Belem -3:13:56 - LMT 1914
--3 B %z 1988 S 12
--3 - %z
-Z America/Belize -5:52:48 - LMT 1912 Ap
--6 BZ %s
-Z America/Boa_Vista -4:2:40 - LMT 1914
--4 B %z 1988 S 12
--4 - %z 1999 S 30
--4 B %z 2000 O 15
--4 - %z
-Z America/Bogota -4:56:16 - LMT 1884 Mar 13
--4:56:16 - BMT 1914 N 23
--5 CO %z
-Z America/Boise -7:44:49 - LMT 1883 N 18 20u
--8 u P%sT 1923 May 13 2
--7 u M%sT 1974
--7 - MST 1974 F 3 2
--7 u M%sT
-Z America/Cambridge_Bay 0 - -00 1920
--7 Y M%sT 1999 O 31 2
--6 C C%sT 2000 O 29 2
--5 - EST 2000 N 5
--6 - CST 2001 Ap 1 3
--7 C M%sT
-Z America/Campo_Grande -3:38:28 - LMT 1914
--4 B %z
-Z America/Cancun -5:47:4 - LMT 1922 Ja 1 6u
--6 - CST 1981 D 26 2
--5 - EST 1983 Ja 4
--6 m C%sT 1997 O 26 2
--5 m E%sT 1998 Au 2 2
--6 m C%sT 2015 F 1 2
--5 - EST
-Z America/Caracas -4:27:44 - LMT 1890
--4:27:40 - CMT 1912 F 12
--4:30 - %z 1965
--4 - %z 2007 D 9 3
--4:30 - %z 2016 May 1 2:30
--4 - %z
-Z America/Cayenne -3:29:20 - LMT 1911 Jul
--4 - %z 1967 O
--3 - %z
-Z America/Chicago -5:50:36 - LMT 1883 N 18 18u
--6 u C%sT 1920
--6 Ch C%sT 1936 Mar 1 2
--5 - EST 1936 N 15 2
--6 Ch C%sT 1942
--6 u C%sT 1946
--6 Ch C%sT 1967
--6 u C%sT
-Z America/Chihuahua -7:4:20 - LMT 1922 Ja 1 7u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 - CST 1996
--6 m C%sT 1998
--6 - CST 1998 Ap Su>=1 3
--7 m M%sT 2022 O 30 2
--6 - CST
-Z America/Ciudad_Juarez -7:5:56 - LMT 1922 Ja 1 7u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 - CST 1996
--6 m C%sT 1998
--6 - CST 1998 Ap Su>=1 3
--7 m M%sT 2010
--7 u M%sT 2022 O 30 2
--6 - CST 2022 N 30
--7 u M%sT
-Z America/Costa_Rica -5:36:13 - LMT 1890
--5:36:13 - SJMT 1921 Ja 15
--6 CR C%sT
-Z America/Cuiaba -3:44:20 - LMT 1914
--4 B %z 2003 S 24
--4 - %z 2004 O
--4 B %z
-Z America/Danmarkshavn -1:14:40 - LMT 1916 Jul 28
--3 - %z 1980 Ap 6 2
--3 E %z 1996
-0 - GMT
-Z America/Dawson -9:17:40 - LMT 1900 Au 20
--9 Y Y%sT 1965
--9 Yu Y%sT 1973 O 28
--8 - PST 1980
--8 C P%sT 2020 N
--7 - MST
-Z America/Dawson_Creek -8:0:56 - LMT 1884
--8 C P%sT 1947
--8 Va P%sT 1972 Au 30 2
--7 - MST
-Z America/Denver -6:59:56 - LMT 1883 N 18 19u
--7 u M%sT 1920
--7 De M%sT 1942
--7 u M%sT 1946
--7 De M%sT 1967
--7 u M%sT
-Z America/Detroit -5:32:11 - LMT 1905
--6 - CST 1915 May 15 2
--5 - EST 1942
--5 u E%sT 1946
--5 Dt E%sT 1967 Jun 14 0:1
--5 u E%sT 1969
--5 - EST 1973
--5 u E%sT 1975
--5 - EST 1975 Ap 27 2
--5 u E%sT
-Z America/Edmonton -7:33:52 - LMT 1906 S
--7 Ed M%sT 1987
--7 C M%sT
-Z America/Eirunepe -4:39:28 - LMT 1914
--5 B %z 1988 S 12
--5 - %z 1993 S 28
--5 B %z 1994 S 22
--5 - %z 2008 Jun 24
--4 - %z 2013 N 10
--5 - %z
-Z America/El_Salvador -5:56:48 - LMT 1921
--6 SV C%sT
-Z America/Fort_Nelson -8:10:47 - LMT 1884
--8 Va P%sT 1946
--8 - PST 1947
--8 Va P%sT 1987
--8 C P%sT 2015 Mar 8 2
--7 - MST
-Z America/Fortaleza -2:34 - LMT 1914
--3 B %z 1990 S 17
--3 - %z 1999 S 30
--3 B %z 2000 O 22
--3 - %z 2001 S 13
--3 B %z 2002 O
--3 - %z
-Z America/Glace_Bay -3:59:48 - LMT 1902 Jun 15
--4 C A%sT 1953
--4 H A%sT 1954
--4 - AST 1972
--4 H A%sT 1974
--4 C A%sT
-Z America/Goose_Bay -4:1:40 - LMT 1884
--3:30:52 - NST 1918
--3:30:52 C N%sT 1919
--3:30:52 - NST 1935 Mar 30
--3:30 - NST 1936
--3:30 j N%sT 1942 May 11
--3:30 C N%sT 1946
--3:30 j N%sT 1966 Mar 15 2
--4 j A%sT 2011 N
--4 C A%sT
-Z America/Grand_Turk -4:44:32 - LMT 1890
--5:7:10 - KMT 1912 F
--5 - EST 1979
--5 u E%sT 2015 Mar 8 2
--4 - AST 2018 Mar 11 3
--5 u E%sT
-Z America/Guatemala -6:2:4 - LMT 1918 O 5
--6 GT C%sT
-Z America/Guayaquil -5:19:20 - LMT 1890
--5:14 - QMT 1931
--5 EC %z
-Z America/Guyana -3:52:39 - LMT 1911 Au
--4 - %z 1915 Mar
--3:45 - %z 1975 Au
--3 - %z 1992 Mar 29 1
--4 - %z
-Z America/Halifax -4:14:24 - LMT 1902 Jun 15
--4 H A%sT 1918
--4 C A%sT 1919
--4 H A%sT 1942 F 9 2s
--4 C A%sT 1946
--4 H A%sT 1974
--4 C A%sT
-Z America/Havana -5:29:28 - LMT 1890
--5:29:36 - HMT 1925 Jul 19 12
--5 Q C%sT
-Z America/Hermosillo -7:23:52 - LMT 1922 Ja 1 7u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 - CST 1942 Ap 24
--7 - MST 1996
--7 m M%sT 1999
--7 - MST
-Z America/Indiana/Indianapolis -5:44:38 - LMT 1883 N 18 18u
--6 u C%sT 1920
--6 In C%sT 1942
--6 u C%sT 1946
--6 In C%sT 1955 Ap 24 2
--5 - EST 1957 S 29 2
--6 - CST 1958 Ap 27 2
--5 - EST 1969
--5 u E%sT 1971
--5 - EST 2006
--5 u E%sT
-Z America/Indiana/Knox -5:46:30 - LMT 1883 N 18 18u
--6 u C%sT 1947
--6 St C%sT 1962 Ap 29 2
--5 - EST 1963 O 27 2
--6 u C%sT 1991 O 27 2
--5 - EST 2006 Ap 2 2
--6 u C%sT
-Z America/Indiana/Marengo -5:45:23 - LMT 1883 N 18 18u
--6 u C%sT 1951
--6 Ma C%sT 1961 Ap 30 2
--5 - EST 1969
--5 u E%sT 1974 Ja 6 2
--6 1 CDT 1974 O 27 2
--5 u E%sT 1976
--5 - EST 2006
--5 u E%sT
-Z America/Indiana/Petersburg -5:49:7 - LMT 1883 N 18 18u
--6 u C%sT 1955
--6 Pi C%sT 1965 Ap 25 2
--5 - EST 1966 O 30 2
--6 u C%sT 1977 O 30 2
--5 - EST 2006 Ap 2 2
--6 u C%sT 2007 N 4 2
--5 u E%sT
-Z America/Indiana/Tell_City -5:47:3 - LMT 1883 N 18 18u
--6 u C%sT 1946
--6 Pe C%sT 1964 Ap 26 2
--5 - EST 1967 O 29 2
--6 u C%sT 1969 Ap 27 2
--5 u E%sT 1971
--5 - EST 2006 Ap 2 2
--6 u C%sT
-Z America/Indiana/Vevay -5:40:16 - LMT 1883 N 18 18u
--6 u C%sT 1954 Ap 25 2
--5 - EST 1969
--5 u E%sT 1973
--5 - EST 2006
--5 u E%sT
-Z America/Indiana/Vincennes -5:50:7 - LMT 1883 N 18 18u
--6 u C%sT 1946
--6 V C%sT 1964 Ap 26 2
--5 - EST 1969
--5 u E%sT 1971
--5 - EST 2006 Ap 2 2
--6 u C%sT 2007 N 4 2
--5 u E%sT
-Z America/Indiana/Winamac -5:46:25 - LMT 1883 N 18 18u
--6 u C%sT 1946
--6 Pu C%sT 1961 Ap 30 2
--5 - EST 1969
--5 u E%sT 1971
--5 - EST 2006 Ap 2 2
--6 u C%sT 2007 Mar 11 2
--5 u E%sT
-Z America/Inuvik 0 - -00 1953
--8 Y P%sT 1979 Ap lastSu 2
--7 Y M%sT 1980
--7 C M%sT
-Z America/Iqaluit 0 - -00 1942 Au
--5 Y E%sT 1999 O 31 2
--6 C C%sT 2000 O 29 2
--5 C E%sT
-Z America/Jamaica -5:7:10 - LMT 1890
--5:7:10 - KMT 1912 F
--5 - EST 1974
--5 u E%sT 1984
--5 - EST
-Z America/Juneau 15:2:19 - LMT 1867 O 19 15:33:32
--8:57:41 - LMT 1900 Au 20 12
--8 - PST 1942
--8 u P%sT 1946
--8 - PST 1969
--8 u P%sT 1980 Ap 27 2
--9 u Y%sT 1980 O 26 2
--8 u P%sT 1983 O 30 2
--9 u Y%sT 1983 N 30
--9 u AK%sT
-Z America/Kentucky/Louisville -5:43:2 - LMT 1883 N 18 18u
--6 u C%sT 1921
--6 v C%sT 1942
--6 u C%sT 1946
--6 v C%sT 1961 Jul 23 2
--5 - EST 1968
--5 u E%sT 1974 Ja 6 2
--6 1 CDT 1974 O 27 2
--5 u E%sT
-Z America/Kentucky/Monticello -5:39:24 - LMT 1883 N 18 18u
--6 u C%sT 1946
--6 - CST 1968
--6 u C%sT 2000 O 29 2
--5 u E%sT
-Z America/La_Paz -4:32:36 - LMT 1890
--4:32:36 - CMT 1931 O 15
--4:32:36 1 BST 1932 Mar 21
--4 - %z
-Z America/Lima -5:8:12 - LMT 1890
--5:8:36 - LMT 1908 Jul 28
--5 PE %z
-Z America/Los_Angeles -7:52:58 - LMT 1883 N 18 20u
--8 u P%sT 1946
--8 CA P%sT 1967
--8 u P%sT
-Z America/Maceio -2:22:52 - LMT 1914
--3 B %z 1990 S 17
--3 - %z 1995 O 13
--3 B %z 1996 S 4
--3 - %z 1999 S 30
--3 B %z 2000 O 22
--3 - %z 2001 S 13
--3 B %z 2002 O
--3 - %z
-Z America/Managua -5:45:8 - LMT 1890
--5:45:12 - MMT 1934 Jun 23
--6 - CST 1973 May
--5 - EST 1975 F 16
--6 NI C%sT 1992 Ja 1 4
--5 - EST 1992 S 24
--6 - CST 1993
--5 - EST 1997
--6 NI C%sT
-Z America/Manaus -4:0:4 - LMT 1914
--4 B %z 1988 S 12
--4 - %z 1993 S 28
--4 B %z 1994 S 22
--4 - %z
-Z America/Martinique -4:4:20 - LMT 1890
--4:4:20 - FFMT 1911 May
--4 - AST 1980 Ap 6
--4 1 ADT 1980 S 28
--4 - AST
-Z America/Matamoros -6:30 - LMT 1922 Ja 1 6u
--6 - CST 1988
--6 u C%sT 1989
--6 m C%sT 2010
--6 u C%sT
-Z America/Mazatlan -7:5:40 - LMT 1922 Ja 1 7u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 - CST 1942 Ap 24
--7 - MST 1970
--7 m M%sT
-Z America/Menominee -5:50:27 - LMT 1885 S 18 12
--6 u C%sT 1946
--6 Me C%sT 1969 Ap 27 2
--5 - EST 1973 Ap 29 2
--6 u C%sT
-Z America/Merida -5:58:28 - LMT 1922 Ja 1 6u
--6 - CST 1981 D 26 2
--5 - EST 1982 N 2 2
--6 m C%sT
-Z America/Metlakatla 15:13:42 - LMT 1867 O 19 15:44:55
--8:46:18 - LMT 1900 Au 20 12
--8 - PST 1942
--8 u P%sT 1946
--8 - PST 1969
--8 u P%sT 1983 O 30 2
--8 - PST 2015 N 1 2
--9 u AK%sT 2018 N 4 2
--8 - PST 2019 Ja 20 2
--9 u AK%sT
-Z America/Mexico_City -6:36:36 - LMT 1922 Ja 1 7u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 m C%sT 2001 S 30 2
--6 - CST 2002 F 20
--6 m C%sT
-Z America/Miquelon -3:44:40 - LMT 1911 Jun 15
--4 - AST 1980 May
--3 - %z 1987
--3 C %z
-Z America/Moncton -4:19:8 - LMT 1883 D 9
--5 - EST 1902 Jun 15
--4 C A%sT 1933
--4 o A%sT 1942
--4 C A%sT 1946
--4 o A%sT 1973
--4 C A%sT 1993
--4 o A%sT 2007
--4 C A%sT
-Z America/Monterrey -6:41:16 - LMT 1922 Ja 1 6u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 - CST 1988
--6 u C%sT 1989
--6 m C%sT
-Z America/Montevideo -3:44:51 - LMT 1908 Jun 10
--3:44:51 - MMT 1920 May
--4 - %z 1923 O
--3:30 U %z 1942 D 14
--3 U %z 1960
--3 U %z 1968
--3 U %z 1970
--3 U %z 1974
--3 U %z 1974 Mar 10
--3 U %z 1974 D 22
--3 U %z
-Z America/New_York -4:56:2 - LMT 1883 N 18 17u
--5 u E%sT 1920
--5 NY E%sT 1942
--5 u E%sT 1946
--5 NY E%sT 1967
--5 u E%sT
-Z America/Nome 12:58:22 - LMT 1867 O 19 13:29:35
--11:1:38 - LMT 1900 Au 20 12
--11 - NST 1942
--11 u N%sT 1946
--11 - NST 1967 Ap
--11 - BST 1969
--11 u B%sT 1983 O 30 2
--9 u Y%sT 1983 N 30
--9 u AK%sT
-Z America/Noronha -2:9:40 - LMT 1914
--2 B %z 1990 S 17
--2 - %z 1999 S 30
--2 B %z 2000 O 15
--2 - %z 2001 S 13
--2 B %z 2002 O
--2 - %z
-Z America/North_Dakota/Beulah -6:47:7 - LMT 1883 N 18 19u
--7 u M%sT 2010 N 7 2
--6 u C%sT
-Z America/North_Dakota/Center -6:45:12 - LMT 1883 N 18 19u
--7 u M%sT 1992 O 25 2
--6 u C%sT
-Z America/North_Dakota/New_Salem -6:45:39 - LMT 1883 N 18 19u
--7 u M%sT 2003 O 26 2
--6 u C%sT
-Z America/Nuuk -3:26:56 - LMT 1916 Jul 28
--3 - %z 1980 Ap 6 2
--3 E %z 2023 Mar 26 1u
--2 - %z 2023 O 29 1u
--2 E %z
-Z America/Ojinaga -6:57:40 - LMT 1922 Ja 1 7u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 - CST 1996
--6 m C%sT 1998
--6 - CST 1998 Ap Su>=1 3
--7 m M%sT 2010
--7 u M%sT 2022 O 30 2
--6 - CST 2022 N 30
--6 u C%sT
-Z America/Panama -5:18:8 - LMT 1890
--5:19:36 - CMT 1908 Ap 22
--5 - EST
-Z America/Paramaribo -3:40:40 - LMT 1911
--3:40:52 - PMT 1935
--3:40:36 - PMT 1945 O
--3:30 - %z 1984 O
--3 - %z
-Z America/Phoenix -7:28:18 - LMT 1883 N 18 19u
--7 u M%sT 1944 Ja 1 0:1
--7 - MST 1944 Ap 1 0:1
--7 u M%sT 1944 O 1 0:1
--7 - MST 1967
--7 u M%sT 1968 Mar 21
--7 - MST
-Z America/Port-au-Prince -4:49:20 - LMT 1890
--4:49 - PPMT 1917 Ja 24 12
--5 HT E%sT
-Z America/Porto_Velho -4:15:36 - LMT 1914
--4 B %z 1988 S 12
--4 - %z
-Z America/Puerto_Rico -4:24:25 - LMT 1899 Mar 28 12
--4 - AST 1942 May 3
--4 u A%sT 1946
--4 - AST
-Z America/Punta_Arenas -4:43:40 - LMT 1890
--4:42:45 - SMT 1910 Ja 10
--5 - %z 1916 Jul
--4:42:45 - SMT 1918 S 10
--4 - %z 1919 Jul
--4:42:45 - SMT 1927 S
--5 x %z 1932 S
--4 - %z 1942 Jun
--5 - %z 1942 Au
--4 - %z 1946 Au 28 24
--5 1 %z 1947 Mar 31 24
--5 - %z 1947 May 21 23
--4 x %z 2016 D 4
--3 - %z
-Z America/Rankin_Inlet 0 - -00 1957
--6 Y C%sT 2000 O 29 2
--5 - EST 2001 Ap 1 3
--6 C C%sT
-Z America/Recife -2:19:36 - LMT 1914
--3 B %z 1990 S 17
--3 - %z 1999 S 30
--3 B %z 2000 O 15
--3 - %z 2001 S 13
--3 B %z 2002 O
--3 - %z
-Z America/Regina -6:58:36 - LMT 1905 S
--7 r M%sT 1960 Ap lastSu 2
--6 - CST
-Z America/Resolute 0 - -00 1947 Au 31
--6 Y C%sT 2000 O 29 2
--5 - EST 2001 Ap 1 3
--6 C C%sT 2006 O 29 2
--5 - EST 2007 Mar 11 3
--6 C C%sT
-Z America/Rio_Branco -4:31:12 - LMT 1914
--5 B %z 1988 S 12
--5 - %z 2008 Jun 24
--4 - %z 2013 N 10
--5 - %z
-Z America/Santarem -3:38:48 - LMT 1914
--4 B %z 1988 S 12
--4 - %z 2008 Jun 24
--3 - %z
-Z America/Santiago -4:42:45 - LMT 1890
--4:42:45 - SMT 1910 Ja 10
--5 - %z 1916 Jul
--4:42:45 - SMT 1918 S 10
--4 - %z 1919 Jul
--4:42:45 - SMT 1927 S
--5 x %z 1932 S
--4 - %z 1942 Jun
--5 - %z 1942 Au
--4 - %z 1946 Jul 14 24
--4 1 %z 1946 Au 28 24
--5 1 %z 1947 Mar 31 24
--5 - %z 1947 May 21 23
--4 x %z
-Z America/Santo_Domingo -4:39:36 - LMT 1890
--4:40 - SDMT 1933 Ap 1 12
--5 DO %s 1974 O 27
--4 - AST 2000 O 29 2
--5 u E%sT 2000 D 3 1
--4 - AST
-Z America/Sao_Paulo -3:6:28 - LMT 1914
--3 B %z 1963 O 23
--3 1 %z 1964
--3 B %z
-Z America/Scoresbysund -1:27:52 - LMT 1916 Jul 28
--2 - %z 1980 Ap 6 2
--2 c %z 1981 Mar 29
--1 E %z 2024 Mar 31
--2 E %z
-Z America/Sitka 14:58:47 - LMT 1867 O 19 15:30
--9:1:13 - LMT 1900 Au 20 12
--8 - PST 1942
--8 u P%sT 1946
--8 - PST 1969
--8 u P%sT 1983 O 30 2
--9 u Y%sT 1983 N 30
--9 u AK%sT
-Z America/St_Johns -3:30:52 - LMT 1884
--3:30:52 j N%sT 1918
--3:30:52 C N%sT 1919
--3:30:52 j N%sT 1935 Mar 30
--3:30 j N%sT 1942 May 11
--3:30 C N%sT 1946
--3:30 j N%sT 2011 N
--3:30 C N%sT
-Z America/Swift_Current -7:11:20 - LMT 1905 S
--7 C M%sT 1946 Ap lastSu 2
--7 r M%sT 1950
--7 Sw M%sT 1972 Ap lastSu 2
--6 - CST
-Z America/Tegucigalpa -5:48:52 - LMT 1921 Ap
--6 HN C%sT
-Z America/Thule -4:35:8 - LMT 1916 Jul 28
--4 Th A%sT
-Z America/Tijuana -7:48:4 - LMT 1922 Ja 1 7u
--7 - MST 1924
--8 - PST 1927 Jun 10
--7 - MST 1930 N 15
--8 - PST 1931 Ap
--8 1 PDT 1931 S 30
--8 - PST 1942 Ap 24
--8 1 PWT 1945 Au 14 23u
--8 1 PPT 1945 N 15
--8 - PST 1948 Ap 5
--8 1 PDT 1949 Ja 14
--8 - PST 1950 May
--8 1 PDT 1950 S 24
--8 - PST 1951 Ap 29 2
--8 1 PDT 1951 S 30 2
--8 - PST 1952 Ap 27 2
--8 1 PDT 1952 S 28 2
--8 - PST 1954
--8 CA P%sT 1961
--8 - PST 1976
--8 u P%sT 1996
--8 m P%sT 2001
--8 u P%sT 2002 F 20
--8 m P%sT 2010
--8 u P%sT
-Z America/Toronto -5:17:32 - LMT 1895
--5 C E%sT 1919
--5 t E%sT 1942 F 9 2s
--5 C E%sT 1946
--5 t E%sT 1974
--5 C E%sT
-Z America/Vancouver -8:12:28 - LMT 1884
--8 Va P%sT 1987
--8 C P%sT
-Z America/Whitehorse -9:0:12 - LMT 1900 Au 20
--9 Y Y%sT 1965
--9 Yu Y%sT 1966 F 27
--8 - PST 1980
--8 C P%sT 2020 N
--7 - MST
-Z America/Winnipeg -6:28:36 - LMT 1887 Jul 16
--6 W C%sT 2006
--6 C C%sT
-Z America/Yakutat 14:41:5 - LMT 1867 O 19 15:12:18
--9:18:55 - LMT 1900 Au 20 12
--9 - YST 1942
--9 u Y%sT 1946
--9 - YST 1969
--9 u Y%sT 1983 N 30
--9 u AK%sT
-Z Antarctica/Casey 0 - -00 1969
-8 - %z 2009 O 18 2
-11 - %z 2010 Mar 5 2
-8 - %z 2011 O 28 2
-11 - %z 2012 F 21 17u
-8 - %z 2016 O 22
-11 - %z 2018 Mar 11 4
-8 - %z 2018 O 7 4
-11 - %z 2019 Mar 17 3
-8 - %z 2019 O 4 3
-11 - %z 2020 Mar 8 3
-8 - %z 2020 O 4 0:1
-11 - %z 2021 Mar 14
-8 - %z 2021 O 3 0:1
-11 - %z 2022 Mar 13
-8 - %z 2022 O 2 0:1
-11 - %z 2023 Mar 9 3
-8 - %z
-Z Antarctica/Davis 0 - -00 1957 Ja 13
-7 - %z 1964 N
-0 - -00 1969 F
-7 - %z 2009 O 18 2
-5 - %z 2010 Mar 10 20u
-7 - %z 2011 O 28 2
-5 - %z 2012 F 21 20u
-7 - %z
-Z Antarctica/Macquarie 0 - -00 1899 N
-10 - AEST 1916 O 1 2
-10 1 AEDT 1917 F
-10 AU AE%sT 1919 Ap 1 0s
-0 - -00 1948 Mar 25
-10 AU AE%sT 1967
-10 AT AE%sT 2010
-10 1 AEDT 2011
-10 AT AE%sT
-Z Antarctica/Mawson 0 - -00 1954 F 13
-6 - %z 2009 O 18 2
-5 - %z
-Z Antarctica/Palmer 0 - -00 1965
--4 A %z 1969 O 5
--3 A %z 1982 May
--4 x %z 2016 D 4
--3 - %z
-Z Antarctica/Rothera 0 - -00 1976 D
--3 - %z
-Z Antarctica/Troll 0 - -00 2005 F 12
-0 Tr %s
-Z Antarctica/Vostok 0 - -00 1957 D 16
-7 - %z 1994 F
-0 - -00 1994 N
-7 - %z 2023 D 18 2
-5 - %z
-Z Asia/Almaty 5:7:48 - LMT 1924 May 2
-5 - %z 1930 Jun 21
-6 R %z 1991 Mar 31 2s
-5 R %z 1992 Ja 19 2s
-6 R %z 2004 O 31 2s
-6 - %z 2024 Mar
-5 - %z
-Z Asia/Amman 2:23:44 - LMT 1931
-2 J EE%sT 2022 O 28 0s
-3 - %z
-Z Asia/Anadyr 11:49:56 - LMT 1924 May 2
-12 - %z 1930 Jun 21
-13 R %z 1982 Ap 1 0s
-12 R %z 1991 Mar 31 2s
-11 R %z 1992 Ja 19 2s
-12 R %z 2010 Mar 28 2s
-11 R %z 2011 Mar 27 2s
-12 - %z
-Z Asia/Aqtau 3:21:4 - LMT 1924 May 2
-4 - %z 1930 Jun 21
-5 - %z 1981 O
-6 - %z 1982 Ap
-5 R %z 1991 Mar 31 2s
-4 R %z 1992 Ja 19 2s
-5 R %z 1994 S 25 2s
-4 R %z 2004 O 31 2s
-5 - %z
-Z Asia/Aqtobe 3:48:40 - LMT 1924 May 2
-4 - %z 1930 Jun 21
-5 - %z 1981 Ap
-5 1 %z 1981 O
-6 - %z 1982 Ap
-5 R %z 1991 Mar 31 2s
-4 R %z 1992 Ja 19 2s
-5 R %z 2004 O 31 2s
-5 - %z
-Z Asia/Ashgabat 3:53:32 - LMT 1924 May 2
-4 - %z 1930 Jun 21
-5 R %z 1991 Mar 31 2
-4 R %z 1992 Ja 19 2
-5 - %z
-Z Asia/Atyrau 3:27:44 - LMT 1924 May 2
-3 - %z 1930 Jun 21
-5 - %z 1981 O
-6 - %z 1982 Ap
-5 R %z 1991 Mar 31 2s
-4 R %z 1992 Ja 19 2s
-5 R %z 1999 Mar 28 2s
-4 R %z 2004 O 31 2s
-5 - %z
-Z Asia/Baghdad 2:57:40 - LMT 1890
-2:57:36 - BMT 1918
-3 - %z 1982 May
-3 IQ %z
-Z Asia/Baku 3:19:24 - LMT 1924 May 2
-3 - %z 1957 Mar
-4 R %z 1991 Mar 31 2s
-3 R %z 1992 S lastSu 2s
-4 - %z 1996
-4 E %z 1997
-4 AZ %z
-Z Asia/Bangkok 6:42:4 - LMT 1880
-6:42:4 - BMT 1920 Ap
-7 - %z
-Z Asia/Barnaul 5:35 - LMT 1919 D 10
-6 - %z 1930 Jun 21
-7 R %z 1991 Mar 31 2s
-6 R %z 1992 Ja 19 2s
-7 R %z 1995 May 28
-6 R %z 2011 Mar 27 2s
-7 - %z 2014 O 26 2s
-6 - %z 2016 Mar 27 2s
-7 - %z
-Z Asia/Beirut 2:22 - LMT 1880
-2 l EE%sT
-Z Asia/Bishkek 4:58:24 - LMT 1924 May 2
-5 - %z 1930 Jun 21
-6 R %z 1991 Mar 31 2s
-5 R %z 1991 Au 31 2
-5 KG %z 2005 Au 12
-6 - %z
-Z Asia/Chita 7:33:52 - LMT 1919 D 15
-8 - %z 1930 Jun 21
-9 R %z 1991 Mar 31 2s
-8 R %z 1992 Ja 19 2s
-9 R %z 2011 Mar 27 2s
-10 - %z 2014 O 26 2s
-8 - %z 2016 Mar 27 2
-9 - %z
-Z Asia/Colombo 5:19:24 - LMT 1880
-5:19:32 - MMT 1906
-5:30 - %z 1942 Ja 5
-5:30 0:30 %z 1942 S
-5:30 1 %z 1945 O 16 2
-5:30 - %z 1996 May 25
-6:30 - %z 1996 O 26 0:30
-6 - %z 2006 Ap 15 0:30
-5:30 - %z
-Z Asia/Damascus 2:25:12 - LMT 1920
-2 S EE%sT 2022 O 28
-3 - %z
-Z Asia/Dhaka 6:1:40 - LMT 1890
-5:53:20 - HMT 1941 O
-6:30 - %z 1942 May 15
-5:30 - %z 1942 S
-6:30 - %z 1951 S 30
-6 - %z 2009
-6 BD %z
-Z Asia/Dili 8:22:20 - LMT 1911 D 31 16u
-8 - %z 1942 F 21 23
-9 - %z 1976 May 3
-8 - %z 2000 S 17
-9 - %z
-Z Asia/Dubai 3:41:12 - LMT 1920
-4 - %z
-Z Asia/Dushanbe 4:35:12 - LMT 1924 May 2
-5 - %z 1930 Jun 21
-6 R %z 1991 Mar 31 2s
-5 1 %z 1991 S 9 2s
-5 - %z
-Z Asia/Famagusta 2:15:48 - LMT 1921 N 14
-2 CY EE%sT 1998 S
-2 E EE%sT 2016 S 8
-3 - %z 2017 O 29 1u
-2 E EE%sT
-Z Asia/Gaza 2:17:52 - LMT 1900 O
-2 Z EET/EEST 1948 May 15
-2 K EE%sT 1967 Jun 5
-2 Z I%sT 1996
-2 J EE%sT 1999
-2 P EE%sT 2008 Au 29
-2 - EET 2008 S
-2 P EE%sT 2010
-2 - EET 2010 Mar 27 0:1
-2 P EE%sT 2011 Au
-2 - EET 2012
-2 P EE%sT
-Z Asia/Hebron 2:20:23 - LMT 1900 O
-2 Z EET/EEST 1948 May 15
-2 K EE%sT 1967 Jun 5
-2 Z I%sT 1996
-2 J EE%sT 1999
-2 P EE%sT
-Z Asia/Ho_Chi_Minh 7:6:30 - LMT 1906 Jul
-7:6:30 - PLMT 1911 May
-7 - %z 1942 D 31 23
-8 - %z 1945 Mar 14 23
-9 - %z 1945 S 1 24
-7 - %z 1947 Ap
-8 - %z 1955 Jul 1 1
-7 - %z 1959 D 31 23
-8 - %z 1975 Jun 13
-7 - %z
-Z Asia/Hong_Kong 7:36:42 - LMT 1904 O 29 17u
-8 - HKT 1941 Jun 15 3
-8 1 HKST 1941 O 1 4
-8 0:30 HKWT 1941 D 25
-9 - JST 1945 N 18 2
-8 HK HK%sT
-Z Asia/Hovd 6:6:36 - LMT 1905 Au
-6 - %z 1978
-7 X %z
-Z Asia/Irkutsk 6:57:5 - LMT 1880
-6:57:5 - IMT 1920 Ja 25
-7 - %z 1930 Jun 21
-8 R %z 1991 Mar 31 2s
-7 R %z 1992 Ja 19 2s
-8 R %z 2011 Mar 27 2s
-9 - %z 2014 O 26 2s
-8 - %z
-Z Asia/Jakarta 7:7:12 - LMT 1867 Au 10
-7:7:12 - BMT 1923 D 31 16:40u
-7:20 - %z 1932 N
-7:30 - %z 1942 Mar 23
-9 - %z 1945 S 23
-7:30 - %z 1948 May
-8 - %z 1950 May
-7:30 - %z 1964
-7 - WIB
-Z Asia/Jayapura 9:22:48 - LMT 1932 N
-9 - %z 1944 S
-9:30 - %z 1964
-9 - WIT
-Z Asia/Jerusalem 2:20:54 - LMT 1880
-2:20:40 - JMT 1918
-2 Z I%sT
-Z Asia/Kabul 4:36:48 - LMT 1890
-4 - %z 1945
-4:30 - %z
-Z Asia/Kamchatka 10:34:36 - LMT 1922 N 10
-11 - %z 1930 Jun 21
-12 R %z 1991 Mar 31 2s
-11 R %z 1992 Ja 19 2s
-12 R %z 2010 Mar 28 2s
-11 R %z 2011 Mar 27 2s
-12 - %z
-Z Asia/Karachi 4:28:12 - LMT 1907
-5:30 - %z 1942 S
-5:30 1 %z 1945 O 15
-5:30 - %z 1951 S 30
-5 - %z 1971 Mar 26
-5 PK PK%sT
-Z Asia/Kathmandu 5:41:16 - LMT 1920
-5:30 - %z 1986
-5:45 - %z
-Z Asia/Khandyga 9:2:13 - LMT 1919 D 15
-8 - %z 1930 Jun 21
-9 R %z 1991 Mar 31 2s
-8 R %z 1992 Ja 19 2s
-9 R %z 2004
-10 R %z 2011 Mar 27 2s
-11 - %z 2011 S 13 0s
-10 - %z 2014 O 26 2s
-9 - %z
-Z Asia/Kolkata 5:53:28 - LMT 1854 Jun 28
-5:53:20 - HMT 1870
-5:21:10 - MMT 1906
-5:30 - IST 1941 O
-5:30 1 %z 1942 May 15
-5:30 - IST 1942 S
-5:30 1 %z 1945 O 15
-5:30 - IST
-Z Asia/Krasnoyarsk 6:11:26 - LMT 1920 Ja 6
-6 - %z 1930 Jun 21
-7 R %z 1991 Mar 31 2s
-6 R %z 1992 Ja 19 2s
-7 R %z 2011 Mar 27 2s
-8 - %z 2014 O 26 2s
-7 - %z
-Z Asia/Kuching 7:21:20 - LMT 1926 Mar
-7:30 - %z 1933
-8 NB %z 1942 F 16
-9 - %z 1945 S 12
-8 - %z
-Z Asia/Macau 7:34:10 - LMT 1904 O 30
-8 - CST 1941 D 21 23
-9 _ %z 1945 S 30 24
-8 _ C%sT
-Z Asia/Magadan 10:3:12 - LMT 1924 May 2
-10 - %z 1930 Jun 21
-11 R %z 1991 Mar 31 2s
-10 R %z 1992 Ja 19 2s
-11 R %z 2011 Mar 27 2s
-12 - %z 2014 O 26 2s
-10 - %z 2016 Ap 24 2s
-11 - %z
-Z Asia/Makassar 7:57:36 - LMT 1920
-7:57:36 - MMT 1932 N
-8 - %z 1942 F 9
-9 - %z 1945 S 23
-8 - WITA
-Z Asia/Manila -15:56 - LMT 1844 D 31
-8:4 - LMT 1899 May 11
-8 PH P%sT 1942 May
-9 - JST 1944 N
-8 PH P%sT
-Z Asia/Nicosia 2:13:28 - LMT 1921 N 14
-2 CY EE%sT 1998 S
-2 E EE%sT
-Z Asia/Novokuznetsk 5:48:48 - LMT 1924 May
-6 - %z 1930 Jun 21
-7 R %z 1991 Mar 31 2s
-6 R %z 1992 Ja 19 2s
-7 R %z 2010 Mar 28 2s
-6 R %z 2011 Mar 27 2s
-7 - %z
-Z Asia/Novosibirsk 5:31:40 - LMT 1919 D 14 6
-6 - %z 1930 Jun 21
-7 R %z 1991 Mar 31 2s
-6 R %z 1992 Ja 19 2s
-7 R %z 1993 May 23
-6 R %z 2011 Mar 27 2s
-7 - %z 2014 O 26 2s
-6 - %z 2016 Jul 24 2s
-7 - %z
-Z Asia/Omsk 4:53:30 - LMT 1919 N 14
-5 - %z 1930 Jun 21
-6 R %z 1991 Mar 31 2s
-5 R %z 1992 Ja 19 2s
-6 R %z 2011 Mar 27 2s
-7 - %z 2014 O 26 2s
-6 - %z
-Z Asia/Oral 3:25:24 - LMT 1924 May 2
-3 - %z 1930 Jun 21
-5 - %z 1981 Ap
-5 1 %z 1981 O
-6 - %z 1982 Ap
-5 R %z 1989 Mar 26 2s
-4 R %z 1992 Ja 19 2s
-5 R %z 1992 Mar 29 2s
-4 R %z 2004 O 31 2s
-5 - %z
-Z Asia/Pontianak 7:17:20 - LMT 1908 May
-7:17:20 - PMT 1932 N
-7:30 - %z 1942 Ja 29
-9 - %z 1945 S 23
-7:30 - %z 1948 May
-8 - %z 1950 May
-7:30 - %z 1964
-8 - WITA 1988
-7 - WIB
-Z Asia/Pyongyang 8:23 - LMT 1908 Ap
-8:30 - KST 1912
-9 - JST 1945 Au 24
-9 - KST 2015 Au 15
-8:30 - KST 2018 May 4 23:30
-9 - KST
-Z Asia/Qatar 3:26:8 - LMT 1920
-4 - %z 1972 Jun
-3 - %z
-Z Asia/Qostanay 4:14:28 - LMT 1924 May 2
-4 - %z 1930 Jun 21
-5 - %z 1981 Ap
-5 1 %z 1981 O
-6 - %z 1982 Ap
-5 R %z 1991 Mar 31 2s
-4 R %z 1992 Ja 19 2s
-5 R %z 2004 O 31 2s
-6 - %z 2024 Mar
-5 - %z
-Z Asia/Qyzylorda 4:21:52 - LMT 1924 May 2
-4 - %z 1930 Jun 21
-5 - %z 1981 Ap
-5 1 %z 1981 O
-6 - %z 1982 Ap
-5 R %z 1991 Mar 31 2s
-4 R %z 1991 S 29 2s
-5 R %z 1992 Ja 19 2s
-6 R %z 1992 Mar 29 2s
-5 R %z 2004 O 31 2s
-6 - %z 2018 D 21
-5 - %z
-Z Asia/Riyadh 3:6:52 - LMT 1947 Mar 14
-3 - %z
-Z Asia/Sakhalin 9:30:48 - LMT 1905 Au 23
-9 - %z 1945 Au 25
-11 R %z 1991 Mar 31 2s
-10 R %z 1992 Ja 19 2s
-11 R %z 1997 Mar lastSu 2s
-10 R %z 2011 Mar 27 2s
-11 - %z 2014 O 26 2s
-10 - %z 2016 Mar 27 2s
-11 - %z
-Z Asia/Samarkand 4:27:53 - LMT 1924 May 2
-4 - %z 1930 Jun 21
-5 - %z 1981 Ap
-5 1 %z 1981 O
-6 - %z 1982 Ap
-5 R %z 1992
-5 - %z
-Z Asia/Seoul 8:27:52 - LMT 1908 Ap
-8:30 - KST 1912
-9 - JST 1945 S 8
-9 KR K%sT 1954 Mar 21
-8:30 KR K%sT 1961 Au 10
-9 KR K%sT
-Z Asia/Shanghai 8:5:43 - LMT 1901
-8 Sh C%sT 1949 May 28
-8 CN C%sT
-Z Asia/Singapore 6:55:25 - LMT 1901
-6:55:25 - SMT 1905 Jun
-7 - %z 1933
-7 0:20 %z 1936
-7:20 - %z 1941 S
-7:30 - %z 1942 F 16
-9 - %z 1945 S 12
-7:30 - %z 1981 D 31 16u
-8 - %z
-Z Asia/Srednekolymsk 10:14:52 - LMT 1924 May 2
-10 - %z 1930 Jun 21
-11 R %z 1991 Mar 31 2s
-10 R %z 1992 Ja 19 2s
-11 R %z 2011 Mar 27 2s
-12 - %z 2014 O 26 2s
-11 - %z
-Z Asia/Taipei 8:6 - LMT 1896
-8 - CST 1937 O
-9 - JST 1945 S 21 1
-8 f C%sT
-Z Asia/Tashkent 4:37:11 - LMT 1924 May 2
-5 - %z 1930 Jun 21
-6 R %z 1991 Mar 31 2
-5 R %z 1992
-5 - %z
-Z Asia/Tbilisi 2:59:11 - LMT 1880
-2:59:11 - TBMT 1924 May 2
-3 - %z 1957 Mar
-4 R %z 1991 Mar 31 2s
-3 R %z 1992
-3 e %z 1994 S lastSu
-4 e %z 1996 O lastSu
-4 1 %z 1997 Mar lastSu
-4 e %z 2004 Jun 27
-3 R %z 2005 Mar lastSu 2
-4 - %z
-Z Asia/Tehran 3:25:44 - LMT 1916
-3:25:44 - TMT 1935 Jun 13
-3:30 i %z 1977 O 20 24
-4 i %z 1979
-3:30 i %z
-Z Asia/Thimphu 5:58:36 - LMT 1947 Au 15
-5:30 - %z 1987 O
-6 - %z
-Z Asia/Tokyo 9:18:59 - LMT 1887 D 31 15u
-9 JP J%sT
-Z Asia/Tomsk 5:39:51 - LMT 1919 D 22
-6 - %z 1930 Jun 21
-7 R %z 1991 Mar 31 2s
-6 R %z 1992 Ja 19 2s
-7 R %z 2002 May 1 3
-6 R %z 2011 Mar 27 2s
-7 - %z 2014 O 26 2s
-6 - %z 2016 May 29 2s
-7 - %z
-Z Asia/Ulaanbaatar 7:7:32 - LMT 1905 Au
-7 - %z 1978
-8 X %z
-Z Asia/Urumqi 5:50:20 - LMT 1928
-6 - %z
-Z Asia/Ust-Nera 9:32:54 - LMT 1919 D 15
-8 - %z 1930 Jun 21
-9 R %z 1981 Ap
-11 R %z 1991 Mar 31 2s
-10 R %z 1992 Ja 19 2s
-11 R %z 2011 Mar 27 2s
-12 - %z 2011 S 13 0s
-11 - %z 2014 O 26 2s
-10 - %z
-Z Asia/Vladivostok 8:47:31 - LMT 1922 N 15
-9 - %z 1930 Jun 21
-10 R %z 1991 Mar 31 2s
-9 R %z 1992 Ja 19 2s
-10 R %z 2011 Mar 27 2s
-11 - %z 2014 O 26 2s
-10 - %z
-Z Asia/Yakutsk 8:38:58 - LMT 1919 D 15
-8 - %z 1930 Jun 21
-9 R %z 1991 Mar 31 2s
-8 R %z 1992 Ja 19 2s
-9 R %z 2011 Mar 27 2s
-10 - %z 2014 O 26 2s
-9 - %z
-Z Asia/Yangon 6:24:47 - LMT 1880
-6:24:47 - RMT 1920
-6:30 - %z 1942 May
-9 - %z 1945 May 3
-6:30 - %z
-Z Asia/Yekaterinburg 4:2:33 - LMT 1916 Jul 3
-3:45:5 - PMT 1919 Jul 15 4
-4 - %z 1930 Jun 21
-5 R %z 1991 Mar 31 2s
-4 R %z 1992 Ja 19 2s
-5 R %z 2011 Mar 27 2s
-6 - %z 2014 O 26 2s
-5 - %z
-Z Asia/Yerevan 2:58 - LMT 1924 May 2
-3 - %z 1957 Mar
-4 R %z 1991 Mar 31 2s
-3 R %z 1995 S 24 2s
-4 - %z 1997
-4 R %z 2011
-4 AM %z
-Z Atlantic/Azores -1:42:40 - LMT 1884
--1:54:32 - HMT 1912 Ja 1 2u
--2 p %z 1966 O 2 2s
--1 - %z 1982 Mar 28 0s
--1 p %z 1986
--1 E %z 1992 D 27 1s
-0 E WE%sT 1993 Jun 17 1u
--1 E %z
-Z Atlantic/Bermuda -4:19:18 - LMT 1890
--4:19:18 Be BMT/BST 1930 Ja 1 2
--4 Be A%sT 1974 Ap 28 2
--4 C A%sT 1976
--4 u A%sT
-Z Atlantic/Canary -1:1:36 - LMT 1922 Mar
--1 - %z 1946 S 30 1
-0 - WET 1980 Ap 6 0s
-0 1 WEST 1980 S 28 1u
-0 E WE%sT
-Z Atlantic/Cape_Verde -1:34:4 - LMT 1912 Ja 1 2u
--2 - %z 1942 S
--2 1 %z 1945 O 15
--2 - %z 1975 N 25 2
--1 - %z
-Z Atlantic/Faroe -0:27:4 - LMT 1908 Ja 11
-0 - WET 1981
-0 E WE%sT
-Z Atlantic/Madeira -1:7:36 - LMT 1884
--1:7:36 - FMT 1912 Ja 1 1u
--1 p %z 1966 O 2 2s
-0 - WET 1982 Ap 4
-0 p WE%sT 1986 Jul 31
-0 E WE%sT
-Z Atlantic/South_Georgia -2:26:8 - LMT 1890
--2 - %z
-Z Atlantic/Stanley -3:51:24 - LMT 1890
--3:51:24 - SMT 1912 Mar 12
--4 FK %z 1983 May
--3 FK %z 1985 S 15
--4 FK %z 2010 S 5 2
--3 - %z
-Z Australia/Adelaide 9:14:20 - LMT 1895 F
-9 - ACST 1899 May
-9:30 AU AC%sT 1971
-9:30 AS AC%sT
-Z Australia/Brisbane 10:12:8 - LMT 1895
-10 AU AE%sT 1971
-10 AQ AE%sT
-Z Australia/Broken_Hill 9:25:48 - LMT 1895 F
-10 - AEST 1896 Au 23
-9 - ACST 1899 May
-9:30 AU AC%sT 1971
-9:30 AN AC%sT 2000
-9:30 AS AC%sT
-Z Australia/Darwin 8:43:20 - LMT 1895 F
-9 - ACST 1899 May
-9:30 AU AC%sT
-Z Australia/Eucla 8:35:28 - LMT 1895 D
-8:45 AU %z 1943 Jul
-8:45 AW %z
-Z Australia/Hobart 9:49:16 - LMT 1895 S
-10 AT AE%sT 1919 O 24
-10 AU AE%sT 1967
-10 AT AE%sT
-Z Australia/Lindeman 9:55:56 - LMT 1895
-10 AU AE%sT 1971
-10 AQ AE%sT 1992 Jul
-10 Ho AE%sT
-Z Australia/Lord_Howe 10:36:20 - LMT 1895 F
-10 - AEST 1981 Mar
-10:30 LH %z 1985 Jul
-10:30 LH %z
-Z Australia/Melbourne 9:39:52 - LMT 1895 F
-10 AU AE%sT 1971
-10 AV AE%sT
-Z Australia/Perth 7:43:24 - LMT 1895 D
-8 AU AW%sT 1943 Jul
-8 AW AW%sT
-Z Australia/Sydney 10:4:52 - LMT 1895 F
-10 AU AE%sT 1971
-10 AN AE%sT
-Z Etc/GMT 0 - GMT
-Z Etc/GMT+1 -1 - %z
-Z Etc/GMT+10 -10 - %z
-Z Etc/GMT+11 -11 - %z
-Z Etc/GMT+12 -12 - %z
-Z Etc/GMT+2 -2 - %z
-Z Etc/GMT+3 -3 - %z
-Z Etc/GMT+4 -4 - %z
-Z Etc/GMT+5 -5 - %z
-Z Etc/GMT+6 -6 - %z
-Z Etc/GMT+7 -7 - %z
-Z Etc/GMT+8 -8 - %z
-Z Etc/GMT+9 -9 - %z
-Z Etc/GMT-1 1 - %z
-Z Etc/GMT-10 10 - %z
-Z Etc/GMT-11 11 - %z
-Z Etc/GMT-12 12 - %z
-Z Etc/GMT-13 13 - %z
-Z Etc/GMT-14 14 - %z
-Z Etc/GMT-2 2 - %z
-Z Etc/GMT-3 3 - %z
-Z Etc/GMT-4 4 - %z
-Z Etc/GMT-5 5 - %z
-Z Etc/GMT-6 6 - %z
-Z Etc/GMT-7 7 - %z
-Z Etc/GMT-8 8 - %z
-Z Etc/GMT-9 9 - %z
-Z Etc/UTC 0 - UTC
-Z Europe/Andorra 0:6:4 - LMT 1901
-0 - WET 1946 S 30
-1 - CET 1985 Mar 31 2
-1 E CE%sT
-Z Europe/Astrakhan 3:12:12 - LMT 1924 May
-3 - %z 1930 Jun 21
-4 R %z 1989 Mar 26 2s
-3 R %z 1991 Mar 31 2s
-4 - %z 1992 Mar 29 2s
-3 R %z 2011 Mar 27 2s
-4 - %z 2014 O 26 2s
-3 - %z 2016 Mar 27 2s
-4 - %z
-Z Europe/Athens 1:34:52 - LMT 1895 S 14
-1:34:52 - AMT 1916 Jul 28 0:1
-2 g EE%sT 1941 Ap 30
-1 g CE%sT 1944 Ap 4
-2 g EE%sT 1981
-2 E EE%sT
-Z Europe/Belgrade 1:22 - LMT 1884
-1 - CET 1941 Ap 18 23
-1 c CE%sT 1945
-1 - CET 1945 May 8 2s
-1 1 CEST 1945 S 16 2s
-1 - CET 1982 N 27
-1 E CE%sT
-Z Europe/Berlin 0:53:28 - LMT 1893 Ap
-1 c CE%sT 1945 May 24 2
-1 So CE%sT 1946
-1 DE CE%sT 1980
-1 E CE%sT
-Z Europe/Brussels 0:17:30 - LMT 1880
-0:17:30 - BMT 1892 May 1 0:17:30
-0 - WET 1914 N 8
-1 - CET 1916 May
-1 c CE%sT 1918 N 11 11u
-0 b WE%sT 1940 May 20 2s
-1 c CE%sT 1944 S 3
-1 b CE%sT 1977
-1 E CE%sT
-Z Europe/Bucharest 1:44:24 - LMT 1891 O
-1:44:24 - BMT 1931 Jul 24
-2 z EE%sT 1981 Mar 29 2s
-2 c EE%sT 1991
-2 z EE%sT 1994
-2 e EE%sT 1997
-2 E EE%sT
-Z Europe/Budapest 1:16:20 - LMT 1890 N
-1 c CE%sT 1918
-1 h CE%sT 1941 Ap 7 23
-1 c CE%sT 1945
-1 h CE%sT 1984
-1 E CE%sT
-Z Europe/Chisinau 1:55:20 - LMT 1880
-1:55 - CMT 1918 F 15
-1:44:24 - BMT 1931 Jul 24
-2 z EE%sT 1940 Au 15
-2 1 EEST 1941 Jul 17
-1 c CE%sT 1944 Au 24
-3 R MSK/MSD 1990 May 6 2
-2 R EE%sT 1992
-2 e EE%sT 1997
-2 MD EE%sT
-Z Europe/Dublin -0:25:21 - LMT 1880 Au 2
--0:25:21 - DMT 1916 May 21 2s
--0:25:21 1 IST 1916 O 1 2s
-0 G %s 1921 D 6
-0 G GMT/IST 1940 F 25 2s
-0 1 IST 1946 O 6 2s
-0 - GMT 1947 Mar 16 2s
-0 1 IST 1947 N 2 2s
-0 - GMT 1948 Ap 18 2s
-0 G GMT/IST 1968 O 27
-1 IE IST/GMT
-Z Europe/Gibraltar -0:21:24 - LMT 1880 Au 2
-0 G %s 1957 Ap 14 2
-1 - CET 1982
-1 E CE%sT
-Z Europe/Helsinki 1:39:49 - LMT 1878 May 31
-1:39:49 - HMT 1921 May
-2 FI EE%sT 1983
-2 E EE%sT
-Z Europe/Istanbul 1:55:52 - LMT 1880
-1:56:56 - IMT 1910 O
-2 T EE%sT 1978 Jun 29
-3 T %z 1984 N 1 2
-2 T EE%sT 2007
-2 E EE%sT 2011 Mar 27 1u
-2 - EET 2011 Mar 28 1u
-2 E EE%sT 2014 Mar 30 1u
-2 - EET 2014 Mar 31 1u
-2 E EE%sT 2015 O 25 1u
-2 1 EEST 2015 N 8 1u
-2 E EE%sT 2016 S 7
-3 - %z
-Z Europe/Kaliningrad 1:22 - LMT 1893 Ap
-1 c CE%sT 1945 Ap 10
-2 O EE%sT 1946 Ap 7
-3 R MSK/MSD 1989 Mar 26 2s
-2 R EE%sT 2011 Mar 27 2s
-3 - %z 2014 O 26 2s
-2 - EET
-Z Europe/Kirov 3:18:48 - LMT 1919 Jul 1 0u
-3 - %z 1930 Jun 21
-4 R %z 1989 Mar 26 2s
-3 R MSK/MSD 1991 Mar 31 2s
-4 - %z 1992 Mar 29 2s
-3 R MSK/MSD 2011 Mar 27 2s
-4 - MSK 2014 O 26 2s
-3 - MSK
-Z Europe/Kyiv 2:2:4 - LMT 1880
-2:2:4 - KMT 1924 May 2
-2 - EET 1930 Jun 21
-3 - MSK 1941 S 20
-1 c CE%sT 1943 N 6
-3 R MSK/MSD 1990 Jul 1 2
-2 1 EEST 1991 S 29 3
-2 c EE%sT 1996 May 13
-2 E EE%sT
-Z Europe/Lisbon -0:36:45 - LMT 1884
--0:36:45 - LMT 1912 Ja 1 0u
-0 p WE%sT 1966 O 2 2s
-1 - CET 1976 S 26 1
-0 p WE%sT 1986
-0 E WE%sT 1992 S 27 1u
-1 E CE%sT 1996 Mar 31 1u
-0 E WE%sT
-Z Europe/London -0:1:15 - LMT 1847 D
-0 G %s 1968 O 27
-1 - BST 1971 O 31 2u
-0 G %s 1996
-0 E GMT/BST
-Z Europe/Madrid -0:14:44 - LMT 1901 Ja 1 0u
-0 s WE%sT 1940 Mar 16 23
-1 s CE%sT 1979
-1 E CE%sT
-Z Europe/Malta 0:58:4 - LMT 1893 N 2
-1 I CE%sT 1973 Mar 31
-1 MT CE%sT 1981
-1 E CE%sT
-Z Europe/Minsk 1:50:16 - LMT 1880
-1:50 - MMT 1924 May 2
-2 - EET 1930 Jun 21
-3 - MSK 1941 Jun 28
-1 c CE%sT 1944 Jul 3
-3 R MSK/MSD 1990
-3 - MSK 1991 Mar 31 2s
-2 R EE%sT 2011 Mar 27 2s
-3 - %z
-Z Europe/Moscow 2:30:17 - LMT 1880
-2:30:17 - MMT 1916 Jul 3
-2:31:19 R %s 1919 Jul 1 0u
-3 R %s 1921 O
-3 R MSK/MSD 1922 O
-2 - EET 1930 Jun 21
-3 R MSK/MSD 1991 Mar 31 2s
-2 R EE%sT 1992 Ja 19 2s
-3 R MSK/MSD 2011 Mar 27 2s
-4 - MSK 2014 O 26 2s
-3 - MSK
-Z Europe/Paris 0:9:21 - LMT 1891 Mar 16
-0:9:21 - PMT 1911 Mar 11
-0 F WE%sT 1940 Jun 14 23
-1 c CE%sT 1944 Au 25
-0 F WE%sT 1945 S 16 3
-1 F CE%sT 1977
-1 E CE%sT
-Z Europe/Prague 0:57:44 - LMT 1850
-0:57:44 - PMT 1891 O
-1 c CE%sT 1945 May 9
-1 CZ CE%sT 1946 D 1 3
-1 -1 GMT 1947 F 23 2
-1 CZ CE%sT 1979
-1 E CE%sT
-Z Europe/Riga 1:36:34 - LMT 1880
-1:36:34 - RMT 1918 Ap 15 2
-1:36:34 1 LST 1918 S 16 3
-1:36:34 - RMT 1919 Ap 1 2
-1:36:34 1 LST 1919 May 22 3
-1:36:34 - RMT 1926 May 11
-2 - EET 1940 Au 5
-3 - MSK 1941 Jul
-1 c CE%sT 1944 O 13
-3 R MSK/MSD 1989 Mar lastSu 2s
-2 1 EEST 1989 S lastSu 2s
-2 LV EE%sT 1997 Ja 21
-2 E EE%sT 2000 F 29
-2 - EET 2001 Ja 2
-2 E EE%sT
-Z Europe/Rome 0:49:56 - LMT 1866 D 12
-0:49:56 - RMT 1893 O 31 23u
-1 I CE%sT 1943 S 10
-1 c CE%sT 1944 Jun 4
-1 I CE%sT 1980
-1 E CE%sT
-Z Europe/Samara 3:20:20 - LMT 1919 Jul 1 0u
-3 - %z 1930 Jun 21
-4 - %z 1935 Ja 27
-4 R %z 1989 Mar 26 2s
-3 R %z 1991 Mar 31 2s
-2 R %z 1991 S 29 2s
-3 - %z 1991 O 20 3
-4 R %z 2010 Mar 28 2s
-3 R %z 2011 Mar 27 2s
-4 - %z
-Z Europe/Saratov 3:4:18 - LMT 1919 Jul 1 0u
-3 - %z 1930 Jun 21
-4 R %z 1988 Mar 27 2s
-3 R %z 1991 Mar 31 2s
-4 - %z 1992 Mar 29 2s
-3 R %z 2011 Mar 27 2s
-4 - %z 2014 O 26 2s
-3 - %z 2016 D 4 2s
-4 - %z
-Z Europe/Simferopol 2:16:24 - LMT 1880
-2:16 - SMT 1924 May 2
-2 - EET 1930 Jun 21
-3 - MSK 1941 N
-1 c CE%sT 1944 Ap 13
-3 R MSK/MSD 1990
-3 - MSK 1990 Jul 1 2
-2 - EET 1992 Mar 20
-2 c EE%sT 1994 May
-3 c MSK/MSD 1996 Mar 31 0s
-3 1 MSD 1996 O 27 3s
-3 - MSK 1997 Mar lastSu 1u
-2 E EE%sT 2014 Mar 30 2
-4 - MSK 2014 O 26 2s
-3 - MSK
-Z Europe/Sofia 1:33:16 - LMT 1880
-1:56:56 - IMT 1894 N 30
-2 - EET 1942 N 2 3
-1 c CE%sT 1945
-1 - CET 1945 Ap 2 3
-2 - EET 1979 Mar 31 23
-2 BG EE%sT 1982 S 26 3
-2 c EE%sT 1991
-2 e EE%sT 1997
-2 E EE%sT
-Z Europe/Tallinn 1:39 - LMT 1880
-1:39 - TMT 1918 F
-1 c CE%sT 1919 Jul
-1:39 - TMT 1921 May
-2 - EET 1940 Au 6
-3 - MSK 1941 S 15
-1 c CE%sT 1944 S 22
-3 R MSK/MSD 1989 Mar 26 2s
-2 1 EEST 1989 S 24 2s
-2 c EE%sT 1998 S 22
-2 E EE%sT 1999 O 31 4
-2 - EET 2002 F 21
-2 E EE%sT
-Z Europe/Tirane 1:19:20 - LMT 1914
-1 - CET 1940 Jun 16
-1 q CE%sT 1984 Jul
-1 E CE%sT
-Z Europe/Ulyanovsk 3:13:36 - LMT 1919 Jul 1 0u
-3 - %z 1930 Jun 21
-4 R %z 1989 Mar 26 2s
-3 R %z 1991 Mar 31 2s
-2 R %z 1992 Ja 19 2s
-3 R %z 2011 Mar 27 2s
-4 - %z 2014 O 26 2s
-3 - %z 2016 Mar 27 2s
-4 - %z
-Z Europe/Vienna 1:5:21 - LMT 1893 Ap
-1 c CE%sT 1920
-1 a CE%sT 1940 Ap 1 2s
-1 c CE%sT 1945 Ap 2 2s
-1 1 CEST 1945 Ap 12 2s
-1 - CET 1946
-1 a CE%sT 1981
-1 E CE%sT
-Z Europe/Vilnius 1:41:16 - LMT 1880
-1:24 - WMT 1917
-1:35:36 - KMT 1919 O 10
-1 - CET 1920 Jul 12
-2 - EET 1920 O 9
-1 - CET 1940 Au 3
-3 - MSK 1941 Jun 24
-1 c CE%sT 1944 Au
-3 R MSK/MSD 1989 Mar 26 2s
-2 R EE%sT 1991 S 29 2s
-2 c EE%sT 1998
-2 - EET 1998 Mar 29 1u
-1 E CE%sT 1999 O 31 1u
-2 - EET 2003
-2 E EE%sT
-Z Europe/Volgograd 2:57:40 - LMT 1920 Ja 3
-3 - %z 1930 Jun 21
-4 - %z 1961 N 11
-4 R %z 1988 Mar 27 2s
-3 R MSK/MSD 1991 Mar 31 2s
-4 - %z 1992 Mar 29 2s
-3 R MSK/MSD 2011 Mar 27 2s
-4 - MSK 2014 O 26 2s
-3 - MSK 2018 O 28 2s
-4 - %z 2020 D 27 2s
-3 - MSK
-Z Europe/Warsaw 1:24 - LMT 1880
-1:24 - WMT 1915 Au 5
-1 c CE%sT 1918 S 16 3
-2 O EE%sT 1922 Jun
-1 O CE%sT 1940 Jun 23 2
-1 c CE%sT 1944 O
-1 O CE%sT 1977
-1 W- CE%sT 1988
-1 E CE%sT
-Z Europe/Zurich 0:34:8 - LMT 1853 Jul 16
-0:29:46 - BMT 1894 Jun
-1 CH CE%sT 1981
-1 E CE%sT
-Z Factory 0 - -00
-Z Indian/Chagos 4:49:40 - LMT 1907
-5 - %z 1996
-6 - %z
-Z Indian/Maldives 4:54 - LMT 1880
-4:54 - MMT 1960
-5 - %z
-Z Indian/Mauritius 3:50 - LMT 1907
-4 MU %z
-Z Pacific/Apia 12:33:4 - LMT 1892 Jul 5
--11:26:56 - LMT 1911
--11:30 - %z 1950
--11 WS %z 2011 D 29 24
-13 WS %z
-Z Pacific/Auckland 11:39:4 - LMT 1868 N 2
-11:30 NZ NZ%sT 1946
-12 NZ NZ%sT
-Z Pacific/Bougainville 10:22:16 - LMT 1880
-9:48:32 - PMMT 1895
-10 - %z 1942 Jul
-9 - %z 1945 Au 21
-10 - %z 2014 D 28 2
-11 - %z
-Z Pacific/Chatham 12:13:48 - LMT 1868 N 2
-12:15 - %z 1946
-12:45 k %z
-Z Pacific/Easter -7:17:28 - LMT 1890
--7:17:28 - EMT 1932 S
--7 x %z 1982 Mar 14 3u
--6 x %z
-Z Pacific/Efate 11:13:16 - LMT 1912 Ja 13
-11 VU %z
-Z Pacific/Fakaofo -11:24:56 - LMT 1901
--11 - %z 2011 D 30
-13 - %z
-Z Pacific/Fiji 11:55:44 - LMT 1915 O 26
-12 FJ %z
-Z Pacific/Galapagos -5:58:24 - LMT 1931
--5 - %z 1986
--6 EC %z
-Z Pacific/Gambier -8:59:48 - LMT 1912 O
--9 - %z
-Z Pacific/Guadalcanal 10:39:48 - LMT 1912 O
-11 - %z
-Z Pacific/Guam -14:21 - LMT 1844 D 31
-9:39 - LMT 1901
-10 - GST 1941 D 10
-9 - %z 1944 Jul 31
-10 Gu G%sT 2000 D 23
-10 - ChST
-Z Pacific/Honolulu -10:31:26 - LMT 1896 Ja 13 12
--10:30 - HST 1933 Ap 30 2
--10:30 1 HDT 1933 May 21 12
--10:30 u H%sT 1947 Jun 8 2
--10 - HST
-Z Pacific/Kanton 0 - -00 1937 Au 31
--12 - %z 1979 O
--11 - %z 1994 D 31
-13 - %z
-Z Pacific/Kiritimati -10:29:20 - LMT 1901
--10:40 - %z 1979 O
--10 - %z 1994 D 31
-14 - %z
-Z Pacific/Kosrae -13:8:4 - LMT 1844 D 31
-10:51:56 - LMT 1901
-11 - %z 1914 O
-9 - %z 1919 F
-11 - %z 1937
-10 - %z 1941 Ap
-9 - %z 1945 Au
-11 - %z 1969 O
-12 - %z 1999
-11 - %z
-Z Pacific/Kwajalein 11:9:20 - LMT 1901
-11 - %z 1937
-10 - %z 1941 Ap
-9 - %z 1944 F 6
-11 - %z 1969 O
--12 - %z 1993 Au 20 24
-12 - %z
-Z Pacific/Marquesas -9:18 - LMT 1912 O
--9:30 - %z
-Z Pacific/Nauru 11:7:40 - LMT 1921 Ja 15
-11:30 - %z 1942 Au 29
-9 - %z 1945 S 8
-11:30 - %z 1979 F 10 2
-12 - %z
-Z Pacific/Niue -11:19:40 - LMT 1952 O 16
--11:20 - %z 1964 Jul
--11 - %z
-Z Pacific/Norfolk 11:11:52 - LMT 1901
-11:12 - %z 1951
-11:30 - %z 1974 O 27 2s
-11:30 1 %z 1975 Mar 2 2s
-11:30 - %z 2015 O 4 2s
-11 - %z 2019 Jul
-11 AN %z
-Z Pacific/Noumea 11:5:48 - LMT 1912 Ja 13
-11 NC %z
-Z Pacific/Pago_Pago 12:37:12 - LMT 1892 Jul 5
--11:22:48 - LMT 1911
--11 - SST
-Z Pacific/Palau -15:2:4 - LMT 1844 D 31
-8:57:56 - LMT 1901
-9 - %z
-Z Pacific/Pitcairn -8:40:20 - LMT 1901
--8:30 - %z 1998 Ap 27
--8 - %z
-Z Pacific/Port_Moresby 9:48:40 - LMT 1880
-9:48:32 - PMMT 1895
-10 - %z
-Z Pacific/Rarotonga 13:20:56 - LMT 1899 D 26
--10:39:4 - LMT 1952 O 16
--10:30 - %z 1978 N 12
--10 CK %z
-Z Pacific/Tahiti -9:58:16 - LMT 1912 O
--10 - %z
-Z Pacific/Tarawa 11:32:4 - LMT 1901
-12 - %z
-Z Pacific/Tongatapu 12:19:12 - LMT 1945 S 10
-12:20 - %z 1961
-13 - %z 1999
-13 TO %z
-L Etc/GMT GMT
-L Australia/Sydney Australia/ACT
-L Australia/Lord_Howe Australia/LHI
-L Australia/Sydney Australia/NSW
-L Australia/Darwin Australia/North
-L Australia/Brisbane Australia/Queensland
-L Australia/Adelaide Australia/South
-L Australia/Hobart Australia/Tasmania
-L Australia/Melbourne Australia/Victoria
-L Australia/Perth Australia/West
-L Australia/Broken_Hill Australia/Yancowinna
-L America/Rio_Branco Brazil/Acre
-L America/Noronha Brazil/DeNoronha
-L America/Sao_Paulo Brazil/East
-L America/Manaus Brazil/West
-L Europe/Brussels CET
-L America/Chicago CST6CDT
-L America/Halifax Canada/Atlantic
-L America/Winnipeg Canada/Central
-L America/Toronto Canada/Eastern
-L America/Edmonton Canada/Mountain
-L America/St_Johns Canada/Newfoundland
-L America/Vancouver Canada/Pacific
-L America/Regina Canada/Saskatchewan
-L America/Whitehorse Canada/Yukon
-L America/Santiago Chile/Continental
-L Pacific/Easter Chile/EasterIsland
-L America/Havana Cuba
-L Europe/Athens EET
-L America/Panama EST
-L America/New_York EST5EDT
-L Africa/Cairo Egypt
-L Europe/Dublin Eire
-L Etc/GMT Etc/GMT+0
-L Etc/GMT Etc/GMT-0
-L Etc/GMT Etc/GMT0
-L Etc/GMT Etc/Greenwich
-L Etc/UTC Etc/UCT
-L Etc/UTC Etc/Universal
-L Etc/UTC Etc/Zulu
-L Europe/London GB
-L Europe/London GB-Eire
-L Etc/GMT GMT+0
-L Etc/GMT GMT-0
-L Etc/GMT GMT0
-L Etc/GMT Greenwich
-L Asia/Hong_Kong Hongkong
-L Africa/Abidjan Iceland
-L Asia/Tehran Iran
-L Asia/Jerusalem Israel
-L America/Jamaica Jamaica
-L Asia/Tokyo Japan
-L Pacific/Kwajalein Kwajalein
-L Africa/Tripoli Libya
-L Europe/Brussels MET
-L America/Phoenix MST
-L America/Denver MST7MDT
-L America/Tijuana Mexico/BajaNorte
-L America/Mazatlan Mexico/BajaSur
-L America/Mexico_City Mexico/General
-L Pacific/Auckland NZ
-L Pacific/Chatham NZ-CHAT
-L America/Denver Navajo
-L Asia/Shanghai PRC
-L Europe/Warsaw Poland
-L Europe/Lisbon Portugal
-L Asia/Taipei ROC
-L Asia/Seoul ROK
-L Asia/Singapore Singapore
-L Europe/Istanbul Turkey
-L Etc/UTC UCT
-L America/Anchorage US/Alaska
-L America/Adak US/Aleutian
-L America/Phoenix US/Arizona
-L America/Chicago US/Central
-L America/Indiana/Indianapolis US/East-Indiana
-L America/New_York US/Eastern
-L Pacific/Honolulu US/Hawaii
-L America/Indiana/Knox US/Indiana-Starke
-L America/Detroit US/Michigan
-L America/Denver US/Mountain
-L America/Los_Angeles US/Pacific
-L Pacific/Pago_Pago US/Samoa
-L Etc/UTC UTC
-L Etc/UTC Universal
-L Europe/Moscow W-SU
-L Etc/UTC Zulu
-L America/Argentina/Buenos_Aires America/Buenos_Aires
-L America/Argentina/Catamarca America/Catamarca
-L America/Argentina/Cordoba America/Cordoba
-L America/Indiana/Indianapolis America/Indianapolis
-L America/Argentina/Jujuy America/Jujuy
-L America/Indiana/Knox America/Knox_IN
-L America/Kentucky/Louisville America/Louisville
-L America/Argentina/Mendoza America/Mendoza
-L America/Puerto_Rico America/Virgin
-L Pacific/Pago_Pago Pacific/Samoa
-L Africa/Abidjan Africa/Accra
-L Africa/Nairobi Africa/Addis_Ababa
-L Africa/Nairobi Africa/Asmara
-L Africa/Abidjan Africa/Bamako
-L Africa/Lagos Africa/Bangui
-L Africa/Abidjan Africa/Banjul
-L Africa/Maputo Africa/Blantyre
-L Africa/Lagos Africa/Brazzaville
-L Africa/Maputo Africa/Bujumbura
-L Africa/Abidjan Africa/Conakry
-L Africa/Abidjan Africa/Dakar
-L Africa/Nairobi Africa/Dar_es_Salaam
-L Africa/Nairobi Africa/Djibouti
-L Africa/Lagos Africa/Douala
-L Africa/Abidjan Africa/Freetown
-L Africa/Maputo Africa/Gaborone
-L Africa/Maputo Africa/Harare
-L Africa/Nairobi Africa/Kampala
-L Africa/Maputo Africa/Kigali
-L Africa/Lagos Africa/Kinshasa
-L Africa/Lagos Africa/Libreville
-L Africa/Abidjan Africa/Lome
-L Africa/Lagos Africa/Luanda
-L Africa/Maputo Africa/Lubumbashi
-L Africa/Maputo Africa/Lusaka
-L Africa/Lagos Africa/Malabo
-L Africa/Johannesburg Africa/Maseru
-L Africa/Johannesburg Africa/Mbabane
-L Africa/Nairobi Africa/Mogadishu
-L Africa/Lagos Africa/Niamey
-L Africa/Abidjan Africa/Nouakchott
-L Africa/Abidjan Africa/Ouagadougou
-L Africa/Lagos Africa/Porto-Novo
-L America/Puerto_Rico America/Anguilla
-L America/Puerto_Rico America/Antigua
-L America/Puerto_Rico America/Aruba
-L America/Panama America/Atikokan
-L America/Puerto_Rico America/Blanc-Sablon
-L America/Panama America/Cayman
-L America/Phoenix America/Creston
-L America/Puerto_Rico America/Curacao
-L America/Puerto_Rico America/Dominica
-L America/Puerto_Rico America/Grenada
-L America/Puerto_Rico America/Guadeloupe
-L America/Puerto_Rico America/Kralendijk
-L America/Puerto_Rico America/Lower_Princes
-L America/Puerto_Rico America/Marigot
-L America/Puerto_Rico America/Montserrat
-L America/Toronto America/Nassau
-L America/Puerto_Rico America/Port_of_Spain
-L America/Puerto_Rico America/St_Barthelemy
-L America/Puerto_Rico America/St_Kitts
-L America/Puerto_Rico America/St_Lucia
-L America/Puerto_Rico America/St_Thomas
-L America/Puerto_Rico America/St_Vincent
-L America/Puerto_Rico America/Tortola
-L Pacific/Port_Moresby Antarctica/DumontDUrville
-L Pacific/Auckland Antarctica/McMurdo
-L Asia/Riyadh Antarctica/Syowa
-L Europe/Berlin Arctic/Longyearbyen
-L Asia/Riyadh Asia/Aden
-L Asia/Qatar Asia/Bahrain
-L Asia/Kuching Asia/Brunei
-L Asia/Singapore Asia/Kuala_Lumpur
-L Asia/Riyadh Asia/Kuwait
-L Asia/Dubai Asia/Muscat
-L Asia/Bangkok Asia/Phnom_Penh
-L Asia/Bangkok Asia/Vientiane
-L Africa/Abidjan Atlantic/Reykjavik
-L Africa/Abidjan Atlantic/St_Helena
-L Europe/Brussels Europe/Amsterdam
-L Europe/Prague Europe/Bratislava
-L Europe/Zurich Europe/Busingen
-L Europe/Berlin Europe/Copenhagen
-L Europe/London Europe/Guernsey
-L Europe/London Europe/Isle_of_Man
-L Europe/London Europe/Jersey
-L Europe/Belgrade Europe/Ljubljana
-L Europe/Brussels Europe/Luxembourg
-L Europe/Helsinki Europe/Mariehamn
-L Europe/Paris Europe/Monaco
-L Europe/Berlin Europe/Oslo
-L Europe/Belgrade Europe/Podgorica
-L Europe/Rome Europe/San_Marino
-L Europe/Belgrade Europe/Sarajevo
-L Europe/Belgrade Europe/Skopje
-L Europe/Berlin Europe/Stockholm
-L Europe/Zurich Europe/Vaduz
-L Europe/Rome Europe/Vatican
-L Europe/Belgrade Europe/Zagreb
-L Africa/Nairobi Indian/Antananarivo
-L Asia/Bangkok Indian/Christmas
-L Asia/Yangon Indian/Cocos
-L Africa/Nairobi Indian/Comoro
-L Indian/Maldives Indian/Kerguelen
-L Asia/Dubai Indian/Mahe
-L Africa/Nairobi Indian/Mayotte
-L Asia/Dubai Indian/Reunion
-L Pacific/Port_Moresby Pacific/Chuuk
-L Pacific/Tarawa Pacific/Funafuti
-L Pacific/Tarawa Pacific/Majuro
-L Pacific/Pago_Pago Pacific/Midway
-L Pacific/Guadalcanal Pacific/Pohnpei
-L Pacific/Guam Pacific/Saipan
-L Pacific/Tarawa Pacific/Wake
-L Pacific/Tarawa Pacific/Wallis
-L Africa/Abidjan Africa/Timbuktu
-L America/Argentina/Catamarca America/Argentina/ComodRivadavia
-L America/Adak America/Atka
-L America/Panama America/Coral_Harbour
-L America/Tijuana America/Ensenada
-L America/Indiana/Indianapolis America/Fort_Wayne
-L America/Toronto America/Montreal
-L America/Toronto America/Nipigon
-L America/Iqaluit America/Pangnirtung
-L America/Rio_Branco America/Porto_Acre
-L America/Winnipeg America/Rainy_River
-L America/Argentina/Cordoba America/Rosario
-L America/Tijuana America/Santa_Isabel
-L America/Denver America/Shiprock
-L America/Toronto America/Thunder_Bay
-L America/Edmonton America/Yellowknife
-L Pacific/Auckland Antarctica/South_Pole
-L Asia/Ulaanbaatar Asia/Choibalsan
-L Asia/Shanghai Asia/Chongqing
-L Asia/Shanghai Asia/Harbin
-L Asia/Urumqi Asia/Kashgar
-L Asia/Jerusalem Asia/Tel_Aviv
-L Europe/Berlin Atlantic/Jan_Mayen
-L Australia/Sydney Australia/Canberra
-L Australia/Hobart Australia/Currie
-L Europe/London Europe/Belfast
-L Europe/Chisinau Europe/Tiraspol
-L Europe/Kyiv Europe/Uzhgorod
-L Europe/Kyiv Europe/Zaporozhye
-L Pacific/Kanton Pacific/Enderbury
-L Pacific/Honolulu Pacific/Johnston
-L Pacific/Port_Moresby Pacific/Yap
-L Europe/Lisbon WET
-L Africa/Nairobi Africa/Asmera
-L America/Nuuk America/Godthab
-L Asia/Ashgabat Asia/Ashkhabad
-L Asia/Kolkata Asia/Calcutta
-L Asia/Shanghai Asia/Chungking
-L Asia/Dhaka Asia/Dacca
-L Europe/Istanbul Asia/Istanbul
-L Asia/Kathmandu Asia/Katmandu
-L Asia/Macau Asia/Macao
-L Asia/Yangon Asia/Rangoon
-L Asia/Ho_Chi_Minh Asia/Saigon
-L Asia/Thimphu Asia/Thimbu
-L Asia/Makassar Asia/Ujung_Pandang
-L Asia/Ulaanbaatar Asia/Ulan_Bator
-L Atlantic/Faroe Atlantic/Faeroe
-L Europe/Kyiv Europe/Kiev
-L Asia/Nicosia Europe/Nicosia
-L Pacific/Honolulu HST
-L America/Los_Angeles PST8PDT
-L Pacific/Guadalcanal Pacific/Ponape
-L Pacific/Port_Moresby Pacific/Truk
diff --git a/lib/pytz/zoneinfo/zone.tab b/lib/pytz/zoneinfo/zone.tab
index bfc0b593..a7373f17 100644
--- a/lib/pytz/zoneinfo/zone.tab
+++ b/lib/pytz/zoneinfo/zone.tab
@@ -1,9 +1,9 @@
-# tzdb timezone descriptions (deprecated version)
+# tz zone descriptions (deprecated version)
 #
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
-# From Paul Eggert (2021-09-20):
+# From Paul Eggert (2014-07-31):
 # This file is intended as a backward-compatibility aid for older programs.
 # New programs should use zone1970.tab.  This file is like zone1970.tab (see
 # zone1970.tab's comments), but with the following additional restrictions:
@@ -12,16 +12,13 @@
 # 2.  The first data column contains exactly one country code.
 #
 # Because of (2), each row stands for an area that is the intersection
-# of a region identified by a country code and of a timezone where civil
+# of a region identified by a country code and of a zone where civil
 # clocks have agreed since 1970; this is a narrower definition than
 # that of zone1970.tab.
 #
-# Unlike zone1970.tab, a row's third column can be a Link from
-# 'backward' instead of a Zone.
-#
-# This table is intended as an aid for users, to help them select timezones
-# appropriate for their practical needs.  It is not intended to take or
-# endorse any position on legal or territorial claims.
+# This table is intended as an aid for users, to help them select time
+# zone data entries appropriate for their practical needs.  It is not
+# intended to take or endorse any position on legal or territorial claims.
 #
 #country-
 #code	coordinates	TZ			comments
@@ -33,19 +30,19 @@ AI	+1812-06304	America/Anguilla
 AL	+4120+01950	Europe/Tirane
 AM	+4011+04430	Asia/Yerevan
 AO	-0848+01314	Africa/Luanda
-AQ	-7750+16636	Antarctica/McMurdo	New Zealand time - McMurdo, South Pole
-AQ	-6617+11031	Antarctica/Casey	Casey
-AQ	-6835+07758	Antarctica/Davis	Davis
-AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville
-AQ	-6736+06253	Antarctica/Mawson	Mawson
-AQ	-6448-06406	Antarctica/Palmer	Palmer
-AQ	-6734-06808	Antarctica/Rothera	Rothera
-AQ	-690022+0393524	Antarctica/Syowa	Syowa
-AQ	-720041+0023206	Antarctica/Troll	Troll
-AQ	-7824+10654	Antarctica/Vostok	Vostok
+AQ	-7750+16636	Antarctica/McMurdo	McMurdo, South Pole, Scott (New Zealand time)
+AQ	-6734-06808	Antarctica/Rothera	Rothera Station, Adelaide Island
+AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
+AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
+AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
+AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
+AQ	-7824+10654	Antarctica/Vostok	Vostok Station, Lake Vostok
+AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Adelie Land
+AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
+AQ	-720041+0023206	Antarctica/Troll	Troll Station, Queen Maud Land
 AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
-AR	-3124-06411	America/Argentina/Cordoba	Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)
-AR	-2447-06525	America/Argentina/Salta	Salta (SA, LP, NQ, RN)
+AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
+AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
 AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
 AR	-2649-06513	America/Argentina/Tucuman	Tucuman (TM)
 AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
@@ -59,16 +56,17 @@ AS	-1416-17042	Pacific/Pago_Pago
 AT	+4813+01620	Europe/Vienna
 AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
 AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
-AU	-4253+14719	Australia/Hobart	Tasmania
+AU	-4253+14719	Australia/Hobart	Tasmania - most locations
+AU	-3956+14352	Australia/Currie	Tasmania - King Island
 AU	-3749+14458	Australia/Melbourne	Victoria
-AU	-3352+15113	Australia/Sydney	New South Wales (most areas)
-AU	-3157+14127	Australia/Broken_Hill	New South Wales (Yancowinna)
-AU	-2728+15302	Australia/Brisbane	Queensland (most areas)
-AU	-2016+14900	Australia/Lindeman	Queensland (Whitsunday Islands)
+AU	-3352+15113	Australia/Sydney	New South Wales - most locations
+AU	-3157+14127	Australia/Broken_Hill	New South Wales - Yancowinna
+AU	-2728+15302	Australia/Brisbane	Queensland - most locations
+AU	-2016+14900	Australia/Lindeman	Queensland - Holiday Islands
 AU	-3455+13835	Australia/Adelaide	South Australia
 AU	-1228+13050	Australia/Darwin	Northern Territory
-AU	-3157+11551	Australia/Perth	Western Australia (most areas)
-AU	-3143+12852	Australia/Eucla	Western Australia (Eucla)
+AU	-3157+11551	Australia/Perth	Western Australia - most locations
+AU	-3143+12852	Australia/Eucla	Western Australia - Eucla area
 AW	+1230-06958	America/Aruba
 AX	+6006+01957	Europe/Mariehamn
 AZ	+4023+04951	Asia/Baku
@@ -87,59 +85,62 @@ BN	+0456+11455	Asia/Brunei
 BO	-1630-06809	America/La_Paz
 BQ	+120903-0681636	America/Kralendijk
 BR	-0351-03225	America/Noronha	Atlantic islands
-BR	-0127-04829	America/Belem	Para (east), Amapa
-BR	-0343-03830	America/Fortaleza	Brazil (northeast: MA, PI, CE, RN, PB)
+BR	-0127-04829	America/Belem	Amapa, E Para
+BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PB)
 BR	-0803-03454	America/Recife	Pernambuco
 BR	-0712-04812	America/Araguaina	Tocantins
 BR	-0940-03543	America/Maceio	Alagoas, Sergipe
 BR	-1259-03831	America/Bahia	Bahia
-BR	-2332-04637	America/Sao_Paulo	Brazil (southeast: GO, DF, MG, ES, RJ, SP, PR, SC, RS)
+BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
 BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
 BR	-1535-05605	America/Cuiaba	Mato Grosso
-BR	-0226-05452	America/Santarem	Para (west)
+BR	-0226-05452	America/Santarem	W Para
 BR	-0846-06354	America/Porto_Velho	Rondonia
 BR	+0249-06040	America/Boa_Vista	Roraima
-BR	-0308-06001	America/Manaus	Amazonas (east)
-BR	-0640-06952	America/Eirunepe	Amazonas (west)
+BR	-0308-06001	America/Manaus	E Amazonas
+BR	-0640-06952	America/Eirunepe	W Amazonas
 BR	-0958-06748	America/Rio_Branco	Acre
 BS	+2505-07721	America/Nassau
 BT	+2728+08939	Asia/Thimphu
 BW	-2439+02555	Africa/Gaborone
 BY	+5354+02734	Europe/Minsk
 BZ	+1730-08812	America/Belize
-CA	+4734-05243	America/St_Johns	Newfoundland, Labrador (SE)
-CA	+4439-06336	America/Halifax	Atlantic - NS (most areas), PE
-CA	+4612-05957	America/Glace_Bay	Atlantic - NS (Cape Breton)
-CA	+4606-06447	America/Moncton	Atlantic - New Brunswick
-CA	+5320-06025	America/Goose_Bay	Atlantic - Labrador (most areas)
-CA	+5125-05707	America/Blanc-Sablon	AST - QC (Lower North Shore)
-CA	+4339-07923	America/Toronto	Eastern - ON & QC (most areas)
-CA	+6344-06828	America/Iqaluit	Eastern - NU (most areas)
-CA	+484531-0913718	America/Atikokan	EST - ON (Atikokan), NU (Coral H)
-CA	+4953-09709	America/Winnipeg	Central - ON (west), Manitoba
-CA	+744144-0944945	America/Resolute	Central - NU (Resolute)
-CA	+624900-0920459	America/Rankin_Inlet	Central - NU (central)
-CA	+5024-10439	America/Regina	CST - SK (most areas)
-CA	+5017-10750	America/Swift_Current	CST - SK (midwest)
-CA	+5333-11328	America/Edmonton	Mountain - AB, BC(E), NT(E), SK(W)
-CA	+690650-1050310	America/Cambridge_Bay	Mountain - NU (west)
-CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
-CA	+4906-11631	America/Creston	MST - BC (Creston)
-CA	+5546-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
-CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
-CA	+6043-13503	America/Whitehorse	MST - Yukon (east)
-CA	+6404-13925	America/Dawson	MST - Yukon (west)
-CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
+CA	+4734-05243	America/St_Johns	Newfoundland Time, including SE Labrador
+CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (most places), PEI
+CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
+CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
+CA	+5320-06025	America/Goose_Bay	Atlantic Time - Labrador - most locations
+CA	+5125-05707	America/Blanc-Sablon	Atlantic Standard Time - Quebec - Lower North Shore
+CA	+4339-07923	America/Toronto	Eastern Time - Ontario & Quebec - most locations
+CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
+CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
+CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut - most locations
+CA	+6608-06544	America/Pangnirtung	Eastern Time - Pangnirtung, Nunavut
+CA	+744144-0944945	America/Resolute	Central Time - Resolute, Nunavut
+CA	+484531-0913718	America/Atikokan	Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
+CA	+624900-0920459	America/Rankin_Inlet	Central Time - central Nunavut
+CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
+CA	+4843-09434	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
+CA	+5024-10439	America/Regina	Central Standard Time - Saskatchewan - most locations
+CA	+5017-10750	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
+CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
+CA	+690650-1050310	America/Cambridge_Bay	Mountain Time - west Nunavut
+CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
+CA	+682059-1334300	America/Inuvik	Mountain Time - west Northwest Territories
+CA	+4906-11631	America/Creston	Mountain Standard Time - Creston, British Columbia
+CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
+CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
+CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
+CA	+6404-13925	America/Dawson	Pacific Time - north Yukon
 CC	-1210+09655	Indian/Cocos
-CD	-0418+01518	Africa/Kinshasa	Dem. Rep. of Congo (west)
-CD	-1140+02728	Africa/Lubumbashi	Dem. Rep. of Congo (east)
+CD	-0418+01518	Africa/Kinshasa	west Dem. Rep. of Congo
+CD	-1140+02728	Africa/Lubumbashi	east Dem. Rep. of Congo
 CF	+0422+01835	Africa/Bangui
 CG	-0416+01517	Africa/Brazzaville
 CH	+4723+00832	Europe/Zurich
 CI	+0519-00402	Africa/Abidjan
 CK	-2114-15946	Pacific/Rarotonga
-CL	-3327-07040	America/Santiago	most of Chile
-CL	-5309-07055	America/Punta_Arenas	Region of Magallanes
+CL	-3327-07040	America/Santiago	most locations
 CL	-2709-10926	Pacific/Easter	Easter Island
 CM	+0403+00942	Africa/Douala
 CN	+3114+12128	Asia/Shanghai	Beijing Time
@@ -150,31 +151,30 @@ CU	+2308-08222	America/Havana
 CV	+1455-02331	Atlantic/Cape_Verde
 CW	+1211-06900	America/Curacao
 CX	-1025+10543	Indian/Christmas
-CY	+3510+03322	Asia/Nicosia	most of Cyprus
-CY	+3507+03357	Asia/Famagusta	Northern Cyprus
+CY	+3510+03322	Asia/Nicosia
 CZ	+5005+01426	Europe/Prague
-DE	+5230+01322	Europe/Berlin	most of Germany
+DE	+5230+01322	Europe/Berlin	most locations
 DE	+4742+00841	Europe/Busingen	Busingen
 DJ	+1136+04309	Africa/Djibouti
 DK	+5540+01235	Europe/Copenhagen
 DM	+1518-06124	America/Dominica
 DO	+1828-06954	America/Santo_Domingo
 DZ	+3647+00303	Africa/Algiers
-EC	-0210-07950	America/Guayaquil	Ecuador (mainland)
+EC	-0210-07950	America/Guayaquil	mainland
 EC	-0054-08936	Pacific/Galapagos	Galapagos Islands
 EE	+5925+02445	Europe/Tallinn
 EG	+3003+03115	Africa/Cairo
 EH	+2709-01312	Africa/El_Aaiun
 ER	+1520+03853	Africa/Asmara
-ES	+4024-00341	Europe/Madrid	Spain (mainland)
-ES	+3553-00519	Africa/Ceuta	Ceuta, Melilla
+ES	+4024-00341	Europe/Madrid	mainland
+ES	+3553-00519	Africa/Ceuta	Ceuta & Melilla
 ES	+2806-01524	Atlantic/Canary	Canary Islands
 ET	+0902+03842	Africa/Addis_Ababa
 FI	+6010+02458	Europe/Helsinki
 FJ	-1808+17825	Pacific/Fiji
 FK	-5142-05751	Atlantic/Stanley
-FM	+0725+15147	Pacific/Chuuk	Chuuk/Truk, Yap
-FM	+0658+15813	Pacific/Pohnpei	Pohnpei/Ponape
+FM	+0725+15147	Pacific/Chuuk	Chuuk (Truk) and Yap
+FM	+0658+15813	Pacific/Pohnpei	Pohnpei (Ponape)
 FM	+0519+16259	Pacific/Kosrae	Kosrae
 FO	+6201-00646	Atlantic/Faroe
 FR	+4852+00220	Europe/Paris
@@ -183,13 +183,13 @@ GB	+513030-0000731	Europe/London
 GD	+1203-06145	America/Grenada
 GE	+4143+04449	Asia/Tbilisi
 GF	+0456-05220	America/Cayenne
-GG	+492717-0023210	Europe/Guernsey
+GG	+4927-00232	Europe/Guernsey
 GH	+0533-00013	Africa/Accra
 GI	+3608-00521	Europe/Gibraltar
-GL	+6411-05144	America/Nuuk	most of Greenland
-GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
-GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
-GL	+7634-06847	America/Thule	Thule/Pituffik
+GL	+6411-05144	America/Godthab	most locations
+GL	+7646-01840	America/Danmarkshavn	east coast, north of Scoresbysund
+GL	+7029-02158	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
+GL	+7634-06847	America/Thule	Thule / Pituffik
 GM	+1328-01639	Africa/Banjul
 GN	+0931-01343	Africa/Conakry
 GP	+1614-06132	America/Guadeloupe
@@ -205,10 +205,10 @@ HN	+1406-08713	America/Tegucigalpa
 HR	+4548+01558	Europe/Zagreb
 HT	+1832-07220	America/Port-au-Prince
 HU	+4730+01905	Europe/Budapest
-ID	-0610+10648	Asia/Jakarta	Java, Sumatra
-ID	-0002+10920	Asia/Pontianak	Borneo (west, central)
-ID	-0507+11924	Asia/Makassar	Borneo (east, south), Sulawesi/Celebes, Bali, Nusa Tengarra, Timor (west)
-ID	-0232+14042	Asia/Jayapura	New Guinea (West Papua / Irian Jaya), Malukus/Moluccas
+ID	-0610+10648	Asia/Jakarta	Java & Sumatra
+ID	-0002+10920	Asia/Pontianak	west & central Borneo
+ID	-0507+11924	Asia/Makassar	east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
+ID	-0232+14042	Asia/Jayapura	west New Guinea (Irian Jaya) & Malukus (Moluccas)
 IE	+5320-00615	Europe/Dublin
 IL	+314650+0351326	Asia/Jerusalem
 IM	+5409-00428	Europe/Isle_of_Man
@@ -218,7 +218,7 @@ IQ	+3321+04425	Asia/Baghdad
 IR	+3540+05126	Asia/Tehran
 IS	+6409-02151	Atlantic/Reykjavik
 IT	+4154+01229	Europe/Rome
-JE	+491101-0020624	Europe/Jersey
+JE	+4912-00207	Europe/Jersey
 JM	+175805-0764736	America/Jamaica
 JO	+3157+03556	Asia/Amman
 JP	+353916+1394441	Asia/Tokyo
@@ -226,7 +226,7 @@ KE	-0117+03649	Africa/Nairobi
 KG	+4254+07436	Asia/Bishkek
 KH	+1133+10455	Asia/Phnom_Penh
 KI	+0125+17300	Pacific/Tarawa	Gilbert Islands
-KI	-0247-17143	Pacific/Kanton	Phoenix Islands
+KI	-0308-17105	Pacific/Enderbury	Phoenix Islands
 KI	+0152-15720	Pacific/Kiritimati	Line Islands
 KM	-1141+04316	Indian/Comoro
 KN	+1718-06243	America/St_Kitts
@@ -234,12 +234,10 @@ KP	+3901+12545	Asia/Pyongyang
 KR	+3733+12658	Asia/Seoul
 KW	+2920+04759	Asia/Kuwait
 KY	+1918-08123	America/Cayman
-KZ	+4315+07657	Asia/Almaty	most of Kazakhstan
-KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda/Kyzylorda/Kzyl-Orda
-KZ	+5312+06337	Asia/Qostanay	Qostanay/Kostanay/Kustanay
-KZ	+5017+05710	Asia/Aqtobe	Aqtobe/Aktobe
-KZ	+4431+05016	Asia/Aqtau	Mangghystau/Mankistau
-KZ	+4707+05156	Asia/Atyrau	Atyrau/Atirau/Gur'yev
+KZ	+4315+07657	Asia/Almaty	most locations
+KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda (Kyzylorda, Kzyl-Orda)
+KZ	+5017+05710	Asia/Aqtobe	Aqtobe (Aktobe)
+KZ	+4431+05016	Asia/Aqtau	Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)
 KZ	+5113+05121	Asia/Oral	West Kazakhstan
 LA	+1758+10236	Asia/Vientiane
 LB	+3353+03530	Asia/Beirut
@@ -258,14 +256,15 @@ MD	+4700+02850	Europe/Chisinau
 ME	+4226+01916	Europe/Podgorica
 MF	+1804-06305	America/Marigot
 MG	-1855+04731	Indian/Antananarivo
-MH	+0709+17112	Pacific/Majuro	most of Marshall Islands
+MH	+0709+17112	Pacific/Majuro	most locations
 MH	+0905+16720	Pacific/Kwajalein	Kwajalein
 MK	+4159+02126	Europe/Skopje
 ML	+1239-00800	Africa/Bamako
-MM	+1647+09610	Asia/Yangon
-MN	+4755+10653	Asia/Ulaanbaatar	most of Mongolia
-MN	+4801+09139	Asia/Hovd	Bayan-Olgii, Hovd, Uvs
-MO	+221150+1133230	Asia/Macau
+MM	+1647+09610	Asia/Rangoon
+MN	+4755+10653	Asia/Ulaanbaatar	most locations
+MN	+4801+09139	Asia/Hovd	Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
+MN	+4804+11430	Asia/Choibalsan	Dornod, Sukhbaatar
+MO	+2214+11335	Asia/Macau
 MP	+1512+14545	Pacific/Saipan
 MQ	+1436-06105	America/Martinique
 MR	+1806-01557	Africa/Nouakchott
@@ -274,20 +273,20 @@ MT	+3554+01431	Europe/Malta
 MU	-2010+05730	Indian/Mauritius
 MV	+0410+07330	Indian/Maldives
 MW	-1547+03500	Africa/Blantyre
-MX	+1924-09909	America/Mexico_City	Central Mexico
-MX	+2105-08646	America/Cancun	Quintana Roo
-MX	+2058-08937	America/Merida	Campeche, Yucatan
-MX	+2540-10019	America/Monterrey	Durango; Coahuila, Nuevo Leon, Tamaulipas (most areas)
-MX	+2550-09730	America/Matamoros	Coahuila, Nuevo Leon, Tamaulipas (US border)
-MX	+2838-10605	America/Chihuahua	Chihuahua (most areas)
-MX	+3144-10629	America/Ciudad_Juarez	Chihuahua (US border - west)
-MX	+2934-10425	America/Ojinaga	Chihuahua (US border - east)
-MX	+2313-10625	America/Mazatlan	Baja California Sur, Nayarit (most areas), Sinaloa
-MX	+2048-10515	America/Bahia_Banderas	Bahia de Banderas
-MX	+2904-11058	America/Hermosillo	Sonora
-MX	+3232-11701	America/Tijuana	Baja California
-MY	+0310+10142	Asia/Kuala_Lumpur	Malaysia (peninsula)
-MY	+0133+11020	Asia/Kuching	Sabah, Sarawak
+MX	+1924-09909	America/Mexico_City	Central Time - most locations
+MX	+2105-08646	America/Cancun	Central Time - Quintana Roo
+MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatan
+MX	+2540-10019	America/Monterrey	Mexican Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas away from US border
+MX	+2550-09730	America/Matamoros	US Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas near US border
+MX	+2313-10625	America/Mazatlan	Mountain Time - S Baja, Nayarit, Sinaloa
+MX	+2838-10605	America/Chihuahua	Mexican Mountain Time - Chihuahua away from US border
+MX	+2934-10425	America/Ojinaga	US Mountain Time - Chihuahua near US border
+MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
+MX	+3232-11701	America/Tijuana	US Pacific Time - Baja California near US border
+MX	+3018-11452	America/Santa_Isabel	Mexican Pacific Time - Baja California away from US border
+MX	+2048-10515	America/Bahia_Banderas	Mexican Central Time - Bahia de Banderas
+MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
+MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
 MZ	-2558+03235	Africa/Maputo
 NA	-2234+01706	Africa/Windhoek
 NC	-2216+16627	Pacific/Noumea
@@ -300,7 +299,7 @@ NO	+5955+01045	Europe/Oslo
 NP	+2743+08519	Asia/Kathmandu
 NR	-0031+16655	Pacific/Nauru
 NU	-1901-16955	Pacific/Niue
-NZ	-3652+17446	Pacific/Auckland	most of New Zealand
+NZ	-3652+17446	Pacific/Auckland	most locations
 NZ	-4357-17633	Pacific/Chatham	Chatham Islands
 OM	+2336+05835	Asia/Muscat
 PA	+0858-07932	America/Panama
@@ -308,7 +307,7 @@ PE	-1203-07703	America/Lima
 PF	-1732-14934	Pacific/Tahiti	Society Islands
 PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
 PF	-2308-13457	Pacific/Gambier	Gambier Islands
-PG	-0930+14710	Pacific/Port_Moresby	most of Papua New Guinea
+PG	-0930+14710	Pacific/Port_Moresby	most locations
 PG	-0613+15534	Pacific/Bougainville	Bougainville
 PH	+1435+12100	Asia/Manila
 PK	+2452+06703	Asia/Karachi
@@ -318,7 +317,7 @@ PN	-2504-13005	Pacific/Pitcairn
 PR	+182806-0660622	America/Puerto_Rico
 PS	+3130+03428	Asia/Gaza	Gaza Strip
 PS	+313200+0350542	Asia/Hebron	West Bank
-PT	+3843-00908	Europe/Lisbon	Portugal (mainland)
+PT	+3843-00908	Europe/Lisbon	mainland
 PT	+3238-01654	Atlantic/Madeira	Madeira Islands
 PT	+3744-02540	Atlantic/Azores	Azores
 PW	+0720+13429	Pacific/Palau
@@ -327,36 +326,27 @@ QA	+2517+05132	Asia/Qatar
 RE	-2052+05528	Indian/Reunion
 RO	+4426+02606	Europe/Bucharest
 RS	+4450+02030	Europe/Belgrade
-RU	+5443+02030	Europe/Kaliningrad	MSK-01 - Kaliningrad
-RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
-# The obsolescent zone.tab format cannot represent Europe/Simferopol well.
-# Put it in RU section and list as UA.  See "territorial claims" above.
-# Programs should use zone1970.tab instead; see above.
-UA	+4457+03406	Europe/Simferopol	Crimea
-RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
-RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd
-RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
-RU	+5134+04602	Europe/Saratov	MSK+01 - Saratov
-RU	+5420+04824	Europe/Ulyanovsk	MSK+01 - Ulyanovsk
-RU	+5312+05009	Europe/Samara	MSK+01 - Samara, Udmurtia
-RU	+5651+06036	Asia/Yekaterinburg	MSK+02 - Urals
-RU	+5500+07324	Asia/Omsk	MSK+03 - Omsk
-RU	+5502+08255	Asia/Novosibirsk	MSK+04 - Novosibirsk
-RU	+5322+08345	Asia/Barnaul	MSK+04 - Altai
-RU	+5630+08458	Asia/Tomsk	MSK+04 - Tomsk
-RU	+5345+08707	Asia/Novokuznetsk	MSK+04 - Kemerovo
-RU	+5601+09250	Asia/Krasnoyarsk	MSK+04 - Krasnoyarsk area
-RU	+5216+10420	Asia/Irkutsk	MSK+05 - Irkutsk, Buryatia
-RU	+5203+11328	Asia/Chita	MSK+06 - Zabaykalsky
-RU	+6200+12940	Asia/Yakutsk	MSK+06 - Lena River
-RU	+623923+1353314	Asia/Khandyga	MSK+06 - Tomponsky, Ust-Maysky
-RU	+4310+13156	Asia/Vladivostok	MSK+07 - Amur River
-RU	+643337+1431336	Asia/Ust-Nera	MSK+07 - Oymyakonsky
-RU	+5934+15048	Asia/Magadan	MSK+08 - Magadan
-RU	+4658+14242	Asia/Sakhalin	MSK+08 - Sakhalin Island
-RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E), N Kuril Is
-RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka
-RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
+RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
+RU	+554521+0373704	Europe/Moscow	Moscow+00 - west Russia
+RU	+4457+03406	Europe/Simferopol	Moscow+00 - Crimea
+RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
+RU	+5312+05009	Europe/Samara	Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia
+RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
+RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
+RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
+RU	+5345+08707	Asia/Novokuznetsk	Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo
+RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
+RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
+RU	+5203+11328	Asia/Chita	Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky
+RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River
+RU	+623923+1353314	Asia/Khandyga	Moscow+06 - Tomponsky, Ust-Maysky
+RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
+RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
+RU	+643337+1431336	Asia/Ust-Nera	Moscow+07 - Oymyakonsky
+RU	+5934+15048	Asia/Magadan	Moscow+08 (Moscow+07 after 2014-10-26) - Magadan
+RU	+6728+15343	Asia/Srednekolymsk	Moscow+08 - E Sakha, N Kuril Is
+RU	+5301+15839	Asia/Kamchatka	Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka
+RU	+6445+17729	Asia/Anadyr	Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea
 RW	-0157+03004	Africa/Kigali
 SA	+2438+04643	Asia/Riyadh
 SB	-0932+16012	Pacific/Guadalcanal
@@ -373,7 +363,7 @@ SM	+4355+01228	Europe/San_Marino
 SN	+1440-01726	Africa/Dakar
 SO	+0204+04522	Africa/Mogadishu
 SR	+0550-05510	America/Paramaribo
-SS	+0451+03137	Africa/Juba
+SS	+0451+03136	Africa/Juba
 ST	+0020+00644	Africa/Sao_Tome
 SV	+1342-08912	America/El_Salvador
 SX	+180305-0630250	America/Lower_Princes
@@ -389,48 +379,51 @@ TK	-0922-17114	Pacific/Fakaofo
 TL	-0833+12535	Asia/Dili
 TM	+3757+05823	Asia/Ashgabat
 TN	+3648+01011	Africa/Tunis
-TO	-210800-1751200	Pacific/Tongatapu
+TO	-2110-17510	Pacific/Tongatapu
 TR	+4101+02858	Europe/Istanbul
 TT	+1039-06131	America/Port_of_Spain
 TV	-0831+17913	Pacific/Funafuti
 TW	+2503+12130	Asia/Taipei
 TZ	-0648+03917	Africa/Dar_es_Salaam
-UA	+5026+03031	Europe/Kyiv	most of Ukraine
+UA	+5026+03031	Europe/Kiev	most locations
+UA	+4837+02218	Europe/Uzhgorod	Ruthenia
+UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
 UG	+0019+03225	Africa/Kampala
+UM	+1645-16931	Pacific/Johnston	Johnston Atoll
 UM	+2813-17722	Pacific/Midway	Midway Islands
 UM	+1917+16637	Pacific/Wake	Wake Island
-US	+404251-0740023	America/New_York	Eastern (most areas)
-US	+421953-0830245	America/Detroit	Eastern - MI (most areas)
-US	+381515-0854534	America/Kentucky/Louisville	Eastern - KY (Louisville area)
-US	+364947-0845057	America/Kentucky/Monticello	Eastern - KY (Wayne)
-US	+394606-0860929	America/Indiana/Indianapolis	Eastern - IN (most areas)
-US	+384038-0873143	America/Indiana/Vincennes	Eastern - IN (Da, Du, K, Mn)
-US	+410305-0863611	America/Indiana/Winamac	Eastern - IN (Pulaski)
-US	+382232-0862041	America/Indiana/Marengo	Eastern - IN (Crawford)
-US	+382931-0871643	America/Indiana/Petersburg	Eastern - IN (Pike)
-US	+384452-0850402	America/Indiana/Vevay	Eastern - IN (Switzerland)
-US	+415100-0873900	America/Chicago	Central (most areas)
-US	+375711-0864541	America/Indiana/Tell_City	Central - IN (Perry)
-US	+411745-0863730	America/Indiana/Knox	Central - IN (Starke)
-US	+450628-0873651	America/Menominee	Central - MI (Wisconsin border)
-US	+470659-1011757	America/North_Dakota/Center	Central - ND (Oliver)
-US	+465042-1012439	America/North_Dakota/New_Salem	Central - ND (Morton rural)
-US	+471551-1014640	America/North_Dakota/Beulah	Central - ND (Mercer)
-US	+394421-1045903	America/Denver	Mountain (most areas)
-US	+433649-1161209	America/Boise	Mountain - ID (south), OR (east)
-US	+332654-1120424	America/Phoenix	MST - AZ (except Navajo)
-US	+340308-1181434	America/Los_Angeles	Pacific
-US	+611305-1495401	America/Anchorage	Alaska (most areas)
-US	+581807-1342511	America/Juneau	Alaska - Juneau area
-US	+571035-1351807	America/Sitka	Alaska - Sitka area
-US	+550737-1313435	America/Metlakatla	Alaska - Annette Island
-US	+593249-1394338	America/Yakutat	Alaska - Yakutat
-US	+643004-1652423	America/Nome	Alaska (west)
-US	+515248-1763929	America/Adak	Alaska - western Aleutians
+US	+404251-0740023	America/New_York	Eastern Time
+US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
+US	+381515-0854534	America/Kentucky/Louisville	Eastern Time - Kentucky - Louisville area
+US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
+US	+394606-0860929	America/Indiana/Indianapolis	Eastern Time - Indiana - most locations
+US	+384038-0873143	America/Indiana/Vincennes	Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
+US	+410305-0863611	America/Indiana/Winamac	Eastern Time - Indiana - Pulaski County
+US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford County
+US	+382931-0871643	America/Indiana/Petersburg	Eastern Time - Indiana - Pike County
+US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
+US	+415100-0873900	America/Chicago	Central Time
+US	+375711-0864541	America/Indiana/Tell_City	Central Time - Indiana - Perry County
+US	+411745-0863730	America/Indiana/Knox	Central Time - Indiana - Starke County
+US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
+US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
+US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota - Morton County (except Mandan area)
+US	+471551-1014640	America/North_Dakota/Beulah	Central Time - North Dakota - Mercer County
+US	+394421-1045903	America/Denver	Mountain Time
+US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
+US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona (except Navajo)
+US	+340308-1181434	America/Los_Angeles	Pacific Time
+US	+550737-1313435	America/Metlakatla	Pacific Standard Time - Annette Island, Alaska
+US	+611305-1495401	America/Anchorage	Alaska Time
+US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
+US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
+US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
+US	+643004-1652423	America/Nome	Alaska Time - west Alaska
+US	+515248-1763929	America/Adak	Aleutian Islands
 US	+211825-1575130	Pacific/Honolulu	Hawaii
-UY	-345433-0561245	America/Montevideo
-UZ	+3940+06648	Asia/Samarkand	Uzbekistan (west)
-UZ	+4120+06918	Asia/Tashkent	Uzbekistan (east)
+UY	-3453-05611	America/Montevideo
+UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
+UZ	+4120+06918	Asia/Tashkent	east Uzbekistan
 VA	+415408+0122711	Europe/Vatican
 VC	+1309-06114	America/St_Vincent
 VE	+1030-06656	America/Caracas
diff --git a/lib/pytz/zoneinfo/zone1970.tab b/lib/pytz/zoneinfo/zone1970.tab
index 7726f39a..e971bc7f 100644
--- a/lib/pytz/zoneinfo/zone1970.tab
+++ b/lib/pytz/zoneinfo/zone1970.tab
@@ -1,56 +1,55 @@
-# tzdb timezone descriptions
+# tz zone descriptions
 #
 # This file is in the public domain.
 #
-# From Paul Eggert (2018-06-27):
-# This file contains a table where each row stands for a timezone where
-# civil timestamps have agreed since 1970.  Columns are separated by
+# From Paul Eggert (2014-07-31):
+# This file contains a table where each row stands for a zone where
+# civil time stamps have agreed since 1970.  Columns are separated by
 # a single tab.  Lines beginning with '#' are comments.  All text uses
 # UTF-8 encoding.  The columns of the table are as follows:
 #
-# 1.  The countries that overlap the timezone, as a comma-separated list
+# 1.  The countries that overlap the zone, as a comma-separated list
 #     of ISO 3166 2-character country codes.  See the file 'iso3166.tab'.
-# 2.  Latitude and longitude of the timezone's principal location
+# 2.  Latitude and longitude of the zone's principal location
 #     in ISO 6709 sign-degrees-minutes-seconds format,
-#     either ±DDMM±DDDMM or ±DDMMSS±DDDMMSS,
+#     either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS,
 #     first latitude (+ is north), then longitude (+ is east).
-# 3.  Timezone name used in value of TZ environment variable.
-#     Please see the theory.html file for how these names are chosen.
-#     If multiple timezones overlap a country, each has a row in the
+# 3.  Zone name used in value of TZ environment variable.
+#     Please see the 'Theory' file for how zone names are chosen.
+#     If multiple zones overlap a country, each has a row in the
 #     table, with each column 1 containing the country code.
-# 4.  Comments; present if and only if countries have multiple timezones,
-#     and useful only for those countries.  For example, the comments
-#     for the row with countries CH,DE,LI and name Europe/Zurich
-#     are useful only for DE, since CH and LI have no other timezones.
+# 4.  Comments; present if and only if a country has multiple zones.
 #
-# If a timezone covers multiple countries, the most-populous city is used,
+# If a zone covers multiple countries, the most-populous city is used,
 # and that country is listed first in column 1; any other countries
 # are listed alphabetically by country code.  The table is sorted
 # first by country code, then (if possible) by an order within the
 # country that (1) makes some geographical sense, and (2) puts the
-# most populous timezones first, where that does not contradict (1).
+# most populous zones first, where that does not contradict (1).
 #
-# This table is intended as an aid for users, to help them select timezones
-# appropriate for their practical needs.  It is not intended to take or
-# endorse any position on legal or territorial claims.
+# This table is intended as an aid for users, to help them select time
+# zone data entries appropriate for their practical needs.  It is not
+# intended to take or endorse any position on legal or territorial claims.
 #
 #country-
 #codes	coordinates	TZ	comments
 AD	+4230+00131	Europe/Andorra
-AE,OM,RE,SC,TF	+2518+05518	Asia/Dubai	Crozet
+AE,OM	+2518+05518	Asia/Dubai
 AF	+3431+06912	Asia/Kabul
 AL	+4120+01950	Europe/Tirane
 AM	+4011+04430	Asia/Yerevan
-AQ	-6617+11031	Antarctica/Casey	Casey
-AQ	-6835+07758	Antarctica/Davis	Davis
-AQ	-6736+06253	Antarctica/Mawson	Mawson
-AQ	-6448-06406	Antarctica/Palmer	Palmer
-AQ	-6734-06808	Antarctica/Rothera	Rothera
-AQ	-720041+0023206	Antarctica/Troll	Troll
-AQ	-7824+10654	Antarctica/Vostok	Vostok
+AQ	-6734-06808	Antarctica/Rothera	Rothera Station, Adelaide Island
+AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
+AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
+AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
+AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
+AQ	-7824+10654	Antarctica/Vostok	Vostok Station, Lake Vostok
+AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Adélie Land
+AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
+AQ	-720041+0023206	Antarctica/Troll	Troll Station, Queen Maud Land
 AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
-AR	-3124-06411	America/Argentina/Cordoba	most areas: CB, CC, CN, ER, FM, MN, SE, SF
-AR	-2447-06525	America/Argentina/Salta	Salta (SA, LP, NQ, RN)
+AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
+AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
 AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
 AR	-2649-06513	America/Argentina/Tucuman	Tucumán (TM)
 AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
@@ -60,71 +59,81 @@ AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
 AR	-3319-06621	America/Argentina/San_Luis	San Luis (SL)
 AR	-5138-06913	America/Argentina/Rio_Gallegos	Santa Cruz (SC)
 AR	-5448-06818	America/Argentina/Ushuaia	Tierra del Fuego (TF)
-AS,UM	-1416-17042	Pacific/Pago_Pago	Midway
+AS,UM	-1416-17042	Pacific/Pago_Pago	Samoa, Midway
 AT	+4813+01620	Europe/Vienna
 AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
 AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
-AU	-4253+14719	Australia/Hobart	Tasmania
+AU	-4253+14719	Australia/Hobart	Tasmania - most locations
+AU	-3956+14352	Australia/Currie	Tasmania - King Island
 AU	-3749+14458	Australia/Melbourne	Victoria
-AU	-3352+15113	Australia/Sydney	New South Wales (most areas)
-AU	-3157+14127	Australia/Broken_Hill	New South Wales (Yancowinna)
-AU	-2728+15302	Australia/Brisbane	Queensland (most areas)
-AU	-2016+14900	Australia/Lindeman	Queensland (Whitsunday Islands)
+AU	-3352+15113	Australia/Sydney	New South Wales - most locations
+AU	-3157+14127	Australia/Broken_Hill	New South Wales - Yancowinna
+AU	-2728+15302	Australia/Brisbane	Queensland - most locations
+AU	-2016+14900	Australia/Lindeman	Queensland - Holiday Islands
 AU	-3455+13835	Australia/Adelaide	South Australia
 AU	-1228+13050	Australia/Darwin	Northern Territory
-AU	-3157+11551	Australia/Perth	Western Australia (most areas)
-AU	-3143+12852	Australia/Eucla	Western Australia (Eucla)
+AU	-3157+11551	Australia/Perth	Western Australia - most locations
+AU	-3143+12852	Australia/Eucla	Western Australia - Eucla area
 AZ	+4023+04951	Asia/Baku
 BB	+1306-05937	America/Barbados
 BD	+2343+09025	Asia/Dhaka
-BE,LU,NL	+5050+00420	Europe/Brussels
+BE	+5050+00420	Europe/Brussels
 BG	+4241+02319	Europe/Sofia
 BM	+3217-06446	Atlantic/Bermuda
+BN	+0456+11455	Asia/Brunei
 BO	-1630-06809	America/La_Paz
 BR	-0351-03225	America/Noronha	Atlantic islands
-BR	-0127-04829	America/Belem	Pará (east), Amapá
-BR	-0343-03830	America/Fortaleza	Brazil (northeast: MA, PI, CE, RN, PB)
+BR	-0127-04829	America/Belem	Amapá, E Pará
+BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PB)
 BR	-0803-03454	America/Recife	Pernambuco
 BR	-0712-04812	America/Araguaina	Tocantins
 BR	-0940-03543	America/Maceio	Alagoas, Sergipe
 BR	-1259-03831	America/Bahia	Bahia
-BR	-2332-04637	America/Sao_Paulo	Brazil (southeast: GO, DF, MG, ES, RJ, SP, PR, SC, RS)
+BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
 BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
 BR	-1535-05605	America/Cuiaba	Mato Grosso
-BR	-0226-05452	America/Santarem	Pará (west)
+BR	-0226-05452	America/Santarem	W Pará
 BR	-0846-06354	America/Porto_Velho	Rondônia
 BR	+0249-06040	America/Boa_Vista	Roraima
-BR	-0308-06001	America/Manaus	Amazonas (east)
-BR	-0640-06952	America/Eirunepe	Amazonas (west)
+BR	-0308-06001	America/Manaus	E Amazonas
+BR	-0640-06952	America/Eirunepe	W Amazonas
 BR	-0958-06748	America/Rio_Branco	Acre
+BS	+2505-07721	America/Nassau
 BT	+2728+08939	Asia/Thimphu
 BY	+5354+02734	Europe/Minsk
 BZ	+1730-08812	America/Belize
-CA	+4734-05243	America/St_Johns	Newfoundland, Labrador (SE)
-CA	+4439-06336	America/Halifax	Atlantic - NS (most areas), PE
-CA	+4612-05957	America/Glace_Bay	Atlantic - NS (Cape Breton)
-CA	+4606-06447	America/Moncton	Atlantic - New Brunswick
-CA	+5320-06025	America/Goose_Bay	Atlantic - Labrador (most areas)
-CA,BS	+4339-07923	America/Toronto	Eastern - ON & QC (most areas)
-CA	+6344-06828	America/Iqaluit	Eastern - NU (most areas)
-CA	+4953-09709	America/Winnipeg	Central - ON (west), Manitoba
-CA	+744144-0944945	America/Resolute	Central - NU (Resolute)
-CA	+624900-0920459	America/Rankin_Inlet	Central - NU (central)
-CA	+5024-10439	America/Regina	CST - SK (most areas)
-CA	+5017-10750	America/Swift_Current	CST - SK (midwest)
-CA	+5333-11328	America/Edmonton	Mountain - AB, BC(E), NT(E), SK(W)
-CA	+690650-1050310	America/Cambridge_Bay	Mountain - NU (west)
-CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
-CA	+5546-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
-CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
-CA	+6043-13503	America/Whitehorse	MST - Yukon (east)
-CA	+6404-13925	America/Dawson	MST - Yukon (west)
-CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
-CH,DE,LI	+4723+00832	Europe/Zurich	Büsingen
-CI,BF,GH,GM,GN,IS,ML,MR,SH,SL,SN,TG	+0519-00402	Africa/Abidjan
+CA	+4734-05243	America/St_Johns	Newfoundland Time, including SE Labrador
+CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (most places), PEI
+CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
+CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
+CA	+5320-06025	America/Goose_Bay	Atlantic Time - Labrador - most locations
+CA	+5125-05707	America/Blanc-Sablon	Atlantic Standard Time - Quebec - Lower North Shore
+CA	+4339-07923	America/Toronto	Eastern Time - Ontario & Quebec - most locations
+CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
+CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
+CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut - most locations
+CA	+6608-06544	America/Pangnirtung	Eastern Time - Pangnirtung, Nunavut
+CA	+744144-0944945	America/Resolute	Central Time - Resolute, Nunavut
+CA	+484531-0913718	America/Atikokan	Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut
+CA	+624900-0920459	America/Rankin_Inlet	Central Time - central Nunavut
+CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
+CA	+4843-09434	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
+CA	+5024-10439	America/Regina	Central Standard Time - Saskatchewan - most locations
+CA	+5017-10750	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
+CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
+CA	+690650-1050310	America/Cambridge_Bay	Mountain Time - west Nunavut
+CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
+CA	+682059-1334300	America/Inuvik	Mountain Time - west Northwest Territories
+CA	+4906-11631	America/Creston	Mountain Standard Time - Creston, British Columbia
+CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
+CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
+CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
+CA	+6404-13925	America/Dawson	Pacific Time - north Yukon
+CC	-1210+09655	Indian/Cocos
+CH,DE,LI	+4723+00832	Europe/Zurich	Swiss time
+CI,BF,GM,GN,ML,MR,SH,SL,SN,ST,TG	+0519-00402	Africa/Abidjan
 CK	-2114-15946	Pacific/Rarotonga
-CL	-3327-07040	America/Santiago	most of Chile
-CL	-5309-07055	America/Punta_Arenas	Region of Magallanes
+CL	-3327-07040	America/Santiago	most locations
 CL	-2709-10926	Pacific/Easter	Easter Island
 CN	+3114+12128	Asia/Shanghai	Beijing Time
 CN	+4348+08735	Asia/Urumqi	Xinjiang Time
@@ -132,34 +141,39 @@ CO	+0436-07405	America/Bogota
 CR	+0956-08405	America/Costa_Rica
 CU	+2308-08222	America/Havana
 CV	+1455-02331	Atlantic/Cape_Verde
-CY	+3510+03322	Asia/Nicosia	most of Cyprus
-CY	+3507+03357	Asia/Famagusta	Northern Cyprus
+CW,AW,BQ,SX	+1211-06900	America/Curacao
+CX	-1025+10543	Indian/Christmas
+CY	+3510+03322	Asia/Nicosia
 CZ,SK	+5005+01426	Europe/Prague
-DE,DK,NO,SE,SJ	+5230+01322	Europe/Berlin	most of Germany
+DE	+5230+01322	Europe/Berlin	Berlin time
+DK	+5540+01235	Europe/Copenhagen
 DO	+1828-06954	America/Santo_Domingo
 DZ	+3647+00303	Africa/Algiers
-EC	-0210-07950	America/Guayaquil	Ecuador (mainland)
+EC	-0210-07950	America/Guayaquil	mainland
 EC	-0054-08936	Pacific/Galapagos	Galápagos Islands
 EE	+5925+02445	Europe/Tallinn
 EG	+3003+03115	Africa/Cairo
 EH	+2709-01312	Africa/El_Aaiun
-ES	+4024-00341	Europe/Madrid	Spain (mainland)
-ES	+3553-00519	Africa/Ceuta	Ceuta, Melilla
+ES	+4024-00341	Europe/Madrid	mainland
+ES	+3553-00519	Africa/Ceuta	Ceuta & Melilla
 ES	+2806-01524	Atlantic/Canary	Canary Islands
 FI,AX	+6010+02458	Europe/Helsinki
 FJ	-1808+17825	Pacific/Fiji
 FK	-5142-05751	Atlantic/Stanley
+FM	+0725+15147	Pacific/Chuuk	Chuuk (Truk) and Yap
+FM	+0658+15813	Pacific/Pohnpei	Pohnpei (Ponape)
 FM	+0519+16259	Pacific/Kosrae	Kosrae
 FO	+6201-00646	Atlantic/Faroe
-FR,MC	+4852+00220	Europe/Paris
+FR	+4852+00220	Europe/Paris
 GB,GG,IM,JE	+513030-0000731	Europe/London
 GE	+4143+04449	Asia/Tbilisi
 GF	+0456-05220	America/Cayenne
+GH	+0533-00013	Africa/Accra
 GI	+3608-00521	Europe/Gibraltar
-GL	+6411-05144	America/Nuuk	most of Greenland
-GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
-GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
-GL	+7634-06847	America/Thule	Thule/Pituffik
+GL	+6411-05144	America/Godthab	most locations
+GL	+7646-01840	America/Danmarkshavn	east coast, north of Scoresbysund
+GL	+7029-02158	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
+GL	+7634-06847	America/Thule	Thule / Pituffik
 GR	+3758+02343	Europe/Athens
 GS	-5416-03632	Atlantic/South_Georgia
 GT	+1438-09031	America/Guatemala
@@ -170,205 +184,188 @@ HK	+2217+11409	Asia/Hong_Kong
 HN	+1406-08713	America/Tegucigalpa
 HT	+1832-07220	America/Port-au-Prince
 HU	+4730+01905	Europe/Budapest
-ID	-0610+10648	Asia/Jakarta	Java, Sumatra
-ID	-0002+10920	Asia/Pontianak	Borneo (west, central)
-ID	-0507+11924	Asia/Makassar	Borneo (east, south), Sulawesi/Celebes, Bali, Nusa Tengarra, Timor (west)
-ID	-0232+14042	Asia/Jayapura	New Guinea (West Papua / Irian Jaya), Malukus/Moluccas
+ID	-0610+10648	Asia/Jakarta	Java & Sumatra
+ID	-0002+10920	Asia/Pontianak	west & central Borneo
+ID	-0507+11924	Asia/Makassar	east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
+ID	-0232+14042	Asia/Jayapura	west New Guinea (Irian Jaya) & Malukus (Moluccas)
 IE	+5320-00615	Europe/Dublin
 IL	+314650+0351326	Asia/Jerusalem
 IN	+2232+08822	Asia/Kolkata
 IO	-0720+07225	Indian/Chagos
 IQ	+3321+04425	Asia/Baghdad
 IR	+3540+05126	Asia/Tehran
+IS	+6409-02151	Atlantic/Reykjavik
 IT,SM,VA	+4154+01229	Europe/Rome
 JM	+175805-0764736	America/Jamaica
 JO	+3157+03556	Asia/Amman
 JP	+353916+1394441	Asia/Tokyo
 KE,DJ,ER,ET,KM,MG,SO,TZ,UG,YT	-0117+03649	Africa/Nairobi
 KG	+4254+07436	Asia/Bishkek
-KI,MH,TV,UM,WF	+0125+17300	Pacific/Tarawa	Gilberts, Marshalls, Wake
-KI	-0247-17143	Pacific/Kanton	Phoenix Islands
+KI	+0125+17300	Pacific/Tarawa	Gilbert Islands
+KI	-0308-17105	Pacific/Enderbury	Phoenix Islands
 KI	+0152-15720	Pacific/Kiritimati	Line Islands
 KP	+3901+12545	Asia/Pyongyang
 KR	+3733+12658	Asia/Seoul
-KZ	+4315+07657	Asia/Almaty	most of Kazakhstan
-KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda/Kyzylorda/Kzyl-Orda
-KZ	+5312+06337	Asia/Qostanay	Qostanay/Kostanay/Kustanay
-KZ	+5017+05710	Asia/Aqtobe	Aqtöbe/Aktobe
-KZ	+4431+05016	Asia/Aqtau	Mangghystaū/Mankistau
-KZ	+4707+05156	Asia/Atyrau	Atyraū/Atirau/Gur'yev
+KZ	+4315+07657	Asia/Almaty	most locations
+KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda (Kyzylorda, Kzyl-Orda)
+KZ	+5017+05710	Asia/Aqtobe	Aqtobe (Aktobe)
+KZ	+4431+05016	Asia/Aqtau	Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)
 KZ	+5113+05121	Asia/Oral	West Kazakhstan
 LB	+3353+03530	Asia/Beirut
 LK	+0656+07951	Asia/Colombo
 LR	+0618-01047	Africa/Monrovia
 LT	+5441+02519	Europe/Vilnius
+LU	+4936+00609	Europe/Luxembourg
 LV	+5657+02406	Europe/Riga
 LY	+3254+01311	Africa/Tripoli
 MA	+3339-00735	Africa/Casablanca
+MC	+4342+00723	Europe/Monaco
 MD	+4700+02850	Europe/Chisinau
+MH	+0709+17112	Pacific/Majuro	most locations
 MH	+0905+16720	Pacific/Kwajalein	Kwajalein
-MM,CC	+1647+09610	Asia/Yangon
-MN	+4755+10653	Asia/Ulaanbaatar	most of Mongolia
-MN	+4801+09139	Asia/Hovd	Bayan-Ölgii, Hovd, Uvs
-MO	+221150+1133230	Asia/Macau
+MM	+1647+09610	Asia/Rangoon
+MN	+4755+10653	Asia/Ulaanbaatar	most locations
+MN	+4801+09139	Asia/Hovd	Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan
+MN	+4804+11430	Asia/Choibalsan	Dornod, Sükhbaatar
+MO	+2214+11335	Asia/Macau
 MQ	+1436-06105	America/Martinique
 MT	+3554+01431	Europe/Malta
 MU	-2010+05730	Indian/Mauritius
-MV,TF	+0410+07330	Indian/Maldives	Kerguelen, St Paul I, Amsterdam I
-MX	+1924-09909	America/Mexico_City	Central Mexico
-MX	+2105-08646	America/Cancun	Quintana Roo
-MX	+2058-08937	America/Merida	Campeche, Yucatán
-MX	+2540-10019	America/Monterrey	Durango; Coahuila, Nuevo León, Tamaulipas (most areas)
-MX	+2550-09730	America/Matamoros	Coahuila, Nuevo León, Tamaulipas (US border)
-MX	+2838-10605	America/Chihuahua	Chihuahua (most areas)
-MX	+3144-10629	America/Ciudad_Juarez	Chihuahua (US border - west)
-MX	+2934-10425	America/Ojinaga	Chihuahua (US border - east)
-MX	+2313-10625	America/Mazatlan	Baja California Sur, Nayarit (most areas), Sinaloa
-MX	+2048-10515	America/Bahia_Banderas	Bahía de Banderas
-MX	+2904-11058	America/Hermosillo	Sonora
-MX	+3232-11701	America/Tijuana	Baja California
-MY,BN	+0133+11020	Asia/Kuching	Sabah, Sarawak
-MZ,BI,BW,CD,MW,RW,ZM,ZW	-2558+03235	Africa/Maputo	Central Africa Time
+MV	+0410+07330	Indian/Maldives
+MX	+1924-09909	America/Mexico_City	Central Time - most locations
+MX	+2105-08646	America/Cancun	Central Time - Quintana Roo
+MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatán
+MX	+2540-10019	America/Monterrey	Mexican Central Time - Coahuila, Durango, Nuevo León, Tamaulipas away from US border
+MX	+2550-09730	America/Matamoros	US Central Time - Coahuila, Durango, Nuevo León, Tamaulipas near US border
+MX	+2313-10625	America/Mazatlan	Mountain Time - S Baja, Nayarit, Sinaloa
+MX	+2838-10605	America/Chihuahua	Mexican Mountain Time - Chihuahua away from US border
+MX	+2934-10425	America/Ojinaga	US Mountain Time - Chihuahua near US border
+MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
+MX	+3232-11701	America/Tijuana	US Pacific Time - Baja California near US border
+MX	+3018-11452	America/Santa_Isabel	Mexican Pacific Time - Baja California away from US border
+MX	+2048-10515	America/Bahia_Banderas	Mexican Central Time - Bahía de Banderas
+MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
+MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
+MZ,BI,BW,CD,MW,RW,ZM,ZW	-2558+03235	Africa/Maputo	Central Africa Time (UTC+2)
 NA	-2234+01706	Africa/Windhoek
 NC	-2216+16627	Pacific/Noumea
 NF	-2903+16758	Pacific/Norfolk
-NG,AO,BJ,CD,CF,CG,CM,GA,GQ,NE	+0627+00324	Africa/Lagos	West Africa Time
+NG,AO,BJ,CD,CF,CG,CM,GA,GQ,NE	+0627+00324	Africa/Lagos	West Africa Time (UTC+1)
 NI	+1209-08617	America/Managua
+NL	+5222+00454	Europe/Amsterdam
+NO,SJ	+5955+01045	Europe/Oslo
 NP	+2743+08519	Asia/Kathmandu
 NR	-0031+16655	Pacific/Nauru
 NU	-1901-16955	Pacific/Niue
 NZ,AQ	-3652+17446	Pacific/Auckland	New Zealand time
 NZ	-4357-17633	Pacific/Chatham	Chatham Islands
-PA,CA,KY	+0858-07932	America/Panama	EST - ON (Atikokan), NU (Coral H)
+PA,KY	+0858-07932	America/Panama
 PE	-1203-07703	America/Lima
 PF	-1732-14934	Pacific/Tahiti	Society Islands
 PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
 PF	-2308-13457	Pacific/Gambier	Gambier Islands
-PG,AQ,FM	-0930+14710	Pacific/Port_Moresby	Papua New Guinea (most areas), Chuuk, Yap, Dumont d'Urville
+PG	-0930+14710	Pacific/Port_Moresby	most locations
 PG	-0613+15534	Pacific/Bougainville	Bougainville
 PH	+1435+12100	Asia/Manila
 PK	+2452+06703	Asia/Karachi
 PL	+5215+02100	Europe/Warsaw
 PM	+4703-05620	America/Miquelon
 PN	-2504-13005	Pacific/Pitcairn
-PR,AG,CA,AI,AW,BL,BQ,CW,DM,GD,GP,KN,LC,MF,MS,SX,TT,VC,VG,VI	+182806-0660622	America/Puerto_Rico	AST - QC (Lower North Shore)
+PR	+182806-0660622	America/Puerto_Rico
 PS	+3130+03428	Asia/Gaza	Gaza Strip
 PS	+313200+0350542	Asia/Hebron	West Bank
-PT	+3843-00908	Europe/Lisbon	Portugal (mainland)
+PT	+3843-00908	Europe/Lisbon	mainland
 PT	+3238-01654	Atlantic/Madeira	Madeira Islands
 PT	+3744-02540	Atlantic/Azores	Azores
 PW	+0720+13429	Pacific/Palau
 PY	-2516-05740	America/Asuncion
 QA,BH	+2517+05132	Asia/Qatar
+RE,TF	-2052+05528	Indian/Reunion	Réunion, Crozet Is, Scattered Is
 RO	+4426+02606	Europe/Bucharest
 RS,BA,HR,ME,MK,SI	+4450+02030	Europe/Belgrade
-RU	+5443+02030	Europe/Kaliningrad	MSK-01 - Kaliningrad
-RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
-# Mention RU and UA alphabetically.  See "territorial claims" above.
-RU,UA	+4457+03406	Europe/Simferopol	Crimea
-RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
-RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd
-RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
-RU	+5134+04602	Europe/Saratov	MSK+01 - Saratov
-RU	+5420+04824	Europe/Ulyanovsk	MSK+01 - Ulyanovsk
-RU	+5312+05009	Europe/Samara	MSK+01 - Samara, Udmurtia
-RU	+5651+06036	Asia/Yekaterinburg	MSK+02 - Urals
-RU	+5500+07324	Asia/Omsk	MSK+03 - Omsk
-RU	+5502+08255	Asia/Novosibirsk	MSK+04 - Novosibirsk
-RU	+5322+08345	Asia/Barnaul	MSK+04 - Altai
-RU	+5630+08458	Asia/Tomsk	MSK+04 - Tomsk
-RU	+5345+08707	Asia/Novokuznetsk	MSK+04 - Kemerovo
-RU	+5601+09250	Asia/Krasnoyarsk	MSK+04 - Krasnoyarsk area
-RU	+5216+10420	Asia/Irkutsk	MSK+05 - Irkutsk, Buryatia
-RU	+5203+11328	Asia/Chita	MSK+06 - Zabaykalsky
-RU	+6200+12940	Asia/Yakutsk	MSK+06 - Lena River
-RU	+623923+1353314	Asia/Khandyga	MSK+06 - Tomponsky, Ust-Maysky
-RU	+4310+13156	Asia/Vladivostok	MSK+07 - Amur River
-RU	+643337+1431336	Asia/Ust-Nera	MSK+07 - Oymyakonsky
-RU	+5934+15048	Asia/Magadan	MSK+08 - Magadan
-RU	+4658+14242	Asia/Sakhalin	MSK+08 - Sakhalin Island
-RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E), N Kuril Is
-RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka
-RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
-SA,AQ,KW,YE	+2438+04643	Asia/Riyadh	Syowa
-SB,FM	-0932+16012	Pacific/Guadalcanal	Pohnpei
-SD	+1536+03232	Africa/Khartoum
-SG,MY	+0117+10351	Asia/Singapore	peninsular Malaysia
+RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
+RU	+554521+0373704	Europe/Moscow	Moscow+00 - west Russia
+RU	+4457+03406	Europe/Simferopol	Moscow+00 - Crimea
+RU	+4844+04425	Europe/Volgograd	Moscow+00 - Caspian Sea
+RU	+5312+05009	Europe/Samara	Moscow+00 (Moscow+01 after 2014-10-26) - Samara, Udmurtia
+RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
+RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
+RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
+RU	+5345+08707	Asia/Novokuznetsk	Moscow+03 (Moscow+04 after 2014-10-26) - Kemerovo
+RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
+RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
+RU	+5203+11328	Asia/Chita	Moscow+06 (Moscow+05 after 2014-10-26) - Zabaykalsky
+RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River
+RU	+623923+1353314	Asia/Khandyga	Moscow+06 - Tomponsky, Ust-Maysky
+RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
+RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
+RU	+643337+1431336	Asia/Ust-Nera	Moscow+07 - Oymyakonsky
+RU	+5934+15048	Asia/Magadan	Moscow+08 (Moscow+07 after 2014-10-26) - Magadan
+RU	+6728+15343	Asia/Srednekolymsk	Moscow+08 - E Sakha, N Kuril Is
+RU	+5301+15839	Asia/Kamchatka	Moscow+08 (Moscow+09 after 2014-10-26) - Kamchatka
+RU	+6445+17729	Asia/Anadyr	Moscow+08 (Moscow+09 after 2014-10-26) - Bering Sea
+SA,KW,YE	+2438+04643	Asia/Riyadh
+SB	-0932+16012	Pacific/Guadalcanal
+SC	-0440+05528	Indian/Mahe
+SD,SS	+1536+03232	Africa/Khartoum
+SE	+5920+01803	Europe/Stockholm
+SG	+0117+10351	Asia/Singapore
 SR	+0550-05510	America/Paramaribo
-SS	+0451+03137	Africa/Juba
-ST	+0020+00644	Africa/Sao_Tome
 SV	+1342-08912	America/El_Salvador
 SY	+3330+03618	Asia/Damascus
 TC	+2128-07108	America/Grand_Turk
 TD	+1207+01503	Africa/Ndjamena
-TH,CX,KH,LA,VN	+1345+10031	Asia/Bangkok	north Vietnam
+TF	-492110+0701303	Indian/Kerguelen	Kerguelen, St Paul I, Amsterdam I
+TH,KH,LA,VN	+1345+10031	Asia/Bangkok	most of Indochina
 TJ	+3835+06848	Asia/Dushanbe
 TK	-0922-17114	Pacific/Fakaofo
 TL	-0833+12535	Asia/Dili
 TM	+3757+05823	Asia/Ashgabat
 TN	+3648+01011	Africa/Tunis
-TO	-210800-1751200	Pacific/Tongatapu
+TO	-2110-17510	Pacific/Tongatapu
 TR	+4101+02858	Europe/Istanbul
+TT,AG,AI,BL,DM,GD,GP,KN,LC,MF,MS,VC,VG,VI	+1039-06131	America/Port_of_Spain
+TV	-0831+17913	Pacific/Funafuti
 TW	+2503+12130	Asia/Taipei
-UA	+5026+03031	Europe/Kyiv	most of Ukraine
-US	+404251-0740023	America/New_York	Eastern (most areas)
-US	+421953-0830245	America/Detroit	Eastern - MI (most areas)
-US	+381515-0854534	America/Kentucky/Louisville	Eastern - KY (Louisville area)
-US	+364947-0845057	America/Kentucky/Monticello	Eastern - KY (Wayne)
-US	+394606-0860929	America/Indiana/Indianapolis	Eastern - IN (most areas)
-US	+384038-0873143	America/Indiana/Vincennes	Eastern - IN (Da, Du, K, Mn)
-US	+410305-0863611	America/Indiana/Winamac	Eastern - IN (Pulaski)
-US	+382232-0862041	America/Indiana/Marengo	Eastern - IN (Crawford)
-US	+382931-0871643	America/Indiana/Petersburg	Eastern - IN (Pike)
-US	+384452-0850402	America/Indiana/Vevay	Eastern - IN (Switzerland)
-US	+415100-0873900	America/Chicago	Central (most areas)
-US	+375711-0864541	America/Indiana/Tell_City	Central - IN (Perry)
-US	+411745-0863730	America/Indiana/Knox	Central - IN (Starke)
-US	+450628-0873651	America/Menominee	Central - MI (Wisconsin border)
-US	+470659-1011757	America/North_Dakota/Center	Central - ND (Oliver)
-US	+465042-1012439	America/North_Dakota/New_Salem	Central - ND (Morton rural)
-US	+471551-1014640	America/North_Dakota/Beulah	Central - ND (Mercer)
-US	+394421-1045903	America/Denver	Mountain (most areas)
-US	+433649-1161209	America/Boise	Mountain - ID (south), OR (east)
-US,CA	+332654-1120424	America/Phoenix	MST - AZ (most areas), Creston BC
-US	+340308-1181434	America/Los_Angeles	Pacific
-US	+611305-1495401	America/Anchorage	Alaska (most areas)
-US	+581807-1342511	America/Juneau	Alaska - Juneau area
-US	+571035-1351807	America/Sitka	Alaska - Sitka area
-US	+550737-1313435	America/Metlakatla	Alaska - Annette Island
-US	+593249-1394338	America/Yakutat	Alaska - Yakutat
-US	+643004-1652423	America/Nome	Alaska (west)
-US	+515248-1763929	America/Adak	Alaska - western Aleutians
-US	+211825-1575130	Pacific/Honolulu	Hawaii
-UY	-345433-0561245	America/Montevideo
-UZ	+3940+06648	Asia/Samarkand	Uzbekistan (west)
-UZ	+4120+06918	Asia/Tashkent	Uzbekistan (east)
+UA	+5026+03031	Europe/Kiev	most locations
+UA	+4837+02218	Europe/Uzhgorod	Ruthenia
+UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk
+UM	+1917+16637	Pacific/Wake	Wake Island
+US	+404251-0740023	America/New_York	Eastern Time
+US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
+US	+381515-0854534	America/Kentucky/Louisville	Eastern Time - Kentucky - Louisville area
+US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
+US	+394606-0860929	America/Indiana/Indianapolis	Eastern Time - Indiana - most locations
+US	+384038-0873143	America/Indiana/Vincennes	Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
+US	+410305-0863611	America/Indiana/Winamac	Eastern Time - Indiana - Pulaski County
+US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford County
+US	+382931-0871643	America/Indiana/Petersburg	Eastern Time - Indiana - Pike County
+US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
+US	+415100-0873900	America/Chicago	Central Time
+US	+375711-0864541	America/Indiana/Tell_City	Central Time - Indiana - Perry County
+US	+411745-0863730	America/Indiana/Knox	Central Time - Indiana - Starke County
+US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
+US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
+US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota - Morton County (except Mandan area)
+US	+471551-1014640	America/North_Dakota/Beulah	Central Time - North Dakota - Mercer County
+US	+394421-1045903	America/Denver	Mountain Time
+US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
+US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona (except Navajo)
+US	+340308-1181434	America/Los_Angeles	Pacific Time
+US	+550737-1313435	America/Metlakatla	Pacific Standard Time - Annette Island, Alaska
+US	+611305-1495401	America/Anchorage	Alaska Time
+US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
+US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
+US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
+US	+643004-1652423	America/Nome	Alaska Time - west Alaska
+US	+515248-1763929	America/Adak	Aleutian Islands
+US,UM	+211825-1575130	Pacific/Honolulu	Hawaii time
+UY	-3453-05611	America/Montevideo
+UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
+UZ	+4120+06918	Asia/Tashkent	east Uzbekistan
 VE	+1030-06656	America/Caracas
 VN	+1045+10640	Asia/Ho_Chi_Minh	south Vietnam
 VU	-1740+16825	Pacific/Efate
+WF	-1318-17610	Pacific/Wallis
 WS	-1350-17144	Pacific/Apia
 ZA,LS,SZ	-2615+02800	Africa/Johannesburg
-#
-# The next section contains experimental tab-separated comments for
-# use by user agents like tzselect that identify continents and oceans.
-#
-# For example, the comment "#@AQ<tab>Antarctica/" means the country code
-# AQ is in the continent Antarctica regardless of the Zone name,
-# so Pacific/Auckland should be listed under Antarctica as well as
-# under the Pacific because its line's country codes include AQ.
-#
-# If more than one country code is affected each is listed separated
-# by commas, e.g., #@IS,SH<tab>Atlantic/".  If a country code is in
-# more than one continent or ocean, each is listed separated by
-# commas, e.g., the second column of "#@CY,TR<tab>Asia/,Europe/".
-#
-# These experimental comments are present only for country codes where
-# the continent or ocean is not already obvious from the Zone name.
-# For example, there is no such comment for RU since it already
-# corresponds to Zone names starting with both "Europe/" and "Asia/".
-#
-#@AQ	Antarctica/
-#@IS,SH	Atlantic/
-#@CY,TR	Asia/,Europe/
-#@SJ	Arctic/
-#@CC,CX,KM,MG,YT	Indian/
diff --git a/lib/pytz/zoneinfo/zonenow.tab b/lib/pytz/zoneinfo/zonenow.tab
deleted file mode 100644
index 01f536b3..00000000
--- a/lib/pytz/zoneinfo/zonenow.tab
+++ /dev/null
@@ -1,299 +0,0 @@
-# tzdb timezone descriptions, for users who do not care about old timestamps
-#
-# This file is in the public domain.
-#
-# From Paul Eggert (2023-12-18):
-# This file contains a table where each row stands for a timezone
-# where civil timestamps are predicted to agree from now on.
-# This file is like zone1970.tab (see zone1970.tab's comments),
-# but with the following changes:
-#
-# 1.  Each timezone corresponds to a set of clocks that are planned
-#     to agree from now on.  This is a larger set of clocks than in
-#     zone1970.tab, where each timezone's clocks must agree from 1970 on.
-# 2.  The first column is irrelevant and ignored.
-# 3.  The table is sorted in a different way:
-#     first by standard time UTC offset;
-#     then, if DST is used, by daylight saving UTC offset;
-#     then by time zone abbreviation.
-# 4.  Every timezone has a nonempty comments column, with wording
-#     distinguishing the timezone only from other timezones with the
-#     same UTC offset at some point during the year.
-#
-# The format of this table is experimental, and may change in future versions.
-#
-# This table is intended as an aid for users, to help them select timezones
-# appropriate for their practical needs.  It is not intended to take or
-# endorse any position on legal or territorial claims.
-#
-#XX	coordinates	TZ	comments
-#
-# -11 - SST
-XX	-1416-17042	Pacific/Pago_Pago	Midway; Samoa ("SST")
-#
-# -11
-XX	-1901-16955	Pacific/Niue	Niue
-#
-# -10 - HST
-XX	+211825-1575130	Pacific/Honolulu	Hawaii ("HST")
-#
-# -10
-XX	-1732-14934	Pacific/Tahiti	Tahiti; Cook Islands
-#
-# -10/-09 - HST / HDT (North America DST)
-XX	+515248-1763929	America/Adak	western Aleutians in Alaska ("HST/HDT")
-#
-# -09:30
-XX	-0900-13930	Pacific/Marquesas	Marquesas
-#
-# -09
-XX	-2308-13457	Pacific/Gambier	Gambier
-#
-# -09/-08 - AKST/AKDT (North America DST)
-XX	+611305-1495401	America/Anchorage	most of Alaska ("AKST/AKDT")
-#
-# -08
-XX	-2504-13005	Pacific/Pitcairn	Pitcairn
-#
-# -08/-07 - PST/PDT (North America DST)
-XX	+340308-1181434	America/Los_Angeles	Pacific ("PST/PDT") - US & Canada; Mexico near US border
-#
-# -07 - MST
-XX	+332654-1120424	America/Phoenix	Mountain Standard ("MST") - Arizona; western Mexico; Yukon
-#
-# -07/-06 - MST/MDT (North America DST)
-XX	+394421-1045903	America/Denver	Mountain ("MST/MDT") - US & Canada; Mexico near US border
-#
-# -06
-XX	-0054-08936	Pacific/Galapagos	Galápagos
-#
-# -06 - CST
-XX	+1924-09909	America/Mexico_City	Central Standard ("CST") - Saskatchewan; central Mexico; Central America
-#
-# -06/-05 (Chile DST)
-XX	-2709-10926	Pacific/Easter	Easter Island
-#
-# -06/-05 - CST/CDT (North America DST)
-XX	+415100-0873900	America/Chicago	Central ("CST/CDT") - US & Canada; Mexico near US border
-#
-# -05
-XX	-1203-07703	America/Lima	eastern South America
-#
-# -05 - EST
-XX	+175805-0764736	America/Jamaica	Eastern Standard ("EST") - Caymans; Jamaica; eastern Mexico; Panama
-#
-# -05/-04 - CST/CDT (Cuba DST)
-XX	+2308-08222	America/Havana	Cuba
-#
-# -05/-04 - EST/EDT (North America DST)
-XX	+404251-0740023	America/New_York	Eastern ("EST/EDT") - US & Canada
-#
-# -04
-XX	+1030-06656	America/Caracas	western South America
-#
-# -04 - AST
-XX	+1828-06954	America/Santo_Domingo	Atlantic Standard ("AST") - eastern Caribbean
-#
-# -04/-03 (Chile DST)
-XX	-3327-07040	America/Santiago	most of Chile
-#
-# -04/-03 (Paraguay DST)
-XX	-2516-05740	America/Asuncion	Paraguay
-#
-# -04/-03 - AST/ADT (North America DST)
-XX	+4439-06336	America/Halifax	Atlantic ("AST/ADT") - Canada; Bermuda
-#
-# -03:30/-02:30 - NST/NDT (North America DST)
-XX	+4734-05243	America/St_Johns	Newfoundland ("NST/NDT")
-#
-# -03
-XX	-2332-04637	America/Sao_Paulo	eastern South America
-#
-# -03/-02 (North America DST)
-XX	+4703-05620	America/Miquelon	St Pierre & Miquelon
-#
-# -02
-XX	-0351-03225	America/Noronha	Fernando de Noronha; South Georgia
-#
-# -02/-01 (EU DST)
-XX	+6411-05144	America/Nuuk	most of Greenland
-#
-# -01
-XX	+1455-02331	Atlantic/Cape_Verde	Cape Verde
-#
-# -01/+00 (EU DST)
-XX	+3744-02540	Atlantic/Azores	Azores
-#
-# +00 - GMT
-XX	+0519-00402	Africa/Abidjan	far western Africa; Iceland ("GMT")
-#
-# +00/+01 - GMT/BST (EU DST)
-XX	+513030-0000731	Europe/London	United Kingdom ("GMT/BST")
-#
-# +00/+01 - WET/WEST (EU DST)
-XX	+3843-00908	Europe/Lisbon	western Europe ("WET/WEST")
-#
-# +00/+02 - Troll DST
-XX	-720041+0023206	Antarctica/Troll	Troll Station in Antarctica
-#
-# +01 - CET
-XX	+3647+00303	Africa/Algiers	Algeria, Tunisia ("CET")
-#
-# +01 - WAT
-XX	+0627+00324	Africa/Lagos	western Africa ("WAT")
-#
-# +01/+00 - IST/GMT (EU DST in reverse)
-XX	+5320-00615	Europe/Dublin	Ireland ("IST/GMT")
-#
-# +01/+00 - (Morocco DST)
-XX	+3339-00735	Africa/Casablanca	Morocco
-#
-# +01/+02 - CET/CEST (EU DST)
-XX	+4852+00220	Europe/Paris	central Europe ("CET/CEST")
-#
-# +02 - CAT
-XX	-2558+03235	Africa/Maputo	central Africa ("CAT")
-#
-# +02 - EET
-XX	+3254+01311	Africa/Tripoli	Libya; Kaliningrad ("EET")
-#
-# +02 - SAST
-XX	-2615+02800	Africa/Johannesburg	southern Africa ("SAST")
-#
-# +02/+03 - EET/EEST (EU DST)
-XX	+3758+02343	Europe/Athens	eastern Europe ("EET/EEST")
-#
-# +02/+03 - EET/EEST (Egypt DST)
-XX	+3003+03115	Africa/Cairo	Egypt
-#
-# +02/+03 - EET/EEST (Lebanon DST)
-XX	+3353+03530	Asia/Beirut	Lebanon
-#
-# +02/+03 - EET/EEST (Moldova DST)
-XX	+4700+02850	Europe/Chisinau	Moldova
-#
-# +02/+03 - EET/EEST (Palestine DST)
-XX	+3130+03428	Asia/Gaza	Palestine
-#
-# +02/+03 - IST/IDT (Israel DST)
-XX	+314650+0351326	Asia/Jerusalem	Israel
-#
-# +03
-XX	+4101+02858	Europe/Istanbul	Near East; Belarus
-#
-# +03 - EAT
-XX	-0117+03649	Africa/Nairobi	eastern Africa ("EAT")
-#
-# +03 - MSK
-XX	+554521+0373704	Europe/Moscow	Moscow ("MSK")
-#
-# +03:30
-XX	+3540+05126	Asia/Tehran	Iran
-#
-# +04
-XX	+2518+05518	Asia/Dubai	Russia; Caucasus; Persian Gulf; Seychelles; Réunion
-#
-# +04:30
-XX	+3431+06912	Asia/Kabul	Afghanistan
-#
-# +05
-XX	+4120+06918	Asia/Tashkent	Russia; Kazakhstan; Tajikistan; Turkmenistan; Uzbekistan; Maldives
-#
-# +05 - PKT
-XX	+2452+06703	Asia/Karachi	Pakistan ("PKT")
-#
-# +05:30
-XX	+0656+07951	Asia/Colombo	Sri Lanka
-#
-# +05:30 - IST
-XX	+2232+08822	Asia/Kolkata	India ("IST")
-#
-# +05:45
-XX	+2743+08519	Asia/Kathmandu	Nepal
-#
-# +06
-XX	+2343+09025	Asia/Dhaka	Russia; Kyrgyzstan; Bhutan; Bangladesh; Chagos
-#
-# +06:30
-XX	+1647+09610	Asia/Yangon	Myanmar; Cocos
-#
-# +07
-XX	+1345+10031	Asia/Bangkok	Russia; Indochina; Christmas Island
-#
-# +07 - WIB
-XX	-0610+10648	Asia/Jakarta	Indonesia ("WIB")
-#
-# +08
-XX	+0117+10351	Asia/Singapore	Russia; Brunei; Malaysia; Singapore
-#
-# +08 - AWST
-XX	-3157+11551	Australia/Perth	Western Australia ("AWST")
-#
-# +08 - CST
-XX	+3114+12128	Asia/Shanghai	China ("CST")
-#
-# +08 - HKT
-XX	+2217+11409	Asia/Hong_Kong	Hong Kong ("HKT")
-#
-# +08 - PHT
-XX	+1435+12100	Asia/Manila	Philippines ("PHT")
-#
-# +08 - WITA
-XX	-0507+11924	Asia/Makassar	Indonesia ("WITA")
-#
-# +08:45
-XX	-3143+12852	Australia/Eucla	Eucla
-#
-# +09
-XX	+5203+11328	Asia/Chita	Russia; Palau; East Timor
-#
-# +09 - JST
-XX	+353916+1394441	Asia/Tokyo	Japan ("JST")
-#
-# +09 - KST
-XX	+3733+12658	Asia/Seoul	Korea ("KST")
-#
-# +09 - WIT
-XX	-0232+14042	Asia/Jayapura	Indonesia ("WIT")
-#
-# +09:30 - ACST
-XX	-1228+13050	Australia/Darwin	Northern Territory ("ACST")
-#
-# +09:30/+10:30 - ACST/ACDT (Australia DST)
-XX	-3455+13835	Australia/Adelaide	South Australia ("ACST/ACDT")
-#
-# +10
-XX	+4310+13156	Asia/Vladivostok	Russia; Yap; Chuuk; Papua New Guinea; Dumont d'Urville
-#
-# +10 - AEST
-XX	-2728+15302	Australia/Brisbane	Queensland ("AEST")
-#
-# +10 - ChST
-XX	+1328+14445	Pacific/Guam	Mariana Islands ("ChST")
-#
-# +10/+11 - AEST/AEDT (Australia DST)
-XX	-3352+15113	Australia/Sydney	southeast Australia ("AEST/AEDT")
-#
-# +10:30/+11
-XX	-3133+15905	Australia/Lord_Howe	Lord Howe Island
-#
-# +11
-XX	-0613+15534	Pacific/Bougainville	Russia; Kosrae; Bougainville; Solomons
-#
-# +11/+12 (Australia DST)
-XX	-2903+16758	Pacific/Norfolk	Norfolk Island
-#
-# +12
-XX	+5301+15839	Asia/Kamchatka	Russia; Tuvalu; Fiji; etc.
-#
-# +12/+13 (New Zealand DST)
-XX	-3652+17446	Pacific/Auckland	New Zealand ("NZST/NZDT")
-#
-# +12:45/+13:45 (Chatham DST)
-XX	-4357-17633	Pacific/Chatham	Chatham Islands
-#
-# +13
-XX	-210800-1751200	Pacific/Tongatapu	Kanton; Tokelau; Samoa (western); Tonga
-#
-# +14
-XX	+0152-15720	Pacific/Kiritimati	Kiritimati
diff --git a/lib/pytz_deprecation_shim/__init__.py b/lib/pytz_deprecation_shim/__init__.py
deleted file mode 100644
index 8b451620..00000000
--- a/lib/pytz_deprecation_shim/__init__.py
+++ /dev/null
@@ -1,34 +0,0 @@
-__all__ = [
-    "AmbiguousTimeError",
-    "NonExistentTimeError",
-    "InvalidTimeError",
-    "UnknownTimeZoneError",
-    "PytzUsageWarning",
-    "FixedOffset",
-    "UTC",
-    "utc",
-    "build_tzinfo",
-    "timezone",
-    "fixed_offset_timezone",
-    "wrap_zone",
-]
-
-from . import helpers
-from ._exceptions import (
-    AmbiguousTimeError,
-    InvalidTimeError,
-    NonExistentTimeError,
-    PytzUsageWarning,
-    UnknownTimeZoneError,
-)
-from ._impl import (
-    UTC,
-    build_tzinfo,
-    fixed_offset_timezone,
-    timezone,
-    wrap_zone,
-)
-
-# Compatibility aliases
-utc = UTC
-FixedOffset = fixed_offset_timezone
diff --git a/lib/pytz_deprecation_shim/_common.py b/lib/pytz_deprecation_shim/_common.py
deleted file mode 100644
index ace322e9..00000000
--- a/lib/pytz_deprecation_shim/_common.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import sys
-
-_PYTZ_IMPORTED = False
-
-
-def pytz_imported():
-    """Detects whether or not pytz has been imported without importing pytz."""
-    global _PYTZ_IMPORTED
-
-    if not _PYTZ_IMPORTED and "pytz" in sys.modules:
-        _PYTZ_IMPORTED = True
-
-    return _PYTZ_IMPORTED
diff --git a/lib/pytz_deprecation_shim/_compat.py b/lib/pytz_deprecation_shim/_compat.py
deleted file mode 100644
index 5b734592..00000000
--- a/lib/pytz_deprecation_shim/_compat.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import sys
-
-if sys.version_info[0] == 2:
-    from . import _compat_py2 as _compat_impl
-else:
-    from . import _compat_py3 as _compat_impl
-
-UTC = _compat_impl.UTC
-get_timezone = _compat_impl.get_timezone
-get_timezone_file = _compat_impl.get_timezone_file
-get_fixed_offset_zone = _compat_impl.get_fixed_offset_zone
-is_ambiguous = _compat_impl.is_ambiguous
-is_imaginary = _compat_impl.is_imaginary
-enfold = _compat_impl.enfold
-get_fold = _compat_impl.get_fold
diff --git a/lib/pytz_deprecation_shim/_compat_py2.py b/lib/pytz_deprecation_shim/_compat_py2.py
deleted file mode 100644
index f473d267..00000000
--- a/lib/pytz_deprecation_shim/_compat_py2.py
+++ /dev/null
@@ -1,43 +0,0 @@
-from datetime import timedelta
-
-from dateutil import tz
-
-UTC = tz.UTC
-
-
-def get_timezone(key):
-    if not key:
-        raise KeyError("Unknown time zone: %s" % key)
-
-    try:
-        rv = tz.gettz(key)
-    except Exception:
-        rv = None
-
-    if rv is None or not isinstance(rv, (tz.tzutc, tz.tzfile)):
-        raise KeyError("Unknown time zone: %s" % key)
-
-    return rv
-
-
-def get_timezone_file(f, key=None):
-    return tz.tzfile(f)
-
-
-def get_fixed_offset_zone(offset):
-    return tz.tzoffset(None, timedelta(minutes=offset))
-
-
-def is_ambiguous(dt):
-    return tz.datetime_ambiguous(dt)
-
-
-def is_imaginary(dt):
-    return not tz.datetime_exists(dt)
-
-
-enfold = tz.enfold
-
-
-def get_fold(dt):
-    return getattr(dt, "fold", 0)
diff --git a/lib/pytz_deprecation_shim/_compat_py3.py b/lib/pytz_deprecation_shim/_compat_py3.py
deleted file mode 100644
index 8881abac..00000000
--- a/lib/pytz_deprecation_shim/_compat_py3.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# Note: This file could use Python 3-only syntax, but at the moment this breaks
-# the coverage job on Python 2. Until we make it so that coverage can ignore
-# this file only on Python 2, we'll have to stick to 2/3-compatible syntax.
-try:
-    import zoneinfo
-except ImportError:
-    from backports import zoneinfo
-
-import datetime
-
-UTC = datetime.timezone.utc
-
-
-def get_timezone(key):
-    try:
-        return zoneinfo.ZoneInfo(key)
-    except (ValueError, OSError):
-        # TODO: Use `from e` when this file can use Python 3 syntax
-        raise KeyError(key)
-
-
-def get_timezone_file(f, key=None):
-    return zoneinfo.ZoneInfo.from_file(f, key=key)
-
-
-def get_fixed_offset_zone(offset):
-    return datetime.timezone(datetime.timedelta(minutes=offset))
-
-
-def is_imaginary(dt):
-    dt_rt = dt.astimezone(UTC).astimezone(dt.tzinfo)
-
-    return not (dt == dt_rt)
-
-
-def is_ambiguous(dt):
-    if is_imaginary(dt):
-        return False
-
-    wall_0 = dt
-    wall_1 = dt.replace(fold=not dt.fold)
-
-    # Ambiguous datetimes can only exist if the offset changes, so we don't
-    # actually have to check whether dst() or tzname() are different.
-    same_offset = wall_0.utcoffset() == wall_1.utcoffset()
-
-    return not same_offset
-
-
-def enfold(dt, fold=1):
-    if dt.fold != fold:
-        return dt.replace(fold=fold)
-    else:
-        return dt
-
-
-def get_fold(dt):
-    return dt.fold
diff --git a/lib/pytz_deprecation_shim/_exceptions.py b/lib/pytz_deprecation_shim/_exceptions.py
deleted file mode 100644
index 58d7af0a..00000000
--- a/lib/pytz_deprecation_shim/_exceptions.py
+++ /dev/null
@@ -1,75 +0,0 @@
-from ._common import pytz_imported
-
-
-class PytzUsageWarning(RuntimeWarning):
-    """Warning raised when accessing features specific to ``pytz``'s interface.
-
-    This warning is used to direct users of ``pytz``-specific features like the
-    ``localize`` and ``normalize`` methods towards using the standard
-    ``tzinfo`` interface, so that these shims can be replaced with one of the
-    underlying libraries they are wrapping.
-    """
-
-
-class UnknownTimeZoneError(KeyError):
-    """Raised when no time zone is found for a specified key."""
-
-
-class InvalidTimeError(Exception):
-    """The base class for exceptions related to folds and gaps."""
-
-
-class AmbiguousTimeError(InvalidTimeError):
-    """Exception raised when ``is_dst=None`` for an ambiguous time (fold)."""
-
-
-class NonExistentTimeError(InvalidTimeError):
-    """Exception raised when ``is_dst=None`` for a non-existent time (gap)."""
-
-
-PYTZ_BASE_ERROR_MAPPING = {}
-
-
-def _make_pytz_derived_errors(
-    InvalidTimeError_=InvalidTimeError,
-    AmbiguousTimeError_=AmbiguousTimeError,
-    NonExistentTimeError_=NonExistentTimeError,
-    UnknownTimeZoneError_=UnknownTimeZoneError,
-):
-    if PYTZ_BASE_ERROR_MAPPING or not pytz_imported():
-        return
-
-    import pytz
-
-    class InvalidTimeError(InvalidTimeError_, pytz.InvalidTimeError):
-        pass
-
-    class AmbiguousTimeError(AmbiguousTimeError_, pytz.AmbiguousTimeError):
-        pass
-
-    class NonExistentTimeError(
-        NonExistentTimeError_, pytz.NonExistentTimeError
-    ):
-        pass
-
-    class UnknownTimeZoneError(
-        UnknownTimeZoneError_, pytz.UnknownTimeZoneError
-    ):
-        pass
-
-    PYTZ_BASE_ERROR_MAPPING.update(
-        {
-            InvalidTimeError_: InvalidTimeError,
-            AmbiguousTimeError_: AmbiguousTimeError,
-            NonExistentTimeError_: NonExistentTimeError,
-            UnknownTimeZoneError_: UnknownTimeZoneError,
-        }
-    )
-
-
-def get_exception(exc_type, msg):
-    _make_pytz_derived_errors()
-
-    out_exc_type = PYTZ_BASE_ERROR_MAPPING.get(exc_type, exc_type)
-
-    return out_exc_type(msg)
diff --git a/lib/pytz_deprecation_shim/_impl.py b/lib/pytz_deprecation_shim/_impl.py
deleted file mode 100644
index 54430479..00000000
--- a/lib/pytz_deprecation_shim/_impl.py
+++ /dev/null
@@ -1,296 +0,0 @@
-# -*- coding: utf-8 -*-
-import warnings
-from datetime import tzinfo
-
-from . import _compat
-from ._exceptions import (
-    AmbiguousTimeError,
-    NonExistentTimeError,
-    PytzUsageWarning,
-    UnknownTimeZoneError,
-    get_exception,
-)
-
-IS_DST_SENTINEL = object()
-KEY_SENTINEL = object()
-
-
-def timezone(key, _cache={}):
-    """Builds an IANA database time zone shim.
-
-    This is the equivalent of ``pytz.timezone``.
-
-    :param key:
-        A valid key from the IANA time zone database.
-
-    :raises UnknownTimeZoneError:
-        If an unknown value is passed, this will raise an exception that can be
-        caught by :exc:`pytz_deprecation_shim.UnknownTimeZoneError` or
-        ``pytz.UnknownTimeZoneError``. Like
-        :exc:`zoneinfo.ZoneInfoNotFoundError`, both of those are subclasses of
-        :exc:`KeyError`.
-    """
-    instance = _cache.get(key, None)
-    if instance is None:
-        if len(key) == 3 and key.lower() == "utc":
-            instance = _cache.setdefault(key, UTC)
-        else:
-            try:
-                zone = _compat.get_timezone(key)
-            except KeyError:
-                raise get_exception(UnknownTimeZoneError, key)
-            instance = _cache.setdefault(key, wrap_zone(zone, key=key))
-
-    return instance
-
-
-def fixed_offset_timezone(offset, _cache={}):
-    """Builds a fixed offset time zone shim.
-
-    This is the equivalent of ``pytz.FixedOffset``. An alias is available as
-    ``pytz_deprecation_shim.FixedOffset`` as well.
-
-    :param offset:
-        A fixed offset from UTC, in minutes. This must be in the range ``-1439
-        <= offset <= 1439``.
-
-    :raises ValueError:
-        For offsets whose absolute value is greater than or equal to 24 hours.
-
-    :return:
-        A shim time zone.
-    """
-    if not (-1440 < offset < 1440):
-        raise ValueError("absolute offset is too large", offset)
-
-    instance = _cache.get(offset, None)
-    if instance is None:
-        if offset == 0:
-            instance = _cache.setdefault(offset, UTC)
-        else:
-            zone = _compat.get_fixed_offset_zone(offset)
-            instance = _cache.setdefault(offset, wrap_zone(zone, key=None))
-
-    return instance
-
-
-def build_tzinfo(zone, fp):
-    """Builds a shim object from a TZif file.
-
-    This is a shim for ``pytz.build_tzinfo``. Given a value to use as the zone
-    IANA key and a file-like object containing a valid TZif file (i.e.
-    conforming to :rfc:`8536`), this builds a time zone object and wraps it in
-    a shim class.
-
-    The argument names are chosen to match those in ``pytz.build_tzinfo``.
-
-    :param zone:
-        A string to be used as the time zone object's IANA key.
-
-    :param fp:
-        A readable file-like object emitting bytes, pointing to a valid TZif
-        file.
-
-    :return:
-        A shim time zone.
-    """
-    zone_file = _compat.get_timezone_file(fp)
-
-    return wrap_zone(zone_file, key=zone)
-
-
-def wrap_zone(tz, key=KEY_SENTINEL, _cache={}):
-    """Wrap an existing time zone object in a shim class.
-
-    This is likely to be useful if you would like to work internally with
-    non-``pytz`` zones, but you expose an interface to callers relying on
-    ``pytz``'s interface. It may also be useful for passing non-``pytz`` zones
-    to libraries expecting to use ``pytz``'s interface.
-
-    :param tz:
-        A :pep:`495`-compatible time zone, such as those provided by
-        :mod:`dateutil.tz` or :mod:`zoneinfo`.
-
-    :param key:
-        The value for the IANA time zone key. This is optional for ``zoneinfo``
-        zones, but required for ``dateutil.tz`` zones.
-
-    :return:
-        A shim time zone.
-    """
-    if key is KEY_SENTINEL:
-        key = getattr(tz, "key", KEY_SENTINEL)
-
-    if key is KEY_SENTINEL:
-        raise TypeError(
-            "The `key` argument is required when wrapping zones that do not "
-            + "have a `key` attribute."
-        )
-
-    instance = _cache.get((id(tz), key), None)
-    if instance is None:
-        instance = _cache.setdefault((id(tz), key), _PytzShimTimezone(tz, key))
-
-    return instance
-
-
-class _PytzShimTimezone(tzinfo):
-    # Add instance variables for _zone and _key because this will make error
-    # reporting with partially-initialized _BasePytzShimTimezone objects
-    # work better.
-    _zone = None
-    _key = None
-
-    def __init__(self, zone, key):
-        self._key = key
-        self._zone = zone
-
-    def utcoffset(self, dt):
-        return self._zone.utcoffset(dt)
-
-    def dst(self, dt):
-        return self._zone.dst(dt)
-
-    def tzname(self, dt):
-        return self._zone.tzname(dt)
-
-    def fromutc(self, dt):
-        # The default fromutc implementation only works if tzinfo is "self"
-        dt_base = dt.replace(tzinfo=self._zone)
-        dt_out = self._zone.fromutc(dt_base)
-
-        return dt_out.replace(tzinfo=self)
-
-    def __str__(self):
-        if self._key is not None:
-            return str(self._key)
-        else:
-            return repr(self)
-
-    def __repr__(self):
-        return "%s(%s, %s)" % (
-            self.__class__.__name__,
-            repr(self._zone),
-            repr(self._key),
-        )
-
-    def unwrap_shim(self):
-        """Returns the underlying class that the shim is a wrapper for.
-
-        This is a shim-specific method equivalent to
-        :func:`pytz_deprecation_shim.helpers.upgrade_tzinfo`. It is provided as
-        a method to allow end-users to upgrade shim timezones without requiring
-        an explicit dependency on ``pytz_deprecation_shim``, e.g.:
-
-        .. code-block:: python
-
-            if getattr(tz, "unwrap_shim", None) is None:
-                tz = tz.unwrap_shim()
-        """
-        return self._zone
-
-    @property
-    def zone(self):
-        warnings.warn(
-            "The zone attribute is specific to pytz's interface; "
-            + "please migrate to a new time zone provider. "
-            + "For more details on how to do so, see %s"
-            % PYTZ_MIGRATION_GUIDE_URL,
-            PytzUsageWarning,
-            stacklevel=2,
-        )
-
-        return self._key
-
-    def localize(self, dt, is_dst=IS_DST_SENTINEL):
-        warnings.warn(
-            "The localize method is no longer necessary, as this "
-            + "time zone supports the fold attribute (PEP 495). "
-            + "For more details on migrating to a PEP 495-compliant "
-            + "implementation, see %s" % PYTZ_MIGRATION_GUIDE_URL,
-            PytzUsageWarning,
-            stacklevel=2,
-        )
-
-        if dt.tzinfo is not None:
-            raise ValueError("Not naive datetime (tzinfo is already set)")
-
-        dt_out = dt.replace(tzinfo=self)
-
-        if is_dst is IS_DST_SENTINEL:
-            return dt_out
-
-        dt_ambiguous = _compat.is_ambiguous(dt_out)
-        dt_imaginary = (
-            _compat.is_imaginary(dt_out) if not dt_ambiguous else False
-        )
-
-        if is_dst is None:
-            if dt_imaginary:
-                raise get_exception(
-                    NonExistentTimeError, dt.replace(tzinfo=None)
-                )
-
-            if dt_ambiguous:
-                raise get_exception(AmbiguousTimeError, dt.replace(tzinfo=None))
-
-        elif dt_ambiguous or dt_imaginary:
-            # Start by normalizing the folds; dt_out may have fold=0 or fold=1,
-            # but we need to know the DST offset on both sides anyway, so we
-            # will get one datetime representing each side of the fold, then
-            # decide which one we're going to return.
-            if _compat.get_fold(dt_out):
-                dt_enfolded = dt_out
-                dt_out = _compat.enfold(dt_out, fold=0)
-            else:
-                dt_enfolded = _compat.enfold(dt_out, fold=1)
-
-            # Now we want to decide whether the fold=0 or fold=1 represents
-            # what pytz would return for `is_dst=True`
-            enfolded_dst = bool(dt_enfolded.dst())
-            if bool(dt_out.dst()) == enfolded_dst:
-                # If this is not a transition between standard time and
-                # daylight saving time, pytz will consider the larger offset
-                # the DST offset.
-                enfolded_dst = dt_enfolded.utcoffset() > dt_out.utcoffset()
-
-            # The default we've established is that dt_out is fold=0; swap it
-            # for the fold=1 datetime if is_dst == True and the enfolded side
-            # is DST or if is_dst == False and the enfolded side is *not* DST.
-            if is_dst == enfolded_dst:
-                dt_out = dt_enfolded
-
-        return dt_out
-
-    def normalize(self, dt):
-        warnings.warn(
-            "The normalize method is no longer necessary, as this "
-            + "time zone supports the fold attribute (PEP 495). "
-            + "For more details on migrating to a PEP 495-compliant "
-            + "implementation, see %s" % PYTZ_MIGRATION_GUIDE_URL,
-            PytzUsageWarning,
-            stacklevel=2,
-        )
-
-        if dt.tzinfo is None:
-            raise ValueError("Naive time - no tzinfo set")
-
-        if dt.tzinfo is self:
-            return dt
-
-        return dt.astimezone(self)
-
-    def __copy__(self):
-        return self
-
-    def __deepcopy__(self, memo=None):
-        return self
-
-    def __reduce__(self):
-        return wrap_zone, (self._zone, self._key)
-
-
-UTC = wrap_zone(_compat.UTC, "UTC")
-PYTZ_MIGRATION_GUIDE_URL = (
-    "https://pytz-deprecation-shim.readthedocs.io/en/latest/migration.html"
-)
diff --git a/lib/pytz_deprecation_shim/helpers.py b/lib/pytz_deprecation_shim/helpers.py
deleted file mode 100644
index 6b05b130..00000000
--- a/lib/pytz_deprecation_shim/helpers.py
+++ /dev/null
@@ -1,90 +0,0 @@
-"""
-This module contains helper functions to ease the transition from ``pytz`` to
-another :pep:`495`-compatible library.
-"""
-from . import _common, _compat
-from ._impl import _PytzShimTimezone
-
-_PYTZ_BASE_CLASSES = None
-
-
-def is_pytz_zone(tz):
-    """Check if a time zone is a ``pytz`` time zone.
-
-    This will only import ``pytz`` if it has already been imported, and does
-    not rely on the existence of the ``localize`` or ``normalize`` methods
-    (since the shim classes also have these methods, but are not ``pytz``
-    zones).
-    """
-
-    # If pytz is not in sys.modules, then we will assume the time zone is not a
-    # pytz zone. It is possible that someone has manipulated sys.modules to
-    # remove pytz, but that's the kind of thing that causes all kinds of other
-    # problems anyway, so we'll call that an unsupported configuration.
-    if not _common.pytz_imported():
-        return False
-
-    if _PYTZ_BASE_CLASSES is None:
-        _populate_pytz_base_classes()
-
-    return isinstance(tz, _PYTZ_BASE_CLASSES)
-
-
-def upgrade_tzinfo(tz):
-    """Convert a ``pytz`` or shim timezone into its modern equivalent.
-
-    The shim classes are thin wrappers around :mod:`zoneinfo` or
-    :mod:`dateutil.tz` implementations of the :class:`datetime.tzinfo` base
-    class. This function removes the shim and returns the underlying "upgraded"
-    time zone.
-
-    When passed a ``pytz`` zone (not a shim), this returns the non-``pytz``
-    equivalent. This may fail if ``pytz`` is using a data source incompatible
-    with the upgraded provider's data source, or if the ``pytz`` zone was built
-    from a file rather than an IANA key.
-
-    When passed an object that is not a shim or a ``pytz`` zone, this returns
-    the original object.
-
-    :param tz:
-        A :class:`datetime.tzinfo` object.
-
-    :raises KeyError:
-        If a ``pytz`` zone is passed to the function with no equivalent in the
-        :pep:`495`-compatible library's version of the Olson database.
-
-    :return:
-        A :pep:`495`-compatible equivalent of any ``pytz`` or shim
-        class, or the original object.
-    """
-    if isinstance(tz, _PytzShimTimezone):
-        return tz._zone
-
-    if is_pytz_zone(tz):
-        if tz.zone is None:
-            # This is a fixed offset zone
-            offset = tz.utcoffset(None)
-            offset_minutes = offset.total_seconds() / 60
-
-            return _compat.get_fixed_offset_zone(offset_minutes)
-
-        if tz.zone == "UTC":
-            return _compat.UTC
-
-        return _compat.get_timezone(tz.zone)
-
-    return tz
-
-
-def _populate_pytz_base_classes():
-    import pytz
-    from pytz.tzinfo import BaseTzInfo
-
-    base_classes = (BaseTzInfo, pytz._FixedOffset)
-
-    # In releases prior to 2018.4, pytz.UTC was not a subclass of BaseTzInfo
-    if not isinstance(pytz.UTC, BaseTzInfo):  # pragma: nocover
-        base_classes = base_classes + (type(pytz.UTC),)
-
-    global _PYTZ_BASE_CLASSES
-    _PYTZ_BASE_CLASSES = base_classes
diff --git a/lib/requests/LICENSE b/lib/requests/LICENSE
new file mode 100644
index 00000000..8c5e7584
--- /dev/null
+++ b/lib/requests/LICENSE
@@ -0,0 +1,13 @@
+Copyright 2014 Kenneth Reitz
+
+   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/lib/requests/NOTICE b/lib/requests/NOTICE
new file mode 100644
index 00000000..f583e47a
--- /dev/null
+++ b/lib/requests/NOTICE
@@ -0,0 +1,54 @@
+Requests includes some vendorized python libraries to ease installation.
+
+Urllib3 License
+===============
+
+This is the MIT license: http://www.opensource.org/licenses/mit-license.php
+
+Copyright 2008-2011 Andrey Petrov and contributors (see CONTRIBUTORS.txt),
+Modifications copyright 2012 Kenneth Reitz.
+
+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.
+
+Chardet License
+===============
+
+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 St, Fifth Floor, Boston, MA
+02110-1301  USA
+
+
+CA Bundle License
+=================
+
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at http://mozilla.org/MPL/2.0/.
diff --git a/lib/requests/README.rst b/lib/requests/README.rst
new file mode 100644
index 00000000..e9f63ef8
--- /dev/null
+++ b/lib/requests/README.rst
@@ -0,0 +1,85 @@
+Requests: HTTP for Humans
+=========================
+
+.. image:: https://badge.fury.io/py/requests.png
+    :target: http://badge.fury.io/py/requests
+
+.. image:: https://pypip.in/d/requests/badge.png
+        :target: https://crate.io/packages/requests/
+
+
+Requests is an Apache2 Licensed HTTP library, written in Python, for human
+beings.
+
+Most existing Python modules for sending HTTP requests are extremely
+verbose and cumbersome. Python's builtin urllib2 module provides most of
+the HTTP capabilities you should need, but the api is thoroughly broken.
+It requires an enormous amount of work (even method overrides) to
+perform the simplest of tasks.
+
+Things shouldn't be this way. Not in Python.
+
+.. code-block:: python
+
+    >>> r = requests.get('https://api.github.com', auth=('user', 'pass'))
+    >>> r.status_code
+    204
+    >>> r.headers['content-type']
+    'application/json'
+    >>> r.text
+    ...
+
+See `the same code, without Requests <https://gist.github.com/973705>`_.
+
+Requests allow you to send HTTP/1.1 requests. You can add headers, form data,
+multipart files, and parameters with simple Python dictionaries, and access the
+response data in the same way. It's powered by httplib and `urllib3
+<https://github.com/shazow/urllib3>`_, but it does all the hard work and crazy
+hacks for you.
+
+
+Features
+--------
+
+- International Domains and URLs
+- Keep-Alive & Connection Pooling
+- Sessions with Cookie Persistence
+- Browser-style SSL Verification
+- Basic/Digest Authentication
+- Elegant Key/Value Cookies
+- Automatic Decompression
+- Unicode Response Bodies
+- Multipart File Uploads
+- Connection Timeouts
+- Thread-safety
+- HTTP(S) proxy support
+
+
+Installation
+------------
+
+To install Requests, simply:
+
+.. code-block:: bash
+
+    $ pip install requests
+
+
+Documentation
+-------------
+
+Documentation is available at http://docs.python-requests.org/.
+
+
+Contribute
+----------
+
+#. Check for open issues or open a fresh issue to start a discussion around a feature idea or a bug. There is a `Contributor Friendly`_ tag for issues that should be ideal for people who are not very familiar with the codebase yet.
+#. If you feel uncomfortable or uncertain about an issue or your changes, feel free to email @sigmavirus24 and he will happily help you via email, Skype, remote pairing or whatever you are comfortable with.
+#. Fork `the repository`_ on GitHub to start making your changes to the **master** branch (or branch off of it).
+#. Write a test which shows that the bug was fixed or that the feature works as expected.
+#. Send a pull request and bug the maintainer until it gets merged and published. :) Make sure to add yourself to AUTHORS_.
+
+.. _`the repository`: http://github.com/kennethreitz/requests
+.. _AUTHORS: https://github.com/kennethreitz/requests/blob/master/AUTHORS.rst
+.. _Contributor Friendly: https://github.com/kennethreitz/requests/issues?direction=desc&labels=Contributor+Friendly&page=1&sort=updated&state=open
diff --git a/lib/requests/__init__.py b/lib/requests/__init__.py
index 051cda13..ac2b06c8 100644
--- a/lib/requests/__init__.py
+++ b/lib/requests/__init__.py
@@ -1,184 +1,77 @@
+# -*- coding: utf-8 -*-
+
 #   __
 #  /__)  _  _     _   _ _/   _
 # / (   (- (/ (/ (- _)  /  _)
 #          /
 
 """
-Requests HTTP Library
+requests HTTP library
 ~~~~~~~~~~~~~~~~~~~~~
 
-Requests is an HTTP library, written in Python, for human beings.
-Basic GET usage:
+Requests is an HTTP library, written in Python, for human beings. Basic GET
+usage:
 
    >>> import requests
    >>> r = requests.get('https://www.python.org')
    >>> r.status_code
    200
-   >>> b'Python is a programming language' in r.content
+   >>> 'Python is a programming language' in r.content
    True
 
 ... or POST:
 
    >>> payload = dict(key1='value1', key2='value2')
-   >>> r = requests.post('https://httpbin.org/post', data=payload)
+   >>> r = requests.post('http://httpbin.org/post', data=payload)
    >>> print(r.text)
    {
      ...
      "form": {
-       "key1": "value1",
-       "key2": "value2"
+       "key2": "value2",
+       "key1": "value1"
      },
      ...
    }
 
 The other HTTP methods are supported - see `requests.api`. Full documentation
-is at <https://requests.readthedocs.io>.
+is at <http://python-requests.org>.
 
-:copyright: (c) 2017 by Kenneth Reitz.
+:copyright: (c) 2014 by Kenneth Reitz.
 :license: Apache 2.0, see LICENSE for more details.
+
 """
 
-import warnings
-
-import urllib3
-
-from .exceptions import RequestsDependencyWarning
+__title__ = 'requests'
+__version__ = '2.5.1'
+__build__ = 0x020501
+__author__ = 'Kenneth Reitz'
+__license__ = 'Apache 2.0'
+__copyright__ = 'Copyright 2014 Kenneth Reitz'
 
+# Attempt to enable urllib3's SNI support, if possible
 try:
-    from charset_normalizer import __version__ as charset_normalizer_version
-except ImportError:
-    charset_normalizer_version = None
-
-try:
-    from chardet import __version__ as chardet_version
-except ImportError:
-    chardet_version = None
-
-
-def check_compatibility(urllib3_version, chardet_version, charset_normalizer_version):
-    urllib3_version = urllib3_version.split(".")
-    assert urllib3_version != ["dev"]  # Verify urllib3 isn't installed from git.
-
-    # Sometimes, urllib3 only reports its version as 16.1.
-    if len(urllib3_version) == 2:
-        urllib3_version.append("0")
-
-    # Check urllib3 for compatibility.
-    major, minor, patch = urllib3_version  # noqa: F811
-    major, minor, patch = int(major), int(minor), int(patch)
-    # urllib3 >= 1.21.1
-    assert major >= 1
-    if major == 1:
-        assert minor >= 21
-
-    # Check charset_normalizer for compatibility.
-    if chardet_version:
-        major, minor, patch = chardet_version.split(".")[:3]
-        major, minor, patch = int(major), int(minor), int(patch)
-        # chardet_version >= 3.0.2, < 6.0.0
-        assert (3, 0, 2) <= (major, minor, patch) < (6, 0, 0)
-    elif charset_normalizer_version:
-        major, minor, patch = charset_normalizer_version.split(".")[:3]
-        major, minor, patch = int(major), int(minor), int(patch)
-        # charset_normalizer >= 2.0.0 < 4.0.0
-        assert (2, 0, 0) <= (major, minor, patch) < (4, 0, 0)
-    else:
-        warnings.warn(
-            "Unable to find acceptable character detection dependency "
-            "(chardet or charset_normalizer).",
-            RequestsDependencyWarning,
-        )
-
-
-def _check_cryptography(cryptography_version):
-    # cryptography < 1.3.4
-    try:
-        cryptography_version = list(map(int, cryptography_version.split(".")))
-    except ValueError:
-        return
-
-    if cryptography_version < [1, 3, 4]:
-        warning = "Old version of cryptography ({}) may cause slowdown.".format(
-            cryptography_version
-        )
-        warnings.warn(warning, RequestsDependencyWarning)
-
-
-# Check imported dependencies for compatibility.
-try:
-    check_compatibility(
-        urllib3.__version__, chardet_version, charset_normalizer_version
-    )
-except (AssertionError, ValueError):
-    warnings.warn(
-        "urllib3 ({}) or chardet ({})/charset_normalizer ({}) doesn't match a supported "
-        "version!".format(
-            urllib3.__version__, chardet_version, charset_normalizer_version
-        ),
-        RequestsDependencyWarning,
-    )
-
-# Attempt to enable urllib3's fallback for SNI support
-# if the standard library doesn't support SNI or the
-# 'ssl' library isn't available.
-try:
-    try:
-        import ssl
-    except ImportError:
-        ssl = None
-
-    if not getattr(ssl, "HAS_SNI", False):
-        from urllib3.contrib import pyopenssl
-
-        pyopenssl.inject_into_urllib3()
-
-        # Check cryptography version
-        from cryptography import __version__ as cryptography_version
-
-        _check_cryptography(cryptography_version)
+    from .packages.urllib3.contrib import pyopenssl
+    pyopenssl.inject_into_urllib3()
 except ImportError:
     pass
 
-# urllib3's DependencyWarnings should be silenced.
-from urllib3.exceptions import DependencyWarning
-
-warnings.simplefilter("ignore", DependencyWarning)
+from . import utils
+from .models import Request, Response, PreparedRequest
+from .api import request, get, head, post, patch, put, delete, options
+from .sessions import session, Session
+from .status_codes import codes
+from .exceptions import (
+    RequestException, Timeout, URLRequired,
+    TooManyRedirects, HTTPError, ConnectionError
+)
 
 # Set default logging handler to avoid "No handler found" warnings.
 import logging
-from logging import NullHandler
-
-from . import packages, utils
-from .__version__ import (
-    __author__,
-    __author_email__,
-    __build__,
-    __cake__,
-    __copyright__,
-    __description__,
-    __license__,
-    __title__,
-    __url__,
-    __version__,
-)
-from .api import delete, get, head, options, patch, post, put, request
-from .exceptions import (
-    ConnectionError,
-    ConnectTimeout,
-    FileModeWarning,
-    HTTPError,
-    JSONDecodeError,
-    ReadTimeout,
-    RequestException,
-    Timeout,
-    TooManyRedirects,
-    URLRequired,
-)
-from .models import PreparedRequest, Request, Response
-from .sessions import Session, session
-from .status_codes import codes
+try:  # Python 2.7+
+    from logging import NullHandler
+except ImportError:
+    class NullHandler(logging.Handler):
+        def emit(self, record):
+            pass
 
 logging.getLogger(__name__).addHandler(NullHandler())
-
-# FileModeWarnings go off per the default.
-warnings.simplefilter("default", FileModeWarning, append=True)
diff --git a/lib/requests/__version__.py b/lib/requests/__version__.py
deleted file mode 100644
index 2c105aca..00000000
--- a/lib/requests/__version__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# .-. .-. .-. . . .-. .-. .-. .-.
-# |(  |-  |.| | | |-  `-.  |  `-.
-# ' ' `-' `-`.`-' `-' `-'  '  `-'
-
-__title__ = "requests"
-__description__ = "Python HTTP for Humans."
-__url__ = "https://requests.readthedocs.io"
-__version__ = "2.32.3"
-__build__ = 0x023203
-__author__ = "Kenneth Reitz"
-__author_email__ = "me@kennethreitz.org"
-__license__ = "Apache-2.0"
-__copyright__ = "Copyright Kenneth Reitz"
-__cake__ = "\u2728 \U0001f370 \u2728"
diff --git a/lib/requests/_internal_utils.py b/lib/requests/_internal_utils.py
deleted file mode 100644
index f2cf635e..00000000
--- a/lib/requests/_internal_utils.py
+++ /dev/null
@@ -1,50 +0,0 @@
-"""
-requests._internal_utils
-~~~~~~~~~~~~~~
-
-Provides utility functions that are consumed internally by Requests
-which depend on extremely few external helpers (such as compat)
-"""
-import re
-
-from .compat import builtin_str
-
-_VALID_HEADER_NAME_RE_BYTE = re.compile(rb"^[^:\s][^:\r\n]*$")
-_VALID_HEADER_NAME_RE_STR = re.compile(r"^[^:\s][^:\r\n]*$")
-_VALID_HEADER_VALUE_RE_BYTE = re.compile(rb"^\S[^\r\n]*$|^$")
-_VALID_HEADER_VALUE_RE_STR = re.compile(r"^\S[^\r\n]*$|^$")
-
-_HEADER_VALIDATORS_STR = (_VALID_HEADER_NAME_RE_STR, _VALID_HEADER_VALUE_RE_STR)
-_HEADER_VALIDATORS_BYTE = (_VALID_HEADER_NAME_RE_BYTE, _VALID_HEADER_VALUE_RE_BYTE)
-HEADER_VALIDATORS = {
-    bytes: _HEADER_VALIDATORS_BYTE,
-    str: _HEADER_VALIDATORS_STR,
-}
-
-
-def to_native_string(string, encoding="ascii"):
-    """Given a string object, regardless of type, returns a representation of
-    that string in the native string type, encoding and decoding where
-    necessary. This assumes ASCII unless told otherwise.
-    """
-    if isinstance(string, builtin_str):
-        out = string
-    else:
-        out = string.decode(encoding)
-
-    return out
-
-
-def unicode_is_ascii(u_string):
-    """Determine if unicode string only contains ASCII characters.
-
-    :param str u_string: unicode string to check. Must be unicode
-        and not Python 2 `str`.
-    :rtype: bool
-    """
-    assert isinstance(u_string, str)
-    try:
-        u_string.encode("ascii")
-        return True
-    except UnicodeEncodeError:
-        return False
diff --git a/lib/requests/adapters.py b/lib/requests/adapters.py
index 9a58b160..c892853b 100644
--- a/lib/requests/adapters.py
+++ b/lib/requests/adapters.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 """
 requests.adapters
 ~~~~~~~~~~~~~~~~~
@@ -6,161 +8,45 @@ This module contains the transport adapters that Requests uses to define
 and maintain connections.
 """
 
-import os.path
-import socket  # noqa: F401
-import typing
-import warnings
+import socket
 
-from urllib3.exceptions import ClosedPoolError, ConnectTimeoutError
-from urllib3.exceptions import HTTPError as _HTTPError
-from urllib3.exceptions import InvalidHeader as _InvalidHeader
-from urllib3.exceptions import (
-    LocationValueError,
-    MaxRetryError,
-    NewConnectionError,
-    ProtocolError,
-)
-from urllib3.exceptions import ProxyError as _ProxyError
-from urllib3.exceptions import ReadTimeoutError, ResponseError
-from urllib3.exceptions import SSLError as _SSLError
-from urllib3.poolmanager import PoolManager, proxy_from_url
-from urllib3.util import Timeout as TimeoutSauce
-from urllib3.util import parse_url
-from urllib3.util.retry import Retry
-from urllib3.util.ssl_ import create_urllib3_context
-
-from .auth import _basic_auth_str
-from .compat import basestring, urlparse
-from .cookies import extract_cookies_to_jar
-from .exceptions import (
-    ConnectionError,
-    ConnectTimeout,
-    InvalidHeader,
-    InvalidProxyURL,
-    InvalidSchema,
-    InvalidURL,
-    ProxyError,
-    ReadTimeout,
-    RetryError,
-    SSLError,
-)
 from .models import Response
+from .packages.urllib3 import Retry
+from .packages.urllib3.poolmanager import PoolManager, proxy_from_url
+from .packages.urllib3.response import HTTPResponse
+from .packages.urllib3.util import Timeout as TimeoutSauce
+from .compat import urlparse, basestring
+from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers,
+                    prepend_scheme_if_needed, get_auth_from_url, urldefragauth)
 from .structures import CaseInsensitiveDict
-from .utils import (
-    DEFAULT_CA_BUNDLE_PATH,
-    extract_zipped_paths,
-    get_auth_from_url,
-    get_encoding_from_headers,
-    prepend_scheme_if_needed,
-    select_proxy,
-    urldefragauth,
-)
-
-try:
-    from urllib3.contrib.socks import SOCKSProxyManager
-except ImportError:
-
-    def SOCKSProxyManager(*args, **kwargs):
-        raise InvalidSchema("Missing dependencies for SOCKS support.")
-
-
-if typing.TYPE_CHECKING:
-    from .models import PreparedRequest
-
+from .packages.urllib3.exceptions import ConnectTimeoutError
+from .packages.urllib3.exceptions import HTTPError as _HTTPError
+from .packages.urllib3.exceptions import MaxRetryError
+from .packages.urllib3.exceptions import ProxyError as _ProxyError
+from .packages.urllib3.exceptions import ProtocolError
+from .packages.urllib3.exceptions import ReadTimeoutError
+from .packages.urllib3.exceptions import SSLError as _SSLError
+from .packages.urllib3.exceptions import ResponseError
+from .cookies import extract_cookies_to_jar
+from .exceptions import (ConnectionError, ConnectTimeout, ReadTimeout, SSLError,
+                         ProxyError, RetryError)
+from .auth import _basic_auth_str
 
 DEFAULT_POOLBLOCK = False
 DEFAULT_POOLSIZE = 10
 DEFAULT_RETRIES = 0
-DEFAULT_POOL_TIMEOUT = None
 
 
-try:
-    import ssl  # noqa: F401
-
-    _preloaded_ssl_context = create_urllib3_context()
-    _preloaded_ssl_context.load_verify_locations(
-        extract_zipped_paths(DEFAULT_CA_BUNDLE_PATH)
-    )
-except ImportError:
-    # Bypass default SSLContext creation when Python
-    # interpreter isn't built with the ssl module.
-    _preloaded_ssl_context = None
-
-
-def _urllib3_request_context(
-    request: "PreparedRequest",
-    verify: "bool | str | None",
-    client_cert: "typing.Tuple[str, str] | str | None",
-    poolmanager: "PoolManager",
-) -> "(typing.Dict[str, typing.Any], typing.Dict[str, typing.Any])":
-    host_params = {}
-    pool_kwargs = {}
-    parsed_request_url = urlparse(request.url)
-    scheme = parsed_request_url.scheme.lower()
-    port = parsed_request_url.port
-
-    # Determine if we have and should use our default SSLContext
-    # to optimize performance on standard requests.
-    poolmanager_kwargs = getattr(poolmanager, "connection_pool_kw", {})
-    has_poolmanager_ssl_context = poolmanager_kwargs.get("ssl_context")
-    should_use_default_ssl_context = (
-        _preloaded_ssl_context is not None and not has_poolmanager_ssl_context
-    )
-
-    cert_reqs = "CERT_REQUIRED"
-    if verify is False:
-        cert_reqs = "CERT_NONE"
-    elif verify is True and should_use_default_ssl_context:
-        pool_kwargs["ssl_context"] = _preloaded_ssl_context
-    elif isinstance(verify, str):
-        if not os.path.isdir(verify):
-            pool_kwargs["ca_certs"] = verify
-        else:
-            pool_kwargs["ca_cert_dir"] = verify
-    pool_kwargs["cert_reqs"] = cert_reqs
-    if client_cert is not None:
-        if isinstance(client_cert, tuple) and len(client_cert) == 2:
-            pool_kwargs["cert_file"] = client_cert[0]
-            pool_kwargs["key_file"] = client_cert[1]
-        else:
-            # According to our docs, we allow users to specify just the client
-            # cert path
-            pool_kwargs["cert_file"] = client_cert
-    host_params = {
-        "scheme": scheme,
-        "host": parsed_request_url.hostname,
-        "port": port,
-    }
-    return host_params, pool_kwargs
-
-
-class BaseAdapter:
+class BaseAdapter(object):
     """The Base Transport Adapter"""
 
     def __init__(self):
-        super().__init__()
+        super(BaseAdapter, self).__init__()
 
-    def send(
-        self, request, stream=False, timeout=None, verify=True, cert=None, proxies=None
-    ):
-        """Sends PreparedRequest object. Returns Response object.
-
-        :param request: The :class:`PreparedRequest <PreparedRequest>` being sent.
-        :param stream: (optional) Whether to stream the request content.
-        :param timeout: (optional) How long to wait for the server to send
-            data before giving up, as a float, or a :ref:`(connect timeout,
-            read timeout) <timeouts>` tuple.
-        :type timeout: float or tuple
-        :param verify: (optional) Either a boolean, in which case it controls whether we verify
-            the server's TLS certificate, or a string, in which case it must be a path
-            to a CA bundle to use
-        :param cert: (optional) Any user-provided SSL certificate to be trusted.
-        :param proxies: (optional) The proxies dictionary to apply to the request.
-        """
+    def send(self):
         raise NotImplementedError
 
     def close(self):
-        """Cleans up adapter specific items."""
         raise NotImplementedError
 
 
@@ -174,7 +60,7 @@ class HTTPAdapter(BaseAdapter):
 
     :param pool_connections: The number of urllib3 connection pools to cache.
     :param pool_maxsize: The maximum number of connections to save in the pool.
-    :param max_retries: The maximum number of retries each connection
+    :param int max_retries: The maximum number of retries each connection
         should attempt. Note, this applies only to failed DNS lookups, socket
         connections and connection timeouts, never to requests where data has
         made it to the server. By default, Requests does not retry failed
@@ -190,22 +76,12 @@ class HTTPAdapter(BaseAdapter):
       >>> a = requests.adapters.HTTPAdapter(max_retries=3)
       >>> s.mount('http://', a)
     """
+    __attrs__ = ['max_retries', 'config', '_pool_connections', '_pool_maxsize',
+                 '_pool_block']
 
-    __attrs__ = [
-        "max_retries",
-        "config",
-        "_pool_connections",
-        "_pool_maxsize",
-        "_pool_block",
-    ]
-
-    def __init__(
-        self,
-        pool_connections=DEFAULT_POOLSIZE,
-        pool_maxsize=DEFAULT_POOLSIZE,
-        max_retries=DEFAULT_RETRIES,
-        pool_block=DEFAULT_POOLBLOCK,
-    ):
+    def __init__(self, pool_connections=DEFAULT_POOLSIZE,
+                 pool_maxsize=DEFAULT_POOLSIZE, max_retries=DEFAULT_RETRIES,
+                 pool_block=DEFAULT_POOLBLOCK):
         if max_retries == DEFAULT_RETRIES:
             self.max_retries = Retry(0, read=False)
         else:
@@ -213,7 +89,7 @@ class HTTPAdapter(BaseAdapter):
         self.config = {}
         self.proxy_manager = {}
 
-        super().__init__()
+        super(HTTPAdapter, self).__init__()
 
         self._pool_connections = pool_connections
         self._pool_maxsize = pool_maxsize
@@ -222,24 +98,22 @@ class HTTPAdapter(BaseAdapter):
         self.init_poolmanager(pool_connections, pool_maxsize, block=pool_block)
 
     def __getstate__(self):
-        return {attr: getattr(self, attr, None) for attr in self.__attrs__}
+        return dict((attr, getattr(self, attr, None)) for attr in
+                    self.__attrs__)
 
     def __setstate__(self, state):
         # Can't handle by adding 'proxy_manager' to self.__attrs__ because
-        # self.poolmanager uses a lambda function, which isn't pickleable.
+        # because self.poolmanager uses a lambda function, which isn't pickleable.
         self.proxy_manager = {}
         self.config = {}
 
         for attr, value in state.items():
             setattr(self, attr, value)
 
-        self.init_poolmanager(
-            self._pool_connections, self._pool_maxsize, block=self._pool_block
-        )
+        self.init_poolmanager(self._pool_connections, self._pool_maxsize,
+                              block=self._pool_block)
 
-    def init_poolmanager(
-        self, connections, maxsize, block=DEFAULT_POOLBLOCK, **pool_kwargs
-    ):
+    def init_poolmanager(self, connections, maxsize, block=DEFAULT_POOLBLOCK, **pool_kwargs):
         """Initializes a urllib3 PoolManager.
 
         This method should not be called from user code, and is only
@@ -256,12 +130,8 @@ class HTTPAdapter(BaseAdapter):
         self._pool_maxsize = maxsize
         self._pool_block = block
 
-        self.poolmanager = PoolManager(
-            num_pools=connections,
-            maxsize=maxsize,
-            block=block,
-            **pool_kwargs,
-        )
+        self.poolmanager = PoolManager(num_pools=connections, maxsize=maxsize,
+                                       block=block, strict=True, **pool_kwargs)
 
     def proxy_manager_for(self, proxy, **proxy_kwargs):
         """Return urllib3 ProxyManager for the given proxy.
@@ -273,33 +143,18 @@ class HTTPAdapter(BaseAdapter):
         :param proxy: The proxy to return a urllib3 ProxyManager for.
         :param proxy_kwargs: Extra keyword arguments used to configure the Proxy Manager.
         :returns: ProxyManager
-        :rtype: urllib3.ProxyManager
         """
-        if proxy in self.proxy_manager:
-            manager = self.proxy_manager[proxy]
-        elif proxy.lower().startswith("socks"):
-            username, password = get_auth_from_url(proxy)
-            manager = self.proxy_manager[proxy] = SOCKSProxyManager(
-                proxy,
-                username=username,
-                password=password,
-                num_pools=self._pool_connections,
-                maxsize=self._pool_maxsize,
-                block=self._pool_block,
-                **proxy_kwargs,
-            )
-        else:
+        if not proxy in self.proxy_manager:
             proxy_headers = self.proxy_headers(proxy)
-            manager = self.proxy_manager[proxy] = proxy_from_url(
+            self.proxy_manager[proxy] = proxy_from_url(
                 proxy,
                 proxy_headers=proxy_headers,
                 num_pools=self._pool_connections,
                 maxsize=self._pool_maxsize,
                 block=self._pool_block,
-                **proxy_kwargs,
-            )
+                **proxy_kwargs)
 
-        return manager
+        return self.proxy_manager[proxy]
 
     def cert_verify(self, conn, url, verify, cert):
         """Verify a SSL certificate. This method should not be called from user
@@ -308,36 +163,28 @@ class HTTPAdapter(BaseAdapter):
 
         :param conn: The urllib3 connection object associated with the cert.
         :param url: The requested URL.
-        :param verify: Either a boolean, in which case it controls whether we verify
-            the server's TLS certificate, or a string, in which case it must be a path
-            to a CA bundle to use
+        :param verify: Whether we should actually verify the certificate.
         :param cert: The SSL certificate to verify.
         """
-        if url.lower().startswith("https") and verify:
-            conn.cert_reqs = "CERT_REQUIRED"
+        if url.lower().startswith('https') and verify:
 
-            # Only load the CA certificates if 'verify' is a string indicating the CA bundle to use.
-            # Otherwise, if verify is a boolean, we don't load anything since
-            # the connection will be using a context with the default certificates already loaded,
-            # and this avoids a call to the slow load_verify_locations()
+            cert_loc = None
+
+            # Allow self-specified cert location.
             if verify is not True:
-                # `verify` must be a str with a path then
                 cert_loc = verify
 
-                if not os.path.exists(cert_loc):
-                    raise OSError(
-                        f"Could not find a suitable TLS CA certificate bundle, "
-                        f"invalid path: {cert_loc}"
-                    )
+            if not cert_loc:
+                cert_loc = DEFAULT_CA_BUNDLE_PATH
 
-                if not os.path.isdir(cert_loc):
-                    conn.ca_certs = cert_loc
-                else:
-                    conn.ca_cert_dir = cert_loc
+            if not cert_loc:
+                raise Exception("Could not find a suitable SSL CA certificate bundle.")
+
+            conn.cert_reqs = 'CERT_REQUIRED'
+            conn.ca_certs = cert_loc
         else:
-            conn.cert_reqs = "CERT_NONE"
+            conn.cert_reqs = 'CERT_NONE'
             conn.ca_certs = None
-            conn.ca_cert_dir = None
 
         if cert:
             if not isinstance(cert, basestring):
@@ -345,16 +192,6 @@ class HTTPAdapter(BaseAdapter):
                 conn.key_file = cert[1]
             else:
                 conn.cert_file = cert
-                conn.key_file = None
-            if conn.cert_file and not os.path.exists(conn.cert_file):
-                raise OSError(
-                    f"Could not find the TLS certificate file, "
-                    f"invalid path: {conn.cert_file}"
-                )
-            if conn.key_file and not os.path.exists(conn.key_file):
-                raise OSError(
-                    f"Could not find the TLS key file, invalid path: {conn.key_file}"
-                )
 
     def build_response(self, req, resp):
         """Builds a :class:`Response <requests.Response>` object from a urllib3
@@ -364,15 +201,14 @@ class HTTPAdapter(BaseAdapter):
 
         :param req: The :class:`PreparedRequest <PreparedRequest>` used to generate the response.
         :param resp: The urllib3 response object.
-        :rtype: requests.Response
         """
         response = Response()
 
         # Fallback to None if there's no status_code, for whatever reason.
-        response.status_code = getattr(resp, "status", None)
+        response.status_code = getattr(resp, 'status', None)
 
         # Make headers case-insensitive.
-        response.headers = CaseInsensitiveDict(getattr(resp, "headers", {}))
+        response.headers = CaseInsensitiveDict(getattr(resp, 'headers', {}))
 
         # Set encoding.
         response.encoding = get_encoding_from_headers(response.headers)
@@ -380,7 +216,7 @@ class HTTPAdapter(BaseAdapter):
         response.reason = response.raw.reason
 
         if isinstance(req.url, bytes):
-            response.url = req.url.decode("utf-8")
+            response.url = req.url.decode('utf-8')
         else:
             response.url = req.url
 
@@ -393,136 +229,19 @@ class HTTPAdapter(BaseAdapter):
 
         return response
 
-    def build_connection_pool_key_attributes(self, request, verify, cert=None):
-        """Build the PoolKey attributes used by urllib3 to return a connection.
-
-        This looks at the PreparedRequest, the user-specified verify value,
-        and the value of the cert parameter to determine what PoolKey values
-        to use to select a connection from a given urllib3 Connection Pool.
-
-        The SSL related pool key arguments are not consistently set. As of
-        this writing, use the following to determine what keys may be in that
-        dictionary:
-
-        * If ``verify`` is ``True``, ``"ssl_context"`` will be set and will be the
-          default Requests SSL Context
-        * If ``verify`` is ``False``, ``"ssl_context"`` will not be set but
-          ``"cert_reqs"`` will be set
-        * If ``verify`` is a string, (i.e., it is a user-specified trust bundle)
-          ``"ca_certs"`` will be set if the string is not a directory recognized
-          by :py:func:`os.path.isdir`, otherwise ``"ca_certs_dir"`` will be
-          set.
-        * If ``"cert"`` is specified, ``"cert_file"`` will always be set. If
-          ``"cert"`` is a tuple with a second item, ``"key_file"`` will also
-          be present
-
-        To override these settings, one may subclass this class, call this
-        method and use the above logic to change parameters as desired. For
-        example, if one wishes to use a custom :py:class:`ssl.SSLContext` one
-        must both set ``"ssl_context"`` and based on what else they require,
-        alter the other keys to ensure the desired behaviour.
-
-        :param request:
-            The PreparedReqest being sent over the connection.
-        :type request:
-            :class:`~requests.models.PreparedRequest`
-        :param verify:
-            Either a boolean, in which case it controls whether
-            we verify the server's TLS certificate, or a string, in which case it
-            must be a path to a CA bundle to use.
-        :param cert:
-            (optional) Any user-provided SSL certificate for client
-            authentication (a.k.a., mTLS). This may be a string (i.e., just
-            the path to a file which holds both certificate and key) or a
-            tuple of length 2 with the certificate file path and key file
-            path.
-        :returns:
-            A tuple of two dictionaries. The first is the "host parameters"
-            portion of the Pool Key including scheme, hostname, and port. The
-            second is a dictionary of SSLContext related parameters.
-        """
-        return _urllib3_request_context(request, verify, cert, self.poolmanager)
-
-    def get_connection_with_tls_context(self, request, verify, proxies=None, cert=None):
-        """Returns a urllib3 connection for the given request and TLS settings.
-        This should not be called from user code, and is only exposed for use
-        when subclassing the :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
-
-        :param request:
-            The :class:`PreparedRequest <PreparedRequest>` object to be sent
-            over the connection.
-        :param verify:
-            Either a boolean, in which case it controls whether we verify the
-            server's TLS certificate, or a string, in which case it must be a
-            path to a CA bundle to use.
-        :param proxies:
-            (optional) The proxies dictionary to apply to the request.
-        :param cert:
-            (optional) Any user-provided SSL certificate to be used for client
-            authentication (a.k.a., mTLS).
-        :rtype:
-            urllib3.ConnectionPool
-        """
-        proxy = select_proxy(request.url, proxies)
-        try:
-            host_params, pool_kwargs = self.build_connection_pool_key_attributes(
-                request,
-                verify,
-                cert,
-            )
-        except ValueError as e:
-            raise InvalidURL(e, request=request)
-        if proxy:
-            proxy = prepend_scheme_if_needed(proxy, "http")
-            proxy_url = parse_url(proxy)
-            if not proxy_url.host:
-                raise InvalidProxyURL(
-                    "Please check proxy URL. It is malformed "
-                    "and could be missing the host."
-                )
-            proxy_manager = self.proxy_manager_for(proxy)
-            conn = proxy_manager.connection_from_host(
-                **host_params, pool_kwargs=pool_kwargs
-            )
-        else:
-            # Only scheme should be lower case
-            conn = self.poolmanager.connection_from_host(
-                **host_params, pool_kwargs=pool_kwargs
-            )
-
-        return conn
-
     def get_connection(self, url, proxies=None):
-        """DEPRECATED: Users should move to `get_connection_with_tls_context`
-        for all subclasses of HTTPAdapter using Requests>=2.32.2.
-
-        Returns a urllib3 connection for the given URL. This should not be
+        """Returns a urllib3 connection for the given URL. This should not be
         called from user code, and is only exposed for use when subclassing the
         :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
 
         :param url: The URL to connect to.
         :param proxies: (optional) A Requests-style dictionary of proxies used on this request.
-        :rtype: urllib3.ConnectionPool
         """
-        warnings.warn(
-            (
-                "`get_connection` has been deprecated in favor of "
-                "`get_connection_with_tls_context`. Custom HTTPAdapter subclasses "
-                "will need to migrate for Requests>=2.32.2. Please see "
-                "https://github.com/psf/requests/pull/6710 for more details."
-            ),
-            DeprecationWarning,
-        )
-        proxy = select_proxy(url, proxies)
+        proxies = proxies or {}
+        proxy = proxies.get(urlparse(url.lower()).scheme)
 
         if proxy:
-            proxy = prepend_scheme_if_needed(proxy, "http")
-            proxy_url = parse_url(proxy)
-            if not proxy_url.host:
-                raise InvalidProxyURL(
-                    "Please check proxy URL. It is malformed "
-                    "and could be missing the host."
-                )
+            proxy = prepend_scheme_if_needed(proxy, 'http')
             proxy_manager = self.proxy_manager_for(proxy)
             conn = proxy_manager.connection_from_url(url)
         else:
@@ -536,12 +255,10 @@ class HTTPAdapter(BaseAdapter):
     def close(self):
         """Disposes of any internal state.
 
-        Currently, this closes the PoolManager and any active ProxyManager,
-        which closes any pooled connections.
+        Currently, this just closes the PoolManager, which closes pooled
+        connections.
         """
         self.poolmanager.clear()
-        for proxy in self.proxy_manager.values():
-            proxy.clear()
 
     def request_url(self, request, proxies):
         """Obtain the url to use when making the final request.
@@ -554,24 +271,16 @@ class HTTPAdapter(BaseAdapter):
         :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
 
         :param request: The :class:`PreparedRequest <PreparedRequest>` being sent.
-        :param proxies: A dictionary of schemes or schemes and hosts to proxy URLs.
-        :rtype: str
+        :param proxies: A dictionary of schemes to proxy URLs.
         """
-        proxy = select_proxy(request.url, proxies)
+        proxies = proxies or {}
         scheme = urlparse(request.url).scheme
+        proxy = proxies.get(scheme)
 
-        is_proxied_http_request = proxy and scheme != "https"
-        using_socks_proxy = False
-        if proxy:
-            proxy_scheme = urlparse(proxy).scheme.lower()
-            using_socks_proxy = proxy_scheme.startswith("socks")
-
-        url = request.path_url
-        if url.startswith("//"):  # Don't confuse urllib3
-            url = f"/{url.lstrip('/')}"
-
-        if is_proxied_http_request and not using_socks_proxy:
+        if proxy and scheme != 'https':
             url = urldefragauth(request.url)
+        else:
+            url = request.path_url
 
         return url
 
@@ -599,107 +308,119 @@ class HTTPAdapter(BaseAdapter):
         when subclassing the
         :class:`HTTPAdapter <requests.adapters.HTTPAdapter>`.
 
-        :param proxy: The url of the proxy being used for this request.
-        :rtype: dict
+        :param proxies: The url of the proxy being used for this request.
+        :param kwargs: Optional additional keyword arguments.
         """
         headers = {}
         username, password = get_auth_from_url(proxy)
 
-        if username:
-            headers["Proxy-Authorization"] = _basic_auth_str(username, password)
+        if username and password:
+            headers['Proxy-Authorization'] = _basic_auth_str(username,
+                                                             password)
 
         return headers
 
-    def send(
-        self, request, stream=False, timeout=None, verify=True, cert=None, proxies=None
-    ):
+    def send(self, request, stream=False, timeout=None, verify=True, cert=None, proxies=None):
         """Sends PreparedRequest object. Returns Response object.
 
         :param request: The :class:`PreparedRequest <PreparedRequest>` being sent.
         :param stream: (optional) Whether to stream the request content.
         :param timeout: (optional) How long to wait for the server to send
-            data before giving up, as a float, or a :ref:`(connect timeout,
-            read timeout) <timeouts>` tuple.
-        :type timeout: float or tuple or urllib3 Timeout object
-        :param verify: (optional) Either a boolean, in which case it controls whether
-            we verify the server's TLS certificate, or a string, in which case it
-            must be a path to a CA bundle to use
+            data before giving up, as a float, or a (`connect timeout, read
+            timeout <user/advanced.html#timeouts>`_) tuple.
+        :type timeout: float or tuple
+        :param verify: (optional) Whether to verify SSL certificates.
         :param cert: (optional) Any user-provided SSL certificate to be trusted.
         :param proxies: (optional) The proxies dictionary to apply to the request.
-        :rtype: requests.Response
         """
 
-        try:
-            conn = self.get_connection_with_tls_context(
-                request, verify, proxies=proxies, cert=cert
-            )
-        except LocationValueError as e:
-            raise InvalidURL(e, request=request)
+        conn = self.get_connection(request.url, proxies)
 
         self.cert_verify(conn, request.url, verify, cert)
         url = self.request_url(request, proxies)
-        self.add_headers(
-            request,
-            stream=stream,
-            timeout=timeout,
-            verify=verify,
-            cert=cert,
-            proxies=proxies,
-        )
+        self.add_headers(request)
 
-        chunked = not (request.body is None or "Content-Length" in request.headers)
+        chunked = not (request.body is None or 'Content-Length' in request.headers)
 
         if isinstance(timeout, tuple):
             try:
                 connect, read = timeout
                 timeout = TimeoutSauce(connect=connect, read=read)
-            except ValueError:
-                raise ValueError(
-                    f"Invalid timeout {timeout}. Pass a (connect, read) timeout tuple, "
-                    f"or a single float to set both timeouts to the same value."
-                )
-        elif isinstance(timeout, TimeoutSauce):
-            pass
+            except ValueError as e:
+                # this may raise a string formatting error.
+                err = ("Invalid timeout {0}. Pass a (connect, read) "
+                       "timeout tuple, or a single float to set "
+                       "both timeouts to the same value".format(timeout))
+                raise ValueError(err)
         else:
             timeout = TimeoutSauce(connect=timeout, read=timeout)
 
         try:
-            resp = conn.urlopen(
-                method=request.method,
-                url=url,
-                body=request.body,
-                headers=request.headers,
-                redirect=False,
-                assert_same_host=False,
-                preload_content=False,
-                decode_content=False,
-                retries=self.max_retries,
-                timeout=timeout,
-                chunked=chunked,
-            )
+            if not chunked:
+                resp = conn.urlopen(
+                    method=request.method,
+                    url=url,
+                    body=request.body,
+                    headers=request.headers,
+                    redirect=False,
+                    assert_same_host=False,
+                    preload_content=False,
+                    decode_content=False,
+                    retries=self.max_retries,
+                    timeout=timeout
+                )
 
-        except (ProtocolError, OSError) as err:
+            # Send the request.
+            else:
+                if hasattr(conn, 'proxy_pool'):
+                    conn = conn.proxy_pool
+
+                low_conn = conn._get_conn(timeout=timeout)
+
+                try:
+                    low_conn.putrequest(request.method,
+                                        url,
+                                        skip_accept_encoding=True)
+
+                    for header, value in request.headers.items():
+                        low_conn.putheader(header, value)
+
+                    low_conn.endheaders()
+
+                    for i in request.body:
+                        low_conn.send(hex(len(i))[2:].encode('utf-8'))
+                        low_conn.send(b'\r\n')
+                        low_conn.send(i)
+                        low_conn.send(b'\r\n')
+                    low_conn.send(b'0\r\n\r\n')
+
+                    r = low_conn.getresponse()
+                    resp = HTTPResponse.from_httplib(
+                        r,
+                        pool=conn,
+                        connection=low_conn,
+                        preload_content=False,
+                        decode_content=False
+                    )
+                except:
+                    # If we hit any problems here, clean up the connection.
+                    # Then, reraise so that we can handle the actual exception.
+                    low_conn.close()
+                    raise
+                else:
+                    # All is well, return the connection to the pool.
+                    conn._put_conn(low_conn)
+
+        except (ProtocolError, socket.error) as err:
             raise ConnectionError(err, request=request)
 
         except MaxRetryError as e:
             if isinstance(e.reason, ConnectTimeoutError):
-                # TODO: Remove this in 3.0.0: see #2811
-                if not isinstance(e.reason, NewConnectionError):
-                    raise ConnectTimeout(e, request=request)
+                raise ConnectTimeout(e, request=request)
 
             if isinstance(e.reason, ResponseError):
                 raise RetryError(e, request=request)
 
-            if isinstance(e.reason, _ProxyError):
-                raise ProxyError(e, request=request)
-
-            if isinstance(e.reason, _SSLError):
-                # This branch is for urllib3 v1.22 and later.
-                raise SSLError(e, request=request)
-
-            raise ConnectionError(e, request=request)
-
-        except ClosedPoolError as e:
             raise ConnectionError(e, request=request)
 
         except _ProxyError as e:
@@ -707,12 +428,9 @@ class HTTPAdapter(BaseAdapter):
 
         except (_SSLError, _HTTPError) as e:
             if isinstance(e, _SSLError):
-                # This branch is for urllib3 versions earlier than v1.22
                 raise SSLError(e, request=request)
             elif isinstance(e, ReadTimeoutError):
                 raise ReadTimeout(e, request=request)
-            elif isinstance(e, _InvalidHeader):
-                raise InvalidHeader(e, request=request)
             else:
                 raise
 
diff --git a/lib/requests/api.py b/lib/requests/api.py
index 59607445..1469b05c 100644
--- a/lib/requests/api.py
+++ b/lib/requests/api.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 """
 requests.api
 ~~~~~~~~~~~~
@@ -6,6 +8,7 @@ This module implements the Requests API.
 
 :copyright: (c) 2012 by Kenneth Reitz.
 :license: Apache2, see LICENSE for more details.
+
 """
 
 from . import sessions
@@ -13,145 +16,116 @@ from . import sessions
 
 def request(method, url, **kwargs):
     """Constructs and sends a :class:`Request <Request>`.
+    Returns :class:`Response <Response>` object.
 
-    :param method: method for the new :class:`Request` object: ``GET``, ``OPTIONS``, ``HEAD``, ``POST``, ``PUT``, ``PATCH``, or ``DELETE``.
+    :param method: method for the new :class:`Request` object.
     :param url: URL for the new :class:`Request` object.
-    :param params: (optional) Dictionary, list of tuples or bytes to send
-        in the query string for the :class:`Request`.
-    :param data: (optional) Dictionary, list of tuples, bytes, or file-like
-        object to send in the body of the :class:`Request`.
-    :param json: (optional) A JSON serializable Python object to send in the body of the :class:`Request`.
+    :param params: (optional) Dictionary or bytes to be sent in the query string for the :class:`Request`.
+    :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
+    :param json: (optional) json data to send in the body of the :class:`Request`.
     :param headers: (optional) Dictionary of HTTP Headers to send with the :class:`Request`.
     :param cookies: (optional) Dict or CookieJar object to send with the :class:`Request`.
-    :param files: (optional) Dictionary of ``'name': file-like-objects`` (or ``{'name': file-tuple}``) for multipart encoding upload.
-        ``file-tuple`` can be a 2-tuple ``('filename', fileobj)``, 3-tuple ``('filename', fileobj, 'content_type')``
-        or a 4-tuple ``('filename', fileobj, 'content_type', custom_headers)``, where ``'content_type'`` is a string
-        defining the content type of the given file and ``custom_headers`` a dict-like object containing additional headers
-        to add for the file.
+    :param files: (optional) Dictionary of ``'name': file-like-objects`` (or ``{'name': ('filename', fileobj)}``) for multipart encoding upload.
     :param auth: (optional) Auth tuple to enable Basic/Digest/Custom HTTP Auth.
-    :param timeout: (optional) How many seconds to wait for the server to send data
-        before giving up, as a float, or a :ref:`(connect timeout, read
-        timeout) <timeouts>` tuple.
+    :param timeout: (optional) How long to wait for the server to send data
+        before giving up, as a float, or a (`connect timeout, read timeout
+        <user/advanced.html#timeouts>`_) tuple.
     :type timeout: float or tuple
-    :param allow_redirects: (optional) Boolean. Enable/disable GET/OPTIONS/POST/PUT/PATCH/DELETE/HEAD redirection. Defaults to ``True``.
+    :param allow_redirects: (optional) Boolean. Set to True if POST/PUT/DELETE redirect following is allowed.
     :type allow_redirects: bool
     :param proxies: (optional) Dictionary mapping protocol to the URL of the proxy.
-    :param verify: (optional) Either a boolean, in which case it controls whether we verify
-            the server's TLS certificate, or a string, in which case it must be a path
-            to a CA bundle to use. Defaults to ``True``.
+    :param verify: (optional) if ``True``, the SSL cert will be verified. A CA_BUNDLE path can also be provided.
     :param stream: (optional) if ``False``, the response content will be immediately downloaded.
     :param cert: (optional) if String, path to ssl client cert file (.pem). If Tuple, ('cert', 'key') pair.
-    :return: :class:`Response <Response>` object
-    :rtype: requests.Response
 
     Usage::
 
       >>> import requests
-      >>> req = requests.request('GET', 'https://httpbin.org/get')
-      >>> req
+      >>> req = requests.request('GET', 'http://httpbin.org/get')
       <Response [200]>
     """
 
-    # By using the 'with' statement we are sure the session is closed, thus we
-    # avoid leaving sockets open which can trigger a ResourceWarning in some
-    # cases, and look like a memory leak in others.
-    with sessions.Session() as session:
-        return session.request(method=method, url=url, **kwargs)
+    session = sessions.Session()
+    response = session.request(method=method, url=url, **kwargs)
+    # By explicitly closing the session, we avoid leaving sockets open which
+    # can trigger a ResourceWarning in some cases, and look like a memory leak
+    # in others.
+    session.close()
+    return response
 
 
-def get(url, params=None, **kwargs):
-    r"""Sends a GET request.
+def get(url, **kwargs):
+    """Sends a GET request. Returns :class:`Response` object.
 
     :param url: URL for the new :class:`Request` object.
-    :param params: (optional) Dictionary, list of tuples or bytes to send
-        in the query string for the :class:`Request`.
     :param \*\*kwargs: Optional arguments that ``request`` takes.
-    :return: :class:`Response <Response>` object
-    :rtype: requests.Response
     """
 
-    return request("get", url, params=params, **kwargs)
+    kwargs.setdefault('allow_redirects', True)
+    return request('get', url, **kwargs)
 
 
 def options(url, **kwargs):
-    r"""Sends an OPTIONS request.
+    """Sends a OPTIONS request. Returns :class:`Response` object.
 
     :param url: URL for the new :class:`Request` object.
     :param \*\*kwargs: Optional arguments that ``request`` takes.
-    :return: :class:`Response <Response>` object
-    :rtype: requests.Response
     """
 
-    return request("options", url, **kwargs)
+    kwargs.setdefault('allow_redirects', True)
+    return request('options', url, **kwargs)
 
 
 def head(url, **kwargs):
-    r"""Sends a HEAD request.
+    """Sends a HEAD request. Returns :class:`Response` object.
 
     :param url: URL for the new :class:`Request` object.
-    :param \*\*kwargs: Optional arguments that ``request`` takes. If
-        `allow_redirects` is not provided, it will be set to `False` (as
-        opposed to the default :meth:`request` behavior).
-    :return: :class:`Response <Response>` object
-    :rtype: requests.Response
+    :param \*\*kwargs: Optional arguments that ``request`` takes.
     """
 
-    kwargs.setdefault("allow_redirects", False)
-    return request("head", url, **kwargs)
+    kwargs.setdefault('allow_redirects', False)
+    return request('head', url, **kwargs)
 
 
 def post(url, data=None, json=None, **kwargs):
-    r"""Sends a POST request.
+    """Sends a POST request. Returns :class:`Response` object.
 
     :param url: URL for the new :class:`Request` object.
-    :param data: (optional) Dictionary, list of tuples, bytes, or file-like
-        object to send in the body of the :class:`Request`.
-    :param json: (optional) A JSON serializable Python object to send in the body of the :class:`Request`.
+    :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
+    :param json: (optional) json data to send in the body of the :class:`Request`.
     :param \*\*kwargs: Optional arguments that ``request`` takes.
-    :return: :class:`Response <Response>` object
-    :rtype: requests.Response
     """
 
-    return request("post", url, data=data, json=json, **kwargs)
+    return request('post', url, data=data, json=json, **kwargs)
 
 
 def put(url, data=None, **kwargs):
-    r"""Sends a PUT request.
+    """Sends a PUT request. Returns :class:`Response` object.
 
     :param url: URL for the new :class:`Request` object.
-    :param data: (optional) Dictionary, list of tuples, bytes, or file-like
-        object to send in the body of the :class:`Request`.
-    :param json: (optional) A JSON serializable Python object to send in the body of the :class:`Request`.
+    :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
     :param \*\*kwargs: Optional arguments that ``request`` takes.
-    :return: :class:`Response <Response>` object
-    :rtype: requests.Response
     """
 
-    return request("put", url, data=data, **kwargs)
+    return request('put', url, data=data, **kwargs)
 
 
 def patch(url, data=None, **kwargs):
-    r"""Sends a PATCH request.
+    """Sends a PATCH request. Returns :class:`Response` object.
 
     :param url: URL for the new :class:`Request` object.
-    :param data: (optional) Dictionary, list of tuples, bytes, or file-like
-        object to send in the body of the :class:`Request`.
-    :param json: (optional) A JSON serializable Python object to send in the body of the :class:`Request`.
+    :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
     :param \*\*kwargs: Optional arguments that ``request`` takes.
-    :return: :class:`Response <Response>` object
-    :rtype: requests.Response
     """
 
-    return request("patch", url, data=data, **kwargs)
+    return request('patch', url,  data=data, **kwargs)
 
 
 def delete(url, **kwargs):
-    r"""Sends a DELETE request.
+    """Sends a DELETE request. Returns :class:`Response` object.
 
     :param url: URL for the new :class:`Request` object.
     :param \*\*kwargs: Optional arguments that ``request`` takes.
-    :return: :class:`Response <Response>` object
-    :rtype: requests.Response
     """
 
-    return request("delete", url, **kwargs)
+    return request('delete', url, **kwargs)
diff --git a/lib/requests/auth.py b/lib/requests/auth.py
index 4a7ce6dc..b950181d 100644
--- a/lib/requests/auth.py
+++ b/lib/requests/auth.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 """
 requests.auth
 ~~~~~~~~~~~~~
@@ -5,175 +7,95 @@ requests.auth
 This module contains the authentication handlers for Requests.
 """
 
-import hashlib
 import os
 import re
-import threading
 import time
-import warnings
+import hashlib
+
 from base64 import b64encode
 
-from ._internal_utils import to_native_string
-from .compat import basestring, str, urlparse
+from .compat import urlparse, str
 from .cookies import extract_cookies_to_jar
-from .utils import parse_dict_header
+from .utils import parse_dict_header, to_native_string
+from .status_codes import codes
 
-CONTENT_TYPE_FORM_URLENCODED = "application/x-www-form-urlencoded"
-CONTENT_TYPE_MULTI_PART = "multipart/form-data"
+CONTENT_TYPE_FORM_URLENCODED = 'application/x-www-form-urlencoded'
+CONTENT_TYPE_MULTI_PART = 'multipart/form-data'
 
 
 def _basic_auth_str(username, password):
     """Returns a Basic Auth string."""
 
-    # "I want us to put a big-ol' comment on top of it that
-    # says that this behaviour is dumb but we need to preserve
-    # it because people are relying on it."
-    #    - Lukasa
-    #
-    # These are here solely to maintain backwards compatibility
-    # for things like ints. This will be removed in 3.0.0.
-    if not isinstance(username, basestring):
-        warnings.warn(
-            "Non-string usernames will no longer be supported in Requests "
-            "3.0.0. Please convert the object you've passed in ({!r}) to "
-            "a string or bytes object in the near future to avoid "
-            "problems.".format(username),
-            category=DeprecationWarning,
-        )
-        username = str(username)
-
-    if not isinstance(password, basestring):
-        warnings.warn(
-            "Non-string passwords will no longer be supported in Requests "
-            "3.0.0. Please convert the object you've passed in ({!r}) to "
-            "a string or bytes object in the near future to avoid "
-            "problems.".format(type(password)),
-            category=DeprecationWarning,
-        )
-        password = str(password)
-    # -- End Removal --
-
-    if isinstance(username, str):
-        username = username.encode("latin1")
-
-    if isinstance(password, str):
-        password = password.encode("latin1")
-
-    authstr = "Basic " + to_native_string(
-        b64encode(b":".join((username, password))).strip()
+    authstr = 'Basic ' + to_native_string(
+        b64encode(('%s:%s' % (username, password)).encode('latin1')).strip()
     )
 
     return authstr
 
 
-class AuthBase:
+class AuthBase(object):
     """Base class that all auth implementations derive from"""
 
     def __call__(self, r):
-        raise NotImplementedError("Auth hooks must be callable.")
+        raise NotImplementedError('Auth hooks must be callable.')
 
 
 class HTTPBasicAuth(AuthBase):
     """Attaches HTTP Basic Authentication to the given Request object."""
-
     def __init__(self, username, password):
         self.username = username
         self.password = password
 
-    def __eq__(self, other):
-        return all(
-            [
-                self.username == getattr(other, "username", None),
-                self.password == getattr(other, "password", None),
-            ]
-        )
-
-    def __ne__(self, other):
-        return not self == other
-
     def __call__(self, r):
-        r.headers["Authorization"] = _basic_auth_str(self.username, self.password)
+        r.headers['Authorization'] = _basic_auth_str(self.username, self.password)
         return r
 
 
 class HTTPProxyAuth(HTTPBasicAuth):
     """Attaches HTTP Proxy Authentication to a given Request object."""
-
     def __call__(self, r):
-        r.headers["Proxy-Authorization"] = _basic_auth_str(self.username, self.password)
+        r.headers['Proxy-Authorization'] = _basic_auth_str(self.username, self.password)
         return r
 
 
 class HTTPDigestAuth(AuthBase):
     """Attaches HTTP Digest Authentication to the given Request object."""
-
     def __init__(self, username, password):
         self.username = username
         self.password = password
-        # Keep state in per-thread local storage
-        self._thread_local = threading.local()
-
-    def init_per_thread_state(self):
-        # Ensure state is initialized just once per-thread
-        if not hasattr(self._thread_local, "init"):
-            self._thread_local.init = True
-            self._thread_local.last_nonce = ""
-            self._thread_local.nonce_count = 0
-            self._thread_local.chal = {}
-            self._thread_local.pos = None
-            self._thread_local.num_401_calls = None
+        self.last_nonce = ''
+        self.nonce_count = 0
+        self.chal = {}
+        self.pos = None
+        self.num_401_calls = 1
 
     def build_digest_header(self, method, url):
-        """
-        :rtype: str
-        """
 
-        realm = self._thread_local.chal["realm"]
-        nonce = self._thread_local.chal["nonce"]
-        qop = self._thread_local.chal.get("qop")
-        algorithm = self._thread_local.chal.get("algorithm")
-        opaque = self._thread_local.chal.get("opaque")
-        hash_utf8 = None
+        realm = self.chal['realm']
+        nonce = self.chal['nonce']
+        qop = self.chal.get('qop')
+        algorithm = self.chal.get('algorithm')
+        opaque = self.chal.get('opaque')
 
         if algorithm is None:
-            _algorithm = "MD5"
+            _algorithm = 'MD5'
         else:
             _algorithm = algorithm.upper()
         # lambdas assume digest modules are imported at the top level
-        if _algorithm == "MD5" or _algorithm == "MD5-SESS":
-
+        if _algorithm == 'MD5' or _algorithm == 'MD5-SESS':
             def md5_utf8(x):
                 if isinstance(x, str):
-                    x = x.encode("utf-8")
+                    x = x.encode('utf-8')
                 return hashlib.md5(x).hexdigest()
-
             hash_utf8 = md5_utf8
-        elif _algorithm == "SHA":
-
+        elif _algorithm == 'SHA':
             def sha_utf8(x):
                 if isinstance(x, str):
-                    x = x.encode("utf-8")
+                    x = x.encode('utf-8')
                 return hashlib.sha1(x).hexdigest()
-
             hash_utf8 = sha_utf8
-        elif _algorithm == "SHA-256":
 
-            def sha256_utf8(x):
-                if isinstance(x, str):
-                    x = x.encode("utf-8")
-                return hashlib.sha256(x).hexdigest()
-
-            hash_utf8 = sha256_utf8
-        elif _algorithm == "SHA-512":
-
-            def sha512_utf8(x):
-                if isinstance(x, str):
-                    x = x.encode("utf-8")
-                return hashlib.sha512(x).hexdigest()
-
-            hash_utf8 = sha512_utf8
-
-        KD = lambda s, d: hash_utf8(f"{s}:{d}")  # noqa:E731
+        KD = lambda s, d: hash_utf8("%s:%s" % (s, d))
 
         if hash_utf8 is None:
             return None
@@ -181,134 +103,107 @@ class HTTPDigestAuth(AuthBase):
         # XXX not implemented yet
         entdig = None
         p_parsed = urlparse(url)
-        #: path is request-uri defined in RFC 2616 which should not be empty
-        path = p_parsed.path or "/"
+        path = p_parsed.path
         if p_parsed.query:
-            path += f"?{p_parsed.query}"
+            path += '?' + p_parsed.query
 
-        A1 = f"{self.username}:{realm}:{self.password}"
-        A2 = f"{method}:{path}"
+        A1 = '%s:%s:%s' % (self.username, realm, self.password)
+        A2 = '%s:%s' % (method, path)
 
         HA1 = hash_utf8(A1)
         HA2 = hash_utf8(A2)
 
-        if nonce == self._thread_local.last_nonce:
-            self._thread_local.nonce_count += 1
+        if nonce == self.last_nonce:
+            self.nonce_count += 1
         else:
-            self._thread_local.nonce_count = 1
-        ncvalue = f"{self._thread_local.nonce_count:08x}"
-        s = str(self._thread_local.nonce_count).encode("utf-8")
-        s += nonce.encode("utf-8")
-        s += time.ctime().encode("utf-8")
+            self.nonce_count = 1
+        ncvalue = '%08x' % self.nonce_count
+        s = str(self.nonce_count).encode('utf-8')
+        s += nonce.encode('utf-8')
+        s += time.ctime().encode('utf-8')
         s += os.urandom(8)
 
-        cnonce = hashlib.sha1(s).hexdigest()[:16]
-        if _algorithm == "MD5-SESS":
-            HA1 = hash_utf8(f"{HA1}:{nonce}:{cnonce}")
+        cnonce = (hashlib.sha1(s).hexdigest()[:16])
+        noncebit = "%s:%s:%s:%s:%s" % (nonce, ncvalue, cnonce, qop, HA2)
+        if _algorithm == 'MD5-SESS':
+            HA1 = hash_utf8('%s:%s:%s' % (HA1, nonce, cnonce))
 
-        if not qop:
-            respdig = KD(HA1, f"{nonce}:{HA2}")
-        elif qop == "auth" or "auth" in qop.split(","):
-            noncebit = f"{nonce}:{ncvalue}:{cnonce}:auth:{HA2}"
+        if qop is None:
+            respdig = KD(HA1, "%s:%s" % (nonce, HA2))
+        elif qop == 'auth' or 'auth' in qop.split(','):
             respdig = KD(HA1, noncebit)
         else:
             # XXX handle auth-int.
             return None
 
-        self._thread_local.last_nonce = nonce
+        self.last_nonce = nonce
 
         # XXX should the partial digests be encoded too?
-        base = (
-            f'username="{self.username}", realm="{realm}", nonce="{nonce}", '
-            f'uri="{path}", response="{respdig}"'
-        )
+        base = 'username="%s", realm="%s", nonce="%s", uri="%s", ' \
+               'response="%s"' % (self.username, realm, nonce, path, respdig)
         if opaque:
-            base += f', opaque="{opaque}"'
+            base += ', opaque="%s"' % opaque
         if algorithm:
-            base += f', algorithm="{algorithm}"'
+            base += ', algorithm="%s"' % algorithm
         if entdig:
-            base += f', digest="{entdig}"'
+            base += ', digest="%s"' % entdig
         if qop:
-            base += f', qop="auth", nc={ncvalue}, cnonce="{cnonce}"'
+            base += ', qop="auth", nc=%s, cnonce="%s"' % (ncvalue, cnonce)
 
-        return f"Digest {base}"
+        return 'Digest %s' % (base)
 
     def handle_redirect(self, r, **kwargs):
         """Reset num_401_calls counter on redirects."""
         if r.is_redirect:
-            self._thread_local.num_401_calls = 1
+            self.num_401_calls = 1
 
     def handle_401(self, r, **kwargs):
-        """
-        Takes the given response and tries digest-auth, if needed.
+        """Takes the given response and tries digest-auth, if needed."""
 
-        :rtype: requests.Response
-        """
-
-        # If response is not 4xx, do not auth
-        # See https://github.com/psf/requests/issues/3772
-        if not 400 <= r.status_code < 500:
-            self._thread_local.num_401_calls = 1
-            return r
-
-        if self._thread_local.pos is not None:
+        if self.pos is not None:
             # Rewind the file position indicator of the body to where
             # it was to resend the request.
-            r.request.body.seek(self._thread_local.pos)
-        s_auth = r.headers.get("www-authenticate", "")
+            r.request.body.seek(self.pos)
+        num_401_calls = getattr(self, 'num_401_calls', 1)
+        s_auth = r.headers.get('www-authenticate', '')
 
-        if "digest" in s_auth.lower() and self._thread_local.num_401_calls < 2:
-            self._thread_local.num_401_calls += 1
-            pat = re.compile(r"digest ", flags=re.IGNORECASE)
-            self._thread_local.chal = parse_dict_header(pat.sub("", s_auth, count=1))
+        if 'digest' in s_auth.lower() and num_401_calls < 2:
+
+            self.num_401_calls += 1
+            pat = re.compile(r'digest ', flags=re.IGNORECASE)
+            self.chal = parse_dict_header(pat.sub('', s_auth, count=1))
 
             # Consume content and release the original connection
             # to allow our new request to reuse the same one.
             r.content
-            r.close()
+            r.raw.release_conn()
             prep = r.request.copy()
             extract_cookies_to_jar(prep._cookies, r.request, r.raw)
             prep.prepare_cookies(prep._cookies)
 
-            prep.headers["Authorization"] = self.build_digest_header(
-                prep.method, prep.url
-            )
+            prep.headers['Authorization'] = self.build_digest_header(
+                prep.method, prep.url)
             _r = r.connection.send(prep, **kwargs)
             _r.history.append(r)
             _r.request = prep
 
             return _r
 
-        self._thread_local.num_401_calls = 1
+        self.num_401_calls = 1
         return r
 
     def __call__(self, r):
-        # Initialize per-thread state, if needed
-        self.init_per_thread_state()
         # If we have a saved nonce, skip the 401
-        if self._thread_local.last_nonce:
-            r.headers["Authorization"] = self.build_digest_header(r.method, r.url)
+        if self.last_nonce:
+            r.headers['Authorization'] = self.build_digest_header(r.method, r.url)
         try:
-            self._thread_local.pos = r.body.tell()
+            self.pos = r.body.tell()
         except AttributeError:
             # In the case of HTTPDigestAuth being reused and the body of
             # the previous request was a file-like object, pos has the
             # file position of the previous body. Ensure it's set to
             # None.
-            self._thread_local.pos = None
-        r.register_hook("response", self.handle_401)
-        r.register_hook("response", self.handle_redirect)
-        self._thread_local.num_401_calls = 1
-
+            self.pos = None
+        r.register_hook('response', self.handle_401)
+        r.register_hook('response', self.handle_redirect)
         return r
-
-    def __eq__(self, other):
-        return all(
-            [
-                self.username == getattr(other, "username", None),
-                self.password == getattr(other, "password", None),
-            ]
-        )
-
-    def __ne__(self, other):
-        return not self == other
diff --git a/lib/requests/cacert.pem b/lib/requests/cacert.pem
new file mode 100644
index 00000000..729fe15d
--- /dev/null
+++ b/lib/requests/cacert.pem
@@ -0,0 +1,5026 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Issuer: CN=GTE CyberTrust Global Root O=GTE Corporation OU=GTE CyberTrust Solutions, Inc.
+# Subject: CN=GTE CyberTrust Global Root O=GTE Corporation OU=GTE CyberTrust Solutions, Inc.
+# Label: "GTE CyberTrust Global Root"
+# Serial: 421
+# MD5 Fingerprint: ca:3d:d3:68:f1:03:5c:d0:32:fa:b8:2b:59:e8:5a:db
+# SHA1 Fingerprint: 97:81:79:50:d8:1c:96:70:cc:34:d8:09:cf:79:44:31:36:7e:f4:74
+# SHA256 Fingerprint: a5:31:25:18:8d:21:10:aa:96:4b:02:c7:b7:c6:da:32:03:17:08:94:e5:fb:71:ff:fb:66:67:d5:e6:81:0a:36
+-----BEGIN CERTIFICATE-----
+MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYD
+VQQKEw9HVEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNv
+bHV0aW9ucywgSW5jLjEjMCEGA1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJv
+b3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEzMjM1OTAwWjB1MQswCQYDVQQGEwJV
+UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJU
+cnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0IEds
+b2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrH
+iM3dFw4usJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTS
+r41tiGeA5u2ylc9yMcqlHHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X4
+04Wqk2kmhXBIgD8SFcd5tB8FLztimQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAG3r
+GwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMWM4ETCJ57NE7fQMh017l9
+3PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OFNMQkpw0P
+lZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/
+-----END CERTIFICATE-----
+
+# Issuer: CN=Thawte Server CA O=Thawte Consulting cc OU=Certification Services Division
+# Subject: CN=Thawte Server CA O=Thawte Consulting cc OU=Certification Services Division
+# Label: "Thawte Server CA"
+# Serial: 1
+# MD5 Fingerprint: c5:70:c4:a2:ed:53:78:0c:c8:10:53:81:64:cb:d0:1d
+# SHA1 Fingerprint: 23:e5:94:94:51:95:f2:41:48:03:b4:d5:64:d2:a3:a3:f5:d8:8b:8c
+# SHA256 Fingerprint: b4:41:0b:73:e2:e6:ea:ca:47:fb:c4:2f:8f:a4:01:8a:f4:38:1d:c5:4c:fa:a8:44:50:46:1e:ed:09:45:4d:e9
+-----BEGIN CERTIFICATE-----
+MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
+VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEm
+MCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wHhcNOTYwODAx
+MDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT
+DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3
+dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNl
+cyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3
+DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD
+gY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl/Kj0R1HahbUgdJSGHg91
+yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg71CcEJRCX
+L+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGj
+EzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG
+7oWDTSEwjsrZqG9JGubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6e
+QNuozDJ0uW8NxuOzRAvZim+aKZuZGCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZ
+qdq5snUb9kLy78fyGPmJvKP/iiMucEc=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Thawte Premium Server CA O=Thawte Consulting cc OU=Certification Services Division
+# Subject: CN=Thawte Premium Server CA O=Thawte Consulting cc OU=Certification Services Division
+# Label: "Thawte Premium Server CA"
+# Serial: 1
+# MD5 Fingerprint: 06:9f:69:79:16:66:90:02:1b:8c:8c:a2:c3:07:6f:3a
+# SHA1 Fingerprint: 62:7f:8d:78:27:65:63:99:d2:7d:7f:90:44:c9:fe:b3:f3:3e:fa:9a
+# SHA256 Fingerprint: ab:70:36:36:5c:71:54:aa:29:c2:c2:9f:5d:41:91:16:3b:16:2a:22:25:01:13:57:d5:6d:07:ff:a7:bc:1f:72
+-----BEGIN CERTIFICATE-----
+MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
+VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy
+dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t
+MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB
+MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG
+A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp
+b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl
+cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv
+bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE
+VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ
+ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR
+uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
+9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI
+hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM
+pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg==
+-----END CERTIFICATE-----
+
+# Issuer: O=Equifax OU=Equifax Secure Certificate Authority
+# Subject: O=Equifax OU=Equifax Secure Certificate Authority
+# Label: "Equifax Secure CA"
+# Serial: 903804111
+# MD5 Fingerprint: 67:cb:9d:c0:13:24:8a:82:9b:b2:17:1e:d1:1b:ec:d4
+# SHA1 Fingerprint: d2:32:09:ad:23:d3:14:23:21:74:e4:0d:7f:9d:62:13:97:86:63:3a
+# SHA256 Fingerprint: 08:29:7a:40:47:db:a2:36:80:c7:31:db:6e:31:76:53:ca:78:48:e1:be:bd:3a:0b:01:79:a7:07:f9:2c:f1:78
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
+UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy
+dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1
+MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx
+dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f
+BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A
+cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC
+AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ
+MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm
+aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw
+ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj
+IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF
+MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
+A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
+7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh
+1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4
+-----END CERTIFICATE-----
+
+# Issuer: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority
+# Subject: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority
+# Label: "Verisign Class 3 Public Primary Certification Authority"
+# Serial: 149843929435818692848040365716851702463
+# MD5 Fingerprint: 10:fc:63:5d:f6:26:3e:0d:f3:25:be:5f:79:cd:67:67
+# SHA1 Fingerprint: 74:2c:31:92:e6:07:e4:24:eb:45:49:54:2b:e1:bb:c5:3e:61:74:e2
+# SHA256 Fingerprint: e7:68:56:34:ef:ac:f6:9a:ce:93:9a:6b:25:5b:7b:4f:ab:ef:42:93:5b:50:a2:65:ac:b5:cb:60:27:e4:4e:70
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
+cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
+MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
+BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
+BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
+I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
+CSqGSIb3DQEBAgUAA4GBALtMEivPLCYATxQT3ab7/AoRhIzzKBxnki98tsX63/Do
+lbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59AhWM1pF+NEHJwZRDmJXNyc
+AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k
+-----END CERTIFICATE-----
+
+# Issuer: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority - G2/(c) 1998 VeriSign, Inc. - For authorized use only/VeriSign Trust Network
+# Subject: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority - G2/(c) 1998 VeriSign, Inc. - For authorized use only/VeriSign Trust Network
+# Label: "Verisign Class 3 Public Primary Certification Authority - G2"
+# Serial: 167285380242319648451154478808036881606
+# MD5 Fingerprint: a2:33:9b:4c:74:78:73:d4:6c:e7:c1:f3:8d:cb:5c:e9
+# SHA1 Fingerprint: 85:37:1c:a6:e5:50:14:3d:ce:28:03:47:1b:de:3a:09:e8:f8:77:0f
+# SHA256 Fingerprint: 83:ce:3c:12:29:68:8a:59:3d:48:5f:81:97:3c:0f:91:95:43:1e:da:37:cc:5e:36:43:0e:79:c7:a8:88:63:8b
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
+c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
+MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
+emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
+DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMg
+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
+YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
+MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCOFoUgRm1HP9SFIIThbbP4
+pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71lSk8UOg0
+13gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwID
+AQABMA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSk
+U01UbSuvDV1Ai2TT1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7i
+F6YM40AIOw7n60RzKprxaZLvcRTDOaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpY
+oJ2daZH9
+-----END CERTIFICATE-----
+
+# Issuer: CN=GlobalSign Root CA O=GlobalSign nv-sa OU=Root CA
+# Subject: CN=GlobalSign Root CA O=GlobalSign nv-sa OU=Root CA
+# Label: "GlobalSign Root CA"
+# Serial: 4835703278459707669005204
+# MD5 Fingerprint: 3e:45:52:15:09:51:92:e1:b7:5d:37:9f:b1:87:29:8a
+# SHA1 Fingerprint: b1:bc:96:8b:d4:f4:9d:62:2a:a8:9a:81:f2:15:01:52:a4:1d:82:9c
+# SHA256 Fingerprint: eb:d4:10:40:e4:bb:3e:c7:42:c9:e3:81:d3:1e:f2:a4:1a:48:b6:68:5c:96:e7:ce:f3:c1:df:6c:d4:33:1c:99
+-----BEGIN CERTIFICATE-----
+MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG
+A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
+b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw
+MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
+YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT
+aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ
+jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp
+xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp
+1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG
+snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ
+U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8
+9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E
+BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B
+AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz
+yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE
+38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP
+AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad
+DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME
+HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
+-----END CERTIFICATE-----
+
+# Issuer: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R2
+# Subject: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R2
+# Label: "GlobalSign Root CA - R2"
+# Serial: 4835703278459682885658125
+# MD5 Fingerprint: 94:14:77:7e:3e:5e:fd:8f:30:bd:41:b0:cf:e7:d0:30
+# SHA1 Fingerprint: 75:e0:ab:b6:13:85:12:27:1c:04:f8:5f:dd:de:38:e4:b7:24:2e:fe
+# SHA256 Fingerprint: ca:42:dd:41:74:5f:d0:b8:1e:b9:02:36:2c:f9:d8:bf:71:9d:a1:bd:1b:1e:fc:94:6f:5b:4c:99:f4:2c:1b:9e
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4G
+A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNp
+Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1
+MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMjETMBEG
+A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6ErPL
+v4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8
+eoLrvozps6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklq
+tTleiDTsvHgMCJiEbKjNS7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzd
+C9XZzPnqJworc5HGnRusyMvo4KD0L5CLTfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pa
+zq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6CygPCm48CAwEAAaOBnDCB
+mTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUm+IH
+V2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5n
+bG9iYWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG
+3lm0mi3f3BmGLjANBgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4Gs
+J0/WwbgcQ3izDJr86iw8bmEbTUsp9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO
+291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu01yiPqFbQfXf5WRDLenVOavS
+ot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG79G+dwfCMNYxd
+AfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
+TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 1 Policy Validation Authority
+# Subject: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 1 Policy Validation Authority
+# Label: "ValiCert Class 1 VA"
+# Serial: 1
+# MD5 Fingerprint: 65:58:ab:15:ad:57:6c:1e:a8:a7:b5:69:ac:bf:ff:eb
+# SHA1 Fingerprint: e5:df:74:3c:b6:01:c4:9b:98:43:dc:ab:8c:e8:6a:81:10:9f:e4:8e
+# SHA256 Fingerprint: f4:c1:49:55:1a:30:13:a3:5b:c7:bf:fe:17:a7:f3:44:9b:c1:ab:5b:5a:0a:e7:4b:06:c2:3b:90:00:4c:01:04
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNTIyMjM0OFoXDTE5MDYy
+NTIyMjM0OFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYWYJ6ibiWuqYvaG9Y
+LqdUHAZu9OqNSLwxlBfw8068srg1knaw0KWlAdcAAxIiGQj4/xEjm84H9b9pGib+
+TunRf50sQB1ZaG6m+FiwnRqP0z/x3BkGgagO4DrdyFNFCQbmD3DD+kCmDuJWBQ8Y
+TfwggtFzVXSNdnKgHZ0dwN0/cQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFBoPUn0
+LBwGlN+VYH+Wexf+T3GtZMjdd9LvWVXoP+iOBSoh8gfStadS/pyxtuJbdxdA6nLW
+I8sogTLDAHkY7FkXicnGah5xyf23dKUlRWnFSKsZ4UWKJWsZ7uW7EvV/96aNUcPw
+nXS3qT6gpf+2SQMT2iLM7XGCK5nPOrf1LXLI
+-----END CERTIFICATE-----
+
+# Issuer: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 2 Policy Validation Authority
+# Subject: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 2 Policy Validation Authority
+# Label: "ValiCert Class 2 VA"
+# Serial: 1
+# MD5 Fingerprint: a9:23:75:9b:ba:49:36:6e:31:c2:db:f2:e7:66:ba:87
+# SHA1 Fingerprint: 31:7a:2a:d0:7f:2b:33:5e:f5:a1:c3:4e:4b:57:e8:b7:d8:f1:fc:a6
+# SHA256 Fingerprint: 58:d0:17:27:9c:d4:dc:63:ab:dd:b1:96:a6:c9:90:6c:30:c4:e0:87:83:ea:e8:c1:60:99:54:d6:93:55:59:6b
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy
+NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY
+dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9
+WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS
+v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v
+UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu
+IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC
+W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd
+-----END CERTIFICATE-----
+
+# Issuer: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 3 Policy Validation Authority
+# Subject: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 3 Policy Validation Authority
+# Label: "RSA Root Certificate 1"
+# Serial: 1
+# MD5 Fingerprint: a2:6f:53:b7:ee:40:db:4a:68:e7:fa:18:d9:10:4b:72
+# SHA1 Fingerprint: 69:bd:8c:f4:9c:d3:00:fb:59:2e:17:93:ca:55:6a:f3:ec:aa:35:fb
+# SHA256 Fingerprint: bc:23:f9:8a:31:3c:b9:2d:e3:bb:fc:3a:5a:9f:44:61:ac:39:49:4c:4a:e1:5a:9e:9d:f1:31:e9:9b:73:01:9a
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMjIzM1oXDTE5MDYy
+NjAwMjIzM1owgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjmFGWHOjVsQaBalfD
+cnWTq8+epvzzFlLWLU2fNUSoLgRNB0mKOCn1dzfnt6td3zZxFJmP3MKS8edgkpfs
+2Ejcv8ECIMYkpChMMFp2bbFc893enhBxoYjHW5tBbcqwuI4V7q0zK89HBFx1cQqY
+JJgpp0lZpd34t0NiYfPT4tBVPwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFa7AliE
+Zwgs3x/be0kz9dNnnfS0ChCzycUs4pJqcXgn8nCDQtM+z6lU9PHYkhaM0QTLS6vJ
+n0WuPIqpsHEzXcjFV9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/A
+PhmcGcwTTYJBtYze4D1gCCAPRX5ron+jjBXu
+-----END CERTIFICATE-----
+
+# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G3 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 1999 VeriSign, Inc. - For authorized use only
+# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G3 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 1999 VeriSign, Inc. - For authorized use only
+# Label: "Verisign Class 3 Public Primary Certification Authority - G3"
+# Serial: 206684696279472310254277870180966723415
+# MD5 Fingerprint: cd:68:b6:a7:c7:c4:ce:75:e0:1d:4f:57:44:61:92:09
+# SHA1 Fingerprint: 13:2d:0d:45:53:4b:69:97:cd:b2:d5:c3:39:e2:55:76:60:9b:5c:c6
+# SHA256 Fingerprint: eb:04:cf:5e:b1:f3:9a:fa:76:2f:2b:b1:20:f2:96:cb:a5:20:c1:b9:7d:b1:58:95:65:b8:1c:b9:a1:7b:72:44
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
+cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
+LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
+aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
+VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
+aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
+bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
+IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b
+N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t
+KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu
+kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm
+CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ
+Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu
+imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te
+2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe
+DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
+/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p
+F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt
+TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=VeriSign Class 4 Public Primary Certification Authority - G3 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 1999 VeriSign, Inc. - For authorized use only
+# Subject: CN=VeriSign Class 4 Public Primary Certification Authority - G3 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 1999 VeriSign, Inc. - For authorized use only
+# Label: "Verisign Class 4 Public Primary Certification Authority - G3"
+# Serial: 314531972711909413743075096039378935511
+# MD5 Fingerprint: db:c8:f2:27:2e:b1:ea:6a:29:23:5d:fe:56:3e:33:df
+# SHA1 Fingerprint: c8:ec:8c:87:92:69:cb:4b:ab:39:e9:8d:7e:57:67:f3:14:95:73:9d
+# SHA256 Fingerprint: e3:89:36:0d:0f:db:ae:b3:d2:50:58:4b:47:30:31:4e:22:2f:39:c1:56:a0:20:14:4e:8d:96:05:61:79:15:06
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
+cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
+LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
+aWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
+VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
+aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
+bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
+IENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK3LpRFpxlmr8Y+1
+GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaStBO3IFsJ
++mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0Gbd
+U6LM8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLm
+NxdLMEYH5IBtptiWLugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XY
+ufTsgsbSPZUd5cBPhMnZo0QoBmrXRazwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/
+ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAj/ola09b5KROJ1WrIhVZPMq1
+CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXttmhwwjIDLk5Mq
+g6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm
+fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c
+2NU8Qh0XwRJdRTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/
+bLvSHgCwIe34QWKCudiyxLtGUPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Entrust.net Secure Server Certification Authority O=Entrust.net OU=www.entrust.net/CPS incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
+# Subject: CN=Entrust.net Secure Server Certification Authority O=Entrust.net OU=www.entrust.net/CPS incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
+# Label: "Entrust.net Secure Server CA"
+# Serial: 927650371
+# MD5 Fingerprint: df:f2:80:73:cc:f1:e6:61:73:fc:f5:42:e9:c5:7c:ee
+# SHA1 Fingerprint: 99:a6:9b:e6:1a:fe:88:6b:4d:2b:82:00:7c:b8:54:fc:31:7e:15:39
+# SHA256 Fingerprint: 62:f2:40:27:8c:56:4c:4d:d8:bf:7d:9d:4f:6f:36:6e:a8:94:d2:2f:5f:34:d9:89:a9:83:ac:ec:2f:ff:ed:50
+-----BEGIN CERTIFICATE-----
+MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
+VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5u
+ZXQvQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMc
+KGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5u
+ZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05OTA1
+MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIGA1UE
+ChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5j
+b3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF
+bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUg
+U2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUA
+A4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQaO2f55M28Qpku0f1BBc/
+I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5gXpa0zf3
+wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OC
+AdcwggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHb
+oIHYpIHVMIHSMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5
+BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1p
+dHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1pdGVk
+MTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRp
+b24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu
+dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0
+MFqBDzIwMTkwNTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8Bdi
+E1U9s/8KAGv7UISX8+1i0BowHQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAa
+MAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EABAwwChsEVjQuMAMCBJAwDQYJKoZI
+hvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyNEwr75Ji174z4xRAN
+95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9n9cd
+2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Entrust.net Certification Authority (2048) O=Entrust.net OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
+# Subject: CN=Entrust.net Certification Authority (2048) O=Entrust.net OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
+# Label: "Entrust.net Premium 2048 Secure Server CA"
+# Serial: 946069240
+# MD5 Fingerprint: ee:29:31:bc:32:7e:9a:e6:e8:b5:f7:51:b4:34:71:90
+# SHA1 Fingerprint: 50:30:06:09:1d:97:d4:f5:ae:39:f7:cb:e7:92:7d:7d:65:2d:34:31
+# SHA256 Fingerprint: 6d:c4:71:72:e0:1c:bc:b0:bf:62:58:0d:89:5f:e2:b8:ac:9a:d4:f8:73:80:1e:0c:10:b9:c8:37:d2:1e:b1:77
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChML
+RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBp
+bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5
+IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQxNzUwNTFaFw0yOTA3
+MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3
+LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxp
+YWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEG
+A1UEAxMqRW50cnVzdC5uZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgp
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArU1LqRKGsuqjIAcVFmQq
+K0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOLGp18EzoOH1u3Hs/lJBQe
+sYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSrhRSGlVuX
+MlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVT
+XTzWnLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/
+HoZdenoVve8AjhUiVBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH
+4QIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
+HQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJKoZIhvcNAQEFBQADggEBADub
+j1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPyT/4xmf3IDExo
+U8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
+zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5b
+u/8j72gZyxKTJ1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+
+bYQLCIt+jerXmCHG8+c8eS9enNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/Er
+fF6adulZkMV8gzURZVE=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Baltimore CyberTrust Root O=Baltimore OU=CyberTrust
+# Subject: CN=Baltimore CyberTrust Root O=Baltimore OU=CyberTrust
+# Label: "Baltimore CyberTrust Root"
+# Serial: 33554617
+# MD5 Fingerprint: ac:b6:94:a5:9c:17:e0:d7:91:52:9b:b1:97:06:a6:e4
+# SHA1 Fingerprint: d4:de:20:d0:5e:66:fc:53:fe:1a:50:88:2c:78:db:28:52:ca:e4:74
+# SHA256 Fingerprint: 16:af:57:a9:f6:76:b0:ab:12:60:95:aa:5e:ba:de:f2:2a:b3:11:19:d6:44:ac:95:cd:4b:93:db:f3:f2:6a:eb
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
+RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
+VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
+DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
+ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
+VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
+mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
+IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
+mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
+XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
+dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
+jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
+BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
+DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
+9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
+jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
+Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
+ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
+R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
+-----END CERTIFICATE-----
+
+# Issuer: CN=Equifax Secure Global eBusiness CA-1 O=Equifax Secure Inc.
+# Subject: CN=Equifax Secure Global eBusiness CA-1 O=Equifax Secure Inc.
+# Label: "Equifax Secure Global eBusiness CA"
+# Serial: 1
+# MD5 Fingerprint: 8f:5d:77:06:27:c4:98:3c:5b:93:78:e7:d7:7d:9b:cc
+# SHA1 Fingerprint: 7e:78:4a:10:1c:82:65:cc:2d:e1:f1:6d:47:b4:40:ca:d9:0a:19:45
+# SHA256 Fingerprint: 5f:0b:62:ea:b5:e3:53:ea:65:21:65:16:58:fb:b6:53:59:f4:43:28:0a:4a:fb:d1:04:d7:7d:10:f9:f0:4c:07
+-----BEGIN CERTIFICATE-----
+MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBT
+ZWN1cmUgR2xvYmFsIGVCdXNpbmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIw
+MDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0VxdWlmYXggU2Vj
+dXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEdsb2JhbCBlQnVzaW5l
+c3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRVPEnC
+UdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc
+58O/gGzNqfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/
+o5brhTMhHD4ePmBudpxnhcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAH
+MA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUvqigdHJQa0S3ySPY+6j/s1dr
+aGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hsMA0GCSqGSIb3DQEBBAUA
+A4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okENI7SS+RkA
+Z70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv
+8qIYNMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV
+-----END CERTIFICATE-----
+
+# Issuer: CN=Equifax Secure eBusiness CA-1 O=Equifax Secure Inc.
+# Subject: CN=Equifax Secure eBusiness CA-1 O=Equifax Secure Inc.
+# Label: "Equifax Secure eBusiness CA 1"
+# Serial: 4
+# MD5 Fingerprint: 64:9c:ef:2e:44:fc:c6:8f:52:07:d0:51:73:8f:cb:3d
+# SHA1 Fingerprint: da:40:18:8b:91:89:a3:ed:ee:ae:da:97:fe:2f:9d:f5:b7:d1:8a:41
+# SHA256 Fingerprint: cf:56:ff:46:a4:a1:86:10:9d:d9:65:84:b5:ee:b5:8a:51:0c:42:75:b0:e5:f9:4f:40:bb:ae:86:5e:19:f6:73
+-----BEGIN CERTIFICATE-----
+MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBT
+ZWN1cmUgZUJ1c2luZXNzIENBLTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQw
+MDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5j
+LjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENBLTEwgZ8wDQYJ
+KoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ1MRo
+RvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBu
+WqDZQu4aIZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKw
+Env+j6YDAgMBAAGjZjBkMBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTAD
+AQH/MB8GA1UdIwQYMBaAFEp4MlIR21kWNl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRK
+eDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQFAAOBgQB1W6ibAxHm6VZM
+zfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5lSE/9dR+
+WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN
+/Bf+KpYrtWKmpj29f5JZzVoqgrI3eQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=AddTrust Class 1 CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Subject: CN=AddTrust Class 1 CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Label: "AddTrust Low-Value Services Root"
+# Serial: 1
+# MD5 Fingerprint: 1e:42:95:02:33:92:6b:b9:5f:c0:7f:da:d6:b2:4b:fc
+# SHA1 Fingerprint: cc:ab:0e:a0:4c:23:01:d6:69:7b:dd:37:9f:cd:12:eb:24:e3:94:9d
+# SHA256 Fingerprint: 8c:72:09:27:9a:c0:4e:27:5e:16:d0:7f:d3:b7:75:e8:01:54:b5:96:80:46:e3:1f:52:dd:25:76:63:24:e9:a7
+-----BEGIN CERTIFICATE-----
+MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
+b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMw
+MTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYD
+VQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ul
+CDtbKRY654eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6n
+tGO0/7Gcrjyvd7ZWxbWroulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyl
+dI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1Zmne3yzxbrww2ywkEtvrNTVokMsAsJch
+PXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJuiGMx1I4S+6+JNM3GOGvDC
++Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8wHQYDVR0O
+BBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8E
+BTADAQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBl
+MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFk
+ZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENB
+IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxtZBsfzQ3duQH6lmM0MkhHma6X
+7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0PhiVYrqW9yTkkz
+43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
+eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJl
+pz/+0WatC7xrmYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOA
+WiFeIc9TVPC6b4nbqKqVz4vjccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
+-----END CERTIFICATE-----
+
+# Issuer: CN=AddTrust External CA Root O=AddTrust AB OU=AddTrust External TTP Network
+# Subject: CN=AddTrust External CA Root O=AddTrust AB OU=AddTrust External TTP Network
+# Label: "AddTrust External Root"
+# Serial: 1
+# MD5 Fingerprint: 1d:35:54:04:85:78:b0:3f:42:42:4d:bf:20:73:0a:3f
+# SHA1 Fingerprint: 02:fa:f3:e2:91:43:54:68:60:78:57:69:4d:f5:e4:5b:68:85:18:68
+# SHA256 Fingerprint: 68:7f:a4:51:38:22:78:ff:f0:c8:b1:1f:8d:43:d5:76:67:1c:6e:b2:bc:ea:b4:13:fb:83:d9:65:d0:6d:2f:f2
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
+IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
+MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
+FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
+bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
+dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
+H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
+uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
+mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
+a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
+E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
+WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
+VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
+Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
+cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
+IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
+AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
+YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
+6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
+Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
+c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
+mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
+-----END CERTIFICATE-----
+
+# Issuer: CN=AddTrust Public CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Subject: CN=AddTrust Public CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Label: "AddTrust Public Services Root"
+# Serial: 1
+# MD5 Fingerprint: c1:62:3e:23:c5:82:73:9c:03:59:4b:2b:e9:77:49:7f
+# SHA1 Fingerprint: 2a:b6:28:48:5e:78:fb:f3:ad:9e:79:10:dd:6b:df:99:72:2c:96:e5
+# SHA256 Fingerprint: 07:91:ca:07:49:b2:07:82:aa:d3:c7:d7:bd:0c:df:c9:48:58:35:84:3e:b2:d7:99:60:09:ce:43:ab:6c:69:27
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
+b3JrMSAwHgYDVQQDExdBZGRUcnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAx
+MDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtB
+ZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIDAeBgNV
+BAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV
+6tsfSlbunyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nX
+GCwwfQ56HmIexkvA/X1id9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnP
+dzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSGAa2Il+tmzV7R/9x98oTaunet3IAIx6eH
+1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAwHM+A+WD+eeSI8t0A65RF
+62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0GA1UdDgQW
+BBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUw
+AwEB/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDEL
+MAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRU
+cnVzdCBUVFAgTmV0d29yazEgMB4GA1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJv
+b3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4JNojVhaTdt02KLmuG7jD8WS6
+IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL+YPoRNWyQSW/
+iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao
+GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh
+4SINhwBk/ox9Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQm
+XiLsks3/QppEIW1cxeMiHV9HEufOX1362KqxMy3ZdvJOOjMMK7MtkAY=
+-----END CERTIFICATE-----
+
+# Issuer: CN=AddTrust Qualified CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Subject: CN=AddTrust Qualified CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Label: "AddTrust Qualified Certificates Root"
+# Serial: 1
+# MD5 Fingerprint: 27:ec:39:47:cd:da:5a:af:e2:9a:01:65:21:a9:4c:bb
+# SHA1 Fingerprint: 4d:23:78:ec:91:95:39:b5:00:7f:75:8f:03:3b:21:1e:c5:4d:8b:cf
+# SHA256 Fingerprint: 80:95:21:08:05:db:4b:bc:35:5e:44:28:d8:fd:6e:c2:cd:e3:ab:5f:b9:7a:99:42:98:8e:b8:f4:dc:d0:60:16
+-----BEGIN CERTIFICATE-----
+MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
+b3JrMSMwIQYDVQQDExpBZGRUcnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1
+MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcxCzAJBgNVBAYTAlNFMRQwEgYDVQQK
+EwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIzAh
+BgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwq
+xBb/4Oxx64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G
+87B4pfYOQnrjfxvM0PC3KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i
+2O+tCBGaKZnhqkRFmhJePp1tUvznoD1oL/BLcHwTOK28FSXx1s6rosAx1i+f4P8U
+WfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GRwVY18BTcZTYJbqukB8c1
+0cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HUMIHRMB0G
+A1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0T
+AQH/BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6Fr
+pGkwZzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQL
+ExRBZGRUcnVzdCBUVFAgTmV0d29yazEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlm
+aWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBABmrder4i2VhlRO6aQTv
+hsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxGGuoYQ992zPlm
+hpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
+dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3
+P6CxB9bpT9zeRXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9Y
+iQBCYz95OdBEsIJuQRno3eDBiFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5no
+xqE=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Entrust Root Certification Authority O=Entrust, Inc. OU=www.entrust.net/CPS is incorporated by reference/(c) 2006 Entrust, Inc.
+# Subject: CN=Entrust Root Certification Authority O=Entrust, Inc. OU=www.entrust.net/CPS is incorporated by reference/(c) 2006 Entrust, Inc.
+# Label: "Entrust Root Certification Authority"
+# Serial: 1164660820
+# MD5 Fingerprint: d6:a5:c3:ed:5d:dd:3e:00:c1:3d:87:92:1f:1d:3f:e4
+# SHA1 Fingerprint: b3:1e:b1:b7:40:e3:6c:84:02:da:dc:37:d4:4d:f5:d4:67:49:52:f9
+# SHA256 Fingerprint: 73:c1:76:43:4f:1b:c6:d5:ad:f4:5b:0e:76:e7:27:28:7c:8d:e5:76:16:c1:e6:e6:14:1a:2b:2c:bc:7d:8e:4c
+-----BEGIN CERTIFICATE-----
+MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0
+Lm5ldC9DUFMgaXMgaW5jb3Jwb3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMW
+KGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsGA1UEAxMkRW50cnVzdCBSb290IENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0MloXDTI2MTEyNzIw
+NTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMTkw
+NwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSBy
+ZWZlcmVuY2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNV
+BAMTJEVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALaVtkNC+sZtKm9I35RMOVcF7sN5EUFo
+Nu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYszA9u3g3s+IIRe7bJWKKf4
+4LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOwwCj0Yzfv9
+KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGI
+rb68j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi
+94DkZfs0Nw4pgHBNrziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOB
+sDCBrTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAi
+gA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1MzQyWjAfBgNVHSMEGDAWgBRo
+kORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DHhmak8fdLQ/uE
+vW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
+A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9t
+O1KzKtvn1ISMY/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6Zua
+AGAT/3B+XxFNSRuzFVJ7yVTav52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP
+9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTSW3iDVuycNsMm4hH2Z0kdkquM++v/
+eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0tHuu2guQOHXvgR1m
+0vdXcDazv/wor3ElhVsT/h5/WrQ8
+-----END CERTIFICATE-----
+
+# Issuer: O=RSA Security Inc OU=RSA Security 2048 V3
+# Subject: O=RSA Security Inc OU=RSA Security 2048 V3
+# Label: "RSA Security 2048 v3"
+# Serial: 13297492616345471454730593562152402946
+# MD5 Fingerprint: 77:0d:19:b1:21:fd:00:42:9c:3e:0c:a5:dd:0b:02:8e
+# SHA1 Fingerprint: 25:01:90:19:cf:fb:d9:99:1c:b7:68:25:74:8d:94:5f:30:93:95:42
+# SHA256 Fingerprint: af:8b:67:62:a1:e5:28:22:81:61:a9:5d:5c:55:9e:e2:66:27:8f:75:d7:9e:83:01:89:a5:03:50:6a:bd:6b:4c
+-----BEGIN CERTIFICATE-----
+MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6
+MRkwFwYDVQQKExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJp
+dHkgMjA0OCBWMzAeFw0wMTAyMjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAX
+BgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAbBgNVBAsTFFJTQSBTZWN1cml0eSAy
+MDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt49VcdKA3Xtp
+eafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7Jylg
+/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGl
+wSMiuLgbWhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnh
+AMFRD0xS+ARaqn1y07iHKrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2
+PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP+Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpu
+AWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+BjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4EFgQUB8NR
+MKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYc
+HnmYv/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/
+Zb5gEydxiKRz44Rj0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+
+f00/FGj1EVDVwfSQpQgdMWD/YIwjVAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVO
+rSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395nzIlQnQFgCi/vcEkllgVsRch
+6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kApKnXwiJPZ9d3
+7CAFYd4=
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Global CA O=GeoTrust Inc.
+# Subject: CN=GeoTrust Global CA O=GeoTrust Inc.
+# Label: "GeoTrust Global CA"
+# Serial: 144470
+# MD5 Fingerprint: f7:75:ab:29:fb:51:4e:b7:77:5e:ff:05:3c:99:8e:f5
+# SHA1 Fingerprint: de:28:f4:a4:ff:e5:b9:2f:a3:c5:03:d1:a3:49:a7:f9:96:2a:82:12
+# SHA256 Fingerprint: ff:85:6a:2d:25:1d:cd:88:d3:66:56:f4:50:12:67:98:cf:ab:aa:de:40:79:9c:72:2d:e4:d2:b5:db:36:a7:3a
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
+MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
+YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
+R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
+9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
+fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
+iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
+1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
+bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
+MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
+ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
+uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
+Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
+tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
+PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
+hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
+5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Global CA 2 O=GeoTrust Inc.
+# Subject: CN=GeoTrust Global CA 2 O=GeoTrust Inc.
+# Label: "GeoTrust Global CA 2"
+# Serial: 1
+# MD5 Fingerprint: 0e:40:a7:6c:de:03:5d:8f:d1:0f:e4:d1:8d:f9:6c:a9
+# SHA1 Fingerprint: a9:e9:78:08:14:37:58:88:f2:05:19:b0:6d:2b:0d:2b:60:16:90:7d
+# SHA256 Fingerprint: ca:2d:82:a0:86:77:07:2f:8a:b6:76:4f:f0:35:67:6c:fe:3e:5e:32:5e:01:21:72:df:3f:92:09:6d:b7:9b:85
+-----BEGIN CERTIFICATE-----
+MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEW
+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFs
+IENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3Qg
+R2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvPE1A
+PRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/NTL8
+Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hL
+TytCOb1kLUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL
+5mkWRxHCJ1kDs6ZgwiFAVvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7
+S4wMcoKK+xfNAGw6EzywhIdLFnopsk/bHdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe
+2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNHK266ZUap
+EBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6td
+EPx7srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv
+/NgdRN3ggX+d6YvhZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywN
+A0ZF66D0f0hExghAzN4bcLUprbqLOzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0
+abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkCx1YAzUm5s2x7UwQa4qjJqhIF
+I8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqFH4z1Ir+rzoPz
+4iIprn2DQKi6bA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Universal CA O=GeoTrust Inc.
+# Subject: CN=GeoTrust Universal CA O=GeoTrust Inc.
+# Label: "GeoTrust Universal CA"
+# Serial: 1
+# MD5 Fingerprint: 92:65:58:8b:a2:1a:31:72:73:68:5c:b4:a5:7a:07:48
+# SHA1 Fingerprint: e6:21:f3:35:43:79:05:9a:4b:68:30:9d:8a:2f:74:22:15:87:ec:79
+# SHA256 Fingerprint: a0:45:9b:9f:63:b2:25:59:f5:fa:5d:4c:6d:b3:f9:f7:2f:f1:93:42:03:35:78:f0:73:bf:1d:1b:46:cb:b9:12
+-----BEGIN CERTIFICATE-----
+MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEW
+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVy
+c2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UE
+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0
+IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYV
+VaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8
+cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTT
+QjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFh
+F7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2v
+c7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/w
+mZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xd
+VHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCX
+teGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZ
+f9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfRe
+Bi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+
+nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB
+/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQY
+MBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG
+9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
+aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fX
+IwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzyn
+ANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0z
+uzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqN
+Pnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKja
+QI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKW
+koRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9
+ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQt
+DF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/Sfuvm
+bJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw=
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Universal CA 2 O=GeoTrust Inc.
+# Subject: CN=GeoTrust Universal CA 2 O=GeoTrust Inc.
+# Label: "GeoTrust Universal CA 2"
+# Serial: 1
+# MD5 Fingerprint: 34:fc:b8:d0:36:db:9e:14:b3:c2:f2:db:8f:e4:94:c7
+# SHA1 Fingerprint: 37:9a:19:7b:41:85:45:35:0c:a6:03:69:f3:3c:2e:af:47:4f:20:79
+# SHA256 Fingerprint: a0:23:4f:3b:c8:52:7c:a5:62:8e:ec:81:ad:5d:69:89:5d:a5:68:0d:c9:1d:1c:b8:47:7f:33:f8:78:b9:5b:0b
+-----BEGIN CERTIFICATE-----
+MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEW
+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVy
+c2FsIENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYD
+VQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1
+c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0DE81
+WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUG
+FF+3Qs17j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdq
+XbboW0W63MOhBW9Wjo8QJqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxL
+se4YuU6W3Nx2/zu+z18DwPw76L5GG//aQMJS9/7jOvdqdzXQ2o3rXhhqMcceujwb
+KNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2WP0+GfPtDCapkzj4T8Fd
+IgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP20gaXT73
+y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRt
+hAAnZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgoc
+QIgfksILAAX/8sgCSqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4
+Lt1ZrtmhN79UNdxzMk+MBB4zsslG8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAfBgNV
+HSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8EBAMCAYYwDQYJ
+KoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
+dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQ
+L1EuxBRa3ugZ4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgr
+Fg5fNuH8KrUwJM/gYwx7WBr+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSo
+ag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpqA1Ihn0CoZ1Dy81of398j9tx4TuaY
+T1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpgY+RdM4kX2TGq2tbz
+GDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiPpm8m
+1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJV
+OCiNUW7dFGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH
+6aLcr34YEoP9VhdBLtUpgn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwX
+QMAJKOSLakhT2+zNVVXxxvjpoixMptEmX36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
+-----END CERTIFICATE-----
+
+# Issuer: CN=America Online Root Certification Authority 1 O=America Online Inc.
+# Subject: CN=America Online Root Certification Authority 1 O=America Online Inc.
+# Label: "America Online Root Certification Authority 1"
+# Serial: 1
+# MD5 Fingerprint: 14:f1:08:ad:9d:fa:64:e2:89:e7:1c:cf:a8:ad:7d:5e
+# SHA1 Fingerprint: 39:21:c1:15:c1:5d:0e:ca:5c:cb:5b:c4:f0:7d:21:d8:05:0b:56:6a
+# SHA256 Fingerprint: 77:40:73:12:c6:3a:15:3d:5b:c0:0b:4e:51:75:9c:df:da:c2:37:dc:2a:33:b6:79:46:e9:8e:9b:fa:68:0a:e3
+-----BEGIN CERTIFICATE-----
+MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTQW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBP
+bmxpbmUgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyODA2
+MDAwMFoXDTM3MTExOTIwNDMwMFowYzELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0Ft
+ZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2EgT25saW5lIFJvb3Qg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAKgv6KRpBgNHw+kqmP8ZonCaxlCyfqXfaE0bfA+2l2h9LaaLl+lk
+hsmj76CGv2BlnEtUiMJIxUo5vxTjWVXlGbR0yLQFOVwWpeKVBeASrlmLojNoWBym
+1BW32J/X3HGrfpq/m44zDyL9Hy7nBzbvYjnF3cu6JRQj3gzGPTzOggjmZj7aUTsW
+OqMFf6Dch9Wc/HKpoH145LcxVR5lu9RhsCFg7RAycsWSJR74kEoYeEfffjA3PlAb
+2xzTa5qGUwew76wGePiEmf4hjUyAtgyC9mZweRrTT6PP8c9GsEsPPt2IYriMqQko
+O3rHl+Ee5fSfwMCuJKDIodkP1nsmgmkyPacCAwEAAaNjMGEwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUAK3Zo/Z59m50qX8zPYEX10zPM94wHwYDVR0jBBgwFoAU
+AK3Zo/Z59m50qX8zPYEX10zPM94wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB
+BQUAA4IBAQB8itEfGDeC4Liwo+1WlchiYZwFos3CYiZhzRAW18y0ZTTQEYqtqKkF
+Zu90821fnZmv9ov761KyBZiibyrFVL0lvV+uyIbqRizBs73B6UlwGBaXCBOMIOAb
+LjpHyx7kADCVW/RFo8AasAFOq73AI25jP4BKxQft3OJvx8Fi8eNy1gTIdGcL+oir
+oQHIb/AUr9KZzVGTfu0uOMe9zkZQPXLjeSWdm4grECDdpbgyn43gKd8hdIaC2y+C
+MMbHNYaz+ZZfRtsMRf3zUMNvxsNIrUam4SdHCh0Om7bCd39j8uB9Gr784N/Xx6ds
+sPmuujz9dLQR6FgNgLzTqIA6me11zEZ7
+-----END CERTIFICATE-----
+
+# Issuer: CN=America Online Root Certification Authority 2 O=America Online Inc.
+# Subject: CN=America Online Root Certification Authority 2 O=America Online Inc.
+# Label: "America Online Root Certification Authority 2"
+# Serial: 1
+# MD5 Fingerprint: d6:ed:3c:ca:e2:66:0f:af:10:43:0d:77:9b:04:09:bf
+# SHA1 Fingerprint: 85:b5:ff:67:9b:0c:79:96:1f:c8:6e:44:22:00:46:13:db:17:92:84
+# SHA256 Fingerprint: 7d:3b:46:5a:60:14:e5:26:c0:af:fc:ee:21:27:d2:31:17:27:ad:81:1c:26:84:2d:00:6a:f3:73:06:cc:80:bd
+-----BEGIN CERTIFICATE-----
+MIIFpDCCA4ygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTQW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBP
+bmxpbmUgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAyMB4XDTAyMDUyODA2
+MDAwMFoXDTM3MDkyOTE0MDgwMFowYzELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0Ft
+ZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2EgT25saW5lIFJvb3Qg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAMxBRR3pPU0Q9oyxQcngXssNt79Hc9PwVU3dxgz6sWYFas14tNwC
+206B89enfHG8dWOgXeMHDEjsJcQDIPT/DjsS/5uN4cbVG7RtIuOx238hZK+GvFci
+KtZHgVdEglZTvYYUAQv8f3SkWq7xuhG1m1hagLQ3eAkzfDJHA1zEpYNI9FdWboE2
+JxhP7JsowtS013wMPgwr38oE18aO6lhOqKSlGBxsRZijQdEt0sdtjRnxrXm3gT+9
+BoInLRBYBbV4Bbkv2wxrkJB+FFk4u5QkE+XRnRTf04JNRvCAOVIyD+OEsnpD8l7e
+Xz8d3eOyG6ChKiMDbi4BFYdcpnV1x5dhvt6G3NRI270qv0pV2uh9UPu0gBe4lL8B
+PeraunzgWGcXuVjgiIZGZ2ydEEdYMtA1fHkqkKJaEBEjNa0vzORKW6fIJ/KD3l67
+Xnfn6KVuY8INXWHQjNJsWiEOyiijzirplcdIz5ZvHZIlyMbGwcEMBawmxNJ10uEq
+Z8A9W6Wa6897GqidFEXlD6CaZd4vKL3Ob5Rmg0gp2OpljK+T2WSfVVcmv2/LNzGZ
+o2C7HK2JNDJiuEMhBnIMoVxtRsX6Kc8w3onccVvdtjc+31D1uAclJuW8tf48ArO3
++L5DwYcRlJ4jbBeKuIonDFRH8KmzwICMoCfrHRnjB453cMor9H124HhnAgMBAAGj
+YzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE1FwWg4u3OpaaEg5+31IqEj
+FNeeMB8GA1UdIwQYMBaAFE1FwWg4u3OpaaEg5+31IqEjFNeeMA4GA1UdDwEB/wQE
+AwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAZ2sGuV9FOypLM7PmG2tZTiLMubekJcmn
+xPBUlgtk87FYT15R/LKXeydlwuXK5w0MJXti4/qftIe3RUavg6WXSIylvfEWK5t2
+LHo1YGwRgJfMqZJS5ivmae2p+DYtLHe/YUjRYwu5W1LtGLBDQiKmsXeu3mnFzccc
+obGlHBD7GL4acN3Bkku+KVqdPzW+5X1R+FXgJXUjhx5c3LqdsKyzadsXg8n33gy8
+CNyRnqjQ1xU3c6U1uPx+xURABsPr+CKAXEfOAuMRn0T//ZoyzH1kUQ7rVyZ2OuMe
+IjzCpjbdGe+n/BLzJsBZMYVMnNjP36TMzCmT/5RtdlwTCJfy7aULTd3oyWgOZtMA
+DjMSW7yV5TKQqLPGbIOtd+6Lfn6xqavT4fG2wLHqiMDn05DpKJKUe2h7lyoKZy2F
+AjgQ5ANh1NolNscIWC2hp1GvMApJ9aZphwctREZ2jirlmjvXGKL8nDgQzMY70rUX
+Om/9riW99XJZZLF0KjhfGEzfz3EEWjbUvy+ZnOjZurGV5gJLIaFb1cFPj65pbVPb
+AZO1XB4Y3WRayhgoPmMEEf0cjQAPuDffZ4qdZqkCapH/E8ovXYO8h5Ns3CRRFgQl
+Zvqz2cK6Kb6aSDiCmfS/O0oxGfm/jiEzFMpPVF/7zvuPcX/9XhmgD0uRuMRUvAaw
+RY8mkaKO/qk=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Visa eCommerce Root O=VISA OU=Visa International Service Association
+# Subject: CN=Visa eCommerce Root O=VISA OU=Visa International Service Association
+# Label: "Visa eCommerce Root"
+# Serial: 25952180776285836048024890241505565794
+# MD5 Fingerprint: fc:11:b8:d8:08:93:30:00:6d:23:f9:7e:eb:52:1e:02
+# SHA1 Fingerprint: 70:17:9b:86:8c:00:a4:fa:60:91:52:22:3f:9f:3e:32:bd:e0:05:62
+# SHA256 Fingerprint: 69:fa:c9:bd:55:fb:0a:c7:8d:53:bb:ee:5c:f1:d5:97:98:9f:d0:aa:ab:20:a2:51:51:bd:f1:73:3e:e7:d1:22
+-----BEGIN CERTIFICATE-----
+MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBr
+MQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRl
+cm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv
+bW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2WhcNMjIwNjI0MDAxNjEyWjBrMQsw
+CQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5h
+dGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1l
+cmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h
+2mCxlCfLF9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4E
+lpF7sDPwsRROEW+1QK8bRaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdV
+ZqW1LS7YgFmypw23RuwhY/81q6UCzyr0TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq
+299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI/k4+oKsGGelT84ATB+0t
+vz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzsGHxBvfaL
+dXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD
+AgEGMB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUF
+AAOCAQEAX/FBfXxcCLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcR
+zCSs00Rsca4BIGsDoo8Ytyk6feUWYFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3
+LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pzzkWKsKZJ/0x9nXGIxHYdkFsd
+7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBuYQa7FkKMcPcw
+++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
+398znM/jra6O1I7mT1GvFpLgXPYHDw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Certum CA O=Unizeto Sp. z o.o.
+# Subject: CN=Certum CA O=Unizeto Sp. z o.o.
+# Label: "Certum Root CA"
+# Serial: 65568
+# MD5 Fingerprint: 2c:8f:9f:66:1d:18:90:b1:47:26:9d:8e:86:82:8c:a9
+# SHA1 Fingerprint: 62:52:dc:40:f7:11:43:a2:2f:de:9e:f7:34:8e:06:42:51:b1:81:18
+# SHA256 Fingerprint: d8:e0:fe:bc:1d:b2:e3:8d:00:94:0f:37:d2:7d:41:34:4d:99:3e:73:4b:99:d5:65:6d:97:78:d4:d8:14:36:24
+-----BEGIN CERTIFICATE-----
+MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
+QTAeFw0wMjA2MTExMDQ2MzlaFw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
+QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6xwS7TT3zNJc4YPk/E
+jG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdLkKWo
+ePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GI
+ULdtlkIJ89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapu
+Ob7kky/ZR6By6/qmW6/KUz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUg
+AKpoC6EahQGcxEZjgoi2IrHu/qpGWX7PNSzVttpd90gzFFS269lvzs2I1qsb2pY7
+HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
+uI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+GXYkHAQa
+TOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTg
+xSvgGrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1q
+CjqTE5s7FCMTY5w/0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5x
+O/fIR/RpbxXyEV6DHpx8Uq79AtoSqFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs
+6GAqm4VKQPNriiTsBhYscw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=AAA Certificate Services O=Comodo CA Limited
+# Subject: CN=AAA Certificate Services O=Comodo CA Limited
+# Label: "Comodo AAA Services root"
+# Serial: 1
+# MD5 Fingerprint: 49:79:04:b0:eb:87:19:ac:47:b0:bc:11:51:9b:74:d0
+# SHA1 Fingerprint: d1:eb:23:a4:6d:17:d6:8f:d9:25:64:c2:f1:f1:60:17:64:d8:e3:49
+# SHA256 Fingerprint: d7:a7:a0:fb:5d:7e:27:31:d7:71:e9:48:4e:bc:de:f7:1d:5f:0c:3e:0a:29:48:78:2b:c8:3e:e0:ea:69:9e:f4
+-----BEGIN CERTIFICATE-----
+MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj
+YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL
+MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
+BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM
+GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua
+BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe
+3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4
+YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR
+rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm
+ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
+oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v
+QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t
+b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF
+AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q
+GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
+Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2
+G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi
+l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3
+smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Secure Certificate Services O=Comodo CA Limited
+# Subject: CN=Secure Certificate Services O=Comodo CA Limited
+# Label: "Comodo Secure Services root"
+# Serial: 1
+# MD5 Fingerprint: d3:d9:bd:ae:9f:ac:67:24:b3:c8:1b:52:e1:b9:a9:bd
+# SHA1 Fingerprint: 4a:65:d5:f4:1d:ef:39:b8:b8:90:4a:4a:d3:64:81:33:cf:c7:a1:d1
+# SHA256 Fingerprint: bd:81:ce:3b:4f:65:91:d1:1a:67:b5:fc:7a:47:fd:ef:25:52:1b:f9:aa:4e:18:b9:e3:df:2e:34:a7:80:3b:e8
+-----BEGIN CERTIFICATE-----
+MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEb
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRp
+ZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVow
+fjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAiBgNV
+BAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPM
+cm3ye5drswfxdySRXyWP9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3S
+HpR7LZQdqnXXs5jLrLxkU0C8j6ysNstcrbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996
+CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rCoznl2yY4rYsK7hljxxwk
+3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3Vp6ea5EQz
+6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNV
+HQ4EFgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
+EwEB/wQFMAMBAf8wgYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2Rv
+Y2EuY29tL1NlY3VyZUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRw
+Oi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmww
+DQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm4J4oqF7Tt/Q0
+5qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj
+Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtI
+gKvcnDe4IRRLDXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJ
+aD61JlfutuC23bkpgHl9j6PwpCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDl
+izeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1HRR3B7Hzs/Sk=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Trusted Certificate Services O=Comodo CA Limited
+# Subject: CN=Trusted Certificate Services O=Comodo CA Limited
+# Label: "Comodo Trusted Services root"
+# Serial: 1
+# MD5 Fingerprint: 91:1b:3f:6e:cd:9e:ab:ee:07:fe:1f:71:d2:b3:61:27
+# SHA1 Fingerprint: e1:9f:e3:0e:8b:84:60:9e:80:9b:17:0d:72:a8:c5:ba:6e:14:09:bd
+# SHA256 Fingerprint: 3f:06:e5:56:81:d4:96:f5:be:16:9e:b5:38:9f:9f:2b:8f:f6:1e:17:08:df:68:81:72:48:49:cd:5d:27:cb:69
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEb
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0
+aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEwMDAwMDBaFw0yODEyMzEyMzU5NTla
+MH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+BgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUwIwYD
+VQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWW
+fnJSoBVC21ndZHoa0Lh73TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMt
+TGo87IvDktJTdyR0nAducPy9C1t2ul/y/9c3S0pgePfw+spwtOpZqqPOSC+pw7IL
+fhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6juljatEPmsbS9Is6FARW
+1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsSivnkBbA7
+kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0G
+A1UdDgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21v
+ZG9jYS5jb20vVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRo
+dHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMu
+Y3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8NtwuleGFTQQuS9/
+HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32
+pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxIS
+jBc/lDb+XbDABHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+
+xqFx7D+gIIxmOom0jtTYsU0lR+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/Atyjcn
+dBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O9y5Xt5hwXsjEeLBi
+-----END CERTIFICATE-----
+
+# Issuer: CN=QuoVadis Root Certification Authority O=QuoVadis Limited OU=Root Certification Authority
+# Subject: CN=QuoVadis Root Certification Authority O=QuoVadis Limited OU=Root Certification Authority
+# Label: "QuoVadis Root CA"
+# Serial: 985026699
+# MD5 Fingerprint: 27:de:36:fe:72:b7:00:03:00:9d:f4:f0:1e:6c:04:24
+# SHA1 Fingerprint: de:3f:40:bd:50:93:d3:9b:6c:60:f6:da:bc:07:62:01:00:89:76:c9
+# SHA256 Fingerprint: a4:5e:de:3b:bb:f0:9c:8a:e1:5c:72:ef:c0:72:68:d6:93:a2:1c:99:6f:d5:1e:67:ca:07:94:60:fd:6d:88:73
+-----BEGIN CERTIFICATE-----
+MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC
+TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz
+MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw
+IwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR
+dW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp
+li4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D
+rOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ
+WCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug
+F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospU
+xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCC
+Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVv
+dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREw
+ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNl
+IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBh
+c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy
+ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
+Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI
+KwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T
+KbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq
+y+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p
+dGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD
+VQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL
+MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk
+fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf8
+7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1R
+cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0y
+mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQW
+xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK
+SnQ2+Q==
+-----END CERTIFICATE-----
+
+# Issuer: CN=QuoVadis Root CA 2 O=QuoVadis Limited
+# Subject: CN=QuoVadis Root CA 2 O=QuoVadis Limited
+# Label: "QuoVadis Root CA 2"
+# Serial: 1289
+# MD5 Fingerprint: 5e:39:7b:dd:f8:ba:ec:82:e9:ac:62:ba:0c:54:00:2b
+# SHA1 Fingerprint: ca:3a:fb:cf:12:40:36:4b:44:b2:16:20:88:80:48:39:19:93:7c:f7
+# SHA256 Fingerprint: 85:a0:dd:7d:d7:20:ad:b7:ff:05:f8:3d:54:2b:20:9d:c7:ff:45:28:f7:d6:77:b1:83:89:fe:a5:e5:c4:9e:86
+-----BEGIN CERTIFICATE-----
+MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
+GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
+b3QgQ0EgMjAeFw0wNjExMjQxODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNV
+BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
+YWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCa
+GMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6XJxg
+Fyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55J
+WpzmM+Yklvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bB
+rrcCaoF6qUWD4gXmuVbBlDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp
++ARz8un+XJiM9XOva7R+zdRcAitMOeGylZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1
+ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt66/3FsvbzSUr5R/7mp/i
+Ucw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1JdxnwQ5hYIiz
+PtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og
+/zOhD7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UH
+oycR7hYQe7xFSkyyBNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuI
+yV77zGHcizN300QyNQliBJIWENieJ0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1Ud
+EwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBQahGK8SEwzJQTU7tD2
+A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGUa6FJpEcwRTEL
+MAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
+ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2f
+BluornFdLwUvZ+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzn
+g/iN/Ae42l9NLmeyhP3ZRPx3UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2Bl
+fF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodmVjB3pjd4M1IQWK4/YY7yarHvGH5K
+WWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK+JDSV6IZUaUtl0Ha
+B0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrWIozc
+hLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPR
+TUIZ3Ph1WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWD
+mbA4CD/pXvk1B+TJYm5Xf6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0Z
+ohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y
+4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8VCLAAVBpQ570su9t+Oza
+8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
+-----END CERTIFICATE-----
+
+# Issuer: CN=QuoVadis Root CA 3 O=QuoVadis Limited
+# Subject: CN=QuoVadis Root CA 3 O=QuoVadis Limited
+# Label: "QuoVadis Root CA 3"
+# Serial: 1478
+# MD5 Fingerprint: 31:85:3c:62:94:97:63:b9:aa:fd:89:4e:af:6f:e0:cf
+# SHA1 Fingerprint: 1f:49:14:f7:d8:74:95:1d:dd:ae:02:c0:be:fd:3a:2d:82:75:51:85
+# SHA256 Fingerprint: 18:f1:fc:7f:20:5d:f8:ad:dd:eb:7f:e0:07:dd:57:e3:af:37:5a:9c:4d:8d:73:54:6b:f4:f1:fe:d1:e1:8d:35
+-----BEGIN CERTIFICATE-----
+MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
+GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
+b3QgQ0EgMzAeFw0wNjExMjQxOTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNV
+BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
+YWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDM
+V0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNggDhoB
+4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUr
+H556VOijKTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd
+8lyyBTNvijbO0BNO/79KDDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9Cabwv
+vWhDFlaJKjdhkf2mrk7AyxRllDdLkgbvBNDInIjbC3uBr7E9KsRlOni27tyAsdLT
+mZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwpp5ijJUMv7/FfJuGITfhe
+btfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8nT8KKdjc
+T5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDt
+WAEXMJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZ
+c6tsgLjoC2SToJyMGf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A
+4iLItLRkT9a6fUg+qGkM17uGcclzuD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYD
+VR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHTBgkrBgEEAb5YAAMwgcUwgZMG
+CCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmljYXRlIGNvbnN0
+aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
+aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVu
+dC4wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2Nw
+czALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4G
+A1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4ywLQoUmkRzBFMQswCQYDVQQGEwJC
+TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UEAxMSUXVvVmFkaXMg
+Um9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZVqyM0
+7ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSem
+d1o417+shvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd
++LJ2w/w4E6oM3kJpK27zPOuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B
+4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadN
+t54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp8kokUvd0/bpO5qgdAm6x
+DYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBCbjPsMZ57
+k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6s
+zHXug/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0j
+Wy10QJLZYxkNc91pvGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeT
+mJlglFwjz1onl14LBQaTNx47aTbrqZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK
+4SVhM7JZG+Ju1zdXtg2pEto=
+-----END CERTIFICATE-----
+
+# Issuer: O=SECOM Trust.net OU=Security Communication RootCA1
+# Subject: O=SECOM Trust.net OU=Security Communication RootCA1
+# Label: "Security Communication Root CA"
+# Serial: 0
+# MD5 Fingerprint: f1:bc:63:6a:54:e0:b5:27:f5:cd:e7:1a:e3:4d:6e:4a
+# SHA1 Fingerprint: 36:b1:2b:49:f9:81:9e:d7:4c:9e:bc:38:0f:c6:56:8f:5d:ac:b2:f7
+# SHA256 Fingerprint: e7:5e:72:ed:9f:56:0e:ec:6e:b4:80:00:73:a4:3f:c3:ad:19:19:5a:39:22:82:01:78:95:97:4a:99:02:6b:6c
+-----BEGIN CERTIFICATE-----
+MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEY
+MBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21t
+dW5pY2F0aW9uIFJvb3RDQTEwHhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5
+WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYD
+VQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw8yl8
+9f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJ
+DKaVv0uMDPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9
+Ms+k2Y7CI9eNqPPYJayX5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/N
+QV3Is00qVUarH9oe4kA92819uZKAnDfdDJZkndwi92SL32HeFZRSFaB9UslLqCHJ
+xrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2JChzAgMBAAGjPzA9MB0G
+A1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYwDwYDVR0T
+AQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vG
+kl3g0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfr
+Uj94nK9NrvjVT8+amCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5
+Bw+SUEmK3TGXX8npN6o7WWWXlDLJs58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJU
+JRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ6rBK+1YWc26sTfcioU+tHXot
+RSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAiFL39vmwLAw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Sonera Class2 CA O=Sonera
+# Subject: CN=Sonera Class2 CA O=Sonera
+# Label: "Sonera Class 2 Root CA"
+# Serial: 29
+# MD5 Fingerprint: a3:ec:75:0f:2e:88:df:fa:48:01:4e:0b:5c:48:6f:fb
+# SHA1 Fingerprint: 37:f7:6d:e6:07:7c:90:c5:b1:3e:93:1a:b7:41:10:b4:f2:e4:9a:27
+# SHA256 Fingerprint: 79:08:b4:03:14:c1:38:10:0b:51:8d:07:35:80:7f:fb:fc:f8:51:8a:00:95:33:71:05:ba:38:6b:15:3d:d9:27
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP
+MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx
+MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV
+BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o
+Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt
+5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s
+3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej
+vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu
+8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw
+DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG
+MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil
+zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/
+3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD
+FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6
+Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2
+ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M
+-----END CERTIFICATE-----
+
+# Issuer: CN=Staat der Nederlanden Root CA O=Staat der Nederlanden
+# Subject: CN=Staat der Nederlanden Root CA O=Staat der Nederlanden
+# Label: "Staat der Nederlanden Root CA"
+# Serial: 10000010
+# MD5 Fingerprint: 60:84:7c:5a:ce:db:0c:d4:cb:a7:e9:fe:02:c6:a9:c0
+# SHA1 Fingerprint: 10:1d:fa:3f:d5:0b:cb:bb:9b:b5:60:0c:19:55:a4:1a:f4:73:3a:04
+# SHA256 Fingerprint: d4:1d:82:9e:8c:16:59:82:2a:f9:3f:ce:62:bf:fc:de:26:4f:c8:4e:8b:95:0c:5f:f2:75:d0:52:35:46:95:a3
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJO
+TDEeMBwGA1UEChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFh
+dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEy
+MTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4wHAYDVQQKExVTdGFhdCBkZXIgTmVk
+ZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxhbmRlbiBSb290IENB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFtvszn
+ExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw71
+9tV2U02PjLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MO
+hXeiD+EwR+4A5zN9RGcaC1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+U
+tFE5A3+y3qcym7RHjm+0Sq7lr7HcsBthvJly3uSJt3omXdozSVtSnA71iq3DuD3o
+BmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn622r+I/q85Ej0ZytqERAh
+SQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRVHSAAMDww
+OgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMv
+cm9vdC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA
+7Jbg0zTBLL9s+DANBgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k
+/rvuFbQvBgwp8qiSpGEN/KtcCFtREytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzm
+eafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbwMVcoEoJz6TMvplW0C5GUR5z6
+u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3ynGQI0DvDKcWy
+7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
+iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==
+-----END CERTIFICATE-----
+
+# Issuer: O=TDC Internet OU=TDC Internet Root CA
+# Subject: O=TDC Internet OU=TDC Internet Root CA
+# Label: "TDC Internet Root CA"
+# Serial: 986490188
+# MD5 Fingerprint: 91:f4:03:55:20:a1:f8:63:2c:62:de:ac:fb:61:1c:8e
+# SHA1 Fingerprint: 21:fc:bd:8e:7f:6c:af:05:1b:d1:b3:43:ec:a8:e7:61:47:f2:0f:8a
+# SHA256 Fingerprint: 48:98:c6:88:8c:0c:ff:b0:d3:e3:1a:ca:8a:37:d4:e3:51:5f:f7:46:d0:26:35:d8:66:46:cf:a0:a3:18:5a:e7
+-----BEGIN CERTIFICATE-----
+MIIEKzCCAxOgAwIBAgIEOsylTDANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJE
+SzEVMBMGA1UEChMMVERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQg
+Um9vdCBDQTAeFw0wMTA0MDUxNjMzMTdaFw0yMTA0MDUxNzAzMTdaMEMxCzAJBgNV
+BAYTAkRLMRUwEwYDVQQKEwxUREMgSW50ZXJuZXQxHTAbBgNVBAsTFFREQyBJbnRl
+cm5ldCBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxLhA
+vJHVYx/XmaCLDEAedLdInUaMArLgJF/wGROnN4NrXceO+YQwzho7+vvOi20jxsNu
+Zp+Jpd/gQlBn+h9sHvTQBda/ytZO5GhgbEaqHF1j4QeGDmUApy6mcca8uYGoOn0a
+0vnRrEvLznWv3Hv6gXPU/Lq9QYjUdLP5Xjg6PEOo0pVOd20TDJ2PeAG3WiAfAzc1
+4izbSysseLlJ28TQx5yc5IogCSEWVmb/Bexb4/DPqyQkXsN/cHoSxNK1EKC2IeGN
+eGlVRGn1ypYcNIUXJXfi9i8nmHj9eQY6otZaQ8H/7AQ77hPv01ha/5Lr7K7a8jcD
+R0G2l8ktCkEiu7vmpwIDAQABo4IBJTCCASEwEQYJYIZIAYb4QgEBBAQDAgAHMGUG
+A1UdHwReMFwwWqBYoFakVDBSMQswCQYDVQQGEwJESzEVMBMGA1UEChMMVERDIElu
+dGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTENMAsGA1UEAxME
+Q1JMMTArBgNVHRAEJDAigA8yMDAxMDQwNTE2MzMxN1qBDzIwMjEwNDA1MTcwMzE3
+WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUbGQBx/2FbazI2p5QCIUItTxWqFAw
+HQYDVR0OBBYEFGxkAcf9hW2syNqeUAiFCLU8VqhQMAwGA1UdEwQFMAMBAf8wHQYJ
+KoZIhvZ9B0EABBAwDhsIVjUuMDo0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4IBAQBO
+Q8zR3R0QGwZ/t6T609lN+yOfI1Rb5osvBCiLtSdtiaHsmGnc540mgwV5dOy0uaOX
+wTUA/RXaOYE6lTGQ3pfphqiZdwzlWqCE/xIWrG64jcN7ksKsLtB9KOy282A4aW8+
+2ARVPp7MVdK6/rtHBNcK2RYKNCn1WBPVT8+PVkuzHu7TmHnaCB4Mb7j4Fifvwm89
+9qNLPg7kbWzbO0ESm70NRyN/PErQr8Cv9u8btRXE64PECV90i9kR+8JWsTz4cMo0
+jUNAE4z9mQNUecYu6oah9jrUCbz0vGbMPVjQV0kK7iXiQe4T+Zs4NNEA9X7nlB38
+aQNiuJkFBT1reBK9sG9l
+-----END CERTIFICATE-----
+
+# Issuer: CN=UTN - DATACorp SGC O=The USERTRUST Network OU=http://www.usertrust.com
+# Subject: CN=UTN - DATACorp SGC O=The USERTRUST Network OU=http://www.usertrust.com
+# Label: "UTN DATACorp SGC Root CA"
+# Serial: 91374294542884689855167577680241077609
+# MD5 Fingerprint: b3:a5:3e:77:21:6d:ac:4a:c0:c9:fb:d5:41:3d:ca:06
+# SHA1 Fingerprint: 58:11:9f:0e:12:82:87:ea:50:fd:d9:87:45:6f:4f:78:dc:fa:d6:d4
+# SHA256 Fingerprint: 85:fb:2f:91:dd:12:27:5a:01:45:b6:36:53:4f:84:02:4a:d6:8b:69:b8:ee:88:68:4f:f7:11:37:58:05:b3:48
+-----BEGIN CERTIFICATE-----
+MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCB
+kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw
+IFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBaMIGTMQswCQYDVQQG
+EwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYD
+VQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cu
+dXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6
+E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZ
+D0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK
+4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykq
+lXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulW
+bfXv33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQAB
+o4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRT
+MtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3Js
+LnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUEIzAhBggr
+BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IB
+AQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft
+Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyj
+j98C5OBxOvG0I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVH
+KWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv
+2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3
+mfnGV/TJVTl4uix5yaaIK/QI
+-----END CERTIFICATE-----
+
+# Issuer: CN=UTN-USERFirst-Hardware O=The USERTRUST Network OU=http://www.usertrust.com
+# Subject: CN=UTN-USERFirst-Hardware O=The USERTRUST Network OU=http://www.usertrust.com
+# Label: "UTN USERFirst Hardware Root CA"
+# Serial: 91374294542884704022267039221184531197
+# MD5 Fingerprint: 4c:56:41:e5:0d:bb:2b:e8:ca:a3:ed:18:08:ad:43:39
+# SHA1 Fingerprint: 04:83:ed:33:99:ac:36:08:05:87:22:ed:bc:5e:46:00:e3:be:f9:d7
+# SHA256 Fingerprint: 6e:a5:47:41:d0:04:66:7e:ed:1b:48:16:63:4a:a3:a7:9e:6e:4b:96:95:0f:82:79:da:fc:8d:9b:d8:81:21:37
+-----BEGIN CERTIFICATE-----
+MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCB
+lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt
+SGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgxOTIyWjCBlzELMAkG
+A1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEe
+MBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8v
+d3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdh
+cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn
+0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlIwrthdBKWHTxqctU8EGc6Oe0rE81m65UJ
+M6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFdtqdt++BxF2uiiPsA3/4a
+MXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8i4fDidNd
+oI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqI
+DsjfPe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9Ksy
+oUhbAgMBAAGjgbkwgbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFKFyXyYbKJhDlV0HN9WFlp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0
+dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LUhhcmR3YXJlLmNy
+bDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUFBwMGBggrBgEF
+BQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
+//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28Gpgoiskli
+CE7/yMgUsogWXecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gE
+CJChicsZUN/KHAG8HQQZexB2lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t
+3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kniCrVWFCVH/A7HFe7fRQ5YiuayZSS
+KqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67nfhmqA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Chambers of Commerce Root O=AC Camerfirma SA CIF A82743287 OU=http://www.chambersign.org
+# Subject: CN=Chambers of Commerce Root O=AC Camerfirma SA CIF A82743287 OU=http://www.chambersign.org
+# Label: "Camerfirma Chambers of Commerce Root"
+# Serial: 0
+# MD5 Fingerprint: b0:01:ee:14:d9:af:29:18:94:76:8e:f1:69:33:2a:84
+# SHA1 Fingerprint: 6e:3a:55:a4:19:0c:19:5c:93:84:3c:c0:db:72:2e:31:30:61:f0:b1
+# SHA256 Fingerprint: 0c:25:8a:12:a5:67:4a:ef:25:f2:8b:a7:dc:fa:ec:ee:a3:48:e5:41:e6:f5:cc:4e:e6:3b:71:b3:61:60:6a:c3
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEn
+MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
+ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMg
+b2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAxNjEzNDNaFw0zNzA5MzAxNjEzNDRa
+MH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZpcm1hIFNBIENJRiBB
+ODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3JnMSIw
+IAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0B
+AQEFAAOCAQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtb
+unXF/KGIJPov7coISjlUxFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0d
+BmpAPrMMhe5cG3nCYsS4No41XQEMIwRHNaqbYE6gZj3LJgqcQKH0XZi/caulAGgq
+7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jWDA+wWFjbw2Y3npuRVDM3
+0pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFVd9oKDMyX
+roDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIG
+A1UdEwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5j
+aGFtYmVyc2lnbi5vcmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p
+26EpW1eLTXYGduHRooowDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIA
+BzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hhbWJlcnNpZ24ub3JnMCcGA1Ud
+EgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYDVR0gBFEwTzBN
+BgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
+aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEB
+AAxBl8IahsAifJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZd
+p0AJPaxJRUXcLo0waLIJuvvDL8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi
+1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wNUPf6s+xCX6ndbcj0dc97wXImsQEc
+XCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/nADydb47kMgkdTXg0
+eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1erfu
+tGWaIZDgqtCYvDi1czyL+Nw=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Global Chambersign Root O=AC Camerfirma SA CIF A82743287 OU=http://www.chambersign.org
+# Subject: CN=Global Chambersign Root O=AC Camerfirma SA CIF A82743287 OU=http://www.chambersign.org
+# Label: "Camerfirma Global Chambersign Root"
+# Serial: 0
+# MD5 Fingerprint: c5:e6:7b:bf:06:d0:4f:43:ed:c4:7a:65:8a:fb:6b:19
+# SHA1 Fingerprint: 33:9b:6b:14:50:24:9b:55:7a:01:87:72:84:d9:e0:2f:c3:d2:d8:e9
+# SHA256 Fingerprint: ef:3c:b4:17:fc:8e:bf:6f:97:87:6c:9e:4e:ce:39:de:1e:a5:fe:64:91:41:d1:02:8b:7d:11:c0:b2:29:8c:ed
+-----BEGIN CERTIFICATE-----
+MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEn
+MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
+ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENo
+YW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYxNDE4WhcNMzcwOTMwMTYxNDE4WjB9
+MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgy
+NzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4G
+A1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUA
+A4IBDQAwggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0
+Mi+ITaFgCPS3CU6gSS9J1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/s
+QJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8Oby4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpV
+eAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl6DJWk0aJqCWKZQbua795
+B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c8lCrEqWh
+z0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0T
+AQH/BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1i
+ZXJzaWduLm9yZy9jaGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4w
+TcbOX60Qq+UDpfqpFDAOBgNVHQ8BAf8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAH
+MCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBjaGFtYmVyc2lnbi5vcmcwKgYD
+VR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9yZzBbBgNVHSAE
+VDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh
+bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0B
+AQUFAAOCAQEAPDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUM
+bKGKfKX0j//U2K0X1S0E0T9YgOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXi
+ryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJPJ7oKXqJ1/6v/2j1pReQvayZzKWG
+VwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4IBHNfTIzSJRUTN3c
+ecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREest2d/
+AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
+-----END CERTIFICATE-----
+
+# Issuer: CN=NetLock Kozjegyzoi (Class A) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Subject: CN=NetLock Kozjegyzoi (Class A) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Label: "NetLock Notary (Class A) Root"
+# Serial: 259
+# MD5 Fingerprint: 86:38:6d:5e:49:63:6c:85:5c:db:6d:dc:94:b7:d0:f7
+# SHA1 Fingerprint: ac:ed:5f:65:53:fd:25:ce:01:5f:1f:7a:48:3b:6a:74:9f:61:78:c6
+# SHA256 Fingerprint: 7f:12:cd:5f:7e:5e:29:0e:c7:d8:51:79:d5:b7:2c:20:a5:be:75:08:ff:db:5b:f8:1a:b9:68:4a:7f:c9:f6:67
+-----BEGIN CERTIFICATE-----
+MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhV
+MRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMe
+TmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0
+dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFzcyBB
+KSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oXDTE5MDIxOTIzMTQ0
+N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhC
+dWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQu
+MRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBL
+b3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSMD7tM9DceqQWC2ObhbHDqeLVu0ThEDaiD
+zl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZz+qMkjvN9wfcZnSX9EUi
+3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC/tmwqcm8
+WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LY
+Oph7tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2Esi
+NCubMvJIH5+hCoR64sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCC
+ApswDgYDVR0PAQH/BAQDAgAGMBIGA1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4
+QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZRUxFTSEgRXplbiB0
+YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRhdGFz
+aSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu
+IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtm
+ZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMg
+ZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVs
+amFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJhc2EgbWVndGFsYWxoYXRv
+IGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBzOi8vd3d3
+Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6
+ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1
+YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3Qg
+dG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRs
+b2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNAbmV0bG9jay5uZXQuMA0G
+CSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5ayZrU3/b39/zcT0mwBQO
+xmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjPytoUMaFP
+0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQ
+QeJBCWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxk
+f1qbFFgBJ34TUMdrKuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK
+8CtmdWOMovsEPoMOmzbwGOQmIMOM8CgHrTwXZoi1/baI
+-----END CERTIFICATE-----
+
+# Issuer: CN=NetLock Uzleti (Class B) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Subject: CN=NetLock Uzleti (Class B) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Label: "NetLock Business (Class B) Root"
+# Serial: 105
+# MD5 Fingerprint: 39:16:aa:b9:6a:41:e1:14:69:df:9e:6c:3b:72:dc:b6
+# SHA1 Fingerprint: 87:9f:4b:ee:05:df:98:58:3b:e3:60:d6:33:e7:0d:3f:fe:98:71:af
+# SHA256 Fingerprint: 39:df:7b:68:2b:7b:93:8f:84:71:54:81:cc:de:8d:60:d8:f2:2e:c5:98:87:7d:0a:aa:c1:2b:59:18:2b:03:12
+-----BEGIN CERTIFICATE-----
+MIIFSzCCBLSgAwIBAgIBaTANBgkqhkiG9w0BAQQFADCBmTELMAkGA1UEBhMCSFUx
+ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0
+b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTIwMAYDVQQD
+EylOZXRMb2NrIFV6bGV0aSAoQ2xhc3MgQikgVGFudXNpdHZhbnlraWFkbzAeFw05
+OTAyMjUxNDEwMjJaFw0xOTAyMjAxNDEwMjJaMIGZMQswCQYDVQQGEwJIVTERMA8G
+A1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNh
+Z2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxMjAwBgNVBAMTKU5l
+dExvY2sgVXpsZXRpIChDbGFzcyBCKSBUYW51c2l0dmFueWtpYWRvMIGfMA0GCSqG
+SIb3DQEBAQUAA4GNADCBiQKBgQCx6gTsIKAjwo84YM/HRrPVG/77uZmeBNwcf4xK
+gZjupNTKihe5In+DCnVMm8Bp2GQ5o+2So/1bXHQawEfKOml2mrriRBf8TKPV/riX
+iK+IA4kfpPIEPsgHC+b5sy96YhQJRhTKZPWLgLViqNhr1nGTLbO/CVRY7QbrqHvc
+Q7GhaQIDAQABo4ICnzCCApswEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8E
+BAMCAAYwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1G
+SUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFu
+b3MgU3pvbGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBh
+bGFwamFuIGtlc3p1bHQuIEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExv
+Y2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGln
+aXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0
+IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJh
+c2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGph
+biBhIGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJo
+ZXRvIGF6IGVsbGVub3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBP
+UlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmlj
+YXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBo
+dHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNA
+bmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4GBAATbrowXr/gOkDFOzT4JwG06
+sPgzTEdM43WIEJessDgVkcYplswhwG08pXTP2IKlOcNl40JwuyKQ433bNXbhoLXa
+n3BukxowOR0w2y7jfLKRstE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKS
+NitjrFgBazMpUIaD8QFI
+-----END CERTIFICATE-----
+
+# Issuer: CN=NetLock Expressz (Class C) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Subject: CN=NetLock Expressz (Class C) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Label: "NetLock Express (Class C) Root"
+# Serial: 104
+# MD5 Fingerprint: 4f:eb:f1:f0:70:c2:80:63:5d:58:9f:da:12:3c:a9:c4
+# SHA1 Fingerprint: e3:92:51:2f:0a:cf:f5:05:df:f6:de:06:7f:75:37:e1:65:ea:57:4b
+# SHA256 Fingerprint: 0b:5e:ed:4e:84:64:03:cf:55:e0:65:84:84:40:ed:2a:82:75:8b:f5:b9:aa:1f:25:3d:46:13:cf:a0:80:ff:3f
+-----BEGIN CERTIFICATE-----
+MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUx
+ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0
+b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQD
+EytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBDKSBUYW51c2l0dmFueWtpYWRvMB4X
+DTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJBgNVBAYTAkhVMREw
+DwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9u
+c2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMr
+TmV0TG9jayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzAN
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNA
+OoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3ZW3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC
+2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63euyucYT2BDMIJTLrdKwW
+RMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQwDgYDVR0P
+AQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEW
+ggJNRklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0
+YWxhbm9zIFN6b2xnYWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFz
+b2sgYWxhcGphbiBrZXN6dWx0LiBBIGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBO
+ZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1iaXp0b3NpdGFzYSB2ZWRpLiBB
+IGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0ZWxlIGF6IGVs
+b2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBs
+ZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25s
+YXBqYW4gYSBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kg
+a2VyaGV0byBheiBlbGxlbm9yemVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4g
+SU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5kIHRoZSB1c2Ugb2YgdGhpcyBjZXJ0
+aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQUyBhdmFpbGFibGUg
+YXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwgYXQg
+Y3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmY
+ta3UzbM2xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2g
+pO0u9f38vf5NNwgMvOOWgyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4
+Fp1hBWeAyNDYpQcCNJgEjTME1A==
+-----END CERTIFICATE-----
+
+# Issuer: CN=XRamp Global Certification Authority O=XRamp Security Services Inc OU=www.xrampsecurity.com
+# Subject: CN=XRamp Global Certification Authority O=XRamp Security Services Inc OU=www.xrampsecurity.com
+# Label: "XRamp Global CA Root"
+# Serial: 107108908803651509692980124233745014957
+# MD5 Fingerprint: a1:0b:44:b3:ca:10:d8:00:6e:9d:0f:d8:0f:92:0a:d1
+# SHA1 Fingerprint: b8:01:86:d1:eb:9c:86:a5:41:04:cf:30:54:f3:4c:52:b7:e5:58:c6
+# SHA256 Fingerprint: ce:cd:dc:90:50:99:d8:da:df:c5:b1:d2:09:b7:37:cb:e2:c1:8c:fb:2c:10:c0:ff:0b:cf:0d:32:86:fc:1a:a2
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB
+gjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEk
+MCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRY
+UmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcx
+NDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3
+dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2Vy
+dmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS6
+38eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCP
+KZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7Q
+DxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4
+qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRa
+JSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNVi
+PvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0P
+BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASs
+jVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0
+eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQAD
+ggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfAR
+vbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
+qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLa
+IR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSy
+i6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQ
+O+7ETPTsJ3xCwnR8gooJybQDJbw=
+-----END CERTIFICATE-----
+
+# Issuer: O=The Go Daddy Group, Inc. OU=Go Daddy Class 2 Certification Authority
+# Subject: O=The Go Daddy Group, Inc. OU=Go Daddy Class 2 Certification Authority
+# Label: "Go Daddy Class 2 CA"
+# Serial: 0
+# MD5 Fingerprint: 91:de:06:25:ab:da:fd:32:17:0c:bb:25:17:2a:84:67
+# SHA1 Fingerprint: 27:96:ba:e6:3f:18:01:e2:77:26:1b:a0:d7:77:70:02:8f:20:ee:e4
+# SHA256 Fingerprint: c3:84:6b:f2:4b:9e:93:ca:64:27:4c:0e:c6:7c:1e:cc:5e:02:4f:fc:ac:d2:d7:40:19:35:0e:81:fe:54:6a:e4
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh
+MB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBE
+YWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3
+MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRo
+ZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3Mg
+MiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN
+ADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCA
+PVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6w
+wdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXi
+EqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMY
+avx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+
+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLE
+sNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h
+/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5
+IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNy
+OO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7P
+TMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
+HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mER
+dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf
+ReYNnyicsbkqWletNw+vHX/bvZ8=
+-----END CERTIFICATE-----
+
+# Issuer: O=Starfield Technologies, Inc. OU=Starfield Class 2 Certification Authority
+# Subject: O=Starfield Technologies, Inc. OU=Starfield Class 2 Certification Authority
+# Label: "Starfield Class 2 CA"
+# Serial: 0
+# MD5 Fingerprint: 32:4a:4b:bb:c8:63:69:9b:be:74:9a:c6:dd:1d:46:24
+# SHA1 Fingerprint: ad:7e:1c:28:b0:64:ef:8f:60:03:40:20:14:c3:d0:e3:37:0e:b5:8a
+# SHA256 Fingerprint: 14:65:fa:20:53:97:b8:76:fa:a6:f0:a9:95:8e:55:90:e4:0f:cc:7f:aa:4f:b7:c2:c8:67:75:21:fb:5f:b6:58
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzEl
+MCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMp
+U3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQw
+NjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBoMQswCQYDVQQGEwJVUzElMCMGA1UE
+ChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZp
+ZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqGSIb3
+DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf
+8MOh2tTYbitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN
++lq2cwQlZut3f+dZxkqZJRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0
+X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVmepsZGD3/cVE8MC5fvj13c7JdBmzDI1aa
+K4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSNF4Azbl5KXZnJHoe0nRrA
+1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HFMIHCMB0G
+A1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fR
+zt0fhvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0
+YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBD
+bGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGsafPzWdqbAYcaT1epoXkJKtv3
+L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLMPUxA2IGvd56D
+eruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
+xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynp
+VSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEY
+WQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q=
+-----END CERTIFICATE-----
+
+# Issuer: CN=StartCom Certification Authority O=StartCom Ltd. OU=Secure Digital Certificate Signing
+# Subject: CN=StartCom Certification Authority O=StartCom Ltd. OU=Secure Digital Certificate Signing
+# Label: "StartCom Certification Authority"
+# Serial: 1
+# MD5 Fingerprint: 22:4d:8f:8a:fc:f7:35:c2:bb:57:34:90:7b:8b:22:16
+# SHA1 Fingerprint: 3e:2b:f7:f2:03:1b:96:f3:8c:e6:c4:d8:a8:5d:3e:2d:58:47:6a:0f
+# SHA256 Fingerprint: c7:66:a9:be:f2:d4:07:1c:86:3a:31:aa:49:20:e8:13:b2:d1:98:60:8c:b7:b7:cf:e2:11:43:b8:36:df:09:ea
+-----BEGIN CERTIFICATE-----
+MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
+Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9
+MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
+U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
+cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
+pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
+OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
+Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
+Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
+HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
+Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
++2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
+Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
+26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
+AQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
+FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9j
+ZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3Js
+LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFM
+BgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0
+Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFy
+dGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3Rh
+cnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlh
+YmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2Yg
+dGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFp
+bGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJ
+YIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNT
+TCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ
+9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8
+jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUW
+FjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJz
+ewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1
+ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5L
+EUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYu
+L6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
+yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuC
+O3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6V
+um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh
+NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14=
+-----END CERTIFICATE-----
+
+# Issuer: O=Government Root Certification Authority
+# Subject: O=Government Root Certification Authority
+# Label: "Taiwan GRCA"
+# Serial: 42023070807708724159991140556527066870
+# MD5 Fingerprint: 37:85:44:53:32:45:1f:20:f0:f3:95:e1:25:c4:43:4e
+# SHA1 Fingerprint: f4:8b:11:bf:de:ab:be:94:54:20:71:e6:41:de:6b:be:88:2b:40:b9
+# SHA256 Fingerprint: 76:00:29:5e:ef:e8:5b:9e:1f:d6:24:db:76:06:2a:aa:ae:59:81:8a:54:d2:77:4c:d4:c0:b2:c0:11:31:e1:b3
+-----BEGIN CERTIFICATE-----
+MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/
+MQswCQYDVQQGEwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5MB4XDTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1ow
+PzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dvdmVybm1lbnQgUm9vdCBDZXJ0aWZp
+Y2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+AJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qNw8XR
+IePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1q
+gQdW8or5BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKy
+yhwOeYHWtXBiCAEuTk8O1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAts
+F/tnyMKtsc2AtJfcdgEWFelq16TheEfOhtX7MfP6Mb40qij7cEwdScevLJ1tZqa2
+jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wovJ5pGfaENda1UhhXcSTvx
+ls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7Q3hub/FC
+VGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHK
+YS1tB6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoH
+EgKXTiCQ8P8NHuJBO9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThN
+Xo+EHWbNxWCWtFJaBYmOlXqYwZE8lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1Ud
+DgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNVHRMEBTADAQH/MDkGBGcqBwAE
+MTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg209yewDL7MTqK
+UWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
+TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyf
+qzvS/3WXy6TjZwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaK
+ZEk9GhiHkASfQlK3T8v+R0F2Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFE
+JPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlUD7gsL0u8qV1bYH+Mh6XgUmMqvtg7
+hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6QzDxARvBMB1uUO07+1
+EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+HbkZ6Mm
+nD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WX
+udpVBrkk7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44Vbnz
+ssQwmSNOXfJIoRIM3BKQCZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDe
+LMDDav7v3Aun+kbfYNucpllQdSNpc5Oy+fwC00fmcc4QAu4njIT/rEUNE1yDMuAl
+pYYsfPQS
+-----END CERTIFICATE-----
+
+# Issuer: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
+# Subject: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
+# Label: "Firmaprofesional Root CA"
+# Serial: 1
+# MD5 Fingerprint: 11:92:79:40:3c:b1:83:40:e5:ab:66:4a:67:92:80:df
+# SHA1 Fingerprint: a9:62:8f:4b:98:a9:1b:48:35:ba:d2:c1:46:32:86:bb:66:64:6a:8c
+# SHA256 Fingerprint: c1:cf:0b:52:09:64:35:e3:f1:b7:1d:aa:ec:45:5a:23:11:c8:40:4f:55:83:a9:e2:13:c6:9d:85:7d:94:33:05
+-----BEGIN CERTIFICATE-----
+MIIEVzCCAz+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCRVMx
+IjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1
+dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20w
+HhcNMDExMDI0MjIwMDAwWhcNMTMxMDI0MjIwMDAwWjCBnTELMAkGA1UEBhMCRVMx
+IjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1
+dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20w
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnIwNvbyOlXnjOlSztlB5u
+Cp4Bx+ow0Syd3Tfom5h5VtP8c9/Qit5Vj1H5WuretXDE7aTt/6MNbg9kUDGvASdY
+rv5sp0ovFy3Tc9UTHI9ZpTQsHVQERc1ouKDAA6XPhUJHlShbz++AbOCQl4oBPB3z
+hxAwJkh91/zpnZFx/0GaqUC1N5wpIE8fUuOgfRNtVLcK3ulqTgesrBlf3H5idPay
+BQC6haD9HThuy1q7hryUZzM1gywfI834yJFxzJeL764P3CkDG8A563DtwW4O2GcL
+iam8NeTvtjS0pbbELaW+0MOUJEjb35bTALVmGotmBQ/dPz/LP6pemkr4tErvlTcb
+AgMBAAGjgZ8wgZwwKgYDVR0RBCMwIYYfaHR0cDovL3d3dy5maXJtYXByb2Zlc2lv
+bmFsLmNvbTASBgNVHRMBAf8ECDAGAQH/AgEBMCsGA1UdEAQkMCKADzIwMDExMDI0
+MjIwMDAwWoEPMjAxMzEwMjQyMjAwMDBaMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
+FgQUMwugZtHq2s7eYpMEKFK1FH84aLcwDQYJKoZIhvcNAQEFBQADggEBAEdz/o0n
+VPD11HecJ3lXV7cVVuzH2Fi3AQL0M+2TUIiefEaxvT8Ub/GzR0iLjJcG1+p+o1wq
+u00vR+L4OQbJnC4xGgN49Lw4xiKLMzHwFgQEffl25EvXwOaD7FnMP97/T2u3Z36m
+hoEyIwOdyPdfwUpgpZKpsaSgYMN4h7Mi8yrrW6ntBas3D7Hi05V2Y1Z0jFhyGzfl
+ZKG+TQyTmAyX9odtsz/ny4Cm7YjHX1BiAuiZdBbQ5rQ58SfLyEDW44YQqSMSkuBp
+QWOnryULwMWSyx6Yo1q6xTMPoJcB3X/ge9YGVM+h4k0460tQtcsm9MracEpqoeJ5
+quGnM/b9Sh/22WA=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Swisscom Root CA 1 O=Swisscom OU=Digital Certificate Services
+# Subject: CN=Swisscom Root CA 1 O=Swisscom OU=Digital Certificate Services
+# Label: "Swisscom Root CA 1"
+# Serial: 122348795730808398873664200247279986742
+# MD5 Fingerprint: f8:38:7c:77:88:df:2c:16:68:2e:c2:e2:52:4b:b8:f9
+# SHA1 Fingerprint: 5f:3a:fc:0a:8b:64:f6:86:67:34:74:df:7e:a9:a2:fe:f9:fa:7a:51
+# SHA256 Fingerprint: 21:db:20:12:36:60:bb:2e:d4:18:20:5d:a1:1e:e7:a8:5a:65:e2:bc:6e:55:b5:af:7e:78:99:c8:a2:66:d9:2e
+-----BEGIN CERTIFICATE-----
+MIIF2TCCA8GgAwIBAgIQXAuFXAvnWUHfV8w/f52oNjANBgkqhkiG9w0BAQUFADBk
+MQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3Qg
+Q0EgMTAeFw0wNTA4MTgxMjA2MjBaFw0yNTA4MTgyMjA2MjBaMGQxCzAJBgNVBAYT
+AmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGlnaXRhbCBDZXJ0aWZp
+Y2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAxMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0LmwqAzZuz8h+BvVM5OAFmUgdbI9
+m2BtRsiMMW8Xw/qabFbtPMWRV8PNq5ZJkCoZSx6jbVfd8StiKHVFXqrWW/oLJdih
+FvkcxC7mlSpnzNApbjyFNDhhSbEAn9Y6cV9Nbc5fuankiX9qUvrKm/LcqfmdmUc/
+TilftKaNXXsLmREDA/7n29uj/x2lzZAeAR81sH8A25Bvxn570e56eqeqDFdvpG3F
+EzuwpdntMhy0XmeLVNxzh+XTF3xmUHJd1BpYwdnP2IkCb6dJtDZd0KTeByy2dbco
+kdaXvij1mB7qWybJvbCXc9qukSbraMH5ORXWZ0sKbU/Lz7DkQnGMU3nn7uHbHaBu
+HYwadzVcFh4rUx80i9Fs/PJnB3r1re3WmquhsUvhzDdf/X/NTa64H5xD+SpYVUNF
+vJbNcA78yeNmuk6NO4HLFWR7uZToXTNShXEuT46iBhFRyePLoW4xCGQMwtI89Tbo
+19AOeCMgkckkKmUpWyL3Ic6DXqTz3kvTaI9GdVyDCW4pa8RwjPWd1yAv/0bSKzjC
+L3UcPX7ape8eYIVpQtPM+GP+HkM5haa2Y0EQs3MevNP6yn0WR+Kn1dCjigoIlmJW
+bjTb2QK5MHXjBNLnj8KwEUAKrNVxAmKLMb7dxiNYMUJDLXT5xp6mig/p/r+D5kNX
+JLrvRjSq1xIBOO0CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0hBBYw
+FDASBgdghXQBUwABBgdghXQBUwABMBIGA1UdEwEB/wQIMAYBAf8CAQcwHwYDVR0j
+BBgwFoAUAyUv3m+CATpcLNwroWm1Z9SM0/0wHQYDVR0OBBYEFAMlL95vggE6XCzc
+K6FptWfUjNP9MA0GCSqGSIb3DQEBBQUAA4ICAQA1EMvspgQNDQ/NwNurqPKIlwzf
+ky9NfEBWMXrrpA9gzXrzvsMnjgM+pN0S734edAY8PzHyHHuRMSG08NBsl9Tpl7Ik
+Vh5WwzW9iAUPWxAaZOHHgjD5Mq2eUCzneAXQMbFamIp1TpBcahQq4FJHgmDmHtqB
+sfsUC1rxn9KVuj7QG9YVHaO+htXbD8BJZLsuUBlL0iT43R4HVtA4oJVwIHaM190e
+3p9xxCPvgxNcoyQVTSlAPGrEqdi3pkSlDfTgnXceQHAm/NrZNuR55LU/vJtlvrsR
+ls/bxig5OgjOR1tTWsWZ/l2p3e9M1MalrQLmjAcSHm8D0W+go/MpvRLHUKKwf4ip
+mXeascClOS5cfGniLLDqN2qk4Vrh9VDlg++luyqI54zb/W1elxmofmZ1a3Hqv7HH
+b6D0jqTsNFFbjCYDcKF31QESVwA12yPeDooomf2xEG9L/zgtYE4snOtnta1J7ksf
+rK/7DZBaZmBwXarNeNQk7shBoJMBkpxqnvy5JMWzFYJ+vq6VK+uxwNrjAWALXmms
+hFZhvnEX/h0TD/7Gh0Xp/jKgGg0TpJRVcaUWi7rKibCyx/yP2FS1k2Kdzs9Z+z0Y
+zirLNRWCXf9UIltxUvu3yf5gmwBBZPCqKuy2QkPOiWaByIufOVQDJdMWNY6E0F/6
+MBr1mmz0DlP5OlvRHA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=DigiCert Assured ID Root CA O=DigiCert Inc OU=www.digicert.com
+# Subject: CN=DigiCert Assured ID Root CA O=DigiCert Inc OU=www.digicert.com
+# Label: "DigiCert Assured ID Root CA"
+# Serial: 17154717934120587862167794914071425081
+# MD5 Fingerprint: 87:ce:0b:7b:2a:0e:49:00:e1:58:71:9b:37:a8:93:72
+# SHA1 Fingerprint: 05:63:b8:63:0d:62:d7:5a:bb:c8:ab:1e:4b:df:b5:a8:99:b2:4d:43
+# SHA256 Fingerprint: 3e:90:99:b5:01:5e:8f:48:6c:00:bc:ea:9d:11:1e:e7:21:fa:ba:35:5a:89:bc:f1:df:69:56:1e:3d:c6:32:5c
+-----BEGIN CERTIFICATE-----
+MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBl
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv
+b3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzExMTEwMDAwMDAwWjBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl
+cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7c
+JpSIqvTO9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYP
+mDI2dsze3Tyoou9q+yHyUmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+
+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4
+VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpyoeb6pNnVFzF1roV9Iq4/
+AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whfGHdPAgMB
+AAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW
+BBRF66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYun
+pyGd823IDzANBgkqhkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRC
+dWKuh+vy1dneVrOfzM4UKLkNl2BcEkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTf
+fwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38FnSbNd67IJKusm7Xi+fT8r87cm
+NW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i8b5QZ7dsvfPx
+H2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
+-----END CERTIFICATE-----
+
+# Issuer: CN=DigiCert Global Root CA O=DigiCert Inc OU=www.digicert.com
+# Subject: CN=DigiCert Global Root CA O=DigiCert Inc OU=www.digicert.com
+# Label: "DigiCert Global Root CA"
+# Serial: 10944719598952040374951832963794454346
+# MD5 Fingerprint: 79:e4:a9:84:0d:7d:3a:96:d7:c0:4f:e2:43:4c:89:2e
+# SHA1 Fingerprint: a8:98:5d:3a:65:e5:e5:c4:b2:d7:d6:6d:40:c6:dd:2f:b1:9c:54:36
+# SHA256 Fingerprint: 43:48:a0:e9:44:4c:78:cb:26:5e:05:8d:5e:89:44:b4:d8:4f:96:62:bd:26:db:25:7f:89:34:a4:43:c7:01:61
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
+QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT
+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
+b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB
+CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97
+nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt
+43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P
+T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4
+gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO
+BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR
+TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw
+DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr
+hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg
+06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF
+PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls
+YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
+CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
+-----END CERTIFICATE-----
+
+# Issuer: CN=DigiCert High Assurance EV Root CA O=DigiCert Inc OU=www.digicert.com
+# Subject: CN=DigiCert High Assurance EV Root CA O=DigiCert Inc OU=www.digicert.com
+# Label: "DigiCert High Assurance EV Root CA"
+# Serial: 3553400076410547919724730734378100087
+# MD5 Fingerprint: d4:74:de:57:5c:39:b2:d3:9c:85:83:c5:c0:65:49:8a
+# SHA1 Fingerprint: 5f:b7:ee:06:33:e2:59:db:ad:0c:4c:9a:e6:d3:8f:1a:61:c7:dc:25
+# SHA256 Fingerprint: 74:31:e5:f4:c3:c1:ce:46:90:77:4f:0b:61:e0:54:40:88:3b:a9:a0:1e:d0:0b:a6:ab:d7:80:6e:d3:b1:18:cf
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
+ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL
+MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3
+LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug
+RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm
++9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW
+PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM
+xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB
+Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3
+hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg
+EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF
+MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA
+FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec
+nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z
+eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF
+hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2
+Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
+vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep
++OkuE6N36B9K
+-----END CERTIFICATE-----
+
+# Issuer: CN=Class 2 Primary CA O=Certplus
+# Subject: CN=Class 2 Primary CA O=Certplus
+# Label: "Certplus Class 2 Primary CA"
+# Serial: 177770208045934040241468760488327595043
+# MD5 Fingerprint: 88:2c:8c:52:b8:a2:3c:f3:f7:bb:03:ea:ae:ac:42:0b
+# SHA1 Fingerprint: 74:20:74:41:72:9c:dd:92:ec:79:31:d8:23:10:8d:c2:81:92:e2:bb
+# SHA256 Fingerprint: 0f:99:3c:8a:ef:97:ba:af:56:87:14:0e:d5:9a:d1:82:1b:b4:af:ac:f0:aa:9a:58:b5:d5:7a:33:8a:3a:fb:cb
+-----BEGIN CERTIFICATE-----
+MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAw
+PTELMAkGA1UEBhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFz
+cyAyIFByaW1hcnkgQ0EwHhcNOTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9
+MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2VydHBsdXMxGzAZBgNVBAMTEkNsYXNz
+IDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxQ
+ltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR5aiR
+VhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyL
+kcAbmXuZVg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCd
+EgETjdyAYveVqUSISnFOYFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yas
+H7WLO7dDWWuwJKZtkIvEcupdM5i3y95ee++U8Rs+yskhwcWYAqqi9lt3m/V+llU0
+HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRMECDAGAQH/AgEKMAsGA1Ud
+DwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJYIZIAYb4
+QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMu
+Y29tL0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/
+AN9WM2K191EBkOvDP9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8
+yfFC82x/xXp8HVGIutIKPidd3i1RTtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMR
+FcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+7UCmnYR0ObncHoUW2ikbhiMA
+ybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW//1IMwrh3KWB
+kJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
+l7+ijrRU
+-----END CERTIFICATE-----
+
+# Issuer: CN=DST Root CA X3 O=Digital Signature Trust Co.
+# Subject: CN=DST Root CA X3 O=Digital Signature Trust Co.
+# Label: "DST Root CA X3"
+# Serial: 91299735575339953335919266965803778155
+# MD5 Fingerprint: 41:03:52:dc:0f:f7:50:1b:16:f0:02:8e:ba:6f:45:c5
+# SHA1 Fingerprint: da:c9:02:4f:54:d8:f6:df:94:93:5f:b1:73:26:38:ca:6a:d7:7c:13
+# SHA256 Fingerprint: 06:87:26:03:31:a7:24:03:d9:09:f1:05:e6:9b:cf:0d:32:e1:bd:24:93:ff:c6:d9:20:6d:11:bc:d6:77:07:39
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
+PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
+Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
+rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
+OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
+xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
+7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
+aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
+SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
+ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
+AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
+R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
+JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
+Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
+
+# Issuer: CN=DST ACES CA X6 O=Digital Signature Trust OU=DST ACES
+# Subject: CN=DST ACES CA X6 O=Digital Signature Trust OU=DST ACES
+# Label: "DST ACES CA X6"
+# Serial: 17771143917277623872238992636097467865
+# MD5 Fingerprint: 21:d8:4c:82:2b:99:09:33:a2:eb:14:24:8d:8e:5f:e8
+# SHA1 Fingerprint: 40:54:da:6f:1c:3f:40:74:ac:ed:0f:ec:cd:db:79:d1:53:fb:90:1d
+# SHA256 Fingerprint: 76:7c:95:5a:76:41:2c:89:af:68:8e:90:a1:c7:0f:55:6c:fd:6b:60:25:db:ea:10:41:6d:7e:b6:83:1f:8c:40
+-----BEGIN CERTIFICATE-----
+MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBb
+MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3Qx
+ETAPBgNVBAsTCERTVCBBQ0VTMRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0w
+MzExMjAyMTE5NThaFw0xNzExMjAyMTE5NThaMFsxCzAJBgNVBAYTAlVTMSAwHgYD
+VQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UECxMIRFNUIEFDRVMx
+FzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPu
+ktKe1jzIDZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7
+gLFViYsx+tC3dr5BPTCapCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZH
+fAjIgrrep4c9oW24MFbCswKBXy314powGCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4a
+ahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPyMjwmR/onJALJfh1biEIT
+ajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1UdEwEB/wQF
+MAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rk
+c3QuY29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjto
+dHRwOi8vd3d3LnRydXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMt
+aW5kZXguaHRtbDAdBgNVHQ4EFgQUCXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZI
+hvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V25FYrnJmQ6AgwbN99Pe7lv7Uk
+QIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6tFr8hlxCBPeP/
+h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq
+nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpR
+rscL9yuwNwXsvFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf2
+9w4LTJxoeHtxMcfrHuBnQfO3oKfN5XozNmr6mis=
+-----END CERTIFICATE-----
+
+# Issuer: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=(c) 2005 TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş.
+# Subject: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=(c) 2005 TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş.
+# Label: "TURKTRUST Certificate Services Provider Root 1"
+# Serial: 1
+# MD5 Fingerprint: f1:6a:22:18:c9:cd:df:ce:82:1d:1d:b7:78:5c:a9:a5
+# SHA1 Fingerprint: 79:98:a3:08:e1:4d:65:85:e6:c2:1e:15:3a:71:9f:ba:5a:d3:4a:d9
+# SHA256 Fingerprint: 44:04:e3:3b:5e:14:0d:cf:99:80:51:fd:fc:80:28:c7:c8:16:15:c5:ee:73:7b:11:1b:58:82:33:a9:b5:35:a0
+-----BEGIN CERTIFICATE-----
+MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOc
+UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
+c8SxMQswCQYDVQQGDAJUUjEPMA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykg
+MjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8
+dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMxMDI3MTdaFw0xNTAz
+MjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsgU2Vy
+dGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYD
+VQQHDAZBTktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kg
+xLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEu
+xZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7
+XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GXyGl8hMW0kWxsE2qkVa2k
+heiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8iSi9BB35J
+YbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5C
+urKZ8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1
+JuTm5Rh8i27fbMx4W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51
+b0dewQIDAQABoxAwDjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV
+9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46sWrv7/hg0Uw2ZkUd82YCdAR7
+kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxEq8Sn5RTOPEFh
+fEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy
+B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdA
+aLX/7KfS0zgYnNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKS
+RGQDJereW26fyfJOrN3H
+-----END CERTIFICATE-----
+
+# Issuer: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş. (c) Kasım 2005
+# Subject: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş. (c) Kasım 2005
+# Label: "TURKTRUST Certificate Services Provider Root 2"
+# Serial: 1
+# MD5 Fingerprint: 37:a5:6e:d4:b1:25:84:97:b7:fd:56:15:7a:f9:a2:00
+# SHA1 Fingerprint: b4:35:d4:e1:11:9d:1c:66:90:a7:49:eb:b3:94:bd:63:7b:a7:82:b7
+# SHA256 Fingerprint: c4:70:cf:54:7e:23:02:b9:77:fb:29:dd:71:a8:9a:7b:6c:1f:60:77:7b:03:29:f5:60:17:f3:28:bf:4f:6b:e6
+-----BEGIN CERTIFICATE-----
+MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOc
+UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
+c8SxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xS
+S1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kg
+SGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcNMDUxMTA3MTAwNzU3
+WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBFbGVrdHJv
+bmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJU
+UjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSw
+bGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWe
+LiAoYykgS2FzxLFtIDIwMDUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqeLCDe2JAOCtFp0if7qnef
+J1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKIx+XlZEdh
+R3n9wFHxwZnn3M5q+6+1ATDcRhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJ
+Qv2gQrSdiVFVKc8bcLyEVK3BEx+Y9C52YItdP5qtygy/p1Zbj3e41Z55SZI/4PGX
+JHpsmxcPbe9TmJEr5A++WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1p
+zpwACPI2/z7woQ8arBT9pmAPAgMBAAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58S
+Fq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
+KoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/nttRbj2hWyfIvwq
+ECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4
+Jl3vpao6+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFz
+gw2lGh1uEpJ+hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotH
+uFEJjOp9zYhys2AzsfAKRO8P9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LS
+y3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9Rnuk5UrbnBEI=
+-----END CERTIFICATE-----
+
+# Issuer: CN=SwissSign Gold CA - G2 O=SwissSign AG
+# Subject: CN=SwissSign Gold CA - G2 O=SwissSign AG
+# Label: "SwissSign Gold CA - G2"
+# Serial: 13492815561806991280
+# MD5 Fingerprint: 24:77:d9:a8:91:d1:3b:fa:88:2d:c2:ff:f8:cd:33:93
+# SHA1 Fingerprint: d8:c5:38:8a:b7:30:1b:1b:6e:d4:7a:e6:45:25:3a:6f:9f:1a:27:61
+# SHA256 Fingerprint: 62:dd:0b:e9:b9:f5:0a:16:3e:a0:f8:e7:5c:05:3b:1e:ca:57:ea:55:c8:68:8f:64:7c:68:81:f2:c8:35:7b:95
+-----BEGIN CERTIFICATE-----
+MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV
+BAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2ln
+biBHb2xkIENBIC0gRzIwHhcNMDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBF
+MQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMR8wHQYDVQQDExZT
+d2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
+CgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUqt2/8
+76LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+
+bbqBHH5CjCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c
+6bM8K8vzARO/Ws/BtQpgvd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqE
+emA8atufK+ze3gE/bk3lUIbLtK/tREDFylqM2tIrfKjuvqblCqoOpd8FUrdVxyJd
+MmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvRAiTysybUa9oEVeXBCsdt
+MDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuendjIj3o02y
+MszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69y
+FGkOpeUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPi
+aG59je883WX0XaxR7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxM
+gI93e2CaHt+28kgeDrpOVG2Y4OGiGqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCB
+qTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWyV7
+lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64OfPAeGZe6Drn
+8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
+L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe6
+45R88a7A3hfm5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczO
+UYrHUDFu4Up+GC9pWbY9ZIEr44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5
+O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCC
+bwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yv
+GPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a
+77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCC
+hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid3
+92qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEpp
+Ld6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+w
+ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt
+Qc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
+-----END CERTIFICATE-----
+
+# Issuer: CN=SwissSign Silver CA - G2 O=SwissSign AG
+# Subject: CN=SwissSign Silver CA - G2 O=SwissSign AG
+# Label: "SwissSign Silver CA - G2"
+# Serial: 5700383053117599563
+# MD5 Fingerprint: e0:06:a1:c9:7d:cf:c9:fc:0d:c0:56:75:96:d8:62:13
+# SHA1 Fingerprint: 9b:aa:e5:9f:56:ee:21:cb:43:5a:be:25:93:df:a7:f0:40:d1:1d:cb
+# SHA256 Fingerprint: be:6c:4d:a2:bb:b9:ba:59:b6:f3:93:97:68:37:42:46:c3:c0:05:99:3f:a9:8f:02:0d:1d:ed:be:d4:8a:81:d5
+-----BEGIN CERTIFICATE-----
+MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UE
+BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWdu
+IFNpbHZlciBDQSAtIEcyMB4XDTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0Nlow
+RzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMY
+U3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644N0Mv
+Fz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7br
+YT7QbNHm+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieF
+nbAVlDLaYQ1HTWBCrpJH6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH
+6ATK72oxh9TAtvmUcXtnZLi2kUpCe2UuMGoM9ZDulebyzYLs2aFK7PayS+VFheZt
+eJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5hqAaEuSh6XzjZG6k4sIN/
+c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5FZGkECwJ
+MoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRH
+HTBsROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTf
+jNFusB3hB48IHpmccelM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb6
+5i/4z3GcRm25xBWNOHkDRUjvxF3XCO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOB
+rDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU
+F6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRBtjpbO8tFnb0c
+wpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
+cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIB
+AHPGgeAn0i0P4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShp
+WJHckRE1qTodvBqlYJ7YH39FkWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9
+xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L3XWgwF15kIwb4FDm3jH+mHtwX6WQ
+2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx/uNncqCxv1yL5PqZ
+IseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFaDGi8
+aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2X
+em1ZqSqPe97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQR
+dAtq/gsD/KNVV4n+SsuuWxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/
+OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJDIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+
+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ubDgEj8Z+7fNzcbBGXJbLy
+tGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Primary Certification Authority O=GeoTrust Inc.
+# Subject: CN=GeoTrust Primary Certification Authority O=GeoTrust Inc.
+# Label: "GeoTrust Primary Certification Authority"
+# Serial: 32798226551256963324313806436981982369
+# MD5 Fingerprint: 02:26:c3:01:5e:08:30:37:43:a9:d0:7d:cf:37:e6:bf
+# SHA1 Fingerprint: 32:3c:11:8e:1b:f7:b8:b6:52:54:e2:e2:10:0d:d6:02:90:37:f0:96
+# SHA256 Fingerprint: 37:d5:10:06:c5:12:ea:ab:62:64:21:f1:ec:8c:92:01:3f:c5:f8:2a:e9:8e:e5:33:eb:46:19:b8:de:b4:d0:6c
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBY
+MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMo
+R2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEx
+MjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
+Ew1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQcmltYXJ5IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9
+AWbK7hWNb6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjA
+ZIVcFU2Ix7e64HXprQU9nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE0
+7e9GceBrAqg1cmuXm2bgyxx5X9gaBGgeRwLmnWDiNpcB3841kt++Z8dtd1k7j53W
+kBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGttm/81w7a4DSwDRp35+MI
+mO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJ
+KoZIhvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ1
+6CePbJC/kRYkRj5KTs4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl
+4b7UVXGYNTq+k+qurUKykG/g/CFNNWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6K
+oKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHaFloxt/m0cYASSJlyc1pZU8Fj
+UjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG1riR/aYNKxoU
+AT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
+-----END CERTIFICATE-----
+
+# Issuer: CN=thawte Primary Root CA O=thawte, Inc. OU=Certification Services Division/(c) 2006 thawte, Inc. - For authorized use only
+# Subject: CN=thawte Primary Root CA O=thawte, Inc. OU=Certification Services Division/(c) 2006 thawte, Inc. - For authorized use only
+# Label: "thawte Primary Root CA"
+# Serial: 69529181992039203566298953787712940909
+# MD5 Fingerprint: 8c:ca:dc:0b:22:ce:f5:be:72:ac:41:1a:11:a8:d8:12
+# SHA1 Fingerprint: 91:c6:d6:ee:3e:8a:c8:63:84:e5:48:c2:99:29:5c:75:6c:81:7b:81
+# SHA256 Fingerprint: 8d:72:2f:81:a9:c1:13:c0:79:1d:f1:36:a2:96:6d:b2:6c:95:0a:97:1d:b4:6b:41:99:f4:ea:54:b7:8b:fb:9f
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCB
+qTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
+Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
+MDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNV
+BAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3MDAwMDAwWhcNMzYw
+NzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5j
+LjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYG
+A1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsoPD7gFnUnMekz52hWXMJEEUMDSxuaPFs
+W0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ1CRfBsDMRJSUjQJib+ta
+3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGcq/gcfomk
+6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6
+Sk/KaAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94J
+NqR32HuHUETVPm4pafs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XP
+r87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUFAAOCAQEAeRHAS7ORtvzw6WfU
+DW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeEuzLlQRHAd9mz
+YJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2
+/qxAeeWsEG89jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/
+LHbTY5xZ3Y+m4Q6gLkH3LpVHz7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7
+jVaMaA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G5 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2006 VeriSign, Inc. - For authorized use only
+# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G5 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2006 VeriSign, Inc. - For authorized use only
+# Label: "VeriSign Class 3 Public Primary Certification Authority - G5"
+# Serial: 33037644167568058970164719475676101450
+# MD5 Fingerprint: cb:17:e4:31:67:3e:e2:09:fe:45:57:93:f3:0a:fa:1c
+# SHA1 Fingerprint: 4e:b6:d5:78:49:9b:1c:cf:5f:58:1e:ad:56:be:3d:9b:67:44:a5:e5
+# SHA256 Fingerprint: 9a:cf:ab:7e:43:c8:d8:80:d0:6b:26:2a:94:de:ee:e4:b4:65:99:89:c3:d0:ca:f1:9b:af:64:05:e4:1a:b7:df
+-----BEGIN CERTIFICATE-----
+MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
+U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
+ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
+ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
+U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
+aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1
+nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex
+t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz
+SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG
+BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+
+rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/
+NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
+BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH
+BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
+aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv
+MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE
+p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y
+5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK
+WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ
+4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N
+hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
+-----END CERTIFICATE-----
+
+# Issuer: CN=SecureTrust CA O=SecureTrust Corporation
+# Subject: CN=SecureTrust CA O=SecureTrust Corporation
+# Label: "SecureTrust CA"
+# Serial: 17199774589125277788362757014266862032
+# MD5 Fingerprint: dc:32:c3:a7:6d:25:57:c7:68:09:9d:ea:2d:a9:a2:d1
+# SHA1 Fingerprint: 87:82:c6:c3:04:35:3b:cf:d2:96:92:d2:59:3e:7d:44:d9:34:ff:11
+# SHA256 Fingerprint: f1:c1:b5:0a:e5:a2:0d:d8:03:0e:c9:f6:bc:24:82:3d:d3:67:b5:25:57:59:b4:e7:1b:61:fc:e9:f7:37:5d:73
+-----BEGIN CERTIFICATE-----
+MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBI
+MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
+FzAVBgNVBAMTDlNlY3VyZVRydXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIz
+MTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAeBgNVBAoTF1NlY3VyZVRydXN0IENv
+cnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQXOZEz
+Zum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO
+0gMdA+9tDWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIao
+wW8xQmxSPmjL8xk037uHGFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj
+7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b01k/unK8RCSc43Oz969XL0Imnal0ugBS
+8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmHursCAwEAAaOBnTCBmjAT
+BgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCeg
+JYYjaHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGC
+NxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt3
+6Z3q059c4EVlew3KW+JwULKUBRSuSceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/
+3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHfmbx8IVQr5Fiiu1cprp6poxkm
+D5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZnMUFdAvnZyPS
+CPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
+3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Secure Global CA O=SecureTrust Corporation
+# Subject: CN=Secure Global CA O=SecureTrust Corporation
+# Label: "Secure Global CA"
+# Serial: 9751836167731051554232119481456978597
+# MD5 Fingerprint: cf:f4:27:0d:d4:ed:dc:65:16:49:6d:3d:da:bf:6e:de
+# SHA1 Fingerprint: 3a:44:73:5a:e5:81:90:1f:24:86:61:46:1e:3b:9c:c4:5f:f5:3a:1b
+# SHA256 Fingerprint: 42:00:f5:04:3a:c8:59:0e:bb:52:7d:20:9e:d1:50:30:29:fb:cb:d4:1c:a1:b5:06:ec:27:f1:5a:de:7d:ac:69
+-----BEGIN CERTIFICATE-----
+MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBK
+MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
+GTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkx
+MjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3Qg
+Q29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jxYDiJ
+iQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa
+/FHtaMbQbqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJ
+jnIFHovdRIWCQtBJwB1g8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnI
+HmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYVHDGA76oYa8J719rO+TMg1fW9ajMtgQT7
+sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi0XPnj3pDAgMBAAGjgZ0w
+gZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1UdEwEB/wQF
+MAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCsw
+KaAnoCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsG
+AQQBgjcVAQQDAgEAMA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0L
+URYD7xh8yOOvaliTFGCRsoTciE6+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXO
+H0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cnCDpOGR86p1hcF895P4vkp9Mm
+I50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/53CYNv6ZHdAbY
+iNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
+f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
+-----END CERTIFICATE-----
+
+# Issuer: CN=COMODO Certification Authority O=COMODO CA Limited
+# Subject: CN=COMODO Certification Authority O=COMODO CA Limited
+# Label: "COMODO Certification Authority"
+# Serial: 104350513648249232941998508985834464573
+# MD5 Fingerprint: 5c:48:dc:f7:42:72:ec:56:94:6d:1c:cc:71:35:80:75
+# SHA1 Fingerprint: 66:31:bf:9e:f7:4f:9e:b6:c9:d5:a6:0c:ba:6a:be:d1:f7:bd:ef:7b
+# SHA256 Fingerprint: 0c:2c:d6:3d:f7:80:6f:a3:99:ed:e8:09:11:6b:57:5b:f8:79:89:f0:65:18:f9:80:8c:86:05:03:17:8b:af:66
+-----BEGIN CERTIFICATE-----
+MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCB
+gTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNV
+BAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEyMDEwMDAw
+MDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3Jl
+YXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01P
+RE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3
+UcEbVASY06m/weaKXTuH+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI
+2GqGd0S7WWaXUF601CxwRM/aN5VCaTwwxHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8
+Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV4EajcNxo2f8ESIl33rXp
++2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA1KGzqSX+
+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5O
+nKVIrLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW
+/zAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6g
+PKA6hjhodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9u
+QXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOCAQEAPpiem/Yb6dc5t3iuHXIY
+SdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CPOGEIqB6BCsAv
+IC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
+RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4
+zJVSk/BwJVmcIGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5dd
+BA6+C4OmF4O5MBKgxTMVBbkN+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IB
+ZQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Network Solutions Certificate Authority O=Network Solutions L.L.C.
+# Subject: CN=Network Solutions Certificate Authority O=Network Solutions L.L.C.
+# Label: "Network Solutions Certificate Authority"
+# Serial: 116697915152937497490437556386812487904
+# MD5 Fingerprint: d3:f3:a6:16:c0:fa:6b:1d:59:b1:2d:96:4d:0e:11:2e
+# SHA1 Fingerprint: 74:f8:a3:c3:ef:e7:b3:90:06:4b:83:90:3c:21:64:60:20:e5:df:ce
+# SHA256 Fingerprint: 15:f0:ba:00:a3:ac:7a:f3:ac:88:4c:07:2b:10:11:a0:77:bd:77:c0:97:f4:01:64:b2:f8:59:8a:bd:83:86:0c
+-----BEGIN CERTIFICATE-----
+MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBi
+MQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
+MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMxMjM1OTU5WjBiMQswCQYDVQQGEwJV
+UzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydO
+ZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwz
+c7MEL7xxjOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPP
+OCwGJgl6cvf6UDL4wpPTaaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rl
+mGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXTcrA/vGp97Eh/jcOrqnErU2lBUzS1sLnF
+BgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc/Qzpf14Dl847ABSHJ3A4
+qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMBAAGjgZcw
+gZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIB
+BjAPBgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwu
+bmV0c29sc3NsLmNvbS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3Jp
+dHkuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc8
+6fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q4LqILPxFzBiwmZVRDuwduIj/
+h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/GGUsyfJj4akH
+/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
+wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHN
+pGxlaKFJdlxDydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
+-----END CERTIFICATE-----
+
+# Issuer: CN=WellsSecure Public Root Certificate Authority O=Wells Fargo WellsSecure OU=Wells Fargo Bank NA
+# Subject: CN=WellsSecure Public Root Certificate Authority O=Wells Fargo WellsSecure OU=Wells Fargo Bank NA
+# Label: "WellsSecure Public Root Certificate Authority"
+# Serial: 1
+# MD5 Fingerprint: 15:ac:a5:c2:92:2d:79:bc:e8:7f:cb:67:ed:02:cf:36
+# SHA1 Fingerprint: e7:b4:f6:9d:61:ec:90:69:db:7e:90:a7:40:1a:3c:f4:7d:4f:e8:ee
+# SHA256 Fingerprint: a7:12:72:ae:aa:a3:cf:e8:72:7f:7f:b3:9f:0f:b3:d1:e5:42:6e:90:60:b0:6e:e6:f1:3e:9a:3c:58:33:cd:43
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMx
+IDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxs
+cyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9v
+dCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDcxMjEzMTcwNzU0WhcNMjIxMjE0
+MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdl
+bGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQD
+DC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+r
+WxxTkqxtnt3CxC5FlAM1iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjU
+Dk/41itMpBb570OYj7OeUt9tkTmPOL13i0Nj67eT/DBMHAGTthP796EfvyXhdDcs
+HqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8bJVhHlfXBIEyg1J55oNj
+z7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiBK0HmOFaf
+SZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/Slwxl
+AgMBAAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqG
+KGh0dHA6Ly9jcmwucGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0P
+AQH/BAQDAgHGMB0GA1UdDgQWBBQmlRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0j
+BIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGBi6SBiDCBhTELMAkGA1UEBhMC
+VVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNX
+ZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEB
+ALkVsUSRzCPIK0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd
+/ZDJPHV3V3p9+N701NX3leZ0bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pB
+A4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSljqHyita04pO2t/caaH/+Xc/77szWn
+k4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+esE2fDbbFwRnzVlhE9
+iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJtylv
+2G0xffX8oRAHh84vWdw+WNs=
+-----END CERTIFICATE-----
+
+# Issuer: CN=COMODO ECC Certification Authority O=COMODO CA Limited
+# Subject: CN=COMODO ECC Certification Authority O=COMODO CA Limited
+# Label: "COMODO ECC Certification Authority"
+# Serial: 41578283867086692638256921589707938090
+# MD5 Fingerprint: 7c:62:ff:74:9d:31:53:5e:68:4a:d5:78:aa:1e:bf:23
+# SHA1 Fingerprint: 9f:74:4e:9f:2b:4d:ba:ec:0f:31:2c:50:b6:56:3b:8e:2d:93:c3:11
+# SHA256 Fingerprint: 17:93:92:7a:06:14:54:97:89:ad:ce:2f:8f:34:f7:f0:b6:6d:0f:3a:e3:a3:b8:4d:21:ec:15:db:ba:4f:ad:c7
+-----BEGIN CERTIFICATE-----
+MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTEL
+MAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
+BxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMT
+IkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwMzA2MDAw
+MDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdy
+ZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09N
+T0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSR
+FtSrYpn1PlILBs5BAH+X4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0J
+cfRK9ChQtP6IHG4/bC8vCVlbpVsLM5niwz2J+Wos77LTBumjQjBAMB0GA1UdDgQW
+BBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VGFAkK+qDm
+fQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdv
+GDeAU/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
+-----END CERTIFICATE-----
+
+# Issuer: CN=IGC/A O=PM/SGDN OU=DCSSI
+# Subject: CN=IGC/A O=PM/SGDN OU=DCSSI
+# Label: "IGC/A"
+# Serial: 245102874772
+# MD5 Fingerprint: 0c:7f:dd:6a:f4:2a:b9:c8:9b:bd:20:7e:a9:db:5c:37
+# SHA1 Fingerprint: 60:d6:89:74:b5:c2:65:9e:8a:0f:c1:88:7c:88:d2:46:69:1b:18:2c
+# SHA256 Fingerprint: b9:be:a7:86:0a:96:2e:a3:61:1d:ab:97:ab:6d:a3:e2:1c:10:68:b9:7d:55:57:5e:d0:e1:12:79:c1:1c:89:32
+-----BEGIN CERTIFICATE-----
+MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYT
+AkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQ
+TS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG
+9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMB4XDTAyMTIxMzE0MjkyM1oXDTIw
+MTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAM
+BgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEO
+MAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2
+LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaI
+s9z4iPf930Pfeo2aSVz2TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2
+xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCWSo7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4
+u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYyHF2fYPepraX/z9E0+X1b
+F8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNdfrGoRpAx
+Vs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGd
+PDPQtQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNV
+HSAEDjAMMAoGCCqBegF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAx
+NjAfBgNVHSMEGDAWgBSjBS8YYFDCiQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUF
+AAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RKq89toB9RlPhJy3Q2FLwV3duJ
+L92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3QMZsyK10XZZOY
+YLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg
+Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2a
+NjSaTFR+FwNIlQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R
+0982gaEbeC9xs/FZTEYYKKuF0mBWWg==
+-----END CERTIFICATE-----
+
+# Issuer: O=SECOM Trust Systems CO.,LTD. OU=Security Communication EV RootCA1
+# Subject: O=SECOM Trust Systems CO.,LTD. OU=Security Communication EV RootCA1
+# Label: "Security Communication EV RootCA1"
+# Serial: 0
+# MD5 Fingerprint: 22:2d:a6:01:ea:7c:0a:f7:f0:6c:56:43:3f:77:76:d3
+# SHA1 Fingerprint: fe:b8:c4:32:dc:f9:76:9a:ce:ae:3d:d8:90:8f:fd:28:86:65:64:7d
+# SHA256 Fingerprint: a2:2d:ba:68:1e:97:37:6e:2d:39:7d:72:8a:ae:3a:9b:62:96:b9:fd:ba:60:bc:2e:11:f6:47:f2:c6:75:fb:37
+-----BEGIN CERTIFICATE-----
+MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDEl
+MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMh
+U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIz
+MloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09N
+IFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNlY3VyaXR5IENvbW11
+bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSE
+RMqm4miO/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gO
+zXppFodEtZDkBp2uoQSXWHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5
+bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4zZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDF
+MxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4bepJz11sS6/vmsJWXMY1
+VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK9U2vP9eC
+OKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HW
+tWS3irO4G8za+6xmiEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZ
+q51ihPZRwSzJIxXYKLerJRO1RuGGAv8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDb
+EJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnWmHyojf6GPgcWkuF75x3sM3Z+
+Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEWT1MKZPlO9L9O
+VL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490
+-----END CERTIFICATE-----
+
+# Issuer: CN=OISTE WISeKey Global Root GA CA O=WISeKey OU=Copyright (c) 2005/OISTE Foundation Endorsed
+# Subject: CN=OISTE WISeKey Global Root GA CA O=WISeKey OU=Copyright (c) 2005/OISTE Foundation Endorsed
+# Label: "OISTE WISeKey Global Root GA CA"
+# Serial: 86718877871133159090080555911823548314
+# MD5 Fingerprint: bc:6c:51:33:a7:e9:d3:66:63:54:15:72:1b:21:92:93
+# SHA1 Fingerprint: 59:22:a1:e1:5a:ea:16:35:21:f8:98:39:6a:46:46:b0:44:1b:0f:a9
+# SHA256 Fingerprint: 41:c9:23:86:6a:b4:ca:d6:b7:ad:57:80:81:58:2e:02:07:97:a6:cb:df:4f:ff:78:ce:83:96:b3:89:37:d7:f5
+-----BEGIN CERTIFICATE-----
+MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCB
+ijELMAkGA1UEBhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHly
+aWdodCAoYykgMjAwNTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
+ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQSBDQTAeFw0w
+NTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYDVQQGEwJDSDEQMA4G
+A1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIwIAYD
+VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBX
+SVNlS2V5IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAy0+zAJs9Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxR
+VVuuk+g3/ytr6dTqvirdqFEr12bDYVxgAsj1znJ7O7jyTmUIms2kahnBAbtzptf2
+w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbDd50kc3vkDIzh2TbhmYsF
+mQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ/yxViJGg
+4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t9
+4B3RLoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQw
+EAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOx
+SPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vImMMkQyh2I+3QZH4VFvbBsUfk2
+ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4+vg1YFkCExh8
+vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
+hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZi
+Fj4A4xylNoEYokxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ
+/L7fCg0=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Microsec e-Szigno Root CA O=Microsec Ltd. OU=e-Szigno CA
+# Subject: CN=Microsec e-Szigno Root CA O=Microsec Ltd. OU=e-Szigno CA
+# Label: "Microsec e-Szigno Root CA"
+# Serial: 272122594155480254301341951808045322001
+# MD5 Fingerprint: f0:96:b6:2f:c5:10:d5:67:8e:83:25:32:e8:5e:2e:e5
+# SHA1 Fingerprint: 23:88:c9:d3:71:cc:9e:96:3d:ff:7d:3c:a7:ce:fc:d6:25:ec:19:0d
+# SHA256 Fingerprint: 32:7a:3d:76:1a:ba:de:a0:34:eb:99:84:06:27:5c:b1:a4:77:6e:fd:ae:2f:df:6d:01:68:ea:1c:4f:55:67:d0
+-----BEGIN CERTIFICATE-----
+MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAw
+cjELMAkGA1UEBhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNy
+b3NlYyBMdGQuMRQwEgYDVQQLEwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9z
+ZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0MDYxMjI4NDRaFw0xNzA0MDYxMjI4
+NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEWMBQGA1UEChMN
+TWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMTGU1p
+Y3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2u
+uO/TEdyB5s87lozWbxXGd36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+
+LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/NoqdNAoI/gqyFxuEPkEeZlApxcpMqyabA
+vjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjcQR/Ji3HWVBTji1R4P770
+Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJPqW+jqpx
+62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcB
+AQRbMFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3Aw
+LQYIKwYBBQUHMAKGIWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAP
+BgNVHRMBAf8EBTADAQH/MIIBcwYDVR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIB
+AQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3LmUtc3ppZ25vLmh1L1NaU1ov
+MIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0AdAB2AOEAbgB5
+ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn
+AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABT
+AHoAbwBsAGcA4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABh
+ACAAcwB6AGUAcgBpAG4AdAAgAGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABo
+AHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMAegBpAGcAbgBvAC4AaAB1AC8AUwBa
+AFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6Ly93d3cuZS1zemln
+bm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NOPU1p
+Y3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxP
+PU1pY3Jvc2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZv
+Y2F0aW9uTGlzdDtiaW5hcnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuB
+EGluZm9AZS1zemlnbm8uaHWkdzB1MSMwIQYDVQQDDBpNaWNyb3NlYyBlLVN6aWdu
+w7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhTWjEWMBQGA1UEChMNTWlj
+cm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhVMIGsBgNV
+HSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJI
+VTERMA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDAS
+BgNVBAsTC2UtU3ppZ25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBS
+b290IENBghEAzLjnv04pGv2i3GalHCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS
+8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMTnGZjWS7KXHAM/IO8VbH0jgds
+ZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FEaGAHQzAxQmHl
+7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a
+86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfR
+hUZLphK3dehKyVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/
+MPMMNz7UwiiAc7EBt51alhQBS6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Certigna O=Dhimyotis
+# Subject: CN=Certigna O=Dhimyotis
+# Label: "Certigna"
+# Serial: 18364802974209362175
+# MD5 Fingerprint: ab:57:a6:5b:7d:42:82:19:b5:d8:58:26:28:5e:fd:ff
+# SHA1 Fingerprint: b1:2e:13:63:45:86:a4:6f:1a:b2:60:68:37:58:2d:c4:ac:fd:94:97
+# SHA256 Fingerprint: e3:b6:a2:db:2e:d7:ce:48:84:2f:7a:c5:32:41:c7:b7:1d:54:14:4b:fb:40:c1:1f:3f:1d:0b:42:f5:ee:a1:2d
+-----BEGIN CERTIFICATE-----
+MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNV
+BAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4X
+DTA3MDYyOTE1MTMwNVoXDTI3MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQ
+BgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwIQ2VydGlnbmEwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7qXOEm7RFHYeGifBZ4
+QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyHGxny
+gQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbw
+zBfsV1/pogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q
+130yGLMLLGq/jj8UEYkgDncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2
+JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKfIrjxwo1p3Po6WAbfAgMBAAGjgbwwgbkw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQtCRZvgHyUtVF9lo53BEw
+ZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJBgNVBAYT
+AkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzj
+AQ/JSP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG
+9w0BAQUFAAOCAQEAhQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8h
+bV6lUmPOEvjvKtpv6zf+EwLHyzs+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFnc
+fca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1kluPBS1xp81HlDQwY9qcEQCYsuu
+HWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY1gkIl2PlwS6w
+t0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
+WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=AC Raíz Certicámara S.A. O=Sociedad Cameral de Certificación Digital - Certicámara S.A.
+# Subject: CN=AC Raíz Certicámara S.A. O=Sociedad Cameral de Certificación Digital - Certicámara S.A.
+# Label: "AC Ra\xC3\xADz Certic\xC3\xA1mara S.A."
+# Serial: 38908203973182606954752843738508300
+# MD5 Fingerprint: 93:2a:3e:f6:fd:23:69:0d:71:20:d4:2b:47:99:2b:a6
+# SHA1 Fingerprint: cb:a1:c5:f8:b0:e3:5e:b8:b9:45:12:d3:f9:34:a2:e9:06:10:d3:36
+# SHA256 Fingerprint: a6:c5:1e:0d:a5:ca:0a:93:09:d2:e4:c0:e4:0c:2a:f9:10:7a:ae:82:03:85:7f:e1:98:e3:e7:69:e3:43:08:5c
+-----BEGIN CERTIFICATE-----
+MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsx
+CzAJBgNVBAYTAkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRp
+ZmljYWNpw7NuIERpZ2l0YWwgLSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwa
+QUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4wHhcNMDYxMTI3MjA0NjI5WhcNMzAw
+NDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+U29jaWVkYWQgQ2Ft
+ZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJhIFMu
+QS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkq
+hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeG
+qentLhM0R7LQcNzJPNCNyu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzL
+fDe3fezTf3MZsGqy2IiKLUV0qPezuMDU2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQ
+Y5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU34ojC2I+GdV75LaeHM/J4
+Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP2yYe68yQ
+54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+b
+MMCm8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48j
+ilSH5L887uvDdUhfHjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++Ej
+YfDIJss2yKHzMI+ko6Kh3VOz3vCaMh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/zt
+A/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK5lw1omdMEWux+IBkAC1vImHF
+rEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1bczwmPS9KvqfJ
+pxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
+AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCB
+lTCBkgYEVR0gADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFy
+YS5jb20vZHBjLzBaBggrBgEFBQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW50
+7WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2UgcHVlZGVuIGVuY29udHJhciBlbiBs
+YSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEfAygPU3zmpFmps4p6
+xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuXEpBc
+unvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/
+Jre7Ir5v/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dp
+ezy4ydV/NgIlqmjCMRW3MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42
+gzmRkBDI8ck1fj+404HGIGQatlDCIaR43NAvO2STdPCWkPHv+wlaNECW8DYSwaN0
+jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wkeZBWN7PGKX6jD/EpOe9+
+XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f/RWmnkJD
+W2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/
+RL5hRqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35r
+MDOhYil/SrnhLecUIw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxk
+BYn8eNZcLCZDqQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=TC TrustCenter Class 2 CA II O=TC TrustCenter GmbH OU=TC TrustCenter Class 2 CA
+# Subject: CN=TC TrustCenter Class 2 CA II O=TC TrustCenter GmbH OU=TC TrustCenter Class 2 CA
+# Label: "TC TrustCenter Class 2 CA II"
+# Serial: 941389028203453866782103406992443
+# MD5 Fingerprint: ce:78:33:5c:59:78:01:6e:18:ea:b9:36:a0:b9:2e:23
+# SHA1 Fingerprint: ae:50:83:ed:7c:f4:5c:bc:8f:61:c6:21:fe:68:5d:79:42:21:15:6e
+# SHA256 Fingerprint: e6:b8:f8:76:64:85:f8:07:ae:7f:8d:ac:16:70:46:1f:07:c0:a1:3e:ef:3a:1f:f7:17:53:8d:7a:ba:d3:91:b4
+-----BEGIN CERTIFICATE-----
+MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjEL
+MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNV
+BAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0
+Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYwMTEyMTQzODQzWhcNMjUxMjMxMjI1
+OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21i
+SDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UEAxMc
+VEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jf
+tMjWQ+nEdVl//OEd+DFwIxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKg
+uNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2J
+XjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQXa7pIXSSTYtZgo+U4+lK
+8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7uSNQZu+99
+5OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3
+kUrL84J6E1wIqzCB7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRy
+dXN0Y2VudGVyLmRlL2NybC92Mi90Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6
+Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBUcnVzdENlbnRlciUyMENsYXNz
+JTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21iSCxPVT1yb290
+Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
+TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iS
+GNn3Bzn1LL4GdXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprt
+ZjluS5TmVfwLG4t3wVMTZonZKNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8
+au0WOB9/WIFaGusyiC2y8zl3gK9etmF1KdsjTYjKUCjLhdLTEKJZbtOTVAB6okaV
+hgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kPJOzHdiEoZa5X6AeI
+dUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfkvQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=TC TrustCenter Class 3 CA II O=TC TrustCenter GmbH OU=TC TrustCenter Class 3 CA
+# Subject: CN=TC TrustCenter Class 3 CA II O=TC TrustCenter GmbH OU=TC TrustCenter Class 3 CA
+# Label: "TC TrustCenter Class 3 CA II"
+# Serial: 1506523511417715638772220530020799
+# MD5 Fingerprint: 56:5f:aa:80:61:12:17:f6:67:21:e6:2b:6d:61:56:8e
+# SHA1 Fingerprint: 80:25:ef:f4:6e:70:c8:d4:72:24:65:84:fe:40:3b:8a:8d:6a:db:f5
+# SHA256 Fingerprint: 8d:a0:84:fc:f9:9c:e0:77:22:f8:9b:32:05:93:98:06:fa:5c:b8:11:e1:c8:13:f6:a1:08:c7:d3:36:b3:40:8e
+-----BEGIN CERTIFICATE-----
+MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjEL
+MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNV
+BAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0
+Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYwMTEyMTQ0MTU3WhcNMjUxMjMxMjI1
+OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21i
+SDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UEAxMc
+VEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJW
+Ht4bNwcwIi9v8Qbxq63WyKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+Q
+Vl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo6SI7dYnWRBpl8huXJh0obazovVkdKyT2
+1oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZuV3bOx4a+9P/FRQI2Alq
+ukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk2ZyqBwi1
+Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NX
+XAek0CSnwPIA1DCB7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRy
+dXN0Y2VudGVyLmRlL2NybC92Mi90Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6
+Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBUcnVzdENlbnRlciUyMENsYXNz
+JTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21iSCxPVT1yb290
+Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
+TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlN
+irTzwppVMXzEO2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8
+TtXqluJucsG7Kv5sbviRmEb8yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6
+g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9IJqDnxrcOfHFcqMRA/07QlIp2+gB
+95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal092Y+tTmBvTwtiBj
+S+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc5A==
+-----END CERTIFICATE-----
+
+# Issuer: CN=TC TrustCenter Universal CA I O=TC TrustCenter GmbH OU=TC TrustCenter Universal CA
+# Subject: CN=TC TrustCenter Universal CA I O=TC TrustCenter GmbH OU=TC TrustCenter Universal CA
+# Label: "TC TrustCenter Universal CA I"
+# Serial: 601024842042189035295619584734726
+# MD5 Fingerprint: 45:e1:a5:72:c5:a9:36:64:40:9e:f5:e4:58:84:67:8c
+# SHA1 Fingerprint: 6b:2f:34:ad:89:58:be:62:fd:b0:6b:5c:ce:bb:9d:d9:4f:4e:39:f3
+# SHA256 Fingerprint: eb:f3:c0:2a:87:89:b1:fb:7d:51:19:95:d6:63:b7:29:06:d9:13:ce:0d:5e:10:56:8a:8a:77:e2:58:61:67:e7
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTEL
+MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNV
+BAsTG1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1
+c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcNMDYwMzIyMTU1NDI4WhcNMjUxMjMx
+MjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIg
+R21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYwJAYD
+VQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSR
+JJZ4Hgmgm5qVSkr1YnwCqMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3T
+fCZdzHd55yx4Oagmcw6iXSVphU9VDprvxrlE4Vc93x9UIuVvZaozhDrzznq+VZeu
+jRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtwag+1m7Z3W0hZneTvWq3z
+wZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9OgdwZu5GQ
+fezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYD
+VR0jBBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0G
+CSqGSIb3DQEBBQUAA4IBAQAo0uCG1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X1
+7caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/CyvwbZ71q+s2IhtNerNXxTPqYn
+8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3ghUJGooWMNjs
+ydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT
+ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/
+2TYcuiUaUj0a7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY
+-----END CERTIFICATE-----
+
+# Issuer: CN=Deutsche Telekom Root CA 2 O=Deutsche Telekom AG OU=T-TeleSec Trust Center
+# Subject: CN=Deutsche Telekom Root CA 2 O=Deutsche Telekom AG OU=T-TeleSec Trust Center
+# Label: "Deutsche Telekom Root CA 2"
+# Serial: 38
+# MD5 Fingerprint: 74:01:4a:91:b1:08:c4:58:ce:47:cd:f0:dd:11:53:08
+# SHA1 Fingerprint: 85:a4:08:c0:9c:19:3e:5d:51:58:7d:cd:d6:13:30:fd:8c:de:37:bf
+# SHA256 Fingerprint: b6:19:1a:50:d0:c3:97:7f:7d:a9:9b:cd:aa:c8:6a:22:7d:ae:b9:67:9e:c7:0b:a3:b0:c9:d9:22:71:c1:70:d3
+-----BEGIN CERTIFICATE-----
+MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEc
+MBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2Vj
+IFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENB
+IDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5MjM1OTAwWjBxMQswCQYDVQQGEwJE
+RTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxl
+U2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290
+IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEU
+ha88EOQ5bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhC
+QN/Po7qCWWqSG6wcmtoIKyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1Mjwr
+rFDa1sPeg5TKqAyZMg4ISFZbavva4VhYAUlfckE8FQYBjl2tqriTtM2e66foai1S
+NNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aKSe5TBY8ZTNXeWHmb0moc
+QqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTVjlsB9WoH
+txa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAP
+BgNVHRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC
+AQEAlGRZrTlk5ynrE/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756Abrsp
+tJh6sTtU6zkXR34ajgv8HzFZMQSyzhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpa
+IzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8rZ7/gFnkm0W09juwzTkZmDLl
+6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4Gdyd1Lx+4ivn+
+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
+Cm26OWMohpLzGITY+9HPBVZkVw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=ComSign Secured CA O=ComSign
+# Subject: CN=ComSign Secured CA O=ComSign
+# Label: "ComSign Secured CA"
+# Serial: 264725503855295744117309814499492384489
+# MD5 Fingerprint: 40:01:25:06:8d:21:43:6a:0e:43:00:9c:e7:43:f3:d5
+# SHA1 Fingerprint: f9:cd:0e:2c:da:76:24:c1:8f:bd:f0:f0:ab:b6:45:b8:f7:fe:d5:7a
+# SHA256 Fingerprint: 50:79:41:c7:44:60:a0:b4:70:86:22:0d:4e:99:32:57:2a:b5:d1:b5:bb:cb:89:80:ab:1c:b1:76:51:a8:44:d2
+-----BEGIN CERTIFICATE-----
+MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAw
+PDEbMBkGA1UEAxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWdu
+MQswCQYDVQQGEwJJTDAeFw0wNDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwx
+GzAZBgNVBAMTEkNvbVNpZ24gU2VjdXJlZCBDQTEQMA4GA1UEChMHQ29tU2lnbjEL
+MAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGtWhf
+HZQVw6QIVS3joFd67+l0Kru5fFdJGhFeTymHDEjWaueP1H5XJLkGieQcPOqs49oh
+gHMhCu95mGwfCP+hUH3ymBvJVG8+pSjsIQQPRbsHPaHA+iqYHU4Gk/v1iDurX8sW
+v+bznkqH7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg/8HZaWSLWapW7ha9B20IZFKF3ue
+Mv5WJDmyVIRD9YTC2LxBkMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr
+9gOUCXDeFhF6K+h2j0kQmHe5Y1yLM5d19guMsqtb3nQgJT/j8xH5h2iGNXHDHYwt
+6+UarA9z1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUwAwEB/zBEBgNVHR8EPTA7
+MDmgN6A1hjNodHRwOi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29tU2lnblNl
+Y3VyZWRDQS5jcmwwDgYDVR0PAQH/BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58
+ADsAj8c+DkWfHl3sMB0GA1UdDgQWBBTBS+1wtvc+fAA7AI/HPg5Fnx5d7DANBgkq
+hkiG9w0BAQUFAAOCAQEAFs/ukhNQq3sUnjO2QiBq1BW9Cav8cujvR3qQrFHBZE7p
+iL1DRYHjZiM/EoZNGeQFsOY3wo3aBijJD4mkU6l1P7CW+6tMM1X5eCZGbxs2mPtC
+dsGCuY7e+0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtpFhpFfTMDZflScZAmlaxMDPWL
+kz/MdXSFmLr/YnpNH4n+rr2UAJm/EaXc4HnFFgt9AmEd6oX5AhVP51qJThRv4zdL
+hfXBPGHg/QVBspJ/wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8+/21OGVZOIJFsnzQz
+OjRXUDpvgV4GxvU+fE6OK85lBi5d0ipTdF7Tbieejw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Cybertrust Global Root O=Cybertrust, Inc
+# Subject: CN=Cybertrust Global Root O=Cybertrust, Inc
+# Label: "Cybertrust Global Root"
+# Serial: 4835703278459682877484360
+# MD5 Fingerprint: 72:e4:4a:87:e3:69:40:80:77:ea:bc:e3:f4:ff:f0:e1
+# SHA1 Fingerprint: 5f:43:e5:b1:bf:f8:78:8c:ac:1c:c7:ca:4a:9a:c6:22:2b:cc:34:c6
+# SHA256 Fingerprint: 96:0a:df:00:63:e9:63:56:75:0c:29:65:dd:0a:08:67:da:0b:9c:bd:6e:77:71:4a:ea:fb:23:49:ab:39:3d:a3
+-----BEGIN CERTIFICATE-----
+MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYG
+A1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2Jh
+bCBSb290MB4XDTA2MTIxNTA4MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UE
+ChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBS
+b290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+Mi8vRRQZhP/8NN5
+7CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW0ozS
+J8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2y
+HLtgwEZLAfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iP
+t3sMpTjr3kfb1V05/Iin89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNz
+FtApD0mpSPCzqrdsxacwOUBdrsTiXSZT8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAY
+XSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/
+MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2MDSgMqAw
+hi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3Js
+MB8GA1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUA
+A4IBAQBW7wojoFROlZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMj
+Wqd8BfP9IjsO0QbE2zZMcwSO5bAi5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUx
+XOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2hO0j9n0Hq0V+09+zv+mKts2o
+omcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+TX3EJIrduPuoc
+A06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
+WL1WMRJOEcgh4LMRkWXbtKaIOM5V
+-----END CERTIFICATE-----
+
+# Issuer: O=Chunghwa Telecom Co., Ltd. OU=ePKI Root Certification Authority
+# Subject: O=Chunghwa Telecom Co., Ltd. OU=ePKI Root Certification Authority
+# Label: "ePKI Root Certification Authority"
+# Serial: 28956088682735189655030529057352760477
+# MD5 Fingerprint: 1b:2e:00:ca:26:06:90:3d:ad:fe:6f:15:68:d3:6b:b3
+# SHA1 Fingerprint: 67:65:0d:f1:7e:8e:7e:5b:82:40:a4:f4:56:4b:cf:e2:3d:69:c6:f0
+# SHA256 Fingerprint: c0:a6:f4:dc:63:a2:4b:fd:cf:54:ef:2a:6a:08:2a:0a:72:de:35:80:3e:2f:f5:ff:52:7a:e5:d8:72:06:df:d5
+-----BEGIN CERTIFICATE-----
+MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBe
+MQswCQYDVQQGEwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0
+ZC4xKjAoBgNVBAsMIWVQS0kgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
+Fw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMxMjdaMF4xCzAJBgNVBAYTAlRXMSMw
+IQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEqMCgGA1UECwwhZVBL
+SSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAH
+SyZbCUNsIZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAh
+ijHyl3SJCRImHJ7K2RKilTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3X
+DZoTM1PRYfl61dd4s5oz9wCGzh1NlDivqOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1
+TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX12ruOzjjK9SXDrkb5wdJ
+fzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0OWQqraffA
+sgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uU
+WH1+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLS
+nT0IFaUQAS2zMnaolQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pH
+dmX2Os+PYhcZewoozRrSgx4hxyy/vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJip
+NiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXiZo1jDiVN1Rmy5nk3pyKdVDEC
+AwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/QkqiMAwGA1UdEwQF
+MAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
+ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGB
+uvl2ICO1J2B01GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6Yl
+PwZpVnPDimZI+ymBV3QGypzqKOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkP
+JXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdVxrsStZf0X4OFunHB2WyBEXYKCrC/
+gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEPNXubrjlpC2JgQCA2
+j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+rGNm6
+5ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUB
+o2M3IUxExJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS
+/jQ6fbjpKdx2qcgw+BRxgMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2z
+Gp1iro2C6pSe3VkQw63d4k3jMdXH7OjysP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTE
+W9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmODBCEIZ43ygknQW/2xzQ+D
+hNQ+IIX3Sj0rnP0qCglN6oH4EZw=
+-----END CERTIFICATE-----
+
+# Issuer: CN=TÜBİTAK UEKAE Kök Sertifika Hizmet Sağlayıcısı - Sürüm 3 O=Türkiye Bilimsel ve Teknolojik Araştırma Kurumu - TÜBİTAK OU=Ulusal Elektronik ve Kriptoloji Araştırma Enstitüsü - UEKAE/Kamu Sertifikasyon Merkezi
+# Subject: CN=TÜBİTAK UEKAE Kök Sertifika Hizmet Sağlayıcısı - Sürüm 3 O=Türkiye Bilimsel ve Teknolojik Araştırma Kurumu - TÜBİTAK OU=Ulusal Elektronik ve Kriptoloji Araştırma Enstitüsü - UEKAE/Kamu Sertifikasyon Merkezi
+# Label: "T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3"
+# Serial: 17
+# MD5 Fingerprint: ed:41:f5:8c:50:c5:2b:9c:73:e6:ee:6c:eb:c2:a8:26
+# SHA1 Fingerprint: 1b:4b:39:61:26:27:6b:64:91:a2:68:6d:d7:02:43:21:2d:1f:1d:96
+# SHA256 Fingerprint: e4:c7:34:30:d7:a5:b5:09:25:df:43:37:0a:0d:21:6e:9a:79:b9:d6:db:83:73:a0:c6:9e:b1:cc:31:c7:c5:2a
+-----BEGIN CERTIFICATE-----
+MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRS
+MRgwFgYDVQQHDA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJp
+bGltc2VsIHZlIFRla25vbG9qaWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSw
+VEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ryb25payB2ZSBLcmlwdG9sb2ppIEFy
+YcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNVBAsMGkthbXUgU2Vy
+dGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUgS8O2
+ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAe
+Fw0wNzA4MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIx
+GDAWBgNVBAcMD0dlYnplIC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmls
+aW1zZWwgdmUgVGVrbm9sb2ppayBBcmHFn3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBU
+QUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZlIEtyaXB0b2xvamkgQXJh
+xZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2FtdSBTZXJ0
+aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7Zr
+IFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4h
+gb46ezzb8R1Sf1n68yJMlaCQvEhOEav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yK
+O7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1xnnRFDDtG1hba+818qEhTsXO
+fJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR6Oqeyjh1jmKw
+lZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
+hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQID
+AQABo0IwQDAdBgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmP
+NOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4N5EY3ATIZJkrGG2AA1nJrvhY0D7t
+wyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLTy9LQQfMmNkqblWwM
+7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYhLBOh
+gLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5n
+oN+J1q2MdqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUs
+yZyQ2uypQjyttgI=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Buypass Class 2 CA 1 O=Buypass AS-983163327
+# Subject: CN=Buypass Class 2 CA 1 O=Buypass AS-983163327
+# Label: "Buypass Class 2 CA 1"
+# Serial: 1
+# MD5 Fingerprint: b8:08:9a:f0:03:cc:1b:0d:c8:6c:0b:76:a1:75:64:23
+# SHA1 Fingerprint: a0:a1:ab:90:c9:fc:84:7b:3b:12:61:e8:97:7d:5f:d3:22:61:d3:cc
+# SHA256 Fingerprint: 0f:4e:9c:dd:26:4b:02:55:50:d1:70:80:63:40:21:4f:e9:44:34:c9:b0:2f:69:7e:c7:10:fc:5f:ea:fb:5e:38
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3Mg
+Q2xhc3MgMiBDQSAxMB4XDTA2MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzEL
+MAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYD
+VQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7McXA0
+ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLX
+l18xoS830r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVB
+HfCuuCkslFJgNJQ72uA40Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B
+5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/RuFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3
+WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0PAQH/BAQD
+AgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLP
+gcIV1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+
+DKhQ7SLHrQVMdvvt7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKu
+BctN518fV4bVIJwo+28TOPX2EZL2fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHs
+h7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5wwDX3OaJdZtB7WZ+oRxKaJyOk
+LY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
+-----END CERTIFICATE-----
+
+# Issuer: CN=Buypass Class 3 CA 1 O=Buypass AS-983163327
+# Subject: CN=Buypass Class 3 CA 1 O=Buypass AS-983163327
+# Label: "Buypass Class 3 CA 1"
+# Serial: 2
+# MD5 Fingerprint: df:3c:73:59:81:e7:39:50:81:04:4c:34:a2:cb:b3:7b
+# SHA1 Fingerprint: 61:57:3a:11:df:0e:d8:7e:d5:92:65:22:ea:d0:56:d7:44:b3:23:71
+# SHA256 Fingerprint: b7:b1:2b:17:1f:82:1d:aa:99:0c:d0:fe:50:87:b1:28:44:8b:a8:e5:18:4f:84:c5:1e:02:b5:c8:fb:96:2b:24
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3Mg
+Q2xhc3MgMyBDQSAxMB4XDTA1MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzEL
+MAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYD
+VQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKxifZg
+isRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//z
+NIqeKNc0n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI
++MkcVyzwPX6UvCWThOiaAJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2R
+hzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+
+mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0PAQH/BAQD
+AgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFP
+Bdy7pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27s
+EzNxZy5p+qksP2bAEllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2
+mSlf56oBzKwzqBwKu5HEA6BvtjT5htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yC
+e/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQjel/wroQk5PMr+4okoyeYZdow
+dXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915
+-----END CERTIFICATE-----
+
+# Issuer: CN=EBG Elektronik Sertifika Hizmet Sağlayıcısı O=EBG Bilişim Teknolojileri ve Hizmetleri A.Ş.
+# Subject: CN=EBG Elektronik Sertifika Hizmet Sağlayıcısı O=EBG Bilişim Teknolojileri ve Hizmetleri A.Ş.
+# Label: "EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1"
+# Serial: 5525761995591021570
+# MD5 Fingerprint: 2c:20:26:9d:cb:1a:4a:00:85:b5:b7:5a:ae:c2:01:37
+# SHA1 Fingerprint: 8c:96:ba:eb:dd:2b:07:07:48:ee:30:32:66:a0:f3:98:6e:7c:ae:58
+# SHA256 Fingerprint: 35:ae:5b:dd:d8:f7:ae:63:5c:ff:ba:56:82:a8:f0:0b:95:f4:84:62:c7:10:8e:e9:a0:e5:29:2b:07:4a:af:b2
+-----BEGIN CERTIFICATE-----
+MIIF5zCCA8+gAwIBAgIITK9zQhyOdAIwDQYJKoZIhvcNAQEFBQAwgYAxODA2BgNV
+BAMML0VCRyBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
+c8SxMTcwNQYDVQQKDC5FQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXpt
+ZXRsZXJpIEEuxZ4uMQswCQYDVQQGEwJUUjAeFw0wNjA4MTcwMDIxMDlaFw0xNjA4
+MTQwMDMxMDlaMIGAMTgwNgYDVQQDDC9FQkcgRWxla3Ryb25payBTZXJ0aWZpa2Eg
+SGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTE3MDUGA1UECgwuRUJHIEJpbGnFn2ltIFRl
+a25vbG9qaWxlcmkgdmUgSGl6bWV0bGVyaSBBLsWeLjELMAkGA1UEBhMCVFIwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDuoIRh0DpqZhAy2DE4f6en5f2h
+4fuXd7hxlugTlkaDT7byX3JWbhNgpQGR4lvFzVcfd2NR/y8927k/qqk153nQ9dAk
+tiHq6yOU/im/+4mRDGSaBUorzAzu8T2bgmmkTPiab+ci2hC6X5L8GCcKqKpE+i4s
+tPtGmggDg3KriORqcsnlZR9uKg+ds+g75AxuetpX/dfreYteIAbTdgtsApWjluTL
+dlHRKJ2hGvxEok3MenaoDT2/F08iiFD9rrbskFBKW5+VQarKD7JK/oCZTqNGFav4
+c0JqwmZ2sQomFd2TkuzbqV9UIlKRcF0T6kjsbgNs2d1s/OsNA/+mgxKb8amTD8Um
+TDGyY5lhcucqZJnSuOl14nypqZoaqsNW2xCaPINStnuWt6yHd6i58mcLlEOzrz5z
++kI2sSXFCjEmN1ZnuqMLfdb3ic1nobc6HmZP9qBVFCVMLDMNpkGMvQQxahByCp0O
+Lna9XvNRiYuoP1Vzv9s6xiQFlpJIqkuNKgPlV5EQ9GooFW5Hd4RcUXSfGenmHmMW
+OeMRFeNYGkS9y8RsZteEBt8w9DeiQyJ50hBs37vmExH8nYQKE3vwO9D8owrXieqW
+fo1IhR5kX9tUoqzVegJ5a9KK8GfaZXINFHDk6Y54jzJ0fFfy1tb0Nokb+Clsi7n2
+l9GkLqq+CxnCRelwXQIDAJ3Zo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
+/wQEAwIBBjAdBgNVHQ4EFgQU587GT/wWZ5b6SqMHwQSny2re2kcwHwYDVR0jBBgw
+FoAU587GT/wWZ5b6SqMHwQSny2re2kcwDQYJKoZIhvcNAQEFBQADggIBAJuYml2+
+8ygjdsZs93/mQJ7ANtyVDR2tFcU22NU57/IeIl6zgrRdu0waypIN30ckHrMk2pGI
+6YNw3ZPX6bqz3xZaPt7gyPvT/Wwp+BVGoGgmzJNSroIBk5DKd8pNSe/iWtkqvTDO
+TLKBtjDOWU/aWR1qeqRFsIImgYZ29fUQALjuswnoT4cCB64kXPBfrAowzIpAoHME
+wfuJJPaaHFy3PApnNgUIMbOv2AFoKuB4j3TeuFGkjGwgPaL7s9QJ/XvCgKqTbCmY
+Iai7FvOpEl90tYeY8pUm3zTvilORiF0alKM/fCL414i6poyWqD1SNGKfAB5UVUJn
+xk1Gj7sURT0KlhaOEKGXmdXTMIXM3rRyt7yKPBgpaP3ccQfuJDlq+u2lrDgv+R4Q
+DgZxGhBM/nV+/x5XOULK1+EVoVZVWRvRo68R2E7DpSvvkL/A7IITW43WciyTTo9q
+Kd+FPNMN4KIYEsxVL0e3p5sC/kH2iExt2qkBR4NkJ2IQgtYSe14DHzSpyZH+r11t
+hie3I6p1GMog57AP14kOpmciY/SDQSsGS7tY1dHXt7kQY9iJSrSq3RZj9W6+YKH4
+7ejWkE8axsWgKdOnIaj1Wjz3x0miIZpKlVIglnKaZsv30oZDfCK+lvm9AahH3eU7
+QPl1K5srRmSGjR70j/sHd9DqSaIcjVIUpgqT
+-----END CERTIFICATE-----
+
+# Issuer: O=certSIGN OU=certSIGN ROOT CA
+# Subject: O=certSIGN OU=certSIGN ROOT CA
+# Label: "certSIGN ROOT CA"
+# Serial: 35210227249154
+# MD5 Fingerprint: 18:98:c0:d6:e9:3a:fc:f9:b0:f5:0c:f7:4b:01:44:17
+# SHA1 Fingerprint: fa:b7:ee:36:97:26:62:fb:2d:b0:2a:f6:bf:03:fd:e8:7c:4b:2f:9b
+# SHA256 Fingerprint: ea:a9:62:c4:fa:4a:6b:af:eb:e4:15:19:6d:35:1c:cd:88:8d:4f:53:f3:fa:8a:e6:d7:c4:66:a9:4e:60:42:bb
+-----BEGIN CERTIFICATE-----
+MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYT
+AlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBD
+QTAeFw0wNjA3MDQxNzIwMDRaFw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJP
+MREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7IJUqOtdu0KBuqV5Do
+0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHHrfAQ
+UySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5d
+RdY4zTW2ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQ
+OA7+j0xbm0bqQfWwCHTD0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwv
+JoIQ4uNllAoEwF73XVv4EOLQunpL+943AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08C
+AwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAcYwHQYDVR0O
+BBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IBAQA+0hyJ
+LjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecY
+MnQ8SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ
+44gx+FkagQnIl6Z0x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6I
+Jd1hJyMctTEHBDa0GpC9oHRxUIltvBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNw
+i/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7NzTogVZ96edhBiIL5VaZVDADlN
+9u6wWk5JRFRYX0KD
+-----END CERTIFICATE-----
+
+# Issuer: CN=CNNIC ROOT O=CNNIC
+# Subject: CN=CNNIC ROOT O=CNNIC
+# Label: "CNNIC ROOT"
+# Serial: 1228079105
+# MD5 Fingerprint: 21:bc:82:ab:49:c4:13:3b:4b:b2:2b:5c:6b:90:9c:19
+# SHA1 Fingerprint: 8b:af:4c:9b:1d:f0:2a:92:f7:da:12:8e:b9:1b:ac:f4:98:60:4b:6f
+# SHA256 Fingerprint: e2:83:93:77:3d:a8:45:a6:79:f2:08:0c:c7:fb:44:a3:b7:a1:c3:79:2c:b7:eb:77:29:fd:cb:6a:8d:99:ae:a7
+-----BEGIN CERTIFICATE-----
+MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJD
+TjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2
+MDcwOTE0WhcNMjcwNDE2MDcwOTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMF
+Q05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzDo+/hn7E7SIX1mlwh
+IhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tizVHa6
+dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZO
+V/kbZKKTVrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrC
+GHn2emU1z5DrvTOTn1OrczvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gN
+v7Sg2Ca+I19zN38m5pIEo3/PIKe38zrKy5nLAgMBAAGjczBxMBEGCWCGSAGG+EIB
+AQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscCwQ7vptU7ETAPBgNVHRMB
+Af8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991SlgrHAsEO
+76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnK
+OOK5Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvH
+ugDnuL8BV8F3RTIMO/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7Hgvi
+yJA/qIYM/PmLXoXLT1tLYhFHxUV8BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fL
+buXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2G8kS1sHNzYDzAgE8yGnLRUhj
+2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5mmxE=
+-----END CERTIFICATE-----
+
+# Issuer: O=Japanese Government OU=ApplicationCA
+# Subject: O=Japanese Government OU=ApplicationCA
+# Label: "ApplicationCA - Japanese Government"
+# Serial: 49
+# MD5 Fingerprint: 7e:23:4e:5b:a7:a5:b4:25:e9:00:07:74:11:62:ae:d6
+# SHA1 Fingerprint: 7f:8a:b0:cf:d0:51:87:6a:66:f3:36:0f:47:c8:8d:8c:d3:35:fc:74
+# SHA256 Fingerprint: 2d:47:43:7d:e1:79:51:21:5a:12:f3:c5:8e:51:c7:29:a5:80:26:ef:1f:cc:0a:5f:b3:d9:dc:01:2f:60:0d:19
+-----BEGIN CERTIFICATE-----
+MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEc
+MBoGA1UEChMTSmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRp
+b25DQTAeFw0wNzEyMTIxNTAwMDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYT
+AkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zlcm5tZW50MRYwFAYDVQQLEw1BcHBs
+aWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp23gdE6H
+j6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4fl+K
+f5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55
+IrmTwcrNwVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cw
+FO5cjFW6WY2H/CPek9AEjP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDiht
+QWEjdnjDuGWk81quzMKq2edY3rZ+nYVunyoKb58DKTCXKB28t89UKU5RMfkntigm
+/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRUWssmP3HMlEYNllPqa0jQ
+k/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNVBAYTAkpQ
+MRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOC
+seODvOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ggEBADlqRHZ3ODrso2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJ
+hyzjVOGjprIIC8CFqMjSnHH2HZ9g/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+
+eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYDio+nEhEMy/0/ecGc/WLuo89U
+DNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmWdupwX3kSa+Sj
+B1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
+rosot4LKGAfmt1t06SAZf7IbiVQ=
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Primary Certification Authority - G3 O=GeoTrust Inc. OU=(c) 2008 GeoTrust Inc. - For authorized use only
+# Subject: CN=GeoTrust Primary Certification Authority - G3 O=GeoTrust Inc. OU=(c) 2008 GeoTrust Inc. - For authorized use only
+# Label: "GeoTrust Primary Certification Authority - G3"
+# Serial: 28809105769928564313984085209975885599
+# MD5 Fingerprint: b5:e8:34:36:c9:10:44:58:48:70:6d:2e:83:d4:b8:05
+# SHA1 Fingerprint: 03:9e:ed:b8:0b:e7:a0:3c:69:53:89:3b:20:d2:d9:32:3a:4c:2a:fd
+# SHA256 Fingerprint: b4:78:b8:12:25:0d:f8:78:63:5c:2a:a7:ec:7d:15:5e:aa:62:5e:e8:29:16:e2:cd:29:43:61:88:6c:d1:fb:d4
+-----BEGIN CERTIFICATE-----
+MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCB
+mDELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsT
+MChjKSAyMDA4IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIzNTk1OVowgZgxCzAJ
+BgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
+MjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0
+BgNVBAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz
++uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5jK/BGvESyiaHAKAxJcCGVn2TAppMSAmUm
+hsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdEc5IiaacDiGydY8hS2pgn
+5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3CIShwiP/W
+JmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exAL
+DmKudlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZC
+huOl1UcCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
+HQYDVR0OBBYEFMR5yo6hTgMdHNxr2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IB
+AQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9cr5HqQ6XErhK8WTTOd8lNNTB
+zU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbEAp7aDHdlDkQN
+kv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
+AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUH
+SJsMC8tJP33st/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2G
+spki4cErx5z481+oghLrGREt
+-----END CERTIFICATE-----
+
+# Issuer: CN=thawte Primary Root CA - G2 O=thawte, Inc. OU=(c) 2007 thawte, Inc. - For authorized use only
+# Subject: CN=thawte Primary Root CA - G2 O=thawte, Inc. OU=(c) 2007 thawte, Inc. - For authorized use only
+# Label: "thawte Primary Root CA - G2"
+# Serial: 71758320672825410020661621085256472406
+# MD5 Fingerprint: 74:9d:ea:60:24:c4:fd:22:53:3e:cc:3a:72:d9:29:4f
+# SHA1 Fingerprint: aa:db:bc:22:23:8f:c4:01:a1:27:bb:38:dd:f4:1d:db:08:9e:f0:12
+# SHA256 Fingerprint: a4:31:0d:50:af:18:a6:44:71:90:37:2a:86:af:af:8b:95:1f:fb:43:1d:83:7f:1e:56:88:b4:59:71:ed:15:57
+-----BEGIN CERTIFICATE-----
+MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDEL
+MAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMp
+IDIwMDcgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAi
+BgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMjAeFw0wNzExMDUwMDAw
+MDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
+d3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBGb3Ig
+YXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9v
+dCBDQSAtIEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/
+BebfowJPDQfGAFG6DAJSLSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6
+papu+7qzcMBniKI11KOasf2twu8x+qi58/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmtgAMADna3+FGO6Lts6K
+DPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUNG4k8VIZ3
+KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41ox
+XZ3Krr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=thawte Primary Root CA - G3 O=thawte, Inc. OU=Certification Services Division/(c) 2008 thawte, Inc. - For authorized use only
+# Subject: CN=thawte Primary Root CA - G3 O=thawte, Inc. OU=Certification Services Division/(c) 2008 thawte, Inc. - For authorized use only
+# Label: "thawte Primary Root CA - G3"
+# Serial: 127614157056681299805556476275995414779
+# MD5 Fingerprint: fb:1b:5d:43:8a:94:cd:44:c6:76:f2:43:4b:47:e7:31
+# SHA1 Fingerprint: f1:8b:53:8d:1b:e9:03:b6:a6:f0:56:43:5b:17:15:89:ca:f3:6b:f2
+# SHA256 Fingerprint: 4b:03:f4:58:07:ad:70:f2:1b:fc:2c:ae:71:c9:fd:e4:60:4c:06:4c:f5:ff:b6:86:ba:e5:db:aa:d7:fd:d3:4c
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCB
+rjELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
+Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
+MDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNV
+BAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0wODA0MDIwMDAwMDBa
+Fw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3Rl
+LCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9u
+MTgwNgYDVQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXpl
+ZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEcz
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsr8nLPvb2FvdeHsbnndm
+gcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2AtP0LMqmsywCPLLEHd5N/8
+YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC+BsUa0Lf
+b1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS9
+9irY7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2S
+zhkGcuYMXDhpxwTWvGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUk
+OQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNV
+HQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJKoZIhvcNAQELBQADggEBABpA
+2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweKA3rD6z8KLFIW
+oCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
+t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7c
+KUGRIjxpp7sC8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fM
+m7v/OeZWYdMKp8RcTGB7BXcmer/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZu
+MdRAGmI0Nj81Aa6sY6A=
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Primary Certification Authority - G2 O=GeoTrust Inc. OU=(c) 2007 GeoTrust Inc. - For authorized use only
+# Subject: CN=GeoTrust Primary Certification Authority - G2 O=GeoTrust Inc. OU=(c) 2007 GeoTrust Inc. - For authorized use only
+# Label: "GeoTrust Primary Certification Authority - G2"
+# Serial: 80682863203381065782177908751794619243
+# MD5 Fingerprint: 01:5e:d8:6b:bd:6f:3d:8e:a1:31:f8:12:e0:98:73:6a
+# SHA1 Fingerprint: 8d:17:84:d5:37:f3:03:7d:ec:70:fe:57:8b:51:9a:99:e6:10:d7:b0
+# SHA256 Fingerprint: 5e:db:7a:c4:3b:82:a0:6a:87:61:e8:d7:be:49:79:eb:f2:61:1f:7d:d7:9b:f9:1c:1c:6b:56:6a:21:9e:d7:66
+-----BEGIN CERTIFICATE-----
+MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDEL
+MAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChj
+KSAyMDA3IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2
+MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1OVowgZgxCzAJBgNV
+BAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykgMjAw
+NyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNV
+BAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
+MjB2MBAGByqGSM49AgEGBSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcL
+So17VDs6bl8VAsBQps8lL33KSLjHUGMcKiEIfJo22Av+0SbFWDEwKCXzXV2juLal
+tJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+EVXVMAoG
+CCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGT
+qQ7mndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBucz
+rD6ogRLQy7rQkgu2npaqBA+K
+-----END CERTIFICATE-----
+
+# Issuer: CN=VeriSign Universal Root Certification Authority O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2008 VeriSign, Inc. - For authorized use only
+# Subject: CN=VeriSign Universal Root Certification Authority O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2008 VeriSign, Inc. - For authorized use only
+# Label: "VeriSign Universal Root Certification Authority"
+# Serial: 85209574734084581917763752644031726877
+# MD5 Fingerprint: 8e:ad:b5:01:aa:4d:81:e4:8c:1d:d1:e1:14:00:95:19
+# SHA1 Fingerprint: 36:79:ca:35:66:87:72:30:4d:30:a5:fb:87:3b:0f:a7:7b:b7:0d:54
+# SHA256 Fingerprint: 23:99:56:11:27:a5:71:25:de:8c:ef:ea:61:0d:df:2f:a0:78:b5:c8:06:7f:4e:82:82:90:bf:b8:60:e8:4b:3c
+-----BEGIN CERTIFICATE-----
+MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCB
+vTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJp
+U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MTgwNgYDVQQDEy9W
+ZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
+Fw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJVUzEX
+MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0
+IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9y
+IGF1dGhvcml6ZWQgdXNlIG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNh
+bCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj1mCOkdeQmIN65lgZOIzF
+9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGPMiJhgsWH
+H26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+H
+LL729fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN
+/BMReYTtXlT2NJ8IAfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPT
+rJ9VAMf2CGqUuV/c4DPxhGD5WycRtPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0GCCsGAQUFBwEMBGEwX6FdoFsw
+WTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2Oa8PPgGrUSBgs
+exkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
+DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4
+sAPmLGd75JR3Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+
+seQxIcaBlVZaDrHC1LGmWazxY8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz
+4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTxP/jgdFcrGJ2BtMQo2pSXpXDrrB2+
+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+PwGZsY6rp2aQW9IHR
+lRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4mJO3
+7M2CYfE45k+XmCpajQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G4 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2007 VeriSign, Inc. - For authorized use only
+# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G4 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2007 VeriSign, Inc. - For authorized use only
+# Label: "VeriSign Class 3 Public Primary Certification Authority - G4"
+# Serial: 63143484348153506665311985501458640051
+# MD5 Fingerprint: 3a:52:e1:e7:fd:6f:3a:e3:6f:f3:6f:99:1b:f9:22:41
+# SHA1 Fingerprint: 22:d5:d8:df:8f:02:31:d1:8d:f7:9d:b7:cf:8a:2d:64:c9:3f:6c:3a
+# SHA256 Fingerprint: 69:dd:d7:ea:90:bb:57:c9:3e:13:5d:c8:5e:a6:fc:d5:48:0b:60:32:39:bd:c4:54:fc:75:8b:2a:26:cf:7f:79
+-----BEGIN CERTIFICATE-----
+MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
+ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
+U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
+aXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJp
+U2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwg
+SW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2ln
+biBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8Utpkmw4tXNherJI9/gHm
+GUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGzrl0Bp3ve
+fLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJ
+aW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYj
+aHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMW
+kf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMDA2gAMGUCMGYhDBgmYFo4e1ZC
+4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIxAJw9SDkjOVga
+FRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=NetLock Arany (Class Gold) Főtanúsítvány O=NetLock Kft. OU=Tanúsítványkiadók (Certification Services)
+# Subject: CN=NetLock Arany (Class Gold) Főtanúsítvány O=NetLock Kft. OU=Tanúsítványkiadók (Certification Services)
+# Label: "NetLock Arany (Class Gold) Főtanúsítvány"
+# Serial: 80544274841616
+# MD5 Fingerprint: c5:a1:b7:ff:73:dd:d6:d7:34:32:18:df:fc:3c:ad:88
+# SHA1 Fingerprint: 06:08:3f:59:3f:15:a1:04:a0:69:a4:6b:a9:03:d0:06:b7:97:09:91
+# SHA256 Fingerprint: 6c:61:da:c3:a2:de:f0:31:50:6b:e0:36:d2:a6:fe:40:19:94:fb:d1:3d:f9:c8:d4:66:59:92:74:c4:46:ec:98
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQG
+EwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3
+MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNl
+cnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBBcmFueSAoQ2xhc3MgR29sZCkgRsWR
+dGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgxMjA2MTUwODIxWjCB
+pzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxOZXRM
+b2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlm
+aWNhdGlvbiBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNz
+IEdvbGQpIEbFkXRhbsO6c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAxCRec75LbRTDofTjl5Bu0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrT
+lF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw/HpYzY6b7cNGbIRwXdrz
+AZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAkH3B5r9s5
+VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRG
+ILdwfzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2
+BJtr+UBdADTHLpl1neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAG
+AQH/AgEEMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2M
+U9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwWqZw8UQCgwBEIBaeZ5m8BiFRh
+bvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTtaYtOUZcTh5m2C
++C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
+bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2F
+uLjbvrW5KfnaNwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2
+XjG4Kvte9nHfRCaexOYNkbQudZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Staat der Nederlanden Root CA - G2 O=Staat der Nederlanden
+# Subject: CN=Staat der Nederlanden Root CA - G2 O=Staat der Nederlanden
+# Label: "Staat der Nederlanden Root CA - G2"
+# Serial: 10000012
+# MD5 Fingerprint: 7c:a5:0f:f8:5b:9a:7d:6d:30:ae:54:5a:e3:42:a2:8a
+# SHA1 Fingerprint: 59:af:82:79:91:86:c7:b4:75:07:cb:cf:03:57:46:eb:04:dd:b7:16
+# SHA256 Fingerprint: 66:8c:83:94:7d:a6:3b:72:4b:ec:e1:74:3c:31:a0:e6:ae:d0:db:8e:c5:b3:1b:e3:77:bb:78:4f:91:b6:71:6f
+-----BEGIN CERTIFICATE-----
+MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJO
+TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFh
+dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oX
+DTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMCTkwxHjAcBgNVBAoMFVN0YWF0IGRl
+ciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5lZGVybGFuZGVuIFJv
+b3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ5291
+qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8Sp
+uOUfiUtnvWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPU
+Z5uW6M7XxgpT0GtJlvOjCwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvE
+pMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiile7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp
+5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCROME4HYYEhLoaJXhena/M
+UGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpICT0ugpTN
+GmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy
+5V6548r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv
+6q012iDTiIJh8BIitrzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEK
+eN5KzlW/HdXZt1bv8Hb/C3m1r737qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6
+B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMBAAGjgZcwgZQwDwYDVR0TAQH/
+BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcCARYxaHR0cDov
+L3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqG
+SIb3DQEBCwUAA4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLyS
+CZa59sCrI2AGeYwRTlHSeYAz+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen
+5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwjf/ST7ZwaUb7dRUG/kSS0H4zpX897
+IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaNkqbG9AclVMwWVxJK
+gnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfkCpYL
++63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxL
+vJxxcypFURmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkm
+bEgeqmiSBeGCc1qb3AdbCG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvk
+N1trSt8sV4pAWja63XVECDdCcAz+3F4hoKOKwJCcaNpQ5kUQR3i2TtJlycM33+FC
+Y7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoVIPVVYpbtbZNQvOSqeK3Z
+ywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm66+KAQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=CA Disig O=Disig a.s.
+# Subject: CN=CA Disig O=Disig a.s.
+# Label: "CA Disig"
+# Serial: 1
+# MD5 Fingerprint: 3f:45:96:39:e2:50:87:f7:bb:fe:98:0c:3c:20:98:e6
+# SHA1 Fingerprint: 2a:c8:d5:8b:57:ce:bf:2f:49:af:f2:fc:76:8f:51:14:62:90:7a:41
+# SHA256 Fingerprint: 92:bf:51:19:ab:ec:ca:d0:b1:33:2d:c4:e1:d0:5f:ba:75:b5:67:90:44:ee:0c:a2:6e:93:1f:74:4f:2f:33:cf
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzET
+MBEGA1UEBxMKQnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UE
+AxMIQ0EgRGlzaWcwHhcNMDYwMzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQsw
+CQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcg
+YS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgmGErE
+Nx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnX
+mjxUizkDPw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYD
+XcDtab86wYqg6I7ZuUUohwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhW
+S8+2rT+MitcE5eN4TPWGqvWP+j1scaMtymfraHtuM6kMgiioTGohQBUgDCZbg8Kp
+FhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8wgfwwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0PAQH/BAQD
+AgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cu
+ZGlzaWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5z
+ay9jYS9jcmwvY2FfZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2sv
+Y2EvY3JsL2NhX2Rpc2lnLmNybDAaBgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEw
+DQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59tWDYcPQuBDRIrRhCA/ec8J9B6
+yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3mkkp7M5+cTxq
+EEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
+CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeB
+EicTXxChds6KezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFN
+PGO+I++MzVpQuGhU+QqZMxEA4Z7CRneC9VkGjCFMhwnN5ag=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Juur-SK O=AS Sertifitseerimiskeskus
+# Subject: CN=Juur-SK O=AS Sertifitseerimiskeskus
+# Label: "Juur-SK"
+# Serial: 999181308
+# MD5 Fingerprint: aa:8e:5d:d9:f8:db:0a:58:b7:8d:26:87:6c:82:35:55
+# SHA1 Fingerprint: 40:9d:4b:d9:17:b5:5c:27:b6:9b:64:cb:98:22:44:0d:cd:09:b8:89
+# SHA256 Fingerprint: ec:c3:e9:c3:40:75:03:be:e0:91:aa:95:2f:41:34:8f:f8:8b:aa:86:3b:22:64:be:fa:c8:07:90:15:74:e9:39
+-----BEGIN CERTIFICATE-----
+MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcN
+AQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZp
+dHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMw
+MVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQsw
+CQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEQ
+MA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOB
+SvZiF3tfTQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkz
+ABpTpyHhOEvWgxutr2TC+Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvH
+LCu3GFH+4Hv2qEivbDtPL+/40UceJlfwUR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMP
+PbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDaTpxt4brNj3pssAki14sL
+2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQFMAMBAf8w
+ggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwIC
+MIHDHoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDk
+AGwAagBhAHMAdABhAHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0
+AHMAZQBlAHIAaQBtAGkAcwBrAGUAcwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABz
+AGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABrAGkAbgBuAGkAdABhAG0AaQBz
+AGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nwcy8wKwYDVR0f
+BCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE
+FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcY
+P2/v6X2+MA4GA1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOi
+CfP+JmeaUOTDBS8rNXiRTHyoERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+g
+kcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyLabVAyJRld/JXIWY7zoVAtjNjGr95
+HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678IIbsSt4beDI3poHS
+na9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkhMp6q
+qIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0Z
+TbvGRNs2yyqcjg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Hongkong Post Root CA 1 O=Hongkong Post
+# Subject: CN=Hongkong Post Root CA 1 O=Hongkong Post
+# Label: "Hongkong Post Root CA 1"
+# Serial: 1000
+# MD5 Fingerprint: a8:0d:6f:39:78:b9:43:6d:77:42:6d:98:5a:cc:23:ca
+# SHA1 Fingerprint: d6:da:a8:20:8d:09:d2:15:4d:24:b5:2f:cb:34:6e:b2:58:b2:8a:58
+# SHA256 Fingerprint: f9:e6:7d:33:6c:51:00:2a:c0:54:c6:32:02:2d:66:dd:a2:e7:e3:ff:f1:0a:d0:61:ed:31:d8:bb:b4:10:cf:b2
+-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsx
+FjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3Qg
+Um9vdCBDQSAxMB4XDTAzMDUxNTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkG
+A1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdr
+b25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1ApzQ
+jVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEn
+PzlTCeqrauh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjh
+ZY4bXSNmO7ilMlHIhqqhqZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9
+nnV0ttgCXjqQesBCNnLsak3c78QA3xMYV18meMjWCnl3v/evt3a5pQuEF10Q6m/h
+q5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgED
+MA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7ih9legYsC
+mEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI3
+7piol7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clB
+oiMBdDhViw+5LmeiIAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJs
+EhTkYY2sEJCehFC78JZvRZ+K88psT/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpO
+fMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilTc4afU9hDDl3WY4JxHYB0yvbi
+AmvZWg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=SecureSign RootCA11 O=Japan Certification Services, Inc.
+# Subject: CN=SecureSign RootCA11 O=Japan Certification Services, Inc.
+# Label: "SecureSign RootCA11"
+# Serial: 1
+# MD5 Fingerprint: b7:52:74:e2:92:b4:80:93:f2:75:e4:cc:d7:f2:ea:26
+# SHA1 Fingerprint: 3b:c4:9f:48:f8:f3:73:a0:9c:1e:bd:f8:5b:b1:c3:65:c7:d8:11:b3
+# SHA256 Fingerprint: bf:0f:ee:fb:9e:3a:58:1a:d5:f9:e9:db:75:89:98:57:43:d2:61:08:5c:4d:31:4f:6f:5d:72:59:aa:42:16:12
+-----BEGIN CERTIFICATE-----
+MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDEr
+MCkGA1UEChMiSmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoG
+A1UEAxMTU2VjdXJlU2lnbiBSb290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0
+MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSswKQYDVQQKEyJKYXBhbiBDZXJ0aWZp
+Y2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1cmVTaWduIFJvb3RD
+QTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvLTJsz
+i1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8
+h9uuywGOwvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOV
+MdrAG/LuYpmGYz+/3ZMqg6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9
+UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rPO7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni
+8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitAbpSACW22s293bzUIUPsC
+h8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZXt94wDgYD
+VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
+AKChOBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xm
+KbabfSVSSUOrTC4rbnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQ
+X5Ucv+2rIrVls4W6ng+4reV6G4pQOh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWr
+QbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01y8hSyn+B/tlr0/cR7SXf+Of5
+pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061lgeLKBObjBmN
+QSdJQO7e5iNEOdyhIta6A/I=
+-----END CERTIFICATE-----
+
+# Issuer: CN=ACEDICOM Root O=EDICOM OU=PKI
+# Subject: CN=ACEDICOM Root O=EDICOM OU=PKI
+# Label: "ACEDICOM Root"
+# Serial: 7029493972724711941
+# MD5 Fingerprint: 42:81:a0:e2:1c:e3:55:10:de:55:89:42:65:96:22:e6
+# SHA1 Fingerprint: e0:b4:32:2e:b2:f6:a5:68:b6:54:53:84:48:18:4a:50:36:87:43:84
+# SHA256 Fingerprint: 03:95:0f:b4:9a:53:1f:3e:19:91:94:23:98:df:a9:e0:ea:32:d7:ba:1c:dd:9b:c8:5d:b5:7e:d9:40:0b:43:4a
+-----BEGIN CERTIFICATE-----
+MIIFtTCCA52gAwIBAgIIYY3HhjsBggUwDQYJKoZIhvcNAQEFBQAwRDEWMBQGA1UE
+AwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00x
+CzAJBgNVBAYTAkVTMB4XDTA4MDQxODE2MjQyMloXDTI4MDQxMzE2MjQyMlowRDEW
+MBQGA1UEAwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZF
+RElDT00xCzAJBgNVBAYTAkVTMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEA/5KV4WgGdrQsyFhIyv2AVClVYyT/kGWbEHV7w2rbYgIB8hiGtXxaOLHkWLn7
+09gtn70yN78sFW2+tfQh0hOR2QetAQXW8713zl9CgQr5auODAKgrLlUTY4HKRxx7
+XBZXehuDYAQ6PmXDzQHe3qTWDLqO3tkE7hdWIpuPY/1NFgu3e3eM+SW10W2ZEi5P
+Grjm6gSSrj0RuVFCPYewMYWveVqc/udOXpJPQ/yrOq2lEiZmueIM15jO1FillUAK
+t0SdE3QrwqXrIhWYENiLxQSfHY9g5QYbm8+5eaA9oiM/Qj9r+hwDezCNzmzAv+Yb
+X79nuIQZ1RXve8uQNjFiybwCq0Zfm/4aaJQ0PZCOrfbkHQl/Sog4P75n/TSW9R28
+MHTLOO7VbKvU/PQAtwBbhTIWdjPp2KOZnQUAqhbm84F9b32qhm2tFXTTxKJxqvQU
+fecyuB+81fFOvW8XAjnXDpVCOscAPukmYxHqC9FK/xidstd7LzrZlvvoHpKuE1XI
+2Sf23EgbsCTBheN3nZqk8wwRHQ3ItBTutYJXCb8gWH8vIiPYcMt5bMlL8qkqyPyH
+K9caUPgn6C9D4zq92Fdx/c6mUlv53U3t5fZvie27k5x2IXXwkkwp9y+cAS7+UEae
+ZAwUswdbxcJzbPEHXEUkFDWug/FqTYl6+rPYLWbwNof1K1MCAwEAAaOBqjCBpzAP
+BgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKaz4SsrSbbXc6GqlPUB53NlTKxQ
+MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUprPhKytJttdzoaqU9QHnc2VMrFAw
+RAYDVR0gBD0wOzA5BgRVHSAAMDEwLwYIKwYBBQUHAgEWI2h0dHA6Ly9hY2VkaWNv
+bS5lZGljb21ncm91cC5jb20vZG9jMA0GCSqGSIb3DQEBBQUAA4ICAQDOLAtSUWIm
+fQwng4/F9tqgaHtPkl7qpHMyEVNEskTLnewPeUKzEKbHDZ3Ltvo/Onzqv4hTGzz3
+gvoFNTPhNahXwOf9jU8/kzJPeGYDdwdY6ZXIfj7QeQCM8htRM5u8lOk6e25SLTKe
+I6RF+7YuE7CLGLHdztUdp0J/Vb77W7tH1PwkzQSulgUV1qzOMPPKC8W64iLgpq0i
+5ALudBF/TP94HTXa5gI06xgSYXcGCRZj6hitoocf8seACQl1ThCojz2GuHURwCRi
+ipZ7SkXp7FnFvmuD5uHorLUwHv4FB4D54SMNUI8FmP8sX+g7tq3PgbUhh8oIKiMn
+MCArz+2UW6yyetLHKKGKC5tNSixthT8Jcjxn4tncB7rrZXtaAWPWkFtPF2Y9fwsZ
+o5NjEFIqnxQWWOLcpfShFosOkYuByptZ+thrkQdlVV9SH686+5DdaaVbnG0OLLb6
+zqylfDJKZ0DcMDQj3dcEI2bw/FWAp/tmGYI1Z2JwOV5vx+qQQEQIHriy1tvuWacN
+GHk0vFQYXlPKNFHtRQrmjseCNj6nOGOpMCwXEGCSn1WHElkQwg9naRHMTh5+Spqt
+r0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3otkYNbn5XOmeUwssfnHdK
+Z05phkOTOPu220+DkdRgfks+KzgHVZhepA==
+-----END CERTIFICATE-----
+
+# Issuer: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority
+# Subject: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority
+# Label: "Verisign Class 3 Public Primary Certification Authority"
+# Serial: 80507572722862485515306429940691309246
+# MD5 Fingerprint: ef:5a:f1:33:ef:f1:cd:bb:51:02:ee:12:14:4b:96:c4
+# SHA1 Fingerprint: a1:db:63:93:91:6f:17:e4:18:55:09:40:04:15:c7:02:40:b0:ae:6b
+# SHA256 Fingerprint: a4:b6:b3:99:6f:c2:f3:06:b3:fd:86:81:bd:63:41:3d:8c:50:09:cc:4f:a3:29:c2:cc:f0:e2:fa:1b:14:03:05
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
+cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
+MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
+BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
+BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
+I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
+CSqGSIb3DQEBBQUAA4GBABByUqkFFBkyCEHwxWsKzH4PIRnN5GfcX6kb5sroc50i
+2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWXbj9T/UWZYB2oK0z5XqcJ
+2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/D/xwzoiQ
+-----END CERTIFICATE-----
+
+# Issuer: CN=Microsec e-Szigno Root CA 2009 O=Microsec Ltd.
+# Subject: CN=Microsec e-Szigno Root CA 2009 O=Microsec Ltd.
+# Label: "Microsec e-Szigno Root CA 2009"
+# Serial: 14014712776195784473
+# MD5 Fingerprint: f8:49:f4:03:bc:44:2d:83:be:48:69:7d:29:64:fc:b1
+# SHA1 Fingerprint: 89:df:74:fe:5c:f4:0f:4a:80:f9:e3:37:7d:54:da:91:e1:01:31:8e
+# SHA256 Fingerprint: 3c:5f:81:fe:a5:fa:b8:2c:64:bf:a2:ea:ec:af:cd:e8:e0:77:fc:86:20:a7:ca:e5:37:16:3d:f3:6e:db:f3:78
+-----BEGIN CERTIFICATE-----
+MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYD
+VQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0
+ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0G
+CSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTAeFw0wOTA2MTYxMTMwMThaFw0y
+OTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3Qx
+FjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3pp
+Z25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
+dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvP
+kd6mJviZpWNwrZuuyjNAfW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tc
+cbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG0IMZfcChEhyVbUr02MelTTMuhTlAdX4U
+fIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKApxn1ntxVUwOXewdI/5n7
+N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm1HxdrtbC
+xkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1
++rUCAwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
+A1UdDgQWBBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPM
+Pcu1SCOhGnqmKrs0aDAbBgNVHREEFDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqG
+SIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0olZMEyL/azXm4Q5DwpL7v8u8h
+mLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfXI/OMn74dseGk
+ddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
+tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c
+2Pm2G2JwCz02yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5t
+HMN1Rq41Bab2XD0h7lbwyYIiLXpUq3DDfSJlgnCW
+-----END CERTIFICATE-----
+
+# Issuer: CN=e-Guven Kok Elektronik Sertifika Hizmet Saglayicisi O=Elektronik Bilgi Guvenligi A.S.
+# Subject: CN=e-Guven Kok Elektronik Sertifika Hizmet Saglayicisi O=Elektronik Bilgi Guvenligi A.S.
+# Label: "E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi"
+# Serial: 91184789765598910059173000485363494069
+# MD5 Fingerprint: 3d:41:29:cb:1e:aa:11:74:cd:5d:b0:62:af:b0:43:5b
+# SHA1 Fingerprint: dd:e1:d2:a9:01:80:2e:1d:87:5e:84:b3:80:7e:4b:b1:fd:99:41:34
+# SHA256 Fingerprint: e6:09:07:84:65:a4:19:78:0c:b6:ac:4c:1c:0b:fb:46:53:d9:d9:cc:6e:b3:94:6e:b7:f3:d6:99:97:ba:d5:98
+-----BEGIN CERTIFICATE-----
+MIIDtjCCAp6gAwIBAgIQRJmNPMADJ72cdpW56tustTANBgkqhkiG9w0BAQUFADB1
+MQswCQYDVQQGEwJUUjEoMCYGA1UEChMfRWxla3Ryb25payBCaWxnaSBHdXZlbmxp
+Z2kgQS5TLjE8MDoGA1UEAxMzZS1HdXZlbiBLb2sgRWxla3Ryb25payBTZXJ0aWZp
+a2EgSGl6bWV0IFNhZ2xheWljaXNpMB4XDTA3MDEwNDExMzI0OFoXDTE3MDEwNDEx
+MzI0OFowdTELMAkGA1UEBhMCVFIxKDAmBgNVBAoTH0VsZWt0cm9uaWsgQmlsZ2kg
+R3V2ZW5saWdpIEEuUy4xPDA6BgNVBAMTM2UtR3V2ZW4gS29rIEVsZWt0cm9uaWsg
+U2VydGlmaWthIEhpem1ldCBTYWdsYXlpY2lzaTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAMMSIJ6wXgBljU5Gu4Bc6SwGl9XzcslwuedLZYDBS75+PNdU
+MZTe1RK6UxYC6lhj71vY8+0qGqpxSKPcEC1fX+tcS5yWCEIlKBHMilpiAVDV6wlT
+L/jDj/6z/P2douNffb7tC+Bg62nsM+3YjfsSSYMAyYuXjDtzKjKzEve5TfL0TW3H
+5tYmNwjy2f1rXKPlSFxYvEK+A1qBuhw1DADT9SN+cTAIJjjcJRFHLfO6IxClv7wC
+90Nex/6wN1CZew+TzuZDLMN+DfIcQ2Zgy2ExR4ejT669VmxMvLz4Bcpk9Ok0oSy1
+c+HCPujIyTQlCFzz7abHlJ+tiEMl1+E5YP6sOVkCAwEAAaNCMEAwDgYDVR0PAQH/
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ/uRLOU1fqRTy7ZVZoE
+VtstxNulMA0GCSqGSIb3DQEBBQUAA4IBAQB/X7lTW2M9dTLn+sR0GstG30ZpHFLP
+qk/CaOv/gKlR6D1id4k9CnU58W5dF4dvaAXBlGzZXd/aslnLpRCKysw5zZ/rTt5S
+/wzw9JKp8mxTq5vSR6AfdPebmvEvFZ96ZDAYBzwqD2fK/A+JYZ1lpTzlvBNbCNvj
+/+27BrtqBrF6T2XGgv0enIu1De5Iu7i9qgi0+6N8y5/NkHZchpZ4Vwpm+Vganf2X
+KWDeEaaQHBkc7gGWIjQ0LpH5t8Qn0Xvmv/uARFoW5evg1Ao4vOSR49XrXMGs3xtq
+fJ7lddK2l4fbzIcrQzqECK+rPNv3PGYxhrCdU3nt+CPeQuMtgvEP5fqX
+-----END CERTIFICATE-----
+
+# Issuer: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R3
+# Subject: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R3
+# Label: "GlobalSign Root CA - R3"
+# Serial: 4835703278459759426209954
+# MD5 Fingerprint: c5:df:b8:49:ca:05:13:55:ee:2d:ba:1a:c3:3e:b0:28
+# SHA1 Fingerprint: d6:9b:56:11:48:f0:1c:77:c5:45:78:c1:09:26:df:5b:85:69:76:ad
+# SHA256 Fingerprint: cb:b5:22:d7:b7:f1:27:ad:6a:01:13:86:5b:df:1c:d4:10:2e:7d:07:59:af:63:5a:7c:f4:72:0d:c9:63:c5:3b
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4G
+A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNp
+Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4
+MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEG
+A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWtiHL8
+RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsT
+gHeMCOFJ0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmm
+KPZpO/bLyCiR5Z2KYVc3rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zd
+QQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjlOCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZ
+XriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2xmmFghcCAwEAAaNCMEAw
+DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI/wS3+o
+LkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZU
+RUm7lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMp
+jjM5RcOO5LlXbKr8EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK
+6fBdRoyV3XpYKBovHd7NADdBj+1EbddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQX
+mcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18YIvDQVETI53O9zJrlAGomecs
+Mx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7rkpeDMdmztcpH
+WD9f
+-----END CERTIFICATE-----
+
+# Issuer: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
+# Subject: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
+# Label: "Autoridad de Certificacion Firmaprofesional CIF A62634068"
+# Serial: 6047274297262753887
+# MD5 Fingerprint: 73:3a:74:7a:ec:bb:a3:96:a6:c2:e4:e2:c8:9b:c0:c3
+# SHA1 Fingerprint: ae:c5:fb:3f:c8:e1:bf:c4:e5:4f:03:07:5a:9a:e8:00:b7:f7:b6:fa
+# SHA256 Fingerprint: 04:04:80:28:bf:1f:28:64:d4:8f:9a:d4:d8:32:94:36:6a:82:88:56:55:3f:3b:14:30:3f:90:14:7f:5d:40:ef
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UE
+BhMCRVMxQjBABgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1h
+cHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEy
+MzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUg
+Q2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBBNjI2MzQwNjgwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDDUtd9
+thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQM
+cas9UX4PB99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefG
+L9ItWY16Ck6WaVICqjaY7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15i
+NA9wBj4gGFrO93IbJWyTdBSTo3OxDqqHECNZXyAFGUftaI6SEspd/NYrspI8IM/h
+X68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyIplD9amML9ZMWGxmPsu2b
+m8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctXMbScyJCy
+Z/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirja
+EbsXLZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/T
+KI8xWVvTyQKmtFLKbpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF
+6NkBiDkal4ZkQdU7hwxu+g/GvUgUvzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVh
+OSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNHDhpkLzCBpgYD
+VR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
+cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBv
+ACAAZABlACAAbABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBl
+AGwAbwBuAGEAIAAwADgAMAAxADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF
+661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx51tkljYyGOylMnfX40S2wBEqgLk9
+am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qkR71kMrv2JYSiJ0L1
+ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaPT481
+PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS
+3a/DTg4fJl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5k
+SeTy36LssUzAKh3ntLFlosS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF
+3dvd6qJ2gHN99ZwExEWN57kci57q13XRcrHedUTnQn3iV2t93Jm8PYMo6oCTjcVM
+ZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoRsaS8I8nkvof/uZS2+F0g
+StRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTDKCOM/icz
+Q0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQB
+jLMi6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
+-----END CERTIFICATE-----
+
+# Issuer: CN=Izenpe.com O=IZENPE S.A.
+# Subject: CN=Izenpe.com O=IZENPE S.A.
+# Label: "Izenpe.com"
+# Serial: 917563065490389241595536686991402621
+# MD5 Fingerprint: a6:b0:cd:85:80:da:5c:50:34:a3:39:90:2f:55:67:73
+# SHA1 Fingerprint: 2f:78:3d:25:52:18:a7:4a:65:39:71:b5:2c:a2:9c:45:15:6f:e9:19
+# SHA256 Fingerprint: 25:30:cc:8e:98:32:15:02:ba:d9:6f:9b:1f:ba:1b:09:9e:2d:29:9e:0f:45:48:bb:91:4f:36:3b:c0:d4:53:1f
+-----BEGIN CERTIFICATE-----
+MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4
+MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6
+ZW5wZS5jb20wHhcNMDcxMjEzMTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYD
+VQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5j
+b20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ03rKDx6sp4boFmVq
+scIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAKClaO
+xdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6H
+LmYRY2xU+zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFX
+uaOKmMPsOzTFlUFpfnXCPCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQD
+yCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxTOTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+
+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbKF7jJeodWLBoBHmy+E60Q
+rLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK0GqfvEyN
+BjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8L
+hij+0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIB
+QFqNeb+Lz0vPqhbBleStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+
+HMh3/1uaD7euBUbl8agW7EekFwIDAQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2lu
+Zm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+SVpFTlBFIFMuQS4gLSBDSUYg
+QTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBGNjIgUzgxQzBB
+BgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
+MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwHQYDVR0OBBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUA
+A4ICAQB4pgwWSp9MiDrAyw6lFn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWb
+laQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbgakEyrkgPH7UIBzg/YsfqikuFgba56
+awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8qhT/AQKM6WfxZSzwo
+JNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Csg1lw
+LDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCT
+VyvehQP5aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGk
+LhObNA5me0mrZJfQRsN5nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJb
+UjWumDqtujWTI6cfSN01RpiyEGjkpTHCClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/
+QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZoQ0iy2+tzJOeRf1SktoA+
+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1ZWrOZyGls
+QyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Chambers of Commerce Root - 2008 O=AC Camerfirma S.A.
+# Subject: CN=Chambers of Commerce Root - 2008 O=AC Camerfirma S.A.
+# Label: "Chambers of Commerce Root - 2008"
+# Serial: 11806822484801597146
+# MD5 Fingerprint: 5e:80:9e:84:5a:0e:65:0b:17:02:f3:55:18:2a:3e:d7
+# SHA1 Fingerprint: 78:6a:74:ac:76:ab:14:7f:9c:6a:30:50:ba:9e:a8:7e:fe:9a:ce:3c
+# SHA256 Fingerprint: 06:3e:4a:fa:c4:91:df:d3:32:f3:08:9b:85:42:e9:46:17:d8:93:d7:fe:94:4e:10:a7:93:7e:e2:9d:96:93:c0
+-----BEGIN CERTIFICATE-----
+MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
+VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
+IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
+MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xKTAnBgNVBAMTIENoYW1iZXJz
+IG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEyMjk1MFoXDTM4MDcz
+MTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBj
+dXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIw
+EAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEp
+MCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW9
+28sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKAXuFixrYp4YFs8r/lfTJq
+VKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorjh40G072Q
+DuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR
+5gN/ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfL
+ZEFHcpOrUMPrCXZkNNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05a
+Sd+pZgvMPMZ4fKecHePOjlO+Bd5gD2vlGts/4+EhySnB8esHnFIbAURRPHsl18Tl
+UlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331lubKgdaX8ZSD6e2wsWsSaR6s
++12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ0wlf2eOKNcx5
+Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
+ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAx
+hduub+84Mxh2EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNV
+HQ4EFgQU+SSsD7K1+HnA+mCIG8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1
++HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpN
+YWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29t
+L2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVy
+ZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAt
+IDIwMDiCCQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRV
+HSAAMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20w
+DQYJKoZIhvcNAQEFBQADggIBAJASryI1wqM58C7e6bXpeHxIvj99RZJe6dqxGfwW
+PJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH3qLPaYRgM+gQDROpI9CF
+5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbURWpGqOt1
+glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaH
+FoI6M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2
+pSB7+R5KBWIBpih1YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MD
+xvbxrN8y8NmBGuScvfaAFPDRLLmF9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QG
+tjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcKzBIKinmwPQN/aUv0NCB9szTq
+jktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvGnrDQWzilm1De
+fhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
+OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZ
+d0jQ
+-----END CERTIFICATE-----
+
+# Issuer: CN=Global Chambersign Root - 2008 O=AC Camerfirma S.A.
+# Subject: CN=Global Chambersign Root - 2008 O=AC Camerfirma S.A.
+# Label: "Global Chambersign Root - 2008"
+# Serial: 14541511773111788494
+# MD5 Fingerprint: 9e:80:ff:78:01:0c:2e:c1:36:bd:fe:96:90:6e:08:f3
+# SHA1 Fingerprint: 4a:bd:ee:ec:95:0d:35:9c:89:ae:c7:52:a1:2c:5b:29:f6:d6:aa:0c
+# SHA256 Fingerprint: 13:63:35:43:93:34:a7:69:80:16:a0:d3:24:de:72:28:4e:07:9d:7b:52:20:bb:8f:bd:74:78:16:ee:be:ba:ca
+-----BEGIN CERTIFICATE-----
+MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
+VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
+IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
+MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
+aGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMxNDBaFw0zODA3MzEx
+MjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3Vy
+cmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAG
+A1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAl
+BgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBAMDfVtPkOpt2RbQT2//BthmLN0EYlVJH6xed
+KYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXfXjaOcNFccUMd2drvXNL7
+G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0ZJJ0YPP2
+zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4
+ddPB/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyG
+HoiMvvKRhI9lNNgATH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2
+Id3UwD2ln58fQ1DJu7xsepeY7s2MH/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3V
+yJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfeOx2YItaswTXbo6Al/3K1dh3e
+beksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSFHTynyQbehP9r
+6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
+wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsog
+zCtLkykPAgMBAAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQW
+BBS5CcqcHtvTbDprru1U8VuTBjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDpr
+ru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UEBhMCRVUxQzBBBgNVBAcTOk1hZHJp
+ZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJmaXJtYS5jb20vYWRk
+cmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJmaXJt
+YSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiC
+CQDJzdPp1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCow
+KAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZI
+hvcNAQEFBQADggIBAICIf3DekijZBZRG/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZ
+UohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6ReAJ3spED8IXDneRRXoz
+X1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/sdZ7LoR/x
+fxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVz
+a2Mg9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yyd
+Yhz2rXzdpjEetrHHfoUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMd
+SqlapskD7+3056huirRXhOukP9DuqqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9O
+AP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETrP3iZ8ntxPjzxmKfFGBI/5rso
+M0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVqc5iJWzouE4ge
+v8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
+09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
+-----END CERTIFICATE-----
+
+# Issuer: CN=Go Daddy Root Certificate Authority - G2 O=GoDaddy.com, Inc.
+# Subject: CN=Go Daddy Root Certificate Authority - G2 O=GoDaddy.com, Inc.
+# Label: "Go Daddy Root Certificate Authority - G2"
+# Serial: 0
+# MD5 Fingerprint: 80:3a:bc:22:c1:e6:fb:8d:9b:3b:27:4a:32:1b:9a:01
+# SHA1 Fingerprint: 47:be:ab:c9:22:ea:e8:0e:78:78:34:62:a7:9f:45:c2:54:fd:e6:8b
+# SHA256 Fingerprint: 45:14:0b:32:47:eb:9c:c8:c5:b4:f0:d7:b5:30:91:f7:32:92:08:9e:6e:5a:63:e2:74:9d:d3:ac:a9:19:8e:da
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoT
+EUdvRGFkZHkuY29tLCBJbmMuMTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRp
+ZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIz
+NTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQH
+EwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8GA1UE
+AxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKD
+E6bFIEMBO4Tx5oVJnyfq9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH
+/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD+qK+ihVqf94Lw7YZFAXK6sOoBJQ7Rnwy
+DfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutdfMh8+7ArU6SSYmlRJQVh
+GkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMlNAJWJwGR
+tDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEA
+AaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
+FDqahQcQZyi27/a9BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmX
+WWcDYfF+OwYxdS2hII5PZYe096acvNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu
+9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r5N9ss4UXnT3ZJE95kTXWXwTr
+gIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYVN8Gb5DKj7Tjo
+2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
+LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI
+4uJEvlz36hz1
+-----END CERTIFICATE-----
+
+# Issuer: CN=Starfield Root Certificate Authority - G2 O=Starfield Technologies, Inc.
+# Subject: CN=Starfield Root Certificate Authority - G2 O=Starfield Technologies, Inc.
+# Label: "Starfield Root Certificate Authority - G2"
+# Serial: 0
+# MD5 Fingerprint: d6:39:81:c6:52:7e:96:69:fc:fc:ca:66:ed:05:f2:96
+# SHA1 Fingerprint: b5:1c:06:7c:ee:2b:0c:3d:f8:55:ab:2d:92:f4:fe:39:d4:e7:0f:0e
+# SHA256 Fingerprint: 2c:e1:cb:0b:f9:d2:f9:e1:02:99:3f:be:21:51:52:c3:b2:dd:0c:ab:de:1c:68:e5:31:9b:83:91:54:db:b7:f5
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
+HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVs
+ZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAw
+MFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
+b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVj
+aG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZp
+Y2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAL3twQP89o/8ArFvW59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMg
+nLRJdzIpVv257IzdIvpy3Cdhl+72WoTsbhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1
+HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNkN3mSwOxGXn/hbVNMYq/N
+Hwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7NfZTD4p7dN
+dloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0
+HZbUJtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0G
+CSqGSIb3DQEBCwUAA4IBAQARWfolTwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjU
+sHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx4mcujJUDJi5DnUox9g61DLu3
+4jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUwF5okxBDgBPfg
+8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
+pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1
+mMpYjn0q7pBZc2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
+-----END CERTIFICATE-----
+
+# Issuer: CN=Starfield Services Root Certificate Authority - G2 O=Starfield Technologies, Inc.
+# Subject: CN=Starfield Services Root Certificate Authority - G2 O=Starfield Technologies, Inc.
+# Label: "Starfield Services Root Certificate Authority - G2"
+# Serial: 0
+# MD5 Fingerprint: 17:35:74:af:7b:61:1c:eb:f4:f9:3c:e2:ee:40:f9:a2
+# SHA1 Fingerprint: 92:5a:8f:8d:2c:6d:04:e0:66:5f:59:6a:ff:22:d8:63:e8:25:6f:3f
+# SHA256 Fingerprint: 56:8d:69:05:a2:c8:87:08:a4:b3:02:51:90:ed:cf:ed:b1:97:4a:60:6a:13:c6:e5:29:0f:cb:2a:e6:3e:da:b5
+-----BEGIN CERTIFICATE-----
+MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
+HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVs
+ZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
+MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNVBAYTAlVTMRAwDgYD
+VQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFy
+ZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2Vy
+dmljZXMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20p
+OsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm2
+8xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4PahHQUw2eeBGg6345AWh1K
+Ts9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLPLJGmpufe
+hRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk
+6mFBrMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAw
+DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+q
+AdcwKziIorhtSpzyEZGDMA0GCSqGSIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMI
+bw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPPE95Dz+I0swSdHynVv/heyNXB
+ve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTyxQGjhdByPq1z
+qwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
+iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn
+0q23KXB56jzaYyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCN
+sSi6
+-----END CERTIFICATE-----
+
+# Issuer: CN=AffirmTrust Commercial O=AffirmTrust
+# Subject: CN=AffirmTrust Commercial O=AffirmTrust
+# Label: "AffirmTrust Commercial"
+# Serial: 8608355977964138876
+# MD5 Fingerprint: 82:92:ba:5b:ef:cd:8a:6f:a6:3d:55:f9:84:f6:d6:b7
+# SHA1 Fingerprint: f9:b5:b6:32:45:5f:9c:be:ec:57:5f:80:dc:e9:6e:2c:c7:b2:78:b7
+# SHA256 Fingerprint: 03:76:ab:1d:54:c5:f9:80:3c:e4:b2:e2:01:a0:ee:7e:ef:7b:57:b6:36:e8:a9:3c:9b:8d:48:60:c9:6f:5f:a7
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
+dCBDb21tZXJjaWFsMB4XDTEwMDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDEL
+MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
+cm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6EqdbDuKP
+Hx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yr
+ba0F8PrVC8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPAL
+MeIrJmqbTFeurCA+ukV6BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1
+yHp52UKqK39c/s4mT6NmgTWvRLpUHhwwMmWd5jyTXlBOeuM61G7MGvv50jeuJCqr
+VwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNVHQ4EFgQUnZPGU4teyq8/
+nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
+KoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYG
+XUPGhi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNj
+vbz4YYCanrHOQnDiqX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivt
+Z8SOyUOyXGsViQK8YvxO8rUzqrJv0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9g
+N53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0khsUlHRUe072o0EclNmsxZt9YC
+nlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
+-----END CERTIFICATE-----
+
+# Issuer: CN=AffirmTrust Networking O=AffirmTrust
+# Subject: CN=AffirmTrust Networking O=AffirmTrust
+# Label: "AffirmTrust Networking"
+# Serial: 8957382827206547757
+# MD5 Fingerprint: 42:65:ca:be:01:9a:9a:4c:a9:8c:41:49:cd:c0:d5:7f
+# SHA1 Fingerprint: 29:36:21:02:8b:20:ed:02:f5:66:c5:32:d1:d6:ed:90:9f:45:00:2f
+# SHA256 Fingerprint: 0a:81:ec:5a:92:97:77:f1:45:90:4a:f3:8d:5d:50:9f:66:b5:e2:c5:8f:cd:b5:31:05:8b:0e:17:f3:f0:b4:1b
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
+dCBOZXR3b3JraW5nMB4XDTEwMDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDEL
+MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
+cm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SEHi3y
+YJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbua
+kCNrmreIdIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRL
+QESxG9fhwoXA3hA/Pe24/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp
+6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gbh+0t+nvujArjqWaJGctB+d1ENmHP4ndG
+yH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNVHQ4EFgQUBx/S55zawm6i
+QLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
+KoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfO
+tDIuUFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzu
+QY0x2+c06lkh1QF612S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZ
+Lgo/bNjR9eUJtGxUAArgFU2HdW23WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4u
+olu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9/ZFvgrG+CJPbFEfxojfHRZ48
+x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
+-----END CERTIFICATE-----
+
+# Issuer: CN=AffirmTrust Premium O=AffirmTrust
+# Subject: CN=AffirmTrust Premium O=AffirmTrust
+# Label: "AffirmTrust Premium"
+# Serial: 7893706540734352110
+# MD5 Fingerprint: c4:5d:0e:48:b6:ac:28:30:4e:0a:bc:f9:38:16:87:57
+# SHA1 Fingerprint: d8:a6:33:2c:e0:03:6f:b1:85:f6:63:4f:7d:6a:06:65:26:32:28:27
+# SHA256 Fingerprint: 70:a7:3f:7f:37:6b:60:07:42:48:90:45:34:b1:14:82:d5:bf:0e:69:8e:cc:49:8d:f5:25:77:eb:f2:e9:3b:9a
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVz
+dCBQcmVtaXVtMB4XDTEwMDEyOTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkG
+A1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1U
+cnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxBLf
+qV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtnBKAQ
+JG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ
++jjeRFcV5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrS
+s8PhaJyJ+HoAVt70VZVs+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5
+HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmdGPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d7
+70O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5Rp9EixAqnOEhss/n/fauG
+V+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NIS+LI+H+S
+qHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S
+5u046uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4Ia
+C1nEWTJ3s7xgaVY5/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TX
+OwF0lkLgAOIua+rF7nKsu7/+6qqo+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYE
+FJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
+BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByvMiPIs0laUZx2
+KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
+Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B
+8OWycvpEgjNC6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQ
+MKSOyARiqcTtNd56l+0OOF6SL5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc
+0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK+4w1IX2COPKpVJEZNZOUbWo6xbLQ
+u4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmVBtWVyuEklut89pMF
+u+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFgIxpH
+YoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8
+GKa1qF60g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaO
+RtGdFNrHF+QFlozEJLUbzxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6e
+KeC2uAloGRwYQw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=AffirmTrust Premium ECC O=AffirmTrust
+# Subject: CN=AffirmTrust Premium ECC O=AffirmTrust
+# Label: "AffirmTrust Premium ECC"
+# Serial: 8401224907861490260
+# MD5 Fingerprint: 64:b0:09:55:cf:b1:d5:99:e2:be:13:ab:a6:5d:ea:4d
+# SHA1 Fingerprint: b8:23:6b:00:2f:1d:16:86:53:01:55:6c:11:a4:37:ca:eb:ff:c3:bb
+# SHA256 Fingerprint: bd:71:fd:f6:da:97:e4:cf:62:d1:64:7a:dd:25:81:b0:7d:79:ad:f8:39:7e:b4:ec:ba:9c:5e:84:88:82:14:23
+-----BEGIN CERTIFICATE-----
+MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMC
+VVMxFDASBgNVBAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQ
+cmVtaXVtIEVDQzAeFw0xMDAxMjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJ
+BgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEgMB4GA1UEAwwXQWZmaXJt
+VHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNMF4bFZ0D
+0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQN8O9
+ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0G
+A1UdDgQWBBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/Vs
+aobgxCd05DhT1wV/GzTjxi+zygk8N53X57hG8f2h4nECMEJZh0PUUd+60wkyWs6I
+flc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKMeQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Certum Trusted Network CA O=Unizeto Technologies S.A. OU=Certum Certification Authority
+# Subject: CN=Certum Trusted Network CA O=Unizeto Technologies S.A. OU=Certum Certification Authority
+# Label: "Certum Trusted Network CA"
+# Serial: 279744
+# MD5 Fingerprint: d5:e9:81:40:c5:18:69:fc:46:2c:89:75:62:0f:aa:78
+# SHA1 Fingerprint: 07:e0:32:e0:20:b7:2c:3f:19:2f:06:28:a2:59:3a:19:a7:0f:06:9e
+# SHA256 Fingerprint: 5c:58:46:8d:55:f5:8e:49:7e:74:39:82:d2:b5:00:10:b6:d1:65:37:4a:cf:83:a7:d4:a3:2d:b7:68:c4:40:8e
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBM
+MSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5D
+ZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBU
+cnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIyMTIwNzM3WhcNMjkxMjMxMTIwNzM3
+WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMg
+Uy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSIw
+IAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rH
+UV+rpDKmYYe2bg+G0jACl/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LM
+TXPb865Px1bVWqeWifrzq2jUI4ZZJ88JJ7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVU
+BBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4fOQtf/WsX+sWn7Et0brM
+kUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0cvW0QM8x
+AcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15y
+sHhE49wcrwn9I0j6vSrEuVUEtRCjjSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfL
+I9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1mS1FhIrlQgnXdAIv94nYmem8
+J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5ajZt3hrvJBW8qY
+VoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
+03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Certinomis - Autorité Racine O=Certinomis OU=0002 433998903
+# Subject: CN=Certinomis - Autorité Racine O=Certinomis OU=0002 433998903
+# Label: "Certinomis - Autorité Racine"
+# Serial: 1
+# MD5 Fingerprint: 7f:30:78:8c:03:e3:ca:c9:0a:e2:c9:ea:1e:aa:55:1a
+# SHA1 Fingerprint: 2e:14:da:ec:28:f0:fa:1e:8e:38:9a:4e:ab:eb:26:c0:0a:d3:83:c3
+# SHA256 Fingerprint: fc:bf:e2:88:62:06:f7:2b:27:59:3c:8b:07:02:97:e1:2d:76:9e:d1:0e:d7:93:07:05:a8:09:8e:ff:c1:4d:17
+-----BEGIN CERTIFICATE-----
+MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjET
+MBEGA1UEChMKQ2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAk
+BgNVBAMMHUNlcnRpbm9taXMgLSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4
+Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkGA1UEBhMCRlIxEzARBgNVBAoTCkNl
+cnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYwJAYDVQQDDB1DZXJ0
+aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jY
+F1AMnmHawE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N
+8y4oH3DfVS9O7cdxbwlyLu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWe
+rP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K
+/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92NjMD2AR5vpTESOH2VwnHu
+7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9qc1pkIuVC
+28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6
+lSTClrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1E
+nn1So2+WLhl+HPNbxxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB
+0iSVL1N6aaLwD4ZFjliCK0wi1F6g530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql09
+5gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna4NH4+ej9Uji29YnfAgMBAAGj
+WzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQN
+jLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ
+KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9s
+ov3/4gbIOZ/xWqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZM
+OH8oMDX/nyNTt7buFHAAQCvaR6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q
+619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40nJ+U8/aGH88bc62UeYdocMMzpXDn
+2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1BCxMjidPJC+iKunqj
+o3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjvJL1v
+nxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG
+5ERQL1TEqkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWq
+pdEdnV1j6CTmNhTih60bWfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZb
+dsLLO7XSAPCjDuGtbkD326C00EauFddEwk01+dIL8hf2rGbVJLJP0RyZwG71fet0
+BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/vgt2Fl43N+bYdJeimUV5
+-----END CERTIFICATE-----
+
+# Issuer: CN=Root CA Generalitat Valenciana O=Generalitat Valenciana OU=PKIGVA
+# Subject: CN=Root CA Generalitat Valenciana O=Generalitat Valenciana OU=PKIGVA
+# Label: "Root CA Generalitat Valenciana"
+# Serial: 994436456
+# MD5 Fingerprint: 2c:8c:17:5e:b1:54:ab:93:17:b5:36:5a:db:d1:c6:f2
+# SHA1 Fingerprint: a0:73:e5:c5:bd:43:61:0d:86:4c:21:13:0a:85:58:57:cc:9c:ea:46
+# SHA256 Fingerprint: 8c:4e:df:d0:43:48:f3:22:96:9e:7e:29:a4:cd:4d:ca:00:46:55:06:1c:16:e1:b0:76:42:2e:f3:42:ad:63:0e
+-----BEGIN CERTIFICATE-----
+MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJF
+UzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJ
+R1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcN
+MDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3WjBoMQswCQYDVQQGEwJFUzEfMB0G
+A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScw
+JQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke+
+WmmmO3I2F0zo37i7L3bhQEZ0ZQKQUgi0/6iMweDHiVYQOTPvaLRfX9ptI6GJXiKj
+SgbwJ/BXufjpTjJ3Cj9BZPPrZe52/lSqfR0grvPXdMIKX/UIKFIIzFVd0g/bmoGl
+u6GzwZTNVOAydTGRGmKy3nXiz0+J2ZGQD0EbtFpKd71ng+CT516nDOeB0/RSrFOy
+A8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXteJajCq+TA81yc477OMUxk
+Hl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMBAAGjggM7
+MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBr
+aS5ndmEuZXMwEgYDVR0TAQH/BAgwBgEB/wIBAjCCAjQGA1UdIASCAiswggInMIIC
+IwYKKwYBBAG/VQIBADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8A
+cgBpAGQAYQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIA
+YQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIAYQBsAGkAdABhAHQAIABWAGEA
+bABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQByAGEAYwBpAPMA
+bgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA
+aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMA
+aQBvAG4AYQBtAGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQA
+ZQAgAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEA
+YwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBuAHQAcgBhACAAZQBuACAAbABhACAA
+ZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAAOgAvAC8AdwB3AHcA
+LgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0dHA6
+Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk+y
+eAT8MIGVBgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk+yeAT8oWykajBoMQsw
+CQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0G
+A1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVu
+Y2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRhTvW1yEICKrNcda3Fbcrn
+lD+laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdzCkj+IHLt
+b8zog2EWRpABlUt9jppSCS/2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg
+9J63NI8KJr2XXPR5OkowGcytT6CYirQxlyric21+eLj4iIlPsSKRZEv1UN4D2+XF
+ducTZnV+ZfsBn5OHiJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmC
+IoaZM3Fa6hlXPZHNqcCjbgcTpsnt+GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM=
+-----END CERTIFICATE-----
+
+# Issuer: CN=A-Trust-nQual-03 O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH OU=A-Trust-nQual-03
+# Subject: CN=A-Trust-nQual-03 O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH OU=A-Trust-nQual-03
+# Label: "A-Trust-nQual-03"
+# Serial: 93214
+# MD5 Fingerprint: 49:63:ae:27:f4:d5:95:3d:d8:db:24:86:b8:9c:07:53
+# SHA1 Fingerprint: d3:c0:63:f2:19:ed:07:3e:34:ad:5d:75:0b:32:76:29:ff:d5:9a:f2
+# SHA256 Fingerprint: 79:3c:bf:45:59:b9:fd:e3:8a:b2:2d:f1:68:69:f6:98:81:ae:14:c4:b0:13:9a:c7:88:a7:8a:1a:fc:ca:02:fb
+-----BEGIN CERTIFICATE-----
+MIIDzzCCAregAwIBAgIDAWweMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJB
+VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp
+bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5R
+dWFsLTAzMRkwFwYDVQQDDBBBLVRydXN0LW5RdWFsLTAzMB4XDTA1MDgxNzIyMDAw
+MFoXDTE1MDgxNzIyMDAwMFowgY0xCzAJBgNVBAYTAkFUMUgwRgYDVQQKDD9BLVRy
+dXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0ZW52
+ZXJrZWhyIEdtYkgxGTAXBgNVBAsMEEEtVHJ1c3QtblF1YWwtMDMxGTAXBgNVBAMM
+EEEtVHJ1c3QtblF1YWwtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCtPWFuA/OQO8BBC4SAzewqo51ru27CQoT3URThoKgtUaNR8t4j8DRE/5TrzAUj
+lUC5B3ilJfYKvUWG6Nm9wASOhURh73+nyfrBJcyFLGM/BWBzSQXgYHiVEEvc+RFZ
+znF/QJuKqiTfC0Li21a8StKlDJu3Qz7dg9MmEALP6iPESU7l0+m0iKsMrmKS1GWH
+2WrX9IWf5DMiJaXlyDO6w8dB3F/GaswADm0yqLaHNgBid5seHzTLkDx4iHQF63n1
+k3Flyp3HaxgtPVxO59X4PzF9j4fsCiIvI+n+u33J4PTs63zEsMMtYrWacdaxaujs
+2e3Vcuy+VwHOBVWf3tFgiBCzAgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYD
+VR0OBAoECERqlWdVeRFPMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC
+AQEAVdRU0VlIXLOThaq/Yy/kgM40ozRiPvbY7meIMQQDbwvUB/tOdQ/TLtPAF8fG
+KOwGDREkDg6lXb+MshOWcdzUzg4NCmgybLlBMRmrsQd7TZjTXLDR8KdCoLXEjq/+
+8T/0709GAHbrAvv5ndJAlseIOrifEXnzgGWovR/TeIGgUUw3tKZdJXDRZslo+S4R
+FGjxVJgIrCaSD96JntT6s3kr0qN51OyLrIdTaEJMUVF0HhsnLuP1Hyl0Te2v9+GS
+mYHovjrHF1D2t8b8m7CKa9aIA5GPBnc6hQLdmNVDeD/GMBWsm2vLV7eJUYs66MmE
+DNuxUCAKGkq6ahq97BvIxYSazQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=TWCA Root Certification Authority O=TAIWAN-CA OU=Root CA
+# Subject: CN=TWCA Root Certification Authority O=TAIWAN-CA OU=Root CA
+# Label: "TWCA Root Certification Authority"
+# Serial: 1
+# MD5 Fingerprint: aa:08:8f:f6:f9:7b:b7:f2:b1:a7:1e:9b:ea:ea:bd:79
+# SHA1 Fingerprint: cf:9e:87:6d:d3:eb:fc:42:26:97:a3:b5:a3:7a:a0:76:a9:06:23:48
+# SHA256 Fingerprint: bf:d8:8f:e1:10:1c:41:ae:3e:80:1b:f8:be:56:35:0e:e9:ba:d1:a6:b9:bd:51:5e:dc:5c:6d:5b:87:11:ac:44
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzES
+MBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFU
+V0NBIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMz
+WhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJVEFJV0FO
+LUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFE
+AcK0HMMxQhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HH
+K3XLfJ+utdGdIzdjp9xCoi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeX
+RfwZVzsrb+RH9JlF/h3x+JejiB03HFyP4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/z
+rX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1ry+UPizgN7gr8/g+YnzAx
+3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkq
+hkiG9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeC
+MErJk/9q56YAf4lCmtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdls
+XebQ79NqZp4VKIV66IIArB6nCWlWQtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62D
+lhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVYT0bf+215WfKEIlKuD8z7fDvn
+aspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocnyYh0igzyXxfkZ
+YiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
+-----END CERTIFICATE-----
+
+# Issuer: O=SECOM Trust Systems CO.,LTD. OU=Security Communication RootCA2
+# Subject: O=SECOM Trust Systems CO.,LTD. OU=Security Communication RootCA2
+# Label: "Security Communication RootCA2"
+# Serial: 0
+# MD5 Fingerprint: 6c:39:7d:a4:0e:55:59:b2:3f:d6:41:b1:12:50:de:43
+# SHA1 Fingerprint: 5f:3b:8c:f2:f8:10:b3:7d:78:b4:ce:ec:19:19:c3:73:34:b9:c7:74
+# SHA256 Fingerprint: 51:3b:2c:ec:b8:10:d4:cd:e5:dd:85:39:1a:df:c6:c2:dd:60:d8:7b:b7:36:d2:b5:21:48:4a:a4:7a:0e:be:f6
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDEl
+MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMe
+U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoX
+DTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRy
+dXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3VyaXR5IENvbW11bmlj
+YXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAV
+OVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGr
+zbl+dp+++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVM
+VAX3NuRFg3sUZdbcDE3R3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQ
+hNBqyjoGADdH5H5XTz+L62e4iKrFvlNVspHEfbmwhRkGeC7bYRr6hfVKkaHnFtWO
+ojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1KEOtOghY6rCcMU/Gt1SSw
+awNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8QIH4D5cs
+OPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
+DQEBCwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpF
+coJxDjrSzG+ntKEju/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXc
+okgfGT+Ok+vx+hfuzU7jBBJV1uXk3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8
+t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6qtnRGEmyR7jTV7JqR50S+kDFy
+1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29mvVXIwAHIRc/
+SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
+-----END CERTIFICATE-----
+
+# Issuer: CN=Hellenic Academic and Research Institutions RootCA 2011 O=Hellenic Academic and Research Institutions Cert. Authority
+# Subject: CN=Hellenic Academic and Research Institutions RootCA 2011 O=Hellenic Academic and Research Institutions Cert. Authority
+# Label: "Hellenic Academic and Research Institutions RootCA 2011"
+# Serial: 0
+# MD5 Fingerprint: 73:9f:4c:4b:73:5b:79:e9:fa:ba:1c:ef:6e:cb:d5:c9
+# SHA1 Fingerprint: fe:45:65:9b:79:03:5b:98:a1:61:b5:51:2e:ac:da:58:09:48:22:4d
+# SHA256 Fingerprint: bc:10:4f:15:a4:8b:e7:09:dc:a5:42:a7:e1:d4:b9:df:6f:05:45:27:e8:02:ea:a9:2d:59:54:44:25:8a:fe:71
+-----BEGIN CERTIFICATE-----
+MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1Ix
+RDBCBgNVBAoTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1
+dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1p
+YyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIFJvb3RDQSAyMDExMB4XDTExMTIw
+NjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYTAkdSMUQwQgYDVQQK
+EztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENl
+cnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJl
+c2VhcmNoIEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPz
+dYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJ
+fel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa71HFK9+WXesyHgLacEns
+bgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u8yBRQlqD
+75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSP
+FEDH3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNV
+HRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp
+5dgTBCPuQSUwRwYDVR0eBEAwPqA8MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQu
+b3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQub3JnMA0GCSqGSIb3DQEBBQUA
+A4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVtXdMiKahsog2p
+6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
+TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7
+dIsXRSZMFpGD/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8Acys
+Nnq/onN694/BtZqhFLKPM58N7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXI
+l7WdmplNsDz4SgCbZN2fOUvRJ9e4
+-----END CERTIFICATE-----
+
+# Issuer: CN=Actalis Authentication Root CA O=Actalis S.p.A./03358520967
+# Subject: CN=Actalis Authentication Root CA O=Actalis S.p.A./03358520967
+# Label: "Actalis Authentication Root CA"
+# Serial: 6271844772424770508
+# MD5 Fingerprint: 69:c1:0d:4f:07:a3:1b:c3:fe:56:3d:04:bc:11:f6:a6
+# SHA1 Fingerprint: f3:73:b3:87:06:5a:28:84:8a:f2:f3:4a:ce:19:2b:dd:c7:8e:9c:ac
+# SHA256 Fingerprint: 55:92:60:84:ec:96:3a:64:b9:6e:2a:be:01:ce:0b:a8:6a:64:fb:fe:bc:c7:aa:b5:af:c1:55:b3:7f:d7:60:66
+-----BEGIN CERTIFICATE-----
+MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UE
+BhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8w
+MzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
+IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDkyMjExMjIwMlowazELMAkGA1UEBhMC
+SVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1
+ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENB
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNv
+UTufClrJwkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX
+4ay8IMKx4INRimlNAJZaby/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9
+KK3giq0itFZljoZUj5NDKd45RnijMCO6zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/
+gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1fYVEiVRvjRuPjPdA1Yprb
+rxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2oxgkg4YQ
+51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2F
+be8lEfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxe
+KF+w6D9Fz8+vm2/7hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4F
+v6MGn8i1zeQf1xcGDXqVdFUNaBr8EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbn
+fpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5jF66CyCU3nuDuP/jVo23Eek7
+jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLYiDrIn3hm7Ynz
+ezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
+ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQAL
+e3KHwGCmSUyIWOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70
+jsNjLiNmsGe+b7bAEzlgqqI0JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDz
+WochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKxK3JCaKygvU5a2hi/a5iB0P2avl4V
+SM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+Xlff1ANATIGk0k9j
+pwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC4yyX
+X04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+Ok
+fcvHlXHo2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7R
+K4X9p2jIugErsWx0Hbhzlefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btU
+ZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXemOR/qnuOf0GZvBeyqdn6/axag67XH/JJU
+LysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9vwGYT7JZVEc+NHt4bVaT
+LnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
+-----END CERTIFICATE-----
+
+# Issuer: O=Trustis Limited OU=Trustis FPS Root CA
+# Subject: O=Trustis Limited OU=Trustis FPS Root CA
+# Label: "Trustis FPS Root CA"
+# Serial: 36053640375399034304724988975563710553
+# MD5 Fingerprint: 30:c9:e7:1e:6b:e6:14:eb:65:b2:16:69:20:31:67:4d
+# SHA1 Fingerprint: 3b:c0:38:0b:33:c3:f6:a6:0c:86:15:22:93:d9:df:f5:4b:81:c0:04
+# SHA256 Fingerprint: c1:b4:82:99:ab:a5:20:8f:e9:63:0a:ce:55:ca:68:a0:3e:da:5a:51:9c:88:02:a0:d3:a6:73:be:8f:8e:55:7d
+-----BEGIN CERTIFICATE-----
+MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBF
+MQswCQYDVQQGEwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQL
+ExNUcnVzdGlzIEZQUyBSb290IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTEx
+MzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNVBAoTD1RydXN0aXMgTGltaXRlZDEc
+MBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQRUN+
+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihH
+iTHcDnlkH5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjj
+vSkCqPoc4Vu5g6hBSLwacY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA
+0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zto3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlB
+OrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEAAaNTMFEwDwYDVR0TAQH/
+BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAdBgNVHQ4E
+FgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01
+GX2cGE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmW
+zaD+vkAMXBJV+JOCyinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP4
+1BIy+Q7DsdwyhEQsb8tGD+pmQQ9P8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZE
+f1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHVl/9D7S3B2l0pKoU/rGXuhg8F
+jZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYliB6XzCGcKQEN
+ZetX2fNXlrtIzYE=
+-----END CERTIFICATE-----
+
+# Issuer: CN=StartCom Certification Authority O=StartCom Ltd. OU=Secure Digital Certificate Signing
+# Subject: CN=StartCom Certification Authority O=StartCom Ltd. OU=Secure Digital Certificate Signing
+# Label: "StartCom Certification Authority"
+# Serial: 45
+# MD5 Fingerprint: c9:3b:0d:84:41:fc:a4:76:79:23:08:57:de:10:19:16
+# SHA1 Fingerprint: a3:f1:33:3f:e2:42:bf:cf:c5:d1:4e:8f:39:42:98:40:68:10:d1:a0
+# SHA256 Fingerprint: e1:78:90:ee:09:a3:fb:f4:f4:8b:9c:41:4a:17:d6:37:b7:a5:06:47:e9:bc:75:23:22:72:7f:cc:17:42:a9:11
+-----BEGIN CERTIFICATE-----
+MIIHhzCCBW+gAwIBAgIBLTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
+Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM3WhcNMzYwOTE3MTk0NjM2WjB9
+MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
+U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
+cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
+pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
+OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
+Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
+Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
+HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
+Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
++2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
+Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
+26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
+AQABo4ICEDCCAgwwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
+VR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMB8GA1UdIwQYMBaAFE4L7xqkQFul
+F2mHMMo0aEPQQa7yMIIBWgYDVR0gBIIBUTCCAU0wggFJBgsrBgEEAYG1NwEBATCC
+ATgwLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5w
+ZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVybWVk
+aWF0ZS5wZGYwgc8GCCsGAQUFBwICMIHCMCcWIFN0YXJ0IENvbW1lcmNpYWwgKFN0
+YXJ0Q29tKSBMdGQuMAMCAQEagZZMaW1pdGVkIExpYWJpbGl0eSwgcmVhZCB0aGUg
+c2VjdGlvbiAqTGVnYWwgTGltaXRhdGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eSBQb2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93
+d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgG
+CWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1
+dGhvcml0eTANBgkqhkiG9w0BAQsFAAOCAgEAjo/n3JR5fPGFf59Jb2vKXfuM/gTF
+wWLRfUKKvFO3lANmMD+x5wqnUCBVJX92ehQN6wQOQOY+2IirByeDqXWmN3PH/UvS
+Ta0XQMhGvjt/UfzDtgUx3M2FIk5xt/JxXrAaxrqTi3iSSoX4eA+D/i+tLPfkpLst
+0OcNOrg+zvZ49q5HJMqjNTbOx8aHmNrs++myziebiMMEofYLWWivydsQD032ZGNc
+pRJvkrKTlMeIFw6Ttn5ii5B/q06f/ON1FE8qMt9bDeD1e5MNq6HPh+GlBEXoPBKl
+CcWw0bdT82AUuoVpaiF8H3VhFyAXe2w7QSlc4axa0c2Mm+tgHRns9+Ww2vl5GKVF
+P0lDV9LdJNUso/2RjSe15esUBppMeyG7Oq0wBhjA2MFrLH9ZXF2RsXAiV+uKa0hK
+1Q8p7MZAwC+ITGgBF3f0JBlPvfrhsiAhS90a2Cl9qrjeVOwhVYBsHvUwyKMQ5bLm
+KhQxw4UtjJixhlpPiVktucf3HMiKf8CdBUrmQk9io20ppB+Fq9vlgcitKj1MXVuE
+JnHEhV5xJMqlG2zYYdMa4FTbzrqpMrUi9nNBCV24F10OD5mQ1kfabwo6YigUZ4LZ
+8dCAWZvLMdibD4x3TrVoivJs9iQOLWxwxXPR3hTQcY+203sC9uO41Alua551hDnm
+fyWl8kgAwKQB2j8=
+-----END CERTIFICATE-----
+
+# Issuer: CN=StartCom Certification Authority G2 O=StartCom Ltd.
+# Subject: CN=StartCom Certification Authority G2 O=StartCom Ltd.
+# Label: "StartCom Certification Authority G2"
+# Serial: 59
+# MD5 Fingerprint: 78:4b:fb:9e:64:82:0a:d3:b8:4c:62:f3:64:f2:90:64
+# SHA1 Fingerprint: 31:f1:fd:68:22:63:20:ee:c6:3b:3f:9d:ea:4a:3e:53:7c:7c:39:17
+# SHA256 Fingerprint: c7:ba:65:67:de:93:a7:98:ae:1f:aa:79:1e:71:2d:37:8f:ae:1f:93:c4:39:7f:ea:44:1b:b7:cb:e6:fd:59:95
+-----BEGIN CERTIFICATE-----
+MIIFYzCCA0ugAwIBAgIBOzANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkgRzIwHhcNMTAwMTAxMDEwMDAxWhcNMzkxMjMxMjM1
+OTAxWjBTMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjEsMCoG
+A1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRzIwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2iTZbB7cgNr2Cu+EWIAOVeq8Oo1XJ
+JZlKxdBWQYeQTSFgpBSHO839sj60ZwNq7eEPS8CRhXBF4EKe3ikj1AENoBB5uNsD
+vfOpL9HG4A/LnooUCri99lZi8cVytjIl2bLzvWXFDSxu1ZJvGIsAQRSCb0AgJnoo
+D/Uefyf3lLE3PbfHkffiAez9lInhzG7TNtYKGXmu1zSCZf98Qru23QumNK9LYP5/
+Q0kGi4xDuFby2X8hQxfqp0iVAXV16iulQ5XqFYSdCI0mblWbq9zSOdIxHWDirMxW
+RST1HFSr7obdljKF+ExP6JV2tgXdNiNnvP8V4so75qbsO+wmETRIjfaAKxojAuuK
+HDp2KntWFhxyKrOq42ClAJ8Em+JvHhRYW6Vsi1g8w7pOOlz34ZYrPu8HvKTlXcxN
+nw3h3Kq74W4a7I/htkxNeXJdFzULHdfBR9qWJODQcqhaX2YtENwvKhOuJv4KHBnM
+0D4LnMgJLvlblnpHnOl68wVQdJVznjAJ85eCXuaPOQgeWeU1FEIT/wCc976qUM/i
+UUjXuG+v+E5+M5iSFGI6dWPPe/regjupuznixL0sAA7IF6wT700ljtizkC+p2il9
+Ha90OrInwMEePnWjFqmveiJdnxMaz6eg6+OGCtP95paV1yPIN93EfKo2rJgaErHg
+TuixO/XWb/Ew1wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
+AwIBBjAdBgNVHQ4EFgQUS8W0QGutHLOlHGVuRjaJhwUMDrYwDQYJKoZIhvcNAQEL
+BQADggIBAHNXPyzVlTJ+N9uWkusZXn5T50HsEbZH77Xe7XRcxfGOSeD8bpkTzZ+K
+2s06Ctg6Wgk/XzTQLwPSZh0avZyQN8gMjgdalEVGKua+etqhqaRpEpKwfTbURIfX
+UfEpY9Z1zRbkJ4kd+MIySP3bmdCPX1R0zKxnNBFi2QwKN4fRoxdIjtIXHfbX/dtl
+6/2o1PXWT6RbdejF0mCy2wl+JYt7ulKSnj7oxXehPOBKc2thz4bcQ///If4jXSRK
+9dNtD2IEBVeC2m6kMyV5Sy5UGYvMLD0w6dEG/+gyRr61M3Z3qAFdlsHB1b6uJcDJ
+HgoJIIihDsnzb02CVAAgp9KP5DlUFy6NHrgbuxu9mk47EDTcnIhT76IxW1hPkWLI
+wpqazRVdOKnWvvgTtZ8SafJQYqz7Fzf07rh1Z2AQ+4NQ+US1dZxAF7L+/XldblhY
+XzD8AK6vM8EOTmy6p6ahfzLbOOCxchcKK5HsamMm7YnUeMx0HgX4a/6ManY5Ka5l
+IxKVCCIcl85bBu4M4ru8H0ST9tg4RQUh7eStqxK2A6RCLi3ECToDZ2mEmuFZkIoo
+hdVddLHRDiBYmxOlsGOm7XtH/UVVMKTumtTm4ofvmMkyghEpIrwACjFeLQ/Ajulr
+so8uBtjRkcfGEvRM/TAXw8HaOFvjqermobp573PYtlNXLfbQ4ddI
+-----END CERTIFICATE-----
+
+# Issuer: CN=Buypass Class 2 Root CA O=Buypass AS-983163327
+# Subject: CN=Buypass Class 2 Root CA O=Buypass AS-983163327
+# Label: "Buypass Class 2 Root CA"
+# Serial: 2
+# MD5 Fingerprint: 46:a7:d2:fe:45:fb:64:5a:a8:59:90:9b:78:44:9b:29
+# SHA1 Fingerprint: 49:0a:75:74:de:87:0a:47:fe:58:ee:f6:c7:6b:eb:c6:0b:12:40:99
+# SHA256 Fingerprint: 9a:11:40:25:19:7c:5b:b9:5d:94:e6:3d:55:cd:43:79:08:47:b6:46:b2:3c:df:11:ad:a4:a0:0e:ff:15:fb:48
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
+Q2xhc3MgMiBSb290IENBMB4XDTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1ow
+TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
+HgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1g1Lr
+6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPV
+L4O2fuPn9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC91
+1K2GScuVr1QGbNgGE41b/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHx
+MlAQTn/0hpPshNOOvEu/XAFOBz3cFIqUCqTqc/sLUegTBxj6DvEr0VQVfTzh97QZ
+QmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeffawrbD02TTqigzXsu8lkB
+arcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgIzRFo1clr
+Us3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLi
+FRhnBkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRS
+P/TizPJhk9H9Z2vXUq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN
+9SG9dKpN6nIDSdvHXx1iY8f93ZHsM+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxP
+AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMmAd+BikoL1Rpzz
+uvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAU18h
+9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
+A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3t
+OluwlN5E40EIosHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo
++fsicdl9sz1Gv7SEr5AcD48Saq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7
+KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYdDnkM/crqJIByw5c/8nerQyIKx+u2
+DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWDLfJ6v9r9jv6ly0Us
+H8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0oyLQ
+I+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK7
+5t98biGCwWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h
+3PFaTWwyI0PurKju7koSCTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPz
+Y11aWOIv4x3kqdbQCtCev9eBCfHJxyYNrJgWVqA=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Buypass Class 3 Root CA O=Buypass AS-983163327
+# Subject: CN=Buypass Class 3 Root CA O=Buypass AS-983163327
+# Label: "Buypass Class 3 Root CA"
+# Serial: 2
+# MD5 Fingerprint: 3d:3b:18:9e:2c:64:5a:e8:d5:88:ce:0e:f9:37:c2:ec
+# SHA1 Fingerprint: da:fa:f7:fa:66:84:ec:06:8f:14:50:bd:c7:c2:81:a5:bc:a9:64:57
+# SHA256 Fingerprint: ed:f7:eb:bc:a2:7a:2a:38:4d:38:7b:7d:40:10:c6:66:e2:ed:b4:84:3e:4c:29:b4:ae:1d:5b:93:32:e6:b2:4d
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
+Q2xhc3MgMyBSb290IENBMB4XDTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFow
+TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
+HgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRHsJ8Y
+ZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3E
+N3coTRiR5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9
+tznDDgFHmV0ST9tD+leh7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX
+0DJq1l1sDPGzbjniazEuOQAnFN44wOwZZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c
+/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH2xc519woe2v1n/MuwU8X
+KhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV/afmiSTY
+zIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvS
+O1UQRwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D
+34xFMFbG02SrZvPAXpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgP
+K9Dx2hzLabjKSWJtyNBjYt1gD1iqj6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3
+AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFEe4zf/lb+74suwv
+Tg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAACAj
+QTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
+cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXS
+IGrs/CIBKM+GuIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2
+HJLw5QY33KbmkJs4j1xrG0aGQ0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsa
+O5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8ZORK15FTAaggiG6cX0S5y2CBNOxv
+033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2KSb12tjE8nVhz36u
+dmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz6MkE
+kbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg41
+3OEMXbugUZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvD
+u79leNKGef9JOxqDDPDeeOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq
+4/g7u9xN12TyUb7mqqta6THuBrxzvxNiCp/HuZc=
+-----END CERTIFICATE-----
+
+# Issuer: CN=T-TeleSec GlobalRoot Class 3 O=T-Systems Enterprise Services GmbH OU=T-Systems Trust Center
+# Subject: CN=T-TeleSec GlobalRoot Class 3 O=T-Systems Enterprise Services GmbH OU=T-Systems Trust Center
+# Label: "T-TeleSec GlobalRoot Class 3"
+# Serial: 1
+# MD5 Fingerprint: ca:fb:40:a8:4e:39:92:8a:1d:fe:8e:2f:c4:27:ea:ef
+# SHA1 Fingerprint: 55:a6:72:3e:cb:f2:ec:cd:c3:23:74:70:19:9d:2a:be:11:e3:81:d1
+# SHA256 Fingerprint: fd:73:da:d3:1c:64:4f:f1:b4:3b:ef:0c:cd:da:96:71:0b:9c:d9:87:5e:ca:7e:31:70:7a:f3:e9:6d:52:2b:bd
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUx
+KzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAd
+BgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNl
+YyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgxMDAxMTAyOTU2WhcNMzMxMDAxMjM1
+OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnBy
+aXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50
+ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN
+8ELg63iIVl6bmlQdTQyK9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/
+RLyTPWGrTs0NvvAgJ1gORH8EGoel15YUNpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4
+hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZFiP0Zf3WHHx+xGwpzJFu5
+ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W0eDrXltM
+EnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGj
+QjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1
+A/d2O2GCahKqGFPrAyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOy
+WL6ukK2YJ5f+AbGwUgC4TeQbIXQbfsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ
+1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzTucpH9sry9uetuUg/vBa3wW30
+6gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7hP0HHRwA11fXT
+91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
+e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4p
+TpPDpFQUWw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=EE Certification Centre Root CA O=AS Sertifitseerimiskeskus
+# Subject: CN=EE Certification Centre Root CA O=AS Sertifitseerimiskeskus
+# Label: "EE Certification Centre Root CA"
+# Serial: 112324828676200291871926431888494945866
+# MD5 Fingerprint: 43:5e:88:d4:7d:1a:4a:7e:fd:84:2e:52:eb:01:d4:6f
+# SHA1 Fingerprint: c9:a8:b9:e7:55:80:5e:58:e3:53:77:a7:25:eb:af:c3:7b:27:cc:d7
+# SHA256 Fingerprint: 3e:84:ba:43:42:90:85:16:e7:75:73:c0:99:2f:09:79:ca:08:4e:46:85:68:1f:f1:95:cc:ba:8a:22:9b:8a:76
+-----BEGIN CERTIFICATE-----
+MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1
+MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1
+czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYG
+CSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIwMTAxMDMwMTAxMDMwWhgPMjAzMDEy
+MTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlBUyBTZXJ0aWZpdHNl
+ZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRyZSBS
+b290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUy
+euuOF0+W2Ap7kaJjbMeMTC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvO
+bntl8jixwKIy72KyaOBhU8E2lf/slLo2rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIw
+WFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw93X2PaRka9ZP585ArQ/d
+MtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtNP2MbRMNE
+1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/
+zQas8fElyalL1BSZMEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYB
+BQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEF
+BQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+RjxY6hUFaTlrg4wCQiZrxTFGGV
+v9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqMlIpPnTX/dqQG
+E5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
+uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIW
+iAYLtqZLICjU3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/v
+GVCJYMzpJJUPwssd8m92kMfMdcGWxZ0=
+-----END CERTIFICATE-----
+
+# Issuer: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş. (c) Aralık 2007
+# Subject: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş. (c) Aralık 2007
+# Label: "TURKTRUST Certificate Services Provider Root 2007"
+# Serial: 1
+# MD5 Fingerprint: 2b:70:20:56:86:82:a0:18:c8:07:53:12:28:70:21:72
+# SHA1 Fingerprint: f1:7f:6f:b6:31:dc:99:e3:a3:c8:7f:fe:1c:f1:81:10:88:d9:60:33
+# SHA256 Fingerprint: 97:8c:d9:66:f2:fa:a0:7b:a7:aa:95:00:d9:c0:2e:9d:77:f2:cd:ad:a6:ad:6b:a7:4a:f4:b9:1c:66:59:3c:50
+-----BEGIN CERTIFICATE-----
+MIIEPTCCAyWgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvzE/MD0GA1UEAww2VMOc
+UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
+c8SxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMV4wXAYDVQQKDFVUw5xS
+S1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kg
+SGl6bWV0bGVyaSBBLsWeLiAoYykgQXJhbMSxayAyMDA3MB4XDTA3MTIyNTE4Mzcx
+OVoXDTE3MTIyMjE4MzcxOVowgb8xPzA9BgNVBAMMNlTDnFJLVFJVU1QgRWxla3Ry
+b25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTELMAkGA1UEBhMC
+VFIxDzANBgNVBAcMBkFua2FyYTFeMFwGA1UECgxVVMOcUktUUlVTVCBCaWxnaSDE
+sGxldGnFn2ltIHZlIEJpbGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7F
+ni4gKGMpIEFyYWzEsWsgMjAwNzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAKu3PgqMyKVYFeaK7yc9SrToJdPNM8Ig3BnuiD9NYvDdE3ePYakqtdTyuTFY
+KTsvP2qcb3N2Je40IIDu6rfwxArNK4aUyeNgsURSsloptJGXg9i3phQvKUmi8wUG
++7RP2qFsmmaf8EMJyupyj+sA1zU511YXRxcw9L6/P8JorzZAwan0qafoEGsIiveG
+HtyaKhUG9qPw9ODHFNRRf8+0222vR5YXm3dx2KdxnSQM9pQ/hTEST7ruToK4uT6P
+IzdezKKqdfcYbwnTrqdUKDT74eA7YH2gvnmJhsifLfkKS8RQouf9eRbHegsYz85M
+733WB2+Y8a+xwXrXgTW4qhe04MsCAwEAAaNCMEAwHQYDVR0OBBYEFCnFkKslrxHk
+Yb+j/4hhkeYO/pyBMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBBQUAA4IBAQAQDdr4Ouwo0RSVgrESLFF6QSU2TJ/sPx+EnWVUXKgW
+AkD6bho3hO9ynYYKVZ1WKKxmLNA6VpM0ByWtCLCPyA8JWcqdmBzlVPi5RX9ql2+I
+aE1KBiY3iAIOtsbWcpnOa3faYjGkVh+uX4132l32iPwa2Z61gfAyuOOI0JzzaqC5
+mxRZNTZPz/OOXl0XrRWV2N2y1RVuAE6zS89mlOTgzbUF2mNXi+WzqtvALhyQRNsa
+XRik7r4EW5nVcV9VZWRi1aKbBFmGyGJ353yCRWo9F7/snXUMrqNvWtMvmDb08PUZ
+qxFdyKbjKlhqQgnDvZImZjINXQhVdP+MmNAKpoRq0Tl9
+-----END CERTIFICATE-----
+
+# Issuer: CN=D-TRUST Root Class 3 CA 2 2009 O=D-Trust GmbH
+# Subject: CN=D-TRUST Root Class 3 CA 2 2009 O=D-Trust GmbH
+# Label: "D-TRUST Root Class 3 CA 2 2009"
+# Serial: 623603
+# MD5 Fingerprint: cd:e0:25:69:8d:47:ac:9c:89:35:90:f7:fd:51:3d:2f
+# SHA1 Fingerprint: 58:e8:ab:b0:36:15:33:fb:80:f7:9b:1b:6d:29:d3:ff:8d:5f:00:f0
+# SHA256 Fingerprint: 49:e7:a4:42:ac:f0:ea:62:87:05:00:54:b5:25:64:b6:50:e4:f4:9e:42:e3:48:d6:aa:38:e0:39:e9:57:b1:c1
+-----BEGIN CERTIFICATE-----
+MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRF
+MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBD
+bGFzcyAzIENBIDIgMjAwOTAeFw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NTha
+ME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMM
+HkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOADER03
+UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42
+tSHKXzlABF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9R
+ySPocq60vFYJfxLLHLGvKZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsM
+lFqVlNpQmvH/pStmMaTJOKDfHR+4CS7zp+hnUquVH+BGPtikw8paxTGA6Eian5Rp
+/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUCAwEAAaOCARowggEWMA8G
+A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ4PGEMA4G
+A1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVj
+dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUy
+MENBJTIwMiUyMDIwMDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRl
+cmV2b2NhdGlvbmxpc3QwQ6BBoD+GPWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3Js
+L2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAwOS5jcmwwDQYJKoZIhvcNAQEL
+BQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm2H6NMLVwMeni
+acfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
+o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4K
+zCUqNQT4YJEVdT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8
+PIWmawomDeCTmGCufsYkl4phX5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3Y
+Johw1+qRzT65ysCQblrGXnRl11z+o+I=
+-----END CERTIFICATE-----
+
+# Issuer: CN=D-TRUST Root Class 3 CA 2 EV 2009 O=D-Trust GmbH
+# Subject: CN=D-TRUST Root Class 3 CA 2 EV 2009 O=D-Trust GmbH
+# Label: "D-TRUST Root Class 3 CA 2 EV 2009"
+# Serial: 623604
+# MD5 Fingerprint: aa:c6:43:2c:5e:2d:cd:c4:34:c0:50:4f:11:02:4f:b6
+# SHA1 Fingerprint: 96:c9:1b:0b:95:b4:10:98:42:fa:d0:d8:22:79:fe:60:fa:b9:16:83
+# SHA256 Fingerprint: ee:c5:49:6b:98:8c:e9:86:25:b9:34:09:2e:ec:29:08:be:d0:b0:f3:16:c2:d4:73:0c:84:ea:f1:f3:d3:48:81
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRF
+MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBD
+bGFzcyAzIENBIDIgRVYgMjAwOTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUw
+NDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNV
+BAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAwOTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfSegpn
+ljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM0
+3TP1YtHhzRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6Z
+qQTMFexgaDbtCHu39b+T7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lR
+p75mpoo6Kr3HGrHhFPC+Oh25z1uxav60sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8
+HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure3511H3a6UCAwEAAaOCASQw
+ggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyvcop9Ntea
+HNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFw
+Oi8vZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xh
+c3MlMjAzJTIwQ0ElMjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1E
+RT9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0MEagRKBChkBodHRwOi8vd3d3LmQt
+dHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xhc3NfM19jYV8yX2V2XzIwMDku
+Y3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+PPoeUSbrh/Yp
+3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
+nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNF
+CSuGdXzfX2lXANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7na
+xpeG0ILD5EJt/rDiZE4OJudANCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqX
+KVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVvw9y4AyHqnxbxLFS1
+-----END CERTIFICATE-----
+
+# Issuer: CN=Autoridad de Certificacion Raiz del Estado Venezolano O=Sistema Nacional de Certificacion Electronica OU=Superintendencia de Servicios de Certificacion Electronica
+# Subject: CN=PSCProcert O=Sistema Nacional de Certificacion Electronica OU=Proveedor de Certificados PROCERT
+# Label: "PSCProcert"
+# Serial: 11
+# MD5 Fingerprint: e6:24:e9:12:01:ae:0c:de:8e:85:c4:ce:a3:12:dd:ec
+# SHA1 Fingerprint: 70:c1:8d:74:b4:28:81:0a:e4:fd:a5:75:d7:01:9f:99:b0:3d:50:74
+# SHA256 Fingerprint: 3c:fc:3c:14:d1:f6:84:ff:17:e3:8c:43:ca:44:0c:00:b9:67:ec:93:3e:8b:fe:06:4c:a1:d7:2c:90:f2:ad:b0
+-----BEGIN CERTIFICATE-----
+MIIJhjCCB26gAwIBAgIBCzANBgkqhkiG9w0BAQsFADCCAR4xPjA8BgNVBAMTNUF1
+dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIFJhaXogZGVsIEVzdGFkbyBWZW5lem9s
+YW5vMQswCQYDVQQGEwJWRTEQMA4GA1UEBxMHQ2FyYWNhczEZMBcGA1UECBMQRGlz
+dHJpdG8gQ2FwaXRhbDE2MDQGA1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0
+aWZpY2FjaW9uIEVsZWN0cm9uaWNhMUMwQQYDVQQLEzpTdXBlcmludGVuZGVuY2lh
+IGRlIFNlcnZpY2lvcyBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMSUwIwYJ
+KoZIhvcNAQkBFhZhY3JhaXpAc3VzY2VydGUuZ29iLnZlMB4XDTEwMTIyODE2NTEw
+MFoXDTIwMTIyNTIzNTk1OVowgdExJjAkBgkqhkiG9w0BCQEWF2NvbnRhY3RvQHBy
+b2NlcnQubmV0LnZlMQ8wDQYDVQQHEwZDaGFjYW8xEDAOBgNVBAgTB01pcmFuZGEx
+KjAoBgNVBAsTIVByb3ZlZWRvciBkZSBDZXJ0aWZpY2Fkb3MgUFJPQ0VSVDE2MDQG
+A1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9u
+aWNhMQswCQYDVQQGEwJWRTETMBEGA1UEAxMKUFNDUHJvY2VydDCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBANW39KOUM6FGqVVhSQ2oh3NekS1wwQYalNo9
+7BVCwfWMrmoX8Yqt/ICV6oNEolt6Vc5Pp6XVurgfoCfAUFM+jbnADrgV3NZs+J74
+BCXfgI8Qhd19L3uA3VcAZCP4bsm+lU/hdezgfl6VzbHvvnpC2Mks0+saGiKLt38G
+ieU89RLAu9MLmV+QfI4tL3czkkohRqipCKzx9hEC2ZUWno0vluYC3XXCFCpa1sl9
+JcLB/KpnheLsvtF8PPqv1W7/U0HU9TI4seJfxPmOEO8GqQKJ/+MMbpfg353bIdD0
+PghpbNjU5Db4g7ayNo+c7zo3Fn2/omnXO1ty0K+qP1xmk6wKImG20qCZyFSTXai2
+0b1dCl53lKItwIKOvMoDKjSuc/HUtQy9vmebVOvh+qBa7Dh+PsHMosdEMXXqP+UH
+0quhJZb25uSgXTcYOWEAM11G1ADEtMo88aKjPvM6/2kwLkDd9p+cJsmWN63nOaK/
+6mnbVSKVUyqUtd+tFjiBdWbjxywbk5yqjKPK2Ww8F22c3HxT4CAnQzb5EuE8XL1m
+v6JpIzi4mWCZDlZTOpx+FIywBm/xhnaQr/2v/pDGj59/i5IjnOcVdo/Vi5QTcmn7
+K2FjiO/mpF7moxdqWEfLcU8UC17IAggmosvpr2uKGcfLFFb14dq12fy/czja+eev
+bqQ34gcnAgMBAAGjggMXMIIDEzASBgNVHRMBAf8ECDAGAQH/AgEBMDcGA1UdEgQw
+MC6CD3N1c2NlcnRlLmdvYi52ZaAbBgVghl4CAqASDBBSSUYtRy0yMDAwNDAzNi0w
+MB0GA1UdDgQWBBRBDxk4qpl/Qguk1yeYVKIXTC1RVDCCAVAGA1UdIwSCAUcwggFD
+gBStuyIdxuDSAaj9dlBSk+2YwU2u06GCASakggEiMIIBHjE+MDwGA1UEAxM1QXV0
+b3JpZGFkIGRlIENlcnRpZmljYWNpb24gUmFpeiBkZWwgRXN0YWRvIFZlbmV6b2xh
+bm8xCzAJBgNVBAYTAlZFMRAwDgYDVQQHEwdDYXJhY2FzMRkwFwYDVQQIExBEaXN0
+cml0byBDYXBpdGFsMTYwNAYDVQQKEy1TaXN0ZW1hIE5hY2lvbmFsIGRlIENlcnRp
+ZmljYWNpb24gRWxlY3Ryb25pY2ExQzBBBgNVBAsTOlN1cGVyaW50ZW5kZW5jaWEg
+ZGUgU2VydmljaW9zIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25pY2ExJTAjBgkq
+hkiG9w0BCQEWFmFjcmFpekBzdXNjZXJ0ZS5nb2IudmWCAQowDgYDVR0PAQH/BAQD
+AgEGME0GA1UdEQRGMESCDnByb2NlcnQubmV0LnZloBUGBWCGXgIBoAwMClBTQy0w
+MDAwMDKgGwYFYIZeAgKgEgwQUklGLUotMzE2MzUzNzMtNzB2BgNVHR8EbzBtMEag
+RKBChkBodHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9sY3IvQ0VSVElGSUNBRE8t
+UkFJWi1TSEEzODRDUkxERVIuY3JsMCOgIaAfhh1sZGFwOi8vYWNyYWl6LnN1c2Nl
+cnRlLmdvYi52ZTA3BggrBgEFBQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6Ly9v
+Y3NwLnN1c2NlcnRlLmdvYi52ZTBBBgNVHSAEOjA4MDYGBmCGXgMBAjAsMCoGCCsG
+AQUFBwIBFh5odHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9kcGMwDQYJKoZIhvcN
+AQELBQADggIBACtZ6yKZu4SqT96QxtGGcSOeSwORR3C7wJJg7ODU523G0+1ng3dS
+1fLld6c2suNUvtm7CpsR72H0xpkzmfWvADmNg7+mvTV+LFwxNG9s2/NkAZiqlCxB
+3RWGymspThbASfzXg0gTB1GEMVKIu4YXx2sviiCtxQuPcD4quxtxj7mkoP3Yldmv
+Wb8lK5jpY5MvYB7Eqvh39YtsL+1+LrVPQA3uvFd359m21D+VJzog1eWuq2w1n8Gh
+HVnchIHuTQfiSLaeS5UtQbHh6N5+LwUeaO6/u5BlOsju6rEYNxxik6SgMexxbJHm
+pHmJWhSnFFAFTKQAVzAswbVhltw+HoSvOULP5dAssSS830DD7X9jSr3hTxJkhpXz
+sOfIt+FTvZLm8wyWuevo5pLtp4EJFAv8lXrPj9Y0TzYS3F7RNHXGRoAvlQSMx4bE
+qCaJqD8Zm4G7UaRKhqsLEQ+xrmNTbSjq3TNWOByyrYDT13K9mmyZY+gAu0F2Bbdb
+mRiKw7gSXFbPVgx96OLP7bx0R/vu0xdOIk9W/1DzLuY5poLWccret9W6aAjtmcz9
+opLLabid+Qqkpj5PkygqYWwHJgD/ll9ohri4zspV4KuxPX+Y1zMOWj3YeMLEYC/H
+YvBhkdI4sPaeVdtAgAUSM84dkpvRabP/v/GSCmE1P93+hvS84Bpxs2Km
+-----END CERTIFICATE-----
+
+# Issuer: CN=China Internet Network Information Center EV Certificates Root O=China Internet Network Information Center
+# Subject: CN=China Internet Network Information Center EV Certificates Root O=China Internet Network Information Center
+# Label: "China Internet Network Information Center EV Certificates Root"
+# Serial: 1218379777
+# MD5 Fingerprint: 55:5d:63:00:97:bd:6a:97:f5:67:ab:4b:fb:6e:63:15
+# SHA1 Fingerprint: 4f:99:aa:93:fb:2b:d1:37:26:a1:99:4a:ce:7f:f0:05:f2:93:5d:1e
+# SHA256 Fingerprint: 1c:01:c6:f4:db:b2:fe:fc:22:55:8b:2b:ca:32:56:3f:49:84:4a:cf:c3:2b:7b:e4:b0:ff:59:9f:9e:8c:7a:f7
+-----BEGIN CERTIFICATE-----
+MIID9zCCAt+gAwIBAgIESJ8AATANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMC
+Q04xMjAwBgNVBAoMKUNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24g
+Q2VudGVyMUcwRQYDVQQDDD5DaGluYSBJbnRlcm5ldCBOZXR3b3JrIEluZm9ybWF0
+aW9uIENlbnRlciBFViBDZXJ0aWZpY2F0ZXMgUm9vdDAeFw0xMDA4MzEwNzExMjVa
+Fw0zMDA4MzEwNzExMjVaMIGKMQswCQYDVQQGEwJDTjEyMDAGA1UECgwpQ2hpbmEg
+SW50ZXJuZXQgTmV0d29yayBJbmZvcm1hdGlvbiBDZW50ZXIxRzBFBgNVBAMMPkNo
+aW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyIEVWIENlcnRp
+ZmljYXRlcyBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm35z
+7r07eKpkQ0H1UN+U8i6yjUqORlTSIRLIOTJCBumD1Z9S7eVnAztUwYyZmczpwA//
+DdmEEbK40ctb3B75aDFk4Zv6dOtouSCV98YPjUesWgbdYavi7NifFy2cyjw1l1Vx
+zUOFsUcW9SxTgHbP0wBkvUCZ3czY28Sf1hNfQYOL+Q2HklY0bBoQCxfVWhyXWIQ8
+hBouXJE0bhlffxdpxWXvayHG1VA6v2G5BY3vbzQ6sm8UY78WO5upKv23KzhmBsUs
+4qpnHkWnjQRmQvaPK++IIGmPMowUc9orhpFjIpryp9vOiYurXccUwVswah+xt54u
+gQEC7c+WXmPbqOY4twIDAQABo2MwYTAfBgNVHSMEGDAWgBR8cks5x8DbYqVPm6oY
+NJKiyoOCWTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
+FgQUfHJLOcfA22KlT5uqGDSSosqDglkwDQYJKoZIhvcNAQEFBQADggEBACrDx0M3
+j92tpLIM7twUbY8opJhJywyA6vPtI2Z1fcXTIWd50XPFtQO3WKwMVC/GVhMPMdoG
+52U7HW8228gd+f2ABsqjPWYWqJ1MFn3AlUa1UeTiH9fqBk1jjZaM7+czV0I664zB
+echNdn3e9rG3geCg+aF4RhcaVpjwTj2rHO3sOdwHSPdj/gauwqRcalsyiMXHM4Ws
+ZkJHwlgkmeHlPuV1LI5D1l08eB6olYIpUNHRFrrvwb562bTYzB5MRuF3sTGrvSrI
+zo9uoV1/A3U05K2JRVRevq4opbs/eHnrc7MKDf2+yfdWrPa37S+bISnHOLaVxATy
+wy39FCqQmbkHzJ8=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Swisscom Root CA 2 O=Swisscom OU=Digital Certificate Services
+# Subject: CN=Swisscom Root CA 2 O=Swisscom OU=Digital Certificate Services
+# Label: "Swisscom Root CA 2"
+# Serial: 40698052477090394928831521023204026294
+# MD5 Fingerprint: 5b:04:69:ec:a5:83:94:63:18:a7:86:d0:e4:f2:6e:19
+# SHA1 Fingerprint: 77:47:4f:c6:30:e4:0f:4c:47:64:3f:84:ba:b8:c6:95:4a:8a:41:ec
+# SHA256 Fingerprint: f0:9b:12:2c:71:14:f4:a0:9b:d4:ea:4f:4a:99:d5:58:b4:6e:4c:25:cd:81:14:0d:29:c0:56:13:91:4c:38:41
+-----BEGIN CERTIFICATE-----
+MIIF2TCCA8GgAwIBAgIQHp4o6Ejy5e/DfEoeWhhntjANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3Qg
+Q0EgMjAeFw0xMTA2MjQwODM4MTRaFw0zMTA2MjUwNzM4MTRaMGQxCzAJBgNVBAYT
+AmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGlnaXRhbCBDZXJ0aWZp
+Y2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAyMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlUJOhJ1R5tMJ6HJaI2nbeHCOFvEr
+jw0DzpPMLgAIe6szjPTpQOYXTKueuEcUMncy3SgM3hhLX3af+Dk7/E6J2HzFZ++r
+0rk0X2s682Q2zsKwzxNoysjL67XiPS4h3+os1OD5cJZM/2pYmLcX5BtS5X4HAB1f
+2uY+lQS3aYg5oUFgJWFLlTloYhyxCwWJwDaCFCE/rtuh/bxvHGCGtlOUSbkrRsVP
+ACu/obvLP+DHVxxX6NZp+MEkUp2IVd3Chy50I9AU/SpHWrumnf2U5NGKpV+GY3aF
+y6//SSj8gO1MedK75MDvAe5QQQg1I3ArqRa0jG6F6bYRzzHdUyYb3y1aSgJA/MTA
+tukxGggo5WDDH8SQjhBiYEQN7Aq+VRhxLKX0srwVYv8c474d2h5Xszx+zYIdkeNL
+6yxSNLCK/RJOlrDrcH+eOfdmQrGrrFLadkBXeyq96G4DsguAhYidDMfCd7Camlf0
+uPoTXGiTOmekl9AbmbeGMktg2M7v0Ax/lZ9vh0+Hio5fCHyqW/xavqGRn1V9TrAL
+acywlKinh/LTSlDcX3KwFnUey7QYYpqwpzmqm59m2I2mbJYV4+by+PGDYmy7Velh
+k6M99bFXi08jsJvllGov34zflVEpYKELKeRcVVi3qPyZ7iVNTA6z00yPhOgpD/0Q
+VAKFyPnlw4vP5w8CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0hBBYw
+FDASBgdghXQBUwIBBgdghXQBUwIBMBIGA1UdEwEB/wQIMAYBAf8CAQcwHQYDVR0O
+BBYEFE0mICKJS9PVpAqhb97iEoHF8TwuMB8GA1UdIwQYMBaAFE0mICKJS9PVpAqh
+b97iEoHF8TwuMA0GCSqGSIb3DQEBCwUAA4ICAQAyCrKkG8t9voJXiblqf/P0wS4R
+fbgZPnm3qKhyN2abGu2sEzsOv2LwnN+ee6FTSA5BesogpxcbtnjsQJHzQq0Qw1zv
+/2BZf82Fo4s9SBwlAjxnffUy6S8w5X2lejjQ82YqZh6NM4OKb3xuqFp1mrjX2lhI
+REeoTPpMSQpKwhI3qEAMw8jh0FcNlzKVxzqfl9NX+Ave5XLzo9v/tdhZsnPdTSpx
+srpJ9csc1fV5yJmz/MFMdOO0vSk3FQQoHt5FRnDsr7p4DooqzgB53MBfGWcsa0vv
+aGgLQ+OswWIJ76bdZWGgr4RVSJFSHMYlkSrQwSIjYVmvRRGFHQEkNI/Ps/8XciAT
+woCqISxxOQ7Qj1zB09GOInJGTB2Wrk9xseEFKZZZ9LuedT3PDTcNYtsmjGOpI99n
+Bjx8Oto0QuFmtEYE3saWmA9LSHokMnWRn6z3aOkquVVlzl1h0ydw2Df+n7mvoC5W
+t6NlUe07qxS/TFED6F+KBZvuim6c779o+sjaC+NCydAXFJy3SuCvkychVSa1ZC+N
+8f+mQAWFBVzKBxlcCxMoTFh/wqXvRdpg065lYZ1Tg3TCrvJcwhbtkj6EPnNgiLx2
+9CzP0H1907he0ZESEOnN3col49XtmS++dYFLJPlFRpTJKSFTnCZFqhMX5OfNeOI5
+wSsSnqaeG8XmDtkx2Q==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Swisscom Root EV CA 2 O=Swisscom OU=Digital Certificate Services
+# Subject: CN=Swisscom Root EV CA 2 O=Swisscom OU=Digital Certificate Services
+# Label: "Swisscom Root EV CA 2"
+# Serial: 322973295377129385374608406479535262296
+# MD5 Fingerprint: 7b:30:34:9f:dd:0a:4b:6b:35:ca:31:51:28:5d:ae:ec
+# SHA1 Fingerprint: e7:a1:90:29:d3:d5:52:dc:0d:0f:c6:92:d3:ea:88:0d:15:2e:1a:6b
+# SHA256 Fingerprint: d9:5f:ea:3c:a4:ee:dc:e7:4c:d7:6e:75:fc:6d:1f:f6:2c:44:1f:0f:a8:bc:77:f0:34:b1:9e:5d:b2:58:01:5d
+-----BEGIN CERTIFICATE-----
+MIIF4DCCA8igAwIBAgIRAPL6ZOJ0Y9ON/RAdBB92ylgwDQYJKoZIhvcNAQELBQAw
+ZzELMAkGA1UEBhMCY2gxETAPBgNVBAoTCFN3aXNzY29tMSUwIwYDVQQLExxEaWdp
+dGFsIENlcnRpZmljYXRlIFNlcnZpY2VzMR4wHAYDVQQDExVTd2lzc2NvbSBSb290
+IEVWIENBIDIwHhcNMTEwNjI0MDk0NTA4WhcNMzEwNjI1MDg0NTA4WjBnMQswCQYD
+VQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2Vy
+dGlmaWNhdGUgU2VydmljZXMxHjAcBgNVBAMTFVN3aXNzY29tIFJvb3QgRVYgQ0Eg
+MjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMT3HS9X6lds93BdY7Bx
+UglgRCgzo3pOCvrY6myLURYaVa5UJsTMRQdBTxB5f3HSek4/OE6zAMaVylvNwSqD
+1ycfMQ4jFrclyxy0uYAyXhqdk/HoPGAsp15XGVhRXrwsVgu42O+LgrQ8uMIkqBPH
+oCE2G3pXKSinLr9xJZDzRINpUKTk4RtiGZQJo/PDvO/0vezbE53PnUgJUmfANykR
+HvvSEaeFGHR55E+FFOtSN+KxRdjMDUN/rhPSays/p8LiqG12W0OfvrSdsyaGOx9/
+5fLoZigWJdBLlzin5M8J0TbDC77aO0RYjb7xnglrPvMyxyuHxuxenPaHZa0zKcQv
+idm5y8kDnftslFGXEBuGCxobP/YCfnvUxVFkKJ3106yDgYjTdLRZncHrYTNaRdHL
+OdAGalNgHa/2+2m8atwBz735j9m9W8E6X47aD0upm50qKGsaCnw8qyIL5XctcfaC
+NYGu+HuB5ur+rPQam3Rc6I8k9l2dRsQs0h4rIWqDJ2dVSqTjyDKXZpBy2uPUZC5f
+46Fq9mDU5zXNysRojddxyNMkM3OxbPlq4SjbX8Y96L5V5jcb7STZDxmPX2MYWFCB
+UWVv8p9+agTnNCRxunZLWB4ZvRVgRaoMEkABnRDixzgHcgplwLa7JSnaFp6LNYth
+7eVxV4O1PHGf40+/fh6Bn0GXAgMBAAGjgYYwgYMwDgYDVR0PAQH/BAQDAgGGMB0G
+A1UdIQQWMBQwEgYHYIV0AVMCAgYHYIV0AVMCAjASBgNVHRMBAf8ECDAGAQH/AgED
+MB0GA1UdDgQWBBRF2aWBbj2ITY1x0kbBbkUe88SAnTAfBgNVHSMEGDAWgBRF2aWB
+bj2ITY1x0kbBbkUe88SAnTANBgkqhkiG9w0BAQsFAAOCAgEAlDpzBp9SSzBc1P6x
+XCX5145v9Ydkn+0UjrgEjihLj6p7jjm02Vj2e6E1CqGdivdj5eu9OYLU43otb98T
+PLr+flaYC/NUn81ETm484T4VvwYmneTwkLbUwp4wLh/vx3rEUMfqe9pQy3omywC0
+Wqu1kx+AiYQElY2NfwmTv9SoqORjbdlk5LgpWgi/UOGED1V7XwgiG/W9mR4U9s70
+WBCCswo9GcG/W6uqmdjyMb3lOGbcWAXH7WMaLgqXfIeTK7KK4/HsGOV1timH59yL
+Gn602MnTihdsfSlEvoqq9X46Lmgxk7lq2prg2+kupYTNHAq4Sgj5nPFhJpiTt3tm
+7JFe3VE/23MPrQRYCd0EApUKPtN236YQHoA96M2kZNEzx5LH4k5E4wnJTsJdhw4S
+nr8PyQUQ3nqjsTzyP6WqJ3mtMX0f/fwZacXduT98zca0wjAefm6S139hdlqP65VN
+vBFuIXxZN5nQBrz5Bm0yFqXZaajh3DyAHmBR3NdUIR7KYndP+tiPsys6DXhyyWhB
+WkdKwqPrGtcKqzwyVcgKEZzfdNbwQBUdyLmPtTbFr/giuMod89a2GQ+fYWVq6nTI
+fI/DT11lgh/ZDYnadXL77/FHZxOzyNEZiCcmmpl5fx7kLD977vHeTYuWl8PVP3wb
+I+2ksx0WckNLIOFZfsLorSa/ovc=
+-----END CERTIFICATE-----
+
+# Issuer: CN=CA Disig Root R1 O=Disig a.s.
+# Subject: CN=CA Disig Root R1 O=Disig a.s.
+# Label: "CA Disig Root R1"
+# Serial: 14052245610670616104
+# MD5 Fingerprint: be:ec:11:93:9a:f5:69:21:bc:d7:c1:c0:67:89:cc:2a
+# SHA1 Fingerprint: 8e:1c:74:f8:a6:20:b9:e5:8a:f4:61:fa:ec:2b:47:56:51:1a:52:c6
+# SHA256 Fingerprint: f9:6f:23:f4:c3:e7:9c:07:7a:46:98:8d:5a:f5:90:06:76:a0:f0:39:cb:64:5d:d1:75:49:b2:16:c8:24:40:ce
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAMMDmu5QkG4oMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNV
+BAYTAlNLMRMwEQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMu
+MRkwFwYDVQQDExBDQSBEaXNpZyBSb290IFIxMB4XDTEyMDcxOTA5MDY1NloXDTQy
+MDcxOTA5MDY1NlowUjELMAkGA1UEBhMCU0sxEzARBgNVBAcTCkJyYXRpc2xhdmEx
+EzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERpc2lnIFJvb3QgUjEw
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCqw3j33Jijp1pedxiy3QRk
+D2P9m5YJgNXoqqXinCaUOuiZc4yd39ffg/N4T0Dhf9Kn0uXKE5Pn7cZ3Xza1lK/o
+OI7bm+V8u8yN63Vz4STN5qctGS7Y1oprFOsIYgrY3LMATcMjfF9DCCMyEtztDK3A
+fQ+lekLZWnDZv6fXARz2m6uOt0qGeKAeVjGu74IKgEH3G8muqzIm1Cxr7X1r5OJe
+IgpFy4QxTaz+29FHuvlglzmxZcfe+5nkCiKxLU3lSCZpq+Kq8/v8kiky6bM+TR8n
+oc2OuRf7JT7JbvN32g0S9l3HuzYQ1VTW8+DiR0jm3hTaYVKvJrT1cU/J19IG32PK
+/yHoWQbgCNWEFVP3Q+V8xaCJmGtzxmjOZd69fwX3se72V6FglcXM6pM6vpmumwKj
+rckWtc7dXpl4fho5frLABaTAgqWjR56M6ly2vGfb5ipN0gTco65F97yLnByn1tUD
+3AjLLhbKXEAz6GfDLuemROoRRRw1ZS0eRWEkG4IupZ0zXWX4Qfkuy5Q/H6MMMSRE
+7cderVC6xkGbrPAXZcD4XW9boAo0PO7X6oifmPmvTiT6l7Jkdtqr9O3jw2Dv1fkC
+yC2fg69naQanMVXVz0tv/wQFx1isXxYb5dKj6zHbHzMVTdDypVP1y+E9Tmgt2BLd
+qvLmTZtJ5cUoobqwWsagtQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUiQq0OJMa5qvum5EY+fU8PjXQ04IwDQYJKoZI
+hvcNAQEFBQADggIBADKL9p1Kyb4U5YysOMo6CdQbzoaz3evUuii+Eq5FLAR0rBNR
+xVgYZk2C2tXck8An4b58n1KeElb21Zyp9HWc+jcSjxyT7Ff+Bw+r1RL3D65hXlaA
+SfX8MPWbTx9BLxyE04nH4toCdu0Jz2zBuByDHBb6lM19oMgY0sidbvW9adRtPTXo
+HqJPYNcHKfyyo6SdbhWSVhlMCrDpfNIZTUJG7L399ldb3Zh+pE3McgODWF3vkzpB
+emOqfDqo9ayk0d2iLbYq/J8BjuIQscTK5GfbVSUZP/3oNn6z4eGBrxEWi1CXYBmC
+AMBrTXO40RMHPuq2MU/wQppt4hF05ZSsjYSVPCGvxdpHyN85YmLLW1AL14FABZyb
+7bq2ix4Eb5YgOe2kfSnbSM6C3NQCjR0EMVrHS/BsYVLXtFHCgWzN4funodKSds+x
+DzdYpPJScWc/DIh4gInByLUfkmO+p3qKViwaqKactV2zY9ATIKHrkWzQjX2v3wvk
+F7mGnjixlAxYjOBVqjtjbZqJYLhkKpLGN/R+Q0O3c+gB53+XD9fyexn9GtePyfqF
+a3qdnom2piiZk4hA9z7NUaPK6u95RyG1/jLix8NRb76AdPCkwzryT+lf3xkK8jsT
+Q6wxpLPn6/wY1gGp8yqPNg7rtLG8t0zJa7+h89n07eLw4+1knj0vllJPgFOL
+-----END CERTIFICATE-----
+
+# Issuer: CN=CA Disig Root R2 O=Disig a.s.
+# Subject: CN=CA Disig Root R2 O=Disig a.s.
+# Label: "CA Disig Root R2"
+# Serial: 10572350602393338211
+# MD5 Fingerprint: 26:01:fb:d8:27:a7:17:9a:45:54:38:1a:43:01:3b:03
+# SHA1 Fingerprint: b5:61:eb:ea:a4:de:e4:25:4b:69:1a:98:a5:57:47:c2:34:c7:d9:71
+# SHA256 Fingerprint: e2:3d:4a:03:6d:7b:70:e9:f5:95:b1:42:20:79:d2:b9:1e:df:bb:1f:b6:51:a0:63:3e:aa:8a:9d:c5:f8:07:03
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNV
+BAYTAlNLMRMwEQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMu
+MRkwFwYDVQQDExBDQSBEaXNpZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQy
+MDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sxEzARBgNVBAcTCkJyYXRpc2xhdmEx
+EzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERpc2lnIFJvb3QgUjIw
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbCw3Oe
+NcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNH
+PWSb6WiaxswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3I
+x2ymrdMxp7zo5eFm1tL7A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbe
+QTg06ov80egEFGEtQX6sx3dOy1FU+16SGBsEWmjGycT6txOgmLcRK7fWV8x8nhfR
+yyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqVg8NTEQxzHQuyRpDRQjrO
+QG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa5Beny912
+H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJ
+QfYEkoopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUD
+i/ZnWejBBhG93c+AAk9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORs
+nLMOPReisjQS1n6yqEm70XooQL6iFh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1
+rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5uQu0wDQYJKoZI
+hvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
+tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqf
+GopTpti72TVVsRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkb
+lvdhuDvEK7Z4bLQjb/D907JedR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka
++elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W81k/BfDxujRNt+3vrMNDcTa/F1bal
+TFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjxmHHEt38OFdAlab0i
+nSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01utI3
+gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18Dr
+G5gPcFw0sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3Os
+zMOl6W8KjptlwlCFtaOgUxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8x
+L4ysEr3vQCj8KWefshNPZiTEUxnpHikV7+ZtsH8tZ/3zbBt1RqPlShfppNcL
+-----END CERTIFICATE-----
+
+# Issuer: CN=ACCVRAIZ1 O=ACCV OU=PKIACCV
+# Subject: CN=ACCVRAIZ1 O=ACCV OU=PKIACCV
+# Label: "ACCVRAIZ1"
+# Serial: 6828503384748696800
+# MD5 Fingerprint: d0:a0:5a:ee:05:b6:09:94:21:a1:7d:f1:b2:29:82:02
+# SHA1 Fingerprint: 93:05:7a:88:15:c6:4f:ce:88:2f:fa:91:16:52:28:78:bc:53:64:17
+# SHA256 Fingerprint: 9a:6e:c0:12:e1:a7:da:9d:be:34:19:4d:47:8a:d7:c0:db:18:22:fb:07:1d:f1:29:81:49:6e:d1:04:38:41:13
+-----BEGIN CERTIFICATE-----
+MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UE
+AwwJQUNDVlJBSVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQsw
+CQYDVQQGEwJFUzAeFw0xMTA1MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQ
+BgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwHUEtJQUNDVjENMAsGA1UECgwEQUND
+VjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCb
+qau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gMjmoY
+HtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWo
+G2ioPej0RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpA
+lHPrzg5XPAOBOp0KoVdDaaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhr
+IA8wKFSVf+DuzgpmndFALW4ir50awQUZ0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/
+0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDGWuzndN9wrqODJerWx5eH
+k6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs78yM2x/47
+4KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMO
+m3WR5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpa
+cXpkatcnYGMN285J9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPl
+uUsXQA+xtrn13k/c4LOsOxFwYIRKQ26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYI
+KwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRwOi8vd3d3LmFjY3YuZXMvZmls
+ZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEuY3J0MB8GCCsG
+AQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
+VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeT
+VfZW6oHlNsyMHj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIG
+CCsGAQUFBwICMIIBFB6CARAAQQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUA
+cgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBhAO0AegAgAGQAZQAgAGwAYQAgAEEA
+QwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUAYwBuAG8AbABvAGcA
+7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBjAHQA
+cgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAA
+QwBQAFMAIABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUA
+czAwBggrBgEFBQcCARYkaHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2Mu
+aHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRt
+aW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2MV9kZXIuY3JsMA4GA1Ud
+DwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZIhvcNAQEF
+BQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdp
+D70ER9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gU
+JyCpZET/LtZ1qmxNYEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+m
+AM/EKXMRNt6GGT6d7hmKG9Ww7Y49nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepD
+vV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJTS+xJlsndQAJxGJ3KQhfnlms
+tn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3sCPdK6jT2iWH
+7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
+I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szA
+h1xA2syVP1XgNce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xF
+d3+YJ5oyXSrjhO7FmGYvliAd3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2H
+pPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3pEfbRD0tVNEYqi4Y7
+-----END CERTIFICATE-----
+
+# Issuer: CN=TWCA Global Root CA O=TAIWAN-CA OU=Root CA
+# Subject: CN=TWCA Global Root CA O=TAIWAN-CA OU=Root CA
+# Label: "TWCA Global Root CA"
+# Serial: 3262
+# MD5 Fingerprint: f9:03:7e:cf:e6:9e:3c:73:7a:2a:90:07:69:ff:2b:96
+# SHA1 Fingerprint: 9c:bb:48:53:f6:a4:f6:d3:52:a4:e8:32:52:55:60:13:f5:ad:af:65
+# SHA256 Fingerprint: 59:76:90:07:f7:68:5d:0f:cd:50:87:2f:9f:95:d5:75:5a:5b:2b:45:7d:81:f3:69:2b:61:0a:98:67:2f:0e:1b
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcx
+EjAQBgNVBAoTCVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMT
+VFdDQSBHbG9iYWwgUm9vdCBDQTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5
+NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQKEwlUQUlXQU4tQ0ExEDAOBgNVBAsT
+B1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3QgQ0EwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2CnJfF
+10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz
+0ALfUPZVr2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfCh
+MBwqoJimFb3u/Rk28OKRQ4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbH
+zIh1HrtsBv+baz4X7GGqcXzGHaL3SekVtTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc
+46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1WKKD+u4ZqyPpcC1jcxkt2
+yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99sy2sbZCi
+laLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYP
+oA/pyJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQA
+BDzfuBSO6N+pjWxnkjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcE
+qYSjMq+u7msXi7Kx/mzhkIyIqJdIzshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm
+4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6gcFGn90xHNcgL
+1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
+LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WF
+H6vPNOw/KP4M8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNo
+RI2T9GRwoD2dKAXDOXC4Ynsg/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+
+nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlglPx4mI88k1HtQJAH32RjJMtOcQWh
+15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryPA9gK8kxkRr05YuWW
+6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3mi4TW
+nsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5j
+wa19hAM8EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWz
+aGHQRiapIVJpLesux+t3zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmy
+KwbQBM0=
+-----END CERTIFICATE-----
diff --git a/lib/requests/certs.py b/lib/requests/certs.py
index be422c3e..07e64750 100644
--- a/lib/requests/certs.py
+++ b/lib/requests/certs.py
@@ -1,17 +1,25 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
 """
-requests.certs
-~~~~~~~~~~~~~~
+certs.py
+~~~~~~~~
 
-This module returns the preferred default CA certificate bundle. There is
-only one — the one from the certifi package.
+This module returns the preferred default CA certificate bundle.
 
 If you are packaging Requests, e.g., for a Linux distribution or a managed
 environment, you can change the definition of where() to return a separately
 packaged CA bundle.
 """
-from certifi import where
+import os.path
 
-if __name__ == "__main__":
+try:
+    from certifi import where
+except ImportError:
+    def where():
+        """Return the preferred certificate bundle."""
+        # vendored bundle inside Requests
+        return os.path.join(os.path.dirname(__file__), 'cacert.pem')
+
+if __name__ == '__main__':
     print(where())
diff --git a/lib/requests/compat.py b/lib/requests/compat.py
index 095de1b6..c07726ee 100644
--- a/lib/requests/compat.py
+++ b/lib/requests/compat.py
@@ -1,34 +1,13 @@
-"""
-requests.compat
-~~~~~~~~~~~~~~~
+# -*- coding: utf-8 -*-
 
-This module previously handled import compatibility issues
-between Python 2 and Python 3. It remains for backwards
-compatibility until the next major version.
+"""
+pythoncompat
 """
 
-import importlib
+from .packages import chardet
+
 import sys
 
-# -------------------
-# Character Detection
-# -------------------
-
-
-def _resolve_char_detection():
-    """Find supported character detection libraries."""
-    chardet = None
-    for lib in ("chardet", "charset_normalizer"):
-        if chardet is None:
-            try:
-                chardet = importlib.import_module(lib)
-            except ImportError:
-                pass
-    return chardet
-
-
-chardet = _resolve_char_detection()
-
 # -------
 # Pythons
 # -------
@@ -37,58 +16,100 @@ chardet = _resolve_char_detection()
 _ver = sys.version_info
 
 #: Python 2.x?
-is_py2 = _ver[0] == 2
+is_py2 = (_ver[0] == 2)
 
 #: Python 3.x?
-is_py3 = _ver[0] == 3
+is_py3 = (_ver[0] == 3)
+
+#: Python 3.0.x
+is_py30 = (is_py3 and _ver[1] == 0)
+
+#: Python 3.1.x
+is_py31 = (is_py3 and _ver[1] == 1)
+
+#: Python 3.2.x
+is_py32 = (is_py3 and _ver[1] == 2)
+
+#: Python 3.3.x
+is_py33 = (is_py3 and _ver[1] == 3)
+
+#: Python 3.4.x
+is_py34 = (is_py3 and _ver[1] == 4)
+
+#: Python 2.7.x
+is_py27 = (is_py2 and _ver[1] == 7)
+
+#: Python 2.6.x
+is_py26 = (is_py2 and _ver[1] == 6)
+
+#: Python 2.5.x
+is_py25 = (is_py2 and _ver[1] == 5)
+
+#: Python 2.4.x
+is_py24 = (is_py2 and _ver[1] == 4)   # I'm assuming this is not by choice.
+
+
+# ---------
+# Platforms
+# ---------
+
+
+# Syntax sugar.
+_ver = sys.version.lower()
+
+is_pypy = ('pypy' in _ver)
+is_jython = ('jython' in _ver)
+is_ironpython = ('iron' in _ver)
+
+# Assume CPython, if nothing else.
+is_cpython = not any((is_pypy, is_jython, is_ironpython))
+
+# Windows-based system.
+is_windows = 'win32' in str(sys.platform).lower()
+
+# Standard Linux 2+ system.
+is_linux = ('linux' in str(sys.platform).lower())
+is_osx = ('darwin' in str(sys.platform).lower())
+is_hpux = ('hpux' in str(sys.platform).lower())   # Complete guess.
+is_solaris = ('solar==' in str(sys.platform).lower())   # Complete guess.
 
-# json/simplejson module import resolution
-has_simplejson = False
 try:
     import simplejson as json
-
-    has_simplejson = True
-except ImportError:
+except (ImportError, SyntaxError):
+    # simplejson does not support Python 3.2, it throws a SyntaxError
+    # because of u'...' Unicode literals.
     import json
 
-if has_simplejson:
-    from simplejson import JSONDecodeError
-else:
-    from json import JSONDecodeError
+# ---------
+# Specifics
+# ---------
 
-# Keep OrderedDict for backwards compatibility.
-from collections import OrderedDict
-from collections.abc import Callable, Mapping, MutableMapping
-from http import cookiejar as cookielib
-from http.cookies import Morsel
-from io import StringIO
+if is_py2:
+    from urllib import quote, unquote, quote_plus, unquote_plus, urlencode, getproxies, proxy_bypass
+    from urlparse import urlparse, urlunparse, urljoin, urlsplit, urldefrag
+    from urllib2 import parse_http_list
+    import cookielib
+    from Cookie import Morsel
+    from StringIO import StringIO
+    from .packages.urllib3.packages.ordered_dict import OrderedDict
 
-# --------------
-# Legacy Imports
-# --------------
-from urllib.parse import (
-    quote,
-    quote_plus,
-    unquote,
-    unquote_plus,
-    urldefrag,
-    urlencode,
-    urljoin,
-    urlparse,
-    urlsplit,
-    urlunparse,
-)
-from urllib.request import (
-    getproxies,
-    getproxies_environment,
-    parse_http_list,
-    proxy_bypass,
-    proxy_bypass_environment,
-)
+    builtin_str = str
+    bytes = str
+    str = unicode
+    basestring = basestring
+    numeric_types = (int, long, float)
 
-builtin_str = str
-str = str
-bytes = bytes
-basestring = (str, bytes)
-numeric_types = (int, float)
-integer_types = (int,)
+
+elif is_py3:
+    from urllib.parse import urlparse, urlunparse, urljoin, urlsplit, urlencode, quote, unquote, quote_plus, unquote_plus, urldefrag
+    from urllib.request import parse_http_list, getproxies, proxy_bypass
+    from http import cookiejar as cookielib
+    from http.cookies import Morsel
+    from io import StringIO
+    from collections import OrderedDict
+
+    builtin_str = str
+    str = str
+    bytes = bytes
+    basestring = (str, bytes)
+    numeric_types = (int, float)
diff --git a/lib/requests/cookies.py b/lib/requests/cookies.py
index f69d0cda..831c49c6 100644
--- a/lib/requests/cookies.py
+++ b/lib/requests/cookies.py
@@ -1,29 +1,27 @@
-"""
-requests.cookies
-~~~~~~~~~~~~~~~~
+# -*- coding: utf-8 -*-
 
-Compatibility code to be able to use `http.cookiejar.CookieJar` with requests.
+"""
+Compatibility code to be able to use `cookielib.CookieJar` with requests.
 
 requests.utils imports from here, so be careful with imports.
 """
 
-import calendar
-import copy
 import time
-
-from ._internal_utils import to_native_string
-from .compat import Morsel, MutableMapping, cookielib, urlparse, urlunparse
+import collections
+from .compat import cookielib, urlparse, urlunparse, Morsel
 
 try:
     import threading
+    # grr, pyflakes: this fixes "redefinition of unused 'threading'"
+    threading
 except ImportError:
     import dummy_threading as threading
 
 
-class MockRequest:
+class MockRequest(object):
     """Wraps a `requests.Request` to mimic a `urllib2.Request`.
 
-    The code in `http.cookiejar.CookieJar` expects this interface in order to correctly
+    The code in `cookielib.CookieJar` expects this interface in order to correctly
     manage cookie policies, i.e., determine whether a cookie can be set, given the
     domains of the request and the cookie.
 
@@ -49,22 +47,16 @@ class MockRequest:
     def get_full_url(self):
         # Only return the response's URL if the user hadn't set the Host
         # header
-        if not self._r.headers.get("Host"):
+        if not self._r.headers.get('Host'):
             return self._r.url
         # If they did set it, retrieve it and reconstruct the expected domain
-        host = to_native_string(self._r.headers["Host"], encoding="utf-8")
+        host = self._r.headers['Host']
         parsed = urlparse(self._r.url)
         # Reconstruct the URL as we expect it
-        return urlunparse(
-            [
-                parsed.scheme,
-                host,
-                parsed.path,
-                parsed.params,
-                parsed.query,
-                parsed.fragment,
-            ]
-        )
+        return urlunparse([
+            parsed.scheme, host, parsed.path, parsed.params, parsed.query,
+            parsed.fragment
+        ])
 
     def is_unverifiable(self):
         return True
@@ -76,10 +68,8 @@ class MockRequest:
         return self._r.headers.get(name, self._new_headers.get(name, default))
 
     def add_header(self, key, val):
-        """cookiejar has no legitimate use for this method; add it back if you find one."""
-        raise NotImplementedError(
-            "Cookie headers should be added with add_unredirected_header()"
-        )
+        """cookielib has no legitimate use for this method; add it back if you find one."""
+        raise NotImplementedError("Cookie headers should be added with add_unredirected_header()")
 
     def add_unredirected_header(self, name, value):
         self._new_headers[name] = value
@@ -100,15 +90,15 @@ class MockRequest:
         return self.get_host()
 
 
-class MockResponse:
+class MockResponse(object):
     """Wraps a `httplib.HTTPMessage` to mimic a `urllib.addinfourl`.
 
     ...what? Basically, expose the parsed HTTP headers from the server response
-    the way `http.cookiejar` expects to see them.
+    the way `cookielib` expects to see them.
     """
 
     def __init__(self, headers):
-        """Make a MockResponse for `cookiejar` to read.
+        """Make a MockResponse for `cookielib` to read.
 
         :param headers: a httplib.HTTPMessage or analogous carrying the headers
         """
@@ -124,11 +114,12 @@ class MockResponse:
 def extract_cookies_to_jar(jar, request, response):
     """Extract the cookies from the response into a CookieJar.
 
-    :param jar: http.cookiejar.CookieJar (not necessarily a RequestsCookieJar)
+    :param jar: cookielib.CookieJar (not necessarily a RequestsCookieJar)
     :param request: our own requests.Request object
     :param response: urllib3.HTTPResponse object
     """
-    if not (hasattr(response, "_original_response") and response._original_response):
+    if not (hasattr(response, '_original_response') and
+            response._original_response):
         return
     # the _original_response field is the wrapped httplib.HTTPResponse object,
     req = MockRequest(request)
@@ -138,14 +129,10 @@ def extract_cookies_to_jar(jar, request, response):
 
 
 def get_cookie_header(jar, request):
-    """
-    Produce an appropriate Cookie header string to be sent with `request`, or None.
-
-    :rtype: str
-    """
+    """Produce an appropriate Cookie header string to be sent with `request`, or None."""
     r = MockRequest(request)
     jar.add_cookie_header(r)
-    return r.get_new_headers().get("Cookie")
+    return r.get_new_headers().get('Cookie')
 
 
 def remove_cookie_by_name(cookiejar, name, domain=None, path=None):
@@ -155,13 +142,10 @@ def remove_cookie_by_name(cookiejar, name, domain=None, path=None):
     """
     clearables = []
     for cookie in cookiejar:
-        if cookie.name != name:
-            continue
-        if domain is not None and domain != cookie.domain:
-            continue
-        if path is not None and path != cookie.path:
-            continue
-        clearables.append((cookie.domain, cookie.path, cookie.name))
+        if cookie.name == name:
+            if domain is None or domain == cookie.domain:
+                if path is None or path == cookie.path:
+                    clearables.append((cookie.domain, cookie.path, cookie.name))
 
     for domain, path, name in clearables:
         cookiejar.clear(domain, path, name)
@@ -169,35 +153,30 @@ def remove_cookie_by_name(cookiejar, name, domain=None, path=None):
 
 class CookieConflictError(RuntimeError):
     """There are two cookies that meet the criteria specified in the cookie jar.
-    Use .get and .set and include domain and path args in order to be more specific.
-    """
+    Use .get and .set and include domain and path args in order to be more specific."""
 
 
-class RequestsCookieJar(cookielib.CookieJar, MutableMapping):
-    """Compatibility class; is a http.cookiejar.CookieJar, but exposes a dict
-    interface.
+class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
+    """Compatibility class; is a cookielib.CookieJar, but exposes a dict interface.
 
     This is the CookieJar we create by default for requests and sessions that
     don't specify one, since some clients may expect response.cookies and
     session.cookies to support dict operations.
 
-    Requests does not use the dict interface internally; it's just for
-    compatibility with external client code. All requests code should work
-    out of the box with externally provided instances of ``CookieJar``, e.g.
-    ``LWPCookieJar`` and ``FileCookieJar``.
+    Don't use the dict interface internally; it's just for compatibility with
+    with external client code. All `requests` code should work out of the box
+    with externally provided instances of CookieJar, e.g., LWPCookieJar and
+    FileCookieJar.
+
+    Caution: dictionary operations that are normally O(1) may be O(n).
 
     Unlike a regular CookieJar, this class is pickleable.
-
-    .. warning:: dictionary operations that are normally O(1) may be O(n).
     """
 
     def get(self, name, default=None, domain=None, path=None):
         """Dict-like get() that also supports optional domain and path args in
         order to resolve naming collisions from using one cookie jar over
-        multiple domains.
-
-        .. warning:: operation is O(n), not O(1).
-        """
+        multiple domains. Caution: operation is O(n), not O(1)."""
         try:
             return self._find_no_duplicates(name, domain, path)
         except KeyError:
@@ -206,13 +185,10 @@ class RequestsCookieJar(cookielib.CookieJar, MutableMapping):
     def set(self, name, value, **kwargs):
         """Dict-like set() that also supports optional domain and path args in
         order to resolve naming collisions from using one cookie jar over
-        multiple domains.
-        """
+        multiple domains."""
         # support client code that unsets cookies by assignment of a None value:
         if value is None:
-            remove_cookie_by_name(
-                self, name, domain=kwargs.get("domain"), path=kwargs.get("path")
-            )
+            remove_cookie_by_name(self, name, domain=kwargs.get('domain'), path=kwargs.get('path'))
             return
 
         if isinstance(value, Morsel):
@@ -223,55 +199,37 @@ class RequestsCookieJar(cookielib.CookieJar, MutableMapping):
         return c
 
     def iterkeys(self):
-        """Dict-like iterkeys() that returns an iterator of names of cookies
-        from the jar.
-
-        .. seealso:: itervalues() and iteritems().
-        """
+        """Dict-like iterkeys() that returns an iterator of names of cookies from the jar.
+        See itervalues() and iteritems()."""
         for cookie in iter(self):
             yield cookie.name
 
     def keys(self):
-        """Dict-like keys() that returns a list of names of cookies from the
-        jar.
-
-        .. seealso:: values() and items().
-        """
+        """Dict-like keys() that returns a list of names of cookies from the jar.
+        See values() and items()."""
         return list(self.iterkeys())
 
     def itervalues(self):
-        """Dict-like itervalues() that returns an iterator of values of cookies
-        from the jar.
-
-        .. seealso:: iterkeys() and iteritems().
-        """
+        """Dict-like itervalues() that returns an iterator of values of cookies from the jar.
+        See iterkeys() and iteritems()."""
         for cookie in iter(self):
             yield cookie.value
 
     def values(self):
-        """Dict-like values() that returns a list of values of cookies from the
-        jar.
-
-        .. seealso:: keys() and items().
-        """
+        """Dict-like values() that returns a list of values of cookies from the jar.
+        See keys() and items()."""
         return list(self.itervalues())
 
     def iteritems(self):
-        """Dict-like iteritems() that returns an iterator of name-value tuples
-        from the jar.
-
-        .. seealso:: iterkeys() and itervalues().
-        """
+        """Dict-like iteritems() that returns an iterator of name-value tuples from the jar.
+        See iterkeys() and itervalues()."""
         for cookie in iter(self):
             yield cookie.name, cookie.value
 
     def items(self):
-        """Dict-like items() that returns a list of name-value tuples from the
-        jar. Allows client-code to call ``dict(RequestsCookieJar)`` and get a
-        vanilla python dict of key value pairs.
-
-        .. seealso:: keys() and values().
-        """
+        """Dict-like items() that returns a list of name-value tuples from the jar.
+        See keys() and values(). Allows client-code to call "dict(RequestsCookieJar)
+        and get a vanilla python dict of key value pairs."""
         return list(self.iteritems())
 
     def list_domains(self):
@@ -292,10 +250,7 @@ class RequestsCookieJar(cookielib.CookieJar, MutableMapping):
 
     def multiple_domains(self):
         """Returns True if there are multiple domains in the jar.
-        Returns False otherwise.
-
-        :rtype: bool
-        """
+        Returns False otherwise."""
         domains = []
         for cookie in iter(self):
             if cookie.domain is not None and cookie.domain in domains:
@@ -304,153 +259,96 @@ class RequestsCookieJar(cookielib.CookieJar, MutableMapping):
         return False  # there is only one domain in jar
 
     def get_dict(self, domain=None, path=None):
-        """Takes as an argument an optional domain and path and returns a plain
-        old Python dict of name-value pairs of cookies that meet the
-        requirements.
-
-        :rtype: dict
-        """
+        """Takes as an argument an optional domain and path and returns a plain old
+        Python dict of name-value pairs of cookies that meet the requirements."""
         dictionary = {}
         for cookie in iter(self):
-            if (domain is None or cookie.domain == domain) and (
-                path is None or cookie.path == path
-            ):
+            if (domain is None or cookie.domain == domain) and (path is None
+                                                or cookie.path == path):
                 dictionary[cookie.name] = cookie.value
         return dictionary
 
-    def __contains__(self, name):
-        try:
-            return super().__contains__(name)
-        except CookieConflictError:
-            return True
-
     def __getitem__(self, name):
-        """Dict-like __getitem__() for compatibility with client code. Throws
-        exception if there are more than one cookie with name. In that case,
-        use the more explicit get() method instead.
+        """Dict-like __getitem__() for compatibility with client code. Throws exception
+        if there are more than one cookie with name. In that case, use the more
+        explicit get() method instead. Caution: operation is O(n), not O(1)."""
 
-        .. warning:: operation is O(n), not O(1).
-        """
         return self._find_no_duplicates(name)
 
     def __setitem__(self, name, value):
-        """Dict-like __setitem__ for compatibility with client code. Throws
-        exception if there is already a cookie of that name in the jar. In that
-        case, use the more explicit set() method instead.
-        """
+        """Dict-like __setitem__ for compatibility with client code. Throws exception
+        if there is already a cookie of that name in the jar. In that case, use the more
+        explicit set() method instead."""
+
         self.set(name, value)
 
     def __delitem__(self, name):
-        """Deletes a cookie given a name. Wraps ``http.cookiejar.CookieJar``'s
-        ``remove_cookie_by_name()``.
-        """
+        """Deletes a cookie given a name. Wraps cookielib.CookieJar's remove_cookie_by_name()."""
         remove_cookie_by_name(self, name)
 
     def set_cookie(self, cookie, *args, **kwargs):
-        if (
-            hasattr(cookie.value, "startswith")
-            and cookie.value.startswith('"')
-            and cookie.value.endswith('"')
-        ):
-            cookie.value = cookie.value.replace('\\"', "")
-        return super().set_cookie(cookie, *args, **kwargs)
+        if hasattr(cookie.value, 'startswith') and cookie.value.startswith('"') and cookie.value.endswith('"'):
+            cookie.value = cookie.value.replace('\\"', '')
+        return super(RequestsCookieJar, self).set_cookie(cookie, *args, **kwargs)
 
     def update(self, other):
         """Updates this jar with cookies from another CookieJar or dict-like"""
         if isinstance(other, cookielib.CookieJar):
             for cookie in other:
-                self.set_cookie(copy.copy(cookie))
+                self.set_cookie(cookie)
         else:
-            super().update(other)
+            super(RequestsCookieJar, self).update(other)
 
     def _find(self, name, domain=None, path=None):
-        """Requests uses this method internally to get cookie values.
-
-        If there are conflicting cookies, _find arbitrarily chooses one.
-        See _find_no_duplicates if you want an exception thrown if there are
-        conflicting cookies.
-
-        :param name: a string containing name of cookie
-        :param domain: (optional) string containing domain of cookie
-        :param path: (optional) string containing path of cookie
-        :return: cookie.value
-        """
+        """Requests uses this method internally to get cookie values. Takes as args name
+        and optional domain and path. Returns a cookie.value. If there are conflicting cookies,
+        _find arbitrarily chooses one. See _find_no_duplicates if you want an exception thrown
+        if there are conflicting cookies."""
         for cookie in iter(self):
             if cookie.name == name:
                 if domain is None or cookie.domain == domain:
                     if path is None or cookie.path == path:
                         return cookie.value
 
-        raise KeyError(f"name={name!r}, domain={domain!r}, path={path!r}")
+        raise KeyError('name=%r, domain=%r, path=%r' % (name, domain, path))
 
     def _find_no_duplicates(self, name, domain=None, path=None):
-        """Both ``__get_item__`` and ``get`` call this function: it's never
-        used elsewhere in Requests.
-
-        :param name: a string containing name of cookie
-        :param domain: (optional) string containing domain of cookie
-        :param path: (optional) string containing path of cookie
-        :raises KeyError: if cookie is not found
-        :raises CookieConflictError: if there are multiple cookies
-            that match name and optionally domain and path
-        :return: cookie.value
-        """
+        """__get_item__ and get call _find_no_duplicates -- never used in Requests internally.
+        Takes as args name and optional domain and path. Returns a cookie.value.
+        Throws KeyError if cookie is not found and CookieConflictError if there are
+        multiple cookies that match name and optionally domain and path."""
         toReturn = None
         for cookie in iter(self):
             if cookie.name == name:
                 if domain is None or cookie.domain == domain:
                     if path is None or cookie.path == path:
-                        if toReturn is not None:
-                            # if there are multiple cookies that meet passed in criteria
-                            raise CookieConflictError(
-                                f"There are multiple cookies with name, {name!r}"
-                            )
-                        # we will eventually return this as long as no cookie conflict
-                        toReturn = cookie.value
+                        if toReturn is not None:  # if there are multiple cookies that meet passed in criteria
+                            raise CookieConflictError('There are multiple cookies with name, %r' % (name))
+                        toReturn = cookie.value  # we will eventually return this as long as no cookie conflict
 
         if toReturn:
             return toReturn
-        raise KeyError(f"name={name!r}, domain={domain!r}, path={path!r}")
+        raise KeyError('name=%r, domain=%r, path=%r' % (name, domain, path))
 
     def __getstate__(self):
         """Unlike a normal CookieJar, this class is pickleable."""
         state = self.__dict__.copy()
         # remove the unpickleable RLock object
-        state.pop("_cookies_lock")
+        state.pop('_cookies_lock')
         return state
 
     def __setstate__(self, state):
         """Unlike a normal CookieJar, this class is pickleable."""
         self.__dict__.update(state)
-        if "_cookies_lock" not in self.__dict__:
+        if '_cookies_lock' not in self.__dict__:
             self._cookies_lock = threading.RLock()
 
     def copy(self):
         """Return a copy of this RequestsCookieJar."""
         new_cj = RequestsCookieJar()
-        new_cj.set_policy(self.get_policy())
         new_cj.update(self)
         return new_cj
 
-    def get_policy(self):
-        """Return the CookiePolicy instance used."""
-        return self._policy
-
-
-def _copy_cookie_jar(jar):
-    if jar is None:
-        return None
-
-    if hasattr(jar, "copy"):
-        # We're dealing with an instance of RequestsCookieJar
-        return jar.copy()
-    # We're dealing with a generic CookieJar instance
-    new_jar = copy.copy(jar)
-    new_jar.clear()
-    for cookie in jar:
-        new_jar.set_cookie(copy.copy(cookie))
-    return new_jar
-
 
 def create_cookie(name, value, **kwargs):
     """Make a cookie from underspecified parameters.
@@ -458,33 +356,31 @@ def create_cookie(name, value, **kwargs):
     By default, the pair of `name` and `value` will be set for the domain ''
     and sent on every request (this is sometimes called a "supercookie").
     """
-    result = {
-        "version": 0,
-        "name": name,
-        "value": value,
-        "port": None,
-        "domain": "",
-        "path": "/",
-        "secure": False,
-        "expires": None,
-        "discard": True,
-        "comment": None,
-        "comment_url": None,
-        "rest": {"HttpOnly": None},
-        "rfc2109": False,
-    }
+    result = dict(
+        version=0,
+        name=name,
+        value=value,
+        port=None,
+        domain='',
+        path='/',
+        secure=False,
+        expires=None,
+        discard=True,
+        comment=None,
+        comment_url=None,
+        rest={'HttpOnly': None},
+        rfc2109=False,)
 
     badargs = set(kwargs) - set(result)
     if badargs:
-        raise TypeError(
-            f"create_cookie() got unexpected keyword arguments: {list(badargs)}"
-        )
+        err = 'create_cookie() got unexpected keyword arguments: %s'
+        raise TypeError(err % list(badargs))
 
     result.update(kwargs)
-    result["port_specified"] = bool(result["port"])
-    result["domain_specified"] = bool(result["domain"])
-    result["domain_initial_dot"] = result["domain"].startswith(".")
-    result["path_specified"] = bool(result["path"])
+    result['port_specified'] = bool(result['port'])
+    result['domain_specified'] = bool(result['domain'])
+    result['domain_initial_dot'] = result['domain'].startswith('.')
+    result['path_specified'] = bool(result['path'])
 
     return cookielib.Cookie(**result)
 
@@ -493,28 +389,26 @@ def morsel_to_cookie(morsel):
     """Convert a Morsel object into a Cookie containing the one k/v pair."""
 
     expires = None
-    if morsel["max-age"]:
-        try:
-            expires = int(time.time() + int(morsel["max-age"]))
-        except ValueError:
-            raise TypeError(f"max-age: {morsel['max-age']} must be integer")
-    elif morsel["expires"]:
-        time_template = "%a, %d-%b-%Y %H:%M:%S GMT"
-        expires = calendar.timegm(time.strptime(morsel["expires"], time_template))
+    if morsel['max-age']:
+        expires = time.time() + morsel['max-age']
+    elif morsel['expires']:
+        time_template = '%a, %d-%b-%Y %H:%M:%S GMT'
+        expires = time.mktime(
+            time.strptime(morsel['expires'], time_template)) - time.timezone
     return create_cookie(
-        comment=morsel["comment"],
-        comment_url=bool(morsel["comment"]),
+        comment=morsel['comment'],
+        comment_url=bool(morsel['comment']),
         discard=False,
-        domain=morsel["domain"],
+        domain=morsel['domain'],
         expires=expires,
         name=morsel.key,
-        path=morsel["path"],
+        path=morsel['path'],
         port=None,
-        rest={"HttpOnly": morsel["httponly"]},
+        rest={'HttpOnly': morsel['httponly']},
         rfc2109=False,
-        secure=bool(morsel["secure"]),
+        secure=bool(morsel['secure']),
         value=morsel.value,
-        version=morsel["version"] or 0,
+        version=morsel['version'] or 0,
     )
 
 
@@ -525,7 +419,6 @@ def cookiejar_from_dict(cookie_dict, cookiejar=None, overwrite=True):
     :param cookiejar: (optional) A cookiejar to add the cookies to.
     :param overwrite: (optional) If False, will not replace cookies
         already in the jar with new ones.
-    :rtype: CookieJar
     """
     if cookiejar is None:
         cookiejar = RequestsCookieJar()
@@ -544,13 +437,13 @@ def merge_cookies(cookiejar, cookies):
 
     :param cookiejar: CookieJar object to add the cookies to.
     :param cookies: Dictionary or CookieJar object to be added.
-    :rtype: CookieJar
     """
     if not isinstance(cookiejar, cookielib.CookieJar):
-        raise ValueError("You can only merge into CookieJar")
-
+        raise ValueError('You can only merge into CookieJar')
+    
     if isinstance(cookies, dict):
-        cookiejar = cookiejar_from_dict(cookies, cookiejar=cookiejar, overwrite=False)
+        cookiejar = cookiejar_from_dict(
+            cookies, cookiejar=cookiejar, overwrite=False)
     elif isinstance(cookies, cookielib.CookieJar):
         try:
             cookiejar.update(cookies)
diff --git a/lib/requests/exceptions.py b/lib/requests/exceptions.py
index 83986b48..89135a80 100644
--- a/lib/requests/exceptions.py
+++ b/lib/requests/exceptions.py
@@ -1,55 +1,30 @@
+# -*- coding: utf-8 -*-
+
 """
 requests.exceptions
 ~~~~~~~~~~~~~~~~~~~
 
 This module contains the set of Requests' exceptions.
-"""
-from urllib3.exceptions import HTTPError as BaseHTTPError
 
-from .compat import JSONDecodeError as CompatJSONDecodeError
+"""
+from .packages.urllib3.exceptions import HTTPError as BaseHTTPError
 
 
 class RequestException(IOError):
     """There was an ambiguous exception that occurred while handling your
-    request.
-    """
+    request."""
 
     def __init__(self, *args, **kwargs):
-        """Initialize RequestException with `request` and `response` objects."""
-        response = kwargs.pop("response", None)
+        """
+        Initialize RequestException with `request` and `response` objects.
+        """
+        response = kwargs.pop('response', None)
         self.response = response
-        self.request = kwargs.pop("request", None)
-        if response is not None and not self.request and hasattr(response, "request"):
+        self.request = kwargs.pop('request', None)
+        if (response is not None and not self.request and
+                hasattr(response, 'request')):
             self.request = self.response.request
-        super().__init__(*args, **kwargs)
-
-
-class InvalidJSONError(RequestException):
-    """A JSON error occurred."""
-
-
-class JSONDecodeError(InvalidJSONError, CompatJSONDecodeError):
-    """Couldn't decode the text into json"""
-
-    def __init__(self, *args, **kwargs):
-        """
-        Construct the JSONDecodeError instance first with all
-        args. Then use it's args to construct the IOError so that
-        the json specific args aren't used as IOError specific args
-        and the error message from JSONDecodeError is preserved.
-        """
-        CompatJSONDecodeError.__init__(self, *args)
-        InvalidJSONError.__init__(self, *self.args, **kwargs)
-
-    def __reduce__(self):
-        """
-        The __reduce__ method called when pickling the object must
-        be the one from the JSONDecodeError (be it json/simplejson)
-        as it expects all the arguments for instantiation, not just
-        one like the IOError, and the MRO would by default call the
-        __reduce__ method from the IOError due to the inheritance order.
-        """
-        return CompatJSONDecodeError.__reduce__(self)
+        super(RequestException, self).__init__(*args, **kwargs)
 
 
 class HTTPError(RequestException):
@@ -97,23 +72,15 @@ class TooManyRedirects(RequestException):
 
 
 class MissingSchema(RequestException, ValueError):
-    """The URL scheme (e.g. http or https) is missing."""
+    """The URL schema (e.g. http or https) is missing."""
 
 
 class InvalidSchema(RequestException, ValueError):
-    """The URL scheme provided is either invalid or unsupported."""
+    """See defaults.py for valid schemas."""
 
 
 class InvalidURL(RequestException, ValueError):
-    """The URL provided was somehow invalid."""
-
-
-class InvalidHeader(RequestException, ValueError):
-    """The header value provided was somehow invalid."""
-
-
-class InvalidProxyURL(InvalidURL):
-    """The proxy URL provided is invalid."""
+    """ The URL provided was somehow invalid. """
 
 
 class ChunkedEncodingError(RequestException):
@@ -121,31 +88,12 @@ class ChunkedEncodingError(RequestException):
 
 
 class ContentDecodingError(RequestException, BaseHTTPError):
-    """Failed to decode response content."""
+    """Failed to decode response content"""
 
 
 class StreamConsumedError(RequestException, TypeError):
-    """The content for this response was already consumed."""
+    """The content for this response was already consumed"""
 
 
 class RetryError(RequestException):
     """Custom retries logic failed"""
-
-
-class UnrewindableBodyError(RequestException):
-    """Requests encountered an error when trying to rewind a body."""
-
-
-# Warnings
-
-
-class RequestsWarning(Warning):
-    """Base warning for Requests."""
-
-
-class FileModeWarning(RequestsWarning, DeprecationWarning):
-    """A file was opened in text mode, but Requests determined its binary length."""
-
-
-class RequestsDependencyWarning(RequestsWarning):
-    """An imported dependency doesn't match the expected version range."""
diff --git a/lib/requests/help.py b/lib/requests/help.py
deleted file mode 100644
index 8fbcd656..00000000
--- a/lib/requests/help.py
+++ /dev/null
@@ -1,134 +0,0 @@
-"""Module containing bug report helper(s)."""
-
-import json
-import platform
-import ssl
-import sys
-
-import idna
-import urllib3
-
-from . import __version__ as requests_version
-
-try:
-    import charset_normalizer
-except ImportError:
-    charset_normalizer = None
-
-try:
-    import chardet
-except ImportError:
-    chardet = None
-
-try:
-    from urllib3.contrib import pyopenssl
-except ImportError:
-    pyopenssl = None
-    OpenSSL = None
-    cryptography = None
-else:
-    import cryptography
-    import OpenSSL
-
-
-def _implementation():
-    """Return a dict with the Python implementation and version.
-
-    Provide both the name and the version of the Python implementation
-    currently running. For example, on CPython 3.10.3 it will return
-    {'name': 'CPython', 'version': '3.10.3'}.
-
-    This function works best on CPython and PyPy: in particular, it probably
-    doesn't work for Jython or IronPython. Future investigation should be done
-    to work out the correct shape of the code for those platforms.
-    """
-    implementation = platform.python_implementation()
-
-    if implementation == "CPython":
-        implementation_version = platform.python_version()
-    elif implementation == "PyPy":
-        implementation_version = "{}.{}.{}".format(
-            sys.pypy_version_info.major,
-            sys.pypy_version_info.minor,
-            sys.pypy_version_info.micro,
-        )
-        if sys.pypy_version_info.releaselevel != "final":
-            implementation_version = "".join(
-                [implementation_version, sys.pypy_version_info.releaselevel]
-            )
-    elif implementation == "Jython":
-        implementation_version = platform.python_version()  # Complete Guess
-    elif implementation == "IronPython":
-        implementation_version = platform.python_version()  # Complete Guess
-    else:
-        implementation_version = "Unknown"
-
-    return {"name": implementation, "version": implementation_version}
-
-
-def info():
-    """Generate information for a bug report."""
-    try:
-        platform_info = {
-            "system": platform.system(),
-            "release": platform.release(),
-        }
-    except OSError:
-        platform_info = {
-            "system": "Unknown",
-            "release": "Unknown",
-        }
-
-    implementation_info = _implementation()
-    urllib3_info = {"version": urllib3.__version__}
-    charset_normalizer_info = {"version": None}
-    chardet_info = {"version": None}
-    if charset_normalizer:
-        charset_normalizer_info = {"version": charset_normalizer.__version__}
-    if chardet:
-        chardet_info = {"version": chardet.__version__}
-
-    pyopenssl_info = {
-        "version": None,
-        "openssl_version": "",
-    }
-    if OpenSSL:
-        pyopenssl_info = {
-            "version": OpenSSL.__version__,
-            "openssl_version": f"{OpenSSL.SSL.OPENSSL_VERSION_NUMBER:x}",
-        }
-    cryptography_info = {
-        "version": getattr(cryptography, "__version__", ""),
-    }
-    idna_info = {
-        "version": getattr(idna, "__version__", ""),
-    }
-
-    system_ssl = ssl.OPENSSL_VERSION_NUMBER
-    system_ssl_info = {"version": f"{system_ssl:x}" if system_ssl is not None else ""}
-
-    return {
-        "platform": platform_info,
-        "implementation": implementation_info,
-        "system_ssl": system_ssl_info,
-        "using_pyopenssl": pyopenssl is not None,
-        "using_charset_normalizer": chardet is None,
-        "pyOpenSSL": pyopenssl_info,
-        "urllib3": urllib3_info,
-        "chardet": chardet_info,
-        "charset_normalizer": charset_normalizer_info,
-        "cryptography": cryptography_info,
-        "idna": idna_info,
-        "requests": {
-            "version": requests_version,
-        },
-    }
-
-
-def main():
-    """Pretty-print the bug information as JSON."""
-    print(json.dumps(info(), sort_keys=True, indent=2))
-
-
-if __name__ == "__main__":
-    main()
diff --git a/lib/requests/hooks.py b/lib/requests/hooks.py
index d181ba2e..5dfaf6b6 100644
--- a/lib/requests/hooks.py
+++ b/lib/requests/hooks.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 """
 requests.hooks
 ~~~~~~~~~~~~~~
@@ -8,26 +10,36 @@ Available hooks:
 
 ``response``:
     The response generated from a Request.
+
 """
-HOOKS = ["response"]
+
+
+HOOKS = ['response']
 
 
 def default_hooks():
-    return {event: [] for event in HOOKS}
-
+    hooks = {}
+    for event in HOOKS:
+        hooks[event] = []
+    return hooks
 
 # TODO: response is the only one
 
 
 def dispatch_hook(key, hooks, hook_data, **kwargs):
     """Dispatches a hook dictionary on a given piece of data."""
-    hooks = hooks or {}
-    hooks = hooks.get(key)
-    if hooks:
-        if hasattr(hooks, "__call__"):
+
+    hooks = hooks or dict()
+
+    if key in hooks:
+        hooks = hooks.get(key)
+
+        if hasattr(hooks, '__call__'):
             hooks = [hooks]
+
         for hook in hooks:
             _hook_data = hook(hook_data, **kwargs)
             if _hook_data is not None:
                 hook_data = _hook_data
+
     return hook_data
diff --git a/lib/requests/models.py b/lib/requests/models.py
index 8f56ca7d..b728c84e 100644
--- a/lib/requests/models.py
+++ b/lib/requests/models.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 """
 requests.models
 ~~~~~~~~~~~~~~~
@@ -5,83 +7,49 @@ requests.models
 This module contains the primary objects that power Requests.
 """
 
+import collections
 import datetime
 
-# Import encoding now, to avoid implicit import later.
-# Implicit import within threads may cause LookupError when standard library is in a ZIP,
-# such as in Embedded Python. See https://github.com/psf/requests/issues/3578.
-import encodings.idna  # noqa: F401
-from io import UnsupportedOperation
-
-from urllib3.exceptions import (
-    DecodeError,
-    LocationParseError,
-    ProtocolError,
-    ReadTimeoutError,
-    SSLError,
-)
-from urllib3.fields import RequestField
-from urllib3.filepost import encode_multipart_formdata
-from urllib3.util import parse_url
-
-from ._internal_utils import to_native_string, unicode_is_ascii
-from .auth import HTTPBasicAuth
-from .compat import (
-    Callable,
-    JSONDecodeError,
-    Mapping,
-    basestring,
-    builtin_str,
-    chardet,
-    cookielib,
-)
-from .compat import json as complexjson
-from .compat import urlencode, urlsplit, urlunparse
-from .cookies import _copy_cookie_jar, cookiejar_from_dict, get_cookie_header
-from .exceptions import (
-    ChunkedEncodingError,
-    ConnectionError,
-    ContentDecodingError,
-    HTTPError,
-    InvalidJSONError,
-    InvalidURL,
-)
-from .exceptions import JSONDecodeError as RequestsJSONDecodeError
-from .exceptions import MissingSchema
-from .exceptions import SSLError as RequestsSSLError
-from .exceptions import StreamConsumedError
+from io import BytesIO, UnsupportedOperation
 from .hooks import default_hooks
-from .status_codes import codes
 from .structures import CaseInsensitiveDict
+
+from .auth import HTTPBasicAuth
+from .cookies import cookiejar_from_dict, get_cookie_header
+from .packages.urllib3.fields import RequestField
+from .packages.urllib3.filepost import encode_multipart_formdata
+from .packages.urllib3.util import parse_url
+from .packages.urllib3.exceptions import (
+    DecodeError, ReadTimeoutError, ProtocolError, LocationParseError)
+from .exceptions import (
+    HTTPError, MissingSchema, InvalidURL, ChunkedEncodingError,
+    ContentDecodingError, ConnectionError, StreamConsumedError)
 from .utils import (
-    check_header_validity,
-    get_auth_from_url,
-    guess_filename,
-    guess_json_utf,
-    iter_slices,
-    parse_header_links,
-    requote_uri,
-    stream_decode_response_unicode,
-    super_len,
-    to_key_val_list,
-)
+    guess_filename, get_auth_from_url, requote_uri,
+    stream_decode_response_unicode, to_key_val_list, parse_header_links,
+    iter_slices, guess_json_utf, super_len, to_native_string)
+from .compat import (
+    cookielib, urlunparse, urlsplit, urlencode, str, bytes, StringIO,
+    is_py2, chardet, json, builtin_str, basestring)
+from .status_codes import codes
 
 #: The set of HTTP status codes that indicate an automatically
 #: processable redirect.
 REDIRECT_STATI = (
-    codes.moved,  # 301
-    codes.found,  # 302
-    codes.other,  # 303
-    codes.temporary_redirect,  # 307
-    codes.permanent_redirect,  # 308
+    codes.moved,              # 301
+    codes.found,              # 302
+    codes.other,              # 303
+    codes.temporary_redirect, # 307
+    codes.permanent_redirect, # 308
 )
-
 DEFAULT_REDIRECT_LIMIT = 30
 CONTENT_CHUNK_SIZE = 10 * 1024
 ITER_CHUNK_SIZE = 512
 
+json_dumps = json.dumps
 
-class RequestEncodingMixin:
+
+class RequestEncodingMixin(object):
     @property
     def path_url(self):
         """Build the path URL to use."""
@@ -92,16 +60,16 @@ class RequestEncodingMixin:
 
         path = p.path
         if not path:
-            path = "/"
+            path = '/'
 
         url.append(path)
 
         query = p.query
         if query:
-            url.append("?")
+            url.append('?')
             url.append(query)
 
-        return "".join(url)
+        return ''.join(url)
 
     @staticmethod
     def _encode_params(data):
@@ -114,21 +82,18 @@ class RequestEncodingMixin:
 
         if isinstance(data, (str, bytes)):
             return data
-        elif hasattr(data, "read"):
+        elif hasattr(data, 'read'):
             return data
-        elif hasattr(data, "__iter__"):
+        elif hasattr(data, '__iter__'):
             result = []
             for k, vs in to_key_val_list(data):
-                if isinstance(vs, basestring) or not hasattr(vs, "__iter__"):
+                if isinstance(vs, basestring) or not hasattr(vs, '__iter__'):
                     vs = [vs]
                 for v in vs:
                     if v is not None:
                         result.append(
-                            (
-                                k.encode("utf-8") if isinstance(k, str) else k,
-                                v.encode("utf-8") if isinstance(v, str) else v,
-                            )
-                        )
+                            (k.encode('utf-8') if isinstance(k, str) else k,
+                             v.encode('utf-8') if isinstance(v, str) else v))
             return urlencode(result, doseq=True)
         else:
             return data
@@ -138,12 +103,11 @@ class RequestEncodingMixin:
         """Build the body for a multipart/form-data request.
 
         Will successfully encode files when passed as a dict or a list of
-        tuples. Order is retained if data is a list of tuples but arbitrary
+        2-tuples. Order is retained if data is a list of 2-tuples but arbitrary
         if parameters are supplied as a dict.
-        The tuples may be 2-tuples (filename, fileobj), 3-tuples (filename, fileobj, contentype)
-        or 4-tuples (filename, fileobj, contentype, custom_headers).
+
         """
-        if not files:
+        if (not files):
             raise ValueError("Files must be provided.")
         elif isinstance(data, basestring):
             raise ValueError("Data must not be a string.")
@@ -153,7 +117,7 @@ class RequestEncodingMixin:
         files = to_key_val_list(files or {})
 
         for field, val in fields:
-            if isinstance(val, basestring) or not hasattr(val, "__iter__"):
+            if isinstance(val, basestring) or not hasattr(val, '__iter__'):
                 val = [val]
             for v in val:
                 if v is not None:
@@ -162,15 +126,10 @@ class RequestEncodingMixin:
                         v = str(v)
 
                     new_fields.append(
-                        (
-                            field.decode("utf-8")
-                            if isinstance(field, bytes)
-                            else field,
-                            v.encode("utf-8") if isinstance(v, str) else v,
-                        )
-                    )
+                        (field.decode('utf-8') if isinstance(field, bytes) else field,
+                         v.encode('utf-8') if isinstance(v, str) else v))
 
-        for k, v in files:
+        for (k, v) in files:
             # support for explicit filename
             ft = None
             fh = None
@@ -184,17 +143,13 @@ class RequestEncodingMixin:
             else:
                 fn = guess_filename(v) or k
                 fp = v
+            if isinstance(fp, str):
+                fp = StringIO(fp)
+            if isinstance(fp, bytes):
+                fp = BytesIO(fp)
 
-            if isinstance(fp, (str, bytes, bytearray)):
-                fdata = fp
-            elif hasattr(fp, "read"):
-                fdata = fp.read()
-            elif fp is None:
-                continue
-            else:
-                fdata = fp
-
-            rf = RequestField(name=k, data=fdata, filename=fn, headers=fh)
+            rf = RequestField(name=k, data=fp.read(),
+                              filename=fn, headers=fh)
             rf.make_multipart(content_type=ft)
             new_fields.append(rf)
 
@@ -203,17 +158,17 @@ class RequestEncodingMixin:
         return body, content_type
 
 
-class RequestHooksMixin:
+class RequestHooksMixin(object):
     def register_hook(self, event, hook):
         """Properly register a hook."""
 
         if event not in self.hooks:
-            raise ValueError(f'Unsupported event specified, with event name "{event}"')
+            raise ValueError('Unsupported event specified, with event name "%s"' % (event))
 
-        if isinstance(hook, Callable):
+        if isinstance(hook, collections.Callable):
             self.hooks[event].append(hook)
-        elif hasattr(hook, "__iter__"):
-            self.hooks[event].extend(h for h in hook if isinstance(h, Callable))
+        elif hasattr(hook, '__iter__'):
+            self.hooks[event].extend(h for h in hook if isinstance(h, collections.Callable))
 
     def deregister_hook(self, event, hook):
         """Deregister a previously registered hook.
@@ -236,13 +191,9 @@ class Request(RequestHooksMixin):
     :param url: URL to send.
     :param headers: dictionary of headers to send.
     :param files: dictionary of {filename: fileobject} files to multipart upload.
-    :param data: the body to attach to the request. If a dictionary or
-        list of tuples ``[(key, value)]`` is provided, form-encoding will
-        take place.
-    :param json: json for the body to attach to the request (if files or data is not specified).
-    :param params: URL parameters to append to the URL. If a dictionary or
-        list of tuples ``[(key, value)]`` is provided, form-encoding will
-        take place.
+    :param data: the body to attach to the request. If a dictionary is provided, form-encoding will take place.
+    :param json: json for the body to attach to the request (if data is not specified).
+    :param params: dictionary of URL parameters to append to the URL.
     :param auth: Auth handler or (user, pass) tuple.
     :param cookies: dictionary or CookieJar of cookies to attach to this request.
     :param hooks: dictionary of callback hooks, for internal usage.
@@ -250,13 +201,12 @@ class Request(RequestHooksMixin):
     Usage::
 
       >>> import requests
-      >>> req = requests.Request('GET', 'https://httpbin.org/get')
+      >>> req = requests.Request('GET', 'http://httpbin.org/get')
       >>> req.prepare()
       <PreparedRequest [GET]>
-    """
 
-    def __init__(
-        self,
+    """
+    def __init__(self,
         method=None,
         url=None,
         headers=None,
@@ -266,8 +216,8 @@ class Request(RequestHooksMixin):
         auth=None,
         cookies=None,
         hooks=None,
-        json=None,
-    ):
+        json=None):
+
         # Default empty dicts for dict params.
         data = [] if data is None else data
         files = [] if files is None else files
@@ -276,7 +226,7 @@ class Request(RequestHooksMixin):
         hooks = {} if hooks is None else hooks
 
         self.hooks = default_hooks()
-        for k, v in list(hooks.items()):
+        for (k, v) in list(hooks.items()):
             self.register_hook(event=k, hook=v)
 
         self.method = method
@@ -290,7 +240,7 @@ class Request(RequestHooksMixin):
         self.cookies = cookies
 
     def __repr__(self):
-        return f"<Request [{self.method}]>"
+        return '<Request [%s]>' % (self.method)
 
     def prepare(self):
         """Constructs a :class:`PreparedRequest <PreparedRequest>` for transmission and returns it."""
@@ -314,21 +264,19 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
     """The fully mutable :class:`PreparedRequest <PreparedRequest>` object,
     containing the exact bytes that will be sent to the server.
 
-    Instances are generated from a :class:`Request <Request>` object, and
-    should not be instantiated manually; doing so may produce undesirable
-    effects.
+    Generated from either a :class:`Request <Request>` object or manually.
 
     Usage::
 
       >>> import requests
-      >>> req = requests.Request('GET', 'https://httpbin.org/get')
+      >>> req = requests.Request('GET', 'http://httpbin.org/get')
       >>> r = req.prepare()
-      >>> r
       <PreparedRequest [GET]>
 
       >>> s = requests.Session()
       >>> s.send(r)
       <Response [200]>
+
     """
 
     def __init__(self):
@@ -345,22 +293,10 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
         self.body = None
         #: dictionary of callback hooks, for internal usage.
         self.hooks = default_hooks()
-        #: integer denoting starting position of a readable file-like body.
-        self._body_position = None
 
-    def prepare(
-        self,
-        method=None,
-        url=None,
-        headers=None,
-        files=None,
-        data=None,
-        params=None,
-        auth=None,
-        cookies=None,
-        hooks=None,
-        json=None,
-    ):
+    def prepare(self, method=None, url=None, headers=None, files=None,
+                data=None, params=None, auth=None, cookies=None, hooks=None,
+                json=None):
         """Prepares the entire request with the given parameters."""
 
         self.prepare_method(method)
@@ -369,7 +305,6 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
         self.prepare_cookies(cookies)
         self.prepare_body(data, files, json)
         self.prepare_auth(auth, url)
-
         # Note that prepare_auth must be last to enable authentication schemes
         # such as OAuth to work on a fully prepared request.
 
@@ -377,54 +312,40 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
         self.prepare_hooks(hooks)
 
     def __repr__(self):
-        return f"<PreparedRequest [{self.method}]>"
+        return '<PreparedRequest [%s]>' % (self.method)
 
     def copy(self):
         p = PreparedRequest()
         p.method = self.method
         p.url = self.url
         p.headers = self.headers.copy() if self.headers is not None else None
-        p._cookies = _copy_cookie_jar(self._cookies)
+        p._cookies = self._cookies.copy() if self._cookies is not None else None
         p.body = self.body
         p.hooks = self.hooks
-        p._body_position = self._body_position
         return p
 
     def prepare_method(self, method):
         """Prepares the given HTTP method."""
         self.method = method
         if self.method is not None:
-            self.method = to_native_string(self.method.upper())
-
-    @staticmethod
-    def _get_idna_encoded_host(host):
-        import idna
-
-        try:
-            host = idna.encode(host, uts46=True).decode("utf-8")
-        except idna.IDNAError:
-            raise UnicodeError
-        return host
+            self.method = self.method.upper()
 
     def prepare_url(self, url, params):
         """Prepares the given HTTP URL."""
         #: Accept objects that have string representations.
-        #: We're unable to blindly call unicode/str functions
+        #: We're unable to blindy call unicode/str functions
         #: as this will include the bytestring indicator (b'')
         #: on python 3.x.
-        #: https://github.com/psf/requests/pull/2238
+        #: https://github.com/kennethreitz/requests/pull/2238
         if isinstance(url, bytes):
-            url = url.decode("utf8")
+            url = url.decode('utf8')
         else:
-            url = str(url)
-
-        # Remove leading whitespaces from url
-        url = url.lstrip()
+            url = unicode(url) if is_py2 else str(url)
 
         # Don't do any URL preparation for non-HTTP schemes like `mailto`,
         # `data` etc to work around exceptions from `url_parse`, which
         # handles RFC 3986 only.
-        if ":" in url and not url.lower().startswith("http"):
+        if ':' in url and not url.lower().startswith('http'):
             self.url = url
             return
 
@@ -435,45 +356,46 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
             raise InvalidURL(*e.args)
 
         if not scheme:
-            raise MissingSchema(
-                f"Invalid URL {url!r}: No scheme supplied. "
-                f"Perhaps you meant https://{url}?"
-            )
+            raise MissingSchema("Invalid URL {0!r}: No schema supplied. "
+                                "Perhaps you meant http://{0}?".format(url))
 
         if not host:
-            raise InvalidURL(f"Invalid URL {url!r}: No host supplied")
+            raise InvalidURL("Invalid URL %r: No host supplied" % url)
 
-        # In general, we want to try IDNA encoding the hostname if the string contains
-        # non-ASCII characters. This allows users to automatically get the correct IDNA
-        # behaviour. For strings containing only ASCII characters, we need to also verify
-        # it doesn't start with a wildcard (*), before allowing the unencoded hostname.
-        if not unicode_is_ascii(host):
-            try:
-                host = self._get_idna_encoded_host(host)
-            except UnicodeError:
-                raise InvalidURL("URL has an invalid label.")
-        elif host.startswith(("*", ".")):
-            raise InvalidURL("URL has an invalid label.")
+        # Only want to apply IDNA to the hostname
+        try:
+            host = host.encode('idna').decode('utf-8')
+        except UnicodeError:
+            raise InvalidURL('URL has an invalid label.')
 
         # Carefully reconstruct the network location
-        netloc = auth or ""
+        netloc = auth or ''
         if netloc:
-            netloc += "@"
+            netloc += '@'
         netloc += host
         if port:
-            netloc += f":{port}"
+            netloc += ':' + str(port)
 
         # Bare domains aren't valid URLs.
         if not path:
-            path = "/"
+            path = '/'
 
-        if isinstance(params, (str, bytes)):
-            params = to_native_string(params)
+        if is_py2:
+            if isinstance(scheme, str):
+                scheme = scheme.encode('utf-8')
+            if isinstance(netloc, str):
+                netloc = netloc.encode('utf-8')
+            if isinstance(path, str):
+                path = path.encode('utf-8')
+            if isinstance(query, str):
+                query = query.encode('utf-8')
+            if isinstance(fragment, str):
+                fragment = fragment.encode('utf-8')
 
         enc_params = self._encode_params(params)
         if enc_params:
             if query:
-                query = f"{query}&{enc_params}"
+                query = '%s&%s' % (query, enc_params)
             else:
                 query = enc_params
 
@@ -483,13 +405,10 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
     def prepare_headers(self, headers):
         """Prepares the given HTTP headers."""
 
-        self.headers = CaseInsensitiveDict()
         if headers:
-            for header in headers.items():
-                # Raise exception on invalid header value.
-                check_header_validity(header)
-                name, value = header
-                self.headers[to_native_string(name)] = value
+            self.headers = CaseInsensitiveDict((to_native_string(name), value) for name, value in headers.items())
+        else:
+            self.headers = CaseInsensitiveDict()
 
     def prepare_body(self, data, files, json=None):
         """Prepares the given HTTP body data."""
@@ -500,92 +419,65 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
         # Nottin' on you.
         body = None
         content_type = None
+        length = None
 
-        if not data and json is not None:
-            # urllib3 requires a bytes-like body. Python 2's json.dumps
-            # provides this natively, but Python 3 gives a Unicode string.
-            content_type = "application/json"
+        if json is not None:
+            content_type = 'application/json'
+            body = json_dumps(json)
 
-            try:
-                body = complexjson.dumps(json, allow_nan=False)
-            except ValueError as ve:
-                raise InvalidJSONError(ve, request=self)
+        is_stream = all([
+            hasattr(data, '__iter__'),
+            not isinstance(data, (basestring, list, tuple, dict))
+        ])
 
-            if not isinstance(body, bytes):
-                body = body.encode("utf-8")
-
-        is_stream = all(
-            [
-                hasattr(data, "__iter__"),
-                not isinstance(data, (basestring, list, tuple, Mapping)),
-            ]
-        )
+        try:
+            length = super_len(data)
+        except (TypeError, AttributeError, UnsupportedOperation):
+            length = None
 
         if is_stream:
-            try:
-                length = super_len(data)
-            except (TypeError, AttributeError, UnsupportedOperation):
-                length = None
-
             body = data
 
-            if getattr(body, "tell", None) is not None:
-                # Record the current file position before reading.
-                # This will allow us to rewind a file in the event
-                # of a redirect.
-                try:
-                    self._body_position = body.tell()
-                except OSError:
-                    # This differentiates from None, allowing us to catch
-                    # a failed `tell()` later when trying to rewind the body
-                    self._body_position = object()
-
             if files:
-                raise NotImplementedError(
-                    "Streamed bodies and files are mutually exclusive."
-                )
+                raise NotImplementedError('Streamed bodies and files are mutually exclusive.')
 
-            if length:
-                self.headers["Content-Length"] = builtin_str(length)
+            if length is not None:
+                self.headers['Content-Length'] = builtin_str(length)
             else:
-                self.headers["Transfer-Encoding"] = "chunked"
+                self.headers['Transfer-Encoding'] = 'chunked'
         else:
             # Multi-part file uploads.
             if files:
                 (body, content_type) = self._encode_files(files, data)
             else:
-                if data:
+                if data and json is None:
                     body = self._encode_params(data)
-                    if isinstance(data, basestring) or hasattr(data, "read"):
+                    if isinstance(data, basestring) or hasattr(data, 'read'):
                         content_type = None
                     else:
-                        content_type = "application/x-www-form-urlencoded"
+                        content_type = 'application/x-www-form-urlencoded'
 
             self.prepare_content_length(body)
 
             # Add content-type if it wasn't explicitly provided.
-            if content_type and ("content-type" not in self.headers):
-                self.headers["Content-Type"] = content_type
+            if content_type and ('content-type' not in self.headers):
+                self.headers['Content-Type'] = content_type
 
         self.body = body
 
     def prepare_content_length(self, body):
-        """Prepare Content-Length header based on request method and body"""
-        if body is not None:
-            length = super_len(body)
-            if length:
-                # If length exists, set it. Otherwise, we fallback
-                # to Transfer-Encoding: chunked.
-                self.headers["Content-Length"] = builtin_str(length)
-        elif (
-            self.method not in ("GET", "HEAD")
-            and self.headers.get("Content-Length") is None
-        ):
-            # Set Content-Length to 0 for methods that can have a body
-            # but don't provide one. (i.e. not GET or HEAD)
-            self.headers["Content-Length"] = "0"
+        if hasattr(body, 'seek') and hasattr(body, 'tell'):
+            body.seek(0, 2)
+            self.headers['Content-Length'] = builtin_str(body.tell())
+            body.seek(0, 0)
+        elif body is not None:
+            l = super_len(body)
+            if l:
+                self.headers['Content-Length'] = builtin_str(l)
+        elif (self.method not in ('GET', 'HEAD')) and (self.headers.get('Content-Length') is None):
+            self.headers['Content-Length'] = '0'
 
-    def prepare_auth(self, auth, url=""):
+    def prepare_auth(self, auth, url=''):
         """Prepares the given HTTP auth data."""
 
         # If no Auth is explicitly provided, extract it from the URL first.
@@ -608,16 +500,8 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
             self.prepare_content_length(self.body)
 
     def prepare_cookies(self, cookies):
-        """Prepares the given HTTP cookie data.
+        """Prepares the given HTTP cookie data."""
 
-        This function eventually generates a ``Cookie`` header from the
-        given cookies using cookielib. Due to cookielib's design, the header
-        will not be regenerated if it already exists, meaning this function
-        can only be called once for the life of the
-        :class:`PreparedRequest <PreparedRequest>` object. Any subsequent calls
-        to ``prepare_cookies`` will have no actual effect, unless the "Cookie"
-        header is removed beforehand.
-        """
         if isinstance(cookies, cookielib.CookieJar):
             self._cookies = cookies
         else:
@@ -625,40 +509,37 @@ class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
 
         cookie_header = get_cookie_header(self._cookies, self)
         if cookie_header is not None:
-            self.headers["Cookie"] = cookie_header
+            self.headers['Cookie'] = cookie_header
 
     def prepare_hooks(self, hooks):
         """Prepares the given hooks."""
-        # hooks can be passed as None to the prepare method and to this
-        # method. To prevent iterating over None, simply use an empty list
-        # if hooks is False-y
-        hooks = hooks or []
         for event in hooks:
             self.register_hook(event, hooks[event])
 
 
-class Response:
+class Response(object):
     """The :class:`Response <Response>` object, which contains a
     server's response to an HTTP request.
     """
 
     __attrs__ = [
-        "_content",
-        "status_code",
-        "headers",
-        "url",
-        "history",
-        "encoding",
-        "reason",
-        "cookies",
-        "elapsed",
-        "request",
+        '_content',
+        'status_code',
+        'headers',
+        'url',
+        'history',
+        'encoding',
+        'reason',
+        'cookies',
+        'elapsed',
+        'request',
     ]
 
     def __init__(self):
+        super(Response, self).__init__()
+
         self._content = False
         self._content_consumed = False
-        self._next = None
 
         #: Integer Code of responded HTTP Status, e.g. 404 or 200.
         self.status_code = None
@@ -670,7 +551,7 @@ class Response:
 
         #: File-like object representation of response (for advanced usage).
         #: Use of ``raw`` requires that ``stream=True`` be set on the request.
-        #: This requirement does not apply for use internally to Requests.
+        # This requirement does not apply for use internally to Requests.
         self.raw = None
 
         #: Final URL location of Response.
@@ -691,60 +572,41 @@ class Response:
         self.cookies = cookiejar_from_dict({})
 
         #: The amount of time elapsed between sending the request
-        #: and the arrival of the response (as a timedelta).
-        #: This property specifically measures the time taken between sending
-        #: the first byte of the request and finishing parsing the headers. It
-        #: is therefore unaffected by consuming the response content or the
-        #: value of the ``stream`` keyword argument.
+        #: and the arrival of the response (as a timedelta)
         self.elapsed = datetime.timedelta(0)
 
         #: The :class:`PreparedRequest <PreparedRequest>` object to which this
         #: is a response.
         self.request = None
 
-    def __enter__(self):
-        return self
-
-    def __exit__(self, *args):
-        self.close()
-
     def __getstate__(self):
         # Consume everything; accessing the content attribute makes
         # sure the content has been fully read.
         if not self._content_consumed:
             self.content
 
-        return {attr: getattr(self, attr, None) for attr in self.__attrs__}
+        return dict(
+            (attr, getattr(self, attr, None))
+            for attr in self.__attrs__
+        )
 
     def __setstate__(self, state):
         for name, value in state.items():
             setattr(self, name, value)
 
         # pickled objects do not have .raw
-        setattr(self, "_content_consumed", True)
-        setattr(self, "raw", None)
+        setattr(self, '_content_consumed', True)
+        setattr(self, 'raw', None)
 
     def __repr__(self):
-        return f"<Response [{self.status_code}]>"
+        return '<Response [%s]>' % (self.status_code)
 
     def __bool__(self):
-        """Returns True if :attr:`status_code` is less than 400.
-
-        This attribute checks if the status code of the response is between
-        400 and 600 to see if there was a client error or a server error. If
-        the status code, is between 200 and 400, this will return True. This
-        is **not** a check to see if the response code is ``200 OK``.
-        """
+        """Returns true if :attr:`status_code` is 'OK'."""
         return self.ok
 
     def __nonzero__(self):
-        """Returns True if :attr:`status_code` is less than 400.
-
-        This attribute checks if the status code of the response is between
-        400 and 600 to see if there was a client error or a server error. If
-        the status code, is between 200 and 400, this will return True. This
-        is **not** a check to see if the response code is ``200 OK``.
-        """
+        """Returns true if :attr:`status_code` is 'OK'."""
         return self.ok
 
     def __iter__(self):
@@ -753,13 +615,6 @@ class Response:
 
     @property
     def ok(self):
-        """Returns True if :attr:`status_code` is less than 400, False if not.
-
-        This attribute checks if the status code of the response is between
-        400 and 600 to see if there was a client error or a server error. If
-        the status code is between 200 and 400, this will return True. This
-        is **not** a check to see if the response code is ``200 OK``.
-        """
         try:
             self.raise_for_status()
         except HTTPError:
@@ -771,30 +626,17 @@ class Response:
         """True if this Response is a well-formed HTTP redirect that could have
         been processed automatically (by :meth:`Session.resolve_redirects`).
         """
-        return "location" in self.headers and self.status_code in REDIRECT_STATI
+        return ('location' in self.headers and self.status_code in REDIRECT_STATI)
 
     @property
     def is_permanent_redirect(self):
-        """True if this Response one of the permanent versions of redirect."""
-        return "location" in self.headers and self.status_code in (
-            codes.moved_permanently,
-            codes.permanent_redirect,
-        )
-
-    @property
-    def next(self):
-        """Returns a PreparedRequest for the next request in a redirect chain, if there is one."""
-        return self._next
+        """True if this Response one of the permanant versions of redirect"""
+        return ('location' in self.headers and self.status_code in (codes.moved_permanently, codes.permanent_redirect))
 
     @property
     def apparent_encoding(self):
-        """The apparent encoding, provided by the charset_normalizer or chardet libraries."""
-        if chardet is not None:
-            return chardet.detect(self.content)["encoding"]
-        else:
-            # If no character detection library is available, we'll fall back
-            # to a standard Python utf-8 str.
-            return "utf-8"
+        """The apparent encoding, provided by the chardet library"""
+        return chardet.detect(self.content)['encoding']
 
     def iter_content(self, chunk_size=1, decode_unicode=False):
         """Iterates over the response data.  When stream=True is set on the
@@ -803,30 +645,22 @@ class Response:
         read into memory.  This is not necessarily the length of each item
         returned as decoding can take place.
 
-        chunk_size must be of type int or None. A value of None will
-        function differently depending on the value of `stream`.
-        stream=True will read data as it arrives in whatever size the
-        chunks are received. If stream=False, data is returned as
-        a single chunk.
-
         If decode_unicode is True, content will be decoded using the best
         available encoding based on the response.
         """
-
         def generate():
-            # Special case for urllib3.
-            if hasattr(self.raw, "stream"):
+            try:
+                # Special case for urllib3.
                 try:
-                    yield from self.raw.stream(chunk_size, decode_content=True)
+                    for chunk in self.raw.stream(chunk_size, decode_content=True):
+                        yield chunk
                 except ProtocolError as e:
                     raise ChunkedEncodingError(e)
                 except DecodeError as e:
                     raise ContentDecodingError(e)
                 except ReadTimeoutError as e:
                     raise ConnectionError(e)
-                except SSLError as e:
-                    raise RequestsSSLError(e)
-            else:
+            except AttributeError:
                 # Standard file-like object.
                 while True:
                     chunk = self.raw.read(chunk_size)
@@ -838,10 +672,6 @@ class Response:
 
         if self._content_consumed and isinstance(self._content, bool):
             raise StreamConsumedError()
-        elif chunk_size is not None and not isinstance(chunk_size, int):
-            raise TypeError(
-                f"chunk_size must be an int, it is instead a {type(chunk_size)}."
-            )
         # simulate reading small chunks of the content
         reused_chunks = iter_slices(self._content, chunk_size)
 
@@ -854,21 +684,16 @@ class Response:
 
         return chunks
 
-    def iter_lines(
-        self, chunk_size=ITER_CHUNK_SIZE, decode_unicode=False, delimiter=None
-    ):
+    def iter_lines(self, chunk_size=ITER_CHUNK_SIZE, decode_unicode=None, delimiter=None):
         """Iterates over the response data, one line at a time.  When
         stream=True is set on the request, this avoids reading the
         content at once into memory for large responses.
-
-        .. note:: This method is not reentrant safe.
         """
 
         pending = None
 
-        for chunk in self.iter_content(
-            chunk_size=chunk_size, decode_unicode=decode_unicode
-        ):
+        for chunk in self.iter_content(chunk_size=chunk_size, decode_unicode=decode_unicode):
+
             if pending is not None:
                 chunk = pending + chunk
 
@@ -882,7 +707,8 @@ class Response:
             else:
                 pending = None
 
-            yield from lines
+            for line in lines:
+                yield line
 
         if pending is not None:
             yield pending
@@ -893,13 +719,18 @@ class Response:
 
         if self._content is False:
             # Read the contents.
-            if self._content_consumed:
-                raise RuntimeError("The content for this response was already consumed")
+            try:
+                if self._content_consumed:
+                    raise RuntimeError(
+                        'The content for this response was already consumed')
 
-            if self.status_code == 0 or self.raw is None:
+                if self.status_code == 0:
+                    self._content = None
+                else:
+                    self._content = bytes().join(self.iter_content(CONTENT_CHUNK_SIZE)) or bytes()
+
+            except AttributeError:
                 self._content = None
-            else:
-                self._content = b"".join(self.iter_content(CONTENT_CHUNK_SIZE)) or b""
 
         self._content_consumed = True
         # don't need to release the connection; that's been handled by urllib3
@@ -911,7 +742,7 @@ class Response:
         """Content of the response, in unicode.
 
         If Response.encoding is None, encoding will be guessed using
-        ``charset_normalizer`` or ``chardet``.
+        ``chardet``.
 
         The encoding of the response content is determined based solely on HTTP
         headers, following RFC 2616 to the letter. If you can take advantage of
@@ -924,7 +755,7 @@ class Response:
         encoding = self.encoding
 
         if not self.content:
-            return ""
+            return str('')
 
         # Fallback to auto-detected encoding.
         if self.encoding is None:
@@ -932,7 +763,7 @@ class Response:
 
         # Decode unicode from given encoding.
         try:
-            content = str(self.content, encoding, errors="replace")
+            content = str(self.content, encoding, errors='replace')
         except (LookupError, TypeError):
             # A LookupError is raised if the encoding was not found which could
             # indicate a misspelling or similar mistake.
@@ -940,85 +771,61 @@ class Response:
             # A TypeError can be raised if encoding is None
             #
             # So we try blindly encoding.
-            content = str(self.content, errors="replace")
+            content = str(self.content, errors='replace')
 
         return content
 
     def json(self, **kwargs):
-        r"""Returns the json-encoded content of a response, if any.
+        """Returns the json-encoded content of a response, if any.
 
         :param \*\*kwargs: Optional arguments that ``json.loads`` takes.
-        :raises requests.exceptions.JSONDecodeError: If the response body does not
-            contain valid json.
         """
 
-        if not self.encoding and self.content and len(self.content) > 3:
+        if not self.encoding and len(self.content) > 3:
             # No encoding set. JSON RFC 4627 section 3 states we should expect
             # UTF-8, -16 or -32. Detect which one to use; If the detection or
-            # decoding fails, fall back to `self.text` (using charset_normalizer to make
+            # decoding fails, fall back to `self.text` (using chardet to make
             # a best guess).
             encoding = guess_json_utf(self.content)
             if encoding is not None:
                 try:
-                    return complexjson.loads(self.content.decode(encoding), **kwargs)
+                    return json.loads(self.content.decode(encoding), **kwargs)
                 except UnicodeDecodeError:
                     # Wrong UTF codec detected; usually because it's not UTF-8
                     # but some other 8-bit codec.  This is an RFC violation,
                     # and the server didn't bother to tell us what codec *was*
                     # used.
                     pass
-                except JSONDecodeError as e:
-                    raise RequestsJSONDecodeError(e.msg, e.doc, e.pos)
-
-        try:
-            return complexjson.loads(self.text, **kwargs)
-        except JSONDecodeError as e:
-            # Catch JSON-related errors and raise as requests.JSONDecodeError
-            # This aliases json.JSONDecodeError and simplejson.JSONDecodeError
-            raise RequestsJSONDecodeError(e.msg, e.doc, e.pos)
+        return json.loads(self.text, **kwargs)
 
     @property
     def links(self):
         """Returns the parsed header links of the response, if any."""
 
-        header = self.headers.get("link")
+        header = self.headers.get('link')
 
-        resolved_links = {}
+        # l = MultiDict()
+        l = {}
 
         if header:
             links = parse_header_links(header)
 
             for link in links:
-                key = link.get("rel") or link.get("url")
-                resolved_links[key] = link
+                key = link.get('rel') or link.get('url')
+                l[key] = link
 
-        return resolved_links
+        return l
 
     def raise_for_status(self):
-        """Raises :class:`HTTPError`, if one occurred."""
+        """Raises stored :class:`HTTPError`, if one occurred."""
 
-        http_error_msg = ""
-        if isinstance(self.reason, bytes):
-            # We attempt to decode utf-8 first because some servers
-            # choose to localize their reason strings. If the string
-            # isn't utf-8, we fall back to iso-8859-1 for all other
-            # encodings. (See PR #3538)
-            try:
-                reason = self.reason.decode("utf-8")
-            except UnicodeDecodeError:
-                reason = self.reason.decode("iso-8859-1")
-        else:
-            reason = self.reason
+        http_error_msg = ''
 
         if 400 <= self.status_code < 500:
-            http_error_msg = (
-                f"{self.status_code} Client Error: {reason} for url: {self.url}"
-            )
+            http_error_msg = '%s Client Error: %s' % (self.status_code, self.reason)
 
         elif 500 <= self.status_code < 600:
-            http_error_msg = (
-                f"{self.status_code} Server Error: {reason} for url: {self.url}"
-            )
+            http_error_msg = '%s Server Error: %s' % (self.status_code, self.reason)
 
         if http_error_msg:
             raise HTTPError(http_error_msg, response=self)
@@ -1029,9 +836,4 @@ class Response:
 
         *Note: Should not normally need to be called explicitly.*
         """
-        if not self._content_consumed:
-            self.raw.close()
-
-        release_conn = getattr(self.raw, "release_conn", None)
-        if release_conn is not None:
-            release_conn()
+        return self.raw.release_conn()
diff --git a/lib/requests/packages.py b/lib/requests/packages.py
deleted file mode 100644
index 5ab3d8e2..00000000
--- a/lib/requests/packages.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import sys
-
-from .compat import chardet
-
-# This code exists for backwards compatibility reasons.
-# I don't like it either. Just look the other way. :)
-
-for package in ("urllib3", "idna"):
-    locals()[package] = __import__(package)
-    # This traversal is apparently necessary such that the identities are
-    # preserved (requests.packages.urllib3.* is urllib3.*)
-    for mod in list(sys.modules):
-        if mod == package or mod.startswith(f"{package}."):
-            sys.modules[f"requests.packages.{mod}"] = sys.modules[mod]
-
-if chardet is not None:
-    target = chardet.__name__
-    for mod in list(sys.modules):
-        if mod == target or mod.startswith(f"{target}."):
-            imported_mod = sys.modules[mod]
-            sys.modules[f"requests.packages.{mod}"] = imported_mod
-            mod = mod.replace(target, "chardet")
-            sys.modules[f"requests.packages.{mod}"] = imported_mod
diff --git a/lib/requests/packages/__init__.py b/lib/requests/packages/__init__.py
new file mode 100644
index 00000000..d62c4b71
--- /dev/null
+++ b/lib/requests/packages/__init__.py
@@ -0,0 +1,3 @@
+from __future__ import absolute_import
+
+from . import urllib3
diff --git a/lib/requests/packages/chardet/__init__.py b/lib/requests/packages/chardet/__init__.py
new file mode 100644
index 00000000..82c2a48d
--- /dev/null
+++ b/lib/requests/packages/chardet/__init__.py
@@ -0,0 +1,32 @@
+######################## BEGIN LICENSE BLOCK ########################
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+__version__ = "2.3.0"
+from sys import version_info
+
+
+def detect(aBuf):
+    if ((version_info < (3, 0) and isinstance(aBuf, unicode)) or
+            (version_info >= (3, 0) and not isinstance(aBuf, bytes))):
+        raise ValueError('Expected a bytes object, not a unicode object')
+
+    from . import universaldetector
+    u = universaldetector.UniversalDetector()
+    u.reset()
+    u.feed(aBuf)
+    u.close()
+    return u.result
diff --git a/lib/requests/packages/chardet/big5freq.py b/lib/requests/packages/chardet/big5freq.py
new file mode 100644
index 00000000..65bffc04
--- /dev/null
+++ b/lib/requests/packages/chardet/big5freq.py
@@ -0,0 +1,925 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+# Big5 frequency table
+# by Taiwan's Mandarin Promotion Council
+# <http://www.edu.tw:81/mandr/>
+#
+# 128  --> 0.42261
+# 256  --> 0.57851
+# 512  --> 0.74851
+# 1024 --> 0.89384
+# 2048 --> 0.97583
+#
+# Ideal Distribution Ratio = 0.74851/(1-0.74851) =2.98
+# Random Distribution Ration = 512/(5401-512)=0.105
+#
+# Typical Distribution Ratio about 25% of Ideal one, still much higher than RDR
+
+BIG5_TYPICAL_DISTRIBUTION_RATIO = 0.75
+
+#Char to FreqOrder table
+BIG5_TABLE_SIZE = 5376
+
+Big5CharToFreqOrder = (
+   1,1801,1506, 255,1431, 198,   9,  82,   6,5008, 177, 202,3681,1256,2821, 110, #   16
+3814,  33,3274, 261,  76,  44,2114,  16,2946,2187,1176, 659,3971,  26,3451,2653, #   32
+1198,3972,3350,4202, 410,2215, 302, 590, 361,1964,   8, 204,  58,4510,5009,1932, #   48
+  63,5010,5011, 317,1614,  75, 222, 159,4203,2417,1480,5012,3555,3091, 224,2822, #   64
+3682,   3,  10,3973,1471,  29,2787,1135,2866,1940, 873, 130,3275,1123, 312,5013, #   80
+4511,2052, 507, 252, 682,5014, 142,1915, 124, 206,2947,  34,3556,3204,  64, 604, #   96
+5015,2501,1977,1978, 155,1991, 645, 641,1606,5016,3452, 337,  72, 406,5017,  80, #  112
+ 630, 238,3205,1509, 263, 939,1092,2654, 756,1440,1094,3453, 449,  69,2987, 591, #  128
+ 179,2096, 471, 115,2035,1844,  60,  50,2988, 134, 806,1869, 734,2036,3454, 180, #  144
+ 995,1607, 156, 537,2907, 688,5018, 319,1305, 779,2145, 514,2379, 298,4512, 359, #  160
+2502,  90,2716,1338, 663,  11, 906,1099,2553,  20,2441, 182, 532,1716,5019, 732, #  176
+1376,4204,1311,1420,3206,  25,2317,1056, 113, 399, 382,1950, 242,3455,2474, 529, #  192
+3276, 475,1447,3683,5020, 117,  21, 656, 810,1297,2300,2334,3557,5021, 126,4205, #  208
+ 706, 456, 150, 613,4513,  71,1118,2037,4206, 145,3092,  85, 835, 486,2115,1246, #  224
+1426, 428, 727,1285,1015, 800, 106, 623, 303,1281,5022,2128,2359, 347,3815, 221, #  240
+3558,3135,5023,1956,1153,4207,  83, 296,1199,3093, 192, 624,  93,5024, 822,1898, #  256
+2823,3136, 795,2065, 991,1554,1542,1592,  27,  43,2867, 859, 139,1456, 860,4514, #  272
+ 437, 712,3974, 164,2397,3137, 695, 211,3037,2097, 195,3975,1608,3559,3560,3684, #  288
+3976, 234, 811,2989,2098,3977,2233,1441,3561,1615,2380, 668,2077,1638, 305, 228, #  304
+1664,4515, 467, 415,5025, 262,2099,1593, 239, 108, 300, 200,1033, 512,1247,2078, #  320
+5026,5027,2176,3207,3685,2682, 593, 845,1062,3277,  88,1723,2038,3978,1951, 212, #  336
+ 266, 152, 149, 468,1899,4208,4516,  77, 187,5028,3038,  37,   5,2990,5029,3979, #  352
+5030,5031,  39,2524,4517,2908,3208,2079,  55, 148,  74,4518, 545, 483,1474,1029, #  368
+1665, 217,1870,1531,3138,1104,2655,4209,  24, 172,3562, 900,3980,3563,3564,4519, #  384
+  32,1408,2824,1312, 329, 487,2360,2251,2717, 784,2683,   4,3039,3351,1427,1789, #  400
+ 188, 109, 499,5032,3686,1717,1790, 888,1217,3040,4520,5033,3565,5034,3352,1520, #  416
+3687,3981, 196,1034, 775,5035,5036, 929,1816, 249, 439,  38,5037,1063,5038, 794, #  432
+3982,1435,2301,  46, 178,3278,2066,5039,2381,5040, 214,1709,4521, 804,  35, 707, #  448
+ 324,3688,1601,2554, 140, 459,4210,5041,5042,1365, 839, 272, 978,2262,2580,3456, #  464
+2129,1363,3689,1423, 697, 100,3094,  48,  70,1231, 495,3139,2196,5043,1294,5044, #  480
+2080, 462, 586,1042,3279, 853, 256, 988, 185,2382,3457,1698, 434,1084,5045,3458, #  496
+ 314,2625,2788,4522,2335,2336, 569,2285, 637,1817,2525, 757,1162,1879,1616,3459, #  512
+ 287,1577,2116, 768,4523,1671,2868,3566,2526,1321,3816, 909,2418,5046,4211, 933, #  528
+3817,4212,2053,2361,1222,4524, 765,2419,1322, 786,4525,5047,1920,1462,1677,2909, #  544
+1699,5048,4526,1424,2442,3140,3690,2600,3353,1775,1941,3460,3983,4213, 309,1369, #  560
+1130,2825, 364,2234,1653,1299,3984,3567,3985,3986,2656, 525,1085,3041, 902,2001, #  576
+1475, 964,4527, 421,1845,1415,1057,2286, 940,1364,3141, 376,4528,4529,1381,   7, #  592
+2527, 983,2383, 336,1710,2684,1846, 321,3461, 559,1131,3042,2752,1809,1132,1313, #  608
+ 265,1481,1858,5049, 352,1203,2826,3280, 167,1089, 420,2827, 776, 792,1724,3568, #  624
+4214,2443,3281,5050,4215,5051, 446, 229, 333,2753, 901,3818,1200,1557,4530,2657, #  640
+1921, 395,2754,2685,3819,4216,1836, 125, 916,3209,2626,4531,5052,5053,3820,5054, #  656
+5055,5056,4532,3142,3691,1133,2555,1757,3462,1510,2318,1409,3569,5057,2146, 438, #  672
+2601,2910,2384,3354,1068, 958,3043, 461, 311,2869,2686,4217,1916,3210,4218,1979, #  688
+ 383, 750,2755,2627,4219, 274, 539, 385,1278,1442,5058,1154,1965, 384, 561, 210, #  704
+  98,1295,2556,3570,5059,1711,2420,1482,3463,3987,2911,1257, 129,5060,3821, 642, #  720
+ 523,2789,2790,2658,5061, 141,2235,1333,  68, 176, 441, 876, 907,4220, 603,2602, #  736
+ 710, 171,3464, 404, 549,  18,3143,2398,1410,3692,1666,5062,3571,4533,2912,4534, #  752
+5063,2991, 368,5064, 146, 366,  99, 871,3693,1543, 748, 807,1586,1185,  22,2263, #  768
+ 379,3822,3211,5065,3212, 505,1942,2628,1992,1382,2319,5066, 380,2362, 218, 702, #  784
+1818,1248,3465,3044,3572,3355,3282,5067,2992,3694, 930,3283,3823,5068,  59,5069, #  800
+ 585, 601,4221, 497,3466,1112,1314,4535,1802,5070,1223,1472,2177,5071, 749,1837, #  816
+ 690,1900,3824,1773,3988,1476, 429,1043,1791,2236,2117, 917,4222, 447,1086,1629, #  832
+5072, 556,5073,5074,2021,1654, 844,1090, 105, 550, 966,1758,2828,1008,1783, 686, #  848
+1095,5075,2287, 793,1602,5076,3573,2603,4536,4223,2948,2302,4537,3825, 980,2503, #  864
+ 544, 353, 527,4538, 908,2687,2913,5077, 381,2629,1943,1348,5078,1341,1252, 560, #  880
+3095,5079,3467,2870,5080,2054, 973, 886,2081, 143,4539,5081,5082, 157,3989, 496, #  896
+4224,  57, 840, 540,2039,4540,4541,3468,2118,1445, 970,2264,1748,1966,2082,4225, #  912
+3144,1234,1776,3284,2829,3695, 773,1206,2130,1066,2040,1326,3990,1738,1725,4226, #  928
+ 279,3145,  51,1544,2604, 423,1578,2131,2067, 173,4542,1880,5083,5084,1583, 264, #  944
+ 610,3696,4543,2444, 280, 154,5085,5086,5087,1739, 338,1282,3096, 693,2871,1411, #  960
+1074,3826,2445,5088,4544,5089,5090,1240, 952,2399,5091,2914,1538,2688, 685,1483, #  976
+4227,2475,1436, 953,4228,2055,4545, 671,2400,  79,4229,2446,3285, 608, 567,2689, #  992
+3469,4230,4231,1691, 393,1261,1792,2401,5092,4546,5093,5094,5095,5096,1383,1672, # 1008
+3827,3213,1464, 522,1119, 661,1150, 216, 675,4547,3991,1432,3574, 609,4548,2690, # 1024
+2402,5097,5098,5099,4232,3045,   0,5100,2476, 315, 231,2447, 301,3356,4549,2385, # 1040
+5101, 233,4233,3697,1819,4550,4551,5102,  96,1777,1315,2083,5103, 257,5104,1810, # 1056
+3698,2718,1139,1820,4234,2022,1124,2164,2791,1778,2659,5105,3097, 363,1655,3214, # 1072
+5106,2993,5107,5108,5109,3992,1567,3993, 718, 103,3215, 849,1443, 341,3357,2949, # 1088
+1484,5110,1712, 127,  67, 339,4235,2403, 679,1412, 821,5111,5112, 834, 738, 351, # 1104
+2994,2147, 846, 235,1497,1881, 418,1993,3828,2719, 186,1100,2148,2756,3575,1545, # 1120
+1355,2950,2872,1377, 583,3994,4236,2581,2995,5113,1298,3699,1078,2557,3700,2363, # 1136
+  78,3829,3830, 267,1289,2100,2002,1594,4237, 348, 369,1274,2197,2178,1838,4552, # 1152
+1821,2830,3701,2757,2288,2003,4553,2951,2758, 144,3358, 882,4554,3995,2759,3470, # 1168
+4555,2915,5114,4238,1726, 320,5115,3996,3046, 788,2996,5116,2831,1774,1327,2873, # 1184
+3997,2832,5117,1306,4556,2004,1700,3831,3576,2364,2660, 787,2023, 506, 824,3702, # 1200
+ 534, 323,4557,1044,3359,2024,1901, 946,3471,5118,1779,1500,1678,5119,1882,4558, # 1216
+ 165, 243,4559,3703,2528, 123, 683,4239, 764,4560,  36,3998,1793, 589,2916, 816, # 1232
+ 626,1667,3047,2237,1639,1555,1622,3832,3999,5120,4000,2874,1370,1228,1933, 891, # 1248
+2084,2917, 304,4240,5121, 292,2997,2720,3577, 691,2101,4241,1115,4561, 118, 662, # 1264
+5122, 611,1156, 854,2386,1316,2875,   2, 386, 515,2918,5123,5124,3286, 868,2238, # 1280
+1486, 855,2661, 785,2216,3048,5125,1040,3216,3578,5126,3146, 448,5127,1525,5128, # 1296
+2165,4562,5129,3833,5130,4242,2833,3579,3147, 503, 818,4001,3148,1568, 814, 676, # 1312
+1444, 306,1749,5131,3834,1416,1030, 197,1428, 805,2834,1501,4563,5132,5133,5134, # 1328
+1994,5135,4564,5136,5137,2198,  13,2792,3704,2998,3149,1229,1917,5138,3835,2132, # 1344
+5139,4243,4565,2404,3580,5140,2217,1511,1727,1120,5141,5142, 646,3836,2448, 307, # 1360
+5143,5144,1595,3217,5145,5146,5147,3705,1113,1356,4002,1465,2529,2530,5148, 519, # 1376
+5149, 128,2133,  92,2289,1980,5150,4003,1512, 342,3150,2199,5151,2793,2218,1981, # 1392
+3360,4244, 290,1656,1317, 789, 827,2365,5152,3837,4566, 562, 581,4004,5153, 401, # 1408
+4567,2252,  94,4568,5154,1399,2794,5155,1463,2025,4569,3218,1944,5156, 828,1105, # 1424
+4245,1262,1394,5157,4246, 605,4570,5158,1784,2876,5159,2835, 819,2102, 578,2200, # 1440
+2952,5160,1502, 436,3287,4247,3288,2836,4005,2919,3472,3473,5161,2721,2320,5162, # 1456
+5163,2337,2068,  23,4571, 193, 826,3838,2103, 699,1630,4248,3098, 390,1794,1064, # 1472
+3581,5164,1579,3099,3100,1400,5165,4249,1839,1640,2877,5166,4572,4573, 137,4250, # 1488
+ 598,3101,1967, 780, 104, 974,2953,5167, 278, 899, 253, 402, 572, 504, 493,1339, # 1504
+5168,4006,1275,4574,2582,2558,5169,3706,3049,3102,2253, 565,1334,2722, 863,  41, # 1520
+5170,5171,4575,5172,1657,2338,  19, 463,2760,4251, 606,5173,2999,3289,1087,2085, # 1536
+1323,2662,3000,5174,1631,1623,1750,4252,2691,5175,2878, 791,2723,2663,2339, 232, # 1552
+2421,5176,3001,1498,5177,2664,2630, 755,1366,3707,3290,3151,2026,1609, 119,1918, # 1568
+3474, 862,1026,4253,5178,4007,3839,4576,4008,4577,2265,1952,2477,5179,1125, 817, # 1584
+4254,4255,4009,1513,1766,2041,1487,4256,3050,3291,2837,3840,3152,5180,5181,1507, # 1600
+5182,2692, 733,  40,1632,1106,2879, 345,4257, 841,2531, 230,4578,3002,1847,3292, # 1616
+3475,5183,1263, 986,3476,5184, 735, 879, 254,1137, 857, 622,1300,1180,1388,1562, # 1632
+4010,4011,2954, 967,2761,2665,1349, 592,2134,1692,3361,3003,1995,4258,1679,4012, # 1648
+1902,2188,5185, 739,3708,2724,1296,1290,5186,4259,2201,2202,1922,1563,2605,2559, # 1664
+1871,2762,3004,5187, 435,5188, 343,1108, 596,  17,1751,4579,2239,3477,3709,5189, # 1680
+4580, 294,3582,2955,1693, 477, 979, 281,2042,3583, 643,2043,3710,2631,2795,2266, # 1696
+1031,2340,2135,2303,3584,4581, 367,1249,2560,5190,3585,5191,4582,1283,3362,2005, # 1712
+ 240,1762,3363,4583,4584, 836,1069,3153, 474,5192,2149,2532, 268,3586,5193,3219, # 1728
+1521,1284,5194,1658,1546,4260,5195,3587,3588,5196,4261,3364,2693,1685,4262, 961, # 1744
+1673,2632, 190,2006,2203,3841,4585,4586,5197, 570,2504,3711,1490,5198,4587,2633, # 1760
+3293,1957,4588, 584,1514, 396,1045,1945,5199,4589,1968,2449,5200,5201,4590,4013, # 1776
+ 619,5202,3154,3294, 215,2007,2796,2561,3220,4591,3221,4592, 763,4263,3842,4593, # 1792
+5203,5204,1958,1767,2956,3365,3712,1174, 452,1477,4594,3366,3155,5205,2838,1253, # 1808
+2387,2189,1091,2290,4264, 492,5206, 638,1169,1825,2136,1752,4014, 648, 926,1021, # 1824
+1324,4595, 520,4596, 997, 847,1007, 892,4597,3843,2267,1872,3713,2405,1785,4598, # 1840
+1953,2957,3103,3222,1728,4265,2044,3714,4599,2008,1701,3156,1551,  30,2268,4266, # 1856
+5207,2027,4600,3589,5208, 501,5209,4267, 594,3478,2166,1822,3590,3479,3591,3223, # 1872
+ 829,2839,4268,5210,1680,3157,1225,4269,5211,3295,4601,4270,3158,2341,5212,4602, # 1888
+4271,5213,4015,4016,5214,1848,2388,2606,3367,5215,4603, 374,4017, 652,4272,4273, # 1904
+ 375,1140, 798,5216,5217,5218,2366,4604,2269, 546,1659, 138,3051,2450,4605,5219, # 1920
+2254, 612,1849, 910, 796,3844,1740,1371, 825,3845,3846,5220,2920,2562,5221, 692, # 1936
+ 444,3052,2634, 801,4606,4274,5222,1491, 244,1053,3053,4275,4276, 340,5223,4018, # 1952
+1041,3005, 293,1168,  87,1357,5224,1539, 959,5225,2240, 721, 694,4277,3847, 219, # 1968
+1478, 644,1417,3368,2666,1413,1401,1335,1389,4019,5226,5227,3006,2367,3159,1826, # 1984
+ 730,1515, 184,2840,  66,4607,5228,1660,2958, 246,3369, 378,1457, 226,3480, 975, # 2000
+4020,2959,1264,3592, 674, 696,5229, 163,5230,1141,2422,2167, 713,3593,3370,4608, # 2016
+4021,5231,5232,1186,  15,5233,1079,1070,5234,1522,3224,3594, 276,1050,2725, 758, # 2032
+1126, 653,2960,3296,5235,2342, 889,3595,4022,3104,3007, 903,1250,4609,4023,3481, # 2048
+3596,1342,1681,1718, 766,3297, 286,  89,2961,3715,5236,1713,5237,2607,3371,3008, # 2064
+5238,2962,2219,3225,2880,5239,4610,2505,2533, 181, 387,1075,4024, 731,2190,3372, # 2080
+5240,3298, 310, 313,3482,2304, 770,4278,  54,3054, 189,4611,3105,3848,4025,5241, # 2096
+1230,1617,1850, 355,3597,4279,4612,3373, 111,4280,3716,1350,3160,3483,3055,4281, # 2112
+2150,3299,3598,5242,2797,4026,4027,3009, 722,2009,5243,1071, 247,1207,2343,2478, # 2128
+1378,4613,2010, 864,1437,1214,4614, 373,3849,1142,2220, 667,4615, 442,2763,2563, # 2144
+3850,4028,1969,4282,3300,1840, 837, 170,1107, 934,1336,1883,5244,5245,2119,4283, # 2160
+2841, 743,1569,5246,4616,4284, 582,2389,1418,3484,5247,1803,5248, 357,1395,1729, # 2176
+3717,3301,2423,1564,2241,5249,3106,3851,1633,4617,1114,2086,4285,1532,5250, 482, # 2192
+2451,4618,5251,5252,1492, 833,1466,5253,2726,3599,1641,2842,5254,1526,1272,3718, # 2208
+4286,1686,1795, 416,2564,1903,1954,1804,5255,3852,2798,3853,1159,2321,5256,2881, # 2224
+4619,1610,1584,3056,2424,2764, 443,3302,1163,3161,5257,5258,4029,5259,4287,2506, # 2240
+3057,4620,4030,3162,2104,1647,3600,2011,1873,4288,5260,4289, 431,3485,5261, 250, # 2256
+  97,  81,4290,5262,1648,1851,1558, 160, 848,5263, 866, 740,1694,5264,2204,2843, # 2272
+3226,4291,4621,3719,1687, 950,2479, 426, 469,3227,3720,3721,4031,5265,5266,1188, # 2288
+ 424,1996, 861,3601,4292,3854,2205,2694, 168,1235,3602,4293,5267,2087,1674,4622, # 2304
+3374,3303, 220,2565,1009,5268,3855, 670,3010, 332,1208, 717,5269,5270,3603,2452, # 2320
+4032,3375,5271, 513,5272,1209,2882,3376,3163,4623,1080,5273,5274,5275,5276,2534, # 2336
+3722,3604, 815,1587,4033,4034,5277,3605,3486,3856,1254,4624,1328,3058,1390,4035, # 2352
+1741,4036,3857,4037,5278, 236,3858,2453,3304,5279,5280,3723,3859,1273,3860,4625, # 2368
+5281, 308,5282,4626, 245,4627,1852,2480,1307,2583, 430, 715,2137,2454,5283, 270, # 2384
+ 199,2883,4038,5284,3606,2727,1753, 761,1754, 725,1661,1841,4628,3487,3724,5285, # 2400
+5286, 587,  14,3305, 227,2608, 326, 480,2270, 943,2765,3607, 291, 650,1884,5287, # 2416
+1702,1226, 102,1547,  62,3488, 904,4629,3489,1164,4294,5288,5289,1224,1548,2766, # 2432
+ 391, 498,1493,5290,1386,1419,5291,2056,1177,4630, 813, 880,1081,2368, 566,1145, # 2448
+4631,2291,1001,1035,2566,2609,2242, 394,1286,5292,5293,2069,5294,  86,1494,1730, # 2464
+4039, 491,1588, 745, 897,2963, 843,3377,4040,2767,2884,3306,1768, 998,2221,2070, # 2480
+ 397,1827,1195,1970,3725,3011,3378, 284,5295,3861,2507,2138,2120,1904,5296,4041, # 2496
+2151,4042,4295,1036,3490,1905, 114,2567,4296, 209,1527,5297,5298,2964,2844,2635, # 2512
+2390,2728,3164, 812,2568,5299,3307,5300,1559, 737,1885,3726,1210, 885,  28,2695, # 2528
+3608,3862,5301,4297,1004,1780,4632,5302, 346,1982,2222,2696,4633,3863,1742, 797, # 2544
+1642,4043,1934,1072,1384,2152, 896,4044,3308,3727,3228,2885,3609,5303,2569,1959, # 2560
+4634,2455,1786,5304,5305,5306,4045,4298,1005,1308,3728,4299,2729,4635,4636,1528, # 2576
+2610, 161,1178,4300,1983, 987,4637,1101,4301, 631,4046,1157,3229,2425,1343,1241, # 2592
+1016,2243,2570, 372, 877,2344,2508,1160, 555,1935, 911,4047,5307, 466,1170, 169, # 2608
+1051,2921,2697,3729,2481,3012,1182,2012,2571,1251,2636,5308, 992,2345,3491,1540, # 2624
+2730,1201,2071,2406,1997,2482,5309,4638, 528,1923,2191,1503,1874,1570,2369,3379, # 2640
+3309,5310, 557,1073,5311,1828,3492,2088,2271,3165,3059,3107, 767,3108,2799,4639, # 2656
+1006,4302,4640,2346,1267,2179,3730,3230, 778,4048,3231,2731,1597,2667,5312,4641, # 2672
+5313,3493,5314,5315,5316,3310,2698,1433,3311, 131,  95,1504,4049, 723,4303,3166, # 2688
+1842,3610,2768,2192,4050,2028,2105,3731,5317,3013,4051,1218,5318,3380,3232,4052, # 2704
+4304,2584, 248,1634,3864, 912,5319,2845,3732,3060,3865, 654,  53,5320,3014,5321, # 2720
+1688,4642, 777,3494,1032,4053,1425,5322, 191, 820,2121,2846, 971,4643, 931,3233, # 2736
+ 135, 664, 783,3866,1998, 772,2922,1936,4054,3867,4644,2923,3234, 282,2732, 640, # 2752
+1372,3495,1127, 922, 325,3381,5323,5324, 711,2045,5325,5326,4055,2223,2800,1937, # 2768
+4056,3382,2224,2255,3868,2305,5327,4645,3869,1258,3312,4057,3235,2139,2965,4058, # 2784
+4059,5328,2225, 258,3236,4646, 101,1227,5329,3313,1755,5330,1391,3314,5331,2924, # 2800
+2057, 893,5332,5333,5334,1402,4305,2347,5335,5336,3237,3611,5337,5338, 878,1325, # 2816
+1781,2801,4647, 259,1385,2585, 744,1183,2272,4648,5339,4060,2509,5340, 684,1024, # 2832
+4306,5341, 472,3612,3496,1165,3315,4061,4062, 322,2153, 881, 455,1695,1152,1340, # 2848
+ 660, 554,2154,4649,1058,4650,4307, 830,1065,3383,4063,4651,1924,5342,1703,1919, # 2864
+5343, 932,2273, 122,5344,4652, 947, 677,5345,3870,2637, 297,1906,1925,2274,4653, # 2880
+2322,3316,5346,5347,4308,5348,4309,  84,4310, 112, 989,5349, 547,1059,4064, 701, # 2896
+3613,1019,5350,4311,5351,3497, 942, 639, 457,2306,2456, 993,2966, 407, 851, 494, # 2912
+4654,3384, 927,5352,1237,5353,2426,3385, 573,4312, 680, 921,2925,1279,1875, 285, # 2928
+ 790,1448,1984, 719,2168,5354,5355,4655,4065,4066,1649,5356,1541, 563,5357,1077, # 2944
+5358,3386,3061,3498, 511,3015,4067,4068,3733,4069,1268,2572,3387,3238,4656,4657, # 2960
+5359, 535,1048,1276,1189,2926,2029,3167,1438,1373,2847,2967,1134,2013,5360,4313, # 2976
+1238,2586,3109,1259,5361, 700,5362,2968,3168,3734,4314,5363,4315,1146,1876,1907, # 2992
+4658,2611,4070, 781,2427, 132,1589, 203, 147, 273,2802,2407, 898,1787,2155,4071, # 3008
+4072,5364,3871,2803,5365,5366,4659,4660,5367,3239,5368,1635,3872, 965,5369,1805, # 3024
+2699,1516,3614,1121,1082,1329,3317,4073,1449,3873,  65,1128,2848,2927,2769,1590, # 3040
+3874,5370,5371,  12,2668,  45, 976,2587,3169,4661, 517,2535,1013,1037,3240,5372, # 3056
+3875,2849,5373,3876,5374,3499,5375,2612, 614,1999,2323,3877,3110,2733,2638,5376, # 3072
+2588,4316, 599,1269,5377,1811,3735,5378,2700,3111, 759,1060, 489,1806,3388,3318, # 3088
+1358,5379,5380,2391,1387,1215,2639,2256, 490,5381,5382,4317,1759,2392,2348,5383, # 3104
+4662,3878,1908,4074,2640,1807,3241,4663,3500,3319,2770,2349, 874,5384,5385,3501, # 3120
+3736,1859,  91,2928,3737,3062,3879,4664,5386,3170,4075,2669,5387,3502,1202,1403, # 3136
+3880,2969,2536,1517,2510,4665,3503,2511,5388,4666,5389,2701,1886,1495,1731,4076, # 3152
+2370,4667,5390,2030,5391,5392,4077,2702,1216, 237,2589,4318,2324,4078,3881,4668, # 3168
+4669,2703,3615,3504, 445,4670,5393,5394,5395,5396,2771,  61,4079,3738,1823,4080, # 3184
+5397, 687,2046, 935, 925, 405,2670, 703,1096,1860,2734,4671,4081,1877,1367,2704, # 3200
+3389, 918,2106,1782,2483, 334,3320,1611,1093,4672, 564,3171,3505,3739,3390, 945, # 3216
+2641,2058,4673,5398,1926, 872,4319,5399,3506,2705,3112, 349,4320,3740,4082,4674, # 3232
+3882,4321,3741,2156,4083,4675,4676,4322,4677,2408,2047, 782,4084, 400, 251,4323, # 3248
+1624,5400,5401, 277,3742, 299,1265, 476,1191,3883,2122,4324,4325,1109, 205,5402, # 3264
+2590,1000,2157,3616,1861,5403,5404,5405,4678,5406,4679,2573, 107,2484,2158,4085, # 3280
+3507,3172,5407,1533, 541,1301, 158, 753,4326,2886,3617,5408,1696, 370,1088,4327, # 3296
+4680,3618, 579, 327, 440, 162,2244, 269,1938,1374,3508, 968,3063,  56,1396,3113, # 3312
+2107,3321,3391,5409,1927,2159,4681,3016,5410,3619,5411,5412,3743,4682,2485,5413, # 3328
+2804,5414,1650,4683,5415,2613,5416,5417,4086,2671,3392,1149,3393,4087,3884,4088, # 3344
+5418,1076,  49,5419, 951,3242,3322,3323, 450,2850, 920,5420,1812,2805,2371,4328, # 3360
+1909,1138,2372,3885,3509,5421,3243,4684,1910,1147,1518,2428,4685,3886,5422,4686, # 3376
+2393,2614, 260,1796,3244,5423,5424,3887,3324, 708,5425,3620,1704,5426,3621,1351, # 3392
+1618,3394,3017,1887, 944,4329,3395,4330,3064,3396,4331,5427,3744, 422, 413,1714, # 3408
+3325, 500,2059,2350,4332,2486,5428,1344,1911, 954,5429,1668,5430,5431,4089,2409, # 3424
+4333,3622,3888,4334,5432,2307,1318,2512,3114, 133,3115,2887,4687, 629,  31,2851, # 3440
+2706,3889,4688, 850, 949,4689,4090,2970,1732,2089,4335,1496,1853,5433,4091, 620, # 3456
+3245, 981,1242,3745,3397,1619,3746,1643,3326,2140,2457,1971,1719,3510,2169,5434, # 3472
+3246,5435,5436,3398,1829,5437,1277,4690,1565,2048,5438,1636,3623,3116,5439, 869, # 3488
+2852, 655,3890,3891,3117,4092,3018,3892,1310,3624,4691,5440,5441,5442,1733, 558, # 3504
+4692,3747, 335,1549,3065,1756,4336,3748,1946,3511,1830,1291,1192, 470,2735,2108, # 3520
+2806, 913,1054,4093,5443,1027,5444,3066,4094,4693, 982,2672,3399,3173,3512,3247, # 3536
+3248,1947,2807,5445, 571,4694,5446,1831,5447,3625,2591,1523,2429,5448,2090, 984, # 3552
+4695,3749,1960,5449,3750, 852, 923,2808,3513,3751, 969,1519, 999,2049,2325,1705, # 3568
+5450,3118, 615,1662, 151, 597,4095,2410,2326,1049, 275,4696,3752,4337, 568,3753, # 3584
+3626,2487,4338,3754,5451,2430,2275, 409,3249,5452,1566,2888,3514,1002, 769,2853, # 3600
+ 194,2091,3174,3755,2226,3327,4339, 628,1505,5453,5454,1763,2180,3019,4096, 521, # 3616
+1161,2592,1788,2206,2411,4697,4097,1625,4340,4341, 412,  42,3119, 464,5455,2642, # 3632
+4698,3400,1760,1571,2889,3515,2537,1219,2207,3893,2643,2141,2373,4699,4700,3328, # 3648
+1651,3401,3627,5456,5457,3628,2488,3516,5458,3756,5459,5460,2276,2092, 460,5461, # 3664
+4701,5462,3020, 962, 588,3629, 289,3250,2644,1116,  52,5463,3067,1797,5464,5465, # 3680
+5466,1467,5467,1598,1143,3757,4342,1985,1734,1067,4702,1280,3402, 465,4703,1572, # 3696
+ 510,5468,1928,2245,1813,1644,3630,5469,4704,3758,5470,5471,2673,1573,1534,5472, # 3712
+5473, 536,1808,1761,3517,3894,3175,2645,5474,5475,5476,4705,3518,2929,1912,2809, # 3728
+5477,3329,1122, 377,3251,5478, 360,5479,5480,4343,1529, 551,5481,2060,3759,1769, # 3744
+2431,5482,2930,4344,3330,3120,2327,2109,2031,4706,1404, 136,1468,1479, 672,1171, # 3760
+3252,2308, 271,3176,5483,2772,5484,2050, 678,2736, 865,1948,4707,5485,2014,4098, # 3776
+2971,5486,2737,2227,1397,3068,3760,4708,4709,1735,2931,3403,3631,5487,3895, 509, # 3792
+2854,2458,2890,3896,5488,5489,3177,3178,4710,4345,2538,4711,2309,1166,1010, 552, # 3808
+ 681,1888,5490,5491,2972,2973,4099,1287,1596,1862,3179, 358, 453, 736, 175, 478, # 3824
+1117, 905,1167,1097,5492,1854,1530,5493,1706,5494,2181,3519,2292,3761,3520,3632, # 3840
+4346,2093,4347,5495,3404,1193,2489,4348,1458,2193,2208,1863,1889,1421,3331,2932, # 3856
+3069,2182,3521, 595,2123,5496,4100,5497,5498,4349,1707,2646, 223,3762,1359, 751, # 3872
+3121, 183,3522,5499,2810,3021, 419,2374, 633, 704,3897,2394, 241,5500,5501,5502, # 3888
+ 838,3022,3763,2277,2773,2459,3898,1939,2051,4101,1309,3122,2246,1181,5503,1136, # 3904
+2209,3899,2375,1446,4350,2310,4712,5504,5505,4351,1055,2615, 484,3764,5506,4102, # 3920
+ 625,4352,2278,3405,1499,4353,4103,5507,4104,4354,3253,2279,2280,3523,5508,5509, # 3936
+2774, 808,2616,3765,3406,4105,4355,3123,2539, 526,3407,3900,4356, 955,5510,1620, # 3952
+4357,2647,2432,5511,1429,3766,1669,1832, 994, 928,5512,3633,1260,5513,5514,5515, # 3968
+1949,2293, 741,2933,1626,4358,2738,2460, 867,1184, 362,3408,1392,5516,5517,4106, # 3984
+4359,1770,1736,3254,2934,4713,4714,1929,2707,1459,1158,5518,3070,3409,2891,1292, # 4000
+1930,2513,2855,3767,1986,1187,2072,2015,2617,4360,5519,2574,2514,2170,3768,2490, # 4016
+3332,5520,3769,4715,5521,5522, 666,1003,3023,1022,3634,4361,5523,4716,1814,2257, # 4032
+ 574,3901,1603, 295,1535, 705,3902,4362, 283, 858, 417,5524,5525,3255,4717,4718, # 4048
+3071,1220,1890,1046,2281,2461,4107,1393,1599, 689,2575, 388,4363,5526,2491, 802, # 4064
+5527,2811,3903,2061,1405,2258,5528,4719,3904,2110,1052,1345,3256,1585,5529, 809, # 4080
+5530,5531,5532, 575,2739,3524, 956,1552,1469,1144,2328,5533,2329,1560,2462,3635, # 4096
+3257,4108, 616,2210,4364,3180,2183,2294,5534,1833,5535,3525,4720,5536,1319,3770, # 4112
+3771,1211,3636,1023,3258,1293,2812,5537,5538,5539,3905, 607,2311,3906, 762,2892, # 4128
+1439,4365,1360,4721,1485,3072,5540,4722,1038,4366,1450,2062,2648,4367,1379,4723, # 4144
+2593,5541,5542,4368,1352,1414,2330,2935,1172,5543,5544,3907,3908,4724,1798,1451, # 4160
+5545,5546,5547,5548,2936,4109,4110,2492,2351, 411,4111,4112,3637,3333,3124,4725, # 4176
+1561,2674,1452,4113,1375,5549,5550,  47,2974, 316,5551,1406,1591,2937,3181,5552, # 4192
+1025,2142,3125,3182, 354,2740, 884,2228,4369,2412, 508,3772, 726,3638, 996,2433, # 4208
+3639, 729,5553, 392,2194,1453,4114,4726,3773,5554,5555,2463,3640,2618,1675,2813, # 4224
+ 919,2352,2975,2353,1270,4727,4115,  73,5556,5557, 647,5558,3259,2856,2259,1550, # 4240
+1346,3024,5559,1332, 883,3526,5560,5561,5562,5563,3334,2775,5564,1212, 831,1347, # 4256
+4370,4728,2331,3909,1864,3073, 720,3910,4729,4730,3911,5565,4371,5566,5567,4731, # 4272
+5568,5569,1799,4732,3774,2619,4733,3641,1645,2376,4734,5570,2938, 669,2211,2675, # 4288
+2434,5571,2893,5572,5573,1028,3260,5574,4372,2413,5575,2260,1353,5576,5577,4735, # 4304
+3183, 518,5578,4116,5579,4373,1961,5580,2143,4374,5581,5582,3025,2354,2355,3912, # 4320
+ 516,1834,1454,4117,2708,4375,4736,2229,2620,1972,1129,3642,5583,2776,5584,2976, # 4336
+1422, 577,1470,3026,1524,3410,5585,5586, 432,4376,3074,3527,5587,2594,1455,2515, # 4352
+2230,1973,1175,5588,1020,2741,4118,3528,4737,5589,2742,5590,1743,1361,3075,3529, # 4368
+2649,4119,4377,4738,2295, 895, 924,4378,2171, 331,2247,3076, 166,1627,3077,1098, # 4384
+5591,1232,2894,2231,3411,4739, 657, 403,1196,2377, 542,3775,3412,1600,4379,3530, # 4400
+5592,4740,2777,3261, 576, 530,1362,4741,4742,2540,2676,3776,4120,5593, 842,3913, # 4416
+5594,2814,2032,1014,4121, 213,2709,3413, 665, 621,4380,5595,3777,2939,2435,5596, # 4432
+2436,3335,3643,3414,4743,4381,2541,4382,4744,3644,1682,4383,3531,1380,5597, 724, # 4448
+2282, 600,1670,5598,1337,1233,4745,3126,2248,5599,1621,4746,5600, 651,4384,5601, # 4464
+1612,4385,2621,5602,2857,5603,2743,2312,3078,5604, 716,2464,3079, 174,1255,2710, # 4480
+4122,3645, 548,1320,1398, 728,4123,1574,5605,1891,1197,3080,4124,5606,3081,3082, # 4496
+3778,3646,3779, 747,5607, 635,4386,4747,5608,5609,5610,4387,5611,5612,4748,5613, # 4512
+3415,4749,2437, 451,5614,3780,2542,2073,4388,2744,4389,4125,5615,1764,4750,5616, # 4528
+4390, 350,4751,2283,2395,2493,5617,4391,4126,2249,1434,4127, 488,4752, 458,4392, # 4544
+4128,3781, 771,1330,2396,3914,2576,3184,2160,2414,1553,2677,3185,4393,5618,2494, # 4560
+2895,2622,1720,2711,4394,3416,4753,5619,2543,4395,5620,3262,4396,2778,5621,2016, # 4576
+2745,5622,1155,1017,3782,3915,5623,3336,2313, 201,1865,4397,1430,5624,4129,5625, # 4592
+5626,5627,5628,5629,4398,1604,5630, 414,1866, 371,2595,4754,4755,3532,2017,3127, # 4608
+4756,1708, 960,4399, 887, 389,2172,1536,1663,1721,5631,2232,4130,2356,2940,1580, # 4624
+5632,5633,1744,4757,2544,4758,4759,5634,4760,5635,2074,5636,4761,3647,3417,2896, # 4640
+4400,5637,4401,2650,3418,2815, 673,2712,2465, 709,3533,4131,3648,4402,5638,1148, # 4656
+ 502, 634,5639,5640,1204,4762,3649,1575,4763,2623,3783,5641,3784,3128, 948,3263, # 4672
+ 121,1745,3916,1110,5642,4403,3083,2516,3027,4132,3785,1151,1771,3917,1488,4133, # 4688
+1987,5643,2438,3534,5644,5645,2094,5646,4404,3918,1213,1407,2816, 531,2746,2545, # 4704
+3264,1011,1537,4764,2779,4405,3129,1061,5647,3786,3787,1867,2897,5648,2018, 120, # 4720
+4406,4407,2063,3650,3265,2314,3919,2678,3419,1955,4765,4134,5649,3535,1047,2713, # 4736
+1266,5650,1368,4766,2858, 649,3420,3920,2546,2747,1102,2859,2679,5651,5652,2000, # 4752
+5653,1111,3651,2977,5654,2495,3921,3652,2817,1855,3421,3788,5655,5656,3422,2415, # 4768
+2898,3337,3266,3653,5657,2577,5658,3654,2818,4135,1460, 856,5659,3655,5660,2899, # 4784
+2978,5661,2900,3922,5662,4408, 632,2517, 875,3923,1697,3924,2296,5663,5664,4767, # 4800
+3028,1239, 580,4768,4409,5665, 914, 936,2075,1190,4136,1039,2124,5666,5667,5668, # 4816
+5669,3423,1473,5670,1354,4410,3925,4769,2173,3084,4137, 915,3338,4411,4412,3339, # 4832
+1605,1835,5671,2748, 398,3656,4413,3926,4138, 328,1913,2860,4139,3927,1331,4414, # 4848
+3029, 937,4415,5672,3657,4140,4141,3424,2161,4770,3425, 524, 742, 538,3085,1012, # 4864
+5673,5674,3928,2466,5675, 658,1103, 225,3929,5676,5677,4771,5678,4772,5679,3267, # 4880
+1243,5680,4142, 963,2250,4773,5681,2714,3658,3186,5682,5683,2596,2332,5684,4774, # 4896
+5685,5686,5687,3536, 957,3426,2547,2033,1931,2941,2467, 870,2019,3659,1746,2780, # 4912
+2781,2439,2468,5688,3930,5689,3789,3130,3790,3537,3427,3791,5690,1179,3086,5691, # 4928
+3187,2378,4416,3792,2548,3188,3131,2749,4143,5692,3428,1556,2549,2297, 977,2901, # 4944
+2034,4144,1205,3429,5693,1765,3430,3189,2125,1271, 714,1689,4775,3538,5694,2333, # 4960
+3931, 533,4417,3660,2184, 617,5695,2469,3340,3539,2315,5696,5697,3190,5698,5699, # 4976
+3932,1988, 618, 427,2651,3540,3431,5700,5701,1244,1690,5702,2819,4418,4776,5703, # 4992
+3541,4777,5704,2284,1576, 473,3661,4419,3432, 972,5705,3662,5706,3087,5707,5708, # 5008
+4778,4779,5709,3793,4145,4146,5710, 153,4780, 356,5711,1892,2902,4420,2144, 408, # 5024
+ 803,2357,5712,3933,5713,4421,1646,2578,2518,4781,4782,3934,5714,3935,4422,5715, # 5040
+2416,3433, 752,5716,5717,1962,3341,2979,5718, 746,3030,2470,4783,4423,3794, 698, # 5056
+4784,1893,4424,3663,2550,4785,3664,3936,5719,3191,3434,5720,1824,1302,4147,2715, # 5072
+3937,1974,4425,5721,4426,3192, 823,1303,1288,1236,2861,3542,4148,3435, 774,3938, # 5088
+5722,1581,4786,1304,2862,3939,4787,5723,2440,2162,1083,3268,4427,4149,4428, 344, # 5104
+1173, 288,2316, 454,1683,5724,5725,1461,4788,4150,2597,5726,5727,4789, 985, 894, # 5120
+5728,3436,3193,5729,1914,2942,3795,1989,5730,2111,1975,5731,4151,5732,2579,1194, # 5136
+ 425,5733,4790,3194,1245,3796,4429,5734,5735,2863,5736, 636,4791,1856,3940, 760, # 5152
+1800,5737,4430,2212,1508,4792,4152,1894,1684,2298,5738,5739,4793,4431,4432,2213, # 5168
+ 479,5740,5741, 832,5742,4153,2496,5743,2980,2497,3797, 990,3132, 627,1815,2652, # 5184
+4433,1582,4434,2126,2112,3543,4794,5744, 799,4435,3195,5745,4795,2113,1737,3031, # 5200
+1018, 543, 754,4436,3342,1676,4796,4797,4154,4798,1489,5746,3544,5747,2624,2903, # 5216
+4155,5748,5749,2981,5750,5751,5752,5753,3196,4799,4800,2185,1722,5754,3269,3270, # 5232
+1843,3665,1715, 481, 365,1976,1857,5755,5756,1963,2498,4801,5757,2127,3666,3271, # 5248
+ 433,1895,2064,2076,5758, 602,2750,5759,5760,5761,5762,5763,3032,1628,3437,5764, # 5264
+3197,4802,4156,2904,4803,2519,5765,2551,2782,5766,5767,5768,3343,4804,2905,5769, # 5280
+4805,5770,2864,4806,4807,1221,2982,4157,2520,5771,5772,5773,1868,1990,5774,5775, # 5296
+5776,1896,5777,5778,4808,1897,4158, 318,5779,2095,4159,4437,5780,5781, 485,5782, # 5312
+ 938,3941, 553,2680, 116,5783,3942,3667,5784,3545,2681,2783,3438,3344,2820,5785, # 5328
+3668,2943,4160,1747,2944,2983,5786,5787, 207,5788,4809,5789,4810,2521,5790,3033, # 5344
+ 890,3669,3943,5791,1878,3798,3439,5792,2186,2358,3440,1652,5793,5794,5795, 941, # 5360
+2299, 208,3546,4161,2020, 330,4438,3944,2906,2499,3799,4439,4811,5796,5797,5798, # 5376  #last 512
+#Everything below is of no interest for detection purpose
+2522,1613,4812,5799,3345,3945,2523,5800,4162,5801,1637,4163,2471,4813,3946,5802, # 5392
+2500,3034,3800,5803,5804,2195,4814,5805,2163,5806,5807,5808,5809,5810,5811,5812, # 5408
+5813,5814,5815,5816,5817,5818,5819,5820,5821,5822,5823,5824,5825,5826,5827,5828, # 5424
+5829,5830,5831,5832,5833,5834,5835,5836,5837,5838,5839,5840,5841,5842,5843,5844, # 5440
+5845,5846,5847,5848,5849,5850,5851,5852,5853,5854,5855,5856,5857,5858,5859,5860, # 5456
+5861,5862,5863,5864,5865,5866,5867,5868,5869,5870,5871,5872,5873,5874,5875,5876, # 5472
+5877,5878,5879,5880,5881,5882,5883,5884,5885,5886,5887,5888,5889,5890,5891,5892, # 5488
+5893,5894,5895,5896,5897,5898,5899,5900,5901,5902,5903,5904,5905,5906,5907,5908, # 5504
+5909,5910,5911,5912,5913,5914,5915,5916,5917,5918,5919,5920,5921,5922,5923,5924, # 5520
+5925,5926,5927,5928,5929,5930,5931,5932,5933,5934,5935,5936,5937,5938,5939,5940, # 5536
+5941,5942,5943,5944,5945,5946,5947,5948,5949,5950,5951,5952,5953,5954,5955,5956, # 5552
+5957,5958,5959,5960,5961,5962,5963,5964,5965,5966,5967,5968,5969,5970,5971,5972, # 5568
+5973,5974,5975,5976,5977,5978,5979,5980,5981,5982,5983,5984,5985,5986,5987,5988, # 5584
+5989,5990,5991,5992,5993,5994,5995,5996,5997,5998,5999,6000,6001,6002,6003,6004, # 5600
+6005,6006,6007,6008,6009,6010,6011,6012,6013,6014,6015,6016,6017,6018,6019,6020, # 5616
+6021,6022,6023,6024,6025,6026,6027,6028,6029,6030,6031,6032,6033,6034,6035,6036, # 5632
+6037,6038,6039,6040,6041,6042,6043,6044,6045,6046,6047,6048,6049,6050,6051,6052, # 5648
+6053,6054,6055,6056,6057,6058,6059,6060,6061,6062,6063,6064,6065,6066,6067,6068, # 5664
+6069,6070,6071,6072,6073,6074,6075,6076,6077,6078,6079,6080,6081,6082,6083,6084, # 5680
+6085,6086,6087,6088,6089,6090,6091,6092,6093,6094,6095,6096,6097,6098,6099,6100, # 5696
+6101,6102,6103,6104,6105,6106,6107,6108,6109,6110,6111,6112,6113,6114,6115,6116, # 5712
+6117,6118,6119,6120,6121,6122,6123,6124,6125,6126,6127,6128,6129,6130,6131,6132, # 5728
+6133,6134,6135,6136,6137,6138,6139,6140,6141,6142,6143,6144,6145,6146,6147,6148, # 5744
+6149,6150,6151,6152,6153,6154,6155,6156,6157,6158,6159,6160,6161,6162,6163,6164, # 5760
+6165,6166,6167,6168,6169,6170,6171,6172,6173,6174,6175,6176,6177,6178,6179,6180, # 5776
+6181,6182,6183,6184,6185,6186,6187,6188,6189,6190,6191,6192,6193,6194,6195,6196, # 5792
+6197,6198,6199,6200,6201,6202,6203,6204,6205,6206,6207,6208,6209,6210,6211,6212, # 5808
+6213,6214,6215,6216,6217,6218,6219,6220,6221,6222,6223,3670,6224,6225,6226,6227, # 5824
+6228,6229,6230,6231,6232,6233,6234,6235,6236,6237,6238,6239,6240,6241,6242,6243, # 5840
+6244,6245,6246,6247,6248,6249,6250,6251,6252,6253,6254,6255,6256,6257,6258,6259, # 5856
+6260,6261,6262,6263,6264,6265,6266,6267,6268,6269,6270,6271,6272,6273,6274,6275, # 5872
+6276,6277,6278,6279,6280,6281,6282,6283,6284,6285,4815,6286,6287,6288,6289,6290, # 5888
+6291,6292,4816,6293,6294,6295,6296,6297,6298,6299,6300,6301,6302,6303,6304,6305, # 5904
+6306,6307,6308,6309,6310,6311,4817,4818,6312,6313,6314,6315,6316,6317,6318,4819, # 5920
+6319,6320,6321,6322,6323,6324,6325,6326,6327,6328,6329,6330,6331,6332,6333,6334, # 5936
+6335,6336,6337,4820,6338,6339,6340,6341,6342,6343,6344,6345,6346,6347,6348,6349, # 5952
+6350,6351,6352,6353,6354,6355,6356,6357,6358,6359,6360,6361,6362,6363,6364,6365, # 5968
+6366,6367,6368,6369,6370,6371,6372,6373,6374,6375,6376,6377,6378,6379,6380,6381, # 5984
+6382,6383,6384,6385,6386,6387,6388,6389,6390,6391,6392,6393,6394,6395,6396,6397, # 6000
+6398,6399,6400,6401,6402,6403,6404,6405,6406,6407,6408,6409,6410,3441,6411,6412, # 6016
+6413,6414,6415,6416,6417,6418,6419,6420,6421,6422,6423,6424,6425,4440,6426,6427, # 6032
+6428,6429,6430,6431,6432,6433,6434,6435,6436,6437,6438,6439,6440,6441,6442,6443, # 6048
+6444,6445,6446,6447,6448,6449,6450,6451,6452,6453,6454,4821,6455,6456,6457,6458, # 6064
+6459,6460,6461,6462,6463,6464,6465,6466,6467,6468,6469,6470,6471,6472,6473,6474, # 6080
+6475,6476,6477,3947,3948,6478,6479,6480,6481,3272,4441,6482,6483,6484,6485,4442, # 6096
+6486,6487,6488,6489,6490,6491,6492,6493,6494,6495,6496,4822,6497,6498,6499,6500, # 6112
+6501,6502,6503,6504,6505,6506,6507,6508,6509,6510,6511,6512,6513,6514,6515,6516, # 6128
+6517,6518,6519,6520,6521,6522,6523,6524,6525,6526,6527,6528,6529,6530,6531,6532, # 6144
+6533,6534,6535,6536,6537,6538,6539,6540,6541,6542,6543,6544,6545,6546,6547,6548, # 6160
+6549,6550,6551,6552,6553,6554,6555,6556,2784,6557,4823,6558,6559,6560,6561,6562, # 6176
+6563,6564,6565,6566,6567,6568,6569,3949,6570,6571,6572,4824,6573,6574,6575,6576, # 6192
+6577,6578,6579,6580,6581,6582,6583,4825,6584,6585,6586,3950,2785,6587,6588,6589, # 6208
+6590,6591,6592,6593,6594,6595,6596,6597,6598,6599,6600,6601,6602,6603,6604,6605, # 6224
+6606,6607,6608,6609,6610,6611,6612,4826,6613,6614,6615,4827,6616,6617,6618,6619, # 6240
+6620,6621,6622,6623,6624,6625,4164,6626,6627,6628,6629,6630,6631,6632,6633,6634, # 6256
+3547,6635,4828,6636,6637,6638,6639,6640,6641,6642,3951,2984,6643,6644,6645,6646, # 6272
+6647,6648,6649,4165,6650,4829,6651,6652,4830,6653,6654,6655,6656,6657,6658,6659, # 6288
+6660,6661,6662,4831,6663,6664,6665,6666,6667,6668,6669,6670,6671,4166,6672,4832, # 6304
+3952,6673,6674,6675,6676,4833,6677,6678,6679,4167,6680,6681,6682,3198,6683,6684, # 6320
+6685,6686,6687,6688,6689,6690,6691,6692,6693,6694,6695,6696,6697,4834,6698,6699, # 6336
+6700,6701,6702,6703,6704,6705,6706,6707,6708,6709,6710,6711,6712,6713,6714,6715, # 6352
+6716,6717,6718,6719,6720,6721,6722,6723,6724,6725,6726,6727,6728,6729,6730,6731, # 6368
+6732,6733,6734,4443,6735,6736,6737,6738,6739,6740,6741,6742,6743,6744,6745,4444, # 6384
+6746,6747,6748,6749,6750,6751,6752,6753,6754,6755,6756,6757,6758,6759,6760,6761, # 6400
+6762,6763,6764,6765,6766,6767,6768,6769,6770,6771,6772,6773,6774,6775,6776,6777, # 6416
+6778,6779,6780,6781,4168,6782,6783,3442,6784,6785,6786,6787,6788,6789,6790,6791, # 6432
+4169,6792,6793,6794,6795,6796,6797,6798,6799,6800,6801,6802,6803,6804,6805,6806, # 6448
+6807,6808,6809,6810,6811,4835,6812,6813,6814,4445,6815,6816,4446,6817,6818,6819, # 6464
+6820,6821,6822,6823,6824,6825,6826,6827,6828,6829,6830,6831,6832,6833,6834,6835, # 6480
+3548,6836,6837,6838,6839,6840,6841,6842,6843,6844,6845,6846,4836,6847,6848,6849, # 6496
+6850,6851,6852,6853,6854,3953,6855,6856,6857,6858,6859,6860,6861,6862,6863,6864, # 6512
+6865,6866,6867,6868,6869,6870,6871,6872,6873,6874,6875,6876,6877,3199,6878,6879, # 6528
+6880,6881,6882,4447,6883,6884,6885,6886,6887,6888,6889,6890,6891,6892,6893,6894, # 6544
+6895,6896,6897,6898,6899,6900,6901,6902,6903,6904,4170,6905,6906,6907,6908,6909, # 6560
+6910,6911,6912,6913,6914,6915,6916,6917,6918,6919,6920,6921,6922,6923,6924,6925, # 6576
+6926,6927,4837,6928,6929,6930,6931,6932,6933,6934,6935,6936,3346,6937,6938,4838, # 6592
+6939,6940,6941,4448,6942,6943,6944,6945,6946,4449,6947,6948,6949,6950,6951,6952, # 6608
+6953,6954,6955,6956,6957,6958,6959,6960,6961,6962,6963,6964,6965,6966,6967,6968, # 6624
+6969,6970,6971,6972,6973,6974,6975,6976,6977,6978,6979,6980,6981,6982,6983,6984, # 6640
+6985,6986,6987,6988,6989,6990,6991,6992,6993,6994,3671,6995,6996,6997,6998,4839, # 6656
+6999,7000,7001,7002,3549,7003,7004,7005,7006,7007,7008,7009,7010,7011,7012,7013, # 6672
+7014,7015,7016,7017,7018,7019,7020,7021,7022,7023,7024,7025,7026,7027,7028,7029, # 6688
+7030,4840,7031,7032,7033,7034,7035,7036,7037,7038,4841,7039,7040,7041,7042,7043, # 6704
+7044,7045,7046,7047,7048,7049,7050,7051,7052,7053,7054,7055,7056,7057,7058,7059, # 6720
+7060,7061,7062,7063,7064,7065,7066,7067,7068,7069,7070,2985,7071,7072,7073,7074, # 6736
+7075,7076,7077,7078,7079,7080,4842,7081,7082,7083,7084,7085,7086,7087,7088,7089, # 6752
+7090,7091,7092,7093,7094,7095,7096,7097,7098,7099,7100,7101,7102,7103,7104,7105, # 6768
+7106,7107,7108,7109,7110,7111,7112,7113,7114,7115,7116,7117,7118,4450,7119,7120, # 6784
+7121,7122,7123,7124,7125,7126,7127,7128,7129,7130,7131,7132,7133,7134,7135,7136, # 6800
+7137,7138,7139,7140,7141,7142,7143,4843,7144,7145,7146,7147,7148,7149,7150,7151, # 6816
+7152,7153,7154,7155,7156,7157,7158,7159,7160,7161,7162,7163,7164,7165,7166,7167, # 6832
+7168,7169,7170,7171,7172,7173,7174,7175,7176,7177,7178,7179,7180,7181,7182,7183, # 6848
+7184,7185,7186,7187,7188,4171,4172,7189,7190,7191,7192,7193,7194,7195,7196,7197, # 6864
+7198,7199,7200,7201,7202,7203,7204,7205,7206,7207,7208,7209,7210,7211,7212,7213, # 6880
+7214,7215,7216,7217,7218,7219,7220,7221,7222,7223,7224,7225,7226,7227,7228,7229, # 6896
+7230,7231,7232,7233,7234,7235,7236,7237,7238,7239,7240,7241,7242,7243,7244,7245, # 6912
+7246,7247,7248,7249,7250,7251,7252,7253,7254,7255,7256,7257,7258,7259,7260,7261, # 6928
+7262,7263,7264,7265,7266,7267,7268,7269,7270,7271,7272,7273,7274,7275,7276,7277, # 6944
+7278,7279,7280,7281,7282,7283,7284,7285,7286,7287,7288,7289,7290,7291,7292,7293, # 6960
+7294,7295,7296,4844,7297,7298,7299,7300,7301,7302,7303,7304,7305,7306,7307,7308, # 6976
+7309,7310,7311,7312,7313,7314,7315,7316,4451,7317,7318,7319,7320,7321,7322,7323, # 6992
+7324,7325,7326,7327,7328,7329,7330,7331,7332,7333,7334,7335,7336,7337,7338,7339, # 7008
+7340,7341,7342,7343,7344,7345,7346,7347,7348,7349,7350,7351,7352,7353,4173,7354, # 7024
+7355,4845,7356,7357,7358,7359,7360,7361,7362,7363,7364,7365,7366,7367,7368,7369, # 7040
+7370,7371,7372,7373,7374,7375,7376,7377,7378,7379,7380,7381,7382,7383,7384,7385, # 7056
+7386,7387,7388,4846,7389,7390,7391,7392,7393,7394,7395,7396,7397,7398,7399,7400, # 7072
+7401,7402,7403,7404,7405,3672,7406,7407,7408,7409,7410,7411,7412,7413,7414,7415, # 7088
+7416,7417,7418,7419,7420,7421,7422,7423,7424,7425,7426,7427,7428,7429,7430,7431, # 7104
+7432,7433,7434,7435,7436,7437,7438,7439,7440,7441,7442,7443,7444,7445,7446,7447, # 7120
+7448,7449,7450,7451,7452,7453,4452,7454,3200,7455,7456,7457,7458,7459,7460,7461, # 7136
+7462,7463,7464,7465,7466,7467,7468,7469,7470,7471,7472,7473,7474,4847,7475,7476, # 7152
+7477,3133,7478,7479,7480,7481,7482,7483,7484,7485,7486,7487,7488,7489,7490,7491, # 7168
+7492,7493,7494,7495,7496,7497,7498,7499,7500,7501,7502,3347,7503,7504,7505,7506, # 7184
+7507,7508,7509,7510,7511,7512,7513,7514,7515,7516,7517,7518,7519,7520,7521,4848, # 7200
+7522,7523,7524,7525,7526,7527,7528,7529,7530,7531,7532,7533,7534,7535,7536,7537, # 7216
+7538,7539,7540,7541,7542,7543,7544,7545,7546,7547,7548,7549,3801,4849,7550,7551, # 7232
+7552,7553,7554,7555,7556,7557,7558,7559,7560,7561,7562,7563,7564,7565,7566,7567, # 7248
+7568,7569,3035,7570,7571,7572,7573,7574,7575,7576,7577,7578,7579,7580,7581,7582, # 7264
+7583,7584,7585,7586,7587,7588,7589,7590,7591,7592,7593,7594,7595,7596,7597,7598, # 7280
+7599,7600,7601,7602,7603,7604,7605,7606,7607,7608,7609,7610,7611,7612,7613,7614, # 7296
+7615,7616,4850,7617,7618,3802,7619,7620,7621,7622,7623,7624,7625,7626,7627,7628, # 7312
+7629,7630,7631,7632,4851,7633,7634,7635,7636,7637,7638,7639,7640,7641,7642,7643, # 7328
+7644,7645,7646,7647,7648,7649,7650,7651,7652,7653,7654,7655,7656,7657,7658,7659, # 7344
+7660,7661,7662,7663,7664,7665,7666,7667,7668,7669,7670,4453,7671,7672,7673,7674, # 7360
+7675,7676,7677,7678,7679,7680,7681,7682,7683,7684,7685,7686,7687,7688,7689,7690, # 7376
+7691,7692,7693,7694,7695,7696,7697,3443,7698,7699,7700,7701,7702,4454,7703,7704, # 7392
+7705,7706,7707,7708,7709,7710,7711,7712,7713,2472,7714,7715,7716,7717,7718,7719, # 7408
+7720,7721,7722,7723,7724,7725,7726,7727,7728,7729,7730,7731,3954,7732,7733,7734, # 7424
+7735,7736,7737,7738,7739,7740,7741,7742,7743,7744,7745,7746,7747,7748,7749,7750, # 7440
+3134,7751,7752,4852,7753,7754,7755,4853,7756,7757,7758,7759,7760,4174,7761,7762, # 7456
+7763,7764,7765,7766,7767,7768,7769,7770,7771,7772,7773,7774,7775,7776,7777,7778, # 7472
+7779,7780,7781,7782,7783,7784,7785,7786,7787,7788,7789,7790,7791,7792,7793,7794, # 7488
+7795,7796,7797,7798,7799,7800,7801,7802,7803,7804,7805,4854,7806,7807,7808,7809, # 7504
+7810,7811,7812,7813,7814,7815,7816,7817,7818,7819,7820,7821,7822,7823,7824,7825, # 7520
+4855,7826,7827,7828,7829,7830,7831,7832,7833,7834,7835,7836,7837,7838,7839,7840, # 7536
+7841,7842,7843,7844,7845,7846,7847,3955,7848,7849,7850,7851,7852,7853,7854,7855, # 7552
+7856,7857,7858,7859,7860,3444,7861,7862,7863,7864,7865,7866,7867,7868,7869,7870, # 7568
+7871,7872,7873,7874,7875,7876,7877,7878,7879,7880,7881,7882,7883,7884,7885,7886, # 7584
+7887,7888,7889,7890,7891,4175,7892,7893,7894,7895,7896,4856,4857,7897,7898,7899, # 7600
+7900,2598,7901,7902,7903,7904,7905,7906,7907,7908,4455,7909,7910,7911,7912,7913, # 7616
+7914,3201,7915,7916,7917,7918,7919,7920,7921,4858,7922,7923,7924,7925,7926,7927, # 7632
+7928,7929,7930,7931,7932,7933,7934,7935,7936,7937,7938,7939,7940,7941,7942,7943, # 7648
+7944,7945,7946,7947,7948,7949,7950,7951,7952,7953,7954,7955,7956,7957,7958,7959, # 7664
+7960,7961,7962,7963,7964,7965,7966,7967,7968,7969,7970,7971,7972,7973,7974,7975, # 7680
+7976,7977,7978,7979,7980,7981,4859,7982,7983,7984,7985,7986,7987,7988,7989,7990, # 7696
+7991,7992,7993,7994,7995,7996,4860,7997,7998,7999,8000,8001,8002,8003,8004,8005, # 7712
+8006,8007,8008,8009,8010,8011,8012,8013,8014,8015,8016,4176,8017,8018,8019,8020, # 7728
+8021,8022,8023,4861,8024,8025,8026,8027,8028,8029,8030,8031,8032,8033,8034,8035, # 7744
+8036,4862,4456,8037,8038,8039,8040,4863,8041,8042,8043,8044,8045,8046,8047,8048, # 7760
+8049,8050,8051,8052,8053,8054,8055,8056,8057,8058,8059,8060,8061,8062,8063,8064, # 7776
+8065,8066,8067,8068,8069,8070,8071,8072,8073,8074,8075,8076,8077,8078,8079,8080, # 7792
+8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095,8096, # 7808
+8097,8098,8099,4864,4177,8100,8101,8102,8103,8104,8105,8106,8107,8108,8109,8110, # 7824
+8111,8112,8113,8114,8115,8116,8117,8118,8119,8120,4178,8121,8122,8123,8124,8125, # 7840
+8126,8127,8128,8129,8130,8131,8132,8133,8134,8135,8136,8137,8138,8139,8140,8141, # 7856
+8142,8143,8144,8145,4865,4866,8146,8147,8148,8149,8150,8151,8152,8153,8154,8155, # 7872
+8156,8157,8158,8159,8160,8161,8162,8163,8164,8165,4179,8166,8167,8168,8169,8170, # 7888
+8171,8172,8173,8174,8175,8176,8177,8178,8179,8180,8181,4457,8182,8183,8184,8185, # 7904
+8186,8187,8188,8189,8190,8191,8192,8193,8194,8195,8196,8197,8198,8199,8200,8201, # 7920
+8202,8203,8204,8205,8206,8207,8208,8209,8210,8211,8212,8213,8214,8215,8216,8217, # 7936
+8218,8219,8220,8221,8222,8223,8224,8225,8226,8227,8228,8229,8230,8231,8232,8233, # 7952
+8234,8235,8236,8237,8238,8239,8240,8241,8242,8243,8244,8245,8246,8247,8248,8249, # 7968
+8250,8251,8252,8253,8254,8255,8256,3445,8257,8258,8259,8260,8261,8262,4458,8263, # 7984
+8264,8265,8266,8267,8268,8269,8270,8271,8272,4459,8273,8274,8275,8276,3550,8277, # 8000
+8278,8279,8280,8281,8282,8283,8284,8285,8286,8287,8288,8289,4460,8290,8291,8292, # 8016
+8293,8294,8295,8296,8297,8298,8299,8300,8301,8302,8303,8304,8305,8306,8307,4867, # 8032
+8308,8309,8310,8311,8312,3551,8313,8314,8315,8316,8317,8318,8319,8320,8321,8322, # 8048
+8323,8324,8325,8326,4868,8327,8328,8329,8330,8331,8332,8333,8334,8335,8336,8337, # 8064
+8338,8339,8340,8341,8342,8343,8344,8345,8346,8347,8348,8349,8350,8351,8352,8353, # 8080
+8354,8355,8356,8357,8358,8359,8360,8361,8362,8363,4869,4461,8364,8365,8366,8367, # 8096
+8368,8369,8370,4870,8371,8372,8373,8374,8375,8376,8377,8378,8379,8380,8381,8382, # 8112
+8383,8384,8385,8386,8387,8388,8389,8390,8391,8392,8393,8394,8395,8396,8397,8398, # 8128
+8399,8400,8401,8402,8403,8404,8405,8406,8407,8408,8409,8410,4871,8411,8412,8413, # 8144
+8414,8415,8416,8417,8418,8419,8420,8421,8422,4462,8423,8424,8425,8426,8427,8428, # 8160
+8429,8430,8431,8432,8433,2986,8434,8435,8436,8437,8438,8439,8440,8441,8442,8443, # 8176
+8444,8445,8446,8447,8448,8449,8450,8451,8452,8453,8454,8455,8456,8457,8458,8459, # 8192
+8460,8461,8462,8463,8464,8465,8466,8467,8468,8469,8470,8471,8472,8473,8474,8475, # 8208
+8476,8477,8478,4180,8479,8480,8481,8482,8483,8484,8485,8486,8487,8488,8489,8490, # 8224
+8491,8492,8493,8494,8495,8496,8497,8498,8499,8500,8501,8502,8503,8504,8505,8506, # 8240
+8507,8508,8509,8510,8511,8512,8513,8514,8515,8516,8517,8518,8519,8520,8521,8522, # 8256
+8523,8524,8525,8526,8527,8528,8529,8530,8531,8532,8533,8534,8535,8536,8537,8538, # 8272
+8539,8540,8541,8542,8543,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,8554, # 8288
+8555,8556,8557,8558,8559,8560,8561,8562,8563,8564,4872,8565,8566,8567,8568,8569, # 8304
+8570,8571,8572,8573,4873,8574,8575,8576,8577,8578,8579,8580,8581,8582,8583,8584, # 8320
+8585,8586,8587,8588,8589,8590,8591,8592,8593,8594,8595,8596,8597,8598,8599,8600, # 8336
+8601,8602,8603,8604,8605,3803,8606,8607,8608,8609,8610,8611,8612,8613,4874,3804, # 8352
+8614,8615,8616,8617,8618,8619,8620,8621,3956,8622,8623,8624,8625,8626,8627,8628, # 8368
+8629,8630,8631,8632,8633,8634,8635,8636,8637,8638,2865,8639,8640,8641,8642,8643, # 8384
+8644,8645,8646,8647,8648,8649,8650,8651,8652,8653,8654,8655,8656,4463,8657,8658, # 8400
+8659,4875,4876,8660,8661,8662,8663,8664,8665,8666,8667,8668,8669,8670,8671,8672, # 8416
+8673,8674,8675,8676,8677,8678,8679,8680,8681,4464,8682,8683,8684,8685,8686,8687, # 8432
+8688,8689,8690,8691,8692,8693,8694,8695,8696,8697,8698,8699,8700,8701,8702,8703, # 8448
+8704,8705,8706,8707,8708,8709,2261,8710,8711,8712,8713,8714,8715,8716,8717,8718, # 8464
+8719,8720,8721,8722,8723,8724,8725,8726,8727,8728,8729,8730,8731,8732,8733,4181, # 8480
+8734,8735,8736,8737,8738,8739,8740,8741,8742,8743,8744,8745,8746,8747,8748,8749, # 8496
+8750,8751,8752,8753,8754,8755,8756,8757,8758,8759,8760,8761,8762,8763,4877,8764, # 8512
+8765,8766,8767,8768,8769,8770,8771,8772,8773,8774,8775,8776,8777,8778,8779,8780, # 8528
+8781,8782,8783,8784,8785,8786,8787,8788,4878,8789,4879,8790,8791,8792,4880,8793, # 8544
+8794,8795,8796,8797,8798,8799,8800,8801,4881,8802,8803,8804,8805,8806,8807,8808, # 8560
+8809,8810,8811,8812,8813,8814,8815,3957,8816,8817,8818,8819,8820,8821,8822,8823, # 8576
+8824,8825,8826,8827,8828,8829,8830,8831,8832,8833,8834,8835,8836,8837,8838,8839, # 8592
+8840,8841,8842,8843,8844,8845,8846,8847,4882,8848,8849,8850,8851,8852,8853,8854, # 8608
+8855,8856,8857,8858,8859,8860,8861,8862,8863,8864,8865,8866,8867,8868,8869,8870, # 8624
+8871,8872,8873,8874,8875,8876,8877,8878,8879,8880,8881,8882,8883,8884,3202,8885, # 8640
+8886,8887,8888,8889,8890,8891,8892,8893,8894,8895,8896,8897,8898,8899,8900,8901, # 8656
+8902,8903,8904,8905,8906,8907,8908,8909,8910,8911,8912,8913,8914,8915,8916,8917, # 8672
+8918,8919,8920,8921,8922,8923,8924,4465,8925,8926,8927,8928,8929,8930,8931,8932, # 8688
+4883,8933,8934,8935,8936,8937,8938,8939,8940,8941,8942,8943,2214,8944,8945,8946, # 8704
+8947,8948,8949,8950,8951,8952,8953,8954,8955,8956,8957,8958,8959,8960,8961,8962, # 8720
+8963,8964,8965,4884,8966,8967,8968,8969,8970,8971,8972,8973,8974,8975,8976,8977, # 8736
+8978,8979,8980,8981,8982,8983,8984,8985,8986,8987,8988,8989,8990,8991,8992,4885, # 8752
+8993,8994,8995,8996,8997,8998,8999,9000,9001,9002,9003,9004,9005,9006,9007,9008, # 8768
+9009,9010,9011,9012,9013,9014,9015,9016,9017,9018,9019,9020,9021,4182,9022,9023, # 8784
+9024,9025,9026,9027,9028,9029,9030,9031,9032,9033,9034,9035,9036,9037,9038,9039, # 8800
+9040,9041,9042,9043,9044,9045,9046,9047,9048,9049,9050,9051,9052,9053,9054,9055, # 8816
+9056,9057,9058,9059,9060,9061,9062,9063,4886,9064,9065,9066,9067,9068,9069,4887, # 8832
+9070,9071,9072,9073,9074,9075,9076,9077,9078,9079,9080,9081,9082,9083,9084,9085, # 8848
+9086,9087,9088,9089,9090,9091,9092,9093,9094,9095,9096,9097,9098,9099,9100,9101, # 8864
+9102,9103,9104,9105,9106,9107,9108,9109,9110,9111,9112,9113,9114,9115,9116,9117, # 8880
+9118,9119,9120,9121,9122,9123,9124,9125,9126,9127,9128,9129,9130,9131,9132,9133, # 8896
+9134,9135,9136,9137,9138,9139,9140,9141,3958,9142,9143,9144,9145,9146,9147,9148, # 8912
+9149,9150,9151,4888,9152,9153,9154,9155,9156,9157,9158,9159,9160,9161,9162,9163, # 8928
+9164,9165,9166,9167,9168,9169,9170,9171,9172,9173,9174,9175,4889,9176,9177,9178, # 8944
+9179,9180,9181,9182,9183,9184,9185,9186,9187,9188,9189,9190,9191,9192,9193,9194, # 8960
+9195,9196,9197,9198,9199,9200,9201,9202,9203,4890,9204,9205,9206,9207,9208,9209, # 8976
+9210,9211,9212,9213,9214,9215,9216,9217,9218,9219,9220,9221,9222,4466,9223,9224, # 8992
+9225,9226,9227,9228,9229,9230,9231,9232,9233,9234,9235,9236,9237,9238,9239,9240, # 9008
+9241,9242,9243,9244,9245,4891,9246,9247,9248,9249,9250,9251,9252,9253,9254,9255, # 9024
+9256,9257,4892,9258,9259,9260,9261,4893,4894,9262,9263,9264,9265,9266,9267,9268, # 9040
+9269,9270,9271,9272,9273,4467,9274,9275,9276,9277,9278,9279,9280,9281,9282,9283, # 9056
+9284,9285,3673,9286,9287,9288,9289,9290,9291,9292,9293,9294,9295,9296,9297,9298, # 9072
+9299,9300,9301,9302,9303,9304,9305,9306,9307,9308,9309,9310,9311,9312,9313,9314, # 9088
+9315,9316,9317,9318,9319,9320,9321,9322,4895,9323,9324,9325,9326,9327,9328,9329, # 9104
+9330,9331,9332,9333,9334,9335,9336,9337,9338,9339,9340,9341,9342,9343,9344,9345, # 9120
+9346,9347,4468,9348,9349,9350,9351,9352,9353,9354,9355,9356,9357,9358,9359,9360, # 9136
+9361,9362,9363,9364,9365,9366,9367,9368,9369,9370,9371,9372,9373,4896,9374,4469, # 9152
+9375,9376,9377,9378,9379,4897,9380,9381,9382,9383,9384,9385,9386,9387,9388,9389, # 9168
+9390,9391,9392,9393,9394,9395,9396,9397,9398,9399,9400,9401,9402,9403,9404,9405, # 9184
+9406,4470,9407,2751,9408,9409,3674,3552,9410,9411,9412,9413,9414,9415,9416,9417, # 9200
+9418,9419,9420,9421,4898,9422,9423,9424,9425,9426,9427,9428,9429,3959,9430,9431, # 9216
+9432,9433,9434,9435,9436,4471,9437,9438,9439,9440,9441,9442,9443,9444,9445,9446, # 9232
+9447,9448,9449,9450,3348,9451,9452,9453,9454,9455,9456,9457,9458,9459,9460,9461, # 9248
+9462,9463,9464,9465,9466,9467,9468,9469,9470,9471,9472,4899,9473,9474,9475,9476, # 9264
+9477,4900,9478,9479,9480,9481,9482,9483,9484,9485,9486,9487,9488,3349,9489,9490, # 9280
+9491,9492,9493,9494,9495,9496,9497,9498,9499,9500,9501,9502,9503,9504,9505,9506, # 9296
+9507,9508,9509,9510,9511,9512,9513,9514,9515,9516,9517,9518,9519,9520,4901,9521, # 9312
+9522,9523,9524,9525,9526,4902,9527,9528,9529,9530,9531,9532,9533,9534,9535,9536, # 9328
+9537,9538,9539,9540,9541,9542,9543,9544,9545,9546,9547,9548,9549,9550,9551,9552, # 9344
+9553,9554,9555,9556,9557,9558,9559,9560,9561,9562,9563,9564,9565,9566,9567,9568, # 9360
+9569,9570,9571,9572,9573,9574,9575,9576,9577,9578,9579,9580,9581,9582,9583,9584, # 9376
+3805,9585,9586,9587,9588,9589,9590,9591,9592,9593,9594,9595,9596,9597,9598,9599, # 9392
+9600,9601,9602,4903,9603,9604,9605,9606,9607,4904,9608,9609,9610,9611,9612,9613, # 9408
+9614,4905,9615,9616,9617,9618,9619,9620,9621,9622,9623,9624,9625,9626,9627,9628, # 9424
+9629,9630,9631,9632,4906,9633,9634,9635,9636,9637,9638,9639,9640,9641,9642,9643, # 9440
+4907,9644,9645,9646,9647,9648,9649,9650,9651,9652,9653,9654,9655,9656,9657,9658, # 9456
+9659,9660,9661,9662,9663,9664,9665,9666,9667,9668,9669,9670,9671,9672,4183,9673, # 9472
+9674,9675,9676,9677,4908,9678,9679,9680,9681,4909,9682,9683,9684,9685,9686,9687, # 9488
+9688,9689,9690,4910,9691,9692,9693,3675,9694,9695,9696,2945,9697,9698,9699,9700, # 9504
+9701,9702,9703,9704,9705,4911,9706,9707,9708,9709,9710,9711,9712,9713,9714,9715, # 9520
+9716,9717,9718,9719,9720,9721,9722,9723,9724,9725,9726,9727,9728,9729,9730,9731, # 9536
+9732,9733,9734,9735,4912,9736,9737,9738,9739,9740,4913,9741,9742,9743,9744,9745, # 9552
+9746,9747,9748,9749,9750,9751,9752,9753,9754,9755,9756,9757,9758,4914,9759,9760, # 9568
+9761,9762,9763,9764,9765,9766,9767,9768,9769,9770,9771,9772,9773,9774,9775,9776, # 9584
+9777,9778,9779,9780,9781,9782,4915,9783,9784,9785,9786,9787,9788,9789,9790,9791, # 9600
+9792,9793,4916,9794,9795,9796,9797,9798,9799,9800,9801,9802,9803,9804,9805,9806, # 9616
+9807,9808,9809,9810,9811,9812,9813,9814,9815,9816,9817,9818,9819,9820,9821,9822, # 9632
+9823,9824,9825,9826,9827,9828,9829,9830,9831,9832,9833,9834,9835,9836,9837,9838, # 9648
+9839,9840,9841,9842,9843,9844,9845,9846,9847,9848,9849,9850,9851,9852,9853,9854, # 9664
+9855,9856,9857,9858,9859,9860,9861,9862,9863,9864,9865,9866,9867,9868,4917,9869, # 9680
+9870,9871,9872,9873,9874,9875,9876,9877,9878,9879,9880,9881,9882,9883,9884,9885, # 9696
+9886,9887,9888,9889,9890,9891,9892,4472,9893,9894,9895,9896,9897,3806,9898,9899, # 9712
+9900,9901,9902,9903,9904,9905,9906,9907,9908,9909,9910,9911,9912,9913,9914,4918, # 9728
+9915,9916,9917,4919,9918,9919,9920,9921,4184,9922,9923,9924,9925,9926,9927,9928, # 9744
+9929,9930,9931,9932,9933,9934,9935,9936,9937,9938,9939,9940,9941,9942,9943,9944, # 9760
+9945,9946,4920,9947,9948,9949,9950,9951,9952,9953,9954,9955,4185,9956,9957,9958, # 9776
+9959,9960,9961,9962,9963,9964,9965,4921,9966,9967,9968,4473,9969,9970,9971,9972, # 9792
+9973,9974,9975,9976,9977,4474,9978,9979,9980,9981,9982,9983,9984,9985,9986,9987, # 9808
+9988,9989,9990,9991,9992,9993,9994,9995,9996,9997,9998,9999,10000,10001,10002,10003, # 9824
+10004,10005,10006,10007,10008,10009,10010,10011,10012,10013,10014,10015,10016,10017,10018,10019, # 9840
+10020,10021,4922,10022,4923,10023,10024,10025,10026,10027,10028,10029,10030,10031,10032,10033, # 9856
+10034,10035,10036,10037,10038,10039,10040,10041,10042,10043,10044,10045,10046,10047,10048,4924, # 9872
+10049,10050,10051,10052,10053,10054,10055,10056,10057,10058,10059,10060,10061,10062,10063,10064, # 9888
+10065,10066,10067,10068,10069,10070,10071,10072,10073,10074,10075,10076,10077,10078,10079,10080, # 9904
+10081,10082,10083,10084,10085,10086,10087,4475,10088,10089,10090,10091,10092,10093,10094,10095, # 9920
+10096,10097,4476,10098,10099,10100,10101,10102,10103,10104,10105,10106,10107,10108,10109,10110, # 9936
+10111,2174,10112,10113,10114,10115,10116,10117,10118,10119,10120,10121,10122,10123,10124,10125, # 9952
+10126,10127,10128,10129,10130,10131,10132,10133,10134,10135,10136,10137,10138,10139,10140,3807, # 9968
+4186,4925,10141,10142,10143,10144,10145,10146,10147,4477,4187,10148,10149,10150,10151,10152, # 9984
+10153,4188,10154,10155,10156,10157,10158,10159,10160,10161,4926,10162,10163,10164,10165,10166, #10000
+10167,10168,10169,10170,10171,10172,10173,10174,10175,10176,10177,10178,10179,10180,10181,10182, #10016
+10183,10184,10185,10186,10187,10188,10189,10190,10191,10192,3203,10193,10194,10195,10196,10197, #10032
+10198,10199,10200,4478,10201,10202,10203,10204,4479,10205,10206,10207,10208,10209,10210,10211, #10048
+10212,10213,10214,10215,10216,10217,10218,10219,10220,10221,10222,10223,10224,10225,10226,10227, #10064
+10228,10229,10230,10231,10232,10233,10234,4927,10235,10236,10237,10238,10239,10240,10241,10242, #10080
+10243,10244,10245,10246,10247,10248,10249,10250,10251,10252,10253,10254,10255,10256,10257,10258, #10096
+10259,10260,10261,10262,10263,10264,10265,10266,10267,10268,10269,10270,10271,10272,10273,4480, #10112
+4928,4929,10274,10275,10276,10277,10278,10279,10280,10281,10282,10283,10284,10285,10286,10287, #10128
+10288,10289,10290,10291,10292,10293,10294,10295,10296,10297,10298,10299,10300,10301,10302,10303, #10144
+10304,10305,10306,10307,10308,10309,10310,10311,10312,10313,10314,10315,10316,10317,10318,10319, #10160
+10320,10321,10322,10323,10324,10325,10326,10327,10328,10329,10330,10331,10332,10333,10334,4930, #10176
+10335,10336,10337,10338,10339,10340,10341,10342,4931,10343,10344,10345,10346,10347,10348,10349, #10192
+10350,10351,10352,10353,10354,10355,3088,10356,2786,10357,10358,10359,10360,4189,10361,10362, #10208
+10363,10364,10365,10366,10367,10368,10369,10370,10371,10372,10373,10374,10375,4932,10376,10377, #10224
+10378,10379,10380,10381,10382,10383,10384,10385,10386,10387,10388,10389,10390,10391,10392,4933, #10240
+10393,10394,10395,4934,10396,10397,10398,10399,10400,10401,10402,10403,10404,10405,10406,10407, #10256
+10408,10409,10410,10411,10412,3446,10413,10414,10415,10416,10417,10418,10419,10420,10421,10422, #10272
+10423,4935,10424,10425,10426,10427,10428,10429,10430,4936,10431,10432,10433,10434,10435,10436, #10288
+10437,10438,10439,10440,10441,10442,10443,4937,10444,10445,10446,10447,4481,10448,10449,10450, #10304
+10451,10452,10453,10454,10455,10456,10457,10458,10459,10460,10461,10462,10463,10464,10465,10466, #10320
+10467,10468,10469,10470,10471,10472,10473,10474,10475,10476,10477,10478,10479,10480,10481,10482, #10336
+10483,10484,10485,10486,10487,10488,10489,10490,10491,10492,10493,10494,10495,10496,10497,10498, #10352
+10499,10500,10501,10502,10503,10504,10505,4938,10506,10507,10508,10509,10510,2552,10511,10512, #10368
+10513,10514,10515,10516,3447,10517,10518,10519,10520,10521,10522,10523,10524,10525,10526,10527, #10384
+10528,10529,10530,10531,10532,10533,10534,10535,10536,10537,10538,10539,10540,10541,10542,10543, #10400
+4482,10544,4939,10545,10546,10547,10548,10549,10550,10551,10552,10553,10554,10555,10556,10557, #10416
+10558,10559,10560,10561,10562,10563,10564,10565,10566,10567,3676,4483,10568,10569,10570,10571, #10432
+10572,3448,10573,10574,10575,10576,10577,10578,10579,10580,10581,10582,10583,10584,10585,10586, #10448
+10587,10588,10589,10590,10591,10592,10593,10594,10595,10596,10597,10598,10599,10600,10601,10602, #10464
+10603,10604,10605,10606,10607,10608,10609,10610,10611,10612,10613,10614,10615,10616,10617,10618, #10480
+10619,10620,10621,10622,10623,10624,10625,10626,10627,4484,10628,10629,10630,10631,10632,4940, #10496
+10633,10634,10635,10636,10637,10638,10639,10640,10641,10642,10643,10644,10645,10646,10647,10648, #10512
+10649,10650,10651,10652,10653,10654,10655,10656,4941,10657,10658,10659,2599,10660,10661,10662, #10528
+10663,10664,10665,10666,3089,10667,10668,10669,10670,10671,10672,10673,10674,10675,10676,10677, #10544
+10678,10679,10680,4942,10681,10682,10683,10684,10685,10686,10687,10688,10689,10690,10691,10692, #10560
+10693,10694,10695,10696,10697,4485,10698,10699,10700,10701,10702,10703,10704,4943,10705,3677, #10576
+10706,10707,10708,10709,10710,10711,10712,4944,10713,10714,10715,10716,10717,10718,10719,10720, #10592
+10721,10722,10723,10724,10725,10726,10727,10728,4945,10729,10730,10731,10732,10733,10734,10735, #10608
+10736,10737,10738,10739,10740,10741,10742,10743,10744,10745,10746,10747,10748,10749,10750,10751, #10624
+10752,10753,10754,10755,10756,10757,10758,10759,10760,10761,4946,10762,10763,10764,10765,10766, #10640
+10767,4947,4948,10768,10769,10770,10771,10772,10773,10774,10775,10776,10777,10778,10779,10780, #10656
+10781,10782,10783,10784,10785,10786,10787,10788,10789,10790,10791,10792,10793,10794,10795,10796, #10672
+10797,10798,10799,10800,10801,10802,10803,10804,10805,10806,10807,10808,10809,10810,10811,10812, #10688
+10813,10814,10815,10816,10817,10818,10819,10820,10821,10822,10823,10824,10825,10826,10827,10828, #10704
+10829,10830,10831,10832,10833,10834,10835,10836,10837,10838,10839,10840,10841,10842,10843,10844, #10720
+10845,10846,10847,10848,10849,10850,10851,10852,10853,10854,10855,10856,10857,10858,10859,10860, #10736
+10861,10862,10863,10864,10865,10866,10867,10868,10869,10870,10871,10872,10873,10874,10875,10876, #10752
+10877,10878,4486,10879,10880,10881,10882,10883,10884,10885,4949,10886,10887,10888,10889,10890, #10768
+10891,10892,10893,10894,10895,10896,10897,10898,10899,10900,10901,10902,10903,10904,10905,10906, #10784
+10907,10908,10909,10910,10911,10912,10913,10914,10915,10916,10917,10918,10919,4487,10920,10921, #10800
+10922,10923,10924,10925,10926,10927,10928,10929,10930,10931,10932,4950,10933,10934,10935,10936, #10816
+10937,10938,10939,10940,10941,10942,10943,10944,10945,10946,10947,10948,10949,4488,10950,10951, #10832
+10952,10953,10954,10955,10956,10957,10958,10959,4190,10960,10961,10962,10963,10964,10965,10966, #10848
+10967,10968,10969,10970,10971,10972,10973,10974,10975,10976,10977,10978,10979,10980,10981,10982, #10864
+10983,10984,10985,10986,10987,10988,10989,10990,10991,10992,10993,10994,10995,10996,10997,10998, #10880
+10999,11000,11001,11002,11003,11004,11005,11006,3960,11007,11008,11009,11010,11011,11012,11013, #10896
+11014,11015,11016,11017,11018,11019,11020,11021,11022,11023,11024,11025,11026,11027,11028,11029, #10912
+11030,11031,11032,4951,11033,11034,11035,11036,11037,11038,11039,11040,11041,11042,11043,11044, #10928
+11045,11046,11047,4489,11048,11049,11050,11051,4952,11052,11053,11054,11055,11056,11057,11058, #10944
+4953,11059,11060,11061,11062,11063,11064,11065,11066,11067,11068,11069,11070,11071,4954,11072, #10960
+11073,11074,11075,11076,11077,11078,11079,11080,11081,11082,11083,11084,11085,11086,11087,11088, #10976
+11089,11090,11091,11092,11093,11094,11095,11096,11097,11098,11099,11100,11101,11102,11103,11104, #10992
+11105,11106,11107,11108,11109,11110,11111,11112,11113,11114,11115,3808,11116,11117,11118,11119, #11008
+11120,11121,11122,11123,11124,11125,11126,11127,11128,11129,11130,11131,11132,11133,11134,4955, #11024
+11135,11136,11137,11138,11139,11140,11141,11142,11143,11144,11145,11146,11147,11148,11149,11150, #11040
+11151,11152,11153,11154,11155,11156,11157,11158,11159,11160,11161,4956,11162,11163,11164,11165, #11056
+11166,11167,11168,11169,11170,11171,11172,11173,11174,11175,11176,11177,11178,11179,11180,4957, #11072
+11181,11182,11183,11184,11185,11186,4958,11187,11188,11189,11190,11191,11192,11193,11194,11195, #11088
+11196,11197,11198,11199,11200,3678,11201,11202,11203,11204,11205,11206,4191,11207,11208,11209, #11104
+11210,11211,11212,11213,11214,11215,11216,11217,11218,11219,11220,11221,11222,11223,11224,11225, #11120
+11226,11227,11228,11229,11230,11231,11232,11233,11234,11235,11236,11237,11238,11239,11240,11241, #11136
+11242,11243,11244,11245,11246,11247,11248,11249,11250,11251,4959,11252,11253,11254,11255,11256, #11152
+11257,11258,11259,11260,11261,11262,11263,11264,11265,11266,11267,11268,11269,11270,11271,11272, #11168
+11273,11274,11275,11276,11277,11278,11279,11280,11281,11282,11283,11284,11285,11286,11287,11288, #11184
+11289,11290,11291,11292,11293,11294,11295,11296,11297,11298,11299,11300,11301,11302,11303,11304, #11200
+11305,11306,11307,11308,11309,11310,11311,11312,11313,11314,3679,11315,11316,11317,11318,4490, #11216
+11319,11320,11321,11322,11323,11324,11325,11326,11327,11328,11329,11330,11331,11332,11333,11334, #11232
+11335,11336,11337,11338,11339,11340,11341,11342,11343,11344,11345,11346,11347,4960,11348,11349, #11248
+11350,11351,11352,11353,11354,11355,11356,11357,11358,11359,11360,11361,11362,11363,11364,11365, #11264
+11366,11367,11368,11369,11370,11371,11372,11373,11374,11375,11376,11377,3961,4961,11378,11379, #11280
+11380,11381,11382,11383,11384,11385,11386,11387,11388,11389,11390,11391,11392,11393,11394,11395, #11296
+11396,11397,4192,11398,11399,11400,11401,11402,11403,11404,11405,11406,11407,11408,11409,11410, #11312
+11411,4962,11412,11413,11414,11415,11416,11417,11418,11419,11420,11421,11422,11423,11424,11425, #11328
+11426,11427,11428,11429,11430,11431,11432,11433,11434,11435,11436,11437,11438,11439,11440,11441, #11344
+11442,11443,11444,11445,11446,11447,11448,11449,11450,11451,11452,11453,11454,11455,11456,11457, #11360
+11458,11459,11460,11461,11462,11463,11464,11465,11466,11467,11468,11469,4963,11470,11471,4491, #11376
+11472,11473,11474,11475,4964,11476,11477,11478,11479,11480,11481,11482,11483,11484,11485,11486, #11392
+11487,11488,11489,11490,11491,11492,4965,11493,11494,11495,11496,11497,11498,11499,11500,11501, #11408
+11502,11503,11504,11505,11506,11507,11508,11509,11510,11511,11512,11513,11514,11515,11516,11517, #11424
+11518,11519,11520,11521,11522,11523,11524,11525,11526,11527,11528,11529,3962,11530,11531,11532, #11440
+11533,11534,11535,11536,11537,11538,11539,11540,11541,11542,11543,11544,11545,11546,11547,11548, #11456
+11549,11550,11551,11552,11553,11554,11555,11556,11557,11558,11559,11560,11561,11562,11563,11564, #11472
+4193,4194,11565,11566,11567,11568,11569,11570,11571,11572,11573,11574,11575,11576,11577,11578, #11488
+11579,11580,11581,11582,11583,11584,11585,11586,11587,11588,11589,11590,11591,4966,4195,11592, #11504
+11593,11594,11595,11596,11597,11598,11599,11600,11601,11602,11603,11604,3090,11605,11606,11607, #11520
+11608,11609,11610,4967,11611,11612,11613,11614,11615,11616,11617,11618,11619,11620,11621,11622, #11536
+11623,11624,11625,11626,11627,11628,11629,11630,11631,11632,11633,11634,11635,11636,11637,11638, #11552
+11639,11640,11641,11642,11643,11644,11645,11646,11647,11648,11649,11650,11651,11652,11653,11654, #11568
+11655,11656,11657,11658,11659,11660,11661,11662,11663,11664,11665,11666,11667,11668,11669,11670, #11584
+11671,11672,11673,11674,4968,11675,11676,11677,11678,11679,11680,11681,11682,11683,11684,11685, #11600
+11686,11687,11688,11689,11690,11691,11692,11693,3809,11694,11695,11696,11697,11698,11699,11700, #11616
+11701,11702,11703,11704,11705,11706,11707,11708,11709,11710,11711,11712,11713,11714,11715,11716, #11632
+11717,11718,3553,11719,11720,11721,11722,11723,11724,11725,11726,11727,11728,11729,11730,4969, #11648
+11731,11732,11733,11734,11735,11736,11737,11738,11739,11740,4492,11741,11742,11743,11744,11745, #11664
+11746,11747,11748,11749,11750,11751,11752,4970,11753,11754,11755,11756,11757,11758,11759,11760, #11680
+11761,11762,11763,11764,11765,11766,11767,11768,11769,11770,11771,11772,11773,11774,11775,11776, #11696
+11777,11778,11779,11780,11781,11782,11783,11784,11785,11786,11787,11788,11789,11790,4971,11791, #11712
+11792,11793,11794,11795,11796,11797,4972,11798,11799,11800,11801,11802,11803,11804,11805,11806, #11728
+11807,11808,11809,11810,4973,11811,11812,11813,11814,11815,11816,11817,11818,11819,11820,11821, #11744
+11822,11823,11824,11825,11826,11827,11828,11829,11830,11831,11832,11833,11834,3680,3810,11835, #11760
+11836,4974,11837,11838,11839,11840,11841,11842,11843,11844,11845,11846,11847,11848,11849,11850, #11776
+11851,11852,11853,11854,11855,11856,11857,11858,11859,11860,11861,11862,11863,11864,11865,11866, #11792
+11867,11868,11869,11870,11871,11872,11873,11874,11875,11876,11877,11878,11879,11880,11881,11882, #11808
+11883,11884,4493,11885,11886,11887,11888,11889,11890,11891,11892,11893,11894,11895,11896,11897, #11824
+11898,11899,11900,11901,11902,11903,11904,11905,11906,11907,11908,11909,11910,11911,11912,11913, #11840
+11914,11915,4975,11916,11917,11918,11919,11920,11921,11922,11923,11924,11925,11926,11927,11928, #11856
+11929,11930,11931,11932,11933,11934,11935,11936,11937,11938,11939,11940,11941,11942,11943,11944, #11872
+11945,11946,11947,11948,11949,4976,11950,11951,11952,11953,11954,11955,11956,11957,11958,11959, #11888
+11960,11961,11962,11963,11964,11965,11966,11967,11968,11969,11970,11971,11972,11973,11974,11975, #11904
+11976,11977,11978,11979,11980,11981,11982,11983,11984,11985,11986,11987,4196,11988,11989,11990, #11920
+11991,11992,4977,11993,11994,11995,11996,11997,11998,11999,12000,12001,12002,12003,12004,12005, #11936
+12006,12007,12008,12009,12010,12011,12012,12013,12014,12015,12016,12017,12018,12019,12020,12021, #11952
+12022,12023,12024,12025,12026,12027,12028,12029,12030,12031,12032,12033,12034,12035,12036,12037, #11968
+12038,12039,12040,12041,12042,12043,12044,12045,12046,12047,12048,12049,12050,12051,12052,12053, #11984
+12054,12055,12056,12057,12058,12059,12060,12061,4978,12062,12063,12064,12065,12066,12067,12068, #12000
+12069,12070,12071,12072,12073,12074,12075,12076,12077,12078,12079,12080,12081,12082,12083,12084, #12016
+12085,12086,12087,12088,12089,12090,12091,12092,12093,12094,12095,12096,12097,12098,12099,12100, #12032
+12101,12102,12103,12104,12105,12106,12107,12108,12109,12110,12111,12112,12113,12114,12115,12116, #12048
+12117,12118,12119,12120,12121,12122,12123,4979,12124,12125,12126,12127,12128,4197,12129,12130, #12064
+12131,12132,12133,12134,12135,12136,12137,12138,12139,12140,12141,12142,12143,12144,12145,12146, #12080
+12147,12148,12149,12150,12151,12152,12153,12154,4980,12155,12156,12157,12158,12159,12160,4494, #12096
+12161,12162,12163,12164,3811,12165,12166,12167,12168,12169,4495,12170,12171,4496,12172,12173, #12112
+12174,12175,12176,3812,12177,12178,12179,12180,12181,12182,12183,12184,12185,12186,12187,12188, #12128
+12189,12190,12191,12192,12193,12194,12195,12196,12197,12198,12199,12200,12201,12202,12203,12204, #12144
+12205,12206,12207,12208,12209,12210,12211,12212,12213,12214,12215,12216,12217,12218,12219,12220, #12160
+12221,4981,12222,12223,12224,12225,12226,12227,12228,12229,12230,12231,12232,12233,12234,12235, #12176
+4982,12236,12237,12238,12239,12240,12241,12242,12243,12244,12245,4983,12246,12247,12248,12249, #12192
+4984,12250,12251,12252,12253,12254,12255,12256,12257,12258,12259,12260,12261,12262,12263,12264, #12208
+4985,12265,4497,12266,12267,12268,12269,12270,12271,12272,12273,12274,12275,12276,12277,12278, #12224
+12279,12280,12281,12282,12283,12284,12285,12286,12287,4986,12288,12289,12290,12291,12292,12293, #12240
+12294,12295,12296,2473,12297,12298,12299,12300,12301,12302,12303,12304,12305,12306,12307,12308, #12256
+12309,12310,12311,12312,12313,12314,12315,12316,12317,12318,12319,3963,12320,12321,12322,12323, #12272
+12324,12325,12326,12327,12328,12329,12330,12331,12332,4987,12333,12334,12335,12336,12337,12338, #12288
+12339,12340,12341,12342,12343,12344,12345,12346,12347,12348,12349,12350,12351,12352,12353,12354, #12304
+12355,12356,12357,12358,12359,3964,12360,12361,12362,12363,12364,12365,12366,12367,12368,12369, #12320
+12370,3965,12371,12372,12373,12374,12375,12376,12377,12378,12379,12380,12381,12382,12383,12384, #12336
+12385,12386,12387,12388,12389,12390,12391,12392,12393,12394,12395,12396,12397,12398,12399,12400, #12352
+12401,12402,12403,12404,12405,12406,12407,12408,4988,12409,12410,12411,12412,12413,12414,12415, #12368
+12416,12417,12418,12419,12420,12421,12422,12423,12424,12425,12426,12427,12428,12429,12430,12431, #12384
+12432,12433,12434,12435,12436,12437,12438,3554,12439,12440,12441,12442,12443,12444,12445,12446, #12400
+12447,12448,12449,12450,12451,12452,12453,12454,12455,12456,12457,12458,12459,12460,12461,12462, #12416
+12463,12464,4989,12465,12466,12467,12468,12469,12470,12471,12472,12473,12474,12475,12476,12477, #12432
+12478,12479,12480,4990,12481,12482,12483,12484,12485,12486,12487,12488,12489,4498,12490,12491, #12448
+12492,12493,12494,12495,12496,12497,12498,12499,12500,12501,12502,12503,12504,12505,12506,12507, #12464
+12508,12509,12510,12511,12512,12513,12514,12515,12516,12517,12518,12519,12520,12521,12522,12523, #12480
+12524,12525,12526,12527,12528,12529,12530,12531,12532,12533,12534,12535,12536,12537,12538,12539, #12496
+12540,12541,12542,12543,12544,12545,12546,12547,12548,12549,12550,12551,4991,12552,12553,12554, #12512
+12555,12556,12557,12558,12559,12560,12561,12562,12563,12564,12565,12566,12567,12568,12569,12570, #12528
+12571,12572,12573,12574,12575,12576,12577,12578,3036,12579,12580,12581,12582,12583,3966,12584, #12544
+12585,12586,12587,12588,12589,12590,12591,12592,12593,12594,12595,12596,12597,12598,12599,12600, #12560
+12601,12602,12603,12604,12605,12606,12607,12608,12609,12610,12611,12612,12613,12614,12615,12616, #12576
+12617,12618,12619,12620,12621,12622,12623,12624,12625,12626,12627,12628,12629,12630,12631,12632, #12592
+12633,12634,12635,12636,12637,12638,12639,12640,12641,12642,12643,12644,12645,12646,4499,12647, #12608
+12648,12649,12650,12651,12652,12653,12654,12655,12656,12657,12658,12659,12660,12661,12662,12663, #12624
+12664,12665,12666,12667,12668,12669,12670,12671,12672,12673,12674,12675,12676,12677,12678,12679, #12640
+12680,12681,12682,12683,12684,12685,12686,12687,12688,12689,12690,12691,12692,12693,12694,12695, #12656
+12696,12697,12698,4992,12699,12700,12701,12702,12703,12704,12705,12706,12707,12708,12709,12710, #12672
+12711,12712,12713,12714,12715,12716,12717,12718,12719,12720,12721,12722,12723,12724,12725,12726, #12688
+12727,12728,12729,12730,12731,12732,12733,12734,12735,12736,12737,12738,12739,12740,12741,12742, #12704
+12743,12744,12745,12746,12747,12748,12749,12750,12751,12752,12753,12754,12755,12756,12757,12758, #12720
+12759,12760,12761,12762,12763,12764,12765,12766,12767,12768,12769,12770,12771,12772,12773,12774, #12736
+12775,12776,12777,12778,4993,2175,12779,12780,12781,12782,12783,12784,12785,12786,4500,12787, #12752
+12788,12789,12790,12791,12792,12793,12794,12795,12796,12797,12798,12799,12800,12801,12802,12803, #12768
+12804,12805,12806,12807,12808,12809,12810,12811,12812,12813,12814,12815,12816,12817,12818,12819, #12784
+12820,12821,12822,12823,12824,12825,12826,4198,3967,12827,12828,12829,12830,12831,12832,12833, #12800
+12834,12835,12836,12837,12838,12839,12840,12841,12842,12843,12844,12845,12846,12847,12848,12849, #12816
+12850,12851,12852,12853,12854,12855,12856,12857,12858,12859,12860,12861,4199,12862,12863,12864, #12832
+12865,12866,12867,12868,12869,12870,12871,12872,12873,12874,12875,12876,12877,12878,12879,12880, #12848
+12881,12882,12883,12884,12885,12886,12887,4501,12888,12889,12890,12891,12892,12893,12894,12895, #12864
+12896,12897,12898,12899,12900,12901,12902,12903,12904,12905,12906,12907,12908,12909,12910,12911, #12880
+12912,4994,12913,12914,12915,12916,12917,12918,12919,12920,12921,12922,12923,12924,12925,12926, #12896
+12927,12928,12929,12930,12931,12932,12933,12934,12935,12936,12937,12938,12939,12940,12941,12942, #12912
+12943,12944,12945,12946,12947,12948,12949,12950,12951,12952,12953,12954,12955,12956,1772,12957, #12928
+12958,12959,12960,12961,12962,12963,12964,12965,12966,12967,12968,12969,12970,12971,12972,12973, #12944
+12974,12975,12976,12977,12978,12979,12980,12981,12982,12983,12984,12985,12986,12987,12988,12989, #12960
+12990,12991,12992,12993,12994,12995,12996,12997,4502,12998,4503,12999,13000,13001,13002,13003, #12976
+4504,13004,13005,13006,13007,13008,13009,13010,13011,13012,13013,13014,13015,13016,13017,13018, #12992
+13019,13020,13021,13022,13023,13024,13025,13026,13027,13028,13029,3449,13030,13031,13032,13033, #13008
+13034,13035,13036,13037,13038,13039,13040,13041,13042,13043,13044,13045,13046,13047,13048,13049, #13024
+13050,13051,13052,13053,13054,13055,13056,13057,13058,13059,13060,13061,13062,13063,13064,13065, #13040
+13066,13067,13068,13069,13070,13071,13072,13073,13074,13075,13076,13077,13078,13079,13080,13081, #13056
+13082,13083,13084,13085,13086,13087,13088,13089,13090,13091,13092,13093,13094,13095,13096,13097, #13072
+13098,13099,13100,13101,13102,13103,13104,13105,13106,13107,13108,13109,13110,13111,13112,13113, #13088
+13114,13115,13116,13117,13118,3968,13119,4995,13120,13121,13122,13123,13124,13125,13126,13127, #13104
+4505,13128,13129,13130,13131,13132,13133,13134,4996,4506,13135,13136,13137,13138,13139,4997, #13120
+13140,13141,13142,13143,13144,13145,13146,13147,13148,13149,13150,13151,13152,13153,13154,13155, #13136
+13156,13157,13158,13159,4998,13160,13161,13162,13163,13164,13165,13166,13167,13168,13169,13170, #13152
+13171,13172,13173,13174,13175,13176,4999,13177,13178,13179,13180,13181,13182,13183,13184,13185, #13168
+13186,13187,13188,13189,13190,13191,13192,13193,13194,13195,13196,13197,13198,13199,13200,13201, #13184
+13202,13203,13204,13205,13206,5000,13207,13208,13209,13210,13211,13212,13213,13214,13215,13216, #13200
+13217,13218,13219,13220,13221,13222,13223,13224,13225,13226,13227,4200,5001,13228,13229,13230, #13216
+13231,13232,13233,13234,13235,13236,13237,13238,13239,13240,3969,13241,13242,13243,13244,3970, #13232
+13245,13246,13247,13248,13249,13250,13251,13252,13253,13254,13255,13256,13257,13258,13259,13260, #13248
+13261,13262,13263,13264,13265,13266,13267,13268,3450,13269,13270,13271,13272,13273,13274,13275, #13264
+13276,5002,13277,13278,13279,13280,13281,13282,13283,13284,13285,13286,13287,13288,13289,13290, #13280
+13291,13292,13293,13294,13295,13296,13297,13298,13299,13300,13301,13302,3813,13303,13304,13305, #13296
+13306,13307,13308,13309,13310,13311,13312,13313,13314,13315,13316,13317,13318,13319,13320,13321, #13312
+13322,13323,13324,13325,13326,13327,13328,4507,13329,13330,13331,13332,13333,13334,13335,13336, #13328
+13337,13338,13339,13340,13341,5003,13342,13343,13344,13345,13346,13347,13348,13349,13350,13351, #13344
+13352,13353,13354,13355,13356,13357,13358,13359,13360,13361,13362,13363,13364,13365,13366,13367, #13360
+5004,13368,13369,13370,13371,13372,13373,13374,13375,13376,13377,13378,13379,13380,13381,13382, #13376
+13383,13384,13385,13386,13387,13388,13389,13390,13391,13392,13393,13394,13395,13396,13397,13398, #13392
+13399,13400,13401,13402,13403,13404,13405,13406,13407,13408,13409,13410,13411,13412,13413,13414, #13408
+13415,13416,13417,13418,13419,13420,13421,13422,13423,13424,13425,13426,13427,13428,13429,13430, #13424
+13431,13432,4508,13433,13434,13435,4201,13436,13437,13438,13439,13440,13441,13442,13443,13444, #13440
+13445,13446,13447,13448,13449,13450,13451,13452,13453,13454,13455,13456,13457,5005,13458,13459, #13456
+13460,13461,13462,13463,13464,13465,13466,13467,13468,13469,13470,4509,13471,13472,13473,13474, #13472
+13475,13476,13477,13478,13479,13480,13481,13482,13483,13484,13485,13486,13487,13488,13489,13490, #13488
+13491,13492,13493,13494,13495,13496,13497,13498,13499,13500,13501,13502,13503,13504,13505,13506, #13504
+13507,13508,13509,13510,13511,13512,13513,13514,13515,13516,13517,13518,13519,13520,13521,13522, #13520
+13523,13524,13525,13526,13527,13528,13529,13530,13531,13532,13533,13534,13535,13536,13537,13538, #13536
+13539,13540,13541,13542,13543,13544,13545,13546,13547,13548,13549,13550,13551,13552,13553,13554, #13552
+13555,13556,13557,13558,13559,13560,13561,13562,13563,13564,13565,13566,13567,13568,13569,13570, #13568
+13571,13572,13573,13574,13575,13576,13577,13578,13579,13580,13581,13582,13583,13584,13585,13586, #13584
+13587,13588,13589,13590,13591,13592,13593,13594,13595,13596,13597,13598,13599,13600,13601,13602, #13600
+13603,13604,13605,13606,13607,13608,13609,13610,13611,13612,13613,13614,13615,13616,13617,13618, #13616
+13619,13620,13621,13622,13623,13624,13625,13626,13627,13628,13629,13630,13631,13632,13633,13634, #13632
+13635,13636,13637,13638,13639,13640,13641,13642,5006,13643,13644,13645,13646,13647,13648,13649, #13648
+13650,13651,5007,13652,13653,13654,13655,13656,13657,13658,13659,13660,13661,13662,13663,13664, #13664
+13665,13666,13667,13668,13669,13670,13671,13672,13673,13674,13675,13676,13677,13678,13679,13680, #13680
+13681,13682,13683,13684,13685,13686,13687,13688,13689,13690,13691,13692,13693,13694,13695,13696, #13696
+13697,13698,13699,13700,13701,13702,13703,13704,13705,13706,13707,13708,13709,13710,13711,13712, #13712
+13713,13714,13715,13716,13717,13718,13719,13720,13721,13722,13723,13724,13725,13726,13727,13728, #13728
+13729,13730,13731,13732,13733,13734,13735,13736,13737,13738,13739,13740,13741,13742,13743,13744, #13744
+13745,13746,13747,13748,13749,13750,13751,13752,13753,13754,13755,13756,13757,13758,13759,13760, #13760
+13761,13762,13763,13764,13765,13766,13767,13768,13769,13770,13771,13772,13773,13774,3273,13775, #13776
+13776,13777,13778,13779,13780,13781,13782,13783,13784,13785,13786,13787,13788,13789,13790,13791, #13792
+13792,13793,13794,13795,13796,13797,13798,13799,13800,13801,13802,13803,13804,13805,13806,13807, #13808
+13808,13809,13810,13811,13812,13813,13814,13815,13816,13817,13818,13819,13820,13821,13822,13823, #13824
+13824,13825,13826,13827,13828,13829,13830,13831,13832,13833,13834,13835,13836,13837,13838,13839, #13840
+13840,13841,13842,13843,13844,13845,13846,13847,13848,13849,13850,13851,13852,13853,13854,13855, #13856
+13856,13857,13858,13859,13860,13861,13862,13863,13864,13865,13866,13867,13868,13869,13870,13871, #13872
+13872,13873,13874,13875,13876,13877,13878,13879,13880,13881,13882,13883,13884,13885,13886,13887, #13888
+13888,13889,13890,13891,13892,13893,13894,13895,13896,13897,13898,13899,13900,13901,13902,13903, #13904
+13904,13905,13906,13907,13908,13909,13910,13911,13912,13913,13914,13915,13916,13917,13918,13919, #13920
+13920,13921,13922,13923,13924,13925,13926,13927,13928,13929,13930,13931,13932,13933,13934,13935, #13936
+13936,13937,13938,13939,13940,13941,13942,13943,13944,13945,13946,13947,13948,13949,13950,13951, #13952
+13952,13953,13954,13955,13956,13957,13958,13959,13960,13961,13962,13963,13964,13965,13966,13967, #13968
+13968,13969,13970,13971,13972) #13973
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/big5prober.py b/lib/requests/packages/chardet/big5prober.py
new file mode 100644
index 00000000..becce81e
--- /dev/null
+++ b/lib/requests/packages/chardet/big5prober.py
@@ -0,0 +1,42 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .mbcharsetprober import MultiByteCharSetProber
+from .codingstatemachine import CodingStateMachine
+from .chardistribution import Big5DistributionAnalysis
+from .mbcssm import Big5SMModel
+
+
+class Big5Prober(MultiByteCharSetProber):
+    def __init__(self):
+        MultiByteCharSetProber.__init__(self)
+        self._mCodingSM = CodingStateMachine(Big5SMModel)
+        self._mDistributionAnalyzer = Big5DistributionAnalysis()
+        self.reset()
+
+    def get_charset_name(self):
+        return "Big5"
diff --git a/lib/requests/packages/chardet/chardetect.py b/lib/requests/packages/chardet/chardetect.py
new file mode 100755
index 00000000..ffe892f2
--- /dev/null
+++ b/lib/requests/packages/chardet/chardetect.py
@@ -0,0 +1,80 @@
+#!/usr/bin/env python
+"""
+Script which takes one or more file paths and reports on their detected
+encodings
+
+Example::
+
+    % chardetect somefile someotherfile
+    somefile: windows-1252 with confidence 0.5
+    someotherfile: ascii with confidence 1.0
+
+If no paths are provided, it takes its input from stdin.
+
+"""
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import argparse
+import sys
+from io import open
+
+from chardet import __version__
+from chardet.universaldetector import UniversalDetector
+
+
+def description_of(lines, name='stdin'):
+    """
+    Return a string describing the probable encoding of a file or
+    list of strings.
+
+    :param lines: The lines to get the encoding of.
+    :type lines: Iterable of bytes
+    :param name: Name of file or collection of lines
+    :type name: str
+    """
+    u = UniversalDetector()
+    for line in lines:
+        u.feed(line)
+    u.close()
+    result = u.result
+    if result['encoding']:
+        return '{0}: {1} with confidence {2}'.format(name, result['encoding'],
+                                                     result['confidence'])
+    else:
+        return '{0}: no result'.format(name)
+
+
+def main(argv=None):
+    '''
+    Handles command line arguments and gets things started.
+
+    :param argv: List of arguments, as if specified on the command-line.
+                 If None, ``sys.argv[1:]`` is used instead.
+    :type argv: list of str
+    '''
+    # Get command line arguments
+    parser = argparse.ArgumentParser(
+        description="Takes one or more file paths and reports their detected \
+                     encodings",
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+        conflict_handler='resolve')
+    parser.add_argument('input',
+                        help='File whose encoding we would like to determine.',
+                        type=argparse.FileType('rb'), nargs='*',
+                        default=[sys.stdin])
+    parser.add_argument('--version', action='version',
+                        version='%(prog)s {0}'.format(__version__))
+    args = parser.parse_args(argv)
+
+    for f in args.input:
+        if f.isatty():
+            print("You are running chardetect interactively. Press " +
+                  "CTRL-D twice at the start of a blank line to signal the " +
+                  "end of your input. If you want help, run chardetect " +
+                  "--help\n", file=sys.stderr)
+        print(description_of(f, f.name))
+
+
+if __name__ == '__main__':
+    main()
diff --git a/lib/requests/packages/chardet/chardistribution.py b/lib/requests/packages/chardet/chardistribution.py
new file mode 100644
index 00000000..4e64a00b
--- /dev/null
+++ b/lib/requests/packages/chardet/chardistribution.py
@@ -0,0 +1,231 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .euctwfreq import (EUCTWCharToFreqOrder, EUCTW_TABLE_SIZE,
+                        EUCTW_TYPICAL_DISTRIBUTION_RATIO)
+from .euckrfreq import (EUCKRCharToFreqOrder, EUCKR_TABLE_SIZE,
+                        EUCKR_TYPICAL_DISTRIBUTION_RATIO)
+from .gb2312freq import (GB2312CharToFreqOrder, GB2312_TABLE_SIZE,
+                         GB2312_TYPICAL_DISTRIBUTION_RATIO)
+from .big5freq import (Big5CharToFreqOrder, BIG5_TABLE_SIZE,
+                       BIG5_TYPICAL_DISTRIBUTION_RATIO)
+from .jisfreq import (JISCharToFreqOrder, JIS_TABLE_SIZE,
+                      JIS_TYPICAL_DISTRIBUTION_RATIO)
+from .compat import wrap_ord
+
+ENOUGH_DATA_THRESHOLD = 1024
+SURE_YES = 0.99
+SURE_NO = 0.01
+MINIMUM_DATA_THRESHOLD = 3
+
+
+class CharDistributionAnalysis:
+    def __init__(self):
+        # Mapping table to get frequency order from char order (get from
+        # GetOrder())
+        self._mCharToFreqOrder = None
+        self._mTableSize = None  # Size of above table
+        # This is a constant value which varies from language to language,
+        # used in calculating confidence.  See
+        # http://www.mozilla.org/projects/intl/UniversalCharsetDetection.html
+        # for further detail.
+        self._mTypicalDistributionRatio = None
+        self.reset()
+
+    def reset(self):
+        """reset analyser, clear any state"""
+        # If this flag is set to True, detection is done and conclusion has
+        # been made
+        self._mDone = False
+        self._mTotalChars = 0  # Total characters encountered
+        # The number of characters whose frequency order is less than 512
+        self._mFreqChars = 0
+
+    def feed(self, aBuf, aCharLen):
+        """feed a character with known length"""
+        if aCharLen == 2:
+            # we only care about 2-bytes character in our distribution analysis
+            order = self.get_order(aBuf)
+        else:
+            order = -1
+        if order >= 0:
+            self._mTotalChars += 1
+            # order is valid
+            if order < self._mTableSize:
+                if 512 > self._mCharToFreqOrder[order]:
+                    self._mFreqChars += 1
+
+    def get_confidence(self):
+        """return confidence based on existing data"""
+        # if we didn't receive any character in our consideration range,
+        # return negative answer
+        if self._mTotalChars <= 0 or self._mFreqChars <= MINIMUM_DATA_THRESHOLD:
+            return SURE_NO
+
+        if self._mTotalChars != self._mFreqChars:
+            r = (self._mFreqChars / ((self._mTotalChars - self._mFreqChars)
+                 * self._mTypicalDistributionRatio))
+            if r < SURE_YES:
+                return r
+
+        # normalize confidence (we don't want to be 100% sure)
+        return SURE_YES
+
+    def got_enough_data(self):
+        # It is not necessary to receive all data to draw conclusion.
+        # For charset detection, certain amount of data is enough
+        return self._mTotalChars > ENOUGH_DATA_THRESHOLD
+
+    def get_order(self, aBuf):
+        # We do not handle characters based on the original encoding string,
+        # but convert this encoding string to a number, here called order.
+        # This allows multiple encodings of a language to share one frequency
+        # table.
+        return -1
+
+
+class EUCTWDistributionAnalysis(CharDistributionAnalysis):
+    def __init__(self):
+        CharDistributionAnalysis.__init__(self)
+        self._mCharToFreqOrder = EUCTWCharToFreqOrder
+        self._mTableSize = EUCTW_TABLE_SIZE
+        self._mTypicalDistributionRatio = EUCTW_TYPICAL_DISTRIBUTION_RATIO
+
+    def get_order(self, aBuf):
+        # for euc-TW encoding, we are interested
+        #   first  byte range: 0xc4 -- 0xfe
+        #   second byte range: 0xa1 -- 0xfe
+        # no validation needed here. State machine has done that
+        first_char = wrap_ord(aBuf[0])
+        if first_char >= 0xC4:
+            return 94 * (first_char - 0xC4) + wrap_ord(aBuf[1]) - 0xA1
+        else:
+            return -1
+
+
+class EUCKRDistributionAnalysis(CharDistributionAnalysis):
+    def __init__(self):
+        CharDistributionAnalysis.__init__(self)
+        self._mCharToFreqOrder = EUCKRCharToFreqOrder
+        self._mTableSize = EUCKR_TABLE_SIZE
+        self._mTypicalDistributionRatio = EUCKR_TYPICAL_DISTRIBUTION_RATIO
+
+    def get_order(self, aBuf):
+        # for euc-KR encoding, we are interested
+        #   first  byte range: 0xb0 -- 0xfe
+        #   second byte range: 0xa1 -- 0xfe
+        # no validation needed here. State machine has done that
+        first_char = wrap_ord(aBuf[0])
+        if first_char >= 0xB0:
+            return 94 * (first_char - 0xB0) + wrap_ord(aBuf[1]) - 0xA1
+        else:
+            return -1
+
+
+class GB2312DistributionAnalysis(CharDistributionAnalysis):
+    def __init__(self):
+        CharDistributionAnalysis.__init__(self)
+        self._mCharToFreqOrder = GB2312CharToFreqOrder
+        self._mTableSize = GB2312_TABLE_SIZE
+        self._mTypicalDistributionRatio = GB2312_TYPICAL_DISTRIBUTION_RATIO
+
+    def get_order(self, aBuf):
+        # for GB2312 encoding, we are interested
+        #  first  byte range: 0xb0 -- 0xfe
+        #  second byte range: 0xa1 -- 0xfe
+        # no validation needed here. State machine has done that
+        first_char, second_char = wrap_ord(aBuf[0]), wrap_ord(aBuf[1])
+        if (first_char >= 0xB0) and (second_char >= 0xA1):
+            return 94 * (first_char - 0xB0) + second_char - 0xA1
+        else:
+            return -1
+
+
+class Big5DistributionAnalysis(CharDistributionAnalysis):
+    def __init__(self):
+        CharDistributionAnalysis.__init__(self)
+        self._mCharToFreqOrder = Big5CharToFreqOrder
+        self._mTableSize = BIG5_TABLE_SIZE
+        self._mTypicalDistributionRatio = BIG5_TYPICAL_DISTRIBUTION_RATIO
+
+    def get_order(self, aBuf):
+        # for big5 encoding, we are interested
+        #   first  byte range: 0xa4 -- 0xfe
+        #   second byte range: 0x40 -- 0x7e , 0xa1 -- 0xfe
+        # no validation needed here. State machine has done that
+        first_char, second_char = wrap_ord(aBuf[0]), wrap_ord(aBuf[1])
+        if first_char >= 0xA4:
+            if second_char >= 0xA1:
+                return 157 * (first_char - 0xA4) + second_char - 0xA1 + 63
+            else:
+                return 157 * (first_char - 0xA4) + second_char - 0x40
+        else:
+            return -1
+
+
+class SJISDistributionAnalysis(CharDistributionAnalysis):
+    def __init__(self):
+        CharDistributionAnalysis.__init__(self)
+        self._mCharToFreqOrder = JISCharToFreqOrder
+        self._mTableSize = JIS_TABLE_SIZE
+        self._mTypicalDistributionRatio = JIS_TYPICAL_DISTRIBUTION_RATIO
+
+    def get_order(self, aBuf):
+        # for sjis encoding, we are interested
+        #   first  byte range: 0x81 -- 0x9f , 0xe0 -- 0xfe
+        #   second byte range: 0x40 -- 0x7e,  0x81 -- oxfe
+        # no validation needed here. State machine has done that
+        first_char, second_char = wrap_ord(aBuf[0]), wrap_ord(aBuf[1])
+        if (first_char >= 0x81) and (first_char <= 0x9F):
+            order = 188 * (first_char - 0x81)
+        elif (first_char >= 0xE0) and (first_char <= 0xEF):
+            order = 188 * (first_char - 0xE0 + 31)
+        else:
+            return -1
+        order = order + second_char - 0x40
+        if second_char > 0x7F:
+            order = -1
+        return order
+
+
+class EUCJPDistributionAnalysis(CharDistributionAnalysis):
+    def __init__(self):
+        CharDistributionAnalysis.__init__(self)
+        self._mCharToFreqOrder = JISCharToFreqOrder
+        self._mTableSize = JIS_TABLE_SIZE
+        self._mTypicalDistributionRatio = JIS_TYPICAL_DISTRIBUTION_RATIO
+
+    def get_order(self, aBuf):
+        # for euc-JP encoding, we are interested
+        #   first  byte range: 0xa0 -- 0xfe
+        #   second byte range: 0xa1 -- 0xfe
+        # no validation needed here. State machine has done that
+        char = wrap_ord(aBuf[0])
+        if char >= 0xA0:
+            return 94 * (char - 0xA1) + wrap_ord(aBuf[1]) - 0xa1
+        else:
+            return -1
diff --git a/lib/requests/packages/chardet/charsetgroupprober.py b/lib/requests/packages/chardet/charsetgroupprober.py
new file mode 100644
index 00000000..85e7a1c6
--- /dev/null
+++ b/lib/requests/packages/chardet/charsetgroupprober.py
@@ -0,0 +1,106 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+# 
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+# 
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from . import constants
+import sys
+from .charsetprober import CharSetProber
+
+
+class CharSetGroupProber(CharSetProber):
+    def __init__(self):
+        CharSetProber.__init__(self)
+        self._mActiveNum = 0
+        self._mProbers = []
+        self._mBestGuessProber = None
+
+    def reset(self):
+        CharSetProber.reset(self)
+        self._mActiveNum = 0
+        for prober in self._mProbers:
+            if prober:
+                prober.reset()
+                prober.active = True
+                self._mActiveNum += 1
+        self._mBestGuessProber = None
+
+    def get_charset_name(self):
+        if not self._mBestGuessProber:
+            self.get_confidence()
+            if not self._mBestGuessProber:
+                return None
+#                self._mBestGuessProber = self._mProbers[0]
+        return self._mBestGuessProber.get_charset_name()
+
+    def feed(self, aBuf):
+        for prober in self._mProbers:
+            if not prober:
+                continue
+            if not prober.active:
+                continue
+            st = prober.feed(aBuf)
+            if not st:
+                continue
+            if st == constants.eFoundIt:
+                self._mBestGuessProber = prober
+                return self.get_state()
+            elif st == constants.eNotMe:
+                prober.active = False
+                self._mActiveNum -= 1
+                if self._mActiveNum <= 0:
+                    self._mState = constants.eNotMe
+                    return self.get_state()
+        return self.get_state()
+
+    def get_confidence(self):
+        st = self.get_state()
+        if st == constants.eFoundIt:
+            return 0.99
+        elif st == constants.eNotMe:
+            return 0.01
+        bestConf = 0.0
+        self._mBestGuessProber = None
+        for prober in self._mProbers:
+            if not prober:
+                continue
+            if not prober.active:
+                if constants._debug:
+                    sys.stderr.write(prober.get_charset_name()
+                                     + ' not active\n')
+                continue
+            cf = prober.get_confidence()
+            if constants._debug:
+                sys.stderr.write('%s confidence = %s\n' %
+                                 (prober.get_charset_name(), cf))
+            if bestConf < cf:
+                bestConf = cf
+                self._mBestGuessProber = prober
+        if not self._mBestGuessProber:
+            return 0.0
+        return bestConf
+#        else:
+#            self._mBestGuessProber = self._mProbers[0]
+#            return self._mBestGuessProber.get_confidence()
diff --git a/lib/requests/packages/chardet/charsetprober.py b/lib/requests/packages/chardet/charsetprober.py
new file mode 100644
index 00000000..97581712
--- /dev/null
+++ b/lib/requests/packages/chardet/charsetprober.py
@@ -0,0 +1,62 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Universal charset detector code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#   Shy Shalom - original C code
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from . import constants
+import re
+
+
+class CharSetProber:
+    def __init__(self):
+        pass
+
+    def reset(self):
+        self._mState = constants.eDetecting
+
+    def get_charset_name(self):
+        return None
+
+    def feed(self, aBuf):
+        pass
+
+    def get_state(self):
+        return self._mState
+
+    def get_confidence(self):
+        return 0.0
+
+    def filter_high_bit_only(self, aBuf):
+        aBuf = re.sub(b'([\x00-\x7F])+', b' ', aBuf)
+        return aBuf
+
+    def filter_without_english_letters(self, aBuf):
+        aBuf = re.sub(b'([A-Za-z])+', b' ', aBuf)
+        return aBuf
+
+    def filter_with_english_letters(self, aBuf):
+        # TODO
+        return aBuf
diff --git a/lib/requests/packages/chardet/codingstatemachine.py b/lib/requests/packages/chardet/codingstatemachine.py
new file mode 100644
index 00000000..8dd8c917
--- /dev/null
+++ b/lib/requests/packages/chardet/codingstatemachine.py
@@ -0,0 +1,61 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .constants import eStart
+from .compat import wrap_ord
+
+
+class CodingStateMachine:
+    def __init__(self, sm):
+        self._mModel = sm
+        self._mCurrentBytePos = 0
+        self._mCurrentCharLen = 0
+        self.reset()
+
+    def reset(self):
+        self._mCurrentState = eStart
+
+    def next_state(self, c):
+        # for each byte we get its class
+        # if it is first byte, we also get byte length
+        # PY3K: aBuf is a byte stream, so c is an int, not a byte
+        byteCls = self._mModel['classTable'][wrap_ord(c)]
+        if self._mCurrentState == eStart:
+            self._mCurrentBytePos = 0
+            self._mCurrentCharLen = self._mModel['charLenTable'][byteCls]
+        # from byte's class and stateTable, we get its next state
+        curr_state = (self._mCurrentState * self._mModel['classFactor']
+                      + byteCls)
+        self._mCurrentState = self._mModel['stateTable'][curr_state]
+        self._mCurrentBytePos += 1
+        return self._mCurrentState
+
+    def get_current_charlen(self):
+        return self._mCurrentCharLen
+
+    def get_coding_state_machine(self):
+        return self._mModel['name']
diff --git a/lib/requests/packages/chardet/compat.py b/lib/requests/packages/chardet/compat.py
new file mode 100644
index 00000000..d9e30add
--- /dev/null
+++ b/lib/requests/packages/chardet/compat.py
@@ -0,0 +1,34 @@
+######################## BEGIN LICENSE BLOCK ########################
+# Contributor(s):
+#   Ian Cordasco - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+import sys
+
+
+if sys.version_info < (3, 0):
+    base_str = (str, unicode)
+else:
+    base_str = (bytes, str)
+
+
+def wrap_ord(a):
+    if sys.version_info < (3, 0) and isinstance(a, base_str):
+        return ord(a)
+    else:
+        return a
diff --git a/lib/requests/packages/chardet/constants.py b/lib/requests/packages/chardet/constants.py
new file mode 100644
index 00000000..e4d148b3
--- /dev/null
+++ b/lib/requests/packages/chardet/constants.py
@@ -0,0 +1,39 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Universal charset detector code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#   Shy Shalom - original C code
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+_debug = 0
+
+eDetecting = 0
+eFoundIt = 1
+eNotMe = 2
+
+eStart = 0
+eError = 1
+eItsMe = 2
+
+SHORTCUT_THRESHOLD = 0.95
diff --git a/lib/requests/packages/chardet/cp949prober.py b/lib/requests/packages/chardet/cp949prober.py
new file mode 100644
index 00000000..ff4272f8
--- /dev/null
+++ b/lib/requests/packages/chardet/cp949prober.py
@@ -0,0 +1,44 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .mbcharsetprober import MultiByteCharSetProber
+from .codingstatemachine import CodingStateMachine
+from .chardistribution import EUCKRDistributionAnalysis
+from .mbcssm import CP949SMModel
+
+
+class CP949Prober(MultiByteCharSetProber):
+    def __init__(self):
+        MultiByteCharSetProber.__init__(self)
+        self._mCodingSM = CodingStateMachine(CP949SMModel)
+        # NOTE: CP949 is a superset of EUC-KR, so the distribution should be
+        #       not different.
+        self._mDistributionAnalyzer = EUCKRDistributionAnalysis()
+        self.reset()
+
+    def get_charset_name(self):
+        return "CP949"
diff --git a/lib/requests/packages/chardet/escprober.py b/lib/requests/packages/chardet/escprober.py
new file mode 100644
index 00000000..80a844ff
--- /dev/null
+++ b/lib/requests/packages/chardet/escprober.py
@@ -0,0 +1,86 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from . import constants
+from .escsm import (HZSMModel, ISO2022CNSMModel, ISO2022JPSMModel,
+                    ISO2022KRSMModel)
+from .charsetprober import CharSetProber
+from .codingstatemachine import CodingStateMachine
+from .compat import wrap_ord
+
+
+class EscCharSetProber(CharSetProber):
+    def __init__(self):
+        CharSetProber.__init__(self)
+        self._mCodingSM = [
+            CodingStateMachine(HZSMModel),
+            CodingStateMachine(ISO2022CNSMModel),
+            CodingStateMachine(ISO2022JPSMModel),
+            CodingStateMachine(ISO2022KRSMModel)
+        ]
+        self.reset()
+
+    def reset(self):
+        CharSetProber.reset(self)
+        for codingSM in self._mCodingSM:
+            if not codingSM:
+                continue
+            codingSM.active = True
+            codingSM.reset()
+        self._mActiveSM = len(self._mCodingSM)
+        self._mDetectedCharset = None
+
+    def get_charset_name(self):
+        return self._mDetectedCharset
+
+    def get_confidence(self):
+        if self._mDetectedCharset:
+            return 0.99
+        else:
+            return 0.00
+
+    def feed(self, aBuf):
+        for c in aBuf:
+            # PY3K: aBuf is a byte array, so c is an int, not a byte
+            for codingSM in self._mCodingSM:
+                if not codingSM:
+                    continue
+                if not codingSM.active:
+                    continue
+                codingState = codingSM.next_state(wrap_ord(c))
+                if codingState == constants.eError:
+                    codingSM.active = False
+                    self._mActiveSM -= 1
+                    if self._mActiveSM <= 0:
+                        self._mState = constants.eNotMe
+                        return self.get_state()
+                elif codingState == constants.eItsMe:
+                    self._mState = constants.eFoundIt
+                    self._mDetectedCharset = codingSM.get_coding_state_machine()  # nopep8
+                    return self.get_state()
+
+        return self.get_state()
diff --git a/lib/requests/packages/chardet/escsm.py b/lib/requests/packages/chardet/escsm.py
new file mode 100644
index 00000000..bd302b4c
--- /dev/null
+++ b/lib/requests/packages/chardet/escsm.py
@@ -0,0 +1,242 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .constants import eStart, eError, eItsMe
+
+HZ_cls = (
+1,0,0,0,0,0,0,0,  # 00 - 07
+0,0,0,0,0,0,0,0,  # 08 - 0f
+0,0,0,0,0,0,0,0,  # 10 - 17
+0,0,0,1,0,0,0,0,  # 18 - 1f
+0,0,0,0,0,0,0,0,  # 20 - 27
+0,0,0,0,0,0,0,0,  # 28 - 2f
+0,0,0,0,0,0,0,0,  # 30 - 37
+0,0,0,0,0,0,0,0,  # 38 - 3f
+0,0,0,0,0,0,0,0,  # 40 - 47
+0,0,0,0,0,0,0,0,  # 48 - 4f
+0,0,0,0,0,0,0,0,  # 50 - 57
+0,0,0,0,0,0,0,0,  # 58 - 5f
+0,0,0,0,0,0,0,0,  # 60 - 67
+0,0,0,0,0,0,0,0,  # 68 - 6f
+0,0,0,0,0,0,0,0,  # 70 - 77
+0,0,0,4,0,5,2,0,  # 78 - 7f
+1,1,1,1,1,1,1,1,  # 80 - 87
+1,1,1,1,1,1,1,1,  # 88 - 8f
+1,1,1,1,1,1,1,1,  # 90 - 97
+1,1,1,1,1,1,1,1,  # 98 - 9f
+1,1,1,1,1,1,1,1,  # a0 - a7
+1,1,1,1,1,1,1,1,  # a8 - af
+1,1,1,1,1,1,1,1,  # b0 - b7
+1,1,1,1,1,1,1,1,  # b8 - bf
+1,1,1,1,1,1,1,1,  # c0 - c7
+1,1,1,1,1,1,1,1,  # c8 - cf
+1,1,1,1,1,1,1,1,  # d0 - d7
+1,1,1,1,1,1,1,1,  # d8 - df
+1,1,1,1,1,1,1,1,  # e0 - e7
+1,1,1,1,1,1,1,1,  # e8 - ef
+1,1,1,1,1,1,1,1,  # f0 - f7
+1,1,1,1,1,1,1,1,  # f8 - ff
+)
+
+HZ_st = (
+eStart,eError,     3,eStart,eStart,eStart,eError,eError,# 00-07
+eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,# 08-0f
+eItsMe,eItsMe,eError,eError,eStart,eStart,     4,eError,# 10-17
+     5,eError,     6,eError,     5,     5,     4,eError,# 18-1f
+     4,eError,     4,     4,     4,eError,     4,eError,# 20-27
+     4,eItsMe,eStart,eStart,eStart,eStart,eStart,eStart,# 28-2f
+)
+
+HZCharLenTable = (0, 0, 0, 0, 0, 0)
+
+HZSMModel = {'classTable': HZ_cls,
+             'classFactor': 6,
+             'stateTable': HZ_st,
+             'charLenTable': HZCharLenTable,
+             'name': "HZ-GB-2312"}
+
+ISO2022CN_cls = (
+2,0,0,0,0,0,0,0,  # 00 - 07
+0,0,0,0,0,0,0,0,  # 08 - 0f
+0,0,0,0,0,0,0,0,  # 10 - 17
+0,0,0,1,0,0,0,0,  # 18 - 1f
+0,0,0,0,0,0,0,0,  # 20 - 27
+0,3,0,0,0,0,0,0,  # 28 - 2f
+0,0,0,0,0,0,0,0,  # 30 - 37
+0,0,0,0,0,0,0,0,  # 38 - 3f
+0,0,0,4,0,0,0,0,  # 40 - 47
+0,0,0,0,0,0,0,0,  # 48 - 4f
+0,0,0,0,0,0,0,0,  # 50 - 57
+0,0,0,0,0,0,0,0,  # 58 - 5f
+0,0,0,0,0,0,0,0,  # 60 - 67
+0,0,0,0,0,0,0,0,  # 68 - 6f
+0,0,0,0,0,0,0,0,  # 70 - 77
+0,0,0,0,0,0,0,0,  # 78 - 7f
+2,2,2,2,2,2,2,2,  # 80 - 87
+2,2,2,2,2,2,2,2,  # 88 - 8f
+2,2,2,2,2,2,2,2,  # 90 - 97
+2,2,2,2,2,2,2,2,  # 98 - 9f
+2,2,2,2,2,2,2,2,  # a0 - a7
+2,2,2,2,2,2,2,2,  # a8 - af
+2,2,2,2,2,2,2,2,  # b0 - b7
+2,2,2,2,2,2,2,2,  # b8 - bf
+2,2,2,2,2,2,2,2,  # c0 - c7
+2,2,2,2,2,2,2,2,  # c8 - cf
+2,2,2,2,2,2,2,2,  # d0 - d7
+2,2,2,2,2,2,2,2,  # d8 - df
+2,2,2,2,2,2,2,2,  # e0 - e7
+2,2,2,2,2,2,2,2,  # e8 - ef
+2,2,2,2,2,2,2,2,  # f0 - f7
+2,2,2,2,2,2,2,2,  # f8 - ff
+)
+
+ISO2022CN_st = (
+eStart,     3,eError,eStart,eStart,eStart,eStart,eStart,# 00-07
+eStart,eError,eError,eError,eError,eError,eError,eError,# 08-0f
+eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,# 10-17
+eItsMe,eItsMe,eItsMe,eError,eError,eError,     4,eError,# 18-1f
+eError,eError,eError,eItsMe,eError,eError,eError,eError,# 20-27
+     5,     6,eError,eError,eError,eError,eError,eError,# 28-2f
+eError,eError,eError,eItsMe,eError,eError,eError,eError,# 30-37
+eError,eError,eError,eError,eError,eItsMe,eError,eStart,# 38-3f
+)
+
+ISO2022CNCharLenTable = (0, 0, 0, 0, 0, 0, 0, 0, 0)
+
+ISO2022CNSMModel = {'classTable': ISO2022CN_cls,
+                    'classFactor': 9,
+                    'stateTable': ISO2022CN_st,
+                    'charLenTable': ISO2022CNCharLenTable,
+                    'name': "ISO-2022-CN"}
+
+ISO2022JP_cls = (
+2,0,0,0,0,0,0,0,  # 00 - 07
+0,0,0,0,0,0,2,2,  # 08 - 0f
+0,0,0,0,0,0,0,0,  # 10 - 17
+0,0,0,1,0,0,0,0,  # 18 - 1f
+0,0,0,0,7,0,0,0,  # 20 - 27
+3,0,0,0,0,0,0,0,  # 28 - 2f
+0,0,0,0,0,0,0,0,  # 30 - 37
+0,0,0,0,0,0,0,0,  # 38 - 3f
+6,0,4,0,8,0,0,0,  # 40 - 47
+0,9,5,0,0,0,0,0,  # 48 - 4f
+0,0,0,0,0,0,0,0,  # 50 - 57
+0,0,0,0,0,0,0,0,  # 58 - 5f
+0,0,0,0,0,0,0,0,  # 60 - 67
+0,0,0,0,0,0,0,0,  # 68 - 6f
+0,0,0,0,0,0,0,0,  # 70 - 77
+0,0,0,0,0,0,0,0,  # 78 - 7f
+2,2,2,2,2,2,2,2,  # 80 - 87
+2,2,2,2,2,2,2,2,  # 88 - 8f
+2,2,2,2,2,2,2,2,  # 90 - 97
+2,2,2,2,2,2,2,2,  # 98 - 9f
+2,2,2,2,2,2,2,2,  # a0 - a7
+2,2,2,2,2,2,2,2,  # a8 - af
+2,2,2,2,2,2,2,2,  # b0 - b7
+2,2,2,2,2,2,2,2,  # b8 - bf
+2,2,2,2,2,2,2,2,  # c0 - c7
+2,2,2,2,2,2,2,2,  # c8 - cf
+2,2,2,2,2,2,2,2,  # d0 - d7
+2,2,2,2,2,2,2,2,  # d8 - df
+2,2,2,2,2,2,2,2,  # e0 - e7
+2,2,2,2,2,2,2,2,  # e8 - ef
+2,2,2,2,2,2,2,2,  # f0 - f7
+2,2,2,2,2,2,2,2,  # f8 - ff
+)
+
+ISO2022JP_st = (
+eStart,     3,eError,eStart,eStart,eStart,eStart,eStart,# 00-07
+eStart,eStart,eError,eError,eError,eError,eError,eError,# 08-0f
+eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,# 10-17
+eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,eError,# 18-1f
+eError,     5,eError,eError,eError,     4,eError,eError,# 20-27
+eError,eError,eError,     6,eItsMe,eError,eItsMe,eError,# 28-2f
+eError,eError,eError,eError,eError,eError,eItsMe,eItsMe,# 30-37
+eError,eError,eError,eItsMe,eError,eError,eError,eError,# 38-3f
+eError,eError,eError,eError,eItsMe,eError,eStart,eStart,# 40-47
+)
+
+ISO2022JPCharLenTable = (0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+
+ISO2022JPSMModel = {'classTable': ISO2022JP_cls,
+                    'classFactor': 10,
+                    'stateTable': ISO2022JP_st,
+                    'charLenTable': ISO2022JPCharLenTable,
+                    'name': "ISO-2022-JP"}
+
+ISO2022KR_cls = (
+2,0,0,0,0,0,0,0,  # 00 - 07
+0,0,0,0,0,0,0,0,  # 08 - 0f
+0,0,0,0,0,0,0,0,  # 10 - 17
+0,0,0,1,0,0,0,0,  # 18 - 1f
+0,0,0,0,3,0,0,0,  # 20 - 27
+0,4,0,0,0,0,0,0,  # 28 - 2f
+0,0,0,0,0,0,0,0,  # 30 - 37
+0,0,0,0,0,0,0,0,  # 38 - 3f
+0,0,0,5,0,0,0,0,  # 40 - 47
+0,0,0,0,0,0,0,0,  # 48 - 4f
+0,0,0,0,0,0,0,0,  # 50 - 57
+0,0,0,0,0,0,0,0,  # 58 - 5f
+0,0,0,0,0,0,0,0,  # 60 - 67
+0,0,0,0,0,0,0,0,  # 68 - 6f
+0,0,0,0,0,0,0,0,  # 70 - 77
+0,0,0,0,0,0,0,0,  # 78 - 7f
+2,2,2,2,2,2,2,2,  # 80 - 87
+2,2,2,2,2,2,2,2,  # 88 - 8f
+2,2,2,2,2,2,2,2,  # 90 - 97
+2,2,2,2,2,2,2,2,  # 98 - 9f
+2,2,2,2,2,2,2,2,  # a0 - a7
+2,2,2,2,2,2,2,2,  # a8 - af
+2,2,2,2,2,2,2,2,  # b0 - b7
+2,2,2,2,2,2,2,2,  # b8 - bf
+2,2,2,2,2,2,2,2,  # c0 - c7
+2,2,2,2,2,2,2,2,  # c8 - cf
+2,2,2,2,2,2,2,2,  # d0 - d7
+2,2,2,2,2,2,2,2,  # d8 - df
+2,2,2,2,2,2,2,2,  # e0 - e7
+2,2,2,2,2,2,2,2,  # e8 - ef
+2,2,2,2,2,2,2,2,  # f0 - f7
+2,2,2,2,2,2,2,2,  # f8 - ff
+)
+
+ISO2022KR_st = (
+eStart,     3,eError,eStart,eStart,eStart,eError,eError,# 00-07
+eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,# 08-0f
+eItsMe,eItsMe,eError,eError,eError,     4,eError,eError,# 10-17
+eError,eError,eError,eError,     5,eError,eError,eError,# 18-1f
+eError,eError,eError,eItsMe,eStart,eStart,eStart,eStart,# 20-27
+)
+
+ISO2022KRCharLenTable = (0, 0, 0, 0, 0, 0)
+
+ISO2022KRSMModel = {'classTable': ISO2022KR_cls,
+                    'classFactor': 6,
+                    'stateTable': ISO2022KR_st,
+                    'charLenTable': ISO2022KRCharLenTable,
+                    'name': "ISO-2022-KR"}
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/eucjpprober.py b/lib/requests/packages/chardet/eucjpprober.py
new file mode 100644
index 00000000..8e64fdcc
--- /dev/null
+++ b/lib/requests/packages/chardet/eucjpprober.py
@@ -0,0 +1,90 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+import sys
+from . import constants
+from .mbcharsetprober import MultiByteCharSetProber
+from .codingstatemachine import CodingStateMachine
+from .chardistribution import EUCJPDistributionAnalysis
+from .jpcntx import EUCJPContextAnalysis
+from .mbcssm import EUCJPSMModel
+
+
+class EUCJPProber(MultiByteCharSetProber):
+    def __init__(self):
+        MultiByteCharSetProber.__init__(self)
+        self._mCodingSM = CodingStateMachine(EUCJPSMModel)
+        self._mDistributionAnalyzer = EUCJPDistributionAnalysis()
+        self._mContextAnalyzer = EUCJPContextAnalysis()
+        self.reset()
+
+    def reset(self):
+        MultiByteCharSetProber.reset(self)
+        self._mContextAnalyzer.reset()
+
+    def get_charset_name(self):
+        return "EUC-JP"
+
+    def feed(self, aBuf):
+        aLen = len(aBuf)
+        for i in range(0, aLen):
+            # PY3K: aBuf is a byte array, so aBuf[i] is an int, not a byte
+            codingState = self._mCodingSM.next_state(aBuf[i])
+            if codingState == constants.eError:
+                if constants._debug:
+                    sys.stderr.write(self.get_charset_name()
+                                     + ' prober hit error at byte ' + str(i)
+                                     + '\n')
+                self._mState = constants.eNotMe
+                break
+            elif codingState == constants.eItsMe:
+                self._mState = constants.eFoundIt
+                break
+            elif codingState == constants.eStart:
+                charLen = self._mCodingSM.get_current_charlen()
+                if i == 0:
+                    self._mLastChar[1] = aBuf[0]
+                    self._mContextAnalyzer.feed(self._mLastChar, charLen)
+                    self._mDistributionAnalyzer.feed(self._mLastChar, charLen)
+                else:
+                    self._mContextAnalyzer.feed(aBuf[i - 1:i + 1], charLen)
+                    self._mDistributionAnalyzer.feed(aBuf[i - 1:i + 1],
+                                                     charLen)
+
+        self._mLastChar[0] = aBuf[aLen - 1]
+
+        if self.get_state() == constants.eDetecting:
+            if (self._mContextAnalyzer.got_enough_data() and
+               (self.get_confidence() > constants.SHORTCUT_THRESHOLD)):
+                self._mState = constants.eFoundIt
+
+        return self.get_state()
+
+    def get_confidence(self):
+        contxtCf = self._mContextAnalyzer.get_confidence()
+        distribCf = self._mDistributionAnalyzer.get_confidence()
+        return max(contxtCf, distribCf)
diff --git a/lib/requests/packages/chardet/euckrfreq.py b/lib/requests/packages/chardet/euckrfreq.py
new file mode 100644
index 00000000..a179e4c2
--- /dev/null
+++ b/lib/requests/packages/chardet/euckrfreq.py
@@ -0,0 +1,596 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+# Sampling from about 20M text materials include literature and computer technology
+
+# 128  --> 0.79
+# 256  --> 0.92
+# 512  --> 0.986
+# 1024 --> 0.99944
+# 2048 --> 0.99999
+#
+# Idea Distribution Ratio = 0.98653 / (1-0.98653) = 73.24
+# Random Distribution Ration = 512 / (2350-512) = 0.279.
+# 
+# Typical Distribution Ratio  
+
+EUCKR_TYPICAL_DISTRIBUTION_RATIO = 6.0
+
+EUCKR_TABLE_SIZE = 2352
+
+# Char to FreqOrder table , 
+EUCKRCharToFreqOrder = ( \
+  13, 130, 120,1396, 481,1719,1720, 328, 609, 212,1721, 707, 400, 299,1722,  87,
+1397,1723, 104, 536,1117,1203,1724,1267, 685,1268, 508,1725,1726,1727,1728,1398,
+1399,1729,1730,1731, 141, 621, 326,1057, 368,1732, 267, 488,  20,1733,1269,1734,
+ 945,1400,1735,  47, 904,1270,1736,1737, 773, 248,1738, 409, 313, 786, 429,1739,
+ 116, 987, 813,1401, 683,  75,1204, 145,1740,1741,1742,1743,  16, 847, 667, 622,
+ 708,1744,1745,1746, 966, 787, 304, 129,1747,  60, 820, 123, 676,1748,1749,1750,
+1751, 617,1752, 626,1753,1754,1755,1756, 653,1757,1758,1759,1760,1761,1762, 856,
+ 344,1763,1764,1765,1766,  89, 401, 418, 806, 905, 848,1767,1768,1769, 946,1205,
+ 709,1770,1118,1771, 241,1772,1773,1774,1271,1775, 569,1776, 999,1777,1778,1779,
+1780, 337, 751,1058,  28, 628, 254,1781, 177, 906, 270, 349, 891,1079,1782,  19,
+1783, 379,1784, 315,1785, 629, 754,1402, 559,1786, 636, 203,1206,1787, 710, 567,
+1788, 935, 814,1789,1790,1207, 766, 528,1791,1792,1208,1793,1794,1795,1796,1797,
+1403,1798,1799, 533,1059,1404,1405,1156,1406, 936, 884,1080,1800, 351,1801,1802,
+1803,1804,1805, 801,1806,1807,1808,1119,1809,1157, 714, 474,1407,1810, 298, 899,
+ 885,1811,1120, 802,1158,1812, 892,1813,1814,1408, 659,1815,1816,1121,1817,1818,
+1819,1820,1821,1822, 319,1823, 594, 545,1824, 815, 937,1209,1825,1826, 573,1409,
+1022,1827,1210,1828,1829,1830,1831,1832,1833, 556, 722, 807,1122,1060,1834, 697,
+1835, 900, 557, 715,1836,1410, 540,1411, 752,1159, 294, 597,1211, 976, 803, 770,
+1412,1837,1838,  39, 794,1413, 358,1839, 371, 925,1840, 453, 661, 788, 531, 723,
+ 544,1023,1081, 869,  91,1841, 392, 430, 790, 602,1414, 677,1082, 457,1415,1416,
+1842,1843, 475, 327,1024,1417, 795, 121,1844, 733, 403,1418,1845,1846,1847, 300,
+ 119, 711,1212, 627,1848,1272, 207,1849,1850, 796,1213, 382,1851, 519,1852,1083,
+ 893,1853,1854,1855, 367, 809, 487, 671,1856, 663,1857,1858, 956, 471, 306, 857,
+1859,1860,1160,1084,1861,1862,1863,1864,1865,1061,1866,1867,1868,1869,1870,1871,
+ 282,  96, 574,1872, 502,1085,1873,1214,1874, 907,1875,1876, 827, 977,1419,1420,
+1421, 268,1877,1422,1878,1879,1880, 308,1881,   2, 537,1882,1883,1215,1884,1885,
+ 127, 791,1886,1273,1423,1887,  34, 336, 404, 643,1888, 571, 654, 894, 840,1889,
+   0, 886,1274, 122, 575, 260, 908, 938,1890,1275, 410, 316,1891,1892, 100,1893,
+1894,1123,  48,1161,1124,1025,1895, 633, 901,1276,1896,1897, 115, 816,1898, 317,
+1899, 694,1900, 909, 734,1424, 572, 866,1425, 691,  85, 524,1010, 543, 394, 841,
+1901,1902,1903,1026,1904,1905,1906,1907,1908,1909,  30, 451, 651, 988, 310,1910,
+1911,1426, 810,1216,  93,1912,1913,1277,1217,1914, 858, 759,  45,  58, 181, 610,
+ 269,1915,1916, 131,1062, 551, 443,1000, 821,1427, 957, 895,1086,1917,1918, 375,
+1919, 359,1920, 687,1921, 822,1922, 293,1923,1924,  40, 662, 118, 692,  29, 939,
+ 887, 640, 482, 174,1925,  69,1162, 728,1428, 910,1926,1278,1218,1279, 386, 870,
+ 217, 854,1163, 823,1927,1928,1929,1930, 834,1931,  78,1932, 859,1933,1063,1934,
+1935,1936,1937, 438,1164, 208, 595,1938,1939,1940,1941,1219,1125,1942, 280, 888,
+1429,1430,1220,1431,1943,1944,1945,1946,1947,1280, 150, 510,1432,1948,1949,1950,
+1951,1952,1953,1954,1011,1087,1955,1433,1043,1956, 881,1957, 614, 958,1064,1065,
+1221,1958, 638,1001, 860, 967, 896,1434, 989, 492, 553,1281,1165,1959,1282,1002,
+1283,1222,1960,1961,1962,1963,  36, 383, 228, 753, 247, 454,1964, 876, 678,1965,
+1966,1284, 126, 464, 490, 835, 136, 672, 529, 940,1088,1435, 473,1967,1968, 467,
+  50, 390, 227, 587, 279, 378, 598, 792, 968, 240, 151, 160, 849, 882,1126,1285,
+ 639,1044, 133, 140, 288, 360, 811, 563,1027, 561, 142, 523,1969,1970,1971,   7,
+ 103, 296, 439, 407, 506, 634, 990,1972,1973,1974,1975, 645,1976,1977,1978,1979,
+1980,1981, 236,1982,1436,1983,1984,1089, 192, 828, 618, 518,1166, 333,1127,1985,
+ 818,1223,1986,1987,1988,1989,1990,1991,1992,1993, 342,1128,1286, 746, 842,1994,
+1995, 560, 223,1287,  98,   8, 189, 650, 978,1288,1996,1437,1997,  17, 345, 250,
+ 423, 277, 234, 512, 226,  97, 289,  42, 167,1998, 201,1999,2000, 843, 836, 824,
+ 532, 338, 783,1090, 182, 576, 436,1438,1439, 527, 500,2001, 947, 889,2002,2003,
+2004,2005, 262, 600, 314, 447,2006, 547,2007, 693, 738,1129,2008,  71,1440, 745,
+ 619, 688,2009, 829,2010,2011, 147,2012,  33, 948,2013,2014,  74, 224,2015,  61,
+ 191, 918, 399, 637,2016,1028,1130, 257, 902,2017,2018,2019,2020,2021,2022,2023,
+2024,2025,2026, 837,2027,2028,2029,2030, 179, 874, 591,  52, 724, 246,2031,2032,
+2033,2034,1167, 969,2035,1289, 630, 605, 911,1091,1168,2036,2037,2038,1441, 912,
+2039, 623,2040,2041, 253,1169,1290,2042,1442, 146, 620, 611, 577, 433,2043,1224,
+ 719,1170, 959, 440, 437, 534,  84, 388, 480,1131, 159, 220, 198, 679,2044,1012,
+ 819,1066,1443, 113,1225, 194, 318,1003,1029,2045,2046,2047,2048,1067,2049,2050,
+2051,2052,2053,  59, 913, 112,2054, 632,2055, 455, 144, 739,1291,2056, 273, 681,
+ 499,2057, 448,2058,2059, 760,2060,2061, 970, 384, 169, 245,1132,2062,2063, 414,
+1444,2064,2065,  41, 235,2066, 157, 252, 877, 568, 919, 789, 580,2067, 725,2068,
+2069,1292,2070,2071,1445,2072,1446,2073,2074,  55, 588,  66,1447, 271,1092,2075,
+1226,2076, 960,1013, 372,2077,2078,2079,2080,2081,1293,2082,2083,2084,2085, 850,
+2086,2087,2088,2089,2090, 186,2091,1068, 180,2092,2093,2094, 109,1227, 522, 606,
+2095, 867,1448,1093, 991,1171, 926, 353,1133,2096, 581,2097,2098,2099,1294,1449,
+1450,2100, 596,1172,1014,1228,2101,1451,1295,1173,1229,2102,2103,1296,1134,1452,
+ 949,1135,2104,2105,1094,1453,1454,1455,2106,1095,2107,2108,2109,2110,2111,2112,
+2113,2114,2115,2116,2117, 804,2118,2119,1230,1231, 805,1456, 405,1136,2120,2121,
+2122,2123,2124, 720, 701,1297, 992,1457, 927,1004,2125,2126,2127,2128,2129,2130,
+  22, 417,2131, 303,2132, 385,2133, 971, 520, 513,2134,1174,  73,1096, 231, 274,
+ 962,1458, 673,2135,1459,2136, 152,1137,2137,2138,2139,2140,1005,1138,1460,1139,
+2141,2142,2143,2144,  11, 374, 844,2145, 154,1232,  46,1461,2146, 838, 830, 721,
+1233, 106,2147,  90, 428, 462, 578, 566,1175, 352,2148,2149, 538,1234, 124,1298,
+2150,1462, 761, 565,2151, 686,2152, 649,2153,  72, 173,2154, 460, 415,2155,1463,
+2156,1235, 305,2157,2158,2159,2160,2161,2162, 579,2163,2164,2165,2166,2167, 747,
+2168,2169,2170,2171,1464, 669,2172,2173,2174,2175,2176,1465,2177,  23, 530, 285,
+2178, 335, 729,2179, 397,2180,2181,2182,1030,2183,2184, 698,2185,2186, 325,2187,
+2188, 369,2189, 799,1097,1015, 348,2190,1069, 680,2191, 851,1466,2192,2193,  10,
+2194, 613, 424,2195, 979, 108, 449, 589,  27, 172,  81,1031,  80, 774, 281, 350,
+1032, 525, 301, 582,1176,2196, 674,1045,2197,2198,1467, 730, 762,2199,2200,2201,
+2202,1468,2203, 993,2204,2205, 266,1070, 963,1140,2206,2207,2208, 664,1098, 972,
+2209,2210,2211,1177,1469,1470, 871,2212,2213,2214,2215,2216,1471,2217,2218,2219,
+2220,2221,2222,2223,2224,2225,2226,2227,1472,1236,2228,2229,2230,2231,2232,2233,
+2234,2235,1299,2236,2237, 200,2238, 477, 373,2239,2240, 731, 825, 777,2241,2242,
+2243, 521, 486, 548,2244,2245,2246,1473,1300,  53, 549, 137, 875,  76, 158,2247,
+1301,1474, 469, 396,1016, 278, 712,2248, 321, 442, 503, 767, 744, 941,1237,1178,
+1475,2249,  82, 178,1141,1179, 973,2250,1302,2251, 297,2252,2253, 570,2254,2255,
+2256,  18, 450, 206,2257, 290, 292,1142,2258, 511, 162,  99, 346, 164, 735,2259,
+1476,1477,   4, 554, 343, 798,1099,2260,1100,2261,  43, 171,1303, 139, 215,2262,
+2263, 717, 775,2264,1033, 322, 216,2265, 831,2266, 149,2267,1304,2268,2269, 702,
+1238, 135, 845, 347, 309,2270, 484,2271, 878, 655, 238,1006,1478,2272,  67,2273,
+ 295,2274,2275, 461,2276, 478, 942, 412,2277,1034,2278,2279,2280, 265,2281, 541,
+2282,2283,2284,2285,2286,  70, 852,1071,2287,2288,2289,2290,  21,  56, 509, 117,
+ 432,2291,2292, 331, 980, 552,1101, 148, 284, 105, 393,1180,1239, 755,2293, 187,
+2294,1046,1479,2295, 340,2296,  63,1047, 230,2297,2298,1305, 763,1306, 101, 800,
+ 808, 494,2299,2300,2301, 903,2302,  37,1072,  14,   5,2303,  79, 675,2304, 312,
+2305,2306,2307,2308,2309,1480,   6,1307,2310,2311,2312,   1, 470,  35,  24, 229,
+2313, 695, 210,  86, 778,  15, 784, 592, 779,  32,  77, 855, 964,2314, 259,2315,
+ 501, 380,2316,2317,  83, 981, 153, 689,1308,1481,1482,1483,2318,2319, 716,1484,
+2320,2321,2322,2323,2324,2325,1485,2326,2327, 128,  57,  68, 261,1048, 211, 170,
+1240,  31,2328,  51, 435, 742,2329,2330,2331, 635,2332, 264, 456,2333,2334,2335,
+ 425,2336,1486, 143, 507, 263, 943,2337, 363, 920,1487, 256,1488,1102, 243, 601,
+1489,2338,2339,2340,2341,2342,2343,2344, 861,2345,2346,2347,2348,2349,2350, 395,
+2351,1490,1491,  62, 535, 166, 225,2352,2353, 668, 419,1241, 138, 604, 928,2354,
+1181,2355,1492,1493,2356,2357,2358,1143,2359, 696,2360, 387, 307,1309, 682, 476,
+2361,2362, 332,  12, 222, 156,2363, 232,2364, 641, 276, 656, 517,1494,1495,1035,
+ 416, 736,1496,2365,1017, 586,2366,2367,2368,1497,2369, 242,2370,2371,2372,1498,
+2373, 965, 713,2374,2375,2376,2377, 740, 982,1499, 944,1500,1007,2378,2379,1310,
+1501,2380,2381,2382, 785, 329,2383,2384,1502,2385,2386,2387, 932,2388,1503,2389,
+2390,2391,2392,1242,2393,2394,2395,2396,2397, 994, 950,2398,2399,2400,2401,1504,
+1311,2402,2403,2404,2405,1049, 749,2406,2407, 853, 718,1144,1312,2408,1182,1505,
+2409,2410, 255, 516, 479, 564, 550, 214,1506,1507,1313, 413, 239, 444, 339,1145,
+1036,1508,1509,1314,1037,1510,1315,2411,1511,2412,2413,2414, 176, 703, 497, 624,
+ 593, 921, 302,2415, 341, 165,1103,1512,2416,1513,2417,2418,2419, 376,2420, 700,
+2421,2422,2423, 258, 768,1316,2424,1183,2425, 995, 608,2426,2427,2428,2429, 221,
+2430,2431,2432,2433,2434,2435,2436,2437, 195, 323, 726, 188, 897, 983,1317, 377,
+ 644,1050, 879,2438, 452,2439,2440,2441,2442,2443,2444, 914,2445,2446,2447,2448,
+ 915, 489,2449,1514,1184,2450,2451, 515,  64, 427, 495,2452, 583,2453, 483, 485,
+1038, 562, 213,1515, 748, 666,2454,2455,2456,2457, 334,2458, 780, 996,1008, 705,
+1243,2459,2460,2461,2462,2463, 114,2464, 493,1146, 366, 163,1516, 961,1104,2465,
+ 291,2466,1318,1105,2467,1517, 365,2468, 355, 951,1244,2469,1319,2470, 631,2471,
+2472, 218,1320, 364, 320, 756,1518,1519,1321,1520,1322,2473,2474,2475,2476, 997,
+2477,2478,2479,2480, 665,1185,2481, 916,1521,2482,2483,2484, 584, 684,2485,2486,
+ 797,2487,1051,1186,2488,2489,2490,1522,2491,2492, 370,2493,1039,1187,  65,2494,
+ 434, 205, 463,1188,2495, 125, 812, 391, 402, 826, 699, 286, 398, 155, 781, 771,
+ 585,2496, 590, 505,1073,2497, 599, 244, 219, 917,1018, 952, 646,1523,2498,1323,
+2499,2500,  49, 984, 354, 741,2501, 625,2502,1324,2503,1019, 190, 357, 757, 491,
+  95, 782, 868,2504,2505,2506,2507,2508,2509, 134,1524,1074, 422,1525, 898,2510,
+ 161,2511,2512,2513,2514, 769,2515,1526,2516,2517, 411,1325,2518, 472,1527,2519,
+2520,2521,2522,2523,2524, 985,2525,2526,2527,2528,2529,2530, 764,2531,1245,2532,
+2533,  25, 204, 311,2534, 496,2535,1052,2536,2537,2538,2539,2540,2541,2542, 199,
+ 704, 504, 468, 758, 657,1528, 196,  44, 839,1246, 272, 750,2543, 765, 862,2544,
+2545,1326,2546, 132, 615, 933,2547, 732,2548,2549,2550,1189,1529,2551, 283,1247,
+1053, 607, 929,2552,2553,2554, 930, 183, 872, 616,1040,1147,2555,1148,1020, 441,
+ 249,1075,2556,2557,2558, 466, 743,2559,2560,2561,  92, 514, 426, 420, 526,2562,
+2563,2564,2565,2566,2567,2568, 185,2569,2570,2571,2572, 776,1530, 658,2573, 362,
+2574, 361, 922,1076, 793,2575,2576,2577,2578,2579,2580,1531, 251,2581,2582,2583,
+2584,1532,  54, 612, 237,1327,2585,2586, 275, 408, 647, 111,2587,1533,1106, 465,
+   3, 458,   9,  38,2588, 107, 110, 890, 209,  26, 737, 498,2589,1534,2590, 431,
+ 202,  88,1535, 356, 287,1107, 660,1149,2591, 381,1536, 986,1150, 445,1248,1151,
+ 974,2592,2593, 846,2594, 446, 953, 184,1249,1250, 727,2595, 923, 193, 883,2596,
+2597,2598, 102, 324, 539, 817,2599, 421,1041,2600, 832,2601,  94, 175, 197, 406,
+2602, 459,2603,2604,2605,2606,2607, 330, 555,2608,2609,2610, 706,1108, 389,2611,
+2612,2613,2614, 233,2615, 833, 558, 931, 954,1251,2616,2617,1537, 546,2618,2619,
+1009,2620,2621,2622,1538, 690,1328,2623, 955,2624,1539,2625,2626, 772,2627,2628,
+2629,2630,2631, 924, 648, 863, 603,2632,2633, 934,1540, 864, 865,2634, 642,1042,
+ 670,1190,2635,2636,2637,2638, 168,2639, 652, 873, 542,1054,1541,2640,2641,2642,  # 512, 256
+#Everything below is of no interest for detection purpose
+2643,2644,2645,2646,2647,2648,2649,2650,2651,2652,2653,2654,2655,2656,2657,2658,
+2659,2660,2661,2662,2663,2664,2665,2666,2667,2668,2669,2670,2671,2672,2673,2674,
+2675,2676,2677,2678,2679,2680,2681,2682,2683,2684,2685,2686,2687,2688,2689,2690,
+2691,2692,2693,2694,2695,2696,2697,2698,2699,1542, 880,2700,2701,2702,2703,2704,
+2705,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,
+2721,2722,2723,2724,2725,1543,2726,2727,2728,2729,2730,2731,2732,1544,2733,2734,
+2735,2736,2737,2738,2739,2740,2741,2742,2743,2744,2745,2746,2747,2748,2749,2750,
+2751,2752,2753,2754,1545,2755,2756,2757,2758,2759,2760,2761,2762,2763,2764,2765,
+2766,1546,2767,1547,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,
+2780,2781,2782,2783,2784,2785,2786,1548,2787,2788,2789,1109,2790,2791,2792,2793,
+2794,2795,2796,2797,2798,2799,2800,2801,2802,2803,2804,2805,2806,2807,2808,2809,
+2810,2811,2812,1329,2813,2814,2815,2816,2817,2818,2819,2820,2821,2822,2823,2824,
+2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2835,2836,2837,2838,2839,2840,
+2841,2842,2843,2844,2845,2846,2847,2848,2849,2850,2851,2852,2853,2854,2855,2856,
+1549,2857,2858,2859,2860,1550,2861,2862,1551,2863,2864,2865,2866,2867,2868,2869,
+2870,2871,2872,2873,2874,1110,1330,2875,2876,2877,2878,2879,2880,2881,2882,2883,
+2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,2898,2899,
+2900,2901,2902,2903,2904,2905,2906,2907,2908,2909,2910,2911,2912,2913,2914,2915,
+2916,2917,2918,2919,2920,2921,2922,2923,2924,2925,2926,2927,2928,2929,2930,1331,
+2931,2932,2933,2934,2935,2936,2937,2938,2939,2940,2941,2942,2943,1552,2944,2945,
+2946,2947,2948,2949,2950,2951,2952,2953,2954,2955,2956,2957,2958,2959,2960,2961,
+2962,2963,2964,1252,2965,2966,2967,2968,2969,2970,2971,2972,2973,2974,2975,2976,
+2977,2978,2979,2980,2981,2982,2983,2984,2985,2986,2987,2988,2989,2990,2991,2992,
+2993,2994,2995,2996,2997,2998,2999,3000,3001,3002,3003,3004,3005,3006,3007,3008,
+3009,3010,3011,3012,1553,3013,3014,3015,3016,3017,1554,3018,1332,3019,3020,3021,
+3022,3023,3024,3025,3026,3027,3028,3029,3030,3031,3032,3033,3034,3035,3036,3037,
+3038,3039,3040,3041,3042,3043,3044,3045,3046,3047,3048,3049,3050,1555,3051,3052,
+3053,1556,1557,3054,3055,3056,3057,3058,3059,3060,3061,3062,3063,3064,3065,3066,
+3067,1558,3068,3069,3070,3071,3072,3073,3074,3075,3076,1559,3077,3078,3079,3080,
+3081,3082,3083,1253,3084,3085,3086,3087,3088,3089,3090,3091,3092,3093,3094,3095,
+3096,3097,3098,3099,3100,3101,3102,3103,3104,3105,3106,3107,3108,1152,3109,3110,
+3111,3112,3113,1560,3114,3115,3116,3117,1111,3118,3119,3120,3121,3122,3123,3124,
+3125,3126,3127,3128,3129,3130,3131,3132,3133,3134,3135,3136,3137,3138,3139,3140,
+3141,3142,3143,3144,3145,3146,3147,3148,3149,3150,3151,3152,3153,3154,3155,3156,
+3157,3158,3159,3160,3161,3162,3163,3164,3165,3166,3167,3168,3169,3170,3171,3172,
+3173,3174,3175,3176,1333,3177,3178,3179,3180,3181,3182,3183,3184,3185,3186,3187,
+3188,3189,1561,3190,3191,1334,3192,3193,3194,3195,3196,3197,3198,3199,3200,3201,
+3202,3203,3204,3205,3206,3207,3208,3209,3210,3211,3212,3213,3214,3215,3216,3217,
+3218,3219,3220,3221,3222,3223,3224,3225,3226,3227,3228,3229,3230,3231,3232,3233,
+3234,1562,3235,3236,3237,3238,3239,3240,3241,3242,3243,3244,3245,3246,3247,3248,
+3249,3250,3251,3252,3253,3254,3255,3256,3257,3258,3259,3260,3261,3262,3263,3264,
+3265,3266,3267,3268,3269,3270,3271,3272,3273,3274,3275,3276,3277,1563,3278,3279,
+3280,3281,3282,3283,3284,3285,3286,3287,3288,3289,3290,3291,3292,3293,3294,3295,
+3296,3297,3298,3299,3300,3301,3302,3303,3304,3305,3306,3307,3308,3309,3310,3311,
+3312,3313,3314,3315,3316,3317,3318,3319,3320,3321,3322,3323,3324,3325,3326,3327,
+3328,3329,3330,3331,3332,3333,3334,3335,3336,3337,3338,3339,3340,3341,3342,3343,
+3344,3345,3346,3347,3348,3349,3350,3351,3352,3353,3354,3355,3356,3357,3358,3359,
+3360,3361,3362,3363,3364,1335,3365,3366,3367,3368,3369,3370,3371,3372,3373,3374,
+3375,3376,3377,3378,3379,3380,3381,3382,3383,3384,3385,3386,3387,1336,3388,3389,
+3390,3391,3392,3393,3394,3395,3396,3397,3398,3399,3400,3401,3402,3403,3404,3405,
+3406,3407,3408,3409,3410,3411,3412,3413,3414,1337,3415,3416,3417,3418,3419,1338,
+3420,3421,3422,1564,1565,3423,3424,3425,3426,3427,3428,3429,3430,3431,1254,3432,
+3433,3434,1339,3435,3436,3437,3438,3439,1566,3440,3441,3442,3443,3444,3445,3446,
+3447,3448,3449,3450,3451,3452,3453,3454,1255,3455,3456,3457,3458,3459,1567,1191,
+3460,1568,1569,3461,3462,3463,1570,3464,3465,3466,3467,3468,1571,3469,3470,3471,
+3472,3473,1572,3474,3475,3476,3477,3478,3479,3480,3481,3482,3483,3484,3485,3486,
+1340,3487,3488,3489,3490,3491,3492,1021,3493,3494,3495,3496,3497,3498,1573,3499,
+1341,3500,3501,3502,3503,3504,3505,3506,3507,3508,3509,3510,3511,1342,3512,3513,
+3514,3515,3516,1574,1343,3517,3518,3519,1575,3520,1576,3521,3522,3523,3524,3525,
+3526,3527,3528,3529,3530,3531,3532,3533,3534,3535,3536,3537,3538,3539,3540,3541,
+3542,3543,3544,3545,3546,3547,3548,3549,3550,3551,3552,3553,3554,3555,3556,3557,
+3558,3559,3560,3561,3562,3563,3564,3565,3566,3567,3568,3569,3570,3571,3572,3573,
+3574,3575,3576,3577,3578,3579,3580,1577,3581,3582,1578,3583,3584,3585,3586,3587,
+3588,3589,3590,3591,3592,3593,3594,3595,3596,3597,3598,3599,3600,3601,3602,3603,
+3604,1579,3605,3606,3607,3608,3609,3610,3611,3612,3613,3614,3615,3616,3617,3618,
+3619,3620,3621,3622,3623,3624,3625,3626,3627,3628,3629,1580,3630,3631,1581,3632,
+3633,3634,3635,3636,3637,3638,3639,3640,3641,3642,3643,3644,3645,3646,3647,3648,
+3649,3650,3651,3652,3653,3654,3655,3656,1582,3657,3658,3659,3660,3661,3662,3663,
+3664,3665,3666,3667,3668,3669,3670,3671,3672,3673,3674,3675,3676,3677,3678,3679,
+3680,3681,3682,3683,3684,3685,3686,3687,3688,3689,3690,3691,3692,3693,3694,3695,
+3696,3697,3698,3699,3700,1192,3701,3702,3703,3704,1256,3705,3706,3707,3708,1583,
+1257,3709,3710,3711,3712,3713,3714,3715,3716,1584,3717,3718,3719,3720,3721,3722,
+3723,3724,3725,3726,3727,3728,3729,3730,3731,3732,3733,3734,3735,3736,3737,3738,
+3739,3740,3741,3742,3743,3744,3745,1344,3746,3747,3748,3749,3750,3751,3752,3753,
+3754,3755,3756,1585,3757,3758,3759,3760,3761,3762,3763,3764,3765,3766,1586,3767,
+3768,3769,3770,3771,3772,3773,3774,3775,3776,3777,3778,1345,3779,3780,3781,3782,
+3783,3784,3785,3786,3787,3788,3789,3790,3791,3792,3793,3794,3795,1346,1587,3796,
+3797,1588,3798,3799,3800,3801,3802,3803,3804,3805,3806,1347,3807,3808,3809,3810,
+3811,1589,3812,3813,3814,3815,3816,3817,3818,3819,3820,3821,1590,3822,3823,1591,
+1348,3824,3825,3826,3827,3828,3829,3830,1592,3831,3832,1593,3833,3834,3835,3836,
+3837,3838,3839,3840,3841,3842,3843,3844,1349,3845,3846,3847,3848,3849,3850,3851,
+3852,3853,3854,3855,3856,3857,3858,1594,3859,3860,3861,3862,3863,3864,3865,3866,
+3867,3868,3869,1595,3870,3871,3872,3873,1596,3874,3875,3876,3877,3878,3879,3880,
+3881,3882,3883,3884,3885,3886,1597,3887,3888,3889,3890,3891,3892,3893,3894,3895,
+1598,3896,3897,3898,1599,1600,3899,1350,3900,1351,3901,3902,1352,3903,3904,3905,
+3906,3907,3908,3909,3910,3911,3912,3913,3914,3915,3916,3917,3918,3919,3920,3921,
+3922,3923,3924,1258,3925,3926,3927,3928,3929,3930,3931,1193,3932,1601,3933,3934,
+3935,3936,3937,3938,3939,3940,3941,3942,3943,1602,3944,3945,3946,3947,3948,1603,
+3949,3950,3951,3952,3953,3954,3955,3956,3957,3958,3959,3960,3961,3962,3963,3964,
+3965,1604,3966,3967,3968,3969,3970,3971,3972,3973,3974,3975,3976,3977,1353,3978,
+3979,3980,3981,3982,3983,3984,3985,3986,3987,3988,3989,3990,3991,1354,3992,3993,
+3994,3995,3996,3997,3998,3999,4000,4001,4002,4003,4004,4005,4006,4007,4008,4009,
+4010,4011,4012,4013,4014,4015,4016,4017,4018,4019,4020,4021,4022,4023,1355,4024,
+4025,4026,4027,4028,4029,4030,4031,4032,4033,4034,4035,4036,4037,4038,4039,4040,
+1605,4041,4042,4043,4044,4045,4046,4047,4048,4049,4050,4051,4052,4053,4054,4055,
+4056,4057,4058,4059,4060,1606,4061,4062,4063,4064,1607,4065,4066,4067,4068,4069,
+4070,4071,4072,4073,4074,4075,4076,1194,4077,4078,1608,4079,4080,4081,4082,4083,
+4084,4085,4086,4087,1609,4088,4089,4090,4091,4092,4093,4094,4095,4096,4097,4098,
+4099,4100,4101,4102,4103,4104,4105,4106,4107,4108,1259,4109,4110,4111,4112,4113,
+4114,4115,4116,4117,4118,4119,4120,4121,4122,4123,4124,1195,4125,4126,4127,1610,
+4128,4129,4130,4131,4132,4133,4134,4135,4136,4137,1356,4138,4139,4140,4141,4142,
+4143,4144,1611,4145,4146,4147,4148,4149,4150,4151,4152,4153,4154,4155,4156,4157,
+4158,4159,4160,4161,4162,4163,4164,4165,4166,4167,4168,4169,4170,4171,4172,4173,
+4174,4175,4176,4177,4178,4179,4180,4181,4182,4183,4184,4185,4186,4187,4188,4189,
+4190,4191,4192,4193,4194,4195,4196,4197,4198,4199,4200,4201,4202,4203,4204,4205,
+4206,4207,4208,4209,4210,4211,4212,4213,4214,4215,4216,4217,4218,4219,1612,4220,
+4221,4222,4223,4224,4225,4226,4227,1357,4228,1613,4229,4230,4231,4232,4233,4234,
+4235,4236,4237,4238,4239,4240,4241,4242,4243,1614,4244,4245,4246,4247,4248,4249,
+4250,4251,4252,4253,4254,4255,4256,4257,4258,4259,4260,4261,4262,4263,4264,4265,
+4266,4267,4268,4269,4270,1196,1358,4271,4272,4273,4274,4275,4276,4277,4278,4279,
+4280,4281,4282,4283,4284,4285,4286,4287,1615,4288,4289,4290,4291,4292,4293,4294,
+4295,4296,4297,4298,4299,4300,4301,4302,4303,4304,4305,4306,4307,4308,4309,4310,
+4311,4312,4313,4314,4315,4316,4317,4318,4319,4320,4321,4322,4323,4324,4325,4326,
+4327,4328,4329,4330,4331,4332,4333,4334,1616,4335,4336,4337,4338,4339,4340,4341,
+4342,4343,4344,4345,4346,4347,4348,4349,4350,4351,4352,4353,4354,4355,4356,4357,
+4358,4359,4360,1617,4361,4362,4363,4364,4365,1618,4366,4367,4368,4369,4370,4371,
+4372,4373,4374,4375,4376,4377,4378,4379,4380,4381,4382,4383,4384,4385,4386,4387,
+4388,4389,4390,4391,4392,4393,4394,4395,4396,4397,4398,4399,4400,4401,4402,4403,
+4404,4405,4406,4407,4408,4409,4410,4411,4412,4413,4414,4415,4416,1619,4417,4418,
+4419,4420,4421,4422,4423,4424,4425,1112,4426,4427,4428,4429,4430,1620,4431,4432,
+4433,4434,4435,4436,4437,4438,4439,4440,4441,4442,1260,1261,4443,4444,4445,4446,
+4447,4448,4449,4450,4451,4452,4453,4454,4455,1359,4456,4457,4458,4459,4460,4461,
+4462,4463,4464,4465,1621,4466,4467,4468,4469,4470,4471,4472,4473,4474,4475,4476,
+4477,4478,4479,4480,4481,4482,4483,4484,4485,4486,4487,4488,4489,1055,4490,4491,
+4492,4493,4494,4495,4496,4497,4498,4499,4500,4501,4502,4503,4504,4505,4506,4507,
+4508,4509,4510,4511,4512,4513,4514,4515,4516,4517,4518,1622,4519,4520,4521,1623,
+4522,4523,4524,4525,4526,4527,4528,4529,4530,4531,4532,4533,4534,4535,1360,4536,
+4537,4538,4539,4540,4541,4542,4543, 975,4544,4545,4546,4547,4548,4549,4550,4551,
+4552,4553,4554,4555,4556,4557,4558,4559,4560,4561,4562,4563,4564,4565,4566,4567,
+4568,4569,4570,4571,1624,4572,4573,4574,4575,4576,1625,4577,4578,4579,4580,4581,
+4582,4583,4584,1626,4585,4586,4587,4588,4589,4590,4591,4592,4593,4594,4595,1627,
+4596,4597,4598,4599,4600,4601,4602,4603,4604,4605,4606,4607,4608,4609,4610,4611,
+4612,4613,4614,4615,1628,4616,4617,4618,4619,4620,4621,4622,4623,4624,4625,4626,
+4627,4628,4629,4630,4631,4632,4633,4634,4635,4636,4637,4638,4639,4640,4641,4642,
+4643,4644,4645,4646,4647,4648,4649,1361,4650,4651,4652,4653,4654,4655,4656,4657,
+4658,4659,4660,4661,1362,4662,4663,4664,4665,4666,4667,4668,4669,4670,4671,4672,
+4673,4674,4675,4676,4677,4678,4679,4680,4681,4682,1629,4683,4684,4685,4686,4687,
+1630,4688,4689,4690,4691,1153,4692,4693,4694,1113,4695,4696,4697,4698,4699,4700,
+4701,4702,4703,4704,4705,4706,4707,4708,4709,4710,4711,1197,4712,4713,4714,4715,
+4716,4717,4718,4719,4720,4721,4722,4723,4724,4725,4726,4727,4728,4729,4730,4731,
+4732,4733,4734,4735,1631,4736,1632,4737,4738,4739,4740,4741,4742,4743,4744,1633,
+4745,4746,4747,4748,4749,1262,4750,4751,4752,4753,4754,1363,4755,4756,4757,4758,
+4759,4760,4761,4762,4763,4764,4765,4766,4767,4768,1634,4769,4770,4771,4772,4773,
+4774,4775,4776,4777,4778,1635,4779,4780,4781,4782,4783,4784,4785,4786,4787,4788,
+4789,1636,4790,4791,4792,4793,4794,4795,4796,4797,4798,4799,4800,4801,4802,4803,
+4804,4805,4806,1637,4807,4808,4809,1638,4810,4811,4812,4813,4814,4815,4816,4817,
+4818,1639,4819,4820,4821,4822,4823,4824,4825,4826,4827,4828,4829,4830,4831,4832,
+4833,1077,4834,4835,4836,4837,4838,4839,4840,4841,4842,4843,4844,4845,4846,4847,
+4848,4849,4850,4851,4852,4853,4854,4855,4856,4857,4858,4859,4860,4861,4862,4863,
+4864,4865,4866,4867,4868,4869,4870,4871,4872,4873,4874,4875,4876,4877,4878,4879,
+4880,4881,4882,4883,1640,4884,4885,1641,4886,4887,4888,4889,4890,4891,4892,4893,
+4894,4895,4896,4897,4898,4899,4900,4901,4902,4903,4904,4905,4906,4907,4908,4909,
+4910,4911,1642,4912,4913,4914,1364,4915,4916,4917,4918,4919,4920,4921,4922,4923,
+4924,4925,4926,4927,4928,4929,4930,4931,1643,4932,4933,4934,4935,4936,4937,4938,
+4939,4940,4941,4942,4943,4944,4945,4946,4947,4948,4949,4950,4951,4952,4953,4954,
+4955,4956,4957,4958,4959,4960,4961,4962,4963,4964,4965,4966,4967,4968,4969,4970,
+4971,4972,4973,4974,4975,4976,4977,4978,4979,4980,1644,4981,4982,4983,4984,1645,
+4985,4986,1646,4987,4988,4989,4990,4991,4992,4993,4994,4995,4996,4997,4998,4999,
+5000,5001,5002,5003,5004,5005,1647,5006,1648,5007,5008,5009,5010,5011,5012,1078,
+5013,5014,5015,5016,5017,5018,5019,5020,5021,5022,5023,5024,5025,5026,5027,5028,
+1365,5029,5030,5031,5032,5033,5034,5035,5036,5037,5038,5039,1649,5040,5041,5042,
+5043,5044,5045,1366,5046,5047,5048,5049,5050,5051,5052,5053,5054,5055,1650,5056,
+5057,5058,5059,5060,5061,5062,5063,5064,5065,5066,5067,5068,5069,5070,5071,5072,
+5073,5074,5075,5076,5077,1651,5078,5079,5080,5081,5082,5083,5084,5085,5086,5087,
+5088,5089,5090,5091,5092,5093,5094,5095,5096,5097,5098,5099,5100,5101,5102,5103,
+5104,5105,5106,5107,5108,5109,5110,1652,5111,5112,5113,5114,5115,5116,5117,5118,
+1367,5119,5120,5121,5122,5123,5124,5125,5126,5127,5128,5129,1653,5130,5131,5132,
+5133,5134,5135,5136,5137,5138,5139,5140,5141,5142,5143,5144,5145,5146,5147,5148,
+5149,1368,5150,1654,5151,1369,5152,5153,5154,5155,5156,5157,5158,5159,5160,5161,
+5162,5163,5164,5165,5166,5167,5168,5169,5170,5171,5172,5173,5174,5175,5176,5177,
+5178,1370,5179,5180,5181,5182,5183,5184,5185,5186,5187,5188,5189,5190,5191,5192,
+5193,5194,5195,5196,5197,5198,1655,5199,5200,5201,5202,1656,5203,5204,5205,5206,
+1371,5207,1372,5208,5209,5210,5211,1373,5212,5213,1374,5214,5215,5216,5217,5218,
+5219,5220,5221,5222,5223,5224,5225,5226,5227,5228,5229,5230,5231,5232,5233,5234,
+5235,5236,5237,5238,5239,5240,5241,5242,5243,5244,5245,5246,5247,1657,5248,5249,
+5250,5251,1658,1263,5252,5253,5254,5255,5256,1375,5257,5258,5259,5260,5261,5262,
+5263,5264,5265,5266,5267,5268,5269,5270,5271,5272,5273,5274,5275,5276,5277,5278,
+5279,5280,5281,5282,5283,1659,5284,5285,5286,5287,5288,5289,5290,5291,5292,5293,
+5294,5295,5296,5297,5298,5299,5300,1660,5301,5302,5303,5304,5305,5306,5307,5308,
+5309,5310,5311,5312,5313,5314,5315,5316,5317,5318,5319,5320,5321,1376,5322,5323,
+5324,5325,5326,5327,5328,5329,5330,5331,5332,5333,1198,5334,5335,5336,5337,5338,
+5339,5340,5341,5342,5343,1661,5344,5345,5346,5347,5348,5349,5350,5351,5352,5353,
+5354,5355,5356,5357,5358,5359,5360,5361,5362,5363,5364,5365,5366,5367,5368,5369,
+5370,5371,5372,5373,5374,5375,5376,5377,5378,5379,5380,5381,5382,5383,5384,5385,
+5386,5387,5388,5389,5390,5391,5392,5393,5394,5395,5396,5397,5398,1264,5399,5400,
+5401,5402,5403,5404,5405,5406,5407,5408,5409,5410,5411,5412,1662,5413,5414,5415,
+5416,1663,5417,5418,5419,5420,5421,5422,5423,5424,5425,5426,5427,5428,5429,5430,
+5431,5432,5433,5434,5435,5436,5437,5438,1664,5439,5440,5441,5442,5443,5444,5445,
+5446,5447,5448,5449,5450,5451,5452,5453,5454,5455,5456,5457,5458,5459,5460,5461,
+5462,5463,5464,5465,5466,5467,5468,5469,5470,5471,5472,5473,5474,5475,5476,5477,
+5478,1154,5479,5480,5481,5482,5483,5484,5485,1665,5486,5487,5488,5489,5490,5491,
+5492,5493,5494,5495,5496,5497,5498,5499,5500,5501,5502,5503,5504,5505,5506,5507,
+5508,5509,5510,5511,5512,5513,5514,5515,5516,5517,5518,5519,5520,5521,5522,5523,
+5524,5525,5526,5527,5528,5529,5530,5531,5532,5533,5534,5535,5536,5537,5538,5539,
+5540,5541,5542,5543,5544,5545,5546,5547,5548,1377,5549,5550,5551,5552,5553,5554,
+5555,5556,5557,5558,5559,5560,5561,5562,5563,5564,5565,5566,5567,5568,5569,5570,
+1114,5571,5572,5573,5574,5575,5576,5577,5578,5579,5580,5581,5582,5583,5584,5585,
+5586,5587,5588,5589,5590,5591,5592,1378,5593,5594,5595,5596,5597,5598,5599,5600,
+5601,5602,5603,5604,5605,5606,5607,5608,5609,5610,5611,5612,5613,5614,1379,5615,
+5616,5617,5618,5619,5620,5621,5622,5623,5624,5625,5626,5627,5628,5629,5630,5631,
+5632,5633,5634,1380,5635,5636,5637,5638,5639,5640,5641,5642,5643,5644,5645,5646,
+5647,5648,5649,1381,1056,5650,5651,5652,5653,5654,5655,5656,5657,5658,5659,5660,
+1666,5661,5662,5663,5664,5665,5666,5667,5668,1667,5669,1668,5670,5671,5672,5673,
+5674,5675,5676,5677,5678,1155,5679,5680,5681,5682,5683,5684,5685,5686,5687,5688,
+5689,5690,5691,5692,5693,5694,5695,5696,5697,5698,1669,5699,5700,5701,5702,5703,
+5704,5705,1670,5706,5707,5708,5709,5710,1671,5711,5712,5713,5714,1382,5715,5716,
+5717,5718,5719,5720,5721,5722,5723,5724,5725,1672,5726,5727,1673,1674,5728,5729,
+5730,5731,5732,5733,5734,5735,5736,1675,5737,5738,5739,5740,5741,5742,5743,5744,
+1676,5745,5746,5747,5748,5749,5750,5751,1383,5752,5753,5754,5755,5756,5757,5758,
+5759,5760,5761,5762,5763,5764,5765,5766,5767,5768,1677,5769,5770,5771,5772,5773,
+1678,5774,5775,5776, 998,5777,5778,5779,5780,5781,5782,5783,5784,5785,1384,5786,
+5787,5788,5789,5790,5791,5792,5793,5794,5795,5796,5797,5798,5799,5800,1679,5801,
+5802,5803,1115,1116,5804,5805,5806,5807,5808,5809,5810,5811,5812,5813,5814,5815,
+5816,5817,5818,5819,5820,5821,5822,5823,5824,5825,5826,5827,5828,5829,5830,5831,
+5832,5833,5834,5835,5836,5837,5838,5839,5840,5841,5842,5843,5844,5845,5846,5847,
+5848,5849,5850,5851,5852,5853,5854,5855,1680,5856,5857,5858,5859,5860,5861,5862,
+5863,5864,1681,5865,5866,5867,1682,5868,5869,5870,5871,5872,5873,5874,5875,5876,
+5877,5878,5879,1683,5880,1684,5881,5882,5883,5884,1685,5885,5886,5887,5888,5889,
+5890,5891,5892,5893,5894,5895,5896,5897,5898,5899,5900,5901,5902,5903,5904,5905,
+5906,5907,1686,5908,5909,5910,5911,5912,5913,5914,5915,5916,5917,5918,5919,5920,
+5921,5922,5923,5924,5925,5926,5927,5928,5929,5930,5931,5932,5933,5934,5935,1687,
+5936,5937,5938,5939,5940,5941,5942,5943,5944,5945,5946,5947,5948,5949,5950,5951,
+5952,1688,1689,5953,1199,5954,5955,5956,5957,5958,5959,5960,5961,1690,5962,5963,
+5964,5965,5966,5967,5968,5969,5970,5971,5972,5973,5974,5975,5976,5977,5978,5979,
+5980,5981,1385,5982,1386,5983,5984,5985,5986,5987,5988,5989,5990,5991,5992,5993,
+5994,5995,5996,5997,5998,5999,6000,6001,6002,6003,6004,6005,6006,6007,6008,6009,
+6010,6011,6012,6013,6014,6015,6016,6017,6018,6019,6020,6021,6022,6023,6024,6025,
+6026,6027,1265,6028,6029,1691,6030,6031,6032,6033,6034,6035,6036,6037,6038,6039,
+6040,6041,6042,6043,6044,6045,6046,6047,6048,6049,6050,6051,6052,6053,6054,6055,
+6056,6057,6058,6059,6060,6061,6062,6063,6064,6065,6066,6067,6068,6069,6070,6071,
+6072,6073,6074,6075,6076,6077,6078,6079,6080,6081,6082,6083,6084,1692,6085,6086,
+6087,6088,6089,6090,6091,6092,6093,6094,6095,6096,6097,6098,6099,6100,6101,6102,
+6103,6104,6105,6106,6107,6108,6109,6110,6111,6112,6113,6114,6115,6116,6117,6118,
+6119,6120,6121,6122,6123,6124,6125,6126,6127,6128,6129,6130,6131,1693,6132,6133,
+6134,6135,6136,1694,6137,6138,6139,6140,6141,1695,6142,6143,6144,6145,6146,6147,
+6148,6149,6150,6151,6152,6153,6154,6155,6156,6157,6158,6159,6160,6161,6162,6163,
+6164,6165,6166,6167,6168,6169,6170,6171,6172,6173,6174,6175,6176,6177,6178,6179,
+6180,6181,6182,6183,6184,6185,1696,6186,6187,6188,6189,6190,6191,6192,6193,6194,
+6195,6196,6197,6198,6199,6200,6201,6202,6203,6204,6205,6206,6207,6208,6209,6210,
+6211,6212,6213,6214,6215,6216,6217,6218,6219,1697,6220,6221,6222,6223,6224,6225,
+6226,6227,6228,6229,6230,6231,6232,6233,6234,6235,6236,6237,6238,6239,6240,6241,
+6242,6243,6244,6245,6246,6247,6248,6249,6250,6251,6252,6253,1698,6254,6255,6256,
+6257,6258,6259,6260,6261,6262,6263,1200,6264,6265,6266,6267,6268,6269,6270,6271,  #1024
+6272,6273,6274,6275,6276,6277,6278,6279,6280,6281,6282,6283,6284,6285,6286,6287,
+6288,6289,6290,6291,6292,6293,6294,6295,6296,6297,6298,6299,6300,6301,6302,1699,
+6303,6304,1700,6305,6306,6307,6308,6309,6310,6311,6312,6313,6314,6315,6316,6317,
+6318,6319,6320,6321,6322,6323,6324,6325,6326,6327,6328,6329,6330,6331,6332,6333,
+6334,6335,6336,6337,6338,6339,1701,6340,6341,6342,6343,6344,1387,6345,6346,6347,
+6348,6349,6350,6351,6352,6353,6354,6355,6356,6357,6358,6359,6360,6361,6362,6363,
+6364,6365,6366,6367,6368,6369,6370,6371,6372,6373,6374,6375,6376,6377,6378,6379,
+6380,6381,6382,6383,6384,6385,6386,6387,6388,6389,6390,6391,6392,6393,6394,6395,
+6396,6397,6398,6399,6400,6401,6402,6403,6404,6405,6406,6407,6408,6409,6410,6411,
+6412,6413,1702,6414,6415,6416,6417,6418,6419,6420,6421,6422,1703,6423,6424,6425,
+6426,6427,6428,6429,6430,6431,6432,6433,6434,6435,6436,6437,6438,1704,6439,6440,
+6441,6442,6443,6444,6445,6446,6447,6448,6449,6450,6451,6452,6453,6454,6455,6456,
+6457,6458,6459,6460,6461,6462,6463,6464,6465,6466,6467,6468,6469,6470,6471,6472,
+6473,6474,6475,6476,6477,6478,6479,6480,6481,6482,6483,6484,6485,6486,6487,6488,
+6489,6490,6491,6492,6493,6494,6495,6496,6497,6498,6499,6500,6501,6502,6503,1266,
+6504,6505,6506,6507,6508,6509,6510,6511,6512,6513,6514,6515,6516,6517,6518,6519,
+6520,6521,6522,6523,6524,6525,6526,6527,6528,6529,6530,6531,6532,6533,6534,6535,
+6536,6537,6538,6539,6540,6541,6542,6543,6544,6545,6546,6547,6548,6549,6550,6551,
+1705,1706,6552,6553,6554,6555,6556,6557,6558,6559,6560,6561,6562,6563,6564,6565,
+6566,6567,6568,6569,6570,6571,6572,6573,6574,6575,6576,6577,6578,6579,6580,6581,
+6582,6583,6584,6585,6586,6587,6588,6589,6590,6591,6592,6593,6594,6595,6596,6597,
+6598,6599,6600,6601,6602,6603,6604,6605,6606,6607,6608,6609,6610,6611,6612,6613,
+6614,6615,6616,6617,6618,6619,6620,6621,6622,6623,6624,6625,6626,6627,6628,6629,
+6630,6631,6632,6633,6634,6635,6636,6637,1388,6638,6639,6640,6641,6642,6643,6644,
+1707,6645,6646,6647,6648,6649,6650,6651,6652,6653,6654,6655,6656,6657,6658,6659,
+6660,6661,6662,6663,1708,6664,6665,6666,6667,6668,6669,6670,6671,6672,6673,6674,
+1201,6675,6676,6677,6678,6679,6680,6681,6682,6683,6684,6685,6686,6687,6688,6689,
+6690,6691,6692,6693,6694,6695,6696,6697,6698,6699,6700,6701,6702,6703,6704,6705,
+6706,6707,6708,6709,6710,6711,6712,6713,6714,6715,6716,6717,6718,6719,6720,6721,
+6722,6723,6724,6725,1389,6726,6727,6728,6729,6730,6731,6732,6733,6734,6735,6736,
+1390,1709,6737,6738,6739,6740,6741,6742,1710,6743,6744,6745,6746,1391,6747,6748,
+6749,6750,6751,6752,6753,6754,6755,6756,6757,1392,6758,6759,6760,6761,6762,6763,
+6764,6765,6766,6767,6768,6769,6770,6771,6772,6773,6774,6775,6776,6777,6778,6779,
+6780,1202,6781,6782,6783,6784,6785,6786,6787,6788,6789,6790,6791,6792,6793,6794,
+6795,6796,6797,6798,6799,6800,6801,6802,6803,6804,6805,6806,6807,6808,6809,1711,
+6810,6811,6812,6813,6814,6815,6816,6817,6818,6819,6820,6821,6822,6823,6824,6825,
+6826,6827,6828,6829,6830,6831,6832,6833,6834,6835,6836,1393,6837,6838,6839,6840,
+6841,6842,6843,6844,6845,6846,6847,6848,6849,6850,6851,6852,6853,6854,6855,6856,
+6857,6858,6859,6860,6861,6862,6863,6864,6865,6866,6867,6868,6869,6870,6871,6872,
+6873,6874,6875,6876,6877,6878,6879,6880,6881,6882,6883,6884,6885,6886,6887,6888,
+6889,6890,6891,6892,6893,6894,6895,6896,6897,6898,6899,6900,6901,6902,1712,6903,
+6904,6905,6906,6907,6908,6909,6910,1713,6911,6912,6913,6914,6915,6916,6917,6918,
+6919,6920,6921,6922,6923,6924,6925,6926,6927,6928,6929,6930,6931,6932,6933,6934,
+6935,6936,6937,6938,6939,6940,6941,6942,6943,6944,6945,6946,6947,6948,6949,6950,
+6951,6952,6953,6954,6955,6956,6957,6958,6959,6960,6961,6962,6963,6964,6965,6966,
+6967,6968,6969,6970,6971,6972,6973,6974,1714,6975,6976,6977,6978,6979,6980,6981,
+6982,6983,6984,6985,6986,6987,6988,1394,6989,6990,6991,6992,6993,6994,6995,6996,
+6997,6998,6999,7000,1715,7001,7002,7003,7004,7005,7006,7007,7008,7009,7010,7011,
+7012,7013,7014,7015,7016,7017,7018,7019,7020,7021,7022,7023,7024,7025,7026,7027,
+7028,1716,7029,7030,7031,7032,7033,7034,7035,7036,7037,7038,7039,7040,7041,7042,
+7043,7044,7045,7046,7047,7048,7049,7050,7051,7052,7053,7054,7055,7056,7057,7058,
+7059,7060,7061,7062,7063,7064,7065,7066,7067,7068,7069,7070,7071,7072,7073,7074,
+7075,7076,7077,7078,7079,7080,7081,7082,7083,7084,7085,7086,7087,7088,7089,7090,
+7091,7092,7093,7094,7095,7096,7097,7098,7099,7100,7101,7102,7103,7104,7105,7106,
+7107,7108,7109,7110,7111,7112,7113,7114,7115,7116,7117,7118,7119,7120,7121,7122,
+7123,7124,7125,7126,7127,7128,7129,7130,7131,7132,7133,7134,7135,7136,7137,7138,
+7139,7140,7141,7142,7143,7144,7145,7146,7147,7148,7149,7150,7151,7152,7153,7154,
+7155,7156,7157,7158,7159,7160,7161,7162,7163,7164,7165,7166,7167,7168,7169,7170,
+7171,7172,7173,7174,7175,7176,7177,7178,7179,7180,7181,7182,7183,7184,7185,7186,
+7187,7188,7189,7190,7191,7192,7193,7194,7195,7196,7197,7198,7199,7200,7201,7202,
+7203,7204,7205,7206,7207,1395,7208,7209,7210,7211,7212,7213,1717,7214,7215,7216,
+7217,7218,7219,7220,7221,7222,7223,7224,7225,7226,7227,7228,7229,7230,7231,7232,
+7233,7234,7235,7236,7237,7238,7239,7240,7241,7242,7243,7244,7245,7246,7247,7248,
+7249,7250,7251,7252,7253,7254,7255,7256,7257,7258,7259,7260,7261,7262,7263,7264,
+7265,7266,7267,7268,7269,7270,7271,7272,7273,7274,7275,7276,7277,7278,7279,7280,
+7281,7282,7283,7284,7285,7286,7287,7288,7289,7290,7291,7292,7293,7294,7295,7296,
+7297,7298,7299,7300,7301,7302,7303,7304,7305,7306,7307,7308,7309,7310,7311,7312,
+7313,1718,7314,7315,7316,7317,7318,7319,7320,7321,7322,7323,7324,7325,7326,7327,
+7328,7329,7330,7331,7332,7333,7334,7335,7336,7337,7338,7339,7340,7341,7342,7343,
+7344,7345,7346,7347,7348,7349,7350,7351,7352,7353,7354,7355,7356,7357,7358,7359,
+7360,7361,7362,7363,7364,7365,7366,7367,7368,7369,7370,7371,7372,7373,7374,7375,
+7376,7377,7378,7379,7380,7381,7382,7383,7384,7385,7386,7387,7388,7389,7390,7391,
+7392,7393,7394,7395,7396,7397,7398,7399,7400,7401,7402,7403,7404,7405,7406,7407,
+7408,7409,7410,7411,7412,7413,7414,7415,7416,7417,7418,7419,7420,7421,7422,7423,
+7424,7425,7426,7427,7428,7429,7430,7431,7432,7433,7434,7435,7436,7437,7438,7439,
+7440,7441,7442,7443,7444,7445,7446,7447,7448,7449,7450,7451,7452,7453,7454,7455,
+7456,7457,7458,7459,7460,7461,7462,7463,7464,7465,7466,7467,7468,7469,7470,7471,
+7472,7473,7474,7475,7476,7477,7478,7479,7480,7481,7482,7483,7484,7485,7486,7487,
+7488,7489,7490,7491,7492,7493,7494,7495,7496,7497,7498,7499,7500,7501,7502,7503,
+7504,7505,7506,7507,7508,7509,7510,7511,7512,7513,7514,7515,7516,7517,7518,7519,
+7520,7521,7522,7523,7524,7525,7526,7527,7528,7529,7530,7531,7532,7533,7534,7535,
+7536,7537,7538,7539,7540,7541,7542,7543,7544,7545,7546,7547,7548,7549,7550,7551,
+7552,7553,7554,7555,7556,7557,7558,7559,7560,7561,7562,7563,7564,7565,7566,7567,
+7568,7569,7570,7571,7572,7573,7574,7575,7576,7577,7578,7579,7580,7581,7582,7583,
+7584,7585,7586,7587,7588,7589,7590,7591,7592,7593,7594,7595,7596,7597,7598,7599,
+7600,7601,7602,7603,7604,7605,7606,7607,7608,7609,7610,7611,7612,7613,7614,7615,
+7616,7617,7618,7619,7620,7621,7622,7623,7624,7625,7626,7627,7628,7629,7630,7631,
+7632,7633,7634,7635,7636,7637,7638,7639,7640,7641,7642,7643,7644,7645,7646,7647,
+7648,7649,7650,7651,7652,7653,7654,7655,7656,7657,7658,7659,7660,7661,7662,7663,
+7664,7665,7666,7667,7668,7669,7670,7671,7672,7673,7674,7675,7676,7677,7678,7679,
+7680,7681,7682,7683,7684,7685,7686,7687,7688,7689,7690,7691,7692,7693,7694,7695,
+7696,7697,7698,7699,7700,7701,7702,7703,7704,7705,7706,7707,7708,7709,7710,7711,
+7712,7713,7714,7715,7716,7717,7718,7719,7720,7721,7722,7723,7724,7725,7726,7727,
+7728,7729,7730,7731,7732,7733,7734,7735,7736,7737,7738,7739,7740,7741,7742,7743,
+7744,7745,7746,7747,7748,7749,7750,7751,7752,7753,7754,7755,7756,7757,7758,7759,
+7760,7761,7762,7763,7764,7765,7766,7767,7768,7769,7770,7771,7772,7773,7774,7775,
+7776,7777,7778,7779,7780,7781,7782,7783,7784,7785,7786,7787,7788,7789,7790,7791,
+7792,7793,7794,7795,7796,7797,7798,7799,7800,7801,7802,7803,7804,7805,7806,7807,
+7808,7809,7810,7811,7812,7813,7814,7815,7816,7817,7818,7819,7820,7821,7822,7823,
+7824,7825,7826,7827,7828,7829,7830,7831,7832,7833,7834,7835,7836,7837,7838,7839,
+7840,7841,7842,7843,7844,7845,7846,7847,7848,7849,7850,7851,7852,7853,7854,7855,
+7856,7857,7858,7859,7860,7861,7862,7863,7864,7865,7866,7867,7868,7869,7870,7871,
+7872,7873,7874,7875,7876,7877,7878,7879,7880,7881,7882,7883,7884,7885,7886,7887,
+7888,7889,7890,7891,7892,7893,7894,7895,7896,7897,7898,7899,7900,7901,7902,7903,
+7904,7905,7906,7907,7908,7909,7910,7911,7912,7913,7914,7915,7916,7917,7918,7919,
+7920,7921,7922,7923,7924,7925,7926,7927,7928,7929,7930,7931,7932,7933,7934,7935,
+7936,7937,7938,7939,7940,7941,7942,7943,7944,7945,7946,7947,7948,7949,7950,7951,
+7952,7953,7954,7955,7956,7957,7958,7959,7960,7961,7962,7963,7964,7965,7966,7967,
+7968,7969,7970,7971,7972,7973,7974,7975,7976,7977,7978,7979,7980,7981,7982,7983,
+7984,7985,7986,7987,7988,7989,7990,7991,7992,7993,7994,7995,7996,7997,7998,7999,
+8000,8001,8002,8003,8004,8005,8006,8007,8008,8009,8010,8011,8012,8013,8014,8015,
+8016,8017,8018,8019,8020,8021,8022,8023,8024,8025,8026,8027,8028,8029,8030,8031,
+8032,8033,8034,8035,8036,8037,8038,8039,8040,8041,8042,8043,8044,8045,8046,8047,
+8048,8049,8050,8051,8052,8053,8054,8055,8056,8057,8058,8059,8060,8061,8062,8063,
+8064,8065,8066,8067,8068,8069,8070,8071,8072,8073,8074,8075,8076,8077,8078,8079,
+8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095,
+8096,8097,8098,8099,8100,8101,8102,8103,8104,8105,8106,8107,8108,8109,8110,8111,
+8112,8113,8114,8115,8116,8117,8118,8119,8120,8121,8122,8123,8124,8125,8126,8127,
+8128,8129,8130,8131,8132,8133,8134,8135,8136,8137,8138,8139,8140,8141,8142,8143,
+8144,8145,8146,8147,8148,8149,8150,8151,8152,8153,8154,8155,8156,8157,8158,8159,
+8160,8161,8162,8163,8164,8165,8166,8167,8168,8169,8170,8171,8172,8173,8174,8175,
+8176,8177,8178,8179,8180,8181,8182,8183,8184,8185,8186,8187,8188,8189,8190,8191,
+8192,8193,8194,8195,8196,8197,8198,8199,8200,8201,8202,8203,8204,8205,8206,8207,
+8208,8209,8210,8211,8212,8213,8214,8215,8216,8217,8218,8219,8220,8221,8222,8223,
+8224,8225,8226,8227,8228,8229,8230,8231,8232,8233,8234,8235,8236,8237,8238,8239,
+8240,8241,8242,8243,8244,8245,8246,8247,8248,8249,8250,8251,8252,8253,8254,8255,
+8256,8257,8258,8259,8260,8261,8262,8263,8264,8265,8266,8267,8268,8269,8270,8271,
+8272,8273,8274,8275,8276,8277,8278,8279,8280,8281,8282,8283,8284,8285,8286,8287,
+8288,8289,8290,8291,8292,8293,8294,8295,8296,8297,8298,8299,8300,8301,8302,8303,
+8304,8305,8306,8307,8308,8309,8310,8311,8312,8313,8314,8315,8316,8317,8318,8319,
+8320,8321,8322,8323,8324,8325,8326,8327,8328,8329,8330,8331,8332,8333,8334,8335,
+8336,8337,8338,8339,8340,8341,8342,8343,8344,8345,8346,8347,8348,8349,8350,8351,
+8352,8353,8354,8355,8356,8357,8358,8359,8360,8361,8362,8363,8364,8365,8366,8367,
+8368,8369,8370,8371,8372,8373,8374,8375,8376,8377,8378,8379,8380,8381,8382,8383,
+8384,8385,8386,8387,8388,8389,8390,8391,8392,8393,8394,8395,8396,8397,8398,8399,
+8400,8401,8402,8403,8404,8405,8406,8407,8408,8409,8410,8411,8412,8413,8414,8415,
+8416,8417,8418,8419,8420,8421,8422,8423,8424,8425,8426,8427,8428,8429,8430,8431,
+8432,8433,8434,8435,8436,8437,8438,8439,8440,8441,8442,8443,8444,8445,8446,8447,
+8448,8449,8450,8451,8452,8453,8454,8455,8456,8457,8458,8459,8460,8461,8462,8463,
+8464,8465,8466,8467,8468,8469,8470,8471,8472,8473,8474,8475,8476,8477,8478,8479,
+8480,8481,8482,8483,8484,8485,8486,8487,8488,8489,8490,8491,8492,8493,8494,8495,
+8496,8497,8498,8499,8500,8501,8502,8503,8504,8505,8506,8507,8508,8509,8510,8511,
+8512,8513,8514,8515,8516,8517,8518,8519,8520,8521,8522,8523,8524,8525,8526,8527,
+8528,8529,8530,8531,8532,8533,8534,8535,8536,8537,8538,8539,8540,8541,8542,8543,
+8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,8554,8555,8556,8557,8558,8559,
+8560,8561,8562,8563,8564,8565,8566,8567,8568,8569,8570,8571,8572,8573,8574,8575,
+8576,8577,8578,8579,8580,8581,8582,8583,8584,8585,8586,8587,8588,8589,8590,8591,
+8592,8593,8594,8595,8596,8597,8598,8599,8600,8601,8602,8603,8604,8605,8606,8607,
+8608,8609,8610,8611,8612,8613,8614,8615,8616,8617,8618,8619,8620,8621,8622,8623,
+8624,8625,8626,8627,8628,8629,8630,8631,8632,8633,8634,8635,8636,8637,8638,8639,
+8640,8641,8642,8643,8644,8645,8646,8647,8648,8649,8650,8651,8652,8653,8654,8655,
+8656,8657,8658,8659,8660,8661,8662,8663,8664,8665,8666,8667,8668,8669,8670,8671,
+8672,8673,8674,8675,8676,8677,8678,8679,8680,8681,8682,8683,8684,8685,8686,8687,
+8688,8689,8690,8691,8692,8693,8694,8695,8696,8697,8698,8699,8700,8701,8702,8703,
+8704,8705,8706,8707,8708,8709,8710,8711,8712,8713,8714,8715,8716,8717,8718,8719,
+8720,8721,8722,8723,8724,8725,8726,8727,8728,8729,8730,8731,8732,8733,8734,8735,
+8736,8737,8738,8739,8740,8741)
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/euckrprober.py b/lib/requests/packages/chardet/euckrprober.py
new file mode 100644
index 00000000..5982a46b
--- /dev/null
+++ b/lib/requests/packages/chardet/euckrprober.py
@@ -0,0 +1,42 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .mbcharsetprober import MultiByteCharSetProber
+from .codingstatemachine import CodingStateMachine
+from .chardistribution import EUCKRDistributionAnalysis
+from .mbcssm import EUCKRSMModel
+
+
+class EUCKRProber(MultiByteCharSetProber):
+    def __init__(self):
+        MultiByteCharSetProber.__init__(self)
+        self._mCodingSM = CodingStateMachine(EUCKRSMModel)
+        self._mDistributionAnalyzer = EUCKRDistributionAnalysis()
+        self.reset()
+
+    def get_charset_name(self):
+        return "EUC-KR"
diff --git a/lib/requests/packages/chardet/euctwfreq.py b/lib/requests/packages/chardet/euctwfreq.py
new file mode 100644
index 00000000..576e7504
--- /dev/null
+++ b/lib/requests/packages/chardet/euctwfreq.py
@@ -0,0 +1,428 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+# EUCTW frequency table
+# Converted from big5 work
+# by Taiwan's Mandarin Promotion Council
+# <http:#www.edu.tw:81/mandr/>
+
+# 128  --> 0.42261
+# 256  --> 0.57851
+# 512  --> 0.74851
+# 1024 --> 0.89384
+# 2048 --> 0.97583
+#
+# Idea Distribution Ratio = 0.74851/(1-0.74851) =2.98
+# Random Distribution Ration = 512/(5401-512)=0.105
+#
+# Typical Distribution Ratio about 25% of Ideal one, still much higher than RDR
+
+EUCTW_TYPICAL_DISTRIBUTION_RATIO = 0.75
+
+# Char to FreqOrder table ,
+EUCTW_TABLE_SIZE = 8102
+
+EUCTWCharToFreqOrder = (
+   1,1800,1506, 255,1431, 198,   9,  82,   6,7310, 177, 202,3615,1256,2808, 110, # 2742
+3735,  33,3241, 261,  76,  44,2113,  16,2931,2184,1176, 659,3868,  26,3404,2643, # 2758
+1198,3869,3313,4060, 410,2211, 302, 590, 361,1963,   8, 204,  58,4296,7311,1931, # 2774
+  63,7312,7313, 317,1614,  75, 222, 159,4061,2412,1480,7314,3500,3068, 224,2809, # 2790
+3616,   3,  10,3870,1471,  29,2774,1135,2852,1939, 873, 130,3242,1123, 312,7315, # 2806
+4297,2051, 507, 252, 682,7316, 142,1914, 124, 206,2932,  34,3501,3173,  64, 604, # 2822
+7317,2494,1976,1977, 155,1990, 645, 641,1606,7318,3405, 337,  72, 406,7319,  80, # 2838
+ 630, 238,3174,1509, 263, 939,1092,2644, 756,1440,1094,3406, 449,  69,2969, 591, # 2854
+ 179,2095, 471, 115,2034,1843,  60,  50,2970, 134, 806,1868, 734,2035,3407, 180, # 2870
+ 995,1607, 156, 537,2893, 688,7320, 319,1305, 779,2144, 514,2374, 298,4298, 359, # 2886
+2495,  90,2707,1338, 663,  11, 906,1099,2545,  20,2436, 182, 532,1716,7321, 732, # 2902
+1376,4062,1311,1420,3175,  25,2312,1056, 113, 399, 382,1949, 242,3408,2467, 529, # 2918
+3243, 475,1447,3617,7322, 117,  21, 656, 810,1297,2295,2329,3502,7323, 126,4063, # 2934
+ 706, 456, 150, 613,4299,  71,1118,2036,4064, 145,3069,  85, 835, 486,2114,1246, # 2950
+1426, 428, 727,1285,1015, 800, 106, 623, 303,1281,7324,2127,2354, 347,3736, 221, # 2966
+3503,3110,7325,1955,1153,4065,  83, 296,1199,3070, 192, 624,  93,7326, 822,1897, # 2982
+2810,3111, 795,2064, 991,1554,1542,1592,  27,  43,2853, 859, 139,1456, 860,4300, # 2998
+ 437, 712,3871, 164,2392,3112, 695, 211,3017,2096, 195,3872,1608,3504,3505,3618, # 3014
+3873, 234, 811,2971,2097,3874,2229,1441,3506,1615,2375, 668,2076,1638, 305, 228, # 3030
+1664,4301, 467, 415,7327, 262,2098,1593, 239, 108, 300, 200,1033, 512,1247,2077, # 3046
+7328,7329,2173,3176,3619,2673, 593, 845,1062,3244,  88,1723,2037,3875,1950, 212, # 3062
+ 266, 152, 149, 468,1898,4066,4302,  77, 187,7330,3018,  37,   5,2972,7331,3876, # 3078
+7332,7333,  39,2517,4303,2894,3177,2078,  55, 148,  74,4304, 545, 483,1474,1029, # 3094
+1665, 217,1869,1531,3113,1104,2645,4067,  24, 172,3507, 900,3877,3508,3509,4305, # 3110
+  32,1408,2811,1312, 329, 487,2355,2247,2708, 784,2674,   4,3019,3314,1427,1788, # 3126
+ 188, 109, 499,7334,3620,1717,1789, 888,1217,3020,4306,7335,3510,7336,3315,1520, # 3142
+3621,3878, 196,1034, 775,7337,7338, 929,1815, 249, 439,  38,7339,1063,7340, 794, # 3158
+3879,1435,2296,  46, 178,3245,2065,7341,2376,7342, 214,1709,4307, 804,  35, 707, # 3174
+ 324,3622,1601,2546, 140, 459,4068,7343,7344,1365, 839, 272, 978,2257,2572,3409, # 3190
+2128,1363,3623,1423, 697, 100,3071,  48,  70,1231, 495,3114,2193,7345,1294,7346, # 3206
+2079, 462, 586,1042,3246, 853, 256, 988, 185,2377,3410,1698, 434,1084,7347,3411, # 3222
+ 314,2615,2775,4308,2330,2331, 569,2280, 637,1816,2518, 757,1162,1878,1616,3412, # 3238
+ 287,1577,2115, 768,4309,1671,2854,3511,2519,1321,3737, 909,2413,7348,4069, 933, # 3254
+3738,7349,2052,2356,1222,4310, 765,2414,1322, 786,4311,7350,1919,1462,1677,2895, # 3270
+1699,7351,4312,1424,2437,3115,3624,2590,3316,1774,1940,3413,3880,4070, 309,1369, # 3286
+1130,2812, 364,2230,1653,1299,3881,3512,3882,3883,2646, 525,1085,3021, 902,2000, # 3302
+1475, 964,4313, 421,1844,1415,1057,2281, 940,1364,3116, 376,4314,4315,1381,   7, # 3318
+2520, 983,2378, 336,1710,2675,1845, 321,3414, 559,1131,3022,2742,1808,1132,1313, # 3334
+ 265,1481,1857,7352, 352,1203,2813,3247, 167,1089, 420,2814, 776, 792,1724,3513, # 3350
+4071,2438,3248,7353,4072,7354, 446, 229, 333,2743, 901,3739,1200,1557,4316,2647, # 3366
+1920, 395,2744,2676,3740,4073,1835, 125, 916,3178,2616,4317,7355,7356,3741,7357, # 3382
+7358,7359,4318,3117,3625,1133,2547,1757,3415,1510,2313,1409,3514,7360,2145, 438, # 3398
+2591,2896,2379,3317,1068, 958,3023, 461, 311,2855,2677,4074,1915,3179,4075,1978, # 3414
+ 383, 750,2745,2617,4076, 274, 539, 385,1278,1442,7361,1154,1964, 384, 561, 210, # 3430
+  98,1295,2548,3515,7362,1711,2415,1482,3416,3884,2897,1257, 129,7363,3742, 642, # 3446
+ 523,2776,2777,2648,7364, 141,2231,1333,  68, 176, 441, 876, 907,4077, 603,2592, # 3462
+ 710, 171,3417, 404, 549,  18,3118,2393,1410,3626,1666,7365,3516,4319,2898,4320, # 3478
+7366,2973, 368,7367, 146, 366,  99, 871,3627,1543, 748, 807,1586,1185,  22,2258, # 3494
+ 379,3743,3180,7368,3181, 505,1941,2618,1991,1382,2314,7369, 380,2357, 218, 702, # 3510
+1817,1248,3418,3024,3517,3318,3249,7370,2974,3628, 930,3250,3744,7371,  59,7372, # 3526
+ 585, 601,4078, 497,3419,1112,1314,4321,1801,7373,1223,1472,2174,7374, 749,1836, # 3542
+ 690,1899,3745,1772,3885,1476, 429,1043,1790,2232,2116, 917,4079, 447,1086,1629, # 3558
+7375, 556,7376,7377,2020,1654, 844,1090, 105, 550, 966,1758,2815,1008,1782, 686, # 3574
+1095,7378,2282, 793,1602,7379,3518,2593,4322,4080,2933,2297,4323,3746, 980,2496, # 3590
+ 544, 353, 527,4324, 908,2678,2899,7380, 381,2619,1942,1348,7381,1341,1252, 560, # 3606
+3072,7382,3420,2856,7383,2053, 973, 886,2080, 143,4325,7384,7385, 157,3886, 496, # 3622
+4081,  57, 840, 540,2038,4326,4327,3421,2117,1445, 970,2259,1748,1965,2081,4082, # 3638
+3119,1234,1775,3251,2816,3629, 773,1206,2129,1066,2039,1326,3887,1738,1725,4083, # 3654
+ 279,3120,  51,1544,2594, 423,1578,2130,2066, 173,4328,1879,7386,7387,1583, 264, # 3670
+ 610,3630,4329,2439, 280, 154,7388,7389,7390,1739, 338,1282,3073, 693,2857,1411, # 3686
+1074,3747,2440,7391,4330,7392,7393,1240, 952,2394,7394,2900,1538,2679, 685,1483, # 3702
+4084,2468,1436, 953,4085,2054,4331, 671,2395,  79,4086,2441,3252, 608, 567,2680, # 3718
+3422,4087,4088,1691, 393,1261,1791,2396,7395,4332,7396,7397,7398,7399,1383,1672, # 3734
+3748,3182,1464, 522,1119, 661,1150, 216, 675,4333,3888,1432,3519, 609,4334,2681, # 3750
+2397,7400,7401,7402,4089,3025,   0,7403,2469, 315, 231,2442, 301,3319,4335,2380, # 3766
+7404, 233,4090,3631,1818,4336,4337,7405,  96,1776,1315,2082,7406, 257,7407,1809, # 3782
+3632,2709,1139,1819,4091,2021,1124,2163,2778,1777,2649,7408,3074, 363,1655,3183, # 3798
+7409,2975,7410,7411,7412,3889,1567,3890, 718, 103,3184, 849,1443, 341,3320,2934, # 3814
+1484,7413,1712, 127,  67, 339,4092,2398, 679,1412, 821,7414,7415, 834, 738, 351, # 3830
+2976,2146, 846, 235,1497,1880, 418,1992,3749,2710, 186,1100,2147,2746,3520,1545, # 3846
+1355,2935,2858,1377, 583,3891,4093,2573,2977,7416,1298,3633,1078,2549,3634,2358, # 3862
+  78,3750,3751, 267,1289,2099,2001,1594,4094, 348, 369,1274,2194,2175,1837,4338, # 3878
+1820,2817,3635,2747,2283,2002,4339,2936,2748, 144,3321, 882,4340,3892,2749,3423, # 3894
+4341,2901,7417,4095,1726, 320,7418,3893,3026, 788,2978,7419,2818,1773,1327,2859, # 3910
+3894,2819,7420,1306,4342,2003,1700,3752,3521,2359,2650, 787,2022, 506, 824,3636, # 3926
+ 534, 323,4343,1044,3322,2023,1900, 946,3424,7421,1778,1500,1678,7422,1881,4344, # 3942
+ 165, 243,4345,3637,2521, 123, 683,4096, 764,4346,  36,3895,1792, 589,2902, 816, # 3958
+ 626,1667,3027,2233,1639,1555,1622,3753,3896,7423,3897,2860,1370,1228,1932, 891, # 3974
+2083,2903, 304,4097,7424, 292,2979,2711,3522, 691,2100,4098,1115,4347, 118, 662, # 3990
+7425, 611,1156, 854,2381,1316,2861,   2, 386, 515,2904,7426,7427,3253, 868,2234, # 4006
+1486, 855,2651, 785,2212,3028,7428,1040,3185,3523,7429,3121, 448,7430,1525,7431, # 4022
+2164,4348,7432,3754,7433,4099,2820,3524,3122, 503, 818,3898,3123,1568, 814, 676, # 4038
+1444, 306,1749,7434,3755,1416,1030, 197,1428, 805,2821,1501,4349,7435,7436,7437, # 4054
+1993,7438,4350,7439,7440,2195,  13,2779,3638,2980,3124,1229,1916,7441,3756,2131, # 4070
+7442,4100,4351,2399,3525,7443,2213,1511,1727,1120,7444,7445, 646,3757,2443, 307, # 4086
+7446,7447,1595,3186,7448,7449,7450,3639,1113,1356,3899,1465,2522,2523,7451, 519, # 4102
+7452, 128,2132,  92,2284,1979,7453,3900,1512, 342,3125,2196,7454,2780,2214,1980, # 4118
+3323,7455, 290,1656,1317, 789, 827,2360,7456,3758,4352, 562, 581,3901,7457, 401, # 4134
+4353,2248,  94,4354,1399,2781,7458,1463,2024,4355,3187,1943,7459, 828,1105,4101, # 4150
+1262,1394,7460,4102, 605,4356,7461,1783,2862,7462,2822, 819,2101, 578,2197,2937, # 4166
+7463,1502, 436,3254,4103,3255,2823,3902,2905,3425,3426,7464,2712,2315,7465,7466, # 4182
+2332,2067,  23,4357, 193, 826,3759,2102, 699,1630,4104,3075, 390,1793,1064,3526, # 4198
+7467,1579,3076,3077,1400,7468,4105,1838,1640,2863,7469,4358,4359, 137,4106, 598, # 4214
+3078,1966, 780, 104, 974,2938,7470, 278, 899, 253, 402, 572, 504, 493,1339,7471, # 4230
+3903,1275,4360,2574,2550,7472,3640,3029,3079,2249, 565,1334,2713, 863,  41,7473, # 4246
+7474,4361,7475,1657,2333,  19, 463,2750,4107, 606,7476,2981,3256,1087,2084,1323, # 4262
+2652,2982,7477,1631,1623,1750,4108,2682,7478,2864, 791,2714,2653,2334, 232,2416, # 4278
+7479,2983,1498,7480,2654,2620, 755,1366,3641,3257,3126,2025,1609, 119,1917,3427, # 4294
+ 862,1026,4109,7481,3904,3760,4362,3905,4363,2260,1951,2470,7482,1125, 817,4110, # 4310
+4111,3906,1513,1766,2040,1487,4112,3030,3258,2824,3761,3127,7483,7484,1507,7485, # 4326
+2683, 733,  40,1632,1106,2865, 345,4113, 841,2524, 230,4364,2984,1846,3259,3428, # 4342
+7486,1263, 986,3429,7487, 735, 879, 254,1137, 857, 622,1300,1180,1388,1562,3907, # 4358
+3908,2939, 967,2751,2655,1349, 592,2133,1692,3324,2985,1994,4114,1679,3909,1901, # 4374
+2185,7488, 739,3642,2715,1296,1290,7489,4115,2198,2199,1921,1563,2595,2551,1870, # 4390
+2752,2986,7490, 435,7491, 343,1108, 596,  17,1751,4365,2235,3430,3643,7492,4366, # 4406
+ 294,3527,2940,1693, 477, 979, 281,2041,3528, 643,2042,3644,2621,2782,2261,1031, # 4422
+2335,2134,2298,3529,4367, 367,1249,2552,7493,3530,7494,4368,1283,3325,2004, 240, # 4438
+1762,3326,4369,4370, 836,1069,3128, 474,7495,2148,2525, 268,3531,7496,3188,1521, # 4454
+1284,7497,1658,1546,4116,7498,3532,3533,7499,4117,3327,2684,1685,4118, 961,1673, # 4470
+2622, 190,2005,2200,3762,4371,4372,7500, 570,2497,3645,1490,7501,4373,2623,3260, # 4486
+1956,4374, 584,1514, 396,1045,1944,7502,4375,1967,2444,7503,7504,4376,3910, 619, # 4502
+7505,3129,3261, 215,2006,2783,2553,3189,4377,3190,4378, 763,4119,3763,4379,7506, # 4518
+7507,1957,1767,2941,3328,3646,1174, 452,1477,4380,3329,3130,7508,2825,1253,2382, # 4534
+2186,1091,2285,4120, 492,7509, 638,1169,1824,2135,1752,3911, 648, 926,1021,1324, # 4550
+4381, 520,4382, 997, 847,1007, 892,4383,3764,2262,1871,3647,7510,2400,1784,4384, # 4566
+1952,2942,3080,3191,1728,4121,2043,3648,4385,2007,1701,3131,1551,  30,2263,4122, # 4582
+7511,2026,4386,3534,7512, 501,7513,4123, 594,3431,2165,1821,3535,3432,3536,3192, # 4598
+ 829,2826,4124,7514,1680,3132,1225,4125,7515,3262,4387,4126,3133,2336,7516,4388, # 4614
+4127,7517,3912,3913,7518,1847,2383,2596,3330,7519,4389, 374,3914, 652,4128,4129, # 4630
+ 375,1140, 798,7520,7521,7522,2361,4390,2264, 546,1659, 138,3031,2445,4391,7523, # 4646
+2250, 612,1848, 910, 796,3765,1740,1371, 825,3766,3767,7524,2906,2554,7525, 692, # 4662
+ 444,3032,2624, 801,4392,4130,7526,1491, 244,1053,3033,4131,4132, 340,7527,3915, # 4678
+1041,2987, 293,1168,  87,1357,7528,1539, 959,7529,2236, 721, 694,4133,3768, 219, # 4694
+1478, 644,1417,3331,2656,1413,1401,1335,1389,3916,7530,7531,2988,2362,3134,1825, # 4710
+ 730,1515, 184,2827,  66,4393,7532,1660,2943, 246,3332, 378,1457, 226,3433, 975, # 4726
+3917,2944,1264,3537, 674, 696,7533, 163,7534,1141,2417,2166, 713,3538,3333,4394, # 4742
+3918,7535,7536,1186,  15,7537,1079,1070,7538,1522,3193,3539, 276,1050,2716, 758, # 4758
+1126, 653,2945,3263,7539,2337, 889,3540,3919,3081,2989, 903,1250,4395,3920,3434, # 4774
+3541,1342,1681,1718, 766,3264, 286,  89,2946,3649,7540,1713,7541,2597,3334,2990, # 4790
+7542,2947,2215,3194,2866,7543,4396,2498,2526, 181, 387,1075,3921, 731,2187,3335, # 4806
+7544,3265, 310, 313,3435,2299, 770,4134,  54,3034, 189,4397,3082,3769,3922,7545, # 4822
+1230,1617,1849, 355,3542,4135,4398,3336, 111,4136,3650,1350,3135,3436,3035,4137, # 4838
+2149,3266,3543,7546,2784,3923,3924,2991, 722,2008,7547,1071, 247,1207,2338,2471, # 4854
+1378,4399,2009, 864,1437,1214,4400, 373,3770,1142,2216, 667,4401, 442,2753,2555, # 4870
+3771,3925,1968,4138,3267,1839, 837, 170,1107, 934,1336,1882,7548,7549,2118,4139, # 4886
+2828, 743,1569,7550,4402,4140, 582,2384,1418,3437,7551,1802,7552, 357,1395,1729, # 4902
+3651,3268,2418,1564,2237,7553,3083,3772,1633,4403,1114,2085,4141,1532,7554, 482, # 4918
+2446,4404,7555,7556,1492, 833,1466,7557,2717,3544,1641,2829,7558,1526,1272,3652, # 4934
+4142,1686,1794, 416,2556,1902,1953,1803,7559,3773,2785,3774,1159,2316,7560,2867, # 4950
+4405,1610,1584,3036,2419,2754, 443,3269,1163,3136,7561,7562,3926,7563,4143,2499, # 4966
+3037,4406,3927,3137,2103,1647,3545,2010,1872,4144,7564,4145, 431,3438,7565, 250, # 4982
+  97,  81,4146,7566,1648,1850,1558, 160, 848,7567, 866, 740,1694,7568,2201,2830, # 4998
+3195,4147,4407,3653,1687, 950,2472, 426, 469,3196,3654,3655,3928,7569,7570,1188, # 5014
+ 424,1995, 861,3546,4148,3775,2202,2685, 168,1235,3547,4149,7571,2086,1674,4408, # 5030
+3337,3270, 220,2557,1009,7572,3776, 670,2992, 332,1208, 717,7573,7574,3548,2447, # 5046
+3929,3338,7575, 513,7576,1209,2868,3339,3138,4409,1080,7577,7578,7579,7580,2527, # 5062
+3656,3549, 815,1587,3930,3931,7581,3550,3439,3777,1254,4410,1328,3038,1390,3932, # 5078
+1741,3933,3778,3934,7582, 236,3779,2448,3271,7583,7584,3657,3780,1273,3781,4411, # 5094
+7585, 308,7586,4412, 245,4413,1851,2473,1307,2575, 430, 715,2136,2449,7587, 270, # 5110
+ 199,2869,3935,7588,3551,2718,1753, 761,1754, 725,1661,1840,4414,3440,3658,7589, # 5126
+7590, 587,  14,3272, 227,2598, 326, 480,2265, 943,2755,3552, 291, 650,1883,7591, # 5142
+1702,1226, 102,1547,  62,3441, 904,4415,3442,1164,4150,7592,7593,1224,1548,2756, # 5158
+ 391, 498,1493,7594,1386,1419,7595,2055,1177,4416, 813, 880,1081,2363, 566,1145, # 5174
+4417,2286,1001,1035,2558,2599,2238, 394,1286,7596,7597,2068,7598,  86,1494,1730, # 5190
+3936, 491,1588, 745, 897,2948, 843,3340,3937,2757,2870,3273,1768, 998,2217,2069, # 5206
+ 397,1826,1195,1969,3659,2993,3341, 284,7599,3782,2500,2137,2119,1903,7600,3938, # 5222
+2150,3939,4151,1036,3443,1904, 114,2559,4152, 209,1527,7601,7602,2949,2831,2625, # 5238
+2385,2719,3139, 812,2560,7603,3274,7604,1559, 737,1884,3660,1210, 885,  28,2686, # 5254
+3553,3783,7605,4153,1004,1779,4418,7606, 346,1981,2218,2687,4419,3784,1742, 797, # 5270
+1642,3940,1933,1072,1384,2151, 896,3941,3275,3661,3197,2871,3554,7607,2561,1958, # 5286
+4420,2450,1785,7608,7609,7610,3942,4154,1005,1308,3662,4155,2720,4421,4422,1528, # 5302
+2600, 161,1178,4156,1982, 987,4423,1101,4157, 631,3943,1157,3198,2420,1343,1241, # 5318
+1016,2239,2562, 372, 877,2339,2501,1160, 555,1934, 911,3944,7611, 466,1170, 169, # 5334
+1051,2907,2688,3663,2474,2994,1182,2011,2563,1251,2626,7612, 992,2340,3444,1540, # 5350
+2721,1201,2070,2401,1996,2475,7613,4424, 528,1922,2188,1503,1873,1570,2364,3342, # 5366
+3276,7614, 557,1073,7615,1827,3445,2087,2266,3140,3039,3084, 767,3085,2786,4425, # 5382
+1006,4158,4426,2341,1267,2176,3664,3199, 778,3945,3200,2722,1597,2657,7616,4427, # 5398
+7617,3446,7618,7619,7620,3277,2689,1433,3278, 131,  95,1504,3946, 723,4159,3141, # 5414
+1841,3555,2758,2189,3947,2027,2104,3665,7621,2995,3948,1218,7622,3343,3201,3949, # 5430
+4160,2576, 248,1634,3785, 912,7623,2832,3666,3040,3786, 654,  53,7624,2996,7625, # 5446
+1688,4428, 777,3447,1032,3950,1425,7626, 191, 820,2120,2833, 971,4429, 931,3202, # 5462
+ 135, 664, 783,3787,1997, 772,2908,1935,3951,3788,4430,2909,3203, 282,2723, 640, # 5478
+1372,3448,1127, 922, 325,3344,7627,7628, 711,2044,7629,7630,3952,2219,2787,1936, # 5494
+3953,3345,2220,2251,3789,2300,7631,4431,3790,1258,3279,3954,3204,2138,2950,3955, # 5510
+3956,7632,2221, 258,3205,4432, 101,1227,7633,3280,1755,7634,1391,3281,7635,2910, # 5526
+2056, 893,7636,7637,7638,1402,4161,2342,7639,7640,3206,3556,7641,7642, 878,1325, # 5542
+1780,2788,4433, 259,1385,2577, 744,1183,2267,4434,7643,3957,2502,7644, 684,1024, # 5558
+4162,7645, 472,3557,3449,1165,3282,3958,3959, 322,2152, 881, 455,1695,1152,1340, # 5574
+ 660, 554,2153,4435,1058,4436,4163, 830,1065,3346,3960,4437,1923,7646,1703,1918, # 5590
+7647, 932,2268, 122,7648,4438, 947, 677,7649,3791,2627, 297,1905,1924,2269,4439, # 5606
+2317,3283,7650,7651,4164,7652,4165,  84,4166, 112, 989,7653, 547,1059,3961, 701, # 5622
+3558,1019,7654,4167,7655,3450, 942, 639, 457,2301,2451, 993,2951, 407, 851, 494, # 5638
+4440,3347, 927,7656,1237,7657,2421,3348, 573,4168, 680, 921,2911,1279,1874, 285, # 5654
+ 790,1448,1983, 719,2167,7658,7659,4441,3962,3963,1649,7660,1541, 563,7661,1077, # 5670
+7662,3349,3041,3451, 511,2997,3964,3965,3667,3966,1268,2564,3350,3207,4442,4443, # 5686
+7663, 535,1048,1276,1189,2912,2028,3142,1438,1373,2834,2952,1134,2012,7664,4169, # 5702
+1238,2578,3086,1259,7665, 700,7666,2953,3143,3668,4170,7667,4171,1146,1875,1906, # 5718
+4444,2601,3967, 781,2422, 132,1589, 203, 147, 273,2789,2402, 898,1786,2154,3968, # 5734
+3969,7668,3792,2790,7669,7670,4445,4446,7671,3208,7672,1635,3793, 965,7673,1804, # 5750
+2690,1516,3559,1121,1082,1329,3284,3970,1449,3794,  65,1128,2835,2913,2759,1590, # 5766
+3795,7674,7675,  12,2658,  45, 976,2579,3144,4447, 517,2528,1013,1037,3209,7676, # 5782
+3796,2836,7677,3797,7678,3452,7679,2602, 614,1998,2318,3798,3087,2724,2628,7680, # 5798
+2580,4172, 599,1269,7681,1810,3669,7682,2691,3088, 759,1060, 489,1805,3351,3285, # 5814
+1358,7683,7684,2386,1387,1215,2629,2252, 490,7685,7686,4173,1759,2387,2343,7687, # 5830
+4448,3799,1907,3971,2630,1806,3210,4449,3453,3286,2760,2344, 874,7688,7689,3454, # 5846
+3670,1858,  91,2914,3671,3042,3800,4450,7690,3145,3972,2659,7691,3455,1202,1403, # 5862
+3801,2954,2529,1517,2503,4451,3456,2504,7692,4452,7693,2692,1885,1495,1731,3973, # 5878
+2365,4453,7694,2029,7695,7696,3974,2693,1216, 237,2581,4174,2319,3975,3802,4454, # 5894
+4455,2694,3560,3457, 445,4456,7697,7698,7699,7700,2761,  61,3976,3672,1822,3977, # 5910
+7701, 687,2045, 935, 925, 405,2660, 703,1096,1859,2725,4457,3978,1876,1367,2695, # 5926
+3352, 918,2105,1781,2476, 334,3287,1611,1093,4458, 564,3146,3458,3673,3353, 945, # 5942
+2631,2057,4459,7702,1925, 872,4175,7703,3459,2696,3089, 349,4176,3674,3979,4460, # 5958
+3803,4177,3675,2155,3980,4461,4462,4178,4463,2403,2046, 782,3981, 400, 251,4179, # 5974
+1624,7704,7705, 277,3676, 299,1265, 476,1191,3804,2121,4180,4181,1109, 205,7706, # 5990
+2582,1000,2156,3561,1860,7707,7708,7709,4464,7710,4465,2565, 107,2477,2157,3982, # 6006
+3460,3147,7711,1533, 541,1301, 158, 753,4182,2872,3562,7712,1696, 370,1088,4183, # 6022
+4466,3563, 579, 327, 440, 162,2240, 269,1937,1374,3461, 968,3043,  56,1396,3090, # 6038
+2106,3288,3354,7713,1926,2158,4467,2998,7714,3564,7715,7716,3677,4468,2478,7717, # 6054
+2791,7718,1650,4469,7719,2603,7720,7721,3983,2661,3355,1149,3356,3984,3805,3985, # 6070
+7722,1076,  49,7723, 951,3211,3289,3290, 450,2837, 920,7724,1811,2792,2366,4184, # 6086
+1908,1138,2367,3806,3462,7725,3212,4470,1909,1147,1518,2423,4471,3807,7726,4472, # 6102
+2388,2604, 260,1795,3213,7727,7728,3808,3291, 708,7729,3565,1704,7730,3566,1351, # 6118
+1618,3357,2999,1886, 944,4185,3358,4186,3044,3359,4187,7731,3678, 422, 413,1714, # 6134
+3292, 500,2058,2345,4188,2479,7732,1344,1910, 954,7733,1668,7734,7735,3986,2404, # 6150
+4189,3567,3809,4190,7736,2302,1318,2505,3091, 133,3092,2873,4473, 629,  31,2838, # 6166
+2697,3810,4474, 850, 949,4475,3987,2955,1732,2088,4191,1496,1852,7737,3988, 620, # 6182
+3214, 981,1242,3679,3360,1619,3680,1643,3293,2139,2452,1970,1719,3463,2168,7738, # 6198
+3215,7739,7740,3361,1828,7741,1277,4476,1565,2047,7742,1636,3568,3093,7743, 869, # 6214
+2839, 655,3811,3812,3094,3989,3000,3813,1310,3569,4477,7744,7745,7746,1733, 558, # 6230
+4478,3681, 335,1549,3045,1756,4192,3682,1945,3464,1829,1291,1192, 470,2726,2107, # 6246
+2793, 913,1054,3990,7747,1027,7748,3046,3991,4479, 982,2662,3362,3148,3465,3216, # 6262
+3217,1946,2794,7749, 571,4480,7750,1830,7751,3570,2583,1523,2424,7752,2089, 984, # 6278
+4481,3683,1959,7753,3684, 852, 923,2795,3466,3685, 969,1519, 999,2048,2320,1705, # 6294
+7754,3095, 615,1662, 151, 597,3992,2405,2321,1049, 275,4482,3686,4193, 568,3687, # 6310
+3571,2480,4194,3688,7755,2425,2270, 409,3218,7756,1566,2874,3467,1002, 769,2840, # 6326
+ 194,2090,3149,3689,2222,3294,4195, 628,1505,7757,7758,1763,2177,3001,3993, 521, # 6342
+1161,2584,1787,2203,2406,4483,3994,1625,4196,4197, 412,  42,3096, 464,7759,2632, # 6358
+4484,3363,1760,1571,2875,3468,2530,1219,2204,3814,2633,2140,2368,4485,4486,3295, # 6374
+1651,3364,3572,7760,7761,3573,2481,3469,7762,3690,7763,7764,2271,2091, 460,7765, # 6390
+4487,7766,3002, 962, 588,3574, 289,3219,2634,1116,  52,7767,3047,1796,7768,7769, # 6406
+7770,1467,7771,1598,1143,3691,4198,1984,1734,1067,4488,1280,3365, 465,4489,1572, # 6422
+ 510,7772,1927,2241,1812,1644,3575,7773,4490,3692,7774,7775,2663,1573,1534,7776, # 6438
+7777,4199, 536,1807,1761,3470,3815,3150,2635,7778,7779,7780,4491,3471,2915,1911, # 6454
+2796,7781,3296,1122, 377,3220,7782, 360,7783,7784,4200,1529, 551,7785,2059,3693, # 6470
+1769,2426,7786,2916,4201,3297,3097,2322,2108,2030,4492,1404, 136,1468,1479, 672, # 6486
+1171,3221,2303, 271,3151,7787,2762,7788,2049, 678,2727, 865,1947,4493,7789,2013, # 6502
+3995,2956,7790,2728,2223,1397,3048,3694,4494,4495,1735,2917,3366,3576,7791,3816, # 6518
+ 509,2841,2453,2876,3817,7792,7793,3152,3153,4496,4202,2531,4497,2304,1166,1010, # 6534
+ 552, 681,1887,7794,7795,2957,2958,3996,1287,1596,1861,3154, 358, 453, 736, 175, # 6550
+ 478,1117, 905,1167,1097,7796,1853,1530,7797,1706,7798,2178,3472,2287,3695,3473, # 6566
+3577,4203,2092,4204,7799,3367,1193,2482,4205,1458,2190,2205,1862,1888,1421,3298, # 6582
+2918,3049,2179,3474, 595,2122,7800,3997,7801,7802,4206,1707,2636, 223,3696,1359, # 6598
+ 751,3098, 183,3475,7803,2797,3003, 419,2369, 633, 704,3818,2389, 241,7804,7805, # 6614
+7806, 838,3004,3697,2272,2763,2454,3819,1938,2050,3998,1309,3099,2242,1181,7807, # 6630
+1136,2206,3820,2370,1446,4207,2305,4498,7808,7809,4208,1055,2605, 484,3698,7810, # 6646
+3999, 625,4209,2273,3368,1499,4210,4000,7811,4001,4211,3222,2274,2275,3476,7812, # 6662
+7813,2764, 808,2606,3699,3369,4002,4212,3100,2532, 526,3370,3821,4213, 955,7814, # 6678
+1620,4214,2637,2427,7815,1429,3700,1669,1831, 994, 928,7816,3578,1260,7817,7818, # 6694
+7819,1948,2288, 741,2919,1626,4215,2729,2455, 867,1184, 362,3371,1392,7820,7821, # 6710
+4003,4216,1770,1736,3223,2920,4499,4500,1928,2698,1459,1158,7822,3050,3372,2877, # 6726
+1292,1929,2506,2842,3701,1985,1187,2071,2014,2607,4217,7823,2566,2507,2169,3702, # 6742
+2483,3299,7824,3703,4501,7825,7826, 666,1003,3005,1022,3579,4218,7827,4502,1813, # 6758
+2253, 574,3822,1603, 295,1535, 705,3823,4219, 283, 858, 417,7828,7829,3224,4503, # 6774
+4504,3051,1220,1889,1046,2276,2456,4004,1393,1599, 689,2567, 388,4220,7830,2484, # 6790
+ 802,7831,2798,3824,2060,1405,2254,7832,4505,3825,2109,1052,1345,3225,1585,7833, # 6806
+ 809,7834,7835,7836, 575,2730,3477, 956,1552,1469,1144,2323,7837,2324,1560,2457, # 6822
+3580,3226,4005, 616,2207,3155,2180,2289,7838,1832,7839,3478,4506,7840,1319,3704, # 6838
+3705,1211,3581,1023,3227,1293,2799,7841,7842,7843,3826, 607,2306,3827, 762,2878, # 6854
+1439,4221,1360,7844,1485,3052,7845,4507,1038,4222,1450,2061,2638,4223,1379,4508, # 6870
+2585,7846,7847,4224,1352,1414,2325,2921,1172,7848,7849,3828,3829,7850,1797,1451, # 6886
+7851,7852,7853,7854,2922,4006,4007,2485,2346, 411,4008,4009,3582,3300,3101,4509, # 6902
+1561,2664,1452,4010,1375,7855,7856,  47,2959, 316,7857,1406,1591,2923,3156,7858, # 6918
+1025,2141,3102,3157, 354,2731, 884,2224,4225,2407, 508,3706, 726,3583, 996,2428, # 6934
+3584, 729,7859, 392,2191,1453,4011,4510,3707,7860,7861,2458,3585,2608,1675,2800, # 6950
+ 919,2347,2960,2348,1270,4511,4012,  73,7862,7863, 647,7864,3228,2843,2255,1550, # 6966
+1346,3006,7865,1332, 883,3479,7866,7867,7868,7869,3301,2765,7870,1212, 831,1347, # 6982
+4226,4512,2326,3830,1863,3053, 720,3831,4513,4514,3832,7871,4227,7872,7873,4515, # 6998
+7874,7875,1798,4516,3708,2609,4517,3586,1645,2371,7876,7877,2924, 669,2208,2665, # 7014
+2429,7878,2879,7879,7880,1028,3229,7881,4228,2408,7882,2256,1353,7883,7884,4518, # 7030
+3158, 518,7885,4013,7886,4229,1960,7887,2142,4230,7888,7889,3007,2349,2350,3833, # 7046
+ 516,1833,1454,4014,2699,4231,4519,2225,2610,1971,1129,3587,7890,2766,7891,2961, # 7062
+1422, 577,1470,3008,1524,3373,7892,7893, 432,4232,3054,3480,7894,2586,1455,2508, # 7078
+2226,1972,1175,7895,1020,2732,4015,3481,4520,7896,2733,7897,1743,1361,3055,3482, # 7094
+2639,4016,4233,4521,2290, 895, 924,4234,2170, 331,2243,3056, 166,1627,3057,1098, # 7110
+7898,1232,2880,2227,3374,4522, 657, 403,1196,2372, 542,3709,3375,1600,4235,3483, # 7126
+7899,4523,2767,3230, 576, 530,1362,7900,4524,2533,2666,3710,4017,7901, 842,3834, # 7142
+7902,2801,2031,1014,4018, 213,2700,3376, 665, 621,4236,7903,3711,2925,2430,7904, # 7158
+2431,3302,3588,3377,7905,4237,2534,4238,4525,3589,1682,4239,3484,1380,7906, 724, # 7174
+2277, 600,1670,7907,1337,1233,4526,3103,2244,7908,1621,4527,7909, 651,4240,7910, # 7190
+1612,4241,2611,7911,2844,7912,2734,2307,3058,7913, 716,2459,3059, 174,1255,2701, # 7206
+4019,3590, 548,1320,1398, 728,4020,1574,7914,1890,1197,3060,4021,7915,3061,3062, # 7222
+3712,3591,3713, 747,7916, 635,4242,4528,7917,7918,7919,4243,7920,7921,4529,7922, # 7238
+3378,4530,2432, 451,7923,3714,2535,2072,4244,2735,4245,4022,7924,1764,4531,7925, # 7254
+4246, 350,7926,2278,2390,2486,7927,4247,4023,2245,1434,4024, 488,4532, 458,4248, # 7270
+4025,3715, 771,1330,2391,3835,2568,3159,2159,2409,1553,2667,3160,4249,7928,2487, # 7286
+2881,2612,1720,2702,4250,3379,4533,7929,2536,4251,7930,3231,4252,2768,7931,2015, # 7302
+2736,7932,1155,1017,3716,3836,7933,3303,2308, 201,1864,4253,1430,7934,4026,7935, # 7318
+7936,7937,7938,7939,4254,1604,7940, 414,1865, 371,2587,4534,4535,3485,2016,3104, # 7334
+4536,1708, 960,4255, 887, 389,2171,1536,1663,1721,7941,2228,4027,2351,2926,1580, # 7350
+7942,7943,7944,1744,7945,2537,4537,4538,7946,4539,7947,2073,7948,7949,3592,3380, # 7366
+2882,4256,7950,4257,2640,3381,2802, 673,2703,2460, 709,3486,4028,3593,4258,7951, # 7382
+1148, 502, 634,7952,7953,1204,4540,3594,1575,4541,2613,3717,7954,3718,3105, 948, # 7398
+3232, 121,1745,3837,1110,7955,4259,3063,2509,3009,4029,3719,1151,1771,3838,1488, # 7414
+4030,1986,7956,2433,3487,7957,7958,2093,7959,4260,3839,1213,1407,2803, 531,2737, # 7430
+2538,3233,1011,1537,7960,2769,4261,3106,1061,7961,3720,3721,1866,2883,7962,2017, # 7446
+ 120,4262,4263,2062,3595,3234,2309,3840,2668,3382,1954,4542,7963,7964,3488,1047, # 7462
+2704,1266,7965,1368,4543,2845, 649,3383,3841,2539,2738,1102,2846,2669,7966,7967, # 7478
+1999,7968,1111,3596,2962,7969,2488,3842,3597,2804,1854,3384,3722,7970,7971,3385, # 7494
+2410,2884,3304,3235,3598,7972,2569,7973,3599,2805,4031,1460, 856,7974,3600,7975, # 7510
+2885,2963,7976,2886,3843,7977,4264, 632,2510, 875,3844,1697,3845,2291,7978,7979, # 7526
+4544,3010,1239, 580,4545,4265,7980, 914, 936,2074,1190,4032,1039,2123,7981,7982, # 7542
+7983,3386,1473,7984,1354,4266,3846,7985,2172,3064,4033, 915,3305,4267,4268,3306, # 7558
+1605,1834,7986,2739, 398,3601,4269,3847,4034, 328,1912,2847,4035,3848,1331,4270, # 7574
+3011, 937,4271,7987,3602,4036,4037,3387,2160,4546,3388, 524, 742, 538,3065,1012, # 7590
+7988,7989,3849,2461,7990, 658,1103, 225,3850,7991,7992,4547,7993,4548,7994,3236, # 7606
+1243,7995,4038, 963,2246,4549,7996,2705,3603,3161,7997,7998,2588,2327,7999,4550, # 7622
+8000,8001,8002,3489,3307, 957,3389,2540,2032,1930,2927,2462, 870,2018,3604,1746, # 7638
+2770,2771,2434,2463,8003,3851,8004,3723,3107,3724,3490,3390,3725,8005,1179,3066, # 7654
+8006,3162,2373,4272,3726,2541,3163,3108,2740,4039,8007,3391,1556,2542,2292, 977, # 7670
+2887,2033,4040,1205,3392,8008,1765,3393,3164,2124,1271,1689, 714,4551,3491,8009, # 7686
+2328,3852, 533,4273,3605,2181, 617,8010,2464,3308,3492,2310,8011,8012,3165,8013, # 7702
+8014,3853,1987, 618, 427,2641,3493,3394,8015,8016,1244,1690,8017,2806,4274,4552, # 7718
+8018,3494,8019,8020,2279,1576, 473,3606,4275,3395, 972,8021,3607,8022,3067,8023, # 7734
+8024,4553,4554,8025,3727,4041,4042,8026, 153,4555, 356,8027,1891,2888,4276,2143, # 7750
+ 408, 803,2352,8028,3854,8029,4277,1646,2570,2511,4556,4557,3855,8030,3856,4278, # 7766
+8031,2411,3396, 752,8032,8033,1961,2964,8034, 746,3012,2465,8035,4279,3728, 698, # 7782
+4558,1892,4280,3608,2543,4559,3609,3857,8036,3166,3397,8037,1823,1302,4043,2706, # 7798
+3858,1973,4281,8038,4282,3167, 823,1303,1288,1236,2848,3495,4044,3398, 774,3859, # 7814
+8039,1581,4560,1304,2849,3860,4561,8040,2435,2161,1083,3237,4283,4045,4284, 344, # 7830
+1173, 288,2311, 454,1683,8041,8042,1461,4562,4046,2589,8043,8044,4563, 985, 894, # 7846
+8045,3399,3168,8046,1913,2928,3729,1988,8047,2110,1974,8048,4047,8049,2571,1194, # 7862
+ 425,8050,4564,3169,1245,3730,4285,8051,8052,2850,8053, 636,4565,1855,3861, 760, # 7878
+1799,8054,4286,2209,1508,4566,4048,1893,1684,2293,8055,8056,8057,4287,4288,2210, # 7894
+ 479,8058,8059, 832,8060,4049,2489,8061,2965,2490,3731, 990,3109, 627,1814,2642, # 7910
+4289,1582,4290,2125,2111,3496,4567,8062, 799,4291,3170,8063,4568,2112,1737,3013, # 7926
+1018, 543, 754,4292,3309,1676,4569,4570,4050,8064,1489,8065,3497,8066,2614,2889, # 7942
+4051,8067,8068,2966,8069,8070,8071,8072,3171,4571,4572,2182,1722,8073,3238,3239, # 7958
+1842,3610,1715, 481, 365,1975,1856,8074,8075,1962,2491,4573,8076,2126,3611,3240, # 7974
+ 433,1894,2063,2075,8077, 602,2741,8078,8079,8080,8081,8082,3014,1628,3400,8083, # 7990
+3172,4574,4052,2890,4575,2512,8084,2544,2772,8085,8086,8087,3310,4576,2891,8088, # 8006
+4577,8089,2851,4578,4579,1221,2967,4053,2513,8090,8091,8092,1867,1989,8093,8094, # 8022
+8095,1895,8096,8097,4580,1896,4054, 318,8098,2094,4055,4293,8099,8100, 485,8101, # 8038
+ 938,3862, 553,2670, 116,8102,3863,3612,8103,3498,2671,2773,3401,3311,2807,8104, # 8054
+3613,2929,4056,1747,2930,2968,8105,8106, 207,8107,8108,2672,4581,2514,8109,3015, # 8070
+ 890,3614,3864,8110,1877,3732,3402,8111,2183,2353,3403,1652,8112,8113,8114, 941, # 8086
+2294, 208,3499,4057,2019, 330,4294,3865,2892,2492,3733,4295,8115,8116,8117,8118, # 8102
+#Everything below is of no interest for detection purpose
+2515,1613,4582,8119,3312,3866,2516,8120,4058,8121,1637,4059,2466,4583,3867,8122, # 8118
+2493,3016,3734,8123,8124,2192,8125,8126,2162,8127,8128,8129,8130,8131,8132,8133, # 8134
+8134,8135,8136,8137,8138,8139,8140,8141,8142,8143,8144,8145,8146,8147,8148,8149, # 8150
+8150,8151,8152,8153,8154,8155,8156,8157,8158,8159,8160,8161,8162,8163,8164,8165, # 8166
+8166,8167,8168,8169,8170,8171,8172,8173,8174,8175,8176,8177,8178,8179,8180,8181, # 8182
+8182,8183,8184,8185,8186,8187,8188,8189,8190,8191,8192,8193,8194,8195,8196,8197, # 8198
+8198,8199,8200,8201,8202,8203,8204,8205,8206,8207,8208,8209,8210,8211,8212,8213, # 8214
+8214,8215,8216,8217,8218,8219,8220,8221,8222,8223,8224,8225,8226,8227,8228,8229, # 8230
+8230,8231,8232,8233,8234,8235,8236,8237,8238,8239,8240,8241,8242,8243,8244,8245, # 8246
+8246,8247,8248,8249,8250,8251,8252,8253,8254,8255,8256,8257,8258,8259,8260,8261, # 8262
+8262,8263,8264,8265,8266,8267,8268,8269,8270,8271,8272,8273,8274,8275,8276,8277, # 8278
+8278,8279,8280,8281,8282,8283,8284,8285,8286,8287,8288,8289,8290,8291,8292,8293, # 8294
+8294,8295,8296,8297,8298,8299,8300,8301,8302,8303,8304,8305,8306,8307,8308,8309, # 8310
+8310,8311,8312,8313,8314,8315,8316,8317,8318,8319,8320,8321,8322,8323,8324,8325, # 8326
+8326,8327,8328,8329,8330,8331,8332,8333,8334,8335,8336,8337,8338,8339,8340,8341, # 8342
+8342,8343,8344,8345,8346,8347,8348,8349,8350,8351,8352,8353,8354,8355,8356,8357, # 8358
+8358,8359,8360,8361,8362,8363,8364,8365,8366,8367,8368,8369,8370,8371,8372,8373, # 8374
+8374,8375,8376,8377,8378,8379,8380,8381,8382,8383,8384,8385,8386,8387,8388,8389, # 8390
+8390,8391,8392,8393,8394,8395,8396,8397,8398,8399,8400,8401,8402,8403,8404,8405, # 8406
+8406,8407,8408,8409,8410,8411,8412,8413,8414,8415,8416,8417,8418,8419,8420,8421, # 8422
+8422,8423,8424,8425,8426,8427,8428,8429,8430,8431,8432,8433,8434,8435,8436,8437, # 8438
+8438,8439,8440,8441,8442,8443,8444,8445,8446,8447,8448,8449,8450,8451,8452,8453, # 8454
+8454,8455,8456,8457,8458,8459,8460,8461,8462,8463,8464,8465,8466,8467,8468,8469, # 8470
+8470,8471,8472,8473,8474,8475,8476,8477,8478,8479,8480,8481,8482,8483,8484,8485, # 8486
+8486,8487,8488,8489,8490,8491,8492,8493,8494,8495,8496,8497,8498,8499,8500,8501, # 8502
+8502,8503,8504,8505,8506,8507,8508,8509,8510,8511,8512,8513,8514,8515,8516,8517, # 8518
+8518,8519,8520,8521,8522,8523,8524,8525,8526,8527,8528,8529,8530,8531,8532,8533, # 8534
+8534,8535,8536,8537,8538,8539,8540,8541,8542,8543,8544,8545,8546,8547,8548,8549, # 8550
+8550,8551,8552,8553,8554,8555,8556,8557,8558,8559,8560,8561,8562,8563,8564,8565, # 8566
+8566,8567,8568,8569,8570,8571,8572,8573,8574,8575,8576,8577,8578,8579,8580,8581, # 8582
+8582,8583,8584,8585,8586,8587,8588,8589,8590,8591,8592,8593,8594,8595,8596,8597, # 8598
+8598,8599,8600,8601,8602,8603,8604,8605,8606,8607,8608,8609,8610,8611,8612,8613, # 8614
+8614,8615,8616,8617,8618,8619,8620,8621,8622,8623,8624,8625,8626,8627,8628,8629, # 8630
+8630,8631,8632,8633,8634,8635,8636,8637,8638,8639,8640,8641,8642,8643,8644,8645, # 8646
+8646,8647,8648,8649,8650,8651,8652,8653,8654,8655,8656,8657,8658,8659,8660,8661, # 8662
+8662,8663,8664,8665,8666,8667,8668,8669,8670,8671,8672,8673,8674,8675,8676,8677, # 8678
+8678,8679,8680,8681,8682,8683,8684,8685,8686,8687,8688,8689,8690,8691,8692,8693, # 8694
+8694,8695,8696,8697,8698,8699,8700,8701,8702,8703,8704,8705,8706,8707,8708,8709, # 8710
+8710,8711,8712,8713,8714,8715,8716,8717,8718,8719,8720,8721,8722,8723,8724,8725, # 8726
+8726,8727,8728,8729,8730,8731,8732,8733,8734,8735,8736,8737,8738,8739,8740,8741) # 8742
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/euctwprober.py b/lib/requests/packages/chardet/euctwprober.py
new file mode 100644
index 00000000..fe652fe3
--- /dev/null
+++ b/lib/requests/packages/chardet/euctwprober.py
@@ -0,0 +1,41 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .mbcharsetprober import MultiByteCharSetProber
+from .codingstatemachine import CodingStateMachine
+from .chardistribution import EUCTWDistributionAnalysis
+from .mbcssm import EUCTWSMModel
+
+class EUCTWProber(MultiByteCharSetProber):
+    def __init__(self):
+        MultiByteCharSetProber.__init__(self)
+        self._mCodingSM = CodingStateMachine(EUCTWSMModel)
+        self._mDistributionAnalyzer = EUCTWDistributionAnalysis()
+        self.reset()
+
+    def get_charset_name(self):
+        return "EUC-TW"
diff --git a/lib/requests/packages/chardet/gb2312freq.py b/lib/requests/packages/chardet/gb2312freq.py
new file mode 100644
index 00000000..1238f510
--- /dev/null
+++ b/lib/requests/packages/chardet/gb2312freq.py
@@ -0,0 +1,472 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+# GB2312 most frequently used character table
+#
+# Char to FreqOrder table , from hz6763
+
+# 512  --> 0.79  -- 0.79
+# 1024 --> 0.92  -- 0.13
+# 2048 --> 0.98  -- 0.06
+# 6768 --> 1.00  -- 0.02
+#
+# Ideal Distribution Ratio = 0.79135/(1-0.79135) = 3.79
+# Random Distribution Ration = 512 / (3755 - 512) = 0.157
+#
+# Typical Distribution Ratio about 25% of Ideal one, still much higher that RDR
+
+GB2312_TYPICAL_DISTRIBUTION_RATIO = 0.9
+
+GB2312_TABLE_SIZE = 3760
+
+GB2312CharToFreqOrder = (
+1671, 749,1443,2364,3924,3807,2330,3921,1704,3463,2691,1511,1515, 572,3191,2205,
+2361, 224,2558, 479,1711, 963,3162, 440,4060,1905,2966,2947,3580,2647,3961,3842,
+2204, 869,4207, 970,2678,5626,2944,2956,1479,4048, 514,3595, 588,1346,2820,3409,
+ 249,4088,1746,1873,2047,1774, 581,1813, 358,1174,3590,1014,1561,4844,2245, 670,
+1636,3112, 889,1286, 953, 556,2327,3060,1290,3141, 613, 185,3477,1367, 850,3820,
+1715,2428,2642,2303,2732,3041,2562,2648,3566,3946,1349, 388,3098,2091,1360,3585,
+ 152,1687,1539, 738,1559,  59,1232,2925,2267,1388,1249,1741,1679,2960, 151,1566,
+1125,1352,4271, 924,4296, 385,3166,4459, 310,1245,2850,  70,3285,2729,3534,3575,
+2398,3298,3466,1960,2265, 217,3647, 864,1909,2084,4401,2773,1010,3269,5152, 853,
+3051,3121,1244,4251,1895, 364,1499,1540,2313,1180,3655,2268, 562, 715,2417,3061,
+ 544, 336,3768,2380,1752,4075, 950, 280,2425,4382, 183,2759,3272, 333,4297,2155,
+1688,2356,1444,1039,4540, 736,1177,3349,2443,2368,2144,2225, 565, 196,1482,3406,
+ 927,1335,4147, 692, 878,1311,1653,3911,3622,1378,4200,1840,2969,3149,2126,1816,
+2534,1546,2393,2760, 737,2494,  13, 447, 245,2747,  38,2765,2129,2589,1079, 606,
+ 360, 471,3755,2890, 404, 848, 699,1785,1236, 370,2221,1023,3746,2074,2026,2023,
+2388,1581,2119, 812,1141,3091,2536,1519, 804,2053, 406,1596,1090, 784, 548,4414,
+1806,2264,2936,1100, 343,4114,5096, 622,3358, 743,3668,1510,1626,5020,3567,2513,
+3195,4115,5627,2489,2991,  24,2065,2697,1087,2719,  48,1634, 315,  68, 985,2052,
+ 198,2239,1347,1107,1439, 597,2366,2172, 871,3307, 919,2487,2790,1867, 236,2570,
+1413,3794, 906,3365,3381,1701,1982,1818,1524,2924,1205, 616,2586,2072,2004, 575,
+ 253,3099,  32,1365,1182, 197,1714,2454,1201, 554,3388,3224,2748, 756,2587, 250,
+2567,1507,1517,3529,1922,2761,2337,3416,1961,1677,2452,2238,3153, 615, 911,1506,
+1474,2495,1265,1906,2749,3756,3280,2161, 898,2714,1759,3450,2243,2444, 563,  26,
+3286,2266,3769,3344,2707,3677, 611,1402, 531,1028,2871,4548,1375, 261,2948, 835,
+1190,4134, 353, 840,2684,1900,3082,1435,2109,1207,1674, 329,1872,2781,4055,2686,
+2104, 608,3318,2423,2957,2768,1108,3739,3512,3271,3985,2203,1771,3520,1418,2054,
+1681,1153, 225,1627,2929, 162,2050,2511,3687,1954, 124,1859,2431,1684,3032,2894,
+ 585,4805,3969,2869,2704,2088,2032,2095,3656,2635,4362,2209, 256, 518,2042,2105,
+3777,3657, 643,2298,1148,1779, 190, 989,3544, 414,  11,2135,2063,2979,1471, 403,
+3678, 126, 770,1563, 671,2499,3216,2877, 600,1179, 307,2805,4937,1268,1297,2694,
+ 252,4032,1448,1494,1331,1394, 127,2256, 222,1647,1035,1481,3056,1915,1048, 873,
+3651, 210,  33,1608,2516, 200,1520, 415, 102,   0,3389,1287, 817,  91,3299,2940,
+ 836,1814, 549,2197,1396,1669,2987,3582,2297,2848,4528,1070, 687,  20,1819, 121,
+1552,1364,1461,1968,2617,3540,2824,2083, 177, 948,4938,2291, 110,4549,2066, 648,
+3359,1755,2110,2114,4642,4845,1693,3937,3308,1257,1869,2123, 208,1804,3159,2992,
+2531,2549,3361,2418,1350,2347,2800,2568,1291,2036,2680,  72, 842,1990, 212,1233,
+1154,1586,  75,2027,3410,4900,1823,1337,2710,2676, 728,2810,1522,3026,4995, 157,
+ 755,1050,4022, 710, 785,1936,2194,2085,1406,2777,2400, 150,1250,4049,1206, 807,
+1910, 534, 529,3309,1721,1660, 274,  39,2827, 661,2670,1578, 925,3248,3815,1094,
+4278,4901,4252,  41,1150,3747,2572,2227,4501,3658,4902,3813,3357,3617,2884,2258,
+ 887, 538,4187,3199,1294,2439,3042,2329,2343,2497,1255, 107, 543,1527, 521,3478,
+3568, 194,5062,  15, 961,3870,1241,1192,2664,  66,5215,3260,2111,1295,1127,2152,
+3805,4135, 901,1164,1976, 398,1278, 530,1460, 748, 904,1054,1966,1426,  53,2909,
+ 509, 523,2279,1534, 536,1019, 239,1685, 460,2353, 673,1065,2401,3600,4298,2272,
+1272,2363, 284,1753,3679,4064,1695,  81, 815,2677,2757,2731,1386, 859, 500,4221,
+2190,2566, 757,1006,2519,2068,1166,1455, 337,2654,3203,1863,1682,1914,3025,1252,
+1409,1366, 847, 714,2834,2038,3209, 964,2970,1901, 885,2553,1078,1756,3049, 301,
+1572,3326, 688,2130,1996,2429,1805,1648,2930,3421,2750,3652,3088, 262,1158,1254,
+ 389,1641,1812, 526,1719, 923,2073,1073,1902, 468, 489,4625,1140, 857,2375,3070,
+3319,2863, 380, 116,1328,2693,1161,2244, 273,1212,1884,2769,3011,1775,1142, 461,
+3066,1200,2147,2212, 790, 702,2695,4222,1601,1058, 434,2338,5153,3640,  67,2360,
+4099,2502, 618,3472,1329, 416,1132, 830,2782,1807,2653,3211,3510,1662, 192,2124,
+ 296,3979,1739,1611,3684,  23, 118, 324, 446,1239,1225, 293,2520,3814,3795,2535,
+3116,  17,1074, 467,2692,2201, 387,2922,  45,1326,3055,1645,3659,2817, 958, 243,
+1903,2320,1339,2825,1784,3289, 356, 576, 865,2315,2381,3377,3916,1088,3122,1713,
+1655, 935, 628,4689,1034,1327, 441, 800, 720, 894,1979,2183,1528,5289,2702,1071,
+4046,3572,2399,1571,3281,  79, 761,1103, 327, 134, 758,1899,1371,1615, 879, 442,
+ 215,2605,2579, 173,2048,2485,1057,2975,3317,1097,2253,3801,4263,1403,1650,2946,
+ 814,4968,3487,1548,2644,1567,1285,   2, 295,2636,  97, 946,3576, 832, 141,4257,
+3273, 760,3821,3521,3156,2607, 949,1024,1733,1516,1803,1920,2125,2283,2665,3180,
+1501,2064,3560,2171,1592, 803,3518,1416, 732,3897,4258,1363,1362,2458, 119,1427,
+ 602,1525,2608,1605,1639,3175, 694,3064,  10, 465,  76,2000,4846,4208, 444,3781,
+1619,3353,2206,1273,3796, 740,2483, 320,1723,2377,3660,2619,1359,1137,1762,1724,
+2345,2842,1850,1862, 912, 821,1866, 612,2625,1735,2573,3369,1093, 844,  89, 937,
+ 930,1424,3564,2413,2972,1004,3046,3019,2011, 711,3171,1452,4178, 428, 801,1943,
+ 432, 445,2811, 206,4136,1472, 730, 349,  73, 397,2802,2547, 998,1637,1167, 789,
+ 396,3217, 154,1218, 716,1120,1780,2819,4826,1931,3334,3762,2139,1215,2627, 552,
+3664,3628,3232,1405,2383,3111,1356,2652,3577,3320,3101,1703, 640,1045,1370,1246,
+4996, 371,1575,2436,1621,2210, 984,4033,1734,2638,  16,4529, 663,2755,3255,1451,
+3917,2257,1253,1955,2234,1263,2951, 214,1229, 617, 485, 359,1831,1969, 473,2310,
+ 750,2058, 165,  80,2864,2419, 361,4344,2416,2479,1134, 796,3726,1266,2943, 860,
+2715, 938, 390,2734,1313,1384, 248, 202, 877,1064,2854, 522,3907, 279,1602, 297,
+2357, 395,3740, 137,2075, 944,4089,2584,1267,3802,  62,1533,2285, 178, 176, 780,
+2440, 201,3707, 590, 478,1560,4354,2117,1075,  30,  74,4643,4004,1635,1441,2745,
+ 776,2596, 238,1077,1692,1912,2844, 605, 499,1742,3947, 241,3053, 980,1749, 936,
+2640,4511,2582, 515,1543,2162,5322,2892,2993, 890,2148,1924, 665,1827,3581,1032,
+ 968,3163, 339,1044,1896, 270, 583,1791,1720,4367,1194,3488,3669,  43,2523,1657,
+ 163,2167, 290,1209,1622,3378, 550, 634,2508,2510, 695,2634,2384,2512,1476,1414,
+ 220,1469,2341,2138,2852,3183,2900,4939,2865,3502,1211,3680, 854,3227,1299,2976,
+3172, 186,2998,1459, 443,1067,3251,1495, 321,1932,3054, 909, 753,1410,1828, 436,
+2441,1119,1587,3164,2186,1258, 227, 231,1425,1890,3200,3942, 247, 959, 725,5254,
+2741, 577,2158,2079, 929, 120, 174, 838,2813, 591,1115, 417,2024,  40,3240,1536,
+1037, 291,4151,2354, 632,1298,2406,2500,3535,1825,1846,3451, 205,1171, 345,4238,
+  18,1163, 811, 685,2208,1217, 425,1312,1508,1175,4308,2552,1033, 587,1381,3059,
+2984,3482, 340,1316,4023,3972, 792,3176, 519, 777,4690, 918, 933,4130,2981,3741,
+  90,3360,2911,2200,5184,4550, 609,3079,2030, 272,3379,2736, 363,3881,1130,1447,
+ 286, 779, 357,1169,3350,3137,1630,1220,2687,2391, 747,1277,3688,2618,2682,2601,
+1156,3196,5290,4034,3102,1689,3596,3128, 874, 219,2783, 798, 508,1843,2461, 269,
+1658,1776,1392,1913,2983,3287,2866,2159,2372, 829,4076,  46,4253,2873,1889,1894,
+ 915,1834,1631,2181,2318, 298, 664,2818,3555,2735, 954,3228,3117, 527,3511,2173,
+ 681,2712,3033,2247,2346,3467,1652, 155,2164,3382, 113,1994, 450, 899, 494, 994,
+1237,2958,1875,2336,1926,3727, 545,1577,1550, 633,3473, 204,1305,3072,2410,1956,
+2471, 707,2134, 841,2195,2196,2663,3843,1026,4940, 990,3252,4997, 368,1092, 437,
+3212,3258,1933,1829, 675,2977,2893, 412, 943,3723,4644,3294,3283,2230,2373,5154,
+2389,2241,2661,2323,1404,2524, 593, 787, 677,3008,1275,2059, 438,2709,2609,2240,
+2269,2246,1446,  36,1568,1373,3892,1574,2301,1456,3962, 693,2276,5216,2035,1143,
+2720,1919,1797,1811,2763,4137,2597,1830,1699,1488,1198,2090, 424,1694, 312,3634,
+3390,4179,3335,2252,1214, 561,1059,3243,2295,2561, 975,5155,2321,2751,3772, 472,
+1537,3282,3398,1047,2077,2348,2878,1323,3340,3076, 690,2906,  51, 369, 170,3541,
+1060,2187,2688,3670,2541,1083,1683, 928,3918, 459, 109,4427, 599,3744,4286, 143,
+2101,2730,2490,  82,1588,3036,2121, 281,1860, 477,4035,1238,2812,3020,2716,3312,
+1530,2188,2055,1317, 843, 636,1808,1173,3495, 649, 181,1002, 147,3641,1159,2414,
+3750,2289,2795, 813,3123,2610,1136,4368,   5,3391,4541,2174, 420, 429,1728, 754,
+1228,2115,2219, 347,2223,2733, 735,1518,3003,2355,3134,1764,3948,3329,1888,2424,
+1001,1234,1972,3321,3363,1672,1021,1450,1584, 226, 765, 655,2526,3404,3244,2302,
+3665, 731, 594,2184, 319,1576, 621, 658,2656,4299,2099,3864,1279,2071,2598,2739,
+ 795,3086,3699,3908,1707,2352,2402,1382,3136,2475,1465,4847,3496,3865,1085,3004,
+2591,1084, 213,2287,1963,3565,2250, 822, 793,4574,3187,1772,1789,3050, 595,1484,
+1959,2770,1080,2650, 456, 422,2996, 940,3322,4328,4345,3092,2742, 965,2784, 739,
+4124, 952,1358,2498,2949,2565, 332,2698,2378, 660,2260,2473,4194,3856,2919, 535,
+1260,2651,1208,1428,1300,1949,1303,2942, 433,2455,2450,1251,1946, 614,1269, 641,
+1306,1810,2737,3078,2912, 564,2365,1419,1415,1497,4460,2367,2185,1379,3005,1307,
+3218,2175,1897,3063, 682,1157,4040,4005,1712,1160,1941,1399, 394, 402,2952,1573,
+1151,2986,2404, 862, 299,2033,1489,3006, 346, 171,2886,3401,1726,2932, 168,2533,
+  47,2507,1030,3735,1145,3370,1395,1318,1579,3609,4560,2857,4116,1457,2529,1965,
+ 504,1036,2690,2988,2405, 745,5871, 849,2397,2056,3081, 863,2359,3857,2096,  99,
+1397,1769,2300,4428,1643,3455,1978,1757,3718,1440,  35,4879,3742,1296,4228,2280,
+ 160,5063,1599,2013, 166, 520,3479,1646,3345,3012, 490,1937,1545,1264,2182,2505,
+1096,1188,1369,1436,2421,1667,2792,2460,1270,2122, 727,3167,2143, 806,1706,1012,
+1800,3037, 960,2218,1882, 805, 139,2456,1139,1521, 851,1052,3093,3089, 342,2039,
+ 744,5097,1468,1502,1585,2087, 223, 939, 326,2140,2577, 892,2481,1623,4077, 982,
+3708, 135,2131,  87,2503,3114,2326,1106, 876,1616, 547,2997,2831,2093,3441,4530,
+4314,   9,3256,4229,4148, 659,1462,1986,1710,2046,2913,2231,4090,4880,5255,3392,
+3274,1368,3689,4645,1477, 705,3384,3635,1068,1529,2941,1458,3782,1509, 100,1656,
+2548, 718,2339, 408,1590,2780,3548,1838,4117,3719,1345,3530, 717,3442,2778,3220,
+2898,1892,4590,3614,3371,2043,1998,1224,3483, 891, 635, 584,2559,3355, 733,1766,
+1729,1172,3789,1891,2307, 781,2982,2271,1957,1580,5773,2633,2005,4195,3097,1535,
+3213,1189,1934,5693,3262, 586,3118,1324,1598, 517,1564,2217,1868,1893,4445,3728,
+2703,3139,1526,1787,1992,3882,2875,1549,1199,1056,2224,1904,2711,5098,4287, 338,
+1993,3129,3489,2689,1809,2815,1997, 957,1855,3898,2550,3275,3057,1105,1319, 627,
+1505,1911,1883,3526, 698,3629,3456,1833,1431, 746,  77,1261,2017,2296,1977,1885,
+ 125,1334,1600, 525,1798,1109,2222,1470,1945, 559,2236,1186,3443,2476,1929,1411,
+2411,3135,1777,3372,2621,1841,1613,3229, 668,1430,1839,2643,2916, 195,1989,2671,
+2358,1387, 629,3205,2293,5256,4439, 123,1310, 888,1879,4300,3021,3605,1003,1162,
+3192,2910,2010, 140,2395,2859,  55,1082,2012,2901, 662, 419,2081,1438, 680,2774,
+4654,3912,1620,1731,1625,5035,4065,2328, 512,1344, 802,5443,2163,2311,2537, 524,
+3399,  98,1155,2103,1918,2606,3925,2816,1393,2465,1504,3773,2177,3963,1478,4346,
+ 180,1113,4655,3461,2028,1698, 833,2696,1235,1322,1594,4408,3623,3013,3225,2040,
+3022, 541,2881, 607,3632,2029,1665,1219, 639,1385,1686,1099,2803,3231,1938,3188,
+2858, 427, 676,2772,1168,2025, 454,3253,2486,3556, 230,1950, 580, 791,1991,1280,
+1086,1974,2034, 630, 257,3338,2788,4903,1017,  86,4790, 966,2789,1995,1696,1131,
+ 259,3095,4188,1308, 179,1463,5257, 289,4107,1248,  42,3413,1725,2288, 896,1947,
+ 774,4474,4254, 604,3430,4264, 392,2514,2588, 452, 237,1408,3018, 988,4531,1970,
+3034,3310, 540,2370,1562,1288,2990, 502,4765,1147,   4,1853,2708, 207, 294,2814,
+4078,2902,2509, 684,  34,3105,3532,2551, 644, 709,2801,2344, 573,1727,3573,3557,
+2021,1081,3100,4315,2100,3681, 199,2263,1837,2385, 146,3484,1195,2776,3949, 997,
+1939,3973,1008,1091,1202,1962,1847,1149,4209,5444,1076, 493, 117,5400,2521, 972,
+1490,2934,1796,4542,2374,1512,2933,2657, 413,2888,1135,2762,2314,2156,1355,2369,
+ 766,2007,2527,2170,3124,2491,2593,2632,4757,2437, 234,3125,3591,1898,1750,1376,
+1942,3468,3138, 570,2127,2145,3276,4131, 962, 132,1445,4196,  19, 941,3624,3480,
+3366,1973,1374,4461,3431,2629, 283,2415,2275, 808,2887,3620,2112,2563,1353,3610,
+ 955,1089,3103,1053,  96,  88,4097, 823,3808,1583, 399, 292,4091,3313, 421,1128,
+ 642,4006, 903,2539,1877,2082, 596,  29,4066,1790, 722,2157, 130, 995,1569, 769,
+1485, 464, 513,2213, 288,1923,1101,2453,4316, 133, 486,2445,  50, 625, 487,2207,
+  57, 423, 481,2962, 159,3729,1558, 491, 303, 482, 501, 240,2837, 112,3648,2392,
+1783, 362,   8,3433,3422, 610,2793,3277,1390,1284,1654,  21,3823, 734, 367, 623,
+ 193, 287, 374,1009,1483, 816, 476, 313,2255,2340,1262,2150,2899,1146,2581, 782,
+2116,1659,2018,1880, 255,3586,3314,1110,2867,2137,2564, 986,2767,5185,2006, 650,
+ 158, 926, 762, 881,3157,2717,2362,3587, 306,3690,3245,1542,3077,2427,1691,2478,
+2118,2985,3490,2438, 539,2305, 983, 129,1754, 355,4201,2386, 827,2923, 104,1773,
+2838,2771, 411,2905,3919, 376, 767, 122,1114, 828,2422,1817,3506, 266,3460,1007,
+1609,4998, 945,2612,4429,2274, 726,1247,1964,2914,2199,2070,4002,4108, 657,3323,
+1422, 579, 455,2764,4737,1222,2895,1670, 824,1223,1487,2525, 558, 861,3080, 598,
+2659,2515,1967, 752,2583,2376,2214,4180, 977, 704,2464,4999,2622,4109,1210,2961,
+ 819,1541, 142,2284,  44, 418, 457,1126,3730,4347,4626,1644,1876,3671,1864, 302,
+1063,5694, 624, 723,1984,3745,1314,1676,2488,1610,1449,3558,3569,2166,2098, 409,
+1011,2325,3704,2306, 818,1732,1383,1824,1844,3757, 999,2705,3497,1216,1423,2683,
+2426,2954,2501,2726,2229,1475,2554,5064,1971,1794,1666,2014,1343, 783, 724, 191,
+2434,1354,2220,5065,1763,2752,2472,4152, 131, 175,2885,3434,  92,1466,4920,2616,
+3871,3872,3866, 128,1551,1632, 669,1854,3682,4691,4125,1230, 188,2973,3290,1302,
+1213, 560,3266, 917, 763,3909,3249,1760, 868,1958, 764,1782,2097, 145,2277,3774,
+4462,  64,1491,3062, 971,2132,3606,2442, 221,1226,1617, 218, 323,1185,3207,3147,
+ 571, 619,1473,1005,1744,2281, 449,1887,2396,3685, 275, 375,3816,1743,3844,3731,
+ 845,1983,2350,4210,1377, 773, 967,3499,3052,3743,2725,4007,1697,1022,3943,1464,
+3264,2855,2722,1952,1029,2839,2467,  84,4383,2215, 820,1391,2015,2448,3672, 377,
+1948,2168, 797,2545,3536,2578,2645,  94,2874,1678, 405,1259,3071, 771, 546,1315,
+ 470,1243,3083, 895,2468, 981, 969,2037, 846,4181, 653,1276,2928,  14,2594, 557,
+3007,2474, 156, 902,1338,1740,2574, 537,2518, 973,2282,2216,2433,1928, 138,2903,
+1293,2631,1612, 646,3457, 839,2935, 111, 496,2191,2847, 589,3186, 149,3994,2060,
+4031,2641,4067,3145,1870,  37,3597,2136,1025,2051,3009,3383,3549,1121,1016,3261,
+1301, 251,2446,2599,2153, 872,3246, 637, 334,3705, 831, 884, 921,3065,3140,4092,
+2198,1944, 246,2964, 108,2045,1152,1921,2308,1031, 203,3173,4170,1907,3890, 810,
+1401,2003,1690, 506, 647,1242,2828,1761,1649,3208,2249,1589,3709,2931,5156,1708,
+ 498, 666,2613, 834,3817,1231, 184,2851,1124, 883,3197,2261,3710,1765,1553,2658,
+1178,2639,2351,  93,1193, 942,2538,2141,4402, 235,1821, 870,1591,2192,1709,1871,
+3341,1618,4126,2595,2334, 603, 651,  69, 701, 268,2662,3411,2555,1380,1606, 503,
+ 448, 254,2371,2646, 574,1187,2309,1770, 322,2235,1292,1801, 305, 566,1133, 229,
+2067,2057, 706, 167, 483,2002,2672,3295,1820,3561,3067, 316, 378,2746,3452,1112,
+ 136,1981, 507,1651,2917,1117, 285,4591, 182,2580,3522,1304, 335,3303,1835,2504,
+1795,1792,2248, 674,1018,2106,2449,1857,2292,2845, 976,3047,1781,2600,2727,1389,
+1281,  52,3152, 153, 265,3950, 672,3485,3951,4463, 430,1183, 365, 278,2169,  27,
+1407,1336,2304, 209,1340,1730,2202,1852,2403,2883, 979,1737,1062, 631,2829,2542,
+3876,2592, 825,2086,2226,3048,3625, 352,1417,3724, 542, 991, 431,1351,3938,1861,
+2294, 826,1361,2927,3142,3503,1738, 463,2462,2723, 582,1916,1595,2808, 400,3845,
+3891,2868,3621,2254,  58,2492,1123, 910,2160,2614,1372,1603,1196,1072,3385,1700,
+3267,1980, 696, 480,2430, 920, 799,1570,2920,1951,2041,4047,2540,1321,4223,2469,
+3562,2228,1271,2602, 401,2833,3351,2575,5157, 907,2312,1256, 410, 263,3507,1582,
+ 996, 678,1849,2316,1480, 908,3545,2237, 703,2322, 667,1826,2849,1531,2604,2999,
+2407,3146,2151,2630,1786,3711, 469,3542, 497,3899,2409, 858, 837,4446,3393,1274,
+ 786, 620,1845,2001,3311, 484, 308,3367,1204,1815,3691,2332,1532,2557,1842,2020,
+2724,1927,2333,4440, 567,  22,1673,2728,4475,1987,1858,1144,1597, 101,1832,3601,
+  12, 974,3783,4391, 951,1412,   1,3720, 453,4608,4041, 528,1041,1027,3230,2628,
+1129, 875,1051,3291,1203,2262,1069,2860,2799,2149,2615,3278, 144,1758,3040,  31,
+ 475,1680, 366,2685,3184, 311,1642,4008,2466,5036,1593,1493,2809, 216,1420,1668,
+ 233, 304,2128,3284, 232,1429,1768,1040,2008,3407,2740,2967,2543, 242,2133, 778,
+1565,2022,2620, 505,2189,2756,1098,2273, 372,1614, 708, 553,2846,2094,2278, 169,
+3626,2835,4161, 228,2674,3165, 809,1454,1309, 466,1705,1095, 900,3423, 880,2667,
+3751,5258,2317,3109,2571,4317,2766,1503,1342, 866,4447,1118,  63,2076, 314,1881,
+1348,1061, 172, 978,3515,1747, 532, 511,3970,   6, 601, 905,2699,3300,1751, 276,
+1467,3725,2668,  65,4239,2544,2779,2556,1604, 578,2451,1802, 992,2331,2624,1320,
+3446, 713,1513,1013, 103,2786,2447,1661, 886,1702, 916, 654,3574,2031,1556, 751,
+2178,2821,2179,1498,1538,2176, 271, 914,2251,2080,1325, 638,1953,2937,3877,2432,
+2754,  95,3265,1716, 260,1227,4083, 775, 106,1357,3254, 426,1607, 555,2480, 772,
+1985, 244,2546, 474, 495,1046,2611,1851,2061,  71,2089,1675,2590, 742,3758,2843,
+3222,1433, 267,2180,2576,2826,2233,2092,3913,2435, 956,1745,3075, 856,2113,1116,
+ 451,   3,1988,2896,1398, 993,2463,1878,2049,1341,2718,2721,2870,2108, 712,2904,
+4363,2753,2324, 277,2872,2349,2649, 384, 987, 435, 691,3000, 922, 164,3939, 652,
+1500,1184,4153,2482,3373,2165,4848,2335,3775,3508,3154,2806,2830,1554,2102,1664,
+2530,1434,2408, 893,1547,2623,3447,2832,2242,2532,3169,2856,3223,2078,  49,3770,
+3469, 462, 318, 656,2259,3250,3069, 679,1629,2758, 344,1138,1104,3120,1836,1283,
+3115,2154,1437,4448, 934, 759,1999, 794,2862,1038, 533,2560,1722,2342, 855,2626,
+1197,1663,4476,3127,  85,4240,2528,  25,1111,1181,3673, 407,3470,4561,2679,2713,
+ 768,1925,2841,3986,1544,1165, 932, 373,1240,2146,1930,2673, 721,4766, 354,4333,
+ 391,2963, 187,  61,3364,1442,1102, 330,1940,1767, 341,3809,4118, 393,2496,2062,
+2211, 105, 331, 300, 439, 913,1332, 626, 379,3304,1557, 328, 689,3952, 309,1555,
+ 931, 317,2517,3027, 325, 569, 686,2107,3084,  60,1042,1333,2794, 264,3177,4014,
+1628, 258,3712,   7,4464,1176,1043,1778, 683, 114,1975,  78,1492, 383,1886, 510,
+ 386, 645,5291,2891,2069,3305,4138,3867,2939,2603,2493,1935,1066,1848,3588,1015,
+1282,1289,4609, 697,1453,3044,2666,3611,1856,2412,  54, 719,1330, 568,3778,2459,
+1748, 788, 492, 551,1191,1000, 488,3394,3763, 282,1799, 348,2016,1523,3155,2390,
+1049, 382,2019,1788,1170, 729,2968,3523, 897,3926,2785,2938,3292, 350,2319,3238,
+1718,1717,2655,3453,3143,4465, 161,2889,2980,2009,1421,  56,1908,1640,2387,2232,
+1917,1874,2477,4921, 148,  83,3438, 592,4245,2882,1822,1055, 741, 115,1496,1624,
+ 381,1638,4592,1020, 516,3214, 458, 947,4575,1432, 211,1514,2926,1865,2142, 189,
+ 852,1221,1400,1486, 882,2299,4036, 351,  28,1122, 700,6479,6480,6481,6482,6483,  # last 512
+#Everything below is of no interest for detection purpose
+5508,6484,3900,3414,3974,4441,4024,3537,4037,5628,5099,3633,6485,3148,6486,3636,
+5509,3257,5510,5973,5445,5872,4941,4403,3174,4627,5873,6276,2286,4230,5446,5874,
+5122,6102,6103,4162,5447,5123,5323,4849,6277,3980,3851,5066,4246,5774,5067,6278,
+3001,2807,5695,3346,5775,5974,5158,5448,6487,5975,5976,5776,3598,6279,5696,4806,
+4211,4154,6280,6488,6489,6490,6281,4212,5037,3374,4171,6491,4562,4807,4722,4827,
+5977,6104,4532,4079,5159,5324,5160,4404,3858,5359,5875,3975,4288,4610,3486,4512,
+5325,3893,5360,6282,6283,5560,2522,4231,5978,5186,5449,2569,3878,6284,5401,3578,
+4415,6285,4656,5124,5979,2506,4247,4449,3219,3417,4334,4969,4329,6492,4576,4828,
+4172,4416,4829,5402,6286,3927,3852,5361,4369,4830,4477,4867,5876,4173,6493,6105,
+4657,6287,6106,5877,5450,6494,4155,4868,5451,3700,5629,4384,6288,6289,5878,3189,
+4881,6107,6290,6495,4513,6496,4692,4515,4723,5100,3356,6497,6291,3810,4080,5561,
+3570,4430,5980,6498,4355,5697,6499,4724,6108,6109,3764,4050,5038,5879,4093,3226,
+6292,5068,5217,4693,3342,5630,3504,4831,4377,4466,4309,5698,4431,5777,6293,5778,
+4272,3706,6110,5326,3752,4676,5327,4273,5403,4767,5631,6500,5699,5880,3475,5039,
+6294,5562,5125,4348,4301,4482,4068,5126,4593,5700,3380,3462,5981,5563,3824,5404,
+4970,5511,3825,4738,6295,6501,5452,4516,6111,5881,5564,6502,6296,5982,6503,4213,
+4163,3454,6504,6112,4009,4450,6113,4658,6297,6114,3035,6505,6115,3995,4904,4739,
+4563,4942,4110,5040,3661,3928,5362,3674,6506,5292,3612,4791,5565,4149,5983,5328,
+5259,5021,4725,4577,4564,4517,4364,6298,5405,4578,5260,4594,4156,4157,5453,3592,
+3491,6507,5127,5512,4709,4922,5984,5701,4726,4289,6508,4015,6116,5128,4628,3424,
+4241,5779,6299,4905,6509,6510,5454,5702,5780,6300,4365,4923,3971,6511,5161,3270,
+3158,5985,4100, 867,5129,5703,6117,5363,3695,3301,5513,4467,6118,6512,5455,4232,
+4242,4629,6513,3959,4478,6514,5514,5329,5986,4850,5162,5566,3846,4694,6119,5456,
+4869,5781,3779,6301,5704,5987,5515,4710,6302,5882,6120,4392,5364,5705,6515,6121,
+6516,6517,3736,5988,5457,5989,4695,2457,5883,4551,5782,6303,6304,6305,5130,4971,
+6122,5163,6123,4870,3263,5365,3150,4871,6518,6306,5783,5069,5706,3513,3498,4409,
+5330,5632,5366,5458,5459,3991,5990,4502,3324,5991,5784,3696,4518,5633,4119,6519,
+4630,5634,4417,5707,4832,5992,3418,6124,5993,5567,4768,5218,6520,4595,3458,5367,
+6125,5635,6126,4202,6521,4740,4924,6307,3981,4069,4385,6308,3883,2675,4051,3834,
+4302,4483,5568,5994,4972,4101,5368,6309,5164,5884,3922,6127,6522,6523,5261,5460,
+5187,4164,5219,3538,5516,4111,3524,5995,6310,6311,5369,3181,3386,2484,5188,3464,
+5569,3627,5708,6524,5406,5165,4677,4492,6312,4872,4851,5885,4468,5996,6313,5709,
+5710,6128,2470,5886,6314,5293,4882,5785,3325,5461,5101,6129,5711,5786,6525,4906,
+6526,6527,4418,5887,5712,4808,2907,3701,5713,5888,6528,3765,5636,5331,6529,6530,
+3593,5889,3637,4943,3692,5714,5787,4925,6315,6130,5462,4405,6131,6132,6316,5262,
+6531,6532,5715,3859,5716,5070,4696,5102,3929,5788,3987,4792,5997,6533,6534,3920,
+4809,5000,5998,6535,2974,5370,6317,5189,5263,5717,3826,6536,3953,5001,4883,3190,
+5463,5890,4973,5999,4741,6133,6134,3607,5570,6000,4711,3362,3630,4552,5041,6318,
+6001,2950,2953,5637,4646,5371,4944,6002,2044,4120,3429,6319,6537,5103,4833,6538,
+6539,4884,4647,3884,6003,6004,4758,3835,5220,5789,4565,5407,6540,6135,5294,4697,
+4852,6320,6321,3206,4907,6541,6322,4945,6542,6136,6543,6323,6005,4631,3519,6544,
+5891,6545,5464,3784,5221,6546,5571,4659,6547,6324,6137,5190,6548,3853,6549,4016,
+4834,3954,6138,5332,3827,4017,3210,3546,4469,5408,5718,3505,4648,5790,5131,5638,
+5791,5465,4727,4318,6325,6326,5792,4553,4010,4698,3439,4974,3638,4335,3085,6006,
+5104,5042,5166,5892,5572,6327,4356,4519,5222,5573,5333,5793,5043,6550,5639,5071,
+4503,6328,6139,6551,6140,3914,3901,5372,6007,5640,4728,4793,3976,3836,4885,6552,
+4127,6553,4451,4102,5002,6554,3686,5105,6555,5191,5072,5295,4611,5794,5296,6556,
+5893,5264,5894,4975,5466,5265,4699,4976,4370,4056,3492,5044,4886,6557,5795,4432,
+4769,4357,5467,3940,4660,4290,6141,4484,4770,4661,3992,6329,4025,4662,5022,4632,
+4835,4070,5297,4663,4596,5574,5132,5409,5895,6142,4504,5192,4664,5796,5896,3885,
+5575,5797,5023,4810,5798,3732,5223,4712,5298,4084,5334,5468,6143,4052,4053,4336,
+4977,4794,6558,5335,4908,5576,5224,4233,5024,4128,5469,5225,4873,6008,5045,4729,
+4742,4633,3675,4597,6559,5897,5133,5577,5003,5641,5719,6330,6560,3017,2382,3854,
+4406,4811,6331,4393,3964,4946,6561,2420,3722,6562,4926,4378,3247,1736,4442,6332,
+5134,6333,5226,3996,2918,5470,4319,4003,4598,4743,4744,4485,3785,3902,5167,5004,
+5373,4394,5898,6144,4874,1793,3997,6334,4085,4214,5106,5642,4909,5799,6009,4419,
+4189,3330,5899,4165,4420,5299,5720,5227,3347,6145,4081,6335,2876,3930,6146,3293,
+3786,3910,3998,5900,5300,5578,2840,6563,5901,5579,6147,3531,5374,6564,6565,5580,
+4759,5375,6566,6148,3559,5643,6336,6010,5517,6337,6338,5721,5902,3873,6011,6339,
+6567,5518,3868,3649,5722,6568,4771,4947,6569,6149,4812,6570,2853,5471,6340,6341,
+5644,4795,6342,6012,5723,6343,5724,6013,4349,6344,3160,6150,5193,4599,4514,4493,
+5168,4320,6345,4927,3666,4745,5169,5903,5005,4928,6346,5725,6014,4730,4203,5046,
+4948,3395,5170,6015,4150,6016,5726,5519,6347,5047,3550,6151,6348,4197,4310,5904,
+6571,5581,2965,6152,4978,3960,4291,5135,6572,5301,5727,4129,4026,5905,4853,5728,
+5472,6153,6349,4533,2700,4505,5336,4678,3583,5073,2994,4486,3043,4554,5520,6350,
+6017,5800,4487,6351,3931,4103,5376,6352,4011,4321,4311,4190,5136,6018,3988,3233,
+4350,5906,5645,4198,6573,5107,3432,4191,3435,5582,6574,4139,5410,6353,5411,3944,
+5583,5074,3198,6575,6354,4358,6576,5302,4600,5584,5194,5412,6577,6578,5585,5413,
+5303,4248,5414,3879,4433,6579,4479,5025,4854,5415,6355,4760,4772,3683,2978,4700,
+3797,4452,3965,3932,3721,4910,5801,6580,5195,3551,5907,3221,3471,3029,6019,3999,
+5908,5909,5266,5267,3444,3023,3828,3170,4796,5646,4979,4259,6356,5647,5337,3694,
+6357,5648,5338,4520,4322,5802,3031,3759,4071,6020,5586,4836,4386,5048,6581,3571,
+4679,4174,4949,6154,4813,3787,3402,3822,3958,3215,3552,5268,4387,3933,4950,4359,
+6021,5910,5075,3579,6358,4234,4566,5521,6359,3613,5049,6022,5911,3375,3702,3178,
+4911,5339,4521,6582,6583,4395,3087,3811,5377,6023,6360,6155,4027,5171,5649,4421,
+4249,2804,6584,2270,6585,4000,4235,3045,6156,5137,5729,4140,4312,3886,6361,4330,
+6157,4215,6158,3500,3676,4929,4331,3713,4930,5912,4265,3776,3368,5587,4470,4855,
+3038,4980,3631,6159,6160,4132,4680,6161,6362,3923,4379,5588,4255,6586,4121,6587,
+6363,4649,6364,3288,4773,4774,6162,6024,6365,3543,6588,4274,3107,3737,5050,5803,
+4797,4522,5589,5051,5730,3714,4887,5378,4001,4523,6163,5026,5522,4701,4175,2791,
+3760,6589,5473,4224,4133,3847,4814,4815,4775,3259,5416,6590,2738,6164,6025,5304,
+3733,5076,5650,4816,5590,6591,6165,6592,3934,5269,6593,3396,5340,6594,5804,3445,
+3602,4042,4488,5731,5732,3525,5591,4601,5196,6166,6026,5172,3642,4612,3202,4506,
+4798,6366,3818,5108,4303,5138,5139,4776,3332,4304,2915,3415,4434,5077,5109,4856,
+2879,5305,4817,6595,5913,3104,3144,3903,4634,5341,3133,5110,5651,5805,6167,4057,
+5592,2945,4371,5593,6596,3474,4182,6367,6597,6168,4507,4279,6598,2822,6599,4777,
+4713,5594,3829,6169,3887,5417,6170,3653,5474,6368,4216,2971,5228,3790,4579,6369,
+5733,6600,6601,4951,4746,4555,6602,5418,5475,6027,3400,4665,5806,6171,4799,6028,
+5052,6172,3343,4800,4747,5006,6370,4556,4217,5476,4396,5229,5379,5477,3839,5914,
+5652,5807,4714,3068,4635,5808,6173,5342,4192,5078,5419,5523,5734,6174,4557,6175,
+4602,6371,6176,6603,5809,6372,5735,4260,3869,5111,5230,6029,5112,6177,3126,4681,
+5524,5915,2706,3563,4748,3130,6178,4018,5525,6604,6605,5478,4012,4837,6606,4534,
+4193,5810,4857,3615,5479,6030,4082,3697,3539,4086,5270,3662,4508,4931,5916,4912,
+5811,5027,3888,6607,4397,3527,3302,3798,2775,2921,2637,3966,4122,4388,4028,4054,
+1633,4858,5079,3024,5007,3982,3412,5736,6608,3426,3236,5595,3030,6179,3427,3336,
+3279,3110,6373,3874,3039,5080,5917,5140,4489,3119,6374,5812,3405,4494,6031,4666,
+4141,6180,4166,6032,5813,4981,6609,5081,4422,4982,4112,3915,5653,3296,3983,6375,
+4266,4410,5654,6610,6181,3436,5082,6611,5380,6033,3819,5596,4535,5231,5306,5113,
+6612,4952,5918,4275,3113,6613,6376,6182,6183,5814,3073,4731,4838,5008,3831,6614,
+4888,3090,3848,4280,5526,5232,3014,5655,5009,5737,5420,5527,6615,5815,5343,5173,
+5381,4818,6616,3151,4953,6617,5738,2796,3204,4360,2989,4281,5739,5174,5421,5197,
+3132,5141,3849,5142,5528,5083,3799,3904,4839,5480,2880,4495,3448,6377,6184,5271,
+5919,3771,3193,6034,6035,5920,5010,6036,5597,6037,6378,6038,3106,5422,6618,5423,
+5424,4142,6619,4889,5084,4890,4313,5740,6620,3437,5175,5307,5816,4199,5198,5529,
+5817,5199,5656,4913,5028,5344,3850,6185,2955,5272,5011,5818,4567,4580,5029,5921,
+3616,5233,6621,6622,6186,4176,6039,6379,6380,3352,5200,5273,2908,5598,5234,3837,
+5308,6623,6624,5819,4496,4323,5309,5201,6625,6626,4983,3194,3838,4167,5530,5922,
+5274,6381,6382,3860,3861,5599,3333,4292,4509,6383,3553,5481,5820,5531,4778,6187,
+3955,3956,4324,4389,4218,3945,4325,3397,2681,5923,4779,5085,4019,5482,4891,5382,
+5383,6040,4682,3425,5275,4094,6627,5310,3015,5483,5657,4398,5924,3168,4819,6628,
+5925,6629,5532,4932,4613,6041,6630,4636,6384,4780,4204,5658,4423,5821,3989,4683,
+5822,6385,4954,6631,5345,6188,5425,5012,5384,3894,6386,4490,4104,6632,5741,5053,
+6633,5823,5926,5659,5660,5927,6634,5235,5742,5824,4840,4933,4820,6387,4859,5928,
+4955,6388,4143,3584,5825,5346,5013,6635,5661,6389,5014,5484,5743,4337,5176,5662,
+6390,2836,6391,3268,6392,6636,6042,5236,6637,4158,6638,5744,5663,4471,5347,3663,
+4123,5143,4293,3895,6639,6640,5311,5929,5826,3800,6189,6393,6190,5664,5348,3554,
+3594,4749,4603,6641,5385,4801,6043,5827,4183,6642,5312,5426,4761,6394,5665,6191,
+4715,2669,6643,6644,5533,3185,5427,5086,5930,5931,5386,6192,6044,6645,4781,4013,
+5745,4282,4435,5534,4390,4267,6045,5746,4984,6046,2743,6193,3501,4087,5485,5932,
+5428,4184,4095,5747,4061,5054,3058,3862,5933,5600,6646,5144,3618,6395,3131,5055,
+5313,6396,4650,4956,3855,6194,3896,5202,4985,4029,4225,6195,6647,5828,5486,5829,
+3589,3002,6648,6397,4782,5276,6649,6196,6650,4105,3803,4043,5237,5830,6398,4096,
+3643,6399,3528,6651,4453,3315,4637,6652,3984,6197,5535,3182,3339,6653,3096,2660,
+6400,6654,3449,5934,4250,4236,6047,6401,5831,6655,5487,3753,4062,5832,6198,6199,
+6656,3766,6657,3403,4667,6048,6658,4338,2897,5833,3880,2797,3780,4326,6659,5748,
+5015,6660,5387,4351,5601,4411,6661,3654,4424,5935,4339,4072,5277,4568,5536,6402,
+6662,5238,6663,5349,5203,6200,5204,6201,5145,4536,5016,5056,4762,5834,4399,4957,
+6202,6403,5666,5749,6664,4340,6665,5936,5177,5667,6666,6667,3459,4668,6404,6668,
+6669,4543,6203,6670,4276,6405,4480,5537,6671,4614,5205,5668,6672,3348,2193,4763,
+6406,6204,5937,5602,4177,5669,3419,6673,4020,6205,4443,4569,5388,3715,3639,6407,
+6049,4058,6206,6674,5938,4544,6050,4185,4294,4841,4651,4615,5488,6207,6408,6051,
+5178,3241,3509,5835,6208,4958,5836,4341,5489,5278,6209,2823,5538,5350,5206,5429,
+6675,4638,4875,4073,3516,4684,4914,4860,5939,5603,5389,6052,5057,3237,5490,3791,
+6676,6409,6677,4821,4915,4106,5351,5058,4243,5539,4244,5604,4842,4916,5239,3028,
+3716,5837,5114,5605,5390,5940,5430,6210,4332,6678,5540,4732,3667,3840,6053,4305,
+3408,5670,5541,6410,2744,5240,5750,6679,3234,5606,6680,5607,5671,3608,4283,4159,
+4400,5352,4783,6681,6411,6682,4491,4802,6211,6412,5941,6413,6414,5542,5751,6683,
+4669,3734,5942,6684,6415,5943,5059,3328,4670,4144,4268,6685,6686,6687,6688,4372,
+3603,6689,5944,5491,4373,3440,6416,5543,4784,4822,5608,3792,4616,5838,5672,3514,
+5391,6417,4892,6690,4639,6691,6054,5673,5839,6055,6692,6056,5392,6212,4038,5544,
+5674,4497,6057,6693,5840,4284,5675,4021,4545,5609,6418,4454,6419,6213,4113,4472,
+5314,3738,5087,5279,4074,5610,4959,4063,3179,4750,6058,6420,6214,3476,4498,4716,
+5431,4960,4685,6215,5241,6694,6421,6216,6695,5841,5945,6422,3748,5946,5179,3905,
+5752,5545,5947,4374,6217,4455,6423,4412,6218,4803,5353,6696,3832,5280,6219,4327,
+4702,6220,6221,6059,4652,5432,6424,3749,4751,6425,5753,4986,5393,4917,5948,5030,
+5754,4861,4733,6426,4703,6697,6222,4671,5949,4546,4961,5180,6223,5031,3316,5281,
+6698,4862,4295,4934,5207,3644,6427,5842,5950,6428,6429,4570,5843,5282,6430,6224,
+5088,3239,6060,6699,5844,5755,6061,6431,2701,5546,6432,5115,5676,4039,3993,3327,
+4752,4425,5315,6433,3941,6434,5677,4617,4604,3074,4581,6225,5433,6435,6226,6062,
+4823,5756,5116,6227,3717,5678,4717,5845,6436,5679,5846,6063,5847,6064,3977,3354,
+6437,3863,5117,6228,5547,5394,4499,4524,6229,4605,6230,4306,4500,6700,5951,6065,
+3693,5952,5089,4366,4918,6701,6231,5548,6232,6702,6438,4704,5434,6703,6704,5953,
+4168,6705,5680,3420,6706,5242,4407,6066,3812,5757,5090,5954,4672,4525,3481,5681,
+4618,5395,5354,5316,5955,6439,4962,6707,4526,6440,3465,4673,6067,6441,5682,6708,
+5435,5492,5758,5683,4619,4571,4674,4804,4893,4686,5493,4753,6233,6068,4269,6442,
+6234,5032,4705,5146,5243,5208,5848,6235,6443,4963,5033,4640,4226,6236,5849,3387,
+6444,6445,4436,4437,5850,4843,5494,4785,4894,6709,4361,6710,5091,5956,3331,6237,
+4987,5549,6069,6711,4342,3517,4473,5317,6070,6712,6071,4706,6446,5017,5355,6713,
+6714,4988,5436,6447,4734,5759,6715,4735,4547,4456,4754,6448,5851,6449,6450,3547,
+5852,5318,6451,6452,5092,4205,6716,6238,4620,4219,5611,6239,6072,4481,5760,5957,
+5958,4059,6240,6453,4227,4537,6241,5761,4030,4186,5244,5209,3761,4457,4876,3337,
+5495,5181,6242,5959,5319,5612,5684,5853,3493,5854,6073,4169,5613,5147,4895,6074,
+5210,6717,5182,6718,3830,6243,2798,3841,6075,6244,5855,5614,3604,4606,5496,5685,
+5118,5356,6719,6454,5960,5357,5961,6720,4145,3935,4621,5119,5962,4261,6721,6455,
+4786,5963,4375,4582,6245,6246,6247,6076,5437,4877,5856,3376,4380,6248,4160,6722,
+5148,6456,5211,6457,6723,4718,6458,6724,6249,5358,4044,3297,6459,6250,5857,5615,
+5497,5245,6460,5498,6725,6251,6252,5550,3793,5499,2959,5396,6461,6462,4572,5093,
+5500,5964,3806,4146,6463,4426,5762,5858,6077,6253,4755,3967,4220,5965,6254,4989,
+5501,6464,4352,6726,6078,4764,2290,5246,3906,5438,5283,3767,4964,2861,5763,5094,
+6255,6256,4622,5616,5859,5860,4707,6727,4285,4708,4824,5617,6257,5551,4787,5212,
+4965,4935,4687,6465,6728,6466,5686,6079,3494,4413,2995,5247,5966,5618,6729,5967,
+5764,5765,5687,5502,6730,6731,6080,5397,6467,4990,6258,6732,4538,5060,5619,6733,
+4719,5688,5439,5018,5149,5284,5503,6734,6081,4607,6259,5120,3645,5861,4583,6260,
+4584,4675,5620,4098,5440,6261,4863,2379,3306,4585,5552,5689,4586,5285,6735,4864,
+6736,5286,6082,6737,4623,3010,4788,4381,4558,5621,4587,4896,3698,3161,5248,4353,
+4045,6262,3754,5183,4588,6738,6263,6739,6740,5622,3936,6741,6468,6742,6264,5095,
+6469,4991,5968,6743,4992,6744,6083,4897,6745,4256,5766,4307,3108,3968,4444,5287,
+3889,4343,6084,4510,6085,4559,6086,4898,5969,6746,5623,5061,4919,5249,5250,5504,
+5441,6265,5320,4878,3242,5862,5251,3428,6087,6747,4237,5624,5442,6266,5553,4539,
+6748,2585,3533,5398,4262,6088,5150,4736,4438,6089,6267,5505,4966,6749,6268,6750,
+6269,5288,5554,3650,6090,6091,4624,6092,5690,6751,5863,4270,5691,4277,5555,5864,
+6752,5692,4720,4865,6470,5151,4688,4825,6753,3094,6754,6471,3235,4653,6755,5213,
+5399,6756,3201,4589,5865,4967,6472,5866,6473,5019,3016,6757,5321,4756,3957,4573,
+6093,4993,5767,4721,6474,6758,5625,6759,4458,6475,6270,6760,5556,4994,5214,5252,
+6271,3875,5768,6094,5034,5506,4376,5769,6761,2120,6476,5253,5770,6762,5771,5970,
+3990,5971,5557,5558,5772,6477,6095,2787,4641,5972,5121,6096,6097,6272,6763,3703,
+5867,5507,6273,4206,6274,4789,6098,6764,3619,3646,3833,3804,2394,3788,4936,3978,
+4866,4899,6099,6100,5559,6478,6765,3599,5868,6101,5869,5870,6275,6766,4527,6767)
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/gb2312prober.py b/lib/requests/packages/chardet/gb2312prober.py
new file mode 100644
index 00000000..0325a2d8
--- /dev/null
+++ b/lib/requests/packages/chardet/gb2312prober.py
@@ -0,0 +1,41 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .mbcharsetprober import MultiByteCharSetProber
+from .codingstatemachine import CodingStateMachine
+from .chardistribution import GB2312DistributionAnalysis
+from .mbcssm import GB2312SMModel
+
+class GB2312Prober(MultiByteCharSetProber):
+    def __init__(self):
+        MultiByteCharSetProber.__init__(self)
+        self._mCodingSM = CodingStateMachine(GB2312SMModel)
+        self._mDistributionAnalyzer = GB2312DistributionAnalysis()
+        self.reset()
+
+    def get_charset_name(self):
+        return "GB2312"
diff --git a/lib/requests/packages/chardet/hebrewprober.py b/lib/requests/packages/chardet/hebrewprober.py
new file mode 100644
index 00000000..ba225c5e
--- /dev/null
+++ b/lib/requests/packages/chardet/hebrewprober.py
@@ -0,0 +1,283 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Universal charset detector code.
+#
+# The Initial Developer of the Original Code is
+#          Shy Shalom
+# Portions created by the Initial Developer are Copyright (C) 2005
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .charsetprober import CharSetProber
+from .constants import eNotMe, eDetecting
+from .compat import wrap_ord
+
+# This prober doesn't actually recognize a language or a charset.
+# It is a helper prober for the use of the Hebrew model probers
+
+### General ideas of the Hebrew charset recognition ###
+#
+# Four main charsets exist in Hebrew:
+# "ISO-8859-8" - Visual Hebrew
+# "windows-1255" - Logical Hebrew
+# "ISO-8859-8-I" - Logical Hebrew
+# "x-mac-hebrew" - ?? Logical Hebrew ??
+#
+# Both "ISO" charsets use a completely identical set of code points, whereas
+# "windows-1255" and "x-mac-hebrew" are two different proper supersets of
+# these code points. windows-1255 defines additional characters in the range
+# 0x80-0x9F as some misc punctuation marks as well as some Hebrew-specific
+# diacritics and additional 'Yiddish' ligature letters in the range 0xc0-0xd6.
+# x-mac-hebrew defines similar additional code points but with a different
+# mapping.
+#
+# As far as an average Hebrew text with no diacritics is concerned, all four
+# charsets are identical with respect to code points. Meaning that for the
+# main Hebrew alphabet, all four map the same values to all 27 Hebrew letters
+# (including final letters).
+#
+# The dominant difference between these charsets is their directionality.
+# "Visual" directionality means that the text is ordered as if the renderer is
+# not aware of a BIDI rendering algorithm. The renderer sees the text and
+# draws it from left to right. The text itself when ordered naturally is read
+# backwards. A buffer of Visual Hebrew generally looks like so:
+# "[last word of first line spelled backwards] [whole line ordered backwards
+# and spelled backwards] [first word of first line spelled backwards]
+# [end of line] [last word of second line] ... etc' "
+# adding punctuation marks, numbers and English text to visual text is
+# naturally also "visual" and from left to right.
+#
+# "Logical" directionality means the text is ordered "naturally" according to
+# the order it is read. It is the responsibility of the renderer to display
+# the text from right to left. A BIDI algorithm is used to place general
+# punctuation marks, numbers and English text in the text.
+#
+# Texts in x-mac-hebrew are almost impossible to find on the Internet. From
+# what little evidence I could find, it seems that its general directionality
+# is Logical.
+#
+# To sum up all of the above, the Hebrew probing mechanism knows about two
+# charsets:
+# Visual Hebrew - "ISO-8859-8" - backwards text - Words and sentences are
+#    backwards while line order is natural. For charset recognition purposes
+#    the line order is unimportant (In fact, for this implementation, even
+#    word order is unimportant).
+# Logical Hebrew - "windows-1255" - normal, naturally ordered text.
+#
+# "ISO-8859-8-I" is a subset of windows-1255 and doesn't need to be
+#    specifically identified.
+# "x-mac-hebrew" is also identified as windows-1255. A text in x-mac-hebrew
+#    that contain special punctuation marks or diacritics is displayed with
+#    some unconverted characters showing as question marks. This problem might
+#    be corrected using another model prober for x-mac-hebrew. Due to the fact
+#    that x-mac-hebrew texts are so rare, writing another model prober isn't
+#    worth the effort and performance hit.
+#
+#### The Prober ####
+#
+# The prober is divided between two SBCharSetProbers and a HebrewProber,
+# all of which are managed, created, fed data, inquired and deleted by the
+# SBCSGroupProber. The two SBCharSetProbers identify that the text is in
+# fact some kind of Hebrew, Logical or Visual. The final decision about which
+# one is it is made by the HebrewProber by combining final-letter scores
+# with the scores of the two SBCharSetProbers to produce a final answer.
+#
+# The SBCSGroupProber is responsible for stripping the original text of HTML
+# tags, English characters, numbers, low-ASCII punctuation characters, spaces
+# and new lines. It reduces any sequence of such characters to a single space.
+# The buffer fed to each prober in the SBCS group prober is pure text in
+# high-ASCII.
+# The two SBCharSetProbers (model probers) share the same language model:
+# Win1255Model.
+# The first SBCharSetProber uses the model normally as any other
+# SBCharSetProber does, to recognize windows-1255, upon which this model was
+# built. The second SBCharSetProber is told to make the pair-of-letter
+# lookup in the language model backwards. This in practice exactly simulates
+# a visual Hebrew model using the windows-1255 logical Hebrew model.
+#
+# The HebrewProber is not using any language model. All it does is look for
+# final-letter evidence suggesting the text is either logical Hebrew or visual
+# Hebrew. Disjointed from the model probers, the results of the HebrewProber
+# alone are meaningless. HebrewProber always returns 0.00 as confidence
+# since it never identifies a charset by itself. Instead, the pointer to the
+# HebrewProber is passed to the model probers as a helper "Name Prober".
+# When the Group prober receives a positive identification from any prober,
+# it asks for the name of the charset identified. If the prober queried is a
+# Hebrew model prober, the model prober forwards the call to the
+# HebrewProber to make the final decision. In the HebrewProber, the
+# decision is made according to the final-letters scores maintained and Both
+# model probers scores. The answer is returned in the form of the name of the
+# charset identified, either "windows-1255" or "ISO-8859-8".
+
+# windows-1255 / ISO-8859-8 code points of interest
+FINAL_KAF = 0xea
+NORMAL_KAF = 0xeb
+FINAL_MEM = 0xed
+NORMAL_MEM = 0xee
+FINAL_NUN = 0xef
+NORMAL_NUN = 0xf0
+FINAL_PE = 0xf3
+NORMAL_PE = 0xf4
+FINAL_TSADI = 0xf5
+NORMAL_TSADI = 0xf6
+
+# Minimum Visual vs Logical final letter score difference.
+# If the difference is below this, don't rely solely on the final letter score
+# distance.
+MIN_FINAL_CHAR_DISTANCE = 5
+
+# Minimum Visual vs Logical model score difference.
+# If the difference is below this, don't rely at all on the model score
+# distance.
+MIN_MODEL_DISTANCE = 0.01
+
+VISUAL_HEBREW_NAME = "ISO-8859-8"
+LOGICAL_HEBREW_NAME = "windows-1255"
+
+
+class HebrewProber(CharSetProber):
+    def __init__(self):
+        CharSetProber.__init__(self)
+        self._mLogicalProber = None
+        self._mVisualProber = None
+        self.reset()
+
+    def reset(self):
+        self._mFinalCharLogicalScore = 0
+        self._mFinalCharVisualScore = 0
+        # The two last characters seen in the previous buffer,
+        # mPrev and mBeforePrev are initialized to space in order to simulate
+        # a word delimiter at the beginning of the data
+        self._mPrev = ' '
+        self._mBeforePrev = ' '
+        # These probers are owned by the group prober.
+
+    def set_model_probers(self, logicalProber, visualProber):
+        self._mLogicalProber = logicalProber
+        self._mVisualProber = visualProber
+
+    def is_final(self, c):
+        return wrap_ord(c) in [FINAL_KAF, FINAL_MEM, FINAL_NUN, FINAL_PE,
+                               FINAL_TSADI]
+
+    def is_non_final(self, c):
+        # The normal Tsadi is not a good Non-Final letter due to words like
+        # 'lechotet' (to chat) containing an apostrophe after the tsadi. This
+        # apostrophe is converted to a space in FilterWithoutEnglishLetters
+        # causing the Non-Final tsadi to appear at an end of a word even
+        # though this is not the case in the original text.
+        # The letters Pe and Kaf rarely display a related behavior of not being
+        # a good Non-Final letter. Words like 'Pop', 'Winamp' and 'Mubarak'
+        # for example legally end with a Non-Final Pe or Kaf. However, the
+        # benefit of these letters as Non-Final letters outweighs the damage
+        # since these words are quite rare.
+        return wrap_ord(c) in [NORMAL_KAF, NORMAL_MEM, NORMAL_NUN, NORMAL_PE]
+
+    def feed(self, aBuf):
+        # Final letter analysis for logical-visual decision.
+        # Look for evidence that the received buffer is either logical Hebrew
+        # or visual Hebrew.
+        # The following cases are checked:
+        # 1) A word longer than 1 letter, ending with a final letter. This is
+        #    an indication that the text is laid out "naturally" since the
+        #    final letter really appears at the end. +1 for logical score.
+        # 2) A word longer than 1 letter, ending with a Non-Final letter. In
+        #    normal Hebrew, words ending with Kaf, Mem, Nun, Pe or Tsadi,
+        #    should not end with the Non-Final form of that letter. Exceptions
+        #    to this rule are mentioned above in isNonFinal(). This is an
+        #    indication that the text is laid out backwards. +1 for visual
+        #    score
+        # 3) A word longer than 1 letter, starting with a final letter. Final
+        #    letters should not appear at the beginning of a word. This is an
+        #    indication that the text is laid out backwards. +1 for visual
+        #    score.
+        #
+        # The visual score and logical score are accumulated throughout the
+        # text and are finally checked against each other in GetCharSetName().
+        # No checking for final letters in the middle of words is done since
+        # that case is not an indication for either Logical or Visual text.
+        #
+        # We automatically filter out all 7-bit characters (replace them with
+        # spaces) so the word boundary detection works properly. [MAP]
+
+        if self.get_state() == eNotMe:
+            # Both model probers say it's not them. No reason to continue.
+            return eNotMe
+
+        aBuf = self.filter_high_bit_only(aBuf)
+
+        for cur in aBuf:
+            if cur == ' ':
+                # We stand on a space - a word just ended
+                if self._mBeforePrev != ' ':
+                    # next-to-last char was not a space so self._mPrev is not a
+                    # 1 letter word
+                    if self.is_final(self._mPrev):
+                        # case (1) [-2:not space][-1:final letter][cur:space]
+                        self._mFinalCharLogicalScore += 1
+                    elif self.is_non_final(self._mPrev):
+                        # case (2) [-2:not space][-1:Non-Final letter][
+                        #  cur:space]
+                        self._mFinalCharVisualScore += 1
+            else:
+                # Not standing on a space
+                if ((self._mBeforePrev == ' ') and
+                        (self.is_final(self._mPrev)) and (cur != ' ')):
+                    # case (3) [-2:space][-1:final letter][cur:not space]
+                    self._mFinalCharVisualScore += 1
+            self._mBeforePrev = self._mPrev
+            self._mPrev = cur
+
+        # Forever detecting, till the end or until both model probers return
+        # eNotMe (handled above)
+        return eDetecting
+
+    def get_charset_name(self):
+        # Make the decision: is it Logical or Visual?
+        # If the final letter score distance is dominant enough, rely on it.
+        finalsub = self._mFinalCharLogicalScore - self._mFinalCharVisualScore
+        if finalsub >= MIN_FINAL_CHAR_DISTANCE:
+            return LOGICAL_HEBREW_NAME
+        if finalsub <= -MIN_FINAL_CHAR_DISTANCE:
+            return VISUAL_HEBREW_NAME
+
+        # It's not dominant enough, try to rely on the model scores instead.
+        modelsub = (self._mLogicalProber.get_confidence()
+                    - self._mVisualProber.get_confidence())
+        if modelsub > MIN_MODEL_DISTANCE:
+            return LOGICAL_HEBREW_NAME
+        if modelsub < -MIN_MODEL_DISTANCE:
+            return VISUAL_HEBREW_NAME
+
+        # Still no good, back to final letter distance, maybe it'll save the
+        # day.
+        if finalsub < 0.0:
+            return VISUAL_HEBREW_NAME
+
+        # (finalsub > 0 - Logical) or (don't know what to do) default to
+        # Logical.
+        return LOGICAL_HEBREW_NAME
+
+    def get_state(self):
+        # Remain active as long as any of the model probers are active.
+        if (self._mLogicalProber.get_state() == eNotMe) and \
+           (self._mVisualProber.get_state() == eNotMe):
+            return eNotMe
+        return eDetecting
diff --git a/lib/requests/packages/chardet/jisfreq.py b/lib/requests/packages/chardet/jisfreq.py
new file mode 100644
index 00000000..064345b0
--- /dev/null
+++ b/lib/requests/packages/chardet/jisfreq.py
@@ -0,0 +1,569 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+# Sampling from about 20M text materials include literature and computer technology
+#
+# Japanese frequency table, applied to both S-JIS and EUC-JP
+# They are sorted in order.
+
+# 128  --> 0.77094
+# 256  --> 0.85710
+# 512  --> 0.92635
+# 1024 --> 0.97130
+# 2048 --> 0.99431
+#
+# Ideal Distribution Ratio = 0.92635 / (1-0.92635) = 12.58
+# Random Distribution Ration = 512 / (2965+62+83+86-512) = 0.191
+#
+# Typical Distribution Ratio, 25% of IDR
+
+JIS_TYPICAL_DISTRIBUTION_RATIO = 3.0
+
+# Char to FreqOrder table ,
+JIS_TABLE_SIZE = 4368
+
+JISCharToFreqOrder = (
+  40,   1,   6, 182, 152, 180, 295,2127, 285, 381,3295,4304,3068,4606,3165,3510, #   16
+3511,1822,2785,4607,1193,2226,5070,4608, 171,2996,1247,  18, 179,5071, 856,1661, #   32
+1262,5072, 619, 127,3431,3512,3230,1899,1700, 232, 228,1294,1298, 284, 283,2041, #   48
+2042,1061,1062,  48,  49,  44,  45, 433, 434,1040,1041, 996, 787,2997,1255,4305, #   64
+2108,4609,1684,1648,5073,5074,5075,5076,5077,5078,3687,5079,4610,5080,3927,3928, #   80
+5081,3296,3432, 290,2285,1471,2187,5082,2580,2825,1303,2140,1739,1445,2691,3375, #   96
+1691,3297,4306,4307,4611, 452,3376,1182,2713,3688,3069,4308,5083,5084,5085,5086, #  112
+5087,5088,5089,5090,5091,5092,5093,5094,5095,5096,5097,5098,5099,5100,5101,5102, #  128
+5103,5104,5105,5106,5107,5108,5109,5110,5111,5112,4097,5113,5114,5115,5116,5117, #  144
+5118,5119,5120,5121,5122,5123,5124,5125,5126,5127,5128,5129,5130,5131,5132,5133, #  160
+5134,5135,5136,5137,5138,5139,5140,5141,5142,5143,5144,5145,5146,5147,5148,5149, #  176
+5150,5151,5152,4612,5153,5154,5155,5156,5157,5158,5159,5160,5161,5162,5163,5164, #  192
+5165,5166,5167,5168,5169,5170,5171,5172,5173,5174,5175,1472, 598, 618, 820,1205, #  208
+1309,1412,1858,1307,1692,5176,5177,5178,5179,5180,5181,5182,1142,1452,1234,1172, #  224
+1875,2043,2149,1793,1382,2973, 925,2404,1067,1241, 960,1377,2935,1491, 919,1217, #  240
+1865,2030,1406,1499,2749,4098,5183,5184,5185,5186,5187,5188,2561,4099,3117,1804, #  256
+2049,3689,4309,3513,1663,5189,3166,3118,3298,1587,1561,3433,5190,3119,1625,2998, #  272
+3299,4613,1766,3690,2786,4614,5191,5192,5193,5194,2161,  26,3377,   2,3929,  20, #  288
+3691,  47,4100,  50,  17,  16,  35, 268,  27, 243,  42, 155,  24, 154,  29, 184, #  304
+   4,  91,  14,  92,  53, 396,  33, 289,   9,  37,  64, 620,  21,  39, 321,   5, #  320
+  12,  11,  52,  13,   3, 208, 138,   0,   7,  60, 526, 141, 151,1069, 181, 275, #  336
+1591,  83, 132,1475, 126, 331, 829,  15,  69, 160,  59,  22, 157,  55,1079, 312, #  352
+ 109,  38,  23,  25,  10,  19,  79,5195,  61, 382,1124,   8,  30,5196,5197,5198, #  368
+5199,5200,5201,5202,5203,5204,5205,5206,  89,  62,  74,  34,2416, 112, 139, 196, #  384
+ 271, 149,  84, 607, 131, 765,  46,  88, 153, 683,  76, 874, 101, 258,  57,  80, #  400
+  32, 364, 121,1508, 169,1547,  68, 235, 145,2999,  41, 360,3027,  70,  63,  31, #  416
+  43, 259, 262,1383,  99, 533, 194,  66,  93, 846, 217, 192,  56, 106,  58, 565, #  432
+ 280, 272, 311, 256, 146,  82, 308,  71, 100, 128, 214, 655, 110, 261, 104,1140, #  448
+  54,  51,  36,  87,  67,3070, 185,2618,2936,2020,  28,1066,2390,2059,5207,5208, #  464
+5209,5210,5211,5212,5213,5214,5215,5216,4615,5217,5218,5219,5220,5221,5222,5223, #  480
+5224,5225,5226,5227,5228,5229,5230,5231,5232,5233,5234,5235,5236,3514,5237,5238, #  496
+5239,5240,5241,5242,5243,5244,2297,2031,4616,4310,3692,5245,3071,5246,3598,5247, #  512
+4617,3231,3515,5248,4101,4311,4618,3808,4312,4102,5249,4103,4104,3599,5250,5251, #  528
+5252,5253,5254,5255,5256,5257,5258,5259,5260,5261,5262,5263,5264,5265,5266,5267, #  544
+5268,5269,5270,5271,5272,5273,5274,5275,5276,5277,5278,5279,5280,5281,5282,5283, #  560
+5284,5285,5286,5287,5288,5289,5290,5291,5292,5293,5294,5295,5296,5297,5298,5299, #  576
+5300,5301,5302,5303,5304,5305,5306,5307,5308,5309,5310,5311,5312,5313,5314,5315, #  592
+5316,5317,5318,5319,5320,5321,5322,5323,5324,5325,5326,5327,5328,5329,5330,5331, #  608
+5332,5333,5334,5335,5336,5337,5338,5339,5340,5341,5342,5343,5344,5345,5346,5347, #  624
+5348,5349,5350,5351,5352,5353,5354,5355,5356,5357,5358,5359,5360,5361,5362,5363, #  640
+5364,5365,5366,5367,5368,5369,5370,5371,5372,5373,5374,5375,5376,5377,5378,5379, #  656
+5380,5381, 363, 642,2787,2878,2788,2789,2316,3232,2317,3434,2011, 165,1942,3930, #  672
+3931,3932,3933,5382,4619,5383,4620,5384,5385,5386,5387,5388,5389,5390,5391,5392, #  688
+5393,5394,5395,5396,5397,5398,5399,5400,5401,5402,5403,5404,5405,5406,5407,5408, #  704
+5409,5410,5411,5412,5413,5414,5415,5416,5417,5418,5419,5420,5421,5422,5423,5424, #  720
+5425,5426,5427,5428,5429,5430,5431,5432,5433,5434,5435,5436,5437,5438,5439,5440, #  736
+5441,5442,5443,5444,5445,5446,5447,5448,5449,5450,5451,5452,5453,5454,5455,5456, #  752
+5457,5458,5459,5460,5461,5462,5463,5464,5465,5466,5467,5468,5469,5470,5471,5472, #  768
+5473,5474,5475,5476,5477,5478,5479,5480,5481,5482,5483,5484,5485,5486,5487,5488, #  784
+5489,5490,5491,5492,5493,5494,5495,5496,5497,5498,5499,5500,5501,5502,5503,5504, #  800
+5505,5506,5507,5508,5509,5510,5511,5512,5513,5514,5515,5516,5517,5518,5519,5520, #  816
+5521,5522,5523,5524,5525,5526,5527,5528,5529,5530,5531,5532,5533,5534,5535,5536, #  832
+5537,5538,5539,5540,5541,5542,5543,5544,5545,5546,5547,5548,5549,5550,5551,5552, #  848
+5553,5554,5555,5556,5557,5558,5559,5560,5561,5562,5563,5564,5565,5566,5567,5568, #  864
+5569,5570,5571,5572,5573,5574,5575,5576,5577,5578,5579,5580,5581,5582,5583,5584, #  880
+5585,5586,5587,5588,5589,5590,5591,5592,5593,5594,5595,5596,5597,5598,5599,5600, #  896
+5601,5602,5603,5604,5605,5606,5607,5608,5609,5610,5611,5612,5613,5614,5615,5616, #  912
+5617,5618,5619,5620,5621,5622,5623,5624,5625,5626,5627,5628,5629,5630,5631,5632, #  928
+5633,5634,5635,5636,5637,5638,5639,5640,5641,5642,5643,5644,5645,5646,5647,5648, #  944
+5649,5650,5651,5652,5653,5654,5655,5656,5657,5658,5659,5660,5661,5662,5663,5664, #  960
+5665,5666,5667,5668,5669,5670,5671,5672,5673,5674,5675,5676,5677,5678,5679,5680, #  976
+5681,5682,5683,5684,5685,5686,5687,5688,5689,5690,5691,5692,5693,5694,5695,5696, #  992
+5697,5698,5699,5700,5701,5702,5703,5704,5705,5706,5707,5708,5709,5710,5711,5712, # 1008
+5713,5714,5715,5716,5717,5718,5719,5720,5721,5722,5723,5724,5725,5726,5727,5728, # 1024
+5729,5730,5731,5732,5733,5734,5735,5736,5737,5738,5739,5740,5741,5742,5743,5744, # 1040
+5745,5746,5747,5748,5749,5750,5751,5752,5753,5754,5755,5756,5757,5758,5759,5760, # 1056
+5761,5762,5763,5764,5765,5766,5767,5768,5769,5770,5771,5772,5773,5774,5775,5776, # 1072
+5777,5778,5779,5780,5781,5782,5783,5784,5785,5786,5787,5788,5789,5790,5791,5792, # 1088
+5793,5794,5795,5796,5797,5798,5799,5800,5801,5802,5803,5804,5805,5806,5807,5808, # 1104
+5809,5810,5811,5812,5813,5814,5815,5816,5817,5818,5819,5820,5821,5822,5823,5824, # 1120
+5825,5826,5827,5828,5829,5830,5831,5832,5833,5834,5835,5836,5837,5838,5839,5840, # 1136
+5841,5842,5843,5844,5845,5846,5847,5848,5849,5850,5851,5852,5853,5854,5855,5856, # 1152
+5857,5858,5859,5860,5861,5862,5863,5864,5865,5866,5867,5868,5869,5870,5871,5872, # 1168
+5873,5874,5875,5876,5877,5878,5879,5880,5881,5882,5883,5884,5885,5886,5887,5888, # 1184
+5889,5890,5891,5892,5893,5894,5895,5896,5897,5898,5899,5900,5901,5902,5903,5904, # 1200
+5905,5906,5907,5908,5909,5910,5911,5912,5913,5914,5915,5916,5917,5918,5919,5920, # 1216
+5921,5922,5923,5924,5925,5926,5927,5928,5929,5930,5931,5932,5933,5934,5935,5936, # 1232
+5937,5938,5939,5940,5941,5942,5943,5944,5945,5946,5947,5948,5949,5950,5951,5952, # 1248
+5953,5954,5955,5956,5957,5958,5959,5960,5961,5962,5963,5964,5965,5966,5967,5968, # 1264
+5969,5970,5971,5972,5973,5974,5975,5976,5977,5978,5979,5980,5981,5982,5983,5984, # 1280
+5985,5986,5987,5988,5989,5990,5991,5992,5993,5994,5995,5996,5997,5998,5999,6000, # 1296
+6001,6002,6003,6004,6005,6006,6007,6008,6009,6010,6011,6012,6013,6014,6015,6016, # 1312
+6017,6018,6019,6020,6021,6022,6023,6024,6025,6026,6027,6028,6029,6030,6031,6032, # 1328
+6033,6034,6035,6036,6037,6038,6039,6040,6041,6042,6043,6044,6045,6046,6047,6048, # 1344
+6049,6050,6051,6052,6053,6054,6055,6056,6057,6058,6059,6060,6061,6062,6063,6064, # 1360
+6065,6066,6067,6068,6069,6070,6071,6072,6073,6074,6075,6076,6077,6078,6079,6080, # 1376
+6081,6082,6083,6084,6085,6086,6087,6088,6089,6090,6091,6092,6093,6094,6095,6096, # 1392
+6097,6098,6099,6100,6101,6102,6103,6104,6105,6106,6107,6108,6109,6110,6111,6112, # 1408
+6113,6114,2044,2060,4621, 997,1235, 473,1186,4622, 920,3378,6115,6116, 379,1108, # 1424
+4313,2657,2735,3934,6117,3809, 636,3233, 573,1026,3693,3435,2974,3300,2298,4105, # 1440
+ 854,2937,2463, 393,2581,2417, 539, 752,1280,2750,2480, 140,1161, 440, 708,1569, # 1456
+ 665,2497,1746,1291,1523,3000, 164,1603, 847,1331, 537,1997, 486, 508,1693,2418, # 1472
+1970,2227, 878,1220, 299,1030, 969, 652,2751, 624,1137,3301,2619,  65,3302,2045, # 1488
+1761,1859,3120,1930,3694,3516, 663,1767, 852, 835,3695, 269, 767,2826,2339,1305, # 1504
+ 896,1150, 770,1616,6118, 506,1502,2075,1012,2519, 775,2520,2975,2340,2938,4314, # 1520
+3028,2086,1224,1943,2286,6119,3072,4315,2240,1273,1987,3935,1557, 175, 597, 985, # 1536
+3517,2419,2521,1416,3029, 585, 938,1931,1007,1052,1932,1685,6120,3379,4316,4623, # 1552
+ 804, 599,3121,1333,2128,2539,1159,1554,2032,3810, 687,2033,2904, 952, 675,1467, # 1568
+3436,6121,2241,1096,1786,2440,1543,1924, 980,1813,2228, 781,2692,1879, 728,1918, # 1584
+3696,4624, 548,1950,4625,1809,1088,1356,3303,2522,1944, 502, 972, 373, 513,2827, # 1600
+ 586,2377,2391,1003,1976,1631,6122,2464,1084, 648,1776,4626,2141, 324, 962,2012, # 1616
+2177,2076,1384, 742,2178,1448,1173,1810, 222, 102, 301, 445, 125,2420, 662,2498, # 1632
+ 277, 200,1476,1165,1068, 224,2562,1378,1446, 450,1880, 659, 791, 582,4627,2939, # 1648
+3936,1516,1274, 555,2099,3697,1020,1389,1526,3380,1762,1723,1787,2229, 412,2114, # 1664
+1900,2392,3518, 512,2597, 427,1925,2341,3122,1653,1686,2465,2499, 697, 330, 273, # 1680
+ 380,2162, 951, 832, 780, 991,1301,3073, 965,2270,3519, 668,2523,2636,1286, 535, # 1696
+1407, 518, 671, 957,2658,2378, 267, 611,2197,3030,6123, 248,2299, 967,1799,2356, # 1712
+ 850,1418,3437,1876,1256,1480,2828,1718,6124,6125,1755,1664,2405,6126,4628,2879, # 1728
+2829, 499,2179, 676,4629, 557,2329,2214,2090, 325,3234, 464, 811,3001, 992,2342, # 1744
+2481,1232,1469, 303,2242, 466,1070,2163, 603,1777,2091,4630,2752,4631,2714, 322, # 1760
+2659,1964,1768, 481,2188,1463,2330,2857,3600,2092,3031,2421,4632,2318,2070,1849, # 1776
+2598,4633,1302,2254,1668,1701,2422,3811,2905,3032,3123,2046,4106,1763,1694,4634, # 1792
+1604, 943,1724,1454, 917, 868,2215,1169,2940, 552,1145,1800,1228,1823,1955, 316, # 1808
+1080,2510, 361,1807,2830,4107,2660,3381,1346,1423,1134,4108,6127, 541,1263,1229, # 1824
+1148,2540, 545, 465,1833,2880,3438,1901,3074,2482, 816,3937, 713,1788,2500, 122, # 1840
+1575, 195,1451,2501,1111,6128, 859, 374,1225,2243,2483,4317, 390,1033,3439,3075, # 1856
+2524,1687, 266, 793,1440,2599, 946, 779, 802, 507, 897,1081, 528,2189,1292, 711, # 1872
+1866,1725,1167,1640, 753, 398,2661,1053, 246, 348,4318, 137,1024,3440,1600,2077, # 1888
+2129, 825,4319, 698, 238, 521, 187,2300,1157,2423,1641,1605,1464,1610,1097,2541, # 1904
+1260,1436, 759,2255,1814,2150, 705,3235, 409,2563,3304, 561,3033,2005,2564, 726, # 1920
+1956,2343,3698,4109, 949,3812,3813,3520,1669, 653,1379,2525, 881,2198, 632,2256, # 1936
+1027, 778,1074, 733,1957, 514,1481,2466, 554,2180, 702,3938,1606,1017,1398,6129, # 1952
+1380,3521, 921, 993,1313, 594, 449,1489,1617,1166, 768,1426,1360, 495,1794,3601, # 1968
+1177,3602,1170,4320,2344, 476, 425,3167,4635,3168,1424, 401,2662,1171,3382,1998, # 1984
+1089,4110, 477,3169, 474,6130,1909, 596,2831,1842, 494, 693,1051,1028,1207,3076, # 2000
+ 606,2115, 727,2790,1473,1115, 743,3522, 630, 805,1532,4321,2021, 366,1057, 838, # 2016
+ 684,1114,2142,4322,2050,1492,1892,1808,2271,3814,2424,1971,1447,1373,3305,1090, # 2032
+1536,3939,3523,3306,1455,2199, 336, 369,2331,1035, 584,2393, 902, 718,2600,6131, # 2048
+2753, 463,2151,1149,1611,2467, 715,1308,3124,1268, 343,1413,3236,1517,1347,2663, # 2064
+2093,3940,2022,1131,1553,2100,2941,1427,3441,2942,1323,2484,6132,1980, 872,2368, # 2080
+2441,2943, 320,2369,2116,1082, 679,1933,3941,2791,3815, 625,1143,2023, 422,2200, # 2096
+3816,6133, 730,1695, 356,2257,1626,2301,2858,2637,1627,1778, 937, 883,2906,2693, # 2112
+3002,1769,1086, 400,1063,1325,3307,2792,4111,3077, 456,2345,1046, 747,6134,1524, # 2128
+ 884,1094,3383,1474,2164,1059, 974,1688,2181,2258,1047, 345,1665,1187, 358, 875, # 2144
+3170, 305, 660,3524,2190,1334,1135,3171,1540,1649,2542,1527, 927, 968,2793, 885, # 2160
+1972,1850, 482, 500,2638,1218,1109,1085,2543,1654,2034, 876,  78,2287,1482,1277, # 2176
+ 861,1675,1083,1779, 724,2754, 454, 397,1132,1612,2332, 893, 672,1237, 257,2259, # 2192
+2370, 135,3384, 337,2244, 547, 352, 340, 709,2485,1400, 788,1138,2511, 540, 772, # 2208
+1682,2260,2272,2544,2013,1843,1902,4636,1999,1562,2288,4637,2201,1403,1533, 407, # 2224
+ 576,3308,1254,2071, 978,3385, 170, 136,1201,3125,2664,3172,2394, 213, 912, 873, # 2240
+3603,1713,2202, 699,3604,3699, 813,3442, 493, 531,1054, 468,2907,1483, 304, 281, # 2256
+4112,1726,1252,2094, 339,2319,2130,2639, 756,1563,2944, 748, 571,2976,1588,2425, # 2272
+2715,1851,1460,2426,1528,1392,1973,3237, 288,3309, 685,3386, 296, 892,2716,2216, # 2288
+1570,2245, 722,1747,2217, 905,3238,1103,6135,1893,1441,1965, 251,1805,2371,3700, # 2304
+2601,1919,1078,  75,2182,1509,1592,1270,2640,4638,2152,6136,3310,3817, 524, 706, # 2320
+1075, 292,3818,1756,2602, 317,  98,3173,3605,3525,1844,2218,3819,2502, 814, 567, # 2336
+ 385,2908,1534,6137, 534,1642,3239, 797,6138,1670,1529, 953,4323, 188,1071, 538, # 2352
+ 178, 729,3240,2109,1226,1374,2000,2357,2977, 731,2468,1116,2014,2051,6139,1261, # 2368
+1593, 803,2859,2736,3443, 556, 682, 823,1541,6140,1369,2289,1706,2794, 845, 462, # 2384
+2603,2665,1361, 387, 162,2358,1740, 739,1770,1720,1304,1401,3241,1049, 627,1571, # 2400
+2427,3526,1877,3942,1852,1500, 431,1910,1503, 677, 297,2795, 286,1433,1038,1198, # 2416
+2290,1133,1596,4113,4639,2469,1510,1484,3943,6141,2442, 108, 712,4640,2372, 866, # 2432
+3701,2755,3242,1348, 834,1945,1408,3527,2395,3243,1811, 824, 994,1179,2110,1548, # 2448
+1453, 790,3003, 690,4324,4325,2832,2909,3820,1860,3821, 225,1748, 310, 346,1780, # 2464
+2470, 821,1993,2717,2796, 828, 877,3528,2860,2471,1702,2165,2910,2486,1789, 453, # 2480
+ 359,2291,1676,  73,1164,1461,1127,3311, 421, 604, 314,1037, 589, 116,2487, 737, # 2496
+ 837,1180, 111, 244, 735,6142,2261,1861,1362, 986, 523, 418, 581,2666,3822, 103, # 2512
+ 855, 503,1414,1867,2488,1091, 657,1597, 979, 605,1316,4641,1021,2443,2078,2001, # 2528
+1209,  96, 587,2166,1032, 260,1072,2153, 173,  94, 226,3244, 819,2006,4642,4114, # 2544
+2203, 231,1744, 782,  97,2667, 786,3387, 887, 391, 442,2219,4326,1425,6143,2694, # 2560
+ 633,1544,1202, 483,2015, 592,2052,1958,2472,1655, 419, 129,4327,3444,3312,1714, # 2576
+1257,3078,4328,1518,1098, 865,1310,1019,1885,1512,1734, 469,2444, 148, 773, 436, # 2592
+1815,1868,1128,1055,4329,1245,2756,3445,2154,1934,1039,4643, 579,1238, 932,2320, # 2608
+ 353, 205, 801, 115,2428, 944,2321,1881, 399,2565,1211, 678, 766,3944, 335,2101, # 2624
+1459,1781,1402,3945,2737,2131,1010, 844, 981,1326,1013, 550,1816,1545,2620,1335, # 2640
+1008, 371,2881, 936,1419,1613,3529,1456,1395,2273,1834,2604,1317,2738,2503, 416, # 2656
+1643,4330, 806,1126, 229, 591,3946,1314,1981,1576,1837,1666, 347,1790, 977,3313, # 2672
+ 764,2861,1853, 688,2429,1920,1462,  77, 595, 415,2002,3034, 798,1192,4115,6144, # 2688
+2978,4331,3035,2695,2582,2072,2566, 430,2430,1727, 842,1396,3947,3702, 613, 377, # 2704
+ 278, 236,1417,3388,3314,3174, 757,1869, 107,3530,6145,1194, 623,2262, 207,1253, # 2720
+2167,3446,3948, 492,1117,1935, 536,1838,2757,1246,4332, 696,2095,2406,1393,1572, # 2736
+3175,1782, 583, 190, 253,1390,2230, 830,3126,3389, 934,3245,1703,1749,2979,1870, # 2752
+2545,1656,2204, 869,2346,4116,3176,1817, 496,1764,4644, 942,1504, 404,1903,1122, # 2768
+1580,3606,2945,1022, 515, 372,1735, 955,2431,3036,6146,2797,1110,2302,2798, 617, # 2784
+6147, 441, 762,1771,3447,3607,3608,1904, 840,3037,  86, 939,1385, 572,1370,2445, # 2800
+1336, 114,3703, 898, 294, 203,3315, 703,1583,2274, 429, 961,4333,1854,1951,3390, # 2816
+2373,3704,4334,1318,1381, 966,1911,2322,1006,1155, 309, 989, 458,2718,1795,1372, # 2832
+1203, 252,1689,1363,3177, 517,1936, 168,1490, 562, 193,3823,1042,4117,1835, 551, # 2848
+ 470,4645, 395, 489,3448,1871,1465,2583,2641, 417,1493, 279,1295, 511,1236,1119, # 2864
+  72,1231,1982,1812,3004, 871,1564, 984,3449,1667,2696,2096,4646,2347,2833,1673, # 2880
+3609, 695,3246,2668, 807,1183,4647, 890, 388,2333,1801,1457,2911,1765,1477,1031, # 2896
+3316,3317,1278,3391,2799,2292,2526, 163,3450,4335,2669,1404,1802,6148,2323,2407, # 2912
+1584,1728,1494,1824,1269, 298, 909,3318,1034,1632, 375, 776,1683,2061, 291, 210, # 2928
+1123, 809,1249,1002,2642,3038, 206,1011,2132, 144, 975, 882,1565, 342, 667, 754, # 2944
+1442,2143,1299,2303,2062, 447, 626,2205,1221,2739,2912,1144,1214,2206,2584, 760, # 2960
+1715, 614, 950,1281,2670,2621, 810, 577,1287,2546,4648, 242,2168, 250,2643, 691, # 2976
+ 123,2644, 647, 313,1029, 689,1357,2946,1650, 216, 771,1339,1306, 808,2063, 549, # 2992
+ 913,1371,2913,2914,6149,1466,1092,1174,1196,1311,2605,2396,1783,1796,3079, 406, # 3008
+2671,2117,3949,4649, 487,1825,2220,6150,2915, 448,2348,1073,6151,2397,1707, 130, # 3024
+ 900,1598, 329, 176,1959,2527,1620,6152,2275,4336,3319,1983,2191,3705,3610,2155, # 3040
+3706,1912,1513,1614,6153,1988, 646, 392,2304,1589,3320,3039,1826,1239,1352,1340, # 3056
+2916, 505,2567,1709,1437,2408,2547, 906,6154,2672, 384,1458,1594,1100,1329, 710, # 3072
+ 423,3531,2064,2231,2622,1989,2673,1087,1882, 333, 841,3005,1296,2882,2379, 580, # 3088
+1937,1827,1293,2585, 601, 574, 249,1772,4118,2079,1120, 645, 901,1176,1690, 795, # 3104
+2207, 478,1434, 516,1190,1530, 761,2080, 930,1264, 355, 435,1552, 644,1791, 987, # 3120
+ 220,1364,1163,1121,1538, 306,2169,1327,1222, 546,2645, 218, 241, 610,1704,3321, # 3136
+1984,1839,1966,2528, 451,6155,2586,3707,2568, 907,3178, 254,2947, 186,1845,4650, # 3152
+ 745, 432,1757, 428,1633, 888,2246,2221,2489,3611,2118,1258,1265, 956,3127,1784, # 3168
+4337,2490, 319, 510, 119, 457,3612, 274,2035,2007,4651,1409,3128, 970,2758, 590, # 3184
+2800, 661,2247,4652,2008,3950,1420,1549,3080,3322,3951,1651,1375,2111, 485,2491, # 3200
+1429,1156,6156,2548,2183,1495, 831,1840,2529,2446, 501,1657, 307,1894,3247,1341, # 3216
+ 666, 899,2156,1539,2549,1559, 886, 349,2208,3081,2305,1736,3824,2170,2759,1014, # 3232
+1913,1386, 542,1397,2948, 490, 368, 716, 362, 159, 282,2569,1129,1658,1288,1750, # 3248
+2674, 276, 649,2016, 751,1496, 658,1818,1284,1862,2209,2087,2512,3451, 622,2834, # 3264
+ 376, 117,1060,2053,1208,1721,1101,1443, 247,1250,3179,1792,3952,2760,2398,3953, # 3280
+6157,2144,3708, 446,2432,1151,2570,3452,2447,2761,2835,1210,2448,3082, 424,2222, # 3296
+1251,2449,2119,2836, 504,1581,4338, 602, 817, 857,3825,2349,2306, 357,3826,1470, # 3312
+1883,2883, 255, 958, 929,2917,3248, 302,4653,1050,1271,1751,2307,1952,1430,2697, # 3328
+2719,2359, 354,3180, 777, 158,2036,4339,1659,4340,4654,2308,2949,2248,1146,2232, # 3344
+3532,2720,1696,2623,3827,6158,3129,1550,2698,1485,1297,1428, 637, 931,2721,2145, # 3360
+ 914,2550,2587,  81,2450, 612, 827,2646,1242,4655,1118,2884, 472,1855,3181,3533, # 3376
+3534, 569,1353,2699,1244,1758,2588,4119,2009,2762,2171,3709,1312,1531,6159,1152, # 3392
+1938, 134,1830, 471,3710,2276,1112,1535,3323,3453,3535, 982,1337,2950, 488, 826, # 3408
+ 674,1058,1628,4120,2017, 522,2399, 211, 568,1367,3454, 350, 293,1872,1139,3249, # 3424
+1399,1946,3006,1300,2360,3324, 588, 736,6160,2606, 744, 669,3536,3828,6161,1358, # 3440
+ 199, 723, 848, 933, 851,1939,1505,1514,1338,1618,1831,4656,1634,3613, 443,2740, # 3456
+3829, 717,1947, 491,1914,6162,2551,1542,4121,1025,6163,1099,1223, 198,3040,2722, # 3472
+ 370, 410,1905,2589, 998,1248,3182,2380, 519,1449,4122,1710, 947, 928,1153,4341, # 3488
+2277, 344,2624,1511, 615, 105, 161,1212,1076,1960,3130,2054,1926,1175,1906,2473, # 3504
+ 414,1873,2801,6164,2309, 315,1319,3325, 318,2018,2146,2157, 963, 631, 223,4342, # 3520
+4343,2675, 479,3711,1197,2625,3712,2676,2361,6165,4344,4123,6166,2451,3183,1886, # 3536
+2184,1674,1330,1711,1635,1506, 799, 219,3250,3083,3954,1677,3713,3326,2081,3614, # 3552
+1652,2073,4657,1147,3041,1752, 643,1961, 147,1974,3955,6167,1716,2037, 918,3007, # 3568
+1994, 120,1537, 118, 609,3184,4345, 740,3455,1219, 332,1615,3830,6168,1621,2980, # 3584
+1582, 783, 212, 553,2350,3714,1349,2433,2082,4124, 889,6169,2310,1275,1410, 973, # 3600
+ 166,1320,3456,1797,1215,3185,2885,1846,2590,2763,4658, 629, 822,3008, 763, 940, # 3616
+1990,2862, 439,2409,1566,1240,1622, 926,1282,1907,2764, 654,2210,1607, 327,1130, # 3632
+3956,1678,1623,6170,2434,2192, 686, 608,3831,3715, 903,3957,3042,6171,2741,1522, # 3648
+1915,1105,1555,2552,1359, 323,3251,4346,3457, 738,1354,2553,2311,2334,1828,2003, # 3664
+3832,1753,2351,1227,6172,1887,4125,1478,6173,2410,1874,1712,1847, 520,1204,2607, # 3680
+ 264,4659, 836,2677,2102, 600,4660,3833,2278,3084,6174,4347,3615,1342, 640, 532, # 3696
+ 543,2608,1888,2400,2591,1009,4348,1497, 341,1737,3616,2723,1394, 529,3252,1321, # 3712
+ 983,4661,1515,2120, 971,2592, 924, 287,1662,3186,4349,2700,4350,1519, 908,1948, # 3728
+2452, 156, 796,1629,1486,2223,2055, 694,4126,1259,1036,3392,1213,2249,2742,1889, # 3744
+1230,3958,1015, 910, 408, 559,3617,4662, 746, 725, 935,4663,3959,3009,1289, 563, # 3760
+ 867,4664,3960,1567,2981,2038,2626, 988,2263,2381,4351, 143,2374, 704,1895,6175, # 3776
+1188,3716,2088, 673,3085,2362,4352, 484,1608,1921,2765,2918, 215, 904,3618,3537, # 3792
+ 894, 509, 976,3043,2701,3961,4353,2837,2982, 498,6176,6177,1102,3538,1332,3393, # 3808
+1487,1636,1637, 233, 245,3962, 383, 650, 995,3044, 460,1520,1206,2352, 749,3327, # 3824
+ 530, 700, 389,1438,1560,1773,3963,2264, 719,2951,2724,3834, 870,1832,1644,1000, # 3840
+ 839,2474,3717, 197,1630,3394, 365,2886,3964,1285,2133, 734, 922, 818,1106, 732, # 3856
+ 480,2083,1774,3458, 923,2279,1350, 221,3086,  85,2233,2234,3835,1585,3010,2147, # 3872
+1387,1705,2382,1619,2475, 133, 239,2802,1991,1016,2084,2383, 411,2838,1113, 651, # 3888
+1985,1160,3328, 990,1863,3087,1048,1276,2647, 265,2627,1599,3253,2056, 150, 638, # 3904
+2019, 656, 853, 326,1479, 680,1439,4354,1001,1759, 413,3459,3395,2492,1431, 459, # 3920
+4355,1125,3329,2265,1953,1450,2065,2863, 849, 351,2678,3131,3254,3255,1104,1577, # 3936
+ 227,1351,1645,2453,2193,1421,2887, 812,2121, 634,  95,2435, 201,2312,4665,1646, # 3952
+1671,2743,1601,2554,2702,2648,2280,1315,1366,2089,3132,1573,3718,3965,1729,1189, # 3968
+ 328,2679,1077,1940,1136, 558,1283, 964,1195, 621,2074,1199,1743,3460,3619,1896, # 3984
+1916,1890,3836,2952,1154,2112,1064, 862, 378,3011,2066,2113,2803,1568,2839,6178, # 4000
+3088,2919,1941,1660,2004,1992,2194, 142, 707,1590,1708,1624,1922,1023,1836,1233, # 4016
+1004,2313, 789, 741,3620,6179,1609,2411,1200,4127,3719,3720,4666,2057,3721, 593, # 4032
+2840, 367,2920,1878,6180,3461,1521, 628,1168, 692,2211,2649, 300, 720,2067,2571, # 4048
+2953,3396, 959,2504,3966,3539,3462,1977, 701,6181, 954,1043, 800, 681, 183,3722, # 4064
+1803,1730,3540,4128,2103, 815,2314, 174, 467, 230,2454,1093,2134, 755,3541,3397, # 4080
+1141,1162,6182,1738,2039, 270,3256,2513,1005,1647,2185,3837, 858,1679,1897,1719, # 4096
+2954,2324,1806, 402, 670, 167,4129,1498,2158,2104, 750,6183, 915, 189,1680,1551, # 4112
+ 455,4356,1501,2455, 405,1095,2955, 338,1586,1266,1819, 570, 641,1324, 237,1556, # 4128
+2650,1388,3723,6184,1368,2384,1343,1978,3089,2436, 879,3724, 792,1191, 758,3012, # 4144
+1411,2135,1322,4357, 240,4667,1848,3725,1574,6185, 420,3045,1546,1391, 714,4358, # 4160
+1967, 941,1864, 863, 664, 426, 560,1731,2680,1785,2864,1949,2363, 403,3330,1415, # 4176
+1279,2136,1697,2335, 204, 721,2097,3838,  90,6186,2085,2505, 191,3967, 124,2148, # 4192
+1376,1798,1178,1107,1898,1405, 860,4359,1243,1272,2375,2983,1558,2456,1638, 113, # 4208
+3621, 578,1923,2609, 880, 386,4130, 784,2186,2266,1422,2956,2172,1722, 497, 263, # 4224
+2514,1267,2412,2610, 177,2703,3542, 774,1927,1344, 616,1432,1595,1018, 172,4360, # 4240
+2325, 911,4361, 438,1468,3622, 794,3968,2024,2173,1681,1829,2957, 945, 895,3090, # 4256
+ 575,2212,2476, 475,2401,2681, 785,2744,1745,2293,2555,1975,3133,2865, 394,4668, # 4272
+3839, 635,4131, 639, 202,1507,2195,2766,1345,1435,2572,3726,1908,1184,1181,2457, # 4288
+3727,3134,4362, 843,2611, 437, 916,4669, 234, 769,1884,3046,3047,3623, 833,6187, # 4304
+1639,2250,2402,1355,1185,2010,2047, 999, 525,1732,1290,1488,2612, 948,1578,3728, # 4320
+2413,2477,1216,2725,2159, 334,3840,1328,3624,2921,1525,4132, 564,1056, 891,4363, # 4336
+1444,1698,2385,2251,3729,1365,2281,2235,1717,6188, 864,3841,2515, 444, 527,2767, # 4352
+2922,3625, 544, 461,6189, 566, 209,2437,3398,2098,1065,2068,3331,3626,3257,2137, # 4368  #last 512
+#Everything below is of no interest for detection purpose
+2138,2122,3730,2888,1995,1820,1044,6190,6191,6192,6193,6194,6195,6196,6197,6198, # 4384
+6199,6200,6201,6202,6203,6204,6205,4670,6206,6207,6208,6209,6210,6211,6212,6213, # 4400
+6214,6215,6216,6217,6218,6219,6220,6221,6222,6223,6224,6225,6226,6227,6228,6229, # 4416
+6230,6231,6232,6233,6234,6235,6236,6237,3187,6238,6239,3969,6240,6241,6242,6243, # 4432
+6244,4671,6245,6246,4672,6247,6248,4133,6249,6250,4364,6251,2923,2556,2613,4673, # 4448
+4365,3970,6252,6253,6254,6255,4674,6256,6257,6258,2768,2353,4366,4675,4676,3188, # 4464
+4367,3463,6259,4134,4677,4678,6260,2267,6261,3842,3332,4368,3543,6262,6263,6264, # 4480
+3013,1954,1928,4135,4679,6265,6266,2478,3091,6267,4680,4369,6268,6269,1699,6270, # 4496
+3544,4136,4681,6271,4137,6272,4370,2804,6273,6274,2593,3971,3972,4682,6275,2236, # 4512
+4683,6276,6277,4684,6278,6279,4138,3973,4685,6280,6281,3258,6282,6283,6284,6285, # 4528
+3974,4686,2841,3975,6286,6287,3545,6288,6289,4139,4687,4140,6290,4141,6291,4142, # 4544
+6292,6293,3333,6294,6295,6296,4371,6297,3399,6298,6299,4372,3976,6300,6301,6302, # 4560
+4373,6303,6304,3843,3731,6305,4688,4374,6306,6307,3259,2294,6308,3732,2530,4143, # 4576
+6309,4689,6310,6311,6312,3048,6313,6314,4690,3733,2237,6315,6316,2282,3334,6317, # 4592
+6318,3844,6319,6320,4691,6321,3400,4692,6322,4693,6323,3049,6324,4375,6325,3977, # 4608
+6326,6327,6328,3546,6329,4694,3335,6330,4695,4696,6331,6332,6333,6334,4376,3978, # 4624
+6335,4697,3979,4144,6336,3980,4698,6337,6338,6339,6340,6341,4699,4700,4701,6342, # 4640
+6343,4702,6344,6345,4703,6346,6347,4704,6348,4705,4706,3135,6349,4707,6350,4708, # 4656
+6351,4377,6352,4709,3734,4145,6353,2506,4710,3189,6354,3050,4711,3981,6355,3547, # 4672
+3014,4146,4378,3735,2651,3845,3260,3136,2224,1986,6356,3401,6357,4712,2594,3627, # 4688
+3137,2573,3736,3982,4713,3628,4714,4715,2682,3629,4716,6358,3630,4379,3631,6359, # 4704
+6360,6361,3983,6362,6363,6364,6365,4147,3846,4717,6366,6367,3737,2842,6368,4718, # 4720
+2628,6369,3261,6370,2386,6371,6372,3738,3984,4719,3464,4720,3402,6373,2924,3336, # 4736
+4148,2866,6374,2805,3262,4380,2704,2069,2531,3138,2806,2984,6375,2769,6376,4721, # 4752
+4722,3403,6377,6378,3548,6379,6380,2705,3092,1979,4149,2629,3337,2889,6381,3338, # 4768
+4150,2557,3339,4381,6382,3190,3263,3739,6383,4151,4723,4152,2558,2574,3404,3191, # 4784
+6384,6385,4153,6386,4724,4382,6387,6388,4383,6389,6390,4154,6391,4725,3985,6392, # 4800
+3847,4155,6393,6394,6395,6396,6397,3465,6398,4384,6399,6400,6401,6402,6403,6404, # 4816
+4156,6405,6406,6407,6408,2123,6409,6410,2326,3192,4726,6411,6412,6413,6414,4385, # 4832
+4157,6415,6416,4158,6417,3093,3848,6418,3986,6419,6420,3849,6421,6422,6423,4159, # 4848
+6424,6425,4160,6426,3740,6427,6428,6429,6430,3987,6431,4727,6432,2238,6433,6434, # 4864
+4386,3988,6435,6436,3632,6437,6438,2843,6439,6440,6441,6442,3633,6443,2958,6444, # 4880
+6445,3466,6446,2364,4387,3850,6447,4388,2959,3340,6448,3851,6449,4728,6450,6451, # 4896
+3264,4729,6452,3193,6453,4389,4390,2706,3341,4730,6454,3139,6455,3194,6456,3051, # 4912
+2124,3852,1602,4391,4161,3853,1158,3854,4162,3989,4392,3990,4731,4732,4393,2040, # 4928
+4163,4394,3265,6457,2807,3467,3855,6458,6459,6460,3991,3468,4733,4734,6461,3140, # 4944
+2960,6462,4735,6463,6464,6465,6466,4736,4737,4738,4739,6467,6468,4164,2403,3856, # 4960
+6469,6470,2770,2844,6471,4740,6472,6473,6474,6475,6476,6477,6478,3195,6479,4741, # 4976
+4395,6480,2867,6481,4742,2808,6482,2493,4165,6483,6484,6485,6486,2295,4743,6487, # 4992
+6488,6489,3634,6490,6491,6492,6493,6494,6495,6496,2985,4744,6497,6498,4745,6499, # 5008
+6500,2925,3141,4166,6501,6502,4746,6503,6504,4747,6505,6506,6507,2890,6508,6509, # 5024
+6510,6511,6512,6513,6514,6515,6516,6517,6518,6519,3469,4167,6520,6521,6522,4748, # 5040
+4396,3741,4397,4749,4398,3342,2125,4750,6523,4751,4752,4753,3052,6524,2961,4168, # 5056
+6525,4754,6526,4755,4399,2926,4169,6527,3857,6528,4400,4170,6529,4171,6530,6531, # 5072
+2595,6532,6533,6534,6535,3635,6536,6537,6538,6539,6540,6541,6542,4756,6543,6544, # 5088
+6545,6546,6547,6548,4401,6549,6550,6551,6552,4402,3405,4757,4403,6553,6554,6555, # 5104
+4172,3742,6556,6557,6558,3992,3636,6559,6560,3053,2726,6561,3549,4173,3054,4404, # 5120
+6562,6563,3993,4405,3266,3550,2809,4406,6564,6565,6566,4758,4759,6567,3743,6568, # 5136
+4760,3744,4761,3470,6569,6570,6571,4407,6572,3745,4174,6573,4175,2810,4176,3196, # 5152
+4762,6574,4177,6575,6576,2494,2891,3551,6577,6578,3471,6579,4408,6580,3015,3197, # 5168
+6581,3343,2532,3994,3858,6582,3094,3406,4409,6583,2892,4178,4763,4410,3016,4411, # 5184
+6584,3995,3142,3017,2683,6585,4179,6586,6587,4764,4412,6588,6589,4413,6590,2986, # 5200
+6591,2962,3552,6592,2963,3472,6593,6594,4180,4765,6595,6596,2225,3267,4414,6597, # 5216
+3407,3637,4766,6598,6599,3198,6600,4415,6601,3859,3199,6602,3473,4767,2811,4416, # 5232
+1856,3268,3200,2575,3996,3997,3201,4417,6603,3095,2927,6604,3143,6605,2268,6606, # 5248
+3998,3860,3096,2771,6607,6608,3638,2495,4768,6609,3861,6610,3269,2745,4769,4181, # 5264
+3553,6611,2845,3270,6612,6613,6614,3862,6615,6616,4770,4771,6617,3474,3999,4418, # 5280
+4419,6618,3639,3344,6619,4772,4182,6620,2126,6621,6622,6623,4420,4773,6624,3018, # 5296
+6625,4774,3554,6626,4183,2025,3746,6627,4184,2707,6628,4421,4422,3097,1775,4185, # 5312
+3555,6629,6630,2868,6631,6632,4423,6633,6634,4424,2414,2533,2928,6635,4186,2387, # 5328
+6636,4775,6637,4187,6638,1891,4425,3202,3203,6639,6640,4776,6641,3345,6642,6643, # 5344
+3640,6644,3475,3346,3641,4000,6645,3144,6646,3098,2812,4188,3642,3204,6647,3863, # 5360
+3476,6648,3864,6649,4426,4001,6650,6651,6652,2576,6653,4189,4777,6654,6655,6656, # 5376
+2846,6657,3477,3205,4002,6658,4003,6659,3347,2252,6660,6661,6662,4778,6663,6664, # 5392
+6665,6666,6667,6668,6669,4779,4780,2048,6670,3478,3099,6671,3556,3747,4004,6672, # 5408
+6673,6674,3145,4005,3748,6675,6676,6677,6678,6679,3408,6680,6681,6682,6683,3206, # 5424
+3207,6684,6685,4781,4427,6686,4782,4783,4784,6687,6688,6689,4190,6690,6691,3479, # 5440
+6692,2746,6693,4428,6694,6695,6696,6697,6698,6699,4785,6700,6701,3208,2727,6702, # 5456
+3146,6703,6704,3409,2196,6705,4429,6706,6707,6708,2534,1996,6709,6710,6711,2747, # 5472
+6712,6713,6714,4786,3643,6715,4430,4431,6716,3557,6717,4432,4433,6718,6719,6720, # 5488
+6721,3749,6722,4006,4787,6723,6724,3644,4788,4434,6725,6726,4789,2772,6727,6728, # 5504
+6729,6730,6731,2708,3865,2813,4435,6732,6733,4790,4791,3480,6734,6735,6736,6737, # 5520
+4436,3348,6738,3410,4007,6739,6740,4008,6741,6742,4792,3411,4191,6743,6744,6745, # 5536
+6746,6747,3866,6748,3750,6749,6750,6751,6752,6753,6754,6755,3867,6756,4009,6757, # 5552
+4793,4794,6758,2814,2987,6759,6760,6761,4437,6762,6763,6764,6765,3645,6766,6767, # 5568
+3481,4192,6768,3751,6769,6770,2174,6771,3868,3752,6772,6773,6774,4193,4795,4438, # 5584
+3558,4796,4439,6775,4797,6776,6777,4798,6778,4799,3559,4800,6779,6780,6781,3482, # 5600
+6782,2893,6783,6784,4194,4801,4010,6785,6786,4440,6787,4011,6788,6789,6790,6791, # 5616
+6792,6793,4802,6794,6795,6796,4012,6797,6798,6799,6800,3349,4803,3483,6801,4804, # 5632
+4195,6802,4013,6803,6804,4196,6805,4014,4015,6806,2847,3271,2848,6807,3484,6808, # 5648
+6809,6810,4441,6811,4442,4197,4443,3272,4805,6812,3412,4016,1579,6813,6814,4017, # 5664
+6815,3869,6816,2964,6817,4806,6818,6819,4018,3646,6820,6821,4807,4019,4020,6822, # 5680
+6823,3560,6824,6825,4021,4444,6826,4198,6827,6828,4445,6829,6830,4199,4808,6831, # 5696
+6832,6833,3870,3019,2458,6834,3753,3413,3350,6835,4809,3871,4810,3561,4446,6836, # 5712
+6837,4447,4811,4812,6838,2459,4448,6839,4449,6840,6841,4022,3872,6842,4813,4814, # 5728
+6843,6844,4815,4200,4201,4202,6845,4023,6846,6847,4450,3562,3873,6848,6849,4816, # 5744
+4817,6850,4451,4818,2139,6851,3563,6852,6853,3351,6854,6855,3352,4024,2709,3414, # 5760
+4203,4452,6856,4204,6857,6858,3874,3875,6859,6860,4819,6861,6862,6863,6864,4453, # 5776
+3647,6865,6866,4820,6867,6868,6869,6870,4454,6871,2869,6872,6873,4821,6874,3754, # 5792
+6875,4822,4205,6876,6877,6878,3648,4206,4455,6879,4823,6880,4824,3876,6881,3055, # 5808
+4207,6882,3415,6883,6884,6885,4208,4209,6886,4210,3353,6887,3354,3564,3209,3485, # 5824
+2652,6888,2728,6889,3210,3755,6890,4025,4456,6891,4825,6892,6893,6894,6895,4211, # 5840
+6896,6897,6898,4826,6899,6900,4212,6901,4827,6902,2773,3565,6903,4828,6904,6905, # 5856
+6906,6907,3649,3650,6908,2849,3566,6909,3567,3100,6910,6911,6912,6913,6914,6915, # 5872
+4026,6916,3355,4829,3056,4457,3756,6917,3651,6918,4213,3652,2870,6919,4458,6920, # 5888
+2438,6921,6922,3757,2774,4830,6923,3356,4831,4832,6924,4833,4459,3653,2507,6925, # 5904
+4834,2535,6926,6927,3273,4027,3147,6928,3568,6929,6930,6931,4460,6932,3877,4461, # 5920
+2729,3654,6933,6934,6935,6936,2175,4835,2630,4214,4028,4462,4836,4215,6937,3148, # 5936
+4216,4463,4837,4838,4217,6938,6939,2850,4839,6940,4464,6941,6942,6943,4840,6944, # 5952
+4218,3274,4465,6945,6946,2710,6947,4841,4466,6948,6949,2894,6950,6951,4842,6952, # 5968
+4219,3057,2871,6953,6954,6955,6956,4467,6957,2711,6958,6959,6960,3275,3101,4843, # 5984
+6961,3357,3569,6962,4844,6963,6964,4468,4845,3570,6965,3102,4846,3758,6966,4847, # 6000
+3878,4848,4849,4029,6967,2929,3879,4850,4851,6968,6969,1733,6970,4220,6971,6972, # 6016
+6973,6974,6975,6976,4852,6977,6978,6979,6980,6981,6982,3759,6983,6984,6985,3486, # 6032
+3487,6986,3488,3416,6987,6988,6989,6990,6991,6992,6993,6994,6995,6996,6997,4853, # 6048
+6998,6999,4030,7000,7001,3211,7002,7003,4221,7004,7005,3571,4031,7006,3572,7007, # 6064
+2614,4854,2577,7008,7009,2965,3655,3656,4855,2775,3489,3880,4222,4856,3881,4032, # 6080
+3882,3657,2730,3490,4857,7010,3149,7011,4469,4858,2496,3491,4859,2283,7012,7013, # 6096
+7014,2365,4860,4470,7015,7016,3760,7017,7018,4223,1917,7019,7020,7021,4471,7022, # 6112
+2776,4472,7023,7024,7025,7026,4033,7027,3573,4224,4861,4034,4862,7028,7029,1929, # 6128
+3883,4035,7030,4473,3058,7031,2536,3761,3884,7032,4036,7033,2966,2895,1968,4474, # 6144
+3276,4225,3417,3492,4226,2105,7034,7035,1754,2596,3762,4227,4863,4475,3763,4864, # 6160
+3764,2615,2777,3103,3765,3658,3418,4865,2296,3766,2815,7036,7037,7038,3574,2872, # 6176
+3277,4476,7039,4037,4477,7040,7041,4038,7042,7043,7044,7045,7046,7047,2537,7048, # 6192
+7049,7050,7051,7052,7053,7054,4478,7055,7056,3767,3659,4228,3575,7057,7058,4229, # 6208
+7059,7060,7061,3660,7062,3212,7063,3885,4039,2460,7064,7065,7066,7067,7068,7069, # 6224
+7070,7071,7072,7073,7074,4866,3768,4867,7075,7076,7077,7078,4868,3358,3278,2653, # 6240
+7079,7080,4479,3886,7081,7082,4869,7083,7084,7085,7086,7087,7088,2538,7089,7090, # 6256
+7091,4040,3150,3769,4870,4041,2896,3359,4230,2930,7092,3279,7093,2967,4480,3213, # 6272
+4481,3661,7094,7095,7096,7097,7098,7099,7100,7101,7102,2461,3770,7103,7104,4231, # 6288
+3151,7105,7106,7107,4042,3662,7108,7109,4871,3663,4872,4043,3059,7110,7111,7112, # 6304
+3493,2988,7113,4873,7114,7115,7116,3771,4874,7117,7118,4232,4875,7119,3576,2336, # 6320
+4876,7120,4233,3419,4044,4877,4878,4482,4483,4879,4484,4234,7121,3772,4880,1045, # 6336
+3280,3664,4881,4882,7122,7123,7124,7125,4883,7126,2778,7127,4485,4486,7128,4884, # 6352
+3214,3887,7129,7130,3215,7131,4885,4045,7132,7133,4046,7134,7135,7136,7137,7138, # 6368
+7139,7140,7141,7142,7143,4235,7144,4886,7145,7146,7147,4887,7148,7149,7150,4487, # 6384
+4047,4488,7151,7152,4888,4048,2989,3888,7153,3665,7154,4049,7155,7156,7157,7158, # 6400
+7159,7160,2931,4889,4890,4489,7161,2631,3889,4236,2779,7162,7163,4891,7164,3060, # 6416
+7165,1672,4892,7166,4893,4237,3281,4894,7167,7168,3666,7169,3494,7170,7171,4050, # 6432
+7172,7173,3104,3360,3420,4490,4051,2684,4052,7174,4053,7175,7176,7177,2253,4054, # 6448
+7178,7179,4895,7180,3152,3890,3153,4491,3216,7181,7182,7183,2968,4238,4492,4055, # 6464
+7184,2990,7185,2479,7186,7187,4493,7188,7189,7190,7191,7192,4896,7193,4897,2969, # 6480
+4494,4898,7194,3495,7195,7196,4899,4495,7197,3105,2731,7198,4900,7199,7200,7201, # 6496
+4056,7202,3361,7203,7204,4496,4901,4902,7205,4497,7206,7207,2315,4903,7208,4904, # 6512
+7209,4905,2851,7210,7211,3577,7212,3578,4906,7213,4057,3667,4907,7214,4058,2354, # 6528
+3891,2376,3217,3773,7215,7216,7217,7218,7219,4498,7220,4908,3282,2685,7221,3496, # 6544
+4909,2632,3154,4910,7222,2337,7223,4911,7224,7225,7226,4912,4913,3283,4239,4499, # 6560
+7227,2816,7228,7229,7230,7231,7232,7233,7234,4914,4500,4501,7235,7236,7237,2686, # 6576
+7238,4915,7239,2897,4502,7240,4503,7241,2516,7242,4504,3362,3218,7243,7244,7245, # 6592
+4916,7246,7247,4505,3363,7248,7249,7250,7251,3774,4506,7252,7253,4917,7254,7255, # 6608
+3284,2991,4918,4919,3219,3892,4920,3106,3497,4921,7256,7257,7258,4922,7259,4923, # 6624
+3364,4507,4508,4059,7260,4240,3498,7261,7262,4924,7263,2992,3893,4060,3220,7264, # 6640
+7265,7266,7267,7268,7269,4509,3775,7270,2817,7271,4061,4925,4510,3776,7272,4241, # 6656
+4511,3285,7273,7274,3499,7275,7276,7277,4062,4512,4926,7278,3107,3894,7279,7280, # 6672
+4927,7281,4513,7282,7283,3668,7284,7285,4242,4514,4243,7286,2058,4515,4928,4929, # 6688
+4516,7287,3286,4244,7288,4517,7289,7290,7291,3669,7292,7293,4930,4931,4932,2355, # 6704
+4933,7294,2633,4518,7295,4245,7296,7297,4519,7298,7299,4520,4521,4934,7300,4246, # 6720
+4522,7301,7302,7303,3579,7304,4247,4935,7305,4936,7306,7307,7308,7309,3777,7310, # 6736
+4523,7311,7312,7313,4248,3580,7314,4524,3778,4249,7315,3581,7316,3287,7317,3221, # 6752
+7318,4937,7319,7320,7321,7322,7323,7324,4938,4939,7325,4525,7326,7327,7328,4063, # 6768
+7329,7330,4940,7331,7332,4941,7333,4526,7334,3500,2780,1741,4942,2026,1742,7335, # 6784
+7336,3582,4527,2388,7337,7338,7339,4528,7340,4250,4943,7341,7342,7343,4944,7344, # 6800
+7345,7346,3020,7347,4945,7348,7349,7350,7351,3895,7352,3896,4064,3897,7353,7354, # 6816
+7355,4251,7356,7357,3898,7358,3779,7359,3780,3288,7360,7361,4529,7362,4946,4530, # 6832
+2027,7363,3899,4531,4947,3222,3583,7364,4948,7365,7366,7367,7368,4949,3501,4950, # 6848
+3781,4951,4532,7369,2517,4952,4252,4953,3155,7370,4954,4955,4253,2518,4533,7371, # 6864
+7372,2712,4254,7373,7374,7375,3670,4956,3671,7376,2389,3502,4065,7377,2338,7378, # 6880
+7379,7380,7381,3061,7382,4957,7383,7384,7385,7386,4958,4534,7387,7388,2993,7389, # 6896
+3062,7390,4959,7391,7392,7393,4960,3108,4961,7394,4535,7395,4962,3421,4536,7396, # 6912
+4963,7397,4964,1857,7398,4965,7399,7400,2176,3584,4966,7401,7402,3422,4537,3900, # 6928
+3585,7403,3782,7404,2852,7405,7406,7407,4538,3783,2654,3423,4967,4539,7408,3784, # 6944
+3586,2853,4540,4541,7409,3901,7410,3902,7411,7412,3785,3109,2327,3903,7413,7414, # 6960
+2970,4066,2932,7415,7416,7417,3904,3672,3424,7418,4542,4543,4544,7419,4968,7420, # 6976
+7421,4255,7422,7423,7424,7425,7426,4067,7427,3673,3365,4545,7428,3110,2559,3674, # 6992
+7429,7430,3156,7431,7432,3503,7433,3425,4546,7434,3063,2873,7435,3223,4969,4547, # 7008
+4548,2898,4256,4068,7436,4069,3587,3786,2933,3787,4257,4970,4971,3788,7437,4972, # 7024
+3064,7438,4549,7439,7440,7441,7442,7443,4973,3905,7444,2874,7445,7446,7447,7448, # 7040
+3021,7449,4550,3906,3588,4974,7450,7451,3789,3675,7452,2578,7453,4070,7454,7455, # 7056
+7456,4258,3676,7457,4975,7458,4976,4259,3790,3504,2634,4977,3677,4551,4260,7459, # 7072
+7460,7461,7462,3907,4261,4978,7463,7464,7465,7466,4979,4980,7467,7468,2213,4262, # 7088
+7469,7470,7471,3678,4981,7472,2439,7473,4263,3224,3289,7474,3908,2415,4982,7475, # 7104
+4264,7476,4983,2655,7477,7478,2732,4552,2854,2875,7479,7480,4265,7481,4553,4984, # 7120
+7482,7483,4266,7484,3679,3366,3680,2818,2781,2782,3367,3589,4554,3065,7485,4071, # 7136
+2899,7486,7487,3157,2462,4072,4555,4073,4985,4986,3111,4267,2687,3368,4556,4074, # 7152
+3791,4268,7488,3909,2783,7489,2656,1962,3158,4557,4987,1963,3159,3160,7490,3112, # 7168
+4988,4989,3022,4990,4991,3792,2855,7491,7492,2971,4558,7493,7494,4992,7495,7496, # 7184
+7497,7498,4993,7499,3426,4559,4994,7500,3681,4560,4269,4270,3910,7501,4075,4995, # 7200
+4271,7502,7503,4076,7504,4996,7505,3225,4997,4272,4077,2819,3023,7506,7507,2733, # 7216
+4561,7508,4562,7509,3369,3793,7510,3590,2508,7511,7512,4273,3113,2994,2616,7513, # 7232
+7514,7515,7516,7517,7518,2820,3911,4078,2748,7519,7520,4563,4998,7521,7522,7523, # 7248
+7524,4999,4274,7525,4564,3682,2239,4079,4565,7526,7527,7528,7529,5000,7530,7531, # 7264
+5001,4275,3794,7532,7533,7534,3066,5002,4566,3161,7535,7536,4080,7537,3162,7538, # 7280
+7539,4567,7540,7541,7542,7543,7544,7545,5003,7546,4568,7547,7548,7549,7550,7551, # 7296
+7552,7553,7554,7555,7556,5004,7557,7558,7559,5005,7560,3795,7561,4569,7562,7563, # 7312
+7564,2821,3796,4276,4277,4081,7565,2876,7566,5006,7567,7568,2900,7569,3797,3912, # 7328
+7570,7571,7572,4278,7573,7574,7575,5007,7576,7577,5008,7578,7579,4279,2934,7580, # 7344
+7581,5009,7582,4570,7583,4280,7584,7585,7586,4571,4572,3913,7587,4573,3505,7588, # 7360
+5010,7589,7590,7591,7592,3798,4574,7593,7594,5011,7595,4281,7596,7597,7598,4282, # 7376
+5012,7599,7600,5013,3163,7601,5014,7602,3914,7603,7604,2734,4575,4576,4577,7605, # 7392
+7606,7607,7608,7609,3506,5015,4578,7610,4082,7611,2822,2901,2579,3683,3024,4579, # 7408
+3507,7612,4580,7613,3226,3799,5016,7614,7615,7616,7617,7618,7619,7620,2995,3290, # 7424
+7621,4083,7622,5017,7623,7624,7625,7626,7627,4581,3915,7628,3291,7629,5018,7630, # 7440
+7631,7632,7633,4084,7634,7635,3427,3800,7636,7637,4582,7638,5019,4583,5020,7639, # 7456
+3916,7640,3801,5021,4584,4283,7641,7642,3428,3591,2269,7643,2617,7644,4585,3592, # 7472
+7645,4586,2902,7646,7647,3227,5022,7648,4587,7649,4284,7650,7651,7652,4588,2284, # 7488
+7653,5023,7654,7655,7656,4589,5024,3802,7657,7658,5025,3508,4590,7659,7660,7661, # 7504
+1969,5026,7662,7663,3684,1821,2688,7664,2028,2509,4285,7665,2823,1841,7666,2689, # 7520
+3114,7667,3917,4085,2160,5027,5028,2972,7668,5029,7669,7670,7671,3593,4086,7672, # 7536
+4591,4087,5030,3803,7673,7674,7675,7676,7677,7678,7679,4286,2366,4592,4593,3067, # 7552
+2328,7680,7681,4594,3594,3918,2029,4287,7682,5031,3919,3370,4288,4595,2856,7683, # 7568
+3509,7684,7685,5032,5033,7686,7687,3804,2784,7688,7689,7690,7691,3371,7692,7693, # 7584
+2877,5034,7694,7695,3920,4289,4088,7696,7697,7698,5035,7699,5036,4290,5037,5038, # 7600
+5039,7700,7701,7702,5040,5041,3228,7703,1760,7704,5042,3229,4596,2106,4089,7705, # 7616
+4597,2824,5043,2107,3372,7706,4291,4090,5044,7707,4091,7708,5045,3025,3805,4598, # 7632
+4292,4293,4294,3373,7709,4599,7710,5046,7711,7712,5047,5048,3806,7713,7714,7715, # 7648
+5049,7716,7717,7718,7719,4600,5050,7720,7721,7722,5051,7723,4295,3429,7724,7725, # 7664
+7726,7727,3921,7728,3292,5052,4092,7729,7730,7731,7732,7733,7734,7735,5053,5054, # 7680
+7736,7737,7738,7739,3922,3685,7740,7741,7742,7743,2635,5055,7744,5056,4601,7745, # 7696
+7746,2560,7747,7748,7749,7750,3923,7751,7752,7753,7754,7755,4296,2903,7756,7757, # 7712
+7758,7759,7760,3924,7761,5057,4297,7762,7763,5058,4298,7764,4093,7765,7766,5059, # 7728
+3925,7767,7768,7769,7770,7771,7772,7773,7774,7775,7776,3595,7777,4299,5060,4094, # 7744
+7778,3293,5061,7779,7780,4300,7781,7782,4602,7783,3596,7784,7785,3430,2367,7786, # 7760
+3164,5062,5063,4301,7787,7788,4095,5064,5065,7789,3374,3115,7790,7791,7792,7793, # 7776
+7794,7795,7796,3597,4603,7797,7798,3686,3116,3807,5066,7799,7800,5067,7801,7802, # 7792
+4604,4302,5068,4303,4096,7803,7804,3294,7805,7806,5069,4605,2690,7807,3026,7808, # 7808
+7809,7810,7811,7812,7813,7814,7815,7816,7817,7818,7819,7820,7821,7822,7823,7824, # 7824
+7825,7826,7827,7828,7829,7830,7831,7832,7833,7834,7835,7836,7837,7838,7839,7840, # 7840
+7841,7842,7843,7844,7845,7846,7847,7848,7849,7850,7851,7852,7853,7854,7855,7856, # 7856
+7857,7858,7859,7860,7861,7862,7863,7864,7865,7866,7867,7868,7869,7870,7871,7872, # 7872
+7873,7874,7875,7876,7877,7878,7879,7880,7881,7882,7883,7884,7885,7886,7887,7888, # 7888
+7889,7890,7891,7892,7893,7894,7895,7896,7897,7898,7899,7900,7901,7902,7903,7904, # 7904
+7905,7906,7907,7908,7909,7910,7911,7912,7913,7914,7915,7916,7917,7918,7919,7920, # 7920
+7921,7922,7923,7924,3926,7925,7926,7927,7928,7929,7930,7931,7932,7933,7934,7935, # 7936
+7936,7937,7938,7939,7940,7941,7942,7943,7944,7945,7946,7947,7948,7949,7950,7951, # 7952
+7952,7953,7954,7955,7956,7957,7958,7959,7960,7961,7962,7963,7964,7965,7966,7967, # 7968
+7968,7969,7970,7971,7972,7973,7974,7975,7976,7977,7978,7979,7980,7981,7982,7983, # 7984
+7984,7985,7986,7987,7988,7989,7990,7991,7992,7993,7994,7995,7996,7997,7998,7999, # 8000
+8000,8001,8002,8003,8004,8005,8006,8007,8008,8009,8010,8011,8012,8013,8014,8015, # 8016
+8016,8017,8018,8019,8020,8021,8022,8023,8024,8025,8026,8027,8028,8029,8030,8031, # 8032
+8032,8033,8034,8035,8036,8037,8038,8039,8040,8041,8042,8043,8044,8045,8046,8047, # 8048
+8048,8049,8050,8051,8052,8053,8054,8055,8056,8057,8058,8059,8060,8061,8062,8063, # 8064
+8064,8065,8066,8067,8068,8069,8070,8071,8072,8073,8074,8075,8076,8077,8078,8079, # 8080
+8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095, # 8096
+8096,8097,8098,8099,8100,8101,8102,8103,8104,8105,8106,8107,8108,8109,8110,8111, # 8112
+8112,8113,8114,8115,8116,8117,8118,8119,8120,8121,8122,8123,8124,8125,8126,8127, # 8128
+8128,8129,8130,8131,8132,8133,8134,8135,8136,8137,8138,8139,8140,8141,8142,8143, # 8144
+8144,8145,8146,8147,8148,8149,8150,8151,8152,8153,8154,8155,8156,8157,8158,8159, # 8160
+8160,8161,8162,8163,8164,8165,8166,8167,8168,8169,8170,8171,8172,8173,8174,8175, # 8176
+8176,8177,8178,8179,8180,8181,8182,8183,8184,8185,8186,8187,8188,8189,8190,8191, # 8192
+8192,8193,8194,8195,8196,8197,8198,8199,8200,8201,8202,8203,8204,8205,8206,8207, # 8208
+8208,8209,8210,8211,8212,8213,8214,8215,8216,8217,8218,8219,8220,8221,8222,8223, # 8224
+8224,8225,8226,8227,8228,8229,8230,8231,8232,8233,8234,8235,8236,8237,8238,8239, # 8240
+8240,8241,8242,8243,8244,8245,8246,8247,8248,8249,8250,8251,8252,8253,8254,8255, # 8256
+8256,8257,8258,8259,8260,8261,8262,8263,8264,8265,8266,8267,8268,8269,8270,8271) # 8272
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/jpcntx.py b/lib/requests/packages/chardet/jpcntx.py
new file mode 100644
index 00000000..59aeb6a8
--- /dev/null
+++ b/lib/requests/packages/chardet/jpcntx.py
@@ -0,0 +1,227 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .compat import wrap_ord
+
+NUM_OF_CATEGORY = 6
+DONT_KNOW = -1
+ENOUGH_REL_THRESHOLD = 100
+MAX_REL_THRESHOLD = 1000
+MINIMUM_DATA_THRESHOLD = 4
+
+# This is hiragana 2-char sequence table, the number in each cell represents its frequency category
+jp2CharContext = (
+(0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1),
+(2,4,0,4,0,3,0,4,0,3,4,4,4,2,4,3,3,4,3,2,3,3,4,2,3,3,3,2,4,1,4,3,3,1,5,4,3,4,3,4,3,5,3,0,3,5,4,2,0,3,1,0,3,3,0,3,3,0,1,1,0,4,3,0,3,3,0,4,0,2,0,3,5,5,5,5,4,0,4,1,0,3,4),
+(0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2),
+(0,4,0,5,0,5,0,4,0,4,5,4,4,3,5,3,5,1,5,3,4,3,4,4,3,4,3,3,4,3,5,4,4,3,5,5,3,5,5,5,3,5,5,3,4,5,5,3,1,3,2,0,3,4,0,4,2,0,4,2,1,5,3,2,3,5,0,4,0,2,0,5,4,4,5,4,5,0,4,0,0,4,4),
+(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
+(0,3,0,4,0,3,0,3,0,4,5,4,3,3,3,3,4,3,5,4,4,3,5,4,4,3,4,3,4,4,4,4,5,3,4,4,3,4,5,5,4,5,5,1,4,5,4,3,0,3,3,1,3,3,0,4,4,0,3,3,1,5,3,3,3,5,0,4,0,3,0,4,4,3,4,3,3,0,4,1,1,3,4),
+(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
+(0,4,0,3,0,3,0,4,0,3,4,4,3,2,2,1,2,1,3,1,3,3,3,3,3,4,3,1,3,3,5,3,3,0,4,3,0,5,4,3,3,5,4,4,3,4,4,5,0,1,2,0,1,2,0,2,2,0,1,0,0,5,2,2,1,4,0,3,0,1,0,4,4,3,5,4,3,0,2,1,0,4,3),
+(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
+(0,3,0,5,0,4,0,2,1,4,4,2,4,1,4,2,4,2,4,3,3,3,4,3,3,3,3,1,4,2,3,3,3,1,4,4,1,1,1,4,3,3,2,0,2,4,3,2,0,3,3,0,3,1,1,0,0,0,3,3,0,4,2,2,3,4,0,4,0,3,0,4,4,5,3,4,4,0,3,0,0,1,4),
+(1,4,0,4,0,4,0,4,0,3,5,4,4,3,4,3,5,4,3,3,4,3,5,4,4,4,4,3,4,2,4,3,3,1,5,4,3,2,4,5,4,5,5,4,4,5,4,4,0,3,2,2,3,3,0,4,3,1,3,2,1,4,3,3,4,5,0,3,0,2,0,4,5,5,4,5,4,0,4,0,0,5,4),
+(0,5,0,5,0,4,0,3,0,4,4,3,4,3,3,3,4,0,4,4,4,3,4,3,4,3,3,1,4,2,4,3,4,0,5,4,1,4,5,4,4,5,3,2,4,3,4,3,2,4,1,3,3,3,2,3,2,0,4,3,3,4,3,3,3,4,0,4,0,3,0,4,5,4,4,4,3,0,4,1,0,1,3),
+(0,3,1,4,0,3,0,2,0,3,4,4,3,1,4,2,3,3,4,3,4,3,4,3,4,4,3,2,3,1,5,4,4,1,4,4,3,5,4,4,3,5,5,4,3,4,4,3,1,2,3,1,2,2,0,3,2,0,3,1,0,5,3,3,3,4,3,3,3,3,4,4,4,4,5,4,2,0,3,3,2,4,3),
+(0,2,0,3,0,1,0,1,0,0,3,2,0,0,2,0,1,0,2,1,3,3,3,1,2,3,1,0,1,0,4,2,1,1,3,3,0,4,3,3,1,4,3,3,0,3,3,2,0,0,0,0,1,0,0,2,0,0,0,0,0,4,1,0,2,3,2,2,2,1,3,3,3,4,4,3,2,0,3,1,0,3,3),
+(0,4,0,4,0,3,0,3,0,4,4,4,3,3,3,3,3,3,4,3,4,2,4,3,4,3,3,2,4,3,4,5,4,1,4,5,3,5,4,5,3,5,4,0,3,5,5,3,1,3,3,2,2,3,0,3,4,1,3,3,2,4,3,3,3,4,0,4,0,3,0,4,5,4,4,5,3,0,4,1,0,3,4),
+(0,2,0,3,0,3,0,0,0,2,2,2,1,0,1,0,0,0,3,0,3,0,3,0,1,3,1,0,3,1,3,3,3,1,3,3,3,0,1,3,1,3,4,0,0,3,1,1,0,3,2,0,0,0,0,1,3,0,1,0,0,3,3,2,0,3,0,0,0,0,0,3,4,3,4,3,3,0,3,0,0,2,3),
+(2,3,0,3,0,2,0,1,0,3,3,4,3,1,3,1,1,1,3,1,4,3,4,3,3,3,0,0,3,1,5,4,3,1,4,3,2,5,5,4,4,4,4,3,3,4,4,4,0,2,1,1,3,2,0,1,2,0,0,1,0,4,1,3,3,3,0,3,0,1,0,4,4,4,5,5,3,0,2,0,0,4,4),
+(0,2,0,1,0,3,1,3,0,2,3,3,3,0,3,1,0,0,3,0,3,2,3,1,3,2,1,1,0,0,4,2,1,0,2,3,1,4,3,2,0,4,4,3,1,3,1,3,0,1,0,0,1,0,0,0,1,0,0,0,0,4,1,1,1,2,0,3,0,0,0,3,4,2,4,3,2,0,1,0,0,3,3),
+(0,1,0,4,0,5,0,4,0,2,4,4,2,3,3,2,3,3,5,3,3,3,4,3,4,2,3,0,4,3,3,3,4,1,4,3,2,1,5,5,3,4,5,1,3,5,4,2,0,3,3,0,1,3,0,4,2,0,1,3,1,4,3,3,3,3,0,3,0,1,0,3,4,4,4,5,5,0,3,0,1,4,5),
+(0,2,0,3,0,3,0,0,0,2,3,1,3,0,4,0,1,1,3,0,3,4,3,2,3,1,0,3,3,2,3,1,3,0,2,3,0,2,1,4,1,2,2,0,0,3,3,0,0,2,0,0,0,1,0,0,0,0,2,2,0,3,2,1,3,3,0,2,0,2,0,0,3,3,1,2,4,0,3,0,2,2,3),
+(2,4,0,5,0,4,0,4,0,2,4,4,4,3,4,3,3,3,1,2,4,3,4,3,4,4,5,0,3,3,3,3,2,0,4,3,1,4,3,4,1,4,4,3,3,4,4,3,1,2,3,0,4,2,0,4,1,0,3,3,0,4,3,3,3,4,0,4,0,2,0,3,5,3,4,5,2,0,3,0,0,4,5),
+(0,3,0,4,0,1,0,1,0,1,3,2,2,1,3,0,3,0,2,0,2,0,3,0,2,0,0,0,1,0,1,1,0,0,3,1,0,0,0,4,0,3,1,0,2,1,3,0,0,0,0,0,0,3,0,0,0,0,0,0,0,4,2,2,3,1,0,3,0,0,0,1,4,4,4,3,0,0,4,0,0,1,4),
+(1,4,1,5,0,3,0,3,0,4,5,4,4,3,5,3,3,4,4,3,4,1,3,3,3,3,2,1,4,1,5,4,3,1,4,4,3,5,4,4,3,5,4,3,3,4,4,4,0,3,3,1,2,3,0,3,1,0,3,3,0,5,4,4,4,4,4,4,3,3,5,4,4,3,3,5,4,0,3,2,0,4,4),
+(0,2,0,3,0,1,0,0,0,1,3,3,3,2,4,1,3,0,3,1,3,0,2,2,1,1,0,0,2,0,4,3,1,0,4,3,0,4,4,4,1,4,3,1,1,3,3,1,0,2,0,0,1,3,0,0,0,0,2,0,0,4,3,2,4,3,5,4,3,3,3,4,3,3,4,3,3,0,2,1,0,3,3),
+(0,2,0,4,0,3,0,2,0,2,5,5,3,4,4,4,4,1,4,3,3,0,4,3,4,3,1,3,3,2,4,3,0,3,4,3,0,3,4,4,2,4,4,0,4,5,3,3,2,2,1,1,1,2,0,1,5,0,3,3,2,4,3,3,3,4,0,3,0,2,0,4,4,3,5,5,0,0,3,0,2,3,3),
+(0,3,0,4,0,3,0,1,0,3,4,3,3,1,3,3,3,0,3,1,3,0,4,3,3,1,1,0,3,0,3,3,0,0,4,4,0,1,5,4,3,3,5,0,3,3,4,3,0,2,0,1,1,1,0,1,3,0,1,2,1,3,3,2,3,3,0,3,0,1,0,1,3,3,4,4,1,0,1,2,2,1,3),
+(0,1,0,4,0,4,0,3,0,1,3,3,3,2,3,1,1,0,3,0,3,3,4,3,2,4,2,0,1,0,4,3,2,0,4,3,0,5,3,3,2,4,4,4,3,3,3,4,0,1,3,0,0,1,0,0,1,0,0,0,0,4,2,3,3,3,0,3,0,0,0,4,4,4,5,3,2,0,3,3,0,3,5),
+(0,2,0,3,0,0,0,3,0,1,3,0,2,0,0,0,1,0,3,1,1,3,3,0,0,3,0,0,3,0,2,3,1,0,3,1,0,3,3,2,0,4,2,2,0,2,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,2,1,2,0,1,0,1,0,0,0,1,3,1,2,0,0,0,1,0,0,1,4),
+(0,3,0,3,0,5,0,1,0,2,4,3,1,3,3,2,1,1,5,2,1,0,5,1,2,0,0,0,3,3,2,2,3,2,4,3,0,0,3,3,1,3,3,0,2,5,3,4,0,3,3,0,1,2,0,2,2,0,3,2,0,2,2,3,3,3,0,2,0,1,0,3,4,4,2,5,4,0,3,0,0,3,5),
+(0,3,0,3,0,3,0,1,0,3,3,3,3,0,3,0,2,0,2,1,1,0,2,0,1,0,0,0,2,1,0,0,1,0,3,2,0,0,3,3,1,2,3,1,0,3,3,0,0,1,0,0,0,0,0,2,0,0,0,0,0,2,3,1,2,3,0,3,0,1,0,3,2,1,0,4,3,0,1,1,0,3,3),
+(0,4,0,5,0,3,0,3,0,4,5,5,4,3,5,3,4,3,5,3,3,2,5,3,4,4,4,3,4,3,4,5,5,3,4,4,3,4,4,5,4,4,4,3,4,5,5,4,2,3,4,2,3,4,0,3,3,1,4,3,2,4,3,3,5,5,0,3,0,3,0,5,5,5,5,4,4,0,4,0,1,4,4),
+(0,4,0,4,0,3,0,3,0,3,5,4,4,2,3,2,5,1,3,2,5,1,4,2,3,2,3,3,4,3,3,3,3,2,5,4,1,3,3,5,3,4,4,0,4,4,3,1,1,3,1,0,2,3,0,2,3,0,3,0,0,4,3,1,3,4,0,3,0,2,0,4,4,4,3,4,5,0,4,0,0,3,4),
+(0,3,0,3,0,3,1,2,0,3,4,4,3,3,3,0,2,2,4,3,3,1,3,3,3,1,1,0,3,1,4,3,2,3,4,4,2,4,4,4,3,4,4,3,2,4,4,3,1,3,3,1,3,3,0,4,1,0,2,2,1,4,3,2,3,3,5,4,3,3,5,4,4,3,3,0,4,0,3,2,2,4,4),
+(0,2,0,1,0,0,0,0,0,1,2,1,3,0,0,0,0,0,2,0,1,2,1,0,0,1,0,0,0,0,3,0,0,1,0,1,1,3,1,0,0,0,1,1,0,1,1,0,0,0,0,0,2,0,0,0,0,0,0,0,0,1,1,2,2,0,3,4,0,0,0,1,1,0,0,1,0,0,0,0,0,1,1),
+(0,1,0,0,0,1,0,0,0,0,4,0,4,1,4,0,3,0,4,0,3,0,4,0,3,0,3,0,4,1,5,1,4,0,0,3,0,5,0,5,2,0,1,0,0,0,2,1,4,0,1,3,0,0,3,0,0,3,1,1,4,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0),
+(1,4,0,5,0,3,0,2,0,3,5,4,4,3,4,3,5,3,4,3,3,0,4,3,3,3,3,3,3,2,4,4,3,1,3,4,4,5,4,4,3,4,4,1,3,5,4,3,3,3,1,2,2,3,3,1,3,1,3,3,3,5,3,3,4,5,0,3,0,3,0,3,4,3,4,4,3,0,3,0,2,4,3),
+(0,1,0,4,0,0,0,0,0,1,4,0,4,1,4,2,4,0,3,0,1,0,1,0,0,0,0,0,2,0,3,1,1,1,0,3,0,0,0,1,2,1,0,0,1,1,1,1,0,1,0,0,0,1,0,0,3,0,0,0,0,3,2,0,2,2,0,1,0,0,0,2,3,2,3,3,0,0,0,0,2,1,0),
+(0,5,1,5,0,3,0,3,0,5,4,4,5,1,5,3,3,0,4,3,4,3,5,3,4,3,3,2,4,3,4,3,3,0,3,3,1,4,4,3,4,4,4,3,4,5,5,3,2,3,1,1,3,3,1,3,1,1,3,3,2,4,5,3,3,5,0,4,0,3,0,4,4,3,5,3,3,0,3,4,0,4,3),
+(0,5,0,5,0,3,0,2,0,4,4,3,5,2,4,3,3,3,4,4,4,3,5,3,5,3,3,1,4,0,4,3,3,0,3,3,0,4,4,4,4,5,4,3,3,5,5,3,2,3,1,2,3,2,0,1,0,0,3,2,2,4,4,3,1,5,0,4,0,3,0,4,3,1,3,2,1,0,3,3,0,3,3),
+(0,4,0,5,0,5,0,4,0,4,5,5,5,3,4,3,3,2,5,4,4,3,5,3,5,3,4,0,4,3,4,4,3,2,4,4,3,4,5,4,4,5,5,0,3,5,5,4,1,3,3,2,3,3,1,3,1,0,4,3,1,4,4,3,4,5,0,4,0,2,0,4,3,4,4,3,3,0,4,0,0,5,5),
+(0,4,0,4,0,5,0,1,1,3,3,4,4,3,4,1,3,0,5,1,3,0,3,1,3,1,1,0,3,0,3,3,4,0,4,3,0,4,4,4,3,4,4,0,3,5,4,1,0,3,0,0,2,3,0,3,1,0,3,1,0,3,2,1,3,5,0,3,0,1,0,3,2,3,3,4,4,0,2,2,0,4,4),
+(2,4,0,5,0,4,0,3,0,4,5,5,4,3,5,3,5,3,5,3,5,2,5,3,4,3,3,4,3,4,5,3,2,1,5,4,3,2,3,4,5,3,4,1,2,5,4,3,0,3,3,0,3,2,0,2,3,0,4,1,0,3,4,3,3,5,0,3,0,1,0,4,5,5,5,4,3,0,4,2,0,3,5),
+(0,5,0,4,0,4,0,2,0,5,4,3,4,3,4,3,3,3,4,3,4,2,5,3,5,3,4,1,4,3,4,4,4,0,3,5,0,4,4,4,4,5,3,1,3,4,5,3,3,3,3,3,3,3,0,2,2,0,3,3,2,4,3,3,3,5,3,4,1,3,3,5,3,2,0,0,0,0,4,3,1,3,3),
+(0,1,0,3,0,3,0,1,0,1,3,3,3,2,3,3,3,0,3,0,0,0,3,1,3,0,0,0,2,2,2,3,0,0,3,2,0,1,2,4,1,3,3,0,0,3,3,3,0,1,0,0,2,1,0,0,3,0,3,1,0,3,0,0,1,3,0,2,0,1,0,3,3,1,3,3,0,0,1,1,0,3,3),
+(0,2,0,3,0,2,1,4,0,2,2,3,1,1,3,1,1,0,2,0,3,1,2,3,1,3,0,0,1,0,4,3,2,3,3,3,1,4,2,3,3,3,3,1,0,3,1,4,0,1,1,0,1,2,0,1,1,0,1,1,0,3,1,3,2,2,0,1,0,0,0,2,3,3,3,1,0,0,0,0,0,2,3),
+(0,5,0,4,0,5,0,2,0,4,5,5,3,3,4,3,3,1,5,4,4,2,4,4,4,3,4,2,4,3,5,5,4,3,3,4,3,3,5,5,4,5,5,1,3,4,5,3,1,4,3,1,3,3,0,3,3,1,4,3,1,4,5,3,3,5,0,4,0,3,0,5,3,3,1,4,3,0,4,0,1,5,3),
+(0,5,0,5,0,4,0,2,0,4,4,3,4,3,3,3,3,3,5,4,4,4,4,4,4,5,3,3,5,2,4,4,4,3,4,4,3,3,4,4,5,5,3,3,4,3,4,3,3,4,3,3,3,3,1,2,2,1,4,3,3,5,4,4,3,4,0,4,0,3,0,4,4,4,4,4,1,0,4,2,0,2,4),
+(0,4,0,4,0,3,0,1,0,3,5,2,3,0,3,0,2,1,4,2,3,3,4,1,4,3,3,2,4,1,3,3,3,0,3,3,0,0,3,3,3,5,3,3,3,3,3,2,0,2,0,0,2,0,0,2,0,0,1,0,0,3,1,2,2,3,0,3,0,2,0,4,4,3,3,4,1,0,3,0,0,2,4),
+(0,0,0,4,0,0,0,0,0,0,1,0,1,0,2,0,0,0,0,0,1,0,2,0,1,0,0,0,0,0,3,1,3,0,3,2,0,0,0,1,0,3,2,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,4,0,2,0,0,0,0,0,0,2),
+(0,2,1,3,0,2,0,2,0,3,3,3,3,1,3,1,3,3,3,3,3,3,4,2,2,1,2,1,4,0,4,3,1,3,3,3,2,4,3,5,4,3,3,3,3,3,3,3,0,1,3,0,2,0,0,1,0,0,1,0,0,4,2,0,2,3,0,3,3,0,3,3,4,2,3,1,4,0,1,2,0,2,3),
+(0,3,0,3,0,1,0,3,0,2,3,3,3,0,3,1,2,0,3,3,2,3,3,2,3,2,3,1,3,0,4,3,2,0,3,3,1,4,3,3,2,3,4,3,1,3,3,1,1,0,1,1,0,1,0,1,0,1,0,0,0,4,1,1,0,3,0,3,1,0,2,3,3,3,3,3,1,0,0,2,0,3,3),
+(0,0,0,0,0,0,0,0,0,0,3,0,2,0,3,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,3,0,3,0,3,1,0,1,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,2,0,2,3,0,0,0,0,0,0,0,0,3),
+(0,2,0,3,1,3,0,3,0,2,3,3,3,1,3,1,3,1,3,1,3,3,3,1,3,0,2,3,1,1,4,3,3,2,3,3,1,2,2,4,1,3,3,0,1,4,2,3,0,1,3,0,3,0,0,1,3,0,2,0,0,3,3,2,1,3,0,3,0,2,0,3,4,4,4,3,1,0,3,0,0,3,3),
+(0,2,0,1,0,2,0,0,0,1,3,2,2,1,3,0,1,1,3,0,3,2,3,1,2,0,2,0,1,1,3,3,3,0,3,3,1,1,2,3,2,3,3,1,2,3,2,0,0,1,0,0,0,0,0,0,3,0,1,0,0,2,1,2,1,3,0,3,0,0,0,3,4,4,4,3,2,0,2,0,0,2,4),
+(0,0,0,1,0,1,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,2,2,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,3,1,0,0,0,0,0,0,0,3),
+(0,3,0,3,0,2,0,3,0,3,3,3,2,3,2,2,2,0,3,1,3,3,3,2,3,3,0,0,3,0,3,2,2,0,2,3,1,4,3,4,3,3,2,3,1,5,4,4,0,3,1,2,1,3,0,3,1,1,2,0,2,3,1,3,1,3,0,3,0,1,0,3,3,4,4,2,1,0,2,1,0,2,4),
+(0,1,0,3,0,1,0,2,0,1,4,2,5,1,4,0,2,0,2,1,3,1,4,0,2,1,0,0,2,1,4,1,1,0,3,3,0,5,1,3,2,3,3,1,0,3,2,3,0,1,0,0,0,0,0,0,1,0,0,0,0,4,0,1,0,3,0,2,0,1,0,3,3,3,4,3,3,0,0,0,0,2,3),
+(0,0,0,1,0,0,0,0,0,0,2,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,1,0,0,1,0,0,0,0,0,3),
+(0,1,0,3,0,4,0,3,0,2,4,3,1,0,3,2,2,1,3,1,2,2,3,1,1,1,2,1,3,0,1,2,0,1,3,2,1,3,0,5,5,1,0,0,1,3,2,1,0,3,0,0,1,0,0,0,0,0,3,4,0,1,1,1,3,2,0,2,0,1,0,2,3,3,1,2,3,0,1,0,1,0,4),
+(0,0,0,1,0,3,0,3,0,2,2,1,0,0,4,0,3,0,3,1,3,0,3,0,3,0,1,0,3,0,3,1,3,0,3,3,0,0,1,2,1,1,1,0,1,2,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,2,2,1,2,0,0,2,0,0,0,0,2,3,3,3,3,0,0,0,0,1,4),
+(0,0,0,3,0,3,0,0,0,0,3,1,1,0,3,0,1,0,2,0,1,0,0,0,0,0,0,0,1,0,3,0,2,0,2,3,0,0,2,2,3,1,2,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,2,0,0,0,0,2,3),
+(2,4,0,5,0,5,0,4,0,3,4,3,3,3,4,3,3,3,4,3,4,4,5,4,5,5,5,2,3,0,5,5,4,1,5,4,3,1,5,4,3,4,4,3,3,4,3,3,0,3,2,0,2,3,0,3,0,0,3,3,0,5,3,2,3,3,0,3,0,3,0,3,4,5,4,5,3,0,4,3,0,3,4),
+(0,3,0,3,0,3,0,3,0,3,3,4,3,2,3,2,3,0,4,3,3,3,3,3,3,3,3,0,3,2,4,3,3,1,3,4,3,4,4,4,3,4,4,3,2,4,4,1,0,2,0,0,1,1,0,2,0,0,3,1,0,5,3,2,1,3,0,3,0,1,2,4,3,2,4,3,3,0,3,2,0,4,4),
+(0,3,0,3,0,1,0,0,0,1,4,3,3,2,3,1,3,1,4,2,3,2,4,2,3,4,3,0,2,2,3,3,3,0,3,3,3,0,3,4,1,3,3,0,3,4,3,3,0,1,1,0,1,0,0,0,4,0,3,0,0,3,1,2,1,3,0,4,0,1,0,4,3,3,4,3,3,0,2,0,0,3,3),
+(0,3,0,4,0,1,0,3,0,3,4,3,3,0,3,3,3,1,3,1,3,3,4,3,3,3,0,0,3,1,5,3,3,1,3,3,2,5,4,3,3,4,5,3,2,5,3,4,0,1,0,0,0,0,0,2,0,0,1,1,0,4,2,2,1,3,0,3,0,2,0,4,4,3,5,3,2,0,1,1,0,3,4),
+(0,5,0,4,0,5,0,2,0,4,4,3,3,2,3,3,3,1,4,3,4,1,5,3,4,3,4,0,4,2,4,3,4,1,5,4,0,4,4,4,4,5,4,1,3,5,4,2,1,4,1,1,3,2,0,3,1,0,3,2,1,4,3,3,3,4,0,4,0,3,0,4,4,4,3,3,3,0,4,2,0,3,4),
+(1,4,0,4,0,3,0,1,0,3,3,3,1,1,3,3,2,2,3,3,1,0,3,2,2,1,2,0,3,1,2,1,2,0,3,2,0,2,2,3,3,4,3,0,3,3,1,2,0,1,1,3,1,2,0,0,3,0,1,1,0,3,2,2,3,3,0,3,0,0,0,2,3,3,4,3,3,0,1,0,0,1,4),
+(0,4,0,4,0,4,0,0,0,3,4,4,3,1,4,2,3,2,3,3,3,1,4,3,4,0,3,0,4,2,3,3,2,2,5,4,2,1,3,4,3,4,3,1,3,3,4,2,0,2,1,0,3,3,0,0,2,0,3,1,0,4,4,3,4,3,0,4,0,1,0,2,4,4,4,4,4,0,3,2,0,3,3),
+(0,0,0,1,0,4,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,3,2,0,0,1,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,2),
+(0,2,0,3,0,4,0,4,0,1,3,3,3,0,4,0,2,1,2,1,1,1,2,0,3,1,1,0,1,0,3,1,0,0,3,3,2,0,1,1,0,0,0,0,0,1,0,2,0,2,2,0,3,1,0,0,1,0,1,1,0,1,2,0,3,0,0,0,0,1,0,0,3,3,4,3,1,0,1,0,3,0,2),
+(0,0,0,3,0,5,0,0,0,0,1,0,2,0,3,1,0,1,3,0,0,0,2,0,0,0,1,0,0,0,1,1,0,0,4,0,0,0,2,3,0,1,4,1,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,1,0,0,0,0,0,0,0,2,0,0,3,0,0,0,0,0,3),
+(0,2,0,5,0,5,0,1,0,2,4,3,3,2,5,1,3,2,3,3,3,0,4,1,2,0,3,0,4,0,2,2,1,1,5,3,0,0,1,4,2,3,2,0,3,3,3,2,0,2,4,1,1,2,0,1,1,0,3,1,0,1,3,1,2,3,0,2,0,0,0,1,3,5,4,4,4,0,3,0,0,1,3),
+(0,4,0,5,0,4,0,4,0,4,5,4,3,3,4,3,3,3,4,3,4,4,5,3,4,5,4,2,4,2,3,4,3,1,4,4,1,3,5,4,4,5,5,4,4,5,5,5,2,3,3,1,4,3,1,3,3,0,3,3,1,4,3,4,4,4,0,3,0,4,0,3,3,4,4,5,0,0,4,3,0,4,5),
+(0,4,0,4,0,3,0,3,0,3,4,4,4,3,3,2,4,3,4,3,4,3,5,3,4,3,2,1,4,2,4,4,3,1,3,4,2,4,5,5,3,4,5,4,1,5,4,3,0,3,2,2,3,2,1,3,1,0,3,3,3,5,3,3,3,5,4,4,2,3,3,4,3,3,3,2,1,0,3,2,1,4,3),
+(0,4,0,5,0,4,0,3,0,3,5,5,3,2,4,3,4,0,5,4,4,1,4,4,4,3,3,3,4,3,5,5,2,3,3,4,1,2,5,5,3,5,5,2,3,5,5,4,0,3,2,0,3,3,1,1,5,1,4,1,0,4,3,2,3,5,0,4,0,3,0,5,4,3,4,3,0,0,4,1,0,4,4),
+(1,3,0,4,0,2,0,2,0,2,5,5,3,3,3,3,3,0,4,2,3,4,4,4,3,4,0,0,3,4,5,4,3,3,3,3,2,5,5,4,5,5,5,4,3,5,5,5,1,3,1,0,1,0,0,3,2,0,4,2,0,5,2,3,2,4,1,3,0,3,0,4,5,4,5,4,3,0,4,2,0,5,4),
+(0,3,0,4,0,5,0,3,0,3,4,4,3,2,3,2,3,3,3,3,3,2,4,3,3,2,2,0,3,3,3,3,3,1,3,3,3,0,4,4,3,4,4,1,1,4,4,2,0,3,1,0,1,1,0,4,1,0,2,3,1,3,3,1,3,4,0,3,0,1,0,3,1,3,0,0,1,0,2,0,0,4,4),
+(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
+(0,3,0,3,0,2,0,3,0,1,5,4,3,3,3,1,4,2,1,2,3,4,4,2,4,4,5,0,3,1,4,3,4,0,4,3,3,3,2,3,2,5,3,4,3,2,2,3,0,0,3,0,2,1,0,1,2,0,0,0,0,2,1,1,3,1,0,2,0,4,0,3,4,4,4,5,2,0,2,0,0,1,3),
+(0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,1,1,0,0,1,1,0,0,0,4,2,1,1,0,1,0,3,2,0,0,3,1,1,1,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,1,0,0,0,2,0,0,0,1,4,0,4,2,1,0,0,0,0,0,1),
+(0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,1,0,0,0,0,0,0,1,0,1,0,0,0,0,3,1,0,0,0,2,0,2,1,0,0,1,2,1,0,1,1,0,0,3,0,0,0,0,0,0,0,0,0,0,0,1,3,1,0,0,0,0,0,1,0,0,2,1,0,0,0,0,0,0,0,0,2),
+(0,4,0,4,0,4,0,3,0,4,4,3,4,2,4,3,2,0,4,4,4,3,5,3,5,3,3,2,4,2,4,3,4,3,1,4,0,2,3,4,4,4,3,3,3,4,4,4,3,4,1,3,4,3,2,1,2,1,3,3,3,4,4,3,3,5,0,4,0,3,0,4,3,3,3,2,1,0,3,0,0,3,3),
+(0,4,0,3,0,3,0,3,0,3,5,5,3,3,3,3,4,3,4,3,3,3,4,4,4,3,3,3,3,4,3,5,3,3,1,3,2,4,5,5,5,5,4,3,4,5,5,3,2,2,3,3,3,3,2,3,3,1,2,3,2,4,3,3,3,4,0,4,0,2,0,4,3,2,2,1,2,0,3,0,0,4,1),
+)
+
+class JapaneseContextAnalysis:
+    def __init__(self):
+        self.reset()
+
+    def reset(self):
+        self._mTotalRel = 0  # total sequence received
+        # category counters, each interger counts sequence in its category
+        self._mRelSample = [0] * NUM_OF_CATEGORY
+        # if last byte in current buffer is not the last byte of a character,
+        # we need to know how many bytes to skip in next buffer
+        self._mNeedToSkipCharNum = 0
+        self._mLastCharOrder = -1  # The order of previous char
+        # If this flag is set to True, detection is done and conclusion has
+        # been made
+        self._mDone = False
+
+    def feed(self, aBuf, aLen):
+        if self._mDone:
+            return
+
+        # The buffer we got is byte oriented, and a character may span in more than one
+        # buffers. In case the last one or two byte in last buffer is not
+        # complete, we record how many byte needed to complete that character
+        # and skip these bytes here.  We can choose to record those bytes as
+        # well and analyse the character once it is complete, but since a
+        # character will not make much difference, by simply skipping
+        # this character will simply our logic and improve performance.
+        i = self._mNeedToSkipCharNum
+        while i < aLen:
+            order, charLen = self.get_order(aBuf[i:i + 2])
+            i += charLen
+            if i > aLen:
+                self._mNeedToSkipCharNum = i - aLen
+                self._mLastCharOrder = -1
+            else:
+                if (order != -1) and (self._mLastCharOrder != -1):
+                    self._mTotalRel += 1
+                    if self._mTotalRel > MAX_REL_THRESHOLD:
+                        self._mDone = True
+                        break
+                    self._mRelSample[jp2CharContext[self._mLastCharOrder][order]] += 1
+                self._mLastCharOrder = order
+
+    def got_enough_data(self):
+        return self._mTotalRel > ENOUGH_REL_THRESHOLD
+
+    def get_confidence(self):
+        # This is just one way to calculate confidence. It works well for me.
+        if self._mTotalRel > MINIMUM_DATA_THRESHOLD:
+            return (self._mTotalRel - self._mRelSample[0]) / self._mTotalRel
+        else:
+            return DONT_KNOW
+
+    def get_order(self, aBuf):
+        return -1, 1
+
+class SJISContextAnalysis(JapaneseContextAnalysis):
+    def __init__(self):
+        self.charset_name = "SHIFT_JIS"
+
+    def get_charset_name(self):
+        return self.charset_name
+
+    def get_order(self, aBuf):
+        if not aBuf:
+            return -1, 1
+        # find out current char's byte length
+        first_char = wrap_ord(aBuf[0])
+        if ((0x81 <= first_char <= 0x9F) or (0xE0 <= first_char <= 0xFC)):
+            charLen = 2
+            if (first_char == 0x87) or (0xFA <= first_char <= 0xFC):
+                self.charset_name = "CP932"
+        else:
+            charLen = 1
+
+        # return its order if it is hiragana
+        if len(aBuf) > 1:
+            second_char = wrap_ord(aBuf[1])
+            if (first_char == 202) and (0x9F <= second_char <= 0xF1):
+                return second_char - 0x9F, charLen
+
+        return -1, charLen
+
+class EUCJPContextAnalysis(JapaneseContextAnalysis):
+    def get_order(self, aBuf):
+        if not aBuf:
+            return -1, 1
+        # find out current char's byte length
+        first_char = wrap_ord(aBuf[0])
+        if (first_char == 0x8E) or (0xA1 <= first_char <= 0xFE):
+            charLen = 2
+        elif first_char == 0x8F:
+            charLen = 3
+        else:
+            charLen = 1
+
+        # return its order if it is hiragana
+        if len(aBuf) > 1:
+            second_char = wrap_ord(aBuf[1])
+            if (first_char == 0xA4) and (0xA1 <= second_char <= 0xF3):
+                return second_char - 0xA1, charLen
+
+        return -1, charLen
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/langbulgarianmodel.py b/lib/requests/packages/chardet/langbulgarianmodel.py
new file mode 100644
index 00000000..e5788fc6
--- /dev/null
+++ b/lib/requests/packages/chardet/langbulgarianmodel.py
@@ -0,0 +1,229 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+# 255: Control characters that usually does not exist in any text
+# 254: Carriage/Return
+# 253: symbol (punctuation) that does not belong to word
+# 252: 0 - 9
+
+# Character Mapping Table:
+# this table is modified base on win1251BulgarianCharToOrderMap, so
+# only number <64 is sure valid
+
+Latin5_BulgarianCharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253, 77, 90, 99,100, 72,109,107,101, 79,185, 81,102, 76, 94, 82,  # 40
+110,186,108, 91, 74,119, 84, 96,111,187,115,253,253,253,253,253,  # 50
+253, 65, 69, 70, 66, 63, 68,112,103, 92,194,104, 95, 86, 87, 71,  # 60
+116,195, 85, 93, 97,113,196,197,198,199,200,253,253,253,253,253,  # 70
+194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,  # 80
+210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,  # 90
+ 81,226,227,228,229,230,105,231,232,233,234,235,236, 45,237,238,  # a0
+ 31, 32, 35, 43, 37, 44, 55, 47, 40, 59, 33, 46, 38, 36, 41, 30,  # b0
+ 39, 28, 34, 51, 48, 49, 53, 50, 54, 57, 61,239, 67,240, 60, 56,  # c0
+  1, 18,  9, 20, 11,  3, 23, 15,  2, 26, 12, 10, 14,  6,  4, 13,  # d0
+  7,  8,  5, 19, 29, 25, 22, 21, 27, 24, 17, 75, 52,241, 42, 16,  # e0
+ 62,242,243,244, 58,245, 98,246,247,248,249,250,251, 91,252,253,  # f0
+)
+
+win1251BulgarianCharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253, 77, 90, 99,100, 72,109,107,101, 79,185, 81,102, 76, 94, 82,  # 40
+110,186,108, 91, 74,119, 84, 96,111,187,115,253,253,253,253,253,  # 50
+253, 65, 69, 70, 66, 63, 68,112,103, 92,194,104, 95, 86, 87, 71,  # 60
+116,195, 85, 93, 97,113,196,197,198,199,200,253,253,253,253,253,  # 70
+206,207,208,209,210,211,212,213,120,214,215,216,217,218,219,220,  # 80
+221, 78, 64, 83,121, 98,117,105,222,223,224,225,226,227,228,229,  # 90
+ 88,230,231,232,233,122, 89,106,234,235,236,237,238, 45,239,240,  # a0
+ 73, 80,118,114,241,242,243,244,245, 62, 58,246,247,248,249,250,  # b0
+ 31, 32, 35, 43, 37, 44, 55, 47, 40, 59, 33, 46, 38, 36, 41, 30,  # c0
+ 39, 28, 34, 51, 48, 49, 53, 50, 54, 57, 61,251, 67,252, 60, 56,  # d0
+  1, 18,  9, 20, 11,  3, 23, 15,  2, 26, 12, 10, 14,  6,  4, 13,  # e0
+  7,  8,  5, 19, 29, 25, 22, 21, 27, 24, 17, 75, 52,253, 42, 16,  # f0
+)
+
+# Model Table:
+# total sequences: 100%
+# first 512 sequences: 96.9392%
+# first 1024 sequences:3.0618%
+# rest  sequences:     0.2992%
+# negative sequences:  0.0020%
+BulgarianLangModel = (
+0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,3,3,3,3,3,3,2,3,3,3,3,3,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,3,3,3,2,2,3,2,2,1,2,2,
+3,1,3,3,2,3,3,3,3,3,3,3,3,3,3,3,3,0,3,3,3,3,3,3,3,3,3,3,0,3,0,1,
+0,0,0,0,0,0,0,0,0,0,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,2,3,3,3,3,3,3,3,3,0,3,1,0,
+0,1,0,0,0,0,0,0,0,0,1,1,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+3,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,1,3,2,3,3,3,3,3,3,3,3,0,3,0,0,
+0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,2,3,3,2,3,3,3,3,3,3,3,3,3,3,3,3,1,3,2,3,3,3,3,3,3,3,3,0,3,0,0,
+0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,3,3,3,2,3,2,2,1,3,3,3,3,2,2,2,1,1,2,0,1,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,3,3,2,3,2,2,3,3,1,1,2,3,3,2,3,3,3,3,2,1,2,0,2,0,3,0,0,
+0,0,0,0,0,0,0,1,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,3,3,1,3,3,3,3,3,2,3,2,3,3,3,3,3,2,3,3,1,3,0,3,0,2,0,0,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,3,3,3,1,3,3,2,3,3,3,1,3,3,2,3,2,2,2,0,0,2,0,2,0,2,0,0,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,3,3,3,3,0,3,3,3,2,2,3,3,3,1,2,2,3,2,1,1,2,0,2,0,0,0,0,
+1,0,0,0,0,0,0,0,0,0,2,0,0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,3,3,2,3,3,1,2,3,2,2,2,3,3,3,3,3,2,2,3,1,2,0,2,1,2,0,0,
+0,0,0,0,0,0,0,0,0,0,3,0,0,1,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,1,3,3,3,3,3,2,3,3,3,2,3,3,2,3,2,2,2,3,1,2,0,1,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,3,3,3,3,3,3,1,1,1,2,2,1,3,1,3,2,2,3,0,0,1,0,1,0,1,0,0,
+0,0,0,1,0,0,0,0,1,0,2,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,2,2,3,2,2,3,1,2,1,1,1,2,3,1,3,1,2,2,0,1,1,1,1,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,1,3,2,2,3,3,1,2,3,1,1,3,3,3,3,1,2,2,1,1,1,0,2,0,2,0,1,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,2,2,3,3,3,2,2,1,1,2,0,2,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
+3,0,1,2,1,3,3,2,3,3,3,3,3,2,3,2,1,0,3,1,2,1,2,1,2,3,2,1,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,1,1,2,3,3,3,3,3,3,3,3,3,3,3,3,0,0,3,1,3,3,2,3,3,2,2,2,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,3,3,3,3,0,3,3,3,3,3,2,1,1,2,1,3,3,0,3,1,1,1,1,3,2,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
+3,3,2,2,2,3,3,3,3,3,3,3,3,3,3,3,1,1,3,1,3,3,2,3,2,2,2,3,0,2,0,0,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,2,3,3,2,2,3,2,1,1,1,1,1,3,1,3,1,1,0,0,0,1,0,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,2,3,2,0,3,2,0,3,0,2,0,0,2,1,3,1,0,0,1,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,2,1,1,1,1,2,1,1,2,1,1,1,2,2,1,2,1,1,1,0,1,1,0,1,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,2,1,3,1,1,2,1,3,2,1,1,0,1,2,3,2,1,1,1,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,3,3,3,3,2,2,1,0,1,0,0,1,0,0,0,2,1,0,3,0,0,1,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,2,3,2,3,3,1,3,2,1,1,1,2,1,1,2,1,3,0,1,0,0,0,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,1,1,2,2,3,3,2,3,2,2,2,3,1,2,2,1,1,2,1,1,2,2,0,1,1,0,1,0,2,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,2,1,3,1,0,2,2,1,3,2,1,0,0,2,0,2,0,1,0,0,0,0,0,0,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,3,1,2,0,2,3,1,2,3,2,0,1,3,1,2,1,1,1,0,0,1,0,0,2,2,2,3,
+2,2,2,2,1,2,1,1,2,2,1,1,2,0,1,1,1,0,0,1,1,0,0,1,1,0,0,0,1,1,0,1,
+3,3,3,3,3,2,1,2,2,1,2,0,2,0,1,0,1,2,1,2,1,1,0,0,0,1,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,
+3,3,2,3,3,1,1,3,1,0,3,2,1,0,0,0,1,2,0,2,0,1,0,0,0,1,0,1,2,1,2,2,
+1,1,1,1,1,1,1,2,2,2,1,1,1,1,1,1,1,0,1,2,1,1,1,0,0,0,0,0,1,1,0,0,
+3,1,0,1,0,2,3,2,2,2,3,2,2,2,2,2,1,0,2,1,2,1,1,1,0,1,2,1,2,2,2,1,
+1,1,2,2,2,2,1,2,1,1,0,1,2,1,2,2,2,1,1,1,0,1,1,1,1,2,0,1,0,0,0,0,
+2,3,2,3,3,0,0,2,1,0,2,1,0,0,0,0,2,3,0,2,0,0,0,0,0,1,0,0,2,0,1,2,
+2,1,2,1,2,2,1,1,1,2,1,1,1,0,1,2,2,1,1,1,1,1,0,1,1,1,0,0,1,2,0,0,
+3,3,2,2,3,0,2,3,1,1,2,0,0,0,1,0,0,2,0,2,0,0,0,1,0,1,0,1,2,0,2,2,
+1,1,1,1,2,1,0,1,2,2,2,1,1,1,1,1,1,1,0,1,1,1,0,0,0,0,0,0,1,1,0,0,
+2,3,2,3,3,0,0,3,0,1,1,0,1,0,0,0,2,2,1,2,0,0,0,0,0,0,0,0,2,0,1,2,
+2,2,1,1,1,1,1,2,2,2,1,0,2,0,1,0,1,0,0,1,0,1,0,0,1,0,0,0,0,1,0,0,
+3,3,3,3,2,2,2,2,2,0,2,1,1,1,1,2,1,2,1,1,0,2,0,1,0,1,0,0,2,0,1,2,
+1,1,1,1,1,1,1,2,2,1,1,0,2,0,1,0,2,0,0,1,1,1,0,0,2,0,0,0,1,1,0,0,
+2,3,3,3,3,1,0,0,0,0,0,0,0,0,0,0,2,0,0,1,1,0,0,0,0,0,0,1,2,0,1,2,
+2,2,2,1,1,2,1,1,2,2,2,1,2,0,1,1,1,1,1,1,0,1,1,1,1,0,0,1,1,1,0,0,
+2,3,3,3,3,0,2,2,0,2,1,0,0,0,1,1,1,2,0,2,0,0,0,3,0,0,0,0,2,0,2,2,
+1,1,1,2,1,2,1,1,2,2,2,1,2,0,1,1,1,0,1,1,1,1,0,2,1,0,0,0,1,1,0,0,
+2,3,3,3,3,0,2,1,0,0,2,0,0,0,0,0,1,2,0,2,0,0,0,0,0,0,0,0,2,0,1,2,
+1,1,1,2,1,1,1,1,2,2,2,0,1,0,1,1,1,0,0,1,1,1,0,0,1,0,0,0,0,1,0,0,
+3,3,2,2,3,0,1,0,1,0,0,0,0,0,0,0,1,1,0,3,0,0,0,0,0,0,0,0,1,0,2,2,
+1,1,1,1,1,2,1,1,2,2,1,2,2,1,0,1,1,1,1,1,0,1,0,0,1,0,0,0,1,1,0,0,
+3,1,0,1,0,2,2,2,2,3,2,1,1,1,2,3,0,0,1,0,2,1,1,0,1,1,1,1,2,1,1,1,
+1,2,2,1,2,1,2,2,1,1,0,1,2,1,2,2,1,1,1,0,0,1,1,1,2,1,0,1,0,0,0,0,
+2,1,0,1,0,3,1,2,2,2,2,1,2,2,1,1,1,0,2,1,2,2,1,1,2,1,1,0,2,1,1,1,
+1,2,2,2,2,2,2,2,1,2,0,1,1,0,2,1,1,1,1,1,0,0,1,1,1,1,0,1,0,0,0,0,
+2,1,1,1,1,2,2,2,2,1,2,2,2,1,2,2,1,1,2,1,2,3,2,2,1,1,1,1,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,2,2,3,2,0,1,2,0,1,2,1,1,0,1,0,1,2,1,2,0,0,0,1,1,0,0,0,1,0,0,2,
+1,1,0,0,1,1,0,1,1,1,1,0,2,0,1,1,1,0,0,1,1,0,0,0,0,1,0,0,0,1,0,0,
+2,0,0,0,0,1,2,2,2,2,2,2,2,1,2,1,1,1,1,1,1,1,0,1,1,1,1,1,2,1,1,1,
+1,2,2,2,2,1,1,2,1,2,1,1,1,0,2,1,2,1,1,1,0,2,1,1,1,1,0,1,0,0,0,0,
+3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,
+1,1,0,1,0,1,1,1,1,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,2,2,3,2,0,0,0,0,1,0,0,0,0,0,0,1,1,0,2,0,0,0,0,0,0,0,0,1,0,1,2,
+1,1,1,1,1,1,0,0,2,2,2,2,2,0,1,1,0,1,1,1,1,1,0,0,1,0,0,0,1,1,0,1,
+2,3,1,2,1,0,1,1,0,2,2,2,0,0,1,0,0,1,1,1,1,0,0,0,0,0,0,0,1,0,1,2,
+1,1,1,1,2,1,1,1,1,1,1,1,1,0,1,1,0,1,0,1,0,1,0,0,1,0,0,0,0,1,0,0,
+2,2,2,2,2,0,0,2,0,0,2,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,2,0,2,2,
+1,1,1,1,1,0,0,1,2,1,1,0,1,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,
+1,2,2,2,2,0,0,2,0,1,1,0,0,0,1,0,0,2,0,2,0,0,0,0,0,0,0,0,0,0,1,1,
+0,0,0,1,1,1,1,1,1,1,1,1,1,0,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
+1,2,2,3,2,0,0,1,0,0,1,0,0,0,0,0,0,1,0,2,0,0,0,1,0,0,0,0,0,0,0,2,
+1,1,0,0,1,0,0,0,1,1,0,0,1,0,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,
+2,1,2,2,2,1,2,1,2,2,1,1,2,1,1,1,0,1,1,1,1,2,0,1,0,1,1,1,1,0,1,1,
+1,1,2,1,1,1,1,1,1,0,0,1,2,1,1,1,1,1,1,0,0,1,1,1,0,0,0,0,0,0,0,0,
+1,0,0,1,3,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,2,2,2,1,0,0,1,0,2,0,0,0,0,0,1,1,1,0,1,0,0,0,0,0,0,0,0,2,0,0,1,
+0,2,0,1,0,0,1,1,2,0,1,0,1,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,
+1,2,2,2,2,0,1,1,0,2,1,0,1,1,1,0,0,1,0,2,0,1,0,0,0,0,0,0,0,0,0,1,
+0,1,0,0,1,0,0,0,1,1,0,0,1,0,0,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,
+2,2,2,2,2,0,0,1,0,0,0,1,0,1,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,1,
+0,1,0,1,1,1,0,0,1,1,1,0,1,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,
+2,0,1,0,0,1,2,1,1,1,1,1,1,2,2,1,0,0,1,0,1,0,0,0,0,1,1,1,1,0,0,0,
+1,1,2,1,1,1,1,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,2,1,2,1,0,0,1,0,0,0,0,0,0,0,0,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,1,
+0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,0,0,1,2,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,
+0,1,1,0,1,1,1,0,0,1,0,0,1,0,1,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,
+1,0,1,0,0,1,1,1,1,1,1,1,1,1,1,1,0,0,1,0,2,0,0,2,0,1,0,0,1,0,0,1,
+1,1,0,0,1,1,0,1,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,
+1,1,1,1,1,1,1,2,0,0,0,0,0,0,2,1,0,1,1,0,0,1,1,1,0,1,0,0,0,0,0,0,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,0,1,1,0,1,1,1,1,1,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+)
+
+Latin5BulgarianModel = {
+  'charToOrderMap': Latin5_BulgarianCharToOrderMap,
+  'precedenceMatrix': BulgarianLangModel,
+  'mTypicalPositiveRatio': 0.969392,
+  'keepEnglishLetter': False,
+  'charsetName': "ISO-8859-5"
+}
+
+Win1251BulgarianModel = {
+  'charToOrderMap': win1251BulgarianCharToOrderMap,
+  'precedenceMatrix': BulgarianLangModel,
+  'mTypicalPositiveRatio': 0.969392,
+  'keepEnglishLetter': False,
+  'charsetName': "windows-1251"
+}
+
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/langcyrillicmodel.py b/lib/requests/packages/chardet/langcyrillicmodel.py
new file mode 100644
index 00000000..a86f54bd
--- /dev/null
+++ b/lib/requests/packages/chardet/langcyrillicmodel.py
@@ -0,0 +1,329 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+# KOI8-R language model
+# Character Mapping Table:
+KOI8R_CharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154,  # 40
+155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253,  # 50
+253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69,  # 60
+ 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253,  # 70
+191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,  # 80
+207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,  # 90
+223,224,225, 68,226,227,228,229,230,231,232,233,234,235,236,237,  # a0
+238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,  # b0
+ 27,  3, 21, 28, 13,  2, 39, 19, 26,  4, 23, 11,  8, 12,  5,  1,  # c0
+ 15, 16,  9,  7,  6, 14, 24, 10, 17, 18, 20, 25, 30, 29, 22, 54,  # d0
+ 59, 37, 44, 58, 41, 48, 53, 46, 55, 42, 60, 36, 49, 38, 31, 34,  # e0
+ 35, 43, 45, 32, 40, 52, 56, 33, 61, 62, 51, 57, 47, 63, 50, 70,  # f0
+)
+
+win1251_CharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154,  # 40
+155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253,  # 50
+253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69,  # 60
+ 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253,  # 70
+191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,
+207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,
+223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,
+239,240,241,242,243,244,245,246, 68,247,248,249,250,251,252,253,
+ 37, 44, 33, 46, 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, 34, 35,
+ 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, 70, 62, 61, 47, 59, 43,
+  3, 21, 10, 19, 13,  2, 24, 20,  4, 23, 11,  8, 12,  5,  1, 15,
+  9,  7,  6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27, 16,
+)
+
+latin5_CharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154,  # 40
+155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253,  # 50
+253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69,  # 60
+ 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253,  # 70
+191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,
+207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,
+223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,
+ 37, 44, 33, 46, 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, 34, 35,
+ 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, 70, 62, 61, 47, 59, 43,
+  3, 21, 10, 19, 13,  2, 24, 20,  4, 23, 11,  8, 12,  5,  1, 15,
+  9,  7,  6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27, 16,
+239, 68,240,241,242,243,244,245,246,247,248,249,250,251,252,255,
+)
+
+macCyrillic_CharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154,  # 40
+155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253,  # 50
+253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69,  # 60
+ 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253,  # 70
+ 37, 44, 33, 46, 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, 34, 35,
+ 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, 70, 62, 61, 47, 59, 43,
+191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,
+207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,
+223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,
+239,240,241,242,243,244,245,246,247,248,249,250,251,252, 68, 16,
+  3, 21, 10, 19, 13,  2, 24, 20,  4, 23, 11,  8, 12,  5,  1, 15,
+  9,  7,  6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27,255,
+)
+
+IBM855_CharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154,  # 40
+155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253,  # 50
+253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69,  # 60
+ 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253,  # 70
+191,192,193,194, 68,195,196,197,198,199,200,201,202,203,204,205,
+206,207,208,209,210,211,212,213,214,215,216,217, 27, 59, 54, 70,
+  3, 37, 21, 44, 28, 58, 13, 41,  2, 48, 39, 53, 19, 46,218,219,
+220,221,222,223,224, 26, 55,  4, 42,225,226,227,228, 23, 60,229,
+230,231,232,233,234,235, 11, 36,236,237,238,239,240,241,242,243,
+  8, 49, 12, 38,  5, 31,  1, 34, 15,244,245,246,247, 35, 16,248,
+ 43,  9, 45,  7, 32,  6, 40, 14, 52, 24, 56, 10, 33, 17, 61,249,
+250, 18, 62, 20, 51, 25, 57, 30, 47, 29, 63, 22, 50,251,252,255,
+)
+
+IBM866_CharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154,  # 40
+155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253,  # 50
+253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69,  # 60
+ 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253,  # 70
+ 37, 44, 33, 46, 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, 34, 35,
+ 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, 70, 62, 61, 47, 59, 43,
+  3, 21, 10, 19, 13,  2, 24, 20,  4, 23, 11,  8, 12,  5,  1, 15,
+191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,
+207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,
+223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,
+  9,  7,  6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27, 16,
+239, 68,240,241,242,243,244,245,246,247,248,249,250,251,252,255,
+)
+
+# Model Table:
+# total sequences: 100%
+# first 512 sequences: 97.6601%
+# first 1024 sequences: 2.3389%
+# rest  sequences:      0.1237%
+# negative sequences:   0.0009%
+RussianLangModel = (
+0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,3,3,3,3,1,3,3,3,2,3,2,3,3,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,3,2,2,2,2,2,0,0,2,
+3,3,3,2,3,3,3,3,3,3,3,3,3,3,2,3,3,0,0,3,3,3,3,3,3,3,3,3,2,3,2,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,2,2,3,3,3,3,3,3,3,3,3,2,3,3,0,0,3,3,3,3,3,3,3,3,2,3,3,1,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,2,3,2,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,3,3,3,3,3,3,3,3,3,3,3,2,1,
+0,0,0,0,0,0,0,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,0,0,3,3,3,3,3,3,3,3,3,3,3,2,1,
+0,0,0,0,0,1,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,2,2,2,3,1,3,3,1,3,3,3,3,2,2,3,0,2,2,2,3,3,2,1,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,2,3,3,3,3,3,2,2,3,2,3,3,3,2,1,2,2,0,1,2,2,2,2,2,2,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,3,0,2,2,3,3,2,1,2,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,1,0,0,2,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,2,3,3,1,2,3,2,2,3,2,3,3,3,3,2,2,3,0,3,2,2,3,1,1,1,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,2,2,3,3,3,3,3,2,3,3,3,3,2,2,2,0,3,3,3,2,2,2,2,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,3,3,2,3,2,3,3,3,3,3,3,2,3,2,2,0,1,3,2,1,2,2,1,0,
+0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,3,3,3,2,1,1,3,0,1,1,1,1,2,1,1,0,2,2,2,1,2,0,1,0,
+0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,2,3,3,2,2,2,2,1,3,2,3,2,3,2,1,2,2,0,1,1,2,1,2,1,2,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,3,3,3,3,2,2,3,2,3,3,3,2,2,2,2,0,2,2,2,2,3,1,1,0,
+0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
+3,2,3,2,2,3,3,3,3,3,3,3,3,3,1,3,2,0,0,3,3,3,3,2,3,3,3,3,2,3,2,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,3,3,3,3,3,2,2,3,3,0,2,1,0,3,2,3,2,3,0,0,1,2,0,0,1,0,1,2,1,1,0,
+0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,0,3,0,2,3,3,3,3,2,3,3,3,3,1,2,2,0,0,2,3,2,2,2,3,2,3,2,2,3,0,0,
+0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,2,3,0,2,3,2,3,0,1,2,3,3,2,0,2,3,0,0,2,3,2,2,0,1,3,1,3,2,2,1,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,1,3,0,2,3,3,3,3,3,3,3,3,2,1,3,2,0,0,2,2,3,3,3,2,3,3,0,2,2,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,2,2,3,3,2,2,2,3,3,0,0,1,1,1,1,1,2,0,0,1,1,1,1,0,1,0,
+0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,2,2,3,3,3,3,3,3,3,0,3,2,3,3,2,3,2,0,2,1,0,1,1,0,1,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,2,3,3,3,2,2,2,2,3,1,3,2,3,1,1,2,1,0,2,2,2,2,1,3,1,0,
+0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
+2,2,3,3,3,3,3,1,2,2,1,3,1,0,3,0,0,3,0,0,0,1,1,0,1,2,1,0,0,0,0,0,
+0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,2,2,1,1,3,3,3,2,2,1,2,2,3,1,1,2,0,0,2,2,1,3,0,0,2,1,1,2,1,1,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,2,3,3,3,3,1,2,2,2,1,2,1,3,3,1,1,2,1,2,1,2,2,0,2,0,0,1,1,0,1,0,
+0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,3,3,3,3,3,2,1,3,2,2,3,2,0,3,2,0,3,0,1,0,1,1,0,0,1,1,1,1,0,1,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,2,3,3,3,2,2,2,3,3,1,2,1,2,1,0,1,0,1,1,0,1,0,0,2,1,1,1,0,1,0,
+0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,
+3,1,1,2,1,2,3,3,2,2,1,2,2,3,0,2,1,0,0,2,2,3,2,1,2,2,2,2,2,3,1,0,
+0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,1,1,0,1,1,2,2,1,1,3,0,0,1,3,1,1,1,0,0,0,1,0,1,1,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,1,3,3,3,2,0,0,0,2,1,0,1,0,2,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,0,1,0,0,2,3,2,2,2,1,2,2,2,1,2,1,0,0,1,1,1,0,2,0,1,1,1,0,0,1,1,
+1,0,0,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,
+2,3,3,3,3,0,0,0,0,1,0,0,0,0,3,0,1,2,1,0,0,0,0,0,0,0,1,1,0,0,1,1,
+1,0,1,0,1,2,0,0,1,1,2,1,0,1,1,1,1,0,1,1,1,1,0,1,0,0,1,0,0,1,1,0,
+2,2,3,2,2,2,3,1,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,0,1,0,1,1,1,0,2,1,
+1,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1,1,1,0,1,0,1,1,0,1,1,1,0,1,1,0,
+3,3,3,2,2,2,2,3,2,2,1,1,2,2,2,2,1,1,3,1,2,1,2,0,0,1,1,0,1,0,2,1,
+1,1,1,1,1,2,1,0,1,1,1,1,0,1,0,0,1,1,0,0,1,0,1,0,0,1,0,0,0,1,1,0,
+2,0,0,1,0,3,2,2,2,2,1,2,1,2,1,2,0,0,0,2,1,2,2,1,1,2,2,0,1,1,0,2,
+1,1,1,1,1,0,1,1,1,2,1,1,1,2,1,0,1,2,1,1,1,1,0,1,1,1,0,0,1,0,0,1,
+1,3,2,2,2,1,1,1,2,3,0,0,0,0,2,0,2,2,1,0,0,0,0,0,0,1,0,0,0,0,1,1,
+1,0,1,1,0,1,0,1,1,0,1,1,0,2,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,1,1,0,
+2,3,2,3,2,1,2,2,2,2,1,0,0,0,2,0,0,1,1,0,0,0,0,0,0,0,1,1,0,0,2,1,
+1,1,2,1,0,2,0,0,1,0,1,0,0,1,0,0,1,1,0,1,1,0,0,0,0,0,1,0,0,0,0,0,
+3,0,0,1,0,2,2,2,3,2,2,2,2,2,2,2,0,0,0,2,1,2,1,1,1,2,2,0,0,0,1,2,
+1,1,1,1,1,0,1,2,1,1,1,1,1,1,1,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0,0,1,
+2,3,2,3,3,2,0,1,1,1,0,0,1,0,2,0,1,1,3,1,0,0,0,0,0,0,0,1,0,0,2,1,
+1,1,1,1,1,1,1,0,1,0,1,1,1,1,0,1,1,1,0,0,1,1,0,1,0,0,0,0,0,0,1,0,
+2,3,3,3,3,1,2,2,2,2,0,1,1,0,2,1,1,1,2,1,0,1,1,0,0,1,0,1,0,0,2,0,
+0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,3,3,3,2,0,0,1,1,2,2,1,0,0,2,0,1,1,3,0,0,1,0,0,0,0,0,1,0,1,2,1,
+1,1,2,0,1,1,1,0,1,0,1,1,0,1,0,1,1,1,1,0,1,0,0,0,0,0,0,1,0,1,1,0,
+1,3,2,3,2,1,0,0,2,2,2,0,1,0,2,0,1,1,1,0,1,0,0,0,3,0,1,1,0,0,2,1,
+1,1,1,0,1,1,0,0,0,0,1,1,0,1,0,0,2,1,1,0,1,0,0,0,1,0,1,0,0,1,1,0,
+3,1,2,1,1,2,2,2,2,2,2,1,2,2,1,1,0,0,0,2,2,2,0,0,0,1,2,1,0,1,0,1,
+2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,2,1,1,1,0,1,0,1,1,0,1,1,1,0,0,1,
+3,0,0,0,0,2,0,1,1,1,1,1,1,1,0,1,0,0,0,1,1,1,0,1,0,1,1,0,0,1,0,1,
+1,1,0,0,1,0,0,0,1,0,1,1,0,0,1,0,1,0,1,0,0,0,0,1,0,0,0,1,0,0,0,1,
+1,3,3,2,2,0,0,0,2,2,0,0,0,1,2,0,1,1,2,0,0,0,0,0,0,0,0,1,0,0,2,1,
+0,1,1,0,0,1,1,0,0,0,1,1,0,1,1,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,1,0,
+2,3,2,3,2,0,0,0,0,1,1,0,0,0,2,0,2,0,2,0,0,0,0,0,1,0,0,1,0,0,1,1,
+1,1,2,0,1,2,1,0,1,1,2,1,1,1,1,1,2,1,1,0,1,0,0,1,1,1,1,1,0,1,1,0,
+1,3,2,2,2,1,0,0,2,2,1,0,1,2,2,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,1,1,
+0,0,1,1,0,1,1,0,0,1,1,0,1,1,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
+1,0,0,1,0,2,3,1,2,2,2,2,2,2,1,1,0,0,0,1,0,1,0,2,1,1,1,0,0,0,0,1,
+1,1,0,1,1,0,1,1,1,1,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,
+2,0,2,0,0,1,0,3,2,1,2,1,2,2,0,1,0,0,0,2,1,0,0,2,1,1,1,1,0,2,0,2,
+2,1,1,1,1,1,1,1,1,1,1,1,1,2,1,0,1,1,1,1,0,0,0,1,1,1,1,0,1,0,0,1,
+1,2,2,2,2,1,0,0,1,0,0,0,0,0,2,0,1,1,1,1,0,0,0,0,1,0,1,2,0,0,2,0,
+1,0,1,1,1,2,1,0,1,0,1,1,0,0,1,0,1,1,1,0,1,0,0,0,1,0,0,1,0,1,1,0,
+2,1,2,2,2,0,3,0,1,1,0,0,0,0,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+0,0,0,1,1,1,0,0,1,0,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,
+1,2,2,3,2,2,0,0,1,1,2,0,1,2,1,0,1,0,1,0,0,1,0,0,0,0,0,0,0,0,0,1,
+0,1,1,0,0,1,1,0,0,1,1,0,0,1,1,0,1,1,0,0,1,0,0,0,0,0,0,0,0,1,1,0,
+2,2,1,1,2,1,2,2,2,2,2,1,2,2,0,1,0,0,0,1,2,2,2,1,2,1,1,1,1,1,2,1,
+1,1,1,1,1,1,1,1,1,1,0,0,1,1,1,0,1,1,1,0,0,0,0,1,1,1,0,1,1,0,0,1,
+1,2,2,2,2,0,1,0,2,2,0,0,0,0,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,2,0,
+0,0,1,0,0,1,0,0,0,0,1,0,1,1,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
+0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,2,2,2,2,0,0,0,2,2,2,0,1,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,
+0,1,1,0,0,1,1,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,2,2,2,2,0,0,0,0,1,0,0,1,1,2,0,0,0,0,1,0,1,0,0,1,0,0,2,0,0,0,1,
+0,0,1,0,0,1,0,0,0,1,1,0,0,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,
+1,2,2,2,1,1,2,0,2,1,1,1,1,0,2,2,0,0,0,0,0,0,0,0,0,1,1,0,0,0,1,1,
+0,0,1,0,1,1,0,0,0,0,1,0,0,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
+1,0,2,1,2,0,0,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,
+0,0,1,0,1,1,0,0,0,0,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,
+1,0,0,0,0,2,0,1,2,1,0,1,1,1,0,1,0,0,0,1,0,1,0,0,1,0,1,0,0,0,0,1,
+0,0,0,0,0,1,0,0,1,1,0,0,1,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,
+2,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+1,0,0,0,1,0,0,0,1,1,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,1,0,0,0,0,0,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+1,1,1,0,1,0,1,0,0,1,1,1,1,0,0,0,1,0,0,0,0,1,0,0,0,1,0,1,0,0,0,0,
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+1,1,0,1,1,0,1,0,1,0,0,0,0,1,1,0,1,1,0,0,0,0,0,1,0,1,1,0,1,0,0,0,
+0,1,1,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,
+)
+
+Koi8rModel = {
+  'charToOrderMap': KOI8R_CharToOrderMap,
+  'precedenceMatrix': RussianLangModel,
+  'mTypicalPositiveRatio': 0.976601,
+  'keepEnglishLetter': False,
+  'charsetName': "KOI8-R"
+}
+
+Win1251CyrillicModel = {
+  'charToOrderMap': win1251_CharToOrderMap,
+  'precedenceMatrix': RussianLangModel,
+  'mTypicalPositiveRatio': 0.976601,
+  'keepEnglishLetter': False,
+  'charsetName': "windows-1251"
+}
+
+Latin5CyrillicModel = {
+  'charToOrderMap': latin5_CharToOrderMap,
+  'precedenceMatrix': RussianLangModel,
+  'mTypicalPositiveRatio': 0.976601,
+  'keepEnglishLetter': False,
+  'charsetName': "ISO-8859-5"
+}
+
+MacCyrillicModel = {
+  'charToOrderMap': macCyrillic_CharToOrderMap,
+  'precedenceMatrix': RussianLangModel,
+  'mTypicalPositiveRatio': 0.976601,
+  'keepEnglishLetter': False,
+  'charsetName': "MacCyrillic"
+};
+
+Ibm866Model = {
+  'charToOrderMap': IBM866_CharToOrderMap,
+  'precedenceMatrix': RussianLangModel,
+  'mTypicalPositiveRatio': 0.976601,
+  'keepEnglishLetter': False,
+  'charsetName': "IBM866"
+}
+
+Ibm855Model = {
+  'charToOrderMap': IBM855_CharToOrderMap,
+  'precedenceMatrix': RussianLangModel,
+  'mTypicalPositiveRatio': 0.976601,
+  'keepEnglishLetter': False,
+  'charsetName': "IBM855"
+}
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/langgreekmodel.py b/lib/requests/packages/chardet/langgreekmodel.py
new file mode 100644
index 00000000..ddb58376
--- /dev/null
+++ b/lib/requests/packages/chardet/langgreekmodel.py
@@ -0,0 +1,225 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+# 255: Control characters that usually does not exist in any text
+# 254: Carriage/Return
+# 253: symbol (punctuation) that does not belong to word
+# 252: 0 - 9
+
+# Character Mapping Table:
+Latin7_CharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253, 82,100,104, 94, 98,101,116,102,111,187,117, 92, 88,113, 85,  # 40
+ 79,118,105, 83, 67,114,119, 95, 99,109,188,253,253,253,253,253,  # 50
+253, 72, 70, 80, 81, 60, 96, 93, 89, 68,120, 97, 77, 86, 69, 55,  # 60
+ 78,115, 65, 66, 58, 76,106,103, 87,107,112,253,253,253,253,253,  # 70
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 80
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 90
+253,233, 90,253,253,253,253,253,253,253,253,253,253, 74,253,253,  # a0
+253,253,253,253,247,248, 61, 36, 46, 71, 73,253, 54,253,108,123,  # b0
+110, 31, 51, 43, 41, 34, 91, 40, 52, 47, 44, 53, 38, 49, 59, 39,  # c0
+ 35, 48,250, 37, 33, 45, 56, 50, 84, 57,120,121, 17, 18, 22, 15,  # d0
+124,  1, 29, 20, 21,  3, 32, 13, 25,  5, 11, 16, 10,  6, 30,  4,  # e0
+  9,  8, 14,  7,  2, 12, 28, 23, 42, 24, 64, 75, 19, 26, 27,253,  # f0
+)
+
+win1253_CharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253, 82,100,104, 94, 98,101,116,102,111,187,117, 92, 88,113, 85,  # 40
+ 79,118,105, 83, 67,114,119, 95, 99,109,188,253,253,253,253,253,  # 50
+253, 72, 70, 80, 81, 60, 96, 93, 89, 68,120, 97, 77, 86, 69, 55,  # 60
+ 78,115, 65, 66, 58, 76,106,103, 87,107,112,253,253,253,253,253,  # 70
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 80
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 90
+253,233, 61,253,253,253,253,253,253,253,253,253,253, 74,253,253,  # a0
+253,253,253,253,247,253,253, 36, 46, 71, 73,253, 54,253,108,123,  # b0
+110, 31, 51, 43, 41, 34, 91, 40, 52, 47, 44, 53, 38, 49, 59, 39,  # c0
+ 35, 48,250, 37, 33, 45, 56, 50, 84, 57,120,121, 17, 18, 22, 15,  # d0
+124,  1, 29, 20, 21,  3, 32, 13, 25,  5, 11, 16, 10,  6, 30,  4,  # e0
+  9,  8, 14,  7,  2, 12, 28, 23, 42, 24, 64, 75, 19, 26, 27,253,  # f0
+)
+
+# Model Table:
+# total sequences: 100%
+# first 512 sequences: 98.2851%
+# first 1024 sequences:1.7001%
+# rest  sequences:     0.0359%
+# negative sequences:  0.0148%
+GreekLangModel = (
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,3,2,2,3,3,3,3,3,3,3,3,1,3,3,3,0,2,2,3,3,0,3,0,3,2,0,3,3,3,0,
+3,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,3,0,3,3,0,3,2,3,3,0,3,2,3,3,3,0,0,3,0,3,0,3,3,2,0,0,0,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,
+0,2,3,2,2,3,3,3,3,3,3,3,3,0,3,3,3,3,0,2,3,3,0,3,3,3,3,2,3,3,3,0,
+2,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,2,3,3,2,3,3,3,3,3,3,3,3,3,3,3,3,0,2,1,3,3,3,3,2,3,3,2,3,3,2,0,
+0,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,0,3,3,3,3,3,3,0,3,3,0,3,3,3,3,3,3,3,3,3,3,0,3,2,3,3,0,
+2,0,1,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
+0,3,3,3,3,3,2,3,0,0,0,0,3,3,0,3,1,3,3,3,0,3,3,0,3,3,3,3,0,0,0,0,
+2,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,3,0,3,0,3,3,3,3,3,0,3,2,2,2,3,0,2,3,3,3,3,3,2,3,3,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,3,3,2,2,2,3,3,3,3,0,3,1,3,3,3,3,2,3,3,3,3,3,3,3,2,2,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,3,2,0,3,0,0,0,3,3,2,3,3,3,3,3,0,0,3,2,3,0,2,3,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,0,3,3,3,3,0,0,3,3,0,2,3,0,3,0,3,3,3,0,0,3,0,3,0,2,2,3,3,0,0,
+0,0,1,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,3,2,0,3,2,3,3,3,3,0,3,3,3,3,3,0,3,3,2,3,2,3,3,2,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,2,3,2,3,3,3,3,3,3,0,2,3,2,3,2,2,2,3,2,3,3,2,3,0,2,2,2,3,0,
+2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,3,0,0,0,3,3,3,2,3,3,0,0,3,0,3,0,0,0,3,2,0,3,0,3,0,0,2,0,2,0,
+0,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,0,3,3,3,3,3,3,0,3,3,0,3,0,0,0,3,3,0,3,3,3,0,0,1,2,3,0,
+3,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,3,2,0,0,3,2,2,3,3,0,3,3,3,3,3,2,1,3,0,3,2,3,3,2,1,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,3,3,0,2,3,3,3,3,3,3,0,0,3,0,3,0,0,0,3,3,0,3,2,3,0,0,3,3,3,0,
+3,0,0,0,2,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,0,3,3,3,3,3,3,0,0,3,0,3,0,0,0,3,2,0,3,2,3,0,0,3,2,3,0,
+2,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,3,1,2,2,3,3,3,3,3,3,0,2,3,0,3,0,0,0,3,3,0,3,0,2,0,0,2,3,1,0,
+2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,0,3,3,3,3,0,3,0,3,3,2,3,0,3,3,3,3,3,3,0,3,3,3,0,2,3,0,0,3,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,0,3,3,3,0,0,3,0,0,0,3,3,0,3,0,2,3,3,0,0,3,0,3,0,3,3,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,3,0,0,0,3,3,3,3,3,3,0,0,3,0,2,0,0,0,3,3,0,3,0,3,0,0,2,0,2,0,
+0,0,0,0,1,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,3,3,0,3,0,2,0,3,2,0,3,2,3,2,3,0,0,3,2,3,2,3,3,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,3,0,0,2,3,3,3,3,3,0,0,0,3,0,2,1,0,0,3,2,2,2,0,3,0,0,2,2,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,0,3,3,3,2,0,3,0,3,0,3,3,0,2,1,2,3,3,0,0,3,0,3,0,3,3,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,2,3,3,3,0,3,3,3,3,3,3,0,2,3,0,3,0,0,0,2,1,0,2,2,3,0,0,2,2,2,0,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,3,0,0,2,3,3,3,2,3,0,0,1,3,0,2,0,0,0,0,3,0,1,0,2,0,0,1,1,1,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,3,1,0,3,0,0,0,3,2,0,3,2,3,3,3,0,0,3,0,3,2,2,2,1,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,0,3,3,3,0,0,3,0,0,0,0,2,0,2,3,3,2,2,2,2,3,0,2,0,2,2,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,3,3,3,2,0,0,0,0,0,0,2,3,0,2,0,2,3,2,0,0,3,0,3,0,3,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,3,2,3,3,2,2,3,0,2,0,3,0,0,0,2,0,0,0,0,1,2,0,2,0,2,0,
+0,2,0,2,0,2,2,0,0,1,0,2,2,2,0,2,2,2,0,2,2,2,0,0,2,0,0,1,0,0,0,0,
+0,2,0,3,3,2,0,0,0,0,0,0,1,3,0,2,0,2,2,2,0,0,2,0,3,0,0,2,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,0,2,3,2,0,2,2,0,2,0,2,2,0,2,0,2,2,2,0,0,0,0,0,0,2,3,0,0,0,2,
+0,1,2,0,0,0,0,2,2,0,0,0,2,1,0,2,2,0,0,0,0,0,0,1,0,2,0,0,0,0,0,0,
+0,0,2,1,0,2,3,2,2,3,2,3,2,0,0,3,3,3,0,0,3,2,0,0,0,1,1,0,2,0,2,2,
+0,2,0,2,0,2,2,0,0,2,0,2,2,2,0,2,2,2,2,0,0,2,0,0,0,2,0,1,0,0,0,0,
+0,3,0,3,3,2,2,0,3,0,0,0,2,2,0,2,2,2,1,2,0,0,1,2,2,0,0,3,0,0,0,2,
+0,1,2,0,0,0,1,2,0,0,0,0,0,0,0,2,2,0,1,0,0,2,0,0,0,2,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,2,3,3,2,2,0,0,0,2,0,2,3,3,0,2,0,0,0,0,0,0,2,2,2,0,2,2,0,2,0,2,
+0,2,2,0,0,2,2,2,2,1,0,0,2,2,0,2,0,0,2,0,0,0,0,0,0,2,0,0,0,0,0,0,
+0,2,0,3,2,3,0,0,0,3,0,0,2,2,0,2,0,2,2,2,0,0,2,0,0,0,0,0,0,0,0,2,
+0,0,2,2,0,0,2,2,2,0,0,0,0,0,0,2,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,2,0,0,3,2,0,2,2,2,2,2,0,0,0,2,0,0,0,0,2,0,1,0,0,2,0,1,0,0,0,
+0,2,2,2,0,2,2,0,1,2,0,2,2,2,0,2,2,2,2,1,2,2,0,0,2,0,0,0,0,0,0,0,
+0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
+0,2,0,2,0,2,2,0,0,0,0,1,2,1,0,0,2,2,0,0,2,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,3,2,3,0,0,2,0,0,0,2,2,0,2,0,0,0,1,0,0,2,0,2,0,2,2,0,0,0,0,
+0,0,2,0,0,0,0,2,2,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,
+0,2,2,3,2,2,0,0,0,0,0,0,1,3,0,2,0,2,2,0,0,0,1,0,2,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,2,0,2,0,3,2,0,2,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+0,0,2,0,0,0,0,1,1,0,0,2,1,2,0,2,2,0,1,0,0,1,0,0,0,2,0,0,0,0,0,0,
+0,3,0,2,2,2,0,0,2,0,0,0,2,0,0,0,2,3,0,2,0,0,0,0,0,0,2,2,0,0,0,2,
+0,1,2,0,0,0,1,2,2,1,0,0,0,2,0,0,2,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,2,1,2,0,2,2,0,2,0,0,2,0,0,0,0,1,2,1,0,2,1,0,0,0,0,0,0,0,0,0,0,
+0,0,2,0,0,0,3,1,2,2,0,2,0,0,0,0,2,0,0,0,2,0,0,3,0,0,0,0,2,2,2,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,2,1,0,2,0,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,1,0,0,0,0,0,0,2,
+0,2,2,0,0,2,2,2,2,2,0,1,2,0,0,0,2,2,0,1,0,2,0,0,2,2,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,0,0,0,3,0,0,2,0,0,0,0,0,0,0,0,2,0,2,0,0,0,0,2,
+0,1,2,0,0,0,0,2,2,1,0,1,0,1,0,2,2,2,1,0,0,0,0,0,0,1,0,0,0,0,0,0,
+0,2,0,1,2,0,0,0,0,0,0,0,0,0,0,2,0,0,2,2,0,0,0,0,1,0,0,0,0,0,0,2,
+0,2,2,0,0,0,0,2,2,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,2,0,0,0,
+0,2,2,2,2,0,0,0,3,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,2,0,0,0,0,0,0,1,
+0,0,2,0,0,0,0,1,2,0,0,0,0,0,0,2,2,1,1,0,0,0,0,0,0,1,0,0,0,0,0,0,
+0,2,0,2,2,2,0,0,2,0,0,0,0,0,0,0,2,2,2,0,0,0,2,0,0,0,0,0,0,0,0,2,
+0,0,1,0,0,0,0,2,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,
+0,3,0,2,0,0,0,0,0,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,2,0,0,0,0,2,
+0,0,2,0,0,0,0,2,2,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,2,0,2,2,1,0,0,0,0,0,0,2,0,0,2,0,2,2,2,0,0,0,0,0,0,2,0,0,0,0,2,
+0,0,2,0,0,2,0,2,2,0,0,0,0,2,0,2,0,0,0,0,0,2,0,0,0,2,0,0,0,0,0,0,
+0,0,3,0,0,0,2,2,0,2,2,0,0,0,0,0,2,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,2,0,0,0,0,0,
+0,2,2,2,2,2,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,1,
+0,0,0,0,0,0,0,2,1,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,2,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
+0,2,0,0,0,2,0,0,0,0,0,1,0,0,0,0,2,2,0,0,0,1,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,2,0,0,0,
+0,2,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,2,0,2,0,0,0,
+0,0,0,0,0,0,0,0,2,1,0,0,0,0,0,0,2,0,0,0,1,2,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+)
+
+Latin7GreekModel = {
+  'charToOrderMap': Latin7_CharToOrderMap,
+  'precedenceMatrix': GreekLangModel,
+  'mTypicalPositiveRatio': 0.982851,
+  'keepEnglishLetter': False,
+  'charsetName': "ISO-8859-7"
+}
+
+Win1253GreekModel = {
+  'charToOrderMap': win1253_CharToOrderMap,
+  'precedenceMatrix': GreekLangModel,
+  'mTypicalPositiveRatio': 0.982851,
+  'keepEnglishLetter': False,
+  'charsetName': "windows-1253"
+}
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/langhebrewmodel.py b/lib/requests/packages/chardet/langhebrewmodel.py
new file mode 100644
index 00000000..75f2bc7f
--- /dev/null
+++ b/lib/requests/packages/chardet/langhebrewmodel.py
@@ -0,0 +1,201 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Universal charset detector code.
+#
+# The Initial Developer of the Original Code is
+#          Simon Montagu
+# Portions created by the Initial Developer are Copyright (C) 2005
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#   Shy Shalom - original C code
+#   Shoshannah Forbes - original C code (?)
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+# 255: Control characters that usually does not exist in any text
+# 254: Carriage/Return
+# 253: symbol (punctuation) that does not belong to word
+# 252: 0 - 9
+
+# Windows-1255 language model
+# Character Mapping Table:
+win1255_CharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253, 69, 91, 79, 80, 92, 89, 97, 90, 68,111,112, 82, 73, 95, 85,  # 40
+ 78,121, 86, 71, 67,102,107, 84,114,103,115,253,253,253,253,253,  # 50
+253, 50, 74, 60, 61, 42, 76, 70, 64, 53,105, 93, 56, 65, 54, 49,  # 60
+ 66,110, 51, 43, 44, 63, 81, 77, 98, 75,108,253,253,253,253,253,  # 70
+124,202,203,204,205, 40, 58,206,207,208,209,210,211,212,213,214,
+215, 83, 52, 47, 46, 72, 32, 94,216,113,217,109,218,219,220,221,
+ 34,116,222,118,100,223,224,117,119,104,125,225,226, 87, 99,227,
+106,122,123,228, 55,229,230,101,231,232,120,233, 48, 39, 57,234,
+ 30, 59, 41, 88, 33, 37, 36, 31, 29, 35,235, 62, 28,236,126,237,
+238, 38, 45,239,240,241,242,243,127,244,245,246,247,248,249,250,
+  9,  8, 20, 16,  3,  2, 24, 14, 22,  1, 25, 15,  4, 11,  6, 23,
+ 12, 19, 13, 26, 18, 27, 21, 17,  7, 10,  5,251,252,128, 96,253,
+)
+
+# Model Table:
+# total sequences: 100%
+# first 512 sequences: 98.4004%
+# first 1024 sequences: 1.5981%
+# rest  sequences:      0.087%
+# negative sequences:   0.0015%
+HebrewLangModel = (
+0,3,3,3,3,3,3,3,3,3,3,2,3,3,3,3,3,3,3,3,3,3,3,2,3,2,1,2,0,1,0,0,
+3,0,3,1,0,0,1,3,2,0,1,1,2,0,2,2,2,1,1,1,1,2,1,1,1,2,0,0,2,2,0,1,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,
+1,2,1,2,1,2,0,0,2,0,0,0,0,0,1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,
+1,2,1,3,1,1,0,0,2,0,0,0,1,0,1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,0,1,2,2,1,3,
+1,2,1,1,2,2,0,0,2,2,0,0,0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,1,0,1,1,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,2,2,2,2,3,2,
+1,2,1,2,2,2,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,2,3,2,2,3,2,2,2,1,2,2,2,2,
+1,2,1,1,2,2,0,1,2,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,0,2,2,2,2,2,
+0,2,0,2,2,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,0,2,2,2,
+0,2,1,2,2,2,0,0,2,1,0,0,0,0,1,0,1,0,0,0,0,0,0,2,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,3,3,3,2,3,3,3,3,3,3,3,3,3,3,3,3,3,2,1,2,3,2,2,2,
+1,2,1,2,2,2,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,1,0,
+3,3,3,3,3,3,3,3,3,2,3,3,3,2,3,3,3,3,3,3,3,3,3,3,3,3,3,1,0,2,0,2,
+0,2,1,2,2,2,0,0,1,2,0,0,0,0,1,0,1,0,0,0,0,0,0,1,0,0,0,2,0,0,1,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,2,3,2,2,3,2,1,2,1,1,1,
+0,1,1,1,1,1,3,0,1,0,0,0,0,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
+3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,0,1,1,0,0,1,0,0,1,0,0,0,0,
+0,0,1,0,0,0,0,0,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,
+0,2,0,1,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,3,2,3,3,3,2,1,2,3,3,2,3,3,3,3,2,3,2,1,2,0,2,1,2,
+0,2,0,2,2,2,0,0,1,2,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,
+3,3,3,3,3,3,3,3,3,2,3,3,3,1,2,2,3,3,2,3,2,3,2,2,3,1,2,2,0,2,2,2,
+0,2,1,2,2,2,0,0,1,2,0,0,0,0,1,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,1,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,3,2,3,3,2,2,2,3,3,3,3,1,3,2,2,2,
+0,2,0,1,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,3,3,3,2,3,2,2,2,1,2,2,0,2,2,2,2,
+0,2,0,2,2,2,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,3,3,3,2,3,3,3,1,3,2,3,3,2,3,3,2,2,1,2,2,2,2,2,2,
+0,2,1,2,1,2,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,2,3,2,3,3,2,3,3,3,3,2,3,2,3,3,3,3,3,2,2,2,2,2,2,2,1,
+0,2,0,1,2,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,3,2,1,2,3,3,3,3,3,3,3,2,3,2,3,2,1,2,3,0,2,1,2,2,
+0,2,1,1,2,1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,2,0,
+3,3,3,3,3,3,3,3,3,2,3,3,3,3,2,1,3,1,2,2,2,1,2,3,3,1,2,1,2,2,2,2,
+0,1,1,1,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,2,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,3,3,0,2,3,3,3,1,3,3,3,1,2,2,2,2,1,1,2,2,2,2,2,2,
+0,2,0,1,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,2,3,3,3,2,2,3,3,3,2,1,2,3,2,3,2,2,2,2,1,2,1,1,1,2,2,
+0,2,1,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
+3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,0,0,0,1,0,0,0,0,0,
+1,0,1,0,0,0,0,0,2,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,2,3,3,2,3,1,2,2,2,2,3,2,3,1,1,2,2,1,2,2,1,1,0,2,2,2,2,
+0,1,0,1,2,2,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
+3,0,0,1,1,0,1,0,0,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,2,0,
+0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,0,1,0,1,0,1,1,0,1,1,0,0,0,1,1,0,1,1,1,0,0,0,0,0,0,1,0,0,0,0,0,
+0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,0,0,0,1,1,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
+3,2,2,1,2,2,2,2,2,2,2,1,2,2,1,2,2,1,1,1,1,1,1,1,1,2,1,1,0,3,3,3,
+0,3,0,2,2,2,2,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
+2,2,2,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,2,2,1,2,2,2,1,1,1,2,0,1,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,2,2,2,2,2,2,2,2,2,2,1,2,2,2,2,2,2,2,2,2,2,2,0,2,2,0,0,0,0,0,0,
+0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,3,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,2,1,0,2,1,0,
+0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,1,1,1,1,1,1,1,1,1,1,0,0,1,1,1,1,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,
+0,3,1,1,2,2,2,2,2,1,2,2,2,1,1,2,2,2,2,2,2,2,1,2,2,1,0,1,1,1,1,0,
+0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,2,1,1,1,1,2,1,1,2,1,0,1,1,1,1,1,1,1,1,1,1,1,0,1,0,0,0,0,0,0,0,
+0,0,2,0,0,0,0,0,0,0,0,1,1,0,0,0,0,1,1,0,0,1,1,0,0,0,0,0,0,1,0,0,
+2,1,1,2,2,2,2,2,2,2,2,2,2,2,1,2,2,2,2,2,1,2,1,2,1,1,1,1,0,0,0,0,
+0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,2,1,2,2,2,2,2,2,2,2,2,2,1,2,1,2,1,1,2,1,1,1,2,1,2,1,2,0,1,0,1,
+0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,3,1,2,2,2,1,2,2,2,2,2,2,2,2,1,2,1,1,1,1,1,1,2,1,2,1,1,0,1,0,1,
+0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,1,2,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,
+0,2,0,1,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
+3,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,1,1,1,1,1,1,1,0,1,1,0,1,0,0,1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,2,0,1,1,1,0,1,0,0,0,1,1,0,1,1,0,0,0,0,0,1,1,0,0,
+0,1,1,1,2,1,2,2,2,0,2,0,2,0,1,1,2,1,1,1,1,2,1,0,1,1,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,0,1,0,0,0,0,0,1,0,1,2,2,0,1,0,0,1,1,2,2,1,2,0,2,0,0,0,1,2,0,1,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,2,0,2,1,2,0,2,0,0,1,1,1,1,1,1,0,1,0,0,0,1,0,0,1,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,1,0,2,1,1,0,1,0,0,1,1,1,2,2,0,0,1,0,0,0,1,0,0,1,
+1,1,2,1,0,1,1,1,0,1,0,1,1,1,1,0,0,0,1,0,1,0,0,0,0,0,0,0,0,2,2,1,
+0,2,0,1,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,1,0,0,1,0,1,1,1,1,0,0,0,0,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,1,1,1,1,1,1,1,1,2,1,0,1,1,1,1,1,1,1,1,1,1,1,0,1,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,0,1,1,1,0,1,1,0,1,0,0,0,1,1,0,1,
+2,0,1,0,1,0,1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,1,0,1,1,1,0,1,0,0,1,1,2,1,1,2,0,1,0,0,0,1,1,0,1,
+1,0,0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,1,0,1,1,2,0,1,0,0,0,0,2,1,1,2,0,2,0,0,0,1,1,0,1,
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,1,0,2,1,1,0,1,0,0,2,2,1,2,1,1,0,1,0,0,0,1,1,0,1,
+2,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,1,2,2,0,0,0,0,0,1,1,0,1,0,0,1,0,0,0,0,1,0,1,
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,1,2,2,0,0,0,0,2,1,1,1,0,2,1,1,0,0,0,2,1,0,1,
+1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,1,0,1,1,2,0,1,0,0,1,1,0,2,1,1,0,1,0,0,0,1,1,0,1,
+2,2,1,1,1,0,1,1,0,1,1,0,1,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,1,0,2,1,1,0,1,0,0,1,1,0,1,2,1,0,2,0,0,0,1,1,0,1,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,
+0,1,0,0,2,0,2,1,1,0,1,0,1,0,0,1,0,0,0,0,1,0,0,0,1,0,0,0,0,0,1,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,0,0,1,0,0,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,1,0,1,1,2,0,1,0,0,1,1,1,0,1,0,0,1,0,0,0,1,0,0,1,
+1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,0,0,0,0,0,0,0,1,0,1,1,0,0,1,0,0,2,1,1,1,1,1,0,1,0,0,0,0,1,0,1,
+0,1,1,1,2,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,1,2,1,0,0,0,0,0,1,1,1,1,1,0,1,0,0,0,1,1,0,0,
+)
+
+Win1255HebrewModel = {
+  'charToOrderMap': win1255_CharToOrderMap,
+  'precedenceMatrix': HebrewLangModel,
+  'mTypicalPositiveRatio': 0.984004,
+  'keepEnglishLetter': False,
+  'charsetName': "windows-1255"
+}
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/langhungarianmodel.py b/lib/requests/packages/chardet/langhungarianmodel.py
new file mode 100644
index 00000000..49d2f0fe
--- /dev/null
+++ b/lib/requests/packages/chardet/langhungarianmodel.py
@@ -0,0 +1,225 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+# 255: Control characters that usually does not exist in any text
+# 254: Carriage/Return
+# 253: symbol (punctuation) that does not belong to word
+# 252: 0 - 9
+
+# Character Mapping Table:
+Latin2_HungarianCharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253, 28, 40, 54, 45, 32, 50, 49, 38, 39, 53, 36, 41, 34, 35, 47,
+ 46, 71, 43, 33, 37, 57, 48, 64, 68, 55, 52,253,253,253,253,253,
+253,  2, 18, 26, 17,  1, 27, 12, 20,  9, 22,  7,  6, 13,  4,  8,
+ 23, 67, 10,  5,  3, 21, 19, 65, 62, 16, 11,253,253,253,253,253,
+159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,
+175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,
+191,192,193,194,195,196,197, 75,198,199,200,201,202,203,204,205,
+ 79,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,
+221, 51, 81,222, 78,223,224,225,226, 44,227,228,229, 61,230,231,
+232,233,234, 58,235, 66, 59,236,237,238, 60, 69, 63,239,240,241,
+ 82, 14, 74,242, 70, 80,243, 72,244, 15, 83, 77, 84, 30, 76, 85,
+245,246,247, 25, 73, 42, 24,248,249,250, 31, 56, 29,251,252,253,
+)
+
+win1250HungarianCharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253, 28, 40, 54, 45, 32, 50, 49, 38, 39, 53, 36, 41, 34, 35, 47,
+ 46, 72, 43, 33, 37, 57, 48, 64, 68, 55, 52,253,253,253,253,253,
+253,  2, 18, 26, 17,  1, 27, 12, 20,  9, 22,  7,  6, 13,  4,  8,
+ 23, 67, 10,  5,  3, 21, 19, 65, 62, 16, 11,253,253,253,253,253,
+161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,
+177,178,179,180, 78,181, 69,182,183,184,185,186,187,188,189,190,
+191,192,193,194,195,196,197, 76,198,199,200,201,202,203,204,205,
+ 81,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,
+221, 51, 83,222, 80,223,224,225,226, 44,227,228,229, 61,230,231,
+232,233,234, 58,235, 66, 59,236,237,238, 60, 70, 63,239,240,241,
+ 84, 14, 75,242, 71, 82,243, 73,244, 15, 85, 79, 86, 30, 77, 87,
+245,246,247, 25, 74, 42, 24,248,249,250, 31, 56, 29,251,252,253,
+)
+
+# Model Table:
+# total sequences: 100%
+# first 512 sequences: 94.7368%
+# first 1024 sequences:5.2623%
+# rest  sequences:     0.8894%
+# negative sequences:  0.0009%
+HungarianLangModel = (
+0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
+3,3,3,3,3,3,3,3,3,3,2,3,3,3,3,3,3,3,3,2,2,3,3,1,1,2,2,2,2,2,1,2,
+3,2,2,3,3,3,3,3,2,3,3,3,3,3,3,1,2,3,3,3,3,2,3,3,1,1,3,3,0,1,1,1,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,
+3,2,1,3,3,3,3,3,2,3,3,3,3,3,1,1,2,3,3,3,3,3,3,3,1,1,3,2,0,1,1,1,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,3,3,3,1,1,2,3,3,3,1,3,3,3,3,3,1,3,3,2,2,0,3,2,3,
+0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,
+3,3,3,3,3,3,2,3,3,3,2,3,3,2,3,3,3,3,3,2,3,3,2,2,3,2,3,2,0,3,2,2,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,
+3,3,3,3,3,3,2,3,3,3,3,3,2,3,3,3,1,2,3,2,2,3,1,2,3,3,2,2,0,3,3,3,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,3,3,2,2,3,3,3,3,3,3,2,3,3,3,3,2,3,3,3,3,0,2,3,2,
+0,0,0,1,1,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,3,3,3,1,1,1,3,3,2,1,3,2,2,3,2,1,3,2,2,1,0,3,3,1,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+3,2,2,3,3,3,3,3,1,2,3,3,3,3,1,2,1,3,3,3,3,2,2,3,1,1,3,2,0,1,1,1,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,2,2,3,3,3,3,3,2,1,3,3,3,3,3,2,2,1,3,3,3,0,1,1,2,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,3,2,3,3,2,3,3,3,2,0,3,2,3,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,1,0,
+3,3,3,3,3,3,2,3,3,3,2,3,2,3,3,3,1,3,2,2,2,3,1,1,3,3,1,1,0,3,3,2,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,2,3,3,3,2,3,2,3,3,3,2,3,3,3,3,3,1,2,3,2,2,0,2,2,2,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+3,3,3,2,2,2,3,1,3,3,2,2,1,3,3,3,1,1,3,1,2,3,2,3,2,2,2,1,0,2,2,2,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,
+3,1,1,3,3,3,3,3,1,2,3,3,3,3,1,2,1,3,3,3,2,2,3,2,1,0,3,2,0,1,1,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,1,1,3,3,3,3,3,1,2,3,3,3,3,1,1,0,3,3,3,3,0,2,3,0,0,2,1,0,1,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,2,2,3,3,2,2,2,2,3,3,0,1,2,3,2,3,2,2,3,2,1,2,0,2,2,2,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,
+3,3,3,3,3,3,1,2,3,3,3,2,1,2,3,3,2,2,2,3,2,3,3,1,3,3,1,1,0,2,3,2,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+3,3,3,1,2,2,2,2,3,3,3,1,1,1,3,3,1,1,3,1,1,3,2,1,2,3,1,1,0,2,2,2,
+0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+3,3,3,2,1,2,1,1,3,3,1,1,1,1,3,3,1,1,2,2,1,2,1,1,2,2,1,1,0,2,2,1,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+3,3,3,1,1,2,1,1,3,3,1,0,1,1,3,3,2,0,1,1,2,3,1,0,2,2,1,0,0,1,3,2,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+3,2,1,3,3,3,3,3,1,2,3,2,3,3,2,1,1,3,2,3,2,1,2,2,0,1,2,1,0,0,1,1,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
+3,3,3,3,2,2,2,2,3,1,2,2,1,1,3,3,0,3,2,1,2,3,2,1,3,3,1,1,0,2,1,3,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+3,3,3,2,2,2,3,2,3,3,3,2,1,1,3,3,1,1,1,2,2,3,2,3,2,2,2,1,0,2,2,1,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+1,0,0,3,3,3,3,3,0,0,3,3,2,3,0,0,0,2,3,3,1,0,1,2,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,1,2,3,3,3,3,3,1,2,3,3,2,2,1,1,0,3,3,2,2,1,2,2,1,0,2,2,0,1,1,1,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,2,2,1,3,1,2,3,3,2,2,1,1,2,2,1,1,1,1,3,2,1,1,1,1,2,1,0,1,2,1,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,
+2,3,3,1,1,1,1,1,3,3,3,0,1,1,3,3,1,1,1,1,1,2,2,0,3,1,1,2,0,2,1,1,
+0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
+3,1,0,1,2,1,2,2,0,1,2,3,1,2,0,0,0,2,1,1,1,1,1,2,0,0,1,1,0,0,0,0,
+1,2,1,2,2,2,1,2,1,2,0,2,0,2,2,1,1,2,1,1,2,1,1,1,0,1,0,0,0,1,1,0,
+1,1,1,2,3,2,3,3,0,1,2,2,3,1,0,1,0,2,1,2,2,0,1,1,0,0,1,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,0,0,3,3,2,2,1,0,0,3,2,3,2,0,0,0,1,1,3,0,0,1,1,0,0,2,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,1,1,2,2,3,3,1,0,1,3,2,3,1,1,1,0,1,1,1,1,1,3,1,0,0,2,2,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,1,1,1,2,2,2,1,0,1,2,3,3,2,0,0,0,2,1,1,1,2,1,1,1,0,1,1,1,0,0,0,
+1,2,2,2,2,2,1,1,1,2,0,2,1,1,1,1,1,2,1,1,1,1,1,1,0,1,1,1,0,0,1,1,
+3,2,2,1,0,0,1,1,2,2,0,3,0,1,2,1,1,0,0,1,1,1,0,1,1,1,1,0,2,1,1,1,
+2,2,1,1,1,2,1,2,1,1,1,1,1,1,1,2,1,1,1,2,3,1,1,1,1,1,1,1,1,1,0,1,
+2,3,3,0,1,0,0,0,3,3,1,0,0,1,2,2,1,0,0,0,0,2,0,0,1,1,1,0,2,1,1,1,
+2,1,1,1,1,1,1,2,1,1,0,1,1,0,1,1,1,0,1,2,1,1,0,1,1,1,1,1,1,1,0,1,
+2,3,3,0,1,0,0,0,2,2,0,0,0,0,1,2,2,0,0,0,0,1,0,0,1,1,0,0,2,0,1,0,
+2,1,1,1,1,2,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1,1,2,0,1,1,1,1,1,0,1,
+3,2,2,0,1,0,1,0,2,3,2,0,0,1,2,2,1,0,0,1,1,1,0,0,2,1,0,1,2,2,1,1,
+2,1,1,1,1,1,1,2,1,1,1,1,1,1,0,2,1,0,1,1,0,1,1,1,0,1,1,2,1,1,0,1,
+2,2,2,0,0,1,0,0,2,2,1,1,0,0,2,1,1,0,0,0,1,2,0,0,2,1,0,0,2,1,1,1,
+2,1,1,1,1,2,1,2,1,1,1,2,2,1,1,2,1,1,1,2,1,1,1,1,1,1,1,1,1,1,0,1,
+1,2,3,0,0,0,1,0,3,2,1,0,0,1,2,1,1,0,0,0,0,2,1,0,1,1,0,0,2,1,2,1,
+1,1,0,0,0,1,0,1,1,1,1,1,2,0,0,1,0,0,0,2,0,0,1,1,1,1,1,1,1,1,0,1,
+3,0,0,2,1,2,2,1,0,0,2,1,2,2,0,0,0,2,1,1,1,0,1,1,0,0,1,1,2,0,0,0,
+1,2,1,2,2,1,1,2,1,2,0,1,1,1,1,1,1,1,1,1,2,1,1,0,0,1,1,1,1,0,0,1,
+1,3,2,0,0,0,1,0,2,2,2,0,0,0,2,2,1,0,0,0,0,3,1,1,1,1,0,0,2,1,1,1,
+2,1,0,1,1,1,0,1,1,1,1,1,1,1,0,2,1,0,0,1,0,1,1,0,1,1,1,1,1,1,0,1,
+2,3,2,0,0,0,1,0,2,2,0,0,0,0,2,1,1,0,0,0,0,2,1,0,1,1,0,0,2,1,1,0,
+2,1,1,1,1,2,1,2,1,2,0,1,1,1,0,2,1,1,1,2,1,1,1,1,0,1,1,1,1,1,0,1,
+3,1,1,2,2,2,3,2,1,1,2,2,1,1,0,1,0,2,2,1,1,1,1,1,0,0,1,1,0,1,1,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,2,2,0,0,0,0,0,2,2,0,0,0,0,2,2,1,0,0,0,1,1,0,0,1,2,0,0,2,1,1,1,
+2,2,1,1,1,2,1,2,1,1,0,1,1,1,1,2,1,1,1,2,1,1,1,1,0,1,2,1,1,1,0,1,
+1,0,0,1,2,3,2,1,0,0,2,0,1,1,0,0,0,1,1,1,1,0,1,1,0,0,1,0,0,0,0,0,
+1,2,1,2,1,2,1,1,1,2,0,2,1,1,1,0,1,2,0,0,1,1,1,0,0,0,0,0,0,0,0,0,
+2,3,2,0,0,0,0,0,1,1,2,1,0,0,1,1,1,0,0,0,0,2,0,0,1,1,0,0,2,1,1,1,
+2,1,1,1,1,1,1,2,1,0,1,1,1,1,0,2,1,1,1,1,1,1,0,1,0,1,1,1,1,1,0,1,
+1,2,2,0,1,1,1,0,2,2,2,0,0,0,3,2,1,0,0,0,1,1,0,0,1,1,0,1,1,1,0,0,
+1,1,0,1,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,2,1,1,1,0,0,1,1,1,0,1,0,1,
+2,1,0,2,1,1,2,2,1,1,2,1,1,1,0,0,0,1,1,0,1,1,1,1,0,0,1,1,1,0,0,0,
+1,2,2,2,2,2,1,1,1,2,0,2,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,0,0,0,1,0,
+1,2,3,0,0,0,1,0,2,2,0,0,0,0,2,2,0,0,0,0,0,1,0,0,1,0,0,0,2,0,1,0,
+2,1,1,1,1,1,0,2,0,0,0,1,2,1,1,1,1,0,1,2,0,1,0,1,0,1,1,1,0,1,0,1,
+2,2,2,0,0,0,1,0,2,1,2,0,0,0,1,1,2,0,0,0,0,1,0,0,1,1,0,0,2,1,0,1,
+2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,0,1,1,1,1,1,0,1,
+1,2,2,0,0,0,1,0,2,2,2,0,0,0,1,1,0,0,0,0,0,1,1,0,2,0,0,1,1,1,0,1,
+1,0,1,1,1,1,1,1,0,1,1,1,1,0,0,1,0,0,1,1,0,1,0,1,1,1,1,1,0,0,0,1,
+1,0,0,1,0,1,2,1,0,0,1,1,1,2,0,0,0,1,1,0,1,0,1,1,0,0,1,0,0,0,0,0,
+0,2,1,2,1,1,1,1,1,2,0,2,0,1,1,0,1,2,1,0,1,1,1,0,0,0,0,0,0,1,0,0,
+2,1,1,0,1,2,0,0,1,1,1,0,0,0,1,1,0,0,0,0,0,1,0,0,1,0,0,0,2,1,0,1,
+2,2,1,1,1,1,1,2,1,1,0,1,1,1,1,2,1,1,1,2,1,1,0,1,0,1,1,1,1,1,0,1,
+1,2,2,0,0,0,0,0,1,1,0,0,0,0,2,1,0,0,0,0,0,2,0,0,2,2,0,0,2,0,0,1,
+2,1,1,1,1,1,1,1,0,1,1,0,1,1,0,1,0,0,0,1,1,1,1,0,0,1,1,1,1,0,0,1,
+1,1,2,0,0,3,1,0,2,1,1,1,0,0,1,1,1,0,0,0,1,1,0,0,0,1,0,0,1,0,1,0,
+1,2,1,0,1,1,1,2,1,1,0,1,1,1,1,1,0,0,0,1,1,1,1,1,0,1,0,0,0,1,0,0,
+2,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,1,0,0,0,1,0,0,0,0,2,0,0,0,
+2,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,2,1,1,0,0,1,1,1,1,1,0,1,
+2,1,1,1,2,1,1,1,0,1,1,2,1,0,0,0,0,1,1,1,1,0,1,0,0,0,0,1,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,1,0,1,1,1,1,1,0,0,1,1,2,1,0,0,0,1,1,0,0,0,1,1,0,0,1,0,1,0,0,0,
+1,2,1,1,1,1,1,1,1,1,0,1,0,1,1,1,1,1,1,0,1,1,1,0,0,0,0,0,0,1,0,0,
+2,0,0,0,1,1,1,1,0,0,1,1,0,0,0,0,0,1,1,1,2,0,0,1,0,0,1,0,1,0,0,0,
+0,1,1,1,1,1,1,1,1,2,0,1,1,1,1,0,1,1,1,0,1,1,1,0,0,0,0,0,0,0,0,0,
+1,0,0,1,1,1,1,1,0,0,2,1,0,1,0,0,0,1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,
+0,1,1,1,1,1,1,0,1,1,0,1,0,1,1,0,1,1,0,0,1,1,1,0,0,0,0,0,0,0,0,0,
+1,0,0,1,1,1,0,0,0,0,1,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,0,0,1,1,0,1,0,1,0,0,1,1,1,0,1,1,1,0,0,0,0,0,0,0,0,0,
+0,0,0,1,0,0,0,0,0,0,1,1,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,1,1,1,0,1,0,0,1,1,0,1,0,1,1,0,1,1,1,0,1,1,1,0,0,0,0,0,0,0,0,0,
+2,1,1,1,1,1,1,1,1,1,1,0,0,1,1,1,0,0,1,0,0,1,0,1,0,1,1,1,0,0,1,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,0,0,1,1,1,1,0,0,0,1,1,1,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,
+0,1,1,1,1,1,1,0,1,1,0,1,0,1,0,0,1,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,
+)
+
+Latin2HungarianModel = {
+  'charToOrderMap': Latin2_HungarianCharToOrderMap,
+  'precedenceMatrix': HungarianLangModel,
+  'mTypicalPositiveRatio': 0.947368,
+  'keepEnglishLetter': True,
+  'charsetName': "ISO-8859-2"
+}
+
+Win1250HungarianModel = {
+  'charToOrderMap': win1250HungarianCharToOrderMap,
+  'precedenceMatrix': HungarianLangModel,
+  'mTypicalPositiveRatio': 0.947368,
+  'keepEnglishLetter': True,
+  'charsetName': "windows-1250"
+}
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/langthaimodel.py b/lib/requests/packages/chardet/langthaimodel.py
new file mode 100644
index 00000000..0508b1b1
--- /dev/null
+++ b/lib/requests/packages/chardet/langthaimodel.py
@@ -0,0 +1,200 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Communicator client code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+# 255: Control characters that usually does not exist in any text
+# 254: Carriage/Return
+# 253: symbol (punctuation) that does not belong to word
+# 252: 0 - 9
+
+# The following result for thai was collected from a limited sample (1M).
+
+# Character Mapping Table:
+TIS620CharToOrderMap = (
+255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255,  # 00
+255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,  # 10
+253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,  # 20
+252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253,  # 30
+253,182,106,107,100,183,184,185,101, 94,186,187,108,109,110,111,  # 40
+188,189,190, 89, 95,112,113,191,192,193,194,253,253,253,253,253,  # 50
+253, 64, 72, 73,114, 74,115,116,102, 81,201,117, 90,103, 78, 82,  # 60
+ 96,202, 91, 79, 84,104,105, 97, 98, 92,203,253,253,253,253,253,  # 70
+209,210,211,212,213, 88,214,215,216,217,218,219,220,118,221,222,
+223,224, 99, 85, 83,225,226,227,228,229,230,231,232,233,234,235,
+236,  5, 30,237, 24,238, 75,  8, 26, 52, 34, 51,119, 47, 58, 57,
+ 49, 53, 55, 43, 20, 19, 44, 14, 48,  3, 17, 25, 39, 62, 31, 54,
+ 45,  9, 16,  2, 61, 15,239, 12, 42, 46, 18, 21, 76,  4, 66, 63,
+ 22, 10,  1, 36, 23, 13, 40, 27, 32, 35, 86,240,241,242,243,244,
+ 11, 28, 41, 29, 33,245, 50, 37,  6,  7, 67, 77, 38, 93,246,247,
+ 68, 56, 59, 65, 69, 60, 70, 80, 71, 87,248,249,250,251,252,253,
+)
+
+# Model Table:
+# total sequences: 100%
+# first 512 sequences: 92.6386%
+# first 1024 sequences:7.3177%
+# rest  sequences:     1.0230%
+# negative sequences:  0.0436%
+ThaiLangModel = (
+0,1,3,3,3,3,0,0,3,3,0,3,3,0,3,3,3,3,3,3,3,3,0,0,3,3,3,0,3,3,3,3,
+0,3,3,0,0,0,1,3,0,3,3,2,3,3,0,1,2,3,3,3,3,0,2,0,2,0,0,3,2,1,2,2,
+3,0,3,3,2,3,0,0,3,3,0,3,3,0,3,3,3,3,3,3,3,3,3,0,3,2,3,0,2,2,2,3,
+0,2,3,0,0,0,0,1,0,1,2,3,1,1,3,2,2,0,1,1,0,0,1,0,0,0,0,0,0,0,1,1,
+3,3,3,2,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,3,3,2,3,2,3,3,2,2,2,
+3,1,2,3,0,3,3,2,2,1,2,3,3,1,2,0,1,3,0,1,0,0,1,0,0,0,0,0,0,0,1,1,
+3,3,2,2,3,3,3,3,1,2,3,3,3,3,3,2,2,2,2,3,3,2,2,3,3,2,2,3,2,3,2,2,
+3,3,1,2,3,1,2,2,3,3,1,0,2,1,0,0,3,1,2,1,0,0,1,0,0,0,0,0,0,1,0,1,
+3,3,3,3,3,3,2,2,3,3,3,3,2,3,2,2,3,3,2,2,3,2,2,2,2,1,1,3,1,2,1,1,
+3,2,1,0,2,1,0,1,0,1,1,0,1,1,0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,
+3,3,3,2,3,2,3,3,2,2,3,2,3,3,2,3,1,1,2,3,2,2,2,3,2,2,2,2,2,1,2,1,
+2,2,1,1,3,3,2,1,0,1,2,2,0,1,3,0,0,0,1,1,0,0,0,0,0,2,3,0,0,2,1,1,
+3,3,2,3,3,2,0,0,3,3,0,3,3,0,2,2,3,1,2,2,1,1,1,0,2,2,2,0,2,2,1,1,
+0,2,1,0,2,0,0,2,0,1,0,0,1,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,1,0,
+3,3,2,3,3,2,0,0,3,3,0,2,3,0,2,1,2,2,2,2,1,2,0,0,2,2,2,0,2,2,1,1,
+0,2,1,0,2,0,0,2,0,1,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,
+3,3,2,3,2,3,2,0,2,2,1,3,2,1,3,2,1,2,3,2,2,3,0,2,3,2,2,1,2,2,2,2,
+1,2,2,0,0,0,0,2,0,1,2,0,1,1,1,0,1,0,3,1,1,0,0,0,0,0,0,0,0,0,1,0,
+3,3,2,3,3,2,3,2,2,2,3,2,2,3,2,2,1,2,3,2,2,3,1,3,2,2,2,3,2,2,2,3,
+3,2,1,3,0,1,1,1,0,2,1,1,1,1,1,0,1,0,1,1,0,0,0,0,0,0,0,0,0,2,0,0,
+1,0,0,3,0,3,3,3,3,3,0,0,3,0,2,2,3,3,3,3,3,0,0,0,1,1,3,0,0,0,0,2,
+0,0,1,0,0,0,0,0,0,0,2,3,0,0,0,3,0,2,0,0,0,0,0,3,0,0,0,0,0,0,0,0,
+2,0,3,3,3,3,0,0,2,3,0,0,3,0,3,3,2,3,3,3,3,3,0,0,3,3,3,0,0,0,3,3,
+0,0,3,0,0,0,0,2,0,0,2,1,1,3,0,0,1,0,0,2,3,0,1,0,0,0,0,0,0,0,1,0,
+3,3,3,3,2,3,3,3,3,3,3,3,1,2,1,3,3,2,2,1,2,2,2,3,1,1,2,0,2,1,2,1,
+2,2,1,0,0,0,1,1,0,1,0,1,1,0,0,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,
+3,0,2,1,2,3,3,3,0,2,0,2,2,0,2,1,3,2,2,1,2,1,0,0,2,2,1,0,2,1,2,2,
+0,1,1,0,0,0,0,1,0,1,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,2,1,3,3,1,1,3,0,2,3,1,1,3,2,1,1,2,0,2,2,3,2,1,1,1,1,1,2,
+3,0,0,1,3,1,2,1,2,0,3,0,0,0,1,0,3,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,
+3,3,1,1,3,2,3,3,3,1,3,2,1,3,2,1,3,2,2,2,2,1,3,3,1,2,1,3,1,2,3,0,
+2,1,1,3,2,2,2,1,2,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,
+3,3,2,3,2,3,3,2,3,2,3,2,3,3,2,1,0,3,2,2,2,1,2,2,2,1,2,2,1,2,1,1,
+2,2,2,3,0,1,3,1,1,1,1,0,1,1,0,2,1,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,2,3,2,2,1,1,3,2,3,2,3,2,0,3,2,2,1,2,0,2,2,2,1,2,2,2,2,1,
+3,2,1,2,2,1,0,2,0,1,0,0,1,1,0,0,0,0,0,1,1,0,1,0,0,0,0,0,0,0,0,1,
+3,3,3,3,3,2,3,1,2,3,3,2,2,3,0,1,1,2,0,3,3,2,2,3,0,1,1,3,0,0,0,0,
+3,1,0,3,3,0,2,0,2,1,0,0,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,2,3,2,3,3,0,1,3,1,1,2,1,2,1,1,3,1,1,0,2,3,1,1,1,1,1,1,1,1,
+3,1,1,2,2,2,2,1,1,1,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+3,2,2,1,1,2,1,3,3,2,3,2,2,3,2,2,3,1,2,2,1,2,0,3,2,1,2,2,2,2,2,1,
+3,2,1,2,2,2,1,1,1,1,0,0,1,1,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,3,3,3,3,1,3,3,0,2,1,0,3,2,0,0,3,1,0,1,1,0,1,0,0,0,0,0,1,
+1,0,0,1,0,3,2,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,0,2,2,2,3,0,0,1,3,0,3,2,0,3,2,2,3,3,3,3,3,1,0,2,2,2,0,2,2,1,2,
+0,2,3,0,0,0,0,1,0,1,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
+3,0,2,3,1,3,3,2,3,3,0,3,3,0,3,2,2,3,2,3,3,3,0,0,2,2,3,0,1,1,1,3,
+0,0,3,0,0,0,2,2,0,1,3,0,1,2,2,2,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,
+3,2,3,3,2,0,3,3,2,2,3,1,3,2,1,3,2,0,1,2,2,0,2,3,2,1,0,3,0,0,0,0,
+3,0,0,2,3,1,3,0,0,3,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,1,3,2,2,2,1,2,0,1,3,1,1,3,1,3,0,0,2,1,1,1,1,2,1,1,1,0,2,1,0,1,
+1,2,0,0,0,3,1,1,0,0,0,0,1,0,1,0,0,1,0,1,0,0,0,0,0,3,1,0,0,0,1,0,
+3,3,3,3,2,2,2,2,2,1,3,1,1,1,2,0,1,1,2,1,2,1,3,2,0,0,3,1,1,1,1,1,
+3,1,0,2,3,0,0,0,3,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,2,3,0,3,3,0,2,0,0,0,0,0,0,0,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
+0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,2,3,1,3,0,0,1,2,0,0,2,0,3,3,2,3,3,3,2,3,0,0,2,2,2,0,0,0,2,2,
+0,0,1,0,0,0,0,3,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
+0,0,0,3,0,2,0,0,0,0,0,0,0,0,0,0,1,2,3,1,3,3,0,0,1,0,3,0,0,0,0,0,
+0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,1,2,3,1,2,3,1,0,3,0,2,2,1,0,2,1,1,2,0,1,0,0,1,1,1,1,0,1,0,0,
+1,0,0,0,0,1,1,0,3,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,3,3,2,1,0,1,1,1,3,1,2,2,2,2,2,2,1,1,1,1,0,3,1,0,1,3,1,1,1,1,
+1,1,0,2,0,1,3,1,1,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,2,0,1,
+3,0,2,2,1,3,3,2,3,3,0,1,1,0,2,2,1,2,1,3,3,1,0,0,3,2,0,0,0,0,2,1,
+0,1,0,0,0,0,1,2,0,1,1,3,1,1,2,2,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
+0,0,3,0,0,1,0,0,0,3,0,0,3,0,3,1,0,1,1,1,3,2,0,0,0,3,0,0,0,0,2,0,
+0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,2,0,0,0,0,0,0,0,0,0,
+3,3,1,3,2,1,3,3,1,2,2,0,1,2,1,0,1,2,0,0,0,0,0,3,0,0,0,3,0,0,0,0,
+3,0,0,1,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,0,1,2,0,3,3,3,2,2,0,1,1,0,1,3,0,0,0,2,2,0,0,0,0,3,1,0,1,0,0,0,
+0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,0,2,3,1,2,0,0,2,1,0,3,1,0,1,2,0,1,1,1,1,3,0,0,3,1,1,0,2,2,1,1,
+0,2,0,0,0,0,0,1,0,1,0,0,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,0,0,3,1,2,0,0,2,2,0,1,2,0,1,0,1,3,1,2,1,0,0,0,2,0,3,0,0,0,1,0,
+0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,0,1,1,2,2,0,0,0,2,0,2,1,0,1,1,0,1,1,1,2,1,0,0,1,1,1,0,2,1,1,1,
+0,1,1,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,1,
+0,0,0,2,0,1,3,1,1,1,1,0,0,0,0,3,2,0,1,0,0,0,1,2,0,0,0,1,0,0,0,0,
+0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,3,3,3,3,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,0,2,3,2,2,0,0,0,1,0,0,0,0,2,3,2,1,2,2,3,0,0,0,2,3,1,0,0,0,1,1,
+0,0,1,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,1,1,0,1,0,0,0,0,0,0,0,0,0,
+3,3,2,2,0,1,0,0,0,0,2,0,2,0,1,0,0,0,1,1,0,0,0,2,1,0,1,0,1,1,0,0,
+0,1,0,2,0,0,1,0,3,0,1,0,0,0,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,1,0,0,1,0,0,0,0,0,1,1,2,0,0,0,0,1,0,0,1,3,1,0,0,0,0,1,1,0,0,
+0,1,0,0,0,0,3,0,0,0,0,0,0,3,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,
+3,3,1,1,1,1,2,3,0,0,2,1,1,1,1,1,0,2,1,1,0,0,0,2,1,0,1,2,1,1,0,1,
+2,1,0,3,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,3,1,0,0,0,0,0,0,0,3,0,0,0,3,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,1,
+0,0,0,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,3,2,0,0,0,0,0,0,1,2,1,0,1,1,0,2,0,0,1,0,0,2,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,2,0,0,0,1,3,0,1,0,0,0,2,0,0,0,0,0,0,0,1,2,0,0,0,0,0,
+3,3,0,0,1,1,2,0,0,1,2,1,0,1,1,1,0,1,1,0,0,2,1,1,0,1,0,0,1,1,1,0,
+0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,2,2,1,0,0,0,0,1,0,0,0,0,3,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,
+2,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,3,0,0,1,1,0,0,0,2,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+1,1,0,1,2,0,1,2,0,0,1,1,0,2,0,1,0,0,1,0,0,0,0,1,0,0,0,2,0,0,0,0,
+1,0,0,1,0,1,1,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,1,0,0,0,0,0,0,0,1,1,0,1,1,0,2,1,3,0,0,0,0,1,1,0,0,0,0,0,0,0,3,
+1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,0,1,0,1,0,0,2,0,0,2,0,0,1,1,2,0,0,1,1,0,0,0,1,0,0,0,1,1,0,0,0,
+1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
+1,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,1,1,0,0,0,
+2,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,0,0,0,0,2,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,3,0,0,0,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,1,0,0,0,0,
+1,0,0,0,0,0,0,0,0,1,0,0,0,0,2,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,1,1,0,0,2,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+)
+
+TIS620ThaiModel = {
+  'charToOrderMap': TIS620CharToOrderMap,
+  'precedenceMatrix': ThaiLangModel,
+  'mTypicalPositiveRatio': 0.926386,
+  'keepEnglishLetter': False,
+  'charsetName': "TIS-620"
+}
+
+# flake8: noqa
diff --git a/lib/requests/packages/chardet/latin1prober.py b/lib/requests/packages/chardet/latin1prober.py
new file mode 100644
index 00000000..eef35735
--- /dev/null
+++ b/lib/requests/packages/chardet/latin1prober.py
@@ -0,0 +1,139 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Universal charset detector code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#   Shy Shalom - original C code
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .charsetprober import CharSetProber
+from .constants import eNotMe
+from .compat import wrap_ord
+
+FREQ_CAT_NUM = 4
+
+UDF = 0  # undefined
+OTH = 1  # other
+ASC = 2  # ascii capital letter
+ASS = 3  # ascii small letter
+ACV = 4  # accent capital vowel
+ACO = 5  # accent capital other
+ASV = 6  # accent small vowel
+ASO = 7  # accent small other
+CLASS_NUM = 8  # total classes
+
+Latin1_CharToClass = (
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 00 - 07
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 08 - 0F
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 10 - 17
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 18 - 1F
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 20 - 27
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 28 - 2F
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 30 - 37
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 38 - 3F
+    OTH, ASC, ASC, ASC, ASC, ASC, ASC, ASC,   # 40 - 47
+    ASC, ASC, ASC, ASC, ASC, ASC, ASC, ASC,   # 48 - 4F
+    ASC, ASC, ASC, ASC, ASC, ASC, ASC, ASC,   # 50 - 57
+    ASC, ASC, ASC, OTH, OTH, OTH, OTH, OTH,   # 58 - 5F
+    OTH, ASS, ASS, ASS, ASS, ASS, ASS, ASS,   # 60 - 67
+    ASS, ASS, ASS, ASS, ASS, ASS, ASS, ASS,   # 68 - 6F
+    ASS, ASS, ASS, ASS, ASS, ASS, ASS, ASS,   # 70 - 77
+    ASS, ASS, ASS, OTH, OTH, OTH, OTH, OTH,   # 78 - 7F
+    OTH, UDF, OTH, ASO, OTH, OTH, OTH, OTH,   # 80 - 87
+    OTH, OTH, ACO, OTH, ACO, UDF, ACO, UDF,   # 88 - 8F
+    UDF, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # 90 - 97
+    OTH, OTH, ASO, OTH, ASO, UDF, ASO, ACO,   # 98 - 9F
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # A0 - A7
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # A8 - AF
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # B0 - B7
+    OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH,   # B8 - BF
+    ACV, ACV, ACV, ACV, ACV, ACV, ACO, ACO,   # C0 - C7
+    ACV, ACV, ACV, ACV, ACV, ACV, ACV, ACV,   # C8 - CF
+    ACO, ACO, ACV, ACV, ACV, ACV, ACV, OTH,   # D0 - D7
+    ACV, ACV, ACV, ACV, ACV, ACO, ACO, ACO,   # D8 - DF
+    ASV, ASV, ASV, ASV, ASV, ASV, ASO, ASO,   # E0 - E7
+    ASV, ASV, ASV, ASV, ASV, ASV, ASV, ASV,   # E8 - EF
+    ASO, ASO, ASV, ASV, ASV, ASV, ASV, OTH,   # F0 - F7
+    ASV, ASV, ASV, ASV, ASV, ASO, ASO, ASO,   # F8 - FF
+)
+
+# 0 : illegal
+# 1 : very unlikely
+# 2 : normal
+# 3 : very likely
+Latin1ClassModel = (
+    # UDF OTH ASC ASS ACV ACO ASV ASO
+    0,  0,  0,  0,  0,  0,  0,  0,  # UDF
+    0,  3,  3,  3,  3,  3,  3,  3,  # OTH
+    0,  3,  3,  3,  3,  3,  3,  3,  # ASC
+    0,  3,  3,  3,  1,  1,  3,  3,  # ASS
+    0,  3,  3,  3,  1,  2,  1,  2,  # ACV
+    0,  3,  3,  3,  3,  3,  3,  3,  # ACO
+    0,  3,  1,  3,  1,  1,  1,  3,  # ASV
+    0,  3,  1,  3,  1,  1,  3,  3,  # ASO
+)
+
+
+class Latin1Prober(CharSetProber):
+    def __init__(self):
+        CharSetProber.__init__(self)
+        self.reset()
+
+    def reset(self):
+        self._mLastCharClass = OTH
+        self._mFreqCounter = [0] * FREQ_CAT_NUM
+        CharSetProber.reset(self)
+
+    def get_charset_name(self):
+        return "windows-1252"
+
+    def feed(self, aBuf):
+        aBuf = self.filter_with_english_letters(aBuf)
+        for c in aBuf:
+            charClass = Latin1_CharToClass[wrap_ord(c)]
+            freq = Latin1ClassModel[(self._mLastCharClass * CLASS_NUM)
+                                    + charClass]
+            if freq == 0:
+                self._mState = eNotMe
+                break
+            self._mFreqCounter[freq] += 1
+            self._mLastCharClass = charClass
+
+        return self.get_state()
+
+    def get_confidence(self):
+        if self.get_state() == eNotMe:
+            return 0.01
+
+        total = sum(self._mFreqCounter)
+        if total < 0.01:
+            confidence = 0.0
+        else:
+            confidence = ((self._mFreqCounter[3] - self._mFreqCounter[1] * 20.0)
+                          / total)
+        if confidence < 0.0:
+            confidence = 0.0
+        # lower the confidence of latin1 so that other more accurate
+        # detector can take priority.
+        confidence = confidence * 0.73
+        return confidence
diff --git a/lib/requests/packages/chardet/mbcharsetprober.py b/lib/requests/packages/chardet/mbcharsetprober.py
new file mode 100644
index 00000000..bb42f2fb
--- /dev/null
+++ b/lib/requests/packages/chardet/mbcharsetprober.py
@@ -0,0 +1,86 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Universal charset detector code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#   Shy Shalom - original C code
+#   Proofpoint, Inc.
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+import sys
+from . import constants
+from .charsetprober import CharSetProber
+
+
+class MultiByteCharSetProber(CharSetProber):
+    def __init__(self):
+        CharSetProber.__init__(self)
+        self._mDistributionAnalyzer = None
+        self._mCodingSM = None
+        self._mLastChar = [0, 0]
+
+    def reset(self):
+        CharSetProber.reset(self)
+        if self._mCodingSM:
+            self._mCodingSM.reset()
+        if self._mDistributionAnalyzer:
+            self._mDistributionAnalyzer.reset()
+        self._mLastChar = [0, 0]
+
+    def get_charset_name(self):
+        pass
+
+    def feed(self, aBuf):
+        aLen = len(aBuf)
+        for i in range(0, aLen):
+            codingState = self._mCodingSM.next_state(aBuf[i])
+            if codingState == constants.eError:
+                if constants._debug:
+                    sys.stderr.write(self.get_charset_name()
+                                     + ' prober hit error at byte ' + str(i)
+                                     + '\n')
+                self._mState = constants.eNotMe
+                break
+            elif codingState == constants.eItsMe:
+                self._mState = constants.eFoundIt
+                break
+            elif codingState == constants.eStart:
+                charLen = self._mCodingSM.get_current_charlen()
+                if i == 0:
+                    self._mLastChar[1] = aBuf[0]
+                    self._mDistributionAnalyzer.feed(self._mLastChar, charLen)
+                else:
+                    self._mDistributionAnalyzer.feed(aBuf[i - 1:i + 1],
+                                                     charLen)
+
+        self._mLastChar[0] = aBuf[aLen - 1]
+
+        if self.get_state() == constants.eDetecting:
+            if (self._mDistributionAnalyzer.got_enough_data() and
+                    (self.get_confidence() > constants.SHORTCUT_THRESHOLD)):
+                self._mState = constants.eFoundIt
+
+        return self.get_state()
+
+    def get_confidence(self):
+        return self._mDistributionAnalyzer.get_confidence()
diff --git a/lib/requests/packages/chardet/mbcsgroupprober.py b/lib/requests/packages/chardet/mbcsgroupprober.py
new file mode 100644
index 00000000..03c9dcf3
--- /dev/null
+++ b/lib/requests/packages/chardet/mbcsgroupprober.py
@@ -0,0 +1,54 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Universal charset detector code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#   Shy Shalom - original C code
+#   Proofpoint, Inc.
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .charsetgroupprober import CharSetGroupProber
+from .utf8prober import UTF8Prober
+from .sjisprober import SJISProber
+from .eucjpprober import EUCJPProber
+from .gb2312prober import GB2312Prober
+from .euckrprober import EUCKRProber
+from .cp949prober import CP949Prober
+from .big5prober import Big5Prober
+from .euctwprober import EUCTWProber
+
+
+class MBCSGroupProber(CharSetGroupProber):
+    def __init__(self):
+        CharSetGroupProber.__init__(self)
+        self._mProbers = [
+            UTF8Prober(),
+            SJISProber(),
+            EUCJPProber(),
+            GB2312Prober(),
+            EUCKRProber(),
+            CP949Prober(),
+            Big5Prober(),
+            EUCTWProber()
+        ]
+        self.reset()
diff --git a/lib/requests/packages/chardet/mbcssm.py b/lib/requests/packages/chardet/mbcssm.py
new file mode 100644
index 00000000..efe678ca
--- /dev/null
+++ b/lib/requests/packages/chardet/mbcssm.py
@@ -0,0 +1,572 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .constants import eStart, eError, eItsMe
+
+# BIG5
+
+BIG5_cls = (
+    1,1,1,1,1,1,1,1,  # 00 - 07    #allow 0x00 as legal value
+    1,1,1,1,1,1,0,0,  # 08 - 0f
+    1,1,1,1,1,1,1,1,  # 10 - 17
+    1,1,1,0,1,1,1,1,  # 18 - 1f
+    1,1,1,1,1,1,1,1,  # 20 - 27
+    1,1,1,1,1,1,1,1,  # 28 - 2f
+    1,1,1,1,1,1,1,1,  # 30 - 37
+    1,1,1,1,1,1,1,1,  # 38 - 3f
+    2,2,2,2,2,2,2,2,  # 40 - 47
+    2,2,2,2,2,2,2,2,  # 48 - 4f
+    2,2,2,2,2,2,2,2,  # 50 - 57
+    2,2,2,2,2,2,2,2,  # 58 - 5f
+    2,2,2,2,2,2,2,2,  # 60 - 67
+    2,2,2,2,2,2,2,2,  # 68 - 6f
+    2,2,2,2,2,2,2,2,  # 70 - 77
+    2,2,2,2,2,2,2,1,  # 78 - 7f
+    4,4,4,4,4,4,4,4,  # 80 - 87
+    4,4,4,4,4,4,4,4,  # 88 - 8f
+    4,4,4,4,4,4,4,4,  # 90 - 97
+    4,4,4,4,4,4,4,4,  # 98 - 9f
+    4,3,3,3,3,3,3,3,  # a0 - a7
+    3,3,3,3,3,3,3,3,  # a8 - af
+    3,3,3,3,3,3,3,3,  # b0 - b7
+    3,3,3,3,3,3,3,3,  # b8 - bf
+    3,3,3,3,3,3,3,3,  # c0 - c7
+    3,3,3,3,3,3,3,3,  # c8 - cf
+    3,3,3,3,3,3,3,3,  # d0 - d7
+    3,3,3,3,3,3,3,3,  # d8 - df
+    3,3,3,3,3,3,3,3,  # e0 - e7
+    3,3,3,3,3,3,3,3,  # e8 - ef
+    3,3,3,3,3,3,3,3,  # f0 - f7
+    3,3,3,3,3,3,3,0  # f8 - ff
+)
+
+BIG5_st = (
+    eError,eStart,eStart,     3,eError,eError,eError,eError,#00-07
+    eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,#08-0f
+    eError,eStart,eStart,eStart,eStart,eStart,eStart,eStart#10-17
+)
+
+Big5CharLenTable = (0, 1, 1, 2, 0)
+
+Big5SMModel = {'classTable': BIG5_cls,
+               'classFactor': 5,
+               'stateTable': BIG5_st,
+               'charLenTable': Big5CharLenTable,
+               'name': 'Big5'}
+
+# CP949
+
+CP949_cls  = (
+    1,1,1,1,1,1,1,1, 1,1,1,1,1,1,0,0,  # 00 - 0f
+    1,1,1,1,1,1,1,1, 1,1,1,0,1,1,1,1,  # 10 - 1f
+    1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,  # 20 - 2f
+    1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,  # 30 - 3f
+    1,4,4,4,4,4,4,4, 4,4,4,4,4,4,4,4,  # 40 - 4f
+    4,4,5,5,5,5,5,5, 5,5,5,1,1,1,1,1,  # 50 - 5f
+    1,5,5,5,5,5,5,5, 5,5,5,5,5,5,5,5,  # 60 - 6f
+    5,5,5,5,5,5,5,5, 5,5,5,1,1,1,1,1,  # 70 - 7f
+    0,6,6,6,6,6,6,6, 6,6,6,6,6,6,6,6,  # 80 - 8f
+    6,6,6,6,6,6,6,6, 6,6,6,6,6,6,6,6,  # 90 - 9f
+    6,7,7,7,7,7,7,7, 7,7,7,7,7,8,8,8,  # a0 - af
+    7,7,7,7,7,7,7,7, 7,7,7,7,7,7,7,7,  # b0 - bf
+    7,7,7,7,7,7,9,2, 2,3,2,2,2,2,2,2,  # c0 - cf
+    2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,  # d0 - df
+    2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,  # e0 - ef
+    2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,0,  # f0 - ff
+)
+
+CP949_st = (
+#cls=    0      1      2      3      4      5      6      7      8      9  # previous state =
+    eError,eStart,     3,eError,eStart,eStart,     4,     5,eError,     6, # eStart
+    eError,eError,eError,eError,eError,eError,eError,eError,eError,eError, # eError
+    eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe, # eItsMe
+    eError,eError,eStart,eStart,eError,eError,eError,eStart,eStart,eStart, # 3
+    eError,eError,eStart,eStart,eStart,eStart,eStart,eStart,eStart,eStart, # 4
+    eError,eStart,eStart,eStart,eStart,eStart,eStart,eStart,eStart,eStart, # 5
+    eError,eStart,eStart,eStart,eStart,eError,eError,eStart,eStart,eStart, # 6
+)
+
+CP949CharLenTable = (0, 1, 2, 0, 1, 1, 2, 2, 0, 2)
+
+CP949SMModel = {'classTable': CP949_cls,
+                'classFactor': 10,
+                'stateTable': CP949_st,
+                'charLenTable': CP949CharLenTable,
+                'name': 'CP949'}
+
+# EUC-JP
+
+EUCJP_cls = (
+    4,4,4,4,4,4,4,4,  # 00 - 07
+    4,4,4,4,4,4,5,5,  # 08 - 0f
+    4,4,4,4,4,4,4,4,  # 10 - 17
+    4,4,4,5,4,4,4,4,  # 18 - 1f
+    4,4,4,4,4,4,4,4,  # 20 - 27
+    4,4,4,4,4,4,4,4,  # 28 - 2f
+    4,4,4,4,4,4,4,4,  # 30 - 37
+    4,4,4,4,4,4,4,4,  # 38 - 3f
+    4,4,4,4,4,4,4,4,  # 40 - 47
+    4,4,4,4,4,4,4,4,  # 48 - 4f
+    4,4,4,4,4,4,4,4,  # 50 - 57
+    4,4,4,4,4,4,4,4,  # 58 - 5f
+    4,4,4,4,4,4,4,4,  # 60 - 67
+    4,4,4,4,4,4,4,4,  # 68 - 6f
+    4,4,4,4,4,4,4,4,  # 70 - 77
+    4,4,4,4,4,4,4,4,  # 78 - 7f
+    5,5,5,5,5,5,5,5,  # 80 - 87
+    5,5,5,5,5,5,1,3,  # 88 - 8f
+    5,5,5,5,5,5,5,5,  # 90 - 97
+    5,5,5,5,5,5,5,5,  # 98 - 9f
+    5,2,2,2,2,2,2,2,  # a0 - a7
+    2,2,2,2,2,2,2,2,  # a8 - af
+    2,2,2,2,2,2,2,2,  # b0 - b7
+    2,2,2,2,2,2,2,2,  # b8 - bf
+    2,2,2,2,2,2,2,2,  # c0 - c7
+    2,2,2,2,2,2,2,2,  # c8 - cf
+    2,2,2,2,2,2,2,2,  # d0 - d7
+    2,2,2,2,2,2,2,2,  # d8 - df
+    0,0,0,0,0,0,0,0,  # e0 - e7
+    0,0,0,0,0,0,0,0,  # e8 - ef
+    0,0,0,0,0,0,0,0,  # f0 - f7
+    0,0,0,0,0,0,0,5  # f8 - ff
+)
+
+EUCJP_st = (
+          3,     4,     3,     5,eStart,eError,eError,eError,#00-07
+     eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f
+     eItsMe,eItsMe,eStart,eError,eStart,eError,eError,eError,#10-17
+     eError,eError,eStart,eError,eError,eError,     3,eError,#18-1f
+          3,eError,eError,eError,eStart,eStart,eStart,eStart#20-27
+)
+
+EUCJPCharLenTable = (2, 2, 2, 3, 1, 0)
+
+EUCJPSMModel = {'classTable': EUCJP_cls,
+                'classFactor': 6,
+                'stateTable': EUCJP_st,
+                'charLenTable': EUCJPCharLenTable,
+                'name': 'EUC-JP'}
+
+# EUC-KR
+
+EUCKR_cls  = (
+    1,1,1,1,1,1,1,1,  # 00 - 07
+    1,1,1,1,1,1,0,0,  # 08 - 0f
+    1,1,1,1,1,1,1,1,  # 10 - 17
+    1,1,1,0,1,1,1,1,  # 18 - 1f
+    1,1,1,1,1,1,1,1,  # 20 - 27
+    1,1,1,1,1,1,1,1,  # 28 - 2f
+    1,1,1,1,1,1,1,1,  # 30 - 37
+    1,1,1,1,1,1,1,1,  # 38 - 3f
+    1,1,1,1,1,1,1,1,  # 40 - 47
+    1,1,1,1,1,1,1,1,  # 48 - 4f
+    1,1,1,1,1,1,1,1,  # 50 - 57
+    1,1,1,1,1,1,1,1,  # 58 - 5f
+    1,1,1,1,1,1,1,1,  # 60 - 67
+    1,1,1,1,1,1,1,1,  # 68 - 6f
+    1,1,1,1,1,1,1,1,  # 70 - 77
+    1,1,1,1,1,1,1,1,  # 78 - 7f
+    0,0,0,0,0,0,0,0,  # 80 - 87
+    0,0,0,0,0,0,0,0,  # 88 - 8f
+    0,0,0,0,0,0,0,0,  # 90 - 97
+    0,0,0,0,0,0,0,0,  # 98 - 9f
+    0,2,2,2,2,2,2,2,  # a0 - a7
+    2,2,2,2,2,3,3,3,  # a8 - af
+    2,2,2,2,2,2,2,2,  # b0 - b7
+    2,2,2,2,2,2,2,2,  # b8 - bf
+    2,2,2,2,2,2,2,2,  # c0 - c7
+    2,3,2,2,2,2,2,2,  # c8 - cf
+    2,2,2,2,2,2,2,2,  # d0 - d7
+    2,2,2,2,2,2,2,2,  # d8 - df
+    2,2,2,2,2,2,2,2,  # e0 - e7
+    2,2,2,2,2,2,2,2,  # e8 - ef
+    2,2,2,2,2,2,2,2,  # f0 - f7
+    2,2,2,2,2,2,2,0   # f8 - ff
+)
+
+EUCKR_st = (
+    eError,eStart,     3,eError,eError,eError,eError,eError,#00-07
+    eItsMe,eItsMe,eItsMe,eItsMe,eError,eError,eStart,eStart #08-0f
+)
+
+EUCKRCharLenTable = (0, 1, 2, 0)
+
+EUCKRSMModel = {'classTable': EUCKR_cls,
+                'classFactor': 4,
+                'stateTable': EUCKR_st,
+                'charLenTable': EUCKRCharLenTable,
+                'name': 'EUC-KR'}
+
+# EUC-TW
+
+EUCTW_cls = (
+    2,2,2,2,2,2,2,2,  # 00 - 07
+    2,2,2,2,2,2,0,0,  # 08 - 0f
+    2,2,2,2,2,2,2,2,  # 10 - 17
+    2,2,2,0,2,2,2,2,  # 18 - 1f
+    2,2,2,2,2,2,2,2,  # 20 - 27
+    2,2,2,2,2,2,2,2,  # 28 - 2f
+    2,2,2,2,2,2,2,2,  # 30 - 37
+    2,2,2,2,2,2,2,2,  # 38 - 3f
+    2,2,2,2,2,2,2,2,  # 40 - 47
+    2,2,2,2,2,2,2,2,  # 48 - 4f
+    2,2,2,2,2,2,2,2,  # 50 - 57
+    2,2,2,2,2,2,2,2,  # 58 - 5f
+    2,2,2,2,2,2,2,2,  # 60 - 67
+    2,2,2,2,2,2,2,2,  # 68 - 6f
+    2,2,2,2,2,2,2,2,  # 70 - 77
+    2,2,2,2,2,2,2,2,  # 78 - 7f
+    0,0,0,0,0,0,0,0,  # 80 - 87
+    0,0,0,0,0,0,6,0,  # 88 - 8f
+    0,0,0,0,0,0,0,0,  # 90 - 97
+    0,0,0,0,0,0,0,0,  # 98 - 9f
+    0,3,4,4,4,4,4,4,  # a0 - a7
+    5,5,1,1,1,1,1,1,  # a8 - af
+    1,1,1,1,1,1,1,1,  # b0 - b7
+    1,1,1,1,1,1,1,1,  # b8 - bf
+    1,1,3,1,3,3,3,3,  # c0 - c7
+    3,3,3,3,3,3,3,3,  # c8 - cf
+    3,3,3,3,3,3,3,3,  # d0 - d7
+    3,3,3,3,3,3,3,3,  # d8 - df
+    3,3,3,3,3,3,3,3,  # e0 - e7
+    3,3,3,3,3,3,3,3,  # e8 - ef
+    3,3,3,3,3,3,3,3,  # f0 - f7
+    3,3,3,3,3,3,3,0   # f8 - ff
+)
+
+EUCTW_st = (
+    eError,eError,eStart,     3,     3,     3,     4,eError,#00-07
+    eError,eError,eError,eError,eError,eError,eItsMe,eItsMe,#08-0f
+    eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,eStart,eError,#10-17
+    eStart,eStart,eStart,eError,eError,eError,eError,eError,#18-1f
+         5,eError,eError,eError,eStart,eError,eStart,eStart,#20-27
+    eStart,eError,eStart,eStart,eStart,eStart,eStart,eStart #28-2f
+)
+
+EUCTWCharLenTable = (0, 0, 1, 2, 2, 2, 3)
+
+EUCTWSMModel = {'classTable': EUCTW_cls,
+                'classFactor': 7,
+                'stateTable': EUCTW_st,
+                'charLenTable': EUCTWCharLenTable,
+                'name': 'x-euc-tw'}
+
+# GB2312
+
+GB2312_cls = (
+    1,1,1,1,1,1,1,1,  # 00 - 07
+    1,1,1,1,1,1,0,0,  # 08 - 0f
+    1,1,1,1,1,1,1,1,  # 10 - 17
+    1,1,1,0,1,1,1,1,  # 18 - 1f
+    1,1,1,1,1,1,1,1,  # 20 - 27
+    1,1,1,1,1,1,1,1,  # 28 - 2f
+    3,3,3,3,3,3,3,3,  # 30 - 37
+    3,3,1,1,1,1,1,1,  # 38 - 3f
+    2,2,2,2,2,2,2,2,  # 40 - 47
+    2,2,2,2,2,2,2,2,  # 48 - 4f
+    2,2,2,2,2,2,2,2,  # 50 - 57
+    2,2,2,2,2,2,2,2,  # 58 - 5f
+    2,2,2,2,2,2,2,2,  # 60 - 67
+    2,2,2,2,2,2,2,2,  # 68 - 6f
+    2,2,2,2,2,2,2,2,  # 70 - 77
+    2,2,2,2,2,2,2,4,  # 78 - 7f
+    5,6,6,6,6,6,6,6,  # 80 - 87
+    6,6,6,6,6,6,6,6,  # 88 - 8f
+    6,6,6,6,6,6,6,6,  # 90 - 97
+    6,6,6,6,6,6,6,6,  # 98 - 9f
+    6,6,6,6,6,6,6,6,  # a0 - a7
+    6,6,6,6,6,6,6,6,  # a8 - af
+    6,6,6,6,6,6,6,6,  # b0 - b7
+    6,6,6,6,6,6,6,6,  # b8 - bf
+    6,6,6,6,6,6,6,6,  # c0 - c7
+    6,6,6,6,6,6,6,6,  # c8 - cf
+    6,6,6,6,6,6,6,6,  # d0 - d7
+    6,6,6,6,6,6,6,6,  # d8 - df
+    6,6,6,6,6,6,6,6,  # e0 - e7
+    6,6,6,6,6,6,6,6,  # e8 - ef
+    6,6,6,6,6,6,6,6,  # f0 - f7
+    6,6,6,6,6,6,6,0   # f8 - ff
+)
+
+GB2312_st = (
+    eError,eStart,eStart,eStart,eStart,eStart,     3,eError,#00-07
+    eError,eError,eError,eError,eError,eError,eItsMe,eItsMe,#08-0f
+    eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,eError,eStart,#10-17
+         4,eError,eStart,eStart,eError,eError,eError,eError,#18-1f
+    eError,eError,     5,eError,eError,eError,eItsMe,eError,#20-27
+    eError,eError,eStart,eStart,eStart,eStart,eStart,eStart #28-2f
+)
+
+# To be accurate, the length of class 6 can be either 2 or 4.
+# But it is not necessary to discriminate between the two since
+# it is used for frequency analysis only, and we are validing
+# each code range there as well. So it is safe to set it to be
+# 2 here.
+GB2312CharLenTable = (0, 1, 1, 1, 1, 1, 2)
+
+GB2312SMModel = {'classTable': GB2312_cls,
+                  'classFactor': 7,
+                  'stateTable': GB2312_st,
+                  'charLenTable': GB2312CharLenTable,
+                  'name': 'GB2312'}
+
+# Shift_JIS
+
+SJIS_cls = (
+    1,1,1,1,1,1,1,1,  # 00 - 07
+    1,1,1,1,1,1,0,0,  # 08 - 0f
+    1,1,1,1,1,1,1,1,  # 10 - 17
+    1,1,1,0,1,1,1,1,  # 18 - 1f
+    1,1,1,1,1,1,1,1,  # 20 - 27
+    1,1,1,1,1,1,1,1,  # 28 - 2f
+    1,1,1,1,1,1,1,1,  # 30 - 37
+    1,1,1,1,1,1,1,1,  # 38 - 3f
+    2,2,2,2,2,2,2,2,  # 40 - 47
+    2,2,2,2,2,2,2,2,  # 48 - 4f
+    2,2,2,2,2,2,2,2,  # 50 - 57
+    2,2,2,2,2,2,2,2,  # 58 - 5f
+    2,2,2,2,2,2,2,2,  # 60 - 67
+    2,2,2,2,2,2,2,2,  # 68 - 6f
+    2,2,2,2,2,2,2,2,  # 70 - 77
+    2,2,2,2,2,2,2,1,  # 78 - 7f
+    3,3,3,3,3,2,2,3,  # 80 - 87
+    3,3,3,3,3,3,3,3,  # 88 - 8f
+    3,3,3,3,3,3,3,3,  # 90 - 97
+    3,3,3,3,3,3,3,3,  # 98 - 9f
+    #0xa0 is illegal in sjis encoding, but some pages does
+    #contain such byte. We need to be more error forgiven.
+    2,2,2,2,2,2,2,2,  # a0 - a7
+    2,2,2,2,2,2,2,2,  # a8 - af
+    2,2,2,2,2,2,2,2,  # b0 - b7
+    2,2,2,2,2,2,2,2,  # b8 - bf
+    2,2,2,2,2,2,2,2,  # c0 - c7
+    2,2,2,2,2,2,2,2,  # c8 - cf
+    2,2,2,2,2,2,2,2,  # d0 - d7
+    2,2,2,2,2,2,2,2,  # d8 - df
+    3,3,3,3,3,3,3,3,  # e0 - e7
+    3,3,3,3,3,4,4,4,  # e8 - ef
+    3,3,3,3,3,3,3,3,  # f0 - f7
+    3,3,3,3,3,0,0,0)  # f8 - ff
+
+
+SJIS_st = (
+    eError,eStart,eStart,     3,eError,eError,eError,eError,#00-07
+    eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f
+    eItsMe,eItsMe,eError,eError,eStart,eStart,eStart,eStart #10-17
+)
+
+SJISCharLenTable = (0, 1, 1, 2, 0, 0)
+
+SJISSMModel = {'classTable': SJIS_cls,
+               'classFactor': 6,
+               'stateTable': SJIS_st,
+               'charLenTable': SJISCharLenTable,
+               'name': 'Shift_JIS'}
+
+# UCS2-BE
+
+UCS2BE_cls = (
+    0,0,0,0,0,0,0,0,  # 00 - 07
+    0,0,1,0,0,2,0,0,  # 08 - 0f
+    0,0,0,0,0,0,0,0,  # 10 - 17
+    0,0,0,3,0,0,0,0,  # 18 - 1f
+    0,0,0,0,0,0,0,0,  # 20 - 27
+    0,3,3,3,3,3,0,0,  # 28 - 2f
+    0,0,0,0,0,0,0,0,  # 30 - 37
+    0,0,0,0,0,0,0,0,  # 38 - 3f
+    0,0,0,0,0,0,0,0,  # 40 - 47
+    0,0,0,0,0,0,0,0,  # 48 - 4f
+    0,0,0,0,0,0,0,0,  # 50 - 57
+    0,0,0,0,0,0,0,0,  # 58 - 5f
+    0,0,0,0,0,0,0,0,  # 60 - 67
+    0,0,0,0,0,0,0,0,  # 68 - 6f
+    0,0,0,0,0,0,0,0,  # 70 - 77
+    0,0,0,0,0,0,0,0,  # 78 - 7f
+    0,0,0,0,0,0,0,0,  # 80 - 87
+    0,0,0,0,0,0,0,0,  # 88 - 8f
+    0,0,0,0,0,0,0,0,  # 90 - 97
+    0,0,0,0,0,0,0,0,  # 98 - 9f
+    0,0,0,0,0,0,0,0,  # a0 - a7
+    0,0,0,0,0,0,0,0,  # a8 - af
+    0,0,0,0,0,0,0,0,  # b0 - b7
+    0,0,0,0,0,0,0,0,  # b8 - bf
+    0,0,0,0,0,0,0,0,  # c0 - c7
+    0,0,0,0,0,0,0,0,  # c8 - cf
+    0,0,0,0,0,0,0,0,  # d0 - d7
+    0,0,0,0,0,0,0,0,  # d8 - df
+    0,0,0,0,0,0,0,0,  # e0 - e7
+    0,0,0,0,0,0,0,0,  # e8 - ef
+    0,0,0,0,0,0,0,0,  # f0 - f7
+    0,0,0,0,0,0,4,5   # f8 - ff
+)
+
+UCS2BE_st  = (
+          5,     7,     7,eError,     4,     3,eError,eError,#00-07
+     eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f
+     eItsMe,eItsMe,     6,     6,     6,     6,eError,eError,#10-17
+          6,     6,     6,     6,     6,eItsMe,     6,     6,#18-1f
+          6,     6,     6,     6,     5,     7,     7,eError,#20-27
+          5,     8,     6,     6,eError,     6,     6,     6,#28-2f
+          6,     6,     6,     6,eError,eError,eStart,eStart #30-37
+)
+
+UCS2BECharLenTable = (2, 2, 2, 0, 2, 2)
+
+UCS2BESMModel = {'classTable': UCS2BE_cls,
+                 'classFactor': 6,
+                 'stateTable': UCS2BE_st,
+                 'charLenTable': UCS2BECharLenTable,
+                 'name': 'UTF-16BE'}
+
+# UCS2-LE
+
+UCS2LE_cls = (
+    0,0,0,0,0,0,0,0,  # 00 - 07
+    0,0,1,0,0,2,0,0,  # 08 - 0f
+    0,0,0,0,0,0,0,0,  # 10 - 17
+    0,0,0,3,0,0,0,0,  # 18 - 1f
+    0,0,0,0,0,0,0,0,  # 20 - 27
+    0,3,3,3,3,3,0,0,  # 28 - 2f
+    0,0,0,0,0,0,0,0,  # 30 - 37
+    0,0,0,0,0,0,0,0,  # 38 - 3f
+    0,0,0,0,0,0,0,0,  # 40 - 47
+    0,0,0,0,0,0,0,0,  # 48 - 4f
+    0,0,0,0,0,0,0,0,  # 50 - 57
+    0,0,0,0,0,0,0,0,  # 58 - 5f
+    0,0,0,0,0,0,0,0,  # 60 - 67
+    0,0,0,0,0,0,0,0,  # 68 - 6f
+    0,0,0,0,0,0,0,0,  # 70 - 77
+    0,0,0,0,0,0,0,0,  # 78 - 7f
+    0,0,0,0,0,0,0,0,  # 80 - 87
+    0,0,0,0,0,0,0,0,  # 88 - 8f
+    0,0,0,0,0,0,0,0,  # 90 - 97
+    0,0,0,0,0,0,0,0,  # 98 - 9f
+    0,0,0,0,0,0,0,0,  # a0 - a7
+    0,0,0,0,0,0,0,0,  # a8 - af
+    0,0,0,0,0,0,0,0,  # b0 - b7
+    0,0,0,0,0,0,0,0,  # b8 - bf
+    0,0,0,0,0,0,0,0,  # c0 - c7
+    0,0,0,0,0,0,0,0,  # c8 - cf
+    0,0,0,0,0,0,0,0,  # d0 - d7
+    0,0,0,0,0,0,0,0,  # d8 - df
+    0,0,0,0,0,0,0,0,  # e0 - e7
+    0,0,0,0,0,0,0,0,  # e8 - ef
+    0,0,0,0,0,0,0,0,  # f0 - f7
+    0,0,0,0,0,0,4,5   # f8 - ff
+)
+
+UCS2LE_st = (
+          6,     6,     7,     6,     4,     3,eError,eError,#00-07
+     eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f
+     eItsMe,eItsMe,     5,     5,     5,eError,eItsMe,eError,#10-17
+          5,     5,     5,eError,     5,eError,     6,     6,#18-1f
+          7,     6,     8,     8,     5,     5,     5,eError,#20-27
+          5,     5,     5,eError,eError,eError,     5,     5,#28-2f
+          5,     5,     5,eError,     5,eError,eStart,eStart #30-37
+)
+
+UCS2LECharLenTable = (2, 2, 2, 2, 2, 2)
+
+UCS2LESMModel = {'classTable': UCS2LE_cls,
+                 'classFactor': 6,
+                 'stateTable': UCS2LE_st,
+                 'charLenTable': UCS2LECharLenTable,
+                 'name': 'UTF-16LE'}
+
+# UTF-8
+
+UTF8_cls = (
+    1,1,1,1,1,1,1,1,  # 00 - 07  #allow 0x00 as a legal value
+    1,1,1,1,1,1,0,0,  # 08 - 0f
+    1,1,1,1,1,1,1,1,  # 10 - 17
+    1,1,1,0,1,1,1,1,  # 18 - 1f
+    1,1,1,1,1,1,1,1,  # 20 - 27
+    1,1,1,1,1,1,1,1,  # 28 - 2f
+    1,1,1,1,1,1,1,1,  # 30 - 37
+    1,1,1,1,1,1,1,1,  # 38 - 3f
+    1,1,1,1,1,1,1,1,  # 40 - 47
+    1,1,1,1,1,1,1,1,  # 48 - 4f
+    1,1,1,1,1,1,1,1,  # 50 - 57
+    1,1,1,1,1,1,1,1,  # 58 - 5f
+    1,1,1,1,1,1,1,1,  # 60 - 67
+    1,1,1,1,1,1,1,1,  # 68 - 6f
+    1,1,1,1,1,1,1,1,  # 70 - 77
+    1,1,1,1,1,1,1,1,  # 78 - 7f
+    2,2,2,2,3,3,3,3,  # 80 - 87
+    4,4,4,4,4,4,4,4,  # 88 - 8f
+    4,4,4,4,4,4,4,4,  # 90 - 97
+    4,4,4,4,4,4,4,4,  # 98 - 9f
+    5,5,5,5,5,5,5,5,  # a0 - a7
+    5,5,5,5,5,5,5,5,  # a8 - af
+    5,5,5,5,5,5,5,5,  # b0 - b7
+    5,5,5,5,5,5,5,5,  # b8 - bf
+    0,0,6,6,6,6,6,6,  # c0 - c7
+    6,6,6,6,6,6,6,6,  # c8 - cf
+    6,6,6,6,6,6,6,6,  # d0 - d7
+    6,6,6,6,6,6,6,6,  # d8 - df
+    7,8,8,8,8,8,8,8,  # e0 - e7
+    8,8,8,8,8,9,8,8,  # e8 - ef
+    10,11,11,11,11,11,11,11,  # f0 - f7
+    12,13,13,13,14,15,0,0    # f8 - ff
+)
+
+UTF8_st = (
+    eError,eStart,eError,eError,eError,eError,     12,   10,#00-07
+         9,     11,     8,     7,     6,     5,     4,    3,#08-0f
+    eError,eError,eError,eError,eError,eError,eError,eError,#10-17
+    eError,eError,eError,eError,eError,eError,eError,eError,#18-1f
+    eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,#20-27
+    eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,#28-2f
+    eError,eError,     5,     5,     5,     5,eError,eError,#30-37
+    eError,eError,eError,eError,eError,eError,eError,eError,#38-3f
+    eError,eError,eError,     5,     5,     5,eError,eError,#40-47
+    eError,eError,eError,eError,eError,eError,eError,eError,#48-4f
+    eError,eError,     7,     7,     7,     7,eError,eError,#50-57
+    eError,eError,eError,eError,eError,eError,eError,eError,#58-5f
+    eError,eError,eError,eError,     7,     7,eError,eError,#60-67
+    eError,eError,eError,eError,eError,eError,eError,eError,#68-6f
+    eError,eError,     9,     9,     9,     9,eError,eError,#70-77
+    eError,eError,eError,eError,eError,eError,eError,eError,#78-7f
+    eError,eError,eError,eError,eError,     9,eError,eError,#80-87
+    eError,eError,eError,eError,eError,eError,eError,eError,#88-8f
+    eError,eError,    12,    12,    12,    12,eError,eError,#90-97
+    eError,eError,eError,eError,eError,eError,eError,eError,#98-9f
+    eError,eError,eError,eError,eError,    12,eError,eError,#a0-a7
+    eError,eError,eError,eError,eError,eError,eError,eError,#a8-af
+    eError,eError,    12,    12,    12,eError,eError,eError,#b0-b7
+    eError,eError,eError,eError,eError,eError,eError,eError,#b8-bf
+    eError,eError,eStart,eStart,eStart,eStart,eError,eError,#c0-c7
+    eError,eError,eError,eError,eError,eError,eError,eError #c8-cf
+)
+
+UTF8CharLenTable = (0, 1, 0, 0, 0, 0, 2, 3, 3, 3, 4, 4, 5, 5, 6, 6)
+
+UTF8SMModel = {'classTable': UTF8_cls,
+               'classFactor': 16,
+               'stateTable': UTF8_st,
+               'charLenTable': UTF8CharLenTable,
+               'name': 'UTF-8'}
diff --git a/lib/requests/packages/chardet/sbcharsetprober.py b/lib/requests/packages/chardet/sbcharsetprober.py
new file mode 100644
index 00000000..37291bd2
--- /dev/null
+++ b/lib/requests/packages/chardet/sbcharsetprober.py
@@ -0,0 +1,120 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Universal charset detector code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#   Shy Shalom - original C code
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+import sys
+from . import constants
+from .charsetprober import CharSetProber
+from .compat import wrap_ord
+
+SAMPLE_SIZE = 64
+SB_ENOUGH_REL_THRESHOLD = 1024
+POSITIVE_SHORTCUT_THRESHOLD = 0.95
+NEGATIVE_SHORTCUT_THRESHOLD = 0.05
+SYMBOL_CAT_ORDER = 250
+NUMBER_OF_SEQ_CAT = 4
+POSITIVE_CAT = NUMBER_OF_SEQ_CAT - 1
+#NEGATIVE_CAT = 0
+
+
+class SingleByteCharSetProber(CharSetProber):
+    def __init__(self, model, reversed=False, nameProber=None):
+        CharSetProber.__init__(self)
+        self._mModel = model
+        # TRUE if we need to reverse every pair in the model lookup
+        self._mReversed = reversed
+        # Optional auxiliary prober for name decision
+        self._mNameProber = nameProber
+        self.reset()
+
+    def reset(self):
+        CharSetProber.reset(self)
+        # char order of last character
+        self._mLastOrder = 255
+        self._mSeqCounters = [0] * NUMBER_OF_SEQ_CAT
+        self._mTotalSeqs = 0
+        self._mTotalChar = 0
+        # characters that fall in our sampling range
+        self._mFreqChar = 0
+
+    def get_charset_name(self):
+        if self._mNameProber:
+            return self._mNameProber.get_charset_name()
+        else:
+            return self._mModel['charsetName']
+
+    def feed(self, aBuf):
+        if not self._mModel['keepEnglishLetter']:
+            aBuf = self.filter_without_english_letters(aBuf)
+        aLen = len(aBuf)
+        if not aLen:
+            return self.get_state()
+        for c in aBuf:
+            order = self._mModel['charToOrderMap'][wrap_ord(c)]
+            if order < SYMBOL_CAT_ORDER:
+                self._mTotalChar += 1
+            if order < SAMPLE_SIZE:
+                self._mFreqChar += 1
+                if self._mLastOrder < SAMPLE_SIZE:
+                    self._mTotalSeqs += 1
+                    if not self._mReversed:
+                        i = (self._mLastOrder * SAMPLE_SIZE) + order
+                        model = self._mModel['precedenceMatrix'][i]
+                    else:  # reverse the order of the letters in the lookup
+                        i = (order * SAMPLE_SIZE) + self._mLastOrder
+                        model = self._mModel['precedenceMatrix'][i]
+                    self._mSeqCounters[model] += 1
+            self._mLastOrder = order
+
+        if self.get_state() == constants.eDetecting:
+            if self._mTotalSeqs > SB_ENOUGH_REL_THRESHOLD:
+                cf = self.get_confidence()
+                if cf > POSITIVE_SHORTCUT_THRESHOLD:
+                    if constants._debug:
+                        sys.stderr.write('%s confidence = %s, we have a'
+                                         'winner\n' %
+                                         (self._mModel['charsetName'], cf))
+                    self._mState = constants.eFoundIt
+                elif cf < NEGATIVE_SHORTCUT_THRESHOLD:
+                    if constants._debug:
+                        sys.stderr.write('%s confidence = %s, below negative'
+                                         'shortcut threshhold %s\n' %
+                                         (self._mModel['charsetName'], cf,
+                                          NEGATIVE_SHORTCUT_THRESHOLD))
+                    self._mState = constants.eNotMe
+
+        return self.get_state()
+
+    def get_confidence(self):
+        r = 0.01
+        if self._mTotalSeqs > 0:
+            r = ((1.0 * self._mSeqCounters[POSITIVE_CAT]) / self._mTotalSeqs
+                 / self._mModel['mTypicalPositiveRatio'])
+            r = r * self._mFreqChar / self._mTotalChar
+            if r >= 1.0:
+                r = 0.99
+        return r
diff --git a/lib/requests/packages/chardet/sbcsgroupprober.py b/lib/requests/packages/chardet/sbcsgroupprober.py
new file mode 100644
index 00000000..1b6196cd
--- /dev/null
+++ b/lib/requests/packages/chardet/sbcsgroupprober.py
@@ -0,0 +1,69 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Universal charset detector code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#   Shy Shalom - original C code
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from .charsetgroupprober import CharSetGroupProber
+from .sbcharsetprober import SingleByteCharSetProber
+from .langcyrillicmodel import (Win1251CyrillicModel, Koi8rModel,
+                                Latin5CyrillicModel, MacCyrillicModel,
+                                Ibm866Model, Ibm855Model)
+from .langgreekmodel import Latin7GreekModel, Win1253GreekModel
+from .langbulgarianmodel import Latin5BulgarianModel, Win1251BulgarianModel
+from .langhungarianmodel import Latin2HungarianModel, Win1250HungarianModel
+from .langthaimodel import TIS620ThaiModel
+from .langhebrewmodel import Win1255HebrewModel
+from .hebrewprober import HebrewProber
+
+
+class SBCSGroupProber(CharSetGroupProber):
+    def __init__(self):
+        CharSetGroupProber.__init__(self)
+        self._mProbers = [
+            SingleByteCharSetProber(Win1251CyrillicModel),
+            SingleByteCharSetProber(Koi8rModel),
+            SingleByteCharSetProber(Latin5CyrillicModel),
+            SingleByteCharSetProber(MacCyrillicModel),
+            SingleByteCharSetProber(Ibm866Model),
+            SingleByteCharSetProber(Ibm855Model),
+            SingleByteCharSetProber(Latin7GreekModel),
+            SingleByteCharSetProber(Win1253GreekModel),
+            SingleByteCharSetProber(Latin5BulgarianModel),
+            SingleByteCharSetProber(Win1251BulgarianModel),
+            SingleByteCharSetProber(Latin2HungarianModel),
+            SingleByteCharSetProber(Win1250HungarianModel),
+            SingleByteCharSetProber(TIS620ThaiModel),
+        ]
+        hebrewProber = HebrewProber()
+        logicalHebrewProber = SingleByteCharSetProber(Win1255HebrewModel,
+                                                      False, hebrewProber)
+        visualHebrewProber = SingleByteCharSetProber(Win1255HebrewModel, True,
+                                                     hebrewProber)
+        hebrewProber.set_model_probers(logicalHebrewProber, visualHebrewProber)
+        self._mProbers.extend([hebrewProber, logicalHebrewProber,
+                               visualHebrewProber])
+
+        self.reset()
diff --git a/lib/requests/packages/chardet/sjisprober.py b/lib/requests/packages/chardet/sjisprober.py
new file mode 100644
index 00000000..cd0e9e70
--- /dev/null
+++ b/lib/requests/packages/chardet/sjisprober.py
@@ -0,0 +1,91 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+import sys
+from .mbcharsetprober import MultiByteCharSetProber
+from .codingstatemachine import CodingStateMachine
+from .chardistribution import SJISDistributionAnalysis
+from .jpcntx import SJISContextAnalysis
+from .mbcssm import SJISSMModel
+from . import constants
+
+
+class SJISProber(MultiByteCharSetProber):
+    def __init__(self):
+        MultiByteCharSetProber.__init__(self)
+        self._mCodingSM = CodingStateMachine(SJISSMModel)
+        self._mDistributionAnalyzer = SJISDistributionAnalysis()
+        self._mContextAnalyzer = SJISContextAnalysis()
+        self.reset()
+
+    def reset(self):
+        MultiByteCharSetProber.reset(self)
+        self._mContextAnalyzer.reset()
+
+    def get_charset_name(self):
+        return self._mContextAnalyzer.get_charset_name()
+
+    def feed(self, aBuf):
+        aLen = len(aBuf)
+        for i in range(0, aLen):
+            codingState = self._mCodingSM.next_state(aBuf[i])
+            if codingState == constants.eError:
+                if constants._debug:
+                    sys.stderr.write(self.get_charset_name()
+                                     + ' prober hit error at byte ' + str(i)
+                                     + '\n')
+                self._mState = constants.eNotMe
+                break
+            elif codingState == constants.eItsMe:
+                self._mState = constants.eFoundIt
+                break
+            elif codingState == constants.eStart:
+                charLen = self._mCodingSM.get_current_charlen()
+                if i == 0:
+                    self._mLastChar[1] = aBuf[0]
+                    self._mContextAnalyzer.feed(self._mLastChar[2 - charLen:],
+                                                charLen)
+                    self._mDistributionAnalyzer.feed(self._mLastChar, charLen)
+                else:
+                    self._mContextAnalyzer.feed(aBuf[i + 1 - charLen:i + 3
+                                                     - charLen], charLen)
+                    self._mDistributionAnalyzer.feed(aBuf[i - 1:i + 1],
+                                                     charLen)
+
+        self._mLastChar[0] = aBuf[aLen - 1]
+
+        if self.get_state() == constants.eDetecting:
+            if (self._mContextAnalyzer.got_enough_data() and
+               (self.get_confidence() > constants.SHORTCUT_THRESHOLD)):
+                self._mState = constants.eFoundIt
+
+        return self.get_state()
+
+    def get_confidence(self):
+        contxtCf = self._mContextAnalyzer.get_confidence()
+        distribCf = self._mDistributionAnalyzer.get_confidence()
+        return max(contxtCf, distribCf)
diff --git a/lib/requests/packages/chardet/universaldetector.py b/lib/requests/packages/chardet/universaldetector.py
new file mode 100644
index 00000000..476522b9
--- /dev/null
+++ b/lib/requests/packages/chardet/universaldetector.py
@@ -0,0 +1,170 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is Mozilla Universal charset detector code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#   Shy Shalom - original C code
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from . import constants
+import sys
+import codecs
+from .latin1prober import Latin1Prober  # windows-1252
+from .mbcsgroupprober import MBCSGroupProber  # multi-byte character sets
+from .sbcsgroupprober import SBCSGroupProber  # single-byte character sets
+from .escprober import EscCharSetProber  # ISO-2122, etc.
+import re
+
+MINIMUM_THRESHOLD = 0.20
+ePureAscii = 0
+eEscAscii = 1
+eHighbyte = 2
+
+
+class UniversalDetector:
+    def __init__(self):
+        self._highBitDetector = re.compile(b'[\x80-\xFF]')
+        self._escDetector = re.compile(b'(\033|~{)')
+        self._mEscCharSetProber = None
+        self._mCharSetProbers = []
+        self.reset()
+
+    def reset(self):
+        self.result = {'encoding': None, 'confidence': 0.0}
+        self.done = False
+        self._mStart = True
+        self._mGotData = False
+        self._mInputState = ePureAscii
+        self._mLastChar = b''
+        if self._mEscCharSetProber:
+            self._mEscCharSetProber.reset()
+        for prober in self._mCharSetProbers:
+            prober.reset()
+
+    def feed(self, aBuf):
+        if self.done:
+            return
+
+        aLen = len(aBuf)
+        if not aLen:
+            return
+
+        if not self._mGotData:
+            # If the data starts with BOM, we know it is UTF
+            if aBuf[:3] == codecs.BOM_UTF8:
+                # EF BB BF  UTF-8 with BOM
+                self.result = {'encoding': "UTF-8-SIG", 'confidence': 1.0}
+            elif aBuf[:4] == codecs.BOM_UTF32_LE:
+                # FF FE 00 00  UTF-32, little-endian BOM
+                self.result = {'encoding': "UTF-32LE", 'confidence': 1.0}
+            elif aBuf[:4] == codecs.BOM_UTF32_BE:
+                # 00 00 FE FF  UTF-32, big-endian BOM
+                self.result = {'encoding': "UTF-32BE", 'confidence': 1.0}
+            elif aBuf[:4] == b'\xFE\xFF\x00\x00':
+                # FE FF 00 00  UCS-4, unusual octet order BOM (3412)
+                self.result = {
+                    'encoding': "X-ISO-10646-UCS-4-3412",
+                    'confidence': 1.0
+                }
+            elif aBuf[:4] == b'\x00\x00\xFF\xFE':
+                # 00 00 FF FE  UCS-4, unusual octet order BOM (2143)
+                self.result = {
+                    'encoding': "X-ISO-10646-UCS-4-2143",
+                    'confidence': 1.0
+                }
+            elif aBuf[:2] == codecs.BOM_LE:
+                # FF FE  UTF-16, little endian BOM
+                self.result = {'encoding': "UTF-16LE", 'confidence': 1.0}
+            elif aBuf[:2] == codecs.BOM_BE:
+                # FE FF  UTF-16, big endian BOM
+                self.result = {'encoding': "UTF-16BE", 'confidence': 1.0}
+
+        self._mGotData = True
+        if self.result['encoding'] and (self.result['confidence'] > 0.0):
+            self.done = True
+            return
+
+        if self._mInputState == ePureAscii:
+            if self._highBitDetector.search(aBuf):
+                self._mInputState = eHighbyte
+            elif ((self._mInputState == ePureAscii) and
+                    self._escDetector.search(self._mLastChar + aBuf)):
+                self._mInputState = eEscAscii
+
+        self._mLastChar = aBuf[-1:]
+
+        if self._mInputState == eEscAscii:
+            if not self._mEscCharSetProber:
+                self._mEscCharSetProber = EscCharSetProber()
+            if self._mEscCharSetProber.feed(aBuf) == constants.eFoundIt:
+                self.result = {'encoding': self._mEscCharSetProber.get_charset_name(),
+                               'confidence': self._mEscCharSetProber.get_confidence()}
+                self.done = True
+        elif self._mInputState == eHighbyte:
+            if not self._mCharSetProbers:
+                self._mCharSetProbers = [MBCSGroupProber(), SBCSGroupProber(),
+                                         Latin1Prober()]
+            for prober in self._mCharSetProbers:
+                if prober.feed(aBuf) == constants.eFoundIt:
+                    self.result = {'encoding': prober.get_charset_name(),
+                                   'confidence': prober.get_confidence()}
+                    self.done = True
+                    break
+
+    def close(self):
+        if self.done:
+            return
+        if not self._mGotData:
+            if constants._debug:
+                sys.stderr.write('no data received!\n')
+            return
+        self.done = True
+
+        if self._mInputState == ePureAscii:
+            self.result = {'encoding': 'ascii', 'confidence': 1.0}
+            return self.result
+
+        if self._mInputState == eHighbyte:
+            proberConfidence = None
+            maxProberConfidence = 0.0
+            maxProber = None
+            for prober in self._mCharSetProbers:
+                if not prober:
+                    continue
+                proberConfidence = prober.get_confidence()
+                if proberConfidence > maxProberConfidence:
+                    maxProberConfidence = proberConfidence
+                    maxProber = prober
+            if maxProber and (maxProberConfidence > MINIMUM_THRESHOLD):
+                self.result = {'encoding': maxProber.get_charset_name(),
+                               'confidence': maxProber.get_confidence()}
+                return self.result
+
+        if constants._debug:
+            sys.stderr.write('no probers hit minimum threshhold\n')
+            for prober in self._mCharSetProbers[0].mProbers:
+                if not prober:
+                    continue
+                sys.stderr.write('%s confidence = %s\n' %
+                                 (prober.get_charset_name(),
+                                  prober.get_confidence()))
diff --git a/lib/requests/packages/chardet/utf8prober.py b/lib/requests/packages/chardet/utf8prober.py
new file mode 100644
index 00000000..1c0bb5d8
--- /dev/null
+++ b/lib/requests/packages/chardet/utf8prober.py
@@ -0,0 +1,76 @@
+######################## BEGIN LICENSE BLOCK ########################
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Mark Pilgrim - port to Python
+#
+# 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 St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+######################### END LICENSE BLOCK #########################
+
+from . import constants
+from .charsetprober import CharSetProber
+from .codingstatemachine import CodingStateMachine
+from .mbcssm import UTF8SMModel
+
+ONE_CHAR_PROB = 0.5
+
+
+class UTF8Prober(CharSetProber):
+    def __init__(self):
+        CharSetProber.__init__(self)
+        self._mCodingSM = CodingStateMachine(UTF8SMModel)
+        self.reset()
+
+    def reset(self):
+        CharSetProber.reset(self)
+        self._mCodingSM.reset()
+        self._mNumOfMBChar = 0
+
+    def get_charset_name(self):
+        return "utf-8"
+
+    def feed(self, aBuf):
+        for c in aBuf:
+            codingState = self._mCodingSM.next_state(c)
+            if codingState == constants.eError:
+                self._mState = constants.eNotMe
+                break
+            elif codingState == constants.eItsMe:
+                self._mState = constants.eFoundIt
+                break
+            elif codingState == constants.eStart:
+                if self._mCodingSM.get_current_charlen() >= 2:
+                    self._mNumOfMBChar += 1
+
+        if self.get_state() == constants.eDetecting:
+            if self.get_confidence() > constants.SHORTCUT_THRESHOLD:
+                self._mState = constants.eFoundIt
+
+        return self.get_state()
+
+    def get_confidence(self):
+        unlike = 0.99
+        if self._mNumOfMBChar < 6:
+            for i in range(0, self._mNumOfMBChar):
+                unlike = unlike * ONE_CHAR_PROB
+            return 1.0 - unlike
+        else:
+            return unlike
diff --git a/lib/requests/packages/urllib3/__init__.py b/lib/requests/packages/urllib3/__init__.py
new file mode 100644
index 00000000..dfc82d03
--- /dev/null
+++ b/lib/requests/packages/urllib3/__init__.py
@@ -0,0 +1,66 @@
+"""
+urllib3 - Thread-safe connection pooling and re-using.
+"""
+
+__author__ = 'Andrey Petrov (andrey.petrov@shazow.net)'
+__license__ = 'MIT'
+__version__ = 'dev'
+
+
+from .connectionpool import (
+    HTTPConnectionPool,
+    HTTPSConnectionPool,
+    connection_from_url
+)
+
+from . import exceptions
+from .filepost import encode_multipart_formdata
+from .poolmanager import PoolManager, ProxyManager, proxy_from_url
+from .response import HTTPResponse
+from .util.request import make_headers
+from .util.url import get_host
+from .util.timeout import Timeout
+from .util.retry import Retry
+
+
+# Set default logging handler to avoid "No handler found" warnings.
+import logging
+try:  # Python 2.7+
+    from logging import NullHandler
+except ImportError:
+    class NullHandler(logging.Handler):
+        def emit(self, record):
+            pass
+
+logging.getLogger(__name__).addHandler(NullHandler())
+
+def add_stderr_logger(level=logging.DEBUG):
+    """
+    Helper for quickly adding a StreamHandler to the logger. Useful for
+    debugging.
+
+    Returns the handler after adding it.
+    """
+    # This method needs to be in this __init__.py to get the __name__ correct
+    # even if urllib3 is vendored within another package.
+    logger = logging.getLogger(__name__)
+    handler = logging.StreamHandler()
+    handler.setFormatter(logging.Formatter('%(asctime)s %(levelname)s %(message)s'))
+    logger.addHandler(handler)
+    logger.setLevel(level)
+    logger.debug('Added a stderr logging handler to logger: %s' % __name__)
+    return handler
+
+# ... Clean up.
+del NullHandler
+
+
+# Set security warning to only go off once by default.
+import warnings
+warnings.simplefilter('always', exceptions.SecurityWarning)
+
+def disable_warnings(category=exceptions.HTTPWarning):
+    """
+    Helper for quickly disabling all urllib3 warnings.
+    """
+    warnings.simplefilter('ignore', category)
diff --git a/lib/requests/packages/urllib3/_collections.py b/lib/requests/packages/urllib3/_collections.py
new file mode 100644
index 00000000..784342a4
--- /dev/null
+++ b/lib/requests/packages/urllib3/_collections.py
@@ -0,0 +1,198 @@
+from collections import Mapping, MutableMapping
+try:
+    from threading import RLock
+except ImportError: # Platform-specific: No threads available
+    class RLock:
+        def __enter__(self):
+            pass
+
+        def __exit__(self, exc_type, exc_value, traceback):
+            pass
+
+
+try: # Python 2.7+
+    from collections import OrderedDict
+except ImportError:
+    from .packages.ordered_dict import OrderedDict
+from .packages.six import iterkeys, itervalues
+
+
+__all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict']
+
+
+_Null = object()
+
+
+class RecentlyUsedContainer(MutableMapping):
+    """
+    Provides a thread-safe dict-like container which maintains up to
+    ``maxsize`` keys while throwing away the least-recently-used keys beyond
+    ``maxsize``.
+
+    :param maxsize:
+        Maximum number of recent elements to retain.
+
+    :param dispose_func:
+        Every time an item is evicted from the container,
+        ``dispose_func(value)`` is called.  Callback which will get called
+    """
+
+    ContainerCls = OrderedDict
+
+    def __init__(self, maxsize=10, dispose_func=None):
+        self._maxsize = maxsize
+        self.dispose_func = dispose_func
+
+        self._container = self.ContainerCls()
+        self.lock = RLock()
+
+    def __getitem__(self, key):
+        # Re-insert the item, moving it to the end of the eviction line.
+        with self.lock:
+            item = self._container.pop(key)
+            self._container[key] = item
+            return item
+
+    def __setitem__(self, key, value):
+        evicted_value = _Null
+        with self.lock:
+            # Possibly evict the existing value of 'key'
+            evicted_value = self._container.get(key, _Null)
+            self._container[key] = value
+
+            # If we didn't evict an existing value, we might have to evict the
+            # least recently used item from the beginning of the container.
+            if len(self._container) > self._maxsize:
+                _key, evicted_value = self._container.popitem(last=False)
+
+        if self.dispose_func and evicted_value is not _Null:
+            self.dispose_func(evicted_value)
+
+    def __delitem__(self, key):
+        with self.lock:
+            value = self._container.pop(key)
+
+        if self.dispose_func:
+            self.dispose_func(value)
+
+    def __len__(self):
+        with self.lock:
+            return len(self._container)
+
+    def __iter__(self):
+        raise NotImplementedError('Iteration over this class is unlikely to be threadsafe.')
+
+    def clear(self):
+        with self.lock:
+            # Copy pointers to all values, then wipe the mapping
+            values = list(itervalues(self._container))
+            self._container.clear()
+
+        if self.dispose_func:
+            for value in values:
+                self.dispose_func(value)
+
+    def keys(self):
+        with self.lock:
+            return list(iterkeys(self._container))
+
+
+class HTTPHeaderDict(MutableMapping):
+    """
+    :param headers:
+        An iterable of field-value pairs. Must not contain multiple field names
+        when compared case-insensitively.
+
+    :param kwargs:
+        Additional field-value pairs to pass in to ``dict.update``.
+
+    A ``dict`` like container for storing HTTP Headers.
+
+    Field names are stored and compared case-insensitively in compliance with
+    RFC 7230. Iteration provides the first case-sensitive key seen for each
+    case-insensitive pair.
+
+    Using ``__setitem__`` syntax overwrites fields that compare equal
+    case-insensitively in order to maintain ``dict``'s api. For fields that
+    compare equal, instead create a new ``HTTPHeaderDict`` and use ``.add``
+    in a loop.
+
+    If multiple fields that are equal case-insensitively are passed to the
+    constructor or ``.update``, the behavior is undefined and some will be
+    lost.
+
+    >>> headers = HTTPHeaderDict()
+    >>> headers.add('Set-Cookie', 'foo=bar')
+    >>> headers.add('set-cookie', 'baz=quxx')
+    >>> headers['content-length'] = '7'
+    >>> headers['SET-cookie']
+    'foo=bar, baz=quxx'
+    >>> headers['Content-Length']
+    '7'
+
+    If you want to access the raw headers with their original casing
+    for debugging purposes you can access the private ``._data`` attribute
+    which is a normal python ``dict`` that maps the case-insensitive key to a
+    list of tuples stored as (case-sensitive-original-name, value). Using the
+    structure from above as our example:
+
+    >>> headers._data
+    {'set-cookie': [('Set-Cookie', 'foo=bar'), ('set-cookie', 'baz=quxx')],
+    'content-length': [('content-length', '7')]}
+    """
+
+    def __init__(self, headers=None, **kwargs):
+        self._data = {}
+        if headers is None:
+            headers = {}
+        self.update(headers, **kwargs)
+
+    def add(self, key, value):
+        """Adds a (name, value) pair, doesn't overwrite the value if it already
+        exists.
+
+        >>> headers = HTTPHeaderDict(foo='bar')
+        >>> headers.add('Foo', 'baz')
+        >>> headers['foo']
+        'bar, baz'
+        """
+        self._data.setdefault(key.lower(), []).append((key, value))
+
+    def getlist(self, key):
+        """Returns a list of all the values for the named field. Returns an
+        empty list if the key doesn't exist."""
+        return self[key].split(', ') if key in self else []
+
+    def copy(self):
+        h = HTTPHeaderDict()
+        for key in self._data:
+            for rawkey, value in self._data[key]:
+                h.add(rawkey, value)
+        return h
+
+    def __eq__(self, other):
+        if not isinstance(other, Mapping):
+            return False
+        other = HTTPHeaderDict(other)
+        return dict((k1, self[k1]) for k1 in self._data) == \
+                dict((k2, other[k2]) for k2 in other._data)
+
+    def __getitem__(self, key):
+        values = self._data[key.lower()]
+        return ', '.join(value[1] for value in values)
+
+    def __setitem__(self, key, value):
+        self._data[key.lower()] = [(key, value)]
+
+    def __delitem__(self, key):
+        del self._data[key.lower()]
+
+    def __len__(self):
+        return len(self._data)
+
+    def __iter__(self):
+        for headers in itervalues(self._data):
+            yield headers[0][0]
+
+    def __repr__(self):
+        return '%s(%r)' % (self.__class__.__name__, dict(self.items()))
diff --git a/lib/requests/packages/urllib3/connection.py b/lib/requests/packages/urllib3/connection.py
new file mode 100644
index 00000000..e5de769d
--- /dev/null
+++ b/lib/requests/packages/urllib3/connection.py
@@ -0,0 +1,262 @@
+import datetime
+import sys
+import socket
+from socket import timeout as SocketTimeout
+import warnings
+from .packages import six
+
+try:  # Python 3
+    from http.client import HTTPConnection as _HTTPConnection, HTTPException
+except ImportError:
+    from httplib import HTTPConnection as _HTTPConnection, HTTPException
+
+
+class DummyConnection(object):
+    "Used to detect a failed ConnectionCls import."
+    pass
+
+
+try:  # Compiled with SSL?
+    HTTPSConnection = DummyConnection
+    import ssl
+    BaseSSLError = ssl.SSLError
+except (ImportError, AttributeError):  # Platform-specific: No SSL.
+    ssl = None
+
+    class BaseSSLError(BaseException):
+        pass
+
+
+try:  # Python 3:
+    # Not a no-op, we're adding this to the namespace so it can be imported.
+    ConnectionError = ConnectionError
+except NameError:  # Python 2:
+    class ConnectionError(Exception):
+        pass
+
+
+from .exceptions import (
+    ConnectTimeoutError,
+    SystemTimeWarning,
+    SecurityWarning,
+)
+from .packages.ssl_match_hostname import match_hostname
+
+from .util.ssl_ import (
+    resolve_cert_reqs,
+    resolve_ssl_version,
+    ssl_wrap_socket,
+    assert_fingerprint,
+)
+
+
+from .util import connection
+
+port_by_scheme = {
+    'http': 80,
+    'https': 443,
+}
+
+RECENT_DATE = datetime.date(2014, 1, 1)
+
+
+class HTTPConnection(_HTTPConnection, object):
+    """
+    Based on httplib.HTTPConnection but provides an extra constructor
+    backwards-compatibility layer between older and newer Pythons.
+
+    Additional keyword parameters are used to configure attributes of the connection.
+    Accepted parameters include:
+
+      - ``strict``: See the documentation on :class:`urllib3.connectionpool.HTTPConnectionPool`
+      - ``source_address``: Set the source address for the current connection.
+
+        .. note:: This is ignored for Python 2.6. It is only applied for 2.7 and 3.x
+
+      - ``socket_options``: Set specific options on the underlying socket. If not specified, then
+        defaults are loaded from ``HTTPConnection.default_socket_options`` which includes disabling
+        Nagle's algorithm (sets TCP_NODELAY to 1) unless the connection is behind a proxy.
+
+        For example, if you wish to enable TCP Keep Alive in addition to the defaults,
+        you might pass::
+
+            HTTPConnection.default_socket_options + [
+                (socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1),
+            ]
+
+        Or you may want to disable the defaults by passing an empty list (e.g., ``[]``).
+    """
+
+    default_port = port_by_scheme['http']
+
+    #: Disable Nagle's algorithm by default.
+    #: ``[(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)]``
+    default_socket_options = [(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)]
+
+    #: Whether this connection verifies the host's certificate.
+    is_verified = False
+
+    def __init__(self, *args, **kw):
+        if six.PY3:  # Python 3
+            kw.pop('strict', None)
+
+        # Pre-set source_address in case we have an older Python like 2.6.
+        self.source_address = kw.get('source_address')
+
+        if sys.version_info < (2, 7):  # Python 2.6
+            # _HTTPConnection on Python 2.6 will balk at this keyword arg, but
+            # not newer versions. We can still use it when creating a
+            # connection though, so we pop it *after* we have saved it as
+            # self.source_address.
+            kw.pop('source_address', None)
+
+        #: The socket options provided by the user. If no options are
+        #: provided, we use the default options.
+        self.socket_options = kw.pop('socket_options', self.default_socket_options)
+
+        # Superclass also sets self.source_address in Python 2.7+.
+        _HTTPConnection.__init__(self, *args, **kw)
+
+    def _new_conn(self):
+        """ Establish a socket connection and set nodelay settings on it.
+
+        :return: New socket connection.
+        """
+        extra_kw = {}
+        if self.source_address:
+            extra_kw['source_address'] = self.source_address
+
+        if self.socket_options:
+            extra_kw['socket_options'] = self.socket_options
+
+        try:
+            conn = connection.create_connection(
+                (self.host, self.port), self.timeout, **extra_kw)
+
+        except SocketTimeout:
+            raise ConnectTimeoutError(
+                self, "Connection to %s timed out. (connect timeout=%s)" %
+                (self.host, self.timeout))
+
+        return conn
+
+    def _prepare_conn(self, conn):
+        self.sock = conn
+        # the _tunnel_host attribute was added in python 2.6.3 (via
+        # http://hg.python.org/cpython/rev/0f57b30a152f) so pythons 2.6(0-2) do
+        # not have them.
+        if getattr(self, '_tunnel_host', None):
+            # TODO: Fix tunnel so it doesn't depend on self.sock state.
+            self._tunnel()
+            # Mark this connection as not reusable
+            self.auto_open = 0
+
+    def connect(self):
+        conn = self._new_conn()
+        self._prepare_conn(conn)
+
+
+class HTTPSConnection(HTTPConnection):
+    default_port = port_by_scheme['https']
+
+    def __init__(self, host, port=None, key_file=None, cert_file=None,
+                 strict=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT, **kw):
+
+        HTTPConnection.__init__(self, host, port, strict=strict,
+                                timeout=timeout, **kw)
+
+        self.key_file = key_file
+        self.cert_file = cert_file
+
+        # Required property for Google AppEngine 1.9.0 which otherwise causes
+        # HTTPS requests to go out as HTTP. (See Issue #356)
+        self._protocol = 'https'
+
+    def connect(self):
+        conn = self._new_conn()
+        self._prepare_conn(conn)
+        self.sock = ssl.wrap_socket(conn, self.key_file, self.cert_file)
+
+
+class VerifiedHTTPSConnection(HTTPSConnection):
+    """
+    Based on httplib.HTTPSConnection but wraps the socket with
+    SSL certification.
+    """
+    cert_reqs = None
+    ca_certs = None
+    ssl_version = None
+    assert_fingerprint = None
+
+    def set_cert(self, key_file=None, cert_file=None,
+                 cert_reqs=None, ca_certs=None,
+                 assert_hostname=None, assert_fingerprint=None):
+
+        self.key_file = key_file
+        self.cert_file = cert_file
+        self.cert_reqs = cert_reqs
+        self.ca_certs = ca_certs
+        self.assert_hostname = assert_hostname
+        self.assert_fingerprint = assert_fingerprint
+
+    def connect(self):
+        # Add certificate verification
+        conn = self._new_conn()
+
+        resolved_cert_reqs = resolve_cert_reqs(self.cert_reqs)
+        resolved_ssl_version = resolve_ssl_version(self.ssl_version)
+
+        hostname = self.host
+        if getattr(self, '_tunnel_host', None):
+            # _tunnel_host was added in Python 2.6.3
+            # (See: http://hg.python.org/cpython/rev/0f57b30a152f)
+
+            self.sock = conn
+            # Calls self._set_hostport(), so self.host is
+            # self._tunnel_host below.
+            self._tunnel()
+            # Mark this connection as not reusable
+            self.auto_open = 0
+
+            # Override the host with the one we're requesting data from.
+            hostname = self._tunnel_host
+
+        is_time_off = datetime.date.today() < RECENT_DATE
+        if is_time_off:
+            warnings.warn((
+                'System time is way off (before {0}). This will probably '
+                'lead to SSL verification errors').format(RECENT_DATE),
+                SystemTimeWarning
+            )
+
+        # Wrap socket using verification with the root certs in
+        # trusted_root_certs
+        self.sock = ssl_wrap_socket(conn, self.key_file, self.cert_file,
+                                    cert_reqs=resolved_cert_reqs,
+                                    ca_certs=self.ca_certs,
+                                    server_hostname=hostname,
+                                    ssl_version=resolved_ssl_version)
+
+        if self.assert_fingerprint:
+            assert_fingerprint(self.sock.getpeercert(binary_form=True),
+                               self.assert_fingerprint)
+        elif resolved_cert_reqs != ssl.CERT_NONE \
+                and self.assert_hostname is not False:
+            cert = self.sock.getpeercert()
+            if not cert.get('subjectAltName', ()):
+                warnings.warn((
+                    'Certificate has no `subjectAltName`, falling back to check for a `commonName` for now. '
+                    'This feature is being removed by major browsers and deprecated by RFC 2818. '
+                    '(See https://github.com/shazow/urllib3/issues/497 for details.)'),
+                    SecurityWarning
+                )
+            match_hostname(cert, self.assert_hostname or hostname)
+
+        self.is_verified = (resolved_cert_reqs == ssl.CERT_REQUIRED
+                            or self.assert_fingerprint is not None)
+
+
+if ssl:
+    # Make a copy for testing.
+    UnverifiedHTTPSConnection = HTTPSConnection
+    HTTPSConnection = VerifiedHTTPSConnection
diff --git a/lib/requests/packages/urllib3/connectionpool.py b/lib/requests/packages/urllib3/connectionpool.py
new file mode 100644
index 00000000..70ee4eed
--- /dev/null
+++ b/lib/requests/packages/urllib3/connectionpool.py
@@ -0,0 +1,761 @@
+import errno
+import logging
+import sys
+import warnings
+
+from socket import error as SocketError, timeout as SocketTimeout
+import socket
+
+try:  # Python 3
+    from queue import LifoQueue, Empty, Full
+except ImportError:
+    from Queue import LifoQueue, Empty, Full
+    import Queue as _  # Platform-specific: Windows
+
+
+from .exceptions import (
+    ClosedPoolError,
+    ProtocolError,
+    EmptyPoolError,
+    HostChangedError,
+    LocationValueError,
+    MaxRetryError,
+    ProxyError,
+    ReadTimeoutError,
+    SSLError,
+    TimeoutError,
+    InsecureRequestWarning,
+)
+from .packages.ssl_match_hostname import CertificateError
+from .packages import six
+from .connection import (
+    port_by_scheme,
+    DummyConnection,
+    HTTPConnection, HTTPSConnection, VerifiedHTTPSConnection,
+    HTTPException, BaseSSLError, ConnectionError
+)
+from .request import RequestMethods
+from .response import HTTPResponse
+
+from .util.connection import is_connection_dropped
+from .util.retry import Retry
+from .util.timeout import Timeout
+from .util.url import get_host
+
+
+xrange = six.moves.xrange
+
+log = logging.getLogger(__name__)
+
+_Default = object()
+
+
+## Pool objects
+class ConnectionPool(object):
+    """
+    Base class for all connection pools, such as
+    :class:`.HTTPConnectionPool` and :class:`.HTTPSConnectionPool`.
+    """
+
+    scheme = None
+    QueueCls = LifoQueue
+
+    def __init__(self, host, port=None):
+        if not host:
+            raise LocationValueError("No host specified.")
+
+        # httplib doesn't like it when we include brackets in ipv6 addresses
+        self.host = host.strip('[]')
+        self.port = port
+
+    def __str__(self):
+        return '%s(host=%r, port=%r)' % (type(self).__name__,
+                                         self.host, self.port)
+
+# This is taken from http://hg.python.org/cpython/file/7aaba721ebc0/Lib/socket.py#l252
+_blocking_errnos = set([errno.EAGAIN, errno.EWOULDBLOCK])
+
+
+class HTTPConnectionPool(ConnectionPool, RequestMethods):
+    """
+    Thread-safe connection pool for one host.
+
+    :param host:
+        Host used for this HTTP Connection (e.g. "localhost"), passed into
+        :class:`httplib.HTTPConnection`.
+
+    :param port:
+        Port used for this HTTP Connection (None is equivalent to 80), passed
+        into :class:`httplib.HTTPConnection`.
+
+    :param strict:
+        Causes BadStatusLine to be raised if the status line can't be parsed
+        as a valid HTTP/1.0 or 1.1 status line, passed into
+        :class:`httplib.HTTPConnection`.
+
+        .. note::
+           Only works in Python 2. This parameter is ignored in Python 3.
+
+    :param timeout:
+        Socket timeout in seconds for each individual connection. This can
+        be a float or integer, which sets the timeout for the HTTP request,
+        or an instance of :class:`urllib3.util.Timeout` which gives you more
+        fine-grained control over request timeouts. After the constructor has
+        been parsed, this is always a `urllib3.util.Timeout` object.
+
+    :param maxsize:
+        Number of connections to save that can be reused. More than 1 is useful
+        in multithreaded situations. If ``block`` is set to false, more
+        connections will be created but they will not be saved once they've
+        been used.
+
+    :param block:
+        If set to True, no more than ``maxsize`` connections will be used at
+        a time. When no free connections are available, the call will block
+        until a connection has been released. This is a useful side effect for
+        particular multithreaded situations where one does not want to use more
+        than maxsize connections per host to prevent flooding.
+
+    :param headers:
+        Headers to include with all requests, unless other headers are given
+        explicitly.
+
+    :param retries:
+        Retry configuration to use by default with requests in this pool.
+
+    :param _proxy:
+        Parsed proxy URL, should not be used directly, instead, see
+        :class:`urllib3.connectionpool.ProxyManager`"
+
+    :param _proxy_headers:
+        A dictionary with proxy headers, should not be used directly,
+        instead, see :class:`urllib3.connectionpool.ProxyManager`"
+
+    :param \**conn_kw:
+        Additional parameters are used to create fresh :class:`urllib3.connection.HTTPConnection`,
+        :class:`urllib3.connection.HTTPSConnection` instances.
+    """
+
+    scheme = 'http'
+    ConnectionCls = HTTPConnection
+
+    def __init__(self, host, port=None, strict=False,
+                 timeout=Timeout.DEFAULT_TIMEOUT, maxsize=1, block=False,
+                 headers=None, retries=None,
+                 _proxy=None, _proxy_headers=None,
+                 **conn_kw):
+        ConnectionPool.__init__(self, host, port)
+        RequestMethods.__init__(self, headers)
+
+        self.strict = strict
+
+        if not isinstance(timeout, Timeout):
+            timeout = Timeout.from_float(timeout)
+
+        if retries is None:
+            retries = Retry.DEFAULT
+
+        self.timeout = timeout
+        self.retries = retries
+
+        self.pool = self.QueueCls(maxsize)
+        self.block = block
+
+        self.proxy = _proxy
+        self.proxy_headers = _proxy_headers or {}
+
+        # Fill the queue up so that doing get() on it will block properly
+        for _ in xrange(maxsize):
+            self.pool.put(None)
+
+        # These are mostly for testing and debugging purposes.
+        self.num_connections = 0
+        self.num_requests = 0
+        self.conn_kw = conn_kw
+
+        if self.proxy:
+            # Enable Nagle's algorithm for proxies, to avoid packet fragmentation.
+            # We cannot know if the user has added default socket options, so we cannot replace the
+            # list.
+            self.conn_kw.setdefault('socket_options', [])
+
+    def _new_conn(self):
+        """
+        Return a fresh :class:`HTTPConnection`.
+        """
+        self.num_connections += 1
+        log.info("Starting new HTTP connection (%d): %s" %
+                 (self.num_connections, self.host))
+
+        conn = self.ConnectionCls(host=self.host, port=self.port,
+                                  timeout=self.timeout.connect_timeout,
+                                  strict=self.strict, **self.conn_kw)
+        return conn
+
+    def _get_conn(self, timeout=None):
+        """
+        Get a connection. Will return a pooled connection if one is available.
+
+        If no connections are available and :prop:`.block` is ``False``, then a
+        fresh connection is returned.
+
+        :param timeout:
+            Seconds to wait before giving up and raising
+            :class:`urllib3.exceptions.EmptyPoolError` if the pool is empty and
+            :prop:`.block` is ``True``.
+        """
+        conn = None
+        try:
+            conn = self.pool.get(block=self.block, timeout=timeout)
+
+        except AttributeError:  # self.pool is None
+            raise ClosedPoolError(self, "Pool is closed.")
+
+        except Empty:
+            if self.block:
+                raise EmptyPoolError(self,
+                                     "Pool reached maximum size and no more "
+                                     "connections are allowed.")
+            pass  # Oh well, we'll create a new connection then
+
+        # If this is a persistent connection, check if it got disconnected
+        if conn and is_connection_dropped(conn):
+            log.info("Resetting dropped connection: %s" % self.host)
+            conn.close()
+            if getattr(conn, 'auto_open', 1) == 0:
+                # This is a proxied connection that has been mutated by
+                # httplib._tunnel() and cannot be reused (since it would
+                # attempt to bypass the proxy)
+                conn = None
+
+        return conn or self._new_conn()
+
+    def _put_conn(self, conn):
+        """
+        Put a connection back into the pool.
+
+        :param conn:
+            Connection object for the current host and port as returned by
+            :meth:`._new_conn` or :meth:`._get_conn`.
+
+        If the pool is already full, the connection is closed and discarded
+        because we exceeded maxsize. If connections are discarded frequently,
+        then maxsize should be increased.
+
+        If the pool is closed, then the connection will be closed and discarded.
+        """
+        try:
+            self.pool.put(conn, block=False)
+            return  # Everything is dandy, done.
+        except AttributeError:
+            # self.pool is None.
+            pass
+        except Full:
+            # This should never happen if self.block == True
+            log.warning(
+                "Connection pool is full, discarding connection: %s" %
+                self.host)
+
+        # Connection never got put back into the pool, close it.
+        if conn:
+            conn.close()
+
+    def _validate_conn(self, conn):
+        """
+        Called right before a request is made, after the socket is created.
+        """
+        pass
+
+    def _get_timeout(self, timeout):
+        """ Helper that always returns a :class:`urllib3.util.Timeout` """
+        if timeout is _Default:
+            return self.timeout.clone()
+
+        if isinstance(timeout, Timeout):
+            return timeout.clone()
+        else:
+            # User passed us an int/float. This is for backwards compatibility,
+            # can be removed later
+            return Timeout.from_float(timeout)
+
+    def _raise_timeout(self, err, url, timeout_value):
+        """Is the error actually a timeout? Will raise a ReadTimeout or pass"""
+
+        if isinstance(err, SocketTimeout):
+            raise ReadTimeoutError(self, url, "Read timed out. (read timeout=%s)" % timeout_value)
+
+        # See the above comment about EAGAIN in Python 3. In Python 2 we have
+        # to specifically catch it and throw the timeout error
+        if hasattr(err, 'errno') and err.errno in _blocking_errnos:
+            raise ReadTimeoutError(self, url, "Read timed out. (read timeout=%s)" % timeout_value)
+
+        # Catch possible read timeouts thrown as SSL errors. If not the
+        # case, rethrow the original. We need to do this because of:
+        # http://bugs.python.org/issue10272
+        if 'timed out' in str(err) or 'did not complete (read)' in str(err):  # Python 2.6
+            raise ReadTimeoutError(self, url, "Read timed out. (read timeout=%s)" % timeout_value)
+
+    def _make_request(self, conn, method, url, timeout=_Default,
+                      **httplib_request_kw):
+        """
+        Perform a request on a given urllib connection object taken from our
+        pool.
+
+        :param conn:
+            a connection from one of our connection pools
+
+        :param timeout:
+            Socket timeout in seconds for the request. This can be a
+            float or integer, which will set the same timeout value for
+            the socket connect and the socket read, or an instance of
+            :class:`urllib3.util.Timeout`, which gives you more fine-grained
+            control over your timeouts.
+        """
+        self.num_requests += 1
+
+        timeout_obj = self._get_timeout(timeout)
+        timeout_obj.start_connect()
+        conn.timeout = timeout_obj.connect_timeout
+
+        # Trigger any extra validation we need to do.
+        try:
+            self._validate_conn(conn)
+        except (SocketTimeout, BaseSSLError) as e:
+            # Py2 raises this as a BaseSSLError, Py3 raises it as socket timeout.
+            self._raise_timeout(err=e, url=url, timeout_value=conn.timeout)
+            raise
+
+        # conn.request() calls httplib.*.request, not the method in
+        # urllib3.request. It also calls makefile (recv) on the socket.
+        conn.request(method, url, **httplib_request_kw)
+
+        # Reset the timeout for the recv() on the socket
+        read_timeout = timeout_obj.read_timeout
+
+        # App Engine doesn't have a sock attr
+        if getattr(conn, 'sock', None):
+            # In Python 3 socket.py will catch EAGAIN and return None when you
+            # try and read into the file pointer created by http.client, which
+            # instead raises a BadStatusLine exception. Instead of catching
+            # the exception and assuming all BadStatusLine exceptions are read
+            # timeouts, check for a zero timeout before making the request.
+            if read_timeout == 0:
+                raise ReadTimeoutError(
+                    self, url, "Read timed out. (read timeout=%s)" % read_timeout)
+            if read_timeout is Timeout.DEFAULT_TIMEOUT:
+                conn.sock.settimeout(socket.getdefaulttimeout())
+            else:  # None or a value
+                conn.sock.settimeout(read_timeout)
+
+        # Receive the response from the server
+        try:
+            try:  # Python 2.7+, use buffering of HTTP responses
+                httplib_response = conn.getresponse(buffering=True)
+            except TypeError:  # Python 2.6 and older
+                httplib_response = conn.getresponse()
+        except (SocketTimeout, BaseSSLError, SocketError) as e:
+            self._raise_timeout(err=e, url=url, timeout_value=read_timeout)
+            raise
+
+        # AppEngine doesn't have a version attr.
+        http_version = getattr(conn, '_http_vsn_str', 'HTTP/?')
+        log.debug("\"%s %s %s\" %s %s" % (method, url, http_version,
+                                          httplib_response.status,
+                                          httplib_response.length))
+        return httplib_response
+
+    def close(self):
+        """
+        Close all pooled connections and disable the pool.
+        """
+        # Disable access to the pool
+        old_pool, self.pool = self.pool, None
+
+        try:
+            while True:
+                conn = old_pool.get(block=False)
+                if conn:
+                    conn.close()
+
+        except Empty:
+            pass  # Done.
+
+    def is_same_host(self, url):
+        """
+        Check if the given ``url`` is a member of the same host as this
+        connection pool.
+        """
+        if url.startswith('/'):
+            return True
+
+        # TODO: Add optional support for socket.gethostbyname checking.
+        scheme, host, port = get_host(url)
+
+        # Use explicit default port for comparison when none is given
+        if self.port and not port:
+            port = port_by_scheme.get(scheme)
+        elif not self.port and port == port_by_scheme.get(scheme):
+            port = None
+
+        return (scheme, host, port) == (self.scheme, self.host, self.port)
+
+    def urlopen(self, method, url, body=None, headers=None, retries=None,
+                redirect=True, assert_same_host=True, timeout=_Default,
+                pool_timeout=None, release_conn=None, **response_kw):
+        """
+        Get a connection from the pool and perform an HTTP request. This is the
+        lowest level call for making a request, so you'll need to specify all
+        the raw details.
+
+        .. note::
+
+           More commonly, it's appropriate to use a convenience method provided
+           by :class:`.RequestMethods`, such as :meth:`request`.
+
+        .. note::
+
+           `release_conn` will only behave as expected if
+           `preload_content=False` because we want to make
+           `preload_content=False` the default behaviour someday soon without
+           breaking backwards compatibility.
+
+        :param method:
+            HTTP request method (such as GET, POST, PUT, etc.)
+
+        :param body:
+            Data to send in the request body (useful for creating
+            POST requests, see HTTPConnectionPool.post_url for
+            more convenience).
+
+        :param headers:
+            Dictionary of custom headers to send, such as User-Agent,
+            If-None-Match, etc. If None, pool headers are used. If provided,
+            these headers completely replace any pool-specific headers.
+
+        :param retries:
+            Configure the number of retries to allow before raising a
+            :class:`~urllib3.exceptions.MaxRetryError` exception.
+
+            Pass ``None`` to retry until you receive a response. Pass a
+            :class:`~urllib3.util.retry.Retry` object for fine-grained control
+            over different types of retries.
+            Pass an integer number to retry connection errors that many times,
+            but no other types of errors. Pass zero to never retry.
+
+            If ``False``, then retries are disabled and any exception is raised
+            immediately. Also, instead of raising a MaxRetryError on redirects,
+            the redirect response will be returned.
+
+        :type retries: :class:`~urllib3.util.retry.Retry`, False, or an int.
+
+        :param redirect:
+            If True, automatically handle redirects (status codes 301, 302,
+            303, 307, 308). Each redirect counts as a retry. Disabling retries
+            will disable redirect, too.
+
+        :param assert_same_host:
+            If ``True``, will make sure that the host of the pool requests is
+            consistent else will raise HostChangedError. When False, you can
+            use the pool on an HTTP proxy and request foreign hosts.
+
+        :param timeout:
+            If specified, overrides the default timeout for this one
+            request. It may be a float (in seconds) or an instance of
+            :class:`urllib3.util.Timeout`.
+
+        :param pool_timeout:
+            If set and the pool is set to block=True, then this method will
+            block for ``pool_timeout`` seconds and raise EmptyPoolError if no
+            connection is available within the time period.
+
+        :param release_conn:
+            If False, then the urlopen call will not release the connection
+            back into the pool once a response is received (but will release if
+            you read the entire contents of the response such as when
+            `preload_content=True`). This is useful if you're not preloading
+            the response's content immediately. You will need to call
+            ``r.release_conn()`` on the response ``r`` to return the connection
+            back into the pool. If None, it takes the value of
+            ``response_kw.get('preload_content', True)``.
+
+        :param \**response_kw:
+            Additional parameters are passed to
+            :meth:`urllib3.response.HTTPResponse.from_httplib`
+        """
+        if headers is None:
+            headers = self.headers
+
+        if not isinstance(retries, Retry):
+            retries = Retry.from_int(retries, redirect=redirect, default=self.retries)
+
+        if release_conn is None:
+            release_conn = response_kw.get('preload_content', True)
+
+        # Check host
+        if assert_same_host and not self.is_same_host(url):
+            raise HostChangedError(self, url, retries)
+
+        conn = None
+
+        # Merge the proxy headers. Only do this in HTTP. We have to copy the
+        # headers dict so we can safely change it without those changes being
+        # reflected in anyone else's copy.
+        if self.scheme == 'http':
+            headers = headers.copy()
+            headers.update(self.proxy_headers)
+
+        # Must keep the exception bound to a separate variable or else Python 3
+        # complains about UnboundLocalError.
+        err = None
+
+        try:
+            # Request a connection from the queue.
+            conn = self._get_conn(timeout=pool_timeout)
+
+            # Make the request on the httplib connection object.
+            httplib_response = self._make_request(conn, method, url,
+                                                  timeout=timeout,
+                                                  body=body, headers=headers)
+
+            # If we're going to release the connection in ``finally:``, then
+            # the request doesn't need to know about the connection. Otherwise
+            # it will also try to release it and we'll have a double-release
+            # mess.
+            response_conn = not release_conn and conn
+
+            # Import httplib's response into our own wrapper object
+            response = HTTPResponse.from_httplib(httplib_response,
+                                                 pool=self,
+                                                 connection=response_conn,
+                                                 **response_kw)
+
+            # else:
+            #     The connection will be put back into the pool when
+            #     ``response.release_conn()`` is called (implicitly by
+            #     ``response.read()``)
+
+        except Empty:
+            # Timed out by queue.
+            raise EmptyPoolError(self, "No pool connections are available.")
+
+        except (BaseSSLError, CertificateError) as e:
+            # Close the connection. If a connection is reused on which there
+            # was a Certificate error, the next request will certainly raise
+            # another Certificate error.
+            if conn:
+                conn.close()
+                conn = None
+            raise SSLError(e)
+
+        except (TimeoutError, HTTPException, SocketError, ConnectionError) as e:
+            if conn:
+                # Discard the connection for these exceptions. It will be
+                # be replaced during the next _get_conn() call.
+                conn.close()
+                conn = None
+
+            stacktrace = sys.exc_info()[2]
+            if isinstance(e, SocketError) and self.proxy:
+                e = ProxyError('Cannot connect to proxy.', e)
+            elif isinstance(e, (SocketError, HTTPException)):
+                e = ProtocolError('Connection aborted.', e)
+
+            retries = retries.increment(method, url, error=e,
+                                        _pool=self, _stacktrace=stacktrace)
+            retries.sleep()
+
+            # Keep track of the error for the retry warning.
+            err = e
+
+        finally:
+            if release_conn:
+                # Put the connection back to be reused. If the connection is
+                # expired then it will be None, which will get replaced with a
+                # fresh connection during _get_conn.
+                self._put_conn(conn)
+
+        if not conn:
+            # Try again
+            log.warning("Retrying (%r) after connection "
+                        "broken by '%r': %s" % (retries, err, url))
+            return self.urlopen(method, url, body, headers, retries,
+                                redirect, assert_same_host,
+                                timeout=timeout, pool_timeout=pool_timeout,
+                                release_conn=release_conn, **response_kw)
+
+        # Handle redirect?
+        redirect_location = redirect and response.get_redirect_location()
+        if redirect_location:
+            if response.status == 303:
+                method = 'GET'
+
+            try:
+                retries = retries.increment(method, url, response=response, _pool=self)
+            except MaxRetryError:
+                if retries.raise_on_redirect:
+                    raise
+                return response
+
+            log.info("Redirecting %s -> %s" % (url, redirect_location))
+            return self.urlopen(method, redirect_location, body, headers,
+                    retries=retries, redirect=redirect,
+                    assert_same_host=assert_same_host,
+                    timeout=timeout, pool_timeout=pool_timeout,
+                    release_conn=release_conn, **response_kw)
+
+        # Check if we should retry the HTTP response.
+        if retries.is_forced_retry(method, status_code=response.status):
+            retries = retries.increment(method, url, response=response, _pool=self)
+            retries.sleep()
+            log.info("Forced retry: %s" % url)
+            return self.urlopen(method, url, body, headers,
+                    retries=retries, redirect=redirect,
+                    assert_same_host=assert_same_host,
+                    timeout=timeout, pool_timeout=pool_timeout,
+                    release_conn=release_conn, **response_kw)
+
+        return response
+
+
+class HTTPSConnectionPool(HTTPConnectionPool):
+    """
+    Same as :class:`.HTTPConnectionPool`, but HTTPS.
+
+    When Python is compiled with the :mod:`ssl` module, then
+    :class:`.VerifiedHTTPSConnection` is used, which *can* verify certificates,
+    instead of :class:`.HTTPSConnection`.
+
+    :class:`.VerifiedHTTPSConnection` uses one of ``assert_fingerprint``,
+    ``assert_hostname`` and ``host`` in this order to verify connections.
+    If ``assert_hostname`` is False, no verification is done.
+
+    The ``key_file``, ``cert_file``, ``cert_reqs``, ``ca_certs`` and
+    ``ssl_version`` are only used if :mod:`ssl` is available and are fed into
+    :meth:`urllib3.util.ssl_wrap_socket` to upgrade the connection socket
+    into an SSL socket.
+    """
+
+    scheme = 'https'
+    ConnectionCls = HTTPSConnection
+
+    def __init__(self, host, port=None,
+                 strict=False, timeout=Timeout.DEFAULT_TIMEOUT, maxsize=1,
+                 block=False, headers=None, retries=None,
+                 _proxy=None, _proxy_headers=None,
+                 key_file=None, cert_file=None, cert_reqs=None,
+                 ca_certs=None, ssl_version=None,
+                 assert_hostname=None, assert_fingerprint=None,
+                 **conn_kw):
+
+        HTTPConnectionPool.__init__(self, host, port, strict, timeout, maxsize,
+                                    block, headers, retries, _proxy, _proxy_headers,
+                                    **conn_kw)
+        self.key_file = key_file
+        self.cert_file = cert_file
+        self.cert_reqs = cert_reqs
+        self.ca_certs = ca_certs
+        self.ssl_version = ssl_version
+        self.assert_hostname = assert_hostname
+        self.assert_fingerprint = assert_fingerprint
+
+    def _prepare_conn(self, conn):
+        """
+        Prepare the ``connection`` for :meth:`urllib3.util.ssl_wrap_socket`
+        and establish the tunnel if proxy is used.
+        """
+
+        if isinstance(conn, VerifiedHTTPSConnection):
+            conn.set_cert(key_file=self.key_file,
+                          cert_file=self.cert_file,
+                          cert_reqs=self.cert_reqs,
+                          ca_certs=self.ca_certs,
+                          assert_hostname=self.assert_hostname,
+                          assert_fingerprint=self.assert_fingerprint)
+            conn.ssl_version = self.ssl_version
+
+        if self.proxy is not None:
+            # Python 2.7+
+            try:
+                set_tunnel = conn.set_tunnel
+            except AttributeError:  # Platform-specific: Python 2.6
+                set_tunnel = conn._set_tunnel
+
+            if sys.version_info <= (2, 6, 4) and not self.proxy_headers:   # Python 2.6.4 and older
+                set_tunnel(self.host, self.port)
+            else:
+                set_tunnel(self.host, self.port, self.proxy_headers)
+
+            # Establish tunnel connection early, because otherwise httplib
+            # would improperly set Host: header to proxy's IP:port.
+            conn.connect()
+
+        return conn
+
+    def _new_conn(self):
+        """
+        Return a fresh :class:`httplib.HTTPSConnection`.
+        """
+        self.num_connections += 1
+        log.info("Starting new HTTPS connection (%d): %s"
+                 % (self.num_connections, self.host))
+
+        if not self.ConnectionCls or self.ConnectionCls is DummyConnection:
+            # Platform-specific: Python without ssl
+            raise SSLError("Can't connect to HTTPS URL because the SSL "
+                           "module is not available.")
+
+        actual_host = self.host
+        actual_port = self.port
+        if self.proxy is not None:
+            actual_host = self.proxy.host
+            actual_port = self.proxy.port
+
+        conn = self.ConnectionCls(host=actual_host, port=actual_port,
+                                  timeout=self.timeout.connect_timeout,
+                                  strict=self.strict, **self.conn_kw)
+
+        return self._prepare_conn(conn)
+
+    def _validate_conn(self, conn):
+        """
+        Called right before a request is made, after the socket is created.
+        """
+        super(HTTPSConnectionPool, self)._validate_conn(conn)
+
+        # Force connect early to allow us to validate the connection.
+        if not getattr(conn, 'sock', None):  # AppEngine might not have  `.sock`
+            conn.connect()
+
+        if not conn.is_verified:
+            warnings.warn((
+                'Unverified HTTPS request is being made. '
+                'Adding certificate verification is strongly advised. See: '
+                'https://urllib3.readthedocs.org/en/latest/security.html'),
+                InsecureRequestWarning)
+
+
+def connection_from_url(url, **kw):
+    """
+    Given a url, return an :class:`.ConnectionPool` instance of its host.
+
+    This is a shortcut for not having to parse out the scheme, host, and port
+    of the url before creating an :class:`.ConnectionPool` instance.
+
+    :param url:
+        Absolute URL string that must include the scheme. Port is optional.
+
+    :param \**kw:
+        Passes additional parameters to the constructor of the appropriate
+        :class:`.ConnectionPool`. Useful for specifying things like
+        timeout, maxsize, headers, etc.
+
+    Example::
+
+        >>> conn = connection_from_url('http://google.com/')
+        >>> r = conn.request('GET', '/')
+    """
+    scheme, host, port = get_host(url)
+    if scheme == 'https':
+        return HTTPSConnectionPool(host, port=port, **kw)
+    else:
+        return HTTPConnectionPool(host, port=port, **kw)
diff --git a/lib/bleach/_vendor/__init__.py b/lib/requests/packages/urllib3/contrib/__init__.py
similarity index 100%
rename from lib/bleach/_vendor/__init__.py
rename to lib/requests/packages/urllib3/contrib/__init__.py
diff --git a/lib/requests/packages/urllib3/contrib/ntlmpool.py b/lib/requests/packages/urllib3/contrib/ntlmpool.py
new file mode 100644
index 00000000..c6b266f5
--- /dev/null
+++ b/lib/requests/packages/urllib3/contrib/ntlmpool.py
@@ -0,0 +1,114 @@
+"""
+NTLM authenticating pool, contributed by erikcederstran
+
+Issue #10, see: http://code.google.com/p/urllib3/issues/detail?id=10
+"""
+
+try:
+    from http.client import HTTPSConnection
+except ImportError:
+    from httplib import HTTPSConnection
+from logging import getLogger
+from ntlm import ntlm
+
+from urllib3 import HTTPSConnectionPool
+
+
+log = getLogger(__name__)
+
+
+class NTLMConnectionPool(HTTPSConnectionPool):
+    """
+    Implements an NTLM authentication version of an urllib3 connection pool
+    """
+
+    scheme = 'https'
+
+    def __init__(self, user, pw, authurl, *args, **kwargs):
+        """
+        authurl is a random URL on the server that is protected by NTLM.
+        user is the Windows user, probably in the DOMAIN\\username format.
+        pw is the password for the user.
+        """
+        super(NTLMConnectionPool, self).__init__(*args, **kwargs)
+        self.authurl = authurl
+        self.rawuser = user
+        user_parts = user.split('\\', 1)
+        self.domain = user_parts[0].upper()
+        self.user = user_parts[1]
+        self.pw = pw
+
+    def _new_conn(self):
+        # Performs the NTLM handshake that secures the connection. The socket
+        # must be kept open while requests are performed.
+        self.num_connections += 1
+        log.debug('Starting NTLM HTTPS connection no. %d: https://%s%s' %
+                  (self.num_connections, self.host, self.authurl))
+
+        headers = {}
+        headers['Connection'] = 'Keep-Alive'
+        req_header = 'Authorization'
+        resp_header = 'www-authenticate'
+
+        conn = HTTPSConnection(host=self.host, port=self.port)
+
+        # Send negotiation message
+        headers[req_header] = (
+            'NTLM %s' % ntlm.create_NTLM_NEGOTIATE_MESSAGE(self.rawuser))
+        log.debug('Request headers: %s' % headers)
+        conn.request('GET', self.authurl, None, headers)
+        res = conn.getresponse()
+        reshdr = dict(res.getheaders())
+        log.debug('Response status: %s %s' % (res.status, res.reason))
+        log.debug('Response headers: %s' % reshdr)
+        log.debug('Response data: %s [...]' % res.read(100))
+
+        # Remove the reference to the socket, so that it can not be closed by
+        # the response object (we want to keep the socket open)
+        res.fp = None
+
+        # Server should respond with a challenge message
+        auth_header_values = reshdr[resp_header].split(', ')
+        auth_header_value = None
+        for s in auth_header_values:
+            if s[:5] == 'NTLM ':
+                auth_header_value = s[5:]
+        if auth_header_value is None:
+            raise Exception('Unexpected %s response header: %s' %
+                            (resp_header, reshdr[resp_header]))
+
+        # Send authentication message
+        ServerChallenge, NegotiateFlags = \
+            ntlm.parse_NTLM_CHALLENGE_MESSAGE(auth_header_value)
+        auth_msg = ntlm.create_NTLM_AUTHENTICATE_MESSAGE(ServerChallenge,
+                                                         self.user,
+                                                         self.domain,
+                                                         self.pw,
+                                                         NegotiateFlags)
+        headers[req_header] = 'NTLM %s' % auth_msg
+        log.debug('Request headers: %s' % headers)
+        conn.request('GET', self.authurl, None, headers)
+        res = conn.getresponse()
+        log.debug('Response status: %s %s' % (res.status, res.reason))
+        log.debug('Response headers: %s' % dict(res.getheaders()))
+        log.debug('Response data: %s [...]' % res.read()[:100])
+        if res.status != 200:
+            if res.status == 401:
+                raise Exception('Server rejected request: wrong '
+                                'username or password')
+            raise Exception('Wrong server response: %s %s' %
+                            (res.status, res.reason))
+
+        res.fp = None
+        log.debug('Connection established')
+        return conn
+
+    def urlopen(self, method, url, body=None, headers=None, retries=3,
+                redirect=True, assert_same_host=True):
+        if headers is None:
+            headers = {}
+        headers['Connection'] = 'Keep-Alive'
+        return super(NTLMConnectionPool, self).urlopen(method, url, body,
+                                                       headers, retries,
+                                                       redirect,
+                                                       assert_same_host)
diff --git a/lib/requests/packages/urllib3/contrib/pyopenssl.py b/lib/requests/packages/urllib3/contrib/pyopenssl.py
new file mode 100644
index 00000000..8229090c
--- /dev/null
+++ b/lib/requests/packages/urllib3/contrib/pyopenssl.py
@@ -0,0 +1,303 @@
+'''SSL with SNI_-support for Python 2. Follow these instructions if you would
+like to verify SSL certificates in Python 2. Note, the default libraries do
+*not* do certificate checking; you need to do additional work to validate
+certificates yourself.
+
+This needs the following packages installed:
+
+* pyOpenSSL (tested with 0.13)
+* ndg-httpsclient (tested with 0.3.2)
+* pyasn1 (tested with 0.1.6)
+
+You can install them with the following command:
+
+    pip install pyopenssl ndg-httpsclient pyasn1
+
+To activate certificate checking, call
+:func:`~urllib3.contrib.pyopenssl.inject_into_urllib3` from your Python code
+before you begin making HTTP requests. This can be done in a ``sitecustomize``
+module, or at any other time before your application begins using ``urllib3``,
+like this::
+
+    try:
+        import urllib3.contrib.pyopenssl
+        urllib3.contrib.pyopenssl.inject_into_urllib3()
+    except ImportError:
+        pass
+
+Now you can use :mod:`urllib3` as you normally would, and it will support SNI
+when the required modules are installed.
+
+Activating this module also has the positive side effect of disabling SSL/TLS
+compression in Python 2 (see `CRIME attack`_).
+
+If you want to configure the default list of supported cipher suites, you can
+set the ``urllib3.contrib.pyopenssl.DEFAULT_SSL_CIPHER_LIST`` variable.
+
+Module Variables
+----------------
+
+:var DEFAULT_SSL_CIPHER_LIST: The list of supported SSL/TLS cipher suites.
+    Default: ``ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:
+    ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:!aNULL:!MD5:!DSS``
+
+.. _sni: https://en.wikipedia.org/wiki/Server_Name_Indication
+.. _crime attack: https://en.wikipedia.org/wiki/CRIME_(security_exploit)
+
+'''
+
+try:
+    from ndg.httpsclient.ssl_peer_verification import SUBJ_ALT_NAME_SUPPORT
+    from ndg.httpsclient.subj_alt_name import SubjectAltName as BaseSubjectAltName
+except SyntaxError as e:
+    raise ImportError(e)
+
+import OpenSSL.SSL
+from pyasn1.codec.der import decoder as der_decoder
+from pyasn1.type import univ, constraint
+from socket import _fileobject, timeout
+import ssl
+import select
+
+from .. import connection
+from .. import util
+
+__all__ = ['inject_into_urllib3', 'extract_from_urllib3']
+
+# SNI only *really* works if we can read the subjectAltName of certificates.
+HAS_SNI = SUBJ_ALT_NAME_SUPPORT
+
+# Map from urllib3 to PyOpenSSL compatible parameter-values.
+_openssl_versions = {
+    ssl.PROTOCOL_SSLv23: OpenSSL.SSL.SSLv23_METHOD,
+    ssl.PROTOCOL_TLSv1: OpenSSL.SSL.TLSv1_METHOD,
+}
+
+try:
+    _openssl_versions.update({ssl.PROTOCOL_SSLv3: OpenSSL.SSL.SSLv3_METHOD})
+except AttributeError:
+    pass
+
+_openssl_verify = {
+    ssl.CERT_NONE: OpenSSL.SSL.VERIFY_NONE,
+    ssl.CERT_OPTIONAL: OpenSSL.SSL.VERIFY_PEER,
+    ssl.CERT_REQUIRED: OpenSSL.SSL.VERIFY_PEER
+                       + OpenSSL.SSL.VERIFY_FAIL_IF_NO_PEER_CERT,
+}
+
+# A secure default.
+# Sources for more information on TLS ciphers:
+#
+# - https://wiki.mozilla.org/Security/Server_Side_TLS
+# - https://www.ssllabs.com/projects/best-practices/index.html
+# - https://hynek.me/articles/hardening-your-web-servers-ssl-ciphers/
+#
+# The general intent is:
+# - Prefer cipher suites that offer perfect forward secrecy (DHE/ECDHE),
+# - prefer ECDHE over DHE for better performance,
+# - prefer any AES-GCM over any AES-CBC for better performance and security,
+# - use 3DES as fallback which is secure but slow,
+# - disable NULL authentication, MD5 MACs and DSS for security reasons.
+DEFAULT_SSL_CIPHER_LIST = "ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:" + \
+    "ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:" + \
+    "!aNULL:!MD5:!DSS"
+
+
+orig_util_HAS_SNI = util.HAS_SNI
+orig_connection_ssl_wrap_socket = connection.ssl_wrap_socket
+
+
+def inject_into_urllib3():
+    'Monkey-patch urllib3 with PyOpenSSL-backed SSL-support.'
+
+    connection.ssl_wrap_socket = ssl_wrap_socket
+    util.HAS_SNI = HAS_SNI
+
+
+def extract_from_urllib3():
+    'Undo monkey-patching by :func:`inject_into_urllib3`.'
+
+    connection.ssl_wrap_socket = orig_connection_ssl_wrap_socket
+    util.HAS_SNI = orig_util_HAS_SNI
+
+
+### Note: This is a slightly bug-fixed version of same from ndg-httpsclient.
+class SubjectAltName(BaseSubjectAltName):
+    '''ASN.1 implementation for subjectAltNames support'''
+
+    # There is no limit to how many SAN certificates a certificate may have,
+    #   however this needs to have some limit so we'll set an arbitrarily high
+    #   limit.
+    sizeSpec = univ.SequenceOf.sizeSpec + \
+        constraint.ValueSizeConstraint(1, 1024)
+
+
+### Note: This is a slightly bug-fixed version of same from ndg-httpsclient.
+def get_subj_alt_name(peer_cert):
+    # Search through extensions
+    dns_name = []
+    if not SUBJ_ALT_NAME_SUPPORT:
+        return dns_name
+
+    general_names = SubjectAltName()
+    for i in range(peer_cert.get_extension_count()):
+        ext = peer_cert.get_extension(i)
+        ext_name = ext.get_short_name()
+        if ext_name != 'subjectAltName':
+            continue
+
+        # PyOpenSSL returns extension data in ASN.1 encoded form
+        ext_dat = ext.get_data()
+        decoded_dat = der_decoder.decode(ext_dat,
+                                         asn1Spec=general_names)
+
+        for name in decoded_dat:
+            if not isinstance(name, SubjectAltName):
+                continue
+            for entry in range(len(name)):
+                component = name.getComponentByPosition(entry)
+                if component.getName() != 'dNSName':
+                    continue
+                dns_name.append(str(component.getComponent()))
+
+    return dns_name
+
+
+class WrappedSocket(object):
+    '''API-compatibility wrapper for Python OpenSSL's Connection-class.
+
+    Note: _makefile_refs, _drop() and _reuse() are needed for the garbage
+    collector of pypy.
+    '''
+
+    def __init__(self, connection, socket, suppress_ragged_eofs=True):
+        self.connection = connection
+        self.socket = socket
+        self.suppress_ragged_eofs = suppress_ragged_eofs
+        self._makefile_refs = 0
+
+    def fileno(self):
+        return self.socket.fileno()
+
+    def makefile(self, mode, bufsize=-1):
+        self._makefile_refs += 1
+        return _fileobject(self, mode, bufsize, close=True)
+
+    def recv(self, *args, **kwargs):
+        try:
+            data = self.connection.recv(*args, **kwargs)
+        except OpenSSL.SSL.SysCallError as e:
+            if self.suppress_ragged_eofs and e.args == (-1, 'Unexpected EOF'):
+                return b''
+            else:
+                raise
+        except OpenSSL.SSL.WantReadError:
+            rd, wd, ed = select.select(
+                [self.socket], [], [], self.socket.gettimeout())
+            if not rd:
+                raise timeout('The read operation timed out')
+            else:
+                return self.recv(*args, **kwargs)
+        else:
+            return data
+
+    def settimeout(self, timeout):
+        return self.socket.settimeout(timeout)
+
+    def _send_until_done(self, data):
+        while True:
+            try:
+                return self.connection.send(data)
+            except OpenSSL.SSL.WantWriteError:
+                _, wlist, _ = select.select([], [self.socket], [],
+                                            self.socket.gettimeout())
+                if not wlist:
+                    raise timeout()
+                continue
+
+    def sendall(self, data):
+        while len(data):
+            sent = self._send_until_done(data)
+            data = data[sent:]
+
+    def close(self):
+        if self._makefile_refs < 1:
+            return self.connection.shutdown()
+        else:
+            self._makefile_refs -= 1
+
+    def getpeercert(self, binary_form=False):
+        x509 = self.connection.get_peer_certificate()
+
+        if not x509:
+            return x509
+
+        if binary_form:
+            return OpenSSL.crypto.dump_certificate(
+                OpenSSL.crypto.FILETYPE_ASN1,
+                x509)
+
+        return {
+            'subject': (
+                (('commonName', x509.get_subject().CN),),
+            ),
+            'subjectAltName': [
+                ('DNS', value)
+                for value in get_subj_alt_name(x509)
+            ]
+        }
+
+    def _reuse(self):
+        self._makefile_refs += 1
+
+    def _drop(self):
+        if self._makefile_refs < 1:
+            self.close()
+        else:
+            self._makefile_refs -= 1
+
+
+def _verify_callback(cnx, x509, err_no, err_depth, return_code):
+    return err_no == 0
+
+
+def ssl_wrap_socket(sock, keyfile=None, certfile=None, cert_reqs=None,
+                    ca_certs=None, server_hostname=None,
+                    ssl_version=None):
+    ctx = OpenSSL.SSL.Context(_openssl_versions[ssl_version])
+    if certfile:
+        keyfile = keyfile or certfile  # Match behaviour of the normal python ssl library
+        ctx.use_certificate_file(certfile)
+    if keyfile:
+        ctx.use_privatekey_file(keyfile)
+    if cert_reqs != ssl.CERT_NONE:
+        ctx.set_verify(_openssl_verify[cert_reqs], _verify_callback)
+    if ca_certs:
+        try:
+            ctx.load_verify_locations(ca_certs, None)
+        except OpenSSL.SSL.Error as e:
+            raise ssl.SSLError('bad ca_certs: %r' % ca_certs, e)
+    else:
+        ctx.set_default_verify_paths()
+
+    # Disable TLS compression to migitate CRIME attack (issue #309)
+    OP_NO_COMPRESSION = 0x20000
+    ctx.set_options(OP_NO_COMPRESSION)
+
+    # Set list of supported ciphersuites.
+    ctx.set_cipher_list(DEFAULT_SSL_CIPHER_LIST)
+
+    cnx = OpenSSL.SSL.Connection(ctx, sock)
+    cnx.set_tlsext_host_name(server_hostname)
+    cnx.set_connect_state()
+    while True:
+        try:
+            cnx.do_handshake()
+        except OpenSSL.SSL.WantReadError:
+            select.select([sock], [], [])
+            continue
+        except OpenSSL.SSL.Error as e:
+            raise ssl.SSLError('bad handshake', e)
+        break
+
+    return WrappedSocket(cnx, sock)
diff --git a/lib/requests/packages/urllib3/exceptions.py b/lib/requests/packages/urllib3/exceptions.py
new file mode 100644
index 00000000..0c6fd3c5
--- /dev/null
+++ b/lib/requests/packages/urllib3/exceptions.py
@@ -0,0 +1,159 @@
+
+## Base Exceptions
+
+class HTTPError(Exception):
+    "Base exception used by this module."
+    pass
+
+class HTTPWarning(Warning):
+    "Base warning used by this module."
+    pass
+
+
+
+class PoolError(HTTPError):
+    "Base exception for errors caused within a pool."
+    def __init__(self, pool, message):
+        self.pool = pool
+        HTTPError.__init__(self, "%s: %s" % (pool, message))
+
+    def __reduce__(self):
+        # For pickling purposes.
+        return self.__class__, (None, None)
+
+
+class RequestError(PoolError):
+    "Base exception for PoolErrors that have associated URLs."
+    def __init__(self, pool, url, message):
+        self.url = url
+        PoolError.__init__(self, pool, message)
+
+    def __reduce__(self):
+        # For pickling purposes.
+        return self.__class__, (None, self.url, None)
+
+
+class SSLError(HTTPError):
+    "Raised when SSL certificate fails in an HTTPS connection."
+    pass
+
+
+class ProxyError(HTTPError):
+    "Raised when the connection to a proxy fails."
+    pass
+
+
+class DecodeError(HTTPError):
+    "Raised when automatic decoding based on Content-Type fails."
+    pass
+
+
+class ProtocolError(HTTPError):
+    "Raised when something unexpected happens mid-request/response."
+    pass
+
+
+#: Renamed to ProtocolError but aliased for backwards compatibility.
+ConnectionError = ProtocolError
+
+
+## Leaf Exceptions
+
+class MaxRetryError(RequestError):
+    """Raised when the maximum number of retries is exceeded.
+
+    :param pool: The connection pool
+    :type pool: :class:`~urllib3.connectionpool.HTTPConnectionPool`
+    :param string url: The requested Url
+    :param exceptions.Exception reason: The underlying error
+
+    """
+
+    def __init__(self, pool, url, reason=None):
+        self.reason = reason
+
+        message = "Max retries exceeded with url: %s (Caused by %r)" % (
+            url, reason)
+
+        RequestError.__init__(self, pool, url, message)
+
+
+class HostChangedError(RequestError):
+    "Raised when an existing pool gets a request for a foreign host."
+
+    def __init__(self, pool, url, retries=3):
+        message = "Tried to open a foreign host with url: %s" % url
+        RequestError.__init__(self, pool, url, message)
+        self.retries = retries
+
+
+class TimeoutStateError(HTTPError):
+    """ Raised when passing an invalid state to a timeout """
+    pass
+
+
+class TimeoutError(HTTPError):
+    """ Raised when a socket timeout error occurs.
+
+    Catching this error will catch both :exc:`ReadTimeoutErrors
+    <ReadTimeoutError>` and :exc:`ConnectTimeoutErrors <ConnectTimeoutError>`.
+    """
+    pass
+
+
+class ReadTimeoutError(TimeoutError, RequestError):
+    "Raised when a socket timeout occurs while receiving data from a server"
+    pass
+
+
+# This timeout error does not have a URL attached and needs to inherit from the
+# base HTTPError
+class ConnectTimeoutError(TimeoutError):
+    "Raised when a socket timeout occurs while connecting to a server"
+    pass
+
+
+class EmptyPoolError(PoolError):
+    "Raised when a pool runs out of connections and no more are allowed."
+    pass
+
+
+class ClosedPoolError(PoolError):
+    "Raised when a request enters a pool after the pool has been closed."
+    pass
+
+
+class LocationValueError(ValueError, HTTPError):
+    "Raised when there is something wrong with a given URL input."
+    pass
+
+
+class LocationParseError(LocationValueError):
+    "Raised when get_host or similar fails to parse the URL input."
+
+    def __init__(self, location):
+        message = "Failed to parse: %s" % location
+        HTTPError.__init__(self, message)
+
+        self.location = location
+
+
+class ResponseError(HTTPError):
+    "Used as a container for an error reason supplied in a MaxRetryError."
+    GENERIC_ERROR = 'too many error responses'
+    SPECIFIC_ERROR = 'too many {status_code} error responses'
+
+
+class SecurityWarning(HTTPWarning):
+    "Warned when perfoming security reducing actions"
+    pass
+
+
+class InsecureRequestWarning(SecurityWarning):
+    "Warned when making an unverified HTTPS request."
+    pass
+
+
+class SystemTimeWarning(SecurityWarning):
+    "Warned when system time is suspected to be wrong"
+    pass
diff --git a/lib/requests/packages/urllib3/fields.py b/lib/requests/packages/urllib3/fields.py
new file mode 100644
index 00000000..c853f8d5
--- /dev/null
+++ b/lib/requests/packages/urllib3/fields.py
@@ -0,0 +1,177 @@
+import email.utils
+import mimetypes
+
+from .packages import six
+
+
+def guess_content_type(filename, default='application/octet-stream'):
+    """
+    Guess the "Content-Type" of a file.
+
+    :param filename:
+        The filename to guess the "Content-Type" of using :mod:`mimetypes`.
+    :param default:
+        If no "Content-Type" can be guessed, default to `default`.
+    """
+    if filename:
+        return mimetypes.guess_type(filename)[0] or default
+    return default
+
+
+def format_header_param(name, value):
+    """
+    Helper function to format and quote a single header parameter.
+
+    Particularly useful for header parameters which might contain
+    non-ASCII values, like file names. This follows RFC 2231, as
+    suggested by RFC 2388 Section 4.4.
+
+    :param name:
+        The name of the parameter, a string expected to be ASCII only.
+    :param value:
+        The value of the parameter, provided as a unicode string.
+    """
+    if not any(ch in value for ch in '"\\\r\n'):
+        result = '%s="%s"' % (name, value)
+        try:
+            result.encode('ascii')
+        except UnicodeEncodeError:
+            pass
+        else:
+            return result
+    if not six.PY3:  # Python 2:
+        value = value.encode('utf-8')
+    value = email.utils.encode_rfc2231(value, 'utf-8')
+    value = '%s*=%s' % (name, value)
+    return value
+
+
+class RequestField(object):
+    """
+    A data container for request body parameters.
+
+    :param name:
+        The name of this request field.
+    :param data:
+        The data/value body.
+    :param filename:
+        An optional filename of the request field.
+    :param headers:
+        An optional dict-like object of headers to initially use for the field.
+    """
+    def __init__(self, name, data, filename=None, headers=None):
+        self._name = name
+        self._filename = filename
+        self.data = data
+        self.headers = {}
+        if headers:
+            self.headers = dict(headers)
+
+    @classmethod
+    def from_tuples(cls, fieldname, value):
+        """
+        A :class:`~urllib3.fields.RequestField` factory from old-style tuple parameters.
+
+        Supports constructing :class:`~urllib3.fields.RequestField` from
+        parameter of key/value strings AND key/filetuple. A filetuple is a
+        (filename, data, MIME type) tuple where the MIME type is optional.
+        For example::
+
+            'foo': 'bar',
+            'fakefile': ('foofile.txt', 'contents of foofile'),
+            'realfile': ('barfile.txt', open('realfile').read()),
+            'typedfile': ('bazfile.bin', open('bazfile').read(), 'image/jpeg'),
+            'nonamefile': 'contents of nonamefile field',
+
+        Field names and filenames must be unicode.
+        """
+        if isinstance(value, tuple):
+            if len(value) == 3:
+                filename, data, content_type = value
+            else:
+                filename, data = value
+                content_type = guess_content_type(filename)
+        else:
+            filename = None
+            content_type = None
+            data = value
+
+        request_param = cls(fieldname, data, filename=filename)
+        request_param.make_multipart(content_type=content_type)
+
+        return request_param
+
+    def _render_part(self, name, value):
+        """
+        Overridable helper function to format a single header parameter.
+
+        :param name:
+            The name of the parameter, a string expected to be ASCII only.
+        :param value:
+            The value of the parameter, provided as a unicode string.
+        """
+        return format_header_param(name, value)
+
+    def _render_parts(self, header_parts):
+        """
+        Helper function to format and quote a single header.
+
+        Useful for single headers that are composed of multiple items. E.g.,
+        'Content-Disposition' fields.
+
+        :param header_parts:
+            A sequence of (k, v) typles or a :class:`dict` of (k, v) to format
+            as `k1="v1"; k2="v2"; ...`.
+        """
+        parts = []
+        iterable = header_parts
+        if isinstance(header_parts, dict):
+            iterable = header_parts.items()
+
+        for name, value in iterable:
+            if value:
+                parts.append(self._render_part(name, value))
+
+        return '; '.join(parts)
+
+    def render_headers(self):
+        """
+        Renders the headers for this request field.
+        """
+        lines = []
+
+        sort_keys = ['Content-Disposition', 'Content-Type', 'Content-Location']
+        for sort_key in sort_keys:
+            if self.headers.get(sort_key, False):
+                lines.append('%s: %s' % (sort_key, self.headers[sort_key]))
+
+        for header_name, header_value in self.headers.items():
+            if header_name not in sort_keys:
+                if header_value:
+                    lines.append('%s: %s' % (header_name, header_value))
+
+        lines.append('\r\n')
+        return '\r\n'.join(lines)
+
+    def make_multipart(self, content_disposition=None, content_type=None,
+                       content_location=None):
+        """
+        Makes this request field into a multipart request field.
+
+        This method overrides "Content-Disposition", "Content-Type" and
+        "Content-Location" headers to the request parameter.
+
+        :param content_type:
+            The 'Content-Type' of the request body.
+        :param content_location:
+            The 'Content-Location' of the request body.
+
+        """
+        self.headers['Content-Disposition'] = content_disposition or 'form-data'
+        self.headers['Content-Disposition'] += '; '.join([
+            '', self._render_parts(
+                (('name', self._name), ('filename', self._filename))
+            )
+        ])
+        self.headers['Content-Type'] = content_type
+        self.headers['Content-Location'] = content_location
diff --git a/lib/urllib3/filepost.py b/lib/requests/packages/urllib3/filepost.py
similarity index 77%
rename from lib/urllib3/filepost.py
rename to lib/requests/packages/urllib3/filepost.py
index 36c9252c..0fbf488d 100644
--- a/lib/urllib3/filepost.py
+++ b/lib/requests/packages/urllib3/filepost.py
@@ -1,25 +1,20 @@
-from __future__ import absolute_import
-
-import binascii
 import codecs
-import os
+
+from uuid import uuid4
 from io import BytesIO
 
-from .fields import RequestField
 from .packages import six
 from .packages.six import b
+from .fields import RequestField
 
-writer = codecs.lookup("utf-8")[3]
+writer = codecs.lookup('utf-8')[3]
 
 
 def choose_boundary():
     """
-    Our embarrassingly-simple replacement for mimetools.choose_boundary.
+    Our embarassingly-simple replacement for mimetools.choose_boundary.
     """
-    boundary = binascii.hexlify(os.urandom(16))
-    if not six.PY2:
-        boundary = boundary.decode("ascii")
-    return boundary
+    return uuid4().hex
 
 
 def iter_field_objects(fields):
@@ -69,14 +64,14 @@ def encode_multipart_formdata(fields, boundary=None):
 
     :param boundary:
         If not specified, then a random boundary will be generated using
-        :func:`urllib3.filepost.choose_boundary`.
+        :func:`mimetools.choose_boundary`.
     """
     body = BytesIO()
     if boundary is None:
         boundary = choose_boundary()
 
     for field in iter_field_objects(fields):
-        body.write(b("--%s\r\n" % (boundary)))
+        body.write(b('--%s\r\n' % (boundary)))
 
         writer(body).write(field.render_headers())
         data = field.data
@@ -89,10 +84,10 @@ def encode_multipart_formdata(fields, boundary=None):
         else:
             body.write(data)
 
-        body.write(b"\r\n")
+        body.write(b'\r\n')
 
-    body.write(b("--%s--\r\n" % (boundary)))
+    body.write(b('--%s--\r\n' % (boundary)))
 
-    content_type = str("multipart/form-data; boundary=%s" % boundary)
+    content_type = str('multipart/form-data; boundary=%s' % boundary)
 
     return body.getvalue(), content_type
diff --git a/lib/requests/packages/urllib3/packages/__init__.py b/lib/requests/packages/urllib3/packages/__init__.py
new file mode 100644
index 00000000..37e83515
--- /dev/null
+++ b/lib/requests/packages/urllib3/packages/__init__.py
@@ -0,0 +1,4 @@
+from __future__ import absolute_import
+
+from . import ssl_match_hostname
+
diff --git a/lib/requests/packages/urllib3/packages/ordered_dict.py b/lib/requests/packages/urllib3/packages/ordered_dict.py
new file mode 100644
index 00000000..4479363c
--- /dev/null
+++ b/lib/requests/packages/urllib3/packages/ordered_dict.py
@@ -0,0 +1,259 @@
+# Backport of OrderedDict() class that runs on Python 2.4, 2.5, 2.6, 2.7 and pypy.
+# Passes Python2.7's test suite and incorporates all the latest updates.
+# Copyright 2009 Raymond Hettinger, released under the MIT License.
+# http://code.activestate.com/recipes/576693/
+try:
+    from thread import get_ident as _get_ident
+except ImportError:
+    from dummy_thread import get_ident as _get_ident
+
+try:
+    from _abcoll import KeysView, ValuesView, ItemsView
+except ImportError:
+    pass
+
+
+class OrderedDict(dict):
+    'Dictionary that remembers insertion order'
+    # An inherited dict maps keys to values.
+    # The inherited dict provides __getitem__, __len__, __contains__, and get.
+    # The remaining methods are order-aware.
+    # Big-O running times for all methods are the same as for regular dictionaries.
+
+    # The internal self.__map dictionary maps keys to links in a doubly linked list.
+    # The circular doubly linked list starts and ends with a sentinel element.
+    # The sentinel element never gets deleted (this simplifies the algorithm).
+    # Each link is stored as a list of length three:  [PREV, NEXT, KEY].
+
+    def __init__(self, *args, **kwds):
+        '''Initialize an ordered dictionary.  Signature is the same as for
+        regular dictionaries, but keyword arguments are not recommended
+        because their insertion order is arbitrary.
+
+        '''
+        if len(args) > 1:
+            raise TypeError('expected at most 1 arguments, got %d' % len(args))
+        try:
+            self.__root
+        except AttributeError:
+            self.__root = root = []                     # sentinel node
+            root[:] = [root, root, None]
+            self.__map = {}
+        self.__update(*args, **kwds)
+
+    def __setitem__(self, key, value, dict_setitem=dict.__setitem__):
+        'od.__setitem__(i, y) <==> od[i]=y'
+        # Setting a new item creates a new link which goes at the end of the linked
+        # list, and the inherited dictionary is updated with the new key/value pair.
+        if key not in self:
+            root = self.__root
+            last = root[0]
+            last[1] = root[0] = self.__map[key] = [last, root, key]
+        dict_setitem(self, key, value)
+
+    def __delitem__(self, key, dict_delitem=dict.__delitem__):
+        'od.__delitem__(y) <==> del od[y]'
+        # Deleting an existing item uses self.__map to find the link which is
+        # then removed by updating the links in the predecessor and successor nodes.
+        dict_delitem(self, key)
+        link_prev, link_next, key = self.__map.pop(key)
+        link_prev[1] = link_next
+        link_next[0] = link_prev
+
+    def __iter__(self):
+        'od.__iter__() <==> iter(od)'
+        root = self.__root
+        curr = root[1]
+        while curr is not root:
+            yield curr[2]
+            curr = curr[1]
+
+    def __reversed__(self):
+        'od.__reversed__() <==> reversed(od)'
+        root = self.__root
+        curr = root[0]
+        while curr is not root:
+            yield curr[2]
+            curr = curr[0]
+
+    def clear(self):
+        'od.clear() -> None.  Remove all items from od.'
+        try:
+            for node in self.__map.itervalues():
+                del node[:]
+            root = self.__root
+            root[:] = [root, root, None]
+            self.__map.clear()
+        except AttributeError:
+            pass
+        dict.clear(self)
+
+    def popitem(self, last=True):
+        '''od.popitem() -> (k, v), return and remove a (key, value) pair.
+        Pairs are returned in LIFO order if last is true or FIFO order if false.
+
+        '''
+        if not self:
+            raise KeyError('dictionary is empty')
+        root = self.__root
+        if last:
+            link = root[0]
+            link_prev = link[0]
+            link_prev[1] = root
+            root[0] = link_prev
+        else:
+            link = root[1]
+            link_next = link[1]
+            root[1] = link_next
+            link_next[0] = root
+        key = link[2]
+        del self.__map[key]
+        value = dict.pop(self, key)
+        return key, value
+
+    # -- the following methods do not depend on the internal structure --
+
+    def keys(self):
+        'od.keys() -> list of keys in od'
+        return list(self)
+
+    def values(self):
+        'od.values() -> list of values in od'
+        return [self[key] for key in self]
+
+    def items(self):
+        'od.items() -> list of (key, value) pairs in od'
+        return [(key, self[key]) for key in self]
+
+    def iterkeys(self):
+        'od.iterkeys() -> an iterator over the keys in od'
+        return iter(self)
+
+    def itervalues(self):
+        'od.itervalues -> an iterator over the values in od'
+        for k in self:
+            yield self[k]
+
+    def iteritems(self):
+        'od.iteritems -> an iterator over the (key, value) items in od'
+        for k in self:
+            yield (k, self[k])
+
+    def update(*args, **kwds):
+        '''od.update(E, **F) -> None.  Update od from dict/iterable E and F.
+
+        If E is a dict instance, does:           for k in E: od[k] = E[k]
+        If E has a .keys() method, does:         for k in E.keys(): od[k] = E[k]
+        Or if E is an iterable of items, does:   for k, v in E: od[k] = v
+        In either case, this is followed by:     for k, v in F.items(): od[k] = v
+
+        '''
+        if len(args) > 2:
+            raise TypeError('update() takes at most 2 positional '
+                            'arguments (%d given)' % (len(args),))
+        elif not args:
+            raise TypeError('update() takes at least 1 argument (0 given)')
+        self = args[0]
+        # Make progressively weaker assumptions about "other"
+        other = ()
+        if len(args) == 2:
+            other = args[1]
+        if isinstance(other, dict):
+            for key in other:
+                self[key] = other[key]
+        elif hasattr(other, 'keys'):
+            for key in other.keys():
+                self[key] = other[key]
+        else:
+            for key, value in other:
+                self[key] = value
+        for key, value in kwds.items():
+            self[key] = value
+
+    __update = update  # let subclasses override update without breaking __init__
+
+    __marker = object()
+
+    def pop(self, key, default=__marker):
+        '''od.pop(k[,d]) -> v, remove specified key and return the corresponding value.
+        If key is not found, d is returned if given, otherwise KeyError is raised.
+
+        '''
+        if key in self:
+            result = self[key]
+            del self[key]
+            return result
+        if default is self.__marker:
+            raise KeyError(key)
+        return default
+
+    def setdefault(self, key, default=None):
+        'od.setdefault(k[,d]) -> od.get(k,d), also set od[k]=d if k not in od'
+        if key in self:
+            return self[key]
+        self[key] = default
+        return default
+
+    def __repr__(self, _repr_running={}):
+        'od.__repr__() <==> repr(od)'
+        call_key = id(self), _get_ident()
+        if call_key in _repr_running:
+            return '...'
+        _repr_running[call_key] = 1
+        try:
+            if not self:
+                return '%s()' % (self.__class__.__name__,)
+            return '%s(%r)' % (self.__class__.__name__, self.items())
+        finally:
+            del _repr_running[call_key]
+
+    def __reduce__(self):
+        'Return state information for pickling'
+        items = [[k, self[k]] for k in self]
+        inst_dict = vars(self).copy()
+        for k in vars(OrderedDict()):
+            inst_dict.pop(k, None)
+        if inst_dict:
+            return (self.__class__, (items,), inst_dict)
+        return self.__class__, (items,)
+
+    def copy(self):
+        'od.copy() -> a shallow copy of od'
+        return self.__class__(self)
+
+    @classmethod
+    def fromkeys(cls, iterable, value=None):
+        '''OD.fromkeys(S[, v]) -> New ordered dictionary with keys from S
+        and values equal to v (which defaults to None).
+
+        '''
+        d = cls()
+        for key in iterable:
+            d[key] = value
+        return d
+
+    def __eq__(self, other):
+        '''od.__eq__(y) <==> od==y.  Comparison to another OD is order-sensitive
+        while comparison to a regular mapping is order-insensitive.
+
+        '''
+        if isinstance(other, OrderedDict):
+            return len(self)==len(other) and self.items() == other.items()
+        return dict.__eq__(self, other)
+
+    def __ne__(self, other):
+        return not self == other
+
+    # -- the following methods are only used in Python 2.7 --
+
+    def viewkeys(self):
+        "od.viewkeys() -> a set-like object providing a view on od's keys"
+        return KeysView(self)
+
+    def viewvalues(self):
+        "od.viewvalues() -> an object providing a view on od's values"
+        return ValuesView(self)
+
+    def viewitems(self):
+        "od.viewitems() -> a set-like object providing a view on od's items"
+        return ItemsView(self)
diff --git a/lib/requests/packages/urllib3/packages/six.py b/lib/requests/packages/urllib3/packages/six.py
new file mode 100644
index 00000000..27d80112
--- /dev/null
+++ b/lib/requests/packages/urllib3/packages/six.py
@@ -0,0 +1,385 @@
+"""Utilities for writing code that runs on Python 2 and 3"""
+
+#Copyright (c) 2010-2011 Benjamin Peterson
+
+#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.
+
+import operator
+import sys
+import types
+
+__author__ = "Benjamin Peterson <benjamin@python.org>"
+__version__ = "1.2.0"  # Revision 41c74fef2ded
+
+
+# True if we are running on Python 3.
+PY3 = sys.version_info[0] == 3
+
+if PY3:
+    string_types = str,
+    integer_types = int,
+    class_types = type,
+    text_type = str
+    binary_type = bytes
+
+    MAXSIZE = sys.maxsize
+else:
+    string_types = basestring,
+    integer_types = (int, long)
+    class_types = (type, types.ClassType)
+    text_type = unicode
+    binary_type = str
+
+    if sys.platform.startswith("java"):
+        # Jython always uses 32 bits.
+        MAXSIZE = int((1 << 31) - 1)
+    else:
+        # It's possible to have sizeof(long) != sizeof(Py_ssize_t).
+        class X(object):
+            def __len__(self):
+                return 1 << 31
+        try:
+            len(X())
+        except OverflowError:
+            # 32-bit
+            MAXSIZE = int((1 << 31) - 1)
+        else:
+            # 64-bit
+            MAXSIZE = int((1 << 63) - 1)
+            del X
+
+
+def _add_doc(func, doc):
+    """Add documentation to a function."""
+    func.__doc__ = doc
+
+
+def _import_module(name):
+    """Import module, returning the module after the last dot."""
+    __import__(name)
+    return sys.modules[name]
+
+
+class _LazyDescr(object):
+
+    def __init__(self, name):
+        self.name = name
+
+    def __get__(self, obj, tp):
+        result = self._resolve()
+        setattr(obj, self.name, result)
+        # This is a bit ugly, but it avoids running this again.
+        delattr(tp, self.name)
+        return result
+
+
+class MovedModule(_LazyDescr):
+
+    def __init__(self, name, old, new=None):
+        super(MovedModule, self).__init__(name)
+        if PY3:
+            if new is None:
+                new = name
+            self.mod = new
+        else:
+            self.mod = old
+
+    def _resolve(self):
+        return _import_module(self.mod)
+
+
+class MovedAttribute(_LazyDescr):
+
+    def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None):
+        super(MovedAttribute, self).__init__(name)
+        if PY3:
+            if new_mod is None:
+                new_mod = name
+            self.mod = new_mod
+            if new_attr is None:
+                if old_attr is None:
+                    new_attr = name
+                else:
+                    new_attr = old_attr
+            self.attr = new_attr
+        else:
+            self.mod = old_mod
+            if old_attr is None:
+                old_attr = name
+            self.attr = old_attr
+
+    def _resolve(self):
+        module = _import_module(self.mod)
+        return getattr(module, self.attr)
+
+
+
+class _MovedItems(types.ModuleType):
+    """Lazy loading of moved objects"""
+
+
+_moved_attributes = [
+    MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"),
+    MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"),
+    MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
+    MovedAttribute("map", "itertools", "builtins", "imap", "map"),
+    MovedAttribute("reload_module", "__builtin__", "imp", "reload"),
+    MovedAttribute("reduce", "__builtin__", "functools"),
+    MovedAttribute("StringIO", "StringIO", "io"),
+    MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
+    MovedAttribute("zip", "itertools", "builtins", "izip", "zip"),
+
+    MovedModule("builtins", "__builtin__"),
+    MovedModule("configparser", "ConfigParser"),
+    MovedModule("copyreg", "copy_reg"),
+    MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
+    MovedModule("http_cookies", "Cookie", "http.cookies"),
+    MovedModule("html_entities", "htmlentitydefs", "html.entities"),
+    MovedModule("html_parser", "HTMLParser", "html.parser"),
+    MovedModule("http_client", "httplib", "http.client"),
+    MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),
+    MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
+    MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),
+    MovedModule("cPickle", "cPickle", "pickle"),
+    MovedModule("queue", "Queue"),
+    MovedModule("reprlib", "repr"),
+    MovedModule("socketserver", "SocketServer"),
+    MovedModule("tkinter", "Tkinter"),
+    MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"),
+    MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"),
+    MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"),
+    MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"),
+    MovedModule("tkinter_tix", "Tix", "tkinter.tix"),
+    MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"),
+    MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"),
+    MovedModule("tkinter_colorchooser", "tkColorChooser",
+                "tkinter.colorchooser"),
+    MovedModule("tkinter_commondialog", "tkCommonDialog",
+                "tkinter.commondialog"),
+    MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"),
+    MovedModule("tkinter_font", "tkFont", "tkinter.font"),
+    MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"),
+    MovedModule("tkinter_tksimpledialog", "tkSimpleDialog",
+                "tkinter.simpledialog"),
+    MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
+    MovedModule("winreg", "_winreg"),
+]
+for attr in _moved_attributes:
+    setattr(_MovedItems, attr.name, attr)
+del attr
+
+moves = sys.modules[__name__ + ".moves"] = _MovedItems("moves")
+
+
+def add_move(move):
+    """Add an item to six.moves."""
+    setattr(_MovedItems, move.name, move)
+
+
+def remove_move(name):
+    """Remove item from six.moves."""
+    try:
+        delattr(_MovedItems, name)
+    except AttributeError:
+        try:
+            del moves.__dict__[name]
+        except KeyError:
+            raise AttributeError("no such move, %r" % (name,))
+
+
+if PY3:
+    _meth_func = "__func__"
+    _meth_self = "__self__"
+
+    _func_code = "__code__"
+    _func_defaults = "__defaults__"
+
+    _iterkeys = "keys"
+    _itervalues = "values"
+    _iteritems = "items"
+else:
+    _meth_func = "im_func"
+    _meth_self = "im_self"
+
+    _func_code = "func_code"
+    _func_defaults = "func_defaults"
+
+    _iterkeys = "iterkeys"
+    _itervalues = "itervalues"
+    _iteritems = "iteritems"
+
+
+try:
+    advance_iterator = next
+except NameError:
+    def advance_iterator(it):
+        return it.next()
+next = advance_iterator
+
+
+if PY3:
+    def get_unbound_function(unbound):
+        return unbound
+
+    Iterator = object
+
+    def callable(obj):
+        return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
+else:
+    def get_unbound_function(unbound):
+        return unbound.im_func
+
+    class Iterator(object):
+
+        def next(self):
+            return type(self).__next__(self)
+
+    callable = callable
+_add_doc(get_unbound_function,
+         """Get the function out of a possibly unbound function""")
+
+
+get_method_function = operator.attrgetter(_meth_func)
+get_method_self = operator.attrgetter(_meth_self)
+get_function_code = operator.attrgetter(_func_code)
+get_function_defaults = operator.attrgetter(_func_defaults)
+
+
+def iterkeys(d):
+    """Return an iterator over the keys of a dictionary."""
+    return iter(getattr(d, _iterkeys)())
+
+def itervalues(d):
+    """Return an iterator over the values of a dictionary."""
+    return iter(getattr(d, _itervalues)())
+
+def iteritems(d):
+    """Return an iterator over the (key, value) pairs of a dictionary."""
+    return iter(getattr(d, _iteritems)())
+
+
+if PY3:
+    def b(s):
+        return s.encode("latin-1")
+    def u(s):
+        return s
+    if sys.version_info[1] <= 1:
+        def int2byte(i):
+            return bytes((i,))
+    else:
+        # This is about 2x faster than the implementation above on 3.2+
+        int2byte = operator.methodcaller("to_bytes", 1, "big")
+    import io
+    StringIO = io.StringIO
+    BytesIO = io.BytesIO
+else:
+    def b(s):
+        return s
+    def u(s):
+        return unicode(s, "unicode_escape")
+    int2byte = chr
+    import StringIO
+    StringIO = BytesIO = StringIO.StringIO
+_add_doc(b, """Byte literal""")
+_add_doc(u, """Text literal""")
+
+
+if PY3:
+    import builtins
+    exec_ = getattr(builtins, "exec")
+
+
+    def reraise(tp, value, tb=None):
+        if value.__traceback__ is not tb:
+            raise value.with_traceback(tb)
+        raise value
+
+
+    print_ = getattr(builtins, "print")
+    del builtins
+
+else:
+    def exec_(code, globs=None, locs=None):
+        """Execute code in a namespace."""
+        if globs is None:
+            frame = sys._getframe(1)
+            globs = frame.f_globals
+            if locs is None:
+                locs = frame.f_locals
+            del frame
+        elif locs is None:
+            locs = globs
+        exec("""exec code in globs, locs""")
+
+
+    exec_("""def reraise(tp, value, tb=None):
+    raise tp, value, tb
+""")
+
+
+    def print_(*args, **kwargs):
+        """The new-style print function."""
+        fp = kwargs.pop("file", sys.stdout)
+        if fp is None:
+            return
+        def write(data):
+            if not isinstance(data, basestring):
+                data = str(data)
+            fp.write(data)
+        want_unicode = False
+        sep = kwargs.pop("sep", None)
+        if sep is not None:
+            if isinstance(sep, unicode):
+                want_unicode = True
+            elif not isinstance(sep, str):
+                raise TypeError("sep must be None or a string")
+        end = kwargs.pop("end", None)
+        if end is not None:
+            if isinstance(end, unicode):
+                want_unicode = True
+            elif not isinstance(end, str):
+                raise TypeError("end must be None or a string")
+        if kwargs:
+            raise TypeError("invalid keyword arguments to print()")
+        if not want_unicode:
+            for arg in args:
+                if isinstance(arg, unicode):
+                    want_unicode = True
+                    break
+        if want_unicode:
+            newline = unicode("\n")
+            space = unicode(" ")
+        else:
+            newline = "\n"
+            space = " "
+        if sep is None:
+            sep = space
+        if end is None:
+            end = newline
+        for i, arg in enumerate(args):
+            if i:
+                write(sep)
+            write(arg)
+        write(end)
+
+_add_doc(reraise, """Reraise an exception.""")
+
+
+def with_metaclass(meta, base=object):
+    """Create a base class with a metaclass."""
+    return meta("NewBase", (base,), {})
diff --git a/lib/requests/packages/urllib3/packages/ssl_match_hostname/__init__.py b/lib/requests/packages/urllib3/packages/ssl_match_hostname/__init__.py
new file mode 100644
index 00000000..dd59a75f
--- /dev/null
+++ b/lib/requests/packages/urllib3/packages/ssl_match_hostname/__init__.py
@@ -0,0 +1,13 @@
+try:
+    # Python 3.2+
+    from ssl import CertificateError, match_hostname
+except ImportError:
+    try:
+        # Backport of the function from a pypi module
+        from backports.ssl_match_hostname import CertificateError, match_hostname
+    except ImportError:
+        # Our vendored copy
+        from ._implementation import CertificateError, match_hostname
+
+# Not needed, but documenting what we provide.
+__all__ = ('CertificateError', 'match_hostname')
diff --git a/lib/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.py b/lib/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.py
new file mode 100644
index 00000000..52f42873
--- /dev/null
+++ b/lib/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.py
@@ -0,0 +1,105 @@
+"""The match_hostname() function from Python 3.3.3, essential when using SSL."""
+
+# Note: This file is under the PSF license as the code comes from the python
+# stdlib.   http://docs.python.org/3/license.html
+
+import re
+
+__version__ = '3.4.0.2'
+
+class CertificateError(ValueError):
+    pass
+
+
+def _dnsname_match(dn, hostname, max_wildcards=1):
+    """Matching according to RFC 6125, section 6.4.3
+
+    http://tools.ietf.org/html/rfc6125#section-6.4.3
+    """
+    pats = []
+    if not dn:
+        return False
+
+    # Ported from python3-syntax:
+    # leftmost, *remainder = dn.split(r'.')
+    parts = dn.split(r'.')
+    leftmost = parts[0]
+    remainder = parts[1:]
+
+    wildcards = leftmost.count('*')
+    if wildcards > max_wildcards:
+        # Issue #17980: avoid denials of service by refusing more
+        # than one wildcard per fragment.  A survey of established
+        # policy among SSL implementations showed it to be a
+        # reasonable choice.
+        raise CertificateError(
+            "too many wildcards in certificate DNS name: " + repr(dn))
+
+    # speed up common case w/o wildcards
+    if not wildcards:
+        return dn.lower() == hostname.lower()
+
+    # RFC 6125, section 6.4.3, subitem 1.
+    # The client SHOULD NOT attempt to match a presented identifier in which
+    # the wildcard character comprises a label other than the left-most label.
+    if leftmost == '*':
+        # When '*' is a fragment by itself, it matches a non-empty dotless
+        # fragment.
+        pats.append('[^.]+')
+    elif leftmost.startswith('xn--') or hostname.startswith('xn--'):
+        # RFC 6125, section 6.4.3, subitem 3.
+        # The client SHOULD NOT attempt to match a presented identifier
+        # where the wildcard character is embedded within an A-label or
+        # U-label of an internationalized domain name.
+        pats.append(re.escape(leftmost))
+    else:
+        # Otherwise, '*' matches any dotless string, e.g. www*
+        pats.append(re.escape(leftmost).replace(r'\*', '[^.]*'))
+
+    # add the remaining fragments, ignore any wildcards
+    for frag in remainder:
+        pats.append(re.escape(frag))
+
+    pat = re.compile(r'\A' + r'\.'.join(pats) + r'\Z', re.IGNORECASE)
+    return pat.match(hostname)
+
+
+def match_hostname(cert, hostname):
+    """Verify that *cert* (in decoded format as returned by
+    SSLSocket.getpeercert()) matches the *hostname*.  RFC 2818 and RFC 6125
+    rules are followed, but IP addresses are not accepted for *hostname*.
+
+    CertificateError is raised on failure. On success, the function
+    returns nothing.
+    """
+    if not cert:
+        raise ValueError("empty or no certificate")
+    dnsnames = []
+    san = cert.get('subjectAltName', ())
+    for key, value in san:
+        if key == 'DNS':
+            if _dnsname_match(value, hostname):
+                return
+            dnsnames.append(value)
+    if not dnsnames:
+        # The subject is only checked when there is no dNSName entry
+        # in subjectAltName
+        for sub in cert.get('subject', ()):
+            for key, value in sub:
+                # XXX according to RFC 2818, the most specific Common Name
+                # must be used.
+                if key == 'commonName':
+                    if _dnsname_match(value, hostname):
+                        return
+                    dnsnames.append(value)
+    if len(dnsnames) > 1:
+        raise CertificateError("hostname %r "
+            "doesn't match either of %s"
+            % (hostname, ', '.join(map(repr, dnsnames))))
+    elif len(dnsnames) == 1:
+        raise CertificateError("hostname %r "
+            "doesn't match %r"
+            % (hostname, dnsnames[0]))
+    else:
+        raise CertificateError("no appropriate commonName or "
+            "subjectAltName fields were found")
diff --git a/lib/requests/packages/urllib3/poolmanager.py b/lib/requests/packages/urllib3/poolmanager.py
new file mode 100644
index 00000000..515dc962
--- /dev/null
+++ b/lib/requests/packages/urllib3/poolmanager.py
@@ -0,0 +1,265 @@
+import logging
+
+try:  # Python 3
+    from urllib.parse import urljoin
+except ImportError:
+    from urlparse import urljoin
+
+from ._collections import RecentlyUsedContainer
+from .connectionpool import HTTPConnectionPool, HTTPSConnectionPool
+from .connectionpool import port_by_scheme
+from .exceptions import LocationValueError
+from .request import RequestMethods
+from .util.url import parse_url
+from .util.retry import Retry
+
+
+__all__ = ['PoolManager', 'ProxyManager', 'proxy_from_url']
+
+
+pool_classes_by_scheme = {
+    'http': HTTPConnectionPool,
+    'https': HTTPSConnectionPool,
+}
+
+log = logging.getLogger(__name__)
+
+SSL_KEYWORDS = ('key_file', 'cert_file', 'cert_reqs', 'ca_certs',
+                'ssl_version')
+
+
+class PoolManager(RequestMethods):
+    """
+    Allows for arbitrary requests while transparently keeping track of
+    necessary connection pools for you.
+
+    :param num_pools:
+        Number of connection pools to cache before discarding the least
+        recently used pool.
+
+    :param headers:
+        Headers to include with all requests, unless other headers are given
+        explicitly.
+
+    :param \**connection_pool_kw:
+        Additional parameters are used to create fresh
+        :class:`urllib3.connectionpool.ConnectionPool` instances.
+
+    Example::
+
+        >>> manager = PoolManager(num_pools=2)
+        >>> r = manager.request('GET', 'http://google.com/')
+        >>> r = manager.request('GET', 'http://google.com/mail')
+        >>> r = manager.request('GET', 'http://yahoo.com/')
+        >>> len(manager.pools)
+        2
+
+    """
+
+    proxy = None
+
+    def __init__(self, num_pools=10, headers=None, **connection_pool_kw):
+        RequestMethods.__init__(self, headers)
+        self.connection_pool_kw = connection_pool_kw
+        self.pools = RecentlyUsedContainer(num_pools,
+                                           dispose_func=lambda p: p.close())
+
+    def _new_pool(self, scheme, host, port):
+        """
+        Create a new :class:`ConnectionPool` based on host, port and scheme.
+
+        This method is used to actually create the connection pools handed out
+        by :meth:`connection_from_url` and companion methods. It is intended
+        to be overridden for customization.
+        """
+        pool_cls = pool_classes_by_scheme[scheme]
+        kwargs = self.connection_pool_kw
+        if scheme == 'http':
+            kwargs = self.connection_pool_kw.copy()
+            for kw in SSL_KEYWORDS:
+                kwargs.pop(kw, None)
+
+        return pool_cls(host, port, **kwargs)
+
+    def clear(self):
+        """
+        Empty our store of pools and direct them all to close.
+
+        This will not affect in-flight connections, but they will not be
+        re-used after completion.
+        """
+        self.pools.clear()
+
+    def connection_from_host(self, host, port=None, scheme='http'):
+        """
+        Get a :class:`ConnectionPool` based on the host, port, and scheme.
+
+        If ``port`` isn't given, it will be derived from the ``scheme`` using
+        ``urllib3.connectionpool.port_by_scheme``.
+        """
+
+        if not host:
+            raise LocationValueError("No host specified.")
+
+        scheme = scheme or 'http'
+        port = port or port_by_scheme.get(scheme, 80)
+        pool_key = (scheme, host, port)
+
+        with self.pools.lock:
+            # If the scheme, host, or port doesn't match existing open
+            # connections, open a new ConnectionPool.
+            pool = self.pools.get(pool_key)
+            if pool:
+                return pool
+
+            # Make a fresh ConnectionPool of the desired type
+            pool = self._new_pool(scheme, host, port)
+            self.pools[pool_key] = pool
+
+        return pool
+
+    def connection_from_url(self, url):
+        """
+        Similar to :func:`urllib3.connectionpool.connection_from_url` but
+        doesn't pass any additional parameters to the
+        :class:`urllib3.connectionpool.ConnectionPool` constructor.
+
+        Additional parameters are taken from the :class:`.PoolManager`
+        constructor.
+        """
+        u = parse_url(url)
+        return self.connection_from_host(u.host, port=u.port, scheme=u.scheme)
+
+    def urlopen(self, method, url, redirect=True, **kw):
+        """
+        Same as :meth:`urllib3.connectionpool.HTTPConnectionPool.urlopen`
+        with custom cross-host redirect logic and only sends the request-uri
+        portion of the ``url``.
+
+        The given ``url`` parameter must be absolute, such that an appropriate
+        :class:`urllib3.connectionpool.ConnectionPool` can be chosen for it.
+        """
+        u = parse_url(url)
+        conn = self.connection_from_host(u.host, port=u.port, scheme=u.scheme)
+
+        kw['assert_same_host'] = False
+        kw['redirect'] = False
+        if 'headers' not in kw:
+            kw['headers'] = self.headers
+
+        if self.proxy is not None and u.scheme == "http":
+            response = conn.urlopen(method, url, **kw)
+        else:
+            response = conn.urlopen(method, u.request_uri, **kw)
+
+        redirect_location = redirect and response.get_redirect_location()
+        if not redirect_location:
+            return response
+
+        # Support relative URLs for redirecting.
+        redirect_location = urljoin(url, redirect_location)
+
+        # RFC 7231, Section 6.4.4
+        if response.status == 303:
+            method = 'GET'
+
+        retries = kw.get('retries')
+        if not isinstance(retries, Retry):
+            retries = Retry.from_int(retries, redirect=redirect)
+
+        kw['retries'] = retries.increment(method, redirect_location)
+        kw['redirect'] = redirect
+
+        log.info("Redirecting %s -> %s" % (url, redirect_location))
+        return self.urlopen(method, redirect_location, **kw)
+
+
+class ProxyManager(PoolManager):
+    """
+    Behaves just like :class:`PoolManager`, but sends all requests through
+    the defined proxy, using the CONNECT method for HTTPS URLs.
+
+    :param proxy_url:
+        The URL of the proxy to be used.
+
+    :param proxy_headers:
+        A dictionary contaning headers that will be sent to the proxy. In case
+        of HTTP they are being sent with each request, while in the
+        HTTPS/CONNECT case they are sent only once. Could be used for proxy
+        authentication.
+
+    Example:
+        >>> proxy = urllib3.ProxyManager('http://localhost:3128/')
+        >>> r1 = proxy.request('GET', 'http://google.com/')
+        >>> r2 = proxy.request('GET', 'http://httpbin.org/')
+        >>> len(proxy.pools)
+        1
+        >>> r3 = proxy.request('GET', 'https://httpbin.org/')
+        >>> r4 = proxy.request('GET', 'https://twitter.com/')
+        >>> len(proxy.pools)
+        3
+
+    """
+
+    def __init__(self, proxy_url, num_pools=10, headers=None,
+                 proxy_headers=None, **connection_pool_kw):
+
+        if isinstance(proxy_url, HTTPConnectionPool):
+            proxy_url = '%s://%s:%i' % (proxy_url.scheme, proxy_url.host,
+                                        proxy_url.port)
+        proxy = parse_url(proxy_url)
+        if not proxy.port:
+            port = port_by_scheme.get(proxy.scheme, 80)
+            proxy = proxy._replace(port=port)
+
+        assert proxy.scheme in ("http", "https"), \
+            'Not supported proxy scheme %s' % proxy.scheme
+
+        self.proxy = proxy
+        self.proxy_headers = proxy_headers or {}
+
+        connection_pool_kw['_proxy'] = self.proxy
+        connection_pool_kw['_proxy_headers'] = self.proxy_headers
+
+        super(ProxyManager, self).__init__(
+            num_pools, headers, **connection_pool_kw)
+
+    def connection_from_host(self, host, port=None, scheme='http'):
+        if scheme == "https":
+            return super(ProxyManager, self).connection_from_host(
+                host, port, scheme)
+
+        return super(ProxyManager, self).connection_from_host(
+            self.proxy.host, self.proxy.port, self.proxy.scheme)
+
+    def _set_proxy_headers(self, url, headers=None):
+        """
+        Sets headers needed by proxies: specifically, the Accept and Host
+        headers. Only sets headers not provided by the user.
+        """
+        headers_ = {'Accept': '*/*'}
+
+        netloc = parse_url(url).netloc
+        if netloc:
+            headers_['Host'] = netloc
+
+        if headers:
+            headers_.update(headers)
+        return headers_
+
+    def urlopen(self, method, url, redirect=True, **kw):
+        "Same as HTTP(S)ConnectionPool.urlopen, ``url`` must be absolute."
+        u = parse_url(url)
+
+        if u.scheme == "http":
+            # For proxied HTTPS requests, httplib sets the necessary headers
+            # on the CONNECT to the proxy. For HTTP, we'll definitely
+            # need to set 'Host' at the very least.
+            headers = kw.get('headers', self.headers)
+            kw['headers'] = self._set_proxy_headers(url, headers)
+
+        return super(ProxyManager, self).urlopen(method, url, redirect=redirect, **kw)
+
+
+def proxy_from_url(url, **kw):
+    return ProxyManager(proxy_url=url, **kw)
diff --git a/lib/requests/packages/urllib3/request.py b/lib/requests/packages/urllib3/request.py
new file mode 100644
index 00000000..b08d6c92
--- /dev/null
+++ b/lib/requests/packages/urllib3/request.py
@@ -0,0 +1,141 @@
+try:
+    from urllib.parse import urlencode
+except ImportError:
+    from urllib import urlencode
+
+from .filepost import encode_multipart_formdata
+
+
+__all__ = ['RequestMethods']
+
+
+class RequestMethods(object):
+    """
+    Convenience mixin for classes who implement a :meth:`urlopen` method, such
+    as :class:`~urllib3.connectionpool.HTTPConnectionPool` and
+    :class:`~urllib3.poolmanager.PoolManager`.
+
+    Provides behavior for making common types of HTTP request methods and
+    decides which type of request field encoding to use.
+
+    Specifically,
+
+    :meth:`.request_encode_url` is for sending requests whose fields are
+    encoded in the URL (such as GET, HEAD, DELETE).
+
+    :meth:`.request_encode_body` is for sending requests whose fields are
+    encoded in the *body* of the request using multipart or www-form-urlencoded
+    (such as for POST, PUT, PATCH).
+
+    :meth:`.request` is for making any kind of request, it will look up the
+    appropriate encoding format and use one of the above two methods to make
+    the request.
+
+    Initializer parameters:
+
+    :param headers:
+        Headers to include with all requests, unless other headers are given
+        explicitly.
+    """
+
+    _encode_url_methods = set(['DELETE', 'GET', 'HEAD', 'OPTIONS'])
+
+    def __init__(self, headers=None):
+        self.headers = headers or {}
+
+    def urlopen(self, method, url, body=None, headers=None,
+                encode_multipart=True, multipart_boundary=None,
+                **kw):  # Abstract
+        raise NotImplemented("Classes extending RequestMethods must implement "
+                             "their own ``urlopen`` method.")
+
+    def request(self, method, url, fields=None, headers=None, **urlopen_kw):
+        """
+        Make a request using :meth:`urlopen` with the appropriate encoding of
+        ``fields`` based on the ``method`` used.
+
+        This is a convenience method that requires the least amount of manual
+        effort. It can be used in most situations, while still having the
+        option to drop down to more specific methods when necessary, such as
+        :meth:`request_encode_url`, :meth:`request_encode_body`,
+        or even the lowest level :meth:`urlopen`.
+        """
+        method = method.upper()
+
+        if method in self._encode_url_methods:
+            return self.request_encode_url(method, url, fields=fields,
+                                           headers=headers,
+                                           **urlopen_kw)
+        else:
+            return self.request_encode_body(method, url, fields=fields,
+                                            headers=headers,
+                                            **urlopen_kw)
+
+    def request_encode_url(self, method, url, fields=None, **urlopen_kw):
+        """
+        Make a request using :meth:`urlopen` with the ``fields`` encoded in
+        the url. This is useful for request methods like GET, HEAD, DELETE, etc.
+        """
+        if fields:
+            url += '?' + urlencode(fields)
+        return self.urlopen(method, url, **urlopen_kw)
+
+    def request_encode_body(self, method, url, fields=None, headers=None,
+                            encode_multipart=True, multipart_boundary=None,
+                            **urlopen_kw):
+        """
+        Make a request using :meth:`urlopen` with the ``fields`` encoded in
+        the body. This is useful for request methods like POST, PUT, PATCH, etc.
+
+        When ``encode_multipart=True`` (default), then
+        :meth:`urllib3.filepost.encode_multipart_formdata` is used to encode
+        the payload with the appropriate content type. Otherwise
+        :meth:`urllib.urlencode` is used with the
+        'application/x-www-form-urlencoded' content type.
+
+        Multipart encoding must be used when posting files, and it's reasonably
+        safe to use it in other times too. However, it may break request
+        signing, such as with OAuth.
+
+        Supports an optional ``fields`` parameter of key/value strings AND
+        key/filetuple. A filetuple is a (filename, data, MIME type) tuple where
+        the MIME type is optional. For example::
+
+            fields = {
+                'foo': 'bar',
+                'fakefile': ('foofile.txt', 'contents of foofile'),
+                'realfile': ('barfile.txt', open('realfile').read()),
+                'typedfile': ('bazfile.bin', open('bazfile').read(),
+                              'image/jpeg'),
+                'nonamefile': 'contents of nonamefile field',
+            }
+
+        When uploading a file, providing a filename (the first parameter of the
+        tuple) is optional but recommended to best mimick behavior of browsers.
+
+        Note that if ``headers`` are supplied, the 'Content-Type' header will
+        be overwritten because it depends on the dynamic random boundary string
+        which is used to compose the body of the request. The random boundary
+        string can be explicitly set with the ``multipart_boundary`` parameter.
+        """
+        if headers is None:
+            headers = self.headers
+
+        extra_kw = {'headers': {}}
+
+        if fields:
+            if 'body' in urlopen_kw:
+                raise TypeError('request got values for both \'fields\' and \'body\', can only specify one.')
+
+            if encode_multipart:
+                body, content_type = encode_multipart_formdata(fields, boundary=multipart_boundary)
+            else:
+                body, content_type = urlencode(fields), 'application/x-www-form-urlencoded'
+
+            extra_kw['body'] = body
+            extra_kw['headers'] = {'Content-Type': content_type}
+
+        extra_kw['headers'].update(headers)
+        extra_kw.update(urlopen_kw)
+
+        return self.urlopen(method, url, **extra_kw)
diff --git a/lib/requests/packages/urllib3/response.py b/lib/requests/packages/urllib3/response.py
new file mode 100644
index 00000000..e69de957
--- /dev/null
+++ b/lib/requests/packages/urllib3/response.py
@@ -0,0 +1,333 @@
+import zlib
+import io
+from socket import timeout as SocketTimeout
+
+from ._collections import HTTPHeaderDict
+from .exceptions import ProtocolError, DecodeError, ReadTimeoutError
+from .packages.six import string_types as basestring, binary_type
+from .connection import HTTPException, BaseSSLError
+from .util.response import is_fp_closed
+
+
+
+class DeflateDecoder(object):
+
+    def __init__(self):
+        self._first_try = True
+        self._data = binary_type()
+        self._obj = zlib.decompressobj()
+
+    def __getattr__(self, name):
+        return getattr(self._obj, name)
+
+    def decompress(self, data):
+        if not self._first_try:
+            return self._obj.decompress(data)
+
+        self._data += data
+        try:
+            return self._obj.decompress(data)
+        except zlib.error:
+            self._first_try = False
+            self._obj = zlib.decompressobj(-zlib.MAX_WBITS)
+            try:
+                return self.decompress(self._data)
+            finally:
+                self._data = None
+
+
+def _get_decoder(mode):
+    if mode == 'gzip':
+        return zlib.decompressobj(16 + zlib.MAX_WBITS)
+
+    return DeflateDecoder()
+
+
+class HTTPResponse(io.IOBase):
+    """
+    HTTP Response container.
+
+    Backwards-compatible to httplib's HTTPResponse but the response ``body`` is
+    loaded and decoded on-demand when the ``data`` property is accessed.  This
+    class is also compatible with the Python standard library's :mod:`io`
+    module, and can hence be treated as a readable object in the context of that
+    framework.
+
+    Extra parameters for behaviour not present in httplib.HTTPResponse:
+
+    :param preload_content:
+        If True, the response's body will be preloaded during construction.
+
+    :param decode_content:
+        If True, attempts to decode specific content-encoding's based on headers
+        (like 'gzip' and 'deflate') will be skipped and raw data will be used
+        instead.
+
+    :param original_response:
+        When this HTTPResponse wrapper is generated from an httplib.HTTPResponse
+        object, it's convenient to include the original for debug purposes. It's
+        otherwise unused.
+    """
+
+    CONTENT_DECODERS = ['gzip', 'deflate']
+    REDIRECT_STATUSES = [301, 302, 303, 307, 308]
+
+    def __init__(self, body='', headers=None, status=0, version=0, reason=None,
+                 strict=0, preload_content=True, decode_content=True,
+                 original_response=None, pool=None, connection=None):
+
+        self.headers = HTTPHeaderDict()
+        if headers:
+            self.headers.update(headers)
+        self.status = status
+        self.version = version
+        self.reason = reason
+        self.strict = strict
+        self.decode_content = decode_content
+
+        self._decoder = None
+        self._body = None
+        self._fp = None
+        self._original_response = original_response
+        self._fp_bytes_read = 0
+
+        if body and isinstance(body, (basestring, binary_type)):
+            self._body = body
+
+        self._pool = pool
+        self._connection = connection
+
+        if hasattr(body, 'read'):
+            self._fp = body
+
+        if preload_content and not self._body:
+            self._body = self.read(decode_content=decode_content)
+
+    def get_redirect_location(self):
+        """
+        Should we redirect and where to?
+
+        :returns: Truthy redirect location string if we got a redirect status
+            code and valid location. ``None`` if redirect status and no
+            location. ``False`` if not a redirect status code.
+        """
+        if self.status in self.REDIRECT_STATUSES:
+            return self.headers.get('location')
+
+        return False
+
+    def release_conn(self):
+        if not self._pool or not self._connection:
+            return
+
+        self._pool._put_conn(self._connection)
+        self._connection = None
+
+    @property
+    def data(self):
+        # For backwords-compat with earlier urllib3 0.4 and earlier.
+        if self._body:
+            return self._body
+
+        if self._fp:
+            return self.read(cache_content=True)
+
+    def tell(self):
+        """
+        Obtain the number of bytes pulled over the wire so far. May differ from
+        the amount of content returned by :meth:``HTTPResponse.read`` if bytes
+        are encoded on the wire (e.g, compressed).
+        """
+        return self._fp_bytes_read
+
+    def read(self, amt=None, decode_content=None, cache_content=False):
+        """
+        Similar to :meth:`httplib.HTTPResponse.read`, but with two additional
+        parameters: ``decode_content`` and ``cache_content``.
+
+        :param amt:
+            How much of the content to read. If specified, caching is skipped
+            because it doesn't make sense to cache partial content as the full
+            response.
+
+        :param decode_content:
+            If True, will attempt to decode the body based on the
+            'content-encoding' header.
+
+        :param cache_content:
+            If True, will save the returned data such that the same result is
+            returned despite of the state of the underlying file object. This
+            is useful if you want the ``.data`` property to continue working
+            after having ``.read()`` the file object. (Overridden if ``amt`` is
+            set.)
+        """
+        # Note: content-encoding value should be case-insensitive, per RFC 7230
+        # Section 3.2
+        content_encoding = self.headers.get('content-encoding', '').lower()
+        if self._decoder is None:
+            if content_encoding in self.CONTENT_DECODERS:
+                self._decoder = _get_decoder(content_encoding)
+        if decode_content is None:
+            decode_content = self.decode_content
+
+        if self._fp is None:
+            return
+
+        flush_decoder = False
+
+        try:
+            try:
+                if amt is None:
+                    # cStringIO doesn't like amt=None
+                    data = self._fp.read()
+                    flush_decoder = True
+                else:
+                    cache_content = False
+                    data = self._fp.read(amt)
+                    if amt != 0 and not data:  # Platform-specific: Buggy versions of Python.
+                        # Close the connection when no data is returned
+                        #
+                        # This is redundant to what httplib/http.client _should_
+                        # already do.  However, versions of python released before
+                        # December 15, 2012 (http://bugs.python.org/issue16298) do
+                        # not properly close the connection in all cases. There is
+                        # no harm in redundantly calling close.
+                        self._fp.close()
+                        flush_decoder = True
+
+            except SocketTimeout:
+                # FIXME: Ideally we'd like to include the url in the ReadTimeoutError but
+                # there is yet no clean way to get at it from this context.
+                raise ReadTimeoutError(self._pool, None, 'Read timed out.')
+
+            except BaseSSLError as e:
+                # FIXME: Is there a better way to differentiate between SSLErrors?
+                if not 'read operation timed out' in str(e):  # Defensive:
+                    # This shouldn't happen but just in case we're missing an edge
+                    # case, let's avoid swallowing SSL errors.
+                    raise
+
+                raise ReadTimeoutError(self._pool, None, 'Read timed out.')
+
+            except HTTPException as e:
+                # This includes IncompleteRead.
+                raise ProtocolError('Connection broken: %r' % e, e)
+
+            self._fp_bytes_read += len(data)
+
+            try:
+                if decode_content and self._decoder:
+                    data = self._decoder.decompress(data)
+            except (IOError, zlib.error) as e:
+                raise DecodeError(
+                    "Received response with content-encoding: %s, but "
+                    "failed to decode it." % content_encoding, e)
+
+            if flush_decoder and decode_content and self._decoder:
+                buf = self._decoder.decompress(binary_type())
+                data += buf + self._decoder.flush()
+
+            if cache_content:
+                self._body = data
+
+            return data
+
+        finally:
+            if self._original_response and self._original_response.isclosed():
+                self.release_conn()
+
+    def stream(self, amt=2**16, decode_content=None):
+        """
+        A generator wrapper for the read() method. A call will block until
+        ``amt`` bytes have been read from the connection or until the
+        connection is closed.
+
+        :param amt:
+            How much of the content to read. The generator will return up to
+            much data per iteration, but may return less. This is particularly
+            likely when using compressed data. However, the empty string will
+            never be returned.
+
+        :param decode_content:
+            If True, will attempt to decode the body based on the
+            'content-encoding' header.
+        """
+        while not is_fp_closed(self._fp):
+            data = self.read(amt=amt, decode_content=decode_content)
+
+            if data:
+                yield data
+
+    @classmethod
+    def from_httplib(ResponseCls, r, **response_kw):
+        """
+        Given an :class:`httplib.HTTPResponse` instance ``r``, return a
+        corresponding :class:`urllib3.response.HTTPResponse` object.
+
+        Remaining parameters are passed to the HTTPResponse constructor, along
+        with ``original_response=r``.
+        """
+
+        headers = HTTPHeaderDict()
+        for k, v in r.getheaders():
+            headers.add(k, v)
+
+        # HTTPResponse objects in Python 3 don't have a .strict attribute
+        strict = getattr(r, 'strict', 0)
+        return ResponseCls(body=r,
+                           headers=headers,
+                           status=r.status,
+                           version=r.version,
+                           reason=r.reason,
+                           strict=strict,
+                           original_response=r,
+                           **response_kw)
+
+    # Backwards-compatibility methods for httplib.HTTPResponse
+    def getheaders(self):
+        return self.headers
+
+    def getheader(self, name, default=None):
+        return self.headers.get(name, default)
+
+    # Overrides from io.IOBase
+    def close(self):
+        if not self.closed:
+            self._fp.close()
+
+    @property
+    def closed(self):
+        if self._fp is None:
+            return True
+        elif hasattr(self._fp, 'closed'):
+            return self._fp.closed
+        elif hasattr(self._fp, 'isclosed'):  # Python 2
+            return self._fp.isclosed()
+        else:
+            return True
+
+    def fileno(self):
+        if self._fp is None:
+            raise IOError("HTTPResponse has no file to get a fileno from")
+        elif hasattr(self._fp, "fileno"):
+            return self._fp.fileno()
+        else:
+            raise IOError("The file-like object this HTTPResponse is wrapped "
+                          "around has no file descriptor")
+
+    def flush(self):
+        if self._fp is not None and hasattr(self._fp, 'flush'):
+            return self._fp.flush()
+
+    def readable(self):
+        # This method is required for `io` module compatibility.
+        return True
+
+    def readinto(self, b):
+        # This method is required for `io` module compatibility.
+        temp = self.read(len(b))
+        if len(temp) == 0:
+            return 0
+        else:
+            b[:len(temp)] = temp
+            return len(temp)
diff --git a/lib/requests/packages/urllib3/util/__init__.py b/lib/requests/packages/urllib3/util/__init__.py
new file mode 100644
index 00000000..8becc814
--- /dev/null
+++ b/lib/requests/packages/urllib3/util/__init__.py
@@ -0,0 +1,24 @@
+# For backwards compatibility, provide imports that used to be here.
+from .connection import is_connection_dropped
+from .request import make_headers
+from .response import is_fp_closed
+from .ssl_ import (
+    SSLContext,
+    HAS_SNI,
+    assert_fingerprint,
+    resolve_cert_reqs,
+    resolve_ssl_version,
+    ssl_wrap_socket,
+)
+from .timeout import (
+    current_time,
+    Timeout,
+)
+
+from .retry import Retry
+from .url import (
+    get_host,
+    parse_url,
+    split_first,
+    Url,
+)
diff --git a/lib/requests/packages/urllib3/util/connection.py b/lib/requests/packages/urllib3/util/connection.py
new file mode 100644
index 00000000..2156993a
--- /dev/null
+++ b/lib/requests/packages/urllib3/util/connection.py
@@ -0,0 +1,97 @@
+import socket
+try:
+    from select import poll, POLLIN
+except ImportError:  # `poll` doesn't exist on OSX and other platforms
+    poll = False
+    try:
+        from select import select
+    except ImportError:  # `select` doesn't exist on AppEngine.
+        select = False
+
+
+def is_connection_dropped(conn):  # Platform-specific
+    """
+    Returns True if the connection is dropped and should be closed.
+
+    :param conn:
+        :class:`httplib.HTTPConnection` object.
+
+    Note: For platforms like AppEngine, this will always return ``False`` to
+    let the platform handle connection recycling transparently for us.
+    """
+    sock = getattr(conn, 'sock', False)
+    if sock is False:  # Platform-specific: AppEngine
+        return False
+    if sock is None:  # Connection already closed (such as by httplib).
+        return True
+
+    if not poll:
+        if not select:  # Platform-specific: AppEngine
+            return False
+
+        try:
+            return select([sock], [], [], 0.0)[0]
+        except socket.error:
+            return True
+
+    # This version is better on platforms that support it.
+    p = poll()
+    p.register(sock, POLLIN)
+    for (fno, ev) in p.poll(0.0):
+        if fno == sock.fileno():
+            # Either data is buffered (bad), or the connection is dropped.
+            return True
+
+
+# This function is copied from socket.py in the Python 2.7 standard
+# library test suite. Added to its signature is only `socket_options`.
+def create_connection(address, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
+                      source_address=None, socket_options=None):
+    """Connect to *address* and return the socket object.
+
+    Convenience function.  Connect to *address* (a 2-tuple ``(host,
+    port)``) and return the socket object.  Passing the optional
+    *timeout* parameter will set the timeout on the socket instance
+    before attempting to connect.  If no *timeout* is supplied, the
+    global default timeout setting returned by :func:`getdefaulttimeout`
+    is used.  If *source_address* is set it must be a tuple of (host, port)
+    for the socket to bind as a source address before making the connection.
+    An host of '' or port 0 tells the OS to use the default.
+    """
+
+    host, port = address
+    err = None
+    for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM):
+        af, socktype, proto, canonname, sa = res
+        sock = None
+        try:
+            sock = socket.socket(af, socktype, proto)
+
+            # If provided, set socket level options before connecting.
+            # This is the only addition urllib3 makes to this function.
+            _set_socket_options(sock, socket_options)
+
+            if timeout is not socket._GLOBAL_DEFAULT_TIMEOUT:
+                sock.settimeout(timeout)
+            if source_address:
+                sock.bind(source_address)
+            sock.connect(sa)
+            return sock
+
+        except socket.error as _:
+            err = _
+            if sock is not None:
+                sock.close()
+
+    if err is not None:
+        raise err
+    else:
+        raise socket.error("getaddrinfo returns an empty list")
+
+
+def _set_socket_options(sock, options):
+    if options is None:
+        return
+
+    for opt in options:
+        sock.setsockopt(*opt)
diff --git a/lib/requests/packages/urllib3/util/request.py b/lib/requests/packages/urllib3/util/request.py
new file mode 100644
index 00000000..bc64f6b1
--- /dev/null
+++ b/lib/requests/packages/urllib3/util/request.py
@@ -0,0 +1,71 @@
+from base64 import b64encode
+
+from ..packages.six import b
+
+ACCEPT_ENCODING = 'gzip,deflate'
+
+
+def make_headers(keep_alive=None, accept_encoding=None, user_agent=None,
+                 basic_auth=None, proxy_basic_auth=None, disable_cache=None):
+    """
+    Shortcuts for generating request headers.
+
+    :param keep_alive:
+        If ``True``, adds 'connection: keep-alive' header.
+
+    :param accept_encoding:
+        Can be a boolean, list, or string.
+        ``True`` translates to 'gzip,deflate'.
+        List will get joined by comma.
+        String will be used as provided.
+
+    :param user_agent:
+        String representing the user-agent you want, such as
+        "python-urllib3/0.6"
+
+    :param basic_auth:
+        Colon-separated username:password string for 'authorization: basic ...'
+        auth header.
+
+    :param proxy_basic_auth:
+        Colon-separated username:password string for 'proxy-authorization: basic ...'
+        auth header.
+
+    :param disable_cache:
+        If ``True``, adds 'cache-control: no-cache' header.
+
+    Example::
+
+        >>> make_headers(keep_alive=True, user_agent="Batman/1.0")
+        {'connection': 'keep-alive', 'user-agent': 'Batman/1.0'}
+        >>> make_headers(accept_encoding=True)
+        {'accept-encoding': 'gzip,deflate'}
+    """
+    headers = {}
+    if accept_encoding:
+        if isinstance(accept_encoding, str):
+            pass
+        elif isinstance(accept_encoding, list):
+            accept_encoding = ','.join(accept_encoding)
+        else:
+            accept_encoding = ACCEPT_ENCODING
+        headers['accept-encoding'] = accept_encoding
+
+    if user_agent:
+        headers['user-agent'] = user_agent
+
+    if keep_alive:
+        headers['connection'] = 'keep-alive'
+
+    if basic_auth:
+        headers['authorization'] = 'Basic ' + \
+            b64encode(b(basic_auth)).decode('utf-8')
+
+    if proxy_basic_auth:
+        headers['proxy-authorization'] = 'Basic ' + \
+            b64encode(b(proxy_basic_auth)).decode('utf-8')
+
+    if disable_cache:
+        headers['cache-control'] = 'no-cache'
+
+    return headers
diff --git a/lib/requests/packages/urllib3/util/response.py b/lib/requests/packages/urllib3/util/response.py
new file mode 100644
index 00000000..45fff552
--- /dev/null
+++ b/lib/requests/packages/urllib3/util/response.py
@@ -0,0 +1,22 @@
+def is_fp_closed(obj):
+    """
+    Checks whether a given file-like object is closed.
+
+    :param obj:
+        The file-like object to check.
+    """
+
+    try:
+        # Check via the official file-like-object way.
+        return obj.closed
+    except AttributeError:
+        pass
+
+    try:
+        # Check if the object is a container for another file-like object that
+        # gets released on exhaustion (e.g. HTTPResponse).
+        return obj.fp is None
+    except AttributeError:
+        pass
+
+    raise ValueError("Unable to determine whether fp is closed.")
diff --git a/lib/requests/packages/urllib3/util/retry.py b/lib/requests/packages/urllib3/util/retry.py
new file mode 100644
index 00000000..aeaf8a02
--- /dev/null
+++ b/lib/requests/packages/urllib3/util/retry.py
@@ -0,0 +1,285 @@
+import time
+import logging
+
+from ..exceptions import (
+    ConnectTimeoutError,
+    MaxRetryError,
+    ProtocolError,
+    ReadTimeoutError,
+    ResponseError,
+)
+from ..packages import six
+
+
+log = logging.getLogger(__name__)
+
+
+class Retry(object):
+    """ Retry configuration.
+
+    Each retry attempt will create a new Retry object with updated values, so
+    they can be safely reused.
+
+    Retries can be defined as a default for a pool::
+
+        retries = Retry(connect=5, read=2, redirect=5)
+        http = PoolManager(retries=retries)
+        response = http.request('GET', 'http://example.com/')
+
+    Or per-request (which overrides the default for the pool)::
+
+        response = http.request('GET', 'http://example.com/', retries=Retry(10))
+
+    Retries can be disabled by passing ``False``::
+
+        response = http.request('GET', 'http://example.com/', retries=False)
+
+    Errors will be wrapped in :class:`~urllib3.exceptions.MaxRetryError` unless
+    retries are disabled, in which case the causing exception will be raised.
+
+    :param int total:
+        Total number of retries to allow. Takes precedence over other counts.
+
+        Set to ``None`` to remove this constraint and fall back on other
+        counts. It's a good idea to set this to some sensibly-high value to
+        account for unexpected edge cases and avoid infinite retry loops.
+
+        Set to ``0`` to fail on the first retry.
+
+        Set to ``False`` to disable and imply ``raise_on_redirect=False``.
+
+    :param int connect:
+        How many connection-related errors to retry on.
+
+        These are errors raised before the request is sent to the remote server,
+        which we assume has not triggered the server to process the request.
+
+        Set to ``0`` to fail on the first retry of this type.
+
+    :param int read:
+        How many times to retry on read errors.
+
+        These errors are raised after the request was sent to the server, so the
+        request may have side-effects.
+
+        Set to ``0`` to fail on the first retry of this type.
+
+    :param int redirect:
+        How many redirects to perform. Limit this to avoid infinite redirect
+        loops.
+
+        A redirect is a HTTP response with a status code 301, 302, 303, 307 or
+        308.
+
+        Set to ``0`` to fail on the first retry of this type.
+
+        Set to ``False`` to disable and imply ``raise_on_redirect=False``.
+
+    :param iterable method_whitelist:
+        Set of uppercased HTTP method verbs that we should retry on.
+
+        By default, we only retry on methods which are considered to be
+        indempotent (multiple requests with the same parameters end with the
+        same state). See :attr:`Retry.DEFAULT_METHOD_WHITELIST`.
+
+    :param iterable status_forcelist:
+        A set of HTTP status codes that we should force a retry on.
+
+        By default, this is disabled with ``None``.
+
+    :param float backoff_factor:
+        A backoff factor to apply between attempts. urllib3 will sleep for::
+
+            {backoff factor} * (2 ^ ({number of total retries} - 1))
+
+        seconds. If the backoff_factor is 0.1, then :func:`.sleep` will sleep
+        for [0.1s, 0.2s, 0.4s, ...] between retries. It will never be longer
+        than :attr:`Retry.MAX_BACKOFF`.
+
+        By default, backoff is disabled (set to 0).
+
+    :param bool raise_on_redirect: Whether, if the number of redirects is
+        exhausted, to raise a MaxRetryError, or to return a response with a
+        response code in the 3xx range.
+    """
+
+    DEFAULT_METHOD_WHITELIST = frozenset([
+        'HEAD', 'GET', 'PUT', 'DELETE', 'OPTIONS', 'TRACE'])
+
+    #: Maximum backoff time.
+    BACKOFF_MAX = 120
+
+    def __init__(self, total=10, connect=None, read=None, redirect=None,
+                 method_whitelist=DEFAULT_METHOD_WHITELIST, status_forcelist=None,
+                 backoff_factor=0, raise_on_redirect=True, _observed_errors=0):
+
+        self.total = total
+        self.connect = connect
+        self.read = read
+
+        if redirect is False or total is False:
+            redirect = 0
+            raise_on_redirect = False
+
+        self.redirect = redirect
+        self.status_forcelist = status_forcelist or set()
+        self.method_whitelist = method_whitelist
+        self.backoff_factor = backoff_factor
+        self.raise_on_redirect = raise_on_redirect
+        self._observed_errors = _observed_errors # TODO: use .history instead?
+
+    def new(self, **kw):
+        params = dict(
+            total=self.total,
+            connect=self.connect, read=self.read, redirect=self.redirect,
+            method_whitelist=self.method_whitelist,
+            status_forcelist=self.status_forcelist,
+            backoff_factor=self.backoff_factor,
+            raise_on_redirect=self.raise_on_redirect,
+            _observed_errors=self._observed_errors,
+        )
+        params.update(kw)
+        return type(self)(**params)
+
+    @classmethod
+    def from_int(cls, retries, redirect=True, default=None):
+        """ Backwards-compatibility for the old retries format."""
+        if retries is None:
+            retries = default if default is not None else cls.DEFAULT
+
+        if isinstance(retries, Retry):
+            return retries
+
+        redirect = bool(redirect) and None
+        new_retries = cls(retries, redirect=redirect)
+        log.debug("Converted retries value: %r -> %r" % (retries, new_retries))
+        return new_retries
+
+    def get_backoff_time(self):
+        """ Formula for computing the current backoff
+
+        :rtype: float
+        """
+        if self._observed_errors <= 1:
+            return 0
+
+        backoff_value = self.backoff_factor * (2 ** (self._observed_errors - 1))
+        return min(self.BACKOFF_MAX, backoff_value)
+
+    def sleep(self):
+        """ Sleep between retry attempts using an exponential backoff.
+
+        By default, the backoff factor is 0 and this method will return
+        immediately.
+        """
+        backoff = self.get_backoff_time()
+        if backoff <= 0:
+            return
+        time.sleep(backoff)
+
+    def _is_connection_error(self, err):
+        """ Errors when we're fairly sure that the server did not receive the
+        request, so it should be safe to retry.
+        """
+        return isinstance(err, ConnectTimeoutError)
+
+    def _is_read_error(self, err):
+        """ Errors that occur after the request has been started, so we should
+        assume that the server began processing it.
+        """
+        return isinstance(err, (ReadTimeoutError, ProtocolError))
+
+    def is_forced_retry(self, method, status_code):
+        """ Is this method/response retryable? (Based on method/codes whitelists)
+        """
+        if self.method_whitelist and method.upper() not in self.method_whitelist:
+            return False
+
+        return self.status_forcelist and status_code in self.status_forcelist
+
+    def is_exhausted(self):
+        """ Are we out of retries? """
+        retry_counts = (self.total, self.connect, self.read, self.redirect)
+        retry_counts = list(filter(None, retry_counts))
+        if not retry_counts:
+            return False
+
+        return min(retry_counts) < 0
+
+    def increment(self, method=None, url=None, response=None, error=None, _pool=None, _stacktrace=None):
+        """ Return a new Retry object with incremented retry counters.
+
+        :param response: A response object, or None, if the server did not
+            return a response.
+        :type response: :class:`~urllib3.response.HTTPResponse`
+        :param Exception error: An error encountered during the request, or
+            None if the response was received successfully.
+
+        :return: A new ``Retry`` object.
+        """
+        if self.total is False and error:
+            # Disabled, indicate to re-raise the error.
+            raise six.reraise(type(error), error, _stacktrace)
+
+        total = self.total
+        if total is not None:
+            total -= 1
+
+        _observed_errors = self._observed_errors
+        connect = self.connect
+        read = self.read
+        redirect = self.redirect
+        cause = 'unknown'
+
+        if error and self._is_connection_error(error):
+            # Connect retry?
+            if connect is False:
+                raise six.reraise(type(error), error, _stacktrace)
+            elif connect is not None:
+                connect -= 1
+            _observed_errors += 1
+
+        elif error and self._is_read_error(error):
+            # Read retry?
+            if read is False:
+                raise six.reraise(type(error), error, _stacktrace)
+            elif read is not None:
+                read -= 1
+            _observed_errors += 1
+
+        elif response and response.get_redirect_location():
+            # Redirect retry?
+            if redirect is not None:
+                redirect -= 1
+            cause = 'too many redirects'
+
+        else:
+            # Incrementing because of a server error like a 500 in
+            # status_forcelist and a the given method is in the whitelist
+            _observed_errors += 1
+            cause = ResponseError.GENERIC_ERROR
+            if response and response.status:
+                cause = ResponseError.SPECIFIC_ERROR.format(
+                    status_code=response.status)
+
+        new_retry = self.new(
+            total=total,
+            connect=connect, read=read, redirect=redirect,
+            _observed_errors=_observed_errors)
+
+        if new_retry.is_exhausted():
+            raise MaxRetryError(_pool, url, error or ResponseError(cause))
+
+        log.debug("Incremented Retry for (url='%s'): %r" % (url, new_retry))
+
+        return new_retry
+
+
+    def __repr__(self):
+        return ('{cls.__name__}(total={self.total}, connect={self.connect}, '
+                'read={self.read}, redirect={self.redirect})').format(
+                    cls=type(self), self=self)
+
+
+# For backwards compatibility (equivalent to pre-v1.9):
+Retry.DEFAULT = Retry(3)
diff --git a/lib/requests/packages/urllib3/util/ssl_.py b/lib/requests/packages/urllib3/util/ssl_.py
new file mode 100644
index 00000000..a788b1b9
--- /dev/null
+++ b/lib/requests/packages/urllib3/util/ssl_.py
@@ -0,0 +1,254 @@
+from binascii import hexlify, unhexlify
+from hashlib import md5, sha1
+
+from ..exceptions import SSLError
+
+
+SSLContext = None
+HAS_SNI = False
+create_default_context = None
+
+import errno
+import ssl
+
+try:  # Test for SSL features
+    from ssl import wrap_socket, CERT_NONE, PROTOCOL_SSLv23
+    from ssl import HAS_SNI  # Has SNI?
+except ImportError:
+    pass
+
+
+try:
+    from ssl import OP_NO_SSLv2, OP_NO_SSLv3, OP_NO_COMPRESSION
+except ImportError:
+    OP_NO_SSLv2, OP_NO_SSLv3 = 0x1000000, 0x2000000
+    OP_NO_COMPRESSION = 0x20000
+
+try:
+    from ssl import _DEFAULT_CIPHERS
+except ImportError:
+    _DEFAULT_CIPHERS = (
+        'ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:ECDH+HIGH:'
+        'DH+HIGH:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+HIGH:RSA+3DES:ECDH+RC4:'
+        'DH+RC4:RSA+RC4:!aNULL:!eNULL:!MD5'
+    )
+
+try:
+    from ssl import SSLContext  # Modern SSL?
+except ImportError:
+    import sys
+
+    class SSLContext(object):  # Platform-specific: Python 2 & 3.1
+        supports_set_ciphers = sys.version_info >= (2, 7)
+
+        def __init__(self, protocol_version):
+            self.protocol = protocol_version
+            # Use default values from a real SSLContext
+            self.check_hostname = False
+            self.verify_mode = ssl.CERT_NONE
+            self.ca_certs = None
+            self.options = 0
+            self.certfile = None
+            self.keyfile = None
+            self.ciphers = None
+
+        def load_cert_chain(self, certfile, keyfile):
+            self.certfile = certfile
+            self.keyfile = keyfile
+
+        def load_verify_locations(self, location):
+            self.ca_certs = location
+
+        def set_ciphers(self, cipher_suite):
+            if not self.supports_set_ciphers:
+                raise TypeError(
+                    'Your version of Python does not support setting '
+                    'a custom cipher suite. Please upgrade to Python '
+                    '2.7, 3.2, or later if you need this functionality.'
+                )
+            self.ciphers = cipher_suite
+
+        def wrap_socket(self, socket, server_hostname=None):
+            kwargs = {
+                'keyfile': self.keyfile,
+                'certfile': self.certfile,
+                'ca_certs': self.ca_certs,
+                'cert_reqs': self.verify_mode,
+                'ssl_version': self.protocol,
+            }
+            if self.supports_set_ciphers:  # Platform-specific: Python 2.7+
+                return wrap_socket(socket, ciphers=self.ciphers, **kwargs)
+            else:  # Platform-specific: Python 2.6
+                return wrap_socket(socket, **kwargs)
+
+
+def assert_fingerprint(cert, fingerprint):
+    """
+    Checks if given fingerprint matches the supplied certificate.
+
+    :param cert:
+        Certificate as bytes object.
+    :param fingerprint:
+        Fingerprint as string of hexdigits, can be interspersed by colons.
+    """
+
+    # Maps the length of a digest to a possible hash function producing
+    # this digest.
+    hashfunc_map = {
+        16: md5,
+        20: sha1
+    }
+
+    fingerprint = fingerprint.replace(':', '').lower()
+    digest_length, odd = divmod(len(fingerprint), 2)
+
+    if odd or digest_length not in hashfunc_map:
+        raise SSLError('Fingerprint is of invalid length.')
+
+    # We need encode() here for py32; works on py2 and p33.
+    fingerprint_bytes = unhexlify(fingerprint.encode())
+
+    hashfunc = hashfunc_map[digest_length]
+
+    cert_digest = hashfunc(cert).digest()
+
+    if not cert_digest == fingerprint_bytes:
+        raise SSLError('Fingerprints did not match. Expected "{0}", got "{1}".'
+                       .format(hexlify(fingerprint_bytes),
+                               hexlify(cert_digest)))
+
+
+def resolve_cert_reqs(candidate):
+    """
+    Resolves the argument to a numeric constant, which can be passed to
+    the wrap_socket function/method from the ssl module.
+    Defaults to :data:`ssl.CERT_NONE`.
+    If given a string it is assumed to be the name of the constant in the
+    :mod:`ssl` module or its abbrevation.
+    (So you can specify `REQUIRED` instead of `CERT_REQUIRED`.
+    If it's neither `None` nor a string we assume it is already the numeric
+    constant which can directly be passed to wrap_socket.
+    """
+    if candidate is None:
+        return CERT_NONE
+
+    if isinstance(candidate, str):
+        res = getattr(ssl, candidate, None)
+        if res is None:
+            res = getattr(ssl, 'CERT_' + candidate)
+        return res
+
+    return candidate
+
+
+def resolve_ssl_version(candidate):
+    """
+    like resolve_cert_reqs
+    """
+    if candidate is None:
+        return PROTOCOL_SSLv23
+
+    if isinstance(candidate, str):
+        res = getattr(ssl, candidate, None)
+        if res is None:
+            res = getattr(ssl, 'PROTOCOL_' + candidate)
+        return res
+
+    return candidate
+
+
+def create_urllib3_context(ssl_version=None, cert_reqs=ssl.CERT_REQUIRED,
+                           options=None, ciphers=None):
+    """All arguments have the same meaning as ``ssl_wrap_socket``.
+
+    By default, this function does a lot of the same work that
+    ``ssl.create_default_context`` does on Python 3.4+. It:
+
+    - Disables SSLv2, SSLv3, and compression
+    - Sets a restricted set of server ciphers
+
+    If you wish to enable SSLv3, you can do::
+
+        from urllib3.util import ssl_
+        context = ssl_.create_urllib3_context()
+        context.options &= ~ssl_.OP_NO_SSLv3
+
+    You can do the same to enable compression (substituting ``COMPRESSION``
+    for ``SSLv3`` in the last line above).
+
+    :param ssl_version:
+        The desired protocol version to use. This will default to
+        PROTOCOL_SSLv23 which will negotiate the highest protocol that both
+        the server and your installation of OpenSSL support.
+    :param cert_reqs:
+        Whether to require the certificate verification. This defaults to
+        ``ssl.CERT_REQUIRED``.
+    :param options:
+        Specific OpenSSL options. These default to ``ssl.OP_NO_SSLv2``,
+        ``ssl.OP_NO_SSLv3``, ``ssl.OP_NO_COMPRESSION``.
+    :param ciphers:
+        Which cipher suites to allow the server to select.
+    :returns:
+        Constructed SSLContext object with specified options
+    :rtype: SSLContext
+    """
+    context = SSLContext(ssl_version or ssl.PROTOCOL_SSLv23)
+
+    if options is None:
+        options = 0
+        # SSLv2 is easily broken and is considered harmful and dangerous
+        options |= OP_NO_SSLv2
+        # SSLv3 has several problems and is now dangerous
+        options |= OP_NO_SSLv3
+        # Disable compression to prevent CRIME attacks for OpenSSL 1.0+
+        # (issue #309)
+        options |= OP_NO_COMPRESSION
+
+    context.options |= options
+
+    if getattr(context, 'supports_set_ciphers', True):  # Platform-specific: Python 2.6
+        context.set_ciphers(ciphers or _DEFAULT_CIPHERS)
+
+    context.verify_mode = cert_reqs
+    if getattr(context, 'check_hostname', None) is not None:  # Platform-specific: Python 3.2
+        context.check_hostname = (context.verify_mode == ssl.CERT_REQUIRED)
+    return context
+
+
+def ssl_wrap_socket(sock, keyfile=None, certfile=None, cert_reqs=None,
+                    ca_certs=None, server_hostname=None,
+                    ssl_version=None, ciphers=None, ssl_context=None):
+    """
+    All arguments except for server_hostname and ssl_context have the same
+    meaning as they do when using :func:`ssl.wrap_socket`.
+
+    :param server_hostname:
+        When SNI is supported, the expected hostname of the certificate
+    :param ssl_context:
+        A pre-made :class:`SSLContext` object. If none is provided, one will
+        be created using :func:`create_urllib3_context`.
+    :param ciphers:
+        A string of ciphers we wish the client to support. This is not
+        supported on Python 2.6 as the ssl module does not support it.
+    """
+    context = ssl_context
+    if context is None:
+        context = create_urllib3_context(ssl_version, cert_reqs,
+                                         ciphers=ciphers)
+
+    if ca_certs:
+        try:
+            context.load_verify_locations(ca_certs)
+        except IOError as e:  # Platform-specific: Python 2.6, 2.7, 3.2
+            raise SSLError(e)
+        # Py33 raises FileNotFoundError which subclasses OSError
+        # These are not equivalent unless we check the errno attribute
+        except OSError as e:  # Platform-specific: Python 3.3 and beyond
+            if e.errno == errno.ENOENT:
+                raise SSLError(e)
+            raise
+    if certfile:
+        context.load_cert_chain(certfile, keyfile)
+    if HAS_SNI:  # Platform-specific: OpenSSL with enabled SNI
+        return context.wrap_socket(sock, server_hostname=server_hostname)
+    return context.wrap_socket(sock)
diff --git a/lib/requests/packages/urllib3/util/timeout.py b/lib/requests/packages/urllib3/util/timeout.py
new file mode 100644
index 00000000..ea7027f3
--- /dev/null
+++ b/lib/requests/packages/urllib3/util/timeout.py
@@ -0,0 +1,240 @@
+# The default socket timeout, used by httplib to indicate that no timeout was
+# specified by the user
+from socket import _GLOBAL_DEFAULT_TIMEOUT
+import time
+
+from ..exceptions import TimeoutStateError
+
+# A sentinel value to indicate that no timeout was specified by the user in
+# urllib3
+_Default = object()
+
+def current_time():
+    """
+    Retrieve the current time. This function is mocked out in unit testing.
+    """
+    return time.time()
+
+
+class Timeout(object):
+    """ Timeout configuration.
+
+    Timeouts can be defined as a default for a pool::
+
+        timeout = Timeout(connect=2.0, read=7.0)
+        http = PoolManager(timeout=timeout)
+        response = http.request('GET', 'http://example.com/')
+
+    Or per-request (which overrides the default for the pool)::
+
+        response = http.request('GET', 'http://example.com/', timeout=Timeout(10))
+
+    Timeouts can be disabled by setting all the parameters to ``None``::
+
+        no_timeout = Timeout(connect=None, read=None)
+        response = http.request('GET', 'http://example.com/, timeout=no_timeout)
+
+
+    :param total:
+        This combines the connect and read timeouts into one; the read timeout
+        will be set to the time leftover from the connect attempt. In the
+        event that both a connect timeout and a total are specified, or a read
+        timeout and a total are specified, the shorter timeout will be applied.
+
+        Defaults to None.
+
+    :type total: integer, float, or None
+
+    :param connect:
+        The maximum amount of time to wait for a connection attempt to a server
+        to succeed. Omitting the parameter will default the connect timeout to
+        the system default, probably `the global default timeout in socket.py
+        <http://hg.python.org/cpython/file/603b4d593758/Lib/socket.py#l535>`_.
+        None will set an infinite timeout for connection attempts.
+
+    :type connect: integer, float, or None
+
+    :param read:
+        The maximum amount of time to wait between consecutive
+        read operations for a response from the server. Omitting
+        the parameter will default the read timeout to the system
+        default, probably `the global default timeout in socket.py
+        <http://hg.python.org/cpython/file/603b4d593758/Lib/socket.py#l535>`_.
+        None will set an infinite timeout.
+
+    :type read: integer, float, or None
+
+    .. note::
+
+        Many factors can affect the total amount of time for urllib3 to return
+        an HTTP response.
+
+        For example, Python's DNS resolver does not obey the timeout specified
+        on the socket. Other factors that can affect total request time include
+        high CPU load, high swap, the program running at a low priority level,
+        or other behaviors.
+
+        In addition, the read and total timeouts only measure the time between
+        read operations on the socket connecting the client and the server,
+        not the total amount of time for the request to return a complete
+        response. For most requests, the timeout is raised because the server
+        has not sent the first byte in the specified time. This is not always
+        the case; if a server streams one byte every fifteen seconds, a timeout
+        of 20 seconds will not trigger, even though the request will take
+        several minutes to complete.
+
+        If your goal is to cut off any request after a set amount of wall clock
+        time, consider having a second "watcher" thread to cut off a slow
+        request.
+    """
+
+    #: A sentinel object representing the default timeout value
+    DEFAULT_TIMEOUT = _GLOBAL_DEFAULT_TIMEOUT
+
+    def __init__(self, total=None, connect=_Default, read=_Default):
+        self._connect = self._validate_timeout(connect, 'connect')
+        self._read = self._validate_timeout(read, 'read')
+        self.total = self._validate_timeout(total, 'total')
+        self._start_connect = None
+
+    def __str__(self):
+        return '%s(connect=%r, read=%r, total=%r)' % (
+            type(self).__name__, self._connect, self._read, self.total)
+
+    @classmethod
+    def _validate_timeout(cls, value, name):
+        """ Check that a timeout attribute is valid.
+
+        :param value: The timeout value to validate
+        :param name: The name of the timeout attribute to validate. This is
+            used to specify in error messages.
+        :return: The validated and casted version of the given value.
+        :raises ValueError: If the type is not an integer or a float, or if it
+            is a numeric value less than zero.
+        """
+        if value is _Default:
+            return cls.DEFAULT_TIMEOUT
+
+        if value is None or value is cls.DEFAULT_TIMEOUT:
+            return value
+
+        try:
+            float(value)
+        except (TypeError, ValueError):
+            raise ValueError("Timeout value %s was %s, but it must be an "
+                             "int or float." % (name, value))
+
+        try:
+            if value < 0:
+                raise ValueError("Attempted to set %s timeout to %s, but the "
+                                 "timeout cannot be set to a value less "
+                                 "than 0." % (name, value))
+        except TypeError:  # Python 3
+            raise ValueError("Timeout value %s was %s, but it must be an "
+                             "int or float." % (name, value))
+
+        return value
+
+    @classmethod
+    def from_float(cls, timeout):
+        """ Create a new Timeout from a legacy timeout value.
+
+        The timeout value used by httplib.py sets the same timeout on the
+        connect(), and recv() socket requests. This creates a :class:`Timeout`
+        object that sets the individual timeouts to the ``timeout`` value
+        passed to this function.
+
+        :param timeout: The legacy timeout value.
+        :type timeout: integer, float, sentinel default object, or None
+        :return: Timeout object
+        :rtype: :class:`Timeout`
+        """
+        return Timeout(read=timeout, connect=timeout)
+
+    def clone(self):
+        """ Create a copy of the timeout object
+
+        Timeout properties are stored per-pool but each request needs a fresh
+        Timeout object to ensure each one has its own start/stop configured.
+
+        :return: a copy of the timeout object
+        :rtype: :class:`Timeout`
+        """
+        # We can't use copy.deepcopy because that will also create a new object
+        # for _GLOBAL_DEFAULT_TIMEOUT, which socket.py uses as a sentinel to
+        # detect the user default.
+        return Timeout(connect=self._connect, read=self._read,
+                       total=self.total)
+
+    def start_connect(self):
+        """ Start the timeout clock, used during a connect() attempt
+
+        :raises urllib3.exceptions.TimeoutStateError: if you attempt
+            to start a timer that has been started already.
+        """
+        if self._start_connect is not None:
+            raise TimeoutStateError("Timeout timer has already been started.")
+        self._start_connect = current_time()
+        return self._start_connect
+
+    def get_connect_duration(self):
+        """ Gets the time elapsed since the call to :meth:`start_connect`.
+
+        :return: Elapsed time.
+        :rtype: float
+        :raises urllib3.exceptions.TimeoutStateError: if you attempt
+            to get duration for a timer that hasn't been started.
+        """
+        if self._start_connect is None:
+            raise TimeoutStateError("Can't get connect duration for timer "
+                                    "that has not started.")
+        return current_time() - self._start_connect
+
+    @property
+    def connect_timeout(self):
+        """ Get the value to use when setting a connection timeout.
+
+        This will be a positive float or integer, the value None
+        (never timeout), or the default system timeout.
+
+        :return: Connect timeout.
+        :rtype: int, float, :attr:`Timeout.DEFAULT_TIMEOUT` or None
+        """
+        if self.total is None:
+            return self._connect
+
+        if self._connect is None or self._connect is self.DEFAULT_TIMEOUT:
+            return self.total
+
+        return min(self._connect, self.total)
+
+    @property
+    def read_timeout(self):
+        """ Get the value for the read timeout.
+
+        This assumes some time has elapsed in the connection timeout and
+        computes the read timeout appropriately.
+
+        If self.total is set, the read timeout is dependent on the amount of
+        time taken by the connect timeout. If the connection time has not been
+        established, a :exc:`~urllib3.exceptions.TimeoutStateError` will be
+        raised.
+
+        :return: Value to use for the read timeout.
+        :rtype: int, float, :attr:`Timeout.DEFAULT_TIMEOUT` or None
+        :raises urllib3.exceptions.TimeoutStateError: If :meth:`start_connect`
+            has not yet been called on this object.
+        """
+        if (self.total is not None and
+            self.total is not self.DEFAULT_TIMEOUT and
+            self._read is not None and
+            self._read is not self.DEFAULT_TIMEOUT):
+            # In case the connect timeout has not yet been established.
+            if self._start_connect is None:
+                return self._read
+            return max(0, min(self.total - self.get_connect_duration(),
+                              self._read))
+        elif self.total is not None and self.total is not self.DEFAULT_TIMEOUT:
+            return max(0, self.total - self.get_connect_duration())
+        else:
+            return self._read
diff --git a/lib/requests/packages/urllib3/util/url.py b/lib/requests/packages/urllib3/util/url.py
new file mode 100644
index 00000000..b2ec834f
--- /dev/null
+++ b/lib/requests/packages/urllib3/util/url.py
@@ -0,0 +1,212 @@
+from collections import namedtuple
+
+from ..exceptions import LocationParseError
+
+
+url_attrs = ['scheme', 'auth', 'host', 'port', 'path', 'query', 'fragment']
+
+
+class Url(namedtuple('Url', url_attrs)):
+    """
+    Datastructure for representing an HTTP URL. Used as a return value for
+    :func:`parse_url`.
+    """
+    slots = ()
+
+    def __new__(cls, scheme=None, auth=None, host=None, port=None, path=None,
+                query=None, fragment=None):
+        return super(Url, cls).__new__(cls, scheme, auth, host, port, path,
+                                       query, fragment)
+
+    @property
+    def hostname(self):
+        """For backwards-compatibility with urlparse. We're nice like that."""
+        return self.host
+
+    @property
+    def request_uri(self):
+        """Absolute path including the query string."""
+        uri = self.path or '/'
+
+        if self.query is not None:
+            uri += '?' + self.query
+
+        return uri
+
+    @property
+    def netloc(self):
+        """Network location including host and port"""
+        if self.port:
+            return '%s:%d' % (self.host, self.port)
+        return self.host
+
+    @property
+    def url(self):
+        """
+        Convert self into a url
+
+        This function should more or less round-trip with :func:`.parse_url`. The
+        returned url may not be exactly the same as the url inputted to
+        :func:`.parse_url`, but it should be equivalent by the RFC (e.g., urls
+        with a blank port will have : removed).
+
+        Example: ::
+
+            >>> U = parse_url('http://google.com/mail/')
+            >>> U.url
+            'http://google.com/mail/'
+            >>> Url('http', 'username:password', 'host.com', 80,
+            ... '/path', 'query', 'fragment').url
+            'http://username:password@host.com:80/path?query#fragment'
+        """
+        scheme, auth, host, port, path, query, fragment = self
+        url = ''
+
+        # We use "is not None" we want things to happen with empty strings (or 0 port)
+        if scheme is not None:
+            url += scheme + '://'
+        if auth is not None:
+            url += auth + '@'
+        if host is not None:
+            url += host
+        if port is not None:
+            url += ':' + str(port)
+        if path is not None:
+            url += path
+        if query is not None:
+            url += '?' + query
+        if fragment is not None:
+            url += '#' + fragment
+
+        return url
+
+    def __str__(self):
+        return self.url
+
+def split_first(s, delims):
+    """
+    Given a string and an iterable of delimiters, split on the first found
+    delimiter. Return two split parts and the matched delimiter.
+
+    If not found, then the first part is the full input string.
+
+    Example::
+
+        >>> split_first('foo/bar?baz', '?/=')
+        ('foo', 'bar?baz', '/')
+        >>> split_first('foo/bar?baz', '123')
+        ('foo/bar?baz', '', None)
+
+    Scales linearly with number of delims. Not ideal for large number of delims.
+    """
+    min_idx = None
+    min_delim = None
+    for d in delims:
+        idx = s.find(d)
+        if idx < 0:
+            continue
+
+        if min_idx is None or idx < min_idx:
+            min_idx = idx
+            min_delim = d
+
+    if min_idx is None or min_idx < 0:
+        return s, '', None
+
+    return s[:min_idx], s[min_idx+1:], min_delim
+
+
+def parse_url(url):
+    """
+    Given a url, return a parsed :class:`.Url` namedtuple. Best-effort is
+    performed to parse incomplete urls. Fields not provided will be None.
+
+    Partly backwards-compatible with :mod:`urlparse`.
+
+    Example::
+
+        >>> parse_url('http://google.com/mail/')
+        Url(scheme='http', host='google.com', port=None, path='/mail/', ...)
+        >>> parse_url('google.com:80')
+        Url(scheme=None, host='google.com', port=80, path=None, ...)
+        >>> parse_url('/foo?bar')
+        Url(scheme=None, host=None, port=None, path='/foo', query='bar', ...)
+    """
+
+    # While this code has overlap with stdlib's urlparse, it is much
+    # simplified for our needs and less annoying.
+    # Additionally, this implementations does silly things to be optimal
+    # on CPython.
+
+    if not url:
+        # Empty
+        return Url()
+
+    scheme = None
+    auth = None
+    host = None
+    port = None
+    path = None
+    fragment = None
+    query = None
+
+    # Scheme
+    if '://' in url:
+        scheme, url = url.split('://', 1)
+
+    # Find the earliest Authority Terminator
+    # (http://tools.ietf.org/html/rfc3986#section-3.2)
+    url, path_, delim = split_first(url, ['/', '?', '#'])
+
+    if delim:
+        # Reassemble the path
+        path = delim + path_
+
+    # Auth
+    if '@' in url:
+        # Last '@' denotes end of auth part
+        auth, url = url.rsplit('@', 1)
+
+    # IPv6
+    if url and url[0] == '[':
+        host, url = url.split(']', 1)
+        host += ']'
+
+    # Port
+    if ':' in url:
+        _host, port = url.split(':', 1)
+
+        if not host:
+            host = _host
+
+        if port:
+            # If given, ports must be integers.
+            if not port.isdigit():
+                raise LocationParseError(url)
+            port = int(port)
+        else:
+            # Blank ports are cool, too. (rfc3986#section-3.2.3)
+            port = None
+
+    elif not host and url:
+        host = url
+
+    if not path:
+        return Url(scheme, auth, host, port, path, query, fragment)
+
+    # Fragment
+    if '#' in path:
+        path, fragment = path.split('#', 1)
+
+    # Query
+    if '?' in path:
+        path, query = path.split('?', 1)
+
+    return Url(scheme, auth, host, port, path, query, fragment)
+
+def get_host(url):
+    """
+    Deprecated. Use :func:`.parse_url` instead.
+    """
+    p = parse_url(url)
+    return p.scheme or 'http', p.hostname, p.port
diff --git a/lib/requests/sessions.py b/lib/requests/sessions.py
index b387bc36..4f306963 100644
--- a/lib/requests/sessions.py
+++ b/lib/requests/sessions.py
@@ -1,66 +1,48 @@
+# -*- coding: utf-8 -*-
+
 """
-requests.sessions
-~~~~~~~~~~~~~~~~~
+requests.session
+~~~~~~~~~~~~~~~~
 
 This module provides a Session object to manage and persist settings across
 requests (cookies, auth, proxies).
+
 """
 import os
-import sys
-import time
-from collections import OrderedDict
-from datetime import timedelta
+from collections import Mapping
+from datetime import datetime
 
-from ._internal_utils import to_native_string
-from .adapters import HTTPAdapter
 from .auth import _basic_auth_str
-from .compat import Mapping, cookielib, urljoin, urlparse
+from .compat import cookielib, OrderedDict, urljoin, urlparse
 from .cookies import (
-    RequestsCookieJar,
-    cookiejar_from_dict,
-    extract_cookies_to_jar,
-    merge_cookies,
-)
-from .exceptions import (
-    ChunkedEncodingError,
-    ContentDecodingError,
-    InvalidSchema,
-    TooManyRedirects,
-)
+    cookiejar_from_dict, extract_cookies_to_jar, RequestsCookieJar, merge_cookies)
+from .models import Request, PreparedRequest, DEFAULT_REDIRECT_LIMIT
 from .hooks import default_hooks, dispatch_hook
+from .utils import to_key_val_list, default_headers, to_native_string
+from .exceptions import (
+    TooManyRedirects, InvalidSchema, ChunkedEncodingError, ContentDecodingError)
+from .packages.urllib3._collections import RecentlyUsedContainer
+from .structures import CaseInsensitiveDict
+
+from .adapters import HTTPAdapter
+
+from .utils import (
+    requote_uri, get_environ_proxies, get_netrc_auth, should_bypass_proxies,
+    get_auth_from_url
+)
+
+from .status_codes import codes
 
 # formerly defined here, reexposed here for backward compatibility
-from .models import (  # noqa: F401
-    DEFAULT_REDIRECT_LIMIT,
-    REDIRECT_STATI,
-    PreparedRequest,
-    Request,
-)
-from .status_codes import codes
-from .structures import CaseInsensitiveDict
-from .utils import (  # noqa: F401
-    DEFAULT_PORTS,
-    default_headers,
-    get_auth_from_url,
-    get_environ_proxies,
-    get_netrc_auth,
-    requote_uri,
-    resolve_proxies,
-    rewind_body,
-    should_bypass_proxies,
-    to_key_val_list,
-)
+from .models import REDIRECT_STATI
 
-# Preferred clock, based on which one is more accurate on a given system.
-if sys.platform == "win32":
-    preferred_clock = time.perf_counter
-else:
-    preferred_clock = time.time
+REDIRECT_CACHE_SIZE = 1000
 
 
 def merge_setting(request_setting, session_setting, dict_class=OrderedDict):
-    """Determines appropriate setting for a given request, taking into account
-    the explicit setting on that request, and the setting in the session. If a
+    """
+    Determines appropriate setting for a given request, taking into account the
+    explicit setting on that request, and the setting in the session. If a
     setting is a dictionary, they will be merged together using `dict_class`
     """
 
@@ -72,140 +54,78 @@ def merge_setting(request_setting, session_setting, dict_class=OrderedDict):
 
     # Bypass if not a dictionary (e.g. verify)
     if not (
-        isinstance(session_setting, Mapping) and isinstance(request_setting, Mapping)
+            isinstance(session_setting, Mapping) and
+            isinstance(request_setting, Mapping)
     ):
         return request_setting
 
     merged_setting = dict_class(to_key_val_list(session_setting))
     merged_setting.update(to_key_val_list(request_setting))
 
-    # Remove keys that are set to None. Extract keys first to avoid altering
-    # the dictionary during iteration.
-    none_keys = [k for (k, v) in merged_setting.items() if v is None]
-    for key in none_keys:
-        del merged_setting[key]
+    # Remove keys that are set to None.
+    for (k, v) in request_setting.items():
+        if v is None:
+            del merged_setting[k]
+
+    merged_setting = dict((k, v) for (k, v) in merged_setting.items() if v is not None)
 
     return merged_setting
 
 
 def merge_hooks(request_hooks, session_hooks, dict_class=OrderedDict):
-    """Properly merges both requests and session hooks.
+    """
+    Properly merges both requests and session hooks.
 
     This is necessary because when request_hooks == {'response': []}, the
     merge breaks Session hooks entirely.
     """
-    if session_hooks is None or session_hooks.get("response") == []:
+    if session_hooks is None or session_hooks.get('response') == []:
         return request_hooks
 
-    if request_hooks is None or request_hooks.get("response") == []:
+    if request_hooks is None or request_hooks.get('response') == []:
         return session_hooks
 
     return merge_setting(request_hooks, session_hooks, dict_class)
 
 
-class SessionRedirectMixin:
-    def get_redirect_target(self, resp):
-        """Receives a Response. Returns a redirect URI or ``None``"""
-        # Due to the nature of how requests processes redirects this method will
-        # be called at least once upon the original response and at least twice
-        # on each subsequent redirect response (if any).
-        # If a custom mixin is used to handle this logic, it may be advantageous
-        # to cache the redirect location onto the response object as a private
-        # attribute.
-        if resp.is_redirect:
-            location = resp.headers["location"]
-            # Currently the underlying http module on py3 decode headers
-            # in latin1, but empirical evidence suggests that latin1 is very
-            # rarely used with non-ASCII characters in HTTP headers.
-            # It is more likely to get UTF8 header rather than latin1.
-            # This causes incorrect handling of UTF8 encoded location headers.
-            # To solve this, we re-encode the location in latin1.
-            location = location.encode("latin1")
-            return to_native_string(location, "utf8")
-        return None
+class SessionRedirectMixin(object):
+    def resolve_redirects(self, resp, req, stream=False, timeout=None,
+                          verify=True, cert=None, proxies=None):
+        """Receives a Response. Returns a generator of Responses."""
 
-    def should_strip_auth(self, old_url, new_url):
-        """Decide whether Authorization header should be removed when redirecting"""
-        old_parsed = urlparse(old_url)
-        new_parsed = urlparse(new_url)
-        if old_parsed.hostname != new_parsed.hostname:
-            return True
-        # Special case: allow http -> https redirect when using the standard
-        # ports. This isn't specified by RFC 7235, but is kept to avoid
-        # breaking backwards compatibility with older versions of requests
-        # that allowed any redirects on the same host.
-        if (
-            old_parsed.scheme == "http"
-            and old_parsed.port in (80, None)
-            and new_parsed.scheme == "https"
-            and new_parsed.port in (443, None)
-        ):
-            return False
+        i = 0
+        hist = [] # keep track of history
 
-        # Handle default port usage corresponding to scheme.
-        changed_port = old_parsed.port != new_parsed.port
-        changed_scheme = old_parsed.scheme != new_parsed.scheme
-        default_port = (DEFAULT_PORTS.get(old_parsed.scheme, None), None)
-        if (
-            not changed_scheme
-            and old_parsed.port in default_port
-            and new_parsed.port in default_port
-        ):
-            return False
-
-        # Standard case: root URI must match
-        return changed_port or changed_scheme
-
-    def resolve_redirects(
-        self,
-        resp,
-        req,
-        stream=False,
-        timeout=None,
-        verify=True,
-        cert=None,
-        proxies=None,
-        yield_requests=False,
-        **adapter_kwargs,
-    ):
-        """Receives a Response. Returns a generator of Responses or Requests."""
-
-        hist = []  # keep track of history
-
-        url = self.get_redirect_target(resp)
-        previous_fragment = urlparse(req.url).fragment
-        while url:
+        while resp.is_redirect:
             prepared_request = req.copy()
 
-            # Update history and keep track of redirects.
-            # resp.history must ignore the original request in this loop
-            hist.append(resp)
-            resp.history = hist[1:]
+            if i > 0:
+                # Update history and keep track of redirects.
+                hist.append(resp)
+                new_hist = list(hist)
+                resp.history = new_hist
 
             try:
                 resp.content  # Consume socket so it can be released
             except (ChunkedEncodingError, ContentDecodingError, RuntimeError):
                 resp.raw.read(decode_content=False)
 
-            if len(resp.history) >= self.max_redirects:
-                raise TooManyRedirects(
-                    f"Exceeded {self.max_redirects} redirects.", response=resp
-                )
+            if i >= self.max_redirects:
+                raise TooManyRedirects('Exceeded %s redirects.' % self.max_redirects)
 
             # Release the connection back into the pool.
             resp.close()
 
-            # Handle redirection without scheme (see: RFC 1808 Section 4)
-            if url.startswith("//"):
-                parsed_rurl = urlparse(resp.url)
-                url = ":".join([to_native_string(parsed_rurl.scheme), url])
+            url = resp.headers['location']
+            method = req.method
 
-            # Normalize url case and attach previous fragment if needed (RFC 7231 7.1.2)
+            # Handle redirection without scheme (see: RFC 1808 Section 4)
+            if url.startswith('//'):
+                parsed_rurl = urlparse(resp.url)
+                url = '%s:%s' % (parsed_rurl.scheme, url)
+
+            # The scheme should be lower case...
             parsed = urlparse(url)
-            if parsed.fragment == "" and previous_fragment:
-                parsed = parsed._replace(fragment=previous_fragment)
-            elif parsed.fragment:
-                previous_fragment = parsed.fragment
             url = parsed.geturl()
 
             # Facilitate relative 'location' headers, as allowed by RFC 7231.
@@ -217,90 +137,94 @@ class SessionRedirectMixin:
                 url = requote_uri(url)
 
             prepared_request.url = to_native_string(url)
+            # Cache the url, unless it redirects to itself.
+            if resp.is_permanent_redirect and req.url != prepared_request.url:
+                self.redirect_cache[req.url] = prepared_request.url
 
-            self.rebuild_method(prepared_request, resp)
+            # http://tools.ietf.org/html/rfc7231#section-6.4.4
+            if (resp.status_code == codes.see_other and
+                    method != 'HEAD'):
+                method = 'GET'
+
+            # Do what the browsers do, despite standards...
+            # First, turn 302s into GETs.
+            if resp.status_code == codes.found and method != 'HEAD':
+                method = 'GET'
+
+            # Second, if a POST is responded to with a 301, turn it into a GET.
+            # This bizarre behaviour is explained in Issue 1704.
+            if resp.status_code == codes.moved and method == 'POST':
+                method = 'GET'
+
+            prepared_request.method = method
+
+            # https://github.com/kennethreitz/requests/issues/1084
+            if resp.status_code not in (codes.temporary_redirect, codes.permanent_redirect):
+                if 'Content-Length' in prepared_request.headers:
+                    del prepared_request.headers['Content-Length']
 
-            # https://github.com/psf/requests/issues/1084
-            if resp.status_code not in (
-                codes.temporary_redirect,
-                codes.permanent_redirect,
-            ):
-                # https://github.com/psf/requests/issues/3490
-                purged_headers = ("Content-Length", "Content-Type", "Transfer-Encoding")
-                for header in purged_headers:
-                    prepared_request.headers.pop(header, None)
                 prepared_request.body = None
 
             headers = prepared_request.headers
-            headers.pop("Cookie", None)
+            try:
+                del headers['Cookie']
+            except KeyError:
+                pass
 
-            # Extract any cookies sent on the response to the cookiejar
-            # in the new request. Because we've mutated our copied prepared
-            # request, use the old one that we haven't yet touched.
-            extract_cookies_to_jar(prepared_request._cookies, req, resp.raw)
-            merge_cookies(prepared_request._cookies, self.cookies)
+            extract_cookies_to_jar(prepared_request._cookies, prepared_request, resp.raw)
+            prepared_request._cookies.update(self.cookies)
             prepared_request.prepare_cookies(prepared_request._cookies)
 
             # Rebuild auth and proxy information.
             proxies = self.rebuild_proxies(prepared_request, proxies)
             self.rebuild_auth(prepared_request, resp)
 
-            # A failed tell() sets `_body_position` to `object()`. This non-None
-            # value ensures `rewindable` will be True, allowing us to raise an
-            # UnrewindableBodyError, instead of hanging the connection.
-            rewindable = prepared_request._body_position is not None and (
-                "Content-Length" in headers or "Transfer-Encoding" in headers
-            )
-
-            # Attempt to rewind consumed file-like object.
-            if rewindable:
-                rewind_body(prepared_request)
-
             # Override the original request.
             req = prepared_request
 
-            if yield_requests:
-                yield req
-            else:
-                resp = self.send(
-                    req,
-                    stream=stream,
-                    timeout=timeout,
-                    verify=verify,
-                    cert=cert,
-                    proxies=proxies,
-                    allow_redirects=False,
-                    **adapter_kwargs,
-                )
+            resp = self.send(
+                req,
+                stream=stream,
+                timeout=timeout,
+                verify=verify,
+                cert=cert,
+                proxies=proxies,
+                allow_redirects=False,
+            )
 
-                extract_cookies_to_jar(self.cookies, prepared_request, resp.raw)
+            extract_cookies_to_jar(self.cookies, prepared_request, resp.raw)
 
-                # extract redirect url, if any, for the next loop
-                url = self.get_redirect_target(resp)
-                yield resp
+            i += 1
+            yield resp
 
     def rebuild_auth(self, prepared_request, response):
-        """When being redirected we may want to strip authentication from the
+        """
+        When being redirected we may want to strip authentication from the
         request to avoid leaking credentials. This method intelligently removes
         and reapplies authentication where possible to avoid credential loss.
         """
         headers = prepared_request.headers
         url = prepared_request.url
 
-        if "Authorization" in headers and self.should_strip_auth(
-            response.request.url, url
-        ):
+        if 'Authorization' in headers:
             # If we get redirected to a new host, we should strip out any
-            # authentication headers.
-            del headers["Authorization"]
+            # authentication headers.
+            original_parsed = urlparse(response.request.url)
+            redirect_parsed = urlparse(url)
+
+            if (original_parsed.hostname != redirect_parsed.hostname):
+                del headers['Authorization']
 
         # .netrc might have more auth for us on our new host.
         new_auth = get_netrc_auth(url) if self.trust_env else None
         if new_auth is not None:
             prepared_request.prepare_auth(new_auth)
 
+        return
+
     def rebuild_proxies(self, prepared_request, proxies):
-        """This method re-evaluates the proxy configuration by considering the
+        """
+        This method re-evaluates the proxy configuration by considering the
         environment variables. If we are redirected to a URL covered by
         NO_PROXY, we strip the proxy configuration. Otherwise, we set missing
         proxy keys for this URL (in case they were stripped by a previous
@@ -308,50 +232,33 @@ class SessionRedirectMixin:
 
         This method also replaces the Proxy-Authorization header where
         necessary.
-
-        :rtype: dict
         """
         headers = prepared_request.headers
-        scheme = urlparse(prepared_request.url).scheme
-        new_proxies = resolve_proxies(prepared_request, proxies, self.trust_env)
+        url = prepared_request.url
+        scheme = urlparse(url).scheme
+        new_proxies = proxies.copy() if proxies is not None else {}
 
-        if "Proxy-Authorization" in headers:
-            del headers["Proxy-Authorization"]
+        if self.trust_env and not should_bypass_proxies(url):
+            environ_proxies = get_environ_proxies(url)
+
+            proxy = environ_proxies.get(scheme)
+
+            if proxy:
+                new_proxies.setdefault(scheme, environ_proxies[scheme])
+
+        if 'Proxy-Authorization' in headers:
+            del headers['Proxy-Authorization']
 
         try:
             username, password = get_auth_from_url(new_proxies[scheme])
         except KeyError:
             username, password = None, None
 
-        # urllib3 handles proxy authorization for us in the standard adapter.
-        # Avoid appending this to TLS tunneled requests where it may be leaked.
-        if not scheme.startswith("https") and username and password:
-            headers["Proxy-Authorization"] = _basic_auth_str(username, password)
+        if username and password:
+            headers['Proxy-Authorization'] = _basic_auth_str(username, password)
 
         return new_proxies
 
-    def rebuild_method(self, prepared_request, response):
-        """When being redirected we may want to change the method of the request
-        based on certain specs or browser behavior.
-        """
-        method = prepared_request.method
-
-        # https://tools.ietf.org/html/rfc7231#section-6.4.4
-        if response.status_code == codes.see_other and method != "HEAD":
-            method = "GET"
-
-        # Do what the browsers do, despite standards...
-        # First, turn 302s into GETs.
-        if response.status_code == codes.found and method != "HEAD":
-            method = "GET"
-
-        # Second, if a POST is responded to with a 301, turn it into a GET.
-        # This bizarre behaviour is explained in Issue 1704.
-        if response.status_code == codes.moved and method == "POST":
-            method = "GET"
-
-        prepared_request.method = method
-
 
 class Session(SessionRedirectMixin):
     """A Requests session.
@@ -362,32 +269,18 @@ class Session(SessionRedirectMixin):
 
       >>> import requests
       >>> s = requests.Session()
-      >>> s.get('https://httpbin.org/get')
-      <Response [200]>
-
-    Or as a context manager::
-
-      >>> with requests.Session() as s:
-      ...     s.get('https://httpbin.org/get')
-      <Response [200]>
+      >>> s.get('http://httpbin.org/get')
+      200
     """
 
     __attrs__ = [
-        "headers",
-        "cookies",
-        "auth",
-        "proxies",
-        "hooks",
-        "params",
-        "verify",
-        "cert",
-        "adapters",
-        "stream",
-        "trust_env",
-        "max_redirects",
+        'headers', 'cookies', 'auth', 'proxies', 'hooks', 'params', 'verify',
+        'cert', 'prefetch', 'adapters', 'stream', 'trust_env',
+        'max_redirects',
     ]
 
     def __init__(self):
+
         #: A case-insensitive dictionary of headers to be sent on each
         #: :class:`Request <Request>` sent from this
         #: :class:`Session <Session>`.
@@ -397,9 +290,9 @@ class Session(SessionRedirectMixin):
         #: :class:`Request <Request>`.
         self.auth = None
 
-        #: Dictionary mapping protocol or protocol and host to the URL of the proxy
-        #: (e.g. {'http': 'foo.bar:3128', 'http://host.name': 'foo.bar:4012'}) to
-        #: be used on each :class:`Request <Request>`.
+        #: Dictionary mapping protocol to the URL of the proxy (e.g.
+        #: {'http': 'foo.bar:3128'}) to be used on each
+        #: :class:`Request <Request>`.
         self.proxies = {}
 
         #: Event-handling hooks.
@@ -414,27 +307,16 @@ class Session(SessionRedirectMixin):
         self.stream = False
 
         #: SSL Verification default.
-        #: Defaults to `True`, requiring requests to verify the TLS certificate at the
-        #: remote end.
-        #: If verify is set to `False`, requests will accept any TLS certificate
-        #: presented by the server, and will ignore hostname mismatches and/or
-        #: expired certificates, which will make your application vulnerable to
-        #: man-in-the-middle (MitM) attacks.
-        #: Only set this to `False` for testing.
         self.verify = True
 
-        #: SSL client certificate default, if String, path to ssl client
-        #: cert file (.pem). If Tuple, ('cert', 'key') pair.
+        #: SSL certificate default.
         self.cert = None
 
         #: Maximum number of redirects allowed. If the request exceeds this
         #: limit, a :class:`TooManyRedirects` exception is raised.
-        #: This defaults to requests.models.DEFAULT_REDIRECT_LIMIT, which is
-        #: 30.
         self.max_redirects = DEFAULT_REDIRECT_LIMIT
 
-        #: Trust environment settings for proxy configuration, default
-        #: authentication and similar.
+        #: Should we trust the environment?
         self.trust_env = True
 
         #: A CookieJar containing all currently outstanding cookies set on this
@@ -445,8 +327,11 @@ class Session(SessionRedirectMixin):
 
         # Default connection adapters.
         self.adapters = OrderedDict()
-        self.mount("https://", HTTPAdapter())
-        self.mount("http://", HTTPAdapter())
+        self.mount('https://', HTTPAdapter())
+        self.mount('http://', HTTPAdapter())
+
+        # Only store 1000 redirects to prevent using infinite memory
+        self.redirect_cache = RecentlyUsedContainer(REDIRECT_CACHE_SIZE)
 
     def __enter__(self):
         return self
@@ -462,7 +347,6 @@ class Session(SessionRedirectMixin):
 
         :param request: :class:`Request` instance to prepare with this
             session's settings.
-        :rtype: requests.PreparedRequest
         """
         cookies = request.cookies or {}
 
@@ -472,8 +356,8 @@ class Session(SessionRedirectMixin):
 
         # Merge with session cookies
         merged_cookies = merge_cookies(
-            merge_cookies(RequestsCookieJar(), self.cookies), cookies
-        )
+            merge_cookies(RequestsCookieJar(), self.cookies), cookies)
+
 
         # Set environment's basic authentication if not explicitly set.
         auth = request.auth
@@ -487,9 +371,7 @@ class Session(SessionRedirectMixin):
             files=request.files,
             data=request.data,
             json=request.json,
-            headers=merge_setting(
-                request.headers, self.headers, dict_class=CaseInsensitiveDict
-            ),
+            headers=merge_setting(request.headers, self.headers, dict_class=CaseInsensitiveDict),
             params=merge_setting(request.params, self.params),
             auth=merge_setting(auth, self.auth),
             cookies=merged_cookies,
@@ -497,10 +379,7 @@ class Session(SessionRedirectMixin):
         )
         return p
 
-    def request(
-        self,
-        method,
-        url,
+    def request(self, method, url,
         params=None,
         data=None,
         headers=None,
@@ -514,8 +393,7 @@ class Session(SessionRedirectMixin):
         stream=None,
         verify=None,
         cert=None,
-        json=None,
-    ):
+        json=None):
         """Constructs a :class:`Request <Request>`, prepares it and sends it.
         Returns :class:`Response <Response>` object.
 
@@ -523,8 +401,8 @@ class Session(SessionRedirectMixin):
         :param url: URL for the new :class:`Request` object.
         :param params: (optional) Dictionary or bytes to be sent in the query
             string for the :class:`Request`.
-        :param data: (optional) Dictionary, list of tuples, bytes, or file-like
-            object to send in the body of the :class:`Request`.
+        :param data: (optional) Dictionary or bytes to send in the body of the
+            :class:`Request`.
         :param json: (optional) json to send in the body of the
             :class:`Request`.
         :param headers: (optional) Dictionary of HTTP Headers to send with the
@@ -536,41 +414,35 @@ class Session(SessionRedirectMixin):
         :param auth: (optional) Auth tuple or callable to enable
             Basic/Digest/Custom HTTP Auth.
         :param timeout: (optional) How long to wait for the server to send
-            data before giving up, as a float, or a :ref:`(connect timeout,
-            read timeout) <timeouts>` tuple.
+            data before giving up, as a float, or a (`connect timeout, read
+            timeout <user/advanced.html#timeouts>`_) tuple.
         :type timeout: float or tuple
         :param allow_redirects: (optional) Set to True by default.
         :type allow_redirects: bool
-        :param proxies: (optional) Dictionary mapping protocol or protocol and
-            hostname to the URL of the proxy.
-        :param hooks: (optional) Dictionary mapping hook name to one event or
-            list of events, event must be callable.
+        :param proxies: (optional) Dictionary mapping protocol to the URL of
+            the proxy.
         :param stream: (optional) whether to immediately download the response
             content. Defaults to ``False``.
-        :param verify: (optional) Either a boolean, in which case it controls whether we verify
-            the server's TLS certificate, or a string, in which case it must be a path
-            to a CA bundle to use. Defaults to ``True``. When set to
-            ``False``, requests will accept any TLS certificate presented by
-            the server, and will ignore hostname mismatches and/or expired
-            certificates, which will make your application vulnerable to
-            man-in-the-middle (MitM) attacks. Setting verify to ``False``
-            may be useful during local development or testing.
+        :param verify: (optional) if ``True``, the SSL cert will be verified.
+            A CA_BUNDLE path can also be provided.
         :param cert: (optional) if String, path to ssl client cert file (.pem).
             If Tuple, ('cert', 'key') pair.
-        :rtype: requests.Response
         """
+
+        method = to_native_string(method)
+
         # Create the Request.
         req = Request(
-            method=method.upper(),
-            url=url,
-            headers=headers,
-            files=files,
-            data=data or {},
-            json=json,
-            params=params or {},
-            auth=auth,
-            cookies=cookies,
-            hooks=hooks,
+            method = method.upper(),
+            url = url,
+            headers = headers,
+            files = files,
+            data = data or {},
+            json = json,
+            params = params or {},
+            auth = auth,
+            cookies = cookies,
+            hooks = hooks,
         )
         prep = self.prepare_request(req)
 
@@ -582,8 +454,8 @@ class Session(SessionRedirectMixin):
 
         # Send the request.
         send_kwargs = {
-            "timeout": timeout,
-            "allow_redirects": allow_redirects,
+            'timeout': timeout,
+            'allow_redirects': allow_redirects,
         }
         send_kwargs.update(settings)
         resp = self.send(prep, **send_kwargs)
@@ -591,139 +463,140 @@ class Session(SessionRedirectMixin):
         return resp
 
     def get(self, url, **kwargs):
-        r"""Sends a GET request. Returns :class:`Response` object.
+        """Sends a GET request. Returns :class:`Response` object.
 
         :param url: URL for the new :class:`Request` object.
         :param \*\*kwargs: Optional arguments that ``request`` takes.
-        :rtype: requests.Response
         """
 
-        kwargs.setdefault("allow_redirects", True)
-        return self.request("GET", url, **kwargs)
+        kwargs.setdefault('allow_redirects', True)
+        return self.request('GET', url, **kwargs)
 
     def options(self, url, **kwargs):
-        r"""Sends a OPTIONS request. Returns :class:`Response` object.
+        """Sends a OPTIONS request. Returns :class:`Response` object.
 
         :param url: URL for the new :class:`Request` object.
         :param \*\*kwargs: Optional arguments that ``request`` takes.
-        :rtype: requests.Response
         """
 
-        kwargs.setdefault("allow_redirects", True)
-        return self.request("OPTIONS", url, **kwargs)
+        kwargs.setdefault('allow_redirects', True)
+        return self.request('OPTIONS', url, **kwargs)
 
     def head(self, url, **kwargs):
-        r"""Sends a HEAD request. Returns :class:`Response` object.
+        """Sends a HEAD request. Returns :class:`Response` object.
 
         :param url: URL for the new :class:`Request` object.
         :param \*\*kwargs: Optional arguments that ``request`` takes.
-        :rtype: requests.Response
         """
 
-        kwargs.setdefault("allow_redirects", False)
-        return self.request("HEAD", url, **kwargs)
+        kwargs.setdefault('allow_redirects', False)
+        return self.request('HEAD', url, **kwargs)
 
     def post(self, url, data=None, json=None, **kwargs):
-        r"""Sends a POST request. Returns :class:`Response` object.
+        """Sends a POST request. Returns :class:`Response` object.
 
         :param url: URL for the new :class:`Request` object.
-        :param data: (optional) Dictionary, list of tuples, bytes, or file-like
-            object to send in the body of the :class:`Request`.
+        :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
         :param json: (optional) json to send in the body of the :class:`Request`.
         :param \*\*kwargs: Optional arguments that ``request`` takes.
-        :rtype: requests.Response
         """
 
-        return self.request("POST", url, data=data, json=json, **kwargs)
+        return self.request('POST', url, data=data, json=json, **kwargs)
 
     def put(self, url, data=None, **kwargs):
-        r"""Sends a PUT request. Returns :class:`Response` object.
+        """Sends a PUT request. Returns :class:`Response` object.
 
         :param url: URL for the new :class:`Request` object.
-        :param data: (optional) Dictionary, list of tuples, bytes, or file-like
-            object to send in the body of the :class:`Request`.
+        :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
         :param \*\*kwargs: Optional arguments that ``request`` takes.
-        :rtype: requests.Response
         """
 
-        return self.request("PUT", url, data=data, **kwargs)
+        return self.request('PUT', url, data=data, **kwargs)
 
     def patch(self, url, data=None, **kwargs):
-        r"""Sends a PATCH request. Returns :class:`Response` object.
+        """Sends a PATCH request. Returns :class:`Response` object.
 
         :param url: URL for the new :class:`Request` object.
-        :param data: (optional) Dictionary, list of tuples, bytes, or file-like
-            object to send in the body of the :class:`Request`.
+        :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
         :param \*\*kwargs: Optional arguments that ``request`` takes.
-        :rtype: requests.Response
         """
 
-        return self.request("PATCH", url, data=data, **kwargs)
+        return self.request('PATCH', url,  data=data, **kwargs)
 
     def delete(self, url, **kwargs):
-        r"""Sends a DELETE request. Returns :class:`Response` object.
+        """Sends a DELETE request. Returns :class:`Response` object.
 
         :param url: URL for the new :class:`Request` object.
         :param \*\*kwargs: Optional arguments that ``request`` takes.
-        :rtype: requests.Response
         """
 
-        return self.request("DELETE", url, **kwargs)
+        return self.request('DELETE', url, **kwargs)
 
     def send(self, request, **kwargs):
-        """Send a given PreparedRequest.
-
-        :rtype: requests.Response
-        """
+        """Send a given PreparedRequest."""
         # Set defaults that the hooks can utilize to ensure they always have
         # the correct parameters to reproduce the previous request.
-        kwargs.setdefault("stream", self.stream)
-        kwargs.setdefault("verify", self.verify)
-        kwargs.setdefault("cert", self.cert)
-        if "proxies" not in kwargs:
-            kwargs["proxies"] = resolve_proxies(request, self.proxies, self.trust_env)
+        kwargs.setdefault('stream', self.stream)
+        kwargs.setdefault('verify', self.verify)
+        kwargs.setdefault('cert', self.cert)
+        kwargs.setdefault('proxies', self.proxies)
 
         # It's possible that users might accidentally send a Request object.
         # Guard against that specific failure case.
-        if isinstance(request, Request):
-            raise ValueError("You can only send PreparedRequests.")
+        if not isinstance(request, PreparedRequest):
+            raise ValueError('You can only send PreparedRequests.')
+
+        checked_urls = set()
+        while request.url in self.redirect_cache:
+            checked_urls.add(request.url)
+            new_url = self.redirect_cache.get(request.url)
+            if new_url in checked_urls:
+                break
+            request.url = new_url
 
         # Set up variables needed for resolve_redirects and dispatching of hooks
-        allow_redirects = kwargs.pop("allow_redirects", True)
-        stream = kwargs.get("stream")
+        allow_redirects = kwargs.pop('allow_redirects', True)
+        stream = kwargs.get('stream')
+        timeout = kwargs.get('timeout')
+        verify = kwargs.get('verify')
+        cert = kwargs.get('cert')
+        proxies = kwargs.get('proxies')
         hooks = request.hooks
 
         # Get the appropriate adapter to use
         adapter = self.get_adapter(url=request.url)
 
         # Start time (approximately) of the request
-        start = preferred_clock()
+        start = datetime.utcnow()
 
         # Send the request
         r = adapter.send(request, **kwargs)
 
         # Total elapsed time of the request (approximately)
-        elapsed = preferred_clock() - start
-        r.elapsed = timedelta(seconds=elapsed)
+        r.elapsed = datetime.utcnow() - start
 
         # Response manipulation hooks
-        r = dispatch_hook("response", hooks, r, **kwargs)
+        r = dispatch_hook('response', hooks, r, **kwargs)
 
         # Persist cookies
         if r.history:
+
             # If the hooks create history then we want those cookies too
             for resp in r.history:
                 extract_cookies_to_jar(self.cookies, resp.request, resp.raw)
 
         extract_cookies_to_jar(self.cookies, request, r.raw)
 
+        # Redirect resolving generator.
+        gen = self.resolve_redirects(r, request,
+            stream=stream,
+            timeout=timeout,
+            verify=verify,
+            cert=cert,
+            proxies=proxies)
+
         # Resolve redirects if allowed.
-        if allow_redirects:
-            # Redirect resolving generator.
-            gen = self.resolve_redirects(r, request, **kwargs)
-            history = [resp for resp in gen]
-        else:
-            history = []
+        history = [resp for resp in gen] if allow_redirects else []
 
         # Shuffle things around if there's history.
         if history:
@@ -733,42 +606,25 @@ class Session(SessionRedirectMixin):
             r = history.pop()
             r.history = history
 
-        # If redirects aren't being followed, store the response on the Request for Response.next().
-        if not allow_redirects:
-            try:
-                r._next = next(
-                    self.resolve_redirects(r, request, yield_requests=True, **kwargs)
-                )
-            except StopIteration:
-                pass
-
         if not stream:
             r.content
 
         return r
 
     def merge_environment_settings(self, url, proxies, stream, verify, cert):
-        """
-        Check the environment and merge it with some settings.
-
-        :rtype: dict
-        """
+        """Check the environment and merge it with some settings."""
         # Gather clues from the surrounding environment.
         if self.trust_env:
             # Set environment's proxies.
-            no_proxy = proxies.get("no_proxy") if proxies is not None else None
-            env_proxies = get_environ_proxies(url, no_proxy=no_proxy)
-            for k, v in env_proxies.items():
+            env_proxies = get_environ_proxies(url) or {}
+            for (k, v) in env_proxies.items():
                 proxies.setdefault(k, v)
 
-            # Look for requests environment configuration
-            # and be compatible with cURL.
+            # Look for requests environment configuration and be compatible
+            # with cURL.
             if verify is True or verify is None:
-                verify = (
-                    os.environ.get("REQUESTS_CA_BUNDLE")
-                    or os.environ.get("CURL_CA_BUNDLE")
-                    or verify
-                )
+                verify = (os.environ.get('REQUESTS_CA_BUNDLE') or
+                          os.environ.get('CURL_CA_BUNDLE'))
 
         # Merge all the kwargs.
         proxies = merge_setting(proxies, self.proxies)
@@ -776,20 +632,18 @@ class Session(SessionRedirectMixin):
         verify = merge_setting(verify, self.verify)
         cert = merge_setting(cert, self.cert)
 
-        return {"proxies": proxies, "stream": stream, "verify": verify, "cert": cert}
+        return {'verify': verify, 'proxies': proxies, 'stream': stream,
+                'cert': cert}
 
     def get_adapter(self, url):
-        """
-        Returns the appropriate connection adapter for the given URL.
+        """Returns the appropriate connnection adapter for the given URL."""
+        for (prefix, adapter) in self.adapters.items():
 
-        :rtype: requests.adapters.BaseAdapter
-        """
-        for prefix, adapter in self.adapters.items():
-            if url.lower().startswith(prefix.lower()):
+            if url.lower().startswith(prefix):
                 return adapter
 
         # Nothing matches :-/
-        raise InvalidSchema(f"No connection adapters were found for {url!r}")
+        raise InvalidSchema("No connection adapters were found for '%s'" % url)
 
     def close(self):
         """Closes all adapters and as such the session"""
@@ -799,8 +653,8 @@ class Session(SessionRedirectMixin):
     def mount(self, prefix, adapter):
         """Registers a connection adapter to a prefix.
 
-        Adapters are sorted in descending order by prefix length.
-        """
+        Adapters are sorted in descending order by key length."""
+
         self.adapters[prefix] = adapter
         keys_to_move = [k for k in self.adapters if len(k) < len(prefix)]
 
@@ -808,24 +662,21 @@ class Session(SessionRedirectMixin):
             self.adapters[key] = self.adapters.pop(key)
 
     def __getstate__(self):
-        state = {attr: getattr(self, attr, None) for attr in self.__attrs__}
+        state = dict((attr, getattr(self, attr, None)) for attr in self.__attrs__)
+        state['redirect_cache'] = dict(self.redirect_cache)
         return state
 
     def __setstate__(self, state):
+        redirect_cache = state.pop('redirect_cache', {})
         for attr, value in state.items():
             setattr(self, attr, value)
 
+        self.redirect_cache = RecentlyUsedContainer(REDIRECT_CACHE_SIZE)
+        for redirect, to in redirect_cache.items():
+            self.redirect_cache[redirect] = to
+
 
 def session():
-    """
-    Returns a :class:`Session` for context-management.
+    """Returns a :class:`Session` for context-management."""
 
-    .. deprecated:: 1.0.0
-
-        This method has been deprecated since version 1.0.0 and is only kept for
-        backwards compatibility. New code should use :class:`~requests.sessions.Session`
-        to create a session. This may be removed at a future date.
-
-    :rtype: Session
-    """
     return Session()
diff --git a/lib/requests/status_codes.py b/lib/requests/status_codes.py
index c7945a2f..e0887f21 100644
--- a/lib/requests/status_codes.py
+++ b/lib/requests/status_codes.py
@@ -1,128 +1,89 @@
-r"""
-The ``codes`` object defines a mapping from common names for HTTP statuses
-to their numerical codes, accessible either as attributes or as dictionary
-items.
-
-Example::
-
-    >>> import requests
-    >>> requests.codes['temporary_redirect']
-    307
-    >>> requests.codes.teapot
-    418
-    >>> requests.codes['\o/']
-    200
-
-Some codes have multiple names, and both upper- and lower-case versions of
-the names are allowed. For example, ``codes.ok``, ``codes.OK``, and
-``codes.okay`` all correspond to the HTTP status code 200.
-"""
+# -*- coding: utf-8 -*-
 
 from .structures import LookupDict
 
 _codes = {
+
     # Informational.
-    100: ("continue",),
-    101: ("switching_protocols",),
-    102: ("processing", "early-hints"),
-    103: ("checkpoint",),
-    122: ("uri_too_long", "request_uri_too_long"),
-    200: ("ok", "okay", "all_ok", "all_okay", "all_good", "\\o/", "✓"),
-    201: ("created",),
-    202: ("accepted",),
-    203: ("non_authoritative_info", "non_authoritative_information"),
-    204: ("no_content",),
-    205: ("reset_content", "reset"),
-    206: ("partial_content", "partial"),
-    207: ("multi_status", "multiple_status", "multi_stati", "multiple_stati"),
-    208: ("already_reported",),
-    226: ("im_used",),
+    100: ('continue',),
+    101: ('switching_protocols',),
+    102: ('processing',),
+    103: ('checkpoint',),
+    122: ('uri_too_long', 'request_uri_too_long'),
+    200: ('ok', 'okay', 'all_ok', 'all_okay', 'all_good', '\\o/', '✓'),
+    201: ('created',),
+    202: ('accepted',),
+    203: ('non_authoritative_info', 'non_authoritative_information'),
+    204: ('no_content',),
+    205: ('reset_content', 'reset'),
+    206: ('partial_content', 'partial'),
+    207: ('multi_status', 'multiple_status', 'multi_stati', 'multiple_stati'),
+    208: ('already_reported',),
+    226: ('im_used',),
+
     # Redirection.
-    300: ("multiple_choices",),
-    301: ("moved_permanently", "moved", "\\o-"),
-    302: ("found",),
-    303: ("see_other", "other"),
-    304: ("not_modified",),
-    305: ("use_proxy",),
-    306: ("switch_proxy",),
-    307: ("temporary_redirect", "temporary_moved", "temporary"),
-    308: (
-        "permanent_redirect",
-        "resume_incomplete",
-        "resume",
-    ),  # "resume" and "resume_incomplete" to be removed in 3.0
+    300: ('multiple_choices',),
+    301: ('moved_permanently', 'moved', '\\o-'),
+    302: ('found',),
+    303: ('see_other', 'other'),
+    304: ('not_modified',),
+    305: ('use_proxy',),
+    306: ('switch_proxy',),
+    307: ('temporary_redirect', 'temporary_moved', 'temporary'),
+    308: ('permanent_redirect',
+          'resume_incomplete', 'resume',), # These 2 to be removed in 3.0
+
     # Client Error.
-    400: ("bad_request", "bad"),
-    401: ("unauthorized",),
-    402: ("payment_required", "payment"),
-    403: ("forbidden",),
-    404: ("not_found", "-o-"),
-    405: ("method_not_allowed", "not_allowed"),
-    406: ("not_acceptable",),
-    407: ("proxy_authentication_required", "proxy_auth", "proxy_authentication"),
-    408: ("request_timeout", "timeout"),
-    409: ("conflict",),
-    410: ("gone",),
-    411: ("length_required",),
-    412: ("precondition_failed", "precondition"),
-    413: ("request_entity_too_large", "content_too_large"),
-    414: ("request_uri_too_large", "uri_too_long"),
-    415: ("unsupported_media_type", "unsupported_media", "media_type"),
-    416: (
-        "requested_range_not_satisfiable",
-        "requested_range",
-        "range_not_satisfiable",
-    ),
-    417: ("expectation_failed",),
-    418: ("im_a_teapot", "teapot", "i_am_a_teapot"),
-    421: ("misdirected_request",),
-    422: ("unprocessable_entity", "unprocessable", "unprocessable_content"),
-    423: ("locked",),
-    424: ("failed_dependency", "dependency"),
-    425: ("unordered_collection", "unordered", "too_early"),
-    426: ("upgrade_required", "upgrade"),
-    428: ("precondition_required", "precondition"),
-    429: ("too_many_requests", "too_many"),
-    431: ("header_fields_too_large", "fields_too_large"),
-    444: ("no_response", "none"),
-    449: ("retry_with", "retry"),
-    450: ("blocked_by_windows_parental_controls", "parental_controls"),
-    451: ("unavailable_for_legal_reasons", "legal_reasons"),
-    499: ("client_closed_request",),
+    400: ('bad_request', 'bad'),
+    401: ('unauthorized',),
+    402: ('payment_required', 'payment'),
+    403: ('forbidden',),
+    404: ('not_found', '-o-'),
+    405: ('method_not_allowed', 'not_allowed'),
+    406: ('not_acceptable',),
+    407: ('proxy_authentication_required', 'proxy_auth', 'proxy_authentication'),
+    408: ('request_timeout', 'timeout'),
+    409: ('conflict',),
+    410: ('gone',),
+    411: ('length_required',),
+    412: ('precondition_failed', 'precondition'),
+    413: ('request_entity_too_large',),
+    414: ('request_uri_too_large',),
+    415: ('unsupported_media_type', 'unsupported_media', 'media_type'),
+    416: ('requested_range_not_satisfiable', 'requested_range', 'range_not_satisfiable'),
+    417: ('expectation_failed',),
+    418: ('im_a_teapot', 'teapot', 'i_am_a_teapot'),
+    422: ('unprocessable_entity', 'unprocessable'),
+    423: ('locked',),
+    424: ('failed_dependency', 'dependency'),
+    425: ('unordered_collection', 'unordered'),
+    426: ('upgrade_required', 'upgrade'),
+    428: ('precondition_required', 'precondition'),
+    429: ('too_many_requests', 'too_many'),
+    431: ('header_fields_too_large', 'fields_too_large'),
+    444: ('no_response', 'none'),
+    449: ('retry_with', 'retry'),
+    450: ('blocked_by_windows_parental_controls', 'parental_controls'),
+    451: ('unavailable_for_legal_reasons', 'legal_reasons'),
+    499: ('client_closed_request',),
+
     # Server Error.
-    500: ("internal_server_error", "server_error", "/o\\", "✗"),
-    501: ("not_implemented",),
-    502: ("bad_gateway",),
-    503: ("service_unavailable", "unavailable"),
-    504: ("gateway_timeout",),
-    505: ("http_version_not_supported", "http_version"),
-    506: ("variant_also_negotiates",),
-    507: ("insufficient_storage",),
-    509: ("bandwidth_limit_exceeded", "bandwidth"),
-    510: ("not_extended",),
-    511: ("network_authentication_required", "network_auth", "network_authentication"),
+    500: ('internal_server_error', 'server_error', '/o\\', '✗'),
+    501: ('not_implemented',),
+    502: ('bad_gateway',),
+    503: ('service_unavailable', 'unavailable'),
+    504: ('gateway_timeout',),
+    505: ('http_version_not_supported', 'http_version'),
+    506: ('variant_also_negotiates',),
+    507: ('insufficient_storage',),
+    509: ('bandwidth_limit_exceeded', 'bandwidth'),
+    510: ('not_extended',),
 }
 
-codes = LookupDict(name="status_codes")
+codes = LookupDict(name='status_codes')
 
-
-def _init():
-    for code, titles in _codes.items():
-        for title in titles:
-            setattr(codes, title, code)
-            if not title.startswith(("\\", "/")):
-                setattr(codes, title.upper(), code)
-
-    def doc(code):
-        names = ", ".join(f"``{n}``" for n in _codes[code])
-        return "* %d: %s" % (code, names)
-
-    global __doc__
-    __doc__ = (
-        __doc__ + "\n" + "\n".join(doc(code) for code in sorted(_codes))
-        if __doc__ is not None
-        else None
-    )
-
-
-_init()
+for (code, titles) in list(_codes.items()):
+    for title in titles:
+        setattr(codes, title, code)
+        if not title.startswith('\\'):
+            setattr(codes, title.upper(), code)
diff --git a/lib/requests/structures.py b/lib/requests/structures.py
index 188e13e4..3e5f2faa 100644
--- a/lib/requests/structures.py
+++ b/lib/requests/structures.py
@@ -1,20 +1,22 @@
+# -*- coding: utf-8 -*-
+
 """
 requests.structures
 ~~~~~~~~~~~~~~~~~~~
 
 Data structures that power Requests.
+
 """
 
-from collections import OrderedDict
-
-from .compat import Mapping, MutableMapping
+import collections
 
 
-class CaseInsensitiveDict(MutableMapping):
-    """A case-insensitive ``dict``-like object.
+class CaseInsensitiveDict(collections.MutableMapping):
+    """
+    A case-insensitive ``dict``-like object.
 
     Implements all methods and operations of
-    ``MutableMapping`` as well as dict's ``copy``. Also
+    ``collections.MutableMapping`` as well as dict's ``copy``. Also
     provides ``lower_items``.
 
     All keys are expected to be strings. The structure remembers the
@@ -35,10 +37,10 @@ class CaseInsensitiveDict(MutableMapping):
     If the constructor, ``.update``, or equality comparison
     operations are given keys that have equal ``.lower()``s, the
     behavior is undefined.
-    """
 
+    """
     def __init__(self, data=None, **kwargs):
-        self._store = OrderedDict()
+        self._store = dict()
         if data is None:
             data = {}
         self.update(data, **kwargs)
@@ -62,10 +64,14 @@ class CaseInsensitiveDict(MutableMapping):
 
     def lower_items(self):
         """Like iteritems(), but with all lowercase keys."""
-        return ((lowerkey, keyval[1]) for (lowerkey, keyval) in self._store.items())
+        return (
+            (lowerkey, keyval[1])
+            for (lowerkey, keyval)
+            in self._store.items()
+        )
 
     def __eq__(self, other):
-        if isinstance(other, Mapping):
+        if isinstance(other, collections.Mapping):
             other = CaseInsensitiveDict(other)
         else:
             return NotImplemented
@@ -79,16 +85,15 @@ class CaseInsensitiveDict(MutableMapping):
     def __repr__(self):
         return str(dict(self.items()))
 
-
 class LookupDict(dict):
     """Dictionary lookup object."""
 
     def __init__(self, name=None):
         self.name = name
-        super().__init__()
+        super(LookupDict, self).__init__()
 
     def __repr__(self):
-        return f"<lookup '{self.name}'>"
+        return '<lookup \'%s\'>' % (self.name)
 
     def __getitem__(self, key):
         # We allow fall-through here, so values default to None
diff --git a/lib/requests/utils.py b/lib/requests/utils.py
index ae6c42f6..74679414 100644
--- a/lib/requests/utils.py
+++ b/lib/requests/utils.py
@@ -1,227 +1,86 @@
+# -*- coding: utf-8 -*-
+
 """
 requests.utils
 ~~~~~~~~~~~~~~
 
 This module provides utility functions that are used within Requests
 that are also useful for external consumption.
+
 """
 
+import cgi
 import codecs
-import contextlib
+import collections
 import io
 import os
+import platform
 import re
+import sys
 import socket
 import struct
-import sys
-import tempfile
 import warnings
-import zipfile
-from collections import OrderedDict
-
-from urllib3.util import make_headers, parse_url
 
+from . import __version__
 from . import certs
-from .__version__ import __version__
-
-# to_native_string is unused here, but imported here for backwards compatibility
-from ._internal_utils import (  # noqa: F401
-    _HEADER_VALIDATORS_BYTE,
-    _HEADER_VALIDATORS_STR,
-    HEADER_VALIDATORS,
-    to_native_string,
-)
-from .compat import (
-    Mapping,
-    basestring,
-    bytes,
-    getproxies,
-    getproxies_environment,
-    integer_types,
-)
 from .compat import parse_http_list as _parse_list_header
-from .compat import (
-    proxy_bypass,
-    proxy_bypass_environment,
-    quote,
-    str,
-    unquote,
-    urlparse,
-    urlunparse,
-)
-from .cookies import cookiejar_from_dict
-from .exceptions import (
-    FileModeWarning,
-    InvalidHeader,
-    InvalidURL,
-    UnrewindableBodyError,
-)
+from .compat import (quote, urlparse, bytes, str, OrderedDict, unquote, is_py2,
+                     builtin_str, getproxies, proxy_bypass, urlunparse)
+from .cookies import RequestsCookieJar, cookiejar_from_dict
 from .structures import CaseInsensitiveDict
+from .exceptions import InvalidURL
 
-NETRC_FILES = (".netrc", "_netrc")
+_hush_pyflakes = (RequestsCookieJar,)
+
+NETRC_FILES = ('.netrc', '_netrc')
 
 DEFAULT_CA_BUNDLE_PATH = certs.where()
 
-DEFAULT_PORTS = {"http": 80, "https": 443}
-
-# Ensure that ', ' is used to preserve previous delimiter behavior.
-DEFAULT_ACCEPT_ENCODING = ", ".join(
-    re.split(r",\s*", make_headers(accept_encoding=True)["accept-encoding"])
-)
-
-
-if sys.platform == "win32":
-    # provide a proxy_bypass version on Windows without DNS lookups
-
-    def proxy_bypass_registry(host):
-        try:
-            import winreg
-        except ImportError:
-            return False
-
-        try:
-            internetSettings = winreg.OpenKey(
-                winreg.HKEY_CURRENT_USER,
-                r"Software\Microsoft\Windows\CurrentVersion\Internet Settings",
-            )
-            # ProxyEnable could be REG_SZ or REG_DWORD, normalizing it
-            proxyEnable = int(winreg.QueryValueEx(internetSettings, "ProxyEnable")[0])
-            # ProxyOverride is almost always a string
-            proxyOverride = winreg.QueryValueEx(internetSettings, "ProxyOverride")[0]
-        except (OSError, ValueError):
-            return False
-        if not proxyEnable or not proxyOverride:
-            return False
-
-        # make a check value list from the registry entry: replace the
-        # '<local>' string by the localhost entry and the corresponding
-        # canonical entry.
-        proxyOverride = proxyOverride.split(";")
-        # filter out empty strings to avoid re.match return true in the following code.
-        proxyOverride = filter(None, proxyOverride)
-        # now check if we match one of the registry values.
-        for test in proxyOverride:
-            if test == "<local>":
-                if "." not in host:
-                    return True
-            test = test.replace(".", r"\.")  # mask dots
-            test = test.replace("*", r".*")  # change glob sequence
-            test = test.replace("?", r".")  # change glob char
-            if re.match(test, host, re.I):
-                return True
-        return False
-
-    def proxy_bypass(host):  # noqa
-        """Return True, if the host should be bypassed.
-
-        Checks proxy settings gathered from the environment, if specified,
-        or the registry.
-        """
-        if getproxies_environment():
-            return proxy_bypass_environment(host)
-        else:
-            return proxy_bypass_registry(host)
-
 
 def dict_to_sequence(d):
     """Returns an internal sequence dictionary update."""
 
-    if hasattr(d, "items"):
+    if hasattr(d, 'items'):
         d = d.items()
 
     return d
 
 
 def super_len(o):
-    total_length = None
-    current_position = 0
+    if hasattr(o, '__len__'):
+        return len(o)
 
-    if isinstance(o, str):
-        o = o.encode("utf-8")
+    if hasattr(o, 'len'):
+        return o.len
 
-    if hasattr(o, "__len__"):
-        total_length = len(o)
-
-    elif hasattr(o, "len"):
-        total_length = o.len
-
-    elif hasattr(o, "fileno"):
+    if hasattr(o, 'fileno'):
         try:
             fileno = o.fileno()
-        except (io.UnsupportedOperation, AttributeError):
-            # AttributeError is a surprising exception, seeing as how we've just checked
-            # that `hasattr(o, 'fileno')`.  It happens for objects obtained via
-            # `Tarfile.extractfile()`, per issue 5229.
+        except io.UnsupportedOperation:
             pass
         else:
-            total_length = os.fstat(fileno).st_size
+            return os.fstat(fileno).st_size
 
-            # Having used fstat to determine the file length, we need to
-            # confirm that this file was opened up in binary mode.
-            if "b" not in o.mode:
-                warnings.warn(
-                    (
-                        "Requests has determined the content-length for this "
-                        "request using the binary size of the file: however, the "
-                        "file has been opened in text mode (i.e. without the 'b' "
-                        "flag in the mode). This may lead to an incorrect "
-                        "content-length. In Requests 3.0, support will be removed "
-                        "for files in text mode."
-                    ),
-                    FileModeWarning,
-                )
-
-    if hasattr(o, "tell"):
-        try:
-            current_position = o.tell()
-        except OSError:
-            # This can happen in some weird situations, such as when the file
-            # is actually a special file descriptor like stdin. In this
-            # instance, we don't know what the length is, so set it to zero and
-            # let requests chunk it instead.
-            if total_length is not None:
-                current_position = total_length
-        else:
-            if hasattr(o, "seek") and total_length is None:
-                # StringIO and BytesIO have seek but no usable fileno
-                try:
-                    # seek to end of file
-                    o.seek(0, 2)
-                    total_length = o.tell()
-
-                    # seek back to current position to support
-                    # partially read file-like objects
-                    o.seek(current_position or 0)
-                except OSError:
-                    total_length = 0
-
-    if total_length is None:
-        total_length = 0
-
-    return max(0, total_length - current_position)
+    if hasattr(o, 'getvalue'):
+        # e.g. BytesIO, cStringIO.StringIO
+        return len(o.getvalue())
 
 
-def get_netrc_auth(url, raise_errors=False):
+def get_netrc_auth(url):
     """Returns the Requests tuple auth for a given url from netrc."""
 
-    netrc_file = os.environ.get("NETRC")
-    if netrc_file is not None:
-        netrc_locations = (netrc_file,)
-    else:
-        netrc_locations = (f"~/{f}" for f in NETRC_FILES)
-
     try:
-        from netrc import NetrcParseError, netrc
+        from netrc import netrc, NetrcParseError
 
         netrc_path = None
 
-        for f in netrc_locations:
+        for f in NETRC_FILES:
             try:
-                loc = os.path.expanduser(f)
+                loc = os.path.expanduser('~/{0}'.format(f))
             except KeyError:
                 # os.path.expanduser can fail when $HOME is undefined and
-                # getpwuid fails. See https://bugs.python.org/issue20164 &
-                # https://github.com/psf/requests/issues/1846
+                # getpwuid fails. See http://bugs.python.org/issue20164 &
+                # https://github.com/kennethreitz/requests/issues/1846
                 return
 
             if os.path.exists(loc):
@@ -234,87 +93,32 @@ def get_netrc_auth(url, raise_errors=False):
 
         ri = urlparse(url)
 
-        # Strip port numbers from netloc. This weird `if...encode`` dance is
-        # used for Python 3.2, which doesn't support unicode literals.
-        splitstr = b":"
-        if isinstance(url, str):
-            splitstr = splitstr.decode("ascii")
-        host = ri.netloc.split(splitstr)[0]
+        # Strip port numbers from netloc
+        host = ri.netloc.split(':')[0]
 
         try:
             _netrc = netrc(netrc_path).authenticators(host)
             if _netrc:
                 # Return with login / password
-                login_i = 0 if _netrc[0] else 1
+                login_i = (0 if _netrc[0] else 1)
                 return (_netrc[login_i], _netrc[2])
-        except (NetrcParseError, OSError):
+        except (NetrcParseError, IOError):
             # If there was a parsing error or a permissions issue reading the file,
-            # we'll just skip netrc auth unless explicitly asked to raise errors.
-            if raise_errors:
-                raise
+            # we'll just skip netrc auth
+            pass
 
-    # App Engine hackiness.
+    # AppEngine hackiness.
     except (ImportError, AttributeError):
         pass
 
 
 def guess_filename(obj):
     """Tries to guess the filename of the given object."""
-    name = getattr(obj, "name", None)
-    if name and isinstance(name, basestring) and name[0] != "<" and name[-1] != ">":
+    name = getattr(obj, 'name', None)
+    if name and isinstance(name, builtin_str) and name[0] != '<' and name[-1] != '>':
         return os.path.basename(name)
 
 
-def extract_zipped_paths(path):
-    """Replace nonexistent paths that look like they refer to a member of a zip
-    archive with the location of an extracted copy of the target, or else
-    just return the provided path unchanged.
-    """
-    if os.path.exists(path):
-        # this is already a valid path, no need to do anything further
-        return path
-
-    # find the first valid part of the provided path and treat that as a zip archive
-    # assume the rest of the path is the name of a member in the archive
-    archive, member = os.path.split(path)
-    while archive and not os.path.exists(archive):
-        archive, prefix = os.path.split(archive)
-        if not prefix:
-            # If we don't check for an empty prefix after the split (in other words, archive remains unchanged after the split),
-            # we _can_ end up in an infinite loop on a rare corner case affecting a small number of users
-            break
-        member = "/".join([prefix, member])
-
-    if not zipfile.is_zipfile(archive):
-        return path
-
-    zip_file = zipfile.ZipFile(archive)
-    if member not in zip_file.namelist():
-        return path
-
-    # we have a valid zip archive and a valid member of that archive
-    tmp = tempfile.gettempdir()
-    extracted_path = os.path.join(tmp, member.split("/")[-1])
-    if not os.path.exists(extracted_path):
-        # use read + write to avoid the creating nested folders, we only want the file, avoids mkdir racing condition
-        with atomic_open(extracted_path) as file_handler:
-            file_handler.write(zip_file.read(member))
-    return extracted_path
-
-
-@contextlib.contextmanager
-def atomic_open(filename):
-    """Write a file to the disk in an atomic fashion"""
-    tmp_descriptor, tmp_name = tempfile.mkstemp(dir=os.path.dirname(filename))
-    try:
-        with os.fdopen(tmp_descriptor, "wb") as tmp_handler:
-            yield tmp_handler
-        os.replace(tmp_name, filename)
-    except BaseException:
-        os.remove(tmp_name)
-        raise
-
-
 def from_key_val_list(value):
     """Take an object and test to see if it can be represented as a
     dictionary. Unless it can not be represented as such, return an
@@ -325,19 +129,15 @@ def from_key_val_list(value):
         >>> from_key_val_list([('key', 'val')])
         OrderedDict([('key', 'val')])
         >>> from_key_val_list('string')
-        Traceback (most recent call last):
-        ...
-        ValueError: cannot encode objects that are not 2-tuples
+        ValueError: need more than 1 value to unpack
         >>> from_key_val_list({'key': 'val'})
         OrderedDict([('key', 'val')])
-
-    :rtype: OrderedDict
     """
     if value is None:
         return None
 
     if isinstance(value, (str, bytes, bool, int)):
-        raise ValueError("cannot encode objects that are not 2-tuples")
+        raise ValueError('cannot encode objects that are not 2-tuples')
 
     return OrderedDict(value)
 
@@ -353,19 +153,15 @@ def to_key_val_list(value):
         >>> to_key_val_list({'key': 'val'})
         [('key', 'val')]
         >>> to_key_val_list('string')
-        Traceback (most recent call last):
-        ...
-        ValueError: cannot encode objects that are not 2-tuples
-
-    :rtype: list
+        ValueError: cannot encode objects that are not 2-tuples.
     """
     if value is None:
         return None
 
     if isinstance(value, (str, bytes, bool, int)):
-        raise ValueError("cannot encode objects that are not 2-tuples")
+        raise ValueError('cannot encode objects that are not 2-tuples')
 
-    if isinstance(value, Mapping):
+    if isinstance(value, collections.Mapping):
         value = value.items()
 
     return list(value)
@@ -393,7 +189,6 @@ def parse_list_header(value):
 
     :param value: a string with a list header.
     :return: :class:`list`
-    :rtype: list
     """
     result = []
     for item in _parse_list_header(value):
@@ -424,14 +219,13 @@ def parse_dict_header(value):
 
     :param value: a string with a dict header.
     :return: :class:`dict`
-    :rtype: dict
     """
     result = {}
     for item in _parse_list_header(value):
-        if "=" not in item:
+        if '=' not in item:
             result[item] = None
             continue
-        name, value = item.split("=", 1)
+        name, value = item.split('=', 1)
         if value[:1] == value[-1:] == '"':
             value = unquote_header_value(value[1:-1])
         result[name] = value
@@ -445,7 +239,6 @@ def unquote_header_value(value, is_filename=False):
     using for quoting.
 
     :param value: the header value to unquote.
-    :rtype: str
     """
     if value and value[0] == value[-1] == '"':
         # this is not the real unquoting, but fixing this so that the
@@ -459,8 +252,8 @@ def unquote_header_value(value, is_filename=False):
         # replace sequence below on a UNC path has the effect of turning
         # the leading double slash into a single slash and then
         # _fix_ie_filename() doesn't work correctly.  See #458.
-        if not is_filename or value[:2] != "\\\\":
-            return value.replace("\\\\", "\\").replace('\\"', '"')
+        if not is_filename or value[:2] != '\\\\':
+            return value.replace('\\\\', '\\').replace('\\"', '"')
     return value
 
 
@@ -468,10 +261,13 @@ def dict_from_cookiejar(cj):
     """Returns a key/value dictionary from a CookieJar.
 
     :param cj: CookieJar object to extract cookies from.
-    :rtype: dict
     """
 
-    cookie_dict = {cookie.name: cookie.value for cookie in cj}
+    cookie_dict = {}
+
+    for cookie in cj:
+        cookie_dict[cookie.name] = cookie.value
+
     return cookie_dict
 
 
@@ -480,10 +276,11 @@ def add_dict_to_cookiejar(cj, cookie_dict):
 
     :param cj: CookieJar to insert cookies into.
     :param cookie_dict: Dict of key/values to insert into CookieJar.
-    :rtype: CookieJar
     """
 
-    return cookiejar_from_dict(cookie_dict, cj)
+    cj2 = cookiejar_from_dict(cookie_dict)
+    cj.update(cj2)
+    return cj
 
 
 def get_encodings_from_content(content):
@@ -491,89 +288,55 @@ def get_encodings_from_content(content):
 
     :param content: bytestring to extract encodings from.
     """
-    warnings.warn(
-        (
-            "In requests 3.0, get_encodings_from_content will be removed. For "
-            "more information, please see the discussion on issue #2266. (This"
-            " warning should only appear once.)"
-        ),
-        DeprecationWarning,
-    )
+    warnings.warn((
+        'In requests 3.0, get_encodings_from_content will be removed. For '
+        'more information, please see the discussion on issue #2266. (This'
+        ' warning should only appear once.)'),
+        DeprecationWarning)
 
     charset_re = re.compile(r'<meta.*?charset=["\']*(.+?)["\'>]', flags=re.I)
     pragma_re = re.compile(r'<meta.*?content=["\']*;?charset=(.+?)["\'>]', flags=re.I)
     xml_re = re.compile(r'^<\?xml.*?encoding=["\']*(.+?)["\'>]')
 
-    return (
-        charset_re.findall(content)
-        + pragma_re.findall(content)
-        + xml_re.findall(content)
-    )
-
-
-def _parse_content_type_header(header):
-    """Returns content type and parameters from given header
-
-    :param header: string
-    :return: tuple containing content type and dictionary of
-         parameters
-    """
-
-    tokens = header.split(";")
-    content_type, params = tokens[0].strip(), tokens[1:]
-    params_dict = {}
-    items_to_strip = "\"' "
-
-    for param in params:
-        param = param.strip()
-        if param:
-            key, value = param, True
-            index_of_equals = param.find("=")
-            if index_of_equals != -1:
-                key = param[:index_of_equals].strip(items_to_strip)
-                value = param[index_of_equals + 1 :].strip(items_to_strip)
-            params_dict[key.lower()] = value
-    return content_type, params_dict
+    return (charset_re.findall(content) +
+            pragma_re.findall(content) +
+            xml_re.findall(content))
 
 
 def get_encoding_from_headers(headers):
     """Returns encodings from given HTTP Header Dict.
 
     :param headers: dictionary to extract encoding from.
-    :rtype: str
     """
 
-    content_type = headers.get("content-type")
+    content_type = headers.get('content-type')
 
     if not content_type:
         return None
 
-    content_type, params = _parse_content_type_header(content_type)
+    content_type, params = cgi.parse_header(content_type)
 
-    if "charset" in params:
-        return params["charset"].strip("'\"")
+    if 'charset' in params:
+        return params['charset'].strip("'\"")
 
-    if "text" in content_type:
-        return "ISO-8859-1"
-
-    if "application/json" in content_type:
-        # Assume UTF-8 based on RFC 4627: https://www.ietf.org/rfc/rfc4627.txt since the charset was unset
-        return "utf-8"
+    if 'text' in content_type:
+        return 'ISO-8859-1'
 
 
 def stream_decode_response_unicode(iterator, r):
-    """Stream decodes an iterator."""
+    """Stream decodes a iterator."""
 
     if r.encoding is None:
-        yield from iterator
+        for item in iterator:
+            yield item
         return
 
-    decoder = codecs.getincrementaldecoder(r.encoding)(errors="replace")
+    decoder = codecs.getincrementaldecoder(r.encoding)(errors='replace')
     for chunk in iterator:
         rv = decoder.decode(chunk)
         if rv:
             yield rv
-    rv = decoder.decode(b"", final=True)
+    rv = decoder.decode(b'', final=True)
     if rv:
         yield rv
 
@@ -581,10 +344,8 @@ def stream_decode_response_unicode(iterator, r):
 def iter_slices(string, slice_length):
     """Iterate over slices of a string."""
     pos = 0
-    if slice_length is None or slice_length <= 0:
-        slice_length = len(string)
     while pos < len(string):
-        yield string[pos : pos + slice_length]
+        yield string[pos:pos + slice_length]
         pos += slice_length
 
 
@@ -598,16 +359,12 @@ def get_unicode_from_response(r):
     1. charset from content-type
     2. fall back and replace all unicode characters
 
-    :rtype: str
     """
-    warnings.warn(
-        (
-            "In requests 3.0, get_unicode_from_response will be removed. For "
-            "more information, please see the discussion on issue #2266. (This"
-            " warning should only appear once.)"
-        ),
-        DeprecationWarning,
-    )
+    warnings.warn((
+        'In requests 3.0, get_unicode_from_response will be removed. For '
+        'more information, please see the discussion on issue #2266. (This'
+        ' warning should only appear once.)'),
+        DeprecationWarning)
 
     tried_encodings = []
 
@@ -622,39 +379,37 @@ def get_unicode_from_response(r):
 
     # Fall back:
     try:
-        return str(r.content, encoding, errors="replace")
+        return str(r.content, encoding, errors='replace')
     except TypeError:
         return r.content
 
 
 # The unreserved URI characters (RFC 3986)
 UNRESERVED_SET = frozenset(
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" + "0123456789-._~"
-)
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+    + "0123456789-._~")
 
 
 def unquote_unreserved(uri):
     """Un-escape any percent-escape sequences in a URI that are unreserved
     characters. This leaves all reserved, illegal and non-ASCII bytes encoded.
-
-    :rtype: str
     """
-    parts = uri.split("%")
+    parts = uri.split('%')
     for i in range(1, len(parts)):
         h = parts[i][0:2]
         if len(h) == 2 and h.isalnum():
             try:
                 c = chr(int(h, 16))
             except ValueError:
-                raise InvalidURL(f"Invalid percent-escape sequence: '{h}'")
+                raise InvalidURL("Invalid percent-escape sequence: '%s'" % h)
 
             if c in UNRESERVED_SET:
                 parts[i] = c + parts[i][2:]
             else:
-                parts[i] = f"%{parts[i]}"
+                parts[i] = '%' + parts[i]
         else:
-            parts[i] = f"%{parts[i]}"
-    return "".join(parts)
+            parts[i] = '%' + parts[i]
+    return ''.join(parts)
 
 
 def requote_uri(uri):
@@ -662,69 +417,48 @@ def requote_uri(uri):
 
     This function passes the given URI through an unquote/quote cycle to
     ensure that it is fully and consistently quoted.
-
-    :rtype: str
     """
-    safe_with_percent = "!#$%&'()*+,/:;=?@[]~"
-    safe_without_percent = "!#$&'()*+,/:;=?@[]~"
-    try:
-        # Unquote only the unreserved characters
-        # Then quote only illegal characters (do not quote reserved,
-        # unreserved, or '%')
-        return quote(unquote_unreserved(uri), safe=safe_with_percent)
-    except InvalidURL:
-        # We couldn't unquote the given URI, so let's try quoting it, but
-        # there may be unquoted '%'s in the URI. We need to make sure they're
-        # properly quoted so they do not cause issues elsewhere.
-        return quote(uri, safe=safe_without_percent)
+    # Unquote only the unreserved characters
+    # Then quote only illegal characters (do not quote reserved, unreserved,
+    # or '%')
+    return quote(unquote_unreserved(uri), safe="!#$%&'()*+,/:;=?@[]~")
 
 
 def address_in_network(ip, net):
-    """This function allows you to check if an IP belongs to a network subnet
-
+    """
+    This function allows you to check if on IP belongs to a network subnet
     Example: returns True if ip = 192.168.1.1 and net = 192.168.1.0/24
              returns False if ip = 192.168.1.1 and net = 192.168.100.0/24
-
-    :rtype: bool
     """
-    ipaddr = struct.unpack("=L", socket.inet_aton(ip))[0]
-    netaddr, bits = net.split("/")
-    netmask = struct.unpack("=L", socket.inet_aton(dotted_netmask(int(bits))))[0]
-    network = struct.unpack("=L", socket.inet_aton(netaddr))[0] & netmask
+    ipaddr = struct.unpack('=L', socket.inet_aton(ip))[0]
+    netaddr, bits = net.split('/')
+    netmask = struct.unpack('=L', socket.inet_aton(dotted_netmask(int(bits))))[0]
+    network = struct.unpack('=L', socket.inet_aton(netaddr))[0] & netmask
     return (ipaddr & netmask) == (network & netmask)
 
 
 def dotted_netmask(mask):
-    """Converts mask from /xx format to xxx.xxx.xxx.xxx
-
-    Example: if mask is 24 function returns 255.255.255.0
-
-    :rtype: str
     """
-    bits = 0xFFFFFFFF ^ (1 << 32 - mask) - 1
-    return socket.inet_ntoa(struct.pack(">I", bits))
+    Converts mask from /xx format to xxx.xxx.xxx.xxx
+    Example: if mask is 24 function returns 255.255.255.0
+    """
+    bits = 0xffffffff ^ (1 << 32 - mask) - 1
+    return socket.inet_ntoa(struct.pack('>I', bits))
 
 
 def is_ipv4_address(string_ip):
-    """
-    :rtype: bool
-    """
     try:
         socket.inet_aton(string_ip)
-    except OSError:
+    except socket.error:
         return False
     return True
 
 
 def is_valid_cidr(string_network):
-    """
-    Very simple check of the cidr format in no_proxy variable.
-
-    :rtype: bool
-    """
-    if string_network.count("/") == 1:
+    """Very simple check of the cidr format in no_proxy variable"""
+    if string_network.count('/') == 1:
         try:
-            mask = int(string_network.split("/")[1])
+            mask = int(string_network.split('/')[1])
         except ValueError:
             return False
 
@@ -732,208 +466,127 @@ def is_valid_cidr(string_network):
             return False
 
         try:
-            socket.inet_aton(string_network.split("/")[0])
-        except OSError:
+            socket.inet_aton(string_network.split('/')[0])
+        except socket.error:
             return False
     else:
         return False
     return True
 
 
-@contextlib.contextmanager
-def set_environ(env_name, value):
-    """Set the environment variable 'env_name' to 'value'
-
-    Save previous value, yield, and then restore the previous value stored in
-    the environment variable 'env_name'.
-
-    If 'value' is None, do nothing"""
-    value_changed = value is not None
-    if value_changed:
-        old_value = os.environ.get(env_name)
-        os.environ[env_name] = value
-    try:
-        yield
-    finally:
-        if value_changed:
-            if old_value is None:
-                del os.environ[env_name]
-            else:
-                os.environ[env_name] = old_value
-
-
-def should_bypass_proxies(url, no_proxy):
+def should_bypass_proxies(url):
     """
     Returns whether we should bypass proxies or not.
-
-    :rtype: bool
     """
-
-    # Prioritize lowercase environment variables over uppercase
-    # to keep a consistent behaviour with other http projects (curl, wget).
-    def get_proxy(key):
-        return os.environ.get(key) or os.environ.get(key.upper())
+    get_proxy = lambda k: os.environ.get(k) or os.environ.get(k.upper())
 
     # First check whether no_proxy is defined. If it is, check that the URL
     # we're getting isn't in the no_proxy list.
-    no_proxy_arg = no_proxy
-    if no_proxy is None:
-        no_proxy = get_proxy("no_proxy")
-    parsed = urlparse(url)
-
-    if parsed.hostname is None:
-        # URLs don't always have hostnames, e.g. file:/// urls.
-        return True
+    no_proxy = get_proxy('no_proxy')
+    netloc = urlparse(url).netloc
 
     if no_proxy:
         # We need to check whether we match here. We need to see if we match
-        # the end of the hostname, both with and without the port.
-        no_proxy = (host for host in no_proxy.replace(" ", "").split(",") if host)
+        # the end of the netloc, both with and without the port.
+        no_proxy = no_proxy.replace(' ', '').split(',')
 
-        if is_ipv4_address(parsed.hostname):
+        ip = netloc.split(':')[0]
+        if is_ipv4_address(ip):
             for proxy_ip in no_proxy:
                 if is_valid_cidr(proxy_ip):
-                    if address_in_network(parsed.hostname, proxy_ip):
+                    if address_in_network(ip, proxy_ip):
                         return True
-                elif parsed.hostname == proxy_ip:
-                    # If no_proxy ip was defined in plain IP notation instead of cidr notation &
-                    # matches the IP of the index
-                    return True
         else:
-            host_with_port = parsed.hostname
-            if parsed.port:
-                host_with_port += f":{parsed.port}"
-
             for host in no_proxy:
-                if parsed.hostname.endswith(host) or host_with_port.endswith(host):
+                if netloc.endswith(host) or netloc.split(':')[0].endswith(host):
                     # The URL does match something in no_proxy, so we don't want
                     # to apply the proxies on this URL.
                     return True
 
-    with set_environ("no_proxy", no_proxy_arg):
-        # parsed.hostname can be `None` in cases such as a file URI.
-        try:
-            bypass = proxy_bypass(parsed.hostname)
-        except (TypeError, socket.gaierror):
-            bypass = False
+    # If the system proxy settings indicate that this URL should be bypassed,
+    # don't proxy.
+    # The proxy_bypass function is incredibly buggy on OS X in early versions
+    # of Python 2.6, so allow this call to fail. Only catch the specific
+    # exceptions we've seen, though: this call failing in other ways can reveal
+    # legitimate problems.
+    try:
+        bypass = proxy_bypass(netloc)
+    except (TypeError, socket.gaierror):
+        bypass = False
 
     if bypass:
         return True
 
     return False
 
-
-def get_environ_proxies(url, no_proxy=None):
-    """
-    Return a dict of environment proxies.
-
-    :rtype: dict
-    """
-    if should_bypass_proxies(url, no_proxy=no_proxy):
+def get_environ_proxies(url):
+    """Return a dict of environment proxies."""
+    if should_bypass_proxies(url):
         return {}
     else:
         return getproxies()
 
 
-def select_proxy(url, proxies):
-    """Select a proxy for the url, if applicable.
-
-    :param url: The url being for the request
-    :param proxies: A dictionary of schemes or schemes and hosts to proxy URLs
-    """
-    proxies = proxies or {}
-    urlparts = urlparse(url)
-    if urlparts.hostname is None:
-        return proxies.get(urlparts.scheme, proxies.get("all"))
-
-    proxy_keys = [
-        urlparts.scheme + "://" + urlparts.hostname,
-        urlparts.scheme,
-        "all://" + urlparts.hostname,
-        "all",
-    ]
-    proxy = None
-    for proxy_key in proxy_keys:
-        if proxy_key in proxies:
-            proxy = proxies[proxy_key]
-            break
-
-    return proxy
-
-
-def resolve_proxies(request, proxies, trust_env=True):
-    """This method takes proxy information from a request and configuration
-    input to resolve a mapping of target proxies. This will consider settings
-    such as NO_PROXY to strip proxy configurations.
-
-    :param request: Request or PreparedRequest
-    :param proxies: A dictionary of schemes or schemes and hosts to proxy URLs
-    :param trust_env: Boolean declaring whether to trust environment configs
-
-    :rtype: dict
-    """
-    proxies = proxies if proxies is not None else {}
-    url = request.url
-    scheme = urlparse(url).scheme
-    no_proxy = proxies.get("no_proxy")
-    new_proxies = proxies.copy()
-
-    if trust_env and not should_bypass_proxies(url, no_proxy=no_proxy):
-        environ_proxies = get_environ_proxies(url, no_proxy=no_proxy)
-
-        proxy = environ_proxies.get(scheme, environ_proxies.get("all"))
-
-        if proxy:
-            new_proxies.setdefault(scheme, proxy)
-    return new_proxies
-
-
 def default_user_agent(name="python-requests"):
-    """
-    Return a string representing the default user agent.
+    """Return a string representing the default user agent."""
+    _implementation = platform.python_implementation()
 
-    :rtype: str
-    """
-    return f"{name}/{__version__}"
+    if _implementation == 'CPython':
+        _implementation_version = platform.python_version()
+    elif _implementation == 'PyPy':
+        _implementation_version = '%s.%s.%s' % (sys.pypy_version_info.major,
+                                                sys.pypy_version_info.minor,
+                                                sys.pypy_version_info.micro)
+        if sys.pypy_version_info.releaselevel != 'final':
+            _implementation_version = ''.join([_implementation_version, sys.pypy_version_info.releaselevel])
+    elif _implementation == 'Jython':
+        _implementation_version = platform.python_version()  # Complete Guess
+    elif _implementation == 'IronPython':
+        _implementation_version = platform.python_version()  # Complete Guess
+    else:
+        _implementation_version = 'Unknown'
+
+    try:
+        p_system = platform.system()
+        p_release = platform.release()
+    except IOError:
+        p_system = 'Unknown'
+        p_release = 'Unknown'
+
+    return " ".join(['%s/%s' % (name, __version__),
+                     '%s/%s' % (_implementation, _implementation_version),
+                     '%s/%s' % (p_system, p_release)])
 
 
 def default_headers():
-    """
-    :rtype: requests.structures.CaseInsensitiveDict
-    """
-    return CaseInsensitiveDict(
-        {
-            "User-Agent": default_user_agent(),
-            "Accept-Encoding": DEFAULT_ACCEPT_ENCODING,
-            "Accept": "*/*",
-            "Connection": "keep-alive",
-        }
-    )
+    return CaseInsensitiveDict({
+        'User-Agent': default_user_agent(),
+        'Accept-Encoding': ', '.join(('gzip', 'deflate')),
+        'Accept': '*/*',
+        'Connection': 'keep-alive',
+    })
 
 
 def parse_header_links(value):
-    """Return a list of parsed link headers proxies.
+    """Return a dict of parsed link headers proxies.
 
     i.e. Link: <http:/.../front.jpeg>; rel=front; type="image/jpeg",<http://.../back.jpeg>; rel=back;type="image/jpeg"
 
-    :rtype: list
     """
 
     links = []
 
     replace_chars = " '\""
 
-    value = value.strip(replace_chars)
-    if not value:
-        return links
-
     for val in re.split(", *<", value):
         try:
             url, params = val.split(";", 1)
         except ValueError:
-            url, params = val, ""
+            url, params = val, ''
 
-        link = {"url": url.strip("<> '\"")}
+        link = {}
+
+        link["url"] = url.strip("<> '\"")
 
         for param in params.split(";"):
             try:
@@ -949,123 +602,89 @@ def parse_header_links(value):
 
 
 # Null bytes; no need to recreate these on each call to guess_json_utf
-_null = "\x00".encode("ascii")  # encoding to ASCII for Python 3
+_null = '\x00'.encode('ascii')  # encoding to ASCII for Python 3
 _null2 = _null * 2
 _null3 = _null * 3
 
 
 def guess_json_utf(data):
-    """
-    :rtype: str
-    """
     # JSON always starts with two ASCII characters, so detection is as
     # easy as counting the nulls and from their location and count
     # determine the encoding. Also detect a BOM, if present.
     sample = data[:4]
-    if sample in (codecs.BOM_UTF32_LE, codecs.BOM_UTF32_BE):
-        return "utf-32"  # BOM included
+    if sample in (codecs.BOM_UTF32_LE, codecs.BOM32_BE):
+        return 'utf-32'     # BOM included
     if sample[:3] == codecs.BOM_UTF8:
-        return "utf-8-sig"  # BOM included, MS style (discouraged)
+        return 'utf-8-sig'  # BOM included, MS style (discouraged)
     if sample[:2] in (codecs.BOM_UTF16_LE, codecs.BOM_UTF16_BE):
-        return "utf-16"  # BOM included
+        return 'utf-16'     # BOM included
     nullcount = sample.count(_null)
     if nullcount == 0:
-        return "utf-8"
+        return 'utf-8'
     if nullcount == 2:
-        if sample[::2] == _null2:  # 1st and 3rd are null
-            return "utf-16-be"
+        if sample[::2] == _null2:   # 1st and 3rd are null
+            return 'utf-16-be'
         if sample[1::2] == _null2:  # 2nd and 4th are null
-            return "utf-16-le"
+            return 'utf-16-le'
         # Did not detect 2 valid UTF-16 ascii-range characters
     if nullcount == 3:
         if sample[:3] == _null3:
-            return "utf-32-be"
+            return 'utf-32-be'
         if sample[1:] == _null3:
-            return "utf-32-le"
+            return 'utf-32-le'
         # Did not detect a valid UTF-32 ascii-range character
     return None
 
 
 def prepend_scheme_if_needed(url, new_scheme):
-    """Given a URL that may or may not have a scheme, prepend the given scheme.
-    Does not replace a present scheme with the one provided as an argument.
+    '''Given a URL that may or may not have a scheme, prepend the given scheme.
+    Does not replace a present scheme with the one provided as an argument.'''
+    scheme, netloc, path, params, query, fragment = urlparse(url, new_scheme)
 
-    :rtype: str
-    """
-    parsed = parse_url(url)
-    scheme, auth, host, port, path, query, fragment = parsed
-
-    # A defect in urlparse determines that there isn't a netloc present in some
-    # urls. We previously assumed parsing was overly cautious, and swapped the
-    # netloc and path. Due to a lack of tests on the original defect, this is
-    # maintained with parse_url for backwards compatibility.
-    netloc = parsed.netloc
+    # urlparse is a finicky beast, and sometimes decides that there isn't a
+    # netloc present. Assume that it's being over-cautious, and switch netloc
+    # and path if urlparse decided there was no netloc.
     if not netloc:
         netloc, path = path, netloc
 
-    if auth:
-        # parse_url doesn't provide the netloc with auth
-        # so we'll add it ourselves.
-        netloc = "@".join([auth, netloc])
-    if scheme is None:
-        scheme = new_scheme
-    if path is None:
-        path = ""
-
-    return urlunparse((scheme, netloc, path, "", query, fragment))
+    return urlunparse((scheme, netloc, path, params, query, fragment))
 
 
 def get_auth_from_url(url):
     """Given a url with authentication components, extract them into a tuple of
-    username,password.
-
-    :rtype: (str,str)
-    """
+    username,password."""
     parsed = urlparse(url)
 
     try:
         auth = (unquote(parsed.username), unquote(parsed.password))
     except (AttributeError, TypeError):
-        auth = ("", "")
+        auth = ('', '')
 
     return auth
 
 
-def check_header_validity(header):
-    """Verifies that header parts don't contain leading whitespace
-    reserved characters, or return characters.
-
-    :param header: tuple, in the format (name, value).
+def to_native_string(string, encoding='ascii'):
     """
-    name, value = header
-    _validate_header_part(header, name, 0)
-    _validate_header_part(header, value, 1)
+    Given a string object, regardless of type, returns a representation of that
+    string in the native string type, encoding and decoding where necessary.
+    This assumes ASCII unless told otherwise.
+    """
+    out = None
 
-
-def _validate_header_part(header, header_part, header_validator_index):
-    if isinstance(header_part, str):
-        validator = _HEADER_VALIDATORS_STR[header_validator_index]
-    elif isinstance(header_part, bytes):
-        validator = _HEADER_VALIDATORS_BYTE[header_validator_index]
+    if isinstance(string, builtin_str):
+        out = string
     else:
-        raise InvalidHeader(
-            f"Header part ({header_part!r}) from {header} "
-            f"must be of type str or bytes, not {type(header_part)}"
-        )
+        if is_py2:
+            out = string.encode(encoding)
+        else:
+            out = string.decode(encoding)
 
-    if not validator.match(header_part):
-        header_kind = "name" if header_validator_index == 0 else "value"
-        raise InvalidHeader(
-            f"Invalid leading whitespace, reserved character(s), or return "
-            f"character(s) in header {header_kind}: {header_part!r}"
-        )
+    return out
 
 
 def urldefragauth(url):
     """
-    Given a url remove the fragment and the authentication part.
-
-    :rtype: str
+    Given a url remove the fragment and the authentication part
     """
     scheme, netloc, path, params, query, fragment = urlparse(url)
 
@@ -1073,24 +692,6 @@ def urldefragauth(url):
     if not netloc:
         netloc, path = path, netloc
 
-    netloc = netloc.rsplit("@", 1)[-1]
+    netloc = netloc.rsplit('@', 1)[-1]
 
-    return urlunparse((scheme, netloc, path, params, query, ""))
-
-
-def rewind_body(prepared_request):
-    """Move file pointer back to its recorded starting position
-    so it can be read again on redirect.
-    """
-    body_seek = getattr(prepared_request.body, "seek", None)
-    if body_seek is not None and isinstance(
-        prepared_request._body_position, integer_types
-    ):
-        try:
-            body_seek(prepared_request._body_position)
-        except OSError:
-            raise UnrewindableBodyError(
-                "An error occurred when rewinding request body for redirect."
-            )
-    else:
-        raise UnrewindableBodyError("Unable to rewind request body for redirect.")
+    return urlunparse((scheme, netloc, path, params, query, ''))
diff --git a/lib/requests_oauthlib/__init__.py b/lib/requests_oauthlib/__init__.py
deleted file mode 100644
index 865d72fb..00000000
--- a/lib/requests_oauthlib/__init__.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# ruff: noqa: F401
-import logging
-
-from .oauth1_auth import OAuth1
-from .oauth1_session import OAuth1Session
-from .oauth2_auth import OAuth2
-from .oauth2_session import OAuth2Session, TokenUpdated
-
-__version__ = "2.0.0"
-
-import requests
-
-if requests.__version__ < "2.0.0":
-    msg = (
-        "You are using requests version %s, which is older than "
-        "requests-oauthlib expects, please upgrade to 2.0.0 or later."
-    )
-    raise Warning(msg % requests.__version__)
-
-logging.getLogger("requests_oauthlib").addHandler(logging.NullHandler())
diff --git a/lib/requests_oauthlib/compliance_fixes/__init__.py b/lib/requests_oauthlib/compliance_fixes/__init__.py
deleted file mode 100644
index 8815ea0b..00000000
--- a/lib/requests_oauthlib/compliance_fixes/__init__.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# ruff: noqa: F401
-from .facebook import facebook_compliance_fix
-from .fitbit import fitbit_compliance_fix
-from .slack import slack_compliance_fix
-from .instagram import instagram_compliance_fix
-from .mailchimp import mailchimp_compliance_fix
-from .weibo import weibo_compliance_fix
-from .plentymarkets import plentymarkets_compliance_fix
-from .ebay import ebay_compliance_fix
diff --git a/lib/requests_oauthlib/compliance_fixes/douban.py b/lib/requests_oauthlib/compliance_fixes/douban.py
deleted file mode 100644
index c8b99c72..00000000
--- a/lib/requests_oauthlib/compliance_fixes/douban.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import json
-
-
-def douban_compliance_fix(session):
-    def fix_token_type(r):
-        token = json.loads(r.text)
-        token.setdefault("token_type", "Bearer")
-        fixed_token = json.dumps(token)
-        r._content = fixed_token.encode()
-        return r
-
-    session._client_default_token_placement = "query"
-    session.register_compliance_hook("access_token_response", fix_token_type)
-
-    return session
diff --git a/lib/requests_oauthlib/compliance_fixes/ebay.py b/lib/requests_oauthlib/compliance_fixes/ebay.py
deleted file mode 100644
index ef33f391..00000000
--- a/lib/requests_oauthlib/compliance_fixes/ebay.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import json
-
-
-def ebay_compliance_fix(session):
-    def _compliance_fix(response):
-        token = json.loads(response.text)
-
-        # eBay responds with non-compliant token types.
-        # https://developer.ebay.com/api-docs/static/oauth-client-credentials-grant.html
-        # https://developer.ebay.com/api-docs/static/oauth-auth-code-grant-request.html
-        # Modify these to be "Bearer".
-        if token.get("token_type") in ["Application Access Token", "User Access Token"]:
-            token["token_type"] = "Bearer"
-            fixed_token = json.dumps(token)
-            response._content = fixed_token.encode()
-
-        return response
-
-    session.register_compliance_hook("access_token_response", _compliance_fix)
-    session.register_compliance_hook("refresh_token_response", _compliance_fix)
-
-    return session
diff --git a/lib/requests_oauthlib/compliance_fixes/facebook.py b/lib/requests_oauthlib/compliance_fixes/facebook.py
deleted file mode 100644
index f44558a8..00000000
--- a/lib/requests_oauthlib/compliance_fixes/facebook.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from json import dumps
-from urllib.parse import parse_qsl
-
-
-def facebook_compliance_fix(session):
-    def _compliance_fix(r):
-        # if Facebook claims to be sending us json, let's trust them.
-        if "application/json" in r.headers.get("content-type", {}):
-            return r
-
-        # Facebook returns a content-type of text/plain when sending their
-        # x-www-form-urlencoded responses, along with a 200. If not, let's
-        # assume we're getting JSON and bail on the fix.
-        if "text/plain" in r.headers.get("content-type", {}) and r.status_code == 200:
-            token = dict(parse_qsl(r.text, keep_blank_values=True))
-        else:
-            return r
-
-        expires = token.get("expires")
-        if expires is not None:
-            token["expires_in"] = expires
-        token["token_type"] = "Bearer"
-        r._content = dumps(token).encode()
-        return r
-
-    session.register_compliance_hook("access_token_response", _compliance_fix)
-    return session
diff --git a/lib/requests_oauthlib/compliance_fixes/fitbit.py b/lib/requests_oauthlib/compliance_fixes/fitbit.py
deleted file mode 100644
index aacc68bf..00000000
--- a/lib/requests_oauthlib/compliance_fixes/fitbit.py
+++ /dev/null
@@ -1,23 +0,0 @@
-"""
-The Fitbit API breaks from the OAuth2 RFC standard by returning an "errors"
-object list, rather than a single "error" string. This puts hooks in place so
-that oauthlib can process an error in the results from access token and refresh
-token responses. This is necessary to prevent getting the generic red herring
-MissingTokenError.
-"""
-
-from json import loads, dumps
-
-
-def fitbit_compliance_fix(session):
-    def _missing_error(r):
-        token = loads(r.text)
-        if "errors" in token:
-            # Set the error to the first one we have
-            token["error"] = token["errors"][0]["errorType"]
-        r._content = dumps(token).encode()
-        return r
-
-    session.register_compliance_hook("access_token_response", _missing_error)
-    session.register_compliance_hook("refresh_token_response", _missing_error)
-    return session
diff --git a/lib/requests_oauthlib/compliance_fixes/instagram.py b/lib/requests_oauthlib/compliance_fixes/instagram.py
deleted file mode 100644
index 7d5a2ad4..00000000
--- a/lib/requests_oauthlib/compliance_fixes/instagram.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from urllib.parse import urlparse, parse_qs
-
-from oauthlib.common import add_params_to_uri
-
-
-def instagram_compliance_fix(session):
-    def _non_compliant_param_name(url, headers, data):
-        # If the user has already specified the token in the URL
-        # then there's nothing to do.
-        # If the specified token is different from ``session.access_token``,
-        # we assume the user intends to override the access token.
-        url_query = dict(parse_qs(urlparse(url).query))
-        token = url_query.get("access_token")
-        if token:
-            # Nothing to do, just return.
-            return url, headers, data
-
-        token = [("access_token", session.access_token)]
-        url = add_params_to_uri(url, token)
-        return url, headers, data
-
-    session.register_compliance_hook("protected_request", _non_compliant_param_name)
-    return session
diff --git a/lib/requests_oauthlib/compliance_fixes/mailchimp.py b/lib/requests_oauthlib/compliance_fixes/mailchimp.py
deleted file mode 100644
index 0d602659..00000000
--- a/lib/requests_oauthlib/compliance_fixes/mailchimp.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import json
-
-
-def mailchimp_compliance_fix(session):
-    def _null_scope(r):
-        token = json.loads(r.text)
-        if "scope" in token and token["scope"] is None:
-            token.pop("scope")
-        r._content = json.dumps(token).encode()
-        return r
-
-    def _non_zero_expiration(r):
-        token = json.loads(r.text)
-        if "expires_in" in token and token["expires_in"] == 0:
-            token["expires_in"] = 3600
-        r._content = json.dumps(token).encode()
-        return r
-
-    session.register_compliance_hook("access_token_response", _null_scope)
-    session.register_compliance_hook("access_token_response", _non_zero_expiration)
-    return session
diff --git a/lib/requests_oauthlib/compliance_fixes/plentymarkets.py b/lib/requests_oauthlib/compliance_fixes/plentymarkets.py
deleted file mode 100644
index 859f0566..00000000
--- a/lib/requests_oauthlib/compliance_fixes/plentymarkets.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from json import dumps, loads
-import re
-
-
-def plentymarkets_compliance_fix(session):
-    def _to_snake_case(n):
-        return re.sub("(.)([A-Z][a-z]+)", r"\1_\2", n).lower()
-
-    def _compliance_fix(r):
-        # Plenty returns the Token in CamelCase instead of _
-        if (
-            "application/json" in r.headers.get("content-type", {})
-            and r.status_code == 200
-        ):
-            token = loads(r.text)
-        else:
-            return r
-
-        fixed_token = {}
-        for k, v in token.items():
-            fixed_token[_to_snake_case(k)] = v
-
-        r._content = dumps(fixed_token).encode()
-        return r
-
-    session.register_compliance_hook("access_token_response", _compliance_fix)
-    return session
diff --git a/lib/requests_oauthlib/compliance_fixes/slack.py b/lib/requests_oauthlib/compliance_fixes/slack.py
deleted file mode 100644
index 9095a470..00000000
--- a/lib/requests_oauthlib/compliance_fixes/slack.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from urllib.parse import urlparse, parse_qs
-
-from oauthlib.common import add_params_to_uri
-
-
-def slack_compliance_fix(session):
-    def _non_compliant_param_name(url, headers, data):
-        # If the user has already specified the token, either in the URL
-        # or in a data dictionary, then there's nothing to do.
-        # If the specified token is different from ``session.access_token``,
-        # we assume the user intends to override the access token.
-        url_query = dict(parse_qs(urlparse(url).query))
-        token = url_query.get("token")
-        if not token and isinstance(data, dict):
-            token = data.get("token")
-
-        if token:
-            # Nothing to do, just return.
-            return url, headers, data
-
-        if not data:
-            data = {"token": session.access_token}
-        elif isinstance(data, dict):
-            data["token"] = session.access_token
-        else:
-            # ``data`` is something other than a dict: maybe a stream,
-            # maybe a file object, maybe something else. We can't easily
-            # modify it, so we'll set the token by modifying the URL instead.
-            token = [("token", session.access_token)]
-            url = add_params_to_uri(url, token)
-        return url, headers, data
-
-    session.register_compliance_hook("protected_request", _non_compliant_param_name)
-    return session
diff --git a/lib/requests_oauthlib/compliance_fixes/weibo.py b/lib/requests_oauthlib/compliance_fixes/weibo.py
deleted file mode 100644
index f1623fd6..00000000
--- a/lib/requests_oauthlib/compliance_fixes/weibo.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from json import loads, dumps
-
-
-def weibo_compliance_fix(session):
-    def _missing_token_type(r):
-        token = loads(r.text)
-        token["token_type"] = "Bearer"
-        r._content = dumps(token).encode()
-        return r
-
-    session._client.default_token_placement = "query"
-    session.register_compliance_hook("access_token_response", _missing_token_type)
-    return session
diff --git a/lib/requests_oauthlib/oauth1_auth.py b/lib/requests_oauthlib/oauth1_auth.py
deleted file mode 100644
index f8c0bd6e..00000000
--- a/lib/requests_oauthlib/oauth1_auth.py
+++ /dev/null
@@ -1,112 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging
-
-from oauthlib.common import extract_params
-from oauthlib.oauth1 import Client, SIGNATURE_HMAC, SIGNATURE_TYPE_AUTH_HEADER
-from oauthlib.oauth1 import SIGNATURE_TYPE_BODY
-from requests.utils import to_native_string
-from requests.auth import AuthBase
-
-CONTENT_TYPE_FORM_URLENCODED = "application/x-www-form-urlencoded"
-CONTENT_TYPE_MULTI_PART = "multipart/form-data"
-
-
-log = logging.getLogger(__name__)
-
-# OBS!: Correct signing of requests are conditional on invoking OAuth1
-# as the last step of preparing a request, or at least having the
-# content-type set properly.
-class OAuth1(AuthBase):
-    """Signs the request using OAuth 1 (RFC5849)"""
-
-    client_class = Client
-
-    def __init__(
-        self,
-        client_key,
-        client_secret=None,
-        resource_owner_key=None,
-        resource_owner_secret=None,
-        callback_uri=None,
-        signature_method=SIGNATURE_HMAC,
-        signature_type=SIGNATURE_TYPE_AUTH_HEADER,
-        rsa_key=None,
-        verifier=None,
-        decoding="utf-8",
-        client_class=None,
-        force_include_body=False,
-        **kwargs
-    ):
-
-        try:
-            signature_type = signature_type.upper()
-        except AttributeError:
-            pass
-
-        client_class = client_class or self.client_class
-
-        self.force_include_body = force_include_body
-
-        self.client = client_class(
-            client_key,
-            client_secret,
-            resource_owner_key,
-            resource_owner_secret,
-            callback_uri,
-            signature_method,
-            signature_type,
-            rsa_key,
-            verifier,
-            decoding=decoding,
-            **kwargs
-        )
-
-    def __call__(self, r):
-        """Add OAuth parameters to the request.
-
-        Parameters may be included from the body if the content-type is
-        urlencoded, if no content type is set a guess is made.
-        """
-        # Overwriting url is safe here as request will not modify it past
-        # this point.
-        log.debug("Signing request %s using client %s", r, self.client)
-
-        content_type = r.headers.get("Content-Type", "")
-        if (
-            not content_type
-            and extract_params(r.body)
-            or self.client.signature_type == SIGNATURE_TYPE_BODY
-        ):
-            content_type = CONTENT_TYPE_FORM_URLENCODED
-        if not isinstance(content_type, str):
-            content_type = content_type.decode("utf-8")
-
-        is_form_encoded = CONTENT_TYPE_FORM_URLENCODED in content_type
-
-        log.debug(
-            "Including body in call to sign: %s",
-            is_form_encoded or self.force_include_body,
-        )
-
-        if is_form_encoded:
-            r.headers["Content-Type"] = CONTENT_TYPE_FORM_URLENCODED
-            r.url, headers, r.body = self.client.sign(
-                str(r.url), str(r.method), r.body or "", r.headers
-            )
-        elif self.force_include_body:
-            # To allow custom clients to work on non form encoded bodies.
-            r.url, headers, r.body = self.client.sign(
-                str(r.url), str(r.method), r.body or "", r.headers
-            )
-        else:
-            # Omit body data in the signing of non form-encoded requests
-            r.url, headers, _ = self.client.sign(
-                str(r.url), str(r.method), None, r.headers
-            )
-
-        r.prepare_headers(headers)
-        r.url = to_native_string(r.url)
-        log.debug("Updated url: %s", r.url)
-        log.debug("Updated headers: %s", headers)
-        log.debug("Updated body: %r", r.body)
-        return r
diff --git a/lib/requests_oauthlib/oauth1_session.py b/lib/requests_oauthlib/oauth1_session.py
deleted file mode 100644
index 7625c808..00000000
--- a/lib/requests_oauthlib/oauth1_session.py
+++ /dev/null
@@ -1,395 +0,0 @@
-from urllib.parse import urlparse
-
-import logging
-
-from oauthlib.common import add_params_to_uri
-from oauthlib.common import urldecode as _urldecode
-from oauthlib.oauth1 import SIGNATURE_HMAC, SIGNATURE_RSA, SIGNATURE_TYPE_AUTH_HEADER
-import requests
-
-from . import OAuth1
-
-
-log = logging.getLogger(__name__)
-
-
-def urldecode(body):
-    """Parse query or json to python dictionary"""
-    try:
-        return _urldecode(body)
-    except Exception:
-        import json
-
-        return json.loads(body)
-
-
-class TokenRequestDenied(ValueError):
-    def __init__(self, message, response):
-        super(TokenRequestDenied, self).__init__(message)
-        self.response = response
-
-    @property
-    def status_code(self):
-        """For backwards-compatibility purposes"""
-        return self.response.status_code
-
-
-class TokenMissing(ValueError):
-    def __init__(self, message, response):
-        super(TokenMissing, self).__init__(message)
-        self.response = response
-
-
-class VerifierMissing(ValueError):
-    pass
-
-
-class OAuth1Session(requests.Session):
-    """Request signing and convenience methods for the oauth dance.
-
-    What is the difference between OAuth1Session and OAuth1?
-
-    OAuth1Session actually uses OAuth1 internally and its purpose is to assist
-    in the OAuth workflow through convenience methods to prepare authorization
-    URLs and parse the various token and redirection responses. It also provide
-    rudimentary validation of responses.
-
-    An example of the OAuth workflow using a basic CLI app and Twitter.
-
-    >>> # Credentials obtained during the registration.
-    >>> client_key = 'client key'
-    >>> client_secret = 'secret'
-    >>> callback_uri = 'https://127.0.0.1/callback'
-    >>>
-    >>> # Endpoints found in the OAuth provider API documentation
-    >>> request_token_url = 'https://api.twitter.com/oauth/request_token'
-    >>> authorization_url = 'https://api.twitter.com/oauth/authorize'
-    >>> access_token_url = 'https://api.twitter.com/oauth/access_token'
-    >>>
-    >>> oauth_session = OAuth1Session(client_key,client_secret=client_secret, callback_uri=callback_uri)
-    >>>
-    >>> # First step, fetch the request token.
-    >>> oauth_session.fetch_request_token(request_token_url)
-    {
-        'oauth_token': 'kjerht2309u',
-        'oauth_token_secret': 'lsdajfh923874',
-    }
-    >>>
-    >>> # Second step. Follow this link and authorize
-    >>> oauth_session.authorization_url(authorization_url)
-    'https://api.twitter.com/oauth/authorize?oauth_token=sdf0o9823sjdfsdf&oauth_callback=https%3A%2F%2F127.0.0.1%2Fcallback'
-    >>>
-    >>> # Third step. Fetch the access token
-    >>> redirect_response = input('Paste the full redirect URL here.')
-    >>> oauth_session.parse_authorization_response(redirect_response)
-    {
-        'oauth_token: 'kjerht2309u',
-        'oauth_token_secret: 'lsdajfh923874',
-        'oauth_verifier: 'w34o8967345',
-    }
-    >>> oauth_session.fetch_access_token(access_token_url)
-    {
-        'oauth_token': 'sdf0o9823sjdfsdf',
-        'oauth_token_secret': '2kjshdfp92i34asdasd',
-    }
-    >>> # Done. You can now make OAuth requests.
-    >>> status_url = 'http://api.twitter.com/1/statuses/update.json'
-    >>> new_status = {'status':  'hello world!'}
-    >>> oauth_session.post(status_url, data=new_status)
-    <Response [200]>
-    """
-
-    def __init__(
-        self,
-        client_key,
-        client_secret=None,
-        resource_owner_key=None,
-        resource_owner_secret=None,
-        callback_uri=None,
-        signature_method=SIGNATURE_HMAC,
-        signature_type=SIGNATURE_TYPE_AUTH_HEADER,
-        rsa_key=None,
-        verifier=None,
-        client_class=None,
-        force_include_body=False,
-        **kwargs
-    ):
-        """Construct the OAuth 1 session.
-
-        :param client_key: A client specific identifier.
-        :param client_secret: A client specific secret used to create HMAC and
-                              plaintext signatures.
-        :param resource_owner_key: A resource owner key, also referred to as
-                                   request token or access token depending on
-                                   when in the workflow it is used.
-        :param resource_owner_secret: A resource owner secret obtained with
-                                      either a request or access token. Often
-                                      referred to as token secret.
-        :param callback_uri: The URL the user is redirect back to after
-                             authorization.
-        :param signature_method: Signature methods determine how the OAuth
-                                 signature is created. The three options are
-                                 oauthlib.oauth1.SIGNATURE_HMAC (default),
-                                 oauthlib.oauth1.SIGNATURE_RSA and
-                                 oauthlib.oauth1.SIGNATURE_PLAIN.
-        :param signature_type: Signature type decides where the OAuth
-                               parameters are added. Either in the
-                               Authorization header (default) or to the URL
-                               query parameters or the request body. Defined as
-                               oauthlib.oauth1.SIGNATURE_TYPE_AUTH_HEADER,
-                               oauthlib.oauth1.SIGNATURE_TYPE_QUERY and
-                               oauthlib.oauth1.SIGNATURE_TYPE_BODY
-                               respectively.
-        :param rsa_key: The private RSA key as a string. Can only be used with
-                        signature_method=oauthlib.oauth1.SIGNATURE_RSA.
-        :param verifier: A verifier string to prove authorization was granted.
-        :param client_class: A subclass of `oauthlib.oauth1.Client` to use with
-                             `requests_oauthlib.OAuth1` instead of the default
-        :param force_include_body: Always include the request body in the
-                                   signature creation.
-        :param **kwargs: Additional keyword arguments passed to `OAuth1`
-        """
-        super(OAuth1Session, self).__init__()
-        self._client = OAuth1(
-            client_key,
-            client_secret=client_secret,
-            resource_owner_key=resource_owner_key,
-            resource_owner_secret=resource_owner_secret,
-            callback_uri=callback_uri,
-            signature_method=signature_method,
-            signature_type=signature_type,
-            rsa_key=rsa_key,
-            verifier=verifier,
-            client_class=client_class,
-            force_include_body=force_include_body,
-            **kwargs
-        )
-        self.auth = self._client
-
-    @property
-    def token(self):
-        oauth_token = self._client.client.resource_owner_key
-        oauth_token_secret = self._client.client.resource_owner_secret
-        oauth_verifier = self._client.client.verifier
-
-        token_dict = {}
-        if oauth_token:
-            token_dict["oauth_token"] = oauth_token
-        if oauth_token_secret:
-            token_dict["oauth_token_secret"] = oauth_token_secret
-        if oauth_verifier:
-            token_dict["oauth_verifier"] = oauth_verifier
-
-        return token_dict
-
-    @token.setter
-    def token(self, value):
-        self._populate_attributes(value)
-
-    @property
-    def authorized(self):
-        """Boolean that indicates whether this session has an OAuth token
-        or not. If `self.authorized` is True, you can reasonably expect
-        OAuth-protected requests to the resource to succeed. If
-        `self.authorized` is False, you need the user to go through the OAuth
-        authentication dance before OAuth-protected requests to the resource
-        will succeed.
-        """
-        if self._client.client.signature_method == SIGNATURE_RSA:
-            # RSA only uses resource_owner_key
-            return bool(self._client.client.resource_owner_key)
-        else:
-            # other methods of authentication use all three pieces
-            return (
-                bool(self._client.client.client_secret)
-                and bool(self._client.client.resource_owner_key)
-                and bool(self._client.client.resource_owner_secret)
-            )
-
-    def authorization_url(self, url, request_token=None, **kwargs):
-        """Create an authorization URL by appending request_token and optional
-        kwargs to url.
-
-        This is the second step in the OAuth 1 workflow. The user should be
-        redirected to this authorization URL, grant access to you, and then
-        be redirected back to you. The redirection back can either be specified
-        during client registration or by supplying a callback URI per request.
-
-        :param url: The authorization endpoint URL.
-        :param request_token: The previously obtained request token.
-        :param kwargs: Optional parameters to append to the URL.
-        :returns: The authorization URL with new parameters embedded.
-
-        An example using a registered default callback URI.
-
-        >>> request_token_url = 'https://api.twitter.com/oauth/request_token'
-        >>> authorization_url = 'https://api.twitter.com/oauth/authorize'
-        >>> oauth_session = OAuth1Session('client-key', client_secret='secret')
-        >>> oauth_session.fetch_request_token(request_token_url)
-        {
-            'oauth_token': 'sdf0o9823sjdfsdf',
-            'oauth_token_secret': '2kjshdfp92i34asdasd',
-        }
-        >>> oauth_session.authorization_url(authorization_url)
-        'https://api.twitter.com/oauth/authorize?oauth_token=sdf0o9823sjdfsdf'
-        >>> oauth_session.authorization_url(authorization_url, foo='bar')
-        'https://api.twitter.com/oauth/authorize?oauth_token=sdf0o9823sjdfsdf&foo=bar'
-
-        An example using an explicit callback URI.
-
-        >>> request_token_url = 'https://api.twitter.com/oauth/request_token'
-        >>> authorization_url = 'https://api.twitter.com/oauth/authorize'
-        >>> oauth_session = OAuth1Session('client-key', client_secret='secret', callback_uri='https://127.0.0.1/callback')
-        >>> oauth_session.fetch_request_token(request_token_url)
-        {
-            'oauth_token': 'sdf0o9823sjdfsdf',
-            'oauth_token_secret': '2kjshdfp92i34asdasd',
-        }
-        >>> oauth_session.authorization_url(authorization_url)
-        'https://api.twitter.com/oauth/authorize?oauth_token=sdf0o9823sjdfsdf&oauth_callback=https%3A%2F%2F127.0.0.1%2Fcallback'
-        """
-        kwargs["oauth_token"] = request_token or self._client.client.resource_owner_key
-        log.debug("Adding parameters %s to url %s", kwargs, url)
-        return add_params_to_uri(url, kwargs.items())
-
-    def fetch_request_token(self, url, realm=None, **request_kwargs):
-        """Fetch a request token.
-
-        This is the first step in the OAuth 1 workflow. A request token is
-        obtained by making a signed post request to url. The token is then
-        parsed from the application/x-www-form-urlencoded response and ready
-        to be used to construct an authorization url.
-
-        :param url: The request token endpoint URL.
-        :param realm: A list of realms to request access to.
-        :param request_kwargs: Optional arguments passed to ''post''
-            function in ''requests.Session''
-        :returns: The response in dict format.
-
-        Note that a previously set callback_uri will be reset for your
-        convenience, or else signature creation will be incorrect on
-        consecutive requests.
-
-        >>> request_token_url = 'https://api.twitter.com/oauth/request_token'
-        >>> oauth_session = OAuth1Session('client-key', client_secret='secret')
-        >>> oauth_session.fetch_request_token(request_token_url)
-        {
-            'oauth_token': 'sdf0o9823sjdfsdf',
-            'oauth_token_secret': '2kjshdfp92i34asdasd',
-        }
-        """
-        self._client.client.realm = " ".join(realm) if realm else None
-        token = self._fetch_token(url, **request_kwargs)
-        log.debug("Resetting callback_uri and realm (not needed in next phase).")
-        self._client.client.callback_uri = None
-        self._client.client.realm = None
-        return token
-
-    def fetch_access_token(self, url, verifier=None, **request_kwargs):
-        """Fetch an access token.
-
-        This is the final step in the OAuth 1 workflow. An access token is
-        obtained using all previously obtained credentials, including the
-        verifier from the authorization step.
-
-        Note that a previously set verifier will be reset for your
-        convenience, or else signature creation will be incorrect on
-        consecutive requests.
-
-        >>> access_token_url = 'https://api.twitter.com/oauth/access_token'
-        >>> redirect_response = 'https://127.0.0.1/callback?oauth_token=kjerht2309uf&oauth_token_secret=lsdajfh923874&oauth_verifier=w34o8967345'
-        >>> oauth_session = OAuth1Session('client-key', client_secret='secret')
-        >>> oauth_session.parse_authorization_response(redirect_response)
-        {
-            'oauth_token: 'kjerht2309u',
-            'oauth_token_secret: 'lsdajfh923874',
-            'oauth_verifier: 'w34o8967345',
-        }
-        >>> oauth_session.fetch_access_token(access_token_url)
-        {
-            'oauth_token': 'sdf0o9823sjdfsdf',
-            'oauth_token_secret': '2kjshdfp92i34asdasd',
-        }
-        """
-        if verifier:
-            self._client.client.verifier = verifier
-        if not getattr(self._client.client, "verifier", None):
-            raise VerifierMissing("No client verifier has been set.")
-        token = self._fetch_token(url, **request_kwargs)
-        log.debug("Resetting verifier attribute, should not be used anymore.")
-        self._client.client.verifier = None
-        return token
-
-    def parse_authorization_response(self, url):
-        """Extract parameters from the post authorization redirect response URL.
-
-        :param url: The full URL that resulted from the user being redirected
-                    back from the OAuth provider to you, the client.
-        :returns: A dict of parameters extracted from the URL.
-
-        >>> redirect_response = 'https://127.0.0.1/callback?oauth_token=kjerht2309uf&oauth_token_secret=lsdajfh923874&oauth_verifier=w34o8967345'
-        >>> oauth_session = OAuth1Session('client-key', client_secret='secret')
-        >>> oauth_session.parse_authorization_response(redirect_response)
-        {
-            'oauth_token: 'kjerht2309u',
-            'oauth_token_secret: 'lsdajfh923874',
-            'oauth_verifier: 'w34o8967345',
-        }
-        """
-        log.debug("Parsing token from query part of url %s", url)
-        token = dict(urldecode(urlparse(url).query))
-        log.debug("Updating internal client token attribute.")
-        self._populate_attributes(token)
-        self.token = token
-        return token
-
-    def _populate_attributes(self, token):
-        if "oauth_token" in token:
-            self._client.client.resource_owner_key = token["oauth_token"]
-        else:
-            raise TokenMissing(
-                "Response does not contain a token: {resp}".format(resp=token), token
-            )
-        if "oauth_token_secret" in token:
-            self._client.client.resource_owner_secret = token["oauth_token_secret"]
-        if "oauth_verifier" in token:
-            self._client.client.verifier = token["oauth_verifier"]
-
-    def _fetch_token(self, url, **request_kwargs):
-        log.debug("Fetching token from %s using client %s", url, self._client.client)
-        r = self.post(url, **request_kwargs)
-
-        if r.status_code >= 400:
-            error = "Token request failed with code %s, response was '%s'."
-            raise TokenRequestDenied(error % (r.status_code, r.text), r)
-
-        log.debug('Decoding token from response "%s"', r.text)
-        try:
-            token = dict(urldecode(r.text.strip()))
-        except ValueError as e:
-            error = (
-                "Unable to decode token from token response. "
-                "This is commonly caused by an unsuccessful request where"
-                " a non urlencoded error message is returned. "
-                "The decoding error was %s"
-                "" % e
-            )
-            raise ValueError(error)
-
-        log.debug("Obtained token %s", token)
-        log.debug("Updating internal client attributes from token data.")
-        self._populate_attributes(token)
-        self.token = token
-        return token
-
-    def rebuild_auth(self, prepared_request, response):
-        """
-        When being redirected we should always strip Authorization
-        header, since nonce may not be reused as per OAuth spec.
-        """
-        if "Authorization" in prepared_request.headers:
-            # If we get redirected to a new host, we should strip out
-            # any authentication headers.
-            prepared_request.headers.pop("Authorization", True)
-            prepared_request.prepare_auth(self.auth)
-        return
diff --git a/lib/requests_oauthlib/oauth2_auth.py b/lib/requests_oauthlib/oauth2_auth.py
deleted file mode 100644
index f19f52ac..00000000
--- a/lib/requests_oauthlib/oauth2_auth.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from oauthlib.oauth2 import WebApplicationClient, InsecureTransportError
-from oauthlib.oauth2 import is_secure_transport
-from requests.auth import AuthBase
-
-
-class OAuth2(AuthBase):
-    """Adds proof of authorization (OAuth2 token) to the request."""
-
-    def __init__(self, client_id=None, client=None, token=None):
-        """Construct a new OAuth 2 authorization object.
-
-        :param client_id: Client id obtained during registration
-        :param client: :class:`oauthlib.oauth2.Client` to be used. Default is
-                       WebApplicationClient which is useful for any
-                       hosted application but not mobile or desktop.
-        :param token: Token dictionary, must include access_token
-                      and token_type.
-        """
-        self._client = client or WebApplicationClient(client_id, token=token)
-        if token:
-            for k, v in token.items():
-                setattr(self._client, k, v)
-
-    def __call__(self, r):
-        """Append an OAuth 2 token to the request.
-
-        Note that currently HTTPS is required for all requests. There may be
-        a token type that allows for plain HTTP in the future and then this
-        should be updated to allow plain HTTP on a white list basis.
-        """
-        if not is_secure_transport(r.url):
-            raise InsecureTransportError()
-        r.url, r.headers, r.body = self._client.add_token(
-            r.url, http_method=r.method, body=r.body, headers=r.headers
-        )
-        return r
diff --git a/lib/requests_oauthlib/oauth2_session.py b/lib/requests_oauthlib/oauth2_session.py
deleted file mode 100644
index 93cc4d7b..00000000
--- a/lib/requests_oauthlib/oauth2_session.py
+++ /dev/null
@@ -1,587 +0,0 @@
-import logging
-
-from oauthlib.common import generate_token, urldecode
-from oauthlib.oauth2 import WebApplicationClient, InsecureTransportError
-from oauthlib.oauth2 import LegacyApplicationClient
-from oauthlib.oauth2 import TokenExpiredError, is_secure_transport
-import requests
-
-log = logging.getLogger(__name__)
-
-
-class TokenUpdated(Warning):
-    def __init__(self, token):
-        super(TokenUpdated, self).__init__()
-        self.token = token
-
-
-class OAuth2Session(requests.Session):
-    """Versatile OAuth 2 extension to :class:`requests.Session`.
-
-    Supports any grant type adhering to :class:`oauthlib.oauth2.Client` spec
-    including the four core OAuth 2 grants.
-
-    Can be used to create authorization urls, fetch tokens and access protected
-    resources using the :class:`requests.Session` interface you are used to.
-
-    - :class:`oauthlib.oauth2.WebApplicationClient` (default): Authorization Code Grant
-    - :class:`oauthlib.oauth2.MobileApplicationClient`: Implicit Grant
-    - :class:`oauthlib.oauth2.LegacyApplicationClient`: Password Credentials Grant
-    - :class:`oauthlib.oauth2.BackendApplicationClient`: Client Credentials Grant
-
-    Note that the only time you will be using Implicit Grant from python is if
-    you are driving a user agent able to obtain URL fragments.
-    """
-
-    def __init__(
-        self,
-        client_id=None,
-        client=None,
-        auto_refresh_url=None,
-        auto_refresh_kwargs=None,
-        scope=None,
-        redirect_uri=None,
-        token=None,
-        state=None,
-        token_updater=None,
-        pkce=None,
-        **kwargs
-    ):
-        """Construct a new OAuth 2 client session.
-
-        :param client_id: Client id obtained during registration
-        :param client: :class:`oauthlib.oauth2.Client` to be used. Default is
-                       WebApplicationClient which is useful for any
-                       hosted application but not mobile or desktop.
-        :param scope: List of scopes you wish to request access to
-        :param redirect_uri: Redirect URI you registered as callback
-        :param token: Token dictionary, must include access_token
-                      and token_type.
-        :param state: State string used to prevent CSRF. This will be given
-                      when creating the authorization url and must be supplied
-                      when parsing the authorization response.
-                      Can be either a string or a no argument callable.
-        :auto_refresh_url: Refresh token endpoint URL, must be HTTPS. Supply
-                           this if you wish the client to automatically refresh
-                           your access tokens.
-        :auto_refresh_kwargs: Extra arguments to pass to the refresh token
-                              endpoint.
-        :token_updater: Method with one argument, token, to be used to update
-                        your token database on automatic token refresh. If not
-                        set a TokenUpdated warning will be raised when a token
-                        has been refreshed. This warning will carry the token
-                        in its token argument.
-        :param pkce: Set "S256" or "plain" to enable PKCE. Default is disabled.
-        :param kwargs: Arguments to pass to the Session constructor.
-        """
-        super(OAuth2Session, self).__init__(**kwargs)
-        self._client = client or WebApplicationClient(client_id, token=token)
-        self.token = token or {}
-        self._scope = scope
-        self.redirect_uri = redirect_uri
-        self.state = state or generate_token
-        self._state = state
-        self.auto_refresh_url = auto_refresh_url
-        self.auto_refresh_kwargs = auto_refresh_kwargs or {}
-        self.token_updater = token_updater
-        self._pkce = pkce
-
-        if self._pkce not in ["S256", "plain", None]:
-            raise AttributeError("Wrong value for {}(.., pkce={})".format(self.__class__, self._pkce))
-
-        # Ensure that requests doesn't do any automatic auth. See #278.
-        # The default behavior can be re-enabled by setting auth to None.
-        self.auth = lambda r: r
-
-        # Allow customizations for non compliant providers through various
-        # hooks to adjust requests and responses.
-        self.compliance_hook = {
-            "access_token_response": set(),
-            "refresh_token_response": set(),
-            "protected_request": set(),
-            "refresh_token_request": set(),
-            "access_token_request": set(),
-        }
-
-    @property
-    def scope(self):
-        """By default the scope from the client is used, except if overridden"""
-        if self._scope is not None:
-            return self._scope
-        elif self._client is not None:
-            return self._client.scope
-        else:
-            return None
-
-    @scope.setter
-    def scope(self, scope):
-        self._scope = scope
-
-    def new_state(self):
-        """Generates a state string to be used in authorizations."""
-        try:
-            self._state = self.state()
-            log.debug("Generated new state %s.", self._state)
-        except TypeError:
-            self._state = self.state
-            log.debug("Re-using previously supplied state %s.", self._state)
-        return self._state
-
-    @property
-    def client_id(self):
-        return getattr(self._client, "client_id", None)
-
-    @client_id.setter
-    def client_id(self, value):
-        self._client.client_id = value
-
-    @client_id.deleter
-    def client_id(self):
-        del self._client.client_id
-
-    @property
-    def token(self):
-        return getattr(self._client, "token", None)
-
-    @token.setter
-    def token(self, value):
-        self._client.token = value
-        self._client.populate_token_attributes(value)
-
-    @property
-    def access_token(self):
-        return getattr(self._client, "access_token", None)
-
-    @access_token.setter
-    def access_token(self, value):
-        self._client.access_token = value
-
-    @access_token.deleter
-    def access_token(self):
-        del self._client.access_token
-
-    @property
-    def authorized(self):
-        """Boolean that indicates whether this session has an OAuth token
-        or not. If `self.authorized` is True, you can reasonably expect
-        OAuth-protected requests to the resource to succeed. If
-        `self.authorized` is False, you need the user to go through the OAuth
-        authentication dance before OAuth-protected requests to the resource
-        will succeed.
-        """
-        return bool(self.access_token)
-
-    def authorization_url(self, url, state=None, **kwargs):
-        """Form an authorization URL.
-
-        :param url: Authorization endpoint url, must be HTTPS.
-        :param state: An optional state string for CSRF protection. If not
-                      given it will be generated for you.
-        :param kwargs: Extra parameters to include.
-        :return: authorization_url, state
-        """
-        state = state or self.new_state()
-        if self._pkce:
-            self._code_verifier = self._client.create_code_verifier(43)
-            kwargs["code_challenge_method"] = self._pkce
-            kwargs["code_challenge"] = self._client.create_code_challenge(
-                code_verifier=self._code_verifier,
-                code_challenge_method=self._pkce
-            )
-        return (
-            self._client.prepare_request_uri(
-                url,
-                redirect_uri=self.redirect_uri,
-                scope=self.scope,
-                state=state,
-                **kwargs
-            ),
-            state,
-        )
-
-    def fetch_token(
-        self,
-        token_url,
-        code=None,
-        authorization_response=None,
-        body="",
-        auth=None,
-        username=None,
-        password=None,
-        method="POST",
-        force_querystring=False,
-        timeout=None,
-        headers=None,
-        verify=None,
-        proxies=None,
-        include_client_id=None,
-        client_secret=None,
-        cert=None,
-        **kwargs
-    ):
-        """Generic method for fetching an access token from the token endpoint.
-
-        If you are using the MobileApplicationClient you will want to use
-        `token_from_fragment` instead of `fetch_token`.
-
-        The current implementation enforces the RFC guidelines.
-
-        :param token_url: Token endpoint URL, must use HTTPS.
-        :param code: Authorization code (used by WebApplicationClients).
-        :param authorization_response: Authorization response URL, the callback
-                                       URL of the request back to you. Used by
-                                       WebApplicationClients instead of code.
-        :param body: Optional application/x-www-form-urlencoded body to add the
-                     include in the token request. Prefer kwargs over body.
-        :param auth: An auth tuple or method as accepted by `requests`.
-        :param username: Username required by LegacyApplicationClients to appear
-                         in the request body.
-        :param password: Password required by LegacyApplicationClients to appear
-                         in the request body.
-        :param method: The HTTP method used to make the request. Defaults
-                       to POST, but may also be GET. Other methods should
-                       be added as needed.
-        :param force_querystring: If True, force the request body to be sent
-            in the querystring instead.
-        :param timeout: Timeout of the request in seconds.
-        :param headers: Dict to default request headers with.
-        :param verify: Verify SSL certificate.
-        :param proxies: The `proxies` argument is passed onto `requests`.
-        :param include_client_id: Should the request body include the
-                                  `client_id` parameter. Default is `None`,
-                                  which will attempt to autodetect. This can be
-                                  forced to always include (True) or never
-                                  include (False).
-        :param client_secret: The `client_secret` paired to the `client_id`.
-                              This is generally required unless provided in the
-                              `auth` tuple. If the value is `None`, it will be
-                              omitted from the request, however if the value is
-                              an empty string, an empty string will be sent.
-        :param cert: Client certificate to send for OAuth 2.0 Mutual-TLS Client
-                     Authentication (draft-ietf-oauth-mtls). Can either be the
-                     path of a file containing the private key and certificate or
-                     a tuple of two filenames for certificate and key.
-        :param kwargs: Extra parameters to include in the token request.
-        :return: A token dict
-        """
-        if not is_secure_transport(token_url):
-            raise InsecureTransportError()
-
-        if not code and authorization_response:
-            self._client.parse_request_uri_response(
-                authorization_response, state=self._state
-            )
-            code = self._client.code
-        elif not code and isinstance(self._client, WebApplicationClient):
-            code = self._client.code
-            if not code:
-                raise ValueError(
-                    "Please supply either code or " "authorization_response parameters."
-                )
-
-        if self._pkce:
-            if self._code_verifier is None:
-                raise ValueError(
-                    "Code verifier is not found, authorization URL must be generated before"
-                )
-            kwargs["code_verifier"] = self._code_verifier
-
-        # Earlier versions of this library build an HTTPBasicAuth header out of
-        # `username` and `password`. The RFC states, however these attributes
-        # must be in the request body and not the header.
-        # If an upstream server is not spec compliant and requires them to
-        # appear as an Authorization header, supply an explicit `auth` header
-        # to this function.
-        # This check will allow for empty strings, but not `None`.
-        #
-        # References
-        # 4.3.2 - Resource Owner Password Credentials Grant
-        #         https://tools.ietf.org/html/rfc6749#section-4.3.2
-
-        if isinstance(self._client, LegacyApplicationClient):
-            if username is None:
-                raise ValueError(
-                    "`LegacyApplicationClient` requires both the "
-                    "`username` and `password` parameters."
-                )
-            if password is None:
-                raise ValueError(
-                    "The required parameter `username` was supplied, "
-                    "but `password` was not."
-                )
-
-        # merge username and password into kwargs for `prepare_request_body`
-        if username is not None:
-            kwargs["username"] = username
-        if password is not None:
-            kwargs["password"] = password
-
-        # is an auth explicitly supplied?
-        if auth is not None:
-            # if we're dealing with the default of `include_client_id` (None):
-            # we will assume the `auth` argument is for an RFC compliant server
-            # and we should not send the `client_id` in the body.
-            # This approach allows us to still force the client_id by submitting
-            # `include_client_id=True` along with an `auth` object.
-            if include_client_id is None:
-                include_client_id = False
-
-        # otherwise we may need to create an auth header
-        else:
-            # since we don't have an auth header, we MAY need to create one
-            # it is possible that we want to send the `client_id` in the body
-            # if so, `include_client_id` should be set to True
-            # otherwise, we will generate an auth header
-            if include_client_id is not True:
-                client_id = self.client_id
-                if client_id:
-                    log.debug(
-                        'Encoding `client_id` "%s" with `client_secret` '
-                        "as Basic auth credentials.",
-                        client_id,
-                    )
-                    client_secret = client_secret if client_secret is not None else ""
-                    auth = requests.auth.HTTPBasicAuth(client_id, client_secret)
-
-        if include_client_id:
-            # this was pulled out of the params
-            # it needs to be passed into prepare_request_body
-            if client_secret is not None:
-                kwargs["client_secret"] = client_secret
-
-        body = self._client.prepare_request_body(
-            code=code,
-            body=body,
-            redirect_uri=self.redirect_uri,
-            include_client_id=include_client_id,
-            **kwargs
-        )
-
-        headers = headers or {
-            "Accept": "application/json",
-            "Content-Type": "application/x-www-form-urlencoded",
-        }
-        self.token = {}
-        request_kwargs = {}
-        if method.upper() == "POST":
-            request_kwargs["params" if force_querystring else "data"] = dict(
-                urldecode(body)
-            )
-        elif method.upper() == "GET":
-            request_kwargs["params"] = dict(urldecode(body))
-        else:
-            raise ValueError("The method kwarg must be POST or GET.")
-
-        for hook in self.compliance_hook["access_token_request"]:
-            log.debug("Invoking access_token_request hook %s.", hook)
-            token_url, headers, request_kwargs = hook(
-                token_url, headers, request_kwargs
-            )
-
-        r = self.request(
-            method=method,
-            url=token_url,
-            timeout=timeout,
-            headers=headers,
-            auth=auth,
-            verify=verify,
-            proxies=proxies,
-            cert=cert,
-            **request_kwargs
-        )
-
-        log.debug("Request to fetch token completed with status %s.", r.status_code)
-        log.debug("Request url was %s", r.request.url)
-        log.debug("Request headers were %s", r.request.headers)
-        log.debug("Request body was %s", r.request.body)
-        log.debug("Response headers were %s and content %s.", r.headers, r.text)
-        log.debug(
-            "Invoking %d token response hooks.",
-            len(self.compliance_hook["access_token_response"]),
-        )
-        for hook in self.compliance_hook["access_token_response"]:
-            log.debug("Invoking hook %s.", hook)
-            r = hook(r)
-
-        self._client.parse_request_body_response(r.text, scope=self.scope)
-        self.token = self._client.token
-        log.debug("Obtained token %s.", self.token)
-        return self.token
-
-    def token_from_fragment(self, authorization_response):
-        """Parse token from the URI fragment, used by MobileApplicationClients.
-
-        :param authorization_response: The full URL of the redirect back to you
-        :return: A token dict
-        """
-        self._client.parse_request_uri_response(
-            authorization_response, state=self._state
-        )
-        self.token = self._client.token
-        return self.token
-
-    def refresh_token(
-        self,
-        token_url,
-        refresh_token=None,
-        body="",
-        auth=None,
-        timeout=None,
-        headers=None,
-        verify=None,
-        proxies=None,
-        **kwargs
-    ):
-        """Fetch a new access token using a refresh token.
-
-        :param token_url: The token endpoint, must be HTTPS.
-        :param refresh_token: The refresh_token to use.
-        :param body: Optional application/x-www-form-urlencoded body to add the
-                     include in the token request. Prefer kwargs over body.
-        :param auth: An auth tuple or method as accepted by `requests`.
-        :param timeout: Timeout of the request in seconds.
-        :param headers: A dict of headers to be used by `requests`.
-        :param verify: Verify SSL certificate.
-        :param proxies: The `proxies` argument will be passed to `requests`.
-        :param kwargs: Extra parameters to include in the token request.
-        :return: A token dict
-        """
-        if not token_url:
-            raise ValueError("No token endpoint set for auto_refresh.")
-
-        if not is_secure_transport(token_url):
-            raise InsecureTransportError()
-
-        refresh_token = refresh_token or self.token.get("refresh_token")
-
-        log.debug(
-            "Adding auto refresh key word arguments %s.", self.auto_refresh_kwargs
-        )
-        kwargs.update(self.auto_refresh_kwargs)
-        body = self._client.prepare_refresh_body(
-            body=body, refresh_token=refresh_token, scope=self.scope, **kwargs
-        )
-        log.debug("Prepared refresh token request body %s", body)
-
-        if headers is None:
-            headers = {
-                "Accept": "application/json",
-                "Content-Type": ("application/x-www-form-urlencoded"),
-            }
-
-        for hook in self.compliance_hook["refresh_token_request"]:
-            log.debug("Invoking refresh_token_request hook %s.", hook)
-            token_url, headers, body = hook(token_url, headers, body)
-
-        r = self.post(
-            token_url,
-            data=dict(urldecode(body)),
-            auth=auth,
-            timeout=timeout,
-            headers=headers,
-            verify=verify,
-            withhold_token=True,
-            proxies=proxies,
-        )
-        log.debug("Request to refresh token completed with status %s.", r.status_code)
-        log.debug("Response headers were %s and content %s.", r.headers, r.text)
-        log.debug(
-            "Invoking %d token response hooks.",
-            len(self.compliance_hook["refresh_token_response"]),
-        )
-        for hook in self.compliance_hook["refresh_token_response"]:
-            log.debug("Invoking hook %s.", hook)
-            r = hook(r)
-
-        self.token = self._client.parse_request_body_response(r.text, scope=self.scope)
-        if "refresh_token" not in self.token:
-            log.debug("No new refresh token given. Re-using old.")
-            self.token["refresh_token"] = refresh_token
-        return self.token
-
-    def request(
-        self,
-        method,
-        url,
-        data=None,
-        headers=None,
-        withhold_token=False,
-        client_id=None,
-        client_secret=None,
-        files=None,
-        **kwargs
-    ):
-        """Intercept all requests and add the OAuth 2 token if present."""
-        if not is_secure_transport(url):
-            raise InsecureTransportError()
-        if self.token and not withhold_token:
-            log.debug(
-                "Invoking %d protected resource request hooks.",
-                len(self.compliance_hook["protected_request"]),
-            )
-            for hook in self.compliance_hook["protected_request"]:
-                log.debug("Invoking hook %s.", hook)
-                url, headers, data = hook(url, headers, data)
-
-            log.debug("Adding token %s to request.", self.token)
-            try:
-                url, headers, data = self._client.add_token(
-                    url, http_method=method, body=data, headers=headers
-                )
-            # Attempt to retrieve and save new access token if expired
-            except TokenExpiredError:
-                if self.auto_refresh_url:
-                    log.debug(
-                        "Auto refresh is set, attempting to refresh at %s.",
-                        self.auto_refresh_url,
-                    )
-
-                    # We mustn't pass auth twice.
-                    auth = kwargs.pop("auth", None)
-                    if client_id and client_secret and (auth is None):
-                        log.debug(
-                            'Encoding client_id "%s" with client_secret as Basic auth credentials.',
-                            client_id,
-                        )
-                        auth = requests.auth.HTTPBasicAuth(client_id, client_secret)
-                    token = self.refresh_token(
-                        self.auto_refresh_url, auth=auth, **kwargs
-                    )
-                    if self.token_updater:
-                        log.debug(
-                            "Updating token to %s using %s.", token, self.token_updater
-                        )
-                        self.token_updater(token)
-                        url, headers, data = self._client.add_token(
-                            url, http_method=method, body=data, headers=headers
-                        )
-                    else:
-                        raise TokenUpdated(token)
-                else:
-                    raise
-
-        log.debug("Requesting url %s using method %s.", url, method)
-        log.debug("Supplying headers %s and data %s", headers, data)
-        log.debug("Passing through key word arguments %s.", kwargs)
-        return super(OAuth2Session, self).request(
-            method, url, headers=headers, data=data, files=files, **kwargs
-        )
-
-    def register_compliance_hook(self, hook_type, hook):
-        """Register a hook for request/response tweaking.
-
-        Available hooks are:
-            access_token_response invoked before token parsing.
-            refresh_token_response invoked before refresh token parsing.
-            protected_request invoked before making a request.
-            access_token_request invoked before making a token fetch request.
-            refresh_token_request invoked before making a refresh request.
-
-        If you find a new hook is needed please send a GitHub PR request
-        or open an issue.
-        """
-        if hook_type not in self.compliance_hook:
-            raise ValueError(
-                "Hook type %s is not in %s.", hook_type, self.compliance_hook
-            )
-        self.compliance_hook[hook_type].add(hook)
diff --git a/lib/rumps/__init__.py b/lib/rumps/__init__.py
deleted file mode 100644
index 5c232f5f..00000000
--- a/lib/rumps/__init__.py
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# rumps: Ridiculously Uncomplicated macOS Python Statusbar apps.
-# Copyright: (c) 2020, Jared Suttles. All rights reserved.
-# License: BSD, see LICENSE for details.
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-"""
-rumps
-=====
-
-Ridiculously Uncomplicated macOS Python Statusbar apps.
-
-rumps exposes Objective-C classes as Python classes and functions which greatly simplifies the process of creating a
-statusbar application.
-"""
-
-__title__ = 'rumps'
-__version__ = '0.4.0'
-__author__ = 'Jared Suttles'
-__license__ = 'Modified BSD'
-__copyright__ = 'Copyright 2020 Jared Suttles'
-
-from . import notifications as _notifications
-from .rumps import (separator, debug_mode, alert, application_support, timers, quit_application, timer,
-                    clicked, MenuItem, SliderMenuItem, Timer, Window, App, slider)
-
-notifications = _notifications.on_notification
-notification = _notifications.notify
diff --git a/lib/rumps/_internal.py b/lib/rumps/_internal.py
deleted file mode 100644
index a4d5320f..00000000
--- a/lib/rumps/_internal.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import print_function
-
-import inspect
-import traceback
-
-import Foundation
-
-from . import compat
-from . import exceptions
-
-
-def require_string(*objs):
-    for obj in objs:
-        if not isinstance(obj, compat.string_types):
-            raise TypeError(
-                'a string is required but given {0}, a {1}'.format(obj, type(obj).__name__)
-            )
-
-
-def require_string_or_none(*objs):
-    for obj in objs:
-        if not(obj is None or isinstance(obj, compat.string_types)):
-            raise TypeError(
-                'a string or None is required but given {0}, a {1}'.format(obj, type(obj).__name__)
-            )
-
-
-def call_as_function_or_method(func, *args, **kwargs):
-    # The idea here is that when using decorators in a class, the functions passed are not bound so we have to
-    # determine later if the functions we have (those saved as callbacks) for particular events need to be passed
-    # 'self'.
-    #
-    # This works for an App subclass method or a standalone decorated function. Will attempt to find function as
-    # a bound method of the App instance. If it is found, use it, otherwise simply call function.
-    from . import rumps
-    try:
-        app = getattr(rumps.App, '*app_instance')
-    except AttributeError:
-        pass
-    else:
-        for name, method in inspect.getmembers(app, predicate=inspect.ismethod):
-            if method.__func__ is func:
-                return method(*args, **kwargs)
-    return func(*args, **kwargs)
-
-
-def guard_unexpected_errors(func):
-    """Decorator to be used in PyObjC callbacks where an error bubbling up
-    would cause a crash. Instead of crashing, print the error to stderr and
-    prevent passing to PyObjC layer.
-
-    For Python 3, print the exception using chaining. Accomplished by setting
-    the cause of :exc:`rumps.exceptions.InternalRumpsError` to the exception.
-
-    For Python 2, emulate exception chaining by printing the original exception
-    followed by :exc:`rumps.exceptions.InternalRumpsError`.
-    """
-    def wrapper(*args, **kwargs):
-        try:
-            return func(*args, **kwargs)
-
-        except Exception as e:
-            internal_error = exceptions.InternalRumpsError(
-                'an unexpected error occurred within an internal callback'
-            )
-            if compat.PY2:
-                import sys
-                traceback.print_exc()
-                print('\nThe above exception was the direct cause of the following exception:\n', file=sys.stderr)
-                traceback.print_exception(exceptions.InternalRumpsError, internal_error, None)
-            else:
-                internal_error.__cause__ = e
-                traceback.print_exception(exceptions.InternalRumpsError, internal_error, None)
-
-    return wrapper
-
-
-def string_to_objc(x):
-    if isinstance(x, compat.binary_type):
-        return Foundation.NSData.alloc().initWithData_(x)
-    elif isinstance(x, compat.string_types):
-        return Foundation.NSString.alloc().initWithString_(x)
-    else:
-        raise TypeError(
-            "expected a string or a bytes-like object but provided %s, "
-            "having type '%s'" % (
-                x,
-                type(x).__name__
-            )
-        )
diff --git a/lib/rumps/compat.py b/lib/rumps/compat.py
deleted file mode 100644
index e17d45a3..00000000
--- a/lib/rumps/compat.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-rumps.compat
-~~~~~~~~~~~~
-
-Compatibility for Python 2 and Python 3 major versions.
-
-:copyright: (c) 2020 by Jared Suttles
-:license: BSD-3-Clause, see LICENSE for details.
-"""
-
-import sys
-
-PY2 = sys.version_info[0] == 2
-
-if not PY2:
-    binary_type = bytes
-    text_type = str
-    string_types = (str,)
-
-    iteritems = lambda d: iter(d.items())
-
-    import collections.abc as collections_abc
-
-else:
-    binary_type = ()
-    text_type = unicode
-    string_types = (str, unicode)
-
-    iteritems = lambda d: d.iteritems()
-
-    import collections as collections_abc
diff --git a/lib/rumps/events.py b/lib/rumps/events.py
deleted file mode 100644
index 64f4439c..00000000
--- a/lib/rumps/events.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import traceback
-
-from . import _internal
-
-
-class EventEmitter(object):
-    def __init__(self, name):
-        self.name = name
-        self.callbacks = set()
-        self._executor = _internal.call_as_function_or_method
-
-    def register(self, func):
-        self.callbacks.add(func)
-        return func
-
-    def unregister(self, func):
-        try:
-            self.callbacks.remove(func)
-            return True
-        except KeyError:
-            return False
-
-    def emit(self, *args, **kwargs):
-        #print('EventEmitter("%s").emit called' % self.name)
-        for callback in self.callbacks:
-            try:
-                self._executor(callback, *args, **kwargs)
-            except Exception:
-                traceback.print_exc()
-
-    __call__ = register
-
-
-before_start = EventEmitter('before_start')
-on_notification = EventEmitter('on_notification')
-on_sleep = EventEmitter('on_sleep')
-on_wake = EventEmitter('on_wake')
-before_quit = EventEmitter('before_quit')
diff --git a/lib/rumps/exceptions.py b/lib/rumps/exceptions.py
deleted file mode 100644
index 05c6d46d..00000000
--- a/lib/rumps/exceptions.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- coding: utf-8 -*-
-
-
-class RumpsError(Exception):
-    """A generic rumps error occurred."""
-
-
-class InternalRumpsError(RumpsError):
-    """Internal mechanism powering functionality of rumps failed."""
diff --git a/lib/rumps/notifications.py b/lib/rumps/notifications.py
deleted file mode 100644
index b111e50e..00000000
--- a/lib/rumps/notifications.py
+++ /dev/null
@@ -1,266 +0,0 @@
-# -*- coding: utf-8 -*-
-
-_ENABLED = True
-try:
-    from Foundation import NSUserNotification, NSUserNotificationCenter
-except ImportError:
-    _ENABLED = False
-
-import datetime
-import os
-import sys
-import traceback
-
-import Foundation
-
-from . import _internal
-from . import compat
-from . import events
-
-
-def on_notification(f):
-    """Decorator for registering a function to serve as a "notification center"
-    for the application. This function will receive the data associated with an
-    incoming macOS notification sent using :func:`rumps.notification`. This
-    occurs whenever the user clicks on a notification for this application in
-    the macOS Notification Center.
-
-    .. code-block:: python
-
-        @rumps.notifications
-        def notification_center(info):
-            if 'unix' in info:
-                print 'i know this'
-
-    """
-    return events.on_notification.register(f)
-
-
-def _gather_info_issue_9():  # pragma: no cover
-    missing_plist = False
-    missing_bundle_ident = False
-    info_plist_path = os.path.join(os.path.dirname(sys.executable), 'Info.plist')
-    try:
-        with open(info_plist_path) as f:
-            import plistlib
-            try:
-                load_plist = plistlib.load
-            except AttributeError:
-                load_plist = plistlib.readPlist
-            try:
-                load_plist(f)['CFBundleIdentifier']
-            except Exception:
-                missing_bundle_ident = True
-
-    except IOError as e:
-        import errno
-        if e.errno == errno.ENOENT:  # No such file or directory
-            missing_plist = True
-
-    info = '\n\n'
-    if missing_plist:
-        info += 'In this case there is no file at "%(info_plist_path)s"'
-        info += '\n\n'
-        confidence = 'should'
-    elif missing_bundle_ident:
-        info += 'In this case the file at "%(info_plist_path)s" does not contain a value for "CFBundleIdentifier"'
-        info += '\n\n'
-        confidence = 'should'
-    else:
-        confidence = 'may'
-    info += 'Running the following command %(confidence)s fix the issue:\n'
-    info += '/usr/libexec/PlistBuddy -c \'Add :CFBundleIdentifier string "rumps"\' %(info_plist_path)s\n'
-    return info % {'info_plist_path': info_plist_path, 'confidence': confidence}
-
-
-def _default_user_notification_center():
-    notification_center = NSUserNotificationCenter.defaultUserNotificationCenter()
-    if notification_center is None:  # pragma: no cover
-        info = (
-            'Failed to setup the notification center. This issue occurs when the "Info.plist" file '
-            'cannot be found or is missing "CFBundleIdentifier".'
-        )
-        try:
-            info += _gather_info_issue_9()
-        except Exception:
-            pass
-        raise RuntimeError(info)
-    else:
-        return notification_center
-
-
-def _init_nsapp(nsapp):
-    if _ENABLED:
-        try:
-            notification_center = _default_user_notification_center()
-        except RuntimeError:
-            pass
-        else:
-            notification_center.setDelegate_(nsapp)
-
-
-@_internal.guard_unexpected_errors
-def _clicked(ns_user_notification_center, ns_user_notification):
-    from . import rumps
-
-    ns_user_notification_center.removeDeliveredNotification_(ns_user_notification)
-    ns_dict = ns_user_notification.userInfo()
-    if ns_dict is None:
-        data = None
-    else:
-        dumped = ns_dict['value']
-        app = getattr(rumps.App, '*app_instance', rumps.App)
-        try:
-            data = app.serializer.loads(dumped)
-        except Exception:
-            traceback.print_exc()
-            return
-
-    # notification center function not specified => no error but log warning
-    if not events.on_notification.callbacks:
-        rumps._log(
-            'WARNING: notification received but no function specified for '
-            'answering it; use @notifications decorator to register a function.'
-        )
-    else:
-        notification = Notification(ns_user_notification, data)
-        events.on_notification.emit(notification)
-
-
-def notify(title, subtitle, message, data=None, sound=True,
-           action_button=None, other_button=None, has_reply_button=False,
-           icon=None, ignoreDnD=False):
-    """Send a notification to Notification Center (OS X 10.8+). If running on a
-    version of macOS that does not support notifications, a ``RuntimeError``
-    will be raised. Apple says,
-
-        "The userInfo content must be of reasonable serialized size (less than
-        1k) or an exception will be thrown."
-
-    So don't do that!
-
-    :param title: text in a larger font.
-    :param subtitle: text in a smaller font below the `title`.
-    :param message: text representing the body of the notification below the
-                    `subtitle`.
-    :param data: will be passed to the application's "notification center" (see
-                 :func:`rumps.notifications`) when this notification is clicked.
-    :param sound: whether the notification should make a noise when it arrives.
-    :param action_button: title for the action button.
-    :param other_button: title for the other button.
-    :param has_reply_button: whether or not the notification has a reply button.
-    :param icon: the filename of an image for the notification's icon, will
-                 replace the default.
-    :param ignoreDnD: whether the notification should ignore do not disturb,
-                 e.g., appear also while screen sharing.
-    """
-    from . import rumps
-
-    if not _ENABLED:
-        raise RuntimeError('OS X 10.8+ is required to send notifications')
-
-    _internal.require_string_or_none(title, subtitle, message)
-
-    notification = NSUserNotification.alloc().init()
-
-    notification.setTitle_(title)
-    notification.setSubtitle_(subtitle)
-    notification.setInformativeText_(message)
-
-    if data is not None:
-        app = getattr(rumps.App, '*app_instance', rumps.App)
-        dumped = app.serializer.dumps(data)
-        objc_string = _internal.string_to_objc(dumped)
-        ns_dict = Foundation.NSMutableDictionary.alloc().init()
-        ns_dict.setDictionary_({'value': objc_string})
-        notification.setUserInfo_(ns_dict)
-
-    if icon is not None:
-        notification.set_identityImage_(rumps._nsimage_from_file(icon))
-    if sound:
-        notification.setSoundName_("NSUserNotificationDefaultSoundName")
-    if action_button:
-        notification.setActionButtonTitle_(action_button)
-        notification.set_showsButtons_(True)
-    if other_button:
-        notification.setOtherButtonTitle_(other_button)
-        notification.set_showsButtons_(True)
-    if has_reply_button:
-        notification.setHasReplyButton_(True)
-    if ignoreDnD:
-        notification.set_ignoresDoNotDisturb_(True)
-
-    notification.setDeliveryDate_(Foundation.NSDate.dateWithTimeInterval_sinceDate_(0, Foundation.NSDate.date()))
-    notification_center = _default_user_notification_center()
-    notification_center.scheduleNotification_(notification)
-
-
-class Notification(compat.collections_abc.Mapping):
-    def __init__(self, ns_user_notification, data):
-        self._ns = ns_user_notification
-        self._data = data
-
-    def __repr__(self):
-        return '<{0}: [data: {1}]>'.format(type(self).__name__, repr(self._data))
-
-    @property
-    def title(self):
-        return compat.text_type(self._ns.title())
-
-    @property
-    def subtitle(self):
-        return compat.text_type(self._ns.subtitle())
-
-    @property
-    def message(self):
-        return compat.text_type(self._ns.informativeText())
-
-    @property
-    def activation_type(self):
-        activation_type = self._ns.activationType()
-        if activation_type == 1:
-            return 'contents_clicked'
-        elif activation_type == 2:
-            return 'action_button_clicked'
-        elif activation_type == 3:
-            return 'replied'
-        elif activation_type == 4:
-            return 'additional_action_clicked'
-
-    @property
-    def delivered_at(self):
-        ns_date = self._ns.actualDeliveryDate()
-        seconds = ns_date.timeIntervalSince1970()
-        dt = datetime.datetime.fromtimestamp(seconds)
-        return dt
-
-    @property
-    def response(self):
-        ns_attributed_string = self._ns.response()
-        if ns_attributed_string is None:
-            return None
-        ns_string = ns_attributed_string.string()
-        return compat.text_type(ns_string)
-
-    @property
-    def data(self):
-        return self._data
-
-    def _check_if_mapping(self):
-        if not isinstance(self._data, compat.collections_abc.Mapping):
-            raise TypeError(
-                'notification cannot be used as a mapping when data is not a '
-                'mapping'
-            )
-
-    def __getitem__(self, key):
-        self._check_if_mapping()
-        return self._data[key]
-
-    def __iter__(self):
-        self._check_if_mapping()
-        return iter(self._data)
-
-    def __len__(self):
-        self._check_if_mapping()
-        return len(self._data)
diff --git a/lib/rumps/packages/__init__.py b/lib/rumps/packages/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/rumps/packages/ordereddict.py b/lib/rumps/packages/ordereddict.py
deleted file mode 100644
index c416b5a1..00000000
--- a/lib/rumps/packages/ordereddict.py
+++ /dev/null
@@ -1,262 +0,0 @@
-# Backport of OrderedDict() class that runs on Python 2.4, 2.5, 2.6, 2.7 and pypy.
-# Passes Python2.7's test suite and incorporates all the latest updates.
-# Copyright 2009 Raymond Hettinger, released under the MIT License.
-# http://code.activestate.com/recipes/576693/
-try:
-    from thread import get_ident as _get_ident
-except ImportError:
-    try:
-        from dummy_thread import get_ident as _get_ident
-    except ImportError:
-        from threading import get_ident as _get_ident
-
-try:
-    from _abcoll import KeysView, ValuesView, ItemsView
-except ImportError:
-    pass
-
-
-class OrderedDict(dict):
-    'Dictionary that remembers insertion order'
-    # An inherited dict maps keys to values.
-    # The inherited dict provides __getitem__, __len__, __contains__, and get.
-    # The remaining methods are order-aware.
-    # Big-O running times for all methods are the same as for regular dictionaries.
-
-    # The internal self.__map dictionary maps keys to links in a doubly linked list.
-    # The circular doubly linked list starts and ends with a sentinel element.
-    # The sentinel element never gets deleted (this simplifies the algorithm).
-    # Each link is stored as a list of length three:  [PREV, NEXT, KEY].
-
-    def __init__(self, *args, **kwds):
-        '''Initialize an ordered dictionary.  Signature is the same as for
-        regular dictionaries, but keyword arguments are not recommended
-        because their insertion order is arbitrary.
-
-        '''
-        if len(args) > 1:
-            raise TypeError('expected at most 1 arguments, got %d' % len(args))
-        try:
-            self.__root
-        except AttributeError:
-            self.__root = root = []                     # sentinel node
-            root[:] = [root, root, None]
-            self.__map = {}
-        self.__update(*args, **kwds)
-
-    def __setitem__(self, key, value, dict_setitem=dict.__setitem__):
-        'od.__setitem__(i, y) <==> od[i]=y'
-        # Setting a new item creates a new link which goes at the end of the linked
-        # list, and the inherited dictionary is updated with the new key/value pair.
-        if key not in self:
-            root = self.__root
-            last = root[0]
-            last[1] = root[0] = self.__map[key] = [last, root, key]
-        dict_setitem(self, key, value)
-
-    def __delitem__(self, key, dict_delitem=dict.__delitem__):
-        'od.__delitem__(y) <==> del od[y]'
-        # Deleting an existing item uses self.__map to find the link which is
-        # then removed by updating the links in the predecessor and successor nodes.
-        dict_delitem(self, key)
-        link_prev, link_next, key = self.__map.pop(key)
-        link_prev[1] = link_next
-        link_next[0] = link_prev
-
-    def __iter__(self):
-        'od.__iter__() <==> iter(od)'
-        root = self.__root
-        curr = root[1]
-        while curr is not root:
-            yield curr[2]
-            curr = curr[1]
-
-    def __reversed__(self):
-        'od.__reversed__() <==> reversed(od)'
-        root = self.__root
-        curr = root[0]
-        while curr is not root:
-            yield curr[2]
-            curr = curr[0]
-
-    def clear(self):
-        'od.clear() -> None.  Remove all items from od.'
-        try:
-            for node in self.__map.values():
-                del node[:]
-            root = self.__root
-            root[:] = [root, root, None]
-            self.__map.clear()
-        except AttributeError:
-            pass
-        dict.clear(self)
-
-    def popitem(self, last=True):
-        '''od.popitem() -> (k, v), return and remove a (key, value) pair.
-        Pairs are returned in LIFO order if last is true or FIFO order if false.
-
-        '''
-        if not self:
-            raise KeyError('dictionary is empty')
-        root = self.__root
-        if last:
-            link = root[0]
-            link_prev = link[0]
-            link_prev[1] = root
-            root[0] = link_prev
-        else:
-            link = root[1]
-            link_next = link[1]
-            root[1] = link_next
-            link_next[0] = root
-        key = link[2]
-        del self.__map[key]
-        value = dict.pop(self, key)
-        return key, value
-
-    # -- the following methods do not depend on the internal structure --
-
-    def keys(self):
-        'od.keys() -> list of keys in od'
-        return list(self)
-
-    def values(self):
-        'od.values() -> list of values in od'
-        return [self[key] for key in self]
-
-    def items(self):
-        'od.items() -> list of (key, value) pairs in od'
-        return [(key, self[key]) for key in self]
-
-    def iterkeys(self):
-        'od.iterkeys() -> an iterator over the keys in od'
-        return iter(self)
-
-    def itervalues(self):
-        'od.itervalues -> an iterator over the values in od'
-        for k in self:
-            yield self[k]
-
-    def iteritems(self):
-        'od.iteritems -> an iterator over the (key, value) items in od'
-        for k in self:
-            yield (k, self[k])
-
-    def update(*args, **kwds):
-        '''od.update(E, **F) -> None.  Update od from dict/iterable E and F.
-
-        If E is a dict instance, does:           for k in E: od[k] = E[k]
-        If E has a .keys() method, does:         for k in E.keys(): od[k] = E[k]
-        Or if E is an iterable of items, does:   for k, v in E: od[k] = v
-        In either case, this is followed by:     for k, v in F.items(): od[k] = v
-
-        '''
-        if len(args) > 2:
-            raise TypeError('update() takes at most 2 positional '
-                            'arguments (%d given)' % (len(args),))
-        elif not args:
-            raise TypeError('update() takes at least 1 argument (0 given)')
-        self = args[0]
-        # Make progressively weaker assumptions about "other"
-        other = ()
-        if len(args) == 2:
-            other = args[1]
-        if isinstance(other, dict):
-            for key in other:
-                self[key] = other[key]
-        elif hasattr(other, 'keys'):
-            for key in other.keys():
-                self[key] = other[key]
-        else:
-            for key, value in other:
-                self[key] = value
-        for key, value in kwds.items():
-            self[key] = value
-
-    __update = update  # let subclasses override update without breaking __init__
-
-    __marker = object()
-
-    def pop(self, key, default=__marker):
-        '''od.pop(k[,d]) -> v, remove specified key and return the corresponding value.
-        If key is not found, d is returned if given, otherwise KeyError is raised.
-
-        '''
-        if key in self:
-            result = self[key]
-            del self[key]
-            return result
-        if default is self.__marker:
-            raise KeyError(key)
-        return default
-
-    def setdefault(self, key, default=None):
-        'od.setdefault(k[,d]) -> od.get(k,d), also set od[k]=d if k not in od'
-        if key in self:
-            return self[key]
-        self[key] = default
-        return default
-
-    def __repr__(self, _repr_running={}):
-        'od.__repr__() <==> repr(od)'
-        call_key = id(self), _get_ident()
-        if call_key in _repr_running:
-            return '...'
-        _repr_running[call_key] = 1
-        try:
-            if not self:
-                return '%s()' % (self.__class__.__name__,)
-            return '%s(%r)' % (self.__class__.__name__, self.items())
-        finally:
-            del _repr_running[call_key]
-
-    def __reduce__(self):
-        'Return state information for pickling'
-        items = [[k, self[k]] for k in self]
-        inst_dict = vars(self).copy()
-        for k in vars(OrderedDict()):
-            inst_dict.pop(k, None)
-        if inst_dict:
-            return (self.__class__, (items,), inst_dict)
-        return self.__class__, (items,)
-
-    def copy(self):
-        'od.copy() -> a shallow copy of od'
-        return self.__class__(self)
-
-    @classmethod
-    def fromkeys(cls, iterable, value=None):
-        '''OD.fromkeys(S[, v]) -> New ordered dictionary with keys from S
-        and values equal to v (which defaults to None).
-
-        '''
-        d = cls()
-        for key in iterable:
-            d[key] = value
-        return d
-
-    def __eq__(self, other):
-        '''od.__eq__(y) <==> od==y.  Comparison to another OD is order-sensitive
-        while comparison to a regular mapping is order-insensitive.
-
-        '''
-        if isinstance(other, OrderedDict):
-            return len(self)==len(other) and self.items() == other.items()
-        return dict.__eq__(self, other)
-
-    def __ne__(self, other):
-        return not self == other
-
-    # -- the following methods are only used in Python 2.7 --
-
-    def viewkeys(self):
-        "od.viewkeys() -> a set-like object providing a view on od's keys"
-        return KeysView(self)
-
-    def viewvalues(self):
-        "od.viewvalues() -> an object providing a view on od's values"
-        return ValuesView(self)
-
-    def viewitems(self):
-        "od.viewitems() -> a set-like object providing a view on od's items"
-        return ItemsView(self)
diff --git a/lib/rumps/rumps.py b/lib/rumps/rumps.py
deleted file mode 100644
index 00148cb9..00000000
--- a/lib/rumps/rumps.py
+++ /dev/null
@@ -1,1205 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# rumps: Ridiculously Uncomplicated macOS Python Statusbar apps.
-# Copyright: (c) 2020, Jared Suttles. All rights reserved.
-# License: BSD, see LICENSE for details.
-
-
-# For compatibility with pyinstaller
-# See: http://stackoverflow.com/questions/21058889/pyinstaller-not-finding-pyobjc-library-macos-python
-import Foundation
-import AppKit
-
-from Foundation import (NSDate, NSTimer, NSRunLoop, NSDefaultRunLoopMode, NSSearchPathForDirectoriesInDomains,
-                        NSMakeRect, NSLog, NSObject, NSMutableDictionary, NSString, NSUserDefaults)
-from AppKit import NSApplication, NSStatusBar, NSMenu, NSMenuItem, NSAlert, NSTextField, NSSecureTextField, NSImage, NSSlider, NSSize, NSWorkspace, NSWorkspaceWillSleepNotification, NSWorkspaceDidWakeNotification
-from PyObjCTools import AppHelper
-
-import os
-import pickle
-import traceback
-import weakref
-
-from .compat import text_type, string_types, iteritems, collections_abc
-from .text_field import Editing, SecureEditing
-from .utils import ListDict
-
-from . import _internal
-from . import events
-from . import notifications
-
-_TIMERS = weakref.WeakKeyDictionary()
-separator = object()
-
-
-def debug_mode(choice):
-    """Enable/disable printing helpful information for debugging the program. Default is off."""
-    global _log
-    if choice:
-        def _log(*args):
-            NSLog(' '.join(map(str, args)))
-    else:
-        def _log(*_):
-            pass
-debug_mode(False)
-
-
-def alert(title=None, message='', ok=None, cancel=None, other=None, icon_path=None):
-    """Generate a simple alert window.
-
-    .. versionchanged:: 0.2.0
-        Providing a `cancel` string will set the button text rather than only using text "Cancel". `title` is no longer
-        a required parameter.
-
-    .. versionchanged:: 0.3.0
-        Add `other` button functionality as well as `icon_path` to change the alert icon.
-
-    :param title: the text positioned at the top of the window in larger font. If ``None``, a default localized title
-                  is used. If not ``None`` or a string, will use the string representation of the object.
-    :param message: the text positioned below the `title` in smaller font. If not a string, will use the string
-                    representation of the object.
-    :param ok: the text for the "ok" button. Must be either a string or ``None``. If ``None``, a default
-               localized button title will be used.
-    :param cancel: the text for the "cancel" button. If a string, the button will have that text. If `cancel`
-                   evaluates to ``True``, will create a button with text "Cancel". Otherwise, this button will not be
-                   created.
-    :param other: the text for the "other" button. If a string, the button will have that text. Otherwise, this button will not be
-                   created.
-    :param icon_path: a path to an image. If ``None``, the applications icon is used.
-    :return: a number representing the button pressed. The "ok" button is ``1`` and "cancel" is ``0``.
-    """
-    message = text_type(message)
-    message = message.replace('%', '%%')
-    if title is not None:
-        title = text_type(title)
-    _internal.require_string_or_none(ok)
-    if not isinstance(cancel, string_types):
-        cancel = 'Cancel' if cancel else None
-    alert = NSAlert.alertWithMessageText_defaultButton_alternateButton_otherButton_informativeTextWithFormat_(
-        title, ok, cancel, other, message)
-    if NSUserDefaults.standardUserDefaults().stringForKey_('AppleInterfaceStyle') == 'Dark':
-        alert.window().setAppearance_(AppKit.NSAppearance.appearanceNamed_('NSAppearanceNameVibrantDark'))
-    alert.setAlertStyle_(0)  # informational style
-    if icon_path is not None:
-        icon = _nsimage_from_file(icon_path)
-        alert.setIcon_(icon)
-    _log('alert opened with message: {0}, title: {1}'.format(repr(message), repr(title)))
-    return alert.runModal()
-
-
-def application_support(name):
-    """Return the application support folder path for the given `name`, creating it if it doesn't exist."""
-    app_support_path = os.path.join(NSSearchPathForDirectoriesInDomains(14, 1, 1).objectAtIndex_(0), name)
-    if not os.path.isdir(app_support_path):
-        os.mkdir(app_support_path)
-    return app_support_path
-
-
-def timers():
-    """Return a list of all :class:`rumps.Timer` objects. These can be active or inactive."""
-    return list(_TIMERS)
-
-
-def quit_application(sender=None):
-    """Quit the application. Some menu item should call this function so that the application can exit gracefully."""
-    nsapplication = NSApplication.sharedApplication()
-    _log('closing application')
-    nsapplication.terminate_(sender)
-
-
-def _nsimage_from_file(filename, dimensions=None, template=None):
-    """Take a path to an image file and return an NSImage object."""
-    try:
-        _log('attempting to open image at {0}'.format(filename))
-        with open(filename):
-            pass
-    except IOError:  # literal file path didn't work -- try to locate image based on main script path
-        try:
-            from __main__ import __file__ as main_script_path
-            main_script_path = os.path.dirname(main_script_path)
-            filename = os.path.join(main_script_path, filename)
-        except ImportError:
-            pass
-        _log('attempting (again) to open image at {0}'.format(filename))
-        with open(filename):  # file doesn't exist
-            pass              # otherwise silently errors in NSImage which isn't helpful for debugging
-    image = NSImage.alloc().initByReferencingFile_(filename)
-    image.setScalesWhenResized_(True)
-    image.setSize_((20, 20) if dimensions is None else dimensions)
-    if not template is None:
-        image.setTemplate_(template)
-    return image
-
-
-# Decorators and helper function serving to register functions for dealing with interaction and events
-#- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-def timer(interval):
-    """Decorator for registering a function as a callback in a new thread. The function will be repeatedly called every
-    `interval` seconds. This decorator accomplishes the same thing as creating a :class:`rumps.Timer` object by using
-    the decorated function and `interval` as parameters and starting it on application launch.
-
-    .. code-block:: python
-
-        @rumps.timer(2)
-        def repeating_function(sender):
-            print 'hi'
-
-    :param interval: a number representing the time in seconds before the decorated function should be called.
-    """
-    def decorator(f):
-        timers = timer.__dict__.setdefault('*timers', [])
-        timers.append(Timer(f, interval))
-        return f
-    return decorator
-
-
-def clicked(*args, **options):
-    """Decorator for registering a function as a callback for a click action on a :class:`rumps.MenuItem` within the
-    application. The passed `args` must specify an existing path in the main menu. The :class:`rumps.MenuItem`
-    instance at the end of that path will have its :meth:`rumps.MenuItem.set_callback` method called, passing in the
-    decorated function.
-
-    .. versionchanged:: 0.2.1
-        Accepts `key` keyword argument.
-
-    .. code-block:: python
-
-        @rumps.clicked('Animal', 'Dog', 'Corgi')
-        def corgi_button(sender):
-            import subprocess
-            subprocess.call(['say', '"corgis are the cutest"'])
-
-    :param args: a series of strings representing the path to a :class:`rumps.MenuItem` in the main menu of the
-                 application.
-    :param key: a string representing the key shortcut as an alternative means of clicking the menu item.
-    """
-    def decorator(f):
-
-        def register_click(self):
-            menuitem = self._menu  # self not defined yet but will be later in 'run' method
-            if menuitem is None:
-                raise ValueError('no menu created')
-            for arg in args:
-                try:
-                    menuitem = menuitem[arg]
-                except KeyError:
-                    menuitem.add(arg)
-                    menuitem = menuitem[arg]
-            menuitem.set_callback(f, options.get('key'))
-
-        # delay registering the button until we have a current instance to be able to traverse the menu
-        buttons = clicked.__dict__.setdefault('*buttons', [])
-        buttons.append(register_click)
-
-        return f
-    return decorator
-
-
-def slider(*args, **options):
-    """Decorator for registering a function as a callback for a slide action on a :class:`rumps.SliderMenuItem` within
-    the application. All elements of the provided path will be created as :class:`rumps.MenuItem` objects. The
-    :class:`rumps.SliderMenuItem` will be created as a child of the last menu item.
-
-    Accepts the same keyword arguments as :class:`rumps.SliderMenuItem`.
-
-    .. versionadded:: 0.3.0
-
-    :param args: a series of strings representing the path to a :class:`rumps.SliderMenuItem` in the main menu of the
-                 application.
-    """
-    def decorator(f):
-
-        def register_click(self):
-
-            # self not defined yet but will be later in 'run' method
-            menuitem = self._menu
-            if menuitem is None:
-                raise ValueError('no menu created')
-
-            # create here in case of error so we don't create the path
-            slider_menu_item = SliderMenuItem(**options)
-            slider_menu_item.set_callback(f)
-
-            for arg in args:
-                try:
-                    menuitem = menuitem[arg]
-                except KeyError:
-                    menuitem.add(arg)
-                    menuitem = menuitem[arg]
-
-            menuitem.add(slider_menu_item)
-
-        # delay registering the button until we have a current instance to be able to traverse the menu
-        buttons = clicked.__dict__.setdefault('*buttons', [])
-        buttons.append(register_click)
-
-        return f
-    return decorator
-
-#- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-class Menu(ListDict):
-    """Wrapper for Objective-C's NSMenu class.
-
-    Implements core functionality of menus in rumps. :class:`rumps.MenuItem` subclasses `Menu`.
-    """
-
-    # NOTE:
-    # Only ever used as the main menu since every other menu would exist as a submenu of a MenuItem
-
-    _choose_key = object()
-
-    def __init__(self):
-        self._counts = {}
-        if not hasattr(self, '_menu'):
-            self._menu = NSMenu.alloc().init()
-        super(Menu, self).__init__()
-
-    def __setitem__(self, key, value):
-        if key not in self:
-            key, value = self._process_new_menuitem(key, value)
-            self._menu.addItem_(value._menuitem)
-            super(Menu, self).__setitem__(key, value)
-
-    def __delitem__(self, key):
-        value = self[key]
-        self._menu.removeItem_(value._menuitem)
-        super(Menu, self).__delitem__(key)
-
-    def add(self, menuitem):
-        """Adds the object to the menu as a :class:`rumps.MenuItem` using the :attr:`rumps.MenuItem.title` as the
-        key. `menuitem` will be converted to a `MenuItem` object if not one already.
-        """
-        self.__setitem__(self._choose_key, menuitem)
-
-    def clear(self):
-        """Remove all `MenuItem` objects from within the menu of this `MenuItem`."""
-        self._menu.removeAllItems()
-        super(Menu, self).clear()
-
-    def copy(self):
-        raise NotImplementedError
-
-    @classmethod
-    def fromkeys(cls, *args, **kwargs):
-        raise NotImplementedError
-
-    def update(self, iterable, **kwargs):
-        """Update with objects from `iterable` after each is converted to a :class:`rumps.MenuItem`, ignoring
-        existing keys. This update is a bit different from the usual ``dict.update`` method. It works recursively and
-        will parse a variety of Python containers and objects, creating `MenuItem` object and submenus as necessary.
-
-        If the `iterable` is an instance of :class:`rumps.MenuItem`, then add to the menu.
-
-        Otherwise, for each element in the `iterable`,
-
-            - if the element is a string or is not an iterable itself, it will be converted to a
-              :class:`rumps.MenuItem` and the key will be its string representation.
-            - if the element is a :class:`rumps.MenuItem` already, it will remain the same and the key will be its
-              :attr:`rumps.MenuItem.title` attribute.
-            - if the element is an iterable having a length of 2, the first value will be converted to a
-              :class:`rumps.MenuItem` and the second will act as the submenu for that `MenuItem`
-            - if the element is an iterable having a length of anything other than 2, a ``ValueError`` will be raised
-            - if the element is a mapping, each key-value pair will act as an iterable having a length of 2
-
-        """
-        def parse_menu(iterable, menu, depth):
-            if isinstance(iterable, MenuItem):
-                menu.add(iterable)
-                return
-
-            for n, ele in enumerate(iteritems(iterable) if isinstance(iterable, collections_abc.Mapping) else iterable):
-
-                # for mappings we recurse but don't drop down a level in the menu
-                if not isinstance(ele, MenuItem) and isinstance(ele, collections_abc.Mapping):
-                    parse_menu(ele, menu, depth)
-
-                # any iterables other than strings and MenuItems
-                elif not isinstance(ele, (string_types, MenuItem)) and isinstance(ele, collections_abc.Iterable):
-                    try:
-                        menuitem, submenu = ele
-                    except TypeError:
-                        raise ValueError('menu iterable element #{0} at depth {1} has length {2}; must be a single '
-                                         'menu item or a pair consisting of a menu item and its '
-                                         'submenu'.format(n, depth, len(tuple(ele))))
-                    menuitem = MenuItem(menuitem)
-                    menu.add(menuitem)
-                    parse_menu(submenu, menuitem, depth+1)
-
-                # menu item / could be visual separator where ele is None or separator
-                else:
-                    menu.add(ele)
-        parse_menu(iterable, self, 0)
-        parse_menu(kwargs, self, 0)
-
-    # ListDict insertion methods
-    #- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-    def insert_after(self, existing_key, menuitem):
-        """Insert a :class:`rumps.MenuItem` in the menu after the `existing_key`.
-
-        :param existing_key: a string key for an existing `MenuItem` value.
-        :param menuitem: an object to be added. It will be converted to a `MenuItem` if not one already.
-        """
-        key, menuitem = self._process_new_menuitem(self._choose_key, menuitem)
-        self._insert_helper(existing_key, key, menuitem, 1)
-        super(Menu, self).insert_after(existing_key, (key, menuitem))
-
-    def insert_before(self, existing_key, menuitem):
-        """Insert a :class:`rumps.MenuItem` in the menu before the `existing_key`.
-
-        :param existing_key: a string key for an existing `MenuItem` value.
-        :param menuitem: an object to be added. It will be converted to a `MenuItem` if not one already.
-        """
-        key, menuitem = self._process_new_menuitem(self._choose_key, menuitem)
-        self._insert_helper(existing_key, key, menuitem, 0)
-        super(Menu, self).insert_before(existing_key, (key, menuitem))
-
-    def _insert_helper(self, existing_key, key, menuitem, pos):
-        if existing_key == key:  # this would mess stuff up...
-            raise ValueError('same key provided for location and insertion')
-        existing_menuitem = self[existing_key]
-        index = self._menu.indexOfItem_(existing_menuitem._menuitem)
-        self._menu.insertItem_atIndex_(menuitem._menuitem, index + pos)
-
-    # Processing MenuItems
-    #- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-    def _process_new_menuitem(self, key, value):
-        if value is None or value is separator:
-            value = SeparatorMenuItem()
-
-        if not hasattr(value, '_menuitem'):
-            value = MenuItem(value)
-
-        if key is self._choose_key:
-            if hasattr(value, 'title'):
-                key = value.title
-            else:
-                cls = type(value)
-                count = self._counts[cls] = self._counts.get(cls, 0) + 1
-                key = '%s_%d' % (cls.__name__, count)
-
-        if hasattr(value, 'title') and key != value.title:
-            _log('WARNING: key {0} is not the same as the title of the corresponding MenuItem {1}; while this '
-                 'would occur if the title is dynamically altered, having different names at the time of menu '
-                 'creation may not be desired '.format(repr(key), repr(value.title)))
-
-        return key, value
-
-
-class MenuItem(Menu):
-    """Represents an item within the application's menu.
-
-    A :class:`rumps.MenuItem` is a button inside a menu but it can also serve as a menu itself whose elements are
-    other `MenuItem` instances.
-
-    Encapsulates and abstracts Objective-C NSMenuItem (and possibly a corresponding NSMenu as a submenu).
-
-    A couple of important notes:
-
-        - A new `MenuItem` instance can be created from any object with a string representation.
-        - Attempting to create a `MenuItem` by passing an existing `MenuItem` instance as the first parameter will not
-          result in a new instance but will instead return the existing instance.
-
-    Remembers the order of items added to menu and has constant time lookup. Can insert new `MenuItem` object before or
-    after other specified ones.
-
-    .. note::
-       When adding a `MenuItem` instance to a menu, the value of :attr:`title` at that time will serve as its key for
-       lookup performed on menus even if the `title` changes during program execution.
-
-    :param title: the name of this menu item. If not a string, will use the string representation of the object.
-    :param callback: the function serving as callback for when a click event occurs on this menu item.
-    :param key: the key shortcut to click this menu item. Must be a string or ``None``.
-    :param icon: a path to an image. If set to ``None``, the current image (if any) is removed.
-    :param dimensions: a sequence of numbers whose length is two, specifying the dimensions of the icon.
-    :param template: a boolean, specifying template mode for a given icon (proper b/w display in dark menu bar)
-    """
-
-    # NOTE:
-    # Because of the quirks of PyObjC, a class level dictionary **inside an NSObject subclass for 10.9.x** is required
-    # in order to have callback_ be a @classmethod. And we need callback_ to be class level because we can't use
-    # instances in setTarget_ method of NSMenuItem. Otherwise this would be much more straightforward like Timer class.
-    #
-    # So the target is always the NSApp class and action is always the @classmethod callback_ -- for every function
-    # decorated with @clicked(...). All we do is lookup the MenuItem instance and the user-provided callback function
-    # based on the NSMenuItem (the only argument passed to callback_).
-
-    def __new__(cls, *args, **kwargs):
-        if args and isinstance(args[0], MenuItem):  # can safely wrap MenuItem instances
-            return args[0]
-        return super(MenuItem, cls).__new__(cls, *args, **kwargs)
-
-    def __init__(self, title, callback=None, key=None, icon=None, dimensions=None, template=None):
-        if isinstance(title, MenuItem):  # don't initialize already existing instances
-            return
-        self._menuitem = NSMenuItem.alloc().initWithTitle_action_keyEquivalent_(text_type(title), None, '')
-        self._menuitem.setTarget_(NSApp)
-        self._menu = self._icon = None
-        self.set_callback(callback, key)
-        self._template = template
-        self.set_icon(icon, dimensions, template)
-        super(MenuItem, self).__init__()
-
-    def __setitem__(self, key, value):
-        if self._menu is None:
-            self._menu = NSMenu.alloc().init()
-            self._menuitem.setSubmenu_(self._menu)
-        super(MenuItem, self).__setitem__(key, value)
-
-    def __repr__(self):
-        return '<{0}: [{1} -> {2}; callback: {3}]>'.format(type(self).__name__, repr(self.title), list(map(str, self)),
-                                                           repr(self.callback))
-
-    @property
-    def title(self):
-        """The text displayed in a menu for this menu item. If not a string, will use the string representation of the
-        object.
-        """
-        return self._menuitem.title()
-
-    @title.setter
-    def title(self, new_title):
-        new_title = text_type(new_title)
-        self._menuitem.setTitle_(new_title)
-
-    @property
-    def icon(self):
-        """The path to an image displayed next to the text for this menu item. If set to ``None``, the current image
-        (if any) is removed.
-
-        .. versionchanged:: 0.2.0
-           Setting icon to ``None`` after setting it to an image will correctly remove the icon. Returns the path to an
-           image rather than exposing a `PyObjC` class.
-
-        """
-        return self._icon
-
-    @icon.setter
-    def icon(self, icon_path):
-        self.set_icon(icon_path, template=self._template)
-
-    @property
-    def template(self):
-        """Template mode for an icon. If set to ``None``, the current icon (if any) is displayed as a color icon.
-        If set to ``True``, template mode is enabled and the icon will be displayed correctly in dark menu bar mode.
-        """
-        return self._template
-
-    @template.setter
-    def template(self, template_mode):
-        self._template = template_mode
-        self.set_icon(self.icon, template=template_mode)
-
-    def set_icon(self, icon_path, dimensions=None, template=None):
-        """Sets the icon displayed next to the text for this menu item. If set to ``None``, the current image (if any)
-        is removed. Can optionally supply `dimensions`.
-
-        .. versionchanged:: 0.2.0
-           Setting `icon` to ``None`` after setting it to an image will correctly remove the icon. Passing `dimensions`
-           a sequence whose length is not two will no longer silently error.
-
-        :param icon_path: a file path to an image.
-        :param dimensions: a sequence of numbers whose length is two.
-        :param template: a boolean who defines the template mode for the icon.
-        """
-        new_icon = _nsimage_from_file(icon_path, dimensions, template) if icon_path is not None else None
-        self._icon = icon_path
-        self._menuitem.setImage_(new_icon)
-
-    @property
-    def state(self):
-        """The state of the menu item. The "on" state is symbolized by a check mark. The "mixed" state is symbolized
-        by a dash.
-
-        .. table:: Setting states
-
-           =====  ======
-           State  Number
-           =====  ======
-            ON      1
-            OFF     0
-           MIXED   -1
-           =====  ======
-
-        """
-        return self._menuitem.state()
-
-    @state.setter
-    def state(self, new_state):
-        self._menuitem.setState_(new_state)
-
-    @property
-    def hidden(self):
-        """Indicates whether the menu item is hidden.
-
-        .. versionadded:: 0.4.0
-
-        """
-        return self._menuitem.isHidden()
-
-    @hidden.setter
-    def hidden(self, value):
-        self._menuitem.setHidden_(value)
-
-    def hide(self):
-        """Hide the menu item.
-
-        .. versionadded:: 0.4.0
-
-        """
-        self.hidden = True
-
-    def show(self):
-        """Show the menu item.
-
-        .. versionadded:: 0.4.0
-
-        """
-        self.hidden = False
-
-    def set_callback(self, callback, key=None):
-        """Set the function serving as callback for when a click event occurs on this menu item. When `callback` is
-        ``None``, it will disable the callback function and grey out the menu item. If `key` is a string, set as the
-        key shortcut. If it is ``None``, no adjustment will be made to the current key shortcut.
-
-        .. versionchanged:: 0.2.0
-           Allowed passing ``None`` as both `callback` and `key`. Additionally, passing a `key` that is neither a
-           string nor ``None`` will result in a standard ``TypeError`` rather than various, uninformative `PyObjC`
-           internal errors depending on the object.
-
-        :param callback: the function to be called when the user clicks on this menu item.
-        :param key: the key shortcut to click this menu item.
-        """
-        _internal.require_string_or_none(key)
-        if key is not None:
-            self._menuitem.setKeyEquivalent_(key)
-        NSApp._ns_to_py_and_callback[self._menuitem] = self, callback
-        self._menuitem.setAction_('callback:' if callback is not None else None)
-
-    @property
-    def callback(self):
-        """Return the current callback function.
-
-        .. versionadded:: 0.2.0
-
-        """
-        return NSApp._ns_to_py_and_callback[self._menuitem][1]
-
-    @property
-    def key(self):
-        """The key shortcut to click this menu item.
-
-        .. versionadded:: 0.2.0
-
-        """
-        return self._menuitem.keyEquivalent()
-
-
-class SliderMenuItem(object):
-    """Represents a slider menu item within the application's menu.
-
-    .. versionadded:: 0.3.0
-
-    :param value: a number for the current position of the slider.
-    :param min_value: a number for the minimum position to which a slider can be moved.
-    :param max_value: a number for the maximum position to which a slider can be moved.
-    :param callback: the function serving as callback for when a slide event occurs on this menu item.
-    :param dimensions: a sequence of numbers whose length is two, specifying the dimensions of the slider.
-    """
-
-    def __init__(self, value=50, min_value=0, max_value=100, callback=None, dimensions=(180, 15)):
-        self._slider = NSSlider.alloc().init()
-        self._slider.setMinValue_(min_value)
-        self._slider.setMaxValue_(max_value)
-        self._slider.setDoubleValue_(value)
-        self._slider.setFrameSize_(NSSize(*dimensions))
-        self._slider.setTarget_(NSApp)
-        self._menuitem = NSMenuItem.alloc().init()
-        self._menuitem.setTarget_(NSApp)
-        self._menuitem.setView_(self._slider)
-        self.set_callback(callback)
-
-    def __repr__(self):
-        return '<{0}: [value: {1}; callback: {2}]>'.format(
-            type(self).__name__,
-            self.value,
-            repr(self.callback)
-        )
-
-    def set_callback(self, callback):
-        """Set the function serving as callback for when a slide event occurs on this menu item.
-
-        :param callback: the function to be called when the user drags the marker on the slider.
-        """
-        NSApp._ns_to_py_and_callback[self._slider] = self, callback
-        self._slider.setAction_('callback:' if callback is not None else None)
-
-    @property
-    def callback(self):
-        return NSApp._ns_to_py_and_callback[self._slider][1]
-
-    @property
-    def value(self):
-        """The current position of the slider."""
-        return self._slider.doubleValue()
-
-    @value.setter
-    def value(self, new_value):
-        self._slider.setDoubleValue_(new_value)
-
-
-class SeparatorMenuItem(object):
-    """Visual separator between :class:`rumps.MenuItem` objects in the application menu."""
-    def __init__(self):
-        self._menuitem = NSMenuItem.separatorItem()
-
-
-class Timer(object):
-    """
-    Python abstraction of an Objective-C event timer in a new thread for application. Controls the callback function,
-    interval, and starting/stopping the run loop.
-
-    .. versionchanged:: 0.2.0
-       Method `__call__` removed.
-
-    :param callback: Function that should be called every `interval` seconds. It will be passed this
-                     :class:`rumps.Timer` object as its only parameter.
-    :param interval: The time in seconds to wait before calling the `callback` function.
-    """
-    def __init__(self, callback, interval):
-        self.set_callback(callback)
-        self._interval = interval
-        self._status = False
-
-    def __repr__(self):
-        return ('<{0}: [callback: {1}; interval: {2}; '
-                'status: {3}]>').format(type(self).__name__, repr(getattr(self, '*callback').__name__),
-                                        self._interval, 'ON' if self._status else 'OFF')
-
-    @property
-    def interval(self):
-        """The time in seconds to wait before calling the :attr:`callback` function."""
-        return self._interval  # self._nstimer.timeInterval() when active but could be inactive
-
-    @interval.setter
-    def interval(self, new_interval):
-        if self._status:
-            if abs(self._nsdate.timeIntervalSinceNow()) >= self._nstimer.timeInterval():
-                self.stop()
-                self._interval = new_interval
-                self.start()
-        else:
-            self._interval = new_interval
-
-    @property
-    def callback(self):
-        """The current function specified as the callback."""
-        return getattr(self, '*callback')
-
-    def is_alive(self):
-        """Whether the timer thread loop is currently running."""
-        return self._status
-
-    def start(self):
-        """Start the timer thread loop."""
-        if not self._status:
-            self._nsdate = NSDate.date()
-            self._nstimer = NSTimer.alloc().initWithFireDate_interval_target_selector_userInfo_repeats_(
-                self._nsdate, self._interval, self, 'callback:', None, True)
-            NSRunLoop.currentRunLoop().addTimer_forMode_(self._nstimer, NSDefaultRunLoopMode)
-            _TIMERS[self] = None
-            self._status = True
-
-    def stop(self):
-        """Stop the timer thread loop."""
-        if self._status:
-            self._nstimer.invalidate()
-            del self._nstimer
-            del self._nsdate
-            self._status = False
-
-    def set_callback(self, callback):
-        """Set the function that should be called every :attr:`interval` seconds. It will be passed this
-        :class:`rumps.Timer` object as its only parameter.
-        """
-        setattr(self, '*callback', callback)
-
-    def callback_(self, _):
-        _log(self)
-        try:
-            return _internal.call_as_function_or_method(getattr(self, '*callback'), self)
-        except Exception:
-            traceback.print_exc()
-
-
-class Window(object):
-    """Generate a window to consume user input in the form of both text and button clicked.
-
-    .. versionchanged:: 0.2.0
-        Providing a `cancel` string will set the button text rather than only using text "Cancel". `message` is no
-        longer a required parameter.
-
-    .. versionchanged:: 0.3.0
-        Add `secure` text input field functionality.
-
-    :param message: the text positioned below the `title` in smaller font. If not a string, will use the string
-                    representation of the object.
-    :param title: the text positioned at the top of the window in larger font. If not a string, will use the string
-                  representation of the object.
-    :param default_text: the text within the editable textbox. If not a string, will use the string representation of
-                         the object.
-    :param ok: the text for the "ok" button. Must be either a string or ``None``. If ``None``, a default
-               localized button title will be used.
-    :param cancel: the text for the "cancel" button. If a string, the button will have that text. If `cancel`
-                   evaluates to ``True``, will create a button with text "Cancel". Otherwise, this button will not be
-                   created.
-    :param dimensions: the size of the editable textbox. Must be sequence with a length of 2.
-    :param secure: should the text field be secured or not. With ``True`` the window can be used for passwords.
-    """
-
-    def __init__(self, message='', title='', default_text='', ok=None, cancel=None, dimensions=(320, 160),
-                 secure=False):
-        message = text_type(message)
-        message = message.replace('%', '%%')
-        title = text_type(title)
-
-        self._cancel = bool(cancel)
-        self._icon = None
-
-        _internal.require_string_or_none(ok)
-        if not isinstance(cancel, string_types):
-            cancel = 'Cancel' if cancel else None
-
-        self._alert = NSAlert.alertWithMessageText_defaultButton_alternateButton_otherButton_informativeTextWithFormat_(
-            title, ok, cancel, None, message)
-        self._alert.setAlertStyle_(0)  # informational style
-
-        if secure:
-            self._textfield = SecureEditing.alloc().initWithFrame_(NSMakeRect(0, 0, *dimensions))
-        else:
-            self._textfield = Editing.alloc().initWithFrame_(NSMakeRect(0, 0, *dimensions))
-        self._textfield.setSelectable_(True)
-        self._alert.setAccessoryView_(self._textfield)
-
-        self.default_text = default_text
-
-    @property
-    def title(self):
-        """The text positioned at the top of the window in larger font. If not a string, will use the string
-        representation of the object.
-        """
-        return self._alert.messageText()
-
-    @title.setter
-    def title(self, new_title):
-        new_title = text_type(new_title)
-        self._alert.setMessageText_(new_title)
-
-    @property
-    def message(self):
-        """The text positioned below the :attr:`title` in smaller font. If not a string, will use the string
-        representation of the object.
-        """
-        return self._alert.informativeText()
-
-    @message.setter
-    def message(self, new_message):
-        new_message = text_type(new_message)
-        self._alert.setInformativeText_(new_message)
-
-    @property
-    def default_text(self):
-        """The text within the editable textbox. An example would be
-
-            "Type your message here."
-
-        If not a string, will use the string representation of the object.
-        """
-        return self._default_text
-
-    @default_text.setter
-    def default_text(self, new_text):
-        new_text = text_type(new_text)
-        self._default_text = new_text
-        self._textfield.setStringValue_(new_text)
-
-    @property
-    def icon(self):
-        """The path to an image displayed for this window. If set to ``None``, will default to the icon for the
-        application using :attr:`rumps.App.icon`.
-
-        .. versionchanged:: 0.2.0
-           If the icon is set to an image then changed to ``None``, it will correctly be changed to the application
-           icon.
-
-        """
-        return self._icon
-
-    @icon.setter
-    def icon(self, icon_path):
-        new_icon = _nsimage_from_file(icon_path) if icon_path is not None else None
-        self._icon = icon_path
-        self._alert.setIcon_(new_icon)
-
-    def add_button(self, name):
-        """Create a new button.
-
-        .. versionchanged:: 0.2.0
-           The `name` parameter is required to be a string.
-
-        :param name: the text for a new button. Must be a string.
-        """
-        _internal.require_string(name)
-        self._alert.addButtonWithTitle_(name)
-
-    def add_buttons(self, iterable=None, *args):
-        """Create multiple new buttons.
-
-        .. versionchanged:: 0.2.0
-           Since each element is passed to :meth:`rumps.Window.add_button`, they must be strings.
-
-        """
-        if iterable is None:
-            return
-        if isinstance(iterable, string_types):
-            self.add_button(iterable)
-        else:
-            for ele in iterable:
-                self.add_button(ele)
-        for arg in args:
-            self.add_button(arg)
-
-    def run(self):
-        """Launch the window. :class:`rumps.Window` instances can be reused to retrieve user input as many times as
-        needed.
-
-        :return: a :class:`rumps.rumps.Response` object that contains the text and the button clicked as an integer.
-        """
-        _log(self)
-        if NSUserDefaults.standardUserDefaults().stringForKey_('AppleInterfaceStyle') == 'Dark':
-            self._alert.window().setAppearance_(AppKit.NSAppearance.appearanceNamed_('NSAppearanceNameVibrantDark'))
-        clicked = self._alert.runModal() % 999
-        if clicked > 2 and self._cancel:
-            clicked -= 1
-        self._textfield.validateEditing()
-        text = self._textfield.stringValue()
-        self.default_text = self._default_text  # reset default text
-        return Response(clicked, text)
-
-
-class Response(object):
-    """Holds information from user interaction with a :class:`rumps.Window` after it has been closed."""
-
-    def __init__(self, clicked, text):
-        self._clicked = clicked
-        self._text = text
-
-    def __repr__(self):
-        shortened_text = self._text if len(self._text) < 21 else self._text[:17] + '...'
-        return '<{0}: [clicked: {1}, text: {2}]>'.format(type(self).__name__, self._clicked, repr(shortened_text))
-
-    @property
-    def clicked(self):
-        """Return a number representing the button pressed by the user.
-
-        The "ok" button will return ``1`` and the "cancel" button will return ``0``. This makes it convenient to write
-        a conditional like,
-
-        .. code-block:: python
-
-            if response.clicked:
-                do_thing_for_ok_pressed()
-            else:
-                do_thing_for_cancel_pressed()
-
-        Where `response` is an instance of :class:`rumps.rumps.Response`.
-
-        Additional buttons added using methods :meth:`rumps.Window.add_button` and :meth:`rumps.Window.add_buttons`
-        will return ``2``, ``3``, ... in the order they were added.
-        """
-        return self._clicked
-
-    @property
-    def text(self):
-        """Return the text collected from the user."""
-        return self._text
-
-
-class NSApp(NSObject):
-    """Objective-C delegate class for NSApplication. Don't instantiate - use App instead."""
-
-    _ns_to_py_and_callback = {}
-
-    def userNotificationCenter_didActivateNotification_(self, notification_center, notification):
-        notifications._clicked(notification_center, notification)
-
-    def initializeStatusBar(self):
-        self.nsstatusitem = NSStatusBar.systemStatusBar().statusItemWithLength_(-1)  # variable dimensions
-        self.nsstatusitem.setHighlightMode_(True)
-
-        self.setStatusBarIcon()
-        self.setStatusBarTitle()
-
-        mainmenu = self._app['_menu']
-        quit_button = self._app['_quit_button']
-        if quit_button is not None:
-            quit_button.set_callback(quit_application)
-            mainmenu.add(quit_button)
-        else:
-            _log('WARNING: the default quit button is disabled. To exit the application gracefully, another button '
-                 'should have a callback of quit_application or call it indirectly.')
-        self.nsstatusitem.setMenu_(mainmenu._menu)  # mainmenu of our status bar spot (_menu attribute is NSMenu)
-
-    def setStatusBarTitle(self):
-        self.nsstatusitem.setTitle_(self._app['_title'])
-        self.fallbackOnName()
-
-    def setStatusBarIcon(self):
-        self.nsstatusitem.setImage_(self._app['_icon_nsimage'])
-        self.fallbackOnName()
-
-    def fallbackOnName(self):
-        if not (self.nsstatusitem.title() or self.nsstatusitem.image()):
-            self.nsstatusitem.setTitle_(self._app['_name'])
-
-    def applicationDidFinishLaunching_(self, notification):
-        workspace          = NSWorkspace.sharedWorkspace()
-        notificationCenter = workspace.notificationCenter()
-        notificationCenter.addObserver_selector_name_object_(
-            self,
-            self.receiveSleepNotification_,
-            NSWorkspaceWillSleepNotification,
-            None
-        )
-        notificationCenter.addObserver_selector_name_object_(
-            self,
-            self.receiveWakeNotification_,
-            NSWorkspaceDidWakeNotification,
-            None
-        )
-
-    def receiveSleepNotification_(self, ns_notification):
-        _log('receiveSleepNotification')
-        events.on_sleep.emit()
-
-    def receiveWakeNotification_(self, ns_notification):
-        _log('receiveWakeNotification')
-        events.on_wake.emit()
-
-    def applicationWillTerminate_(self, ns_notification):
-        _log('applicationWillTerminate')
-        events.before_quit.emit()
-
-    @classmethod
-    def callback_(cls, nsmenuitem):
-        self, callback = cls._ns_to_py_and_callback[nsmenuitem]
-        _log(self)
-        try:
-            return _internal.call_as_function_or_method(callback, self)
-        except Exception:
-            traceback.print_exc()
-
-
-class App(object):
-    """Represents the statusbar application.
-
-    Provides a simple and pythonic interface for all those long and ugly `PyObjC` calls. :class:`rumps.App` may be
-    subclassed so that the application logic can be encapsulated within a class. Alternatively, an `App` can be
-    instantiated and the various callback functions can exist at module level.
-
-    .. versionchanged:: 0.2.0
-       `name` parameter must be a string and `title` must be either a string or ``None``. `quit_button` parameter added.
-
-    :param name: the name of the application.
-    :param title: text that will be displayed for the application in the statusbar.
-    :param icon: file path to the icon that will be displayed for the application in the statusbar.
-    :param menu: an iterable of Python objects or pairs of objects that will be converted into the main menu for the
-                 application. Parsing is implemented by calling :meth:`rumps.MenuItem.update`.
-    :param quit_button: the quit application menu item within the main menu. If ``None``, the default quit button will
-                        not be added.
-    """
-
-    # NOTE:
-    # Serves as a setup class for NSApp since Objective-C classes shouldn't be instantiated normally.
-    # This is the most user-friendly way.
-
-    #: A serializer for notification data.  The default is pickle.
-    serializer = pickle
-
-    def __init__(self, name, title=None, icon=None, template=None, menu=None, quit_button='Quit'):
-        _internal.require_string(name)
-        self._name = name
-        self._icon = self._icon_nsimage = self._title = None
-        self._template = template
-        self.icon = icon
-        self.title = title
-        self.quit_button = quit_button
-        self._menu = Menu()
-        if menu is not None:
-            self.menu = menu
-        self._application_support = application_support(self._name)
-
-    # Properties
-    #- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-    @property
-    def name(self):
-        """The name of the application. Determines the application support folder name. Will also serve as the title
-        text of the application if :attr:`title` is not set.
-        """
-        return self._name
-
-    @property
-    def title(self):
-        """The text that will be displayed for the application in the statusbar. Can be ``None`` in which case the icon
-        will be used or, if there is no icon set the application text will fallback on the application :attr:`name`.
-
-        .. versionchanged:: 0.2.0
-           If the title is set then changed to ``None``, it will correctly be removed. Must be either a string or
-           ``None``.
-
-        """
-        return self._title
-
-    @title.setter
-    def title(self, title):
-        _internal.require_string_or_none(title)
-        self._title = title
-        try:
-            self._nsapp.setStatusBarTitle()
-        except AttributeError:
-            pass
-
-    @property
-    def icon(self):
-        """A path to an image representing the icon that will be displayed for the application in the statusbar.
-        Can be ``None`` in which case the text from :attr:`title` will be used.
-
-        .. versionchanged:: 0.2.0
-           If the icon is set to an image then changed to ``None``, it will correctly be removed.
-
-        """
-        return self._icon
-
-    @icon.setter
-    def icon(self, icon_path):
-        new_icon = _nsimage_from_file(icon_path, template=self._template) if icon_path is not None else None
-        self._icon = icon_path
-        self._icon_nsimage = new_icon
-        try:
-            self._nsapp.setStatusBarIcon()
-        except AttributeError:
-            pass
-
-    @property
-    def template(self):
-        """Template mode for an icon. If set to ``None``, the current icon (if any) is displayed as a color icon.
-        If set to ``True``, template mode is enabled and the icon will be displayed correctly in dark menu bar mode.
-        """
-        return self._template
-
-    @template.setter
-    def template(self, template_mode):
-        self._template = template_mode
-        # resetting the icon to apply template setting
-        self.icon = self._icon
-
-    @property
-    def menu(self):
-        """Represents the main menu of the statusbar application. Setting `menu` works by calling
-        :meth:`rumps.MenuItem.update`.
-        """
-        return self._menu
-
-    @menu.setter
-    def menu(self, iterable):
-        self._menu.update(iterable)
-
-    @property
-    def quit_button(self):
-        """The quit application menu item within the main menu. This is a special :class:`rumps.MenuItem` object that
-        will both replace any function callback with :func:`rumps.quit_application` and add itself to the end of the
-        main menu when :meth:`rumps.App.run` is called. If set to ``None``, the default quit button will not be added.
-
-        .. warning::
-           If set to ``None``, some other menu item should call :func:`rumps.quit_application` so that the
-           application can exit gracefully.
-
-        .. versionadded:: 0.2.0
-
-        """
-        return self._quit_button
-
-    @quit_button.setter
-    def quit_button(self, quit_text):
-        if quit_text is None:
-            self._quit_button = None
-        else:
-            self._quit_button = MenuItem(quit_text)
-
-    # Open files in application support folder
-    #- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-    def open(self, *args):
-        """Open a file within the application support folder for this application.
-
-        .. code-block:: python
-
-            app = App('Cool App')
-            with app.open('data.json') as f:
-                pass
-
-        Is a shortcut for,
-
-        .. code-block:: python
-
-            app = App('Cool App')
-            filename = os.path.join(application_support(app.name), 'data.json')
-            with open(filename) as f:
-                pass
-
-        """
-        return open(os.path.join(self._application_support, args[0]), *args[1:])
-
-    # Run the application
-    #- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-    def run(self, **options):
-        """Performs various setup tasks including creating the underlying Objective-C application, starting the timers,
-        and registering callback functions for click events. Then starts the application run loop.
-
-        .. versionchanged:: 0.2.1
-            Accepts `debug` keyword argument.
-
-        :param debug: determines if application should log information useful for debugging. Same effect as calling
-                      :func:`rumps.debug_mode`.
-
-        """
-        dont_change = object()
-        debug = options.get('debug', dont_change)
-        if debug is not dont_change:
-            debug_mode(debug)
-
-        nsapplication = NSApplication.sharedApplication()
-        nsapplication.activateIgnoringOtherApps_(True)  # NSAlerts in front
-        self._nsapp = NSApp.alloc().init()
-        self._nsapp._app = self.__dict__  # allow for dynamic modification based on this App instance
-        nsapplication.setDelegate_(self._nsapp)
-        notifications._init_nsapp(self._nsapp)
-
-        setattr(App, '*app_instance', self)  # class level ref to running instance (for passing self to App subclasses)
-        t = b = None
-        for t in getattr(timer, '*timers', []):
-            t.start()
-        for b in getattr(clicked, '*buttons', []):
-            b(self)  # we waited on registering clicks so we could pass self to access _menu attribute
-        del t, b
-
-        self._nsapp.initializeStatusBar()
-
-        AppHelper.installMachInterrupt()
-        events.before_start.emit()
-        AppHelper.runEventLoop()
diff --git a/lib/rumps/text_field.py b/lib/rumps/text_field.py
deleted file mode 100644
index f33f0ff4..00000000
--- a/lib/rumps/text_field.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from AppKit import NSApplication, NSTextField, NSSecureTextField, NSKeyDown, NSCommandKeyMask
-
-
-class Editing(NSTextField):
-    """NSTextField with cut, copy, paste, undo and selectAll"""
-    def performKeyEquivalent_(self, event):
-        return _perform_key_equivalent(self, event)
-
-
-class SecureEditing(NSSecureTextField):
-    """NSSecureTextField with cut, copy, paste, undo and selectAll"""
-    def performKeyEquivalent_(self, event):
-        return _perform_key_equivalent(self, event)
-
-
-def _perform_key_equivalent(self, event):
-    if event.type() == NSKeyDown and event.modifierFlags() & NSCommandKeyMask:
-        if event.charactersIgnoringModifiers() == "x":
-            NSApplication.sharedApplication().sendAction_to_from_("cut:", None, self)
-            return True
-        elif event.charactersIgnoringModifiers() == "c":
-            NSApplication.sharedApplication().sendAction_to_from_("copy:", None, self)
-            return True
-        elif event.charactersIgnoringModifiers() == "v":
-            NSApplication.sharedApplication().sendAction_to_from_("paste:", None, self)
-            return True
-        elif event.charactersIgnoringModifiers() == "z":
-            NSApplication.sharedApplication().sendAction_to_from_("undo:", None, self)
-            return True
-        elif event.charactersIgnoringModifiers() == "a":
-            NSApplication.sharedApplication().sendAction_to_from_("selectAll:", None, self)
-            return True
diff --git a/lib/rumps/utils.py b/lib/rumps/utils.py
deleted file mode 100644
index eb71b9b8..00000000
--- a/lib/rumps/utils.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-rumps.utils
-~~~~~~~~~~~
-
-Generic container classes and utility functions.
-
-:copyright: (c) 2020 by Jared Suttles
-:license: BSD-3-Clause, see LICENSE for details.
-"""
-
-from .packages.ordereddict import OrderedDict as _OrderedDict
-
-
-# ListDict: OrderedDict subclass with insertion methods for modifying the order of the linked list in O(1) time
-# https://gist.github.com/jaredks/6276032
-class ListDict(_OrderedDict):
-    def __insertion(self, link_prev, key_value):
-        key, value = key_value
-        if link_prev[2] != key:
-            if key in self:
-                del self[key]
-            link_next = link_prev[1]
-            self._OrderedDict__map[key] = link_prev[1] = link_next[0] = [link_prev, link_next, key]
-        dict.__setitem__(self, key, value)
-
-    def insert_after(self, existing_key, key_value):
-        self.__insertion(self._OrderedDict__map[existing_key], key_value)
-
-    def insert_before(self, existing_key, key_value):
-        self.__insertion(self._OrderedDict__map[existing_key][0], key_value)
diff --git a/lib/simplejson/__init__.py b/lib/simplejson/__init__.py
deleted file mode 100644
index d3ff141d..00000000
--- a/lib/simplejson/__init__.py
+++ /dev/null
@@ -1,562 +0,0 @@
-r"""JSON (JavaScript Object Notation) <http://json.org> is a subset of
-JavaScript syntax (ECMA-262 3rd edition) used as a lightweight data
-interchange format.
-
-:mod:`simplejson` exposes an API familiar to users of the standard library
-:mod:`marshal` and :mod:`pickle` modules. It is the externally maintained
-version of the :mod:`json` library contained in Python 2.6, but maintains
-compatibility back to Python 2.5 and (currently) has significant performance
-advantages, even without using the optional C extension for speedups.
-
-Encoding basic Python object hierarchies::
-
-    >>> import simplejson as json
-    >>> json.dumps(['foo', {'bar': ('baz', None, 1.0, 2)}])
-    '["foo", {"bar": ["baz", null, 1.0, 2]}]'
-    >>> print(json.dumps("\"foo\bar"))
-    "\"foo\bar"
-    >>> print(json.dumps(u'\u1234'))
-    "\u1234"
-    >>> print(json.dumps('\\'))
-    "\\"
-    >>> print(json.dumps({"c": 0, "b": 0, "a": 0}, sort_keys=True))
-    {"a": 0, "b": 0, "c": 0}
-    >>> from simplejson.compat import StringIO
-    >>> io = StringIO()
-    >>> json.dump(['streaming API'], io)
-    >>> io.getvalue()
-    '["streaming API"]'
-
-Compact encoding::
-
-    >>> import simplejson as json
-    >>> obj = [1,2,3,{'4': 5, '6': 7}]
-    >>> json.dumps(obj, separators=(',',':'), sort_keys=True)
-    '[1,2,3,{"4":5,"6":7}]'
-
-Pretty printing::
-
-    >>> import simplejson as json
-    >>> print(json.dumps({'4': 5, '6': 7}, sort_keys=True, indent='    '))
-    {
-        "4": 5,
-        "6": 7
-    }
-
-Decoding JSON::
-
-    >>> import simplejson as json
-    >>> obj = [u'foo', {u'bar': [u'baz', None, 1.0, 2]}]
-    >>> json.loads('["foo", {"bar":["baz", null, 1.0, 2]}]') == obj
-    True
-    >>> json.loads('"\\"foo\\bar"') == u'"foo\x08ar'
-    True
-    >>> from simplejson.compat import StringIO
-    >>> io = StringIO('["streaming API"]')
-    >>> json.load(io)[0] == 'streaming API'
-    True
-
-Specializing JSON object decoding::
-
-    >>> import simplejson as json
-    >>> def as_complex(dct):
-    ...     if '__complex__' in dct:
-    ...         return complex(dct['real'], dct['imag'])
-    ...     return dct
-    ...
-    >>> json.loads('{"__complex__": true, "real": 1, "imag": 2}',
-    ...     object_hook=as_complex)
-    (1+2j)
-    >>> from decimal import Decimal
-    >>> json.loads('1.1', parse_float=Decimal) == Decimal('1.1')
-    True
-
-Specializing JSON object encoding::
-
-    >>> import simplejson as json
-    >>> def encode_complex(obj):
-    ...     if isinstance(obj, complex):
-    ...         return [obj.real, obj.imag]
-    ...     raise TypeError('Object of type %s is not JSON serializable' %
-    ...                     obj.__class__.__name__)
-    ...
-    >>> json.dumps(2 + 1j, default=encode_complex)
-    '[2.0, 1.0]'
-    >>> json.JSONEncoder(default=encode_complex).encode(2 + 1j)
-    '[2.0, 1.0]'
-    >>> ''.join(json.JSONEncoder(default=encode_complex).iterencode(2 + 1j))
-    '[2.0, 1.0]'
-
-Using simplejson.tool from the shell to validate and pretty-print::
-
-    $ echo '{"json":"obj"}' | python -m simplejson.tool
-    {
-        "json": "obj"
-    }
-    $ echo '{ 1.2:3.4}' | python -m simplejson.tool
-    Expecting property name: line 1 column 3 (char 2)
-
-Parsing multiple documents serialized as JSON lines (newline-delimited JSON)::
-
-    >>> import simplejson as json
-    >>> def loads_lines(docs):
-    ...     for doc in docs.splitlines():
-    ...         yield json.loads(doc)
-    ...
-    >>> sum(doc["count"] for doc in loads_lines('{"count":1}\n{"count":2}\n{"count":3}\n'))
-    6
-
-Serializing multiple objects to JSON lines (newline-delimited JSON)::
-
-    >>> import simplejson as json
-    >>> def dumps_lines(objs):
-    ...     for obj in objs:
-    ...         yield json.dumps(obj, separators=(',',':')) + '\n'
-    ...
-    >>> ''.join(dumps_lines([{'count': 1}, {'count': 2}, {'count': 3}]))
-    '{"count":1}\n{"count":2}\n{"count":3}\n'
-
-"""
-from __future__ import absolute_import
-__version__ = '3.19.3'
-__all__ = [
-    'dump', 'dumps', 'load', 'loads',
-    'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',
-    'OrderedDict', 'simple_first', 'RawJSON'
-]
-
-__author__ = 'Bob Ippolito <bob@redivi.com>'
-
-from decimal import Decimal
-
-from .errors import JSONDecodeError
-from .raw_json import RawJSON
-from .decoder import JSONDecoder
-from .encoder import JSONEncoder, JSONEncoderForHTML
-def _import_OrderedDict():
-    import collections
-    try:
-        return collections.OrderedDict
-    except AttributeError:
-        from . import ordered_dict
-        return ordered_dict.OrderedDict
-OrderedDict = _import_OrderedDict()
-
-def _import_c_make_encoder():
-    try:
-        from ._speedups import make_encoder
-        return make_encoder
-    except ImportError:
-        return None
-
-_default_encoder = JSONEncoder()
-
-def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True,
-         allow_nan=False, cls=None, indent=None, separators=None,
-         encoding='utf-8', default=None, use_decimal=True,
-         namedtuple_as_object=True, tuple_as_array=True,
-         bigint_as_string=False, sort_keys=False, item_sort_key=None,
-         for_json=False, ignore_nan=False, int_as_string_bitcount=None,
-         iterable_as_array=False, **kw):
-    """Serialize ``obj`` as a JSON formatted stream to ``fp`` (a
-    ``.write()``-supporting file-like object).
-
-    If *skipkeys* is true then ``dict`` keys that are not basic types
-    (``str``, ``int``, ``long``, ``float``, ``bool``, ``None``)
-    will be skipped instead of raising a ``TypeError``.
-
-    If *ensure_ascii* is false (default: ``True``), then the output may
-    contain non-ASCII characters, so long as they do not need to be escaped
-    by JSON. When it is true, all non-ASCII characters are escaped.
-
-    If *allow_nan* is true (default: ``False``), then out of range ``float``
-    values (``nan``, ``inf``, ``-inf``) will be serialized to
-    their JavaScript equivalents (``NaN``, ``Infinity``, ``-Infinity``)
-    instead of raising a ValueError. See
-    *ignore_nan* for ECMA-262 compliant behavior.
-
-    If *indent* is a string, then JSON array elements and object members
-    will be pretty-printed with a newline followed by that string repeated
-    for each level of nesting. ``None`` (the default) selects the most compact
-    representation without any newlines.
-
-    If specified, *separators* should be an
-    ``(item_separator, key_separator)`` tuple.  The default is ``(', ', ': ')``
-    if *indent* is ``None`` and ``(',', ': ')`` otherwise.  To get the most
-    compact JSON representation, you should specify ``(',', ':')`` to eliminate
-    whitespace.
-
-    *encoding* is the character encoding for str instances, default is UTF-8.
-
-    *default(obj)* is a function that should return a serializable version
-    of obj or raise ``TypeError``. The default simply raises ``TypeError``.
-
-    If *use_decimal* is true (default: ``True``) then decimal.Decimal
-    will be natively serialized to JSON with full precision.
-
-    If *namedtuple_as_object* is true (default: ``True``),
-    :class:`tuple` subclasses with ``_asdict()`` methods will be encoded
-    as JSON objects.
-
-    If *tuple_as_array* is true (default: ``True``),
-    :class:`tuple` (and subclasses) will be encoded as JSON arrays.
-
-    If *iterable_as_array* is true (default: ``False``),
-    any object not in the above table that implements ``__iter__()``
-    will be encoded as a JSON array.
-
-    If *bigint_as_string* is true (default: ``False``), ints 2**53 and higher
-    or lower than -2**53 will be encoded as strings. This is to avoid the
-    rounding that happens in Javascript otherwise. Note that this is still a
-    lossy operation that will not round-trip correctly and should be used
-    sparingly.
-
-    If *int_as_string_bitcount* is a positive number (n), then int of size
-    greater than or equal to 2**n or lower than or equal to -2**n will be
-    encoded as strings.
-
-    If specified, *item_sort_key* is a callable used to sort the items in
-    each dictionary. This is useful if you want to sort items other than
-    in alphabetical order by key. This option takes precedence over
-    *sort_keys*.
-
-    If *sort_keys* is true (default: ``False``), the output of dictionaries
-    will be sorted by item.
-
-    If *for_json* is true (default: ``False``), objects with a ``for_json()``
-    method will use the return value of that method for encoding as JSON
-    instead of the object.
-
-    If *ignore_nan* is true (default: ``False``), then out of range
-    :class:`float` values (``nan``, ``inf``, ``-inf``) will be serialized as
-    ``null`` in compliance with the ECMA-262 specification. If true, this will
-    override *allow_nan*.
-
-    To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the
-    ``.default()`` method to serialize additional types), specify it with
-    the ``cls`` kwarg. NOTE: You should use *default* or *for_json* instead
-    of subclassing whenever possible.
-
-    """
-    # cached encoder
-    if (not skipkeys and ensure_ascii and
-        check_circular and not allow_nan and
-        cls is None and indent is None and separators is None and
-        encoding == 'utf-8' and default is None and use_decimal
-        and namedtuple_as_object and tuple_as_array and not iterable_as_array
-        and not bigint_as_string and not sort_keys
-        and not item_sort_key and not for_json
-        and not ignore_nan and int_as_string_bitcount is None
-        and not kw
-    ):
-        iterable = _default_encoder.iterencode(obj)
-    else:
-        if cls is None:
-            cls = JSONEncoder
-        iterable = cls(skipkeys=skipkeys, ensure_ascii=ensure_ascii,
-            check_circular=check_circular, allow_nan=allow_nan, indent=indent,
-            separators=separators, encoding=encoding,
-            default=default, use_decimal=use_decimal,
-            namedtuple_as_object=namedtuple_as_object,
-            tuple_as_array=tuple_as_array,
-            iterable_as_array=iterable_as_array,
-            bigint_as_string=bigint_as_string,
-            sort_keys=sort_keys,
-            item_sort_key=item_sort_key,
-            for_json=for_json,
-            ignore_nan=ignore_nan,
-            int_as_string_bitcount=int_as_string_bitcount,
-            **kw).iterencode(obj)
-    # could accelerate with writelines in some versions of Python, at
-    # a debuggability cost
-    for chunk in iterable:
-        fp.write(chunk)
-
-
-def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True,
-          allow_nan=False, cls=None, indent=None, separators=None,
-          encoding='utf-8', default=None, use_decimal=True,
-          namedtuple_as_object=True, tuple_as_array=True,
-          bigint_as_string=False, sort_keys=False, item_sort_key=None,
-          for_json=False, ignore_nan=False, int_as_string_bitcount=None,
-          iterable_as_array=False, **kw):
-    """Serialize ``obj`` to a JSON formatted ``str``.
-
-    If ``skipkeys`` is true then ``dict`` keys that are not basic types
-    (``str``, ``int``, ``long``, ``float``, ``bool``, ``None``)
-    will be skipped instead of raising a ``TypeError``.
-
-    If *ensure_ascii* is false (default: ``True``), then the output may
-    contain non-ASCII characters, so long as they do not need to be escaped
-    by JSON. When it is true, all non-ASCII characters are escaped.
-
-    If ``check_circular`` is false, then the circular reference check
-    for container types will be skipped and a circular reference will
-    result in an ``OverflowError`` (or worse).
-
-    If *allow_nan* is true (default: ``False``), then out of range ``float``
-    values (``nan``, ``inf``, ``-inf``) will be serialized to
-    their JavaScript equivalents (``NaN``, ``Infinity``, ``-Infinity``)
-    instead of raising a ValueError. See
-    *ignore_nan* for ECMA-262 compliant behavior.
-
-    If ``indent`` is a string, then JSON array elements and object members
-    will be pretty-printed with a newline followed by that string repeated
-    for each level of nesting. ``None`` (the default) selects the most compact
-    representation without any newlines. For backwards compatibility with
-    versions of simplejson earlier than 2.1.0, an integer is also accepted
-    and is converted to a string with that many spaces.
-
-    If specified, ``separators`` should be an
-    ``(item_separator, key_separator)`` tuple.  The default is ``(', ', ': ')``
-    if *indent* is ``None`` and ``(',', ': ')`` otherwise.  To get the most
-    compact JSON representation, you should specify ``(',', ':')`` to eliminate
-    whitespace.
-
-    ``encoding`` is the character encoding for bytes instances, default is
-    UTF-8.
-
-    ``default(obj)`` is a function that should return a serializable version
-    of obj or raise TypeError. The default simply raises TypeError.
-
-    If *use_decimal* is true (default: ``True``) then decimal.Decimal
-    will be natively serialized to JSON with full precision.
-
-    If *namedtuple_as_object* is true (default: ``True``),
-    :class:`tuple` subclasses with ``_asdict()`` methods will be encoded
-    as JSON objects.
-
-    If *tuple_as_array* is true (default: ``True``),
-    :class:`tuple` (and subclasses) will be encoded as JSON arrays.
-
-    If *iterable_as_array* is true (default: ``False``),
-    any object not in the above table that implements ``__iter__()``
-    will be encoded as a JSON array.
-
-    If *bigint_as_string* is true (not the default), ints 2**53 and higher
-    or lower than -2**53 will be encoded as strings. This is to avoid the
-    rounding that happens in Javascript otherwise.
-
-    If *int_as_string_bitcount* is a positive number (n), then int of size
-    greater than or equal to 2**n or lower than or equal to -2**n will be
-    encoded as strings.
-
-    If specified, *item_sort_key* is a callable used to sort the items in
-    each dictionary. This is useful if you want to sort items other than
-    in alphabetical order by key. This option takes precedence over
-    *sort_keys*.
-
-    If *sort_keys* is true (default: ``False``), the output of dictionaries
-    will be sorted by item.
-
-    If *for_json* is true (default: ``False``), objects with a ``for_json()``
-    method will use the return value of that method for encoding as JSON
-    instead of the object.
-
-    If *ignore_nan* is true (default: ``False``), then out of range
-    :class:`float` values (``nan``, ``inf``, ``-inf``) will be serialized as
-    ``null`` in compliance with the ECMA-262 specification. If true, this will
-    override *allow_nan*.
-
-    To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the
-    ``.default()`` method to serialize additional types), specify it with
-    the ``cls`` kwarg. NOTE: You should use *default* instead of subclassing
-    whenever possible.
-
-    """
-    # cached encoder
-    if (not skipkeys and ensure_ascii and
-        check_circular and not allow_nan and
-        cls is None and indent is None and separators is None and
-        encoding == 'utf-8' and default is None and use_decimal
-        and namedtuple_as_object and tuple_as_array and not iterable_as_array
-        and not bigint_as_string and not sort_keys
-        and not item_sort_key and not for_json
-        and not ignore_nan and int_as_string_bitcount is None
-        and not kw
-    ):
-        return _default_encoder.encode(obj)
-    if cls is None:
-        cls = JSONEncoder
-    return cls(
-        skipkeys=skipkeys, ensure_ascii=ensure_ascii,
-        check_circular=check_circular, allow_nan=allow_nan, indent=indent,
-        separators=separators, encoding=encoding, default=default,
-        use_decimal=use_decimal,
-        namedtuple_as_object=namedtuple_as_object,
-        tuple_as_array=tuple_as_array,
-        iterable_as_array=iterable_as_array,
-        bigint_as_string=bigint_as_string,
-        sort_keys=sort_keys,
-        item_sort_key=item_sort_key,
-        for_json=for_json,
-        ignore_nan=ignore_nan,
-        int_as_string_bitcount=int_as_string_bitcount,
-        **kw).encode(obj)
-
-
-_default_decoder = JSONDecoder()
-
-
-def load(fp, encoding=None, cls=None, object_hook=None, parse_float=None,
-        parse_int=None, parse_constant=None, object_pairs_hook=None,
-        use_decimal=False, allow_nan=False, **kw):
-    """Deserialize ``fp`` (a ``.read()``-supporting file-like object containing
-    a JSON document as `str` or `bytes`) to a Python object.
-
-    *encoding* determines the encoding used to interpret any
-    `bytes` objects decoded by this instance (``'utf-8'`` by
-    default). It has no effect when decoding `str` objects.
-
-    *object_hook*, if specified, will be called with the result of every
-    JSON object decoded and its return value will be used in place of the
-    given :class:`dict`.  This can be used to provide custom
-    deserializations (e.g. to support JSON-RPC class hinting).
-
-    *object_pairs_hook* is an optional function that will be called with
-    the result of any object literal decode with an ordered list of pairs.
-    The return value of *object_pairs_hook* will be used instead of the
-    :class:`dict`.  This feature can be used to implement custom decoders
-    that rely on the order that the key and value pairs are decoded (for
-    example, :func:`collections.OrderedDict` will remember the order of
-    insertion). If *object_hook* is also defined, the *object_pairs_hook*
-    takes priority.
-
-    *parse_float*, if specified, will be called with the string of every
-    JSON float to be decoded. By default, this is equivalent to
-    ``float(num_str)``. This can be used to use another datatype or parser
-    for JSON floats (e.g. :class:`decimal.Decimal`).
-
-    *parse_int*, if specified, will be called with the string of every
-    JSON int to be decoded. By default, this is equivalent to
-    ``int(num_str)``.  This can be used to use another datatype or parser
-    for JSON integers (e.g. :class:`float`).
-
-    *allow_nan*, if True (default false), will allow the parser to
-    accept the non-standard floats ``NaN``, ``Infinity``, and ``-Infinity``
-    and enable the use of the deprecated *parse_constant*.
-
-    If *use_decimal* is true (default: ``False``) then it implies
-    parse_float=decimal.Decimal for parity with ``dump``.
-
-    *parse_constant*, if specified, will be
-    called with one of the following strings: ``'-Infinity'``,
-    ``'Infinity'``, ``'NaN'``. It is not recommended to use this feature,
-    as it is rare to parse non-compliant JSON containing these values.
-
-    To use a custom ``JSONDecoder`` subclass, specify it with the ``cls``
-    kwarg. NOTE: You should use *object_hook* or *object_pairs_hook* instead
-    of subclassing whenever possible.
-
-    """
-    return loads(fp.read(),
-        encoding=encoding, cls=cls, object_hook=object_hook,
-        parse_float=parse_float, parse_int=parse_int,
-        parse_constant=parse_constant, object_pairs_hook=object_pairs_hook,
-        use_decimal=use_decimal, allow_nan=allow_nan, **kw)
-
-
-def loads(s, encoding=None, cls=None, object_hook=None, parse_float=None,
-        parse_int=None, parse_constant=None, object_pairs_hook=None,
-        use_decimal=False, allow_nan=False, **kw):
-    """Deserialize ``s`` (a ``str`` or ``unicode`` instance containing a JSON
-    document) to a Python object.
-
-    *encoding* determines the encoding used to interpret any
-    :class:`bytes` objects decoded by this instance (``'utf-8'`` by
-    default). It has no effect when decoding :class:`unicode` objects.
-
-    *object_hook*, if specified, will be called with the result of every
-    JSON object decoded and its return value will be used in place of the
-    given :class:`dict`.  This can be used to provide custom
-    deserializations (e.g. to support JSON-RPC class hinting).
-
-    *object_pairs_hook* is an optional function that will be called with
-    the result of any object literal decode with an ordered list of pairs.
-    The return value of *object_pairs_hook* will be used instead of the
-    :class:`dict`.  This feature can be used to implement custom decoders
-    that rely on the order that the key and value pairs are decoded (for
-    example, :func:`collections.OrderedDict` will remember the order of
-    insertion). If *object_hook* is also defined, the *object_pairs_hook*
-    takes priority.
-
-    *parse_float*, if specified, will be called with the string of every
-    JSON float to be decoded.  By default, this is equivalent to
-    ``float(num_str)``. This can be used to use another datatype or parser
-    for JSON floats (e.g. :class:`decimal.Decimal`).
-
-    *parse_int*, if specified, will be called with the string of every
-    JSON int to be decoded.  By default, this is equivalent to
-    ``int(num_str)``.  This can be used to use another datatype or parser
-    for JSON integers (e.g. :class:`float`).
-
-    *allow_nan*, if True (default false), will allow the parser to
-    accept the non-standard floats ``NaN``, ``Infinity``, and ``-Infinity``
-    and enable the use of the deprecated *parse_constant*.
-
-    If *use_decimal* is true (default: ``False``) then it implies
-    parse_float=decimal.Decimal for parity with ``dump``.
-
-    *parse_constant*, if specified, will be
-    called with one of the following strings: ``'-Infinity'``,
-    ``'Infinity'``, ``'NaN'``. It is not recommended to use this feature,
-    as it is rare to parse non-compliant JSON containing these values.
-
-    To use a custom ``JSONDecoder`` subclass, specify it with the ``cls``
-    kwarg. NOTE: You should use *object_hook* or *object_pairs_hook* instead
-    of subclassing whenever possible.
-
-    """
-    if (cls is None and encoding is None and object_hook is None and
-            parse_int is None and parse_float is None and
-            parse_constant is None and object_pairs_hook is None
-            and not use_decimal and not allow_nan and not kw):
-        return _default_decoder.decode(s)
-    if cls is None:
-        cls = JSONDecoder
-    if object_hook is not None:
-        kw['object_hook'] = object_hook
-    if object_pairs_hook is not None:
-        kw['object_pairs_hook'] = object_pairs_hook
-    if parse_float is not None:
-        kw['parse_float'] = parse_float
-    if parse_int is not None:
-        kw['parse_int'] = parse_int
-    if parse_constant is not None:
-        kw['parse_constant'] = parse_constant
-    if use_decimal:
-        if parse_float is not None:
-            raise TypeError("use_decimal=True implies parse_float=Decimal")
-        kw['parse_float'] = Decimal
-    if allow_nan:
-        kw['allow_nan'] = True
-    return cls(encoding=encoding, **kw).decode(s)
-
-
-def _toggle_speedups(enabled):
-    from . import decoder as dec
-    from . import encoder as enc
-    from . import scanner as scan
-    c_make_encoder = _import_c_make_encoder()
-    if enabled:
-        dec.scanstring = dec.c_scanstring or dec.py_scanstring
-        enc.c_make_encoder = c_make_encoder
-        enc.encode_basestring_ascii = (enc.c_encode_basestring_ascii or
-            enc.py_encode_basestring_ascii)
-        scan.make_scanner = scan.c_make_scanner or scan.py_make_scanner
-    else:
-        dec.scanstring = dec.py_scanstring
-        enc.c_make_encoder = None
-        enc.encode_basestring_ascii = enc.py_encode_basestring_ascii
-        scan.make_scanner = scan.py_make_scanner
-    dec.make_scanner = scan.make_scanner
-    global _default_decoder
-    _default_decoder = JSONDecoder()
-    global _default_encoder
-    _default_encoder = JSONEncoder()
-
-def simple_first(kv):
-    """Helper function to pass to item_sort_key to sort simple
-    elements to the top, then container elements.
-    """
-    return (isinstance(kv[1], (list, dict, tuple)), kv[0])
diff --git a/lib/simplejson/compat.py b/lib/simplejson/compat.py
deleted file mode 100644
index 5fc14128..00000000
--- a/lib/simplejson/compat.py
+++ /dev/null
@@ -1,34 +0,0 @@
-"""Python 3 compatibility shims
-"""
-import sys
-if sys.version_info[0] < 3:
-    PY3 = False
-    def b(s):
-        return s
-    try:
-        from cStringIO import StringIO
-    except ImportError:
-        from StringIO import StringIO
-    BytesIO = StringIO
-    text_type = unicode
-    binary_type = str
-    string_types = (basestring,)
-    integer_types = (int, long)
-    unichr = unichr
-    reload_module = reload
-else:
-    PY3 = True
-    if sys.version_info[:2] >= (3, 4):
-        from importlib import reload as reload_module
-    else:
-        from imp import reload as reload_module
-    def b(s):
-        return bytes(s, 'latin1')
-    from io import StringIO, BytesIO
-    text_type = str
-    binary_type = bytes
-    string_types = (str,)
-    integer_types = (int,)
-    unichr = chr
-
-long_type = integer_types[-1]
diff --git a/lib/simplejson/decoder.py b/lib/simplejson/decoder.py
deleted file mode 100644
index c99a976d..00000000
--- a/lib/simplejson/decoder.py
+++ /dev/null
@@ -1,416 +0,0 @@
-"""Implementation of JSONDecoder
-"""
-from __future__ import absolute_import
-import re
-import sys
-import struct
-from .compat import PY3, unichr
-from .scanner import make_scanner, JSONDecodeError
-
-def _import_c_scanstring():
-    try:
-        from ._speedups import scanstring
-        return scanstring
-    except ImportError:
-        return None
-c_scanstring = _import_c_scanstring()
-
-# NOTE (3.1.0): JSONDecodeError may still be imported from this module for
-# compatibility, but it was never in the __all__
-__all__ = ['JSONDecoder']
-
-FLAGS = re.VERBOSE | re.MULTILINE | re.DOTALL
-
-def _floatconstants():
-    if sys.version_info < (2, 6):
-        _BYTES = '7FF80000000000007FF0000000000000'.decode('hex')
-        nan, inf = struct.unpack('>dd', _BYTES)
-    else:
-        nan = float('nan')
-        inf = float('inf')
-    return nan, inf, -inf
-
-NaN, PosInf, NegInf = _floatconstants()
-
-_CONSTANTS = {
-    '-Infinity': NegInf,
-    'Infinity': PosInf,
-    'NaN': NaN,
-}
-
-STRINGCHUNK = re.compile(r'(.*?)(["\\\x00-\x1f])', FLAGS)
-BACKSLASH = {
-    '"': u'"', '\\': u'\\', '/': u'/',
-    'b': u'\b', 'f': u'\f', 'n': u'\n', 'r': u'\r', 't': u'\t',
-}
-
-DEFAULT_ENCODING = "utf-8"
-
-if hasattr(sys, 'get_int_max_str_digits'):
-    bounded_int = int
-else:
-    def bounded_int(s, INT_MAX_STR_DIGITS=4300):
-        """Backport of the integer string length conversion limitation
-
-        https://docs.python.org/3/library/stdtypes.html#int-max-str-digits
-        """
-        if len(s) > INT_MAX_STR_DIGITS:
-            raise ValueError("Exceeds the limit (%s) for integer string conversion: value has %s digits" % (INT_MAX_STR_DIGITS, len(s)))
-        return int(s)
-
-
-def scan_four_digit_hex(s, end, _m=re.compile(r'^[0-9a-fA-F]{4}$').match):
-    """Scan a four digit hex number from s[end:end + 4]
-    """
-    msg = "Invalid \\uXXXX escape sequence"
-    esc = s[end:end + 4]
-    if not _m(esc):
-        raise JSONDecodeError(msg, s, end - 2)
-    try:
-        return int(esc, 16), end + 4
-    except ValueError:
-        raise JSONDecodeError(msg, s, end - 2)
-
-def py_scanstring(s, end, encoding=None, strict=True,
-        _b=BACKSLASH, _m=STRINGCHUNK.match, _join=u''.join,
-        _PY3=PY3, _maxunicode=sys.maxunicode,
-        _scan_four_digit_hex=scan_four_digit_hex):
-    """Scan the string s for a JSON string. End is the index of the
-    character in s after the quote that started the JSON string.
-    Unescapes all valid JSON string escape sequences and raises ValueError
-    on attempt to decode an invalid string. If strict is False then literal
-    control characters are allowed in the string.
-
-    Returns a tuple of the decoded string and the index of the character in s
-    after the end quote."""
-    if encoding is None:
-        encoding = DEFAULT_ENCODING
-    chunks = []
-    _append = chunks.append
-    begin = end - 1
-    while 1:
-        chunk = _m(s, end)
-        if chunk is None:
-            raise JSONDecodeError(
-                "Unterminated string starting at", s, begin)
-        prev_end = end
-        end = chunk.end()
-        content, terminator = chunk.groups()
-        # Content is contains zero or more unescaped string characters
-        if content:
-            if not _PY3 and not isinstance(content, unicode):
-                content = unicode(content, encoding)
-            _append(content)
-        # Terminator is the end of string, a literal control character,
-        # or a backslash denoting that an escape sequence follows
-        if terminator == '"':
-            break
-        elif terminator != '\\':
-            if strict:
-                msg = "Invalid control character %r at"
-                raise JSONDecodeError(msg, s, prev_end)
-            else:
-                _append(terminator)
-                continue
-        try:
-            esc = s[end]
-        except IndexError:
-            raise JSONDecodeError(
-                "Unterminated string starting at", s, begin)
-        # If not a unicode escape sequence, must be in the lookup table
-        if esc != 'u':
-            try:
-                char = _b[esc]
-            except KeyError:
-                msg = "Invalid \\X escape sequence %r"
-                raise JSONDecodeError(msg, s, end)
-            end += 1
-        else:
-            # Unicode escape sequence
-            uni, end = _scan_four_digit_hex(s, end + 1)
-            # Check for surrogate pair on UCS-4 systems
-            # Note that this will join high/low surrogate pairs
-            # but will also pass unpaired surrogates through
-            if (_maxunicode > 65535 and
-                uni & 0xfc00 == 0xd800 and
-                s[end:end + 2] == '\\u'):
-                uni2, end2 = _scan_four_digit_hex(s, end + 2)
-                if uni2 & 0xfc00 == 0xdc00:
-                    uni = 0x10000 + (((uni - 0xd800) << 10) |
-                                        (uni2 - 0xdc00))
-                    end = end2
-            char = unichr(uni)
-        # Append the unescaped character
-        _append(char)
-    return _join(chunks), end
-
-
-# Use speedup if available
-scanstring = c_scanstring or py_scanstring
-
-WHITESPACE = re.compile(r'[ \t\n\r]*', FLAGS)
-WHITESPACE_STR = ' \t\n\r'
-
-def JSONObject(state, encoding, strict, scan_once, object_hook,
-        object_pairs_hook, memo=None,
-        _w=WHITESPACE.match, _ws=WHITESPACE_STR):
-    (s, end) = state
-    # Backwards compatibility
-    if memo is None:
-        memo = {}
-    memo_get = memo.setdefault
-    pairs = []
-    # Use a slice to prevent IndexError from being raised, the following
-    # check will raise a more specific ValueError if the string is empty
-    nextchar = s[end:end + 1]
-    # Normally we expect nextchar == '"'
-    if nextchar != '"':
-        if nextchar in _ws:
-            end = _w(s, end).end()
-            nextchar = s[end:end + 1]
-        # Trivial empty object
-        if nextchar == '}':
-            if object_pairs_hook is not None:
-                result = object_pairs_hook(pairs)
-                return result, end + 1
-            pairs = {}
-            if object_hook is not None:
-                pairs = object_hook(pairs)
-            return pairs, end + 1
-        elif nextchar != '"':
-            raise JSONDecodeError(
-                "Expecting property name enclosed in double quotes or '}'",
-                s, end)
-    end += 1
-    while True:
-        key, end = scanstring(s, end, encoding, strict)
-        key = memo_get(key, key)
-
-        # To skip some function call overhead we optimize the fast paths where
-        # the JSON key separator is ": " or just ":".
-        if s[end:end + 1] != ':':
-            end = _w(s, end).end()
-            if s[end:end + 1] != ':':
-                raise JSONDecodeError("Expecting ':' delimiter", s, end)
-
-        end += 1
-
-        try:
-            if s[end] in _ws:
-                end += 1
-                if s[end] in _ws:
-                    end = _w(s, end + 1).end()
-        except IndexError:
-            pass
-
-        value, end = scan_once(s, end)
-        pairs.append((key, value))
-
-        try:
-            nextchar = s[end]
-            if nextchar in _ws:
-                end = _w(s, end + 1).end()
-                nextchar = s[end]
-        except IndexError:
-            nextchar = ''
-        end += 1
-
-        if nextchar == '}':
-            break
-        elif nextchar != ',':
-            raise JSONDecodeError("Expecting ',' delimiter or '}'", s, end - 1)
-
-        try:
-            nextchar = s[end]
-            if nextchar in _ws:
-                end += 1
-                nextchar = s[end]
-                if nextchar in _ws:
-                    end = _w(s, end + 1).end()
-                    nextchar = s[end]
-        except IndexError:
-            nextchar = ''
-
-        end += 1
-        if nextchar != '"':
-            raise JSONDecodeError(
-                "Expecting property name enclosed in double quotes",
-                s, end - 1)
-
-    if object_pairs_hook is not None:
-        result = object_pairs_hook(pairs)
-        return result, end
-    pairs = dict(pairs)
-    if object_hook is not None:
-        pairs = object_hook(pairs)
-    return pairs, end
-
-def JSONArray(state, scan_once, _w=WHITESPACE.match, _ws=WHITESPACE_STR):
-    (s, end) = state
-    values = []
-    nextchar = s[end:end + 1]
-    if nextchar in _ws:
-        end = _w(s, end + 1).end()
-        nextchar = s[end:end + 1]
-    # Look-ahead for trivial empty array
-    if nextchar == ']':
-        return values, end + 1
-    elif nextchar == '':
-        raise JSONDecodeError("Expecting value or ']'", s, end)
-    _append = values.append
-    while True:
-        value, end = scan_once(s, end)
-        _append(value)
-        nextchar = s[end:end + 1]
-        if nextchar in _ws:
-            end = _w(s, end + 1).end()
-            nextchar = s[end:end + 1]
-        end += 1
-        if nextchar == ']':
-            break
-        elif nextchar != ',':
-            raise JSONDecodeError("Expecting ',' delimiter or ']'", s, end - 1)
-
-        try:
-            if s[end] in _ws:
-                end += 1
-                if s[end] in _ws:
-                    end = _w(s, end + 1).end()
-        except IndexError:
-            pass
-
-    return values, end
-
-class JSONDecoder(object):
-    """Simple JSON <http://json.org> decoder
-
-    Performs the following translations in decoding by default:
-
-    +---------------+-------------------+
-    | JSON          | Python            |
-    +===============+===================+
-    | object        | dict              |
-    +---------------+-------------------+
-    | array         | list              |
-    +---------------+-------------------+
-    | string        | str, unicode      |
-    +---------------+-------------------+
-    | number (int)  | int, long         |
-    +---------------+-------------------+
-    | number (real) | float             |
-    +---------------+-------------------+
-    | true          | True              |
-    +---------------+-------------------+
-    | false         | False             |
-    +---------------+-------------------+
-    | null          | None              |
-    +---------------+-------------------+
-
-    When allow_nan=True, it also understands
-    ``NaN``, ``Infinity``, and ``-Infinity`` as
-    their corresponding ``float`` values, which is outside the JSON spec.
-
-    """
-
-    def __init__(self, encoding=None, object_hook=None, parse_float=None,
-            parse_int=None, parse_constant=None, strict=True,
-            object_pairs_hook=None, allow_nan=False):
-        """
-        *encoding* determines the encoding used to interpret any
-        :class:`str` objects decoded by this instance (``'utf-8'`` by
-        default).  It has no effect when decoding :class:`unicode` objects.
-
-        Note that currently only encodings that are a superset of ASCII work,
-        strings of other encodings should be passed in as :class:`unicode`.
-
-        *object_hook*, if specified, will be called with the result of every
-        JSON object decoded and its return value will be used in place of the
-        given :class:`dict`.  This can be used to provide custom
-        deserializations (e.g. to support JSON-RPC class hinting).
-
-        *object_pairs_hook* is an optional function that will be called with
-        the result of any object literal decode with an ordered list of pairs.
-        The return value of *object_pairs_hook* will be used instead of the
-        :class:`dict`.  This feature can be used to implement custom decoders
-        that rely on the order that the key and value pairs are decoded (for
-        example, :func:`collections.OrderedDict` will remember the order of
-        insertion). If *object_hook* is also defined, the *object_pairs_hook*
-        takes priority.
-
-        *parse_float*, if specified, will be called with the string of every
-        JSON float to be decoded.  By default, this is equivalent to
-        ``float(num_str)``. This can be used to use another datatype or parser
-        for JSON floats (e.g. :class:`decimal.Decimal`).
-
-        *parse_int*, if specified, will be called with the string of every
-        JSON int to be decoded.  By default, this is equivalent to
-        ``int(num_str)``.  This can be used to use another datatype or parser
-        for JSON integers (e.g. :class:`float`).
-
-        *allow_nan*, if True (default false), will allow the parser to
-        accept the non-standard floats ``NaN``, ``Infinity``, and ``-Infinity``.
-
-        *parse_constant*, if specified, will be
-        called with one of the following strings: ``'-Infinity'``,
-        ``'Infinity'``, ``'NaN'``. It is not recommended to use this feature,
-        as it is rare to parse non-compliant JSON containing these values.
-
-        *strict* controls the parser's behavior when it encounters an
-        invalid control character in a string. The default setting of
-        ``True`` means that unescaped control characters are parse errors, if
-        ``False`` then control characters will be allowed in strings.
-
-        """
-        if encoding is None:
-            encoding = DEFAULT_ENCODING
-        self.encoding = encoding
-        self.object_hook = object_hook
-        self.object_pairs_hook = object_pairs_hook
-        self.parse_float = parse_float or float
-        self.parse_int = parse_int or bounded_int
-        self.parse_constant = parse_constant or (allow_nan and _CONSTANTS.__getitem__ or None)
-        self.strict = strict
-        self.parse_object = JSONObject
-        self.parse_array = JSONArray
-        self.parse_string = scanstring
-        self.memo = {}
-        self.scan_once = make_scanner(self)
-
-    def decode(self, s, _w=WHITESPACE.match, _PY3=PY3):
-        """Return the Python representation of ``s`` (a ``str`` or ``unicode``
-        instance containing a JSON document)
-
-        """
-        if _PY3 and isinstance(s, bytes):
-            s = str(s, self.encoding)
-        obj, end = self.raw_decode(s)
-        end = _w(s, end).end()
-        if end != len(s):
-            raise JSONDecodeError("Extra data", s, end, len(s))
-        return obj
-
-    def raw_decode(self, s, idx=0, _w=WHITESPACE.match, _PY3=PY3):
-        """Decode a JSON document from ``s`` (a ``str`` or ``unicode``
-        beginning with a JSON document) and return a 2-tuple of the Python
-        representation and the index in ``s`` where the document ended.
-        Optionally, ``idx`` can be used to specify an offset in ``s`` where
-        the JSON document begins.
-
-        This can be used to decode a JSON document from a string that may
-        have extraneous data at the end.
-
-        """
-        if idx < 0:
-            # Ensure that raw_decode bails on negative indexes, the regex
-            # would otherwise mask this behavior. #98
-            raise JSONDecodeError('Expecting value', s, idx)
-        if _PY3 and not isinstance(s, str):
-            raise TypeError("Input string must be text, not bytes")
-        # strip UTF-8 bom
-        if len(s) > idx:
-            ord0 = ord(s[idx])
-            if ord0 == 0xfeff:
-                idx += 1
-            elif ord0 == 0xef and s[idx:idx + 3] == '\xef\xbb\xbf':
-                idx += 3
-        return self.scan_once(s, idx=_w(s, idx).end())
diff --git a/lib/simplejson/encoder.py b/lib/simplejson/encoder.py
deleted file mode 100644
index 661ff361..00000000
--- a/lib/simplejson/encoder.py
+++ /dev/null
@@ -1,740 +0,0 @@
-"""Implementation of JSONEncoder
-"""
-from __future__ import absolute_import
-import re
-from operator import itemgetter
-# Do not import Decimal directly to avoid reload issues
-import decimal
-from .compat import binary_type, text_type, string_types, integer_types, PY3
-def _import_speedups():
-    try:
-        from . import _speedups
-        return _speedups.encode_basestring_ascii, _speedups.make_encoder
-    except ImportError:
-        return None, None
-c_encode_basestring_ascii, c_make_encoder = _import_speedups()
-
-from .decoder import PosInf
-from .raw_json import RawJSON
-
-ESCAPE = re.compile(r'[\x00-\x1f\\"]')
-ESCAPE_ASCII = re.compile(r'([\\"]|[^\ -~])')
-HAS_UTF8 = re.compile(r'[\x80-\xff]')
-ESCAPE_DCT = {
-    '\\': '\\\\',
-    '"': '\\"',
-    '\b': '\\b',
-    '\f': '\\f',
-    '\n': '\\n',
-    '\r': '\\r',
-    '\t': '\\t',
-}
-for i in range(0x20):
-    #ESCAPE_DCT.setdefault(chr(i), '\\u{0:04x}'.format(i))
-    ESCAPE_DCT.setdefault(chr(i), '\\u%04x' % (i,))
-del i
-
-FLOAT_REPR = repr
-
-def encode_basestring(s, _PY3=PY3, _q=u'"'):
-    """Return a JSON representation of a Python string
-
-    """
-    if _PY3:
-        if isinstance(s, bytes):
-            s = str(s, 'utf-8')
-        elif type(s) is not str:
-            # convert an str subclass instance to exact str
-            # raise a TypeError otherwise
-            s = str.__str__(s)
-    else:
-        if isinstance(s, str) and HAS_UTF8.search(s) is not None:
-            s = unicode(s, 'utf-8')
-        elif type(s) not in (str, unicode):
-            # convert an str subclass instance to exact str
-            # convert a unicode subclass instance to exact unicode
-            # raise a TypeError otherwise
-            if isinstance(s, str):
-                s = str.__str__(s)
-            else:
-                s = unicode.__getnewargs__(s)[0]
-    def replace(match):
-        return ESCAPE_DCT[match.group(0)]
-    return _q + ESCAPE.sub(replace, s) + _q
-
-
-def py_encode_basestring_ascii(s, _PY3=PY3):
-    """Return an ASCII-only JSON representation of a Python string
-
-    """
-    if _PY3:
-        if isinstance(s, bytes):
-            s = str(s, 'utf-8')
-        elif type(s) is not str:
-            # convert an str subclass instance to exact str
-            # raise a TypeError otherwise
-            s = str.__str__(s)
-    else:
-        if isinstance(s, str) and HAS_UTF8.search(s) is not None:
-            s = unicode(s, 'utf-8')
-        elif type(s) not in (str, unicode):
-            # convert an str subclass instance to exact str
-            # convert a unicode subclass instance to exact unicode
-            # raise a TypeError otherwise
-            if isinstance(s, str):
-                s = str.__str__(s)
-            else:
-                s = unicode.__getnewargs__(s)[0]
-    def replace(match):
-        s = match.group(0)
-        try:
-            return ESCAPE_DCT[s]
-        except KeyError:
-            n = ord(s)
-            if n < 0x10000:
-                #return '\\u{0:04x}'.format(n)
-                return '\\u%04x' % (n,)
-            else:
-                # surrogate pair
-                n -= 0x10000
-                s1 = 0xd800 | ((n >> 10) & 0x3ff)
-                s2 = 0xdc00 | (n & 0x3ff)
-                #return '\\u{0:04x}\\u{1:04x}'.format(s1, s2)
-                return '\\u%04x\\u%04x' % (s1, s2)
-    return '"' + str(ESCAPE_ASCII.sub(replace, s)) + '"'
-
-
-encode_basestring_ascii = (
-    c_encode_basestring_ascii or py_encode_basestring_ascii)
-
-class JSONEncoder(object):
-    """Extensible JSON <http://json.org> encoder for Python data structures.
-
-    Supports the following objects and types by default:
-
-    +-------------------+---------------+
-    | Python            | JSON          |
-    +===================+===============+
-    | dict, namedtuple  | object        |
-    +-------------------+---------------+
-    | list, tuple       | array         |
-    +-------------------+---------------+
-    | str, unicode      | string        |
-    +-------------------+---------------+
-    | int, long, float  | number        |
-    +-------------------+---------------+
-    | True              | true          |
-    +-------------------+---------------+
-    | False             | false         |
-    +-------------------+---------------+
-    | None              | null          |
-    +-------------------+---------------+
-
-    To extend this to recognize other objects, subclass and implement a
-    ``.default()`` method with another method that returns a serializable
-    object for ``o`` if possible, otherwise it should call the superclass
-    implementation (to raise ``TypeError``).
-
-    """
-    item_separator = ', '
-    key_separator = ': '
-
-    def __init__(self, skipkeys=False, ensure_ascii=True,
-                 check_circular=True, allow_nan=False, sort_keys=False,
-                 indent=None, separators=None, encoding='utf-8', default=None,
-                 use_decimal=True, namedtuple_as_object=True,
-                 tuple_as_array=True, bigint_as_string=False,
-                 item_sort_key=None, for_json=False, ignore_nan=False,
-                 int_as_string_bitcount=None, iterable_as_array=False):
-        """Constructor for JSONEncoder, with sensible defaults.
-
-        If skipkeys is false, then it is a TypeError to attempt
-        encoding of keys that are not str, int, long, float or None.  If
-        skipkeys is True, such items are simply skipped.
-
-        If ensure_ascii is true, the output is guaranteed to be str
-        objects with all incoming unicode characters escaped.  If
-        ensure_ascii is false, the output will be unicode object.
-
-        If check_circular is true, then lists, dicts, and custom encoded
-        objects will be checked for circular references during encoding to
-        prevent an infinite recursion (which would cause an OverflowError).
-        Otherwise, no such check takes place.
-
-        If allow_nan is true (default: False), then out of range float
-        values (nan, inf, -inf) will be serialized to
-        their JavaScript equivalents (NaN, Infinity, -Infinity)
-        instead of raising a ValueError. See
-        ignore_nan for ECMA-262 compliant behavior.
-
-        If sort_keys is true, then the output of dictionaries will be
-        sorted by key; this is useful for regression tests to ensure
-        that JSON serializations can be compared on a day-to-day basis.
-
-        If indent is a string, then JSON array elements and object members
-        will be pretty-printed with a newline followed by that string repeated
-        for each level of nesting. ``None`` (the default) selects the most compact
-        representation without any newlines. For backwards compatibility with
-        versions of simplejson earlier than 2.1.0, an integer is also accepted
-        and is converted to a string with that many spaces.
-
-        If specified, separators should be an (item_separator, key_separator)
-        tuple.  The default is (', ', ': ') if *indent* is ``None`` and
-        (',', ': ') otherwise.  To get the most compact JSON representation,
-        you should specify (',', ':') to eliminate whitespace.
-
-        If specified, default is a function that gets called for objects
-        that can't otherwise be serialized.  It should return a JSON encodable
-        version of the object or raise a ``TypeError``.
-
-        If encoding is not None, then all input strings will be
-        transformed into unicode using that encoding prior to JSON-encoding.
-        The default is UTF-8.
-
-        If use_decimal is true (default: ``True``), ``decimal.Decimal`` will
-        be supported directly by the encoder. For the inverse, decode JSON
-        with ``parse_float=decimal.Decimal``.
-
-        If namedtuple_as_object is true (the default), objects with
-        ``_asdict()`` methods will be encoded as JSON objects.
-
-        If tuple_as_array is true (the default), tuple (and subclasses) will
-        be encoded as JSON arrays.
-
-        If *iterable_as_array* is true (default: ``False``),
-        any object not in the above table that implements ``__iter__()``
-        will be encoded as a JSON array.
-
-        If bigint_as_string is true (not the default), ints 2**53 and higher
-        or lower than -2**53 will be encoded as strings. This is to avoid the
-        rounding that happens in Javascript otherwise.
-
-        If int_as_string_bitcount is a positive number (n), then int of size
-        greater than or equal to 2**n or lower than or equal to -2**n will be
-        encoded as strings.
-
-        If specified, item_sort_key is a callable used to sort the items in
-        each dictionary. This is useful if you want to sort items other than
-        in alphabetical order by key.
-
-        If for_json is true (not the default), objects with a ``for_json()``
-        method will use the return value of that method for encoding as JSON
-        instead of the object.
-
-        If *ignore_nan* is true (default: ``False``), then out of range
-        :class:`float` values (``nan``, ``inf``, ``-inf``) will be serialized
-        as ``null`` in compliance with the ECMA-262 specification. If true,
-        this will override *allow_nan*.
-
-        """
-
-        self.skipkeys = skipkeys
-        self.ensure_ascii = ensure_ascii
-        self.check_circular = check_circular
-        self.allow_nan = allow_nan
-        self.sort_keys = sort_keys
-        self.use_decimal = use_decimal
-        self.namedtuple_as_object = namedtuple_as_object
-        self.tuple_as_array = tuple_as_array
-        self.iterable_as_array = iterable_as_array
-        self.bigint_as_string = bigint_as_string
-        self.item_sort_key = item_sort_key
-        self.for_json = for_json
-        self.ignore_nan = ignore_nan
-        self.int_as_string_bitcount = int_as_string_bitcount
-        if indent is not None and not isinstance(indent, string_types):
-            indent = indent * ' '
-        self.indent = indent
-        if separators is not None:
-            self.item_separator, self.key_separator = separators
-        elif indent is not None:
-            self.item_separator = ','
-        if default is not None:
-            self.default = default
-        self.encoding = encoding
-
-    def default(self, o):
-        """Implement this method in a subclass such that it returns
-        a serializable object for ``o``, or calls the base implementation
-        (to raise a ``TypeError``).
-
-        For example, to support arbitrary iterators, you could
-        implement default like this::
-
-            def default(self, o):
-                try:
-                    iterable = iter(o)
-                except TypeError:
-                    pass
-                else:
-                    return list(iterable)
-                return JSONEncoder.default(self, o)
-
-        """
-        raise TypeError('Object of type %s is not JSON serializable' %
-                        o.__class__.__name__)
-
-    def encode(self, o):
-        """Return a JSON string representation of a Python data structure.
-
-        >>> from simplejson import JSONEncoder
-        >>> JSONEncoder().encode({"foo": ["bar", "baz"]})
-        '{"foo": ["bar", "baz"]}'
-
-        """
-        # This is for extremely simple cases and benchmarks.
-        if isinstance(o, binary_type):
-            _encoding = self.encoding
-            if (_encoding is not None and not (_encoding == 'utf-8')):
-                o = text_type(o, _encoding)
-        if isinstance(o, string_types):
-            if self.ensure_ascii:
-                return encode_basestring_ascii(o)
-            else:
-                return encode_basestring(o)
-        # This doesn't pass the iterator directly to ''.join() because the
-        # exceptions aren't as detailed.  The list call should be roughly
-        # equivalent to the PySequence_Fast that ''.join() would do.
-        chunks = self.iterencode(o)
-        if not isinstance(chunks, (list, tuple)):
-            chunks = list(chunks)
-        if self.ensure_ascii:
-            return ''.join(chunks)
-        else:
-            return u''.join(chunks)
-
-    def iterencode(self, o):
-        """Encode the given object and yield each string
-        representation as available.
-
-        For example::
-
-            for chunk in JSONEncoder().iterencode(bigobject):
-                mysocket.write(chunk)
-
-        """
-        if self.check_circular:
-            markers = {}
-        else:
-            markers = None
-        if self.ensure_ascii:
-            _encoder = encode_basestring_ascii
-        else:
-            _encoder = encode_basestring
-        if self.encoding != 'utf-8' and self.encoding is not None:
-            def _encoder(o, _orig_encoder=_encoder, _encoding=self.encoding):
-                if isinstance(o, binary_type):
-                    o = text_type(o, _encoding)
-                return _orig_encoder(o)
-
-        def floatstr(o, allow_nan=self.allow_nan, ignore_nan=self.ignore_nan,
-                _repr=FLOAT_REPR, _inf=PosInf, _neginf=-PosInf):
-            # Check for specials. Note that this type of test is processor
-            # and/or platform-specific, so do tests which don't depend on
-            # the internals.
-
-            if o != o:
-                text = 'NaN'
-            elif o == _inf:
-                text = 'Infinity'
-            elif o == _neginf:
-                text = '-Infinity'
-            else:
-                if type(o) != float:
-                    # See #118, do not trust custom str/repr
-                    o = float(o)
-                return _repr(o)
-
-            if ignore_nan:
-                text = 'null'
-            elif not allow_nan:
-                raise ValueError(
-                    "Out of range float values are not JSON compliant: " +
-                    repr(o))
-
-            return text
-
-        key_memo = {}
-        int_as_string_bitcount = (
-            53 if self.bigint_as_string else self.int_as_string_bitcount)
-        if (c_make_encoder is not None and self.indent is None):
-            _iterencode = c_make_encoder(
-                markers, self.default, _encoder, self.indent,
-                self.key_separator, self.item_separator, self.sort_keys,
-                self.skipkeys, self.allow_nan, key_memo, self.use_decimal,
-                self.namedtuple_as_object, self.tuple_as_array,
-                int_as_string_bitcount,
-                self.item_sort_key, self.encoding, self.for_json,
-                self.ignore_nan, decimal.Decimal, self.iterable_as_array)
-        else:
-            _iterencode = _make_iterencode(
-                markers, self.default, _encoder, self.indent, floatstr,
-                self.key_separator, self.item_separator, self.sort_keys,
-                self.skipkeys, self.use_decimal,
-                self.namedtuple_as_object, self.tuple_as_array,
-                int_as_string_bitcount,
-                self.item_sort_key, self.encoding, self.for_json,
-                self.iterable_as_array, Decimal=decimal.Decimal)
-        try:
-            return _iterencode(o, 0)
-        finally:
-            key_memo.clear()
-
-
-class JSONEncoderForHTML(JSONEncoder):
-    """An encoder that produces JSON safe to embed in HTML.
-
-    To embed JSON content in, say, a script tag on a web page, the
-    characters &, < and > should be escaped. They cannot be escaped
-    with the usual entities (e.g. &amp;) because they are not expanded
-    within <script> tags.
-
-    This class also escapes the line separator and paragraph separator
-    characters U+2028 and U+2029, irrespective of the ensure_ascii setting,
-    as these characters are not valid in JavaScript strings (see
-    http://timelessrepo.com/json-isnt-a-javascript-subset).
-    """
-
-    def encode(self, o):
-        # Override JSONEncoder.encode because it has hacks for
-        # performance that make things more complicated.
-        chunks = self.iterencode(o)
-        if self.ensure_ascii:
-            return ''.join(chunks)
-        else:
-            return u''.join(chunks)
-
-    def iterencode(self, o):
-        chunks = super(JSONEncoderForHTML, self).iterencode(o)
-        for chunk in chunks:
-            chunk = chunk.replace('&', '\\u0026')
-            chunk = chunk.replace('<', '\\u003c')
-            chunk = chunk.replace('>', '\\u003e')
-
-            if not self.ensure_ascii:
-                chunk = chunk.replace(u'\u2028', '\\u2028')
-                chunk = chunk.replace(u'\u2029', '\\u2029')
-
-            yield chunk
-
-
-def _make_iterencode(markers, _default, _encoder, _indent, _floatstr,
-        _key_separator, _item_separator, _sort_keys, _skipkeys,
-        _use_decimal, _namedtuple_as_object, _tuple_as_array,
-        _int_as_string_bitcount, _item_sort_key,
-        _encoding,_for_json,
-        _iterable_as_array,
-        ## HACK: hand-optimized bytecode; turn globals into locals
-        _PY3=PY3,
-        ValueError=ValueError,
-        string_types=string_types,
-        Decimal=None,
-        dict=dict,
-        float=float,
-        id=id,
-        integer_types=integer_types,
-        isinstance=isinstance,
-        list=list,
-        str=str,
-        tuple=tuple,
-        iter=iter,
-    ):
-    if _use_decimal and Decimal is None:
-        Decimal = decimal.Decimal
-    if _item_sort_key and not callable(_item_sort_key):
-        raise TypeError("item_sort_key must be None or callable")
-    elif _sort_keys and not _item_sort_key:
-        _item_sort_key = itemgetter(0)
-
-    if (_int_as_string_bitcount is not None and
-        (_int_as_string_bitcount <= 0 or
-         not isinstance(_int_as_string_bitcount, integer_types))):
-        raise TypeError("int_as_string_bitcount must be a positive integer")
-
-    def call_method(obj, method_name):
-        method = getattr(obj, method_name, None)
-        if callable(method):
-            try:
-                return (method(),)
-            except TypeError:
-                pass
-        return None
-
-    def _encode_int(value):
-        skip_quoting = (
-            _int_as_string_bitcount is None
-            or
-            _int_as_string_bitcount < 1
-        )
-        if type(value) not in integer_types:
-            # See #118, do not trust custom str/repr
-            value = int(value)
-        if (
-            skip_quoting or
-            (-1 << _int_as_string_bitcount)
-            < value <
-            (1 << _int_as_string_bitcount)
-        ):
-            return str(value)
-        return '"' + str(value) + '"'
-
-    def _iterencode_list(lst, _current_indent_level):
-        if not lst:
-            yield '[]'
-            return
-        if markers is not None:
-            markerid = id(lst)
-            if markerid in markers:
-                raise ValueError("Circular reference detected")
-            markers[markerid] = lst
-        buf = '['
-        if _indent is not None:
-            _current_indent_level += 1
-            newline_indent = '\n' + (_indent * _current_indent_level)
-            separator = _item_separator + newline_indent
-            buf += newline_indent
-        else:
-            newline_indent = None
-            separator = _item_separator
-        first = True
-        for value in lst:
-            if first:
-                first = False
-            else:
-                buf = separator
-            if isinstance(value, string_types):
-                yield buf + _encoder(value)
-            elif _PY3 and isinstance(value, bytes) and _encoding is not None:
-                yield buf + _encoder(value)
-            elif isinstance(value, RawJSON):
-                yield buf + value.encoded_json
-            elif value is None:
-                yield buf + 'null'
-            elif value is True:
-                yield buf + 'true'
-            elif value is False:
-                yield buf + 'false'
-            elif isinstance(value, integer_types):
-                yield buf + _encode_int(value)
-            elif isinstance(value, float):
-                yield buf + _floatstr(value)
-            elif _use_decimal and isinstance(value, Decimal):
-                yield buf + str(value)
-            else:
-                yield buf
-                for_json = _for_json and call_method(value, 'for_json')
-                if for_json:
-                    chunks = _iterencode(for_json[0], _current_indent_level)
-                elif isinstance(value, list):
-                    chunks = _iterencode_list(value, _current_indent_level)
-                else:
-                    _asdict = _namedtuple_as_object and call_method(value, '_asdict')
-                    if _asdict:
-                        dct = _asdict[0]
-                        if not isinstance(dct, dict):
-                            raise TypeError("_asdict() must return a dict, not %s" % (type(dct).__name__,))
-                        chunks = _iterencode_dict(dct,
-                                                  _current_indent_level)
-                    elif _tuple_as_array and isinstance(value, tuple):
-                        chunks = _iterencode_list(value, _current_indent_level)
-                    elif isinstance(value, dict):
-                        chunks = _iterencode_dict(value, _current_indent_level)
-                    else:
-                        chunks = _iterencode(value, _current_indent_level)
-                for chunk in chunks:
-                    yield chunk
-        if first:
-            # iterable_as_array misses the fast path at the top
-            yield '[]'
-        else:
-            if newline_indent is not None:
-                _current_indent_level -= 1
-                yield '\n' + (_indent * _current_indent_level)
-            yield ']'
-        if markers is not None:
-            del markers[markerid]
-
-    def _stringify_key(key):
-        if isinstance(key, string_types): # pragma: no cover
-            pass
-        elif _PY3 and isinstance(key, bytes) and _encoding is not None:
-            key = str(key, _encoding)
-        elif isinstance(key, float):
-            key = _floatstr(key)
-        elif key is True:
-            key = 'true'
-        elif key is False:
-            key = 'false'
-        elif key is None:
-            key = 'null'
-        elif isinstance(key, integer_types):
-            if type(key) not in integer_types:
-                # See #118, do not trust custom str/repr
-                key = int(key)
-            key = str(key)
-        elif _use_decimal and isinstance(key, Decimal):
-            key = str(key)
-        elif _skipkeys:
-            key = None
-        else:
-            raise TypeError('keys must be str, int, float, bool or None, '
-                            'not %s' % key.__class__.__name__)
-        return key
-
-    def _iterencode_dict(dct, _current_indent_level):
-        if not dct:
-            yield '{}'
-            return
-        if markers is not None:
-            markerid = id(dct)
-            if markerid in markers:
-                raise ValueError("Circular reference detected")
-            markers[markerid] = dct
-        yield '{'
-        if _indent is not None:
-            _current_indent_level += 1
-            newline_indent = '\n' + (_indent * _current_indent_level)
-            item_separator = _item_separator + newline_indent
-            yield newline_indent
-        else:
-            newline_indent = None
-            item_separator = _item_separator
-        first = True
-        if _PY3:
-            iteritems = dct.items()
-        else:
-            iteritems = dct.iteritems()
-        if _item_sort_key:
-            items = []
-            for k, v in dct.items():
-                if not isinstance(k, string_types):
-                    k = _stringify_key(k)
-                    if k is None:
-                        continue
-                items.append((k, v))
-            items.sort(key=_item_sort_key)
-        else:
-            items = iteritems
-        for key, value in items:
-            if not (_item_sort_key or isinstance(key, string_types)):
-                key = _stringify_key(key)
-                if key is None:
-                    # _skipkeys must be True
-                    continue
-            if first:
-                first = False
-            else:
-                yield item_separator
-            yield _encoder(key)
-            yield _key_separator
-            if isinstance(value, string_types):
-                yield _encoder(value)
-            elif _PY3 and isinstance(value, bytes) and _encoding is not None:
-                yield _encoder(value)
-            elif isinstance(value, RawJSON):
-                yield value.encoded_json
-            elif value is None:
-                yield 'null'
-            elif value is True:
-                yield 'true'
-            elif value is False:
-                yield 'false'
-            elif isinstance(value, integer_types):
-                yield _encode_int(value)
-            elif isinstance(value, float):
-                yield _floatstr(value)
-            elif _use_decimal and isinstance(value, Decimal):
-                yield str(value)
-            else:
-                for_json = _for_json and call_method(value, 'for_json')
-                if for_json:
-                    chunks = _iterencode(for_json[0], _current_indent_level)
-                elif isinstance(value, list):
-                    chunks = _iterencode_list(value, _current_indent_level)
-                else:
-                    _asdict = _namedtuple_as_object and call_method(value, '_asdict')
-                    if _asdict:
-                        dct = _asdict[0]
-                        if not isinstance(dct, dict):
-                            raise TypeError("_asdict() must return a dict, not %s" % (type(dct).__name__,))
-                        chunks = _iterencode_dict(dct,
-                                                  _current_indent_level)
-                    elif _tuple_as_array and isinstance(value, tuple):
-                        chunks = _iterencode_list(value, _current_indent_level)
-                    elif isinstance(value, dict):
-                        chunks = _iterencode_dict(value, _current_indent_level)
-                    else:
-                        chunks = _iterencode(value, _current_indent_level)
-                for chunk in chunks:
-                    yield chunk
-        if newline_indent is not None:
-            _current_indent_level -= 1
-            yield '\n' + (_indent * _current_indent_level)
-        yield '}'
-        if markers is not None:
-            del markers[markerid]
-
-    def _iterencode(o, _current_indent_level):
-        if isinstance(o, string_types):
-            yield _encoder(o)
-        elif _PY3 and isinstance(o, bytes) and _encoding is not None:
-            yield _encoder(o)
-        elif isinstance(o, RawJSON):
-            yield o.encoded_json
-        elif o is None:
-            yield 'null'
-        elif o is True:
-            yield 'true'
-        elif o is False:
-            yield 'false'
-        elif isinstance(o, integer_types):
-            yield _encode_int(o)
-        elif isinstance(o, float):
-            yield _floatstr(o)
-        else:
-            for_json = _for_json and call_method(o, 'for_json')
-            if for_json:
-                for chunk in _iterencode(for_json[0], _current_indent_level):
-                    yield chunk
-            elif isinstance(o, list):
-                for chunk in _iterencode_list(o, _current_indent_level):
-                    yield chunk
-            else:
-                _asdict = _namedtuple_as_object and call_method(o, '_asdict')
-                if _asdict:
-                    dct = _asdict[0]
-                    if not isinstance(dct, dict):
-                        raise TypeError("_asdict() must return a dict, not %s" % (type(dct).__name__,))
-                    for chunk in _iterencode_dict(dct, _current_indent_level):
-                        yield chunk
-                elif (_tuple_as_array and isinstance(o, tuple)):
-                    for chunk in _iterencode_list(o, _current_indent_level):
-                        yield chunk
-                elif isinstance(o, dict):
-                    for chunk in _iterencode_dict(o, _current_indent_level):
-                        yield chunk
-                elif _use_decimal and isinstance(o, Decimal):
-                    yield str(o)
-                else:
-                    while _iterable_as_array:
-                        # Markers are not checked here because it is valid for
-                        # an iterable to return self.
-                        try:
-                            o = iter(o)
-                        except TypeError:
-                            break
-                        for chunk in _iterencode_list(o, _current_indent_level):
-                            yield chunk
-                        return
-                    if markers is not None:
-                        markerid = id(o)
-                        if markerid in markers:
-                            raise ValueError("Circular reference detected")
-                        markers[markerid] = o
-                    o = _default(o)
-                    for chunk in _iterencode(o, _current_indent_level):
-                        yield chunk
-                    if markers is not None:
-                        del markers[markerid]
-
-    return _iterencode
diff --git a/lib/simplejson/errors.py b/lib/simplejson/errors.py
deleted file mode 100644
index b97ab1e9..00000000
--- a/lib/simplejson/errors.py
+++ /dev/null
@@ -1,53 +0,0 @@
-"""Error classes used by simplejson
-"""
-__all__ = ['JSONDecodeError']
-
-
-def linecol(doc, pos):
-    lineno = doc.count('\n', 0, pos) + 1
-    if lineno == 1:
-        colno = pos + 1
-    else:
-        colno = pos - doc.rindex('\n', 0, pos)
-    return lineno, colno
-
-
-def errmsg(msg, doc, pos, end=None):
-    lineno, colno = linecol(doc, pos)
-    msg = msg.replace('%r', repr(doc[pos:pos + 1]))
-    if end is None:
-        fmt = '%s: line %d column %d (char %d)'
-        return fmt % (msg, lineno, colno, pos)
-    endlineno, endcolno = linecol(doc, end)
-    fmt = '%s: line %d column %d - line %d column %d (char %d - %d)'
-    return fmt % (msg, lineno, colno, endlineno, endcolno, pos, end)
-
-
-class JSONDecodeError(ValueError):
-    """Subclass of ValueError with the following additional properties:
-
-    msg: The unformatted error message
-    doc: The JSON document being parsed
-    pos: The start index of doc where parsing failed
-    end: The end index of doc where parsing failed (may be None)
-    lineno: The line corresponding to pos
-    colno: The column corresponding to pos
-    endlineno: The line corresponding to end (may be None)
-    endcolno: The column corresponding to end (may be None)
-
-    """
-    # Note that this exception is used from _speedups
-    def __init__(self, msg, doc, pos, end=None):
-        ValueError.__init__(self, errmsg(msg, doc, pos, end=end))
-        self.msg = msg
-        self.doc = doc
-        self.pos = pos
-        self.end = end
-        self.lineno, self.colno = linecol(doc, pos)
-        if end is not None:
-            self.endlineno, self.endcolno = linecol(doc, end)
-        else:
-            self.endlineno, self.endcolno = None, None
-
-    def __reduce__(self):
-        return self.__class__, (self.msg, self.doc, self.pos, self.end)
diff --git a/lib/simplejson/ordered_dict.py b/lib/simplejson/ordered_dict.py
deleted file mode 100644
index d5a55ebd..00000000
--- a/lib/simplejson/ordered_dict.py
+++ /dev/null
@@ -1,103 +0,0 @@
-"""Drop-in replacement for collections.OrderedDict by Raymond Hettinger
-
-http://code.activestate.com/recipes/576693/
-
-"""
-from UserDict import DictMixin
-
-class OrderedDict(dict, DictMixin):
-
-    def __init__(self, *args, **kwds):
-        if len(args) > 1:
-            raise TypeError('expected at most 1 arguments, got %d' % len(args))
-        try:
-            self.__end
-        except AttributeError:
-            self.clear()
-        self.update(*args, **kwds)
-
-    def clear(self):
-        self.__end = end = []
-        end += [None, end, end]         # sentinel node for doubly linked list
-        self.__map = {}                 # key --> [key, prev, next]
-        dict.clear(self)
-
-    def __setitem__(self, key, value):
-        if key not in self:
-            end = self.__end
-            curr = end[1]
-            curr[2] = end[1] = self.__map[key] = [key, curr, end]
-        dict.__setitem__(self, key, value)
-
-    def __delitem__(self, key):
-        dict.__delitem__(self, key)
-        key, prev, next = self.__map.pop(key)
-        prev[2] = next
-        next[1] = prev
-
-    def __iter__(self):
-        end = self.__end
-        curr = end[2]
-        while curr is not end:
-            yield curr[0]
-            curr = curr[2]
-
-    def __reversed__(self):
-        end = self.__end
-        curr = end[1]
-        while curr is not end:
-            yield curr[0]
-            curr = curr[1]
-
-    def popitem(self, last=True):
-        if not self:
-            raise KeyError('dictionary is empty')
-        key = reversed(self).next() if last else iter(self).next()
-        value = self.pop(key)
-        return key, value
-
-    def __reduce__(self):
-        items = [[k, self[k]] for k in self]
-        tmp = self.__map, self.__end
-        del self.__map, self.__end
-        inst_dict = vars(self).copy()
-        self.__map, self.__end = tmp
-        if inst_dict:
-            return (self.__class__, (items,), inst_dict)
-        return self.__class__, (items,)
-
-    def keys(self):
-        return list(self)
-
-    setdefault = DictMixin.setdefault
-    update = DictMixin.update
-    pop = DictMixin.pop
-    values = DictMixin.values
-    items = DictMixin.items
-    iterkeys = DictMixin.iterkeys
-    itervalues = DictMixin.itervalues
-    iteritems = DictMixin.iteritems
-
-    def __repr__(self):
-        if not self:
-            return '%s()' % (self.__class__.__name__,)
-        return '%s(%r)' % (self.__class__.__name__, self.items())
-
-    def copy(self):
-        return self.__class__(self)
-
-    @classmethod
-    def fromkeys(cls, iterable, value=None):
-        d = cls()
-        for key in iterable:
-            d[key] = value
-        return d
-
-    def __eq__(self, other):
-        if isinstance(other, OrderedDict):
-            return len(self)==len(other) and \
-                   all(p==q for p, q in  zip(self.items(), other.items()))
-        return dict.__eq__(self, other)
-
-    def __ne__(self, other):
-        return not self == other
diff --git a/lib/simplejson/raw_json.py b/lib/simplejson/raw_json.py
deleted file mode 100644
index 2071a702..00000000
--- a/lib/simplejson/raw_json.py
+++ /dev/null
@@ -1,9 +0,0 @@
-"""Implementation of RawJSON
-"""
-
-class RawJSON(object):
-    """Wrap an encoded JSON document for direct embedding in the output
-
-    """
-    def __init__(self, encoded_json):
-        self.encoded_json = encoded_json
diff --git a/lib/simplejson/scanner.py b/lib/simplejson/scanner.py
deleted file mode 100644
index 34710d68..00000000
--- a/lib/simplejson/scanner.py
+++ /dev/null
@@ -1,85 +0,0 @@
-"""JSON token scanner
-"""
-import re
-from .errors import JSONDecodeError
-def _import_c_make_scanner():
-    try:
-        from ._speedups import make_scanner
-        return make_scanner
-    except ImportError:
-        return None
-c_make_scanner = _import_c_make_scanner()
-
-__all__ = ['make_scanner', 'JSONDecodeError']
-
-NUMBER_RE = re.compile(
-    r'(-?(?:0|[1-9]\d*))(\.\d+)?([eE][-+]?\d+)?',
-    (re.VERBOSE | re.MULTILINE | re.DOTALL))
-
-
-def py_make_scanner(context):
-    parse_object = context.parse_object
-    parse_array = context.parse_array
-    parse_string = context.parse_string
-    match_number = NUMBER_RE.match
-    encoding = context.encoding
-    strict = context.strict
-    parse_float = context.parse_float
-    parse_int = context.parse_int
-    parse_constant = context.parse_constant
-    object_hook = context.object_hook
-    object_pairs_hook = context.object_pairs_hook
-    memo = context.memo
-
-    def _scan_once(string, idx):
-        errmsg = 'Expecting value'
-        try:
-            nextchar = string[idx]
-        except IndexError:
-            raise JSONDecodeError(errmsg, string, idx)
-
-        if nextchar == '"':
-            return parse_string(string, idx + 1, encoding, strict)
-        elif nextchar == '{':
-            return parse_object((string, idx + 1), encoding, strict,
-                _scan_once, object_hook, object_pairs_hook, memo)
-        elif nextchar == '[':
-            return parse_array((string, idx + 1), _scan_once)
-        elif nextchar == 'n' and string[idx:idx + 4] == 'null':
-            return None, idx + 4
-        elif nextchar == 't' and string[idx:idx + 4] == 'true':
-            return True, idx + 4
-        elif nextchar == 'f' and string[idx:idx + 5] == 'false':
-            return False, idx + 5
-
-        m = match_number(string, idx)
-        if m is not None:
-            integer, frac, exp = m.groups()
-            if frac or exp:
-                res = parse_float(integer + (frac or '') + (exp or ''))
-            else:
-                res = parse_int(integer)
-            return res, m.end()
-        elif parse_constant and nextchar == 'N' and string[idx:idx + 3] == 'NaN':
-            return parse_constant('NaN'), idx + 3
-        elif parse_constant and nextchar == 'I' and string[idx:idx + 8] == 'Infinity':
-            return parse_constant('Infinity'), idx + 8
-        elif parse_constant and nextchar == '-' and string[idx:idx + 9] == '-Infinity':
-            return parse_constant('-Infinity'), idx + 9
-        else:
-            raise JSONDecodeError(errmsg, string, idx)
-
-    def scan_once(string, idx):
-        if idx < 0:
-            # Ensure the same behavior as the C speedup, otherwise
-            # this would work for *some* negative string indices due
-            # to the behavior of __getitem__ for strings. #98
-            raise JSONDecodeError('Expecting value', string, idx)
-        try:
-            return _scan_once(string, idx)
-        finally:
-            memo.clear()
-
-    return scan_once
-
-make_scanner = c_make_scanner or py_make_scanner
diff --git a/lib/simplejson/tests/__init__.py b/lib/simplejson/tests/__init__.py
deleted file mode 100644
index 79d1d170..00000000
--- a/lib/simplejson/tests/__init__.py
+++ /dev/null
@@ -1,91 +0,0 @@
-from __future__ import absolute_import
-import unittest
-import sys
-import os
-
-
-class NoExtensionTestSuite(unittest.TestSuite):
-    def run(self, result):
-        import simplejson
-
-        simplejson._toggle_speedups(False)
-        result = unittest.TestSuite.run(self, result)
-        simplejson._toggle_speedups(True)
-        return result
-
-
-class TestMissingSpeedups(unittest.TestCase):
-    def runTest(self):
-        if hasattr(sys, "pypy_translation_info"):
-            "PyPy doesn't need speedups! :)"
-        elif hasattr(self, "skipTest"):
-            self.skipTest("_speedups.so is missing!")
-
-
-def additional_tests(suite=None, project_dir=None):
-    import simplejson
-    import simplejson.encoder
-    import simplejson.decoder
-
-    if suite is None:
-        suite = unittest.TestSuite()
-    try:
-        import doctest
-    except ImportError:
-        if sys.version_info < (2, 7):
-            # doctests in 2.6 depends on cStringIO
-            return suite
-        raise
-    for mod in (simplejson, simplejson.encoder, simplejson.decoder):
-        suite.addTest(doctest.DocTestSuite(mod))
-    if project_dir is not None:
-        suite.addTest(
-            doctest.DocFileSuite(
-                os.path.join(project_dir, "index.rst"), module_relative=False
-            )
-        )
-    return suite
-
-
-def all_tests_suite(project_dir=None):
-    def get_suite():
-        suite_names = [
-            "simplejson.tests.%s" % (os.path.splitext(f)[0],)
-            for f in os.listdir(os.path.dirname(__file__))
-            if f.startswith("test_") and f.endswith(".py")
-        ]
-        return additional_tests(
-            suite=unittest.TestLoader().loadTestsFromNames(suite_names),
-            project_dir=project_dir,
-        )
-
-    suite = get_suite()
-    import simplejson
-
-    if simplejson._import_c_make_encoder() is None:
-        suite.addTest(TestMissingSpeedups())
-    else:
-        suite = unittest.TestSuite(
-            [
-                suite,
-                NoExtensionTestSuite([get_suite()]),
-            ]
-        )
-    return suite
-
-
-def main(project_dir=None):
-    runner = unittest.TextTestRunner(verbosity=1 + sys.argv.count("-v"))
-    suite = all_tests_suite(project_dir=project_dir)
-    raise SystemExit(not runner.run(suite).wasSuccessful())
-
-
-if __name__ == "__main__":
-    import os
-    import sys
-
-    project_dir = os.path.dirname(
-        os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    )
-    sys.path.insert(0, project_dir)
-    main(project_dir=project_dir)
diff --git a/lib/simplejson/tests/_cibw_runner.py b/lib/simplejson/tests/_cibw_runner.py
deleted file mode 100644
index bffb70b8..00000000
--- a/lib/simplejson/tests/_cibw_runner.py
+++ /dev/null
@@ -1,7 +0,0 @@
-"""Internal module for running tests from cibuildwheel"""
-
-import sys
-import simplejson.tests
-
-if __name__ == '__main__':
-    simplejson.tests.main(project_dir=sys.argv[1])
diff --git a/lib/simplejson/tests/test_bigint_as_string.py b/lib/simplejson/tests/test_bigint_as_string.py
deleted file mode 100644
index 2cf2cc29..00000000
--- a/lib/simplejson/tests/test_bigint_as_string.py
+++ /dev/null
@@ -1,67 +0,0 @@
-from unittest import TestCase
-
-import simplejson as json
-
-
-class TestBigintAsString(TestCase):
-    # Python 2.5, at least the one that ships on Mac OS X, calculates
-    # 2 ** 53 as 0! It manages to calculate 1 << 53 correctly.
-    values = [(200, 200),
-              ((1 << 53) - 1, 9007199254740991),
-              ((1 << 53), '9007199254740992'),
-              ((1 << 53) + 1, '9007199254740993'),
-              (-100, -100),
-              ((-1 << 53), '-9007199254740992'),
-              ((-1 << 53) - 1, '-9007199254740993'),
-              ((-1 << 53) + 1, -9007199254740991)]
-
-    options = (
-        {"bigint_as_string": True},
-        {"int_as_string_bitcount": 53}
-    )
-
-    def test_ints(self):
-        for opts in self.options:
-            for val, expect in self.values:
-                self.assertEqual(
-                    val,
-                    json.loads(json.dumps(val)))
-                self.assertEqual(
-                    expect,
-                    json.loads(json.dumps(val, **opts)))
-
-    def test_lists(self):
-        for opts in self.options:
-            for val, expect in self.values:
-                val = [val, val]
-                expect = [expect, expect]
-                self.assertEqual(
-                    val,
-                    json.loads(json.dumps(val)))
-                self.assertEqual(
-                    expect,
-                    json.loads(json.dumps(val, **opts)))
-
-    def test_dicts(self):
-        for opts in self.options:
-            for val, expect in self.values:
-                val = {'k': val}
-                expect = {'k': expect}
-                self.assertEqual(
-                    val,
-                    json.loads(json.dumps(val)))
-                self.assertEqual(
-                    expect,
-                    json.loads(json.dumps(val, **opts)))
-
-    def test_dict_keys(self):
-        for opts in self.options:
-            for val, _ in self.values:
-                expect = {str(val): 'value'}
-                val = {val: 'value'}
-                self.assertEqual(
-                    expect,
-                    json.loads(json.dumps(val)))
-                self.assertEqual(
-                    expect,
-                    json.loads(json.dumps(val, **opts)))
diff --git a/lib/simplejson/tests/test_bitsize_int_as_string.py b/lib/simplejson/tests/test_bitsize_int_as_string.py
deleted file mode 100644
index fd7d103a..00000000
--- a/lib/simplejson/tests/test_bitsize_int_as_string.py
+++ /dev/null
@@ -1,73 +0,0 @@
-from unittest import TestCase
-
-import simplejson as json
-
-
-class TestBitSizeIntAsString(TestCase):
-    # Python 2.5, at least the one that ships on Mac OS X, calculates
-    # 2 ** 31 as 0! It manages to calculate 1 << 31 correctly.
-    values = [
-        (200, 200),
-        ((1 << 31) - 1, (1 << 31) - 1),
-        ((1 << 31), str(1 << 31)),
-        ((1 << 31) + 1, str((1 << 31) + 1)),
-        (-100, -100),
-        ((-1 << 31), str(-1 << 31)),
-        ((-1 << 31) - 1, str((-1 << 31) - 1)),
-        ((-1 << 31) + 1, (-1 << 31) + 1),
-    ]
-
-    def test_invalid_counts(self):
-        for n in ['foo', -1, 0, 1.0]:
-            self.assertRaises(
-                TypeError,
-                json.dumps, 0, int_as_string_bitcount=n)
-
-    def test_ints_outside_range_fails(self):
-        self.assertNotEqual(
-            str(1 << 15),
-            json.loads(json.dumps(1 << 15, int_as_string_bitcount=16)),
-            )
-
-    def test_ints(self):
-        for val, expect in self.values:
-            self.assertEqual(
-                val,
-                json.loads(json.dumps(val)))
-            self.assertEqual(
-                expect,
-                json.loads(json.dumps(val, int_as_string_bitcount=31)),
-                )
-
-    def test_lists(self):
-        for val, expect in self.values:
-            val = [val, val]
-            expect = [expect, expect]
-            self.assertEqual(
-                val,
-                json.loads(json.dumps(val)))
-            self.assertEqual(
-                expect,
-                json.loads(json.dumps(val, int_as_string_bitcount=31)))
-
-    def test_dicts(self):
-        for val, expect in self.values:
-            val = {'k': val}
-            expect = {'k': expect}
-            self.assertEqual(
-                val,
-                json.loads(json.dumps(val)))
-            self.assertEqual(
-                expect,
-                json.loads(json.dumps(val, int_as_string_bitcount=31)))
-
-    def test_dict_keys(self):
-        for val, _ in self.values:
-            expect = {str(val): 'value'}
-            val = {val: 'value'}
-            self.assertEqual(
-                expect,
-                json.loads(json.dumps(val)))
-            self.assertEqual(
-                expect,
-                json.loads(json.dumps(val, int_as_string_bitcount=31)))
diff --git a/lib/simplejson/tests/test_check_circular.py b/lib/simplejson/tests/test_check_circular.py
deleted file mode 100644
index af6463d6..00000000
--- a/lib/simplejson/tests/test_check_circular.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from unittest import TestCase
-import simplejson as json
-
-def default_iterable(obj):
-    return list(obj)
-
-class TestCheckCircular(TestCase):
-    def test_circular_dict(self):
-        dct = {}
-        dct['a'] = dct
-        self.assertRaises(ValueError, json.dumps, dct)
-
-    def test_circular_list(self):
-        lst = []
-        lst.append(lst)
-        self.assertRaises(ValueError, json.dumps, lst)
-
-    def test_circular_composite(self):
-        dct2 = {}
-        dct2['a'] = []
-        dct2['a'].append(dct2)
-        self.assertRaises(ValueError, json.dumps, dct2)
-
-    def test_circular_default(self):
-        json.dumps([set()], default=default_iterable)
-        self.assertRaises(TypeError, json.dumps, [set()])
-
-    def test_circular_off_default(self):
-        json.dumps([set()], default=default_iterable, check_circular=False)
-        self.assertRaises(TypeError, json.dumps, [set()], check_circular=False)
diff --git a/lib/simplejson/tests/test_decimal.py b/lib/simplejson/tests/test_decimal.py
deleted file mode 100644
index 2b0940b1..00000000
--- a/lib/simplejson/tests/test_decimal.py
+++ /dev/null
@@ -1,71 +0,0 @@
-import decimal
-from decimal import Decimal
-from unittest import TestCase
-from simplejson.compat import StringIO, reload_module
-
-import simplejson as json
-
-class TestDecimal(TestCase):
-    NUMS = "1.0", "10.00", "1.1", "1234567890.1234567890", "500"
-    def dumps(self, obj, **kw):
-        sio = StringIO()
-        json.dump(obj, sio, **kw)
-        res = json.dumps(obj, **kw)
-        self.assertEqual(res, sio.getvalue())
-        return res
-
-    def loads(self, s, **kw):
-        sio = StringIO(s)
-        res = json.loads(s, **kw)
-        self.assertEqual(res, json.load(sio, **kw))
-        return res
-
-    def test_decimal_encode(self):
-        for d in map(Decimal, self.NUMS):
-            self.assertEqual(self.dumps(d, use_decimal=True), str(d))
-
-    def test_decimal_decode(self):
-        for s in self.NUMS:
-            self.assertEqual(self.loads(s, parse_float=Decimal), Decimal(s))
-
-    def test_stringify_key(self):
-        for d in map(Decimal, self.NUMS):
-            v = {d: d}
-            self.assertEqual(
-                self.loads(
-                    self.dumps(v, use_decimal=True), parse_float=Decimal),
-                {str(d): d})
-
-    def test_decimal_roundtrip(self):
-        for d in map(Decimal, self.NUMS):
-            # The type might not be the same (int and Decimal) but they
-            # should still compare equal.
-            for v in [d, [d], {'': d}]:
-                self.assertEqual(
-                    self.loads(
-                        self.dumps(v, use_decimal=True), parse_float=Decimal),
-                    v)
-
-    def test_decimal_defaults(self):
-        d = Decimal('1.1')
-        # use_decimal=True is the default
-        self.assertRaises(TypeError, json.dumps, d, use_decimal=False)
-        self.assertEqual('1.1', json.dumps(d))
-        self.assertEqual('1.1', json.dumps(d, use_decimal=True))
-        self.assertRaises(TypeError, json.dump, d, StringIO(),
-                          use_decimal=False)
-        sio = StringIO()
-        json.dump(d, sio)
-        self.assertEqual('1.1', sio.getvalue())
-        sio = StringIO()
-        json.dump(d, sio, use_decimal=True)
-        self.assertEqual('1.1', sio.getvalue())
-
-    def test_decimal_reload(self):
-        # Simulate a subinterpreter that reloads the Python modules but not
-        # the C code https://github.com/simplejson/simplejson/issues/34
-        global Decimal
-        Decimal = reload_module(decimal).Decimal
-        import simplejson.encoder
-        simplejson.encoder.Decimal = Decimal
-        self.test_decimal_roundtrip()
diff --git a/lib/simplejson/tests/test_decode.py b/lib/simplejson/tests/test_decode.py
deleted file mode 100644
index 317b4f98..00000000
--- a/lib/simplejson/tests/test_decode.py
+++ /dev/null
@@ -1,127 +0,0 @@
-from __future__ import absolute_import
-import decimal
-from unittest import TestCase
-
-import sys
-import simplejson as json
-from simplejson.compat import StringIO, b, binary_type
-from simplejson import OrderedDict
-
-class MisbehavingBytesSubtype(binary_type):
-    def decode(self, encoding=None):
-        return "bad decode"
-    def __str__(self):
-        return "bad __str__"
-    def __bytes__(self):
-        return b("bad __bytes__")
-
-class TestDecode(TestCase):
-    if not hasattr(TestCase, 'assertIs'):
-        def assertIs(self, a, b):
-            self.assertTrue(a is b, '%r is %r' % (a, b))
-
-    def test_decimal(self):
-        rval = json.loads('1.1', parse_float=decimal.Decimal)
-        self.assertTrue(isinstance(rval, decimal.Decimal))
-        self.assertEqual(rval, decimal.Decimal('1.1'))
-
-    def test_float(self):
-        rval = json.loads('1', parse_int=float)
-        self.assertTrue(isinstance(rval, float))
-        self.assertEqual(rval, 1.0)
-
-    def test_decoder_optimizations(self):
-        # Several optimizations were made that skip over calls to
-        # the whitespace regex, so this test is designed to try and
-        # exercise the uncommon cases. The array cases are already covered.
-        rval = json.loads('{   "key"    :    "value"    ,  "k":"v"    }')
-        self.assertEqual(rval, {"key":"value", "k":"v"})
-
-    def test_empty_objects(self):
-        s = '{}'
-        self.assertEqual(json.loads(s), eval(s))
-        s = '[]'
-        self.assertEqual(json.loads(s), eval(s))
-        s = '""'
-        self.assertEqual(json.loads(s), eval(s))
-
-    def test_object_pairs_hook(self):
-        s = '{"xkd":1, "kcw":2, "art":3, "hxm":4, "qrt":5, "pad":6, "hoy":7}'
-        p = [("xkd", 1), ("kcw", 2), ("art", 3), ("hxm", 4),
-             ("qrt", 5), ("pad", 6), ("hoy", 7)]
-        self.assertEqual(json.loads(s), eval(s))
-        self.assertEqual(json.loads(s, object_pairs_hook=lambda x: x), p)
-        self.assertEqual(json.load(StringIO(s),
-                                   object_pairs_hook=lambda x: x), p)
-        od = json.loads(s, object_pairs_hook=OrderedDict)
-        self.assertEqual(od, OrderedDict(p))
-        self.assertEqual(type(od), OrderedDict)
-        # the object_pairs_hook takes priority over the object_hook
-        self.assertEqual(json.loads(s,
-                                    object_pairs_hook=OrderedDict,
-                                    object_hook=lambda x: None),
-                         OrderedDict(p))
-
-    def check_keys_reuse(self, source, loads):
-        rval = loads(source)
-        (a, b), (c, d) = sorted(rval[0]), sorted(rval[1])
-        self.assertIs(a, c)
-        self.assertIs(b, d)
-
-    def test_keys_reuse_str(self):
-        s = u'[{"a_key": 1, "b_\xe9": 2}, {"a_key": 3, "b_\xe9": 4}]'.encode('utf8')
-        self.check_keys_reuse(s, json.loads)
-
-    def test_keys_reuse_unicode(self):
-        s = u'[{"a_key": 1, "b_\xe9": 2}, {"a_key": 3, "b_\xe9": 4}]'
-        self.check_keys_reuse(s, json.loads)
-
-    def test_empty_strings(self):
-        self.assertEqual(json.loads('""'), "")
-        self.assertEqual(json.loads(u'""'), u"")
-        self.assertEqual(json.loads('[""]'), [""])
-        self.assertEqual(json.loads(u'[""]'), [u""])
-
-    def test_raw_decode(self):
-        cls = json.decoder.JSONDecoder
-        self.assertEqual(
-            ({'a': {}}, 9),
-            cls().raw_decode("{\"a\": {}}"))
-        # http://code.google.com/p/simplejson/issues/detail?id=85
-        self.assertEqual(
-            ({'a': {}}, 9),
-            cls(object_pairs_hook=dict).raw_decode("{\"a\": {}}"))
-        # https://github.com/simplejson/simplejson/pull/38
-        self.assertEqual(
-            ({'a': {}}, 11),
-            cls().raw_decode(" \n{\"a\": {}}"))
-
-    def test_bytes_decode(self):
-        cls = json.decoder.JSONDecoder
-        data = b('"\xe2\x82\xac"')
-        self.assertEqual(cls().decode(data), u'\u20ac')
-        self.assertEqual(cls(encoding='latin1').decode(data), u'\xe2\x82\xac')
-        self.assertEqual(cls(encoding=None).decode(data), u'\u20ac')
-
-        data = MisbehavingBytesSubtype(b('"\xe2\x82\xac"'))
-        self.assertEqual(cls().decode(data), u'\u20ac')
-        self.assertEqual(cls(encoding='latin1').decode(data), u'\xe2\x82\xac')
-        self.assertEqual(cls(encoding=None).decode(data), u'\u20ac')
-
-    def test_bounds_checking(self):
-        # https://github.com/simplejson/simplejson/issues/98
-        j = json.decoder.JSONDecoder()
-        for i in [4, 5, 6, -1, -2, -3, -4, -5, -6]:
-            self.assertRaises(ValueError, j.scan_once, '1234', i)
-            self.assertRaises(ValueError, j.raw_decode, '1234', i)
-        x, y = sorted(['128931233', '472389423'], key=id)
-        diff = id(x) - id(y)
-        self.assertRaises(ValueError, j.scan_once, y, diff)
-        self.assertRaises(ValueError, j.raw_decode, y, i)
-
-    def test_bounded_int(self):
-        # SJ-PT-23-03, limit quadratic number parsing per Python 3.11
-        max_str_digits = getattr(sys, 'get_int_max_str_digits', lambda: 4300)()
-        s = '1' + '0' * (max_str_digits - 1)
-        self.assertEqual(json.loads(s), int(s))
-        self.assertRaises(ValueError, json.loads, s + '0')
diff --git a/lib/simplejson/tests/test_default.py b/lib/simplejson/tests/test_default.py
deleted file mode 100644
index d1eacb8c..00000000
--- a/lib/simplejson/tests/test_default.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from unittest import TestCase
-
-import simplejson as json
-
-class TestDefault(TestCase):
-    def test_default(self):
-        self.assertEqual(
-            json.dumps(type, default=repr),
-            json.dumps(repr(type)))
diff --git a/lib/simplejson/tests/test_dump.py b/lib/simplejson/tests/test_dump.py
deleted file mode 100644
index eff24c29..00000000
--- a/lib/simplejson/tests/test_dump.py
+++ /dev/null
@@ -1,249 +0,0 @@
-from unittest import TestCase
-from simplejson.compat import StringIO, long_type, b, binary_type, text_type, PY3
-import simplejson as json
-
-class MisbehavingTextSubtype(text_type):
-    def __str__(self):
-        return "FAIL!"
-
-class MisbehavingBytesSubtype(binary_type):
-    def decode(self, encoding=None):
-        return "bad decode"
-    def __str__(self):
-        return "bad __str__"
-    def __bytes__(self):
-        return b("bad __bytes__")
-
-def as_text_type(s):
-    if PY3 and isinstance(s, bytes):
-        return s.decode('ascii')
-    return s
-
-def decode_iso_8859_15(b):
-    return b.decode('iso-8859-15')
-
-class TestDump(TestCase):
-    def test_dump(self):
-        sio = StringIO()
-        json.dump({}, sio)
-        self.assertEqual(sio.getvalue(), '{}')
-
-    def test_constants(self):
-        for c in [None, True, False]:
-            self.assertTrue(json.loads(json.dumps(c)) is c)
-            self.assertTrue(json.loads(json.dumps([c]))[0] is c)
-            self.assertTrue(json.loads(json.dumps({'a': c}))['a'] is c)
-
-    def test_stringify_key(self):
-        items = [(b('bytes'), 'bytes'),
-                 (1.0, '1.0'),
-                 (10, '10'),
-                 (True, 'true'),
-                 (False, 'false'),
-                 (None, 'null'),
-                 (long_type(100), '100')]
-        for k, expect in items:
-            self.assertEqual(
-                json.loads(json.dumps({k: expect})),
-                {expect: expect})
-            self.assertEqual(
-                json.loads(json.dumps({k: expect}, sort_keys=True)),
-                {expect: expect})
-        self.assertRaises(TypeError, json.dumps, {json: 1})
-        for v in [{}, {'other': 1}, {b('derp'): 1, 'herp': 2}]:
-            for sort_keys in [False, True]:
-                v0 = dict(v)
-                v0[json] = 1
-                v1 = dict((as_text_type(key), val) for (key, val) in v.items())
-                self.assertEqual(
-                    json.loads(json.dumps(v0, skipkeys=True, sort_keys=sort_keys)),
-                    v1)
-                self.assertEqual(
-                    json.loads(json.dumps({'': v0}, skipkeys=True, sort_keys=sort_keys)),
-                    {'': v1})
-                self.assertEqual(
-                    json.loads(json.dumps([v0], skipkeys=True, sort_keys=sort_keys)),
-                    [v1])
-
-    def test_dumps(self):
-        self.assertEqual(json.dumps({}), '{}')
-
-    def test_encode_truefalse(self):
-        self.assertEqual(json.dumps(
-                 {True: False, False: True}, sort_keys=True),
-                 '{"false": true, "true": false}')
-        self.assertEqual(
-            json.dumps(
-                {2: 3.0,
-                 4.0: long_type(5),
-                 False: 1,
-                 long_type(6): True,
-                 "7": 0},
-                sort_keys=True),
-            '{"2": 3.0, "4.0": 5, "6": true, "7": 0, "false": 1}')
-
-    def test_ordered_dict(self):
-        # http://bugs.python.org/issue6105
-        items = [('one', 1), ('two', 2), ('three', 3), ('four', 4), ('five', 5)]
-        s = json.dumps(json.OrderedDict(items))
-        self.assertEqual(
-            s,
-            '{"one": 1, "two": 2, "three": 3, "four": 4, "five": 5}')
-
-    def test_indent_unknown_type_acceptance(self):
-        """
-        A test against the regression mentioned at `github issue 29`_.
-
-        The indent parameter should accept any type which pretends to be
-        an instance of int or long when it comes to being multiplied by
-        strings, even if it is not actually an int or long, for
-        backwards compatibility.
-
-        .. _github issue 29:
-           http://github.com/simplejson/simplejson/issue/29
-        """
-
-        class AwesomeInt(object):
-            """An awesome reimplementation of integers"""
-
-            def __init__(self, *args, **kwargs):
-                if len(args) > 0:
-                    # [construct from literals, objects, etc.]
-                    # ...
-
-                    # Finally, if args[0] is an integer, store it
-                    if isinstance(args[0], int):
-                        self._int = args[0]
-
-            # [various methods]
-
-            def __mul__(self, other):
-                # [various ways to multiply AwesomeInt objects]
-                # ... finally, if the right-hand operand is not awesome enough,
-                # try to do a normal integer multiplication
-                if hasattr(self, '_int'):
-                    return self._int * other
-                else:
-                    raise NotImplementedError("To do non-awesome things with"
-                        " this object, please construct it from an integer!")
-
-        s = json.dumps([0, 1, 2], indent=AwesomeInt(3))
-        self.assertEqual(s, '[\n   0,\n   1,\n   2\n]')
-
-    def test_accumulator(self):
-        # the C API uses an accumulator that collects after 100,000 appends
-        lst = [0] * 100000
-        self.assertEqual(json.loads(json.dumps(lst)), lst)
-
-    def test_sort_keys(self):
-        # https://github.com/simplejson/simplejson/issues/106
-        for num_keys in range(2, 32):
-            p = dict((str(x), x) for x in range(num_keys))
-            sio = StringIO()
-            json.dump(p, sio, sort_keys=True)
-            self.assertEqual(sio.getvalue(), json.dumps(p, sort_keys=True))
-            self.assertEqual(json.loads(sio.getvalue()), p)
-
-    def test_misbehaving_text_subtype(self):
-        # https://github.com/simplejson/simplejson/issues/185
-        text = "this is some text"
-        self.assertEqual(
-            json.dumps(MisbehavingTextSubtype(text)),
-            json.dumps(text)
-        )
-        self.assertEqual(
-            json.dumps([MisbehavingTextSubtype(text)]),
-            json.dumps([text])
-        )
-        self.assertEqual(
-            json.dumps({MisbehavingTextSubtype(text): 42}),
-            json.dumps({text: 42})
-        )
-
-    def test_misbehaving_bytes_subtype(self):
-        data = b("this is some data \xe2\x82\xac")
-        self.assertEqual(
-            json.dumps(MisbehavingBytesSubtype(data)),
-            json.dumps(data)
-        )
-        self.assertEqual(
-            json.dumps([MisbehavingBytesSubtype(data)]),
-            json.dumps([data])
-        )
-        self.assertEqual(
-            json.dumps({MisbehavingBytesSubtype(data): 42}),
-            json.dumps({data: 42})
-        )
-
-    def test_bytes_toplevel(self):
-        self.assertEqual(json.dumps(b('\xe2\x82\xac')), r'"\u20ac"')
-        self.assertRaises(UnicodeDecodeError, json.dumps, b('\xa4'))
-        self.assertEqual(json.dumps(b('\xa4'), encoding='iso-8859-1'),
-                         r'"\u00a4"')
-        self.assertEqual(json.dumps(b('\xa4'), encoding='iso-8859-15'),
-                         r'"\u20ac"')
-        if PY3:
-            self.assertRaises(TypeError, json.dumps, b('\xe2\x82\xac'),
-                              encoding=None)
-            self.assertRaises(TypeError, json.dumps, b('\xa4'),
-                              encoding=None)
-            self.assertEqual(json.dumps(b('\xa4'), encoding=None,
-                                        default=decode_iso_8859_15),
-                            r'"\u20ac"')
-        else:
-            self.assertEqual(json.dumps(b('\xe2\x82\xac'), encoding=None),
-                             r'"\u20ac"')
-            self.assertRaises(UnicodeDecodeError, json.dumps, b('\xa4'),
-                              encoding=None)
-            self.assertRaises(UnicodeDecodeError, json.dumps, b('\xa4'),
-                              encoding=None, default=decode_iso_8859_15)
-
-    def test_bytes_nested(self):
-        self.assertEqual(json.dumps([b('\xe2\x82\xac')]), r'["\u20ac"]')
-        self.assertRaises(UnicodeDecodeError, json.dumps, [b('\xa4')])
-        self.assertEqual(json.dumps([b('\xa4')], encoding='iso-8859-1'),
-                         r'["\u00a4"]')
-        self.assertEqual(json.dumps([b('\xa4')], encoding='iso-8859-15'),
-                         r'["\u20ac"]')
-        if PY3:
-            self.assertRaises(TypeError, json.dumps, [b('\xe2\x82\xac')],
-                              encoding=None)
-            self.assertRaises(TypeError, json.dumps, [b('\xa4')],
-                              encoding=None)
-            self.assertEqual(json.dumps([b('\xa4')], encoding=None,
-                                        default=decode_iso_8859_15),
-                             r'["\u20ac"]')
-        else:
-            self.assertEqual(json.dumps([b('\xe2\x82\xac')], encoding=None),
-                             r'["\u20ac"]')
-            self.assertRaises(UnicodeDecodeError, json.dumps, [b('\xa4')],
-                              encoding=None)
-            self.assertRaises(UnicodeDecodeError, json.dumps, [b('\xa4')],
-                              encoding=None, default=decode_iso_8859_15)
-
-    def test_bytes_key(self):
-        self.assertEqual(json.dumps({b('\xe2\x82\xac'): 42}), r'{"\u20ac": 42}')
-        self.assertRaises(UnicodeDecodeError, json.dumps, {b('\xa4'): 42})
-        self.assertEqual(json.dumps({b('\xa4'): 42}, encoding='iso-8859-1'),
-                         r'{"\u00a4": 42}')
-        self.assertEqual(json.dumps({b('\xa4'): 42}, encoding='iso-8859-15'),
-                         r'{"\u20ac": 42}')
-        if PY3:
-            self.assertRaises(TypeError, json.dumps, {b('\xe2\x82\xac'): 42},
-                              encoding=None)
-            self.assertRaises(TypeError, json.dumps, {b('\xa4'): 42},
-                              encoding=None)
-            self.assertRaises(TypeError, json.dumps, {b('\xa4'): 42},
-                              encoding=None, default=decode_iso_8859_15)
-            self.assertEqual(json.dumps({b('\xa4'): 42}, encoding=None,
-                                        skipkeys=True),
-                             r'{}')
-        else:
-            self.assertEqual(json.dumps({b('\xe2\x82\xac'): 42}, encoding=None),
-                             r'{"\u20ac": 42}')
-            self.assertRaises(UnicodeDecodeError, json.dumps, {b('\xa4'): 42},
-                              encoding=None)
-            self.assertRaises(UnicodeDecodeError, json.dumps, {b('\xa4'): 42},
-                              encoding=None, default=decode_iso_8859_15)
-            self.assertRaises(UnicodeDecodeError, json.dumps, {b('\xa4'): 42},
-                              encoding=None, skipkeys=True)
diff --git a/lib/simplejson/tests/test_encode_basestring_ascii.py b/lib/simplejson/tests/test_encode_basestring_ascii.py
deleted file mode 100644
index 49706bfd..00000000
--- a/lib/simplejson/tests/test_encode_basestring_ascii.py
+++ /dev/null
@@ -1,47 +0,0 @@
-from unittest import TestCase
-
-import simplejson.encoder
-from simplejson.compat import b
-
-CASES = [
-    (u'/\\"\ucafe\ubabe\uab98\ufcde\ubcda\uef4a\x08\x0c\n\r\t`1~!@#$%^&*()_+-=[]{}|;:\',./<>?', '"/\\\\\\"\\ucafe\\ubabe\\uab98\\ufcde\\ubcda\\uef4a\\b\\f\\n\\r\\t`1~!@#$%^&*()_+-=[]{}|;:\',./<>?"'),
-    (u'\u0123\u4567\u89ab\ucdef\uabcd\uef4a', '"\\u0123\\u4567\\u89ab\\ucdef\\uabcd\\uef4a"'),
-    (u'controls', '"controls"'),
-    (u'\x08\x0c\n\r\t', '"\\b\\f\\n\\r\\t"'),
-    (u'{"object with 1 member":["array with 1 element"]}', '"{\\"object with 1 member\\":[\\"array with 1 element\\"]}"'),
-    (u' s p a c e d ', '" s p a c e d "'),
-    (u'\U0001d120', '"\\ud834\\udd20"'),
-    (u'\u03b1\u03a9', '"\\u03b1\\u03a9"'),
-    (b('\xce\xb1\xce\xa9'), '"\\u03b1\\u03a9"'),
-    (u'\u03b1\u03a9', '"\\u03b1\\u03a9"'),
-    (b('\xce\xb1\xce\xa9'), '"\\u03b1\\u03a9"'),
-    (u'\u03b1\u03a9', '"\\u03b1\\u03a9"'),
-    (u'\u03b1\u03a9', '"\\u03b1\\u03a9"'),
-    (u"`1~!@#$%^&*()_+-={':[,]}|;.</>?", '"`1~!@#$%^&*()_+-={\':[,]}|;.</>?"'),
-    (u'\x08\x0c\n\r\t', '"\\b\\f\\n\\r\\t"'),
-    (u'\u0123\u4567\u89ab\ucdef\uabcd\uef4a', '"\\u0123\\u4567\\u89ab\\ucdef\\uabcd\\uef4a"'),
-]
-
-class TestEncodeBaseStringAscii(TestCase):
-    def test_py_encode_basestring_ascii(self):
-        self._test_encode_basestring_ascii(simplejson.encoder.py_encode_basestring_ascii)
-
-    def test_c_encode_basestring_ascii(self):
-        if not simplejson.encoder.c_encode_basestring_ascii:
-            return
-        self._test_encode_basestring_ascii(simplejson.encoder.c_encode_basestring_ascii)
-
-    def _test_encode_basestring_ascii(self, encode_basestring_ascii):
-        fname = encode_basestring_ascii.__name__
-        for input_string, expect in CASES:
-            result = encode_basestring_ascii(input_string)
-            #self.assertEqual(result, expect,
-            #    '{0!r} != {1!r} for {2}({3!r})'.format(
-            #        result, expect, fname, input_string))
-            self.assertEqual(result, expect,
-                '%r != %r for %s(%r)' % (result, expect, fname, input_string))
-
-    def test_sorted_dict(self):
-        items = [('one', 1), ('two', 2), ('three', 3), ('four', 4), ('five', 5)]
-        s = simplejson.dumps(dict(items), sort_keys=True)
-        self.assertEqual(s, '{"five": 5, "four": 4, "one": 1, "three": 3, "two": 2}')
diff --git a/lib/simplejson/tests/test_encode_for_html.py b/lib/simplejson/tests/test_encode_for_html.py
deleted file mode 100644
index 3a840aa4..00000000
--- a/lib/simplejson/tests/test_encode_for_html.py
+++ /dev/null
@@ -1,38 +0,0 @@
-import unittest
-
-import simplejson as json
-
-class TestEncodeForHTML(unittest.TestCase):
-
-    def setUp(self):
-        self.decoder = json.JSONDecoder()
-        self.encoder = json.JSONEncoderForHTML()
-        self.non_ascii_encoder = json.JSONEncoderForHTML(ensure_ascii=False)
-
-    def test_basic_encode(self):
-        self.assertEqual(r'"\u0026"', self.encoder.encode('&'))
-        self.assertEqual(r'"\u003c"', self.encoder.encode('<'))
-        self.assertEqual(r'"\u003e"', self.encoder.encode('>'))
-        self.assertEqual(r'"\u2028"', self.encoder.encode(u'\u2028'))
-
-    def test_non_ascii_basic_encode(self):
-        self.assertEqual(r'"\u0026"', self.non_ascii_encoder.encode('&'))
-        self.assertEqual(r'"\u003c"', self.non_ascii_encoder.encode('<'))
-        self.assertEqual(r'"\u003e"', self.non_ascii_encoder.encode('>'))
-        self.assertEqual(r'"\u2028"', self.non_ascii_encoder.encode(u'\u2028'))
-
-    def test_basic_roundtrip(self):
-        for char in '&<>':
-            self.assertEqual(
-                char, self.decoder.decode(
-                    self.encoder.encode(char)))
-
-    def test_prevent_script_breakout(self):
-        bad_string = '</script><script>alert("gotcha")</script>'
-        self.assertEqual(
-            r'"\u003c/script\u003e\u003cscript\u003e'
-            r'alert(\"gotcha\")\u003c/script\u003e"',
-            self.encoder.encode(bad_string))
-        self.assertEqual(
-            bad_string, self.decoder.decode(
-                self.encoder.encode(bad_string)))
diff --git a/lib/simplejson/tests/test_errors.py b/lib/simplejson/tests/test_errors.py
deleted file mode 100644
index d5738254..00000000
--- a/lib/simplejson/tests/test_errors.py
+++ /dev/null
@@ -1,68 +0,0 @@
-import sys, pickle
-from unittest import TestCase
-
-import simplejson as json
-from simplejson.compat import text_type, b
-
-class TestErrors(TestCase):
-    def test_string_keys_error(self):
-        data = [{'a': 'A', 'b': (2, 4), 'c': 3.0, ('d',): 'D tuple'}]
-        try:
-            json.dumps(data)
-        except TypeError:
-            err = sys.exc_info()[1]
-        else:
-            self.fail('Expected TypeError')
-        self.assertEqual(str(err),
-                'keys must be str, int, float, bool or None, not tuple')
-
-    def test_not_serializable(self):
-        try:
-            json.dumps(json)
-        except TypeError:
-            err = sys.exc_info()[1]
-        else:
-            self.fail('Expected TypeError')
-        self.assertEqual(str(err),
-                'Object of type module is not JSON serializable')
-
-    def test_decode_error(self):
-        err = None
-        try:
-            json.loads('{}\na\nb')
-        except json.JSONDecodeError:
-            err = sys.exc_info()[1]
-        else:
-            self.fail('Expected JSONDecodeError')
-        self.assertEqual(err.lineno, 2)
-        self.assertEqual(err.colno, 1)
-        self.assertEqual(err.endlineno, 3)
-        self.assertEqual(err.endcolno, 2)
-
-    def test_scan_error(self):
-        err = None
-        for t in (text_type, b):
-            try:
-                json.loads(t('{"asdf": "'))
-            except json.JSONDecodeError:
-                err = sys.exc_info()[1]
-            else:
-                self.fail('Expected JSONDecodeError')
-            self.assertEqual(err.lineno, 1)
-            self.assertEqual(err.colno, 10)
-
-    def test_error_is_pickable(self):
-        err = None
-        try:
-            json.loads('{}\na\nb')
-        except json.JSONDecodeError:
-            err = sys.exc_info()[1]
-        else:
-            self.fail('Expected JSONDecodeError')
-        s = pickle.dumps(err)
-        e = pickle.loads(s)
-
-        self.assertEqual(err.msg, e.msg)
-        self.assertEqual(err.doc, e.doc)
-        self.assertEqual(err.pos, e.pos)
-        self.assertEqual(err.end, e.end)
diff --git a/lib/simplejson/tests/test_fail.py b/lib/simplejson/tests/test_fail.py
deleted file mode 100644
index 5f9a8f69..00000000
--- a/lib/simplejson/tests/test_fail.py
+++ /dev/null
@@ -1,178 +0,0 @@
-import sys
-from unittest import TestCase
-
-import simplejson as json
-
-# 2007-10-05
-JSONDOCS = [
-    # http://json.org/JSON_checker/test/fail1.json
-    '"A JSON payload should be an object or array, not a string."',
-    # http://json.org/JSON_checker/test/fail2.json
-    '["Unclosed array"',
-    # http://json.org/JSON_checker/test/fail3.json
-    '{unquoted_key: "keys must be quoted"}',
-    # http://json.org/JSON_checker/test/fail4.json
-    '["extra comma",]',
-    # http://json.org/JSON_checker/test/fail5.json
-    '["double extra comma",,]',
-    # http://json.org/JSON_checker/test/fail6.json
-    '[   , "<-- missing value"]',
-    # http://json.org/JSON_checker/test/fail7.json
-    '["Comma after the close"],',
-    # http://json.org/JSON_checker/test/fail8.json
-    '["Extra close"]]',
-    # http://json.org/JSON_checker/test/fail9.json
-    '{"Extra comma": true,}',
-    # http://json.org/JSON_checker/test/fail10.json
-    '{"Extra value after close": true} "misplaced quoted value"',
-    # http://json.org/JSON_checker/test/fail11.json
-    '{"Illegal expression": 1 + 2}',
-    # http://json.org/JSON_checker/test/fail12.json
-    '{"Illegal invocation": alert()}',
-    # http://json.org/JSON_checker/test/fail13.json
-    '{"Numbers cannot have leading zeroes": 013}',
-    # http://json.org/JSON_checker/test/fail14.json
-    '{"Numbers cannot be hex": 0x14}',
-    # http://json.org/JSON_checker/test/fail15.json
-    '["Illegal backslash escape: \\x15"]',
-    # http://json.org/JSON_checker/test/fail16.json
-    '[\\naked]',
-    # http://json.org/JSON_checker/test/fail17.json
-    '["Illegal backslash escape: \\017"]',
-    # http://json.org/JSON_checker/test/fail18.json
-    '[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]',
-    # http://json.org/JSON_checker/test/fail19.json
-    '{"Missing colon" null}',
-    # http://json.org/JSON_checker/test/fail20.json
-    '{"Double colon":: null}',
-    # http://json.org/JSON_checker/test/fail21.json
-    '{"Comma instead of colon", null}',
-    # http://json.org/JSON_checker/test/fail22.json
-    '["Colon instead of comma": false]',
-    # http://json.org/JSON_checker/test/fail23.json
-    '["Bad value", truth]',
-    # http://json.org/JSON_checker/test/fail24.json
-    "['single quote']",
-    # http://json.org/JSON_checker/test/fail25.json
-    '["\ttab\tcharacter\tin\tstring\t"]',
-    # http://json.org/JSON_checker/test/fail26.json
-    '["tab\\   character\\   in\\  string\\  "]',
-    # http://json.org/JSON_checker/test/fail27.json
-    '["line\nbreak"]',
-    # http://json.org/JSON_checker/test/fail28.json
-    '["line\\\nbreak"]',
-    # http://json.org/JSON_checker/test/fail29.json
-    '[0e]',
-    # http://json.org/JSON_checker/test/fail30.json
-    '[0e+]',
-    # http://json.org/JSON_checker/test/fail31.json
-    '[0e+-1]',
-    # http://json.org/JSON_checker/test/fail32.json
-    '{"Comma instead if closing brace": true,',
-    # http://json.org/JSON_checker/test/fail33.json
-    '["mismatch"}',
-    # http://code.google.com/p/simplejson/issues/detail?id=3
-    u'["A\u001FZ control characters in string"]',
-    # misc based on coverage
-    '{',
-    '{]',
-    '{"foo": "bar"]',
-    '{"foo": "bar"',
-    'nul',
-    'nulx',
-    '-',
-    '-x',
-    '-e',
-    '-e0',
-    '-Infinite',
-    '-Inf',
-    'Infinit',
-    'Infinite',
-    'NaM',
-    'NuN',
-    'falsy',
-    'fal',
-    'trug',
-    'tru',
-    '1e',
-    '1ex',
-    '1e-',
-    '1e-x',
-]
-
-SKIPS = {
-    1: "why not have a string payload?",
-    18: "spec doesn't specify any nesting limitations",
-}
-
-class TestFail(TestCase):
-    def test_failures(self):
-        for idx, doc in enumerate(JSONDOCS):
-            idx = idx + 1
-            if idx in SKIPS:
-                json.loads(doc)
-                continue
-            try:
-                json.loads(doc)
-            except json.JSONDecodeError:
-                pass
-            else:
-                self.fail("Expected failure for fail%d.json: %r" % (idx, doc))
-
-    def test_array_decoder_issue46(self):
-        # http://code.google.com/p/simplejson/issues/detail?id=46
-        for doc in [u'[,]', '[,]']:
-            try:
-                json.loads(doc)
-            except json.JSONDecodeError:
-                e = sys.exc_info()[1]
-                self.assertEqual(e.pos, 1)
-                self.assertEqual(e.lineno, 1)
-                self.assertEqual(e.colno, 2)
-            except Exception:
-                e = sys.exc_info()[1]
-                self.fail("Unexpected exception raised %r %s" % (e, e))
-            else:
-                self.fail("Unexpected success parsing '[,]'")
-
-    def test_truncated_input(self):
-        test_cases = [
-            ('', 'Expecting value', 0),
-            ('[', "Expecting value or ']'", 1),
-            ('[42', "Expecting ',' delimiter", 3),
-            ('[42,', 'Expecting value', 4),
-            ('["', 'Unterminated string starting at', 1),
-            ('["spam', 'Unterminated string starting at', 1),
-            ('["spam"', "Expecting ',' delimiter", 7),
-            ('["spam",', 'Expecting value', 8),
-            ('{', "Expecting property name enclosed in double quotes or '}'", 1),
-            ('{"', 'Unterminated string starting at', 1),
-            ('{"spam', 'Unterminated string starting at', 1),
-            ('{"spam"', "Expecting ':' delimiter", 7),
-            ('{"spam":', 'Expecting value', 8),
-            ('{"spam":42', "Expecting ',' delimiter", 10),
-            ('{"spam":42,', 'Expecting property name enclosed in double quotes',
-             11),
-            ('"', 'Unterminated string starting at', 0),
-            ('"spam', 'Unterminated string starting at', 0),
-            ('[,', "Expecting value", 1),
-            ('--', 'Expecting value', 0),
-            ('"\x18d', "Invalid control character %r", 1),
-        ]
-        for data, msg, idx in test_cases:
-            try:
-                json.loads(data)
-            except json.JSONDecodeError:
-                e = sys.exc_info()[1]
-                self.assertEqual(
-                    e.msg[:len(msg)],
-                    msg,
-                    "%r doesn't start with %r for %r" % (e.msg, msg, data))
-                self.assertEqual(
-                    e.pos, idx,
-                    "pos %r != %r for %r" % (e.pos, idx, data))
-            except Exception:
-                e = sys.exc_info()[1]
-                self.fail("Unexpected exception raised %r %s" % (e, e))
-            else:
-                self.fail("Unexpected success parsing '%r'" % (data,))
diff --git a/lib/simplejson/tests/test_float.py b/lib/simplejson/tests/test_float.py
deleted file mode 100644
index a9779694..00000000
--- a/lib/simplejson/tests/test_float.py
+++ /dev/null
@@ -1,38 +0,0 @@
-import math
-from unittest import TestCase
-from simplejson.compat import long_type, text_type
-import simplejson as json
-from simplejson.decoder import NaN, PosInf, NegInf
-
-class TestFloat(TestCase):
-    def test_degenerates_allow(self):
-        for inf in (PosInf, NegInf):
-            self.assertEqual(json.loads(json.dumps(inf, allow_nan=True), allow_nan=True), inf)
-        # Python 2.5 doesn't have math.isnan
-        nan = json.loads(json.dumps(NaN, allow_nan=True), allow_nan=True)
-        self.assertTrue((0 + nan) != nan)
-
-    def test_degenerates_ignore(self):
-        for f in (PosInf, NegInf, NaN):
-            self.assertEqual(json.loads(json.dumps(f, ignore_nan=True)), None)
-
-    def test_degenerates_deny(self):
-        for f in (PosInf, NegInf, NaN):
-            self.assertRaises(ValueError, json.dumps, f, allow_nan=False)
-        for s in ('Infinity', '-Infinity', 'NaN'):
-            self.assertRaises(ValueError, json.loads, s, allow_nan=False)
-            self.assertRaises(ValueError, json.loads, s)
-
-    def test_floats(self):
-        for num in [1617161771.7650001, math.pi, math.pi**100,
-                    math.pi**-100, 3.1]:
-            self.assertEqual(float(json.dumps(num)), num)
-            self.assertEqual(json.loads(json.dumps(num)), num)
-            self.assertEqual(json.loads(text_type(json.dumps(num))), num)
-
-    def test_ints(self):
-        for num in [1, long_type(1), 1<<32, 1<<64]:
-            self.assertEqual(json.dumps(num), str(num))
-            self.assertEqual(int(json.dumps(num)), num)
-            self.assertEqual(json.loads(json.dumps(num)), num)
-            self.assertEqual(json.loads(text_type(json.dumps(num))), num)
diff --git a/lib/simplejson/tests/test_for_json.py b/lib/simplejson/tests/test_for_json.py
deleted file mode 100644
index b791b883..00000000
--- a/lib/simplejson/tests/test_for_json.py
+++ /dev/null
@@ -1,97 +0,0 @@
-import unittest
-import simplejson as json
-
-
-class ForJson(object):
-    def for_json(self):
-        return {'for_json': 1}
-
-
-class NestedForJson(object):
-    def for_json(self):
-        return {'nested': ForJson()}
-
-
-class ForJsonList(object):
-    def for_json(self):
-        return ['list']
-
-
-class DictForJson(dict):
-    def for_json(self):
-        return {'alpha': 1}
-
-
-class ListForJson(list):
-    def for_json(self):
-        return ['list']
-
-
-class TestForJson(unittest.TestCase):
-    def assertRoundTrip(self, obj, other, for_json=True):
-        if for_json is None:
-            # None will use the default
-            s = json.dumps(obj)
-        else:
-            s = json.dumps(obj, for_json=for_json)
-        self.assertEqual(
-            json.loads(s),
-            other)
-
-    def test_for_json_encodes_stand_alone_object(self):
-        self.assertRoundTrip(
-            ForJson(),
-            ForJson().for_json())
-
-    def test_for_json_encodes_object_nested_in_dict(self):
-        self.assertRoundTrip(
-            {'hooray': ForJson()},
-            {'hooray': ForJson().for_json()})
-
-    def test_for_json_encodes_object_nested_in_list_within_dict(self):
-        self.assertRoundTrip(
-            {'list': [0, ForJson(), 2, 3]},
-            {'list': [0, ForJson().for_json(), 2, 3]})
-
-    def test_for_json_encodes_object_nested_within_object(self):
-        self.assertRoundTrip(
-            NestedForJson(),
-            {'nested': {'for_json': 1}})
-
-    def test_for_json_encodes_list(self):
-        self.assertRoundTrip(
-            ForJsonList(),
-            ForJsonList().for_json())
-
-    def test_for_json_encodes_list_within_object(self):
-        self.assertRoundTrip(
-            {'nested': ForJsonList()},
-            {'nested': ForJsonList().for_json()})
-
-    def test_for_json_encodes_dict_subclass(self):
-        self.assertRoundTrip(
-            DictForJson(a=1),
-            DictForJson(a=1).for_json())
-
-    def test_for_json_encodes_list_subclass(self):
-        self.assertRoundTrip(
-            ListForJson(['l']),
-            ListForJson(['l']).for_json())
-
-    def test_for_json_ignored_if_not_true_with_dict_subclass(self):
-        for for_json in (None, False):
-            self.assertRoundTrip(
-                DictForJson(a=1),
-                {'a': 1},
-                for_json=for_json)
-
-    def test_for_json_ignored_if_not_true_with_list_subclass(self):
-        for for_json in (None, False):
-            self.assertRoundTrip(
-                ListForJson(['l']),
-                ['l'],
-                for_json=for_json)
-
-    def test_raises_typeerror_if_for_json_not_true_with_object(self):
-        self.assertRaises(TypeError, json.dumps, ForJson())
-        self.assertRaises(TypeError, json.dumps, ForJson(), for_json=False)
diff --git a/lib/simplejson/tests/test_indent.py b/lib/simplejson/tests/test_indent.py
deleted file mode 100644
index cea25a57..00000000
--- a/lib/simplejson/tests/test_indent.py
+++ /dev/null
@@ -1,86 +0,0 @@
-from unittest import TestCase
-import textwrap
-
-import simplejson as json
-from simplejson.compat import StringIO
-
-class TestIndent(TestCase):
-    def test_indent(self):
-        h = [['blorpie'], ['whoops'], [], 'd-shtaeou', 'd-nthiouh',
-             'i-vhbjkhnth',
-             {'nifty': 87}, {'field': 'yes', 'morefield': False} ]
-
-        expect = textwrap.dedent("""\
-        [
-        \t[
-        \t\t"blorpie"
-        \t],
-        \t[
-        \t\t"whoops"
-        \t],
-        \t[],
-        \t"d-shtaeou",
-        \t"d-nthiouh",
-        \t"i-vhbjkhnth",
-        \t{
-        \t\t"nifty": 87
-        \t},
-        \t{
-        \t\t"field": "yes",
-        \t\t"morefield": false
-        \t}
-        ]""")
-
-
-        d1 = json.dumps(h)
-        d2 = json.dumps(h, indent='\t', sort_keys=True, separators=(',', ': '))
-        d3 = json.dumps(h, indent='  ', sort_keys=True, separators=(',', ': '))
-        d4 = json.dumps(h, indent=2, sort_keys=True, separators=(',', ': '))
-
-        h1 = json.loads(d1)
-        h2 = json.loads(d2)
-        h3 = json.loads(d3)
-        h4 = json.loads(d4)
-
-        self.assertEqual(h1, h)
-        self.assertEqual(h2, h)
-        self.assertEqual(h3, h)
-        self.assertEqual(h4, h)
-        self.assertEqual(d3, expect.replace('\t', '  '))
-        self.assertEqual(d4, expect.replace('\t', '  '))
-        # NOTE: Python 2.4 textwrap.dedent converts tabs to spaces,
-        #       so the following is expected to fail. Python 2.4 is not a
-        #       supported platform in simplejson 2.1.0+.
-        self.assertEqual(d2, expect)
-
-    def test_indent0(self):
-        h = {3: 1}
-        def check(indent, expected):
-            d1 = json.dumps(h, indent=indent)
-            self.assertEqual(d1, expected)
-
-            sio = StringIO()
-            json.dump(h, sio, indent=indent)
-            self.assertEqual(sio.getvalue(), expected)
-
-        # indent=0 should emit newlines
-        check(0, '{\n"3": 1\n}')
-        # indent=None is more compact
-        check(None, '{"3": 1}')
-
-    def test_separators(self):
-        lst = [1,2,3,4]
-        expect = '[\n1,\n2,\n3,\n4\n]'
-        expect_spaces = '[\n1, \n2, \n3, \n4\n]'
-        # Ensure that separators still works
-        self.assertEqual(
-            expect_spaces,
-            json.dumps(lst, indent=0, separators=(', ', ': ')))
-        # Force the new defaults
-        self.assertEqual(
-            expect,
-            json.dumps(lst, indent=0, separators=(',', ': ')))
-        # Added in 2.1.4
-        self.assertEqual(
-            expect,
-            json.dumps(lst, indent=0))
diff --git a/lib/simplejson/tests/test_item_sort_key.py b/lib/simplejson/tests/test_item_sort_key.py
deleted file mode 100644
index 98971b86..00000000
--- a/lib/simplejson/tests/test_item_sort_key.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from unittest import TestCase
-
-import simplejson as json
-from operator import itemgetter
-
-class TestItemSortKey(TestCase):
-    def test_simple_first(self):
-        a = {'a': 1, 'c': 5, 'jack': 'jill', 'pick': 'axe', 'array': [1, 5, 6, 9], 'tuple': (83, 12, 3), 'crate': 'dog', 'zeak': 'oh'}
-        self.assertEqual(
-            '{"a": 1, "c": 5, "crate": "dog", "jack": "jill", "pick": "axe", "zeak": "oh", "array": [1, 5, 6, 9], "tuple": [83, 12, 3]}',
-            json.dumps(a, item_sort_key=json.simple_first))
-
-    def test_case(self):
-        a = {'a': 1, 'c': 5, 'Jack': 'jill', 'pick': 'axe', 'Array': [1, 5, 6, 9], 'tuple': (83, 12, 3), 'crate': 'dog', 'zeak': 'oh'}
-        self.assertEqual(
-            '{"Array": [1, 5, 6, 9], "Jack": "jill", "a": 1, "c": 5, "crate": "dog", "pick": "axe", "tuple": [83, 12, 3], "zeak": "oh"}',
-            json.dumps(a, item_sort_key=itemgetter(0)))
-        self.assertEqual(
-            '{"a": 1, "Array": [1, 5, 6, 9], "c": 5, "crate": "dog", "Jack": "jill", "pick": "axe", "tuple": [83, 12, 3], "zeak": "oh"}',
-            json.dumps(a, item_sort_key=lambda kv: kv[0].lower()))
-
-    def test_item_sort_key_value(self):
-        # https://github.com/simplejson/simplejson/issues/173
-        a = {'a': 1, 'b': 0}
-        self.assertEqual(
-            '{"b": 0, "a": 1}',
-            json.dumps(a, item_sort_key=lambda kv: kv[1]))
diff --git a/lib/simplejson/tests/test_iterable.py b/lib/simplejson/tests/test_iterable.py
deleted file mode 100644
index 35d3e759..00000000
--- a/lib/simplejson/tests/test_iterable.py
+++ /dev/null
@@ -1,31 +0,0 @@
-import unittest
-from simplejson.compat import StringIO
-
-import simplejson as json
-
-def iter_dumps(obj, **kw):
-    return ''.join(json.JSONEncoder(**kw).iterencode(obj))
-
-def sio_dump(obj, **kw):
-    sio = StringIO()
-    json.dumps(obj, **kw)
-    return sio.getvalue()
-
-class TestIterable(unittest.TestCase):
-    def test_iterable(self):
-        for l in ([], [1], [1, 2], [1, 2, 3]):
-            for opts in [{}, {'indent': 2}]:
-                for dumps in (json.dumps, iter_dumps, sio_dump):
-                    expect = dumps(l, **opts)
-                    default_expect = dumps(sum(l), **opts)
-                    # Default is False
-                    self.assertRaises(TypeError, dumps, iter(l), **opts)
-                    self.assertRaises(TypeError, dumps, iter(l), iterable_as_array=False, **opts)
-                    self.assertEqual(expect, dumps(iter(l), iterable_as_array=True, **opts))
-                    # Ensure that the "default" gets called
-                    self.assertEqual(default_expect, dumps(iter(l), default=sum, **opts))
-                    self.assertEqual(default_expect, dumps(iter(l), iterable_as_array=False, default=sum, **opts))
-                    # Ensure that the "default" does not get called
-                    self.assertEqual(
-                        expect,
-                        dumps(iter(l), iterable_as_array=True, default=sum, **opts))
diff --git a/lib/simplejson/tests/test_namedtuple.py b/lib/simplejson/tests/test_namedtuple.py
deleted file mode 100644
index cc0f8aa1..00000000
--- a/lib/simplejson/tests/test_namedtuple.py
+++ /dev/null
@@ -1,174 +0,0 @@
-from __future__ import absolute_import
-import unittest
-import simplejson as json
-from simplejson.compat import StringIO
-
-try:
-    from unittest import mock
-except ImportError:
-    mock = None
-
-try:
-    from collections import namedtuple
-except ImportError:
-    class Value(tuple):
-        def __new__(cls, *args):
-            return tuple.__new__(cls, args)
-
-        def _asdict(self):
-            return {'value': self[0]}
-    class Point(tuple):
-        def __new__(cls, *args):
-            return tuple.__new__(cls, args)
-
-        def _asdict(self):
-            return {'x': self[0], 'y': self[1]}
-else:
-    Value = namedtuple('Value', ['value'])
-    Point = namedtuple('Point', ['x', 'y'])
-
-class DuckValue(object):
-    def __init__(self, *args):
-        self.value = Value(*args)
-
-    def _asdict(self):
-        return self.value._asdict()
-
-class DuckPoint(object):
-    def __init__(self, *args):
-        self.point = Point(*args)
-
-    def _asdict(self):
-        return self.point._asdict()
-
-class DeadDuck(object):
-    _asdict = None
-
-class DeadDict(dict):
-    _asdict = None
-
-CONSTRUCTORS = [
-    lambda v: v,
-    lambda v: [v],
-    lambda v: [{'key': v}],
-]
-
-class TestNamedTuple(unittest.TestCase):
-    def test_namedtuple_dumps(self):
-        for v in [Value(1), Point(1, 2), DuckValue(1), DuckPoint(1, 2)]:
-            d = v._asdict()
-            self.assertEqual(d, json.loads(json.dumps(v)))
-            self.assertEqual(
-                d,
-                json.loads(json.dumps(v, namedtuple_as_object=True)))
-            self.assertEqual(d, json.loads(json.dumps(v, tuple_as_array=False)))
-            self.assertEqual(
-                d,
-                json.loads(json.dumps(v, namedtuple_as_object=True,
-                                      tuple_as_array=False)))
-
-    def test_namedtuple_dumps_false(self):
-        for v in [Value(1), Point(1, 2)]:
-            l = list(v)
-            self.assertEqual(
-                l,
-                json.loads(json.dumps(v, namedtuple_as_object=False)))
-            self.assertRaises(TypeError, json.dumps, v,
-                tuple_as_array=False, namedtuple_as_object=False)
-
-    def test_namedtuple_dump(self):
-        for v in [Value(1), Point(1, 2), DuckValue(1), DuckPoint(1, 2)]:
-            d = v._asdict()
-            sio = StringIO()
-            json.dump(v, sio)
-            self.assertEqual(d, json.loads(sio.getvalue()))
-            sio = StringIO()
-            json.dump(v, sio, namedtuple_as_object=True)
-            self.assertEqual(
-                d,
-                json.loads(sio.getvalue()))
-            sio = StringIO()
-            json.dump(v, sio, tuple_as_array=False)
-            self.assertEqual(d, json.loads(sio.getvalue()))
-            sio = StringIO()
-            json.dump(v, sio, namedtuple_as_object=True,
-                      tuple_as_array=False)
-            self.assertEqual(
-                d,
-                json.loads(sio.getvalue()))
-
-    def test_namedtuple_dump_false(self):
-        for v in [Value(1), Point(1, 2)]:
-            l = list(v)
-            sio = StringIO()
-            json.dump(v, sio, namedtuple_as_object=False)
-            self.assertEqual(
-                l,
-                json.loads(sio.getvalue()))
-            self.assertRaises(TypeError, json.dump, v, StringIO(),
-                tuple_as_array=False, namedtuple_as_object=False)
-
-    def test_asdict_not_callable_dump(self):
-        for f in CONSTRUCTORS:
-            self.assertRaises(
-                TypeError,
-                json.dump,
-                f(DeadDuck()),
-                StringIO(),
-                namedtuple_as_object=True
-            )
-            sio = StringIO()
-            json.dump(f(DeadDict()), sio, namedtuple_as_object=True)
-            self.assertEqual(
-                json.dumps(f({})),
-                sio.getvalue())
-            self.assertRaises(
-                TypeError,
-                json.dump,
-                f(Value),
-                StringIO(),
-                namedtuple_as_object=True
-            )
-
-    def test_asdict_not_callable_dumps(self):
-        for f in CONSTRUCTORS:
-            self.assertRaises(TypeError,
-                json.dumps, f(DeadDuck()), namedtuple_as_object=True)
-            self.assertRaises(
-                TypeError,
-                json.dumps,
-                f(Value),
-                namedtuple_as_object=True
-            )
-            self.assertEqual(
-                json.dumps(f({})),
-                json.dumps(f(DeadDict()), namedtuple_as_object=True))
-
-    def test_asdict_unbound_method_dumps(self):
-        for f in CONSTRUCTORS:
-            self.assertEqual(
-                json.dumps(f(Value), default=lambda v: v.__name__),
-                json.dumps(f(Value.__name__))
-            )
-
-    def test_asdict_does_not_return_dict(self):
-        if not mock:
-            if hasattr(unittest, "SkipTest"):
-                raise unittest.SkipTest("unittest.mock required")
-            else:
-                print("unittest.mock not available")
-                return
-        fake = mock.Mock()
-        self.assertTrue(hasattr(fake, '_asdict'))
-        self.assertTrue(callable(fake._asdict))
-        self.assertFalse(isinstance(fake._asdict(), dict))
-        # https://github.com/simplejson/simplejson/pull/284
-        # when running under a debug build of CPython (COPTS=-UNDEBUG)
-        # a C assertion could fire due to an unchecked error of an PyDict
-        # API call on a non-dict internally in _speedups.c.  Without a debug
-        # build of CPython this test likely passes either way despite the
-        # potential for internal data corruption.  Getting it to crash in
-        # a debug build is not always easy either as it requires an
-        # assert(!PyErr_Occurred()) that could fire later on.
-        with self.assertRaises(TypeError):
-            json.dumps({23: fake}, namedtuple_as_object=True, for_json=False)
diff --git a/lib/simplejson/tests/test_pass1.py b/lib/simplejson/tests/test_pass1.py
deleted file mode 100644
index f0b5b10e..00000000
--- a/lib/simplejson/tests/test_pass1.py
+++ /dev/null
@@ -1,71 +0,0 @@
-from unittest import TestCase
-
-import simplejson as json
-
-# from http://json.org/JSON_checker/test/pass1.json
-JSON = r'''
-[
-    "JSON Test Pattern pass1",
-    {"object with 1 member":["array with 1 element"]},
-    {},
-    [],
-    -42,
-    true,
-    false,
-    null,
-    {
-        "integer": 1234567890,
-        "real": -9876.543210,
-        "e": 0.123456789e-12,
-        "E": 1.234567890E+34,
-        "":  23456789012E66,
-        "zero": 0,
-        "one": 1,
-        "space": " ",
-        "quote": "\"",
-        "backslash": "\\",
-        "controls": "\b\f\n\r\t",
-        "slash": "/ & \/",
-        "alpha": "abcdefghijklmnopqrstuvwyz",
-        "ALPHA": "ABCDEFGHIJKLMNOPQRSTUVWYZ",
-        "digit": "0123456789",
-        "special": "`1~!@#$%^&*()_+-={':[,]}|;.</>?",
-        "hex": "\u0123\u4567\u89AB\uCDEF\uabcd\uef4A",
-        "true": true,
-        "false": false,
-        "null": null,
-        "array":[  ],
-        "object":{  },
-        "address": "50 St. James Street",
-        "url": "http://www.JSON.org/",
-        "comment": "// /* <!-- --",
-        "# -- --> */": " ",
-        " s p a c e d " :[1,2 , 3
-
-,
-
-4 , 5        ,          6           ,7        ],"compact": [1,2,3,4,5,6,7],
-        "jsontext": "{\"object with 1 member\":[\"array with 1 element\"]}",
-        "quotes": "&#34; \u0022 %22 0x22 034 &#x22;",
-        "\/\\\"\uCAFE\uBABE\uAB98\uFCDE\ubcda\uef4A\b\f\n\r\t`1~!@#$%^&*()_+-=[]{}|;:',./<>?"
-: "A key can be any string"
-    },
-    0.5 ,98.6
-,
-99.44
-,
-
-1066,
-1e1,
-0.1e1,
-1e-1,
-1e00,2e+00,2e-00
-,"rosebud"]
-'''
-
-class TestPass1(TestCase):
-    def test_parse(self):
-        # test in/out equivalence and parsing
-        res = json.loads(JSON)
-        out = json.dumps(res)
-        self.assertEqual(res, json.loads(out))
diff --git a/lib/simplejson/tests/test_pass2.py b/lib/simplejson/tests/test_pass2.py
deleted file mode 100644
index 5d812b3b..00000000
--- a/lib/simplejson/tests/test_pass2.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from unittest import TestCase
-import simplejson as json
-
-# from http://json.org/JSON_checker/test/pass2.json
-JSON = r'''
-[[[[[[[[[[[[[[[[[[["Not too deep"]]]]]]]]]]]]]]]]]]]
-'''
-
-class TestPass2(TestCase):
-    def test_parse(self):
-        # test in/out equivalence and parsing
-        res = json.loads(JSON)
-        out = json.dumps(res)
-        self.assertEqual(res, json.loads(out))
diff --git a/lib/simplejson/tests/test_pass3.py b/lib/simplejson/tests/test_pass3.py
deleted file mode 100644
index 821d60b2..00000000
--- a/lib/simplejson/tests/test_pass3.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from unittest import TestCase
-
-import simplejson as json
-
-# from http://json.org/JSON_checker/test/pass3.json
-JSON = r'''
-{
-    "JSON Test Pattern pass3": {
-        "The outermost value": "must be an object or array.",
-        "In this test": "It is an object."
-    }
-}
-'''
-
-class TestPass3(TestCase):
-    def test_parse(self):
-        # test in/out equivalence and parsing
-        res = json.loads(JSON)
-        out = json.dumps(res)
-        self.assertEqual(res, json.loads(out))
diff --git a/lib/simplejson/tests/test_raw_json.py b/lib/simplejson/tests/test_raw_json.py
deleted file mode 100644
index 1dfcc2c5..00000000
--- a/lib/simplejson/tests/test_raw_json.py
+++ /dev/null
@@ -1,47 +0,0 @@
-import unittest
-import simplejson as json
-
-dct1 = {
-    'key1': 'value1'
-}
-
-dct2 = {
-    'key2': 'value2',
-    'd1': dct1
-}
-
-dct3 = {
-    'key2': 'value2',
-    'd1': json.dumps(dct1)
-}
-
-dct4 = {
-    'key2': 'value2',
-    'd1': json.RawJSON(json.dumps(dct1))
-}
-
-
-class TestRawJson(unittest.TestCase):
-
-    def test_normal_str(self):
-        self.assertNotEqual(json.dumps(dct2), json.dumps(dct3))
-
-    def test_raw_json_str(self):
-        self.assertEqual(json.dumps(dct2), json.dumps(dct4))
-        self.assertEqual(dct2, json.loads(json.dumps(dct4)))
-
-    def test_list(self):
-        self.assertEqual(
-            json.dumps([dct2]),
-            json.dumps([json.RawJSON(json.dumps(dct2))]))
-        self.assertEqual(
-            [dct2],
-            json.loads(json.dumps([json.RawJSON(json.dumps(dct2))])))
-
-    def test_direct(self):
-        self.assertEqual(
-            json.dumps(dct2),
-            json.dumps(json.RawJSON(json.dumps(dct2))))
-        self.assertEqual(
-            dct2,
-            json.loads(json.dumps(json.RawJSON(json.dumps(dct2)))))
diff --git a/lib/simplejson/tests/test_recursion.py b/lib/simplejson/tests/test_recursion.py
deleted file mode 100644
index 662eb667..00000000
--- a/lib/simplejson/tests/test_recursion.py
+++ /dev/null
@@ -1,67 +0,0 @@
-from unittest import TestCase
-
-import simplejson as json
-
-class JSONTestObject:
-    pass
-
-
-class RecursiveJSONEncoder(json.JSONEncoder):
-    recurse = False
-    def default(self, o):
-        if o is JSONTestObject:
-            if self.recurse:
-                return [JSONTestObject]
-            else:
-                return 'JSONTestObject'
-        return json.JSONEncoder.default(o)
-
-
-class TestRecursion(TestCase):
-    def test_listrecursion(self):
-        x = []
-        x.append(x)
-        try:
-            json.dumps(x)
-        except ValueError:
-            pass
-        else:
-            self.fail("didn't raise ValueError on list recursion")
-        x = []
-        y = [x]
-        x.append(y)
-        try:
-            json.dumps(x)
-        except ValueError:
-            pass
-        else:
-            self.fail("didn't raise ValueError on alternating list recursion")
-        y = []
-        x = [y, y]
-        # ensure that the marker is cleared
-        json.dumps(x)
-
-    def test_dictrecursion(self):
-        x = {}
-        x["test"] = x
-        try:
-            json.dumps(x)
-        except ValueError:
-            pass
-        else:
-            self.fail("didn't raise ValueError on dict recursion")
-        x = {}
-        y = {"a": x, "b": x}
-        # ensure that the marker is cleared
-        json.dumps(y)
-
-    def test_defaultrecursion(self):
-        enc = RecursiveJSONEncoder()
-        self.assertEqual(enc.encode(JSONTestObject), '"JSONTestObject"')
-        enc.recurse = True
-        try:
-            enc.encode(JSONTestObject)
-        except ValueError:
-            pass
-        else:
-            self.fail("didn't raise ValueError on default recursion")
diff --git a/lib/simplejson/tests/test_scanstring.py b/lib/simplejson/tests/test_scanstring.py
deleted file mode 100644
index 1f544834..00000000
--- a/lib/simplejson/tests/test_scanstring.py
+++ /dev/null
@@ -1,200 +0,0 @@
-import sys
-from unittest import TestCase
-
-import simplejson as json
-import simplejson.decoder
-from simplejson.compat import b, PY3
-
-class TestScanString(TestCase):
-    # The bytes type is intentionally not used in most of these tests
-    # under Python 3 because the decoder immediately coerces to str before
-    # calling scanstring. In Python 2 we are testing the code paths
-    # for both unicode and str.
-    #
-    # The reason this is done is because Python 3 would require
-    # entirely different code paths for parsing bytes and str.
-    #
-    def test_py_scanstring(self):
-        self._test_scanstring(simplejson.decoder.py_scanstring)
-
-    def test_c_scanstring(self):
-        if not simplejson.decoder.c_scanstring:
-            return
-        self._test_scanstring(simplejson.decoder.c_scanstring)
-
-        self.assertTrue(isinstance(simplejson.decoder.c_scanstring('""', 0)[0], str))
-
-    def _test_scanstring(self, scanstring):
-        if sys.maxunicode == 65535:
-            self.assertEqual(
-                scanstring(u'"z\U0001d120x"', 1, None, True),
-                (u'z\U0001d120x', 6))
-        else:
-            self.assertEqual(
-                scanstring(u'"z\U0001d120x"', 1, None, True),
-                (u'z\U0001d120x', 5))
-
-        self.assertEqual(
-            scanstring('"\\u007b"', 1, None, True),
-            (u'{', 8))
-
-        self.assertEqual(
-            scanstring('"A JSON payload should be an object or array, not a string."', 1, None, True),
-            (u'A JSON payload should be an object or array, not a string.', 60))
-
-        self.assertEqual(
-            scanstring('["Unclosed array"', 2, None, True),
-            (u'Unclosed array', 17))
-
-        self.assertEqual(
-            scanstring('["extra comma",]', 2, None, True),
-            (u'extra comma', 14))
-
-        self.assertEqual(
-            scanstring('["double extra comma",,]', 2, None, True),
-            (u'double extra comma', 21))
-
-        self.assertEqual(
-            scanstring('["Comma after the close"],', 2, None, True),
-            (u'Comma after the close', 24))
-
-        self.assertEqual(
-            scanstring('["Extra close"]]', 2, None, True),
-            (u'Extra close', 14))
-
-        self.assertEqual(
-            scanstring('{"Extra comma": true,}', 2, None, True),
-            (u'Extra comma', 14))
-
-        self.assertEqual(
-            scanstring('{"Extra value after close": true} "misplaced quoted value"', 2, None, True),
-            (u'Extra value after close', 26))
-
-        self.assertEqual(
-            scanstring('{"Illegal expression": 1 + 2}', 2, None, True),
-            (u'Illegal expression', 21))
-
-        self.assertEqual(
-            scanstring('{"Illegal invocation": alert()}', 2, None, True),
-            (u'Illegal invocation', 21))
-
-        self.assertEqual(
-            scanstring('{"Numbers cannot have leading zeroes": 013}', 2, None, True),
-            (u'Numbers cannot have leading zeroes', 37))
-
-        self.assertEqual(
-            scanstring('{"Numbers cannot be hex": 0x14}', 2, None, True),
-            (u'Numbers cannot be hex', 24))
-
-        self.assertEqual(
-            scanstring('[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]', 21, None, True),
-            (u'Too deep', 30))
-
-        self.assertEqual(
-            scanstring('{"Missing colon" null}', 2, None, True),
-            (u'Missing colon', 16))
-
-        self.assertEqual(
-            scanstring('{"Double colon":: null}', 2, None, True),
-            (u'Double colon', 15))
-
-        self.assertEqual(
-            scanstring('{"Comma instead of colon", null}', 2, None, True),
-            (u'Comma instead of colon', 25))
-
-        self.assertEqual(
-            scanstring('["Colon instead of comma": false]', 2, None, True),
-            (u'Colon instead of comma', 25))
-
-        self.assertEqual(
-            scanstring('["Bad value", truth]', 2, None, True),
-            (u'Bad value', 12))
-
-        for c in map(chr, range(0x00, 0x1f)):
-            self.assertEqual(
-                scanstring(c + '"', 0, None, False),
-                (c, 2))
-            self.assertRaises(
-                ValueError,
-                scanstring, c + '"', 0, None, True)
-
-        self.assertRaises(ValueError, scanstring, '', 0, None, True)
-        self.assertRaises(ValueError, scanstring, 'a', 0, None, True)
-        self.assertRaises(ValueError, scanstring, '\\', 0, None, True)
-        self.assertRaises(ValueError, scanstring, '\\u', 0, None, True)
-        self.assertRaises(ValueError, scanstring, '\\u0', 0, None, True)
-        self.assertRaises(ValueError, scanstring, '\\u01', 0, None, True)
-        self.assertRaises(ValueError, scanstring, '\\u012', 0, None, True)
-        self.assertRaises(ValueError, scanstring, '\\u0123', 0, None, True)
-        if sys.maxunicode > 65535:
-            self.assertRaises(ValueError,
-                              scanstring, '\\ud834\\u"', 0, None, True)
-            self.assertRaises(ValueError,
-                              scanstring, '\\ud834\\x0123"', 0, None, True)
-
-        self.assertRaises(json.JSONDecodeError, scanstring, '\\u-123"', 0, None, True)
-        # SJ-PT-23-01: Invalid Handling of Broken Unicode Escape Sequences
-        self.assertRaises(json.JSONDecodeError, scanstring, '\\u EDD"', 0, None, True)
-
-    def test_issue3623(self):
-        self.assertRaises(ValueError, json.decoder.scanstring, "xxx", 1,
-                          "xxx")
-        self.assertRaises(UnicodeDecodeError,
-                          json.encoder.encode_basestring_ascii, b("xx\xff"))
-
-    def test_overflow(self):
-        # Python 2.5 does not have maxsize, Python 3 does not have maxint
-        maxsize = getattr(sys, 'maxsize', getattr(sys, 'maxint', None))
-        assert maxsize is not None
-        self.assertRaises(OverflowError, json.decoder.scanstring, "xxx",
-                          maxsize + 1)
-
-    def test_surrogates(self):
-        scanstring = json.decoder.scanstring
-
-        def assertScan(given, expect, test_utf8=True):
-            givens = [given]
-            if not PY3 and test_utf8:
-                givens.append(given.encode('utf8'))
-            for given in givens:
-                (res, count) = scanstring(given, 1, None, True)
-                self.assertEqual(len(given), count)
-                self.assertEqual(res, expect)
-
-        assertScan(
-            u'"z\\ud834\\u0079x"',
-            u'z\ud834yx')
-        assertScan(
-            u'"z\\ud834\\udd20x"',
-            u'z\U0001d120x')
-        assertScan(
-            u'"z\\ud834\\ud834\\udd20x"',
-            u'z\ud834\U0001d120x')
-        assertScan(
-            u'"z\\ud834x"',
-            u'z\ud834x')
-        assertScan(
-            u'"z\\udd20x"',
-            u'z\udd20x')
-        assertScan(
-            u'"z\ud834x"',
-            u'z\ud834x')
-        # It may look strange to join strings together, but Python is drunk.
-        # https://gist.github.com/etrepum/5538443
-        assertScan(
-            u'"z\\ud834\udd20x12345"',
-            u''.join([u'z\ud834', u'\udd20x12345']))
-        assertScan(
-            u'"z\ud834\\udd20x"',
-            u''.join([u'z\ud834', u'\udd20x']))
-        # these have different behavior given UTF8 input, because the surrogate
-        # pair may be joined (in maxunicode > 65535 builds)
-        assertScan(
-            u''.join([u'"z\ud834', u'\udd20x"']),
-            u''.join([u'z\ud834', u'\udd20x']),
-            test_utf8=False)
-
-        self.assertRaises(ValueError,
-                          scanstring, u'"z\\ud83x"', 1, None, True)
-        self.assertRaises(ValueError,
-                          scanstring, u'"z\\ud834\\udd2x"', 1, None, True)
diff --git a/lib/simplejson/tests/test_separators.py b/lib/simplejson/tests/test_separators.py
deleted file mode 100644
index 91b4d4fb..00000000
--- a/lib/simplejson/tests/test_separators.py
+++ /dev/null
@@ -1,42 +0,0 @@
-import textwrap
-from unittest import TestCase
-
-import simplejson as json
-
-
-class TestSeparators(TestCase):
-    def test_separators(self):
-        h = [['blorpie'], ['whoops'], [], 'd-shtaeou', 'd-nthiouh', 'i-vhbjkhnth',
-             {'nifty': 87}, {'field': 'yes', 'morefield': False} ]
-
-        expect = textwrap.dedent("""\
-        [
-          [
-            "blorpie"
-          ] ,
-          [
-            "whoops"
-          ] ,
-          [] ,
-          "d-shtaeou" ,
-          "d-nthiouh" ,
-          "i-vhbjkhnth" ,
-          {
-            "nifty" : 87
-          } ,
-          {
-            "field" : "yes" ,
-            "morefield" : false
-          }
-        ]""")
-
-
-        d1 = json.dumps(h)
-        d2 = json.dumps(h, indent='  ', sort_keys=True, separators=(' ,', ' : '))
-
-        h1 = json.loads(d1)
-        h2 = json.loads(d2)
-
-        self.assertEqual(h1, h)
-        self.assertEqual(h2, h)
-        self.assertEqual(d2, expect)
diff --git a/lib/simplejson/tests/test_speedups.py b/lib/simplejson/tests/test_speedups.py
deleted file mode 100644
index 8b146df9..00000000
--- a/lib/simplejson/tests/test_speedups.py
+++ /dev/null
@@ -1,114 +0,0 @@
-from __future__ import with_statement
-
-import sys
-import unittest
-from unittest import TestCase
-
-import simplejson
-from simplejson import encoder, decoder, scanner
-from simplejson.compat import PY3, long_type, b
-
-
-def has_speedups():
-    return encoder.c_make_encoder is not None
-
-
-def skip_if_speedups_missing(func):
-    def wrapper(*args, **kwargs):
-        if not has_speedups():
-            if hasattr(unittest, 'SkipTest'):
-                raise unittest.SkipTest("C Extension not available")
-            else:
-                sys.stdout.write("C Extension not available")
-                return
-        return func(*args, **kwargs)
-
-    return wrapper
-
-
-class BadBool:
-    def __bool__(self):
-        1/0
-    __nonzero__ = __bool__
-
-
-class TestDecode(TestCase):
-    @skip_if_speedups_missing
-    def test_make_scanner(self):
-        self.assertRaises(AttributeError, scanner.c_make_scanner, 1)
-
-    @skip_if_speedups_missing
-    def test_bad_bool_args(self):
-        def test(value):
-            decoder.JSONDecoder(strict=BadBool()).decode(value)
-        self.assertRaises(ZeroDivisionError, test, '""')
-        self.assertRaises(ZeroDivisionError, test, '{}')
-        if not PY3:
-            self.assertRaises(ZeroDivisionError, test, u'""')
-            self.assertRaises(ZeroDivisionError, test, u'{}')
-
-class TestEncode(TestCase):
-    @skip_if_speedups_missing
-    def test_make_encoder(self):
-        self.assertRaises(
-            TypeError,
-            encoder.c_make_encoder,
-            None,
-            ("\xCD\x7D\x3D\x4E\x12\x4C\xF9\x79\xD7"
-             "\x52\xBA\x82\xF2\x27\x4A\x7D\xA0\xCA\x75"),
-            None
-        )
-
-    @skip_if_speedups_missing
-    def test_bad_str_encoder(self):
-        # Issue #31505: There shouldn't be an assertion failure in case
-        # c_make_encoder() receives a bad encoder() argument.
-        import decimal
-        def bad_encoder1(*args):
-            return None
-        enc = encoder.c_make_encoder(
-                None, lambda obj: str(obj),
-                bad_encoder1, None, ': ', ', ',
-                False, False, False, {}, False, False, False,
-                None, None, 'utf-8', False, False, decimal.Decimal, False)
-        self.assertRaises(TypeError, enc, 'spam', 4)
-        self.assertRaises(TypeError, enc, {'spam': 42}, 4)
-
-        def bad_encoder2(*args):
-            1/0
-        enc = encoder.c_make_encoder(
-                None, lambda obj: str(obj),
-                bad_encoder2, None, ': ', ', ',
-                False, False, False, {}, False, False, False,
-                None, None, 'utf-8', False, False, decimal.Decimal, False)
-        self.assertRaises(ZeroDivisionError, enc, 'spam', 4)
-
-    @skip_if_speedups_missing
-    def test_bad_bool_args(self):
-        def test(name):
-            encoder.JSONEncoder(**{name: BadBool()}).encode({})
-        self.assertRaises(ZeroDivisionError, test, 'skipkeys')
-        self.assertRaises(ZeroDivisionError, test, 'ensure_ascii')
-        self.assertRaises(ZeroDivisionError, test, 'check_circular')
-        self.assertRaises(ZeroDivisionError, test, 'allow_nan')
-        self.assertRaises(ZeroDivisionError, test, 'sort_keys')
-        self.assertRaises(ZeroDivisionError, test, 'use_decimal')
-        self.assertRaises(ZeroDivisionError, test, 'namedtuple_as_object')
-        self.assertRaises(ZeroDivisionError, test, 'tuple_as_array')
-        self.assertRaises(ZeroDivisionError, test, 'bigint_as_string')
-        self.assertRaises(ZeroDivisionError, test, 'for_json')
-        self.assertRaises(ZeroDivisionError, test, 'ignore_nan')
-        self.assertRaises(ZeroDivisionError, test, 'iterable_as_array')
-
-    @skip_if_speedups_missing
-    def test_int_as_string_bitcount_overflow(self):
-        long_count = long_type(2)**32+31
-        def test():
-            encoder.JSONEncoder(int_as_string_bitcount=long_count).encode(0)
-        self.assertRaises((TypeError, OverflowError), test)
-
-    if PY3:
-        @skip_if_speedups_missing
-        def test_bad_encoding(self):
-            with self.assertRaises(UnicodeEncodeError):
-                encoder.JSONEncoder(encoding='\udcff').encode({b('key'): 123})
diff --git a/lib/simplejson/tests/test_str_subclass.py b/lib/simplejson/tests/test_str_subclass.py
deleted file mode 100644
index b6c8351f..00000000
--- a/lib/simplejson/tests/test_str_subclass.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from unittest import TestCase
-
-import simplejson
-from simplejson.compat import text_type
-
-# Tests for issue demonstrated in https://github.com/simplejson/simplejson/issues/144
-class WonkyTextSubclass(text_type):
-    def __getslice__(self, start, end):
-        return self.__class__('not what you wanted!')
-
-class TestStrSubclass(TestCase):
-    def test_dump_load(self):
-        for s in ['', '"hello"', 'text', u'\u005c']:
-            self.assertEqual(
-                s,
-                simplejson.loads(simplejson.dumps(WonkyTextSubclass(s))))
-
-            self.assertEqual(
-                s,
-                simplejson.loads(simplejson.dumps(WonkyTextSubclass(s),
-                                                  ensure_ascii=False)))
diff --git a/lib/simplejson/tests/test_subclass.py b/lib/simplejson/tests/test_subclass.py
deleted file mode 100644
index 2bae3b63..00000000
--- a/lib/simplejson/tests/test_subclass.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from unittest import TestCase
-import simplejson as json
-
-from decimal import Decimal
-
-class AlternateInt(int):
-    def __repr__(self):
-        return 'invalid json'
-    __str__ = __repr__
-
-
-class AlternateFloat(float):
-    def __repr__(self):
-        return 'invalid json'
-    __str__ = __repr__
-
-
-# class AlternateDecimal(Decimal):
-#     def __repr__(self):
-#         return 'invalid json'
-
-
-class TestSubclass(TestCase):
-    def test_int(self):
-        self.assertEqual(json.dumps(AlternateInt(1)), '1')
-        self.assertEqual(json.dumps(AlternateInt(-1)), '-1')
-        self.assertEqual(json.loads(json.dumps({AlternateInt(1): 1})), {'1': 1})
-
-    def test_float(self):
-        self.assertEqual(json.dumps(AlternateFloat(1.0)), '1.0')
-        self.assertEqual(json.dumps(AlternateFloat(-1.0)), '-1.0')
-        self.assertEqual(json.loads(json.dumps({AlternateFloat(1.0): 1})), {'1.0': 1})
-
-    # NOTE: Decimal subclasses are not supported as-is
-    # def test_decimal(self):
-    #     self.assertEqual(json.dumps(AlternateDecimal('1.0')), '1.0')
-    #     self.assertEqual(json.dumps(AlternateDecimal('-1.0')), '-1.0')
diff --git a/lib/simplejson/tests/test_tool.py b/lib/simplejson/tests/test_tool.py
deleted file mode 100644
index 914bff8b..00000000
--- a/lib/simplejson/tests/test_tool.py
+++ /dev/null
@@ -1,114 +0,0 @@
-from __future__ import with_statement
-import os
-import sys
-import textwrap
-import unittest
-import subprocess
-import tempfile
-try:
-    # Python 3.x
-    from test.support import strip_python_stderr
-except ImportError:
-    # Python 2.6+
-    try:
-        from test.test_support import strip_python_stderr
-    except ImportError:
-        # Python 2.5
-        import re
-        def strip_python_stderr(stderr):
-            return re.sub(
-                r"\[\d+ refs\]\r?\n?$".encode(),
-                "".encode(),
-                stderr).strip()
-
-def open_temp_file():
-    if sys.version_info >= (2, 6):
-        file = tempfile.NamedTemporaryFile(delete=False)
-        filename = file.name
-    else:
-        fd, filename = tempfile.mkstemp()
-        file = os.fdopen(fd, 'w+b')
-    return file, filename
-
-class TestTool(unittest.TestCase):
-    data = """
-
-        [["blorpie"],[ "whoops" ] , [
-                                 ],\t"d-shtaeou",\r"d-nthiouh",
-        "i-vhbjkhnth", {"nifty":87}, {"morefield" :\tfalse,"field"
-            :"yes"}  ]
-           """
-
-    expect = textwrap.dedent("""\
-    [
-        [
-            "blorpie"
-        ],
-        [
-            "whoops"
-        ],
-        [],
-        "d-shtaeou",
-        "d-nthiouh",
-        "i-vhbjkhnth",
-        {
-            "nifty": 87
-        },
-        {
-            "field": "yes",
-            "morefield": false
-        }
-    ]
-    """)
-
-    def runTool(self, args=None, data=None):
-        argv = [sys.executable, '-m', 'simplejson.tool']
-        if args:
-            argv.extend(args)
-        proc = subprocess.Popen(argv,
-                                stdin=subprocess.PIPE,
-                                stderr=subprocess.PIPE,
-                                stdout=subprocess.PIPE)
-        out, err = proc.communicate(data)
-        self.assertEqual(strip_python_stderr(err), ''.encode())
-        self.assertEqual(proc.returncode, 0)
-        return out.decode('utf8').splitlines()
-
-    def test_stdin_stdout(self):
-        self.assertEqual(
-            self.runTool(data=self.data.encode()),
-            self.expect.splitlines())
-
-    def test_infile_stdout(self):
-        infile, infile_name = open_temp_file()
-        try:
-            infile.write(self.data.encode())
-            infile.close()
-            self.assertEqual(
-                self.runTool(args=[infile_name]),
-                self.expect.splitlines())
-        finally:
-            os.unlink(infile_name)
-
-    def test_infile_outfile(self):
-        infile, infile_name = open_temp_file()
-        try:
-            infile.write(self.data.encode())
-            infile.close()
-            # outfile will get overwritten by tool, so the delete
-            # may not work on some platforms. Do it manually.
-            outfile, outfile_name = open_temp_file()
-            try:
-                outfile.close()
-                self.assertEqual(
-                    self.runTool(args=[infile_name, outfile_name]),
-                    [])
-                with open(outfile_name, 'rb') as f:
-                    self.assertEqual(
-                        f.read().decode('utf8').splitlines(),
-                        self.expect.splitlines()
-                    )
-            finally:
-                os.unlink(outfile_name)
-        finally:
-            os.unlink(infile_name)
diff --git a/lib/simplejson/tests/test_tuple.py b/lib/simplejson/tests/test_tuple.py
deleted file mode 100644
index 4ad7b0e8..00000000
--- a/lib/simplejson/tests/test_tuple.py
+++ /dev/null
@@ -1,47 +0,0 @@
-import unittest
-
-from simplejson.compat import StringIO
-import simplejson as json
-
-class TestTuples(unittest.TestCase):
-    def test_tuple_array_dumps(self):
-        t = (1, 2, 3)
-        expect = json.dumps(list(t))
-        # Default is True
-        self.assertEqual(expect, json.dumps(t))
-        self.assertEqual(expect, json.dumps(t, tuple_as_array=True))
-        self.assertRaises(TypeError, json.dumps, t, tuple_as_array=False)
-        # Ensure that the "default" does not get called
-        self.assertEqual(expect, json.dumps(t, default=repr))
-        self.assertEqual(expect, json.dumps(t, tuple_as_array=True,
-                                            default=repr))
-        # Ensure that the "default" gets called
-        self.assertEqual(
-            json.dumps(repr(t)),
-            json.dumps(t, tuple_as_array=False, default=repr))
-
-    def test_tuple_array_dump(self):
-        t = (1, 2, 3)
-        expect = json.dumps(list(t))
-        # Default is True
-        sio = StringIO()
-        json.dump(t, sio)
-        self.assertEqual(expect, sio.getvalue())
-        sio = StringIO()
-        json.dump(t, sio, tuple_as_array=True)
-        self.assertEqual(expect, sio.getvalue())
-        self.assertRaises(TypeError, json.dump, t, StringIO(),
-                          tuple_as_array=False)
-        # Ensure that the "default" does not get called
-        sio = StringIO()
-        json.dump(t, sio, default=repr)
-        self.assertEqual(expect, sio.getvalue())
-        sio = StringIO()
-        json.dump(t, sio, tuple_as_array=True, default=repr)
-        self.assertEqual(expect, sio.getvalue())
-        # Ensure that the "default" gets called
-        sio = StringIO()
-        json.dump(t, sio, tuple_as_array=False, default=repr)
-        self.assertEqual(
-            json.dumps(repr(t)),
-            sio.getvalue())
diff --git a/lib/simplejson/tests/test_unicode.py b/lib/simplejson/tests/test_unicode.py
deleted file mode 100644
index 0c7b1a6c..00000000
--- a/lib/simplejson/tests/test_unicode.py
+++ /dev/null
@@ -1,154 +0,0 @@
-import sys
-import codecs
-from unittest import TestCase
-
-import simplejson as json
-from simplejson.compat import unichr, text_type, b, BytesIO
-
-class TestUnicode(TestCase):
-    def test_encoding1(self):
-        encoder = json.JSONEncoder(encoding='utf-8')
-        u = u'\N{GREEK SMALL LETTER ALPHA}\N{GREEK CAPITAL LETTER OMEGA}'
-        s = u.encode('utf-8')
-        ju = encoder.encode(u)
-        js = encoder.encode(s)
-        self.assertEqual(ju, js)
-
-    def test_encoding2(self):
-        u = u'\N{GREEK SMALL LETTER ALPHA}\N{GREEK CAPITAL LETTER OMEGA}'
-        s = u.encode('utf-8')
-        ju = json.dumps(u, encoding='utf-8')
-        js = json.dumps(s, encoding='utf-8')
-        self.assertEqual(ju, js)
-
-    def test_encoding3(self):
-        u = u'\N{GREEK SMALL LETTER ALPHA}\N{GREEK CAPITAL LETTER OMEGA}'
-        j = json.dumps(u)
-        self.assertEqual(j, '"\\u03b1\\u03a9"')
-
-    def test_encoding4(self):
-        u = u'\N{GREEK SMALL LETTER ALPHA}\N{GREEK CAPITAL LETTER OMEGA}'
-        j = json.dumps([u])
-        self.assertEqual(j, '["\\u03b1\\u03a9"]')
-
-    def test_encoding5(self):
-        u = u'\N{GREEK SMALL LETTER ALPHA}\N{GREEK CAPITAL LETTER OMEGA}'
-        j = json.dumps(u, ensure_ascii=False)
-        self.assertEqual(j, u'"' + u + u'"')
-
-    def test_encoding6(self):
-        u = u'\N{GREEK SMALL LETTER ALPHA}\N{GREEK CAPITAL LETTER OMEGA}'
-        j = json.dumps([u], ensure_ascii=False)
-        self.assertEqual(j, u'["' + u + u'"]')
-
-    def test_big_unicode_encode(self):
-        u = u'\U0001d120'
-        self.assertEqual(json.dumps(u), '"\\ud834\\udd20"')
-        self.assertEqual(json.dumps(u, ensure_ascii=False), u'"\U0001d120"')
-
-    def test_big_unicode_decode(self):
-        u = u'z\U0001d120x'
-        self.assertEqual(json.loads('"' + u + '"'), u)
-        self.assertEqual(json.loads('"z\\ud834\\udd20x"'), u)
-
-    def test_unicode_decode(self):
-        for i in range(0, 0xd7ff):
-            u = unichr(i)
-            #s = '"\\u{0:04x}"'.format(i)
-            s = '"\\u%04x"' % (i,)
-            self.assertEqual(json.loads(s), u)
-
-    def test_object_pairs_hook_with_unicode(self):
-        s = u'{"xkd":1, "kcw":2, "art":3, "hxm":4, "qrt":5, "pad":6, "hoy":7}'
-        p = [(u"xkd", 1), (u"kcw", 2), (u"art", 3), (u"hxm", 4),
-             (u"qrt", 5), (u"pad", 6), (u"hoy", 7)]
-        self.assertEqual(json.loads(s), eval(s))
-        self.assertEqual(json.loads(s, object_pairs_hook=lambda x: x), p)
-        od = json.loads(s, object_pairs_hook=json.OrderedDict)
-        self.assertEqual(od, json.OrderedDict(p))
-        self.assertEqual(type(od), json.OrderedDict)
-        # the object_pairs_hook takes priority over the object_hook
-        self.assertEqual(json.loads(s,
-                                    object_pairs_hook=json.OrderedDict,
-                                    object_hook=lambda x: None),
-                         json.OrderedDict(p))
-
-
-    def test_default_encoding(self):
-        self.assertEqual(json.loads(u'{"a": "\xe9"}'.encode('utf-8')),
-            {'a': u'\xe9'})
-
-    def test_unicode_preservation(self):
-        self.assertEqual(type(json.loads(u'""')), text_type)
-        self.assertEqual(type(json.loads(u'"a"')), text_type)
-        self.assertEqual(type(json.loads(u'["a"]')[0]), text_type)
-
-    def test_ensure_ascii_false_returns_unicode(self):
-        # http://code.google.com/p/simplejson/issues/detail?id=48
-        self.assertEqual(type(json.dumps([], ensure_ascii=False)), text_type)
-        self.assertEqual(type(json.dumps(0, ensure_ascii=False)), text_type)
-        self.assertEqual(type(json.dumps({}, ensure_ascii=False)), text_type)
-        self.assertEqual(type(json.dumps("", ensure_ascii=False)), text_type)
-
-    def test_ensure_ascii_false_bytestring_encoding(self):
-        # http://code.google.com/p/simplejson/issues/detail?id=48
-        doc1 = {u'quux': b('Arr\xc3\xaat sur images')}
-        doc2 = {u'quux': u'Arr\xeat sur images'}
-        doc_ascii = '{"quux": "Arr\\u00eat sur images"}'
-        doc_unicode = u'{"quux": "Arr\xeat sur images"}'
-        self.assertEqual(json.dumps(doc1), doc_ascii)
-        self.assertEqual(json.dumps(doc2), doc_ascii)
-        self.assertEqual(json.dumps(doc1, ensure_ascii=False), doc_unicode)
-        self.assertEqual(json.dumps(doc2, ensure_ascii=False), doc_unicode)
-
-    def test_ensure_ascii_linebreak_encoding(self):
-        # http://timelessrepo.com/json-isnt-a-javascript-subset
-        s1 = u'\u2029\u2028'
-        s2 = s1.encode('utf8')
-        expect = '"\\u2029\\u2028"'
-        expect_non_ascii = u'"\u2029\u2028"'
-        self.assertEqual(json.dumps(s1), expect)
-        self.assertEqual(json.dumps(s2), expect)
-        self.assertEqual(json.dumps(s1, ensure_ascii=False), expect_non_ascii)
-        self.assertEqual(json.dumps(s2, ensure_ascii=False), expect_non_ascii)
-
-    def test_invalid_escape_sequences(self):
-        # incomplete escape sequence
-        self.assertRaises(json.JSONDecodeError, json.loads, '"\\u')
-        self.assertRaises(json.JSONDecodeError, json.loads, '"\\u1')
-        self.assertRaises(json.JSONDecodeError, json.loads, '"\\u12')
-        self.assertRaises(json.JSONDecodeError, json.loads, '"\\u123')
-        self.assertRaises(json.JSONDecodeError, json.loads, '"\\u1234')
-        # invalid escape sequence
-        self.assertRaises(json.JSONDecodeError, json.loads, '"\\u123x"')
-        self.assertRaises(json.JSONDecodeError, json.loads, '"\\u12x4"')
-        self.assertRaises(json.JSONDecodeError, json.loads, '"\\u1x34"')
-        self.assertRaises(json.JSONDecodeError, json.loads, '"\\ux234"')
-        if sys.maxunicode > 65535:
-            # invalid escape sequence for low surrogate
-            self.assertRaises(json.JSONDecodeError, json.loads, '"\\ud800\\u"')
-            self.assertRaises(json.JSONDecodeError, json.loads, '"\\ud800\\u0"')
-            self.assertRaises(json.JSONDecodeError, json.loads, '"\\ud800\\u00"')
-            self.assertRaises(json.JSONDecodeError, json.loads, '"\\ud800\\u000"')
-            self.assertRaises(json.JSONDecodeError, json.loads, '"\\ud800\\u000x"')
-            self.assertRaises(json.JSONDecodeError, json.loads, '"\\ud800\\u00x0"')
-            self.assertRaises(json.JSONDecodeError, json.loads, '"\\ud800\\u0x00"')
-            self.assertRaises(json.JSONDecodeError, json.loads, '"\\ud800\\ux000"')
-
-    def test_ensure_ascii_still_works(self):
-        # in the ascii range, ensure that everything is the same
-        for c in map(unichr, range(0, 127)):
-            self.assertEqual(
-                json.dumps(c, ensure_ascii=False),
-                json.dumps(c))
-        snowman = u'\N{SNOWMAN}'
-        self.assertEqual(
-            json.dumps(c, ensure_ascii=False),
-            '"' + c + '"')
-
-    def test_strip_bom(self):
-        content = u"\u3053\u3093\u306b\u3061\u308f"
-        json_doc = codecs.BOM_UTF8 + b(json.dumps(content))
-        self.assertEqual(json.load(BytesIO(json_doc)), content)
-        for doc in json_doc, json_doc.decode('utf8'):
-            self.assertEqual(json.loads(doc), content)
diff --git a/lib/simplejson/tool.py b/lib/simplejson/tool.py
deleted file mode 100644
index 062e8e2c..00000000
--- a/lib/simplejson/tool.py
+++ /dev/null
@@ -1,42 +0,0 @@
-r"""Command-line tool to validate and pretty-print JSON
-
-Usage::
-
-    $ echo '{"json":"obj"}' | python -m simplejson.tool
-    {
-        "json": "obj"
-    }
-    $ echo '{ 1.2:3.4}' | python -m simplejson.tool
-    Expecting property name: line 1 column 2 (char 2)
-
-"""
-from __future__ import with_statement
-import sys
-import simplejson as json
-
-def main():
-    if len(sys.argv) == 1:
-        infile = sys.stdin
-        outfile = sys.stdout
-    elif len(sys.argv) == 2:
-        infile = open(sys.argv[1], 'r')
-        outfile = sys.stdout
-    elif len(sys.argv) == 3:
-        infile = open(sys.argv[1], 'r')
-        outfile = open(sys.argv[2], 'w')
-    else:
-        raise SystemExit(sys.argv[0] + " [infile [outfile]]")
-    with infile:
-        try:
-            obj = json.load(infile,
-                            object_pairs_hook=json.OrderedDict,
-                            use_decimal=True)
-        except ValueError:
-            raise SystemExit(sys.exc_info()[1])
-    with outfile:
-        json.dump(obj, outfile, sort_keys=True, indent='    ', use_decimal=True)
-        outfile.write('\n')
-
-
-if __name__ == '__main__':
-    main()
diff --git a/lib/six.py b/lib/six.py
index 4e15675d..019130f7 100644
--- a/lib/six.py
+++ b/lib/six.py
@@ -1,4 +1,6 @@
-# Copyright (c) 2010-2020 Benjamin Peterson
+"""Utilities for writing code that runs on Python 2 and 3"""
+
+# Copyright (c) 2010-2014 Benjamin Peterson
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -18,24 +20,17 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-"""Utilities for writing code that runs on Python 2 and 3"""
-
-from __future__ import absolute_import
-
-import functools
-import itertools
 import operator
 import sys
 import types
 
 __author__ = "Benjamin Peterson <benjamin@python.org>"
-__version__ = "1.16.0"
+__version__ = "1.6.1"
 
 
 # Useful for very coarse version differentiation.
 PY2 = sys.version_info[0] == 2
 PY3 = sys.version_info[0] == 3
-PY34 = sys.version_info[0:2] >= (3, 4)
 
 if PY3:
     string_types = str,
@@ -58,7 +53,6 @@ else:
     else:
         # It's possible to have sizeof(long) != sizeof(Py_ssize_t).
         class X(object):
-
             def __len__(self):
                 return 1 << 31
         try:
@@ -71,11 +65,6 @@ else:
             MAXSIZE = int((1 << 63) - 1)
         del X
 
-if PY34:
-    from importlib.util import spec_from_loader
-else:
-    spec_from_loader = None
-
 
 def _add_doc(func, doc):
     """Add documentation to a function."""
@@ -94,14 +83,14 @@ class _LazyDescr(object):
         self.name = name
 
     def __get__(self, obj, tp):
-        result = self._resolve()
-        setattr(obj, self.name, result)  # Invokes __set__.
         try:
-            # This is a bit ugly, but it avoids running this again by
-            # removing this descriptor.
-            delattr(obj.__class__, self.name)
-        except AttributeError:
-            pass
+            result = self._resolve()
+        except ImportError:
+            # See the nice big comment in MovedModule.__getattr__.
+            raise AttributeError("%s could not be imported " % self.name)
+        setattr(obj, self.name, result) # Invokes __set__.
+        # This is a bit ugly, but it avoids running this again.
+        delattr(obj.__class__, self.name)
         return result
 
 
@@ -120,7 +109,22 @@ class MovedModule(_LazyDescr):
         return _import_module(self.mod)
 
     def __getattr__(self, attr):
-        _module = self._resolve()
+        # It turns out many Python frameworks like to traverse sys.modules and
+        # try to load various attributes. This causes problems if this is a
+        # platform-specific module on the wrong platform, like _winreg on
+        # Unixes. Therefore, we silently pretend unimportable modules do not
+        # have any attributes. See issues #51, #53, #56, and #63 for the full
+        # tales of woe.
+        #
+        # First, if possible, avoid loading the module just to look at __file__,
+        # __name__, or __path__.
+        if (attr in ("__file__", "__name__", "__path__") and
+            self.mod not in sys.modules):
+            raise AttributeError(attr)
+        try:
+            _module = self._resolve()
+        except ImportError:
+            raise AttributeError(attr)
         value = getattr(_module, attr)
         setattr(self, attr, value)
         return value
@@ -166,86 +170,9 @@ class MovedAttribute(_LazyDescr):
         return getattr(module, self.attr)
 
 
-class _SixMetaPathImporter(object):
-
-    """
-    A meta path importer to import six.moves and its submodules.
-
-    This class implements a PEP302 finder and loader. It should be compatible
-    with Python 2.5 and all existing versions of Python3
-    """
-
-    def __init__(self, six_module_name):
-        self.name = six_module_name
-        self.known_modules = {}
-
-    def _add_module(self, mod, *fullnames):
-        for fullname in fullnames:
-            self.known_modules[self.name + "." + fullname] = mod
-
-    def _get_module(self, fullname):
-        return self.known_modules[self.name + "." + fullname]
-
-    def find_module(self, fullname, path=None):
-        if fullname in self.known_modules:
-            return self
-        return None
-
-    def find_spec(self, fullname, path, target=None):
-        if fullname in self.known_modules:
-            return spec_from_loader(fullname, self)
-        return None
-
-    def __get_module(self, fullname):
-        try:
-            return self.known_modules[fullname]
-        except KeyError:
-            raise ImportError("This loader does not know module " + fullname)
-
-    def load_module(self, fullname):
-        try:
-            # in case of a reload
-            return sys.modules[fullname]
-        except KeyError:
-            pass
-        mod = self.__get_module(fullname)
-        if isinstance(mod, MovedModule):
-            mod = mod._resolve()
-        else:
-            mod.__loader__ = self
-        sys.modules[fullname] = mod
-        return mod
-
-    def is_package(self, fullname):
-        """
-        Return true, if the named module is a package.
-
-        We need this method to get correct spec objects with
-        Python 3.4 (see PEP451)
-        """
-        return hasattr(self.__get_module(fullname), "__path__")
-
-    def get_code(self, fullname):
-        """Return None
-
-        Required, if is_package is implemented"""
-        self.__get_module(fullname)  # eventually raises ImportError
-        return None
-    get_source = get_code  # same as get_code
-
-    def create_module(self, spec):
-        return self.load_module(spec.name)
-
-    def exec_module(self, module):
-        pass
-
-_importer = _SixMetaPathImporter(__name__)
-
 
 class _MovedItems(_LazyModule):
-
     """Lazy loading of moved objects"""
-    __path__ = []  # mark as package
 
 
 _moved_attributes = [
@@ -253,39 +180,28 @@ _moved_attributes = [
     MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"),
     MovedAttribute("filterfalse", "itertools", "itertools", "ifilterfalse", "filterfalse"),
     MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
-    MovedAttribute("intern", "__builtin__", "sys"),
     MovedAttribute("map", "itertools", "builtins", "imap", "map"),
-    MovedAttribute("getcwd", "os", "os", "getcwdu", "getcwd"),
-    MovedAttribute("getcwdb", "os", "os", "getcwd", "getcwdb"),
-    MovedAttribute("getoutput", "commands", "subprocess"),
     MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
-    MovedAttribute("reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"),
+    MovedAttribute("reload_module", "__builtin__", "imp", "reload"),
     MovedAttribute("reduce", "__builtin__", "functools"),
-    MovedAttribute("shlex_quote", "pipes", "shlex", "quote"),
     MovedAttribute("StringIO", "StringIO", "io"),
-    MovedAttribute("UserDict", "UserDict", "collections"),
-    MovedAttribute("UserList", "UserList", "collections"),
     MovedAttribute("UserString", "UserString", "collections"),
     MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
     MovedAttribute("zip", "itertools", "builtins", "izip", "zip"),
     MovedAttribute("zip_longest", "itertools", "itertools", "izip_longest", "zip_longest"),
+
     MovedModule("builtins", "__builtin__"),
     MovedModule("configparser", "ConfigParser"),
-    MovedModule("collections_abc", "collections", "collections.abc" if sys.version_info >= (3, 3) else "collections"),
     MovedModule("copyreg", "copy_reg"),
     MovedModule("dbm_gnu", "gdbm", "dbm.gnu"),
-    MovedModule("dbm_ndbm", "dbm", "dbm.ndbm"),
-    MovedModule("_dummy_thread", "dummy_thread", "_dummy_thread" if sys.version_info < (3, 9) else "_thread"),
     MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
     MovedModule("http_cookies", "Cookie", "http.cookies"),
     MovedModule("html_entities", "htmlentitydefs", "html.entities"),
     MovedModule("html_parser", "HTMLParser", "html.parser"),
     MovedModule("http_client", "httplib", "http.client"),
-    MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
-    MovedModule("email_mime_image", "email.MIMEImage", "email.mime.image"),
     MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"),
-    MovedModule("email_mime_nonmultipart", "email.MIMENonMultipart", "email.mime.nonmultipart"),
     MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"),
+    MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
     MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),
     MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
     MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),
@@ -317,28 +233,21 @@ _moved_attributes = [
     MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"),
     MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
     MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"),
-    MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"),
+    MovedModule("xmlrpc_server", "xmlrpclib", "xmlrpc.server"),
+    MovedModule("winreg", "_winreg"),
 ]
-# Add windows specific modules.
-if sys.platform == "win32":
-    _moved_attributes += [
-        MovedModule("winreg", "_winreg"),
-    ]
-
 for attr in _moved_attributes:
     setattr(_MovedItems, attr.name, attr)
     if isinstance(attr, MovedModule):
-        _importer._add_module(attr, "moves." + attr.name)
+        sys.modules[__name__ + ".moves." + attr.name] = attr
 del attr
 
 _MovedItems._moved_attributes = _moved_attributes
 
-moves = _MovedItems(__name__ + ".moves")
-_importer._add_module(moves, "moves")
+moves = sys.modules[__name__ + ".moves"] = _MovedItems(__name__ + ".moves")
 
 
 class Module_six_moves_urllib_parse(_LazyModule):
-
     """Lazy loading of moved objects in six.moves.urllib_parse"""
 
 
@@ -357,17 +266,8 @@ _urllib_parse_moved_attributes = [
     MovedAttribute("quote_plus", "urllib", "urllib.parse"),
     MovedAttribute("unquote", "urllib", "urllib.parse"),
     MovedAttribute("unquote_plus", "urllib", "urllib.parse"),
-    MovedAttribute("unquote_to_bytes", "urllib", "urllib.parse", "unquote", "unquote_to_bytes"),
     MovedAttribute("urlencode", "urllib", "urllib.parse"),
     MovedAttribute("splitquery", "urllib", "urllib.parse"),
-    MovedAttribute("splittag", "urllib", "urllib.parse"),
-    MovedAttribute("splituser", "urllib", "urllib.parse"),
-    MovedAttribute("splitvalue", "urllib", "urllib.parse"),
-    MovedAttribute("uses_fragment", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_netloc", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_params", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_query", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_relative", "urlparse", "urllib.parse"),
 ]
 for attr in _urllib_parse_moved_attributes:
     setattr(Module_six_moves_urllib_parse, attr.name, attr)
@@ -375,12 +275,10 @@ del attr
 
 Module_six_moves_urllib_parse._moved_attributes = _urllib_parse_moved_attributes
 
-_importer._add_module(Module_six_moves_urllib_parse(__name__ + ".moves.urllib_parse"),
-                      "moves.urllib_parse", "moves.urllib.parse")
+sys.modules[__name__ + ".moves.urllib_parse"] = sys.modules[__name__ + ".moves.urllib.parse"] = Module_six_moves_urllib_parse(__name__ + ".moves.urllib_parse")
 
 
 class Module_six_moves_urllib_error(_LazyModule):
-
     """Lazy loading of moved objects in six.moves.urllib_error"""
 
 
@@ -395,12 +293,10 @@ del attr
 
 Module_six_moves_urllib_error._moved_attributes = _urllib_error_moved_attributes
 
-_importer._add_module(Module_six_moves_urllib_error(__name__ + ".moves.urllib.error"),
-                      "moves.urllib_error", "moves.urllib.error")
+sys.modules[__name__ + ".moves.urllib_error"] = sys.modules[__name__ + ".moves.urllib.error"] = Module_six_moves_urllib_error(__name__ + ".moves.urllib.error")
 
 
 class Module_six_moves_urllib_request(_LazyModule):
-
     """Lazy loading of moved objects in six.moves.urllib_request"""
 
 
@@ -438,8 +334,6 @@ _urllib_request_moved_attributes = [
     MovedAttribute("URLopener", "urllib", "urllib.request"),
     MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
     MovedAttribute("proxy_bypass", "urllib", "urllib.request"),
-    MovedAttribute("parse_http_list", "urllib2", "urllib.request"),
-    MovedAttribute("parse_keqv_list", "urllib2", "urllib.request"),
 ]
 for attr in _urllib_request_moved_attributes:
     setattr(Module_six_moves_urllib_request, attr.name, attr)
@@ -447,12 +341,10 @@ del attr
 
 Module_six_moves_urllib_request._moved_attributes = _urllib_request_moved_attributes
 
-_importer._add_module(Module_six_moves_urllib_request(__name__ + ".moves.urllib.request"),
-                      "moves.urllib_request", "moves.urllib.request")
+sys.modules[__name__ + ".moves.urllib_request"] = sys.modules[__name__ + ".moves.urllib.request"] = Module_six_moves_urllib_request(__name__ + ".moves.urllib.request")
 
 
 class Module_six_moves_urllib_response(_LazyModule):
-
     """Lazy loading of moved objects in six.moves.urllib_response"""
 
 
@@ -468,12 +360,10 @@ del attr
 
 Module_six_moves_urllib_response._moved_attributes = _urllib_response_moved_attributes
 
-_importer._add_module(Module_six_moves_urllib_response(__name__ + ".moves.urllib.response"),
-                      "moves.urllib_response", "moves.urllib.response")
+sys.modules[__name__ + ".moves.urllib_response"] = sys.modules[__name__ + ".moves.urllib.response"] = Module_six_moves_urllib_response(__name__ + ".moves.urllib.response")
 
 
 class Module_six_moves_urllib_robotparser(_LazyModule):
-
     """Lazy loading of moved objects in six.moves.urllib_robotparser"""
 
 
@@ -486,25 +376,22 @@ del attr
 
 Module_six_moves_urllib_robotparser._moved_attributes = _urllib_robotparser_moved_attributes
 
-_importer._add_module(Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib.robotparser"),
-                      "moves.urllib_robotparser", "moves.urllib.robotparser")
+sys.modules[__name__ + ".moves.urllib_robotparser"] = sys.modules[__name__ + ".moves.urllib.robotparser"] = Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib.robotparser")
 
 
 class Module_six_moves_urllib(types.ModuleType):
-
     """Create a six.moves.urllib namespace that resembles the Python 3 namespace"""
-    __path__ = []  # mark as package
-    parse = _importer._get_module("moves.urllib_parse")
-    error = _importer._get_module("moves.urllib_error")
-    request = _importer._get_module("moves.urllib_request")
-    response = _importer._get_module("moves.urllib_response")
-    robotparser = _importer._get_module("moves.urllib_robotparser")
+    parse = sys.modules[__name__ + ".moves.urllib_parse"]
+    error = sys.modules[__name__ + ".moves.urllib_error"]
+    request = sys.modules[__name__ + ".moves.urllib_request"]
+    response = sys.modules[__name__ + ".moves.urllib_response"]
+    robotparser = sys.modules[__name__ + ".moves.urllib_robotparser"]
 
     def __dir__(self):
         return ['parse', 'error', 'request', 'response', 'robotparser']
 
-_importer._add_module(Module_six_moves_urllib(__name__ + ".moves.urllib"),
-                      "moves.urllib")
+
+sys.modules[__name__ + ".moves.urllib"] = Module_six_moves_urllib(__name__ + ".moves.urllib")
 
 
 def add_move(move):
@@ -531,6 +418,11 @@ if PY3:
     _func_code = "__code__"
     _func_defaults = "__defaults__"
     _func_globals = "__globals__"
+
+    _iterkeys = "keys"
+    _itervalues = "values"
+    _iteritems = "items"
+    _iterlists = "lists"
 else:
     _meth_func = "im_func"
     _meth_self = "im_self"
@@ -540,6 +432,11 @@ else:
     _func_defaults = "func_defaults"
     _func_globals = "func_globals"
 
+    _iterkeys = "iterkeys"
+    _itervalues = "itervalues"
+    _iteritems = "iteritems"
+    _iterlists = "iterlists"
+
 
 try:
     advance_iterator = next
@@ -562,9 +459,6 @@ if PY3:
 
     create_bound_method = types.MethodType
 
-    def create_unbound_method(func, cls):
-        return func
-
     Iterator = object
 else:
     def get_unbound_function(unbound):
@@ -573,9 +467,6 @@ else:
     def create_bound_method(func, obj):
         return types.MethodType(func, obj, obj.__class__)
 
-    def create_unbound_method(func, cls):
-        return types.MethodType(func, None, cls)
-
     class Iterator(object):
 
         def next(self):
@@ -594,132 +485,69 @@ get_function_defaults = operator.attrgetter(_func_defaults)
 get_function_globals = operator.attrgetter(_func_globals)
 
 
-if PY3:
-    def iterkeys(d, **kw):
-        return iter(d.keys(**kw))
+def iterkeys(d, **kw):
+    """Return an iterator over the keys of a dictionary."""
+    return iter(getattr(d, _iterkeys)(**kw))
 
-    def itervalues(d, **kw):
-        return iter(d.values(**kw))
+def itervalues(d, **kw):
+    """Return an iterator over the values of a dictionary."""
+    return iter(getattr(d, _itervalues)(**kw))
 
-    def iteritems(d, **kw):
-        return iter(d.items(**kw))
+def iteritems(d, **kw):
+    """Return an iterator over the (key, value) pairs of a dictionary."""
+    return iter(getattr(d, _iteritems)(**kw))
 
-    def iterlists(d, **kw):
-        return iter(d.lists(**kw))
-
-    viewkeys = operator.methodcaller("keys")
-
-    viewvalues = operator.methodcaller("values")
-
-    viewitems = operator.methodcaller("items")
-else:
-    def iterkeys(d, **kw):
-        return d.iterkeys(**kw)
-
-    def itervalues(d, **kw):
-        return d.itervalues(**kw)
-
-    def iteritems(d, **kw):
-        return d.iteritems(**kw)
-
-    def iterlists(d, **kw):
-        return d.iterlists(**kw)
-
-    viewkeys = operator.methodcaller("viewkeys")
-
-    viewvalues = operator.methodcaller("viewvalues")
-
-    viewitems = operator.methodcaller("viewitems")
-
-_add_doc(iterkeys, "Return an iterator over the keys of a dictionary.")
-_add_doc(itervalues, "Return an iterator over the values of a dictionary.")
-_add_doc(iteritems,
-         "Return an iterator over the (key, value) pairs of a dictionary.")
-_add_doc(iterlists,
-         "Return an iterator over the (key, [values]) pairs of a dictionary.")
+def iterlists(d, **kw):
+    """Return an iterator over the (key, [values]) pairs of a dictionary."""
+    return iter(getattr(d, _iterlists)(**kw))
 
 
 if PY3:
     def b(s):
         return s.encode("latin-1")
-
     def u(s):
         return s
     unichr = chr
-    import struct
-    int2byte = struct.Struct(">B").pack
-    del struct
+    if sys.version_info[1] <= 1:
+        def int2byte(i):
+            return bytes((i,))
+    else:
+        # This is about 2x faster than the implementation above on 3.2+
+        int2byte = operator.methodcaller("to_bytes", 1, "big")
     byte2int = operator.itemgetter(0)
     indexbytes = operator.getitem
     iterbytes = iter
     import io
     StringIO = io.StringIO
     BytesIO = io.BytesIO
-    del io
-    _assertCountEqual = "assertCountEqual"
-    if sys.version_info[1] <= 1:
-        _assertRaisesRegex = "assertRaisesRegexp"
-        _assertRegex = "assertRegexpMatches"
-        _assertNotRegex = "assertNotRegexpMatches"
-    else:
-        _assertRaisesRegex = "assertRaisesRegex"
-        _assertRegex = "assertRegex"
-        _assertNotRegex = "assertNotRegex"
 else:
     def b(s):
         return s
     # Workaround for standalone backslash
-
     def u(s):
         return unicode(s.replace(r'\\', r'\\\\'), "unicode_escape")
     unichr = unichr
     int2byte = chr
-
     def byte2int(bs):
         return ord(bs[0])
-
     def indexbytes(buf, i):
         return ord(buf[i])
-    iterbytes = functools.partial(itertools.imap, ord)
+    def iterbytes(buf):
+        return (ord(byte) for byte in buf)
     import StringIO
     StringIO = BytesIO = StringIO.StringIO
-    _assertCountEqual = "assertItemsEqual"
-    _assertRaisesRegex = "assertRaisesRegexp"
-    _assertRegex = "assertRegexpMatches"
-    _assertNotRegex = "assertNotRegexpMatches"
 _add_doc(b, """Byte literal""")
 _add_doc(u, """Text literal""")
 
 
-def assertCountEqual(self, *args, **kwargs):
-    return getattr(self, _assertCountEqual)(*args, **kwargs)
-
-
-def assertRaisesRegex(self, *args, **kwargs):
-    return getattr(self, _assertRaisesRegex)(*args, **kwargs)
-
-
-def assertRegex(self, *args, **kwargs):
-    return getattr(self, _assertRegex)(*args, **kwargs)
-
-
-def assertNotRegex(self, *args, **kwargs):
-    return getattr(self, _assertNotRegex)(*args, **kwargs)
-
-
 if PY3:
     exec_ = getattr(moves.builtins, "exec")
 
+
     def reraise(tp, value, tb=None):
-        try:
-            if value is None:
-                value = tp()
-            if value.__traceback__ is not tb:
-                raise value.with_traceback(tb)
-            raise value
-        finally:
-            value = None
-            tb = None
+        if value.__traceback__ is not tb:
+            raise value.with_traceback(tb)
+        raise value
 
 else:
     def exec_(_code_, _globs_=None, _locs_=None):
@@ -734,26 +562,12 @@ else:
             _locs_ = _globs_
         exec("""exec _code_ in _globs_, _locs_""")
 
+
     exec_("""def reraise(tp, value, tb=None):
-    try:
-        raise tp, value, tb
-    finally:
-        tb = None
+    raise tp, value, tb
 """)
 
 
-if sys.version_info[:2] > (3,):
-    exec_("""def raise_from(value, from_value):
-    try:
-        raise value from from_value
-    finally:
-        value = None
-""")
-else:
-    def raise_from(value, from_value):
-        raise value
-
-
 print_ = getattr(moves.builtins, "print", None)
 if print_ is None:
     def print_(*args, **kwargs):
@@ -761,14 +575,13 @@ if print_ is None:
         fp = kwargs.pop("file", sys.stdout)
         if fp is None:
             return
-
         def write(data):
             if not isinstance(data, basestring):
                 data = str(data)
             # If the file has an encoding, encode unicode with it.
             if (isinstance(fp, file) and
-                    isinstance(data, unicode) and
-                    fp.encoding is not None):
+                isinstance(data, unicode) and
+                fp.encoding is not None):
                 errors = getattr(fp, "errors", None)
                 if errors is None:
                     errors = "strict"
@@ -809,190 +622,25 @@ if print_ is None:
                 write(sep)
             write(arg)
         write(end)
-if sys.version_info[:2] < (3, 3):
-    _print = print_
-
-    def print_(*args, **kwargs):
-        fp = kwargs.get("file", sys.stdout)
-        flush = kwargs.pop("flush", False)
-        _print(*args, **kwargs)
-        if flush and fp is not None:
-            fp.flush()
 
 _add_doc(reraise, """Reraise an exception.""")
 
-if sys.version_info[0:2] < (3, 4):
-    # This does exactly the same what the :func:`py3:functools.update_wrapper`
-    # function does on Python versions after 3.2. It sets the ``__wrapped__``
-    # attribute on ``wrapper`` object and it doesn't raise an error if any of
-    # the attributes mentioned in ``assigned`` and ``updated`` are missing on
-    # ``wrapped`` object.
-    def _update_wrapper(wrapper, wrapped,
-                        assigned=functools.WRAPPER_ASSIGNMENTS,
-                        updated=functools.WRAPPER_UPDATES):
-        for attr in assigned:
-            try:
-                value = getattr(wrapped, attr)
-            except AttributeError:
-                continue
-            else:
-                setattr(wrapper, attr, value)
-        for attr in updated:
-            getattr(wrapper, attr).update(getattr(wrapped, attr, {}))
-        wrapper.__wrapped__ = wrapped
-        return wrapper
-    _update_wrapper.__doc__ = functools.update_wrapper.__doc__
-
-    def wraps(wrapped, assigned=functools.WRAPPER_ASSIGNMENTS,
-              updated=functools.WRAPPER_UPDATES):
-        return functools.partial(_update_wrapper, wrapped=wrapped,
-                                 assigned=assigned, updated=updated)
-    wraps.__doc__ = functools.wraps.__doc__
-
-else:
-    wraps = functools.wraps
-
 
 def with_metaclass(meta, *bases):
     """Create a base class with a metaclass."""
-    # This requires a bit of explanation: the basic idea is to make a dummy
-    # metaclass for one level of class instantiation that replaces itself with
-    # the actual metaclass.
-    class metaclass(type):
-
-        def __new__(cls, name, this_bases, d):
-            if sys.version_info[:2] >= (3, 7):
-                # This version introduced PEP 560 that requires a bit
-                # of extra care (we mimic what is done by __build_class__).
-                resolved_bases = types.resolve_bases(bases)
-                if resolved_bases is not bases:
-                    d['__orig_bases__'] = bases
-            else:
-                resolved_bases = bases
-            return meta(name, resolved_bases, d)
-
-        @classmethod
-        def __prepare__(cls, name, this_bases):
-            return meta.__prepare__(name, bases)
-    return type.__new__(metaclass, 'temporary_class', (), {})
-
+    return meta("NewBase", bases, {})
 
 def add_metaclass(metaclass):
     """Class decorator for creating a class with a metaclass."""
     def wrapper(cls):
         orig_vars = cls.__dict__.copy()
+        orig_vars.pop('__dict__', None)
+        orig_vars.pop('__weakref__', None)
         slots = orig_vars.get('__slots__')
         if slots is not None:
             if isinstance(slots, str):
                 slots = [slots]
             for slots_var in slots:
                 orig_vars.pop(slots_var)
-        orig_vars.pop('__dict__', None)
-        orig_vars.pop('__weakref__', None)
-        if hasattr(cls, '__qualname__'):
-            orig_vars['__qualname__'] = cls.__qualname__
         return metaclass(cls.__name__, cls.__bases__, orig_vars)
     return wrapper
-
-
-def ensure_binary(s, encoding='utf-8', errors='strict'):
-    """Coerce **s** to six.binary_type.
-
-    For Python 2:
-      - `unicode` -> encoded to `str`
-      - `str` -> `str`
-
-    For Python 3:
-      - `str` -> encoded to `bytes`
-      - `bytes` -> `bytes`
-    """
-    if isinstance(s, binary_type):
-        return s
-    if isinstance(s, text_type):
-        return s.encode(encoding, errors)
-    raise TypeError("not expecting type '%s'" % type(s))
-
-
-def ensure_str(s, encoding='utf-8', errors='strict'):
-    """Coerce *s* to `str`.
-
-    For Python 2:
-      - `unicode` -> encoded to `str`
-      - `str` -> `str`
-
-    For Python 3:
-      - `str` -> `str`
-      - `bytes` -> decoded to `str`
-    """
-    # Optimization: Fast return for the common case.
-    if type(s) is str:
-        return s
-    if PY2 and isinstance(s, text_type):
-        return s.encode(encoding, errors)
-    elif PY3 and isinstance(s, binary_type):
-        return s.decode(encoding, errors)
-    elif not isinstance(s, (text_type, binary_type)):
-        raise TypeError("not expecting type '%s'" % type(s))
-    return s
-
-
-def ensure_text(s, encoding='utf-8', errors='strict'):
-    """Coerce *s* to six.text_type.
-
-    For Python 2:
-      - `unicode` -> `unicode`
-      - `str` -> `unicode`
-
-    For Python 3:
-      - `str` -> `str`
-      - `bytes` -> decoded to `str`
-    """
-    if isinstance(s, binary_type):
-        return s.decode(encoding, errors)
-    elif isinstance(s, text_type):
-        return s
-    else:
-        raise TypeError("not expecting type '%s'" % type(s))
-
-
-def python_2_unicode_compatible(klass):
-    """
-    A class decorator that defines __unicode__ and __str__ methods under Python 2.
-    Under Python 3 it does nothing.
-
-    To support Python 2 and 3 with a single code base, define a __str__ method
-    returning text and apply this decorator to the class.
-    """
-    if PY2:
-        if '__str__' not in klass.__dict__:
-            raise ValueError("@python_2_unicode_compatible cannot be applied "
-                             "to %s because it doesn't define __str__()." %
-                             klass.__name__)
-        klass.__unicode__ = klass.__str__
-        klass.__str__ = lambda self: self.__unicode__().encode('utf-8')
-    return klass
-
-
-# Complete the moves implementation.
-# This code is at the end of this module to speed up module loading.
-# Turn this module into a package.
-__path__ = []  # required for PEP 302 and PEP 451
-__package__ = __name__  # see PEP 366 @ReservedAssignment
-if globals().get("__spec__") is not None:
-    __spec__.submodule_search_locations = []  # PEP 451 @UndefinedVariable
-# Remove other six meta path importers, since they cause problems. This can
-# happen if six is removed from sys.modules and then reloaded. (Setuptools does
-# this for some reason.)
-if sys.meta_path:
-    for i, importer in enumerate(sys.meta_path):
-        # Here's some real nastiness: Another "instance" of the six module might
-        # be floating around. Therefore, we can't use isinstance() to check for
-        # the six meta path importer, since the other six instance will have
-        # inserted an importer with different class.
-        if (type(importer).__name__ == "_SixMetaPathImporter" and
-                importer.name == __name__):
-            del sys.meta_path[i]
-            break
-    del i, importer
-# Finally, add the importer to the meta path import hook.
-sys.meta_path.append(_importer)
diff --git a/lib/soupsieve/__init__.py b/lib/soupsieve/__init__.py
deleted file mode 100644
index 8173fd40..00000000
--- a/lib/soupsieve/__init__.py
+++ /dev/null
@@ -1,168 +0,0 @@
-"""
-Soup Sieve.
-
-A CSS selector filter for BeautifulSoup4.
-
-MIT License
-
-Copyright (c) 2018 Isaac Muse
-
-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.
-"""
-from __future__ import annotations
-from .__meta__ import __version__, __version_info__  # noqa: F401
-from . import css_parser as cp
-from . import css_match as cm
-from . import css_types as ct
-from .util import DEBUG, SelectorSyntaxError  # noqa: F401
-import bs4  # type: ignore[import]
-from typing import Any, Iterator, Iterable
-
-__all__ = (
-    'DEBUG', 'SelectorSyntaxError', 'SoupSieve',
-    'closest', 'compile', 'filter', 'iselect',
-    'match', 'select', 'select_one'
-)
-
-SoupSieve = cm.SoupSieve
-
-
-def compile(  # noqa: A001
-    pattern: str,
-    namespaces: dict[str, str] | None = None,
-    flags: int = 0,
-    *,
-    custom: dict[str, str] | None = None,
-    **kwargs: Any
-) -> cm.SoupSieve:
-    """Compile CSS pattern."""
-
-    if isinstance(pattern, SoupSieve):
-        if flags:
-            raise ValueError("Cannot process 'flags' argument on a compiled selector list")
-        elif namespaces is not None:
-            raise ValueError("Cannot process 'namespaces' argument on a compiled selector list")
-        elif custom is not None:
-            raise ValueError("Cannot process 'custom' argument on a compiled selector list")
-        return pattern
-
-    return cp._cached_css_compile(
-        pattern,
-        ct.Namespaces(namespaces) if namespaces is not None else namespaces,
-        ct.CustomSelectors(custom) if custom is not None else custom,
-        flags
-    )
-
-
-def purge() -> None:
-    """Purge cached patterns."""
-
-    cp._purge_cache()
-
-
-def closest(
-    select: str,
-    tag: bs4.Tag,
-    namespaces: dict[str, str] | None = None,
-    flags: int = 0,
-    *,
-    custom: dict[str, str] | None = None,
-    **kwargs: Any
-) -> bs4.Tag:
-    """Match closest ancestor."""
-
-    return compile(select, namespaces, flags, **kwargs).closest(tag)
-
-
-def match(
-    select: str,
-    tag: bs4.Tag,
-    namespaces: dict[str, str] | None = None,
-    flags: int = 0,
-    *,
-    custom: dict[str, str] | None = None,
-    **kwargs: Any
-) -> bool:
-    """Match node."""
-
-    return compile(select, namespaces, flags, **kwargs).match(tag)
-
-
-def filter(  # noqa: A001
-    select: str,
-    iterable: Iterable[bs4.Tag],
-    namespaces: dict[str, str] | None = None,
-    flags: int = 0,
-    *,
-    custom: dict[str, str] | None = None,
-    **kwargs: Any
-) -> list[bs4.Tag]:
-    """Filter list of nodes."""
-
-    return compile(select, namespaces, flags, **kwargs).filter(iterable)
-
-
-def select_one(
-    select: str,
-    tag: bs4.Tag,
-    namespaces: dict[str, str] | None = None,
-    flags: int = 0,
-    *,
-    custom: dict[str, str] | None = None,
-    **kwargs: Any
-) -> bs4.Tag:
-    """Select a single tag."""
-
-    return compile(select, namespaces, flags, **kwargs).select_one(tag)
-
-
-def select(
-    select: str,
-    tag: bs4.Tag,
-    namespaces: dict[str, str] | None = None,
-    limit: int = 0,
-    flags: int = 0,
-    *,
-    custom: dict[str, str] | None = None,
-    **kwargs: Any
-) -> list[bs4.Tag]:
-    """Select the specified tags."""
-
-    return compile(select, namespaces, flags, **kwargs).select(tag, limit)
-
-
-def iselect(
-    select: str,
-    tag: bs4.Tag,
-    namespaces: dict[str, str] | None = None,
-    limit: int = 0,
-    flags: int = 0,
-    *,
-    custom: dict[str, str] | None = None,
-    **kwargs: Any
-) -> Iterator[bs4.Tag]:
-    """Iterate the specified tags."""
-
-    yield from compile(select, namespaces, flags, **kwargs).iselect(tag, limit)
-
-
-def escape(ident: str) -> str:
-    """Escape identifier."""
-
-    return cp.escape(ident)
diff --git a/lib/soupsieve/__meta__.py b/lib/soupsieve/__meta__.py
deleted file mode 100644
index 4dcec73f..00000000
--- a/lib/soupsieve/__meta__.py
+++ /dev/null
@@ -1,197 +0,0 @@
-"""Meta related things."""
-from __future__ import annotations
-from collections import namedtuple
-import re
-
-RE_VER = re.compile(
-    r'''(?x)
-    (?P<major>\d+)(?:\.(?P<minor>\d+))?(?:\.(?P<micro>\d+))?
-    (?:(?P<type>a|b|rc)(?P<pre>\d+))?
-    (?:\.post(?P<post>\d+))?
-    (?:\.dev(?P<dev>\d+))?
-    '''
-)
-
-REL_MAP = {
-    ".dev": "",
-    ".dev-alpha": "a",
-    ".dev-beta": "b",
-    ".dev-candidate": "rc",
-    "alpha": "a",
-    "beta": "b",
-    "candidate": "rc",
-    "final": ""
-}
-
-DEV_STATUS = {
-    ".dev": "2 - Pre-Alpha",
-    ".dev-alpha": "2 - Pre-Alpha",
-    ".dev-beta": "2 - Pre-Alpha",
-    ".dev-candidate": "2 - Pre-Alpha",
-    "alpha": "3 - Alpha",
-    "beta": "4 - Beta",
-    "candidate": "4 - Beta",
-    "final": "5 - Production/Stable"
-}
-
-PRE_REL_MAP = {"a": 'alpha', "b": 'beta', "rc": 'candidate'}
-
-
-class Version(namedtuple("Version", ["major", "minor", "micro", "release", "pre", "post", "dev"])):
-    """
-    Get the version (PEP 440).
-
-    A biased approach to the PEP 440 semantic version.
-
-    Provides a tuple structure which is sorted for comparisons `v1 > v2` etc.
-      (major, minor, micro, release type, pre-release build, post-release build, development release build)
-    Release types are named in is such a way they are comparable with ease.
-    Accessors to check if a development, pre-release, or post-release build. Also provides accessor to get
-    development status for setup files.
-
-    How it works (currently):
-
-    - You must specify a release type as either `final`, `alpha`, `beta`, or `candidate`.
-    - To define a development release, you can use either `.dev`, `.dev-alpha`, `.dev-beta`, or `.dev-candidate`.
-      The dot is used to ensure all development specifiers are sorted before `alpha`.
-      You can specify a `dev` number for development builds, but do not have to as implicit development releases
-      are allowed.
-    - You must specify a `pre` value greater than zero if using a prerelease as this project (not PEP 440) does not
-      allow implicit prereleases.
-    - You can optionally set `post` to a value greater than zero to make the build a post release. While post releases
-      are technically allowed in prereleases, it is strongly discouraged, so we are rejecting them. It should be
-      noted that we do not allow `post0` even though PEP 440 does not restrict this. This project specifically
-      does not allow implicit post releases.
-    - It should be noted that we do not support epochs `1!` or local versions `+some-custom.version-1`.
-
-    Acceptable version releases:
-
-    ```
-    Version(1, 0, 0, "final")                    1.0
-    Version(1, 2, 0, "final")                    1.2
-    Version(1, 2, 3, "final")                    1.2.3
-    Version(1, 2, 0, ".dev-alpha", pre=4)        1.2a4
-    Version(1, 2, 0, ".dev-beta", pre=4)         1.2b4
-    Version(1, 2, 0, ".dev-candidate", pre=4)    1.2rc4
-    Version(1, 2, 0, "final", post=1)            1.2.post1
-    Version(1, 2, 3, ".dev")                     1.2.3.dev0
-    Version(1, 2, 3, ".dev", dev=1)              1.2.3.dev1
-    ```
-
-    """
-
-    def __new__(
-        cls,
-        major: int, minor: int, micro: int, release: str = "final",
-        pre: int = 0, post: int = 0, dev: int = 0
-    ) -> Version:
-        """Validate version info."""
-
-        # Ensure all parts are positive integers.
-        for value in (major, minor, micro, pre, post):
-            if not (isinstance(value, int) and value >= 0):
-                raise ValueError("All version parts except 'release' should be integers.")
-
-        if release not in REL_MAP:
-            raise ValueError(f"'{release}' is not a valid release type.")
-
-        # Ensure valid pre-release (we do not allow implicit pre-releases).
-        if ".dev-candidate" < release < "final":
-            if pre == 0:
-                raise ValueError("Implicit pre-releases not allowed.")
-            elif dev:
-                raise ValueError("Version is not a development release.")
-            elif post:
-                raise ValueError("Post-releases are not allowed with pre-releases.")
-
-        # Ensure valid development or development/pre release
-        elif release < "alpha":
-            if release > ".dev" and pre == 0:
-                raise ValueError("Implicit pre-release not allowed.")
-            elif post:
-                raise ValueError("Post-releases are not allowed with pre-releases.")
-
-        # Ensure a valid normal release
-        else:
-            if pre:
-                raise ValueError("Version is not a pre-release.")
-            elif dev:
-                raise ValueError("Version is not a development release.")
-
-        return super().__new__(cls, major, minor, micro, release, pre, post, dev)
-
-    def _is_pre(self) -> bool:
-        """Is prerelease."""
-
-        return bool(self.pre > 0)
-
-    def _is_dev(self) -> bool:
-        """Is development."""
-
-        return bool(self.release < "alpha")
-
-    def _is_post(self) -> bool:
-        """Is post."""
-
-        return bool(self.post > 0)
-
-    def _get_dev_status(self) -> str:  # pragma: no cover
-        """Get development status string."""
-
-        return DEV_STATUS[self.release]
-
-    def _get_canonical(self) -> str:
-        """Get the canonical output string."""
-
-        # Assemble major, minor, micro version and append `pre`, `post`, or `dev` if needed..
-        if self.micro == 0:
-            ver = f"{self.major}.{self.minor}"
-        else:
-            ver = f"{self.major}.{self.minor}.{self.micro}"
-        if self._is_pre():
-            ver += f'{REL_MAP[self.release]}{self.pre}'
-        if self._is_post():
-            ver += f".post{self.post}"
-        if self._is_dev():
-            ver += f".dev{self.dev}"
-
-        return ver
-
-
-def parse_version(ver: str) -> Version:
-    """Parse version into a comparable Version tuple."""
-
-    m = RE_VER.match(ver)
-
-    if m is None:
-        raise ValueError(f"'{ver}' is not a valid version")
-
-    # Handle major, minor, micro
-    major = int(m.group('major'))
-    minor = int(m.group('minor')) if m.group('minor') else 0
-    micro = int(m.group('micro')) if m.group('micro') else 0
-
-    # Handle pre releases
-    if m.group('type'):
-        release = PRE_REL_MAP[m.group('type')]
-        pre = int(m.group('pre'))
-    else:
-        release = "final"
-        pre = 0
-
-    # Handle development releases
-    dev = m.group('dev') if m.group('dev') else 0
-    if m.group('dev'):
-        dev = int(m.group('dev'))
-        release = '.dev-' + release if pre else '.dev'
-    else:
-        dev = 0
-
-    # Handle post
-    post = int(m.group('post')) if m.group('post') else 0
-
-    return Version(major, minor, micro, release, pre, post, dev)
-
-
-__version_info__ = Version(2, 5, 0, "final")
-__version__ = __version_info__._get_canonical()
diff --git a/lib/soupsieve/css_match.py b/lib/soupsieve/css_match.py
deleted file mode 100644
index 0b0ecfa9..00000000
--- a/lib/soupsieve/css_match.py
+++ /dev/null
@@ -1,1582 +0,0 @@
-"""CSS matcher."""
-from __future__ import annotations
-from datetime import datetime
-from . import util
-import re
-from . import css_types as ct
-import unicodedata
-import bs4  # type: ignore[import]
-from typing import Iterator, Iterable, Any, Callable, Sequence, cast  # noqa: F401
-
-# Empty tag pattern (whitespace okay)
-RE_NOT_EMPTY = re.compile('[^ \t\r\n\f]')
-
-RE_NOT_WS = re.compile('[^ \t\r\n\f]+')
-
-# Relationships
-REL_PARENT = ' '
-REL_CLOSE_PARENT = '>'
-REL_SIBLING = '~'
-REL_CLOSE_SIBLING = '+'
-
-# Relationships for :has() (forward looking)
-REL_HAS_PARENT = ': '
-REL_HAS_CLOSE_PARENT = ':>'
-REL_HAS_SIBLING = ':~'
-REL_HAS_CLOSE_SIBLING = ':+'
-
-NS_XHTML = 'http://www.w3.org/1999/xhtml'
-NS_XML = 'http://www.w3.org/XML/1998/namespace'
-
-DIR_FLAGS = ct.SEL_DIR_LTR | ct.SEL_DIR_RTL
-RANGES = ct.SEL_IN_RANGE | ct.SEL_OUT_OF_RANGE
-
-DIR_MAP = {
-    'ltr': ct.SEL_DIR_LTR,
-    'rtl': ct.SEL_DIR_RTL,
-    'auto': 0
-}
-
-RE_NUM = re.compile(r"^(?P<value>-?(?:[0-9]{1,}(\.[0-9]+)?|\.[0-9]+))$")
-RE_TIME = re.compile(r'^(?P<hour>[0-9]{2}):(?P<minutes>[0-9]{2})$')
-RE_MONTH = re.compile(r'^(?P<year>[0-9]{4,})-(?P<month>[0-9]{2})$')
-RE_WEEK = re.compile(r'^(?P<year>[0-9]{4,})-W(?P<week>[0-9]{2})$')
-RE_DATE = re.compile(r'^(?P<year>[0-9]{4,})-(?P<month>[0-9]{2})-(?P<day>[0-9]{2})$')
-RE_DATETIME = re.compile(
-    r'^(?P<year>[0-9]{4,})-(?P<month>[0-9]{2})-(?P<day>[0-9]{2})T(?P<hour>[0-9]{2}):(?P<minutes>[0-9]{2})$'
-)
-RE_WILD_STRIP = re.compile(r'(?:(?:-\*-)(?:\*(?:-|$))*|-\*$)')
-
-MONTHS_30 = (4, 6, 9, 11)  # April, June, September, and November
-FEB = 2
-SHORT_MONTH = 30
-LONG_MONTH = 31
-FEB_MONTH = 28
-FEB_LEAP_MONTH = 29
-DAYS_IN_WEEK = 7
-
-
-class _FakeParent:
-    """
-    Fake parent class.
-
-    When we have a fragment with no `BeautifulSoup` document object,
-    we can't evaluate `nth` selectors properly.  Create a temporary
-    fake parent so we can traverse the root element as a child.
-    """
-
-    def __init__(self, element: bs4.Tag) -> None:
-        """Initialize."""
-
-        self.contents = [element]
-
-    def __len__(self) -> bs4.PageElement:
-        """Length."""
-
-        return len(self.contents)
-
-
-class _DocumentNav:
-    """Navigate a Beautiful Soup document."""
-
-    @classmethod
-    def assert_valid_input(cls, tag: Any) -> None:
-        """Check if valid input tag or document."""
-
-        # Fail on unexpected types.
-        if not cls.is_tag(tag):
-            raise TypeError(f"Expected a BeautifulSoup 'Tag', but instead received type {type(tag)}")
-
-    @staticmethod
-    def is_doc(obj: bs4.Tag) -> bool:
-        """Is `BeautifulSoup` object."""
-        return isinstance(obj, bs4.BeautifulSoup)
-
-    @staticmethod
-    def is_tag(obj: bs4.PageElement) -> bool:
-        """Is tag."""
-        return isinstance(obj, bs4.Tag)
-
-    @staticmethod
-    def is_declaration(obj: bs4.PageElement) -> bool:  # pragma: no cover
-        """Is declaration."""
-        return isinstance(obj, bs4.Declaration)
-
-    @staticmethod
-    def is_cdata(obj: bs4.PageElement) -> bool:
-        """Is CDATA."""
-        return isinstance(obj, bs4.CData)
-
-    @staticmethod
-    def is_processing_instruction(obj: bs4.PageElement) -> bool:  # pragma: no cover
-        """Is processing instruction."""
-        return isinstance(obj, bs4.ProcessingInstruction)
-
-    @staticmethod
-    def is_navigable_string(obj: bs4.PageElement) -> bool:
-        """Is navigable string."""
-        return isinstance(obj, bs4.NavigableString)
-
-    @staticmethod
-    def is_special_string(obj: bs4.PageElement) -> bool:
-        """Is special string."""
-        return isinstance(obj, (bs4.Comment, bs4.Declaration, bs4.CData, bs4.ProcessingInstruction, bs4.Doctype))
-
-    @classmethod
-    def is_content_string(cls, obj: bs4.PageElement) -> bool:
-        """Check if node is content string."""
-
-        return cls.is_navigable_string(obj) and not cls.is_special_string(obj)
-
-    @staticmethod
-    def create_fake_parent(el: bs4.Tag) -> _FakeParent:
-        """Create fake parent for a given element."""
-
-        return _FakeParent(el)
-
-    @staticmethod
-    def is_xml_tree(el: bs4.Tag) -> bool:
-        """Check if element (or document) is from a XML tree."""
-
-        return bool(el._is_xml)
-
-    def is_iframe(self, el: bs4.Tag) -> bool:
-        """Check if element is an `iframe`."""
-
-        return bool(
-            ((el.name if self.is_xml_tree(el) else util.lower(el.name)) == 'iframe') and
-            self.is_html_tag(el)  # type: ignore[attr-defined]
-        )
-
-    def is_root(self, el: bs4.Tag) -> bool:
-        """
-        Return whether element is a root element.
-
-        We check that the element is the root of the tree (which we have already pre-calculated),
-        and we check if it is the root element under an `iframe`.
-        """
-
-        root = self.root and self.root is el  # type: ignore[attr-defined]
-        if not root:
-            parent = self.get_parent(el)
-            root = parent is not None and self.is_html and self.is_iframe(parent)  # type: ignore[attr-defined]
-        return root
-
-    def get_contents(self, el: bs4.Tag, no_iframe: bool = False) -> Iterator[bs4.PageElement]:
-        """Get contents or contents in reverse."""
-        if not no_iframe or not self.is_iframe(el):
-            yield from el.contents
-
-    def get_children(
-        self,
-        el: bs4.Tag,
-        start: int | None = None,
-        reverse: bool = False,
-        tags: bool = True,
-        no_iframe: bool = False
-    ) -> Iterator[bs4.PageElement]:
-        """Get children."""
-
-        if not no_iframe or not self.is_iframe(el):
-            last = len(el.contents) - 1
-            if start is None:
-                index = last if reverse else 0
-            else:
-                index = start
-            end = -1 if reverse else last + 1
-            incr = -1 if reverse else 1
-
-            if 0 <= index <= last:
-                while index != end:
-                    node = el.contents[index]
-                    index += incr
-                    if not tags or self.is_tag(node):
-                        yield node
-
-    def get_descendants(
-        self,
-        el: bs4.Tag,
-        tags: bool = True,
-        no_iframe: bool = False
-    ) -> Iterator[bs4.PageElement]:
-        """Get descendants."""
-
-        if not no_iframe or not self.is_iframe(el):
-            next_good = None
-            for child in el.descendants:
-
-                if next_good is not None:
-                    if child is not next_good:
-                        continue
-                    next_good = None
-
-                is_tag = self.is_tag(child)
-
-                if no_iframe and is_tag and self.is_iframe(child):
-                    if child.next_sibling is not None:
-                        next_good = child.next_sibling
-                    else:
-                        last_child = child
-                        while self.is_tag(last_child) and last_child.contents:
-                            last_child = last_child.contents[-1]
-                        next_good = last_child.next_element
-                    yield child
-                    if next_good is None:
-                        break
-                    # Coverage isn't seeing this even though it's executed
-                    continue  # pragma: no cover
-
-                if not tags or is_tag:
-                    yield child
-
-    def get_parent(self, el: bs4.Tag, no_iframe: bool = False) -> bs4.Tag:
-        """Get parent."""
-
-        parent = el.parent
-        if no_iframe and parent is not None and self.is_iframe(parent):
-            parent = None
-        return parent
-
-    @staticmethod
-    def get_tag_name(el: bs4.Tag) -> str | None:
-        """Get tag."""
-
-        return cast('str | None', el.name)
-
-    @staticmethod
-    def get_prefix_name(el: bs4.Tag) -> str | None:
-        """Get prefix."""
-
-        return cast('str | None', el.prefix)
-
-    @staticmethod
-    def get_uri(el: bs4.Tag) -> str | None:
-        """Get namespace `URI`."""
-
-        return cast('str | None', el.namespace)
-
-    @classmethod
-    def get_next(cls, el: bs4.Tag, tags: bool = True) -> bs4.PageElement:
-        """Get next sibling tag."""
-
-        sibling = el.next_sibling
-        while tags and not cls.is_tag(sibling) and sibling is not None:
-            sibling = sibling.next_sibling
-        return sibling
-
-    @classmethod
-    def get_previous(cls, el: bs4.Tag, tags: bool = True) -> bs4.PageElement:
-        """Get previous sibling tag."""
-
-        sibling = el.previous_sibling
-        while tags and not cls.is_tag(sibling) and sibling is not None:
-            sibling = sibling.previous_sibling
-        return sibling
-
-    @staticmethod
-    def has_html_ns(el: bs4.Tag) -> bool:
-        """
-        Check if element has an HTML namespace.
-
-        This is a bit different than whether a element is treated as having an HTML namespace,
-        like we do in the case of `is_html_tag`.
-        """
-
-        ns = getattr(el, 'namespace') if el else None  # noqa: B009
-        return bool(ns and ns == NS_XHTML)
-
-    @staticmethod
-    def split_namespace(el: bs4.Tag, attr_name: str) -> tuple[str | None, str | None]:
-        """Return namespace and attribute name without the prefix."""
-
-        return getattr(attr_name, 'namespace', None), getattr(attr_name, 'name', None)
-
-    @classmethod
-    def normalize_value(cls, value: Any) -> str | Sequence[str]:
-        """Normalize the value to be a string or list of strings."""
-
-        # Treat `None` as empty string.
-        if value is None:
-            return ''
-
-        # Pass through strings
-        if (isinstance(value, str)):
-            return value
-
-        # If it's a byte string, convert it to Unicode, treating it as UTF-8.
-        if isinstance(value, bytes):
-            return value.decode("utf8")
-
-        # BeautifulSoup supports sequences of attribute values, so make sure the children are strings.
-        if isinstance(value, Sequence):
-            new_value = []
-            for v in value:
-                if not isinstance(v, (str, bytes)) and isinstance(v, Sequence):
-                    # This is most certainly a user error and will crash and burn later.
-                    # To keep things working, we'll do what we do with all objects,
-                    # And convert them to strings.
-                    new_value.append(str(v))
-                else:
-                    # Convert the child to a string
-                    new_value.append(cast(str, cls.normalize_value(v)))
-            return new_value
-
-        # Try and make anything else a string
-        return str(value)
-
-    @classmethod
-    def get_attribute_by_name(
-        cls,
-        el: bs4.Tag,
-        name: str,
-        default: str | Sequence[str] | None = None
-    ) -> str | Sequence[str] | None:
-        """Get attribute by name."""
-
-        value = default
-        if el._is_xml:
-            try:
-                value = cls.normalize_value(el.attrs[name])
-            except KeyError:
-                pass
-        else:
-            for k, v in el.attrs.items():
-                if util.lower(k) == name:
-                    value = cls.normalize_value(v)
-                    break
-        return value
-
-    @classmethod
-    def iter_attributes(cls, el: bs4.Tag) -> Iterator[tuple[str, str | Sequence[str] | None]]:
-        """Iterate attributes."""
-
-        for k, v in el.attrs.items():
-            yield k, cls.normalize_value(v)
-
-    @classmethod
-    def get_classes(cls, el: bs4.Tag) -> Sequence[str]:
-        """Get classes."""
-
-        classes = cls.get_attribute_by_name(el, 'class', [])
-        if isinstance(classes, str):
-            classes = RE_NOT_WS.findall(classes)
-        return cast(Sequence[str], classes)
-
-    def get_text(self, el: bs4.Tag, no_iframe: bool = False) -> str:
-        """Get text."""
-
-        return ''.join(
-            [node for node in self.get_descendants(el, tags=False, no_iframe=no_iframe) if self.is_content_string(node)]
-        )
-
-    def get_own_text(self, el: bs4.Tag, no_iframe: bool = False) -> list[str]:
-        """Get Own Text."""
-
-        return [node for node in self.get_contents(el, no_iframe=no_iframe) if self.is_content_string(node)]
-
-
-class Inputs:
-    """Class for parsing and validating input items."""
-
-    @staticmethod
-    def validate_day(year: int, month: int, day: int) -> bool:
-        """Validate day."""
-
-        max_days = LONG_MONTH
-        if month == FEB:
-            max_days = FEB_LEAP_MONTH if ((year % 4 == 0) and (year % 100 != 0)) or (year % 400 == 0) else FEB_MONTH
-        elif month in MONTHS_30:
-            max_days = SHORT_MONTH
-        return 1 <= day <= max_days
-
-    @staticmethod
-    def validate_week(year: int, week: int) -> bool:
-        """Validate week."""
-
-        max_week = datetime.strptime(f"{12}-{31}-{year}", "%m-%d-%Y").isocalendar()[1]
-        if max_week == 1:
-            max_week = 53
-        return 1 <= week <= max_week
-
-    @staticmethod
-    def validate_month(month: int) -> bool:
-        """Validate month."""
-
-        return 1 <= month <= 12
-
-    @staticmethod
-    def validate_year(year: int) -> bool:
-        """Validate year."""
-
-        return 1 <= year
-
-    @staticmethod
-    def validate_hour(hour: int) -> bool:
-        """Validate hour."""
-
-        return 0 <= hour <= 23
-
-    @staticmethod
-    def validate_minutes(minutes: int) -> bool:
-        """Validate minutes."""
-
-        return 0 <= minutes <= 59
-
-    @classmethod
-    def parse_value(cls, itype: str, value: str | None) -> tuple[float, ...] | None:
-        """Parse the input value."""
-
-        parsed = None  # type: tuple[float, ...] | None
-        if value is None:
-            return value
-        if itype == "date":
-            m = RE_DATE.match(value)
-            if m:
-                year = int(m.group('year'), 10)
-                month = int(m.group('month'), 10)
-                day = int(m.group('day'), 10)
-                if cls.validate_year(year) and cls.validate_month(month) and cls.validate_day(year, month, day):
-                    parsed = (year, month, day)
-        elif itype == "month":
-            m = RE_MONTH.match(value)
-            if m:
-                year = int(m.group('year'), 10)
-                month = int(m.group('month'), 10)
-                if cls.validate_year(year) and cls.validate_month(month):
-                    parsed = (year, month)
-        elif itype == "week":
-            m = RE_WEEK.match(value)
-            if m:
-                year = int(m.group('year'), 10)
-                week = int(m.group('week'), 10)
-                if cls.validate_year(year) and cls.validate_week(year, week):
-                    parsed = (year, week)
-        elif itype == "time":
-            m = RE_TIME.match(value)
-            if m:
-                hour = int(m.group('hour'), 10)
-                minutes = int(m.group('minutes'), 10)
-                if cls.validate_hour(hour) and cls.validate_minutes(minutes):
-                    parsed = (hour, minutes)
-        elif itype == "datetime-local":
-            m = RE_DATETIME.match(value)
-            if m:
-                year = int(m.group('year'), 10)
-                month = int(m.group('month'), 10)
-                day = int(m.group('day'), 10)
-                hour = int(m.group('hour'), 10)
-                minutes = int(m.group('minutes'), 10)
-                if (
-                    cls.validate_year(year) and cls.validate_month(month) and cls.validate_day(year, month, day) and
-                    cls.validate_hour(hour) and cls.validate_minutes(minutes)
-                ):
-                    parsed = (year, month, day, hour, minutes)
-        elif itype in ("number", "range"):
-            m = RE_NUM.match(value)
-            if m:
-                parsed = (float(m.group('value')),)
-        return parsed
-
-
-class CSSMatch(_DocumentNav):
-    """Perform CSS matching."""
-
-    def __init__(
-        self,
-        selectors: ct.SelectorList,
-        scope: bs4.Tag,
-        namespaces: ct.Namespaces | None,
-        flags: int
-    ) -> None:
-        """Initialize."""
-
-        self.assert_valid_input(scope)
-        self.tag = scope
-        self.cached_meta_lang = []  # type: list[tuple[str, str]]
-        self.cached_default_forms = []  # type: list[tuple[bs4.Tag, bs4.Tag]]
-        self.cached_indeterminate_forms = []  # type: list[tuple[bs4.Tag, str, bool]]
-        self.selectors = selectors
-        self.namespaces = {} if namespaces is None else namespaces  # type: ct.Namespaces | dict[str, str]
-        self.flags = flags
-        self.iframe_restrict = False
-
-        # Find the root element for the whole tree
-        doc = scope
-        parent = self.get_parent(doc)
-        while parent:
-            doc = parent
-            parent = self.get_parent(doc)
-        root = None
-        if not self.is_doc(doc):
-            root = doc
-        else:
-            for child in self.get_children(doc):
-                root = child
-                break
-
-        self.root = root
-        self.scope = scope if scope is not doc else root
-        self.has_html_namespace = self.has_html_ns(root)
-
-        # A document can be both XML and HTML (XHTML)
-        self.is_xml = self.is_xml_tree(doc)
-        self.is_html = not self.is_xml or self.has_html_namespace
-
-    def supports_namespaces(self) -> bool:
-        """Check if namespaces are supported in the HTML type."""
-
-        return self.is_xml or self.has_html_namespace
-
-    def get_tag_ns(self, el: bs4.Tag) -> str:
-        """Get tag namespace."""
-
-        if self.supports_namespaces():
-            namespace = ''
-            ns = self.get_uri(el)
-            if ns:
-                namespace = ns
-        else:
-            namespace = NS_XHTML
-        return namespace
-
-    def is_html_tag(self, el: bs4.Tag) -> bool:
-        """Check if tag is in HTML namespace."""
-
-        return self.get_tag_ns(el) == NS_XHTML
-
-    def get_tag(self, el: bs4.Tag) -> str | None:
-        """Get tag."""
-
-        name = self.get_tag_name(el)
-        return util.lower(name) if name is not None and not self.is_xml else name
-
-    def get_prefix(self, el: bs4.Tag) -> str | None:
-        """Get prefix."""
-
-        prefix = self.get_prefix_name(el)
-        return util.lower(prefix) if prefix is not None and not self.is_xml else prefix
-
-    def find_bidi(self, el: bs4.Tag) -> int | None:
-        """Get directionality from element text."""
-
-        for node in self.get_children(el, tags=False):
-
-            # Analyze child text nodes
-            if self.is_tag(node):
-
-                # Avoid analyzing certain elements specified in the specification.
-                direction = DIR_MAP.get(util.lower(self.get_attribute_by_name(node, 'dir', '')), None)
-                if (
-                    self.get_tag(node) in ('bdi', 'script', 'style', 'textarea', 'iframe') or
-                    not self.is_html_tag(node) or
-                    direction is not None
-                ):
-                    continue  # pragma: no cover
-
-                # Check directionality of this node's text
-                value = self.find_bidi(node)
-                if value is not None:
-                    return value
-
-                # Direction could not be determined
-                continue  # pragma: no cover
-
-            # Skip `doctype` comments, etc.
-            if self.is_special_string(node):
-                continue
-
-            # Analyze text nodes for directionality.
-            for c in node:
-                bidi = unicodedata.bidirectional(c)
-                if bidi in ('AL', 'R', 'L'):
-                    return ct.SEL_DIR_LTR if bidi == 'L' else ct.SEL_DIR_RTL
-        return None
-
-    def extended_language_filter(self, lang_range: str, lang_tag: str) -> bool:
-        """Filter the language tags."""
-
-        match = True
-        lang_range = RE_WILD_STRIP.sub('-', lang_range).lower()
-        ranges = lang_range.split('-')
-        subtags = lang_tag.lower().split('-')
-        length = len(ranges)
-        slength = len(subtags)
-        rindex = 0
-        sindex = 0
-        r = ranges[rindex]
-        s = subtags[sindex]
-
-        # Empty specified language should match unspecified language attributes
-        if length == 1 and slength == 1 and not r and r == s:
-            return True
-
-        # Primary tag needs to match
-        if (r != '*' and r != s) or (r == '*' and slength == 1 and not s):
-            match = False
-
-        rindex += 1
-        sindex += 1
-
-        # Match until we run out of ranges
-        while match and rindex < length:
-            r = ranges[rindex]
-            try:
-                s = subtags[sindex]
-            except IndexError:
-                # Ran out of subtags,
-                # but we still have ranges
-                match = False
-                continue
-
-            # Empty range
-            if not r:
-                match = False
-                continue
-
-            # Matched range
-            elif s == r:
-                rindex += 1
-
-            # Implicit wildcard cannot match
-            # singletons
-            elif len(s) == 1:
-                match = False
-                continue
-
-            # Implicitly matched, so grab next subtag
-            sindex += 1
-
-        return match
-
-    def match_attribute_name(
-        self,
-        el: bs4.Tag,
-        attr: str,
-        prefix: str | None
-    ) -> str | Sequence[str] | None:
-        """Match attribute name and return value if it exists."""
-
-        value = None
-        if self.supports_namespaces():
-            value = None
-            # If we have not defined namespaces, we can't very well find them, so don't bother trying.
-            if prefix:
-                ns = self.namespaces.get(prefix)
-                if ns is None and prefix != '*':
-                    return None
-            else:
-                ns = None
-
-            for k, v in self.iter_attributes(el):
-
-                # Get attribute parts
-                namespace, name = self.split_namespace(el, k)
-
-                # Can't match a prefix attribute as we haven't specified one to match
-                # Try to match it normally as a whole `p:a` as selector may be trying `p\:a`.
-                if ns is None:
-                    if (self.is_xml and attr == k) or (not self.is_xml and util.lower(attr) == util.lower(k)):
-                        value = v
-                        break
-                    # Coverage is not finding this even though it is executed.
-                    # Adding a print statement before this (and erasing coverage) causes coverage to find the line.
-                    # Ignore the false positive message.
-                    continue  # pragma: no cover
-
-                # We can't match our desired prefix attribute as the attribute doesn't have a prefix
-                if namespace is None or ns != namespace and prefix != '*':
-                    continue
-
-                # The attribute doesn't match.
-                if (util.lower(attr) != util.lower(name)) if not self.is_xml else (attr != name):
-                    continue
-
-                value = v
-                break
-        else:
-            for k, v in self.iter_attributes(el):
-                if util.lower(attr) != util.lower(k):
-                    continue
-                value = v
-                break
-        return value
-
-    def match_namespace(self, el: bs4.Tag, tag: ct.SelectorTag) -> bool:
-        """Match the namespace of the element."""
-
-        match = True
-        namespace = self.get_tag_ns(el)
-        default_namespace = self.namespaces.get('')
-        tag_ns = '' if tag.prefix is None else self.namespaces.get(tag.prefix)
-        # We must match the default namespace if one is not provided
-        if tag.prefix is None and (default_namespace is not None and namespace != default_namespace):
-            match = False
-        # If we specified `|tag`, we must not have a namespace.
-        elif (tag.prefix is not None and tag.prefix == '' and namespace):
-            match = False
-        # Verify prefix matches
-        elif (
-            tag.prefix and
-            tag.prefix != '*' and (tag_ns is None or namespace != tag_ns)
-        ):
-            match = False
-        return match
-
-    def match_attributes(self, el: bs4.Tag, attributes: tuple[ct.SelectorAttribute, ...]) -> bool:
-        """Match attributes."""
-
-        match = True
-        if attributes:
-            for a in attributes:
-                temp = self.match_attribute_name(el, a.attribute, a.prefix)
-                pattern = a.xml_type_pattern if self.is_xml and a.xml_type_pattern else a.pattern
-                if temp is None:
-                    match = False
-                    break
-                value = temp if isinstance(temp, str) else ' '.join(temp)
-                if pattern is None:
-                    continue
-                elif pattern.match(value) is None:
-                    match = False
-                    break
-        return match
-
-    def match_tagname(self, el: bs4.Tag, tag: ct.SelectorTag) -> bool:
-        """Match tag name."""
-
-        name = (util.lower(tag.name) if not self.is_xml and tag.name is not None else tag.name)
-        return not (
-            name is not None and
-            name not in (self.get_tag(el), '*')
-        )
-
-    def match_tag(self, el: bs4.Tag, tag: ct.SelectorTag | None) -> bool:
-        """Match the tag."""
-
-        match = True
-        if tag is not None:
-            # Verify namespace
-            if not self.match_namespace(el, tag):
-                match = False
-            if not self.match_tagname(el, tag):
-                match = False
-        return match
-
-    def match_past_relations(self, el: bs4.Tag, relation: ct.SelectorList) -> bool:
-        """Match past relationship."""
-
-        found = False
-        # I don't think this can ever happen, but it makes `mypy` happy
-        if isinstance(relation[0], ct.SelectorNull):  # pragma: no cover
-            return found
-
-        if relation[0].rel_type == REL_PARENT:
-            parent = self.get_parent(el, no_iframe=self.iframe_restrict)
-            while not found and parent:
-                found = self.match_selectors(parent, relation)
-                parent = self.get_parent(parent, no_iframe=self.iframe_restrict)
-        elif relation[0].rel_type == REL_CLOSE_PARENT:
-            parent = self.get_parent(el, no_iframe=self.iframe_restrict)
-            if parent:
-                found = self.match_selectors(parent, relation)
-        elif relation[0].rel_type == REL_SIBLING:
-            sibling = self.get_previous(el)
-            while not found and sibling:
-                found = self.match_selectors(sibling, relation)
-                sibling = self.get_previous(sibling)
-        elif relation[0].rel_type == REL_CLOSE_SIBLING:
-            sibling = self.get_previous(el)
-            if sibling and self.is_tag(sibling):
-                found = self.match_selectors(sibling, relation)
-        return found
-
-    def match_future_child(self, parent: bs4.Tag, relation: ct.SelectorList, recursive: bool = False) -> bool:
-        """Match future child."""
-
-        match = False
-        if recursive:
-            children = self.get_descendants  # type: Callable[..., Iterator[bs4.Tag]]
-        else:
-            children = self.get_children
-        for child in children(parent, no_iframe=self.iframe_restrict):
-            match = self.match_selectors(child, relation)
-            if match:
-                break
-        return match
-
-    def match_future_relations(self, el: bs4.Tag, relation: ct.SelectorList) -> bool:
-        """Match future relationship."""
-
-        found = False
-        # I don't think this can ever happen, but it makes `mypy` happy
-        if isinstance(relation[0], ct.SelectorNull):  # pragma: no cover
-            return found
-
-        if relation[0].rel_type == REL_HAS_PARENT:
-            found = self.match_future_child(el, relation, True)
-        elif relation[0].rel_type == REL_HAS_CLOSE_PARENT:
-            found = self.match_future_child(el, relation)
-        elif relation[0].rel_type == REL_HAS_SIBLING:
-            sibling = self.get_next(el)
-            while not found and sibling:
-                found = self.match_selectors(sibling, relation)
-                sibling = self.get_next(sibling)
-        elif relation[0].rel_type == REL_HAS_CLOSE_SIBLING:
-            sibling = self.get_next(el)
-            if sibling and self.is_tag(sibling):
-                found = self.match_selectors(sibling, relation)
-        return found
-
-    def match_relations(self, el: bs4.Tag, relation: ct.SelectorList) -> bool:
-        """Match relationship to other elements."""
-
-        found = False
-
-        if isinstance(relation[0], ct.SelectorNull) or relation[0].rel_type is None:
-            return found
-
-        if relation[0].rel_type.startswith(':'):
-            found = self.match_future_relations(el, relation)
-        else:
-            found = self.match_past_relations(el, relation)
-
-        return found
-
-    def match_id(self, el: bs4.Tag, ids: tuple[str, ...]) -> bool:
-        """Match element's ID."""
-
-        found = True
-        for i in ids:
-            if i != self.get_attribute_by_name(el, 'id', ''):
-                found = False
-                break
-        return found
-
-    def match_classes(self, el: bs4.Tag, classes: tuple[str, ...]) -> bool:
-        """Match element's classes."""
-
-        current_classes = self.get_classes(el)
-        found = True
-        for c in classes:
-            if c not in current_classes:
-                found = False
-                break
-        return found
-
-    def match_root(self, el: bs4.Tag) -> bool:
-        """Match element as root."""
-
-        is_root = self.is_root(el)
-        if is_root:
-            sibling = self.get_previous(el, tags=False)
-            while is_root and sibling is not None:
-                if (
-                    self.is_tag(sibling) or (self.is_content_string(sibling) and sibling.strip()) or
-                    self.is_cdata(sibling)
-                ):
-                    is_root = False
-                else:
-                    sibling = self.get_previous(sibling, tags=False)
-        if is_root:
-            sibling = self.get_next(el, tags=False)
-            while is_root and sibling is not None:
-                if (
-                    self.is_tag(sibling) or (self.is_content_string(sibling) and sibling.strip()) or
-                    self.is_cdata(sibling)
-                ):
-                    is_root = False
-                else:
-                    sibling = self.get_next(sibling, tags=False)
-        return is_root
-
-    def match_scope(self, el: bs4.Tag) -> bool:
-        """Match element as scope."""
-
-        return self.scope is el
-
-    def match_nth_tag_type(self, el: bs4.Tag, child: bs4.Tag) -> bool:
-        """Match tag type for `nth` matches."""
-
-        return (
-            (self.get_tag(child) == self.get_tag(el)) and
-            (self.get_tag_ns(child) == self.get_tag_ns(el))
-        )
-
-    def match_nth(self, el: bs4.Tag, nth: bs4.Tag) -> bool:
-        """Match `nth` elements."""
-
-        matched = True
-
-        for n in nth:
-            matched = False
-            if n.selectors and not self.match_selectors(el, n.selectors):
-                break
-            parent = self.get_parent(el)
-            if parent is None:
-                parent = self.create_fake_parent(el)
-            last = n.last
-            last_index = len(parent) - 1
-            index = last_index if last else 0
-            relative_index = 0
-            a = n.a
-            b = n.b
-            var = n.n
-            count = 0
-            count_incr = 1
-            factor = -1 if last else 1
-            idx = last_idx = a * count + b if var else a
-
-            # We can only adjust bounds within a variable index
-            if var:
-                # Abort if our nth index is out of bounds and only getting further out of bounds as we increment.
-                # Otherwise, increment to try to get in bounds.
-                adjust = None
-                while idx < 1 or idx > last_index:
-                    if idx < 0:
-                        diff_low = 0 - idx
-                        if adjust is not None and adjust == 1:
-                            break
-                        adjust = -1
-                        count += count_incr
-                        idx = last_idx = a * count + b if var else a
-                        diff = 0 - idx
-                        if diff >= diff_low:
-                            break
-                    else:
-                        diff_high = idx - last_index
-                        if adjust is not None and adjust == -1:
-                            break
-                        adjust = 1
-                        count += count_incr
-                        idx = last_idx = a * count + b if var else a
-                        diff = idx - last_index
-                        if diff >= diff_high:
-                            break
-                        diff_high = diff
-
-                # If a < 0, our count is working backwards, so floor the index by increasing the count.
-                # Find the count that yields the lowest, in bound value and use that.
-                # Lastly reverse count increment so that we'll increase our index.
-                lowest = count
-                if a < 0:
-                    while idx >= 1:
-                        lowest = count
-                        count += count_incr
-                        idx = last_idx = a * count + b if var else a
-                    count_incr = -1
-                count = lowest
-                idx = last_idx = a * count + b if var else a
-
-            # Evaluate elements while our calculated nth index is still in range
-            while 1 <= idx <= last_index + 1:
-                child = None
-                # Evaluate while our child index is still in range.
-                for child in self.get_children(parent, start=index, reverse=factor < 0, tags=False):
-                    index += factor
-                    if not self.is_tag(child):
-                        continue
-                    # Handle `of S` in `nth-child`
-                    if n.selectors and not self.match_selectors(child, n.selectors):
-                        continue
-                    # Handle `of-type`
-                    if n.of_type and not self.match_nth_tag_type(el, child):
-                        continue
-                    relative_index += 1
-                    if relative_index == idx:
-                        if child is el:
-                            matched = True
-                        else:
-                            break
-                    if child is el:
-                        break
-                if child is el:
-                    break
-                last_idx = idx
-                count += count_incr
-                if count < 0:
-                    # Count is counting down and has now ventured into invalid territory.
-                    break
-                idx = a * count + b if var else a
-                if last_idx == idx:
-                    break
-            if not matched:
-                break
-        return matched
-
-    def match_empty(self, el: bs4.Tag) -> bool:
-        """Check if element is empty (if requested)."""
-
-        is_empty = True
-        for child in self.get_children(el, tags=False):
-            if self.is_tag(child):
-                is_empty = False
-                break
-            elif self.is_content_string(child) and RE_NOT_EMPTY.search(child):
-                is_empty = False
-                break
-        return is_empty
-
-    def match_subselectors(self, el: bs4.Tag, selectors: tuple[ct.SelectorList, ...]) -> bool:
-        """Match selectors."""
-
-        match = True
-        for sel in selectors:
-            if not self.match_selectors(el, sel):
-                match = False
-        return match
-
-    def match_contains(self, el: bs4.Tag, contains: tuple[ct.SelectorContains, ...]) -> bool:
-        """Match element if it contains text."""
-
-        match = True
-        content = None  # type: str | Sequence[str] | None
-        for contain_list in contains:
-            if content is None:
-                if contain_list.own:
-                    content = self.get_own_text(el, no_iframe=self.is_html)
-                else:
-                    content = self.get_text(el, no_iframe=self.is_html)
-            found = False
-            for text in contain_list.text:
-                if contain_list.own:
-                    for c in content:
-                        if text in c:
-                            found = True
-                            break
-                    if found:
-                        break
-                else:
-                    if text in content:
-                        found = True
-                        break
-            if not found:
-                match = False
-        return match
-
-    def match_default(self, el: bs4.Tag) -> bool:
-        """Match default."""
-
-        match = False
-
-        # Find this input's form
-        form = None
-        parent = self.get_parent(el, no_iframe=True)
-        while parent and form is None:
-            if self.get_tag(parent) == 'form' and self.is_html_tag(parent):
-                form = parent
-            else:
-                parent = self.get_parent(parent, no_iframe=True)
-
-        # Look in form cache to see if we've already located its default button
-        found_form = False
-        for f, t in self.cached_default_forms:
-            if f is form:
-                found_form = True
-                if t is el:
-                    match = True
-                break
-
-        # We didn't have the form cached, so look for its default button
-        if not found_form:
-            for child in self.get_descendants(form, no_iframe=True):
-                name = self.get_tag(child)
-                # Can't do nested forms (haven't figured out why we never hit this)
-                if name == 'form':  # pragma: no cover
-                    break
-                if name in ('input', 'button'):
-                    v = self.get_attribute_by_name(child, 'type', '')
-                    if v and util.lower(v) == 'submit':
-                        self.cached_default_forms.append((form, child))
-                        if el is child:
-                            match = True
-                        break
-        return match
-
-    def match_indeterminate(self, el: bs4.Tag) -> bool:
-        """Match default."""
-
-        match = False
-        name = cast(str, self.get_attribute_by_name(el, 'name'))
-
-        def get_parent_form(el: bs4.Tag) -> bs4.Tag | None:
-            """Find this input's form."""
-            form = None
-            parent = self.get_parent(el, no_iframe=True)
-            while form is None:
-                if self.get_tag(parent) == 'form' and self.is_html_tag(parent):
-                    form = parent
-                    break
-                last_parent = parent
-                parent = self.get_parent(parent, no_iframe=True)
-                if parent is None:
-                    form = last_parent
-                    break
-            return form
-
-        form = get_parent_form(el)
-
-        # Look in form cache to see if we've already evaluated that its fellow radio buttons are indeterminate
-        found_form = False
-        for f, n, i in self.cached_indeterminate_forms:
-            if f is form and n == name:
-                found_form = True
-                if i is True:
-                    match = True
-                break
-
-        # We didn't have the form cached, so validate that the radio button is indeterminate
-        if not found_form:
-            checked = False
-            for child in self.get_descendants(form, no_iframe=True):
-                if child is el:
-                    continue
-                tag_name = self.get_tag(child)
-                if tag_name == 'input':
-                    is_radio = False
-                    check = False
-                    has_name = False
-                    for k, v in self.iter_attributes(child):
-                        if util.lower(k) == 'type' and util.lower(v) == 'radio':
-                            is_radio = True
-                        elif util.lower(k) == 'name' and v == name:
-                            has_name = True
-                        elif util.lower(k) == 'checked':
-                            check = True
-                        if is_radio and check and has_name and get_parent_form(child) is form:
-                            checked = True
-                            break
-                if checked:
-                    break
-            if not checked:
-                match = True
-            self.cached_indeterminate_forms.append((form, name, match))
-
-        return match
-
-    def match_lang(self, el: bs4.Tag, langs: tuple[ct.SelectorLang, ...]) -> bool:
-        """Match languages."""
-
-        match = False
-        has_ns = self.supports_namespaces()
-        root = self.root
-        has_html_namespace = self.has_html_namespace
-
-        # Walk parents looking for `lang` (HTML) or `xml:lang` XML property.
-        parent = el
-        found_lang = None
-        last = None
-        while not found_lang:
-            has_html_ns = self.has_html_ns(parent)
-            for k, v in self.iter_attributes(parent):
-                attr_ns, attr = self.split_namespace(parent, k)
-                if (
-                    ((not has_ns or has_html_ns) and (util.lower(k) if not self.is_xml else k) == 'lang') or
-                    (
-                        has_ns and not has_html_ns and attr_ns == NS_XML and
-                        (util.lower(attr) if not self.is_xml and attr is not None else attr) == 'lang'
-                    )
-                ):
-                    found_lang = v
-                    break
-            last = parent
-            parent = self.get_parent(parent, no_iframe=self.is_html)
-
-            if parent is None:
-                root = last
-                has_html_namespace = self.has_html_ns(root)
-                parent = last
-                break
-
-        # Use cached meta language.
-        if found_lang is None and self.cached_meta_lang:
-            for cache in self.cached_meta_lang:
-                if root is cache[0]:
-                    found_lang = cache[1]
-
-        # If we couldn't find a language, and the document is HTML, look to meta to determine language.
-        if found_lang is None and (not self.is_xml or (has_html_namespace and root.name == 'html')):
-            # Find head
-            found = False
-            for tag in ('html', 'head'):
-                found = False
-                for child in self.get_children(parent, no_iframe=self.is_html):
-                    if self.get_tag(child) == tag and self.is_html_tag(child):
-                        found = True
-                        parent = child
-                        break
-                if not found:  # pragma: no cover
-                    break
-
-            # Search meta tags
-            if found:
-                for child in parent:
-                    if self.is_tag(child) and self.get_tag(child) == 'meta' and self.is_html_tag(parent):
-                        c_lang = False
-                        content = None
-                        for k, v in self.iter_attributes(child):
-                            if util.lower(k) == 'http-equiv' and util.lower(v) == 'content-language':
-                                c_lang = True
-                            if util.lower(k) == 'content':
-                                content = v
-                            if c_lang and content:
-                                found_lang = content
-                                self.cached_meta_lang.append((cast(str, root), cast(str, found_lang)))
-                                break
-                    if found_lang is not None:
-                        break
-                if found_lang is None:
-                    self.cached_meta_lang.append((cast(str, root), ''))
-
-        # If we determined a language, compare.
-        if found_lang is not None:
-            for patterns in langs:
-                match = False
-                for pattern in patterns:
-                    if self.extended_language_filter(pattern, cast(str, found_lang)):
-                        match = True
-                if not match:
-                    break
-
-        return match
-
-    def match_dir(self, el: bs4.Tag, directionality: int) -> bool:
-        """Check directionality."""
-
-        # If we have to match both left and right, we can't match either.
-        if directionality & ct.SEL_DIR_LTR and directionality & ct.SEL_DIR_RTL:
-            return False
-
-        if el is None or not self.is_html_tag(el):
-            return False
-
-        # Element has defined direction of left to right or right to left
-        direction = DIR_MAP.get(util.lower(self.get_attribute_by_name(el, 'dir', '')), None)
-        if direction not in (None, 0):
-            return direction == directionality
-
-        # Element is the document element (the root) and no direction assigned, assume left to right.
-        is_root = self.is_root(el)
-        if is_root and direction is None:
-            return ct.SEL_DIR_LTR == directionality
-
-        # If `input[type=telephone]` and no direction is assigned, assume left to right.
-        name = self.get_tag(el)
-        is_input = name == 'input'
-        is_textarea = name == 'textarea'
-        is_bdi = name == 'bdi'
-        itype = util.lower(self.get_attribute_by_name(el, 'type', '')) if is_input else ''
-        if is_input and itype == 'tel' and direction is None:
-            return ct.SEL_DIR_LTR == directionality
-
-        # Auto handling for text inputs
-        if ((is_input and itype in ('text', 'search', 'tel', 'url', 'email')) or is_textarea) and direction == 0:
-            if is_textarea:
-                value = ''.join(node for node in self.get_contents(el, no_iframe=True) if self.is_content_string(node))
-            else:
-                value = cast(str, self.get_attribute_by_name(el, 'value', ''))
-            if value:
-                for c in value:
-                    bidi = unicodedata.bidirectional(c)
-                    if bidi in ('AL', 'R', 'L'):
-                        direction = ct.SEL_DIR_LTR if bidi == 'L' else ct.SEL_DIR_RTL
-                        return direction == directionality
-                # Assume left to right
-                return ct.SEL_DIR_LTR == directionality
-            elif is_root:
-                return ct.SEL_DIR_LTR == directionality
-            return self.match_dir(self.get_parent(el, no_iframe=True), directionality)
-
-        # Auto handling for `bdi` and other non text inputs.
-        if (is_bdi and direction is None) or direction == 0:
-            direction = self.find_bidi(el)
-            if direction is not None:
-                return direction == directionality
-            elif is_root:
-                return ct.SEL_DIR_LTR == directionality
-            return self.match_dir(self.get_parent(el, no_iframe=True), directionality)
-
-        # Match parents direction
-        return self.match_dir(self.get_parent(el, no_iframe=True), directionality)
-
-    def match_range(self, el: bs4.Tag, condition: int) -> bool:
-        """
-        Match range.
-
-        Behavior is modeled after what we see in browsers. Browsers seem to evaluate
-        if the value is out of range, and if not, it is in range. So a missing value
-        will not evaluate out of range; therefore, value is in range. Personally, I
-        feel like this should evaluate as neither in or out of range.
-        """
-
-        out_of_range = False
-
-        itype = util.lower(self.get_attribute_by_name(el, 'type'))
-        mn = Inputs.parse_value(itype, cast(str, self.get_attribute_by_name(el, 'min', None)))
-        mx = Inputs.parse_value(itype, cast(str, self.get_attribute_by_name(el, 'max', None)))
-
-        # There is no valid min or max, so we cannot evaluate a range
-        if mn is None and mx is None:
-            return False
-
-        value = Inputs.parse_value(itype, cast(str, self.get_attribute_by_name(el, 'value', None)))
-        if value is not None:
-            if itype in ("date", "datetime-local", "month", "week", "number", "range"):
-                if mn is not None and value < mn:
-                    out_of_range = True
-                if not out_of_range and mx is not None and value > mx:
-                    out_of_range = True
-            elif itype == "time":
-                if mn is not None and mx is not None and mn > mx:
-                    # Time is periodic, so this is a reversed/discontinuous range
-                    if value < mn and value > mx:
-                        out_of_range = True
-                else:
-                    if mn is not None and value < mn:
-                        out_of_range = True
-                    if not out_of_range and mx is not None and value > mx:
-                        out_of_range = True
-
-        return not out_of_range if condition & ct.SEL_IN_RANGE else out_of_range
-
-    def match_defined(self, el: bs4.Tag) -> bool:
-        """
-        Match defined.
-
-        `:defined` is related to custom elements in a browser.
-
-        - If the document is XML (not XHTML), all tags will match.
-        - Tags that are not custom (don't have a hyphen) are marked defined.
-        - If the tag has a prefix (without or without a namespace), it will not match.
-
-        This is of course requires the parser to provide us with the proper prefix and namespace info,
-        if it doesn't, there is nothing we can do.
-        """
-
-        name = self.get_tag(el)
-        return (
-            name is not None and (
-                name.find('-') == -1 or
-                name.find(':') != -1 or
-                self.get_prefix(el) is not None
-            )
-        )
-
-    def match_placeholder_shown(self, el: bs4.Tag) -> bool:
-        """
-        Match placeholder shown according to HTML spec.
-
-        - text area should be checked if they have content. A single newline does not count as content.
-
-        """
-
-        match = False
-        content = self.get_text(el)
-        if content in ('', '\n'):
-            match = True
-
-        return match
-
-    def match_selectors(self, el: bs4.Tag, selectors: ct.SelectorList) -> bool:
-        """Check if element matches one of the selectors."""
-
-        match = False
-        is_not = selectors.is_not
-        is_html = selectors.is_html
-
-        # Internal selector lists that use the HTML flag, will automatically get the `html` namespace.
-        if is_html:
-            namespaces = self.namespaces
-            iframe_restrict = self.iframe_restrict
-            self.namespaces = {'html': NS_XHTML}
-            self.iframe_restrict = True
-
-        if not is_html or self.is_html:
-            for selector in selectors:
-                match = is_not
-                # We have a un-matchable situation (like `:focus` as you can focus an element in this environment)
-                if isinstance(selector, ct.SelectorNull):
-                    continue
-                # Verify tag matches
-                if not self.match_tag(el, selector.tag):
-                    continue
-                # Verify tag is defined
-                if selector.flags & ct.SEL_DEFINED and not self.match_defined(el):
-                    continue
-                # Verify element is root
-                if selector.flags & ct.SEL_ROOT and not self.match_root(el):
-                    continue
-                # Verify element is scope
-                if selector.flags & ct.SEL_SCOPE and not self.match_scope(el):
-                    continue
-                # Verify element has placeholder shown
-                if selector.flags & ct.SEL_PLACEHOLDER_SHOWN and not self.match_placeholder_shown(el):
-                    continue
-                # Verify `nth` matches
-                if not self.match_nth(el, selector.nth):
-                    continue
-                if selector.flags & ct.SEL_EMPTY and not self.match_empty(el):
-                    continue
-                # Verify id matches
-                if selector.ids and not self.match_id(el, selector.ids):
-                    continue
-                # Verify classes match
-                if selector.classes and not self.match_classes(el, selector.classes):
-                    continue
-                # Verify attribute(s) match
-                if not self.match_attributes(el, selector.attributes):
-                    continue
-                # Verify ranges
-                if selector.flags & RANGES and not self.match_range(el, selector.flags & RANGES):
-                    continue
-                # Verify language patterns
-                if selector.lang and not self.match_lang(el, selector.lang):
-                    continue
-                # Verify pseudo selector patterns
-                if selector.selectors and not self.match_subselectors(el, selector.selectors):
-                    continue
-                # Verify relationship selectors
-                if selector.relation and not self.match_relations(el, selector.relation):
-                    continue
-                # Validate that the current default selector match corresponds to the first submit button in the form
-                if selector.flags & ct.SEL_DEFAULT and not self.match_default(el):
-                    continue
-                # Validate that the unset radio button is among radio buttons with the same name in a form that are
-                # also not set.
-                if selector.flags & ct.SEL_INDETERMINATE and not self.match_indeterminate(el):
-                    continue
-                # Validate element directionality
-                if selector.flags & DIR_FLAGS and not self.match_dir(el, selector.flags & DIR_FLAGS):
-                    continue
-                # Validate that the tag contains the specified text.
-                if selector.contains and not self.match_contains(el, selector.contains):
-                    continue
-                match = not is_not
-                break
-
-        # Restore actual namespaces being used for external selector lists
-        if is_html:
-            self.namespaces = namespaces
-            self.iframe_restrict = iframe_restrict
-
-        return match
-
-    def select(self, limit: int = 0) -> Iterator[bs4.Tag]:
-        """Match all tags under the targeted tag."""
-
-        lim = None if limit < 1 else limit
-
-        for child in self.get_descendants(self.tag):
-            if self.match(child):
-                yield child
-                if lim is not None:
-                    lim -= 1
-                    if lim < 1:
-                        break
-
-    def closest(self) -> bs4.Tag | None:
-        """Match closest ancestor."""
-
-        current = self.tag
-        closest = None
-        while closest is None and current is not None:
-            if self.match(current):
-                closest = current
-            else:
-                current = self.get_parent(current)
-        return closest
-
-    def filter(self) -> list[bs4.Tag]:  # noqa A001
-        """Filter tag's children."""
-
-        return [tag for tag in self.get_contents(self.tag) if not self.is_navigable_string(tag) and self.match(tag)]
-
-    def match(self, el: bs4.Tag) -> bool:
-        """Match."""
-
-        return not self.is_doc(el) and self.is_tag(el) and self.match_selectors(el, self.selectors)
-
-
-class SoupSieve(ct.Immutable):
-    """Compiled Soup Sieve selector matching object."""
-
-    pattern: str
-    selectors: ct.SelectorList
-    namespaces: ct.Namespaces | None
-    custom: dict[str, str]
-    flags: int
-
-    __slots__ = ("pattern", "selectors", "namespaces", "custom", "flags", "_hash")
-
-    def __init__(
-        self,
-        pattern: str,
-        selectors: ct.SelectorList,
-        namespaces: ct.Namespaces | None,
-        custom: ct.CustomSelectors | None,
-        flags: int
-    ):
-        """Initialize."""
-
-        super().__init__(
-            pattern=pattern,
-            selectors=selectors,
-            namespaces=namespaces,
-            custom=custom,
-            flags=flags
-        )
-
-    def match(self, tag: bs4.Tag) -> bool:
-        """Match."""
-
-        return CSSMatch(self.selectors, tag, self.namespaces, self.flags).match(tag)
-
-    def closest(self, tag: bs4.Tag) -> bs4.Tag:
-        """Match closest ancestor."""
-
-        return CSSMatch(self.selectors, tag, self.namespaces, self.flags).closest()
-
-    def filter(self, iterable: Iterable[bs4.Tag]) -> list[bs4.Tag]:  # noqa A001
-        """
-        Filter.
-
-        `CSSMatch` can cache certain searches for tags of the same document,
-        so if we are given a tag, all tags are from the same document,
-        and we can take advantage of the optimization.
-
-        Any other kind of iterable could have tags from different documents or detached tags,
-        so for those, we use a new `CSSMatch` for each item in the iterable.
-        """
-
-        if CSSMatch.is_tag(iterable):
-            return CSSMatch(self.selectors, iterable, self.namespaces, self.flags).filter()
-        else:
-            return [node for node in iterable if not CSSMatch.is_navigable_string(node) and self.match(node)]
-
-    def select_one(self, tag: bs4.Tag) -> bs4.Tag:
-        """Select a single tag."""
-
-        tags = self.select(tag, limit=1)
-        return tags[0] if tags else None
-
-    def select(self, tag: bs4.Tag, limit: int = 0) -> list[bs4.Tag]:
-        """Select the specified tags."""
-
-        return list(self.iselect(tag, limit))
-
-    def iselect(self, tag: bs4.Tag, limit: int = 0) -> Iterator[bs4.Tag]:
-        """Iterate the specified tags."""
-
-        yield from CSSMatch(self.selectors, tag, self.namespaces, self.flags).select(limit)
-
-    def __repr__(self) -> str:  # pragma: no cover
-        """Representation."""
-
-        return (
-            f"SoupSieve(pattern={self.pattern!r}, namespaces={self.namespaces!r}, "
-            f"custom={self.custom!r}, flags={self.flags!r})"
-        )
-
-    __str__ = __repr__
-
-
-ct.pickle_register(SoupSieve)
diff --git a/lib/soupsieve/css_parser.py b/lib/soupsieve/css_parser.py
deleted file mode 100644
index 14cf54a2..00000000
--- a/lib/soupsieve/css_parser.py
+++ /dev/null
@@ -1,1280 +0,0 @@
-"""CSS selector parser."""
-from __future__ import annotations
-import re
-from functools import lru_cache
-from . import util
-from . import css_match as cm
-from . import css_types as ct
-from .util import SelectorSyntaxError
-import warnings
-from typing import Match, Any, Iterator, cast
-
-UNICODE_REPLACEMENT_CHAR = 0xFFFD
-
-# Simple pseudo classes that take no parameters
-PSEUDO_SIMPLE = {
-    ":any-link",
-    ":empty",
-    ":first-child",
-    ":first-of-type",
-    ":in-range",
-    ":out-of-range",
-    ":last-child",
-    ":last-of-type",
-    ":link",
-    ":only-child",
-    ":only-of-type",
-    ":root",
-    ':checked',
-    ':default',
-    ':disabled',
-    ':enabled',
-    ':indeterminate',
-    ':optional',
-    ':placeholder-shown',
-    ':read-only',
-    ':read-write',
-    ':required',
-    ':scope',
-    ':defined'
-}
-
-# Supported, simple pseudo classes that match nothing in the Soup Sieve environment
-PSEUDO_SIMPLE_NO_MATCH = {
-    ':active',
-    ':current',
-    ':focus',
-    ':focus-visible',
-    ':focus-within',
-    ':future',
-    ':host',
-    ':hover',
-    ':local-link',
-    ':past',
-    ':paused',
-    ':playing',
-    ':target',
-    ':target-within',
-    ':user-invalid',
-    ':visited'
-}
-
-# Complex pseudo classes that take selector lists
-PSEUDO_COMPLEX = {
-    ':contains',
-    ':-soup-contains',
-    ':-soup-contains-own',
-    ':has',
-    ':is',
-    ':matches',
-    ':not',
-    ':where'
-}
-
-PSEUDO_COMPLEX_NO_MATCH = {
-    ':current',
-    ':host',
-    ':host-context'
-}
-
-# Complex pseudo classes that take very specific parameters and are handled special
-PSEUDO_SPECIAL = {
-    ':dir',
-    ':lang',
-    ':nth-child',
-    ':nth-last-child',
-    ':nth-last-of-type',
-    ':nth-of-type'
-}
-
-PSEUDO_SUPPORTED = PSEUDO_SIMPLE | PSEUDO_SIMPLE_NO_MATCH | PSEUDO_COMPLEX | PSEUDO_COMPLEX_NO_MATCH | PSEUDO_SPECIAL
-
-# Sub-patterns parts
-# Whitespace
-NEWLINE = r'(?:\r\n|(?!\r\n)[\n\f\r])'
-WS = fr'(?:[ \t]|{NEWLINE})'
-# Comments
-COMMENTS = r'(?:/\*[^*]*\*+(?:[^/*][^*]*\*+)*/)'
-# Whitespace with comments included
-WSC = fr'(?:{WS}|{COMMENTS})'
-# CSS escapes
-CSS_ESCAPES = fr'(?:\\(?:[a-f0-9]{{1,6}}{WS}?|[^\r\n\f]|$))'
-CSS_STRING_ESCAPES = fr'(?:\\(?:[a-f0-9]{{1,6}}{WS}?|[^\r\n\f]|$|{NEWLINE}))'
-# CSS Identifier
-IDENTIFIER = fr'''
-(?:(?:-?(?:[^\x00-\x2f\x30-\x40\x5B-\x5E\x60\x7B-\x9f]|{CSS_ESCAPES})+|--)
-(?:[^\x00-\x2c\x2e\x2f\x3A-\x40\x5B-\x5E\x60\x7B-\x9f]|{CSS_ESCAPES})*)
-'''
-# `nth` content
-NTH = fr'(?:[-+])?(?:[0-9]+n?|n)(?:(?<=n){WSC}*(?:[-+]){WSC}*(?:[0-9]+))?'
-# Value: quoted string or identifier
-VALUE = fr'''(?:"(?:\\(?:.|{NEWLINE})|[^\\"\r\n\f]+)*?"|'(?:\\(?:.|{NEWLINE})|[^\\'\r\n\f]+)*?'|{IDENTIFIER}+)'''
-# Attribute value comparison. `!=` is handled special as it is non-standard.
-ATTR = fr'(?:{WSC}*(?P<cmp>[!~^|*$]?=){WSC}*(?P<value>{VALUE})(?:{WSC}*(?P<case>[is]))?)?{WSC}*\]'
-
-# Selector patterns
-# IDs (`#id`)
-PAT_ID = fr'\#{IDENTIFIER}'
-# Classes (`.class`)
-PAT_CLASS = fr'\.{IDENTIFIER}'
-# Prefix:Tag (`prefix|tag`)
-PAT_TAG = fr'(?P<tag_ns>(?:{IDENTIFIER}|\*)?\|)?(?P<tag_name>{IDENTIFIER}|\*)'
-# Attributes (`[attr]`, `[attr=value]`, etc.)
-PAT_ATTR = fr'\[{WSC}*(?P<attr_ns>(?:{IDENTIFIER}|\*)?\|)?(?P<attr_name>{IDENTIFIER}){ATTR}'
-# Pseudo class (`:pseudo-class`, `:pseudo-class(`)
-PAT_PSEUDO_CLASS = fr'(?P<name>:{IDENTIFIER})(?P<open>\({WSC}*)?'
-# Pseudo class special patterns. Matches `:pseudo-class(` for special case pseudo classes.
-PAT_PSEUDO_CLASS_SPECIAL = fr'(?P<name>:{IDENTIFIER})(?P<open>\({WSC}*)'
-# Custom pseudo class (`:--custom-pseudo`)
-PAT_PSEUDO_CLASS_CUSTOM = fr'(?P<name>:(?=--){IDENTIFIER})'
-# Closing pseudo group (`)`)
-PAT_PSEUDO_CLOSE = fr'{WSC}*\)'
-# Pseudo element (`::pseudo-element`)
-PAT_PSEUDO_ELEMENT = fr':{PAT_PSEUDO_CLASS}'
-# At rule (`@page`, etc.) (not supported)
-PAT_AT_RULE = fr'@P{IDENTIFIER}'
-# Pseudo class `nth-child` (`:nth-child(an+b [of S]?)`, `:first-child`, etc.)
-PAT_PSEUDO_NTH_CHILD = fr'''
-(?P<pseudo_nth_child>{PAT_PSEUDO_CLASS_SPECIAL}
-(?P<nth_child>{NTH}|even|odd))(?:{WSC}*\)|(?P<of>{COMMENTS}*{WS}{WSC}*of{COMMENTS}*{WS}{WSC}*))
-'''
-# Pseudo class `nth-of-type` (`:nth-of-type(an+b)`, `:first-of-type`, etc.)
-PAT_PSEUDO_NTH_TYPE = fr'''
-(?P<pseudo_nth_type>{PAT_PSEUDO_CLASS_SPECIAL}
-(?P<nth_type>{NTH}|even|odd)){WSC}*\)
-'''
-# Pseudo class language (`:lang("*-de", en)`)
-PAT_PSEUDO_LANG = fr'{PAT_PSEUDO_CLASS_SPECIAL}(?P<values>{VALUE}(?:{WSC}*,{WSC}*{VALUE})*){WSC}*\)'
-# Pseudo class direction (`:dir(ltr)`)
-PAT_PSEUDO_DIR = fr'{PAT_PSEUDO_CLASS_SPECIAL}(?P<dir>ltr|rtl){WSC}*\)'
-# Combining characters (`>`, `~`, ` `, `+`, `,`)
-PAT_COMBINE = fr'{WSC}*?(?P<relation>[,+>~]|{WS}(?![,+>~])){WSC}*'
-# Extra: Contains (`:contains(text)`)
-PAT_PSEUDO_CONTAINS = fr'{PAT_PSEUDO_CLASS_SPECIAL}(?P<values>{VALUE}(?:{WSC}*,{WSC}*{VALUE})*){WSC}*\)'
-
-# Regular expressions
-# CSS escape pattern
-RE_CSS_ESC = re.compile(fr'(?:(\\[a-f0-9]{{1,6}}{WSC}?)|(\\[^\r\n\f])|(\\$))', re.I)
-RE_CSS_STR_ESC = re.compile(fr'(?:(\\[a-f0-9]{{1,6}}{WS}?)|(\\[^\r\n\f])|(\\$)|(\\{NEWLINE}))', re.I)
-# Pattern to break up `nth` specifiers
-RE_NTH = re.compile(fr'(?P<s1>[-+])?(?P<a>[0-9]+n?|n)(?:(?<=n){WSC}*(?P<s2>[-+]){WSC}*(?P<b>[0-9]+))?', re.I)
-# Pattern to iterate multiple values.
-RE_VALUES = re.compile(fr'(?:(?P<value>{VALUE})|(?P<split>{WSC}*,{WSC}*))', re.X)
-# Whitespace checks
-RE_WS = re.compile(WS)
-RE_WS_BEGIN = re.compile(fr'^{WSC}*')
-RE_WS_END = re.compile(fr'{WSC}*$')
-RE_CUSTOM = re.compile(fr'^{PAT_PSEUDO_CLASS_CUSTOM}$', re.X)
-
-# Constants
-# List split token
-COMMA_COMBINATOR = ','
-# Relation token for descendant
-WS_COMBINATOR = " "
-
-# Parse flags
-FLG_PSEUDO = 0x01
-FLG_NOT = 0x02
-FLG_RELATIVE = 0x04
-FLG_DEFAULT = 0x08
-FLG_HTML = 0x10
-FLG_INDETERMINATE = 0x20
-FLG_OPEN = 0x40
-FLG_IN_RANGE = 0x80
-FLG_OUT_OF_RANGE = 0x100
-FLG_PLACEHOLDER_SHOWN = 0x200
-FLG_FORGIVE = 0x400
-
-# Maximum cached patterns to store
-_MAXCACHE = 500
-
-
-@lru_cache(maxsize=_MAXCACHE)
-def _cached_css_compile(
-    pattern: str,
-    namespaces: ct.Namespaces | None,
-    custom: ct.CustomSelectors | None,
-    flags: int
-) -> cm.SoupSieve:
-    """Cached CSS compile."""
-
-    custom_selectors = process_custom(custom)
-    return cm.SoupSieve(
-        pattern,
-        CSSParser(
-            pattern,
-            custom=custom_selectors,
-            flags=flags
-        ).process_selectors(),
-        namespaces,
-        custom,
-        flags
-    )
-
-
-def _purge_cache() -> None:
-    """Purge the cache."""
-
-    _cached_css_compile.cache_clear()
-
-
-def process_custom(custom: ct.CustomSelectors | None) -> dict[str, str | ct.SelectorList]:
-    """Process custom."""
-
-    custom_selectors = {}
-    if custom is not None:
-        for key, value in custom.items():
-            name = util.lower(key)
-            if RE_CUSTOM.match(name) is None:
-                raise SelectorSyntaxError(f"The name '{name}' is not a valid custom pseudo-class name")
-            if name in custom_selectors:
-                raise KeyError(f"The custom selector '{name}' has already been registered")
-            custom_selectors[css_unescape(name)] = value
-    return custom_selectors
-
-
-def css_unescape(content: str, string: bool = False) -> str:
-    """
-    Unescape CSS value.
-
-    Strings allow for spanning the value on multiple strings by escaping a new line.
-    """
-
-    def replace(m: Match[str]) -> str:
-        """Replace with the appropriate substitute."""
-
-        if m.group(1):
-            codepoint = int(m.group(1)[1:], 16)
-            if codepoint == 0:
-                codepoint = UNICODE_REPLACEMENT_CHAR
-            value = chr(codepoint)
-        elif m.group(2):
-            value = m.group(2)[1:]
-        elif m.group(3):
-            value = '\ufffd'
-        else:
-            value = ''
-
-        return value
-
-    return (RE_CSS_ESC if not string else RE_CSS_STR_ESC).sub(replace, content)
-
-
-def escape(ident: str) -> str:
-    """Escape identifier."""
-
-    string = []
-    length = len(ident)
-    start_dash = length > 0 and ident[0] == '-'
-    if length == 1 and start_dash:
-        # Need to escape identifier that is a single `-` with no other characters
-        string.append(f'\\{ident}')
-    else:
-        for index, c in enumerate(ident):
-            codepoint = ord(c)
-            if codepoint == 0x00:
-                string.append('\ufffd')
-            elif (0x01 <= codepoint <= 0x1F) or codepoint == 0x7F:
-                string.append(f'\\{codepoint:x} ')
-            elif (index == 0 or (start_dash and index == 1)) and (0x30 <= codepoint <= 0x39):
-                string.append(f'\\{codepoint:x} ')
-            elif (
-                codepoint in (0x2D, 0x5F) or codepoint >= 0x80 or (0x30 <= codepoint <= 0x39) or
-                (0x30 <= codepoint <= 0x39) or (0x41 <= codepoint <= 0x5A) or (0x61 <= codepoint <= 0x7A)
-            ):
-                string.append(c)
-            else:
-                string.append(f'\\{c}')
-    return ''.join(string)
-
-
-class SelectorPattern:
-    """Selector pattern."""
-
-    def __init__(self, name: str, pattern: str) -> None:
-        """Initialize."""
-
-        self.name = name
-        self.re_pattern = re.compile(pattern, re.I | re.X | re.U)
-
-    def get_name(self) -> str:
-        """Get name."""
-
-        return self.name
-
-    def match(self, selector: str, index: int, flags: int) -> Match[str] | None:
-        """Match the selector."""
-
-        return self.re_pattern.match(selector, index)
-
-
-class SpecialPseudoPattern(SelectorPattern):
-    """Selector pattern."""
-
-    def __init__(self, patterns: tuple[tuple[str, tuple[str, ...], str, type[SelectorPattern]], ...]) -> None:
-        """Initialize."""
-
-        self.patterns = {}
-        for p in patterns:
-            name = p[0]
-            pattern = p[3](name, p[2])
-            for pseudo in p[1]:
-                self.patterns[pseudo] = pattern
-
-        self.matched_name = None  # type: SelectorPattern | None
-        self.re_pseudo_name = re.compile(PAT_PSEUDO_CLASS_SPECIAL, re.I | re.X | re.U)
-
-    def get_name(self) -> str:
-        """Get name."""
-
-        return '' if self.matched_name is None else self.matched_name.get_name()
-
-    def match(self, selector: str, index: int, flags: int) -> Match[str] | None:
-        """Match the selector."""
-
-        pseudo = None
-        m = self.re_pseudo_name.match(selector, index)
-        if m:
-            name = util.lower(css_unescape(m.group('name')))
-            pattern = self.patterns.get(name)
-            if pattern:
-                pseudo = pattern.match(selector, index, flags)
-                if pseudo:
-                    self.matched_name = pattern
-
-        return pseudo
-
-
-class _Selector:
-    """
-    Intermediate selector class.
-
-    This stores selector data for a compound selector as we are acquiring them.
-    Once we are done collecting the data for a compound selector, we freeze
-    the data in an object that can be pickled and hashed.
-    """
-
-    def __init__(self, **kwargs: Any) -> None:
-        """Initialize."""
-
-        self.tag = kwargs.get('tag', None)  # type: ct.SelectorTag | None
-        self.ids = kwargs.get('ids', [])  # type: list[str]
-        self.classes = kwargs.get('classes', [])  # type: list[str]
-        self.attributes = kwargs.get('attributes', [])  # type: list[ct.SelectorAttribute]
-        self.nth = kwargs.get('nth', [])  # type: list[ct.SelectorNth]
-        self.selectors = kwargs.get('selectors', [])  # type: list[ct.SelectorList]
-        self.relations = kwargs.get('relations', [])  # type: list[_Selector]
-        self.rel_type = kwargs.get('rel_type', None)  # type: str | None
-        self.contains = kwargs.get('contains', [])  # type: list[ct.SelectorContains]
-        self.lang = kwargs.get('lang', [])  # type: list[ct.SelectorLang]
-        self.flags = kwargs.get('flags', 0)  # type: int
-        self.no_match = kwargs.get('no_match', False)  # type: bool
-
-    def _freeze_relations(self, relations: list[_Selector]) -> ct.SelectorList:
-        """Freeze relation."""
-
-        if relations:
-            sel = relations[0]
-            sel.relations.extend(relations[1:])
-            return ct.SelectorList([sel.freeze()])
-        else:
-            return ct.SelectorList()
-
-    def freeze(self) -> ct.Selector | ct.SelectorNull:
-        """Freeze self."""
-
-        if self.no_match:
-            return ct.SelectorNull()
-        else:
-            return ct.Selector(
-                self.tag,
-                tuple(self.ids),
-                tuple(self.classes),
-                tuple(self.attributes),
-                tuple(self.nth),
-                tuple(self.selectors),
-                self._freeze_relations(self.relations),
-                self.rel_type,
-                tuple(self.contains),
-                tuple(self.lang),
-                self.flags
-            )
-
-    def __str__(self) -> str:  # pragma: no cover
-        """String representation."""
-
-        return (
-            f'_Selector(tag={self.tag!r}, ids={self.ids!r}, classes={self.classes!r}, attributes={self.attributes!r}, '
-            f'nth={self.nth!r}, selectors={self.selectors!r}, relations={self.relations!r}, '
-            f'rel_type={self.rel_type!r}, contains={self.contains!r}, lang={self.lang!r}, flags={self.flags!r}, '
-            f'no_match={self.no_match!r})'
-        )
-
-    __repr__ = __str__
-
-
-class CSSParser:
-    """Parse CSS selectors."""
-
-    css_tokens = (
-        SelectorPattern("pseudo_close", PAT_PSEUDO_CLOSE),
-        SpecialPseudoPattern(
-            (
-                (
-                    "pseudo_contains",
-                    (':contains', ':-soup-contains', ':-soup-contains-own'),
-                    PAT_PSEUDO_CONTAINS,
-                    SelectorPattern
-                ),
-                ("pseudo_nth_child", (':nth-child', ':nth-last-child'), PAT_PSEUDO_NTH_CHILD, SelectorPattern),
-                ("pseudo_nth_type", (':nth-of-type', ':nth-last-of-type'), PAT_PSEUDO_NTH_TYPE, SelectorPattern),
-                ("pseudo_lang", (':lang',), PAT_PSEUDO_LANG, SelectorPattern),
-                ("pseudo_dir", (':dir',), PAT_PSEUDO_DIR, SelectorPattern)
-            )
-        ),
-        SelectorPattern("pseudo_class_custom", PAT_PSEUDO_CLASS_CUSTOM),
-        SelectorPattern("pseudo_class", PAT_PSEUDO_CLASS),
-        SelectorPattern("pseudo_element", PAT_PSEUDO_ELEMENT),
-        SelectorPattern("at_rule", PAT_AT_RULE),
-        SelectorPattern("id", PAT_ID),
-        SelectorPattern("class", PAT_CLASS),
-        SelectorPattern("tag", PAT_TAG),
-        SelectorPattern("attribute", PAT_ATTR),
-        SelectorPattern("combine", PAT_COMBINE)
-    )
-
-    def __init__(
-        self,
-        selector: str,
-        custom: dict[str, str | ct.SelectorList] | None = None,
-        flags: int = 0
-    ) -> None:
-        """Initialize."""
-
-        self.pattern = selector.replace('\x00', '\ufffd')
-        self.flags = flags
-        self.debug = self.flags & util.DEBUG
-        self.custom = {} if custom is None else custom
-
-    def parse_attribute_selector(self, sel: _Selector, m: Match[str], has_selector: bool) -> bool:
-        """Create attribute selector from the returned regex match."""
-
-        inverse = False
-        op = m.group('cmp')
-        case = util.lower(m.group('case')) if m.group('case') else None
-        ns = css_unescape(m.group('attr_ns')[:-1]) if m.group('attr_ns') else ''
-        attr = css_unescape(m.group('attr_name'))
-        is_type = False
-        pattern2 = None
-        value = ''
-
-        if case:
-            flags = (re.I if case == 'i' else 0) | re.DOTALL
-        elif util.lower(attr) == 'type':
-            flags = re.I | re.DOTALL
-            is_type = True
-        else:
-            flags = re.DOTALL
-
-        if op:
-            if m.group('value').startswith(('"', "'")):
-                value = css_unescape(m.group('value')[1:-1], True)
-            else:
-                value = css_unescape(m.group('value'))
-
-        if not op:
-            # Attribute name
-            pattern = None
-        elif op.startswith('^'):
-            # Value start with
-            pattern = re.compile(r'^%s.*' % re.escape(value), flags)
-        elif op.startswith('$'):
-            # Value ends with
-            pattern = re.compile(r'.*?%s$' % re.escape(value), flags)
-        elif op.startswith('*'):
-            # Value contains
-            pattern = re.compile(r'.*?%s.*' % re.escape(value), flags)
-        elif op.startswith('~'):
-            # Value contains word within space separated list
-            # `~=` should match nothing if it is empty or contains whitespace,
-            # so if either of these cases is present, use `[^\s\S]` which cannot be matched.
-            value = r'[^\s\S]' if not value or RE_WS.search(value) else re.escape(value)
-            pattern = re.compile(r'.*?(?:(?<=^)|(?<=[ \t\r\n\f]))%s(?=(?:[ \t\r\n\f]|$)).*' % value, flags)
-        elif op.startswith('|'):
-            # Value starts with word in dash separated list
-            pattern = re.compile(r'^%s(?:-.*)?$' % re.escape(value), flags)
-        else:
-            # Value matches
-            pattern = re.compile(r'^%s$' % re.escape(value), flags)
-            if op.startswith('!'):
-                # Equivalent to `:not([attr=value])`
-                inverse = True
-        if is_type and pattern:
-            pattern2 = re.compile(pattern.pattern)
-
-        # Append the attribute selector
-        sel_attr = ct.SelectorAttribute(attr, ns, pattern, pattern2)
-        if inverse:
-            # If we are using `!=`, we need to nest the pattern under a `:not()`.
-            sub_sel = _Selector()
-            sub_sel.attributes.append(sel_attr)
-            not_list = ct.SelectorList([sub_sel.freeze()], True, False)
-            sel.selectors.append(not_list)
-        else:
-            sel.attributes.append(sel_attr)
-
-        has_selector = True
-        return has_selector
-
-    def parse_tag_pattern(self, sel: _Selector, m: Match[str], has_selector: bool) -> bool:
-        """Parse tag pattern from regex match."""
-
-        prefix = css_unescape(m.group('tag_ns')[:-1]) if m.group('tag_ns') else None
-        tag = css_unescape(m.group('tag_name'))
-        sel.tag = ct.SelectorTag(tag, prefix)
-        has_selector = True
-        return has_selector
-
-    def parse_pseudo_class_custom(self, sel: _Selector, m: Match[str], has_selector: bool) -> bool:
-        """
-        Parse custom pseudo class alias.
-
-        Compile custom selectors as we need them. When compiling a custom selector,
-        set it to `None` in the dictionary so we can avoid an infinite loop.
-        """
-
-        pseudo = util.lower(css_unescape(m.group('name')))
-        selector = self.custom.get(pseudo)
-        if selector is None:
-            raise SelectorSyntaxError(
-                f"Undefined custom selector '{pseudo}' found at position {m.end(0)}",
-                self.pattern,
-                m.end(0)
-            )
-
-        if not isinstance(selector, ct.SelectorList):
-            del self.custom[pseudo]
-            selector = CSSParser(
-                selector, custom=self.custom, flags=self.flags
-            ).process_selectors(flags=FLG_PSEUDO)
-            self.custom[pseudo] = selector
-
-        sel.selectors.append(selector)
-        has_selector = True
-        return has_selector
-
-    def parse_pseudo_class(
-        self,
-        sel: _Selector,
-        m: Match[str],
-        has_selector: bool,
-        iselector: Iterator[tuple[str, Match[str]]],
-        is_html: bool
-    ) -> tuple[bool, bool]:
-        """Parse pseudo class."""
-
-        complex_pseudo = False
-        pseudo = util.lower(css_unescape(m.group('name')))
-        if m.group('open'):
-            complex_pseudo = True
-        if complex_pseudo and pseudo in PSEUDO_COMPLEX:
-            has_selector = self.parse_pseudo_open(sel, pseudo, has_selector, iselector, m.end(0))
-        elif not complex_pseudo and pseudo in PSEUDO_SIMPLE:
-            if pseudo == ':root':
-                sel.flags |= ct.SEL_ROOT
-            elif pseudo == ':defined':
-                sel.flags |= ct.SEL_DEFINED
-                is_html = True
-            elif pseudo == ':scope':
-                sel.flags |= ct.SEL_SCOPE
-            elif pseudo == ':empty':
-                sel.flags |= ct.SEL_EMPTY
-            elif pseudo in (':link', ':any-link'):
-                sel.selectors.append(CSS_LINK)
-            elif pseudo == ':checked':
-                sel.selectors.append(CSS_CHECKED)
-            elif pseudo == ':default':
-                sel.selectors.append(CSS_DEFAULT)
-            elif pseudo == ':indeterminate':
-                sel.selectors.append(CSS_INDETERMINATE)
-            elif pseudo == ":disabled":
-                sel.selectors.append(CSS_DISABLED)
-            elif pseudo == ":enabled":
-                sel.selectors.append(CSS_ENABLED)
-            elif pseudo == ":required":
-                sel.selectors.append(CSS_REQUIRED)
-            elif pseudo == ":optional":
-                sel.selectors.append(CSS_OPTIONAL)
-            elif pseudo == ":read-only":
-                sel.selectors.append(CSS_READ_ONLY)
-            elif pseudo == ":read-write":
-                sel.selectors.append(CSS_READ_WRITE)
-            elif pseudo == ":in-range":
-                sel.selectors.append(CSS_IN_RANGE)
-            elif pseudo == ":out-of-range":
-                sel.selectors.append(CSS_OUT_OF_RANGE)
-            elif pseudo == ":placeholder-shown":
-                sel.selectors.append(CSS_PLACEHOLDER_SHOWN)
-            elif pseudo == ':first-child':
-                sel.nth.append(ct.SelectorNth(1, False, 0, False, False, ct.SelectorList()))
-            elif pseudo == ':last-child':
-                sel.nth.append(ct.SelectorNth(1, False, 0, False, True, ct.SelectorList()))
-            elif pseudo == ':first-of-type':
-                sel.nth.append(ct.SelectorNth(1, False, 0, True, False, ct.SelectorList()))
-            elif pseudo == ':last-of-type':
-                sel.nth.append(ct.SelectorNth(1, False, 0, True, True, ct.SelectorList()))
-            elif pseudo == ':only-child':
-                sel.nth.extend(
-                    [
-                        ct.SelectorNth(1, False, 0, False, False, ct.SelectorList()),
-                        ct.SelectorNth(1, False, 0, False, True, ct.SelectorList())
-                    ]
-                )
-            elif pseudo == ':only-of-type':
-                sel.nth.extend(
-                    [
-                        ct.SelectorNth(1, False, 0, True, False, ct.SelectorList()),
-                        ct.SelectorNth(1, False, 0, True, True, ct.SelectorList())
-                    ]
-                )
-            has_selector = True
-        elif complex_pseudo and pseudo in PSEUDO_COMPLEX_NO_MATCH:
-            self.parse_selectors(iselector, m.end(0), FLG_PSEUDO | FLG_OPEN)
-            sel.no_match = True
-            has_selector = True
-        elif not complex_pseudo and pseudo in PSEUDO_SIMPLE_NO_MATCH:
-            sel.no_match = True
-            has_selector = True
-        elif pseudo in PSEUDO_SUPPORTED:
-            raise SelectorSyntaxError(
-                f"Invalid syntax for pseudo class '{pseudo}'",
-                self.pattern,
-                m.start(0)
-            )
-        else:
-            raise NotImplementedError(
-                f"'{pseudo}' pseudo-class is not implemented at this time"
-            )
-
-        return has_selector, is_html
-
-    def parse_pseudo_nth(
-        self,
-        sel: _Selector,
-        m: Match[str],
-        has_selector: bool,
-        iselector: Iterator[tuple[str, Match[str]]]
-    ) -> bool:
-        """Parse `nth` pseudo."""
-
-        mdict = m.groupdict()
-        if mdict.get('pseudo_nth_child'):
-            postfix = '_child'
-        else:
-            postfix = '_type'
-        mdict['name'] = util.lower(css_unescape(mdict['name']))
-        content = util.lower(mdict.get('nth' + postfix))
-        if content == 'even':
-            # 2n
-            s1 = 2
-            s2 = 0
-            var = True
-        elif content == 'odd':
-            # 2n+1
-            s1 = 2
-            s2 = 1
-            var = True
-        else:
-            nth_parts = cast(Match[str], RE_NTH.match(content))
-            _s1 = '-' if nth_parts.group('s1') and nth_parts.group('s1') == '-' else ''
-            a = nth_parts.group('a')
-            var = a.endswith('n')
-            if a.startswith('n'):
-                _s1 += '1'
-            elif var:
-                _s1 += a[:-1]
-            else:
-                _s1 += a
-            _s2 = '-' if nth_parts.group('s2') and nth_parts.group('s2') == '-' else ''
-            if nth_parts.group('b'):
-                _s2 += nth_parts.group('b')
-            else:
-                _s2 = '0'
-            s1 = int(_s1, 10)
-            s2 = int(_s2, 10)
-
-        pseudo_sel = mdict['name']
-        if postfix == '_child':
-            if m.group('of'):
-                # Parse the rest of `of S`.
-                nth_sel = self.parse_selectors(iselector, m.end(0), FLG_PSEUDO | FLG_OPEN)
-            else:
-                # Use default `*|*` for `of S`.
-                nth_sel = CSS_NTH_OF_S_DEFAULT
-            if pseudo_sel == ':nth-child':
-                sel.nth.append(ct.SelectorNth(s1, var, s2, False, False, nth_sel))
-            elif pseudo_sel == ':nth-last-child':
-                sel.nth.append(ct.SelectorNth(s1, var, s2, False, True, nth_sel))
-        else:
-            if pseudo_sel == ':nth-of-type':
-                sel.nth.append(ct.SelectorNth(s1, var, s2, True, False, ct.SelectorList()))
-            elif pseudo_sel == ':nth-last-of-type':
-                sel.nth.append(ct.SelectorNth(s1, var, s2, True, True, ct.SelectorList()))
-        has_selector = True
-        return has_selector
-
-    def parse_pseudo_open(
-        self,
-        sel: _Selector,
-        name: str,
-        has_selector: bool,
-        iselector: Iterator[tuple[str, Match[str]]],
-        index: int
-    ) -> bool:
-        """Parse pseudo with opening bracket."""
-
-        flags = FLG_PSEUDO | FLG_OPEN
-        if name == ':not':
-            flags |= FLG_NOT
-        elif name == ':has':
-            flags |= FLG_RELATIVE
-        elif name in (':where', ':is'):
-            flags |= FLG_FORGIVE
-
-        sel.selectors.append(self.parse_selectors(iselector, index, flags))
-        has_selector = True
-
-        return has_selector
-
-    def parse_has_combinator(
-        self,
-        sel: _Selector,
-        m: Match[str],
-        has_selector: bool,
-        selectors: list[_Selector],
-        rel_type: str,
-        index: int
-    ) -> tuple[bool, _Selector, str]:
-        """Parse combinator tokens."""
-
-        combinator = m.group('relation').strip()
-        if not combinator:
-            combinator = WS_COMBINATOR
-        if combinator == COMMA_COMBINATOR:
-            sel.rel_type = rel_type
-            selectors[-1].relations.append(sel)
-            rel_type = ":" + WS_COMBINATOR
-            selectors.append(_Selector())
-        else:
-            if has_selector:
-                # End the current selector and associate the leading combinator with this selector.
-                sel.rel_type = rel_type
-                selectors[-1].relations.append(sel)
-            elif rel_type[1:] != WS_COMBINATOR:
-                # It's impossible to have two whitespace combinators after each other as the patterns
-                # will gobble up trailing whitespace. It is also impossible to have a whitespace
-                # combinator after any other kind for the same reason. But we could have
-                # multiple non-whitespace combinators. So if the current combinator is not a whitespace,
-                # then we've hit the multiple combinator case, so we should fail.
-                raise SelectorSyntaxError(
-                    f'The multiple combinators at position {index}',
-                    self.pattern,
-                    index
-                )
-
-            # Set the leading combinator for the next selector.
-            rel_type = ':' + combinator
-
-        sel = _Selector()
-        has_selector = False
-        return has_selector, sel, rel_type
-
-    def parse_combinator(
-        self,
-        sel: _Selector,
-        m: Match[str],
-        has_selector: bool,
-        selectors: list[_Selector],
-        relations: list[_Selector],
-        is_pseudo: bool,
-        is_forgive: bool,
-        index: int
-    ) -> tuple[bool, _Selector]:
-        """Parse combinator tokens."""
-
-        combinator = m.group('relation').strip()
-        if not combinator:
-            combinator = WS_COMBINATOR
-        if not has_selector:
-            if not is_forgive or combinator != COMMA_COMBINATOR:
-                raise SelectorSyntaxError(
-                    f"The combinator '{combinator}' at position {index}, must have a selector before it",
-                    self.pattern,
-                    index
-                )
-
-            # If we are in a forgiving pseudo class, just make the selector a "no match"
-            if combinator == COMMA_COMBINATOR:
-                sel.no_match = True
-                del relations[:]
-                selectors.append(sel)
-        else:
-            if combinator == COMMA_COMBINATOR:
-                if not sel.tag and not is_pseudo:
-                    # Implied `*`
-                    sel.tag = ct.SelectorTag('*', None)
-                sel.relations.extend(relations)
-                selectors.append(sel)
-                del relations[:]
-            else:
-                sel.relations.extend(relations)
-                sel.rel_type = combinator
-                del relations[:]
-                relations.append(sel)
-
-        sel = _Selector()
-        has_selector = False
-
-        return has_selector, sel
-
-    def parse_class_id(self, sel: _Selector, m: Match[str], has_selector: bool) -> bool:
-        """Parse HTML classes and ids."""
-
-        selector = m.group(0)
-        if selector.startswith('.'):
-            sel.classes.append(css_unescape(selector[1:]))
-        else:
-            sel.ids.append(css_unescape(selector[1:]))
-        has_selector = True
-        return has_selector
-
-    def parse_pseudo_contains(self, sel: _Selector, m: Match[str], has_selector: bool) -> bool:
-        """Parse contains."""
-
-        pseudo = util.lower(css_unescape(m.group('name')))
-        if pseudo == ":contains":
-            warnings.warn(  # noqa: B028
-                "The pseudo class ':contains' is deprecated, ':-soup-contains' should be used moving forward.",
-                FutureWarning
-            )
-        contains_own = pseudo == ":-soup-contains-own"
-        values = css_unescape(m.group('values'))
-        patterns = []
-        for token in RE_VALUES.finditer(values):
-            if token.group('split'):
-                continue
-            value = token.group('value')
-            if value.startswith(("'", '"')):
-                value = css_unescape(value[1:-1], True)
-            else:
-                value = css_unescape(value)
-            patterns.append(value)
-        sel.contains.append(ct.SelectorContains(patterns, contains_own))
-        has_selector = True
-        return has_selector
-
-    def parse_pseudo_lang(self, sel: _Selector, m: Match[str], has_selector: bool) -> bool:
-        """Parse pseudo language."""
-
-        values = m.group('values')
-        patterns = []
-        for token in RE_VALUES.finditer(values):
-            if token.group('split'):
-                continue
-            value = token.group('value')
-            if value.startswith(('"', "'")):
-                value = css_unescape(value[1:-1], True)
-            else:
-                value = css_unescape(value)
-
-            patterns.append(value)
-
-        sel.lang.append(ct.SelectorLang(patterns))
-        has_selector = True
-
-        return has_selector
-
-    def parse_pseudo_dir(self, sel: _Selector, m: Match[str], has_selector: bool) -> bool:
-        """Parse pseudo direction."""
-
-        value = ct.SEL_DIR_LTR if util.lower(m.group('dir')) == 'ltr' else ct.SEL_DIR_RTL
-        sel.flags |= value
-        has_selector = True
-        return has_selector
-
-    def parse_selectors(
-        self,
-        iselector: Iterator[tuple[str, Match[str]]],
-        index: int = 0,
-        flags: int = 0
-    ) -> ct.SelectorList:
-        """Parse selectors."""
-
-        # Initialize important variables
-        sel = _Selector()
-        selectors = []
-        has_selector = False
-        closed = False
-        relations = []  # type: list[_Selector]
-        rel_type = ":" + WS_COMBINATOR
-
-        # Setup various flags
-        is_open = bool(flags & FLG_OPEN)
-        is_pseudo = bool(flags & FLG_PSEUDO)
-        is_relative = bool(flags & FLG_RELATIVE)
-        is_not = bool(flags & FLG_NOT)
-        is_html = bool(flags & FLG_HTML)
-        is_default = bool(flags & FLG_DEFAULT)
-        is_indeterminate = bool(flags & FLG_INDETERMINATE)
-        is_in_range = bool(flags & FLG_IN_RANGE)
-        is_out_of_range = bool(flags & FLG_OUT_OF_RANGE)
-        is_placeholder_shown = bool(flags & FLG_PLACEHOLDER_SHOWN)
-        is_forgive = bool(flags & FLG_FORGIVE)
-
-        # Print out useful debug stuff
-        if self.debug:  # pragma: no cover
-            if is_pseudo:
-                print('    is_pseudo: True')
-            if is_open:
-                print('    is_open: True')
-            if is_relative:
-                print('    is_relative: True')
-            if is_not:
-                print('    is_not: True')
-            if is_html:
-                print('    is_html: True')
-            if is_default:
-                print('    is_default: True')
-            if is_indeterminate:
-                print('    is_indeterminate: True')
-            if is_in_range:
-                print('    is_in_range: True')
-            if is_out_of_range:
-                print('    is_out_of_range: True')
-            if is_placeholder_shown:
-                print('    is_placeholder_shown: True')
-            if is_forgive:
-                print('    is_forgive: True')
-
-        # The algorithm for relative selectors require an initial selector in the selector list
-        if is_relative:
-            selectors.append(_Selector())
-
-        try:
-            while True:
-                key, m = next(iselector)
-
-                # Handle parts
-                if key == "at_rule":
-                    raise NotImplementedError(f"At-rules found at position {m.start(0)}")
-                elif key == 'pseudo_class_custom':
-                    has_selector = self.parse_pseudo_class_custom(sel, m, has_selector)
-                elif key == 'pseudo_class':
-                    has_selector, is_html = self.parse_pseudo_class(sel, m, has_selector, iselector, is_html)
-                elif key == 'pseudo_element':
-                    raise NotImplementedError(f"Pseudo-element found at position {m.start(0)}")
-                elif key == 'pseudo_contains':
-                    has_selector = self.parse_pseudo_contains(sel, m, has_selector)
-                elif key in ('pseudo_nth_type', 'pseudo_nth_child'):
-                    has_selector = self.parse_pseudo_nth(sel, m, has_selector, iselector)
-                elif key == 'pseudo_lang':
-                    has_selector = self.parse_pseudo_lang(sel, m, has_selector)
-                elif key == 'pseudo_dir':
-                    has_selector = self.parse_pseudo_dir(sel, m, has_selector)
-                    # Currently only supports HTML
-                    is_html = True
-                elif key == 'pseudo_close':
-                    if not has_selector:
-                        if not is_forgive:
-                            raise SelectorSyntaxError(
-                                f"Expected a selector at position {m.start(0)}",
-                                self.pattern,
-                                m.start(0)
-                            )
-                        sel.no_match = True
-                    if is_open:
-                        closed = True
-                        break
-                    else:
-                        raise SelectorSyntaxError(
-                            f"Unmatched pseudo-class close at position {m.start(0)}",
-                            self.pattern,
-                            m.start(0)
-                        )
-                elif key == 'combine':
-                    if is_relative:
-                        has_selector, sel, rel_type = self.parse_has_combinator(
-                            sel, m, has_selector, selectors, rel_type, index
-                        )
-                    else:
-                        has_selector, sel = self.parse_combinator(
-                            sel, m, has_selector, selectors, relations, is_pseudo, is_forgive, index
-                        )
-                elif key == 'attribute':
-                    has_selector = self.parse_attribute_selector(sel, m, has_selector)
-                elif key == 'tag':
-                    if has_selector:
-                        raise SelectorSyntaxError(
-                            f"Tag name found at position {m.start(0)} instead of at the start",
-                            self.pattern,
-                            m.start(0)
-                        )
-                    has_selector = self.parse_tag_pattern(sel, m, has_selector)
-                elif key in ('class', 'id'):
-                    has_selector = self.parse_class_id(sel, m, has_selector)
-
-                index = m.end(0)
-        except StopIteration:
-            pass
-
-        # Handle selectors that are not closed
-        if is_open and not closed:
-            raise SelectorSyntaxError(
-                f"Unclosed pseudo-class at position {index}",
-                self.pattern,
-                index
-            )
-
-        # Cleanup completed selector piece
-        if has_selector:
-            if not sel.tag and not is_pseudo:
-                # Implied `*`
-                sel.tag = ct.SelectorTag('*', None)
-            if is_relative:
-                sel.rel_type = rel_type
-                selectors[-1].relations.append(sel)
-            else:
-                sel.relations.extend(relations)
-                del relations[:]
-                selectors.append(sel)
-
-        # Forgive empty slots in pseudo-classes that have lists (and are forgiving)
-        elif is_forgive and (not selectors or not relations):
-            # Handle normal pseudo-classes with empty slots like `:is()` etc.
-            sel.no_match = True
-            del relations[:]
-            selectors.append(sel)
-            has_selector = True
-
-        if not has_selector:
-            # We will always need to finish a selector when `:has()` is used as it leads with combining.
-            # May apply to others as well.
-            raise SelectorSyntaxError(
-                f'Expected a selector at position {index}',
-                self.pattern,
-                index
-            )
-
-        # Some patterns require additional logic, such as default. We try to make these the
-        # last pattern, and append the appropriate flag to that selector which communicates
-        # to the matcher what additional logic is required.
-        if is_default:
-            selectors[-1].flags = ct.SEL_DEFAULT
-        if is_indeterminate:
-            selectors[-1].flags = ct.SEL_INDETERMINATE
-        if is_in_range:
-            selectors[-1].flags = ct.SEL_IN_RANGE
-        if is_out_of_range:
-            selectors[-1].flags = ct.SEL_OUT_OF_RANGE
-        if is_placeholder_shown:
-            selectors[-1].flags = ct.SEL_PLACEHOLDER_SHOWN
-
-        # Return selector list
-        return ct.SelectorList([s.freeze() for s in selectors], is_not, is_html)
-
-    def selector_iter(self, pattern: str) -> Iterator[tuple[str, Match[str]]]:
-        """Iterate selector tokens."""
-
-        # Ignore whitespace and comments at start and end of pattern
-        m = RE_WS_BEGIN.search(pattern)
-        index = m.end(0) if m else 0
-        m = RE_WS_END.search(pattern)
-        end = (m.start(0) - 1) if m else (len(pattern) - 1)
-
-        if self.debug:  # pragma: no cover
-            print(f'## PARSING: {pattern!r}')
-        while index <= end:
-            m = None
-            for v in self.css_tokens:
-                m = v.match(pattern, index, self.flags)
-                if m:
-                    name = v.get_name()
-                    if self.debug:  # pragma: no cover
-                        print(f"TOKEN: '{name}' --> {m.group(0)!r} at position {m.start(0)}")
-                    index = m.end(0)
-                    yield name, m
-                    break
-            if m is None:
-                c = pattern[index]
-                # If the character represents the start of one of the known selector types,
-                # throw an exception mentioning that the known selector type is in error;
-                # otherwise, report the invalid character.
-                if c == '[':
-                    msg = f"Malformed attribute selector at position {index}"
-                elif c == '.':
-                    msg = f"Malformed class selector at position {index}"
-                elif c == '#':
-                    msg = f"Malformed id selector at position {index}"
-                elif c == ':':
-                    msg = f"Malformed pseudo-class selector at position {index}"
-                else:
-                    msg = f"Invalid character {c!r} position {index}"
-                raise SelectorSyntaxError(msg, self.pattern, index)
-        if self.debug:  # pragma: no cover
-            print('## END PARSING')
-
-    def process_selectors(self, index: int = 0, flags: int = 0) -> ct.SelectorList:
-        """Process selectors."""
-
-        return self.parse_selectors(self.selector_iter(self.pattern), index, flags)
-
-
-# Precompile CSS selector lists for pseudo-classes (additional logic may be required beyond the pattern)
-# A few patterns are order dependent as they use patterns previous compiled.
-
-# CSS pattern for `:link` and `:any-link`
-CSS_LINK = CSSParser(
-    'html|*:is(a, area)[href]'
-).process_selectors(flags=FLG_PSEUDO | FLG_HTML)
-# CSS pattern for `:checked`
-CSS_CHECKED = CSSParser(
-    '''
-    html|*:is(input[type=checkbox], input[type=radio])[checked], html|option[selected]
-    '''
-).process_selectors(flags=FLG_PSEUDO | FLG_HTML)
-# CSS pattern for `:default` (must compile CSS_CHECKED first)
-CSS_DEFAULT = CSSParser(
-    '''
-    :checked,
-
-    /*
-    This pattern must be at the end.
-    Special logic is applied to the last selector.
-    */
-    html|form html|*:is(button, input)[type="submit"]
-    '''
-).process_selectors(flags=FLG_PSEUDO | FLG_HTML | FLG_DEFAULT)
-# CSS pattern for `:indeterminate`
-CSS_INDETERMINATE = CSSParser(
-    '''
-    html|input[type="checkbox"][indeterminate],
-    html|input[type="radio"]:is(:not([name]), [name=""]):not([checked]),
-    html|progress:not([value]),
-
-    /*
-    This pattern must be at the end.
-    Special logic is applied to the last selector.
-    */
-    html|input[type="radio"][name]:not([name='']):not([checked])
-    '''
-).process_selectors(flags=FLG_PSEUDO | FLG_HTML | FLG_INDETERMINATE)
-# CSS pattern for `:disabled`
-CSS_DISABLED = CSSParser(
-    '''
-    html|*:is(input:not([type=hidden]), button, select, textarea, fieldset, optgroup, option, fieldset)[disabled],
-    html|optgroup[disabled] > html|option,
-    html|fieldset[disabled] > html|*:is(input:not([type=hidden]), button, select, textarea, fieldset),
-    html|fieldset[disabled] >
-        html|*:not(legend:nth-of-type(1)) html|*:is(input:not([type=hidden]), button, select, textarea, fieldset)
-    '''
-).process_selectors(flags=FLG_PSEUDO | FLG_HTML)
-# CSS pattern for `:enabled`
-CSS_ENABLED = CSSParser(
-    '''
-    html|*:is(input:not([type=hidden]), button, select, textarea, fieldset, optgroup, option, fieldset):not(:disabled)
-    '''
-).process_selectors(flags=FLG_PSEUDO | FLG_HTML)
-# CSS pattern for `:required`
-CSS_REQUIRED = CSSParser(
-    'html|*:is(input, textarea, select)[required]'
-).process_selectors(flags=FLG_PSEUDO | FLG_HTML)
-# CSS pattern for `:optional`
-CSS_OPTIONAL = CSSParser(
-    'html|*:is(input, textarea, select):not([required])'
-).process_selectors(flags=FLG_PSEUDO | FLG_HTML)
-# CSS pattern for `:placeholder-shown`
-CSS_PLACEHOLDER_SHOWN = CSSParser(
-    '''
-    html|input:is(
-        :not([type]),
-        [type=""],
-        [type=text],
-        [type=search],
-        [type=url],
-        [type=tel],
-        [type=email],
-        [type=password],
-        [type=number]
-    )[placeholder]:not([placeholder='']):is(:not([value]), [value=""]),
-    html|textarea[placeholder]:not([placeholder=''])
-    '''
-).process_selectors(flags=FLG_PSEUDO | FLG_HTML | FLG_PLACEHOLDER_SHOWN)
-# CSS pattern default for `:nth-child` "of S" feature
-CSS_NTH_OF_S_DEFAULT = CSSParser(
-    '*|*'
-).process_selectors(flags=FLG_PSEUDO)
-# CSS pattern for `:read-write` (CSS_DISABLED must be compiled first)
-CSS_READ_WRITE = CSSParser(
-    '''
-    html|*:is(
-        textarea,
-        input:is(
-            :not([type]),
-            [type=""],
-            [type=text],
-            [type=search],
-            [type=url],
-            [type=tel],
-            [type=email],
-            [type=number],
-            [type=password],
-            [type=date],
-            [type=datetime-local],
-            [type=month],
-            [type=time],
-            [type=week]
-        )
-    ):not([readonly], :disabled),
-    html|*:is([contenteditable=""], [contenteditable="true" i])
-    '''
-).process_selectors(flags=FLG_PSEUDO | FLG_HTML)
-# CSS pattern for `:read-only`
-CSS_READ_ONLY = CSSParser(
-    '''
-    html|*:not(:read-write)
-    '''
-).process_selectors(flags=FLG_PSEUDO | FLG_HTML)
-# CSS pattern for `:in-range`
-CSS_IN_RANGE = CSSParser(
-    '''
-    html|input:is(
-        [type="date"],
-        [type="month"],
-        [type="week"],
-        [type="time"],
-        [type="datetime-local"],
-        [type="number"],
-        [type="range"]
-    ):is(
-        [min],
-        [max]
-    )
-    '''
-).process_selectors(flags=FLG_PSEUDO | FLG_IN_RANGE | FLG_HTML)
-# CSS pattern for `:out-of-range`
-CSS_OUT_OF_RANGE = CSSParser(
-    '''
-    html|input:is(
-        [type="date"],
-        [type="month"],
-        [type="week"],
-        [type="time"],
-        [type="datetime-local"],
-        [type="number"],
-        [type="range"]
-    ):is(
-        [min],
-        [max]
-    )
-    '''
-).process_selectors(flags=FLG_PSEUDO | FLG_OUT_OF_RANGE | FLG_HTML)
diff --git a/lib/soupsieve/css_types.py b/lib/soupsieve/css_types.py
deleted file mode 100644
index 71a6519b..00000000
--- a/lib/soupsieve/css_types.py
+++ /dev/null
@@ -1,407 +0,0 @@
-"""CSS selector structure items."""
-from __future__ import annotations
-import copyreg
-from .pretty import pretty
-from typing import Any, Iterator, Hashable, Pattern, Iterable, Mapping
-
-__all__ = (
-    'Selector',
-    'SelectorNull',
-    'SelectorTag',
-    'SelectorAttribute',
-    'SelectorContains',
-    'SelectorNth',
-    'SelectorLang',
-    'SelectorList',
-    'Namespaces',
-    'CustomSelectors'
-)
-
-
-SEL_EMPTY = 0x1
-SEL_ROOT = 0x2
-SEL_DEFAULT = 0x4
-SEL_INDETERMINATE = 0x8
-SEL_SCOPE = 0x10
-SEL_DIR_LTR = 0x20
-SEL_DIR_RTL = 0x40
-SEL_IN_RANGE = 0x80
-SEL_OUT_OF_RANGE = 0x100
-SEL_DEFINED = 0x200
-SEL_PLACEHOLDER_SHOWN = 0x400
-
-
-class Immutable:
-    """Immutable."""
-
-    __slots__: tuple[str, ...] = ('_hash',)
-
-    _hash: int
-
-    def __init__(self, **kwargs: Any) -> None:
-        """Initialize."""
-
-        temp = []
-        for k, v in kwargs.items():
-            temp.append(type(v))
-            temp.append(v)
-            super().__setattr__(k, v)
-        super().__setattr__('_hash', hash(tuple(temp)))
-
-    @classmethod
-    def __base__(cls) -> type[Immutable]:
-        """Get base class."""
-
-        return cls
-
-    def __eq__(self, other: Any) -> bool:
-        """Equal."""
-
-        return (
-            isinstance(other, self.__base__()) and
-            all(getattr(other, key) == getattr(self, key) for key in self.__slots__ if key != '_hash')
-        )
-
-    def __ne__(self, other: Any) -> bool:
-        """Equal."""
-
-        return (
-            not isinstance(other, self.__base__()) or
-            any(getattr(other, key) != getattr(self, key) for key in self.__slots__ if key != '_hash')
-        )
-
-    def __hash__(self) -> int:
-        """Hash."""
-
-        return self._hash
-
-    def __setattr__(self, name: str, value: Any) -> None:
-        """Prevent mutability."""
-
-        raise AttributeError(f"'{self.__class__.__name__}' is immutable")
-
-    def __repr__(self) -> str:  # pragma: no cover
-        """Representation."""
-
-        r = ', '.join([f"{k}={getattr(self, k)!r}" for k in self.__slots__[:-1]])
-        return f"{self.__class__.__name__}({r})"
-
-    __str__ = __repr__
-
-    def pretty(self) -> None:  # pragma: no cover
-        """Pretty print."""
-
-        print(pretty(self))
-
-
-class ImmutableDict(Mapping[Any, Any]):
-    """Hashable, immutable dictionary."""
-
-    def __init__(
-        self,
-        arg: dict[Any, Any] | Iterable[tuple[Any, Any]]
-    ) -> None:
-        """Initialize."""
-
-        self._validate(arg)
-        self._d = dict(arg)
-        self._hash = hash(tuple([(type(x), x, type(y), y) for x, y in sorted(self._d.items())]))
-
-    def _validate(self, arg: dict[Any, Any] | Iterable[tuple[Any, Any]]) -> None:
-        """Validate arguments."""
-
-        if isinstance(arg, dict):
-            if not all(isinstance(v, Hashable) for v in arg.values()):
-                raise TypeError(f'{self.__class__.__name__} values must be hashable')
-        elif not all(isinstance(k, Hashable) and isinstance(v, Hashable) for k, v in arg):
-            raise TypeError(f'{self.__class__.__name__} values must be hashable')
-
-    def __iter__(self) -> Iterator[Any]:
-        """Iterator."""
-
-        return iter(self._d)
-
-    def __len__(self) -> int:
-        """Length."""
-
-        return len(self._d)
-
-    def __getitem__(self, key: Any) -> Any:
-        """Get item: `namespace['key']`."""
-
-        return self._d[key]
-
-    def __hash__(self) -> int:
-        """Hash."""
-
-        return self._hash
-
-    def __repr__(self) -> str:  # pragma: no cover
-        """Representation."""
-
-        return f"{self._d!r}"
-
-    __str__ = __repr__
-
-
-class Namespaces(ImmutableDict):
-    """Namespaces."""
-
-    def __init__(self, arg: dict[str, str] | Iterable[tuple[str, str]]) -> None:
-        """Initialize."""
-
-        super().__init__(arg)
-
-    def _validate(self, arg: dict[str, str] | Iterable[tuple[str, str]]) -> None:
-        """Validate arguments."""
-
-        if isinstance(arg, dict):
-            if not all(isinstance(v, str) for v in arg.values()):
-                raise TypeError(f'{self.__class__.__name__} values must be hashable')
-        elif not all(isinstance(k, str) and isinstance(v, str) for k, v in arg):
-            raise TypeError(f'{self.__class__.__name__} keys and values must be Unicode strings')
-
-
-class CustomSelectors(ImmutableDict):
-    """Custom selectors."""
-
-    def __init__(self, arg: dict[str, str] | Iterable[tuple[str, str]]) -> None:
-        """Initialize."""
-
-        super().__init__(arg)
-
-    def _validate(self, arg: dict[str, str] | Iterable[tuple[str, str]]) -> None:
-        """Validate arguments."""
-
-        if isinstance(arg, dict):
-            if not all(isinstance(v, str) for v in arg.values()):
-                raise TypeError(f'{self.__class__.__name__} values must be hashable')
-        elif not all(isinstance(k, str) and isinstance(v, str) for k, v in arg):
-            raise TypeError(f'{self.__class__.__name__} keys and values must be Unicode strings')
-
-
-class Selector(Immutable):
-    """Selector."""
-
-    __slots__ = (
-        'tag', 'ids', 'classes', 'attributes', 'nth', 'selectors',
-        'relation', 'rel_type', 'contains', 'lang', 'flags', '_hash'
-    )
-
-    tag: SelectorTag | None
-    ids: tuple[str, ...]
-    classes: tuple[str, ...]
-    attributes: tuple[SelectorAttribute, ...]
-    nth: tuple[SelectorNth, ...]
-    selectors: tuple[SelectorList, ...]
-    relation: SelectorList
-    rel_type: str | None
-    contains: tuple[SelectorContains, ...]
-    lang: tuple[SelectorLang, ...]
-    flags: int
-
-    def __init__(
-        self,
-        tag: SelectorTag | None,
-        ids: tuple[str, ...],
-        classes: tuple[str, ...],
-        attributes: tuple[SelectorAttribute, ...],
-        nth: tuple[SelectorNth, ...],
-        selectors: tuple[SelectorList, ...],
-        relation: SelectorList,
-        rel_type: str | None,
-        contains: tuple[SelectorContains, ...],
-        lang: tuple[SelectorLang, ...],
-        flags: int
-    ):
-        """Initialize."""
-
-        super().__init__(
-            tag=tag,
-            ids=ids,
-            classes=classes,
-            attributes=attributes,
-            nth=nth,
-            selectors=selectors,
-            relation=relation,
-            rel_type=rel_type,
-            contains=contains,
-            lang=lang,
-            flags=flags
-        )
-
-
-class SelectorNull(Immutable):
-    """Null Selector."""
-
-    def __init__(self) -> None:
-        """Initialize."""
-
-        super().__init__()
-
-
-class SelectorTag(Immutable):
-    """Selector tag."""
-
-    __slots__ = ("name", "prefix", "_hash")
-
-    name: str
-    prefix: str | None
-
-    def __init__(self, name: str, prefix: str | None) -> None:
-        """Initialize."""
-
-        super().__init__(name=name, prefix=prefix)
-
-
-class SelectorAttribute(Immutable):
-    """Selector attribute rule."""
-
-    __slots__ = ("attribute", "prefix", "pattern", "xml_type_pattern", "_hash")
-
-    attribute: str
-    prefix: str
-    pattern: Pattern[str] | None
-    xml_type_pattern: Pattern[str] | None
-
-    def __init__(
-        self,
-        attribute: str,
-        prefix: str,
-        pattern: Pattern[str] | None,
-        xml_type_pattern: Pattern[str] | None
-    ) -> None:
-        """Initialize."""
-
-        super().__init__(
-            attribute=attribute,
-            prefix=prefix,
-            pattern=pattern,
-            xml_type_pattern=xml_type_pattern
-        )
-
-
-class SelectorContains(Immutable):
-    """Selector contains rule."""
-
-    __slots__ = ("text", "own", "_hash")
-
-    text: tuple[str, ...]
-    own: bool
-
-    def __init__(self, text: Iterable[str], own: bool) -> None:
-        """Initialize."""
-
-        super().__init__(text=tuple(text), own=own)
-
-
-class SelectorNth(Immutable):
-    """Selector nth type."""
-
-    __slots__ = ("a", "n", "b", "of_type", "last", "selectors", "_hash")
-
-    a: int
-    n: bool
-    b: int
-    of_type: bool
-    last: bool
-    selectors: SelectorList
-
-    def __init__(self, a: int, n: bool, b: int, of_type: bool, last: bool, selectors: SelectorList) -> None:
-        """Initialize."""
-
-        super().__init__(
-            a=a,
-            n=n,
-            b=b,
-            of_type=of_type,
-            last=last,
-            selectors=selectors
-        )
-
-
-class SelectorLang(Immutable):
-    """Selector language rules."""
-
-    __slots__ = ("languages", "_hash",)
-
-    languages: tuple[str, ...]
-
-    def __init__(self, languages: Iterable[str]):
-        """Initialize."""
-
-        super().__init__(languages=tuple(languages))
-
-    def __iter__(self) -> Iterator[str]:
-        """Iterator."""
-
-        return iter(self.languages)
-
-    def __len__(self) -> int:  # pragma: no cover
-        """Length."""
-
-        return len(self.languages)
-
-    def __getitem__(self, index: int) -> str:  # pragma: no cover
-        """Get item."""
-
-        return self.languages[index]
-
-
-class SelectorList(Immutable):
-    """Selector list."""
-
-    __slots__ = ("selectors", "is_not", "is_html", "_hash")
-
-    selectors: tuple[Selector | SelectorNull, ...]
-    is_not: bool
-    is_html: bool
-
-    def __init__(
-        self,
-        selectors: Iterable[Selector | SelectorNull] | None = None,
-        is_not: bool = False,
-        is_html: bool = False
-    ) -> None:
-        """Initialize."""
-
-        super().__init__(
-            selectors=tuple(selectors) if selectors is not None else (),
-            is_not=is_not,
-            is_html=is_html
-        )
-
-    def __iter__(self) -> Iterator[Selector | SelectorNull]:
-        """Iterator."""
-
-        return iter(self.selectors)
-
-    def __len__(self) -> int:
-        """Length."""
-
-        return len(self.selectors)
-
-    def __getitem__(self, index: int) -> Selector | SelectorNull:
-        """Get item."""
-
-        return self.selectors[index]
-
-
-def _pickle(p: Any) -> Any:
-    return p.__base__(), tuple([getattr(p, s) for s in p.__slots__[:-1]])
-
-
-def pickle_register(obj: Any) -> None:
-    """Allow object to be pickled."""
-
-    copyreg.pickle(obj, _pickle)
-
-
-pickle_register(Selector)
-pickle_register(SelectorNull)
-pickle_register(SelectorTag)
-pickle_register(SelectorAttribute)
-pickle_register(SelectorContains)
-pickle_register(SelectorNth)
-pickle_register(SelectorLang)
-pickle_register(SelectorList)
diff --git a/lib/soupsieve/pretty.py b/lib/soupsieve/pretty.py
deleted file mode 100644
index 193db05e..00000000
--- a/lib/soupsieve/pretty.py
+++ /dev/null
@@ -1,139 +0,0 @@
-"""
-Format a pretty string of a `SoupSieve` object for easy debugging.
-
-This won't necessarily support all types and such, and definitely
-not support custom outputs.
-
-It is mainly geared towards our types as the `SelectorList`
-object is a beast to look at without some indentation and newlines.
-The format and various output types is fairly known (though it
-hasn't been tested extensively to make sure we aren't missing corners).
-
-Example:
--------
-```
->>> import soupsieve as sv
->>> sv.compile('this > that.class[name=value]').selectors.pretty()
-SelectorList(
-    selectors=(
-        Selector(
-            tag=SelectorTag(
-                name='that',
-                prefix=None),
-            ids=(),
-            classes=(
-                'class',
-                ),
-            attributes=(
-                SelectorAttribute(
-                    attribute='name',
-                    prefix='',
-                    pattern=re.compile(
-                        '^value$'),
-                    xml_type_pattern=None),
-                ),
-            nth=(),
-            selectors=(),
-            relation=SelectorList(
-                selectors=(
-                    Selector(
-                        tag=SelectorTag(
-                            name='this',
-                            prefix=None),
-                        ids=(),
-                        classes=(),
-                        attributes=(),
-                        nth=(),
-                        selectors=(),
-                        relation=SelectorList(
-                            selectors=(),
-                            is_not=False,
-                            is_html=False),
-                        rel_type='>',
-                        contains=(),
-                        lang=(),
-                        flags=0),
-                    ),
-                is_not=False,
-                is_html=False),
-            rel_type=None,
-            contains=(),
-            lang=(),
-            flags=0),
-        ),
-    is_not=False,
-    is_html=False)
-```
-
-"""
-from __future__ import annotations
-import re
-from typing import Any
-
-RE_CLASS = re.compile(r'(?i)[a-z_][_a-z\d\.]+\(')
-RE_PARAM = re.compile(r'(?i)[_a-z][_a-z\d]+=')
-RE_EMPTY = re.compile(r'\(\)|\[\]|\{\}')
-RE_LSTRT = re.compile(r'\[')
-RE_DSTRT = re.compile(r'\{')
-RE_TSTRT = re.compile(r'\(')
-RE_LEND = re.compile(r'\]')
-RE_DEND = re.compile(r'\}')
-RE_TEND = re.compile(r'\)')
-RE_INT = re.compile(r'\d+')
-RE_KWORD = re.compile(r'(?i)[_a-z][_a-z\d]+')
-RE_DQSTR = re.compile(r'"(?:\\.|[^"\\])*"')
-RE_SQSTR = re.compile(r"'(?:\\.|[^'\\])*'")
-RE_SEP = re.compile(r'\s*(,)\s*')
-RE_DSEP = re.compile(r'\s*(:)\s*')
-
-TOKENS = {
-    'class': RE_CLASS,
-    'param': RE_PARAM,
-    'empty': RE_EMPTY,
-    'lstrt': RE_LSTRT,
-    'dstrt': RE_DSTRT,
-    'tstrt': RE_TSTRT,
-    'lend': RE_LEND,
-    'dend': RE_DEND,
-    'tend': RE_TEND,
-    'sqstr': RE_SQSTR,
-    'sep': RE_SEP,
-    'dsep': RE_DSEP,
-    'int': RE_INT,
-    'kword': RE_KWORD,
-    'dqstr': RE_DQSTR
-}
-
-
-def pretty(obj: Any) -> str:  # pragma: no cover
-    """Make the object output string pretty."""
-
-    sel = str(obj)
-    index = 0
-    end = len(sel) - 1
-    indent = 0
-    output = []
-
-    while index <= end:
-        m = None
-        for k, v in TOKENS.items():
-            m = v.match(sel, index)
-
-            if m:
-                name = k
-                index = m.end(0)
-                if name in ('class', 'lstrt', 'dstrt', 'tstrt'):
-                    indent += 4
-                    output.append(f'{m.group(0)}\n{" " * indent}')
-                elif name in ('param', 'int', 'kword', 'sqstr', 'dqstr', 'empty'):
-                    output.append(m.group(0))
-                elif name in ('lend', 'dend', 'tend'):
-                    indent -= 4
-                    output.append(m.group(0))
-                elif name in ('sep',):
-                    output.append(f'{m.group(1)}\n{" " * indent}')
-                elif name in ('dsep',):
-                    output.append(f'{m.group(1)} ')
-                break
-
-    return ''.join(output)
diff --git a/lib/soupsieve/py.typed b/lib/soupsieve/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/soupsieve/util.py b/lib/soupsieve/util.py
deleted file mode 100644
index 9b2e64df..00000000
--- a/lib/soupsieve/util.py
+++ /dev/null
@@ -1,117 +0,0 @@
-"""Utility."""
-from __future__ import annotations
-from functools import wraps, lru_cache
-import warnings
-import re
-from typing import Callable, Any
-
-DEBUG = 0x00001
-
-RE_PATTERN_LINE_SPLIT = re.compile(r'(?:\r\n|(?!\r\n)[\n\r])|$')
-
-UC_A = ord('A')
-UC_Z = ord('Z')
-
-
-@lru_cache(maxsize=512)
-def lower(string: str) -> str:
-    """Lower."""
-
-    new_string = []
-    for c in string:
-        o = ord(c)
-        new_string.append(chr(o + 32) if UC_A <= o <= UC_Z else c)
-    return ''.join(new_string)
-
-
-class SelectorSyntaxError(Exception):
-    """Syntax error in a CSS selector."""
-
-    def __init__(self, msg: str, pattern: str | None = None, index: int | None = None) -> None:
-        """Initialize."""
-
-        self.line = None
-        self.col = None
-        self.context = None
-
-        if pattern is not None and index is not None:
-            # Format pattern to show line and column position
-            self.context, self.line, self.col = get_pattern_context(pattern, index)
-            msg = f'{msg}\n  line {self.line}:\n{self.context}'
-
-        super().__init__(msg)
-
-
-def deprecated(message: str, stacklevel: int = 2) -> Callable[..., Any]:  # pragma: no cover
-    """
-    Raise a `DeprecationWarning` when wrapped function/method is called.
-
-    Usage:
-
-        @deprecated("This method will be removed in version X; use Y instead.")
-        def some_method()"
-            pass
-    """
-
-    def _wrapper(func: Callable[..., Any]) -> Callable[..., Any]:
-        @wraps(func)
-        def _deprecated_func(*args: Any, **kwargs: Any) -> Any:
-            warnings.warn(
-                f"'{func.__name__}' is deprecated. {message}",
-                category=DeprecationWarning,
-                stacklevel=stacklevel
-            )
-            return func(*args, **kwargs)
-        return _deprecated_func
-    return _wrapper
-
-
-def warn_deprecated(message: str, stacklevel: int = 2) -> None:  # pragma: no cover
-    """Warn deprecated."""
-
-    warnings.warn(
-        message,
-        category=DeprecationWarning,
-        stacklevel=stacklevel
-    )
-
-
-def get_pattern_context(pattern: str, index: int) -> tuple[str, int, int]:
-    """Get the pattern context."""
-
-    last = 0
-    current_line = 1
-    col = 1
-    text = []  # type: list[str]
-    line = 1
-    offset = None  # type: int | None
-
-    # Split pattern by newline and handle the text before the newline
-    for m in RE_PATTERN_LINE_SPLIT.finditer(pattern):
-        linetext = pattern[last:m.start(0)]
-        if not len(m.group(0)) and not len(text):
-            indent = ''
-            offset = -1
-            col = index - last + 1
-        elif last <= index < m.end(0):
-            indent = '--> '
-            offset = (-1 if index > m.start(0) else 0) + 3
-            col = index - last + 1
-        else:
-            indent = '    '
-            offset = None
-        if len(text):
-            # Regardless of whether we are presented with `\r\n`, `\r`, or `\n`,
-            # we will render the output with just `\n`. We will still log the column
-            # correctly though.
-            text.append('\n')
-        text.append(f'{indent}{linetext}')
-        if offset is not None:
-            text.append('\n')
-            text.append(' ' * (col + offset) + '^')
-            line = current_line
-
-        current_line += 1
-        last = m.end(0)
-
-    return ''.join(text), line, col
diff --git a/lib/tempora/__init__.py b/lib/tempora/__init__.py
deleted file mode 100644
index a41d02c2..00000000
--- a/lib/tempora/__init__.py
+++ /dev/null
@@ -1,653 +0,0 @@
-"Objects and routines pertaining to date and time (tempora)"
-
-import datetime
-import time
-import re
-import numbers
-import functools
-import contextlib
-from numbers import Number
-from typing import Union, Tuple, Iterable
-from typing import cast
-
-import dateutil.parser
-import dateutil.tz
-
-
-# some useful constants
-osc_per_year = 290_091_329_207_984_000
-"""
-mean vernal equinox year expressed in oscillations of atomic cesium at the
-year 2000 (see http://webexhibits.org/calendars/timeline.html for more info).
-"""
-osc_per_second = 9_192_631_770
-seconds_per_second = 1
-seconds_per_year = 31_556_940
-seconds_per_minute = 60
-minutes_per_hour = 60
-hours_per_day = 24
-seconds_per_hour = seconds_per_minute * minutes_per_hour
-seconds_per_day = seconds_per_hour * hours_per_day
-days_per_year = seconds_per_year / seconds_per_day
-thirty_days = datetime.timedelta(days=30)
-# these values provide useful averages
-six_months = datetime.timedelta(days=days_per_year / 2)
-seconds_per_month = seconds_per_year / 12
-hours_per_month = hours_per_day * days_per_year / 12
-
-
-@functools.lru_cache()
-def _needs_year_help() -> bool:
-    """
-    Some versions of Python render %Y with only three characters :(
-    https://bugs.python.org/issue39103
-    """
-    return len(datetime.date(900, 1, 1).strftime('%Y')) != 4
-
-
-AnyDatetime = Union[datetime.datetime, datetime.date, datetime.time]
-StructDatetime = Union[Tuple[int, ...], time.struct_time]
-
-
-def ensure_datetime(ob: AnyDatetime) -> datetime.datetime:
-    """
-    Given a datetime or date or time object from the ``datetime``
-    module, always return a datetime using default values.
-    """
-    if isinstance(ob, datetime.datetime):
-        return ob
-    date = cast(datetime.date, ob)
-    time = cast(datetime.time, ob)
-    if isinstance(ob, datetime.date):
-        time = datetime.time()
-    if isinstance(ob, datetime.time):
-        date = datetime.date(1900, 1, 1)
-    return datetime.datetime.combine(date, time)
-
-
-def infer_datetime(ob: Union[AnyDatetime, StructDatetime]) -> datetime.datetime:
-    if isinstance(ob, (time.struct_time, tuple)):
-        ob = datetime.datetime(*ob[:6])  # type: ignore
-    return ensure_datetime(ob)
-
-
-def strftime(fmt: str, t: Union[AnyDatetime, tuple, time.struct_time]) -> str:
-    """
-    Portable strftime.
-
-    In the stdlib, strftime has `known portability problems
-    <https://bugs.python.org/issue13305>`_. This function
-    aims to smooth over those issues and provide a
-    consistent experience across the major platforms.
-
-    >>> strftime('%Y', datetime.datetime(1890, 1, 1))
-    '1890'
-    >>> strftime('%Y', datetime.datetime(900, 1, 1))
-    '0900'
-
-    Supports time.struct_time, tuples, and datetime.datetime objects.
-
-    >>> strftime('%Y-%m-%d', (1976, 5, 7))
-    '1976-05-07'
-
-    Also supports date objects
-
-    >>> strftime('%Y', datetime.date(1976, 5, 7))
-    '1976'
-
-    Also supports milliseconds using %s.
-
-    >>> strftime('%s', datetime.time(microsecond=20000))
-    '020'
-
-    Also supports microseconds (3 digits) using %µ
-
-    >>> strftime('%µ', datetime.time(microsecond=123456))
-    '456'
-
-    Historically, %u was used for microseconds, but now
-    it honors the value rendered by stdlib.
-
-    >>> strftime('%u', datetime.date(1976, 5, 7))
-    '5'
-
-    Also supports microseconds (6 digits) using %f
-
-    >>> strftime('%f', datetime.time(microsecond=23456))
-    '023456'
-
-    Even supports time values on date objects (discouraged):
-
-    >>> strftime('%f', datetime.date(1976, 1, 1))
-    '000000'
-    >>> strftime('%µ', datetime.date(1976, 1, 1))
-    '000'
-    >>> strftime('%s', datetime.date(1976, 1, 1))
-    '000'
-
-    And vice-versa:
-
-    >>> strftime('%Y', datetime.time())
-    '1900'
-    """
-    t = infer_datetime(t)
-    subs = (
-        ('%s', '%03d' % (t.microsecond // 1000)),
-        ('%µ', '%03d' % (t.microsecond % 1000)),
-    ) + (('%Y', '%04d' % t.year),) * _needs_year_help()
-
-    def doSub(s, sub):
-        return s.replace(*sub)
-
-    def doSubs(s):
-        return functools.reduce(doSub, subs, s)
-
-    fmt = '%%'.join(map(doSubs, fmt.split('%%')))
-    return t.strftime(fmt)
-
-
-def datetime_mod(dt, period, start=None):
-    """
-    Find the time which is the specified date/time truncated to the time delta
-    relative to the start date/time.
-    By default, the start time is midnight of the same day as the specified
-    date/time.
-
-    >>> datetime_mod(datetime.datetime(2004, 1, 2, 3),
-    ...     datetime.timedelta(days = 1.5),
-    ...     start = datetime.datetime(2004, 1, 1))
-    datetime.datetime(2004, 1, 1, 0, 0)
-    >>> datetime_mod(datetime.datetime(2004, 1, 2, 13),
-    ...     datetime.timedelta(days = 1.5),
-    ...     start = datetime.datetime(2004, 1, 1))
-    datetime.datetime(2004, 1, 2, 12, 0)
-    >>> datetime_mod(datetime.datetime(2004, 1, 2, 13),
-    ...     datetime.timedelta(days = 7),
-    ...     start = datetime.datetime(2004, 1, 1))
-    datetime.datetime(2004, 1, 1, 0, 0)
-    >>> datetime_mod(datetime.datetime(2004, 1, 10, 13),
-    ...     datetime.timedelta(days = 7),
-    ...     start = datetime.datetime(2004, 1, 1))
-    datetime.datetime(2004, 1, 8, 0, 0)
-    """
-    if start is None:
-        # use midnight of the same day
-        start = datetime.datetime.combine(dt.date(), datetime.time())
-    # calculate the difference between the specified time and the start date.
-    delta = dt - start
-
-    # now aggregate the delta and the period into microseconds
-    # Use microseconds because that's the highest precision of these time
-    # pieces.  Also, using microseconds ensures perfect precision (no floating
-    # point errors).
-    def get_time_delta_microseconds(td):
-        return (td.days * seconds_per_day + td.seconds) * 1000000 + td.microseconds
-
-    delta, period = map(get_time_delta_microseconds, (delta, period))
-    offset = datetime.timedelta(microseconds=delta % period)
-    # the result is the original specified time minus the offset
-    result = dt - offset
-    return result
-
-
-def datetime_round(dt, period, start=None):
-    """
-    Find the nearest even period for the specified date/time.
-
-    >>> datetime_round(datetime.datetime(2004, 11, 13, 8, 11, 13),
-    ...     datetime.timedelta(hours = 1))
-    datetime.datetime(2004, 11, 13, 8, 0)
-    >>> datetime_round(datetime.datetime(2004, 11, 13, 8, 31, 13),
-    ...     datetime.timedelta(hours = 1))
-    datetime.datetime(2004, 11, 13, 9, 0)
-    >>> datetime_round(datetime.datetime(2004, 11, 13, 8, 30),
-    ...     datetime.timedelta(hours = 1))
-    datetime.datetime(2004, 11, 13, 9, 0)
-    """
-    result = datetime_mod(dt, period, start)
-    if abs(dt - result) >= period // 2:
-        result += period
-    return result
-
-
-def get_nearest_year_for_day(day):
-    """
-    Returns the nearest year to now inferred from a Julian date.
-
-    >>> freezer = getfixture('freezer')
-    >>> freezer.move_to('2019-05-20')
-    >>> get_nearest_year_for_day(20)
-    2019
-    >>> get_nearest_year_for_day(340)
-    2018
-    >>> freezer.move_to('2019-12-15')
-    >>> get_nearest_year_for_day(20)
-    2020
-    """
-    now = time.gmtime()
-    result = now.tm_year
-    # if the day is far greater than today, it must be from last year
-    if day - now.tm_yday > 365 // 2:
-        result -= 1
-    # if the day is far less than today, it must be for next year.
-    if now.tm_yday - day > 365 // 2:
-        result += 1
-    return result
-
-
-def gregorian_date(year, julian_day):
-    """
-    Gregorian Date is defined as a year and a julian day (1-based
-    index into the days of the year).
-
-    >>> gregorian_date(2007, 15)
-    datetime.date(2007, 1, 15)
-    """
-    result = datetime.date(year, 1, 1)
-    result += datetime.timedelta(days=julian_day - 1)
-    return result
-
-
-def get_period_seconds(period):
-    """
-    return the number of seconds in the specified period
-
-    >>> get_period_seconds('day')
-    86400
-    >>> get_period_seconds(86400)
-    86400
-    >>> get_period_seconds(datetime.timedelta(hours=24))
-    86400
-    >>> get_period_seconds('day + os.system("rm -Rf *")')
-    Traceback (most recent call last):
-    ...
-    ValueError: period not in (second, minute, hour, day, month, year)
-    """
-    if isinstance(period, str):
-        try:
-            name = 'seconds_per_' + period.lower()
-            result = globals()[name]
-        except KeyError:
-            msg = "period not in (second, minute, hour, day, month, year)"
-            raise ValueError(msg)
-    elif isinstance(period, numbers.Number):
-        result = period
-    elif isinstance(period, datetime.timedelta):
-        result = period.days * get_period_seconds('day') + period.seconds
-    else:
-        raise TypeError('period must be a string or integer')
-    return result
-
-
-def get_date_format_string(period):
-    """
-    For a given period (e.g. 'month', 'day', or some numeric interval
-    such as 3600 (in secs)), return the format string that can be
-    used with strftime to format that time to specify the times
-    across that interval, but no more detailed.
-    For example,
-
-    >>> get_date_format_string('month')
-    '%Y-%m'
-    >>> get_date_format_string(3600)
-    '%Y-%m-%d %H'
-    >>> get_date_format_string('hour')
-    '%Y-%m-%d %H'
-    >>> get_date_format_string(None)
-    Traceback (most recent call last):
-        ...
-    TypeError: period must be a string or integer
-    >>> get_date_format_string('garbage')
-    Traceback (most recent call last):
-        ...
-    ValueError: period not in (second, minute, hour, day, month, year)
-    """
-    # handle the special case of 'month' which doesn't have
-    #  a static interval in seconds
-    if isinstance(period, str) and period.lower() == 'month':
-        return '%Y-%m'
-    file_period_secs = get_period_seconds(period)
-    format_pieces = ('%Y', '-%m-%d', ' %H', '-%M', '-%S')
-    seconds_per_second = 1
-    intervals = (
-        seconds_per_year,
-        seconds_per_day,
-        seconds_per_hour,
-        seconds_per_minute,
-        seconds_per_second,
-    )
-    mods = list(map(lambda interval: file_period_secs % interval, intervals))
-    format_pieces = format_pieces[: mods.index(0) + 1]
-    return ''.join(format_pieces)
-
-
-def calculate_prorated_values():
-    """
-    >>> monkeypatch = getfixture('monkeypatch')
-    >>> import builtins
-    >>> monkeypatch.setattr(builtins, 'input', lambda prompt: '3/hour')
-    >>> calculate_prorated_values()
-    per minute: 0.05
-    per hour: 3.0
-    per day: 72.0
-    per month: 2191.454166666667
-    per year: 26297.45
-    """
-    rate = input("Enter the rate (3/hour, 50/month)> ")
-    for period, value in _prorated_values(rate):
-        print(f"per {period}: {value}")
-
-
-def _prorated_values(rate: str) -> Iterable[Tuple[str, Number]]:
-    """
-    Given a rate (a string in units per unit time), and return that same
-    rate for various time periods.
-
-    >>> for period, value in _prorated_values('20/hour'):
-    ...     print('{period}: {value:0.3f}'.format(**locals()))
-    minute: 0.333
-    hour: 20.000
-    day: 480.000
-    month: 14609.694
-    year: 175316.333
-
-    """
-    match = re.match(r'(?P<value>[\d.]+)/(?P<period>\w+)$', rate)
-    res = cast(re.Match, match).groupdict()
-    value = float(res['value'])
-    value_per_second = value / get_period_seconds(res['period'])
-    for period in ('minute', 'hour', 'day', 'month', 'year'):
-        period_value = value_per_second * get_period_seconds(period)
-        yield period, period_value
-
-
-def parse_timedelta(str):
-    """
-    Take a string representing a span of time and parse it to a time delta.
-    Accepts any string of comma-separated numbers each with a unit indicator.
-
-    >>> parse_timedelta('1 day')
-    datetime.timedelta(days=1)
-
-    >>> parse_timedelta('1 day, 30 seconds')
-    datetime.timedelta(days=1, seconds=30)
-
-    >>> parse_timedelta('47.32 days, 20 minutes, 15.4 milliseconds')
-    datetime.timedelta(days=47, seconds=28848, microseconds=15400)
-
-    Supports weeks, months, years
-
-    >>> parse_timedelta('1 week')
-    datetime.timedelta(days=7)
-
-    >>> parse_timedelta('1 year, 1 month')
-    datetime.timedelta(days=395, seconds=58685)
-
-    Note that months and years strict intervals, not aligned
-    to a calendar:
-
-    >>> date = datetime.datetime.fromisoformat('2000-01-01')
-    >>> later = date + parse_timedelta('1 year')
-    >>> diff = later.replace(year=date.year) - date
-    >>> diff.seconds
-    20940
-
-    >>> parse_timedelta('foo')
-    Traceback (most recent call last):
-    ...
-    ValueError: Unexpected 'foo'
-
-    >>> parse_timedelta('14 seconds foo')
-    Traceback (most recent call last):
-    ...
-    ValueError: Unexpected 'foo'
-
-    Supports abbreviations:
-
-    >>> parse_timedelta('1s')
-    datetime.timedelta(seconds=1)
-
-    >>> parse_timedelta('1sec')
-    datetime.timedelta(seconds=1)
-
-    >>> parse_timedelta('5min1sec')
-    datetime.timedelta(seconds=301)
-
-    >>> parse_timedelta('1 ms')
-    datetime.timedelta(microseconds=1000)
-
-    >>> parse_timedelta('1 µs')
-    datetime.timedelta(microseconds=1)
-
-    >>> parse_timedelta('1 us')
-    datetime.timedelta(microseconds=1)
-
-    And supports the common colon-separated duration:
-
-    >>> parse_timedelta('14:00:35.362')
-    datetime.timedelta(seconds=50435, microseconds=362000)
-
-    TODO: Should this be 14 hours or 14 minutes?
-
-    >>> parse_timedelta('14:00')
-    datetime.timedelta(seconds=50400)
-
-    >>> parse_timedelta('14:00 minutes')
-    Traceback (most recent call last):
-    ...
-    ValueError: Cannot specify units with composite delta
-
-    Nanoseconds get rounded to the nearest microsecond:
-
-    >>> parse_timedelta('600 ns')
-    datetime.timedelta(microseconds=1)
-
-    >>> parse_timedelta('.002 µs, 499 ns')
-    datetime.timedelta(microseconds=1)
-
-    Expect ValueError for other invalid inputs.
-
-    >>> parse_timedelta('13 feet')
-    Traceback (most recent call last):
-    ...
-    ValueError: Invalid unit feets
-    """
-    return _parse_timedelta_nanos(str).resolve()
-
-
-def _parse_timedelta_nanos(str):
-    parts = re.finditer(r'(?P<value>[\d.:]+)\s?(?P<unit>[^\W\d_]+)?', str)
-    chk_parts = _check_unmatched(parts, str)
-    deltas = map(_parse_timedelta_part, chk_parts)
-    return sum(deltas, _Saved_NS())
-
-
-def _check_unmatched(matches, text):
-    """
-    Ensure no words appear in unmatched text.
-    """
-
-    def check_unmatched(unmatched):
-        found = re.search(r'\w+', unmatched)
-        if found:
-            raise ValueError(f"Unexpected {found.group(0)!r}")
-
-    pos = 0
-    for match in matches:
-        check_unmatched(text[pos : match.start()])
-        yield match
-        pos = match.end()
-    check_unmatched(text[pos:])
-
-
-_unit_lookup = {
-    'µs': 'microsecond',
-    'µsec': 'microsecond',
-    'us': 'microsecond',
-    'usec': 'microsecond',
-    'micros': 'microsecond',
-    'ms': 'millisecond',
-    'msec': 'millisecond',
-    'millis': 'millisecond',
-    's': 'second',
-    'sec': 'second',
-    'h': 'hour',
-    'hr': 'hour',
-    'm': 'minute',
-    'min': 'minute',
-    'w': 'week',
-    'wk': 'week',
-    'd': 'day',
-    'ns': 'nanosecond',
-    'nsec': 'nanosecond',
-    'nanos': 'nanosecond',
-}
-
-
-def _resolve_unit(raw_match):
-    if raw_match is None:
-        return 'second'
-    text = raw_match.lower()
-    return _unit_lookup.get(text, text)
-
-
-def _parse_timedelta_composite(raw_value, unit):
-    if unit != 'seconds':
-        raise ValueError("Cannot specify units with composite delta")
-    values = raw_value.split(':')
-    units = 'hours', 'minutes', 'seconds'
-    composed = ' '.join(f'{value} {unit}' for value, unit in zip(values, units))
-    return _parse_timedelta_nanos(composed)
-
-
-def _parse_timedelta_part(match):
-    unit = _resolve_unit(match.group('unit'))
-    if not unit.endswith('s'):
-        unit += 's'
-    raw_value = match.group('value')
-    if ':' in raw_value:
-        return _parse_timedelta_composite(raw_value, unit)
-    value = float(raw_value)
-    if unit == 'months':
-        unit = 'years'
-        value = value / 12
-    if unit == 'years':
-        unit = 'days'
-        value = value * days_per_year
-    return _Saved_NS.derive(unit, value)
-
-
-class _Saved_NS:
-    """
-    Bundle a timedelta with nanoseconds.
-
-    >>> _Saved_NS.derive('microseconds', .001)
-    _Saved_NS(td=datetime.timedelta(0), nanoseconds=1)
-    """
-
-    td = datetime.timedelta()
-    nanoseconds = 0
-    multiplier = dict(
-        seconds=1000000000,
-        milliseconds=1000000,
-        microseconds=1000,
-    )
-
-    def __init__(self, **kwargs):
-        vars(self).update(kwargs)
-
-    @classmethod
-    def derive(cls, unit, value):
-        if unit == 'nanoseconds':
-            return _Saved_NS(nanoseconds=value)
-
-        try:
-            raw_td = datetime.timedelta(**{unit: value})
-        except TypeError:
-            raise ValueError(f"Invalid unit {unit}")
-        res = _Saved_NS(td=raw_td)
-        with contextlib.suppress(KeyError):
-            res.nanoseconds = int(value * cls.multiplier[unit]) % 1000
-        return res
-
-    def __add__(self, other):
-        return _Saved_NS(
-            td=self.td + other.td, nanoseconds=self.nanoseconds + other.nanoseconds
-        )
-
-    def resolve(self):
-        """
-        Resolve any nanoseconds into the microseconds field,
-        discarding any nanosecond resolution (but honoring partial
-        microseconds).
-        """
-        addl_micros = round(self.nanoseconds / 1000)
-        return self.td + datetime.timedelta(microseconds=addl_micros)
-
-    def __repr__(self):
-        return f'_Saved_NS(td={self.td!r}, nanoseconds={self.nanoseconds!r})'
-
-
-def date_range(start=None, stop=None, step=None):
-    """
-    Much like the built-in function range, but works with dates
-
-    >>> range_items = date_range(
-    ...     datetime.datetime(2005,12,21),
-    ...     datetime.datetime(2005,12,25),
-    ... )
-    >>> my_range = tuple(range_items)
-    >>> datetime.datetime(2005,12,21) in my_range
-    True
-    >>> datetime.datetime(2005,12,22) in my_range
-    True
-    >>> datetime.datetime(2005,12,25) in my_range
-    False
-    >>> from_now = date_range(stop=datetime.datetime(2099, 12, 31))
-    >>> next(from_now)
-    datetime.datetime(...)
-    """
-    if step is None:
-        step = datetime.timedelta(days=1)
-    if start is None:
-        start = datetime.datetime.now()
-    while start < stop:
-        yield start
-        start += step
-
-
-tzinfos = dict(
-    AEST=dateutil.tz.gettz("Australia/Sydney"),
-    AEDT=dateutil.tz.gettz("Australia/Sydney"),
-    ACST=dateutil.tz.gettz("Australia/Darwin"),
-    ACDT=dateutil.tz.gettz("Australia/Adelaide"),
-    AWST=dateutil.tz.gettz("Australia/Perth"),
-    EST=dateutil.tz.gettz("America/New_York"),
-    EDT=dateutil.tz.gettz("America/New_York"),
-    CST=dateutil.tz.gettz("America/Chicago"),
-    CDT=dateutil.tz.gettz("America/Chicago"),
-    MST=dateutil.tz.gettz("America/Denver"),
-    MDT=dateutil.tz.gettz("America/Denver"),
-    PST=dateutil.tz.gettz("America/Los_Angeles"),
-    PDT=dateutil.tz.gettz("America/Los_Angeles"),
-    GMT=dateutil.tz.gettz("Etc/GMT"),
-    UTC=dateutil.tz.gettz("UTC"),
-    CET=dateutil.tz.gettz("Europe/Berlin"),
-    CEST=dateutil.tz.gettz("Europe/Berlin"),
-    IST=dateutil.tz.gettz("Asia/Kolkata"),
-    BST=dateutil.tz.gettz("Europe/London"),
-    MSK=dateutil.tz.gettz("Europe/Moscow"),
-    EET=dateutil.tz.gettz("Europe/Helsinki"),
-    EEST=dateutil.tz.gettz("Europe/Helsinki"),
-    # Add more mappings as needed
-)
-
-
-def parse(*args, **kwargs):
-    """
-    Parse the input using dateutil.parser.parse with friendly tz support.
-
-    >>> parse('2024-07-26 12:59:00 EDT')
-    datetime.datetime(...America/New_York...)
-    """
-    return dateutil.parser.parse(*args, tzinfos=tzinfos, **kwargs)
diff --git a/lib/tempora/schedule.py b/lib/tempora/schedule.py
deleted file mode 100644
index 7f06fdcd..00000000
--- a/lib/tempora/schedule.py
+++ /dev/null
@@ -1,204 +0,0 @@
-"""
-Classes for calling functions a schedule. Has time zone support.
-
-For example, to run a job at 08:00 every morning in 'Asia/Calcutta':
-
->>> from tests.compat.py38 import zoneinfo
->>> job = lambda: print("time is now", datetime.datetime())
->>> time = datetime.time(8, tzinfo=zoneinfo.ZoneInfo('Asia/Calcutta'))
->>> cmd = PeriodicCommandFixedDelay.daily_at(time, job)
->>> sched = InvokeScheduler()
->>> sched.add(cmd)
->>> while True:  # doctest: +SKIP
-...     sched.run_pending()
-...     time.sleep(.1)
-
-By default, the scheduler uses timezone-aware times in UTC. A
-client may override the default behavior by overriding ``now``
-and ``from_timestamp`` functions.
-
->>> now()
-datetime.datetime(...utc)
->>> from_timestamp(1718723533.7685602)
-datetime.datetime(...utc)
-"""
-
-import datetime
-import numbers
-import abc
-import bisect
-
-from .utc import now, fromtimestamp as from_timestamp
-
-
-class DelayedCommand(datetime.datetime):
-    """
-    A command to be executed after some delay (seconds or timedelta).
-    """
-
-    @classmethod
-    def from_datetime(cls, other):
-        return cls(
-            other.year,
-            other.month,
-            other.day,
-            other.hour,
-            other.minute,
-            other.second,
-            other.microsecond,
-            other.tzinfo,
-        )
-
-    @classmethod
-    def after(cls, delay, target):
-        if not isinstance(delay, datetime.timedelta):
-            delay = datetime.timedelta(seconds=delay)
-        due_time = now() + delay
-        cmd = cls.from_datetime(due_time)
-        cmd.delay = delay
-        cmd.target = target
-        return cmd
-
-    @staticmethod
-    def _from_timestamp(input):
-        """
-        If input is a real number, interpret it as a Unix timestamp
-        (seconds sinc Epoch in UTC) and return a timezone-aware
-        datetime object. Otherwise return input unchanged.
-        """
-        if not isinstance(input, numbers.Real):
-            return input
-        return from_timestamp(input)
-
-    @classmethod
-    def at_time(cls, at, target):
-        """
-        Construct a DelayedCommand to come due at `at`, where `at` may be
-        a datetime or timestamp.
-        """
-        at = cls._from_timestamp(at)
-        cmd = cls.from_datetime(at)
-        cmd.delay = at - now()
-        cmd.target = target
-        return cmd
-
-    def due(self):
-        return now() >= self
-
-
-class PeriodicCommand(DelayedCommand):
-    """
-    Like a delayed command, but expect this command to run every delay
-    seconds.
-    """
-
-    def _next_time(self):
-        """
-        Add delay to self, localized
-        """
-        return self + self.delay
-
-    def next(self):
-        cmd = self.__class__.from_datetime(self._next_time())
-        cmd.delay = self.delay
-        cmd.target = self.target
-        return cmd
-
-    def __setattr__(self, key, value):
-        if key == 'delay' and not value > datetime.timedelta():
-            raise ValueError("A PeriodicCommand must have a positive, non-zero delay.")
-        super().__setattr__(key, value)
-
-
-class PeriodicCommandFixedDelay(PeriodicCommand):
-    """
-    Like a periodic command, but don't calculate the delay based on
-    the current time. Instead use a fixed delay following the initial
-    run.
-    """
-
-    @classmethod
-    def at_time(cls, at, delay, target):
-        """
-        >>> cmd = PeriodicCommandFixedDelay.at_time(0, 30, None)
-        >>> cmd.delay.total_seconds()
-        30.0
-        """
-        at = cls._from_timestamp(at)
-        cmd = cls.from_datetime(at)
-        if isinstance(delay, numbers.Number):
-            delay = datetime.timedelta(seconds=delay)
-        cmd.delay = delay
-        cmd.target = target
-        return cmd
-
-    @classmethod
-    def daily_at(cls, at, target):
-        """
-        Schedule a command to run at a specific time each day.
-
-        >>> from tempora import utc
-        >>> noon = utc.time(12, 0)
-        >>> cmd = PeriodicCommandFixedDelay.daily_at(noon, None)
-        >>> cmd.delay.total_seconds()
-        86400.0
-        """
-        daily = datetime.timedelta(days=1)
-        # convert when to the next datetime matching this time
-        when = datetime.datetime.combine(datetime.date.today(), at)
-        when -= daily
-        while when < now():
-            when += daily
-        return cls.at_time(when, daily, target)
-
-
-class Scheduler:
-    """
-    A rudimentary abstract scheduler accepting DelayedCommands
-    and dispatching them on schedule.
-    """
-
-    def __init__(self):
-        self.queue = []
-
-    def add(self, command):
-        assert isinstance(command, DelayedCommand)
-        bisect.insort(self.queue, command)
-
-    def run_pending(self):
-        while self.queue:
-            command = self.queue[0]
-            if not command.due():
-                break
-            self.run(command)
-            if isinstance(command, PeriodicCommand):
-                self.add(command.next())
-            del self.queue[0]
-
-    @abc.abstractmethod
-    def run(self, command):
-        """
-        Run the command
-        """
-
-
-class InvokeScheduler(Scheduler):
-    """
-    Command targets are functions to be invoked on schedule.
-    """
-
-    def run(self, command):
-        command.target()
-
-
-class CallbackScheduler(Scheduler):
-    """
-    Command targets are passed to a dispatch callable on schedule.
-    """
-
-    def __init__(self, dispatch):
-        super().__init__()
-        self.dispatch = dispatch
-
-    def run(self, command):
-        self.dispatch(command.target)
diff --git a/lib/tempora/timing.py b/lib/tempora/timing.py
deleted file mode 100644
index e74b8962..00000000
--- a/lib/tempora/timing.py
+++ /dev/null
@@ -1,266 +0,0 @@
-import collections.abc
-import contextlib
-import datetime
-import functools
-import numbers
-import time
-
-import jaraco.functools
-
-
-class Stopwatch:
-    """
-    A simple stopwatch that starts automatically.
-
-    >>> w = Stopwatch()
-    >>> _1_sec = datetime.timedelta(seconds=1)
-    >>> w.split() < _1_sec
-    True
-    >>> time.sleep(1.0)
-    >>> w.split() >= _1_sec
-    True
-    >>> w.stop() >= _1_sec
-    True
-    >>> w.reset()
-    >>> w.start()
-    >>> w.split() < _1_sec
-    True
-
-    Launch the Stopwatch in a context:
-
-    >>> with Stopwatch() as watch:
-    ...     assert isinstance(watch.split(), datetime.timedelta)
-
-    After exiting the context, the watch is stopped; read the
-    elapsed time directly:
-
-    >>> watch.elapsed
-    datetime.timedelta(...)
-    >>> watch.elapsed.seconds
-    0
-    """
-
-    def __init__(self):
-        self.reset()
-        self.start()
-
-    def reset(self):
-        self.elapsed = datetime.timedelta(0)
-        with contextlib.suppress(AttributeError):
-            del self._start
-
-    def _diff(self):
-        return datetime.timedelta(seconds=time.monotonic() - self._start)
-
-    def start(self):
-        self._start = time.monotonic()
-
-    def stop(self):
-        self.elapsed += self._diff()
-        del self._start
-        return self.elapsed
-
-    def split(self):
-        return self.elapsed + self._diff()
-
-    # context manager support
-    def __enter__(self):
-        self.start()
-        return self
-
-    def __exit__(self, exc_type, exc_value, traceback):
-        self.stop()
-
-
-class IntervalGovernor:
-    """
-    Decorate a function to only allow it to be called once per
-    min_interval. Otherwise, it returns None.
-
-    >>> gov = IntervalGovernor(30)
-    >>> gov.min_interval.total_seconds()
-    30.0
-    """
-
-    def __init__(self, min_interval):
-        if isinstance(min_interval, numbers.Number):
-            min_interval = datetime.timedelta(seconds=min_interval)
-        self.min_interval = min_interval
-        self.last_call = None
-
-    def decorate(self, func):
-        @functools.wraps(func)
-        def wrapper(*args, **kwargs):
-            allow = not self.last_call or self.last_call.split() > self.min_interval
-            if allow:
-                self.last_call = Stopwatch()
-                return func(*args, **kwargs)
-
-        return wrapper
-
-    __call__ = decorate
-
-
-class Timer(Stopwatch):
-    """
-    Watch for a target elapsed time.
-
-    >>> t = Timer(0.1)
-    >>> t.expired()
-    False
-    >>> __import__('time').sleep(0.15)
-    >>> t.expired()
-    True
-    """
-
-    def __init__(self, target=float('Inf')):
-        self.target = self._accept(target)
-        super().__init__()
-
-    @staticmethod
-    def _accept(target):
-        """
-        Accept None or ∞ or datetime or numeric for target
-
-        >>> Timer._accept(datetime.timedelta(seconds=30))
-        30.0
-        >>> Timer._accept(None)
-        inf
-        """
-        if isinstance(target, datetime.timedelta):
-            target = target.total_seconds()
-
-        if target is None:
-            # treat None as infinite target
-            target = float('Inf')
-
-        return target
-
-    def expired(self):
-        return self.split().total_seconds() > self.target
-
-
-class BackoffDelay(collections.abc.Iterator):
-    """
-    Exponential backoff delay.
-
-    Useful for defining delays between retries. Consider for use
-    with ``jaraco.functools.retry_call`` as the cleanup.
-
-    Default behavior has no effect; a delay or jitter must
-    be supplied for the call to be non-degenerate.
-
-    >>> bd = BackoffDelay()
-    >>> bd()
-    >>> bd()
-
-    The following instance will delay 10ms for the first call,
-    20ms for the second, etc.
-
-    >>> bd = BackoffDelay(delay=0.01, factor=2)
-    >>> bd()
-    >>> bd()
-
-    Inspect and adjust the state of the delay anytime.
-
-    >>> bd.delay
-    0.04
-    >>> bd.delay = 0.01
-
-    Set limit to prevent the delay from exceeding bounds.
-
-    >>> bd = BackoffDelay(delay=0.01, factor=2, limit=0.015)
-    >>> bd()
-    >>> bd.delay
-    0.015
-
-    To reset the backoff, simply call ``.reset()``:
-
-    >>> bd.reset()
-    >>> bd.delay
-    0.01
-
-    Iterate on the object to retrieve/advance the delay values.
-
-    >>> next(bd)
-    0.01
-    >>> next(bd)
-    0.015
-    >>> import itertools
-    >>> tuple(itertools.islice(bd, 3))
-    (0.015, 0.015, 0.015)
-
-    Limit may be a callable taking a number and returning
-    the limited number.
-
-    >>> at_least_one = lambda n: max(n, 1)
-    >>> bd = BackoffDelay(delay=0.01, factor=2, limit=at_least_one)
-    >>> next(bd)
-    0.01
-    >>> next(bd)
-    1
-
-    Pass a jitter to add or subtract seconds to the delay.
-
-    >>> bd = BackoffDelay(jitter=0.01)
-    >>> next(bd)
-    0
-    >>> next(bd)
-    0.01
-
-    Jitter may be a callable. To supply a non-deterministic jitter
-    between -0.5 and 0.5, consider:
-
-    >>> import random
-    >>> jitter=functools.partial(random.uniform, -0.5, 0.5)
-    >>> bd = BackoffDelay(jitter=jitter)
-    >>> next(bd)
-    0
-    >>> 0 <= next(bd) <= 0.5
-    True
-    """
-
-    delay = 0
-
-    factor = 1
-    "Multiplier applied to delay"
-
-    jitter = 0
-    "Number or callable returning extra seconds to add to delay"
-
-    @jaraco.functools.save_method_args
-    def __init__(self, delay=0, factor=1, limit=float('inf'), jitter=0):
-        self.delay = delay
-        self.factor = factor
-        if isinstance(limit, numbers.Number):
-            limit_ = limit
-
-            def limit(n):
-                return max(0, min(limit_, n))
-
-        self.limit = limit
-        if isinstance(jitter, numbers.Number):
-            jitter_ = jitter
-
-            def jitter():
-                return jitter_
-
-        self.jitter = jitter
-
-    def __call__(self):
-        time.sleep(next(self))
-
-    def __next__(self):
-        delay = self.delay
-        self.bump()
-        return delay
-
-    def __iter__(self):
-        return self
-
-    def bump(self):
-        self.delay = self.limit(self.delay * self.factor + self.jitter())
-
-    def reset(self):
-        saved = self._saved___init__
-        self.__init__(*saved.args, **saved.kwargs)
diff --git a/lib/tempora/utc.py b/lib/tempora/utc.py
deleted file mode 100644
index 08c5f1f6..00000000
--- a/lib/tempora/utc.py
+++ /dev/null
@@ -1,46 +0,0 @@
-"""
-Facilities for common time operations in UTC.
-
-Inspired by the `utc project <https://pypi.org/project/utc>`_.
-
->>> dt = now()
->>> dt == fromtimestamp(dt.timestamp())
-True
->>> dt.tzinfo
-datetime.timezone.utc
-
->>> from time import time as timestamp
->>> now().timestamp() - timestamp() < 0.1
-True
-
->>> (now() - fromtimestamp(timestamp())).total_seconds() < 0.1
-True
-
->>> datetime(2018, 6, 26, 0).tzinfo
-datetime.timezone.utc
-
->>> time(0, 0).tzinfo
-datetime.timezone.utc
-
-Now should be affected by freezegun.
-
->>> freezer = getfixture('freezer')
->>> freezer.move_to('1999-12-31 17:00:00 -0700')
->>> print(now())
-2000-01-01 00:00:00+00:00
-"""
-
-import datetime as std
-import functools
-
-
-__all__ = ['now', 'fromtimestamp', 'datetime', 'time']
-
-
-def now():
-    return std.datetime.now(std.timezone.utc)
-
-
-fromtimestamp = functools.partial(std.datetime.fromtimestamp, tz=std.timezone.utc)
-datetime = functools.partial(std.datetime, tzinfo=std.timezone.utc)
-time = functools.partial(std.time, tzinfo=std.timezone.utc)
diff --git a/lib/tokenize_rt.py b/lib/tokenize_rt.py
deleted file mode 100644
index f909ead7..00000000
--- a/lib/tokenize_rt.py
+++ /dev/null
@@ -1,205 +0,0 @@
-from __future__ import annotations
-
-import argparse
-import io
-import keyword
-import re
-import sys
-import tokenize
-from collections.abc import Generator
-from collections.abc import Iterable
-from collections.abc import Sequence
-from re import Pattern
-from typing import NamedTuple
-
-# this is a performance hack.  see https://bugs.python.org/issue43014
-if (  # pragma: no branch
-        sys.version_info < (3, 10) and
-        callable(getattr(tokenize, '_compile', None))
-):  # pragma: <3.10 cover
-    from functools import lru_cache
-    tokenize._compile = lru_cache(tokenize._compile)
-
-ESCAPED_NL = 'ESCAPED_NL'
-UNIMPORTANT_WS = 'UNIMPORTANT_WS'
-NON_CODING_TOKENS = frozenset(('COMMENT', ESCAPED_NL, 'NL', UNIMPORTANT_WS))
-
-
-class Offset(NamedTuple):
-    line: int | None = None
-    utf8_byte_offset: int | None = None
-
-
-class Token(NamedTuple):
-    name: str
-    src: str
-    line: int | None = None
-    utf8_byte_offset: int | None = None
-
-    @property
-    def offset(self) -> Offset:
-        return Offset(self.line, self.utf8_byte_offset)
-
-    def matches(self, *, name: str, src: str) -> bool:
-        return self.name == name and self.src == src
-
-
-_string_re = re.compile('^([^\'"]*)(.*)$', re.DOTALL)
-_escaped_nl_re = re.compile(r'\\(\n|\r\n|\r)')
-
-NAMED_UNICODE_RE = re.compile(r'(?<!\\)(?:\\\\)*(\\N\{[^}]+\})')
-
-
-def curly_escape(s: str) -> str:
-    parts = NAMED_UNICODE_RE.split(s)
-    return ''.join(
-        part.replace('{', '{{').replace('}', '}}') if i % 2 == 0 else part
-        for i, part in enumerate(parts)
-    )
-
-
-def _re_partition(regex: Pattern[str], s: str) -> tuple[str, str, str]:
-    match = regex.search(s)
-    if match:
-        return s[:match.start()], s[slice(*match.span())], s[match.end():]
-    else:
-        return (s, '', '')
-
-
-def src_to_tokens(src: str) -> list[Token]:
-    tokenize_target = io.StringIO(src)
-    lines = ('',) + tuple(tokenize_target)
-
-    tokenize_target.seek(0)
-
-    tokens = []
-    last_line = 1
-    last_col = 0
-    end_offset = 0
-
-    gen = tokenize.generate_tokens(tokenize_target.readline)
-    for tok_type, tok_text, (sline, scol), (eline, ecol), line in gen:
-        if sline > last_line:
-            newtok = lines[last_line][last_col:]
-            for lineno in range(last_line + 1, sline):
-                newtok += lines[lineno]
-            if scol > 0:
-                newtok += lines[sline][:scol]
-
-            # a multiline unimportant whitespace may contain escaped newlines
-            while _escaped_nl_re.search(newtok):
-                ws, nl, newtok = _re_partition(_escaped_nl_re, newtok)
-                if ws:
-                    tokens.append(
-                        Token(UNIMPORTANT_WS, ws, last_line, end_offset),
-                    )
-                    end_offset += len(ws.encode())
-                tokens.append(Token(ESCAPED_NL, nl, last_line, end_offset))
-                end_offset = 0
-                last_line += 1
-            if newtok:
-                tokens.append(Token(UNIMPORTANT_WS, newtok, sline, 0))
-                end_offset = len(newtok.encode())
-            else:
-                end_offset = 0
-
-        elif scol > last_col:
-            newtok = line[last_col:scol]
-            tokens.append(Token(UNIMPORTANT_WS, newtok, sline, end_offset))
-            end_offset += len(newtok.encode())
-
-        tok_name = tokenize.tok_name[tok_type]
-
-        if tok_name == 'FSTRING_MIDDLE':  # pragma: >=3.12 cover
-            if '{' in tok_text or '}' in tok_text:
-                new_tok_text = curly_escape(tok_text)
-                ecol += len(new_tok_text) - len(tok_text)
-                tok_text = new_tok_text
-
-        tokens.append(Token(tok_name, tok_text, sline, end_offset))
-        last_line, last_col = eline, ecol
-        if sline != eline:
-            end_offset = len(lines[last_line][:last_col].encode())
-        else:
-            end_offset += len(tok_text.encode())
-
-    return tokens
-
-
-def tokens_to_src(tokens: Iterable[Token]) -> str:
-    return ''.join(tok.src for tok in tokens)
-
-
-def reversed_enumerate(
-        tokens: Sequence[Token],
-) -> Generator[tuple[int, Token]]:
-    for i in reversed(range(len(tokens))):
-        yield i, tokens[i]
-
-
-def parse_string_literal(src: str) -> tuple[str, str]:
-    """parse a string literal's source into (prefix, string)"""
-    match = _string_re.match(src)
-    assert match is not None
-    return match.group(1), match.group(2)
-
-
-def rfind_string_parts(tokens: Sequence[Token], i: int) -> tuple[int, ...]:
-    """find the indicies of the string parts of a (joined) string literal
-
-    - `i` should start at the end of the string literal
-    - returns `()` (an empty tuple) for things which are not string literals
-    """
-    ret = []
-    depth = 0
-    for i in range(i, -1, -1):
-        token = tokens[i]
-        if token.name == 'STRING':
-            ret.append(i)
-        elif token.name in NON_CODING_TOKENS:
-            pass
-        elif token.src == ')':
-            depth += 1
-        elif depth and token.src == '(':
-            depth -= 1
-            # if we closed the paren(s) make sure it was a parenthesized string
-            # and not actually a call
-            if depth == 0:
-                for j in range(i - 1, -1, -1):
-                    tok = tokens[j]
-                    if tok.name in NON_CODING_TOKENS:
-                        pass
-                    # this was actually a call and not a parenthesized string
-                    elif (
-                            tok.src in {']', ')'} or (
-                                tok.name == 'NAME' and
-                                tok.src not in keyword.kwlist
-                            )
-                    ):
-                        return ()
-                    else:
-                        break
-                break
-        elif depth:  # it looked like a string but wasn't
-            return ()
-        else:
-            break
-    return tuple(reversed(ret))
-
-
-def main(argv: Sequence[str] | None = None) -> int:
-    parser = argparse.ArgumentParser()
-    parser.add_argument('filename')
-    args = parser.parse_args(argv)
-    with open(args.filename) as f:
-        tokens = src_to_tokens(f.read())
-
-    for token in tokens:
-        line, col = str(token.line), str(token.utf8_byte_offset)
-        print(f'{line}:{col} {token.name} {token.src!r}')
-
-    return 0
-
-
-if __name__ == '__main__':
-    raise SystemExit(main())
diff --git a/lib/twitter/__init__.py b/lib/twitter/__init__.py
deleted file mode 100644
index b4836243..00000000
--- a/lib/twitter/__init__.py
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#
-# Copyright 2007-2018 The Python-Twitter Developers
-#
-# 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.
-
-"""A library that provides a Python interface to the Twitter API."""
-from __future__ import absolute_import
-
-__author__       = 'The Python-Twitter Developers'
-__email__        = 'python-twitter@googlegroups.com'
-__copyright__    = 'Copyright (c) 2007-2016 The Python-Twitter Developers'
-__license__      = 'Apache License 2.0'
-__version__      = '3.5'
-__url__          = 'https://github.com/bear/python-twitter'
-__download_url__ = 'https://pypi.python.org/pypi/python-twitter'
-__description__  = 'A Python wrapper around the Twitter API'
-
-
-import json                                 # noqa
-
-try:
-    from hashlib import md5                 # noqa
-except ImportError:
-    from md5 import md5                     # noqa
-
-from ._file_cache import _FileCache         # noqa
-from .error import TwitterError             # noqa
-from .parse_tweet import ParseTweet         # noqa
-
-from .models import (                       # noqa
-    Category,                               # noqa
-    DirectMessage,                          # noqa
-    Hashtag,                                # noqa
-    List,                                   # noqa
-    Media,                                  # noqa
-    Trend,                                  # noqa
-    Url,                                    # noqa
-    User,                                   # noqa
-    UserStatus,                             # noqa
-    Status                                  # noqa
-)
-
-from .api import Api                        # noqa
diff --git a/lib/twitter/_file_cache.py b/lib/twitter/_file_cache.py
deleted file mode 100644
index 39962457..00000000
--- a/lib/twitter/_file_cache.py
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/env python
-import errno
-import os
-import tempfile
-
-from hashlib import md5
-
-
-class _FileCacheError(Exception):
-    """Base exception class for FileCache related errors"""
-
-
-class _FileCache(object):
-    DEPTH = 3
-
-    def __init__(self, root_directory=None):
-        self._InitializeRootDirectory(root_directory)
-
-    def Get(self, key):
-        path = self._GetPath(key)
-        if os.path.exists(path):
-            with open(path) as f:
-                return f.read()
-        else:
-            return None
-
-    def Set(self, key, data):
-        path = self._GetPath(key)
-        directory = os.path.dirname(path)
-        if not os.path.exists(directory):
-            os.makedirs(directory)
-        if not os.path.isdir(directory):
-            raise _FileCacheError('%s exists but is not a directory' % directory)
-        temp_fd, temp_path = tempfile.mkstemp()
-        temp_fp = os.fdopen(temp_fd, 'w')
-        temp_fp.write(data)
-        temp_fp.close()
-        if not path.startswith(self._root_directory):
-            raise _FileCacheError('%s does not appear to live under %s' %
-                                  (path, self._root_directory))
-        if os.path.exists(path):
-            os.remove(path)
-        os.rename(temp_path, path)
-
-    def Remove(self, key):
-        path = self._GetPath(key)
-        if not path.startswith(self._root_directory):
-            raise _FileCacheError('%s does not appear to live under %s' %
-                                  (path, self._root_directory))
-        if os.path.exists(path):
-            os.remove(path)
-
-    def GetCachedTime(self, key):
-        path = self._GetPath(key)
-        if os.path.exists(path):
-            return os.path.getmtime(path)
-        else:
-            return None
-
-    def _GetUsername(self):
-        """Attempt to find the username in a cross-platform fashion."""
-        try:
-            return os.getenv('USER') or \
-                   os.getenv('LOGNAME') or \
-                   os.getenv('USERNAME') or \
-                   os.getlogin() or \
-                   'nobody'
-        except (AttributeError, IOError, OSError):
-            return 'nobody'
-
-    def _GetTmpCachePath(self):
-        username = self._GetUsername()
-        cache_directory = 'python.cache_' + username
-        return os.path.join(tempfile.gettempdir(), cache_directory)
-
-    def _InitializeRootDirectory(self, root_directory):
-        if not root_directory:
-            root_directory = self._GetTmpCachePath()
-        root_directory = os.path.abspath(root_directory)
-        try:
-            os.mkdir(root_directory)
-        except OSError as e:
-            if e.errno == errno.EEXIST and os.path.isdir(root_directory):
-                # directory already exists
-                pass
-            else:
-                # exists but is a file, or no permissions, or...
-                raise
-        self._root_directory = root_directory
-
-    def _GetPath(self, key):
-        try:
-            hashed_key = md5(key.encode('utf-8')).hexdigest()
-        except TypeError:
-            hashed_key = md5.new(key).hexdigest()
-
-        return os.path.join(self._root_directory,
-                            self._GetPrefix(hashed_key),
-                            hashed_key)
-
-    def _GetPrefix(self, hashed_key):
-        return os.path.sep.join(hashed_key[0:_FileCache.DEPTH])
diff --git a/lib/twitter/api.py b/lib/twitter/api.py
deleted file mode 100644
index a823fc38..00000000
--- a/lib/twitter/api.py
+++ /dev/null
@@ -1,5037 +0,0 @@
-#!/usr/bin/env python
-
-#
-#
-# Copyright 2007-2016, 2018 The Python-Twitter Developers
-#
-# 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.
-
-"""A library that provides a Python interface to the Twitter API"""
-from __future__ import division
-from __future__ import print_function
-
-import json
-import sys
-import gzip
-import time
-import base64
-import re
-import logging
-import requests
-from requests_oauthlib import OAuth1, OAuth2
-import io
-import warnings
-from uuid import uuid4
-import os
-
-try:
-    # python 3
-    from urllib.parse import urlparse, urlunparse, urlencode, quote_plus
-    from urllib.request import __version__ as urllib_version
-except ImportError:
-    from urlparse import urlparse, urlunparse
-    from urllib import urlencode, quote_plus
-    from urllib import __version__ as urllib_version
-
-from twitter import (
-    __version__,
-    _FileCache,
-    Category,
-    DirectMessage,
-    List,
-    Status,
-    Trend,
-    User,
-    UserStatus,
-)
-
-from twitter.ratelimit import RateLimit
-
-from twitter.twitter_utils import (
-    calc_expected_status_length,
-    is_url,
-    parse_media_file,
-    enf_type,
-    parse_arg_list)
-
-from twitter.error import (
-    TwitterError,
-    PythonTwitterDeprecationWarning330,
-)
-
-if sys.version_info > (3,):
-    long = int  # pylint: disable=invalid-name,redefined-builtin
-
-CHARACTER_LIMIT = 280
-
-# A singleton representing a lazily instantiated FileCache.
-DEFAULT_CACHE = object()
-
-logger = logging.getLogger(__name__)
-
-
-class Api(object):
-    """A python interface into the Twitter API
-
-    By default, the Api caches results for 1 minute.
-
-    Example usage:
-
-      To create an instance of the twitter.Api class, with no authentication:
-
-        >>> import twitter
-        >>> api = twitter.Api()
-
-      To fetch a single user's public status messages, where "user" is either
-      a Twitter "short name" or their user id.
-
-        >>> statuses = api.GetUserTimeline(user)
-        >>> print([s.text for s in statuses])
-
-      To use authentication, instantiate the twitter.Api class with a
-      consumer key and secret; and the oAuth key and secret:
-
-        >>> api = twitter.Api(consumer_key='twitter consumer key',
-                              consumer_secret='twitter consumer secret',
-                              access_token_key='the_key_given',
-                              access_token_secret='the_key_secret')
-
-      To fetch your friends (after being authenticated):
-
-        >>> users = api.GetFriends()
-        >>> print([u.name for u in users])
-
-      To post a twitter status message (after being authenticated):
-
-        >>> status = api.PostUpdate('I love python-twitter!')
-        >>> print(status.text)
-        I love python-twitter!
-
-      There are many other methods, including:
-
-        >>> api.PostUpdates(status)
-        >>> api.PostDirectMessage(user, text)
-        >>> api.GetUser(user)
-        >>> api.GetReplies()
-        >>> api.GetUserTimeline(user)
-        >>> api.GetHomeTimeline()
-        >>> api.GetStatus(status_id)
-        >>> api.GetStatuses(status_ids)
-        >>> api.DestroyStatus(status_id)
-        >>> api.GetFriends(user)
-        >>> api.GetFollowers()
-        >>> api.GetFeatured()
-        >>> api.GetDirectMessages()
-        >>> api.GetSentDirectMessages()
-        >>> api.PostDirectMessage(user, text)
-        >>> api.DestroyDirectMessage(message_id)
-        >>> api.DestroyFriendship(user)
-        >>> api.CreateFriendship(user)
-        >>> api.LookupFriendship(user)
-        >>> api.VerifyCredentials()
-    """
-
-    DEFAULT_CACHE_TIMEOUT = 60  # cache for 1 minute
-    _API_REALM = 'Twitter API'
-
-    def __init__(self,
-                 consumer_key=None,
-                 consumer_secret=None,
-                 access_token_key=None,
-                 access_token_secret=None,
-                 application_only_auth=False,
-                 input_encoding=None,
-                 request_headers=None,
-                 cache=DEFAULT_CACHE,
-                 base_url=None,
-                 stream_url=None,
-                 upload_url=None,
-                 chunk_size=1024 * 1024,
-                 use_gzip_compression=False,
-                 debugHTTP=False,
-                 timeout=None,
-                 sleep_on_rate_limit=False,
-                 tweet_mode='compat',
-                 proxies=None):
-        """Instantiate a new twitter.Api object.
-
-        Args:
-          consumer_key (str):
-            Your Twitter user's consumer_key.
-          consumer_secret (str):
-            Your Twitter user's consumer_secret.
-          access_token_key (str):
-            The oAuth access token key value you retrieved
-            from running get_access_token.py.
-          access_token_secret (str):
-            The oAuth access token's secret, also retrieved
-            from the get_access_token.py run.
-          application_only_auth:
-             Use Application-Only Auth instead of User Auth.
-             Defaults to False [Optional]
-          input_encoding (str, optional):
-            The encoding used to encode input strings.
-          request_header (dict, optional):
-            A dictionary of additional HTTP request headers.
-          cache (object, optional):
-            The cache instance to use. Defaults to DEFAULT_CACHE.
-            Use None to disable caching.
-          base_url (str, optional):
-            The base URL to use to contact the Twitter API.
-            Defaults to https://api.twitter.com.
-          stream_url (str, optional):
-            The base URL to use for streaming endpoints.
-            Defaults to 'https://stream.twitter.com/1.1'.
-          upload_url (str, optional):
-            The base URL to use for uploads. Defaults to 'https://upload.twitter.com/1.1'.
-          chunk_size (int, optional):
-            Chunk size to use for chunked (multi-part) uploads of images/videos/gifs.
-            Defaults to 1MB. Anything under 16KB and you run the risk of erroring out
-            on 15MB files.
-          use_gzip_compression (bool, optional):
-            Set to True to tell enable gzip compression for any call
-            made to Twitter.  Defaults to False.
-          debugHTTP (bool, optional):
-            Set to True to enable debug output from urllib2 when performing
-            any HTTP requests.  Defaults to False.
-          timeout (int, optional):
-            Set timeout (in seconds) of the http/https requests. If None the
-            requests lib default will be used.  Defaults to None.
-          sleep_on_rate_limit (bool, optional):
-            Whether to sleep an appropriate amount of time if a rate limit is hit for
-            an endpoint.
-          tweet_mode (str, optional):
-            Whether to use the new (as of Sept. 2016) extended tweet mode. See docs for
-            details. Choices are ['compatibility', 'extended'].
-          proxies (dict, optional):
-            A dictionary of proxies for the request to pass through, if not specified
-            allows requests lib to use environmental variables for proxy if any.
-        """
-
-        # check to see if the library is running on a Google App Engine instance
-        # see GAE.rst for more information
-        if os.environ:
-            if 'APPENGINE_RUNTIME' in os.environ.keys():
-                # Adapter ensures requests use app engine's urlfetch
-                import requests_toolbelt.adapters.appengine
-                requests_toolbelt.adapters.appengine.monkeypatch()
-                # App Engine does not like this caching strategy, disable caching
-                cache = None
-
-        self.SetCache(cache)
-        self._cache_timeout = Api.DEFAULT_CACHE_TIMEOUT
-        self._input_encoding = input_encoding
-        self._use_gzip = use_gzip_compression
-        self._debugHTTP = debugHTTP
-        self._shortlink_size = 19
-        if timeout and timeout < 30:
-            warnings.warn("Warning: The Twitter streaming API sends 30s keepalives, the given timeout is shorter!")
-        self._timeout = timeout
-        self.__auth = None
-
-        self._InitializeRequestHeaders(request_headers)
-        self._InitializeUserAgent()
-        self._InitializeDefaultParameters()
-
-        self.rate_limit = RateLimit()
-        self.sleep_on_rate_limit = sleep_on_rate_limit
-        self.tweet_mode = tweet_mode
-        self.proxies = proxies
-
-        if base_url is None:
-            self.base_url = 'https://api.twitter.com/1.1'
-        else:
-            self.base_url = base_url
-
-        if stream_url is None:
-            self.stream_url = 'https://stream.twitter.com/1.1'
-        else:
-            self.stream_url = stream_url
-
-        if upload_url is None:
-            self.upload_url = 'https://upload.twitter.com/1.1'
-        else:
-            self.upload_url = upload_url
-
-        self.chunk_size = chunk_size
-
-        if self.chunk_size < 1024 * 16:
-            warnings.warn((
-                "A chunk size lower than 16384 may result in too many "
-                "requests to the Twitter API when uploading videos. You are "
-                "strongly advised to increase it above 16384"))
-
-        if (consumer_key and not
-           (application_only_auth or all([access_token_key, access_token_secret]))):
-            raise TwitterError({'message': "Missing oAuth Consumer Key or Access Token"})
-
-        self.SetCredentials(consumer_key, consumer_secret, access_token_key, access_token_secret,
-                            application_only_auth)
-
-        if debugHTTP:
-            try:
-                import http.client as http_client  # python3
-            except ImportError:
-                import httplib as http_client  # python2
-
-            http_client.HTTPConnection.debuglevel = 1
-
-            logging.basicConfig()  # you need to initialize logging, otherwise you will not see anything from requests
-            logging.getLogger().setLevel(logging.DEBUG)
-            requests_log = logging.getLogger("requests.packages.urllib3")
-            requests_log.setLevel(logging.DEBUG)
-            requests_log.propagate = True
-
-        self._session = requests.Session()
-
-    @staticmethod
-    def GetAppOnlyAuthToken(consumer_key, consumer_secret):
-        """
-        Generate a Bearer Token from consumer_key and consumer_secret
-        """
-        key = quote_plus(consumer_key)
-        secret = quote_plus(consumer_secret)
-        bearer_token = base64.b64encode('{}:{}'.format(key, secret).encode('utf8'))
-
-        post_headers = {
-            'Authorization': 'Basic {0}'.format(bearer_token.decode('utf8')),
-            'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
-        }
-
-        res = requests.post(url='https://api.twitter.com/oauth2/token',
-                            data={'grant_type': 'client_credentials'},
-                            headers=post_headers)
-        bearer_creds = res.json()
-        return bearer_creds
-
-    def SetCredentials(self,
-                       consumer_key,
-                       consumer_secret,
-                       access_token_key=None,
-                       access_token_secret=None,
-                       application_only_auth=False):
-        """Set the consumer_key and consumer_secret for this instance
-
-        Args:
-          consumer_key:
-            The consumer_key of the twitter account.
-          consumer_secret:
-            The consumer_secret for the twitter account.
-          access_token_key:
-            The oAuth access token key value you retrieved
-            from running get_access_token.py.
-          access_token_secret:
-            The oAuth access token's secret, also retrieved
-            from the get_access_token.py run.
-          application_only_auth:
-            Whether to generate a bearer token and use Application-Only Auth
-        """
-        self._consumer_key = consumer_key
-        self._consumer_secret = consumer_secret
-        self._access_token_key = access_token_key
-        self._access_token_secret = access_token_secret
-
-        if application_only_auth:
-            self._bearer_token = self.GetAppOnlyAuthToken(consumer_key, consumer_secret)
-            self.__auth = OAuth2(token=self._bearer_token)
-        else:
-            auth_list = [consumer_key, consumer_secret,
-                         access_token_key, access_token_secret]
-            if all(auth_list):
-                self.__auth = OAuth1(consumer_key, consumer_secret,
-                                     access_token_key, access_token_secret)
-
-        self._config = None
-
-    def GetHelpConfiguration(self):
-        """Get basic help configuration details from Twitter.
-
-        Args:
-            None
-
-        Returns:
-            dict: Sets self._config and returns dict of help config values.
-        """
-        if self._config is None:
-            url = '%s/help/configuration.json' % self.base_url
-            resp = self._RequestUrl(url, 'GET')
-            data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-            self._config = data
-        return self._config
-
-    def GetShortUrlLength(self, https=False):
-        """Returns number of characters reserved per URL included in a tweet.
-
-        Args:
-            https (bool, optional):
-                If True, return number of characters reserved for https urls
-                or, if False, return number of character reserved for http urls.
-        Returns:
-            (int): Number of characters reserved per URL.
-        """
-        config = self.GetHelpConfiguration()
-        if https:
-            return config['short_url_length_https']
-        else:
-            return config['short_url_length']
-
-    def ClearCredentials(self):
-        """Clear any credentials for this instance
-        """
-        self._consumer_key = None
-        self._consumer_secret = None
-        self._access_token_key = None
-        self._access_token_secret = None
-        self._bearer_token = None
-        self.__auth = None  # for request upgrade
-
-    def GetSearch(self,
-                  term=None,
-                  raw_query=None,
-                  geocode=None,
-                  since_id=None,
-                  max_id=None,
-                  until=None,
-                  since=None,
-                  count=15,
-                  lang=None,
-                  locale=None,
-                  result_type="mixed",
-                  include_entities=None,
-                  return_json=False):
-        """Return twitter search results for a given term. You must specify one
-        of term, geocode, or raw_query.
-
-        Args:
-          term (str, optional):
-            Term to search by. Optional if you include geocode.
-          raw_query (str, optional):
-            A raw query as a string. This should be everything after the "?" in
-            the URL (i.e., the query parameters). You are responsible for all
-            type checking and ensuring that the query string is properly
-            formatted, as it will only be URL-encoded before be passed directly
-            to Twitter with no other checks performed. For advanced usage only.
-            *This will override any other parameters passed*
-          since_id (int, optional):
-            Returns results with an ID greater than (that is, more recent
-            than) the specified ID. There are limits to the number of
-            Tweets which can be accessed through the API. If the limit of
-            Tweets has occurred since the since_id, the since_id will be
-            forced to the oldest ID available.
-          max_id (int, optional):
-            Returns only statuses with an ID less than (that is, older
-            than) or equal to the specified ID.
-          until (str, optional):
-            Returns tweets generated before the given date. Date should be
-            formatted as YYYY-MM-DD.
-          since (str, optional):
-            Returns tweets generated since the given date. Date should be
-            formatted as YYYY-MM-DD.
-          geocode (str or list or tuple, optional):
-            Geolocation within which to search for tweets. Can be either a
-            string in the form of "latitude,longitude,radius" where latitude
-            and longitude are floats and radius is a string such as "1mi" or
-            "1km" ("mi" or "km" are the only units allowed). For example:
-              >>> api.GetSearch(geocode="37.781157,-122.398720,1mi").
-            Otherwise, you can pass a list of either floats or strings for
-            lat/long and a string for radius:
-              >>> api.GetSearch(geocode=[37.781157, -122.398720, "1mi"])
-              >>> # or:
-              >>> api.GetSearch(geocode=(37.781157, -122.398720, "1mi"))
-              >>> # or:
-              >>> api.GetSearch(geocode=("37.781157", "-122.398720", "1mi"))
-          count (int, optional):
-            Number of results to return.  Default is 15 and maxmimum that
-            Twitter returns is 100 irrespective of what you type in.
-          lang (str, optional):
-            Language for results as ISO 639-1 code.  Default is None
-            (all languages).
-          locale (str, optional):
-            Language of the search query. Currently only 'ja' is effective.
-            This is intended for language-specific consumers and the default
-            should work in the majority of cases.
-          result_type (str, optional):
-            Type of result which should be returned. Default is "mixed".
-            Valid options are "mixed, "recent", and "popular".
-          include_entities (bool, optional):
-            If True, each tweet will include a node called "entities".
-            This node offers a variety of metadata about the tweet in a
-            discrete structure, including: user_mentions, urls, and
-            hashtags.
-          return_json (bool, optional):
-            If True JSON data will be returned, instead of twitter.Userret
-        Returns:
-          list: A sequence of twitter.Status instances, one for each message
-          containing the term, within the bounds of the geocoded area, or
-          given by the raw_query.
-        """
-
-        url = '%s/search/tweets.json' % self.base_url
-        parameters = {}
-
-        if since_id:
-            parameters['since_id'] = enf_type('since_id', int, since_id)
-
-        if max_id:
-            parameters['max_id'] = enf_type('max_id', int, max_id)
-
-        if until:
-            parameters['until'] = enf_type('until', str, until)
-
-        if since:
-            parameters['since'] = enf_type('since', str, since)
-
-        if lang:
-            parameters['lang'] = enf_type('lang', str, lang)
-
-        if locale:
-            parameters['locale'] = enf_type('locale', str, locale)
-
-        if term is None and geocode is None and raw_query is None:
-            return []
-
-        if term is not None:
-            parameters['q'] = term
-
-        if geocode is not None:
-            if isinstance(geocode, list) or isinstance(geocode, tuple):
-                parameters['geocode'] = ','.join([str(geo) for geo in geocode])
-            else:
-                parameters['geocode'] = enf_type('geocode', str, geocode)
-
-        if include_entities:
-            parameters['include_entities'] = enf_type('include_entities',
-                                                      bool,
-                                                      include_entities)
-
-        parameters['count'] = enf_type('count', int, count)
-
-        if result_type in ["mixed", "popular", "recent"]:
-            parameters['result_type'] = result_type
-
-        if raw_query is not None:
-            url = "{url}?{raw_query}".format(
-                url=url,
-                raw_query=raw_query)
-            resp = self._RequestUrl(url, 'GET')
-        else:
-            resp = self._RequestUrl(url, 'GET', data=parameters)
-
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-        if return_json:
-            return data
-        else:
-            return [Status.NewFromJsonDict(x) for x in data.get('statuses', '')]
-
-    def GetUsersSearch(self,
-                       term=None,
-                       page=1,
-                       count=20,
-                       include_entities=None):
-        """Return twitter user search results for a given term.
-
-        Args:
-          term:
-            Term to search by.
-          page:
-            Page of results to return. Default is 1
-            [Optional]
-          count:
-            Number of results to return.  Default is 20
-            [Optional]
-          include_entities:
-            If True, each tweet will include a node called "entities,".
-            This node offers a variety of metadata about the tweet in a
-            discrete structure, including: user_mentions, urls, and hashtags.
-            [Optional]
-
-        Returns:
-          A sequence of twitter.User instances, one for each message containing
-          the term
-        """
-        # Build request parameters
-        parameters = {}
-
-        if term is not None:
-            parameters['q'] = term
-
-        if page != 1:
-            parameters['page'] = page
-
-        if include_entities:
-            parameters['include_entities'] = 1
-
-        try:
-            parameters['count'] = int(count)
-        except ValueError:
-            raise TwitterError({'message': "count must be an integer"})
-
-        # Make and send requests
-        url = '%s/users/search.json' % self.base_url
-        resp = self._RequestUrl(url, 'GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-        return [User.NewFromJsonDict(x) for x in data]
-
-    def GetTrendsCurrent(self, exclude=None):
-        """Get the current top trending topics (global)
-
-        Args:
-          exclude:
-            Appends the exclude parameter as a request parameter.
-            Currently only exclude=hashtags is supported. [Optional]
-
-        Returns:
-          A list with 10 entries. Each entry contains a trend.
-        """
-        return self.GetTrendsWoeid(woeid=1, exclude=exclude)
-
-    def GetTrendsWoeid(self, woeid, exclude=None):
-        """Return the top 10 trending topics for a specific WOEID, if trending
-        information is available for it.
-
-        Args:
-          woeid:
-            the Yahoo! Where On Earth ID for a location.
-          exclude:
-            Appends the exclude parameter as a request parameter.
-            Currently only exclude=hashtags is supported. [Optional]
-
-        Returns:
-          A list with 10 entries. Each entry contains a trend.
-        """
-        url = '%s/trends/place.json' % (self.base_url)
-        parameters = {'id': woeid}
-
-        if exclude:
-            parameters['exclude'] = exclude
-
-        resp = self._RequestUrl(url, verb='GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-        trends = []
-        timestamp = data[0]['as_of']
-
-        for trend in data[0]['trends']:
-            trends.append(Trend.NewFromJsonDict(trend, timestamp=timestamp))
-        return trends
-
-    def GetUserSuggestionCategories(self):
-        """ Return the list of suggested user categories, this can be used in
-            GetUserSuggestion function
-        Returns:
-            A list of categories
-        """
-        url = '%s/users/suggestions.json' % (self.base_url)
-        resp = self._RequestUrl(url, verb='GET')
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        categories = []
-
-        for category in data:
-            categories.append(Category.NewFromJsonDict(category))
-        return categories
-
-    def GetUserSuggestion(self, category):
-        """ Returns a list of users in a category
-        Args:
-            category:
-                The Category object to limit the search by
-        Returns:
-            A list of users in that category
-        """
-        url = '%s/users/suggestions/%s.json' % (self.base_url, category.slug)
-
-        resp = self._RequestUrl(url, verb='GET')
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        users = []
-        for user in data['users']:
-            users.append(User.NewFromJsonDict(user))
-        return users
-
-    def GetHomeTimeline(self,
-                        count=None,
-                        since_id=None,
-                        max_id=None,
-                        trim_user=False,
-                        exclude_replies=False,
-                        contributor_details=False,
-                        include_entities=True):
-        """Fetch a collection of the most recent Tweets and retweets posted
-        by the authenticating user and the users they follow.
-
-        The home timeline is central to how most users interact with Twitter.
-
-        Args:
-          count:
-            Specifies the number of statuses to retrieve. May not be
-            greater than 200. Defaults to 20. [Optional]
-          since_id:
-            Returns results with an ID greater than (that is, more recent
-            than) the specified ID. There are limits to the number of
-            Tweets which can be accessed through the API. If the limit of
-            Tweets has occurred since the since_id, the since_id will be
-            forced to the oldest ID available. [Optional]
-          max_id:
-            Returns results with an ID less than (that is, older than) or
-            equal to the specified ID. [Optional]
-          trim_user:
-            When True, each tweet returned in a timeline will include a user
-            object including only the status authors numerical ID. Omit this
-            parameter to receive the complete user object. [Optional]
-          exclude_replies:
-            This parameter will prevent replies from appearing in the
-            returned timeline. Using exclude_replies with the count
-            parameter will mean you will receive up-to count tweets -
-            this is because the count parameter retrieves that many
-            tweets before filtering out retweets and replies. [Optional]
-          contributor_details:
-            This parameter enhances the contributors element of the
-            status response to include the screen_name of the contributor.
-            By default only the user_id of the contributor is included. [Optional]
-          include_entities:
-            The entities node will be disincluded when set to false.
-            This node offers a variety of metadata about the tweet in a
-            discreet structure, including: user_mentions, urls, and
-            hashtags. [Optional]
-
-        Returns:
-          A sequence of twitter.Status instances, one for each message
-        """
-        url = '%s/statuses/home_timeline.json' % self.base_url
-
-        parameters = {}
-        if count is not None:
-            try:
-                if int(count) > 200:
-                    raise TwitterError({'message': "'count' may not be greater than 200"})
-            except ValueError:
-                raise TwitterError({'message': "'count' must be an integer"})
-            parameters['count'] = count
-        if since_id:
-            try:
-                parameters['since_id'] = int(since_id)
-            except ValueError:
-                raise TwitterError({'message': "'since_id' must be an integer"})
-        if max_id:
-            try:
-                parameters['max_id'] = int(max_id)
-            except ValueError:
-                raise TwitterError({'message': "'max_id' must be an integer"})
-        if trim_user:
-            parameters['trim_user'] = 1
-        if exclude_replies:
-            parameters['exclude_replies'] = 1
-        if contributor_details:
-            parameters['contributor_details'] = 1
-        if not include_entities:
-            parameters['include_entities'] = 'false'
-        resp = self._RequestUrl(url, 'GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return [Status.NewFromJsonDict(x) for x in data]
-
-    def GetUserTimeline(self,
-                        user_id=None,
-                        screen_name=None,
-                        since_id=None,
-                        max_id=None,
-                        count=None,
-                        include_rts=True,
-                        trim_user=False,
-                        exclude_replies=False):
-        """Fetch the sequence of public Status messages for a single user.
-
-        The twitter.Api instance must be authenticated if the user is private.
-
-        Args:
-          user_id (int, optional):
-            Specifies the ID of the user for whom to return the
-            user_timeline. Helpful for disambiguating when a valid user ID
-            is also a valid screen name.
-          screen_name (str, optional):
-            Specifies the screen name of the user for whom to return the
-            user_timeline. Helpful for disambiguating when a valid screen
-            name is also a user ID.
-          since_id (int, optional):
-            Returns results with an ID greater than (that is, more recent
-            than) the specified ID. There are limits to the number of
-            Tweets which can be accessed through the API. If the limit of
-            Tweets has occurred since the since_id, the since_id will be
-            forced to the oldest ID available.
-          max_id (int, optional):
-            Returns only statuses with an ID less than (that is, older
-            than) or equal to the specified ID.
-          count (int, optional):
-            Specifies the number of statuses to retrieve. May not be
-            greater than 200.
-          include_rts (bool, optional):
-            If True, the timeline will contain native retweets (if they
-            exist) in addition to the standard stream of tweets.
-          trim_user (bool, optional):
-            If True, statuses will only contain the numerical user ID only.
-            Otherwise a full user object will be returned for each status.
-          exclude_replies (bool, optional)
-            If True, this will prevent replies from appearing in the returned
-            timeline. Using exclude_replies with the count parameter will mean you
-            will receive up-to count tweets - this is because the count parameter
-            retrieves that many tweets before filtering out retweets and replies.
-            This parameter is only supported for JSON and XML responses.
-
-        Returns:
-          A sequence of Status instances, one for each message up to count
-        """
-        url = '%s/statuses/user_timeline.json' % (self.base_url)
-        parameters = {}
-
-        if user_id:
-            parameters['user_id'] = enf_type('user_id', int, user_id)
-        elif screen_name:
-            parameters['screen_name'] = screen_name
-        if since_id:
-            parameters['since_id'] = enf_type('since_id', int, since_id)
-        if max_id:
-            parameters['max_id'] = enf_type('max_id', int, max_id)
-        if count:
-            parameters['count'] = enf_type('count', int, count)
-
-        parameters['include_rts'] = enf_type('include_rts', bool, include_rts)
-        parameters['trim_user'] = enf_type('trim_user', bool, trim_user)
-        parameters['exclude_replies'] = enf_type('exclude_replies', bool, exclude_replies)
-
-        resp = self._RequestUrl(url, 'GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return [Status.NewFromJsonDict(x) for x in data]
-
-    def GetStatus(self,
-                  status_id,
-                  trim_user=False,
-                  include_my_retweet=True,
-                  include_entities=True,
-                  include_ext_alt_text=True):
-        """Returns a single status message, specified by the status_id parameter.
-
-        Args:
-          status_id:
-            The numeric ID of the status you are trying to retrieve.
-          trim_user:
-            When set to True, each tweet returned in a timeline will include
-            a user object including only the status authors numerical ID.
-            Omit this parameter to receive the complete user object. [Optional]
-          include_my_retweet:
-            When set to True, any Tweets returned that have been retweeted by
-            the authenticating user will include an additional
-            current_user_retweet node, containing the ID of the source status
-            for the retweet. [Optional]
-          include_entities:
-            If False, the entities node will be disincluded.
-            This node offers a variety of metadata about the tweet in a
-            discreet structure, including: user_mentions, urls, and
-            hashtags. [Optional]
-        Returns:
-          A twitter.Status instance representing that status message
-        """
-        url = '%s/statuses/show.json' % (self.base_url)
-
-        parameters = {
-            'id': enf_type('status_id', int, status_id),
-            'trim_user': enf_type('trim_user', bool, trim_user),
-            'include_my_retweet': enf_type('include_my_retweet', bool, include_my_retweet),
-            'include_entities': enf_type('include_entities', bool, include_entities),
-            'include_ext_alt_text': enf_type('include_ext_alt_text', bool, include_ext_alt_text)
-        }
-
-        resp = self._RequestUrl(url, 'GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return Status.NewFromJsonDict(data)
-
-    def GetStatuses(self,
-                    status_ids,
-                    trim_user=False,
-                    include_entities=True,
-                    map=False):
-        """Returns a list of status messages, specified by the status_ids parameter.
-
-        Args:
-          status_ids:
-            A list of the numeric ID of the statuses you are trying to retrieve.
-          trim_user:
-            When set to True, each tweet returned in a timeline will include
-            a user object including only the status authors numerical ID.
-            Omit this parameter to receive the complete user object. [Optional]
-          include_entities:
-            If False, the entities node will be disincluded.
-            This node offers a variety of metadata about the tweet in a
-            discreet structure, including: user_mentions, urls, and
-            hashtags. [Optional]
-          map:
-            If True, returns a dictionary with status id as key and returned
-            status data (or None if tweet does not exist or is inaccessible)
-            as value. Otherwise returns an unordered list of successfully
-            retrieved Tweets. [Optional]
-        Returns:
-          A dictionary or unordered list (depending on the parameter 'map') of
-          twitter Status instances representing the status messages.
-        """
-        url = '%s/statuses/lookup.json' % (self.base_url)
-
-        map = enf_type('map', bool, map)
-
-        if map:
-            result = {}
-        else:
-            result = []
-        offset = 0
-        parameters = {
-            'trim_user': enf_type('trim_user', bool, trim_user),
-            'include_entities': enf_type('include_entities', bool, include_entities),
-            'map': map
-        }
-        while offset < len(status_ids):
-            parameters['id'] = ','.join([str(enf_type('status_id', int, status_id)) for status_id in status_ids[offset:offset + 100]])
-
-            resp = self._RequestUrl(url, 'GET', data=parameters)
-            data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-            if map:
-                result.update({int(key): (Status.NewFromJsonDict(value) if value else None) for key, value in data['id'].items()})
-            else:
-                result += [Status.NewFromJsonDict(dataitem) for dataitem in data]
-
-            offset += 100
-
-        return result
-
-    def GetStatusOembed(self,
-                        status_id=None,
-                        url=None,
-                        maxwidth=None,
-                        hide_media=False,
-                        hide_thread=False,
-                        omit_script=False,
-                        align=None,
-                        related=None,
-                        lang=None):
-        """Returns information allowing the creation of an embedded representation of a
-        Tweet on third party sites.
-
-        Specify tweet by the id or url parameter.
-
-        Args:
-          status_id:
-            The numeric ID of the status you are trying to embed.
-          url:
-            The url of the status you are trying to embed.
-          maxwidth:
-            The maximum width in pixels that the embed should be rendered at.
-            This value is constrained to be between 250 and 550 pixels. [Optional]
-          hide_media:
-            Specifies whether the embedded Tweet should automatically expand images. [Optional]
-          hide_thread:
-            Specifies whether the embedded Tweet should automatically show the original
-            message in the case that the embedded Tweet is a reply. [Optional]
-          omit_script:
-            Specifies whether the embedded Tweet HTML should include a <script>
-            element pointing to widgets.js. [Optional]
-          align:
-            Specifies whether the embedded Tweet should be left aligned, right aligned,
-            or centered in the page. [Optional]
-          related:
-            A comma sperated string of related screen names. [Optional]
-          lang:
-            Language code for the rendered embed. [Optional]
-
-        Returns:
-          A dictionary with the response.
-        """
-        request_url = '%s/statuses/oembed.json' % (self.base_url)
-
-        parameters = {}
-
-        if status_id is not None:
-            try:
-                parameters['id'] = int(status_id)
-            except ValueError:
-                raise TwitterError({'message': "'status_id' must be an integer."})
-        elif url is not None:
-            parameters['url'] = url
-        else:
-            raise TwitterError({'message': "Must specify either 'status_id' or 'url'"})
-
-        if maxwidth is not None:
-            parameters['maxwidth'] = maxwidth
-        if hide_media is True:
-            parameters['hide_media'] = 'true'
-        if hide_thread is True:
-            parameters['hide_thread'] = 'true'
-        if omit_script is True:
-            parameters['omit_script'] = 'true'
-        if align is not None:
-            if align not in ('left', 'center', 'right', 'none'):
-                raise TwitterError({'message': "'align' must be 'left', 'center', 'right', or 'none'"})
-            parameters['align'] = align
-        if related:
-            if not isinstance(related, str):
-                raise TwitterError({'message': "'related' should be a string of comma separated screen names"})
-            parameters['related'] = related
-        if lang is not None:
-            if not isinstance(lang, str):
-                raise TwitterError({'message': "'lang' should be string instance"})
-            parameters['lang'] = lang
-
-        resp = self._RequestUrl(request_url, 'GET', data=parameters, enforce_auth=False)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return data
-
-    def DestroyStatus(self, status_id, trim_user=False):
-        """Destroys the status specified by the required ID parameter.
-
-        The authenticating user must be the author of the specified
-        status.
-
-        Args:
-          status_id (int):
-            The numerical ID of the status you're trying to destroy.
-          trim_user (bool, optional):
-            When set to True, each tweet returned in a timeline will include
-            a user object including only the status authors numerical ID.
-
-        Returns:
-          A twitter.Status instance representing the destroyed status message
-        """
-        url = '%s/statuses/destroy/%s.json' % (self.base_url, status_id)
-
-        post_data = {
-            'id': enf_type('status_id', int, status_id),
-            'trim_user': enf_type('trim_user', bool, trim_user)
-        }
-
-        resp = self._RequestUrl(url, 'POST', data=post_data)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return Status.NewFromJsonDict(data)
-
-    def PostUpdate(self,
-                   status,
-                   media=None,
-                   media_additional_owners=None,
-                   media_category=None,
-                   in_reply_to_status_id=None,
-                   auto_populate_reply_metadata=False,
-                   exclude_reply_user_ids=None,
-                   latitude=None,
-                   longitude=None,
-                   place_id=None,
-                   display_coordinates=False,
-                   trim_user=False,
-                   verify_status_length=True,
-                   attachment_url=None):
-        """Post a twitter status message from the authenticated user.
-
-        https://dev.twitter.com/docs/api/1.1/post/statuses/update
-
-        Args:
-            status (str):
-                The message text to be posted. Must be less than or equal to
-                CHARACTER_LIMIT characters.
-            media (int, str, fp, optional):
-                A URL, a local file, or a file-like object (something with a
-                read() method), or a list of any combination of the above.
-            media_additional_owners (list, optional):
-                A list of user ids representing Twitter users that should be able
-                to use the uploaded media in their tweets. If you pass a list of
-                media, then additional_owners will apply to each object. If you
-                need more granular control, please use the UploadMedia* methods.
-            media_category (str, optional):
-                Only for use with the AdsAPI. See
-                https://dev.twitter.com/ads/creative/promoted-video-overview if
-                this applies to your application.
-            in_reply_to_status_id (int, optional):
-                The ID of an existing status that the status to be posted is
-                in reply to.  This implicitly sets the in_reply_to_user_id
-                attribute of the resulting status to the user ID of the
-                message being replied to.  Invalid/missing status IDs will be
-                ignored.
-            auto_populate_reply_metadata (bool, optional):
-                Automatically include the @usernames of the users mentioned or
-                participating in the tweet to which this tweet is in reply.
-            exclude_reply_user_ids (list, optional):
-                Remove given user_ids (*not* @usernames) from the tweet's
-                automatically generated reply metadata.
-            attachment_url (str, optional):
-                URL to an attachment resource: one to four photos, a GIF,
-                video, Quote Tweet, or DM deep link. If not specified and
-                media parameter is not None, we will attach the first media
-                object as the attachment URL. If a bad URL is passed, Twitter
-                will raise an error.
-            latitude (float, optional):
-                Latitude coordinate of the tweet in degrees. Will only work
-                in conjunction with longitude argument. Both longitude and
-                latitude will be ignored by twitter if the user has a false
-                geo_enabled setting.
-            longitude (float, optional):
-                Longitude coordinate of the tweet in degrees. Will only work
-                in conjunction with latitude argument. Both longitude and
-                latitude will be ignored by twitter if the user has a false
-                geo_enabled setting.
-            place_id (int, optional):
-                A place in the world. These IDs can be retrieved from
-                GET geo/reverse_geocode.
-            display_coordinates (bool, optional):
-                Whether or not to put a pin on the exact coordinates a tweet
-                has been sent from.
-            trim_user (bool, optional):
-                If True the returned payload will only contain the user IDs,
-                otherwise the payload will contain the full user data item.
-            verify_status_length (bool, optional):
-                If True, api throws a hard error that the status is over
-                CHARACTER_LIMIT characters. If False, Api will attempt to post
-                the status.
-        Returns:
-            (twitter.Status) A twitter.Status instance representing the
-            message posted.
-        """
-        url = '%s/statuses/update.json' % self.base_url
-
-        if isinstance(status, str) or self._input_encoding is None:
-            u_status = status
-        else:
-            u_status = str(status, self._input_encoding)
-
-        if verify_status_length and calc_expected_status_length(u_status) > CHARACTER_LIMIT:
-            raise TwitterError("Text must be less than or equal to CHARACTER_LIMIT characters.")
-
-        if auto_populate_reply_metadata and not in_reply_to_status_id:
-            raise TwitterError("If auto_populate_reply_metadata is True, you must set in_reply_to_status_id")
-
-        parameters = {
-            'status': u_status,
-            'in_reply_to_status_id': in_reply_to_status_id,
-            'auto_populate_reply_metadata': auto_populate_reply_metadata,
-            'place_id': place_id,
-            'display_coordinates': display_coordinates,
-            'trim_user': trim_user,
-            'exclude_reply_user_ids': ','.join([str(u) for u in exclude_reply_user_ids or []]),
-        }
-
-        if attachment_url:
-            parameters['attachment_url'] = attachment_url
-
-        if media:
-            chunked_types = ['video/mp4', 'video/quicktime', 'image/gif']
-            media_ids = []
-            if isinstance(media, (int, long)):
-                media_ids.append(media)
-
-            elif isinstance(media, list):
-                for media_file in media:
-
-                    # If you want to pass just a media ID, it should be an int
-                    if isinstance(media_file, (int, long)):
-                        media_ids.append(media_file)
-                        continue
-
-                    _, _, file_size, media_type = parse_media_file(media_file)
-                    if (media_type == 'image/gif' or media_type == 'video/mp4') and len(media) > 1:
-                        raise TwitterError(
-                            'You cannot post more than 1 GIF or 1 video in a single status.')
-                    if file_size > self.chunk_size or media_type in chunked_types:
-                        media_id = self.UploadMediaChunked(
-                            media=media_file,
-                            additional_owners=media_additional_owners,
-                            media_category=media_category)
-                    else:
-                        media_id = self.UploadMediaSimple(
-                            media=media_file,
-                            additional_owners=media_additional_owners,
-                            media_category=media_category)
-                    media_ids.append(media_id)
-            else:
-                _, _, file_size, media_type = parse_media_file(media)
-                if file_size > self.chunk_size or media_type in chunked_types:
-                    media_ids.append(self.UploadMediaChunked(
-                        media, media_additional_owners, media_category=media_category
-                    ))
-                else:
-                    media_ids.append(self.UploadMediaSimple(
-                        media, media_additional_owners, media_category=media_category
-                    ))
-            parameters['media_ids'] = ','.join([str(mid) for mid in media_ids])
-
-        if latitude is not None and longitude is not None:
-            parameters['lat'] = str(latitude)
-            parameters['long'] = str(longitude)
-
-        resp = self._RequestUrl(url, 'POST', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return Status.NewFromJsonDict(data)
-
-    def UploadMediaSimple(self,
-                          media,
-                          additional_owners=None,
-                          media_category=None):
-
-        """ Upload a media file to Twitter in one request. Used for small file
-        uploads that do not require chunked uploads.
-
-        Args:
-            media:
-                File-like object to upload.
-            additional_owners: additional Twitter users that are allowed to use
-                The uploaded media. Should be a list of integers. Maximum
-                number of additional owners is capped at 100 by Twitter.
-            media_category:
-                Category with which to identify media upload. Only use with Ads
-                API & video files.
-
-        Returns:
-            media_id:
-                ID of the uploaded media returned by the Twitter API or 0.
-
-        """
-        url = '%s/media/upload.json' % self.upload_url
-        parameters = {}
-
-        media_fp, _, _, _ = parse_media_file(media)
-
-        parameters['media'] = media_fp.read()
-
-        if additional_owners and len(additional_owners) > 100:
-            raise TwitterError({'message': 'Maximum of 100 additional owners may be specified for a Media object'})
-        if additional_owners:
-            parameters['additional_owners'] = additional_owners
-        if media_category:
-            parameters['media_category'] = media_category
-
-        resp = self._RequestUrl(url, 'POST', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        try:
-            return data['media_id']
-        except KeyError:
-            raise TwitterError({'message': 'Media could not be uploaded.'})
-
-    def PostMediaMetadata(self,
-                          media_id,
-                          alt_text=None):
-        """Provide addtional data for uploaded media.
-
-        Args:
-            media_id:
-                ID of a previously uploaded media item.
-            alt_text:
-                Image Alternate Text.
-        """
-        url = '%s/media/metadata/create.json' % self.upload_url
-        parameters = {}
-
-        parameters['media_id'] = media_id
-
-        if alt_text:
-            parameters['alt_text'] = {"text": alt_text}
-
-        resp = self._RequestUrl(url, 'POST', json=parameters)
-
-        return resp
-
-    def _UploadMediaChunkedInit(self,
-                                media,
-                                additional_owners=None,
-                                media_category=None):
-        """Start a chunked upload to Twitter.
-
-        Args:
-            media:
-                File-like object to upload.
-            additional_owners: additional Twitter users that are allowed to use
-                The uploaded media. Should be a list of integers. Maximum
-                number of additional owners is capped at 100 by Twitter.
-            media_category:
-                Category with which to identify media upload. Only use with Ads
-                API & video files.
-
-        Returns:
-            tuple: media_id (returned from Twitter), file-handler object (i.e., has .read()
-            method), filename media file.
-        """
-        url = '%s/media/upload.json' % self.upload_url
-
-        media_fp, filename, file_size, media_type = parse_media_file(media, async_upload=True)
-
-        if not all([media_fp, filename, file_size, media_type]):
-            raise TwitterError({'message': 'Could not process media file'})
-
-        parameters = {}
-
-        if additional_owners and len(additional_owners) > 100:
-            raise TwitterError({'message': 'Maximum of 100 additional owners may be specified for a Media object'})
-        if additional_owners:
-            parameters['additional_owners'] = additional_owners
-        if media_category:
-            parameters['media_category'] = media_category
-
-        # INIT doesn't read in any data. It's purpose is to prepare Twitter to
-        # receive the content in APPEND requests.
-        parameters['command'] = 'INIT'
-        parameters['media_type'] = media_type
-        parameters['total_bytes'] = file_size
-
-        resp = self._RequestUrl(url, 'POST', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        try:
-            media_id = data['media_id']
-        except KeyError:
-            raise TwitterError({'message': 'Media could not be uploaded'})
-
-        return (media_id, media_fp, filename)
-
-    def _UploadMediaChunkedAppend(self,
-                                  media_id,
-                                  media_fp,
-                                  filename):
-        """Appends (i.e., actually uploads) media file to Twitter.
-
-        Args:
-            media_id (int):
-                ID of the media file received from Init method.
-            media_fp (file):
-                File-like object representing media file (must have .read() method)
-            filename (str):
-                Filename of the media file being uploaded.
-
-        Returns:
-            True if successful. Raises otherwise.
-        """
-        url = '%s/media/upload.json' % self.upload_url
-
-        boundary = "--{0}".format(uuid4().hex).encode('utf-8')
-        media_id_bytes = str(media_id).encode('utf-8')
-        headers = {'Content-Type': 'multipart/form-data; boundary={0}'.format(
-            boundary.decode('utf8')[2:]
-        )}
-
-        segment_id = 0
-        while True:
-            try:
-                data = media_fp.read(self.chunk_size)
-            except ValueError:
-                break
-            if not data:
-                break
-            body = [
-                boundary,
-                b'Content-Disposition: form-data; name="command"',
-                b'',
-                b'APPEND',
-                boundary,
-                b'Content-Disposition: form-data; name="media_id"',
-                b'',
-                media_id_bytes,
-                boundary,
-                b'Content-Disposition: form-data; name="segment_index"',
-                b'',
-                str(segment_id).encode('utf-8'),
-                boundary,
-                'Content-Disposition: form-data; name="media"; filename="{0!r}"'.format(filename).encode('utf8'),
-                b'Content-Type: application/octet-stream',
-                b'',
-                data,
-                boundary + b'--'
-            ]
-            body_data = b'\r\n'.join(body)
-            headers['Content-Length'] = str(len(body_data))
-
-            resp = self._RequestChunkedUpload(url=url,
-                                              headers=headers,
-                                              data=body_data)
-
-            # The body of the response should be blank, but the normal decoding
-            # raises a JSONDecodeError, so we should only do error checking
-            # if the response is not blank.
-            if resp.content.decode('utf-8'):
-                return self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-            segment_id += 1
-
-        try:
-            media_fp.close()
-        except Exception as e:
-            pass
-
-        return True
-
-    def _UploadMediaChunkedFinalize(self, media_id):
-        """Finalize chunked upload to Twitter.
-
-        Args:
-            media_id (int):
-                ID of the media file for which to finalize the upload.
-
-        Returns:
-            json: JSON string of data from Twitter.
-        """
-        url = '%s/media/upload.json' % self.upload_url
-
-        parameters = {
-            'command': 'FINALIZE',
-            'media_id': media_id
-        }
-
-        resp = self._RequestUrl(url, 'POST', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return data
-
-    def UploadMediaChunked(self,
-                           media,
-                           additional_owners=None,
-                           media_category=None):
-        """Upload a media file to Twitter in multiple requests.
-
-        Args:
-            media:
-                File-like object to upload.
-            additional_owners: additional Twitter users that are allowed to use
-                The uploaded media. Should be a list of integers. Maximum
-                number of additional owners is capped at 100 by Twitter.
-            media_category:
-                Category with which to identify media upload. Only use with Ads
-                API & video files.
-
-        Returns:
-            media_id:
-                ID of the uploaded media returned by the Twitter API. Raises if
-                unsuccesful.
-        """
-
-        media_id, media_fp, filename = self._UploadMediaChunkedInit(media=media,
-                                                                    additional_owners=additional_owners,
-                                                                    media_category=media_category)
-
-        append = self._UploadMediaChunkedAppend(media_id=media_id,
-                                                media_fp=media_fp,
-                                                filename=filename)
-
-        if not append:
-            TwitterError('Media could not be uploaded.')
-
-        data = self._UploadMediaChunkedFinalize(media_id)
-
-        try:
-            return data['media_id']
-        except KeyError:
-            raise TwitterError('Media could not be uploaded.')
-
-    def _TweetTextWrap(self,
-                       status,
-                       char_lim=CHARACTER_LIMIT):
-
-        if not self._config:
-            self.GetHelpConfiguration()
-
-        tweets = []
-        line = []
-        line_length = 0
-        words = re.split(r'\s', status)
-
-        if len(words) == 1 and not is_url(words[0]):
-            if len(words[0]) > CHARACTER_LIMIT:
-                raise TwitterError("Unable to split status into tweetable parts. Word was: {0}/{1}".format(len(words[0]), char_lim))
-            else:
-                tweets.append(words[0])
-                return tweets
-
-        for word in words:
-            if len(word) > char_lim:
-                raise TwitterError("Unable to split status into tweetable parts. Word was: {0}/{1}".format(len(word), char_lim))
-            new_len = line_length
-
-            if is_url(word):
-                new_len = line_length + self._config['short_url_length_https'] + 1
-            else:
-                new_len += len(word) + 1
-
-            if new_len > CHARACTER_LIMIT:
-                tweets.append(' '.join(line))
-                line = [word]
-                line_length = new_len - line_length
-            else:
-                line.append(word)
-                line_length = new_len
-
-        tweets.append(' '.join(line))
-        return tweets
-
-    def PostUpdates(self,
-                    status,
-                    continuation=None,
-                    **kwargs):
-        """Post one or more twitter status messages from the authenticated user.
-
-        Unlike api.PostUpdate, this method will post multiple status updates
-        if the message is longer than CHARACTER_LIMIT characters.
-
-        Args:
-          status:
-            The message text to be posted.
-            May be longer than CHARACTER_LIMIT characters.
-          continuation:
-            The character string, if any, to be appended to all but the
-            last message.  Note that Twitter strips trailing '...' strings
-            from messages.  Consider using the unicode \u2026 character
-            (horizontal ellipsis) instead. [Defaults to None]
-          **kwargs:
-            See api.PostUpdate for a list of accepted parameters.
-
-        Returns:
-          A of list twitter.Status instance representing the messages posted.
-        """
-        results = list()
-
-        if continuation is None:
-            continuation = ''
-        char_limit = CHARACTER_LIMIT - len(continuation)
-
-        tweets = self._TweetTextWrap(status=status, char_lim=char_limit)
-
-        if len(tweets) == 1:
-            results.append(self.PostUpdate(status=tweets[0], **kwargs))
-            return results
-
-        for tweet in tweets[0:-1]:
-            results.append(self.PostUpdate(status=tweet + continuation, **kwargs))
-        results.append(self.PostUpdate(status=tweets[-1], **kwargs))
-
-        return results
-
-    def PostRetweet(self, status_id, trim_user=False):
-        """Retweet a tweet with the Retweet API.
-
-        Args:
-          status_id:
-            The numerical id of the tweet that will be retweeted
-          trim_user:
-            If True the returned payload will only contain the user IDs,
-            otherwise the payload will contain the full user data item.
-            [Optional]
-
-        Returns:
-          A twitter.Status instance representing the original tweet with retweet details embedded.
-        """
-        try:
-            if int(status_id) <= 0:
-                raise TwitterError({'message': "'status_id' must be a positive number"})
-        except ValueError:
-            raise TwitterError({'message': "'status_id' must be an integer"})
-
-        url = '%s/statuses/retweet/%s.json' % (self.base_url, status_id)
-        data = {'id': status_id}
-        if trim_user:
-            data['trim_user'] = 'true'
-        resp = self._RequestUrl(url, 'POST', data=data)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return Status.NewFromJsonDict(data)
-
-    def GetUserRetweets(self,
-                        count=None,
-                        since_id=None,
-                        max_id=None,
-                        trim_user=False):
-        """Fetch the sequence of retweets made by the authenticated user.
-
-        Args:
-          count:
-            The number of status messages to retrieve. [Optional]
-          since_id:
-            Returns results with an ID greater than (that is, more recent
-            than) the specified ID. There are limits to the number of
-            Tweets which can be accessed through the API. If the limit of
-            Tweets has occurred since the since_id, the since_id will be
-            forced to the oldest ID available. [Optional]
-          max_id:
-            Returns results with an ID less than (that is, older than) or
-            equal to the specified ID. [Optional]
-          trim_user:
-            If True the returned payload will only contain the user IDs,
-            otherwise the payload will contain the full user data item.
-            [Optional]
-
-        Returns:
-          A sequence of twitter.Status instances, one for each message up to count
-        """
-        return self.GetUserTimeline(
-            since_id=since_id,
-            count=count,
-            max_id=max_id,
-            trim_user=trim_user,
-            exclude_replies=True,
-            include_rts=True)
-
-    def GetReplies(self,
-                   since_id=None,
-                   count=None,
-                   max_id=None,
-                   trim_user=False):
-        """Get a sequence of status messages representing the 20 most
-        recent replies (status updates prefixed with @twitterID) to the
-        authenticating user.
-
-        Args:
-          since_id:
-            Returns results with an ID greater than (that is, more recent
-            than) the specified ID. There are limits to the number of
-            Tweets which can be accessed through the API. If the limit of
-            Tweets has occurred since the since_id, the since_id will be
-            forced to the oldest ID available. [Optional]
-          max_id:
-            Returns results with an ID less than (that is, older than) or
-            equal to the specified ID. [Optional]
-          trim_user:
-            If True the returned payload will only contain the user IDs,
-            otherwise the payload will contain the full user data item.
-            [Optional]
-
-        Returns:
-          A sequence of twitter.Status instances, one for each reply to the user.
-        """
-        return self.GetUserTimeline(since_id=since_id, count=count, max_id=max_id, trim_user=trim_user,
-                                    exclude_replies=False, include_rts=False)
-
-    def GetRetweets(self,
-                    statusid,
-                    count=None,
-                    trim_user=False):
-        """Returns up to 100 of the first retweets of the tweet identified
-        by statusid
-
-        Args:
-          statusid (int):
-            The ID of the tweet for which retweets should be searched for
-          count (int, optional):
-            The number of status messages to retrieve.
-          trim_user (bool, optional):
-            If True the returned payload will only contain the user IDs,
-            otherwise the payload will contain the full user data item.
-
-        Returns:
-          A list of twitter.Status instances, which are retweets of statusid
-        """
-        url = '%s/statuses/retweets/%s.json' % (self.base_url, statusid)
-        parameters = {
-            'trim_user': enf_type('trim_user', bool, trim_user),
-        }
-
-        if count:
-            parameters['count'] = enf_type('count', int, count)
-
-        resp = self._RequestUrl(url, 'GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return [Status.NewFromJsonDict(s) for s in data]
-
-    def GetRetweeters(self,
-                      status_id,
-                      cursor=None,
-                      count=100,
-                      stringify_ids=False):
-        """Returns a collection of up to 100 user IDs belonging to users who have
-        retweeted the tweet specified by the status_id parameter.
-
-        Args:
-          status_id:
-            the tweet's numerical ID
-          cursor:
-            breaks the ids into pages of no more than 100.
-          stringify_ids:
-            returns the IDs as unicode strings. [Optional]
-
-        Returns:
-          A list of user IDs
-        """
-        url = '%s/statuses/retweeters/ids.json' % (self.base_url)
-        parameters = {
-            'id': enf_type('id', int, status_id),
-            'stringify_ids': enf_type('stringify_ids', bool, stringify_ids),
-            'count': count,
-        }
-
-        result = []
-
-        total_count = 0
-        while True:
-            if cursor:
-                try:
-                    parameters['cursor'] = int(cursor)
-                except ValueError:
-                    raise TwitterError({'message': "cursor must be an integer"})
-            resp = self._RequestUrl(url, 'GET', data=parameters)
-            data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-            result += [x for x in data['ids']]
-            if 'next_cursor' in data:
-                if data['next_cursor'] == 0 or data['next_cursor'] == data['previous_cursor']:
-                    break
-                else:
-                    cursor = data['next_cursor']
-                    total_count -= len(data['ids'])
-                    if total_count < 1:
-                        break
-            else:
-                break
-
-        return result
-
-    def GetRetweetsOfMe(self,
-                        count=None,
-                        since_id=None,
-                        max_id=None,
-                        trim_user=False,
-                        include_entities=True,
-                        include_user_entities=True):
-        """Returns up to 100 of the most recent tweets of the user that have been
-        retweeted by others.
-
-        Args:
-          count:
-            The number of retweets to retrieve, up to 100.
-            Defaults to 20. [Optional]
-          since_id:
-            Returns results with an ID greater than
-            (newer than) this ID. [Optional]
-          max_id:
-            Returns results with an ID less than or equal
-            to this ID. [Optional]
-          trim_user:
-            When True, the user object for each tweet will
-            only be an ID. [Optional]
-          include_entities:
-            When True, the tweet entities will be included. [Optional]
-          include_user_entities:
-            When True, the user entities will be included. [Optional]
-        """
-        url = '%s/statuses/retweets_of_me.json' % self.base_url
-        if count is not None:
-            try:
-                if int(count) > 100:
-                    raise TwitterError({'message': "'count' may not be greater than 100"})
-            except ValueError:
-                raise TwitterError({'message': "'count' must be an integer"})
-        parameters = {
-            'count': count,
-            'since_id': since_id,
-            'max_id': max_id,
-            'trim_user': bool(trim_user),
-            'include_entities': bool(include_entities),
-            'include_user_entities': bool(include_user_entities),
-        }
-
-        resp = self._RequestUrl(url, 'GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return [Status.NewFromJsonDict(s) for s in data]
-
-    def _GetBlocksMutesPaged(self,
-                             endpoint,
-                             action,
-                             cursor=-1,
-                             skip_status=False,
-                             include_entities=True,
-                             stringify_ids=False):
-        """ Fetch a page of the users (as twitter.User instances)
-        blocked or muted by the currently authenticated user.
-
-        Args:
-          endpoint (str):
-            Either "mute" or "block".
-          action (str):
-            Either 'list' or 'ids' depending if you want to return fully-hydrated
-            twitter.User objects or a list of user IDs as ints.
-          cursor (int, optional):
-            Should be set to -1 if you want the first page, thereafter denotes
-            the page of users that you want to return.
-          skip_status (bool, optional):
-            If True the statuses will not be returned in the user items.
-          include_entities (bool, optional):
-            When True, the user entities will be included.
-
-        Returns:
-          next_cursor, previous_cursor, list of twitter.User instances,
-          one for each user.
-        """
-        urls = {
-            'mute': {
-                'list': '%s/mutes/users/list.json' % self.base_url,
-                'ids': '%s/mutes/users/ids.json' % self.base_url
-            },
-            'block': {
-                'list': '%s/blocks/list.json' % self.base_url,
-                'ids': '%s/blocks/ids.json' % self.base_url
-            }
-        }
-
-        url = urls[endpoint][action]
-
-        result = []
-        parameters = {
-            'skip_status': bool(skip_status),
-            'include_entities': bool(include_entities),
-            'stringify_ids': bool(stringify_ids),
-            'cursor': cursor,
-        }
-
-        resp = self._RequestUrl(url, 'GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        if action == 'ids':
-            result += data.get('ids')
-        else:
-            result += [User.NewFromJsonDict(x) for x in data['users']]
-        next_cursor = data.get('next_cursor', 0)
-        previous_cursor = data.get('previous_cursor', 0)
-
-        return next_cursor, previous_cursor, result
-
-    def GetBlocks(self,
-                  skip_status=False,
-                  include_entities=False):
-        """ Fetch the sequence of all users (as twitter.User instances),
-        blocked by the currently authenticated user.
-
-        Args:
-          skip_status (bool, optional):
-            If True the statuses will not be returned in the user items.
-          include_entities (bool, optional):
-            When True, the user entities will be included.
-
-        Returns:
-          A list of twitter.User instances, one for each blocked user.
-        """
-        result = []
-        cursor = -1
-
-        while True:
-            next_cursor, previous_cursor, users = self.GetBlocksPaged(
-                cursor=cursor,
-                skip_status=skip_status,
-                include_entities=include_entities)
-            result += users
-            if next_cursor == 0 or next_cursor == previous_cursor:
-                break
-            else:
-                cursor = next_cursor
-
-        return result
-
-    def GetBlocksPaged(self,
-                       cursor=-1,
-                       skip_status=False,
-                       include_entities=False):
-        """ Fetch a page of the users (as twitter.User instances)
-        blocked by the currently authenticated user.
-
-        Args:
-          cursor (int, optional):
-            Should be set to -1 if you want the first page, thereafter denotes
-            the page of blocked users that you want to return.
-          skip_status (bool, optional):
-            If True the statuses will not be returned in the user items.
-          include_entities (bool, optional):
-            When True, the user entities will be included.
-
-        Returns:
-          next_cursor, previous_cursor, list of twitter.User instances,
-          one for each blocked user.
-        """
-        return self._GetBlocksMutesPaged(endpoint='block',
-                                         action='list',
-                                         cursor=cursor,
-                                         skip_status=skip_status,
-                                         include_entities=include_entities)
-
-    def GetBlocksIDs(self,
-                     stringify_ids=False):
-        """Fetch the sequence of all user IDs blocked by the
-        currently authenticated user.
-
-        Args:
-          stringify_ids (bool, optional):
-            If True user IDs will be returned as strings rather than integers.
-
-        Returns:
-          A list of user IDs for all blocked users.
-        """
-        result = []
-        cursor = -1
-
-        while True:
-            next_cursor, previous_cursor, user_ids = self.GetBlocksIDsPaged(
-                cursor=cursor,
-                stringify_ids=stringify_ids)
-            result += user_ids
-            if next_cursor == 0 or next_cursor == previous_cursor:
-                break
-            else:
-                cursor = next_cursor
-
-        return result
-
-    def GetBlocksIDsPaged(self,
-                          cursor=-1,
-                          stringify_ids=False):
-        """ Fetch a page of the user IDs blocked by the currently
-        authenticated user.
-
-        Args:
-          cursor (int, optional):
-            Should be set to -1 if you want the first page, thereafter denotes
-            the page of blocked users that you want to return.
-          stringify_ids (bool, optional):
-            If True user IDs will be returned as strings rather than integers.
-
-        Returns:
-          next_cursor, previous_cursor, list of user IDs of blocked users.
-        """
-        return self._GetBlocksMutesPaged(endpoint='block',
-                                         action='ids',
-                                         cursor=cursor,
-                                         stringify_ids=stringify_ids)
-
-    def GetMutes(self,
-                 skip_status=False,
-                 include_entities=False):
-        """ Fetch the sequence of all users (as twitter.User instances),
-        muted by the currently authenticated user.
-
-        Args:
-          skip_status (bool, optional):
-            If True the statuses will not be returned in the user items.
-          include_entities (bool, optional):
-            When True, the user entities will be included.
-
-        Returns:
-          A list of twitter.User instances, one for each muted user.
-        """
-        result = []
-        cursor = -1
-
-        while True:
-            next_cursor, previous_cursor, users = self.GetMutesPaged(
-                cursor=cursor,
-                skip_status=skip_status,
-                include_entities=include_entities)
-            result += users
-            if next_cursor == 0 or next_cursor == previous_cursor:
-                break
-            else:
-                cursor = next_cursor
-
-        return result
-
-    def GetMutesPaged(self,
-                      cursor=-1,
-                      skip_status=False,
-                      include_entities=False):
-        """ Fetch a page of the users (as twitter.User instances)
-        muted by the currently authenticated user.
-
-        Args:
-          cursor (int, optional):
-            Should be set to -1 if you want the first page, thereafter denotes
-            the page of muted users that you want to return.
-          skip_status (bool, optional):
-            If True the statuses will not be returned in the user items.
-          include_entities (bool, optional):
-            When True, the user entities will be included.
-
-        Returns:
-          next_cursor, previous_cursor, list of twitter.User instances,
-          one for each muted user.
-        """
-
-        return self._GetBlocksMutesPaged(endpoint='mute',
-                                         action='list',
-                                         cursor=cursor,
-                                         skip_status=skip_status,
-                                         include_entities=include_entities)
-
-    def GetMutesIDs(self,
-                    stringify_ids=False):
-        """Fetch the sequence of all user IDs muted by the
-        currently authenticated user.
-
-        Args:
-          stringify_ids (bool, optional):
-            If True user IDs will be returned as strings rather than integers.
-
-        Returns:
-          A list of user IDs for all muted users.
-        """
-        result = []
-        cursor = -1
-
-        while True:
-            next_cursor, previous_cursor, user_ids = self.GetMutesIDsPaged(
-                cursor=cursor,
-                stringify_ids=stringify_ids)
-            result += user_ids
-            if next_cursor == 0 or next_cursor == previous_cursor:
-                break
-            else:
-                cursor = next_cursor
-
-        return result
-
-    def GetMutesIDsPaged(self,
-                         cursor=-1,
-                         stringify_ids=False):
-        """ Fetch a page of the user IDs muted by the currently
-        authenticated user.
-
-        Args:
-          cursor (int, optional):
-            Should be set to -1 if you want the first page, thereafter denotes
-            the page of muted users that you want to return.
-          stringify_ids (bool, optional):
-            If True user IDs will be returned as strings rather than integers.
-
-        Returns:
-          next_cursor, previous_cursor, list of user IDs of muted users.
-        """
-        return self._GetBlocksMutesPaged(endpoint='mute',
-                                         action='ids',
-                                         cursor=cursor,
-                                         stringify_ids=stringify_ids)
-
-    def _BlockMute(self,
-                   action,
-                   endpoint,
-                   user_id=None,
-                   screen_name=None,
-                   include_entities=True,
-                   skip_status=False):
-        """Create or destroy a block or mute on behalf of the authenticated user.
-
-        Args:
-          action (str):
-            Either 'create' or 'destroy'.
-          endpoint (str):
-            Either 'block' or 'mute'.
-          user_id (int, optional)
-            The numerical ID of the user to block/mute.
-          screen_name (str, optional):
-            The screen name of the user to block/mute.
-          include_entities (bool, optional):
-            The entities node will not be included if set to False.
-          skip_status (bool, optional):
-              When set to False, the blocked User's statuses will not be included
-              with the returned User object.
-        Returns:
-          twitter.User: twitter.User object representing the blocked/muted user.
-        """
-
-        urls = {
-            'block': {
-                'create': '%s/blocks/create.json' % (self.base_url),
-                'destroy': '%s/blocks/destroy.json' % (self.base_url),
-            },
-            'mute': {
-                'create': '%s/mutes/users/create.json' % (self.base_url),
-                'destroy': '%s/mutes/users/destroy.json' % (self.base_url)
-            }
-        }
-
-        url = urls[endpoint][action]
-        post_data = {}
-
-        if user_id:
-            post_data['user_id'] = enf_type('user_id', int, user_id)
-        elif screen_name:
-            post_data['screen_name'] = screen_name
-        else:
-            raise TwitterError("You must specify either a user_id or screen_name")
-
-        if include_entities:
-            post_data['include_entities'] = enf_type('include_entities', bool, include_entities)
-        if skip_status:
-            post_data['skip_status'] = enf_type('skip_status', bool, skip_status)
-
-        resp = self._RequestUrl(url, 'POST', data=post_data)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return User.NewFromJsonDict(data)
-
-    def CreateBlock(self,
-                    user_id=None,
-                    screen_name=None,
-                    include_entities=True,
-                    skip_status=False):
-        """Blocks the user specified by either user_id or screen_name.
-
-        Args:
-          user_id (int, optional)
-            The numerical ID of the user to block.
-          screen_name (str, optional):
-            The screen name of the user to block.
-          include_entities (bool, optional):
-            The entities node will not be included if set to False.
-          skip_status (bool, optional):
-            When set to False, the blocked User's statuses will not be included
-            with the returned User object.
-
-        Returns:
-          A twitter.User instance representing the blocked user.
-        """
-        return self._BlockMute(action='create',
-                               endpoint='block',
-                               user_id=user_id,
-                               screen_name=screen_name,
-                               include_entities=include_entities,
-                               skip_status=skip_status)
-
-    def DestroyBlock(self,
-                     user_id=None,
-                     screen_name=None,
-                     include_entities=True,
-                     skip_status=False):
-        """Unlocks the user specified by either user_id or screen_name.
-
-        Args:
-          user_id (int, optional)
-            The numerical ID of the user to block.
-          screen_name (str, optional):
-            The screen name of the user to block.
-          include_entities (bool, optional):
-            The entities node will not be included if set to False.
-          skip_status (bool, optional):
-            When set to False, the blocked User's statuses will not be included
-            with the returned User object.
-
-        Returns:
-          A twitter.User instance representing the blocked user.
-        """
-        return self._BlockMute(action='destroy',
-                               endpoint='block',
-                               user_id=user_id,
-                               screen_name=screen_name,
-                               include_entities=include_entities,
-                               skip_status=skip_status)
-
-    def CreateMute(self,
-                   user_id=None,
-                   screen_name=None,
-                   include_entities=True,
-                   skip_status=False):
-        """Mutes the user specified by either user_id or screen_name.
-
-        Args:
-          user_id (int, optional)
-            The numerical ID of the user to mute.
-          screen_name (str, optional):
-            The screen name of the user to mute.
-          include_entities (bool, optional):
-            The entities node will not be included if set to False.
-          skip_status (bool, optional):
-            When set to False, the muted User's statuses will not be included
-            with the returned User object.
-
-        Returns:
-          A twitter.User instance representing the muted user.
-        """
-        return self._BlockMute(action='create',
-                               endpoint='mute',
-                               user_id=user_id,
-                               screen_name=screen_name,
-                               include_entities=include_entities,
-                               skip_status=skip_status)
-
-    def DestroyMute(self,
-                    user_id=None,
-                    screen_name=None,
-                    include_entities=True,
-                    skip_status=False):
-        """Unlocks the user specified by either user_id or screen_name.
-
-        Args:
-          user_id (int, optional)
-            The numerical ID of the user to mute.
-          screen_name (str, optional):
-            The screen name of the user to mute.
-          include_entities (bool, optional):
-            The entities node will not be included if set to False.
-          skip_status (bool, optional):
-            When set to False, the muted User's statuses will not be included
-            with the returned User object.
-
-        Returns:
-          A twitter.User instance representing the muted user.
-        """
-        return self._BlockMute(action='destroy',
-                               endpoint='mute',
-                               user_id=user_id,
-                               screen_name=screen_name,
-                               include_entities=include_entities,
-                               skip_status=skip_status)
-
-    def _GetIDsPaged(self,
-                     url,
-                     user_id,
-                     screen_name,
-                     cursor,
-                     stringify_ids,
-                     count):
-        """
-        This is the lowest level paging logic for fetching IDs. It is used
-        solely by GetFollowerIDsPaged and GetFriendIDsPaged. It is not intended
-        for other use.
-
-        See GetFollowerIDsPaged or GetFriendIDsPaged for an explanation of the
-        input arguments.
-        """
-        result = []
-
-        parameters = {}
-        if user_id is not None:
-            parameters['user_id'] = user_id
-        if screen_name is not None:
-            parameters['screen_name'] = screen_name
-        if count is not None:
-            parameters['count'] = count
-        parameters['stringify_ids'] = stringify_ids
-        parameters['cursor'] = cursor
-
-        resp = self._RequestUrl(url, 'GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        if 'ids' in data:
-            result.extend([x for x in data['ids']])
-
-        next_cursor = data.get('next_cursor', 0)
-        previous_cursor = data.get('previous_cursor', 0)
-
-        return next_cursor, previous_cursor, result
-
-    def GetFollowerIDsPaged(self,
-                            user_id=None,
-                            screen_name=None,
-                            cursor=-1,
-                            stringify_ids=False,
-                            count=5000):
-        """Make a cursor driven call to return a list of one page followers.
-
-        The caller is responsible for handling the cursor value and looping
-        to gather all of the data
-
-        Args:
-          user_id:
-            The twitter id of the user whose followers you are fetching.
-            If not specified, defaults to the authenticated user. [Optional]
-          screen_name:
-            The twitter name of the user whose followers you are fetching.
-            If not specified, defaults to the authenticated user. [Optional]
-          cursor:
-            Should be set to -1 for the initial call and then is used to
-            control what result page Twitter returns.
-          stringify_ids:
-            if True then twitter will return the ids as strings instead of
-            integers. [Optional]
-          count:
-            The number of user id's to retrieve per API request. Please be aware
-            that this might get you rate-limited if set to a small number.
-            By default Twitter will retrieve 5000 UIDs per call. [Optional]
-
-        Returns:
-          next_cursor, previous_cursor, data sequence of user ids,
-          one for each follower
-        """
-        url = '%s/followers/ids.json' % self.base_url
-        return self._GetIDsPaged(url=url,
-                                 user_id=user_id,
-                                 screen_name=screen_name,
-                                 cursor=cursor,
-                                 stringify_ids=stringify_ids,
-                                 count=count)
-
-    def GetFriendIDsPaged(self,
-                          user_id=None,
-                          screen_name=None,
-                          cursor=-1,
-                          stringify_ids=False,
-                          count=5000):
-        """Make a cursor driven call to return the list of all friends
-
-        The caller is responsible for handling the cursor value and looping
-        to gather all of the data
-
-        Args:
-          user_id:
-            The twitter id of the user whose friends you are fetching.
-            If not specified, defaults to the authenticated user. [Optional]
-          screen_name:
-            The twitter name of the user whose friends you are fetching.
-            If not specified, defaults to the authenticated user. [Optional]
-          cursor:
-            Should be set to -1 for the initial call and then is used to
-            control what result page Twitter returns.
-          stringify_ids:
-            if True then twitter will return the ids as strings instead of
-            integers. [Optional]
-          count:
-            The number of user id's to retrieve per API request. Please be aware
-            that this might get you rate-limited if set to a small number.
-            By default Twitter will retrieve 5000 UIDs per call. [Optional]
-
-        Returns:
-          next_cursor, previous_cursor, data sequence of twitter.User instances,
-          one for each friend
-        """
-        url = '%s/friends/ids.json' % self.base_url
-        return self._GetIDsPaged(url,
-                                 user_id,
-                                 screen_name,
-                                 cursor,
-                                 stringify_ids,
-                                 count)
-
-    def _GetFriendFollowerIDs(self,
-                              url=None,
-                              user_id=None,
-                              screen_name=None,
-                              cursor=None,
-                              count=None,
-                              stringify_ids=False,
-                              total_count=None):
-        """ Common method for GetFriendIDs and GetFollowerIDs """
-
-        count = 5000
-        cursor = -1
-        result = []
-
-        if total_count:
-            total_count = enf_type('total_count', int, total_count)
-
-        if total_count and total_count < count:
-            count = total_count
-
-        while True:
-            if total_count is not None and len(result) + count > total_count:
-                break
-
-            next_cursor, previous_cursor, data = self._GetIDsPaged(
-                url=url,
-                user_id=user_id,
-                screen_name=screen_name,
-                cursor=cursor,
-                stringify_ids=stringify_ids,
-                count=count)
-
-            result.extend([x for x in data])
-
-            if next_cursor == 0 or next_cursor == previous_cursor:
-                break
-            else:
-                cursor = next_cursor
-
-        return result
-
-    def GetFollowerIDs(self,
-                       user_id=None,
-                       screen_name=None,
-                       cursor=None,
-                       stringify_ids=False,
-                       count=None,
-                       total_count=None):
-        """Returns a list of twitter user id's for every person
-        that is following the specified user.
-
-        Args:
-          user_id:
-            The id of the user to retrieve the id list for. [Optional]
-          screen_name:
-            The screen_name of the user to retrieve the id list for. [Optional]
-          cursor:
-            Specifies the Twitter API Cursor location to start at.
-            Note: there are pagination limits. [Optional]
-          stringify_ids:
-            if True then twitter will return the ids as strings instead of
-            integers. [Optional]
-          count:
-            The number of user id's to retrieve per API request. Please be aware
-            that this might get you rate-limited if set to a small number.
-            By default Twitter will retrieve 5000 UIDs per call. [Optional]
-          total_count:
-            The total amount of UIDs to retrieve. Good if the account has many
-            followers and you don't want to get rate limited. The data returned
-            might contain more UIDs if total_count is not a multiple of count
-            (5000 by default). [Optional]
-
-        Returns:
-          A list of integers, one for each user id.
-        """
-        url = '%s/followers/ids.json' % self.base_url
-        return self._GetFriendFollowerIDs(url=url,
-                                          user_id=user_id,
-                                          screen_name=screen_name,
-                                          cursor=cursor,
-                                          stringify_ids=stringify_ids,
-                                          count=count,
-                                          total_count=total_count)
-
-    def GetFriendIDs(self,
-                     user_id=None,
-                     screen_name=None,
-                     cursor=None,
-                     count=None,
-                     stringify_ids=False,
-                     total_count=None):
-        """ Fetch a sequence of user ids, one for each friend.
-        Returns a list of all the given user's friends' IDs. If no user_id or
-        screen_name is given, the friends will be those of the authenticated
-        user.
-
-        Args:
-          user_id:
-            The id of the user to retrieve the id list for. [Optional]
-          screen_name:
-            The screen_name of the user to retrieve the id list for. [Optional]
-          cursor:
-            Specifies the Twitter API Cursor location to start at.
-            Note: there are pagination limits. [Optional]
-          stringify_ids:
-            if True then twitter will return the ids as strings instead of integers.
-            [Optional]
-          count:
-            The number of user id's to retrieve per API request. Please be aware that
-            this might get you rate-limited if set to a small number.
-            By default Twitter will retrieve 5000 UIDs per call. [Optional]
-          total_count:
-            The total amount of UIDs to retrieve. Good if the account has many followers
-            and you don't want to get rate limited. The data returned might contain more
-            UIDs if total_count is not a multiple of count (5000 by default). [Optional]
-
-        Returns:
-          A list of integers, one for each user id.
-        """
-        url = '%s/friends/ids.json' % self.base_url
-        return self._GetFriendFollowerIDs(url,
-                                          user_id,
-                                          screen_name,
-                                          cursor,
-                                          count,
-                                          stringify_ids,
-                                          total_count)
-
-    def _GetFriendsFollowersPaged(self,
-                                  url=None,
-                                  user_id=None,
-                                  screen_name=None,
-                                  cursor=-1,
-                                  count=200,
-                                  skip_status=False,
-                                  include_user_entities=True):
-
-        """Make a cursor driven call to return the list of 1 page of friends
-        or followers.
-
-        Args:
-          url:
-            Endpoint from which to get data. Either
-            base_url+'/followers/list.json' or base_url+'/friends/list.json'.
-          user_id:
-            The twitter id of the user whose followers you are fetching.
-            If not specified, defaults to the authenticated user. [Optional]
-          screen_name:
-            The twitter name of the user whose followers you are fetching.
-            If not specified, defaults to the authenticated user. [Optional]
-          cursor:
-            Should be set to -1 for the initial call and then is used to
-            control what result page Twitter returns.
-          count:
-            The number of users to return per page, up to a maximum of 200.
-            Defaults to 200. [Optional]
-          skip_status:
-            If True the statuses will not be returned in the user items.
-            [Optional]
-          include_user_entities:
-            When True, the user entities will be included. [Optional]
-
-        Returns:
-          next_cursor, previous_cursor, data sequence of twitter.User
-          instances, one for each follower
-        """
-
-        if user_id and screen_name:
-            warnings.warn(
-                "If both user_id and screen_name are specified, Twitter will "
-                "return the followers of the user specified by screen_name, "
-                "however this behavior is undocumented by Twitter and might "
-                "change without warning.", stacklevel=2)
-
-        parameters = {}
-
-        if user_id is not None:
-            parameters['user_id'] = user_id
-        if screen_name is not None:
-            parameters['screen_name'] = screen_name
-
-        try:
-            parameters['count'] = int(count)
-        except ValueError:
-            raise TwitterError({'message': "count must be an integer"})
-
-        parameters['skip_status'] = skip_status
-        parameters['include_user_entities'] = include_user_entities
-        parameters['cursor'] = cursor
-
-        resp = self._RequestUrl(url, 'GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        if 'users' in data:
-            users = [User.NewFromJsonDict(user) for user in data['users']]
-        else:
-            users = []
-
-        if 'next_cursor' in data:
-            next_cursor = data['next_cursor']
-        else:
-            next_cursor = 0
-        if 'previous_cursor' in data:
-            previous_cursor = data['previous_cursor']
-        else:
-            previous_cursor = 0
-
-        return next_cursor, previous_cursor, users
-
-    def GetFollowersPaged(self,
-                          user_id=None,
-                          screen_name=None,
-                          cursor=-1,
-                          count=200,
-                          skip_status=False,
-                          include_user_entities=True):
-        """Make a cursor driven call to return the list of all followers
-
-        Args:
-          user_id:
-            The twitter id of the user whose followers you are fetching.
-            If not specified, defaults to the authenticated user. [Optional]
-          screen_name:
-            The twitter name of the user whose followers you are fetching.
-            If not specified, defaults to the authenticated user. [Optional]
-          cursor:
-            Should be set to -1 for the initial call and then is used to
-            control what result page Twitter returns.
-          count:
-            The number of users to return per page, up to a maximum of 200.
-            Defaults to 200. [Optional]
-          skip_status:
-            If True the statuses will not be returned in the user items.
-            [Optional]
-          include_user_entities:
-            When True, the user entities will be included. [Optional]
-
-        Returns:
-          next_cursor, previous_cursor, data sequence of twitter.User
-          instances, one for each follower
-        """
-        url = '%s/followers/list.json' % self.base_url
-        return self._GetFriendsFollowersPaged(url,
-                                              user_id,
-                                              screen_name,
-                                              cursor,
-                                              count,
-                                              skip_status,
-                                              include_user_entities)
-
-    def GetFriendsPaged(self,
-                        user_id=None,
-                        screen_name=None,
-                        cursor=-1,
-                        count=200,
-                        skip_status=False,
-                        include_user_entities=True):
-        """Make a cursor driven call to return the list of all friends.
-
-        Args:
-          user_id:
-            The twitter id of the user whose friends you are fetching.
-            If not specified, defaults to the authenticated user. [Optional]
-          screen_name:
-            The twitter name of the user whose friends you are fetching.
-            If not specified, defaults to the authenticated user. [Optional]
-          cursor:
-            Should be set to -1 for the initial call and then is used to
-            control what result page Twitter returns.
-          count:
-            The number of users to return per page, up to a current maximum of
-            200. Defaults to 200. [Optional]
-          skip_status:
-            If True the statuses will not be returned in the user items.
-            [Optional]
-          include_user_entities:
-            When True, the user entities will be included. [Optional]
-
-        Returns:
-          next_cursor, previous_cursor, data sequence of twitter.User
-          instances, one for each follower
-        """
-        url = '%s/friends/list.json' % self.base_url
-        return self._GetFriendsFollowersPaged(url,
-                                              user_id,
-                                              screen_name,
-                                              cursor,
-                                              count,
-                                              skip_status,
-                                              include_user_entities)
-
-    def _GetFriendsFollowers(self,
-                             url=None,
-                             user_id=None,
-                             screen_name=None,
-                             cursor=None,
-                             count=None,
-                             total_count=None,
-                             skip_status=False,
-                             include_user_entities=True):
-
-        """ Fetch the sequence of twitter.User instances, one for each friend
-        or follower.
-
-        Args:
-          url:
-            URL to get. Either base_url + ('/followers/list.json' or
-            '/friends/list.json').
-          user_id:
-            The twitter id of the user whose friends you are fetching.
-            If not specified, defaults to the authenticated user. [Optional]
-          screen_name:
-            The twitter name of the user whose friends you are fetching.
-            If not specified, defaults to the authenticated user. [Optional]
-          cursor:
-            Should be set to -1 for the initial call and then is used to
-            control what result page Twitter returns.
-          count:
-            The number of users to return per page, up to a maximum of 200.
-            Defaults to 200. [Optional]
-          total_count:
-            The upper bound of number of users to return, defaults to None.
-          skip_status:
-            If True the statuses will not be returned in the user items.
-            [Optional]
-          include_user_entities:
-            When True, the user entities will be included. [Optional]
-
-        Returns:
-          A sequence of twitter.User instances, one for each friend or follower
-        """
-
-        if cursor is not None or count is not None:
-            warnings.warn(
-                "Use of 'cursor' and 'count' parameters are deprecated as of "
-                "python-twitter 3.0. Please use GetFriendsPaged or "
-                "GetFollowersPaged instead.",
-                PythonTwitterDeprecationWarning330)
-
-        count = 200
-        cursor = -1
-        result = []
-
-        if total_count:
-            try:
-                total_count = int(total_count)
-            except ValueError:
-                raise TwitterError({'message': "total_count must be an integer"})
-
-            if total_count <= 200:
-                count = total_count
-
-        while True:
-            if total_count is not None and len(result) + count > total_count:
-                break
-
-            next_cursor, previous_cursor, data = self._GetFriendsFollowersPaged(
-                url,
-                user_id,
-                screen_name,
-                cursor,
-                count,
-                skip_status,
-                include_user_entities)
-
-            if next_cursor:
-                cursor = next_cursor
-
-            result.extend(data)
-
-            if next_cursor == 0 or next_cursor == previous_cursor:
-                break
-
-        return result
-
-    def GetFollowers(self,
-                     user_id=None,
-                     screen_name=None,
-                     cursor=None,
-                     count=None,
-                     total_count=None,
-                     skip_status=False,
-                     include_user_entities=True):
-        """Fetch the sequence of twitter.User instances, one for each follower.
-
-        If both user_id and screen_name are specified, this call will return
-        the followers of the user specified by screen_name, however this
-        behavior is undocumented by Twitter and may change without warning.
-
-        Args:
-          user_id:
-            The twitter id of the user whose followers you are fetching.
-            If not specified, defaults to the authenticated user. [Optional]
-          screen_name:
-            The twitter name of the user whose followers you are fetching.
-            If not specified, defaults to the authenticated user. [Optional]
-          cursor:
-            Should be set to -1 for the initial call and then is used to
-            control what result page Twitter returns.
-          count:
-            The number of users to return per page, up to a maximum of 200.
-            Defaults to 200. [Optional]
-          total_count:
-            The upper bound of number of users to return, defaults to None.
-          skip_status:
-            If True the statuses will not be returned in the user items. [Optional]
-          include_user_entities:
-            When True, the user entities will be included. [Optional]
-
-        Returns:
-          A sequence of twitter.User instances, one for each follower
-        """
-        url = '%s/followers/list.json' % self.base_url
-        return self._GetFriendsFollowers(url,
-                                         user_id,
-                                         screen_name,
-                                         cursor,
-                                         count,
-                                         total_count,
-                                         skip_status,
-                                         include_user_entities)
-
-    def GetFriends(self,
-                   user_id=None,
-                   screen_name=None,
-                   cursor=None,
-                   count=None,
-                   total_count=None,
-                   skip_status=False,
-                   include_user_entities=True):
-        """Fetch the sequence of twitter.User instances, one for each friend.
-
-        If both user_id and screen_name are specified, this call will return
-        the followers of the user specified by screen_name, however this
-        behavior is undocumented by Twitter and may change without warning.
-
-        Args:
-          user_id:
-            The twitter id of the user whose friends you are fetching.
-            If not specified, defaults to the authenticated user. [Optional]
-          screen_name:
-            The twitter name of the user whose friends you are fetching.
-            If not specified, defaults to the authenticated user. [Optional]
-          cursor:
-            Should be set to -1 for the initial call and then is used to
-            control what result page Twitter returns.
-          count:
-            The number of users to return per page, up to a maximum of 200.
-            Defaults to 200. [Optional]
-          total_count:
-            The upper bound of number of users to return, defaults to None.
-          skip_status:
-            If True the statuses will not be returned in the user items.
-            [Optional]
-          include_user_entities:
-            When True, the user entities will be included. [Optional]
-
-        Returns:
-          A sequence of twitter.User instances, one for each friend
-        """
-        url = '%s/friends/list.json' % self.base_url
-        return self._GetFriendsFollowers(url,
-                                         user_id,
-                                         screen_name,
-                                         cursor,
-                                         count,
-                                         total_count,
-                                         skip_status,
-                                         include_user_entities)
-
-    def UsersLookup(self,
-                    user_id=None,
-                    screen_name=None,
-                    users=None,
-                    include_entities=True,
-                    return_json=False):
-        """Fetch extended information for the specified users.
-
-        Users may be specified either as lists of either user_ids,
-        screen_names, or twitter.User objects. The list of users that
-        are queried is the union of all specified parameters.
-
-        No more than 100 users may be given per request.
-
-        Args:
-          user_id (int, list, optional):
-            A list of user_ids to retrieve extended information.
-          screen_name (str, list, optional):
-            A list of screen_names to retrieve extended information.
-          users (list, optional):
-            A list of twitter.User objects to retrieve extended information.
-          include_entities (bool, optional):
-            The entities node that may appear within embedded statuses will be
-            excluded when set to False.
-          return_json (bool, optional):
-            If True JSON data will be returned, instead of twitter.User
-
-        Returns:
-          A list of twitter.User objects for the requested users
-        """
-        if not any([user_id, screen_name, users]):
-            raise TwitterError("Specify at least one of user_id, screen_name, or users.")
-
-        url = '%s/users/lookup.json' % self.base_url
-        parameters = {
-            'include_entities': include_entities
-        }
-        uids = list()
-        if user_id:
-            uids.extend(user_id)
-        if users:
-            uids.extend([u.id for u in users])
-        if len(uids):
-            parameters['user_id'] = ','.join([str(u) for u in uids])
-        if screen_name:
-            parameters['screen_name'] = parse_arg_list(screen_name, 'screen_name')
-
-        if len(uids) > 100:
-            raise TwitterError("No more than 100 users may be requested per request.")
-
-        resp = self._RequestUrl(url, 'GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        if return_json:
-            return data
-        else:
-            return [User.NewFromJsonDict(u) for u in data]
-
-    def GetUser(self,
-                user_id=None,
-                screen_name=None,
-                include_entities=True,
-                return_json=False):
-        """Returns a single user.
-
-        Args:
-          user_id (int, optional):
-            The id of the user to retrieve.
-          screen_name (str, optional):
-            The screen name of the user for whom to return results for.
-            Either a user_id or screen_name is required for this method.
-          include_entities (bool, optional):
-            The entities node will be omitted when set to False.
-          return_json (bool, optional):
-            If True JSON data will be returned, instead of twitter.User
-
-        Returns:
-          A twitter.User instance representing that user
-        """
-        url = '%s/users/show.json' % (self.base_url)
-        parameters = {
-            'include_entities': include_entities
-        }
-        if user_id:
-            parameters['user_id'] = user_id
-        elif screen_name:
-            parameters['screen_name'] = screen_name
-        else:
-            raise TwitterError("Specify at least one of user_id or screen_name.")
-
-        resp = self._RequestUrl(url, 'GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        if return_json:
-            return data
-        else:
-            return User.NewFromJsonDict(data)
-
-    def GetDirectMessages(self,
-                          since_id=None,
-                          max_id=None,
-                          count=None,
-                          include_entities=True,
-                          skip_status=False,
-                          full_text=False,
-                          page=None,
-                          return_json=False):
-        """Returns a list of the direct messages sent to the authenticating user.
-
-        Args:
-          since_id:
-            Returns results with an ID greater than (that is, more recent
-            than) the specified ID. There are limits to the number of
-            Tweets which can be accessed through the API. If the limit of
-            Tweets has occurred since the since_id, the since_id will be
-            forced to the oldest ID available. [Optional]
-          max_id:
-            Returns results with an ID less than (that is, older than) or
-            equal to the specified ID. [Optional]
-          count:
-            Specifies the number of direct messages to try and retrieve, up to a
-            maximum of 200. The value of count is best thought of as a limit to the
-            number of Tweets to return because suspended or deleted content is
-            removed after the count has been applied. [Optional]
-          include_entities:
-            The entities node will be omitted when set to False.
-            [Optional]
-          skip_status:
-            When set to True statuses will not be included in the returned user
-            objects. [Optional]
-          full_text:
-            When set to True full message will be included in the returned message
-            object if message length is bigger than CHARACTER_LIMIT characters. [Optional]
-          page:
-            If you want more than 200 messages, you can use this and get 20 messages
-            each time. You must recall it and increment the page value until it
-            return nothing. You can't use count option with it. First value is 1 and
-            not 0.
-          return_json (bool, optional):
-            If True JSON data will be returned, instead of twitter.User
-
-        Returns:
-          A sequence of twitter.DirectMessage instances
-        """
-        url = '%s/direct_messages.json' % self.base_url
-        parameters = {
-            'full_text': bool(full_text),
-            'include_entities': bool(include_entities),
-            'max_id': max_id,
-            'since_id': since_id,
-            'skip_status': bool(skip_status),
-        }
-
-        if count:
-            parameters['count'] = enf_type('count', int, count)
-        if page:
-            parameters['page'] = enf_type('page', int, page)
-
-        resp = self._RequestUrl(url, 'GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        if return_json:
-            return data
-        else:
-            return [DirectMessage.NewFromJsonDict(x) for x in data]
-
-    def GetSentDirectMessages(self,
-                              since_id=None,
-                              max_id=None,
-                              count=None,
-                              page=None,
-                              include_entities=True,
-                              return_json=False):
-        """Returns a list of the direct messages sent by the authenticating user.
-
-        Args:
-          since_id (int, optional):
-            Returns results with an ID greater than (that is, more recent
-            than) the specified ID. There are limits to the number of
-            Tweets which can be accessed through the API. If the limit of
-            Tweets has occured since the since_id, the since_id will be
-            forced to the oldest ID available.
-          max_id (int, optional):
-            Returns results with an ID less than (that is, older than) or
-            equal to the specified ID.
-          count (int, optional):
-            Specifies the number of direct messages to try and retrieve, up to a
-            maximum of 200. The value of count is best thought of as a limit to the
-            number of Tweets to return because suspended or deleted content is
-            removed after the count has been applied.
-          page (int, optional):
-            Specifies the page of results to retrieve.
-            Note: there are pagination limits. [Optional]
-          include_entities (bool, optional):
-            The entities node will be omitted when set to False.
-          return_json (bool, optional):
-            If True JSON data will be returned, instead of twitter.User
-
-        Returns:
-          A sequence of twitter.DirectMessage instances
-        """
-        url = '%s/direct_messages/sent.json' % self.base_url
-
-        parameters = {
-            'include_entities': bool(include_entities),
-            'max_id': max_id,
-            'since_id': since_id,
-        }
-
-        if count:
-            parameters['count'] = enf_type('count', int, count)
-        if page:
-            parameters['page'] = enf_type('page', int, page)
-
-        resp = self._RequestUrl(url, 'GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        if return_json:
-            return data
-        else:
-            return [DirectMessage.NewFromJsonDict(x) for x in data]
-
-    def PostDirectMessage(self,
-                          text,
-                          user_id=None,
-                          screen_name=None,
-                          return_json=False):
-        """Post a twitter direct message from the authenticated user.
-
-        Args:
-          text: The message text to be posted.
-          user_id:
-            The ID of the user who should receive the direct message.
-          return_json (bool, optional):
-            If True JSON data will be returned, instead of twitter.DirectMessage
-        Returns:
-          A twitter.DirectMessage instance representing the message posted
-        """
-        url = '%s/direct_messages/events/new.json' % self.base_url
-
-        # Hack to allow some sort of backwards compatibility with older versions
-        # part of the fix for Issue #587
-        if user_id is None and screen_name is not None:
-            user_id = self.GetUser(screen_name=screen_name).id
-
-        event = {
-            'event': {
-                'type': 'message_create',
-                'message_create': {
-                    'target': {
-                        'recipient_id': user_id,
-                    },
-                    'message_data': {
-                        'text': text
-                    }
-                }
-            }
-        }
-
-        resp = self._RequestUrl(url, 'POST', json=event)
-        data = resp.json()
-
-        if return_json:
-            return data
-        else:
-            dm = DirectMessage(
-                created_at=data['event']['created_timestamp'],
-                id=data['event']['id'],
-                recipient_id=data['event']['message_create']['target']['recipient_id'],
-                sender_id=data['event']['message_create']['sender_id'],
-                text=data['event']['message_create']['message_data']['text'],
-            )
-            dm._json = data
-            return dm
-
-    def DestroyDirectMessage(self, message_id, include_entities=True, return_json=False):
-        """Destroys the direct message specified in the required ID parameter.
-
-        The twitter.Api instance must be authenticated, and the
-        authenticating user must be the recipient of the specified direct
-        message.
-
-        Args:
-          message_id:
-            The id of the direct message to be destroyed
-          return_json (bool, optional):
-            If True JSON data will be returned, instead of twitter.User
-
-        Returns:
-          A twitter.DirectMessage instance representing the message destroyed
-        """
-        url = '%s/direct_messages/destroy.json' % self.base_url
-        data = {
-            'id': enf_type('message_id', int, message_id),
-            'include_entities': enf_type('include_entities', bool, include_entities)
-        }
-
-        resp = self._RequestUrl(url, 'POST', data=data)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        if return_json:
-            return data
-        else:
-            return DirectMessage.NewFromJsonDict(data)
-
-    def CreateFriendship(self, user_id=None, screen_name=None, follow=True, retweets=True, **kwargs):
-        """Befriends the user specified by the user_id or screen_name.
-
-        Args:
-          user_id (int, optional):
-            A user_id to follow
-          screen_name (str, optional)
-            A screen_name to follow
-          follow (bool, optional):
-            Set to False to disable notifications for the target user
-          retweets (bool, optional):
-            Enable or disable retweets from the target user.
-
-        Returns:
-          A twitter.User instance representing the befriended user.
-        """
-        return self._AddOrEditFriendship(user_id=user_id,
-                                         screen_name=screen_name,
-                                         follow=follow,
-                                         retweets=retweets,
-                                         **kwargs)
-
-    def _AddOrEditFriendship(self,
-                             user_id=None,
-                             screen_name=None,
-                             uri_end='create',
-                             follow_key='follow',
-                             follow=True,
-                             **kwargs):
-        """Shared method for Create/Update Friendship."""
-        url = '%s/friendships/%s.json' % (self.base_url, uri_end)
-        data = {}
-        if user_id:
-            data['user_id'] = user_id
-        elif screen_name:
-            data['screen_name'] = screen_name
-        else:
-            raise TwitterError("Specify at least one of user_id or screen_name.")
-
-        follow_json = json.dumps(follow)
-        data['{}'.format(follow_key)] = follow_json
-        data.update(**kwargs)
-
-        resp = self._RequestUrl(url, 'POST', data=data)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return User.NewFromJsonDict(data)
-
-    def UpdateFriendship(self,
-                         user_id=None,
-                         screen_name=None,
-                         follow=True,
-                         retweets=True,
-                         **kwargs):
-        """Updates a friendship with the user specified by the user_id or screen_name.
-
-        Args:
-          user_id (int, optional):
-            A user_id to update
-          screen_name (str, optional):
-            A screen_name to update
-          follow (bool, optional):
-            Set to False to disable notifications for the target user
-          retweets (bool, optional):
-            Enable or disable retweets from the target user.
-          device:
-            Set to False to disable notifications for the target user
-
-        Returns:
-          A twitter.User instance representing the befriended user.
-        """
-        return self._AddOrEditFriendship(user_id=user_id,
-                                         screen_name=screen_name,
-                                         follow=follow,
-                                         follow_key='device',
-                                         retweets=retweets,
-                                         uri_end='update',
-                                         **kwargs)
-
-    def DestroyFriendship(self, user_id=None, screen_name=None):
-        """Discontinues friendship with a user_id or screen_name.
-
-        Args:
-          user_id:
-            A user_id to unfollow [Optional]
-          screen_name:
-            A screen_name to unfollow [Optional]
-
-        Returns:
-          A twitter.User instance representing the discontinued friend.
-        """
-        url = '%s/friendships/destroy.json' % self.base_url
-        data = {}
-        if user_id:
-            data['user_id'] = user_id
-        elif screen_name:
-            data['screen_name'] = screen_name
-        else:
-            raise TwitterError("Specify at least one of user_id or screen_name.")
-
-        resp = self._RequestUrl(url, 'POST', data=data)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return User.NewFromJsonDict(data)
-
-    def ShowFriendship(self,
-                       source_user_id=None,
-                       source_screen_name=None,
-                       target_user_id=None,
-                       target_screen_name=None):
-        """Returns information about the relationship between the two users.
-
-        Args:
-          source_id:
-            The user_id of the subject user [Optional]
-          source_screen_name:
-            The screen_name of the subject user [Optional]
-          target_id:
-            The user_id of the target user [Optional]
-          target_screen_name:
-            The screen_name of the target user [Optional]
-
-        Returns:
-          A Twitter Json structure.
-        """
-        url = '%s/friendships/show.json' % self.base_url
-        data = {}
-        if source_user_id:
-            data['source_id'] = source_user_id
-        elif source_screen_name:
-            data['source_screen_name'] = source_screen_name
-        else:
-            raise TwitterError({'message': "Specify at least one of source_user_id or source_screen_name."})
-        if target_user_id:
-            data['target_id'] = target_user_id
-        elif target_screen_name:
-            data['target_screen_name'] = target_screen_name
-        else:
-            raise TwitterError({'message': "Specify at least one of target_user_id or target_screen_name."})
-
-        resp = self._RequestUrl(url, 'GET', data=data)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return data
-
-    def LookupFriendship(self,
-                         user_id=None,
-                         screen_name=None,
-                         return_json=False):
-        """Lookup friendship status for user to authed user.
-
-        Users may be specified either as lists of either user_ids,
-        screen_names, or twitter.User objects. The list of users that
-        are queried is the union of all specified parameters.
-
-        Up to 100 users may be specified.
-
-        Args:
-          user_id (int, User, or list of ints or Users, optional):
-            A list of user_ids to retrieve extended information.
-          screen_name (string, User, or list of strings or Users, optional):
-            A list of screen_names to retrieve extended information.
-          return_json (bool, optional):
-            If True JSON data will be returned, instead of twitter.User
-
-        Returns:
-          list: A list of twitter.UserStatus instance representing the
-          friendship status between the specified users and the authenticated
-          user.
-        """
-        url = '%s/friendships/lookup.json' % (self.base_url)
-        parameters = {}
-
-        if user_id:
-            if isinstance(user_id, (list, tuple)):
-                uids = list()
-                for user in user_id:
-                    if isinstance(user, User):
-                        uids.append(user.id)
-                    else:
-                        uids.append(enf_type('user_id', int, user))
-                parameters['user_id'] = ",".join([str(uid) for uid in uids])
-            else:
-                if isinstance(user_id, User):
-                    parameters['user_id'] = user_id.id
-                else:
-                    parameters['user_id'] = enf_type('user_id', int, user_id)
-        if screen_name:
-            if isinstance(screen_name, (list, tuple)):
-                sn_list = list()
-                for user in screen_name:
-                    if isinstance(user, User):
-                        sn_list.append(user.screen_name)
-                    else:
-                        sn_list.append(enf_type('screen_name', str, user))
-                parameters['screen_name'] = ','.join(sn_list)
-            else:
-                if isinstance(screen_name, User):
-                    parameters['screen_name'] = screen_name.screen_name
-                else:
-                    parameters['screen_name'] = enf_type('screen_name', str, screen_name)
-        if not user_id and not screen_name:
-            raise TwitterError("Specify at least one of user_id or screen_name.")
-
-        resp = self._RequestUrl(url, 'GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        if return_json:
-            return data
-        else:
-            return [UserStatus.NewFromJsonDict(x) for x in data]
-
-    def IncomingFriendship(self,
-                           cursor=None,
-                           stringify_ids=None):
-        """Returns a collection of user IDs belonging to users who have
-        pending request to follow the authenticated user.
-
-        Args:
-          cursor:
-            breaks the ids into pages of no more than 5000.
-          stringify_ids:
-            returns the IDs as unicode strings. [Optional]
-
-        Returns:
-          A list of user IDs
-        """
-        url = '%s/friendships/incoming.json' % (self.base_url)
-        parameters = {}
-        if stringify_ids:
-            parameters['stringify_ids'] = 'true'
-        result = []
-
-        total_count = 0
-        while True:
-            if cursor:
-                try:
-                    parameters['count'] = int(cursor)
-                except ValueError:
-                    raise TwitterError({'message': "cursor must be an integer"})
-            resp = self._RequestUrl(url, 'GET', data=parameters)
-            data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-            result += [x for x in data['ids']]
-            if 'next_cursor' in data:
-                if data['next_cursor'] == 0 or data['next_cursor'] == data['previous_cursor']:
-                    break
-                else:
-                    cursor = data['next_cursor']
-                    total_count -= len(data['ids'])
-                    if total_count < 1:
-                        break
-            else:
-                break
-
-        return result
-
-    def OutgoingFriendship(self,
-                           cursor=None,
-                           stringify_ids=None):
-        """Returns a collection of user IDs for every protected user
-        for whom the authenticated user has a pending follow request.
-
-        Args:
-          cursor:
-            breaks the ids into pages of no more than 5000.
-          stringify_ids:
-            returns the IDs as unicode strings. [Optional]
-
-        Returns:
-          A list of user IDs
-        """
-        url = '%s/friendships/outgoing.json' % (self.base_url)
-        parameters = {}
-        if stringify_ids:
-            parameters['stringify_ids'] = 'true'
-        result = []
-
-        total_count = 0
-        while True:
-            if cursor:
-                try:
-                    parameters['count'] = int(cursor)
-                except ValueError:
-                    raise TwitterError({'message': "cursor must be an integer"})
-            resp = self._RequestUrl(url, 'GET', data=parameters)
-            data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-            result += [x for x in data['ids']]
-            if 'next_cursor' in data:
-                if data['next_cursor'] == 0 or data['next_cursor'] == data['previous_cursor']:
-                    break
-                else:
-                    cursor = data['next_cursor']
-                    total_count -= len(data['ids'])
-                    if total_count < 1:
-                        break
-            else:
-                break
-
-        return result
-
-    def CreateFavorite(self,
-                       status=None,
-                       status_id=None,
-                       include_entities=True):
-        """Favorites the specified status object or id as the authenticating user.
-
-        Returns the favorite status when successful.
-
-        Args:
-          status_id (int, optional):
-            The id of the twitter status to mark as a favorite.
-          status (twitter.Status, optional):
-            The twitter.Status object to mark as a favorite.
-          include_entities (bool, optional):
-            The entities node will be omitted when set to False.
-
-        Returns:
-          A twitter.Status instance representing the newly-marked favorite.
-        """
-        url = '%s/favorites/create.json' % self.base_url
-        data = {}
-        if status_id:
-            data['id'] = status_id
-        elif status:
-            data['id'] = status.id
-        else:
-            raise TwitterError({'message': "Specify status_id or status"})
-        data['include_entities'] = enf_type('include_entities', bool, include_entities)
-
-        resp = self._RequestUrl(url, 'POST', data=data)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return Status.NewFromJsonDict(data)
-
-    def DestroyFavorite(self,
-                        status=None,
-                        status_id=None,
-                        include_entities=True):
-        """Un-Favorites the specified status object or id as the authenticating user.
-
-        Returns the un-favorited status when successful.
-
-        Args:
-          status_id (int, optional):
-            The id of the twitter status to mark as a favorite.
-          status (twitter.Status, optional):
-            The twitter.Status object to mark as a favorite.
-          include_entities (bool, optional):
-            The entities node will be omitted when set to False.
-
-        Returns:
-          A twitter.Status instance representing the newly-unmarked favorite.
-        """
-        url = '%s/favorites/destroy.json' % self.base_url
-        data = {}
-
-        if status_id:
-            data['id'] = status_id
-        elif status:
-            data['id'] = status.id
-        else:
-            raise TwitterError({'message': "Specify status_id or status"})
-        data['include_entities'] = enf_type('include_entities', bool, include_entities)
-
-        resp = self._RequestUrl(url, 'POST', data=data)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return Status.NewFromJsonDict(data)
-
-    def GetFavorites(self,
-                     user_id=None,
-                     screen_name=None,
-                     count=None,
-                     since_id=None,
-                     max_id=None,
-                     include_entities=True,
-                     return_json=False):
-        """Return a list of Status objects representing favorited tweets.
-
-        Returns up to 200 most recent tweets for the authenticated user.
-
-        Args:
-          user_id (int, optional):
-            Specifies the ID of the user for whom to return the
-            favorites. Helpful for disambiguating when a valid user ID
-            is also a valid screen name.
-          screen_name (str, optional):
-            Specifies the screen name of the user for whom to return the
-            favorites. Helpful for disambiguating when a valid screen
-            name is also a user ID.
-          since_id (int, optional):
-            Returns results with an ID greater than (that is, more recent
-            than) the specified ID. There are limits to the number of
-            Tweets which can be accessed through the API. If the limit of
-            Tweets has occurred since the since_id, the since_id will be
-            forced to the oldest ID available.
-          max_id (int, optional):
-            Returns only statuses with an ID less than (that is, older
-            than) or equal to the specified ID.
-          count (int, optional):
-            Specifies the number of statuses to retrieve. May not be
-            greater than 200.
-          include_entities (bool, optional):
-            The entities node will be omitted when set to False.
-          return_json (bool, optional):
-            If True JSON data will be returned, instead of twitter.User
-
-        Returns:
-          A sequence of Status instances, one for each favorited tweet up to count
-        """
-        parameters = {}
-        url = '%s/favorites/list.json' % self.base_url
-        if user_id:
-            parameters['user_id'] = enf_type('user_id', int, user_id)
-        elif screen_name:
-            parameters['screen_name'] = screen_name
-        if since_id:
-            parameters['since_id'] = enf_type('since_id', int, since_id)
-        if max_id:
-            parameters['max_id'] = enf_type('max_id', int, max_id)
-        if count:
-            parameters['count'] = enf_type('count', int, count)
-        parameters['include_entities'] = enf_type('include_entities', bool, include_entities)
-
-        resp = self._RequestUrl(url, 'GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        if return_json:
-            return data
-        else:
-            return [Status.NewFromJsonDict(x) for x in data]
-
-    def GetMentions(self,
-                    count=None,
-                    since_id=None,
-                    max_id=None,
-                    trim_user=False,
-                    contributor_details=False,
-                    include_entities=True,
-                    return_json=False):
-        """Returns the 20 most recent mentions (status containing @screen_name)
-        for the authenticating user.
-
-        Args:
-          count:
-            Specifies the number of tweets to try and retrieve, up to a maximum of
-            200. The value of count is best thought of as a limit to the number of
-            tweets to return because suspended or deleted content is removed after
-            the count has been applied. [Optional]
-          since_id:
-            Returns results with an ID greater than (that is, more recent
-            than) the specified ID. There are limits to the number of
-            Tweets which can be accessed through the API. If the limit of
-            Tweets has occurred since the since_id, the since_id will be
-            forced to the oldest ID available. [Optional]
-          max_id:
-            Returns only statuses with an ID less than
-            (that is, older than) the specified ID. [Optional]
-          trim_user:
-            When set to True, each tweet returned in a timeline will include a user
-            object including only the status authors numerical ID. Omit this
-            parameter to receive the complete user object. [Optional]
-          contributor_details:
-            If set to True, this parameter enhances the contributors element of the
-            status response to include the screen_name of the contributor. By
-            default only the user_id of the contributor is included. [Optional]
-          include_entities:
-            The entities node will be disincluded when set to False. [Optional]
-          return_json (bool, optional):
-            If True JSON data will be returned, instead of twitter.User
-
-        Returns:
-          A sequence of twitter.Status instances, one for each mention of the user.
-        """
-        url = '%s/statuses/mentions_timeline.json' % self.base_url
-
-        parameters = {
-            'contributor_details': bool(contributor_details),
-            'include_entities': bool(include_entities),
-            'max_id': max_id,
-            'since_id': since_id,
-            'trim_user': bool(trim_user),
-        }
-
-        if count:
-            parameters['count'] = enf_type('count', int, count)
-
-        resp = self._RequestUrl(url, 'GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        if return_json:
-            return data
-        else:
-            return [Status.NewFromJsonDict(x) for x in data]
-
-    @staticmethod
-    def _IDList(list_id, slug, owner_id, owner_screen_name):
-        parameters = {}
-        if list_id is not None:
-            parameters['list_id'] = enf_type('list_id', int, list_id)
-        elif slug is not None:
-            parameters['slug'] = slug
-            if owner_id is not None:
-                parameters['owner_id'] = enf_type('owner_id', int, owner_id)
-            elif owner_screen_name is not None:
-                parameters['owner_screen_name'] = owner_screen_name
-            else:
-                raise TwitterError({'message': (
-                    'If specifying a list by slug, an owner_id or '
-                    'owner_screen_name must also be given.')})
-        else:
-            raise TwitterError({'message': (
-                'Either list_id or slug and one of owner_id and '
-                'owner_screen_name must be passed.')})
-
-        return parameters
-
-    def CreateList(self, name, mode=None, description=None):
-        """Creates a new list with the give name for the authenticated user.
-
-        Args:
-          name (str):
-            New name for the list
-          mode (str, optional):
-            'public' or 'private'. Defaults to 'public'.
-          description (str, optional):
-            Description of the list.
-
-        Returns:
-          twitter.list.List: A twitter.List instance representing the new list
-        """
-        url = '%s/lists/create.json' % self.base_url
-        parameters = {'name': name}
-        if mode is not None:
-            parameters['mode'] = mode
-        if description is not None:
-            parameters['description'] = description
-
-        resp = self._RequestUrl(url, 'POST', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return List.NewFromJsonDict(data)
-
-    def DestroyList(self,
-                    owner_screen_name=None,
-                    owner_id=None,
-                    list_id=None,
-                    slug=None):
-        """Destroys the list identified by list_id or slug and one of
-        owner_screen_name or owner_id.
-
-        Args:
-          owner_screen_name (str, optional):
-            The screen_name of the user who owns the list being requested
-            by a slug.
-          owner_id (int, optional):
-            The user ID of the user who owns the list being requested
-            by a slug.
-          list_id (int, optional):
-            The numerical id of the list.
-          slug (str, optional):
-            You can identify a list by its slug instead of its numerical id.
-            If you decide to do so, note that you'll also have to specify
-            the list owner using the owner_id or owner_screen_name parameters.
-
-        Returns:
-          twitter.list.List: A twitter.List instance representing the
-          removed list.
-        """
-        url = '%s/lists/destroy.json' % self.base_url
-        parameters = {}
-
-        parameters.update(self._IDList(list_id=list_id,
-                                       slug=slug,
-                                       owner_id=owner_id,
-                                       owner_screen_name=owner_screen_name))
-
-        resp = self._RequestUrl(url, 'POST', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return List.NewFromJsonDict(data)
-
-    def CreateSubscription(self,
-                           owner_screen_name=None,
-                           owner_id=None,
-                           list_id=None,
-                           slug=None):
-        """Creates a subscription to a list by the authenticated user.
-
-        Args:
-          owner_screen_name (str, optional):
-            The screen_name of the user who owns the list being requested
-            by a slug.
-          owner_id (int, optional):
-            The user ID of the user who owns the list being requested
-            by a slug.
-          list_id (int, optional):
-            The numerical id of the list.
-          slug (str, optional):
-            You can identify a list by its slug instead of its numerical id.
-            If you decide to do so, note that you'll also have to specify
-            the list owner using the owner_id or owner_screen_name parameters.
-
-        Returns:
-          twitter.user.User: A twitter.User instance representing the user subscribed
-        """
-        url = '%s/lists/subscribers/create.json' % self.base_url
-        parameters = {}
-
-        parameters.update(self._IDList(list_id=list_id,
-                                       slug=slug,
-                                       owner_id=owner_id,
-                                       owner_screen_name=owner_screen_name))
-
-        resp = self._RequestUrl(url, 'POST', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return User.NewFromJsonDict(data)
-
-    def DestroySubscription(self,
-                            owner_screen_name=None,
-                            owner_id=None,
-                            list_id=None,
-                            slug=None):
-        """Destroys the subscription to a list for the authenticated user.
-
-        Args:
-          owner_screen_name (str, optional):
-            The screen_name of the user who owns the list being requested
-            by a slug.
-          owner_id (int, optional):
-            The user ID of the user who owns the list being requested
-            by a slug.
-          list_id (int, optional):
-            The numerical id of the list.
-          slug (str, optional):
-            You can identify a list by its slug instead of its numerical id.
-            If you decide to do so, note that you'll also have to specify the
-            list owner using the owner_id or owner_screen_name parameters.
-
-        Returns:
-          twitter.list.List: A twitter.List instance representing
-          the removed list.
-        """
-        url = '%s/lists/subscribers/destroy.json' % (self.base_url)
-        parameters = {}
-
-        parameters.update(self._IDList(list_id=list_id,
-                                       slug=slug,
-                                       owner_id=owner_id,
-                                       owner_screen_name=owner_screen_name))
-
-        resp = self._RequestUrl(url, 'POST', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return List.NewFromJsonDict(data)
-
-    def ShowSubscription(self,
-                         owner_screen_name=None,
-                         owner_id=None,
-                         list_id=None,
-                         slug=None,
-                         user_id=None,
-                         screen_name=None,
-                         include_entities=False,
-                         skip_status=False,
-                         return_json=False):
-        """Check if the specified user is a subscriber of the specified list.
-
-        Returns the user if they are subscriber.
-
-        Args:
-          owner_screen_name (str, optional):
-            The screen_name of the user who owns the list being requested
-            by a slug.
-          owner_id (int, optional):
-            The user ID of the user who owns the list being requested
-            by a slug.
-          list_id (int, optional):
-            The numerical ID of the list.
-          slug (str, optional):
-            You can identify a list by its slug instead of its numerical ID.
-            If you decide to do so, note that you'll also have to specify
-            the list owner using the owner_id or owner_screen_name parameters.
-          user_id (int, optional):
-            The user_id or a list of user_id's to add to the list.
-            If not given, then screen_name is required.
-          screen_name (str, optional):
-            The screen_name or a list of screen_name's to add to the list.
-            If not given, then user_id is required.
-          include_entities (bool, optional):
-            If False, the timeline will not contain additional metadata.
-            Defaults to True.
-          skip_status (bool, optional):
-            If True the statuses will not be returned in the user items.
-          return_json (bool, optional):
-            If True JSON data will be returned, instead of twitter.User
-
-        Returns:
-          twitter.user.User: A twitter.User instance representing the user
-          requested.
-        """
-        url = '%s/lists/subscribers/show.json' % (self.base_url)
-        parameters = {}
-
-        parameters.update(self._IDList(list_id=list_id,
-                                       slug=slug,
-                                       owner_id=owner_id,
-                                       owner_screen_name=owner_screen_name))
-
-        if user_id:
-            parameters['user_id'] = enf_type('user_id', int, user_id)
-        elif screen_name:
-            parameters['screen_name'] = screen_name
-        if skip_status:
-            parameters['skip_status'] = True
-        if include_entities:
-            parameters['include_entities'] = True
-
-        resp = self._RequestUrl(url, 'GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        if return_json:
-            return data
-        else:
-            return User.NewFromJsonDict(data)
-
-    def GetSubscriptions(self,
-                         user_id=None,
-                         screen_name=None,
-                         count=20,
-                         cursor=-1,
-                         return_json=False):
-        """Obtain a collection of the lists the specified user is
-        subscribed to. If neither user_id or screen_name is specified, the
-        data returned will be for the authenticated user.
-
-        The list will contain a maximum of 20 lists per page by default.
-
-        Does not include the user's own lists.
-
-        Args:
-          user_id (int, optional):
-            The ID of the user for whom to return results for.
-          screen_name (str, optional):
-            The screen name of the user for whom to return results for.
-          count (int, optional):
-           The amount of results to return per page.
-           No more than 1000 results will ever be returned in a single
-           page. Defaults to 20.
-          cursor (int, optional):
-            The "page" value that Twitter will use to start building the
-            list sequence from. Use the value of -1 to start at the
-            beginning. Twitter will return in the result the values for
-            next_cursor and previous_cursor.
-          return_json (bool, optional):
-            If True JSON data will be returned, instead of twitter.User
-
-        Returns:
-          twitter.list.List: A sequence of twitter.List instances,
-          one for each list
-        """
-        url = '%s/lists/subscriptions.json' % (self.base_url)
-        parameters = {}
-        parameters['cursor'] = enf_type('cursor', int, cursor)
-        parameters['count'] = enf_type('count', int, count)
-        if user_id is not None:
-            parameters['user_id'] = enf_type('user_id', int, user_id)
-        elif screen_name is not None:
-            parameters['screen_name'] = screen_name
-
-        resp = self._RequestUrl(url, 'GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        if return_json:
-            return data
-        else:
-            return [List.NewFromJsonDict(x) for x in data['lists']]
-
-    def GetMemberships(self,
-                       user_id=None,
-                       screen_name=None,
-                       count=20,
-                       cursor=-1,
-                       filter_to_owned_lists=False,
-                       return_json=False):
-        """Obtain the lists the specified user is a member of. If no user_id or
-        screen_name is specified, the data returned will be for the
-        authenticated user.
-
-        Returns a maximum of 20 lists per page by default.
-
-        Args:
-          user_id (int, optional):
-            The ID of the user for whom to return results for.
-          screen_name (str, optional):
-            The screen name of the user for whom to return
-            results for.
-          count (int, optional):
-           The amount of results to return per page.
-           No more than 1000 results will ever be returned in a single page.
-           Defaults to 20.
-          cursor (int, optional):
-            The "page" value that Twitter will use to start building the list
-            sequence from. Use the value of -1 to start at the beginning.
-            Twitter will return in the result the values for next_cursor and
-            previous_cursor.
-          filter_to_owned_lists (bool, optional):
-            Set to True to return only the lists the authenticating user
-            owns, and the user specified by user_id or screen_name is a
-            member of. Default value is False.
-          return_json (bool, optional):
-            If True JSON data will be returned, instead of twitter.User
-
-        Returns:
-          list: A list of twitter.List instances, one for each list in which
-          the user specified by user_id or screen_name is a member
-        """
-        url = '%s/lists/memberships.json' % (self.base_url)
-        parameters = {}
-        if cursor is not None:
-            parameters['cursor'] = enf_type('cursor', int, cursor)
-        if count is not None:
-            parameters['count'] = enf_type('count', int, count)
-        if filter_to_owned_lists:
-            parameters['filter_to_owned_lists'] = enf_type(
-                'filter_to_owned_lists', bool, filter_to_owned_lists)
-
-        if user_id is not None:
-            parameters['user_id'] = enf_type('user_id', int, user_id)
-        elif screen_name is not None:
-            parameters['screen_name'] = screen_name
-
-        resp = self._RequestUrl(url, 'GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        if return_json:
-            return data
-        else:
-            return [List.NewFromJsonDict(x) for x in data['lists']]
-
-    def GetListsList(self,
-                     screen_name=None,
-                     user_id=None,
-                     reverse=False,
-                     return_json=False):
-        """Returns all lists the user subscribes to, including their own.
-        If no user_id or screen_name is specified, the data returned will be
-        for the authenticated user.
-
-        Args:
-          screen_name (str, optional):
-            Specifies the screen name of the user for whom to return the
-            user_timeline. Helpful for disambiguating when a valid screen
-            name is also a user ID.
-          user_id (int, optional):
-            Specifies the ID of the user for whom to return the
-            user_timeline. Helpful for disambiguating when a valid user ID
-            is also a valid screen name.
-          reverse (bool, optional):
-            If False, the owned lists will be returned first, othewise
-            subscribed lists will be at the top. Returns a maximum of 100
-            entries regardless. Defaults to False.
-          return_json (bool, optional):
-            If True JSON data will be returned, instead of twitter.User
-
-        Returns:
-          list: A sequence of twitter.List instances.
-        """
-        url = '%s/lists/list.json' % (self.base_url)
-        parameters = {}
-        if user_id:
-            parameters['user_id'] = enf_type('user_id', int, user_id)
-        elif screen_name:
-            parameters['screen_name'] = screen_name
-        if reverse:
-            parameters['reverse'] = enf_type('reverse', bool, reverse)
-
-        resp = self._RequestUrl(url, 'GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        if return_json:
-            return data
-        else:
-            return [List.NewFromJsonDict(x) for x in data]
-
-    def GetListTimeline(self,
-                        list_id=None,
-                        slug=None,
-                        owner_id=None,
-                        owner_screen_name=None,
-                        since_id=None,
-                        max_id=None,
-                        count=None,
-                        include_rts=True,
-                        include_entities=True,
-                        return_json=False):
-        """Fetch the sequence of Status messages for a given List ID.
-
-        Args:
-          list_id (int, optional):
-            Specifies the ID of the list to retrieve.
-          slug (str, optional):
-            The slug name for the list to retrieve. If you specify None for the
-            list_id, then you have to provide either a owner_screen_name or
-            owner_id.
-          owner_id (int, optional):
-            Specifies the ID of the user for whom to return the
-            list timeline. Helpful for disambiguating when a valid user ID
-            is also a valid screen name.
-          owner_screen_name (str, optional):
-            Specifies the screen name of the user for whom to return the
-            user_timeline. Helpful for disambiguating when a valid screen
-            name is also a user ID.
-          since_id (int, optional):
-            Returns results with an ID greater than (that is, more recent than)
-            the specified ID. There are limits to the number of Tweets which
-            can be accessed through the API.
-            If the limit of Tweets has occurred since the since_id, the
-            since_id will be forced to the oldest ID available.
-          max_id (int, optional):
-            Returns only statuses with an ID less than (that is, older than) or
-            equal to the specified ID.
-          count (int, optional):
-            Specifies the number of statuses to retrieve.
-            May not be greater than 200.
-          include_rts (bool, optional):
-            If True, the timeline will contain native retweets (if they exist)
-            in addition to the standard stream of tweets.
-          include_entities (bool, optional):
-            If False, the timeline will not contain additional metadata.
-            Defaults to True.
-          return_json (bool, optional):
-            If True JSON data will be returned, instead of twitter.User
-
-        Returns:
-          list: A list of twitter.status.Status instances, one for each
-          message up to count.
-        """
-        url = '%s/lists/statuses.json' % self.base_url
-        parameters = {}
-
-        parameters.update(self._IDList(list_id=list_id,
-                                       slug=slug,
-                                       owner_id=owner_id,
-                                       owner_screen_name=owner_screen_name))
-
-        if since_id:
-            parameters['since_id'] = enf_type('since_id', int, since_id)
-        if max_id:
-            parameters['max_id'] = enf_type('max_id', int, max_id)
-        if count:
-            parameters['count'] = enf_type('count', int, count)
-        if not include_rts:
-            parameters['include_rts'] = enf_type('include_rts', bool, include_rts)
-        if not include_entities:
-            parameters['include_entities'] = enf_type('include_entities', bool, include_entities)
-
-        resp = self._RequestUrl(url, 'GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        if return_json:
-            return data
-        else:
-            return [Status.NewFromJsonDict(x) for x in data]
-
-    def GetListMembersPaged(self,
-                            list_id=None,
-                            slug=None,
-                            owner_id=None,
-                            owner_screen_name=None,
-                            cursor=-1,
-                            count=100,
-                            skip_status=False,
-                            include_entities=True):
-        """Fetch the sequence of twitter.User instances, one for each member
-        of the given list_id or slug.
-
-        Args:
-          list_id (int, optional):
-            Specifies the ID of the list to retrieve.
-          slug (str, optional):
-            The slug name for the list to retrieve. If you specify None for the
-            list_id, then you have to provide either a owner_screen_name or
-            owner_id.
-          owner_id (int, optional):
-            Specifies the ID of the user for whom to return the
-            list timeline. Helpful for disambiguating when a valid user ID
-            is also a valid screen name.
-          owner_screen_name (str, optional):
-            Specifies the screen name of the user for whom to return the
-            user_timeline. Helpful for disambiguating when a valid screen
-            name is also a user ID.
-          cursor (int, optional):
-            Should be set to -1 for the initial call and then is used to
-            control what result page Twitter returns.
-          skip_status (bool, optional):
-            If True the statuses will not be returned in the user items.
-          include_entities (bool, optional):
-            If False, the timeline will not contain additional metadata.
-            Defaults to True.
-
-        Returns:
-          list: A sequence of twitter.user.User instances, one for each
-          member of the twitter.list.List.
-        """
-        url = '%s/lists/members.json' % self.base_url
-        parameters = {}
-
-        parameters.update(self._IDList(list_id=list_id,
-                                       slug=slug,
-                                       owner_id=owner_id,
-                                       owner_screen_name=owner_screen_name))
-
-        if count:
-            parameters['count'] = enf_type('count', int, count)
-        if cursor:
-            parameters['cursor'] = enf_type('cursor', int, cursor)
-
-        parameters['skip_status'] = enf_type('skip_status', bool, skip_status)
-        parameters['include_entities'] = enf_type('include_entities', bool, include_entities)
-
-        resp = self._RequestUrl(url, 'GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-        next_cursor = data.get('next_cursor', 0)
-        previous_cursor = data.get('previous_cursor', 0)
-        users = [User.NewFromJsonDict(user) for user in data.get('users', [])]
-
-        return next_cursor, previous_cursor, users
-
-    def GetListMembers(self,
-                       list_id=None,
-                       slug=None,
-                       owner_id=None,
-                       owner_screen_name=None,
-                       skip_status=False,
-                       include_entities=False):
-        """Fetch the sequence of twitter.User instances, one for each member
-        of the given list_id or slug.
-
-        Args:
-          list_id (int, optional):
-            Specifies the ID of the list to retrieve.
-          slug (str, optional):
-            The slug name for the list to retrieve. If you specify None for the
-            list_id, then you have to provide either a owner_screen_name or
-            owner_id.
-          owner_id (int, optional):
-            Specifies the ID of the user for whom to return the
-            list timeline. Helpful for disambiguating when a valid user ID
-            is also a valid screen name.
-          owner_screen_name (str, optional):
-            Specifies the screen name of the user for whom to return the
-            user_timeline. Helpful for disambiguating when a valid screen
-            name is also a user ID.
-          skip_status (bool, optional):
-            If True the statuses will not be returned in the user items.
-          include_entities (bool, optional):
-            If False, the timeline will not contain additional metadata.
-            Defaults to True.
-
-        Returns:
-          list: A sequence of twitter.user.User instances, one for each
-          member of the twitter.list.List.
-        """
-        cursor = -1
-        result = []
-        while True:
-            next_cursor, previous_cursor, users = self.GetListMembersPaged(
-                list_id=list_id,
-                slug=slug,
-                owner_id=owner_id,
-                owner_screen_name=owner_screen_name,
-                cursor=cursor,
-                skip_status=skip_status,
-                include_entities=include_entities)
-            result += users
-
-            if next_cursor == 0 or next_cursor == previous_cursor:
-                break
-            else:
-                cursor = next_cursor
-
-        return result
-
-    def CreateListsMember(self,
-                          list_id=None,
-                          slug=None,
-                          user_id=None,
-                          screen_name=None,
-                          owner_screen_name=None,
-                          owner_id=None):
-        """Add a new member (or list of members) to the specified list.
-
-        Args:
-          list_id (int, optional):
-            The numerical id of the list.
-          slug (str, optional):
-            You can identify a list by its slug instead of its numerical id.
-            If you decide to do so, note that you'll also have to specify the
-            list owner using the owner_id or owner_screen_name parameters.
-          user_id (int, optional):
-            The user_id or a list of user_id's to add to the list.
-            If not given, then screen_name is required.
-          screen_name (str, optional):
-            The screen_name or a list of screen_name's to add to the list.
-            If not given, then user_id is required.
-          owner_screen_name (str, optional):
-            The screen_name of the user who owns the list being requested by
-            a slug.
-          owner_id (int, optional):
-            The user ID of the user who owns the list being requested by
-            a slug.
-
-        Returns:
-          twitter.list.List: A twitter.List instance representing the list
-          subscribed to.
-        """
-        is_list = False
-        parameters = {}
-
-        parameters.update(self._IDList(list_id=list_id,
-                                       slug=slug,
-                                       owner_id=owner_id,
-                                       owner_screen_name=owner_screen_name))
-
-        if user_id:
-            if isinstance(user_id, list) or isinstance(user_id, tuple):
-                is_list = True
-                uids = [str(enf_type('user_id', int, uid)) for uid in user_id]
-                parameters['user_id'] = ','.join(uids)
-            else:
-                parameters['user_id'] = enf_type('user_id', int, user_id)
-
-        elif screen_name:
-            if isinstance(screen_name, list) or isinstance(screen_name, tuple):
-                is_list = True
-                parameters['screen_name'] = ','.join(screen_name)
-            else:
-                parameters['screen_name'] = screen_name
-        if is_list:
-            url = '%s/lists/members/create_all.json' % self.base_url
-        else:
-            url = '%s/lists/members/create.json' % self.base_url
-
-        resp = self._RequestUrl(url, 'POST', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return List.NewFromJsonDict(data)
-
-    def DestroyListsMember(self,
-                           list_id=None,
-                           slug=None,
-                           owner_screen_name=None,
-                           owner_id=None,
-                           user_id=None,
-                           screen_name=None):
-        """Destroys the subscription to a list for the authenticated user.
-
-        Args:
-          list_id (int, optional):
-            The numerical id of the list.
-          slug (str, optional):
-            You can identify a list by its slug instead of its numerical id.
-            If you decide to do so, note that you'll also have to specify
-            the list owner using the owner_id or owner_screen_name parameters.
-          owner_screen_name (str, optional):
-            The screen_name of the user who owns the list being requested by a
-            slug.
-          owner_id (int, optional):
-            The user ID of the user who owns the list being requested by a slug.
-          user_id (int, optional):
-            The user_id or a list of user_id's to remove from the list.
-            If not given, then screen_name is required.
-          screen_name (str, optional):
-            The screen_name or a list of Screen_name's to remove from the list.
-            If not given, then user_id is required.
-
-        Returns:
-          twitter.list.List: A twitter.List instance representing the
-          removed list.
-        """
-        is_list = False
-        parameters = {}
-
-        parameters.update(self._IDList(list_id=list_id,
-                                       slug=slug,
-                                       owner_id=owner_id,
-                                       owner_screen_name=owner_screen_name))
-
-        if user_id:
-            if isinstance(user_id, list) or isinstance(user_id, tuple):
-                is_list = True
-                uids = [str(enf_type('user_id', int, uid)) for uid in user_id]
-                parameters['user_id'] = ','.join(uids)
-            else:
-                parameters['user_id'] = int(user_id)
-        elif screen_name:
-            if isinstance(screen_name, list) or isinstance(screen_name, tuple):
-                is_list = True
-                parameters['screen_name'] = ','.join(screen_name)
-            else:
-                parameters['screen_name'] = screen_name
-
-        if is_list:
-            url = '%s/lists/members/destroy_all.json' % self.base_url
-        else:
-            url = '%s/lists/members/destroy.json' % self.base_url
-
-        resp = self._RequestUrl(url, 'POST', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return List.NewFromJsonDict(data)
-
-    def GetListsPaged(self,
-                      user_id=None,
-                      screen_name=None,
-                      cursor=-1,
-                      count=20):
-        """ Fetch the sequence of lists for a user. If no user_id or
-        screen_name is passed, the data returned will be for the
-        authenticated user.
-
-        Args:
-          user_id (int, optional):
-            The ID of the user for whom to return results for.
-          screen_name (str, optional):
-            The screen name of the user for whom to return results
-            for.
-          count (int, optional):
-            The amount of results to return per page. No more than 1000 results
-            will ever be returned in a single page. Defaults to 20.
-          cursor (int, optional):
-            The "page" value that Twitter will use to start building the list
-            sequence from. Use the value of -1 to start at the beginning.
-            Twitter will return in the result the values for next_cursor and
-            previous_cursor.
-
-        Returns:
-          next_cursor (int), previous_cursor (int), list of twitter.List
-          instances, one for each list
-        """
-        url = '%s/lists/ownerships.json' % self.base_url
-        parameters = {}
-        if user_id is not None:
-            parameters['user_id'] = enf_type('user_id', int, user_id)
-        elif screen_name is not None:
-            parameters['screen_name'] = screen_name
-
-        if count is not None:
-            parameters['count'] = enf_type('count', int, count)
-
-        parameters['cursor'] = enf_type('cursor', int, cursor)
-
-        resp = self._RequestUrl(url, 'GET', data=parameters)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        next_cursor = data.get('next_cursor', 0)
-        previous_cursor = data.get('previous_cursor', 0)
-        lists = [List.NewFromJsonDict(x) for x in data.get('lists', [])]
-
-        return next_cursor, previous_cursor, lists
-
-    def GetLists(self,
-                 user_id=None,
-                 screen_name=None):
-        """Fetch the sequence of lists for a user. If no user_id or screen_name
-        is passed, the data returned will be for the authenticated user.
-
-        Args:
-          user_id:
-            The ID of the user for whom to return results for. [Optional]
-          screen_name:
-            The screen name of the user for whom to return results
-            for. [Optional]
-          count:
-            The amount of results to return per page.
-            No more than 1000 results will ever be returned in a single page.
-            Defaults to 20. [Optional]
-          cursor:
-            The "page" value that Twitter will use to start building the list
-            sequence from. Use the value of -1 to start at the beginning.
-            Twitter will return in the result the values for next_cursor and
-            previous_cursor. [Optional]
-
-        Returns:
-          A sequence of twitter.List instances, one for each list
-        """
-        result = []
-        cursor = -1
-
-        while True:
-            next_cursor, prev_cursor, lists = self.GetListsPaged(
-                user_id=user_id,
-                screen_name=screen_name,
-                cursor=cursor)
-            result += lists
-            if next_cursor == 0 or next_cursor == prev_cursor:
-                break
-            else:
-                cursor = next_cursor
-
-        return result
-
-    def UpdateProfile(self,
-                      name=None,
-                      profileURL=None,
-                      location=None,
-                      description=None,
-                      profile_link_color=None,
-                      include_entities=False,
-                      skip_status=False):
-        """Update's the authenticated user's profile data.
-
-        Args:
-          name (str, optional):
-            Full name associated with the profile.
-          profileURL (str, optional):
-            URL associated with the profile.
-            Will be prepended with "http://" if not present.
-          location (str, optional):
-            The city or country describing where the user of the account is located.
-            The contents are not normalized or geocoded in any way.
-          description (str, optional):
-            A description of the user owning the account.
-          profile_link_color (str, optional):
-            hex value of profile color theme. formated without '#' or '0x'. Ex:  FF00FF
-          include_entities (bool, optional):
-            The entities node will be omitted when set to False.
-          skip_status (bool, optional):
-            When set to either True, t or 1 then statuses will not be included
-            in the returned user objects.
-
-        Returns:
-          A twitter.User instance representing the modified user.
-        """
-        url = '%s/account/update_profile.json' % (self.base_url)
-        data = {
-            'name': name,
-            'url': profileURL,
-            'location': location,
-            'description': description,
-            'profile_link_color': profile_link_color,
-            'include_entities': include_entities,
-            'skip_status': skip_status,
-        }
-
-        resp = self._RequestUrl(url, 'POST', data=data)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return User.NewFromJsonDict(data)
-
-    def UpdateImage(self,
-                    image,
-                    include_entities=False,
-                    skip_status=False):
-        """Update a User's profile image. Change may not be immediately
-        reflected due to image processing on Twitter's side.
-
-        Args:
-            image (str):
-                Location of local image file to use.
-            include_entities (bool, optional):
-                Include the entities node in the return data.
-            skip_status (bool, optional):
-                Include the User's last Status in the User entity returned.
-
-        Returns:
-            (twitter.models.User): Updated User object.
-        """
-
-        url = '%s/account/update_profile_image.json' % (self.base_url)
-        with open(image, 'rb') as image_file:
-            encoded_image = base64.b64encode(image_file.read())
-        data = {
-            'image': encoded_image
-        }
-        if include_entities:
-            data['include_entities'] = 1
-        if skip_status:
-            data['skip_status'] = 1
-
-        resp = self._RequestUrl(url, 'POST', data=data)
-
-        if resp.status_code in [200, 201, 202]:
-            return True
-        if resp.status_code == 400:
-            raise TwitterError({'message': "Image data could not be processed"})
-        if resp.status_code == 422:
-            raise TwitterError({'message': "The image could not be resized or is too large."})
-
-    def UpdateBanner(self,
-                     image,
-                     include_entities=False,
-                     skip_status=False):
-        """Updates the authenticated users profile banner.
-
-        Args:
-          image:
-            Location of image in file system
-          include_entities:
-            If True, each tweet will include a node called "entities."
-            This node offers a variety of metadata about the tweet in a
-            discrete structure, including: user_mentions, urls, and hashtags.
-            [Optional]
-
-        Returns:
-          A twitter.List instance representing the list subscribed to
-        """
-        url = '%s/account/update_profile_banner.json' % (self.base_url)
-        with open(image, 'rb') as image_file:
-            encoded_image = base64.b64encode(image_file.read())
-        data = {
-            # When updated for API v1.1 use image, not banner
-            # https://dev.twitter.com/docs/api/1.1/post/account/update_profile_banner
-            # 'image': encoded_image
-            'banner': encoded_image
-        }
-        if include_entities:
-            data['include_entities'] = 1
-        if skip_status:
-            data['skip_status'] = 1
-
-        resp = self._RequestUrl(url, 'POST', data=data)
-
-        if resp.status_code in [200, 201, 202]:
-            return True
-        if resp.status_code == 400:
-            raise TwitterError({'message': "Image data could not be processed"})
-        if resp.status_code == 422:
-            raise TwitterError({'message': "The image could not be resized or is too large."})
-
-        raise TwitterError({'message': "Unkown banner image upload issue"})
-
-    def GetStreamSample(self, delimited=False, stall_warnings=True):
-        """Returns a small sample of public statuses.
-
-        Args:
-          delimited:
-            Specifies a message length. [Optional]
-          stall_warnings:
-            Set to True to have Twitter deliver stall warnings. [Optional]
-
-        Returns:
-          A Twitter stream
-        """
-        url = '%s/statuses/sample.json' % self.stream_url
-        parameters = {
-            'delimited': bool(delimited),
-            'stall_warnings': bool(stall_warnings)
-        }
-        resp = self._RequestStream(url, 'GET', data=parameters)
-        for line in resp.iter_lines():
-            if line:
-                data = self._ParseAndCheckTwitter(line.decode('utf-8'))
-                yield data
-
-    def GetStreamFilter(self,
-                        follow=None,
-                        track=None,
-                        locations=None,
-                        languages=None,
-                        delimited=None,
-                        stall_warnings=None,
-                        filter_level=None):
-        """Returns a filtered view of public statuses.
-
-        Args:
-          follow:
-            A list of user IDs to track. [Optional]
-          track:
-            A list of expressions to track. [Optional]
-          locations:
-            A list of Longitude,Latitude pairs (as strings) specifying
-            bounding boxes for the tweets' origin. [Optional]
-          delimited:
-            Specifies a message length. [Optional]
-          stall_warnings:
-            Set to True to have Twitter deliver stall warnings. [Optional]
-          languages:
-            A list of Languages.
-            Will only return Tweets that have been detected as being
-            written in the specified languages. [Optional]
-          filter_level:
-            Specifies level of filtering applied to stream.
-            Set to None, 'low' or 'medium'. [Optional]
-
-        Returns:
-          A twitter stream
-        """
-        if all((follow is None, track is None, locations is None)):
-            raise ValueError({'message': "No filter parameters specified."})
-        url = '%s/statuses/filter.json' % self.stream_url
-        data = {}
-        if follow is not None:
-            data['follow'] = ','.join(follow)
-        if track is not None:
-            data['track'] = ','.join(track)
-        if locations is not None:
-            data['locations'] = ','.join(locations)
-        if delimited is not None:
-            data['delimited'] = str(delimited)
-        if stall_warnings is not None:
-            data['stall_warnings'] = str(stall_warnings)
-        if languages is not None:
-            data['language'] = ','.join(languages)
-        if filter_level is not None:
-            data['filter_level'] = filter_level
-
-        resp = self._RequestStream(url, 'POST', data=data)
-        for line in resp.iter_lines():
-            if line:
-                data = self._ParseAndCheckTwitter(line.decode('utf-8'))
-                yield data
-
-    def GetUserStream(self,
-                      replies='all',
-                      withuser='user',
-                      track=None,
-                      locations=None,
-                      delimited=None,
-                      stall_warnings=None,
-                      stringify_friend_ids=False,
-                      filter_level=None,
-                      session=None,
-                      include_keepalive=False):
-        """Returns the data from the user stream.
-
-        Args:
-          replies:
-            Specifies whether to return additional @replies in the stream.
-            Defaults to 'all'.
-          withuser:
-            Specifies whether to return information for just the authenticating
-            user, or include messages from accounts the user follows. [Optional]
-          track:
-            A list of expressions to track. [Optional]
-          locations:
-            A list of Latitude,Longitude pairs (as strings) specifying
-            bounding boxes for the tweets' origin. [Optional]
-          delimited:
-            Specifies a message length. [Optional]
-          stall_warnings:
-            Set to True to have Twitter deliver stall warnings. [Optional]
-          stringify_friend_ids:
-            Specifies whether to send the friends list preamble as an array of
-            integers or an array of strings. [Optional]
-          filter_level:
-            Specifies level of filtering applied to stream.
-            Set to None, low or medium. [Optional]
-
-        Returns:
-          A twitter stream
-        """
-        url = 'https://userstream.twitter.com/1.1/user.json'
-        data = {}
-        if stringify_friend_ids:
-            data['stringify_friend_ids'] = 'true'
-        if replies is not None:
-            data['replies'] = replies
-        if withuser is not None:
-            data['with'] = withuser
-        if track is not None:
-            data['track'] = ','.join(track)
-        if locations is not None:
-            data['locations'] = ','.join(locations)
-        if delimited is not None:
-            data['delimited'] = str(delimited)
-        if stall_warnings is not None:
-            data['stall_warnings'] = str(stall_warnings)
-        if filter_level is not None:
-            data['filter_level'] = filter_level
-
-        resp = self._RequestStream(url, 'POST', data=data, session=session)
-        # The Twitter streaming API sends keep-alive newlines every 30s if there has not been other
-        # traffic, and specifies that streams should only be reset after three keep-alive ticks.
-        #
-        # The original implementation of this API didn't expose keep-alive signals to the user,
-        # making it difficult to determine whether the connection should be hung up or not.
-        #
-        # https://dev.twitter.com/streaming/overview/connecting
-        for line in resp.iter_lines():
-            if line:
-                data = self._ParseAndCheckTwitter(line.decode('utf-8'))
-                yield data
-            elif include_keepalive:
-                yield None
-
-    def VerifyCredentials(self, include_entities=None, skip_status=None, include_email=None):
-        """Returns a twitter.User instance if the authenticating user is valid.
-
-        Args:
-          include_entities:
-            Specifies whether to return additional @replies in the stream.
-          skip_status:
-            When set to either true, t or 1 statuses will not be included in the
-            returned user object.
-          include_email:
-            Use of this parameter requires whitelisting.
-            When set to true email will be returned in the user objects as a string.
-            If the user does not have an email address on their account, or if the
-            email address is un-verified, null will be returned. If your app is
-            not whitelisted, then the 'email' key will not be present in the json
-            response.
-
-        Returns:
-          A twitter.User instance representing that user if the
-          credentials are valid, None otherwise.
-        """
-        url = '%s/account/verify_credentials.json' % self.base_url
-        data = {
-            'include_entities': enf_type('include_entities', bool, include_entities),
-            'skip_status': enf_type('skip_status', bool, skip_status),
-            'include_email': 'true' if enf_type('include_email', bool, include_email) else 'false',
-        }
-
-        resp = self._RequestUrl(url, 'GET', data)
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        return User.NewFromJsonDict(data)
-
-    def SetCache(self, cache):
-        """Override the default cache.  Set to None to prevent caching.
-
-        Args:
-          cache:
-            An instance that supports the same API as the twitter._FileCache
-        """
-        if cache == DEFAULT_CACHE:
-            self._cache = _FileCache()
-        else:
-            self._cache = cache
-
-    def SetUrllib(self, urllib):
-        """Override the default urllib implementation.
-
-        Args:
-          urllib:
-            An instance that supports the same API as the urllib2 module
-        """
-        self._urllib = urllib
-
-    def SetCacheTimeout(self, cache_timeout):
-        """Override the default cache timeout.
-
-        Args:
-          cache_timeout:
-            Time, in seconds, that responses should be reused.
-        """
-        self._cache_timeout = cache_timeout
-
-    def SetUserAgent(self, user_agent):
-        """Override the default user agent.
-
-        Args:
-          user_agent:
-            A string that should be send to the server as the user-agent.
-        """
-        self._request_headers['User-Agent'] = user_agent
-
-    def SetXTwitterHeaders(self, client, url, version):
-        """Set the X-Twitter HTTP headers that will be sent to the server.
-
-        Args:
-          client:
-             The client name as a string.  Will be sent to the server as
-             the 'X-Twitter-Client' header.
-          url:
-             The URL of the meta.xml as a string.  Will be sent to the server
-             as the 'X-Twitter-Client-URL' header.
-          version:
-             The client version as a string.  Will be sent to the server
-             as the 'X-Twitter-Client-Version' header.
-        """
-        self._request_headers['X-Twitter-Client'] = client
-        self._request_headers['X-Twitter-Client-URL'] = url
-        self._request_headers['X-Twitter-Client-Version'] = version
-
-    def SetSource(self, source):
-        """Suggest the "from source" value to be displayed on the Twitter web site.
-
-        The value of the 'source' parameter must be first recognized by
-        the Twitter server.
-
-        New source values are authorized on a case by case basis by the
-        Twitter development team.
-
-        Args:
-          source:
-            The source name as a string.  Will be sent to the server as
-            the 'source' parameter.
-        """
-        self._default_params['source'] = source
-
-    def InitializeRateLimit(self):
-        """ Make a call to the Twitter API to get the rate limit
-        status for the currently authenticated user or application.
-
-        Returns:
-            None.
-
-        """
-        _sleep = self.sleep_on_rate_limit
-        if self.sleep_on_rate_limit:
-            self.sleep_on_rate_limit = False
-
-        url = '%s/application/rate_limit_status.json' % self.base_url
-
-        resp = self._RequestUrl(url, 'GET')  # No-Cache
-        data = self._ParseAndCheckTwitter(resp.content.decode('utf-8'))
-
-        self.sleep_on_rate_limit = _sleep
-        self.rate_limit = RateLimit(**data)
-
-    def CheckRateLimit(self, url):
-        """ Checks a URL to see the rate limit status for that endpoint.
-
-        Args:
-            url (str):
-                URL to check against the current rate limits.
-
-        Returns:
-            namedtuple: EndpointRateLimit namedtuple.
-
-        """
-        if not self.rate_limit.__dict__.get('resources', None):
-            self.InitializeRateLimit()
-
-        if url:
-            limit = self.rate_limit.get_limit(url)
-
-        return limit
-
-    def _BuildUrl(self, url, path_elements=None, extra_params=None):
-        # Break url into constituent parts
-        (scheme, netloc, path, params, query, fragment) = urlparse(url)
-
-        # Add any additional path elements to the path
-        if path_elements:
-            # Filter out the path elements that have a value of None
-            filtered_elements = [i for i in path_elements if i]
-            if not path.endswith('/'):
-                path += '/'
-            path += '/'.join(filtered_elements)
-
-        # Add any additional query parameters to the query string
-        if extra_params and len(extra_params) > 0:
-            extra_query = self._EncodeParameters(extra_params)
-            # Add it to the existing query
-            if query:
-                query += '&' + extra_query
-            else:
-                query = extra_query
-
-        # Return the rebuilt URL
-        return urlunparse((scheme, netloc, path, params, query, fragment))
-
-    def _InitializeRequestHeaders(self, request_headers):
-        if request_headers:
-            self._request_headers = request_headers
-        else:
-            self._request_headers = {}
-
-    def _InitializeUserAgent(self):
-        user_agent = 'Python-urllib/%s (python-twitter/%s)' % \
-                     (urllib_version, __version__)
-        self.SetUserAgent(user_agent)
-
-    def _InitializeDefaultParameters(self):
-        self._default_params = {}
-
-    @staticmethod
-    def _DecompressGzippedResponse(response):
-        raw_data = response.read()
-        if response.headers.get('content-encoding', None) == 'gzip':
-            url_data = gzip.GzipFile(fileobj=io.StringIO(raw_data)).read()
-        else:
-            url_data = raw_data
-        return url_data
-
-    @staticmethod
-    def _EncodeParameters(parameters):
-        """Return a string in key=value&key=value form.
-
-        Values of None are not included in the output string.
-
-        Args:
-          parameters (dict): dictionary of query parameters to be converted into a
-          string for encoding and sending to Twitter.
-
-        Returns:
-          A URL-encoded string in "key=value&key=value" form
-        """
-        if parameters is None:
-            return None
-        if not isinstance(parameters, dict):
-            raise TwitterError("`parameters` must be a dict.")
-        else:
-            params = dict()
-            for k, v in parameters.items():
-                if v is not None:
-                    if getattr(v, 'encode', None):
-                        v = v.encode('utf8')
-                    params.update({k: v})
-            return urlencode(params)
-
-    def _ParseAndCheckTwitter(self, json_data):
-        """Try and parse the JSON returned from Twitter and return
-        an empty dictionary if there is any error.
-
-        This is a purely defensive check because during some Twitter
-        network outages it will return an HTML failwhale page.
-        """
-        try:
-            data = json.loads(json_data)
-        except ValueError:
-            if "<title>Twitter / Over capacity</title>" in json_data:
-                raise TwitterError({'message': "Capacity Error"})
-            if "<title>Twitter / Error</title>" in json_data:
-                raise TwitterError({'message': "Technical Error"})
-            if "Exceeded connection limit for user" in json_data:
-                raise TwitterError({'message': "Exceeded connection limit for user"})
-            if "Error 401 Unauthorized" in json_data:
-                raise TwitterError({'message': "Unauthorized"})
-            raise TwitterError({'Unknown error': '{0}'.format(json_data)})
-        self._CheckForTwitterError(data)
-        return data
-
-    @staticmethod
-    def _CheckForTwitterError(data):
-        """Raises a TwitterError if twitter returns an error message.
-
-        Args:
-            data (dict):
-                A python dict created from the Twitter json response
-
-        Raises:
-            (twitter.TwitterError): TwitterError wrapping the twitter error
-            message if one exists.
-        """
-        # Twitter errors are relatively unlikely, so it is faster
-        # to check first, rather than try and catch the exception
-        if 'error' in data:
-            raise TwitterError(data['error'])
-        if 'errors' in data:
-            raise TwitterError(data['errors'])
-
-    def _RequestChunkedUpload(self, url, headers, data):
-        try:
-            return requests.post(
-                url,
-                headers=headers,
-                data=data,
-                auth=self.__auth,
-                timeout=self._timeout,
-                proxies=self.proxies
-            )
-        except requests.RequestException as e:
-            raise TwitterError(str(e))
-
-    def _RequestUrl(self, url, verb, data=None, json=None, enforce_auth=True):
-        """Request a url.
-
-        Args:
-            url:
-                The web location we want to retrieve.
-            verb:
-                Either POST or GET.
-            data:
-                A dict of (str, unicode) key/value pairs.
-
-        Returns:
-            A JSON object.
-        """
-        if enforce_auth:
-            if not self.__auth:
-                raise TwitterError("The twitter.Api instance must be authenticated.")
-
-            if url and self.sleep_on_rate_limit:
-                limit = self.CheckRateLimit(url)
-
-                if limit.remaining == 0:
-                    try:
-                        stime = max(int(limit.reset - time.time()) + 10, 0)
-                        logger.debug('Rate limited requesting [%s], sleeping for [%s]', url, stime)
-                        time.sleep(stime)
-                    except ValueError:
-                        pass
-
-        if not data:
-            data = {}
-
-        if verb == 'POST':
-            if data:
-                if 'media_ids' in data:
-                    url = self._BuildUrl(url, extra_params={'media_ids': data['media_ids']})
-                    resp = self._session.post(url, data=data, auth=self.__auth, timeout=self._timeout, proxies=self.proxies)
-                elif 'media' in data:
-                    resp = self._session.post(url, files=data, auth=self.__auth, timeout=self._timeout, proxies=self.proxies)
-                else:
-                    resp = self._session.post(url, data=data, auth=self.__auth, timeout=self._timeout, proxies=self.proxies)
-            elif json:
-                resp = self._session.post(url, json=json, auth=self.__auth, timeout=self._timeout, proxies=self.proxies)
-            else:
-                resp = 0  # POST request, but without data or json
-
-        elif verb == 'GET':
-            data['tweet_mode'] = self.tweet_mode
-            url = self._BuildUrl(url, extra_params=data)
-            resp = self._session.get(url, auth=self.__auth, timeout=self._timeout, proxies=self.proxies)
-
-        else:
-            resp = 0  # if not a POST or GET request
-
-        if url and self.rate_limit:
-            limit = resp.headers.get('x-rate-limit-limit', 0)
-            remaining = resp.headers.get('x-rate-limit-remaining', 0)
-            reset = resp.headers.get('x-rate-limit-reset', 0)
-
-            self.rate_limit.set_limit(url, limit, remaining, reset)
-
-        return resp
-
-    def _RequestStream(self, url, verb, data=None, session=None):
-        """Request a stream of data.
-
-           Args:
-             url:
-               The web location we want to retrieve.
-             verb:
-               Either POST or GET.
-             data:
-               A dict of (str, unicode) key/value pairs.
-
-           Returns:
-             A twitter stream.
-        """
-        session = session or requests.Session()
-
-        if verb == 'POST':
-            try:
-                return session.post(url, data=data, stream=True,
-                                    auth=self.__auth,
-                                    timeout=self._timeout,
-                                    proxies=self.proxies)
-            except requests.RequestException as e:
-                raise TwitterError(str(e))
-        if verb == 'GET':
-            url = self._BuildUrl(url, extra_params=data)
-            try:
-                return session.get(url, stream=True, auth=self.__auth,
-                                   timeout=self._timeout, proxies=self.proxies)
-            except requests.RequestException as e:
-                raise TwitterError(str(e))
-        return 0  # if not a POST or GET request
diff --git a/lib/twitter/debug.py b/lib/twitter/debug.py
deleted file mode 100644
index 4e7a5f2b..00000000
--- a/lib/twitter/debug.py
+++ /dev/null
@@ -1,65 +0,0 @@
-from twitter import Api, TwitterError
-import requests
-
-
-class Api(Api):
-    def DebugEndpoint(self, verb=None, endpoint=None, data=None):
-        """ Request a url and return raw data. For testing purposes only.
-
-        Args:
-            url:
-                The web location we want to retrieve.
-            verb:
-                Either POST or GET.
-            data:
-                A dict of (str, unicode) key/value pairs.
-
-        Returns:
-            data
-        """
-
-        url = "{0}{1}".format(self.base_url, endpoint)
-
-        if verb == 'POST':
-            if 'media_ids' in data:
-                url = self._BuildUrl(
-                    url,
-                    extra_params={
-                        'media_ids': data['media_ids']
-                    }
-                )
-                print('POSTing url:', url)
-            if 'media' in data:
-                try:
-                    print('POSTing url:', url)
-                    raw_data = requests.post(
-                        url,
-                        files=data,
-                        auth=self.__auth,
-                        timeout=self._timeout
-                    )
-                except requests.RequestException as e:
-                    raise TwitterError(str(e))
-            else:
-                try:
-                    print('POSTing url:', url)
-                    raw_data = requests.post(
-                        url,
-                        data=data,
-                        auth=self.__auth,
-                        timeout=self._timeout
-                    )
-                except requests.RequestException as e:
-                    raise TwitterError(str(e))
-        if verb == 'GET':
-            url = self._BuildUrl(url, extra_params=data)
-            print('GETting url:', url)
-            try:
-                raw_data = requests.get(
-                    url,
-                    auth=self.__auth,
-                    timeout=self._timeout)
-
-            except requests.RequestException as e:
-                raise TwitterError(str(e))
-        return raw_data._content
diff --git a/lib/twitter/error.py b/lib/twitter/error.py
deleted file mode 100644
index 2f3a2032..00000000
--- a/lib/twitter/error.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env python
-
-
-class TwitterError(Exception):
-    """Base class for Twitter errors"""
-
-    @property
-    def message(self):
-        '''Returns the first argument used to construct this error.'''
-        return self.args[0]
-
-
-class PythonTwitterDeprecationWarning(DeprecationWarning):
-    """Base class for python-twitter deprecation warnings"""
-    pass
-
-
-class PythonTwitterDeprecationWarning330(PythonTwitterDeprecationWarning):
-    """Warning for features to be removed in version 3.3.0"""
-    pass
-
-
-class PythonTwitterDeprecationWarning340(PythonTwitterDeprecationWarning):
-    """Warning for features to be removed in version 3.4.0"""
-    pass
diff --git a/lib/twitter/models.py b/lib/twitter/models.py
deleted file mode 100644
index e8974ebe..00000000
--- a/lib/twitter/models.py
+++ /dev/null
@@ -1,531 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-import json
-from calendar import timegm
-
-try:
-    from rfc822 import parsedate
-except ImportError:
-    from email.utils import parsedate
-
-
-class TwitterModel(object):
-
-    """ Base class from which all twitter models will inherit. """
-
-    def __init__(self, **kwargs):
-        self.param_defaults = {}
-
-    def __str__(self):
-        """ Returns a string representation of TwitterModel. By default
-        this is the same as AsJsonString(). """
-        return self.AsJsonString()
-
-    def __eq__(self, other):
-        return other and self.AsDict() == other.AsDict()
-
-    def __ne__(self, other):
-        return not self.__eq__(other)
-
-    def __hash__(self):
-        if hasattr(self, 'id'):
-            return hash(self.id)
-        else:
-            raise TypeError('unhashable type: {} (no id attribute)'
-                            .format(type(self)))
-
-    def AsJsonString(self, ensure_ascii=True):
-        """ Returns the TwitterModel as a JSON string based on key/value
-        pairs returned from the AsDict() method. """
-        return json.dumps(self.AsDict(), ensure_ascii=ensure_ascii, sort_keys=True)
-
-    def AsDict(self):
-        """ Create a dictionary representation of the object. Please see inline
-        comments on construction when dictionaries contain TwitterModels. """
-        data = {}
-
-        for (key, value) in self.param_defaults.items():
-
-            # If the value is a list, we need to create a list to hold the
-            # dicts created by an object supporting the AsDict() method,
-            # i.e., if it inherits from TwitterModel. If the item in the list
-            # doesn't support the AsDict() method, then we assign the value
-            # directly. An example being a list of Media objects contained
-            # within a Status object.
-            if isinstance(getattr(self, key, None), (list, tuple, set)):
-                data[key] = list()
-                for subobj in getattr(self, key, None):
-                    if getattr(subobj, 'AsDict', None):
-                        data[key].append(subobj.AsDict())
-                    else:
-                        data[key].append(subobj)
-
-            # Not a list, *but still a subclass of TwitterModel* and
-            # and we can assign the data[key] directly with the AsDict()
-            # method of the object. An example being a Status object contained
-            # within a User object.
-            elif getattr(getattr(self, key, None), 'AsDict', None):
-                data[key] = getattr(self, key).AsDict()
-
-            # If the value doesn't have an AsDict() method, i.e., it's not
-            # something that subclasses TwitterModel, then we can use direct
-            # assigment.
-            elif getattr(self, key, None):
-                data[key] = getattr(self, key, None)
-        return data
-
-    @classmethod
-    def NewFromJsonDict(cls, data, **kwargs):
-        """ Create a new instance based on a JSON dict. Any kwargs should be
-        supplied by the inherited, calling class.
-
-        Args:
-            data: A JSON dict, as converted from the JSON in the twitter API.
-
-        """
-
-        json_data = data.copy()
-        if kwargs:
-            for key, val in kwargs.items():
-                json_data[key] = val
-
-        c = cls(**json_data)
-        c._json = data
-        return c
-
-
-class Media(TwitterModel):
-
-    """A class representing the Media component of a tweet. """
-
-    def __init__(self, **kwargs):
-        self.param_defaults = {
-            'display_url': None,
-            'expanded_url': None,
-            'ext_alt_text': None,
-            'id': None,
-            'media_url': None,
-            'media_url_https': None,
-            'sizes': None,
-            'type': None,
-            'url': None,
-            'video_info': None,
-        }
-
-        for (param, default) in self.param_defaults.items():
-            setattr(self, param, kwargs.get(param, default))
-
-    def __repr__(self):
-        return "Media(ID={media_id}, Type={media_type}, DisplayURL='{url}')".format(
-            media_id=self.id,
-            media_type=self.type,
-            url=self.display_url)
-
-
-class List(TwitterModel):
-
-    """A class representing the List structure used by the twitter API. """
-
-    def __init__(self, **kwargs):
-        self.param_defaults = {
-            'description': None,
-            'following': None,
-            'full_name': None,
-            'id': None,
-            'member_count': None,
-            'mode': None,
-            'name': None,
-            'slug': None,
-            'subscriber_count': None,
-            'uri': None,
-            'user': None,
-        }
-
-        for (param, default) in self.param_defaults.items():
-            setattr(self, param, kwargs.get(param, default))
-
-        if 'user' in kwargs:
-            self.user = User.NewFromJsonDict(kwargs.get('user'))
-
-    def __repr__(self):
-        return "List(ID={list_id}, FullName={full_name!r}, Slug={slug}, User={user})".format(
-            list_id=self.id,
-            full_name=self.full_name,
-            slug=self.slug,
-            user=self.user.screen_name)
-
-
-class Category(TwitterModel):
-
-    """A class representing the suggested user category structure. """
-
-    def __init__(self, **kwargs):
-        self.param_defaults = {
-            'name': None,
-            'size': None,
-            'slug': None,
-        }
-
-        for (param, default) in self.param_defaults.items():
-            setattr(self, param, kwargs.get(param, default))
-
-    def __repr__(self):
-        return "Category(Name={name!r}, Slug={slug}, Size={size})".format(
-            name=self.name,
-            slug=self.slug,
-            size=self.size)
-
-
-class DirectMessage(TwitterModel):
-
-    """A class representing a Direct Message. """
-
-    def __init__(self, **kwargs):
-        self.param_defaults = {
-            'created_at': None,
-            'id': None,
-            'recipient_id': None,
-            'sender_id': None,
-            'text': None,
-        }
-
-        for (param, default) in self.param_defaults.items():
-            setattr(self, param, kwargs.get(param, default))
-
-    def __repr__(self):
-        if self.text and len(self.text) > 140:
-            text = "{text}[...]".format(text=self.text[:140])
-        else:
-            text = self.text
-        return "DirectMessage(ID={dm_id}, Sender={sender}, Created={time}, Text='{text!r}')".format(
-            dm_id=self.id,
-            sender=self.sender_id,
-            time=self.created_at,
-            text=text)
-
-
-class Trend(TwitterModel):
-
-    """ A class representing a trending topic. """
-
-    def __init__(self, **kwargs):
-        self.param_defaults = {
-            'events': None,
-            'name': None,
-            'promoted_content': None,
-            'query': None,
-            'timestamp': None,
-            'url': None,
-            'tweet_volume': None,
-        }
-
-        for (param, default) in self.param_defaults.items():
-            setattr(self, param, kwargs.get(param, default))
-
-    def __repr__(self):
-        return "Trend(Name={0!r}, Time={1}, URL={2})".format(
-            self.name,
-            self.timestamp,
-            self.url)
-
-    @property
-    def volume(self):
-        return self.tweet_volume
-
-
-class Hashtag(TwitterModel):
-
-    """ A class representing a twitter hashtag. """
-
-    def __init__(self, **kwargs):
-        self.param_defaults = {
-            'text': None
-        }
-
-        for (param, default) in self.param_defaults.items():
-            setattr(self, param, kwargs.get(param, default))
-
-    def __repr__(self):
-        return "Hashtag(Text={text!r})".format(
-            text=self.text)
-
-
-class Url(TwitterModel):
-
-    """ A class representing an URL contained in a tweet. """
-
-    def __init__(self, **kwargs):
-        self.param_defaults = {
-            'expanded_url': None,
-            'url': None}
-
-        for (param, default) in self.param_defaults.items():
-            setattr(self, param, kwargs.get(param, default))
-
-    def __repr__(self):
-        return "URL(URL={url}, ExpandedURL={eurl})".format(
-            url=self.url,
-            eurl=self.expanded_url)
-
-
-class UserStatus(TwitterModel):
-
-    """ A class representing the UserStatus structure. This is an abbreviated
-    form of the twitter.User object. """
-
-    _connections = {'following': False,
-                    'followed_by': False,
-                    'following_received': False,
-                    'following_requested': False,
-                    'blocking': False,
-                    'muting': False}
-
-    def __init__(self, **kwargs):
-        self.param_defaults = {
-            'blocking': False,
-            'followed_by': False,
-            'following': False,
-            'following_received': False,
-            'following_requested': False,
-            'id': None,
-            'id_str': None,
-            'muting': False,
-            'name': None,
-            'screen_name': None,
-        }
-
-        for (param, default) in self.param_defaults.items():
-            setattr(self, param, kwargs.get(param, default))
-
-        if 'connections' in kwargs:
-            for param in self._connections:
-                if param in kwargs['connections']:
-                    setattr(self, param, True)
-
-    @property
-    def connections(self):
-        return {'following': self.following,
-                'followed_by': self.followed_by,
-                'following_received': self.following_received,
-                'following_requested': self.following_requested,
-                'blocking': self.blocking,
-                'muting': self.muting}
-
-    def __repr__(self):
-        connections = [param for param in self.connections if getattr(self, param)]
-        return "UserStatus(ID={uid}, ScreenName={sn}, Connections=[{conn}])".format(
-            uid=self.id,
-            sn=self.screen_name,
-            conn=", ".join(connections))
-
-
-class User(TwitterModel):
-
-    """A class representing the User structure. """
-
-    def __init__(self, **kwargs):
-        self.param_defaults = {
-            'contributors_enabled': None,
-            'created_at': None,
-            'default_profile': None,
-            'default_profile_image': None,
-            'description': None,
-            'email': None,
-            'favourites_count': None,
-            'followers_count': None,
-            'following': None,
-            'friends_count': None,
-            'geo_enabled': None,
-            'id': None,
-            'id_str': None,
-            'lang': None,
-            'listed_count': None,
-            'location': None,
-            'name': None,
-            'notifications': None,
-            'profile_background_color': None,
-            'profile_background_image_url': None,
-            'profile_background_image_url_https': None,
-            'profile_background_tile': None,
-            'profile_banner_url': None,
-            'profile_image_url': None,
-            'profile_image_url_https': None,
-            'profile_link_color': None,
-            'profile_sidebar_border_color': None,
-            'profile_sidebar_fill_color': None,
-            'profile_text_color': None,
-            'profile_use_background_image': None,
-            'protected': None,
-            'screen_name': None,
-            'status': None,
-            'statuses_count': None,
-            'time_zone': None,
-            'url': None,
-            'utc_offset': None,
-            'verified': None,
-            'withheld_in_countries': None,
-            'withheld_scope': None,
-        }
-
-        for (param, default) in self.param_defaults.items():
-            setattr(self, param, kwargs.get(param, default))
-
-    def __repr__(self):
-        return "User(ID={uid}, ScreenName={sn})".format(
-            uid=self.id,
-            sn=self.screen_name)
-
-    @classmethod
-    def NewFromJsonDict(cls, data, **kwargs):
-        from twitter import Status
-        if data.get('status', None):
-            status = Status.NewFromJsonDict(data.get('status'))
-            return super(cls, cls).NewFromJsonDict(data=data, status=status)
-        else:
-            return super(cls, cls).NewFromJsonDict(data=data)
-
-
-class Status(TwitterModel):
-    """A class representing the Status structure used by the twitter API.
-    """
-
-    def __init__(self, **kwargs):
-        self.param_defaults = {
-            'contributors': None,
-            'coordinates': None,
-            'created_at': None,
-            'current_user_retweet': None,
-            'favorite_count': None,
-            'favorited': None,
-            'full_text': None,
-            'geo': None,
-            'hashtags': None,
-            'id': None,
-            'id_str': None,
-            'in_reply_to_screen_name': None,
-            'in_reply_to_status_id': None,
-            'in_reply_to_user_id': None,
-            'lang': None,
-            'location': None,
-            'media': None,
-            'place': None,
-            'possibly_sensitive': None,
-            'quoted_status': None,
-            'quoted_status_id': None,
-            'quoted_status_id_str': None,
-            'retweet_count': None,
-            'retweeted': None,
-            'retweeted_status': None,
-            'scopes': None,
-            'source': None,
-            'text': None,
-            'truncated': None,
-            'urls': None,
-            'user': None,
-            'user_mentions': None,
-            'withheld_copyright': None,
-            'withheld_in_countries': None,
-            'withheld_scope': None,
-        }
-
-        for (param, default) in self.param_defaults.items():
-            setattr(self, param, kwargs.get(param, default))
-
-        if kwargs.get('full_text', None):
-            self.tweet_mode = 'extended'
-        else:
-            self.tweet_mode = 'compatibility'
-
-    @property
-    def created_at_in_seconds(self):
-        """ Get the time this status message was posted, in seconds since
-        the epoch (1 Jan 1970).
-
-        Returns:
-            int: The time this status message was posted, in seconds since
-            the epoch.
-        """
-        return timegm(parsedate(self.created_at))
-
-    def __repr__(self):
-        """ A string representation of this twitter.Status instance.
-        The return value is the ID of status, username and datetime.
-
-        Returns:
-            string: A string representation of this twitter.Status instance with
-            the ID of status, username and datetime.
-        """
-        if self.tweet_mode == 'extended':
-            text = self.full_text
-        else:
-            text = self.text
-        if self.user:
-            return "Status(ID={0}, ScreenName={1}, Created={2}, Text={3!r})".format(
-                self.id,
-                self.user.screen_name,
-                self.created_at,
-                text)
-        else:
-            return u"Status(ID={0}, Created={1}, Text={2!r})".format(
-                self.id,
-                self.created_at,
-                text)
-
-    @classmethod
-    def NewFromJsonDict(cls, data, **kwargs):
-        """ Create a new instance based on a JSON dict.
-
-        Args:
-            data: A JSON dict, as converted from the JSON in the twitter API
-
-        Returns:
-            A twitter.Status instance
-        """
-        current_user_retweet = None
-        hashtags = None
-        media = None
-        quoted_status = None
-        retweeted_status = None
-        urls = None
-        user = None
-        user_mentions = None
-
-        # for loading extended tweets from the streaming API.
-        if 'extended_tweet' in data:
-            for k, v in data['extended_tweet'].items():
-                data[k] = v
-
-        if 'user' in data:
-            user = User.NewFromJsonDict(data['user'])
-        if 'retweeted_status' in data:
-            retweeted_status = Status.NewFromJsonDict(data['retweeted_status'])
-        if 'current_user_retweet' in data:
-            current_user_retweet = data['current_user_retweet']['id']
-        if 'quoted_status' in data:
-            quoted_status = Status.NewFromJsonDict(data.get('quoted_status'))
-
-        if 'entities' in data:
-            if 'urls' in data['entities']:
-                urls = [Url.NewFromJsonDict(u) for u in data['entities']['urls']]
-            if 'user_mentions' in data['entities']:
-                user_mentions = [User.NewFromJsonDict(u) for u in data['entities']['user_mentions']]
-            if 'hashtags' in data['entities']:
-                hashtags = [Hashtag.NewFromJsonDict(h) for h in data['entities']['hashtags']]
-            if 'media' in data['entities']:
-                media = [Media.NewFromJsonDict(m) for m in data['entities']['media']]
-
-        # the new extended entities
-        if 'extended_entities' in data:
-            if 'media' in data['extended_entities']:
-                media = [Media.NewFromJsonDict(m) for m in data['extended_entities']['media']]
-
-        return super(cls, cls).NewFromJsonDict(data=data,
-                                               current_user_retweet=current_user_retweet,
-                                               hashtags=hashtags,
-                                               media=media,
-                                               quoted_status=quoted_status,
-                                               retweeted_status=retweeted_status,
-                                               urls=urls,
-                                               user=user,
-                                               user_mentions=user_mentions)
diff --git a/lib/twitter/parse_tweet.py b/lib/twitter/parse_tweet.py
deleted file mode 100644
index 70e1c7ef..00000000
--- a/lib/twitter/parse_tweet.py
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env python
-
-import re
-
-
-class Emoticons:
-    POSITIVE = ["*O", "*-*", "*O*", "*o*", "* *",
-                ":P", ":D", ":d", ":p",
-                ";P", ";D", ";d", ";p",
-                ":-)", ";-)", ":=)", ";=)",
-                ":<)", ":>)", ";>)", ";=)",
-                "=}", ":)", "(:;)",
-                "(;", ":}", "{:", ";}",
-                "{;:]",
-                "[;", ":')", ";')", ":-3",
-                "{;", ":]",
-                ";-3", ":-x", ";-x", ":-X",
-                ";-X", ":-}", ";-=}", ":-]",
-                ";-]", ":-.)",
-                "^_^", "^-^"]
-
-    NEGATIVE = [":(", ";(", ":'(",
-                "=(", "={", "):", ");",
-                ")':", ")';", ")=", "}=",
-                ";-{{", ";-{", ":-{{", ":-{",
-                ":-(", ";-(",
-                ":,)", ":'{",
-                "[:", ";]"
-                ]
-
-
-class ParseTweet(object):
-    # compile once on import
-    regexp = {"RT": "^RT", "MT": r"^MT", "ALNUM": r"(@[a-zA-Z0-9_]+)",
-              "HASHTAG": r"(#[\w\d]+)", "URL": r"([https://|http://]?[a-zA-Z\d\/]+[\.]+[a-zA-Z\d\/\.]+)",
-              "SPACES": r"\s+"}
-    regexp = dict((key, re.compile(value)) for key, value in regexp.items())
-
-    def __init__(self, timeline_owner, tweet):
-        """ timeline_owner : twitter handle of user account. tweet - 140 chars from feed; object does all computation on construction
-            properties:
-            RT, MT - boolean
-            URLs - list of URL
-            Hashtags - list of tags
-        """
-        self.Owner = timeline_owner
-        self.tweet = tweet
-        self.UserHandles = ParseTweet.getUserHandles(tweet)
-        self.Hashtags = ParseTweet.getHashtags(tweet)
-        self.URLs = ParseTweet.getURLs(tweet)
-        self.RT = ParseTweet.getAttributeRT(tweet)
-        self.MT = ParseTweet.getAttributeMT(tweet)
-        self.Emoticon = ParseTweet.getAttributeEmoticon(tweet)
-
-        # additional intelligence
-        if (self.RT and len(self.UserHandles) > 0):  # change the owner of tweet?
-            self.Owner = self.UserHandles[0]
-        return
-
-    def __str__(self):
-        """ for display method """
-        return "owner %s, urls: %d, hashtags %d, user_handles %d, len_tweet %d, RT = %s, MT = %s" % \
-               (self.Owner, len(self.URLs), len(self.Hashtags), len(self.UserHandles), len(self.tweet), self.RT, self.MT)
-
-    @staticmethod
-    def getAttributeEmoticon(tweet):
-        """ see if tweet is contains any emoticons, +ve, -ve or neutral """
-        emoji = list()
-        for tok in re.split(ParseTweet.regexp["SPACES"], tweet.strip()):
-            if tok in Emoticons.POSITIVE:
-                emoji.append(tok)
-                continue
-            if tok in Emoticons.NEGATIVE:
-                emoji.append(tok)
-        return emoji
-
-    @staticmethod
-    def getAttributeRT(tweet):
-        """ see if tweet is a RT """
-        return re.search(ParseTweet.regexp["RT"], tweet.strip()) is not None
-
-    @staticmethod
-    def getAttributeMT(tweet):
-        """ see if tweet is a MT """
-        return re.search(ParseTweet.regexp["MT"], tweet.strip()) is not None
-
-    @staticmethod
-    def getUserHandles(tweet):
-        """ given a tweet we try and extract all user handles in order of occurrence"""
-        return re.findall(ParseTweet.regexp["ALNUM"], tweet)
-
-    @staticmethod
-    def getHashtags(tweet):
-        """ return all hashtags"""
-        return re.findall(ParseTweet.regexp["HASHTAG"], tweet)
-
-    @staticmethod
-    def getURLs(tweet):
-        r""" URL : [http://]?[\w\.?/]+"""
-        return re.findall(ParseTweet.regexp["URL"], tweet)
diff --git a/lib/twitter/ratelimit.py b/lib/twitter/ratelimit.py
deleted file mode 100644
index 3a717b38..00000000
--- a/lib/twitter/ratelimit.py
+++ /dev/null
@@ -1,191 +0,0 @@
-from collections import namedtuple
-import re
-try:
-    from urllib.parse import urlparse
-except ImportError:
-    from urlparse import urlparse
-
-from twitter.twitter_utils import enf_type
-
-EndpointRateLimit = namedtuple('EndpointRateLimit',
-                               ['limit', 'remaining', 'reset'])
-
-ResourceEndpoint = namedtuple('ResourceEndpoint', ['regex', 'resource'])
-
-
-GEO_ID_PLACE_ID = ResourceEndpoint(re.compile(r'/geo/id/\d+'), "/geo/id/:place_id")
-SAVED_SEARCHES_DESTROY_ID = ResourceEndpoint(re.compile(r'/saved_searches/destroy/\d+'), "/saved_searches/destroy/:id")
-SAVED_SEARCHES_SHOW_ID = ResourceEndpoint(re.compile(r'/saved_searches/show/\d+'), "/saved_searches/show/:id")
-STATUSES_RETWEETS_ID = ResourceEndpoint(re.compile(r'/statuses/retweets/\d+'), "/statuses/retweets/:id")
-STATUSES_SHOW_ID = ResourceEndpoint(re.compile(r'/statuses/show'), "/statuses/show/:id")
-USERS_SHOW_ID = ResourceEndpoint(re.compile(r'/users/show'), "/users/show/:id")
-USERS_SUGGESTIONS_SLUG = ResourceEndpoint(re.compile(r'/users/suggestions/\w+$'), "/users/suggestions/:slug")
-USERS_SUGGESTIONS_SLUG_MEMBERS = ResourceEndpoint(re.compile(r'/users/suggestions/.+/members'), "/users/suggestions/:slug/members")
-
-NON_STANDARD_ENDPOINTS = [
-    GEO_ID_PLACE_ID,
-    SAVED_SEARCHES_DESTROY_ID,
-    SAVED_SEARCHES_SHOW_ID,
-    STATUSES_RETWEETS_ID,
-    STATUSES_SHOW_ID,
-    USERS_SHOW_ID,
-    USERS_SUGGESTIONS_SLUG,
-    USERS_SUGGESTIONS_SLUG_MEMBERS,
-]
-
-
-class RateLimit(object):
-
-    """ Object to hold the rate limit status of various endpoints for
-    the twitter.Api object.
-
-    This object is generally attached to the API as Api.rate_limit, but is not
-    created until the user makes a method call that uses _RequestUrl() or calls
-    Api.InitializeRateLimit(), after which it get created and populated with
-    rate limit data from Twitter.
-
-    Calling Api.InitializeRateLimit() populates the object with all of the
-    rate limits for the endpoints defined by Twitter; more info is available
-    here:
-
-        https://dev.twitter.com/rest/public/rate-limits
-
-        https://dev.twitter.com/rest/public/rate-limiting
-
-        https://dev.twitter.com/rest/reference/get/application/rate_limit_status
-
-    Once a resource (i.e., an endpoint) has been requested, Twitter's response
-    will contain the current rate limit status as part of the headers, i.e.::
-
-        x-rate-limit-limit
-        x-rate-limit-remaining
-        x-rate-limit-reset
-
-    ``limit`` is the generic limit for that endpoint, ``remaining`` is how many
-    more times you can make a call to that endpoint, and ``reset`` is the time
-    (in seconds since the epoch) until remaining resets to its default for that
-    endpoint.
-
-    Generally speaking, each endpoint has a 15-minute reset time and endpoints
-    can either make 180 or 15 requests per window. According to Twitter, any
-    endpoint not defined in the rate limit chart or the response from a GET
-    request to ``application/rate_limit_status.json`` should be assumed to be
-    15 requests per 15 minutes.
-
-    """
-
-    def __init__(self, **kwargs):
-        """ Instantiates the RateLimitObject. Takes a json dict as
-        kwargs and maps to the object's dictionary. So for something like:
-
-        {"resources": {
-                "help": {
-                    /help/privacy": {
-                        "limit": 15,
-                        "remaining": 15,
-                        "reset": 1452254278
-                    }
-                }
-            }
-        }
-
-        the RateLimit object will have an attribute 'resources' from which you
-        can perform a lookup like:
-
-            api.rate_limit.get('help').get('/help/privacy')
-
-        and a dictionary of limit, remaining, and reset will be returned.
-
-        """
-        self.__dict__['resources'] = {}
-        self.__dict__.update(kwargs)
-
-    @staticmethod
-    def url_to_resource(url):
-        """ Take a fully qualified URL and attempts to return the rate limit
-        resource family corresponding to it. For example:
-
-            >>> RateLimit.url_to_resource('https://api.twitter.com/1.1/statuses/lookup.json?id=317')
-            >>> '/statuses/lookup'
-
-        Args:
-            url (str): URL to convert to a resource family.
-
-        Returns:
-            string: Resource family corresponding to the URL.
-        """
-        resource = urlparse(url).path.replace('/1.1', '').replace('.json', '')
-        for non_std_endpoint in NON_STANDARD_ENDPOINTS:
-            if re.match(non_std_endpoint.regex, resource):
-                return non_std_endpoint.resource
-        return resource
-
-    def set_unknown_limit(self, url, limit, remaining, reset):
-        return self.set_limit(url, limit, remaining, reset)
-
-    def set_limit(self, url, limit, remaining, reset):
-        """ If a resource family is unknown, add it to the object's
-        dictionary. This is to deal with new endpoints being added to
-        the API, but not necessarily to the information returned by
-        ``/account/rate_limit_status.json`` endpoint.
-
-        For example, if Twitter were to add an endpoint
-        ``/puppies/lookup.json``, the RateLimit object would create a resource
-        family ``puppies`` and add ``/puppies/lookup`` as the endpoint, along
-        with whatever limit, remaining hits available, and reset time would be
-        applicable to that resource+endpoint pair.
-
-        Args:
-            url (str):
-                URL of the endpoint being fetched.
-            limit (int):
-                Max number of times a user or app can hit the endpoint
-                before being rate limited.
-            remaining (int):
-                Number of times a user or app can access the endpoint
-                before being rate limited.
-            reset (int):
-                Epoch time at which the rate limit window will reset.
-        """
-        endpoint = self.url_to_resource(url)
-        resource_family = endpoint.split('/')[1]
-        new_endpoint = {endpoint: {
-            "limit": enf_type('limit', int, limit),
-            "remaining": enf_type('remaining', int, remaining),
-            "reset": enf_type('reset', int, reset)
-        }}
-
-        if not self.resources.get(resource_family, None):
-            self.resources[resource_family] = {}
-
-        self.__dict__['resources'][resource_family].update(new_endpoint)
-
-        return self.get_limit(url)
-
-    def get_limit(self, url):
-        """ Gets a EndpointRateLimit object for the given url.
-
-        Args:
-            url (str, optional):
-                URL of the endpoint for which to return the rate limit
-                status.
-
-        Returns:
-            namedtuple: EndpointRateLimit object containing rate limit
-            information.
-        """
-        endpoint = self.url_to_resource(url)
-        resource_family = endpoint.split('/')[1]
-
-        try:
-            family_rates = self.resources.get(resource_family).get(endpoint)
-        except AttributeError:
-            return EndpointRateLimit(limit=15, remaining=15, reset=0)
-
-        if not family_rates:
-            self.set_unknown_limit(url, limit=15, remaining=15, reset=0)
-            return EndpointRateLimit(limit=15, remaining=15, reset=0)
-
-        return EndpointRateLimit(family_rates['limit'],
-                                 family_rates['remaining'],
-                                 family_rates['reset'])
diff --git a/lib/twitter/twitter_utils.py b/lib/twitter/twitter_utils.py
deleted file mode 100644
index b402ae63..00000000
--- a/lib/twitter/twitter_utils.py
+++ /dev/null
@@ -1,321 +0,0 @@
-# encoding: utf-8
-from __future__ import unicode_literals
-
-import mimetypes
-import os
-import re
-import sys
-from tempfile import NamedTemporaryFile
-from unicodedata import normalize
-
-try:
-    from urllib.parse import urlparse
-except ImportError:
-    from urlparse import urlparse
-
-import requests
-from twitter import TwitterError
-import twitter
-
-if sys.version_info < (3,):
-    range = xrange
-
-if sys.version_info > (3,):
-    unicode = str
-
-CHAR_RANGES = [
-    range(0, 4351),
-    range(8192, 8205),
-    range(8208, 8223),
-    range(8242, 8247)]
-
-TLDS = [
-    "ac", "ad", "ae", "af", "ag", "ai", "al", "am", "an", "ao", "aq", "ar",
-    "as", "at", "au", "aw", "ax", "az", "ba", "bb", "bd", "be", "bf", "bg",
-    "bh", "bi", "bj", "bl", "bm", "bn", "bo", "bq", "br", "bs", "bt", "bv",
-    "bw", "by", "bz", "ca", "cc", "cd", "cf", "cg", "ch", "ci", "ck", "cl",
-    "cm", "cn", "co", "cr", "cu", "cv", "cw", "cx", "cy", "cz", "de", "dj",
-    "dk", "dm", "do", "dz", "ec", "ee", "eg", "eh", "er", "es", "et", "eu",
-    "fi", "fj", "fk", "fm", "fo", "fr", "ga", "gb", "gd", "ge", "gf", "gg",
-    "gh", "gi", "gl", "gm", "gn", "gp", "gq", "gr", "gs", "gt", "gu", "gw",
-    "gy", "hk", "hm", "hn", "hr", "ht", "hu", "id", "ie", "il", "im", "in",
-    "io", "iq", "ir", "is", "it", "je", "jm", "jo", "jp", "ke", "kg", "kh",
-    "ki", "km", "kn", "kp", "kr", "kw", "ky", "kz", "la", "lb", "lc", "li",
-    "lk", "lr", "ls", "lt", "lu", "lv", "ly", "ma", "mc", "md", "me", "mf",
-    "mg", "mh", "mk", "ml", "mm", "mn", "mo", "mp", "mq", "mr", "ms", "mt",
-    "mu", "mv", "mw", "mx", "my", "mz", "na", "nc", "ne", "nf", "ng", "ni",
-    "nl", "no", "np", "nr", "nu", "nz", "om", "pa", "pe", "pf", "pg", "ph",
-    "pk", "pl", "pm", "pn", "pr", "ps", "pt", "pw", "py", "qa", "re", "ro",
-    "rs", "ru", "rw", "sa", "sb", "sc", "sd", "se", "sg", "sh", "si", "sj",
-    "sk", "sl", "sm", "sn", "so", "sr", "ss", "st", "su", "sv", "sx", "sy",
-    "sz", "tc", "td", "tf", "tg", "th", "tj", "tk", "tl", "tm", "tn", "to",
-    "tp", "tr", "tt", "tv", "tw", "tz", "ua", "ug", "uk", "um", "us", "uy",
-    "uz", "va", "vc", "ve", "vg", "vi", "vn", "vu", "wf", "ws", "ye", "yt",
-    "za", "zm", "zw", "ελ", "бел", "мкд", "мон", "рф", "�рб", "укр", "қаз",
-    "հայ", "الاردن", "الجزائر", "السعودية", "المغرب", "امارات", "ایران", "بھارت",
-    "تونس", "سودان", "سورية", "عراق", "عمان", "�لسطين", "قطر", "مصر",
-    "مليسيا", "پاکستان", "भारत", "বাংলা", "ভারত", "ਭਾਰਤ", "ભારત",
-    "இந�தியா", "இலங�கை", "சிங�கப�பூர�", "భారత�", "ලංක�", "ไทย",
-    "გე", "中国", "中國", "�湾", "��", "新加�", "澳門", "香港", "한국", "neric:",
-    "abb", "abbott", "abogado", "academy", "accenture", "accountant",
-    "accountants", "aco", "active", "actor", "ads", "adult", "aeg", "aero",
-    "afl", "agency", "aig", "airforce", "airtel", "allfinanz", "alsace",
-    "amsterdam", "android", "apartments", "app", "aquarelle", "archi", "army",
-    "arpa", "asia", "associates", "attorney", "auction", "audio", "auto",
-    "autos", "axa", "azure", "band", "bank", "bar", "barcelona", "barclaycard",
-    "barclays", "bargains", "bauhaus", "bayern", "bbc", "bbva", "bcn", "beer",
-    "bentley", "berlin", "best", "bet", "bharti", "bible", "bid", "bike",
-    "bing", "bingo", "bio", "biz", "black", "blackfriday", "bloomberg", "blue",
-    "bmw", "bnl", "bnpparibas", "boats", "bond", "boo", "boots", "boutique",
-    "bradesco", "bridgestone", "broker", "brother", "brussels", "budapest",
-    "build", "builders", "business", "buzz", "bzh", "cab", "cafe", "cal",
-    "camera", "camp", "cancerresearch", "canon", "capetown", "capital",
-    "caravan", "cards", "care", "career", "careers", "cars", "cartier",
-    "casa", "cash", "casino", "cat", "catering", "cba", "cbn", "ceb", "center",
-    "ceo", "cern", "cfa", "cfd", "chanel", "channel", "chat", "cheap",
-    "chloe", "christmas", "chrome", "church", "cisco", "citic", "city",
-    "claims", "cleaning", "click", "clinic", "clothing", "cloud", "club",
-    "coach", "codes", "coffee", "college", "cologne", "com", "commbank",
-    "community", "company", "computer", "condos", "construction", "consulting",
-    "contractors", "cooking", "cool", "coop", "corsica", "country", "coupons",
-    "courses", "credit", "creditcard", "cricket", "crown", "crs", "cruises",
-    "cuisinella", "cymru", "cyou", "dabur", "dad", "dance", "date", "dating",
-    "datsun", "day", "dclk", "deals", "degree", "delivery", "delta",
-    "democrat", "dental", "dentist", "desi", "design", "dev", "diamonds",
-    "diet", "digital", "direct", "directory", "discount", "dnp", "docs",
-    "dog", "doha", "domains", "doosan", "download", "drive", "durban", "dvag",
-    "earth", "eat", "edu", "education", "email", "emerck", "energy",
-    "engineer", "engineering", "enterprises", "epson", "equipment", "erni",
-    "esq", "estate", "eurovision", "eus", "events", "everbank", "exchange",
-    "expert", "exposed", "express", "fage", "fail", "faith", "family", "fan",
-    "fans", "farm", "fashion", "feedback", "film", "finance", "financial",
-    "firmdale", "fish", "fishing", "fit", "fitness", "flights", "florist",
-    "flowers", "flsmidth", "fly", "foo", "football", "forex", "forsale",
-    "forum", "foundation", "frl", "frogans", "fund", "furniture", "futbol",
-    "fyi", "gal", "gallery", "game", "garden", "gbiz", "gdn", "gent",
-    "genting", "ggee", "gift", "gifts", "gives", "giving", "glass", "gle",
-    "global", "globo", "gmail", "gmo", "gmx", "gold", "goldpoint", "golf",
-    "goo", "goog", "google", "gop", "gov", "graphics", "gratis", "green",
-    "gripe", "group", "guge", "guide", "guitars", "guru", "hamburg", "hangout",
-    "haus", "healthcare", "help", "here", "hermes", "hiphop", "hitachi", "hiv",
-    "hockey", "holdings", "holiday", "homedepot", "homes", "honda", "horse",
-    "host", "hosting", "hoteles", "hotmail", "house", "how", "hsbc", "ibm",
-    "icbc", "ice", "icu", "ifm", "iinet", "immo", "immobilien", "industries",
-    "infiniti", "info", "ing", "ink", "institute", "insure", "int",
-    "international", "investments", "ipiranga", "irish", "ist", "istanbul",
-    "itau", "iwc", "java", "jcb", "jetzt", "jewelry", "jlc", "jll", "jobs",
-    "joburg", "jprs", "juegos", "kaufen", "kddi", "kim", "kitchen", "kiwi",
-    "koeln", "komatsu", "krd", "kred", "kyoto", "lacaixa", "lancaster", "land",
-    "lasalle", "lat", "latrobe", "law", "lawyer", "lds", "lease", "leclerc",
-    "legal", "lexus", "lgbt", "liaison", "lidl", "life", "lighting", "limited",
-    "limo", "link", "live", "lixil", "loan", "loans", "lol", "london", "lotte",
-    "lotto", "love", "ltda", "lupin", "luxe", "luxury", "madrid", "maif",
-    "maison", "man", "management", "mango", "market", "marketing", "markets",
-    "marriott", "mba", "media", "meet", "melbourne", "meme", "memorial", "men",
-    "menu", "miami", "microsoft", "mil", "mini", "mma", "mobi", "moda", "moe",
-    "mom", "monash", "money", "montblanc", "mormon", "mortgage", "moscow",
-    "motorcycles", "mov", "movie", "movistar", "mtn", "mtpc", "museum",
-    "nadex", "nagoya", "name", "navy", "nec", "net", "netbank", "network",
-    "neustar", "new", "news", "nexus", "ngo", "nhk", "nico", "ninja", "nissan",
-    "nokia", "nra", "nrw", "ntt", "nyc", "office", "okinawa", "omega", "one",
-    "ong", "onl", "online", "ooo", "oracle", "orange", "org", "organic",
-    "osaka", "otsuka", "ovh", "page", "panerai", "paris", "partners", "parts",
-    "party", "pet", "pharmacy", "philips", "photo", "photography", "photos",
-    "physio", "piaget", "pics", "pictet", "pictures", "pink", "pizza", "place",
-    "play", "plumbing", "plus", "pohl", "poker", "porn", "post", "praxi",
-    "press", "pro", "prod", "productions", "prof", "properties", "property",
-    "pub", "qpon", "quebec", "racing", "realtor", "realty", "recipes", "red",
-    "redstone", "rehab", "reise", "reisen", "reit", "ren", "rent", "rentals",
-    "repair", "report", "republican", "rest", "restaurant", "review",
-    "reviews", "rich", "ricoh", "rio", "rip", "rocks", "rodeo", "rsvp", "ruhr",
-    "run", "ryukyu", "saarland", "sakura", "sale", "samsung", "sandvik",
-    "sandvikcoromant", "sanofi", "sap", "sarl", "saxo", "sca", "scb",
-    "schmidt", "scholarships", "school", "schule", "schwarz", "science",
-    "scor", "scot", "seat", "seek", "sener", "services", "sew", "sex", "sexy",
-    "shiksha", "shoes", "show", "shriram", "singles", "site", "ski", "sky",
-    "skype", "sncf", "soccer", "social", "software", "sohu", "solar",
-    "solutions", "sony", "soy", "space", "spiegel", "spreadbetting", "srl",
-    "starhub", "statoil", "studio", "study", "style", "sucks", "supplies",
-    "supply", "support", "surf", "surgery", "suzuki", "swatch", "swiss",
-    "sydney", "systems", "taipei", "tatamotors", "tatar", "tattoo", "tax",
-    "taxi", "team", "tech", "technology", "tel", "telefonica", "temasek",
-    "tennis", "thd", "theater", "tickets", "tienda", "tips", "tires", "tirol",
-    "today", "tokyo", "tools", "top", "toray", "toshiba", "tours", "town",
-    "toyota", "toys", "trade", "trading", "training", "travel", "trust", "tui",
-    "ubs", "university", "uno", "uol", "vacations", "vegas", "ventures",
-    "vermögensberater", "vermögensberatung", "versicherung", "vet", "viajes",
-    "video", "villas", "vin", "vision", "vista", "vistaprint", "vlaanderen",
-    "vodka", "vote", "voting", "voto", "voyage", "wales", "walter", "wang",
-    "watch", "webcam", "website", "wed", "wedding", "weir", "whoswho", "wien",
-    "wiki", "williamhill", "win", "windows", "wine", "wme", "work", "works",
-    "world", "wtc", "wtf", "xbox", "xerox", "xin", "xperia", "xxx", "xyz",
-    "yachts", "yandex", "yodobashi", "yoga", "yokohama", "youtube", "zip",
-    "zone", "zuerich", "дети", "ком", "мо�ква", "онлайн", "орг", "ру�", "�айт",
-    "קו�", "بازار", "شبكة", "كوم", "موقع", "कॉम", "नेट", "संगठन", "คอม",
-    "�ん�", "グーグル", "コム", "世界", "中信", "中文网", "�业", "佛山", "信�",
-    "�康", "八�", "公�", "公益", "商城", "商店", "商标", "在线", "大拿", "娱�",
-    "工行", "广东", "慈善", "我爱你", "手机", "政务", "政府", "新闻", "时尚", "机构",
-    "淡马锡", "游�", "点看", "移动", "组织机构", "网�", "网店", "网络", "谷歌", "集团",
-    "飞利浦", "�厅", "닷넷", "닷컴", "삼성", "onion"]
-
-URL_REGEXP = re.compile((
-    r'('
-    r'^(?!(https?://|www\.)?\.|ftps?://|([0-9]+\.){{1,3}}\d+)'  # exclude urls that start with "."
-    r'(?:https?://|www\.)*^(?!.*@)(?:[\w+-_]+[.])'              # beginning of url
-    r'(?:{0}\b'                                                # all tlds
-    r'(?:[:0-9]))'                                              # port numbers & close off TLDs
-    r'(?:[\w+\/]?[a-z0-9!\*\'\(\);:&=\+\$/%#\[\]\-_\.,~?])*'    # path/query params
-    r')').format(r'\b|'.join(TLDS)), re.U | re.I | re.X)
-
-
-def calc_expected_status_length(status, short_url_length=23):
-    """ Calculates the length of a tweet, taking into account Twitter's
-    replacement of URLs with https://t.co links.
-
-    Args:
-        status: text of the status message to be posted.
-        short_url_length: the current published https://t.co links
-
-    Returns:
-        Expected length of the status message as an integer.
-
-    """
-    status_length = 0
-    if isinstance(status, bytes):
-        status = unicode(status)
-    for word in re.split(r'\s', status):
-        if is_url(word):
-            status_length += short_url_length
-        else:
-            for character in word:
-                if any([ord(normalize("NFC", character)) in char_range for char_range in CHAR_RANGES]):
-                    status_length += 1
-                else:
-                    status_length += 2
-    status_length += len(re.findall(r'\s', status))
-    return status_length
-
-
-def is_url(text):
-    """ Checks to see if a bit of text is a URL.
-
-    Args:
-        text: text to check.
-
-    Returns:
-        Boolean of whether the text should be treated as a URL or not.
-    """
-    return bool(re.findall(URL_REGEXP, text))
-
-
-def http_to_file(http):
-    data_file = NamedTemporaryFile()
-    req = requests.get(http, stream=True)
-    for chunk in req.iter_content(chunk_size=1024 * 1024):
-        data_file.write(chunk)
-    return data_file
-
-
-def parse_media_file(passed_media, async_upload=False):
-    """ Parses a media file and attempts to return a file-like object and
-    information about the media file.
-
-    Args:
-        passed_media: media file which to parse.
-        async_upload: flag, for validation media file attributes.
-
-    Returns:
-        file-like object, the filename of the media file, the file size, and
-        the type of media.
-    """
-    img_formats = ['image/jpeg',
-                   'image/png',
-                   'image/bmp',
-                   'image/webp']
-    long_img_formats = [
-        'image/gif'
-    ]
-    video_formats = ['video/mp4',
-                     'video/quicktime']
-
-    # If passed_media is a string, check if it points to a URL, otherwise,
-    # it should point to local file. Create a reference to a file obj for
-    #  each case such that data_file ends up with a read() method.
-    if not hasattr(passed_media, 'read'):
-        if passed_media.startswith('http'):
-            data_file = http_to_file(passed_media)
-            filename = os.path.basename(urlparse(passed_media).path)
-        else:
-            data_file = open(os.path.realpath(passed_media), 'rb')
-            filename = os.path.basename(passed_media)
-
-    # Otherwise, if a file object was passed in the first place,
-    # create the standard reference to media_file (i.e., rename it to fp).
-    else:
-        if passed_media.mode not in ['rb', 'rb+', 'w+b']:
-            raise TwitterError('File mode must be "rb" or "rb+"')
-        filename = os.path.basename(passed_media.name)
-        data_file = passed_media
-
-    data_file.seek(0, 2)
-    file_size = data_file.tell()
-
-    try:
-        data_file.seek(0)
-    except Exception as e:
-        pass
-
-    media_type = mimetypes.guess_type(os.path.basename(filename))[0]
-    if media_type is not None:
-        if media_type in img_formats and file_size > 5 * 1048576:
-            raise TwitterError({'message': 'Images must be less than 5MB.'})
-        elif media_type in long_img_formats and file_size > 15 * 1048576:
-            raise TwitterError({'message': 'GIF Image must be less than 15MB.'})
-        elif media_type in video_formats and not async_upload and file_size > 15 * 1048576:
-            raise TwitterError({'message': 'Videos must be less than 15MB.'})
-        elif media_type in video_formats and async_upload and file_size > 512 * 1048576:
-            raise TwitterError({'message': 'Videos must be less than 512MB.'})
-        elif media_type not in img_formats and media_type not in video_formats and media_type not in long_img_formats:
-            raise TwitterError({'message': 'Media type could not be determined.'})
-
-    return data_file, filename, file_size, media_type
-
-
-def enf_type(field, _type, val):
-    """ Checks to see if a given val for a field (i.e., the name of the field)
-    is of the proper _type. If it is not, raises a TwitterError with a brief
-    explanation.
-
-    Args:
-        field:
-            Name of the field you are checking.
-        _type:
-            Type that the value should be returned as.
-        val:
-            Value to convert to _type.
-
-    Returns:
-        val converted to type _type.
-
-    """
-    try:
-        return _type(val)
-    except ValueError:
-        raise TwitterError({
-            'message': '"{0}" must be type {1}'.format(field, _type.__name__)
-        })
-
-
-def parse_arg_list(args, attr):
-    out = []
-    if isinstance(args, (str, unicode)):
-        out.append(args)
-    elif isinstance(args, twitter.User):
-        out.append(getattr(args, attr))
-    elif isinstance(args, (list, tuple)):
-        for item in args:
-            if isinstance(item, (str, unicode)):
-                out.append(item)
-            elif isinstance(item, twitter.User):
-                out.append(getattr(item, attr))
-    return ",".join([str(item) for item in out])
diff --git a/lib/typeguard/__init__.py b/lib/typeguard/__init__.py
deleted file mode 100644
index 6781cad0..00000000
--- a/lib/typeguard/__init__.py
+++ /dev/null
@@ -1,48 +0,0 @@
-import os
-from typing import Any
-
-from ._checkers import TypeCheckerCallable as TypeCheckerCallable
-from ._checkers import TypeCheckLookupCallback as TypeCheckLookupCallback
-from ._checkers import check_type_internal as check_type_internal
-from ._checkers import checker_lookup_functions as checker_lookup_functions
-from ._checkers import load_plugins as load_plugins
-from ._config import CollectionCheckStrategy as CollectionCheckStrategy
-from ._config import ForwardRefPolicy as ForwardRefPolicy
-from ._config import TypeCheckConfiguration as TypeCheckConfiguration
-from ._decorators import typechecked as typechecked
-from ._decorators import typeguard_ignore as typeguard_ignore
-from ._exceptions import InstrumentationWarning as InstrumentationWarning
-from ._exceptions import TypeCheckError as TypeCheckError
-from ._exceptions import TypeCheckWarning as TypeCheckWarning
-from ._exceptions import TypeHintWarning as TypeHintWarning
-from ._functions import TypeCheckFailCallback as TypeCheckFailCallback
-from ._functions import check_type as check_type
-from ._functions import warn_on_error as warn_on_error
-from ._importhook import ImportHookManager as ImportHookManager
-from ._importhook import TypeguardFinder as TypeguardFinder
-from ._importhook import install_import_hook as install_import_hook
-from ._memo import TypeCheckMemo as TypeCheckMemo
-from ._suppression import suppress_type_checks as suppress_type_checks
-from ._utils import Unset as Unset
-
-# Re-export imports so they look like they live directly in this package
-for value in list(locals().values()):
-    if getattr(value, "__module__", "").startswith(f"{__name__}."):
-        value.__module__ = __name__
-
-
-config: TypeCheckConfiguration
-
-
-def __getattr__(name: str) -> Any:
-    if name == "config":
-        from ._config import global_config
-
-        return global_config
-
-    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
-
-
-# Automatically load checker lookup functions unless explicitly disabled
-if "TYPEGUARD_DISABLE_PLUGIN_AUTOLOAD" not in os.environ:
-    load_plugins()
diff --git a/lib/typeguard/_checkers.py b/lib/typeguard/_checkers.py
deleted file mode 100644
index 67dd5ad4..00000000
--- a/lib/typeguard/_checkers.py
+++ /dev/null
@@ -1,993 +0,0 @@
-from __future__ import annotations
-
-import collections.abc
-import inspect
-import sys
-import types
-import typing
-import warnings
-from enum import Enum
-from inspect import Parameter, isclass, isfunction
-from io import BufferedIOBase, IOBase, RawIOBase, TextIOBase
-from textwrap import indent
-from typing import (
-    IO,
-    AbstractSet,
-    Any,
-    BinaryIO,
-    Callable,
-    Dict,
-    ForwardRef,
-    List,
-    Mapping,
-    MutableMapping,
-    NewType,
-    Optional,
-    Sequence,
-    Set,
-    TextIO,
-    Tuple,
-    Type,
-    TypeVar,
-    Union,
-)
-from unittest.mock import Mock
-from weakref import WeakKeyDictionary
-
-try:
-    import typing_extensions
-except ImportError:
-    typing_extensions = None  # type: ignore[assignment]
-
-# Must use this because typing.is_typeddict does not recognize
-# TypedDict from typing_extensions, and as of version 4.12.0
-# typing_extensions.TypedDict is different from typing.TypedDict
-# on all versions.
-from typing_extensions import is_typeddict
-
-from ._config import ForwardRefPolicy
-from ._exceptions import TypeCheckError, TypeHintWarning
-from ._memo import TypeCheckMemo
-from ._utils import evaluate_forwardref, get_stacklevel, get_type_name, qualified_name
-
-if sys.version_info >= (3, 11):
-    from typing import (
-        Annotated,
-        NotRequired,
-        TypeAlias,
-        get_args,
-        get_origin,
-    )
-
-    SubclassableAny = Any
-else:
-    from typing_extensions import (
-        Annotated,
-        NotRequired,
-        TypeAlias,
-        get_args,
-        get_origin,
-    )
-    from typing_extensions import Any as SubclassableAny
-
-if sys.version_info >= (3, 10):
-    from importlib.metadata import entry_points
-    from typing import ParamSpec
-else:
-    from importlib_metadata import entry_points
-    from typing_extensions import ParamSpec
-
-TypeCheckerCallable: TypeAlias = Callable[
-    [Any, Any, Tuple[Any, ...], TypeCheckMemo], Any
-]
-TypeCheckLookupCallback: TypeAlias = Callable[
-    [Any, Tuple[Any, ...], Tuple[Any, ...]], Optional[TypeCheckerCallable]
-]
-
-checker_lookup_functions: list[TypeCheckLookupCallback] = []
-generic_alias_types: tuple[type, ...] = (type(List), type(List[Any]))
-if sys.version_info >= (3, 9):
-    generic_alias_types += (types.GenericAlias,)
-
-protocol_check_cache: WeakKeyDictionary[
-    type[Any], dict[type[Any], TypeCheckError | None]
-] = WeakKeyDictionary()
-
-# Sentinel
-_missing = object()
-
-# Lifted from mypy.sharedparse
-BINARY_MAGIC_METHODS = {
-    "__add__",
-    "__and__",
-    "__cmp__",
-    "__divmod__",
-    "__div__",
-    "__eq__",
-    "__floordiv__",
-    "__ge__",
-    "__gt__",
-    "__iadd__",
-    "__iand__",
-    "__idiv__",
-    "__ifloordiv__",
-    "__ilshift__",
-    "__imatmul__",
-    "__imod__",
-    "__imul__",
-    "__ior__",
-    "__ipow__",
-    "__irshift__",
-    "__isub__",
-    "__itruediv__",
-    "__ixor__",
-    "__le__",
-    "__lshift__",
-    "__lt__",
-    "__matmul__",
-    "__mod__",
-    "__mul__",
-    "__ne__",
-    "__or__",
-    "__pow__",
-    "__radd__",
-    "__rand__",
-    "__rdiv__",
-    "__rfloordiv__",
-    "__rlshift__",
-    "__rmatmul__",
-    "__rmod__",
-    "__rmul__",
-    "__ror__",
-    "__rpow__",
-    "__rrshift__",
-    "__rshift__",
-    "__rsub__",
-    "__rtruediv__",
-    "__rxor__",
-    "__sub__",
-    "__truediv__",
-    "__xor__",
-}
-
-
-def check_callable(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if not callable(value):
-        raise TypeCheckError("is not callable")
-
-    if args:
-        try:
-            signature = inspect.signature(value)
-        except (TypeError, ValueError):
-            return
-
-        argument_types = args[0]
-        if isinstance(argument_types, list) and not any(
-            type(item) is ParamSpec for item in argument_types
-        ):
-            # The callable must not have keyword-only arguments without defaults
-            unfulfilled_kwonlyargs = [
-                param.name
-                for param in signature.parameters.values()
-                if param.kind == Parameter.KEYWORD_ONLY
-                and param.default == Parameter.empty
-            ]
-            if unfulfilled_kwonlyargs:
-                raise TypeCheckError(
-                    f"has mandatory keyword-only arguments in its declaration: "
-                    f'{", ".join(unfulfilled_kwonlyargs)}'
-                )
-
-            num_positional_args = num_mandatory_pos_args = 0
-            has_varargs = False
-            for param in signature.parameters.values():
-                if param.kind in (
-                    Parameter.POSITIONAL_ONLY,
-                    Parameter.POSITIONAL_OR_KEYWORD,
-                ):
-                    num_positional_args += 1
-                    if param.default is Parameter.empty:
-                        num_mandatory_pos_args += 1
-                elif param.kind == Parameter.VAR_POSITIONAL:
-                    has_varargs = True
-
-            if num_mandatory_pos_args > len(argument_types):
-                raise TypeCheckError(
-                    f"has too many mandatory positional arguments in its declaration; "
-                    f"expected {len(argument_types)} but {num_mandatory_pos_args} "
-                    f"mandatory positional argument(s) declared"
-                )
-            elif not has_varargs and num_positional_args < len(argument_types):
-                raise TypeCheckError(
-                    f"has too few arguments in its declaration; expected "
-                    f"{len(argument_types)} but {num_positional_args} argument(s) "
-                    f"declared"
-                )
-
-
-def check_mapping(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if origin_type is Dict or origin_type is dict:
-        if not isinstance(value, dict):
-            raise TypeCheckError("is not a dict")
-    if origin_type is MutableMapping or origin_type is collections.abc.MutableMapping:
-        if not isinstance(value, collections.abc.MutableMapping):
-            raise TypeCheckError("is not a mutable mapping")
-    elif not isinstance(value, collections.abc.Mapping):
-        raise TypeCheckError("is not a mapping")
-
-    if args:
-        key_type, value_type = args
-        if key_type is not Any or value_type is not Any:
-            samples = memo.config.collection_check_strategy.iterate_samples(
-                value.items()
-            )
-            for k, v in samples:
-                try:
-                    check_type_internal(k, key_type, memo)
-                except TypeCheckError as exc:
-                    exc.append_path_element(f"key {k!r}")
-                    raise
-
-                try:
-                    check_type_internal(v, value_type, memo)
-                except TypeCheckError as exc:
-                    exc.append_path_element(f"value of key {k!r}")
-                    raise
-
-
-def check_typed_dict(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if not isinstance(value, dict):
-        raise TypeCheckError("is not a dict")
-
-    declared_keys = frozenset(origin_type.__annotations__)
-    if hasattr(origin_type, "__required_keys__"):
-        required_keys = set(origin_type.__required_keys__)
-    else:  # py3.8 and lower
-        required_keys = set(declared_keys) if origin_type.__total__ else set()
-
-    existing_keys = set(value)
-    extra_keys = existing_keys - declared_keys
-    if extra_keys:
-        keys_formatted = ", ".join(f'"{key}"' for key in sorted(extra_keys, key=repr))
-        raise TypeCheckError(f"has unexpected extra key(s): {keys_formatted}")
-
-    # Detect NotRequired fields which are hidden by get_type_hints()
-    type_hints: dict[str, type] = {}
-    for key, annotation in origin_type.__annotations__.items():
-        if isinstance(annotation, ForwardRef):
-            annotation = evaluate_forwardref(annotation, memo)
-            if get_origin(annotation) is NotRequired:
-                required_keys.discard(key)
-                annotation = get_args(annotation)[0]
-
-        type_hints[key] = annotation
-
-    missing_keys = required_keys - existing_keys
-    if missing_keys:
-        keys_formatted = ", ".join(f'"{key}"' for key in sorted(missing_keys, key=repr))
-        raise TypeCheckError(f"is missing required key(s): {keys_formatted}")
-
-    for key, argtype in type_hints.items():
-        argvalue = value.get(key, _missing)
-        if argvalue is not _missing:
-            try:
-                check_type_internal(argvalue, argtype, memo)
-            except TypeCheckError as exc:
-                exc.append_path_element(f"value of key {key!r}")
-                raise
-
-
-def check_list(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if not isinstance(value, list):
-        raise TypeCheckError("is not a list")
-
-    if args and args != (Any,):
-        samples = memo.config.collection_check_strategy.iterate_samples(value)
-        for i, v in enumerate(samples):
-            try:
-                check_type_internal(v, args[0], memo)
-            except TypeCheckError as exc:
-                exc.append_path_element(f"item {i}")
-                raise
-
-
-def check_sequence(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if not isinstance(value, collections.abc.Sequence):
-        raise TypeCheckError("is not a sequence")
-
-    if args and args != (Any,):
-        samples = memo.config.collection_check_strategy.iterate_samples(value)
-        for i, v in enumerate(samples):
-            try:
-                check_type_internal(v, args[0], memo)
-            except TypeCheckError as exc:
-                exc.append_path_element(f"item {i}")
-                raise
-
-
-def check_set(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if origin_type is frozenset:
-        if not isinstance(value, frozenset):
-            raise TypeCheckError("is not a frozenset")
-    elif not isinstance(value, AbstractSet):
-        raise TypeCheckError("is not a set")
-
-    if args and args != (Any,):
-        samples = memo.config.collection_check_strategy.iterate_samples(value)
-        for v in samples:
-            try:
-                check_type_internal(v, args[0], memo)
-            except TypeCheckError as exc:
-                exc.append_path_element(f"[{v}]")
-                raise
-
-
-def check_tuple(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    # Specialized check for NamedTuples
-    if field_types := getattr(origin_type, "__annotations__", None):
-        if not isinstance(value, origin_type):
-            raise TypeCheckError(
-                f"is not a named tuple of type {qualified_name(origin_type)}"
-            )
-
-        for name, field_type in field_types.items():
-            try:
-                check_type_internal(getattr(value, name), field_type, memo)
-            except TypeCheckError as exc:
-                exc.append_path_element(f"attribute {name!r}")
-                raise
-
-        return
-    elif not isinstance(value, tuple):
-        raise TypeCheckError("is not a tuple")
-
-    if args:
-        use_ellipsis = args[-1] is Ellipsis
-        tuple_params = args[: -1 if use_ellipsis else None]
-    else:
-        # Unparametrized Tuple or plain tuple
-        return
-
-    if use_ellipsis:
-        element_type = tuple_params[0]
-        samples = memo.config.collection_check_strategy.iterate_samples(value)
-        for i, element in enumerate(samples):
-            try:
-                check_type_internal(element, element_type, memo)
-            except TypeCheckError as exc:
-                exc.append_path_element(f"item {i}")
-                raise
-    elif tuple_params == ((),):
-        if value != ():
-            raise TypeCheckError("is not an empty tuple")
-    else:
-        if len(value) != len(tuple_params):
-            raise TypeCheckError(
-                f"has wrong number of elements (expected {len(tuple_params)}, got "
-                f"{len(value)} instead)"
-            )
-
-        for i, (element, element_type) in enumerate(zip(value, tuple_params)):
-            try:
-                check_type_internal(element, element_type, memo)
-            except TypeCheckError as exc:
-                exc.append_path_element(f"item {i}")
-                raise
-
-
-def check_union(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    errors: dict[str, TypeCheckError] = {}
-    try:
-        for type_ in args:
-            try:
-                check_type_internal(value, type_, memo)
-                return
-            except TypeCheckError as exc:
-                errors[get_type_name(type_)] = exc
-
-        formatted_errors = indent(
-            "\n".join(f"{key}: {error}" for key, error in errors.items()), "  "
-        )
-    finally:
-        del errors  # avoid creating ref cycle
-    raise TypeCheckError(f"did not match any element in the union:\n{formatted_errors}")
-
-
-def check_uniontype(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    errors: dict[str, TypeCheckError] = {}
-    for type_ in args:
-        try:
-            check_type_internal(value, type_, memo)
-            return
-        except TypeCheckError as exc:
-            errors[get_type_name(type_)] = exc
-
-    formatted_errors = indent(
-        "\n".join(f"{key}: {error}" for key, error in errors.items()), "  "
-    )
-    raise TypeCheckError(f"did not match any element in the union:\n{formatted_errors}")
-
-
-def check_class(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if not isclass(value) and not isinstance(value, generic_alias_types):
-        raise TypeCheckError("is not a class")
-
-    if not args:
-        return
-
-    if isinstance(args[0], ForwardRef):
-        expected_class = evaluate_forwardref(args[0], memo)
-    else:
-        expected_class = args[0]
-
-    if expected_class is Any:
-        return
-    elif getattr(expected_class, "_is_protocol", False):
-        check_protocol(value, expected_class, (), memo)
-    elif isinstance(expected_class, TypeVar):
-        check_typevar(value, expected_class, (), memo, subclass_check=True)
-    elif get_origin(expected_class) is Union:
-        errors: dict[str, TypeCheckError] = {}
-        for arg in get_args(expected_class):
-            if arg is Any:
-                return
-
-            try:
-                check_class(value, type, (arg,), memo)
-                return
-            except TypeCheckError as exc:
-                errors[get_type_name(arg)] = exc
-        else:
-            formatted_errors = indent(
-                "\n".join(f"{key}: {error}" for key, error in errors.items()), "  "
-            )
-            raise TypeCheckError(
-                f"did not match any element in the union:\n{formatted_errors}"
-            )
-    elif not issubclass(value, expected_class):  # type: ignore[arg-type]
-        raise TypeCheckError(f"is not a subclass of {qualified_name(expected_class)}")
-
-
-def check_newtype(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    check_type_internal(value, origin_type.__supertype__, memo)
-
-
-def check_instance(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if not isinstance(value, origin_type):
-        raise TypeCheckError(f"is not an instance of {qualified_name(origin_type)}")
-
-
-def check_typevar(
-    value: Any,
-    origin_type: TypeVar,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-    *,
-    subclass_check: bool = False,
-) -> None:
-    if origin_type.__bound__ is not None:
-        annotation = (
-            Type[origin_type.__bound__] if subclass_check else origin_type.__bound__
-        )
-        check_type_internal(value, annotation, memo)
-    elif origin_type.__constraints__:
-        for constraint in origin_type.__constraints__:
-            annotation = Type[constraint] if subclass_check else constraint
-            try:
-                check_type_internal(value, annotation, memo)
-            except TypeCheckError:
-                pass
-            else:
-                break
-        else:
-            formatted_constraints = ", ".join(
-                get_type_name(constraint) for constraint in origin_type.__constraints__
-            )
-            raise TypeCheckError(
-                f"does not match any of the constraints " f"({formatted_constraints})"
-            )
-
-
-if typing_extensions is None:
-
-    def _is_literal_type(typ: object) -> bool:
-        return typ is typing.Literal
-
-else:
-
-    def _is_literal_type(typ: object) -> bool:
-        return typ is typing.Literal or typ is typing_extensions.Literal
-
-
-def check_literal(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    def get_literal_args(literal_args: tuple[Any, ...]) -> tuple[Any, ...]:
-        retval: list[Any] = []
-        for arg in literal_args:
-            if _is_literal_type(get_origin(arg)):
-                retval.extend(get_literal_args(arg.__args__))
-            elif arg is None or isinstance(arg, (int, str, bytes, bool, Enum)):
-                retval.append(arg)
-            else:
-                raise TypeError(
-                    f"Illegal literal value: {arg}"
-                )  # TypeError here is deliberate
-
-        return tuple(retval)
-
-    final_args = tuple(get_literal_args(args))
-    try:
-        index = final_args.index(value)
-    except ValueError:
-        pass
-    else:
-        if type(final_args[index]) is type(value):
-            return
-
-    formatted_args = ", ".join(repr(arg) for arg in final_args)
-    raise TypeCheckError(f"is not any of ({formatted_args})") from None
-
-
-def check_literal_string(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    check_type_internal(value, str, memo)
-
-
-def check_typeguard(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    check_type_internal(value, bool, memo)
-
-
-def check_none(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if value is not None:
-        raise TypeCheckError("is not None")
-
-
-def check_number(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if origin_type is complex and not isinstance(value, (complex, float, int)):
-        raise TypeCheckError("is neither complex, float or int")
-    elif origin_type is float and not isinstance(value, (float, int)):
-        raise TypeCheckError("is neither float or int")
-
-
-def check_io(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if origin_type is TextIO or (origin_type is IO and args == (str,)):
-        if not isinstance(value, TextIOBase):
-            raise TypeCheckError("is not a text based I/O object")
-    elif origin_type is BinaryIO or (origin_type is IO and args == (bytes,)):
-        if not isinstance(value, (RawIOBase, BufferedIOBase)):
-            raise TypeCheckError("is not a binary I/O object")
-    elif not isinstance(value, IOBase):
-        raise TypeCheckError("is not an I/O object")
-
-
-def check_protocol(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    subject: type[Any] = value if isclass(value) else type(value)
-
-    if subject in protocol_check_cache:
-        result_map = protocol_check_cache[subject]
-        if origin_type in result_map:
-            if exc := result_map[origin_type]:
-                raise exc
-            else:
-                return
-
-    # Collect a set of methods and non-method attributes present in the protocol
-    ignored_attrs = set(dir(typing.Protocol)) | {
-        "__annotations__",
-        "__non_callable_proto_members__",
-    }
-    expected_methods: dict[str, tuple[Any, Any]] = {}
-    expected_noncallable_members: dict[str, Any] = {}
-    for attrname in dir(origin_type):
-        # Skip attributes present in typing.Protocol
-        if attrname in ignored_attrs:
-            continue
-
-        member = getattr(origin_type, attrname)
-        if callable(member):
-            signature = inspect.signature(member)
-            argtypes = [
-                (p.annotation if p.annotation is not Parameter.empty else Any)
-                for p in signature.parameters.values()
-                if p.kind is not Parameter.KEYWORD_ONLY
-            ] or Ellipsis
-            return_annotation = (
-                signature.return_annotation
-                if signature.return_annotation is not Parameter.empty
-                else Any
-            )
-            expected_methods[attrname] = argtypes, return_annotation
-        else:
-            expected_noncallable_members[attrname] = member
-
-    for attrname, annotation in typing.get_type_hints(origin_type).items():
-        expected_noncallable_members[attrname] = annotation
-
-    subject_annotations = typing.get_type_hints(subject)
-
-    # Check that all required methods are present and their signatures are compatible
-    result_map = protocol_check_cache.setdefault(subject, {})
-    try:
-        for attrname, callable_args in expected_methods.items():
-            try:
-                method = getattr(subject, attrname)
-            except AttributeError:
-                if attrname in subject_annotations:
-                    raise TypeCheckError(
-                        f"is not compatible with the {origin_type.__qualname__} protocol "
-                        f"because its {attrname!r} attribute is not a method"
-                    ) from None
-                else:
-                    raise TypeCheckError(
-                        f"is not compatible with the {origin_type.__qualname__} protocol "
-                        f"because it has no method named {attrname!r}"
-                    ) from None
-
-            if not callable(method):
-                raise TypeCheckError(
-                    f"is not compatible with the {origin_type.__qualname__} protocol "
-                    f"because its {attrname!r} attribute is not a callable"
-                )
-
-            # TODO: raise exception on added keyword-only arguments without defaults
-            try:
-                check_callable(method, Callable, callable_args, memo)
-            except TypeCheckError as exc:
-                raise TypeCheckError(
-                    f"is not compatible with the {origin_type.__qualname__} protocol "
-                    f"because its {attrname!r} method {exc}"
-                ) from None
-
-        # Check that all required non-callable members are present
-        for attrname in expected_noncallable_members:
-            # TODO: implement assignability checks for non-callable members
-            if attrname not in subject_annotations and not hasattr(subject, attrname):
-                raise TypeCheckError(
-                    f"is not compatible with the {origin_type.__qualname__} protocol "
-                    f"because it has no attribute named {attrname!r}"
-                )
-    except TypeCheckError as exc:
-        result_map[origin_type] = exc
-        raise
-    else:
-        result_map[origin_type] = None
-
-
-def check_byteslike(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if not isinstance(value, (bytearray, bytes, memoryview)):
-        raise TypeCheckError("is not bytes-like")
-
-
-def check_self(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if memo.self_type is None:
-        raise TypeCheckError("cannot be checked against Self outside of a method call")
-
-    if isclass(value):
-        if not issubclass(value, memo.self_type):
-            raise TypeCheckError(
-                f"is not an instance of the self type "
-                f"({qualified_name(memo.self_type)})"
-            )
-    elif not isinstance(value, memo.self_type):
-        raise TypeCheckError(
-            f"is not an instance of the self type ({qualified_name(memo.self_type)})"
-        )
-
-
-def check_paramspec(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    pass  # No-op for now
-
-
-def check_instanceof(
-    value: Any,
-    origin_type: Any,
-    args: tuple[Any, ...],
-    memo: TypeCheckMemo,
-) -> None:
-    if not isinstance(value, origin_type):
-        raise TypeCheckError(f"is not an instance of {qualified_name(origin_type)}")
-
-
-def check_type_internal(
-    value: Any,
-    annotation: Any,
-    memo: TypeCheckMemo,
-) -> None:
-    """
-    Check that the given object is compatible with the given type annotation.
-
-    This function should only be used by type checker callables. Applications should use
-    :func:`~.check_type` instead.
-
-    :param value: the value to check
-    :param annotation: the type annotation to check against
-    :param memo: a memo object containing configuration and information necessary for
-        looking up forward references
-    """
-
-    if isinstance(annotation, ForwardRef):
-        try:
-            annotation = evaluate_forwardref(annotation, memo)
-        except NameError:
-            if memo.config.forward_ref_policy is ForwardRefPolicy.ERROR:
-                raise
-            elif memo.config.forward_ref_policy is ForwardRefPolicy.WARN:
-                warnings.warn(
-                    f"Cannot resolve forward reference {annotation.__forward_arg__!r}",
-                    TypeHintWarning,
-                    stacklevel=get_stacklevel(),
-                )
-
-            return
-
-    if annotation is Any or annotation is SubclassableAny or isinstance(value, Mock):
-        return
-
-    # Skip type checks if value is an instance of a class that inherits from Any
-    if not isclass(value) and SubclassableAny in type(value).__bases__:
-        return
-
-    extras: tuple[Any, ...]
-    origin_type = get_origin(annotation)
-    if origin_type is Annotated:
-        annotation, *extras_ = get_args(annotation)
-        extras = tuple(extras_)
-        origin_type = get_origin(annotation)
-    else:
-        extras = ()
-
-    if origin_type is not None:
-        args = get_args(annotation)
-
-        # Compatibility hack to distinguish between unparametrized and empty tuple
-        # (tuple[()]), necessary due to https://github.com/python/cpython/issues/91137
-        if origin_type in (tuple, Tuple) and annotation is not Tuple and not args:
-            args = ((),)
-    else:
-        origin_type = annotation
-        args = ()
-
-    for lookup_func in checker_lookup_functions:
-        checker = lookup_func(origin_type, args, extras)
-        if checker:
-            checker(value, origin_type, args, memo)
-            return
-
-    if isclass(origin_type):
-        if not isinstance(value, origin_type):
-            raise TypeCheckError(f"is not an instance of {qualified_name(origin_type)}")
-    elif type(origin_type) is str:  # noqa: E721
-        warnings.warn(
-            f"Skipping type check against {origin_type!r}; this looks like a "
-            f"string-form forward reference imported from another module",
-            TypeHintWarning,
-            stacklevel=get_stacklevel(),
-        )
-
-
-# Equality checks are applied to these
-origin_type_checkers = {
-    bytes: check_byteslike,
-    AbstractSet: check_set,
-    BinaryIO: check_io,
-    Callable: check_callable,
-    collections.abc.Callable: check_callable,
-    complex: check_number,
-    dict: check_mapping,
-    Dict: check_mapping,
-    float: check_number,
-    frozenset: check_set,
-    IO: check_io,
-    list: check_list,
-    List: check_list,
-    typing.Literal: check_literal,
-    Mapping: check_mapping,
-    MutableMapping: check_mapping,
-    None: check_none,
-    collections.abc.Mapping: check_mapping,
-    collections.abc.MutableMapping: check_mapping,
-    Sequence: check_sequence,
-    collections.abc.Sequence: check_sequence,
-    collections.abc.Set: check_set,
-    set: check_set,
-    Set: check_set,
-    TextIO: check_io,
-    tuple: check_tuple,
-    Tuple: check_tuple,
-    type: check_class,
-    Type: check_class,
-    Union: check_union,
-}
-if sys.version_info >= (3, 10):
-    origin_type_checkers[types.UnionType] = check_uniontype
-    origin_type_checkers[typing.TypeGuard] = check_typeguard
-if sys.version_info >= (3, 11):
-    origin_type_checkers.update(
-        {typing.LiteralString: check_literal_string, typing.Self: check_self}
-    )
-if typing_extensions is not None:
-    # On some Python versions, these may simply be re-exports from typing,
-    # but exactly which Python versions is subject to change,
-    # so it's best to err on the safe side
-    # and update the dictionary on all Python versions
-    # if typing_extensions is installed
-    origin_type_checkers[typing_extensions.Literal] = check_literal
-    origin_type_checkers[typing_extensions.LiteralString] = check_literal_string
-    origin_type_checkers[typing_extensions.Self] = check_self
-    origin_type_checkers[typing_extensions.TypeGuard] = check_typeguard
-
-
-def builtin_checker_lookup(
-    origin_type: Any, args: tuple[Any, ...], extras: tuple[Any, ...]
-) -> TypeCheckerCallable | None:
-    checker = origin_type_checkers.get(origin_type)
-    if checker is not None:
-        return checker
-    elif is_typeddict(origin_type):
-        return check_typed_dict
-    elif isclass(origin_type) and issubclass(
-        origin_type,
-        Tuple,  # type: ignore[arg-type]
-    ):
-        # NamedTuple
-        return check_tuple
-    elif getattr(origin_type, "_is_protocol", False):
-        return check_protocol
-    elif isinstance(origin_type, ParamSpec):
-        return check_paramspec
-    elif isinstance(origin_type, TypeVar):
-        return check_typevar
-    elif origin_type.__class__ is NewType:
-        # typing.NewType on Python 3.10+
-        return check_newtype
-    elif (
-        isfunction(origin_type)
-        and getattr(origin_type, "__module__", None) == "typing"
-        and getattr(origin_type, "__qualname__", "").startswith("NewType.")
-        and hasattr(origin_type, "__supertype__")
-    ):
-        # typing.NewType on Python 3.9 and below
-        return check_newtype
-
-    return None
-
-
-checker_lookup_functions.append(builtin_checker_lookup)
-
-
-def load_plugins() -> None:
-    """
-    Load all type checker lookup functions from entry points.
-
-    All entry points from the ``typeguard.checker_lookup`` group are loaded, and the
-    returned lookup functions are added to :data:`typeguard.checker_lookup_functions`.
-
-    .. note:: This function is called implicitly on import, unless the
-        ``TYPEGUARD_DISABLE_PLUGIN_AUTOLOAD`` environment variable is present.
-    """
-
-    for ep in entry_points(group="typeguard.checker_lookup"):
-        try:
-            plugin = ep.load()
-        except Exception as exc:
-            warnings.warn(
-                f"Failed to load plugin {ep.name!r}: " f"{qualified_name(exc)}: {exc}",
-                stacklevel=2,
-            )
-            continue
-
-        if not callable(plugin):
-            warnings.warn(
-                f"Plugin {ep} returned a non-callable object: {plugin!r}", stacklevel=2
-            )
-            continue
-
-        checker_lookup_functions.insert(0, plugin)
diff --git a/lib/typeguard/_config.py b/lib/typeguard/_config.py
deleted file mode 100644
index 36efad53..00000000
--- a/lib/typeguard/_config.py
+++ /dev/null
@@ -1,108 +0,0 @@
-from __future__ import annotations
-
-from collections.abc import Iterable
-from dataclasses import dataclass
-from enum import Enum, auto
-from typing import TYPE_CHECKING, TypeVar
-
-if TYPE_CHECKING:
-    from ._functions import TypeCheckFailCallback
-
-T = TypeVar("T")
-
-
-class ForwardRefPolicy(Enum):
-    """
-    Defines how unresolved forward references are handled.
-
-    Members:
-
-    * ``ERROR``: propagate the :exc:`NameError` when the forward reference lookup fails
-    * ``WARN``: emit a :class:`~.TypeHintWarning` if the forward reference lookup fails
-    * ``IGNORE``: silently skip checks for unresolveable forward references
-    """
-
-    ERROR = auto()
-    WARN = auto()
-    IGNORE = auto()
-
-
-class CollectionCheckStrategy(Enum):
-    """
-    Specifies how thoroughly the contents of collections are type checked.
-
-    This has an effect on the following built-in checkers:
-
-    * ``AbstractSet``
-    * ``Dict``
-    * ``List``
-    * ``Mapping``
-    * ``Set``
-    * ``Tuple[<type>, ...]`` (arbitrarily sized tuples)
-
-    Members:
-
-    * ``FIRST_ITEM``: check only the first item
-    * ``ALL_ITEMS``: check all items
-    """
-
-    FIRST_ITEM = auto()
-    ALL_ITEMS = auto()
-
-    def iterate_samples(self, collection: Iterable[T]) -> Iterable[T]:
-        if self is CollectionCheckStrategy.FIRST_ITEM:
-            try:
-                return [next(iter(collection))]
-            except StopIteration:
-                return ()
-        else:
-            return collection
-
-
-@dataclass
-class TypeCheckConfiguration:
-    """
-     You can change Typeguard's behavior with these settings.
-
-    .. attribute:: typecheck_fail_callback
-       :type: Callable[[TypeCheckError, TypeCheckMemo], Any]
-
-         Callable that is called when type checking fails.
-
-         Default: ``None`` (the :exc:`~.TypeCheckError` is raised directly)
-
-    .. attribute:: forward_ref_policy
-       :type: ForwardRefPolicy
-
-         Specifies what to do when a forward reference fails to resolve.
-
-         Default: ``WARN``
-
-    .. attribute:: collection_check_strategy
-       :type: CollectionCheckStrategy
-
-         Specifies how thoroughly the contents of collections (list, dict, etc.) are
-         type checked.
-
-         Default: ``FIRST_ITEM``
-
-    .. attribute:: debug_instrumentation
-       :type: bool
-
-         If set to ``True``, the code of modules or functions instrumented by typeguard
-         is printed to ``sys.stderr`` after the instrumentation is done
-
-         Requires Python 3.9 or newer.
-
-         Default: ``False``
-    """
-
-    forward_ref_policy: ForwardRefPolicy = ForwardRefPolicy.WARN
-    typecheck_fail_callback: TypeCheckFailCallback | None = None
-    collection_check_strategy: CollectionCheckStrategy = (
-        CollectionCheckStrategy.FIRST_ITEM
-    )
-    debug_instrumentation: bool = False
-
-
-global_config = TypeCheckConfiguration()
diff --git a/lib/typeguard/_decorators.py b/lib/typeguard/_decorators.py
deleted file mode 100644
index cf325335..00000000
--- a/lib/typeguard/_decorators.py
+++ /dev/null
@@ -1,235 +0,0 @@
-from __future__ import annotations
-
-import ast
-import inspect
-import sys
-from collections.abc import Sequence
-from functools import partial
-from inspect import isclass, isfunction
-from types import CodeType, FrameType, FunctionType
-from typing import TYPE_CHECKING, Any, Callable, ForwardRef, TypeVar, cast, overload
-from warnings import warn
-
-from ._config import CollectionCheckStrategy, ForwardRefPolicy, global_config
-from ._exceptions import InstrumentationWarning
-from ._functions import TypeCheckFailCallback
-from ._transformer import TypeguardTransformer
-from ._utils import Unset, function_name, get_stacklevel, is_method_of, unset
-
-if TYPE_CHECKING:
-    from typeshed.stdlib.types import _Cell
-
-    _F = TypeVar("_F")
-
-    def typeguard_ignore(f: _F) -> _F:
-        """This decorator is a noop during static type-checking."""
-        return f
-
-else:
-    from typing import no_type_check as typeguard_ignore  # noqa: F401
-
-T_CallableOrType = TypeVar("T_CallableOrType", bound=Callable[..., Any])
-
-
-def make_cell(value: object) -> _Cell:
-    return (lambda: value).__closure__[0]  # type: ignore[index]
-
-
-def find_target_function(
-    new_code: CodeType, target_path: Sequence[str], firstlineno: int
-) -> CodeType | None:
-    target_name = target_path[0]
-    for const in new_code.co_consts:
-        if isinstance(const, CodeType):
-            if const.co_name == target_name:
-                if const.co_firstlineno == firstlineno:
-                    return const
-                elif len(target_path) > 1:
-                    target_code = find_target_function(
-                        const, target_path[1:], firstlineno
-                    )
-                    if target_code:
-                        return target_code
-
-    return None
-
-
-def instrument(f: T_CallableOrType) -> FunctionType | str:
-    if not getattr(f, "__code__", None):
-        return "no code associated"
-    elif not getattr(f, "__module__", None):
-        return "__module__ attribute is not set"
-    elif f.__code__.co_filename == "<stdin>":
-        return "cannot instrument functions defined in a REPL"
-    elif hasattr(f, "__wrapped__"):
-        return (
-            "@typechecked only supports instrumenting functions wrapped with "
-            "@classmethod, @staticmethod or @property"
-        )
-
-    target_path = [item for item in f.__qualname__.split(".") if item != "<locals>"]
-    module_source = inspect.getsource(sys.modules[f.__module__])
-    module_ast = ast.parse(module_source)
-    instrumentor = TypeguardTransformer(target_path, f.__code__.co_firstlineno)
-    instrumentor.visit(module_ast)
-
-    if not instrumentor.target_node or instrumentor.target_lineno is None:
-        return "instrumentor did not find the target function"
-
-    module_code = compile(module_ast, f.__code__.co_filename, "exec", dont_inherit=True)
-    new_code = find_target_function(
-        module_code, target_path, instrumentor.target_lineno
-    )
-    if not new_code:
-        return "cannot find the target function in the AST"
-
-    if global_config.debug_instrumentation and sys.version_info >= (3, 9):
-        # Find the matching AST node, then unparse it to source and print to stdout
-        print(
-            f"Source code of {f.__qualname__}() after instrumentation:"
-            "\n----------------------------------------------",
-            file=sys.stderr,
-        )
-        print(ast.unparse(instrumentor.target_node), file=sys.stderr)
-        print(
-            "----------------------------------------------",
-            file=sys.stderr,
-        )
-
-    closure = f.__closure__
-    if new_code.co_freevars != f.__code__.co_freevars:
-        # Create a new closure and find values for the new free variables
-        frame = cast(FrameType, inspect.currentframe())
-        frame = cast(FrameType, frame.f_back)
-        frame_locals = cast(FrameType, frame.f_back).f_locals
-        cells: list[_Cell] = []
-        for key in new_code.co_freevars:
-            if key in instrumentor.names_used_in_annotations:
-                # Find the value and make a new cell from it
-                value = frame_locals.get(key) or ForwardRef(key)
-                cells.append(make_cell(value))
-            else:
-                # Reuse the cell from the existing closure
-                assert f.__closure__
-                cells.append(f.__closure__[f.__code__.co_freevars.index(key)])
-
-        closure = tuple(cells)
-
-    new_function = FunctionType(new_code, f.__globals__, f.__name__, closure=closure)
-    new_function.__module__ = f.__module__
-    new_function.__name__ = f.__name__
-    new_function.__qualname__ = f.__qualname__
-    new_function.__annotations__ = f.__annotations__
-    new_function.__doc__ = f.__doc__
-    new_function.__defaults__ = f.__defaults__
-    new_function.__kwdefaults__ = f.__kwdefaults__
-    return new_function
-
-
-@overload
-def typechecked(
-    *,
-    forward_ref_policy: ForwardRefPolicy | Unset = unset,
-    typecheck_fail_callback: TypeCheckFailCallback | Unset = unset,
-    collection_check_strategy: CollectionCheckStrategy | Unset = unset,
-    debug_instrumentation: bool | Unset = unset,
-) -> Callable[[T_CallableOrType], T_CallableOrType]: ...
-
-
-@overload
-def typechecked(target: T_CallableOrType) -> T_CallableOrType: ...
-
-
-def typechecked(
-    target: T_CallableOrType | None = None,
-    *,
-    forward_ref_policy: ForwardRefPolicy | Unset = unset,
-    typecheck_fail_callback: TypeCheckFailCallback | Unset = unset,
-    collection_check_strategy: CollectionCheckStrategy | Unset = unset,
-    debug_instrumentation: bool | Unset = unset,
-) -> Any:
-    """
-    Instrument the target function to perform run-time type checking.
-
-    This decorator recompiles the target function, injecting code to type check
-    arguments, return values, yield values (excluding ``yield from``) and assignments to
-    annotated local variables.
-
-    This can also be used as a class decorator. This will instrument all type annotated
-    methods, including :func:`@classmethod <classmethod>`,
-    :func:`@staticmethod <staticmethod>`,  and :class:`@property <property>` decorated
-    methods in the class.
-
-    .. note:: When Python is run in optimized mode (``-O`` or ``-OO``, this decorator
-        is a no-op). This is a feature meant for selectively introducing type checking
-        into a code base where the checks aren't meant to be run in production.
-
-    :param target: the function or class to enable type checking for
-    :param forward_ref_policy: override for
-        :attr:`.TypeCheckConfiguration.forward_ref_policy`
-    :param typecheck_fail_callback: override for
-        :attr:`.TypeCheckConfiguration.typecheck_fail_callback`
-    :param collection_check_strategy: override for
-        :attr:`.TypeCheckConfiguration.collection_check_strategy`
-    :param debug_instrumentation: override for
-        :attr:`.TypeCheckConfiguration.debug_instrumentation`
-
-    """
-    if target is None:
-        return partial(
-            typechecked,
-            forward_ref_policy=forward_ref_policy,
-            typecheck_fail_callback=typecheck_fail_callback,
-            collection_check_strategy=collection_check_strategy,
-            debug_instrumentation=debug_instrumentation,
-        )
-
-    if not __debug__:
-        return target
-
-    if isclass(target):
-        for key, attr in target.__dict__.items():
-            if is_method_of(attr, target):
-                retval = instrument(attr)
-                if isfunction(retval):
-                    setattr(target, key, retval)
-            elif isinstance(attr, (classmethod, staticmethod)):
-                if is_method_of(attr.__func__, target):
-                    retval = instrument(attr.__func__)
-                    if isfunction(retval):
-                        wrapper = attr.__class__(retval)
-                        setattr(target, key, wrapper)
-            elif isinstance(attr, property):
-                kwargs: dict[str, Any] = dict(doc=attr.__doc__)
-                for name in ("fset", "fget", "fdel"):
-                    property_func = kwargs[name] = getattr(attr, name)
-                    if is_method_of(property_func, target):
-                        retval = instrument(property_func)
-                        if isfunction(retval):
-                            kwargs[name] = retval
-
-                setattr(target, key, attr.__class__(**kwargs))
-
-        return target
-
-    # Find either the first Python wrapper or the actual function
-    wrapper_class: (
-        type[classmethod[Any, Any, Any]] | type[staticmethod[Any, Any]] | None
-    ) = None
-    if isinstance(target, (classmethod, staticmethod)):
-        wrapper_class = target.__class__
-        target = target.__func__
-
-    retval = instrument(target)
-    if isinstance(retval, str):
-        warn(
-            f"{retval} -- not typechecking {function_name(target)}",
-            InstrumentationWarning,
-            stacklevel=get_stacklevel(),
-        )
-        return target
-
-    if wrapper_class is None:
-        return retval
-    else:
-        return wrapper_class(retval)
diff --git a/lib/typeguard/_exceptions.py b/lib/typeguard/_exceptions.py
deleted file mode 100644
index 625437a6..00000000
--- a/lib/typeguard/_exceptions.py
+++ /dev/null
@@ -1,42 +0,0 @@
-from collections import deque
-from typing import Deque
-
-
-class TypeHintWarning(UserWarning):
-    """
-    A warning that is emitted when a type hint in string form could not be resolved to
-    an actual type.
-    """
-
-
-class TypeCheckWarning(UserWarning):
-    """Emitted by typeguard's type checkers when a type mismatch is detected."""
-
-    def __init__(self, message: str):
-        super().__init__(message)
-
-
-class InstrumentationWarning(UserWarning):
-    """Emitted when there's a problem with instrumenting a function for type checks."""
-
-    def __init__(self, message: str):
-        super().__init__(message)
-
-
-class TypeCheckError(Exception):
-    """
-    Raised by typeguard's type checkers when a type mismatch is detected.
-    """
-
-    def __init__(self, message: str):
-        super().__init__(message)
-        self._path: Deque[str] = deque()
-
-    def append_path_element(self, element: str) -> None:
-        self._path.append(element)
-
-    def __str__(self) -> str:
-        if self._path:
-            return " of ".join(self._path) + " " + str(self.args[0])
-        else:
-            return str(self.args[0])
diff --git a/lib/typeguard/_functions.py b/lib/typeguard/_functions.py
deleted file mode 100644
index 28497856..00000000
--- a/lib/typeguard/_functions.py
+++ /dev/null
@@ -1,308 +0,0 @@
-from __future__ import annotations
-
-import sys
-import warnings
-from typing import Any, Callable, NoReturn, TypeVar, Union, overload
-
-from . import _suppression
-from ._checkers import BINARY_MAGIC_METHODS, check_type_internal
-from ._config import (
-    CollectionCheckStrategy,
-    ForwardRefPolicy,
-    TypeCheckConfiguration,
-)
-from ._exceptions import TypeCheckError, TypeCheckWarning
-from ._memo import TypeCheckMemo
-from ._utils import get_stacklevel, qualified_name
-
-if sys.version_info >= (3, 11):
-    from typing import Literal, Never, TypeAlias
-else:
-    from typing_extensions import Literal, Never, TypeAlias
-
-T = TypeVar("T")
-TypeCheckFailCallback: TypeAlias = Callable[[TypeCheckError, TypeCheckMemo], Any]
-
-
-@overload
-def check_type(
-    value: object,
-    expected_type: type[T],
-    *,
-    forward_ref_policy: ForwardRefPolicy = ...,
-    typecheck_fail_callback: TypeCheckFailCallback | None = ...,
-    collection_check_strategy: CollectionCheckStrategy = ...,
-) -> T: ...
-
-
-@overload
-def check_type(
-    value: object,
-    expected_type: Any,
-    *,
-    forward_ref_policy: ForwardRefPolicy = ...,
-    typecheck_fail_callback: TypeCheckFailCallback | None = ...,
-    collection_check_strategy: CollectionCheckStrategy = ...,
-) -> Any: ...
-
-
-def check_type(
-    value: object,
-    expected_type: Any,
-    *,
-    forward_ref_policy: ForwardRefPolicy = TypeCheckConfiguration().forward_ref_policy,
-    typecheck_fail_callback: TypeCheckFailCallback | None = (
-        TypeCheckConfiguration().typecheck_fail_callback
-    ),
-    collection_check_strategy: CollectionCheckStrategy = (
-        TypeCheckConfiguration().collection_check_strategy
-    ),
-) -> Any:
-    """
-    Ensure that ``value`` matches ``expected_type``.
-
-    The types from the :mod:`typing` module do not support :func:`isinstance` or
-    :func:`issubclass` so a number of type specific checks are required. This function
-    knows which checker to call for which type.
-
-    This function wraps :func:`~.check_type_internal` in the following ways:
-
-    * Respects type checking suppression (:func:`~.suppress_type_checks`)
-    * Forms a :class:`~.TypeCheckMemo` from the current stack frame
-    * Calls the configured type check fail callback if the check fails
-
-    Note that this function is independent of the globally shared configuration in
-    :data:`typeguard.config`. This means that usage within libraries is safe from being
-    affected configuration changes made by other libraries or by the integrating
-    application. Instead, configuration options have the same default values as their
-    corresponding fields in :class:`TypeCheckConfiguration`.
-
-    :param value: value to be checked against ``expected_type``
-    :param expected_type: a class or generic type instance, or a tuple of such things
-    :param forward_ref_policy: see :attr:`TypeCheckConfiguration.forward_ref_policy`
-    :param typecheck_fail_callback:
-        see :attr`TypeCheckConfiguration.typecheck_fail_callback`
-    :param collection_check_strategy:
-        see :attr:`TypeCheckConfiguration.collection_check_strategy`
-    :return: ``value``, unmodified
-    :raises TypeCheckError: if there is a type mismatch
-
-    """
-    if type(expected_type) is tuple:
-        expected_type = Union[expected_type]
-
-    config = TypeCheckConfiguration(
-        forward_ref_policy=forward_ref_policy,
-        typecheck_fail_callback=typecheck_fail_callback,
-        collection_check_strategy=collection_check_strategy,
-    )
-
-    if _suppression.type_checks_suppressed or expected_type is Any:
-        return value
-
-    frame = sys._getframe(1)
-    memo = TypeCheckMemo(frame.f_globals, frame.f_locals, config=config)
-    try:
-        check_type_internal(value, expected_type, memo)
-    except TypeCheckError as exc:
-        exc.append_path_element(qualified_name(value, add_class_prefix=True))
-        if config.typecheck_fail_callback:
-            config.typecheck_fail_callback(exc, memo)
-        else:
-            raise
-
-    return value
-
-
-def check_argument_types(
-    func_name: str,
-    arguments: dict[str, tuple[Any, Any]],
-    memo: TypeCheckMemo,
-) -> Literal[True]:
-    if _suppression.type_checks_suppressed:
-        return True
-
-    for argname, (value, annotation) in arguments.items():
-        if annotation is NoReturn or annotation is Never:
-            exc = TypeCheckError(
-                f"{func_name}() was declared never to be called but it was"
-            )
-            if memo.config.typecheck_fail_callback:
-                memo.config.typecheck_fail_callback(exc, memo)
-            else:
-                raise exc
-
-        try:
-            check_type_internal(value, annotation, memo)
-        except TypeCheckError as exc:
-            qualname = qualified_name(value, add_class_prefix=True)
-            exc.append_path_element(f'argument "{argname}" ({qualname})')
-            if memo.config.typecheck_fail_callback:
-                memo.config.typecheck_fail_callback(exc, memo)
-            else:
-                raise
-
-    return True
-
-
-def check_return_type(
-    func_name: str,
-    retval: T,
-    annotation: Any,
-    memo: TypeCheckMemo,
-) -> T:
-    if _suppression.type_checks_suppressed:
-        return retval
-
-    if annotation is NoReturn or annotation is Never:
-        exc = TypeCheckError(f"{func_name}() was declared never to return but it did")
-        if memo.config.typecheck_fail_callback:
-            memo.config.typecheck_fail_callback(exc, memo)
-        else:
-            raise exc
-
-    try:
-        check_type_internal(retval, annotation, memo)
-    except TypeCheckError as exc:
-        # Allow NotImplemented if this is a binary magic method (__eq__() et al)
-        if retval is NotImplemented and annotation is bool:
-            # This does (and cannot) not check if it's actually a method
-            func_name = func_name.rsplit(".", 1)[-1]
-            if func_name in BINARY_MAGIC_METHODS:
-                return retval
-
-        qualname = qualified_name(retval, add_class_prefix=True)
-        exc.append_path_element(f"the return value ({qualname})")
-        if memo.config.typecheck_fail_callback:
-            memo.config.typecheck_fail_callback(exc, memo)
-        else:
-            raise
-
-    return retval
-
-
-def check_send_type(
-    func_name: str,
-    sendval: T,
-    annotation: Any,
-    memo: TypeCheckMemo,
-) -> T:
-    if _suppression.type_checks_suppressed:
-        return sendval
-
-    if annotation is NoReturn or annotation is Never:
-        exc = TypeCheckError(
-            f"{func_name}() was declared never to be sent a value to but it was"
-        )
-        if memo.config.typecheck_fail_callback:
-            memo.config.typecheck_fail_callback(exc, memo)
-        else:
-            raise exc
-
-    try:
-        check_type_internal(sendval, annotation, memo)
-    except TypeCheckError as exc:
-        qualname = qualified_name(sendval, add_class_prefix=True)
-        exc.append_path_element(f"the value sent to generator ({qualname})")
-        if memo.config.typecheck_fail_callback:
-            memo.config.typecheck_fail_callback(exc, memo)
-        else:
-            raise
-
-    return sendval
-
-
-def check_yield_type(
-    func_name: str,
-    yieldval: T,
-    annotation: Any,
-    memo: TypeCheckMemo,
-) -> T:
-    if _suppression.type_checks_suppressed:
-        return yieldval
-
-    if annotation is NoReturn or annotation is Never:
-        exc = TypeCheckError(f"{func_name}() was declared never to yield but it did")
-        if memo.config.typecheck_fail_callback:
-            memo.config.typecheck_fail_callback(exc, memo)
-        else:
-            raise exc
-
-    try:
-        check_type_internal(yieldval, annotation, memo)
-    except TypeCheckError as exc:
-        qualname = qualified_name(yieldval, add_class_prefix=True)
-        exc.append_path_element(f"the yielded value ({qualname})")
-        if memo.config.typecheck_fail_callback:
-            memo.config.typecheck_fail_callback(exc, memo)
-        else:
-            raise
-
-    return yieldval
-
-
-def check_variable_assignment(
-    value: object, varname: str, annotation: Any, memo: TypeCheckMemo
-) -> Any:
-    if _suppression.type_checks_suppressed:
-        return value
-
-    try:
-        check_type_internal(value, annotation, memo)
-    except TypeCheckError as exc:
-        qualname = qualified_name(value, add_class_prefix=True)
-        exc.append_path_element(f"value assigned to {varname} ({qualname})")
-        if memo.config.typecheck_fail_callback:
-            memo.config.typecheck_fail_callback(exc, memo)
-        else:
-            raise
-
-    return value
-
-
-def check_multi_variable_assignment(
-    value: Any, targets: list[dict[str, Any]], memo: TypeCheckMemo
-) -> Any:
-    if max(len(target) for target in targets) == 1:
-        iterated_values = [value]
-    else:
-        iterated_values = list(value)
-
-    if not _suppression.type_checks_suppressed:
-        for expected_types in targets:
-            value_index = 0
-            for ann_index, (varname, expected_type) in enumerate(
-                expected_types.items()
-            ):
-                if varname.startswith("*"):
-                    varname = varname[1:]
-                    keys_left = len(expected_types) - 1 - ann_index
-                    next_value_index = len(iterated_values) - keys_left
-                    obj: object = iterated_values[value_index:next_value_index]
-                    value_index = next_value_index
-                else:
-                    obj = iterated_values[value_index]
-                    value_index += 1
-
-                try:
-                    check_type_internal(obj, expected_type, memo)
-                except TypeCheckError as exc:
-                    qualname = qualified_name(obj, add_class_prefix=True)
-                    exc.append_path_element(f"value assigned to {varname} ({qualname})")
-                    if memo.config.typecheck_fail_callback:
-                        memo.config.typecheck_fail_callback(exc, memo)
-                    else:
-                        raise
-
-    return iterated_values[0] if len(iterated_values) == 1 else iterated_values
-
-
-def warn_on_error(exc: TypeCheckError, memo: TypeCheckMemo) -> None:
-    """
-    Emit a warning on a type mismatch.
-
-    This is intended to be used as an error handler in
-    :attr:`TypeCheckConfiguration.typecheck_fail_callback`.
-
-    """
-    warnings.warn(TypeCheckWarning(str(exc)), stacklevel=get_stacklevel())
diff --git a/lib/typeguard/_importhook.py b/lib/typeguard/_importhook.py
deleted file mode 100644
index 8590540a..00000000
--- a/lib/typeguard/_importhook.py
+++ /dev/null
@@ -1,213 +0,0 @@
-from __future__ import annotations
-
-import ast
-import sys
-import types
-from collections.abc import Callable, Iterable
-from importlib.abc import MetaPathFinder
-from importlib.machinery import ModuleSpec, SourceFileLoader
-from importlib.util import cache_from_source, decode_source
-from inspect import isclass
-from os import PathLike
-from types import CodeType, ModuleType, TracebackType
-from typing import Sequence, TypeVar
-from unittest.mock import patch
-
-from ._config import global_config
-from ._transformer import TypeguardTransformer
-
-if sys.version_info >= (3, 12):
-    from collections.abc import Buffer
-else:
-    from typing_extensions import Buffer
-
-if sys.version_info >= (3, 11):
-    from typing import ParamSpec
-else:
-    from typing_extensions import ParamSpec
-
-if sys.version_info >= (3, 10):
-    from importlib.metadata import PackageNotFoundError, version
-else:
-    from importlib_metadata import PackageNotFoundError, version
-
-try:
-    OPTIMIZATION = "typeguard" + "".join(version("typeguard").split(".")[:3])
-except PackageNotFoundError:
-    OPTIMIZATION = "typeguard"
-
-P = ParamSpec("P")
-T = TypeVar("T")
-
-
-# The name of this function is magical
-def _call_with_frames_removed(
-    f: Callable[P, T], *args: P.args, **kwargs: P.kwargs
-) -> T:
-    return f(*args, **kwargs)
-
-
-def optimized_cache_from_source(path: str, debug_override: bool | None = None) -> str:
-    return cache_from_source(path, debug_override, optimization=OPTIMIZATION)
-
-
-class TypeguardLoader(SourceFileLoader):
-    @staticmethod
-    def source_to_code(
-        data: Buffer | str | ast.Module | ast.Expression | ast.Interactive,
-        path: Buffer | str | PathLike[str] = "<string>",
-    ) -> CodeType:
-        if isinstance(data, (ast.Module, ast.Expression, ast.Interactive)):
-            tree = data
-        else:
-            if isinstance(data, str):
-                source = data
-            else:
-                source = decode_source(data)
-
-            tree = _call_with_frames_removed(
-                ast.parse,
-                source,
-                path,
-                "exec",
-            )
-
-        tree = TypeguardTransformer().visit(tree)
-        ast.fix_missing_locations(tree)
-
-        if global_config.debug_instrumentation and sys.version_info >= (3, 9):
-            print(
-                f"Source code of {path!r} after instrumentation:\n"
-                "----------------------------------------------",
-                file=sys.stderr,
-            )
-            print(ast.unparse(tree), file=sys.stderr)
-            print("----------------------------------------------", file=sys.stderr)
-
-        return _call_with_frames_removed(
-            compile, tree, path, "exec", 0, dont_inherit=True
-        )
-
-    def exec_module(self, module: ModuleType) -> None:
-        # Use a custom optimization marker – the import lock should make this monkey
-        # patch safe
-        with patch(
-            "importlib._bootstrap_external.cache_from_source",
-            optimized_cache_from_source,
-        ):
-            super().exec_module(module)
-
-
-class TypeguardFinder(MetaPathFinder):
-    """
-    Wraps another path finder and instruments the module with
-    :func:`@typechecked <typeguard.typechecked>` if :meth:`should_instrument` returns
-    ``True``.
-
-    Should not be used directly, but rather via :func:`~.install_import_hook`.
-
-    .. versionadded:: 2.6
-    """
-
-    def __init__(self, packages: list[str] | None, original_pathfinder: MetaPathFinder):
-        self.packages = packages
-        self._original_pathfinder = original_pathfinder
-
-    def find_spec(
-        self,
-        fullname: str,
-        path: Sequence[str] | None,
-        target: types.ModuleType | None = None,
-    ) -> ModuleSpec | None:
-        if self.should_instrument(fullname):
-            spec = self._original_pathfinder.find_spec(fullname, path, target)
-            if spec is not None and isinstance(spec.loader, SourceFileLoader):
-                spec.loader = TypeguardLoader(spec.loader.name, spec.loader.path)
-                return spec
-
-        return None
-
-    def should_instrument(self, module_name: str) -> bool:
-        """
-        Determine whether the module with the given name should be instrumented.
-
-        :param module_name: full name of the module that is about to be imported (e.g.
-            ``xyz.abc``)
-
-        """
-        if self.packages is None:
-            return True
-
-        for package in self.packages:
-            if module_name == package or module_name.startswith(package + "."):
-                return True
-
-        return False
-
-
-class ImportHookManager:
-    """
-    A handle that can be used to uninstall the Typeguard import hook.
-    """
-
-    def __init__(self, hook: MetaPathFinder):
-        self.hook = hook
-
-    def __enter__(self) -> None:
-        pass
-
-    def __exit__(
-        self,
-        exc_type: type[BaseException],
-        exc_val: BaseException,
-        exc_tb: TracebackType,
-    ) -> None:
-        self.uninstall()
-
-    def uninstall(self) -> None:
-        """Uninstall the import hook."""
-        try:
-            sys.meta_path.remove(self.hook)
-        except ValueError:
-            pass  # already removed
-
-
-def install_import_hook(
-    packages: Iterable[str] | None = None,
-    *,
-    cls: type[TypeguardFinder] = TypeguardFinder,
-) -> ImportHookManager:
-    """
-    Install an import hook that instruments functions for automatic type checking.
-
-    This only affects modules loaded **after** this hook has been installed.
-
-    :param packages: an iterable of package names to instrument, or ``None`` to
-        instrument all packages
-    :param cls: a custom meta path finder class
-    :return: a context manager that uninstalls the hook on exit (or when you call
-        ``.uninstall()``)
-
-    .. versionadded:: 2.6
-
-    """
-    if packages is None:
-        target_packages: list[str] | None = None
-    elif isinstance(packages, str):
-        target_packages = [packages]
-    else:
-        target_packages = list(packages)
-
-    for finder in sys.meta_path:
-        if (
-            isclass(finder)
-            and finder.__name__ == "PathFinder"
-            and hasattr(finder, "find_spec")
-        ):
-            break
-    else:
-        raise RuntimeError("Cannot find a PathFinder in sys.meta_path")
-
-    hook = cls(target_packages, finder)
-    sys.meta_path.insert(0, hook)
-    return ImportHookManager(hook)
diff --git a/lib/typeguard/_memo.py b/lib/typeguard/_memo.py
deleted file mode 100644
index 1d0d80c6..00000000
--- a/lib/typeguard/_memo.py
+++ /dev/null
@@ -1,48 +0,0 @@
-from __future__ import annotations
-
-from typing import Any
-
-from typeguard._config import TypeCheckConfiguration, global_config
-
-
-class TypeCheckMemo:
-    """
-    Contains information necessary for type checkers to do their work.
-
-    .. attribute:: globals
-       :type: dict[str, Any]
-
-        Dictionary of global variables to use for resolving forward references.
-
-    .. attribute:: locals
-       :type: dict[str, Any]
-
-        Dictionary of local variables to use for resolving forward references.
-
-    .. attribute:: self_type
-       :type: type | None
-
-        When running type checks within an instance method or class method, this is the
-        class object that the first argument (usually named ``self`` or ``cls``) refers
-        to.
-
-    .. attribute:: config
-       :type: TypeCheckConfiguration
-
-         Contains the configuration for a particular set of type checking operations.
-    """
-
-    __slots__ = "globals", "locals", "self_type", "config"
-
-    def __init__(
-        self,
-        globals: dict[str, Any],
-        locals: dict[str, Any],
-        *,
-        self_type: type | None = None,
-        config: TypeCheckConfiguration = global_config,
-    ):
-        self.globals = globals
-        self.locals = locals
-        self.self_type = self_type
-        self.config = config
diff --git a/lib/typeguard/_pytest_plugin.py b/lib/typeguard/_pytest_plugin.py
deleted file mode 100644
index 7b2f494e..00000000
--- a/lib/typeguard/_pytest_plugin.py
+++ /dev/null
@@ -1,127 +0,0 @@
-from __future__ import annotations
-
-import sys
-import warnings
-from typing import TYPE_CHECKING, Any, Literal
-
-from typeguard._config import CollectionCheckStrategy, ForwardRefPolicy, global_config
-from typeguard._exceptions import InstrumentationWarning
-from typeguard._importhook import install_import_hook
-from typeguard._utils import qualified_name, resolve_reference
-
-if TYPE_CHECKING:
-    from pytest import Config, Parser
-
-
-def pytest_addoption(parser: Parser) -> None:
-    def add_ini_option(
-        opt_type: (
-            Literal["string", "paths", "pathlist", "args", "linelist", "bool"] | None
-        ),
-    ) -> None:
-        parser.addini(
-            group.options[-1].names()[0][2:],
-            group.options[-1].attrs()["help"],
-            opt_type,
-        )
-
-    group = parser.getgroup("typeguard")
-    group.addoption(
-        "--typeguard-packages",
-        action="store",
-        help="comma separated name list of packages and modules to instrument for "
-        "type checking, or :all: to instrument all modules loaded after typeguard",
-    )
-    add_ini_option("linelist")
-
-    group.addoption(
-        "--typeguard-debug-instrumentation",
-        action="store_true",
-        help="print all instrumented code to stderr",
-    )
-    add_ini_option("bool")
-
-    group.addoption(
-        "--typeguard-typecheck-fail-callback",
-        action="store",
-        help=(
-            "a module:varname (e.g. typeguard:warn_on_error) reference to a function "
-            "that is called (with the exception, and memo object as arguments) to "
-            "handle a TypeCheckError"
-        ),
-    )
-    add_ini_option("string")
-
-    group.addoption(
-        "--typeguard-forward-ref-policy",
-        action="store",
-        choices=list(ForwardRefPolicy.__members__),
-        help=(
-            "determines how to deal with unresolveable forward references in type "
-            "annotations"
-        ),
-    )
-    add_ini_option("string")
-
-    group.addoption(
-        "--typeguard-collection-check-strategy",
-        action="store",
-        choices=list(CollectionCheckStrategy.__members__),
-        help="determines how thoroughly to check collections (list, dict, etc)",
-    )
-    add_ini_option("string")
-
-
-def pytest_configure(config: Config) -> None:
-    def getoption(name: str) -> Any:
-        return config.getoption(name.replace("-", "_")) or config.getini(name)
-
-    packages: list[str] | None = []
-    if packages_option := config.getoption("typeguard_packages"):
-        packages = [pkg.strip() for pkg in packages_option.split(",")]
-    elif packages_ini := config.getini("typeguard-packages"):
-        packages = packages_ini
-
-    if packages:
-        if packages == [":all:"]:
-            packages = None
-        else:
-            already_imported_packages = sorted(
-                package for package in packages if package in sys.modules
-            )
-            if already_imported_packages:
-                warnings.warn(
-                    f"typeguard cannot check these packages because they are already "
-                    f"imported: {', '.join(already_imported_packages)}",
-                    InstrumentationWarning,
-                    stacklevel=1,
-                )
-
-        install_import_hook(packages=packages)
-
-    debug_option = getoption("typeguard-debug-instrumentation")
-    if debug_option:
-        global_config.debug_instrumentation = True
-
-    fail_callback_option = getoption("typeguard-typecheck-fail-callback")
-    if fail_callback_option:
-        callback = resolve_reference(fail_callback_option)
-        if not callable(callback):
-            raise TypeError(
-                f"{fail_callback_option} ({qualified_name(callback.__class__)}) is not "
-                f"a callable"
-            )
-
-        global_config.typecheck_fail_callback = callback
-
-    forward_ref_policy_option = getoption("typeguard-forward-ref-policy")
-    if forward_ref_policy_option:
-        forward_ref_policy = ForwardRefPolicy.__members__[forward_ref_policy_option]
-        global_config.forward_ref_policy = forward_ref_policy
-
-    collection_check_strategy_option = getoption("typeguard-collection-check-strategy")
-    if collection_check_strategy_option:
-        collection_check_strategy = CollectionCheckStrategy.__members__[
-            collection_check_strategy_option
-        ]
-        global_config.collection_check_strategy = collection_check_strategy
diff --git a/lib/typeguard/_suppression.py b/lib/typeguard/_suppression.py
deleted file mode 100644
index bbbfbfbe..00000000
--- a/lib/typeguard/_suppression.py
+++ /dev/null
@@ -1,86 +0,0 @@
-from __future__ import annotations
-
-import sys
-from collections.abc import Callable, Generator
-from contextlib import contextmanager
-from functools import update_wrapper
-from threading import Lock
-from typing import ContextManager, TypeVar, overload
-
-if sys.version_info >= (3, 10):
-    from typing import ParamSpec
-else:
-    from typing_extensions import ParamSpec
-
-P = ParamSpec("P")
-T = TypeVar("T")
-
-type_checks_suppressed = 0
-type_checks_suppress_lock = Lock()
-
-
-@overload
-def suppress_type_checks(func: Callable[P, T]) -> Callable[P, T]: ...
-
-
-@overload
-def suppress_type_checks() -> ContextManager[None]: ...
-
-
-def suppress_type_checks(
-    func: Callable[P, T] | None = None,
-) -> Callable[P, T] | ContextManager[None]:
-    """
-    Temporarily suppress all type checking.
-
-    This function has two operating modes, based on how it's used:
-
-    #. as a context manager (``with suppress_type_checks(): ...``)
-    #. as a decorator (``@suppress_type_checks``)
-
-    When used as a context manager, :func:`check_type` and any automatically
-    instrumented functions skip the actual type checking. These context managers can be
-    nested.
-
-    When used as a decorator, all type checking is suppressed while the function is
-    running.
-
-    Type checking will resume once no more context managers are active and no decorated
-    functions are running.
-
-    Both operating modes are thread-safe.
-
-    """
-
-    def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
-        global type_checks_suppressed
-
-        with type_checks_suppress_lock:
-            type_checks_suppressed += 1
-
-        assert func is not None
-        try:
-            return func(*args, **kwargs)
-        finally:
-            with type_checks_suppress_lock:
-                type_checks_suppressed -= 1
-
-    def cm() -> Generator[None, None, None]:
-        global type_checks_suppressed
-
-        with type_checks_suppress_lock:
-            type_checks_suppressed += 1
-
-        try:
-            yield
-        finally:
-            with type_checks_suppress_lock:
-                type_checks_suppressed -= 1
-
-    if func is None:
-        # Context manager mode
-        return contextmanager(cm)()
-    else:
-        # Decorator mode
-        update_wrapper(wrapper, func)
-        return wrapper
diff --git a/lib/typeguard/_transformer.py b/lib/typeguard/_transformer.py
deleted file mode 100644
index 13ac3630..00000000
--- a/lib/typeguard/_transformer.py
+++ /dev/null
@@ -1,1229 +0,0 @@
-from __future__ import annotations
-
-import ast
-import builtins
-import sys
-import typing
-from ast import (
-    AST,
-    Add,
-    AnnAssign,
-    Assign,
-    AsyncFunctionDef,
-    Attribute,
-    AugAssign,
-    BinOp,
-    BitAnd,
-    BitOr,
-    BitXor,
-    Call,
-    ClassDef,
-    Constant,
-    Dict,
-    Div,
-    Expr,
-    Expression,
-    FloorDiv,
-    FunctionDef,
-    If,
-    Import,
-    ImportFrom,
-    Index,
-    List,
-    Load,
-    LShift,
-    MatMult,
-    Mod,
-    Module,
-    Mult,
-    Name,
-    NamedExpr,
-    NodeTransformer,
-    NodeVisitor,
-    Pass,
-    Pow,
-    Return,
-    RShift,
-    Starred,
-    Store,
-    Sub,
-    Subscript,
-    Tuple,
-    Yield,
-    YieldFrom,
-    alias,
-    copy_location,
-    expr,
-    fix_missing_locations,
-    keyword,
-    walk,
-)
-from collections import defaultdict
-from collections.abc import Generator, Sequence
-from contextlib import contextmanager
-from copy import deepcopy
-from dataclasses import dataclass, field
-from typing import Any, ClassVar, cast, overload
-
-generator_names = (
-    "typing.Generator",
-    "collections.abc.Generator",
-    "typing.Iterator",
-    "collections.abc.Iterator",
-    "typing.Iterable",
-    "collections.abc.Iterable",
-    "typing.AsyncIterator",
-    "collections.abc.AsyncIterator",
-    "typing.AsyncIterable",
-    "collections.abc.AsyncIterable",
-    "typing.AsyncGenerator",
-    "collections.abc.AsyncGenerator",
-)
-anytype_names = (
-    "typing.Any",
-    "typing_extensions.Any",
-)
-literal_names = (
-    "typing.Literal",
-    "typing_extensions.Literal",
-)
-annotated_names = (
-    "typing.Annotated",
-    "typing_extensions.Annotated",
-)
-ignore_decorators = (
-    "typing.no_type_check",
-    "typeguard.typeguard_ignore",
-)
-aug_assign_functions = {
-    Add: "iadd",
-    Sub: "isub",
-    Mult: "imul",
-    MatMult: "imatmul",
-    Div: "itruediv",
-    FloorDiv: "ifloordiv",
-    Mod: "imod",
-    Pow: "ipow",
-    LShift: "ilshift",
-    RShift: "irshift",
-    BitAnd: "iand",
-    BitXor: "ixor",
-    BitOr: "ior",
-}
-
-
-@dataclass
-class TransformMemo:
-    node: Module | ClassDef | FunctionDef | AsyncFunctionDef | None
-    parent: TransformMemo | None
-    path: tuple[str, ...]
-    joined_path: Constant = field(init=False)
-    return_annotation: expr | None = None
-    yield_annotation: expr | None = None
-    send_annotation: expr | None = None
-    is_async: bool = False
-    local_names: set[str] = field(init=False, default_factory=set)
-    imported_names: dict[str, str] = field(init=False, default_factory=dict)
-    ignored_names: set[str] = field(init=False, default_factory=set)
-    load_names: defaultdict[str, dict[str, Name]] = field(
-        init=False, default_factory=lambda: defaultdict(dict)
-    )
-    has_yield_expressions: bool = field(init=False, default=False)
-    has_return_expressions: bool = field(init=False, default=False)
-    memo_var_name: Name | None = field(init=False, default=None)
-    should_instrument: bool = field(init=False, default=True)
-    variable_annotations: dict[str, expr] = field(init=False, default_factory=dict)
-    configuration_overrides: dict[str, Any] = field(init=False, default_factory=dict)
-    code_inject_index: int = field(init=False, default=0)
-
-    def __post_init__(self) -> None:
-        elements: list[str] = []
-        memo = self
-        while isinstance(memo.node, (ClassDef, FunctionDef, AsyncFunctionDef)):
-            elements.insert(0, memo.node.name)
-            if not memo.parent:
-                break
-
-            memo = memo.parent
-            if isinstance(memo.node, (FunctionDef, AsyncFunctionDef)):
-                elements.insert(0, "<locals>")
-
-        self.joined_path = Constant(".".join(elements))
-
-        # Figure out where to insert instrumentation code
-        if self.node:
-            for index, child in enumerate(self.node.body):
-                if isinstance(child, ImportFrom) and child.module == "__future__":
-                    # (module only) __future__ imports must come first
-                    continue
-                elif (
-                    isinstance(child, Expr)
-                    and isinstance(child.value, Constant)
-                    and isinstance(child.value.value, str)
-                ):
-                    continue  # docstring
-
-                self.code_inject_index = index
-                break
-
-    def get_unused_name(self, name: str) -> str:
-        memo: TransformMemo | None = self
-        while memo is not None:
-            if name in memo.local_names:
-                memo = self
-                name += "_"
-            else:
-                memo = memo.parent
-
-        self.local_names.add(name)
-        return name
-
-    def is_ignored_name(self, expression: expr | Expr | None) -> bool:
-        top_expression = (
-            expression.value if isinstance(expression, Expr) else expression
-        )
-
-        if isinstance(top_expression, Attribute) and isinstance(
-            top_expression.value, Name
-        ):
-            name = top_expression.value.id
-        elif isinstance(top_expression, Name):
-            name = top_expression.id
-        else:
-            return False
-
-        memo: TransformMemo | None = self
-        while memo is not None:
-            if name in memo.ignored_names:
-                return True
-
-            memo = memo.parent
-
-        return False
-
-    def get_memo_name(self) -> Name:
-        if not self.memo_var_name:
-            self.memo_var_name = Name(id="memo", ctx=Load())
-
-        return self.memo_var_name
-
-    def get_import(self, module: str, name: str) -> Name:
-        if module in self.load_names and name in self.load_names[module]:
-            return self.load_names[module][name]
-
-        qualified_name = f"{module}.{name}"
-        if name in self.imported_names and self.imported_names[name] == qualified_name:
-            return Name(id=name, ctx=Load())
-
-        alias = self.get_unused_name(name)
-        node = self.load_names[module][name] = Name(id=alias, ctx=Load())
-        self.imported_names[name] = qualified_name
-        return node
-
-    def insert_imports(self, node: Module | FunctionDef | AsyncFunctionDef) -> None:
-        """Insert imports needed by injected code."""
-        if not self.load_names:
-            return
-
-        # Insert imports after any "from __future__ ..." imports and any docstring
-        for modulename, names in self.load_names.items():
-            aliases = [
-                alias(orig_name, new_name.id if orig_name != new_name.id else None)
-                for orig_name, new_name in sorted(names.items())
-            ]
-            node.body.insert(self.code_inject_index, ImportFrom(modulename, aliases, 0))
-
-    def name_matches(self, expression: expr | Expr | None, *names: str) -> bool:
-        if expression is None:
-            return False
-
-        path: list[str] = []
-        top_expression = (
-            expression.value if isinstance(expression, Expr) else expression
-        )
-
-        if isinstance(top_expression, Subscript):
-            top_expression = top_expression.value
-        elif isinstance(top_expression, Call):
-            top_expression = top_expression.func
-
-        while isinstance(top_expression, Attribute):
-            path.insert(0, top_expression.attr)
-            top_expression = top_expression.value
-
-        if not isinstance(top_expression, Name):
-            return False
-
-        if top_expression.id in self.imported_names:
-            translated = self.imported_names[top_expression.id]
-        elif hasattr(builtins, top_expression.id):
-            translated = "builtins." + top_expression.id
-        else:
-            translated = top_expression.id
-
-        path.insert(0, translated)
-        joined_path = ".".join(path)
-        if joined_path in names:
-            return True
-        elif self.parent:
-            return self.parent.name_matches(expression, *names)
-        else:
-            return False
-
-    def get_config_keywords(self) -> list[keyword]:
-        if self.parent and isinstance(self.parent.node, ClassDef):
-            overrides = self.parent.configuration_overrides.copy()
-        else:
-            overrides = {}
-
-        overrides.update(self.configuration_overrides)
-        return [keyword(key, value) for key, value in overrides.items()]
-
-
-class NameCollector(NodeVisitor):
-    def __init__(self) -> None:
-        self.names: set[str] = set()
-
-    def visit_Import(self, node: Import) -> None:
-        for name in node.names:
-            self.names.add(name.asname or name.name)
-
-    def visit_ImportFrom(self, node: ImportFrom) -> None:
-        for name in node.names:
-            self.names.add(name.asname or name.name)
-
-    def visit_Assign(self, node: Assign) -> None:
-        for target in node.targets:
-            if isinstance(target, Name):
-                self.names.add(target.id)
-
-    def visit_NamedExpr(self, node: NamedExpr) -> Any:
-        if isinstance(node.target, Name):
-            self.names.add(node.target.id)
-
-    def visit_FunctionDef(self, node: FunctionDef) -> None:
-        pass
-
-    def visit_ClassDef(self, node: ClassDef) -> None:
-        pass
-
-
-class GeneratorDetector(NodeVisitor):
-    """Detects if a function node is a generator function."""
-
-    contains_yields: bool = False
-    in_root_function: bool = False
-
-    def visit_Yield(self, node: Yield) -> Any:
-        self.contains_yields = True
-
-    def visit_YieldFrom(self, node: YieldFrom) -> Any:
-        self.contains_yields = True
-
-    def visit_ClassDef(self, node: ClassDef) -> Any:
-        pass
-
-    def visit_FunctionDef(self, node: FunctionDef | AsyncFunctionDef) -> Any:
-        if not self.in_root_function:
-            self.in_root_function = True
-            self.generic_visit(node)
-            self.in_root_function = False
-
-    def visit_AsyncFunctionDef(self, node: AsyncFunctionDef) -> Any:
-        self.visit_FunctionDef(node)
-
-
-class AnnotationTransformer(NodeTransformer):
-    type_substitutions: ClassVar[dict[str, tuple[str, str]]] = {
-        "builtins.dict": ("typing", "Dict"),
-        "builtins.list": ("typing", "List"),
-        "builtins.tuple": ("typing", "Tuple"),
-        "builtins.set": ("typing", "Set"),
-        "builtins.frozenset": ("typing", "FrozenSet"),
-    }
-
-    def __init__(self, transformer: TypeguardTransformer):
-        self.transformer = transformer
-        self._memo = transformer._memo
-        self._level = 0
-
-    def visit(self, node: AST) -> Any:
-        # Don't process Literals
-        if isinstance(node, expr) and self._memo.name_matches(node, *literal_names):
-            return node
-
-        self._level += 1
-        new_node = super().visit(node)
-        self._level -= 1
-
-        if isinstance(new_node, Expression) and not hasattr(new_node, "body"):
-            return None
-
-        # Return None if this new node matches a variation of typing.Any
-        if (
-            self._level == 0
-            and isinstance(new_node, expr)
-            and self._memo.name_matches(new_node, *anytype_names)
-        ):
-            return None
-
-        return new_node
-
-    def visit_BinOp(self, node: BinOp) -> Any:
-        self.generic_visit(node)
-
-        if isinstance(node.op, BitOr):
-            # If either branch of the BinOp has been transformed to `None`, it means
-            # that a type in the union was ignored, so the entire annotation should e
-            # ignored
-            if not hasattr(node, "left") or not hasattr(node, "right"):
-                return None
-
-            # Return Any if either side is Any
-            if self._memo.name_matches(node.left, *anytype_names):
-                return node.left
-            elif self._memo.name_matches(node.right, *anytype_names):
-                return node.right
-
-            if sys.version_info < (3, 10):
-                union_name = self.transformer._get_import("typing", "Union")
-                return Subscript(
-                    value=union_name,
-                    slice=Index(
-                        Tuple(elts=[node.left, node.right], ctx=Load()), ctx=Load()
-                    ),
-                    ctx=Load(),
-                )
-
-        return node
-
-    def visit_Attribute(self, node: Attribute) -> Any:
-        if self._memo.is_ignored_name(node):
-            return None
-
-        return node
-
-    def visit_Subscript(self, node: Subscript) -> Any:
-        if self._memo.is_ignored_name(node.value):
-            return None
-
-        # The subscript of typing(_extensions).Literal can be any arbitrary string, so
-        # don't try to evaluate it as code
-        if node.slice:
-            if isinstance(node.slice, Index):
-                # Python 3.8
-                slice_value = node.slice.value  # type: ignore[attr-defined]
-            else:
-                slice_value = node.slice
-
-            if isinstance(slice_value, Tuple):
-                if self._memo.name_matches(node.value, *annotated_names):
-                    # Only treat the first argument to typing.Annotated as a potential
-                    # forward reference
-                    items = cast(
-                        typing.List[expr],
-                        [self.visit(slice_value.elts[0])] + slice_value.elts[1:],
-                    )
-                else:
-                    items = cast(
-                        typing.List[expr],
-                        [self.visit(item) for item in slice_value.elts],
-                    )
-
-                # If this is a Union and any of the items is Any, erase the entire
-                # annotation
-                if self._memo.name_matches(node.value, "typing.Union") and any(
-                    item is None
-                    or (
-                        isinstance(item, expr)
-                        and self._memo.name_matches(item, *anytype_names)
-                    )
-                    for item in items
-                ):
-                    return None
-
-                # If all items in the subscript were Any, erase the subscript entirely
-                if all(item is None for item in items):
-                    return node.value
-
-                for index, item in enumerate(items):
-                    if item is None:
-                        items[index] = self.transformer._get_import("typing", "Any")
-
-                slice_value.elts = items
-            else:
-                self.generic_visit(node)
-
-                # If the transformer erased the slice entirely, just return the node
-                # value without the subscript (unless it's Optional, in which case erase
-                # the node entirely
-                if self._memo.name_matches(
-                    node.value, "typing.Optional"
-                ) and not hasattr(node, "slice"):
-                    return None
-                if sys.version_info >= (3, 9) and not hasattr(node, "slice"):
-                    return node.value
-                elif sys.version_info < (3, 9) and not hasattr(node.slice, "value"):
-                    return node.value
-
-        return node
-
-    def visit_Name(self, node: Name) -> Any:
-        if self._memo.is_ignored_name(node):
-            return None
-
-        if sys.version_info < (3, 9):
-            for typename, substitute in self.type_substitutions.items():
-                if self._memo.name_matches(node, typename):
-                    new_node = self.transformer._get_import(*substitute)
-                    return copy_location(new_node, node)
-
-        return node
-
-    def visit_Call(self, node: Call) -> Any:
-        # Don't recurse into calls
-        return node
-
-    def visit_Constant(self, node: Constant) -> Any:
-        if isinstance(node.value, str):
-            expression = ast.parse(node.value, mode="eval")
-            new_node = self.visit(expression)
-            if new_node:
-                return copy_location(new_node.body, node)
-            else:
-                return None
-
-        return node
-
-
-class TypeguardTransformer(NodeTransformer):
-    def __init__(
-        self, target_path: Sequence[str] | None = None, target_lineno: int | None = None
-    ) -> None:
-        self._target_path = tuple(target_path) if target_path else None
-        self._memo = self._module_memo = TransformMemo(None, None, ())
-        self.names_used_in_annotations: set[str] = set()
-        self.target_node: FunctionDef | AsyncFunctionDef | None = None
-        self.target_lineno = target_lineno
-
-    def generic_visit(self, node: AST) -> AST:
-        has_non_empty_body_initially = bool(getattr(node, "body", None))
-        initial_type = type(node)
-
-        node = super().generic_visit(node)
-
-        if (
-            type(node) is initial_type
-            and has_non_empty_body_initially
-            and hasattr(node, "body")
-            and not node.body
-        ):
-            # If we have still the same node type after transformation
-            # but we've optimised it's body away, we add a `pass` statement.
-            node.body = [Pass()]
-
-        return node
-
-    @contextmanager
-    def _use_memo(
-        self, node: ClassDef | FunctionDef | AsyncFunctionDef
-    ) -> Generator[None, Any, None]:
-        new_memo = TransformMemo(node, self._memo, self._memo.path + (node.name,))
-        old_memo = self._memo
-        self._memo = new_memo
-
-        if isinstance(node, (FunctionDef, AsyncFunctionDef)):
-            new_memo.should_instrument = (
-                self._target_path is None or new_memo.path == self._target_path
-            )
-            if new_memo.should_instrument:
-                # Check if the function is a generator function
-                detector = GeneratorDetector()
-                detector.visit(node)
-
-                # Extract yield, send and return types where possible from a subscripted
-                # annotation like Generator[int, str, bool]
-                return_annotation = deepcopy(node.returns)
-                if detector.contains_yields and new_memo.name_matches(
-                    return_annotation, *generator_names
-                ):
-                    if isinstance(return_annotation, Subscript):
-                        annotation_slice = return_annotation.slice
-
-                        # Python < 3.9
-                        if isinstance(annotation_slice, Index):
-                            annotation_slice = (
-                                annotation_slice.value  # type: ignore[attr-defined]
-                            )
-
-                        if isinstance(annotation_slice, Tuple):
-                            items = annotation_slice.elts
-                        else:
-                            items = [annotation_slice]
-
-                        if len(items) > 0:
-                            new_memo.yield_annotation = self._convert_annotation(
-                                items[0]
-                            )
-
-                        if len(items) > 1:
-                            new_memo.send_annotation = self._convert_annotation(
-                                items[1]
-                            )
-
-                        if len(items) > 2:
-                            new_memo.return_annotation = self._convert_annotation(
-                                items[2]
-                            )
-                else:
-                    new_memo.return_annotation = self._convert_annotation(
-                        return_annotation
-                    )
-
-        if isinstance(node, AsyncFunctionDef):
-            new_memo.is_async = True
-
-        yield
-        self._memo = old_memo
-
-    def _get_import(self, module: str, name: str) -> Name:
-        memo = self._memo if self._target_path else self._module_memo
-        return memo.get_import(module, name)
-
-    @overload
-    def _convert_annotation(self, annotation: None) -> None: ...
-
-    @overload
-    def _convert_annotation(self, annotation: expr) -> expr: ...
-
-    def _convert_annotation(self, annotation: expr | None) -> expr | None:
-        if annotation is None:
-            return None
-
-        # Convert PEP 604 unions (x | y) and generic built-in collections where
-        # necessary, and undo forward references
-        new_annotation = cast(expr, AnnotationTransformer(self).visit(annotation))
-        if isinstance(new_annotation, expr):
-            new_annotation = ast.copy_location(new_annotation, annotation)
-
-            # Store names used in the annotation
-            names = {node.id for node in walk(new_annotation) if isinstance(node, Name)}
-            self.names_used_in_annotations.update(names)
-
-        return new_annotation
-
-    def visit_Name(self, node: Name) -> Name:
-        self._memo.local_names.add(node.id)
-        return node
-
-    def visit_Module(self, node: Module) -> Module:
-        self._module_memo = self._memo = TransformMemo(node, None, ())
-        self.generic_visit(node)
-        self._module_memo.insert_imports(node)
-
-        fix_missing_locations(node)
-        return node
-
-    def visit_Import(self, node: Import) -> Import:
-        for name in node.names:
-            self._memo.local_names.add(name.asname or name.name)
-            self._memo.imported_names[name.asname or name.name] = name.name
-
-        return node
-
-    def visit_ImportFrom(self, node: ImportFrom) -> ImportFrom:
-        for name in node.names:
-            if name.name != "*":
-                alias = name.asname or name.name
-                self._memo.local_names.add(alias)
-                self._memo.imported_names[alias] = f"{node.module}.{name.name}"
-
-        return node
-
-    def visit_ClassDef(self, node: ClassDef) -> ClassDef | None:
-        self._memo.local_names.add(node.name)
-
-        # Eliminate top level classes not belonging to the target path
-        if (
-            self._target_path is not None
-            and not self._memo.path
-            and node.name != self._target_path[0]
-        ):
-            return None
-
-        with self._use_memo(node):
-            for decorator in node.decorator_list.copy():
-                if self._memo.name_matches(decorator, "typeguard.typechecked"):
-                    # Remove the decorator to prevent duplicate instrumentation
-                    node.decorator_list.remove(decorator)
-
-                    # Store any configuration overrides
-                    if isinstance(decorator, Call) and decorator.keywords:
-                        self._memo.configuration_overrides.update(
-                            {kw.arg: kw.value for kw in decorator.keywords if kw.arg}
-                        )
-
-            self.generic_visit(node)
-            return node
-
-    def visit_FunctionDef(
-        self, node: FunctionDef | AsyncFunctionDef
-    ) -> FunctionDef | AsyncFunctionDef | None:
-        """
-        Injects type checks for function arguments, and for a return of None if the
-        function is annotated to return something else than Any or None, and the body
-        ends without an explicit "return".
-
-        """
-        self._memo.local_names.add(node.name)
-
-        # Eliminate top level functions not belonging to the target path
-        if (
-            self._target_path is not None
-            and not self._memo.path
-            and node.name != self._target_path[0]
-        ):
-            return None
-
-        # Skip instrumentation if we're instrumenting the whole module and the function
-        # contains either @no_type_check or @typeguard_ignore
-        if self._target_path is None:
-            for decorator in node.decorator_list:
-                if self._memo.name_matches(decorator, *ignore_decorators):
-                    return node
-
-        with self._use_memo(node):
-            arg_annotations: dict[str, Any] = {}
-            if self._target_path is None or self._memo.path == self._target_path:
-                # Find line number we're supposed to match against
-                if node.decorator_list:
-                    first_lineno = node.decorator_list[0].lineno
-                else:
-                    first_lineno = node.lineno
-
-                for decorator in node.decorator_list.copy():
-                    if self._memo.name_matches(decorator, "typing.overload"):
-                        # Remove overloads entirely
-                        return None
-                    elif self._memo.name_matches(decorator, "typeguard.typechecked"):
-                        # Remove the decorator to prevent duplicate instrumentation
-                        node.decorator_list.remove(decorator)
-
-                        # Store any configuration overrides
-                        if isinstance(decorator, Call) and decorator.keywords:
-                            self._memo.configuration_overrides = {
-                                kw.arg: kw.value for kw in decorator.keywords if kw.arg
-                            }
-
-                if self.target_lineno == first_lineno:
-                    assert self.target_node is None
-                    self.target_node = node
-                    if node.decorator_list:
-                        self.target_lineno = node.decorator_list[0].lineno
-                    else:
-                        self.target_lineno = node.lineno
-
-                all_args = node.args.args + node.args.kwonlyargs + node.args.posonlyargs
-
-                # Ensure that any type shadowed by the positional or keyword-only
-                # argument names are ignored in this function
-                for arg in all_args:
-                    self._memo.ignored_names.add(arg.arg)
-
-                # Ensure that any type shadowed by the variable positional argument name
-                # (e.g. "args" in *args) is ignored this function
-                if node.args.vararg:
-                    self._memo.ignored_names.add(node.args.vararg.arg)
-
-                # Ensure that any type shadowed by the variable keywrod argument name
-                # (e.g. "kwargs" in *kwargs) is ignored this function
-                if node.args.kwarg:
-                    self._memo.ignored_names.add(node.args.kwarg.arg)
-
-                for arg in all_args:
-                    annotation = self._convert_annotation(deepcopy(arg.annotation))
-                    if annotation:
-                        arg_annotations[arg.arg] = annotation
-
-                if node.args.vararg:
-                    annotation_ = self._convert_annotation(node.args.vararg.annotation)
-                    if annotation_:
-                        if sys.version_info >= (3, 9):
-                            container = Name("tuple", ctx=Load())
-                        else:
-                            container = self._get_import("typing", "Tuple")
-
-                        subscript_slice: Tuple | Index = Tuple(
-                            [
-                                annotation_,
-                                Constant(Ellipsis),
-                            ],
-                            ctx=Load(),
-                        )
-                        if sys.version_info < (3, 9):
-                            subscript_slice = Index(subscript_slice, ctx=Load())
-
-                        arg_annotations[node.args.vararg.arg] = Subscript(
-                            container, subscript_slice, ctx=Load()
-                        )
-
-                if node.args.kwarg:
-                    annotation_ = self._convert_annotation(node.args.kwarg.annotation)
-                    if annotation_:
-                        if sys.version_info >= (3, 9):
-                            container = Name("dict", ctx=Load())
-                        else:
-                            container = self._get_import("typing", "Dict")
-
-                        subscript_slice = Tuple(
-                            [
-                                Name("str", ctx=Load()),
-                                annotation_,
-                            ],
-                            ctx=Load(),
-                        )
-                        if sys.version_info < (3, 9):
-                            subscript_slice = Index(subscript_slice, ctx=Load())
-
-                        arg_annotations[node.args.kwarg.arg] = Subscript(
-                            container, subscript_slice, ctx=Load()
-                        )
-
-                if arg_annotations:
-                    self._memo.variable_annotations.update(arg_annotations)
-
-            self.generic_visit(node)
-
-            if arg_annotations:
-                annotations_dict = Dict(
-                    keys=[Constant(key) for key in arg_annotations.keys()],
-                    values=[
-                        Tuple([Name(key, ctx=Load()), annotation], ctx=Load())
-                        for key, annotation in arg_annotations.items()
-                    ],
-                )
-                func_name = self._get_import(
-                    "typeguard._functions", "check_argument_types"
-                )
-                args = [
-                    self._memo.joined_path,
-                    annotations_dict,
-                    self._memo.get_memo_name(),
-                ]
-                node.body.insert(
-                    self._memo.code_inject_index, Expr(Call(func_name, args, []))
-                )
-
-            # Add a checked "return None" to the end if there's no explicit return
-            # Skip if the return annotation is None or Any
-            if (
-                self._memo.return_annotation
-                and (not self._memo.is_async or not self._memo.has_yield_expressions)
-                and not isinstance(node.body[-1], Return)
-                and (
-                    not isinstance(self._memo.return_annotation, Constant)
-                    or self._memo.return_annotation.value is not None
-                )
-            ):
-                func_name = self._get_import(
-                    "typeguard._functions", "check_return_type"
-                )
-                return_node = Return(
-                    Call(
-                        func_name,
-                        [
-                            self._memo.joined_path,
-                            Constant(None),
-                            self._memo.return_annotation,
-                            self._memo.get_memo_name(),
-                        ],
-                        [],
-                    )
-                )
-
-                # Replace a placeholder "pass" at the end
-                if isinstance(node.body[-1], Pass):
-                    copy_location(return_node, node.body[-1])
-                    del node.body[-1]
-
-                node.body.append(return_node)
-
-            # Insert code to create the call memo, if it was ever needed for this
-            # function
-            if self._memo.memo_var_name:
-                memo_kwargs: dict[str, Any] = {}
-                if self._memo.parent and isinstance(self._memo.parent.node, ClassDef):
-                    for decorator in node.decorator_list:
-                        if (
-                            isinstance(decorator, Name)
-                            and decorator.id == "staticmethod"
-                        ):
-                            break
-                        elif (
-                            isinstance(decorator, Name)
-                            and decorator.id == "classmethod"
-                        ):
-                            memo_kwargs["self_type"] = Name(
-                                id=node.args.args[0].arg, ctx=Load()
-                            )
-                            break
-                    else:
-                        if node.args.args:
-                            if node.name == "__new__":
-                                memo_kwargs["self_type"] = Name(
-                                    id=node.args.args[0].arg, ctx=Load()
-                                )
-                            else:
-                                memo_kwargs["self_type"] = Attribute(
-                                    Name(id=node.args.args[0].arg, ctx=Load()),
-                                    "__class__",
-                                    ctx=Load(),
-                                )
-
-                # Construct the function reference
-                # Nested functions get special treatment: the function name is added
-                # to free variables (and the closure of the resulting function)
-                names: list[str] = [node.name]
-                memo = self._memo.parent
-                while memo:
-                    if isinstance(memo.node, (FunctionDef, AsyncFunctionDef)):
-                        # This is a nested function. Use the function name as-is.
-                        del names[:-1]
-                        break
-                    elif not isinstance(memo.node, ClassDef):
-                        break
-
-                    names.insert(0, memo.node.name)
-                    memo = memo.parent
-
-                config_keywords = self._memo.get_config_keywords()
-                if config_keywords:
-                    memo_kwargs["config"] = Call(
-                        self._get_import("dataclasses", "replace"),
-                        [self._get_import("typeguard._config", "global_config")],
-                        config_keywords,
-                    )
-
-                self._memo.memo_var_name.id = self._memo.get_unused_name("memo")
-                memo_store_name = Name(id=self._memo.memo_var_name.id, ctx=Store())
-                globals_call = Call(Name(id="globals", ctx=Load()), [], [])
-                locals_call = Call(Name(id="locals", ctx=Load()), [], [])
-                memo_expr = Call(
-                    self._get_import("typeguard", "TypeCheckMemo"),
-                    [globals_call, locals_call],
-                    [keyword(key, value) for key, value in memo_kwargs.items()],
-                )
-                node.body.insert(
-                    self._memo.code_inject_index,
-                    Assign([memo_store_name], memo_expr),
-                )
-
-                self._memo.insert_imports(node)
-
-                # Special case the __new__() method to create a local alias from the
-                # class name to the first argument (usually "cls")
-                if (
-                    isinstance(node, FunctionDef)
-                    and node.args
-                    and self._memo.parent is not None
-                    and isinstance(self._memo.parent.node, ClassDef)
-                    and node.name == "__new__"
-                ):
-                    first_args_expr = Name(node.args.args[0].arg, ctx=Load())
-                    cls_name = Name(self._memo.parent.node.name, ctx=Store())
-                    node.body.insert(
-                        self._memo.code_inject_index,
-                        Assign([cls_name], first_args_expr),
-                    )
-
-                # Rmove any placeholder "pass" at the end
-                if isinstance(node.body[-1], Pass):
-                    del node.body[-1]
-
-        return node
-
-    def visit_AsyncFunctionDef(
-        self, node: AsyncFunctionDef
-    ) -> FunctionDef | AsyncFunctionDef | None:
-        return self.visit_FunctionDef(node)
-
-    def visit_Return(self, node: Return) -> Return:
-        """This injects type checks into "return" statements."""
-        self.generic_visit(node)
-        if (
-            self._memo.return_annotation
-            and self._memo.should_instrument
-            and not self._memo.is_ignored_name(self._memo.return_annotation)
-        ):
-            func_name = self._get_import("typeguard._functions", "check_return_type")
-            old_node = node
-            retval = old_node.value or Constant(None)
-            node = Return(
-                Call(
-                    func_name,
-                    [
-                        self._memo.joined_path,
-                        retval,
-                        self._memo.return_annotation,
-                        self._memo.get_memo_name(),
-                    ],
-                    [],
-                )
-            )
-            copy_location(node, old_node)
-
-        return node
-
-    def visit_Yield(self, node: Yield) -> Yield | Call:
-        """
-        This injects type checks into "yield" expressions, checking both the yielded
-        value and the value sent back to the generator, when appropriate.
-
-        """
-        self._memo.has_yield_expressions = True
-        self.generic_visit(node)
-
-        if (
-            self._memo.yield_annotation
-            and self._memo.should_instrument
-            and not self._memo.is_ignored_name(self._memo.yield_annotation)
-        ):
-            func_name = self._get_import("typeguard._functions", "check_yield_type")
-            yieldval = node.value or Constant(None)
-            node.value = Call(
-                func_name,
-                [
-                    self._memo.joined_path,
-                    yieldval,
-                    self._memo.yield_annotation,
-                    self._memo.get_memo_name(),
-                ],
-                [],
-            )
-
-        if (
-            self._memo.send_annotation
-            and self._memo.should_instrument
-            and not self._memo.is_ignored_name(self._memo.send_annotation)
-        ):
-            func_name = self._get_import("typeguard._functions", "check_send_type")
-            old_node = node
-            call_node = Call(
-                func_name,
-                [
-                    self._memo.joined_path,
-                    old_node,
-                    self._memo.send_annotation,
-                    self._memo.get_memo_name(),
-                ],
-                [],
-            )
-            copy_location(call_node, old_node)
-            return call_node
-
-        return node
-
-    def visit_AnnAssign(self, node: AnnAssign) -> Any:
-        """
-        This injects a type check into a local variable annotation-assignment within a
-        function body.
-
-        """
-        self.generic_visit(node)
-
-        if (
-            isinstance(self._memo.node, (FunctionDef, AsyncFunctionDef))
-            and node.annotation
-            and isinstance(node.target, Name)
-        ):
-            self._memo.ignored_names.add(node.target.id)
-            annotation = self._convert_annotation(deepcopy(node.annotation))
-            if annotation:
-                self._memo.variable_annotations[node.target.id] = annotation
-                if node.value:
-                    func_name = self._get_import(
-                        "typeguard._functions", "check_variable_assignment"
-                    )
-                    node.value = Call(
-                        func_name,
-                        [
-                            node.value,
-                            Constant(node.target.id),
-                            annotation,
-                            self._memo.get_memo_name(),
-                        ],
-                        [],
-                    )
-
-        return node
-
-    def visit_Assign(self, node: Assign) -> Any:
-        """
-        This injects a type check into a local variable assignment within a function
-        body. The variable must have been annotated earlier in the function body.
-
-        """
-        self.generic_visit(node)
-
-        # Only instrument function-local assignments
-        if isinstance(self._memo.node, (FunctionDef, AsyncFunctionDef)):
-            targets: list[dict[Constant, expr | None]] = []
-            check_required = False
-            for target in node.targets:
-                elts: Sequence[expr]
-                if isinstance(target, Name):
-                    elts = [target]
-                elif isinstance(target, Tuple):
-                    elts = target.elts
-                else:
-                    continue
-
-                annotations_: dict[Constant, expr | None] = {}
-                for exp in elts:
-                    prefix = ""
-                    if isinstance(exp, Starred):
-                        exp = exp.value
-                        prefix = "*"
-
-                    if isinstance(exp, Name):
-                        self._memo.ignored_names.add(exp.id)
-                        name = prefix + exp.id
-                        annotation = self._memo.variable_annotations.get(exp.id)
-                        if annotation:
-                            annotations_[Constant(name)] = annotation
-                            check_required = True
-                        else:
-                            annotations_[Constant(name)] = None
-
-                targets.append(annotations_)
-
-            if check_required:
-                # Replace missing annotations with typing.Any
-                for item in targets:
-                    for key, expression in item.items():
-                        if expression is None:
-                            item[key] = self._get_import("typing", "Any")
-
-                if len(targets) == 1 and len(targets[0]) == 1:
-                    func_name = self._get_import(
-                        "typeguard._functions", "check_variable_assignment"
-                    )
-                    target_varname = next(iter(targets[0]))
-                    node.value = Call(
-                        func_name,
-                        [
-                            node.value,
-                            target_varname,
-                            targets[0][target_varname],
-                            self._memo.get_memo_name(),
-                        ],
-                        [],
-                    )
-                elif targets:
-                    func_name = self._get_import(
-                        "typeguard._functions", "check_multi_variable_assignment"
-                    )
-                    targets_arg = List(
-                        [
-                            Dict(keys=list(target), values=list(target.values()))
-                            for target in targets
-                        ],
-                        ctx=Load(),
-                    )
-                    node.value = Call(
-                        func_name,
-                        [node.value, targets_arg, self._memo.get_memo_name()],
-                        [],
-                    )
-
-        return node
-
-    def visit_NamedExpr(self, node: NamedExpr) -> Any:
-        """This injects a type check into an assignment expression (a := foo())."""
-        self.generic_visit(node)
-
-        # Only instrument function-local assignments
-        if isinstance(self._memo.node, (FunctionDef, AsyncFunctionDef)) and isinstance(
-            node.target, Name
-        ):
-            self._memo.ignored_names.add(node.target.id)
-
-            # Bail out if no matching annotation is found
-            annotation = self._memo.variable_annotations.get(node.target.id)
-            if annotation is None:
-                return node
-
-            func_name = self._get_import(
-                "typeguard._functions", "check_variable_assignment"
-            )
-            node.value = Call(
-                func_name,
-                [
-                    node.value,
-                    Constant(node.target.id),
-                    annotation,
-                    self._memo.get_memo_name(),
-                ],
-                [],
-            )
-
-        return node
-
-    def visit_AugAssign(self, node: AugAssign) -> Any:
-        """
-        This injects a type check into an augmented assignment expression (a += 1).
-
-        """
-        self.generic_visit(node)
-
-        # Only instrument function-local assignments
-        if isinstance(self._memo.node, (FunctionDef, AsyncFunctionDef)) and isinstance(
-            node.target, Name
-        ):
-            # Bail out if no matching annotation is found
-            annotation = self._memo.variable_annotations.get(node.target.id)
-            if annotation is None:
-                return node
-
-            # Bail out if the operator is not found (newer Python version?)
-            try:
-                operator_func_name = aug_assign_functions[node.op.__class__]
-            except KeyError:
-                return node
-
-            operator_func = self._get_import("operator", operator_func_name)
-            operator_call = Call(
-                operator_func, [Name(node.target.id, ctx=Load()), node.value], []
-            )
-            check_call = Call(
-                self._get_import("typeguard._functions", "check_variable_assignment"),
-                [
-                    operator_call,
-                    Constant(node.target.id),
-                    annotation,
-                    self._memo.get_memo_name(),
-                ],
-                [],
-            )
-            return Assign(targets=[node.target], value=check_call)
-
-        return node
-
-    def visit_If(self, node: If) -> Any:
-        """
-        This blocks names from being collected from a module-level
-        "if typing.TYPE_CHECKING:" block, so that they won't be type checked.
-
-        """
-        self.generic_visit(node)
-
-        if (
-            self._memo is self._module_memo
-            and isinstance(node.test, Name)
-            and self._memo.name_matches(node.test, "typing.TYPE_CHECKING")
-        ):
-            collector = NameCollector()
-            collector.visit(node)
-            self._memo.ignored_names.update(collector.names)
-
-        return node
diff --git a/lib/typeguard/_union_transformer.py b/lib/typeguard/_union_transformer.py
deleted file mode 100644
index 19617e6a..00000000
--- a/lib/typeguard/_union_transformer.py
+++ /dev/null
@@ -1,55 +0,0 @@
-"""
-Transforms lazily evaluated PEP 604 unions into typing.Unions, for compatibility with
-Python versions older than 3.10.
-"""
-
-from __future__ import annotations
-
-from ast import (
-    BinOp,
-    BitOr,
-    Index,
-    Load,
-    Name,
-    NodeTransformer,
-    Subscript,
-    fix_missing_locations,
-    parse,
-)
-from ast import Tuple as ASTTuple
-from types import CodeType
-from typing import Any, Dict, FrozenSet, List, Set, Tuple, Union
-
-type_substitutions = {
-    "dict": Dict,
-    "list": List,
-    "tuple": Tuple,
-    "set": Set,
-    "frozenset": FrozenSet,
-    "Union": Union,
-}
-
-
-class UnionTransformer(NodeTransformer):
-    def __init__(self, union_name: Name | None = None):
-        self.union_name = union_name or Name(id="Union", ctx=Load())
-
-    def visit_BinOp(self, node: BinOp) -> Any:
-        self.generic_visit(node)
-        if isinstance(node.op, BitOr):
-            return Subscript(
-                value=self.union_name,
-                slice=Index(
-                    ASTTuple(elts=[node.left, node.right], ctx=Load()), ctx=Load()
-                ),
-                ctx=Load(),
-            )
-
-        return node
-
-
-def compile_type_hint(hint: str) -> CodeType:
-    parsed = parse(hint, "<string>", "eval")
-    UnionTransformer().visit(parsed)
-    fix_missing_locations(parsed)
-    return compile(parsed, "<string>", "eval", flags=0)
diff --git a/lib/typeguard/_utils.py b/lib/typeguard/_utils.py
deleted file mode 100644
index 9bcc8417..00000000
--- a/lib/typeguard/_utils.py
+++ /dev/null
@@ -1,173 +0,0 @@
-from __future__ import annotations
-
-import inspect
-import sys
-from importlib import import_module
-from inspect import currentframe
-from types import CodeType, FrameType, FunctionType
-from typing import TYPE_CHECKING, Any, Callable, ForwardRef, Union, cast, final
-from weakref import WeakValueDictionary
-
-if TYPE_CHECKING:
-    from ._memo import TypeCheckMemo
-
-if sys.version_info >= (3, 13):
-    from typing import get_args, get_origin
-
-    def evaluate_forwardref(forwardref: ForwardRef, memo: TypeCheckMemo) -> Any:
-        return forwardref._evaluate(
-            memo.globals, memo.locals, type_params=(), recursive_guard=frozenset()
-        )
-
-elif sys.version_info >= (3, 10):
-    from typing import get_args, get_origin
-
-    def evaluate_forwardref(forwardref: ForwardRef, memo: TypeCheckMemo) -> Any:
-        return forwardref._evaluate(
-            memo.globals, memo.locals, recursive_guard=frozenset()
-        )
-
-else:
-    from typing_extensions import get_args, get_origin
-
-    evaluate_extra_args: tuple[frozenset[Any], ...] = (
-        (frozenset(),) if sys.version_info >= (3, 9) else ()
-    )
-
-    def evaluate_forwardref(forwardref: ForwardRef, memo: TypeCheckMemo) -> Any:
-        from ._union_transformer import compile_type_hint, type_substitutions
-
-        if not forwardref.__forward_evaluated__:
-            forwardref.__forward_code__ = compile_type_hint(forwardref.__forward_arg__)
-
-        try:
-            return forwardref._evaluate(memo.globals, memo.locals, *evaluate_extra_args)
-        except NameError:
-            if sys.version_info < (3, 10):
-                # Try again, with the type substitutions (list -> List etc.) in place
-                new_globals = memo.globals.copy()
-                new_globals.setdefault("Union", Union)
-                if sys.version_info < (3, 9):
-                    new_globals.update(type_substitutions)
-
-                return forwardref._evaluate(
-                    new_globals, memo.locals or new_globals, *evaluate_extra_args
-                )
-
-            raise
-
-
-_functions_map: WeakValueDictionary[CodeType, FunctionType] = WeakValueDictionary()
-
-
-def get_type_name(type_: Any) -> str:
-    name: str
-    for attrname in "__name__", "_name", "__forward_arg__":
-        candidate = getattr(type_, attrname, None)
-        if isinstance(candidate, str):
-            name = candidate
-            break
-    else:
-        origin = get_origin(type_)
-        candidate = getattr(origin, "_name", None)
-        if candidate is None:
-            candidate = type_.__class__.__name__.strip("_")
-
-        if isinstance(candidate, str):
-            name = candidate
-        else:
-            return "(unknown)"
-
-    args = get_args(type_)
-    if args:
-        if name == "Literal":
-            formatted_args = ", ".join(repr(arg) for arg in args)
-        else:
-            formatted_args = ", ".join(get_type_name(arg) for arg in args)
-
-        name += f"[{formatted_args}]"
-
-    module = getattr(type_, "__module__", None)
-    if module and module not in (None, "typing", "typing_extensions", "builtins"):
-        name = module + "." + name
-
-    return name
-
-
-def qualified_name(obj: Any, *, add_class_prefix: bool = False) -> str:
-    """
-    Return the qualified name (e.g. package.module.Type) for the given object.
-
-    Builtins and types from the :mod:`typing` package get special treatment by having
-    the module name stripped from the generated name.
-
-    """
-    if obj is None:
-        return "None"
-    elif inspect.isclass(obj):
-        prefix = "class " if add_class_prefix else ""
-        type_ = obj
-    else:
-        prefix = ""
-        type_ = type(obj)
-
-    module = type_.__module__
-    qualname = type_.__qualname__
-    name = qualname if module in ("typing", "builtins") else f"{module}.{qualname}"
-    return prefix + name
-
-
-def function_name(func: Callable[..., Any]) -> str:
-    """
-    Return the qualified name of the given function.
-
-    Builtins and types from the :mod:`typing` package get special treatment by having
-    the module name stripped from the generated name.
-
-    """
-    # For partial functions and objects with __call__ defined, __qualname__ does not
-    # exist
-    module = getattr(func, "__module__", "")
-    qualname = (module + ".") if module not in ("builtins", "") else ""
-    return qualname + getattr(func, "__qualname__", repr(func))
-
-
-def resolve_reference(reference: str) -> Any:
-    modulename, varname = reference.partition(":")[::2]
-    if not modulename or not varname:
-        raise ValueError(f"{reference!r} is not a module:varname reference")
-
-    obj = import_module(modulename)
-    for attr in varname.split("."):
-        obj = getattr(obj, attr)
-
-    return obj
-
-
-def is_method_of(obj: object, cls: type) -> bool:
-    return (
-        inspect.isfunction(obj)
-        and obj.__module__ == cls.__module__
-        and obj.__qualname__.startswith(cls.__qualname__ + ".")
-    )
-
-
-def get_stacklevel() -> int:
-    level = 1
-    frame = cast(FrameType, currentframe()).f_back
-    while frame and frame.f_globals.get("__name__", "").startswith("typeguard."):
-        level += 1
-        frame = frame.f_back
-
-    return level
-
-
-@final
-class Unset:
-    __slots__ = ()
-
-    def __repr__(self) -> str:
-        return "<unset>"
-
-
-unset = Unset()
diff --git a/lib/typeguard/py.typed b/lib/typeguard/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/typing_extensions.py b/lib/typing_extensions.py
deleted file mode 100644
index dec429ca..00000000
--- a/lib/typing_extensions.py
+++ /dev/null
@@ -1,3641 +0,0 @@
-import abc
-import collections
-import collections.abc
-import contextlib
-import functools
-import inspect
-import operator
-import sys
-import types as _types
-import typing
-import warnings
-
-__all__ = [
-    # Super-special typing primitives.
-    'Any',
-    'ClassVar',
-    'Concatenate',
-    'Final',
-    'LiteralString',
-    'ParamSpec',
-    'ParamSpecArgs',
-    'ParamSpecKwargs',
-    'Self',
-    'Type',
-    'TypeVar',
-    'TypeVarTuple',
-    'Unpack',
-
-    # ABCs (from collections.abc).
-    'Awaitable',
-    'AsyncIterator',
-    'AsyncIterable',
-    'Coroutine',
-    'AsyncGenerator',
-    'AsyncContextManager',
-    'Buffer',
-    'ChainMap',
-
-    # Concrete collection types.
-    'ContextManager',
-    'Counter',
-    'Deque',
-    'DefaultDict',
-    'NamedTuple',
-    'OrderedDict',
-    'TypedDict',
-
-    # Structural checks, a.k.a. protocols.
-    'SupportsAbs',
-    'SupportsBytes',
-    'SupportsComplex',
-    'SupportsFloat',
-    'SupportsIndex',
-    'SupportsInt',
-    'SupportsRound',
-
-    # One-off things.
-    'Annotated',
-    'assert_never',
-    'assert_type',
-    'clear_overloads',
-    'dataclass_transform',
-    'deprecated',
-    'Doc',
-    'get_overloads',
-    'final',
-    'get_args',
-    'get_origin',
-    'get_original_bases',
-    'get_protocol_members',
-    'get_type_hints',
-    'IntVar',
-    'is_protocol',
-    'is_typeddict',
-    'Literal',
-    'NewType',
-    'overload',
-    'override',
-    'Protocol',
-    'reveal_type',
-    'runtime',
-    'runtime_checkable',
-    'Text',
-    'TypeAlias',
-    'TypeAliasType',
-    'TypeGuard',
-    'TypeIs',
-    'TYPE_CHECKING',
-    'Never',
-    'NoReturn',
-    'ReadOnly',
-    'Required',
-    'NotRequired',
-
-    # Pure aliases, have always been in typing
-    'AbstractSet',
-    'AnyStr',
-    'BinaryIO',
-    'Callable',
-    'Collection',
-    'Container',
-    'Dict',
-    'ForwardRef',
-    'FrozenSet',
-    'Generator',
-    'Generic',
-    'Hashable',
-    'IO',
-    'ItemsView',
-    'Iterable',
-    'Iterator',
-    'KeysView',
-    'List',
-    'Mapping',
-    'MappingView',
-    'Match',
-    'MutableMapping',
-    'MutableSequence',
-    'MutableSet',
-    'NoDefault',
-    'Optional',
-    'Pattern',
-    'Reversible',
-    'Sequence',
-    'Set',
-    'Sized',
-    'TextIO',
-    'Tuple',
-    'Union',
-    'ValuesView',
-    'cast',
-    'no_type_check',
-    'no_type_check_decorator',
-]
-
-# for backward compatibility
-PEP_560 = True
-GenericMeta = type
-_PEP_696_IMPLEMENTED = sys.version_info >= (3, 13, 0, "beta")
-
-# The functions below are modified copies of typing internal helpers.
-# They are needed by _ProtocolMeta and they provide support for PEP 646.
-
-
-class _Sentinel:
-    def __repr__(self):
-        return "<sentinel>"
-
-
-_marker = _Sentinel()
-
-
-if sys.version_info >= (3, 10):
-    def _should_collect_from_parameters(t):
-        return isinstance(
-            t, (typing._GenericAlias, _types.GenericAlias, _types.UnionType)
-        )
-elif sys.version_info >= (3, 9):
-    def _should_collect_from_parameters(t):
-        return isinstance(t, (typing._GenericAlias, _types.GenericAlias))
-else:
-    def _should_collect_from_parameters(t):
-        return isinstance(t, typing._GenericAlias) and not t._special
-
-
-NoReturn = typing.NoReturn
-
-# Some unconstrained type variables.  These are used by the container types.
-# (These are not for export.)
-T = typing.TypeVar('T')  # Any type.
-KT = typing.TypeVar('KT')  # Key type.
-VT = typing.TypeVar('VT')  # Value type.
-T_co = typing.TypeVar('T_co', covariant=True)  # Any type covariant containers.
-T_contra = typing.TypeVar('T_contra', contravariant=True)  # Ditto contravariant.
-
-
-if sys.version_info >= (3, 11):
-    from typing import Any
-else:
-
-    class _AnyMeta(type):
-        def __instancecheck__(self, obj):
-            if self is Any:
-                raise TypeError("typing_extensions.Any cannot be used with isinstance()")
-            return super().__instancecheck__(obj)
-
-        def __repr__(self):
-            if self is Any:
-                return "typing_extensions.Any"
-            return super().__repr__()
-
-    class Any(metaclass=_AnyMeta):
-        """Special type indicating an unconstrained type.
-        - Any is compatible with every type.
-        - Any assumed to have all methods.
-        - All values assumed to be instances of Any.
-        Note that all the above statements are true from the point of view of
-        static type checkers. At runtime, Any should not be used with instance
-        checks.
-        """
-        def __new__(cls, *args, **kwargs):
-            if cls is Any:
-                raise TypeError("Any cannot be instantiated")
-            return super().__new__(cls, *args, **kwargs)
-
-
-ClassVar = typing.ClassVar
-
-
-class _ExtensionsSpecialForm(typing._SpecialForm, _root=True):
-    def __repr__(self):
-        return 'typing_extensions.' + self._name
-
-
-Final = typing.Final
-
-if sys.version_info >= (3, 11):
-    final = typing.final
-else:
-    # @final exists in 3.8+, but we backport it for all versions
-    # before 3.11 to keep support for the __final__ attribute.
-    # See https://bugs.python.org/issue46342
-    def final(f):
-        """This decorator can be used to indicate to type checkers that
-        the decorated method cannot be overridden, and decorated class
-        cannot be subclassed. For example:
-
-            class Base:
-                @final
-                def done(self) -> None:
-                    ...
-            class Sub(Base):
-                def done(self) -> None:  # Error reported by type checker
-                    ...
-            @final
-            class Leaf:
-                ...
-            class Other(Leaf):  # Error reported by type checker
-                ...
-
-        There is no runtime checking of these properties. The decorator
-        sets the ``__final__`` attribute to ``True`` on the decorated object
-        to allow runtime introspection.
-        """
-        try:
-            f.__final__ = True
-        except (AttributeError, TypeError):
-            # Skip the attribute silently if it is not writable.
-            # AttributeError happens if the object has __slots__ or a
-            # read-only property, TypeError if it's a builtin class.
-            pass
-        return f
-
-
-def IntVar(name):
-    return typing.TypeVar(name)
-
-
-# A Literal bug was fixed in 3.11.0, 3.10.1 and 3.9.8
-if sys.version_info >= (3, 10, 1):
-    Literal = typing.Literal
-else:
-    def _flatten_literal_params(parameters):
-        """An internal helper for Literal creation: flatten Literals among parameters"""
-        params = []
-        for p in parameters:
-            if isinstance(p, _LiteralGenericAlias):
-                params.extend(p.__args__)
-            else:
-                params.append(p)
-        return tuple(params)
-
-    def _value_and_type_iter(params):
-        for p in params:
-            yield p, type(p)
-
-    class _LiteralGenericAlias(typing._GenericAlias, _root=True):
-        def __eq__(self, other):
-            if not isinstance(other, _LiteralGenericAlias):
-                return NotImplemented
-            these_args_deduped = set(_value_and_type_iter(self.__args__))
-            other_args_deduped = set(_value_and_type_iter(other.__args__))
-            return these_args_deduped == other_args_deduped
-
-        def __hash__(self):
-            return hash(frozenset(_value_and_type_iter(self.__args__)))
-
-    class _LiteralForm(_ExtensionsSpecialForm, _root=True):
-        def __init__(self, doc: str):
-            self._name = 'Literal'
-            self._doc = self.__doc__ = doc
-
-        def __getitem__(self, parameters):
-            if not isinstance(parameters, tuple):
-                parameters = (parameters,)
-
-            parameters = _flatten_literal_params(parameters)
-
-            val_type_pairs = list(_value_and_type_iter(parameters))
-            try:
-                deduped_pairs = set(val_type_pairs)
-            except TypeError:
-                # unhashable parameters
-                pass
-            else:
-                # similar logic to typing._deduplicate on Python 3.9+
-                if len(deduped_pairs) < len(val_type_pairs):
-                    new_parameters = []
-                    for pair in val_type_pairs:
-                        if pair in deduped_pairs:
-                            new_parameters.append(pair[0])
-                            deduped_pairs.remove(pair)
-                    assert not deduped_pairs, deduped_pairs
-                    parameters = tuple(new_parameters)
-
-            return _LiteralGenericAlias(self, parameters)
-
-    Literal = _LiteralForm(doc="""\
-                           A type that can be used to indicate to type checkers
-                           that the corresponding value has a value literally equivalent
-                           to the provided parameter. For example:
-
-                               var: Literal[4] = 4
-
-                           The type checker understands that 'var' is literally equal to
-                           the value 4 and no other value.
-
-                           Literal[...] cannot be subclassed. There is no runtime
-                           checking verifying that the parameter is actually a value
-                           instead of a type.""")
-
-
-_overload_dummy = typing._overload_dummy
-
-
-if hasattr(typing, "get_overloads"):  # 3.11+
-    overload = typing.overload
-    get_overloads = typing.get_overloads
-    clear_overloads = typing.clear_overloads
-else:
-    # {module: {qualname: {firstlineno: func}}}
-    _overload_registry = collections.defaultdict(
-        functools.partial(collections.defaultdict, dict)
-    )
-
-    def overload(func):
-        """Decorator for overloaded functions/methods.
-
-        In a stub file, place two or more stub definitions for the same
-        function in a row, each decorated with @overload.  For example:
-
-        @overload
-        def utf8(value: None) -> None: ...
-        @overload
-        def utf8(value: bytes) -> bytes: ...
-        @overload
-        def utf8(value: str) -> bytes: ...
-
-        In a non-stub file (i.e. a regular .py file), do the same but
-        follow it with an implementation.  The implementation should *not*
-        be decorated with @overload.  For example:
-
-        @overload
-        def utf8(value: None) -> None: ...
-        @overload
-        def utf8(value: bytes) -> bytes: ...
-        @overload
-        def utf8(value: str) -> bytes: ...
-        def utf8(value):
-            # implementation goes here
-
-        The overloads for a function can be retrieved at runtime using the
-        get_overloads() function.
-        """
-        # classmethod and staticmethod
-        f = getattr(func, "__func__", func)
-        try:
-            _overload_registry[f.__module__][f.__qualname__][
-                f.__code__.co_firstlineno
-            ] = func
-        except AttributeError:
-            # Not a normal function; ignore.
-            pass
-        return _overload_dummy
-
-    def get_overloads(func):
-        """Return all defined overloads for *func* as a sequence."""
-        # classmethod and staticmethod
-        f = getattr(func, "__func__", func)
-        if f.__module__ not in _overload_registry:
-            return []
-        mod_dict = _overload_registry[f.__module__]
-        if f.__qualname__ not in mod_dict:
-            return []
-        return list(mod_dict[f.__qualname__].values())
-
-    def clear_overloads():
-        """Clear all overloads in the registry."""
-        _overload_registry.clear()
-
-
-# This is not a real generic class.  Don't use outside annotations.
-Type = typing.Type
-
-# Various ABCs mimicking those in collections.abc.
-# A few are simply re-exported for completeness.
-Awaitable = typing.Awaitable
-Coroutine = typing.Coroutine
-AsyncIterable = typing.AsyncIterable
-AsyncIterator = typing.AsyncIterator
-Deque = typing.Deque
-DefaultDict = typing.DefaultDict
-OrderedDict = typing.OrderedDict
-Counter = typing.Counter
-ChainMap = typing.ChainMap
-Text = typing.Text
-TYPE_CHECKING = typing.TYPE_CHECKING
-
-
-if sys.version_info >= (3, 13, 0, "beta"):
-    from typing import AsyncContextManager, AsyncGenerator, ContextManager, Generator
-else:
-    def _is_dunder(attr):
-        return attr.startswith('__') and attr.endswith('__')
-
-    # Python <3.9 doesn't have typing._SpecialGenericAlias
-    _special_generic_alias_base = getattr(
-        typing, "_SpecialGenericAlias", typing._GenericAlias
-    )
-
-    class _SpecialGenericAlias(_special_generic_alias_base, _root=True):
-        def __init__(self, origin, nparams, *, inst=True, name=None, defaults=()):
-            if _special_generic_alias_base is typing._GenericAlias:
-                # Python <3.9
-                self.__origin__ = origin
-                self._nparams = nparams
-                super().__init__(origin, nparams, special=True, inst=inst, name=name)
-            else:
-                # Python >= 3.9
-                super().__init__(origin, nparams, inst=inst, name=name)
-            self._defaults = defaults
-
-        def __setattr__(self, attr, val):
-            allowed_attrs = {'_name', '_inst', '_nparams', '_defaults'}
-            if _special_generic_alias_base is typing._GenericAlias:
-                # Python <3.9
-                allowed_attrs.add("__origin__")
-            if _is_dunder(attr) or attr in allowed_attrs:
-                object.__setattr__(self, attr, val)
-            else:
-                setattr(self.__origin__, attr, val)
-
-        @typing._tp_cache
-        def __getitem__(self, params):
-            if not isinstance(params, tuple):
-                params = (params,)
-            msg = "Parameters to generic types must be types."
-            params = tuple(typing._type_check(p, msg) for p in params)
-            if (
-                self._defaults
-                and len(params) < self._nparams
-                and len(params) + len(self._defaults) >= self._nparams
-            ):
-                params = (*params, *self._defaults[len(params) - self._nparams:])
-            actual_len = len(params)
-
-            if actual_len != self._nparams:
-                if self._defaults:
-                    expected = f"at least {self._nparams - len(self._defaults)}"
-                else:
-                    expected = str(self._nparams)
-                if not self._nparams:
-                    raise TypeError(f"{self} is not a generic class")
-                raise TypeError(
-                    f"Too {'many' if actual_len > self._nparams else 'few'}"
-                    f" arguments for {self};"
-                    f" actual {actual_len}, expected {expected}"
-                )
-            return self.copy_with(params)
-
-    _NoneType = type(None)
-    Generator = _SpecialGenericAlias(
-        collections.abc.Generator, 3, defaults=(_NoneType, _NoneType)
-    )
-    AsyncGenerator = _SpecialGenericAlias(
-        collections.abc.AsyncGenerator, 2, defaults=(_NoneType,)
-    )
-    ContextManager = _SpecialGenericAlias(
-        contextlib.AbstractContextManager,
-        2,
-        name="ContextManager",
-        defaults=(typing.Optional[bool],)
-    )
-    AsyncContextManager = _SpecialGenericAlias(
-        contextlib.AbstractAsyncContextManager,
-        2,
-        name="AsyncContextManager",
-        defaults=(typing.Optional[bool],)
-    )
-
-
-_PROTO_ALLOWLIST = {
-    'collections.abc': [
-        'Callable', 'Awaitable', 'Iterable', 'Iterator', 'AsyncIterable',
-        'Hashable', 'Sized', 'Container', 'Collection', 'Reversible', 'Buffer',
-    ],
-    'contextlib': ['AbstractContextManager', 'AbstractAsyncContextManager'],
-    'typing_extensions': ['Buffer'],
-}
-
-
-_EXCLUDED_ATTRS = frozenset(typing.EXCLUDED_ATTRIBUTES) | {
-    "__match_args__", "__protocol_attrs__", "__non_callable_proto_members__",
-    "__final__",
-}
-
-
-def _get_protocol_attrs(cls):
-    attrs = set()
-    for base in cls.__mro__[:-1]:  # without object
-        if base.__name__ in {'Protocol', 'Generic'}:
-            continue
-        annotations = getattr(base, '__annotations__', {})
-        for attr in (*base.__dict__, *annotations):
-            if (not attr.startswith('_abc_') and attr not in _EXCLUDED_ATTRS):
-                attrs.add(attr)
-    return attrs
-
-
-def _caller(depth=2):
-    try:
-        return sys._getframe(depth).f_globals.get('__name__', '__main__')
-    except (AttributeError, ValueError):  # For platforms without _getframe()
-        return None
-
-
-# `__match_args__` attribute was removed from protocol members in 3.13,
-# we want to backport this change to older Python versions.
-if sys.version_info >= (3, 13):
-    Protocol = typing.Protocol
-else:
-    def _allow_reckless_class_checks(depth=3):
-        """Allow instance and class checks for special stdlib modules.
-        The abc and functools modules indiscriminately call isinstance() and
-        issubclass() on the whole MRO of a user class, which may contain protocols.
-        """
-        return _caller(depth) in {'abc', 'functools', None}
-
-    def _no_init(self, *args, **kwargs):
-        if type(self)._is_protocol:
-            raise TypeError('Protocols cannot be instantiated')
-
-    def _type_check_issubclass_arg_1(arg):
-        """Raise TypeError if `arg` is not an instance of `type`
-        in `issubclass(arg, <protocol>)`.
-
-        In most cases, this is verified by type.__subclasscheck__.
-        Checking it again unnecessarily would slow down issubclass() checks,
-        so, we don't perform this check unless we absolutely have to.
-
-        For various error paths, however,
-        we want to ensure that *this* error message is shown to the user
-        where relevant, rather than a typing.py-specific error message.
-        """
-        if not isinstance(arg, type):
-            # Same error message as for issubclass(1, int).
-            raise TypeError('issubclass() arg 1 must be a class')
-
-    # Inheriting from typing._ProtocolMeta isn't actually desirable,
-    # but is necessary to allow typing.Protocol and typing_extensions.Protocol
-    # to mix without getting TypeErrors about "metaclass conflict"
-    class _ProtocolMeta(type(typing.Protocol)):
-        # This metaclass is somewhat unfortunate,
-        # but is necessary for several reasons...
-        #
-        # NOTE: DO NOT call super() in any methods in this class
-        # That would call the methods on typing._ProtocolMeta on Python 3.8-3.11
-        # and those are slow
-        def __new__(mcls, name, bases, namespace, **kwargs):
-            if name == "Protocol" and len(bases) < 2:
-                pass
-            elif {Protocol, typing.Protocol} & set(bases):
-                for base in bases:
-                    if not (
-                        base in {object, typing.Generic, Protocol, typing.Protocol}
-                        or base.__name__ in _PROTO_ALLOWLIST.get(base.__module__, [])
-                        or is_protocol(base)
-                    ):
-                        raise TypeError(
-                            f"Protocols can only inherit from other protocols, "
-                            f"got {base!r}"
-                        )
-            return abc.ABCMeta.__new__(mcls, name, bases, namespace, **kwargs)
-
-        def __init__(cls, *args, **kwargs):
-            abc.ABCMeta.__init__(cls, *args, **kwargs)
-            if getattr(cls, "_is_protocol", False):
-                cls.__protocol_attrs__ = _get_protocol_attrs(cls)
-
-        def __subclasscheck__(cls, other):
-            if cls is Protocol:
-                return type.__subclasscheck__(cls, other)
-            if (
-                getattr(cls, '_is_protocol', False)
-                and not _allow_reckless_class_checks()
-            ):
-                if not getattr(cls, '_is_runtime_protocol', False):
-                    _type_check_issubclass_arg_1(other)
-                    raise TypeError(
-                        "Instance and class checks can only be used with "
-                        "@runtime_checkable protocols"
-                    )
-                if (
-                    # this attribute is set by @runtime_checkable:
-                    cls.__non_callable_proto_members__
-                    and cls.__dict__.get("__subclasshook__") is _proto_hook
-                ):
-                    _type_check_issubclass_arg_1(other)
-                    non_method_attrs = sorted(cls.__non_callable_proto_members__)
-                    raise TypeError(
-                        "Protocols with non-method members don't support issubclass()."
-                        f" Non-method members: {str(non_method_attrs)[1:-1]}."
-                    )
-            return abc.ABCMeta.__subclasscheck__(cls, other)
-
-        def __instancecheck__(cls, instance):
-            # We need this method for situations where attributes are
-            # assigned in __init__.
-            if cls is Protocol:
-                return type.__instancecheck__(cls, instance)
-            if not getattr(cls, "_is_protocol", False):
-                # i.e., it's a concrete subclass of a protocol
-                return abc.ABCMeta.__instancecheck__(cls, instance)
-
-            if (
-                not getattr(cls, '_is_runtime_protocol', False) and
-                not _allow_reckless_class_checks()
-            ):
-                raise TypeError("Instance and class checks can only be used with"
-                                " @runtime_checkable protocols")
-
-            if abc.ABCMeta.__instancecheck__(cls, instance):
-                return True
-
-            for attr in cls.__protocol_attrs__:
-                try:
-                    val = inspect.getattr_static(instance, attr)
-                except AttributeError:
-                    break
-                # this attribute is set by @runtime_checkable:
-                if val is None and attr not in cls.__non_callable_proto_members__:
-                    break
-            else:
-                return True
-
-            return False
-
-        def __eq__(cls, other):
-            # Hack so that typing.Generic.__class_getitem__
-            # treats typing_extensions.Protocol
-            # as equivalent to typing.Protocol
-            if abc.ABCMeta.__eq__(cls, other) is True:
-                return True
-            return cls is Protocol and other is typing.Protocol
-
-        # This has to be defined, or the abc-module cache
-        # complains about classes with this metaclass being unhashable,
-        # if we define only __eq__!
-        def __hash__(cls) -> int:
-            return type.__hash__(cls)
-
-    @classmethod
-    def _proto_hook(cls, other):
-        if not cls.__dict__.get('_is_protocol', False):
-            return NotImplemented
-
-        for attr in cls.__protocol_attrs__:
-            for base in other.__mro__:
-                # Check if the members appears in the class dictionary...
-                if attr in base.__dict__:
-                    if base.__dict__[attr] is None:
-                        return NotImplemented
-                    break
-
-                # ...or in annotations, if it is a sub-protocol.
-                annotations = getattr(base, '__annotations__', {})
-                if (
-                    isinstance(annotations, collections.abc.Mapping)
-                    and attr in annotations
-                    and is_protocol(other)
-                ):
-                    break
-            else:
-                return NotImplemented
-        return True
-
-    class Protocol(typing.Generic, metaclass=_ProtocolMeta):
-        __doc__ = typing.Protocol.__doc__
-        __slots__ = ()
-        _is_protocol = True
-        _is_runtime_protocol = False
-
-        def __init_subclass__(cls, *args, **kwargs):
-            super().__init_subclass__(*args, **kwargs)
-
-            # Determine if this is a protocol or a concrete subclass.
-            if not cls.__dict__.get('_is_protocol', False):
-                cls._is_protocol = any(b is Protocol for b in cls.__bases__)
-
-            # Set (or override) the protocol subclass hook.
-            if '__subclasshook__' not in cls.__dict__:
-                cls.__subclasshook__ = _proto_hook
-
-            # Prohibit instantiation for protocol classes
-            if cls._is_protocol and cls.__init__ is Protocol.__init__:
-                cls.__init__ = _no_init
-
-
-if sys.version_info >= (3, 13):
-    runtime_checkable = typing.runtime_checkable
-else:
-    def runtime_checkable(cls):
-        """Mark a protocol class as a runtime protocol.
-
-        Such protocol can be used with isinstance() and issubclass().
-        Raise TypeError if applied to a non-protocol class.
-        This allows a simple-minded structural check very similar to
-        one trick ponies in collections.abc such as Iterable.
-
-        For example::
-
-            @runtime_checkable
-            class Closable(Protocol):
-                def close(self): ...
-
-            assert isinstance(open('/some/file'), Closable)
-
-        Warning: this will check only the presence of the required methods,
-        not their type signatures!
-        """
-        if not issubclass(cls, typing.Generic) or not getattr(cls, '_is_protocol', False):
-            raise TypeError(f'@runtime_checkable can be only applied to protocol classes,'
-                            f' got {cls!r}')
-        cls._is_runtime_protocol = True
-
-        # typing.Protocol classes on <=3.11 break if we execute this block,
-        # because typing.Protocol classes on <=3.11 don't have a
-        # `__protocol_attrs__` attribute, and this block relies on the
-        # `__protocol_attrs__` attribute. Meanwhile, typing.Protocol classes on 3.12.2+
-        # break if we *don't* execute this block, because *they* assume that all
-        # protocol classes have a `__non_callable_proto_members__` attribute
-        # (which this block sets)
-        if isinstance(cls, _ProtocolMeta) or sys.version_info >= (3, 12, 2):
-            # PEP 544 prohibits using issubclass()
-            # with protocols that have non-method members.
-            # See gh-113320 for why we compute this attribute here,
-            # rather than in `_ProtocolMeta.__init__`
-            cls.__non_callable_proto_members__ = set()
-            for attr in cls.__protocol_attrs__:
-                try:
-                    is_callable = callable(getattr(cls, attr, None))
-                except Exception as e:
-                    raise TypeError(
-                        f"Failed to determine whether protocol member {attr!r} "
-                        "is a method member"
-                    ) from e
-                else:
-                    if not is_callable:
-                        cls.__non_callable_proto_members__.add(attr)
-
-        return cls
-
-
-# The "runtime" alias exists for backwards compatibility.
-runtime = runtime_checkable
-
-
-# Our version of runtime-checkable protocols is faster on Python 3.8-3.11
-if sys.version_info >= (3, 12):
-    SupportsInt = typing.SupportsInt
-    SupportsFloat = typing.SupportsFloat
-    SupportsComplex = typing.SupportsComplex
-    SupportsBytes = typing.SupportsBytes
-    SupportsIndex = typing.SupportsIndex
-    SupportsAbs = typing.SupportsAbs
-    SupportsRound = typing.SupportsRound
-else:
-    @runtime_checkable
-    class SupportsInt(Protocol):
-        """An ABC with one abstract method __int__."""
-        __slots__ = ()
-
-        @abc.abstractmethod
-        def __int__(self) -> int:
-            pass
-
-    @runtime_checkable
-    class SupportsFloat(Protocol):
-        """An ABC with one abstract method __float__."""
-        __slots__ = ()
-
-        @abc.abstractmethod
-        def __float__(self) -> float:
-            pass
-
-    @runtime_checkable
-    class SupportsComplex(Protocol):
-        """An ABC with one abstract method __complex__."""
-        __slots__ = ()
-
-        @abc.abstractmethod
-        def __complex__(self) -> complex:
-            pass
-
-    @runtime_checkable
-    class SupportsBytes(Protocol):
-        """An ABC with one abstract method __bytes__."""
-        __slots__ = ()
-
-        @abc.abstractmethod
-        def __bytes__(self) -> bytes:
-            pass
-
-    @runtime_checkable
-    class SupportsIndex(Protocol):
-        __slots__ = ()
-
-        @abc.abstractmethod
-        def __index__(self) -> int:
-            pass
-
-    @runtime_checkable
-    class SupportsAbs(Protocol[T_co]):
-        """
-        An ABC with one abstract method __abs__ that is covariant in its return type.
-        """
-        __slots__ = ()
-
-        @abc.abstractmethod
-        def __abs__(self) -> T_co:
-            pass
-
-    @runtime_checkable
-    class SupportsRound(Protocol[T_co]):
-        """
-        An ABC with one abstract method __round__ that is covariant in its return type.
-        """
-        __slots__ = ()
-
-        @abc.abstractmethod
-        def __round__(self, ndigits: int = 0) -> T_co:
-            pass
-
-
-def _ensure_subclassable(mro_entries):
-    def inner(func):
-        if sys.implementation.name == "pypy" and sys.version_info < (3, 9):
-            cls_dict = {
-                "__call__": staticmethod(func),
-                "__mro_entries__": staticmethod(mro_entries)
-            }
-            t = type(func.__name__, (), cls_dict)
-            return functools.update_wrapper(t(), func)
-        else:
-            func.__mro_entries__ = mro_entries
-            return func
-    return inner
-
-
-# Update this to something like >=3.13.0b1 if and when
-# PEP 728 is implemented in CPython
-_PEP_728_IMPLEMENTED = False
-
-if _PEP_728_IMPLEMENTED:
-    # The standard library TypedDict in Python 3.8 does not store runtime information
-    # about which (if any) keys are optional.  See https://bugs.python.org/issue38834
-    # The standard library TypedDict in Python 3.9.0/1 does not honour the "total"
-    # keyword with old-style TypedDict().  See https://bugs.python.org/issue42059
-    # The standard library TypedDict below Python 3.11 does not store runtime
-    # information about optional and required keys when using Required or NotRequired.
-    # Generic TypedDicts are also impossible using typing.TypedDict on Python <3.11.
-    # Aaaand on 3.12 we add __orig_bases__ to TypedDict
-    # to enable better runtime introspection.
-    # On 3.13 we deprecate some odd ways of creating TypedDicts.
-    # Also on 3.13, PEP 705 adds the ReadOnly[] qualifier.
-    # PEP 728 (still pending) makes more changes.
-    TypedDict = typing.TypedDict
-    _TypedDictMeta = typing._TypedDictMeta
-    is_typeddict = typing.is_typeddict
-else:
-    # 3.10.0 and later
-    _TAKES_MODULE = "module" in inspect.signature(typing._type_check).parameters
-
-    def _get_typeddict_qualifiers(annotation_type):
-        while True:
-            annotation_origin = get_origin(annotation_type)
-            if annotation_origin is Annotated:
-                annotation_args = get_args(annotation_type)
-                if annotation_args:
-                    annotation_type = annotation_args[0]
-                else:
-                    break
-            elif annotation_origin is Required:
-                yield Required
-                annotation_type, = get_args(annotation_type)
-            elif annotation_origin is NotRequired:
-                yield NotRequired
-                annotation_type, = get_args(annotation_type)
-            elif annotation_origin is ReadOnly:
-                yield ReadOnly
-                annotation_type, = get_args(annotation_type)
-            else:
-                break
-
-    class _TypedDictMeta(type):
-        def __new__(cls, name, bases, ns, *, total=True, closed=False):
-            """Create new typed dict class object.
-
-            This method is called when TypedDict is subclassed,
-            or when TypedDict is instantiated. This way
-            TypedDict supports all three syntax forms described in its docstring.
-            Subclasses and instances of TypedDict return actual dictionaries.
-            """
-            for base in bases:
-                if type(base) is not _TypedDictMeta and base is not typing.Generic:
-                    raise TypeError('cannot inherit from both a TypedDict type '
-                                    'and a non-TypedDict base class')
-
-            if any(issubclass(b, typing.Generic) for b in bases):
-                generic_base = (typing.Generic,)
-            else:
-                generic_base = ()
-
-            # typing.py generally doesn't let you inherit from plain Generic, unless
-            # the name of the class happens to be "Protocol"
-            tp_dict = type.__new__(_TypedDictMeta, "Protocol", (*generic_base, dict), ns)
-            tp_dict.__name__ = name
-            if tp_dict.__qualname__ == "Protocol":
-                tp_dict.__qualname__ = name
-
-            if not hasattr(tp_dict, '__orig_bases__'):
-                tp_dict.__orig_bases__ = bases
-
-            annotations = {}
-            if "__annotations__" in ns:
-                own_annotations = ns["__annotations__"]
-            elif "__annotate__" in ns:
-                # TODO: Use inspect.VALUE here, and make the annotations lazily evaluated
-                own_annotations = ns["__annotate__"](1)
-            else:
-                own_annotations = {}
-            msg = "TypedDict('Name', {f0: t0, f1: t1, ...}); each t must be a type"
-            if _TAKES_MODULE:
-                own_annotations = {
-                    n: typing._type_check(tp, msg, module=tp_dict.__module__)
-                    for n, tp in own_annotations.items()
-                }
-            else:
-                own_annotations = {
-                    n: typing._type_check(tp, msg)
-                    for n, tp in own_annotations.items()
-                }
-            required_keys = set()
-            optional_keys = set()
-            readonly_keys = set()
-            mutable_keys = set()
-            extra_items_type = None
-
-            for base in bases:
-                base_dict = base.__dict__
-
-                annotations.update(base_dict.get('__annotations__', {}))
-                required_keys.update(base_dict.get('__required_keys__', ()))
-                optional_keys.update(base_dict.get('__optional_keys__', ()))
-                readonly_keys.update(base_dict.get('__readonly_keys__', ()))
-                mutable_keys.update(base_dict.get('__mutable_keys__', ()))
-                base_extra_items_type = base_dict.get('__extra_items__', None)
-                if base_extra_items_type is not None:
-                    extra_items_type = base_extra_items_type
-
-            if closed and extra_items_type is None:
-                extra_items_type = Never
-            if closed and "__extra_items__" in own_annotations:
-                annotation_type = own_annotations.pop("__extra_items__")
-                qualifiers = set(_get_typeddict_qualifiers(annotation_type))
-                if Required in qualifiers:
-                    raise TypeError(
-                        "Special key __extra_items__ does not support "
-                        "Required"
-                    )
-                if NotRequired in qualifiers:
-                    raise TypeError(
-                        "Special key __extra_items__ does not support "
-                        "NotRequired"
-                    )
-                extra_items_type = annotation_type
-
-            annotations.update(own_annotations)
-            for annotation_key, annotation_type in own_annotations.items():
-                qualifiers = set(_get_typeddict_qualifiers(annotation_type))
-
-                if Required in qualifiers:
-                    required_keys.add(annotation_key)
-                elif NotRequired in qualifiers:
-                    optional_keys.add(annotation_key)
-                elif total:
-                    required_keys.add(annotation_key)
-                else:
-                    optional_keys.add(annotation_key)
-                if ReadOnly in qualifiers:
-                    mutable_keys.discard(annotation_key)
-                    readonly_keys.add(annotation_key)
-                else:
-                    mutable_keys.add(annotation_key)
-                    readonly_keys.discard(annotation_key)
-
-            tp_dict.__annotations__ = annotations
-            tp_dict.__required_keys__ = frozenset(required_keys)
-            tp_dict.__optional_keys__ = frozenset(optional_keys)
-            tp_dict.__readonly_keys__ = frozenset(readonly_keys)
-            tp_dict.__mutable_keys__ = frozenset(mutable_keys)
-            if not hasattr(tp_dict, '__total__'):
-                tp_dict.__total__ = total
-            tp_dict.__closed__ = closed
-            tp_dict.__extra_items__ = extra_items_type
-            return tp_dict
-
-        __call__ = dict  # static method
-
-        def __subclasscheck__(cls, other):
-            # Typed dicts are only for static structural subtyping.
-            raise TypeError('TypedDict does not support instance and class checks')
-
-        __instancecheck__ = __subclasscheck__
-
-    _TypedDict = type.__new__(_TypedDictMeta, 'TypedDict', (), {})
-
-    @_ensure_subclassable(lambda bases: (_TypedDict,))
-    def TypedDict(typename, fields=_marker, /, *, total=True, closed=False, **kwargs):
-        """A simple typed namespace. At runtime it is equivalent to a plain dict.
-
-        TypedDict creates a dictionary type such that a type checker will expect all
-        instances to have a certain set of keys, where each key is
-        associated with a value of a consistent type. This expectation
-        is not checked at runtime.
-
-        Usage::
-
-            class Point2D(TypedDict):
-                x: int
-                y: int
-                label: str
-
-            a: Point2D = {'x': 1, 'y': 2, 'label': 'good'}  # OK
-            b: Point2D = {'z': 3, 'label': 'bad'}           # Fails type check
-
-            assert Point2D(x=1, y=2, label='first') == dict(x=1, y=2, label='first')
-
-        The type info can be accessed via the Point2D.__annotations__ dict, and
-        the Point2D.__required_keys__ and Point2D.__optional_keys__ frozensets.
-        TypedDict supports an additional equivalent form::
-
-            Point2D = TypedDict('Point2D', {'x': int, 'y': int, 'label': str})
-
-        By default, all keys must be present in a TypedDict. It is possible
-        to override this by specifying totality::
-
-            class Point2D(TypedDict, total=False):
-                x: int
-                y: int
-
-        This means that a Point2D TypedDict can have any of the keys omitted. A type
-        checker is only expected to support a literal False or True as the value of
-        the total argument. True is the default, and makes all items defined in the
-        class body be required.
-
-        The Required and NotRequired special forms can also be used to mark
-        individual keys as being required or not required::
-
-            class Point2D(TypedDict):
-                x: int  # the "x" key must always be present (Required is the default)
-                y: NotRequired[int]  # the "y" key can be omitted
-
-        See PEP 655 for more details on Required and NotRequired.
-        """
-        if fields is _marker or fields is None:
-            if fields is _marker:
-                deprecated_thing = "Failing to pass a value for the 'fields' parameter"
-            else:
-                deprecated_thing = "Passing `None` as the 'fields' parameter"
-
-            example = f"`{typename} = TypedDict({typename!r}, {{}})`"
-            deprecation_msg = (
-                f"{deprecated_thing} is deprecated and will be disallowed in "
-                "Python 3.15. To create a TypedDict class with 0 fields "
-                "using the functional syntax, pass an empty dictionary, e.g. "
-            ) + example + "."
-            warnings.warn(deprecation_msg, DeprecationWarning, stacklevel=2)
-            if closed is not False and closed is not True:
-                kwargs["closed"] = closed
-                closed = False
-            fields = kwargs
-        elif kwargs:
-            raise TypeError("TypedDict takes either a dict or keyword arguments,"
-                            " but not both")
-        if kwargs:
-            if sys.version_info >= (3, 13):
-                raise TypeError("TypedDict takes no keyword arguments")
-            warnings.warn(
-                "The kwargs-based syntax for TypedDict definitions is deprecated "
-                "in Python 3.11, will be removed in Python 3.13, and may not be "
-                "understood by third-party type checkers.",
-                DeprecationWarning,
-                stacklevel=2,
-            )
-
-        ns = {'__annotations__': dict(fields)}
-        module = _caller()
-        if module is not None:
-            # Setting correct module is necessary to make typed dict classes pickleable.
-            ns['__module__'] = module
-
-        td = _TypedDictMeta(typename, (), ns, total=total, closed=closed)
-        td.__orig_bases__ = (TypedDict,)
-        return td
-
-    if hasattr(typing, "_TypedDictMeta"):
-        _TYPEDDICT_TYPES = (typing._TypedDictMeta, _TypedDictMeta)
-    else:
-        _TYPEDDICT_TYPES = (_TypedDictMeta,)
-
-    def is_typeddict(tp):
-        """Check if an annotation is a TypedDict class
-
-        For example::
-            class Film(TypedDict):
-                title: str
-                year: int
-
-            is_typeddict(Film)  # => True
-            is_typeddict(Union[list, str])  # => False
-        """
-        # On 3.8, this would otherwise return True
-        if hasattr(typing, "TypedDict") and tp is typing.TypedDict:
-            return False
-        return isinstance(tp, _TYPEDDICT_TYPES)
-
-
-if hasattr(typing, "assert_type"):
-    assert_type = typing.assert_type
-
-else:
-    def assert_type(val, typ, /):
-        """Assert (to the type checker) that the value is of the given type.
-
-        When the type checker encounters a call to assert_type(), it
-        emits an error if the value is not of the specified type::
-
-            def greet(name: str) -> None:
-                assert_type(name, str)  # ok
-                assert_type(name, int)  # type checker error
-
-        At runtime this returns the first argument unchanged and otherwise
-        does nothing.
-        """
-        return val
-
-
-if hasattr(typing, "ReadOnly"):  # 3.13+
-    get_type_hints = typing.get_type_hints
-else:  # <=3.13
-    # replaces _strip_annotations()
-    def _strip_extras(t):
-        """Strips Annotated, Required and NotRequired from a given type."""
-        if isinstance(t, _AnnotatedAlias):
-            return _strip_extras(t.__origin__)
-        if hasattr(t, "__origin__") and t.__origin__ in (Required, NotRequired, ReadOnly):
-            return _strip_extras(t.__args__[0])
-        if isinstance(t, typing._GenericAlias):
-            stripped_args = tuple(_strip_extras(a) for a in t.__args__)
-            if stripped_args == t.__args__:
-                return t
-            return t.copy_with(stripped_args)
-        if hasattr(_types, "GenericAlias") and isinstance(t, _types.GenericAlias):
-            stripped_args = tuple(_strip_extras(a) for a in t.__args__)
-            if stripped_args == t.__args__:
-                return t
-            return _types.GenericAlias(t.__origin__, stripped_args)
-        if hasattr(_types, "UnionType") and isinstance(t, _types.UnionType):
-            stripped_args = tuple(_strip_extras(a) for a in t.__args__)
-            if stripped_args == t.__args__:
-                return t
-            return functools.reduce(operator.or_, stripped_args)
-
-        return t
-
-    def get_type_hints(obj, globalns=None, localns=None, include_extras=False):
-        """Return type hints for an object.
-
-        This is often the same as obj.__annotations__, but it handles
-        forward references encoded as string literals, adds Optional[t] if a
-        default value equal to None is set and recursively replaces all
-        'Annotated[T, ...]', 'Required[T]' or 'NotRequired[T]' with 'T'
-        (unless 'include_extras=True').
-
-        The argument may be a module, class, method, or function. The annotations
-        are returned as a dictionary. For classes, annotations include also
-        inherited members.
-
-        TypeError is raised if the argument is not of a type that can contain
-        annotations, and an empty dictionary is returned if no annotations are
-        present.
-
-        BEWARE -- the behavior of globalns and localns is counterintuitive
-        (unless you are familiar with how eval() and exec() work).  The
-        search order is locals first, then globals.
-
-        - If no dict arguments are passed, an attempt is made to use the
-          globals from obj (or the respective module's globals for classes),
-          and these are also used as the locals.  If the object does not appear
-          to have globals, an empty dictionary is used.
-
-        - If one dict argument is passed, it is used for both globals and
-          locals.
-
-        - If two dict arguments are passed, they specify globals and
-          locals, respectively.
-        """
-        if hasattr(typing, "Annotated"):  # 3.9+
-            hint = typing.get_type_hints(
-                obj, globalns=globalns, localns=localns, include_extras=True
-            )
-        else:  # 3.8
-            hint = typing.get_type_hints(obj, globalns=globalns, localns=localns)
-        if include_extras:
-            return hint
-        return {k: _strip_extras(t) for k, t in hint.items()}
-
-
-# Python 3.9+ has PEP 593 (Annotated)
-if hasattr(typing, 'Annotated'):
-    Annotated = typing.Annotated
-    # Not exported and not a public API, but needed for get_origin() and get_args()
-    # to work.
-    _AnnotatedAlias = typing._AnnotatedAlias
-# 3.8
-else:
-    class _AnnotatedAlias(typing._GenericAlias, _root=True):
-        """Runtime representation of an annotated type.
-
-        At its core 'Annotated[t, dec1, dec2, ...]' is an alias for the type 't'
-        with extra annotations. The alias behaves like a normal typing alias,
-        instantiating is the same as instantiating the underlying type, binding
-        it to types is also the same.
-        """
-        def __init__(self, origin, metadata):
-            if isinstance(origin, _AnnotatedAlias):
-                metadata = origin.__metadata__ + metadata
-                origin = origin.__origin__
-            super().__init__(origin, origin)
-            self.__metadata__ = metadata
-
-        def copy_with(self, params):
-            assert len(params) == 1
-            new_type = params[0]
-            return _AnnotatedAlias(new_type, self.__metadata__)
-
-        def __repr__(self):
-            return (f"typing_extensions.Annotated[{typing._type_repr(self.__origin__)}, "
-                    f"{', '.join(repr(a) for a in self.__metadata__)}]")
-
-        def __reduce__(self):
-            return operator.getitem, (
-                Annotated, (self.__origin__, *self.__metadata__)
-            )
-
-        def __eq__(self, other):
-            if not isinstance(other, _AnnotatedAlias):
-                return NotImplemented
-            if self.__origin__ != other.__origin__:
-                return False
-            return self.__metadata__ == other.__metadata__
-
-        def __hash__(self):
-            return hash((self.__origin__, self.__metadata__))
-
-    class Annotated:
-        """Add context specific metadata to a type.
-
-        Example: Annotated[int, runtime_check.Unsigned] indicates to the
-        hypothetical runtime_check module that this type is an unsigned int.
-        Every other consumer of this type can ignore this metadata and treat
-        this type as int.
-
-        The first argument to Annotated must be a valid type (and will be in
-        the __origin__ field), the remaining arguments are kept as a tuple in
-        the __extra__ field.
-
-        Details:
-
-        - It's an error to call `Annotated` with less than two arguments.
-        - Nested Annotated are flattened::
-
-            Annotated[Annotated[T, Ann1, Ann2], Ann3] == Annotated[T, Ann1, Ann2, Ann3]
-
-        - Instantiating an annotated type is equivalent to instantiating the
-        underlying type::
-
-            Annotated[C, Ann1](5) == C(5)
-
-        - Annotated can be used as a generic type alias::
-
-            Optimized = Annotated[T, runtime.Optimize()]
-            Optimized[int] == Annotated[int, runtime.Optimize()]
-
-            OptimizedList = Annotated[List[T], runtime.Optimize()]
-            OptimizedList[int] == Annotated[List[int], runtime.Optimize()]
-        """
-
-        __slots__ = ()
-
-        def __new__(cls, *args, **kwargs):
-            raise TypeError("Type Annotated cannot be instantiated.")
-
-        @typing._tp_cache
-        def __class_getitem__(cls, params):
-            if not isinstance(params, tuple) or len(params) < 2:
-                raise TypeError("Annotated[...] should be used "
-                                "with at least two arguments (a type and an "
-                                "annotation).")
-            allowed_special_forms = (ClassVar, Final)
-            if get_origin(params[0]) in allowed_special_forms:
-                origin = params[0]
-            else:
-                msg = "Annotated[t, ...]: t must be a type."
-                origin = typing._type_check(params[0], msg)
-            metadata = tuple(params[1:])
-            return _AnnotatedAlias(origin, metadata)
-
-        def __init_subclass__(cls, *args, **kwargs):
-            raise TypeError(
-                f"Cannot subclass {cls.__module__}.Annotated"
-            )
-
-# Python 3.8 has get_origin() and get_args() but those implementations aren't
-# Annotated-aware, so we can't use those. Python 3.9's versions don't support
-# ParamSpecArgs and ParamSpecKwargs, so only Python 3.10's versions will do.
-if sys.version_info[:2] >= (3, 10):
-    get_origin = typing.get_origin
-    get_args = typing.get_args
-# 3.8-3.9
-else:
-    try:
-        # 3.9+
-        from typing import _BaseGenericAlias
-    except ImportError:
-        _BaseGenericAlias = typing._GenericAlias
-    try:
-        # 3.9+
-        from typing import GenericAlias as _typing_GenericAlias
-    except ImportError:
-        _typing_GenericAlias = typing._GenericAlias
-
-    def get_origin(tp):
-        """Get the unsubscripted version of a type.
-
-        This supports generic types, Callable, Tuple, Union, Literal, Final, ClassVar
-        and Annotated. Return None for unsupported types. Examples::
-
-            get_origin(Literal[42]) is Literal
-            get_origin(int) is None
-            get_origin(ClassVar[int]) is ClassVar
-            get_origin(Generic) is Generic
-            get_origin(Generic[T]) is Generic
-            get_origin(Union[T, int]) is Union
-            get_origin(List[Tuple[T, T]][int]) == list
-            get_origin(P.args) is P
-        """
-        if isinstance(tp, _AnnotatedAlias):
-            return Annotated
-        if isinstance(tp, (typing._GenericAlias, _typing_GenericAlias, _BaseGenericAlias,
-                           ParamSpecArgs, ParamSpecKwargs)):
-            return tp.__origin__
-        if tp is typing.Generic:
-            return typing.Generic
-        return None
-
-    def get_args(tp):
-        """Get type arguments with all substitutions performed.
-
-        For unions, basic simplifications used by Union constructor are performed.
-        Examples::
-            get_args(Dict[str, int]) == (str, int)
-            get_args(int) == ()
-            get_args(Union[int, Union[T, int], str][int]) == (int, str)
-            get_args(Union[int, Tuple[T, int]][str]) == (int, Tuple[str, int])
-            get_args(Callable[[], T][int]) == ([], int)
-        """
-        if isinstance(tp, _AnnotatedAlias):
-            return (tp.__origin__, *tp.__metadata__)
-        if isinstance(tp, (typing._GenericAlias, _typing_GenericAlias)):
-            if getattr(tp, "_special", False):
-                return ()
-            res = tp.__args__
-            if get_origin(tp) is collections.abc.Callable and res[0] is not Ellipsis:
-                res = (list(res[:-1]), res[-1])
-            return res
-        return ()
-
-
-# 3.10+
-if hasattr(typing, 'TypeAlias'):
-    TypeAlias = typing.TypeAlias
-# 3.9
-elif sys.version_info[:2] >= (3, 9):
-    @_ExtensionsSpecialForm
-    def TypeAlias(self, parameters):
-        """Special marker indicating that an assignment should
-        be recognized as a proper type alias definition by type
-        checkers.
-
-        For example::
-
-            Predicate: TypeAlias = Callable[..., bool]
-
-        It's invalid when used anywhere except as in the example above.
-        """
-        raise TypeError(f"{self} is not subscriptable")
-# 3.8
-else:
-    TypeAlias = _ExtensionsSpecialForm(
-        'TypeAlias',
-        doc="""Special marker indicating that an assignment should
-        be recognized as a proper type alias definition by type
-        checkers.
-
-        For example::
-
-            Predicate: TypeAlias = Callable[..., bool]
-
-        It's invalid when used anywhere except as in the example
-        above."""
-    )
-
-
-if hasattr(typing, "NoDefault"):
-    NoDefault = typing.NoDefault
-else:
-    class NoDefaultTypeMeta(type):
-        def __setattr__(cls, attr, value):
-            # TypeError is consistent with the behavior of NoneType
-            raise TypeError(
-                f"cannot set {attr!r} attribute of immutable type {cls.__name__!r}"
-            )
-
-    class NoDefaultType(metaclass=NoDefaultTypeMeta):
-        """The type of the NoDefault singleton."""
-
-        __slots__ = ()
-
-        def __new__(cls):
-            return globals().get("NoDefault") or object.__new__(cls)
-
-        def __repr__(self):
-            return "typing_extensions.NoDefault"
-
-        def __reduce__(self):
-            return "NoDefault"
-
-    NoDefault = NoDefaultType()
-    del NoDefaultType, NoDefaultTypeMeta
-
-
-def _set_default(type_param, default):
-    type_param.has_default = lambda: default is not NoDefault
-    type_param.__default__ = default
-
-
-def _set_module(typevarlike):
-    # for pickling:
-    def_mod = _caller(depth=3)
-    if def_mod != 'typing_extensions':
-        typevarlike.__module__ = def_mod
-
-
-class _DefaultMixin:
-    """Mixin for TypeVarLike defaults."""
-
-    __slots__ = ()
-    __init__ = _set_default
-
-
-# Classes using this metaclass must provide a _backported_typevarlike ClassVar
-class _TypeVarLikeMeta(type):
-    def __instancecheck__(cls, __instance: Any) -> bool:
-        return isinstance(__instance, cls._backported_typevarlike)
-
-
-if _PEP_696_IMPLEMENTED:
-    from typing import TypeVar
-else:
-    # Add default and infer_variance parameters from PEP 696 and 695
-    class TypeVar(metaclass=_TypeVarLikeMeta):
-        """Type variable."""
-
-        _backported_typevarlike = typing.TypeVar
-
-        def __new__(cls, name, *constraints, bound=None,
-                    covariant=False, contravariant=False,
-                    default=NoDefault, infer_variance=False):
-            if hasattr(typing, "TypeAliasType"):
-                # PEP 695 implemented (3.12+), can pass infer_variance to typing.TypeVar
-                typevar = typing.TypeVar(name, *constraints, bound=bound,
-                                         covariant=covariant, contravariant=contravariant,
-                                         infer_variance=infer_variance)
-            else:
-                typevar = typing.TypeVar(name, *constraints, bound=bound,
-                                         covariant=covariant, contravariant=contravariant)
-                if infer_variance and (covariant or contravariant):
-                    raise ValueError("Variance cannot be specified with infer_variance.")
-                typevar.__infer_variance__ = infer_variance
-
-            _set_default(typevar, default)
-            _set_module(typevar)
-
-            def _tvar_prepare_subst(alias, args):
-                if (
-                    typevar.has_default()
-                    and alias.__parameters__.index(typevar) == len(args)
-                ):
-                    args += (typevar.__default__,)
-                return args
-
-            typevar.__typing_prepare_subst__ = _tvar_prepare_subst
-            return typevar
-
-        def __init_subclass__(cls) -> None:
-            raise TypeError(f"type '{__name__}.TypeVar' is not an acceptable base type")
-
-
-# Python 3.10+ has PEP 612
-if hasattr(typing, 'ParamSpecArgs'):
-    ParamSpecArgs = typing.ParamSpecArgs
-    ParamSpecKwargs = typing.ParamSpecKwargs
-# 3.8-3.9
-else:
-    class _Immutable:
-        """Mixin to indicate that object should not be copied."""
-        __slots__ = ()
-
-        def __copy__(self):
-            return self
-
-        def __deepcopy__(self, memo):
-            return self
-
-    class ParamSpecArgs(_Immutable):
-        """The args for a ParamSpec object.
-
-        Given a ParamSpec object P, P.args is an instance of ParamSpecArgs.
-
-        ParamSpecArgs objects have a reference back to their ParamSpec:
-
-        P.args.__origin__ is P
-
-        This type is meant for runtime introspection and has no special meaning to
-        static type checkers.
-        """
-        def __init__(self, origin):
-            self.__origin__ = origin
-
-        def __repr__(self):
-            return f"{self.__origin__.__name__}.args"
-
-        def __eq__(self, other):
-            if not isinstance(other, ParamSpecArgs):
-                return NotImplemented
-            return self.__origin__ == other.__origin__
-
-    class ParamSpecKwargs(_Immutable):
-        """The kwargs for a ParamSpec object.
-
-        Given a ParamSpec object P, P.kwargs is an instance of ParamSpecKwargs.
-
-        ParamSpecKwargs objects have a reference back to their ParamSpec:
-
-        P.kwargs.__origin__ is P
-
-        This type is meant for runtime introspection and has no special meaning to
-        static type checkers.
-        """
-        def __init__(self, origin):
-            self.__origin__ = origin
-
-        def __repr__(self):
-            return f"{self.__origin__.__name__}.kwargs"
-
-        def __eq__(self, other):
-            if not isinstance(other, ParamSpecKwargs):
-                return NotImplemented
-            return self.__origin__ == other.__origin__
-
-
-if _PEP_696_IMPLEMENTED:
-    from typing import ParamSpec
-
-# 3.10+
-elif hasattr(typing, 'ParamSpec'):
-
-    # Add default parameter - PEP 696
-    class ParamSpec(metaclass=_TypeVarLikeMeta):
-        """Parameter specification."""
-
-        _backported_typevarlike = typing.ParamSpec
-
-        def __new__(cls, name, *, bound=None,
-                    covariant=False, contravariant=False,
-                    infer_variance=False, default=NoDefault):
-            if hasattr(typing, "TypeAliasType"):
-                # PEP 695 implemented, can pass infer_variance to typing.TypeVar
-                paramspec = typing.ParamSpec(name, bound=bound,
-                                             covariant=covariant,
-                                             contravariant=contravariant,
-                                             infer_variance=infer_variance)
-            else:
-                paramspec = typing.ParamSpec(name, bound=bound,
-                                             covariant=covariant,
-                                             contravariant=contravariant)
-                paramspec.__infer_variance__ = infer_variance
-
-            _set_default(paramspec, default)
-            _set_module(paramspec)
-
-            def _paramspec_prepare_subst(alias, args):
-                params = alias.__parameters__
-                i = params.index(paramspec)
-                if i == len(args) and paramspec.has_default():
-                    args = [*args, paramspec.__default__]
-                if i >= len(args):
-                    raise TypeError(f"Too few arguments for {alias}")
-                # Special case where Z[[int, str, bool]] == Z[int, str, bool] in PEP 612.
-                if len(params) == 1 and not typing._is_param_expr(args[0]):
-                    assert i == 0
-                    args = (args,)
-                # Convert lists to tuples to help other libraries cache the results.
-                elif isinstance(args[i], list):
-                    args = (*args[:i], tuple(args[i]), *args[i + 1:])
-                return args
-
-            paramspec.__typing_prepare_subst__ = _paramspec_prepare_subst
-            return paramspec
-
-        def __init_subclass__(cls) -> None:
-            raise TypeError(f"type '{__name__}.ParamSpec' is not an acceptable base type")
-
-# 3.8-3.9
-else:
-
-    # Inherits from list as a workaround for Callable checks in Python < 3.9.2.
-    class ParamSpec(list, _DefaultMixin):
-        """Parameter specification variable.
-
-        Usage::
-
-           P = ParamSpec('P')
-
-        Parameter specification variables exist primarily for the benefit of static
-        type checkers.  They are used to forward the parameter types of one
-        callable to another callable, a pattern commonly found in higher order
-        functions and decorators.  They are only valid when used in ``Concatenate``,
-        or s the first argument to ``Callable``. In Python 3.10 and higher,
-        they are also supported in user-defined Generics at runtime.
-        See class Generic for more information on generic types.  An
-        example for annotating a decorator::
-
-           T = TypeVar('T')
-           P = ParamSpec('P')
-
-           def add_logging(f: Callable[P, T]) -> Callable[P, T]:
-               '''A type-safe decorator to add logging to a function.'''
-               def inner(*args: P.args, **kwargs: P.kwargs) -> T:
-                   logging.info(f'{f.__name__} was called')
-                   return f(*args, **kwargs)
-               return inner
-
-           @add_logging
-           def add_two(x: float, y: float) -> float:
-               '''Add two numbers together.'''
-               return x + y
-
-        Parameter specification variables defined with covariant=True or
-        contravariant=True can be used to declare covariant or contravariant
-        generic types.  These keyword arguments are valid, but their actual semantics
-        are yet to be decided.  See PEP 612 for details.
-
-        Parameter specification variables can be introspected. e.g.:
-
-           P.__name__ == 'T'
-           P.__bound__ == None
-           P.__covariant__ == False
-           P.__contravariant__ == False
-
-        Note that only parameter specification variables defined in global scope can
-        be pickled.
-        """
-
-        # Trick Generic __parameters__.
-        __class__ = typing.TypeVar
-
-        @property
-        def args(self):
-            return ParamSpecArgs(self)
-
-        @property
-        def kwargs(self):
-            return ParamSpecKwargs(self)
-
-        def __init__(self, name, *, bound=None, covariant=False, contravariant=False,
-                     infer_variance=False, default=NoDefault):
-            list.__init__(self, [self])
-            self.__name__ = name
-            self.__covariant__ = bool(covariant)
-            self.__contravariant__ = bool(contravariant)
-            self.__infer_variance__ = bool(infer_variance)
-            if bound:
-                self.__bound__ = typing._type_check(bound, 'Bound must be a type.')
-            else:
-                self.__bound__ = None
-            _DefaultMixin.__init__(self, default)
-
-            # for pickling:
-            def_mod = _caller()
-            if def_mod != 'typing_extensions':
-                self.__module__ = def_mod
-
-        def __repr__(self):
-            if self.__infer_variance__:
-                prefix = ''
-            elif self.__covariant__:
-                prefix = '+'
-            elif self.__contravariant__:
-                prefix = '-'
-            else:
-                prefix = '~'
-            return prefix + self.__name__
-
-        def __hash__(self):
-            return object.__hash__(self)
-
-        def __eq__(self, other):
-            return self is other
-
-        def __reduce__(self):
-            return self.__name__
-
-        # Hack to get typing._type_check to pass.
-        def __call__(self, *args, **kwargs):
-            pass
-
-
-# 3.8-3.9
-if not hasattr(typing, 'Concatenate'):
-    # Inherits from list as a workaround for Callable checks in Python < 3.9.2.
-    class _ConcatenateGenericAlias(list):
-
-        # Trick Generic into looking into this for __parameters__.
-        __class__ = typing._GenericAlias
-
-        # Flag in 3.8.
-        _special = False
-
-        def __init__(self, origin, args):
-            super().__init__(args)
-            self.__origin__ = origin
-            self.__args__ = args
-
-        def __repr__(self):
-            _type_repr = typing._type_repr
-            return (f'{_type_repr(self.__origin__)}'
-                    f'[{", ".join(_type_repr(arg) for arg in self.__args__)}]')
-
-        def __hash__(self):
-            return hash((self.__origin__, self.__args__))
-
-        # Hack to get typing._type_check to pass in Generic.
-        def __call__(self, *args, **kwargs):
-            pass
-
-        @property
-        def __parameters__(self):
-            return tuple(
-                tp for tp in self.__args__ if isinstance(tp, (typing.TypeVar, ParamSpec))
-            )
-
-
-# 3.8-3.9
-@typing._tp_cache
-def _concatenate_getitem(self, parameters):
-    if parameters == ():
-        raise TypeError("Cannot take a Concatenate of no types.")
-    if not isinstance(parameters, tuple):
-        parameters = (parameters,)
-    if not isinstance(parameters[-1], ParamSpec):
-        raise TypeError("The last parameter to Concatenate should be a "
-                        "ParamSpec variable.")
-    msg = "Concatenate[arg, ...]: each arg must be a type."
-    parameters = tuple(typing._type_check(p, msg) for p in parameters)
-    return _ConcatenateGenericAlias(self, parameters)
-
-
-# 3.10+
-if hasattr(typing, 'Concatenate'):
-    Concatenate = typing.Concatenate
-    _ConcatenateGenericAlias = typing._ConcatenateGenericAlias
-# 3.9
-elif sys.version_info[:2] >= (3, 9):
-    @_ExtensionsSpecialForm
-    def Concatenate(self, parameters):
-        """Used in conjunction with ``ParamSpec`` and ``Callable`` to represent a
-        higher order function which adds, removes or transforms parameters of a
-        callable.
-
-        For example::
-
-           Callable[Concatenate[int, P], int]
-
-        See PEP 612 for detailed information.
-        """
-        return _concatenate_getitem(self, parameters)
-# 3.8
-else:
-    class _ConcatenateForm(_ExtensionsSpecialForm, _root=True):
-        def __getitem__(self, parameters):
-            return _concatenate_getitem(self, parameters)
-
-    Concatenate = _ConcatenateForm(
-        'Concatenate',
-        doc="""Used in conjunction with ``ParamSpec`` and ``Callable`` to represent a
-        higher order function which adds, removes or transforms parameters of a
-        callable.
-
-        For example::
-
-           Callable[Concatenate[int, P], int]
-
-        See PEP 612 for detailed information.
-        """)
-
-# 3.10+
-if hasattr(typing, 'TypeGuard'):
-    TypeGuard = typing.TypeGuard
-# 3.9
-elif sys.version_info[:2] >= (3, 9):
-    @_ExtensionsSpecialForm
-    def TypeGuard(self, parameters):
-        """Special typing form used to annotate the return type of a user-defined
-        type guard function.  ``TypeGuard`` only accepts a single type argument.
-        At runtime, functions marked this way should return a boolean.
-
-        ``TypeGuard`` aims to benefit *type narrowing* -- a technique used by static
-        type checkers to determine a more precise type of an expression within a
-        program's code flow.  Usually type narrowing is done by analyzing
-        conditional code flow and applying the narrowing to a block of code.  The
-        conditional expression here is sometimes referred to as a "type guard".
-
-        Sometimes it would be convenient to use a user-defined boolean function
-        as a type guard.  Such a function should use ``TypeGuard[...]`` as its
-        return type to alert static type checkers to this intention.
-
-        Using  ``-> TypeGuard`` tells the static type checker that for a given
-        function:
-
-        1. The return value is a boolean.
-        2. If the return value is ``True``, the type of its argument
-        is the type inside ``TypeGuard``.
-
-        For example::
-
-            def is_str(val: Union[str, float]):
-                # "isinstance" type guard
-                if isinstance(val, str):
-                    # Type of ``val`` is narrowed to ``str``
-                    ...
-                else:
-                    # Else, type of ``val`` is narrowed to ``float``.
-                    ...
-
-        Strict type narrowing is not enforced -- ``TypeB`` need not be a narrower
-        form of ``TypeA`` (it can even be a wider form) and this may lead to
-        type-unsafe results.  The main reason is to allow for things like
-        narrowing ``List[object]`` to ``List[str]`` even though the latter is not
-        a subtype of the former, since ``List`` is invariant.  The responsibility of
-        writing type-safe type guards is left to the user.
-
-        ``TypeGuard`` also works with type variables.  For more information, see
-        PEP 647 (User-Defined Type Guards).
-        """
-        item = typing._type_check(parameters, f'{self} accepts only a single type.')
-        return typing._GenericAlias(self, (item,))
-# 3.8
-else:
-    class _TypeGuardForm(_ExtensionsSpecialForm, _root=True):
-        def __getitem__(self, parameters):
-            item = typing._type_check(parameters,
-                                      f'{self._name} accepts only a single type')
-            return typing._GenericAlias(self, (item,))
-
-    TypeGuard = _TypeGuardForm(
-        'TypeGuard',
-        doc="""Special typing form used to annotate the return type of a user-defined
-        type guard function.  ``TypeGuard`` only accepts a single type argument.
-        At runtime, functions marked this way should return a boolean.
-
-        ``TypeGuard`` aims to benefit *type narrowing* -- a technique used by static
-        type checkers to determine a more precise type of an expression within a
-        program's code flow.  Usually type narrowing is done by analyzing
-        conditional code flow and applying the narrowing to a block of code.  The
-        conditional expression here is sometimes referred to as a "type guard".
-
-        Sometimes it would be convenient to use a user-defined boolean function
-        as a type guard.  Such a function should use ``TypeGuard[...]`` as its
-        return type to alert static type checkers to this intention.
-
-        Using  ``-> TypeGuard`` tells the static type checker that for a given
-        function:
-
-        1. The return value is a boolean.
-        2. If the return value is ``True``, the type of its argument
-        is the type inside ``TypeGuard``.
-
-        For example::
-
-            def is_str(val: Union[str, float]):
-                # "isinstance" type guard
-                if isinstance(val, str):
-                    # Type of ``val`` is narrowed to ``str``
-                    ...
-                else:
-                    # Else, type of ``val`` is narrowed to ``float``.
-                    ...
-
-        Strict type narrowing is not enforced -- ``TypeB`` need not be a narrower
-        form of ``TypeA`` (it can even be a wider form) and this may lead to
-        type-unsafe results.  The main reason is to allow for things like
-        narrowing ``List[object]`` to ``List[str]`` even though the latter is not
-        a subtype of the former, since ``List`` is invariant.  The responsibility of
-        writing type-safe type guards is left to the user.
-
-        ``TypeGuard`` also works with type variables.  For more information, see
-        PEP 647 (User-Defined Type Guards).
-        """)
-
-# 3.13+
-if hasattr(typing, 'TypeIs'):
-    TypeIs = typing.TypeIs
-# 3.9
-elif sys.version_info[:2] >= (3, 9):
-    @_ExtensionsSpecialForm
-    def TypeIs(self, parameters):
-        """Special typing form used to annotate the return type of a user-defined
-        type narrower function.  ``TypeIs`` only accepts a single type argument.
-        At runtime, functions marked this way should return a boolean.
-
-        ``TypeIs`` aims to benefit *type narrowing* -- a technique used by static
-        type checkers to determine a more precise type of an expression within a
-        program's code flow.  Usually type narrowing is done by analyzing
-        conditional code flow and applying the narrowing to a block of code.  The
-        conditional expression here is sometimes referred to as a "type guard".
-
-        Sometimes it would be convenient to use a user-defined boolean function
-        as a type guard.  Such a function should use ``TypeIs[...]`` as its
-        return type to alert static type checkers to this intention.
-
-        Using  ``-> TypeIs`` tells the static type checker that for a given
-        function:
-
-        1. The return value is a boolean.
-        2. If the return value is ``True``, the type of its argument
-        is the intersection of the type inside ``TypeGuard`` and the argument's
-        previously known type.
-
-        For example::
-
-            def is_awaitable(val: object) -> TypeIs[Awaitable[Any]]:
-                return hasattr(val, '__await__')
-
-            def f(val: Union[int, Awaitable[int]]) -> int:
-                if is_awaitable(val):
-                    assert_type(val, Awaitable[int])
-                else:
-                    assert_type(val, int)
-
-        ``TypeIs`` also works with type variables.  For more information, see
-        PEP 742 (Narrowing types with TypeIs).
-        """
-        item = typing._type_check(parameters, f'{self} accepts only a single type.')
-        return typing._GenericAlias(self, (item,))
-# 3.8
-else:
-    class _TypeIsForm(_ExtensionsSpecialForm, _root=True):
-        def __getitem__(self, parameters):
-            item = typing._type_check(parameters,
-                                      f'{self._name} accepts only a single type')
-            return typing._GenericAlias(self, (item,))
-
-    TypeIs = _TypeIsForm(
-        'TypeIs',
-        doc="""Special typing form used to annotate the return type of a user-defined
-        type narrower function.  ``TypeIs`` only accepts a single type argument.
-        At runtime, functions marked this way should return a boolean.
-
-        ``TypeIs`` aims to benefit *type narrowing* -- a technique used by static
-        type checkers to determine a more precise type of an expression within a
-        program's code flow.  Usually type narrowing is done by analyzing
-        conditional code flow and applying the narrowing to a block of code.  The
-        conditional expression here is sometimes referred to as a "type guard".
-
-        Sometimes it would be convenient to use a user-defined boolean function
-        as a type guard.  Such a function should use ``TypeIs[...]`` as its
-        return type to alert static type checkers to this intention.
-
-        Using  ``-> TypeIs`` tells the static type checker that for a given
-        function:
-
-        1. The return value is a boolean.
-        2. If the return value is ``True``, the type of its argument
-        is the intersection of the type inside ``TypeGuard`` and the argument's
-        previously known type.
-
-        For example::
-
-            def is_awaitable(val: object) -> TypeIs[Awaitable[Any]]:
-                return hasattr(val, '__await__')
-
-            def f(val: Union[int, Awaitable[int]]) -> int:
-                if is_awaitable(val):
-                    assert_type(val, Awaitable[int])
-                else:
-                    assert_type(val, int)
-
-        ``TypeIs`` also works with type variables.  For more information, see
-        PEP 742 (Narrowing types with TypeIs).
-        """)
-
-
-# Vendored from cpython typing._SpecialFrom
-class _SpecialForm(typing._Final, _root=True):
-    __slots__ = ('_name', '__doc__', '_getitem')
-
-    def __init__(self, getitem):
-        self._getitem = getitem
-        self._name = getitem.__name__
-        self.__doc__ = getitem.__doc__
-
-    def __getattr__(self, item):
-        if item in {'__name__', '__qualname__'}:
-            return self._name
-
-        raise AttributeError(item)
-
-    def __mro_entries__(self, bases):
-        raise TypeError(f"Cannot subclass {self!r}")
-
-    def __repr__(self):
-        return f'typing_extensions.{self._name}'
-
-    def __reduce__(self):
-        return self._name
-
-    def __call__(self, *args, **kwds):
-        raise TypeError(f"Cannot instantiate {self!r}")
-
-    def __or__(self, other):
-        return typing.Union[self, other]
-
-    def __ror__(self, other):
-        return typing.Union[other, self]
-
-    def __instancecheck__(self, obj):
-        raise TypeError(f"{self} cannot be used with isinstance()")
-
-    def __subclasscheck__(self, cls):
-        raise TypeError(f"{self} cannot be used with issubclass()")
-
-    @typing._tp_cache
-    def __getitem__(self, parameters):
-        return self._getitem(self, parameters)
-
-
-if hasattr(typing, "LiteralString"):  # 3.11+
-    LiteralString = typing.LiteralString
-else:
-    @_SpecialForm
-    def LiteralString(self, params):
-        """Represents an arbitrary literal string.
-
-        Example::
-
-          from typing_extensions import LiteralString
-
-          def query(sql: LiteralString) -> ...:
-              ...
-
-          query("SELECT * FROM table")  # ok
-          query(f"SELECT * FROM {input()}")  # not ok
-
-        See PEP 675 for details.
-
-        """
-        raise TypeError(f"{self} is not subscriptable")
-
-
-if hasattr(typing, "Self"):  # 3.11+
-    Self = typing.Self
-else:
-    @_SpecialForm
-    def Self(self, params):
-        """Used to spell the type of "self" in classes.
-
-        Example::
-
-          from typing import Self
-
-          class ReturnsSelf:
-              def parse(self, data: bytes) -> Self:
-                  ...
-                  return self
-
-        """
-
-        raise TypeError(f"{self} is not subscriptable")
-
-
-if hasattr(typing, "Never"):  # 3.11+
-    Never = typing.Never
-else:
-    @_SpecialForm
-    def Never(self, params):
-        """The bottom type, a type that has no members.
-
-        This can be used to define a function that should never be
-        called, or a function that never returns::
-
-            from typing_extensions import Never
-
-            def never_call_me(arg: Never) -> None:
-                pass
-
-            def int_or_str(arg: int | str) -> None:
-                never_call_me(arg)  # type checker error
-                match arg:
-                    case int():
-                        print("It's an int")
-                    case str():
-                        print("It's a str")
-                    case _:
-                        never_call_me(arg)  # ok, arg is of type Never
-
-        """
-
-        raise TypeError(f"{self} is not subscriptable")
-
-
-if hasattr(typing, 'Required'):  # 3.11+
-    Required = typing.Required
-    NotRequired = typing.NotRequired
-elif sys.version_info[:2] >= (3, 9):  # 3.9-3.10
-    @_ExtensionsSpecialForm
-    def Required(self, parameters):
-        """A special typing construct to mark a key of a total=False TypedDict
-        as required. For example:
-
-            class Movie(TypedDict, total=False):
-                title: Required[str]
-                year: int
-
-            m = Movie(
-                title='The Matrix',  # typechecker error if key is omitted
-                year=1999,
-            )
-
-        There is no runtime checking that a required key is actually provided
-        when instantiating a related TypedDict.
-        """
-        item = typing._type_check(parameters, f'{self._name} accepts only a single type.')
-        return typing._GenericAlias(self, (item,))
-
-    @_ExtensionsSpecialForm
-    def NotRequired(self, parameters):
-        """A special typing construct to mark a key of a TypedDict as
-        potentially missing. For example:
-
-            class Movie(TypedDict):
-                title: str
-                year: NotRequired[int]
-
-            m = Movie(
-                title='The Matrix',  # typechecker error if key is omitted
-                year=1999,
-            )
-        """
-        item = typing._type_check(parameters, f'{self._name} accepts only a single type.')
-        return typing._GenericAlias(self, (item,))
-
-else:  # 3.8
-    class _RequiredForm(_ExtensionsSpecialForm, _root=True):
-        def __getitem__(self, parameters):
-            item = typing._type_check(parameters,
-                                      f'{self._name} accepts only a single type.')
-            return typing._GenericAlias(self, (item,))
-
-    Required = _RequiredForm(
-        'Required',
-        doc="""A special typing construct to mark a key of a total=False TypedDict
-        as required. For example:
-
-            class Movie(TypedDict, total=False):
-                title: Required[str]
-                year: int
-
-            m = Movie(
-                title='The Matrix',  # typechecker error if key is omitted
-                year=1999,
-            )
-
-        There is no runtime checking that a required key is actually provided
-        when instantiating a related TypedDict.
-        """)
-    NotRequired = _RequiredForm(
-        'NotRequired',
-        doc="""A special typing construct to mark a key of a TypedDict as
-        potentially missing. For example:
-
-            class Movie(TypedDict):
-                title: str
-                year: NotRequired[int]
-
-            m = Movie(
-                title='The Matrix',  # typechecker error if key is omitted
-                year=1999,
-            )
-        """)
-
-
-if hasattr(typing, 'ReadOnly'):
-    ReadOnly = typing.ReadOnly
-elif sys.version_info[:2] >= (3, 9):  # 3.9-3.12
-    @_ExtensionsSpecialForm
-    def ReadOnly(self, parameters):
-        """A special typing construct to mark an item of a TypedDict as read-only.
-
-        For example:
-
-            class Movie(TypedDict):
-                title: ReadOnly[str]
-                year: int
-
-            def mutate_movie(m: Movie) -> None:
-                m["year"] = 1992  # allowed
-                m["title"] = "The Matrix"  # typechecker error
-
-        There is no runtime checking for this property.
-        """
-        item = typing._type_check(parameters, f'{self._name} accepts only a single type.')
-        return typing._GenericAlias(self, (item,))
-
-else:  # 3.8
-    class _ReadOnlyForm(_ExtensionsSpecialForm, _root=True):
-        def __getitem__(self, parameters):
-            item = typing._type_check(parameters,
-                                      f'{self._name} accepts only a single type.')
-            return typing._GenericAlias(self, (item,))
-
-    ReadOnly = _ReadOnlyForm(
-        'ReadOnly',
-        doc="""A special typing construct to mark a key of a TypedDict as read-only.
-
-        For example:
-
-            class Movie(TypedDict):
-                title: ReadOnly[str]
-                year: int
-
-            def mutate_movie(m: Movie) -> None:
-                m["year"] = 1992  # allowed
-                m["title"] = "The Matrix"  # typechecker error
-
-        There is no runtime checking for this propery.
-        """)
-
-
-_UNPACK_DOC = """\
-Type unpack operator.
-
-The type unpack operator takes the child types from some container type,
-such as `tuple[int, str]` or a `TypeVarTuple`, and 'pulls them out'. For
-example:
-
-  # For some generic class `Foo`:
-  Foo[Unpack[tuple[int, str]]]  # Equivalent to Foo[int, str]
-
-  Ts = TypeVarTuple('Ts')
-  # Specifies that `Bar` is generic in an arbitrary number of types.
-  # (Think of `Ts` as a tuple of an arbitrary number of individual
-  #  `TypeVar`s, which the `Unpack` is 'pulling out' directly into the
-  #  `Generic[]`.)
-  class Bar(Generic[Unpack[Ts]]): ...
-  Bar[int]  # Valid
-  Bar[int, str]  # Also valid
-
-From Python 3.11, this can also be done using the `*` operator:
-
-    Foo[*tuple[int, str]]
-    class Bar(Generic[*Ts]): ...
-
-The operator can also be used along with a `TypedDict` to annotate
-`**kwargs` in a function signature. For instance:
-
-  class Movie(TypedDict):
-    name: str
-    year: int
-
-  # This function expects two keyword arguments - *name* of type `str` and
-  # *year* of type `int`.
-  def foo(**kwargs: Unpack[Movie]): ...
-
-Note that there is only some runtime checking of this operator. Not
-everything the runtime allows may be accepted by static type checkers.
-
-For more information, see PEP 646 and PEP 692.
-"""
-
-
-if sys.version_info >= (3, 12):  # PEP 692 changed the repr of Unpack[]
-    Unpack = typing.Unpack
-
-    def _is_unpack(obj):
-        return get_origin(obj) is Unpack
-
-elif sys.version_info[:2] >= (3, 9):  # 3.9+
-    class _UnpackSpecialForm(_ExtensionsSpecialForm, _root=True):
-        def __init__(self, getitem):
-            super().__init__(getitem)
-            self.__doc__ = _UNPACK_DOC
-
-    class _UnpackAlias(typing._GenericAlias, _root=True):
-        __class__ = typing.TypeVar
-
-        @property
-        def __typing_unpacked_tuple_args__(self):
-            assert self.__origin__ is Unpack
-            assert len(self.__args__) == 1
-            arg, = self.__args__
-            if isinstance(arg, (typing._GenericAlias, _types.GenericAlias)):
-                if arg.__origin__ is not tuple:
-                    raise TypeError("Unpack[...] must be used with a tuple type")
-                return arg.__args__
-            return None
-
-    @_UnpackSpecialForm
-    def Unpack(self, parameters):
-        item = typing._type_check(parameters, f'{self._name} accepts only a single type.')
-        return _UnpackAlias(self, (item,))
-
-    def _is_unpack(obj):
-        return isinstance(obj, _UnpackAlias)
-
-else:  # 3.8
-    class _UnpackAlias(typing._GenericAlias, _root=True):
-        __class__ = typing.TypeVar
-
-    class _UnpackForm(_ExtensionsSpecialForm, _root=True):
-        def __getitem__(self, parameters):
-            item = typing._type_check(parameters,
-                                      f'{self._name} accepts only a single type.')
-            return _UnpackAlias(self, (item,))
-
-    Unpack = _UnpackForm('Unpack', doc=_UNPACK_DOC)
-
-    def _is_unpack(obj):
-        return isinstance(obj, _UnpackAlias)
-
-
-if _PEP_696_IMPLEMENTED:
-    from typing import TypeVarTuple
-
-elif hasattr(typing, "TypeVarTuple"):  # 3.11+
-
-    def _unpack_args(*args):
-        newargs = []
-        for arg in args:
-            subargs = getattr(arg, '__typing_unpacked_tuple_args__', None)
-            if subargs is not None and not (subargs and subargs[-1] is ...):
-                newargs.extend(subargs)
-            else:
-                newargs.append(arg)
-        return newargs
-
-    # Add default parameter - PEP 696
-    class TypeVarTuple(metaclass=_TypeVarLikeMeta):
-        """Type variable tuple."""
-
-        _backported_typevarlike = typing.TypeVarTuple
-
-        def __new__(cls, name, *, default=NoDefault):
-            tvt = typing.TypeVarTuple(name)
-            _set_default(tvt, default)
-            _set_module(tvt)
-
-            def _typevartuple_prepare_subst(alias, args):
-                params = alias.__parameters__
-                typevartuple_index = params.index(tvt)
-                for param in params[typevartuple_index + 1:]:
-                    if isinstance(param, TypeVarTuple):
-                        raise TypeError(
-                            f"More than one TypeVarTuple parameter in {alias}"
-                        )
-
-                alen = len(args)
-                plen = len(params)
-                left = typevartuple_index
-                right = plen - typevartuple_index - 1
-                var_tuple_index = None
-                fillarg = None
-                for k, arg in enumerate(args):
-                    if not isinstance(arg, type):
-                        subargs = getattr(arg, '__typing_unpacked_tuple_args__', None)
-                        if subargs and len(subargs) == 2 and subargs[-1] is ...:
-                            if var_tuple_index is not None:
-                                raise TypeError(
-                                    "More than one unpacked "
-                                    "arbitrary-length tuple argument"
-                                )
-                            var_tuple_index = k
-                            fillarg = subargs[0]
-                if var_tuple_index is not None:
-                    left = min(left, var_tuple_index)
-                    right = min(right, alen - var_tuple_index - 1)
-                elif left + right > alen:
-                    raise TypeError(f"Too few arguments for {alias};"
-                                    f" actual {alen}, expected at least {plen - 1}")
-                if left == alen - right and tvt.has_default():
-                    replacement = _unpack_args(tvt.__default__)
-                else:
-                    replacement = args[left: alen - right]
-
-                return (
-                    *args[:left],
-                    *([fillarg] * (typevartuple_index - left)),
-                    replacement,
-                    *([fillarg] * (plen - right - left - typevartuple_index - 1)),
-                    *args[alen - right:],
-                )
-
-            tvt.__typing_prepare_subst__ = _typevartuple_prepare_subst
-            return tvt
-
-        def __init_subclass__(self, *args, **kwds):
-            raise TypeError("Cannot subclass special typing classes")
-
-else:  # <=3.10
-    class TypeVarTuple(_DefaultMixin):
-        """Type variable tuple.
-
-        Usage::
-
-            Ts = TypeVarTuple('Ts')
-
-        In the same way that a normal type variable is a stand-in for a single
-        type such as ``int``, a type variable *tuple* is a stand-in for a *tuple*
-        type such as ``Tuple[int, str]``.
-
-        Type variable tuples can be used in ``Generic`` declarations.
-        Consider the following example::
-
-            class Array(Generic[*Ts]): ...
-
-        The ``Ts`` type variable tuple here behaves like ``tuple[T1, T2]``,
-        where ``T1`` and ``T2`` are type variables. To use these type variables
-        as type parameters of ``Array``, we must *unpack* the type variable tuple using
-        the star operator: ``*Ts``. The signature of ``Array`` then behaves
-        as if we had simply written ``class Array(Generic[T1, T2]): ...``.
-        In contrast to ``Generic[T1, T2]``, however, ``Generic[*Shape]`` allows
-        us to parameterise the class with an *arbitrary* number of type parameters.
-
-        Type variable tuples can be used anywhere a normal ``TypeVar`` can.
-        This includes class definitions, as shown above, as well as function
-        signatures and variable annotations::
-
-            class Array(Generic[*Ts]):
-
-                def __init__(self, shape: Tuple[*Ts]):
-                    self._shape: Tuple[*Ts] = shape
-
-                def get_shape(self) -> Tuple[*Ts]:
-                    return self._shape
-
-            shape = (Height(480), Width(640))
-            x: Array[Height, Width] = Array(shape)
-            y = abs(x)  # Inferred type is Array[Height, Width]
-            z = x + x   #        ...    is Array[Height, Width]
-            x.get_shape()  #     ...    is tuple[Height, Width]
-
-        """
-
-        # Trick Generic __parameters__.
-        __class__ = typing.TypeVar
-
-        def __iter__(self):
-            yield self.__unpacked__
-
-        def __init__(self, name, *, default=NoDefault):
-            self.__name__ = name
-            _DefaultMixin.__init__(self, default)
-
-            # for pickling:
-            def_mod = _caller()
-            if def_mod != 'typing_extensions':
-                self.__module__ = def_mod
-
-            self.__unpacked__ = Unpack[self]
-
-        def __repr__(self):
-            return self.__name__
-
-        def __hash__(self):
-            return object.__hash__(self)
-
-        def __eq__(self, other):
-            return self is other
-
-        def __reduce__(self):
-            return self.__name__
-
-        def __init_subclass__(self, *args, **kwds):
-            if '_root' not in kwds:
-                raise TypeError("Cannot subclass special typing classes")
-
-
-if hasattr(typing, "reveal_type"):  # 3.11+
-    reveal_type = typing.reveal_type
-else:  # <=3.10
-    def reveal_type(obj: T, /) -> T:
-        """Reveal the inferred type of a variable.
-
-        When a static type checker encounters a call to ``reveal_type()``,
-        it will emit the inferred type of the argument::
-
-            x: int = 1
-            reveal_type(x)
-
-        Running a static type checker (e.g., ``mypy``) on this example
-        will produce output similar to 'Revealed type is "builtins.int"'.
-
-        At runtime, the function prints the runtime type of the
-        argument and returns it unchanged.
-
-        """
-        print(f"Runtime type is {type(obj).__name__!r}", file=sys.stderr)
-        return obj
-
-
-if hasattr(typing, "_ASSERT_NEVER_REPR_MAX_LENGTH"):  # 3.11+
-    _ASSERT_NEVER_REPR_MAX_LENGTH = typing._ASSERT_NEVER_REPR_MAX_LENGTH
-else:  # <=3.10
-    _ASSERT_NEVER_REPR_MAX_LENGTH = 100
-
-
-if hasattr(typing, "assert_never"):  # 3.11+
-    assert_never = typing.assert_never
-else:  # <=3.10
-    def assert_never(arg: Never, /) -> Never:
-        """Assert to the type checker that a line of code is unreachable.
-
-        Example::
-
-            def int_or_str(arg: int | str) -> None:
-                match arg:
-                    case int():
-                        print("It's an int")
-                    case str():
-                        print("It's a str")
-                    case _:
-                        assert_never(arg)
-
-        If a type checker finds that a call to assert_never() is
-        reachable, it will emit an error.
-
-        At runtime, this throws an exception when called.
-
-        """
-        value = repr(arg)
-        if len(value) > _ASSERT_NEVER_REPR_MAX_LENGTH:
-            value = value[:_ASSERT_NEVER_REPR_MAX_LENGTH] + '...'
-        raise AssertionError(f"Expected code to be unreachable, but got: {value}")
-
-
-if sys.version_info >= (3, 12):  # 3.12+
-    # dataclass_transform exists in 3.11 but lacks the frozen_default parameter
-    dataclass_transform = typing.dataclass_transform
-else:  # <=3.11
-    def dataclass_transform(
-        *,
-        eq_default: bool = True,
-        order_default: bool = False,
-        kw_only_default: bool = False,
-        frozen_default: bool = False,
-        field_specifiers: typing.Tuple[
-            typing.Union[typing.Type[typing.Any], typing.Callable[..., typing.Any]],
-            ...
-        ] = (),
-        **kwargs: typing.Any,
-    ) -> typing.Callable[[T], T]:
-        """Decorator that marks a function, class, or metaclass as providing
-        dataclass-like behavior.
-
-        Example:
-
-            from typing_extensions import dataclass_transform
-
-            _T = TypeVar("_T")
-
-            # Used on a decorator function
-            @dataclass_transform()
-            def create_model(cls: type[_T]) -> type[_T]:
-                ...
-                return cls
-
-            @create_model
-            class CustomerModel:
-                id: int
-                name: str
-
-            # Used on a base class
-            @dataclass_transform()
-            class ModelBase: ...
-
-            class CustomerModel(ModelBase):
-                id: int
-                name: str
-
-            # Used on a metaclass
-            @dataclass_transform()
-            class ModelMeta(type): ...
-
-            class ModelBase(metaclass=ModelMeta): ...
-
-            class CustomerModel(ModelBase):
-                id: int
-                name: str
-
-        Each of the ``CustomerModel`` classes defined in this example will now
-        behave similarly to a dataclass created with the ``@dataclasses.dataclass``
-        decorator. For example, the type checker will synthesize an ``__init__``
-        method.
-
-        The arguments to this decorator can be used to customize this behavior:
-        - ``eq_default`` indicates whether the ``eq`` parameter is assumed to be
-          True or False if it is omitted by the caller.
-        - ``order_default`` indicates whether the ``order`` parameter is
-          assumed to be True or False if it is omitted by the caller.
-        - ``kw_only_default`` indicates whether the ``kw_only`` parameter is
-          assumed to be True or False if it is omitted by the caller.
-        - ``frozen_default`` indicates whether the ``frozen`` parameter is
-          assumed to be True or False if it is omitted by the caller.
-        - ``field_specifiers`` specifies a static list of supported classes
-          or functions that describe fields, similar to ``dataclasses.field()``.
-
-        At runtime, this decorator records its arguments in the
-        ``__dataclass_transform__`` attribute on the decorated object.
-
-        See PEP 681 for details.
-
-        """
-        def decorator(cls_or_fn):
-            cls_or_fn.__dataclass_transform__ = {
-                "eq_default": eq_default,
-                "order_default": order_default,
-                "kw_only_default": kw_only_default,
-                "frozen_default": frozen_default,
-                "field_specifiers": field_specifiers,
-                "kwargs": kwargs,
-            }
-            return cls_or_fn
-        return decorator
-
-
-if hasattr(typing, "override"):  # 3.12+
-    override = typing.override
-else:  # <=3.11
-    _F = typing.TypeVar("_F", bound=typing.Callable[..., typing.Any])
-
-    def override(arg: _F, /) -> _F:
-        """Indicate that a method is intended to override a method in a base class.
-
-        Usage:
-
-            class Base:
-                def method(self) -> None:
-                    pass
-
-            class Child(Base):
-                @override
-                def method(self) -> None:
-                    super().method()
-
-        When this decorator is applied to a method, the type checker will
-        validate that it overrides a method with the same name on a base class.
-        This helps prevent bugs that may occur when a base class is changed
-        without an equivalent change to a child class.
-
-        There is no runtime checking of these properties. The decorator
-        sets the ``__override__`` attribute to ``True`` on the decorated object
-        to allow runtime introspection.
-
-        See PEP 698 for details.
-
-        """
-        try:
-            arg.__override__ = True
-        except (AttributeError, TypeError):
-            # Skip the attribute silently if it is not writable.
-            # AttributeError happens if the object has __slots__ or a
-            # read-only property, TypeError if it's a builtin class.
-            pass
-        return arg
-
-
-if hasattr(warnings, "deprecated"):
-    deprecated = warnings.deprecated
-else:
-    _T = typing.TypeVar("_T")
-
-    class deprecated:
-        """Indicate that a class, function or overload is deprecated.
-
-        When this decorator is applied to an object, the type checker
-        will generate a diagnostic on usage of the deprecated object.
-
-        Usage:
-
-            @deprecated("Use B instead")
-            class A:
-                pass
-
-            @deprecated("Use g instead")
-            def f():
-                pass
-
-            @overload
-            @deprecated("int support is deprecated")
-            def g(x: int) -> int: ...
-            @overload
-            def g(x: str) -> int: ...
-
-        The warning specified by *category* will be emitted at runtime
-        on use of deprecated objects. For functions, that happens on calls;
-        for classes, on instantiation and on creation of subclasses.
-        If the *category* is ``None``, no warning is emitted at runtime.
-        The *stacklevel* determines where the
-        warning is emitted. If it is ``1`` (the default), the warning
-        is emitted at the direct caller of the deprecated object; if it
-        is higher, it is emitted further up the stack.
-        Static type checker behavior is not affected by the *category*
-        and *stacklevel* arguments.
-
-        The deprecation message passed to the decorator is saved in the
-        ``__deprecated__`` attribute on the decorated object.
-        If applied to an overload, the decorator
-        must be after the ``@overload`` decorator for the attribute to
-        exist on the overload as returned by ``get_overloads()``.
-
-        See PEP 702 for details.
-
-        """
-        def __init__(
-            self,
-            message: str,
-            /,
-            *,
-            category: typing.Optional[typing.Type[Warning]] = DeprecationWarning,
-            stacklevel: int = 1,
-        ) -> None:
-            if not isinstance(message, str):
-                raise TypeError(
-                    "Expected an object of type str for 'message', not "
-                    f"{type(message).__name__!r}"
-                )
-            self.message = message
-            self.category = category
-            self.stacklevel = stacklevel
-
-        def __call__(self, arg: _T, /) -> _T:
-            # Make sure the inner functions created below don't
-            # retain a reference to self.
-            msg = self.message
-            category = self.category
-            stacklevel = self.stacklevel
-            if category is None:
-                arg.__deprecated__ = msg
-                return arg
-            elif isinstance(arg, type):
-                import functools
-                from types import MethodType
-
-                original_new = arg.__new__
-
-                @functools.wraps(original_new)
-                def __new__(cls, *args, **kwargs):
-                    if cls is arg:
-                        warnings.warn(msg, category=category, stacklevel=stacklevel + 1)
-                    if original_new is not object.__new__:
-                        return original_new(cls, *args, **kwargs)
-                    # Mirrors a similar check in object.__new__.
-                    elif cls.__init__ is object.__init__ and (args or kwargs):
-                        raise TypeError(f"{cls.__name__}() takes no arguments")
-                    else:
-                        return original_new(cls)
-
-                arg.__new__ = staticmethod(__new__)
-
-                original_init_subclass = arg.__init_subclass__
-                # We need slightly different behavior if __init_subclass__
-                # is a bound method (likely if it was implemented in Python)
-                if isinstance(original_init_subclass, MethodType):
-                    original_init_subclass = original_init_subclass.__func__
-
-                    @functools.wraps(original_init_subclass)
-                    def __init_subclass__(*args, **kwargs):
-                        warnings.warn(msg, category=category, stacklevel=stacklevel + 1)
-                        return original_init_subclass(*args, **kwargs)
-
-                    arg.__init_subclass__ = classmethod(__init_subclass__)
-                # Or otherwise, which likely means it's a builtin such as
-                # object's implementation of __init_subclass__.
-                else:
-                    @functools.wraps(original_init_subclass)
-                    def __init_subclass__(*args, **kwargs):
-                        warnings.warn(msg, category=category, stacklevel=stacklevel + 1)
-                        return original_init_subclass(*args, **kwargs)
-
-                    arg.__init_subclass__ = __init_subclass__
-
-                arg.__deprecated__ = __new__.__deprecated__ = msg
-                __init_subclass__.__deprecated__ = msg
-                return arg
-            elif callable(arg):
-                import functools
-
-                @functools.wraps(arg)
-                def wrapper(*args, **kwargs):
-                    warnings.warn(msg, category=category, stacklevel=stacklevel + 1)
-                    return arg(*args, **kwargs)
-
-                arg.__deprecated__ = wrapper.__deprecated__ = msg
-                return wrapper
-            else:
-                raise TypeError(
-                    "@deprecated decorator with non-None category must be applied to "
-                    f"a class or callable, not {arg!r}"
-                )
-
-
-# We have to do some monkey patching to deal with the dual nature of
-# Unpack/TypeVarTuple:
-# - We want Unpack to be a kind of TypeVar so it gets accepted in
-#   Generic[Unpack[Ts]]
-# - We want it to *not* be treated as a TypeVar for the purposes of
-#   counting generic parameters, so that when we subscript a generic,
-#   the runtime doesn't try to substitute the Unpack with the subscripted type.
-if not hasattr(typing, "TypeVarTuple"):
-    def _check_generic(cls, parameters, elen=_marker):
-        """Check correct count for parameters of a generic cls (internal helper).
-
-        This gives a nice error message in case of count mismatch.
-        """
-        if not elen:
-            raise TypeError(f"{cls} is not a generic class")
-        if elen is _marker:
-            if not hasattr(cls, "__parameters__") or not cls.__parameters__:
-                raise TypeError(f"{cls} is not a generic class")
-            elen = len(cls.__parameters__)
-        alen = len(parameters)
-        if alen != elen:
-            expect_val = elen
-            if hasattr(cls, "__parameters__"):
-                parameters = [p for p in cls.__parameters__ if not _is_unpack(p)]
-                num_tv_tuples = sum(isinstance(p, TypeVarTuple) for p in parameters)
-                if (num_tv_tuples > 0) and (alen >= elen - num_tv_tuples):
-                    return
-
-                # deal with TypeVarLike defaults
-                # required TypeVarLikes cannot appear after a defaulted one.
-                if alen < elen:
-                    # since we validate TypeVarLike default in _collect_type_vars
-                    # or _collect_parameters we can safely check parameters[alen]
-                    if (
-                        getattr(parameters[alen], '__default__', NoDefault)
-                        is not NoDefault
-                    ):
-                        return
-
-                    num_default_tv = sum(getattr(p, '__default__', NoDefault)
-                                         is not NoDefault for p in parameters)
-
-                    elen -= num_default_tv
-
-                    expect_val = f"at least {elen}"
-
-            things = "arguments" if sys.version_info >= (3, 10) else "parameters"
-            raise TypeError(f"Too {'many' if alen > elen else 'few'} {things}"
-                            f" for {cls}; actual {alen}, expected {expect_val}")
-else:
-    # Python 3.11+
-
-    def _check_generic(cls, parameters, elen):
-        """Check correct count for parameters of a generic cls (internal helper).
-
-        This gives a nice error message in case of count mismatch.
-        """
-        if not elen:
-            raise TypeError(f"{cls} is not a generic class")
-        alen = len(parameters)
-        if alen != elen:
-            expect_val = elen
-            if hasattr(cls, "__parameters__"):
-                parameters = [p for p in cls.__parameters__ if not _is_unpack(p)]
-
-                # deal with TypeVarLike defaults
-                # required TypeVarLikes cannot appear after a defaulted one.
-                if alen < elen:
-                    # since we validate TypeVarLike default in _collect_type_vars
-                    # or _collect_parameters we can safely check parameters[alen]
-                    if (
-                        getattr(parameters[alen], '__default__', NoDefault)
-                        is not NoDefault
-                    ):
-                        return
-
-                    num_default_tv = sum(getattr(p, '__default__', NoDefault)
-                                         is not NoDefault for p in parameters)
-
-                    elen -= num_default_tv
-
-                    expect_val = f"at least {elen}"
-
-            raise TypeError(f"Too {'many' if alen > elen else 'few'} arguments"
-                            f" for {cls}; actual {alen}, expected {expect_val}")
-
-if not _PEP_696_IMPLEMENTED:
-    typing._check_generic = _check_generic
-
-
-def _has_generic_or_protocol_as_origin() -> bool:
-    try:
-        frame = sys._getframe(2)
-    # - Catch AttributeError: not all Python implementations have sys._getframe()
-    # - Catch ValueError: maybe we're called from an unexpected module
-    #   and the call stack isn't deep enough
-    except (AttributeError, ValueError):
-        return False  # err on the side of leniency
-    else:
-        # If we somehow get invoked from outside typing.py,
-        # also err on the side of leniency
-        if frame.f_globals.get("__name__") != "typing":
-            return False
-        origin = frame.f_locals.get("origin")
-        # Cannot use "in" because origin may be an object with a buggy __eq__ that
-        # throws an error.
-        return origin is typing.Generic or origin is Protocol or origin is typing.Protocol
-
-
-_TYPEVARTUPLE_TYPES = {TypeVarTuple, getattr(typing, "TypeVarTuple", None)}
-
-
-def _is_unpacked_typevartuple(x) -> bool:
-    if get_origin(x) is not Unpack:
-        return False
-    args = get_args(x)
-    return (
-        bool(args)
-        and len(args) == 1
-        and type(args[0]) in _TYPEVARTUPLE_TYPES
-    )
-
-
-# Python 3.11+ _collect_type_vars was renamed to _collect_parameters
-if hasattr(typing, '_collect_type_vars'):
-    def _collect_type_vars(types, typevar_types=None):
-        """Collect all type variable contained in types in order of
-        first appearance (lexicographic order). For example::
-
-            _collect_type_vars((T, List[S, T])) == (T, S)
-        """
-        if typevar_types is None:
-            typevar_types = typing.TypeVar
-        tvars = []
-
-        # A required TypeVarLike cannot appear after a TypeVarLike with a default
-        # if it was a direct call to `Generic[]` or `Protocol[]`
-        enforce_default_ordering = _has_generic_or_protocol_as_origin()
-        default_encountered = False
-
-        # Also, a TypeVarLike with a default cannot appear after a TypeVarTuple
-        type_var_tuple_encountered = False
-
-        for t in types:
-            if _is_unpacked_typevartuple(t):
-                type_var_tuple_encountered = True
-            elif isinstance(t, typevar_types) and t not in tvars:
-                if enforce_default_ordering:
-                    has_default = getattr(t, '__default__', NoDefault) is not NoDefault
-                    if has_default:
-                        if type_var_tuple_encountered:
-                            raise TypeError('Type parameter with a default'
-                                            ' follows TypeVarTuple')
-                        default_encountered = True
-                    elif default_encountered:
-                        raise TypeError(f'Type parameter {t!r} without a default'
-                                        ' follows type parameter with a default')
-
-                tvars.append(t)
-            if _should_collect_from_parameters(t):
-                tvars.extend([t for t in t.__parameters__ if t not in tvars])
-        return tuple(tvars)
-
-    typing._collect_type_vars = _collect_type_vars
-else:
-    def _collect_parameters(args):
-        """Collect all type variables and parameter specifications in args
-        in order of first appearance (lexicographic order).
-
-        For example::
-
-            assert _collect_parameters((T, Callable[P, T])) == (T, P)
-        """
-        parameters = []
-
-        # A required TypeVarLike cannot appear after a TypeVarLike with default
-        # if it was a direct call to `Generic[]` or `Protocol[]`
-        enforce_default_ordering = _has_generic_or_protocol_as_origin()
-        default_encountered = False
-
-        # Also, a TypeVarLike with a default cannot appear after a TypeVarTuple
-        type_var_tuple_encountered = False
-
-        for t in args:
-            if isinstance(t, type):
-                # We don't want __parameters__ descriptor of a bare Python class.
-                pass
-            elif isinstance(t, tuple):
-                # `t` might be a tuple, when `ParamSpec` is substituted with
-                # `[T, int]`, or `[int, *Ts]`, etc.
-                for x in t:
-                    for collected in _collect_parameters([x]):
-                        if collected not in parameters:
-                            parameters.append(collected)
-            elif hasattr(t, '__typing_subst__'):
-                if t not in parameters:
-                    if enforce_default_ordering:
-                        has_default = (
-                            getattr(t, '__default__', NoDefault) is not NoDefault
-                        )
-
-                        if type_var_tuple_encountered and has_default:
-                            raise TypeError('Type parameter with a default'
-                                            ' follows TypeVarTuple')
-
-                        if has_default:
-                            default_encountered = True
-                        elif default_encountered:
-                            raise TypeError(f'Type parameter {t!r} without a default'
-                                            ' follows type parameter with a default')
-
-                    parameters.append(t)
-            else:
-                if _is_unpacked_typevartuple(t):
-                    type_var_tuple_encountered = True
-                for x in getattr(t, '__parameters__', ()):
-                    if x not in parameters:
-                        parameters.append(x)
-
-        return tuple(parameters)
-
-    if not _PEP_696_IMPLEMENTED:
-        typing._collect_parameters = _collect_parameters
-
-# Backport typing.NamedTuple as it exists in Python 3.13.
-# In 3.11, the ability to define generic `NamedTuple`s was supported.
-# This was explicitly disallowed in 3.9-3.10, and only half-worked in <=3.8.
-# On 3.12, we added __orig_bases__ to call-based NamedTuples
-# On 3.13, we deprecated kwargs-based NamedTuples
-if sys.version_info >= (3, 13):
-    NamedTuple = typing.NamedTuple
-else:
-    def _make_nmtuple(name, types, module, defaults=()):
-        fields = [n for n, t in types]
-        annotations = {n: typing._type_check(t, f"field {n} annotation must be a type")
-                       for n, t in types}
-        nm_tpl = collections.namedtuple(name, fields,
-                                        defaults=defaults, module=module)
-        nm_tpl.__annotations__ = nm_tpl.__new__.__annotations__ = annotations
-        # The `_field_types` attribute was removed in 3.9;
-        # in earlier versions, it is the same as the `__annotations__` attribute
-        if sys.version_info < (3, 9):
-            nm_tpl._field_types = annotations
-        return nm_tpl
-
-    _prohibited_namedtuple_fields = typing._prohibited
-    _special_namedtuple_fields = frozenset({'__module__', '__name__', '__annotations__'})
-
-    class _NamedTupleMeta(type):
-        def __new__(cls, typename, bases, ns):
-            assert _NamedTuple in bases
-            for base in bases:
-                if base is not _NamedTuple and base is not typing.Generic:
-                    raise TypeError(
-                        'can only inherit from a NamedTuple type and Generic')
-            bases = tuple(tuple if base is _NamedTuple else base for base in bases)
-            if "__annotations__" in ns:
-                types = ns["__annotations__"]
-            elif "__annotate__" in ns:
-                # TODO: Use inspect.VALUE here, and make the annotations lazily evaluated
-                types = ns["__annotate__"](1)
-            else:
-                types = {}
-            default_names = []
-            for field_name in types:
-                if field_name in ns:
-                    default_names.append(field_name)
-                elif default_names:
-                    raise TypeError(f"Non-default namedtuple field {field_name} "
-                                    f"cannot follow default field"
-                                    f"{'s' if len(default_names) > 1 else ''} "
-                                    f"{', '.join(default_names)}")
-            nm_tpl = _make_nmtuple(
-                typename, types.items(),
-                defaults=[ns[n] for n in default_names],
-                module=ns['__module__']
-            )
-            nm_tpl.__bases__ = bases
-            if typing.Generic in bases:
-                if hasattr(typing, '_generic_class_getitem'):  # 3.12+
-                    nm_tpl.__class_getitem__ = classmethod(typing._generic_class_getitem)
-                else:
-                    class_getitem = typing.Generic.__class_getitem__.__func__
-                    nm_tpl.__class_getitem__ = classmethod(class_getitem)
-            # update from user namespace without overriding special namedtuple attributes
-            for key, val in ns.items():
-                if key in _prohibited_namedtuple_fields:
-                    raise AttributeError("Cannot overwrite NamedTuple attribute " + key)
-                elif key not in _special_namedtuple_fields:
-                    if key not in nm_tpl._fields:
-                        setattr(nm_tpl, key, ns[key])
-                    try:
-                        set_name = type(val).__set_name__
-                    except AttributeError:
-                        pass
-                    else:
-                        try:
-                            set_name(val, nm_tpl, key)
-                        except BaseException as e:
-                            msg = (
-                                f"Error calling __set_name__ on {type(val).__name__!r} "
-                                f"instance {key!r} in {typename!r}"
-                            )
-                            # BaseException.add_note() existed on py311,
-                            # but the __set_name__ machinery didn't start
-                            # using add_note() until py312.
-                            # Making sure exceptions are raised in the same way
-                            # as in "normal" classes seems most important here.
-                            if sys.version_info >= (3, 12):
-                                e.add_note(msg)
-                                raise
-                            else:
-                                raise RuntimeError(msg) from e
-
-            if typing.Generic in bases:
-                nm_tpl.__init_subclass__()
-            return nm_tpl
-
-    _NamedTuple = type.__new__(_NamedTupleMeta, 'NamedTuple', (), {})
-
-    def _namedtuple_mro_entries(bases):
-        assert NamedTuple in bases
-        return (_NamedTuple,)
-
-    @_ensure_subclassable(_namedtuple_mro_entries)
-    def NamedTuple(typename, fields=_marker, /, **kwargs):
-        """Typed version of namedtuple.
-
-        Usage::
-
-            class Employee(NamedTuple):
-                name: str
-                id: int
-
-        This is equivalent to::
-
-            Employee = collections.namedtuple('Employee', ['name', 'id'])
-
-        The resulting class has an extra __annotations__ attribute, giving a
-        dict that maps field names to types.  (The field names are also in
-        the _fields attribute, which is part of the namedtuple API.)
-        An alternative equivalent functional syntax is also accepted::
-
-            Employee = NamedTuple('Employee', [('name', str), ('id', int)])
-        """
-        if fields is _marker:
-            if kwargs:
-                deprecated_thing = "Creating NamedTuple classes using keyword arguments"
-                deprecation_msg = (
-                    "{name} is deprecated and will be disallowed in Python {remove}. "
-                    "Use the class-based or functional syntax instead."
-                )
-            else:
-                deprecated_thing = "Failing to pass a value for the 'fields' parameter"
-                example = f"`{typename} = NamedTuple({typename!r}, [])`"
-                deprecation_msg = (
-                    "{name} is deprecated and will be disallowed in Python {remove}. "
-                    "To create a NamedTuple class with 0 fields "
-                    "using the functional syntax, "
-                    "pass an empty list, e.g. "
-                ) + example + "."
-        elif fields is None:
-            if kwargs:
-                raise TypeError(
-                    "Cannot pass `None` as the 'fields' parameter "
-                    "and also specify fields using keyword arguments"
-                )
-            else:
-                deprecated_thing = "Passing `None` as the 'fields' parameter"
-                example = f"`{typename} = NamedTuple({typename!r}, [])`"
-                deprecation_msg = (
-                    "{name} is deprecated and will be disallowed in Python {remove}. "
-                    "To create a NamedTuple class with 0 fields "
-                    "using the functional syntax, "
-                    "pass an empty list, e.g. "
-                ) + example + "."
-        elif kwargs:
-            raise TypeError("Either list of fields or keywords"
-                            " can be provided to NamedTuple, not both")
-        if fields is _marker or fields is None:
-            warnings.warn(
-                deprecation_msg.format(name=deprecated_thing, remove="3.15"),
-                DeprecationWarning,
-                stacklevel=2,
-            )
-            fields = kwargs.items()
-        nt = _make_nmtuple(typename, fields, module=_caller())
-        nt.__orig_bases__ = (NamedTuple,)
-        return nt
-
-
-if hasattr(collections.abc, "Buffer"):
-    Buffer = collections.abc.Buffer
-else:
-    class Buffer(abc.ABC):  # noqa: B024
-        """Base class for classes that implement the buffer protocol.
-
-        The buffer protocol allows Python objects to expose a low-level
-        memory buffer interface. Before Python 3.12, it is not possible
-        to implement the buffer protocol in pure Python code, or even
-        to check whether a class implements the buffer protocol. In
-        Python 3.12 and higher, the ``__buffer__`` method allows access
-        to the buffer protocol from Python code, and the
-        ``collections.abc.Buffer`` ABC allows checking whether a class
-        implements the buffer protocol.
-
-        To indicate support for the buffer protocol in earlier versions,
-        inherit from this ABC, either in a stub file or at runtime,
-        or use ABC registration. This ABC provides no methods, because
-        there is no Python-accessible methods shared by pre-3.12 buffer
-        classes. It is useful primarily for static checks.
-
-        """
-
-    # As a courtesy, register the most common stdlib buffer classes.
-    Buffer.register(memoryview)
-    Buffer.register(bytearray)
-    Buffer.register(bytes)
-
-
-# Backport of types.get_original_bases, available on 3.12+ in CPython
-if hasattr(_types, "get_original_bases"):
-    get_original_bases = _types.get_original_bases
-else:
-    def get_original_bases(cls, /):
-        """Return the class's "original" bases prior to modification by `__mro_entries__`.
-
-        Examples::
-
-            from typing import TypeVar, Generic
-            from typing_extensions import NamedTuple, TypedDict
-
-            T = TypeVar("T")
-            class Foo(Generic[T]): ...
-            class Bar(Foo[int], float): ...
-            class Baz(list[str]): ...
-            Eggs = NamedTuple("Eggs", [("a", int), ("b", str)])
-            Spam = TypedDict("Spam", {"a": int, "b": str})
-
-            assert get_original_bases(Bar) == (Foo[int], float)
-            assert get_original_bases(Baz) == (list[str],)
-            assert get_original_bases(Eggs) == (NamedTuple,)
-            assert get_original_bases(Spam) == (TypedDict,)
-            assert get_original_bases(int) == (object,)
-        """
-        try:
-            return cls.__dict__.get("__orig_bases__", cls.__bases__)
-        except AttributeError:
-            raise TypeError(
-                f'Expected an instance of type, not {type(cls).__name__!r}'
-            ) from None
-
-
-# NewType is a class on Python 3.10+, making it pickleable
-# The error message for subclassing instances of NewType was improved on 3.11+
-if sys.version_info >= (3, 11):
-    NewType = typing.NewType
-else:
-    class NewType:
-        """NewType creates simple unique types with almost zero
-        runtime overhead. NewType(name, tp) is considered a subtype of tp
-        by static type checkers. At runtime, NewType(name, tp) returns
-        a dummy callable that simply returns its argument. Usage::
-            UserId = NewType('UserId', int)
-            def name_by_id(user_id: UserId) -> str:
-                ...
-            UserId('user')          # Fails type check
-            name_by_id(42)          # Fails type check
-            name_by_id(UserId(42))  # OK
-            num = UserId(5) + 1     # type: int
-        """
-
-        def __call__(self, obj, /):
-            return obj
-
-        def __init__(self, name, tp):
-            self.__qualname__ = name
-            if '.' in name:
-                name = name.rpartition('.')[-1]
-            self.__name__ = name
-            self.__supertype__ = tp
-            def_mod = _caller()
-            if def_mod != 'typing_extensions':
-                self.__module__ = def_mod
-
-        def __mro_entries__(self, bases):
-            # We defined __mro_entries__ to get a better error message
-            # if a user attempts to subclass a NewType instance. bpo-46170
-            supercls_name = self.__name__
-
-            class Dummy:
-                def __init_subclass__(cls):
-                    subcls_name = cls.__name__
-                    raise TypeError(
-                        f"Cannot subclass an instance of NewType. "
-                        f"Perhaps you were looking for: "
-                        f"`{subcls_name} = NewType({subcls_name!r}, {supercls_name})`"
-                    )
-
-            return (Dummy,)
-
-        def __repr__(self):
-            return f'{self.__module__}.{self.__qualname__}'
-
-        def __reduce__(self):
-            return self.__qualname__
-
-        if sys.version_info >= (3, 10):
-            # PEP 604 methods
-            # It doesn't make sense to have these methods on Python <3.10
-
-            def __or__(self, other):
-                return typing.Union[self, other]
-
-            def __ror__(self, other):
-                return typing.Union[other, self]
-
-
-if hasattr(typing, "TypeAliasType"):
-    TypeAliasType = typing.TypeAliasType
-else:
-    def _is_unionable(obj):
-        """Corresponds to is_unionable() in unionobject.c in CPython."""
-        return obj is None or isinstance(obj, (
-            type,
-            _types.GenericAlias,
-            _types.UnionType,
-            TypeAliasType,
-        ))
-
-    class TypeAliasType:
-        """Create named, parameterized type aliases.
-
-        This provides a backport of the new `type` statement in Python 3.12:
-
-            type ListOrSet[T] = list[T] | set[T]
-
-        is equivalent to:
-
-            T = TypeVar("T")
-            ListOrSet = TypeAliasType("ListOrSet", list[T] | set[T], type_params=(T,))
-
-        The name ListOrSet can then be used as an alias for the type it refers to.
-
-        The type_params argument should contain all the type parameters used
-        in the value of the type alias. If the alias is not generic, this
-        argument is omitted.
-
-        Static type checkers should only support type aliases declared using
-        TypeAliasType that follow these rules:
-
-        - The first argument (the name) must be a string literal.
-        - The TypeAliasType instance must be immediately assigned to a variable
-          of the same name. (For example, 'X = TypeAliasType("Y", int)' is invalid,
-          as is 'X, Y = TypeAliasType("X", int), TypeAliasType("Y", int)').
-
-        """
-
-        def __init__(self, name: str, value, *, type_params=()):
-            if not isinstance(name, str):
-                raise TypeError("TypeAliasType name must be a string")
-            self.__value__ = value
-            self.__type_params__ = type_params
-
-            parameters = []
-            for type_param in type_params:
-                if isinstance(type_param, TypeVarTuple):
-                    parameters.extend(type_param)
-                else:
-                    parameters.append(type_param)
-            self.__parameters__ = tuple(parameters)
-            def_mod = _caller()
-            if def_mod != 'typing_extensions':
-                self.__module__ = def_mod
-            # Setting this attribute closes the TypeAliasType from further modification
-            self.__name__ = name
-
-        def __setattr__(self, name: str, value: object, /) -> None:
-            if hasattr(self, "__name__"):
-                self._raise_attribute_error(name)
-            super().__setattr__(name, value)
-
-        def __delattr__(self, name: str, /) -> Never:
-            self._raise_attribute_error(name)
-
-        def _raise_attribute_error(self, name: str) -> Never:
-            # Match the Python 3.12 error messages exactly
-            if name == "__name__":
-                raise AttributeError("readonly attribute")
-            elif name in {"__value__", "__type_params__", "__parameters__", "__module__"}:
-                raise AttributeError(
-                    f"attribute '{name}' of 'typing.TypeAliasType' objects "
-                    "is not writable"
-                )
-            else:
-                raise AttributeError(
-                    f"'typing.TypeAliasType' object has no attribute '{name}'"
-                )
-
-        def __repr__(self) -> str:
-            return self.__name__
-
-        def __getitem__(self, parameters):
-            if not isinstance(parameters, tuple):
-                parameters = (parameters,)
-            parameters = [
-                typing._type_check(
-                    item, f'Subscripting {self.__name__} requires a type.'
-                )
-                for item in parameters
-            ]
-            return typing._GenericAlias(self, tuple(parameters))
-
-        def __reduce__(self):
-            return self.__name__
-
-        def __init_subclass__(cls, *args, **kwargs):
-            raise TypeError(
-                "type 'typing_extensions.TypeAliasType' is not an acceptable base type"
-            )
-
-        # The presence of this method convinces typing._type_check
-        # that TypeAliasTypes are types.
-        def __call__(self):
-            raise TypeError("Type alias is not callable")
-
-        if sys.version_info >= (3, 10):
-            def __or__(self, right):
-                # For forward compatibility with 3.12, reject Unions
-                # that are not accepted by the built-in Union.
-                if not _is_unionable(right):
-                    return NotImplemented
-                return typing.Union[self, right]
-
-            def __ror__(self, left):
-                if not _is_unionable(left):
-                    return NotImplemented
-                return typing.Union[left, self]
-
-
-if hasattr(typing, "is_protocol"):
-    is_protocol = typing.is_protocol
-    get_protocol_members = typing.get_protocol_members
-else:
-    def is_protocol(tp: type, /) -> bool:
-        """Return True if the given type is a Protocol.
-
-        Example::
-
-            >>> from typing_extensions import Protocol, is_protocol
-            >>> class P(Protocol):
-            ...     def a(self) -> str: ...
-            ...     b: int
-            >>> is_protocol(P)
-            True
-            >>> is_protocol(int)
-            False
-        """
-        return (
-            isinstance(tp, type)
-            and getattr(tp, '_is_protocol', False)
-            and tp is not Protocol
-            and tp is not typing.Protocol
-        )
-
-    def get_protocol_members(tp: type, /) -> typing.FrozenSet[str]:
-        """Return the set of members defined in a Protocol.
-
-        Example::
-
-            >>> from typing_extensions import Protocol, get_protocol_members
-            >>> class P(Protocol):
-            ...     def a(self) -> str: ...
-            ...     b: int
-            >>> get_protocol_members(P)
-            frozenset({'a', 'b'})
-
-        Raise a TypeError for arguments that are not Protocols.
-        """
-        if not is_protocol(tp):
-            raise TypeError(f'{tp!r} is not a Protocol')
-        if hasattr(tp, '__protocol_attrs__'):
-            return frozenset(tp.__protocol_attrs__)
-        return frozenset(_get_protocol_attrs(tp))
-
-
-if hasattr(typing, "Doc"):
-    Doc = typing.Doc
-else:
-    class Doc:
-        """Define the documentation of a type annotation using ``Annotated``, to be
-         used in class attributes, function and method parameters, return values,
-         and variables.
-
-        The value should be a positional-only string literal to allow static tools
-        like editors and documentation generators to use it.
-
-        This complements docstrings.
-
-        The string value passed is available in the attribute ``documentation``.
-
-        Example::
-
-            >>> from typing_extensions import Annotated, Doc
-            >>> def hi(to: Annotated[str, Doc("Who to say hi to")]) -> None: ...
-        """
-        def __init__(self, documentation: str, /) -> None:
-            self.documentation = documentation
-
-        def __repr__(self) -> str:
-            return f"Doc({self.documentation!r})"
-
-        def __hash__(self) -> int:
-            return hash(self.documentation)
-
-        def __eq__(self, other: object) -> bool:
-            if not isinstance(other, Doc):
-                return NotImplemented
-            return self.documentation == other.documentation
-
-
-_CapsuleType = getattr(_types, "CapsuleType", None)
-
-if _CapsuleType is None:
-    try:
-        import _socket
-    except ImportError:
-        pass
-    else:
-        _CAPI = getattr(_socket, "CAPI", None)
-        if _CAPI is not None:
-            _CapsuleType = type(_CAPI)
-
-if _CapsuleType is not None:
-    CapsuleType = _CapsuleType
-    __all__.append("CapsuleType")
-
-
-# Aliases for items that have always been in typing.
-# Explicitly assign these (rather than using `from typing import *` at the top),
-# so that we get a CI error if one of these is deleted from typing.py
-# in a future version of Python
-AbstractSet = typing.AbstractSet
-AnyStr = typing.AnyStr
-BinaryIO = typing.BinaryIO
-Callable = typing.Callable
-Collection = typing.Collection
-Container = typing.Container
-Dict = typing.Dict
-ForwardRef = typing.ForwardRef
-FrozenSet = typing.FrozenSet
-Generic = typing.Generic
-Hashable = typing.Hashable
-IO = typing.IO
-ItemsView = typing.ItemsView
-Iterable = typing.Iterable
-Iterator = typing.Iterator
-KeysView = typing.KeysView
-List = typing.List
-Mapping = typing.Mapping
-MappingView = typing.MappingView
-Match = typing.Match
-MutableMapping = typing.MutableMapping
-MutableSequence = typing.MutableSequence
-MutableSet = typing.MutableSet
-Optional = typing.Optional
-Pattern = typing.Pattern
-Reversible = typing.Reversible
-Sequence = typing.Sequence
-Set = typing.Set
-Sized = typing.Sized
-TextIO = typing.TextIO
-Tuple = typing.Tuple
-Union = typing.Union
-ValuesView = typing.ValuesView
-cast = typing.cast
-no_type_check = typing.no_type_check
-no_type_check_decorator = typing.no_type_check_decorator
diff --git a/lib/tzdata/__init__.py b/lib/tzdata/__init__.py
deleted file mode 100644
index e558a8a5..00000000
--- a/lib/tzdata/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# IANA versions like 2020a are not valid PEP 440 identifiers; the recommended
-# way to translate the version is to use YYYY.n where `n` is a 0-based index.
-__version__ = "2024.2"
-
-# This exposes the original IANA version number.
-IANA_VERSION = "2024b"
diff --git a/lib/tzdata/zoneinfo/Africa/Abidjan b/lib/tzdata/zoneinfo/Africa/Abidjan
deleted file mode 100644
index 8906e88c..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Abidjan and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Accra b/lib/tzdata/zoneinfo/Africa/Accra
deleted file mode 100644
index 8906e88c..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Accra and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Addis_Ababa b/lib/tzdata/zoneinfo/Africa/Addis_Ababa
deleted file mode 100644
index 5f4ebcb7..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Addis_Ababa and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Algiers b/lib/tzdata/zoneinfo/Africa/Algiers
deleted file mode 100644
index 56a4dd2a..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Algiers and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Asmara b/lib/tzdata/zoneinfo/Africa/Asmara
deleted file mode 100644
index 5f4ebcb7..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Asmara and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Asmera b/lib/tzdata/zoneinfo/Africa/Asmera
deleted file mode 100644
index 5f4ebcb7..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Asmera and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Bamako b/lib/tzdata/zoneinfo/Africa/Bamako
deleted file mode 100644
index 8906e88c..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Bamako and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Bangui b/lib/tzdata/zoneinfo/Africa/Bangui
deleted file mode 100644
index 3d7a71ba..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Bangui and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Banjul b/lib/tzdata/zoneinfo/Africa/Banjul
deleted file mode 100644
index 8906e88c..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Banjul and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Bissau b/lib/tzdata/zoneinfo/Africa/Bissau
deleted file mode 100644
index 0da1d1e2..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Bissau and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Blantyre b/lib/tzdata/zoneinfo/Africa/Blantyre
deleted file mode 100644
index 581bb0e0..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Blantyre and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Brazzaville b/lib/tzdata/zoneinfo/Africa/Brazzaville
deleted file mode 100644
index 3d7a71ba..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Brazzaville and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Bujumbura b/lib/tzdata/zoneinfo/Africa/Bujumbura
deleted file mode 100644
index 581bb0e0..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Bujumbura and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Cairo b/lib/tzdata/zoneinfo/Africa/Cairo
deleted file mode 100644
index 1e6d48d1..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Cairo and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Casablanca b/lib/tzdata/zoneinfo/Africa/Casablanca
deleted file mode 100644
index 240ebb2b..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Casablanca and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Ceuta b/lib/tzdata/zoneinfo/Africa/Ceuta
deleted file mode 100644
index a461dcea..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Ceuta and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Conakry b/lib/tzdata/zoneinfo/Africa/Conakry
deleted file mode 100644
index 8906e88c..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Conakry and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Dakar b/lib/tzdata/zoneinfo/Africa/Dakar
deleted file mode 100644
index 8906e88c..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Dakar and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Dar_es_Salaam b/lib/tzdata/zoneinfo/Africa/Dar_es_Salaam
deleted file mode 100644
index 5f4ebcb7..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Dar_es_Salaam and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Djibouti b/lib/tzdata/zoneinfo/Africa/Djibouti
deleted file mode 100644
index 5f4ebcb7..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Djibouti and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Douala b/lib/tzdata/zoneinfo/Africa/Douala
deleted file mode 100644
index 3d7a71ba..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Douala and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/El_Aaiun b/lib/tzdata/zoneinfo/Africa/El_Aaiun
deleted file mode 100644
index 909c5f96..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/El_Aaiun and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Freetown b/lib/tzdata/zoneinfo/Africa/Freetown
deleted file mode 100644
index 8906e88c..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Freetown and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Gaborone b/lib/tzdata/zoneinfo/Africa/Gaborone
deleted file mode 100644
index 581bb0e0..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Gaborone and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Harare b/lib/tzdata/zoneinfo/Africa/Harare
deleted file mode 100644
index 581bb0e0..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Harare and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Johannesburg b/lib/tzdata/zoneinfo/Africa/Johannesburg
deleted file mode 100644
index bada0638..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Johannesburg and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Juba b/lib/tzdata/zoneinfo/Africa/Juba
deleted file mode 100644
index 0aba9ffd..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Juba and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Kampala b/lib/tzdata/zoneinfo/Africa/Kampala
deleted file mode 100644
index 5f4ebcb7..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Kampala and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Khartoum b/lib/tzdata/zoneinfo/Africa/Khartoum
deleted file mode 100644
index 3f8e44b8..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Khartoum and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Kigali b/lib/tzdata/zoneinfo/Africa/Kigali
deleted file mode 100644
index 581bb0e0..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Kigali and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Kinshasa b/lib/tzdata/zoneinfo/Africa/Kinshasa
deleted file mode 100644
index 3d7a71ba..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Kinshasa and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Lagos b/lib/tzdata/zoneinfo/Africa/Lagos
deleted file mode 100644
index 3d7a71ba..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Lagos and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Libreville b/lib/tzdata/zoneinfo/Africa/Libreville
deleted file mode 100644
index 3d7a71ba..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Libreville and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Lome b/lib/tzdata/zoneinfo/Africa/Lome
deleted file mode 100644
index 8906e88c..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Lome and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Luanda b/lib/tzdata/zoneinfo/Africa/Luanda
deleted file mode 100644
index 3d7a71ba..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Luanda and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Lubumbashi b/lib/tzdata/zoneinfo/Africa/Lubumbashi
deleted file mode 100644
index 581bb0e0..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Lubumbashi and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Lusaka b/lib/tzdata/zoneinfo/Africa/Lusaka
deleted file mode 100644
index 581bb0e0..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Lusaka and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Malabo b/lib/tzdata/zoneinfo/Africa/Malabo
deleted file mode 100644
index 3d7a71ba..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Malabo and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Maputo b/lib/tzdata/zoneinfo/Africa/Maputo
deleted file mode 100644
index 581bb0e0..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Maputo and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Maseru b/lib/tzdata/zoneinfo/Africa/Maseru
deleted file mode 100644
index bada0638..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Maseru and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Mbabane b/lib/tzdata/zoneinfo/Africa/Mbabane
deleted file mode 100644
index bada0638..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Mbabane and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Mogadishu b/lib/tzdata/zoneinfo/Africa/Mogadishu
deleted file mode 100644
index 5f4ebcb7..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Mogadishu and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Monrovia b/lib/tzdata/zoneinfo/Africa/Monrovia
deleted file mode 100644
index 83778092..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Monrovia and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Nairobi b/lib/tzdata/zoneinfo/Africa/Nairobi
deleted file mode 100644
index 5f4ebcb7..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Nairobi and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Ndjamena b/lib/tzdata/zoneinfo/Africa/Ndjamena
deleted file mode 100644
index ecbc0966..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Ndjamena and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Niamey b/lib/tzdata/zoneinfo/Africa/Niamey
deleted file mode 100644
index 3d7a71ba..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Niamey and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Nouakchott b/lib/tzdata/zoneinfo/Africa/Nouakchott
deleted file mode 100644
index 8906e88c..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Nouakchott and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Ouagadougou b/lib/tzdata/zoneinfo/Africa/Ouagadougou
deleted file mode 100644
index 8906e88c..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Ouagadougou and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Porto-Novo b/lib/tzdata/zoneinfo/Africa/Porto-Novo
deleted file mode 100644
index 3d7a71ba..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Porto-Novo and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Sao_Tome b/lib/tzdata/zoneinfo/Africa/Sao_Tome
deleted file mode 100644
index 425ad3fd..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Sao_Tome and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Timbuktu b/lib/tzdata/zoneinfo/Africa/Timbuktu
deleted file mode 100644
index 8906e88c..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Timbuktu and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Tripoli b/lib/tzdata/zoneinfo/Africa/Tripoli
deleted file mode 100644
index e0c89971..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Tripoli and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Tunis b/lib/tzdata/zoneinfo/Africa/Tunis
deleted file mode 100644
index ca324cb4..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Tunis and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/Windhoek b/lib/tzdata/zoneinfo/Africa/Windhoek
deleted file mode 100644
index 0edc52b9..00000000
Binary files a/lib/tzdata/zoneinfo/Africa/Windhoek and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Africa/__init__.py b/lib/tzdata/zoneinfo/Africa/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/tzdata/zoneinfo/America/Adak b/lib/tzdata/zoneinfo/America/Adak
deleted file mode 100644
index b1497bda..00000000
Binary files a/lib/tzdata/zoneinfo/America/Adak and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Anchorage b/lib/tzdata/zoneinfo/America/Anchorage
deleted file mode 100644
index cdf0572b..00000000
Binary files a/lib/tzdata/zoneinfo/America/Anchorage and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Anguilla b/lib/tzdata/zoneinfo/America/Anguilla
deleted file mode 100644
index 47b4dc34..00000000
Binary files a/lib/tzdata/zoneinfo/America/Anguilla and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Antigua b/lib/tzdata/zoneinfo/America/Antigua
deleted file mode 100644
index 47b4dc34..00000000
Binary files a/lib/tzdata/zoneinfo/America/Antigua and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Araguaina b/lib/tzdata/zoneinfo/America/Araguaina
deleted file mode 100644
index f66c9f79..00000000
Binary files a/lib/tzdata/zoneinfo/America/Araguaina and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Argentina/Buenos_Aires b/lib/tzdata/zoneinfo/America/Argentina/Buenos_Aires
deleted file mode 100644
index d6f999b8..00000000
Binary files a/lib/tzdata/zoneinfo/America/Argentina/Buenos_Aires and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Argentina/Catamarca b/lib/tzdata/zoneinfo/America/Argentina/Catamarca
deleted file mode 100644
index 1dcc8d85..00000000
Binary files a/lib/tzdata/zoneinfo/America/Argentina/Catamarca and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Argentina/ComodRivadavia b/lib/tzdata/zoneinfo/America/Argentina/ComodRivadavia
deleted file mode 100644
index 1dcc8d85..00000000
Binary files a/lib/tzdata/zoneinfo/America/Argentina/ComodRivadavia and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Argentina/Cordoba b/lib/tzdata/zoneinfo/America/Argentina/Cordoba
deleted file mode 100644
index 35a52e53..00000000
Binary files a/lib/tzdata/zoneinfo/America/Argentina/Cordoba and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Argentina/Jujuy b/lib/tzdata/zoneinfo/America/Argentina/Jujuy
deleted file mode 100644
index b275f27c..00000000
Binary files a/lib/tzdata/zoneinfo/America/Argentina/Jujuy and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Argentina/La_Rioja b/lib/tzdata/zoneinfo/America/Argentina/La_Rioja
deleted file mode 100644
index 23fca122..00000000
Binary files a/lib/tzdata/zoneinfo/America/Argentina/La_Rioja and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Argentina/Mendoza b/lib/tzdata/zoneinfo/America/Argentina/Mendoza
deleted file mode 100644
index 691c5697..00000000
Binary files a/lib/tzdata/zoneinfo/America/Argentina/Mendoza and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Argentina/Rio_Gallegos b/lib/tzdata/zoneinfo/America/Argentina/Rio_Gallegos
deleted file mode 100644
index 991d1fae..00000000
Binary files a/lib/tzdata/zoneinfo/America/Argentina/Rio_Gallegos and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Argentina/Salta b/lib/tzdata/zoneinfo/America/Argentina/Salta
deleted file mode 100644
index 58863e04..00000000
Binary files a/lib/tzdata/zoneinfo/America/Argentina/Salta and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Argentina/San_Juan b/lib/tzdata/zoneinfo/America/Argentina/San_Juan
deleted file mode 100644
index 7eba33c1..00000000
Binary files a/lib/tzdata/zoneinfo/America/Argentina/San_Juan and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Argentina/San_Luis b/lib/tzdata/zoneinfo/America/Argentina/San_Luis
deleted file mode 100644
index 0a81cbdd..00000000
Binary files a/lib/tzdata/zoneinfo/America/Argentina/San_Luis and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Argentina/Tucuman b/lib/tzdata/zoneinfo/America/Argentina/Tucuman
deleted file mode 100644
index 10556d5d..00000000
Binary files a/lib/tzdata/zoneinfo/America/Argentina/Tucuman and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Argentina/Ushuaia b/lib/tzdata/zoneinfo/America/Argentina/Ushuaia
deleted file mode 100644
index e0317502..00000000
Binary files a/lib/tzdata/zoneinfo/America/Argentina/Ushuaia and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Argentina/__init__.py b/lib/tzdata/zoneinfo/America/Argentina/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/tzdata/zoneinfo/America/Aruba b/lib/tzdata/zoneinfo/America/Aruba
deleted file mode 100644
index 47b4dc34..00000000
Binary files a/lib/tzdata/zoneinfo/America/Aruba and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Asuncion b/lib/tzdata/zoneinfo/America/Asuncion
deleted file mode 100644
index 62250367..00000000
Binary files a/lib/tzdata/zoneinfo/America/Asuncion and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Atikokan b/lib/tzdata/zoneinfo/America/Atikokan
deleted file mode 100644
index 9154643f..00000000
Binary files a/lib/tzdata/zoneinfo/America/Atikokan and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Atka b/lib/tzdata/zoneinfo/America/Atka
deleted file mode 100644
index b1497bda..00000000
Binary files a/lib/tzdata/zoneinfo/America/Atka and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Bahia b/lib/tzdata/zoneinfo/America/Bahia
deleted file mode 100644
index 7969e307..00000000
Binary files a/lib/tzdata/zoneinfo/America/Bahia and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Bahia_Banderas b/lib/tzdata/zoneinfo/America/Bahia_Banderas
deleted file mode 100644
index 882400bd..00000000
Binary files a/lib/tzdata/zoneinfo/America/Bahia_Banderas and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Barbados b/lib/tzdata/zoneinfo/America/Barbados
deleted file mode 100644
index 720c9863..00000000
Binary files a/lib/tzdata/zoneinfo/America/Barbados and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Belem b/lib/tzdata/zoneinfo/America/Belem
deleted file mode 100644
index e0d7653c..00000000
Binary files a/lib/tzdata/zoneinfo/America/Belem and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Belize b/lib/tzdata/zoneinfo/America/Belize
deleted file mode 100644
index bfc19f4e..00000000
Binary files a/lib/tzdata/zoneinfo/America/Belize and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Blanc-Sablon b/lib/tzdata/zoneinfo/America/Blanc-Sablon
deleted file mode 100644
index 47b4dc34..00000000
Binary files a/lib/tzdata/zoneinfo/America/Blanc-Sablon and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Boa_Vista b/lib/tzdata/zoneinfo/America/Boa_Vista
deleted file mode 100644
index fca97207..00000000
Binary files a/lib/tzdata/zoneinfo/America/Boa_Vista and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Bogota b/lib/tzdata/zoneinfo/America/Bogota
deleted file mode 100644
index 85b90333..00000000
Binary files a/lib/tzdata/zoneinfo/America/Bogota and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Boise b/lib/tzdata/zoneinfo/America/Boise
deleted file mode 100644
index 72fec9e8..00000000
Binary files a/lib/tzdata/zoneinfo/America/Boise and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Buenos_Aires b/lib/tzdata/zoneinfo/America/Buenos_Aires
deleted file mode 100644
index d6f999b8..00000000
Binary files a/lib/tzdata/zoneinfo/America/Buenos_Aires and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Cambridge_Bay b/lib/tzdata/zoneinfo/America/Cambridge_Bay
deleted file mode 100644
index 1092f4b6..00000000
Binary files a/lib/tzdata/zoneinfo/America/Cambridge_Bay and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Campo_Grande b/lib/tzdata/zoneinfo/America/Campo_Grande
deleted file mode 100644
index 6855e4e9..00000000
Binary files a/lib/tzdata/zoneinfo/America/Campo_Grande and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Cancun b/lib/tzdata/zoneinfo/America/Cancun
deleted file mode 100644
index 3110cdfd..00000000
Binary files a/lib/tzdata/zoneinfo/America/Cancun and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Caracas b/lib/tzdata/zoneinfo/America/Caracas
deleted file mode 100644
index 8dbe6ff7..00000000
Binary files a/lib/tzdata/zoneinfo/America/Caracas and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Catamarca b/lib/tzdata/zoneinfo/America/Catamarca
deleted file mode 100644
index 1dcc8d85..00000000
Binary files a/lib/tzdata/zoneinfo/America/Catamarca and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Cayenne b/lib/tzdata/zoneinfo/America/Cayenne
deleted file mode 100644
index cd49f053..00000000
Binary files a/lib/tzdata/zoneinfo/America/Cayenne and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Cayman b/lib/tzdata/zoneinfo/America/Cayman
deleted file mode 100644
index 9154643f..00000000
Binary files a/lib/tzdata/zoneinfo/America/Cayman and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Chicago b/lib/tzdata/zoneinfo/America/Chicago
deleted file mode 100644
index b0168806..00000000
Binary files a/lib/tzdata/zoneinfo/America/Chicago and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Chihuahua b/lib/tzdata/zoneinfo/America/Chihuahua
deleted file mode 100644
index f65bb1c9..00000000
Binary files a/lib/tzdata/zoneinfo/America/Chihuahua and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Ciudad_Juarez b/lib/tzdata/zoneinfo/America/Ciudad_Juarez
deleted file mode 100644
index 5f865ea8..00000000
Binary files a/lib/tzdata/zoneinfo/America/Ciudad_Juarez and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Coral_Harbour b/lib/tzdata/zoneinfo/America/Coral_Harbour
deleted file mode 100644
index 9154643f..00000000
Binary files a/lib/tzdata/zoneinfo/America/Coral_Harbour and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Cordoba b/lib/tzdata/zoneinfo/America/Cordoba
deleted file mode 100644
index 35a52e53..00000000
Binary files a/lib/tzdata/zoneinfo/America/Cordoba and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Costa_Rica b/lib/tzdata/zoneinfo/America/Costa_Rica
deleted file mode 100644
index 08f0128e..00000000
Binary files a/lib/tzdata/zoneinfo/America/Costa_Rica and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Creston b/lib/tzdata/zoneinfo/America/Creston
deleted file mode 100644
index c2bd2f94..00000000
Binary files a/lib/tzdata/zoneinfo/America/Creston and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Cuiaba b/lib/tzdata/zoneinfo/America/Cuiaba
deleted file mode 100644
index c09a8755..00000000
Binary files a/lib/tzdata/zoneinfo/America/Cuiaba and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Curacao b/lib/tzdata/zoneinfo/America/Curacao
deleted file mode 100644
index 47b4dc34..00000000
Binary files a/lib/tzdata/zoneinfo/America/Curacao and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Danmarkshavn b/lib/tzdata/zoneinfo/America/Danmarkshavn
deleted file mode 100644
index 8718efcc..00000000
Binary files a/lib/tzdata/zoneinfo/America/Danmarkshavn and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Dawson b/lib/tzdata/zoneinfo/America/Dawson
deleted file mode 100644
index 07e4c5f4..00000000
Binary files a/lib/tzdata/zoneinfo/America/Dawson and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Dawson_Creek b/lib/tzdata/zoneinfo/America/Dawson_Creek
deleted file mode 100644
index 761d1d9a..00000000
Binary files a/lib/tzdata/zoneinfo/America/Dawson_Creek and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Denver b/lib/tzdata/zoneinfo/America/Denver
deleted file mode 100644
index 09e54e5c..00000000
Binary files a/lib/tzdata/zoneinfo/America/Denver and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Detroit b/lib/tzdata/zoneinfo/America/Detroit
deleted file mode 100644
index 6eb3ac46..00000000
Binary files a/lib/tzdata/zoneinfo/America/Detroit and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Dominica b/lib/tzdata/zoneinfo/America/Dominica
deleted file mode 100644
index 47b4dc34..00000000
Binary files a/lib/tzdata/zoneinfo/America/Dominica and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Edmonton b/lib/tzdata/zoneinfo/America/Edmonton
deleted file mode 100644
index 645ee945..00000000
Binary files a/lib/tzdata/zoneinfo/America/Edmonton and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Eirunepe b/lib/tzdata/zoneinfo/America/Eirunepe
deleted file mode 100644
index 7da4b98f..00000000
Binary files a/lib/tzdata/zoneinfo/America/Eirunepe and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/El_Salvador b/lib/tzdata/zoneinfo/America/El_Salvador
deleted file mode 100644
index 43484117..00000000
Binary files a/lib/tzdata/zoneinfo/America/El_Salvador and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Ensenada b/lib/tzdata/zoneinfo/America/Ensenada
deleted file mode 100644
index 18d0d14a..00000000
Binary files a/lib/tzdata/zoneinfo/America/Ensenada and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Fort_Nelson b/lib/tzdata/zoneinfo/America/Fort_Nelson
deleted file mode 100644
index 2a49c6c5..00000000
Binary files a/lib/tzdata/zoneinfo/America/Fort_Nelson and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Fort_Wayne b/lib/tzdata/zoneinfo/America/Fort_Wayne
deleted file mode 100644
index 6b08d15b..00000000
Binary files a/lib/tzdata/zoneinfo/America/Fort_Wayne and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Fortaleza b/lib/tzdata/zoneinfo/America/Fortaleza
deleted file mode 100644
index 092e40d7..00000000
Binary files a/lib/tzdata/zoneinfo/America/Fortaleza and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Glace_Bay b/lib/tzdata/zoneinfo/America/Glace_Bay
deleted file mode 100644
index f85eb341..00000000
Binary files a/lib/tzdata/zoneinfo/America/Glace_Bay and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Godthab b/lib/tzdata/zoneinfo/America/Godthab
deleted file mode 100644
index 310774ea..00000000
Binary files a/lib/tzdata/zoneinfo/America/Godthab and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Goose_Bay b/lib/tzdata/zoneinfo/America/Goose_Bay
deleted file mode 100644
index e2cc3eef..00000000
Binary files a/lib/tzdata/zoneinfo/America/Goose_Bay and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Grand_Turk b/lib/tzdata/zoneinfo/America/Grand_Turk
deleted file mode 100644
index 9d90e745..00000000
Binary files a/lib/tzdata/zoneinfo/America/Grand_Turk and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Grenada b/lib/tzdata/zoneinfo/America/Grenada
deleted file mode 100644
index 47b4dc34..00000000
Binary files a/lib/tzdata/zoneinfo/America/Grenada and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Guadeloupe b/lib/tzdata/zoneinfo/America/Guadeloupe
deleted file mode 100644
index 47b4dc34..00000000
Binary files a/lib/tzdata/zoneinfo/America/Guadeloupe and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Guatemala b/lib/tzdata/zoneinfo/America/Guatemala
deleted file mode 100644
index 8aa8e588..00000000
Binary files a/lib/tzdata/zoneinfo/America/Guatemala and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Guayaquil b/lib/tzdata/zoneinfo/America/Guayaquil
deleted file mode 100644
index 381ae6c4..00000000
Binary files a/lib/tzdata/zoneinfo/America/Guayaquil and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Guyana b/lib/tzdata/zoneinfo/America/Guyana
deleted file mode 100644
index bcc66881..00000000
Binary files a/lib/tzdata/zoneinfo/America/Guyana and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Halifax b/lib/tzdata/zoneinfo/America/Halifax
deleted file mode 100644
index 9fa850a7..00000000
Binary files a/lib/tzdata/zoneinfo/America/Halifax and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Havana b/lib/tzdata/zoneinfo/America/Havana
deleted file mode 100644
index e06629d3..00000000
Binary files a/lib/tzdata/zoneinfo/America/Havana and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Hermosillo b/lib/tzdata/zoneinfo/America/Hermosillo
deleted file mode 100644
index ba7b1476..00000000
Binary files a/lib/tzdata/zoneinfo/America/Hermosillo and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Indiana/Indianapolis b/lib/tzdata/zoneinfo/America/Indiana/Indianapolis
deleted file mode 100644
index 6b08d15b..00000000
Binary files a/lib/tzdata/zoneinfo/America/Indiana/Indianapolis and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Indiana/Knox b/lib/tzdata/zoneinfo/America/Indiana/Knox
deleted file mode 100644
index b187d5f8..00000000
Binary files a/lib/tzdata/zoneinfo/America/Indiana/Knox and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Indiana/Marengo b/lib/tzdata/zoneinfo/America/Indiana/Marengo
deleted file mode 100644
index a730fe66..00000000
Binary files a/lib/tzdata/zoneinfo/America/Indiana/Marengo and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Indiana/Petersburg b/lib/tzdata/zoneinfo/America/Indiana/Petersburg
deleted file mode 100644
index 341a0235..00000000
Binary files a/lib/tzdata/zoneinfo/America/Indiana/Petersburg and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Indiana/Tell_City b/lib/tzdata/zoneinfo/America/Indiana/Tell_City
deleted file mode 100644
index 76e1f628..00000000
Binary files a/lib/tzdata/zoneinfo/America/Indiana/Tell_City and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Indiana/Vevay b/lib/tzdata/zoneinfo/America/Indiana/Vevay
deleted file mode 100644
index f2acf6cb..00000000
Binary files a/lib/tzdata/zoneinfo/America/Indiana/Vevay and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Indiana/Vincennes b/lib/tzdata/zoneinfo/America/Indiana/Vincennes
deleted file mode 100644
index c255f89b..00000000
Binary files a/lib/tzdata/zoneinfo/America/Indiana/Vincennes and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Indiana/Winamac b/lib/tzdata/zoneinfo/America/Indiana/Winamac
deleted file mode 100644
index 679d321e..00000000
Binary files a/lib/tzdata/zoneinfo/America/Indiana/Winamac and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Indiana/__init__.py b/lib/tzdata/zoneinfo/America/Indiana/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/tzdata/zoneinfo/America/Indianapolis b/lib/tzdata/zoneinfo/America/Indianapolis
deleted file mode 100644
index 6b08d15b..00000000
Binary files a/lib/tzdata/zoneinfo/America/Indianapolis and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Inuvik b/lib/tzdata/zoneinfo/America/Inuvik
deleted file mode 100644
index 86639f6e..00000000
Binary files a/lib/tzdata/zoneinfo/America/Inuvik and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Iqaluit b/lib/tzdata/zoneinfo/America/Iqaluit
deleted file mode 100644
index 95e055cb..00000000
Binary files a/lib/tzdata/zoneinfo/America/Iqaluit and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Jamaica b/lib/tzdata/zoneinfo/America/Jamaica
deleted file mode 100644
index be6b1b6f..00000000
Binary files a/lib/tzdata/zoneinfo/America/Jamaica and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Jujuy b/lib/tzdata/zoneinfo/America/Jujuy
deleted file mode 100644
index b275f27c..00000000
Binary files a/lib/tzdata/zoneinfo/America/Jujuy and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Juneau b/lib/tzdata/zoneinfo/America/Juneau
deleted file mode 100644
index e347b369..00000000
Binary files a/lib/tzdata/zoneinfo/America/Juneau and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Kentucky/Louisville b/lib/tzdata/zoneinfo/America/Kentucky/Louisville
deleted file mode 100644
index f2136d6e..00000000
Binary files a/lib/tzdata/zoneinfo/America/Kentucky/Louisville and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Kentucky/Monticello b/lib/tzdata/zoneinfo/America/Kentucky/Monticello
deleted file mode 100644
index d9f54a18..00000000
Binary files a/lib/tzdata/zoneinfo/America/Kentucky/Monticello and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Kentucky/__init__.py b/lib/tzdata/zoneinfo/America/Kentucky/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/tzdata/zoneinfo/America/Knox_IN b/lib/tzdata/zoneinfo/America/Knox_IN
deleted file mode 100644
index b187d5f8..00000000
Binary files a/lib/tzdata/zoneinfo/America/Knox_IN and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Kralendijk b/lib/tzdata/zoneinfo/America/Kralendijk
deleted file mode 100644
index 47b4dc34..00000000
Binary files a/lib/tzdata/zoneinfo/America/Kralendijk and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/La_Paz b/lib/tzdata/zoneinfo/America/La_Paz
deleted file mode 100644
index 68ddaae7..00000000
Binary files a/lib/tzdata/zoneinfo/America/La_Paz and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Lima b/lib/tzdata/zoneinfo/America/Lima
deleted file mode 100644
index b643c551..00000000
Binary files a/lib/tzdata/zoneinfo/America/Lima and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Los_Angeles b/lib/tzdata/zoneinfo/America/Los_Angeles
deleted file mode 100644
index aaf07787..00000000
Binary files a/lib/tzdata/zoneinfo/America/Los_Angeles and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Louisville b/lib/tzdata/zoneinfo/America/Louisville
deleted file mode 100644
index f2136d6e..00000000
Binary files a/lib/tzdata/zoneinfo/America/Louisville and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Lower_Princes b/lib/tzdata/zoneinfo/America/Lower_Princes
deleted file mode 100644
index 47b4dc34..00000000
Binary files a/lib/tzdata/zoneinfo/America/Lower_Princes and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Maceio b/lib/tzdata/zoneinfo/America/Maceio
deleted file mode 100644
index dbb8d57d..00000000
Binary files a/lib/tzdata/zoneinfo/America/Maceio and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Managua b/lib/tzdata/zoneinfo/America/Managua
deleted file mode 100644
index 86ef76bf..00000000
Binary files a/lib/tzdata/zoneinfo/America/Managua and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Manaus b/lib/tzdata/zoneinfo/America/Manaus
deleted file mode 100644
index 59c952eb..00000000
Binary files a/lib/tzdata/zoneinfo/America/Manaus and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Marigot b/lib/tzdata/zoneinfo/America/Marigot
deleted file mode 100644
index 47b4dc34..00000000
Binary files a/lib/tzdata/zoneinfo/America/Marigot and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Martinique b/lib/tzdata/zoneinfo/America/Martinique
deleted file mode 100644
index 25c0232d..00000000
Binary files a/lib/tzdata/zoneinfo/America/Martinique and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Matamoros b/lib/tzdata/zoneinfo/America/Matamoros
deleted file mode 100644
index 993ac475..00000000
Binary files a/lib/tzdata/zoneinfo/America/Matamoros and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Mazatlan b/lib/tzdata/zoneinfo/America/Mazatlan
deleted file mode 100644
index 5aa6039e..00000000
Binary files a/lib/tzdata/zoneinfo/America/Mazatlan and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Mendoza b/lib/tzdata/zoneinfo/America/Mendoza
deleted file mode 100644
index 691c5697..00000000
Binary files a/lib/tzdata/zoneinfo/America/Mendoza and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Menominee b/lib/tzdata/zoneinfo/America/Menominee
deleted file mode 100644
index 28d2c56e..00000000
Binary files a/lib/tzdata/zoneinfo/America/Menominee and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Merida b/lib/tzdata/zoneinfo/America/Merida
deleted file mode 100644
index e5c7d8cc..00000000
Binary files a/lib/tzdata/zoneinfo/America/Merida and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Metlakatla b/lib/tzdata/zoneinfo/America/Metlakatla
deleted file mode 100644
index 71b0eab0..00000000
Binary files a/lib/tzdata/zoneinfo/America/Metlakatla and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Mexico_City b/lib/tzdata/zoneinfo/America/Mexico_City
deleted file mode 100644
index 18112346..00000000
Binary files a/lib/tzdata/zoneinfo/America/Mexico_City and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Miquelon b/lib/tzdata/zoneinfo/America/Miquelon
deleted file mode 100644
index ba95cb0b..00000000
Binary files a/lib/tzdata/zoneinfo/America/Miquelon and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Moncton b/lib/tzdata/zoneinfo/America/Moncton
deleted file mode 100644
index 020e33d9..00000000
Binary files a/lib/tzdata/zoneinfo/America/Moncton and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Monterrey b/lib/tzdata/zoneinfo/America/Monterrey
deleted file mode 100644
index c1e05464..00000000
Binary files a/lib/tzdata/zoneinfo/America/Monterrey and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Montevideo b/lib/tzdata/zoneinfo/America/Montevideo
deleted file mode 100644
index 4b2fb3e5..00000000
Binary files a/lib/tzdata/zoneinfo/America/Montevideo and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Montreal b/lib/tzdata/zoneinfo/America/Montreal
deleted file mode 100644
index 668e70d7..00000000
Binary files a/lib/tzdata/zoneinfo/America/Montreal and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Montserrat b/lib/tzdata/zoneinfo/America/Montserrat
deleted file mode 100644
index 47b4dc34..00000000
Binary files a/lib/tzdata/zoneinfo/America/Montserrat and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Nassau b/lib/tzdata/zoneinfo/America/Nassau
deleted file mode 100644
index 668e70d7..00000000
Binary files a/lib/tzdata/zoneinfo/America/Nassau and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/New_York b/lib/tzdata/zoneinfo/America/New_York
deleted file mode 100644
index 2b6c2eea..00000000
Binary files a/lib/tzdata/zoneinfo/America/New_York and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Nipigon b/lib/tzdata/zoneinfo/America/Nipigon
deleted file mode 100644
index 668e70d7..00000000
Binary files a/lib/tzdata/zoneinfo/America/Nipigon and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Nome b/lib/tzdata/zoneinfo/America/Nome
deleted file mode 100644
index 23ead1c0..00000000
Binary files a/lib/tzdata/zoneinfo/America/Nome and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Noronha b/lib/tzdata/zoneinfo/America/Noronha
deleted file mode 100644
index 9e74745c..00000000
Binary files a/lib/tzdata/zoneinfo/America/Noronha and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/North_Dakota/Beulah b/lib/tzdata/zoneinfo/America/North_Dakota/Beulah
deleted file mode 100644
index becf4383..00000000
Binary files a/lib/tzdata/zoneinfo/America/North_Dakota/Beulah and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/North_Dakota/Center b/lib/tzdata/zoneinfo/America/North_Dakota/Center
deleted file mode 100644
index d03bda04..00000000
Binary files a/lib/tzdata/zoneinfo/America/North_Dakota/Center and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/North_Dakota/New_Salem b/lib/tzdata/zoneinfo/America/North_Dakota/New_Salem
deleted file mode 100644
index ecefc15d..00000000
Binary files a/lib/tzdata/zoneinfo/America/North_Dakota/New_Salem and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/North_Dakota/__init__.py b/lib/tzdata/zoneinfo/America/North_Dakota/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/tzdata/zoneinfo/America/Nuuk b/lib/tzdata/zoneinfo/America/Nuuk
deleted file mode 100644
index 310774ea..00000000
Binary files a/lib/tzdata/zoneinfo/America/Nuuk and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Ojinaga b/lib/tzdata/zoneinfo/America/Ojinaga
deleted file mode 100644
index 1dd08b1c..00000000
Binary files a/lib/tzdata/zoneinfo/America/Ojinaga and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Panama b/lib/tzdata/zoneinfo/America/Panama
deleted file mode 100644
index 9154643f..00000000
Binary files a/lib/tzdata/zoneinfo/America/Panama and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Pangnirtung b/lib/tzdata/zoneinfo/America/Pangnirtung
deleted file mode 100644
index 95e055cb..00000000
Binary files a/lib/tzdata/zoneinfo/America/Pangnirtung and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Paramaribo b/lib/tzdata/zoneinfo/America/Paramaribo
deleted file mode 100644
index 24f925a2..00000000
Binary files a/lib/tzdata/zoneinfo/America/Paramaribo and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Phoenix b/lib/tzdata/zoneinfo/America/Phoenix
deleted file mode 100644
index c2bd2f94..00000000
Binary files a/lib/tzdata/zoneinfo/America/Phoenix and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Port-au-Prince b/lib/tzdata/zoneinfo/America/Port-au-Prince
deleted file mode 100644
index 3e75731b..00000000
Binary files a/lib/tzdata/zoneinfo/America/Port-au-Prince and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Port_of_Spain b/lib/tzdata/zoneinfo/America/Port_of_Spain
deleted file mode 100644
index 47b4dc34..00000000
Binary files a/lib/tzdata/zoneinfo/America/Port_of_Spain and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Porto_Acre b/lib/tzdata/zoneinfo/America/Porto_Acre
deleted file mode 100644
index fb5185ca..00000000
Binary files a/lib/tzdata/zoneinfo/America/Porto_Acre and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Porto_Velho b/lib/tzdata/zoneinfo/America/Porto_Velho
deleted file mode 100644
index 7f8047d9..00000000
Binary files a/lib/tzdata/zoneinfo/America/Porto_Velho and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Puerto_Rico b/lib/tzdata/zoneinfo/America/Puerto_Rico
deleted file mode 100644
index 47b4dc34..00000000
Binary files a/lib/tzdata/zoneinfo/America/Puerto_Rico and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Punta_Arenas b/lib/tzdata/zoneinfo/America/Punta_Arenas
deleted file mode 100644
index aa839ea7..00000000
Binary files a/lib/tzdata/zoneinfo/America/Punta_Arenas and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Rainy_River b/lib/tzdata/zoneinfo/America/Rainy_River
deleted file mode 100644
index 7e646d18..00000000
Binary files a/lib/tzdata/zoneinfo/America/Rainy_River and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Rankin_Inlet b/lib/tzdata/zoneinfo/America/Rankin_Inlet
deleted file mode 100644
index 6d1d90de..00000000
Binary files a/lib/tzdata/zoneinfo/America/Rankin_Inlet and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Recife b/lib/tzdata/zoneinfo/America/Recife
deleted file mode 100644
index 305abcb8..00000000
Binary files a/lib/tzdata/zoneinfo/America/Recife and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Regina b/lib/tzdata/zoneinfo/America/Regina
deleted file mode 100644
index a3f8217a..00000000
Binary files a/lib/tzdata/zoneinfo/America/Regina and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Resolute b/lib/tzdata/zoneinfo/America/Resolute
deleted file mode 100644
index 97eb8a9c..00000000
Binary files a/lib/tzdata/zoneinfo/America/Resolute and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Rio_Branco b/lib/tzdata/zoneinfo/America/Rio_Branco
deleted file mode 100644
index fb5185ca..00000000
Binary files a/lib/tzdata/zoneinfo/America/Rio_Branco and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Rosario b/lib/tzdata/zoneinfo/America/Rosario
deleted file mode 100644
index 35a52e53..00000000
Binary files a/lib/tzdata/zoneinfo/America/Rosario and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Santa_Isabel b/lib/tzdata/zoneinfo/America/Santa_Isabel
deleted file mode 100644
index 18d0d14a..00000000
Binary files a/lib/tzdata/zoneinfo/America/Santa_Isabel and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Santarem b/lib/tzdata/zoneinfo/America/Santarem
deleted file mode 100644
index f81d1442..00000000
Binary files a/lib/tzdata/zoneinfo/America/Santarem and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Santiago b/lib/tzdata/zoneinfo/America/Santiago
deleted file mode 100644
index d3fc9b83..00000000
Binary files a/lib/tzdata/zoneinfo/America/Santiago and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Santo_Domingo b/lib/tzdata/zoneinfo/America/Santo_Domingo
deleted file mode 100644
index 3e078508..00000000
Binary files a/lib/tzdata/zoneinfo/America/Santo_Domingo and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Sao_Paulo b/lib/tzdata/zoneinfo/America/Sao_Paulo
deleted file mode 100644
index a16da2c4..00000000
Binary files a/lib/tzdata/zoneinfo/America/Sao_Paulo and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Scoresbysund b/lib/tzdata/zoneinfo/America/Scoresbysund
deleted file mode 100644
index fc1b11cb..00000000
Binary files a/lib/tzdata/zoneinfo/America/Scoresbysund and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Shiprock b/lib/tzdata/zoneinfo/America/Shiprock
deleted file mode 100644
index 09e54e5c..00000000
Binary files a/lib/tzdata/zoneinfo/America/Shiprock and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Sitka b/lib/tzdata/zoneinfo/America/Sitka
deleted file mode 100644
index 36681ed7..00000000
Binary files a/lib/tzdata/zoneinfo/America/Sitka and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/St_Barthelemy b/lib/tzdata/zoneinfo/America/St_Barthelemy
deleted file mode 100644
index 47b4dc34..00000000
Binary files a/lib/tzdata/zoneinfo/America/St_Barthelemy and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/St_Johns b/lib/tzdata/zoneinfo/America/St_Johns
deleted file mode 100644
index 94d790ba..00000000
Binary files a/lib/tzdata/zoneinfo/America/St_Johns and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/St_Kitts b/lib/tzdata/zoneinfo/America/St_Kitts
deleted file mode 100644
index 47b4dc34..00000000
Binary files a/lib/tzdata/zoneinfo/America/St_Kitts and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/St_Lucia b/lib/tzdata/zoneinfo/America/St_Lucia
deleted file mode 100644
index 47b4dc34..00000000
Binary files a/lib/tzdata/zoneinfo/America/St_Lucia and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/St_Thomas b/lib/tzdata/zoneinfo/America/St_Thomas
deleted file mode 100644
index 47b4dc34..00000000
Binary files a/lib/tzdata/zoneinfo/America/St_Thomas and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/St_Vincent b/lib/tzdata/zoneinfo/America/St_Vincent
deleted file mode 100644
index 47b4dc34..00000000
Binary files a/lib/tzdata/zoneinfo/America/St_Vincent and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Swift_Current b/lib/tzdata/zoneinfo/America/Swift_Current
deleted file mode 100644
index bdbb4944..00000000
Binary files a/lib/tzdata/zoneinfo/America/Swift_Current and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Tegucigalpa b/lib/tzdata/zoneinfo/America/Tegucigalpa
deleted file mode 100644
index 38036a32..00000000
Binary files a/lib/tzdata/zoneinfo/America/Tegucigalpa and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Thule b/lib/tzdata/zoneinfo/America/Thule
deleted file mode 100644
index f38dc56b..00000000
Binary files a/lib/tzdata/zoneinfo/America/Thule and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Thunder_Bay b/lib/tzdata/zoneinfo/America/Thunder_Bay
deleted file mode 100644
index 668e70d7..00000000
Binary files a/lib/tzdata/zoneinfo/America/Thunder_Bay and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Tijuana b/lib/tzdata/zoneinfo/America/Tijuana
deleted file mode 100644
index 18d0d14a..00000000
Binary files a/lib/tzdata/zoneinfo/America/Tijuana and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Toronto b/lib/tzdata/zoneinfo/America/Toronto
deleted file mode 100644
index 668e70d7..00000000
Binary files a/lib/tzdata/zoneinfo/America/Toronto and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Tortola b/lib/tzdata/zoneinfo/America/Tortola
deleted file mode 100644
index 47b4dc34..00000000
Binary files a/lib/tzdata/zoneinfo/America/Tortola and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Vancouver b/lib/tzdata/zoneinfo/America/Vancouver
deleted file mode 100644
index c9984911..00000000
Binary files a/lib/tzdata/zoneinfo/America/Vancouver and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Virgin b/lib/tzdata/zoneinfo/America/Virgin
deleted file mode 100644
index 47b4dc34..00000000
Binary files a/lib/tzdata/zoneinfo/America/Virgin and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Whitehorse b/lib/tzdata/zoneinfo/America/Whitehorse
deleted file mode 100644
index 40baa9ab..00000000
Binary files a/lib/tzdata/zoneinfo/America/Whitehorse and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Winnipeg b/lib/tzdata/zoneinfo/America/Winnipeg
deleted file mode 100644
index 7e646d18..00000000
Binary files a/lib/tzdata/zoneinfo/America/Winnipeg and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Yakutat b/lib/tzdata/zoneinfo/America/Yakutat
deleted file mode 100644
index 773feba8..00000000
Binary files a/lib/tzdata/zoneinfo/America/Yakutat and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/Yellowknife b/lib/tzdata/zoneinfo/America/Yellowknife
deleted file mode 100644
index 645ee945..00000000
Binary files a/lib/tzdata/zoneinfo/America/Yellowknife and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/America/__init__.py b/lib/tzdata/zoneinfo/America/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/tzdata/zoneinfo/Antarctica/Casey b/lib/tzdata/zoneinfo/Antarctica/Casey
deleted file mode 100644
index 84f1c61e..00000000
Binary files a/lib/tzdata/zoneinfo/Antarctica/Casey and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Antarctica/Davis b/lib/tzdata/zoneinfo/Antarctica/Davis
deleted file mode 100644
index 3ec32224..00000000
Binary files a/lib/tzdata/zoneinfo/Antarctica/Davis and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Antarctica/DumontDUrville b/lib/tzdata/zoneinfo/Antarctica/DumontDUrville
deleted file mode 100644
index 5d8fc3a1..00000000
Binary files a/lib/tzdata/zoneinfo/Antarctica/DumontDUrville and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Antarctica/Macquarie b/lib/tzdata/zoneinfo/Antarctica/Macquarie
deleted file mode 100644
index 99a8e60e..00000000
Binary files a/lib/tzdata/zoneinfo/Antarctica/Macquarie and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Antarctica/Mawson b/lib/tzdata/zoneinfo/Antarctica/Mawson
deleted file mode 100644
index 05e4c6c5..00000000
Binary files a/lib/tzdata/zoneinfo/Antarctica/Mawson and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Antarctica/McMurdo b/lib/tzdata/zoneinfo/Antarctica/McMurdo
deleted file mode 100644
index afb39293..00000000
Binary files a/lib/tzdata/zoneinfo/Antarctica/McMurdo and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Antarctica/Palmer b/lib/tzdata/zoneinfo/Antarctica/Palmer
deleted file mode 100644
index 32c19416..00000000
Binary files a/lib/tzdata/zoneinfo/Antarctica/Palmer and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Antarctica/Rothera b/lib/tzdata/zoneinfo/Antarctica/Rothera
deleted file mode 100644
index ea49c00b..00000000
Binary files a/lib/tzdata/zoneinfo/Antarctica/Rothera and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Antarctica/South_Pole b/lib/tzdata/zoneinfo/Antarctica/South_Pole
deleted file mode 100644
index afb39293..00000000
Binary files a/lib/tzdata/zoneinfo/Antarctica/South_Pole and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Antarctica/Syowa b/lib/tzdata/zoneinfo/Antarctica/Syowa
deleted file mode 100644
index 01c47ccb..00000000
Binary files a/lib/tzdata/zoneinfo/Antarctica/Syowa and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Antarctica/Troll b/lib/tzdata/zoneinfo/Antarctica/Troll
deleted file mode 100644
index 2359c44b..00000000
Binary files a/lib/tzdata/zoneinfo/Antarctica/Troll and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Antarctica/Vostok b/lib/tzdata/zoneinfo/Antarctica/Vostok
deleted file mode 100644
index 4ce8f747..00000000
Binary files a/lib/tzdata/zoneinfo/Antarctica/Vostok and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Antarctica/__init__.py b/lib/tzdata/zoneinfo/Antarctica/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/tzdata/zoneinfo/Arctic/Longyearbyen b/lib/tzdata/zoneinfo/Arctic/Longyearbyen
deleted file mode 100644
index 465546bd..00000000
Binary files a/lib/tzdata/zoneinfo/Arctic/Longyearbyen and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Arctic/__init__.py b/lib/tzdata/zoneinfo/Arctic/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/tzdata/zoneinfo/Asia/Aden b/lib/tzdata/zoneinfo/Asia/Aden
deleted file mode 100644
index 01c47ccb..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Aden and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Almaty b/lib/tzdata/zoneinfo/Asia/Almaty
deleted file mode 100644
index 02f047d7..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Almaty and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Amman b/lib/tzdata/zoneinfo/Asia/Amman
deleted file mode 100644
index a3f9dff5..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Amman and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Anadyr b/lib/tzdata/zoneinfo/Asia/Anadyr
deleted file mode 100644
index 551884d3..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Anadyr and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Aqtau b/lib/tzdata/zoneinfo/Asia/Aqtau
deleted file mode 100644
index 3a40d117..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Aqtau and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Aqtobe b/lib/tzdata/zoneinfo/Asia/Aqtobe
deleted file mode 100644
index 62c5840a..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Aqtobe and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Ashgabat b/lib/tzdata/zoneinfo/Asia/Ashgabat
deleted file mode 100644
index 84821672..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Ashgabat and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Ashkhabad b/lib/tzdata/zoneinfo/Asia/Ashkhabad
deleted file mode 100644
index 84821672..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Ashkhabad and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Atyrau b/lib/tzdata/zoneinfo/Asia/Atyrau
deleted file mode 100644
index cb2c82f6..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Atyrau and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Baghdad b/lib/tzdata/zoneinfo/Asia/Baghdad
deleted file mode 100644
index a3ce9759..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Baghdad and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Bahrain b/lib/tzdata/zoneinfo/Asia/Bahrain
deleted file mode 100644
index 7409d749..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Bahrain and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Baku b/lib/tzdata/zoneinfo/Asia/Baku
deleted file mode 100644
index 96203d7a..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Baku and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Bangkok b/lib/tzdata/zoneinfo/Asia/Bangkok
deleted file mode 100644
index ed687d29..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Bangkok and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Barnaul b/lib/tzdata/zoneinfo/Asia/Barnaul
deleted file mode 100644
index ff976dd3..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Barnaul and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Beirut b/lib/tzdata/zoneinfo/Asia/Beirut
deleted file mode 100644
index 55dce572..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Beirut and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Bishkek b/lib/tzdata/zoneinfo/Asia/Bishkek
deleted file mode 100644
index fe7832cd..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Bishkek and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Brunei b/lib/tzdata/zoneinfo/Asia/Brunei
deleted file mode 100644
index 59bc6e40..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Brunei and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Calcutta b/lib/tzdata/zoneinfo/Asia/Calcutta
deleted file mode 100644
index 00bc80a6..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Calcutta and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Chita b/lib/tzdata/zoneinfo/Asia/Chita
deleted file mode 100644
index 9d49cd35..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Chita and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Choibalsan b/lib/tzdata/zoneinfo/Asia/Choibalsan
deleted file mode 100644
index 6f5d3a15..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Choibalsan and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Chongqing b/lib/tzdata/zoneinfo/Asia/Chongqing
deleted file mode 100644
index d6b66984..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Chongqing and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Chungking b/lib/tzdata/zoneinfo/Asia/Chungking
deleted file mode 100644
index d6b66984..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Chungking and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Colombo b/lib/tzdata/zoneinfo/Asia/Colombo
deleted file mode 100644
index 3eeb1b72..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Colombo and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Dacca b/lib/tzdata/zoneinfo/Asia/Dacca
deleted file mode 100644
index 28136808..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Dacca and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Damascus b/lib/tzdata/zoneinfo/Asia/Damascus
deleted file mode 100644
index bd1624de..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Damascus and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Dhaka b/lib/tzdata/zoneinfo/Asia/Dhaka
deleted file mode 100644
index 28136808..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Dhaka and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Dili b/lib/tzdata/zoneinfo/Asia/Dili
deleted file mode 100644
index 22e705ca..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Dili and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Dubai b/lib/tzdata/zoneinfo/Asia/Dubai
deleted file mode 100644
index 58d75bc2..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Dubai and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Dushanbe b/lib/tzdata/zoneinfo/Asia/Dushanbe
deleted file mode 100644
index d83fb076..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Dushanbe and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Famagusta b/lib/tzdata/zoneinfo/Asia/Famagusta
deleted file mode 100644
index cc441795..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Famagusta and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Gaza b/lib/tzdata/zoneinfo/Asia/Gaza
deleted file mode 100644
index 0d796627..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Gaza and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Harbin b/lib/tzdata/zoneinfo/Asia/Harbin
deleted file mode 100644
index d6b66984..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Harbin and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Hebron b/lib/tzdata/zoneinfo/Asia/Hebron
deleted file mode 100644
index 53a3c143..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Hebron and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Ho_Chi_Minh b/lib/tzdata/zoneinfo/Asia/Ho_Chi_Minh
deleted file mode 100644
index 86e21b0f..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Ho_Chi_Minh and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Hong_Kong b/lib/tzdata/zoneinfo/Asia/Hong_Kong
deleted file mode 100644
index c80e3648..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Hong_Kong and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Hovd b/lib/tzdata/zoneinfo/Asia/Hovd
deleted file mode 100644
index 6e08a261..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Hovd and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Irkutsk b/lib/tzdata/zoneinfo/Asia/Irkutsk
deleted file mode 100644
index 550e2a08..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Irkutsk and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Istanbul b/lib/tzdata/zoneinfo/Asia/Istanbul
deleted file mode 100644
index c8918668..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Istanbul and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Jakarta b/lib/tzdata/zoneinfo/Asia/Jakarta
deleted file mode 100644
index c9752d2f..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Jakarta and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Jayapura b/lib/tzdata/zoneinfo/Asia/Jayapura
deleted file mode 100644
index 7c22f539..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Jayapura and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Jerusalem b/lib/tzdata/zoneinfo/Asia/Jerusalem
deleted file mode 100644
index 4c49bbf5..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Jerusalem and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Kabul b/lib/tzdata/zoneinfo/Asia/Kabul
deleted file mode 100644
index 660ce4cf..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Kabul and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Kamchatka b/lib/tzdata/zoneinfo/Asia/Kamchatka
deleted file mode 100644
index c6515540..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Kamchatka and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Karachi b/lib/tzdata/zoneinfo/Asia/Karachi
deleted file mode 100644
index e56d5afd..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Karachi and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Kashgar b/lib/tzdata/zoneinfo/Asia/Kashgar
deleted file mode 100644
index 69ff7f6f..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Kashgar and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Kathmandu b/lib/tzdata/zoneinfo/Asia/Kathmandu
deleted file mode 100644
index 3a0d330f..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Kathmandu and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Katmandu b/lib/tzdata/zoneinfo/Asia/Katmandu
deleted file mode 100644
index 3a0d330f..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Katmandu and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Khandyga b/lib/tzdata/zoneinfo/Asia/Khandyga
deleted file mode 100644
index aeb73320..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Khandyga and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Kolkata b/lib/tzdata/zoneinfo/Asia/Kolkata
deleted file mode 100644
index 00bc80a6..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Kolkata and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Krasnoyarsk b/lib/tzdata/zoneinfo/Asia/Krasnoyarsk
deleted file mode 100644
index e0d4fcb5..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Krasnoyarsk and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Kuala_Lumpur b/lib/tzdata/zoneinfo/Asia/Kuala_Lumpur
deleted file mode 100644
index dbbdea3c..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Kuala_Lumpur and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Kuching b/lib/tzdata/zoneinfo/Asia/Kuching
deleted file mode 100644
index 59bc6e40..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Kuching and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Kuwait b/lib/tzdata/zoneinfo/Asia/Kuwait
deleted file mode 100644
index 01c47ccb..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Kuwait and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Macao b/lib/tzdata/zoneinfo/Asia/Macao
deleted file mode 100644
index c22f75e4..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Macao and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Macau b/lib/tzdata/zoneinfo/Asia/Macau
deleted file mode 100644
index c22f75e4..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Macau and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Magadan b/lib/tzdata/zoneinfo/Asia/Magadan
deleted file mode 100644
index 16bac844..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Magadan and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Makassar b/lib/tzdata/zoneinfo/Asia/Makassar
deleted file mode 100644
index 5990010b..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Makassar and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Manila b/lib/tzdata/zoneinfo/Asia/Manila
deleted file mode 100644
index 3c3584e0..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Manila and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Muscat b/lib/tzdata/zoneinfo/Asia/Muscat
deleted file mode 100644
index 58d75bc2..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Muscat and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Nicosia b/lib/tzdata/zoneinfo/Asia/Nicosia
deleted file mode 100644
index 390347f4..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Nicosia and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Novokuznetsk b/lib/tzdata/zoneinfo/Asia/Novokuznetsk
deleted file mode 100644
index 9378d505..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Novokuznetsk and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Novosibirsk b/lib/tzdata/zoneinfo/Asia/Novosibirsk
deleted file mode 100644
index 65a9fa2c..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Novosibirsk and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Omsk b/lib/tzdata/zoneinfo/Asia/Omsk
deleted file mode 100644
index dc0ed422..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Omsk and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Oral b/lib/tzdata/zoneinfo/Asia/Oral
deleted file mode 100644
index 25a63ec8..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Oral and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Phnom_Penh b/lib/tzdata/zoneinfo/Asia/Phnom_Penh
deleted file mode 100644
index ed687d29..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Phnom_Penh and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Pontianak b/lib/tzdata/zoneinfo/Asia/Pontianak
deleted file mode 100644
index 285bed2c..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Pontianak and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Pyongyang b/lib/tzdata/zoneinfo/Asia/Pyongyang
deleted file mode 100644
index 57240cf8..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Pyongyang and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Qatar b/lib/tzdata/zoneinfo/Asia/Qatar
deleted file mode 100644
index 7409d749..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Qatar and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Qostanay b/lib/tzdata/zoneinfo/Asia/Qostanay
deleted file mode 100644
index 109fe415..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Qostanay and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Qyzylorda b/lib/tzdata/zoneinfo/Asia/Qyzylorda
deleted file mode 100644
index fe4d6c6d..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Qyzylorda and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Rangoon b/lib/tzdata/zoneinfo/Asia/Rangoon
deleted file mode 100644
index 14b2ad09..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Rangoon and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Riyadh b/lib/tzdata/zoneinfo/Asia/Riyadh
deleted file mode 100644
index 01c47ccb..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Riyadh and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Saigon b/lib/tzdata/zoneinfo/Asia/Saigon
deleted file mode 100644
index 86e21b0f..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Saigon and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Sakhalin b/lib/tzdata/zoneinfo/Asia/Sakhalin
deleted file mode 100644
index 69f0faad..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Sakhalin and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Samarkand b/lib/tzdata/zoneinfo/Asia/Samarkand
deleted file mode 100644
index c43e27c5..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Samarkand and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Seoul b/lib/tzdata/zoneinfo/Asia/Seoul
deleted file mode 100644
index 1755147f..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Seoul and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Shanghai b/lib/tzdata/zoneinfo/Asia/Shanghai
deleted file mode 100644
index d6b66984..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Shanghai and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Singapore b/lib/tzdata/zoneinfo/Asia/Singapore
deleted file mode 100644
index dbbdea3c..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Singapore and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Srednekolymsk b/lib/tzdata/zoneinfo/Asia/Srednekolymsk
deleted file mode 100644
index 7fdee5cb..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Srednekolymsk and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Taipei b/lib/tzdata/zoneinfo/Asia/Taipei
deleted file mode 100644
index 35d89d03..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Taipei and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Tashkent b/lib/tzdata/zoneinfo/Asia/Tashkent
deleted file mode 100644
index 65ee428c..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Tashkent and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Tbilisi b/lib/tzdata/zoneinfo/Asia/Tbilisi
deleted file mode 100644
index 166e4341..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Tbilisi and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Tehran b/lib/tzdata/zoneinfo/Asia/Tehran
deleted file mode 100644
index 824acb04..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Tehran and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Tel_Aviv b/lib/tzdata/zoneinfo/Asia/Tel_Aviv
deleted file mode 100644
index 4c49bbf5..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Tel_Aviv and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Thimbu b/lib/tzdata/zoneinfo/Asia/Thimbu
deleted file mode 100644
index 0edc72cf..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Thimbu and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Thimphu b/lib/tzdata/zoneinfo/Asia/Thimphu
deleted file mode 100644
index 0edc72cf..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Thimphu and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Tokyo b/lib/tzdata/zoneinfo/Asia/Tokyo
deleted file mode 100644
index 1aa066ce..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Tokyo and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Tomsk b/lib/tzdata/zoneinfo/Asia/Tomsk
deleted file mode 100644
index c3c307d7..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Tomsk and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Ujung_Pandang b/lib/tzdata/zoneinfo/Asia/Ujung_Pandang
deleted file mode 100644
index 5990010b..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Ujung_Pandang and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Ulaanbaatar b/lib/tzdata/zoneinfo/Asia/Ulaanbaatar
deleted file mode 100644
index 6f5d3a15..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Ulaanbaatar and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Ulan_Bator b/lib/tzdata/zoneinfo/Asia/Ulan_Bator
deleted file mode 100644
index 6f5d3a15..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Ulan_Bator and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Urumqi b/lib/tzdata/zoneinfo/Asia/Urumqi
deleted file mode 100644
index 69ff7f6f..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Urumqi and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Ust-Nera b/lib/tzdata/zoneinfo/Asia/Ust-Nera
deleted file mode 100644
index c39331e3..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Ust-Nera and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Vientiane b/lib/tzdata/zoneinfo/Asia/Vientiane
deleted file mode 100644
index ed687d29..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Vientiane and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Vladivostok b/lib/tzdata/zoneinfo/Asia/Vladivostok
deleted file mode 100644
index 72a3d4e8..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Vladivostok and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Yakutsk b/lib/tzdata/zoneinfo/Asia/Yakutsk
deleted file mode 100644
index 336f932e..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Yakutsk and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Yangon b/lib/tzdata/zoneinfo/Asia/Yangon
deleted file mode 100644
index 14b2ad09..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Yangon and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Yekaterinburg b/lib/tzdata/zoneinfo/Asia/Yekaterinburg
deleted file mode 100644
index a3bf7f29..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Yekaterinburg and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/Yerevan b/lib/tzdata/zoneinfo/Asia/Yerevan
deleted file mode 100644
index 6dd927cb..00000000
Binary files a/lib/tzdata/zoneinfo/Asia/Yerevan and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Asia/__init__.py b/lib/tzdata/zoneinfo/Asia/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/tzdata/zoneinfo/Atlantic/Azores b/lib/tzdata/zoneinfo/Atlantic/Azores
deleted file mode 100644
index cda1c1d2..00000000
Binary files a/lib/tzdata/zoneinfo/Atlantic/Azores and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Atlantic/Bermuda b/lib/tzdata/zoneinfo/Atlantic/Bermuda
deleted file mode 100644
index abc75ea7..00000000
Binary files a/lib/tzdata/zoneinfo/Atlantic/Bermuda and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Atlantic/Canary b/lib/tzdata/zoneinfo/Atlantic/Canary
deleted file mode 100644
index 5ab3243a..00000000
Binary files a/lib/tzdata/zoneinfo/Atlantic/Canary and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Atlantic/Cape_Verde b/lib/tzdata/zoneinfo/Atlantic/Cape_Verde
deleted file mode 100644
index 8f7de1c0..00000000
Binary files a/lib/tzdata/zoneinfo/Atlantic/Cape_Verde and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Atlantic/Faeroe b/lib/tzdata/zoneinfo/Atlantic/Faeroe
deleted file mode 100644
index 9558bf71..00000000
Binary files a/lib/tzdata/zoneinfo/Atlantic/Faeroe and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Atlantic/Faroe b/lib/tzdata/zoneinfo/Atlantic/Faroe
deleted file mode 100644
index 9558bf71..00000000
Binary files a/lib/tzdata/zoneinfo/Atlantic/Faroe and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Atlantic/Jan_Mayen b/lib/tzdata/zoneinfo/Atlantic/Jan_Mayen
deleted file mode 100644
index 465546bd..00000000
Binary files a/lib/tzdata/zoneinfo/Atlantic/Jan_Mayen and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Atlantic/Madeira b/lib/tzdata/zoneinfo/Atlantic/Madeira
deleted file mode 100644
index 21e84571..00000000
Binary files a/lib/tzdata/zoneinfo/Atlantic/Madeira and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Atlantic/Reykjavik b/lib/tzdata/zoneinfo/Atlantic/Reykjavik
deleted file mode 100644
index 8906e88c..00000000
Binary files a/lib/tzdata/zoneinfo/Atlantic/Reykjavik and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Atlantic/South_Georgia b/lib/tzdata/zoneinfo/Atlantic/South_Georgia
deleted file mode 100644
index 7fa5f468..00000000
Binary files a/lib/tzdata/zoneinfo/Atlantic/South_Georgia and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Atlantic/St_Helena b/lib/tzdata/zoneinfo/Atlantic/St_Helena
deleted file mode 100644
index 8906e88c..00000000
Binary files a/lib/tzdata/zoneinfo/Atlantic/St_Helena and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Atlantic/Stanley b/lib/tzdata/zoneinfo/Atlantic/Stanley
deleted file mode 100644
index 1a4c8ea8..00000000
Binary files a/lib/tzdata/zoneinfo/Atlantic/Stanley and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Atlantic/__init__.py b/lib/tzdata/zoneinfo/Atlantic/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/tzdata/zoneinfo/Australia/ACT b/lib/tzdata/zoneinfo/Australia/ACT
deleted file mode 100644
index 1975a3a4..00000000
Binary files a/lib/tzdata/zoneinfo/Australia/ACT and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Australia/Adelaide b/lib/tzdata/zoneinfo/Australia/Adelaide
deleted file mode 100644
index 3bfbbc56..00000000
Binary files a/lib/tzdata/zoneinfo/Australia/Adelaide and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Australia/Brisbane b/lib/tzdata/zoneinfo/Australia/Brisbane
deleted file mode 100644
index dc9a980a..00000000
Binary files a/lib/tzdata/zoneinfo/Australia/Brisbane and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Australia/Broken_Hill b/lib/tzdata/zoneinfo/Australia/Broken_Hill
deleted file mode 100644
index 947b5099..00000000
Binary files a/lib/tzdata/zoneinfo/Australia/Broken_Hill and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Australia/Canberra b/lib/tzdata/zoneinfo/Australia/Canberra
deleted file mode 100644
index 1975a3a4..00000000
Binary files a/lib/tzdata/zoneinfo/Australia/Canberra and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Australia/Currie b/lib/tzdata/zoneinfo/Australia/Currie
deleted file mode 100644
index dc2ef554..00000000
Binary files a/lib/tzdata/zoneinfo/Australia/Currie and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Australia/Darwin b/lib/tzdata/zoneinfo/Australia/Darwin
deleted file mode 100644
index a6a67300..00000000
Binary files a/lib/tzdata/zoneinfo/Australia/Darwin and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Australia/Eucla b/lib/tzdata/zoneinfo/Australia/Eucla
deleted file mode 100644
index 9080f5cd..00000000
Binary files a/lib/tzdata/zoneinfo/Australia/Eucla and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Australia/Hobart b/lib/tzdata/zoneinfo/Australia/Hobart
deleted file mode 100644
index dc2ef554..00000000
Binary files a/lib/tzdata/zoneinfo/Australia/Hobart and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Australia/LHI b/lib/tzdata/zoneinfo/Australia/LHI
deleted file mode 100644
index 4d4ec8ce..00000000
Binary files a/lib/tzdata/zoneinfo/Australia/LHI and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Australia/Lindeman b/lib/tzdata/zoneinfo/Australia/Lindeman
deleted file mode 100644
index 131d77b5..00000000
Binary files a/lib/tzdata/zoneinfo/Australia/Lindeman and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Australia/Lord_Howe b/lib/tzdata/zoneinfo/Australia/Lord_Howe
deleted file mode 100644
index 4d4ec8ce..00000000
Binary files a/lib/tzdata/zoneinfo/Australia/Lord_Howe and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Australia/Melbourne b/lib/tzdata/zoneinfo/Australia/Melbourne
deleted file mode 100644
index d3f195ac..00000000
Binary files a/lib/tzdata/zoneinfo/Australia/Melbourne and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Australia/NSW b/lib/tzdata/zoneinfo/Australia/NSW
deleted file mode 100644
index 1975a3a4..00000000
Binary files a/lib/tzdata/zoneinfo/Australia/NSW and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Australia/North b/lib/tzdata/zoneinfo/Australia/North
deleted file mode 100644
index a6a67300..00000000
Binary files a/lib/tzdata/zoneinfo/Australia/North and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Australia/Perth b/lib/tzdata/zoneinfo/Australia/Perth
deleted file mode 100644
index 4f771828..00000000
Binary files a/lib/tzdata/zoneinfo/Australia/Perth and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Australia/Queensland b/lib/tzdata/zoneinfo/Australia/Queensland
deleted file mode 100644
index dc9a980a..00000000
Binary files a/lib/tzdata/zoneinfo/Australia/Queensland and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Australia/South b/lib/tzdata/zoneinfo/Australia/South
deleted file mode 100644
index 3bfbbc56..00000000
Binary files a/lib/tzdata/zoneinfo/Australia/South and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Australia/Sydney b/lib/tzdata/zoneinfo/Australia/Sydney
deleted file mode 100644
index 1975a3a4..00000000
Binary files a/lib/tzdata/zoneinfo/Australia/Sydney and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Australia/Tasmania b/lib/tzdata/zoneinfo/Australia/Tasmania
deleted file mode 100644
index dc2ef554..00000000
Binary files a/lib/tzdata/zoneinfo/Australia/Tasmania and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Australia/Victoria b/lib/tzdata/zoneinfo/Australia/Victoria
deleted file mode 100644
index d3f195ac..00000000
Binary files a/lib/tzdata/zoneinfo/Australia/Victoria and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Australia/West b/lib/tzdata/zoneinfo/Australia/West
deleted file mode 100644
index 4f771828..00000000
Binary files a/lib/tzdata/zoneinfo/Australia/West and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Australia/Yancowinna b/lib/tzdata/zoneinfo/Australia/Yancowinna
deleted file mode 100644
index 947b5099..00000000
Binary files a/lib/tzdata/zoneinfo/Australia/Yancowinna and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Australia/__init__.py b/lib/tzdata/zoneinfo/Australia/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/tzdata/zoneinfo/Brazil/Acre b/lib/tzdata/zoneinfo/Brazil/Acre
deleted file mode 100644
index fb5185ca..00000000
Binary files a/lib/tzdata/zoneinfo/Brazil/Acre and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Brazil/DeNoronha b/lib/tzdata/zoneinfo/Brazil/DeNoronha
deleted file mode 100644
index 9e74745c..00000000
Binary files a/lib/tzdata/zoneinfo/Brazil/DeNoronha and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Brazil/East b/lib/tzdata/zoneinfo/Brazil/East
deleted file mode 100644
index a16da2c4..00000000
Binary files a/lib/tzdata/zoneinfo/Brazil/East and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Brazil/West b/lib/tzdata/zoneinfo/Brazil/West
deleted file mode 100644
index 59c952eb..00000000
Binary files a/lib/tzdata/zoneinfo/Brazil/West and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Brazil/__init__.py b/lib/tzdata/zoneinfo/Brazil/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/tzdata/zoneinfo/CET b/lib/tzdata/zoneinfo/CET
deleted file mode 100644
index 31973271..00000000
Binary files a/lib/tzdata/zoneinfo/CET and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/CST6CDT b/lib/tzdata/zoneinfo/CST6CDT
deleted file mode 100644
index b0168806..00000000
Binary files a/lib/tzdata/zoneinfo/CST6CDT and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Canada/Atlantic b/lib/tzdata/zoneinfo/Canada/Atlantic
deleted file mode 100644
index 9fa850a7..00000000
Binary files a/lib/tzdata/zoneinfo/Canada/Atlantic and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Canada/Central b/lib/tzdata/zoneinfo/Canada/Central
deleted file mode 100644
index 7e646d18..00000000
Binary files a/lib/tzdata/zoneinfo/Canada/Central and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Canada/Eastern b/lib/tzdata/zoneinfo/Canada/Eastern
deleted file mode 100644
index 668e70d7..00000000
Binary files a/lib/tzdata/zoneinfo/Canada/Eastern and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Canada/Mountain b/lib/tzdata/zoneinfo/Canada/Mountain
deleted file mode 100644
index 645ee945..00000000
Binary files a/lib/tzdata/zoneinfo/Canada/Mountain and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Canada/Newfoundland b/lib/tzdata/zoneinfo/Canada/Newfoundland
deleted file mode 100644
index 94d790ba..00000000
Binary files a/lib/tzdata/zoneinfo/Canada/Newfoundland and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Canada/Pacific b/lib/tzdata/zoneinfo/Canada/Pacific
deleted file mode 100644
index c9984911..00000000
Binary files a/lib/tzdata/zoneinfo/Canada/Pacific and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Canada/Saskatchewan b/lib/tzdata/zoneinfo/Canada/Saskatchewan
deleted file mode 100644
index a3f8217a..00000000
Binary files a/lib/tzdata/zoneinfo/Canada/Saskatchewan and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Canada/Yukon b/lib/tzdata/zoneinfo/Canada/Yukon
deleted file mode 100644
index 40baa9ab..00000000
Binary files a/lib/tzdata/zoneinfo/Canada/Yukon and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Canada/__init__.py b/lib/tzdata/zoneinfo/Canada/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/tzdata/zoneinfo/Chile/Continental b/lib/tzdata/zoneinfo/Chile/Continental
deleted file mode 100644
index d3fc9b83..00000000
Binary files a/lib/tzdata/zoneinfo/Chile/Continental and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Chile/EasterIsland b/lib/tzdata/zoneinfo/Chile/EasterIsland
deleted file mode 100644
index 54dff005..00000000
Binary files a/lib/tzdata/zoneinfo/Chile/EasterIsland and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Chile/__init__.py b/lib/tzdata/zoneinfo/Chile/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/tzdata/zoneinfo/Cuba b/lib/tzdata/zoneinfo/Cuba
deleted file mode 100644
index e06629d3..00000000
Binary files a/lib/tzdata/zoneinfo/Cuba and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/EET b/lib/tzdata/zoneinfo/EET
deleted file mode 100644
index 231bf9c3..00000000
Binary files a/lib/tzdata/zoneinfo/EET and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/EST b/lib/tzdata/zoneinfo/EST
deleted file mode 100644
index 9154643f..00000000
Binary files a/lib/tzdata/zoneinfo/EST and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/EST5EDT b/lib/tzdata/zoneinfo/EST5EDT
deleted file mode 100644
index 2b6c2eea..00000000
Binary files a/lib/tzdata/zoneinfo/EST5EDT and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Egypt b/lib/tzdata/zoneinfo/Egypt
deleted file mode 100644
index 1e6d48d1..00000000
Binary files a/lib/tzdata/zoneinfo/Egypt and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Eire b/lib/tzdata/zoneinfo/Eire
deleted file mode 100644
index 17d2b158..00000000
Binary files a/lib/tzdata/zoneinfo/Eire and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT b/lib/tzdata/zoneinfo/Etc/GMT
deleted file mode 100644
index 157573b1..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT+0 b/lib/tzdata/zoneinfo/Etc/GMT+0
deleted file mode 100644
index 157573b1..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT+0 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT+1 b/lib/tzdata/zoneinfo/Etc/GMT+1
deleted file mode 100644
index 98d5dcf9..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT+1 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT+10 b/lib/tzdata/zoneinfo/Etc/GMT+10
deleted file mode 100644
index ecb287e6..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT+10 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT+11 b/lib/tzdata/zoneinfo/Etc/GMT+11
deleted file mode 100644
index e9414129..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT+11 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT+12 b/lib/tzdata/zoneinfo/Etc/GMT+12
deleted file mode 100644
index 9c95bd07..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT+12 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT+2 b/lib/tzdata/zoneinfo/Etc/GMT+2
deleted file mode 100644
index 6d5ce3db..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT+2 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT+3 b/lib/tzdata/zoneinfo/Etc/GMT+3
deleted file mode 100644
index 5ef7be71..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT+3 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT+4 b/lib/tzdata/zoneinfo/Etc/GMT+4
deleted file mode 100644
index 75f16216..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT+4 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT+5 b/lib/tzdata/zoneinfo/Etc/GMT+5
deleted file mode 100644
index 589990ae..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT+5 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT+6 b/lib/tzdata/zoneinfo/Etc/GMT+6
deleted file mode 100644
index fcb60ca2..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT+6 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT+7 b/lib/tzdata/zoneinfo/Etc/GMT+7
deleted file mode 100644
index c0427a40..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT+7 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT+8 b/lib/tzdata/zoneinfo/Etc/GMT+8
deleted file mode 100644
index 9bdc2283..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT+8 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT+9 b/lib/tzdata/zoneinfo/Etc/GMT+9
deleted file mode 100644
index ca7a81f6..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT+9 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT-0 b/lib/tzdata/zoneinfo/Etc/GMT-0
deleted file mode 100644
index 157573b1..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT-0 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT-1 b/lib/tzdata/zoneinfo/Etc/GMT-1
deleted file mode 100644
index cb45601c..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT-1 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT-10 b/lib/tzdata/zoneinfo/Etc/GMT-10
deleted file mode 100644
index 11d988e1..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT-10 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT-11 b/lib/tzdata/zoneinfo/Etc/GMT-11
deleted file mode 100644
index f4c5d5cc..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT-11 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT-12 b/lib/tzdata/zoneinfo/Etc/GMT-12
deleted file mode 100644
index cd397b02..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT-12 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT-13 b/lib/tzdata/zoneinfo/Etc/GMT-13
deleted file mode 100644
index 8fad7c6b..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT-13 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT-14 b/lib/tzdata/zoneinfo/Etc/GMT-14
deleted file mode 100644
index a595e60e..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT-14 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT-2 b/lib/tzdata/zoneinfo/Etc/GMT-2
deleted file mode 100644
index 97b44a9b..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT-2 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT-3 b/lib/tzdata/zoneinfo/Etc/GMT-3
deleted file mode 100644
index 4eb17ff0..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT-3 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT-4 b/lib/tzdata/zoneinfo/Etc/GMT-4
deleted file mode 100644
index 13aef80c..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT-4 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT-5 b/lib/tzdata/zoneinfo/Etc/GMT-5
deleted file mode 100644
index 83a28169..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT-5 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT-6 b/lib/tzdata/zoneinfo/Etc/GMT-6
deleted file mode 100644
index 79a983e5..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT-6 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT-7 b/lib/tzdata/zoneinfo/Etc/GMT-7
deleted file mode 100644
index e136690e..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT-7 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT-8 b/lib/tzdata/zoneinfo/Etc/GMT-8
deleted file mode 100644
index bc70fe41..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT-8 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT-9 b/lib/tzdata/zoneinfo/Etc/GMT-9
deleted file mode 100644
index d18cedd5..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT-9 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/GMT0 b/lib/tzdata/zoneinfo/Etc/GMT0
deleted file mode 100644
index 157573b1..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/GMT0 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/Greenwich b/lib/tzdata/zoneinfo/Etc/Greenwich
deleted file mode 100644
index 157573b1..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/Greenwich and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/UCT b/lib/tzdata/zoneinfo/Etc/UCT
deleted file mode 100644
index 00841a62..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/UCT and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/UTC b/lib/tzdata/zoneinfo/Etc/UTC
deleted file mode 100644
index 00841a62..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/UTC and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/Universal b/lib/tzdata/zoneinfo/Etc/Universal
deleted file mode 100644
index 00841a62..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/Universal and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/Zulu b/lib/tzdata/zoneinfo/Etc/Zulu
deleted file mode 100644
index 00841a62..00000000
Binary files a/lib/tzdata/zoneinfo/Etc/Zulu and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Etc/__init__.py b/lib/tzdata/zoneinfo/Etc/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/tzdata/zoneinfo/Europe/Amsterdam b/lib/tzdata/zoneinfo/Europe/Amsterdam
deleted file mode 100644
index 31973271..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Amsterdam and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Andorra b/lib/tzdata/zoneinfo/Europe/Andorra
deleted file mode 100644
index 38685d42..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Andorra and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Astrakhan b/lib/tzdata/zoneinfo/Europe/Astrakhan
deleted file mode 100644
index aff8d82d..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Astrakhan and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Athens b/lib/tzdata/zoneinfo/Europe/Athens
deleted file mode 100644
index 231bf9c3..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Athens and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Belfast b/lib/tzdata/zoneinfo/Europe/Belfast
deleted file mode 100644
index b9e95d92..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Belfast and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Belgrade b/lib/tzdata/zoneinfo/Europe/Belgrade
deleted file mode 100644
index a1bf9281..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Belgrade and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Berlin b/lib/tzdata/zoneinfo/Europe/Berlin
deleted file mode 100644
index 465546bd..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Berlin and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Bratislava b/lib/tzdata/zoneinfo/Europe/Bratislava
deleted file mode 100644
index fb7c145a..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Bratislava and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Brussels b/lib/tzdata/zoneinfo/Europe/Brussels
deleted file mode 100644
index 31973271..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Brussels and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Bucharest b/lib/tzdata/zoneinfo/Europe/Bucharest
deleted file mode 100644
index c4a391e7..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Bucharest and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Budapest b/lib/tzdata/zoneinfo/Europe/Budapest
deleted file mode 100644
index 940be467..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Budapest and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Busingen b/lib/tzdata/zoneinfo/Europe/Busingen
deleted file mode 100644
index 388df296..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Busingen and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Chisinau b/lib/tzdata/zoneinfo/Europe/Chisinau
deleted file mode 100644
index 9152e685..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Chisinau and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Copenhagen b/lib/tzdata/zoneinfo/Europe/Copenhagen
deleted file mode 100644
index 465546bd..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Copenhagen and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Dublin b/lib/tzdata/zoneinfo/Europe/Dublin
deleted file mode 100644
index 17d2b158..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Dublin and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Gibraltar b/lib/tzdata/zoneinfo/Europe/Gibraltar
deleted file mode 100644
index 017bb2e3..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Gibraltar and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Guernsey b/lib/tzdata/zoneinfo/Europe/Guernsey
deleted file mode 100644
index b9e95d92..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Guernsey and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Helsinki b/lib/tzdata/zoneinfo/Europe/Helsinki
deleted file mode 100644
index ff5e5653..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Helsinki and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Isle_of_Man b/lib/tzdata/zoneinfo/Europe/Isle_of_Man
deleted file mode 100644
index b9e95d92..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Isle_of_Man and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Istanbul b/lib/tzdata/zoneinfo/Europe/Istanbul
deleted file mode 100644
index c8918668..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Istanbul and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Jersey b/lib/tzdata/zoneinfo/Europe/Jersey
deleted file mode 100644
index b9e95d92..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Jersey and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Kaliningrad b/lib/tzdata/zoneinfo/Europe/Kaliningrad
deleted file mode 100644
index 0ec47564..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Kaliningrad and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Kiev b/lib/tzdata/zoneinfo/Europe/Kiev
deleted file mode 100644
index 753a6c86..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Kiev and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Kirov b/lib/tzdata/zoneinfo/Europe/Kirov
deleted file mode 100644
index bfac5611..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Kirov and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Kyiv b/lib/tzdata/zoneinfo/Europe/Kyiv
deleted file mode 100644
index 753a6c86..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Kyiv and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Lisbon b/lib/tzdata/zoneinfo/Europe/Lisbon
deleted file mode 100644
index 7e9aae72..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Lisbon and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Ljubljana b/lib/tzdata/zoneinfo/Europe/Ljubljana
deleted file mode 100644
index a1bf9281..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Ljubljana and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/London b/lib/tzdata/zoneinfo/Europe/London
deleted file mode 100644
index b9e95d92..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/London and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Luxembourg b/lib/tzdata/zoneinfo/Europe/Luxembourg
deleted file mode 100644
index 31973271..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Luxembourg and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Madrid b/lib/tzdata/zoneinfo/Europe/Madrid
deleted file mode 100644
index 60bdf4d0..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Madrid and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Malta b/lib/tzdata/zoneinfo/Europe/Malta
deleted file mode 100644
index 27539c22..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Malta and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Mariehamn b/lib/tzdata/zoneinfo/Europe/Mariehamn
deleted file mode 100644
index ff5e5653..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Mariehamn and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Minsk b/lib/tzdata/zoneinfo/Europe/Minsk
deleted file mode 100644
index 30d3a672..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Minsk and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Monaco b/lib/tzdata/zoneinfo/Europe/Monaco
deleted file mode 100644
index 00a27264..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Monaco and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Moscow b/lib/tzdata/zoneinfo/Europe/Moscow
deleted file mode 100644
index 5e6b6de6..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Moscow and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Nicosia b/lib/tzdata/zoneinfo/Europe/Nicosia
deleted file mode 100644
index 390347f4..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Nicosia and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Oslo b/lib/tzdata/zoneinfo/Europe/Oslo
deleted file mode 100644
index 465546bd..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Oslo and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Paris b/lib/tzdata/zoneinfo/Europe/Paris
deleted file mode 100644
index 00a27264..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Paris and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Podgorica b/lib/tzdata/zoneinfo/Europe/Podgorica
deleted file mode 100644
index a1bf9281..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Podgorica and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Prague b/lib/tzdata/zoneinfo/Europe/Prague
deleted file mode 100644
index fb7c145a..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Prague and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Riga b/lib/tzdata/zoneinfo/Europe/Riga
deleted file mode 100644
index d99170b6..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Riga and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Rome b/lib/tzdata/zoneinfo/Europe/Rome
deleted file mode 100644
index 639ca3be..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Rome and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Samara b/lib/tzdata/zoneinfo/Europe/Samara
deleted file mode 100644
index 8d0c26e5..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Samara and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/San_Marino b/lib/tzdata/zoneinfo/Europe/San_Marino
deleted file mode 100644
index 639ca3be..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/San_Marino and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Sarajevo b/lib/tzdata/zoneinfo/Europe/Sarajevo
deleted file mode 100644
index a1bf9281..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Sarajevo and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Saratov b/lib/tzdata/zoneinfo/Europe/Saratov
deleted file mode 100644
index 2684d8f8..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Saratov and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Simferopol b/lib/tzdata/zoneinfo/Europe/Simferopol
deleted file mode 100644
index 298b8326..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Simferopol and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Skopje b/lib/tzdata/zoneinfo/Europe/Skopje
deleted file mode 100644
index a1bf9281..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Skopje and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Sofia b/lib/tzdata/zoneinfo/Europe/Sofia
deleted file mode 100644
index 89450685..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Sofia and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Stockholm b/lib/tzdata/zoneinfo/Europe/Stockholm
deleted file mode 100644
index 465546bd..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Stockholm and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Tallinn b/lib/tzdata/zoneinfo/Europe/Tallinn
deleted file mode 100644
index fbebdc62..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Tallinn and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Tirane b/lib/tzdata/zoneinfo/Europe/Tirane
deleted file mode 100644
index 743a7337..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Tirane and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Tiraspol b/lib/tzdata/zoneinfo/Europe/Tiraspol
deleted file mode 100644
index 9152e685..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Tiraspol and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Ulyanovsk b/lib/tzdata/zoneinfo/Europe/Ulyanovsk
deleted file mode 100644
index bb842cb1..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Ulyanovsk and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Uzhgorod b/lib/tzdata/zoneinfo/Europe/Uzhgorod
deleted file mode 100644
index 753a6c86..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Uzhgorod and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Vaduz b/lib/tzdata/zoneinfo/Europe/Vaduz
deleted file mode 100644
index 388df296..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Vaduz and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Vatican b/lib/tzdata/zoneinfo/Europe/Vatican
deleted file mode 100644
index 639ca3be..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Vatican and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Vienna b/lib/tzdata/zoneinfo/Europe/Vienna
deleted file mode 100644
index 75339e98..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Vienna and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Vilnius b/lib/tzdata/zoneinfo/Europe/Vilnius
deleted file mode 100644
index 43c3d7f1..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Vilnius and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Volgograd b/lib/tzdata/zoneinfo/Europe/Volgograd
deleted file mode 100644
index 0715d58b..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Volgograd and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Warsaw b/lib/tzdata/zoneinfo/Europe/Warsaw
deleted file mode 100644
index efe1a40f..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Warsaw and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Zagreb b/lib/tzdata/zoneinfo/Europe/Zagreb
deleted file mode 100644
index a1bf9281..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Zagreb and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Zaporozhye b/lib/tzdata/zoneinfo/Europe/Zaporozhye
deleted file mode 100644
index 753a6c86..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Zaporozhye and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/Zurich b/lib/tzdata/zoneinfo/Europe/Zurich
deleted file mode 100644
index 388df296..00000000
Binary files a/lib/tzdata/zoneinfo/Europe/Zurich and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Europe/__init__.py b/lib/tzdata/zoneinfo/Europe/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/tzdata/zoneinfo/Factory b/lib/tzdata/zoneinfo/Factory
deleted file mode 100644
index b4dd7735..00000000
Binary files a/lib/tzdata/zoneinfo/Factory and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/GB b/lib/tzdata/zoneinfo/GB
deleted file mode 100644
index b9e95d92..00000000
Binary files a/lib/tzdata/zoneinfo/GB and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/GB-Eire b/lib/tzdata/zoneinfo/GB-Eire
deleted file mode 100644
index b9e95d92..00000000
Binary files a/lib/tzdata/zoneinfo/GB-Eire and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/GMT b/lib/tzdata/zoneinfo/GMT
deleted file mode 100644
index 157573b1..00000000
Binary files a/lib/tzdata/zoneinfo/GMT and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/GMT+0 b/lib/tzdata/zoneinfo/GMT+0
deleted file mode 100644
index 157573b1..00000000
Binary files a/lib/tzdata/zoneinfo/GMT+0 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/GMT-0 b/lib/tzdata/zoneinfo/GMT-0
deleted file mode 100644
index 157573b1..00000000
Binary files a/lib/tzdata/zoneinfo/GMT-0 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/GMT0 b/lib/tzdata/zoneinfo/GMT0
deleted file mode 100644
index 157573b1..00000000
Binary files a/lib/tzdata/zoneinfo/GMT0 and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Greenwich b/lib/tzdata/zoneinfo/Greenwich
deleted file mode 100644
index 157573b1..00000000
Binary files a/lib/tzdata/zoneinfo/Greenwich and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/HST b/lib/tzdata/zoneinfo/HST
deleted file mode 100644
index 40e3d492..00000000
Binary files a/lib/tzdata/zoneinfo/HST and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Hongkong b/lib/tzdata/zoneinfo/Hongkong
deleted file mode 100644
index c80e3648..00000000
Binary files a/lib/tzdata/zoneinfo/Hongkong and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Iceland b/lib/tzdata/zoneinfo/Iceland
deleted file mode 100644
index 8906e88c..00000000
Binary files a/lib/tzdata/zoneinfo/Iceland and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Indian/Antananarivo b/lib/tzdata/zoneinfo/Indian/Antananarivo
deleted file mode 100644
index 5f4ebcb7..00000000
Binary files a/lib/tzdata/zoneinfo/Indian/Antananarivo and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Indian/Chagos b/lib/tzdata/zoneinfo/Indian/Chagos
deleted file mode 100644
index 8b8ce226..00000000
Binary files a/lib/tzdata/zoneinfo/Indian/Chagos and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Indian/Christmas b/lib/tzdata/zoneinfo/Indian/Christmas
deleted file mode 100644
index ed687d29..00000000
Binary files a/lib/tzdata/zoneinfo/Indian/Christmas and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Indian/Cocos b/lib/tzdata/zoneinfo/Indian/Cocos
deleted file mode 100644
index 14b2ad09..00000000
Binary files a/lib/tzdata/zoneinfo/Indian/Cocos and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Indian/Comoro b/lib/tzdata/zoneinfo/Indian/Comoro
deleted file mode 100644
index 5f4ebcb7..00000000
Binary files a/lib/tzdata/zoneinfo/Indian/Comoro and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Indian/Kerguelen b/lib/tzdata/zoneinfo/Indian/Kerguelen
deleted file mode 100644
index 58a82e4e..00000000
Binary files a/lib/tzdata/zoneinfo/Indian/Kerguelen and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Indian/Mahe b/lib/tzdata/zoneinfo/Indian/Mahe
deleted file mode 100644
index 58d75bc2..00000000
Binary files a/lib/tzdata/zoneinfo/Indian/Mahe and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Indian/Maldives b/lib/tzdata/zoneinfo/Indian/Maldives
deleted file mode 100644
index 58a82e4e..00000000
Binary files a/lib/tzdata/zoneinfo/Indian/Maldives and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Indian/Mauritius b/lib/tzdata/zoneinfo/Indian/Mauritius
deleted file mode 100644
index 7c111348..00000000
Binary files a/lib/tzdata/zoneinfo/Indian/Mauritius and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Indian/Mayotte b/lib/tzdata/zoneinfo/Indian/Mayotte
deleted file mode 100644
index 5f4ebcb7..00000000
Binary files a/lib/tzdata/zoneinfo/Indian/Mayotte and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Indian/Reunion b/lib/tzdata/zoneinfo/Indian/Reunion
deleted file mode 100644
index 58d75bc2..00000000
Binary files a/lib/tzdata/zoneinfo/Indian/Reunion and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Indian/__init__.py b/lib/tzdata/zoneinfo/Indian/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/tzdata/zoneinfo/Iran b/lib/tzdata/zoneinfo/Iran
deleted file mode 100644
index 824acb04..00000000
Binary files a/lib/tzdata/zoneinfo/Iran and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Israel b/lib/tzdata/zoneinfo/Israel
deleted file mode 100644
index 4c49bbf5..00000000
Binary files a/lib/tzdata/zoneinfo/Israel and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Jamaica b/lib/tzdata/zoneinfo/Jamaica
deleted file mode 100644
index be6b1b6f..00000000
Binary files a/lib/tzdata/zoneinfo/Jamaica and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Japan b/lib/tzdata/zoneinfo/Japan
deleted file mode 100644
index 1aa066ce..00000000
Binary files a/lib/tzdata/zoneinfo/Japan and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Kwajalein b/lib/tzdata/zoneinfo/Kwajalein
deleted file mode 100644
index 9416d522..00000000
Binary files a/lib/tzdata/zoneinfo/Kwajalein and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Libya b/lib/tzdata/zoneinfo/Libya
deleted file mode 100644
index e0c89971..00000000
Binary files a/lib/tzdata/zoneinfo/Libya and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/MET b/lib/tzdata/zoneinfo/MET
deleted file mode 100644
index 31973271..00000000
Binary files a/lib/tzdata/zoneinfo/MET and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/MST b/lib/tzdata/zoneinfo/MST
deleted file mode 100644
index c2bd2f94..00000000
Binary files a/lib/tzdata/zoneinfo/MST and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/MST7MDT b/lib/tzdata/zoneinfo/MST7MDT
deleted file mode 100644
index 09e54e5c..00000000
Binary files a/lib/tzdata/zoneinfo/MST7MDT and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Mexico/BajaNorte b/lib/tzdata/zoneinfo/Mexico/BajaNorte
deleted file mode 100644
index 18d0d14a..00000000
Binary files a/lib/tzdata/zoneinfo/Mexico/BajaNorte and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Mexico/BajaSur b/lib/tzdata/zoneinfo/Mexico/BajaSur
deleted file mode 100644
index 5aa6039e..00000000
Binary files a/lib/tzdata/zoneinfo/Mexico/BajaSur and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Mexico/General b/lib/tzdata/zoneinfo/Mexico/General
deleted file mode 100644
index 18112346..00000000
Binary files a/lib/tzdata/zoneinfo/Mexico/General and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Mexico/__init__.py b/lib/tzdata/zoneinfo/Mexico/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/tzdata/zoneinfo/NZ b/lib/tzdata/zoneinfo/NZ
deleted file mode 100644
index afb39293..00000000
Binary files a/lib/tzdata/zoneinfo/NZ and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/NZ-CHAT b/lib/tzdata/zoneinfo/NZ-CHAT
deleted file mode 100644
index f06065eb..00000000
Binary files a/lib/tzdata/zoneinfo/NZ-CHAT and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Navajo b/lib/tzdata/zoneinfo/Navajo
deleted file mode 100644
index 09e54e5c..00000000
Binary files a/lib/tzdata/zoneinfo/Navajo and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/PRC b/lib/tzdata/zoneinfo/PRC
deleted file mode 100644
index d6b66984..00000000
Binary files a/lib/tzdata/zoneinfo/PRC and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/PST8PDT b/lib/tzdata/zoneinfo/PST8PDT
deleted file mode 100644
index aaf07787..00000000
Binary files a/lib/tzdata/zoneinfo/PST8PDT and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Apia b/lib/tzdata/zoneinfo/Pacific/Apia
deleted file mode 100644
index a6b835aa..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Apia and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Auckland b/lib/tzdata/zoneinfo/Pacific/Auckland
deleted file mode 100644
index afb39293..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Auckland and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Bougainville b/lib/tzdata/zoneinfo/Pacific/Bougainville
deleted file mode 100644
index 7c667093..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Bougainville and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Chatham b/lib/tzdata/zoneinfo/Pacific/Chatham
deleted file mode 100644
index f06065eb..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Chatham and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Chuuk b/lib/tzdata/zoneinfo/Pacific/Chuuk
deleted file mode 100644
index 5d8fc3a1..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Chuuk and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Easter b/lib/tzdata/zoneinfo/Pacific/Easter
deleted file mode 100644
index 54dff005..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Easter and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Efate b/lib/tzdata/zoneinfo/Pacific/Efate
deleted file mode 100644
index bf7471dd..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Efate and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Enderbury b/lib/tzdata/zoneinfo/Pacific/Enderbury
deleted file mode 100644
index 2b6a0608..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Enderbury and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Fakaofo b/lib/tzdata/zoneinfo/Pacific/Fakaofo
deleted file mode 100644
index b7b30213..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Fakaofo and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Fiji b/lib/tzdata/zoneinfo/Pacific/Fiji
deleted file mode 100644
index 610b850b..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Fiji and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Funafuti b/lib/tzdata/zoneinfo/Pacific/Funafuti
deleted file mode 100644
index 6bc21682..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Funafuti and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Galapagos b/lib/tzdata/zoneinfo/Pacific/Galapagos
deleted file mode 100644
index a9403eca..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Galapagos and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Gambier b/lib/tzdata/zoneinfo/Pacific/Gambier
deleted file mode 100644
index ddfc34ff..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Gambier and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Guadalcanal b/lib/tzdata/zoneinfo/Pacific/Guadalcanal
deleted file mode 100644
index 720c6790..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Guadalcanal and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Guam b/lib/tzdata/zoneinfo/Pacific/Guam
deleted file mode 100644
index bf9a2d95..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Guam and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Honolulu b/lib/tzdata/zoneinfo/Pacific/Honolulu
deleted file mode 100644
index 40e3d492..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Honolulu and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Johnston b/lib/tzdata/zoneinfo/Pacific/Johnston
deleted file mode 100644
index 40e3d492..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Johnston and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Kanton b/lib/tzdata/zoneinfo/Pacific/Kanton
deleted file mode 100644
index 2b6a0608..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Kanton and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Kiritimati b/lib/tzdata/zoneinfo/Pacific/Kiritimati
deleted file mode 100644
index 2f676d3b..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Kiritimati and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Kosrae b/lib/tzdata/zoneinfo/Pacific/Kosrae
deleted file mode 100644
index f5d58242..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Kosrae and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Kwajalein b/lib/tzdata/zoneinfo/Pacific/Kwajalein
deleted file mode 100644
index 9416d522..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Kwajalein and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Majuro b/lib/tzdata/zoneinfo/Pacific/Majuro
deleted file mode 100644
index 6bc21682..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Majuro and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Marquesas b/lib/tzdata/zoneinfo/Pacific/Marquesas
deleted file mode 100644
index 6ea24b72..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Marquesas and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Midway b/lib/tzdata/zoneinfo/Pacific/Midway
deleted file mode 100644
index 001289ce..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Midway and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Nauru b/lib/tzdata/zoneinfo/Pacific/Nauru
deleted file mode 100644
index ae13aac7..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Nauru and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Niue b/lib/tzdata/zoneinfo/Pacific/Niue
deleted file mode 100644
index be874e24..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Niue and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Norfolk b/lib/tzdata/zoneinfo/Pacific/Norfolk
deleted file mode 100644
index 0c0bdbda..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Norfolk and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Noumea b/lib/tzdata/zoneinfo/Pacific/Noumea
deleted file mode 100644
index 824f8141..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Noumea and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Pago_Pago b/lib/tzdata/zoneinfo/Pacific/Pago_Pago
deleted file mode 100644
index 001289ce..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Pago_Pago and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Palau b/lib/tzdata/zoneinfo/Pacific/Palau
deleted file mode 100644
index bc8eb7a5..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Palau and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Pitcairn b/lib/tzdata/zoneinfo/Pacific/Pitcairn
deleted file mode 100644
index 8a4ba4d3..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Pitcairn and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Pohnpei b/lib/tzdata/zoneinfo/Pacific/Pohnpei
deleted file mode 100644
index 720c6790..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Pohnpei and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Ponape b/lib/tzdata/zoneinfo/Pacific/Ponape
deleted file mode 100644
index 720c6790..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Ponape and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Port_Moresby b/lib/tzdata/zoneinfo/Pacific/Port_Moresby
deleted file mode 100644
index 5d8fc3a1..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Port_Moresby and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Rarotonga b/lib/tzdata/zoneinfo/Pacific/Rarotonga
deleted file mode 100644
index 7220bda0..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Rarotonga and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Saipan b/lib/tzdata/zoneinfo/Pacific/Saipan
deleted file mode 100644
index bf9a2d95..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Saipan and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Samoa b/lib/tzdata/zoneinfo/Pacific/Samoa
deleted file mode 100644
index 001289ce..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Samoa and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Tahiti b/lib/tzdata/zoneinfo/Pacific/Tahiti
deleted file mode 100644
index 50a064fa..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Tahiti and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Tarawa b/lib/tzdata/zoneinfo/Pacific/Tarawa
deleted file mode 100644
index 6bc21682..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Tarawa and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Tongatapu b/lib/tzdata/zoneinfo/Pacific/Tongatapu
deleted file mode 100644
index f28c8401..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Tongatapu and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Truk b/lib/tzdata/zoneinfo/Pacific/Truk
deleted file mode 100644
index 5d8fc3a1..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Truk and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Wake b/lib/tzdata/zoneinfo/Pacific/Wake
deleted file mode 100644
index 6bc21682..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Wake and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Wallis b/lib/tzdata/zoneinfo/Pacific/Wallis
deleted file mode 100644
index 6bc21682..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Wallis and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/Yap b/lib/tzdata/zoneinfo/Pacific/Yap
deleted file mode 100644
index 5d8fc3a1..00000000
Binary files a/lib/tzdata/zoneinfo/Pacific/Yap and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Pacific/__init__.py b/lib/tzdata/zoneinfo/Pacific/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/tzdata/zoneinfo/Poland b/lib/tzdata/zoneinfo/Poland
deleted file mode 100644
index efe1a40f..00000000
Binary files a/lib/tzdata/zoneinfo/Poland and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Portugal b/lib/tzdata/zoneinfo/Portugal
deleted file mode 100644
index 7e9aae72..00000000
Binary files a/lib/tzdata/zoneinfo/Portugal and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/ROC b/lib/tzdata/zoneinfo/ROC
deleted file mode 100644
index 35d89d03..00000000
Binary files a/lib/tzdata/zoneinfo/ROC and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/ROK b/lib/tzdata/zoneinfo/ROK
deleted file mode 100644
index 1755147f..00000000
Binary files a/lib/tzdata/zoneinfo/ROK and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Singapore b/lib/tzdata/zoneinfo/Singapore
deleted file mode 100644
index dbbdea3c..00000000
Binary files a/lib/tzdata/zoneinfo/Singapore and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Turkey b/lib/tzdata/zoneinfo/Turkey
deleted file mode 100644
index c8918668..00000000
Binary files a/lib/tzdata/zoneinfo/Turkey and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/UCT b/lib/tzdata/zoneinfo/UCT
deleted file mode 100644
index 00841a62..00000000
Binary files a/lib/tzdata/zoneinfo/UCT and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/US/Alaska b/lib/tzdata/zoneinfo/US/Alaska
deleted file mode 100644
index cdf0572b..00000000
Binary files a/lib/tzdata/zoneinfo/US/Alaska and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/US/Aleutian b/lib/tzdata/zoneinfo/US/Aleutian
deleted file mode 100644
index b1497bda..00000000
Binary files a/lib/tzdata/zoneinfo/US/Aleutian and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/US/Arizona b/lib/tzdata/zoneinfo/US/Arizona
deleted file mode 100644
index c2bd2f94..00000000
Binary files a/lib/tzdata/zoneinfo/US/Arizona and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/US/Central b/lib/tzdata/zoneinfo/US/Central
deleted file mode 100644
index b0168806..00000000
Binary files a/lib/tzdata/zoneinfo/US/Central and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/US/East-Indiana b/lib/tzdata/zoneinfo/US/East-Indiana
deleted file mode 100644
index 6b08d15b..00000000
Binary files a/lib/tzdata/zoneinfo/US/East-Indiana and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/US/Eastern b/lib/tzdata/zoneinfo/US/Eastern
deleted file mode 100644
index 2b6c2eea..00000000
Binary files a/lib/tzdata/zoneinfo/US/Eastern and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/US/Hawaii b/lib/tzdata/zoneinfo/US/Hawaii
deleted file mode 100644
index 40e3d492..00000000
Binary files a/lib/tzdata/zoneinfo/US/Hawaii and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/US/Indiana-Starke b/lib/tzdata/zoneinfo/US/Indiana-Starke
deleted file mode 100644
index b187d5f8..00000000
Binary files a/lib/tzdata/zoneinfo/US/Indiana-Starke and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/US/Michigan b/lib/tzdata/zoneinfo/US/Michigan
deleted file mode 100644
index 6eb3ac46..00000000
Binary files a/lib/tzdata/zoneinfo/US/Michigan and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/US/Mountain b/lib/tzdata/zoneinfo/US/Mountain
deleted file mode 100644
index 09e54e5c..00000000
Binary files a/lib/tzdata/zoneinfo/US/Mountain and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/US/Pacific b/lib/tzdata/zoneinfo/US/Pacific
deleted file mode 100644
index aaf07787..00000000
Binary files a/lib/tzdata/zoneinfo/US/Pacific and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/US/Samoa b/lib/tzdata/zoneinfo/US/Samoa
deleted file mode 100644
index 001289ce..00000000
Binary files a/lib/tzdata/zoneinfo/US/Samoa and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/US/__init__.py b/lib/tzdata/zoneinfo/US/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/tzdata/zoneinfo/UTC b/lib/tzdata/zoneinfo/UTC
deleted file mode 100644
index 00841a62..00000000
Binary files a/lib/tzdata/zoneinfo/UTC and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Universal b/lib/tzdata/zoneinfo/Universal
deleted file mode 100644
index 00841a62..00000000
Binary files a/lib/tzdata/zoneinfo/Universal and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/W-SU b/lib/tzdata/zoneinfo/W-SU
deleted file mode 100644
index 5e6b6de6..00000000
Binary files a/lib/tzdata/zoneinfo/W-SU and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/WET b/lib/tzdata/zoneinfo/WET
deleted file mode 100644
index 7e9aae72..00000000
Binary files a/lib/tzdata/zoneinfo/WET and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/Zulu b/lib/tzdata/zoneinfo/Zulu
deleted file mode 100644
index 00841a62..00000000
Binary files a/lib/tzdata/zoneinfo/Zulu and /dev/null differ
diff --git a/lib/tzdata/zoneinfo/__init__.py b/lib/tzdata/zoneinfo/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/tzdata/zoneinfo/iso3166.tab b/lib/tzdata/zoneinfo/iso3166.tab
deleted file mode 100644
index 402c015e..00000000
--- a/lib/tzdata/zoneinfo/iso3166.tab
+++ /dev/null
@@ -1,279 +0,0 @@
-# ISO 3166 alpha-2 country codes
-#
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-#
-# From Paul Eggert (2023-09-06):
-# This file contains a table of two-letter country codes.  Columns are
-# separated by a single tab.  Lines beginning with '#' are comments.
-# All text uses UTF-8 encoding.  The columns of the table are as follows:
-#
-# 1.  ISO 3166-1 alpha-2 country code, current as of
-#     ISO/TC 46 N1108 (2023-04-05).  See: ISO/TC 46 Documents
-#     https://www.iso.org/committee/48750.html?view=documents
-# 2.  The usual English name for the coded region.  This sometimes
-#     departs from ISO-listed names, sometimes so that sorted subsets
-#     of names are useful (e.g., "Samoa (American)" and "Samoa
-#     (western)" rather than "American Samoa" and "Samoa"),
-#     sometimes to avoid confusion among non-experts (e.g.,
-#     "Czech Republic" and "Turkey" rather than "Czechia" and "Türkiye"),
-#     and sometimes to omit needless detail or churn (e.g., "Netherlands"
-#     rather than "Netherlands (the)" or "Netherlands (Kingdom of the)").
-#
-# The table is sorted by country code.
-#
-# This table is intended as an aid for users, to help them select time
-# zone data appropriate for their practical needs.  It is not intended
-# to take or endorse any position on legal or territorial claims.
-#
-#country-
-#code	name of country, territory, area, or subdivision
-AD	Andorra
-AE	United Arab Emirates
-AF	Afghanistan
-AG	Antigua & Barbuda
-AI	Anguilla
-AL	Albania
-AM	Armenia
-AO	Angola
-AQ	Antarctica
-AR	Argentina
-AS	Samoa (American)
-AT	Austria
-AU	Australia
-AW	Aruba
-AX	Ã…land Islands
-AZ	Azerbaijan
-BA	Bosnia & Herzegovina
-BB	Barbados
-BD	Bangladesh
-BE	Belgium
-BF	Burkina Faso
-BG	Bulgaria
-BH	Bahrain
-BI	Burundi
-BJ	Benin
-BL	St Barthelemy
-BM	Bermuda
-BN	Brunei
-BO	Bolivia
-BQ	Caribbean NL
-BR	Brazil
-BS	Bahamas
-BT	Bhutan
-BV	Bouvet Island
-BW	Botswana
-BY	Belarus
-BZ	Belize
-CA	Canada
-CC	Cocos (Keeling) Islands
-CD	Congo (Dem. Rep.)
-CF	Central African Rep.
-CG	Congo (Rep.)
-CH	Switzerland
-CI	Côte d'Ivoire
-CK	Cook Islands
-CL	Chile
-CM	Cameroon
-CN	China
-CO	Colombia
-CR	Costa Rica
-CU	Cuba
-CV	Cape Verde
-CW	Curaçao
-CX	Christmas Island
-CY	Cyprus
-CZ	Czech Republic
-DE	Germany
-DJ	Djibouti
-DK	Denmark
-DM	Dominica
-DO	Dominican Republic
-DZ	Algeria
-EC	Ecuador
-EE	Estonia
-EG	Egypt
-EH	Western Sahara
-ER	Eritrea
-ES	Spain
-ET	Ethiopia
-FI	Finland
-FJ	Fiji
-FK	Falkland Islands
-FM	Micronesia
-FO	Faroe Islands
-FR	France
-GA	Gabon
-GB	Britain (UK)
-GD	Grenada
-GE	Georgia
-GF	French Guiana
-GG	Guernsey
-GH	Ghana
-GI	Gibraltar
-GL	Greenland
-GM	Gambia
-GN	Guinea
-GP	Guadeloupe
-GQ	Equatorial Guinea
-GR	Greece
-GS	South Georgia & the South Sandwich Islands
-GT	Guatemala
-GU	Guam
-GW	Guinea-Bissau
-GY	Guyana
-HK	Hong Kong
-HM	Heard Island & McDonald Islands
-HN	Honduras
-HR	Croatia
-HT	Haiti
-HU	Hungary
-ID	Indonesia
-IE	Ireland
-IL	Israel
-IM	Isle of Man
-IN	India
-IO	British Indian Ocean Territory
-IQ	Iraq
-IR	Iran
-IS	Iceland
-IT	Italy
-JE	Jersey
-JM	Jamaica
-JO	Jordan
-JP	Japan
-KE	Kenya
-KG	Kyrgyzstan
-KH	Cambodia
-KI	Kiribati
-KM	Comoros
-KN	St Kitts & Nevis
-KP	Korea (North)
-KR	Korea (South)
-KW	Kuwait
-KY	Cayman Islands
-KZ	Kazakhstan
-LA	Laos
-LB	Lebanon
-LC	St Lucia
-LI	Liechtenstein
-LK	Sri Lanka
-LR	Liberia
-LS	Lesotho
-LT	Lithuania
-LU	Luxembourg
-LV	Latvia
-LY	Libya
-MA	Morocco
-MC	Monaco
-MD	Moldova
-ME	Montenegro
-MF	St Martin (French)
-MG	Madagascar
-MH	Marshall Islands
-MK	North Macedonia
-ML	Mali
-MM	Myanmar (Burma)
-MN	Mongolia
-MO	Macau
-MP	Northern Mariana Islands
-MQ	Martinique
-MR	Mauritania
-MS	Montserrat
-MT	Malta
-MU	Mauritius
-MV	Maldives
-MW	Malawi
-MX	Mexico
-MY	Malaysia
-MZ	Mozambique
-NA	Namibia
-NC	New Caledonia
-NE	Niger
-NF	Norfolk Island
-NG	Nigeria
-NI	Nicaragua
-NL	Netherlands
-NO	Norway
-NP	Nepal
-NR	Nauru
-NU	Niue
-NZ	New Zealand
-OM	Oman
-PA	Panama
-PE	Peru
-PF	French Polynesia
-PG	Papua New Guinea
-PH	Philippines
-PK	Pakistan
-PL	Poland
-PM	St Pierre & Miquelon
-PN	Pitcairn
-PR	Puerto Rico
-PS	Palestine
-PT	Portugal
-PW	Palau
-PY	Paraguay
-QA	Qatar
-RE	Réunion
-RO	Romania
-RS	Serbia
-RU	Russia
-RW	Rwanda
-SA	Saudi Arabia
-SB	Solomon Islands
-SC	Seychelles
-SD	Sudan
-SE	Sweden
-SG	Singapore
-SH	St Helena
-SI	Slovenia
-SJ	Svalbard & Jan Mayen
-SK	Slovakia
-SL	Sierra Leone
-SM	San Marino
-SN	Senegal
-SO	Somalia
-SR	Suriname
-SS	South Sudan
-ST	Sao Tome & Principe
-SV	El Salvador
-SX	St Maarten (Dutch)
-SY	Syria
-SZ	Eswatini (Swaziland)
-TC	Turks & Caicos Is
-TD	Chad
-TF	French S. Terr.
-TG	Togo
-TH	Thailand
-TJ	Tajikistan
-TK	Tokelau
-TL	East Timor
-TM	Turkmenistan
-TN	Tunisia
-TO	Tonga
-TR	Turkey
-TT	Trinidad & Tobago
-TV	Tuvalu
-TW	Taiwan
-TZ	Tanzania
-UA	Ukraine
-UG	Uganda
-UM	US minor outlying islands
-US	United States
-UY	Uruguay
-UZ	Uzbekistan
-VA	Vatican City
-VC	St Vincent
-VE	Venezuela
-VG	Virgin Islands (UK)
-VI	Virgin Islands (US)
-VN	Vietnam
-VU	Vanuatu
-WF	Wallis & Futuna
-WS	Samoa (western)
-YE	Yemen
-YT	Mayotte
-ZA	South Africa
-ZM	Zambia
-ZW	Zimbabwe
diff --git a/lib/tzdata/zoneinfo/leapseconds b/lib/tzdata/zoneinfo/leapseconds
deleted file mode 100644
index 6c715cb2..00000000
--- a/lib/tzdata/zoneinfo/leapseconds
+++ /dev/null
@@ -1,79 +0,0 @@
-# Allowance for leap seconds added to each time zone file.
-
-# This file is in the public domain.
-
-# This file is generated automatically from the data in the public-domain
-# NIST/IERS format leap-seconds.list file, which can be copied from
-# <https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list>
-# or, in a variant with different comments, from
-# <ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.list>.
-# For more about leap-seconds.list, please see
-# The NTP Timescale and Leap Seconds
-# <https://www.eecis.udel.edu/~mills/leap.html>.
-
-# The rules for leap seconds are specified in Annex 1 (Time scales) of:
-# Standard-frequency and time-signal emissions.
-# International Telecommunication Union - Radiocommunication Sector
-# (ITU-R) Recommendation TF.460-6 (02/2002)
-# <https://www.itu.int/rec/R-REC-TF.460-6-200202-I/>.
-# The International Earth Rotation and Reference Systems Service (IERS)
-# periodically uses leap seconds to keep UTC to within 0.9 s of UT1
-# (a proxy for Earth's angle in space as measured by astronomers)
-# and publishes leap second data in a copyrighted file
-# <https://hpiers.obspm.fr/iers/bul/bulc/Leap_Second.dat>.
-# See: Levine J. Coordinated Universal Time and the leap second.
-# URSI Radio Sci Bull. 2016;89(4):30-6. doi:10.23919/URSIRSB.2016.7909995
-# <https://ieeexplore.ieee.org/document/7909995>.
-
-# There were no leap seconds before 1972, as no official mechanism
-# accounted for the discrepancy between atomic time (TAI) and the earth's
-# rotation.  The first ("1 Jan 1972") data line in leap-seconds.list
-# does not denote a leap second; it denotes the start of the current definition
-# of UTC.
-
-# All leap-seconds are Stationary (S) at the given UTC time.
-# The correction (+ or -) is made at the given time, so in the unlikely
-# event of a negative leap second, a line would look like this:
-# Leap	YEAR	MON	DAY	23:59:59	-	S
-# Typical lines look like this:
-# Leap	YEAR	MON	DAY	23:59:60	+	S
-Leap	1972	Jun	30	23:59:60	+	S
-Leap	1972	Dec	31	23:59:60	+	S
-Leap	1973	Dec	31	23:59:60	+	S
-Leap	1974	Dec	31	23:59:60	+	S
-Leap	1975	Dec	31	23:59:60	+	S
-Leap	1976	Dec	31	23:59:60	+	S
-Leap	1977	Dec	31	23:59:60	+	S
-Leap	1978	Dec	31	23:59:60	+	S
-Leap	1979	Dec	31	23:59:60	+	S
-Leap	1981	Jun	30	23:59:60	+	S
-Leap	1982	Jun	30	23:59:60	+	S
-Leap	1983	Jun	30	23:59:60	+	S
-Leap	1985	Jun	30	23:59:60	+	S
-Leap	1987	Dec	31	23:59:60	+	S
-Leap	1989	Dec	31	23:59:60	+	S
-Leap	1990	Dec	31	23:59:60	+	S
-Leap	1992	Jun	30	23:59:60	+	S
-Leap	1993	Jun	30	23:59:60	+	S
-Leap	1994	Jun	30	23:59:60	+	S
-Leap	1995	Dec	31	23:59:60	+	S
-Leap	1997	Jun	30	23:59:60	+	S
-Leap	1998	Dec	31	23:59:60	+	S
-Leap	2005	Dec	31	23:59:60	+	S
-Leap	2008	Dec	31	23:59:60	+	S
-Leap	2012	Jun	30	23:59:60	+	S
-Leap	2015	Jun	30	23:59:60	+	S
-Leap	2016	Dec	31	23:59:60	+	S
-
-# UTC timestamp when this leap second list expires.
-# Any additional leap seconds will come after this.
-# This Expires line is commented out for now,
-# so that pre-2020a zic implementations do not reject this file.
-#Expires 2025	Jun	28	00:00:00
-
-# POSIX timestamps for the data in this file:
-#updated 1720104763 (2024-07-04 14:52:43 UTC)
-#expires 1751068800 (2025-06-28 00:00:00 UTC)
-
-#	Updated through IERS Bulletin C (https://hpiers.obspm.fr/iers/bul/bulc/bulletinc.dat)
-#	File expires on 28 June 2025
diff --git a/lib/tzdata/zoneinfo/tzdata.zi b/lib/tzdata/zoneinfo/tzdata.zi
deleted file mode 100644
index 62e78bb8..00000000
--- a/lib/tzdata/zoneinfo/tzdata.zi
+++ /dev/null
@@ -1,4281 +0,0 @@
-# version 2024b
-# This zic input file is in the public domain.
-R d 1916 o - Jun 14 23s 1 S
-R d 1916 1919 - O Su>=1 23s 0 -
-R d 1917 o - Mar 24 23s 1 S
-R d 1918 o - Mar 9 23s 1 S
-R d 1919 o - Mar 1 23s 1 S
-R d 1920 o - F 14 23s 1 S
-R d 1920 o - O 23 23s 0 -
-R d 1921 o - Mar 14 23s 1 S
-R d 1921 o - Jun 21 23s 0 -
-R d 1939 o - S 11 23s 1 S
-R d 1939 o - N 19 1 0 -
-R d 1944 1945 - Ap M>=1 2 1 S
-R d 1944 o - O 8 2 0 -
-R d 1945 o - S 16 1 0 -
-R d 1971 o - Ap 25 23s 1 S
-R d 1971 o - S 26 23s 0 -
-R d 1977 o - May 6 0 1 S
-R d 1977 o - O 21 0 0 -
-R d 1978 o - Mar 24 1 1 S
-R d 1978 o - S 22 3 0 -
-R d 1980 o - Ap 25 0 1 S
-R d 1980 o - O 31 2 0 -
-R K 1940 o - Jul 15 0 1 S
-R K 1940 o - O 1 0 0 -
-R K 1941 o - Ap 15 0 1 S
-R K 1941 o - S 16 0 0 -
-R K 1942 1944 - Ap 1 0 1 S
-R K 1942 o - O 27 0 0 -
-R K 1943 1945 - N 1 0 0 -
-R K 1945 o - Ap 16 0 1 S
-R K 1957 o - May 10 0 1 S
-R K 1957 1958 - O 1 0 0 -
-R K 1958 o - May 1 0 1 S
-R K 1959 1981 - May 1 1 1 S
-R K 1959 1965 - S 30 3 0 -
-R K 1966 1994 - O 1 3 0 -
-R K 1982 o - Jul 25 1 1 S
-R K 1983 o - Jul 12 1 1 S
-R K 1984 1988 - May 1 1 1 S
-R K 1989 o - May 6 1 1 S
-R K 1990 1994 - May 1 1 1 S
-R K 1995 2010 - Ap lastF 0s 1 S
-R K 1995 2005 - S lastTh 24 0 -
-R K 2006 o - S 21 24 0 -
-R K 2007 o - S Th>=1 24 0 -
-R K 2008 o - Au lastTh 24 0 -
-R K 2009 o - Au 20 24 0 -
-R K 2010 o - Au 10 24 0 -
-R K 2010 o - S 9 24 1 S
-R K 2010 o - S lastTh 24 0 -
-R K 2014 o - May 15 24 1 S
-R K 2014 o - Jun 26 24 0 -
-R K 2014 o - Jul 31 24 1 S
-R K 2014 o - S lastTh 24 0 -
-R K 2023 ma - Ap lastF 0 1 S
-R K 2023 ma - O lastTh 24 0 -
-R L 1951 o - O 14 2 1 S
-R L 1952 o - Ja 1 0 0 -
-R L 1953 o - O 9 2 1 S
-R L 1954 o - Ja 1 0 0 -
-R L 1955 o - S 30 0 1 S
-R L 1956 o - Ja 1 0 0 -
-R L 1982 1984 - Ap 1 0 1 S
-R L 1982 1985 - O 1 0 0 -
-R L 1985 o - Ap 6 0 1 S
-R L 1986 o - Ap 4 0 1 S
-R L 1986 o - O 3 0 0 -
-R L 1987 1989 - Ap 1 0 1 S
-R L 1987 1989 - O 1 0 0 -
-R L 1997 o - Ap 4 0 1 S
-R L 1997 o - O 4 0 0 -
-R L 2013 o - Mar lastF 1 1 S
-R L 2013 o - O lastF 2 0 -
-R MU 1982 o - O 10 0 1 -
-R MU 1983 o - Mar 21 0 0 -
-R MU 2008 o - O lastSu 2 1 -
-R MU 2009 o - Mar lastSu 2 0 -
-R M 1939 o - S 12 0 1 -
-R M 1939 o - N 19 0 0 -
-R M 1940 o - F 25 0 1 -
-R M 1945 o - N 18 0 0 -
-R M 1950 o - Jun 11 0 1 -
-R M 1950 o - O 29 0 0 -
-R M 1967 o - Jun 3 12 1 -
-R M 1967 o - O 1 0 0 -
-R M 1974 o - Jun 24 0 1 -
-R M 1974 o - S 1 0 0 -
-R M 1976 1977 - May 1 0 1 -
-R M 1976 o - Au 1 0 0 -
-R M 1977 o - S 28 0 0 -
-R M 1978 o - Jun 1 0 1 -
-R M 1978 o - Au 4 0 0 -
-R M 2008 o - Jun 1 0 1 -
-R M 2008 o - S 1 0 0 -
-R M 2009 o - Jun 1 0 1 -
-R M 2009 o - Au 21 0 0 -
-R M 2010 o - May 2 0 1 -
-R M 2010 o - Au 8 0 0 -
-R M 2011 o - Ap 3 0 1 -
-R M 2011 o - Jul 31 0 0 -
-R M 2012 2013 - Ap lastSu 2 1 -
-R M 2012 o - Jul 20 3 0 -
-R M 2012 o - Au 20 2 1 -
-R M 2012 o - S 30 3 0 -
-R M 2013 o - Jul 7 3 0 -
-R M 2013 o - Au 10 2 1 -
-R M 2013 2018 - O lastSu 3 0 -
-R M 2014 2018 - Mar lastSu 2 1 -
-R M 2014 o - Jun 28 3 0 -
-R M 2014 o - Au 2 2 1 -
-R M 2015 o - Jun 14 3 0 -
-R M 2015 o - Jul 19 2 1 -
-R M 2016 o - Jun 5 3 0 -
-R M 2016 o - Jul 10 2 1 -
-R M 2017 o - May 21 3 0 -
-R M 2017 o - Jul 2 2 1 -
-R M 2018 o - May 13 3 0 -
-R M 2018 o - Jun 17 2 1 -
-R M 2019 o - May 5 3 -1 -
-R M 2019 o - Jun 9 2 0 -
-R M 2020 o - Ap 19 3 -1 -
-R M 2020 o - May 31 2 0 -
-R M 2021 o - Ap 11 3 -1 -
-R M 2021 o - May 16 2 0 -
-R M 2022 o - Mar 27 3 -1 -
-R M 2022 o - May 8 2 0 -
-R M 2023 o - Mar 19 3 -1 -
-R M 2023 o - Ap 23 2 0 -
-R M 2024 o - Mar 10 3 -1 -
-R M 2024 o - Ap 14 2 0 -
-R M 2025 o - F 23 3 -1 -
-R M 2025 o - Ap 6 2 0 -
-R M 2026 o - F 15 3 -1 -
-R M 2026 o - Mar 22 2 0 -
-R M 2027 o - F 7 3 -1 -
-R M 2027 o - Mar 14 2 0 -
-R M 2028 o - Ja 23 3 -1 -
-R M 2028 o - Mar 5 2 0 -
-R M 2029 o - Ja 14 3 -1 -
-R M 2029 o - F 18 2 0 -
-R M 2029 o - D 30 3 -1 -
-R M 2030 o - F 10 2 0 -
-R M 2030 o - D 22 3 -1 -
-R M 2031 o - Ja 26 2 0 -
-R M 2031 o - D 14 3 -1 -
-R M 2032 o - Ja 18 2 0 -
-R M 2032 o - N 28 3 -1 -
-R M 2033 o - Ja 9 2 0 -
-R M 2033 o - N 20 3 -1 -
-R M 2033 o - D 25 2 0 -
-R M 2034 o - N 5 3 -1 -
-R M 2034 o - D 17 2 0 -
-R M 2035 o - O 28 3 -1 -
-R M 2035 o - D 9 2 0 -
-R M 2036 o - O 19 3 -1 -
-R M 2036 o - N 23 2 0 -
-R M 2037 o - O 4 3 -1 -
-R M 2037 o - N 15 2 0 -
-R M 2038 o - S 26 3 -1 -
-R M 2038 o - O 31 2 0 -
-R M 2039 o - S 18 3 -1 -
-R M 2039 o - O 23 2 0 -
-R M 2040 o - S 2 3 -1 -
-R M 2040 o - O 14 2 0 -
-R M 2041 o - Au 25 3 -1 -
-R M 2041 o - S 29 2 0 -
-R M 2042 o - Au 10 3 -1 -
-R M 2042 o - S 21 2 0 -
-R M 2043 o - Au 2 3 -1 -
-R M 2043 o - S 13 2 0 -
-R M 2044 o - Jul 24 3 -1 -
-R M 2044 o - Au 28 2 0 -
-R M 2045 o - Jul 9 3 -1 -
-R M 2045 o - Au 20 2 0 -
-R M 2046 o - Jul 1 3 -1 -
-R M 2046 o - Au 5 2 0 -
-R M 2047 o - Jun 23 3 -1 -
-R M 2047 o - Jul 28 2 0 -
-R M 2048 o - Jun 7 3 -1 -
-R M 2048 o - Jul 19 2 0 -
-R M 2049 o - May 30 3 -1 -
-R M 2049 o - Jul 4 2 0 -
-R M 2050 o - May 15 3 -1 -
-R M 2050 o - Jun 26 2 0 -
-R M 2051 o - May 7 3 -1 -
-R M 2051 o - Jun 18 2 0 -
-R M 2052 o - Ap 28 3 -1 -
-R M 2052 o - Jun 2 2 0 -
-R M 2053 o - Ap 13 3 -1 -
-R M 2053 o - May 25 2 0 -
-R M 2054 o - Ap 5 3 -1 -
-R M 2054 o - May 10 2 0 -
-R M 2055 o - Mar 28 3 -1 -
-R M 2055 o - May 2 2 0 -
-R M 2056 o - Mar 12 3 -1 -
-R M 2056 o - Ap 23 2 0 -
-R M 2057 o - Mar 4 3 -1 -
-R M 2057 o - Ap 8 2 0 -
-R M 2058 o - F 17 3 -1 -
-R M 2058 o - Mar 31 2 0 -
-R M 2059 o - F 9 3 -1 -
-R M 2059 o - Mar 23 2 0 -
-R M 2060 o - F 1 3 -1 -
-R M 2060 o - Mar 7 2 0 -
-R M 2061 o - Ja 16 3 -1 -
-R M 2061 o - F 27 2 0 -
-R M 2062 o - Ja 8 3 -1 -
-R M 2062 o - F 12 2 0 -
-R M 2062 o - D 31 3 -1 -
-R M 2063 o - F 4 2 0 -
-R M 2063 o - D 16 3 -1 -
-R M 2064 o - Ja 27 2 0 -
-R M 2064 o - D 7 3 -1 -
-R M 2065 o - Ja 11 2 0 -
-R M 2065 o - N 22 3 -1 -
-R M 2066 o - Ja 3 2 0 -
-R M 2066 o - N 14 3 -1 -
-R M 2066 o - D 26 2 0 -
-R M 2067 o - N 6 3 -1 -
-R M 2067 o - D 11 2 0 -
-R M 2068 o - O 21 3 -1 -
-R M 2068 o - D 2 2 0 -
-R M 2069 o - O 13 3 -1 -
-R M 2069 o - N 17 2 0 -
-R M 2070 o - O 5 3 -1 -
-R M 2070 o - N 9 2 0 -
-R M 2071 o - S 20 3 -1 -
-R M 2071 o - N 1 2 0 -
-R M 2072 o - S 11 3 -1 -
-R M 2072 o - O 16 2 0 -
-R M 2073 o - Au 27 3 -1 -
-R M 2073 o - O 8 2 0 -
-R M 2074 o - Au 19 3 -1 -
-R M 2074 o - S 30 2 0 -
-R M 2075 o - Au 11 3 -1 -
-R M 2075 o - S 15 2 0 -
-R M 2076 o - Jul 26 3 -1 -
-R M 2076 o - S 6 2 0 -
-R M 2077 o - Jul 18 3 -1 -
-R M 2077 o - Au 22 2 0 -
-R M 2078 o - Jul 10 3 -1 -
-R M 2078 o - Au 14 2 0 -
-R M 2079 o - Jun 25 3 -1 -
-R M 2079 o - Au 6 2 0 -
-R M 2080 o - Jun 16 3 -1 -
-R M 2080 o - Jul 21 2 0 -
-R M 2081 o - Jun 1 3 -1 -
-R M 2081 o - Jul 13 2 0 -
-R M 2082 o - May 24 3 -1 -
-R M 2082 o - Jun 28 2 0 -
-R M 2083 o - May 16 3 -1 -
-R M 2083 o - Jun 20 2 0 -
-R M 2084 o - Ap 30 3 -1 -
-R M 2084 o - Jun 11 2 0 -
-R M 2085 o - Ap 22 3 -1 -
-R M 2085 o - May 27 2 0 -
-R M 2086 o - Ap 14 3 -1 -
-R M 2086 o - May 19 2 0 -
-R M 2087 o - Mar 30 3 -1 -
-R M 2087 o - May 11 2 0 -
-R NA 1994 o - Mar 21 0 -1 WAT
-R NA 1994 2017 - S Su>=1 2 0 CAT
-R NA 1995 2017 - Ap Su>=1 2 -1 WAT
-R SA 1942 1943 - S Su>=15 2 1 -
-R SA 1943 1944 - Mar Su>=15 2 0 -
-R SD 1970 o - May 1 0 1 S
-R SD 1970 1985 - O 15 0 0 -
-R SD 1971 o - Ap 30 0 1 S
-R SD 1972 1985 - Ap lastSu 0 1 S
-R n 1939 o - Ap 15 23s 1 S
-R n 1939 o - N 18 23s 0 -
-R n 1940 o - F 25 23s 1 S
-R n 1941 o - O 6 0 0 -
-R n 1942 o - Mar 9 0 1 S
-R n 1942 o - N 2 3 0 -
-R n 1943 o - Mar 29 2 1 S
-R n 1943 o - Ap 17 2 0 -
-R n 1943 o - Ap 25 2 1 S
-R n 1943 o - O 4 2 0 -
-R n 1944 1945 - Ap M>=1 2 1 S
-R n 1944 o - O 8 0 0 -
-R n 1945 o - S 16 0 0 -
-R n 1977 o - Ap 30 0s 1 S
-R n 1977 o - S 24 0s 0 -
-R n 1978 o - May 1 0s 1 S
-R n 1978 o - O 1 0s 0 -
-R n 1988 o - Jun 1 0s 1 S
-R n 1988 1990 - S lastSu 0s 0 -
-R n 1989 o - Mar 26 0s 1 S
-R n 1990 o - May 1 0s 1 S
-R n 2005 o - May 1 0s 1 S
-R n 2005 o - S 30 1s 0 -
-R n 2006 2008 - Mar lastSu 2s 1 S
-R n 2006 2008 - O lastSu 2s 0 -
-R Tr 2005 ma - Mar lastSu 1u 2 +02
-R Tr 2004 ma - O lastSu 1u 0 +00
-R AM 2011 o - Mar lastSu 2s 1 -
-R AM 2011 o - O lastSu 2s 0 -
-R AZ 1997 2015 - Mar lastSu 4 1 -
-R AZ 1997 2015 - O lastSu 5 0 -
-R BD 2009 o - Jun 19 23 1 -
-R BD 2009 o - D 31 24 0 -
-R Sh 1919 o - Ap 12 24 1 D
-R Sh 1919 o - S 30 24 0 S
-R Sh 1940 o - Jun 1 0 1 D
-R Sh 1940 o - O 12 24 0 S
-R Sh 1941 o - Mar 15 0 1 D
-R Sh 1941 o - N 1 24 0 S
-R Sh 1942 o - Ja 31 0 1 D
-R Sh 1945 o - S 1 24 0 S
-R Sh 1946 o - May 15 0 1 D
-R Sh 1946 o - S 30 24 0 S
-R Sh 1947 o - Ap 15 0 1 D
-R Sh 1947 o - O 31 24 0 S
-R Sh 1948 1949 - May 1 0 1 D
-R Sh 1948 1949 - S 30 24 0 S
-R CN 1986 o - May 4 2 1 D
-R CN 1986 1991 - S Su>=11 2 0 S
-R CN 1987 1991 - Ap Su>=11 2 1 D
-R HK 1946 o - Ap 21 0 1 S
-R HK 1946 o - D 1 3:30s 0 -
-R HK 1947 o - Ap 13 3:30s 1 S
-R HK 1947 o - N 30 3:30s 0 -
-R HK 1948 o - May 2 3:30s 1 S
-R HK 1948 1952 - O Su>=28 3:30s 0 -
-R HK 1949 1953 - Ap Su>=1 3:30 1 S
-R HK 1953 1964 - O Su>=31 3:30 0 -
-R HK 1954 1964 - Mar Su>=18 3:30 1 S
-R HK 1965 1976 - Ap Su>=16 3:30 1 S
-R HK 1965 1976 - O Su>=16 3:30 0 -
-R HK 1973 o - D 30 3:30 1 S
-R HK 1979 o - May 13 3:30 1 S
-R HK 1979 o - O 21 3:30 0 -
-R f 1946 o - May 15 0 1 D
-R f 1946 o - O 1 0 0 S
-R f 1947 o - Ap 15 0 1 D
-R f 1947 o - N 1 0 0 S
-R f 1948 1951 - May 1 0 1 D
-R f 1948 1951 - O 1 0 0 S
-R f 1952 o - Mar 1 0 1 D
-R f 1952 1954 - N 1 0 0 S
-R f 1953 1959 - Ap 1 0 1 D
-R f 1955 1961 - O 1 0 0 S
-R f 1960 1961 - Jun 1 0 1 D
-R f 1974 1975 - Ap 1 0 1 D
-R f 1974 1975 - O 1 0 0 S
-R f 1979 o - Jul 1 0 1 D
-R f 1979 o - O 1 0 0 S
-R _ 1942 1943 - Ap 30 23 1 -
-R _ 1942 o - N 17 23 0 -
-R _ 1943 o - S 30 23 0 S
-R _ 1946 o - Ap 30 23s 1 D
-R _ 1946 o - S 30 23s 0 S
-R _ 1947 o - Ap 19 23s 1 D
-R _ 1947 o - N 30 23s 0 S
-R _ 1948 o - May 2 23s 1 D
-R _ 1948 o - O 31 23s 0 S
-R _ 1949 1950 - Ap Sa>=1 23s 1 D
-R _ 1949 1950 - O lastSa 23s 0 S
-R _ 1951 o - Mar 31 23s 1 D
-R _ 1951 o - O 28 23s 0 S
-R _ 1952 1953 - Ap Sa>=1 23s 1 D
-R _ 1952 o - N 1 23s 0 S
-R _ 1953 1954 - O lastSa 23s 0 S
-R _ 1954 1956 - Mar Sa>=17 23s 1 D
-R _ 1955 o - N 5 23s 0 S
-R _ 1956 1964 - N Su>=1 3:30 0 S
-R _ 1957 1964 - Mar Su>=18 3:30 1 D
-R _ 1965 1973 - Ap Su>=16 3:30 1 D
-R _ 1965 1966 - O Su>=16 2:30 0 S
-R _ 1967 1976 - O Su>=16 3:30 0 S
-R _ 1973 o - D 30 3:30 1 D
-R _ 1975 1976 - Ap Su>=16 3:30 1 D
-R _ 1979 o - May 13 3:30 1 D
-R _ 1979 o - O Su>=16 3:30 0 S
-R CY 1975 o - Ap 13 0 1 S
-R CY 1975 o - O 12 0 0 -
-R CY 1976 o - May 15 0 1 S
-R CY 1976 o - O 11 0 0 -
-R CY 1977 1980 - Ap Su>=1 0 1 S
-R CY 1977 o - S 25 0 0 -
-R CY 1978 o - O 2 0 0 -
-R CY 1979 1997 - S lastSu 0 0 -
-R CY 1981 1998 - Mar lastSu 0 1 S
-R i 1910 o - Ja 1 0 0 -
-R i 1977 o - Mar 21 23 1 -
-R i 1977 o - O 20 24 0 -
-R i 1978 o - Mar 24 24 1 -
-R i 1978 o - Au 5 1 0 -
-R i 1979 o - May 26 24 1 -
-R i 1979 o - S 18 24 0 -
-R i 1980 o - Mar 20 24 1 -
-R i 1980 o - S 22 24 0 -
-R i 1991 o - May 2 24 1 -
-R i 1992 1995 - Mar 21 24 1 -
-R i 1991 1995 - S 21 24 0 -
-R i 1996 o - Mar 20 24 1 -
-R i 1996 o - S 20 24 0 -
-R i 1997 1999 - Mar 21 24 1 -
-R i 1997 1999 - S 21 24 0 -
-R i 2000 o - Mar 20 24 1 -
-R i 2000 o - S 20 24 0 -
-R i 2001 2003 - Mar 21 24 1 -
-R i 2001 2003 - S 21 24 0 -
-R i 2004 o - Mar 20 24 1 -
-R i 2004 o - S 20 24 0 -
-R i 2005 o - Mar 21 24 1 -
-R i 2005 o - S 21 24 0 -
-R i 2008 o - Mar 20 24 1 -
-R i 2008 o - S 20 24 0 -
-R i 2009 2011 - Mar 21 24 1 -
-R i 2009 2011 - S 21 24 0 -
-R i 2012 o - Mar 20 24 1 -
-R i 2012 o - S 20 24 0 -
-R i 2013 2015 - Mar 21 24 1 -
-R i 2013 2015 - S 21 24 0 -
-R i 2016 o - Mar 20 24 1 -
-R i 2016 o - S 20 24 0 -
-R i 2017 2019 - Mar 21 24 1 -
-R i 2017 2019 - S 21 24 0 -
-R i 2020 o - Mar 20 24 1 -
-R i 2020 o - S 20 24 0 -
-R i 2021 2022 - Mar 21 24 1 -
-R i 2021 2022 - S 21 24 0 -
-R IQ 1982 o - May 1 0 1 -
-R IQ 1982 1984 - O 1 0 0 -
-R IQ 1983 o - Mar 31 0 1 -
-R IQ 1984 1985 - Ap 1 0 1 -
-R IQ 1985 1990 - S lastSu 1s 0 -
-R IQ 1986 1990 - Mar lastSu 1s 1 -
-R IQ 1991 2007 - Ap 1 3s 1 -
-R IQ 1991 2007 - O 1 3s 0 -
-R Z 1940 o - May 31 24u 1 D
-R Z 1940 o - S 30 24u 0 S
-R Z 1940 o - N 16 24u 1 D
-R Z 1942 1946 - O 31 24u 0 S
-R Z 1943 1944 - Mar 31 24u 1 D
-R Z 1945 1946 - Ap 15 24u 1 D
-R Z 1948 o - May 22 24u 2 DD
-R Z 1948 o - Au 31 24u 1 D
-R Z 1948 1949 - O 31 24u 0 S
-R Z 1949 o - Ap 30 24u 1 D
-R Z 1950 o - Ap 15 24u 1 D
-R Z 1950 o - S 14 24u 0 S
-R Z 1951 o - Mar 31 24u 1 D
-R Z 1951 o - N 10 24u 0 S
-R Z 1952 o - Ap 19 24u 1 D
-R Z 1952 o - O 18 24u 0 S
-R Z 1953 o - Ap 11 24u 1 D
-R Z 1953 o - S 12 24u 0 S
-R Z 1954 o - Jun 12 24u 1 D
-R Z 1954 o - S 11 24u 0 S
-R Z 1955 o - Jun 11 24u 1 D
-R Z 1955 o - S 10 24u 0 S
-R Z 1956 o - Jun 2 24u 1 D
-R Z 1956 o - S 29 24u 0 S
-R Z 1957 o - Ap 27 24u 1 D
-R Z 1957 o - S 21 24u 0 S
-R Z 1974 o - Jul 6 24 1 D
-R Z 1974 o - O 12 24 0 S
-R Z 1975 o - Ap 19 24 1 D
-R Z 1975 o - Au 30 24 0 S
-R Z 1980 o - Au 2 24s 1 D
-R Z 1980 o - S 13 24s 0 S
-R Z 1984 o - May 5 24s 1 D
-R Z 1984 o - Au 25 24s 0 S
-R Z 1985 o - Ap 13 24 1 D
-R Z 1985 o - Au 31 24 0 S
-R Z 1986 o - May 17 24 1 D
-R Z 1986 o - S 6 24 0 S
-R Z 1987 o - Ap 14 24 1 D
-R Z 1987 o - S 12 24 0 S
-R Z 1988 o - Ap 9 24 1 D
-R Z 1988 o - S 3 24 0 S
-R Z 1989 o - Ap 29 24 1 D
-R Z 1989 o - S 2 24 0 S
-R Z 1990 o - Mar 24 24 1 D
-R Z 1990 o - Au 25 24 0 S
-R Z 1991 o - Mar 23 24 1 D
-R Z 1991 o - Au 31 24 0 S
-R Z 1992 o - Mar 28 24 1 D
-R Z 1992 o - S 5 24 0 S
-R Z 1993 o - Ap 2 0 1 D
-R Z 1993 o - S 5 0 0 S
-R Z 1994 o - Ap 1 0 1 D
-R Z 1994 o - Au 28 0 0 S
-R Z 1995 o - Mar 31 0 1 D
-R Z 1995 o - S 3 0 0 S
-R Z 1996 o - Mar 14 24 1 D
-R Z 1996 o - S 15 24 0 S
-R Z 1997 o - Mar 20 24 1 D
-R Z 1997 o - S 13 24 0 S
-R Z 1998 o - Mar 20 0 1 D
-R Z 1998 o - S 6 0 0 S
-R Z 1999 o - Ap 2 2 1 D
-R Z 1999 o - S 3 2 0 S
-R Z 2000 o - Ap 14 2 1 D
-R Z 2000 o - O 6 1 0 S
-R Z 2001 o - Ap 9 1 1 D
-R Z 2001 o - S 24 1 0 S
-R Z 2002 o - Mar 29 1 1 D
-R Z 2002 o - O 7 1 0 S
-R Z 2003 o - Mar 28 1 1 D
-R Z 2003 o - O 3 1 0 S
-R Z 2004 o - Ap 7 1 1 D
-R Z 2004 o - S 22 1 0 S
-R Z 2005 2012 - Ap F<=1 2 1 D
-R Z 2005 o - O 9 2 0 S
-R Z 2006 o - O 1 2 0 S
-R Z 2007 o - S 16 2 0 S
-R Z 2008 o - O 5 2 0 S
-R Z 2009 o - S 27 2 0 S
-R Z 2010 o - S 12 2 0 S
-R Z 2011 o - O 2 2 0 S
-R Z 2012 o - S 23 2 0 S
-R Z 2013 ma - Mar F>=23 2 1 D
-R Z 2013 ma - O lastSu 2 0 S
-R JP 1948 o - May Sa>=1 24 1 D
-R JP 1948 1951 - S Sa>=8 25 0 S
-R JP 1949 o - Ap Sa>=1 24 1 D
-R JP 1950 1951 - May Sa>=1 24 1 D
-R J 1973 o - Jun 6 0 1 S
-R J 1973 1975 - O 1 0 0 -
-R J 1974 1977 - May 1 0 1 S
-R J 1976 o - N 1 0 0 -
-R J 1977 o - O 1 0 0 -
-R J 1978 o - Ap 30 0 1 S
-R J 1978 o - S 30 0 0 -
-R J 1985 o - Ap 1 0 1 S
-R J 1985 o - O 1 0 0 -
-R J 1986 1988 - Ap F>=1 0 1 S
-R J 1986 1990 - O F>=1 0 0 -
-R J 1989 o - May 8 0 1 S
-R J 1990 o - Ap 27 0 1 S
-R J 1991 o - Ap 17 0 1 S
-R J 1991 o - S 27 0 0 -
-R J 1992 o - Ap 10 0 1 S
-R J 1992 1993 - O F>=1 0 0 -
-R J 1993 1998 - Ap F>=1 0 1 S
-R J 1994 o - S F>=15 0 0 -
-R J 1995 1998 - S F>=15 0s 0 -
-R J 1999 o - Jul 1 0s 1 S
-R J 1999 2002 - S lastF 0s 0 -
-R J 2000 2001 - Mar lastTh 0s 1 S
-R J 2002 2012 - Mar lastTh 24 1 S
-R J 2003 o - O 24 0s 0 -
-R J 2004 o - O 15 0s 0 -
-R J 2005 o - S lastF 0s 0 -
-R J 2006 2011 - O lastF 0s 0 -
-R J 2013 o - D 20 0 0 -
-R J 2014 2021 - Mar lastTh 24 1 S
-R J 2014 2022 - O lastF 0s 0 -
-R J 2022 o - F lastTh 24 1 S
-R KG 1992 1996 - Ap Su>=7 0s 1 -
-R KG 1992 1996 - S lastSu 0 0 -
-R KG 1997 2005 - Mar lastSu 2:30 1 -
-R KG 1997 2004 - O lastSu 2:30 0 -
-R KR 1948 o - Jun 1 0 1 D
-R KR 1948 o - S 12 24 0 S
-R KR 1949 o - Ap 3 0 1 D
-R KR 1949 1951 - S Sa>=7 24 0 S
-R KR 1950 o - Ap 1 0 1 D
-R KR 1951 o - May 6 0 1 D
-R KR 1955 o - May 5 0 1 D
-R KR 1955 o - S 8 24 0 S
-R KR 1956 o - May 20 0 1 D
-R KR 1956 o - S 29 24 0 S
-R KR 1957 1960 - May Su>=1 0 1 D
-R KR 1957 1960 - S Sa>=17 24 0 S
-R KR 1987 1988 - May Su>=8 2 1 D
-R KR 1987 1988 - O Su>=8 3 0 S
-R l 1920 o - Mar 28 0 1 S
-R l 1920 o - O 25 0 0 -
-R l 1921 o - Ap 3 0 1 S
-R l 1921 o - O 3 0 0 -
-R l 1922 o - Mar 26 0 1 S
-R l 1922 o - O 8 0 0 -
-R l 1923 o - Ap 22 0 1 S
-R l 1923 o - S 16 0 0 -
-R l 1957 1961 - May 1 0 1 S
-R l 1957 1961 - O 1 0 0 -
-R l 1972 o - Jun 22 0 1 S
-R l 1972 1977 - O 1 0 0 -
-R l 1973 1977 - May 1 0 1 S
-R l 1978 o - Ap 30 0 1 S
-R l 1978 o - S 30 0 0 -
-R l 1984 1987 - May 1 0 1 S
-R l 1984 1991 - O 16 0 0 -
-R l 1988 o - Jun 1 0 1 S
-R l 1989 o - May 10 0 1 S
-R l 1990 1992 - May 1 0 1 S
-R l 1992 o - O 4 0 0 -
-R l 1993 ma - Mar lastSu 0 1 S
-R l 1993 1998 - S lastSu 0 0 -
-R l 1999 ma - O lastSu 0 0 -
-R NB 1935 1941 - S 14 0 0:20 -
-R NB 1935 1941 - D 14 0 0 -
-R X 1983 1984 - Ap 1 0 1 -
-R X 1983 o - O 1 0 0 -
-R X 1985 1998 - Mar lastSu 0 1 -
-R X 1984 1998 - S lastSu 0 0 -
-R X 2001 o - Ap lastSa 2 1 -
-R X 2001 2006 - S lastSa 2 0 -
-R X 2002 2006 - Mar lastSa 2 1 -
-R X 2015 2016 - Mar lastSa 2 1 -
-R X 2015 2016 - S lastSa 0 0 -
-R PK 2002 o - Ap Su>=2 0 1 S
-R PK 2002 o - O Su>=2 0 0 -
-R PK 2008 o - Jun 1 0 1 S
-R PK 2008 2009 - N 1 0 0 -
-R PK 2009 o - Ap 15 0 1 S
-R P 1999 2005 - Ap F>=15 0 1 S
-R P 1999 2003 - O F>=15 0 0 -
-R P 2004 o - O 1 1 0 -
-R P 2005 o - O 4 2 0 -
-R P 2006 2007 - Ap 1 0 1 S
-R P 2006 o - S 22 0 0 -
-R P 2007 o - S 13 2 0 -
-R P 2008 2009 - Mar lastF 0 1 S
-R P 2008 o - S 1 0 0 -
-R P 2009 o - S 4 1 0 -
-R P 2010 o - Mar 26 0 1 S
-R P 2010 o - Au 11 0 0 -
-R P 2011 o - Ap 1 0:1 1 S
-R P 2011 o - Au 1 0 0 -
-R P 2011 o - Au 30 0 1 S
-R P 2011 o - S 30 0 0 -
-R P 2012 2014 - Mar lastTh 24 1 S
-R P 2012 o - S 21 1 0 -
-R P 2013 o - S 27 0 0 -
-R P 2014 o - O 24 0 0 -
-R P 2015 o - Mar 28 0 1 S
-R P 2015 o - O 23 1 0 -
-R P 2016 2018 - Mar Sa<=30 1 1 S
-R P 2016 2018 - O Sa<=30 1 0 -
-R P 2019 o - Mar 29 0 1 S
-R P 2019 o - O Sa<=30 0 0 -
-R P 2020 2021 - Mar Sa<=30 0 1 S
-R P 2020 o - O 24 1 0 -
-R P 2021 o - O 29 1 0 -
-R P 2022 o - Mar 27 0 1 S
-R P 2022 2035 - O Sa<=30 2 0 -
-R P 2023 o - Ap 29 2 1 S
-R P 2024 o - Ap 20 2 1 S
-R P 2025 o - Ap 12 2 1 S
-R P 2026 2054 - Mar Sa<=30 2 1 S
-R P 2036 o - O 18 2 0 -
-R P 2037 o - O 10 2 0 -
-R P 2038 o - S 25 2 0 -
-R P 2039 o - S 17 2 0 -
-R P 2040 o - S 1 2 0 -
-R P 2040 o - O 20 2 1 S
-R P 2040 2067 - O Sa<=30 2 0 -
-R P 2041 o - Au 24 2 0 -
-R P 2041 o - O 5 2 1 S
-R P 2042 o - Au 16 2 0 -
-R P 2042 o - S 27 2 1 S
-R P 2043 o - Au 1 2 0 -
-R P 2043 o - S 19 2 1 S
-R P 2044 o - Jul 23 2 0 -
-R P 2044 o - S 3 2 1 S
-R P 2045 o - Jul 15 2 0 -
-R P 2045 o - Au 26 2 1 S
-R P 2046 o - Jun 30 2 0 -
-R P 2046 o - Au 18 2 1 S
-R P 2047 o - Jun 22 2 0 -
-R P 2047 o - Au 3 2 1 S
-R P 2048 o - Jun 6 2 0 -
-R P 2048 o - Jul 25 2 1 S
-R P 2049 o - May 29 2 0 -
-R P 2049 o - Jul 10 2 1 S
-R P 2050 o - May 21 2 0 -
-R P 2050 o - Jul 2 2 1 S
-R P 2051 o - May 6 2 0 -
-R P 2051 o - Jun 24 2 1 S
-R P 2052 o - Ap 27 2 0 -
-R P 2052 o - Jun 8 2 1 S
-R P 2053 o - Ap 12 2 0 -
-R P 2053 o - May 31 2 1 S
-R P 2054 o - Ap 4 2 0 -
-R P 2054 o - May 23 2 1 S
-R P 2055 o - May 8 2 1 S
-R P 2056 o - Ap 29 2 1 S
-R P 2057 o - Ap 14 2 1 S
-R P 2058 o - Ap 6 2 1 S
-R P 2059 ma - Mar Sa<=30 2 1 S
-R P 2068 o - O 20 2 0 -
-R P 2069 o - O 12 2 0 -
-R P 2070 o - O 4 2 0 -
-R P 2071 o - S 19 2 0 -
-R P 2072 o - S 10 2 0 -
-R P 2072 o - O 22 2 1 S
-R P 2072 ma - O Sa<=30 2 0 -
-R P 2073 o - S 2 2 0 -
-R P 2073 o - O 14 2 1 S
-R P 2074 o - Au 18 2 0 -
-R P 2074 o - O 6 2 1 S
-R P 2075 o - Au 10 2 0 -
-R P 2075 o - S 21 2 1 S
-R P 2076 o - Jul 25 2 0 -
-R P 2076 o - S 12 2 1 S
-R P 2077 o - Jul 17 2 0 -
-R P 2077 o - S 4 2 1 S
-R P 2078 o - Jul 9 2 0 -
-R P 2078 o - Au 20 2 1 S
-R P 2079 o - Jun 24 2 0 -
-R P 2079 o - Au 12 2 1 S
-R P 2080 o - Jun 15 2 0 -
-R P 2080 o - Jul 27 2 1 S
-R P 2081 o - Jun 7 2 0 -
-R P 2081 o - Jul 19 2 1 S
-R P 2082 o - May 23 2 0 -
-R P 2082 o - Jul 11 2 1 S
-R P 2083 o - May 15 2 0 -
-R P 2083 o - Jun 26 2 1 S
-R P 2084 o - Ap 29 2 0 -
-R P 2084 o - Jun 17 2 1 S
-R P 2085 o - Ap 21 2 0 -
-R P 2085 o - Jun 9 2 1 S
-R P 2086 o - Ap 13 2 0 -
-R P 2086 o - May 25 2 1 S
-R PH 1936 o - N 1 0 1 D
-R PH 1937 o - F 1 0 0 S
-R PH 1954 o - Ap 12 0 1 D
-R PH 1954 o - Jul 1 0 0 S
-R PH 1978 o - Mar 22 0 1 D
-R PH 1978 o - S 21 0 0 S
-R S 1920 1923 - Ap Su>=15 2 1 S
-R S 1920 1923 - O Su>=1 2 0 -
-R S 1962 o - Ap 29 2 1 S
-R S 1962 o - O 1 2 0 -
-R S 1963 1965 - May 1 2 1 S
-R S 1963 o - S 30 2 0 -
-R S 1964 o - O 1 2 0 -
-R S 1965 o - S 30 2 0 -
-R S 1966 o - Ap 24 2 1 S
-R S 1966 1976 - O 1 2 0 -
-R S 1967 1978 - May 1 2 1 S
-R S 1977 1978 - S 1 2 0 -
-R S 1983 1984 - Ap 9 2 1 S
-R S 1983 1984 - O 1 2 0 -
-R S 1986 o - F 16 2 1 S
-R S 1986 o - O 9 2 0 -
-R S 1987 o - Mar 1 2 1 S
-R S 1987 1988 - O 31 2 0 -
-R S 1988 o - Mar 15 2 1 S
-R S 1989 o - Mar 31 2 1 S
-R S 1989 o - O 1 2 0 -
-R S 1990 o - Ap 1 2 1 S
-R S 1990 o - S 30 2 0 -
-R S 1991 o - Ap 1 0 1 S
-R S 1991 1992 - O 1 0 0 -
-R S 1992 o - Ap 8 0 1 S
-R S 1993 o - Mar 26 0 1 S
-R S 1993 o - S 25 0 0 -
-R S 1994 1996 - Ap 1 0 1 S
-R S 1994 2005 - O 1 0 0 -
-R S 1997 1998 - Mar lastM 0 1 S
-R S 1999 2006 - Ap 1 0 1 S
-R S 2006 o - S 22 0 0 -
-R S 2007 o - Mar lastF 0 1 S
-R S 2007 o - N F>=1 0 0 -
-R S 2008 o - Ap F>=1 0 1 S
-R S 2008 o - N 1 0 0 -
-R S 2009 o - Mar lastF 0 1 S
-R S 2010 2011 - Ap F>=1 0 1 S
-R S 2012 2022 - Mar lastF 0 1 S
-R S 2009 2022 - O lastF 0 0 -
-R AU 1917 o - Ja 1 2s 1 D
-R AU 1917 o - Mar lastSu 2s 0 S
-R AU 1942 o - Ja 1 2s 1 D
-R AU 1942 o - Mar lastSu 2s 0 S
-R AU 1942 o - S 27 2s 1 D
-R AU 1943 1944 - Mar lastSu 2s 0 S
-R AU 1943 o - O 3 2s 1 D
-R AW 1974 o - O lastSu 2s 1 D
-R AW 1975 o - Mar Su>=1 2s 0 S
-R AW 1983 o - O lastSu 2s 1 D
-R AW 1984 o - Mar Su>=1 2s 0 S
-R AW 1991 o - N 17 2s 1 D
-R AW 1992 o - Mar Su>=1 2s 0 S
-R AW 2006 o - D 3 2s 1 D
-R AW 2007 2009 - Mar lastSu 2s 0 S
-R AW 2007 2008 - O lastSu 2s 1 D
-R AQ 1971 o - O lastSu 2s 1 D
-R AQ 1972 o - F lastSu 2s 0 S
-R AQ 1989 1991 - O lastSu 2s 1 D
-R AQ 1990 1992 - Mar Su>=1 2s 0 S
-R Ho 1992 1993 - O lastSu 2s 1 D
-R Ho 1993 1994 - Mar Su>=1 2s 0 S
-R AS 1971 1985 - O lastSu 2s 1 D
-R AS 1986 o - O 19 2s 1 D
-R AS 1987 2007 - O lastSu 2s 1 D
-R AS 1972 o - F 27 2s 0 S
-R AS 1973 1985 - Mar Su>=1 2s 0 S
-R AS 1986 1990 - Mar Su>=15 2s 0 S
-R AS 1991 o - Mar 3 2s 0 S
-R AS 1992 o - Mar 22 2s 0 S
-R AS 1993 o - Mar 7 2s 0 S
-R AS 1994 o - Mar 20 2s 0 S
-R AS 1995 2005 - Mar lastSu 2s 0 S
-R AS 2006 o - Ap 2 2s 0 S
-R AS 2007 o - Mar lastSu 2s 0 S
-R AS 2008 ma - Ap Su>=1 2s 0 S
-R AS 2008 ma - O Su>=1 2s 1 D
-R AT 1916 o - O Su>=1 2s 1 D
-R AT 1917 o - Mar lastSu 2s 0 S
-R AT 1917 1918 - O Su>=22 2s 1 D
-R AT 1918 1919 - Mar Su>=1 2s 0 S
-R AT 1967 o - O Su>=1 2s 1 D
-R AT 1968 o - Mar Su>=29 2s 0 S
-R AT 1968 1985 - O lastSu 2s 1 D
-R AT 1969 1971 - Mar Su>=8 2s 0 S
-R AT 1972 o - F lastSu 2s 0 S
-R AT 1973 1981 - Mar Su>=1 2s 0 S
-R AT 1982 1983 - Mar lastSu 2s 0 S
-R AT 1984 1986 - Mar Su>=1 2s 0 S
-R AT 1986 o - O Su>=15 2s 1 D
-R AT 1987 1990 - Mar Su>=15 2s 0 S
-R AT 1987 o - O Su>=22 2s 1 D
-R AT 1988 1990 - O lastSu 2s 1 D
-R AT 1991 1999 - O Su>=1 2s 1 D
-R AT 1991 2005 - Mar lastSu 2s 0 S
-R AT 2000 o - Au lastSu 2s 1 D
-R AT 2001 ma - O Su>=1 2s 1 D
-R AT 2006 o - Ap Su>=1 2s 0 S
-R AT 2007 o - Mar lastSu 2s 0 S
-R AT 2008 ma - Ap Su>=1 2s 0 S
-R AV 1971 1985 - O lastSu 2s 1 D
-R AV 1972 o - F lastSu 2s 0 S
-R AV 1973 1985 - Mar Su>=1 2s 0 S
-R AV 1986 1990 - Mar Su>=15 2s 0 S
-R AV 1986 1987 - O Su>=15 2s 1 D
-R AV 1988 1999 - O lastSu 2s 1 D
-R AV 1991 1994 - Mar Su>=1 2s 0 S
-R AV 1995 2005 - Mar lastSu 2s 0 S
-R AV 2000 o - Au lastSu 2s 1 D
-R AV 2001 2007 - O lastSu 2s 1 D
-R AV 2006 o - Ap Su>=1 2s 0 S
-R AV 2007 o - Mar lastSu 2s 0 S
-R AV 2008 ma - Ap Su>=1 2s 0 S
-R AV 2008 ma - O Su>=1 2s 1 D
-R AN 1971 1985 - O lastSu 2s 1 D
-R AN 1972 o - F 27 2s 0 S
-R AN 1973 1981 - Mar Su>=1 2s 0 S
-R AN 1982 o - Ap Su>=1 2s 0 S
-R AN 1983 1985 - Mar Su>=1 2s 0 S
-R AN 1986 1989 - Mar Su>=15 2s 0 S
-R AN 1986 o - O 19 2s 1 D
-R AN 1987 1999 - O lastSu 2s 1 D
-R AN 1990 1995 - Mar Su>=1 2s 0 S
-R AN 1996 2005 - Mar lastSu 2s 0 S
-R AN 2000 o - Au lastSu 2s 1 D
-R AN 2001 2007 - O lastSu 2s 1 D
-R AN 2006 o - Ap Su>=1 2s 0 S
-R AN 2007 o - Mar lastSu 2s 0 S
-R AN 2008 ma - Ap Su>=1 2s 0 S
-R AN 2008 ma - O Su>=1 2s 1 D
-R LH 1981 1984 - O lastSu 2 1 -
-R LH 1982 1985 - Mar Su>=1 2 0 -
-R LH 1985 o - O lastSu 2 0:30 -
-R LH 1986 1989 - Mar Su>=15 2 0 -
-R LH 1986 o - O 19 2 0:30 -
-R LH 1987 1999 - O lastSu 2 0:30 -
-R LH 1990 1995 - Mar Su>=1 2 0 -
-R LH 1996 2005 - Mar lastSu 2 0 -
-R LH 2000 o - Au lastSu 2 0:30 -
-R LH 2001 2007 - O lastSu 2 0:30 -
-R LH 2006 o - Ap Su>=1 2 0 -
-R LH 2007 o - Mar lastSu 2 0 -
-R LH 2008 ma - Ap Su>=1 2 0 -
-R LH 2008 ma - O Su>=1 2 0:30 -
-R FJ 1998 1999 - N Su>=1 2 1 -
-R FJ 1999 2000 - F lastSu 3 0 -
-R FJ 2009 o - N 29 2 1 -
-R FJ 2010 o - Mar lastSu 3 0 -
-R FJ 2010 2013 - O Su>=21 2 1 -
-R FJ 2011 o - Mar Su>=1 3 0 -
-R FJ 2012 2013 - Ja Su>=18 3 0 -
-R FJ 2014 o - Ja Su>=18 2 0 -
-R FJ 2014 2018 - N Su>=1 2 1 -
-R FJ 2015 2021 - Ja Su>=12 3 0 -
-R FJ 2019 o - N Su>=8 2 1 -
-R FJ 2020 o - D 20 2 1 -
-R Gu 1959 o - Jun 27 2 1 D
-R Gu 1961 o - Ja 29 2 0 S
-R Gu 1967 o - S 1 2 1 D
-R Gu 1969 o - Ja 26 0:1 0 S
-R Gu 1969 o - Jun 22 2 1 D
-R Gu 1969 o - Au 31 2 0 S
-R Gu 1970 1971 - Ap lastSu 2 1 D
-R Gu 1970 1971 - S Su>=1 2 0 S
-R Gu 1973 o - D 16 2 1 D
-R Gu 1974 o - F 24 2 0 S
-R Gu 1976 o - May 26 2 1 D
-R Gu 1976 o - Au 22 2:1 0 S
-R Gu 1977 o - Ap 24 2 1 D
-R Gu 1977 o - Au 28 2 0 S
-R NC 1977 1978 - D Su>=1 0 1 -
-R NC 1978 1979 - F 27 0 0 -
-R NC 1996 o - D 1 2s 1 -
-R NC 1997 o - Mar 2 2s 0 -
-R NZ 1927 o - N 6 2 1 S
-R NZ 1928 o - Mar 4 2 0 M
-R NZ 1928 1933 - O Su>=8 2 0:30 S
-R NZ 1929 1933 - Mar Su>=15 2 0 M
-R NZ 1934 1940 - Ap lastSu 2 0 M
-R NZ 1934 1940 - S lastSu 2 0:30 S
-R NZ 1946 o - Ja 1 0 0 S
-R NZ 1974 o - N Su>=1 2s 1 D
-R k 1974 o - N Su>=1 2:45s 1 -
-R NZ 1975 o - F lastSu 2s 0 S
-R k 1975 o - F lastSu 2:45s 0 -
-R NZ 1975 1988 - O lastSu 2s 1 D
-R k 1975 1988 - O lastSu 2:45s 1 -
-R NZ 1976 1989 - Mar Su>=1 2s 0 S
-R k 1976 1989 - Mar Su>=1 2:45s 0 -
-R NZ 1989 o - O Su>=8 2s 1 D
-R k 1989 o - O Su>=8 2:45s 1 -
-R NZ 1990 2006 - O Su>=1 2s 1 D
-R k 1990 2006 - O Su>=1 2:45s 1 -
-R NZ 1990 2007 - Mar Su>=15 2s 0 S
-R k 1990 2007 - Mar Su>=15 2:45s 0 -
-R NZ 2007 ma - S lastSu 2s 1 D
-R k 2007 ma - S lastSu 2:45s 1 -
-R NZ 2008 ma - Ap Su>=1 2s 0 S
-R k 2008 ma - Ap Su>=1 2:45s 0 -
-R CK 1978 o - N 12 0 0:30 -
-R CK 1979 1991 - Mar Su>=1 0 0 -
-R CK 1979 1990 - O lastSu 0 0:30 -
-R WS 2010 o - S lastSu 0 1 -
-R WS 2011 o - Ap Sa>=1 4 0 -
-R WS 2011 o - S lastSa 3 1 -
-R WS 2012 2021 - Ap Su>=1 4 0 -
-R WS 2012 2020 - S lastSu 3 1 -
-R TO 1999 o - O 7 2s 1 -
-R TO 2000 o - Mar 19 2s 0 -
-R TO 2000 2001 - N Su>=1 2 1 -
-R TO 2001 2002 - Ja lastSu 2 0 -
-R TO 2016 o - N Su>=1 2 1 -
-R TO 2017 o - Ja Su>=15 3 0 -
-R VU 1973 o - D 22 12u 1 -
-R VU 1974 o - Mar 30 12u 0 -
-R VU 1983 1991 - S Sa>=22 24 1 -
-R VU 1984 1991 - Mar Sa>=22 24 0 -
-R VU 1992 1993 - Ja Sa>=22 24 0 -
-R VU 1992 o - O Sa>=22 24 1 -
-R G 1916 o - May 21 2s 1 BST
-R G 1916 o - O 1 2s 0 GMT
-R G 1917 o - Ap 8 2s 1 BST
-R G 1917 o - S 17 2s 0 GMT
-R G 1918 o - Mar 24 2s 1 BST
-R G 1918 o - S 30 2s 0 GMT
-R G 1919 o - Mar 30 2s 1 BST
-R G 1919 o - S 29 2s 0 GMT
-R G 1920 o - Mar 28 2s 1 BST
-R G 1920 o - O 25 2s 0 GMT
-R G 1921 o - Ap 3 2s 1 BST
-R G 1921 o - O 3 2s 0 GMT
-R G 1922 o - Mar 26 2s 1 BST
-R G 1922 o - O 8 2s 0 GMT
-R G 1923 o - Ap Su>=16 2s 1 BST
-R G 1923 1924 - S Su>=16 2s 0 GMT
-R G 1924 o - Ap Su>=9 2s 1 BST
-R G 1925 1926 - Ap Su>=16 2s 1 BST
-R G 1925 1938 - O Su>=2 2s 0 GMT
-R G 1927 o - Ap Su>=9 2s 1 BST
-R G 1928 1929 - Ap Su>=16 2s 1 BST
-R G 1930 o - Ap Su>=9 2s 1 BST
-R G 1931 1932 - Ap Su>=16 2s 1 BST
-R G 1933 o - Ap Su>=9 2s 1 BST
-R G 1934 o - Ap Su>=16 2s 1 BST
-R G 1935 o - Ap Su>=9 2s 1 BST
-R G 1936 1937 - Ap Su>=16 2s 1 BST
-R G 1938 o - Ap Su>=9 2s 1 BST
-R G 1939 o - Ap Su>=16 2s 1 BST
-R G 1939 o - N Su>=16 2s 0 GMT
-R G 1940 o - F Su>=23 2s 1 BST
-R G 1941 o - May Su>=2 1s 2 BDST
-R G 1941 1943 - Au Su>=9 1s 1 BST
-R G 1942 1944 - Ap Su>=2 1s 2 BDST
-R G 1944 o - S Su>=16 1s 1 BST
-R G 1945 o - Ap M>=2 1s 2 BDST
-R G 1945 o - Jul Su>=9 1s 1 BST
-R G 1945 1946 - O Su>=2 2s 0 GMT
-R G 1946 o - Ap Su>=9 2s 1 BST
-R G 1947 o - Mar 16 2s 1 BST
-R G 1947 o - Ap 13 1s 2 BDST
-R G 1947 o - Au 10 1s 1 BST
-R G 1947 o - N 2 2s 0 GMT
-R G 1948 o - Mar 14 2s 1 BST
-R G 1948 o - O 31 2s 0 GMT
-R G 1949 o - Ap 3 2s 1 BST
-R G 1949 o - O 30 2s 0 GMT
-R G 1950 1952 - Ap Su>=14 2s 1 BST
-R G 1950 1952 - O Su>=21 2s 0 GMT
-R G 1953 o - Ap Su>=16 2s 1 BST
-R G 1953 1960 - O Su>=2 2s 0 GMT
-R G 1954 o - Ap Su>=9 2s 1 BST
-R G 1955 1956 - Ap Su>=16 2s 1 BST
-R G 1957 o - Ap Su>=9 2s 1 BST
-R G 1958 1959 - Ap Su>=16 2s 1 BST
-R G 1960 o - Ap Su>=9 2s 1 BST
-R G 1961 1963 - Mar lastSu 2s 1 BST
-R G 1961 1968 - O Su>=23 2s 0 GMT
-R G 1964 1967 - Mar Su>=19 2s 1 BST
-R G 1968 o - F 18 2s 1 BST
-R G 1972 1980 - Mar Su>=16 2s 1 BST
-R G 1972 1980 - O Su>=23 2s 0 GMT
-R G 1981 1995 - Mar lastSu 1u 1 BST
-R G 1981 1989 - O Su>=23 1u 0 GMT
-R G 1990 1995 - O Su>=22 1u 0 GMT
-R IE 1971 o - O 31 2u -1 -
-R IE 1972 1980 - Mar Su>=16 2u 0 -
-R IE 1972 1980 - O Su>=23 2u -1 -
-R IE 1981 ma - Mar lastSu 1u 0 -
-R IE 1981 1989 - O Su>=23 1u -1 -
-R IE 1990 1995 - O Su>=22 1u -1 -
-R IE 1996 ma - O lastSu 1u -1 -
-R E 1977 1980 - Ap Su>=1 1u 1 S
-R E 1977 o - S lastSu 1u 0 -
-R E 1978 o - O 1 1u 0 -
-R E 1979 1995 - S lastSu 1u 0 -
-R E 1981 ma - Mar lastSu 1u 1 S
-R E 1996 ma - O lastSu 1u 0 -
-R W- 1977 1980 - Ap Su>=1 1s 1 S
-R W- 1977 o - S lastSu 1s 0 -
-R W- 1978 o - O 1 1s 0 -
-R W- 1979 1995 - S lastSu 1s 0 -
-R W- 1981 ma - Mar lastSu 1s 1 S
-R W- 1996 ma - O lastSu 1s 0 -
-R c 1916 o - Ap 30 23 1 S
-R c 1916 o - O 1 1 0 -
-R c 1917 1918 - Ap M>=15 2s 1 S
-R c 1917 1918 - S M>=15 2s 0 -
-R c 1940 o - Ap 1 2s 1 S
-R c 1942 o - N 2 2s 0 -
-R c 1943 o - Mar 29 2s 1 S
-R c 1943 o - O 4 2s 0 -
-R c 1944 1945 - Ap M>=1 2s 1 S
-R c 1944 o - O 2 2s 0 -
-R c 1945 o - S 16 2s 0 -
-R c 1977 1980 - Ap Su>=1 2s 1 S
-R c 1977 o - S lastSu 2s 0 -
-R c 1978 o - O 1 2s 0 -
-R c 1979 1995 - S lastSu 2s 0 -
-R c 1981 ma - Mar lastSu 2s 1 S
-R c 1996 ma - O lastSu 2s 0 -
-R e 1977 1980 - Ap Su>=1 0 1 S
-R e 1977 o - S lastSu 0 0 -
-R e 1978 o - O 1 0 0 -
-R e 1979 1995 - S lastSu 0 0 -
-R e 1981 ma - Mar lastSu 0 1 S
-R e 1996 ma - O lastSu 0 0 -
-R R 1917 o - Jul 1 23 1 MST
-R R 1917 o - D 28 0 0 MMT
-R R 1918 o - May 31 22 2 MDST
-R R 1918 o - S 16 1 1 MST
-R R 1919 o - May 31 23 2 MDST
-R R 1919 o - Jul 1 0u 1 MSD
-R R 1919 o - Au 16 0 0 MSK
-R R 1921 o - F 14 23 1 MSD
-R R 1921 o - Mar 20 23 2 +05
-R R 1921 o - S 1 0 1 MSD
-R R 1921 o - O 1 0 0 -
-R R 1981 1984 - Ap 1 0 1 S
-R R 1981 1983 - O 1 0 0 -
-R R 1984 1995 - S lastSu 2s 0 -
-R R 1985 2010 - Mar lastSu 2s 1 S
-R R 1996 2010 - O lastSu 2s 0 -
-R q 1940 o - Jun 16 0 1 S
-R q 1942 o - N 2 3 0 -
-R q 1943 o - Mar 29 2 1 S
-R q 1943 o - Ap 10 3 0 -
-R q 1974 o - May 4 0 1 S
-R q 1974 o - O 2 0 0 -
-R q 1975 o - May 1 0 1 S
-R q 1975 o - O 2 0 0 -
-R q 1976 o - May 2 0 1 S
-R q 1976 o - O 3 0 0 -
-R q 1977 o - May 8 0 1 S
-R q 1977 o - O 2 0 0 -
-R q 1978 o - May 6 0 1 S
-R q 1978 o - O 1 0 0 -
-R q 1979 o - May 5 0 1 S
-R q 1979 o - S 30 0 0 -
-R q 1980 o - May 3 0 1 S
-R q 1980 o - O 4 0 0 -
-R q 1981 o - Ap 26 0 1 S
-R q 1981 o - S 27 0 0 -
-R q 1982 o - May 2 0 1 S
-R q 1982 o - O 3 0 0 -
-R q 1983 o - Ap 18 0 1 S
-R q 1983 o - O 1 0 0 -
-R q 1984 o - Ap 1 0 1 S
-R a 1920 o - Ap 5 2s 1 S
-R a 1920 o - S 13 2s 0 -
-R a 1946 o - Ap 14 2s 1 S
-R a 1946 o - O 7 2s 0 -
-R a 1947 1948 - O Su>=1 2s 0 -
-R a 1947 o - Ap 6 2s 1 S
-R a 1948 o - Ap 18 2s 1 S
-R a 1980 o - Ap 6 0 1 S
-R a 1980 o - S 28 0 0 -
-R b 1918 o - Mar 9 0s 1 S
-R b 1918 1919 - O Sa>=1 23s 0 -
-R b 1919 o - Mar 1 23s 1 S
-R b 1920 o - F 14 23s 1 S
-R b 1920 o - O 23 23s 0 -
-R b 1921 o - Mar 14 23s 1 S
-R b 1921 o - O 25 23s 0 -
-R b 1922 o - Mar 25 23s 1 S
-R b 1922 1927 - O Sa>=1 23s 0 -
-R b 1923 o - Ap 21 23s 1 S
-R b 1924 o - Mar 29 23s 1 S
-R b 1925 o - Ap 4 23s 1 S
-R b 1926 o - Ap 17 23s 1 S
-R b 1927 o - Ap 9 23s 1 S
-R b 1928 o - Ap 14 23s 1 S
-R b 1928 1938 - O Su>=2 2s 0 -
-R b 1929 o - Ap 21 2s 1 S
-R b 1930 o - Ap 13 2s 1 S
-R b 1931 o - Ap 19 2s 1 S
-R b 1932 o - Ap 3 2s 1 S
-R b 1933 o - Mar 26 2s 1 S
-R b 1934 o - Ap 8 2s 1 S
-R b 1935 o - Mar 31 2s 1 S
-R b 1936 o - Ap 19 2s 1 S
-R b 1937 o - Ap 4 2s 1 S
-R b 1938 o - Mar 27 2s 1 S
-R b 1939 o - Ap 16 2s 1 S
-R b 1939 o - N 19 2s 0 -
-R b 1940 o - F 25 2s 1 S
-R b 1944 o - S 17 2s 0 -
-R b 1945 o - Ap 2 2s 1 S
-R b 1945 o - S 16 2s 0 -
-R b 1946 o - May 19 2s 1 S
-R b 1946 o - O 7 2s 0 -
-R BG 1979 o - Mar 31 23 1 S
-R BG 1979 o - O 1 1 0 -
-R BG 1980 1982 - Ap Sa>=1 23 1 S
-R BG 1980 o - S 29 1 0 -
-R BG 1981 o - S 27 2 0 -
-R CZ 1945 o - Ap M>=1 2s 1 S
-R CZ 1945 o - O 1 2s 0 -
-R CZ 1946 o - May 6 2s 1 S
-R CZ 1946 1949 - O Su>=1 2s 0 -
-R CZ 1947 1948 - Ap Su>=15 2s 1 S
-R CZ 1949 o - Ap 9 2s 1 S
-R Th 1991 1992 - Mar lastSu 2 1 D
-R Th 1991 1992 - S lastSu 2 0 S
-R Th 1993 2006 - Ap Su>=1 2 1 D
-R Th 1993 2006 - O lastSu 2 0 S
-R Th 2007 ma - Mar Su>=8 2 1 D
-R Th 2007 ma - N Su>=1 2 0 S
-R FI 1942 o - Ap 2 24 1 S
-R FI 1942 o - O 4 1 0 -
-R FI 1981 1982 - Mar lastSu 2 1 S
-R FI 1981 1982 - S lastSu 3 0 -
-R F 1916 o - Jun 14 23s 1 S
-R F 1916 1919 - O Su>=1 23s 0 -
-R F 1917 o - Mar 24 23s 1 S
-R F 1918 o - Mar 9 23s 1 S
-R F 1919 o - Mar 1 23s 1 S
-R F 1920 o - F 14 23s 1 S
-R F 1920 o - O 23 23s 0 -
-R F 1921 o - Mar 14 23s 1 S
-R F 1921 o - O 25 23s 0 -
-R F 1922 o - Mar 25 23s 1 S
-R F 1922 1938 - O Sa>=1 23s 0 -
-R F 1923 o - May 26 23s 1 S
-R F 1924 o - Mar 29 23s 1 S
-R F 1925 o - Ap 4 23s 1 S
-R F 1926 o - Ap 17 23s 1 S
-R F 1927 o - Ap 9 23s 1 S
-R F 1928 o - Ap 14 23s 1 S
-R F 1929 o - Ap 20 23s 1 S
-R F 1930 o - Ap 12 23s 1 S
-R F 1931 o - Ap 18 23s 1 S
-R F 1932 o - Ap 2 23s 1 S
-R F 1933 o - Mar 25 23s 1 S
-R F 1934 o - Ap 7 23s 1 S
-R F 1935 o - Mar 30 23s 1 S
-R F 1936 o - Ap 18 23s 1 S
-R F 1937 o - Ap 3 23s 1 S
-R F 1938 o - Mar 26 23s 1 S
-R F 1939 o - Ap 15 23s 1 S
-R F 1939 o - N 18 23s 0 -
-R F 1940 o - F 25 2 1 S
-R F 1941 o - May 5 0 2 M
-R F 1941 o - O 6 0 1 S
-R F 1942 o - Mar 9 0 2 M
-R F 1942 o - N 2 3 1 S
-R F 1943 o - Mar 29 2 2 M
-R F 1943 o - O 4 3 1 S
-R F 1944 o - Ap 3 2 2 M
-R F 1944 o - O 8 1 1 S
-R F 1945 o - Ap 2 2 2 M
-R F 1945 o - S 16 3 0 -
-R F 1976 o - Mar 28 1 1 S
-R F 1976 o - S 26 1 0 -
-R DE 1946 o - Ap 14 2s 1 S
-R DE 1946 o - O 7 2s 0 -
-R DE 1947 1949 - O Su>=1 2s 0 -
-R DE 1947 o - Ap 6 3s 1 S
-R DE 1947 o - May 11 2s 2 M
-R DE 1947 o - Jun 29 3 1 S
-R DE 1948 o - Ap 18 2s 1 S
-R DE 1949 o - Ap 10 2s 1 S
-R So 1945 o - May 24 2 2 M
-R So 1945 o - S 24 3 1 S
-R So 1945 o - N 18 2s 0 -
-R g 1932 o - Jul 7 0 1 S
-R g 1932 o - S 1 0 0 -
-R g 1941 o - Ap 7 0 1 S
-R g 1942 o - N 2 3 0 -
-R g 1943 o - Mar 30 0 1 S
-R g 1943 o - O 4 0 0 -
-R g 1952 o - Jul 1 0 1 S
-R g 1952 o - N 2 0 0 -
-R g 1975 o - Ap 12 0s 1 S
-R g 1975 o - N 26 0s 0 -
-R g 1976 o - Ap 11 2s 1 S
-R g 1976 o - O 10 2s 0 -
-R g 1977 1978 - Ap Su>=1 2s 1 S
-R g 1977 o - S 26 2s 0 -
-R g 1978 o - S 24 4 0 -
-R g 1979 o - Ap 1 9 1 S
-R g 1979 o - S 29 2 0 -
-R g 1980 o - Ap 1 0 1 S
-R g 1980 o - S 28 0 0 -
-R h 1918 1919 - Ap 15 2 1 S
-R h 1918 1920 - S M>=15 3 0 -
-R h 1920 o - Ap 5 2 1 S
-R h 1945 o - May 1 23 1 S
-R h 1945 o - N 1 1 0 -
-R h 1946 o - Mar 31 2s 1 S
-R h 1946 o - O 7 2 0 -
-R h 1947 1949 - Ap Su>=4 2s 1 S
-R h 1947 1949 - O Su>=1 2s 0 -
-R h 1954 o - May 23 0 1 S
-R h 1954 o - O 3 0 0 -
-R h 1955 o - May 22 2 1 S
-R h 1955 o - O 2 3 0 -
-R h 1956 1957 - Jun Su>=1 2 1 S
-R h 1956 1957 - S lastSu 3 0 -
-R h 1980 o - Ap 6 0 1 S
-R h 1980 o - S 28 1 0 -
-R h 1981 1983 - Mar lastSu 0 1 S
-R h 1981 1983 - S lastSu 1 0 -
-R I 1916 o - Jun 3 24 1 S
-R I 1916 1917 - S 30 24 0 -
-R I 1917 o - Mar 31 24 1 S
-R I 1918 o - Mar 9 24 1 S
-R I 1918 o - O 6 24 0 -
-R I 1919 o - Mar 1 24 1 S
-R I 1919 o - O 4 24 0 -
-R I 1920 o - Mar 20 24 1 S
-R I 1920 o - S 18 24 0 -
-R I 1940 o - Jun 14 24 1 S
-R I 1942 o - N 2 2s 0 -
-R I 1943 o - Mar 29 2s 1 S
-R I 1943 o - O 4 2s 0 -
-R I 1944 o - Ap 2 2s 1 S
-R I 1944 o - S 17 2s 0 -
-R I 1945 o - Ap 2 2 1 S
-R I 1945 o - S 15 1 0 -
-R I 1946 o - Mar 17 2s 1 S
-R I 1946 o - O 6 2s 0 -
-R I 1947 o - Mar 16 0s 1 S
-R I 1947 o - O 5 0s 0 -
-R I 1948 o - F 29 2s 1 S
-R I 1948 o - O 3 2s 0 -
-R I 1966 1968 - May Su>=22 0s 1 S
-R I 1966 o - S 24 24 0 -
-R I 1967 1969 - S Su>=22 0s 0 -
-R I 1969 o - Jun 1 0s 1 S
-R I 1970 o - May 31 0s 1 S
-R I 1970 o - S lastSu 0s 0 -
-R I 1971 1972 - May Su>=22 0s 1 S
-R I 1971 o - S lastSu 0s 0 -
-R I 1972 o - O 1 0s 0 -
-R I 1973 o - Jun 3 0s 1 S
-R I 1973 1974 - S lastSu 0s 0 -
-R I 1974 o - May 26 0s 1 S
-R I 1975 o - Jun 1 0s 1 S
-R I 1975 1977 - S lastSu 0s 0 -
-R I 1976 o - May 30 0s 1 S
-R I 1977 1979 - May Su>=22 0s 1 S
-R I 1978 o - O 1 0s 0 -
-R I 1979 o - S 30 0s 0 -
-R LV 1989 1996 - Mar lastSu 2s 1 S
-R LV 1989 1996 - S lastSu 2s 0 -
-R MT 1973 o - Mar 31 0s 1 S
-R MT 1973 o - S 29 0s 0 -
-R MT 1974 o - Ap 21 0s 1 S
-R MT 1974 o - S 16 0s 0 -
-R MT 1975 1979 - Ap Su>=15 2 1 S
-R MT 1975 1980 - S Su>=15 2 0 -
-R MT 1980 o - Mar 31 2 1 S
-R MD 1997 ma - Mar lastSu 2 1 S
-R MD 1997 ma - O lastSu 3 0 -
-R O 1918 1919 - S 16 2s 0 -
-R O 1919 o - Ap 15 2s 1 S
-R O 1944 o - Ap 3 2s 1 S
-R O 1944 o - O 4 2 0 -
-R O 1945 o - Ap 29 0 1 S
-R O 1945 o - N 1 0 0 -
-R O 1946 o - Ap 14 0s 1 S
-R O 1946 o - O 7 2s 0 -
-R O 1947 o - May 4 2s 1 S
-R O 1947 1949 - O Su>=1 2s 0 -
-R O 1948 o - Ap 18 2s 1 S
-R O 1949 o - Ap 10 2s 1 S
-R O 1957 o - Jun 2 1s 1 S
-R O 1957 1958 - S lastSu 1s 0 -
-R O 1958 o - Mar 30 1s 1 S
-R O 1959 o - May 31 1s 1 S
-R O 1959 1961 - O Su>=1 1s 0 -
-R O 1960 o - Ap 3 1s 1 S
-R O 1961 1964 - May lastSu 1s 1 S
-R O 1962 1964 - S lastSu 1s 0 -
-R p 1916 o - Jun 17 23 1 S
-R p 1916 o - N 1 1 0 -
-R p 1917 1921 - Mar 1 0 1 S
-R p 1917 1921 - O 14 24 0 -
-R p 1924 o - Ap 16 23s 1 S
-R p 1924 o - O 4 23s 0 -
-R p 1926 o - Ap 17 23s 1 S
-R p 1926 1929 - O Sa>=1 23s 0 -
-R p 1927 o - Ap 9 23s 1 S
-R p 1928 o - Ap 14 23s 1 S
-R p 1929 o - Ap 20 23s 1 S
-R p 1931 o - Ap 18 23s 1 S
-R p 1931 1932 - O Sa>=1 23s 0 -
-R p 1932 o - Ap 2 23s 1 S
-R p 1934 o - Ap 7 23s 1 S
-R p 1934 1938 - O Sa>=1 23s 0 -
-R p 1935 o - Mar 30 23s 1 S
-R p 1936 o - Ap 18 23s 1 S
-R p 1937 o - Ap 3 23s 1 S
-R p 1938 o - Mar 26 23s 1 S
-R p 1939 o - Ap 15 23s 1 S
-R p 1939 o - N 18 23s 0 -
-R p 1940 o - F 24 23s 1 S
-R p 1940 o - O 7 23s 0 -
-R p 1941 o - Ap 5 23s 1 S
-R p 1941 o - O 5 23s 0 -
-R p 1942 1945 - Mar Sa>=8 23s 1 S
-R p 1942 o - Ap 25 22s 2 M
-R p 1942 o - Au 15 22s 1 S
-R p 1942 1945 - O Sa>=24 23s 0 -
-R p 1943 o - Ap 17 22s 2 M
-R p 1943 1945 - Au Sa>=25 22s 1 S
-R p 1944 1945 - Ap Sa>=21 22s 2 M
-R p 1946 o - Ap Sa>=1 23s 1 S
-R p 1946 o - O Sa>=1 23s 0 -
-R p 1947 1966 - Ap Su>=1 2s 1 S
-R p 1947 1965 - O Su>=1 2s 0 -
-R p 1976 o - S lastSu 1 0 -
-R p 1977 o - Mar lastSu 0s 1 S
-R p 1977 o - S lastSu 0s 0 -
-R p 1978 1980 - Ap Su>=1 1s 1 S
-R p 1978 o - O 1 1s 0 -
-R p 1979 1980 - S lastSu 1s 0 -
-R p 1981 1986 - Mar lastSu 0s 1 S
-R p 1981 1985 - S lastSu 0s 0 -
-R z 1932 o - May 21 0s 1 S
-R z 1932 1939 - O Su>=1 0s 0 -
-R z 1933 1939 - Ap Su>=2 0s 1 S
-R z 1979 o - May 27 0 1 S
-R z 1979 o - S lastSu 0 0 -
-R z 1980 o - Ap 5 23 1 S
-R z 1980 o - S lastSu 1 0 -
-R z 1991 1993 - Mar lastSu 0s 1 S
-R z 1991 1993 - S lastSu 0s 0 -
-R s 1918 o - Ap 15 23 1 S
-R s 1918 1919 - O 6 24s 0 -
-R s 1919 o - Ap 6 23 1 S
-R s 1924 o - Ap 16 23 1 S
-R s 1924 o - O 4 24s 0 -
-R s 1926 o - Ap 17 23 1 S
-R s 1926 1929 - O Sa>=1 24s 0 -
-R s 1927 o - Ap 9 23 1 S
-R s 1928 o - Ap 15 0 1 S
-R s 1929 o - Ap 20 23 1 S
-R s 1937 o - Jun 16 23 1 S
-R s 1937 o - O 2 24s 0 -
-R s 1938 o - Ap 2 23 1 S
-R s 1938 o - Ap 30 23 2 M
-R s 1938 o - O 2 24 1 S
-R s 1939 o - O 7 24s 0 -
-R s 1942 o - May 2 23 1 S
-R s 1942 o - S 1 1 0 -
-R s 1943 1946 - Ap Sa>=13 23 1 S
-R s 1943 1944 - O Su>=1 1 0 -
-R s 1945 1946 - S lastSu 1 0 -
-R s 1949 o - Ap 30 23 1 S
-R s 1949 o - O 2 1 0 -
-R s 1974 1975 - Ap Sa>=12 23 1 S
-R s 1974 1975 - O Su>=1 1 0 -
-R s 1976 o - Mar 27 23 1 S
-R s 1976 1977 - S lastSu 1 0 -
-R s 1977 o - Ap 2 23 1 S
-R s 1978 o - Ap 2 2s 1 S
-R s 1978 o - O 1 2s 0 -
-R Sp 1967 o - Jun 3 12 1 S
-R Sp 1967 o - O 1 0 0 -
-R Sp 1974 o - Jun 24 0 1 S
-R Sp 1974 o - S 1 0 0 -
-R Sp 1976 1977 - May 1 0 1 S
-R Sp 1976 o - Au 1 0 0 -
-R Sp 1977 o - S 28 0 0 -
-R Sp 1978 o - Jun 1 0 1 S
-R Sp 1978 o - Au 4 0 0 -
-R CH 1941 1942 - May M>=1 1 1 S
-R CH 1941 1942 - O M>=1 2 0 -
-R T 1916 o - May 1 0 1 S
-R T 1916 o - O 1 0 0 -
-R T 1920 o - Mar 28 0 1 S
-R T 1920 o - O 25 0 0 -
-R T 1921 o - Ap 3 0 1 S
-R T 1921 o - O 3 0 0 -
-R T 1922 o - Mar 26 0 1 S
-R T 1922 o - O 8 0 0 -
-R T 1924 o - May 13 0 1 S
-R T 1924 1925 - O 1 0 0 -
-R T 1925 o - May 1 0 1 S
-R T 1940 o - Jul 1 0 1 S
-R T 1940 o - O 6 0 0 -
-R T 1940 o - D 1 0 1 S
-R T 1941 o - S 21 0 0 -
-R T 1942 o - Ap 1 0 1 S
-R T 1945 o - O 8 0 0 -
-R T 1946 o - Jun 1 0 1 S
-R T 1946 o - O 1 0 0 -
-R T 1947 1948 - Ap Su>=16 0 1 S
-R T 1947 1951 - O Su>=2 0 0 -
-R T 1949 o - Ap 10 0 1 S
-R T 1950 o - Ap 16 0 1 S
-R T 1951 o - Ap 22 0 1 S
-R T 1962 o - Jul 15 0 1 S
-R T 1963 o - O 30 0 0 -
-R T 1964 o - May 15 0 1 S
-R T 1964 o - O 1 0 0 -
-R T 1973 o - Jun 3 1 1 S
-R T 1973 1976 - O Su>=31 2 0 -
-R T 1974 o - Mar 31 2 1 S
-R T 1975 o - Mar 22 2 1 S
-R T 1976 o - Mar 21 2 1 S
-R T 1977 1978 - Ap Su>=1 2 1 S
-R T 1977 1978 - O Su>=15 2 0 -
-R T 1978 o - Jun 29 0 0 -
-R T 1983 o - Jul 31 2 1 S
-R T 1983 o - O 2 2 0 -
-R T 1985 o - Ap 20 1s 1 S
-R T 1985 o - S 28 1s 0 -
-R T 1986 1993 - Mar lastSu 1s 1 S
-R T 1986 1995 - S lastSu 1s 0 -
-R T 1994 o - Mar 20 1s 1 S
-R T 1995 2006 - Mar lastSu 1s 1 S
-R T 1996 2006 - O lastSu 1s 0 -
-R u 1918 1919 - Mar lastSu 2 1 D
-R u 1918 1919 - O lastSu 2 0 S
-R u 1942 o - F 9 2 1 W
-R u 1945 o - Au 14 23u 1 P
-R u 1945 o - S 30 2 0 S
-R u 1967 2006 - O lastSu 2 0 S
-R u 1967 1973 - Ap lastSu 2 1 D
-R u 1974 o - Ja 6 2 1 D
-R u 1975 o - F lastSu 2 1 D
-R u 1976 1986 - Ap lastSu 2 1 D
-R u 1987 2006 - Ap Su>=1 2 1 D
-R u 2007 ma - Mar Su>=8 2 1 D
-R u 2007 ma - N Su>=1 2 0 S
-R NY 1920 o - Mar lastSu 2 1 D
-R NY 1920 o - O lastSu 2 0 S
-R NY 1921 1966 - Ap lastSu 2 1 D
-R NY 1921 1954 - S lastSu 2 0 S
-R NY 1955 1966 - O lastSu 2 0 S
-R Ch 1920 o - Jun 13 2 1 D
-R Ch 1920 1921 - O lastSu 2 0 S
-R Ch 1921 o - Mar lastSu 2 1 D
-R Ch 1922 1966 - Ap lastSu 2 1 D
-R Ch 1922 1954 - S lastSu 2 0 S
-R Ch 1955 1966 - O lastSu 2 0 S
-R De 1920 1921 - Mar lastSu 2 1 D
-R De 1920 o - O lastSu 2 0 S
-R De 1921 o - May 22 2 0 S
-R De 1965 1966 - Ap lastSu 2 1 D
-R De 1965 1966 - O lastSu 2 0 S
-R CA 1948 o - Mar 14 2:1 1 D
-R CA 1949 o - Ja 1 2 0 S
-R CA 1950 1966 - Ap lastSu 1 1 D
-R CA 1950 1961 - S lastSu 2 0 S
-R CA 1962 1966 - O lastSu 2 0 S
-R In 1941 o - Jun 22 2 1 D
-R In 1941 1954 - S lastSu 2 0 S
-R In 1946 1954 - Ap lastSu 2 1 D
-R Ma 1951 o - Ap lastSu 2 1 D
-R Ma 1951 o - S lastSu 2 0 S
-R Ma 1954 1960 - Ap lastSu 2 1 D
-R Ma 1954 1960 - S lastSu 2 0 S
-R V 1946 o - Ap lastSu 2 1 D
-R V 1946 o - S lastSu 2 0 S
-R V 1953 1954 - Ap lastSu 2 1 D
-R V 1953 1959 - S lastSu 2 0 S
-R V 1955 o - May 1 0 1 D
-R V 1956 1963 - Ap lastSu 2 1 D
-R V 1960 o - O lastSu 2 0 S
-R V 1961 o - S lastSu 2 0 S
-R V 1962 1963 - O lastSu 2 0 S
-R Pe 1955 o - May 1 0 1 D
-R Pe 1955 1960 - S lastSu 2 0 S
-R Pe 1956 1963 - Ap lastSu 2 1 D
-R Pe 1961 1963 - O lastSu 2 0 S
-R Pi 1955 o - May 1 0 1 D
-R Pi 1955 1960 - S lastSu 2 0 S
-R Pi 1956 1964 - Ap lastSu 2 1 D
-R Pi 1961 1964 - O lastSu 2 0 S
-R St 1947 1961 - Ap lastSu 2 1 D
-R St 1947 1954 - S lastSu 2 0 S
-R St 1955 1956 - O lastSu 2 0 S
-R St 1957 1958 - S lastSu 2 0 S
-R St 1959 1961 - O lastSu 2 0 S
-R Pu 1946 1960 - Ap lastSu 2 1 D
-R Pu 1946 1954 - S lastSu 2 0 S
-R Pu 1955 1956 - O lastSu 2 0 S
-R Pu 1957 1960 - S lastSu 2 0 S
-R v 1921 o - May 1 2 1 D
-R v 1921 o - S 1 2 0 S
-R v 1941 o - Ap lastSu 2 1 D
-R v 1941 o - S lastSu 2 0 S
-R v 1946 o - Ap lastSu 0:1 1 D
-R v 1946 o - Jun 2 2 0 S
-R v 1950 1961 - Ap lastSu 2 1 D
-R v 1950 1955 - S lastSu 2 0 S
-R v 1956 1961 - O lastSu 2 0 S
-R Dt 1948 o - Ap lastSu 2 1 D
-R Dt 1948 o - S lastSu 2 0 S
-R Me 1946 o - Ap lastSu 2 1 D
-R Me 1946 o - S lastSu 2 0 S
-R Me 1966 o - Ap lastSu 2 1 D
-R Me 1966 o - O lastSu 2 0 S
-R C 1918 o - Ap 14 2 1 D
-R C 1918 o - O 27 2 0 S
-R C 1942 o - F 9 2 1 W
-R C 1945 o - Au 14 23u 1 P
-R C 1945 o - S 30 2 0 S
-R C 1974 1986 - Ap lastSu 2 1 D
-R C 1974 2006 - O lastSu 2 0 S
-R C 1987 2006 - Ap Su>=1 2 1 D
-R C 2007 ma - Mar Su>=8 2 1 D
-R C 2007 ma - N Su>=1 2 0 S
-R j 1917 o - Ap 8 2 1 D
-R j 1917 o - S 17 2 0 S
-R j 1919 o - May 5 23 1 D
-R j 1919 o - Au 12 23 0 S
-R j 1920 1935 - May Su>=1 23 1 D
-R j 1920 1935 - O lastSu 23 0 S
-R j 1936 1941 - May M>=9 0 1 D
-R j 1936 1941 - O M>=2 0 0 S
-R j 1946 1950 - May Su>=8 2 1 D
-R j 1946 1950 - O Su>=2 2 0 S
-R j 1951 1986 - Ap lastSu 2 1 D
-R j 1951 1959 - S lastSu 2 0 S
-R j 1960 1986 - O lastSu 2 0 S
-R j 1987 o - Ap Su>=1 0:1 1 D
-R j 1987 2006 - O lastSu 0:1 0 S
-R j 1988 o - Ap Su>=1 0:1 2 DD
-R j 1989 2006 - Ap Su>=1 0:1 1 D
-R j 2007 2011 - Mar Su>=8 0:1 1 D
-R j 2007 2010 - N Su>=1 0:1 0 S
-R H 1916 o - Ap 1 0 1 D
-R H 1916 o - O 1 0 0 S
-R H 1920 o - May 9 0 1 D
-R H 1920 o - Au 29 0 0 S
-R H 1921 o - May 6 0 1 D
-R H 1921 1922 - S 5 0 0 S
-R H 1922 o - Ap 30 0 1 D
-R H 1923 1925 - May Su>=1 0 1 D
-R H 1923 o - S 4 0 0 S
-R H 1924 o - S 15 0 0 S
-R H 1925 o - S 28 0 0 S
-R H 1926 o - May 16 0 1 D
-R H 1926 o - S 13 0 0 S
-R H 1927 o - May 1 0 1 D
-R H 1927 o - S 26 0 0 S
-R H 1928 1931 - May Su>=8 0 1 D
-R H 1928 o - S 9 0 0 S
-R H 1929 o - S 3 0 0 S
-R H 1930 o - S 15 0 0 S
-R H 1931 1932 - S M>=24 0 0 S
-R H 1932 o - May 1 0 1 D
-R H 1933 o - Ap 30 0 1 D
-R H 1933 o - O 2 0 0 S
-R H 1934 o - May 20 0 1 D
-R H 1934 o - S 16 0 0 S
-R H 1935 o - Jun 2 0 1 D
-R H 1935 o - S 30 0 0 S
-R H 1936 o - Jun 1 0 1 D
-R H 1936 o - S 14 0 0 S
-R H 1937 1938 - May Su>=1 0 1 D
-R H 1937 1941 - S M>=24 0 0 S
-R H 1939 o - May 28 0 1 D
-R H 1940 1941 - May Su>=1 0 1 D
-R H 1946 1949 - Ap lastSu 2 1 D
-R H 1946 1949 - S lastSu 2 0 S
-R H 1951 1954 - Ap lastSu 2 1 D
-R H 1951 1954 - S lastSu 2 0 S
-R H 1956 1959 - Ap lastSu 2 1 D
-R H 1956 1959 - S lastSu 2 0 S
-R H 1962 1973 - Ap lastSu 2 1 D
-R H 1962 1973 - O lastSu 2 0 S
-R o 1933 1935 - Jun Su>=8 1 1 D
-R o 1933 1935 - S Su>=8 1 0 S
-R o 1936 1938 - Jun Su>=1 1 1 D
-R o 1936 1938 - S Su>=1 1 0 S
-R o 1939 o - May 27 1 1 D
-R o 1939 1941 - S Sa>=21 1 0 S
-R o 1940 o - May 19 1 1 D
-R o 1941 o - May 4 1 1 D
-R o 1946 1972 - Ap lastSu 2 1 D
-R o 1946 1956 - S lastSu 2 0 S
-R o 1957 1972 - O lastSu 2 0 S
-R o 1993 2006 - Ap Su>=1 0:1 1 D
-R o 1993 2006 - O lastSu 0:1 0 S
-R t 1919 o - Mar 30 23:30 1 D
-R t 1919 o - O 26 0 0 S
-R t 1920 o - May 2 2 1 D
-R t 1920 o - S 26 0 0 S
-R t 1921 o - May 15 2 1 D
-R t 1921 o - S 15 2 0 S
-R t 1922 1923 - May Su>=8 2 1 D
-R t 1922 1926 - S Su>=15 2 0 S
-R t 1924 1927 - May Su>=1 2 1 D
-R t 1927 1937 - S Su>=25 2 0 S
-R t 1928 1937 - Ap Su>=25 2 1 D
-R t 1938 1940 - Ap lastSu 2 1 D
-R t 1938 1939 - S lastSu 2 0 S
-R t 1945 1948 - S lastSu 2 0 S
-R t 1946 1973 - Ap lastSu 2 1 D
-R t 1949 1950 - N lastSu 2 0 S
-R t 1951 1956 - S lastSu 2 0 S
-R t 1957 1973 - O lastSu 2 0 S
-R W 1916 o - Ap 23 0 1 D
-R W 1916 o - S 17 0 0 S
-R W 1918 o - Ap 14 2 1 D
-R W 1918 o - O 27 2 0 S
-R W 1937 o - May 16 2 1 D
-R W 1937 o - S 26 2 0 S
-R W 1942 o - F 9 2 1 W
-R W 1945 o - Au 14 23u 1 P
-R W 1945 o - S lastSu 2 0 S
-R W 1946 o - May 12 2 1 D
-R W 1946 o - O 13 2 0 S
-R W 1947 1949 - Ap lastSu 2 1 D
-R W 1947 1949 - S lastSu 2 0 S
-R W 1950 o - May 1 2 1 D
-R W 1950 o - S 30 2 0 S
-R W 1951 1960 - Ap lastSu 2 1 D
-R W 1951 1958 - S lastSu 2 0 S
-R W 1959 o - O lastSu 2 0 S
-R W 1960 o - S lastSu 2 0 S
-R W 1963 o - Ap lastSu 2 1 D
-R W 1963 o - S 22 2 0 S
-R W 1966 1986 - Ap lastSu 2s 1 D
-R W 1966 2005 - O lastSu 2s 0 S
-R W 1987 2005 - Ap Su>=1 2s 1 D
-R r 1918 o - Ap 14 2 1 D
-R r 1918 o - O 27 2 0 S
-R r 1930 1934 - May Su>=1 0 1 D
-R r 1930 1934 - O Su>=1 0 0 S
-R r 1937 1941 - Ap Su>=8 0 1 D
-R r 1937 o - O Su>=8 0 0 S
-R r 1938 o - O Su>=1 0 0 S
-R r 1939 1941 - O Su>=8 0 0 S
-R r 1942 o - F 9 2 1 W
-R r 1945 o - Au 14 23u 1 P
-R r 1945 o - S lastSu 2 0 S
-R r 1946 o - Ap Su>=8 2 1 D
-R r 1946 o - O Su>=8 2 0 S
-R r 1947 1957 - Ap lastSu 2 1 D
-R r 1947 1957 - S lastSu 2 0 S
-R r 1959 o - Ap lastSu 2 1 D
-R r 1959 o - O lastSu 2 0 S
-R Sw 1957 o - Ap lastSu 2 1 D
-R Sw 1957 o - O lastSu 2 0 S
-R Sw 1959 1961 - Ap lastSu 2 1 D
-R Sw 1959 o - O lastSu 2 0 S
-R Sw 1960 1961 - S lastSu 2 0 S
-R Ed 1918 1919 - Ap Su>=8 2 1 D
-R Ed 1918 o - O 27 2 0 S
-R Ed 1919 o - May 27 2 0 S
-R Ed 1920 1923 - Ap lastSu 2 1 D
-R Ed 1920 o - O lastSu 2 0 S
-R Ed 1921 1923 - S lastSu 2 0 S
-R Ed 1942 o - F 9 2 1 W
-R Ed 1945 o - Au 14 23u 1 P
-R Ed 1945 o - S lastSu 2 0 S
-R Ed 1947 o - Ap lastSu 2 1 D
-R Ed 1947 o - S lastSu 2 0 S
-R Ed 1972 1986 - Ap lastSu 2 1 D
-R Ed 1972 2006 - O lastSu 2 0 S
-R Va 1918 o - Ap 14 2 1 D
-R Va 1918 o - O 27 2 0 S
-R Va 1942 o - F 9 2 1 W
-R Va 1945 o - Au 14 23u 1 P
-R Va 1945 o - S 30 2 0 S
-R Va 1946 1986 - Ap lastSu 2 1 D
-R Va 1946 o - S 29 2 0 S
-R Va 1947 1961 - S lastSu 2 0 S
-R Va 1962 2006 - O lastSu 2 0 S
-R Y 1918 o - Ap 14 2 1 D
-R Y 1918 o - O 27 2 0 S
-R Y 1919 o - May 25 2 1 D
-R Y 1919 o - N 1 0 0 S
-R Y 1942 o - F 9 2 1 W
-R Y 1945 o - Au 14 23u 1 P
-R Y 1945 o - S 30 2 0 S
-R Y 1972 1986 - Ap lastSu 2 1 D
-R Y 1972 2006 - O lastSu 2 0 S
-R Y 1987 2006 - Ap Su>=1 2 1 D
-R Yu 1965 o - Ap lastSu 0 2 DD
-R Yu 1965 o - O lastSu 2 0 S
-R m 1931 o - April 30 0 1 D
-R m 1931 o - O 1 0 0 S
-R m 1939 o - F 5 0 1 D
-R m 1939 o - Jun 25 0 0 S
-R m 1940 o - D 9 0 1 D
-R m 1941 o - Ap 1 0 0 S
-R m 1943 o - D 16 0 1 W
-R m 1944 o - May 1 0 0 S
-R m 1950 o - F 12 0 1 D
-R m 1950 o - Jul 30 0 0 S
-R m 1996 2000 - Ap Su>=1 2 1 D
-R m 1996 2000 - O lastSu 2 0 S
-R m 2001 o - May Su>=1 2 1 D
-R m 2001 o - S lastSu 2 0 S
-R m 2002 2022 - Ap Su>=1 2 1 D
-R m 2002 2022 - O lastSu 2 0 S
-R BB 1942 o - Ap 19 5u 1 D
-R BB 1942 o - Au 31 6u 0 S
-R BB 1943 o - May 2 5u 1 D
-R BB 1943 o - S 5 6u 0 S
-R BB 1944 o - Ap 10 5u 0:30 -
-R BB 1944 o - S 10 6u 0 S
-R BB 1977 o - Jun 12 2 1 D
-R BB 1977 1978 - O Su>=1 2 0 S
-R BB 1978 1980 - Ap Su>=15 2 1 D
-R BB 1979 o - S 30 2 0 S
-R BB 1980 o - S 25 2 0 S
-R BZ 1918 1941 - O Sa>=1 24 0:30 -0530
-R BZ 1919 1942 - F Sa>=8 24 0 CST
-R BZ 1942 o - Jun 27 24 1 CWT
-R BZ 1945 o - Au 14 23u 1 CPT
-R BZ 1945 o - D 15 24 0 CST
-R BZ 1947 1967 - O Sa>=1 24 0:30 -0530
-R BZ 1948 1968 - F Sa>=8 24 0 CST
-R BZ 1973 o - D 5 0 1 CDT
-R BZ 1974 o - F 9 0 0 CST
-R BZ 1982 o - D 18 0 1 CDT
-R BZ 1983 o - F 12 0 0 CST
-R Be 1917 o - Ap 5 24 1 -
-R Be 1917 o - S 30 24 0 -
-R Be 1918 o - Ap 13 24 1 -
-R Be 1918 o - S 15 24 0 S
-R Be 1942 o - Ja 11 2 1 D
-R Be 1942 o - O 18 2 0 S
-R Be 1943 o - Mar 21 2 1 D
-R Be 1943 o - O 31 2 0 S
-R Be 1944 1945 - Mar Su>=8 2 1 D
-R Be 1944 1945 - N Su>=1 2 0 S
-R Be 1947 o - May Su>=15 2 1 D
-R Be 1947 o - S Su>=8 2 0 S
-R Be 1948 1952 - May Su>=22 2 1 D
-R Be 1948 1952 - S Su>=1 2 0 S
-R Be 1956 o - May Su>=22 2 1 D
-R Be 1956 o - O lastSu 2 0 S
-R CR 1979 1980 - F lastSu 0 1 D
-R CR 1979 1980 - Jun Su>=1 0 0 S
-R CR 1991 1992 - Ja Sa>=15 0 1 D
-R CR 1991 o - Jul 1 0 0 S
-R CR 1992 o - Mar 15 0 0 S
-R Q 1928 o - Jun 10 0 1 D
-R Q 1928 o - O 10 0 0 S
-R Q 1940 1942 - Jun Su>=1 0 1 D
-R Q 1940 1942 - S Su>=1 0 0 S
-R Q 1945 1946 - Jun Su>=1 0 1 D
-R Q 1945 1946 - S Su>=1 0 0 S
-R Q 1965 o - Jun 1 0 1 D
-R Q 1965 o - S 30 0 0 S
-R Q 1966 o - May 29 0 1 D
-R Q 1966 o - O 2 0 0 S
-R Q 1967 o - Ap 8 0 1 D
-R Q 1967 1968 - S Su>=8 0 0 S
-R Q 1968 o - Ap 14 0 1 D
-R Q 1969 1977 - Ap lastSu 0 1 D
-R Q 1969 1971 - O lastSu 0 0 S
-R Q 1972 1974 - O 8 0 0 S
-R Q 1975 1977 - O lastSu 0 0 S
-R Q 1978 o - May 7 0 1 D
-R Q 1978 1990 - O Su>=8 0 0 S
-R Q 1979 1980 - Mar Su>=15 0 1 D
-R Q 1981 1985 - May Su>=5 0 1 D
-R Q 1986 1989 - Mar Su>=14 0 1 D
-R Q 1990 1997 - Ap Su>=1 0 1 D
-R Q 1991 1995 - O Su>=8 0s 0 S
-R Q 1996 o - O 6 0s 0 S
-R Q 1997 o - O 12 0s 0 S
-R Q 1998 1999 - Mar lastSu 0s 1 D
-R Q 1998 2003 - O lastSu 0s 0 S
-R Q 2000 2003 - Ap Su>=1 0s 1 D
-R Q 2004 o - Mar lastSu 0s 1 D
-R Q 2006 2010 - O lastSu 0s 0 S
-R Q 2007 o - Mar Su>=8 0s 1 D
-R Q 2008 o - Mar Su>=15 0s 1 D
-R Q 2009 2010 - Mar Su>=8 0s 1 D
-R Q 2011 o - Mar Su>=15 0s 1 D
-R Q 2011 o - N 13 0s 0 S
-R Q 2012 o - Ap 1 0s 1 D
-R Q 2012 ma - N Su>=1 0s 0 S
-R Q 2013 ma - Mar Su>=8 0s 1 D
-R DO 1966 o - O 30 0 1 EDT
-R DO 1967 o - F 28 0 0 EST
-R DO 1969 1973 - O lastSu 0 0:30 -0430
-R DO 1970 o - F 21 0 0 EST
-R DO 1971 o - Ja 20 0 0 EST
-R DO 1972 1974 - Ja 21 0 0 EST
-R SV 1987 1988 - May Su>=1 0 1 D
-R SV 1987 1988 - S lastSu 0 0 S
-R GT 1973 o - N 25 0 1 D
-R GT 1974 o - F 24 0 0 S
-R GT 1983 o - May 21 0 1 D
-R GT 1983 o - S 22 0 0 S
-R GT 1991 o - Mar 23 0 1 D
-R GT 1991 o - S 7 0 0 S
-R GT 2006 o - Ap 30 0 1 D
-R GT 2006 o - O 1 0 0 S
-R HT 1983 o - May 8 0 1 D
-R HT 1984 1987 - Ap lastSu 0 1 D
-R HT 1983 1987 - O lastSu 0 0 S
-R HT 1988 1997 - Ap Su>=1 1s 1 D
-R HT 1988 1997 - O lastSu 1s 0 S
-R HT 2005 2006 - Ap Su>=1 0 1 D
-R HT 2005 2006 - O lastSu 0 0 S
-R HT 2012 2015 - Mar Su>=8 2 1 D
-R HT 2012 2015 - N Su>=1 2 0 S
-R HT 2017 ma - Mar Su>=8 2 1 D
-R HT 2017 ma - N Su>=1 2 0 S
-R HN 1987 1988 - May Su>=1 0 1 D
-R HN 1987 1988 - S lastSu 0 0 S
-R HN 2006 o - May Su>=1 0 1 D
-R HN 2006 o - Au M>=1 0 0 S
-R NI 1979 1980 - Mar Su>=16 0 1 D
-R NI 1979 1980 - Jun M>=23 0 0 S
-R NI 2005 o - Ap 10 0 1 D
-R NI 2005 o - O Su>=1 0 0 S
-R NI 2006 o - Ap 30 2 1 D
-R NI 2006 o - O Su>=1 1 0 S
-R A 1930 o - D 1 0 1 -
-R A 1931 o - Ap 1 0 0 -
-R A 1931 o - O 15 0 1 -
-R A 1932 1940 - Mar 1 0 0 -
-R A 1932 1939 - N 1 0 1 -
-R A 1940 o - Jul 1 0 1 -
-R A 1941 o - Jun 15 0 0 -
-R A 1941 o - O 15 0 1 -
-R A 1943 o - Au 1 0 0 -
-R A 1943 o - O 15 0 1 -
-R A 1946 o - Mar 1 0 0 -
-R A 1946 o - O 1 0 1 -
-R A 1963 o - O 1 0 0 -
-R A 1963 o - D 15 0 1 -
-R A 1964 1966 - Mar 1 0 0 -
-R A 1964 1966 - O 15 0 1 -
-R A 1967 o - Ap 2 0 0 -
-R A 1967 1968 - O Su>=1 0 1 -
-R A 1968 1969 - Ap Su>=1 0 0 -
-R A 1974 o - Ja 23 0 1 -
-R A 1974 o - May 1 0 0 -
-R A 1988 o - D 1 0 1 -
-R A 1989 1993 - Mar Su>=1 0 0 -
-R A 1989 1992 - O Su>=15 0 1 -
-R A 1999 o - O Su>=1 0 1 -
-R A 2000 o - Mar 3 0 0 -
-R A 2007 o - D 30 0 1 -
-R A 2008 2009 - Mar Su>=15 0 0 -
-R A 2008 o - O Su>=15 0 1 -
-R Sa 2008 2009 - Mar Su>=8 0 0 -
-R Sa 2007 2008 - O Su>=8 0 1 -
-R B 1931 o - O 3 11 1 -
-R B 1932 1933 - Ap 1 0 0 -
-R B 1932 o - O 3 0 1 -
-R B 1949 1952 - D 1 0 1 -
-R B 1950 o - Ap 16 1 0 -
-R B 1951 1952 - Ap 1 0 0 -
-R B 1953 o - Mar 1 0 0 -
-R B 1963 o - D 9 0 1 -
-R B 1964 o - Mar 1 0 0 -
-R B 1965 o - Ja 31 0 1 -
-R B 1965 o - Mar 31 0 0 -
-R B 1965 o - D 1 0 1 -
-R B 1966 1968 - Mar 1 0 0 -
-R B 1966 1967 - N 1 0 1 -
-R B 1985 o - N 2 0 1 -
-R B 1986 o - Mar 15 0 0 -
-R B 1986 o - O 25 0 1 -
-R B 1987 o - F 14 0 0 -
-R B 1987 o - O 25 0 1 -
-R B 1988 o - F 7 0 0 -
-R B 1988 o - O 16 0 1 -
-R B 1989 o - Ja 29 0 0 -
-R B 1989 o - O 15 0 1 -
-R B 1990 o - F 11 0 0 -
-R B 1990 o - O 21 0 1 -
-R B 1991 o - F 17 0 0 -
-R B 1991 o - O 20 0 1 -
-R B 1992 o - F 9 0 0 -
-R B 1992 o - O 25 0 1 -
-R B 1993 o - Ja 31 0 0 -
-R B 1993 1995 - O Su>=11 0 1 -
-R B 1994 1995 - F Su>=15 0 0 -
-R B 1996 o - F 11 0 0 -
-R B 1996 o - O 6 0 1 -
-R B 1997 o - F 16 0 0 -
-R B 1997 o - O 6 0 1 -
-R B 1998 o - Mar 1 0 0 -
-R B 1998 o - O 11 0 1 -
-R B 1999 o - F 21 0 0 -
-R B 1999 o - O 3 0 1 -
-R B 2000 o - F 27 0 0 -
-R B 2000 2001 - O Su>=8 0 1 -
-R B 2001 2006 - F Su>=15 0 0 -
-R B 2002 o - N 3 0 1 -
-R B 2003 o - O 19 0 1 -
-R B 2004 o - N 2 0 1 -
-R B 2005 o - O 16 0 1 -
-R B 2006 o - N 5 0 1 -
-R B 2007 o - F 25 0 0 -
-R B 2007 o - O Su>=8 0 1 -
-R B 2008 2017 - O Su>=15 0 1 -
-R B 2008 2011 - F Su>=15 0 0 -
-R B 2012 o - F Su>=22 0 0 -
-R B 2013 2014 - F Su>=15 0 0 -
-R B 2015 o - F Su>=22 0 0 -
-R B 2016 2019 - F Su>=15 0 0 -
-R B 2018 o - N Su>=1 0 1 -
-R x 1927 1931 - S 1 0 1 -
-R x 1928 1932 - Ap 1 0 0 -
-R x 1968 o - N 3 4u 1 -
-R x 1969 o - Mar 30 3u 0 -
-R x 1969 o - N 23 4u 1 -
-R x 1970 o - Mar 29 3u 0 -
-R x 1971 o - Mar 14 3u 0 -
-R x 1970 1972 - O Su>=9 4u 1 -
-R x 1972 1986 - Mar Su>=9 3u 0 -
-R x 1973 o - S 30 4u 1 -
-R x 1974 1987 - O Su>=9 4u 1 -
-R x 1987 o - Ap 12 3u 0 -
-R x 1988 1990 - Mar Su>=9 3u 0 -
-R x 1988 1989 - O Su>=9 4u 1 -
-R x 1990 o - S 16 4u 1 -
-R x 1991 1996 - Mar Su>=9 3u 0 -
-R x 1991 1997 - O Su>=9 4u 1 -
-R x 1997 o - Mar 30 3u 0 -
-R x 1998 o - Mar Su>=9 3u 0 -
-R x 1998 o - S 27 4u 1 -
-R x 1999 o - Ap 4 3u 0 -
-R x 1999 2010 - O Su>=9 4u 1 -
-R x 2000 2007 - Mar Su>=9 3u 0 -
-R x 2008 o - Mar 30 3u 0 -
-R x 2009 o - Mar Su>=9 3u 0 -
-R x 2010 o - Ap Su>=1 3u 0 -
-R x 2011 o - May Su>=2 3u 0 -
-R x 2011 o - Au Su>=16 4u 1 -
-R x 2012 2014 - Ap Su>=23 3u 0 -
-R x 2012 2014 - S Su>=2 4u 1 -
-R x 2016 2018 - May Su>=9 3u 0 -
-R x 2016 2018 - Au Su>=9 4u 1 -
-R x 2019 ma - Ap Su>=2 3u 0 -
-R x 2019 2021 - S Su>=2 4u 1 -
-R x 2022 o - S Su>=9 4u 1 -
-R x 2023 ma - S Su>=2 4u 1 -
-R CO 1992 o - May 3 0 1 -
-R CO 1993 o - F 6 24 0 -
-R EC 1992 o - N 28 0 1 -
-R EC 1993 o - F 5 0 0 -
-R FK 1937 1938 - S lastSu 0 1 -
-R FK 1938 1942 - Mar Su>=19 0 0 -
-R FK 1939 o - O 1 0 1 -
-R FK 1940 1942 - S lastSu 0 1 -
-R FK 1943 o - Ja 1 0 0 -
-R FK 1983 o - S lastSu 0 1 -
-R FK 1984 1985 - Ap lastSu 0 0 -
-R FK 1984 o - S 16 0 1 -
-R FK 1985 2000 - S Su>=9 0 1 -
-R FK 1986 2000 - Ap Su>=16 0 0 -
-R FK 2001 2010 - Ap Su>=15 2 0 -
-R FK 2001 2010 - S Su>=1 2 1 -
-R y 1975 1988 - O 1 0 1 -
-R y 1975 1978 - Mar 1 0 0 -
-R y 1979 1991 - Ap 1 0 0 -
-R y 1989 o - O 22 0 1 -
-R y 1990 o - O 1 0 1 -
-R y 1991 o - O 6 0 1 -
-R y 1992 o - Mar 1 0 0 -
-R y 1992 o - O 5 0 1 -
-R y 1993 o - Mar 31 0 0 -
-R y 1993 1995 - O 1 0 1 -
-R y 1994 1995 - F lastSu 0 0 -
-R y 1996 o - Mar 1 0 0 -
-R y 1996 2001 - O Su>=1 0 1 -
-R y 1997 o - F lastSu 0 0 -
-R y 1998 2001 - Mar Su>=1 0 0 -
-R y 2002 2004 - Ap Su>=1 0 0 -
-R y 2002 2003 - S Su>=1 0 1 -
-R y 2004 2009 - O Su>=15 0 1 -
-R y 2005 2009 - Mar Su>=8 0 0 -
-R y 2010 ma - O Su>=1 0 1 -
-R y 2010 2012 - Ap Su>=8 0 0 -
-R y 2013 ma - Mar Su>=22 0 0 -
-R PE 1938 o - Ja 1 0 1 -
-R PE 1938 o - Ap 1 0 0 -
-R PE 1938 1939 - S lastSu 0 1 -
-R PE 1939 1940 - Mar Su>=24 0 0 -
-R PE 1986 1987 - Ja 1 0 1 -
-R PE 1986 1987 - Ap 1 0 0 -
-R PE 1990 o - Ja 1 0 1 -
-R PE 1990 o - Ap 1 0 0 -
-R PE 1994 o - Ja 1 0 1 -
-R PE 1994 o - Ap 1 0 0 -
-R U 1923 1925 - O 1 0 0:30 -
-R U 1924 1926 - Ap 1 0 0 -
-R U 1933 1938 - O lastSu 0 0:30 -
-R U 1934 1941 - Mar lastSa 24 0 -
-R U 1939 o - O 1 0 0:30 -
-R U 1940 o - O 27 0 0:30 -
-R U 1941 o - Au 1 0 0:30 -
-R U 1942 o - D 14 0 0:30 -
-R U 1943 o - Mar 14 0 0 -
-R U 1959 o - May 24 0 0:30 -
-R U 1959 o - N 15 0 0 -
-R U 1960 o - Ja 17 0 1 -
-R U 1960 o - Mar 6 0 0 -
-R U 1965 o - Ap 4 0 1 -
-R U 1965 o - S 26 0 0 -
-R U 1968 o - May 27 0 0:30 -
-R U 1968 o - D 1 0 0 -
-R U 1970 o - Ap 25 0 1 -
-R U 1970 o - Jun 14 0 0 -
-R U 1972 o - Ap 23 0 1 -
-R U 1972 o - Jul 16 0 0 -
-R U 1974 o - Ja 13 0 1:30 -
-R U 1974 o - Mar 10 0 0:30 -
-R U 1974 o - S 1 0 0 -
-R U 1974 o - D 22 0 1 -
-R U 1975 o - Mar 30 0 0 -
-R U 1976 o - D 19 0 1 -
-R U 1977 o - Mar 6 0 0 -
-R U 1977 o - D 4 0 1 -
-R U 1978 1979 - Mar Su>=1 0 0 -
-R U 1978 o - D 17 0 1 -
-R U 1979 o - Ap 29 0 1 -
-R U 1980 o - Mar 16 0 0 -
-R U 1987 o - D 14 0 1 -
-R U 1988 o - F 28 0 0 -
-R U 1988 o - D 11 0 1 -
-R U 1989 o - Mar 5 0 0 -
-R U 1989 o - O 29 0 1 -
-R U 1990 o - F 25 0 0 -
-R U 1990 1991 - O Su>=21 0 1 -
-R U 1991 1992 - Mar Su>=1 0 0 -
-R U 1992 o - O 18 0 1 -
-R U 1993 o - F 28 0 0 -
-R U 2004 o - S 19 0 1 -
-R U 2005 o - Mar 27 2 0 -
-R U 2005 o - O 9 2 1 -
-R U 2006 2015 - Mar Su>=8 2 0 -
-R U 2006 2014 - O Su>=1 2 1 -
-Z Africa/Abidjan -0:16:8 - LMT 1912
-0 - GMT
-Z Africa/Algiers 0:12:12 - LMT 1891 Mar 16
-0:9:21 - PMT 1911 Mar 11
-0 d WE%sT 1940 F 25 2
-1 d CE%sT 1946 O 7
-0 - WET 1956 Ja 29
-1 - CET 1963 Ap 14
-0 d WE%sT 1977 O 21
-1 d CE%sT 1979 O 26
-0 d WE%sT 1981 May
-1 - CET
-Z Africa/Bissau -1:2:20 - LMT 1912 Ja 1 1u
--1 - %z 1975
-0 - GMT
-Z Africa/Cairo 2:5:9 - LMT 1900 O
-2 K EE%sT
-Z Africa/Casablanca -0:30:20 - LMT 1913 O 26
-0 M %z 1984 Mar 16
-1 - %z 1986
-0 M %z 2018 O 28 3
-1 M %z
-Z Africa/Ceuta -0:21:16 - LMT 1901 Ja 1 0u
-0 - WET 1918 May 6 23
-0 1 WEST 1918 O 7 23
-0 - WET 1924
-0 s WE%sT 1929
-0 - WET 1967
-0 Sp WE%sT 1984 Mar 16
-1 - CET 1986
-1 E CE%sT
-Z Africa/El_Aaiun -0:52:48 - LMT 1934
--1 - %z 1976 Ap 14
-0 M %z 2018 O 28 3
-1 M %z
-Z Africa/Johannesburg 1:52 - LMT 1892 F 8
-1:30 - SAST 1903 Mar
-2 SA SAST
-Z Africa/Juba 2:6:28 - LMT 1931
-2 SD CA%sT 2000 Ja 15 12
-3 - EAT 2021 F
-2 - CAT
-Z Africa/Khartoum 2:10:8 - LMT 1931
-2 SD CA%sT 2000 Ja 15 12
-3 - EAT 2017 N
-2 - CAT
-Z Africa/Lagos 0:13:35 - LMT 1905 Jul
-0 - GMT 1908 Jul
-0:13:35 - LMT 1914
-0:30 - %z 1919 S
-1 - WAT
-Z Africa/Maputo 2:10:18 - LMT 1909
-2 - CAT
-Z Africa/Monrovia -0:43:8 - LMT 1882
--0:43:8 - MMT 1919 Mar
--0:44:30 - MMT 1972 Ja 7
-0 - GMT
-Z Africa/Nairobi 2:27:16 - LMT 1908 May
-2:30 - %z 1928 Jun 30 24
-3 - EAT 1930 Ja 4 24
-2:30 - %z 1936 D 31 24
-2:45 - %z 1942 Jul 31 24
-3 - EAT
-Z Africa/Ndjamena 1:0:12 - LMT 1912
-1 - WAT 1979 O 14
-1 1 WAST 1980 Mar 8
-1 - WAT
-Z Africa/Sao_Tome 0:26:56 - LMT 1884
--0:36:45 - LMT 1912 Ja 1 0u
-0 - GMT 2018 Ja 1 1
-1 - WAT 2019 Ja 1 2
-0 - GMT
-Z Africa/Tripoli 0:52:44 - LMT 1920
-1 L CE%sT 1959
-2 - EET 1982
-1 L CE%sT 1990 May 4
-2 - EET 1996 S 30
-1 L CE%sT 1997 O 4
-2 - EET 2012 N 10 2
-1 L CE%sT 2013 O 25 2
-2 - EET
-Z Africa/Tunis 0:40:44 - LMT 1881 May 12
-0:9:21 - PMT 1911 Mar 11
-1 n CE%sT
-Z Africa/Windhoek 1:8:24 - LMT 1892 F 8
-1:30 - %z 1903 Mar
-2 - SAST 1942 S 20 2
-2 1 SAST 1943 Mar 21 2
-2 - SAST 1990 Mar 21
-2 NA %s
-Z America/Adak 12:13:22 - LMT 1867 O 19 12:44:35
--11:46:38 - LMT 1900 Au 20 12
--11 - NST 1942
--11 u N%sT 1946
--11 - NST 1967 Ap
--11 - BST 1969
--11 u B%sT 1983 O 30 2
--10 u AH%sT 1983 N 30
--10 u H%sT
-Z America/Anchorage 14:0:24 - LMT 1867 O 19 14:31:37
--9:59:36 - LMT 1900 Au 20 12
--10 - AST 1942
--10 u A%sT 1967 Ap
--10 - AHST 1969
--10 u AH%sT 1983 O 30 2
--9 u Y%sT 1983 N 30
--9 u AK%sT
-Z America/Araguaina -3:12:48 - LMT 1914
--3 B %z 1990 S 17
--3 - %z 1995 S 14
--3 B %z 2003 S 24
--3 - %z 2012 O 21
--3 B %z 2013 S
--3 - %z
-Z America/Argentina/Buenos_Aires -3:53:48 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 A %z
-Z America/Argentina/Catamarca -4:23:8 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1991 Mar 3
--4 - %z 1991 O 20
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 - %z 2004 Jun
--4 - %z 2004 Jun 20
--3 A %z 2008 O 18
--3 - %z
-Z America/Argentina/Cordoba -4:16:48 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1991 Mar 3
--4 - %z 1991 O 20
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 A %z
-Z America/Argentina/Jujuy -4:21:12 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1990 Mar 4
--4 - %z 1990 O 28
--4 1 %z 1991 Mar 17
--4 - %z 1991 O 6
--3 1 %z 1992
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 A %z 2008 O 18
--3 - %z
-Z America/Argentina/La_Rioja -4:27:24 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1991 Mar
--4 - %z 1991 May 7
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 - %z 2004 Jun
--4 - %z 2004 Jun 20
--3 A %z 2008 O 18
--3 - %z
-Z America/Argentina/Mendoza -4:35:16 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1990 Mar 4
--4 - %z 1990 O 15
--4 1 %z 1991 Mar
--4 - %z 1991 O 15
--4 1 %z 1992 Mar
--4 - %z 1992 O 18
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 - %z 2004 May 23
--4 - %z 2004 S 26
--3 A %z 2008 O 18
--3 - %z
-Z America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 - %z 2004 Jun
--4 - %z 2004 Jun 20
--3 A %z 2008 O 18
--3 - %z
-Z America/Argentina/Salta -4:21:40 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1991 Mar 3
--4 - %z 1991 O 20
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 A %z 2008 O 18
--3 - %z
-Z America/Argentina/San_Juan -4:34:4 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1991 Mar
--4 - %z 1991 May 7
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 - %z 2004 May 31
--4 - %z 2004 Jul 25
--3 A %z 2008 O 18
--3 - %z
-Z America/Argentina/San_Luis -4:25:24 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1990
--3 1 %z 1990 Mar 14
--4 - %z 1990 O 15
--4 1 %z 1991 Mar
--4 - %z 1991 Jun
--3 - %z 1999 O 3
--4 1 %z 2000 Mar 3
--3 - %z 2004 May 31
--4 - %z 2004 Jul 25
--3 A %z 2008 Ja 21
--4 Sa %z 2009 O 11
--3 - %z
-Z America/Argentina/Tucuman -4:20:52 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1991 Mar 3
--4 - %z 1991 O 20
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 - %z 2004 Jun
--4 - %z 2004 Jun 13
--3 A %z
-Z America/Argentina/Ushuaia -4:33:12 - LMT 1894 O 31
--4:16:48 - CMT 1920 May
--4 - %z 1930 D
--4 A %z 1969 O 5
--3 A %z 1999 O 3
--4 A %z 2000 Mar 3
--3 - %z 2004 May 30
--4 - %z 2004 Jun 20
--3 A %z 2008 O 18
--3 - %z
-Z America/Asuncion -3:50:40 - LMT 1890
--3:50:40 - AMT 1931 O 10
--4 - %z 1972 O
--3 - %z 1974 Ap
--4 y %z
-Z America/Bahia -2:34:4 - LMT 1914
--3 B %z 2003 S 24
--3 - %z 2011 O 16
--3 B %z 2012 O 21
--3 - %z
-Z America/Bahia_Banderas -7:1 - LMT 1922 Ja 1 7u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 - CST 1942 Ap 24
--7 - MST 1970
--7 m M%sT 2010 Ap 4 2
--6 m C%sT
-Z America/Barbados -3:58:29 - LMT 1911 Au 28
--4 BB A%sT 1944
--4 BB AST/-0330 1945
--4 BB A%sT
-Z America/Belem -3:13:56 - LMT 1914
--3 B %z 1988 S 12
--3 - %z
-Z America/Belize -5:52:48 - LMT 1912 Ap
--6 BZ %s
-Z America/Boa_Vista -4:2:40 - LMT 1914
--4 B %z 1988 S 12
--4 - %z 1999 S 30
--4 B %z 2000 O 15
--4 - %z
-Z America/Bogota -4:56:16 - LMT 1884 Mar 13
--4:56:16 - BMT 1914 N 23
--5 CO %z
-Z America/Boise -7:44:49 - LMT 1883 N 18 20u
--8 u P%sT 1923 May 13 2
--7 u M%sT 1974
--7 - MST 1974 F 3 2
--7 u M%sT
-Z America/Cambridge_Bay 0 - -00 1920
--7 Y M%sT 1999 O 31 2
--6 C C%sT 2000 O 29 2
--5 - EST 2000 N 5
--6 - CST 2001 Ap 1 3
--7 C M%sT
-Z America/Campo_Grande -3:38:28 - LMT 1914
--4 B %z
-Z America/Cancun -5:47:4 - LMT 1922 Ja 1 6u
--6 - CST 1981 D 26 2
--5 - EST 1983 Ja 4
--6 m C%sT 1997 O 26 2
--5 m E%sT 1998 Au 2 2
--6 m C%sT 2015 F 1 2
--5 - EST
-Z America/Caracas -4:27:44 - LMT 1890
--4:27:40 - CMT 1912 F 12
--4:30 - %z 1965
--4 - %z 2007 D 9 3
--4:30 - %z 2016 May 1 2:30
--4 - %z
-Z America/Cayenne -3:29:20 - LMT 1911 Jul
--4 - %z 1967 O
--3 - %z
-Z America/Chicago -5:50:36 - LMT 1883 N 18 18u
--6 u C%sT 1920
--6 Ch C%sT 1936 Mar 1 2
--5 - EST 1936 N 15 2
--6 Ch C%sT 1942
--6 u C%sT 1946
--6 Ch C%sT 1967
--6 u C%sT
-Z America/Chihuahua -7:4:20 - LMT 1922 Ja 1 7u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 - CST 1996
--6 m C%sT 1998
--6 - CST 1998 Ap Su>=1 3
--7 m M%sT 2022 O 30 2
--6 - CST
-Z America/Ciudad_Juarez -7:5:56 - LMT 1922 Ja 1 7u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 - CST 1996
--6 m C%sT 1998
--6 - CST 1998 Ap Su>=1 3
--7 m M%sT 2010
--7 u M%sT 2022 O 30 2
--6 - CST 2022 N 30
--7 u M%sT
-Z America/Costa_Rica -5:36:13 - LMT 1890
--5:36:13 - SJMT 1921 Ja 15
--6 CR C%sT
-Z America/Cuiaba -3:44:20 - LMT 1914
--4 B %z 2003 S 24
--4 - %z 2004 O
--4 B %z
-Z America/Danmarkshavn -1:14:40 - LMT 1916 Jul 28
--3 - %z 1980 Ap 6 2
--3 E %z 1996
-0 - GMT
-Z America/Dawson -9:17:40 - LMT 1900 Au 20
--9 Y Y%sT 1965
--9 Yu Y%sT 1973 O 28
--8 - PST 1980
--8 C P%sT 2020 N
--7 - MST
-Z America/Dawson_Creek -8:0:56 - LMT 1884
--8 C P%sT 1947
--8 Va P%sT 1972 Au 30 2
--7 - MST
-Z America/Denver -6:59:56 - LMT 1883 N 18 19u
--7 u M%sT 1920
--7 De M%sT 1942
--7 u M%sT 1946
--7 De M%sT 1967
--7 u M%sT
-Z America/Detroit -5:32:11 - LMT 1905
--6 - CST 1915 May 15 2
--5 - EST 1942
--5 u E%sT 1946
--5 Dt E%sT 1967 Jun 14 0:1
--5 u E%sT 1969
--5 - EST 1973
--5 u E%sT 1975
--5 - EST 1975 Ap 27 2
--5 u E%sT
-Z America/Edmonton -7:33:52 - LMT 1906 S
--7 Ed M%sT 1987
--7 C M%sT
-Z America/Eirunepe -4:39:28 - LMT 1914
--5 B %z 1988 S 12
--5 - %z 1993 S 28
--5 B %z 1994 S 22
--5 - %z 2008 Jun 24
--4 - %z 2013 N 10
--5 - %z
-Z America/El_Salvador -5:56:48 - LMT 1921
--6 SV C%sT
-Z America/Fort_Nelson -8:10:47 - LMT 1884
--8 Va P%sT 1946
--8 - PST 1947
--8 Va P%sT 1987
--8 C P%sT 2015 Mar 8 2
--7 - MST
-Z America/Fortaleza -2:34 - LMT 1914
--3 B %z 1990 S 17
--3 - %z 1999 S 30
--3 B %z 2000 O 22
--3 - %z 2001 S 13
--3 B %z 2002 O
--3 - %z
-Z America/Glace_Bay -3:59:48 - LMT 1902 Jun 15
--4 C A%sT 1953
--4 H A%sT 1954
--4 - AST 1972
--4 H A%sT 1974
--4 C A%sT
-Z America/Goose_Bay -4:1:40 - LMT 1884
--3:30:52 - NST 1918
--3:30:52 C N%sT 1919
--3:30:52 - NST 1935 Mar 30
--3:30 - NST 1936
--3:30 j N%sT 1942 May 11
--3:30 C N%sT 1946
--3:30 j N%sT 1966 Mar 15 2
--4 j A%sT 2011 N
--4 C A%sT
-Z America/Grand_Turk -4:44:32 - LMT 1890
--5:7:10 - KMT 1912 F
--5 - EST 1979
--5 u E%sT 2015 Mar 8 2
--4 - AST 2018 Mar 11 3
--5 u E%sT
-Z America/Guatemala -6:2:4 - LMT 1918 O 5
--6 GT C%sT
-Z America/Guayaquil -5:19:20 - LMT 1890
--5:14 - QMT 1931
--5 EC %z
-Z America/Guyana -3:52:39 - LMT 1911 Au
--4 - %z 1915 Mar
--3:45 - %z 1975 Au
--3 - %z 1992 Mar 29 1
--4 - %z
-Z America/Halifax -4:14:24 - LMT 1902 Jun 15
--4 H A%sT 1918
--4 C A%sT 1919
--4 H A%sT 1942 F 9 2s
--4 C A%sT 1946
--4 H A%sT 1974
--4 C A%sT
-Z America/Havana -5:29:28 - LMT 1890
--5:29:36 - HMT 1925 Jul 19 12
--5 Q C%sT
-Z America/Hermosillo -7:23:52 - LMT 1922 Ja 1 7u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 - CST 1942 Ap 24
--7 - MST 1996
--7 m M%sT 1999
--7 - MST
-Z America/Indiana/Indianapolis -5:44:38 - LMT 1883 N 18 18u
--6 u C%sT 1920
--6 In C%sT 1942
--6 u C%sT 1946
--6 In C%sT 1955 Ap 24 2
--5 - EST 1957 S 29 2
--6 - CST 1958 Ap 27 2
--5 - EST 1969
--5 u E%sT 1971
--5 - EST 2006
--5 u E%sT
-Z America/Indiana/Knox -5:46:30 - LMT 1883 N 18 18u
--6 u C%sT 1947
--6 St C%sT 1962 Ap 29 2
--5 - EST 1963 O 27 2
--6 u C%sT 1991 O 27 2
--5 - EST 2006 Ap 2 2
--6 u C%sT
-Z America/Indiana/Marengo -5:45:23 - LMT 1883 N 18 18u
--6 u C%sT 1951
--6 Ma C%sT 1961 Ap 30 2
--5 - EST 1969
--5 u E%sT 1974 Ja 6 2
--6 1 CDT 1974 O 27 2
--5 u E%sT 1976
--5 - EST 2006
--5 u E%sT
-Z America/Indiana/Petersburg -5:49:7 - LMT 1883 N 18 18u
--6 u C%sT 1955
--6 Pi C%sT 1965 Ap 25 2
--5 - EST 1966 O 30 2
--6 u C%sT 1977 O 30 2
--5 - EST 2006 Ap 2 2
--6 u C%sT 2007 N 4 2
--5 u E%sT
-Z America/Indiana/Tell_City -5:47:3 - LMT 1883 N 18 18u
--6 u C%sT 1946
--6 Pe C%sT 1964 Ap 26 2
--5 - EST 1967 O 29 2
--6 u C%sT 1969 Ap 27 2
--5 u E%sT 1971
--5 - EST 2006 Ap 2 2
--6 u C%sT
-Z America/Indiana/Vevay -5:40:16 - LMT 1883 N 18 18u
--6 u C%sT 1954 Ap 25 2
--5 - EST 1969
--5 u E%sT 1973
--5 - EST 2006
--5 u E%sT
-Z America/Indiana/Vincennes -5:50:7 - LMT 1883 N 18 18u
--6 u C%sT 1946
--6 V C%sT 1964 Ap 26 2
--5 - EST 1969
--5 u E%sT 1971
--5 - EST 2006 Ap 2 2
--6 u C%sT 2007 N 4 2
--5 u E%sT
-Z America/Indiana/Winamac -5:46:25 - LMT 1883 N 18 18u
--6 u C%sT 1946
--6 Pu C%sT 1961 Ap 30 2
--5 - EST 1969
--5 u E%sT 1971
--5 - EST 2006 Ap 2 2
--6 u C%sT 2007 Mar 11 2
--5 u E%sT
-Z America/Inuvik 0 - -00 1953
--8 Y P%sT 1979 Ap lastSu 2
--7 Y M%sT 1980
--7 C M%sT
-Z America/Iqaluit 0 - -00 1942 Au
--5 Y E%sT 1999 O 31 2
--6 C C%sT 2000 O 29 2
--5 C E%sT
-Z America/Jamaica -5:7:10 - LMT 1890
--5:7:10 - KMT 1912 F
--5 - EST 1974
--5 u E%sT 1984
--5 - EST
-Z America/Juneau 15:2:19 - LMT 1867 O 19 15:33:32
--8:57:41 - LMT 1900 Au 20 12
--8 - PST 1942
--8 u P%sT 1946
--8 - PST 1969
--8 u P%sT 1980 Ap 27 2
--9 u Y%sT 1980 O 26 2
--8 u P%sT 1983 O 30 2
--9 u Y%sT 1983 N 30
--9 u AK%sT
-Z America/Kentucky/Louisville -5:43:2 - LMT 1883 N 18 18u
--6 u C%sT 1921
--6 v C%sT 1942
--6 u C%sT 1946
--6 v C%sT 1961 Jul 23 2
--5 - EST 1968
--5 u E%sT 1974 Ja 6 2
--6 1 CDT 1974 O 27 2
--5 u E%sT
-Z America/Kentucky/Monticello -5:39:24 - LMT 1883 N 18 18u
--6 u C%sT 1946
--6 - CST 1968
--6 u C%sT 2000 O 29 2
--5 u E%sT
-Z America/La_Paz -4:32:36 - LMT 1890
--4:32:36 - CMT 1931 O 15
--4:32:36 1 BST 1932 Mar 21
--4 - %z
-Z America/Lima -5:8:12 - LMT 1890
--5:8:36 - LMT 1908 Jul 28
--5 PE %z
-Z America/Los_Angeles -7:52:58 - LMT 1883 N 18 20u
--8 u P%sT 1946
--8 CA P%sT 1967
--8 u P%sT
-Z America/Maceio -2:22:52 - LMT 1914
--3 B %z 1990 S 17
--3 - %z 1995 O 13
--3 B %z 1996 S 4
--3 - %z 1999 S 30
--3 B %z 2000 O 22
--3 - %z 2001 S 13
--3 B %z 2002 O
--3 - %z
-Z America/Managua -5:45:8 - LMT 1890
--5:45:12 - MMT 1934 Jun 23
--6 - CST 1973 May
--5 - EST 1975 F 16
--6 NI C%sT 1992 Ja 1 4
--5 - EST 1992 S 24
--6 - CST 1993
--5 - EST 1997
--6 NI C%sT
-Z America/Manaus -4:0:4 - LMT 1914
--4 B %z 1988 S 12
--4 - %z 1993 S 28
--4 B %z 1994 S 22
--4 - %z
-Z America/Martinique -4:4:20 - LMT 1890
--4:4:20 - FFMT 1911 May
--4 - AST 1980 Ap 6
--4 1 ADT 1980 S 28
--4 - AST
-Z America/Matamoros -6:30 - LMT 1922 Ja 1 6u
--6 - CST 1988
--6 u C%sT 1989
--6 m C%sT 2010
--6 u C%sT
-Z America/Mazatlan -7:5:40 - LMT 1922 Ja 1 7u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 - CST 1942 Ap 24
--7 - MST 1970
--7 m M%sT
-Z America/Menominee -5:50:27 - LMT 1885 S 18 12
--6 u C%sT 1946
--6 Me C%sT 1969 Ap 27 2
--5 - EST 1973 Ap 29 2
--6 u C%sT
-Z America/Merida -5:58:28 - LMT 1922 Ja 1 6u
--6 - CST 1981 D 26 2
--5 - EST 1982 N 2 2
--6 m C%sT
-Z America/Metlakatla 15:13:42 - LMT 1867 O 19 15:44:55
--8:46:18 - LMT 1900 Au 20 12
--8 - PST 1942
--8 u P%sT 1946
--8 - PST 1969
--8 u P%sT 1983 O 30 2
--8 - PST 2015 N 1 2
--9 u AK%sT 2018 N 4 2
--8 - PST 2019 Ja 20 2
--9 u AK%sT
-Z America/Mexico_City -6:36:36 - LMT 1922 Ja 1 7u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 m C%sT 2001 S 30 2
--6 - CST 2002 F 20
--6 m C%sT
-Z America/Miquelon -3:44:40 - LMT 1911 Jun 15
--4 - AST 1980 May
--3 - %z 1987
--3 C %z
-Z America/Moncton -4:19:8 - LMT 1883 D 9
--5 - EST 1902 Jun 15
--4 C A%sT 1933
--4 o A%sT 1942
--4 C A%sT 1946
--4 o A%sT 1973
--4 C A%sT 1993
--4 o A%sT 2007
--4 C A%sT
-Z America/Monterrey -6:41:16 - LMT 1922 Ja 1 6u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 - CST 1988
--6 u C%sT 1989
--6 m C%sT
-Z America/Montevideo -3:44:51 - LMT 1908 Jun 10
--3:44:51 - MMT 1920 May
--4 - %z 1923 O
--3:30 U %z 1942 D 14
--3 U %z 1960
--3 U %z 1968
--3 U %z 1970
--3 U %z 1974
--3 U %z 1974 Mar 10
--3 U %z 1974 D 22
--3 U %z
-Z America/New_York -4:56:2 - LMT 1883 N 18 17u
--5 u E%sT 1920
--5 NY E%sT 1942
--5 u E%sT 1946
--5 NY E%sT 1967
--5 u E%sT
-Z America/Nome 12:58:22 - LMT 1867 O 19 13:29:35
--11:1:38 - LMT 1900 Au 20 12
--11 - NST 1942
--11 u N%sT 1946
--11 - NST 1967 Ap
--11 - BST 1969
--11 u B%sT 1983 O 30 2
--9 u Y%sT 1983 N 30
--9 u AK%sT
-Z America/Noronha -2:9:40 - LMT 1914
--2 B %z 1990 S 17
--2 - %z 1999 S 30
--2 B %z 2000 O 15
--2 - %z 2001 S 13
--2 B %z 2002 O
--2 - %z
-Z America/North_Dakota/Beulah -6:47:7 - LMT 1883 N 18 19u
--7 u M%sT 2010 N 7 2
--6 u C%sT
-Z America/North_Dakota/Center -6:45:12 - LMT 1883 N 18 19u
--7 u M%sT 1992 O 25 2
--6 u C%sT
-Z America/North_Dakota/New_Salem -6:45:39 - LMT 1883 N 18 19u
--7 u M%sT 2003 O 26 2
--6 u C%sT
-Z America/Nuuk -3:26:56 - LMT 1916 Jul 28
--3 - %z 1980 Ap 6 2
--3 E %z 2023 Mar 26 1u
--2 - %z 2023 O 29 1u
--2 E %z
-Z America/Ojinaga -6:57:40 - LMT 1922 Ja 1 7u
--7 - MST 1927 Jun 10
--6 - CST 1930 N 15
--7 m M%sT 1932 Ap
--6 - CST 1996
--6 m C%sT 1998
--6 - CST 1998 Ap Su>=1 3
--7 m M%sT 2010
--7 u M%sT 2022 O 30 2
--6 - CST 2022 N 30
--6 u C%sT
-Z America/Panama -5:18:8 - LMT 1890
--5:19:36 - CMT 1908 Ap 22
--5 - EST
-Z America/Paramaribo -3:40:40 - LMT 1911
--3:40:52 - PMT 1935
--3:40:36 - PMT 1945 O
--3:30 - %z 1984 O
--3 - %z
-Z America/Phoenix -7:28:18 - LMT 1883 N 18 19u
--7 u M%sT 1944 Ja 1 0:1
--7 - MST 1944 Ap 1 0:1
--7 u M%sT 1944 O 1 0:1
--7 - MST 1967
--7 u M%sT 1968 Mar 21
--7 - MST
-Z America/Port-au-Prince -4:49:20 - LMT 1890
--4:49 - PPMT 1917 Ja 24 12
--5 HT E%sT
-Z America/Porto_Velho -4:15:36 - LMT 1914
--4 B %z 1988 S 12
--4 - %z
-Z America/Puerto_Rico -4:24:25 - LMT 1899 Mar 28 12
--4 - AST 1942 May 3
--4 u A%sT 1946
--4 - AST
-Z America/Punta_Arenas -4:43:40 - LMT 1890
--4:42:45 - SMT 1910 Ja 10
--5 - %z 1916 Jul
--4:42:45 - SMT 1918 S 10
--4 - %z 1919 Jul
--4:42:45 - SMT 1927 S
--5 x %z 1932 S
--4 - %z 1942 Jun
--5 - %z 1942 Au
--4 - %z 1946 Au 28 24
--5 1 %z 1947 Mar 31 24
--5 - %z 1947 May 21 23
--4 x %z 2016 D 4
--3 - %z
-Z America/Rankin_Inlet 0 - -00 1957
--6 Y C%sT 2000 O 29 2
--5 - EST 2001 Ap 1 3
--6 C C%sT
-Z America/Recife -2:19:36 - LMT 1914
--3 B %z 1990 S 17
--3 - %z 1999 S 30
--3 B %z 2000 O 15
--3 - %z 2001 S 13
--3 B %z 2002 O
--3 - %z
-Z America/Regina -6:58:36 - LMT 1905 S
--7 r M%sT 1960 Ap lastSu 2
--6 - CST
-Z America/Resolute 0 - -00 1947 Au 31
--6 Y C%sT 2000 O 29 2
--5 - EST 2001 Ap 1 3
--6 C C%sT 2006 O 29 2
--5 - EST 2007 Mar 11 3
--6 C C%sT
-Z America/Rio_Branco -4:31:12 - LMT 1914
--5 B %z 1988 S 12
--5 - %z 2008 Jun 24
--4 - %z 2013 N 10
--5 - %z
-Z America/Santarem -3:38:48 - LMT 1914
--4 B %z 1988 S 12
--4 - %z 2008 Jun 24
--3 - %z
-Z America/Santiago -4:42:45 - LMT 1890
--4:42:45 - SMT 1910 Ja 10
--5 - %z 1916 Jul
--4:42:45 - SMT 1918 S 10
--4 - %z 1919 Jul
--4:42:45 - SMT 1927 S
--5 x %z 1932 S
--4 - %z 1942 Jun
--5 - %z 1942 Au
--4 - %z 1946 Jul 14 24
--4 1 %z 1946 Au 28 24
--5 1 %z 1947 Mar 31 24
--5 - %z 1947 May 21 23
--4 x %z
-Z America/Santo_Domingo -4:39:36 - LMT 1890
--4:40 - SDMT 1933 Ap 1 12
--5 DO %s 1974 O 27
--4 - AST 2000 O 29 2
--5 u E%sT 2000 D 3 1
--4 - AST
-Z America/Sao_Paulo -3:6:28 - LMT 1914
--3 B %z 1963 O 23
--3 1 %z 1964
--3 B %z
-Z America/Scoresbysund -1:27:52 - LMT 1916 Jul 28
--2 - %z 1980 Ap 6 2
--2 c %z 1981 Mar 29
--1 E %z 2024 Mar 31
--2 E %z
-Z America/Sitka 14:58:47 - LMT 1867 O 19 15:30
--9:1:13 - LMT 1900 Au 20 12
--8 - PST 1942
--8 u P%sT 1946
--8 - PST 1969
--8 u P%sT 1983 O 30 2
--9 u Y%sT 1983 N 30
--9 u AK%sT
-Z America/St_Johns -3:30:52 - LMT 1884
--3:30:52 j N%sT 1918
--3:30:52 C N%sT 1919
--3:30:52 j N%sT 1935 Mar 30
--3:30 j N%sT 1942 May 11
--3:30 C N%sT 1946
--3:30 j N%sT 2011 N
--3:30 C N%sT
-Z America/Swift_Current -7:11:20 - LMT 1905 S
--7 C M%sT 1946 Ap lastSu 2
--7 r M%sT 1950
--7 Sw M%sT 1972 Ap lastSu 2
--6 - CST
-Z America/Tegucigalpa -5:48:52 - LMT 1921 Ap
--6 HN C%sT
-Z America/Thule -4:35:8 - LMT 1916 Jul 28
--4 Th A%sT
-Z America/Tijuana -7:48:4 - LMT 1922 Ja 1 7u
--7 - MST 1924
--8 - PST 1927 Jun 10
--7 - MST 1930 N 15
--8 - PST 1931 Ap
--8 1 PDT 1931 S 30
--8 - PST 1942 Ap 24
--8 1 PWT 1945 Au 14 23u
--8 1 PPT 1945 N 15
--8 - PST 1948 Ap 5
--8 1 PDT 1949 Ja 14
--8 - PST 1950 May
--8 1 PDT 1950 S 24
--8 - PST 1951 Ap 29 2
--8 1 PDT 1951 S 30 2
--8 - PST 1952 Ap 27 2
--8 1 PDT 1952 S 28 2
--8 - PST 1954
--8 CA P%sT 1961
--8 - PST 1976
--8 u P%sT 1996
--8 m P%sT 2001
--8 u P%sT 2002 F 20
--8 m P%sT 2010
--8 u P%sT
-Z America/Toronto -5:17:32 - LMT 1895
--5 C E%sT 1919
--5 t E%sT 1942 F 9 2s
--5 C E%sT 1946
--5 t E%sT 1974
--5 C E%sT
-Z America/Vancouver -8:12:28 - LMT 1884
--8 Va P%sT 1987
--8 C P%sT
-Z America/Whitehorse -9:0:12 - LMT 1900 Au 20
--9 Y Y%sT 1965
--9 Yu Y%sT 1966 F 27
--8 - PST 1980
--8 C P%sT 2020 N
--7 - MST
-Z America/Winnipeg -6:28:36 - LMT 1887 Jul 16
--6 W C%sT 2006
--6 C C%sT
-Z America/Yakutat 14:41:5 - LMT 1867 O 19 15:12:18
--9:18:55 - LMT 1900 Au 20 12
--9 - YST 1942
--9 u Y%sT 1946
--9 - YST 1969
--9 u Y%sT 1983 N 30
--9 u AK%sT
-Z Antarctica/Casey 0 - -00 1969
-8 - %z 2009 O 18 2
-11 - %z 2010 Mar 5 2
-8 - %z 2011 O 28 2
-11 - %z 2012 F 21 17u
-8 - %z 2016 O 22
-11 - %z 2018 Mar 11 4
-8 - %z 2018 O 7 4
-11 - %z 2019 Mar 17 3
-8 - %z 2019 O 4 3
-11 - %z 2020 Mar 8 3
-8 - %z 2020 O 4 0:1
-11 - %z 2021 Mar 14
-8 - %z 2021 O 3 0:1
-11 - %z 2022 Mar 13
-8 - %z 2022 O 2 0:1
-11 - %z 2023 Mar 9 3
-8 - %z
-Z Antarctica/Davis 0 - -00 1957 Ja 13
-7 - %z 1964 N
-0 - -00 1969 F
-7 - %z 2009 O 18 2
-5 - %z 2010 Mar 10 20u
-7 - %z 2011 O 28 2
-5 - %z 2012 F 21 20u
-7 - %z
-Z Antarctica/Macquarie 0 - -00 1899 N
-10 - AEST 1916 O 1 2
-10 1 AEDT 1917 F
-10 AU AE%sT 1919 Ap 1 0s
-0 - -00 1948 Mar 25
-10 AU AE%sT 1967
-10 AT AE%sT 2010
-10 1 AEDT 2011
-10 AT AE%sT
-Z Antarctica/Mawson 0 - -00 1954 F 13
-6 - %z 2009 O 18 2
-5 - %z
-Z Antarctica/Palmer 0 - -00 1965
--4 A %z 1969 O 5
--3 A %z 1982 May
--4 x %z 2016 D 4
--3 - %z
-Z Antarctica/Rothera 0 - -00 1976 D
--3 - %z
-Z Antarctica/Troll 0 - -00 2005 F 12
-0 Tr %s
-Z Antarctica/Vostok 0 - -00 1957 D 16
-7 - %z 1994 F
-0 - -00 1994 N
-7 - %z 2023 D 18 2
-5 - %z
-Z Asia/Almaty 5:7:48 - LMT 1924 May 2
-5 - %z 1930 Jun 21
-6 R %z 1991 Mar 31 2s
-5 R %z 1992 Ja 19 2s
-6 R %z 2004 O 31 2s
-6 - %z 2024 Mar
-5 - %z
-Z Asia/Amman 2:23:44 - LMT 1931
-2 J EE%sT 2022 O 28 0s
-3 - %z
-Z Asia/Anadyr 11:49:56 - LMT 1924 May 2
-12 - %z 1930 Jun 21
-13 R %z 1982 Ap 1 0s
-12 R %z 1991 Mar 31 2s
-11 R %z 1992 Ja 19 2s
-12 R %z 2010 Mar 28 2s
-11 R %z 2011 Mar 27 2s
-12 - %z
-Z Asia/Aqtau 3:21:4 - LMT 1924 May 2
-4 - %z 1930 Jun 21
-5 - %z 1981 O
-6 - %z 1982 Ap
-5 R %z 1991 Mar 31 2s
-4 R %z 1992 Ja 19 2s
-5 R %z 1994 S 25 2s
-4 R %z 2004 O 31 2s
-5 - %z
-Z Asia/Aqtobe 3:48:40 - LMT 1924 May 2
-4 - %z 1930 Jun 21
-5 - %z 1981 Ap
-5 1 %z 1981 O
-6 - %z 1982 Ap
-5 R %z 1991 Mar 31 2s
-4 R %z 1992 Ja 19 2s
-5 R %z 2004 O 31 2s
-5 - %z
-Z Asia/Ashgabat 3:53:32 - LMT 1924 May 2
-4 - %z 1930 Jun 21
-5 R %z 1991 Mar 31 2
-4 R %z 1992 Ja 19 2
-5 - %z
-Z Asia/Atyrau 3:27:44 - LMT 1924 May 2
-3 - %z 1930 Jun 21
-5 - %z 1981 O
-6 - %z 1982 Ap
-5 R %z 1991 Mar 31 2s
-4 R %z 1992 Ja 19 2s
-5 R %z 1999 Mar 28 2s
-4 R %z 2004 O 31 2s
-5 - %z
-Z Asia/Baghdad 2:57:40 - LMT 1890
-2:57:36 - BMT 1918
-3 - %z 1982 May
-3 IQ %z
-Z Asia/Baku 3:19:24 - LMT 1924 May 2
-3 - %z 1957 Mar
-4 R %z 1991 Mar 31 2s
-3 R %z 1992 S lastSu 2s
-4 - %z 1996
-4 E %z 1997
-4 AZ %z
-Z Asia/Bangkok 6:42:4 - LMT 1880
-6:42:4 - BMT 1920 Ap
-7 - %z
-Z Asia/Barnaul 5:35 - LMT 1919 D 10
-6 - %z 1930 Jun 21
-7 R %z 1991 Mar 31 2s
-6 R %z 1992 Ja 19 2s
-7 R %z 1995 May 28
-6 R %z 2011 Mar 27 2s
-7 - %z 2014 O 26 2s
-6 - %z 2016 Mar 27 2s
-7 - %z
-Z Asia/Beirut 2:22 - LMT 1880
-2 l EE%sT
-Z Asia/Bishkek 4:58:24 - LMT 1924 May 2
-5 - %z 1930 Jun 21
-6 R %z 1991 Mar 31 2s
-5 R %z 1991 Au 31 2
-5 KG %z 2005 Au 12
-6 - %z
-Z Asia/Chita 7:33:52 - LMT 1919 D 15
-8 - %z 1930 Jun 21
-9 R %z 1991 Mar 31 2s
-8 R %z 1992 Ja 19 2s
-9 R %z 2011 Mar 27 2s
-10 - %z 2014 O 26 2s
-8 - %z 2016 Mar 27 2
-9 - %z
-Z Asia/Colombo 5:19:24 - LMT 1880
-5:19:32 - MMT 1906
-5:30 - %z 1942 Ja 5
-5:30 0:30 %z 1942 S
-5:30 1 %z 1945 O 16 2
-5:30 - %z 1996 May 25
-6:30 - %z 1996 O 26 0:30
-6 - %z 2006 Ap 15 0:30
-5:30 - %z
-Z Asia/Damascus 2:25:12 - LMT 1920
-2 S EE%sT 2022 O 28
-3 - %z
-Z Asia/Dhaka 6:1:40 - LMT 1890
-5:53:20 - HMT 1941 O
-6:30 - %z 1942 May 15
-5:30 - %z 1942 S
-6:30 - %z 1951 S 30
-6 - %z 2009
-6 BD %z
-Z Asia/Dili 8:22:20 - LMT 1911 D 31 16u
-8 - %z 1942 F 21 23
-9 - %z 1976 May 3
-8 - %z 2000 S 17
-9 - %z
-Z Asia/Dubai 3:41:12 - LMT 1920
-4 - %z
-Z Asia/Dushanbe 4:35:12 - LMT 1924 May 2
-5 - %z 1930 Jun 21
-6 R %z 1991 Mar 31 2s
-5 1 %z 1991 S 9 2s
-5 - %z
-Z Asia/Famagusta 2:15:48 - LMT 1921 N 14
-2 CY EE%sT 1998 S
-2 E EE%sT 2016 S 8
-3 - %z 2017 O 29 1u
-2 E EE%sT
-Z Asia/Gaza 2:17:52 - LMT 1900 O
-2 Z EET/EEST 1948 May 15
-2 K EE%sT 1967 Jun 5
-2 Z I%sT 1996
-2 J EE%sT 1999
-2 P EE%sT 2008 Au 29
-2 - EET 2008 S
-2 P EE%sT 2010
-2 - EET 2010 Mar 27 0:1
-2 P EE%sT 2011 Au
-2 - EET 2012
-2 P EE%sT
-Z Asia/Hebron 2:20:23 - LMT 1900 O
-2 Z EET/EEST 1948 May 15
-2 K EE%sT 1967 Jun 5
-2 Z I%sT 1996
-2 J EE%sT 1999
-2 P EE%sT
-Z Asia/Ho_Chi_Minh 7:6:30 - LMT 1906 Jul
-7:6:30 - PLMT 1911 May
-7 - %z 1942 D 31 23
-8 - %z 1945 Mar 14 23
-9 - %z 1945 S 1 24
-7 - %z 1947 Ap
-8 - %z 1955 Jul 1 1
-7 - %z 1959 D 31 23
-8 - %z 1975 Jun 13
-7 - %z
-Z Asia/Hong_Kong 7:36:42 - LMT 1904 O 29 17u
-8 - HKT 1941 Jun 15 3
-8 1 HKST 1941 O 1 4
-8 0:30 HKWT 1941 D 25
-9 - JST 1945 N 18 2
-8 HK HK%sT
-Z Asia/Hovd 6:6:36 - LMT 1905 Au
-6 - %z 1978
-7 X %z
-Z Asia/Irkutsk 6:57:5 - LMT 1880
-6:57:5 - IMT 1920 Ja 25
-7 - %z 1930 Jun 21
-8 R %z 1991 Mar 31 2s
-7 R %z 1992 Ja 19 2s
-8 R %z 2011 Mar 27 2s
-9 - %z 2014 O 26 2s
-8 - %z
-Z Asia/Jakarta 7:7:12 - LMT 1867 Au 10
-7:7:12 - BMT 1923 D 31 16:40u
-7:20 - %z 1932 N
-7:30 - %z 1942 Mar 23
-9 - %z 1945 S 23
-7:30 - %z 1948 May
-8 - %z 1950 May
-7:30 - %z 1964
-7 - WIB
-Z Asia/Jayapura 9:22:48 - LMT 1932 N
-9 - %z 1944 S
-9:30 - %z 1964
-9 - WIT
-Z Asia/Jerusalem 2:20:54 - LMT 1880
-2:20:40 - JMT 1918
-2 Z I%sT
-Z Asia/Kabul 4:36:48 - LMT 1890
-4 - %z 1945
-4:30 - %z
-Z Asia/Kamchatka 10:34:36 - LMT 1922 N 10
-11 - %z 1930 Jun 21
-12 R %z 1991 Mar 31 2s
-11 R %z 1992 Ja 19 2s
-12 R %z 2010 Mar 28 2s
-11 R %z 2011 Mar 27 2s
-12 - %z
-Z Asia/Karachi 4:28:12 - LMT 1907
-5:30 - %z 1942 S
-5:30 1 %z 1945 O 15
-5:30 - %z 1951 S 30
-5 - %z 1971 Mar 26
-5 PK PK%sT
-Z Asia/Kathmandu 5:41:16 - LMT 1920
-5:30 - %z 1986
-5:45 - %z
-Z Asia/Khandyga 9:2:13 - LMT 1919 D 15
-8 - %z 1930 Jun 21
-9 R %z 1991 Mar 31 2s
-8 R %z 1992 Ja 19 2s
-9 R %z 2004
-10 R %z 2011 Mar 27 2s
-11 - %z 2011 S 13 0s
-10 - %z 2014 O 26 2s
-9 - %z
-Z Asia/Kolkata 5:53:28 - LMT 1854 Jun 28
-5:53:20 - HMT 1870
-5:21:10 - MMT 1906
-5:30 - IST 1941 O
-5:30 1 %z 1942 May 15
-5:30 - IST 1942 S
-5:30 1 %z 1945 O 15
-5:30 - IST
-Z Asia/Krasnoyarsk 6:11:26 - LMT 1920 Ja 6
-6 - %z 1930 Jun 21
-7 R %z 1991 Mar 31 2s
-6 R %z 1992 Ja 19 2s
-7 R %z 2011 Mar 27 2s
-8 - %z 2014 O 26 2s
-7 - %z
-Z Asia/Kuching 7:21:20 - LMT 1926 Mar
-7:30 - %z 1933
-8 NB %z 1942 F 16
-9 - %z 1945 S 12
-8 - %z
-Z Asia/Macau 7:34:10 - LMT 1904 O 30
-8 - CST 1941 D 21 23
-9 _ %z 1945 S 30 24
-8 _ C%sT
-Z Asia/Magadan 10:3:12 - LMT 1924 May 2
-10 - %z 1930 Jun 21
-11 R %z 1991 Mar 31 2s
-10 R %z 1992 Ja 19 2s
-11 R %z 2011 Mar 27 2s
-12 - %z 2014 O 26 2s
-10 - %z 2016 Ap 24 2s
-11 - %z
-Z Asia/Makassar 7:57:36 - LMT 1920
-7:57:36 - MMT 1932 N
-8 - %z 1942 F 9
-9 - %z 1945 S 23
-8 - WITA
-Z Asia/Manila -15:56 - LMT 1844 D 31
-8:4 - LMT 1899 May 11
-8 PH P%sT 1942 May
-9 - JST 1944 N
-8 PH P%sT
-Z Asia/Nicosia 2:13:28 - LMT 1921 N 14
-2 CY EE%sT 1998 S
-2 E EE%sT
-Z Asia/Novokuznetsk 5:48:48 - LMT 1924 May
-6 - %z 1930 Jun 21
-7 R %z 1991 Mar 31 2s
-6 R %z 1992 Ja 19 2s
-7 R %z 2010 Mar 28 2s
-6 R %z 2011 Mar 27 2s
-7 - %z
-Z Asia/Novosibirsk 5:31:40 - LMT 1919 D 14 6
-6 - %z 1930 Jun 21
-7 R %z 1991 Mar 31 2s
-6 R %z 1992 Ja 19 2s
-7 R %z 1993 May 23
-6 R %z 2011 Mar 27 2s
-7 - %z 2014 O 26 2s
-6 - %z 2016 Jul 24 2s
-7 - %z
-Z Asia/Omsk 4:53:30 - LMT 1919 N 14
-5 - %z 1930 Jun 21
-6 R %z 1991 Mar 31 2s
-5 R %z 1992 Ja 19 2s
-6 R %z 2011 Mar 27 2s
-7 - %z 2014 O 26 2s
-6 - %z
-Z Asia/Oral 3:25:24 - LMT 1924 May 2
-3 - %z 1930 Jun 21
-5 - %z 1981 Ap
-5 1 %z 1981 O
-6 - %z 1982 Ap
-5 R %z 1989 Mar 26 2s
-4 R %z 1992 Ja 19 2s
-5 R %z 1992 Mar 29 2s
-4 R %z 2004 O 31 2s
-5 - %z
-Z Asia/Pontianak 7:17:20 - LMT 1908 May
-7:17:20 - PMT 1932 N
-7:30 - %z 1942 Ja 29
-9 - %z 1945 S 23
-7:30 - %z 1948 May
-8 - %z 1950 May
-7:30 - %z 1964
-8 - WITA 1988
-7 - WIB
-Z Asia/Pyongyang 8:23 - LMT 1908 Ap
-8:30 - KST 1912
-9 - JST 1945 Au 24
-9 - KST 2015 Au 15
-8:30 - KST 2018 May 4 23:30
-9 - KST
-Z Asia/Qatar 3:26:8 - LMT 1920
-4 - %z 1972 Jun
-3 - %z
-Z Asia/Qostanay 4:14:28 - LMT 1924 May 2
-4 - %z 1930 Jun 21
-5 - %z 1981 Ap
-5 1 %z 1981 O
-6 - %z 1982 Ap
-5 R %z 1991 Mar 31 2s
-4 R %z 1992 Ja 19 2s
-5 R %z 2004 O 31 2s
-6 - %z 2024 Mar
-5 - %z
-Z Asia/Qyzylorda 4:21:52 - LMT 1924 May 2
-4 - %z 1930 Jun 21
-5 - %z 1981 Ap
-5 1 %z 1981 O
-6 - %z 1982 Ap
-5 R %z 1991 Mar 31 2s
-4 R %z 1991 S 29 2s
-5 R %z 1992 Ja 19 2s
-6 R %z 1992 Mar 29 2s
-5 R %z 2004 O 31 2s
-6 - %z 2018 D 21
-5 - %z
-Z Asia/Riyadh 3:6:52 - LMT 1947 Mar 14
-3 - %z
-Z Asia/Sakhalin 9:30:48 - LMT 1905 Au 23
-9 - %z 1945 Au 25
-11 R %z 1991 Mar 31 2s
-10 R %z 1992 Ja 19 2s
-11 R %z 1997 Mar lastSu 2s
-10 R %z 2011 Mar 27 2s
-11 - %z 2014 O 26 2s
-10 - %z 2016 Mar 27 2s
-11 - %z
-Z Asia/Samarkand 4:27:53 - LMT 1924 May 2
-4 - %z 1930 Jun 21
-5 - %z 1981 Ap
-5 1 %z 1981 O
-6 - %z 1982 Ap
-5 R %z 1992
-5 - %z
-Z Asia/Seoul 8:27:52 - LMT 1908 Ap
-8:30 - KST 1912
-9 - JST 1945 S 8
-9 KR K%sT 1954 Mar 21
-8:30 KR K%sT 1961 Au 10
-9 KR K%sT
-Z Asia/Shanghai 8:5:43 - LMT 1901
-8 Sh C%sT 1949 May 28
-8 CN C%sT
-Z Asia/Singapore 6:55:25 - LMT 1901
-6:55:25 - SMT 1905 Jun
-7 - %z 1933
-7 0:20 %z 1936
-7:20 - %z 1941 S
-7:30 - %z 1942 F 16
-9 - %z 1945 S 12
-7:30 - %z 1981 D 31 16u
-8 - %z
-Z Asia/Srednekolymsk 10:14:52 - LMT 1924 May 2
-10 - %z 1930 Jun 21
-11 R %z 1991 Mar 31 2s
-10 R %z 1992 Ja 19 2s
-11 R %z 2011 Mar 27 2s
-12 - %z 2014 O 26 2s
-11 - %z
-Z Asia/Taipei 8:6 - LMT 1896
-8 - CST 1937 O
-9 - JST 1945 S 21 1
-8 f C%sT
-Z Asia/Tashkent 4:37:11 - LMT 1924 May 2
-5 - %z 1930 Jun 21
-6 R %z 1991 Mar 31 2
-5 R %z 1992
-5 - %z
-Z Asia/Tbilisi 2:59:11 - LMT 1880
-2:59:11 - TBMT 1924 May 2
-3 - %z 1957 Mar
-4 R %z 1991 Mar 31 2s
-3 R %z 1992
-3 e %z 1994 S lastSu
-4 e %z 1996 O lastSu
-4 1 %z 1997 Mar lastSu
-4 e %z 2004 Jun 27
-3 R %z 2005 Mar lastSu 2
-4 - %z
-Z Asia/Tehran 3:25:44 - LMT 1916
-3:25:44 - TMT 1935 Jun 13
-3:30 i %z 1977 O 20 24
-4 i %z 1979
-3:30 i %z
-Z Asia/Thimphu 5:58:36 - LMT 1947 Au 15
-5:30 - %z 1987 O
-6 - %z
-Z Asia/Tokyo 9:18:59 - LMT 1887 D 31 15u
-9 JP J%sT
-Z Asia/Tomsk 5:39:51 - LMT 1919 D 22
-6 - %z 1930 Jun 21
-7 R %z 1991 Mar 31 2s
-6 R %z 1992 Ja 19 2s
-7 R %z 2002 May 1 3
-6 R %z 2011 Mar 27 2s
-7 - %z 2014 O 26 2s
-6 - %z 2016 May 29 2s
-7 - %z
-Z Asia/Ulaanbaatar 7:7:32 - LMT 1905 Au
-7 - %z 1978
-8 X %z
-Z Asia/Urumqi 5:50:20 - LMT 1928
-6 - %z
-Z Asia/Ust-Nera 9:32:54 - LMT 1919 D 15
-8 - %z 1930 Jun 21
-9 R %z 1981 Ap
-11 R %z 1991 Mar 31 2s
-10 R %z 1992 Ja 19 2s
-11 R %z 2011 Mar 27 2s
-12 - %z 2011 S 13 0s
-11 - %z 2014 O 26 2s
-10 - %z
-Z Asia/Vladivostok 8:47:31 - LMT 1922 N 15
-9 - %z 1930 Jun 21
-10 R %z 1991 Mar 31 2s
-9 R %z 1992 Ja 19 2s
-10 R %z 2011 Mar 27 2s
-11 - %z 2014 O 26 2s
-10 - %z
-Z Asia/Yakutsk 8:38:58 - LMT 1919 D 15
-8 - %z 1930 Jun 21
-9 R %z 1991 Mar 31 2s
-8 R %z 1992 Ja 19 2s
-9 R %z 2011 Mar 27 2s
-10 - %z 2014 O 26 2s
-9 - %z
-Z Asia/Yangon 6:24:47 - LMT 1880
-6:24:47 - RMT 1920
-6:30 - %z 1942 May
-9 - %z 1945 May 3
-6:30 - %z
-Z Asia/Yekaterinburg 4:2:33 - LMT 1916 Jul 3
-3:45:5 - PMT 1919 Jul 15 4
-4 - %z 1930 Jun 21
-5 R %z 1991 Mar 31 2s
-4 R %z 1992 Ja 19 2s
-5 R %z 2011 Mar 27 2s
-6 - %z 2014 O 26 2s
-5 - %z
-Z Asia/Yerevan 2:58 - LMT 1924 May 2
-3 - %z 1957 Mar
-4 R %z 1991 Mar 31 2s
-3 R %z 1995 S 24 2s
-4 - %z 1997
-4 R %z 2011
-4 AM %z
-Z Atlantic/Azores -1:42:40 - LMT 1884
--1:54:32 - HMT 1912 Ja 1 2u
--2 p %z 1966 O 2 2s
--1 - %z 1982 Mar 28 0s
--1 p %z 1986
--1 E %z 1992 D 27 1s
-0 E WE%sT 1993 Jun 17 1u
--1 E %z
-Z Atlantic/Bermuda -4:19:18 - LMT 1890
--4:19:18 Be BMT/BST 1930 Ja 1 2
--4 Be A%sT 1974 Ap 28 2
--4 C A%sT 1976
--4 u A%sT
-Z Atlantic/Canary -1:1:36 - LMT 1922 Mar
--1 - %z 1946 S 30 1
-0 - WET 1980 Ap 6 0s
-0 1 WEST 1980 S 28 1u
-0 E WE%sT
-Z Atlantic/Cape_Verde -1:34:4 - LMT 1912 Ja 1 2u
--2 - %z 1942 S
--2 1 %z 1945 O 15
--2 - %z 1975 N 25 2
--1 - %z
-Z Atlantic/Faroe -0:27:4 - LMT 1908 Ja 11
-0 - WET 1981
-0 E WE%sT
-Z Atlantic/Madeira -1:7:36 - LMT 1884
--1:7:36 - FMT 1912 Ja 1 1u
--1 p %z 1966 O 2 2s
-0 - WET 1982 Ap 4
-0 p WE%sT 1986 Jul 31
-0 E WE%sT
-Z Atlantic/South_Georgia -2:26:8 - LMT 1890
--2 - %z
-Z Atlantic/Stanley -3:51:24 - LMT 1890
--3:51:24 - SMT 1912 Mar 12
--4 FK %z 1983 May
--3 FK %z 1985 S 15
--4 FK %z 2010 S 5 2
--3 - %z
-Z Australia/Adelaide 9:14:20 - LMT 1895 F
-9 - ACST 1899 May
-9:30 AU AC%sT 1971
-9:30 AS AC%sT
-Z Australia/Brisbane 10:12:8 - LMT 1895
-10 AU AE%sT 1971
-10 AQ AE%sT
-Z Australia/Broken_Hill 9:25:48 - LMT 1895 F
-10 - AEST 1896 Au 23
-9 - ACST 1899 May
-9:30 AU AC%sT 1971
-9:30 AN AC%sT 2000
-9:30 AS AC%sT
-Z Australia/Darwin 8:43:20 - LMT 1895 F
-9 - ACST 1899 May
-9:30 AU AC%sT
-Z Australia/Eucla 8:35:28 - LMT 1895 D
-8:45 AU %z 1943 Jul
-8:45 AW %z
-Z Australia/Hobart 9:49:16 - LMT 1895 S
-10 AT AE%sT 1919 O 24
-10 AU AE%sT 1967
-10 AT AE%sT
-Z Australia/Lindeman 9:55:56 - LMT 1895
-10 AU AE%sT 1971
-10 AQ AE%sT 1992 Jul
-10 Ho AE%sT
-Z Australia/Lord_Howe 10:36:20 - LMT 1895 F
-10 - AEST 1981 Mar
-10:30 LH %z 1985 Jul
-10:30 LH %z
-Z Australia/Melbourne 9:39:52 - LMT 1895 F
-10 AU AE%sT 1971
-10 AV AE%sT
-Z Australia/Perth 7:43:24 - LMT 1895 D
-8 AU AW%sT 1943 Jul
-8 AW AW%sT
-Z Australia/Sydney 10:4:52 - LMT 1895 F
-10 AU AE%sT 1971
-10 AN AE%sT
-Z Etc/GMT 0 - GMT
-Z Etc/GMT+1 -1 - %z
-Z Etc/GMT+10 -10 - %z
-Z Etc/GMT+11 -11 - %z
-Z Etc/GMT+12 -12 - %z
-Z Etc/GMT+2 -2 - %z
-Z Etc/GMT+3 -3 - %z
-Z Etc/GMT+4 -4 - %z
-Z Etc/GMT+5 -5 - %z
-Z Etc/GMT+6 -6 - %z
-Z Etc/GMT+7 -7 - %z
-Z Etc/GMT+8 -8 - %z
-Z Etc/GMT+9 -9 - %z
-Z Etc/GMT-1 1 - %z
-Z Etc/GMT-10 10 - %z
-Z Etc/GMT-11 11 - %z
-Z Etc/GMT-12 12 - %z
-Z Etc/GMT-13 13 - %z
-Z Etc/GMT-14 14 - %z
-Z Etc/GMT-2 2 - %z
-Z Etc/GMT-3 3 - %z
-Z Etc/GMT-4 4 - %z
-Z Etc/GMT-5 5 - %z
-Z Etc/GMT-6 6 - %z
-Z Etc/GMT-7 7 - %z
-Z Etc/GMT-8 8 - %z
-Z Etc/GMT-9 9 - %z
-Z Etc/UTC 0 - UTC
-Z Europe/Andorra 0:6:4 - LMT 1901
-0 - WET 1946 S 30
-1 - CET 1985 Mar 31 2
-1 E CE%sT
-Z Europe/Astrakhan 3:12:12 - LMT 1924 May
-3 - %z 1930 Jun 21
-4 R %z 1989 Mar 26 2s
-3 R %z 1991 Mar 31 2s
-4 - %z 1992 Mar 29 2s
-3 R %z 2011 Mar 27 2s
-4 - %z 2014 O 26 2s
-3 - %z 2016 Mar 27 2s
-4 - %z
-Z Europe/Athens 1:34:52 - LMT 1895 S 14
-1:34:52 - AMT 1916 Jul 28 0:1
-2 g EE%sT 1941 Ap 30
-1 g CE%sT 1944 Ap 4
-2 g EE%sT 1981
-2 E EE%sT
-Z Europe/Belgrade 1:22 - LMT 1884
-1 - CET 1941 Ap 18 23
-1 c CE%sT 1945
-1 - CET 1945 May 8 2s
-1 1 CEST 1945 S 16 2s
-1 - CET 1982 N 27
-1 E CE%sT
-Z Europe/Berlin 0:53:28 - LMT 1893 Ap
-1 c CE%sT 1945 May 24 2
-1 So CE%sT 1946
-1 DE CE%sT 1980
-1 E CE%sT
-Z Europe/Brussels 0:17:30 - LMT 1880
-0:17:30 - BMT 1892 May 1 0:17:30
-0 - WET 1914 N 8
-1 - CET 1916 May
-1 c CE%sT 1918 N 11 11u
-0 b WE%sT 1940 May 20 2s
-1 c CE%sT 1944 S 3
-1 b CE%sT 1977
-1 E CE%sT
-Z Europe/Bucharest 1:44:24 - LMT 1891 O
-1:44:24 - BMT 1931 Jul 24
-2 z EE%sT 1981 Mar 29 2s
-2 c EE%sT 1991
-2 z EE%sT 1994
-2 e EE%sT 1997
-2 E EE%sT
-Z Europe/Budapest 1:16:20 - LMT 1890 N
-1 c CE%sT 1918
-1 h CE%sT 1941 Ap 7 23
-1 c CE%sT 1945
-1 h CE%sT 1984
-1 E CE%sT
-Z Europe/Chisinau 1:55:20 - LMT 1880
-1:55 - CMT 1918 F 15
-1:44:24 - BMT 1931 Jul 24
-2 z EE%sT 1940 Au 15
-2 1 EEST 1941 Jul 17
-1 c CE%sT 1944 Au 24
-3 R MSK/MSD 1990 May 6 2
-2 R EE%sT 1992
-2 e EE%sT 1997
-2 MD EE%sT
-Z Europe/Dublin -0:25:21 - LMT 1880 Au 2
--0:25:21 - DMT 1916 May 21 2s
--0:25:21 1 IST 1916 O 1 2s
-0 G %s 1921 D 6
-0 G GMT/IST 1940 F 25 2s
-0 1 IST 1946 O 6 2s
-0 - GMT 1947 Mar 16 2s
-0 1 IST 1947 N 2 2s
-0 - GMT 1948 Ap 18 2s
-0 G GMT/IST 1968 O 27
-1 IE IST/GMT
-Z Europe/Gibraltar -0:21:24 - LMT 1880 Au 2
-0 G %s 1957 Ap 14 2
-1 - CET 1982
-1 E CE%sT
-Z Europe/Helsinki 1:39:49 - LMT 1878 May 31
-1:39:49 - HMT 1921 May
-2 FI EE%sT 1983
-2 E EE%sT
-Z Europe/Istanbul 1:55:52 - LMT 1880
-1:56:56 - IMT 1910 O
-2 T EE%sT 1978 Jun 29
-3 T %z 1984 N 1 2
-2 T EE%sT 2007
-2 E EE%sT 2011 Mar 27 1u
-2 - EET 2011 Mar 28 1u
-2 E EE%sT 2014 Mar 30 1u
-2 - EET 2014 Mar 31 1u
-2 E EE%sT 2015 O 25 1u
-2 1 EEST 2015 N 8 1u
-2 E EE%sT 2016 S 7
-3 - %z
-Z Europe/Kaliningrad 1:22 - LMT 1893 Ap
-1 c CE%sT 1945 Ap 10
-2 O EE%sT 1946 Ap 7
-3 R MSK/MSD 1989 Mar 26 2s
-2 R EE%sT 2011 Mar 27 2s
-3 - %z 2014 O 26 2s
-2 - EET
-Z Europe/Kirov 3:18:48 - LMT 1919 Jul 1 0u
-3 - %z 1930 Jun 21
-4 R %z 1989 Mar 26 2s
-3 R MSK/MSD 1991 Mar 31 2s
-4 - %z 1992 Mar 29 2s
-3 R MSK/MSD 2011 Mar 27 2s
-4 - MSK 2014 O 26 2s
-3 - MSK
-Z Europe/Kyiv 2:2:4 - LMT 1880
-2:2:4 - KMT 1924 May 2
-2 - EET 1930 Jun 21
-3 - MSK 1941 S 20
-1 c CE%sT 1943 N 6
-3 R MSK/MSD 1990 Jul 1 2
-2 1 EEST 1991 S 29 3
-2 c EE%sT 1996 May 13
-2 E EE%sT
-Z Europe/Lisbon -0:36:45 - LMT 1884
--0:36:45 - LMT 1912 Ja 1 0u
-0 p WE%sT 1966 O 2 2s
-1 - CET 1976 S 26 1
-0 p WE%sT 1986
-0 E WE%sT 1992 S 27 1u
-1 E CE%sT 1996 Mar 31 1u
-0 E WE%sT
-Z Europe/London -0:1:15 - LMT 1847 D
-0 G %s 1968 O 27
-1 - BST 1971 O 31 2u
-0 G %s 1996
-0 E GMT/BST
-Z Europe/Madrid -0:14:44 - LMT 1901 Ja 1 0u
-0 s WE%sT 1940 Mar 16 23
-1 s CE%sT 1979
-1 E CE%sT
-Z Europe/Malta 0:58:4 - LMT 1893 N 2
-1 I CE%sT 1973 Mar 31
-1 MT CE%sT 1981
-1 E CE%sT
-Z Europe/Minsk 1:50:16 - LMT 1880
-1:50 - MMT 1924 May 2
-2 - EET 1930 Jun 21
-3 - MSK 1941 Jun 28
-1 c CE%sT 1944 Jul 3
-3 R MSK/MSD 1990
-3 - MSK 1991 Mar 31 2s
-2 R EE%sT 2011 Mar 27 2s
-3 - %z
-Z Europe/Moscow 2:30:17 - LMT 1880
-2:30:17 - MMT 1916 Jul 3
-2:31:19 R %s 1919 Jul 1 0u
-3 R %s 1921 O
-3 R MSK/MSD 1922 O
-2 - EET 1930 Jun 21
-3 R MSK/MSD 1991 Mar 31 2s
-2 R EE%sT 1992 Ja 19 2s
-3 R MSK/MSD 2011 Mar 27 2s
-4 - MSK 2014 O 26 2s
-3 - MSK
-Z Europe/Paris 0:9:21 - LMT 1891 Mar 16
-0:9:21 - PMT 1911 Mar 11
-0 F WE%sT 1940 Jun 14 23
-1 c CE%sT 1944 Au 25
-0 F WE%sT 1945 S 16 3
-1 F CE%sT 1977
-1 E CE%sT
-Z Europe/Prague 0:57:44 - LMT 1850
-0:57:44 - PMT 1891 O
-1 c CE%sT 1945 May 9
-1 CZ CE%sT 1946 D 1 3
-1 -1 GMT 1947 F 23 2
-1 CZ CE%sT 1979
-1 E CE%sT
-Z Europe/Riga 1:36:34 - LMT 1880
-1:36:34 - RMT 1918 Ap 15 2
-1:36:34 1 LST 1918 S 16 3
-1:36:34 - RMT 1919 Ap 1 2
-1:36:34 1 LST 1919 May 22 3
-1:36:34 - RMT 1926 May 11
-2 - EET 1940 Au 5
-3 - MSK 1941 Jul
-1 c CE%sT 1944 O 13
-3 R MSK/MSD 1989 Mar lastSu 2s
-2 1 EEST 1989 S lastSu 2s
-2 LV EE%sT 1997 Ja 21
-2 E EE%sT 2000 F 29
-2 - EET 2001 Ja 2
-2 E EE%sT
-Z Europe/Rome 0:49:56 - LMT 1866 D 12
-0:49:56 - RMT 1893 O 31 23u
-1 I CE%sT 1943 S 10
-1 c CE%sT 1944 Jun 4
-1 I CE%sT 1980
-1 E CE%sT
-Z Europe/Samara 3:20:20 - LMT 1919 Jul 1 0u
-3 - %z 1930 Jun 21
-4 - %z 1935 Ja 27
-4 R %z 1989 Mar 26 2s
-3 R %z 1991 Mar 31 2s
-2 R %z 1991 S 29 2s
-3 - %z 1991 O 20 3
-4 R %z 2010 Mar 28 2s
-3 R %z 2011 Mar 27 2s
-4 - %z
-Z Europe/Saratov 3:4:18 - LMT 1919 Jul 1 0u
-3 - %z 1930 Jun 21
-4 R %z 1988 Mar 27 2s
-3 R %z 1991 Mar 31 2s
-4 - %z 1992 Mar 29 2s
-3 R %z 2011 Mar 27 2s
-4 - %z 2014 O 26 2s
-3 - %z 2016 D 4 2s
-4 - %z
-Z Europe/Simferopol 2:16:24 - LMT 1880
-2:16 - SMT 1924 May 2
-2 - EET 1930 Jun 21
-3 - MSK 1941 N
-1 c CE%sT 1944 Ap 13
-3 R MSK/MSD 1990
-3 - MSK 1990 Jul 1 2
-2 - EET 1992 Mar 20
-2 c EE%sT 1994 May
-3 c MSK/MSD 1996 Mar 31 0s
-3 1 MSD 1996 O 27 3s
-3 - MSK 1997 Mar lastSu 1u
-2 E EE%sT 2014 Mar 30 2
-4 - MSK 2014 O 26 2s
-3 - MSK
-Z Europe/Sofia 1:33:16 - LMT 1880
-1:56:56 - IMT 1894 N 30
-2 - EET 1942 N 2 3
-1 c CE%sT 1945
-1 - CET 1945 Ap 2 3
-2 - EET 1979 Mar 31 23
-2 BG EE%sT 1982 S 26 3
-2 c EE%sT 1991
-2 e EE%sT 1997
-2 E EE%sT
-Z Europe/Tallinn 1:39 - LMT 1880
-1:39 - TMT 1918 F
-1 c CE%sT 1919 Jul
-1:39 - TMT 1921 May
-2 - EET 1940 Au 6
-3 - MSK 1941 S 15
-1 c CE%sT 1944 S 22
-3 R MSK/MSD 1989 Mar 26 2s
-2 1 EEST 1989 S 24 2s
-2 c EE%sT 1998 S 22
-2 E EE%sT 1999 O 31 4
-2 - EET 2002 F 21
-2 E EE%sT
-Z Europe/Tirane 1:19:20 - LMT 1914
-1 - CET 1940 Jun 16
-1 q CE%sT 1984 Jul
-1 E CE%sT
-Z Europe/Ulyanovsk 3:13:36 - LMT 1919 Jul 1 0u
-3 - %z 1930 Jun 21
-4 R %z 1989 Mar 26 2s
-3 R %z 1991 Mar 31 2s
-2 R %z 1992 Ja 19 2s
-3 R %z 2011 Mar 27 2s
-4 - %z 2014 O 26 2s
-3 - %z 2016 Mar 27 2s
-4 - %z
-Z Europe/Vienna 1:5:21 - LMT 1893 Ap
-1 c CE%sT 1920
-1 a CE%sT 1940 Ap 1 2s
-1 c CE%sT 1945 Ap 2 2s
-1 1 CEST 1945 Ap 12 2s
-1 - CET 1946
-1 a CE%sT 1981
-1 E CE%sT
-Z Europe/Vilnius 1:41:16 - LMT 1880
-1:24 - WMT 1917
-1:35:36 - KMT 1919 O 10
-1 - CET 1920 Jul 12
-2 - EET 1920 O 9
-1 - CET 1940 Au 3
-3 - MSK 1941 Jun 24
-1 c CE%sT 1944 Au
-3 R MSK/MSD 1989 Mar 26 2s
-2 R EE%sT 1991 S 29 2s
-2 c EE%sT 1998
-2 - EET 1998 Mar 29 1u
-1 E CE%sT 1999 O 31 1u
-2 - EET 2003
-2 E EE%sT
-Z Europe/Volgograd 2:57:40 - LMT 1920 Ja 3
-3 - %z 1930 Jun 21
-4 - %z 1961 N 11
-4 R %z 1988 Mar 27 2s
-3 R MSK/MSD 1991 Mar 31 2s
-4 - %z 1992 Mar 29 2s
-3 R MSK/MSD 2011 Mar 27 2s
-4 - MSK 2014 O 26 2s
-3 - MSK 2018 O 28 2s
-4 - %z 2020 D 27 2s
-3 - MSK
-Z Europe/Warsaw 1:24 - LMT 1880
-1:24 - WMT 1915 Au 5
-1 c CE%sT 1918 S 16 3
-2 O EE%sT 1922 Jun
-1 O CE%sT 1940 Jun 23 2
-1 c CE%sT 1944 O
-1 O CE%sT 1977
-1 W- CE%sT 1988
-1 E CE%sT
-Z Europe/Zurich 0:34:8 - LMT 1853 Jul 16
-0:29:46 - BMT 1894 Jun
-1 CH CE%sT 1981
-1 E CE%sT
-Z Factory 0 - -00
-Z Indian/Chagos 4:49:40 - LMT 1907
-5 - %z 1996
-6 - %z
-Z Indian/Maldives 4:54 - LMT 1880
-4:54 - MMT 1960
-5 - %z
-Z Indian/Mauritius 3:50 - LMT 1907
-4 MU %z
-Z Pacific/Apia 12:33:4 - LMT 1892 Jul 5
--11:26:56 - LMT 1911
--11:30 - %z 1950
--11 WS %z 2011 D 29 24
-13 WS %z
-Z Pacific/Auckland 11:39:4 - LMT 1868 N 2
-11:30 NZ NZ%sT 1946
-12 NZ NZ%sT
-Z Pacific/Bougainville 10:22:16 - LMT 1880
-9:48:32 - PMMT 1895
-10 - %z 1942 Jul
-9 - %z 1945 Au 21
-10 - %z 2014 D 28 2
-11 - %z
-Z Pacific/Chatham 12:13:48 - LMT 1868 N 2
-12:15 - %z 1946
-12:45 k %z
-Z Pacific/Easter -7:17:28 - LMT 1890
--7:17:28 - EMT 1932 S
--7 x %z 1982 Mar 14 3u
--6 x %z
-Z Pacific/Efate 11:13:16 - LMT 1912 Ja 13
-11 VU %z
-Z Pacific/Fakaofo -11:24:56 - LMT 1901
--11 - %z 2011 D 30
-13 - %z
-Z Pacific/Fiji 11:55:44 - LMT 1915 O 26
-12 FJ %z
-Z Pacific/Galapagos -5:58:24 - LMT 1931
--5 - %z 1986
--6 EC %z
-Z Pacific/Gambier -8:59:48 - LMT 1912 O
--9 - %z
-Z Pacific/Guadalcanal 10:39:48 - LMT 1912 O
-11 - %z
-Z Pacific/Guam -14:21 - LMT 1844 D 31
-9:39 - LMT 1901
-10 - GST 1941 D 10
-9 - %z 1944 Jul 31
-10 Gu G%sT 2000 D 23
-10 - ChST
-Z Pacific/Honolulu -10:31:26 - LMT 1896 Ja 13 12
--10:30 - HST 1933 Ap 30 2
--10:30 1 HDT 1933 May 21 12
--10:30 u H%sT 1947 Jun 8 2
--10 - HST
-Z Pacific/Kanton 0 - -00 1937 Au 31
--12 - %z 1979 O
--11 - %z 1994 D 31
-13 - %z
-Z Pacific/Kiritimati -10:29:20 - LMT 1901
--10:40 - %z 1979 O
--10 - %z 1994 D 31
-14 - %z
-Z Pacific/Kosrae -13:8:4 - LMT 1844 D 31
-10:51:56 - LMT 1901
-11 - %z 1914 O
-9 - %z 1919 F
-11 - %z 1937
-10 - %z 1941 Ap
-9 - %z 1945 Au
-11 - %z 1969 O
-12 - %z 1999
-11 - %z
-Z Pacific/Kwajalein 11:9:20 - LMT 1901
-11 - %z 1937
-10 - %z 1941 Ap
-9 - %z 1944 F 6
-11 - %z 1969 O
--12 - %z 1993 Au 20 24
-12 - %z
-Z Pacific/Marquesas -9:18 - LMT 1912 O
--9:30 - %z
-Z Pacific/Nauru 11:7:40 - LMT 1921 Ja 15
-11:30 - %z 1942 Au 29
-9 - %z 1945 S 8
-11:30 - %z 1979 F 10 2
-12 - %z
-Z Pacific/Niue -11:19:40 - LMT 1952 O 16
--11:20 - %z 1964 Jul
--11 - %z
-Z Pacific/Norfolk 11:11:52 - LMT 1901
-11:12 - %z 1951
-11:30 - %z 1974 O 27 2s
-11:30 1 %z 1975 Mar 2 2s
-11:30 - %z 2015 O 4 2s
-11 - %z 2019 Jul
-11 AN %z
-Z Pacific/Noumea 11:5:48 - LMT 1912 Ja 13
-11 NC %z
-Z Pacific/Pago_Pago 12:37:12 - LMT 1892 Jul 5
--11:22:48 - LMT 1911
--11 - SST
-Z Pacific/Palau -15:2:4 - LMT 1844 D 31
-8:57:56 - LMT 1901
-9 - %z
-Z Pacific/Pitcairn -8:40:20 - LMT 1901
--8:30 - %z 1998 Ap 27
--8 - %z
-Z Pacific/Port_Moresby 9:48:40 - LMT 1880
-9:48:32 - PMMT 1895
-10 - %z
-Z Pacific/Rarotonga 13:20:56 - LMT 1899 D 26
--10:39:4 - LMT 1952 O 16
--10:30 - %z 1978 N 12
--10 CK %z
-Z Pacific/Tahiti -9:58:16 - LMT 1912 O
--10 - %z
-Z Pacific/Tarawa 11:32:4 - LMT 1901
-12 - %z
-Z Pacific/Tongatapu 12:19:12 - LMT 1945 S 10
-12:20 - %z 1961
-13 - %z 1999
-13 TO %z
-L Etc/GMT GMT
-L Australia/Sydney Australia/ACT
-L Australia/Lord_Howe Australia/LHI
-L Australia/Sydney Australia/NSW
-L Australia/Darwin Australia/North
-L Australia/Brisbane Australia/Queensland
-L Australia/Adelaide Australia/South
-L Australia/Hobart Australia/Tasmania
-L Australia/Melbourne Australia/Victoria
-L Australia/Perth Australia/West
-L Australia/Broken_Hill Australia/Yancowinna
-L America/Rio_Branco Brazil/Acre
-L America/Noronha Brazil/DeNoronha
-L America/Sao_Paulo Brazil/East
-L America/Manaus Brazil/West
-L Europe/Brussels CET
-L America/Chicago CST6CDT
-L America/Halifax Canada/Atlantic
-L America/Winnipeg Canada/Central
-L America/Toronto Canada/Eastern
-L America/Edmonton Canada/Mountain
-L America/St_Johns Canada/Newfoundland
-L America/Vancouver Canada/Pacific
-L America/Regina Canada/Saskatchewan
-L America/Whitehorse Canada/Yukon
-L America/Santiago Chile/Continental
-L Pacific/Easter Chile/EasterIsland
-L America/Havana Cuba
-L Europe/Athens EET
-L America/Panama EST
-L America/New_York EST5EDT
-L Africa/Cairo Egypt
-L Europe/Dublin Eire
-L Etc/GMT Etc/GMT+0
-L Etc/GMT Etc/GMT-0
-L Etc/GMT Etc/GMT0
-L Etc/GMT Etc/Greenwich
-L Etc/UTC Etc/UCT
-L Etc/UTC Etc/Universal
-L Etc/UTC Etc/Zulu
-L Europe/London GB
-L Europe/London GB-Eire
-L Etc/GMT GMT+0
-L Etc/GMT GMT-0
-L Etc/GMT GMT0
-L Etc/GMT Greenwich
-L Asia/Hong_Kong Hongkong
-L Africa/Abidjan Iceland
-L Asia/Tehran Iran
-L Asia/Jerusalem Israel
-L America/Jamaica Jamaica
-L Asia/Tokyo Japan
-L Pacific/Kwajalein Kwajalein
-L Africa/Tripoli Libya
-L Europe/Brussels MET
-L America/Phoenix MST
-L America/Denver MST7MDT
-L America/Tijuana Mexico/BajaNorte
-L America/Mazatlan Mexico/BajaSur
-L America/Mexico_City Mexico/General
-L Pacific/Auckland NZ
-L Pacific/Chatham NZ-CHAT
-L America/Denver Navajo
-L Asia/Shanghai PRC
-L Europe/Warsaw Poland
-L Europe/Lisbon Portugal
-L Asia/Taipei ROC
-L Asia/Seoul ROK
-L Asia/Singapore Singapore
-L Europe/Istanbul Turkey
-L Etc/UTC UCT
-L America/Anchorage US/Alaska
-L America/Adak US/Aleutian
-L America/Phoenix US/Arizona
-L America/Chicago US/Central
-L America/Indiana/Indianapolis US/East-Indiana
-L America/New_York US/Eastern
-L Pacific/Honolulu US/Hawaii
-L America/Indiana/Knox US/Indiana-Starke
-L America/Detroit US/Michigan
-L America/Denver US/Mountain
-L America/Los_Angeles US/Pacific
-L Pacific/Pago_Pago US/Samoa
-L Etc/UTC UTC
-L Etc/UTC Universal
-L Europe/Moscow W-SU
-L Etc/UTC Zulu
-L America/Argentina/Buenos_Aires America/Buenos_Aires
-L America/Argentina/Catamarca America/Catamarca
-L America/Argentina/Cordoba America/Cordoba
-L America/Indiana/Indianapolis America/Indianapolis
-L America/Argentina/Jujuy America/Jujuy
-L America/Indiana/Knox America/Knox_IN
-L America/Kentucky/Louisville America/Louisville
-L America/Argentina/Mendoza America/Mendoza
-L America/Puerto_Rico America/Virgin
-L Pacific/Pago_Pago Pacific/Samoa
-L Africa/Abidjan Africa/Accra
-L Africa/Nairobi Africa/Addis_Ababa
-L Africa/Nairobi Africa/Asmara
-L Africa/Abidjan Africa/Bamako
-L Africa/Lagos Africa/Bangui
-L Africa/Abidjan Africa/Banjul
-L Africa/Maputo Africa/Blantyre
-L Africa/Lagos Africa/Brazzaville
-L Africa/Maputo Africa/Bujumbura
-L Africa/Abidjan Africa/Conakry
-L Africa/Abidjan Africa/Dakar
-L Africa/Nairobi Africa/Dar_es_Salaam
-L Africa/Nairobi Africa/Djibouti
-L Africa/Lagos Africa/Douala
-L Africa/Abidjan Africa/Freetown
-L Africa/Maputo Africa/Gaborone
-L Africa/Maputo Africa/Harare
-L Africa/Nairobi Africa/Kampala
-L Africa/Maputo Africa/Kigali
-L Africa/Lagos Africa/Kinshasa
-L Africa/Lagos Africa/Libreville
-L Africa/Abidjan Africa/Lome
-L Africa/Lagos Africa/Luanda
-L Africa/Maputo Africa/Lubumbashi
-L Africa/Maputo Africa/Lusaka
-L Africa/Lagos Africa/Malabo
-L Africa/Johannesburg Africa/Maseru
-L Africa/Johannesburg Africa/Mbabane
-L Africa/Nairobi Africa/Mogadishu
-L Africa/Lagos Africa/Niamey
-L Africa/Abidjan Africa/Nouakchott
-L Africa/Abidjan Africa/Ouagadougou
-L Africa/Lagos Africa/Porto-Novo
-L America/Puerto_Rico America/Anguilla
-L America/Puerto_Rico America/Antigua
-L America/Puerto_Rico America/Aruba
-L America/Panama America/Atikokan
-L America/Puerto_Rico America/Blanc-Sablon
-L America/Panama America/Cayman
-L America/Phoenix America/Creston
-L America/Puerto_Rico America/Curacao
-L America/Puerto_Rico America/Dominica
-L America/Puerto_Rico America/Grenada
-L America/Puerto_Rico America/Guadeloupe
-L America/Puerto_Rico America/Kralendijk
-L America/Puerto_Rico America/Lower_Princes
-L America/Puerto_Rico America/Marigot
-L America/Puerto_Rico America/Montserrat
-L America/Toronto America/Nassau
-L America/Puerto_Rico America/Port_of_Spain
-L America/Puerto_Rico America/St_Barthelemy
-L America/Puerto_Rico America/St_Kitts
-L America/Puerto_Rico America/St_Lucia
-L America/Puerto_Rico America/St_Thomas
-L America/Puerto_Rico America/St_Vincent
-L America/Puerto_Rico America/Tortola
-L Pacific/Port_Moresby Antarctica/DumontDUrville
-L Pacific/Auckland Antarctica/McMurdo
-L Asia/Riyadh Antarctica/Syowa
-L Europe/Berlin Arctic/Longyearbyen
-L Asia/Riyadh Asia/Aden
-L Asia/Qatar Asia/Bahrain
-L Asia/Kuching Asia/Brunei
-L Asia/Singapore Asia/Kuala_Lumpur
-L Asia/Riyadh Asia/Kuwait
-L Asia/Dubai Asia/Muscat
-L Asia/Bangkok Asia/Phnom_Penh
-L Asia/Bangkok Asia/Vientiane
-L Africa/Abidjan Atlantic/Reykjavik
-L Africa/Abidjan Atlantic/St_Helena
-L Europe/Brussels Europe/Amsterdam
-L Europe/Prague Europe/Bratislava
-L Europe/Zurich Europe/Busingen
-L Europe/Berlin Europe/Copenhagen
-L Europe/London Europe/Guernsey
-L Europe/London Europe/Isle_of_Man
-L Europe/London Europe/Jersey
-L Europe/Belgrade Europe/Ljubljana
-L Europe/Brussels Europe/Luxembourg
-L Europe/Helsinki Europe/Mariehamn
-L Europe/Paris Europe/Monaco
-L Europe/Berlin Europe/Oslo
-L Europe/Belgrade Europe/Podgorica
-L Europe/Rome Europe/San_Marino
-L Europe/Belgrade Europe/Sarajevo
-L Europe/Belgrade Europe/Skopje
-L Europe/Berlin Europe/Stockholm
-L Europe/Zurich Europe/Vaduz
-L Europe/Rome Europe/Vatican
-L Europe/Belgrade Europe/Zagreb
-L Africa/Nairobi Indian/Antananarivo
-L Asia/Bangkok Indian/Christmas
-L Asia/Yangon Indian/Cocos
-L Africa/Nairobi Indian/Comoro
-L Indian/Maldives Indian/Kerguelen
-L Asia/Dubai Indian/Mahe
-L Africa/Nairobi Indian/Mayotte
-L Asia/Dubai Indian/Reunion
-L Pacific/Port_Moresby Pacific/Chuuk
-L Pacific/Tarawa Pacific/Funafuti
-L Pacific/Tarawa Pacific/Majuro
-L Pacific/Pago_Pago Pacific/Midway
-L Pacific/Guadalcanal Pacific/Pohnpei
-L Pacific/Guam Pacific/Saipan
-L Pacific/Tarawa Pacific/Wake
-L Pacific/Tarawa Pacific/Wallis
-L Africa/Abidjan Africa/Timbuktu
-L America/Argentina/Catamarca America/Argentina/ComodRivadavia
-L America/Adak America/Atka
-L America/Panama America/Coral_Harbour
-L America/Tijuana America/Ensenada
-L America/Indiana/Indianapolis America/Fort_Wayne
-L America/Toronto America/Montreal
-L America/Toronto America/Nipigon
-L America/Iqaluit America/Pangnirtung
-L America/Rio_Branco America/Porto_Acre
-L America/Winnipeg America/Rainy_River
-L America/Argentina/Cordoba America/Rosario
-L America/Tijuana America/Santa_Isabel
-L America/Denver America/Shiprock
-L America/Toronto America/Thunder_Bay
-L America/Edmonton America/Yellowknife
-L Pacific/Auckland Antarctica/South_Pole
-L Asia/Ulaanbaatar Asia/Choibalsan
-L Asia/Shanghai Asia/Chongqing
-L Asia/Shanghai Asia/Harbin
-L Asia/Urumqi Asia/Kashgar
-L Asia/Jerusalem Asia/Tel_Aviv
-L Europe/Berlin Atlantic/Jan_Mayen
-L Australia/Sydney Australia/Canberra
-L Australia/Hobart Australia/Currie
-L Europe/London Europe/Belfast
-L Europe/Chisinau Europe/Tiraspol
-L Europe/Kyiv Europe/Uzhgorod
-L Europe/Kyiv Europe/Zaporozhye
-L Pacific/Kanton Pacific/Enderbury
-L Pacific/Honolulu Pacific/Johnston
-L Pacific/Port_Moresby Pacific/Yap
-L Europe/Lisbon WET
-L Africa/Nairobi Africa/Asmera
-L America/Nuuk America/Godthab
-L Asia/Ashgabat Asia/Ashkhabad
-L Asia/Kolkata Asia/Calcutta
-L Asia/Shanghai Asia/Chungking
-L Asia/Dhaka Asia/Dacca
-L Europe/Istanbul Asia/Istanbul
-L Asia/Kathmandu Asia/Katmandu
-L Asia/Macau Asia/Macao
-L Asia/Yangon Asia/Rangoon
-L Asia/Ho_Chi_Minh Asia/Saigon
-L Asia/Thimphu Asia/Thimbu
-L Asia/Makassar Asia/Ujung_Pandang
-L Asia/Ulaanbaatar Asia/Ulan_Bator
-L Atlantic/Faroe Atlantic/Faeroe
-L Europe/Kyiv Europe/Kiev
-L Asia/Nicosia Europe/Nicosia
-L Pacific/Honolulu HST
-L America/Los_Angeles PST8PDT
-L Pacific/Guadalcanal Pacific/Ponape
-L Pacific/Port_Moresby Pacific/Truk
diff --git a/lib/tzdata/zoneinfo/zone.tab b/lib/tzdata/zoneinfo/zone.tab
deleted file mode 100644
index bfc0b593..00000000
--- a/lib/tzdata/zoneinfo/zone.tab
+++ /dev/null
@@ -1,447 +0,0 @@
-# tzdb timezone descriptions (deprecated version)
-#
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-#
-# From Paul Eggert (2021-09-20):
-# This file is intended as a backward-compatibility aid for older programs.
-# New programs should use zone1970.tab.  This file is like zone1970.tab (see
-# zone1970.tab's comments), but with the following additional restrictions:
-#
-# 1.  This file contains only ASCII characters.
-# 2.  The first data column contains exactly one country code.
-#
-# Because of (2), each row stands for an area that is the intersection
-# of a region identified by a country code and of a timezone where civil
-# clocks have agreed since 1970; this is a narrower definition than
-# that of zone1970.tab.
-#
-# Unlike zone1970.tab, a row's third column can be a Link from
-# 'backward' instead of a Zone.
-#
-# This table is intended as an aid for users, to help them select timezones
-# appropriate for their practical needs.  It is not intended to take or
-# endorse any position on legal or territorial claims.
-#
-#country-
-#code	coordinates	TZ			comments
-AD	+4230+00131	Europe/Andorra
-AE	+2518+05518	Asia/Dubai
-AF	+3431+06912	Asia/Kabul
-AG	+1703-06148	America/Antigua
-AI	+1812-06304	America/Anguilla
-AL	+4120+01950	Europe/Tirane
-AM	+4011+04430	Asia/Yerevan
-AO	-0848+01314	Africa/Luanda
-AQ	-7750+16636	Antarctica/McMurdo	New Zealand time - McMurdo, South Pole
-AQ	-6617+11031	Antarctica/Casey	Casey
-AQ	-6835+07758	Antarctica/Davis	Davis
-AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville
-AQ	-6736+06253	Antarctica/Mawson	Mawson
-AQ	-6448-06406	Antarctica/Palmer	Palmer
-AQ	-6734-06808	Antarctica/Rothera	Rothera
-AQ	-690022+0393524	Antarctica/Syowa	Syowa
-AQ	-720041+0023206	Antarctica/Troll	Troll
-AQ	-7824+10654	Antarctica/Vostok	Vostok
-AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
-AR	-3124-06411	America/Argentina/Cordoba	Argentina (most areas: CB, CC, CN, ER, FM, MN, SE, SF)
-AR	-2447-06525	America/Argentina/Salta	Salta (SA, LP, NQ, RN)
-AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
-AR	-2649-06513	America/Argentina/Tucuman	Tucuman (TM)
-AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
-AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
-AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
-AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
-AR	-3319-06621	America/Argentina/San_Luis	San Luis (SL)
-AR	-5138-06913	America/Argentina/Rio_Gallegos	Santa Cruz (SC)
-AR	-5448-06818	America/Argentina/Ushuaia	Tierra del Fuego (TF)
-AS	-1416-17042	Pacific/Pago_Pago
-AT	+4813+01620	Europe/Vienna
-AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
-AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
-AU	-4253+14719	Australia/Hobart	Tasmania
-AU	-3749+14458	Australia/Melbourne	Victoria
-AU	-3352+15113	Australia/Sydney	New South Wales (most areas)
-AU	-3157+14127	Australia/Broken_Hill	New South Wales (Yancowinna)
-AU	-2728+15302	Australia/Brisbane	Queensland (most areas)
-AU	-2016+14900	Australia/Lindeman	Queensland (Whitsunday Islands)
-AU	-3455+13835	Australia/Adelaide	South Australia
-AU	-1228+13050	Australia/Darwin	Northern Territory
-AU	-3157+11551	Australia/Perth	Western Australia (most areas)
-AU	-3143+12852	Australia/Eucla	Western Australia (Eucla)
-AW	+1230-06958	America/Aruba
-AX	+6006+01957	Europe/Mariehamn
-AZ	+4023+04951	Asia/Baku
-BA	+4352+01825	Europe/Sarajevo
-BB	+1306-05937	America/Barbados
-BD	+2343+09025	Asia/Dhaka
-BE	+5050+00420	Europe/Brussels
-BF	+1222-00131	Africa/Ouagadougou
-BG	+4241+02319	Europe/Sofia
-BH	+2623+05035	Asia/Bahrain
-BI	-0323+02922	Africa/Bujumbura
-BJ	+0629+00237	Africa/Porto-Novo
-BL	+1753-06251	America/St_Barthelemy
-BM	+3217-06446	Atlantic/Bermuda
-BN	+0456+11455	Asia/Brunei
-BO	-1630-06809	America/La_Paz
-BQ	+120903-0681636	America/Kralendijk
-BR	-0351-03225	America/Noronha	Atlantic islands
-BR	-0127-04829	America/Belem	Para (east), Amapa
-BR	-0343-03830	America/Fortaleza	Brazil (northeast: MA, PI, CE, RN, PB)
-BR	-0803-03454	America/Recife	Pernambuco
-BR	-0712-04812	America/Araguaina	Tocantins
-BR	-0940-03543	America/Maceio	Alagoas, Sergipe
-BR	-1259-03831	America/Bahia	Bahia
-BR	-2332-04637	America/Sao_Paulo	Brazil (southeast: GO, DF, MG, ES, RJ, SP, PR, SC, RS)
-BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
-BR	-1535-05605	America/Cuiaba	Mato Grosso
-BR	-0226-05452	America/Santarem	Para (west)
-BR	-0846-06354	America/Porto_Velho	Rondonia
-BR	+0249-06040	America/Boa_Vista	Roraima
-BR	-0308-06001	America/Manaus	Amazonas (east)
-BR	-0640-06952	America/Eirunepe	Amazonas (west)
-BR	-0958-06748	America/Rio_Branco	Acre
-BS	+2505-07721	America/Nassau
-BT	+2728+08939	Asia/Thimphu
-BW	-2439+02555	Africa/Gaborone
-BY	+5354+02734	Europe/Minsk
-BZ	+1730-08812	America/Belize
-CA	+4734-05243	America/St_Johns	Newfoundland, Labrador (SE)
-CA	+4439-06336	America/Halifax	Atlantic - NS (most areas), PE
-CA	+4612-05957	America/Glace_Bay	Atlantic - NS (Cape Breton)
-CA	+4606-06447	America/Moncton	Atlantic - New Brunswick
-CA	+5320-06025	America/Goose_Bay	Atlantic - Labrador (most areas)
-CA	+5125-05707	America/Blanc-Sablon	AST - QC (Lower North Shore)
-CA	+4339-07923	America/Toronto	Eastern - ON & QC (most areas)
-CA	+6344-06828	America/Iqaluit	Eastern - NU (most areas)
-CA	+484531-0913718	America/Atikokan	EST - ON (Atikokan), NU (Coral H)
-CA	+4953-09709	America/Winnipeg	Central - ON (west), Manitoba
-CA	+744144-0944945	America/Resolute	Central - NU (Resolute)
-CA	+624900-0920459	America/Rankin_Inlet	Central - NU (central)
-CA	+5024-10439	America/Regina	CST - SK (most areas)
-CA	+5017-10750	America/Swift_Current	CST - SK (midwest)
-CA	+5333-11328	America/Edmonton	Mountain - AB, BC(E), NT(E), SK(W)
-CA	+690650-1050310	America/Cambridge_Bay	Mountain - NU (west)
-CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
-CA	+4906-11631	America/Creston	MST - BC (Creston)
-CA	+5546-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
-CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
-CA	+6043-13503	America/Whitehorse	MST - Yukon (east)
-CA	+6404-13925	America/Dawson	MST - Yukon (west)
-CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
-CC	-1210+09655	Indian/Cocos
-CD	-0418+01518	Africa/Kinshasa	Dem. Rep. of Congo (west)
-CD	-1140+02728	Africa/Lubumbashi	Dem. Rep. of Congo (east)
-CF	+0422+01835	Africa/Bangui
-CG	-0416+01517	Africa/Brazzaville
-CH	+4723+00832	Europe/Zurich
-CI	+0519-00402	Africa/Abidjan
-CK	-2114-15946	Pacific/Rarotonga
-CL	-3327-07040	America/Santiago	most of Chile
-CL	-5309-07055	America/Punta_Arenas	Region of Magallanes
-CL	-2709-10926	Pacific/Easter	Easter Island
-CM	+0403+00942	Africa/Douala
-CN	+3114+12128	Asia/Shanghai	Beijing Time
-CN	+4348+08735	Asia/Urumqi	Xinjiang Time
-CO	+0436-07405	America/Bogota
-CR	+0956-08405	America/Costa_Rica
-CU	+2308-08222	America/Havana
-CV	+1455-02331	Atlantic/Cape_Verde
-CW	+1211-06900	America/Curacao
-CX	-1025+10543	Indian/Christmas
-CY	+3510+03322	Asia/Nicosia	most of Cyprus
-CY	+3507+03357	Asia/Famagusta	Northern Cyprus
-CZ	+5005+01426	Europe/Prague
-DE	+5230+01322	Europe/Berlin	most of Germany
-DE	+4742+00841	Europe/Busingen	Busingen
-DJ	+1136+04309	Africa/Djibouti
-DK	+5540+01235	Europe/Copenhagen
-DM	+1518-06124	America/Dominica
-DO	+1828-06954	America/Santo_Domingo
-DZ	+3647+00303	Africa/Algiers
-EC	-0210-07950	America/Guayaquil	Ecuador (mainland)
-EC	-0054-08936	Pacific/Galapagos	Galapagos Islands
-EE	+5925+02445	Europe/Tallinn
-EG	+3003+03115	Africa/Cairo
-EH	+2709-01312	Africa/El_Aaiun
-ER	+1520+03853	Africa/Asmara
-ES	+4024-00341	Europe/Madrid	Spain (mainland)
-ES	+3553-00519	Africa/Ceuta	Ceuta, Melilla
-ES	+2806-01524	Atlantic/Canary	Canary Islands
-ET	+0902+03842	Africa/Addis_Ababa
-FI	+6010+02458	Europe/Helsinki
-FJ	-1808+17825	Pacific/Fiji
-FK	-5142-05751	Atlantic/Stanley
-FM	+0725+15147	Pacific/Chuuk	Chuuk/Truk, Yap
-FM	+0658+15813	Pacific/Pohnpei	Pohnpei/Ponape
-FM	+0519+16259	Pacific/Kosrae	Kosrae
-FO	+6201-00646	Atlantic/Faroe
-FR	+4852+00220	Europe/Paris
-GA	+0023+00927	Africa/Libreville
-GB	+513030-0000731	Europe/London
-GD	+1203-06145	America/Grenada
-GE	+4143+04449	Asia/Tbilisi
-GF	+0456-05220	America/Cayenne
-GG	+492717-0023210	Europe/Guernsey
-GH	+0533-00013	Africa/Accra
-GI	+3608-00521	Europe/Gibraltar
-GL	+6411-05144	America/Nuuk	most of Greenland
-GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
-GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
-GL	+7634-06847	America/Thule	Thule/Pituffik
-GM	+1328-01639	Africa/Banjul
-GN	+0931-01343	Africa/Conakry
-GP	+1614-06132	America/Guadeloupe
-GQ	+0345+00847	Africa/Malabo
-GR	+3758+02343	Europe/Athens
-GS	-5416-03632	Atlantic/South_Georgia
-GT	+1438-09031	America/Guatemala
-GU	+1328+14445	Pacific/Guam
-GW	+1151-01535	Africa/Bissau
-GY	+0648-05810	America/Guyana
-HK	+2217+11409	Asia/Hong_Kong
-HN	+1406-08713	America/Tegucigalpa
-HR	+4548+01558	Europe/Zagreb
-HT	+1832-07220	America/Port-au-Prince
-HU	+4730+01905	Europe/Budapest
-ID	-0610+10648	Asia/Jakarta	Java, Sumatra
-ID	-0002+10920	Asia/Pontianak	Borneo (west, central)
-ID	-0507+11924	Asia/Makassar	Borneo (east, south), Sulawesi/Celebes, Bali, Nusa Tengarra, Timor (west)
-ID	-0232+14042	Asia/Jayapura	New Guinea (West Papua / Irian Jaya), Malukus/Moluccas
-IE	+5320-00615	Europe/Dublin
-IL	+314650+0351326	Asia/Jerusalem
-IM	+5409-00428	Europe/Isle_of_Man
-IN	+2232+08822	Asia/Kolkata
-IO	-0720+07225	Indian/Chagos
-IQ	+3321+04425	Asia/Baghdad
-IR	+3540+05126	Asia/Tehran
-IS	+6409-02151	Atlantic/Reykjavik
-IT	+4154+01229	Europe/Rome
-JE	+491101-0020624	Europe/Jersey
-JM	+175805-0764736	America/Jamaica
-JO	+3157+03556	Asia/Amman
-JP	+353916+1394441	Asia/Tokyo
-KE	-0117+03649	Africa/Nairobi
-KG	+4254+07436	Asia/Bishkek
-KH	+1133+10455	Asia/Phnom_Penh
-KI	+0125+17300	Pacific/Tarawa	Gilbert Islands
-KI	-0247-17143	Pacific/Kanton	Phoenix Islands
-KI	+0152-15720	Pacific/Kiritimati	Line Islands
-KM	-1141+04316	Indian/Comoro
-KN	+1718-06243	America/St_Kitts
-KP	+3901+12545	Asia/Pyongyang
-KR	+3733+12658	Asia/Seoul
-KW	+2920+04759	Asia/Kuwait
-KY	+1918-08123	America/Cayman
-KZ	+4315+07657	Asia/Almaty	most of Kazakhstan
-KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda/Kyzylorda/Kzyl-Orda
-KZ	+5312+06337	Asia/Qostanay	Qostanay/Kostanay/Kustanay
-KZ	+5017+05710	Asia/Aqtobe	Aqtobe/Aktobe
-KZ	+4431+05016	Asia/Aqtau	Mangghystau/Mankistau
-KZ	+4707+05156	Asia/Atyrau	Atyrau/Atirau/Gur'yev
-KZ	+5113+05121	Asia/Oral	West Kazakhstan
-LA	+1758+10236	Asia/Vientiane
-LB	+3353+03530	Asia/Beirut
-LC	+1401-06100	America/St_Lucia
-LI	+4709+00931	Europe/Vaduz
-LK	+0656+07951	Asia/Colombo
-LR	+0618-01047	Africa/Monrovia
-LS	-2928+02730	Africa/Maseru
-LT	+5441+02519	Europe/Vilnius
-LU	+4936+00609	Europe/Luxembourg
-LV	+5657+02406	Europe/Riga
-LY	+3254+01311	Africa/Tripoli
-MA	+3339-00735	Africa/Casablanca
-MC	+4342+00723	Europe/Monaco
-MD	+4700+02850	Europe/Chisinau
-ME	+4226+01916	Europe/Podgorica
-MF	+1804-06305	America/Marigot
-MG	-1855+04731	Indian/Antananarivo
-MH	+0709+17112	Pacific/Majuro	most of Marshall Islands
-MH	+0905+16720	Pacific/Kwajalein	Kwajalein
-MK	+4159+02126	Europe/Skopje
-ML	+1239-00800	Africa/Bamako
-MM	+1647+09610	Asia/Yangon
-MN	+4755+10653	Asia/Ulaanbaatar	most of Mongolia
-MN	+4801+09139	Asia/Hovd	Bayan-Olgii, Hovd, Uvs
-MO	+221150+1133230	Asia/Macau
-MP	+1512+14545	Pacific/Saipan
-MQ	+1436-06105	America/Martinique
-MR	+1806-01557	Africa/Nouakchott
-MS	+1643-06213	America/Montserrat
-MT	+3554+01431	Europe/Malta
-MU	-2010+05730	Indian/Mauritius
-MV	+0410+07330	Indian/Maldives
-MW	-1547+03500	Africa/Blantyre
-MX	+1924-09909	America/Mexico_City	Central Mexico
-MX	+2105-08646	America/Cancun	Quintana Roo
-MX	+2058-08937	America/Merida	Campeche, Yucatan
-MX	+2540-10019	America/Monterrey	Durango; Coahuila, Nuevo Leon, Tamaulipas (most areas)
-MX	+2550-09730	America/Matamoros	Coahuila, Nuevo Leon, Tamaulipas (US border)
-MX	+2838-10605	America/Chihuahua	Chihuahua (most areas)
-MX	+3144-10629	America/Ciudad_Juarez	Chihuahua (US border - west)
-MX	+2934-10425	America/Ojinaga	Chihuahua (US border - east)
-MX	+2313-10625	America/Mazatlan	Baja California Sur, Nayarit (most areas), Sinaloa
-MX	+2048-10515	America/Bahia_Banderas	Bahia de Banderas
-MX	+2904-11058	America/Hermosillo	Sonora
-MX	+3232-11701	America/Tijuana	Baja California
-MY	+0310+10142	Asia/Kuala_Lumpur	Malaysia (peninsula)
-MY	+0133+11020	Asia/Kuching	Sabah, Sarawak
-MZ	-2558+03235	Africa/Maputo
-NA	-2234+01706	Africa/Windhoek
-NC	-2216+16627	Pacific/Noumea
-NE	+1331+00207	Africa/Niamey
-NF	-2903+16758	Pacific/Norfolk
-NG	+0627+00324	Africa/Lagos
-NI	+1209-08617	America/Managua
-NL	+5222+00454	Europe/Amsterdam
-NO	+5955+01045	Europe/Oslo
-NP	+2743+08519	Asia/Kathmandu
-NR	-0031+16655	Pacific/Nauru
-NU	-1901-16955	Pacific/Niue
-NZ	-3652+17446	Pacific/Auckland	most of New Zealand
-NZ	-4357-17633	Pacific/Chatham	Chatham Islands
-OM	+2336+05835	Asia/Muscat
-PA	+0858-07932	America/Panama
-PE	-1203-07703	America/Lima
-PF	-1732-14934	Pacific/Tahiti	Society Islands
-PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
-PF	-2308-13457	Pacific/Gambier	Gambier Islands
-PG	-0930+14710	Pacific/Port_Moresby	most of Papua New Guinea
-PG	-0613+15534	Pacific/Bougainville	Bougainville
-PH	+1435+12100	Asia/Manila
-PK	+2452+06703	Asia/Karachi
-PL	+5215+02100	Europe/Warsaw
-PM	+4703-05620	America/Miquelon
-PN	-2504-13005	Pacific/Pitcairn
-PR	+182806-0660622	America/Puerto_Rico
-PS	+3130+03428	Asia/Gaza	Gaza Strip
-PS	+313200+0350542	Asia/Hebron	West Bank
-PT	+3843-00908	Europe/Lisbon	Portugal (mainland)
-PT	+3238-01654	Atlantic/Madeira	Madeira Islands
-PT	+3744-02540	Atlantic/Azores	Azores
-PW	+0720+13429	Pacific/Palau
-PY	-2516-05740	America/Asuncion
-QA	+2517+05132	Asia/Qatar
-RE	-2052+05528	Indian/Reunion
-RO	+4426+02606	Europe/Bucharest
-RS	+4450+02030	Europe/Belgrade
-RU	+5443+02030	Europe/Kaliningrad	MSK-01 - Kaliningrad
-RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
-# The obsolescent zone.tab format cannot represent Europe/Simferopol well.
-# Put it in RU section and list as UA.  See "territorial claims" above.
-# Programs should use zone1970.tab instead; see above.
-UA	+4457+03406	Europe/Simferopol	Crimea
-RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
-RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd
-RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
-RU	+5134+04602	Europe/Saratov	MSK+01 - Saratov
-RU	+5420+04824	Europe/Ulyanovsk	MSK+01 - Ulyanovsk
-RU	+5312+05009	Europe/Samara	MSK+01 - Samara, Udmurtia
-RU	+5651+06036	Asia/Yekaterinburg	MSK+02 - Urals
-RU	+5500+07324	Asia/Omsk	MSK+03 - Omsk
-RU	+5502+08255	Asia/Novosibirsk	MSK+04 - Novosibirsk
-RU	+5322+08345	Asia/Barnaul	MSK+04 - Altai
-RU	+5630+08458	Asia/Tomsk	MSK+04 - Tomsk
-RU	+5345+08707	Asia/Novokuznetsk	MSK+04 - Kemerovo
-RU	+5601+09250	Asia/Krasnoyarsk	MSK+04 - Krasnoyarsk area
-RU	+5216+10420	Asia/Irkutsk	MSK+05 - Irkutsk, Buryatia
-RU	+5203+11328	Asia/Chita	MSK+06 - Zabaykalsky
-RU	+6200+12940	Asia/Yakutsk	MSK+06 - Lena River
-RU	+623923+1353314	Asia/Khandyga	MSK+06 - Tomponsky, Ust-Maysky
-RU	+4310+13156	Asia/Vladivostok	MSK+07 - Amur River
-RU	+643337+1431336	Asia/Ust-Nera	MSK+07 - Oymyakonsky
-RU	+5934+15048	Asia/Magadan	MSK+08 - Magadan
-RU	+4658+14242	Asia/Sakhalin	MSK+08 - Sakhalin Island
-RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E), N Kuril Is
-RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka
-RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
-RW	-0157+03004	Africa/Kigali
-SA	+2438+04643	Asia/Riyadh
-SB	-0932+16012	Pacific/Guadalcanal
-SC	-0440+05528	Indian/Mahe
-SD	+1536+03232	Africa/Khartoum
-SE	+5920+01803	Europe/Stockholm
-SG	+0117+10351	Asia/Singapore
-SH	-1555-00542	Atlantic/St_Helena
-SI	+4603+01431	Europe/Ljubljana
-SJ	+7800+01600	Arctic/Longyearbyen
-SK	+4809+01707	Europe/Bratislava
-SL	+0830-01315	Africa/Freetown
-SM	+4355+01228	Europe/San_Marino
-SN	+1440-01726	Africa/Dakar
-SO	+0204+04522	Africa/Mogadishu
-SR	+0550-05510	America/Paramaribo
-SS	+0451+03137	Africa/Juba
-ST	+0020+00644	Africa/Sao_Tome
-SV	+1342-08912	America/El_Salvador
-SX	+180305-0630250	America/Lower_Princes
-SY	+3330+03618	Asia/Damascus
-SZ	-2618+03106	Africa/Mbabane
-TC	+2128-07108	America/Grand_Turk
-TD	+1207+01503	Africa/Ndjamena
-TF	-492110+0701303	Indian/Kerguelen
-TG	+0608+00113	Africa/Lome
-TH	+1345+10031	Asia/Bangkok
-TJ	+3835+06848	Asia/Dushanbe
-TK	-0922-17114	Pacific/Fakaofo
-TL	-0833+12535	Asia/Dili
-TM	+3757+05823	Asia/Ashgabat
-TN	+3648+01011	Africa/Tunis
-TO	-210800-1751200	Pacific/Tongatapu
-TR	+4101+02858	Europe/Istanbul
-TT	+1039-06131	America/Port_of_Spain
-TV	-0831+17913	Pacific/Funafuti
-TW	+2503+12130	Asia/Taipei
-TZ	-0648+03917	Africa/Dar_es_Salaam
-UA	+5026+03031	Europe/Kyiv	most of Ukraine
-UG	+0019+03225	Africa/Kampala
-UM	+2813-17722	Pacific/Midway	Midway Islands
-UM	+1917+16637	Pacific/Wake	Wake Island
-US	+404251-0740023	America/New_York	Eastern (most areas)
-US	+421953-0830245	America/Detroit	Eastern - MI (most areas)
-US	+381515-0854534	America/Kentucky/Louisville	Eastern - KY (Louisville area)
-US	+364947-0845057	America/Kentucky/Monticello	Eastern - KY (Wayne)
-US	+394606-0860929	America/Indiana/Indianapolis	Eastern - IN (most areas)
-US	+384038-0873143	America/Indiana/Vincennes	Eastern - IN (Da, Du, K, Mn)
-US	+410305-0863611	America/Indiana/Winamac	Eastern - IN (Pulaski)
-US	+382232-0862041	America/Indiana/Marengo	Eastern - IN (Crawford)
-US	+382931-0871643	America/Indiana/Petersburg	Eastern - IN (Pike)
-US	+384452-0850402	America/Indiana/Vevay	Eastern - IN (Switzerland)
-US	+415100-0873900	America/Chicago	Central (most areas)
-US	+375711-0864541	America/Indiana/Tell_City	Central - IN (Perry)
-US	+411745-0863730	America/Indiana/Knox	Central - IN (Starke)
-US	+450628-0873651	America/Menominee	Central - MI (Wisconsin border)
-US	+470659-1011757	America/North_Dakota/Center	Central - ND (Oliver)
-US	+465042-1012439	America/North_Dakota/New_Salem	Central - ND (Morton rural)
-US	+471551-1014640	America/North_Dakota/Beulah	Central - ND (Mercer)
-US	+394421-1045903	America/Denver	Mountain (most areas)
-US	+433649-1161209	America/Boise	Mountain - ID (south), OR (east)
-US	+332654-1120424	America/Phoenix	MST - AZ (except Navajo)
-US	+340308-1181434	America/Los_Angeles	Pacific
-US	+611305-1495401	America/Anchorage	Alaska (most areas)
-US	+581807-1342511	America/Juneau	Alaska - Juneau area
-US	+571035-1351807	America/Sitka	Alaska - Sitka area
-US	+550737-1313435	America/Metlakatla	Alaska - Annette Island
-US	+593249-1394338	America/Yakutat	Alaska - Yakutat
-US	+643004-1652423	America/Nome	Alaska (west)
-US	+515248-1763929	America/Adak	Alaska - western Aleutians
-US	+211825-1575130	Pacific/Honolulu	Hawaii
-UY	-345433-0561245	America/Montevideo
-UZ	+3940+06648	Asia/Samarkand	Uzbekistan (west)
-UZ	+4120+06918	Asia/Tashkent	Uzbekistan (east)
-VA	+415408+0122711	Europe/Vatican
-VC	+1309-06114	America/St_Vincent
-VE	+1030-06656	America/Caracas
-VG	+1827-06437	America/Tortola
-VI	+1821-06456	America/St_Thomas
-VN	+1045+10640	Asia/Ho_Chi_Minh
-VU	-1740+16825	Pacific/Efate
-WF	-1318-17610	Pacific/Wallis
-WS	-1350-17144	Pacific/Apia
-YE	+1245+04512	Asia/Aden
-YT	-1247+04514	Indian/Mayotte
-ZA	-2615+02800	Africa/Johannesburg
-ZM	-1525+02817	Africa/Lusaka
-ZW	-1750+03103	Africa/Harare
diff --git a/lib/tzdata/zoneinfo/zone1970.tab b/lib/tzdata/zoneinfo/zone1970.tab
deleted file mode 100644
index 7726f39a..00000000
--- a/lib/tzdata/zoneinfo/zone1970.tab
+++ /dev/null
@@ -1,374 +0,0 @@
-# tzdb timezone descriptions
-#
-# This file is in the public domain.
-#
-# From Paul Eggert (2018-06-27):
-# This file contains a table where each row stands for a timezone where
-# civil timestamps have agreed since 1970.  Columns are separated by
-# a single tab.  Lines beginning with '#' are comments.  All text uses
-# UTF-8 encoding.  The columns of the table are as follows:
-#
-# 1.  The countries that overlap the timezone, as a comma-separated list
-#     of ISO 3166 2-character country codes.  See the file 'iso3166.tab'.
-# 2.  Latitude and longitude of the timezone's principal location
-#     in ISO 6709 sign-degrees-minutes-seconds format,
-#     either ±DDMM±DDDMM or ±DDMMSS±DDDMMSS,
-#     first latitude (+ is north), then longitude (+ is east).
-# 3.  Timezone name used in value of TZ environment variable.
-#     Please see the theory.html file for how these names are chosen.
-#     If multiple timezones overlap a country, each has a row in the
-#     table, with each column 1 containing the country code.
-# 4.  Comments; present if and only if countries have multiple timezones,
-#     and useful only for those countries.  For example, the comments
-#     for the row with countries CH,DE,LI and name Europe/Zurich
-#     are useful only for DE, since CH and LI have no other timezones.
-#
-# If a timezone covers multiple countries, the most-populous city is used,
-# and that country is listed first in column 1; any other countries
-# are listed alphabetically by country code.  The table is sorted
-# first by country code, then (if possible) by an order within the
-# country that (1) makes some geographical sense, and (2) puts the
-# most populous timezones first, where that does not contradict (1).
-#
-# This table is intended as an aid for users, to help them select timezones
-# appropriate for their practical needs.  It is not intended to take or
-# endorse any position on legal or territorial claims.
-#
-#country-
-#codes	coordinates	TZ	comments
-AD	+4230+00131	Europe/Andorra
-AE,OM,RE,SC,TF	+2518+05518	Asia/Dubai	Crozet
-AF	+3431+06912	Asia/Kabul
-AL	+4120+01950	Europe/Tirane
-AM	+4011+04430	Asia/Yerevan
-AQ	-6617+11031	Antarctica/Casey	Casey
-AQ	-6835+07758	Antarctica/Davis	Davis
-AQ	-6736+06253	Antarctica/Mawson	Mawson
-AQ	-6448-06406	Antarctica/Palmer	Palmer
-AQ	-6734-06808	Antarctica/Rothera	Rothera
-AQ	-720041+0023206	Antarctica/Troll	Troll
-AQ	-7824+10654	Antarctica/Vostok	Vostok
-AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
-AR	-3124-06411	America/Argentina/Cordoba	most areas: CB, CC, CN, ER, FM, MN, SE, SF
-AR	-2447-06525	America/Argentina/Salta	Salta (SA, LP, NQ, RN)
-AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
-AR	-2649-06513	America/Argentina/Tucuman	Tucumán (TM)
-AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
-AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
-AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
-AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
-AR	-3319-06621	America/Argentina/San_Luis	San Luis (SL)
-AR	-5138-06913	America/Argentina/Rio_Gallegos	Santa Cruz (SC)
-AR	-5448-06818	America/Argentina/Ushuaia	Tierra del Fuego (TF)
-AS,UM	-1416-17042	Pacific/Pago_Pago	Midway
-AT	+4813+01620	Europe/Vienna
-AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
-AU	-5430+15857	Antarctica/Macquarie	Macquarie Island
-AU	-4253+14719	Australia/Hobart	Tasmania
-AU	-3749+14458	Australia/Melbourne	Victoria
-AU	-3352+15113	Australia/Sydney	New South Wales (most areas)
-AU	-3157+14127	Australia/Broken_Hill	New South Wales (Yancowinna)
-AU	-2728+15302	Australia/Brisbane	Queensland (most areas)
-AU	-2016+14900	Australia/Lindeman	Queensland (Whitsunday Islands)
-AU	-3455+13835	Australia/Adelaide	South Australia
-AU	-1228+13050	Australia/Darwin	Northern Territory
-AU	-3157+11551	Australia/Perth	Western Australia (most areas)
-AU	-3143+12852	Australia/Eucla	Western Australia (Eucla)
-AZ	+4023+04951	Asia/Baku
-BB	+1306-05937	America/Barbados
-BD	+2343+09025	Asia/Dhaka
-BE,LU,NL	+5050+00420	Europe/Brussels
-BG	+4241+02319	Europe/Sofia
-BM	+3217-06446	Atlantic/Bermuda
-BO	-1630-06809	America/La_Paz
-BR	-0351-03225	America/Noronha	Atlantic islands
-BR	-0127-04829	America/Belem	Pará (east), Amapá
-BR	-0343-03830	America/Fortaleza	Brazil (northeast: MA, PI, CE, RN, PB)
-BR	-0803-03454	America/Recife	Pernambuco
-BR	-0712-04812	America/Araguaina	Tocantins
-BR	-0940-03543	America/Maceio	Alagoas, Sergipe
-BR	-1259-03831	America/Bahia	Bahia
-BR	-2332-04637	America/Sao_Paulo	Brazil (southeast: GO, DF, MG, ES, RJ, SP, PR, SC, RS)
-BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
-BR	-1535-05605	America/Cuiaba	Mato Grosso
-BR	-0226-05452	America/Santarem	Pará (west)
-BR	-0846-06354	America/Porto_Velho	Rondônia
-BR	+0249-06040	America/Boa_Vista	Roraima
-BR	-0308-06001	America/Manaus	Amazonas (east)
-BR	-0640-06952	America/Eirunepe	Amazonas (west)
-BR	-0958-06748	America/Rio_Branco	Acre
-BT	+2728+08939	Asia/Thimphu
-BY	+5354+02734	Europe/Minsk
-BZ	+1730-08812	America/Belize
-CA	+4734-05243	America/St_Johns	Newfoundland, Labrador (SE)
-CA	+4439-06336	America/Halifax	Atlantic - NS (most areas), PE
-CA	+4612-05957	America/Glace_Bay	Atlantic - NS (Cape Breton)
-CA	+4606-06447	America/Moncton	Atlantic - New Brunswick
-CA	+5320-06025	America/Goose_Bay	Atlantic - Labrador (most areas)
-CA,BS	+4339-07923	America/Toronto	Eastern - ON & QC (most areas)
-CA	+6344-06828	America/Iqaluit	Eastern - NU (most areas)
-CA	+4953-09709	America/Winnipeg	Central - ON (west), Manitoba
-CA	+744144-0944945	America/Resolute	Central - NU (Resolute)
-CA	+624900-0920459	America/Rankin_Inlet	Central - NU (central)
-CA	+5024-10439	America/Regina	CST - SK (most areas)
-CA	+5017-10750	America/Swift_Current	CST - SK (midwest)
-CA	+5333-11328	America/Edmonton	Mountain - AB, BC(E), NT(E), SK(W)
-CA	+690650-1050310	America/Cambridge_Bay	Mountain - NU (west)
-CA	+682059-1334300	America/Inuvik	Mountain - NT (west)
-CA	+5546-12014	America/Dawson_Creek	MST - BC (Dawson Cr, Ft St John)
-CA	+5848-12242	America/Fort_Nelson	MST - BC (Ft Nelson)
-CA	+6043-13503	America/Whitehorse	MST - Yukon (east)
-CA	+6404-13925	America/Dawson	MST - Yukon (west)
-CA	+4916-12307	America/Vancouver	Pacific - BC (most areas)
-CH,DE,LI	+4723+00832	Europe/Zurich	Büsingen
-CI,BF,GH,GM,GN,IS,ML,MR,SH,SL,SN,TG	+0519-00402	Africa/Abidjan
-CK	-2114-15946	Pacific/Rarotonga
-CL	-3327-07040	America/Santiago	most of Chile
-CL	-5309-07055	America/Punta_Arenas	Region of Magallanes
-CL	-2709-10926	Pacific/Easter	Easter Island
-CN	+3114+12128	Asia/Shanghai	Beijing Time
-CN	+4348+08735	Asia/Urumqi	Xinjiang Time
-CO	+0436-07405	America/Bogota
-CR	+0956-08405	America/Costa_Rica
-CU	+2308-08222	America/Havana
-CV	+1455-02331	Atlantic/Cape_Verde
-CY	+3510+03322	Asia/Nicosia	most of Cyprus
-CY	+3507+03357	Asia/Famagusta	Northern Cyprus
-CZ,SK	+5005+01426	Europe/Prague
-DE,DK,NO,SE,SJ	+5230+01322	Europe/Berlin	most of Germany
-DO	+1828-06954	America/Santo_Domingo
-DZ	+3647+00303	Africa/Algiers
-EC	-0210-07950	America/Guayaquil	Ecuador (mainland)
-EC	-0054-08936	Pacific/Galapagos	Galápagos Islands
-EE	+5925+02445	Europe/Tallinn
-EG	+3003+03115	Africa/Cairo
-EH	+2709-01312	Africa/El_Aaiun
-ES	+4024-00341	Europe/Madrid	Spain (mainland)
-ES	+3553-00519	Africa/Ceuta	Ceuta, Melilla
-ES	+2806-01524	Atlantic/Canary	Canary Islands
-FI,AX	+6010+02458	Europe/Helsinki
-FJ	-1808+17825	Pacific/Fiji
-FK	-5142-05751	Atlantic/Stanley
-FM	+0519+16259	Pacific/Kosrae	Kosrae
-FO	+6201-00646	Atlantic/Faroe
-FR,MC	+4852+00220	Europe/Paris
-GB,GG,IM,JE	+513030-0000731	Europe/London
-GE	+4143+04449	Asia/Tbilisi
-GF	+0456-05220	America/Cayenne
-GI	+3608-00521	Europe/Gibraltar
-GL	+6411-05144	America/Nuuk	most of Greenland
-GL	+7646-01840	America/Danmarkshavn	National Park (east coast)
-GL	+7029-02158	America/Scoresbysund	Scoresbysund/Ittoqqortoormiit
-GL	+7634-06847	America/Thule	Thule/Pituffik
-GR	+3758+02343	Europe/Athens
-GS	-5416-03632	Atlantic/South_Georgia
-GT	+1438-09031	America/Guatemala
-GU,MP	+1328+14445	Pacific/Guam
-GW	+1151-01535	Africa/Bissau
-GY	+0648-05810	America/Guyana
-HK	+2217+11409	Asia/Hong_Kong
-HN	+1406-08713	America/Tegucigalpa
-HT	+1832-07220	America/Port-au-Prince
-HU	+4730+01905	Europe/Budapest
-ID	-0610+10648	Asia/Jakarta	Java, Sumatra
-ID	-0002+10920	Asia/Pontianak	Borneo (west, central)
-ID	-0507+11924	Asia/Makassar	Borneo (east, south), Sulawesi/Celebes, Bali, Nusa Tengarra, Timor (west)
-ID	-0232+14042	Asia/Jayapura	New Guinea (West Papua / Irian Jaya), Malukus/Moluccas
-IE	+5320-00615	Europe/Dublin
-IL	+314650+0351326	Asia/Jerusalem
-IN	+2232+08822	Asia/Kolkata
-IO	-0720+07225	Indian/Chagos
-IQ	+3321+04425	Asia/Baghdad
-IR	+3540+05126	Asia/Tehran
-IT,SM,VA	+4154+01229	Europe/Rome
-JM	+175805-0764736	America/Jamaica
-JO	+3157+03556	Asia/Amman
-JP	+353916+1394441	Asia/Tokyo
-KE,DJ,ER,ET,KM,MG,SO,TZ,UG,YT	-0117+03649	Africa/Nairobi
-KG	+4254+07436	Asia/Bishkek
-KI,MH,TV,UM,WF	+0125+17300	Pacific/Tarawa	Gilberts, Marshalls, Wake
-KI	-0247-17143	Pacific/Kanton	Phoenix Islands
-KI	+0152-15720	Pacific/Kiritimati	Line Islands
-KP	+3901+12545	Asia/Pyongyang
-KR	+3733+12658	Asia/Seoul
-KZ	+4315+07657	Asia/Almaty	most of Kazakhstan
-KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda/Kyzylorda/Kzyl-Orda
-KZ	+5312+06337	Asia/Qostanay	Qostanay/Kostanay/Kustanay
-KZ	+5017+05710	Asia/Aqtobe	Aqtöbe/Aktobe
-KZ	+4431+05016	Asia/Aqtau	Mangghystaū/Mankistau
-KZ	+4707+05156	Asia/Atyrau	Atyraū/Atirau/Gur'yev
-KZ	+5113+05121	Asia/Oral	West Kazakhstan
-LB	+3353+03530	Asia/Beirut
-LK	+0656+07951	Asia/Colombo
-LR	+0618-01047	Africa/Monrovia
-LT	+5441+02519	Europe/Vilnius
-LV	+5657+02406	Europe/Riga
-LY	+3254+01311	Africa/Tripoli
-MA	+3339-00735	Africa/Casablanca
-MD	+4700+02850	Europe/Chisinau
-MH	+0905+16720	Pacific/Kwajalein	Kwajalein
-MM,CC	+1647+09610	Asia/Yangon
-MN	+4755+10653	Asia/Ulaanbaatar	most of Mongolia
-MN	+4801+09139	Asia/Hovd	Bayan-Ölgii, Hovd, Uvs
-MO	+221150+1133230	Asia/Macau
-MQ	+1436-06105	America/Martinique
-MT	+3554+01431	Europe/Malta
-MU	-2010+05730	Indian/Mauritius
-MV,TF	+0410+07330	Indian/Maldives	Kerguelen, St Paul I, Amsterdam I
-MX	+1924-09909	America/Mexico_City	Central Mexico
-MX	+2105-08646	America/Cancun	Quintana Roo
-MX	+2058-08937	America/Merida	Campeche, Yucatán
-MX	+2540-10019	America/Monterrey	Durango; Coahuila, Nuevo León, Tamaulipas (most areas)
-MX	+2550-09730	America/Matamoros	Coahuila, Nuevo León, Tamaulipas (US border)
-MX	+2838-10605	America/Chihuahua	Chihuahua (most areas)
-MX	+3144-10629	America/Ciudad_Juarez	Chihuahua (US border - west)
-MX	+2934-10425	America/Ojinaga	Chihuahua (US border - east)
-MX	+2313-10625	America/Mazatlan	Baja California Sur, Nayarit (most areas), Sinaloa
-MX	+2048-10515	America/Bahia_Banderas	Bahía de Banderas
-MX	+2904-11058	America/Hermosillo	Sonora
-MX	+3232-11701	America/Tijuana	Baja California
-MY,BN	+0133+11020	Asia/Kuching	Sabah, Sarawak
-MZ,BI,BW,CD,MW,RW,ZM,ZW	-2558+03235	Africa/Maputo	Central Africa Time
-NA	-2234+01706	Africa/Windhoek
-NC	-2216+16627	Pacific/Noumea
-NF	-2903+16758	Pacific/Norfolk
-NG,AO,BJ,CD,CF,CG,CM,GA,GQ,NE	+0627+00324	Africa/Lagos	West Africa Time
-NI	+1209-08617	America/Managua
-NP	+2743+08519	Asia/Kathmandu
-NR	-0031+16655	Pacific/Nauru
-NU	-1901-16955	Pacific/Niue
-NZ,AQ	-3652+17446	Pacific/Auckland	New Zealand time
-NZ	-4357-17633	Pacific/Chatham	Chatham Islands
-PA,CA,KY	+0858-07932	America/Panama	EST - ON (Atikokan), NU (Coral H)
-PE	-1203-07703	America/Lima
-PF	-1732-14934	Pacific/Tahiti	Society Islands
-PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
-PF	-2308-13457	Pacific/Gambier	Gambier Islands
-PG,AQ,FM	-0930+14710	Pacific/Port_Moresby	Papua New Guinea (most areas), Chuuk, Yap, Dumont d'Urville
-PG	-0613+15534	Pacific/Bougainville	Bougainville
-PH	+1435+12100	Asia/Manila
-PK	+2452+06703	Asia/Karachi
-PL	+5215+02100	Europe/Warsaw
-PM	+4703-05620	America/Miquelon
-PN	-2504-13005	Pacific/Pitcairn
-PR,AG,CA,AI,AW,BL,BQ,CW,DM,GD,GP,KN,LC,MF,MS,SX,TT,VC,VG,VI	+182806-0660622	America/Puerto_Rico	AST - QC (Lower North Shore)
-PS	+3130+03428	Asia/Gaza	Gaza Strip
-PS	+313200+0350542	Asia/Hebron	West Bank
-PT	+3843-00908	Europe/Lisbon	Portugal (mainland)
-PT	+3238-01654	Atlantic/Madeira	Madeira Islands
-PT	+3744-02540	Atlantic/Azores	Azores
-PW	+0720+13429	Pacific/Palau
-PY	-2516-05740	America/Asuncion
-QA,BH	+2517+05132	Asia/Qatar
-RO	+4426+02606	Europe/Bucharest
-RS,BA,HR,ME,MK,SI	+4450+02030	Europe/Belgrade
-RU	+5443+02030	Europe/Kaliningrad	MSK-01 - Kaliningrad
-RU	+554521+0373704	Europe/Moscow	MSK+00 - Moscow area
-# Mention RU and UA alphabetically.  See "territorial claims" above.
-RU,UA	+4457+03406	Europe/Simferopol	Crimea
-RU	+5836+04939	Europe/Kirov	MSK+00 - Kirov
-RU	+4844+04425	Europe/Volgograd	MSK+00 - Volgograd
-RU	+4621+04803	Europe/Astrakhan	MSK+01 - Astrakhan
-RU	+5134+04602	Europe/Saratov	MSK+01 - Saratov
-RU	+5420+04824	Europe/Ulyanovsk	MSK+01 - Ulyanovsk
-RU	+5312+05009	Europe/Samara	MSK+01 - Samara, Udmurtia
-RU	+5651+06036	Asia/Yekaterinburg	MSK+02 - Urals
-RU	+5500+07324	Asia/Omsk	MSK+03 - Omsk
-RU	+5502+08255	Asia/Novosibirsk	MSK+04 - Novosibirsk
-RU	+5322+08345	Asia/Barnaul	MSK+04 - Altai
-RU	+5630+08458	Asia/Tomsk	MSK+04 - Tomsk
-RU	+5345+08707	Asia/Novokuznetsk	MSK+04 - Kemerovo
-RU	+5601+09250	Asia/Krasnoyarsk	MSK+04 - Krasnoyarsk area
-RU	+5216+10420	Asia/Irkutsk	MSK+05 - Irkutsk, Buryatia
-RU	+5203+11328	Asia/Chita	MSK+06 - Zabaykalsky
-RU	+6200+12940	Asia/Yakutsk	MSK+06 - Lena River
-RU	+623923+1353314	Asia/Khandyga	MSK+06 - Tomponsky, Ust-Maysky
-RU	+4310+13156	Asia/Vladivostok	MSK+07 - Amur River
-RU	+643337+1431336	Asia/Ust-Nera	MSK+07 - Oymyakonsky
-RU	+5934+15048	Asia/Magadan	MSK+08 - Magadan
-RU	+4658+14242	Asia/Sakhalin	MSK+08 - Sakhalin Island
-RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E), N Kuril Is
-RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka
-RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea
-SA,AQ,KW,YE	+2438+04643	Asia/Riyadh	Syowa
-SB,FM	-0932+16012	Pacific/Guadalcanal	Pohnpei
-SD	+1536+03232	Africa/Khartoum
-SG,MY	+0117+10351	Asia/Singapore	peninsular Malaysia
-SR	+0550-05510	America/Paramaribo
-SS	+0451+03137	Africa/Juba
-ST	+0020+00644	Africa/Sao_Tome
-SV	+1342-08912	America/El_Salvador
-SY	+3330+03618	Asia/Damascus
-TC	+2128-07108	America/Grand_Turk
-TD	+1207+01503	Africa/Ndjamena
-TH,CX,KH,LA,VN	+1345+10031	Asia/Bangkok	north Vietnam
-TJ	+3835+06848	Asia/Dushanbe
-TK	-0922-17114	Pacific/Fakaofo
-TL	-0833+12535	Asia/Dili
-TM	+3757+05823	Asia/Ashgabat
-TN	+3648+01011	Africa/Tunis
-TO	-210800-1751200	Pacific/Tongatapu
-TR	+4101+02858	Europe/Istanbul
-TW	+2503+12130	Asia/Taipei
-UA	+5026+03031	Europe/Kyiv	most of Ukraine
-US	+404251-0740023	America/New_York	Eastern (most areas)
-US	+421953-0830245	America/Detroit	Eastern - MI (most areas)
-US	+381515-0854534	America/Kentucky/Louisville	Eastern - KY (Louisville area)
-US	+364947-0845057	America/Kentucky/Monticello	Eastern - KY (Wayne)
-US	+394606-0860929	America/Indiana/Indianapolis	Eastern - IN (most areas)
-US	+384038-0873143	America/Indiana/Vincennes	Eastern - IN (Da, Du, K, Mn)
-US	+410305-0863611	America/Indiana/Winamac	Eastern - IN (Pulaski)
-US	+382232-0862041	America/Indiana/Marengo	Eastern - IN (Crawford)
-US	+382931-0871643	America/Indiana/Petersburg	Eastern - IN (Pike)
-US	+384452-0850402	America/Indiana/Vevay	Eastern - IN (Switzerland)
-US	+415100-0873900	America/Chicago	Central (most areas)
-US	+375711-0864541	America/Indiana/Tell_City	Central - IN (Perry)
-US	+411745-0863730	America/Indiana/Knox	Central - IN (Starke)
-US	+450628-0873651	America/Menominee	Central - MI (Wisconsin border)
-US	+470659-1011757	America/North_Dakota/Center	Central - ND (Oliver)
-US	+465042-1012439	America/North_Dakota/New_Salem	Central - ND (Morton rural)
-US	+471551-1014640	America/North_Dakota/Beulah	Central - ND (Mercer)
-US	+394421-1045903	America/Denver	Mountain (most areas)
-US	+433649-1161209	America/Boise	Mountain - ID (south), OR (east)
-US,CA	+332654-1120424	America/Phoenix	MST - AZ (most areas), Creston BC
-US	+340308-1181434	America/Los_Angeles	Pacific
-US	+611305-1495401	America/Anchorage	Alaska (most areas)
-US	+581807-1342511	America/Juneau	Alaska - Juneau area
-US	+571035-1351807	America/Sitka	Alaska - Sitka area
-US	+550737-1313435	America/Metlakatla	Alaska - Annette Island
-US	+593249-1394338	America/Yakutat	Alaska - Yakutat
-US	+643004-1652423	America/Nome	Alaska (west)
-US	+515248-1763929	America/Adak	Alaska - western Aleutians
-US	+211825-1575130	Pacific/Honolulu	Hawaii
-UY	-345433-0561245	America/Montevideo
-UZ	+3940+06648	Asia/Samarkand	Uzbekistan (west)
-UZ	+4120+06918	Asia/Tashkent	Uzbekistan (east)
-VE	+1030-06656	America/Caracas
-VN	+1045+10640	Asia/Ho_Chi_Minh	south Vietnam
-VU	-1740+16825	Pacific/Efate
-WS	-1350-17144	Pacific/Apia
-ZA,LS,SZ	-2615+02800	Africa/Johannesburg
-#
-# The next section contains experimental tab-separated comments for
-# use by user agents like tzselect that identify continents and oceans.
-#
-# For example, the comment "#@AQ<tab>Antarctica/" means the country code
-# AQ is in the continent Antarctica regardless of the Zone name,
-# so Pacific/Auckland should be listed under Antarctica as well as
-# under the Pacific because its line's country codes include AQ.
-#
-# If more than one country code is affected each is listed separated
-# by commas, e.g., #@IS,SH<tab>Atlantic/".  If a country code is in
-# more than one continent or ocean, each is listed separated by
-# commas, e.g., the second column of "#@CY,TR<tab>Asia/,Europe/".
-#
-# These experimental comments are present only for country codes where
-# the continent or ocean is not already obvious from the Zone name.
-# For example, there is no such comment for RU since it already
-# corresponds to Zone names starting with both "Europe/" and "Asia/".
-#
-#@AQ	Antarctica/
-#@IS,SH	Atlantic/
-#@CY,TR	Asia/,Europe/
-#@SJ	Arctic/
-#@CC,CX,KM,MG,YT	Indian/
diff --git a/lib/tzdata/zoneinfo/zonenow.tab b/lib/tzdata/zoneinfo/zonenow.tab
deleted file mode 100644
index 01f536b3..00000000
--- a/lib/tzdata/zoneinfo/zonenow.tab
+++ /dev/null
@@ -1,299 +0,0 @@
-# tzdb timezone descriptions, for users who do not care about old timestamps
-#
-# This file is in the public domain.
-#
-# From Paul Eggert (2023-12-18):
-# This file contains a table where each row stands for a timezone
-# where civil timestamps are predicted to agree from now on.
-# This file is like zone1970.tab (see zone1970.tab's comments),
-# but with the following changes:
-#
-# 1.  Each timezone corresponds to a set of clocks that are planned
-#     to agree from now on.  This is a larger set of clocks than in
-#     zone1970.tab, where each timezone's clocks must agree from 1970 on.
-# 2.  The first column is irrelevant and ignored.
-# 3.  The table is sorted in a different way:
-#     first by standard time UTC offset;
-#     then, if DST is used, by daylight saving UTC offset;
-#     then by time zone abbreviation.
-# 4.  Every timezone has a nonempty comments column, with wording
-#     distinguishing the timezone only from other timezones with the
-#     same UTC offset at some point during the year.
-#
-# The format of this table is experimental, and may change in future versions.
-#
-# This table is intended as an aid for users, to help them select timezones
-# appropriate for their practical needs.  It is not intended to take or
-# endorse any position on legal or territorial claims.
-#
-#XX	coordinates	TZ	comments
-#
-# -11 - SST
-XX	-1416-17042	Pacific/Pago_Pago	Midway; Samoa ("SST")
-#
-# -11
-XX	-1901-16955	Pacific/Niue	Niue
-#
-# -10 - HST
-XX	+211825-1575130	Pacific/Honolulu	Hawaii ("HST")
-#
-# -10
-XX	-1732-14934	Pacific/Tahiti	Tahiti; Cook Islands
-#
-# -10/-09 - HST / HDT (North America DST)
-XX	+515248-1763929	America/Adak	western Aleutians in Alaska ("HST/HDT")
-#
-# -09:30
-XX	-0900-13930	Pacific/Marquesas	Marquesas
-#
-# -09
-XX	-2308-13457	Pacific/Gambier	Gambier
-#
-# -09/-08 - AKST/AKDT (North America DST)
-XX	+611305-1495401	America/Anchorage	most of Alaska ("AKST/AKDT")
-#
-# -08
-XX	-2504-13005	Pacific/Pitcairn	Pitcairn
-#
-# -08/-07 - PST/PDT (North America DST)
-XX	+340308-1181434	America/Los_Angeles	Pacific ("PST/PDT") - US & Canada; Mexico near US border
-#
-# -07 - MST
-XX	+332654-1120424	America/Phoenix	Mountain Standard ("MST") - Arizona; western Mexico; Yukon
-#
-# -07/-06 - MST/MDT (North America DST)
-XX	+394421-1045903	America/Denver	Mountain ("MST/MDT") - US & Canada; Mexico near US border
-#
-# -06
-XX	-0054-08936	Pacific/Galapagos	Galápagos
-#
-# -06 - CST
-XX	+1924-09909	America/Mexico_City	Central Standard ("CST") - Saskatchewan; central Mexico; Central America
-#
-# -06/-05 (Chile DST)
-XX	-2709-10926	Pacific/Easter	Easter Island
-#
-# -06/-05 - CST/CDT (North America DST)
-XX	+415100-0873900	America/Chicago	Central ("CST/CDT") - US & Canada; Mexico near US border
-#
-# -05
-XX	-1203-07703	America/Lima	eastern South America
-#
-# -05 - EST
-XX	+175805-0764736	America/Jamaica	Eastern Standard ("EST") - Caymans; Jamaica; eastern Mexico; Panama
-#
-# -05/-04 - CST/CDT (Cuba DST)
-XX	+2308-08222	America/Havana	Cuba
-#
-# -05/-04 - EST/EDT (North America DST)
-XX	+404251-0740023	America/New_York	Eastern ("EST/EDT") - US & Canada
-#
-# -04
-XX	+1030-06656	America/Caracas	western South America
-#
-# -04 - AST
-XX	+1828-06954	America/Santo_Domingo	Atlantic Standard ("AST") - eastern Caribbean
-#
-# -04/-03 (Chile DST)
-XX	-3327-07040	America/Santiago	most of Chile
-#
-# -04/-03 (Paraguay DST)
-XX	-2516-05740	America/Asuncion	Paraguay
-#
-# -04/-03 - AST/ADT (North America DST)
-XX	+4439-06336	America/Halifax	Atlantic ("AST/ADT") - Canada; Bermuda
-#
-# -03:30/-02:30 - NST/NDT (North America DST)
-XX	+4734-05243	America/St_Johns	Newfoundland ("NST/NDT")
-#
-# -03
-XX	-2332-04637	America/Sao_Paulo	eastern South America
-#
-# -03/-02 (North America DST)
-XX	+4703-05620	America/Miquelon	St Pierre & Miquelon
-#
-# -02
-XX	-0351-03225	America/Noronha	Fernando de Noronha; South Georgia
-#
-# -02/-01 (EU DST)
-XX	+6411-05144	America/Nuuk	most of Greenland
-#
-# -01
-XX	+1455-02331	Atlantic/Cape_Verde	Cape Verde
-#
-# -01/+00 (EU DST)
-XX	+3744-02540	Atlantic/Azores	Azores
-#
-# +00 - GMT
-XX	+0519-00402	Africa/Abidjan	far western Africa; Iceland ("GMT")
-#
-# +00/+01 - GMT/BST (EU DST)
-XX	+513030-0000731	Europe/London	United Kingdom ("GMT/BST")
-#
-# +00/+01 - WET/WEST (EU DST)
-XX	+3843-00908	Europe/Lisbon	western Europe ("WET/WEST")
-#
-# +00/+02 - Troll DST
-XX	-720041+0023206	Antarctica/Troll	Troll Station in Antarctica
-#
-# +01 - CET
-XX	+3647+00303	Africa/Algiers	Algeria, Tunisia ("CET")
-#
-# +01 - WAT
-XX	+0627+00324	Africa/Lagos	western Africa ("WAT")
-#
-# +01/+00 - IST/GMT (EU DST in reverse)
-XX	+5320-00615	Europe/Dublin	Ireland ("IST/GMT")
-#
-# +01/+00 - (Morocco DST)
-XX	+3339-00735	Africa/Casablanca	Morocco
-#
-# +01/+02 - CET/CEST (EU DST)
-XX	+4852+00220	Europe/Paris	central Europe ("CET/CEST")
-#
-# +02 - CAT
-XX	-2558+03235	Africa/Maputo	central Africa ("CAT")
-#
-# +02 - EET
-XX	+3254+01311	Africa/Tripoli	Libya; Kaliningrad ("EET")
-#
-# +02 - SAST
-XX	-2615+02800	Africa/Johannesburg	southern Africa ("SAST")
-#
-# +02/+03 - EET/EEST (EU DST)
-XX	+3758+02343	Europe/Athens	eastern Europe ("EET/EEST")
-#
-# +02/+03 - EET/EEST (Egypt DST)
-XX	+3003+03115	Africa/Cairo	Egypt
-#
-# +02/+03 - EET/EEST (Lebanon DST)
-XX	+3353+03530	Asia/Beirut	Lebanon
-#
-# +02/+03 - EET/EEST (Moldova DST)
-XX	+4700+02850	Europe/Chisinau	Moldova
-#
-# +02/+03 - EET/EEST (Palestine DST)
-XX	+3130+03428	Asia/Gaza	Palestine
-#
-# +02/+03 - IST/IDT (Israel DST)
-XX	+314650+0351326	Asia/Jerusalem	Israel
-#
-# +03
-XX	+4101+02858	Europe/Istanbul	Near East; Belarus
-#
-# +03 - EAT
-XX	-0117+03649	Africa/Nairobi	eastern Africa ("EAT")
-#
-# +03 - MSK
-XX	+554521+0373704	Europe/Moscow	Moscow ("MSK")
-#
-# +03:30
-XX	+3540+05126	Asia/Tehran	Iran
-#
-# +04
-XX	+2518+05518	Asia/Dubai	Russia; Caucasus; Persian Gulf; Seychelles; Réunion
-#
-# +04:30
-XX	+3431+06912	Asia/Kabul	Afghanistan
-#
-# +05
-XX	+4120+06918	Asia/Tashkent	Russia; Kazakhstan; Tajikistan; Turkmenistan; Uzbekistan; Maldives
-#
-# +05 - PKT
-XX	+2452+06703	Asia/Karachi	Pakistan ("PKT")
-#
-# +05:30
-XX	+0656+07951	Asia/Colombo	Sri Lanka
-#
-# +05:30 - IST
-XX	+2232+08822	Asia/Kolkata	India ("IST")
-#
-# +05:45
-XX	+2743+08519	Asia/Kathmandu	Nepal
-#
-# +06
-XX	+2343+09025	Asia/Dhaka	Russia; Kyrgyzstan; Bhutan; Bangladesh; Chagos
-#
-# +06:30
-XX	+1647+09610	Asia/Yangon	Myanmar; Cocos
-#
-# +07
-XX	+1345+10031	Asia/Bangkok	Russia; Indochina; Christmas Island
-#
-# +07 - WIB
-XX	-0610+10648	Asia/Jakarta	Indonesia ("WIB")
-#
-# +08
-XX	+0117+10351	Asia/Singapore	Russia; Brunei; Malaysia; Singapore
-#
-# +08 - AWST
-XX	-3157+11551	Australia/Perth	Western Australia ("AWST")
-#
-# +08 - CST
-XX	+3114+12128	Asia/Shanghai	China ("CST")
-#
-# +08 - HKT
-XX	+2217+11409	Asia/Hong_Kong	Hong Kong ("HKT")
-#
-# +08 - PHT
-XX	+1435+12100	Asia/Manila	Philippines ("PHT")
-#
-# +08 - WITA
-XX	-0507+11924	Asia/Makassar	Indonesia ("WITA")
-#
-# +08:45
-XX	-3143+12852	Australia/Eucla	Eucla
-#
-# +09
-XX	+5203+11328	Asia/Chita	Russia; Palau; East Timor
-#
-# +09 - JST
-XX	+353916+1394441	Asia/Tokyo	Japan ("JST")
-#
-# +09 - KST
-XX	+3733+12658	Asia/Seoul	Korea ("KST")
-#
-# +09 - WIT
-XX	-0232+14042	Asia/Jayapura	Indonesia ("WIT")
-#
-# +09:30 - ACST
-XX	-1228+13050	Australia/Darwin	Northern Territory ("ACST")
-#
-# +09:30/+10:30 - ACST/ACDT (Australia DST)
-XX	-3455+13835	Australia/Adelaide	South Australia ("ACST/ACDT")
-#
-# +10
-XX	+4310+13156	Asia/Vladivostok	Russia; Yap; Chuuk; Papua New Guinea; Dumont d'Urville
-#
-# +10 - AEST
-XX	-2728+15302	Australia/Brisbane	Queensland ("AEST")
-#
-# +10 - ChST
-XX	+1328+14445	Pacific/Guam	Mariana Islands ("ChST")
-#
-# +10/+11 - AEST/AEDT (Australia DST)
-XX	-3352+15113	Australia/Sydney	southeast Australia ("AEST/AEDT")
-#
-# +10:30/+11
-XX	-3133+15905	Australia/Lord_Howe	Lord Howe Island
-#
-# +11
-XX	-0613+15534	Pacific/Bougainville	Russia; Kosrae; Bougainville; Solomons
-#
-# +11/+12 (Australia DST)
-XX	-2903+16758	Pacific/Norfolk	Norfolk Island
-#
-# +12
-XX	+5301+15839	Asia/Kamchatka	Russia; Tuvalu; Fiji; etc.
-#
-# +12/+13 (New Zealand DST)
-XX	-3652+17446	Pacific/Auckland	New Zealand ("NZST/NZDT")
-#
-# +12:45/+13:45 (Chatham DST)
-XX	-4357-17633	Pacific/Chatham	Chatham Islands
-#
-# +13
-XX	-210800-1751200	Pacific/Tongatapu	Kanton; Tokelau; Samoa (western); Tonga
-#
-# +14
-XX	+0152-15720	Pacific/Kiritimati	Kiritimati
diff --git a/lib/tzdata/zones b/lib/tzdata/zones
deleted file mode 100644
index 3c4a951d..00000000
--- a/lib/tzdata/zones
+++ /dev/null
@@ -1,597 +0,0 @@
-Africa/Abidjan
-Africa/Algiers
-Africa/Bissau
-Africa/Cairo
-Africa/Casablanca
-Africa/Ceuta
-Africa/El_Aaiun
-Africa/Johannesburg
-Africa/Juba
-Africa/Khartoum
-Africa/Lagos
-Africa/Maputo
-Africa/Monrovia
-Africa/Nairobi
-Africa/Ndjamena
-Africa/Sao_Tome
-Africa/Tripoli
-Africa/Tunis
-Africa/Windhoek
-America/Adak
-America/Anchorage
-America/Araguaina
-America/Argentina/Buenos_Aires
-America/Argentina/Catamarca
-America/Argentina/Cordoba
-America/Argentina/Jujuy
-America/Argentina/La_Rioja
-America/Argentina/Mendoza
-America/Argentina/Rio_Gallegos
-America/Argentina/Salta
-America/Argentina/San_Juan
-America/Argentina/San_Luis
-America/Argentina/Tucuman
-America/Argentina/Ushuaia
-America/Asuncion
-America/Bahia
-America/Bahia_Banderas
-America/Barbados
-America/Belem
-America/Belize
-America/Boa_Vista
-America/Bogota
-America/Boise
-America/Cambridge_Bay
-America/Campo_Grande
-America/Cancun
-America/Caracas
-America/Cayenne
-America/Chicago
-America/Chihuahua
-America/Ciudad_Juarez
-America/Costa_Rica
-America/Cuiaba
-America/Danmarkshavn
-America/Dawson
-America/Dawson_Creek
-America/Denver
-America/Detroit
-America/Edmonton
-America/Eirunepe
-America/El_Salvador
-America/Fort_Nelson
-America/Fortaleza
-America/Glace_Bay
-America/Goose_Bay
-America/Grand_Turk
-America/Guatemala
-America/Guayaquil
-America/Guyana
-America/Halifax
-America/Havana
-America/Hermosillo
-America/Indiana/Indianapolis
-America/Indiana/Knox
-America/Indiana/Marengo
-America/Indiana/Petersburg
-America/Indiana/Tell_City
-America/Indiana/Vevay
-America/Indiana/Vincennes
-America/Indiana/Winamac
-America/Inuvik
-America/Iqaluit
-America/Jamaica
-America/Juneau
-America/Kentucky/Louisville
-America/Kentucky/Monticello
-America/La_Paz
-America/Lima
-America/Los_Angeles
-America/Maceio
-America/Managua
-America/Manaus
-America/Martinique
-America/Matamoros
-America/Mazatlan
-America/Menominee
-America/Merida
-America/Metlakatla
-America/Mexico_City
-America/Miquelon
-America/Moncton
-America/Monterrey
-America/Montevideo
-America/New_York
-America/Nome
-America/Noronha
-America/North_Dakota/Beulah
-America/North_Dakota/Center
-America/North_Dakota/New_Salem
-America/Nuuk
-America/Ojinaga
-America/Panama
-America/Paramaribo
-America/Phoenix
-America/Port-au-Prince
-America/Porto_Velho
-America/Puerto_Rico
-America/Punta_Arenas
-America/Rankin_Inlet
-America/Recife
-America/Regina
-America/Resolute
-America/Rio_Branco
-America/Santarem
-America/Santiago
-America/Santo_Domingo
-America/Sao_Paulo
-America/Scoresbysund
-America/Sitka
-America/St_Johns
-America/Swift_Current
-America/Tegucigalpa
-America/Thule
-America/Tijuana
-America/Toronto
-America/Vancouver
-America/Whitehorse
-America/Winnipeg
-America/Yakutat
-Antarctica/Casey
-Antarctica/Davis
-Antarctica/Macquarie
-Antarctica/Mawson
-Antarctica/Palmer
-Antarctica/Rothera
-Antarctica/Troll
-Antarctica/Vostok
-Asia/Almaty
-Asia/Amman
-Asia/Anadyr
-Asia/Aqtau
-Asia/Aqtobe
-Asia/Ashgabat
-Asia/Atyrau
-Asia/Baghdad
-Asia/Baku
-Asia/Bangkok
-Asia/Barnaul
-Asia/Beirut
-Asia/Bishkek
-Asia/Chita
-Asia/Colombo
-Asia/Damascus
-Asia/Dhaka
-Asia/Dili
-Asia/Dubai
-Asia/Dushanbe
-Asia/Famagusta
-Asia/Gaza
-Asia/Hebron
-Asia/Ho_Chi_Minh
-Asia/Hong_Kong
-Asia/Hovd
-Asia/Irkutsk
-Asia/Jakarta
-Asia/Jayapura
-Asia/Jerusalem
-Asia/Kabul
-Asia/Kamchatka
-Asia/Karachi
-Asia/Kathmandu
-Asia/Khandyga
-Asia/Kolkata
-Asia/Krasnoyarsk
-Asia/Kuching
-Asia/Macau
-Asia/Magadan
-Asia/Makassar
-Asia/Manila
-Asia/Nicosia
-Asia/Novokuznetsk
-Asia/Novosibirsk
-Asia/Omsk
-Asia/Oral
-Asia/Pontianak
-Asia/Pyongyang
-Asia/Qatar
-Asia/Qostanay
-Asia/Qyzylorda
-Asia/Riyadh
-Asia/Sakhalin
-Asia/Samarkand
-Asia/Seoul
-Asia/Shanghai
-Asia/Singapore
-Asia/Srednekolymsk
-Asia/Taipei
-Asia/Tashkent
-Asia/Tbilisi
-Asia/Tehran
-Asia/Thimphu
-Asia/Tokyo
-Asia/Tomsk
-Asia/Ulaanbaatar
-Asia/Urumqi
-Asia/Ust-Nera
-Asia/Vladivostok
-Asia/Yakutsk
-Asia/Yangon
-Asia/Yekaterinburg
-Asia/Yerevan
-Atlantic/Azores
-Atlantic/Bermuda
-Atlantic/Canary
-Atlantic/Cape_Verde
-Atlantic/Faroe
-Atlantic/Madeira
-Atlantic/South_Georgia
-Atlantic/Stanley
-Australia/Adelaide
-Australia/Brisbane
-Australia/Broken_Hill
-Australia/Darwin
-Australia/Eucla
-Australia/Hobart
-Australia/Lindeman
-Australia/Lord_Howe
-Australia/Melbourne
-Australia/Perth
-Australia/Sydney
-Etc/GMT
-Etc/GMT+1
-Etc/GMT+10
-Etc/GMT+11
-Etc/GMT+12
-Etc/GMT+2
-Etc/GMT+3
-Etc/GMT+4
-Etc/GMT+5
-Etc/GMT+6
-Etc/GMT+7
-Etc/GMT+8
-Etc/GMT+9
-Etc/GMT-1
-Etc/GMT-10
-Etc/GMT-11
-Etc/GMT-12
-Etc/GMT-13
-Etc/GMT-14
-Etc/GMT-2
-Etc/GMT-3
-Etc/GMT-4
-Etc/GMT-5
-Etc/GMT-6
-Etc/GMT-7
-Etc/GMT-8
-Etc/GMT-9
-Etc/UTC
-Europe/Andorra
-Europe/Astrakhan
-Europe/Athens
-Europe/Belgrade
-Europe/Berlin
-Europe/Brussels
-Europe/Bucharest
-Europe/Budapest
-Europe/Chisinau
-Europe/Dublin
-Europe/Gibraltar
-Europe/Helsinki
-Europe/Istanbul
-Europe/Kaliningrad
-Europe/Kirov
-Europe/Kyiv
-Europe/Lisbon
-Europe/London
-Europe/Madrid
-Europe/Malta
-Europe/Minsk
-Europe/Moscow
-Europe/Paris
-Europe/Prague
-Europe/Riga
-Europe/Rome
-Europe/Samara
-Europe/Saratov
-Europe/Simferopol
-Europe/Sofia
-Europe/Tallinn
-Europe/Tirane
-Europe/Ulyanovsk
-Europe/Vienna
-Europe/Vilnius
-Europe/Volgograd
-Europe/Warsaw
-Europe/Zurich
-Factory
-Indian/Chagos
-Indian/Maldives
-Indian/Mauritius
-Pacific/Apia
-Pacific/Auckland
-Pacific/Bougainville
-Pacific/Chatham
-Pacific/Easter
-Pacific/Efate
-Pacific/Fakaofo
-Pacific/Fiji
-Pacific/Galapagos
-Pacific/Gambier
-Pacific/Guadalcanal
-Pacific/Guam
-Pacific/Honolulu
-Pacific/Kanton
-Pacific/Kiritimati
-Pacific/Kosrae
-Pacific/Kwajalein
-Pacific/Marquesas
-Pacific/Nauru
-Pacific/Niue
-Pacific/Norfolk
-Pacific/Noumea
-Pacific/Pago_Pago
-Pacific/Palau
-Pacific/Pitcairn
-Pacific/Port_Moresby
-Pacific/Rarotonga
-Pacific/Tahiti
-Pacific/Tarawa
-Pacific/Tongatapu
-GMT
-Australia/ACT
-Australia/LHI
-Australia/NSW
-Australia/North
-Australia/Queensland
-Australia/South
-Australia/Tasmania
-Australia/Victoria
-Australia/West
-Australia/Yancowinna
-Brazil/Acre
-Brazil/DeNoronha
-Brazil/East
-Brazil/West
-CET
-CST6CDT
-Canada/Atlantic
-Canada/Central
-Canada/Eastern
-Canada/Mountain
-Canada/Newfoundland
-Canada/Pacific
-Canada/Saskatchewan
-Canada/Yukon
-Chile/Continental
-Chile/EasterIsland
-Cuba
-EET
-EST
-EST5EDT
-Egypt
-Eire
-Etc/GMT+0
-Etc/GMT-0
-Etc/GMT0
-Etc/Greenwich
-Etc/UCT
-Etc/Universal
-Etc/Zulu
-GB
-GB-Eire
-GMT+0
-GMT-0
-GMT0
-Greenwich
-Hongkong
-Iceland
-Iran
-Israel
-Jamaica
-Japan
-Kwajalein
-Libya
-MET
-MST
-MST7MDT
-Mexico/BajaNorte
-Mexico/BajaSur
-Mexico/General
-NZ
-NZ-CHAT
-Navajo
-PRC
-Poland
-Portugal
-ROC
-ROK
-Singapore
-Turkey
-UCT
-US/Alaska
-US/Aleutian
-US/Arizona
-US/Central
-US/East-Indiana
-US/Eastern
-US/Hawaii
-US/Indiana-Starke
-US/Michigan
-US/Mountain
-US/Pacific
-US/Samoa
-UTC
-Universal
-W-SU
-Zulu
-America/Buenos_Aires
-America/Catamarca
-America/Cordoba
-America/Indianapolis
-America/Jujuy
-America/Knox_IN
-America/Louisville
-America/Mendoza
-America/Virgin
-Pacific/Samoa
-Africa/Accra
-Africa/Addis_Ababa
-Africa/Asmara
-Africa/Bamako
-Africa/Bangui
-Africa/Banjul
-Africa/Blantyre
-Africa/Brazzaville
-Africa/Bujumbura
-Africa/Conakry
-Africa/Dakar
-Africa/Dar_es_Salaam
-Africa/Djibouti
-Africa/Douala
-Africa/Freetown
-Africa/Gaborone
-Africa/Harare
-Africa/Kampala
-Africa/Kigali
-Africa/Kinshasa
-Africa/Libreville
-Africa/Lome
-Africa/Luanda
-Africa/Lubumbashi
-Africa/Lusaka
-Africa/Malabo
-Africa/Maseru
-Africa/Mbabane
-Africa/Mogadishu
-Africa/Niamey
-Africa/Nouakchott
-Africa/Ouagadougou
-Africa/Porto-Novo
-America/Anguilla
-America/Antigua
-America/Aruba
-America/Atikokan
-America/Blanc-Sablon
-America/Cayman
-America/Creston
-America/Curacao
-America/Dominica
-America/Grenada
-America/Guadeloupe
-America/Kralendijk
-America/Lower_Princes
-America/Marigot
-America/Montserrat
-America/Nassau
-America/Port_of_Spain
-America/St_Barthelemy
-America/St_Kitts
-America/St_Lucia
-America/St_Thomas
-America/St_Vincent
-America/Tortola
-Antarctica/DumontDUrville
-Antarctica/McMurdo
-Antarctica/Syowa
-Arctic/Longyearbyen
-Asia/Aden
-Asia/Bahrain
-Asia/Brunei
-Asia/Kuala_Lumpur
-Asia/Kuwait
-Asia/Muscat
-Asia/Phnom_Penh
-Asia/Vientiane
-Atlantic/Reykjavik
-Atlantic/St_Helena
-Europe/Amsterdam
-Europe/Bratislava
-Europe/Busingen
-Europe/Copenhagen
-Europe/Guernsey
-Europe/Isle_of_Man
-Europe/Jersey
-Europe/Ljubljana
-Europe/Luxembourg
-Europe/Mariehamn
-Europe/Monaco
-Europe/Oslo
-Europe/Podgorica
-Europe/San_Marino
-Europe/Sarajevo
-Europe/Skopje
-Europe/Stockholm
-Europe/Vaduz
-Europe/Vatican
-Europe/Zagreb
-Indian/Antananarivo
-Indian/Christmas
-Indian/Cocos
-Indian/Comoro
-Indian/Kerguelen
-Indian/Mahe
-Indian/Mayotte
-Indian/Reunion
-Pacific/Chuuk
-Pacific/Funafuti
-Pacific/Majuro
-Pacific/Midway
-Pacific/Pohnpei
-Pacific/Saipan
-Pacific/Wake
-Pacific/Wallis
-Africa/Timbuktu
-America/Argentina/ComodRivadavia
-America/Atka
-America/Coral_Harbour
-America/Ensenada
-America/Fort_Wayne
-America/Montreal
-America/Nipigon
-America/Pangnirtung
-America/Porto_Acre
-America/Rainy_River
-America/Rosario
-America/Santa_Isabel
-America/Shiprock
-America/Thunder_Bay
-America/Yellowknife
-Antarctica/South_Pole
-Asia/Choibalsan
-Asia/Chongqing
-Asia/Harbin
-Asia/Kashgar
-Asia/Tel_Aviv
-Atlantic/Jan_Mayen
-Australia/Canberra
-Australia/Currie
-Europe/Belfast
-Europe/Tiraspol
-Europe/Uzhgorod
-Europe/Zaporozhye
-Pacific/Enderbury
-Pacific/Johnston
-Pacific/Yap
-WET
-Africa/Asmera
-America/Godthab
-Asia/Ashkhabad
-Asia/Calcutta
-Asia/Chungking
-Asia/Dacca
-Asia/Istanbul
-Asia/Katmandu
-Asia/Macao
-Asia/Rangoon
-Asia/Saigon
-Asia/Thimbu
-Asia/Ujung_Pandang
-Asia/Ulan_Bator
-Atlantic/Faeroe
-Europe/Kiev
-Europe/Nicosia
-HST
-PST8PDT
-Pacific/Ponape
-Pacific/Truk
diff --git a/lib/tzlocal/LICENSE.txt b/lib/tzlocal/LICENSE.txt
new file mode 100644
index 00000000..0e259d42
--- /dev/null
+++ b/lib/tzlocal/LICENSE.txt
@@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.
diff --git a/lib/tzlocal/README.rst b/lib/tzlocal/README.rst
new file mode 100644
index 00000000..09e9bfe8
--- /dev/null
+++ b/lib/tzlocal/README.rst
@@ -0,0 +1,80 @@
+tzlocal
+=======
+
+This Python module returns a `tzinfo` object with the local timezone information under Unix and Win-32.
+It requires `pytz`, and returns `pytz` `tzinfo` objects.
+
+This module attempts to fix a glaring hole in `pytz`, that there is no way to
+get the local timezone information, unless you know the zoneinfo name, and
+under several Linux distros that's hard or impossible to figure out.
+
+Also, with Windows different timezone system using pytz isn't of much use
+unless you separately configure the zoneinfo timezone name.
+
+With `tzlocal` you only need to call `get_localzone()` and you will get a
+`tzinfo` object with the local time zone info. On some Unices you will still
+not get to know what the timezone name is, but you don't need that when you
+have the tzinfo file. However, if the timezone name is readily available it
+will be used.
+
+
+Supported systems
+-----------------
+
+These are the systems that are in theory supported:
+
+ * Windows 2000 and later
+
+ * Any unix-like system with a /etc/localtime or /usr/local/etc/localtime
+
+If you have one of the above systems and it does not work, it's a bug.
+Please report it.
+
+
+Usage
+-----
+
+Load the local timezone:
+
+    >>> from tzlocal import get_localzone
+    >>> tz = get_localzone()
+    >>> tz
+    <DstTzInfo 'Europe/Warsaw' WMT+1:24:00 STD>
+
+Create a local datetime:
+
+    >>> from datetime import datetime
+    >>> dt = tz.localize(datetime.now())
+    >>> dt
+    datetime.datetime(2012, 9, 11, 14, 43, 42, 518871, tzinfo=<DstTzInfo 'Europe/Warsaw' CEST+2:00:00 DST>)
+
+Lookup another timezone with `pytz`:
+
+    >>> import pytz
+    >>> eastern = pytz.timezone('US/Eastern')
+
+Convert the datetime:
+
+    >>> dt.astimezone(eastern)
+    datetime.datetime(2012, 9, 11, 8, 43, 42, 518871, tzinfo=<DstTzInfo 'US/Eastern' EDT-1 day, 20:00:00 DST>)
+
+
+Maintainer
+----------
+
+* Lennart Regebro, regebro@gmail.com
+
+Contributors
+------------
+
+* Marc Van Olmen
+* Benjamen Meyer
+* Manuel Ebert
+* Xiaokun Zhu
+
+(Sorry if I forgot someone)
+
+License
+-------
+
+* CC0 1.0 Universal  http://creativecommons.org/publicdomain/zero/1.0/
diff --git a/lib/tzlocal/__init__.py b/lib/tzlocal/__init__.py
index 50abb093..df7a66b9 100644
--- a/lib/tzlocal/__init__.py
+++ b/lib/tzlocal/__init__.py
@@ -1,20 +1,7 @@
 import sys
-
-if sys.platform == "win32":
-    from tzlocal.win32 import (
-        get_localzone,
-        get_localzone_name,
-        reload_localzone,
-    )  # pragma: no cover
+if sys.platform == 'win32':
+    from tzlocal.win32 import get_localzone, reload_localzone
+elif 'darwin' in sys.platform:
+    from tzlocal.darwin import get_localzone, reload_localzone
 else:
-    from tzlocal.unix import get_localzone, get_localzone_name, reload_localzone
-
-from tzlocal.utils import assert_tz_offset
-
-
-__all__ = [
-    "get_localzone",
-    "get_localzone_name",
-    "reload_localzone",
-    "assert_tz_offset",
-]
+    from tzlocal.unix import get_localzone, reload_localzone
diff --git a/lib/tzlocal/darwin.py b/lib/tzlocal/darwin.py
new file mode 100644
index 00000000..86fd906f
--- /dev/null
+++ b/lib/tzlocal/darwin.py
@@ -0,0 +1,27 @@
+from __future__ import with_statement
+import os
+import pytz
+
+_cache_tz = None
+
+def _get_localzone():
+    tzname = os.popen("systemsetup -gettimezone").read().replace("Time Zone: ", "").strip()
+    if not tzname or tzname not in pytz.all_timezones_set:
+        # link will be something like /usr/share/zoneinfo/America/Los_Angeles.
+        link = os.readlink("/etc/localtime")
+        tzname = link[link.rfind("zoneinfo/") + 9:]
+    return pytz.timezone(tzname)
+
+def get_localzone():
+    """Get the computers configured local timezone, if any."""
+    global _cache_tz
+    if _cache_tz is None:
+        _cache_tz = _get_localzone()
+    return _cache_tz
+
+def reload_localzone():
+    """Reload the cached localzone. You need to call this if the timezone has changed."""
+    global _cache_tz
+    _cache_tz = _get_localzone()
+    return _cache_tz
+
diff --git a/lib/tzlocal/tests.py b/lib/tzlocal/tests.py
new file mode 100644
index 00000000..49dd0aef
--- /dev/null
+++ b/lib/tzlocal/tests.py
@@ -0,0 +1,64 @@
+import sys
+import os
+from datetime import datetime
+import unittest
+import pytz
+import tzlocal.unix
+
+class TzLocalTests(unittest.TestCase):
+
+    def test_env(self):
+        tz_harare = tzlocal.unix._tz_from_env(':Africa/Harare')
+        self.assertEqual(tz_harare.zone, 'Africa/Harare')
+
+        # Some Unices allow this as well, so we must allow it:
+        tz_harare = tzlocal.unix._tz_from_env('Africa/Harare')
+        self.assertEqual(tz_harare.zone, 'Africa/Harare')
+
+        local_path = os.path.split(__file__)[0]
+        tz_local = tzlocal.unix._tz_from_env(':' + os.path.join(local_path, 'test_data', 'Harare'))
+        self.assertEqual(tz_local.zone, 'local')
+        # Make sure the local timezone is the same as the Harare one above.
+        # We test this with a past date, so that we don't run into future changes
+        # of the Harare timezone.
+        dt = datetime(2012, 1, 1, 5)
+        self.assertEqual(tz_harare.localize(dt), tz_local.localize(dt))
+
+        # Non-zoneinfo timezones are not supported in the TZ environment.
+        self.assertRaises(pytz.UnknownTimeZoneError, tzlocal.unix._tz_from_env, 'GMT+03:00')
+
+    def test_timezone(self):
+        # Most versions of Ubuntu
+        local_path = os.path.split(__file__)[0]
+        tz = tzlocal.unix._get_localzone(_root=os.path.join(local_path, 'test_data', 'timezone'))
+        self.assertEqual(tz.zone, 'Africa/Harare')
+
+    def test_zone_setting(self):
+        # A ZONE setting in /etc/sysconfig/clock, f ex CentOS
+        local_path = os.path.split(__file__)[0]
+        tz = tzlocal.unix._get_localzone(_root=os.path.join(local_path, 'test_data', 'zone_setting'))
+        self.assertEqual(tz.zone, 'Africa/Harare')
+
+    def test_timezone_setting(self):
+        # A ZONE setting in /etc/conf.d/clock, f ex Gentoo
+        local_path = os.path.split(__file__)[0]
+        tz = tzlocal.unix._get_localzone(_root=os.path.join(local_path, 'test_data', 'timezone_setting'))
+        self.assertEqual(tz.zone, 'Africa/Harare')
+
+    def test_only_localtime(self):
+        local_path = os.path.split(__file__)[0]
+        tz = tzlocal.unix._get_localzone(_root=os.path.join(local_path, 'test_data', 'localtime'))
+        self.assertEqual(tz.zone, 'local')
+        dt = datetime(2012, 1, 1, 5)
+        self.assertEqual(pytz.timezone('Africa/Harare').localize(dt), tz.localize(dt))
+
+if sys.platform == 'win32':
+
+    import tzlocal.win32
+    class TzWin32Tests(unittest.TestCase):
+
+        def test_win32(self):
+            tzlocal.win32.get_localzone()
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/lib/tzlocal/unix.py b/lib/tzlocal/unix.py
index f510c12c..76c214dd 100644
--- a/lib/tzlocal/unix.py
+++ b/lib/tzlocal/unix.py
@@ -1,230 +1,115 @@
-import logging
+from __future__ import with_statement
 import os
 import re
-import sys
-import warnings
-from datetime import timezone
-
-from tzlocal import utils
-
-if sys.version_info >= (3, 9):
-    import zoneinfo  # pragma: no cover
-else:
-    from backports import zoneinfo  # pragma: no cover
+import pytz
 
 _cache_tz = None
-_cache_tz_name = None
 
-log = logging.getLogger("tzlocal")
+def _tz_from_env(tzenv):
+    if tzenv[0] == ':':
+        tzenv = tzenv[1:]
 
-def _get_localzone_name(_root="/"):
+    # TZ specifies a file
+    if os.path.exists(tzenv):
+        with open(tzenv, 'rb') as tzfile:
+            return pytz.tzfile.build_tzinfo('local', tzfile)
+
+    # TZ specifies a zoneinfo zone.
+    try:
+        tz = pytz.timezone(tzenv)
+        # That worked, so we return this:
+        return tz
+    except pytz.UnknownTimeZoneError:
+        raise pytz.UnknownTimeZoneError(
+            "tzlocal() does not support non-zoneinfo timezones like %s. \n"
+            "Please use a timezone in the form of Continent/City")
+
+def _get_localzone(_root='/'):
     """Tries to find the local timezone configuration.
 
-    This method finds the timezone name, if it can, or it returns None.
+    This method prefers finding the timezone name and passing that to pytz,
+    over passing in the localtime file, as in the later case the zoneinfo
+    name is unknown.
 
     The parameter _root makes the function look for files like /etc/localtime
     beneath the _root directory. This is primarily used by the tests.
     In normal usage you call the function without parameters."""
 
-    # First try the ENV setting.
-    tzenv = utils._tz_name_from_env()
+    tzenv = os.environ.get('TZ')
     if tzenv:
-        return tzenv
-
-    # Are we under Termux on Android?
-    if os.path.exists(os.path.join(_root, "system/bin/getprop")):
-        log.debug("This looks like Termux")
-
-        import subprocess
-
         try:
-            androidtz = (
-                subprocess.check_output(["getprop", "persist.sys.timezone"])
-                .strip()
-                .decode()
-            )
-            return androidtz
-        except (OSError, subprocess.CalledProcessError):
-            # proot environment or failed to getprop
-            log.debug("It's not termux?")
+            return _tz_from_env(tzenv)
+        except pytz.UnknownTimeZoneError:
             pass
 
     # Now look for distribution specific configuration files
     # that contain the timezone name.
+    tzpath = os.path.join(_root, 'etc/timezone')
+    if os.path.exists(tzpath):
+        with open(tzpath, 'rb') as tzfile:
+            data = tzfile.read()
 
-    # Stick all of them in a dict, to compare later.
-    found_configs = {}
-
-    for configfile in ("etc/timezone", "var/db/zoneinfo"):
-        tzpath = os.path.join(_root, configfile)
-        try:
-            with open(tzpath) as tzfile:
-                data = tzfile.read()
-                log.debug(f"{tzpath} found, contents:\n {data}")
-
-                etctz = data.strip("/ \t\r\n")
-                if not etctz:
-                    # Empty file, skip
-                    continue
-                for etctz in etctz.splitlines():
-                    # Get rid of host definitions and comments:
-                    if " " in etctz:
-                        etctz, dummy = etctz.split(" ", 1)
-                    if "#" in etctz:
-                        etctz, dummy = etctz.split("#", 1)
-                    if not etctz:
-                        continue
-
-                    found_configs[tzpath] = etctz.replace(" ", "_")
-
-        except (OSError, UnicodeDecodeError):
-            # File doesn't exist or is a directory, or it's a binary file.
-            continue
+            # Issue #3 was that /etc/timezone was a zoneinfo file.
+            # That's a misconfiguration, but we need to handle it gracefully:
+            if data[:5] != 'TZif2':
+                etctz = data.strip().decode()
+                # Get rid of host definitions and comments:
+                if ' ' in etctz:
+                    etctz, dummy = etctz.split(' ', 1)
+                if '#' in etctz:
+                    etctz, dummy = etctz.split('#', 1)
+                return pytz.timezone(etctz.replace(' ', '_'))
 
     # CentOS has a ZONE setting in /etc/sysconfig/clock,
     # OpenSUSE has a TIMEZONE setting in /etc/sysconfig/clock and
     # Gentoo has a TIMEZONE setting in /etc/conf.d/clock
     # We look through these files for a timezone:
 
-    zone_re = re.compile(r"\s*ZONE\s*=\s*\"")
-    timezone_re = re.compile(r"\s*TIMEZONE\s*=\s*\"")
-    end_re = re.compile('"')
+    zone_re = re.compile('\s*ZONE\s*=\s*\"')
+    timezone_re = re.compile('\s*TIMEZONE\s*=\s*\"')
+    end_re = re.compile('\"')
 
-    for filename in ("etc/sysconfig/clock", "etc/conf.d/clock"):
+    for filename in ('etc/sysconfig/clock', 'etc/conf.d/clock'):
         tzpath = os.path.join(_root, filename)
-        try:
-            with open(tzpath, "rt") as tzfile:
-                data = tzfile.readlines()
-                log.debug(f"{tzpath} found, contents:\n {data}")
-
-            for line in data:
-                # Look for the ZONE= setting.
-                match = zone_re.match(line)
-                if match is None:
-                    # No ZONE= setting. Look for the TIMEZONE= setting.
-                    match = timezone_re.match(line)
-                if match is not None:
-                    # Some setting existed
-                    line = line[match.end() :]
-                    etctz = line[: end_re.search(line).start()]
-
-                    # We found a timezone
-                    found_configs[tzpath] = etctz.replace(" ", "_")
-
-        except (OSError, UnicodeDecodeError):
-            # UnicodeDecode handles when clock is symlink to /etc/localtime
+        if not os.path.exists(tzpath):
             continue
+        with open(tzpath, 'rt') as tzfile:
+            data = tzfile.readlines()
 
-    # systemd distributions use symlinks that include the zone name,
-    # see manpage of localtime(5) and timedatectl(1)
-    tzpath = os.path.join(_root, "etc/localtime")
-    if os.path.exists(tzpath) and os.path.islink(tzpath):
-        log.debug(f"{tzpath} found")
-        etctz = os.path.realpath(tzpath)
-        start = etctz.find("/") + 1
-        while start != 0:
-            etctz = etctz[start:]
-            try:
-                zoneinfo.ZoneInfo(etctz)
-                tzinfo = f"{tzpath} is a symlink to"
-                found_configs[tzinfo] = etctz.replace(" ", "_")
-                # Only need first valid relative path in simlink.
-                break
-            except zoneinfo.ZoneInfoNotFoundError:
-                pass
-            start = etctz.find("/") + 1
+        for line in data:
+            # Look for the ZONE= setting.
+            match = zone_re.match(line)
+            if match is None:
+                # No ZONE= setting. Look for the TIMEZONE= setting.
+                match = timezone_re.match(line)
+            if match is not None:
+                # Some setting existed
+                line = line[match.end():]
+                etctz = line[:end_re.search(line).start()]
 
-    if len(found_configs) > 0:
-        log.debug(f"{len(found_configs)} found:\n {found_configs}")
-        # We found some explicit config of some sort!
-        if len(found_configs) > 1:
-            # Uh-oh, multiple configs. See if they match:
-            unique_tzs = set()
-            zoneinfopath = os.path.join(_root, "usr", "share", "zoneinfo")
-            directory_depth = len(zoneinfopath.split(os.path.sep))
+                # We found a timezone
+                return pytz.timezone(etctz.replace(' ', '_'))
 
-            for tzname in found_configs.values():
-                # Look them up in /usr/share/zoneinfo, and find what they
-                # really point to:
-                path = os.path.realpath(os.path.join(zoneinfopath, *tzname.split("/")))
-                real_zone_name = "/".join(path.split(os.path.sep)[directory_depth:])
-                unique_tzs.add(real_zone_name)
+    # No explicit setting existed. Use localtime
+    for filename in ('etc/localtime', 'usr/local/etc/localtime'):
+        tzpath = os.path.join(_root, filename)
 
-            if len(unique_tzs) != 1:
-                message = "Multiple conflicting time zone configurations found:\n"
-                for key, value in found_configs.items():
-                    message += f"{key}: {value}\n"
-                message += "Fix the configuration, or set the time zone in a TZ environment variable.\n"
-                raise zoneinfo.ZoneInfoNotFoundError(message)
-
-        # We found exactly one config! Use it.
-        return list(found_configs.values())[0]
-
-
-def _get_localzone(_root="/"):
-    """Creates a timezone object from the timezone name.
-
-    If there is no timezone config, it will try to create a file from the
-    localtime timezone, and if there isn't one, it will default to UTC.
-
-    The parameter _root makes the function look for files like /etc/localtime
-    beneath the _root directory. This is primarily used by the tests.
-    In normal usage you call the function without parameters."""
-
-    # First try the ENV setting.
-    tzenv = utils._tz_from_env()
-    if tzenv:
-        return tzenv
-
-    tzname = _get_localzone_name(_root)
-    if tzname is None:
-        # No explicit setting existed. Use localtime
-        log.debug("No explicit setting existed. Use localtime")
-        for filename in ("etc/localtime", "usr/local/etc/localtime"):
-            tzpath = os.path.join(_root, filename)
-
-            if not os.path.exists(tzpath):
-                continue
-            with open(tzpath, "rb") as tzfile:
-                tz = zoneinfo.ZoneInfo.from_file(tzfile, key="local")
-                break
-        else:
-            warnings.warn("Can not find any timezone configuration, defaulting to UTC.")
-            tz = timezone.utc
-    else:
-        tz = zoneinfo.ZoneInfo(tzname)
-
-    if _root == "/":
-        # We are using a file in etc to name the timezone.
-        # Verify that the timezone specified there is actually used:
-        utils.assert_tz_offset(tz, error=False)
-    return tz
-
-
-def get_localzone_name():
-    """Get the computers configured local timezone name, if any."""
-    global _cache_tz_name
-    if _cache_tz_name is None:
-        _cache_tz_name = _get_localzone_name()
-
-    return _cache_tz_name
+        if not os.path.exists(tzpath):
+            continue
+        with open(tzpath, 'rb') as tzfile:
+            return pytz.tzfile.build_tzinfo('local', tzfile)
 
+    raise pytz.UnknownTimeZoneError('Can not find any timezone configuration')
 
 def get_localzone():
     """Get the computers configured local timezone, if any."""
-
     global _cache_tz
     if _cache_tz is None:
         _cache_tz = _get_localzone()
-
     return _cache_tz
 
-
 def reload_localzone():
     """Reload the cached localzone. You need to call this if the timezone has changed."""
-    global _cache_tz_name
     global _cache_tz
-    _cache_tz_name = _get_localzone_name()
     _cache_tz = _get_localzone()
-
     return _cache_tz
diff --git a/lib/tzlocal/utils.py b/lib/tzlocal/utils.py
deleted file mode 100644
index 4ba82d3d..00000000
--- a/lib/tzlocal/utils.py
+++ /dev/null
@@ -1,112 +0,0 @@
-import logging
-import os
-import time
-import datetime
-import calendar
-import warnings
-
-try:
-    import zoneinfo  # pragma: no cover
-except ImportError:
-    from backports import zoneinfo  # pragma: no cover
-
-from tzlocal import windows_tz
-
-log = logging.getLogger("tzlocal")
-
-
-def get_tz_offset(tz):
-    """Get timezone's offset using built-in function datetime.utcoffset()."""
-    return int(datetime.datetime.now(tz).utcoffset().total_seconds())
-
-
-def assert_tz_offset(tz, error=True):
-    """Assert that system's timezone offset equals to the timezone offset found.
-
-    If they don't match, we probably have a misconfiguration, for example, an
-    incorrect timezone set in /etc/timezone file in systemd distributions.
-
-    If error is True, this method will raise a ValueError, otherwise it will
-    emit a warning.
-    """
-
-    tz_offset = get_tz_offset(tz)
-    system_offset = calendar.timegm(time.localtime()) - calendar.timegm(time.gmtime())
-    # No one has timezone offsets less than a minute, so this should be close enough:
-    if abs(tz_offset - system_offset) > 60:
-        msg = (
-            "Timezone offset does not match system offset: {} != {}. "
-            "Please, check your config files."
-        ).format(tz_offset, system_offset)
-        if error:
-            raise ValueError(msg)
-        warnings.warn(msg)
-
-
-def _tz_name_from_env(tzenv=None):
-    if tzenv is None:
-        tzenv = os.environ.get("TZ")
-
-    if not tzenv:
-        return None
-
-    log.debug(f"Found a TZ environment: {tzenv}")
-
-    if tzenv[0] == ":":
-        tzenv = tzenv[1:]
-
-    if tzenv in windows_tz.tz_win:
-        # Yup, it's a timezone
-        return tzenv
-
-    if os.path.isabs(tzenv) and os.path.exists(tzenv):
-        # It's a file specification, expand it, if possible
-        parts = os.path.realpath(tzenv).split(os.sep)
-
-        # Is it a zone info zone?
-        possible_tz = "/".join(parts[-2:])
-        if possible_tz in windows_tz.tz_win:
-            # Yup, it is
-            return possible_tz
-
-        # Maybe it's a short one, like UTC?
-        if parts[-1] in windows_tz.tz_win:
-            # Indeed
-            return parts[-1]
-
-    log.debug("TZ does not contain a time zone name")
-    return None
-
-
-def _tz_from_env(tzenv=None):
-    if tzenv is None:
-        tzenv = os.environ.get("TZ")
-
-    if not tzenv:
-        return None
-
-    # Some weird format that exists:
-    if tzenv[0] == ":":
-        tzenv = tzenv[1:]
-
-    # TZ specifies a file
-    if os.path.isabs(tzenv) and os.path.exists(tzenv):
-        # Try to see if we can figure out the name
-        tzname = _tz_name_from_env(tzenv)
-        if not tzname:
-            # Nope, not a standard timezone name, just take the filename
-            tzname = tzenv.split(os.sep)[-1]
-        with open(tzenv, "rb") as tzfile:
-            return zoneinfo.ZoneInfo.from_file(tzfile, key=tzname)
-
-    # TZ must specify a zoneinfo zone.
-    try:
-        tz = zoneinfo.ZoneInfo(tzenv)
-        # That worked, so we return this:
-        return tz
-    except zoneinfo.ZoneInfoNotFoundError:
-        # Nope, it's something like "PST4DST" etc, we can't handle that.
-        raise zoneinfo.ZoneInfoNotFoundError(
-            "tzlocal() does not support non-zoneinfo timezones like %s. \n"
-            "Please use a timezone in the form of Continent/City" % tzenv
-        ) from None
diff --git a/lib/tzlocal/win32.py b/lib/tzlocal/win32.py
index 9e8dc735..63445cd7 100644
--- a/lib/tzlocal/win32.py
+++ b/lib/tzlocal/win32.py
@@ -1,78 +1,72 @@
-import logging
-from datetime import datetime
-
 try:
     import _winreg as winreg
 except ImportError:
     import winreg
 
-try:
-    import zoneinfo  # pragma: no cover
-except ImportError:
-    from backports import zoneinfo  # pragma: no cover
-
 from tzlocal.windows_tz import win_tz
-from tzlocal import utils
+import pytz
 
 _cache_tz = None
-_cache_tz_name = None
-
-log = logging.getLogger("tzlocal")
-
 
 def valuestodict(key):
     """Convert a registry key's values to a dictionary."""
-    result = {}
+    dict = {}
     size = winreg.QueryInfoKey(key)[1]
     for i in range(size):
         data = winreg.EnumValue(key, i)
-        result[data[0]] = data[1]
-    return result
+        dict[data[0]] = data[1]
+    return dict
 
-
-def _get_dst_info(tz):
-    # Find the offset for when it doesn't have DST:
-    dst_offset = std_offset = None
-    has_dst = False
-    year = datetime.now().year
-    for dt in (datetime(year, 1, 1), datetime(year, 6, 1)):
-        if tz.dst(dt).total_seconds() == 0.0:
-            # OK, no DST during winter, get this offset
-            std_offset = tz.utcoffset(dt).total_seconds()
-        else:
-            has_dst = True
-
-    return has_dst, std_offset, dst_offset
-
-
-def _get_localzone_name():
+def get_localzone_name():
     # Windows is special. It has unique time zone names (in several
     # meanings of the word) available, but unfortunately, they can be
     # translated to the language of the operating system, so we need to
     # do a backwards lookup, by going through all time zones and see which
     # one matches.
-    tzenv = utils._tz_name_from_env()
-    if tzenv:
-        return tzenv
-
-    log.debug("Looking up time zone info from registry")
     handle = winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE)
 
     TZLOCALKEYNAME = r"SYSTEM\CurrentControlSet\Control\TimeZoneInformation"
     localtz = winreg.OpenKey(handle, TZLOCALKEYNAME)
     keyvalues = valuestodict(localtz)
     localtz.Close()
-
-    if "TimeZoneKeyName" in keyvalues:
-        # Windows 7 and later
+    if 'TimeZoneKeyName' in keyvalues:
+        # Windows 7 (and Vista?)
 
         # For some reason this returns a string with loads of NUL bytes at
         # least on some systems. I don't know if this is a bug somewhere, I
         # just work around it.
-        tzkeyname = keyvalues["TimeZoneKeyName"].split("\x00", 1)[0]
+        tzkeyname = keyvalues['TimeZoneKeyName'].split('\x00', 1)[0]
     else:
-        # Don't support XP any longer
-        raise LookupError("Can not find Windows timezone configuration")
+        # Windows 2000 or XP
+
+        # This is the localized name:
+        tzwin = keyvalues['StandardName']
+
+        # Open the list of timezones to look up the real name:
+        TZKEYNAME = r"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones"
+        tzkey = winreg.OpenKey(handle, TZKEYNAME)
+
+        # Now, match this value to Time Zone information
+        tzkeyname = None
+        for i in range(winreg.QueryInfoKey(tzkey)[0]):
+            subkey = winreg.EnumKey(tzkey, i)
+            sub = winreg.OpenKey(tzkey, subkey)
+            data = valuestodict(sub)
+            sub.Close()
+            try:
+                if data['Std'] == tzwin:
+                    tzkeyname = subkey
+                    break
+            except KeyError:
+                # This timezone didn't have proper configuration.
+                # Ignore it.
+                pass
+
+        tzkey.Close()
+        handle.Close()
+
+    if tzkeyname is None:
+        raise LookupError('Can not find Windows timezone configuration')
 
     timezone = win_tz.get(tzkeyname)
     if timezone is None:
@@ -82,66 +76,18 @@ def _get_localzone_name():
 
     # Return what we have.
     if timezone is None:
-        raise zoneinfo.ZoneInfoNotFoundError(tzkeyname)
-
-    if keyvalues.get("DynamicDaylightTimeDisabled", 0) == 1:
-        # DST is disabled, so don't return the timezone name,
-        # instead return Etc/GMT+offset
-
-        tz = zoneinfo.ZoneInfo(timezone)
-        has_dst, std_offset, dst_offset = _get_dst_info(tz)
-        if not has_dst:
-            # The DST is turned off in the windows configuration,
-            # but this timezone doesn't have DST so it doesn't matter
-            return timezone
-
-        if std_offset is None:
-            raise zoneinfo.ZoneInfoNotFoundError(
-                f"{tzkeyname} claims to not have a non-DST time!?"
-            )
-
-        if std_offset % 3600:
-            # I can't convert this to an hourly offset
-            raise zoneinfo.ZoneInfoNotFoundError(
-                f"tzlocal can't support disabling DST in the {timezone} zone."
-            )
-
-        # This has whole hours as offset, return it as Etc/GMT
-        return f"Etc/GMT{-std_offset//3600:+.0f}"
+        raise pytz.UnknownTimeZoneError('Can not find timezone ' + tzkeyname)
 
     return timezone
 
-
-def get_localzone_name():
-    """Get the zoneinfo timezone name that matches the Windows-configured timezone."""
-    global _cache_tz_name
-    if _cache_tz_name is None:
-        _cache_tz_name = _get_localzone_name()
-
-    return _cache_tz_name
-
-
 def get_localzone():
     """Returns the zoneinfo-based tzinfo object that matches the Windows-configured timezone."""
-
     global _cache_tz
     if _cache_tz is None:
-        _cache_tz = zoneinfo.ZoneInfo(get_localzone_name())
-
-    if not utils._tz_name_from_env():
-        # If the timezone does NOT come from a TZ environment variable,
-        # verify that it's correct. If it's from the environment,
-        # we accept it, this is so you can run tests with different timezones.
-        utils.assert_tz_offset(_cache_tz, error=False)
-
+        _cache_tz = pytz.timezone(get_localzone_name())
     return _cache_tz
 
-
 def reload_localzone():
     """Reload the cached localzone. You need to call this if the timezone has changed."""
     global _cache_tz
-    global _cache_tz_name
-    _cache_tz_name = _get_localzone_name()
-    _cache_tz = zoneinfo.ZoneInfo(_cache_tz_name)
-    utils.assert_tz_offset(_cache_tz, error=False)
-    return _cache_tz
+    _cache_tz = pytz.timezone(get_localzone_name())
diff --git a/lib/tzlocal/windows_tz.py b/lib/tzlocal/windows_tz.py
index ed49c4ac..0790bb48 100644
--- a/lib/tzlocal/windows_tz.py
+++ b/lib/tzlocal/windows_tz.py
@@ -1,718 +1,542 @@
-# This file is autogenerated by the update_windows_mapping.py script
+# This file is autogenerated by the get_windows_info.py script
 # Do not edit.
-win_tz = {
-    "AUS Central Standard Time": "Australia/Darwin",
-    "AUS Eastern Standard Time": "Australia/Sydney",
-    "Afghanistan Standard Time": "Asia/Kabul",
-    "Alaskan Standard Time": "America/Anchorage",
-    "Aleutian Standard Time": "America/Adak",
-    "Altai Standard Time": "Asia/Barnaul",
-    "Arab Standard Time": "Asia/Riyadh",
-    "Arabian Standard Time": "Asia/Dubai",
-    "Arabic Standard Time": "Asia/Baghdad",
-    "Argentina Standard Time": "America/Buenos_Aires",
-    "Astrakhan Standard Time": "Europe/Astrakhan",
-    "Atlantic Standard Time": "America/Halifax",
-    "Aus Central W. Standard Time": "Australia/Eucla",
-    "Azerbaijan Standard Time": "Asia/Baku",
-    "Azores Standard Time": "Atlantic/Azores",
-    "Bahia Standard Time": "America/Bahia",
-    "Bangladesh Standard Time": "Asia/Dhaka",
-    "Belarus Standard Time": "Europe/Minsk",
-    "Bougainville Standard Time": "Pacific/Bougainville",
-    "Canada Central Standard Time": "America/Regina",
-    "Cape Verde Standard Time": "Atlantic/Cape_Verde",
-    "Caucasus Standard Time": "Asia/Yerevan",
-    "Cen. Australia Standard Time": "Australia/Adelaide",
-    "Central America Standard Time": "America/Guatemala",
-    "Central Asia Standard Time": "Asia/Almaty",
-    "Central Brazilian Standard Time": "America/Cuiaba",
-    "Central Europe Standard Time": "Europe/Budapest",
-    "Central European Standard Time": "Europe/Warsaw",
-    "Central Pacific Standard Time": "Pacific/Guadalcanal",
-    "Central Standard Time": "America/Chicago",
-    "Central Standard Time (Mexico)": "America/Mexico_City",
-    "Chatham Islands Standard Time": "Pacific/Chatham",
-    "China Standard Time": "Asia/Shanghai",
-    "Cuba Standard Time": "America/Havana",
-    "Dateline Standard Time": "Etc/GMT+12",
-    "E. Africa Standard Time": "Africa/Nairobi",
-    "E. Australia Standard Time": "Australia/Brisbane",
-    "E. Europe Standard Time": "Europe/Chisinau",
-    "E. South America Standard Time": "America/Sao_Paulo",
-    "Easter Island Standard Time": "Pacific/Easter",
-    "Eastern Standard Time": "America/New_York",
-    "Eastern Standard Time (Mexico)": "America/Cancun",
-    "Egypt Standard Time": "Africa/Cairo",
-    "Ekaterinburg Standard Time": "Asia/Yekaterinburg",
-    "FLE Standard Time": "Europe/Kiev",
-    "Fiji Standard Time": "Pacific/Fiji",
-    "GMT Standard Time": "Europe/London",
-    "GTB Standard Time": "Europe/Bucharest",
-    "Georgian Standard Time": "Asia/Tbilisi",
-    "Greenland Standard Time": "America/Godthab",
-    "Greenwich Standard Time": "Atlantic/Reykjavik",
-    "Haiti Standard Time": "America/Port-au-Prince",
-    "Hawaiian Standard Time": "Pacific/Honolulu",
-    "India Standard Time": "Asia/Calcutta",
-    "Iran Standard Time": "Asia/Tehran",
-    "Israel Standard Time": "Asia/Jerusalem",
-    "Jordan Standard Time": "Asia/Amman",
-    "Kaliningrad Standard Time": "Europe/Kaliningrad",
-    "Korea Standard Time": "Asia/Seoul",
-    "Libya Standard Time": "Africa/Tripoli",
-    "Line Islands Standard Time": "Pacific/Kiritimati",
-    "Lord Howe Standard Time": "Australia/Lord_Howe",
-    "Magadan Standard Time": "Asia/Magadan",
-    "Magallanes Standard Time": "America/Punta_Arenas",
-    "Marquesas Standard Time": "Pacific/Marquesas",
-    "Mauritius Standard Time": "Indian/Mauritius",
-    "Middle East Standard Time": "Asia/Beirut",
-    "Montevideo Standard Time": "America/Montevideo",
-    "Morocco Standard Time": "Africa/Casablanca",
-    "Mountain Standard Time": "America/Denver",
-    "Mountain Standard Time (Mexico)": "America/Mazatlan",
-    "Myanmar Standard Time": "Asia/Rangoon",
-    "N. Central Asia Standard Time": "Asia/Novosibirsk",
-    "Namibia Standard Time": "Africa/Windhoek",
-    "Nepal Standard Time": "Asia/Katmandu",
-    "New Zealand Standard Time": "Pacific/Auckland",
-    "Newfoundland Standard Time": "America/St_Johns",
-    "Norfolk Standard Time": "Pacific/Norfolk",
-    "North Asia East Standard Time": "Asia/Irkutsk",
-    "North Asia Standard Time": "Asia/Krasnoyarsk",
-    "North Korea Standard Time": "Asia/Pyongyang",
-    "Omsk Standard Time": "Asia/Omsk",
-    "Pacific SA Standard Time": "America/Santiago",
-    "Pacific Standard Time": "America/Los_Angeles",
-    "Pacific Standard Time (Mexico)": "America/Tijuana",
-    "Pakistan Standard Time": "Asia/Karachi",
-    "Paraguay Standard Time": "America/Asuncion",
-    "Qyzylorda Standard Time": "Asia/Qyzylorda",
-    "Romance Standard Time": "Europe/Paris",
-    "Russia Time Zone 10": "Asia/Srednekolymsk",
-    "Russia Time Zone 11": "Asia/Kamchatka",
-    "Russia Time Zone 3": "Europe/Samara",
-    "Russian Standard Time": "Europe/Moscow",
-    "SA Eastern Standard Time": "America/Cayenne",
-    "SA Pacific Standard Time": "America/Bogota",
-    "SA Western Standard Time": "America/La_Paz",
-    "SE Asia Standard Time": "Asia/Bangkok",
-    "Saint Pierre Standard Time": "America/Miquelon",
-    "Sakhalin Standard Time": "Asia/Sakhalin",
-    "Samoa Standard Time": "Pacific/Apia",
-    "Sao Tome Standard Time": "Africa/Sao_Tome",
-    "Saratov Standard Time": "Europe/Saratov",
-    "Singapore Standard Time": "Asia/Singapore",
-    "South Africa Standard Time": "Africa/Johannesburg",
-    "South Sudan Standard Time": "Africa/Juba",
-    "Sri Lanka Standard Time": "Asia/Colombo",
-    "Sudan Standard Time": "Africa/Khartoum",
-    "Syria Standard Time": "Asia/Damascus",
-    "Taipei Standard Time": "Asia/Taipei",
-    "Tasmania Standard Time": "Australia/Hobart",
-    "Tocantins Standard Time": "America/Araguaina",
-    "Tokyo Standard Time": "Asia/Tokyo",
-    "Tomsk Standard Time": "Asia/Tomsk",
-    "Tonga Standard Time": "Pacific/Tongatapu",
-    "Transbaikal Standard Time": "Asia/Chita",
-    "Turkey Standard Time": "Europe/Istanbul",
-    "Turks And Caicos Standard Time": "America/Grand_Turk",
-    "US Eastern Standard Time": "America/Indianapolis",
-    "US Mountain Standard Time": "America/Phoenix",
-    "UTC": "Etc/UTC",
-    "UTC+12": "Etc/GMT-12",
-    "UTC+13": "Etc/GMT-13",
-    "UTC-02": "Etc/GMT+2",
-    "UTC-08": "Etc/GMT+8",
-    "UTC-09": "Etc/GMT+9",
-    "UTC-11": "Etc/GMT+11",
-    "Ulaanbaatar Standard Time": "Asia/Ulaanbaatar",
-    "Venezuela Standard Time": "America/Caracas",
-    "Vladivostok Standard Time": "Asia/Vladivostok",
-    "Volgograd Standard Time": "Europe/Volgograd",
-    "W. Australia Standard Time": "Australia/Perth",
-    "W. Central Africa Standard Time": "Africa/Lagos",
-    "W. Europe Standard Time": "Europe/Berlin",
-    "W. Mongolia Standard Time": "Asia/Hovd",
-    "West Asia Standard Time": "Asia/Tashkent",
-    "West Bank Standard Time": "Asia/Hebron",
-    "West Pacific Standard Time": "Pacific/Port_Moresby",
-    "Yakutsk Standard Time": "Asia/Yakutsk",
-    "Yukon Standard Time": "America/Whitehorse",
-}
+win_tz = {'AUS Central Standard Time': 'Australia/Darwin',
+ 'AUS Eastern Standard Time': 'Australia/Sydney',
+ 'Afghanistan Standard Time': 'Asia/Kabul',
+ 'Alaskan Standard Time': 'America/Anchorage',
+ 'Arab Standard Time': 'Asia/Riyadh',
+ 'Arabian Standard Time': 'Asia/Dubai',
+ 'Arabic Standard Time': 'Asia/Baghdad',
+ 'Argentina Standard Time': 'America/Buenos_Aires',
+ 'Atlantic Standard Time': 'America/Halifax',
+ 'Azerbaijan Standard Time': 'Asia/Baku',
+ 'Azores Standard Time': 'Atlantic/Azores',
+ 'Bahia Standard Time': 'America/Bahia',
+ 'Bangladesh Standard Time': 'Asia/Dhaka',
+ 'Belarus Standard Time': 'Europe/Minsk',
+ 'Canada Central Standard Time': 'America/Regina',
+ 'Cape Verde Standard Time': 'Atlantic/Cape_Verde',
+ 'Caucasus Standard Time': 'Asia/Yerevan',
+ 'Cen. Australia Standard Time': 'Australia/Adelaide',
+ 'Central America Standard Time': 'America/Guatemala',
+ 'Central Asia Standard Time': 'Asia/Almaty',
+ 'Central Brazilian Standard Time': 'America/Cuiaba',
+ 'Central Europe Standard Time': 'Europe/Budapest',
+ 'Central European Standard Time': 'Europe/Warsaw',
+ 'Central Pacific Standard Time': 'Pacific/Guadalcanal',
+ 'Central Standard Time': 'America/Chicago',
+ 'Central Standard Time (Mexico)': 'America/Mexico_City',
+ 'China Standard Time': 'Asia/Shanghai',
+ 'Dateline Standard Time': 'Etc/GMT+12',
+ 'E. Africa Standard Time': 'Africa/Nairobi',
+ 'E. Australia Standard Time': 'Australia/Brisbane',
+ 'E. South America Standard Time': 'America/Sao_Paulo',
+ 'Eastern Standard Time': 'America/New_York',
+ 'Egypt Standard Time': 'Africa/Cairo',
+ 'Ekaterinburg Standard Time': 'Asia/Yekaterinburg',
+ 'FLE Standard Time': 'Europe/Kiev',
+ 'Fiji Standard Time': 'Pacific/Fiji',
+ 'GMT Standard Time': 'Europe/London',
+ 'GTB Standard Time': 'Europe/Bucharest',
+ 'Georgian Standard Time': 'Asia/Tbilisi',
+ 'Greenland Standard Time': 'America/Godthab',
+ 'Greenwich Standard Time': 'Atlantic/Reykjavik',
+ 'Hawaiian Standard Time': 'Pacific/Honolulu',
+ 'India Standard Time': 'Asia/Calcutta',
+ 'Iran Standard Time': 'Asia/Tehran',
+ 'Israel Standard Time': 'Asia/Jerusalem',
+ 'Jordan Standard Time': 'Asia/Amman',
+ 'Kaliningrad Standard Time': 'Europe/Kaliningrad',
+ 'Korea Standard Time': 'Asia/Seoul',
+ 'Libya Standard Time': 'Africa/Tripoli',
+ 'Line Islands Standard Time': 'Pacific/Kiritimati',
+ 'Magadan Standard Time': 'Asia/Magadan',
+ 'Mauritius Standard Time': 'Indian/Mauritius',
+ 'Middle East Standard Time': 'Asia/Beirut',
+ 'Montevideo Standard Time': 'America/Montevideo',
+ 'Morocco Standard Time': 'Africa/Casablanca',
+ 'Mountain Standard Time': 'America/Denver',
+ 'Mountain Standard Time (Mexico)': 'America/Chihuahua',
+ 'Myanmar Standard Time': 'Asia/Rangoon',
+ 'N. Central Asia Standard Time': 'Asia/Novosibirsk',
+ 'Namibia Standard Time': 'Africa/Windhoek',
+ 'Nepal Standard Time': 'Asia/Katmandu',
+ 'New Zealand Standard Time': 'Pacific/Auckland',
+ 'Newfoundland Standard Time': 'America/St_Johns',
+ 'North Asia East Standard Time': 'Asia/Irkutsk',
+ 'North Asia Standard Time': 'Asia/Krasnoyarsk',
+ 'Pacific SA Standard Time': 'America/Santiago',
+ 'Pacific Standard Time': 'America/Los_Angeles',
+ 'Pacific Standard Time (Mexico)': 'America/Santa_Isabel',
+ 'Pakistan Standard Time': 'Asia/Karachi',
+ 'Paraguay Standard Time': 'America/Asuncion',
+ 'Romance Standard Time': 'Europe/Paris',
+ 'Russia Time Zone 10': 'Asia/Srednekolymsk',
+ 'Russia Time Zone 11': 'Asia/Kamchatka',
+ 'Russia Time Zone 3': 'Europe/Samara',
+ 'Russian Standard Time': 'Europe/Moscow',
+ 'SA Eastern Standard Time': 'America/Cayenne',
+ 'SA Pacific Standard Time': 'America/Bogota',
+ 'SA Western Standard Time': 'America/La_Paz',
+ 'SE Asia Standard Time': 'Asia/Bangkok',
+ 'Samoa Standard Time': 'Pacific/Apia',
+ 'Singapore Standard Time': 'Asia/Singapore',
+ 'South Africa Standard Time': 'Africa/Johannesburg',
+ 'Sri Lanka Standard Time': 'Asia/Colombo',
+ 'Syria Standard Time': 'Asia/Damascus',
+ 'Taipei Standard Time': 'Asia/Taipei',
+ 'Tasmania Standard Time': 'Australia/Hobart',
+ 'Tokyo Standard Time': 'Asia/Tokyo',
+ 'Tonga Standard Time': 'Pacific/Tongatapu',
+ 'Turkey Standard Time': 'Europe/Istanbul',
+ 'US Eastern Standard Time': 'America/Indianapolis',
+ 'US Mountain Standard Time': 'America/Phoenix',
+ 'UTC': 'Etc/GMT',
+ 'UTC+12': 'Etc/GMT-12',
+ 'UTC-02': 'Etc/GMT+2',
+ 'UTC-11': 'Etc/GMT+11',
+ 'Ulaanbaatar Standard Time': 'Asia/Ulaanbaatar',
+ 'Venezuela Standard Time': 'America/Caracas',
+ 'Vladivostok Standard Time': 'Asia/Vladivostok',
+ 'W. Australia Standard Time': 'Australia/Perth',
+ 'W. Central Africa Standard Time': 'Africa/Lagos',
+ 'W. Europe Standard Time': 'Europe/Berlin',
+ 'West Asia Standard Time': 'Asia/Tashkent',
+ 'West Pacific Standard Time': 'Pacific/Port_Moresby',
+ 'Yakutsk Standard Time': 'Asia/Yakutsk'}
 
 # Old name for the win_tz variable:
 tz_names = win_tz
 
-tz_win = {
-    "": "Central Standard Time (Mexico)",
-    "Africa/Abidjan": "Greenwich Standard Time",
-    "Africa/Accra": "Greenwich Standard Time",
-    "Africa/Addis_Ababa": "E. Africa Standard Time",
-    "Africa/Algiers": "W. Central Africa Standard Time",
-    "Africa/Asmara": "E. Africa Standard Time",
-    "Africa/Asmera": "E. Africa Standard Time",
-    "Africa/Bamako": "Greenwich Standard Time",
-    "Africa/Bangui": "W. Central Africa Standard Time",
-    "Africa/Banjul": "Greenwich Standard Time",
-    "Africa/Bissau": "Greenwich Standard Time",
-    "Africa/Blantyre": "South Africa Standard Time",
-    "Africa/Brazzaville": "W. Central Africa Standard Time",
-    "Africa/Bujumbura": "South Africa Standard Time",
-    "Africa/Cairo": "Egypt Standard Time",
-    "Africa/Casablanca": "Morocco Standard Time",
-    "Africa/Ceuta": "Romance Standard Time",
-    "Africa/Conakry": "Greenwich Standard Time",
-    "Africa/Dakar": "Greenwich Standard Time",
-    "Africa/Dar_es_Salaam": "E. Africa Standard Time",
-    "Africa/Djibouti": "E. Africa Standard Time",
-    "Africa/Douala": "W. Central Africa Standard Time",
-    "Africa/El_Aaiun": "Morocco Standard Time",
-    "Africa/Freetown": "Greenwich Standard Time",
-    "Africa/Gaborone": "South Africa Standard Time",
-    "Africa/Harare": "South Africa Standard Time",
-    "Africa/Johannesburg": "South Africa Standard Time",
-    "Africa/Juba": "South Sudan Standard Time",
-    "Africa/Kampala": "E. Africa Standard Time",
-    "Africa/Khartoum": "Sudan Standard Time",
-    "Africa/Kigali": "South Africa Standard Time",
-    "Africa/Kinshasa": "W. Central Africa Standard Time",
-    "Africa/Lagos": "W. Central Africa Standard Time",
-    "Africa/Libreville": "W. Central Africa Standard Time",
-    "Africa/Lome": "Greenwich Standard Time",
-    "Africa/Luanda": "W. Central Africa Standard Time",
-    "Africa/Lubumbashi": "South Africa Standard Time",
-    "Africa/Lusaka": "South Africa Standard Time",
-    "Africa/Malabo": "W. Central Africa Standard Time",
-    "Africa/Maputo": "South Africa Standard Time",
-    "Africa/Maseru": "South Africa Standard Time",
-    "Africa/Mbabane": "South Africa Standard Time",
-    "Africa/Mogadishu": "E. Africa Standard Time",
-    "Africa/Monrovia": "Greenwich Standard Time",
-    "Africa/Nairobi": "E. Africa Standard Time",
-    "Africa/Ndjamena": "W. Central Africa Standard Time",
-    "Africa/Niamey": "W. Central Africa Standard Time",
-    "Africa/Nouakchott": "Greenwich Standard Time",
-    "Africa/Ouagadougou": "Greenwich Standard Time",
-    "Africa/Porto-Novo": "W. Central Africa Standard Time",
-    "Africa/Sao_Tome": "Sao Tome Standard Time",
-    "Africa/Timbuktu": "Greenwich Standard Time",
-    "Africa/Tripoli": "Libya Standard Time",
-    "Africa/Tunis": "W. Central Africa Standard Time",
-    "Africa/Windhoek": "Namibia Standard Time",
-    "America/Adak": "Aleutian Standard Time",
-    "America/Anchorage": "Alaskan Standard Time",
-    "America/Anguilla": "SA Western Standard Time",
-    "America/Antigua": "SA Western Standard Time",
-    "America/Araguaina": "Tocantins Standard Time",
-    "America/Argentina/La_Rioja": "Argentina Standard Time",
-    "America/Argentina/Rio_Gallegos": "Argentina Standard Time",
-    "America/Argentina/Salta": "Argentina Standard Time",
-    "America/Argentina/San_Juan": "Argentina Standard Time",
-    "America/Argentina/San_Luis": "Argentina Standard Time",
-    "America/Argentina/Tucuman": "Argentina Standard Time",
-    "America/Argentina/Ushuaia": "Argentina Standard Time",
-    "America/Aruba": "SA Western Standard Time",
-    "America/Asuncion": "Paraguay Standard Time",
-    "America/Atikokan": "SA Pacific Standard Time",
-    "America/Atka": "Aleutian Standard Time",
-    "America/Bahia": "Bahia Standard Time",
-    "America/Bahia_Banderas": "Central Standard Time (Mexico)",
-    "America/Barbados": "SA Western Standard Time",
-    "America/Belem": "SA Eastern Standard Time",
-    "America/Belize": "Central America Standard Time",
-    "America/Blanc-Sablon": "SA Western Standard Time",
-    "America/Boa_Vista": "SA Western Standard Time",
-    "America/Bogota": "SA Pacific Standard Time",
-    "America/Boise": "Mountain Standard Time",
-    "America/Buenos_Aires": "Argentina Standard Time",
-    "America/Cambridge_Bay": "Mountain Standard Time",
-    "America/Campo_Grande": "Central Brazilian Standard Time",
-    "America/Cancun": "Eastern Standard Time (Mexico)",
-    "America/Caracas": "Venezuela Standard Time",
-    "America/Catamarca": "Argentina Standard Time",
-    "America/Cayenne": "SA Eastern Standard Time",
-    "America/Cayman": "SA Pacific Standard Time",
-    "America/Chicago": "Central Standard Time",
-    "America/Chihuahua": "Central Standard Time (Mexico)",
-    "America/Ciudad_Juarez": "Mountain Standard Time",
-    "America/Coral_Harbour": "SA Pacific Standard Time",
-    "America/Cordoba": "Argentina Standard Time",
-    "America/Costa_Rica": "Central America Standard Time",
-    "America/Creston": "US Mountain Standard Time",
-    "America/Cuiaba": "Central Brazilian Standard Time",
-    "America/Curacao": "SA Western Standard Time",
-    "America/Danmarkshavn": "Greenwich Standard Time",
-    "America/Dawson": "Yukon Standard Time",
-    "America/Dawson_Creek": "US Mountain Standard Time",
-    "America/Denver": "Mountain Standard Time",
-    "America/Detroit": "Eastern Standard Time",
-    "America/Dominica": "SA Western Standard Time",
-    "America/Edmonton": "Mountain Standard Time",
-    "America/Eirunepe": "SA Pacific Standard Time",
-    "America/El_Salvador": "Central America Standard Time",
-    "America/Ensenada": "Pacific Standard Time (Mexico)",
-    "America/Fort_Nelson": "US Mountain Standard Time",
-    "America/Fortaleza": "SA Eastern Standard Time",
-    "America/Glace_Bay": "Atlantic Standard Time",
-    "America/Godthab": "Greenland Standard Time",
-    "America/Goose_Bay": "Atlantic Standard Time",
-    "America/Grand_Turk": "Turks And Caicos Standard Time",
-    "America/Grenada": "SA Western Standard Time",
-    "America/Guadeloupe": "SA Western Standard Time",
-    "America/Guatemala": "Central America Standard Time",
-    "America/Guayaquil": "SA Pacific Standard Time",
-    "America/Guyana": "SA Western Standard Time",
-    "America/Halifax": "Atlantic Standard Time",
-    "America/Havana": "Cuba Standard Time",
-    "America/Hermosillo": "US Mountain Standard Time",
-    "America/Indiana/Knox": "Central Standard Time",
-    "America/Indiana/Marengo": "US Eastern Standard Time",
-    "America/Indiana/Petersburg": "Eastern Standard Time",
-    "America/Indiana/Tell_City": "Central Standard Time",
-    "America/Indiana/Vevay": "US Eastern Standard Time",
-    "America/Indiana/Vincennes": "Eastern Standard Time",
-    "America/Indiana/Winamac": "Eastern Standard Time",
-    "America/Indianapolis": "US Eastern Standard Time",
-    "America/Inuvik": "Mountain Standard Time",
-    "America/Iqaluit": "Eastern Standard Time",
-    "America/Jamaica": "SA Pacific Standard Time",
-    "America/Jujuy": "Argentina Standard Time",
-    "America/Juneau": "Alaskan Standard Time",
-    "America/Kentucky/Monticello": "Eastern Standard Time",
-    "America/Knox_IN": "Central Standard Time",
-    "America/Kralendijk": "SA Western Standard Time",
-    "America/La_Paz": "SA Western Standard Time",
-    "America/Lima": "SA Pacific Standard Time",
-    "America/Los_Angeles": "Pacific Standard Time",
-    "America/Louisville": "Eastern Standard Time",
-    "America/Lower_Princes": "SA Western Standard Time",
-    "America/Maceio": "SA Eastern Standard Time",
-    "America/Managua": "Central America Standard Time",
-    "America/Manaus": "SA Western Standard Time",
-    "America/Marigot": "SA Western Standard Time",
-    "America/Martinique": "SA Western Standard Time",
-    "America/Matamoros": "Central Standard Time",
-    "America/Mazatlan": "Mountain Standard Time (Mexico)",
-    "America/Mendoza": "Argentina Standard Time",
-    "America/Menominee": "Central Standard Time",
-    "America/Merida": "Central Standard Time (Mexico)",
-    "America/Metlakatla": "Alaskan Standard Time",
-    "America/Mexico_City": "Central Standard Time (Mexico)",
-    "America/Miquelon": "Saint Pierre Standard Time",
-    "America/Moncton": "Atlantic Standard Time",
-    "America/Monterrey": "Central Standard Time (Mexico)",
-    "America/Montevideo": "Montevideo Standard Time",
-    "America/Montreal": "Eastern Standard Time",
-    "America/Montserrat": "SA Western Standard Time",
-    "America/Nassau": "Eastern Standard Time",
-    "America/New_York": "Eastern Standard Time",
-    "America/Nipigon": "Eastern Standard Time",
-    "America/Nome": "Alaskan Standard Time",
-    "America/Noronha": "UTC-02",
-    "America/North_Dakota/Beulah": "Central Standard Time",
-    "America/North_Dakota/Center": "Central Standard Time",
-    "America/North_Dakota/New_Salem": "Central Standard Time",
-    "America/Ojinaga": "Central Standard Time",
-    "America/Panama": "SA Pacific Standard Time",
-    "America/Pangnirtung": "Eastern Standard Time",
-    "America/Paramaribo": "SA Eastern Standard Time",
-    "America/Phoenix": "US Mountain Standard Time",
-    "America/Port-au-Prince": "Haiti Standard Time",
-    "America/Port_of_Spain": "SA Western Standard Time",
-    "America/Porto_Acre": "SA Pacific Standard Time",
-    "America/Porto_Velho": "SA Western Standard Time",
-    "America/Puerto_Rico": "SA Western Standard Time",
-    "America/Punta_Arenas": "Magallanes Standard Time",
-    "America/Rainy_River": "Central Standard Time",
-    "America/Rankin_Inlet": "Central Standard Time",
-    "America/Recife": "SA Eastern Standard Time",
-    "America/Regina": "Canada Central Standard Time",
-    "America/Resolute": "Central Standard Time",
-    "America/Rio_Branco": "SA Pacific Standard Time",
-    "America/Santa_Isabel": "Pacific Standard Time (Mexico)",
-    "America/Santarem": "SA Eastern Standard Time",
-    "America/Santiago": "Pacific SA Standard Time",
-    "America/Santo_Domingo": "SA Western Standard Time",
-    "America/Sao_Paulo": "E. South America Standard Time",
-    "America/Scoresbysund": "Azores Standard Time",
-    "America/Shiprock": "Mountain Standard Time",
-    "America/Sitka": "Alaskan Standard Time",
-    "America/St_Barthelemy": "SA Western Standard Time",
-    "America/St_Johns": "Newfoundland Standard Time",
-    "America/St_Kitts": "SA Western Standard Time",
-    "America/St_Lucia": "SA Western Standard Time",
-    "America/St_Thomas": "SA Western Standard Time",
-    "America/St_Vincent": "SA Western Standard Time",
-    "America/Swift_Current": "Canada Central Standard Time",
-    "America/Tegucigalpa": "Central America Standard Time",
-    "America/Thule": "Atlantic Standard Time",
-    "America/Thunder_Bay": "Eastern Standard Time",
-    "America/Tijuana": "Pacific Standard Time (Mexico)",
-    "America/Toronto": "Eastern Standard Time",
-    "America/Tortola": "SA Western Standard Time",
-    "America/Vancouver": "Pacific Standard Time",
-    "America/Virgin": "SA Western Standard Time",
-    "America/Whitehorse": "Yukon Standard Time",
-    "America/Winnipeg": "Central Standard Time",
-    "America/Yakutat": "Alaskan Standard Time",
-    "America/Yellowknife": "Mountain Standard Time",
-    "Antarctica/Casey": "Central Pacific Standard Time",
-    "Antarctica/Davis": "SE Asia Standard Time",
-    "Antarctica/DumontDUrville": "West Pacific Standard Time",
-    "Antarctica/Macquarie": "Tasmania Standard Time",
-    "Antarctica/Mawson": "West Asia Standard Time",
-    "Antarctica/McMurdo": "New Zealand Standard Time",
-    "Antarctica/Palmer": "SA Eastern Standard Time",
-    "Antarctica/Rothera": "SA Eastern Standard Time",
-    "Antarctica/South_Pole": "New Zealand Standard Time",
-    "Antarctica/Syowa": "Arab Standard Time",
-    "Antarctica/Vostok": "Central Asia Standard Time",
-    "Arctic/Longyearbyen": "W. Europe Standard Time",
-    "Asia/Aden": "Arab Standard Time",
-    "Asia/Almaty": "Central Asia Standard Time",
-    "Asia/Amman": "Jordan Standard Time",
-    "Asia/Anadyr": "Russia Time Zone 11",
-    "Asia/Aqtau": "West Asia Standard Time",
-    "Asia/Aqtobe": "West Asia Standard Time",
-    "Asia/Ashgabat": "West Asia Standard Time",
-    "Asia/Ashkhabad": "West Asia Standard Time",
-    "Asia/Atyrau": "West Asia Standard Time",
-    "Asia/Baghdad": "Arabic Standard Time",
-    "Asia/Bahrain": "Arab Standard Time",
-    "Asia/Baku": "Azerbaijan Standard Time",
-    "Asia/Bangkok": "SE Asia Standard Time",
-    "Asia/Barnaul": "Altai Standard Time",
-    "Asia/Beirut": "Middle East Standard Time",
-    "Asia/Bishkek": "Central Asia Standard Time",
-    "Asia/Brunei": "Singapore Standard Time",
-    "Asia/Calcutta": "India Standard Time",
-    "Asia/Chita": "Transbaikal Standard Time",
-    "Asia/Choibalsan": "Ulaanbaatar Standard Time",
-    "Asia/Chongqing": "China Standard Time",
-    "Asia/Chungking": "China Standard Time",
-    "Asia/Colombo": "Sri Lanka Standard Time",
-    "Asia/Dacca": "Bangladesh Standard Time",
-    "Asia/Damascus": "Syria Standard Time",
-    "Asia/Dhaka": "Bangladesh Standard Time",
-    "Asia/Dili": "Tokyo Standard Time",
-    "Asia/Dubai": "Arabian Standard Time",
-    "Asia/Dushanbe": "West Asia Standard Time",
-    "Asia/Famagusta": "GTB Standard Time",
-    "Asia/Gaza": "West Bank Standard Time",
-    "Asia/Harbin": "China Standard Time",
-    "Asia/Hebron": "West Bank Standard Time",
-    "Asia/Hong_Kong": "China Standard Time",
-    "Asia/Hovd": "W. Mongolia Standard Time",
-    "Asia/Irkutsk": "North Asia East Standard Time",
-    "Asia/Istanbul": "Turkey Standard Time",
-    "Asia/Jakarta": "SE Asia Standard Time",
-    "Asia/Jayapura": "Tokyo Standard Time",
-    "Asia/Jerusalem": "Israel Standard Time",
-    "Asia/Kabul": "Afghanistan Standard Time",
-    "Asia/Kamchatka": "Russia Time Zone 11",
-    "Asia/Karachi": "Pakistan Standard Time",
-    "Asia/Kashgar": "Central Asia Standard Time",
-    "Asia/Katmandu": "Nepal Standard Time",
-    "Asia/Khandyga": "Yakutsk Standard Time",
-    "Asia/Krasnoyarsk": "North Asia Standard Time",
-    "Asia/Kuala_Lumpur": "Singapore Standard Time",
-    "Asia/Kuching": "Singapore Standard Time",
-    "Asia/Kuwait": "Arab Standard Time",
-    "Asia/Macao": "China Standard Time",
-    "Asia/Macau": "China Standard Time",
-    "Asia/Magadan": "Magadan Standard Time",
-    "Asia/Makassar": "Singapore Standard Time",
-    "Asia/Manila": "Singapore Standard Time",
-    "Asia/Muscat": "Arabian Standard Time",
-    "Asia/Nicosia": "GTB Standard Time",
-    "Asia/Novokuznetsk": "North Asia Standard Time",
-    "Asia/Novosibirsk": "N. Central Asia Standard Time",
-    "Asia/Omsk": "Omsk Standard Time",
-    "Asia/Oral": "West Asia Standard Time",
-    "Asia/Phnom_Penh": "SE Asia Standard Time",
-    "Asia/Pontianak": "SE Asia Standard Time",
-    "Asia/Pyongyang": "North Korea Standard Time",
-    "Asia/Qatar": "Arab Standard Time",
-    "Asia/Qostanay": "Central Asia Standard Time",
-    "Asia/Qyzylorda": "Qyzylorda Standard Time",
-    "Asia/Rangoon": "Myanmar Standard Time",
-    "Asia/Riyadh": "Arab Standard Time",
-    "Asia/Saigon": "SE Asia Standard Time",
-    "Asia/Sakhalin": "Sakhalin Standard Time",
-    "Asia/Samarkand": "West Asia Standard Time",
-    "Asia/Seoul": "Korea Standard Time",
-    "Asia/Shanghai": "China Standard Time",
-    "Asia/Singapore": "Singapore Standard Time",
-    "Asia/Srednekolymsk": "Russia Time Zone 10",
-    "Asia/Taipei": "Taipei Standard Time",
-    "Asia/Tashkent": "West Asia Standard Time",
-    "Asia/Tbilisi": "Georgian Standard Time",
-    "Asia/Tehran": "Iran Standard Time",
-    "Asia/Tel_Aviv": "Israel Standard Time",
-    "Asia/Thimbu": "Bangladesh Standard Time",
-    "Asia/Thimphu": "Bangladesh Standard Time",
-    "Asia/Tokyo": "Tokyo Standard Time",
-    "Asia/Tomsk": "Tomsk Standard Time",
-    "Asia/Ujung_Pandang": "Singapore Standard Time",
-    "Asia/Ulaanbaatar": "Ulaanbaatar Standard Time",
-    "Asia/Ulan_Bator": "Ulaanbaatar Standard Time",
-    "Asia/Urumqi": "Central Asia Standard Time",
-    "Asia/Ust-Nera": "Vladivostok Standard Time",
-    "Asia/Vientiane": "SE Asia Standard Time",
-    "Asia/Vladivostok": "Vladivostok Standard Time",
-    "Asia/Yakutsk": "Yakutsk Standard Time",
-    "Asia/Yekaterinburg": "Ekaterinburg Standard Time",
-    "Asia/Yerevan": "Caucasus Standard Time",
-    "Atlantic/Azores": "Azores Standard Time",
-    "Atlantic/Bermuda": "Atlantic Standard Time",
-    "Atlantic/Canary": "GMT Standard Time",
-    "Atlantic/Cape_Verde": "Cape Verde Standard Time",
-    "Atlantic/Faeroe": "GMT Standard Time",
-    "Atlantic/Jan_Mayen": "W. Europe Standard Time",
-    "Atlantic/Madeira": "GMT Standard Time",
-    "Atlantic/Reykjavik": "Greenwich Standard Time",
-    "Atlantic/South_Georgia": "UTC-02",
-    "Atlantic/St_Helena": "Greenwich Standard Time",
-    "Atlantic/Stanley": "SA Eastern Standard Time",
-    "Australia/ACT": "AUS Eastern Standard Time",
-    "Australia/Adelaide": "Cen. Australia Standard Time",
-    "Australia/Brisbane": "E. Australia Standard Time",
-    "Australia/Broken_Hill": "Cen. Australia Standard Time",
-    "Australia/Canberra": "AUS Eastern Standard Time",
-    "Australia/Currie": "Tasmania Standard Time",
-    "Australia/Darwin": "AUS Central Standard Time",
-    "Australia/Eucla": "Aus Central W. Standard Time",
-    "Australia/Hobart": "Tasmania Standard Time",
-    "Australia/LHI": "Lord Howe Standard Time",
-    "Australia/Lindeman": "E. Australia Standard Time",
-    "Australia/Lord_Howe": "Lord Howe Standard Time",
-    "Australia/Melbourne": "AUS Eastern Standard Time",
-    "Australia/NSW": "AUS Eastern Standard Time",
-    "Australia/North": "AUS Central Standard Time",
-    "Australia/Perth": "W. Australia Standard Time",
-    "Australia/Queensland": "E. Australia Standard Time",
-    "Australia/South": "Cen. Australia Standard Time",
-    "Australia/Sydney": "AUS Eastern Standard Time",
-    "Australia/Tasmania": "Tasmania Standard Time",
-    "Australia/Victoria": "AUS Eastern Standard Time",
-    "Australia/West": "W. Australia Standard Time",
-    "Australia/Yancowinna": "Cen. Australia Standard Time",
-    "Brazil/Acre": "SA Pacific Standard Time",
-    "Brazil/DeNoronha": "UTC-02",
-    "Brazil/East": "E. South America Standard Time",
-    "Brazil/West": "SA Western Standard Time",
-    "CST6CDT": "Central Standard Time",
-    "Canada/Atlantic": "Atlantic Standard Time",
-    "Canada/Central": "Central Standard Time",
-    "Canada/Eastern": "Eastern Standard Time",
-    "Canada/Mountain": "Mountain Standard Time",
-    "Canada/Newfoundland": "Newfoundland Standard Time",
-    "Canada/Pacific": "Pacific Standard Time",
-    "Canada/Saskatchewan": "Canada Central Standard Time",
-    "Canada/Yukon": "Yukon Standard Time",
-    "Chile/Continental": "Pacific SA Standard Time",
-    "Chile/EasterIsland": "Easter Island Standard Time",
-    "Cuba": "Cuba Standard Time",
-    "EST5EDT": "Eastern Standard Time",
-    "Egypt": "Egypt Standard Time",
-    "Eire": "GMT Standard Time",
-    "Etc/GMT": "UTC",
-    "Etc/GMT+0": "UTC",
-    "Etc/GMT+1": "Cape Verde Standard Time",
-    "Etc/GMT+10": "Hawaiian Standard Time",
-    "Etc/GMT+11": "UTC-11",
-    "Etc/GMT+12": "Dateline Standard Time",
-    "Etc/GMT+2": "UTC-02",
-    "Etc/GMT+3": "SA Eastern Standard Time",
-    "Etc/GMT+4": "SA Western Standard Time",
-    "Etc/GMT+5": "SA Pacific Standard Time",
-    "Etc/GMT+6": "Central America Standard Time",
-    "Etc/GMT+7": "US Mountain Standard Time",
-    "Etc/GMT+8": "UTC-08",
-    "Etc/GMT+9": "UTC-09",
-    "Etc/GMT-0": "UTC",
-    "Etc/GMT-1": "W. Central Africa Standard Time",
-    "Etc/GMT-10": "West Pacific Standard Time",
-    "Etc/GMT-11": "Central Pacific Standard Time",
-    "Etc/GMT-12": "UTC+12",
-    "Etc/GMT-13": "UTC+13",
-    "Etc/GMT-14": "Line Islands Standard Time",
-    "Etc/GMT-2": "South Africa Standard Time",
-    "Etc/GMT-3": "E. Africa Standard Time",
-    "Etc/GMT-4": "Arabian Standard Time",
-    "Etc/GMT-5": "West Asia Standard Time",
-    "Etc/GMT-6": "Central Asia Standard Time",
-    "Etc/GMT-7": "SE Asia Standard Time",
-    "Etc/GMT-8": "Singapore Standard Time",
-    "Etc/GMT-9": "Tokyo Standard Time",
-    "Etc/GMT0": "UTC",
-    "Etc/Greenwich": "UTC",
-    "Etc/UCT": "UTC",
-    "Etc/UTC": "UTC",
-    "Etc/Universal": "UTC",
-    "Etc/Zulu": "UTC",
-    "Europe/Amsterdam": "Romance Standard Time",
-    "Europe/Andorra": "W. Europe Standard Time",
-    "Europe/Astrakhan": "Astrakhan Standard Time",
-    "Europe/Athens": "GTB Standard Time",
-    "Europe/Belfast": "GMT Standard Time",
-    "Europe/Belgrade": "Central Europe Standard Time",
-    "Europe/Berlin": "W. Europe Standard Time",
-    "Europe/Bratislava": "Central Europe Standard Time",
-    "Europe/Brussels": "Romance Standard Time",
-    "Europe/Bucharest": "GTB Standard Time",
-    "Europe/Budapest": "Central Europe Standard Time",
-    "Europe/Busingen": "W. Europe Standard Time",
-    "Europe/Chisinau": "E. Europe Standard Time",
-    "Europe/Copenhagen": "W. Europe Standard Time",
-    "Europe/Dublin": "GMT Standard Time",
-    "Europe/Gibraltar": "W. Europe Standard Time",
-    "Europe/Guernsey": "GMT Standard Time",
-    "Europe/Helsinki": "FLE Standard Time",
-    "Europe/Isle_of_Man": "GMT Standard Time",
-    "Europe/Istanbul": "Turkey Standard Time",
-    "Europe/Jersey": "GMT Standard Time",
-    "Europe/Kaliningrad": "Kaliningrad Standard Time",
-    "Europe/Kiev": "FLE Standard Time",
-    "Europe/Kirov": "Russian Standard Time",
-    "Europe/Lisbon": "GMT Standard Time",
-    "Europe/Ljubljana": "Central Europe Standard Time",
-    "Europe/London": "GMT Standard Time",
-    "Europe/Luxembourg": "Romance Standard Time",
-    "Europe/Madrid": "Romance Standard Time",
-    "Europe/Malta": "W. Europe Standard Time",
-    "Europe/Mariehamn": "FLE Standard Time",
-    "Europe/Minsk": "Belarus Standard Time",
-    "Europe/Monaco": "Romance Standard Time",
-    "Europe/Moscow": "Russian Standard Time",
-    "Europe/Nicosia": "GTB Standard Time",
-    "Europe/Oslo": "W. Europe Standard Time",
-    "Europe/Paris": "Romance Standard Time",
-    "Europe/Podgorica": "Central Europe Standard Time",
-    "Europe/Prague": "Central Europe Standard Time",
-    "Europe/Riga": "FLE Standard Time",
-    "Europe/Rome": "W. Europe Standard Time",
-    "Europe/Samara": "Russia Time Zone 3",
-    "Europe/San_Marino": "W. Europe Standard Time",
-    "Europe/Sarajevo": "Central Europe Standard Time",
-    "Europe/Saratov": "Saratov Standard Time",
-    "Europe/Simferopol": "Russian Standard Time",
-    "Europe/Skopje": "Central Europe Standard Time",
-    "Europe/Sofia": "FLE Standard Time",
-    "Europe/Stockholm": "W. Europe Standard Time",
-    "Europe/Tallinn": "FLE Standard Time",
-    "Europe/Tirane": "Central Europe Standard Time",
-    "Europe/Tiraspol": "E. Europe Standard Time",
-    "Europe/Ulyanovsk": "Astrakhan Standard Time",
-    "Europe/Uzhgorod": "FLE Standard Time",
-    "Europe/Vaduz": "W. Europe Standard Time",
-    "Europe/Vatican": "W. Europe Standard Time",
-    "Europe/Vienna": "W. Europe Standard Time",
-    "Europe/Vilnius": "FLE Standard Time",
-    "Europe/Volgograd": "Volgograd Standard Time",
-    "Europe/Warsaw": "Central European Standard Time",
-    "Europe/Zagreb": "Central Europe Standard Time",
-    "Europe/Zaporozhye": "FLE Standard Time",
-    "Europe/Zurich": "W. Europe Standard Time",
-    "GB": "GMT Standard Time",
-    "GB-Eire": "GMT Standard Time",
-    "GMT+0": "UTC",
-    "GMT-0": "UTC",
-    "GMT0": "UTC",
-    "Greenwich": "UTC",
-    "Hongkong": "China Standard Time",
-    "Iceland": "Greenwich Standard Time",
-    "Indian/Antananarivo": "E. Africa Standard Time",
-    "Indian/Chagos": "Central Asia Standard Time",
-    "Indian/Christmas": "SE Asia Standard Time",
-    "Indian/Cocos": "Myanmar Standard Time",
-    "Indian/Comoro": "E. Africa Standard Time",
-    "Indian/Kerguelen": "West Asia Standard Time",
-    "Indian/Mahe": "Arabian Standard Time",
-    "Indian/Maldives": "West Asia Standard Time",
-    "Indian/Mauritius": "Mauritius Standard Time",
-    "Indian/Mayotte": "E. Africa Standard Time",
-    "Indian/Reunion": "Arabian Standard Time",
-    "Iran": "Iran Standard Time",
-    "Israel": "Israel Standard Time",
-    "Jamaica": "SA Pacific Standard Time",
-    "Japan": "Tokyo Standard Time",
-    "Kwajalein": "UTC+12",
-    "Libya": "Libya Standard Time",
-    "MST7MDT": "Mountain Standard Time",
-    "Mexico/BajaNorte": "Pacific Standard Time (Mexico)",
-    "Mexico/BajaSur": "Mountain Standard Time (Mexico)",
-    "Mexico/General": "Central Standard Time (Mexico)",
-    "NZ": "New Zealand Standard Time",
-    "NZ-CHAT": "Chatham Islands Standard Time",
-    "Navajo": "Mountain Standard Time",
-    "PRC": "China Standard Time",
-    "PST8PDT": "Pacific Standard Time",
-    "Pacific/Apia": "Samoa Standard Time",
-    "Pacific/Auckland": "New Zealand Standard Time",
-    "Pacific/Bougainville": "Bougainville Standard Time",
-    "Pacific/Chatham": "Chatham Islands Standard Time",
-    "Pacific/Chuuk": "West Pacific Standard Time",
-    "Pacific/Easter": "Easter Island Standard Time",
-    "Pacific/Efate": "Central Pacific Standard Time",
-    "Pacific/Enderbury": "UTC+13",
-    "Pacific/Fakaofo": "UTC+13",
-    "Pacific/Fiji": "Fiji Standard Time",
-    "Pacific/Funafuti": "UTC+12",
-    "Pacific/Galapagos": "Central America Standard Time",
-    "Pacific/Gambier": "UTC-09",
-    "Pacific/Guadalcanal": "Central Pacific Standard Time",
-    "Pacific/Guam": "West Pacific Standard Time",
-    "Pacific/Honolulu": "Hawaiian Standard Time",
-    "Pacific/Johnston": "Hawaiian Standard Time",
-    "Pacific/Kiritimati": "Line Islands Standard Time",
-    "Pacific/Kosrae": "Central Pacific Standard Time",
-    "Pacific/Kwajalein": "UTC+12",
-    "Pacific/Majuro": "UTC+12",
-    "Pacific/Marquesas": "Marquesas Standard Time",
-    "Pacific/Midway": "UTC-11",
-    "Pacific/Nauru": "UTC+12",
-    "Pacific/Niue": "UTC-11",
-    "Pacific/Norfolk": "Norfolk Standard Time",
-    "Pacific/Noumea": "Central Pacific Standard Time",
-    "Pacific/Pago_Pago": "UTC-11",
-    "Pacific/Palau": "Tokyo Standard Time",
-    "Pacific/Pitcairn": "UTC-08",
-    "Pacific/Pohnpei": "Central Pacific Standard Time",
-    "Pacific/Ponape": "Central Pacific Standard Time",
-    "Pacific/Port_Moresby": "West Pacific Standard Time",
-    "Pacific/Rarotonga": "Hawaiian Standard Time",
-    "Pacific/Saipan": "West Pacific Standard Time",
-    "Pacific/Samoa": "UTC-11",
-    "Pacific/Tahiti": "Hawaiian Standard Time",
-    "Pacific/Tarawa": "UTC+12",
-    "Pacific/Tongatapu": "Tonga Standard Time",
-    "Pacific/Truk": "West Pacific Standard Time",
-    "Pacific/Wake": "UTC+12",
-    "Pacific/Wallis": "UTC+12",
-    "Pacific/Yap": "West Pacific Standard Time",
-    "Poland": "Central European Standard Time",
-    "Portugal": "GMT Standard Time",
-    "ROC": "Taipei Standard Time",
-    "ROK": "Korea Standard Time",
-    "Singapore": "Singapore Standard Time",
-    "Turkey": "Turkey Standard Time",
-    "UCT": "UTC",
-    "US/Alaska": "Alaskan Standard Time",
-    "US/Aleutian": "Aleutian Standard Time",
-    "US/Arizona": "US Mountain Standard Time",
-    "US/Central": "Central Standard Time",
-    "US/Eastern": "Eastern Standard Time",
-    "US/Hawaii": "Hawaiian Standard Time",
-    "US/Indiana-Starke": "Central Standard Time",
-    "US/Michigan": "Eastern Standard Time",
-    "US/Mountain": "Mountain Standard Time",
-    "US/Pacific": "Pacific Standard Time",
-    "US/Samoa": "UTC-11",
-    "UTC": "UTC",
-    "Universal": "UTC",
-    "W-SU": "Russian Standard Time",
-    "Zulu": "UTC",
-}
+tz_win = {'Africa/Abidjan': 'Greenwich Standard Time',
+ 'Africa/Accra': 'Greenwich Standard Time',
+ 'Africa/Addis_Ababa': 'E. Africa Standard Time',
+ 'Africa/Algiers': 'W. Central Africa Standard Time',
+ 'Africa/Asmera': 'E. Africa Standard Time',
+ 'Africa/Bamako': 'Greenwich Standard Time',
+ 'Africa/Bangui': 'W. Central Africa Standard Time',
+ 'Africa/Banjul': 'Greenwich Standard Time',
+ 'Africa/Bissau': 'Greenwich Standard Time',
+ 'Africa/Blantyre': 'South Africa Standard Time',
+ 'Africa/Brazzaville': 'W. Central Africa Standard Time',
+ 'Africa/Bujumbura': 'South Africa Standard Time',
+ 'Africa/Cairo': 'Egypt Standard Time',
+ 'Africa/Casablanca': 'Morocco Standard Time',
+ 'Africa/Ceuta': 'Romance Standard Time',
+ 'Africa/Conakry': 'Greenwich Standard Time',
+ 'Africa/Dakar': 'Greenwich Standard Time',
+ 'Africa/Dar_es_Salaam': 'E. Africa Standard Time',
+ 'Africa/Djibouti': 'E. Africa Standard Time',
+ 'Africa/Douala': 'W. Central Africa Standard Time',
+ 'Africa/El_Aaiun': 'Morocco Standard Time',
+ 'Africa/Freetown': 'Greenwich Standard Time',
+ 'Africa/Gaborone': 'South Africa Standard Time',
+ 'Africa/Harare': 'South Africa Standard Time',
+ 'Africa/Johannesburg': 'South Africa Standard Time',
+ 'Africa/Juba': 'E. Africa Standard Time',
+ 'Africa/Kampala': 'E. Africa Standard Time',
+ 'Africa/Khartoum': 'E. Africa Standard Time',
+ 'Africa/Kigali': 'South Africa Standard Time',
+ 'Africa/Kinshasa': 'W. Central Africa Standard Time',
+ 'Africa/Lagos': 'W. Central Africa Standard Time',
+ 'Africa/Libreville': 'W. Central Africa Standard Time',
+ 'Africa/Lome': 'Greenwich Standard Time',
+ 'Africa/Luanda': 'W. Central Africa Standard Time',
+ 'Africa/Lubumbashi': 'South Africa Standard Time',
+ 'Africa/Lusaka': 'South Africa Standard Time',
+ 'Africa/Malabo': 'W. Central Africa Standard Time',
+ 'Africa/Maputo': 'South Africa Standard Time',
+ 'Africa/Maseru': 'South Africa Standard Time',
+ 'Africa/Mbabane': 'South Africa Standard Time',
+ 'Africa/Mogadishu': 'E. Africa Standard Time',
+ 'Africa/Monrovia': 'Greenwich Standard Time',
+ 'Africa/Nairobi': 'E. Africa Standard Time',
+ 'Africa/Ndjamena': 'W. Central Africa Standard Time',
+ 'Africa/Niamey': 'W. Central Africa Standard Time',
+ 'Africa/Nouakchott': 'Greenwich Standard Time',
+ 'Africa/Ouagadougou': 'Greenwich Standard Time',
+ 'Africa/Porto-Novo': 'W. Central Africa Standard Time',
+ 'Africa/Sao_Tome': 'Greenwich Standard Time',
+ 'Africa/Tripoli': 'Libya Standard Time',
+ 'Africa/Tunis': 'W. Central Africa Standard Time',
+ 'Africa/Windhoek': 'Namibia Standard Time',
+ 'America/Anchorage': 'Alaskan Standard Time',
+ 'America/Anguilla': 'SA Western Standard Time',
+ 'America/Antigua': 'SA Western Standard Time',
+ 'America/Araguaina': 'SA Eastern Standard Time',
+ 'America/Argentina/La_Rioja': 'Argentina Standard Time',
+ 'America/Argentina/Rio_Gallegos': 'Argentina Standard Time',
+ 'America/Argentina/Salta': 'Argentina Standard Time',
+ 'America/Argentina/San_Juan': 'Argentina Standard Time',
+ 'America/Argentina/San_Luis': 'Argentina Standard Time',
+ 'America/Argentina/Tucuman': 'Argentina Standard Time',
+ 'America/Argentina/Ushuaia': 'Argentina Standard Time',
+ 'America/Aruba': 'SA Western Standard Time',
+ 'America/Asuncion': 'Paraguay Standard Time',
+ 'America/Bahia': 'Bahia Standard Time',
+ 'America/Bahia_Banderas': 'Central Standard Time (Mexico)',
+ 'America/Barbados': 'SA Western Standard Time',
+ 'America/Belem': 'SA Eastern Standard Time',
+ 'America/Belize': 'Central America Standard Time',
+ 'America/Blanc-Sablon': 'SA Western Standard Time',
+ 'America/Boa_Vista': 'SA Western Standard Time',
+ 'America/Bogota': 'SA Pacific Standard Time',
+ 'America/Boise': 'Mountain Standard Time',
+ 'America/Buenos_Aires': 'Argentina Standard Time',
+ 'America/Cambridge_Bay': 'Mountain Standard Time',
+ 'America/Campo_Grande': 'Central Brazilian Standard Time',
+ 'America/Cancun': 'Central Standard Time (Mexico)',
+ 'America/Caracas': 'Venezuela Standard Time',
+ 'America/Catamarca': 'Argentina Standard Time',
+ 'America/Cayenne': 'SA Eastern Standard Time',
+ 'America/Cayman': 'SA Pacific Standard Time',
+ 'America/Chicago': 'Central Standard Time',
+ 'America/Chihuahua': 'Mountain Standard Time (Mexico)',
+ 'America/Coral_Harbour': 'SA Pacific Standard Time',
+ 'America/Cordoba': 'Argentina Standard Time',
+ 'America/Costa_Rica': 'Central America Standard Time',
+ 'America/Creston': 'US Mountain Standard Time',
+ 'America/Cuiaba': 'Central Brazilian Standard Time',
+ 'America/Curacao': 'SA Western Standard Time',
+ 'America/Danmarkshavn': 'UTC',
+ 'America/Dawson': 'Pacific Standard Time',
+ 'America/Dawson_Creek': 'US Mountain Standard Time',
+ 'America/Denver': 'Mountain Standard Time',
+ 'America/Detroit': 'Eastern Standard Time',
+ 'America/Dominica': 'SA Western Standard Time',
+ 'America/Edmonton': 'Mountain Standard Time',
+ 'America/Eirunepe': 'SA Pacific Standard Time',
+ 'America/El_Salvador': 'Central America Standard Time',
+ 'America/Fortaleza': 'SA Eastern Standard Time',
+ 'America/Glace_Bay': 'Atlantic Standard Time',
+ 'America/Godthab': 'Greenland Standard Time',
+ 'America/Goose_Bay': 'Atlantic Standard Time',
+ 'America/Grand_Turk': 'SA Western Standard Time',
+ 'America/Grenada': 'SA Western Standard Time',
+ 'America/Guadeloupe': 'SA Western Standard Time',
+ 'America/Guatemala': 'Central America Standard Time',
+ 'America/Guayaquil': 'SA Pacific Standard Time',
+ 'America/Guyana': 'SA Western Standard Time',
+ 'America/Halifax': 'Atlantic Standard Time',
+ 'America/Havana': 'Eastern Standard Time',
+ 'America/Hermosillo': 'US Mountain Standard Time',
+ 'America/Indiana/Knox': 'Central Standard Time',
+ 'America/Indiana/Marengo': 'US Eastern Standard Time',
+ 'America/Indiana/Petersburg': 'Eastern Standard Time',
+ 'America/Indiana/Tell_City': 'Central Standard Time',
+ 'America/Indiana/Vevay': 'US Eastern Standard Time',
+ 'America/Indiana/Vincennes': 'Eastern Standard Time',
+ 'America/Indiana/Winamac': 'Eastern Standard Time',
+ 'America/Indianapolis': 'US Eastern Standard Time',
+ 'America/Inuvik': 'Mountain Standard Time',
+ 'America/Iqaluit': 'Eastern Standard Time',
+ 'America/Jamaica': 'SA Pacific Standard Time',
+ 'America/Jujuy': 'Argentina Standard Time',
+ 'America/Juneau': 'Alaskan Standard Time',
+ 'America/Kentucky/Monticello': 'Eastern Standard Time',
+ 'America/Kralendijk': 'SA Western Standard Time',
+ 'America/La_Paz': 'SA Western Standard Time',
+ 'America/Lima': 'SA Pacific Standard Time',
+ 'America/Los_Angeles': 'Pacific Standard Time',
+ 'America/Louisville': 'Eastern Standard Time',
+ 'America/Lower_Princes': 'SA Western Standard Time',
+ 'America/Maceio': 'SA Eastern Standard Time',
+ 'America/Managua': 'Central America Standard Time',
+ 'America/Manaus': 'SA Western Standard Time',
+ 'America/Marigot': 'SA Western Standard Time',
+ 'America/Martinique': 'SA Western Standard Time',
+ 'America/Matamoros': 'Central Standard Time',
+ 'America/Mazatlan': 'Mountain Standard Time (Mexico)',
+ 'America/Mendoza': 'Argentina Standard Time',
+ 'America/Menominee': 'Central Standard Time',
+ 'America/Merida': 'Central Standard Time (Mexico)',
+ 'America/Mexico_City': 'Central Standard Time (Mexico)',
+ 'America/Moncton': 'Atlantic Standard Time',
+ 'America/Monterrey': 'Central Standard Time (Mexico)',
+ 'America/Montevideo': 'Montevideo Standard Time',
+ 'America/Montreal': 'Eastern Standard Time',
+ 'America/Montserrat': 'SA Western Standard Time',
+ 'America/Nassau': 'Eastern Standard Time',
+ 'America/New_York': 'Eastern Standard Time',
+ 'America/Nipigon': 'Eastern Standard Time',
+ 'America/Nome': 'Alaskan Standard Time',
+ 'America/Noronha': 'UTC-02',
+ 'America/North_Dakota/Beulah': 'Central Standard Time',
+ 'America/North_Dakota/Center': 'Central Standard Time',
+ 'America/North_Dakota/New_Salem': 'Central Standard Time',
+ 'America/Ojinaga': 'Mountain Standard Time',
+ 'America/Panama': 'SA Pacific Standard Time',
+ 'America/Pangnirtung': 'Eastern Standard Time',
+ 'America/Paramaribo': 'SA Eastern Standard Time',
+ 'America/Phoenix': 'US Mountain Standard Time',
+ 'America/Port-au-Prince': 'Eastern Standard Time',
+ 'America/Port_of_Spain': 'SA Western Standard Time',
+ 'America/Porto_Velho': 'SA Western Standard Time',
+ 'America/Puerto_Rico': 'SA Western Standard Time',
+ 'America/Rainy_River': 'Central Standard Time',
+ 'America/Rankin_Inlet': 'Central Standard Time',
+ 'America/Recife': 'SA Eastern Standard Time',
+ 'America/Regina': 'Canada Central Standard Time',
+ 'America/Resolute': 'Central Standard Time',
+ 'America/Rio_Branco': 'SA Pacific Standard Time',
+ 'America/Santa_Isabel': 'Pacific Standard Time (Mexico)',
+ 'America/Santarem': 'SA Eastern Standard Time',
+ 'America/Santiago': 'Pacific SA Standard Time',
+ 'America/Santo_Domingo': 'SA Western Standard Time',
+ 'America/Sao_Paulo': 'E. South America Standard Time',
+ 'America/Scoresbysund': 'Azores Standard Time',
+ 'America/Sitka': 'Alaskan Standard Time',
+ 'America/St_Barthelemy': 'SA Western Standard Time',
+ 'America/St_Johns': 'Newfoundland Standard Time',
+ 'America/St_Kitts': 'SA Western Standard Time',
+ 'America/St_Lucia': 'SA Western Standard Time',
+ 'America/St_Thomas': 'SA Western Standard Time',
+ 'America/St_Vincent': 'SA Western Standard Time',
+ 'America/Swift_Current': 'Canada Central Standard Time',
+ 'America/Tegucigalpa': 'Central America Standard Time',
+ 'America/Thule': 'Atlantic Standard Time',
+ 'America/Thunder_Bay': 'Eastern Standard Time',
+ 'America/Tijuana': 'Pacific Standard Time',
+ 'America/Toronto': 'Eastern Standard Time',
+ 'America/Tortola': 'SA Western Standard Time',
+ 'America/Vancouver': 'Pacific Standard Time',
+ 'America/Whitehorse': 'Pacific Standard Time',
+ 'America/Winnipeg': 'Central Standard Time',
+ 'America/Yakutat': 'Alaskan Standard Time',
+ 'America/Yellowknife': 'Mountain Standard Time',
+ 'Antarctica/Casey': 'W. Australia Standard Time',
+ 'Antarctica/Davis': 'SE Asia Standard Time',
+ 'Antarctica/DumontDUrville': 'West Pacific Standard Time',
+ 'Antarctica/Macquarie': 'Central Pacific Standard Time',
+ 'Antarctica/Mawson': 'West Asia Standard Time',
+ 'Antarctica/McMurdo': 'New Zealand Standard Time',
+ 'Antarctica/Palmer': 'Pacific SA Standard Time',
+ 'Antarctica/Rothera': 'SA Eastern Standard Time',
+ 'Antarctica/Syowa': 'E. Africa Standard Time',
+ 'Antarctica/Vostok': 'Central Asia Standard Time',
+ 'Arctic/Longyearbyen': 'W. Europe Standard Time',
+ 'Asia/Aden': 'Arab Standard Time',
+ 'Asia/Almaty': 'Central Asia Standard Time',
+ 'Asia/Amman': 'Jordan Standard Time',
+ 'Asia/Anadyr': 'Russia Time Zone 11',
+ 'Asia/Aqtau': 'West Asia Standard Time',
+ 'Asia/Aqtobe': 'West Asia Standard Time',
+ 'Asia/Ashgabat': 'West Asia Standard Time',
+ 'Asia/Baghdad': 'Arabic Standard Time',
+ 'Asia/Bahrain': 'Arab Standard Time',
+ 'Asia/Baku': 'Azerbaijan Standard Time',
+ 'Asia/Bangkok': 'SE Asia Standard Time',
+ 'Asia/Beirut': 'Middle East Standard Time',
+ 'Asia/Bishkek': 'Central Asia Standard Time',
+ 'Asia/Brunei': 'Singapore Standard Time',
+ 'Asia/Calcutta': 'India Standard Time',
+ 'Asia/Chita': 'North Asia East Standard Time',
+ 'Asia/Choibalsan': 'Ulaanbaatar Standard Time',
+ 'Asia/Colombo': 'Sri Lanka Standard Time',
+ 'Asia/Damascus': 'Syria Standard Time',
+ 'Asia/Dhaka': 'Bangladesh Standard Time',
+ 'Asia/Dili': 'Tokyo Standard Time',
+ 'Asia/Dubai': 'Arabian Standard Time',
+ 'Asia/Dushanbe': 'West Asia Standard Time',
+ 'Asia/Hong_Kong': 'China Standard Time',
+ 'Asia/Hovd': 'SE Asia Standard Time',
+ 'Asia/Irkutsk': 'North Asia East Standard Time',
+ 'Asia/Jakarta': 'SE Asia Standard Time',
+ 'Asia/Jayapura': 'Tokyo Standard Time',
+ 'Asia/Jerusalem': 'Israel Standard Time',
+ 'Asia/Kabul': 'Afghanistan Standard Time',
+ 'Asia/Kamchatka': 'Russia Time Zone 11',
+ 'Asia/Karachi': 'Pakistan Standard Time',
+ 'Asia/Katmandu': 'Nepal Standard Time',
+ 'Asia/Khandyga': 'Yakutsk Standard Time',
+ 'Asia/Krasnoyarsk': 'North Asia Standard Time',
+ 'Asia/Kuala_Lumpur': 'Singapore Standard Time',
+ 'Asia/Kuching': 'Singapore Standard Time',
+ 'Asia/Kuwait': 'Arab Standard Time',
+ 'Asia/Macau': 'China Standard Time',
+ 'Asia/Magadan': 'Magadan Standard Time',
+ 'Asia/Makassar': 'Singapore Standard Time',
+ 'Asia/Manila': 'Singapore Standard Time',
+ 'Asia/Muscat': 'Arabian Standard Time',
+ 'Asia/Nicosia': 'GTB Standard Time',
+ 'Asia/Novokuznetsk': 'North Asia Standard Time',
+ 'Asia/Novosibirsk': 'N. Central Asia Standard Time',
+ 'Asia/Omsk': 'N. Central Asia Standard Time',
+ 'Asia/Oral': 'West Asia Standard Time',
+ 'Asia/Phnom_Penh': 'SE Asia Standard Time',
+ 'Asia/Pontianak': 'SE Asia Standard Time',
+ 'Asia/Pyongyang': 'Korea Standard Time',
+ 'Asia/Qatar': 'Arab Standard Time',
+ 'Asia/Qyzylorda': 'Central Asia Standard Time',
+ 'Asia/Rangoon': 'Myanmar Standard Time',
+ 'Asia/Riyadh': 'Arab Standard Time',
+ 'Asia/Saigon': 'SE Asia Standard Time',
+ 'Asia/Sakhalin': 'Vladivostok Standard Time',
+ 'Asia/Samarkand': 'West Asia Standard Time',
+ 'Asia/Seoul': 'Korea Standard Time',
+ 'Asia/Shanghai': 'China Standard Time',
+ 'Asia/Singapore': 'Singapore Standard Time',
+ 'Asia/Srednekolymsk': 'Russia Time Zone 10',
+ 'Asia/Taipei': 'Taipei Standard Time',
+ 'Asia/Tashkent': 'West Asia Standard Time',
+ 'Asia/Tbilisi': 'Georgian Standard Time',
+ 'Asia/Tehran': 'Iran Standard Time',
+ 'Asia/Thimphu': 'Bangladesh Standard Time',
+ 'Asia/Tokyo': 'Tokyo Standard Time',
+ 'Asia/Ulaanbaatar': 'Ulaanbaatar Standard Time',
+ 'Asia/Urumqi': 'Central Asia Standard Time',
+ 'Asia/Ust-Nera': 'Vladivostok Standard Time',
+ 'Asia/Vientiane': 'SE Asia Standard Time',
+ 'Asia/Vladivostok': 'Vladivostok Standard Time',
+ 'Asia/Yakutsk': 'Yakutsk Standard Time',
+ 'Asia/Yekaterinburg': 'Ekaterinburg Standard Time',
+ 'Asia/Yerevan': 'Caucasus Standard Time',
+ 'Atlantic/Azores': 'Azores Standard Time',
+ 'Atlantic/Bermuda': 'Atlantic Standard Time',
+ 'Atlantic/Canary': 'GMT Standard Time',
+ 'Atlantic/Cape_Verde': 'Cape Verde Standard Time',
+ 'Atlantic/Faeroe': 'GMT Standard Time',
+ 'Atlantic/Madeira': 'GMT Standard Time',
+ 'Atlantic/Reykjavik': 'Greenwich Standard Time',
+ 'Atlantic/South_Georgia': 'UTC-02',
+ 'Atlantic/St_Helena': 'Greenwich Standard Time',
+ 'Atlantic/Stanley': 'SA Eastern Standard Time',
+ 'Australia/Adelaide': 'Cen. Australia Standard Time',
+ 'Australia/Brisbane': 'E. Australia Standard Time',
+ 'Australia/Broken_Hill': 'Cen. Australia Standard Time',
+ 'Australia/Currie': 'Tasmania Standard Time',
+ 'Australia/Darwin': 'AUS Central Standard Time',
+ 'Australia/Hobart': 'Tasmania Standard Time',
+ 'Australia/Lindeman': 'E. Australia Standard Time',
+ 'Australia/Melbourne': 'AUS Eastern Standard Time',
+ 'Australia/Perth': 'W. Australia Standard Time',
+ 'Australia/Sydney': 'AUS Eastern Standard Time',
+ 'CST6CDT': 'Central Standard Time',
+ 'EST5EDT': 'Eastern Standard Time',
+ 'Etc/GMT': 'UTC',
+ 'Etc/GMT+1': 'Cape Verde Standard Time',
+ 'Etc/GMT+10': 'Hawaiian Standard Time',
+ 'Etc/GMT+11': 'UTC-11',
+ 'Etc/GMT+12': 'Dateline Standard Time',
+ 'Etc/GMT+2': 'UTC-02',
+ 'Etc/GMT+3': 'SA Eastern Standard Time',
+ 'Etc/GMT+4': 'SA Western Standard Time',
+ 'Etc/GMT+5': 'SA Pacific Standard Time',
+ 'Etc/GMT+6': 'Central America Standard Time',
+ 'Etc/GMT+7': 'US Mountain Standard Time',
+ 'Etc/GMT-1': 'W. Central Africa Standard Time',
+ 'Etc/GMT-10': 'West Pacific Standard Time',
+ 'Etc/GMT-11': 'Central Pacific Standard Time',
+ 'Etc/GMT-12': 'UTC+12',
+ 'Etc/GMT-13': 'Tonga Standard Time',
+ 'Etc/GMT-14': 'Line Islands Standard Time',
+ 'Etc/GMT-2': 'South Africa Standard Time',
+ 'Etc/GMT-3': 'E. Africa Standard Time',
+ 'Etc/GMT-4': 'Arabian Standard Time',
+ 'Etc/GMT-5': 'West Asia Standard Time',
+ 'Etc/GMT-6': 'Central Asia Standard Time',
+ 'Etc/GMT-7': 'SE Asia Standard Time',
+ 'Etc/GMT-8': 'Singapore Standard Time',
+ 'Etc/GMT-9': 'Tokyo Standard Time',
+ 'Etc/UTC': 'UTC',
+ 'Europe/Amsterdam': 'W. Europe Standard Time',
+ 'Europe/Andorra': 'W. Europe Standard Time',
+ 'Europe/Athens': 'GTB Standard Time',
+ 'Europe/Belgrade': 'Central Europe Standard Time',
+ 'Europe/Berlin': 'W. Europe Standard Time',
+ 'Europe/Bratislava': 'Central Europe Standard Time',
+ 'Europe/Brussels': 'Romance Standard Time',
+ 'Europe/Bucharest': 'GTB Standard Time',
+ 'Europe/Budapest': 'Central Europe Standard Time',
+ 'Europe/Busingen': 'W. Europe Standard Time',
+ 'Europe/Chisinau': 'GTB Standard Time',
+ 'Europe/Copenhagen': 'Romance Standard Time',
+ 'Europe/Dublin': 'GMT Standard Time',
+ 'Europe/Gibraltar': 'W. Europe Standard Time',
+ 'Europe/Guernsey': 'GMT Standard Time',
+ 'Europe/Helsinki': 'FLE Standard Time',
+ 'Europe/Isle_of_Man': 'GMT Standard Time',
+ 'Europe/Istanbul': 'Turkey Standard Time',
+ 'Europe/Jersey': 'GMT Standard Time',
+ 'Europe/Kaliningrad': 'Kaliningrad Standard Time',
+ 'Europe/Kiev': 'FLE Standard Time',
+ 'Europe/Lisbon': 'GMT Standard Time',
+ 'Europe/Ljubljana': 'Central Europe Standard Time',
+ 'Europe/London': 'GMT Standard Time',
+ 'Europe/Luxembourg': 'W. Europe Standard Time',
+ 'Europe/Madrid': 'Romance Standard Time',
+ 'Europe/Malta': 'W. Europe Standard Time',
+ 'Europe/Mariehamn': 'FLE Standard Time',
+ 'Europe/Minsk': 'Belarus Standard Time',
+ 'Europe/Monaco': 'W. Europe Standard Time',
+ 'Europe/Moscow': 'Russian Standard Time',
+ 'Europe/Oslo': 'W. Europe Standard Time',
+ 'Europe/Paris': 'Romance Standard Time',
+ 'Europe/Podgorica': 'Central Europe Standard Time',
+ 'Europe/Prague': 'Central Europe Standard Time',
+ 'Europe/Riga': 'FLE Standard Time',
+ 'Europe/Rome': 'W. Europe Standard Time',
+ 'Europe/Samara': 'Russia Time Zone 3',
+ 'Europe/San_Marino': 'W. Europe Standard Time',
+ 'Europe/Sarajevo': 'Central European Standard Time',
+ 'Europe/Simferopol': 'Russian Standard Time',
+ 'Europe/Skopje': 'Central European Standard Time',
+ 'Europe/Sofia': 'FLE Standard Time',
+ 'Europe/Stockholm': 'W. Europe Standard Time',
+ 'Europe/Tallinn': 'FLE Standard Time',
+ 'Europe/Tirane': 'Central Europe Standard Time',
+ 'Europe/Uzhgorod': 'FLE Standard Time',
+ 'Europe/Vaduz': 'W. Europe Standard Time',
+ 'Europe/Vatican': 'W. Europe Standard Time',
+ 'Europe/Vienna': 'W. Europe Standard Time',
+ 'Europe/Vilnius': 'FLE Standard Time',
+ 'Europe/Volgograd': 'Russian Standard Time',
+ 'Europe/Warsaw': 'Central European Standard Time',
+ 'Europe/Zagreb': 'Central European Standard Time',
+ 'Europe/Zaporozhye': 'FLE Standard Time',
+ 'Europe/Zurich': 'W. Europe Standard Time',
+ 'Indian/Antananarivo': 'E. Africa Standard Time',
+ 'Indian/Chagos': 'Central Asia Standard Time',
+ 'Indian/Christmas': 'SE Asia Standard Time',
+ 'Indian/Cocos': 'Myanmar Standard Time',
+ 'Indian/Comoro': 'E. Africa Standard Time',
+ 'Indian/Kerguelen': 'West Asia Standard Time',
+ 'Indian/Mahe': 'Mauritius Standard Time',
+ 'Indian/Maldives': 'West Asia Standard Time',
+ 'Indian/Mauritius': 'Mauritius Standard Time',
+ 'Indian/Mayotte': 'E. Africa Standard Time',
+ 'Indian/Reunion': 'Mauritius Standard Time',
+ 'MST7MDT': 'Mountain Standard Time',
+ 'PST8PDT': 'Pacific Standard Time',
+ 'Pacific/Apia': 'Samoa Standard Time',
+ 'Pacific/Auckland': 'New Zealand Standard Time',
+ 'Pacific/Efate': 'Central Pacific Standard Time',
+ 'Pacific/Enderbury': 'Tonga Standard Time',
+ 'Pacific/Fakaofo': 'Tonga Standard Time',
+ 'Pacific/Fiji': 'Fiji Standard Time',
+ 'Pacific/Funafuti': 'UTC+12',
+ 'Pacific/Galapagos': 'Central America Standard Time',
+ 'Pacific/Guadalcanal': 'Central Pacific Standard Time',
+ 'Pacific/Guam': 'West Pacific Standard Time',
+ 'Pacific/Honolulu': 'Hawaiian Standard Time',
+ 'Pacific/Johnston': 'Hawaiian Standard Time',
+ 'Pacific/Kiritimati': 'Line Islands Standard Time',
+ 'Pacific/Kosrae': 'Central Pacific Standard Time',
+ 'Pacific/Kwajalein': 'UTC+12',
+ 'Pacific/Majuro': 'UTC+12',
+ 'Pacific/Midway': 'UTC-11',
+ 'Pacific/Nauru': 'UTC+12',
+ 'Pacific/Niue': 'UTC-11',
+ 'Pacific/Noumea': 'Central Pacific Standard Time',
+ 'Pacific/Pago_Pago': 'UTC-11',
+ 'Pacific/Palau': 'Tokyo Standard Time',
+ 'Pacific/Ponape': 'Central Pacific Standard Time',
+ 'Pacific/Port_Moresby': 'West Pacific Standard Time',
+ 'Pacific/Rarotonga': 'Hawaiian Standard Time',
+ 'Pacific/Saipan': 'West Pacific Standard Time',
+ 'Pacific/Tahiti': 'Hawaiian Standard Time',
+ 'Pacific/Tarawa': 'UTC+12',
+ 'Pacific/Tongatapu': 'Tonga Standard Time',
+ 'Pacific/Truk': 'West Pacific Standard Time',
+ 'Pacific/Wake': 'UTC+12',
+ 'Pacific/Wallis': 'UTC+12'}
diff --git a/lib/unidecode/LICENSE b/lib/unidecode/LICENSE
new file mode 100644
index 00000000..d159169d
--- /dev/null
+++ b/lib/unidecode/LICENSE
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 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.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/lib/unidecode/README b/lib/unidecode/README
new file mode 100644
index 00000000..8d7bfd4b
--- /dev/null
+++ b/lib/unidecode/README
@@ -0,0 +1,134 @@
+Unidecode, lossy ASCII transliterations of Unicode text
+=======================================================
+
+It often happens that you have text data in Unicode, but you need to
+represent it in ASCII. For example when integrating with legacy code that
+doesn't support Unicode, or for ease of entry of non-Roman names on a US
+keyboard, or when constructing ASCII machine identifiers from
+human-readable Unicode strings that should still be somewhat intelligeble
+(a popular example of this is when making an URL slug from an article
+title). 
+
+In most of these examples you could represent Unicode characters as
+"???" or "\\15BA\\15A0\\1610", to mention two extreme cases. But that's
+nearly useless to someone who actually wants to read what the text says.
+
+What Unidecode provides is a middle road: function unidecode() takes
+Unicode data and tries to represent it in ASCII characters (i.e., the
+universally displayable characters between 0x00 and 0x7F), where the
+compromises taken when mapping between two character sets are chosen to be
+near what a human with a US keyboard would choose.
+
+The quality of resulting ASCII representation varies. For languages of
+western origin it should be between perfect and good. On the other hand
+transliteration (i.e., conveying, in Roman letters, the pronunciation
+expressed by the text in some other writing system) of languages like
+Chinese, Japanese or Korean is a very complex issue and this library does
+not even attempt to address it. It draws the line at context-free
+character-by-character mapping. So a good rule of thumb is that the further
+the script you are transliterating is from Latin alphabet, the worse the
+transliteration will be.
+
+Note that this module generally produces better results than simply
+stripping accents from characters (which can be done in Python with
+built-in functions). It is based on hand-tuned character mappings that for
+example also contain ASCII approximations for symbols and non-Latin
+alphabets.
+
+This is a Python port of Text::Unidecode Perl module by
+Sean M. Burke <sburke@cpan.org>.
+
+
+Module content
+--------------
+
+The module exports a single function that takes an Unicode object (Python
+2.x) or string (Python 3.x) and returns a string (that can be encoded to
+ASCII bytes in Python 3.x)::
+
+    >>> from unidecode import unidecode
+    >>> unidecode(u'ko\u017eu\u0161\u010dek')
+    'kozuscek'
+    >>> unidecode(u'30 \U0001d5c4\U0001d5c6/\U0001d5c1')
+    '30 km/h'
+    >>> unidecode(u"\u5317\u4EB0")
+    'Bei Jing '
+
+
+Requirements
+------------
+
+Nothing except Python itself.
+    
+You need a Python build with "wide" Unicode characters (also called "UCS-4
+build") in order for unidecode to work correctly with characters outside of
+Basic Multilingual Plane (BMP). Common characters outside BMP are bold, italic,
+script, etc. variants of the Latin alphabet intended for mathematical notation.
+Surrogate pair encoding of "narrow" builds is not supported in unidecode.
+
+If your Python build supports "wide" Unicode the following expression will
+return True::
+
+    >>> import sys
+    >>> sys.maxunicode > 0xffff
+    True
+
+See PEP 261 for details regarding support for "wide" Unicode characters in
+Python.
+
+
+Installation
+------------
+
+You install Unidecode, as you would install any Python module, by running
+these commands::
+
+    python setup.py install
+    python setup.py test
+
+
+Source
+------
+
+You can get the latest development version of Unidecode with::
+
+    git clone https://www.tablix.org/~avian/git/unidecode.git
+
+
+Support
+-------
+
+Questions, bug reports, useful code bits, and suggestions for Unidecode
+should be sent to tomaz.solc@tablix.org
+
+
+Copyright
+---------
+
+Original character transliteration tables:
+
+Copyright 2001, Sean M. Burke <sburke@cpan.org>, all rights reserved.
+
+Python code and later additions:
+
+Copyright 2014, Tomaz Solc <tomaz.solc@tablix.org>
+
+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.  The programs and
+documentation in this dist are distributed in the hope that they will be
+useful, but without any warranty; without even the implied warranty of
+merchantability or fitness for a particular purpose.
+
+..
+    vim: set filetype=rst:
diff --git a/lib/unidecode/__init__.py b/lib/unidecode/__init__.py
new file mode 100644
index 00000000..ac5b86d9
--- /dev/null
+++ b/lib/unidecode/__init__.py
@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+# vi:tabstop=4:expandtab:sw=4
+"""Transliterate Unicode text into plain 7-bit ASCII.
+
+Example usage:
+>>> from unidecode import unidecode:
+>>> unidecode(u"\u5317\u4EB0")
+"Bei Jing "
+
+The transliteration uses a straightforward map, and doesn't have alternatives
+for the same character based on language, position, or anything else.
+
+In Python 3, a standard string object will be returned. If you need bytes, use:
+>>> unidecode("Κνωσός").encode("ascii")
+b'Knosos'
+"""
+import warnings
+from sys import version_info
+
+Cache = {}
+
+def unidecode(string):
+    """Transliterate an Unicode object into an ASCII string
+
+    >>> unidecode(u"\u5317\u4EB0")
+    "Bei Jing "
+    """
+
+    if version_info[0] < 3 and not isinstance(string, unicode):
+        warnings.warn(  "Argument %r is not an unicode object. "
+                        "Passing an encoded string will likely have "
+                        "unexpected results." % (type(string),),
+			RuntimeWarning, 2)
+
+    retval = []
+
+    for char in string:
+        codepoint = ord(char)
+
+        if codepoint < 0x80: # Basic ASCII
+            retval.append(str(char))
+            continue
+        
+        if codepoint > 0xeffff:
+            continue # Characters in Private Use Area and above are ignored
+
+        if 0xd800 <= codepoint <= 0xdfff:
+            warnings.warn(  "Surrogate character %r will be ignored. "
+                            "You might be using a narrow Python build." % (char,),
+                            RuntimeWarning, 2)
+
+        section = codepoint >> 8   # Chop off the last two hex digits
+        position = codepoint % 256 # Last two hex digits
+
+        try:
+            table = Cache[section]
+        except KeyError:
+            try:
+                mod = __import__('unidecode.x%03x'%(section), globals(), locals(), ['data'])
+            except ImportError:
+                Cache[section] = None
+                continue   # No match: ignore this character and carry on.
+
+            Cache[section] = table = mod.data
+
+        if table and len(table) > position:
+            retval.append( table[position] )
+
+    return ''.join(retval)
diff --git a/lib/unidecode/x000.py b/lib/unidecode/x000.py
new file mode 100644
index 00000000..c3f8f515
--- /dev/null
+++ b/lib/unidecode/x000.py
@@ -0,0 +1,165 @@
+data = (
+# Code points u+007f and below are equivalent to ASCII and are handled by a
+# special case in the code. Hence they are not present in this table.
+'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+'', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+
+'',    # 0x80
+'',    # 0x81
+'',    # 0x82
+'',    # 0x83
+'',    # 0x84
+'',    # 0x85
+'',    # 0x86
+'',    # 0x87
+'',    # 0x88
+'',    # 0x89
+'',    # 0x8a
+'',    # 0x8b
+'',    # 0x8c
+'',    # 0x8d
+'',    # 0x8e
+'',    # 0x8f
+'',    # 0x90
+'',    # 0x91
+'',    # 0x92
+'',    # 0x93
+'',    # 0x94
+'',    # 0x95
+'',    # 0x96
+'',    # 0x97
+'',    # 0x98
+'',    # 0x99
+'',    # 0x9a
+'',    # 0x9b
+'',    # 0x9c
+'',    # 0x9d
+'',    # 0x9e
+'',    # 0x9f
+' ',    # 0xa0
+'!',    # 0xa1
+'C/',    # 0xa2
+
+# Not "GBP" - Pound Sign is used for more than just British Pounds.
+'PS',    # 0xa3
+
+'$?',    # 0xa4
+'Y=',    # 0xa5
+'|',    # 0xa6
+'SS',    # 0xa7
+'"',    # 0xa8
+'(c)',    # 0xa9
+'a',    # 0xaa
+'<<',    # 0xab
+'!',    # 0xac
+'',    # 0xad
+'(r)',    # 0xae
+'-',    # 0xaf
+'deg',    # 0xb0
+'+-',    # 0xb1
+
+# These might be combined with other superscript digits (u+2070 - u+2079)
+'2',    # 0xb2
+'3',    # 0xb3
+
+'\'',    # 0xb4
+'u',    # 0xb5
+'P',    # 0xb6
+'*',    # 0xb7
+',',    # 0xb8
+'1',    # 0xb9
+'o',    # 0xba
+'>>',    # 0xbb
+'1/4',    # 0xbc
+'1/2',    # 0xbd
+'3/4',    # 0xbe
+'?',    # 0xbf
+'A',    # 0xc0
+'A',    # 0xc1
+'A',    # 0xc2
+'A',    # 0xc3
+
+# Not "AE" - used in languages other than German
+'A',    # 0xc4
+
+'A',    # 0xc5
+'AE',    # 0xc6
+'C',    # 0xc7
+'E',    # 0xc8
+'E',    # 0xc9
+'E',    # 0xca
+'E',    # 0xcb
+'I',    # 0xcc
+'I',    # 0xcd
+'I',    # 0xce
+'I',    # 0xcf
+'D',    # 0xd0
+'N',    # 0xd1
+'O',    # 0xd2
+'O',    # 0xd3
+'O',    # 0xd4
+'O',    # 0xd5
+
+# Not "OE" - used in languages other than German
+'O',    # 0xd6
+
+'x',    # 0xd7
+'O',    # 0xd8
+'U',    # 0xd9
+'U',    # 0xda
+'U',    # 0xdb
+
+# Not "UE" - used in languages other than German
+'U',    # 0xdc
+
+'Y',    # 0xdd
+'Th',    # 0xde
+'ss',    # 0xdf
+'a',    # 0xe0
+'a',    # 0xe1
+'a',    # 0xe2
+'a',    # 0xe3
+
+# Not "ae" - used in languages other than German
+'a',    # 0xe4
+
+'a',    # 0xe5
+'ae',    # 0xe6
+'c',    # 0xe7
+'e',    # 0xe8
+'e',    # 0xe9
+'e',    # 0xea
+'e',    # 0xeb
+'i',    # 0xec
+'i',    # 0xed
+'i',    # 0xee
+'i',    # 0xef
+'d',    # 0xf0
+'n',    # 0xf1
+'o',    # 0xf2
+'o',    # 0xf3
+'o',    # 0xf4
+'o',    # 0xf5
+
+# Not "oe" - used in languages other than German
+'o',    # 0xf6
+
+'/',    # 0xf7
+'o',    # 0xf8
+'u',    # 0xf9
+'u',    # 0xfa
+'u',    # 0xfb
+
+# Not "ue" - used in languages other than German
+'u',    # 0xfc
+
+'y',    # 0xfd
+'th',    # 0xfe
+'y',    # 0xff
+)
diff --git a/lib/unidecode/x001.py b/lib/unidecode/x001.py
new file mode 100644
index 00000000..212c2d1a
--- /dev/null
+++ b/lib/unidecode/x001.py
@@ -0,0 +1,258 @@
+data = (
+'A',    # 0x00
+'a',    # 0x01
+'A',    # 0x02
+'a',    # 0x03
+'A',    # 0x04
+'a',    # 0x05
+'C',    # 0x06
+'c',    # 0x07
+'C',    # 0x08
+'c',    # 0x09
+'C',    # 0x0a
+'c',    # 0x0b
+'C',    # 0x0c
+'c',    # 0x0d
+'D',    # 0x0e
+'d',    # 0x0f
+'D',    # 0x10
+'d',    # 0x11
+'E',    # 0x12
+'e',    # 0x13
+'E',    # 0x14
+'e',    # 0x15
+'E',    # 0x16
+'e',    # 0x17
+'E',    # 0x18
+'e',    # 0x19
+'E',    # 0x1a
+'e',    # 0x1b
+'G',    # 0x1c
+'g',    # 0x1d
+'G',    # 0x1e
+'g',    # 0x1f
+'G',    # 0x20
+'g',    # 0x21
+'G',    # 0x22
+'g',    # 0x23
+'H',    # 0x24
+'h',    # 0x25
+'H',    # 0x26
+'h',    # 0x27
+'I',    # 0x28
+'i',    # 0x29
+'I',    # 0x2a
+'i',    # 0x2b
+'I',    # 0x2c
+'i',    # 0x2d
+'I',    # 0x2e
+'i',    # 0x2f
+'I',    # 0x30
+'i',    # 0x31
+'IJ',    # 0x32
+'ij',    # 0x33
+'J',    # 0x34
+'j',    # 0x35
+'K',    # 0x36
+'k',    # 0x37
+'k',    # 0x38
+'L',    # 0x39
+'l',    # 0x3a
+'L',    # 0x3b
+'l',    # 0x3c
+'L',    # 0x3d
+'l',    # 0x3e
+'L',    # 0x3f
+'l',    # 0x40
+'L',    # 0x41
+'l',    # 0x42
+'N',    # 0x43
+'n',    # 0x44
+'N',    # 0x45
+'n',    # 0x46
+'N',    # 0x47
+'n',    # 0x48
+'\'n',    # 0x49
+'ng',    # 0x4a
+'NG',    # 0x4b
+'O',    # 0x4c
+'o',    # 0x4d
+'O',    # 0x4e
+'o',    # 0x4f
+'O',    # 0x50
+'o',    # 0x51
+'OE',    # 0x52
+'oe',    # 0x53
+'R',    # 0x54
+'r',    # 0x55
+'R',    # 0x56
+'r',    # 0x57
+'R',    # 0x58
+'r',    # 0x59
+'S',    # 0x5a
+'s',    # 0x5b
+'S',    # 0x5c
+'s',    # 0x5d
+'S',    # 0x5e
+'s',    # 0x5f
+'S',    # 0x60
+'s',    # 0x61
+'T',    # 0x62
+'t',    # 0x63
+'T',    # 0x64
+'t',    # 0x65
+'T',    # 0x66
+'t',    # 0x67
+'U',    # 0x68
+'u',    # 0x69
+'U',    # 0x6a
+'u',    # 0x6b
+'U',    # 0x6c
+'u',    # 0x6d
+'U',    # 0x6e
+'u',    # 0x6f
+'U',    # 0x70
+'u',    # 0x71
+'U',    # 0x72
+'u',    # 0x73
+'W',    # 0x74
+'w',    # 0x75
+'Y',    # 0x76
+'y',    # 0x77
+'Y',    # 0x78
+'Z',    # 0x79
+'z',    # 0x7a
+'Z',    # 0x7b
+'z',    # 0x7c
+'Z',    # 0x7d
+'z',    # 0x7e
+'s',    # 0x7f
+'b',    # 0x80
+'B',    # 0x81
+'B',    # 0x82
+'b',    # 0x83
+'6',    # 0x84
+'6',    # 0x85
+'O',    # 0x86
+'C',    # 0x87
+'c',    # 0x88
+'D',    # 0x89
+'D',    # 0x8a
+'D',    # 0x8b
+'d',    # 0x8c
+'d',    # 0x8d
+'3',    # 0x8e
+'@',    # 0x8f
+'E',    # 0x90
+'F',    # 0x91
+'f',    # 0x92
+'G',    # 0x93
+'G',    # 0x94
+'hv',    # 0x95
+'I',    # 0x96
+'I',    # 0x97
+'K',    # 0x98
+'k',    # 0x99
+'l',    # 0x9a
+'l',    # 0x9b
+'W',    # 0x9c
+'N',    # 0x9d
+'n',    # 0x9e
+'O',    # 0x9f
+'O',    # 0xa0
+'o',    # 0xa1
+'OI',    # 0xa2
+'oi',    # 0xa3
+'P',    # 0xa4
+'p',    # 0xa5
+'YR',    # 0xa6
+'2',    # 0xa7
+'2',    # 0xa8
+'SH',    # 0xa9
+'sh',    # 0xaa
+'t',    # 0xab
+'T',    # 0xac
+'t',    # 0xad
+'T',    # 0xae
+'U',    # 0xaf
+'u',    # 0xb0
+'Y',    # 0xb1
+'V',    # 0xb2
+'Y',    # 0xb3
+'y',    # 0xb4
+'Z',    # 0xb5
+'z',    # 0xb6
+'ZH',    # 0xb7
+'ZH',    # 0xb8
+'zh',    # 0xb9
+'zh',    # 0xba
+'2',    # 0xbb
+'5',    # 0xbc
+'5',    # 0xbd
+'ts',    # 0xbe
+'w',    # 0xbf
+'|',    # 0xc0
+'||',    # 0xc1
+'|=',    # 0xc2
+'!',    # 0xc3
+'DZ',    # 0xc4
+'Dz',    # 0xc5
+'dz',    # 0xc6
+'LJ',    # 0xc7
+'Lj',    # 0xc8
+'lj',    # 0xc9
+'NJ',    # 0xca
+'Nj',    # 0xcb
+'nj',    # 0xcc
+'A',    # 0xcd
+'a',    # 0xce
+'I',    # 0xcf
+'i',    # 0xd0
+'O',    # 0xd1
+'o',    # 0xd2
+'U',    # 0xd3
+'u',    # 0xd4
+'U',    # 0xd5
+'u',    # 0xd6
+'U',    # 0xd7
+'u',    # 0xd8
+'U',    # 0xd9
+'u',    # 0xda
+'U',    # 0xdb
+'u',    # 0xdc
+'@',    # 0xdd
+'A',    # 0xde
+'a',    # 0xdf
+'A',    # 0xe0
+'a',    # 0xe1
+'AE',    # 0xe2
+'ae',    # 0xe3
+'G',    # 0xe4
+'g',    # 0xe5
+'G',    # 0xe6
+'g',    # 0xe7
+'K',    # 0xe8
+'k',    # 0xe9
+'O',    # 0xea
+'o',    # 0xeb
+'O',    # 0xec
+'o',    # 0xed
+'ZH',    # 0xee
+'zh',    # 0xef
+'j',    # 0xf0
+'DZ',    # 0xf1
+'Dz',    # 0xf2
+'dz',    # 0xf3
+'G',    # 0xf4
+'g',    # 0xf5
+'HV',    # 0xf6
+'W',    # 0xf7
+'N',    # 0xf8
+'n',    # 0xf9
+'A',    # 0xfa
+'a',    # 0xfb
+'AE',    # 0xfc
+'ae',    # 0xfd
+'O',    # 0xfe
+'o',    # 0xff
+)
diff --git a/lib/unidecode/x002.py b/lib/unidecode/x002.py
new file mode 100644
index 00000000..ea45441e
--- /dev/null
+++ b/lib/unidecode/x002.py
@@ -0,0 +1,257 @@
+data = (
+'A',    # 0x00
+'a',    # 0x01
+'A',    # 0x02
+'a',    # 0x03
+'E',    # 0x04
+'e',    # 0x05
+'E',    # 0x06
+'e',    # 0x07
+'I',    # 0x08
+'i',    # 0x09
+'I',    # 0x0a
+'i',    # 0x0b
+'O',    # 0x0c
+'o',    # 0x0d
+'O',    # 0x0e
+'o',    # 0x0f
+'R',    # 0x10
+'r',    # 0x11
+'R',    # 0x12
+'r',    # 0x13
+'U',    # 0x14
+'u',    # 0x15
+'U',    # 0x16
+'u',    # 0x17
+'S',    # 0x18
+'s',    # 0x19
+'T',    # 0x1a
+'t',    # 0x1b
+'Y',    # 0x1c
+'y',    # 0x1d
+'H',    # 0x1e
+'h',    # 0x1f
+'N',    # 0x20
+'d',    # 0x21
+'OU',    # 0x22
+'ou',    # 0x23
+'Z',    # 0x24
+'z',    # 0x25
+'A',    # 0x26
+'a',    # 0x27
+'E',    # 0x28
+'e',    # 0x29
+'O',    # 0x2a
+'o',    # 0x2b
+'O',    # 0x2c
+'o',    # 0x2d
+'O',    # 0x2e
+'o',    # 0x2f
+'O',    # 0x30
+'o',    # 0x31
+'Y',    # 0x32
+'y',    # 0x33
+'l',    # 0x34
+'n',    # 0x35
+'t',    # 0x36
+'j',    # 0x37
+'db',    # 0x38
+'qp',    # 0x39
+'A',    # 0x3a
+'C',    # 0x3b
+'c',    # 0x3c
+'L',    # 0x3d
+'T',    # 0x3e
+'s',    # 0x3f
+'z',    # 0x40
+'[?]',    # 0x41
+'[?]',    # 0x42
+'B',    # 0x43
+'U',    # 0x44
+'^',    # 0x45
+'E',    # 0x46
+'e',    # 0x47
+'J',    # 0x48
+'j',    # 0x49
+'q',    # 0x4a
+'q',    # 0x4b
+'R',    # 0x4c
+'r',    # 0x4d
+'Y',    # 0x4e
+'y',    # 0x4f
+'a',    # 0x50
+'a',    # 0x51
+'a',    # 0x52
+'b',    # 0x53
+'o',    # 0x54
+'c',    # 0x55
+'d',    # 0x56
+'d',    # 0x57
+'e',    # 0x58
+'@',    # 0x59
+'@',    # 0x5a
+'e',    # 0x5b
+'e',    # 0x5c
+'e',    # 0x5d
+'e',    # 0x5e
+'j',    # 0x5f
+'g',    # 0x60
+'g',    # 0x61
+'g',    # 0x62
+'g',    # 0x63
+'u',    # 0x64
+'Y',    # 0x65
+'h',    # 0x66
+'h',    # 0x67
+'i',    # 0x68
+'i',    # 0x69
+'I',    # 0x6a
+'l',    # 0x6b
+'l',    # 0x6c
+'l',    # 0x6d
+'lZ',    # 0x6e
+'W',    # 0x6f
+'W',    # 0x70
+'m',    # 0x71
+'n',    # 0x72
+'n',    # 0x73
+'n',    # 0x74
+'o',    # 0x75
+'OE',    # 0x76
+'O',    # 0x77
+'F',    # 0x78
+'r',    # 0x79
+'r',    # 0x7a
+'r',    # 0x7b
+'r',    # 0x7c
+'r',    # 0x7d
+'r',    # 0x7e
+'r',    # 0x7f
+'R',    # 0x80
+'R',    # 0x81
+'s',    # 0x82
+'S',    # 0x83
+'j',    # 0x84
+'S',    # 0x85
+'S',    # 0x86
+'t',    # 0x87
+'t',    # 0x88
+'u',    # 0x89
+'U',    # 0x8a
+'v',    # 0x8b
+'^',    # 0x8c
+'w',    # 0x8d
+'y',    # 0x8e
+'Y',    # 0x8f
+'z',    # 0x90
+'z',    # 0x91
+'Z',    # 0x92
+'Z',    # 0x93
+'?',    # 0x94
+'?',    # 0x95
+'?',    # 0x96
+'C',    # 0x97
+'@',    # 0x98
+'B',    # 0x99
+'E',    # 0x9a
+'G',    # 0x9b
+'H',    # 0x9c
+'j',    # 0x9d
+'k',    # 0x9e
+'L',    # 0x9f
+'q',    # 0xa0
+'?',    # 0xa1
+'?',    # 0xa2
+'dz',    # 0xa3
+'dZ',    # 0xa4
+'dz',    # 0xa5
+'ts',    # 0xa6
+'tS',    # 0xa7
+'tC',    # 0xa8
+'fN',    # 0xa9
+'ls',    # 0xaa
+'lz',    # 0xab
+'WW',    # 0xac
+']]',    # 0xad
+'h',    # 0xae
+'h',    # 0xaf
+'k',    # 0xb0
+'h',    # 0xb1
+'j',    # 0xb2
+'r',    # 0xb3
+'r',    # 0xb4
+'r',    # 0xb5
+'r',    # 0xb6
+'w',    # 0xb7
+'y',    # 0xb8
+'\'',    # 0xb9
+'"',    # 0xba
+'`',    # 0xbb
+'\'',    # 0xbc
+'`',    # 0xbd
+'`',    # 0xbe
+'\'',    # 0xbf
+'?',    # 0xc0
+'?',    # 0xc1
+'<',    # 0xc2
+'>',    # 0xc3
+'^',    # 0xc4
+'V',    # 0xc5
+'^',    # 0xc6
+'V',    # 0xc7
+'\'',    # 0xc8
+'-',    # 0xc9
+'/',    # 0xca
+'\\',    # 0xcb
+',',    # 0xcc
+'_',    # 0xcd
+'\\',    # 0xce
+'/',    # 0xcf
+':',    # 0xd0
+'.',    # 0xd1
+'`',    # 0xd2
+'\'',    # 0xd3
+'^',    # 0xd4
+'V',    # 0xd5
+'+',    # 0xd6
+'-',    # 0xd7
+'V',    # 0xd8
+'.',    # 0xd9
+'@',    # 0xda
+',',    # 0xdb
+'~',    # 0xdc
+'"',    # 0xdd
+'R',    # 0xde
+'X',    # 0xdf
+'G',    # 0xe0
+'l',    # 0xe1
+'s',    # 0xe2
+'x',    # 0xe3
+'?',    # 0xe4
+'',    # 0xe5
+'',    # 0xe6
+'',    # 0xe7
+'',    # 0xe8
+'',    # 0xe9
+'',    # 0xea
+'',    # 0xeb
+'V',    # 0xec
+'=',    # 0xed
+'"',    # 0xee
+'[?]',    # 0xef
+'[?]',    # 0xf0
+'[?]',    # 0xf1
+'[?]',    # 0xf2
+'[?]',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x003.py b/lib/unidecode/x003.py
new file mode 100644
index 00000000..4ba8d726
--- /dev/null
+++ b/lib/unidecode/x003.py
@@ -0,0 +1,257 @@
+data = (
+'',    # 0x00
+'',    # 0x01
+'',    # 0x02
+'',    # 0x03
+'',    # 0x04
+'',    # 0x05
+'',    # 0x06
+'',    # 0x07
+'',    # 0x08
+'',    # 0x09
+'',    # 0x0a
+'',    # 0x0b
+'',    # 0x0c
+'',    # 0x0d
+'',    # 0x0e
+'',    # 0x0f
+'',    # 0x10
+'',    # 0x11
+'',    # 0x12
+'',    # 0x13
+'',    # 0x14
+'',    # 0x15
+'',    # 0x16
+'',    # 0x17
+'',    # 0x18
+'',    # 0x19
+'',    # 0x1a
+'',    # 0x1b
+'',    # 0x1c
+'',    # 0x1d
+'',    # 0x1e
+'',    # 0x1f
+'',    # 0x20
+'',    # 0x21
+'',    # 0x22
+'',    # 0x23
+'',    # 0x24
+'',    # 0x25
+'',    # 0x26
+'',    # 0x27
+'',    # 0x28
+'',    # 0x29
+'',    # 0x2a
+'',    # 0x2b
+'',    # 0x2c
+'',    # 0x2d
+'',    # 0x2e
+'',    # 0x2f
+'',    # 0x30
+'',    # 0x31
+'',    # 0x32
+'',    # 0x33
+'',    # 0x34
+'',    # 0x35
+'',    # 0x36
+'',    # 0x37
+'',    # 0x38
+'',    # 0x39
+'',    # 0x3a
+'',    # 0x3b
+'',    # 0x3c
+'',    # 0x3d
+'',    # 0x3e
+'',    # 0x3f
+'',    # 0x40
+'',    # 0x41
+'',    # 0x42
+'',    # 0x43
+'',    # 0x44
+'',    # 0x45
+'',    # 0x46
+'',    # 0x47
+'',    # 0x48
+'',    # 0x49
+'',    # 0x4a
+'',    # 0x4b
+'',    # 0x4c
+'',    # 0x4d
+'',    # 0x4e
+'[?]',    # 0x4f
+'[?]',    # 0x50
+'[?]',    # 0x51
+'[?]',    # 0x52
+'[?]',    # 0x53
+'[?]',    # 0x54
+'[?]',    # 0x55
+'[?]',    # 0x56
+'[?]',    # 0x57
+'[?]',    # 0x58
+'[?]',    # 0x59
+'[?]',    # 0x5a
+'[?]',    # 0x5b
+'[?]',    # 0x5c
+'[?]',    # 0x5d
+'[?]',    # 0x5e
+'[?]',    # 0x5f
+'',    # 0x60
+'',    # 0x61
+'',    # 0x62
+'a',    # 0x63
+'e',    # 0x64
+'i',    # 0x65
+'o',    # 0x66
+'u',    # 0x67
+'c',    # 0x68
+'d',    # 0x69
+'h',    # 0x6a
+'m',    # 0x6b
+'r',    # 0x6c
+'t',    # 0x6d
+'v',    # 0x6e
+'x',    # 0x6f
+'[?]',    # 0x70
+'[?]',    # 0x71
+'[?]',    # 0x72
+'[?]',    # 0x73
+'\'',    # 0x74
+',',    # 0x75
+'[?]',    # 0x76
+'[?]',    # 0x77
+'[?]',    # 0x78
+'[?]',    # 0x79
+'',    # 0x7a
+'[?]',    # 0x7b
+'[?]',    # 0x7c
+'[?]',    # 0x7d
+'?',    # 0x7e
+'[?]',    # 0x7f
+'[?]',    # 0x80
+'[?]',    # 0x81
+'[?]',    # 0x82
+'[?]',    # 0x83
+'',    # 0x84
+'',    # 0x85
+'A',    # 0x86
+';',    # 0x87
+'E',    # 0x88
+'E',    # 0x89
+'I',    # 0x8a
+'[?]',    # 0x8b
+'O',    # 0x8c
+'[?]',    # 0x8d
+'U',    # 0x8e
+'O',    # 0x8f
+'I',    # 0x90
+'A',    # 0x91
+'B',    # 0x92
+'G',    # 0x93
+'D',    # 0x94
+'E',    # 0x95
+'Z',    # 0x96
+'E',    # 0x97
+'Th',    # 0x98
+'I',    # 0x99
+'K',    # 0x9a
+'L',    # 0x9b
+'M',    # 0x9c
+'N',    # 0x9d
+'Ks',    # 0x9e
+'O',    # 0x9f
+'P',    # 0xa0
+'R',    # 0xa1
+'[?]',    # 0xa2
+'S',    # 0xa3
+'T',    # 0xa4
+'U',    # 0xa5
+'Ph',    # 0xa6
+'Kh',    # 0xa7
+'Ps',    # 0xa8
+'O',    # 0xa9
+'I',    # 0xaa
+'U',    # 0xab
+'a',    # 0xac
+'e',    # 0xad
+'e',    # 0xae
+'i',    # 0xaf
+'u',    # 0xb0
+'a',    # 0xb1
+'b',    # 0xb2
+'g',    # 0xb3
+'d',    # 0xb4
+'e',    # 0xb5
+'z',    # 0xb6
+'e',    # 0xb7
+'th',    # 0xb8
+'i',    # 0xb9
+'k',    # 0xba
+'l',    # 0xbb
+'m',    # 0xbc
+'n',    # 0xbd
+'x',    # 0xbe
+'o',    # 0xbf
+'p',    # 0xc0
+'r',    # 0xc1
+'s',    # 0xc2
+'s',    # 0xc3
+'t',    # 0xc4
+'u',    # 0xc5
+'ph',    # 0xc6
+'kh',    # 0xc7
+'ps',    # 0xc8
+'o',    # 0xc9
+'i',    # 0xca
+'u',    # 0xcb
+'o',    # 0xcc
+'u',    # 0xcd
+'o',    # 0xce
+'[?]',    # 0xcf
+'b',    # 0xd0
+'th',    # 0xd1
+'U',    # 0xd2
+'U',    # 0xd3
+'U',    # 0xd4
+'ph',    # 0xd5
+'p',    # 0xd6
+'&',    # 0xd7
+'[?]',    # 0xd8
+'[?]',    # 0xd9
+'St',    # 0xda
+'st',    # 0xdb
+'W',    # 0xdc
+'w',    # 0xdd
+'Q',    # 0xde
+'q',    # 0xdf
+'Sp',    # 0xe0
+'sp',    # 0xe1
+'Sh',    # 0xe2
+'sh',    # 0xe3
+'F',    # 0xe4
+'f',    # 0xe5
+'Kh',    # 0xe6
+'kh',    # 0xe7
+'H',    # 0xe8
+'h',    # 0xe9
+'G',    # 0xea
+'g',    # 0xeb
+'CH',    # 0xec
+'ch',    # 0xed
+'Ti',    # 0xee
+'ti',    # 0xef
+'k',    # 0xf0
+'r',    # 0xf1
+'c',    # 0xf2
+'j',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x004.py b/lib/unidecode/x004.py
new file mode 100644
index 00000000..1cc3dbc4
--- /dev/null
+++ b/lib/unidecode/x004.py
@@ -0,0 +1,257 @@
+data = (
+'Ie',    # 0x00
+'Io',    # 0x01
+'Dj',    # 0x02
+'Gj',    # 0x03
+'Ie',    # 0x04
+'Dz',    # 0x05
+'I',    # 0x06
+'Yi',    # 0x07
+'J',    # 0x08
+'Lj',    # 0x09
+'Nj',    # 0x0a
+'Tsh',    # 0x0b
+'Kj',    # 0x0c
+'I',    # 0x0d
+'U',    # 0x0e
+'Dzh',    # 0x0f
+'A',    # 0x10
+'B',    # 0x11
+'V',    # 0x12
+'G',    # 0x13
+'D',    # 0x14
+'E',    # 0x15
+'Zh',    # 0x16
+'Z',    # 0x17
+'I',    # 0x18
+'I',    # 0x19
+'K',    # 0x1a
+'L',    # 0x1b
+'M',    # 0x1c
+'N',    # 0x1d
+'O',    # 0x1e
+'P',    # 0x1f
+'R',    # 0x20
+'S',    # 0x21
+'T',    # 0x22
+'U',    # 0x23
+'F',    # 0x24
+'Kh',    # 0x25
+'Ts',    # 0x26
+'Ch',    # 0x27
+'Sh',    # 0x28
+'Shch',    # 0x29
+'\'',    # 0x2a
+'Y',    # 0x2b
+'\'',    # 0x2c
+'E',    # 0x2d
+'Iu',    # 0x2e
+'Ia',    # 0x2f
+'a',    # 0x30
+'b',    # 0x31
+'v',    # 0x32
+'g',    # 0x33
+'d',    # 0x34
+'e',    # 0x35
+'zh',    # 0x36
+'z',    # 0x37
+'i',    # 0x38
+'i',    # 0x39
+'k',    # 0x3a
+'l',    # 0x3b
+'m',    # 0x3c
+'n',    # 0x3d
+'o',    # 0x3e
+'p',    # 0x3f
+'r',    # 0x40
+'s',    # 0x41
+'t',    # 0x42
+'u',    # 0x43
+'f',    # 0x44
+'kh',    # 0x45
+'ts',    # 0x46
+'ch',    # 0x47
+'sh',    # 0x48
+'shch',    # 0x49
+'\'',    # 0x4a
+'y',    # 0x4b
+'\'',    # 0x4c
+'e',    # 0x4d
+'iu',    # 0x4e
+'ia',    # 0x4f
+'ie',    # 0x50
+'io',    # 0x51
+'dj',    # 0x52
+'gj',    # 0x53
+'ie',    # 0x54
+'dz',    # 0x55
+'i',    # 0x56
+'yi',    # 0x57
+'j',    # 0x58
+'lj',    # 0x59
+'nj',    # 0x5a
+'tsh',    # 0x5b
+'kj',    # 0x5c
+'i',    # 0x5d
+'u',    # 0x5e
+'dzh',    # 0x5f
+'O',    # 0x60
+'o',    # 0x61
+'E',    # 0x62
+'e',    # 0x63
+'Ie',    # 0x64
+'ie',    # 0x65
+'E',    # 0x66
+'e',    # 0x67
+'Ie',    # 0x68
+'ie',    # 0x69
+'O',    # 0x6a
+'o',    # 0x6b
+'Io',    # 0x6c
+'io',    # 0x6d
+'Ks',    # 0x6e
+'ks',    # 0x6f
+'Ps',    # 0x70
+'ps',    # 0x71
+'F',    # 0x72
+'f',    # 0x73
+'Y',    # 0x74
+'y',    # 0x75
+'Y',    # 0x76
+'y',    # 0x77
+'u',    # 0x78
+'u',    # 0x79
+'O',    # 0x7a
+'o',    # 0x7b
+'O',    # 0x7c
+'o',    # 0x7d
+'Ot',    # 0x7e
+'ot',    # 0x7f
+'Q',    # 0x80
+'q',    # 0x81
+'*1000*',    # 0x82
+'',    # 0x83
+'',    # 0x84
+'',    # 0x85
+'',    # 0x86
+'[?]',    # 0x87
+'*100.000*',    # 0x88
+'*1.000.000*',    # 0x89
+'[?]',    # 0x8a
+'[?]',    # 0x8b
+'"',    # 0x8c
+'"',    # 0x8d
+'R\'',    # 0x8e
+'r\'',    # 0x8f
+'G\'',    # 0x90
+'g\'',    # 0x91
+'G\'',    # 0x92
+'g\'',    # 0x93
+'G\'',    # 0x94
+'g\'',    # 0x95
+'Zh\'',    # 0x96
+'zh\'',    # 0x97
+'Z\'',    # 0x98
+'z\'',    # 0x99
+'K\'',    # 0x9a
+'k\'',    # 0x9b
+'K\'',    # 0x9c
+'k\'',    # 0x9d
+'K\'',    # 0x9e
+'k\'',    # 0x9f
+'K\'',    # 0xa0
+'k\'',    # 0xa1
+'N\'',    # 0xa2
+'n\'',    # 0xa3
+'Ng',    # 0xa4
+'ng',    # 0xa5
+'P\'',    # 0xa6
+'p\'',    # 0xa7
+'Kh',    # 0xa8
+'kh',    # 0xa9
+'S\'',    # 0xaa
+'s\'',    # 0xab
+'T\'',    # 0xac
+'t\'',    # 0xad
+'U',    # 0xae
+'u',    # 0xaf
+'U\'',    # 0xb0
+'u\'',    # 0xb1
+'Kh\'',    # 0xb2
+'kh\'',    # 0xb3
+'Tts',    # 0xb4
+'tts',    # 0xb5
+'Ch\'',    # 0xb6
+'ch\'',    # 0xb7
+'Ch\'',    # 0xb8
+'ch\'',    # 0xb9
+'H',    # 0xba
+'h',    # 0xbb
+'Ch',    # 0xbc
+'ch',    # 0xbd
+'Ch\'',    # 0xbe
+'ch\'',    # 0xbf
+'`',    # 0xc0
+'Zh',    # 0xc1
+'zh',    # 0xc2
+'K\'',    # 0xc3
+'k\'',    # 0xc4
+'[?]',    # 0xc5
+'[?]',    # 0xc6
+'N\'',    # 0xc7
+'n\'',    # 0xc8
+'[?]',    # 0xc9
+'[?]',    # 0xca
+'Ch',    # 0xcb
+'ch',    # 0xcc
+'[?]',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'a',    # 0xd0
+'a',    # 0xd1
+'A',    # 0xd2
+'a',    # 0xd3
+'Ae',    # 0xd4
+'ae',    # 0xd5
+'Ie',    # 0xd6
+'ie',    # 0xd7
+'@',    # 0xd8
+'@',    # 0xd9
+'@',    # 0xda
+'@',    # 0xdb
+'Zh',    # 0xdc
+'zh',    # 0xdd
+'Z',    # 0xde
+'z',    # 0xdf
+'Dz',    # 0xe0
+'dz',    # 0xe1
+'I',    # 0xe2
+'i',    # 0xe3
+'I',    # 0xe4
+'i',    # 0xe5
+'O',    # 0xe6
+'o',    # 0xe7
+'O',    # 0xe8
+'o',    # 0xe9
+'O',    # 0xea
+'o',    # 0xeb
+'E',    # 0xec
+'e',    # 0xed
+'U',    # 0xee
+'u',    # 0xef
+'U',    # 0xf0
+'u',    # 0xf1
+'U',    # 0xf2
+'u',    # 0xf3
+'Ch',    # 0xf4
+'ch',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'Y',    # 0xf8
+'y',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x005.py b/lib/unidecode/x005.py
new file mode 100644
index 00000000..2913ffff
--- /dev/null
+++ b/lib/unidecode/x005.py
@@ -0,0 +1,257 @@
+data = (
+'[?]',    # 0x00
+'[?]',    # 0x01
+'[?]',    # 0x02
+'[?]',    # 0x03
+'[?]',    # 0x04
+'[?]',    # 0x05
+'[?]',    # 0x06
+'[?]',    # 0x07
+'[?]',    # 0x08
+'[?]',    # 0x09
+'[?]',    # 0x0a
+'[?]',    # 0x0b
+'[?]',    # 0x0c
+'[?]',    # 0x0d
+'[?]',    # 0x0e
+'[?]',    # 0x0f
+'[?]',    # 0x10
+'[?]',    # 0x11
+'[?]',    # 0x12
+'[?]',    # 0x13
+'[?]',    # 0x14
+'[?]',    # 0x15
+'[?]',    # 0x16
+'[?]',    # 0x17
+'[?]',    # 0x18
+'[?]',    # 0x19
+'[?]',    # 0x1a
+'[?]',    # 0x1b
+'[?]',    # 0x1c
+'[?]',    # 0x1d
+'[?]',    # 0x1e
+'[?]',    # 0x1f
+'[?]',    # 0x20
+'[?]',    # 0x21
+'[?]',    # 0x22
+'[?]',    # 0x23
+'[?]',    # 0x24
+'[?]',    # 0x25
+'[?]',    # 0x26
+'[?]',    # 0x27
+'[?]',    # 0x28
+'[?]',    # 0x29
+'[?]',    # 0x2a
+'[?]',    # 0x2b
+'[?]',    # 0x2c
+'[?]',    # 0x2d
+'[?]',    # 0x2e
+'[?]',    # 0x2f
+'[?]',    # 0x30
+'A',    # 0x31
+'B',    # 0x32
+'G',    # 0x33
+'D',    # 0x34
+'E',    # 0x35
+'Z',    # 0x36
+'E',    # 0x37
+'E',    # 0x38
+'T`',    # 0x39
+'Zh',    # 0x3a
+'I',    # 0x3b
+'L',    # 0x3c
+'Kh',    # 0x3d
+'Ts',    # 0x3e
+'K',    # 0x3f
+'H',    # 0x40
+'Dz',    # 0x41
+'Gh',    # 0x42
+'Ch',    # 0x43
+'M',    # 0x44
+'Y',    # 0x45
+'N',    # 0x46
+'Sh',    # 0x47
+'O',    # 0x48
+'Ch`',    # 0x49
+'P',    # 0x4a
+'J',    # 0x4b
+'Rh',    # 0x4c
+'S',    # 0x4d
+'V',    # 0x4e
+'T',    # 0x4f
+'R',    # 0x50
+'Ts`',    # 0x51
+'W',    # 0x52
+'P`',    # 0x53
+'K`',    # 0x54
+'O',    # 0x55
+'F',    # 0x56
+'[?]',    # 0x57
+'[?]',    # 0x58
+'<',    # 0x59
+'\'',    # 0x5a
+'/',    # 0x5b
+'!',    # 0x5c
+',',    # 0x5d
+'?',    # 0x5e
+'.',    # 0x5f
+'[?]',    # 0x60
+'a',    # 0x61
+'b',    # 0x62
+'g',    # 0x63
+'d',    # 0x64
+'e',    # 0x65
+'z',    # 0x66
+'e',    # 0x67
+'e',    # 0x68
+'t`',    # 0x69
+'zh',    # 0x6a
+'i',    # 0x6b
+'l',    # 0x6c
+'kh',    # 0x6d
+'ts',    # 0x6e
+'k',    # 0x6f
+'h',    # 0x70
+'dz',    # 0x71
+'gh',    # 0x72
+'ch',    # 0x73
+'m',    # 0x74
+'y',    # 0x75
+'n',    # 0x76
+'sh',    # 0x77
+'o',    # 0x78
+'ch`',    # 0x79
+'p',    # 0x7a
+'j',    # 0x7b
+'rh',    # 0x7c
+'s',    # 0x7d
+'v',    # 0x7e
+'t',    # 0x7f
+'r',    # 0x80
+'ts`',    # 0x81
+'w',    # 0x82
+'p`',    # 0x83
+'k`',    # 0x84
+'o',    # 0x85
+'f',    # 0x86
+'ew',    # 0x87
+'[?]',    # 0x88
+':',    # 0x89
+'-',    # 0x8a
+'[?]',    # 0x8b
+'[?]',    # 0x8c
+'[?]',    # 0x8d
+'[?]',    # 0x8e
+'[?]',    # 0x8f
+'[?]',    # 0x90
+'',    # 0x91
+'',    # 0x92
+'',    # 0x93
+'',    # 0x94
+'',    # 0x95
+'',    # 0x96
+'',    # 0x97
+'',    # 0x98
+'',    # 0x99
+'',    # 0x9a
+'',    # 0x9b
+'',    # 0x9c
+'',    # 0x9d
+'',    # 0x9e
+'',    # 0x9f
+'',    # 0xa0
+'',    # 0xa1
+'[?]',    # 0xa2
+'',    # 0xa3
+'',    # 0xa4
+'',    # 0xa5
+'',    # 0xa6
+'',    # 0xa7
+'',    # 0xa8
+'',    # 0xa9
+'',    # 0xaa
+'',    # 0xab
+'',    # 0xac
+'',    # 0xad
+'',    # 0xae
+'',    # 0xaf
+'@',    # 0xb0
+'e',    # 0xb1
+'a',    # 0xb2
+'o',    # 0xb3
+'i',    # 0xb4
+'e',    # 0xb5
+'e',    # 0xb6
+'a',    # 0xb7
+'a',    # 0xb8
+'o',    # 0xb9
+'[?]',    # 0xba
+'u',    # 0xbb
+'\'',    # 0xbc
+'',    # 0xbd
+'',    # 0xbe
+'',    # 0xbf
+'|',    # 0xc0
+'',    # 0xc1
+'',    # 0xc2
+':',    # 0xc3
+'',    # 0xc4
+'[?]',    # 0xc5
+'[?]',    # 0xc6
+'[?]',    # 0xc7
+'[?]',    # 0xc8
+'[?]',    # 0xc9
+'[?]',    # 0xca
+'[?]',    # 0xcb
+'[?]',    # 0xcc
+'[?]',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'',    # 0xd0
+'b',    # 0xd1
+'g',    # 0xd2
+'d',    # 0xd3
+'h',    # 0xd4
+'v',    # 0xd5
+'z',    # 0xd6
+'kh',    # 0xd7
+'t',    # 0xd8
+'y',    # 0xd9
+'k',    # 0xda
+'k',    # 0xdb
+'l',    # 0xdc
+'m',    # 0xdd
+'m',    # 0xde
+'n',    # 0xdf
+'n',    # 0xe0
+'s',    # 0xe1
+'`',    # 0xe2
+'p',    # 0xe3
+'p',    # 0xe4
+'ts',    # 0xe5
+'ts',    # 0xe6
+'q',    # 0xe7
+'r',    # 0xe8
+'sh',    # 0xe9
+'t',    # 0xea
+'[?]',    # 0xeb
+'[?]',    # 0xec
+'[?]',    # 0xed
+'[?]',    # 0xee
+'[?]',    # 0xef
+'V',    # 0xf0
+'oy',    # 0xf1
+'i',    # 0xf2
+'\'',    # 0xf3
+'"',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x006.py b/lib/unidecode/x006.py
new file mode 100644
index 00000000..09440b28
--- /dev/null
+++ b/lib/unidecode/x006.py
@@ -0,0 +1,257 @@
+data = (
+'[?]',    # 0x00
+'[?]',    # 0x01
+'[?]',    # 0x02
+'[?]',    # 0x03
+'[?]',    # 0x04
+'[?]',    # 0x05
+'[?]',    # 0x06
+'[?]',    # 0x07
+'[?]',    # 0x08
+'[?]',    # 0x09
+'[?]',    # 0x0a
+'[?]',    # 0x0b
+',',    # 0x0c
+'[?]',    # 0x0d
+'[?]',    # 0x0e
+'[?]',    # 0x0f
+'[?]',    # 0x10
+'[?]',    # 0x11
+'[?]',    # 0x12
+'[?]',    # 0x13
+'[?]',    # 0x14
+'[?]',    # 0x15
+'[?]',    # 0x16
+'[?]',    # 0x17
+'[?]',    # 0x18
+'[?]',    # 0x19
+'[?]',    # 0x1a
+';',    # 0x1b
+'[?]',    # 0x1c
+'[?]',    # 0x1d
+'[?]',    # 0x1e
+'?',    # 0x1f
+'[?]',    # 0x20
+'',    # 0x21
+'a',    # 0x22
+'\'',    # 0x23
+'w\'',    # 0x24
+'',    # 0x25
+'y\'',    # 0x26
+'',    # 0x27
+'b',    # 0x28
+'@',    # 0x29
+'t',    # 0x2a
+'th',    # 0x2b
+'j',    # 0x2c
+'H',    # 0x2d
+'kh',    # 0x2e
+'d',    # 0x2f
+'dh',    # 0x30
+'r',    # 0x31
+'z',    # 0x32
+'s',    # 0x33
+'sh',    # 0x34
+'S',    # 0x35
+'D',    # 0x36
+'T',    # 0x37
+'Z',    # 0x38
+'`',    # 0x39
+'G',    # 0x3a
+'[?]',    # 0x3b
+'[?]',    # 0x3c
+'[?]',    # 0x3d
+'[?]',    # 0x3e
+'[?]',    # 0x3f
+'',    # 0x40
+'f',    # 0x41
+'q',    # 0x42
+'k',    # 0x43
+'l',    # 0x44
+'m',    # 0x45
+'n',    # 0x46
+'h',    # 0x47
+'w',    # 0x48
+'~',    # 0x49
+'y',    # 0x4a
+'an',    # 0x4b
+'un',    # 0x4c
+'in',    # 0x4d
+'a',    # 0x4e
+'u',    # 0x4f
+'i',    # 0x50
+'W',    # 0x51
+'',    # 0x52
+'',    # 0x53
+'\'',    # 0x54
+'\'',    # 0x55
+'[?]',    # 0x56
+'[?]',    # 0x57
+'[?]',    # 0x58
+'[?]',    # 0x59
+'[?]',    # 0x5a
+'[?]',    # 0x5b
+'[?]',    # 0x5c
+'[?]',    # 0x5d
+'[?]',    # 0x5e
+'[?]',    # 0x5f
+'0',    # 0x60
+'1',    # 0x61
+'2',    # 0x62
+'3',    # 0x63
+'4',    # 0x64
+'5',    # 0x65
+'6',    # 0x66
+'7',    # 0x67
+'8',    # 0x68
+'9',    # 0x69
+'%',    # 0x6a
+'.',    # 0x6b
+',',    # 0x6c
+'*',    # 0x6d
+'[?]',    # 0x6e
+'[?]',    # 0x6f
+'',    # 0x70
+'\'',    # 0x71
+'\'',    # 0x72
+'\'',    # 0x73
+'',    # 0x74
+'\'',    # 0x75
+'\'w',    # 0x76
+'\'u',    # 0x77
+'\'y',    # 0x78
+'tt',    # 0x79
+'tth',    # 0x7a
+'b',    # 0x7b
+'t',    # 0x7c
+'T',    # 0x7d
+'p',    # 0x7e
+'th',    # 0x7f
+'bh',    # 0x80
+'\'h',    # 0x81
+'H',    # 0x82
+'ny',    # 0x83
+'dy',    # 0x84
+'H',    # 0x85
+'ch',    # 0x86
+'cch',    # 0x87
+'dd',    # 0x88
+'D',    # 0x89
+'D',    # 0x8a
+'Dt',    # 0x8b
+'dh',    # 0x8c
+'ddh',    # 0x8d
+'d',    # 0x8e
+'D',    # 0x8f
+'D',    # 0x90
+'rr',    # 0x91
+'R',    # 0x92
+'R',    # 0x93
+'R',    # 0x94
+'R',    # 0x95
+'R',    # 0x96
+'R',    # 0x97
+'j',    # 0x98
+'R',    # 0x99
+'S',    # 0x9a
+'S',    # 0x9b
+'S',    # 0x9c
+'S',    # 0x9d
+'S',    # 0x9e
+'T',    # 0x9f
+'GH',    # 0xa0
+'F',    # 0xa1
+'F',    # 0xa2
+'F',    # 0xa3
+'v',    # 0xa4
+'f',    # 0xa5
+'ph',    # 0xa6
+'Q',    # 0xa7
+'Q',    # 0xa8
+'kh',    # 0xa9
+'k',    # 0xaa
+'K',    # 0xab
+'K',    # 0xac
+'ng',    # 0xad
+'K',    # 0xae
+'g',    # 0xaf
+'G',    # 0xb0
+'N',    # 0xb1
+'G',    # 0xb2
+'G',    # 0xb3
+'G',    # 0xb4
+'L',    # 0xb5
+'L',    # 0xb6
+'L',    # 0xb7
+'L',    # 0xb8
+'N',    # 0xb9
+'N',    # 0xba
+'N',    # 0xbb
+'N',    # 0xbc
+'N',    # 0xbd
+'h',    # 0xbe
+'Ch',    # 0xbf
+'hy',    # 0xc0
+'h',    # 0xc1
+'H',    # 0xc2
+'@',    # 0xc3
+'W',    # 0xc4
+'oe',    # 0xc5
+'oe',    # 0xc6
+'u',    # 0xc7
+'yu',    # 0xc8
+'yu',    # 0xc9
+'W',    # 0xca
+'v',    # 0xcb
+'y',    # 0xcc
+'Y',    # 0xcd
+'Y',    # 0xce
+'W',    # 0xcf
+'',    # 0xd0
+'',    # 0xd1
+'y',    # 0xd2
+'y\'',    # 0xd3
+'.',    # 0xd4
+'ae',    # 0xd5
+'',    # 0xd6
+'',    # 0xd7
+'',    # 0xd8
+'',    # 0xd9
+'',    # 0xda
+'',    # 0xdb
+'',    # 0xdc
+'@',    # 0xdd
+'#',    # 0xde
+'',    # 0xdf
+'',    # 0xe0
+'',    # 0xe1
+'',    # 0xe2
+'',    # 0xe3
+'',    # 0xe4
+'',    # 0xe5
+'',    # 0xe6
+'',    # 0xe7
+'',    # 0xe8
+'^',    # 0xe9
+'',    # 0xea
+'',    # 0xeb
+'',    # 0xec
+'',    # 0xed
+'[?]',    # 0xee
+'[?]',    # 0xef
+'0',    # 0xf0
+'1',    # 0xf1
+'2',    # 0xf2
+'3',    # 0xf3
+'4',    # 0xf4
+'5',    # 0xf5
+'6',    # 0xf6
+'7',    # 0xf7
+'8',    # 0xf8
+'9',    # 0xf9
+'Sh',    # 0xfa
+'D',    # 0xfb
+'Gh',    # 0xfc
+'&',    # 0xfd
+'+m',    # 0xfe
+)
diff --git a/lib/unidecode/x007.py b/lib/unidecode/x007.py
new file mode 100644
index 00000000..d2c00213
--- /dev/null
+++ b/lib/unidecode/x007.py
@@ -0,0 +1,257 @@
+data = (
+'//',    # 0x00
+'/',    # 0x01
+',',    # 0x02
+'!',    # 0x03
+'!',    # 0x04
+'-',    # 0x05
+',',    # 0x06
+',',    # 0x07
+';',    # 0x08
+'?',    # 0x09
+'~',    # 0x0a
+'{',    # 0x0b
+'}',    # 0x0c
+'*',    # 0x0d
+'[?]',    # 0x0e
+'',    # 0x0f
+'\'',    # 0x10
+'',    # 0x11
+'b',    # 0x12
+'g',    # 0x13
+'g',    # 0x14
+'d',    # 0x15
+'d',    # 0x16
+'h',    # 0x17
+'w',    # 0x18
+'z',    # 0x19
+'H',    # 0x1a
+'t',    # 0x1b
+'t',    # 0x1c
+'y',    # 0x1d
+'yh',    # 0x1e
+'k',    # 0x1f
+'l',    # 0x20
+'m',    # 0x21
+'n',    # 0x22
+'s',    # 0x23
+'s',    # 0x24
+'`',    # 0x25
+'p',    # 0x26
+'p',    # 0x27
+'S',    # 0x28
+'q',    # 0x29
+'r',    # 0x2a
+'sh',    # 0x2b
+'t',    # 0x2c
+'[?]',    # 0x2d
+'[?]',    # 0x2e
+'[?]',    # 0x2f
+'a',    # 0x30
+'a',    # 0x31
+'a',    # 0x32
+'A',    # 0x33
+'A',    # 0x34
+'A',    # 0x35
+'e',    # 0x36
+'e',    # 0x37
+'e',    # 0x38
+'E',    # 0x39
+'i',    # 0x3a
+'i',    # 0x3b
+'u',    # 0x3c
+'u',    # 0x3d
+'u',    # 0x3e
+'o',    # 0x3f
+'',    # 0x40
+'`',    # 0x41
+'\'',    # 0x42
+'',    # 0x43
+'',    # 0x44
+'X',    # 0x45
+'Q',    # 0x46
+'@',    # 0x47
+'@',    # 0x48
+'|',    # 0x49
+'+',    # 0x4a
+'[?]',    # 0x4b
+'[?]',    # 0x4c
+'[?]',    # 0x4d
+'[?]',    # 0x4e
+'[?]',    # 0x4f
+'[?]',    # 0x50
+'[?]',    # 0x51
+'[?]',    # 0x52
+'[?]',    # 0x53
+'[?]',    # 0x54
+'[?]',    # 0x55
+'[?]',    # 0x56
+'[?]',    # 0x57
+'[?]',    # 0x58
+'[?]',    # 0x59
+'[?]',    # 0x5a
+'[?]',    # 0x5b
+'[?]',    # 0x5c
+'[?]',    # 0x5d
+'[?]',    # 0x5e
+'[?]',    # 0x5f
+'[?]',    # 0x60
+'[?]',    # 0x61
+'[?]',    # 0x62
+'[?]',    # 0x63
+'[?]',    # 0x64
+'[?]',    # 0x65
+'[?]',    # 0x66
+'[?]',    # 0x67
+'[?]',    # 0x68
+'[?]',    # 0x69
+'[?]',    # 0x6a
+'[?]',    # 0x6b
+'[?]',    # 0x6c
+'[?]',    # 0x6d
+'[?]',    # 0x6e
+'[?]',    # 0x6f
+'[?]',    # 0x70
+'[?]',    # 0x71
+'[?]',    # 0x72
+'[?]',    # 0x73
+'[?]',    # 0x74
+'[?]',    # 0x75
+'[?]',    # 0x76
+'[?]',    # 0x77
+'[?]',    # 0x78
+'[?]',    # 0x79
+'[?]',    # 0x7a
+'[?]',    # 0x7b
+'[?]',    # 0x7c
+'[?]',    # 0x7d
+'[?]',    # 0x7e
+'[?]',    # 0x7f
+'h',    # 0x80
+'sh',    # 0x81
+'n',    # 0x82
+'r',    # 0x83
+'b',    # 0x84
+'L',    # 0x85
+'k',    # 0x86
+'\'',    # 0x87
+'v',    # 0x88
+'m',    # 0x89
+'f',    # 0x8a
+'dh',    # 0x8b
+'th',    # 0x8c
+'l',    # 0x8d
+'g',    # 0x8e
+'ny',    # 0x8f
+'s',    # 0x90
+'d',    # 0x91
+'z',    # 0x92
+'t',    # 0x93
+'y',    # 0x94
+'p',    # 0x95
+'j',    # 0x96
+'ch',    # 0x97
+'tt',    # 0x98
+'hh',    # 0x99
+'kh',    # 0x9a
+'th',    # 0x9b
+'z',    # 0x9c
+'sh',    # 0x9d
+'s',    # 0x9e
+'d',    # 0x9f
+'t',    # 0xa0
+'z',    # 0xa1
+'`',    # 0xa2
+'gh',    # 0xa3
+'q',    # 0xa4
+'w',    # 0xa5
+'a',    # 0xa6
+'aa',    # 0xa7
+'i',    # 0xa8
+'ee',    # 0xa9
+'u',    # 0xaa
+'oo',    # 0xab
+'e',    # 0xac
+'ey',    # 0xad
+'o',    # 0xae
+'oa',    # 0xaf
+'',    # 0xb0
+'[?]',    # 0xb1
+'[?]',    # 0xb2
+'[?]',    # 0xb3
+'[?]',    # 0xb4
+'[?]',    # 0xb5
+'[?]',    # 0xb6
+'[?]',    # 0xb7
+'[?]',    # 0xb8
+'[?]',    # 0xb9
+'[?]',    # 0xba
+'[?]',    # 0xbb
+'[?]',    # 0xbc
+'[?]',    # 0xbd
+'[?]',    # 0xbe
+'[?]',    # 0xbf
+'[?]',    # 0xc0
+'[?]',    # 0xc1
+'[?]',    # 0xc2
+'[?]',    # 0xc3
+'[?]',    # 0xc4
+'[?]',    # 0xc5
+'[?]',    # 0xc6
+'[?]',    # 0xc7
+'[?]',    # 0xc8
+'[?]',    # 0xc9
+'[?]',    # 0xca
+'[?]',    # 0xcb
+'[?]',    # 0xcc
+'[?]',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'[?]',    # 0xd0
+'[?]',    # 0xd1
+'[?]',    # 0xd2
+'[?]',    # 0xd3
+'[?]',    # 0xd4
+'[?]',    # 0xd5
+'[?]',    # 0xd6
+'[?]',    # 0xd7
+'[?]',    # 0xd8
+'[?]',    # 0xd9
+'[?]',    # 0xda
+'[?]',    # 0xdb
+'[?]',    # 0xdc
+'[?]',    # 0xdd
+'[?]',    # 0xde
+'[?]',    # 0xdf
+'[?]',    # 0xe0
+'[?]',    # 0xe1
+'[?]',    # 0xe2
+'[?]',    # 0xe3
+'[?]',    # 0xe4
+'[?]',    # 0xe5
+'[?]',    # 0xe6
+'[?]',    # 0xe7
+'[?]',    # 0xe8
+'[?]',    # 0xe9
+'[?]',    # 0xea
+'[?]',    # 0xeb
+'[?]',    # 0xec
+'[?]',    # 0xed
+'[?]',    # 0xee
+'[?]',    # 0xef
+'[?]',    # 0xf0
+'[?]',    # 0xf1
+'[?]',    # 0xf2
+'[?]',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x009.py b/lib/unidecode/x009.py
new file mode 100644
index 00000000..564ec784
--- /dev/null
+++ b/lib/unidecode/x009.py
@@ -0,0 +1,257 @@
+data = (
+'[?]',    # 0x00
+'N',    # 0x01
+'N',    # 0x02
+'H',    # 0x03
+'[?]',    # 0x04
+'a',    # 0x05
+'aa',    # 0x06
+'i',    # 0x07
+'ii',    # 0x08
+'u',    # 0x09
+'uu',    # 0x0a
+'R',    # 0x0b
+'L',    # 0x0c
+'eN',    # 0x0d
+'e',    # 0x0e
+'e',    # 0x0f
+'ai',    # 0x10
+'oN',    # 0x11
+'o',    # 0x12
+'o',    # 0x13
+'au',    # 0x14
+'k',    # 0x15
+'kh',    # 0x16
+'g',    # 0x17
+'gh',    # 0x18
+'ng',    # 0x19
+'c',    # 0x1a
+'ch',    # 0x1b
+'j',    # 0x1c
+'jh',    # 0x1d
+'ny',    # 0x1e
+'tt',    # 0x1f
+'tth',    # 0x20
+'dd',    # 0x21
+'ddh',    # 0x22
+'nn',    # 0x23
+'t',    # 0x24
+'th',    # 0x25
+'d',    # 0x26
+'dh',    # 0x27
+'n',    # 0x28
+'nnn',    # 0x29
+'p',    # 0x2a
+'ph',    # 0x2b
+'b',    # 0x2c
+'bh',    # 0x2d
+'m',    # 0x2e
+'y',    # 0x2f
+'r',    # 0x30
+'rr',    # 0x31
+'l',    # 0x32
+'l',    # 0x33
+'lll',    # 0x34
+'v',    # 0x35
+'sh',    # 0x36
+'ss',    # 0x37
+'s',    # 0x38
+'h',    # 0x39
+'[?]',    # 0x3a
+'[?]',    # 0x3b
+'\'',    # 0x3c
+'\'',    # 0x3d
+'aa',    # 0x3e
+'i',    # 0x3f
+'ii',    # 0x40
+'u',    # 0x41
+'uu',    # 0x42
+'R',    # 0x43
+'RR',    # 0x44
+'eN',    # 0x45
+'e',    # 0x46
+'e',    # 0x47
+'ai',    # 0x48
+'oN',    # 0x49
+'o',    # 0x4a
+'o',    # 0x4b
+'au',    # 0x4c
+'',    # 0x4d
+'[?]',    # 0x4e
+'[?]',    # 0x4f
+'AUM',    # 0x50
+'\'',    # 0x51
+'\'',    # 0x52
+'`',    # 0x53
+'\'',    # 0x54
+'[?]',    # 0x55
+'[?]',    # 0x56
+'[?]',    # 0x57
+'q',    # 0x58
+'khh',    # 0x59
+'ghh',    # 0x5a
+'z',    # 0x5b
+'dddh',    # 0x5c
+'rh',    # 0x5d
+'f',    # 0x5e
+'yy',    # 0x5f
+'RR',    # 0x60
+'LL',    # 0x61
+'L',    # 0x62
+'LL',    # 0x63
+' / ',    # 0x64
+' // ',    # 0x65
+'0',    # 0x66
+'1',    # 0x67
+'2',    # 0x68
+'3',    # 0x69
+'4',    # 0x6a
+'5',    # 0x6b
+'6',    # 0x6c
+'7',    # 0x6d
+'8',    # 0x6e
+'9',    # 0x6f
+'.',    # 0x70
+'[?]',    # 0x71
+'[?]',    # 0x72
+'[?]',    # 0x73
+'[?]',    # 0x74
+'[?]',    # 0x75
+'[?]',    # 0x76
+'[?]',    # 0x77
+'[?]',    # 0x78
+'[?]',    # 0x79
+'[?]',    # 0x7a
+'[?]',    # 0x7b
+'[?]',    # 0x7c
+'[?]',    # 0x7d
+'[?]',    # 0x7e
+'[?]',    # 0x7f
+'[?]',    # 0x80
+'N',    # 0x81
+'N',    # 0x82
+'H',    # 0x83
+'[?]',    # 0x84
+'a',    # 0x85
+'aa',    # 0x86
+'i',    # 0x87
+'ii',    # 0x88
+'u',    # 0x89
+'uu',    # 0x8a
+'R',    # 0x8b
+'RR',    # 0x8c
+'[?]',    # 0x8d
+'[?]',    # 0x8e
+'e',    # 0x8f
+'ai',    # 0x90
+'[?]',    # 0x91
+'[?]',    # 0x92
+'o',    # 0x93
+'au',    # 0x94
+'k',    # 0x95
+'kh',    # 0x96
+'g',    # 0x97
+'gh',    # 0x98
+'ng',    # 0x99
+'c',    # 0x9a
+'ch',    # 0x9b
+'j',    # 0x9c
+'jh',    # 0x9d
+'ny',    # 0x9e
+'tt',    # 0x9f
+'tth',    # 0xa0
+'dd',    # 0xa1
+'ddh',    # 0xa2
+'nn',    # 0xa3
+'t',    # 0xa4
+'th',    # 0xa5
+'d',    # 0xa6
+'dh',    # 0xa7
+'n',    # 0xa8
+'[?]',    # 0xa9
+'p',    # 0xaa
+'ph',    # 0xab
+'b',    # 0xac
+'bh',    # 0xad
+'m',    # 0xae
+'y',    # 0xaf
+'r',    # 0xb0
+'[?]',    # 0xb1
+'l',    # 0xb2
+'[?]',    # 0xb3
+'[?]',    # 0xb4
+'[?]',    # 0xb5
+'sh',    # 0xb6
+'ss',    # 0xb7
+'s',    # 0xb8
+'h',    # 0xb9
+'[?]',    # 0xba
+'[?]',    # 0xbb
+'\'',    # 0xbc
+'[?]',    # 0xbd
+'aa',    # 0xbe
+'i',    # 0xbf
+'ii',    # 0xc0
+'u',    # 0xc1
+'uu',    # 0xc2
+'R',    # 0xc3
+'RR',    # 0xc4
+'[?]',    # 0xc5
+'[?]',    # 0xc6
+'e',    # 0xc7
+'ai',    # 0xc8
+'[?]',    # 0xc9
+'[?]',    # 0xca
+'o',    # 0xcb
+'au',    # 0xcc
+'',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'[?]',    # 0xd0
+'[?]',    # 0xd1
+'[?]',    # 0xd2
+'[?]',    # 0xd3
+'[?]',    # 0xd4
+'[?]',    # 0xd5
+'[?]',    # 0xd6
+'+',    # 0xd7
+'[?]',    # 0xd8
+'[?]',    # 0xd9
+'[?]',    # 0xda
+'[?]',    # 0xdb
+'rr',    # 0xdc
+'rh',    # 0xdd
+'[?]',    # 0xde
+'yy',    # 0xdf
+'RR',    # 0xe0
+'LL',    # 0xe1
+'L',    # 0xe2
+'LL',    # 0xe3
+'[?]',    # 0xe4
+'[?]',    # 0xe5
+'0',    # 0xe6
+'1',    # 0xe7
+'2',    # 0xe8
+'3',    # 0xe9
+'4',    # 0xea
+'5',    # 0xeb
+'6',    # 0xec
+'7',    # 0xed
+'8',    # 0xee
+'9',    # 0xef
+'r\'',    # 0xf0
+'r`',    # 0xf1
+'Rs',    # 0xf2
+'Rs',    # 0xf3
+'1/',    # 0xf4
+'2/',    # 0xf5
+'3/',    # 0xf6
+'4/',    # 0xf7
+' 1 - 1/',    # 0xf8
+'/16',    # 0xf9
+'',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x00a.py b/lib/unidecode/x00a.py
new file mode 100644
index 00000000..1ccd9df6
--- /dev/null
+++ b/lib/unidecode/x00a.py
@@ -0,0 +1,257 @@
+data = (
+'[?]',    # 0x00
+'[?]',    # 0x01
+'N',    # 0x02
+'[?]',    # 0x03
+'[?]',    # 0x04
+'a',    # 0x05
+'aa',    # 0x06
+'i',    # 0x07
+'ii',    # 0x08
+'u',    # 0x09
+'uu',    # 0x0a
+'[?]',    # 0x0b
+'[?]',    # 0x0c
+'[?]',    # 0x0d
+'[?]',    # 0x0e
+'ee',    # 0x0f
+'ai',    # 0x10
+'[?]',    # 0x11
+'[?]',    # 0x12
+'oo',    # 0x13
+'au',    # 0x14
+'k',    # 0x15
+'kh',    # 0x16
+'g',    # 0x17
+'gh',    # 0x18
+'ng',    # 0x19
+'c',    # 0x1a
+'ch',    # 0x1b
+'j',    # 0x1c
+'jh',    # 0x1d
+'ny',    # 0x1e
+'tt',    # 0x1f
+'tth',    # 0x20
+'dd',    # 0x21
+'ddh',    # 0x22
+'nn',    # 0x23
+'t',    # 0x24
+'th',    # 0x25
+'d',    # 0x26
+'dh',    # 0x27
+'n',    # 0x28
+'[?]',    # 0x29
+'p',    # 0x2a
+'ph',    # 0x2b
+'b',    # 0x2c
+'bb',    # 0x2d
+'m',    # 0x2e
+'y',    # 0x2f
+'r',    # 0x30
+'[?]',    # 0x31
+'l',    # 0x32
+'ll',    # 0x33
+'[?]',    # 0x34
+'v',    # 0x35
+'sh',    # 0x36
+'[?]',    # 0x37
+'s',    # 0x38
+'h',    # 0x39
+'[?]',    # 0x3a
+'[?]',    # 0x3b
+'\'',    # 0x3c
+'[?]',    # 0x3d
+'aa',    # 0x3e
+'i',    # 0x3f
+'ii',    # 0x40
+'u',    # 0x41
+'uu',    # 0x42
+'[?]',    # 0x43
+'[?]',    # 0x44
+'[?]',    # 0x45
+'[?]',    # 0x46
+'ee',    # 0x47
+'ai',    # 0x48
+'[?]',    # 0x49
+'[?]',    # 0x4a
+'oo',    # 0x4b
+'au',    # 0x4c
+'',    # 0x4d
+'[?]',    # 0x4e
+'[?]',    # 0x4f
+'[?]',    # 0x50
+'[?]',    # 0x51
+'[?]',    # 0x52
+'[?]',    # 0x53
+'[?]',    # 0x54
+'[?]',    # 0x55
+'[?]',    # 0x56
+'[?]',    # 0x57
+'[?]',    # 0x58
+'khh',    # 0x59
+'ghh',    # 0x5a
+'z',    # 0x5b
+'rr',    # 0x5c
+'[?]',    # 0x5d
+'f',    # 0x5e
+'[?]',    # 0x5f
+'[?]',    # 0x60
+'[?]',    # 0x61
+'[?]',    # 0x62
+'[?]',    # 0x63
+'[?]',    # 0x64
+'[?]',    # 0x65
+'0',    # 0x66
+'1',    # 0x67
+'2',    # 0x68
+'3',    # 0x69
+'4',    # 0x6a
+'5',    # 0x6b
+'6',    # 0x6c
+'7',    # 0x6d
+'8',    # 0x6e
+'9',    # 0x6f
+'N',    # 0x70
+'H',    # 0x71
+'',    # 0x72
+'',    # 0x73
+'G.E.O.',    # 0x74
+'[?]',    # 0x75
+'[?]',    # 0x76
+'[?]',    # 0x77
+'[?]',    # 0x78
+'[?]',    # 0x79
+'[?]',    # 0x7a
+'[?]',    # 0x7b
+'[?]',    # 0x7c
+'[?]',    # 0x7d
+'[?]',    # 0x7e
+'[?]',    # 0x7f
+'[?]',    # 0x80
+'N',    # 0x81
+'N',    # 0x82
+'H',    # 0x83
+'[?]',    # 0x84
+'a',    # 0x85
+'aa',    # 0x86
+'i',    # 0x87
+'ii',    # 0x88
+'u',    # 0x89
+'uu',    # 0x8a
+'R',    # 0x8b
+'[?]',    # 0x8c
+'eN',    # 0x8d
+'[?]',    # 0x8e
+'e',    # 0x8f
+'ai',    # 0x90
+'oN',    # 0x91
+'[?]',    # 0x92
+'o',    # 0x93
+'au',    # 0x94
+'k',    # 0x95
+'kh',    # 0x96
+'g',    # 0x97
+'gh',    # 0x98
+'ng',    # 0x99
+'c',    # 0x9a
+'ch',    # 0x9b
+'j',    # 0x9c
+'jh',    # 0x9d
+'ny',    # 0x9e
+'tt',    # 0x9f
+'tth',    # 0xa0
+'dd',    # 0xa1
+'ddh',    # 0xa2
+'nn',    # 0xa3
+'t',    # 0xa4
+'th',    # 0xa5
+'d',    # 0xa6
+'dh',    # 0xa7
+'n',    # 0xa8
+'[?]',    # 0xa9
+'p',    # 0xaa
+'ph',    # 0xab
+'b',    # 0xac
+'bh',    # 0xad
+'m',    # 0xae
+'ya',    # 0xaf
+'r',    # 0xb0
+'[?]',    # 0xb1
+'l',    # 0xb2
+'ll',    # 0xb3
+'[?]',    # 0xb4
+'v',    # 0xb5
+'sh',    # 0xb6
+'ss',    # 0xb7
+'s',    # 0xb8
+'h',    # 0xb9
+'[?]',    # 0xba
+'[?]',    # 0xbb
+'\'',    # 0xbc
+'\'',    # 0xbd
+'aa',    # 0xbe
+'i',    # 0xbf
+'ii',    # 0xc0
+'u',    # 0xc1
+'uu',    # 0xc2
+'R',    # 0xc3
+'RR',    # 0xc4
+'eN',    # 0xc5
+'[?]',    # 0xc6
+'e',    # 0xc7
+'ai',    # 0xc8
+'oN',    # 0xc9
+'[?]',    # 0xca
+'o',    # 0xcb
+'au',    # 0xcc
+'',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'AUM',    # 0xd0
+'[?]',    # 0xd1
+'[?]',    # 0xd2
+'[?]',    # 0xd3
+'[?]',    # 0xd4
+'[?]',    # 0xd5
+'[?]',    # 0xd6
+'[?]',    # 0xd7
+'[?]',    # 0xd8
+'[?]',    # 0xd9
+'[?]',    # 0xda
+'[?]',    # 0xdb
+'[?]',    # 0xdc
+'[?]',    # 0xdd
+'[?]',    # 0xde
+'[?]',    # 0xdf
+'RR',    # 0xe0
+'[?]',    # 0xe1
+'[?]',    # 0xe2
+'[?]',    # 0xe3
+'[?]',    # 0xe4
+'[?]',    # 0xe5
+'0',    # 0xe6
+'1',    # 0xe7
+'2',    # 0xe8
+'3',    # 0xe9
+'4',    # 0xea
+'5',    # 0xeb
+'6',    # 0xec
+'7',    # 0xed
+'8',    # 0xee
+'9',    # 0xef
+'[?]',    # 0xf0
+'[?]',    # 0xf1
+'[?]',    # 0xf2
+'[?]',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x00b.py b/lib/unidecode/x00b.py
new file mode 100644
index 00000000..19d18488
--- /dev/null
+++ b/lib/unidecode/x00b.py
@@ -0,0 +1,257 @@
+data = (
+'[?]',    # 0x00
+'N',    # 0x01
+'N',    # 0x02
+'H',    # 0x03
+'[?]',    # 0x04
+'a',    # 0x05
+'aa',    # 0x06
+'i',    # 0x07
+'ii',    # 0x08
+'u',    # 0x09
+'uu',    # 0x0a
+'R',    # 0x0b
+'L',    # 0x0c
+'[?]',    # 0x0d
+'[?]',    # 0x0e
+'e',    # 0x0f
+'ai',    # 0x10
+'[?]',    # 0x11
+'[?]',    # 0x12
+'o',    # 0x13
+'au',    # 0x14
+'k',    # 0x15
+'kh',    # 0x16
+'g',    # 0x17
+'gh',    # 0x18
+'ng',    # 0x19
+'c',    # 0x1a
+'ch',    # 0x1b
+'j',    # 0x1c
+'jh',    # 0x1d
+'ny',    # 0x1e
+'tt',    # 0x1f
+'tth',    # 0x20
+'dd',    # 0x21
+'ddh',    # 0x22
+'nn',    # 0x23
+'t',    # 0x24
+'th',    # 0x25
+'d',    # 0x26
+'dh',    # 0x27
+'n',    # 0x28
+'[?]',    # 0x29
+'p',    # 0x2a
+'ph',    # 0x2b
+'b',    # 0x2c
+'bh',    # 0x2d
+'m',    # 0x2e
+'y',    # 0x2f
+'r',    # 0x30
+'[?]',    # 0x31
+'l',    # 0x32
+'ll',    # 0x33
+'[?]',    # 0x34
+'',    # 0x35
+'sh',    # 0x36
+'ss',    # 0x37
+'s',    # 0x38
+'h',    # 0x39
+'[?]',    # 0x3a
+'[?]',    # 0x3b
+'\'',    # 0x3c
+'\'',    # 0x3d
+'aa',    # 0x3e
+'i',    # 0x3f
+'ii',    # 0x40
+'u',    # 0x41
+'uu',    # 0x42
+'R',    # 0x43
+'[?]',    # 0x44
+'[?]',    # 0x45
+'[?]',    # 0x46
+'e',    # 0x47
+'ai',    # 0x48
+'[?]',    # 0x49
+'[?]',    # 0x4a
+'o',    # 0x4b
+'au',    # 0x4c
+'',    # 0x4d
+'[?]',    # 0x4e
+'[?]',    # 0x4f
+'[?]',    # 0x50
+'[?]',    # 0x51
+'[?]',    # 0x52
+'[?]',    # 0x53
+'[?]',    # 0x54
+'[?]',    # 0x55
+'+',    # 0x56
+'+',    # 0x57
+'[?]',    # 0x58
+'[?]',    # 0x59
+'[?]',    # 0x5a
+'[?]',    # 0x5b
+'rr',    # 0x5c
+'rh',    # 0x5d
+'[?]',    # 0x5e
+'yy',    # 0x5f
+'RR',    # 0x60
+'LL',    # 0x61
+'[?]',    # 0x62
+'[?]',    # 0x63
+'[?]',    # 0x64
+'[?]',    # 0x65
+'0',    # 0x66
+'1',    # 0x67
+'2',    # 0x68
+'3',    # 0x69
+'4',    # 0x6a
+'5',    # 0x6b
+'6',    # 0x6c
+'7',    # 0x6d
+'8',    # 0x6e
+'9',    # 0x6f
+'',    # 0x70
+'[?]',    # 0x71
+'[?]',    # 0x72
+'[?]',    # 0x73
+'[?]',    # 0x74
+'[?]',    # 0x75
+'[?]',    # 0x76
+'[?]',    # 0x77
+'[?]',    # 0x78
+'[?]',    # 0x79
+'[?]',    # 0x7a
+'[?]',    # 0x7b
+'[?]',    # 0x7c
+'[?]',    # 0x7d
+'[?]',    # 0x7e
+'[?]',    # 0x7f
+'[?]',    # 0x80
+'[?]',    # 0x81
+'N',    # 0x82
+'H',    # 0x83
+'[?]',    # 0x84
+'a',    # 0x85
+'aa',    # 0x86
+'i',    # 0x87
+'ii',    # 0x88
+'u',    # 0x89
+'uu',    # 0x8a
+'[?]',    # 0x8b
+'[?]',    # 0x8c
+'[?]',    # 0x8d
+'e',    # 0x8e
+'ee',    # 0x8f
+'ai',    # 0x90
+'[?]',    # 0x91
+'o',    # 0x92
+'oo',    # 0x93
+'au',    # 0x94
+'k',    # 0x95
+'[?]',    # 0x96
+'[?]',    # 0x97
+'[?]',    # 0x98
+'ng',    # 0x99
+'c',    # 0x9a
+'[?]',    # 0x9b
+'j',    # 0x9c
+'[?]',    # 0x9d
+'ny',    # 0x9e
+'tt',    # 0x9f
+'[?]',    # 0xa0
+'[?]',    # 0xa1
+'[?]',    # 0xa2
+'nn',    # 0xa3
+'t',    # 0xa4
+'[?]',    # 0xa5
+'[?]',    # 0xa6
+'[?]',    # 0xa7
+'n',    # 0xa8
+'nnn',    # 0xa9
+'p',    # 0xaa
+'[?]',    # 0xab
+'[?]',    # 0xac
+'[?]',    # 0xad
+'m',    # 0xae
+'y',    # 0xaf
+'r',    # 0xb0
+'rr',    # 0xb1
+'l',    # 0xb2
+'ll',    # 0xb3
+'lll',    # 0xb4
+'v',    # 0xb5
+'[?]',    # 0xb6
+'ss',    # 0xb7
+'s',    # 0xb8
+'h',    # 0xb9
+'[?]',    # 0xba
+'[?]',    # 0xbb
+'[?]',    # 0xbc
+'[?]',    # 0xbd
+'aa',    # 0xbe
+'i',    # 0xbf
+'ii',    # 0xc0
+'u',    # 0xc1
+'uu',    # 0xc2
+'[?]',    # 0xc3
+'[?]',    # 0xc4
+'[?]',    # 0xc5
+'e',    # 0xc6
+'ee',    # 0xc7
+'ai',    # 0xc8
+'[?]',    # 0xc9
+'o',    # 0xca
+'oo',    # 0xcb
+'au',    # 0xcc
+'',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'[?]',    # 0xd0
+'[?]',    # 0xd1
+'[?]',    # 0xd2
+'[?]',    # 0xd3
+'[?]',    # 0xd4
+'[?]',    # 0xd5
+'[?]',    # 0xd6
+'+',    # 0xd7
+'[?]',    # 0xd8
+'[?]',    # 0xd9
+'[?]',    # 0xda
+'[?]',    # 0xdb
+'[?]',    # 0xdc
+'[?]',    # 0xdd
+'[?]',    # 0xde
+'[?]',    # 0xdf
+'[?]',    # 0xe0
+'[?]',    # 0xe1
+'[?]',    # 0xe2
+'[?]',    # 0xe3
+'[?]',    # 0xe4
+'[?]',    # 0xe5
+'0',    # 0xe6
+'1',    # 0xe7
+'2',    # 0xe8
+'3',    # 0xe9
+'4',    # 0xea
+'5',    # 0xeb
+'6',    # 0xec
+'7',    # 0xed
+'8',    # 0xee
+'9',    # 0xef
+'+10+',    # 0xf0
+'+100+',    # 0xf1
+'+1000+',    # 0xf2
+'[?]',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x00c.py b/lib/unidecode/x00c.py
new file mode 100644
index 00000000..56f3654f
--- /dev/null
+++ b/lib/unidecode/x00c.py
@@ -0,0 +1,257 @@
+data = (
+'[?]',    # 0x00
+'N',    # 0x01
+'N',    # 0x02
+'H',    # 0x03
+'[?]',    # 0x04
+'a',    # 0x05
+'aa',    # 0x06
+'i',    # 0x07
+'ii',    # 0x08
+'u',    # 0x09
+'uu',    # 0x0a
+'R',    # 0x0b
+'L',    # 0x0c
+'[?]',    # 0x0d
+'e',    # 0x0e
+'ee',    # 0x0f
+'ai',    # 0x10
+'[?]',    # 0x11
+'o',    # 0x12
+'oo',    # 0x13
+'au',    # 0x14
+'k',    # 0x15
+'kh',    # 0x16
+'g',    # 0x17
+'gh',    # 0x18
+'ng',    # 0x19
+'c',    # 0x1a
+'ch',    # 0x1b
+'j',    # 0x1c
+'jh',    # 0x1d
+'ny',    # 0x1e
+'tt',    # 0x1f
+'tth',    # 0x20
+'dd',    # 0x21
+'ddh',    # 0x22
+'nn',    # 0x23
+'t',    # 0x24
+'th',    # 0x25
+'d',    # 0x26
+'dh',    # 0x27
+'n',    # 0x28
+'[?]',    # 0x29
+'p',    # 0x2a
+'ph',    # 0x2b
+'b',    # 0x2c
+'bh',    # 0x2d
+'m',    # 0x2e
+'y',    # 0x2f
+'r',    # 0x30
+'rr',    # 0x31
+'l',    # 0x32
+'ll',    # 0x33
+'[?]',    # 0x34
+'v',    # 0x35
+'sh',    # 0x36
+'ss',    # 0x37
+'s',    # 0x38
+'h',    # 0x39
+'[?]',    # 0x3a
+'[?]',    # 0x3b
+'[?]',    # 0x3c
+'[?]',    # 0x3d
+'aa',    # 0x3e
+'i',    # 0x3f
+'ii',    # 0x40
+'u',    # 0x41
+'uu',    # 0x42
+'R',    # 0x43
+'RR',    # 0x44
+'[?]',    # 0x45
+'e',    # 0x46
+'ee',    # 0x47
+'ai',    # 0x48
+'[?]',    # 0x49
+'o',    # 0x4a
+'oo',    # 0x4b
+'au',    # 0x4c
+'',    # 0x4d
+'[?]',    # 0x4e
+'[?]',    # 0x4f
+'[?]',    # 0x50
+'[?]',    # 0x51
+'[?]',    # 0x52
+'[?]',    # 0x53
+'[?]',    # 0x54
+'+',    # 0x55
+'+',    # 0x56
+'[?]',    # 0x57
+'[?]',    # 0x58
+'[?]',    # 0x59
+'[?]',    # 0x5a
+'[?]',    # 0x5b
+'[?]',    # 0x5c
+'[?]',    # 0x5d
+'[?]',    # 0x5e
+'[?]',    # 0x5f
+'RR',    # 0x60
+'LL',    # 0x61
+'[?]',    # 0x62
+'[?]',    # 0x63
+'[?]',    # 0x64
+'[?]',    # 0x65
+'0',    # 0x66
+'1',    # 0x67
+'2',    # 0x68
+'3',    # 0x69
+'4',    # 0x6a
+'5',    # 0x6b
+'6',    # 0x6c
+'7',    # 0x6d
+'8',    # 0x6e
+'9',    # 0x6f
+'[?]',    # 0x70
+'[?]',    # 0x71
+'[?]',    # 0x72
+'[?]',    # 0x73
+'[?]',    # 0x74
+'[?]',    # 0x75
+'[?]',    # 0x76
+'[?]',    # 0x77
+'[?]',    # 0x78
+'[?]',    # 0x79
+'[?]',    # 0x7a
+'[?]',    # 0x7b
+'[?]',    # 0x7c
+'[?]',    # 0x7d
+'[?]',    # 0x7e
+'[?]',    # 0x7f
+'[?]',    # 0x80
+'[?]',    # 0x81
+'N',    # 0x82
+'H',    # 0x83
+'[?]',    # 0x84
+'a',    # 0x85
+'aa',    # 0x86
+'i',    # 0x87
+'ii',    # 0x88
+'u',    # 0x89
+'uu',    # 0x8a
+'R',    # 0x8b
+'L',    # 0x8c
+'[?]',    # 0x8d
+'e',    # 0x8e
+'ee',    # 0x8f
+'ai',    # 0x90
+'[?]',    # 0x91
+'o',    # 0x92
+'oo',    # 0x93
+'au',    # 0x94
+'k',    # 0x95
+'kh',    # 0x96
+'g',    # 0x97
+'gh',    # 0x98
+'ng',    # 0x99
+'c',    # 0x9a
+'ch',    # 0x9b
+'j',    # 0x9c
+'jh',    # 0x9d
+'ny',    # 0x9e
+'tt',    # 0x9f
+'tth',    # 0xa0
+'dd',    # 0xa1
+'ddh',    # 0xa2
+'nn',    # 0xa3
+'t',    # 0xa4
+'th',    # 0xa5
+'d',    # 0xa6
+'dh',    # 0xa7
+'n',    # 0xa8
+'[?]',    # 0xa9
+'p',    # 0xaa
+'ph',    # 0xab
+'b',    # 0xac
+'bh',    # 0xad
+'m',    # 0xae
+'y',    # 0xaf
+'r',    # 0xb0
+'rr',    # 0xb1
+'l',    # 0xb2
+'ll',    # 0xb3
+'[?]',    # 0xb4
+'v',    # 0xb5
+'sh',    # 0xb6
+'ss',    # 0xb7
+'s',    # 0xb8
+'h',    # 0xb9
+'[?]',    # 0xba
+'[?]',    # 0xbb
+'[?]',    # 0xbc
+'[?]',    # 0xbd
+'aa',    # 0xbe
+'i',    # 0xbf
+'ii',    # 0xc0
+'u',    # 0xc1
+'uu',    # 0xc2
+'R',    # 0xc3
+'RR',    # 0xc4
+'[?]',    # 0xc5
+'e',    # 0xc6
+'ee',    # 0xc7
+'ai',    # 0xc8
+'[?]',    # 0xc9
+'o',    # 0xca
+'oo',    # 0xcb
+'au',    # 0xcc
+'',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'[?]',    # 0xd0
+'[?]',    # 0xd1
+'[?]',    # 0xd2
+'[?]',    # 0xd3
+'[?]',    # 0xd4
+'+',    # 0xd5
+'+',    # 0xd6
+'[?]',    # 0xd7
+'[?]',    # 0xd8
+'[?]',    # 0xd9
+'[?]',    # 0xda
+'[?]',    # 0xdb
+'[?]',    # 0xdc
+'[?]',    # 0xdd
+'lll',    # 0xde
+'[?]',    # 0xdf
+'RR',    # 0xe0
+'LL',    # 0xe1
+'[?]',    # 0xe2
+'[?]',    # 0xe3
+'[?]',    # 0xe4
+'[?]',    # 0xe5
+'0',    # 0xe6
+'1',    # 0xe7
+'2',    # 0xe8
+'3',    # 0xe9
+'4',    # 0xea
+'5',    # 0xeb
+'6',    # 0xec
+'7',    # 0xed
+'8',    # 0xee
+'9',    # 0xef
+'[?]',    # 0xf0
+'[?]',    # 0xf1
+'[?]',    # 0xf2
+'[?]',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x00d.py b/lib/unidecode/x00d.py
new file mode 100644
index 00000000..d105c437
--- /dev/null
+++ b/lib/unidecode/x00d.py
@@ -0,0 +1,257 @@
+data = (
+'[?]',    # 0x00
+'[?]',    # 0x01
+'N',    # 0x02
+'H',    # 0x03
+'[?]',    # 0x04
+'a',    # 0x05
+'aa',    # 0x06
+'i',    # 0x07
+'ii',    # 0x08
+'u',    # 0x09
+'uu',    # 0x0a
+'R',    # 0x0b
+'L',    # 0x0c
+'[?]',    # 0x0d
+'e',    # 0x0e
+'ee',    # 0x0f
+'ai',    # 0x10
+'[?]',    # 0x11
+'o',    # 0x12
+'oo',    # 0x13
+'au',    # 0x14
+'k',    # 0x15
+'kh',    # 0x16
+'g',    # 0x17
+'gh',    # 0x18
+'ng',    # 0x19
+'c',    # 0x1a
+'ch',    # 0x1b
+'j',    # 0x1c
+'jh',    # 0x1d
+'ny',    # 0x1e
+'tt',    # 0x1f
+'tth',    # 0x20
+'dd',    # 0x21
+'ddh',    # 0x22
+'nn',    # 0x23
+'t',    # 0x24
+'th',    # 0x25
+'d',    # 0x26
+'dh',    # 0x27
+'n',    # 0x28
+'[?]',    # 0x29
+'p',    # 0x2a
+'ph',    # 0x2b
+'b',    # 0x2c
+'bh',    # 0x2d
+'m',    # 0x2e
+'y',    # 0x2f
+'r',    # 0x30
+'rr',    # 0x31
+'l',    # 0x32
+'ll',    # 0x33
+'lll',    # 0x34
+'v',    # 0x35
+'sh',    # 0x36
+'ss',    # 0x37
+'s',    # 0x38
+'h',    # 0x39
+'[?]',    # 0x3a
+'[?]',    # 0x3b
+'[?]',    # 0x3c
+'[?]',    # 0x3d
+'aa',    # 0x3e
+'i',    # 0x3f
+'ii',    # 0x40
+'u',    # 0x41
+'uu',    # 0x42
+'R',    # 0x43
+'[?]',    # 0x44
+'[?]',    # 0x45
+'e',    # 0x46
+'ee',    # 0x47
+'ai',    # 0x48
+'',    # 0x49
+'o',    # 0x4a
+'oo',    # 0x4b
+'au',    # 0x4c
+'',    # 0x4d
+'[?]',    # 0x4e
+'[?]',    # 0x4f
+'[?]',    # 0x50
+'[?]',    # 0x51
+'[?]',    # 0x52
+'[?]',    # 0x53
+'[?]',    # 0x54
+'[?]',    # 0x55
+'[?]',    # 0x56
+'+',    # 0x57
+'[?]',    # 0x58
+'[?]',    # 0x59
+'[?]',    # 0x5a
+'[?]',    # 0x5b
+'[?]',    # 0x5c
+'[?]',    # 0x5d
+'[?]',    # 0x5e
+'[?]',    # 0x5f
+'RR',    # 0x60
+'LL',    # 0x61
+'[?]',    # 0x62
+'[?]',    # 0x63
+'[?]',    # 0x64
+'[?]',    # 0x65
+'0',    # 0x66
+'1',    # 0x67
+'2',    # 0x68
+'3',    # 0x69
+'4',    # 0x6a
+'5',    # 0x6b
+'6',    # 0x6c
+'7',    # 0x6d
+'8',    # 0x6e
+'9',    # 0x6f
+'[?]',    # 0x70
+'[?]',    # 0x71
+'[?]',    # 0x72
+'[?]',    # 0x73
+'[?]',    # 0x74
+'[?]',    # 0x75
+'[?]',    # 0x76
+'[?]',    # 0x77
+'[?]',    # 0x78
+'[?]',    # 0x79
+'[?]',    # 0x7a
+'[?]',    # 0x7b
+'[?]',    # 0x7c
+'[?]',    # 0x7d
+'[?]',    # 0x7e
+'[?]',    # 0x7f
+'[?]',    # 0x80
+'[?]',    # 0x81
+'N',    # 0x82
+'H',    # 0x83
+'[?]',    # 0x84
+'a',    # 0x85
+'aa',    # 0x86
+'ae',    # 0x87
+'aae',    # 0x88
+'i',    # 0x89
+'ii',    # 0x8a
+'u',    # 0x8b
+'uu',    # 0x8c
+'R',    # 0x8d
+'RR',    # 0x8e
+'L',    # 0x8f
+'LL',    # 0x90
+'e',    # 0x91
+'ee',    # 0x92
+'ai',    # 0x93
+'o',    # 0x94
+'oo',    # 0x95
+'au',    # 0x96
+'[?]',    # 0x97
+'[?]',    # 0x98
+'[?]',    # 0x99
+'k',    # 0x9a
+'kh',    # 0x9b
+'g',    # 0x9c
+'gh',    # 0x9d
+'ng',    # 0x9e
+'nng',    # 0x9f
+'c',    # 0xa0
+'ch',    # 0xa1
+'j',    # 0xa2
+'jh',    # 0xa3
+'ny',    # 0xa4
+'jny',    # 0xa5
+'nyj',    # 0xa6
+'tt',    # 0xa7
+'tth',    # 0xa8
+'dd',    # 0xa9
+'ddh',    # 0xaa
+'nn',    # 0xab
+'nndd',    # 0xac
+'t',    # 0xad
+'th',    # 0xae
+'d',    # 0xaf
+'dh',    # 0xb0
+'n',    # 0xb1
+'[?]',    # 0xb2
+'nd',    # 0xb3
+'p',    # 0xb4
+'ph',    # 0xb5
+'b',    # 0xb6
+'bh',    # 0xb7
+'m',    # 0xb8
+'mb',    # 0xb9
+'y',    # 0xba
+'r',    # 0xbb
+'[?]',    # 0xbc
+'l',    # 0xbd
+'[?]',    # 0xbe
+'[?]',    # 0xbf
+'v',    # 0xc0
+'sh',    # 0xc1
+'ss',    # 0xc2
+'s',    # 0xc3
+'h',    # 0xc4
+'ll',    # 0xc5
+'f',    # 0xc6
+'[?]',    # 0xc7
+'[?]',    # 0xc8
+'[?]',    # 0xc9
+'',    # 0xca
+'[?]',    # 0xcb
+'[?]',    # 0xcc
+'[?]',    # 0xcd
+'[?]',    # 0xce
+'aa',    # 0xcf
+'ae',    # 0xd0
+'aae',    # 0xd1
+'i',    # 0xd2
+'ii',    # 0xd3
+'u',    # 0xd4
+'[?]',    # 0xd5
+'uu',    # 0xd6
+'[?]',    # 0xd7
+'R',    # 0xd8
+'e',    # 0xd9
+'ee',    # 0xda
+'ai',    # 0xdb
+'o',    # 0xdc
+'oo',    # 0xdd
+'au',    # 0xde
+'L',    # 0xdf
+'[?]',    # 0xe0
+'[?]',    # 0xe1
+'[?]',    # 0xe2
+'[?]',    # 0xe3
+'[?]',    # 0xe4
+'[?]',    # 0xe5
+'[?]',    # 0xe6
+'[?]',    # 0xe7
+'[?]',    # 0xe8
+'[?]',    # 0xe9
+'[?]',    # 0xea
+'[?]',    # 0xeb
+'[?]',    # 0xec
+'[?]',    # 0xed
+'[?]',    # 0xee
+'[?]',    # 0xef
+'[?]',    # 0xf0
+'[?]',    # 0xf1
+'RR',    # 0xf2
+'LL',    # 0xf3
+' . ',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x00e.py b/lib/unidecode/x00e.py
new file mode 100644
index 00000000..775b5f4a
--- /dev/null
+++ b/lib/unidecode/x00e.py
@@ -0,0 +1,257 @@
+data = (
+'[?]',    # 0x00
+'k',    # 0x01
+'kh',    # 0x02
+'kh',    # 0x03
+'kh',    # 0x04
+'kh',    # 0x05
+'kh',    # 0x06
+'ng',    # 0x07
+'cch',    # 0x08
+'ch',    # 0x09
+'ch',    # 0x0a
+'ch',    # 0x0b
+'ch',    # 0x0c
+'y',    # 0x0d
+'d',    # 0x0e
+'t',    # 0x0f
+'th',    # 0x10
+'th',    # 0x11
+'th',    # 0x12
+'n',    # 0x13
+'d',    # 0x14
+'t',    # 0x15
+'th',    # 0x16
+'th',    # 0x17
+'th',    # 0x18
+'n',    # 0x19
+'b',    # 0x1a
+'p',    # 0x1b
+'ph',    # 0x1c
+'f',    # 0x1d
+'ph',    # 0x1e
+'f',    # 0x1f
+'ph',    # 0x20
+'m',    # 0x21
+'y',    # 0x22
+'r',    # 0x23
+'R',    # 0x24
+'l',    # 0x25
+'L',    # 0x26
+'w',    # 0x27
+'s',    # 0x28
+'s',    # 0x29
+'s',    # 0x2a
+'h',    # 0x2b
+'l',    # 0x2c
+'`',    # 0x2d
+'h',    # 0x2e
+'~',    # 0x2f
+'a',    # 0x30
+'a',    # 0x31
+'aa',    # 0x32
+'am',    # 0x33
+'i',    # 0x34
+'ii',    # 0x35
+'ue',    # 0x36
+'uue',    # 0x37
+'u',    # 0x38
+'uu',    # 0x39
+'\'',    # 0x3a
+'[?]',    # 0x3b
+'[?]',    # 0x3c
+'[?]',    # 0x3d
+'[?]',    # 0x3e
+'Bh.',    # 0x3f
+'e',    # 0x40
+'ae',    # 0x41
+'o',    # 0x42
+'ai',    # 0x43
+'ai',    # 0x44
+'ao',    # 0x45
+'+',    # 0x46
+'',    # 0x47
+'',    # 0x48
+'',    # 0x49
+'',    # 0x4a
+'',    # 0x4b
+'',    # 0x4c
+'M',    # 0x4d
+'',    # 0x4e
+' * ',    # 0x4f
+'0',    # 0x50
+'1',    # 0x51
+'2',    # 0x52
+'3',    # 0x53
+'4',    # 0x54
+'5',    # 0x55
+'6',    # 0x56
+'7',    # 0x57
+'8',    # 0x58
+'9',    # 0x59
+' // ',    # 0x5a
+' /// ',    # 0x5b
+'[?]',    # 0x5c
+'[?]',    # 0x5d
+'[?]',    # 0x5e
+'[?]',    # 0x5f
+'[?]',    # 0x60
+'[?]',    # 0x61
+'[?]',    # 0x62
+'[?]',    # 0x63
+'[?]',    # 0x64
+'[?]',    # 0x65
+'[?]',    # 0x66
+'[?]',    # 0x67
+'[?]',    # 0x68
+'[?]',    # 0x69
+'[?]',    # 0x6a
+'[?]',    # 0x6b
+'[?]',    # 0x6c
+'[?]',    # 0x6d
+'[?]',    # 0x6e
+'[?]',    # 0x6f
+'[?]',    # 0x70
+'[?]',    # 0x71
+'[?]',    # 0x72
+'[?]',    # 0x73
+'[?]',    # 0x74
+'[?]',    # 0x75
+'[?]',    # 0x76
+'[?]',    # 0x77
+'[?]',    # 0x78
+'[?]',    # 0x79
+'[?]',    # 0x7a
+'[?]',    # 0x7b
+'[?]',    # 0x7c
+'[?]',    # 0x7d
+'[?]',    # 0x7e
+'[?]',    # 0x7f
+'[?]',    # 0x80
+'k',    # 0x81
+'kh',    # 0x82
+'[?]',    # 0x83
+'kh',    # 0x84
+'[?]',    # 0x85
+'[?]',    # 0x86
+'ng',    # 0x87
+'ch',    # 0x88
+'[?]',    # 0x89
+'s',    # 0x8a
+'[?]',    # 0x8b
+'[?]',    # 0x8c
+'ny',    # 0x8d
+'[?]',    # 0x8e
+'[?]',    # 0x8f
+'[?]',    # 0x90
+'[?]',    # 0x91
+'[?]',    # 0x92
+'[?]',    # 0x93
+'d',    # 0x94
+'h',    # 0x95
+'th',    # 0x96
+'th',    # 0x97
+'[?]',    # 0x98
+'n',    # 0x99
+'b',    # 0x9a
+'p',    # 0x9b
+'ph',    # 0x9c
+'f',    # 0x9d
+'ph',    # 0x9e
+'f',    # 0x9f
+'[?]',    # 0xa0
+'m',    # 0xa1
+'y',    # 0xa2
+'r',    # 0xa3
+'[?]',    # 0xa4
+'l',    # 0xa5
+'[?]',    # 0xa6
+'w',    # 0xa7
+'[?]',    # 0xa8
+'[?]',    # 0xa9
+'s',    # 0xaa
+'h',    # 0xab
+'[?]',    # 0xac
+'`',    # 0xad
+'',    # 0xae
+'~',    # 0xaf
+'a',    # 0xb0
+'',    # 0xb1
+'aa',    # 0xb2
+'am',    # 0xb3
+'i',    # 0xb4
+'ii',    # 0xb5
+'y',    # 0xb6
+'yy',    # 0xb7
+'u',    # 0xb8
+'uu',    # 0xb9
+'[?]',    # 0xba
+'o',    # 0xbb
+'l',    # 0xbc
+'ny',    # 0xbd
+'[?]',    # 0xbe
+'[?]',    # 0xbf
+'e',    # 0xc0
+'ei',    # 0xc1
+'o',    # 0xc2
+'ay',    # 0xc3
+'ai',    # 0xc4
+'[?]',    # 0xc5
+'+',    # 0xc6
+'[?]',    # 0xc7
+'',    # 0xc8
+'',    # 0xc9
+'',    # 0xca
+'',    # 0xcb
+'',    # 0xcc
+'M',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'0',    # 0xd0
+'1',    # 0xd1
+'2',    # 0xd2
+'3',    # 0xd3
+'4',    # 0xd4
+'5',    # 0xd5
+'6',    # 0xd6
+'7',    # 0xd7
+'8',    # 0xd8
+'9',    # 0xd9
+'[?]',    # 0xda
+'[?]',    # 0xdb
+'hn',    # 0xdc
+'hm',    # 0xdd
+'[?]',    # 0xde
+'[?]',    # 0xdf
+'[?]',    # 0xe0
+'[?]',    # 0xe1
+'[?]',    # 0xe2
+'[?]',    # 0xe3
+'[?]',    # 0xe4
+'[?]',    # 0xe5
+'[?]',    # 0xe6
+'[?]',    # 0xe7
+'[?]',    # 0xe8
+'[?]',    # 0xe9
+'[?]',    # 0xea
+'[?]',    # 0xeb
+'[?]',    # 0xec
+'[?]',    # 0xed
+'[?]',    # 0xee
+'[?]',    # 0xef
+'[?]',    # 0xf0
+'[?]',    # 0xf1
+'[?]',    # 0xf2
+'[?]',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x00f.py b/lib/unidecode/x00f.py
new file mode 100644
index 00000000..4c2410e0
--- /dev/null
+++ b/lib/unidecode/x00f.py
@@ -0,0 +1,257 @@
+data = (
+'AUM',    # 0x00
+'',    # 0x01
+'',    # 0x02
+'',    # 0x03
+'',    # 0x04
+'',    # 0x05
+'',    # 0x06
+'',    # 0x07
+' // ',    # 0x08
+' * ',    # 0x09
+'',    # 0x0a
+'-',    # 0x0b
+' / ',    # 0x0c
+' / ',    # 0x0d
+' // ',    # 0x0e
+' -/ ',    # 0x0f
+' +/ ',    # 0x10
+' X/ ',    # 0x11
+' /XX/ ',    # 0x12
+' /X/ ',    # 0x13
+', ',    # 0x14
+'',    # 0x15
+'',    # 0x16
+'',    # 0x17
+'',    # 0x18
+'',    # 0x19
+'',    # 0x1a
+'',    # 0x1b
+'',    # 0x1c
+'',    # 0x1d
+'',    # 0x1e
+'',    # 0x1f
+'0',    # 0x20
+'1',    # 0x21
+'2',    # 0x22
+'3',    # 0x23
+'4',    # 0x24
+'5',    # 0x25
+'6',    # 0x26
+'7',    # 0x27
+'8',    # 0x28
+'9',    # 0x29
+'.5',    # 0x2a
+'1.5',    # 0x2b
+'2.5',    # 0x2c
+'3.5',    # 0x2d
+'4.5',    # 0x2e
+'5.5',    # 0x2f
+'6.5',    # 0x30
+'7.5',    # 0x31
+'8.5',    # 0x32
+'-.5',    # 0x33
+'+',    # 0x34
+'*',    # 0x35
+'^',    # 0x36
+'_',    # 0x37
+'',    # 0x38
+'~',    # 0x39
+'[?]',    # 0x3a
+']',    # 0x3b
+'[[',    # 0x3c
+']]',    # 0x3d
+'',    # 0x3e
+'',    # 0x3f
+'k',    # 0x40
+'kh',    # 0x41
+'g',    # 0x42
+'gh',    # 0x43
+'ng',    # 0x44
+'c',    # 0x45
+'ch',    # 0x46
+'j',    # 0x47
+'[?]',    # 0x48
+'ny',    # 0x49
+'tt',    # 0x4a
+'tth',    # 0x4b
+'dd',    # 0x4c
+'ddh',    # 0x4d
+'nn',    # 0x4e
+'t',    # 0x4f
+'th',    # 0x50
+'d',    # 0x51
+'dh',    # 0x52
+'n',    # 0x53
+'p',    # 0x54
+'ph',    # 0x55
+'b',    # 0x56
+'bh',    # 0x57
+'m',    # 0x58
+'ts',    # 0x59
+'tsh',    # 0x5a
+'dz',    # 0x5b
+'dzh',    # 0x5c
+'w',    # 0x5d
+'zh',    # 0x5e
+'z',    # 0x5f
+'\'',    # 0x60
+'y',    # 0x61
+'r',    # 0x62
+'l',    # 0x63
+'sh',    # 0x64
+'ssh',    # 0x65
+'s',    # 0x66
+'h',    # 0x67
+'a',    # 0x68
+'kss',    # 0x69
+'r',    # 0x6a
+'[?]',    # 0x6b
+'[?]',    # 0x6c
+'[?]',    # 0x6d
+'[?]',    # 0x6e
+'[?]',    # 0x6f
+'[?]',    # 0x70
+'aa',    # 0x71
+'i',    # 0x72
+'ii',    # 0x73
+'u',    # 0x74
+'uu',    # 0x75
+'R',    # 0x76
+'RR',    # 0x77
+'L',    # 0x78
+'LL',    # 0x79
+'e',    # 0x7a
+'ee',    # 0x7b
+'o',    # 0x7c
+'oo',    # 0x7d
+'M',    # 0x7e
+'H',    # 0x7f
+'i',    # 0x80
+'ii',    # 0x81
+'',    # 0x82
+'',    # 0x83
+'',    # 0x84
+'',    # 0x85
+'',    # 0x86
+'',    # 0x87
+'',    # 0x88
+'',    # 0x89
+'',    # 0x8a
+'',    # 0x8b
+'[?]',    # 0x8c
+'[?]',    # 0x8d
+'[?]',    # 0x8e
+'[?]',    # 0x8f
+'k',    # 0x90
+'kh',    # 0x91
+'g',    # 0x92
+'gh',    # 0x93
+'ng',    # 0x94
+'c',    # 0x95
+'ch',    # 0x96
+'j',    # 0x97
+'[?]',    # 0x98
+'ny',    # 0x99
+'tt',    # 0x9a
+'tth',    # 0x9b
+'dd',    # 0x9c
+'ddh',    # 0x9d
+'nn',    # 0x9e
+'t',    # 0x9f
+'th',    # 0xa0
+'d',    # 0xa1
+'dh',    # 0xa2
+'n',    # 0xa3
+'p',    # 0xa4
+'ph',    # 0xa5
+'b',    # 0xa6
+'bh',    # 0xa7
+'m',    # 0xa8
+'ts',    # 0xa9
+'tsh',    # 0xaa
+'dz',    # 0xab
+'dzh',    # 0xac
+'w',    # 0xad
+'zh',    # 0xae
+'z',    # 0xaf
+'\'',    # 0xb0
+'y',    # 0xb1
+'r',    # 0xb2
+'l',    # 0xb3
+'sh',    # 0xb4
+'ss',    # 0xb5
+'s',    # 0xb6
+'h',    # 0xb7
+'a',    # 0xb8
+'kss',    # 0xb9
+'w',    # 0xba
+'y',    # 0xbb
+'r',    # 0xbc
+'[?]',    # 0xbd
+'X',    # 0xbe
+' :X: ',    # 0xbf
+' /O/ ',    # 0xc0
+' /o/ ',    # 0xc1
+' \\o\\ ',    # 0xc2
+' (O) ',    # 0xc3
+'',    # 0xc4
+'',    # 0xc5
+'',    # 0xc6
+'',    # 0xc7
+'',    # 0xc8
+'',    # 0xc9
+'',    # 0xca
+'',    # 0xcb
+'',    # 0xcc
+'[?]',    # 0xcd
+'[?]',    # 0xce
+'',    # 0xcf
+'[?]',    # 0xd0
+'[?]',    # 0xd1
+'[?]',    # 0xd2
+'[?]',    # 0xd3
+'[?]',    # 0xd4
+'[?]',    # 0xd5
+'[?]',    # 0xd6
+'[?]',    # 0xd7
+'[?]',    # 0xd8
+'[?]',    # 0xd9
+'[?]',    # 0xda
+'[?]',    # 0xdb
+'[?]',    # 0xdc
+'[?]',    # 0xdd
+'[?]',    # 0xde
+'[?]',    # 0xdf
+'[?]',    # 0xe0
+'[?]',    # 0xe1
+'[?]',    # 0xe2
+'[?]',    # 0xe3
+'[?]',    # 0xe4
+'[?]',    # 0xe5
+'[?]',    # 0xe6
+'[?]',    # 0xe7
+'[?]',    # 0xe8
+'[?]',    # 0xe9
+'[?]',    # 0xea
+'[?]',    # 0xeb
+'[?]',    # 0xec
+'[?]',    # 0xed
+'[?]',    # 0xee
+'[?]',    # 0xef
+'[?]',    # 0xf0
+'[?]',    # 0xf1
+'[?]',    # 0xf2
+'[?]',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x010.py b/lib/unidecode/x010.py
new file mode 100644
index 00000000..aaf820d9
--- /dev/null
+++ b/lib/unidecode/x010.py
@@ -0,0 +1,257 @@
+data = (
+'k',    # 0x00
+'kh',    # 0x01
+'g',    # 0x02
+'gh',    # 0x03
+'ng',    # 0x04
+'c',    # 0x05
+'ch',    # 0x06
+'j',    # 0x07
+'jh',    # 0x08
+'ny',    # 0x09
+'nny',    # 0x0a
+'tt',    # 0x0b
+'tth',    # 0x0c
+'dd',    # 0x0d
+'ddh',    # 0x0e
+'nn',    # 0x0f
+'tt',    # 0x10
+'th',    # 0x11
+'d',    # 0x12
+'dh',    # 0x13
+'n',    # 0x14
+'p',    # 0x15
+'ph',    # 0x16
+'b',    # 0x17
+'bh',    # 0x18
+'m',    # 0x19
+'y',    # 0x1a
+'r',    # 0x1b
+'l',    # 0x1c
+'w',    # 0x1d
+'s',    # 0x1e
+'h',    # 0x1f
+'ll',    # 0x20
+'a',    # 0x21
+'[?]',    # 0x22
+'i',    # 0x23
+'ii',    # 0x24
+'u',    # 0x25
+'uu',    # 0x26
+'e',    # 0x27
+'[?]',    # 0x28
+'o',    # 0x29
+'au',    # 0x2a
+'[?]',    # 0x2b
+'aa',    # 0x2c
+'i',    # 0x2d
+'ii',    # 0x2e
+'u',    # 0x2f
+'uu',    # 0x30
+'e',    # 0x31
+'ai',    # 0x32
+'[?]',    # 0x33
+'[?]',    # 0x34
+'[?]',    # 0x35
+'N',    # 0x36
+'\'',    # 0x37
+':',    # 0x38
+'',    # 0x39
+'[?]',    # 0x3a
+'[?]',    # 0x3b
+'[?]',    # 0x3c
+'[?]',    # 0x3d
+'[?]',    # 0x3e
+'[?]',    # 0x3f
+'0',    # 0x40
+'1',    # 0x41
+'2',    # 0x42
+'3',    # 0x43
+'4',    # 0x44
+'5',    # 0x45
+'6',    # 0x46
+'7',    # 0x47
+'8',    # 0x48
+'9',    # 0x49
+' / ',    # 0x4a
+' // ',    # 0x4b
+'n*',    # 0x4c
+'r*',    # 0x4d
+'l*',    # 0x4e
+'e*',    # 0x4f
+'sh',    # 0x50
+'ss',    # 0x51
+'R',    # 0x52
+'RR',    # 0x53
+'L',    # 0x54
+'LL',    # 0x55
+'R',    # 0x56
+'RR',    # 0x57
+'L',    # 0x58
+'LL',    # 0x59
+'[?]',    # 0x5a
+'[?]',    # 0x5b
+'[?]',    # 0x5c
+'[?]',    # 0x5d
+'[?]',    # 0x5e
+'[?]',    # 0x5f
+'[?]',    # 0x60
+'[?]',    # 0x61
+'[?]',    # 0x62
+'[?]',    # 0x63
+'[?]',    # 0x64
+'[?]',    # 0x65
+'[?]',    # 0x66
+'[?]',    # 0x67
+'[?]',    # 0x68
+'[?]',    # 0x69
+'[?]',    # 0x6a
+'[?]',    # 0x6b
+'[?]',    # 0x6c
+'[?]',    # 0x6d
+'[?]',    # 0x6e
+'[?]',    # 0x6f
+'[?]',    # 0x70
+'[?]',    # 0x71
+'[?]',    # 0x72
+'[?]',    # 0x73
+'[?]',    # 0x74
+'[?]',    # 0x75
+'[?]',    # 0x76
+'[?]',    # 0x77
+'[?]',    # 0x78
+'[?]',    # 0x79
+'[?]',    # 0x7a
+'[?]',    # 0x7b
+'[?]',    # 0x7c
+'[?]',    # 0x7d
+'[?]',    # 0x7e
+'[?]',    # 0x7f
+'[?]',    # 0x80
+'[?]',    # 0x81
+'[?]',    # 0x82
+'[?]',    # 0x83
+'[?]',    # 0x84
+'[?]',    # 0x85
+'[?]',    # 0x86
+'[?]',    # 0x87
+'[?]',    # 0x88
+'[?]',    # 0x89
+'[?]',    # 0x8a
+'[?]',    # 0x8b
+'[?]',    # 0x8c
+'[?]',    # 0x8d
+'[?]',    # 0x8e
+'[?]',    # 0x8f
+'[?]',    # 0x90
+'[?]',    # 0x91
+'[?]',    # 0x92
+'[?]',    # 0x93
+'[?]',    # 0x94
+'[?]',    # 0x95
+'[?]',    # 0x96
+'[?]',    # 0x97
+'[?]',    # 0x98
+'[?]',    # 0x99
+'[?]',    # 0x9a
+'[?]',    # 0x9b
+'[?]',    # 0x9c
+'[?]',    # 0x9d
+'[?]',    # 0x9e
+'[?]',    # 0x9f
+'A',    # 0xa0
+'B',    # 0xa1
+'G',    # 0xa2
+'D',    # 0xa3
+'E',    # 0xa4
+'V',    # 0xa5
+'Z',    # 0xa6
+'T`',    # 0xa7
+'I',    # 0xa8
+'K',    # 0xa9
+'L',    # 0xaa
+'M',    # 0xab
+'N',    # 0xac
+'O',    # 0xad
+'P',    # 0xae
+'Zh',    # 0xaf
+'R',    # 0xb0
+'S',    # 0xb1
+'T',    # 0xb2
+'U',    # 0xb3
+'P`',    # 0xb4
+'K`',    # 0xb5
+'G\'',    # 0xb6
+'Q',    # 0xb7
+'Sh',    # 0xb8
+'Ch`',    # 0xb9
+'C`',    # 0xba
+'Z\'',    # 0xbb
+'C',    # 0xbc
+'Ch',    # 0xbd
+'X',    # 0xbe
+'J',    # 0xbf
+'H',    # 0xc0
+'E',    # 0xc1
+'Y',    # 0xc2
+'W',    # 0xc3
+'Xh',    # 0xc4
+'OE',    # 0xc5
+'[?]',    # 0xc6
+'[?]',    # 0xc7
+'[?]',    # 0xc8
+'[?]',    # 0xc9
+'[?]',    # 0xca
+'[?]',    # 0xcb
+'[?]',    # 0xcc
+'[?]',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'a',    # 0xd0
+'b',    # 0xd1
+'g',    # 0xd2
+'d',    # 0xd3
+'e',    # 0xd4
+'v',    # 0xd5
+'z',    # 0xd6
+'t`',    # 0xd7
+'i',    # 0xd8
+'k',    # 0xd9
+'l',    # 0xda
+'m',    # 0xdb
+'n',    # 0xdc
+'o',    # 0xdd
+'p',    # 0xde
+'zh',    # 0xdf
+'r',    # 0xe0
+'s',    # 0xe1
+'t',    # 0xe2
+'u',    # 0xe3
+'p`',    # 0xe4
+'k`',    # 0xe5
+'g\'',    # 0xe6
+'q',    # 0xe7
+'sh',    # 0xe8
+'ch`',    # 0xe9
+'c`',    # 0xea
+'z\'',    # 0xeb
+'c',    # 0xec
+'ch',    # 0xed
+'x',    # 0xee
+'j',    # 0xef
+'h',    # 0xf0
+'e',    # 0xf1
+'y',    # 0xf2
+'w',    # 0xf3
+'xh',    # 0xf4
+'oe',    # 0xf5
+'f',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+' // ',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x011.py b/lib/unidecode/x011.py
new file mode 100644
index 00000000..f0d8f929
--- /dev/null
+++ b/lib/unidecode/x011.py
@@ -0,0 +1,257 @@
+data = (
+'g',    # 0x00
+'gg',    # 0x01
+'n',    # 0x02
+'d',    # 0x03
+'dd',    # 0x04
+'r',    # 0x05
+'m',    # 0x06
+'b',    # 0x07
+'bb',    # 0x08
+'s',    # 0x09
+'ss',    # 0x0a
+'',    # 0x0b
+'j',    # 0x0c
+'jj',    # 0x0d
+'c',    # 0x0e
+'k',    # 0x0f
+'t',    # 0x10
+'p',    # 0x11
+'h',    # 0x12
+'ng',    # 0x13
+'nn',    # 0x14
+'nd',    # 0x15
+'nb',    # 0x16
+'dg',    # 0x17
+'rn',    # 0x18
+'rr',    # 0x19
+'rh',    # 0x1a
+'rN',    # 0x1b
+'mb',    # 0x1c
+'mN',    # 0x1d
+'bg',    # 0x1e
+'bn',    # 0x1f
+'',    # 0x20
+'bs',    # 0x21
+'bsg',    # 0x22
+'bst',    # 0x23
+'bsb',    # 0x24
+'bss',    # 0x25
+'bsj',    # 0x26
+'bj',    # 0x27
+'bc',    # 0x28
+'bt',    # 0x29
+'bp',    # 0x2a
+'bN',    # 0x2b
+'bbN',    # 0x2c
+'sg',    # 0x2d
+'sn',    # 0x2e
+'sd',    # 0x2f
+'sr',    # 0x30
+'sm',    # 0x31
+'sb',    # 0x32
+'sbg',    # 0x33
+'sss',    # 0x34
+'s',    # 0x35
+'sj',    # 0x36
+'sc',    # 0x37
+'sk',    # 0x38
+'st',    # 0x39
+'sp',    # 0x3a
+'sh',    # 0x3b
+'',    # 0x3c
+'',    # 0x3d
+'',    # 0x3e
+'',    # 0x3f
+'Z',    # 0x40
+'g',    # 0x41
+'d',    # 0x42
+'m',    # 0x43
+'b',    # 0x44
+'s',    # 0x45
+'Z',    # 0x46
+'',    # 0x47
+'j',    # 0x48
+'c',    # 0x49
+'t',    # 0x4a
+'p',    # 0x4b
+'N',    # 0x4c
+'j',    # 0x4d
+'',    # 0x4e
+'',    # 0x4f
+'',    # 0x50
+'',    # 0x51
+'ck',    # 0x52
+'ch',    # 0x53
+'',    # 0x54
+'',    # 0x55
+'pb',    # 0x56
+'pN',    # 0x57
+'hh',    # 0x58
+'Q',    # 0x59
+'[?]',    # 0x5a
+'[?]',    # 0x5b
+'[?]',    # 0x5c
+'[?]',    # 0x5d
+'[?]',    # 0x5e
+'',    # 0x5f
+'',    # 0x60
+'a',    # 0x61
+'ae',    # 0x62
+'ya',    # 0x63
+'yae',    # 0x64
+'eo',    # 0x65
+'e',    # 0x66
+'yeo',    # 0x67
+'ye',    # 0x68
+'o',    # 0x69
+'wa',    # 0x6a
+'wae',    # 0x6b
+'oe',    # 0x6c
+'yo',    # 0x6d
+'u',    # 0x6e
+'weo',    # 0x6f
+'we',    # 0x70
+'wi',    # 0x71
+'yu',    # 0x72
+'eu',    # 0x73
+'yi',    # 0x74
+'i',    # 0x75
+'a-o',    # 0x76
+'a-u',    # 0x77
+'ya-o',    # 0x78
+'ya-yo',    # 0x79
+'eo-o',    # 0x7a
+'eo-u',    # 0x7b
+'eo-eu',    # 0x7c
+'yeo-o',    # 0x7d
+'yeo-u',    # 0x7e
+'o-eo',    # 0x7f
+'o-e',    # 0x80
+'o-ye',    # 0x81
+'o-o',    # 0x82
+'o-u',    # 0x83
+'yo-ya',    # 0x84
+'yo-yae',    # 0x85
+'yo-yeo',    # 0x86
+'yo-o',    # 0x87
+'yo-i',    # 0x88
+'u-a',    # 0x89
+'u-ae',    # 0x8a
+'u-eo-eu',    # 0x8b
+'u-ye',    # 0x8c
+'u-u',    # 0x8d
+'yu-a',    # 0x8e
+'yu-eo',    # 0x8f
+'yu-e',    # 0x90
+'yu-yeo',    # 0x91
+'yu-ye',    # 0x92
+'yu-u',    # 0x93
+'yu-i',    # 0x94
+'eu-u',    # 0x95
+'eu-eu',    # 0x96
+'yi-u',    # 0x97
+'i-a',    # 0x98
+'i-ya',    # 0x99
+'i-o',    # 0x9a
+'i-u',    # 0x9b
+'i-eu',    # 0x9c
+'i-U',    # 0x9d
+'U',    # 0x9e
+'U-eo',    # 0x9f
+'U-u',    # 0xa0
+'U-i',    # 0xa1
+'UU',    # 0xa2
+'[?]',    # 0xa3
+'[?]',    # 0xa4
+'[?]',    # 0xa5
+'[?]',    # 0xa6
+'[?]',    # 0xa7
+'g',    # 0xa8
+'gg',    # 0xa9
+'gs',    # 0xaa
+'n',    # 0xab
+'nj',    # 0xac
+'nh',    # 0xad
+'d',    # 0xae
+'l',    # 0xaf
+'lg',    # 0xb0
+'lm',    # 0xb1
+'lb',    # 0xb2
+'ls',    # 0xb3
+'lt',    # 0xb4
+'lp',    # 0xb5
+'lh',    # 0xb6
+'m',    # 0xb7
+'b',    # 0xb8
+'bs',    # 0xb9
+'s',    # 0xba
+'ss',    # 0xbb
+'ng',    # 0xbc
+'j',    # 0xbd
+'c',    # 0xbe
+'k',    # 0xbf
+'t',    # 0xc0
+'p',    # 0xc1
+'h',    # 0xc2
+'gl',    # 0xc3
+'gsg',    # 0xc4
+'ng',    # 0xc5
+'nd',    # 0xc6
+'ns',    # 0xc7
+'nZ',    # 0xc8
+'nt',    # 0xc9
+'dg',    # 0xca
+'tl',    # 0xcb
+'lgs',    # 0xcc
+'ln',    # 0xcd
+'ld',    # 0xce
+'lth',    # 0xcf
+'ll',    # 0xd0
+'lmg',    # 0xd1
+'lms',    # 0xd2
+'lbs',    # 0xd3
+'lbh',    # 0xd4
+'rNp',    # 0xd5
+'lss',    # 0xd6
+'lZ',    # 0xd7
+'lk',    # 0xd8
+'lQ',    # 0xd9
+'mg',    # 0xda
+'ml',    # 0xdb
+'mb',    # 0xdc
+'ms',    # 0xdd
+'mss',    # 0xde
+'mZ',    # 0xdf
+'mc',    # 0xe0
+'mh',    # 0xe1
+'mN',    # 0xe2
+'bl',    # 0xe3
+'bp',    # 0xe4
+'ph',    # 0xe5
+'pN',    # 0xe6
+'sg',    # 0xe7
+'sd',    # 0xe8
+'sl',    # 0xe9
+'sb',    # 0xea
+'Z',    # 0xeb
+'g',    # 0xec
+'ss',    # 0xed
+'',    # 0xee
+'kh',    # 0xef
+'N',    # 0xf0
+'Ns',    # 0xf1
+'NZ',    # 0xf2
+'pb',    # 0xf3
+'pN',    # 0xf4
+'hn',    # 0xf5
+'hl',    # 0xf6
+'hm',    # 0xf7
+'hb',    # 0xf8
+'Q',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x012.py b/lib/unidecode/x012.py
new file mode 100644
index 00000000..f2670650
--- /dev/null
+++ b/lib/unidecode/x012.py
@@ -0,0 +1,258 @@
+data = (
+'ha',    # 0x00
+'hu',    # 0x01
+'hi',    # 0x02
+'haa',    # 0x03
+'hee',    # 0x04
+'he',    # 0x05
+'ho',    # 0x06
+'[?]',    # 0x07
+'la',    # 0x08
+'lu',    # 0x09
+'li',    # 0x0a
+'laa',    # 0x0b
+'lee',    # 0x0c
+'le',    # 0x0d
+'lo',    # 0x0e
+'lwa',    # 0x0f
+'hha',    # 0x10
+'hhu',    # 0x11
+'hhi',    # 0x12
+'hhaa',    # 0x13
+'hhee',    # 0x14
+'hhe',    # 0x15
+'hho',    # 0x16
+'hhwa',    # 0x17
+'ma',    # 0x18
+'mu',    # 0x19
+'mi',    # 0x1a
+'maa',    # 0x1b
+'mee',    # 0x1c
+'me',    # 0x1d
+'mo',    # 0x1e
+'mwa',    # 0x1f
+'sza',    # 0x20
+'szu',    # 0x21
+'szi',    # 0x22
+'szaa',    # 0x23
+'szee',    # 0x24
+'sze',    # 0x25
+'szo',    # 0x26
+'szwa',    # 0x27
+'ra',    # 0x28
+'ru',    # 0x29
+'ri',    # 0x2a
+'raa',    # 0x2b
+'ree',    # 0x2c
+'re',    # 0x2d
+'ro',    # 0x2e
+'rwa',    # 0x2f
+'sa',    # 0x30
+'su',    # 0x31
+'si',    # 0x32
+'saa',    # 0x33
+'see',    # 0x34
+'se',    # 0x35
+'so',    # 0x36
+'swa',    # 0x37
+'sha',    # 0x38
+'shu',    # 0x39
+'shi',    # 0x3a
+'shaa',    # 0x3b
+'shee',    # 0x3c
+'she',    # 0x3d
+'sho',    # 0x3e
+'shwa',    # 0x3f
+'qa',    # 0x40
+'qu',    # 0x41
+'qi',    # 0x42
+'qaa',    # 0x43
+'qee',    # 0x44
+'qe',    # 0x45
+'qo',    # 0x46
+'[?]',    # 0x47
+'qwa',    # 0x48
+'[?]',    # 0x49
+'qwi',    # 0x4a
+'qwaa',    # 0x4b
+'qwee',    # 0x4c
+'qwe',    # 0x4d
+'[?]',    # 0x4e
+'[?]',    # 0x4f
+'qha',    # 0x50
+'qhu',    # 0x51
+'qhi',    # 0x52
+'qhaa',    # 0x53
+'qhee',    # 0x54
+'qhe',    # 0x55
+'qho',    # 0x56
+'[?]',    # 0x57
+'qhwa',    # 0x58
+'[?]',    # 0x59
+'qhwi',    # 0x5a
+'qhwaa',    # 0x5b
+'qhwee',    # 0x5c
+'qhwe',    # 0x5d
+'[?]',    # 0x5e
+'[?]',    # 0x5f
+'ba',    # 0x60
+'bu',    # 0x61
+'bi',    # 0x62
+'baa',    # 0x63
+'bee',    # 0x64
+'be',    # 0x65
+'bo',    # 0x66
+'bwa',    # 0x67
+'va',    # 0x68
+'vu',    # 0x69
+'vi',    # 0x6a
+'vaa',    # 0x6b
+'vee',    # 0x6c
+'ve',    # 0x6d
+'vo',    # 0x6e
+'vwa',    # 0x6f
+'ta',    # 0x70
+'tu',    # 0x71
+'ti',    # 0x72
+'taa',    # 0x73
+'tee',    # 0x74
+'te',    # 0x75
+'to',    # 0x76
+'twa',    # 0x77
+'ca',    # 0x78
+'cu',    # 0x79
+'ci',    # 0x7a
+'caa',    # 0x7b
+'cee',    # 0x7c
+'ce',    # 0x7d
+'co',    # 0x7e
+'cwa',    # 0x7f
+'xa',    # 0x80
+'xu',    # 0x81
+'xi',    # 0x82
+'xaa',    # 0x83
+'xee',    # 0x84
+'xe',    # 0x85
+'xo',    # 0x86
+'[?]',    # 0x87
+'xwa',    # 0x88
+'[?]',    # 0x89
+'xwi',    # 0x8a
+'xwaa',    # 0x8b
+'xwee',    # 0x8c
+'xwe',    # 0x8d
+'[?]',    # 0x8e
+'[?]',    # 0x8f
+'na',    # 0x90
+'nu',    # 0x91
+'ni',    # 0x92
+'naa',    # 0x93
+'nee',    # 0x94
+'ne',    # 0x95
+'no',    # 0x96
+'nwa',    # 0x97
+'nya',    # 0x98
+'nyu',    # 0x99
+'nyi',    # 0x9a
+'nyaa',    # 0x9b
+'nyee',    # 0x9c
+'nye',    # 0x9d
+'nyo',    # 0x9e
+'nywa',    # 0x9f
+'\'a',    # 0xa0
+'\'u',    # 0xa1
+'[?]',    # 0xa2
+'\'aa',    # 0xa3
+'\'ee',    # 0xa4
+'\'e',    # 0xa5
+'\'o',    # 0xa6
+'\'wa',    # 0xa7
+'ka',    # 0xa8
+'ku',    # 0xa9
+'ki',    # 0xaa
+'kaa',    # 0xab
+'kee',    # 0xac
+'ke',    # 0xad
+'ko',    # 0xae
+'[?]',    # 0xaf
+'kwa',    # 0xb0
+'[?]',    # 0xb1
+'kwi',    # 0xb2
+'kwaa',    # 0xb3
+'kwee',    # 0xb4
+'kwe',    # 0xb5
+'[?]',    # 0xb6
+'[?]',    # 0xb7
+'kxa',    # 0xb8
+'kxu',    # 0xb9
+'kxi',    # 0xba
+'kxaa',    # 0xbb
+'kxee',    # 0xbc
+'kxe',    # 0xbd
+'kxo',    # 0xbe
+'[?]',    # 0xbf
+'kxwa',    # 0xc0
+'[?]',    # 0xc1
+'kxwi',    # 0xc2
+'kxwaa',    # 0xc3
+'kxwee',    # 0xc4
+'kxwe',    # 0xc5
+'[?]',    # 0xc6
+'[?]',    # 0xc7
+'wa',    # 0xc8
+'wu',    # 0xc9
+'wi',    # 0xca
+'waa',    # 0xcb
+'wee',    # 0xcc
+'we',    # 0xcd
+'wo',    # 0xce
+'[?]',    # 0xcf
+'`a',    # 0xd0
+'`u',    # 0xd1
+'`i',    # 0xd2
+'`aa',    # 0xd3
+'`ee',    # 0xd4
+'`e',    # 0xd5
+'`o',    # 0xd6
+'[?]',    # 0xd7
+'za',    # 0xd8
+'zu',    # 0xd9
+'zi',    # 0xda
+'zaa',    # 0xdb
+'zee',    # 0xdc
+'ze',    # 0xdd
+'zo',    # 0xde
+'zwa',    # 0xdf
+'zha',    # 0xe0
+'zhu',    # 0xe1
+'zhi',    # 0xe2
+'zhaa',    # 0xe3
+'zhee',    # 0xe4
+'zhe',    # 0xe5
+'zho',    # 0xe6
+'zhwa',    # 0xe7
+'ya',    # 0xe8
+'yu',    # 0xe9
+'yi',    # 0xea
+'yaa',    # 0xeb
+'yee',    # 0xec
+'ye',    # 0xed
+'yo',    # 0xee
+'[?]',    # 0xef
+'da',    # 0xf0
+'du',    # 0xf1
+'di',    # 0xf2
+'daa',    # 0xf3
+'dee',    # 0xf4
+'de',    # 0xf5
+'do',    # 0xf6
+'dwa',    # 0xf7
+'dda',    # 0xf8
+'ddu',    # 0xf9
+'ddi',    # 0xfa
+'ddaa',    # 0xfb
+'ddee',    # 0xfc
+'dde',    # 0xfd
+'ddo',    # 0xfe
+'ddwa',    # 0xff
+)
diff --git a/lib/unidecode/x013.py b/lib/unidecode/x013.py
new file mode 100644
index 00000000..8a8c3f9c
--- /dev/null
+++ b/lib/unidecode/x013.py
@@ -0,0 +1,257 @@
+data = (
+'ja',    # 0x00
+'ju',    # 0x01
+'ji',    # 0x02
+'jaa',    # 0x03
+'jee',    # 0x04
+'je',    # 0x05
+'jo',    # 0x06
+'jwa',    # 0x07
+'ga',    # 0x08
+'gu',    # 0x09
+'gi',    # 0x0a
+'gaa',    # 0x0b
+'gee',    # 0x0c
+'ge',    # 0x0d
+'go',    # 0x0e
+'[?]',    # 0x0f
+'gwa',    # 0x10
+'[?]',    # 0x11
+'gwi',    # 0x12
+'gwaa',    # 0x13
+'gwee',    # 0x14
+'gwe',    # 0x15
+'[?]',    # 0x16
+'[?]',    # 0x17
+'gga',    # 0x18
+'ggu',    # 0x19
+'ggi',    # 0x1a
+'ggaa',    # 0x1b
+'ggee',    # 0x1c
+'gge',    # 0x1d
+'ggo',    # 0x1e
+'[?]',    # 0x1f
+'tha',    # 0x20
+'thu',    # 0x21
+'thi',    # 0x22
+'thaa',    # 0x23
+'thee',    # 0x24
+'the',    # 0x25
+'tho',    # 0x26
+'thwa',    # 0x27
+'cha',    # 0x28
+'chu',    # 0x29
+'chi',    # 0x2a
+'chaa',    # 0x2b
+'chee',    # 0x2c
+'che',    # 0x2d
+'cho',    # 0x2e
+'chwa',    # 0x2f
+'pha',    # 0x30
+'phu',    # 0x31
+'phi',    # 0x32
+'phaa',    # 0x33
+'phee',    # 0x34
+'phe',    # 0x35
+'pho',    # 0x36
+'phwa',    # 0x37
+'tsa',    # 0x38
+'tsu',    # 0x39
+'tsi',    # 0x3a
+'tsaa',    # 0x3b
+'tsee',    # 0x3c
+'tse',    # 0x3d
+'tso',    # 0x3e
+'tswa',    # 0x3f
+'tza',    # 0x40
+'tzu',    # 0x41
+'tzi',    # 0x42
+'tzaa',    # 0x43
+'tzee',    # 0x44
+'tze',    # 0x45
+'tzo',    # 0x46
+'[?]',    # 0x47
+'fa',    # 0x48
+'fu',    # 0x49
+'fi',    # 0x4a
+'faa',    # 0x4b
+'fee',    # 0x4c
+'fe',    # 0x4d
+'fo',    # 0x4e
+'fwa',    # 0x4f
+'pa',    # 0x50
+'pu',    # 0x51
+'pi',    # 0x52
+'paa',    # 0x53
+'pee',    # 0x54
+'pe',    # 0x55
+'po',    # 0x56
+'pwa',    # 0x57
+'rya',    # 0x58
+'mya',    # 0x59
+'fya',    # 0x5a
+'[?]',    # 0x5b
+'[?]',    # 0x5c
+'[?]',    # 0x5d
+'[?]',    # 0x5e
+'[?]',    # 0x5f
+'[?]',    # 0x60
+' ',    # 0x61
+'.',    # 0x62
+',',    # 0x63
+';',    # 0x64
+':',    # 0x65
+':: ',    # 0x66
+'?',    # 0x67
+'//',    # 0x68
+'1',    # 0x69
+'2',    # 0x6a
+'3',    # 0x6b
+'4',    # 0x6c
+'5',    # 0x6d
+'6',    # 0x6e
+'7',    # 0x6f
+'8',    # 0x70
+'9',    # 0x71
+'10+',    # 0x72
+'20+',    # 0x73
+'30+',    # 0x74
+'40+',    # 0x75
+'50+',    # 0x76
+'60+',    # 0x77
+'70+',    # 0x78
+'80+',    # 0x79
+'90+',    # 0x7a
+'100+',    # 0x7b
+'10,000+',    # 0x7c
+'[?]',    # 0x7d
+'[?]',    # 0x7e
+'[?]',    # 0x7f
+'[?]',    # 0x80
+'[?]',    # 0x81
+'[?]',    # 0x82
+'[?]',    # 0x83
+'[?]',    # 0x84
+'[?]',    # 0x85
+'[?]',    # 0x86
+'[?]',    # 0x87
+'[?]',    # 0x88
+'[?]',    # 0x89
+'[?]',    # 0x8a
+'[?]',    # 0x8b
+'[?]',    # 0x8c
+'[?]',    # 0x8d
+'[?]',    # 0x8e
+'[?]',    # 0x8f
+'[?]',    # 0x90
+'[?]',    # 0x91
+'[?]',    # 0x92
+'[?]',    # 0x93
+'[?]',    # 0x94
+'[?]',    # 0x95
+'[?]',    # 0x96
+'[?]',    # 0x97
+'[?]',    # 0x98
+'[?]',    # 0x99
+'[?]',    # 0x9a
+'[?]',    # 0x9b
+'[?]',    # 0x9c
+'[?]',    # 0x9d
+'[?]',    # 0x9e
+'[?]',    # 0x9f
+'a',    # 0xa0
+'e',    # 0xa1
+'i',    # 0xa2
+'o',    # 0xa3
+'u',    # 0xa4
+'v',    # 0xa5
+'ga',    # 0xa6
+'ka',    # 0xa7
+'ge',    # 0xa8
+'gi',    # 0xa9
+'go',    # 0xaa
+'gu',    # 0xab
+'gv',    # 0xac
+'ha',    # 0xad
+'he',    # 0xae
+'hi',    # 0xaf
+'ho',    # 0xb0
+'hu',    # 0xb1
+'hv',    # 0xb2
+'la',    # 0xb3
+'le',    # 0xb4
+'li',    # 0xb5
+'lo',    # 0xb6
+'lu',    # 0xb7
+'lv',    # 0xb8
+'ma',    # 0xb9
+'me',    # 0xba
+'mi',    # 0xbb
+'mo',    # 0xbc
+'mu',    # 0xbd
+'na',    # 0xbe
+'hna',    # 0xbf
+'nah',    # 0xc0
+'ne',    # 0xc1
+'ni',    # 0xc2
+'no',    # 0xc3
+'nu',    # 0xc4
+'nv',    # 0xc5
+'qua',    # 0xc6
+'que',    # 0xc7
+'qui',    # 0xc8
+'quo',    # 0xc9
+'quu',    # 0xca
+'quv',    # 0xcb
+'sa',    # 0xcc
+'s',    # 0xcd
+'se',    # 0xce
+'si',    # 0xcf
+'so',    # 0xd0
+'su',    # 0xd1
+'sv',    # 0xd2
+'da',    # 0xd3
+'ta',    # 0xd4
+'de',    # 0xd5
+'te',    # 0xd6
+'di',    # 0xd7
+'ti',    # 0xd8
+'do',    # 0xd9
+'du',    # 0xda
+'dv',    # 0xdb
+'dla',    # 0xdc
+'tla',    # 0xdd
+'tle',    # 0xde
+'tli',    # 0xdf
+'tlo',    # 0xe0
+'tlu',    # 0xe1
+'tlv',    # 0xe2
+'tsa',    # 0xe3
+'tse',    # 0xe4
+'tsi',    # 0xe5
+'tso',    # 0xe6
+'tsu',    # 0xe7
+'tsv',    # 0xe8
+'wa',    # 0xe9
+'we',    # 0xea
+'wi',    # 0xeb
+'wo',    # 0xec
+'wu',    # 0xed
+'wv',    # 0xee
+'ya',    # 0xef
+'ye',    # 0xf0
+'yi',    # 0xf1
+'yo',    # 0xf2
+'yu',    # 0xf3
+'yv',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x014.py b/lib/unidecode/x014.py
new file mode 100644
index 00000000..e8c01809
--- /dev/null
+++ b/lib/unidecode/x014.py
@@ -0,0 +1,258 @@
+data = (
+'[?]',    # 0x00
+'e',    # 0x01
+'aai',    # 0x02
+'i',    # 0x03
+'ii',    # 0x04
+'o',    # 0x05
+'oo',    # 0x06
+'oo',    # 0x07
+'ee',    # 0x08
+'i',    # 0x09
+'a',    # 0x0a
+'aa',    # 0x0b
+'we',    # 0x0c
+'we',    # 0x0d
+'wi',    # 0x0e
+'wi',    # 0x0f
+'wii',    # 0x10
+'wii',    # 0x11
+'wo',    # 0x12
+'wo',    # 0x13
+'woo',    # 0x14
+'woo',    # 0x15
+'woo',    # 0x16
+'wa',    # 0x17
+'wa',    # 0x18
+'waa',    # 0x19
+'waa',    # 0x1a
+'waa',    # 0x1b
+'ai',    # 0x1c
+'w',    # 0x1d
+'\'',    # 0x1e
+'t',    # 0x1f
+'k',    # 0x20
+'sh',    # 0x21
+'s',    # 0x22
+'n',    # 0x23
+'w',    # 0x24
+'n',    # 0x25
+'[?]',    # 0x26
+'w',    # 0x27
+'c',    # 0x28
+'?',    # 0x29
+'l',    # 0x2a
+'en',    # 0x2b
+'in',    # 0x2c
+'on',    # 0x2d
+'an',    # 0x2e
+'pe',    # 0x2f
+'paai',    # 0x30
+'pi',    # 0x31
+'pii',    # 0x32
+'po',    # 0x33
+'poo',    # 0x34
+'poo',    # 0x35
+'hee',    # 0x36
+'hi',    # 0x37
+'pa',    # 0x38
+'paa',    # 0x39
+'pwe',    # 0x3a
+'pwe',    # 0x3b
+'pwi',    # 0x3c
+'pwi',    # 0x3d
+'pwii',    # 0x3e
+'pwii',    # 0x3f
+'pwo',    # 0x40
+'pwo',    # 0x41
+'pwoo',    # 0x42
+'pwoo',    # 0x43
+'pwa',    # 0x44
+'pwa',    # 0x45
+'pwaa',    # 0x46
+'pwaa',    # 0x47
+'pwaa',    # 0x48
+'p',    # 0x49
+'p',    # 0x4a
+'h',    # 0x4b
+'te',    # 0x4c
+'taai',    # 0x4d
+'ti',    # 0x4e
+'tii',    # 0x4f
+'to',    # 0x50
+'too',    # 0x51
+'too',    # 0x52
+'dee',    # 0x53
+'di',    # 0x54
+'ta',    # 0x55
+'taa',    # 0x56
+'twe',    # 0x57
+'twe',    # 0x58
+'twi',    # 0x59
+'twi',    # 0x5a
+'twii',    # 0x5b
+'twii',    # 0x5c
+'two',    # 0x5d
+'two',    # 0x5e
+'twoo',    # 0x5f
+'twoo',    # 0x60
+'twa',    # 0x61
+'twa',    # 0x62
+'twaa',    # 0x63
+'twaa',    # 0x64
+'twaa',    # 0x65
+'t',    # 0x66
+'tte',    # 0x67
+'tti',    # 0x68
+'tto',    # 0x69
+'tta',    # 0x6a
+'ke',    # 0x6b
+'kaai',    # 0x6c
+'ki',    # 0x6d
+'kii',    # 0x6e
+'ko',    # 0x6f
+'koo',    # 0x70
+'koo',    # 0x71
+'ka',    # 0x72
+'kaa',    # 0x73
+'kwe',    # 0x74
+'kwe',    # 0x75
+'kwi',    # 0x76
+'kwi',    # 0x77
+'kwii',    # 0x78
+'kwii',    # 0x79
+'kwo',    # 0x7a
+'kwo',    # 0x7b
+'kwoo',    # 0x7c
+'kwoo',    # 0x7d
+'kwa',    # 0x7e
+'kwa',    # 0x7f
+'kwaa',    # 0x80
+'kwaa',    # 0x81
+'kwaa',    # 0x82
+'k',    # 0x83
+'kw',    # 0x84
+'keh',    # 0x85
+'kih',    # 0x86
+'koh',    # 0x87
+'kah',    # 0x88
+'ce',    # 0x89
+'caai',    # 0x8a
+'ci',    # 0x8b
+'cii',    # 0x8c
+'co',    # 0x8d
+'coo',    # 0x8e
+'coo',    # 0x8f
+'ca',    # 0x90
+'caa',    # 0x91
+'cwe',    # 0x92
+'cwe',    # 0x93
+'cwi',    # 0x94
+'cwi',    # 0x95
+'cwii',    # 0x96
+'cwii',    # 0x97
+'cwo',    # 0x98
+'cwo',    # 0x99
+'cwoo',    # 0x9a
+'cwoo',    # 0x9b
+'cwa',    # 0x9c
+'cwa',    # 0x9d
+'cwaa',    # 0x9e
+'cwaa',    # 0x9f
+'cwaa',    # 0xa0
+'c',    # 0xa1
+'th',    # 0xa2
+'me',    # 0xa3
+'maai',    # 0xa4
+'mi',    # 0xa5
+'mii',    # 0xa6
+'mo',    # 0xa7
+'moo',    # 0xa8
+'moo',    # 0xa9
+'ma',    # 0xaa
+'maa',    # 0xab
+'mwe',    # 0xac
+'mwe',    # 0xad
+'mwi',    # 0xae
+'mwi',    # 0xaf
+'mwii',    # 0xb0
+'mwii',    # 0xb1
+'mwo',    # 0xb2
+'mwo',    # 0xb3
+'mwoo',    # 0xb4
+'mwoo',    # 0xb5
+'mwa',    # 0xb6
+'mwa',    # 0xb7
+'mwaa',    # 0xb8
+'mwaa',    # 0xb9
+'mwaa',    # 0xba
+'m',    # 0xbb
+'m',    # 0xbc
+'mh',    # 0xbd
+'m',    # 0xbe
+'m',    # 0xbf
+'ne',    # 0xc0
+'naai',    # 0xc1
+'ni',    # 0xc2
+'nii',    # 0xc3
+'no',    # 0xc4
+'noo',    # 0xc5
+'noo',    # 0xc6
+'na',    # 0xc7
+'naa',    # 0xc8
+'nwe',    # 0xc9
+'nwe',    # 0xca
+'nwa',    # 0xcb
+'nwa',    # 0xcc
+'nwaa',    # 0xcd
+'nwaa',    # 0xce
+'nwaa',    # 0xcf
+'n',    # 0xd0
+'ng',    # 0xd1
+'nh',    # 0xd2
+'le',    # 0xd3
+'laai',    # 0xd4
+'li',    # 0xd5
+'lii',    # 0xd6
+'lo',    # 0xd7
+'loo',    # 0xd8
+'loo',    # 0xd9
+'la',    # 0xda
+'laa',    # 0xdb
+'lwe',    # 0xdc
+'lwe',    # 0xdd
+'lwi',    # 0xde
+'lwi',    # 0xdf
+'lwii',    # 0xe0
+'lwii',    # 0xe1
+'lwo',    # 0xe2
+'lwo',    # 0xe3
+'lwoo',    # 0xe4
+'lwoo',    # 0xe5
+'lwa',    # 0xe6
+'lwa',    # 0xe7
+'lwaa',    # 0xe8
+'lwaa',    # 0xe9
+'l',    # 0xea
+'l',    # 0xeb
+'l',    # 0xec
+'se',    # 0xed
+'saai',    # 0xee
+'si',    # 0xef
+'sii',    # 0xf0
+'so',    # 0xf1
+'soo',    # 0xf2
+'soo',    # 0xf3
+'sa',    # 0xf4
+'saa',    # 0xf5
+'swe',    # 0xf6
+'swe',    # 0xf7
+'swi',    # 0xf8
+'swi',    # 0xf9
+'swii',    # 0xfa
+'swii',    # 0xfb
+'swo',    # 0xfc
+'swo',    # 0xfd
+'swoo',    # 0xfe
+'swoo',    # 0xff
+)
diff --git a/lib/unidecode/x015.py b/lib/unidecode/x015.py
new file mode 100644
index 00000000..5ac22cbe
--- /dev/null
+++ b/lib/unidecode/x015.py
@@ -0,0 +1,258 @@
+data = (
+'swa',    # 0x00
+'swa',    # 0x01
+'swaa',    # 0x02
+'swaa',    # 0x03
+'swaa',    # 0x04
+'s',    # 0x05
+'s',    # 0x06
+'sw',    # 0x07
+'s',    # 0x08
+'sk',    # 0x09
+'skw',    # 0x0a
+'sW',    # 0x0b
+'spwa',    # 0x0c
+'stwa',    # 0x0d
+'skwa',    # 0x0e
+'scwa',    # 0x0f
+'she',    # 0x10
+'shi',    # 0x11
+'shii',    # 0x12
+'sho',    # 0x13
+'shoo',    # 0x14
+'sha',    # 0x15
+'shaa',    # 0x16
+'shwe',    # 0x17
+'shwe',    # 0x18
+'shwi',    # 0x19
+'shwi',    # 0x1a
+'shwii',    # 0x1b
+'shwii',    # 0x1c
+'shwo',    # 0x1d
+'shwo',    # 0x1e
+'shwoo',    # 0x1f
+'shwoo',    # 0x20
+'shwa',    # 0x21
+'shwa',    # 0x22
+'shwaa',    # 0x23
+'shwaa',    # 0x24
+'sh',    # 0x25
+'ye',    # 0x26
+'yaai',    # 0x27
+'yi',    # 0x28
+'yii',    # 0x29
+'yo',    # 0x2a
+'yoo',    # 0x2b
+'yoo',    # 0x2c
+'ya',    # 0x2d
+'yaa',    # 0x2e
+'ywe',    # 0x2f
+'ywe',    # 0x30
+'ywi',    # 0x31
+'ywi',    # 0x32
+'ywii',    # 0x33
+'ywii',    # 0x34
+'ywo',    # 0x35
+'ywo',    # 0x36
+'ywoo',    # 0x37
+'ywoo',    # 0x38
+'ywa',    # 0x39
+'ywa',    # 0x3a
+'ywaa',    # 0x3b
+'ywaa',    # 0x3c
+'ywaa',    # 0x3d
+'y',    # 0x3e
+'y',    # 0x3f
+'y',    # 0x40
+'yi',    # 0x41
+'re',    # 0x42
+'re',    # 0x43
+'le',    # 0x44
+'raai',    # 0x45
+'ri',    # 0x46
+'rii',    # 0x47
+'ro',    # 0x48
+'roo',    # 0x49
+'lo',    # 0x4a
+'ra',    # 0x4b
+'raa',    # 0x4c
+'la',    # 0x4d
+'rwaa',    # 0x4e
+'rwaa',    # 0x4f
+'r',    # 0x50
+'r',    # 0x51
+'r',    # 0x52
+'fe',    # 0x53
+'faai',    # 0x54
+'fi',    # 0x55
+'fii',    # 0x56
+'fo',    # 0x57
+'foo',    # 0x58
+'fa',    # 0x59
+'faa',    # 0x5a
+'fwaa',    # 0x5b
+'fwaa',    # 0x5c
+'f',    # 0x5d
+'the',    # 0x5e
+'the',    # 0x5f
+'thi',    # 0x60
+'thi',    # 0x61
+'thii',    # 0x62
+'thii',    # 0x63
+'tho',    # 0x64
+'thoo',    # 0x65
+'tha',    # 0x66
+'thaa',    # 0x67
+'thwaa',    # 0x68
+'thwaa',    # 0x69
+'th',    # 0x6a
+'tthe',    # 0x6b
+'tthi',    # 0x6c
+'ttho',    # 0x6d
+'ttha',    # 0x6e
+'tth',    # 0x6f
+'tye',    # 0x70
+'tyi',    # 0x71
+'tyo',    # 0x72
+'tya',    # 0x73
+'he',    # 0x74
+'hi',    # 0x75
+'hii',    # 0x76
+'ho',    # 0x77
+'hoo',    # 0x78
+'ha',    # 0x79
+'haa',    # 0x7a
+'h',    # 0x7b
+'h',    # 0x7c
+'hk',    # 0x7d
+'qaai',    # 0x7e
+'qi',    # 0x7f
+'qii',    # 0x80
+'qo',    # 0x81
+'qoo',    # 0x82
+'qa',    # 0x83
+'qaa',    # 0x84
+'q',    # 0x85
+'tlhe',    # 0x86
+'tlhi',    # 0x87
+'tlho',    # 0x88
+'tlha',    # 0x89
+'re',    # 0x8a
+'ri',    # 0x8b
+'ro',    # 0x8c
+'ra',    # 0x8d
+'ngaai',    # 0x8e
+'ngi',    # 0x8f
+'ngii',    # 0x90
+'ngo',    # 0x91
+'ngoo',    # 0x92
+'nga',    # 0x93
+'ngaa',    # 0x94
+'ng',    # 0x95
+'nng',    # 0x96
+'she',    # 0x97
+'shi',    # 0x98
+'sho',    # 0x99
+'sha',    # 0x9a
+'the',    # 0x9b
+'thi',    # 0x9c
+'tho',    # 0x9d
+'tha',    # 0x9e
+'th',    # 0x9f
+'lhi',    # 0xa0
+'lhii',    # 0xa1
+'lho',    # 0xa2
+'lhoo',    # 0xa3
+'lha',    # 0xa4
+'lhaa',    # 0xa5
+'lh',    # 0xa6
+'the',    # 0xa7
+'thi',    # 0xa8
+'thii',    # 0xa9
+'tho',    # 0xaa
+'thoo',    # 0xab
+'tha',    # 0xac
+'thaa',    # 0xad
+'th',    # 0xae
+'b',    # 0xaf
+'e',    # 0xb0
+'i',    # 0xb1
+'o',    # 0xb2
+'a',    # 0xb3
+'we',    # 0xb4
+'wi',    # 0xb5
+'wo',    # 0xb6
+'wa',    # 0xb7
+'ne',    # 0xb8
+'ni',    # 0xb9
+'no',    # 0xba
+'na',    # 0xbb
+'ke',    # 0xbc
+'ki',    # 0xbd
+'ko',    # 0xbe
+'ka',    # 0xbf
+'he',    # 0xc0
+'hi',    # 0xc1
+'ho',    # 0xc2
+'ha',    # 0xc3
+'ghu',    # 0xc4
+'gho',    # 0xc5
+'ghe',    # 0xc6
+'ghee',    # 0xc7
+'ghi',    # 0xc8
+'gha',    # 0xc9
+'ru',    # 0xca
+'ro',    # 0xcb
+'re',    # 0xcc
+'ree',    # 0xcd
+'ri',    # 0xce
+'ra',    # 0xcf
+'wu',    # 0xd0
+'wo',    # 0xd1
+'we',    # 0xd2
+'wee',    # 0xd3
+'wi',    # 0xd4
+'wa',    # 0xd5
+'hwu',    # 0xd6
+'hwo',    # 0xd7
+'hwe',    # 0xd8
+'hwee',    # 0xd9
+'hwi',    # 0xda
+'hwa',    # 0xdb
+'thu',    # 0xdc
+'tho',    # 0xdd
+'the',    # 0xde
+'thee',    # 0xdf
+'thi',    # 0xe0
+'tha',    # 0xe1
+'ttu',    # 0xe2
+'tto',    # 0xe3
+'tte',    # 0xe4
+'ttee',    # 0xe5
+'tti',    # 0xe6
+'tta',    # 0xe7
+'pu',    # 0xe8
+'po',    # 0xe9
+'pe',    # 0xea
+'pee',    # 0xeb
+'pi',    # 0xec
+'pa',    # 0xed
+'p',    # 0xee
+'gu',    # 0xef
+'go',    # 0xf0
+'ge',    # 0xf1
+'gee',    # 0xf2
+'gi',    # 0xf3
+'ga',    # 0xf4
+'khu',    # 0xf5
+'kho',    # 0xf6
+'khe',    # 0xf7
+'khee',    # 0xf8
+'khi',    # 0xf9
+'kha',    # 0xfa
+'kku',    # 0xfb
+'kko',    # 0xfc
+'kke',    # 0xfd
+'kkee',    # 0xfe
+'kki',    # 0xff
+)
diff --git a/lib/unidecode/x016.py b/lib/unidecode/x016.py
new file mode 100644
index 00000000..613d1e90
--- /dev/null
+++ b/lib/unidecode/x016.py
@@ -0,0 +1,257 @@
+data = (
+'kka',    # 0x00
+'kk',    # 0x01
+'nu',    # 0x02
+'no',    # 0x03
+'ne',    # 0x04
+'nee',    # 0x05
+'ni',    # 0x06
+'na',    # 0x07
+'mu',    # 0x08
+'mo',    # 0x09
+'me',    # 0x0a
+'mee',    # 0x0b
+'mi',    # 0x0c
+'ma',    # 0x0d
+'yu',    # 0x0e
+'yo',    # 0x0f
+'ye',    # 0x10
+'yee',    # 0x11
+'yi',    # 0x12
+'ya',    # 0x13
+'ju',    # 0x14
+'ju',    # 0x15
+'jo',    # 0x16
+'je',    # 0x17
+'jee',    # 0x18
+'ji',    # 0x19
+'ji',    # 0x1a
+'ja',    # 0x1b
+'jju',    # 0x1c
+'jjo',    # 0x1d
+'jje',    # 0x1e
+'jjee',    # 0x1f
+'jji',    # 0x20
+'jja',    # 0x21
+'lu',    # 0x22
+'lo',    # 0x23
+'le',    # 0x24
+'lee',    # 0x25
+'li',    # 0x26
+'la',    # 0x27
+'dlu',    # 0x28
+'dlo',    # 0x29
+'dle',    # 0x2a
+'dlee',    # 0x2b
+'dli',    # 0x2c
+'dla',    # 0x2d
+'lhu',    # 0x2e
+'lho',    # 0x2f
+'lhe',    # 0x30
+'lhee',    # 0x31
+'lhi',    # 0x32
+'lha',    # 0x33
+'tlhu',    # 0x34
+'tlho',    # 0x35
+'tlhe',    # 0x36
+'tlhee',    # 0x37
+'tlhi',    # 0x38
+'tlha',    # 0x39
+'tlu',    # 0x3a
+'tlo',    # 0x3b
+'tle',    # 0x3c
+'tlee',    # 0x3d
+'tli',    # 0x3e
+'tla',    # 0x3f
+'zu',    # 0x40
+'zo',    # 0x41
+'ze',    # 0x42
+'zee',    # 0x43
+'zi',    # 0x44
+'za',    # 0x45
+'z',    # 0x46
+'z',    # 0x47
+'dzu',    # 0x48
+'dzo',    # 0x49
+'dze',    # 0x4a
+'dzee',    # 0x4b
+'dzi',    # 0x4c
+'dza',    # 0x4d
+'su',    # 0x4e
+'so',    # 0x4f
+'se',    # 0x50
+'see',    # 0x51
+'si',    # 0x52
+'sa',    # 0x53
+'shu',    # 0x54
+'sho',    # 0x55
+'she',    # 0x56
+'shee',    # 0x57
+'shi',    # 0x58
+'sha',    # 0x59
+'sh',    # 0x5a
+'tsu',    # 0x5b
+'tso',    # 0x5c
+'tse',    # 0x5d
+'tsee',    # 0x5e
+'tsi',    # 0x5f
+'tsa',    # 0x60
+'chu',    # 0x61
+'cho',    # 0x62
+'che',    # 0x63
+'chee',    # 0x64
+'chi',    # 0x65
+'cha',    # 0x66
+'ttsu',    # 0x67
+'ttso',    # 0x68
+'ttse',    # 0x69
+'ttsee',    # 0x6a
+'ttsi',    # 0x6b
+'ttsa',    # 0x6c
+'X',    # 0x6d
+'.',    # 0x6e
+'qai',    # 0x6f
+'ngai',    # 0x70
+'nngi',    # 0x71
+'nngii',    # 0x72
+'nngo',    # 0x73
+'nngoo',    # 0x74
+'nnga',    # 0x75
+'nngaa',    # 0x76
+'[?]',    # 0x77
+'[?]',    # 0x78
+'[?]',    # 0x79
+'[?]',    # 0x7a
+'[?]',    # 0x7b
+'[?]',    # 0x7c
+'[?]',    # 0x7d
+'[?]',    # 0x7e
+'[?]',    # 0x7f
+' ',    # 0x80
+'b',    # 0x81
+'l',    # 0x82
+'f',    # 0x83
+'s',    # 0x84
+'n',    # 0x85
+'h',    # 0x86
+'d',    # 0x87
+'t',    # 0x88
+'c',    # 0x89
+'q',    # 0x8a
+'m',    # 0x8b
+'g',    # 0x8c
+'ng',    # 0x8d
+'z',    # 0x8e
+'r',    # 0x8f
+'a',    # 0x90
+'o',    # 0x91
+'u',    # 0x92
+'e',    # 0x93
+'i',    # 0x94
+'ch',    # 0x95
+'th',    # 0x96
+'ph',    # 0x97
+'p',    # 0x98
+'x',    # 0x99
+'p',    # 0x9a
+'<',    # 0x9b
+'>',    # 0x9c
+'[?]',    # 0x9d
+'[?]',    # 0x9e
+'[?]',    # 0x9f
+'f',    # 0xa0
+'v',    # 0xa1
+'u',    # 0xa2
+'yr',    # 0xa3
+'y',    # 0xa4
+'w',    # 0xa5
+'th',    # 0xa6
+'th',    # 0xa7
+'a',    # 0xa8
+'o',    # 0xa9
+'ac',    # 0xaa
+'ae',    # 0xab
+'o',    # 0xac
+'o',    # 0xad
+'o',    # 0xae
+'oe',    # 0xaf
+'on',    # 0xb0
+'r',    # 0xb1
+'k',    # 0xb2
+'c',    # 0xb3
+'k',    # 0xb4
+'g',    # 0xb5
+'ng',    # 0xb6
+'g',    # 0xb7
+'g',    # 0xb8
+'w',    # 0xb9
+'h',    # 0xba
+'h',    # 0xbb
+'h',    # 0xbc
+'h',    # 0xbd
+'n',    # 0xbe
+'n',    # 0xbf
+'n',    # 0xc0
+'i',    # 0xc1
+'e',    # 0xc2
+'j',    # 0xc3
+'g',    # 0xc4
+'ae',    # 0xc5
+'a',    # 0xc6
+'eo',    # 0xc7
+'p',    # 0xc8
+'z',    # 0xc9
+'s',    # 0xca
+'s',    # 0xcb
+'s',    # 0xcc
+'c',    # 0xcd
+'z',    # 0xce
+'t',    # 0xcf
+'t',    # 0xd0
+'d',    # 0xd1
+'b',    # 0xd2
+'b',    # 0xd3
+'p',    # 0xd4
+'p',    # 0xd5
+'e',    # 0xd6
+'m',    # 0xd7
+'m',    # 0xd8
+'m',    # 0xd9
+'l',    # 0xda
+'l',    # 0xdb
+'ng',    # 0xdc
+'ng',    # 0xdd
+'d',    # 0xde
+'o',    # 0xdf
+'ear',    # 0xe0
+'ior',    # 0xe1
+'qu',    # 0xe2
+'qu',    # 0xe3
+'qu',    # 0xe4
+'s',    # 0xe5
+'yr',    # 0xe6
+'yr',    # 0xe7
+'yr',    # 0xe8
+'q',    # 0xe9
+'x',    # 0xea
+'.',    # 0xeb
+':',    # 0xec
+'+',    # 0xed
+'17',    # 0xee
+'18',    # 0xef
+'19',    # 0xf0
+'[?]',    # 0xf1
+'[?]',    # 0xf2
+'[?]',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x017.py b/lib/unidecode/x017.py
new file mode 100644
index 00000000..e0a8f447
--- /dev/null
+++ b/lib/unidecode/x017.py
@@ -0,0 +1,257 @@
+data = (
+'[?]',    # 0x00
+'[?]',    # 0x01
+'[?]',    # 0x02
+'[?]',    # 0x03
+'[?]',    # 0x04
+'[?]',    # 0x05
+'[?]',    # 0x06
+'[?]',    # 0x07
+'[?]',    # 0x08
+'[?]',    # 0x09
+'[?]',    # 0x0a
+'[?]',    # 0x0b
+'[?]',    # 0x0c
+'[?]',    # 0x0d
+'[?]',    # 0x0e
+'[?]',    # 0x0f
+'[?]',    # 0x10
+'[?]',    # 0x11
+'[?]',    # 0x12
+'[?]',    # 0x13
+'[?]',    # 0x14
+'[?]',    # 0x15
+'[?]',    # 0x16
+'[?]',    # 0x17
+'[?]',    # 0x18
+'[?]',    # 0x19
+'[?]',    # 0x1a
+'[?]',    # 0x1b
+'[?]',    # 0x1c
+'[?]',    # 0x1d
+'[?]',    # 0x1e
+'[?]',    # 0x1f
+'[?]',    # 0x20
+'[?]',    # 0x21
+'[?]',    # 0x22
+'[?]',    # 0x23
+'[?]',    # 0x24
+'[?]',    # 0x25
+'[?]',    # 0x26
+'[?]',    # 0x27
+'[?]',    # 0x28
+'[?]',    # 0x29
+'[?]',    # 0x2a
+'[?]',    # 0x2b
+'[?]',    # 0x2c
+'[?]',    # 0x2d
+'[?]',    # 0x2e
+'[?]',    # 0x2f
+'[?]',    # 0x30
+'[?]',    # 0x31
+'[?]',    # 0x32
+'[?]',    # 0x33
+'[?]',    # 0x34
+'[?]',    # 0x35
+'[?]',    # 0x36
+'[?]',    # 0x37
+'[?]',    # 0x38
+'[?]',    # 0x39
+'[?]',    # 0x3a
+'[?]',    # 0x3b
+'[?]',    # 0x3c
+'[?]',    # 0x3d
+'[?]',    # 0x3e
+'[?]',    # 0x3f
+'[?]',    # 0x40
+'[?]',    # 0x41
+'[?]',    # 0x42
+'[?]',    # 0x43
+'[?]',    # 0x44
+'[?]',    # 0x45
+'[?]',    # 0x46
+'[?]',    # 0x47
+'[?]',    # 0x48
+'[?]',    # 0x49
+'[?]',    # 0x4a
+'[?]',    # 0x4b
+'[?]',    # 0x4c
+'[?]',    # 0x4d
+'[?]',    # 0x4e
+'[?]',    # 0x4f
+'[?]',    # 0x50
+'[?]',    # 0x51
+'[?]',    # 0x52
+'[?]',    # 0x53
+'[?]',    # 0x54
+'[?]',    # 0x55
+'[?]',    # 0x56
+'[?]',    # 0x57
+'[?]',    # 0x58
+'[?]',    # 0x59
+'[?]',    # 0x5a
+'[?]',    # 0x5b
+'[?]',    # 0x5c
+'[?]',    # 0x5d
+'[?]',    # 0x5e
+'[?]',    # 0x5f
+'[?]',    # 0x60
+'[?]',    # 0x61
+'[?]',    # 0x62
+'[?]',    # 0x63
+'[?]',    # 0x64
+'[?]',    # 0x65
+'[?]',    # 0x66
+'[?]',    # 0x67
+'[?]',    # 0x68
+'[?]',    # 0x69
+'[?]',    # 0x6a
+'[?]',    # 0x6b
+'[?]',    # 0x6c
+'[?]',    # 0x6d
+'[?]',    # 0x6e
+'[?]',    # 0x6f
+'[?]',    # 0x70
+'[?]',    # 0x71
+'[?]',    # 0x72
+'[?]',    # 0x73
+'[?]',    # 0x74
+'[?]',    # 0x75
+'[?]',    # 0x76
+'[?]',    # 0x77
+'[?]',    # 0x78
+'[?]',    # 0x79
+'[?]',    # 0x7a
+'[?]',    # 0x7b
+'[?]',    # 0x7c
+'[?]',    # 0x7d
+'[?]',    # 0x7e
+'[?]',    # 0x7f
+'k',    # 0x80
+'kh',    # 0x81
+'g',    # 0x82
+'gh',    # 0x83
+'ng',    # 0x84
+'c',    # 0x85
+'ch',    # 0x86
+'j',    # 0x87
+'jh',    # 0x88
+'ny',    # 0x89
+'t',    # 0x8a
+'tth',    # 0x8b
+'d',    # 0x8c
+'ddh',    # 0x8d
+'nn',    # 0x8e
+'t',    # 0x8f
+'th',    # 0x90
+'d',    # 0x91
+'dh',    # 0x92
+'n',    # 0x93
+'p',    # 0x94
+'ph',    # 0x95
+'b',    # 0x96
+'bh',    # 0x97
+'m',    # 0x98
+'y',    # 0x99
+'r',    # 0x9a
+'l',    # 0x9b
+'v',    # 0x9c
+'sh',    # 0x9d
+'ss',    # 0x9e
+'s',    # 0x9f
+'h',    # 0xa0
+'l',    # 0xa1
+'q',    # 0xa2
+'a',    # 0xa3
+'aa',    # 0xa4
+'i',    # 0xa5
+'ii',    # 0xa6
+'u',    # 0xa7
+'uk',    # 0xa8
+'uu',    # 0xa9
+'uuv',    # 0xaa
+'ry',    # 0xab
+'ryy',    # 0xac
+'ly',    # 0xad
+'lyy',    # 0xae
+'e',    # 0xaf
+'ai',    # 0xb0
+'oo',    # 0xb1
+'oo',    # 0xb2
+'au',    # 0xb3
+'a',    # 0xb4
+'aa',    # 0xb5
+'aa',    # 0xb6
+'i',    # 0xb7
+'ii',    # 0xb8
+'y',    # 0xb9
+'yy',    # 0xba
+'u',    # 0xbb
+'uu',    # 0xbc
+'ua',    # 0xbd
+'oe',    # 0xbe
+'ya',    # 0xbf
+'ie',    # 0xc0
+'e',    # 0xc1
+'ae',    # 0xc2
+'ai',    # 0xc3
+'oo',    # 0xc4
+'au',    # 0xc5
+'M',    # 0xc6
+'H',    # 0xc7
+'a`',    # 0xc8
+'',    # 0xc9
+'',    # 0xca
+'',    # 0xcb
+'r',    # 0xcc
+'',    # 0xcd
+'!',    # 0xce
+'',    # 0xcf
+'',    # 0xd0
+'',    # 0xd1
+'',    # 0xd2
+'',    # 0xd3
+'.',    # 0xd4
+' // ',    # 0xd5
+':',    # 0xd6
+'+',    # 0xd7
+'++',    # 0xd8
+' * ',    # 0xd9
+' /// ',    # 0xda
+'KR',    # 0xdb
+'\'',    # 0xdc
+'[?]',    # 0xdd
+'[?]',    # 0xde
+'[?]',    # 0xdf
+'0',    # 0xe0
+'1',    # 0xe1
+'2',    # 0xe2
+'3',    # 0xe3
+'4',    # 0xe4
+'5',    # 0xe5
+'6',    # 0xe6
+'7',    # 0xe7
+'8',    # 0xe8
+'9',    # 0xe9
+'[?]',    # 0xea
+'[?]',    # 0xeb
+'[?]',    # 0xec
+'[?]',    # 0xed
+'[?]',    # 0xee
+'[?]',    # 0xef
+'[?]',    # 0xf0
+'[?]',    # 0xf1
+'[?]',    # 0xf2
+'[?]',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x018.py b/lib/unidecode/x018.py
new file mode 100644
index 00000000..3162a010
--- /dev/null
+++ b/lib/unidecode/x018.py
@@ -0,0 +1,257 @@
+data = (
+' @ ',    # 0x00
+' ... ',    # 0x01
+', ',    # 0x02
+'. ',    # 0x03
+': ',    # 0x04
+' // ',    # 0x05
+'',    # 0x06
+'-',    # 0x07
+', ',    # 0x08
+'. ',    # 0x09
+'',    # 0x0a
+'',    # 0x0b
+'',    # 0x0c
+'',    # 0x0d
+'',    # 0x0e
+'[?]',    # 0x0f
+'0',    # 0x10
+'1',    # 0x11
+'2',    # 0x12
+'3',    # 0x13
+'4',    # 0x14
+'5',    # 0x15
+'6',    # 0x16
+'7',    # 0x17
+'8',    # 0x18
+'9',    # 0x19
+'[?]',    # 0x1a
+'[?]',    # 0x1b
+'[?]',    # 0x1c
+'[?]',    # 0x1d
+'[?]',    # 0x1e
+'[?]',    # 0x1f
+'a',    # 0x20
+'e',    # 0x21
+'i',    # 0x22
+'o',    # 0x23
+'u',    # 0x24
+'O',    # 0x25
+'U',    # 0x26
+'ee',    # 0x27
+'n',    # 0x28
+'ng',    # 0x29
+'b',    # 0x2a
+'p',    # 0x2b
+'q',    # 0x2c
+'g',    # 0x2d
+'m',    # 0x2e
+'l',    # 0x2f
+'s',    # 0x30
+'sh',    # 0x31
+'t',    # 0x32
+'d',    # 0x33
+'ch',    # 0x34
+'j',    # 0x35
+'y',    # 0x36
+'r',    # 0x37
+'w',    # 0x38
+'f',    # 0x39
+'k',    # 0x3a
+'kha',    # 0x3b
+'ts',    # 0x3c
+'z',    # 0x3d
+'h',    # 0x3e
+'zr',    # 0x3f
+'lh',    # 0x40
+'zh',    # 0x41
+'ch',    # 0x42
+'-',    # 0x43
+'e',    # 0x44
+'i',    # 0x45
+'o',    # 0x46
+'u',    # 0x47
+'O',    # 0x48
+'U',    # 0x49
+'ng',    # 0x4a
+'b',    # 0x4b
+'p',    # 0x4c
+'q',    # 0x4d
+'g',    # 0x4e
+'m',    # 0x4f
+'t',    # 0x50
+'d',    # 0x51
+'ch',    # 0x52
+'j',    # 0x53
+'ts',    # 0x54
+'y',    # 0x55
+'w',    # 0x56
+'k',    # 0x57
+'g',    # 0x58
+'h',    # 0x59
+'jy',    # 0x5a
+'ny',    # 0x5b
+'dz',    # 0x5c
+'e',    # 0x5d
+'i',    # 0x5e
+'iy',    # 0x5f
+'U',    # 0x60
+'u',    # 0x61
+'ng',    # 0x62
+'k',    # 0x63
+'g',    # 0x64
+'h',    # 0x65
+'p',    # 0x66
+'sh',    # 0x67
+'t',    # 0x68
+'d',    # 0x69
+'j',    # 0x6a
+'f',    # 0x6b
+'g',    # 0x6c
+'h',    # 0x6d
+'ts',    # 0x6e
+'z',    # 0x6f
+'r',    # 0x70
+'ch',    # 0x71
+'zh',    # 0x72
+'i',    # 0x73
+'k',    # 0x74
+'r',    # 0x75
+'f',    # 0x76
+'zh',    # 0x77
+'[?]',    # 0x78
+'[?]',    # 0x79
+'[?]',    # 0x7a
+'[?]',    # 0x7b
+'[?]',    # 0x7c
+'[?]',    # 0x7d
+'[?]',    # 0x7e
+'[?]',    # 0x7f
+'[?]',    # 0x80
+'H',    # 0x81
+'X',    # 0x82
+'W',    # 0x83
+'M',    # 0x84
+' 3 ',    # 0x85
+' 333 ',    # 0x86
+'a',    # 0x87
+'i',    # 0x88
+'k',    # 0x89
+'ng',    # 0x8a
+'c',    # 0x8b
+'tt',    # 0x8c
+'tth',    # 0x8d
+'dd',    # 0x8e
+'nn',    # 0x8f
+'t',    # 0x90
+'d',    # 0x91
+'p',    # 0x92
+'ph',    # 0x93
+'ss',    # 0x94
+'zh',    # 0x95
+'z',    # 0x96
+'a',    # 0x97
+'t',    # 0x98
+'zh',    # 0x99
+'gh',    # 0x9a
+'ng',    # 0x9b
+'c',    # 0x9c
+'jh',    # 0x9d
+'tta',    # 0x9e
+'ddh',    # 0x9f
+'t',    # 0xa0
+'dh',    # 0xa1
+'ss',    # 0xa2
+'cy',    # 0xa3
+'zh',    # 0xa4
+'z',    # 0xa5
+'u',    # 0xa6
+'y',    # 0xa7
+'bh',    # 0xa8
+'\'',    # 0xa9
+'[?]',    # 0xaa
+'[?]',    # 0xab
+'[?]',    # 0xac
+'[?]',    # 0xad
+'[?]',    # 0xae
+'[?]',    # 0xaf
+'[?]',    # 0xb0
+'[?]',    # 0xb1
+'[?]',    # 0xb2
+'[?]',    # 0xb3
+'[?]',    # 0xb4
+'[?]',    # 0xb5
+'[?]',    # 0xb6
+'[?]',    # 0xb7
+'[?]',    # 0xb8
+'[?]',    # 0xb9
+'[?]',    # 0xba
+'[?]',    # 0xbb
+'[?]',    # 0xbc
+'[?]',    # 0xbd
+'[?]',    # 0xbe
+'[?]',    # 0xbf
+'[?]',    # 0xc0
+'[?]',    # 0xc1
+'[?]',    # 0xc2
+'[?]',    # 0xc3
+'[?]',    # 0xc4
+'[?]',    # 0xc5
+'[?]',    # 0xc6
+'[?]',    # 0xc7
+'[?]',    # 0xc8
+'[?]',    # 0xc9
+'[?]',    # 0xca
+'[?]',    # 0xcb
+'[?]',    # 0xcc
+'[?]',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'[?]',    # 0xd0
+'[?]',    # 0xd1
+'[?]',    # 0xd2
+'[?]',    # 0xd3
+'[?]',    # 0xd4
+'[?]',    # 0xd5
+'[?]',    # 0xd6
+'[?]',    # 0xd7
+'[?]',    # 0xd8
+'[?]',    # 0xd9
+'[?]',    # 0xda
+'[?]',    # 0xdb
+'[?]',    # 0xdc
+'[?]',    # 0xdd
+'[?]',    # 0xde
+'[?]',    # 0xdf
+'[?]',    # 0xe0
+'[?]',    # 0xe1
+'[?]',    # 0xe2
+'[?]',    # 0xe3
+'[?]',    # 0xe4
+'[?]',    # 0xe5
+'[?]',    # 0xe6
+'[?]',    # 0xe7
+'[?]',    # 0xe8
+'[?]',    # 0xe9
+'[?]',    # 0xea
+'[?]',    # 0xeb
+'[?]',    # 0xec
+'[?]',    # 0xed
+'[?]',    # 0xee
+'[?]',    # 0xef
+'[?]',    # 0xf0
+'[?]',    # 0xf1
+'[?]',    # 0xf2
+'[?]',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x01d.py b/lib/unidecode/x01d.py
new file mode 100644
index 00000000..5b659060
--- /dev/null
+++ b/lib/unidecode/x01d.py
@@ -0,0 +1,257 @@
+data = (
+'',    # 0x00
+'',    # 0x01
+'',    # 0x02
+'',    # 0x03
+'',    # 0x04
+'',    # 0x05
+'',    # 0x06
+'',    # 0x07
+'',    # 0x08
+'',    # 0x09
+'',    # 0x0a
+'',    # 0x0b
+'',    # 0x0c
+'',    # 0x0d
+'',    # 0x0e
+'',    # 0x0f
+'',    # 0x10
+'',    # 0x11
+'',    # 0x12
+'',    # 0x13
+'',    # 0x14
+'',    # 0x15
+'',    # 0x16
+'',    # 0x17
+'',    # 0x18
+'',    # 0x19
+'',    # 0x1a
+'',    # 0x1b
+'',    # 0x1c
+'',    # 0x1d
+'',    # 0x1e
+'',    # 0x1f
+'',    # 0x20
+'',    # 0x21
+'',    # 0x22
+'',    # 0x23
+'',    # 0x24
+'',    # 0x25
+'',    # 0x26
+'',    # 0x27
+'',    # 0x28
+'',    # 0x29
+'',    # 0x2a
+'',    # 0x2b
+'',    # 0x2c
+'',    # 0x2d
+'',    # 0x2e
+'',    # 0x2f
+'',    # 0x30
+'',    # 0x31
+'',    # 0x32
+'',    # 0x33
+'',    # 0x34
+'',    # 0x35
+'',    # 0x36
+'',    # 0x37
+'',    # 0x38
+'',    # 0x39
+'',    # 0x3a
+'',    # 0x3b
+'',    # 0x3c
+'',    # 0x3d
+'',    # 0x3e
+'',    # 0x3f
+'',    # 0x40
+'',    # 0x41
+'',    # 0x42
+'',    # 0x43
+'',    # 0x44
+'',    # 0x45
+'',    # 0x46
+'',    # 0x47
+'',    # 0x48
+'',    # 0x49
+'',    # 0x4a
+'',    # 0x4b
+'',    # 0x4c
+'',    # 0x4d
+'',    # 0x4e
+'',    # 0x4f
+'',    # 0x50
+'',    # 0x51
+'',    # 0x52
+'',    # 0x53
+'',    # 0x54
+'',    # 0x55
+'',    # 0x56
+'',    # 0x57
+'',    # 0x58
+'',    # 0x59
+'',    # 0x5a
+'',    # 0x5b
+'',    # 0x5c
+'',    # 0x5d
+'',    # 0x5e
+'',    # 0x5f
+'',    # 0x60
+'',    # 0x61
+'',    # 0x62
+'',    # 0x63
+'',    # 0x64
+'',    # 0x65
+'',    # 0x66
+'',    # 0x67
+'',    # 0x68
+'',    # 0x69
+'',    # 0x6a
+'',    # 0x6b
+'b',    # 0x6c
+'d',    # 0x6d
+'f',    # 0x6e
+'m',    # 0x6f
+'n',    # 0x70
+'p',    # 0x71
+'r',    # 0x72
+'r',    # 0x73
+'s',    # 0x74
+'t',    # 0x75
+'z',    # 0x76
+'g',    # 0x77
+'',    # 0x78
+'',    # 0x79
+'',    # 0x7a
+'',    # 0x7b
+'',    # 0x7c
+'p',    # 0x7d
+'',    # 0x7e
+'',    # 0x7f
+'b',    # 0x80
+'d',    # 0x81
+'f',    # 0x82
+'g',    # 0x83
+'k',    # 0x84
+'l',    # 0x85
+'m',    # 0x86
+'n',    # 0x87
+'p',    # 0x88
+'r',    # 0x89
+'s',    # 0x8a
+'',    # 0x8b
+'v',    # 0x8c
+'x',    # 0x8d
+'z',    # 0x8e
+'',    # 0x8f
+'',    # 0x90
+'',    # 0x91
+'',    # 0x92
+'',    # 0x93
+'',    # 0x94
+'',    # 0x95
+'',    # 0x96
+'',    # 0x97
+'',    # 0x98
+'',    # 0x99
+'',    # 0x9a
+'',    # 0x9b
+'',    # 0x9c
+'',    # 0x9d
+'',    # 0x9e
+'',    # 0x9f
+'',    # 0xa0
+'',    # 0xa1
+'',    # 0xa2
+'',    # 0xa3
+'',    # 0xa4
+'',    # 0xa5
+'',    # 0xa6
+'',    # 0xa7
+'',    # 0xa8
+'',    # 0xa9
+'',    # 0xaa
+'',    # 0xab
+'',    # 0xac
+'',    # 0xad
+'',    # 0xae
+'',    # 0xaf
+'',    # 0xb0
+'',    # 0xb1
+'',    # 0xb2
+'',    # 0xb3
+'',    # 0xb4
+'',    # 0xb5
+'',    # 0xb6
+'',    # 0xb7
+'',    # 0xb8
+'',    # 0xb9
+'',    # 0xba
+'',    # 0xbb
+'',    # 0xbc
+'',    # 0xbd
+'',    # 0xbe
+'',    # 0xbf
+'',    # 0xc0
+'',    # 0xc1
+'',    # 0xc2
+'',    # 0xc3
+'',    # 0xc4
+'',    # 0xc5
+'',    # 0xc6
+'',    # 0xc7
+'',    # 0xc8
+'',    # 0xc9
+'',    # 0xca
+'',    # 0xcb
+'',    # 0xcc
+'',    # 0xcd
+'',    # 0xce
+'',    # 0xcf
+'',    # 0xd0
+'',    # 0xd1
+'',    # 0xd2
+'',    # 0xd3
+'',    # 0xd4
+'',    # 0xd5
+'',    # 0xd6
+'',    # 0xd7
+'',    # 0xd8
+'',    # 0xd9
+'',    # 0xda
+'',    # 0xdb
+'',    # 0xdc
+'',    # 0xdd
+'',    # 0xde
+'',    # 0xdf
+'',    # 0xe0
+'',    # 0xe1
+'',    # 0xe2
+'',    # 0xe3
+'',    # 0xe4
+'',    # 0xe5
+'',    # 0xe6
+'',    # 0xe7
+'',    # 0xe8
+'',    # 0xe9
+'',    # 0xea
+'',    # 0xeb
+'',    # 0xec
+'',    # 0xed
+'',    # 0xee
+'',    # 0xef
+'',    # 0xf0
+'',    # 0xf1
+'',    # 0xf2
+'',    # 0xf3
+'',    # 0xf4
+'',    # 0xf5
+'',    # 0xf6
+'',    # 0xf7
+'',    # 0xf8
+'',    # 0xf9
+'',    # 0xfa
+'',    # 0xfb
+'',    # 0xfc
+'',    # 0xfd
+'',    # 0xfe
+)
diff --git a/lib/unidecode/x01e.py b/lib/unidecode/x01e.py
new file mode 100644
index 00000000..606576b6
--- /dev/null
+++ b/lib/unidecode/x01e.py
@@ -0,0 +1,257 @@
+data = (
+'A',    # 0x00
+'a',    # 0x01
+'B',    # 0x02
+'b',    # 0x03
+'B',    # 0x04
+'b',    # 0x05
+'B',    # 0x06
+'b',    # 0x07
+'C',    # 0x08
+'c',    # 0x09
+'D',    # 0x0a
+'d',    # 0x0b
+'D',    # 0x0c
+'d',    # 0x0d
+'D',    # 0x0e
+'d',    # 0x0f
+'D',    # 0x10
+'d',    # 0x11
+'D',    # 0x12
+'d',    # 0x13
+'E',    # 0x14
+'e',    # 0x15
+'E',    # 0x16
+'e',    # 0x17
+'E',    # 0x18
+'e',    # 0x19
+'E',    # 0x1a
+'e',    # 0x1b
+'E',    # 0x1c
+'e',    # 0x1d
+'F',    # 0x1e
+'f',    # 0x1f
+'G',    # 0x20
+'g',    # 0x21
+'H',    # 0x22
+'h',    # 0x23
+'H',    # 0x24
+'h',    # 0x25
+'H',    # 0x26
+'h',    # 0x27
+'H',    # 0x28
+'h',    # 0x29
+'H',    # 0x2a
+'h',    # 0x2b
+'I',    # 0x2c
+'i',    # 0x2d
+'I',    # 0x2e
+'i',    # 0x2f
+'K',    # 0x30
+'k',    # 0x31
+'K',    # 0x32
+'k',    # 0x33
+'K',    # 0x34
+'k',    # 0x35
+'L',    # 0x36
+'l',    # 0x37
+'L',    # 0x38
+'l',    # 0x39
+'L',    # 0x3a
+'l',    # 0x3b
+'L',    # 0x3c
+'l',    # 0x3d
+'M',    # 0x3e
+'m',    # 0x3f
+'M',    # 0x40
+'m',    # 0x41
+'M',    # 0x42
+'m',    # 0x43
+'N',    # 0x44
+'n',    # 0x45
+'N',    # 0x46
+'n',    # 0x47
+'N',    # 0x48
+'n',    # 0x49
+'N',    # 0x4a
+'n',    # 0x4b
+'O',    # 0x4c
+'o',    # 0x4d
+'O',    # 0x4e
+'o',    # 0x4f
+'O',    # 0x50
+'o',    # 0x51
+'O',    # 0x52
+'o',    # 0x53
+'P',    # 0x54
+'p',    # 0x55
+'P',    # 0x56
+'p',    # 0x57
+'R',    # 0x58
+'r',    # 0x59
+'R',    # 0x5a
+'r',    # 0x5b
+'R',    # 0x5c
+'r',    # 0x5d
+'R',    # 0x5e
+'r',    # 0x5f
+'S',    # 0x60
+'s',    # 0x61
+'S',    # 0x62
+'s',    # 0x63
+'S',    # 0x64
+'s',    # 0x65
+'S',    # 0x66
+'s',    # 0x67
+'S',    # 0x68
+'s',    # 0x69
+'T',    # 0x6a
+'t',    # 0x6b
+'T',    # 0x6c
+'t',    # 0x6d
+'T',    # 0x6e
+'t',    # 0x6f
+'T',    # 0x70
+'t',    # 0x71
+'U',    # 0x72
+'u',    # 0x73
+'U',    # 0x74
+'u',    # 0x75
+'U',    # 0x76
+'u',    # 0x77
+'U',    # 0x78
+'u',    # 0x79
+'U',    # 0x7a
+'u',    # 0x7b
+'V',    # 0x7c
+'v',    # 0x7d
+'V',    # 0x7e
+'v',    # 0x7f
+'W',    # 0x80
+'w',    # 0x81
+'W',    # 0x82
+'w',    # 0x83
+'W',    # 0x84
+'w',    # 0x85
+'W',    # 0x86
+'w',    # 0x87
+'W',    # 0x88
+'w',    # 0x89
+'X',    # 0x8a
+'x',    # 0x8b
+'X',    # 0x8c
+'x',    # 0x8d
+'Y',    # 0x8e
+'y',    # 0x8f
+'Z',    # 0x90
+'z',    # 0x91
+'Z',    # 0x92
+'z',    # 0x93
+'Z',    # 0x94
+'z',    # 0x95
+'h',    # 0x96
+'t',    # 0x97
+'w',    # 0x98
+'y',    # 0x99
+'a',    # 0x9a
+'S',    # 0x9b
+'[?]',    # 0x9c
+'[?]',    # 0x9d
+'Ss',    # 0x9e
+'[?]',    # 0x9f
+'A',    # 0xa0
+'a',    # 0xa1
+'A',    # 0xa2
+'a',    # 0xa3
+'A',    # 0xa4
+'a',    # 0xa5
+'A',    # 0xa6
+'a',    # 0xa7
+'A',    # 0xa8
+'a',    # 0xa9
+'A',    # 0xaa
+'a',    # 0xab
+'A',    # 0xac
+'a',    # 0xad
+'A',    # 0xae
+'a',    # 0xaf
+'A',    # 0xb0
+'a',    # 0xb1
+'A',    # 0xb2
+'a',    # 0xb3
+'A',    # 0xb4
+'a',    # 0xb5
+'A',    # 0xb6
+'a',    # 0xb7
+'E',    # 0xb8
+'e',    # 0xb9
+'E',    # 0xba
+'e',    # 0xbb
+'E',    # 0xbc
+'e',    # 0xbd
+'E',    # 0xbe
+'e',    # 0xbf
+'E',    # 0xc0
+'e',    # 0xc1
+'E',    # 0xc2
+'e',    # 0xc3
+'E',    # 0xc4
+'e',    # 0xc5
+'E',    # 0xc6
+'e',    # 0xc7
+'I',    # 0xc8
+'i',    # 0xc9
+'I',    # 0xca
+'i',    # 0xcb
+'O',    # 0xcc
+'o',    # 0xcd
+'O',    # 0xce
+'o',    # 0xcf
+'O',    # 0xd0
+'o',    # 0xd1
+'O',    # 0xd2
+'o',    # 0xd3
+'O',    # 0xd4
+'o',    # 0xd5
+'O',    # 0xd6
+'o',    # 0xd7
+'O',    # 0xd8
+'o',    # 0xd9
+'O',    # 0xda
+'o',    # 0xdb
+'O',    # 0xdc
+'o',    # 0xdd
+'O',    # 0xde
+'o',    # 0xdf
+'O',    # 0xe0
+'o',    # 0xe1
+'O',    # 0xe2
+'o',    # 0xe3
+'U',    # 0xe4
+'u',    # 0xe5
+'U',    # 0xe6
+'u',    # 0xe7
+'U',    # 0xe8
+'u',    # 0xe9
+'U',    # 0xea
+'u',    # 0xeb
+'U',    # 0xec
+'u',    # 0xed
+'U',    # 0xee
+'u',    # 0xef
+'U',    # 0xf0
+'u',    # 0xf1
+'Y',    # 0xf2
+'y',    # 0xf3
+'Y',    # 0xf4
+'y',    # 0xf5
+'Y',    # 0xf6
+'y',    # 0xf7
+'Y',    # 0xf8
+'y',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x01f.py b/lib/unidecode/x01f.py
new file mode 100644
index 00000000..bcd2dec5
--- /dev/null
+++ b/lib/unidecode/x01f.py
@@ -0,0 +1,257 @@
+data = (
+'a',    # 0x00
+'a',    # 0x01
+'a',    # 0x02
+'a',    # 0x03
+'a',    # 0x04
+'a',    # 0x05
+'a',    # 0x06
+'a',    # 0x07
+'A',    # 0x08
+'A',    # 0x09
+'A',    # 0x0a
+'A',    # 0x0b
+'A',    # 0x0c
+'A',    # 0x0d
+'A',    # 0x0e
+'A',    # 0x0f
+'e',    # 0x10
+'e',    # 0x11
+'e',    # 0x12
+'e',    # 0x13
+'e',    # 0x14
+'e',    # 0x15
+'[?]',    # 0x16
+'[?]',    # 0x17
+'E',    # 0x18
+'E',    # 0x19
+'E',    # 0x1a
+'E',    # 0x1b
+'E',    # 0x1c
+'E',    # 0x1d
+'[?]',    # 0x1e
+'[?]',    # 0x1f
+'e',    # 0x20
+'e',    # 0x21
+'e',    # 0x22
+'e',    # 0x23
+'e',    # 0x24
+'e',    # 0x25
+'e',    # 0x26
+'e',    # 0x27
+'E',    # 0x28
+'E',    # 0x29
+'E',    # 0x2a
+'E',    # 0x2b
+'E',    # 0x2c
+'E',    # 0x2d
+'E',    # 0x2e
+'E',    # 0x2f
+'i',    # 0x30
+'i',    # 0x31
+'i',    # 0x32
+'i',    # 0x33
+'i',    # 0x34
+'i',    # 0x35
+'i',    # 0x36
+'i',    # 0x37
+'I',    # 0x38
+'I',    # 0x39
+'I',    # 0x3a
+'I',    # 0x3b
+'I',    # 0x3c
+'I',    # 0x3d
+'I',    # 0x3e
+'I',    # 0x3f
+'o',    # 0x40
+'o',    # 0x41
+'o',    # 0x42
+'o',    # 0x43
+'o',    # 0x44
+'o',    # 0x45
+'[?]',    # 0x46
+'[?]',    # 0x47
+'O',    # 0x48
+'O',    # 0x49
+'O',    # 0x4a
+'O',    # 0x4b
+'O',    # 0x4c
+'O',    # 0x4d
+'[?]',    # 0x4e
+'[?]',    # 0x4f
+'u',    # 0x50
+'u',    # 0x51
+'u',    # 0x52
+'u',    # 0x53
+'u',    # 0x54
+'u',    # 0x55
+'u',    # 0x56
+'u',    # 0x57
+'[?]',    # 0x58
+'U',    # 0x59
+'[?]',    # 0x5a
+'U',    # 0x5b
+'[?]',    # 0x5c
+'U',    # 0x5d
+'[?]',    # 0x5e
+'U',    # 0x5f
+'o',    # 0x60
+'o',    # 0x61
+'o',    # 0x62
+'o',    # 0x63
+'o',    # 0x64
+'o',    # 0x65
+'o',    # 0x66
+'o',    # 0x67
+'O',    # 0x68
+'O',    # 0x69
+'O',    # 0x6a
+'O',    # 0x6b
+'O',    # 0x6c
+'O',    # 0x6d
+'O',    # 0x6e
+'O',    # 0x6f
+'a',    # 0x70
+'a',    # 0x71
+'e',    # 0x72
+'e',    # 0x73
+'e',    # 0x74
+'e',    # 0x75
+'i',    # 0x76
+'i',    # 0x77
+'o',    # 0x78
+'o',    # 0x79
+'u',    # 0x7a
+'u',    # 0x7b
+'o',    # 0x7c
+'o',    # 0x7d
+'[?]',    # 0x7e
+'[?]',    # 0x7f
+'a',    # 0x80
+'a',    # 0x81
+'a',    # 0x82
+'a',    # 0x83
+'a',    # 0x84
+'a',    # 0x85
+'a',    # 0x86
+'a',    # 0x87
+'A',    # 0x88
+'A',    # 0x89
+'A',    # 0x8a
+'A',    # 0x8b
+'A',    # 0x8c
+'A',    # 0x8d
+'A',    # 0x8e
+'A',    # 0x8f
+'e',    # 0x90
+'e',    # 0x91
+'e',    # 0x92
+'e',    # 0x93
+'e',    # 0x94
+'e',    # 0x95
+'e',    # 0x96
+'e',    # 0x97
+'E',    # 0x98
+'E',    # 0x99
+'E',    # 0x9a
+'E',    # 0x9b
+'E',    # 0x9c
+'E',    # 0x9d
+'E',    # 0x9e
+'E',    # 0x9f
+'o',    # 0xa0
+'o',    # 0xa1
+'o',    # 0xa2
+'o',    # 0xa3
+'o',    # 0xa4
+'o',    # 0xa5
+'o',    # 0xa6
+'o',    # 0xa7
+'O',    # 0xa8
+'O',    # 0xa9
+'O',    # 0xaa
+'O',    # 0xab
+'O',    # 0xac
+'O',    # 0xad
+'O',    # 0xae
+'O',    # 0xaf
+'a',    # 0xb0
+'a',    # 0xb1
+'a',    # 0xb2
+'a',    # 0xb3
+'a',    # 0xb4
+'[?]',    # 0xb5
+'a',    # 0xb6
+'a',    # 0xb7
+'A',    # 0xb8
+'A',    # 0xb9
+'A',    # 0xba
+'A',    # 0xbb
+'A',    # 0xbc
+'\'',    # 0xbd
+'i',    # 0xbe
+'\'',    # 0xbf
+'~',    # 0xc0
+'"~',    # 0xc1
+'e',    # 0xc2
+'e',    # 0xc3
+'e',    # 0xc4
+'[?]',    # 0xc5
+'e',    # 0xc6
+'e',    # 0xc7
+'E',    # 0xc8
+'E',    # 0xc9
+'E',    # 0xca
+'E',    # 0xcb
+'E',    # 0xcc
+'\'`',    # 0xcd
+'\'\'',    # 0xce
+'\'~',    # 0xcf
+'i',    # 0xd0
+'i',    # 0xd1
+'i',    # 0xd2
+'i',    # 0xd3
+'[?]',    # 0xd4
+'[?]',    # 0xd5
+'i',    # 0xd6
+'i',    # 0xd7
+'I',    # 0xd8
+'I',    # 0xd9
+'I',    # 0xda
+'I',    # 0xdb
+'[?]',    # 0xdc
+'`\'',    # 0xdd
+'`\'',    # 0xde
+'`~',    # 0xdf
+'u',    # 0xe0
+'u',    # 0xe1
+'u',    # 0xe2
+'u',    # 0xe3
+'R',    # 0xe4
+'R',    # 0xe5
+'u',    # 0xe6
+'u',    # 0xe7
+'U',    # 0xe8
+'U',    # 0xe9
+'U',    # 0xea
+'U',    # 0xeb
+'R',    # 0xec
+'"`',    # 0xed
+'"\'',    # 0xee
+'`',    # 0xef
+'[?]',    # 0xf0
+'[?]',    # 0xf1
+'o',    # 0xf2
+'o',    # 0xf3
+'o',    # 0xf4
+'[?]',    # 0xf5
+'o',    # 0xf6
+'o',    # 0xf7
+'O',    # 0xf8
+'O',    # 0xf9
+'O',    # 0xfa
+'O',    # 0xfb
+'O',    # 0xfc
+'\'',    # 0xfd
+'`',    # 0xfe
+)
diff --git a/lib/unidecode/x020.py b/lib/unidecode/x020.py
new file mode 100644
index 00000000..b6494730
--- /dev/null
+++ b/lib/unidecode/x020.py
@@ -0,0 +1,257 @@
+data = (
+' ',    # 0x00
+' ',    # 0x01
+' ',    # 0x02
+' ',    # 0x03
+' ',    # 0x04
+' ',    # 0x05
+' ',    # 0x06
+' ',    # 0x07
+' ',    # 0x08
+' ',    # 0x09
+' ',    # 0x0a
+' ',    # 0x0b
+'',    # 0x0c
+'',    # 0x0d
+'',    # 0x0e
+'',    # 0x0f
+'-',    # 0x10
+'-',    # 0x11
+'-',    # 0x12
+'-',    # 0x13
+'--',    # 0x14
+'--',    # 0x15
+'||',    # 0x16
+'_',    # 0x17
+'\'',    # 0x18
+'\'',    # 0x19
+',',    # 0x1a
+'\'',    # 0x1b
+'"',    # 0x1c
+'"',    # 0x1d
+',,',    # 0x1e
+'"',    # 0x1f
+'+',    # 0x20
+'++',    # 0x21
+'*',    # 0x22
+'*>',    # 0x23
+'.',    # 0x24
+'..',    # 0x25
+'...',    # 0x26
+'.',    # 0x27
+'\x0a',    # 0x28
+'\x0a\x0a',    # 0x29
+'',    # 0x2a
+'',    # 0x2b
+'',    # 0x2c
+'',    # 0x2d
+'',    # 0x2e
+' ',    # 0x2f
+'%0',    # 0x30
+'%00',    # 0x31
+'\'',    # 0x32
+'\'\'',    # 0x33
+'\'\'\'',    # 0x34
+'`',    # 0x35
+'``',    # 0x36
+'```',    # 0x37
+'^',    # 0x38
+'<',    # 0x39
+'>',    # 0x3a
+'*',    # 0x3b
+'!!',    # 0x3c
+'!?',    # 0x3d
+'-',    # 0x3e
+'_',    # 0x3f
+'-',    # 0x40
+'^',    # 0x41
+'***',    # 0x42
+'--',    # 0x43
+'/',    # 0x44
+'-[',    # 0x45
+']-',    # 0x46
+'??',    # 0x47
+'?!',    # 0x48
+'!?',    # 0x49
+'7',    # 0x4a
+'PP',    # 0x4b
+'(]',    # 0x4c
+'[)',    # 0x4d
+'*',    # 0x4e
+'[?]',    # 0x4f
+'[?]',    # 0x50
+'[?]',    # 0x51
+'%',    # 0x52
+'~',    # 0x53
+'[?]',    # 0x54
+'[?]',    # 0x55
+'[?]',    # 0x56
+"''''",    # 0x57
+'[?]',    # 0x58
+'[?]',    # 0x59
+'[?]',    # 0x5a
+'[?]',    # 0x5b
+'[?]',    # 0x5c
+'[?]',    # 0x5d
+'[?]',    # 0x5e
+'[?]',    # 0x5f
+'',    # 0x60
+'[?]',    # 0x61
+'[?]',    # 0x62
+'[?]',    # 0x63
+'[?]',    # 0x64
+'[?]',    # 0x65
+'[?]',    # 0x66
+'[?]',    # 0x67
+'[?]',    # 0x68
+'[?]',    # 0x69
+'',    # 0x6a
+'',    # 0x6b
+'',    # 0x6c
+'',    # 0x6d
+'',    # 0x6e
+'',    # 0x6f
+'0',    # 0x70
+'',    # 0x71
+'',    # 0x72
+'',    # 0x73
+'4',    # 0x74
+'5',    # 0x75
+'6',    # 0x76
+'7',    # 0x77
+'8',    # 0x78
+'9',    # 0x79
+'+',    # 0x7a
+'-',    # 0x7b
+'=',    # 0x7c
+'(',    # 0x7d
+')',    # 0x7e
+'n',    # 0x7f
+'0',    # 0x80
+'1',    # 0x81
+'2',    # 0x82
+'3',    # 0x83
+'4',    # 0x84
+'5',    # 0x85
+'6',    # 0x86
+'7',    # 0x87
+'8',    # 0x88
+'9',    # 0x89
+'+',    # 0x8a
+'-',    # 0x8b
+'=',    # 0x8c
+'(',    # 0x8d
+')',    # 0x8e
+'[?]',    # 0x8f
+'[?]',    # 0x90
+'[?]',    # 0x91
+'[?]',    # 0x92
+'[?]',    # 0x93
+'[?]',    # 0x94
+'[?]',    # 0x95
+'[?]',    # 0x96
+'[?]',    # 0x97
+'[?]',    # 0x98
+'[?]',    # 0x99
+'[?]',    # 0x9a
+'[?]',    # 0x9b
+'[?]',    # 0x9c
+'[?]',    # 0x9d
+'[?]',    # 0x9e
+'[?]',    # 0x9f
+'ECU',    # 0xa0
+'CL',    # 0xa1
+'Cr',    # 0xa2
+'FF',    # 0xa3
+'L',    # 0xa4
+'mil',    # 0xa5
+'N',    # 0xa6
+'Pts',    # 0xa7
+'Rs',    # 0xa8
+'W',    # 0xa9
+'NS',    # 0xaa
+'D',    # 0xab
+'EUR',    # 0xac
+'K',    # 0xad
+'T',    # 0xae
+'Dr',    # 0xaf
+'[?]',    # 0xb0
+'[?]',    # 0xb1
+'[?]',    # 0xb2
+'[?]',    # 0xb3
+'[?]',    # 0xb4
+'[?]',    # 0xb5
+'[?]',    # 0xb6
+'[?]',    # 0xb7
+'[?]',    # 0xb8
+'[?]',    # 0xb9
+'[?]',    # 0xba
+'[?]',    # 0xbb
+'[?]',    # 0xbc
+'[?]',    # 0xbd
+'[?]',    # 0xbe
+'[?]',    # 0xbf
+'[?]',    # 0xc0
+'[?]',    # 0xc1
+'[?]',    # 0xc2
+'[?]',    # 0xc3
+'[?]',    # 0xc4
+'[?]',    # 0xc5
+'[?]',    # 0xc6
+'[?]',    # 0xc7
+'[?]',    # 0xc8
+'[?]',    # 0xc9
+'[?]',    # 0xca
+'[?]',    # 0xcb
+'[?]',    # 0xcc
+'[?]',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'',    # 0xd0
+'',    # 0xd1
+'',    # 0xd2
+'',    # 0xd3
+'',    # 0xd4
+'',    # 0xd5
+'',    # 0xd6
+'',    # 0xd7
+'',    # 0xd8
+'',    # 0xd9
+'',    # 0xda
+'',    # 0xdb
+'',    # 0xdc
+'',    # 0xdd
+'',    # 0xde
+'',    # 0xdf
+'',    # 0xe0
+'',    # 0xe1
+'',    # 0xe2
+'',    # 0xe3
+'[?]',    # 0xe4
+'',    # 0xe5
+'[?]',    # 0xe6
+'[?]',    # 0xe7
+'[?]',    # 0xe8
+'[?]',    # 0xe9
+'[?]',    # 0xea
+'[?]',    # 0xeb
+'[?]',    # 0xec
+'[?]',    # 0xed
+'[?]',    # 0xee
+'[?]',    # 0xef
+'[?]',    # 0xf0
+'[?]',    # 0xf1
+'[?]',    # 0xf2
+'[?]',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x021.py b/lib/unidecode/x021.py
new file mode 100644
index 00000000..067d9bdc
--- /dev/null
+++ b/lib/unidecode/x021.py
@@ -0,0 +1,257 @@
+data = (
+'',    # 0x00
+'',    # 0x01
+'C',    # 0x02
+'',    # 0x03
+'',    # 0x04
+'',    # 0x05
+'',    # 0x06
+'',    # 0x07
+'',    # 0x08
+'',    # 0x09
+'',    # 0x0a
+'',    # 0x0b
+'',    # 0x0c
+'H',    # 0x0d
+'',    # 0x0e
+'',    # 0x0f
+'',    # 0x10
+'',    # 0x11
+'',    # 0x12
+'',    # 0x13
+'',    # 0x14
+'N',    # 0x15
+'',    # 0x16
+'',    # 0x17
+'',    # 0x18
+'P',    # 0x19
+'Q',    # 0x1a
+'',    # 0x1b
+'',    # 0x1c
+'R',    # 0x1d
+'',    # 0x1e
+'',    # 0x1f
+'(sm)',    # 0x20
+'TEL',    # 0x21
+'(tm)',    # 0x22
+'',    # 0x23
+'Z',    # 0x24
+'',    # 0x25
+'',    # 0x26
+'',    # 0x27
+'',    # 0x28
+'',    # 0x29
+'K',    # 0x2a
+'A',    # 0x2b
+'',    # 0x2c
+'',    # 0x2d
+'e',    # 0x2e
+'e',    # 0x2f
+'E',    # 0x30
+'F',    # 0x31
+'F',    # 0x32
+'M',    # 0x33
+'',    # 0x34
+'',    # 0x35
+'',    # 0x36
+'',    # 0x37
+'',    # 0x38
+'',    # 0x39
+'',    # 0x3a
+'FAX',    # 0x3b
+'',    # 0x3c
+'',    # 0x3d
+'',    # 0x3e
+'',    # 0x3f
+'[?]',    # 0x40
+'[?]',    # 0x41
+'[?]',    # 0x42
+'[?]',    # 0x43
+'[?]',    # 0x44
+'D',    # 0x45
+'d',    # 0x46
+'e',    # 0x47
+'i',    # 0x48
+'j',    # 0x49
+'[?]',    # 0x4a
+'[?]',    # 0x4b
+'[?]',    # 0x4c
+'[?]',    # 0x4d
+'F',    # 0x4e
+'[?]',    # 0x4f
+'[?]',    # 0x50
+'[?]',    # 0x51
+'[?]',    # 0x52
+' 1/3 ',    # 0x53
+' 2/3 ',    # 0x54
+' 1/5 ',    # 0x55
+' 2/5 ',    # 0x56
+' 3/5 ',    # 0x57
+' 4/5 ',    # 0x58
+' 1/6 ',    # 0x59
+' 5/6 ',    # 0x5a
+' 1/8 ',    # 0x5b
+' 3/8 ',    # 0x5c
+' 5/8 ',    # 0x5d
+' 7/8 ',    # 0x5e
+' 1/',    # 0x5f
+'I',    # 0x60
+'II',    # 0x61
+'III',    # 0x62
+'IV',    # 0x63
+'V',    # 0x64
+'VI',    # 0x65
+'VII',    # 0x66
+'VIII',    # 0x67
+'IX',    # 0x68
+'X',    # 0x69
+'XI',    # 0x6a
+'XII',    # 0x6b
+'L',    # 0x6c
+'C',    # 0x6d
+'D',    # 0x6e
+'M',    # 0x6f
+'i',    # 0x70
+'ii',    # 0x71
+'iii',    # 0x72
+'iv',    # 0x73
+'v',    # 0x74
+'vi',    # 0x75
+'vii',    # 0x76
+'viii',    # 0x77
+'ix',    # 0x78
+'x',    # 0x79
+'xi',    # 0x7a
+'xii',    # 0x7b
+'l',    # 0x7c
+'c',    # 0x7d
+'d',    # 0x7e
+'m',    # 0x7f
+'(D',    # 0x80
+'D)',    # 0x81
+'((|))',    # 0x82
+')',    # 0x83
+'[?]',    # 0x84
+'[?]',    # 0x85
+'[?]',    # 0x86
+'[?]',    # 0x87
+'[?]',    # 0x88
+'[?]',    # 0x89
+'[?]',    # 0x8a
+'[?]',    # 0x8b
+'[?]',    # 0x8c
+'[?]',    # 0x8d
+'[?]',    # 0x8e
+'[?]',    # 0x8f
+'-',    # 0x90
+'|',    # 0x91
+'-',    # 0x92
+'|',    # 0x93
+'-',    # 0x94
+'|',    # 0x95
+'\\',    # 0x96
+'/',    # 0x97
+'\\',    # 0x98
+'/',    # 0x99
+'-',    # 0x9a
+'-',    # 0x9b
+'~',    # 0x9c
+'~',    # 0x9d
+'-',    # 0x9e
+'|',    # 0x9f
+'-',    # 0xa0
+'|',    # 0xa1
+'-',    # 0xa2
+'-',    # 0xa3
+'-',    # 0xa4
+'|',    # 0xa5
+'-',    # 0xa6
+'|',    # 0xa7
+'|',    # 0xa8
+'-',    # 0xa9
+'-',    # 0xaa
+'-',    # 0xab
+'-',    # 0xac
+'-',    # 0xad
+'-',    # 0xae
+'|',    # 0xaf
+'|',    # 0xb0
+'|',    # 0xb1
+'|',    # 0xb2
+'|',    # 0xb3
+'|',    # 0xb4
+'|',    # 0xb5
+'^',    # 0xb6
+'V',    # 0xb7
+'\\',    # 0xb8
+'=',    # 0xb9
+'V',    # 0xba
+'^',    # 0xbb
+'-',    # 0xbc
+'-',    # 0xbd
+'|',    # 0xbe
+'|',    # 0xbf
+'-',    # 0xc0
+'-',    # 0xc1
+'|',    # 0xc2
+'|',    # 0xc3
+'=',    # 0xc4
+'|',    # 0xc5
+'=',    # 0xc6
+'=',    # 0xc7
+'|',    # 0xc8
+'=',    # 0xc9
+'|',    # 0xca
+'=',    # 0xcb
+'=',    # 0xcc
+'=',    # 0xcd
+'=',    # 0xce
+'=',    # 0xcf
+'=',    # 0xd0
+'|',    # 0xd1
+'=',    # 0xd2
+'|',    # 0xd3
+'=',    # 0xd4
+'|',    # 0xd5
+'\\',    # 0xd6
+'/',    # 0xd7
+'\\',    # 0xd8
+'/',    # 0xd9
+'=',    # 0xda
+'=',    # 0xdb
+'~',    # 0xdc
+'~',    # 0xdd
+'|',    # 0xde
+'|',    # 0xdf
+'-',    # 0xe0
+'|',    # 0xe1
+'-',    # 0xe2
+'|',    # 0xe3
+'-',    # 0xe4
+'-',    # 0xe5
+'-',    # 0xe6
+'|',    # 0xe7
+'-',    # 0xe8
+'|',    # 0xe9
+'|',    # 0xea
+'|',    # 0xeb
+'|',    # 0xec
+'|',    # 0xed
+'|',    # 0xee
+'|',    # 0xef
+'-',    # 0xf0
+'\\',    # 0xf1
+'\\',    # 0xf2
+'|',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x022.py b/lib/unidecode/x022.py
new file mode 100644
index 00000000..e38fb5cc
--- /dev/null
+++ b/lib/unidecode/x022.py
@@ -0,0 +1,257 @@
+data = (
+'[?]',    # 0x00
+'[?]',    # 0x01
+'[?]',    # 0x02
+'[?]',    # 0x03
+'[?]',    # 0x04
+'[?]',    # 0x05
+'[?]',    # 0x06
+'[?]',    # 0x07
+'[?]',    # 0x08
+'[?]',    # 0x09
+'[?]',    # 0x0a
+'[?]',    # 0x0b
+'[?]',    # 0x0c
+'[?]',    # 0x0d
+'[?]',    # 0x0e
+'[?]',    # 0x0f
+'[?]',    # 0x10
+'[?]',    # 0x11
+'-',    # 0x12
+'[?]',    # 0x13
+'[?]',    # 0x14
+'/',    # 0x15
+'\\',    # 0x16
+'*',    # 0x17
+'[?]',    # 0x18
+'[?]',    # 0x19
+'[?]',    # 0x1a
+'[?]',    # 0x1b
+'[?]',    # 0x1c
+'[?]',    # 0x1d
+'[?]',    # 0x1e
+'[?]',    # 0x1f
+'[?]',    # 0x20
+'[?]',    # 0x21
+'[?]',    # 0x22
+'|',    # 0x23
+'[?]',    # 0x24
+'[?]',    # 0x25
+'[?]',    # 0x26
+'[?]',    # 0x27
+'[?]',    # 0x28
+'[?]',    # 0x29
+'[?]',    # 0x2a
+'[?]',    # 0x2b
+'[?]',    # 0x2c
+'[?]',    # 0x2d
+'[?]',    # 0x2e
+'[?]',    # 0x2f
+'[?]',    # 0x30
+'[?]',    # 0x31
+'[?]',    # 0x32
+'[?]',    # 0x33
+'[?]',    # 0x34
+'[?]',    # 0x35
+':',    # 0x36
+'[?]',    # 0x37
+'[?]',    # 0x38
+'[?]',    # 0x39
+'[?]',    # 0x3a
+'[?]',    # 0x3b
+'~',    # 0x3c
+'[?]',    # 0x3d
+'[?]',    # 0x3e
+'[?]',    # 0x3f
+'[?]',    # 0x40
+'[?]',    # 0x41
+'[?]',    # 0x42
+'[?]',    # 0x43
+'[?]',    # 0x44
+'[?]',    # 0x45
+'[?]',    # 0x46
+'[?]',    # 0x47
+'[?]',    # 0x48
+'[?]',    # 0x49
+'[?]',    # 0x4a
+'[?]',    # 0x4b
+'[?]',    # 0x4c
+'[?]',    # 0x4d
+'[?]',    # 0x4e
+'[?]',    # 0x4f
+'[?]',    # 0x50
+'[?]',    # 0x51
+'[?]',    # 0x52
+'[?]',    # 0x53
+'[?]',    # 0x54
+'[?]',    # 0x55
+'[?]',    # 0x56
+'[?]',    # 0x57
+'[?]',    # 0x58
+'[?]',    # 0x59
+'[?]',    # 0x5a
+'[?]',    # 0x5b
+'[?]',    # 0x5c
+'[?]',    # 0x5d
+'[?]',    # 0x5e
+'[?]',    # 0x5f
+'[?]',    # 0x60
+'[?]',    # 0x61
+'[?]',    # 0x62
+'[?]',    # 0x63
+'<=',    # 0x64
+'>=',    # 0x65
+'<=',    # 0x66
+'>=',    # 0x67
+'[?]',    # 0x68
+'[?]',    # 0x69
+'[?]',    # 0x6a
+'[?]',    # 0x6b
+'[?]',    # 0x6c
+'[?]',    # 0x6d
+'[?]',    # 0x6e
+'[?]',    # 0x6f
+'[?]',    # 0x70
+'[?]',    # 0x71
+'[?]',    # 0x72
+'[?]',    # 0x73
+'[?]',    # 0x74
+'[?]',    # 0x75
+'[?]',    # 0x76
+'[?]',    # 0x77
+'[?]',    # 0x78
+'[?]',    # 0x79
+'[?]',    # 0x7a
+'[?]',    # 0x7b
+'[?]',    # 0x7c
+'[?]',    # 0x7d
+'[?]',    # 0x7e
+'[?]',    # 0x7f
+'[?]',    # 0x80
+'[?]',    # 0x81
+'[?]',    # 0x82
+'[?]',    # 0x83
+'[?]',    # 0x84
+'[?]',    # 0x85
+'[?]',    # 0x86
+'[?]',    # 0x87
+'[?]',    # 0x88
+'[?]',    # 0x89
+'[?]',    # 0x8a
+'[?]',    # 0x8b
+'[?]',    # 0x8c
+'[?]',    # 0x8d
+'[?]',    # 0x8e
+'[?]',    # 0x8f
+'[?]',    # 0x90
+'[?]',    # 0x91
+'[?]',    # 0x92
+'[?]',    # 0x93
+'[?]',    # 0x94
+'[?]',    # 0x95
+'[?]',    # 0x96
+'[?]',    # 0x97
+'[?]',    # 0x98
+'[?]',    # 0x99
+'[?]',    # 0x9a
+'[?]',    # 0x9b
+'[?]',    # 0x9c
+'[?]',    # 0x9d
+'[?]',    # 0x9e
+'[?]',    # 0x9f
+'[?]',    # 0xa0
+'[?]',    # 0xa1
+'[?]',    # 0xa2
+'[?]',    # 0xa3
+'[?]',    # 0xa4
+'[?]',    # 0xa5
+'[?]',    # 0xa6
+'[?]',    # 0xa7
+'[?]',    # 0xa8
+'[?]',    # 0xa9
+'[?]',    # 0xaa
+'[?]',    # 0xab
+'[?]',    # 0xac
+'[?]',    # 0xad
+'[?]',    # 0xae
+'[?]',    # 0xaf
+'[?]',    # 0xb0
+'[?]',    # 0xb1
+'[?]',    # 0xb2
+'[?]',    # 0xb3
+'[?]',    # 0xb4
+'[?]',    # 0xb5
+'[?]',    # 0xb6
+'[?]',    # 0xb7
+'[?]',    # 0xb8
+'[?]',    # 0xb9
+'[?]',    # 0xba
+'[?]',    # 0xbb
+'[?]',    # 0xbc
+'[?]',    # 0xbd
+'[?]',    # 0xbe
+'[?]',    # 0xbf
+'[?]',    # 0xc0
+'[?]',    # 0xc1
+'[?]',    # 0xc2
+'[?]',    # 0xc3
+'[?]',    # 0xc4
+'[?]',    # 0xc5
+'[?]',    # 0xc6
+'[?]',    # 0xc7
+'[?]',    # 0xc8
+'[?]',    # 0xc9
+'[?]',    # 0xca
+'[?]',    # 0xcb
+'[?]',    # 0xcc
+'[?]',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'[?]',    # 0xd0
+'[?]',    # 0xd1
+'[?]',    # 0xd2
+'[?]',    # 0xd3
+'[?]',    # 0xd4
+'[?]',    # 0xd5
+'[?]',    # 0xd6
+'[?]',    # 0xd7
+'[?]',    # 0xd8
+'[?]',    # 0xd9
+'[?]',    # 0xda
+'[?]',    # 0xdb
+'[?]',    # 0xdc
+'[?]',    # 0xdd
+'[?]',    # 0xde
+'[?]',    # 0xdf
+'[?]',    # 0xe0
+'[?]',    # 0xe1
+'[?]',    # 0xe2
+'[?]',    # 0xe3
+'[?]',    # 0xe4
+'[?]',    # 0xe5
+'[?]',    # 0xe6
+'[?]',    # 0xe7
+'[?]',    # 0xe8
+'[?]',    # 0xe9
+'[?]',    # 0xea
+'[?]',    # 0xeb
+'[?]',    # 0xec
+'[?]',    # 0xed
+'[?]',    # 0xee
+'[?]',    # 0xef
+'[?]',    # 0xf0
+'[?]',    # 0xf1
+'[?]',    # 0xf2
+'[?]',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x023.py b/lib/unidecode/x023.py
new file mode 100644
index 00000000..3c4462e2
--- /dev/null
+++ b/lib/unidecode/x023.py
@@ -0,0 +1,257 @@
+data = (
+'[?]',    # 0x00
+'[?]',    # 0x01
+'[?]',    # 0x02
+'^',    # 0x03
+'[?]',    # 0x04
+'[?]',    # 0x05
+'[?]',    # 0x06
+'[?]',    # 0x07
+'[?]',    # 0x08
+'[?]',    # 0x09
+'[?]',    # 0x0a
+'[?]',    # 0x0b
+'[?]',    # 0x0c
+'[?]',    # 0x0d
+'[?]',    # 0x0e
+'[?]',    # 0x0f
+'[?]',    # 0x10
+'[?]',    # 0x11
+'[?]',    # 0x12
+'[?]',    # 0x13
+'[?]',    # 0x14
+'[?]',    # 0x15
+'[?]',    # 0x16
+'[?]',    # 0x17
+'[?]',    # 0x18
+'[?]',    # 0x19
+'[?]',    # 0x1a
+'[?]',    # 0x1b
+'[?]',    # 0x1c
+'[?]',    # 0x1d
+'[?]',    # 0x1e
+'[?]',    # 0x1f
+'[?]',    # 0x20
+'[?]',    # 0x21
+'[?]',    # 0x22
+'[?]',    # 0x23
+'[?]',    # 0x24
+'[?]',    # 0x25
+'[?]',    # 0x26
+'[?]',    # 0x27
+'[?]',    # 0x28
+'<',    # 0x29
+'> ',    # 0x2a
+'[?]',    # 0x2b
+'[?]',    # 0x2c
+'[?]',    # 0x2d
+'[?]',    # 0x2e
+'[?]',    # 0x2f
+'[?]',    # 0x30
+'[?]',    # 0x31
+'[?]',    # 0x32
+'[?]',    # 0x33
+'[?]',    # 0x34
+'[?]',    # 0x35
+'[?]',    # 0x36
+'[?]',    # 0x37
+'[?]',    # 0x38
+'[?]',    # 0x39
+'[?]',    # 0x3a
+'[?]',    # 0x3b
+'[?]',    # 0x3c
+'[?]',    # 0x3d
+'[?]',    # 0x3e
+'[?]',    # 0x3f
+'[?]',    # 0x40
+'[?]',    # 0x41
+'[?]',    # 0x42
+'[?]',    # 0x43
+'[?]',    # 0x44
+'[?]',    # 0x45
+'[?]',    # 0x46
+'[?]',    # 0x47
+'[?]',    # 0x48
+'[?]',    # 0x49
+'[?]',    # 0x4a
+'[?]',    # 0x4b
+'[?]',    # 0x4c
+'[?]',    # 0x4d
+'[?]',    # 0x4e
+'[?]',    # 0x4f
+'[?]',    # 0x50
+'[?]',    # 0x51
+'[?]',    # 0x52
+'[?]',    # 0x53
+'[?]',    # 0x54
+'[?]',    # 0x55
+'[?]',    # 0x56
+'[?]',    # 0x57
+'[?]',    # 0x58
+'[?]',    # 0x59
+'[?]',    # 0x5a
+'[?]',    # 0x5b
+'[?]',    # 0x5c
+'[?]',    # 0x5d
+'[?]',    # 0x5e
+'[?]',    # 0x5f
+'[?]',    # 0x60
+'[?]',    # 0x61
+'[?]',    # 0x62
+'[?]',    # 0x63
+'[?]',    # 0x64
+'[?]',    # 0x65
+'[?]',    # 0x66
+'[?]',    # 0x67
+'[?]',    # 0x68
+'[?]',    # 0x69
+'[?]',    # 0x6a
+'[?]',    # 0x6b
+'[?]',    # 0x6c
+'[?]',    # 0x6d
+'[?]',    # 0x6e
+'[?]',    # 0x6f
+'[?]',    # 0x70
+'[?]',    # 0x71
+'[?]',    # 0x72
+'[?]',    # 0x73
+'[?]',    # 0x74
+'[?]',    # 0x75
+'[?]',    # 0x76
+'[?]',    # 0x77
+'[?]',    # 0x78
+'[?]',    # 0x79
+'[?]',    # 0x7a
+'[?]',    # 0x7b
+'[?]',    # 0x7c
+'[?]',    # 0x7d
+'[?]',    # 0x7e
+'[?]',    # 0x7f
+'[?]',    # 0x80
+'[?]',    # 0x81
+'[?]',    # 0x82
+'[?]',    # 0x83
+'[?]',    # 0x84
+'[?]',    # 0x85
+'[?]',    # 0x86
+'[?]',    # 0x87
+'[?]',    # 0x88
+'[?]',    # 0x89
+'[?]',    # 0x8a
+'[?]',    # 0x8b
+'[?]',    # 0x8c
+'[?]',    # 0x8d
+'[?]',    # 0x8e
+'[?]',    # 0x8f
+'[?]',    # 0x90
+'[?]',    # 0x91
+'[?]',    # 0x92
+'[?]',    # 0x93
+'[?]',    # 0x94
+'[?]',    # 0x95
+'[?]',    # 0x96
+'[?]',    # 0x97
+'[?]',    # 0x98
+'[?]',    # 0x99
+'[?]',    # 0x9a
+'[?]',    # 0x9b
+'[?]',    # 0x9c
+'[?]',    # 0x9d
+'[?]',    # 0x9e
+'[?]',    # 0x9f
+'[?]',    # 0xa0
+'[?]',    # 0xa1
+'[?]',    # 0xa2
+'[?]',    # 0xa3
+'[?]',    # 0xa4
+'[?]',    # 0xa5
+'[?]',    # 0xa6
+'[?]',    # 0xa7
+'[?]',    # 0xa8
+'[?]',    # 0xa9
+'[?]',    # 0xaa
+'[?]',    # 0xab
+'[?]',    # 0xac
+'[?]',    # 0xad
+'[?]',    # 0xae
+'[?]',    # 0xaf
+'[?]',    # 0xb0
+'[?]',    # 0xb1
+'[?]',    # 0xb2
+'[?]',    # 0xb3
+'[?]',    # 0xb4
+'[?]',    # 0xb5
+'[?]',    # 0xb6
+'[?]',    # 0xb7
+'[?]',    # 0xb8
+'[?]',    # 0xb9
+'[?]',    # 0xba
+'[?]',    # 0xbb
+'[?]',    # 0xbc
+'[?]',    # 0xbd
+'[?]',    # 0xbe
+'[?]',    # 0xbf
+'[?]',    # 0xc0
+'[?]',    # 0xc1
+'[?]',    # 0xc2
+'[?]',    # 0xc3
+'[?]',    # 0xc4
+'[?]',    # 0xc5
+'[?]',    # 0xc6
+'[?]',    # 0xc7
+'[?]',    # 0xc8
+'[?]',    # 0xc9
+'[?]',    # 0xca
+'[?]',    # 0xcb
+'[?]',    # 0xcc
+'[?]',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'[?]',    # 0xd0
+'[?]',    # 0xd1
+'[?]',    # 0xd2
+'[?]',    # 0xd3
+'[?]',    # 0xd4
+'[?]',    # 0xd5
+'[?]',    # 0xd6
+'[?]',    # 0xd7
+'[?]',    # 0xd8
+'[?]',    # 0xd9
+'[?]',    # 0xda
+'[?]',    # 0xdb
+'[?]',    # 0xdc
+'[?]',    # 0xdd
+'[?]',    # 0xde
+'[?]',    # 0xdf
+'[?]',    # 0xe0
+'[?]',    # 0xe1
+'[?]',    # 0xe2
+'[?]',    # 0xe3
+'[?]',    # 0xe4
+'[?]',    # 0xe5
+'[?]',    # 0xe6
+'[?]',    # 0xe7
+'[?]',    # 0xe8
+'[?]',    # 0xe9
+'[?]',    # 0xea
+'[?]',    # 0xeb
+'[?]',    # 0xec
+'[?]',    # 0xed
+'[?]',    # 0xee
+'[?]',    # 0xef
+'[?]',    # 0xf0
+'[?]',    # 0xf1
+'[?]',    # 0xf2
+'[?]',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x024.py b/lib/unidecode/x024.py
new file mode 100644
index 00000000..20b3c8f1
--- /dev/null
+++ b/lib/unidecode/x024.py
@@ -0,0 +1,257 @@
+data = (
+'',    # 0x00
+'',    # 0x01
+'',    # 0x02
+'',    # 0x03
+'',    # 0x04
+'',    # 0x05
+'',    # 0x06
+'',    # 0x07
+'',    # 0x08
+'',    # 0x09
+'',    # 0x0a
+'',    # 0x0b
+'',    # 0x0c
+'',    # 0x0d
+'',    # 0x0e
+'',    # 0x0f
+'',    # 0x10
+'',    # 0x11
+'',    # 0x12
+'',    # 0x13
+'',    # 0x14
+'',    # 0x15
+'',    # 0x16
+'',    # 0x17
+'',    # 0x18
+'',    # 0x19
+'',    # 0x1a
+'',    # 0x1b
+'',    # 0x1c
+'',    # 0x1d
+'',    # 0x1e
+'',    # 0x1f
+'',    # 0x20
+'',    # 0x21
+'',    # 0x22
+'',    # 0x23
+'',    # 0x24
+'',    # 0x25
+'',    # 0x26
+'[?]',    # 0x27
+'[?]',    # 0x28
+'[?]',    # 0x29
+'[?]',    # 0x2a
+'[?]',    # 0x2b
+'[?]',    # 0x2c
+'[?]',    # 0x2d
+'[?]',    # 0x2e
+'[?]',    # 0x2f
+'[?]',    # 0x30
+'[?]',    # 0x31
+'[?]',    # 0x32
+'[?]',    # 0x33
+'[?]',    # 0x34
+'[?]',    # 0x35
+'[?]',    # 0x36
+'[?]',    # 0x37
+'[?]',    # 0x38
+'[?]',    # 0x39
+'[?]',    # 0x3a
+'[?]',    # 0x3b
+'[?]',    # 0x3c
+'[?]',    # 0x3d
+'[?]',    # 0x3e
+'[?]',    # 0x3f
+'',    # 0x40
+'',    # 0x41
+'',    # 0x42
+'',    # 0x43
+'',    # 0x44
+'',    # 0x45
+'',    # 0x46
+'',    # 0x47
+'',    # 0x48
+'',    # 0x49
+'',    # 0x4a
+'[?]',    # 0x4b
+'[?]',    # 0x4c
+'[?]',    # 0x4d
+'[?]',    # 0x4e
+'[?]',    # 0x4f
+'[?]',    # 0x50
+'[?]',    # 0x51
+'[?]',    # 0x52
+'[?]',    # 0x53
+'[?]',    # 0x54
+'[?]',    # 0x55
+'[?]',    # 0x56
+'[?]',    # 0x57
+'[?]',    # 0x58
+'[?]',    # 0x59
+'[?]',    # 0x5a
+'[?]',    # 0x5b
+'[?]',    # 0x5c
+'[?]',    # 0x5d
+'[?]',    # 0x5e
+'[?]',    # 0x5f
+'1',    # 0x60
+'2',    # 0x61
+'3',    # 0x62
+'4',    # 0x63
+'5',    # 0x64
+'6',    # 0x65
+'7',    # 0x66
+'8',    # 0x67
+'9',    # 0x68
+'10',    # 0x69
+'11',    # 0x6a
+'12',    # 0x6b
+'13',    # 0x6c
+'14',    # 0x6d
+'15',    # 0x6e
+'16',    # 0x6f
+'17',    # 0x70
+'18',    # 0x71
+'19',    # 0x72
+'20',    # 0x73
+'(1)',    # 0x74
+'(2)',    # 0x75
+'(3)',    # 0x76
+'(4)',    # 0x77
+'(5)',    # 0x78
+'(6)',    # 0x79
+'(7)',    # 0x7a
+'(8)',    # 0x7b
+'(9)',    # 0x7c
+'(10)',    # 0x7d
+'(11)',    # 0x7e
+'(12)',    # 0x7f
+'(13)',    # 0x80
+'(14)',    # 0x81
+'(15)',    # 0x82
+'(16)',    # 0x83
+'(17)',    # 0x84
+'(18)',    # 0x85
+'(19)',    # 0x86
+'(20)',    # 0x87
+'1.',    # 0x88
+'2.',    # 0x89
+'3.',    # 0x8a
+'4.',    # 0x8b
+'5.',    # 0x8c
+'6.',    # 0x8d
+'7.',    # 0x8e
+'8.',    # 0x8f
+'9.',    # 0x90
+'10.',    # 0x91
+'11.',    # 0x92
+'12.',    # 0x93
+'13.',    # 0x94
+'14.',    # 0x95
+'15.',    # 0x96
+'16.',    # 0x97
+'17.',    # 0x98
+'18.',    # 0x99
+'19.',    # 0x9a
+'20.',    # 0x9b
+'(a)',    # 0x9c
+'(b)',    # 0x9d
+'(c)',    # 0x9e
+'(d)',    # 0x9f
+'(e)',    # 0xa0
+'(f)',    # 0xa1
+'(g)',    # 0xa2
+'(h)',    # 0xa3
+'(i)',    # 0xa4
+'(j)',    # 0xa5
+'(k)',    # 0xa6
+'(l)',    # 0xa7
+'(m)',    # 0xa8
+'(n)',    # 0xa9
+'(o)',    # 0xaa
+'(p)',    # 0xab
+'(q)',    # 0xac
+'(r)',    # 0xad
+'(s)',    # 0xae
+'(t)',    # 0xaf
+'(u)',    # 0xb0
+'(v)',    # 0xb1
+'(w)',    # 0xb2
+'(x)',    # 0xb3
+'(y)',    # 0xb4
+'(z)',    # 0xb5
+'a',    # 0xb6
+'b',    # 0xb7
+'c',    # 0xb8
+'d',    # 0xb9
+'e',    # 0xba
+'f',    # 0xbb
+'g',    # 0xbc
+'h',    # 0xbd
+'i',    # 0xbe
+'j',    # 0xbf
+'k',    # 0xc0
+'l',    # 0xc1
+'m',    # 0xc2
+'n',    # 0xc3
+'o',    # 0xc4
+'p',    # 0xc5
+'q',    # 0xc6
+'r',    # 0xc7
+'s',    # 0xc8
+'t',    # 0xc9
+'u',    # 0xca
+'v',    # 0xcb
+'w',    # 0xcc
+'x',    # 0xcd
+'y',    # 0xce
+'z',    # 0xcf
+'a',    # 0xd0
+'b',    # 0xd1
+'c',    # 0xd2
+'d',    # 0xd3
+'e',    # 0xd4
+'f',    # 0xd5
+'g',    # 0xd6
+'h',    # 0xd7
+'i',    # 0xd8
+'j',    # 0xd9
+'k',    # 0xda
+'l',    # 0xdb
+'m',    # 0xdc
+'n',    # 0xdd
+'o',    # 0xde
+'p',    # 0xdf
+'q',    # 0xe0
+'r',    # 0xe1
+'s',    # 0xe2
+'t',    # 0xe3
+'u',    # 0xe4
+'v',    # 0xe5
+'w',    # 0xe6
+'x',    # 0xe7
+'y',    # 0xe8
+'z',    # 0xe9
+'0',    # 0xea
+'[?]',    # 0xeb
+'[?]',    # 0xec
+'[?]',    # 0xed
+'[?]',    # 0xee
+'[?]',    # 0xef
+'[?]',    # 0xf0
+'[?]',    # 0xf1
+'[?]',    # 0xf2
+'[?]',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x025.py b/lib/unidecode/x025.py
new file mode 100644
index 00000000..5a62b10d
--- /dev/null
+++ b/lib/unidecode/x025.py
@@ -0,0 +1,257 @@
+data = (
+'-',    # 0x00
+'-',    # 0x01
+'|',    # 0x02
+'|',    # 0x03
+'-',    # 0x04
+'-',    # 0x05
+'|',    # 0x06
+'|',    # 0x07
+'-',    # 0x08
+'-',    # 0x09
+'|',    # 0x0a
+'|',    # 0x0b
+'+',    # 0x0c
+'+',    # 0x0d
+'+',    # 0x0e
+'+',    # 0x0f
+'+',    # 0x10
+'+',    # 0x11
+'+',    # 0x12
+'+',    # 0x13
+'+',    # 0x14
+'+',    # 0x15
+'+',    # 0x16
+'+',    # 0x17
+'+',    # 0x18
+'+',    # 0x19
+'+',    # 0x1a
+'+',    # 0x1b
+'+',    # 0x1c
+'+',    # 0x1d
+'+',    # 0x1e
+'+',    # 0x1f
+'+',    # 0x20
+'+',    # 0x21
+'+',    # 0x22
+'+',    # 0x23
+'+',    # 0x24
+'+',    # 0x25
+'+',    # 0x26
+'+',    # 0x27
+'+',    # 0x28
+'+',    # 0x29
+'+',    # 0x2a
+'+',    # 0x2b
+'+',    # 0x2c
+'+',    # 0x2d
+'+',    # 0x2e
+'+',    # 0x2f
+'+',    # 0x30
+'+',    # 0x31
+'+',    # 0x32
+'+',    # 0x33
+'+',    # 0x34
+'+',    # 0x35
+'+',    # 0x36
+'+',    # 0x37
+'+',    # 0x38
+'+',    # 0x39
+'+',    # 0x3a
+'+',    # 0x3b
+'+',    # 0x3c
+'+',    # 0x3d
+'+',    # 0x3e
+'+',    # 0x3f
+'+',    # 0x40
+'+',    # 0x41
+'+',    # 0x42
+'+',    # 0x43
+'+',    # 0x44
+'+',    # 0x45
+'+',    # 0x46
+'+',    # 0x47
+'+',    # 0x48
+'+',    # 0x49
+'+',    # 0x4a
+'+',    # 0x4b
+'-',    # 0x4c
+'-',    # 0x4d
+'|',    # 0x4e
+'|',    # 0x4f
+'-',    # 0x50
+'|',    # 0x51
+'+',    # 0x52
+'+',    # 0x53
+'+',    # 0x54
+'+',    # 0x55
+'+',    # 0x56
+'+',    # 0x57
+'+',    # 0x58
+'+',    # 0x59
+'+',    # 0x5a
+'+',    # 0x5b
+'+',    # 0x5c
+'+',    # 0x5d
+'+',    # 0x5e
+'+',    # 0x5f
+'+',    # 0x60
+'+',    # 0x61
+'+',    # 0x62
+'+',    # 0x63
+'+',    # 0x64
+'+',    # 0x65
+'+',    # 0x66
+'+',    # 0x67
+'+',    # 0x68
+'+',    # 0x69
+'+',    # 0x6a
+'+',    # 0x6b
+'+',    # 0x6c
+'+',    # 0x6d
+'+',    # 0x6e
+'+',    # 0x6f
+'+',    # 0x70
+'/',    # 0x71
+'\\',    # 0x72
+'X',    # 0x73
+'-',    # 0x74
+'|',    # 0x75
+'-',    # 0x76
+'|',    # 0x77
+'-',    # 0x78
+'|',    # 0x79
+'-',    # 0x7a
+'|',    # 0x7b
+'-',    # 0x7c
+'|',    # 0x7d
+'-',    # 0x7e
+'|',    # 0x7f
+'#',    # 0x80
+'#',    # 0x81
+'#',    # 0x82
+'#',    # 0x83
+'#',    # 0x84
+'#',    # 0x85
+'#',    # 0x86
+'#',    # 0x87
+'#',    # 0x88
+'#',    # 0x89
+'#',    # 0x8a
+'#',    # 0x8b
+'#',    # 0x8c
+'#',    # 0x8d
+'#',    # 0x8e
+'#',    # 0x8f
+'#',    # 0x90
+'#',    # 0x91
+'#',    # 0x92
+'#',    # 0x93
+'-',    # 0x94
+'|',    # 0x95
+'[?]',    # 0x96
+'[?]',    # 0x97
+'[?]',    # 0x98
+'[?]',    # 0x99
+'[?]',    # 0x9a
+'[?]',    # 0x9b
+'[?]',    # 0x9c
+'[?]',    # 0x9d
+'[?]',    # 0x9e
+'[?]',    # 0x9f
+'#',    # 0xa0
+'#',    # 0xa1
+'#',    # 0xa2
+'#',    # 0xa3
+'#',    # 0xa4
+'#',    # 0xa5
+'#',    # 0xa6
+'#',    # 0xa7
+'#',    # 0xa8
+'#',    # 0xa9
+'#',    # 0xaa
+'#',    # 0xab
+'#',    # 0xac
+'#',    # 0xad
+'#',    # 0xae
+'#',    # 0xaf
+'#',    # 0xb0
+'#',    # 0xb1
+'^',    # 0xb2
+'^',    # 0xb3
+'^',    # 0xb4
+'^',    # 0xb5
+'>',    # 0xb6
+'>',    # 0xb7
+'>',    # 0xb8
+'>',    # 0xb9
+'>',    # 0xba
+'>',    # 0xbb
+'V',    # 0xbc
+'V',    # 0xbd
+'V',    # 0xbe
+'V',    # 0xbf
+'<',    # 0xc0
+'<',    # 0xc1
+'<',    # 0xc2
+'<',    # 0xc3
+'<',    # 0xc4
+'<',    # 0xc5
+'*',    # 0xc6
+'*',    # 0xc7
+'*',    # 0xc8
+'*',    # 0xc9
+'*',    # 0xca
+'*',    # 0xcb
+'*',    # 0xcc
+'*',    # 0xcd
+'*',    # 0xce
+'*',    # 0xcf
+'*',    # 0xd0
+'*',    # 0xd1
+'*',    # 0xd2
+'*',    # 0xd3
+'*',    # 0xd4
+'*',    # 0xd5
+'*',    # 0xd6
+'*',    # 0xd7
+'*',    # 0xd8
+'*',    # 0xd9
+'*',    # 0xda
+'*',    # 0xdb
+'*',    # 0xdc
+'*',    # 0xdd
+'*',    # 0xde
+'*',    # 0xdf
+'*',    # 0xe0
+'*',    # 0xe1
+'*',    # 0xe2
+'*',    # 0xe3
+'*',    # 0xe4
+'*',    # 0xe5
+'*',    # 0xe6
+'#',    # 0xe7
+'#',    # 0xe8
+'#',    # 0xe9
+'#',    # 0xea
+'#',    # 0xeb
+'^',    # 0xec
+'^',    # 0xed
+'^',    # 0xee
+'O',    # 0xef
+'#',    # 0xf0
+'#',    # 0xf1
+'#',    # 0xf2
+'#',    # 0xf3
+'#',    # 0xf4
+'#',    # 0xf5
+'#',    # 0xf6
+'#',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x026.py b/lib/unidecode/x026.py
new file mode 100644
index 00000000..c575472c
--- /dev/null
+++ b/lib/unidecode/x026.py
@@ -0,0 +1,257 @@
+data = (
+'',    # 0x00
+'',    # 0x01
+'',    # 0x02
+'',    # 0x03
+'',    # 0x04
+'',    # 0x05
+'',    # 0x06
+'',    # 0x07
+'',    # 0x08
+'',    # 0x09
+'',    # 0x0a
+'',    # 0x0b
+'',    # 0x0c
+'',    # 0x0d
+'',    # 0x0e
+'',    # 0x0f
+'',    # 0x10
+'',    # 0x11
+'',    # 0x12
+'',    # 0x13
+'[?]',    # 0x14
+'[?]',    # 0x15
+'[?]',    # 0x16
+'[?]',    # 0x17
+'[?]',    # 0x18
+'',    # 0x19
+'',    # 0x1a
+'',    # 0x1b
+'',    # 0x1c
+'',    # 0x1d
+'',    # 0x1e
+'',    # 0x1f
+'',    # 0x20
+'',    # 0x21
+'',    # 0x22
+'',    # 0x23
+'',    # 0x24
+'',    # 0x25
+'',    # 0x26
+'',    # 0x27
+'',    # 0x28
+'',    # 0x29
+'',    # 0x2a
+'',    # 0x2b
+'',    # 0x2c
+'',    # 0x2d
+'',    # 0x2e
+'',    # 0x2f
+'',    # 0x30
+'',    # 0x31
+'',    # 0x32
+'',    # 0x33
+'',    # 0x34
+'',    # 0x35
+'',    # 0x36
+'',    # 0x37
+'',    # 0x38
+'',    # 0x39
+'',    # 0x3a
+'',    # 0x3b
+'',    # 0x3c
+'',    # 0x3d
+'',    # 0x3e
+'',    # 0x3f
+'',    # 0x40
+'',    # 0x41
+'',    # 0x42
+'',    # 0x43
+'',    # 0x44
+'',    # 0x45
+'',    # 0x46
+'',    # 0x47
+'',    # 0x48
+'',    # 0x49
+'',    # 0x4a
+'',    # 0x4b
+'',    # 0x4c
+'',    # 0x4d
+'',    # 0x4e
+'',    # 0x4f
+'',    # 0x50
+'',    # 0x51
+'',    # 0x52
+'',    # 0x53
+'',    # 0x54
+'',    # 0x55
+'',    # 0x56
+'',    # 0x57
+'',    # 0x58
+'',    # 0x59
+'',    # 0x5a
+'',    # 0x5b
+'',    # 0x5c
+'',    # 0x5d
+'',    # 0x5e
+'',    # 0x5f
+'',    # 0x60
+'',    # 0x61
+'',    # 0x62
+'',    # 0x63
+'',    # 0x64
+'',    # 0x65
+'',    # 0x66
+'',    # 0x67
+'',    # 0x68
+'',    # 0x69
+'',    # 0x6a
+'',    # 0x6b
+'',    # 0x6c
+'',    # 0x6d
+'',    # 0x6e
+'#',    # 0x6f
+'',    # 0x70
+'',    # 0x71
+'[?]',    # 0x72
+'[?]',    # 0x73
+'[?]',    # 0x74
+'[?]',    # 0x75
+'[?]',    # 0x76
+'[?]',    # 0x77
+'[?]',    # 0x78
+'[?]',    # 0x79
+'[?]',    # 0x7a
+'[?]',    # 0x7b
+'[?]',    # 0x7c
+'[?]',    # 0x7d
+'[?]',    # 0x7e
+'[?]',    # 0x7f
+'[?]',    # 0x80
+'[?]',    # 0x81
+'[?]',    # 0x82
+'[?]',    # 0x83
+'[?]',    # 0x84
+'[?]',    # 0x85
+'[?]',    # 0x86
+'[?]',    # 0x87
+'[?]',    # 0x88
+'[?]',    # 0x89
+'[?]',    # 0x8a
+'[?]',    # 0x8b
+'[?]',    # 0x8c
+'[?]',    # 0x8d
+'[?]',    # 0x8e
+'[?]',    # 0x8f
+'[?]',    # 0x90
+'[?]',    # 0x91
+'[?]',    # 0x92
+'[?]',    # 0x93
+'[?]',    # 0x94
+'[?]',    # 0x95
+'[?]',    # 0x96
+'[?]',    # 0x97
+'[?]',    # 0x98
+'[?]',    # 0x99
+'[?]',    # 0x9a
+'[?]',    # 0x9b
+'[?]',    # 0x9c
+'[?]',    # 0x9d
+'[?]',    # 0x9e
+'[?]',    # 0x9f
+'[?]',    # 0xa0
+'[?]',    # 0xa1
+'[?]',    # 0xa2
+'[?]',    # 0xa3
+'[?]',    # 0xa4
+'[?]',    # 0xa5
+'[?]',    # 0xa6
+'[?]',    # 0xa7
+'[?]',    # 0xa8
+'[?]',    # 0xa9
+'[?]',    # 0xaa
+'[?]',    # 0xab
+'[?]',    # 0xac
+'[?]',    # 0xad
+'[?]',    # 0xae
+'[?]',    # 0xaf
+'[?]',    # 0xb0
+'[?]',    # 0xb1
+'[?]',    # 0xb2
+'[?]',    # 0xb3
+'[?]',    # 0xb4
+'[?]',    # 0xb5
+'[?]',    # 0xb6
+'[?]',    # 0xb7
+'[?]',    # 0xb8
+'[?]',    # 0xb9
+'[?]',    # 0xba
+'[?]',    # 0xbb
+'[?]',    # 0xbc
+'[?]',    # 0xbd
+'[?]',    # 0xbe
+'[?]',    # 0xbf
+'[?]',    # 0xc0
+'[?]',    # 0xc1
+'[?]',    # 0xc2
+'[?]',    # 0xc3
+'[?]',    # 0xc4
+'[?]',    # 0xc5
+'[?]',    # 0xc6
+'[?]',    # 0xc7
+'[?]',    # 0xc8
+'[?]',    # 0xc9
+'[?]',    # 0xca
+'[?]',    # 0xcb
+'[?]',    # 0xcc
+'[?]',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'[?]',    # 0xd0
+'[?]',    # 0xd1
+'[?]',    # 0xd2
+'[?]',    # 0xd3
+'[?]',    # 0xd4
+'[?]',    # 0xd5
+'[?]',    # 0xd6
+'[?]',    # 0xd7
+'[?]',    # 0xd8
+'[?]',    # 0xd9
+'[?]',    # 0xda
+'[?]',    # 0xdb
+'[?]',    # 0xdc
+'[?]',    # 0xdd
+'[?]',    # 0xde
+'[?]',    # 0xdf
+'[?]',    # 0xe0
+'[?]',    # 0xe1
+'[?]',    # 0xe2
+'[?]',    # 0xe3
+'[?]',    # 0xe4
+'[?]',    # 0xe5
+'[?]',    # 0xe6
+'[?]',    # 0xe7
+'[?]',    # 0xe8
+'[?]',    # 0xe9
+'[?]',    # 0xea
+'[?]',    # 0xeb
+'[?]',    # 0xec
+'[?]',    # 0xed
+'[?]',    # 0xee
+'[?]',    # 0xef
+'[?]',    # 0xf0
+'[?]',    # 0xf1
+'[?]',    # 0xf2
+'[?]',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x027.py b/lib/unidecode/x027.py
new file mode 100644
index 00000000..3c74c073
--- /dev/null
+++ b/lib/unidecode/x027.py
@@ -0,0 +1,257 @@
+data = (
+'[?]',    # 0x00
+'',    # 0x01
+'',    # 0x02
+'',    # 0x03
+'',    # 0x04
+'',    # 0x05
+'',    # 0x06
+'',    # 0x07
+'',    # 0x08
+'',    # 0x09
+'',    # 0x0a
+'',    # 0x0b
+'',    # 0x0c
+'',    # 0x0d
+'',    # 0x0e
+'',    # 0x0f
+'',    # 0x10
+'',    # 0x11
+'',    # 0x12
+'',    # 0x13
+'',    # 0x14
+'',    # 0x15
+'',    # 0x16
+'',    # 0x17
+'',    # 0x18
+'',    # 0x19
+'',    # 0x1a
+'',    # 0x1b
+'',    # 0x1c
+'',    # 0x1d
+'',    # 0x1e
+'',    # 0x1f
+'',    # 0x20
+'',    # 0x21
+'',    # 0x22
+'',    # 0x23
+'',    # 0x24
+'',    # 0x25
+'',    # 0x26
+'',    # 0x27
+'',    # 0x28
+'',    # 0x29
+'',    # 0x2a
+'',    # 0x2b
+'',    # 0x2c
+'',    # 0x2d
+'',    # 0x2e
+'',    # 0x2f
+'',    # 0x30
+'*',    # 0x31
+'',    # 0x32
+'',    # 0x33
+'',    # 0x34
+'',    # 0x35
+'',    # 0x36
+'',    # 0x37
+'',    # 0x38
+'',    # 0x39
+'',    # 0x3a
+'',    # 0x3b
+'',    # 0x3c
+'',    # 0x3d
+'',    # 0x3e
+'',    # 0x3f
+'',    # 0x40
+'',    # 0x41
+'',    # 0x42
+'',    # 0x43
+'',    # 0x44
+'',    # 0x45
+'',    # 0x46
+'',    # 0x47
+'',    # 0x48
+'',    # 0x49
+'',    # 0x4a
+'',    # 0x4b
+'',    # 0x4c
+'',    # 0x4d
+'',    # 0x4e
+'',    # 0x4f
+'',    # 0x50
+'',    # 0x51
+'',    # 0x52
+'',    # 0x53
+'',    # 0x54
+'',    # 0x55
+'',    # 0x56
+'',    # 0x57
+'|',    # 0x58
+'',    # 0x59
+'',    # 0x5a
+'',    # 0x5b
+'',    # 0x5c
+'',    # 0x5d
+'',    # 0x5e
+'[?]',    # 0x5f
+'[?]',    # 0x60
+'',    # 0x61
+'!',    # 0x62
+'',    # 0x63
+'',    # 0x64
+'',    # 0x65
+'',    # 0x66
+'',    # 0x67
+'',    # 0x68
+'',    # 0x69
+'',    # 0x6a
+'',    # 0x6b
+'',    # 0x6c
+'',    # 0x6d
+'',    # 0x6e
+'',    # 0x6f
+'',    # 0x70
+'',    # 0x71
+'',    # 0x72
+'',    # 0x73
+'',    # 0x74
+'',    # 0x75
+'',    # 0x76
+'',    # 0x77
+'',    # 0x78
+'',    # 0x79
+'',    # 0x7a
+'',    # 0x7b
+'',    # 0x7c
+'',    # 0x7d
+'',    # 0x7e
+'',    # 0x7f
+'',    # 0x80
+'',    # 0x81
+'',    # 0x82
+'',    # 0x83
+'',    # 0x84
+'',    # 0x85
+'',    # 0x86
+'',    # 0x87
+'',    # 0x88
+'',    # 0x89
+'',    # 0x8a
+'',    # 0x8b
+'',    # 0x8c
+'',    # 0x8d
+'',    # 0x8e
+'',    # 0x8f
+'',    # 0x90
+'',    # 0x91
+'',    # 0x92
+'',    # 0x93
+'',    # 0x94
+'',    # 0x95
+'',    # 0x96
+'',    # 0x97
+'',    # 0x98
+'',    # 0x99
+'',    # 0x9a
+'',    # 0x9b
+'',    # 0x9c
+'',    # 0x9d
+'',    # 0x9e
+'',    # 0x9f
+'',    # 0xa0
+'',    # 0xa1
+'',    # 0xa2
+'',    # 0xa3
+'',    # 0xa4
+'',    # 0xa5
+'',    # 0xa6
+'',    # 0xa7
+'',    # 0xa8
+'',    # 0xa9
+'',    # 0xaa
+'',    # 0xab
+'',    # 0xac
+'',    # 0xad
+'',    # 0xae
+'',    # 0xaf
+'[?]',    # 0xb0
+'',    # 0xb1
+'',    # 0xb2
+'',    # 0xb3
+'',    # 0xb4
+'',    # 0xb5
+'',    # 0xb6
+'',    # 0xb7
+'',    # 0xb8
+'',    # 0xb9
+'',    # 0xba
+'',    # 0xbb
+'',    # 0xbc
+'',    # 0xbd
+'',    # 0xbe
+'[?]',    # 0xbf
+'[?]',    # 0xc0
+'[?]',    # 0xc1
+'[?]',    # 0xc2
+'[?]',    # 0xc3
+'[?]',    # 0xc4
+'[?]',    # 0xc5
+'[?]',    # 0xc6
+'[?]',    # 0xc7
+'[?]',    # 0xc8
+'[?]',    # 0xc9
+'[?]',    # 0xca
+'[?]',    # 0xcb
+'[?]',    # 0xcc
+'[?]',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'[?]',    # 0xd0
+'[?]',    # 0xd1
+'[?]',    # 0xd2
+'[?]',    # 0xd3
+'[?]',    # 0xd4
+'[?]',    # 0xd5
+'[?]',    # 0xd6
+'[?]',    # 0xd7
+'[?]',    # 0xd8
+'[?]',    # 0xd9
+'[?]',    # 0xda
+'[?]',    # 0xdb
+'[?]',    # 0xdc
+'[?]',    # 0xdd
+'[?]',    # 0xde
+'[?]',    # 0xdf
+'[?]',    # 0xe0
+'[?]',    # 0xe1
+'[?]',    # 0xe2
+'[?]',    # 0xe3
+'[?]',    # 0xe4
+'[?]',    # 0xe5
+'[',    # 0xe6
+'[?]',    # 0xe7
+'<',    # 0xe8
+'> ',    # 0xe9
+'[?]',    # 0xea
+'[?]',    # 0xeb
+'[?]',    # 0xec
+'[?]',    # 0xed
+'[?]',    # 0xee
+'[?]',    # 0xef
+'[?]',    # 0xf0
+'[?]',    # 0xf1
+'[?]',    # 0xf2
+'[?]',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x028.py b/lib/unidecode/x028.py
new file mode 100644
index 00000000..dc2f3f05
--- /dev/null
+++ b/lib/unidecode/x028.py
@@ -0,0 +1,258 @@
+data = (
+' ',    # 0x00
+'a',    # 0x01
+'1',    # 0x02
+'b',    # 0x03
+'\'',    # 0x04
+'k',    # 0x05
+'2',    # 0x06
+'l',    # 0x07
+'@',    # 0x08
+'c',    # 0x09
+'i',    # 0x0a
+'f',    # 0x0b
+'/',    # 0x0c
+'m',    # 0x0d
+'s',    # 0x0e
+'p',    # 0x0f
+'"',    # 0x10
+'e',    # 0x11
+'3',    # 0x12
+'h',    # 0x13
+'9',    # 0x14
+'o',    # 0x15
+'6',    # 0x16
+'r',    # 0x17
+'^',    # 0x18
+'d',    # 0x19
+'j',    # 0x1a
+'g',    # 0x1b
+'>',    # 0x1c
+'n',    # 0x1d
+'t',    # 0x1e
+'q',    # 0x1f
+',',    # 0x20
+'*',    # 0x21
+'5',    # 0x22
+'<',    # 0x23
+'-',    # 0x24
+'u',    # 0x25
+'8',    # 0x26
+'v',    # 0x27
+'.',    # 0x28
+'%',    # 0x29
+'[',    # 0x2a
+'$',    # 0x2b
+'+',    # 0x2c
+'x',    # 0x2d
+'!',    # 0x2e
+'&',    # 0x2f
+';',    # 0x30
+':',    # 0x31
+'4',    # 0x32
+'\\',    # 0x33
+'0',    # 0x34
+'z',    # 0x35
+'7',    # 0x36
+'(',    # 0x37
+'_',    # 0x38
+'?',    # 0x39
+'w',    # 0x3a
+']',    # 0x3b
+'#',    # 0x3c
+'y',    # 0x3d
+')',    # 0x3e
+'=',    # 0x3f
+'[d7]',    # 0x40
+'[d17]',    # 0x41
+'[d27]',    # 0x42
+'[d127]',    # 0x43
+'[d37]',    # 0x44
+'[d137]',    # 0x45
+'[d237]',    # 0x46
+'[d1237]',    # 0x47
+'[d47]',    # 0x48
+'[d147]',    # 0x49
+'[d247]',    # 0x4a
+'[d1247]',    # 0x4b
+'[d347]',    # 0x4c
+'[d1347]',    # 0x4d
+'[d2347]',    # 0x4e
+'[d12347]',    # 0x4f
+'[d57]',    # 0x50
+'[d157]',    # 0x51
+'[d257]',    # 0x52
+'[d1257]',    # 0x53
+'[d357]',    # 0x54
+'[d1357]',    # 0x55
+'[d2357]',    # 0x56
+'[d12357]',    # 0x57
+'[d457]',    # 0x58
+'[d1457]',    # 0x59
+'[d2457]',    # 0x5a
+'[d12457]',    # 0x5b
+'[d3457]',    # 0x5c
+'[d13457]',    # 0x5d
+'[d23457]',    # 0x5e
+'[d123457]',    # 0x5f
+'[d67]',    # 0x60
+'[d167]',    # 0x61
+'[d267]',    # 0x62
+'[d1267]',    # 0x63
+'[d367]',    # 0x64
+'[d1367]',    # 0x65
+'[d2367]',    # 0x66
+'[d12367]',    # 0x67
+'[d467]',    # 0x68
+'[d1467]',    # 0x69
+'[d2467]',    # 0x6a
+'[d12467]',    # 0x6b
+'[d3467]',    # 0x6c
+'[d13467]',    # 0x6d
+'[d23467]',    # 0x6e
+'[d123467]',    # 0x6f
+'[d567]',    # 0x70
+'[d1567]',    # 0x71
+'[d2567]',    # 0x72
+'[d12567]',    # 0x73
+'[d3567]',    # 0x74
+'[d13567]',    # 0x75
+'[d23567]',    # 0x76
+'[d123567]',    # 0x77
+'[d4567]',    # 0x78
+'[d14567]',    # 0x79
+'[d24567]',    # 0x7a
+'[d124567]',    # 0x7b
+'[d34567]',    # 0x7c
+'[d134567]',    # 0x7d
+'[d234567]',    # 0x7e
+'[d1234567]',    # 0x7f
+'[d8]',    # 0x80
+'[d18]',    # 0x81
+'[d28]',    # 0x82
+'[d128]',    # 0x83
+'[d38]',    # 0x84
+'[d138]',    # 0x85
+'[d238]',    # 0x86
+'[d1238]',    # 0x87
+'[d48]',    # 0x88
+'[d148]',    # 0x89
+'[d248]',    # 0x8a
+'[d1248]',    # 0x8b
+'[d348]',    # 0x8c
+'[d1348]',    # 0x8d
+'[d2348]',    # 0x8e
+'[d12348]',    # 0x8f
+'[d58]',    # 0x90
+'[d158]',    # 0x91
+'[d258]',    # 0x92
+'[d1258]',    # 0x93
+'[d358]',    # 0x94
+'[d1358]',    # 0x95
+'[d2358]',    # 0x96
+'[d12358]',    # 0x97
+'[d458]',    # 0x98
+'[d1458]',    # 0x99
+'[d2458]',    # 0x9a
+'[d12458]',    # 0x9b
+'[d3458]',    # 0x9c
+'[d13458]',    # 0x9d
+'[d23458]',    # 0x9e
+'[d123458]',    # 0x9f
+'[d68]',    # 0xa0
+'[d168]',    # 0xa1
+'[d268]',    # 0xa2
+'[d1268]',    # 0xa3
+'[d368]',    # 0xa4
+'[d1368]',    # 0xa5
+'[d2368]',    # 0xa6
+'[d12368]',    # 0xa7
+'[d468]',    # 0xa8
+'[d1468]',    # 0xa9
+'[d2468]',    # 0xaa
+'[d12468]',    # 0xab
+'[d3468]',    # 0xac
+'[d13468]',    # 0xad
+'[d23468]',    # 0xae
+'[d123468]',    # 0xaf
+'[d568]',    # 0xb0
+'[d1568]',    # 0xb1
+'[d2568]',    # 0xb2
+'[d12568]',    # 0xb3
+'[d3568]',    # 0xb4
+'[d13568]',    # 0xb5
+'[d23568]',    # 0xb6
+'[d123568]',    # 0xb7
+'[d4568]',    # 0xb8
+'[d14568]',    # 0xb9
+'[d24568]',    # 0xba
+'[d124568]',    # 0xbb
+'[d34568]',    # 0xbc
+'[d134568]',    # 0xbd
+'[d234568]',    # 0xbe
+'[d1234568]',    # 0xbf
+'[d78]',    # 0xc0
+'[d178]',    # 0xc1
+'[d278]',    # 0xc2
+'[d1278]',    # 0xc3
+'[d378]',    # 0xc4
+'[d1378]',    # 0xc5
+'[d2378]',    # 0xc6
+'[d12378]',    # 0xc7
+'[d478]',    # 0xc8
+'[d1478]',    # 0xc9
+'[d2478]',    # 0xca
+'[d12478]',    # 0xcb
+'[d3478]',    # 0xcc
+'[d13478]',    # 0xcd
+'[d23478]',    # 0xce
+'[d123478]',    # 0xcf
+'[d578]',    # 0xd0
+'[d1578]',    # 0xd1
+'[d2578]',    # 0xd2
+'[d12578]',    # 0xd3
+'[d3578]',    # 0xd4
+'[d13578]',    # 0xd5
+'[d23578]',    # 0xd6
+'[d123578]',    # 0xd7
+'[d4578]',    # 0xd8
+'[d14578]',    # 0xd9
+'[d24578]',    # 0xda
+'[d124578]',    # 0xdb
+'[d34578]',    # 0xdc
+'[d134578]',    # 0xdd
+'[d234578]',    # 0xde
+'[d1234578]',    # 0xdf
+'[d678]',    # 0xe0
+'[d1678]',    # 0xe1
+'[d2678]',    # 0xe2
+'[d12678]',    # 0xe3
+'[d3678]',    # 0xe4
+'[d13678]',    # 0xe5
+'[d23678]',    # 0xe6
+'[d123678]',    # 0xe7
+'[d4678]',    # 0xe8
+'[d14678]',    # 0xe9
+'[d24678]',    # 0xea
+'[d124678]',    # 0xeb
+'[d34678]',    # 0xec
+'[d134678]',    # 0xed
+'[d234678]',    # 0xee
+'[d1234678]',    # 0xef
+'[d5678]',    # 0xf0
+'[d15678]',    # 0xf1
+'[d25678]',    # 0xf2
+'[d125678]',    # 0xf3
+'[d35678]',    # 0xf4
+'[d135678]',    # 0xf5
+'[d235678]',    # 0xf6
+'[d1235678]',    # 0xf7
+'[d45678]',    # 0xf8
+'[d145678]',    # 0xf9
+'[d245678]',    # 0xfa
+'[d1245678]',    # 0xfb
+'[d345678]',    # 0xfc
+'[d1345678]',    # 0xfd
+'[d2345678]',    # 0xfe
+'[d12345678]',    # 0xff
+)
diff --git a/lib/unidecode/x029.py b/lib/unidecode/x029.py
new file mode 100644
index 00000000..c2df2548
--- /dev/null
+++ b/lib/unidecode/x029.py
@@ -0,0 +1,257 @@
+data = (
+'',    # 0x00
+'',    # 0x01
+'',    # 0x02
+'',    # 0x03
+'',    # 0x04
+'',    # 0x05
+'',    # 0x06
+'',    # 0x07
+'',    # 0x08
+'',    # 0x09
+'',    # 0x0a
+'',    # 0x0b
+'',    # 0x0c
+'',    # 0x0d
+'',    # 0x0e
+'',    # 0x0f
+'',    # 0x10
+'',    # 0x11
+'',    # 0x12
+'',    # 0x13
+'',    # 0x14
+'',    # 0x15
+'',    # 0x16
+'',    # 0x17
+'',    # 0x18
+'',    # 0x19
+'',    # 0x1a
+'',    # 0x1b
+'',    # 0x1c
+'',    # 0x1d
+'',    # 0x1e
+'',    # 0x1f
+'',    # 0x20
+'',    # 0x21
+'',    # 0x22
+'',    # 0x23
+'',    # 0x24
+'',    # 0x25
+'',    # 0x26
+'',    # 0x27
+'',    # 0x28
+'',    # 0x29
+'',    # 0x2a
+'',    # 0x2b
+'',    # 0x2c
+'',    # 0x2d
+'',    # 0x2e
+'',    # 0x2f
+'',    # 0x30
+'',    # 0x31
+'',    # 0x32
+'',    # 0x33
+'',    # 0x34
+'',    # 0x35
+'',    # 0x36
+'',    # 0x37
+'',    # 0x38
+'',    # 0x39
+'',    # 0x3a
+'',    # 0x3b
+'',    # 0x3c
+'',    # 0x3d
+'',    # 0x3e
+'',    # 0x3f
+'',    # 0x40
+'',    # 0x41
+'',    # 0x42
+'',    # 0x43
+'',    # 0x44
+'',    # 0x45
+'',    # 0x46
+'',    # 0x47
+'',    # 0x48
+'',    # 0x49
+'',    # 0x4a
+'',    # 0x4b
+'',    # 0x4c
+'',    # 0x4d
+'',    # 0x4e
+'',    # 0x4f
+'',    # 0x50
+'',    # 0x51
+'',    # 0x52
+'',    # 0x53
+'',    # 0x54
+'',    # 0x55
+'',    # 0x56
+'',    # 0x57
+'',    # 0x58
+'',    # 0x59
+'',    # 0x5a
+'',    # 0x5b
+'',    # 0x5c
+'',    # 0x5d
+'',    # 0x5e
+'',    # 0x5f
+'',    # 0x60
+'',    # 0x61
+'',    # 0x62
+'',    # 0x63
+'',    # 0x64
+'',    # 0x65
+'',    # 0x66
+'',    # 0x67
+'',    # 0x68
+'',    # 0x69
+'',    # 0x6a
+'',    # 0x6b
+'',    # 0x6c
+'',    # 0x6d
+'',    # 0x6e
+'',    # 0x6f
+'',    # 0x70
+'',    # 0x71
+'',    # 0x72
+'',    # 0x73
+'',    # 0x74
+'',    # 0x75
+'',    # 0x76
+'',    # 0x77
+'',    # 0x78
+'',    # 0x79
+'',    # 0x7a
+'',    # 0x7b
+'',    # 0x7c
+'',    # 0x7d
+'',    # 0x7e
+'',    # 0x7f
+'',    # 0x80
+'',    # 0x81
+'',    # 0x82
+'{',    # 0x83
+'} ',    # 0x84
+'',    # 0x85
+'',    # 0x86
+'',    # 0x87
+'',    # 0x88
+'',    # 0x89
+'',    # 0x8a
+'',    # 0x8b
+'',    # 0x8c
+'',    # 0x8d
+'',    # 0x8e
+'',    # 0x8f
+'',    # 0x90
+'',    # 0x91
+'',    # 0x92
+'',    # 0x93
+'',    # 0x94
+'',    # 0x95
+'',    # 0x96
+'',    # 0x97
+'',    # 0x98
+'',    # 0x99
+'',    # 0x9a
+'',    # 0x9b
+'',    # 0x9c
+'',    # 0x9d
+'',    # 0x9e
+'',    # 0x9f
+'',    # 0xa0
+'',    # 0xa1
+'',    # 0xa2
+'',    # 0xa3
+'',    # 0xa4
+'',    # 0xa5
+'',    # 0xa6
+'',    # 0xa7
+'',    # 0xa8
+'',    # 0xa9
+'',    # 0xaa
+'',    # 0xab
+'',    # 0xac
+'',    # 0xad
+'',    # 0xae
+'',    # 0xaf
+'',    # 0xb0
+'',    # 0xb1
+'',    # 0xb2
+'',    # 0xb3
+'',    # 0xb4
+'',    # 0xb5
+'',    # 0xb6
+'',    # 0xb7
+'',    # 0xb8
+'',    # 0xb9
+'',    # 0xba
+'',    # 0xbb
+'',    # 0xbc
+'',    # 0xbd
+'',    # 0xbe
+'',    # 0xbf
+'',    # 0xc0
+'',    # 0xc1
+'',    # 0xc2
+'',    # 0xc3
+'',    # 0xc4
+'',    # 0xc5
+'',    # 0xc6
+'',    # 0xc7
+'',    # 0xc8
+'',    # 0xc9
+'',    # 0xca
+'',    # 0xcb
+'',    # 0xcc
+'',    # 0xcd
+'',    # 0xce
+'',    # 0xcf
+'',    # 0xd0
+'',    # 0xd1
+'',    # 0xd2
+'',    # 0xd3
+'',    # 0xd4
+'',    # 0xd5
+'',    # 0xd6
+'',    # 0xd7
+'',    # 0xd8
+'',    # 0xd9
+'',    # 0xda
+'',    # 0xdb
+'',    # 0xdc
+'',    # 0xdd
+'',    # 0xde
+'',    # 0xdf
+'',    # 0xe0
+'',    # 0xe1
+'',    # 0xe2
+'',    # 0xe3
+'',    # 0xe4
+'',    # 0xe5
+'',    # 0xe6
+'',    # 0xe7
+'',    # 0xe8
+'',    # 0xe9
+'',    # 0xea
+'',    # 0xeb
+'',    # 0xec
+'',    # 0xed
+'',    # 0xee
+'',    # 0xef
+'',    # 0xf0
+'',    # 0xf1
+'',    # 0xf2
+'',    # 0xf3
+'',    # 0xf4
+'',    # 0xf5
+'',    # 0xf6
+'',    # 0xf7
+'',    # 0xf8
+'',    # 0xf9
+'',    # 0xfa
+'',    # 0xfb
+'',    # 0xfc
+'',    # 0xfd
+'',    # 0xfe
+)
diff --git a/lib/unidecode/x02a.py b/lib/unidecode/x02a.py
new file mode 100644
index 00000000..b832ef35
--- /dev/null
+++ b/lib/unidecode/x02a.py
@@ -0,0 +1,257 @@
+data = (
+'',    # 0x00
+'',    # 0x01
+'',    # 0x02
+'',    # 0x03
+'',    # 0x04
+'',    # 0x05
+'',    # 0x06
+'',    # 0x07
+'',    # 0x08
+'',    # 0x09
+'',    # 0x0a
+'',    # 0x0b
+'',    # 0x0c
+'',    # 0x0d
+'',    # 0x0e
+'',    # 0x0f
+'',    # 0x10
+'',    # 0x11
+'',    # 0x12
+'',    # 0x13
+'',    # 0x14
+'',    # 0x15
+'',    # 0x16
+'',    # 0x17
+'',    # 0x18
+'',    # 0x19
+'',    # 0x1a
+'',    # 0x1b
+'',    # 0x1c
+'',    # 0x1d
+'',    # 0x1e
+'',    # 0x1f
+'',    # 0x20
+'',    # 0x21
+'',    # 0x22
+'',    # 0x23
+'',    # 0x24
+'',    # 0x25
+'',    # 0x26
+'',    # 0x27
+'',    # 0x28
+'',    # 0x29
+'',    # 0x2a
+'',    # 0x2b
+'',    # 0x2c
+'',    # 0x2d
+'',    # 0x2e
+'',    # 0x2f
+'',    # 0x30
+'',    # 0x31
+'',    # 0x32
+'',    # 0x33
+'',    # 0x34
+'',    # 0x35
+'',    # 0x36
+'',    # 0x37
+'',    # 0x38
+'',    # 0x39
+'',    # 0x3a
+'',    # 0x3b
+'',    # 0x3c
+'',    # 0x3d
+'',    # 0x3e
+'',    # 0x3f
+'',    # 0x40
+'',    # 0x41
+'',    # 0x42
+'',    # 0x43
+'',    # 0x44
+'',    # 0x45
+'',    # 0x46
+'',    # 0x47
+'',    # 0x48
+'',    # 0x49
+'',    # 0x4a
+'',    # 0x4b
+'',    # 0x4c
+'',    # 0x4d
+'',    # 0x4e
+'',    # 0x4f
+'',    # 0x50
+'',    # 0x51
+'',    # 0x52
+'',    # 0x53
+'',    # 0x54
+'',    # 0x55
+'',    # 0x56
+'',    # 0x57
+'',    # 0x58
+'',    # 0x59
+'',    # 0x5a
+'',    # 0x5b
+'',    # 0x5c
+'',    # 0x5d
+'',    # 0x5e
+'',    # 0x5f
+'',    # 0x60
+'',    # 0x61
+'',    # 0x62
+'',    # 0x63
+'',    # 0x64
+'',    # 0x65
+'',    # 0x66
+'',    # 0x67
+'',    # 0x68
+'',    # 0x69
+'',    # 0x6a
+'',    # 0x6b
+'',    # 0x6c
+'',    # 0x6d
+'',    # 0x6e
+'',    # 0x6f
+'',    # 0x70
+'',    # 0x71
+'',    # 0x72
+'',    # 0x73
+'::=',    # 0x74
+'==',    # 0x75
+'===',    # 0x76
+'',    # 0x77
+'',    # 0x78
+'',    # 0x79
+'',    # 0x7a
+'',    # 0x7b
+'',    # 0x7c
+'',    # 0x7d
+'',    # 0x7e
+'',    # 0x7f
+'',    # 0x80
+'',    # 0x81
+'',    # 0x82
+'',    # 0x83
+'',    # 0x84
+'',    # 0x85
+'',    # 0x86
+'',    # 0x87
+'',    # 0x88
+'',    # 0x89
+'',    # 0x8a
+'',    # 0x8b
+'',    # 0x8c
+'',    # 0x8d
+'',    # 0x8e
+'',    # 0x8f
+'',    # 0x90
+'',    # 0x91
+'',    # 0x92
+'',    # 0x93
+'',    # 0x94
+'',    # 0x95
+'',    # 0x96
+'',    # 0x97
+'',    # 0x98
+'',    # 0x99
+'',    # 0x9a
+'',    # 0x9b
+'',    # 0x9c
+'',    # 0x9d
+'',    # 0x9e
+'',    # 0x9f
+'',    # 0xa0
+'',    # 0xa1
+'',    # 0xa2
+'',    # 0xa3
+'',    # 0xa4
+'',    # 0xa5
+'',    # 0xa6
+'',    # 0xa7
+'',    # 0xa8
+'',    # 0xa9
+'',    # 0xaa
+'',    # 0xab
+'',    # 0xac
+'',    # 0xad
+'',    # 0xae
+'',    # 0xaf
+'',    # 0xb0
+'',    # 0xb1
+'',    # 0xb2
+'',    # 0xb3
+'',    # 0xb4
+'',    # 0xb5
+'',    # 0xb6
+'',    # 0xb7
+'',    # 0xb8
+'',    # 0xb9
+'',    # 0xba
+'',    # 0xbb
+'',    # 0xbc
+'',    # 0xbd
+'',    # 0xbe
+'',    # 0xbf
+'',    # 0xc0
+'',    # 0xc1
+'',    # 0xc2
+'',    # 0xc3
+'',    # 0xc4
+'',    # 0xc5
+'',    # 0xc6
+'',    # 0xc7
+'',    # 0xc8
+'',    # 0xc9
+'',    # 0xca
+'',    # 0xcb
+'',    # 0xcc
+'',    # 0xcd
+'',    # 0xce
+'',    # 0xcf
+'',    # 0xd0
+'',    # 0xd1
+'',    # 0xd2
+'',    # 0xd3
+'',    # 0xd4
+'',    # 0xd5
+'',    # 0xd6
+'',    # 0xd7
+'',    # 0xd8
+'',    # 0xd9
+'',    # 0xda
+'',    # 0xdb
+'',    # 0xdc
+'',    # 0xdd
+'',    # 0xde
+'',    # 0xdf
+'',    # 0xe0
+'',    # 0xe1
+'',    # 0xe2
+'',    # 0xe3
+'',    # 0xe4
+'',    # 0xe5
+'',    # 0xe6
+'',    # 0xe7
+'',    # 0xe8
+'',    # 0xe9
+'',    # 0xea
+'',    # 0xeb
+'',    # 0xec
+'',    # 0xed
+'',    # 0xee
+'',    # 0xef
+'',    # 0xf0
+'',    # 0xf1
+'',    # 0xf2
+'',    # 0xf3
+'',    # 0xf4
+'',    # 0xf5
+'',    # 0xf6
+'',    # 0xf7
+'',    # 0xf8
+'',    # 0xf9
+'',    # 0xfa
+'',    # 0xfb
+'',    # 0xfc
+'',    # 0xfd
+'',    # 0xfe
+)
diff --git a/lib/unidecode/x02c.py b/lib/unidecode/x02c.py
new file mode 100644
index 00000000..0d05d069
--- /dev/null
+++ b/lib/unidecode/x02c.py
@@ -0,0 +1,257 @@
+data = (
+'',    # 0x00
+'',    # 0x01
+'',    # 0x02
+'',    # 0x03
+'',    # 0x04
+'',    # 0x05
+'',    # 0x06
+'',    # 0x07
+'',    # 0x08
+'',    # 0x09
+'',    # 0x0a
+'',    # 0x0b
+'',    # 0x0c
+'',    # 0x0d
+'',    # 0x0e
+'',    # 0x0f
+'',    # 0x10
+'',    # 0x11
+'',    # 0x12
+'',    # 0x13
+'',    # 0x14
+'',    # 0x15
+'',    # 0x16
+'',    # 0x17
+'',    # 0x18
+'',    # 0x19
+'',    # 0x1a
+'',    # 0x1b
+'',    # 0x1c
+'',    # 0x1d
+'',    # 0x1e
+'',    # 0x1f
+'',    # 0x20
+'',    # 0x21
+'',    # 0x22
+'',    # 0x23
+'',    # 0x24
+'',    # 0x25
+'',    # 0x26
+'',    # 0x27
+'',    # 0x28
+'',    # 0x29
+'',    # 0x2a
+'',    # 0x2b
+'',    # 0x2c
+'',    # 0x2d
+'',    # 0x2e
+'',    # 0x2f
+'',    # 0x30
+'',    # 0x31
+'',    # 0x32
+'',    # 0x33
+'',    # 0x34
+'',    # 0x35
+'',    # 0x36
+'',    # 0x37
+'',    # 0x38
+'',    # 0x39
+'',    # 0x3a
+'',    # 0x3b
+'',    # 0x3c
+'',    # 0x3d
+'',    # 0x3e
+'',    # 0x3f
+'',    # 0x40
+'',    # 0x41
+'',    # 0x42
+'',    # 0x43
+'',    # 0x44
+'',    # 0x45
+'',    # 0x46
+'',    # 0x47
+'',    # 0x48
+'',    # 0x49
+'',    # 0x4a
+'',    # 0x4b
+'',    # 0x4c
+'',    # 0x4d
+'',    # 0x4e
+'',    # 0x4f
+'',    # 0x50
+'',    # 0x51
+'',    # 0x52
+'',    # 0x53
+'',    # 0x54
+'',    # 0x55
+'',    # 0x56
+'',    # 0x57
+'',    # 0x58
+'',    # 0x59
+'',    # 0x5a
+'',    # 0x5b
+'',    # 0x5c
+'',    # 0x5d
+'',    # 0x5e
+'',    # 0x5f
+'L',    # 0x60
+'l',    # 0x61
+'L',    # 0x62
+'P',    # 0x63
+'R',    # 0x64
+'a',    # 0x65
+'t',    # 0x66
+'H',    # 0x67
+'h',    # 0x68
+'K',    # 0x69
+'k',    # 0x6a
+'Z',    # 0x6b
+'z',    # 0x6c
+'',    # 0x6d
+'M',    # 0x6e
+'A',    # 0x6f
+'',    # 0x70
+'',    # 0x71
+'',    # 0x72
+'',    # 0x73
+'',    # 0x74
+'',    # 0x75
+'',    # 0x76
+'',    # 0x77
+'',    # 0x78
+'',    # 0x79
+'',    # 0x7a
+'',    # 0x7b
+'',    # 0x7c
+'',    # 0x7d
+'',    # 0x7e
+'',    # 0x7f
+'',    # 0x80
+'',    # 0x81
+'',    # 0x82
+'',    # 0x83
+'',    # 0x84
+'',    # 0x85
+'',    # 0x86
+'',    # 0x87
+'',    # 0x88
+'',    # 0x89
+'',    # 0x8a
+'',    # 0x8b
+'',    # 0x8c
+'',    # 0x8d
+'',    # 0x8e
+'',    # 0x8f
+'',    # 0x90
+'',    # 0x91
+'',    # 0x92
+'',    # 0x93
+'',    # 0x94
+'',    # 0x95
+'',    # 0x96
+'',    # 0x97
+'',    # 0x98
+'',    # 0x99
+'',    # 0x9a
+'',    # 0x9b
+'',    # 0x9c
+'',    # 0x9d
+'',    # 0x9e
+'',    # 0x9f
+'',    # 0xa0
+'',    # 0xa1
+'',    # 0xa2
+'',    # 0xa3
+'',    # 0xa4
+'',    # 0xa5
+'',    # 0xa6
+'',    # 0xa7
+'',    # 0xa8
+'',    # 0xa9
+'',    # 0xaa
+'',    # 0xab
+'',    # 0xac
+'',    # 0xad
+'',    # 0xae
+'',    # 0xaf
+'',    # 0xb0
+'',    # 0xb1
+'',    # 0xb2
+'',    # 0xb3
+'',    # 0xb4
+'',    # 0xb5
+'',    # 0xb6
+'',    # 0xb7
+'',    # 0xb8
+'',    # 0xb9
+'',    # 0xba
+'',    # 0xbb
+'',    # 0xbc
+'',    # 0xbd
+'',    # 0xbe
+'',    # 0xbf
+'',    # 0xc0
+'',    # 0xc1
+'',    # 0xc2
+'',    # 0xc3
+'',    # 0xc4
+'',    # 0xc5
+'',    # 0xc6
+'',    # 0xc7
+'',    # 0xc8
+'',    # 0xc9
+'',    # 0xca
+'',    # 0xcb
+'',    # 0xcc
+'',    # 0xcd
+'',    # 0xce
+'',    # 0xcf
+'',    # 0xd0
+'',    # 0xd1
+'',    # 0xd2
+'',    # 0xd3
+'',    # 0xd4
+'',    # 0xd5
+'',    # 0xd6
+'',    # 0xd7
+'',    # 0xd8
+'',    # 0xd9
+'',    # 0xda
+'',    # 0xdb
+'',    # 0xdc
+'',    # 0xdd
+'',    # 0xde
+'',    # 0xdf
+'',    # 0xe0
+'',    # 0xe1
+'',    # 0xe2
+'',    # 0xe3
+'',    # 0xe4
+'',    # 0xe5
+'',    # 0xe6
+'',    # 0xe7
+'',    # 0xe8
+'',    # 0xe9
+'',    # 0xea
+'',    # 0xeb
+'',    # 0xec
+'',    # 0xed
+'',    # 0xee
+'',    # 0xef
+'',    # 0xf0
+'',    # 0xf1
+'',    # 0xf2
+'',    # 0xf3
+'',    # 0xf4
+'',    # 0xf5
+'',    # 0xf6
+'',    # 0xf7
+'',    # 0xf8
+'',    # 0xf9
+'',    # 0xfa
+'',    # 0xfb
+'',    # 0xfc
+'',    # 0xfd
+'',    # 0xfe
+)
diff --git a/lib/unidecode/x02e.py b/lib/unidecode/x02e.py
new file mode 100644
index 00000000..feaad8d3
--- /dev/null
+++ b/lib/unidecode/x02e.py
@@ -0,0 +1,257 @@
+data = (
+'[?]',    # 0x00
+'[?]',    # 0x01
+'[?]',    # 0x02
+'[?]',    # 0x03
+'[?]',    # 0x04
+'[?]',    # 0x05
+'[?]',    # 0x06
+'[?]',    # 0x07
+'[?]',    # 0x08
+'[?]',    # 0x09
+'[?]',    # 0x0a
+'[?]',    # 0x0b
+'[?]',    # 0x0c
+'[?]',    # 0x0d
+'[?]',    # 0x0e
+'[?]',    # 0x0f
+'[?]',    # 0x10
+'[?]',    # 0x11
+'[?]',    # 0x12
+'[?]',    # 0x13
+'[?]',    # 0x14
+'[?]',    # 0x15
+'[?]',    # 0x16
+'[?]',    # 0x17
+'[?]',    # 0x18
+'[?]',    # 0x19
+'[?]',    # 0x1a
+'[?]',    # 0x1b
+'[?]',    # 0x1c
+'[?]',    # 0x1d
+'[?]',    # 0x1e
+'[?]',    # 0x1f
+'[?]',    # 0x20
+'[?]',    # 0x21
+'[?]',    # 0x22
+'[?]',    # 0x23
+'[?]',    # 0x24
+'[?]',    # 0x25
+'[?]',    # 0x26
+'[?]',    # 0x27
+'[?]',    # 0x28
+'[?]',    # 0x29
+'[?]',    # 0x2a
+'[?]',    # 0x2b
+'[?]',    # 0x2c
+'[?]',    # 0x2d
+'[?]',    # 0x2e
+'[?]',    # 0x2f
+'[?]',    # 0x30
+'[?]',    # 0x31
+'[?]',    # 0x32
+'[?]',    # 0x33
+'[?]',    # 0x34
+'[?]',    # 0x35
+'[?]',    # 0x36
+'[?]',    # 0x37
+'[?]',    # 0x38
+'[?]',    # 0x39
+'[?]',    # 0x3a
+'[?]',    # 0x3b
+'[?]',    # 0x3c
+'[?]',    # 0x3d
+'[?]',    # 0x3e
+'[?]',    # 0x3f
+'[?]',    # 0x40
+'[?]',    # 0x41
+'[?]',    # 0x42
+'[?]',    # 0x43
+'[?]',    # 0x44
+'[?]',    # 0x45
+'[?]',    # 0x46
+'[?]',    # 0x47
+'[?]',    # 0x48
+'[?]',    # 0x49
+'[?]',    # 0x4a
+'[?]',    # 0x4b
+'[?]',    # 0x4c
+'[?]',    # 0x4d
+'[?]',    # 0x4e
+'[?]',    # 0x4f
+'[?]',    # 0x50
+'[?]',    # 0x51
+'[?]',    # 0x52
+'[?]',    # 0x53
+'[?]',    # 0x54
+'[?]',    # 0x55
+'[?]',    # 0x56
+'[?]',    # 0x57
+'[?]',    # 0x58
+'[?]',    # 0x59
+'[?]',    # 0x5a
+'[?]',    # 0x5b
+'[?]',    # 0x5c
+'[?]',    # 0x5d
+'[?]',    # 0x5e
+'[?]',    # 0x5f
+'[?]',    # 0x60
+'[?]',    # 0x61
+'[?]',    # 0x62
+'[?]',    # 0x63
+'[?]',    # 0x64
+'[?]',    # 0x65
+'[?]',    # 0x66
+'[?]',    # 0x67
+'[?]',    # 0x68
+'[?]',    # 0x69
+'[?]',    # 0x6a
+'[?]',    # 0x6b
+'[?]',    # 0x6c
+'[?]',    # 0x6d
+'[?]',    # 0x6e
+'[?]',    # 0x6f
+'[?]',    # 0x70
+'[?]',    # 0x71
+'[?]',    # 0x72
+'[?]',    # 0x73
+'[?]',    # 0x74
+'[?]',    # 0x75
+'[?]',    # 0x76
+'[?]',    # 0x77
+'[?]',    # 0x78
+'[?]',    # 0x79
+'[?]',    # 0x7a
+'[?]',    # 0x7b
+'[?]',    # 0x7c
+'[?]',    # 0x7d
+'[?]',    # 0x7e
+'[?]',    # 0x7f
+'[?] ',    # 0x80
+'[?] ',    # 0x81
+'[?] ',    # 0x82
+'[?] ',    # 0x83
+'[?] ',    # 0x84
+'[?] ',    # 0x85
+'[?] ',    # 0x86
+'[?] ',    # 0x87
+'[?] ',    # 0x88
+'[?] ',    # 0x89
+'[?] ',    # 0x8a
+'[?] ',    # 0x8b
+'[?] ',    # 0x8c
+'[?] ',    # 0x8d
+'[?] ',    # 0x8e
+'[?] ',    # 0x8f
+'[?] ',    # 0x90
+'[?] ',    # 0x91
+'[?] ',    # 0x92
+'[?] ',    # 0x93
+'[?] ',    # 0x94
+'[?] ',    # 0x95
+'[?] ',    # 0x96
+'[?] ',    # 0x97
+'[?] ',    # 0x98
+'[?] ',    # 0x99
+'[?]',    # 0x9a
+'[?] ',    # 0x9b
+'[?] ',    # 0x9c
+'[?] ',    # 0x9d
+'[?] ',    # 0x9e
+'[?] ',    # 0x9f
+'[?] ',    # 0xa0
+'[?] ',    # 0xa1
+'[?] ',    # 0xa2
+'[?] ',    # 0xa3
+'[?] ',    # 0xa4
+'[?] ',    # 0xa5
+'[?] ',    # 0xa6
+'[?] ',    # 0xa7
+'[?] ',    # 0xa8
+'[?] ',    # 0xa9
+'[?] ',    # 0xaa
+'[?] ',    # 0xab
+'[?] ',    # 0xac
+'[?] ',    # 0xad
+'[?] ',    # 0xae
+'[?] ',    # 0xaf
+'[?] ',    # 0xb0
+'[?] ',    # 0xb1
+'[?] ',    # 0xb2
+'[?] ',    # 0xb3
+'[?] ',    # 0xb4
+'[?] ',    # 0xb5
+'[?] ',    # 0xb6
+'[?] ',    # 0xb7
+'[?] ',    # 0xb8
+'[?] ',    # 0xb9
+'[?] ',    # 0xba
+'[?] ',    # 0xbb
+'[?] ',    # 0xbc
+'[?] ',    # 0xbd
+'[?] ',    # 0xbe
+'[?] ',    # 0xbf
+'[?] ',    # 0xc0
+'[?] ',    # 0xc1
+'[?] ',    # 0xc2
+'[?] ',    # 0xc3
+'[?] ',    # 0xc4
+'[?] ',    # 0xc5
+'[?] ',    # 0xc6
+'[?] ',    # 0xc7
+'[?] ',    # 0xc8
+'[?] ',    # 0xc9
+'[?] ',    # 0xca
+'[?] ',    # 0xcb
+'[?] ',    # 0xcc
+'[?] ',    # 0xcd
+'[?] ',    # 0xce
+'[?] ',    # 0xcf
+'[?] ',    # 0xd0
+'[?] ',    # 0xd1
+'[?] ',    # 0xd2
+'[?] ',    # 0xd3
+'[?] ',    # 0xd4
+'[?] ',    # 0xd5
+'[?] ',    # 0xd6
+'[?] ',    # 0xd7
+'[?] ',    # 0xd8
+'[?] ',    # 0xd9
+'[?] ',    # 0xda
+'[?] ',    # 0xdb
+'[?] ',    # 0xdc
+'[?] ',    # 0xdd
+'[?] ',    # 0xde
+'[?] ',    # 0xdf
+'[?] ',    # 0xe0
+'[?] ',    # 0xe1
+'[?] ',    # 0xe2
+'[?] ',    # 0xe3
+'[?] ',    # 0xe4
+'[?] ',    # 0xe5
+'[?] ',    # 0xe6
+'[?] ',    # 0xe7
+'[?] ',    # 0xe8
+'[?] ',    # 0xe9
+'[?] ',    # 0xea
+'[?] ',    # 0xeb
+'[?] ',    # 0xec
+'[?] ',    # 0xed
+'[?] ',    # 0xee
+'[?] ',    # 0xef
+'[?] ',    # 0xf0
+'[?] ',    # 0xf1
+'[?] ',    # 0xf2
+'[?] ',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x02f.py b/lib/unidecode/x02f.py
new file mode 100644
index 00000000..01f8b15b
--- /dev/null
+++ b/lib/unidecode/x02f.py
@@ -0,0 +1,257 @@
+data = (
+'[?] ',    # 0x00
+'[?] ',    # 0x01
+'[?] ',    # 0x02
+'[?] ',    # 0x03
+'[?] ',    # 0x04
+'[?] ',    # 0x05
+'[?] ',    # 0x06
+'[?] ',    # 0x07
+'[?] ',    # 0x08
+'[?] ',    # 0x09
+'[?] ',    # 0x0a
+'[?] ',    # 0x0b
+'[?] ',    # 0x0c
+'[?] ',    # 0x0d
+'[?] ',    # 0x0e
+'[?] ',    # 0x0f
+'[?] ',    # 0x10
+'[?] ',    # 0x11
+'[?] ',    # 0x12
+'[?] ',    # 0x13
+'[?] ',    # 0x14
+'[?] ',    # 0x15
+'[?] ',    # 0x16
+'[?] ',    # 0x17
+'[?] ',    # 0x18
+'[?] ',    # 0x19
+'[?] ',    # 0x1a
+'[?] ',    # 0x1b
+'[?] ',    # 0x1c
+'[?] ',    # 0x1d
+'[?] ',    # 0x1e
+'[?] ',    # 0x1f
+'[?] ',    # 0x20
+'[?] ',    # 0x21
+'[?] ',    # 0x22
+'[?] ',    # 0x23
+'[?] ',    # 0x24
+'[?] ',    # 0x25
+'[?] ',    # 0x26
+'[?] ',    # 0x27
+'[?] ',    # 0x28
+'[?] ',    # 0x29
+'[?] ',    # 0x2a
+'[?] ',    # 0x2b
+'[?] ',    # 0x2c
+'[?] ',    # 0x2d
+'[?] ',    # 0x2e
+'[?] ',    # 0x2f
+'[?] ',    # 0x30
+'[?] ',    # 0x31
+'[?] ',    # 0x32
+'[?] ',    # 0x33
+'[?] ',    # 0x34
+'[?] ',    # 0x35
+'[?] ',    # 0x36
+'[?] ',    # 0x37
+'[?] ',    # 0x38
+'[?] ',    # 0x39
+'[?] ',    # 0x3a
+'[?] ',    # 0x3b
+'[?] ',    # 0x3c
+'[?] ',    # 0x3d
+'[?] ',    # 0x3e
+'[?] ',    # 0x3f
+'[?] ',    # 0x40
+'[?] ',    # 0x41
+'[?] ',    # 0x42
+'[?] ',    # 0x43
+'[?] ',    # 0x44
+'[?] ',    # 0x45
+'[?] ',    # 0x46
+'[?] ',    # 0x47
+'[?] ',    # 0x48
+'[?] ',    # 0x49
+'[?] ',    # 0x4a
+'[?] ',    # 0x4b
+'[?] ',    # 0x4c
+'[?] ',    # 0x4d
+'[?] ',    # 0x4e
+'[?] ',    # 0x4f
+'[?] ',    # 0x50
+'[?] ',    # 0x51
+'[?] ',    # 0x52
+'[?] ',    # 0x53
+'[?] ',    # 0x54
+'[?] ',    # 0x55
+'[?] ',    # 0x56
+'[?] ',    # 0x57
+'[?] ',    # 0x58
+'[?] ',    # 0x59
+'[?] ',    # 0x5a
+'[?] ',    # 0x5b
+'[?] ',    # 0x5c
+'[?] ',    # 0x5d
+'[?] ',    # 0x5e
+'[?] ',    # 0x5f
+'[?] ',    # 0x60
+'[?] ',    # 0x61
+'[?] ',    # 0x62
+'[?] ',    # 0x63
+'[?] ',    # 0x64
+'[?] ',    # 0x65
+'[?] ',    # 0x66
+'[?] ',    # 0x67
+'[?] ',    # 0x68
+'[?] ',    # 0x69
+'[?] ',    # 0x6a
+'[?] ',    # 0x6b
+'[?] ',    # 0x6c
+'[?] ',    # 0x6d
+'[?] ',    # 0x6e
+'[?] ',    # 0x6f
+'[?] ',    # 0x70
+'[?] ',    # 0x71
+'[?] ',    # 0x72
+'[?] ',    # 0x73
+'[?] ',    # 0x74
+'[?] ',    # 0x75
+'[?] ',    # 0x76
+'[?] ',    # 0x77
+'[?] ',    # 0x78
+'[?] ',    # 0x79
+'[?] ',    # 0x7a
+'[?] ',    # 0x7b
+'[?] ',    # 0x7c
+'[?] ',    # 0x7d
+'[?] ',    # 0x7e
+'[?] ',    # 0x7f
+'[?] ',    # 0x80
+'[?] ',    # 0x81
+'[?] ',    # 0x82
+'[?] ',    # 0x83
+'[?] ',    # 0x84
+'[?] ',    # 0x85
+'[?] ',    # 0x86
+'[?] ',    # 0x87
+'[?] ',    # 0x88
+'[?] ',    # 0x89
+'[?] ',    # 0x8a
+'[?] ',    # 0x8b
+'[?] ',    # 0x8c
+'[?] ',    # 0x8d
+'[?] ',    # 0x8e
+'[?] ',    # 0x8f
+'[?] ',    # 0x90
+'[?] ',    # 0x91
+'[?] ',    # 0x92
+'[?] ',    # 0x93
+'[?] ',    # 0x94
+'[?] ',    # 0x95
+'[?] ',    # 0x96
+'[?] ',    # 0x97
+'[?] ',    # 0x98
+'[?] ',    # 0x99
+'[?] ',    # 0x9a
+'[?] ',    # 0x9b
+'[?] ',    # 0x9c
+'[?] ',    # 0x9d
+'[?] ',    # 0x9e
+'[?] ',    # 0x9f
+'[?] ',    # 0xa0
+'[?] ',    # 0xa1
+'[?] ',    # 0xa2
+'[?] ',    # 0xa3
+'[?] ',    # 0xa4
+'[?] ',    # 0xa5
+'[?] ',    # 0xa6
+'[?] ',    # 0xa7
+'[?] ',    # 0xa8
+'[?] ',    # 0xa9
+'[?] ',    # 0xaa
+'[?] ',    # 0xab
+'[?] ',    # 0xac
+'[?] ',    # 0xad
+'[?] ',    # 0xae
+'[?] ',    # 0xaf
+'[?] ',    # 0xb0
+'[?] ',    # 0xb1
+'[?] ',    # 0xb2
+'[?] ',    # 0xb3
+'[?] ',    # 0xb4
+'[?] ',    # 0xb5
+'[?] ',    # 0xb6
+'[?] ',    # 0xb7
+'[?] ',    # 0xb8
+'[?] ',    # 0xb9
+'[?] ',    # 0xba
+'[?] ',    # 0xbb
+'[?] ',    # 0xbc
+'[?] ',    # 0xbd
+'[?] ',    # 0xbe
+'[?] ',    # 0xbf
+'[?] ',    # 0xc0
+'[?] ',    # 0xc1
+'[?] ',    # 0xc2
+'[?] ',    # 0xc3
+'[?] ',    # 0xc4
+'[?] ',    # 0xc5
+'[?] ',    # 0xc6
+'[?] ',    # 0xc7
+'[?] ',    # 0xc8
+'[?] ',    # 0xc9
+'[?] ',    # 0xca
+'[?] ',    # 0xcb
+'[?] ',    # 0xcc
+'[?] ',    # 0xcd
+'[?] ',    # 0xce
+'[?] ',    # 0xcf
+'[?] ',    # 0xd0
+'[?] ',    # 0xd1
+'[?] ',    # 0xd2
+'[?] ',    # 0xd3
+'[?] ',    # 0xd4
+'[?] ',    # 0xd5
+'[?]',    # 0xd6
+'[?]',    # 0xd7
+'[?]',    # 0xd8
+'[?]',    # 0xd9
+'[?]',    # 0xda
+'[?]',    # 0xdb
+'[?]',    # 0xdc
+'[?]',    # 0xdd
+'[?]',    # 0xde
+'[?]',    # 0xdf
+'[?]',    # 0xe0
+'[?]',    # 0xe1
+'[?]',    # 0xe2
+'[?]',    # 0xe3
+'[?]',    # 0xe4
+'[?]',    # 0xe5
+'[?]',    # 0xe6
+'[?]',    # 0xe7
+'[?]',    # 0xe8
+'[?]',    # 0xe9
+'[?]',    # 0xea
+'[?]',    # 0xeb
+'[?]',    # 0xec
+'[?]',    # 0xed
+'[?]',    # 0xee
+'[?]',    # 0xef
+'[?] ',    # 0xf0
+'[?] ',    # 0xf1
+'[?] ',    # 0xf2
+'[?] ',    # 0xf3
+'[?] ',    # 0xf4
+'[?] ',    # 0xf5
+'[?] ',    # 0xf6
+'[?] ',    # 0xf7
+'[?] ',    # 0xf8
+'[?] ',    # 0xf9
+'[?] ',    # 0xfa
+'[?] ',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x030.py b/lib/unidecode/x030.py
new file mode 100644
index 00000000..d65ed4c5
--- /dev/null
+++ b/lib/unidecode/x030.py
@@ -0,0 +1,257 @@
+data = (
+' ',    # 0x00
+', ',    # 0x01
+'. ',    # 0x02
+'"',    # 0x03
+'[JIS]',    # 0x04
+'"',    # 0x05
+'/',    # 0x06
+'0',    # 0x07
+'<',    # 0x08
+'> ',    # 0x09
+'<<',    # 0x0a
+'>> ',    # 0x0b
+'[',    # 0x0c
+'] ',    # 0x0d
+'{',    # 0x0e
+'} ',    # 0x0f
+'[(',    # 0x10
+')] ',    # 0x11
+'@',    # 0x12
+'X ',    # 0x13
+'[',    # 0x14
+'] ',    # 0x15
+'[[',    # 0x16
+']] ',    # 0x17
+'((',    # 0x18
+')) ',    # 0x19
+'[[',    # 0x1a
+']] ',    # 0x1b
+'~ ',    # 0x1c
+'``',    # 0x1d
+'\'\'',    # 0x1e
+',,',    # 0x1f
+'@',    # 0x20
+'1',    # 0x21
+'2',    # 0x22
+'3',    # 0x23
+'4',    # 0x24
+'5',    # 0x25
+'6',    # 0x26
+'7',    # 0x27
+'8',    # 0x28
+'9',    # 0x29
+'',    # 0x2a
+'',    # 0x2b
+'',    # 0x2c
+'',    # 0x2d
+'',    # 0x2e
+'',    # 0x2f
+'~',    # 0x30
+'+',    # 0x31
+'+',    # 0x32
+'+',    # 0x33
+'+',    # 0x34
+'',    # 0x35
+'@',    # 0x36
+' // ',    # 0x37
+'+10+',    # 0x38
+'+20+',    # 0x39
+'+30+',    # 0x3a
+'[?]',    # 0x3b
+'[?]',    # 0x3c
+'[?]',    # 0x3d
+'',    # 0x3e
+'',    # 0x3f
+'[?]',    # 0x40
+'a',    # 0x41
+'a',    # 0x42
+'i',    # 0x43
+'i',    # 0x44
+'u',    # 0x45
+'u',    # 0x46
+'e',    # 0x47
+'e',    # 0x48
+'o',    # 0x49
+'o',    # 0x4a
+'ka',    # 0x4b
+'ga',    # 0x4c
+'ki',    # 0x4d
+'gi',    # 0x4e
+'ku',    # 0x4f
+'gu',    # 0x50
+'ke',    # 0x51
+'ge',    # 0x52
+'ko',    # 0x53
+'go',    # 0x54
+'sa',    # 0x55
+'za',    # 0x56
+'shi',   # 0x57
+'zi',    # 0x58
+'su',    # 0x59
+'zu',    # 0x5a
+'se',    # 0x5b
+'ze',    # 0x5c
+'so',    # 0x5d
+'zo',    # 0x5e
+'ta',    # 0x5f
+'da',    # 0x60
+'chi',   # 0x61
+'di',    # 0x62
+'tsu',   # 0x63
+'tsu',   # 0x64
+'du',    # 0x65
+'te',    # 0x66
+'de',    # 0x67
+'to',    # 0x68
+'do',    # 0x69
+'na',    # 0x6a
+'ni',    # 0x6b
+'nu',    # 0x6c
+'ne',    # 0x6d
+'no',    # 0x6e
+'ha',    # 0x6f
+'ba',    # 0x70
+'pa',    # 0x71
+'hi',    # 0x72
+'bi',    # 0x73
+'pi',    # 0x74
+'hu',    # 0x75
+'bu',    # 0x76
+'pu',    # 0x77
+'he',    # 0x78
+'be',    # 0x79
+'pe',    # 0x7a
+'ho',    # 0x7b
+'bo',    # 0x7c
+'po',    # 0x7d
+'ma',    # 0x7e
+'mi',    # 0x7f
+'mu',    # 0x80
+'me',    # 0x81
+'mo',    # 0x82
+'ya',    # 0x83
+'ya',    # 0x84
+'yu',    # 0x85
+'yu',    # 0x86
+'yo',    # 0x87
+'yo',    # 0x88
+'ra',    # 0x89
+'ri',    # 0x8a
+'ru',    # 0x8b
+'re',    # 0x8c
+'ro',    # 0x8d
+'wa',    # 0x8e
+'wa',    # 0x8f
+'wi',    # 0x90
+'we',    # 0x91
+'wo',    # 0x92
+'n',    # 0x93
+'vu',    # 0x94
+'[?]',    # 0x95
+'[?]',    # 0x96
+'[?]',    # 0x97
+'[?]',    # 0x98
+'',    # 0x99
+'',    # 0x9a
+'',    # 0x9b
+'',    # 0x9c
+'"',    # 0x9d
+'"',    # 0x9e
+'[?]',    # 0x9f
+'[?]',    # 0xa0
+'a',    # 0xa1
+'a',    # 0xa2
+'i',    # 0xa3
+'i',    # 0xa4
+'u',    # 0xa5
+'u',    # 0xa6
+'e',    # 0xa7
+'e',    # 0xa8
+'o',    # 0xa9
+'o',    # 0xaa
+'ka',    # 0xab
+'ga',    # 0xac
+'ki',    # 0xad
+'gi',    # 0xae
+'ku',    # 0xaf
+'gu',    # 0xb0
+'ke',    # 0xb1
+'ge',    # 0xb2
+'ko',    # 0xb3
+'go',    # 0xb4
+'sa',    # 0xb5
+'za',    # 0xb6
+'shi',   # 0xb7
+'zi',    # 0xb8
+'su',    # 0xb9
+'zu',    # 0xba
+'se',    # 0xbb
+'ze',    # 0xbc
+'so',    # 0xbd
+'zo',    # 0xbe
+'ta',    # 0xbf
+'da',    # 0xc0
+'chi',   # 0xc1
+'di',    # 0xc2
+'tsu',   # 0xc3
+'tsu',   # 0xc4
+'du',    # 0xc5
+'te',    # 0xc6
+'de',    # 0xc7
+'to',    # 0xc8
+'do',    # 0xc9
+'na',    # 0xca
+'ni',    # 0xcb
+'nu',    # 0xcc
+'ne',    # 0xcd
+'no',    # 0xce
+'ha',    # 0xcf
+'ba',    # 0xd0
+'pa',    # 0xd1
+'hi',    # 0xd2
+'bi',    # 0xd3
+'pi',    # 0xd4
+'hu',    # 0xd5
+'bu',    # 0xd6
+'pu',    # 0xd7
+'he',    # 0xd8
+'be',    # 0xd9
+'pe',    # 0xda
+'ho',    # 0xdb
+'bo',    # 0xdc
+'po',    # 0xdd
+'ma',    # 0xde
+'mi',    # 0xdf
+'mu',    # 0xe0
+'me',    # 0xe1
+'mo',    # 0xe2
+'ya',    # 0xe3
+'ya',    # 0xe4
+'yu',    # 0xe5
+'yu',    # 0xe6
+'yo',    # 0xe7
+'yo',    # 0xe8
+'ra',    # 0xe9
+'ri',    # 0xea
+'ru',    # 0xeb
+'re',    # 0xec
+'ro',    # 0xed
+'wa',    # 0xee
+'wa',    # 0xef
+'wi',    # 0xf0
+'we',    # 0xf1
+'wo',    # 0xf2
+'n',    # 0xf3
+'vu',    # 0xf4
+'ka',    # 0xf5
+'ke',    # 0xf6
+'va',    # 0xf7
+'vi',    # 0xf8
+'ve',    # 0xf9
+'vo',    # 0xfa
+'',    # 0xfb
+'',    # 0xfc
+'"',    # 0xfd
+'"',    # 0xfe
+)
diff --git a/lib/unidecode/x031.py b/lib/unidecode/x031.py
new file mode 100644
index 00000000..f5576080
--- /dev/null
+++ b/lib/unidecode/x031.py
@@ -0,0 +1,257 @@
+data = (
+'[?]',    # 0x00
+'[?]',    # 0x01
+'[?]',    # 0x02
+'[?]',    # 0x03
+'[?]',    # 0x04
+'B',    # 0x05
+'P',    # 0x06
+'M',    # 0x07
+'F',    # 0x08
+'D',    # 0x09
+'T',    # 0x0a
+'N',    # 0x0b
+'L',    # 0x0c
+'G',    # 0x0d
+'K',    # 0x0e
+'H',    # 0x0f
+'J',    # 0x10
+'Q',    # 0x11
+'X',    # 0x12
+'ZH',    # 0x13
+'CH',    # 0x14
+'SH',    # 0x15
+'R',    # 0x16
+'Z',    # 0x17
+'C',    # 0x18
+'S',    # 0x19
+'A',    # 0x1a
+'O',    # 0x1b
+'E',    # 0x1c
+'EH',    # 0x1d
+'AI',    # 0x1e
+'EI',    # 0x1f
+'AU',    # 0x20
+'OU',    # 0x21
+'AN',    # 0x22
+'EN',    # 0x23
+'ANG',    # 0x24
+'ENG',    # 0x25
+'ER',    # 0x26
+'I',    # 0x27
+'U',    # 0x28
+'IU',    # 0x29
+'V',    # 0x2a
+'NG',    # 0x2b
+'GN',    # 0x2c
+'[?]',    # 0x2d
+'[?]',    # 0x2e
+'[?]',    # 0x2f
+'[?]',    # 0x30
+'g',    # 0x31
+'gg',    # 0x32
+'gs',    # 0x33
+'n',    # 0x34
+'nj',    # 0x35
+'nh',    # 0x36
+'d',    # 0x37
+'dd',    # 0x38
+'r',    # 0x39
+'lg',    # 0x3a
+'lm',    # 0x3b
+'lb',    # 0x3c
+'ls',    # 0x3d
+'lt',    # 0x3e
+'lp',    # 0x3f
+'rh',    # 0x40
+'m',    # 0x41
+'b',    # 0x42
+'bb',    # 0x43
+'bs',    # 0x44
+'s',    # 0x45
+'ss',    # 0x46
+'',    # 0x47
+'j',    # 0x48
+'jj',    # 0x49
+'c',    # 0x4a
+'k',    # 0x4b
+'t',    # 0x4c
+'p',    # 0x4d
+'h',    # 0x4e
+'a',    # 0x4f
+'ae',    # 0x50
+'ya',    # 0x51
+'yae',    # 0x52
+'eo',    # 0x53
+'e',    # 0x54
+'yeo',    # 0x55
+'ye',    # 0x56
+'o',    # 0x57
+'wa',    # 0x58
+'wae',    # 0x59
+'oe',    # 0x5a
+'yo',    # 0x5b
+'u',    # 0x5c
+'weo',    # 0x5d
+'we',    # 0x5e
+'wi',    # 0x5f
+'yu',    # 0x60
+'eu',    # 0x61
+'yi',    # 0x62
+'i',    # 0x63
+'',    # 0x64
+'nn',    # 0x65
+'nd',    # 0x66
+'ns',    # 0x67
+'nZ',    # 0x68
+'lgs',    # 0x69
+'ld',    # 0x6a
+'lbs',    # 0x6b
+'lZ',    # 0x6c
+'lQ',    # 0x6d
+'mb',    # 0x6e
+'ms',    # 0x6f
+'mZ',    # 0x70
+'mN',    # 0x71
+'bg',    # 0x72
+'',    # 0x73
+'bsg',    # 0x74
+'bst',    # 0x75
+'bj',    # 0x76
+'bt',    # 0x77
+'bN',    # 0x78
+'bbN',    # 0x79
+'sg',    # 0x7a
+'sn',    # 0x7b
+'sd',    # 0x7c
+'sb',    # 0x7d
+'sj',    # 0x7e
+'Z',    # 0x7f
+'',    # 0x80
+'N',    # 0x81
+'Ns',    # 0x82
+'NZ',    # 0x83
+'pN',    # 0x84
+'hh',    # 0x85
+'Q',    # 0x86
+'yo-ya',    # 0x87
+'yo-yae',    # 0x88
+'yo-i',    # 0x89
+'yu-yeo',    # 0x8a
+'yu-ye',    # 0x8b
+'yu-i',    # 0x8c
+'U',    # 0x8d
+'U-i',    # 0x8e
+'[?]',    # 0x8f
+'',    # 0x90
+'',    # 0x91
+'',    # 0x92
+'',    # 0x93
+'',    # 0x94
+'',    # 0x95
+'',    # 0x96
+'',    # 0x97
+'',    # 0x98
+'',    # 0x99
+'',    # 0x9a
+'',    # 0x9b
+'',    # 0x9c
+'',    # 0x9d
+'',    # 0x9e
+'',    # 0x9f
+'BU',    # 0xa0
+'ZI',    # 0xa1
+'JI',    # 0xa2
+'GU',    # 0xa3
+'EE',    # 0xa4
+'ENN',    # 0xa5
+'OO',    # 0xa6
+'ONN',    # 0xa7
+'IR',    # 0xa8
+'ANN',    # 0xa9
+'INN',    # 0xaa
+'UNN',    # 0xab
+'IM',    # 0xac
+'NGG',    # 0xad
+'AINN',    # 0xae
+'AUNN',    # 0xaf
+'AM',    # 0xb0
+'OM',    # 0xb1
+'ONG',    # 0xb2
+'INNN',    # 0xb3
+'P',    # 0xb4
+'T',    # 0xb5
+'K',    # 0xb6
+'H',    # 0xb7
+'[?]',    # 0xb8
+'[?]',    # 0xb9
+'[?]',    # 0xba
+'[?]',    # 0xbb
+'[?]',    # 0xbc
+'[?]',    # 0xbd
+'[?]',    # 0xbe
+'[?]',    # 0xbf
+'[?]',    # 0xc0
+'[?]',    # 0xc1
+'[?]',    # 0xc2
+'[?]',    # 0xc3
+'[?]',    # 0xc4
+'[?]',    # 0xc5
+'[?]',    # 0xc6
+'[?]',    # 0xc7
+'[?]',    # 0xc8
+'[?]',    # 0xc9
+'[?]',    # 0xca
+'[?]',    # 0xcb
+'[?]',    # 0xcc
+'[?]',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'[?]',    # 0xd0
+'[?]',    # 0xd1
+'[?]',    # 0xd2
+'[?]',    # 0xd3
+'[?]',    # 0xd4
+'[?]',    # 0xd5
+'[?]',    # 0xd6
+'[?]',    # 0xd7
+'[?]',    # 0xd8
+'[?]',    # 0xd9
+'[?]',    # 0xda
+'[?]',    # 0xdb
+'[?]',    # 0xdc
+'[?]',    # 0xdd
+'[?]',    # 0xde
+'[?]',    # 0xdf
+'[?]',    # 0xe0
+'[?]',    # 0xe1
+'[?]',    # 0xe2
+'[?]',    # 0xe3
+'[?]',    # 0xe4
+'[?]',    # 0xe5
+'[?]',    # 0xe6
+'[?]',    # 0xe7
+'[?]',    # 0xe8
+'[?]',    # 0xe9
+'[?]',    # 0xea
+'[?]',    # 0xeb
+'[?]',    # 0xec
+'[?]',    # 0xed
+'[?]',    # 0xee
+'[?]',    # 0xef
+'[?]',    # 0xf0
+'[?]',    # 0xf1
+'[?]',    # 0xf2
+'[?]',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x032.py b/lib/unidecode/x032.py
new file mode 100644
index 00000000..30282d4a
--- /dev/null
+++ b/lib/unidecode/x032.py
@@ -0,0 +1,257 @@
+data = (
+'(g)',    # 0x00
+'(n)',    # 0x01
+'(d)',    # 0x02
+'(r)',    # 0x03
+'(m)',    # 0x04
+'(b)',    # 0x05
+'(s)',    # 0x06
+'()',    # 0x07
+'(j)',    # 0x08
+'(c)',    # 0x09
+'(k)',    # 0x0a
+'(t)',    # 0x0b
+'(p)',    # 0x0c
+'(h)',    # 0x0d
+'(ga)',    # 0x0e
+'(na)',    # 0x0f
+'(da)',    # 0x10
+'(ra)',    # 0x11
+'(ma)',    # 0x12
+'(ba)',    # 0x13
+'(sa)',    # 0x14
+'(a)',    # 0x15
+'(ja)',    # 0x16
+'(ca)',    # 0x17
+'(ka)',    # 0x18
+'(ta)',    # 0x19
+'(pa)',    # 0x1a
+'(ha)',    # 0x1b
+'(ju)',    # 0x1c
+'[?]',    # 0x1d
+'[?]',    # 0x1e
+'[?]',    # 0x1f
+'(1) ',    # 0x20
+'(2) ',    # 0x21
+'(3) ',    # 0x22
+'(4) ',    # 0x23
+'(5) ',    # 0x24
+'(6) ',    # 0x25
+'(7) ',    # 0x26
+'(8) ',    # 0x27
+'(9) ',    # 0x28
+'(10) ',    # 0x29
+'(Yue) ',    # 0x2a
+'(Huo) ',    # 0x2b
+'(Shui) ',    # 0x2c
+'(Mu) ',    # 0x2d
+'(Jin) ',    # 0x2e
+'(Tu) ',    # 0x2f
+'(Ri) ',    # 0x30
+'(Zhu) ',    # 0x31
+'(You) ',    # 0x32
+'(She) ',    # 0x33
+'(Ming) ',    # 0x34
+'(Te) ',    # 0x35
+'(Cai) ',    # 0x36
+'(Zhu) ',    # 0x37
+'(Lao) ',    # 0x38
+'(Dai) ',    # 0x39
+'(Hu) ',    # 0x3a
+'(Xue) ',    # 0x3b
+'(Jian) ',    # 0x3c
+'(Qi) ',    # 0x3d
+'(Zi) ',    # 0x3e
+'(Xie) ',    # 0x3f
+'(Ji) ',    # 0x40
+'(Xiu) ',    # 0x41
+'<<',    # 0x42
+'>>',    # 0x43
+'[?]',    # 0x44
+'[?]',    # 0x45
+'[?]',    # 0x46
+'[?]',    # 0x47
+'[?]',    # 0x48
+'[?]',    # 0x49
+'[?]',    # 0x4a
+'[?]',    # 0x4b
+'[?]',    # 0x4c
+'[?]',    # 0x4d
+'[?]',    # 0x4e
+'[?]',    # 0x4f
+'[?]',    # 0x50
+'21',    # 0x51
+'22',    # 0x52
+'23',    # 0x53
+'24',    # 0x54
+'25',    # 0x55
+'26',    # 0x56
+'27',    # 0x57
+'28',    # 0x58
+'29',    # 0x59
+'30',    # 0x5a
+'31',    # 0x5b
+'32',    # 0x5c
+'33',    # 0x5d
+'34',    # 0x5e
+'35',    # 0x5f
+'(g)',    # 0x60
+'(n)',    # 0x61
+'(d)',    # 0x62
+'(r)',    # 0x63
+'(m)',    # 0x64
+'(b)',    # 0x65
+'(s)',    # 0x66
+'()',    # 0x67
+'(j)',    # 0x68
+'(c)',    # 0x69
+'(k)',    # 0x6a
+'(t)',    # 0x6b
+'(p)',    # 0x6c
+'(h)',    # 0x6d
+'(ga)',    # 0x6e
+'(na)',    # 0x6f
+'(da)',    # 0x70
+'(ra)',    # 0x71
+'(ma)',    # 0x72
+'(ba)',    # 0x73
+'(sa)',    # 0x74
+'(a)',    # 0x75
+'(ja)',    # 0x76
+'(ca)',    # 0x77
+'(ka)',    # 0x78
+'(ta)',    # 0x79
+'(pa)',    # 0x7a
+'(ha)',    # 0x7b
+'[?]',    # 0x7c
+'[?]',    # 0x7d
+'[?]',    # 0x7e
+'KIS ',    # 0x7f
+'(1) ',    # 0x80
+'(2) ',    # 0x81
+'(3) ',    # 0x82
+'(4) ',    # 0x83
+'(5) ',    # 0x84
+'(6) ',    # 0x85
+'(7) ',    # 0x86
+'(8) ',    # 0x87
+'(9) ',    # 0x88
+'(10) ',    # 0x89
+'(Yue) ',    # 0x8a
+'(Huo) ',    # 0x8b
+'(Shui) ',    # 0x8c
+'(Mu) ',    # 0x8d
+'(Jin) ',    # 0x8e
+'(Tu) ',    # 0x8f
+'(Ri) ',    # 0x90
+'(Zhu) ',    # 0x91
+'(You) ',    # 0x92
+'(She) ',    # 0x93
+'(Ming) ',    # 0x94
+'(Te) ',    # 0x95
+'(Cai) ',    # 0x96
+'(Zhu) ',    # 0x97
+'(Lao) ',    # 0x98
+'(Mi) ',    # 0x99
+'(Nan) ',    # 0x9a
+'(Nu) ',    # 0x9b
+'(Shi) ',    # 0x9c
+'(You) ',    # 0x9d
+'(Yin) ',    # 0x9e
+'(Zhu) ',    # 0x9f
+'(Xiang) ',    # 0xa0
+'(Xiu) ',    # 0xa1
+'(Xie) ',    # 0xa2
+'(Zheng) ',    # 0xa3
+'(Shang) ',    # 0xa4
+'(Zhong) ',    # 0xa5
+'(Xia) ',    # 0xa6
+'(Zuo) ',    # 0xa7
+'(You) ',    # 0xa8
+'(Yi) ',    # 0xa9
+'(Zong) ',    # 0xaa
+'(Xue) ',    # 0xab
+'(Jian) ',    # 0xac
+'(Qi) ',    # 0xad
+'(Zi) ',    # 0xae
+'(Xie) ',    # 0xaf
+'(Ye) ',    # 0xb0
+'36',    # 0xb1
+'37',    # 0xb2
+'38',    # 0xb3
+'39',    # 0xb4
+'40',    # 0xb5
+'41',    # 0xb6
+'42',    # 0xb7
+'43',    # 0xb8
+'44',    # 0xb9
+'45',    # 0xba
+'46',    # 0xbb
+'47',    # 0xbc
+'48',    # 0xbd
+'49',    # 0xbe
+'50',    # 0xbf
+'1M',    # 0xc0
+'2M',    # 0xc1
+'3M',    # 0xc2
+'4M',    # 0xc3
+'5M',    # 0xc4
+'6M',    # 0xc5
+'7M',    # 0xc6
+'8M',    # 0xc7
+'9M',    # 0xc8
+'10M',    # 0xc9
+'11M',    # 0xca
+'12M',    # 0xcb
+'[?]',    # 0xcc
+'[?]',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'a',    # 0xd0
+'i',    # 0xd1
+'u',    # 0xd2
+'u',    # 0xd3
+'o',    # 0xd4
+'ka',    # 0xd5
+'ki',    # 0xd6
+'ku',    # 0xd7
+'ke',    # 0xd8
+'ko',    # 0xd9
+'sa',    # 0xda
+'si',    # 0xdb
+'su',    # 0xdc
+'se',    # 0xdd
+'so',    # 0xde
+'ta',    # 0xdf
+'ti',    # 0xe0
+'tu',    # 0xe1
+'te',    # 0xe2
+'to',    # 0xe3
+'na',    # 0xe4
+'ni',    # 0xe5
+'nu',    # 0xe6
+'ne',    # 0xe7
+'no',    # 0xe8
+'ha',    # 0xe9
+'hi',    # 0xea
+'hu',    # 0xeb
+'he',    # 0xec
+'ho',    # 0xed
+'ma',    # 0xee
+'mi',    # 0xef
+'mu',    # 0xf0
+'me',    # 0xf1
+'mo',    # 0xf2
+'ya',    # 0xf3
+'yu',    # 0xf4
+'yo',    # 0xf5
+'ra',    # 0xf6
+'ri',    # 0xf7
+'ru',    # 0xf8
+'re',    # 0xf9
+'ro',    # 0xfa
+'wa',    # 0xfb
+'wi',    # 0xfc
+'we',    # 0xfd
+'wo',    # 0xfe
+)
diff --git a/lib/unidecode/x033.py b/lib/unidecode/x033.py
new file mode 100644
index 00000000..64eb651a
--- /dev/null
+++ b/lib/unidecode/x033.py
@@ -0,0 +1,257 @@
+data = (
+'apartment',    # 0x00
+'alpha',    # 0x01
+'ampere',    # 0x02
+'are',    # 0x03
+'inning',    # 0x04
+'inch',    # 0x05
+'won',    # 0x06
+'escudo',    # 0x07
+'acre',    # 0x08
+'ounce',    # 0x09
+'ohm',    # 0x0a
+'kai-ri',    # 0x0b
+'carat',    # 0x0c
+'calorie',    # 0x0d
+'gallon',    # 0x0e
+'gamma',    # 0x0f
+'giga',    # 0x10
+'guinea',    # 0x11
+'curie',    # 0x12
+'guilder',    # 0x13
+'kilo',    # 0x14
+'kilogram',    # 0x15
+'kilometer',    # 0x16
+'kilowatt',    # 0x17
+'gram',    # 0x18
+'gram ton',    # 0x19
+'cruzeiro',    # 0x1a
+'krone',    # 0x1b
+'case',    # 0x1c
+'koruna',    # 0x1d
+'co-op',    # 0x1e
+'cycle',    # 0x1f
+'centime',    # 0x20
+'shilling',    # 0x21
+'centi',    # 0x22
+'cent',    # 0x23
+'dozen',    # 0x24
+'desi',    # 0x25
+'dollar',    # 0x26
+'ton',    # 0x27
+'nano',    # 0x28
+'knot',    # 0x29
+'heights',    # 0x2a
+'percent',    # 0x2b
+'parts',    # 0x2c
+'barrel',    # 0x2d
+'piaster',    # 0x2e
+'picul',    # 0x2f
+'pico',    # 0x30
+'building',    # 0x31
+'farad',    # 0x32
+'feet',    # 0x33
+'bushel',    # 0x34
+'franc',    # 0x35
+'hectare',    # 0x36
+'peso',    # 0x37
+'pfennig',    # 0x38
+'hertz',    # 0x39
+'pence',    # 0x3a
+'page',    # 0x3b
+'beta',    # 0x3c
+'point',    # 0x3d
+'volt',    # 0x3e
+'hon',    # 0x3f
+'pound',    # 0x40
+'hall',    # 0x41
+'horn',    # 0x42
+'micro',    # 0x43
+'mile',    # 0x44
+'mach',    # 0x45
+'mark',    # 0x46
+'mansion',    # 0x47
+'micron',    # 0x48
+'milli',    # 0x49
+'millibar',    # 0x4a
+'mega',    # 0x4b
+'megaton',    # 0x4c
+'meter',    # 0x4d
+'yard',    # 0x4e
+'yard',    # 0x4f
+'yuan',    # 0x50
+'liter',    # 0x51
+'lira',    # 0x52
+'rupee',    # 0x53
+'ruble',    # 0x54
+'rem',    # 0x55
+'roentgen',    # 0x56
+'watt',    # 0x57
+'0h',    # 0x58
+'1h',    # 0x59
+'2h',    # 0x5a
+'3h',    # 0x5b
+'4h',    # 0x5c
+'5h',    # 0x5d
+'6h',    # 0x5e
+'7h',    # 0x5f
+'8h',    # 0x60
+'9h',    # 0x61
+'10h',    # 0x62
+'11h',    # 0x63
+'12h',    # 0x64
+'13h',    # 0x65
+'14h',    # 0x66
+'15h',    # 0x67
+'16h',    # 0x68
+'17h',    # 0x69
+'18h',    # 0x6a
+'19h',    # 0x6b
+'20h',    # 0x6c
+'21h',    # 0x6d
+'22h',    # 0x6e
+'23h',    # 0x6f
+'24h',    # 0x70
+'HPA',    # 0x71
+'da',    # 0x72
+'AU',    # 0x73
+'bar',    # 0x74
+'oV',    # 0x75
+'pc',    # 0x76
+'[?]',    # 0x77
+'[?]',    # 0x78
+'[?]',    # 0x79
+'[?]',    # 0x7a
+'Heisei',    # 0x7b
+'Syouwa',    # 0x7c
+'Taisyou',    # 0x7d
+'Meiji',    # 0x7e
+'Inc.',    # 0x7f
+'pA',    # 0x80
+'nA',    # 0x81
+'microamp',    # 0x82
+'mA',    # 0x83
+'kA',    # 0x84
+'kB',    # 0x85
+'MB',    # 0x86
+'GB',    # 0x87
+'cal',    # 0x88
+'kcal',    # 0x89
+'pF',    # 0x8a
+'nF',    # 0x8b
+'microFarad',    # 0x8c
+'microgram',    # 0x8d
+'mg',    # 0x8e
+'kg',    # 0x8f
+'Hz',    # 0x90
+'kHz',    # 0x91
+'MHz',    # 0x92
+'GHz',    # 0x93
+'THz',    # 0x94
+'microliter',    # 0x95
+'ml',    # 0x96
+'dl',    # 0x97
+'kl',    # 0x98
+'fm',    # 0x99
+'nm',    # 0x9a
+'micrometer',    # 0x9b
+'mm',    # 0x9c
+'cm',    # 0x9d
+'km',    # 0x9e
+'mm^2',    # 0x9f
+'cm^2',    # 0xa0
+'m^2',    # 0xa1
+'km^2',    # 0xa2
+'mm^4',    # 0xa3
+'cm^3',    # 0xa4
+'m^3',    # 0xa5
+'km^3',    # 0xa6
+'m/s',    # 0xa7
+'m/s^2',    # 0xa8
+'Pa',    # 0xa9
+'kPa',    # 0xaa
+'MPa',    # 0xab
+'GPa',    # 0xac
+'rad',    # 0xad
+'rad/s',    # 0xae
+'rad/s^2',    # 0xaf
+'ps',    # 0xb0
+'ns',    # 0xb1
+'microsecond',    # 0xb2
+'ms',    # 0xb3
+'pV',    # 0xb4
+'nV',    # 0xb5
+'microvolt',    # 0xb6
+'mV',    # 0xb7
+'kV',    # 0xb8
+'MV',    # 0xb9
+'pW',    # 0xba
+'nW',    # 0xbb
+'microwatt',    # 0xbc
+'mW',    # 0xbd
+'kW',    # 0xbe
+'MW',    # 0xbf
+'kOhm',    # 0xc0
+'MOhm',    # 0xc1
+'a.m.',    # 0xc2
+'Bq',    # 0xc3
+'cc',    # 0xc4
+'cd',    # 0xc5
+'C/kg',    # 0xc6
+'Co.',    # 0xc7
+'dB',    # 0xc8
+'Gy',    # 0xc9
+'ha',    # 0xca
+'HP',    # 0xcb
+'in',    # 0xcc
+'K.K.',    # 0xcd
+'KM',    # 0xce
+'kt',    # 0xcf
+'lm',    # 0xd0
+'ln',    # 0xd1
+'log',    # 0xd2
+'lx',    # 0xd3
+'mb',    # 0xd4
+'mil',    # 0xd5
+'mol',    # 0xd6
+'pH',    # 0xd7
+'p.m.',    # 0xd8
+'PPM',    # 0xd9
+'PR',    # 0xda
+'sr',    # 0xdb
+'Sv',    # 0xdc
+'Wb',    # 0xdd
+'[?]',    # 0xde
+'[?]',    # 0xdf
+'1d',    # 0xe0
+'2d',    # 0xe1
+'3d',    # 0xe2
+'4d',    # 0xe3
+'5d',    # 0xe4
+'6d',    # 0xe5
+'7d',    # 0xe6
+'8d',    # 0xe7
+'9d',    # 0xe8
+'10d',    # 0xe9
+'11d',    # 0xea
+'12d',    # 0xeb
+'13d',    # 0xec
+'14d',    # 0xed
+'15d',    # 0xee
+'16d',    # 0xef
+'17d',    # 0xf0
+'18d',    # 0xf1
+'19d',    # 0xf2
+'20d',    # 0xf3
+'21d',    # 0xf4
+'22d',    # 0xf5
+'23d',    # 0xf6
+'24d',    # 0xf7
+'25d',    # 0xf8
+'26d',    # 0xf9
+'27d',    # 0xfa
+'28d',    # 0xfb
+'29d',    # 0xfc
+'30d',    # 0xfd
+'31d',    # 0xfe
+)
diff --git a/lib/unidecode/x04d.py b/lib/unidecode/x04d.py
new file mode 100644
index 00000000..b025461a
--- /dev/null
+++ b/lib/unidecode/x04d.py
@@ -0,0 +1,257 @@
+data = (
+'[?] ',    # 0x00
+'[?] ',    # 0x01
+'[?] ',    # 0x02
+'[?] ',    # 0x03
+'[?] ',    # 0x04
+'[?] ',    # 0x05
+'[?] ',    # 0x06
+'[?] ',    # 0x07
+'[?] ',    # 0x08
+'[?] ',    # 0x09
+'[?] ',    # 0x0a
+'[?] ',    # 0x0b
+'[?] ',    # 0x0c
+'[?] ',    # 0x0d
+'[?] ',    # 0x0e
+'[?] ',    # 0x0f
+'[?] ',    # 0x10
+'[?] ',    # 0x11
+'[?] ',    # 0x12
+'[?] ',    # 0x13
+'[?] ',    # 0x14
+'[?] ',    # 0x15
+'[?] ',    # 0x16
+'[?] ',    # 0x17
+'[?] ',    # 0x18
+'[?] ',    # 0x19
+'[?] ',    # 0x1a
+'[?] ',    # 0x1b
+'[?] ',    # 0x1c
+'[?] ',    # 0x1d
+'[?] ',    # 0x1e
+'[?] ',    # 0x1f
+'[?] ',    # 0x20
+'[?] ',    # 0x21
+'[?] ',    # 0x22
+'[?] ',    # 0x23
+'[?] ',    # 0x24
+'[?] ',    # 0x25
+'[?] ',    # 0x26
+'[?] ',    # 0x27
+'[?] ',    # 0x28
+'[?] ',    # 0x29
+'[?] ',    # 0x2a
+'[?] ',    # 0x2b
+'[?] ',    # 0x2c
+'[?] ',    # 0x2d
+'[?] ',    # 0x2e
+'[?] ',    # 0x2f
+'[?] ',    # 0x30
+'[?] ',    # 0x31
+'[?] ',    # 0x32
+'[?] ',    # 0x33
+'[?] ',    # 0x34
+'[?] ',    # 0x35
+'[?] ',    # 0x36
+'[?] ',    # 0x37
+'[?] ',    # 0x38
+'[?] ',    # 0x39
+'[?] ',    # 0x3a
+'[?] ',    # 0x3b
+'[?] ',    # 0x3c
+'[?] ',    # 0x3d
+'[?] ',    # 0x3e
+'[?] ',    # 0x3f
+'[?] ',    # 0x40
+'[?] ',    # 0x41
+'[?] ',    # 0x42
+'[?] ',    # 0x43
+'[?] ',    # 0x44
+'[?] ',    # 0x45
+'[?] ',    # 0x46
+'[?] ',    # 0x47
+'[?] ',    # 0x48
+'[?] ',    # 0x49
+'[?] ',    # 0x4a
+'[?] ',    # 0x4b
+'[?] ',    # 0x4c
+'[?] ',    # 0x4d
+'[?] ',    # 0x4e
+'[?] ',    # 0x4f
+'[?] ',    # 0x50
+'[?] ',    # 0x51
+'[?] ',    # 0x52
+'[?] ',    # 0x53
+'[?] ',    # 0x54
+'[?] ',    # 0x55
+'[?] ',    # 0x56
+'[?] ',    # 0x57
+'[?] ',    # 0x58
+'[?] ',    # 0x59
+'[?] ',    # 0x5a
+'[?] ',    # 0x5b
+'[?] ',    # 0x5c
+'[?] ',    # 0x5d
+'[?] ',    # 0x5e
+'[?] ',    # 0x5f
+'[?] ',    # 0x60
+'[?] ',    # 0x61
+'[?] ',    # 0x62
+'[?] ',    # 0x63
+'[?] ',    # 0x64
+'[?] ',    # 0x65
+'[?] ',    # 0x66
+'[?] ',    # 0x67
+'[?] ',    # 0x68
+'[?] ',    # 0x69
+'[?] ',    # 0x6a
+'[?] ',    # 0x6b
+'[?] ',    # 0x6c
+'[?] ',    # 0x6d
+'[?] ',    # 0x6e
+'[?] ',    # 0x6f
+'[?] ',    # 0x70
+'[?] ',    # 0x71
+'[?] ',    # 0x72
+'[?] ',    # 0x73
+'[?] ',    # 0x74
+'[?] ',    # 0x75
+'[?] ',    # 0x76
+'[?] ',    # 0x77
+'[?] ',    # 0x78
+'[?] ',    # 0x79
+'[?] ',    # 0x7a
+'[?] ',    # 0x7b
+'[?] ',    # 0x7c
+'[?] ',    # 0x7d
+'[?] ',    # 0x7e
+'[?] ',    # 0x7f
+'[?] ',    # 0x80
+'[?] ',    # 0x81
+'[?] ',    # 0x82
+'[?] ',    # 0x83
+'[?] ',    # 0x84
+'[?] ',    # 0x85
+'[?] ',    # 0x86
+'[?] ',    # 0x87
+'[?] ',    # 0x88
+'[?] ',    # 0x89
+'[?] ',    # 0x8a
+'[?] ',    # 0x8b
+'[?] ',    # 0x8c
+'[?] ',    # 0x8d
+'[?] ',    # 0x8e
+'[?] ',    # 0x8f
+'[?] ',    # 0x90
+'[?] ',    # 0x91
+'[?] ',    # 0x92
+'[?] ',    # 0x93
+'[?] ',    # 0x94
+'[?] ',    # 0x95
+'[?] ',    # 0x96
+'[?] ',    # 0x97
+'[?] ',    # 0x98
+'[?] ',    # 0x99
+'[?] ',    # 0x9a
+'[?] ',    # 0x9b
+'[?] ',    # 0x9c
+'[?] ',    # 0x9d
+'[?] ',    # 0x9e
+'[?] ',    # 0x9f
+'[?] ',    # 0xa0
+'[?] ',    # 0xa1
+'[?] ',    # 0xa2
+'[?] ',    # 0xa3
+'[?] ',    # 0xa4
+'[?] ',    # 0xa5
+'[?] ',    # 0xa6
+'[?] ',    # 0xa7
+'[?] ',    # 0xa8
+'[?] ',    # 0xa9
+'[?] ',    # 0xaa
+'[?] ',    # 0xab
+'[?] ',    # 0xac
+'[?] ',    # 0xad
+'[?] ',    # 0xae
+'[?] ',    # 0xaf
+'[?] ',    # 0xb0
+'[?] ',    # 0xb1
+'[?] ',    # 0xb2
+'[?] ',    # 0xb3
+'[?] ',    # 0xb4
+'[?] ',    # 0xb5
+'[?]',    # 0xb6
+'[?]',    # 0xb7
+'[?]',    # 0xb8
+'[?]',    # 0xb9
+'[?]',    # 0xba
+'[?]',    # 0xbb
+'[?]',    # 0xbc
+'[?]',    # 0xbd
+'[?]',    # 0xbe
+'[?]',    # 0xbf
+'[?]',    # 0xc0
+'[?]',    # 0xc1
+'[?]',    # 0xc2
+'[?]',    # 0xc3
+'[?]',    # 0xc4
+'[?]',    # 0xc5
+'[?]',    # 0xc6
+'[?]',    # 0xc7
+'[?]',    # 0xc8
+'[?]',    # 0xc9
+'[?]',    # 0xca
+'[?]',    # 0xcb
+'[?]',    # 0xcc
+'[?]',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'[?]',    # 0xd0
+'[?]',    # 0xd1
+'[?]',    # 0xd2
+'[?]',    # 0xd3
+'[?]',    # 0xd4
+'[?]',    # 0xd5
+'[?]',    # 0xd6
+'[?]',    # 0xd7
+'[?]',    # 0xd8
+'[?]',    # 0xd9
+'[?]',    # 0xda
+'[?]',    # 0xdb
+'[?]',    # 0xdc
+'[?]',    # 0xdd
+'[?]',    # 0xde
+'[?]',    # 0xdf
+'[?]',    # 0xe0
+'[?]',    # 0xe1
+'[?]',    # 0xe2
+'[?]',    # 0xe3
+'[?]',    # 0xe4
+'[?]',    # 0xe5
+'[?]',    # 0xe6
+'[?]',    # 0xe7
+'[?]',    # 0xe8
+'[?]',    # 0xe9
+'[?]',    # 0xea
+'[?]',    # 0xeb
+'[?]',    # 0xec
+'[?]',    # 0xed
+'[?]',    # 0xee
+'[?]',    # 0xef
+'[?]',    # 0xf0
+'[?]',    # 0xf1
+'[?]',    # 0xf2
+'[?]',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x04e.py b/lib/unidecode/x04e.py
new file mode 100644
index 00000000..b472b855
--- /dev/null
+++ b/lib/unidecode/x04e.py
@@ -0,0 +1,258 @@
+data = (
+'Yi ',    # 0x00
+'Ding ',    # 0x01
+'Kao ',    # 0x02
+'Qi ',    # 0x03
+'Shang ',    # 0x04
+'Xia ',    # 0x05
+'[?] ',    # 0x06
+'Mo ',    # 0x07
+'Zhang ',    # 0x08
+'San ',    # 0x09
+'Shang ',    # 0x0a
+'Xia ',    # 0x0b
+'Ji ',    # 0x0c
+'Bu ',    # 0x0d
+'Yu ',    # 0x0e
+'Mian ',    # 0x0f
+'Gai ',    # 0x10
+'Chou ',    # 0x11
+'Chou ',    # 0x12
+'Zhuan ',    # 0x13
+'Qie ',    # 0x14
+'Pi ',    # 0x15
+'Shi ',    # 0x16
+'Shi ',    # 0x17
+'Qiu ',    # 0x18
+'Bing ',    # 0x19
+'Ye ',    # 0x1a
+'Cong ',    # 0x1b
+'Dong ',    # 0x1c
+'Si ',    # 0x1d
+'Cheng ',    # 0x1e
+'Diu ',    # 0x1f
+'Qiu ',    # 0x20
+'Liang ',    # 0x21
+'Diu ',    # 0x22
+'You ',    # 0x23
+'Liang ',    # 0x24
+'Yan ',    # 0x25
+'Bing ',    # 0x26
+'Sang ',    # 0x27
+'Gun ',    # 0x28
+'Jiu ',    # 0x29
+'Ge ',    # 0x2a
+'Ya ',    # 0x2b
+'Qiang ',    # 0x2c
+'Zhong ',    # 0x2d
+'Ji ',    # 0x2e
+'Jie ',    # 0x2f
+'Feng ',    # 0x30
+'Guan ',    # 0x31
+'Chuan ',    # 0x32
+'Chan ',    # 0x33
+'Lin ',    # 0x34
+'Zhuo ',    # 0x35
+'Zhu ',    # 0x36
+'Ha ',    # 0x37
+'Wan ',    # 0x38
+'Dan ',    # 0x39
+'Wei ',    # 0x3a
+'Zhu ',    # 0x3b
+'Jing ',    # 0x3c
+'Li ',    # 0x3d
+'Ju ',    # 0x3e
+'Pie ',    # 0x3f
+'Fu ',    # 0x40
+'Yi ',    # 0x41
+'Yi ',    # 0x42
+'Nai ',    # 0x43
+'Shime ',    # 0x44
+'Jiu ',    # 0x45
+'Jiu ',    # 0x46
+'Zhe ',    # 0x47
+'Yao ',    # 0x48
+'Yi ',    # 0x49
+'[?] ',    # 0x4a
+'Zhi ',    # 0x4b
+'Wu ',    # 0x4c
+'Zha ',    # 0x4d
+'Hu ',    # 0x4e
+'Fa ',    # 0x4f
+'Le ',    # 0x50
+'Zhong ',    # 0x51
+'Ping ',    # 0x52
+'Pang ',    # 0x53
+'Qiao ',    # 0x54
+'Hu ',    # 0x55
+'Guai ',    # 0x56
+'Cheng ',    # 0x57
+'Cheng ',    # 0x58
+'Yi ',    # 0x59
+'Yin ',    # 0x5a
+'[?] ',    # 0x5b
+'Mie ',    # 0x5c
+'Jiu ',    # 0x5d
+'Qi ',    # 0x5e
+'Ye ',    # 0x5f
+'Xi ',    # 0x60
+'Xiang ',    # 0x61
+'Gai ',    # 0x62
+'Diu ',    # 0x63
+'Hal ',    # 0x64
+'[?] ',    # 0x65
+'Shu ',    # 0x66
+'Twul ',    # 0x67
+'Shi ',    # 0x68
+'Ji ',    # 0x69
+'Nang ',    # 0x6a
+'Jia ',    # 0x6b
+'Kel ',    # 0x6c
+'Shi ',    # 0x6d
+'[?] ',    # 0x6e
+'Ol ',    # 0x6f
+'Mai ',    # 0x70
+'Luan ',    # 0x71
+'Cal ',    # 0x72
+'Ru ',    # 0x73
+'Xue ',    # 0x74
+'Yan ',    # 0x75
+'Fu ',    # 0x76
+'Sha ',    # 0x77
+'Na ',    # 0x78
+'Gan ',    # 0x79
+'Sol ',    # 0x7a
+'El ',    # 0x7b
+'Cwul ',    # 0x7c
+'[?] ',    # 0x7d
+'Gan ',    # 0x7e
+'Chi ',    # 0x7f
+'Gui ',    # 0x80
+'Gan ',    # 0x81
+'Luan ',    # 0x82
+'Lin ',    # 0x83
+'Yi ',    # 0x84
+'Jue ',    # 0x85
+'Liao ',    # 0x86
+'Ma ',    # 0x87
+'Yu ',    # 0x88
+'Zheng ',    # 0x89
+'Shi ',    # 0x8a
+'Shi ',    # 0x8b
+'Er ',    # 0x8c
+'Chu ',    # 0x8d
+'Yu ',    # 0x8e
+'Yu ',    # 0x8f
+'Yu ',    # 0x90
+'Yun ',    # 0x91
+'Hu ',    # 0x92
+'Qi ',    # 0x93
+'Wu ',    # 0x94
+'Jing ',    # 0x95
+'Si ',    # 0x96
+'Sui ',    # 0x97
+'Gen ',    # 0x98
+'Gen ',    # 0x99
+'Ya ',    # 0x9a
+'Xie ',    # 0x9b
+'Ya ',    # 0x9c
+'Qi ',    # 0x9d
+'Ya ',    # 0x9e
+'Ji ',    # 0x9f
+'Tou ',    # 0xa0
+'Wang ',    # 0xa1
+'Kang ',    # 0xa2
+'Ta ',    # 0xa3
+'Jiao ',    # 0xa4
+'Hai ',    # 0xa5
+'Yi ',    # 0xa6
+'Chan ',    # 0xa7
+'Heng ',    # 0xa8
+'Mu ',    # 0xa9
+'[?] ',    # 0xaa
+'Xiang ',    # 0xab
+'Jing ',    # 0xac
+'Ting ',    # 0xad
+'Liang ',    # 0xae
+'Xiang ',    # 0xaf
+'Jing ',    # 0xb0
+'Ye ',    # 0xb1
+'Qin ',    # 0xb2
+'Bo ',    # 0xb3
+'You ',    # 0xb4
+'Xie ',    # 0xb5
+'Dan ',    # 0xb6
+'Lian ',    # 0xb7
+'Duo ',    # 0xb8
+'Wei ',    # 0xb9
+'Ren ',    # 0xba
+'Ren ',    # 0xbb
+'Ji ',    # 0xbc
+'La ',    # 0xbd
+'Wang ',    # 0xbe
+'Yi ',    # 0xbf
+'Shi ',    # 0xc0
+'Ren ',    # 0xc1
+'Le ',    # 0xc2
+'Ding ',    # 0xc3
+'Ze ',    # 0xc4
+'Jin ',    # 0xc5
+'Pu ',    # 0xc6
+'Chou ',    # 0xc7
+'Ba ',    # 0xc8
+'Zhang ',    # 0xc9
+'Jin ',    # 0xca
+'Jie ',    # 0xcb
+'Bing ',    # 0xcc
+'Reng ',    # 0xcd
+'Cong ',    # 0xce
+'Fo ',    # 0xcf
+'San ',    # 0xd0
+'Lun ',    # 0xd1
+'Sya ',    # 0xd2
+'Cang ',    # 0xd3
+'Zi ',    # 0xd4
+'Shi ',    # 0xd5
+'Ta ',    # 0xd6
+'Zhang ',    # 0xd7
+'Fu ',    # 0xd8
+'Xian ',    # 0xd9
+'Xian ',    # 0xda
+'Tuo ',    # 0xdb
+'Hong ',    # 0xdc
+'Tong ',    # 0xdd
+'Ren ',    # 0xde
+'Qian ',    # 0xdf
+'Gan ',    # 0xe0
+'Yi ',    # 0xe1
+'Di ',    # 0xe2
+'Dai ',    # 0xe3
+'Ling ',    # 0xe4
+'Yi ',    # 0xe5
+'Chao ',    # 0xe6
+'Chang ',    # 0xe7
+'Sa ',    # 0xe8
+'[?] ',    # 0xe9
+'Yi ',    # 0xea
+'Mu ',    # 0xeb
+'Men ',    # 0xec
+'Ren ',    # 0xed
+'Jia ',    # 0xee
+'Chao ',    # 0xef
+'Yang ',    # 0xf0
+'Qian ',    # 0xf1
+'Zhong ',    # 0xf2
+'Pi ',    # 0xf3
+'Wan ',    # 0xf4
+'Wu ',    # 0xf5
+'Jian ',    # 0xf6
+'Jie ',    # 0xf7
+'Yao ',    # 0xf8
+'Feng ',    # 0xf9
+'Cang ',    # 0xfa
+'Ren ',    # 0xfb
+'Wang ',    # 0xfc
+'Fen ',    # 0xfd
+'Di ',    # 0xfe
+'Fang ',    # 0xff
+)
diff --git a/lib/unidecode/x04f.py b/lib/unidecode/x04f.py
new file mode 100644
index 00000000..98c22910
--- /dev/null
+++ b/lib/unidecode/x04f.py
@@ -0,0 +1,258 @@
+data = (
+'Zhong ',    # 0x00
+'Qi ',    # 0x01
+'Pei ',    # 0x02
+'Yu ',    # 0x03
+'Diao ',    # 0x04
+'Dun ',    # 0x05
+'Wen ',    # 0x06
+'Yi ',    # 0x07
+'Xin ',    # 0x08
+'Kang ',    # 0x09
+'Yi ',    # 0x0a
+'Ji ',    # 0x0b
+'Ai ',    # 0x0c
+'Wu ',    # 0x0d
+'Ji ',    # 0x0e
+'Fu ',    # 0x0f
+'Fa ',    # 0x10
+'Xiu ',    # 0x11
+'Jin ',    # 0x12
+'Bei ',    # 0x13
+'Dan ',    # 0x14
+'Fu ',    # 0x15
+'Tang ',    # 0x16
+'Zhong ',    # 0x17
+'You ',    # 0x18
+'Huo ',    # 0x19
+'Hui ',    # 0x1a
+'Yu ',    # 0x1b
+'Cui ',    # 0x1c
+'Chuan ',    # 0x1d
+'San ',    # 0x1e
+'Wei ',    # 0x1f
+'Chuan ',    # 0x20
+'Che ',    # 0x21
+'Ya ',    # 0x22
+'Xian ',    # 0x23
+'Shang ',    # 0x24
+'Chang ',    # 0x25
+'Lun ',    # 0x26
+'Cang ',    # 0x27
+'Xun ',    # 0x28
+'Xin ',    # 0x29
+'Wei ',    # 0x2a
+'Zhu ',    # 0x2b
+'[?] ',    # 0x2c
+'Xuan ',    # 0x2d
+'Nu ',    # 0x2e
+'Bo ',    # 0x2f
+'Gu ',    # 0x30
+'Ni ',    # 0x31
+'Ni ',    # 0x32
+'Xie ',    # 0x33
+'Ban ',    # 0x34
+'Xu ',    # 0x35
+'Ling ',    # 0x36
+'Zhou ',    # 0x37
+'Shen ',    # 0x38
+'Qu ',    # 0x39
+'Si ',    # 0x3a
+'Beng ',    # 0x3b
+'Si ',    # 0x3c
+'Jia ',    # 0x3d
+'Pi ',    # 0x3e
+'Yi ',    # 0x3f
+'Si ',    # 0x40
+'Ai ',    # 0x41
+'Zheng ',    # 0x42
+'Dian ',    # 0x43
+'Han ',    # 0x44
+'Mai ',    # 0x45
+'Dan ',    # 0x46
+'Zhu ',    # 0x47
+'Bu ',    # 0x48
+'Qu ',    # 0x49
+'Bi ',    # 0x4a
+'Shao ',    # 0x4b
+'Ci ',    # 0x4c
+'Wei ',    # 0x4d
+'Di ',    # 0x4e
+'Zhu ',    # 0x4f
+'Zuo ',    # 0x50
+'You ',    # 0x51
+'Yang ',    # 0x52
+'Ti ',    # 0x53
+'Zhan ',    # 0x54
+'He ',    # 0x55
+'Bi ',    # 0x56
+'Tuo ',    # 0x57
+'She ',    # 0x58
+'Yu ',    # 0x59
+'Yi ',    # 0x5a
+'Fo ',    # 0x5b
+'Zuo ',    # 0x5c
+'Kou ',    # 0x5d
+'Ning ',    # 0x5e
+'Tong ',    # 0x5f
+'Ni ',    # 0x60
+'Xuan ',    # 0x61
+'Qu ',    # 0x62
+'Yong ',    # 0x63
+'Wa ',    # 0x64
+'Qian ',    # 0x65
+'[?] ',    # 0x66
+'Ka ',    # 0x67
+'[?] ',    # 0x68
+'Pei ',    # 0x69
+'Huai ',    # 0x6a
+'He ',    # 0x6b
+'Lao ',    # 0x6c
+'Xiang ',    # 0x6d
+'Ge ',    # 0x6e
+'Yang ',    # 0x6f
+'Bai ',    # 0x70
+'Fa ',    # 0x71
+'Ming ',    # 0x72
+'Jia ',    # 0x73
+'Er ',    # 0x74
+'Bing ',    # 0x75
+'Ji ',    # 0x76
+'Hen ',    # 0x77
+'Huo ',    # 0x78
+'Gui ',    # 0x79
+'Quan ',    # 0x7a
+'Tiao ',    # 0x7b
+'Jiao ',    # 0x7c
+'Ci ',    # 0x7d
+'Yi ',    # 0x7e
+'Shi ',    # 0x7f
+'Xing ',    # 0x80
+'Shen ',    # 0x81
+'Tuo ',    # 0x82
+'Kan ',    # 0x83
+'Zhi ',    # 0x84
+'Gai ',    # 0x85
+'Lai ',    # 0x86
+'Yi ',    # 0x87
+'Chi ',    # 0x88
+'Kua ',    # 0x89
+'Guang ',    # 0x8a
+'Li ',    # 0x8b
+'Yin ',    # 0x8c
+'Shi ',    # 0x8d
+'Mi ',    # 0x8e
+'Zhu ',    # 0x8f
+'Xu ',    # 0x90
+'You ',    # 0x91
+'An ',    # 0x92
+'Lu ',    # 0x93
+'Mou ',    # 0x94
+'Er ',    # 0x95
+'Lun ',    # 0x96
+'Tong ',    # 0x97
+'Cha ',    # 0x98
+'Chi ',    # 0x99
+'Xun ',    # 0x9a
+'Gong ',    # 0x9b
+'Zhou ',    # 0x9c
+'Yi ',    # 0x9d
+'Ru ',    # 0x9e
+'Jian ',    # 0x9f
+'Xia ',    # 0xa0
+'Jia ',    # 0xa1
+'Zai ',    # 0xa2
+'Lu ',    # 0xa3
+'Ko ',    # 0xa4
+'Jiao ',    # 0xa5
+'Zhen ',    # 0xa6
+'Ce ',    # 0xa7
+'Qiao ',    # 0xa8
+'Kuai ',    # 0xa9
+'Chai ',    # 0xaa
+'Ning ',    # 0xab
+'Nong ',    # 0xac
+'Jin ',    # 0xad
+'Wu ',    # 0xae
+'Hou ',    # 0xaf
+'Jiong ',    # 0xb0
+'Cheng ',    # 0xb1
+'Zhen ',    # 0xb2
+'Zuo ',    # 0xb3
+'Chou ',    # 0xb4
+'Qin ',    # 0xb5
+'Lu ',    # 0xb6
+'Ju ',    # 0xb7
+'Shu ',    # 0xb8
+'Ting ',    # 0xb9
+'Shen ',    # 0xba
+'Tuo ',    # 0xbb
+'Bo ',    # 0xbc
+'Nan ',    # 0xbd
+'Hao ',    # 0xbe
+'Bian ',    # 0xbf
+'Tui ',    # 0xc0
+'Yu ',    # 0xc1
+'Xi ',    # 0xc2
+'Cu ',    # 0xc3
+'E ',    # 0xc4
+'Qiu ',    # 0xc5
+'Xu ',    # 0xc6
+'Kuang ',    # 0xc7
+'Ku ',    # 0xc8
+'Wu ',    # 0xc9
+'Jun ',    # 0xca
+'Yi ',    # 0xcb
+'Fu ',    # 0xcc
+'Lang ',    # 0xcd
+'Zu ',    # 0xce
+'Qiao ',    # 0xcf
+'Li ',    # 0xd0
+'Yong ',    # 0xd1
+'Hun ',    # 0xd2
+'Jing ',    # 0xd3
+'Xian ',    # 0xd4
+'San ',    # 0xd5
+'Pai ',    # 0xd6
+'Su ',    # 0xd7
+'Fu ',    # 0xd8
+'Xi ',    # 0xd9
+'Li ',    # 0xda
+'Fu ',    # 0xdb
+'Ping ',    # 0xdc
+'Bao ',    # 0xdd
+'Yu ',    # 0xde
+'Si ',    # 0xdf
+'Xia ',    # 0xe0
+'Xin ',    # 0xe1
+'Xiu ',    # 0xe2
+'Yu ',    # 0xe3
+'Ti ',    # 0xe4
+'Che ',    # 0xe5
+'Chou ',    # 0xe6
+'[?] ',    # 0xe7
+'Yan ',    # 0xe8
+'Lia ',    # 0xe9
+'Li ',    # 0xea
+'Lai ',    # 0xeb
+'[?] ',    # 0xec
+'Jian ',    # 0xed
+'Xiu ',    # 0xee
+'Fu ',    # 0xef
+'He ',    # 0xf0
+'Ju ',    # 0xf1
+'Xiao ',    # 0xf2
+'Pai ',    # 0xf3
+'Jian ',    # 0xf4
+'Biao ',    # 0xf5
+'Chu ',    # 0xf6
+'Fei ',    # 0xf7
+'Feng ',    # 0xf8
+'Ya ',    # 0xf9
+'An ',    # 0xfa
+'Bei ',    # 0xfb
+'Yu ',    # 0xfc
+'Xin ',    # 0xfd
+'Bi ',    # 0xfe
+'Jian ',    # 0xff
+)
diff --git a/lib/unidecode/x050.py b/lib/unidecode/x050.py
new file mode 100644
index 00000000..184b87fd
--- /dev/null
+++ b/lib/unidecode/x050.py
@@ -0,0 +1,258 @@
+data = (
+'Chang ',    # 0x00
+'Chi ',    # 0x01
+'Bing ',    # 0x02
+'Zan ',    # 0x03
+'Yao ',    # 0x04
+'Cui ',    # 0x05
+'Lia ',    # 0x06
+'Wan ',    # 0x07
+'Lai ',    # 0x08
+'Cang ',    # 0x09
+'Zong ',    # 0x0a
+'Ge ',    # 0x0b
+'Guan ',    # 0x0c
+'Bei ',    # 0x0d
+'Tian ',    # 0x0e
+'Shu ',    # 0x0f
+'Shu ',    # 0x10
+'Men ',    # 0x11
+'Dao ',    # 0x12
+'Tan ',    # 0x13
+'Jue ',    # 0x14
+'Chui ',    # 0x15
+'Xing ',    # 0x16
+'Peng ',    # 0x17
+'Tang ',    # 0x18
+'Hou ',    # 0x19
+'Yi ',    # 0x1a
+'Qi ',    # 0x1b
+'Ti ',    # 0x1c
+'Gan ',    # 0x1d
+'Jing ',    # 0x1e
+'Jie ',    # 0x1f
+'Sui ',    # 0x20
+'Chang ',    # 0x21
+'Jie ',    # 0x22
+'Fang ',    # 0x23
+'Zhi ',    # 0x24
+'Kong ',    # 0x25
+'Juan ',    # 0x26
+'Zong ',    # 0x27
+'Ju ',    # 0x28
+'Qian ',    # 0x29
+'Ni ',    # 0x2a
+'Lun ',    # 0x2b
+'Zhuo ',    # 0x2c
+'Wei ',    # 0x2d
+'Luo ',    # 0x2e
+'Song ',    # 0x2f
+'Leng ',    # 0x30
+'Hun ',    # 0x31
+'Dong ',    # 0x32
+'Zi ',    # 0x33
+'Ben ',    # 0x34
+'Wu ',    # 0x35
+'Ju ',    # 0x36
+'Nai ',    # 0x37
+'Cai ',    # 0x38
+'Jian ',    # 0x39
+'Zhai ',    # 0x3a
+'Ye ',    # 0x3b
+'Zhi ',    # 0x3c
+'Sha ',    # 0x3d
+'Qing ',    # 0x3e
+'[?] ',    # 0x3f
+'Ying ',    # 0x40
+'Cheng ',    # 0x41
+'Jian ',    # 0x42
+'Yan ',    # 0x43
+'Nuan ',    # 0x44
+'Zhong ',    # 0x45
+'Chun ',    # 0x46
+'Jia ',    # 0x47
+'Jie ',    # 0x48
+'Wei ',    # 0x49
+'Yu ',    # 0x4a
+'Bing ',    # 0x4b
+'Ruo ',    # 0x4c
+'Ti ',    # 0x4d
+'Wei ',    # 0x4e
+'Pian ',    # 0x4f
+'Yan ',    # 0x50
+'Feng ',    # 0x51
+'Tang ',    # 0x52
+'Wo ',    # 0x53
+'E ',    # 0x54
+'Xie ',    # 0x55
+'Che ',    # 0x56
+'Sheng ',    # 0x57
+'Kan ',    # 0x58
+'Di ',    # 0x59
+'Zuo ',    # 0x5a
+'Cha ',    # 0x5b
+'Ting ',    # 0x5c
+'Bei ',    # 0x5d
+'Ye ',    # 0x5e
+'Huang ',    # 0x5f
+'Yao ',    # 0x60
+'Zhan ',    # 0x61
+'Chou ',    # 0x62
+'Yan ',    # 0x63
+'You ',    # 0x64
+'Jian ',    # 0x65
+'Xu ',    # 0x66
+'Zha ',    # 0x67
+'Ci ',    # 0x68
+'Fu ',    # 0x69
+'Bi ',    # 0x6a
+'Zhi ',    # 0x6b
+'Zong ',    # 0x6c
+'Mian ',    # 0x6d
+'Ji ',    # 0x6e
+'Yi ',    # 0x6f
+'Xie ',    # 0x70
+'Xun ',    # 0x71
+'Si ',    # 0x72
+'Duan ',    # 0x73
+'Ce ',    # 0x74
+'Zhen ',    # 0x75
+'Ou ',    # 0x76
+'Tou ',    # 0x77
+'Tou ',    # 0x78
+'Bei ',    # 0x79
+'Za ',    # 0x7a
+'Lu ',    # 0x7b
+'Jie ',    # 0x7c
+'Wei ',    # 0x7d
+'Fen ',    # 0x7e
+'Chang ',    # 0x7f
+'Gui ',    # 0x80
+'Sou ',    # 0x81
+'Zhi ',    # 0x82
+'Su ',    # 0x83
+'Xia ',    # 0x84
+'Fu ',    # 0x85
+'Yuan ',    # 0x86
+'Rong ',    # 0x87
+'Li ',    # 0x88
+'Ru ',    # 0x89
+'Yun ',    # 0x8a
+'Gou ',    # 0x8b
+'Ma ',    # 0x8c
+'Bang ',    # 0x8d
+'Dian ',    # 0x8e
+'Tang ',    # 0x8f
+'Hao ',    # 0x90
+'Jie ',    # 0x91
+'Xi ',    # 0x92
+'Shan ',    # 0x93
+'Qian ',    # 0x94
+'Jue ',    # 0x95
+'Cang ',    # 0x96
+'Chu ',    # 0x97
+'San ',    # 0x98
+'Bei ',    # 0x99
+'Xiao ',    # 0x9a
+'Yong ',    # 0x9b
+'Yao ',    # 0x9c
+'Tan ',    # 0x9d
+'Suo ',    # 0x9e
+'Yang ',    # 0x9f
+'Fa ',    # 0xa0
+'Bing ',    # 0xa1
+'Jia ',    # 0xa2
+'Dai ',    # 0xa3
+'Zai ',    # 0xa4
+'Tang ',    # 0xa5
+'[?] ',    # 0xa6
+'Bin ',    # 0xa7
+'Chu ',    # 0xa8
+'Nuo ',    # 0xa9
+'Can ',    # 0xaa
+'Lei ',    # 0xab
+'Cui ',    # 0xac
+'Yong ',    # 0xad
+'Zao ',    # 0xae
+'Zong ',    # 0xaf
+'Peng ',    # 0xb0
+'Song ',    # 0xb1
+'Ao ',    # 0xb2
+'Chuan ',    # 0xb3
+'Yu ',    # 0xb4
+'Zhai ',    # 0xb5
+'Cou ',    # 0xb6
+'Shang ',    # 0xb7
+'Qiang ',    # 0xb8
+'Jing ',    # 0xb9
+'Chi ',    # 0xba
+'Sha ',    # 0xbb
+'Han ',    # 0xbc
+'Zhang ',    # 0xbd
+'Qing ',    # 0xbe
+'Yan ',    # 0xbf
+'Di ',    # 0xc0
+'Xi ',    # 0xc1
+'Lu ',    # 0xc2
+'Bei ',    # 0xc3
+'Piao ',    # 0xc4
+'Jin ',    # 0xc5
+'Lian ',    # 0xc6
+'Lu ',    # 0xc7
+'Man ',    # 0xc8
+'Qian ',    # 0xc9
+'Xian ',    # 0xca
+'Tan ',    # 0xcb
+'Ying ',    # 0xcc
+'Dong ',    # 0xcd
+'Zhuan ',    # 0xce
+'Xiang ',    # 0xcf
+'Shan ',    # 0xd0
+'Qiao ',    # 0xd1
+'Jiong ',    # 0xd2
+'Tui ',    # 0xd3
+'Zun ',    # 0xd4
+'Pu ',    # 0xd5
+'Xi ',    # 0xd6
+'Lao ',    # 0xd7
+'Chang ',    # 0xd8
+'Guang ',    # 0xd9
+'Liao ',    # 0xda
+'Qi ',    # 0xdb
+'Deng ',    # 0xdc
+'Chan ',    # 0xdd
+'Wei ',    # 0xde
+'Ji ',    # 0xdf
+'Fan ',    # 0xe0
+'Hui ',    # 0xe1
+'Chuan ',    # 0xe2
+'Jian ',    # 0xe3
+'Dan ',    # 0xe4
+'Jiao ',    # 0xe5
+'Jiu ',    # 0xe6
+'Seng ',    # 0xe7
+'Fen ',    # 0xe8
+'Xian ',    # 0xe9
+'Jue ',    # 0xea
+'E ',    # 0xeb
+'Jiao ',    # 0xec
+'Jian ',    # 0xed
+'Tong ',    # 0xee
+'Lin ',    # 0xef
+'Bo ',    # 0xf0
+'Gu ',    # 0xf1
+'[?] ',    # 0xf2
+'Su ',    # 0xf3
+'Xian ',    # 0xf4
+'Jiang ',    # 0xf5
+'Min ',    # 0xf6
+'Ye ',    # 0xf7
+'Jin ',    # 0xf8
+'Jia ',    # 0xf9
+'Qiao ',    # 0xfa
+'Pi ',    # 0xfb
+'Feng ',    # 0xfc
+'Zhou ',    # 0xfd
+'Ai ',    # 0xfe
+'Sai ',    # 0xff
+)
diff --git a/lib/unidecode/x051.py b/lib/unidecode/x051.py
new file mode 100644
index 00000000..c1928354
--- /dev/null
+++ b/lib/unidecode/x051.py
@@ -0,0 +1,258 @@
+data = (
+'Yi ',    # 0x00
+'Jun ',    # 0x01
+'Nong ',    # 0x02
+'Chan ',    # 0x03
+'Yi ',    # 0x04
+'Dang ',    # 0x05
+'Jing ',    # 0x06
+'Xuan ',    # 0x07
+'Kuai ',    # 0x08
+'Jian ',    # 0x09
+'Chu ',    # 0x0a
+'Dan ',    # 0x0b
+'Jiao ',    # 0x0c
+'Sha ',    # 0x0d
+'Zai ',    # 0x0e
+'[?] ',    # 0x0f
+'Bin ',    # 0x10
+'An ',    # 0x11
+'Ru ',    # 0x12
+'Tai ',    # 0x13
+'Chou ',    # 0x14
+'Chai ',    # 0x15
+'Lan ',    # 0x16
+'Ni ',    # 0x17
+'Jin ',    # 0x18
+'Qian ',    # 0x19
+'Meng ',    # 0x1a
+'Wu ',    # 0x1b
+'Ning ',    # 0x1c
+'Qiong ',    # 0x1d
+'Ni ',    # 0x1e
+'Chang ',    # 0x1f
+'Lie ',    # 0x20
+'Lei ',    # 0x21
+'Lu ',    # 0x22
+'Kuang ',    # 0x23
+'Bao ',    # 0x24
+'Du ',    # 0x25
+'Biao ',    # 0x26
+'Zan ',    # 0x27
+'Zhi ',    # 0x28
+'Si ',    # 0x29
+'You ',    # 0x2a
+'Hao ',    # 0x2b
+'Chen ',    # 0x2c
+'Chen ',    # 0x2d
+'Li ',    # 0x2e
+'Teng ',    # 0x2f
+'Wei ',    # 0x30
+'Long ',    # 0x31
+'Chu ',    # 0x32
+'Chan ',    # 0x33
+'Rang ',    # 0x34
+'Shu ',    # 0x35
+'Hui ',    # 0x36
+'Li ',    # 0x37
+'Luo ',    # 0x38
+'Zan ',    # 0x39
+'Nuo ',    # 0x3a
+'Tang ',    # 0x3b
+'Yan ',    # 0x3c
+'Lei ',    # 0x3d
+'Nang ',    # 0x3e
+'Er ',    # 0x3f
+'Wu ',    # 0x40
+'Yun ',    # 0x41
+'Zan ',    # 0x42
+'Yuan ',    # 0x43
+'Xiong ',    # 0x44
+'Chong ',    # 0x45
+'Zhao ',    # 0x46
+'Xiong ',    # 0x47
+'Xian ',    # 0x48
+'Guang ',    # 0x49
+'Dui ',    # 0x4a
+'Ke ',    # 0x4b
+'Dui ',    # 0x4c
+'Mian ',    # 0x4d
+'Tu ',    # 0x4e
+'Chang ',    # 0x4f
+'Er ',    # 0x50
+'Dui ',    # 0x51
+'Er ',    # 0x52
+'Xin ',    # 0x53
+'Tu ',    # 0x54
+'Si ',    # 0x55
+'Yan ',    # 0x56
+'Yan ',    # 0x57
+'Shi ',    # 0x58
+'Shi ',    # 0x59
+'Dang ',    # 0x5a
+'Qian ',    # 0x5b
+'Dou ',    # 0x5c
+'Fen ',    # 0x5d
+'Mao ',    # 0x5e
+'Shen ',    # 0x5f
+'Dou ',    # 0x60
+'Bai ',    # 0x61
+'Jing ',    # 0x62
+'Li ',    # 0x63
+'Huang ',    # 0x64
+'Ru ',    # 0x65
+'Wang ',    # 0x66
+'Nei ',    # 0x67
+'Quan ',    # 0x68
+'Liang ',    # 0x69
+'Yu ',    # 0x6a
+'Ba ',    # 0x6b
+'Gong ',    # 0x6c
+'Liu ',    # 0x6d
+'Xi ',    # 0x6e
+'[?] ',    # 0x6f
+'Lan ',    # 0x70
+'Gong ',    # 0x71
+'Tian ',    # 0x72
+'Guan ',    # 0x73
+'Xing ',    # 0x74
+'Bing ',    # 0x75
+'Qi ',    # 0x76
+'Ju ',    # 0x77
+'Dian ',    # 0x78
+'Zi ',    # 0x79
+'Ppwun ',    # 0x7a
+'Yang ',    # 0x7b
+'Jian ',    # 0x7c
+'Shou ',    # 0x7d
+'Ji ',    # 0x7e
+'Yi ',    # 0x7f
+'Ji ',    # 0x80
+'Chan ',    # 0x81
+'Jiong ',    # 0x82
+'Mao ',    # 0x83
+'Ran ',    # 0x84
+'Nei ',    # 0x85
+'Yuan ',    # 0x86
+'Mao ',    # 0x87
+'Gang ',    # 0x88
+'Ran ',    # 0x89
+'Ce ',    # 0x8a
+'Jiong ',    # 0x8b
+'Ce ',    # 0x8c
+'Zai ',    # 0x8d
+'Gua ',    # 0x8e
+'Jiong ',    # 0x8f
+'Mao ',    # 0x90
+'Zhou ',    # 0x91
+'Mou ',    # 0x92
+'Gou ',    # 0x93
+'Xu ',    # 0x94
+'Mian ',    # 0x95
+'Mi ',    # 0x96
+'Rong ',    # 0x97
+'Yin ',    # 0x98
+'Xie ',    # 0x99
+'Kan ',    # 0x9a
+'Jun ',    # 0x9b
+'Nong ',    # 0x9c
+'Yi ',    # 0x9d
+'Mi ',    # 0x9e
+'Shi ',    # 0x9f
+'Guan ',    # 0xa0
+'Meng ',    # 0xa1
+'Zhong ',    # 0xa2
+'Ju ',    # 0xa3
+'Yuan ',    # 0xa4
+'Ming ',    # 0xa5
+'Kou ',    # 0xa6
+'Lam ',    # 0xa7
+'Fu ',    # 0xa8
+'Xie ',    # 0xa9
+'Mi ',    # 0xaa
+'Bing ',    # 0xab
+'Dong ',    # 0xac
+'Tai ',    # 0xad
+'Gang ',    # 0xae
+'Feng ',    # 0xaf
+'Bing ',    # 0xb0
+'Hu ',    # 0xb1
+'Chong ',    # 0xb2
+'Jue ',    # 0xb3
+'Hu ',    # 0xb4
+'Kuang ',    # 0xb5
+'Ye ',    # 0xb6
+'Leng ',    # 0xb7
+'Pan ',    # 0xb8
+'Fu ',    # 0xb9
+'Min ',    # 0xba
+'Dong ',    # 0xbb
+'Xian ',    # 0xbc
+'Lie ',    # 0xbd
+'Xia ',    # 0xbe
+'Jian ',    # 0xbf
+'Jing ',    # 0xc0
+'Shu ',    # 0xc1
+'Mei ',    # 0xc2
+'Tu ',    # 0xc3
+'Qi ',    # 0xc4
+'Gu ',    # 0xc5
+'Zhun ',    # 0xc6
+'Song ',    # 0xc7
+'Jing ',    # 0xc8
+'Liang ',    # 0xc9
+'Qing ',    # 0xca
+'Diao ',    # 0xcb
+'Ling ',    # 0xcc
+'Dong ',    # 0xcd
+'Gan ',    # 0xce
+'Jian ',    # 0xcf
+'Yin ',    # 0xd0
+'Cou ',    # 0xd1
+'Yi ',    # 0xd2
+'Li ',    # 0xd3
+'Cang ',    # 0xd4
+'Ming ',    # 0xd5
+'Zhuen ',    # 0xd6
+'Cui ',    # 0xd7
+'Si ',    # 0xd8
+'Duo ',    # 0xd9
+'Jin ',    # 0xda
+'Lin ',    # 0xdb
+'Lin ',    # 0xdc
+'Ning ',    # 0xdd
+'Xi ',    # 0xde
+'Du ',    # 0xdf
+'Ji ',    # 0xe0
+'Fan ',    # 0xe1
+'Fan ',    # 0xe2
+'Fan ',    # 0xe3
+'Feng ',    # 0xe4
+'Ju ',    # 0xe5
+'Chu ',    # 0xe6
+'Tako ',    # 0xe7
+'Feng ',    # 0xe8
+'Mok ',    # 0xe9
+'Ci ',    # 0xea
+'Fu ',    # 0xeb
+'Feng ',    # 0xec
+'Ping ',    # 0xed
+'Feng ',    # 0xee
+'Kai ',    # 0xef
+'Huang ',    # 0xf0
+'Kai ',    # 0xf1
+'Gan ',    # 0xf2
+'Deng ',    # 0xf3
+'Ping ',    # 0xf4
+'Qu ',    # 0xf5
+'Xiong ',    # 0xf6
+'Kuai ',    # 0xf7
+'Tu ',    # 0xf8
+'Ao ',    # 0xf9
+'Chu ',    # 0xfa
+'Ji ',    # 0xfb
+'Dang ',    # 0xfc
+'Han ',    # 0xfd
+'Han ',    # 0xfe
+'Zao ',    # 0xff
+)
diff --git a/lib/unidecode/x052.py b/lib/unidecode/x052.py
new file mode 100644
index 00000000..088f221f
--- /dev/null
+++ b/lib/unidecode/x052.py
@@ -0,0 +1,258 @@
+data = (
+'Dao ',    # 0x00
+'Diao ',    # 0x01
+'Dao ',    # 0x02
+'Ren ',    # 0x03
+'Ren ',    # 0x04
+'Chuang ',    # 0x05
+'Fen ',    # 0x06
+'Qie ',    # 0x07
+'Yi ',    # 0x08
+'Ji ',    # 0x09
+'Kan ',    # 0x0a
+'Qian ',    # 0x0b
+'Cun ',    # 0x0c
+'Chu ',    # 0x0d
+'Wen ',    # 0x0e
+'Ji ',    # 0x0f
+'Dan ',    # 0x10
+'Xing ',    # 0x11
+'Hua ',    # 0x12
+'Wan ',    # 0x13
+'Jue ',    # 0x14
+'Li ',    # 0x15
+'Yue ',    # 0x16
+'Lie ',    # 0x17
+'Liu ',    # 0x18
+'Ze ',    # 0x19
+'Gang ',    # 0x1a
+'Chuang ',    # 0x1b
+'Fu ',    # 0x1c
+'Chu ',    # 0x1d
+'Qu ',    # 0x1e
+'Ju ',    # 0x1f
+'Shan ',    # 0x20
+'Min ',    # 0x21
+'Ling ',    # 0x22
+'Zhong ',    # 0x23
+'Pan ',    # 0x24
+'Bie ',    # 0x25
+'Jie ',    # 0x26
+'Jie ',    # 0x27
+'Bao ',    # 0x28
+'Li ',    # 0x29
+'Shan ',    # 0x2a
+'Bie ',    # 0x2b
+'Chan ',    # 0x2c
+'Jing ',    # 0x2d
+'Gua ',    # 0x2e
+'Gen ',    # 0x2f
+'Dao ',    # 0x30
+'Chuang ',    # 0x31
+'Kui ',    # 0x32
+'Ku ',    # 0x33
+'Duo ',    # 0x34
+'Er ',    # 0x35
+'Zhi ',    # 0x36
+'Shua ',    # 0x37
+'Quan ',    # 0x38
+'Cha ',    # 0x39
+'Ci ',    # 0x3a
+'Ke ',    # 0x3b
+'Jie ',    # 0x3c
+'Gui ',    # 0x3d
+'Ci ',    # 0x3e
+'Gui ',    # 0x3f
+'Kai ',    # 0x40
+'Duo ',    # 0x41
+'Ji ',    # 0x42
+'Ti ',    # 0x43
+'Jing ',    # 0x44
+'Lou ',    # 0x45
+'Gen ',    # 0x46
+'Ze ',    # 0x47
+'Yuan ',    # 0x48
+'Cuo ',    # 0x49
+'Xue ',    # 0x4a
+'Ke ',    # 0x4b
+'La ',    # 0x4c
+'Qian ',    # 0x4d
+'Cha ',    # 0x4e
+'Chuang ',    # 0x4f
+'Gua ',    # 0x50
+'Jian ',    # 0x51
+'Cuo ',    # 0x52
+'Li ',    # 0x53
+'Ti ',    # 0x54
+'Fei ',    # 0x55
+'Pou ',    # 0x56
+'Chan ',    # 0x57
+'Qi ',    # 0x58
+'Chuang ',    # 0x59
+'Zi ',    # 0x5a
+'Gang ',    # 0x5b
+'Wan ',    # 0x5c
+'Bo ',    # 0x5d
+'Ji ',    # 0x5e
+'Duo ',    # 0x5f
+'Qing ',    # 0x60
+'Yan ',    # 0x61
+'Zhuo ',    # 0x62
+'Jian ',    # 0x63
+'Ji ',    # 0x64
+'Bo ',    # 0x65
+'Yan ',    # 0x66
+'Ju ',    # 0x67
+'Huo ',    # 0x68
+'Sheng ',    # 0x69
+'Jian ',    # 0x6a
+'Duo ',    # 0x6b
+'Duan ',    # 0x6c
+'Wu ',    # 0x6d
+'Gua ',    # 0x6e
+'Fu ',    # 0x6f
+'Sheng ',    # 0x70
+'Jian ',    # 0x71
+'Ge ',    # 0x72
+'Zha ',    # 0x73
+'Kai ',    # 0x74
+'Chuang ',    # 0x75
+'Juan ',    # 0x76
+'Chan ',    # 0x77
+'Tuan ',    # 0x78
+'Lu ',    # 0x79
+'Li ',    # 0x7a
+'Fou ',    # 0x7b
+'Shan ',    # 0x7c
+'Piao ',    # 0x7d
+'Kou ',    # 0x7e
+'Jiao ',    # 0x7f
+'Gua ',    # 0x80
+'Qiao ',    # 0x81
+'Jue ',    # 0x82
+'Hua ',    # 0x83
+'Zha ',    # 0x84
+'Zhuo ',    # 0x85
+'Lian ',    # 0x86
+'Ju ',    # 0x87
+'Pi ',    # 0x88
+'Liu ',    # 0x89
+'Gui ',    # 0x8a
+'Jiao ',    # 0x8b
+'Gui ',    # 0x8c
+'Jian ',    # 0x8d
+'Jian ',    # 0x8e
+'Tang ',    # 0x8f
+'Huo ',    # 0x90
+'Ji ',    # 0x91
+'Jian ',    # 0x92
+'Yi ',    # 0x93
+'Jian ',    # 0x94
+'Zhi ',    # 0x95
+'Chan ',    # 0x96
+'Cuan ',    # 0x97
+'Mo ',    # 0x98
+'Li ',    # 0x99
+'Zhu ',    # 0x9a
+'Li ',    # 0x9b
+'Ya ',    # 0x9c
+'Quan ',    # 0x9d
+'Ban ',    # 0x9e
+'Gong ',    # 0x9f
+'Jia ',    # 0xa0
+'Wu ',    # 0xa1
+'Mai ',    # 0xa2
+'Lie ',    # 0xa3
+'Jin ',    # 0xa4
+'Keng ',    # 0xa5
+'Xie ',    # 0xa6
+'Zhi ',    # 0xa7
+'Dong ',    # 0xa8
+'Zhu ',    # 0xa9
+'Nu ',    # 0xaa
+'Jie ',    # 0xab
+'Qu ',    # 0xac
+'Shao ',    # 0xad
+'Yi ',    # 0xae
+'Zhu ',    # 0xaf
+'Miao ',    # 0xb0
+'Li ',    # 0xb1
+'Jing ',    # 0xb2
+'Lao ',    # 0xb3
+'Lao ',    # 0xb4
+'Juan ',    # 0xb5
+'Kou ',    # 0xb6
+'Yang ',    # 0xb7
+'Wa ',    # 0xb8
+'Xiao ',    # 0xb9
+'Mou ',    # 0xba
+'Kuang ',    # 0xbb
+'Jie ',    # 0xbc
+'Lie ',    # 0xbd
+'He ',    # 0xbe
+'Shi ',    # 0xbf
+'Ke ',    # 0xc0
+'Jing ',    # 0xc1
+'Hao ',    # 0xc2
+'Bo ',    # 0xc3
+'Min ',    # 0xc4
+'Chi ',    # 0xc5
+'Lang ',    # 0xc6
+'Yong ',    # 0xc7
+'Yong ',    # 0xc8
+'Mian ',    # 0xc9
+'Ke ',    # 0xca
+'Xun ',    # 0xcb
+'Juan ',    # 0xcc
+'Qing ',    # 0xcd
+'Lu ',    # 0xce
+'Pou ',    # 0xcf
+'Meng ',    # 0xd0
+'Lai ',    # 0xd1
+'Le ',    # 0xd2
+'Kai ',    # 0xd3
+'Mian ',    # 0xd4
+'Dong ',    # 0xd5
+'Xu ',    # 0xd6
+'Xu ',    # 0xd7
+'Kan ',    # 0xd8
+'Wu ',    # 0xd9
+'Yi ',    # 0xda
+'Xun ',    # 0xdb
+'Weng ',    # 0xdc
+'Sheng ',    # 0xdd
+'Lao ',    # 0xde
+'Mu ',    # 0xdf
+'Lu ',    # 0xe0
+'Piao ',    # 0xe1
+'Shi ',    # 0xe2
+'Ji ',    # 0xe3
+'Qin ',    # 0xe4
+'Qiang ',    # 0xe5
+'Jiao ',    # 0xe6
+'Quan ',    # 0xe7
+'Yang ',    # 0xe8
+'Yi ',    # 0xe9
+'Jue ',    # 0xea
+'Fan ',    # 0xeb
+'Juan ',    # 0xec
+'Tong ',    # 0xed
+'Ju ',    # 0xee
+'Dan ',    # 0xef
+'Xie ',    # 0xf0
+'Mai ',    # 0xf1
+'Xun ',    # 0xf2
+'Xun ',    # 0xf3
+'Lu ',    # 0xf4
+'Li ',    # 0xf5
+'Che ',    # 0xf6
+'Rang ',    # 0xf7
+'Quan ',    # 0xf8
+'Bao ',    # 0xf9
+'Shao ',    # 0xfa
+'Yun ',    # 0xfb
+'Jiu ',    # 0xfc
+'Bao ',    # 0xfd
+'Gou ',    # 0xfe
+'Wu ',    # 0xff
+)
diff --git a/lib/unidecode/x053.py b/lib/unidecode/x053.py
new file mode 100644
index 00000000..fa08b6ef
--- /dev/null
+++ b/lib/unidecode/x053.py
@@ -0,0 +1,258 @@
+data = (
+'Yun ',    # 0x00
+'Mwun ',    # 0x01
+'Nay ',    # 0x02
+'Gai ',    # 0x03
+'Gai ',    # 0x04
+'Bao ',    # 0x05
+'Cong ',    # 0x06
+'[?] ',    # 0x07
+'Xiong ',    # 0x08
+'Peng ',    # 0x09
+'Ju ',    # 0x0a
+'Tao ',    # 0x0b
+'Ge ',    # 0x0c
+'Pu ',    # 0x0d
+'An ',    # 0x0e
+'Pao ',    # 0x0f
+'Fu ',    # 0x10
+'Gong ',    # 0x11
+'Da ',    # 0x12
+'Jiu ',    # 0x13
+'Qiong ',    # 0x14
+'Bi ',    # 0x15
+'Hua ',    # 0x16
+'Bei ',    # 0x17
+'Nao ',    # 0x18
+'Chi ',    # 0x19
+'Fang ',    # 0x1a
+'Jiu ',    # 0x1b
+'Yi ',    # 0x1c
+'Za ',    # 0x1d
+'Jiang ',    # 0x1e
+'Kang ',    # 0x1f
+'Jiang ',    # 0x20
+'Kuang ',    # 0x21
+'Hu ',    # 0x22
+'Xia ',    # 0x23
+'Qu ',    # 0x24
+'Bian ',    # 0x25
+'Gui ',    # 0x26
+'Qie ',    # 0x27
+'Zang ',    # 0x28
+'Kuang ',    # 0x29
+'Fei ',    # 0x2a
+'Hu ',    # 0x2b
+'Tou ',    # 0x2c
+'Gui ',    # 0x2d
+'Gui ',    # 0x2e
+'Hui ',    # 0x2f
+'Dan ',    # 0x30
+'Gui ',    # 0x31
+'Lian ',    # 0x32
+'Lian ',    # 0x33
+'Suan ',    # 0x34
+'Du ',    # 0x35
+'Jiu ',    # 0x36
+'Qu ',    # 0x37
+'Xi ',    # 0x38
+'Pi ',    # 0x39
+'Qu ',    # 0x3a
+'Yi ',    # 0x3b
+'Qia ',    # 0x3c
+'Yan ',    # 0x3d
+'Bian ',    # 0x3e
+'Ni ',    # 0x3f
+'Qu ',    # 0x40
+'Shi ',    # 0x41
+'Xin ',    # 0x42
+'Qian ',    # 0x43
+'Nian ',    # 0x44
+'Sa ',    # 0x45
+'Zu ',    # 0x46
+'Sheng ',    # 0x47
+'Wu ',    # 0x48
+'Hui ',    # 0x49
+'Ban ',    # 0x4a
+'Shi ',    # 0x4b
+'Xi ',    # 0x4c
+'Wan ',    # 0x4d
+'Hua ',    # 0x4e
+'Xie ',    # 0x4f
+'Wan ',    # 0x50
+'Bei ',    # 0x51
+'Zu ',    # 0x52
+'Zhuo ',    # 0x53
+'Xie ',    # 0x54
+'Dan ',    # 0x55
+'Mai ',    # 0x56
+'Nan ',    # 0x57
+'Dan ',    # 0x58
+'Ji ',    # 0x59
+'Bo ',    # 0x5a
+'Shuai ',    # 0x5b
+'Bu ',    # 0x5c
+'Kuang ',    # 0x5d
+'Bian ',    # 0x5e
+'Bu ',    # 0x5f
+'Zhan ',    # 0x60
+'Qia ',    # 0x61
+'Lu ',    # 0x62
+'You ',    # 0x63
+'Lu ',    # 0x64
+'Xi ',    # 0x65
+'Gua ',    # 0x66
+'Wo ',    # 0x67
+'Xie ',    # 0x68
+'Jie ',    # 0x69
+'Jie ',    # 0x6a
+'Wei ',    # 0x6b
+'Ang ',    # 0x6c
+'Qiong ',    # 0x6d
+'Zhi ',    # 0x6e
+'Mao ',    # 0x6f
+'Yin ',    # 0x70
+'Wei ',    # 0x71
+'Shao ',    # 0x72
+'Ji ',    # 0x73
+'Que ',    # 0x74
+'Luan ',    # 0x75
+'Shi ',    # 0x76
+'Juan ',    # 0x77
+'Xie ',    # 0x78
+'Xu ',    # 0x79
+'Jin ',    # 0x7a
+'Que ',    # 0x7b
+'Wu ',    # 0x7c
+'Ji ',    # 0x7d
+'E ',    # 0x7e
+'Qing ',    # 0x7f
+'Xi ',    # 0x80
+'[?] ',    # 0x81
+'Han ',    # 0x82
+'Zhan ',    # 0x83
+'E ',    # 0x84
+'Ting ',    # 0x85
+'Li ',    # 0x86
+'Zhe ',    # 0x87
+'Han ',    # 0x88
+'Li ',    # 0x89
+'Ya ',    # 0x8a
+'Ya ',    # 0x8b
+'Yan ',    # 0x8c
+'She ',    # 0x8d
+'Zhi ',    # 0x8e
+'Zha ',    # 0x8f
+'Pang ',    # 0x90
+'[?] ',    # 0x91
+'He ',    # 0x92
+'Ya ',    # 0x93
+'Zhi ',    # 0x94
+'Ce ',    # 0x95
+'Pang ',    # 0x96
+'Ti ',    # 0x97
+'Li ',    # 0x98
+'She ',    # 0x99
+'Hou ',    # 0x9a
+'Ting ',    # 0x9b
+'Zui ',    # 0x9c
+'Cuo ',    # 0x9d
+'Fei ',    # 0x9e
+'Yuan ',    # 0x9f
+'Ce ',    # 0xa0
+'Yuan ',    # 0xa1
+'Xiang ',    # 0xa2
+'Yan ',    # 0xa3
+'Li ',    # 0xa4
+'Jue ',    # 0xa5
+'Sha ',    # 0xa6
+'Dian ',    # 0xa7
+'Chu ',    # 0xa8
+'Jiu ',    # 0xa9
+'Qin ',    # 0xaa
+'Ao ',    # 0xab
+'Gui ',    # 0xac
+'Yan ',    # 0xad
+'Si ',    # 0xae
+'Li ',    # 0xaf
+'Chang ',    # 0xb0
+'Lan ',    # 0xb1
+'Li ',    # 0xb2
+'Yan ',    # 0xb3
+'Yan ',    # 0xb4
+'Yuan ',    # 0xb5
+'Si ',    # 0xb6
+'Gong ',    # 0xb7
+'Lin ',    # 0xb8
+'Qiu ',    # 0xb9
+'Qu ',    # 0xba
+'Qu ',    # 0xbb
+'Uk ',    # 0xbc
+'Lei ',    # 0xbd
+'Du ',    # 0xbe
+'Xian ',    # 0xbf
+'Zhuan ',    # 0xc0
+'San ',    # 0xc1
+'Can ',    # 0xc2
+'Can ',    # 0xc3
+'Can ',    # 0xc4
+'Can ',    # 0xc5
+'Ai ',    # 0xc6
+'Dai ',    # 0xc7
+'You ',    # 0xc8
+'Cha ',    # 0xc9
+'Ji ',    # 0xca
+'You ',    # 0xcb
+'Shuang ',    # 0xcc
+'Fan ',    # 0xcd
+'Shou ',    # 0xce
+'Guai ',    # 0xcf
+'Ba ',    # 0xd0
+'Fa ',    # 0xd1
+'Ruo ',    # 0xd2
+'Shi ',    # 0xd3
+'Shu ',    # 0xd4
+'Zhuo ',    # 0xd5
+'Qu ',    # 0xd6
+'Shou ',    # 0xd7
+'Bian ',    # 0xd8
+'Xu ',    # 0xd9
+'Jia ',    # 0xda
+'Pan ',    # 0xdb
+'Sou ',    # 0xdc
+'Gao ',    # 0xdd
+'Wei ',    # 0xde
+'Sou ',    # 0xdf
+'Die ',    # 0xe0
+'Rui ',    # 0xe1
+'Cong ',    # 0xe2
+'Kou ',    # 0xe3
+'Gu ',    # 0xe4
+'Ju ',    # 0xe5
+'Ling ',    # 0xe6
+'Gua ',    # 0xe7
+'Tao ',    # 0xe8
+'Kou ',    # 0xe9
+'Zhi ',    # 0xea
+'Jiao ',    # 0xeb
+'Zhao ',    # 0xec
+'Ba ',    # 0xed
+'Ding ',    # 0xee
+'Ke ',    # 0xef
+'Tai ',    # 0xf0
+'Chi ',    # 0xf1
+'Shi ',    # 0xf2
+'You ',    # 0xf3
+'Qiu ',    # 0xf4
+'Po ',    # 0xf5
+'Xie ',    # 0xf6
+'Hao ',    # 0xf7
+'Si ',    # 0xf8
+'Tan ',    # 0xf9
+'Chi ',    # 0xfa
+'Le ',    # 0xfb
+'Diao ',    # 0xfc
+'Ji ',    # 0xfd
+'[?] ',    # 0xfe
+'Hong ',    # 0xff
+)
diff --git a/lib/unidecode/x054.py b/lib/unidecode/x054.py
new file mode 100644
index 00000000..c014e0fe
--- /dev/null
+++ b/lib/unidecode/x054.py
@@ -0,0 +1,258 @@
+data = (
+'Mie ',    # 0x00
+'Xu ',    # 0x01
+'Mang ',    # 0x02
+'Chi ',    # 0x03
+'Ge ',    # 0x04
+'Xuan ',    # 0x05
+'Yao ',    # 0x06
+'Zi ',    # 0x07
+'He ',    # 0x08
+'Ji ',    # 0x09
+'Diao ',    # 0x0a
+'Cun ',    # 0x0b
+'Tong ',    # 0x0c
+'Ming ',    # 0x0d
+'Hou ',    # 0x0e
+'Li ',    # 0x0f
+'Tu ',    # 0x10
+'Xiang ',    # 0x11
+'Zha ',    # 0x12
+'Xia ',    # 0x13
+'Ye ',    # 0x14
+'Lu ',    # 0x15
+'A ',    # 0x16
+'Ma ',    # 0x17
+'Ou ',    # 0x18
+'Xue ',    # 0x19
+'Yi ',    # 0x1a
+'Jun ',    # 0x1b
+'Chou ',    # 0x1c
+'Lin ',    # 0x1d
+'Tun ',    # 0x1e
+'Yin ',    # 0x1f
+'Fei ',    # 0x20
+'Bi ',    # 0x21
+'Qin ',    # 0x22
+'Qin ',    # 0x23
+'Jie ',    # 0x24
+'Bu ',    # 0x25
+'Fou ',    # 0x26
+'Ba ',    # 0x27
+'Dun ',    # 0x28
+'Fen ',    # 0x29
+'E ',    # 0x2a
+'Han ',    # 0x2b
+'Ting ',    # 0x2c
+'Hang ',    # 0x2d
+'Shun ',    # 0x2e
+'Qi ',    # 0x2f
+'Hong ',    # 0x30
+'Zhi ',    # 0x31
+'Shen ',    # 0x32
+'Wu ',    # 0x33
+'Wu ',    # 0x34
+'Chao ',    # 0x35
+'Ne ',    # 0x36
+'Xue ',    # 0x37
+'Xi ',    # 0x38
+'Chui ',    # 0x39
+'Dou ',    # 0x3a
+'Wen ',    # 0x3b
+'Hou ',    # 0x3c
+'Ou ',    # 0x3d
+'Wu ',    # 0x3e
+'Gao ',    # 0x3f
+'Ya ',    # 0x40
+'Jun ',    # 0x41
+'Lu ',    # 0x42
+'E ',    # 0x43
+'Ge ',    # 0x44
+'Mei ',    # 0x45
+'Ai ',    # 0x46
+'Qi ',    # 0x47
+'Cheng ',    # 0x48
+'Wu ',    # 0x49
+'Gao ',    # 0x4a
+'Fu ',    # 0x4b
+'Jiao ',    # 0x4c
+'Hong ',    # 0x4d
+'Chi ',    # 0x4e
+'Sheng ',    # 0x4f
+'Ne ',    # 0x50
+'Tun ',    # 0x51
+'Fu ',    # 0x52
+'Yi ',    # 0x53
+'Dai ',    # 0x54
+'Ou ',    # 0x55
+'Li ',    # 0x56
+'Bai ',    # 0x57
+'Yuan ',    # 0x58
+'Kuai ',    # 0x59
+'[?] ',    # 0x5a
+'Qiang ',    # 0x5b
+'Wu ',    # 0x5c
+'E ',    # 0x5d
+'Shi ',    # 0x5e
+'Quan ',    # 0x5f
+'Pen ',    # 0x60
+'Wen ',    # 0x61
+'Ni ',    # 0x62
+'M ',    # 0x63
+'Ling ',    # 0x64
+'Ran ',    # 0x65
+'You ',    # 0x66
+'Di ',    # 0x67
+'Zhou ',    # 0x68
+'Shi ',    # 0x69
+'Zhou ',    # 0x6a
+'Tie ',    # 0x6b
+'Xi ',    # 0x6c
+'Yi ',    # 0x6d
+'Qi ',    # 0x6e
+'Ping ',    # 0x6f
+'Zi ',    # 0x70
+'Gu ',    # 0x71
+'Zi ',    # 0x72
+'Wei ',    # 0x73
+'Xu ',    # 0x74
+'He ',    # 0x75
+'Nao ',    # 0x76
+'Xia ',    # 0x77
+'Pei ',    # 0x78
+'Yi ',    # 0x79
+'Xiao ',    # 0x7a
+'Shen ',    # 0x7b
+'Hu ',    # 0x7c
+'Ming ',    # 0x7d
+'Da ',    # 0x7e
+'Qu ',    # 0x7f
+'Ju ',    # 0x80
+'Gem ',    # 0x81
+'Za ',    # 0x82
+'Tuo ',    # 0x83
+'Duo ',    # 0x84
+'Pou ',    # 0x85
+'Pao ',    # 0x86
+'Bi ',    # 0x87
+'Fu ',    # 0x88
+'Yang ',    # 0x89
+'He ',    # 0x8a
+'Zha ',    # 0x8b
+'He ',    # 0x8c
+'Hai ',    # 0x8d
+'Jiu ',    # 0x8e
+'Yong ',    # 0x8f
+'Fu ',    # 0x90
+'Que ',    # 0x91
+'Zhou ',    # 0x92
+'Wa ',    # 0x93
+'Ka ',    # 0x94
+'Gu ',    # 0x95
+'Ka ',    # 0x96
+'Zuo ',    # 0x97
+'Bu ',    # 0x98
+'Long ',    # 0x99
+'Dong ',    # 0x9a
+'Ning ',    # 0x9b
+'Tha ',    # 0x9c
+'Si ',    # 0x9d
+'Xian ',    # 0x9e
+'Huo ',    # 0x9f
+'Qi ',    # 0xa0
+'Er ',    # 0xa1
+'E ',    # 0xa2
+'Guang ',    # 0xa3
+'Zha ',    # 0xa4
+'Xi ',    # 0xa5
+'Yi ',    # 0xa6
+'Lie ',    # 0xa7
+'Zi ',    # 0xa8
+'Mie ',    # 0xa9
+'Mi ',    # 0xaa
+'Zhi ',    # 0xab
+'Yao ',    # 0xac
+'Ji ',    # 0xad
+'Zhou ',    # 0xae
+'Ge ',    # 0xaf
+'Shuai ',    # 0xb0
+'Zan ',    # 0xb1
+'Xiao ',    # 0xb2
+'Ke ',    # 0xb3
+'Hui ',    # 0xb4
+'Kua ',    # 0xb5
+'Huai ',    # 0xb6
+'Tao ',    # 0xb7
+'Xian ',    # 0xb8
+'E ',    # 0xb9
+'Xuan ',    # 0xba
+'Xiu ',    # 0xbb
+'Wai ',    # 0xbc
+'Yan ',    # 0xbd
+'Lao ',    # 0xbe
+'Yi ',    # 0xbf
+'Ai ',    # 0xc0
+'Pin ',    # 0xc1
+'Shen ',    # 0xc2
+'Tong ',    # 0xc3
+'Hong ',    # 0xc4
+'Xiong ',    # 0xc5
+'Chi ',    # 0xc6
+'Wa ',    # 0xc7
+'Ha ',    # 0xc8
+'Zai ',    # 0xc9
+'Yu ',    # 0xca
+'Di ',    # 0xcb
+'Pai ',    # 0xcc
+'Xiang ',    # 0xcd
+'Ai ',    # 0xce
+'Hen ',    # 0xcf
+'Kuang ',    # 0xd0
+'Ya ',    # 0xd1
+'Da ',    # 0xd2
+'Xiao ',    # 0xd3
+'Bi ',    # 0xd4
+'Yue ',    # 0xd5
+'[?] ',    # 0xd6
+'Hua ',    # 0xd7
+'Sasou ',    # 0xd8
+'Kuai ',    # 0xd9
+'Duo ',    # 0xda
+'[?] ',    # 0xdb
+'Ji ',    # 0xdc
+'Nong ',    # 0xdd
+'Mou ',    # 0xde
+'Yo ',    # 0xdf
+'Hao ',    # 0xe0
+'Yuan ',    # 0xe1
+'Long ',    # 0xe2
+'Pou ',    # 0xe3
+'Mang ',    # 0xe4
+'Ge ',    # 0xe5
+'E ',    # 0xe6
+'Chi ',    # 0xe7
+'Shao ',    # 0xe8
+'Li ',    # 0xe9
+'Na ',    # 0xea
+'Zu ',    # 0xeb
+'He ',    # 0xec
+'Ku ',    # 0xed
+'Xiao ',    # 0xee
+'Xian ',    # 0xef
+'Lao ',    # 0xf0
+'Bo ',    # 0xf1
+'Zhe ',    # 0xf2
+'Zha ',    # 0xf3
+'Liang ',    # 0xf4
+'Ba ',    # 0xf5
+'Mie ',    # 0xf6
+'Le ',    # 0xf7
+'Sui ',    # 0xf8
+'Fou ',    # 0xf9
+'Bu ',    # 0xfa
+'Han ',    # 0xfb
+'Heng ',    # 0xfc
+'Geng ',    # 0xfd
+'Shuo ',    # 0xfe
+'Ge ',    # 0xff
+)
diff --git a/lib/unidecode/x055.py b/lib/unidecode/x055.py
new file mode 100644
index 00000000..26aea747
--- /dev/null
+++ b/lib/unidecode/x055.py
@@ -0,0 +1,258 @@
+data = (
+'You ',    # 0x00
+'Yan ',    # 0x01
+'Gu ',    # 0x02
+'Gu ',    # 0x03
+'Bai ',    # 0x04
+'Han ',    # 0x05
+'Suo ',    # 0x06
+'Chun ',    # 0x07
+'Yi ',    # 0x08
+'Ai ',    # 0x09
+'Jia ',    # 0x0a
+'Tu ',    # 0x0b
+'Xian ',    # 0x0c
+'Huan ',    # 0x0d
+'Li ',    # 0x0e
+'Xi ',    # 0x0f
+'Tang ',    # 0x10
+'Zuo ',    # 0x11
+'Qiu ',    # 0x12
+'Che ',    # 0x13
+'Wu ',    # 0x14
+'Zao ',    # 0x15
+'Ya ',    # 0x16
+'Dou ',    # 0x17
+'Qi ',    # 0x18
+'Di ',    # 0x19
+'Qin ',    # 0x1a
+'Ma ',    # 0x1b
+'Mal ',    # 0x1c
+'Hong ',    # 0x1d
+'Dou ',    # 0x1e
+'Kes ',    # 0x1f
+'Lao ',    # 0x20
+'Liang ',    # 0x21
+'Suo ',    # 0x22
+'Zao ',    # 0x23
+'Huan ',    # 0x24
+'Lang ',    # 0x25
+'Sha ',    # 0x26
+'Ji ',    # 0x27
+'Zuo ',    # 0x28
+'Wo ',    # 0x29
+'Feng ',    # 0x2a
+'Yin ',    # 0x2b
+'Hu ',    # 0x2c
+'Qi ',    # 0x2d
+'Shou ',    # 0x2e
+'Wei ',    # 0x2f
+'Shua ',    # 0x30
+'Chang ',    # 0x31
+'Er ',    # 0x32
+'Li ',    # 0x33
+'Qiang ',    # 0x34
+'An ',    # 0x35
+'Jie ',    # 0x36
+'Yo ',    # 0x37
+'Nian ',    # 0x38
+'Yu ',    # 0x39
+'Tian ',    # 0x3a
+'Lai ',    # 0x3b
+'Sha ',    # 0x3c
+'Xi ',    # 0x3d
+'Tuo ',    # 0x3e
+'Hu ',    # 0x3f
+'Ai ',    # 0x40
+'Zhou ',    # 0x41
+'Nou ',    # 0x42
+'Ken ',    # 0x43
+'Zhuo ',    # 0x44
+'Zhuo ',    # 0x45
+'Shang ',    # 0x46
+'Di ',    # 0x47
+'Heng ',    # 0x48
+'Lan ',    # 0x49
+'A ',    # 0x4a
+'Xiao ',    # 0x4b
+'Xiang ',    # 0x4c
+'Tun ',    # 0x4d
+'Wu ',    # 0x4e
+'Wen ',    # 0x4f
+'Cui ',    # 0x50
+'Sha ',    # 0x51
+'Hu ',    # 0x52
+'Qi ',    # 0x53
+'Qi ',    # 0x54
+'Tao ',    # 0x55
+'Dan ',    # 0x56
+'Dan ',    # 0x57
+'Ye ',    # 0x58
+'Zi ',    # 0x59
+'Bi ',    # 0x5a
+'Cui ',    # 0x5b
+'Chuo ',    # 0x5c
+'He ',    # 0x5d
+'Ya ',    # 0x5e
+'Qi ',    # 0x5f
+'Zhe ',    # 0x60
+'Pei ',    # 0x61
+'Liang ',    # 0x62
+'Xian ',    # 0x63
+'Pi ',    # 0x64
+'Sha ',    # 0x65
+'La ',    # 0x66
+'Ze ',    # 0x67
+'Qing ',    # 0x68
+'Gua ',    # 0x69
+'Pa ',    # 0x6a
+'Zhe ',    # 0x6b
+'Se ',    # 0x6c
+'Zhuan ',    # 0x6d
+'Nie ',    # 0x6e
+'Guo ',    # 0x6f
+'Luo ',    # 0x70
+'Yan ',    # 0x71
+'Di ',    # 0x72
+'Quan ',    # 0x73
+'Tan ',    # 0x74
+'Bo ',    # 0x75
+'Ding ',    # 0x76
+'Lang ',    # 0x77
+'Xiao ',    # 0x78
+'[?] ',    # 0x79
+'Tang ',    # 0x7a
+'Chi ',    # 0x7b
+'Ti ',    # 0x7c
+'An ',    # 0x7d
+'Jiu ',    # 0x7e
+'Dan ',    # 0x7f
+'Ke ',    # 0x80
+'Yong ',    # 0x81
+'Wei ',    # 0x82
+'Nan ',    # 0x83
+'Shan ',    # 0x84
+'Yu ',    # 0x85
+'Zhe ',    # 0x86
+'La ',    # 0x87
+'Jie ',    # 0x88
+'Hou ',    # 0x89
+'Han ',    # 0x8a
+'Die ',    # 0x8b
+'Zhou ',    # 0x8c
+'Chai ',    # 0x8d
+'Wai ',    # 0x8e
+'Re ',    # 0x8f
+'Yu ',    # 0x90
+'Yin ',    # 0x91
+'Zan ',    # 0x92
+'Yao ',    # 0x93
+'Wo ',    # 0x94
+'Mian ',    # 0x95
+'Hu ',    # 0x96
+'Yun ',    # 0x97
+'Chuan ',    # 0x98
+'Hui ',    # 0x99
+'Huan ',    # 0x9a
+'Huan ',    # 0x9b
+'Xi ',    # 0x9c
+'He ',    # 0x9d
+'Ji ',    # 0x9e
+'Kui ',    # 0x9f
+'Zhong ',    # 0xa0
+'Wei ',    # 0xa1
+'Sha ',    # 0xa2
+'Xu ',    # 0xa3
+'Huang ',    # 0xa4
+'Du ',    # 0xa5
+'Nie ',    # 0xa6
+'Xuan ',    # 0xa7
+'Liang ',    # 0xa8
+'Yu ',    # 0xa9
+'Sang ',    # 0xaa
+'Chi ',    # 0xab
+'Qiao ',    # 0xac
+'Yan ',    # 0xad
+'Dan ',    # 0xae
+'Pen ',    # 0xaf
+'Can ',    # 0xb0
+'Li ',    # 0xb1
+'Yo ',    # 0xb2
+'Zha ',    # 0xb3
+'Wei ',    # 0xb4
+'Miao ',    # 0xb5
+'Ying ',    # 0xb6
+'Pen ',    # 0xb7
+'Phos ',    # 0xb8
+'Kui ',    # 0xb9
+'Xi ',    # 0xba
+'Yu ',    # 0xbb
+'Jie ',    # 0xbc
+'Lou ',    # 0xbd
+'Ku ',    # 0xbe
+'Sao ',    # 0xbf
+'Huo ',    # 0xc0
+'Ti ',    # 0xc1
+'Yao ',    # 0xc2
+'He ',    # 0xc3
+'A ',    # 0xc4
+'Xiu ',    # 0xc5
+'Qiang ',    # 0xc6
+'Se ',    # 0xc7
+'Yong ',    # 0xc8
+'Su ',    # 0xc9
+'Hong ',    # 0xca
+'Xie ',    # 0xcb
+'Yi ',    # 0xcc
+'Suo ',    # 0xcd
+'Ma ',    # 0xce
+'Cha ',    # 0xcf
+'Hai ',    # 0xd0
+'Ke ',    # 0xd1
+'Ta ',    # 0xd2
+'Sang ',    # 0xd3
+'Tian ',    # 0xd4
+'Ru ',    # 0xd5
+'Sou ',    # 0xd6
+'Wa ',    # 0xd7
+'Ji ',    # 0xd8
+'Pang ',    # 0xd9
+'Wu ',    # 0xda
+'Xian ',    # 0xdb
+'Shi ',    # 0xdc
+'Ge ',    # 0xdd
+'Zi ',    # 0xde
+'Jie ',    # 0xdf
+'Luo ',    # 0xe0
+'Weng ',    # 0xe1
+'Wa ',    # 0xe2
+'Si ',    # 0xe3
+'Chi ',    # 0xe4
+'Hao ',    # 0xe5
+'Suo ',    # 0xe6
+'Jia ',    # 0xe7
+'Hai ',    # 0xe8
+'Suo ',    # 0xe9
+'Qin ',    # 0xea
+'Nie ',    # 0xeb
+'He ',    # 0xec
+'Cis ',    # 0xed
+'Sai ',    # 0xee
+'Ng ',    # 0xef
+'Ge ',    # 0xf0
+'Na ',    # 0xf1
+'Dia ',    # 0xf2
+'Ai ',    # 0xf3
+'[?] ',    # 0xf4
+'Tong ',    # 0xf5
+'Bi ',    # 0xf6
+'Ao ',    # 0xf7
+'Ao ',    # 0xf8
+'Lian ',    # 0xf9
+'Cui ',    # 0xfa
+'Zhe ',    # 0xfb
+'Mo ',    # 0xfc
+'Sou ',    # 0xfd
+'Sou ',    # 0xfe
+'Tan ',    # 0xff
+)
diff --git a/lib/unidecode/x056.py b/lib/unidecode/x056.py
new file mode 100644
index 00000000..30b7fa54
--- /dev/null
+++ b/lib/unidecode/x056.py
@@ -0,0 +1,258 @@
+data = (
+'Di ',    # 0x00
+'Qi ',    # 0x01
+'Jiao ',    # 0x02
+'Chong ',    # 0x03
+'Jiao ',    # 0x04
+'Kai ',    # 0x05
+'Tan ',    # 0x06
+'San ',    # 0x07
+'Cao ',    # 0x08
+'Jia ',    # 0x09
+'Ai ',    # 0x0a
+'Xiao ',    # 0x0b
+'Piao ',    # 0x0c
+'Lou ',    # 0x0d
+'Ga ',    # 0x0e
+'Gu ',    # 0x0f
+'Xiao ',    # 0x10
+'Hu ',    # 0x11
+'Hui ',    # 0x12
+'Guo ',    # 0x13
+'Ou ',    # 0x14
+'Xian ',    # 0x15
+'Ze ',    # 0x16
+'Chang ',    # 0x17
+'Xu ',    # 0x18
+'Po ',    # 0x19
+'De ',    # 0x1a
+'Ma ',    # 0x1b
+'Ma ',    # 0x1c
+'Hu ',    # 0x1d
+'Lei ',    # 0x1e
+'Du ',    # 0x1f
+'Ga ',    # 0x20
+'Tang ',    # 0x21
+'Ye ',    # 0x22
+'Beng ',    # 0x23
+'Ying ',    # 0x24
+'Saai ',    # 0x25
+'Jiao ',    # 0x26
+'Mi ',    # 0x27
+'Xiao ',    # 0x28
+'Hua ',    # 0x29
+'Mai ',    # 0x2a
+'Ran ',    # 0x2b
+'Zuo ',    # 0x2c
+'Peng ',    # 0x2d
+'Lao ',    # 0x2e
+'Xiao ',    # 0x2f
+'Ji ',    # 0x30
+'Zhu ',    # 0x31
+'Chao ',    # 0x32
+'Kui ',    # 0x33
+'Zui ',    # 0x34
+'Xiao ',    # 0x35
+'Si ',    # 0x36
+'Hao ',    # 0x37
+'Fu ',    # 0x38
+'Liao ',    # 0x39
+'Qiao ',    # 0x3a
+'Xi ',    # 0x3b
+'Xiu ',    # 0x3c
+'Tan ',    # 0x3d
+'Tan ',    # 0x3e
+'Mo ',    # 0x3f
+'Xun ',    # 0x40
+'E ',    # 0x41
+'Zun ',    # 0x42
+'Fan ',    # 0x43
+'Chi ',    # 0x44
+'Hui ',    # 0x45
+'Zan ',    # 0x46
+'Chuang ',    # 0x47
+'Cu ',    # 0x48
+'Dan ',    # 0x49
+'Yu ',    # 0x4a
+'Tun ',    # 0x4b
+'Cheng ',    # 0x4c
+'Jiao ',    # 0x4d
+'Ye ',    # 0x4e
+'Xi ',    # 0x4f
+'Qi ',    # 0x50
+'Hao ',    # 0x51
+'Lian ',    # 0x52
+'Xu ',    # 0x53
+'Deng ',    # 0x54
+'Hui ',    # 0x55
+'Yin ',    # 0x56
+'Pu ',    # 0x57
+'Jue ',    # 0x58
+'Qin ',    # 0x59
+'Xun ',    # 0x5a
+'Nie ',    # 0x5b
+'Lu ',    # 0x5c
+'Si ',    # 0x5d
+'Yan ',    # 0x5e
+'Ying ',    # 0x5f
+'Da ',    # 0x60
+'Dan ',    # 0x61
+'Yu ',    # 0x62
+'Zhou ',    # 0x63
+'Jin ',    # 0x64
+'Nong ',    # 0x65
+'Yue ',    # 0x66
+'Hui ',    # 0x67
+'Qi ',    # 0x68
+'E ',    # 0x69
+'Zao ',    # 0x6a
+'Yi ',    # 0x6b
+'Shi ',    # 0x6c
+'Jiao ',    # 0x6d
+'Yuan ',    # 0x6e
+'Ai ',    # 0x6f
+'Yong ',    # 0x70
+'Jue ',    # 0x71
+'Kuai ',    # 0x72
+'Yu ',    # 0x73
+'Pen ',    # 0x74
+'Dao ',    # 0x75
+'Ge ',    # 0x76
+'Xin ',    # 0x77
+'Dun ',    # 0x78
+'Dang ',    # 0x79
+'Sin ',    # 0x7a
+'Sai ',    # 0x7b
+'Pi ',    # 0x7c
+'Pi ',    # 0x7d
+'Yin ',    # 0x7e
+'Zui ',    # 0x7f
+'Ning ',    # 0x80
+'Di ',    # 0x81
+'Lan ',    # 0x82
+'Ta ',    # 0x83
+'Huo ',    # 0x84
+'Ru ',    # 0x85
+'Hao ',    # 0x86
+'Xia ',    # 0x87
+'Ya ',    # 0x88
+'Duo ',    # 0x89
+'Xi ',    # 0x8a
+'Chou ',    # 0x8b
+'Ji ',    # 0x8c
+'Jin ',    # 0x8d
+'Hao ',    # 0x8e
+'Ti ',    # 0x8f
+'Chang ',    # 0x90
+'[?] ',    # 0x91
+'[?] ',    # 0x92
+'Ca ',    # 0x93
+'Ti ',    # 0x94
+'Lu ',    # 0x95
+'Hui ',    # 0x96
+'Bo ',    # 0x97
+'You ',    # 0x98
+'Nie ',    # 0x99
+'Yin ',    # 0x9a
+'Hu ',    # 0x9b
+'Mo ',    # 0x9c
+'Huang ',    # 0x9d
+'Zhe ',    # 0x9e
+'Li ',    # 0x9f
+'Liu ',    # 0xa0
+'Haai ',    # 0xa1
+'Nang ',    # 0xa2
+'Xiao ',    # 0xa3
+'Mo ',    # 0xa4
+'Yan ',    # 0xa5
+'Li ',    # 0xa6
+'Lu ',    # 0xa7
+'Long ',    # 0xa8
+'Fu ',    # 0xa9
+'Dan ',    # 0xaa
+'Chen ',    # 0xab
+'Pin ',    # 0xac
+'Pi ',    # 0xad
+'Xiang ',    # 0xae
+'Huo ',    # 0xaf
+'Mo ',    # 0xb0
+'Xi ',    # 0xb1
+'Duo ',    # 0xb2
+'Ku ',    # 0xb3
+'Yan ',    # 0xb4
+'Chan ',    # 0xb5
+'Ying ',    # 0xb6
+'Rang ',    # 0xb7
+'Dian ',    # 0xb8
+'La ',    # 0xb9
+'Ta ',    # 0xba
+'Xiao ',    # 0xbb
+'Jiao ',    # 0xbc
+'Chuo ',    # 0xbd
+'Huan ',    # 0xbe
+'Huo ',    # 0xbf
+'Zhuan ',    # 0xc0
+'Nie ',    # 0xc1
+'Xiao ',    # 0xc2
+'Ca ',    # 0xc3
+'Li ',    # 0xc4
+'Chan ',    # 0xc5
+'Chai ',    # 0xc6
+'Li ',    # 0xc7
+'Yi ',    # 0xc8
+'Luo ',    # 0xc9
+'Nang ',    # 0xca
+'Zan ',    # 0xcb
+'Su ',    # 0xcc
+'Xi ',    # 0xcd
+'So ',    # 0xce
+'Jian ',    # 0xcf
+'Za ',    # 0xd0
+'Zhu ',    # 0xd1
+'Lan ',    # 0xd2
+'Nie ',    # 0xd3
+'Nang ',    # 0xd4
+'[?] ',    # 0xd5
+'[?] ',    # 0xd6
+'Wei ',    # 0xd7
+'Hui ',    # 0xd8
+'Yin ',    # 0xd9
+'Qiu ',    # 0xda
+'Si ',    # 0xdb
+'Nin ',    # 0xdc
+'Jian ',    # 0xdd
+'Hui ',    # 0xde
+'Xin ',    # 0xdf
+'Yin ',    # 0xe0
+'Nan ',    # 0xe1
+'Tuan ',    # 0xe2
+'Tuan ',    # 0xe3
+'Dun ',    # 0xe4
+'Kang ',    # 0xe5
+'Yuan ',    # 0xe6
+'Jiong ',    # 0xe7
+'Pian ',    # 0xe8
+'Yun ',    # 0xe9
+'Cong ',    # 0xea
+'Hu ',    # 0xeb
+'Hui ',    # 0xec
+'Yuan ',    # 0xed
+'You ',    # 0xee
+'Guo ',    # 0xef
+'Kun ',    # 0xf0
+'Cong ',    # 0xf1
+'Wei ',    # 0xf2
+'Tu ',    # 0xf3
+'Wei ',    # 0xf4
+'Lun ',    # 0xf5
+'Guo ',    # 0xf6
+'Qun ',    # 0xf7
+'Ri ',    # 0xf8
+'Ling ',    # 0xf9
+'Gu ',    # 0xfa
+'Guo ',    # 0xfb
+'Tai ',    # 0xfc
+'Guo ',    # 0xfd
+'Tu ',    # 0xfe
+'You ',    # 0xff
+)
diff --git a/lib/unidecode/x057.py b/lib/unidecode/x057.py
new file mode 100644
index 00000000..9392fb86
--- /dev/null
+++ b/lib/unidecode/x057.py
@@ -0,0 +1,258 @@
+data = (
+'Guo ',    # 0x00
+'Yin ',    # 0x01
+'Hun ',    # 0x02
+'Pu ',    # 0x03
+'Yu ',    # 0x04
+'Han ',    # 0x05
+'Yuan ',    # 0x06
+'Lun ',    # 0x07
+'Quan ',    # 0x08
+'Yu ',    # 0x09
+'Qing ',    # 0x0a
+'Guo ',    # 0x0b
+'Chuan ',    # 0x0c
+'Wei ',    # 0x0d
+'Yuan ',    # 0x0e
+'Quan ',    # 0x0f
+'Ku ',    # 0x10
+'Fu ',    # 0x11
+'Yuan ',    # 0x12
+'Yuan ',    # 0x13
+'E ',    # 0x14
+'Tu ',    # 0x15
+'Tu ',    # 0x16
+'Tu ',    # 0x17
+'Tuan ',    # 0x18
+'Lue ',    # 0x19
+'Hui ',    # 0x1a
+'Yi ',    # 0x1b
+'Yuan ',    # 0x1c
+'Luan ',    # 0x1d
+'Luan ',    # 0x1e
+'Tu ',    # 0x1f
+'Ya ',    # 0x20
+'Tu ',    # 0x21
+'Ting ',    # 0x22
+'Sheng ',    # 0x23
+'Pu ',    # 0x24
+'Lu ',    # 0x25
+'Iri ',    # 0x26
+'Ya ',    # 0x27
+'Zai ',    # 0x28
+'Wei ',    # 0x29
+'Ge ',    # 0x2a
+'Yu ',    # 0x2b
+'Wu ',    # 0x2c
+'Gui ',    # 0x2d
+'Pi ',    # 0x2e
+'Yi ',    # 0x2f
+'Di ',    # 0x30
+'Qian ',    # 0x31
+'Qian ',    # 0x32
+'Zhen ',    # 0x33
+'Zhuo ',    # 0x34
+'Dang ',    # 0x35
+'Qia ',    # 0x36
+'Akutsu ',    # 0x37
+'Yama ',    # 0x38
+'Kuang ',    # 0x39
+'Chang ',    # 0x3a
+'Qi ',    # 0x3b
+'Nie ',    # 0x3c
+'Mo ',    # 0x3d
+'Ji ',    # 0x3e
+'Jia ',    # 0x3f
+'Zhi ',    # 0x40
+'Zhi ',    # 0x41
+'Ban ',    # 0x42
+'Xun ',    # 0x43
+'Tou ',    # 0x44
+'Qin ',    # 0x45
+'Fen ',    # 0x46
+'Jun ',    # 0x47
+'Keng ',    # 0x48
+'Tun ',    # 0x49
+'Fang ',    # 0x4a
+'Fen ',    # 0x4b
+'Ben ',    # 0x4c
+'Tan ',    # 0x4d
+'Kan ',    # 0x4e
+'Pi ',    # 0x4f
+'Zuo ',    # 0x50
+'Keng ',    # 0x51
+'Bi ',    # 0x52
+'Xing ',    # 0x53
+'Di ',    # 0x54
+'Jing ',    # 0x55
+'Ji ',    # 0x56
+'Kuai ',    # 0x57
+'Di ',    # 0x58
+'Jing ',    # 0x59
+'Jian ',    # 0x5a
+'Tan ',    # 0x5b
+'Li ',    # 0x5c
+'Ba ',    # 0x5d
+'Wu ',    # 0x5e
+'Fen ',    # 0x5f
+'Zhui ',    # 0x60
+'Po ',    # 0x61
+'Pan ',    # 0x62
+'Tang ',    # 0x63
+'Kun ',    # 0x64
+'Qu ',    # 0x65
+'Tan ',    # 0x66
+'Zhi ',    # 0x67
+'Tuo ',    # 0x68
+'Gan ',    # 0x69
+'Ping ',    # 0x6a
+'Dian ',    # 0x6b
+'Gua ',    # 0x6c
+'Ni ',    # 0x6d
+'Tai ',    # 0x6e
+'Pi ',    # 0x6f
+'Jiong ',    # 0x70
+'Yang ',    # 0x71
+'Fo ',    # 0x72
+'Ao ',    # 0x73
+'Liu ',    # 0x74
+'Qiu ',    # 0x75
+'Mu ',    # 0x76
+'Ke ',    # 0x77
+'Gou ',    # 0x78
+'Xue ',    # 0x79
+'Ba ',    # 0x7a
+'Chi ',    # 0x7b
+'Che ',    # 0x7c
+'Ling ',    # 0x7d
+'Zhu ',    # 0x7e
+'Fu ',    # 0x7f
+'Hu ',    # 0x80
+'Zhi ',    # 0x81
+'Chui ',    # 0x82
+'La ',    # 0x83
+'Long ',    # 0x84
+'Long ',    # 0x85
+'Lu ',    # 0x86
+'Ao ',    # 0x87
+'Tay ',    # 0x88
+'Pao ',    # 0x89
+'[?] ',    # 0x8a
+'Xing ',    # 0x8b
+'Dong ',    # 0x8c
+'Ji ',    # 0x8d
+'Ke ',    # 0x8e
+'Lu ',    # 0x8f
+'Ci ',    # 0x90
+'Chi ',    # 0x91
+'Lei ',    # 0x92
+'Gai ',    # 0x93
+'Yin ',    # 0x94
+'Hou ',    # 0x95
+'Dui ',    # 0x96
+'Zhao ',    # 0x97
+'Fu ',    # 0x98
+'Guang ',    # 0x99
+'Yao ',    # 0x9a
+'Duo ',    # 0x9b
+'Duo ',    # 0x9c
+'Gui ',    # 0x9d
+'Cha ',    # 0x9e
+'Yang ',    # 0x9f
+'Yin ',    # 0xa0
+'Fa ',    # 0xa1
+'Gou ',    # 0xa2
+'Yuan ',    # 0xa3
+'Die ',    # 0xa4
+'Xie ',    # 0xa5
+'Ken ',    # 0xa6
+'Jiong ',    # 0xa7
+'Shou ',    # 0xa8
+'E ',    # 0xa9
+'Ha ',    # 0xaa
+'Dian ',    # 0xab
+'Hong ',    # 0xac
+'Wu ',    # 0xad
+'Kua ',    # 0xae
+'[?] ',    # 0xaf
+'Tao ',    # 0xb0
+'Dang ',    # 0xb1
+'Kai ',    # 0xb2
+'Gake ',    # 0xb3
+'Nao ',    # 0xb4
+'An ',    # 0xb5
+'Xing ',    # 0xb6
+'Xian ',    # 0xb7
+'Huan ',    # 0xb8
+'Bang ',    # 0xb9
+'Pei ',    # 0xba
+'Ba ',    # 0xbb
+'Yi ',    # 0xbc
+'Yin ',    # 0xbd
+'Han ',    # 0xbe
+'Xu ',    # 0xbf
+'Chui ',    # 0xc0
+'Cen ',    # 0xc1
+'Geng ',    # 0xc2
+'Ai ',    # 0xc3
+'Peng ',    # 0xc4
+'Fang ',    # 0xc5
+'Que ',    # 0xc6
+'Yong ',    # 0xc7
+'Xun ',    # 0xc8
+'Jia ',    # 0xc9
+'Di ',    # 0xca
+'Mai ',    # 0xcb
+'Lang ',    # 0xcc
+'Xuan ',    # 0xcd
+'Cheng ',    # 0xce
+'Yan ',    # 0xcf
+'Jin ',    # 0xd0
+'Zhe ',    # 0xd1
+'Lei ',    # 0xd2
+'Lie ',    # 0xd3
+'Bu ',    # 0xd4
+'Cheng ',    # 0xd5
+'Gomi ',    # 0xd6
+'Bu ',    # 0xd7
+'Shi ',    # 0xd8
+'Xun ',    # 0xd9
+'Guo ',    # 0xda
+'Jiong ',    # 0xdb
+'Ye ',    # 0xdc
+'Nian ',    # 0xdd
+'Di ',    # 0xde
+'Yu ',    # 0xdf
+'Bu ',    # 0xe0
+'Ya ',    # 0xe1
+'Juan ',    # 0xe2
+'Sui ',    # 0xe3
+'Pi ',    # 0xe4
+'Cheng ',    # 0xe5
+'Wan ',    # 0xe6
+'Ju ',    # 0xe7
+'Lun ',    # 0xe8
+'Zheng ',    # 0xe9
+'Kong ',    # 0xea
+'Chong ',    # 0xeb
+'Dong ',    # 0xec
+'Dai ',    # 0xed
+'Tan ',    # 0xee
+'An ',    # 0xef
+'Cai ',    # 0xf0
+'Shu ',    # 0xf1
+'Beng ',    # 0xf2
+'Kan ',    # 0xf3
+'Zhi ',    # 0xf4
+'Duo ',    # 0xf5
+'Yi ',    # 0xf6
+'Zhi ',    # 0xf7
+'Yi ',    # 0xf8
+'Pei ',    # 0xf9
+'Ji ',    # 0xfa
+'Zhun ',    # 0xfb
+'Qi ',    # 0xfc
+'Sao ',    # 0xfd
+'Ju ',    # 0xfe
+'Ni ',    # 0xff
+)
diff --git a/lib/unidecode/x058.py b/lib/unidecode/x058.py
new file mode 100644
index 00000000..88057182
--- /dev/null
+++ b/lib/unidecode/x058.py
@@ -0,0 +1,258 @@
+data = (
+'Ku ',    # 0x00
+'Ke ',    # 0x01
+'Tang ',    # 0x02
+'Kun ',    # 0x03
+'Ni ',    # 0x04
+'Jian ',    # 0x05
+'Dui ',    # 0x06
+'Jin ',    # 0x07
+'Gang ',    # 0x08
+'Yu ',    # 0x09
+'E ',    # 0x0a
+'Peng ',    # 0x0b
+'Gu ',    # 0x0c
+'Tu ',    # 0x0d
+'Leng ',    # 0x0e
+'[?] ',    # 0x0f
+'Ya ',    # 0x10
+'Qian ',    # 0x11
+'[?] ',    # 0x12
+'An ',    # 0x13
+'[?] ',    # 0x14
+'Duo ',    # 0x15
+'Nao ',    # 0x16
+'Tu ',    # 0x17
+'Cheng ',    # 0x18
+'Yin ',    # 0x19
+'Hun ',    # 0x1a
+'Bi ',    # 0x1b
+'Lian ',    # 0x1c
+'Guo ',    # 0x1d
+'Die ',    # 0x1e
+'Zhuan ',    # 0x1f
+'Hou ',    # 0x20
+'Bao ',    # 0x21
+'Bao ',    # 0x22
+'Yu ',    # 0x23
+'Di ',    # 0x24
+'Mao ',    # 0x25
+'Jie ',    # 0x26
+'Ruan ',    # 0x27
+'E ',    # 0x28
+'Geng ',    # 0x29
+'Kan ',    # 0x2a
+'Zong ',    # 0x2b
+'Yu ',    # 0x2c
+'Huang ',    # 0x2d
+'E ',    # 0x2e
+'Yao ',    # 0x2f
+'Yan ',    # 0x30
+'Bao ',    # 0x31
+'Ji ',    # 0x32
+'Mei ',    # 0x33
+'Chang ',    # 0x34
+'Du ',    # 0x35
+'Tuo ',    # 0x36
+'Yin ',    # 0x37
+'Feng ',    # 0x38
+'Zhong ',    # 0x39
+'Jie ',    # 0x3a
+'Zhen ',    # 0x3b
+'Feng ',    # 0x3c
+'Gang ',    # 0x3d
+'Chuan ',    # 0x3e
+'Jian ',    # 0x3f
+'Pyeng ',    # 0x40
+'Toride ',    # 0x41
+'Xiang ',    # 0x42
+'Huang ',    # 0x43
+'Leng ',    # 0x44
+'Duan ',    # 0x45
+'[?] ',    # 0x46
+'Xuan ',    # 0x47
+'Ji ',    # 0x48
+'Ji ',    # 0x49
+'Kuai ',    # 0x4a
+'Ying ',    # 0x4b
+'Ta ',    # 0x4c
+'Cheng ',    # 0x4d
+'Yong ',    # 0x4e
+'Kai ',    # 0x4f
+'Su ',    # 0x50
+'Su ',    # 0x51
+'Shi ',    # 0x52
+'Mi ',    # 0x53
+'Ta ',    # 0x54
+'Weng ',    # 0x55
+'Cheng ',    # 0x56
+'Tu ',    # 0x57
+'Tang ',    # 0x58
+'Que ',    # 0x59
+'Zhong ',    # 0x5a
+'Li ',    # 0x5b
+'Peng ',    # 0x5c
+'Bang ',    # 0x5d
+'Sai ',    # 0x5e
+'Zang ',    # 0x5f
+'Dui ',    # 0x60
+'Tian ',    # 0x61
+'Wu ',    # 0x62
+'Cheng ',    # 0x63
+'Xun ',    # 0x64
+'Ge ',    # 0x65
+'Zhen ',    # 0x66
+'Ai ',    # 0x67
+'Gong ',    # 0x68
+'Yan ',    # 0x69
+'Kan ',    # 0x6a
+'Tian ',    # 0x6b
+'Yuan ',    # 0x6c
+'Wen ',    # 0x6d
+'Xie ',    # 0x6e
+'Liu ',    # 0x6f
+'Ama ',    # 0x70
+'Lang ',    # 0x71
+'Chang ',    # 0x72
+'Peng ',    # 0x73
+'Beng ',    # 0x74
+'Chen ',    # 0x75
+'Cu ',    # 0x76
+'Lu ',    # 0x77
+'Ou ',    # 0x78
+'Qian ',    # 0x79
+'Mei ',    # 0x7a
+'Mo ',    # 0x7b
+'Zhuan ',    # 0x7c
+'Shuang ',    # 0x7d
+'Shu ',    # 0x7e
+'Lou ',    # 0x7f
+'Chi ',    # 0x80
+'Man ',    # 0x81
+'Biao ',    # 0x82
+'Jing ',    # 0x83
+'Qi ',    # 0x84
+'Shu ',    # 0x85
+'Di ',    # 0x86
+'Zhang ',    # 0x87
+'Kan ',    # 0x88
+'Yong ',    # 0x89
+'Dian ',    # 0x8a
+'Chen ',    # 0x8b
+'Zhi ',    # 0x8c
+'Xi ',    # 0x8d
+'Guo ',    # 0x8e
+'Qiang ',    # 0x8f
+'Jin ',    # 0x90
+'Di ',    # 0x91
+'Shang ',    # 0x92
+'Mu ',    # 0x93
+'Cui ',    # 0x94
+'Yan ',    # 0x95
+'Ta ',    # 0x96
+'Zeng ',    # 0x97
+'Qi ',    # 0x98
+'Qiang ',    # 0x99
+'Liang ',    # 0x9a
+'[?] ',    # 0x9b
+'Zhui ',    # 0x9c
+'Qiao ',    # 0x9d
+'Zeng ',    # 0x9e
+'Xu ',    # 0x9f
+'Shan ',    # 0xa0
+'Shan ',    # 0xa1
+'Ba ',    # 0xa2
+'Pu ',    # 0xa3
+'Kuai ',    # 0xa4
+'Dong ',    # 0xa5
+'Fan ',    # 0xa6
+'Que ',    # 0xa7
+'Mo ',    # 0xa8
+'Dun ',    # 0xa9
+'Dun ',    # 0xaa
+'Dun ',    # 0xab
+'Di ',    # 0xac
+'Sheng ',    # 0xad
+'Duo ',    # 0xae
+'Duo ',    # 0xaf
+'Tan ',    # 0xb0
+'Deng ',    # 0xb1
+'Wu ',    # 0xb2
+'Fen ',    # 0xb3
+'Huang ',    # 0xb4
+'Tan ',    # 0xb5
+'Da ',    # 0xb6
+'Ye ',    # 0xb7
+'Sho ',    # 0xb8
+'Mama ',    # 0xb9
+'Yu ',    # 0xba
+'Qiang ',    # 0xbb
+'Ji ',    # 0xbc
+'Qiao ',    # 0xbd
+'Ken ',    # 0xbe
+'Yi ',    # 0xbf
+'Pi ',    # 0xc0
+'Bi ',    # 0xc1
+'Dian ',    # 0xc2
+'Jiang ',    # 0xc3
+'Ye ',    # 0xc4
+'Yong ',    # 0xc5
+'Bo ',    # 0xc6
+'Tan ',    # 0xc7
+'Lan ',    # 0xc8
+'Ju ',    # 0xc9
+'Huai ',    # 0xca
+'Dang ',    # 0xcb
+'Rang ',    # 0xcc
+'Qian ',    # 0xcd
+'Xun ',    # 0xce
+'Lan ',    # 0xcf
+'Xi ',    # 0xd0
+'He ',    # 0xd1
+'Ai ',    # 0xd2
+'Ya ',    # 0xd3
+'Dao ',    # 0xd4
+'Hao ',    # 0xd5
+'Ruan ',    # 0xd6
+'Mama ',    # 0xd7
+'Lei ',    # 0xd8
+'Kuang ',    # 0xd9
+'Lu ',    # 0xda
+'Yan ',    # 0xdb
+'Tan ',    # 0xdc
+'Wei ',    # 0xdd
+'Huai ',    # 0xde
+'Long ',    # 0xdf
+'Long ',    # 0xe0
+'Rui ',    # 0xe1
+'Li ',    # 0xe2
+'Lin ',    # 0xe3
+'Rang ',    # 0xe4
+'Ten ',    # 0xe5
+'Xun ',    # 0xe6
+'Yan ',    # 0xe7
+'Lei ',    # 0xe8
+'Ba ',    # 0xe9
+'[?] ',    # 0xea
+'Shi ',    # 0xeb
+'Ren ',    # 0xec
+'[?] ',    # 0xed
+'Zhuang ',    # 0xee
+'Zhuang ',    # 0xef
+'Sheng ',    # 0xf0
+'Yi ',    # 0xf1
+'Mai ',    # 0xf2
+'Ke ',    # 0xf3
+'Zhu ',    # 0xf4
+'Zhuang ',    # 0xf5
+'Hu ',    # 0xf6
+'Hu ',    # 0xf7
+'Kun ',    # 0xf8
+'Yi ',    # 0xf9
+'Hu ',    # 0xfa
+'Xu ',    # 0xfb
+'Kun ',    # 0xfc
+'Shou ',    # 0xfd
+'Mang ',    # 0xfe
+'Zun ',    # 0xff
+)
diff --git a/lib/unidecode/x059.py b/lib/unidecode/x059.py
new file mode 100644
index 00000000..45966661
--- /dev/null
+++ b/lib/unidecode/x059.py
@@ -0,0 +1,258 @@
+data = (
+'Shou ',    # 0x00
+'Yi ',    # 0x01
+'Zhi ',    # 0x02
+'Gu ',    # 0x03
+'Chu ',    # 0x04
+'Jiang ',    # 0x05
+'Feng ',    # 0x06
+'Bei ',    # 0x07
+'Cay ',    # 0x08
+'Bian ',    # 0x09
+'Sui ',    # 0x0a
+'Qun ',    # 0x0b
+'Ling ',    # 0x0c
+'Fu ',    # 0x0d
+'Zuo ',    # 0x0e
+'Xia ',    # 0x0f
+'Xiong ',    # 0x10
+'[?] ',    # 0x11
+'Nao ',    # 0x12
+'Xia ',    # 0x13
+'Kui ',    # 0x14
+'Xi ',    # 0x15
+'Wai ',    # 0x16
+'Yuan ',    # 0x17
+'Mao ',    # 0x18
+'Su ',    # 0x19
+'Duo ',    # 0x1a
+'Duo ',    # 0x1b
+'Ye ',    # 0x1c
+'Qing ',    # 0x1d
+'Uys ',    # 0x1e
+'Gou ',    # 0x1f
+'Gou ',    # 0x20
+'Qi ',    # 0x21
+'Meng ',    # 0x22
+'Meng ',    # 0x23
+'Yin ',    # 0x24
+'Huo ',    # 0x25
+'Chen ',    # 0x26
+'Da ',    # 0x27
+'Ze ',    # 0x28
+'Tian ',    # 0x29
+'Tai ',    # 0x2a
+'Fu ',    # 0x2b
+'Guai ',    # 0x2c
+'Yao ',    # 0x2d
+'Yang ',    # 0x2e
+'Hang ',    # 0x2f
+'Gao ',    # 0x30
+'Shi ',    # 0x31
+'Ben ',    # 0x32
+'Tai ',    # 0x33
+'Tou ',    # 0x34
+'Yan ',    # 0x35
+'Bi ',    # 0x36
+'Yi ',    # 0x37
+'Kua ',    # 0x38
+'Jia ',    # 0x39
+'Duo ',    # 0x3a
+'Kwu ',    # 0x3b
+'Kuang ',    # 0x3c
+'Yun ',    # 0x3d
+'Jia ',    # 0x3e
+'Pa ',    # 0x3f
+'En ',    # 0x40
+'Lian ',    # 0x41
+'Huan ',    # 0x42
+'Di ',    # 0x43
+'Yan ',    # 0x44
+'Pao ',    # 0x45
+'Quan ',    # 0x46
+'Qi ',    # 0x47
+'Nai ',    # 0x48
+'Feng ',    # 0x49
+'Xie ',    # 0x4a
+'Fen ',    # 0x4b
+'Dian ',    # 0x4c
+'[?] ',    # 0x4d
+'Kui ',    # 0x4e
+'Zou ',    # 0x4f
+'Huan ',    # 0x50
+'Qi ',    # 0x51
+'Kai ',    # 0x52
+'Zha ',    # 0x53
+'Ben ',    # 0x54
+'Yi ',    # 0x55
+'Jiang ',    # 0x56
+'Tao ',    # 0x57
+'Zang ',    # 0x58
+'Ben ',    # 0x59
+'Xi ',    # 0x5a
+'Xiang ',    # 0x5b
+'Fei ',    # 0x5c
+'Diao ',    # 0x5d
+'Xun ',    # 0x5e
+'Keng ',    # 0x5f
+'Dian ',    # 0x60
+'Ao ',    # 0x61
+'She ',    # 0x62
+'Weng ',    # 0x63
+'Pan ',    # 0x64
+'Ao ',    # 0x65
+'Wu ',    # 0x66
+'Ao ',    # 0x67
+'Jiang ',    # 0x68
+'Lian ',    # 0x69
+'Duo ',    # 0x6a
+'Yun ',    # 0x6b
+'Jiang ',    # 0x6c
+'Shi ',    # 0x6d
+'Fen ',    # 0x6e
+'Huo ',    # 0x6f
+'Bi ',    # 0x70
+'Lian ',    # 0x71
+'Duo ',    # 0x72
+'Nu ',    # 0x73
+'Nu ',    # 0x74
+'Ding ',    # 0x75
+'Nai ',    # 0x76
+'Qian ',    # 0x77
+'Jian ',    # 0x78
+'Ta ',    # 0x79
+'Jiu ',    # 0x7a
+'Nan ',    # 0x7b
+'Cha ',    # 0x7c
+'Hao ',    # 0x7d
+'Xian ',    # 0x7e
+'Fan ',    # 0x7f
+'Ji ',    # 0x80
+'Shuo ',    # 0x81
+'Ru ',    # 0x82
+'Fei ',    # 0x83
+'Wang ',    # 0x84
+'Hong ',    # 0x85
+'Zhuang ',    # 0x86
+'Fu ',    # 0x87
+'Ma ',    # 0x88
+'Dan ',    # 0x89
+'Ren ',    # 0x8a
+'Fu ',    # 0x8b
+'Jing ',    # 0x8c
+'Yan ',    # 0x8d
+'Xie ',    # 0x8e
+'Wen ',    # 0x8f
+'Zhong ',    # 0x90
+'Pa ',    # 0x91
+'Du ',    # 0x92
+'Ji ',    # 0x93
+'Keng ',    # 0x94
+'Zhong ',    # 0x95
+'Yao ',    # 0x96
+'Jin ',    # 0x97
+'Yun ',    # 0x98
+'Miao ',    # 0x99
+'Pei ',    # 0x9a
+'Shi ',    # 0x9b
+'Yue ',    # 0x9c
+'Zhuang ',    # 0x9d
+'Niu ',    # 0x9e
+'Yan ',    # 0x9f
+'Na ',    # 0xa0
+'Xin ',    # 0xa1
+'Fen ',    # 0xa2
+'Bi ',    # 0xa3
+'Yu ',    # 0xa4
+'Tuo ',    # 0xa5
+'Feng ',    # 0xa6
+'Yuan ',    # 0xa7
+'Fang ',    # 0xa8
+'Wu ',    # 0xa9
+'Yu ',    # 0xaa
+'Gui ',    # 0xab
+'Du ',    # 0xac
+'Ba ',    # 0xad
+'Ni ',    # 0xae
+'Zhou ',    # 0xaf
+'Zhuo ',    # 0xb0
+'Zhao ',    # 0xb1
+'Da ',    # 0xb2
+'Nai ',    # 0xb3
+'Yuan ',    # 0xb4
+'Tou ',    # 0xb5
+'Xuan ',    # 0xb6
+'Zhi ',    # 0xb7
+'E ',    # 0xb8
+'Mei ',    # 0xb9
+'Mo ',    # 0xba
+'Qi ',    # 0xbb
+'Bi ',    # 0xbc
+'Shen ',    # 0xbd
+'Qie ',    # 0xbe
+'E ',    # 0xbf
+'He ',    # 0xc0
+'Xu ',    # 0xc1
+'Fa ',    # 0xc2
+'Zheng ',    # 0xc3
+'Min ',    # 0xc4
+'Ban ',    # 0xc5
+'Mu ',    # 0xc6
+'Fu ',    # 0xc7
+'Ling ',    # 0xc8
+'Zi ',    # 0xc9
+'Zi ',    # 0xca
+'Shi ',    # 0xcb
+'Ran ',    # 0xcc
+'Shan ',    # 0xcd
+'Yang ',    # 0xce
+'Man ',    # 0xcf
+'Jie ',    # 0xd0
+'Gu ',    # 0xd1
+'Si ',    # 0xd2
+'Xing ',    # 0xd3
+'Wei ',    # 0xd4
+'Zi ',    # 0xd5
+'Ju ',    # 0xd6
+'Shan ',    # 0xd7
+'Pin ',    # 0xd8
+'Ren ',    # 0xd9
+'Yao ',    # 0xda
+'Tong ',    # 0xdb
+'Jiang ',    # 0xdc
+'Shu ',    # 0xdd
+'Ji ',    # 0xde
+'Gai ',    # 0xdf
+'Shang ',    # 0xe0
+'Kuo ',    # 0xe1
+'Juan ',    # 0xe2
+'Jiao ',    # 0xe3
+'Gou ',    # 0xe4
+'Mu ',    # 0xe5
+'Jian ',    # 0xe6
+'Jian ',    # 0xe7
+'Yi ',    # 0xe8
+'Nian ',    # 0xe9
+'Zhi ',    # 0xea
+'Ji ',    # 0xeb
+'Ji ',    # 0xec
+'Xian ',    # 0xed
+'Heng ',    # 0xee
+'Guang ',    # 0xef
+'Jun ',    # 0xf0
+'Kua ',    # 0xf1
+'Yan ',    # 0xf2
+'Ming ',    # 0xf3
+'Lie ',    # 0xf4
+'Pei ',    # 0xf5
+'Yan ',    # 0xf6
+'You ',    # 0xf7
+'Yan ',    # 0xf8
+'Cha ',    # 0xf9
+'Shen ',    # 0xfa
+'Yin ',    # 0xfb
+'Chi ',    # 0xfc
+'Gui ',    # 0xfd
+'Quan ',    # 0xfe
+'Zi ',    # 0xff
+)
diff --git a/lib/unidecode/x05a.py b/lib/unidecode/x05a.py
new file mode 100644
index 00000000..be56e652
--- /dev/null
+++ b/lib/unidecode/x05a.py
@@ -0,0 +1,258 @@
+data = (
+'Song ',    # 0x00
+'Wei ',    # 0x01
+'Hong ',    # 0x02
+'Wa ',    # 0x03
+'Lou ',    # 0x04
+'Ya ',    # 0x05
+'Rao ',    # 0x06
+'Jiao ',    # 0x07
+'Luan ',    # 0x08
+'Ping ',    # 0x09
+'Xian ',    # 0x0a
+'Shao ',    # 0x0b
+'Li ',    # 0x0c
+'Cheng ',    # 0x0d
+'Xiao ',    # 0x0e
+'Mang ',    # 0x0f
+'Fu ',    # 0x10
+'Suo ',    # 0x11
+'Wu ',    # 0x12
+'Wei ',    # 0x13
+'Ke ',    # 0x14
+'Lai ',    # 0x15
+'Chuo ',    # 0x16
+'Ding ',    # 0x17
+'Niang ',    # 0x18
+'Xing ',    # 0x19
+'Nan ',    # 0x1a
+'Yu ',    # 0x1b
+'Nuo ',    # 0x1c
+'Pei ',    # 0x1d
+'Nei ',    # 0x1e
+'Juan ',    # 0x1f
+'Shen ',    # 0x20
+'Zhi ',    # 0x21
+'Han ',    # 0x22
+'Di ',    # 0x23
+'Zhuang ',    # 0x24
+'E ',    # 0x25
+'Pin ',    # 0x26
+'Tui ',    # 0x27
+'Han ',    # 0x28
+'Mian ',    # 0x29
+'Wu ',    # 0x2a
+'Yan ',    # 0x2b
+'Wu ',    # 0x2c
+'Xi ',    # 0x2d
+'Yan ',    # 0x2e
+'Yu ',    # 0x2f
+'Si ',    # 0x30
+'Yu ',    # 0x31
+'Wa ',    # 0x32
+'[?] ',    # 0x33
+'Xian ',    # 0x34
+'Ju ',    # 0x35
+'Qu ',    # 0x36
+'Shui ',    # 0x37
+'Qi ',    # 0x38
+'Xian ',    # 0x39
+'Zhui ',    # 0x3a
+'Dong ',    # 0x3b
+'Chang ',    # 0x3c
+'Lu ',    # 0x3d
+'Ai ',    # 0x3e
+'E ',    # 0x3f
+'E ',    # 0x40
+'Lou ',    # 0x41
+'Mian ',    # 0x42
+'Cong ',    # 0x43
+'Pou ',    # 0x44
+'Ju ',    # 0x45
+'Po ',    # 0x46
+'Cai ',    # 0x47
+'Ding ',    # 0x48
+'Wan ',    # 0x49
+'Biao ',    # 0x4a
+'Xiao ',    # 0x4b
+'Shu ',    # 0x4c
+'Qi ',    # 0x4d
+'Hui ',    # 0x4e
+'Fu ',    # 0x4f
+'E ',    # 0x50
+'Wo ',    # 0x51
+'Tan ',    # 0x52
+'Fei ',    # 0x53
+'Wei ',    # 0x54
+'Jie ',    # 0x55
+'Tian ',    # 0x56
+'Ni ',    # 0x57
+'Quan ',    # 0x58
+'Jing ',    # 0x59
+'Hun ',    # 0x5a
+'Jing ',    # 0x5b
+'Qian ',    # 0x5c
+'Dian ',    # 0x5d
+'Xing ',    # 0x5e
+'Hu ',    # 0x5f
+'Wa ',    # 0x60
+'Lai ',    # 0x61
+'Bi ',    # 0x62
+'Yin ',    # 0x63
+'Chou ',    # 0x64
+'Chuo ',    # 0x65
+'Fu ',    # 0x66
+'Jing ',    # 0x67
+'Lun ',    # 0x68
+'Yan ',    # 0x69
+'Lan ',    # 0x6a
+'Kun ',    # 0x6b
+'Yin ',    # 0x6c
+'Ya ',    # 0x6d
+'Ju ',    # 0x6e
+'Li ',    # 0x6f
+'Dian ',    # 0x70
+'Xian ',    # 0x71
+'Hwa ',    # 0x72
+'Hua ',    # 0x73
+'Ying ',    # 0x74
+'Chan ',    # 0x75
+'Shen ',    # 0x76
+'Ting ',    # 0x77
+'Dang ',    # 0x78
+'Yao ',    # 0x79
+'Wu ',    # 0x7a
+'Nan ',    # 0x7b
+'Ruo ',    # 0x7c
+'Jia ',    # 0x7d
+'Tou ',    # 0x7e
+'Xu ',    # 0x7f
+'Yu ',    # 0x80
+'Wei ',    # 0x81
+'Ti ',    # 0x82
+'Rou ',    # 0x83
+'Mei ',    # 0x84
+'Dan ',    # 0x85
+'Ruan ',    # 0x86
+'Qin ',    # 0x87
+'Hui ',    # 0x88
+'Wu ',    # 0x89
+'Qian ',    # 0x8a
+'Chun ',    # 0x8b
+'Mao ',    # 0x8c
+'Fu ',    # 0x8d
+'Jie ',    # 0x8e
+'Duan ',    # 0x8f
+'Xi ',    # 0x90
+'Zhong ',    # 0x91
+'Mei ',    # 0x92
+'Huang ',    # 0x93
+'Mian ',    # 0x94
+'An ',    # 0x95
+'Ying ',    # 0x96
+'Xuan ',    # 0x97
+'Jie ',    # 0x98
+'Wei ',    # 0x99
+'Mei ',    # 0x9a
+'Yuan ',    # 0x9b
+'Zhen ',    # 0x9c
+'Qiu ',    # 0x9d
+'Ti ',    # 0x9e
+'Xie ',    # 0x9f
+'Tuo ',    # 0xa0
+'Lian ',    # 0xa1
+'Mao ',    # 0xa2
+'Ran ',    # 0xa3
+'Si ',    # 0xa4
+'Pian ',    # 0xa5
+'Wei ',    # 0xa6
+'Wa ',    # 0xa7
+'Jiu ',    # 0xa8
+'Hu ',    # 0xa9
+'Ao ',    # 0xaa
+'[?] ',    # 0xab
+'Bou ',    # 0xac
+'Xu ',    # 0xad
+'Tou ',    # 0xae
+'Gui ',    # 0xaf
+'Zou ',    # 0xb0
+'Yao ',    # 0xb1
+'Pi ',    # 0xb2
+'Xi ',    # 0xb3
+'Yuan ',    # 0xb4
+'Ying ',    # 0xb5
+'Rong ',    # 0xb6
+'Ru ',    # 0xb7
+'Chi ',    # 0xb8
+'Liu ',    # 0xb9
+'Mei ',    # 0xba
+'Pan ',    # 0xbb
+'Ao ',    # 0xbc
+'Ma ',    # 0xbd
+'Gou ',    # 0xbe
+'Kui ',    # 0xbf
+'Qin ',    # 0xc0
+'Jia ',    # 0xc1
+'Sao ',    # 0xc2
+'Zhen ',    # 0xc3
+'Yuan ',    # 0xc4
+'Cha ',    # 0xc5
+'Yong ',    # 0xc6
+'Ming ',    # 0xc7
+'Ying ',    # 0xc8
+'Ji ',    # 0xc9
+'Su ',    # 0xca
+'Niao ',    # 0xcb
+'Xian ',    # 0xcc
+'Tao ',    # 0xcd
+'Pang ',    # 0xce
+'Lang ',    # 0xcf
+'Nao ',    # 0xd0
+'Bao ',    # 0xd1
+'Ai ',    # 0xd2
+'Pi ',    # 0xd3
+'Pin ',    # 0xd4
+'Yi ',    # 0xd5
+'Piao ',    # 0xd6
+'Yu ',    # 0xd7
+'Lei ',    # 0xd8
+'Xuan ',    # 0xd9
+'Man ',    # 0xda
+'Yi ',    # 0xdb
+'Zhang ',    # 0xdc
+'Kang ',    # 0xdd
+'Yong ',    # 0xde
+'Ni ',    # 0xdf
+'Li ',    # 0xe0
+'Di ',    # 0xe1
+'Gui ',    # 0xe2
+'Yan ',    # 0xe3
+'Jin ',    # 0xe4
+'Zhuan ',    # 0xe5
+'Chang ',    # 0xe6
+'Ce ',    # 0xe7
+'Han ',    # 0xe8
+'Nen ',    # 0xe9
+'Lao ',    # 0xea
+'Mo ',    # 0xeb
+'Zhe ',    # 0xec
+'Hu ',    # 0xed
+'Hu ',    # 0xee
+'Ao ',    # 0xef
+'Nen ',    # 0xf0
+'Qiang ',    # 0xf1
+'Ma ',    # 0xf2
+'Pie ',    # 0xf3
+'Gu ',    # 0xf4
+'Wu ',    # 0xf5
+'Jiao ',    # 0xf6
+'Tuo ',    # 0xf7
+'Zhan ',    # 0xf8
+'Mao ',    # 0xf9
+'Xian ',    # 0xfa
+'Xian ',    # 0xfb
+'Mo ',    # 0xfc
+'Liao ',    # 0xfd
+'Lian ',    # 0xfe
+'Hua ',    # 0xff
+)
diff --git a/lib/unidecode/x05b.py b/lib/unidecode/x05b.py
new file mode 100644
index 00000000..1b167b3e
--- /dev/null
+++ b/lib/unidecode/x05b.py
@@ -0,0 +1,258 @@
+data = (
+'Gui ',    # 0x00
+'Deng ',    # 0x01
+'Zhi ',    # 0x02
+'Xu ',    # 0x03
+'Yi ',    # 0x04
+'Hua ',    # 0x05
+'Xi ',    # 0x06
+'Hui ',    # 0x07
+'Rao ',    # 0x08
+'Xi ',    # 0x09
+'Yan ',    # 0x0a
+'Chan ',    # 0x0b
+'Jiao ',    # 0x0c
+'Mei ',    # 0x0d
+'Fan ',    # 0x0e
+'Fan ',    # 0x0f
+'Xian ',    # 0x10
+'Yi ',    # 0x11
+'Wei ',    # 0x12
+'Jiao ',    # 0x13
+'Fu ',    # 0x14
+'Shi ',    # 0x15
+'Bi ',    # 0x16
+'Shan ',    # 0x17
+'Sui ',    # 0x18
+'Qiang ',    # 0x19
+'Lian ',    # 0x1a
+'Huan ',    # 0x1b
+'Xin ',    # 0x1c
+'Niao ',    # 0x1d
+'Dong ',    # 0x1e
+'Yi ',    # 0x1f
+'Can ',    # 0x20
+'Ai ',    # 0x21
+'Niang ',    # 0x22
+'Neng ',    # 0x23
+'Ma ',    # 0x24
+'Tiao ',    # 0x25
+'Chou ',    # 0x26
+'Jin ',    # 0x27
+'Ci ',    # 0x28
+'Yu ',    # 0x29
+'Pin ',    # 0x2a
+'Yong ',    # 0x2b
+'Xu ',    # 0x2c
+'Nai ',    # 0x2d
+'Yan ',    # 0x2e
+'Tai ',    # 0x2f
+'Ying ',    # 0x30
+'Can ',    # 0x31
+'Niao ',    # 0x32
+'Wo ',    # 0x33
+'Ying ',    # 0x34
+'Mian ',    # 0x35
+'Kaka ',    # 0x36
+'Ma ',    # 0x37
+'Shen ',    # 0x38
+'Xing ',    # 0x39
+'Ni ',    # 0x3a
+'Du ',    # 0x3b
+'Liu ',    # 0x3c
+'Yuan ',    # 0x3d
+'Lan ',    # 0x3e
+'Yan ',    # 0x3f
+'Shuang ',    # 0x40
+'Ling ',    # 0x41
+'Jiao ',    # 0x42
+'Niang ',    # 0x43
+'Lan ',    # 0x44
+'Xian ',    # 0x45
+'Ying ',    # 0x46
+'Shuang ',    # 0x47
+'Shuai ',    # 0x48
+'Quan ',    # 0x49
+'Mi ',    # 0x4a
+'Li ',    # 0x4b
+'Luan ',    # 0x4c
+'Yan ',    # 0x4d
+'Zhu ',    # 0x4e
+'Lan ',    # 0x4f
+'Zi ',    # 0x50
+'Jie ',    # 0x51
+'Jue ',    # 0x52
+'Jue ',    # 0x53
+'Kong ',    # 0x54
+'Yun ',    # 0x55
+'Zi ',    # 0x56
+'Zi ',    # 0x57
+'Cun ',    # 0x58
+'Sun ',    # 0x59
+'Fu ',    # 0x5a
+'Bei ',    # 0x5b
+'Zi ',    # 0x5c
+'Xiao ',    # 0x5d
+'Xin ',    # 0x5e
+'Meng ',    # 0x5f
+'Si ',    # 0x60
+'Tai ',    # 0x61
+'Bao ',    # 0x62
+'Ji ',    # 0x63
+'Gu ',    # 0x64
+'Nu ',    # 0x65
+'Xue ',    # 0x66
+'[?] ',    # 0x67
+'Zhuan ',    # 0x68
+'Hai ',    # 0x69
+'Luan ',    # 0x6a
+'Sun ',    # 0x6b
+'Huai ',    # 0x6c
+'Mie ',    # 0x6d
+'Cong ',    # 0x6e
+'Qian ',    # 0x6f
+'Shu ',    # 0x70
+'Chan ',    # 0x71
+'Ya ',    # 0x72
+'Zi ',    # 0x73
+'Ni ',    # 0x74
+'Fu ',    # 0x75
+'Zi ',    # 0x76
+'Li ',    # 0x77
+'Xue ',    # 0x78
+'Bo ',    # 0x79
+'Ru ',    # 0x7a
+'Lai ',    # 0x7b
+'Nie ',    # 0x7c
+'Nie ',    # 0x7d
+'Ying ',    # 0x7e
+'Luan ',    # 0x7f
+'Mian ',    # 0x80
+'Zhu ',    # 0x81
+'Rong ',    # 0x82
+'Ta ',    # 0x83
+'Gui ',    # 0x84
+'Zhai ',    # 0x85
+'Qiong ',    # 0x86
+'Yu ',    # 0x87
+'Shou ',    # 0x88
+'An ',    # 0x89
+'Tu ',    # 0x8a
+'Song ',    # 0x8b
+'Wan ',    # 0x8c
+'Rou ',    # 0x8d
+'Yao ',    # 0x8e
+'Hong ',    # 0x8f
+'Yi ',    # 0x90
+'Jing ',    # 0x91
+'Zhun ',    # 0x92
+'Mi ',    # 0x93
+'Zhu ',    # 0x94
+'Dang ',    # 0x95
+'Hong ',    # 0x96
+'Zong ',    # 0x97
+'Guan ',    # 0x98
+'Zhou ',    # 0x99
+'Ding ',    # 0x9a
+'Wan ',    # 0x9b
+'Yi ',    # 0x9c
+'Bao ',    # 0x9d
+'Shi ',    # 0x9e
+'Shi ',    # 0x9f
+'Chong ',    # 0xa0
+'Shen ',    # 0xa1
+'Ke ',    # 0xa2
+'Xuan ',    # 0xa3
+'Shi ',    # 0xa4
+'You ',    # 0xa5
+'Huan ',    # 0xa6
+'Yi ',    # 0xa7
+'Tiao ',    # 0xa8
+'Shi ',    # 0xa9
+'Xian ',    # 0xaa
+'Gong ',    # 0xab
+'Cheng ',    # 0xac
+'Qun ',    # 0xad
+'Gong ',    # 0xae
+'Xiao ',    # 0xaf
+'Zai ',    # 0xb0
+'Zha ',    # 0xb1
+'Bao ',    # 0xb2
+'Hai ',    # 0xb3
+'Yan ',    # 0xb4
+'Xiao ',    # 0xb5
+'Jia ',    # 0xb6
+'Shen ',    # 0xb7
+'Chen ',    # 0xb8
+'Rong ',    # 0xb9
+'Huang ',    # 0xba
+'Mi ',    # 0xbb
+'Kou ',    # 0xbc
+'Kuan ',    # 0xbd
+'Bin ',    # 0xbe
+'Su ',    # 0xbf
+'Cai ',    # 0xc0
+'Zan ',    # 0xc1
+'Ji ',    # 0xc2
+'Yuan ',    # 0xc3
+'Ji ',    # 0xc4
+'Yin ',    # 0xc5
+'Mi ',    # 0xc6
+'Kou ',    # 0xc7
+'Qing ',    # 0xc8
+'Que ',    # 0xc9
+'Zhen ',    # 0xca
+'Jian ',    # 0xcb
+'Fu ',    # 0xcc
+'Ning ',    # 0xcd
+'Bing ',    # 0xce
+'Huan ',    # 0xcf
+'Mei ',    # 0xd0
+'Qin ',    # 0xd1
+'Han ',    # 0xd2
+'Yu ',    # 0xd3
+'Shi ',    # 0xd4
+'Ning ',    # 0xd5
+'Qin ',    # 0xd6
+'Ning ',    # 0xd7
+'Zhi ',    # 0xd8
+'Yu ',    # 0xd9
+'Bao ',    # 0xda
+'Kuan ',    # 0xdb
+'Ning ',    # 0xdc
+'Qin ',    # 0xdd
+'Mo ',    # 0xde
+'Cha ',    # 0xdf
+'Ju ',    # 0xe0
+'Gua ',    # 0xe1
+'Qin ',    # 0xe2
+'Hu ',    # 0xe3
+'Wu ',    # 0xe4
+'Liao ',    # 0xe5
+'Shi ',    # 0xe6
+'Zhu ',    # 0xe7
+'Zhai ',    # 0xe8
+'Shen ',    # 0xe9
+'Wei ',    # 0xea
+'Xie ',    # 0xeb
+'Kuan ',    # 0xec
+'Hui ',    # 0xed
+'Liao ',    # 0xee
+'Jun ',    # 0xef
+'Huan ',    # 0xf0
+'Yi ',    # 0xf1
+'Yi ',    # 0xf2
+'Bao ',    # 0xf3
+'Qin ',    # 0xf4
+'Chong ',    # 0xf5
+'Bao ',    # 0xf6
+'Feng ',    # 0xf7
+'Cun ',    # 0xf8
+'Dui ',    # 0xf9
+'Si ',    # 0xfa
+'Xun ',    # 0xfb
+'Dao ',    # 0xfc
+'Lu ',    # 0xfd
+'Dui ',    # 0xfe
+'Shou ',    # 0xff
+)
diff --git a/lib/unidecode/x05c.py b/lib/unidecode/x05c.py
new file mode 100644
index 00000000..62957e87
--- /dev/null
+++ b/lib/unidecode/x05c.py
@@ -0,0 +1,258 @@
+data = (
+'Po ',    # 0x00
+'Feng ',    # 0x01
+'Zhuan ',    # 0x02
+'Fu ',    # 0x03
+'She ',    # 0x04
+'Ke ',    # 0x05
+'Jiang ',    # 0x06
+'Jiang ',    # 0x07
+'Zhuan ',    # 0x08
+'Wei ',    # 0x09
+'Zun ',    # 0x0a
+'Xun ',    # 0x0b
+'Shu ',    # 0x0c
+'Dui ',    # 0x0d
+'Dao ',    # 0x0e
+'Xiao ',    # 0x0f
+'Ji ',    # 0x10
+'Shao ',    # 0x11
+'Er ',    # 0x12
+'Er ',    # 0x13
+'Er ',    # 0x14
+'Ga ',    # 0x15
+'Jian ',    # 0x16
+'Shu ',    # 0x17
+'Chen ',    # 0x18
+'Shang ',    # 0x19
+'Shang ',    # 0x1a
+'Mo ',    # 0x1b
+'Ga ',    # 0x1c
+'Chang ',    # 0x1d
+'Liao ',    # 0x1e
+'Xian ',    # 0x1f
+'Xian ',    # 0x20
+'[?] ',    # 0x21
+'Wang ',    # 0x22
+'Wang ',    # 0x23
+'You ',    # 0x24
+'Liao ',    # 0x25
+'Liao ',    # 0x26
+'Yao ',    # 0x27
+'Mang ',    # 0x28
+'Wang ',    # 0x29
+'Wang ',    # 0x2a
+'Wang ',    # 0x2b
+'Ga ',    # 0x2c
+'Yao ',    # 0x2d
+'Duo ',    # 0x2e
+'Kui ',    # 0x2f
+'Zhong ',    # 0x30
+'Jiu ',    # 0x31
+'Gan ',    # 0x32
+'Gu ',    # 0x33
+'Gan ',    # 0x34
+'Tui ',    # 0x35
+'Gan ',    # 0x36
+'Gan ',    # 0x37
+'Shi ',    # 0x38
+'Yin ',    # 0x39
+'Chi ',    # 0x3a
+'Kao ',    # 0x3b
+'Ni ',    # 0x3c
+'Jin ',    # 0x3d
+'Wei ',    # 0x3e
+'Niao ',    # 0x3f
+'Ju ',    # 0x40
+'Pi ',    # 0x41
+'Ceng ',    # 0x42
+'Xi ',    # 0x43
+'Bi ',    # 0x44
+'Ju ',    # 0x45
+'Jie ',    # 0x46
+'Tian ',    # 0x47
+'Qu ',    # 0x48
+'Ti ',    # 0x49
+'Jie ',    # 0x4a
+'Wu ',    # 0x4b
+'Diao ',    # 0x4c
+'Shi ',    # 0x4d
+'Shi ',    # 0x4e
+'Ping ',    # 0x4f
+'Ji ',    # 0x50
+'Xie ',    # 0x51
+'Chen ',    # 0x52
+'Xi ',    # 0x53
+'Ni ',    # 0x54
+'Zhan ',    # 0x55
+'Xi ',    # 0x56
+'[?] ',    # 0x57
+'Man ',    # 0x58
+'E ',    # 0x59
+'Lou ',    # 0x5a
+'Ping ',    # 0x5b
+'Ti ',    # 0x5c
+'Fei ',    # 0x5d
+'Shu ',    # 0x5e
+'Xie ',    # 0x5f
+'Tu ',    # 0x60
+'Lu ',    # 0x61
+'Lu ',    # 0x62
+'Xi ',    # 0x63
+'Ceng ',    # 0x64
+'Lu ',    # 0x65
+'Ju ',    # 0x66
+'Xie ',    # 0x67
+'Ju ',    # 0x68
+'Jue ',    # 0x69
+'Liao ',    # 0x6a
+'Jue ',    # 0x6b
+'Shu ',    # 0x6c
+'Xi ',    # 0x6d
+'Che ',    # 0x6e
+'Tun ',    # 0x6f
+'Ni ',    # 0x70
+'Shan ',    # 0x71
+'[?] ',    # 0x72
+'Xian ',    # 0x73
+'Li ',    # 0x74
+'Xue ',    # 0x75
+'Nata ',    # 0x76
+'[?] ',    # 0x77
+'Long ',    # 0x78
+'Yi ',    # 0x79
+'Qi ',    # 0x7a
+'Ren ',    # 0x7b
+'Wu ',    # 0x7c
+'Han ',    # 0x7d
+'Shen ',    # 0x7e
+'Yu ',    # 0x7f
+'Chu ',    # 0x80
+'Sui ',    # 0x81
+'Qi ',    # 0x82
+'[?] ',    # 0x83
+'Yue ',    # 0x84
+'Ban ',    # 0x85
+'Yao ',    # 0x86
+'Ang ',    # 0x87
+'Ya ',    # 0x88
+'Wu ',    # 0x89
+'Jie ',    # 0x8a
+'E ',    # 0x8b
+'Ji ',    # 0x8c
+'Qian ',    # 0x8d
+'Fen ',    # 0x8e
+'Yuan ',    # 0x8f
+'Qi ',    # 0x90
+'Cen ',    # 0x91
+'Qian ',    # 0x92
+'Qi ',    # 0x93
+'Cha ',    # 0x94
+'Jie ',    # 0x95
+'Qu ',    # 0x96
+'Gang ',    # 0x97
+'Xian ',    # 0x98
+'Ao ',    # 0x99
+'Lan ',    # 0x9a
+'Dao ',    # 0x9b
+'Ba ',    # 0x9c
+'Zuo ',    # 0x9d
+'Zuo ',    # 0x9e
+'Yang ',    # 0x9f
+'Ju ',    # 0xa0
+'Gang ',    # 0xa1
+'Ke ',    # 0xa2
+'Gou ',    # 0xa3
+'Xue ',    # 0xa4
+'Bei ',    # 0xa5
+'Li ',    # 0xa6
+'Tiao ',    # 0xa7
+'Ju ',    # 0xa8
+'Yan ',    # 0xa9
+'Fu ',    # 0xaa
+'Xiu ',    # 0xab
+'Jia ',    # 0xac
+'Ling ',    # 0xad
+'Tuo ',    # 0xae
+'Pei ',    # 0xaf
+'You ',    # 0xb0
+'Dai ',    # 0xb1
+'Kuang ',    # 0xb2
+'Yue ',    # 0xb3
+'Qu ',    # 0xb4
+'Hu ',    # 0xb5
+'Po ',    # 0xb6
+'Min ',    # 0xb7
+'An ',    # 0xb8
+'Tiao ',    # 0xb9
+'Ling ',    # 0xba
+'Chi ',    # 0xbb
+'Yuri ',    # 0xbc
+'Dong ',    # 0xbd
+'Cem ',    # 0xbe
+'Kui ',    # 0xbf
+'Xiu ',    # 0xc0
+'Mao ',    # 0xc1
+'Tong ',    # 0xc2
+'Xue ',    # 0xc3
+'Yi ',    # 0xc4
+'Kura ',    # 0xc5
+'He ',    # 0xc6
+'Ke ',    # 0xc7
+'Luo ',    # 0xc8
+'E ',    # 0xc9
+'Fu ',    # 0xca
+'Xun ',    # 0xcb
+'Die ',    # 0xcc
+'Lu ',    # 0xcd
+'An ',    # 0xce
+'Er ',    # 0xcf
+'Gai ',    # 0xd0
+'Quan ',    # 0xd1
+'Tong ',    # 0xd2
+'Yi ',    # 0xd3
+'Mu ',    # 0xd4
+'Shi ',    # 0xd5
+'An ',    # 0xd6
+'Wei ',    # 0xd7
+'Hu ',    # 0xd8
+'Zhi ',    # 0xd9
+'Mi ',    # 0xda
+'Li ',    # 0xdb
+'Ji ',    # 0xdc
+'Tong ',    # 0xdd
+'Wei ',    # 0xde
+'You ',    # 0xdf
+'Sang ',    # 0xe0
+'Xia ',    # 0xe1
+'Li ',    # 0xe2
+'Yao ',    # 0xe3
+'Jiao ',    # 0xe4
+'Zheng ',    # 0xe5
+'Luan ',    # 0xe6
+'Jiao ',    # 0xe7
+'E ',    # 0xe8
+'E ',    # 0xe9
+'Yu ',    # 0xea
+'Ye ',    # 0xeb
+'Bu ',    # 0xec
+'Qiao ',    # 0xed
+'Qun ',    # 0xee
+'Feng ',    # 0xef
+'Feng ',    # 0xf0
+'Nao ',    # 0xf1
+'Li ',    # 0xf2
+'You ',    # 0xf3
+'Xian ',    # 0xf4
+'Hong ',    # 0xf5
+'Dao ',    # 0xf6
+'Shen ',    # 0xf7
+'Cheng ',    # 0xf8
+'Tu ',    # 0xf9
+'Geng ',    # 0xfa
+'Jun ',    # 0xfb
+'Hao ',    # 0xfc
+'Xia ',    # 0xfd
+'Yin ',    # 0xfe
+'Yu ',    # 0xff
+)
diff --git a/lib/unidecode/x05d.py b/lib/unidecode/x05d.py
new file mode 100644
index 00000000..c85032aa
--- /dev/null
+++ b/lib/unidecode/x05d.py
@@ -0,0 +1,258 @@
+data = (
+'Lang ',    # 0x00
+'Kan ',    # 0x01
+'Lao ',    # 0x02
+'Lai ',    # 0x03
+'Xian ',    # 0x04
+'Que ',    # 0x05
+'Kong ',    # 0x06
+'Chong ',    # 0x07
+'Chong ',    # 0x08
+'Ta ',    # 0x09
+'Lin ',    # 0x0a
+'Hua ',    # 0x0b
+'Ju ',    # 0x0c
+'Lai ',    # 0x0d
+'Qi ',    # 0x0e
+'Min ',    # 0x0f
+'Kun ',    # 0x10
+'Kun ',    # 0x11
+'Zu ',    # 0x12
+'Gu ',    # 0x13
+'Cui ',    # 0x14
+'Ya ',    # 0x15
+'Ya ',    # 0x16
+'Gang ',    # 0x17
+'Lun ',    # 0x18
+'Lun ',    # 0x19
+'Leng ',    # 0x1a
+'Jue ',    # 0x1b
+'Duo ',    # 0x1c
+'Zheng ',    # 0x1d
+'Guo ',    # 0x1e
+'Yin ',    # 0x1f
+'Dong ',    # 0x20
+'Han ',    # 0x21
+'Zheng ',    # 0x22
+'Wei ',    # 0x23
+'Yao ',    # 0x24
+'Pi ',    # 0x25
+'Yan ',    # 0x26
+'Song ',    # 0x27
+'Jie ',    # 0x28
+'Beng ',    # 0x29
+'Zu ',    # 0x2a
+'Jue ',    # 0x2b
+'Dong ',    # 0x2c
+'Zhan ',    # 0x2d
+'Gu ',    # 0x2e
+'Yin ',    # 0x2f
+'[?] ',    # 0x30
+'Ze ',    # 0x31
+'Huang ',    # 0x32
+'Yu ',    # 0x33
+'Wei ',    # 0x34
+'Yang ',    # 0x35
+'Feng ',    # 0x36
+'Qiu ',    # 0x37
+'Dun ',    # 0x38
+'Ti ',    # 0x39
+'Yi ',    # 0x3a
+'Zhi ',    # 0x3b
+'Shi ',    # 0x3c
+'Zai ',    # 0x3d
+'Yao ',    # 0x3e
+'E ',    # 0x3f
+'Zhu ',    # 0x40
+'Kan ',    # 0x41
+'Lu ',    # 0x42
+'Yan ',    # 0x43
+'Mei ',    # 0x44
+'Gan ',    # 0x45
+'Ji ',    # 0x46
+'Ji ',    # 0x47
+'Huan ',    # 0x48
+'Ting ',    # 0x49
+'Sheng ',    # 0x4a
+'Mei ',    # 0x4b
+'Qian ',    # 0x4c
+'Wu ',    # 0x4d
+'Yu ',    # 0x4e
+'Zong ',    # 0x4f
+'Lan ',    # 0x50
+'Jue ',    # 0x51
+'Yan ',    # 0x52
+'Yan ',    # 0x53
+'Wei ',    # 0x54
+'Zong ',    # 0x55
+'Cha ',    # 0x56
+'Sui ',    # 0x57
+'Rong ',    # 0x58
+'Yamashina ',    # 0x59
+'Qin ',    # 0x5a
+'Yu ',    # 0x5b
+'Kewashii ',    # 0x5c
+'Lou ',    # 0x5d
+'Tu ',    # 0x5e
+'Dui ',    # 0x5f
+'Xi ',    # 0x60
+'Weng ',    # 0x61
+'Cang ',    # 0x62
+'Dang ',    # 0x63
+'Hong ',    # 0x64
+'Jie ',    # 0x65
+'Ai ',    # 0x66
+'Liu ',    # 0x67
+'Wu ',    # 0x68
+'Song ',    # 0x69
+'Qiao ',    # 0x6a
+'Zi ',    # 0x6b
+'Wei ',    # 0x6c
+'Beng ',    # 0x6d
+'Dian ',    # 0x6e
+'Cuo ',    # 0x6f
+'Qian ',    # 0x70
+'Yong ',    # 0x71
+'Nie ',    # 0x72
+'Cuo ',    # 0x73
+'Ji ',    # 0x74
+'[?] ',    # 0x75
+'Tao ',    # 0x76
+'Song ',    # 0x77
+'Zong ',    # 0x78
+'Jiang ',    # 0x79
+'Liao ',    # 0x7a
+'Kang ',    # 0x7b
+'Chan ',    # 0x7c
+'Die ',    # 0x7d
+'Cen ',    # 0x7e
+'Ding ',    # 0x7f
+'Tu ',    # 0x80
+'Lou ',    # 0x81
+'Zhang ',    # 0x82
+'Zhan ',    # 0x83
+'Zhan ',    # 0x84
+'Ao ',    # 0x85
+'Cao ',    # 0x86
+'Qu ',    # 0x87
+'Qiang ',    # 0x88
+'Zui ',    # 0x89
+'Zui ',    # 0x8a
+'Dao ',    # 0x8b
+'Dao ',    # 0x8c
+'Xi ',    # 0x8d
+'Yu ',    # 0x8e
+'Bo ',    # 0x8f
+'Long ',    # 0x90
+'Xiang ',    # 0x91
+'Ceng ',    # 0x92
+'Bo ',    # 0x93
+'Qin ',    # 0x94
+'Jiao ',    # 0x95
+'Yan ',    # 0x96
+'Lao ',    # 0x97
+'Zhan ',    # 0x98
+'Lin ',    # 0x99
+'Liao ',    # 0x9a
+'Liao ',    # 0x9b
+'Jin ',    # 0x9c
+'Deng ',    # 0x9d
+'Duo ',    # 0x9e
+'Zun ',    # 0x9f
+'Jiao ',    # 0xa0
+'Gui ',    # 0xa1
+'Yao ',    # 0xa2
+'Qiao ',    # 0xa3
+'Yao ',    # 0xa4
+'Jue ',    # 0xa5
+'Zhan ',    # 0xa6
+'Yi ',    # 0xa7
+'Xue ',    # 0xa8
+'Nao ',    # 0xa9
+'Ye ',    # 0xaa
+'Ye ',    # 0xab
+'Yi ',    # 0xac
+'E ',    # 0xad
+'Xian ',    # 0xae
+'Ji ',    # 0xaf
+'Xie ',    # 0xb0
+'Ke ',    # 0xb1
+'Xi ',    # 0xb2
+'Di ',    # 0xb3
+'Ao ',    # 0xb4
+'Zui ',    # 0xb5
+'[?] ',    # 0xb6
+'Ni ',    # 0xb7
+'Rong ',    # 0xb8
+'Dao ',    # 0xb9
+'Ling ',    # 0xba
+'Za ',    # 0xbb
+'Yu ',    # 0xbc
+'Yue ',    # 0xbd
+'Yin ',    # 0xbe
+'[?] ',    # 0xbf
+'Jie ',    # 0xc0
+'Li ',    # 0xc1
+'Sui ',    # 0xc2
+'Long ',    # 0xc3
+'Long ',    # 0xc4
+'Dian ',    # 0xc5
+'Ying ',    # 0xc6
+'Xi ',    # 0xc7
+'Ju ',    # 0xc8
+'Chan ',    # 0xc9
+'Ying ',    # 0xca
+'Kui ',    # 0xcb
+'Yan ',    # 0xcc
+'Wei ',    # 0xcd
+'Nao ',    # 0xce
+'Quan ',    # 0xcf
+'Chao ',    # 0xd0
+'Cuan ',    # 0xd1
+'Luan ',    # 0xd2
+'Dian ',    # 0xd3
+'Dian ',    # 0xd4
+'[?] ',    # 0xd5
+'Yan ',    # 0xd6
+'Yan ',    # 0xd7
+'Yan ',    # 0xd8
+'Nao ',    # 0xd9
+'Yan ',    # 0xda
+'Chuan ',    # 0xdb
+'Gui ',    # 0xdc
+'Chuan ',    # 0xdd
+'Zhou ',    # 0xde
+'Huang ',    # 0xdf
+'Jing ',    # 0xe0
+'Xun ',    # 0xe1
+'Chao ',    # 0xe2
+'Chao ',    # 0xe3
+'Lie ',    # 0xe4
+'Gong ',    # 0xe5
+'Zuo ',    # 0xe6
+'Qiao ',    # 0xe7
+'Ju ',    # 0xe8
+'Gong ',    # 0xe9
+'Kek ',    # 0xea
+'Wu ',    # 0xeb
+'Pwu ',    # 0xec
+'Pwu ',    # 0xed
+'Chai ',    # 0xee
+'Qiu ',    # 0xef
+'Qiu ',    # 0xf0
+'Ji ',    # 0xf1
+'Yi ',    # 0xf2
+'Si ',    # 0xf3
+'Ba ',    # 0xf4
+'Zhi ',    # 0xf5
+'Zhao ',    # 0xf6
+'Xiang ',    # 0xf7
+'Yi ',    # 0xf8
+'Jin ',    # 0xf9
+'Xun ',    # 0xfa
+'Juan ',    # 0xfb
+'Phas ',    # 0xfc
+'Xun ',    # 0xfd
+'Jin ',    # 0xfe
+'Fu ',    # 0xff
+)
diff --git a/lib/unidecode/x05e.py b/lib/unidecode/x05e.py
new file mode 100644
index 00000000..af879280
--- /dev/null
+++ b/lib/unidecode/x05e.py
@@ -0,0 +1,258 @@
+data = (
+'Za ',    # 0x00
+'Bi ',    # 0x01
+'Shi ',    # 0x02
+'Bu ',    # 0x03
+'Ding ',    # 0x04
+'Shuai ',    # 0x05
+'Fan ',    # 0x06
+'Nie ',    # 0x07
+'Shi ',    # 0x08
+'Fen ',    # 0x09
+'Pa ',    # 0x0a
+'Zhi ',    # 0x0b
+'Xi ',    # 0x0c
+'Hu ',    # 0x0d
+'Dan ',    # 0x0e
+'Wei ',    # 0x0f
+'Zhang ',    # 0x10
+'Tang ',    # 0x11
+'Dai ',    # 0x12
+'Ma ',    # 0x13
+'Pei ',    # 0x14
+'Pa ',    # 0x15
+'Tie ',    # 0x16
+'Fu ',    # 0x17
+'Lian ',    # 0x18
+'Zhi ',    # 0x19
+'Zhou ',    # 0x1a
+'Bo ',    # 0x1b
+'Zhi ',    # 0x1c
+'Di ',    # 0x1d
+'Mo ',    # 0x1e
+'Yi ',    # 0x1f
+'Yi ',    # 0x20
+'Ping ',    # 0x21
+'Qia ',    # 0x22
+'Juan ',    # 0x23
+'Ru ',    # 0x24
+'Shuai ',    # 0x25
+'Dai ',    # 0x26
+'Zheng ',    # 0x27
+'Shui ',    # 0x28
+'Qiao ',    # 0x29
+'Zhen ',    # 0x2a
+'Shi ',    # 0x2b
+'Qun ',    # 0x2c
+'Xi ',    # 0x2d
+'Bang ',    # 0x2e
+'Dai ',    # 0x2f
+'Gui ',    # 0x30
+'Chou ',    # 0x31
+'Ping ',    # 0x32
+'Zhang ',    # 0x33
+'Sha ',    # 0x34
+'Wan ',    # 0x35
+'Dai ',    # 0x36
+'Wei ',    # 0x37
+'Chang ',    # 0x38
+'Sha ',    # 0x39
+'Qi ',    # 0x3a
+'Ze ',    # 0x3b
+'Guo ',    # 0x3c
+'Mao ',    # 0x3d
+'Du ',    # 0x3e
+'Hou ',    # 0x3f
+'Zheng ',    # 0x40
+'Xu ',    # 0x41
+'Mi ',    # 0x42
+'Wei ',    # 0x43
+'Wo ',    # 0x44
+'Fu ',    # 0x45
+'Yi ',    # 0x46
+'Bang ',    # 0x47
+'Ping ',    # 0x48
+'Tazuna ',    # 0x49
+'Gong ',    # 0x4a
+'Pan ',    # 0x4b
+'Huang ',    # 0x4c
+'Dao ',    # 0x4d
+'Mi ',    # 0x4e
+'Jia ',    # 0x4f
+'Teng ',    # 0x50
+'Hui ',    # 0x51
+'Zhong ',    # 0x52
+'Shan ',    # 0x53
+'Man ',    # 0x54
+'Mu ',    # 0x55
+'Biao ',    # 0x56
+'Guo ',    # 0x57
+'Ze ',    # 0x58
+'Mu ',    # 0x59
+'Bang ',    # 0x5a
+'Zhang ',    # 0x5b
+'Jiong ',    # 0x5c
+'Chan ',    # 0x5d
+'Fu ',    # 0x5e
+'Zhi ',    # 0x5f
+'Hu ',    # 0x60
+'Fan ',    # 0x61
+'Chuang ',    # 0x62
+'Bi ',    # 0x63
+'Hei ',    # 0x64
+'[?] ',    # 0x65
+'Mi ',    # 0x66
+'Qiao ',    # 0x67
+'Chan ',    # 0x68
+'Fen ',    # 0x69
+'Meng ',    # 0x6a
+'Bang ',    # 0x6b
+'Chou ',    # 0x6c
+'Mie ',    # 0x6d
+'Chu ',    # 0x6e
+'Jie ',    # 0x6f
+'Xian ',    # 0x70
+'Lan ',    # 0x71
+'Gan ',    # 0x72
+'Ping ',    # 0x73
+'Nian ',    # 0x74
+'Qian ',    # 0x75
+'Bing ',    # 0x76
+'Bing ',    # 0x77
+'Xing ',    # 0x78
+'Gan ',    # 0x79
+'Yao ',    # 0x7a
+'Huan ',    # 0x7b
+'You ',    # 0x7c
+'You ',    # 0x7d
+'Ji ',    # 0x7e
+'Yan ',    # 0x7f
+'Pi ',    # 0x80
+'Ting ',    # 0x81
+'Ze ',    # 0x82
+'Guang ',    # 0x83
+'Zhuang ',    # 0x84
+'Mo ',    # 0x85
+'Qing ',    # 0x86
+'Bi ',    # 0x87
+'Qin ',    # 0x88
+'Dun ',    # 0x89
+'Chuang ',    # 0x8a
+'Gui ',    # 0x8b
+'Ya ',    # 0x8c
+'Bai ',    # 0x8d
+'Jie ',    # 0x8e
+'Xu ',    # 0x8f
+'Lu ',    # 0x90
+'Wu ',    # 0x91
+'[?] ',    # 0x92
+'Ku ',    # 0x93
+'Ying ',    # 0x94
+'Di ',    # 0x95
+'Pao ',    # 0x96
+'Dian ',    # 0x97
+'Ya ',    # 0x98
+'Miao ',    # 0x99
+'Geng ',    # 0x9a
+'Ci ',    # 0x9b
+'Fu ',    # 0x9c
+'Tong ',    # 0x9d
+'Pang ',    # 0x9e
+'Fei ',    # 0x9f
+'Xiang ',    # 0xa0
+'Yi ',    # 0xa1
+'Zhi ',    # 0xa2
+'Tiao ',    # 0xa3
+'Zhi ',    # 0xa4
+'Xiu ',    # 0xa5
+'Du ',    # 0xa6
+'Zuo ',    # 0xa7
+'Xiao ',    # 0xa8
+'Tu ',    # 0xa9
+'Gui ',    # 0xaa
+'Ku ',    # 0xab
+'Pang ',    # 0xac
+'Ting ',    # 0xad
+'You ',    # 0xae
+'Bu ',    # 0xaf
+'Ding ',    # 0xb0
+'Cheng ',    # 0xb1
+'Lai ',    # 0xb2
+'Bei ',    # 0xb3
+'Ji ',    # 0xb4
+'An ',    # 0xb5
+'Shu ',    # 0xb6
+'Kang ',    # 0xb7
+'Yong ',    # 0xb8
+'Tuo ',    # 0xb9
+'Song ',    # 0xba
+'Shu ',    # 0xbb
+'Qing ',    # 0xbc
+'Yu ',    # 0xbd
+'Yu ',    # 0xbe
+'Miao ',    # 0xbf
+'Sou ',    # 0xc0
+'Ce ',    # 0xc1
+'Xiang ',    # 0xc2
+'Fei ',    # 0xc3
+'Jiu ',    # 0xc4
+'He ',    # 0xc5
+'Hui ',    # 0xc6
+'Liu ',    # 0xc7
+'Sha ',    # 0xc8
+'Lian ',    # 0xc9
+'Lang ',    # 0xca
+'Sou ',    # 0xcb
+'Jian ',    # 0xcc
+'Pou ',    # 0xcd
+'Qing ',    # 0xce
+'Jiu ',    # 0xcf
+'Jiu ',    # 0xd0
+'Qin ',    # 0xd1
+'Ao ',    # 0xd2
+'Kuo ',    # 0xd3
+'Lou ',    # 0xd4
+'Yin ',    # 0xd5
+'Liao ',    # 0xd6
+'Dai ',    # 0xd7
+'Lu ',    # 0xd8
+'Yi ',    # 0xd9
+'Chu ',    # 0xda
+'Chan ',    # 0xdb
+'Tu ',    # 0xdc
+'Si ',    # 0xdd
+'Xin ',    # 0xde
+'Miao ',    # 0xdf
+'Chang ',    # 0xe0
+'Wu ',    # 0xe1
+'Fei ',    # 0xe2
+'Guang ',    # 0xe3
+'Koc ',    # 0xe4
+'Kuai ',    # 0xe5
+'Bi ',    # 0xe6
+'Qiang ',    # 0xe7
+'Xie ',    # 0xe8
+'Lin ',    # 0xe9
+'Lin ',    # 0xea
+'Liao ',    # 0xeb
+'Lu ',    # 0xec
+'[?] ',    # 0xed
+'Ying ',    # 0xee
+'Xian ',    # 0xef
+'Ting ',    # 0xf0
+'Yong ',    # 0xf1
+'Li ',    # 0xf2
+'Ting ',    # 0xf3
+'Yin ',    # 0xf4
+'Xun ',    # 0xf5
+'Yan ',    # 0xf6
+'Ting ',    # 0xf7
+'Di ',    # 0xf8
+'Po ',    # 0xf9
+'Jian ',    # 0xfa
+'Hui ',    # 0xfb
+'Nai ',    # 0xfc
+'Hui ',    # 0xfd
+'Gong ',    # 0xfe
+'Nian ',    # 0xff
+)
diff --git a/lib/unidecode/x05f.py b/lib/unidecode/x05f.py
new file mode 100644
index 00000000..032eab89
--- /dev/null
+++ b/lib/unidecode/x05f.py
@@ -0,0 +1,258 @@
+data = (
+'Kai ',    # 0x00
+'Bian ',    # 0x01
+'Yi ',    # 0x02
+'Qi ',    # 0x03
+'Nong ',    # 0x04
+'Fen ',    # 0x05
+'Ju ',    # 0x06
+'Yan ',    # 0x07
+'Yi ',    # 0x08
+'Zang ',    # 0x09
+'Bi ',    # 0x0a
+'Yi ',    # 0x0b
+'Yi ',    # 0x0c
+'Er ',    # 0x0d
+'San ',    # 0x0e
+'Shi ',    # 0x0f
+'Er ',    # 0x10
+'Shi ',    # 0x11
+'Shi ',    # 0x12
+'Gong ',    # 0x13
+'Diao ',    # 0x14
+'Yin ',    # 0x15
+'Hu ',    # 0x16
+'Fu ',    # 0x17
+'Hong ',    # 0x18
+'Wu ',    # 0x19
+'Tui ',    # 0x1a
+'Chi ',    # 0x1b
+'Jiang ',    # 0x1c
+'Ba ',    # 0x1d
+'Shen ',    # 0x1e
+'Di ',    # 0x1f
+'Zhang ',    # 0x20
+'Jue ',    # 0x21
+'Tao ',    # 0x22
+'Fu ',    # 0x23
+'Di ',    # 0x24
+'Mi ',    # 0x25
+'Xian ',    # 0x26
+'Hu ',    # 0x27
+'Chao ',    # 0x28
+'Nu ',    # 0x29
+'Jing ',    # 0x2a
+'Zhen ',    # 0x2b
+'Yi ',    # 0x2c
+'Mi ',    # 0x2d
+'Quan ',    # 0x2e
+'Wan ',    # 0x2f
+'Shao ',    # 0x30
+'Ruo ',    # 0x31
+'Xuan ',    # 0x32
+'Jing ',    # 0x33
+'Dun ',    # 0x34
+'Zhang ',    # 0x35
+'Jiang ',    # 0x36
+'Qiang ',    # 0x37
+'Peng ',    # 0x38
+'Dan ',    # 0x39
+'Qiang ',    # 0x3a
+'Bi ',    # 0x3b
+'Bi ',    # 0x3c
+'She ',    # 0x3d
+'Dan ',    # 0x3e
+'Jian ',    # 0x3f
+'Gou ',    # 0x40
+'Sei ',    # 0x41
+'Fa ',    # 0x42
+'Bi ',    # 0x43
+'Kou ',    # 0x44
+'Nagi ',    # 0x45
+'Bie ',    # 0x46
+'Xiao ',    # 0x47
+'Dan ',    # 0x48
+'Kuo ',    # 0x49
+'Qiang ',    # 0x4a
+'Hong ',    # 0x4b
+'Mi ',    # 0x4c
+'Kuo ',    # 0x4d
+'Wan ',    # 0x4e
+'Jue ',    # 0x4f
+'Ji ',    # 0x50
+'Ji ',    # 0x51
+'Gui ',    # 0x52
+'Dang ',    # 0x53
+'Lu ',    # 0x54
+'Lu ',    # 0x55
+'Tuan ',    # 0x56
+'Hui ',    # 0x57
+'Zhi ',    # 0x58
+'Hui ',    # 0x59
+'Hui ',    # 0x5a
+'Yi ',    # 0x5b
+'Yi ',    # 0x5c
+'Yi ',    # 0x5d
+'Yi ',    # 0x5e
+'Huo ',    # 0x5f
+'Huo ',    # 0x60
+'Shan ',    # 0x61
+'Xing ',    # 0x62
+'Wen ',    # 0x63
+'Tong ',    # 0x64
+'Yan ',    # 0x65
+'Yan ',    # 0x66
+'Yu ',    # 0x67
+'Chi ',    # 0x68
+'Cai ',    # 0x69
+'Biao ',    # 0x6a
+'Diao ',    # 0x6b
+'Bin ',    # 0x6c
+'Peng ',    # 0x6d
+'Yong ',    # 0x6e
+'Piao ',    # 0x6f
+'Zhang ',    # 0x70
+'Ying ',    # 0x71
+'Chi ',    # 0x72
+'Chi ',    # 0x73
+'Zhuo ',    # 0x74
+'Tuo ',    # 0x75
+'Ji ',    # 0x76
+'Pang ',    # 0x77
+'Zhong ',    # 0x78
+'Yi ',    # 0x79
+'Wang ',    # 0x7a
+'Che ',    # 0x7b
+'Bi ',    # 0x7c
+'Chi ',    # 0x7d
+'Ling ',    # 0x7e
+'Fu ',    # 0x7f
+'Wang ',    # 0x80
+'Zheng ',    # 0x81
+'Cu ',    # 0x82
+'Wang ',    # 0x83
+'Jing ',    # 0x84
+'Dai ',    # 0x85
+'Xi ',    # 0x86
+'Xun ',    # 0x87
+'Hen ',    # 0x88
+'Yang ',    # 0x89
+'Huai ',    # 0x8a
+'Lu ',    # 0x8b
+'Hou ',    # 0x8c
+'Wa ',    # 0x8d
+'Cheng ',    # 0x8e
+'Zhi ',    # 0x8f
+'Xu ',    # 0x90
+'Jing ',    # 0x91
+'Tu ',    # 0x92
+'Cong ',    # 0x93
+'[?] ',    # 0x94
+'Lai ',    # 0x95
+'Cong ',    # 0x96
+'De ',    # 0x97
+'Pai ',    # 0x98
+'Xi ',    # 0x99
+'[?] ',    # 0x9a
+'Qi ',    # 0x9b
+'Chang ',    # 0x9c
+'Zhi ',    # 0x9d
+'Cong ',    # 0x9e
+'Zhou ',    # 0x9f
+'Lai ',    # 0xa0
+'Yu ',    # 0xa1
+'Xie ',    # 0xa2
+'Jie ',    # 0xa3
+'Jian ',    # 0xa4
+'Chi ',    # 0xa5
+'Jia ',    # 0xa6
+'Bian ',    # 0xa7
+'Huang ',    # 0xa8
+'Fu ',    # 0xa9
+'Xun ',    # 0xaa
+'Wei ',    # 0xab
+'Pang ',    # 0xac
+'Yao ',    # 0xad
+'Wei ',    # 0xae
+'Xi ',    # 0xaf
+'Zheng ',    # 0xb0
+'Piao ',    # 0xb1
+'Chi ',    # 0xb2
+'De ',    # 0xb3
+'Zheng ',    # 0xb4
+'Zheng ',    # 0xb5
+'Bie ',    # 0xb6
+'De ',    # 0xb7
+'Chong ',    # 0xb8
+'Che ',    # 0xb9
+'Jiao ',    # 0xba
+'Wei ',    # 0xbb
+'Jiao ',    # 0xbc
+'Hui ',    # 0xbd
+'Mei ',    # 0xbe
+'Long ',    # 0xbf
+'Xiang ',    # 0xc0
+'Bao ',    # 0xc1
+'Qu ',    # 0xc2
+'Xin ',    # 0xc3
+'Shu ',    # 0xc4
+'Bi ',    # 0xc5
+'Yi ',    # 0xc6
+'Le ',    # 0xc7
+'Ren ',    # 0xc8
+'Dao ',    # 0xc9
+'Ding ',    # 0xca
+'Gai ',    # 0xcb
+'Ji ',    # 0xcc
+'Ren ',    # 0xcd
+'Ren ',    # 0xce
+'Chan ',    # 0xcf
+'Tan ',    # 0xd0
+'Te ',    # 0xd1
+'Te ',    # 0xd2
+'Gan ',    # 0xd3
+'Qi ',    # 0xd4
+'Shi ',    # 0xd5
+'Cun ',    # 0xd6
+'Zhi ',    # 0xd7
+'Wang ',    # 0xd8
+'Mang ',    # 0xd9
+'Xi ',    # 0xda
+'Fan ',    # 0xdb
+'Ying ',    # 0xdc
+'Tian ',    # 0xdd
+'Min ',    # 0xde
+'Min ',    # 0xdf
+'Zhong ',    # 0xe0
+'Chong ',    # 0xe1
+'Wu ',    # 0xe2
+'Ji ',    # 0xe3
+'Wu ',    # 0xe4
+'Xi ',    # 0xe5
+'Ye ',    # 0xe6
+'You ',    # 0xe7
+'Wan ',    # 0xe8
+'Cong ',    # 0xe9
+'Zhong ',    # 0xea
+'Kuai ',    # 0xeb
+'Yu ',    # 0xec
+'Bian ',    # 0xed
+'Zhi ',    # 0xee
+'Qi ',    # 0xef
+'Cui ',    # 0xf0
+'Chen ',    # 0xf1
+'Tai ',    # 0xf2
+'Tun ',    # 0xf3
+'Qian ',    # 0xf4
+'Nian ',    # 0xf5
+'Hun ',    # 0xf6
+'Xiong ',    # 0xf7
+'Niu ',    # 0xf8
+'Wang ',    # 0xf9
+'Xian ',    # 0xfa
+'Xin ',    # 0xfb
+'Kang ',    # 0xfc
+'Hu ',    # 0xfd
+'Kai ',    # 0xfe
+'Fen ',    # 0xff
+)
diff --git a/lib/unidecode/x060.py b/lib/unidecode/x060.py
new file mode 100644
index 00000000..ad3728f8
--- /dev/null
+++ b/lib/unidecode/x060.py
@@ -0,0 +1,258 @@
+data = (
+'Huai ',    # 0x00
+'Tai ',    # 0x01
+'Song ',    # 0x02
+'Wu ',    # 0x03
+'Ou ',    # 0x04
+'Chang ',    # 0x05
+'Chuang ',    # 0x06
+'Ju ',    # 0x07
+'Yi ',    # 0x08
+'Bao ',    # 0x09
+'Chao ',    # 0x0a
+'Min ',    # 0x0b
+'Pei ',    # 0x0c
+'Zuo ',    # 0x0d
+'Zen ',    # 0x0e
+'Yang ',    # 0x0f
+'Kou ',    # 0x10
+'Ban ',    # 0x11
+'Nu ',    # 0x12
+'Nao ',    # 0x13
+'Zheng ',    # 0x14
+'Pa ',    # 0x15
+'Bu ',    # 0x16
+'Tie ',    # 0x17
+'Gu ',    # 0x18
+'Hu ',    # 0x19
+'Ju ',    # 0x1a
+'Da ',    # 0x1b
+'Lian ',    # 0x1c
+'Si ',    # 0x1d
+'Chou ',    # 0x1e
+'Di ',    # 0x1f
+'Dai ',    # 0x20
+'Yi ',    # 0x21
+'Tu ',    # 0x22
+'You ',    # 0x23
+'Fu ',    # 0x24
+'Ji ',    # 0x25
+'Peng ',    # 0x26
+'Xing ',    # 0x27
+'Yuan ',    # 0x28
+'Ni ',    # 0x29
+'Guai ',    # 0x2a
+'Fu ',    # 0x2b
+'Xi ',    # 0x2c
+'Bi ',    # 0x2d
+'You ',    # 0x2e
+'Qie ',    # 0x2f
+'Xuan ',    # 0x30
+'Cong ',    # 0x31
+'Bing ',    # 0x32
+'Huang ',    # 0x33
+'Xu ',    # 0x34
+'Chu ',    # 0x35
+'Pi ',    # 0x36
+'Xi ',    # 0x37
+'Xi ',    # 0x38
+'Tan ',    # 0x39
+'Koraeru ',    # 0x3a
+'Zong ',    # 0x3b
+'Dui ',    # 0x3c
+'[?] ',    # 0x3d
+'Ki ',    # 0x3e
+'Yi ',    # 0x3f
+'Chi ',    # 0x40
+'Ren ',    # 0x41
+'Xun ',    # 0x42
+'Shi ',    # 0x43
+'Xi ',    # 0x44
+'Lao ',    # 0x45
+'Heng ',    # 0x46
+'Kuang ',    # 0x47
+'Mu ',    # 0x48
+'Zhi ',    # 0x49
+'Xie ',    # 0x4a
+'Lian ',    # 0x4b
+'Tiao ',    # 0x4c
+'Huang ',    # 0x4d
+'Die ',    # 0x4e
+'Hao ',    # 0x4f
+'Kong ',    # 0x50
+'Gui ',    # 0x51
+'Heng ',    # 0x52
+'Xi ',    # 0x53
+'Xiao ',    # 0x54
+'Shu ',    # 0x55
+'S ',    # 0x56
+'Kua ',    # 0x57
+'Qiu ',    # 0x58
+'Yang ',    # 0x59
+'Hui ',    # 0x5a
+'Hui ',    # 0x5b
+'Chi ',    # 0x5c
+'Jia ',    # 0x5d
+'Yi ',    # 0x5e
+'Xiong ',    # 0x5f
+'Guai ',    # 0x60
+'Lin ',    # 0x61
+'Hui ',    # 0x62
+'Zi ',    # 0x63
+'Xu ',    # 0x64
+'Chi ',    # 0x65
+'Xiang ',    # 0x66
+'Nu ',    # 0x67
+'Hen ',    # 0x68
+'En ',    # 0x69
+'Ke ',    # 0x6a
+'Tong ',    # 0x6b
+'Tian ',    # 0x6c
+'Gong ',    # 0x6d
+'Quan ',    # 0x6e
+'Xi ',    # 0x6f
+'Qia ',    # 0x70
+'Yue ',    # 0x71
+'Peng ',    # 0x72
+'Ken ',    # 0x73
+'De ',    # 0x74
+'Hui ',    # 0x75
+'E ',    # 0x76
+'Kyuu ',    # 0x77
+'Tong ',    # 0x78
+'Yan ',    # 0x79
+'Kai ',    # 0x7a
+'Ce ',    # 0x7b
+'Nao ',    # 0x7c
+'Yun ',    # 0x7d
+'Mang ',    # 0x7e
+'Yong ',    # 0x7f
+'Yong ',    # 0x80
+'Yuan ',    # 0x81
+'Pi ',    # 0x82
+'Kun ',    # 0x83
+'Qiao ',    # 0x84
+'Yue ',    # 0x85
+'Yu ',    # 0x86
+'Yu ',    # 0x87
+'Jie ',    # 0x88
+'Xi ',    # 0x89
+'Zhe ',    # 0x8a
+'Lin ',    # 0x8b
+'Ti ',    # 0x8c
+'Han ',    # 0x8d
+'Hao ',    # 0x8e
+'Qie ',    # 0x8f
+'Ti ',    # 0x90
+'Bu ',    # 0x91
+'Yi ',    # 0x92
+'Qian ',    # 0x93
+'Hui ',    # 0x94
+'Xi ',    # 0x95
+'Bei ',    # 0x96
+'Man ',    # 0x97
+'Yi ',    # 0x98
+'Heng ',    # 0x99
+'Song ',    # 0x9a
+'Quan ',    # 0x9b
+'Cheng ',    # 0x9c
+'Hui ',    # 0x9d
+'Wu ',    # 0x9e
+'Wu ',    # 0x9f
+'You ',    # 0xa0
+'Li ',    # 0xa1
+'Liang ',    # 0xa2
+'Huan ',    # 0xa3
+'Cong ',    # 0xa4
+'Yi ',    # 0xa5
+'Yue ',    # 0xa6
+'Li ',    # 0xa7
+'Nin ',    # 0xa8
+'Nao ',    # 0xa9
+'E ',    # 0xaa
+'Que ',    # 0xab
+'Xuan ',    # 0xac
+'Qian ',    # 0xad
+'Wu ',    # 0xae
+'Min ',    # 0xaf
+'Cong ',    # 0xb0
+'Fei ',    # 0xb1
+'Bei ',    # 0xb2
+'Duo ',    # 0xb3
+'Cui ',    # 0xb4
+'Chang ',    # 0xb5
+'Men ',    # 0xb6
+'Li ',    # 0xb7
+'Ji ',    # 0xb8
+'Guan ',    # 0xb9
+'Guan ',    # 0xba
+'Xing ',    # 0xbb
+'Dao ',    # 0xbc
+'Qi ',    # 0xbd
+'Kong ',    # 0xbe
+'Tian ',    # 0xbf
+'Lun ',    # 0xc0
+'Xi ',    # 0xc1
+'Kan ',    # 0xc2
+'Kun ',    # 0xc3
+'Ni ',    # 0xc4
+'Qing ',    # 0xc5
+'Chou ',    # 0xc6
+'Dun ',    # 0xc7
+'Guo ',    # 0xc8
+'Chan ',    # 0xc9
+'Liang ',    # 0xca
+'Wan ',    # 0xcb
+'Yuan ',    # 0xcc
+'Jin ',    # 0xcd
+'Ji ',    # 0xce
+'Lin ',    # 0xcf
+'Yu ',    # 0xd0
+'Huo ',    # 0xd1
+'He ',    # 0xd2
+'Quan ',    # 0xd3
+'Tan ',    # 0xd4
+'Ti ',    # 0xd5
+'Ti ',    # 0xd6
+'Nie ',    # 0xd7
+'Wang ',    # 0xd8
+'Chuo ',    # 0xd9
+'Bu ',    # 0xda
+'Hun ',    # 0xdb
+'Xi ',    # 0xdc
+'Tang ',    # 0xdd
+'Xin ',    # 0xde
+'Wei ',    # 0xdf
+'Hui ',    # 0xe0
+'E ',    # 0xe1
+'Rui ',    # 0xe2
+'Zong ',    # 0xe3
+'Jian ',    # 0xe4
+'Yong ',    # 0xe5
+'Dian ',    # 0xe6
+'Ju ',    # 0xe7
+'Can ',    # 0xe8
+'Cheng ',    # 0xe9
+'De ',    # 0xea
+'Bei ',    # 0xeb
+'Qie ',    # 0xec
+'Can ',    # 0xed
+'Dan ',    # 0xee
+'Guan ',    # 0xef
+'Duo ',    # 0xf0
+'Nao ',    # 0xf1
+'Yun ',    # 0xf2
+'Xiang ',    # 0xf3
+'Zhui ',    # 0xf4
+'Die ',    # 0xf5
+'Huang ',    # 0xf6
+'Chun ',    # 0xf7
+'Qiong ',    # 0xf8
+'Re ',    # 0xf9
+'Xing ',    # 0xfa
+'Ce ',    # 0xfb
+'Bian ',    # 0xfc
+'Hun ',    # 0xfd
+'Zong ',    # 0xfe
+'Ti ',    # 0xff
+)
diff --git a/lib/unidecode/x061.py b/lib/unidecode/x061.py
new file mode 100644
index 00000000..6e8ab80d
--- /dev/null
+++ b/lib/unidecode/x061.py
@@ -0,0 +1,258 @@
+data = (
+'Qiao ',    # 0x00
+'Chou ',    # 0x01
+'Bei ',    # 0x02
+'Xuan ',    # 0x03
+'Wei ',    # 0x04
+'Ge ',    # 0x05
+'Qian ',    # 0x06
+'Wei ',    # 0x07
+'Yu ',    # 0x08
+'Yu ',    # 0x09
+'Bi ',    # 0x0a
+'Xuan ',    # 0x0b
+'Huan ',    # 0x0c
+'Min ',    # 0x0d
+'Bi ',    # 0x0e
+'Yi ',    # 0x0f
+'Mian ',    # 0x10
+'Yong ',    # 0x11
+'Kai ',    # 0x12
+'Dang ',    # 0x13
+'Yin ',    # 0x14
+'E ',    # 0x15
+'Chen ',    # 0x16
+'Mou ',    # 0x17
+'Ke ',    # 0x18
+'Ke ',    # 0x19
+'Yu ',    # 0x1a
+'Ai ',    # 0x1b
+'Qie ',    # 0x1c
+'Yan ',    # 0x1d
+'Nuo ',    # 0x1e
+'Gan ',    # 0x1f
+'Yun ',    # 0x20
+'Zong ',    # 0x21
+'Sai ',    # 0x22
+'Leng ',    # 0x23
+'Fen ',    # 0x24
+'[?] ',    # 0x25
+'Kui ',    # 0x26
+'Kui ',    # 0x27
+'Que ',    # 0x28
+'Gong ',    # 0x29
+'Yun ',    # 0x2a
+'Su ',    # 0x2b
+'Su ',    # 0x2c
+'Qi ',    # 0x2d
+'Yao ',    # 0x2e
+'Song ',    # 0x2f
+'Huang ',    # 0x30
+'Ji ',    # 0x31
+'Gu ',    # 0x32
+'Ju ',    # 0x33
+'Chuang ',    # 0x34
+'Ni ',    # 0x35
+'Xie ',    # 0x36
+'Kai ',    # 0x37
+'Zheng ',    # 0x38
+'Yong ',    # 0x39
+'Cao ',    # 0x3a
+'Sun ',    # 0x3b
+'Shen ',    # 0x3c
+'Bo ',    # 0x3d
+'Kai ',    # 0x3e
+'Yuan ',    # 0x3f
+'Xie ',    # 0x40
+'Hun ',    # 0x41
+'Yong ',    # 0x42
+'Yang ',    # 0x43
+'Li ',    # 0x44
+'Sao ',    # 0x45
+'Tao ',    # 0x46
+'Yin ',    # 0x47
+'Ci ',    # 0x48
+'Xu ',    # 0x49
+'Qian ',    # 0x4a
+'Tai ',    # 0x4b
+'Huang ',    # 0x4c
+'Yun ',    # 0x4d
+'Shen ',    # 0x4e
+'Ming ',    # 0x4f
+'[?] ',    # 0x50
+'She ',    # 0x51
+'Cong ',    # 0x52
+'Piao ',    # 0x53
+'Mo ',    # 0x54
+'Mu ',    # 0x55
+'Guo ',    # 0x56
+'Chi ',    # 0x57
+'Can ',    # 0x58
+'Can ',    # 0x59
+'Can ',    # 0x5a
+'Cui ',    # 0x5b
+'Min ',    # 0x5c
+'Te ',    # 0x5d
+'Zhang ',    # 0x5e
+'Tong ',    # 0x5f
+'Ao ',    # 0x60
+'Shuang ',    # 0x61
+'Man ',    # 0x62
+'Guan ',    # 0x63
+'Que ',    # 0x64
+'Zao ',    # 0x65
+'Jiu ',    # 0x66
+'Hui ',    # 0x67
+'Kai ',    # 0x68
+'Lian ',    # 0x69
+'Ou ',    # 0x6a
+'Song ',    # 0x6b
+'Jin ',    # 0x6c
+'Yin ',    # 0x6d
+'Lu ',    # 0x6e
+'Shang ',    # 0x6f
+'Wei ',    # 0x70
+'Tuan ',    # 0x71
+'Man ',    # 0x72
+'Qian ',    # 0x73
+'She ',    # 0x74
+'Yong ',    # 0x75
+'Qing ',    # 0x76
+'Kang ',    # 0x77
+'Di ',    # 0x78
+'Zhi ',    # 0x79
+'Lou ',    # 0x7a
+'Juan ',    # 0x7b
+'Qi ',    # 0x7c
+'Qi ',    # 0x7d
+'Yu ',    # 0x7e
+'Ping ',    # 0x7f
+'Liao ',    # 0x80
+'Cong ',    # 0x81
+'You ',    # 0x82
+'Chong ',    # 0x83
+'Zhi ',    # 0x84
+'Tong ',    # 0x85
+'Cheng ',    # 0x86
+'Qi ',    # 0x87
+'Qu ',    # 0x88
+'Peng ',    # 0x89
+'Bei ',    # 0x8a
+'Bie ',    # 0x8b
+'Chun ',    # 0x8c
+'Jiao ',    # 0x8d
+'Zeng ',    # 0x8e
+'Chi ',    # 0x8f
+'Lian ',    # 0x90
+'Ping ',    # 0x91
+'Kui ',    # 0x92
+'Hui ',    # 0x93
+'Qiao ',    # 0x94
+'Cheng ',    # 0x95
+'Yin ',    # 0x96
+'Yin ',    # 0x97
+'Xi ',    # 0x98
+'Xi ',    # 0x99
+'Dan ',    # 0x9a
+'Tan ',    # 0x9b
+'Duo ',    # 0x9c
+'Dui ',    # 0x9d
+'Dui ',    # 0x9e
+'Su ',    # 0x9f
+'Jue ',    # 0xa0
+'Ce ',    # 0xa1
+'Xiao ',    # 0xa2
+'Fan ',    # 0xa3
+'Fen ',    # 0xa4
+'Lao ',    # 0xa5
+'Lao ',    # 0xa6
+'Chong ',    # 0xa7
+'Han ',    # 0xa8
+'Qi ',    # 0xa9
+'Xian ',    # 0xaa
+'Min ',    # 0xab
+'Jing ',    # 0xac
+'Liao ',    # 0xad
+'Wu ',    # 0xae
+'Can ',    # 0xaf
+'Jue ',    # 0xb0
+'Cu ',    # 0xb1
+'Xian ',    # 0xb2
+'Tan ',    # 0xb3
+'Sheng ',    # 0xb4
+'Pi ',    # 0xb5
+'Yi ',    # 0xb6
+'Chu ',    # 0xb7
+'Xian ',    # 0xb8
+'Nao ',    # 0xb9
+'Dan ',    # 0xba
+'Tan ',    # 0xbb
+'Jing ',    # 0xbc
+'Song ',    # 0xbd
+'Han ',    # 0xbe
+'Jiao ',    # 0xbf
+'Wai ',    # 0xc0
+'Huan ',    # 0xc1
+'Dong ',    # 0xc2
+'Qin ',    # 0xc3
+'Qin ',    # 0xc4
+'Qu ',    # 0xc5
+'Cao ',    # 0xc6
+'Ken ',    # 0xc7
+'Xie ',    # 0xc8
+'Ying ',    # 0xc9
+'Ao ',    # 0xca
+'Mao ',    # 0xcb
+'Yi ',    # 0xcc
+'Lin ',    # 0xcd
+'Se ',    # 0xce
+'Jun ',    # 0xcf
+'Huai ',    # 0xd0
+'Men ',    # 0xd1
+'Lan ',    # 0xd2
+'Ai ',    # 0xd3
+'Lin ',    # 0xd4
+'Yan ',    # 0xd5
+'Gua ',    # 0xd6
+'Xia ',    # 0xd7
+'Chi ',    # 0xd8
+'Yu ',    # 0xd9
+'Yin ',    # 0xda
+'Dai ',    # 0xdb
+'Meng ',    # 0xdc
+'Ai ',    # 0xdd
+'Meng ',    # 0xde
+'Dui ',    # 0xdf
+'Qi ',    # 0xe0
+'Mo ',    # 0xe1
+'Lan ',    # 0xe2
+'Men ',    # 0xe3
+'Chou ',    # 0xe4
+'Zhi ',    # 0xe5
+'Nuo ',    # 0xe6
+'Nuo ',    # 0xe7
+'Yan ',    # 0xe8
+'Yang ',    # 0xe9
+'Bo ',    # 0xea
+'Zhi ',    # 0xeb
+'Kuang ',    # 0xec
+'Kuang ',    # 0xed
+'You ',    # 0xee
+'Fu ',    # 0xef
+'Liu ',    # 0xf0
+'Mie ',    # 0xf1
+'Cheng ',    # 0xf2
+'[?] ',    # 0xf3
+'Chan ',    # 0xf4
+'Meng ',    # 0xf5
+'Lan ',    # 0xf6
+'Huai ',    # 0xf7
+'Xuan ',    # 0xf8
+'Rang ',    # 0xf9
+'Chan ',    # 0xfa
+'Ji ',    # 0xfb
+'Ju ',    # 0xfc
+'Huan ',    # 0xfd
+'She ',    # 0xfe
+'Yi ',    # 0xff
+)
diff --git a/lib/unidecode/x062.py b/lib/unidecode/x062.py
new file mode 100644
index 00000000..97979203
--- /dev/null
+++ b/lib/unidecode/x062.py
@@ -0,0 +1,258 @@
+data = (
+'Lian ',    # 0x00
+'Nan ',    # 0x01
+'Mi ',    # 0x02
+'Tang ',    # 0x03
+'Jue ',    # 0x04
+'Gang ',    # 0x05
+'Gang ',    # 0x06
+'Gang ',    # 0x07
+'Ge ',    # 0x08
+'Yue ',    # 0x09
+'Wu ',    # 0x0a
+'Jian ',    # 0x0b
+'Xu ',    # 0x0c
+'Shu ',    # 0x0d
+'Rong ',    # 0x0e
+'Xi ',    # 0x0f
+'Cheng ',    # 0x10
+'Wo ',    # 0x11
+'Jie ',    # 0x12
+'Ge ',    # 0x13
+'Jian ',    # 0x14
+'Qiang ',    # 0x15
+'Huo ',    # 0x16
+'Qiang ',    # 0x17
+'Zhan ',    # 0x18
+'Dong ',    # 0x19
+'Qi ',    # 0x1a
+'Jia ',    # 0x1b
+'Die ',    # 0x1c
+'Zei ',    # 0x1d
+'Jia ',    # 0x1e
+'Ji ',    # 0x1f
+'Shi ',    # 0x20
+'Kan ',    # 0x21
+'Ji ',    # 0x22
+'Kui ',    # 0x23
+'Gai ',    # 0x24
+'Deng ',    # 0x25
+'Zhan ',    # 0x26
+'Chuang ',    # 0x27
+'Ge ',    # 0x28
+'Jian ',    # 0x29
+'Jie ',    # 0x2a
+'Yu ',    # 0x2b
+'Jian ',    # 0x2c
+'Yan ',    # 0x2d
+'Lu ',    # 0x2e
+'Xi ',    # 0x2f
+'Zhan ',    # 0x30
+'Xi ',    # 0x31
+'Xi ',    # 0x32
+'Chuo ',    # 0x33
+'Dai ',    # 0x34
+'Qu ',    # 0x35
+'Hu ',    # 0x36
+'Hu ',    # 0x37
+'Hu ',    # 0x38
+'E ',    # 0x39
+'Shi ',    # 0x3a
+'Li ',    # 0x3b
+'Mao ',    # 0x3c
+'Hu ',    # 0x3d
+'Li ',    # 0x3e
+'Fang ',    # 0x3f
+'Suo ',    # 0x40
+'Bian ',    # 0x41
+'Dian ',    # 0x42
+'Jiong ',    # 0x43
+'Shang ',    # 0x44
+'Yi ',    # 0x45
+'Yi ',    # 0x46
+'Shan ',    # 0x47
+'Hu ',    # 0x48
+'Fei ',    # 0x49
+'Yan ',    # 0x4a
+'Shou ',    # 0x4b
+'T ',    # 0x4c
+'Cai ',    # 0x4d
+'Zha ',    # 0x4e
+'Qiu ',    # 0x4f
+'Le ',    # 0x50
+'Bu ',    # 0x51
+'Ba ',    # 0x52
+'Da ',    # 0x53
+'Reng ',    # 0x54
+'Fu ',    # 0x55
+'Hameru ',    # 0x56
+'Zai ',    # 0x57
+'Tuo ',    # 0x58
+'Zhang ',    # 0x59
+'Diao ',    # 0x5a
+'Kang ',    # 0x5b
+'Yu ',    # 0x5c
+'Ku ',    # 0x5d
+'Han ',    # 0x5e
+'Shen ',    # 0x5f
+'Cha ',    # 0x60
+'Yi ',    # 0x61
+'Gu ',    # 0x62
+'Kou ',    # 0x63
+'Wu ',    # 0x64
+'Tuo ',    # 0x65
+'Qian ',    # 0x66
+'Zhi ',    # 0x67
+'Ren ',    # 0x68
+'Kuo ',    # 0x69
+'Men ',    # 0x6a
+'Sao ',    # 0x6b
+'Yang ',    # 0x6c
+'Niu ',    # 0x6d
+'Ban ',    # 0x6e
+'Che ',    # 0x6f
+'Rao ',    # 0x70
+'Xi ',    # 0x71
+'Qian ',    # 0x72
+'Ban ',    # 0x73
+'Jia ',    # 0x74
+'Yu ',    # 0x75
+'Fu ',    # 0x76
+'Ao ',    # 0x77
+'Xi ',    # 0x78
+'Pi ',    # 0x79
+'Zhi ',    # 0x7a
+'Zi ',    # 0x7b
+'E ',    # 0x7c
+'Dun ',    # 0x7d
+'Zhao ',    # 0x7e
+'Cheng ',    # 0x7f
+'Ji ',    # 0x80
+'Yan ',    # 0x81
+'Kuang ',    # 0x82
+'Bian ',    # 0x83
+'Chao ',    # 0x84
+'Ju ',    # 0x85
+'Wen ',    # 0x86
+'Hu ',    # 0x87
+'Yue ',    # 0x88
+'Jue ',    # 0x89
+'Ba ',    # 0x8a
+'Qin ',    # 0x8b
+'Zhen ',    # 0x8c
+'Zheng ',    # 0x8d
+'Yun ',    # 0x8e
+'Wan ',    # 0x8f
+'Nu ',    # 0x90
+'Yi ',    # 0x91
+'Shu ',    # 0x92
+'Zhua ',    # 0x93
+'Pou ',    # 0x94
+'Tou ',    # 0x95
+'Dou ',    # 0x96
+'Kang ',    # 0x97
+'Zhe ',    # 0x98
+'Pou ',    # 0x99
+'Fu ',    # 0x9a
+'Pao ',    # 0x9b
+'Ba ',    # 0x9c
+'Ao ',    # 0x9d
+'Ze ',    # 0x9e
+'Tuan ',    # 0x9f
+'Kou ',    # 0xa0
+'Lun ',    # 0xa1
+'Qiang ',    # 0xa2
+'[?] ',    # 0xa3
+'Hu ',    # 0xa4
+'Bao ',    # 0xa5
+'Bing ',    # 0xa6
+'Zhi ',    # 0xa7
+'Peng ',    # 0xa8
+'Tan ',    # 0xa9
+'Pu ',    # 0xaa
+'Pi ',    # 0xab
+'Tai ',    # 0xac
+'Yao ',    # 0xad
+'Zhen ',    # 0xae
+'Zha ',    # 0xaf
+'Yang ',    # 0xb0
+'Bao ',    # 0xb1
+'He ',    # 0xb2
+'Ni ',    # 0xb3
+'Yi ',    # 0xb4
+'Di ',    # 0xb5
+'Chi ',    # 0xb6
+'Pi ',    # 0xb7
+'Za ',    # 0xb8
+'Mo ',    # 0xb9
+'Mo ',    # 0xba
+'Shen ',    # 0xbb
+'Ya ',    # 0xbc
+'Chou ',    # 0xbd
+'Qu ',    # 0xbe
+'Min ',    # 0xbf
+'Chu ',    # 0xc0
+'Jia ',    # 0xc1
+'Fu ',    # 0xc2
+'Zhan ',    # 0xc3
+'Zhu ',    # 0xc4
+'Dan ',    # 0xc5
+'Chai ',    # 0xc6
+'Mu ',    # 0xc7
+'Nian ',    # 0xc8
+'La ',    # 0xc9
+'Fu ',    # 0xca
+'Pao ',    # 0xcb
+'Ban ',    # 0xcc
+'Pai ',    # 0xcd
+'Ling ',    # 0xce
+'Na ',    # 0xcf
+'Guai ',    # 0xd0
+'Qian ',    # 0xd1
+'Ju ',    # 0xd2
+'Tuo ',    # 0xd3
+'Ba ',    # 0xd4
+'Tuo ',    # 0xd5
+'Tuo ',    # 0xd6
+'Ao ',    # 0xd7
+'Ju ',    # 0xd8
+'Zhuo ',    # 0xd9
+'Pan ',    # 0xda
+'Zhao ',    # 0xdb
+'Bai ',    # 0xdc
+'Bai ',    # 0xdd
+'Di ',    # 0xde
+'Ni ',    # 0xdf
+'Ju ',    # 0xe0
+'Kuo ',    # 0xe1
+'Long ',    # 0xe2
+'Jian ',    # 0xe3
+'[?] ',    # 0xe4
+'Yong ',    # 0xe5
+'Lan ',    # 0xe6
+'Ning ',    # 0xe7
+'Bo ',    # 0xe8
+'Ze ',    # 0xe9
+'Qian ',    # 0xea
+'Hen ',    # 0xeb
+'Gua ',    # 0xec
+'Shi ',    # 0xed
+'Jie ',    # 0xee
+'Zheng ',    # 0xef
+'Nin ',    # 0xf0
+'Gong ',    # 0xf1
+'Gong ',    # 0xf2
+'Quan ',    # 0xf3
+'Shuan ',    # 0xf4
+'Cun ',    # 0xf5
+'Zan ',    # 0xf6
+'Kao ',    # 0xf7
+'Chi ',    # 0xf8
+'Xie ',    # 0xf9
+'Ce ',    # 0xfa
+'Hui ',    # 0xfb
+'Pin ',    # 0xfc
+'Zhuai ',    # 0xfd
+'Shi ',    # 0xfe
+'Na ',    # 0xff
+)
diff --git a/lib/unidecode/x063.py b/lib/unidecode/x063.py
new file mode 100644
index 00000000..896cea25
--- /dev/null
+++ b/lib/unidecode/x063.py
@@ -0,0 +1,258 @@
+data = (
+'Bo ',    # 0x00
+'Chi ',    # 0x01
+'Gua ',    # 0x02
+'Zhi ',    # 0x03
+'Kuo ',    # 0x04
+'Duo ',    # 0x05
+'Duo ',    # 0x06
+'Zhi ',    # 0x07
+'Qie ',    # 0x08
+'An ',    # 0x09
+'Nong ',    # 0x0a
+'Zhen ',    # 0x0b
+'Ge ',    # 0x0c
+'Jiao ',    # 0x0d
+'Ku ',    # 0x0e
+'Dong ',    # 0x0f
+'Ru ',    # 0x10
+'Tiao ',    # 0x11
+'Lie ',    # 0x12
+'Zha ',    # 0x13
+'Lu ',    # 0x14
+'Die ',    # 0x15
+'Wa ',    # 0x16
+'Jue ',    # 0x17
+'Mushiru ',    # 0x18
+'Ju ',    # 0x19
+'Zhi ',    # 0x1a
+'Luan ',    # 0x1b
+'Ya ',    # 0x1c
+'Zhua ',    # 0x1d
+'Ta ',    # 0x1e
+'Xie ',    # 0x1f
+'Nao ',    # 0x20
+'Dang ',    # 0x21
+'Jiao ',    # 0x22
+'Zheng ',    # 0x23
+'Ji ',    # 0x24
+'Hui ',    # 0x25
+'Xun ',    # 0x26
+'Ku ',    # 0x27
+'Ai ',    # 0x28
+'Tuo ',    # 0x29
+'Nuo ',    # 0x2a
+'Cuo ',    # 0x2b
+'Bo ',    # 0x2c
+'Geng ',    # 0x2d
+'Ti ',    # 0x2e
+'Zhen ',    # 0x2f
+'Cheng ',    # 0x30
+'Suo ',    # 0x31
+'Suo ',    # 0x32
+'Keng ',    # 0x33
+'Mei ',    # 0x34
+'Long ',    # 0x35
+'Ju ',    # 0x36
+'Peng ',    # 0x37
+'Jian ',    # 0x38
+'Yi ',    # 0x39
+'Ting ',    # 0x3a
+'Shan ',    # 0x3b
+'Nuo ',    # 0x3c
+'Wan ',    # 0x3d
+'Xie ',    # 0x3e
+'Cha ',    # 0x3f
+'Feng ',    # 0x40
+'Jiao ',    # 0x41
+'Wu ',    # 0x42
+'Jun ',    # 0x43
+'Jiu ',    # 0x44
+'Tong ',    # 0x45
+'Kun ',    # 0x46
+'Huo ',    # 0x47
+'Tu ',    # 0x48
+'Zhuo ',    # 0x49
+'Pou ',    # 0x4a
+'Le ',    # 0x4b
+'Ba ',    # 0x4c
+'Han ',    # 0x4d
+'Shao ',    # 0x4e
+'Nie ',    # 0x4f
+'Juan ',    # 0x50
+'Ze ',    # 0x51
+'Song ',    # 0x52
+'Ye ',    # 0x53
+'Jue ',    # 0x54
+'Bu ',    # 0x55
+'Huan ',    # 0x56
+'Bu ',    # 0x57
+'Zun ',    # 0x58
+'Yi ',    # 0x59
+'Zhai ',    # 0x5a
+'Lu ',    # 0x5b
+'Sou ',    # 0x5c
+'Tuo ',    # 0x5d
+'Lao ',    # 0x5e
+'Sun ',    # 0x5f
+'Bang ',    # 0x60
+'Jian ',    # 0x61
+'Huan ',    # 0x62
+'Dao ',    # 0x63
+'[?] ',    # 0x64
+'Wan ',    # 0x65
+'Qin ',    # 0x66
+'Peng ',    # 0x67
+'She ',    # 0x68
+'Lie ',    # 0x69
+'Min ',    # 0x6a
+'Men ',    # 0x6b
+'Fu ',    # 0x6c
+'Bai ',    # 0x6d
+'Ju ',    # 0x6e
+'Dao ',    # 0x6f
+'Wo ',    # 0x70
+'Ai ',    # 0x71
+'Juan ',    # 0x72
+'Yue ',    # 0x73
+'Zong ',    # 0x74
+'Chen ',    # 0x75
+'Chui ',    # 0x76
+'Jie ',    # 0x77
+'Tu ',    # 0x78
+'Ben ',    # 0x79
+'Na ',    # 0x7a
+'Nian ',    # 0x7b
+'Nuo ',    # 0x7c
+'Zu ',    # 0x7d
+'Wo ',    # 0x7e
+'Xi ',    # 0x7f
+'Xian ',    # 0x80
+'Cheng ',    # 0x81
+'Dian ',    # 0x82
+'Sao ',    # 0x83
+'Lun ',    # 0x84
+'Qing ',    # 0x85
+'Gang ',    # 0x86
+'Duo ',    # 0x87
+'Shou ',    # 0x88
+'Diao ',    # 0x89
+'Pou ',    # 0x8a
+'Di ',    # 0x8b
+'Zhang ',    # 0x8c
+'Gun ',    # 0x8d
+'Ji ',    # 0x8e
+'Tao ',    # 0x8f
+'Qia ',    # 0x90
+'Qi ',    # 0x91
+'Pai ',    # 0x92
+'Shu ',    # 0x93
+'Qian ',    # 0x94
+'Ling ',    # 0x95
+'Yi ',    # 0x96
+'Ya ',    # 0x97
+'Jue ',    # 0x98
+'Zheng ',    # 0x99
+'Liang ',    # 0x9a
+'Gua ',    # 0x9b
+'Yi ',    # 0x9c
+'Huo ',    # 0x9d
+'Shan ',    # 0x9e
+'Zheng ',    # 0x9f
+'Lue ',    # 0xa0
+'Cai ',    # 0xa1
+'Tan ',    # 0xa2
+'Che ',    # 0xa3
+'Bing ',    # 0xa4
+'Jie ',    # 0xa5
+'Ti ',    # 0xa6
+'Kong ',    # 0xa7
+'Tui ',    # 0xa8
+'Yan ',    # 0xa9
+'Cuo ',    # 0xaa
+'Zou ',    # 0xab
+'Ju ',    # 0xac
+'Tian ',    # 0xad
+'Qian ',    # 0xae
+'Ken ',    # 0xaf
+'Bai ',    # 0xb0
+'Shou ',    # 0xb1
+'Jie ',    # 0xb2
+'Lu ',    # 0xb3
+'Guo ',    # 0xb4
+'Haba ',    # 0xb5
+'[?] ',    # 0xb6
+'Zhi ',    # 0xb7
+'Dan ',    # 0xb8
+'Mang ',    # 0xb9
+'Xian ',    # 0xba
+'Sao ',    # 0xbb
+'Guan ',    # 0xbc
+'Peng ',    # 0xbd
+'Yuan ',    # 0xbe
+'Nuo ',    # 0xbf
+'Jian ',    # 0xc0
+'Zhen ',    # 0xc1
+'Jiu ',    # 0xc2
+'Jian ',    # 0xc3
+'Yu ',    # 0xc4
+'Yan ',    # 0xc5
+'Kui ',    # 0xc6
+'Nan ',    # 0xc7
+'Hong ',    # 0xc8
+'Rou ',    # 0xc9
+'Pi ',    # 0xca
+'Wei ',    # 0xcb
+'Sai ',    # 0xcc
+'Zou ',    # 0xcd
+'Xuan ',    # 0xce
+'Miao ',    # 0xcf
+'Ti ',    # 0xd0
+'Nie ',    # 0xd1
+'Cha ',    # 0xd2
+'Shi ',    # 0xd3
+'Zong ',    # 0xd4
+'Zhen ',    # 0xd5
+'Yi ',    # 0xd6
+'Shun ',    # 0xd7
+'Heng ',    # 0xd8
+'Bian ',    # 0xd9
+'Yang ',    # 0xda
+'Huan ',    # 0xdb
+'Yan ',    # 0xdc
+'Zuan ',    # 0xdd
+'An ',    # 0xde
+'Xu ',    # 0xdf
+'Ya ',    # 0xe0
+'Wo ',    # 0xe1
+'Ke ',    # 0xe2
+'Chuai ',    # 0xe3
+'Ji ',    # 0xe4
+'Ti ',    # 0xe5
+'La ',    # 0xe6
+'La ',    # 0xe7
+'Cheng ',    # 0xe8
+'Kai ',    # 0xe9
+'Jiu ',    # 0xea
+'Jiu ',    # 0xeb
+'Tu ',    # 0xec
+'Jie ',    # 0xed
+'Hui ',    # 0xee
+'Geng ',    # 0xef
+'Chong ',    # 0xf0
+'Shuo ',    # 0xf1
+'She ',    # 0xf2
+'Xie ',    # 0xf3
+'Yuan ',    # 0xf4
+'Qian ',    # 0xf5
+'Ye ',    # 0xf6
+'Cha ',    # 0xf7
+'Zha ',    # 0xf8
+'Bei ',    # 0xf9
+'Yao ',    # 0xfa
+'[?] ',    # 0xfb
+'[?] ',    # 0xfc
+'Lan ',    # 0xfd
+'Wen ',    # 0xfe
+'Qin ',    # 0xff
+)
diff --git a/lib/unidecode/x064.py b/lib/unidecode/x064.py
new file mode 100644
index 00000000..dc1514b6
--- /dev/null
+++ b/lib/unidecode/x064.py
@@ -0,0 +1,258 @@
+data = (
+'Chan ',    # 0x00
+'Ge ',    # 0x01
+'Lou ',    # 0x02
+'Zong ',    # 0x03
+'Geng ',    # 0x04
+'Jiao ',    # 0x05
+'Gou ',    # 0x06
+'Qin ',    # 0x07
+'Yong ',    # 0x08
+'Que ',    # 0x09
+'Chou ',    # 0x0a
+'Chi ',    # 0x0b
+'Zhan ',    # 0x0c
+'Sun ',    # 0x0d
+'Sun ',    # 0x0e
+'Bo ',    # 0x0f
+'Chu ',    # 0x10
+'Rong ',    # 0x11
+'Beng ',    # 0x12
+'Cuo ',    # 0x13
+'Sao ',    # 0x14
+'Ke ',    # 0x15
+'Yao ',    # 0x16
+'Dao ',    # 0x17
+'Zhi ',    # 0x18
+'Nu ',    # 0x19
+'Xie ',    # 0x1a
+'Jian ',    # 0x1b
+'Sou ',    # 0x1c
+'Qiu ',    # 0x1d
+'Gao ',    # 0x1e
+'Xian ',    # 0x1f
+'Shuo ',    # 0x20
+'Sang ',    # 0x21
+'Jin ',    # 0x22
+'Mie ',    # 0x23
+'E ',    # 0x24
+'Chui ',    # 0x25
+'Nuo ',    # 0x26
+'Shan ',    # 0x27
+'Ta ',    # 0x28
+'Jie ',    # 0x29
+'Tang ',    # 0x2a
+'Pan ',    # 0x2b
+'Ban ',    # 0x2c
+'Da ',    # 0x2d
+'Li ',    # 0x2e
+'Tao ',    # 0x2f
+'Hu ',    # 0x30
+'Zhi ',    # 0x31
+'Wa ',    # 0x32
+'Xia ',    # 0x33
+'Qian ',    # 0x34
+'Wen ',    # 0x35
+'Qiang ',    # 0x36
+'Tian ',    # 0x37
+'Zhen ',    # 0x38
+'E ',    # 0x39
+'Xi ',    # 0x3a
+'Nuo ',    # 0x3b
+'Quan ',    # 0x3c
+'Cha ',    # 0x3d
+'Zha ',    # 0x3e
+'Ge ',    # 0x3f
+'Wu ',    # 0x40
+'En ',    # 0x41
+'She ',    # 0x42
+'Kang ',    # 0x43
+'She ',    # 0x44
+'Shu ',    # 0x45
+'Bai ',    # 0x46
+'Yao ',    # 0x47
+'Bin ',    # 0x48
+'Sou ',    # 0x49
+'Tan ',    # 0x4a
+'Sa ',    # 0x4b
+'Chan ',    # 0x4c
+'Suo ',    # 0x4d
+'Liao ',    # 0x4e
+'Chong ',    # 0x4f
+'Chuang ',    # 0x50
+'Guo ',    # 0x51
+'Bing ',    # 0x52
+'Feng ',    # 0x53
+'Shuai ',    # 0x54
+'Di ',    # 0x55
+'Qi ',    # 0x56
+'Sou ',    # 0x57
+'Zhai ',    # 0x58
+'Lian ',    # 0x59
+'Tang ',    # 0x5a
+'Chi ',    # 0x5b
+'Guan ',    # 0x5c
+'Lu ',    # 0x5d
+'Luo ',    # 0x5e
+'Lou ',    # 0x5f
+'Zong ',    # 0x60
+'Gai ',    # 0x61
+'Hu ',    # 0x62
+'Zha ',    # 0x63
+'Chuang ',    # 0x64
+'Tang ',    # 0x65
+'Hua ',    # 0x66
+'Cui ',    # 0x67
+'Nai ',    # 0x68
+'Mo ',    # 0x69
+'Jiang ',    # 0x6a
+'Gui ',    # 0x6b
+'Ying ',    # 0x6c
+'Zhi ',    # 0x6d
+'Ao ',    # 0x6e
+'Zhi ',    # 0x6f
+'Nie ',    # 0x70
+'Man ',    # 0x71
+'Shan ',    # 0x72
+'Kou ',    # 0x73
+'Shu ',    # 0x74
+'Suo ',    # 0x75
+'Tuan ',    # 0x76
+'Jiao ',    # 0x77
+'Mo ',    # 0x78
+'Mo ',    # 0x79
+'Zhe ',    # 0x7a
+'Xian ',    # 0x7b
+'Keng ',    # 0x7c
+'Piao ',    # 0x7d
+'Jiang ',    # 0x7e
+'Yin ',    # 0x7f
+'Gou ',    # 0x80
+'Qian ',    # 0x81
+'Lue ',    # 0x82
+'Ji ',    # 0x83
+'Ying ',    # 0x84
+'Jue ',    # 0x85
+'Pie ',    # 0x86
+'Pie ',    # 0x87
+'Lao ',    # 0x88
+'Dun ',    # 0x89
+'Xian ',    # 0x8a
+'Ruan ',    # 0x8b
+'Kui ',    # 0x8c
+'Zan ',    # 0x8d
+'Yi ',    # 0x8e
+'Xun ',    # 0x8f
+'Cheng ',    # 0x90
+'Cheng ',    # 0x91
+'Sa ',    # 0x92
+'Nao ',    # 0x93
+'Heng ',    # 0x94
+'Si ',    # 0x95
+'Qian ',    # 0x96
+'Huang ',    # 0x97
+'Da ',    # 0x98
+'Zun ',    # 0x99
+'Nian ',    # 0x9a
+'Lin ',    # 0x9b
+'Zheng ',    # 0x9c
+'Hui ',    # 0x9d
+'Zhuang ',    # 0x9e
+'Jiao ',    # 0x9f
+'Ji ',    # 0xa0
+'Cao ',    # 0xa1
+'Dan ',    # 0xa2
+'Dan ',    # 0xa3
+'Che ',    # 0xa4
+'Bo ',    # 0xa5
+'Che ',    # 0xa6
+'Jue ',    # 0xa7
+'Xiao ',    # 0xa8
+'Liao ',    # 0xa9
+'Ben ',    # 0xaa
+'Fu ',    # 0xab
+'Qiao ',    # 0xac
+'Bo ',    # 0xad
+'Cuo ',    # 0xae
+'Zhuo ',    # 0xaf
+'Zhuan ',    # 0xb0
+'Tuo ',    # 0xb1
+'Pu ',    # 0xb2
+'Qin ',    # 0xb3
+'Dun ',    # 0xb4
+'Nian ',    # 0xb5
+'[?] ',    # 0xb6
+'Xie ',    # 0xb7
+'Lu ',    # 0xb8
+'Jiao ',    # 0xb9
+'Cuan ',    # 0xba
+'Ta ',    # 0xbb
+'Han ',    # 0xbc
+'Qiao ',    # 0xbd
+'Zhua ',    # 0xbe
+'Jian ',    # 0xbf
+'Gan ',    # 0xc0
+'Yong ',    # 0xc1
+'Lei ',    # 0xc2
+'Kuo ',    # 0xc3
+'Lu ',    # 0xc4
+'Shan ',    # 0xc5
+'Zhuo ',    # 0xc6
+'Ze ',    # 0xc7
+'Pu ',    # 0xc8
+'Chuo ',    # 0xc9
+'Ji ',    # 0xca
+'Dang ',    # 0xcb
+'Suo ',    # 0xcc
+'Cao ',    # 0xcd
+'Qing ',    # 0xce
+'Jing ',    # 0xcf
+'Huan ',    # 0xd0
+'Jie ',    # 0xd1
+'Qin ',    # 0xd2
+'Kuai ',    # 0xd3
+'Dan ',    # 0xd4
+'Xi ',    # 0xd5
+'Ge ',    # 0xd6
+'Pi ',    # 0xd7
+'Bo ',    # 0xd8
+'Ao ',    # 0xd9
+'Ju ',    # 0xda
+'Ye ',    # 0xdb
+'[?] ',    # 0xdc
+'Mang ',    # 0xdd
+'Sou ',    # 0xde
+'Mi ',    # 0xdf
+'Ji ',    # 0xe0
+'Tai ',    # 0xe1
+'Zhuo ',    # 0xe2
+'Dao ',    # 0xe3
+'Xing ',    # 0xe4
+'Lan ',    # 0xe5
+'Ca ',    # 0xe6
+'Ju ',    # 0xe7
+'Ye ',    # 0xe8
+'Ru ',    # 0xe9
+'Ye ',    # 0xea
+'Ye ',    # 0xeb
+'Ni ',    # 0xec
+'Hu ',    # 0xed
+'Ji ',    # 0xee
+'Bin ',    # 0xef
+'Ning ',    # 0xf0
+'Ge ',    # 0xf1
+'Zhi ',    # 0xf2
+'Jie ',    # 0xf3
+'Kuo ',    # 0xf4
+'Mo ',    # 0xf5
+'Jian ',    # 0xf6
+'Xie ',    # 0xf7
+'Lie ',    # 0xf8
+'Tan ',    # 0xf9
+'Bai ',    # 0xfa
+'Sou ',    # 0xfb
+'Lu ',    # 0xfc
+'Lue ',    # 0xfd
+'Rao ',    # 0xfe
+'Zhi ',    # 0xff
+)
diff --git a/lib/unidecode/x065.py b/lib/unidecode/x065.py
new file mode 100644
index 00000000..ede51764
--- /dev/null
+++ b/lib/unidecode/x065.py
@@ -0,0 +1,258 @@
+data = (
+'Pan ',    # 0x00
+'Yang ',    # 0x01
+'Lei ',    # 0x02
+'Sa ',    # 0x03
+'Shu ',    # 0x04
+'Zan ',    # 0x05
+'Nian ',    # 0x06
+'Xian ',    # 0x07
+'Jun ',    # 0x08
+'Huo ',    # 0x09
+'Li ',    # 0x0a
+'La ',    # 0x0b
+'Han ',    # 0x0c
+'Ying ',    # 0x0d
+'Lu ',    # 0x0e
+'Long ',    # 0x0f
+'Qian ',    # 0x10
+'Qian ',    # 0x11
+'Zan ',    # 0x12
+'Qian ',    # 0x13
+'Lan ',    # 0x14
+'San ',    # 0x15
+'Ying ',    # 0x16
+'Mei ',    # 0x17
+'Rang ',    # 0x18
+'Chan ',    # 0x19
+'[?] ',    # 0x1a
+'Cuan ',    # 0x1b
+'Xi ',    # 0x1c
+'She ',    # 0x1d
+'Luo ',    # 0x1e
+'Jun ',    # 0x1f
+'Mi ',    # 0x20
+'Li ',    # 0x21
+'Zan ',    # 0x22
+'Luan ',    # 0x23
+'Tan ',    # 0x24
+'Zuan ',    # 0x25
+'Li ',    # 0x26
+'Dian ',    # 0x27
+'Wa ',    # 0x28
+'Dang ',    # 0x29
+'Jiao ',    # 0x2a
+'Jue ',    # 0x2b
+'Lan ',    # 0x2c
+'Li ',    # 0x2d
+'Nang ',    # 0x2e
+'Zhi ',    # 0x2f
+'Gui ',    # 0x30
+'Gui ',    # 0x31
+'Qi ',    # 0x32
+'Xin ',    # 0x33
+'Pu ',    # 0x34
+'Sui ',    # 0x35
+'Shou ',    # 0x36
+'Kao ',    # 0x37
+'You ',    # 0x38
+'Gai ',    # 0x39
+'Yi ',    # 0x3a
+'Gong ',    # 0x3b
+'Gan ',    # 0x3c
+'Ban ',    # 0x3d
+'Fang ',    # 0x3e
+'Zheng ',    # 0x3f
+'Bo ',    # 0x40
+'Dian ',    # 0x41
+'Kou ',    # 0x42
+'Min ',    # 0x43
+'Wu ',    # 0x44
+'Gu ',    # 0x45
+'He ',    # 0x46
+'Ce ',    # 0x47
+'Xiao ',    # 0x48
+'Mi ',    # 0x49
+'Chu ',    # 0x4a
+'Ge ',    # 0x4b
+'Di ',    # 0x4c
+'Xu ',    # 0x4d
+'Jiao ',    # 0x4e
+'Min ',    # 0x4f
+'Chen ',    # 0x50
+'Jiu ',    # 0x51
+'Zhen ',    # 0x52
+'Duo ',    # 0x53
+'Yu ',    # 0x54
+'Chi ',    # 0x55
+'Ao ',    # 0x56
+'Bai ',    # 0x57
+'Xu ',    # 0x58
+'Jiao ',    # 0x59
+'Duo ',    # 0x5a
+'Lian ',    # 0x5b
+'Nie ',    # 0x5c
+'Bi ',    # 0x5d
+'Chang ',    # 0x5e
+'Dian ',    # 0x5f
+'Duo ',    # 0x60
+'Yi ',    # 0x61
+'Gan ',    # 0x62
+'San ',    # 0x63
+'Ke ',    # 0x64
+'Yan ',    # 0x65
+'Dun ',    # 0x66
+'Qi ',    # 0x67
+'Dou ',    # 0x68
+'Xiao ',    # 0x69
+'Duo ',    # 0x6a
+'Jiao ',    # 0x6b
+'Jing ',    # 0x6c
+'Yang ',    # 0x6d
+'Xia ',    # 0x6e
+'Min ',    # 0x6f
+'Shu ',    # 0x70
+'Ai ',    # 0x71
+'Qiao ',    # 0x72
+'Ai ',    # 0x73
+'Zheng ',    # 0x74
+'Di ',    # 0x75
+'Zhen ',    # 0x76
+'Fu ',    # 0x77
+'Shu ',    # 0x78
+'Liao ',    # 0x79
+'Qu ',    # 0x7a
+'Xiong ',    # 0x7b
+'Xi ',    # 0x7c
+'Jiao ',    # 0x7d
+'Sen ',    # 0x7e
+'Jiao ',    # 0x7f
+'Zhuo ',    # 0x80
+'Yi ',    # 0x81
+'Lian ',    # 0x82
+'Bi ',    # 0x83
+'Li ',    # 0x84
+'Xiao ',    # 0x85
+'Xiao ',    # 0x86
+'Wen ',    # 0x87
+'Xue ',    # 0x88
+'Qi ',    # 0x89
+'Qi ',    # 0x8a
+'Zhai ',    # 0x8b
+'Bin ',    # 0x8c
+'Jue ',    # 0x8d
+'Zhai ',    # 0x8e
+'[?] ',    # 0x8f
+'Fei ',    # 0x90
+'Ban ',    # 0x91
+'Ban ',    # 0x92
+'Lan ',    # 0x93
+'Yu ',    # 0x94
+'Lan ',    # 0x95
+'Wei ',    # 0x96
+'Dou ',    # 0x97
+'Sheng ',    # 0x98
+'Liao ',    # 0x99
+'Jia ',    # 0x9a
+'Hu ',    # 0x9b
+'Xie ',    # 0x9c
+'Jia ',    # 0x9d
+'Yu ',    # 0x9e
+'Zhen ',    # 0x9f
+'Jiao ',    # 0xa0
+'Wo ',    # 0xa1
+'Tou ',    # 0xa2
+'Chu ',    # 0xa3
+'Jin ',    # 0xa4
+'Chi ',    # 0xa5
+'Yin ',    # 0xa6
+'Fu ',    # 0xa7
+'Qiang ',    # 0xa8
+'Zhan ',    # 0xa9
+'Qu ',    # 0xaa
+'Zhuo ',    # 0xab
+'Zhan ',    # 0xac
+'Duan ',    # 0xad
+'Zhuo ',    # 0xae
+'Si ',    # 0xaf
+'Xin ',    # 0xb0
+'Zhuo ',    # 0xb1
+'Zhuo ',    # 0xb2
+'Qin ',    # 0xb3
+'Lin ',    # 0xb4
+'Zhuo ',    # 0xb5
+'Chu ',    # 0xb6
+'Duan ',    # 0xb7
+'Zhu ',    # 0xb8
+'Fang ',    # 0xb9
+'Xie ',    # 0xba
+'Hang ',    # 0xbb
+'Yu ',    # 0xbc
+'Shi ',    # 0xbd
+'Pei ',    # 0xbe
+'You ',    # 0xbf
+'Mye ',    # 0xc0
+'Pang ',    # 0xc1
+'Qi ',    # 0xc2
+'Zhan ',    # 0xc3
+'Mao ',    # 0xc4
+'Lu ',    # 0xc5
+'Pei ',    # 0xc6
+'Pi ',    # 0xc7
+'Liu ',    # 0xc8
+'Fu ',    # 0xc9
+'Fang ',    # 0xca
+'Xuan ',    # 0xcb
+'Jing ',    # 0xcc
+'Jing ',    # 0xcd
+'Ni ',    # 0xce
+'Zu ',    # 0xcf
+'Zhao ',    # 0xd0
+'Yi ',    # 0xd1
+'Liu ',    # 0xd2
+'Shao ',    # 0xd3
+'Jian ',    # 0xd4
+'Es ',    # 0xd5
+'Yi ',    # 0xd6
+'Qi ',    # 0xd7
+'Zhi ',    # 0xd8
+'Fan ',    # 0xd9
+'Piao ',    # 0xda
+'Fan ',    # 0xdb
+'Zhan ',    # 0xdc
+'Guai ',    # 0xdd
+'Sui ',    # 0xde
+'Yu ',    # 0xdf
+'Wu ',    # 0xe0
+'Ji ',    # 0xe1
+'Ji ',    # 0xe2
+'Ji ',    # 0xe3
+'Huo ',    # 0xe4
+'Ri ',    # 0xe5
+'Dan ',    # 0xe6
+'Jiu ',    # 0xe7
+'Zhi ',    # 0xe8
+'Zao ',    # 0xe9
+'Xie ',    # 0xea
+'Tiao ',    # 0xeb
+'Xun ',    # 0xec
+'Xu ',    # 0xed
+'Xu ',    # 0xee
+'Xu ',    # 0xef
+'Gan ',    # 0xf0
+'Han ',    # 0xf1
+'Tai ',    # 0xf2
+'Di ',    # 0xf3
+'Xu ',    # 0xf4
+'Chan ',    # 0xf5
+'Shi ',    # 0xf6
+'Kuang ',    # 0xf7
+'Yang ',    # 0xf8
+'Shi ',    # 0xf9
+'Wang ',    # 0xfa
+'Min ',    # 0xfb
+'Min ',    # 0xfc
+'Tun ',    # 0xfd
+'Chun ',    # 0xfe
+'Wu ',    # 0xff
+)
diff --git a/lib/unidecode/x066.py b/lib/unidecode/x066.py
new file mode 100644
index 00000000..01898d55
--- /dev/null
+++ b/lib/unidecode/x066.py
@@ -0,0 +1,258 @@
+data = (
+'Yun ',    # 0x00
+'Bei ',    # 0x01
+'Ang ',    # 0x02
+'Ze ',    # 0x03
+'Ban ',    # 0x04
+'Jie ',    # 0x05
+'Kun ',    # 0x06
+'Sheng ',    # 0x07
+'Hu ',    # 0x08
+'Fang ',    # 0x09
+'Hao ',    # 0x0a
+'Gui ',    # 0x0b
+'Chang ',    # 0x0c
+'Xuan ',    # 0x0d
+'Ming ',    # 0x0e
+'Hun ',    # 0x0f
+'Fen ',    # 0x10
+'Qin ',    # 0x11
+'Hu ',    # 0x12
+'Yi ',    # 0x13
+'Xi ',    # 0x14
+'Xin ',    # 0x15
+'Yan ',    # 0x16
+'Ze ',    # 0x17
+'Fang ',    # 0x18
+'Tan ',    # 0x19
+'Shen ',    # 0x1a
+'Ju ',    # 0x1b
+'Yang ',    # 0x1c
+'Zan ',    # 0x1d
+'Bing ',    # 0x1e
+'Xing ',    # 0x1f
+'Ying ',    # 0x20
+'Xuan ',    # 0x21
+'Pei ',    # 0x22
+'Zhen ',    # 0x23
+'Ling ',    # 0x24
+'Chun ',    # 0x25
+'Hao ',    # 0x26
+'Mei ',    # 0x27
+'Zuo ',    # 0x28
+'Mo ',    # 0x29
+'Bian ',    # 0x2a
+'Xu ',    # 0x2b
+'Hun ',    # 0x2c
+'Zhao ',    # 0x2d
+'Zong ',    # 0x2e
+'Shi ',    # 0x2f
+'Shi ',    # 0x30
+'Yu ',    # 0x31
+'Fei ',    # 0x32
+'Die ',    # 0x33
+'Mao ',    # 0x34
+'Ni ',    # 0x35
+'Chang ',    # 0x36
+'Wen ',    # 0x37
+'Dong ',    # 0x38
+'Ai ',    # 0x39
+'Bing ',    # 0x3a
+'Ang ',    # 0x3b
+'Zhou ',    # 0x3c
+'Long ',    # 0x3d
+'Xian ',    # 0x3e
+'Kuang ',    # 0x3f
+'Tiao ',    # 0x40
+'Chao ',    # 0x41
+'Shi ',    # 0x42
+'Huang ',    # 0x43
+'Huang ',    # 0x44
+'Xuan ',    # 0x45
+'Kui ',    # 0x46
+'Xu ',    # 0x47
+'Jiao ',    # 0x48
+'Jin ',    # 0x49
+'Zhi ',    # 0x4a
+'Jin ',    # 0x4b
+'Shang ',    # 0x4c
+'Tong ',    # 0x4d
+'Hong ',    # 0x4e
+'Yan ',    # 0x4f
+'Gai ',    # 0x50
+'Xiang ',    # 0x51
+'Shai ',    # 0x52
+'Xiao ',    # 0x53
+'Ye ',    # 0x54
+'Yun ',    # 0x55
+'Hui ',    # 0x56
+'Han ',    # 0x57
+'Han ',    # 0x58
+'Jun ',    # 0x59
+'Wan ',    # 0x5a
+'Xian ',    # 0x5b
+'Kun ',    # 0x5c
+'Zhou ',    # 0x5d
+'Xi ',    # 0x5e
+'Cheng ',    # 0x5f
+'Sheng ',    # 0x60
+'Bu ',    # 0x61
+'Zhe ',    # 0x62
+'Zhe ',    # 0x63
+'Wu ',    # 0x64
+'Han ',    # 0x65
+'Hui ',    # 0x66
+'Hao ',    # 0x67
+'Chen ',    # 0x68
+'Wan ',    # 0x69
+'Tian ',    # 0x6a
+'Zhuo ',    # 0x6b
+'Zui ',    # 0x6c
+'Zhou ',    # 0x6d
+'Pu ',    # 0x6e
+'Jing ',    # 0x6f
+'Xi ',    # 0x70
+'Shan ',    # 0x71
+'Yi ',    # 0x72
+'Xi ',    # 0x73
+'Qing ',    # 0x74
+'Qi ',    # 0x75
+'Jing ',    # 0x76
+'Gui ',    # 0x77
+'Zhen ',    # 0x78
+'Yi ',    # 0x79
+'Zhi ',    # 0x7a
+'An ',    # 0x7b
+'Wan ',    # 0x7c
+'Lin ',    # 0x7d
+'Liang ',    # 0x7e
+'Chang ',    # 0x7f
+'Wang ',    # 0x80
+'Xiao ',    # 0x81
+'Zan ',    # 0x82
+'Hi ',    # 0x83
+'Xuan ',    # 0x84
+'Xuan ',    # 0x85
+'Yi ',    # 0x86
+'Xia ',    # 0x87
+'Yun ',    # 0x88
+'Hui ',    # 0x89
+'Fu ',    # 0x8a
+'Min ',    # 0x8b
+'Kui ',    # 0x8c
+'He ',    # 0x8d
+'Ying ',    # 0x8e
+'Du ',    # 0x8f
+'Wei ',    # 0x90
+'Shu ',    # 0x91
+'Qing ',    # 0x92
+'Mao ',    # 0x93
+'Nan ',    # 0x94
+'Jian ',    # 0x95
+'Nuan ',    # 0x96
+'An ',    # 0x97
+'Yang ',    # 0x98
+'Chun ',    # 0x99
+'Yao ',    # 0x9a
+'Suo ',    # 0x9b
+'Jin ',    # 0x9c
+'Ming ',    # 0x9d
+'Jiao ',    # 0x9e
+'Kai ',    # 0x9f
+'Gao ',    # 0xa0
+'Weng ',    # 0xa1
+'Chang ',    # 0xa2
+'Qi ',    # 0xa3
+'Hao ',    # 0xa4
+'Yan ',    # 0xa5
+'Li ',    # 0xa6
+'Ai ',    # 0xa7
+'Ji ',    # 0xa8
+'Gui ',    # 0xa9
+'Men ',    # 0xaa
+'Zan ',    # 0xab
+'Xie ',    # 0xac
+'Hao ',    # 0xad
+'Mu ',    # 0xae
+'Mo ',    # 0xaf
+'Cong ',    # 0xb0
+'Ni ',    # 0xb1
+'Zhang ',    # 0xb2
+'Hui ',    # 0xb3
+'Bao ',    # 0xb4
+'Han ',    # 0xb5
+'Xuan ',    # 0xb6
+'Chuan ',    # 0xb7
+'Liao ',    # 0xb8
+'Xian ',    # 0xb9
+'Dan ',    # 0xba
+'Jing ',    # 0xbb
+'Pie ',    # 0xbc
+'Lin ',    # 0xbd
+'Tun ',    # 0xbe
+'Xi ',    # 0xbf
+'Yi ',    # 0xc0
+'Ji ',    # 0xc1
+'Huang ',    # 0xc2
+'Tai ',    # 0xc3
+'Ye ',    # 0xc4
+'Ye ',    # 0xc5
+'Li ',    # 0xc6
+'Tan ',    # 0xc7
+'Tong ',    # 0xc8
+'Xiao ',    # 0xc9
+'Fei ',    # 0xca
+'Qin ',    # 0xcb
+'Zhao ',    # 0xcc
+'Hao ',    # 0xcd
+'Yi ',    # 0xce
+'Xiang ',    # 0xcf
+'Xing ',    # 0xd0
+'Sen ',    # 0xd1
+'Jiao ',    # 0xd2
+'Bao ',    # 0xd3
+'Jing ',    # 0xd4
+'Yian ',    # 0xd5
+'Ai ',    # 0xd6
+'Ye ',    # 0xd7
+'Ru ',    # 0xd8
+'Shu ',    # 0xd9
+'Meng ',    # 0xda
+'Xun ',    # 0xdb
+'Yao ',    # 0xdc
+'Pu ',    # 0xdd
+'Li ',    # 0xde
+'Chen ',    # 0xdf
+'Kuang ',    # 0xe0
+'Die ',    # 0xe1
+'[?] ',    # 0xe2
+'Yan ',    # 0xe3
+'Huo ',    # 0xe4
+'Lu ',    # 0xe5
+'Xi ',    # 0xe6
+'Rong ',    # 0xe7
+'Long ',    # 0xe8
+'Nang ',    # 0xe9
+'Luo ',    # 0xea
+'Luan ',    # 0xeb
+'Shai ',    # 0xec
+'Tang ',    # 0xed
+'Yan ',    # 0xee
+'Chu ',    # 0xef
+'Yue ',    # 0xf0
+'Yue ',    # 0xf1
+'Qu ',    # 0xf2
+'Yi ',    # 0xf3
+'Geng ',    # 0xf4
+'Ye ',    # 0xf5
+'Hu ',    # 0xf6
+'He ',    # 0xf7
+'Shu ',    # 0xf8
+'Cao ',    # 0xf9
+'Cao ',    # 0xfa
+'Noboru ',    # 0xfb
+'Man ',    # 0xfc
+'Ceng ',    # 0xfd
+'Ceng ',    # 0xfe
+'Ti ',    # 0xff
+)
diff --git a/lib/unidecode/x067.py b/lib/unidecode/x067.py
new file mode 100644
index 00000000..2e863ae0
--- /dev/null
+++ b/lib/unidecode/x067.py
@@ -0,0 +1,258 @@
+data = (
+'Zui ',    # 0x00
+'Can ',    # 0x01
+'Xu ',    # 0x02
+'Hui ',    # 0x03
+'Yin ',    # 0x04
+'Qie ',    # 0x05
+'Fen ',    # 0x06
+'Pi ',    # 0x07
+'Yue ',    # 0x08
+'You ',    # 0x09
+'Ruan ',    # 0x0a
+'Peng ',    # 0x0b
+'Ban ',    # 0x0c
+'Fu ',    # 0x0d
+'Ling ',    # 0x0e
+'Fei ',    # 0x0f
+'Qu ',    # 0x10
+'[?] ',    # 0x11
+'Nu ',    # 0x12
+'Tiao ',    # 0x13
+'Shuo ',    # 0x14
+'Zhen ',    # 0x15
+'Lang ',    # 0x16
+'Lang ',    # 0x17
+'Juan ',    # 0x18
+'Ming ',    # 0x19
+'Huang ',    # 0x1a
+'Wang ',    # 0x1b
+'Tun ',    # 0x1c
+'Zhao ',    # 0x1d
+'Ji ',    # 0x1e
+'Qi ',    # 0x1f
+'Ying ',    # 0x20
+'Zong ',    # 0x21
+'Wang ',    # 0x22
+'Tong ',    # 0x23
+'Lang ',    # 0x24
+'[?] ',    # 0x25
+'Meng ',    # 0x26
+'Long ',    # 0x27
+'Mu ',    # 0x28
+'Deng ',    # 0x29
+'Wei ',    # 0x2a
+'Mo ',    # 0x2b
+'Ben ',    # 0x2c
+'Zha ',    # 0x2d
+'Zhu ',    # 0x2e
+'Zhu ',    # 0x2f
+'[?] ',    # 0x30
+'Zhu ',    # 0x31
+'Ren ',    # 0x32
+'Ba ',    # 0x33
+'Po ',    # 0x34
+'Duo ',    # 0x35
+'Duo ',    # 0x36
+'Dao ',    # 0x37
+'Li ',    # 0x38
+'Qiu ',    # 0x39
+'Ji ',    # 0x3a
+'Jiu ',    # 0x3b
+'Bi ',    # 0x3c
+'Xiu ',    # 0x3d
+'Ting ',    # 0x3e
+'Ci ',    # 0x3f
+'Sha ',    # 0x40
+'Eburi ',    # 0x41
+'Za ',    # 0x42
+'Quan ',    # 0x43
+'Qian ',    # 0x44
+'Yu ',    # 0x45
+'Gan ',    # 0x46
+'Wu ',    # 0x47
+'Cha ',    # 0x48
+'Shan ',    # 0x49
+'Xun ',    # 0x4a
+'Fan ',    # 0x4b
+'Wu ',    # 0x4c
+'Zi ',    # 0x4d
+'Li ',    # 0x4e
+'Xing ',    # 0x4f
+'Cai ',    # 0x50
+'Cun ',    # 0x51
+'Ren ',    # 0x52
+'Shao ',    # 0x53
+'Tuo ',    # 0x54
+'Di ',    # 0x55
+'Zhang ',    # 0x56
+'Mang ',    # 0x57
+'Chi ',    # 0x58
+'Yi ',    # 0x59
+'Gu ',    # 0x5a
+'Gong ',    # 0x5b
+'Du ',    # 0x5c
+'Yi ',    # 0x5d
+'Qi ',    # 0x5e
+'Shu ',    # 0x5f
+'Gang ',    # 0x60
+'Tiao ',    # 0x61
+'Moku ',    # 0x62
+'Soma ',    # 0x63
+'Tochi ',    # 0x64
+'Lai ',    # 0x65
+'Sugi ',    # 0x66
+'Mang ',    # 0x67
+'Yang ',    # 0x68
+'Ma ',    # 0x69
+'Miao ',    # 0x6a
+'Si ',    # 0x6b
+'Yuan ',    # 0x6c
+'Hang ',    # 0x6d
+'Fei ',    # 0x6e
+'Bei ',    # 0x6f
+'Jie ',    # 0x70
+'Dong ',    # 0x71
+'Gao ',    # 0x72
+'Yao ',    # 0x73
+'Xian ',    # 0x74
+'Chu ',    # 0x75
+'Qun ',    # 0x76
+'Pa ',    # 0x77
+'Shu ',    # 0x78
+'Hua ',    # 0x79
+'Xin ',    # 0x7a
+'Chou ',    # 0x7b
+'Zhu ',    # 0x7c
+'Chou ',    # 0x7d
+'Song ',    # 0x7e
+'Ban ',    # 0x7f
+'Song ',    # 0x80
+'Ji ',    # 0x81
+'Yue ',    # 0x82
+'Jin ',    # 0x83
+'Gou ',    # 0x84
+'Ji ',    # 0x85
+'Mao ',    # 0x86
+'Pi ',    # 0x87
+'Bi ',    # 0x88
+'Wang ',    # 0x89
+'Ang ',    # 0x8a
+'Fang ',    # 0x8b
+'Fen ',    # 0x8c
+'Yi ',    # 0x8d
+'Fu ',    # 0x8e
+'Nan ',    # 0x8f
+'Xi ',    # 0x90
+'Hu ',    # 0x91
+'Ya ',    # 0x92
+'Dou ',    # 0x93
+'Xun ',    # 0x94
+'Zhen ',    # 0x95
+'Yao ',    # 0x96
+'Lin ',    # 0x97
+'Rui ',    # 0x98
+'E ',    # 0x99
+'Mei ',    # 0x9a
+'Zhao ',    # 0x9b
+'Guo ',    # 0x9c
+'Zhi ',    # 0x9d
+'Cong ',    # 0x9e
+'Yun ',    # 0x9f
+'Waku ',    # 0xa0
+'Dou ',    # 0xa1
+'Shu ',    # 0xa2
+'Zao ',    # 0xa3
+'[?] ',    # 0xa4
+'Li ',    # 0xa5
+'Haze ',    # 0xa6
+'Jian ',    # 0xa7
+'Cheng ',    # 0xa8
+'Matsu ',    # 0xa9
+'Qiang ',    # 0xaa
+'Feng ',    # 0xab
+'Nan ',    # 0xac
+'Xiao ',    # 0xad
+'Xian ',    # 0xae
+'Ku ',    # 0xaf
+'Ping ',    # 0xb0
+'Yi ',    # 0xb1
+'Xi ',    # 0xb2
+'Zhi ',    # 0xb3
+'Guai ',    # 0xb4
+'Xiao ',    # 0xb5
+'Jia ',    # 0xb6
+'Jia ',    # 0xb7
+'Gou ',    # 0xb8
+'Fu ',    # 0xb9
+'Mo ',    # 0xba
+'Yi ',    # 0xbb
+'Ye ',    # 0xbc
+'Ye ',    # 0xbd
+'Shi ',    # 0xbe
+'Nie ',    # 0xbf
+'Bi ',    # 0xc0
+'Duo ',    # 0xc1
+'Yi ',    # 0xc2
+'Ling ',    # 0xc3
+'Bing ',    # 0xc4
+'Ni ',    # 0xc5
+'La ',    # 0xc6
+'He ',    # 0xc7
+'Pan ',    # 0xc8
+'Fan ',    # 0xc9
+'Zhong ',    # 0xca
+'Dai ',    # 0xcb
+'Ci ',    # 0xcc
+'Yang ',    # 0xcd
+'Fu ',    # 0xce
+'Bo ',    # 0xcf
+'Mou ',    # 0xd0
+'Gan ',    # 0xd1
+'Qi ',    # 0xd2
+'Ran ',    # 0xd3
+'Rou ',    # 0xd4
+'Mao ',    # 0xd5
+'Zhao ',    # 0xd6
+'Song ',    # 0xd7
+'Zhe ',    # 0xd8
+'Xia ',    # 0xd9
+'You ',    # 0xda
+'Shen ',    # 0xdb
+'Ju ',    # 0xdc
+'Tuo ',    # 0xdd
+'Zuo ',    # 0xde
+'Nan ',    # 0xdf
+'Ning ',    # 0xe0
+'Yong ',    # 0xe1
+'Di ',    # 0xe2
+'Zhi ',    # 0xe3
+'Zha ',    # 0xe4
+'Cha ',    # 0xe5
+'Dan ',    # 0xe6
+'Gu ',    # 0xe7
+'Pu ',    # 0xe8
+'Jiu ',    # 0xe9
+'Ao ',    # 0xea
+'Fu ',    # 0xeb
+'Jian ',    # 0xec
+'Bo ',    # 0xed
+'Duo ',    # 0xee
+'Ke ',    # 0xef
+'Nai ',    # 0xf0
+'Zhu ',    # 0xf1
+'Bi ',    # 0xf2
+'Liu ',    # 0xf3
+'Chai ',    # 0xf4
+'Zha ',    # 0xf5
+'Si ',    # 0xf6
+'Zhu ',    # 0xf7
+'Pei ',    # 0xf8
+'Shi ',    # 0xf9
+'Guai ',    # 0xfa
+'Cha ',    # 0xfb
+'Yao ',    # 0xfc
+'Jue ',    # 0xfd
+'Jiu ',    # 0xfe
+'Shi ',    # 0xff
+)
diff --git a/lib/unidecode/x068.py b/lib/unidecode/x068.py
new file mode 100644
index 00000000..c562311c
--- /dev/null
+++ b/lib/unidecode/x068.py
@@ -0,0 +1,258 @@
+data = (
+'Zhi ',    # 0x00
+'Liu ',    # 0x01
+'Mei ',    # 0x02
+'Hoy ',    # 0x03
+'Rong ',    # 0x04
+'Zha ',    # 0x05
+'[?] ',    # 0x06
+'Biao ',    # 0x07
+'Zhan ',    # 0x08
+'Jie ',    # 0x09
+'Long ',    # 0x0a
+'Dong ',    # 0x0b
+'Lu ',    # 0x0c
+'Sayng ',    # 0x0d
+'Li ',    # 0x0e
+'Lan ',    # 0x0f
+'Yong ',    # 0x10
+'Shu ',    # 0x11
+'Xun ',    # 0x12
+'Shuan ',    # 0x13
+'Qi ',    # 0x14
+'Zhen ',    # 0x15
+'Qi ',    # 0x16
+'Li ',    # 0x17
+'Yi ',    # 0x18
+'Xiang ',    # 0x19
+'Zhen ',    # 0x1a
+'Li ',    # 0x1b
+'Su ',    # 0x1c
+'Gua ',    # 0x1d
+'Kan ',    # 0x1e
+'Bing ',    # 0x1f
+'Ren ',    # 0x20
+'Xiao ',    # 0x21
+'Bo ',    # 0x22
+'Ren ',    # 0x23
+'Bing ',    # 0x24
+'Zi ',    # 0x25
+'Chou ',    # 0x26
+'Yi ',    # 0x27
+'Jie ',    # 0x28
+'Xu ',    # 0x29
+'Zhu ',    # 0x2a
+'Jian ',    # 0x2b
+'Zui ',    # 0x2c
+'Er ',    # 0x2d
+'Er ',    # 0x2e
+'You ',    # 0x2f
+'Fa ',    # 0x30
+'Gong ',    # 0x31
+'Kao ',    # 0x32
+'Lao ',    # 0x33
+'Zhan ',    # 0x34
+'Li ',    # 0x35
+'Yin ',    # 0x36
+'Yang ',    # 0x37
+'He ',    # 0x38
+'Gen ',    # 0x39
+'Zhi ',    # 0x3a
+'Chi ',    # 0x3b
+'Ge ',    # 0x3c
+'Zai ',    # 0x3d
+'Luan ',    # 0x3e
+'Fu ',    # 0x3f
+'Jie ',    # 0x40
+'Hang ',    # 0x41
+'Gui ',    # 0x42
+'Tao ',    # 0x43
+'Guang ',    # 0x44
+'Wei ',    # 0x45
+'Kuang ',    # 0x46
+'Ru ',    # 0x47
+'An ',    # 0x48
+'An ',    # 0x49
+'Juan ',    # 0x4a
+'Yi ',    # 0x4b
+'Zhuo ',    # 0x4c
+'Ku ',    # 0x4d
+'Zhi ',    # 0x4e
+'Qiong ',    # 0x4f
+'Tong ',    # 0x50
+'Sang ',    # 0x51
+'Sang ',    # 0x52
+'Huan ',    # 0x53
+'Jie ',    # 0x54
+'Jiu ',    # 0x55
+'Xue ',    # 0x56
+'Duo ',    # 0x57
+'Zhui ',    # 0x58
+'Yu ',    # 0x59
+'Zan ',    # 0x5a
+'Kasei ',    # 0x5b
+'Ying ',    # 0x5c
+'Masu ',    # 0x5d
+'[?] ',    # 0x5e
+'Zhan ',    # 0x5f
+'Ya ',    # 0x60
+'Nao ',    # 0x61
+'Zhen ',    # 0x62
+'Dang ',    # 0x63
+'Qi ',    # 0x64
+'Qiao ',    # 0x65
+'Hua ',    # 0x66
+'Kuai ',    # 0x67
+'Jiang ',    # 0x68
+'Zhuang ',    # 0x69
+'Xun ',    # 0x6a
+'Suo ',    # 0x6b
+'Sha ',    # 0x6c
+'Zhen ',    # 0x6d
+'Bei ',    # 0x6e
+'Ting ',    # 0x6f
+'Gua ',    # 0x70
+'Jing ',    # 0x71
+'Bo ',    # 0x72
+'Ben ',    # 0x73
+'Fu ',    # 0x74
+'Rui ',    # 0x75
+'Tong ',    # 0x76
+'Jue ',    # 0x77
+'Xi ',    # 0x78
+'Lang ',    # 0x79
+'Liu ',    # 0x7a
+'Feng ',    # 0x7b
+'Qi ',    # 0x7c
+'Wen ',    # 0x7d
+'Jun ',    # 0x7e
+'Gan ',    # 0x7f
+'Cu ',    # 0x80
+'Liang ',    # 0x81
+'Qiu ',    # 0x82
+'Ting ',    # 0x83
+'You ',    # 0x84
+'Mei ',    # 0x85
+'Bang ',    # 0x86
+'Long ',    # 0x87
+'Peng ',    # 0x88
+'Zhuang ',    # 0x89
+'Di ',    # 0x8a
+'Xuan ',    # 0x8b
+'Tu ',    # 0x8c
+'Zao ',    # 0x8d
+'Ao ',    # 0x8e
+'Gu ',    # 0x8f
+'Bi ',    # 0x90
+'Di ',    # 0x91
+'Han ',    # 0x92
+'Zi ',    # 0x93
+'Zhi ',    # 0x94
+'Ren ',    # 0x95
+'Bei ',    # 0x96
+'Geng ',    # 0x97
+'Jian ',    # 0x98
+'Huan ',    # 0x99
+'Wan ',    # 0x9a
+'Nuo ',    # 0x9b
+'Jia ',    # 0x9c
+'Tiao ',    # 0x9d
+'Ji ',    # 0x9e
+'Xiao ',    # 0x9f
+'Lu ',    # 0xa0
+'Huan ',    # 0xa1
+'Shao ',    # 0xa2
+'Cen ',    # 0xa3
+'Fen ',    # 0xa4
+'Song ',    # 0xa5
+'Meng ',    # 0xa6
+'Wu ',    # 0xa7
+'Li ',    # 0xa8
+'Li ',    # 0xa9
+'Dou ',    # 0xaa
+'Cen ',    # 0xab
+'Ying ',    # 0xac
+'Suo ',    # 0xad
+'Ju ',    # 0xae
+'Ti ',    # 0xaf
+'Jie ',    # 0xb0
+'Kun ',    # 0xb1
+'Zhuo ',    # 0xb2
+'Shu ',    # 0xb3
+'Chan ',    # 0xb4
+'Fan ',    # 0xb5
+'Wei ',    # 0xb6
+'Jing ',    # 0xb7
+'Li ',    # 0xb8
+'Bing ',    # 0xb9
+'Fumoto ',    # 0xba
+'Shikimi ',    # 0xbb
+'Tao ',    # 0xbc
+'Zhi ',    # 0xbd
+'Lai ',    # 0xbe
+'Lian ',    # 0xbf
+'Jian ',    # 0xc0
+'Zhuo ',    # 0xc1
+'Ling ',    # 0xc2
+'Li ',    # 0xc3
+'Qi ',    # 0xc4
+'Bing ',    # 0xc5
+'Zhun ',    # 0xc6
+'Cong ',    # 0xc7
+'Qian ',    # 0xc8
+'Mian ',    # 0xc9
+'Qi ',    # 0xca
+'Qi ',    # 0xcb
+'Cai ',    # 0xcc
+'Gun ',    # 0xcd
+'Chan ',    # 0xce
+'Te ',    # 0xcf
+'Fei ',    # 0xd0
+'Pai ',    # 0xd1
+'Bang ',    # 0xd2
+'Pou ',    # 0xd3
+'Hun ',    # 0xd4
+'Zong ',    # 0xd5
+'Cheng ',    # 0xd6
+'Zao ',    # 0xd7
+'Ji ',    # 0xd8
+'Li ',    # 0xd9
+'Peng ',    # 0xda
+'Yu ',    # 0xdb
+'Yu ',    # 0xdc
+'Gu ',    # 0xdd
+'Hun ',    # 0xde
+'Dong ',    # 0xdf
+'Tang ',    # 0xe0
+'Gang ',    # 0xe1
+'Wang ',    # 0xe2
+'Di ',    # 0xe3
+'Xi ',    # 0xe4
+'Fan ',    # 0xe5
+'Cheng ',    # 0xe6
+'Zhan ',    # 0xe7
+'Qi ',    # 0xe8
+'Yuan ',    # 0xe9
+'Yan ',    # 0xea
+'Yu ',    # 0xeb
+'Quan ',    # 0xec
+'Yi ',    # 0xed
+'Sen ',    # 0xee
+'Ren ',    # 0xef
+'Chui ',    # 0xf0
+'Leng ',    # 0xf1
+'Qi ',    # 0xf2
+'Zhuo ',    # 0xf3
+'Fu ',    # 0xf4
+'Ke ',    # 0xf5
+'Lai ',    # 0xf6
+'Zou ',    # 0xf7
+'Zou ',    # 0xf8
+'Zhuo ',    # 0xf9
+'Guan ',    # 0xfa
+'Fen ',    # 0xfb
+'Fen ',    # 0xfc
+'Chen ',    # 0xfd
+'Qiong ',    # 0xfe
+'Nie ',    # 0xff
+)
diff --git a/lib/unidecode/x069.py b/lib/unidecode/x069.py
new file mode 100644
index 00000000..7fa8c7de
--- /dev/null
+++ b/lib/unidecode/x069.py
@@ -0,0 +1,258 @@
+data = (
+'Wan ',    # 0x00
+'Guo ',    # 0x01
+'Lu ',    # 0x02
+'Hao ',    # 0x03
+'Jie ',    # 0x04
+'Yi ',    # 0x05
+'Chou ',    # 0x06
+'Ju ',    # 0x07
+'Ju ',    # 0x08
+'Cheng ',    # 0x09
+'Zuo ',    # 0x0a
+'Liang ',    # 0x0b
+'Qiang ',    # 0x0c
+'Zhi ',    # 0x0d
+'Zhui ',    # 0x0e
+'Ya ',    # 0x0f
+'Ju ',    # 0x10
+'Bei ',    # 0x11
+'Jiao ',    # 0x12
+'Zhuo ',    # 0x13
+'Zi ',    # 0x14
+'Bin ',    # 0x15
+'Peng ',    # 0x16
+'Ding ',    # 0x17
+'Chu ',    # 0x18
+'Chang ',    # 0x19
+'Kunugi ',    # 0x1a
+'Momiji ',    # 0x1b
+'Jian ',    # 0x1c
+'Gui ',    # 0x1d
+'Xi ',    # 0x1e
+'Du ',    # 0x1f
+'Qian ',    # 0x20
+'Kunugi ',    # 0x21
+'Soko ',    # 0x22
+'Shide ',    # 0x23
+'Luo ',    # 0x24
+'Zhi ',    # 0x25
+'Ken ',    # 0x26
+'Myeng ',    # 0x27
+'Tafu ',    # 0x28
+'[?] ',    # 0x29
+'Peng ',    # 0x2a
+'Zhan ',    # 0x2b
+'[?] ',    # 0x2c
+'Tuo ',    # 0x2d
+'Sen ',    # 0x2e
+'Duo ',    # 0x2f
+'Ye ',    # 0x30
+'Fou ',    # 0x31
+'Wei ',    # 0x32
+'Wei ',    # 0x33
+'Duan ',    # 0x34
+'Jia ',    # 0x35
+'Zong ',    # 0x36
+'Jian ',    # 0x37
+'Yi ',    # 0x38
+'Shen ',    # 0x39
+'Xi ',    # 0x3a
+'Yan ',    # 0x3b
+'Yan ',    # 0x3c
+'Chuan ',    # 0x3d
+'Zhan ',    # 0x3e
+'Chun ',    # 0x3f
+'Yu ',    # 0x40
+'He ',    # 0x41
+'Zha ',    # 0x42
+'Wo ',    # 0x43
+'Pian ',    # 0x44
+'Bi ',    # 0x45
+'Yao ',    # 0x46
+'Huo ',    # 0x47
+'Xu ',    # 0x48
+'Ruo ',    # 0x49
+'Yang ',    # 0x4a
+'La ',    # 0x4b
+'Yan ',    # 0x4c
+'Ben ',    # 0x4d
+'Hun ',    # 0x4e
+'Kui ',    # 0x4f
+'Jie ',    # 0x50
+'Kui ',    # 0x51
+'Si ',    # 0x52
+'Feng ',    # 0x53
+'Xie ',    # 0x54
+'Tuo ',    # 0x55
+'Zhi ',    # 0x56
+'Jian ',    # 0x57
+'Mu ',    # 0x58
+'Mao ',    # 0x59
+'Chu ',    # 0x5a
+'Hu ',    # 0x5b
+'Hu ',    # 0x5c
+'Lian ',    # 0x5d
+'Leng ',    # 0x5e
+'Ting ',    # 0x5f
+'Nan ',    # 0x60
+'Yu ',    # 0x61
+'You ',    # 0x62
+'Mei ',    # 0x63
+'Song ',    # 0x64
+'Xuan ',    # 0x65
+'Xuan ',    # 0x66
+'Ying ',    # 0x67
+'Zhen ',    # 0x68
+'Pian ',    # 0x69
+'Ye ',    # 0x6a
+'Ji ',    # 0x6b
+'Jie ',    # 0x6c
+'Ye ',    # 0x6d
+'Chu ',    # 0x6e
+'Shun ',    # 0x6f
+'Yu ',    # 0x70
+'Cou ',    # 0x71
+'Wei ',    # 0x72
+'Mei ',    # 0x73
+'Di ',    # 0x74
+'Ji ',    # 0x75
+'Jie ',    # 0x76
+'Kai ',    # 0x77
+'Qiu ',    # 0x78
+'Ying ',    # 0x79
+'Rou ',    # 0x7a
+'Heng ',    # 0x7b
+'Lou ',    # 0x7c
+'Le ',    # 0x7d
+'Hazou ',    # 0x7e
+'Katsura ',    # 0x7f
+'Pin ',    # 0x80
+'Muro ',    # 0x81
+'Gai ',    # 0x82
+'Tan ',    # 0x83
+'Lan ',    # 0x84
+'Yun ',    # 0x85
+'Yu ',    # 0x86
+'Chen ',    # 0x87
+'Lu ',    # 0x88
+'Ju ',    # 0x89
+'Sakaki ',    # 0x8a
+'[?] ',    # 0x8b
+'Pi ',    # 0x8c
+'Xie ',    # 0x8d
+'Jia ',    # 0x8e
+'Yi ',    # 0x8f
+'Zhan ',    # 0x90
+'Fu ',    # 0x91
+'Nai ',    # 0x92
+'Mi ',    # 0x93
+'Lang ',    # 0x94
+'Rong ',    # 0x95
+'Gu ',    # 0x96
+'Jian ',    # 0x97
+'Ju ',    # 0x98
+'Ta ',    # 0x99
+'Yao ',    # 0x9a
+'Zhen ',    # 0x9b
+'Bang ',    # 0x9c
+'Sha ',    # 0x9d
+'Yuan ',    # 0x9e
+'Zi ',    # 0x9f
+'Ming ',    # 0xa0
+'Su ',    # 0xa1
+'Jia ',    # 0xa2
+'Yao ',    # 0xa3
+'Jie ',    # 0xa4
+'Huang ',    # 0xa5
+'Gan ',    # 0xa6
+'Fei ',    # 0xa7
+'Zha ',    # 0xa8
+'Qian ',    # 0xa9
+'Ma ',    # 0xaa
+'Sun ',    # 0xab
+'Yuan ',    # 0xac
+'Xie ',    # 0xad
+'Rong ',    # 0xae
+'Shi ',    # 0xaf
+'Zhi ',    # 0xb0
+'Cui ',    # 0xb1
+'Yun ',    # 0xb2
+'Ting ',    # 0xb3
+'Liu ',    # 0xb4
+'Rong ',    # 0xb5
+'Tang ',    # 0xb6
+'Que ',    # 0xb7
+'Zhai ',    # 0xb8
+'Si ',    # 0xb9
+'Sheng ',    # 0xba
+'Ta ',    # 0xbb
+'Ke ',    # 0xbc
+'Xi ',    # 0xbd
+'Gu ',    # 0xbe
+'Qi ',    # 0xbf
+'Kao ',    # 0xc0
+'Gao ',    # 0xc1
+'Sun ',    # 0xc2
+'Pan ',    # 0xc3
+'Tao ',    # 0xc4
+'Ge ',    # 0xc5
+'Xun ',    # 0xc6
+'Dian ',    # 0xc7
+'Nou ',    # 0xc8
+'Ji ',    # 0xc9
+'Shuo ',    # 0xca
+'Gou ',    # 0xcb
+'Chui ',    # 0xcc
+'Qiang ',    # 0xcd
+'Cha ',    # 0xce
+'Qian ',    # 0xcf
+'Huai ',    # 0xd0
+'Mei ',    # 0xd1
+'Xu ',    # 0xd2
+'Gang ',    # 0xd3
+'Gao ',    # 0xd4
+'Zhuo ',    # 0xd5
+'Tuo ',    # 0xd6
+'Hashi ',    # 0xd7
+'Yang ',    # 0xd8
+'Dian ',    # 0xd9
+'Jia ',    # 0xda
+'Jian ',    # 0xdb
+'Zui ',    # 0xdc
+'Kashi ',    # 0xdd
+'Ori ',    # 0xde
+'Bin ',    # 0xdf
+'Zhu ',    # 0xe0
+'[?] ',    # 0xe1
+'Xi ',    # 0xe2
+'Qi ',    # 0xe3
+'Lian ',    # 0xe4
+'Hui ',    # 0xe5
+'Yong ',    # 0xe6
+'Qian ',    # 0xe7
+'Guo ',    # 0xe8
+'Gai ',    # 0xe9
+'Gai ',    # 0xea
+'Tuan ',    # 0xeb
+'Hua ',    # 0xec
+'Cu ',    # 0xed
+'Sen ',    # 0xee
+'Cui ',    # 0xef
+'Beng ',    # 0xf0
+'You ',    # 0xf1
+'Hu ',    # 0xf2
+'Jiang ',    # 0xf3
+'Hu ',    # 0xf4
+'Huan ',    # 0xf5
+'Kui ',    # 0xf6
+'Yi ',    # 0xf7
+'Nie ',    # 0xf8
+'Gao ',    # 0xf9
+'Kang ',    # 0xfa
+'Gui ',    # 0xfb
+'Gui ',    # 0xfc
+'Cao ',    # 0xfd
+'Man ',    # 0xfe
+'Jin ',    # 0xff
+)
diff --git a/lib/unidecode/x06a.py b/lib/unidecode/x06a.py
new file mode 100644
index 00000000..12fcabd5
--- /dev/null
+++ b/lib/unidecode/x06a.py
@@ -0,0 +1,258 @@
+data = (
+'Di ',    # 0x00
+'Zhuang ',    # 0x01
+'Le ',    # 0x02
+'Lang ',    # 0x03
+'Chen ',    # 0x04
+'Cong ',    # 0x05
+'Li ',    # 0x06
+'Xiu ',    # 0x07
+'Qing ',    # 0x08
+'Shuang ',    # 0x09
+'Fan ',    # 0x0a
+'Tong ',    # 0x0b
+'Guan ',    # 0x0c
+'Ji ',    # 0x0d
+'Suo ',    # 0x0e
+'Lei ',    # 0x0f
+'Lu ',    # 0x10
+'Liang ',    # 0x11
+'Mi ',    # 0x12
+'Lou ',    # 0x13
+'Chao ',    # 0x14
+'Su ',    # 0x15
+'Ke ',    # 0x16
+'Shu ',    # 0x17
+'Tang ',    # 0x18
+'Biao ',    # 0x19
+'Lu ',    # 0x1a
+'Jiu ',    # 0x1b
+'Shu ',    # 0x1c
+'Zha ',    # 0x1d
+'Shu ',    # 0x1e
+'Zhang ',    # 0x1f
+'Men ',    # 0x20
+'Mo ',    # 0x21
+'Niao ',    # 0x22
+'Yang ',    # 0x23
+'Tiao ',    # 0x24
+'Peng ',    # 0x25
+'Zhu ',    # 0x26
+'Sha ',    # 0x27
+'Xi ',    # 0x28
+'Quan ',    # 0x29
+'Heng ',    # 0x2a
+'Jian ',    # 0x2b
+'Cong ',    # 0x2c
+'[?] ',    # 0x2d
+'Hokuso ',    # 0x2e
+'Qiang ',    # 0x2f
+'Tara ',    # 0x30
+'Ying ',    # 0x31
+'Er ',    # 0x32
+'Xin ',    # 0x33
+'Zhi ',    # 0x34
+'Qiao ',    # 0x35
+'Zui ',    # 0x36
+'Cong ',    # 0x37
+'Pu ',    # 0x38
+'Shu ',    # 0x39
+'Hua ',    # 0x3a
+'Kui ',    # 0x3b
+'Zhen ',    # 0x3c
+'Zun ',    # 0x3d
+'Yue ',    # 0x3e
+'Zhan ',    # 0x3f
+'Xi ',    # 0x40
+'Xun ',    # 0x41
+'Dian ',    # 0x42
+'Fa ',    # 0x43
+'Gan ',    # 0x44
+'Mo ',    # 0x45
+'Wu ',    # 0x46
+'Qiao ',    # 0x47
+'Nao ',    # 0x48
+'Lin ',    # 0x49
+'Liu ',    # 0x4a
+'Qiao ',    # 0x4b
+'Xian ',    # 0x4c
+'Run ',    # 0x4d
+'Fan ',    # 0x4e
+'Zhan ',    # 0x4f
+'Tuo ',    # 0x50
+'Lao ',    # 0x51
+'Yun ',    # 0x52
+'Shun ',    # 0x53
+'Tui ',    # 0x54
+'Cheng ',    # 0x55
+'Tang ',    # 0x56
+'Meng ',    # 0x57
+'Ju ',    # 0x58
+'Cheng ',    # 0x59
+'Su ',    # 0x5a
+'Jue ',    # 0x5b
+'Jue ',    # 0x5c
+'Tan ',    # 0x5d
+'Hui ',    # 0x5e
+'Ji ',    # 0x5f
+'Nuo ',    # 0x60
+'Xiang ',    # 0x61
+'Tuo ',    # 0x62
+'Ning ',    # 0x63
+'Rui ',    # 0x64
+'Zhu ',    # 0x65
+'Chuang ',    # 0x66
+'Zeng ',    # 0x67
+'Fen ',    # 0x68
+'Qiong ',    # 0x69
+'Ran ',    # 0x6a
+'Heng ',    # 0x6b
+'Cen ',    # 0x6c
+'Gu ',    # 0x6d
+'Liu ',    # 0x6e
+'Lao ',    # 0x6f
+'Gao ',    # 0x70
+'Chu ',    # 0x71
+'Zusa ',    # 0x72
+'Nude ',    # 0x73
+'Ca ',    # 0x74
+'San ',    # 0x75
+'Ji ',    # 0x76
+'Dou ',    # 0x77
+'Shou ',    # 0x78
+'Lu ',    # 0x79
+'[?] ',    # 0x7a
+'[?] ',    # 0x7b
+'Yuan ',    # 0x7c
+'Ta ',    # 0x7d
+'Shu ',    # 0x7e
+'Jiang ',    # 0x7f
+'Tan ',    # 0x80
+'Lin ',    # 0x81
+'Nong ',    # 0x82
+'Yin ',    # 0x83
+'Xi ',    # 0x84
+'Sui ',    # 0x85
+'Shan ',    # 0x86
+'Zui ',    # 0x87
+'Xuan ',    # 0x88
+'Cheng ',    # 0x89
+'Gan ',    # 0x8a
+'Ju ',    # 0x8b
+'Zui ',    # 0x8c
+'Yi ',    # 0x8d
+'Qin ',    # 0x8e
+'Pu ',    # 0x8f
+'Yan ',    # 0x90
+'Lei ',    # 0x91
+'Feng ',    # 0x92
+'Hui ',    # 0x93
+'Dang ',    # 0x94
+'Ji ',    # 0x95
+'Sui ',    # 0x96
+'Bo ',    # 0x97
+'Bi ',    # 0x98
+'Ding ',    # 0x99
+'Chu ',    # 0x9a
+'Zhua ',    # 0x9b
+'Kuai ',    # 0x9c
+'Ji ',    # 0x9d
+'Jie ',    # 0x9e
+'Jia ',    # 0x9f
+'Qing ',    # 0xa0
+'Zhe ',    # 0xa1
+'Jian ',    # 0xa2
+'Qiang ',    # 0xa3
+'Dao ',    # 0xa4
+'Yi ',    # 0xa5
+'Biao ',    # 0xa6
+'Song ',    # 0xa7
+'She ',    # 0xa8
+'Lin ',    # 0xa9
+'Kunugi ',    # 0xaa
+'Cha ',    # 0xab
+'Meng ',    # 0xac
+'Yin ',    # 0xad
+'Tao ',    # 0xae
+'Tai ',    # 0xaf
+'Mian ',    # 0xb0
+'Qi ',    # 0xb1
+'Toan ',    # 0xb2
+'Bin ',    # 0xb3
+'Huo ',    # 0xb4
+'Ji ',    # 0xb5
+'Qian ',    # 0xb6
+'Mi ',    # 0xb7
+'Ning ',    # 0xb8
+'Yi ',    # 0xb9
+'Gao ',    # 0xba
+'Jian ',    # 0xbb
+'Yin ',    # 0xbc
+'Er ',    # 0xbd
+'Qing ',    # 0xbe
+'Yan ',    # 0xbf
+'Qi ',    # 0xc0
+'Mi ',    # 0xc1
+'Zhao ',    # 0xc2
+'Gui ',    # 0xc3
+'Chun ',    # 0xc4
+'Ji ',    # 0xc5
+'Kui ',    # 0xc6
+'Po ',    # 0xc7
+'Deng ',    # 0xc8
+'Chu ',    # 0xc9
+'[?] ',    # 0xca
+'Mian ',    # 0xcb
+'You ',    # 0xcc
+'Zhi ',    # 0xcd
+'Guang ',    # 0xce
+'Qian ',    # 0xcf
+'Lei ',    # 0xd0
+'Lei ',    # 0xd1
+'Sa ',    # 0xd2
+'Lu ',    # 0xd3
+'Li ',    # 0xd4
+'Cuan ',    # 0xd5
+'Lu ',    # 0xd6
+'Mie ',    # 0xd7
+'Hui ',    # 0xd8
+'Ou ',    # 0xd9
+'Lu ',    # 0xda
+'Jie ',    # 0xdb
+'Gao ',    # 0xdc
+'Du ',    # 0xdd
+'Yuan ',    # 0xde
+'Li ',    # 0xdf
+'Fei ',    # 0xe0
+'Zhuo ',    # 0xe1
+'Sou ',    # 0xe2
+'Lian ',    # 0xe3
+'Tamo ',    # 0xe4
+'Chu ',    # 0xe5
+'[?] ',    # 0xe6
+'Zhu ',    # 0xe7
+'Lu ',    # 0xe8
+'Yan ',    # 0xe9
+'Li ',    # 0xea
+'Zhu ',    # 0xeb
+'Chen ',    # 0xec
+'Jie ',    # 0xed
+'E ',    # 0xee
+'Su ',    # 0xef
+'Huai ',    # 0xf0
+'Nie ',    # 0xf1
+'Yu ',    # 0xf2
+'Long ',    # 0xf3
+'Lai ',    # 0xf4
+'[?] ',    # 0xf5
+'Xian ',    # 0xf6
+'Kwi ',    # 0xf7
+'Ju ',    # 0xf8
+'Xiao ',    # 0xf9
+'Ling ',    # 0xfa
+'Ying ',    # 0xfb
+'Jian ',    # 0xfc
+'Yin ',    # 0xfd
+'You ',    # 0xfe
+'Ying ',    # 0xff
+)
diff --git a/lib/unidecode/x06b.py b/lib/unidecode/x06b.py
new file mode 100644
index 00000000..56aa7c65
--- /dev/null
+++ b/lib/unidecode/x06b.py
@@ -0,0 +1,258 @@
+data = (
+'Xiang ',    # 0x00
+'Nong ',    # 0x01
+'Bo ',    # 0x02
+'Chan ',    # 0x03
+'Lan ',    # 0x04
+'Ju ',    # 0x05
+'Shuang ',    # 0x06
+'She ',    # 0x07
+'Wei ',    # 0x08
+'Cong ',    # 0x09
+'Quan ',    # 0x0a
+'Qu ',    # 0x0b
+'Cang ',    # 0x0c
+'[?] ',    # 0x0d
+'Yu ',    # 0x0e
+'Luo ',    # 0x0f
+'Li ',    # 0x10
+'Zan ',    # 0x11
+'Luan ',    # 0x12
+'Dang ',    # 0x13
+'Jue ',    # 0x14
+'Em ',    # 0x15
+'Lan ',    # 0x16
+'Lan ',    # 0x17
+'Zhu ',    # 0x18
+'Lei ',    # 0x19
+'Li ',    # 0x1a
+'Ba ',    # 0x1b
+'Nang ',    # 0x1c
+'Yu ',    # 0x1d
+'Ling ',    # 0x1e
+'Tsuki ',    # 0x1f
+'Qian ',    # 0x20
+'Ci ',    # 0x21
+'Huan ',    # 0x22
+'Xin ',    # 0x23
+'Yu ',    # 0x24
+'Yu ',    # 0x25
+'Qian ',    # 0x26
+'Ou ',    # 0x27
+'Xu ',    # 0x28
+'Chao ',    # 0x29
+'Chu ',    # 0x2a
+'Chi ',    # 0x2b
+'Kai ',    # 0x2c
+'Yi ',    # 0x2d
+'Jue ',    # 0x2e
+'Xi ',    # 0x2f
+'Xu ',    # 0x30
+'Xia ',    # 0x31
+'Yu ',    # 0x32
+'Kuai ',    # 0x33
+'Lang ',    # 0x34
+'Kuan ',    # 0x35
+'Shuo ',    # 0x36
+'Xi ',    # 0x37
+'Ai ',    # 0x38
+'Yi ',    # 0x39
+'Qi ',    # 0x3a
+'Hu ',    # 0x3b
+'Chi ',    # 0x3c
+'Qin ',    # 0x3d
+'Kuan ',    # 0x3e
+'Kan ',    # 0x3f
+'Kuan ',    # 0x40
+'Kan ',    # 0x41
+'Chuan ',    # 0x42
+'Sha ',    # 0x43
+'Gua ',    # 0x44
+'Yin ',    # 0x45
+'Xin ',    # 0x46
+'Xie ',    # 0x47
+'Yu ',    # 0x48
+'Qian ',    # 0x49
+'Xiao ',    # 0x4a
+'Yi ',    # 0x4b
+'Ge ',    # 0x4c
+'Wu ',    # 0x4d
+'Tan ',    # 0x4e
+'Jin ',    # 0x4f
+'Ou ',    # 0x50
+'Hu ',    # 0x51
+'Ti ',    # 0x52
+'Huan ',    # 0x53
+'Xu ',    # 0x54
+'Pen ',    # 0x55
+'Xi ',    # 0x56
+'Xiao ',    # 0x57
+'Xu ',    # 0x58
+'Xi ',    # 0x59
+'Sen ',    # 0x5a
+'Lian ',    # 0x5b
+'Chu ',    # 0x5c
+'Yi ',    # 0x5d
+'Kan ',    # 0x5e
+'Yu ',    # 0x5f
+'Chuo ',    # 0x60
+'Huan ',    # 0x61
+'Zhi ',    # 0x62
+'Zheng ',    # 0x63
+'Ci ',    # 0x64
+'Bu ',    # 0x65
+'Wu ',    # 0x66
+'Qi ',    # 0x67
+'Bu ',    # 0x68
+'Bu ',    # 0x69
+'Wai ',    # 0x6a
+'Ju ',    # 0x6b
+'Qian ',    # 0x6c
+'Chi ',    # 0x6d
+'Se ',    # 0x6e
+'Chi ',    # 0x6f
+'Se ',    # 0x70
+'Zhong ',    # 0x71
+'Sui ',    # 0x72
+'Sui ',    # 0x73
+'Li ',    # 0x74
+'Cuo ',    # 0x75
+'Yu ',    # 0x76
+'Li ',    # 0x77
+'Gui ',    # 0x78
+'Dai ',    # 0x79
+'Dai ',    # 0x7a
+'Si ',    # 0x7b
+'Jian ',    # 0x7c
+'Zhe ',    # 0x7d
+'Mo ',    # 0x7e
+'Mo ',    # 0x7f
+'Yao ',    # 0x80
+'Mo ',    # 0x81
+'Cu ',    # 0x82
+'Yang ',    # 0x83
+'Tian ',    # 0x84
+'Sheng ',    # 0x85
+'Dai ',    # 0x86
+'Shang ',    # 0x87
+'Xu ',    # 0x88
+'Xun ',    # 0x89
+'Shu ',    # 0x8a
+'Can ',    # 0x8b
+'Jue ',    # 0x8c
+'Piao ',    # 0x8d
+'Qia ',    # 0x8e
+'Qiu ',    # 0x8f
+'Su ',    # 0x90
+'Qing ',    # 0x91
+'Yun ',    # 0x92
+'Lian ',    # 0x93
+'Yi ',    # 0x94
+'Fou ',    # 0x95
+'Zhi ',    # 0x96
+'Ye ',    # 0x97
+'Can ',    # 0x98
+'Hun ',    # 0x99
+'Dan ',    # 0x9a
+'Ji ',    # 0x9b
+'Ye ',    # 0x9c
+'Zhen ',    # 0x9d
+'Yun ',    # 0x9e
+'Wen ',    # 0x9f
+'Chou ',    # 0xa0
+'Bin ',    # 0xa1
+'Ti ',    # 0xa2
+'Jin ',    # 0xa3
+'Shang ',    # 0xa4
+'Yin ',    # 0xa5
+'Diao ',    # 0xa6
+'Cu ',    # 0xa7
+'Hui ',    # 0xa8
+'Cuan ',    # 0xa9
+'Yi ',    # 0xaa
+'Dan ',    # 0xab
+'Du ',    # 0xac
+'Jiang ',    # 0xad
+'Lian ',    # 0xae
+'Bin ',    # 0xaf
+'Du ',    # 0xb0
+'Tsukusu ',    # 0xb1
+'Jian ',    # 0xb2
+'Shu ',    # 0xb3
+'Ou ',    # 0xb4
+'Duan ',    # 0xb5
+'Zhu ',    # 0xb6
+'Yin ',    # 0xb7
+'Qing ',    # 0xb8
+'Yi ',    # 0xb9
+'Sha ',    # 0xba
+'Que ',    # 0xbb
+'Ke ',    # 0xbc
+'Yao ',    # 0xbd
+'Jun ',    # 0xbe
+'Dian ',    # 0xbf
+'Hui ',    # 0xc0
+'Hui ',    # 0xc1
+'Gu ',    # 0xc2
+'Que ',    # 0xc3
+'Ji ',    # 0xc4
+'Yi ',    # 0xc5
+'Ou ',    # 0xc6
+'Hui ',    # 0xc7
+'Duan ',    # 0xc8
+'Yi ',    # 0xc9
+'Xiao ',    # 0xca
+'Wu ',    # 0xcb
+'Guan ',    # 0xcc
+'Mu ',    # 0xcd
+'Mei ',    # 0xce
+'Mei ',    # 0xcf
+'Ai ',    # 0xd0
+'Zuo ',    # 0xd1
+'Du ',    # 0xd2
+'Yu ',    # 0xd3
+'Bi ',    # 0xd4
+'Bi ',    # 0xd5
+'Bi ',    # 0xd6
+'Pi ',    # 0xd7
+'Pi ',    # 0xd8
+'Bi ',    # 0xd9
+'Chan ',    # 0xda
+'Mao ',    # 0xdb
+'[?] ',    # 0xdc
+'[?] ',    # 0xdd
+'Pu ',    # 0xde
+'Mushiru ',    # 0xdf
+'Jia ',    # 0xe0
+'Zhan ',    # 0xe1
+'Sai ',    # 0xe2
+'Mu ',    # 0xe3
+'Tuo ',    # 0xe4
+'Xun ',    # 0xe5
+'Er ',    # 0xe6
+'Rong ',    # 0xe7
+'Xian ',    # 0xe8
+'Ju ',    # 0xe9
+'Mu ',    # 0xea
+'Hao ',    # 0xeb
+'Qiu ',    # 0xec
+'Dou ',    # 0xed
+'Mushiru ',    # 0xee
+'Tan ',    # 0xef
+'Pei ',    # 0xf0
+'Ju ',    # 0xf1
+'Duo ',    # 0xf2
+'Cui ',    # 0xf3
+'Bi ',    # 0xf4
+'San ',    # 0xf5
+'[?] ',    # 0xf6
+'Mao ',    # 0xf7
+'Sui ',    # 0xf8
+'Yu ',    # 0xf9
+'Yu ',    # 0xfa
+'Tuo ',    # 0xfb
+'He ',    # 0xfc
+'Jian ',    # 0xfd
+'Ta ',    # 0xfe
+'San ',    # 0xff
+)
diff --git a/lib/unidecode/x06c.py b/lib/unidecode/x06c.py
new file mode 100644
index 00000000..a1534e74
--- /dev/null
+++ b/lib/unidecode/x06c.py
@@ -0,0 +1,258 @@
+data = (
+'Lu ',    # 0x00
+'Mu ',    # 0x01
+'Li ',    # 0x02
+'Tong ',    # 0x03
+'Rong ',    # 0x04
+'Chang ',    # 0x05
+'Pu ',    # 0x06
+'Luo ',    # 0x07
+'Zhan ',    # 0x08
+'Sao ',    # 0x09
+'Zhan ',    # 0x0a
+'Meng ',    # 0x0b
+'Luo ',    # 0x0c
+'Qu ',    # 0x0d
+'Die ',    # 0x0e
+'Shi ',    # 0x0f
+'Di ',    # 0x10
+'Min ',    # 0x11
+'Jue ',    # 0x12
+'Mang ',    # 0x13
+'Qi ',    # 0x14
+'Pie ',    # 0x15
+'Nai ',    # 0x16
+'Qi ',    # 0x17
+'Dao ',    # 0x18
+'Xian ',    # 0x19
+'Chuan ',    # 0x1a
+'Fen ',    # 0x1b
+'Ri ',    # 0x1c
+'Nei ',    # 0x1d
+'[?] ',    # 0x1e
+'Fu ',    # 0x1f
+'Shen ',    # 0x20
+'Dong ',    # 0x21
+'Qing ',    # 0x22
+'Qi ',    # 0x23
+'Yin ',    # 0x24
+'Xi ',    # 0x25
+'Hai ',    # 0x26
+'Yang ',    # 0x27
+'An ',    # 0x28
+'Ya ',    # 0x29
+'Ke ',    # 0x2a
+'Qing ',    # 0x2b
+'Ya ',    # 0x2c
+'Dong ',    # 0x2d
+'Dan ',    # 0x2e
+'Lu ',    # 0x2f
+'Qing ',    # 0x30
+'Yang ',    # 0x31
+'Yun ',    # 0x32
+'Yun ',    # 0x33
+'Shui ',    # 0x34
+'San ',    # 0x35
+'Zheng ',    # 0x36
+'Bing ',    # 0x37
+'Yong ',    # 0x38
+'Dang ',    # 0x39
+'Shitamizu ',    # 0x3a
+'Le ',    # 0x3b
+'Ni ',    # 0x3c
+'Tun ',    # 0x3d
+'Fan ',    # 0x3e
+'Gui ',    # 0x3f
+'Ting ',    # 0x40
+'Zhi ',    # 0x41
+'Qiu ',    # 0x42
+'Bin ',    # 0x43
+'Ze ',    # 0x44
+'Mian ',    # 0x45
+'Cuan ',    # 0x46
+'Hui ',    # 0x47
+'Diao ',    # 0x48
+'Yi ',    # 0x49
+'Cha ',    # 0x4a
+'Zhuo ',    # 0x4b
+'Chuan ',    # 0x4c
+'Wan ',    # 0x4d
+'Fan ',    # 0x4e
+'Dai ',    # 0x4f
+'Xi ',    # 0x50
+'Tuo ',    # 0x51
+'Mang ',    # 0x52
+'Qiu ',    # 0x53
+'Qi ',    # 0x54
+'Shan ',    # 0x55
+'Pai ',    # 0x56
+'Han ',    # 0x57
+'Qian ',    # 0x58
+'Wu ',    # 0x59
+'Wu ',    # 0x5a
+'Xun ',    # 0x5b
+'Si ',    # 0x5c
+'Ru ',    # 0x5d
+'Gong ',    # 0x5e
+'Jiang ',    # 0x5f
+'Chi ',    # 0x60
+'Wu ',    # 0x61
+'Tsuchi ',    # 0x62
+'[?] ',    # 0x63
+'Tang ',    # 0x64
+'Zhi ',    # 0x65
+'Chi ',    # 0x66
+'Qian ',    # 0x67
+'Mi ',    # 0x68
+'Yu ',    # 0x69
+'Wang ',    # 0x6a
+'Qing ',    # 0x6b
+'Jing ',    # 0x6c
+'Rui ',    # 0x6d
+'Jun ',    # 0x6e
+'Hong ',    # 0x6f
+'Tai ',    # 0x70
+'Quan ',    # 0x71
+'Ji ',    # 0x72
+'Bian ',    # 0x73
+'Bian ',    # 0x74
+'Gan ',    # 0x75
+'Wen ',    # 0x76
+'Zhong ',    # 0x77
+'Fang ',    # 0x78
+'Xiong ',    # 0x79
+'Jue ',    # 0x7a
+'Hang ',    # 0x7b
+'Niou ',    # 0x7c
+'Qi ',    # 0x7d
+'Fen ',    # 0x7e
+'Xu ',    # 0x7f
+'Xu ',    # 0x80
+'Qin ',    # 0x81
+'Yi ',    # 0x82
+'Wo ',    # 0x83
+'Yun ',    # 0x84
+'Yuan ',    # 0x85
+'Hang ',    # 0x86
+'Yan ',    # 0x87
+'Chen ',    # 0x88
+'Chen ',    # 0x89
+'Dan ',    # 0x8a
+'You ',    # 0x8b
+'Dun ',    # 0x8c
+'Hu ',    # 0x8d
+'Huo ',    # 0x8e
+'Qie ',    # 0x8f
+'Mu ',    # 0x90
+'Rou ',    # 0x91
+'Mei ',    # 0x92
+'Ta ',    # 0x93
+'Mian ',    # 0x94
+'Wu ',    # 0x95
+'Chong ',    # 0x96
+'Tian ',    # 0x97
+'Bi ',    # 0x98
+'Sha ',    # 0x99
+'Zhi ',    # 0x9a
+'Pei ',    # 0x9b
+'Pan ',    # 0x9c
+'Zhui ',    # 0x9d
+'Za ',    # 0x9e
+'Gou ',    # 0x9f
+'Liu ',    # 0xa0
+'Mei ',    # 0xa1
+'Ze ',    # 0xa2
+'Feng ',    # 0xa3
+'Ou ',    # 0xa4
+'Li ',    # 0xa5
+'Lun ',    # 0xa6
+'Cang ',    # 0xa7
+'Feng ',    # 0xa8
+'Wei ',    # 0xa9
+'Hu ',    # 0xaa
+'Mo ',    # 0xab
+'Mei ',    # 0xac
+'Shu ',    # 0xad
+'Ju ',    # 0xae
+'Zan ',    # 0xaf
+'Tuo ',    # 0xb0
+'Tuo ',    # 0xb1
+'Tuo ',    # 0xb2
+'He ',    # 0xb3
+'Li ',    # 0xb4
+'Mi ',    # 0xb5
+'Yi ',    # 0xb6
+'Fa ',    # 0xb7
+'Fei ',    # 0xb8
+'You ',    # 0xb9
+'Tian ',    # 0xba
+'Zhi ',    # 0xbb
+'Zhao ',    # 0xbc
+'Gu ',    # 0xbd
+'Zhan ',    # 0xbe
+'Yan ',    # 0xbf
+'Si ',    # 0xc0
+'Kuang ',    # 0xc1
+'Jiong ',    # 0xc2
+'Ju ',    # 0xc3
+'Xie ',    # 0xc4
+'Qiu ',    # 0xc5
+'Yi ',    # 0xc6
+'Jia ',    # 0xc7
+'Zhong ',    # 0xc8
+'Quan ',    # 0xc9
+'Bo ',    # 0xca
+'Hui ',    # 0xcb
+'Mi ',    # 0xcc
+'Ben ',    # 0xcd
+'Zhuo ',    # 0xce
+'Chu ',    # 0xcf
+'Le ',    # 0xd0
+'You ',    # 0xd1
+'Gu ',    # 0xd2
+'Hong ',    # 0xd3
+'Gan ',    # 0xd4
+'Fa ',    # 0xd5
+'Mao ',    # 0xd6
+'Si ',    # 0xd7
+'Hu ',    # 0xd8
+'Ping ',    # 0xd9
+'Ci ',    # 0xda
+'Fan ',    # 0xdb
+'Chi ',    # 0xdc
+'Su ',    # 0xdd
+'Ning ',    # 0xde
+'Cheng ',    # 0xdf
+'Ling ',    # 0xe0
+'Pao ',    # 0xe1
+'Bo ',    # 0xe2
+'Qi ',    # 0xe3
+'Si ',    # 0xe4
+'Ni ',    # 0xe5
+'Ju ',    # 0xe6
+'Yue ',    # 0xe7
+'Zhu ',    # 0xe8
+'Sheng ',    # 0xe9
+'Lei ',    # 0xea
+'Xuan ',    # 0xeb
+'Xue ',    # 0xec
+'Fu ',    # 0xed
+'Pan ',    # 0xee
+'Min ',    # 0xef
+'Tai ',    # 0xf0
+'Yang ',    # 0xf1
+'Ji ',    # 0xf2
+'Yong ',    # 0xf3
+'Guan ',    # 0xf4
+'Beng ',    # 0xf5
+'Xue ',    # 0xf6
+'Long ',    # 0xf7
+'Lu ',    # 0xf8
+'[?] ',    # 0xf9
+'Bo ',    # 0xfa
+'Xie ',    # 0xfb
+'Po ',    # 0xfc
+'Ze ',    # 0xfd
+'Jing ',    # 0xfe
+'Yin ',    # 0xff
+)
diff --git a/lib/unidecode/x06d.py b/lib/unidecode/x06d.py
new file mode 100644
index 00000000..a9113465
--- /dev/null
+++ b/lib/unidecode/x06d.py
@@ -0,0 +1,258 @@
+data = (
+'Zhou ',    # 0x00
+'Ji ',    # 0x01
+'Yi ',    # 0x02
+'Hui ',    # 0x03
+'Hui ',    # 0x04
+'Zui ',    # 0x05
+'Cheng ',    # 0x06
+'Yin ',    # 0x07
+'Wei ',    # 0x08
+'Hou ',    # 0x09
+'Jian ',    # 0x0a
+'Yang ',    # 0x0b
+'Lie ',    # 0x0c
+'Si ',    # 0x0d
+'Ji ',    # 0x0e
+'Er ',    # 0x0f
+'Xing ',    # 0x10
+'Fu ',    # 0x11
+'Sa ',    # 0x12
+'Suo ',    # 0x13
+'Zhi ',    # 0x14
+'Yin ',    # 0x15
+'Wu ',    # 0x16
+'Xi ',    # 0x17
+'Kao ',    # 0x18
+'Zhu ',    # 0x19
+'Jiang ',    # 0x1a
+'Luo ',    # 0x1b
+'[?] ',    # 0x1c
+'An ',    # 0x1d
+'Dong ',    # 0x1e
+'Yi ',    # 0x1f
+'Mou ',    # 0x20
+'Lei ',    # 0x21
+'Yi ',    # 0x22
+'Mi ',    # 0x23
+'Quan ',    # 0x24
+'Jin ',    # 0x25
+'Mo ',    # 0x26
+'Wei ',    # 0x27
+'Xiao ',    # 0x28
+'Xie ',    # 0x29
+'Hong ',    # 0x2a
+'Xu ',    # 0x2b
+'Shuo ',    # 0x2c
+'Kuang ',    # 0x2d
+'Tao ',    # 0x2e
+'Qie ',    # 0x2f
+'Ju ',    # 0x30
+'Er ',    # 0x31
+'Zhou ',    # 0x32
+'Ru ',    # 0x33
+'Ping ',    # 0x34
+'Xun ',    # 0x35
+'Xiong ',    # 0x36
+'Zhi ',    # 0x37
+'Guang ',    # 0x38
+'Huan ',    # 0x39
+'Ming ',    # 0x3a
+'Huo ',    # 0x3b
+'Wa ',    # 0x3c
+'Qia ',    # 0x3d
+'Pai ',    # 0x3e
+'Wu ',    # 0x3f
+'Qu ',    # 0x40
+'Liu ',    # 0x41
+'Yi ',    # 0x42
+'Jia ',    # 0x43
+'Jing ',    # 0x44
+'Qian ',    # 0x45
+'Jiang ',    # 0x46
+'Jiao ',    # 0x47
+'Cheng ',    # 0x48
+'Shi ',    # 0x49
+'Zhuo ',    # 0x4a
+'Ce ',    # 0x4b
+'Pal ',    # 0x4c
+'Kuai ',    # 0x4d
+'Ji ',    # 0x4e
+'Liu ',    # 0x4f
+'Chan ',    # 0x50
+'Hun ',    # 0x51
+'Hu ',    # 0x52
+'Nong ',    # 0x53
+'Xun ',    # 0x54
+'Jin ',    # 0x55
+'Lie ',    # 0x56
+'Qiu ',    # 0x57
+'Wei ',    # 0x58
+'Zhe ',    # 0x59
+'Jun ',    # 0x5a
+'Han ',    # 0x5b
+'Bang ',    # 0x5c
+'Mang ',    # 0x5d
+'Zhuo ',    # 0x5e
+'You ',    # 0x5f
+'Xi ',    # 0x60
+'Bo ',    # 0x61
+'Dou ',    # 0x62
+'Wan ',    # 0x63
+'Hong ',    # 0x64
+'Yi ',    # 0x65
+'Pu ',    # 0x66
+'Ying ',    # 0x67
+'Lan ',    # 0x68
+'Hao ',    # 0x69
+'Lang ',    # 0x6a
+'Han ',    # 0x6b
+'Li ',    # 0x6c
+'Geng ',    # 0x6d
+'Fu ',    # 0x6e
+'Wu ',    # 0x6f
+'Lian ',    # 0x70
+'Chun ',    # 0x71
+'Feng ',    # 0x72
+'Yi ',    # 0x73
+'Yu ',    # 0x74
+'Tong ',    # 0x75
+'Lao ',    # 0x76
+'Hai ',    # 0x77
+'Jin ',    # 0x78
+'Jia ',    # 0x79
+'Chong ',    # 0x7a
+'Weng ',    # 0x7b
+'Mei ',    # 0x7c
+'Sui ',    # 0x7d
+'Cheng ',    # 0x7e
+'Pei ',    # 0x7f
+'Xian ',    # 0x80
+'Shen ',    # 0x81
+'Tu ',    # 0x82
+'Kun ',    # 0x83
+'Pin ',    # 0x84
+'Nie ',    # 0x85
+'Han ',    # 0x86
+'Jing ',    # 0x87
+'Xiao ',    # 0x88
+'She ',    # 0x89
+'Nian ',    # 0x8a
+'Tu ',    # 0x8b
+'Yong ',    # 0x8c
+'Xiao ',    # 0x8d
+'Xian ',    # 0x8e
+'Ting ',    # 0x8f
+'E ',    # 0x90
+'Su ',    # 0x91
+'Tun ',    # 0x92
+'Juan ',    # 0x93
+'Cen ',    # 0x94
+'Ti ',    # 0x95
+'Li ',    # 0x96
+'Shui ',    # 0x97
+'Si ',    # 0x98
+'Lei ',    # 0x99
+'Shui ',    # 0x9a
+'Tao ',    # 0x9b
+'Du ',    # 0x9c
+'Lao ',    # 0x9d
+'Lai ',    # 0x9e
+'Lian ',    # 0x9f
+'Wei ',    # 0xa0
+'Wo ',    # 0xa1
+'Yun ',    # 0xa2
+'Huan ',    # 0xa3
+'Di ',    # 0xa4
+'[?] ',    # 0xa5
+'Run ',    # 0xa6
+'Jian ',    # 0xa7
+'Zhang ',    # 0xa8
+'Se ',    # 0xa9
+'Fu ',    # 0xaa
+'Guan ',    # 0xab
+'Xing ',    # 0xac
+'Shou ',    # 0xad
+'Shuan ',    # 0xae
+'Ya ',    # 0xaf
+'Chuo ',    # 0xb0
+'Zhang ',    # 0xb1
+'Ye ',    # 0xb2
+'Kong ',    # 0xb3
+'Wo ',    # 0xb4
+'Han ',    # 0xb5
+'Tuo ',    # 0xb6
+'Dong ',    # 0xb7
+'He ',    # 0xb8
+'Wo ',    # 0xb9
+'Ju ',    # 0xba
+'Gan ',    # 0xbb
+'Liang ',    # 0xbc
+'Hun ',    # 0xbd
+'Ta ',    # 0xbe
+'Zhuo ',    # 0xbf
+'Dian ',    # 0xc0
+'Qie ',    # 0xc1
+'De ',    # 0xc2
+'Juan ',    # 0xc3
+'Zi ',    # 0xc4
+'Xi ',    # 0xc5
+'Yao ',    # 0xc6
+'Qi ',    # 0xc7
+'Gu ',    # 0xc8
+'Guo ',    # 0xc9
+'Han ',    # 0xca
+'Lin ',    # 0xcb
+'Tang ',    # 0xcc
+'Zhou ',    # 0xcd
+'Peng ',    # 0xce
+'Hao ',    # 0xcf
+'Chang ',    # 0xd0
+'Shu ',    # 0xd1
+'Qi ',    # 0xd2
+'Fang ',    # 0xd3
+'Chi ',    # 0xd4
+'Lu ',    # 0xd5
+'Nao ',    # 0xd6
+'Ju ',    # 0xd7
+'Tao ',    # 0xd8
+'Cong ',    # 0xd9
+'Lei ',    # 0xda
+'Zhi ',    # 0xdb
+'Peng ',    # 0xdc
+'Fei ',    # 0xdd
+'Song ',    # 0xde
+'Tian ',    # 0xdf
+'Pi ',    # 0xe0
+'Dan ',    # 0xe1
+'Yu ',    # 0xe2
+'Ni ',    # 0xe3
+'Yu ',    # 0xe4
+'Lu ',    # 0xe5
+'Gan ',    # 0xe6
+'Mi ',    # 0xe7
+'Jing ',    # 0xe8
+'Ling ',    # 0xe9
+'Lun ',    # 0xea
+'Yin ',    # 0xeb
+'Cui ',    # 0xec
+'Qu ',    # 0xed
+'Huai ',    # 0xee
+'Yu ',    # 0xef
+'Nian ',    # 0xf0
+'Shen ',    # 0xf1
+'Piao ',    # 0xf2
+'Chun ',    # 0xf3
+'Wa ',    # 0xf4
+'Yuan ',    # 0xf5
+'Lai ',    # 0xf6
+'Hun ',    # 0xf7
+'Qing ',    # 0xf8
+'Yan ',    # 0xf9
+'Qian ',    # 0xfa
+'Tian ',    # 0xfb
+'Miao ',    # 0xfc
+'Zhi ',    # 0xfd
+'Yin ',    # 0xfe
+'Mi ',    # 0xff
+)
diff --git a/lib/unidecode/x06e.py b/lib/unidecode/x06e.py
new file mode 100644
index 00000000..d4698fd4
--- /dev/null
+++ b/lib/unidecode/x06e.py
@@ -0,0 +1,258 @@
+data = (
+'Ben ',    # 0x00
+'Yuan ',    # 0x01
+'Wen ',    # 0x02
+'Re ',    # 0x03
+'Fei ',    # 0x04
+'Qing ',    # 0x05
+'Yuan ',    # 0x06
+'Ke ',    # 0x07
+'Ji ',    # 0x08
+'She ',    # 0x09
+'Yuan ',    # 0x0a
+'Shibui ',    # 0x0b
+'Lu ',    # 0x0c
+'Zi ',    # 0x0d
+'Du ',    # 0x0e
+'[?] ',    # 0x0f
+'Jian ',    # 0x10
+'Min ',    # 0x11
+'Pi ',    # 0x12
+'Tani ',    # 0x13
+'Yu ',    # 0x14
+'Yuan ',    # 0x15
+'Shen ',    # 0x16
+'Shen ',    # 0x17
+'Rou ',    # 0x18
+'Huan ',    # 0x19
+'Zhu ',    # 0x1a
+'Jian ',    # 0x1b
+'Nuan ',    # 0x1c
+'Yu ',    # 0x1d
+'Qiu ',    # 0x1e
+'Ting ',    # 0x1f
+'Qu ',    # 0x20
+'Du ',    # 0x21
+'Feng ',    # 0x22
+'Zha ',    # 0x23
+'Bo ',    # 0x24
+'Wo ',    # 0x25
+'Wo ',    # 0x26
+'Di ',    # 0x27
+'Wei ',    # 0x28
+'Wen ',    # 0x29
+'Ru ',    # 0x2a
+'Xie ',    # 0x2b
+'Ce ',    # 0x2c
+'Wei ',    # 0x2d
+'Ge ',    # 0x2e
+'Gang ',    # 0x2f
+'Yan ',    # 0x30
+'Hong ',    # 0x31
+'Xuan ',    # 0x32
+'Mi ',    # 0x33
+'Ke ',    # 0x34
+'Mao ',    # 0x35
+'Ying ',    # 0x36
+'Yan ',    # 0x37
+'You ',    # 0x38
+'Hong ',    # 0x39
+'Miao ',    # 0x3a
+'Xing ',    # 0x3b
+'Mei ',    # 0x3c
+'Zai ',    # 0x3d
+'Hun ',    # 0x3e
+'Nai ',    # 0x3f
+'Kui ',    # 0x40
+'Shi ',    # 0x41
+'E ',    # 0x42
+'Pai ',    # 0x43
+'Mei ',    # 0x44
+'Lian ',    # 0x45
+'Qi ',    # 0x46
+'Qi ',    # 0x47
+'Mei ',    # 0x48
+'Tian ',    # 0x49
+'Cou ',    # 0x4a
+'Wei ',    # 0x4b
+'Can ',    # 0x4c
+'Tuan ',    # 0x4d
+'Mian ',    # 0x4e
+'Hui ',    # 0x4f
+'Mo ',    # 0x50
+'Xu ',    # 0x51
+'Ji ',    # 0x52
+'Pen ',    # 0x53
+'Jian ',    # 0x54
+'Jian ',    # 0x55
+'Hu ',    # 0x56
+'Feng ',    # 0x57
+'Xiang ',    # 0x58
+'Yi ',    # 0x59
+'Yin ',    # 0x5a
+'Zhan ',    # 0x5b
+'Shi ',    # 0x5c
+'Jie ',    # 0x5d
+'Cheng ',    # 0x5e
+'Huang ',    # 0x5f
+'Tan ',    # 0x60
+'Yu ',    # 0x61
+'Bi ',    # 0x62
+'Min ',    # 0x63
+'Shi ',    # 0x64
+'Tu ',    # 0x65
+'Sheng ',    # 0x66
+'Yong ',    # 0x67
+'Qu ',    # 0x68
+'Zhong ',    # 0x69
+'Suei ',    # 0x6a
+'Jiu ',    # 0x6b
+'Jiao ',    # 0x6c
+'Qiou ',    # 0x6d
+'Yin ',    # 0x6e
+'Tang ',    # 0x6f
+'Long ',    # 0x70
+'Huo ',    # 0x71
+'Yuan ',    # 0x72
+'Nan ',    # 0x73
+'Ban ',    # 0x74
+'You ',    # 0x75
+'Quan ',    # 0x76
+'Chui ',    # 0x77
+'Liang ',    # 0x78
+'Chan ',    # 0x79
+'Yan ',    # 0x7a
+'Chun ',    # 0x7b
+'Nie ',    # 0x7c
+'Zi ',    # 0x7d
+'Wan ',    # 0x7e
+'Shi ',    # 0x7f
+'Man ',    # 0x80
+'Ying ',    # 0x81
+'Ratsu ',    # 0x82
+'Kui ',    # 0x83
+'[?] ',    # 0x84
+'Jian ',    # 0x85
+'Xu ',    # 0x86
+'Lu ',    # 0x87
+'Gui ',    # 0x88
+'Gai ',    # 0x89
+'[?] ',    # 0x8a
+'[?] ',    # 0x8b
+'Po ',    # 0x8c
+'Jin ',    # 0x8d
+'Gui ',    # 0x8e
+'Tang ',    # 0x8f
+'Yuan ',    # 0x90
+'Suo ',    # 0x91
+'Yuan ',    # 0x92
+'Lian ',    # 0x93
+'Yao ',    # 0x94
+'Meng ',    # 0x95
+'Zhun ',    # 0x96
+'Sheng ',    # 0x97
+'Ke ',    # 0x98
+'Tai ',    # 0x99
+'Da ',    # 0x9a
+'Wa ',    # 0x9b
+'Liu ',    # 0x9c
+'Gou ',    # 0x9d
+'Sao ',    # 0x9e
+'Ming ',    # 0x9f
+'Zha ',    # 0xa0
+'Shi ',    # 0xa1
+'Yi ',    # 0xa2
+'Lun ',    # 0xa3
+'Ma ',    # 0xa4
+'Pu ',    # 0xa5
+'Wei ',    # 0xa6
+'Li ',    # 0xa7
+'Cai ',    # 0xa8
+'Wu ',    # 0xa9
+'Xi ',    # 0xaa
+'Wen ',    # 0xab
+'Qiang ',    # 0xac
+'Ze ',    # 0xad
+'Shi ',    # 0xae
+'Su ',    # 0xaf
+'Yi ',    # 0xb0
+'Zhen ',    # 0xb1
+'Sou ',    # 0xb2
+'Yun ',    # 0xb3
+'Xiu ',    # 0xb4
+'Yin ',    # 0xb5
+'Rong ',    # 0xb6
+'Hun ',    # 0xb7
+'Su ',    # 0xb8
+'Su ',    # 0xb9
+'Ni ',    # 0xba
+'Ta ',    # 0xbb
+'Shi ',    # 0xbc
+'Ru ',    # 0xbd
+'Wei ',    # 0xbe
+'Pan ',    # 0xbf
+'Chu ',    # 0xc0
+'Chu ',    # 0xc1
+'Pang ',    # 0xc2
+'Weng ',    # 0xc3
+'Cang ',    # 0xc4
+'Mie ',    # 0xc5
+'He ',    # 0xc6
+'Dian ',    # 0xc7
+'Hao ',    # 0xc8
+'Huang ',    # 0xc9
+'Xi ',    # 0xca
+'Zi ',    # 0xcb
+'Di ',    # 0xcc
+'Zhi ',    # 0xcd
+'Ying ',    # 0xce
+'Fu ',    # 0xcf
+'Jie ',    # 0xd0
+'Hua ',    # 0xd1
+'Ge ',    # 0xd2
+'Zi ',    # 0xd3
+'Tao ',    # 0xd4
+'Teng ',    # 0xd5
+'Sui ',    # 0xd6
+'Bi ',    # 0xd7
+'Jiao ',    # 0xd8
+'Hui ',    # 0xd9
+'Gun ',    # 0xda
+'Yin ',    # 0xdb
+'Gao ',    # 0xdc
+'Long ',    # 0xdd
+'Zhi ',    # 0xde
+'Yan ',    # 0xdf
+'She ',    # 0xe0
+'Man ',    # 0xe1
+'Ying ',    # 0xe2
+'Chun ',    # 0xe3
+'Lu ',    # 0xe4
+'Lan ',    # 0xe5
+'Luan ',    # 0xe6
+'[?] ',    # 0xe7
+'Bin ',    # 0xe8
+'Tan ',    # 0xe9
+'Yu ',    # 0xea
+'Sou ',    # 0xeb
+'Hu ',    # 0xec
+'Bi ',    # 0xed
+'Biao ',    # 0xee
+'Zhi ',    # 0xef
+'Jiang ',    # 0xf0
+'Kou ',    # 0xf1
+'Shen ',    # 0xf2
+'Shang ',    # 0xf3
+'Di ',    # 0xf4
+'Mi ',    # 0xf5
+'Ao ',    # 0xf6
+'Lu ',    # 0xf7
+'Hu ',    # 0xf8
+'Hu ',    # 0xf9
+'You ',    # 0xfa
+'Chan ',    # 0xfb
+'Fan ',    # 0xfc
+'Yong ',    # 0xfd
+'Gun ',    # 0xfe
+'Man ',    # 0xff
+)
diff --git a/lib/unidecode/x06f.py b/lib/unidecode/x06f.py
new file mode 100644
index 00000000..36bf2a26
--- /dev/null
+++ b/lib/unidecode/x06f.py
@@ -0,0 +1,258 @@
+data = (
+'Qing ',    # 0x00
+'Yu ',    # 0x01
+'Piao ',    # 0x02
+'Ji ',    # 0x03
+'Ya ',    # 0x04
+'Jiao ',    # 0x05
+'Qi ',    # 0x06
+'Xi ',    # 0x07
+'Ji ',    # 0x08
+'Lu ',    # 0x09
+'Lu ',    # 0x0a
+'Long ',    # 0x0b
+'Jin ',    # 0x0c
+'Guo ',    # 0x0d
+'Cong ',    # 0x0e
+'Lou ',    # 0x0f
+'Zhi ',    # 0x10
+'Gai ',    # 0x11
+'Qiang ',    # 0x12
+'Li ',    # 0x13
+'Yan ',    # 0x14
+'Cao ',    # 0x15
+'Jiao ',    # 0x16
+'Cong ',    # 0x17
+'Qun ',    # 0x18
+'Tuan ',    # 0x19
+'Ou ',    # 0x1a
+'Teng ',    # 0x1b
+'Ye ',    # 0x1c
+'Xi ',    # 0x1d
+'Mi ',    # 0x1e
+'Tang ',    # 0x1f
+'Mo ',    # 0x20
+'Shang ',    # 0x21
+'Han ',    # 0x22
+'Lian ',    # 0x23
+'Lan ',    # 0x24
+'Wa ',    # 0x25
+'Li ',    # 0x26
+'Qian ',    # 0x27
+'Feng ',    # 0x28
+'Xuan ',    # 0x29
+'Yi ',    # 0x2a
+'Man ',    # 0x2b
+'Zi ',    # 0x2c
+'Mang ',    # 0x2d
+'Kang ',    # 0x2e
+'Lei ',    # 0x2f
+'Peng ',    # 0x30
+'Shu ',    # 0x31
+'Zhang ',    # 0x32
+'Zhang ',    # 0x33
+'Chong ',    # 0x34
+'Xu ',    # 0x35
+'Huan ',    # 0x36
+'Kuo ',    # 0x37
+'Jian ',    # 0x38
+'Yan ',    # 0x39
+'Chuang ',    # 0x3a
+'Liao ',    # 0x3b
+'Cui ',    # 0x3c
+'Ti ',    # 0x3d
+'Yang ',    # 0x3e
+'Jiang ',    # 0x3f
+'Cong ',    # 0x40
+'Ying ',    # 0x41
+'Hong ',    # 0x42
+'Xun ',    # 0x43
+'Shu ',    # 0x44
+'Guan ',    # 0x45
+'Ying ',    # 0x46
+'Xiao ',    # 0x47
+'[?] ',    # 0x48
+'[?] ',    # 0x49
+'Xu ',    # 0x4a
+'Lian ',    # 0x4b
+'Zhi ',    # 0x4c
+'Wei ',    # 0x4d
+'Pi ',    # 0x4e
+'Jue ',    # 0x4f
+'Jiao ',    # 0x50
+'Po ',    # 0x51
+'Dang ',    # 0x52
+'Hui ',    # 0x53
+'Jie ',    # 0x54
+'Wu ',    # 0x55
+'Pa ',    # 0x56
+'Ji ',    # 0x57
+'Pan ',    # 0x58
+'Gui ',    # 0x59
+'Xiao ',    # 0x5a
+'Qian ',    # 0x5b
+'Qian ',    # 0x5c
+'Xi ',    # 0x5d
+'Lu ',    # 0x5e
+'Xi ',    # 0x5f
+'Xuan ',    # 0x60
+'Dun ',    # 0x61
+'Huang ',    # 0x62
+'Min ',    # 0x63
+'Run ',    # 0x64
+'Su ',    # 0x65
+'Liao ',    # 0x66
+'Zhen ',    # 0x67
+'Zhong ',    # 0x68
+'Yi ',    # 0x69
+'Di ',    # 0x6a
+'Wan ',    # 0x6b
+'Dan ',    # 0x6c
+'Tan ',    # 0x6d
+'Chao ',    # 0x6e
+'Xun ',    # 0x6f
+'Kui ',    # 0x70
+'Yie ',    # 0x71
+'Shao ',    # 0x72
+'Tu ',    # 0x73
+'Zhu ',    # 0x74
+'San ',    # 0x75
+'Hei ',    # 0x76
+'Bi ',    # 0x77
+'Shan ',    # 0x78
+'Chan ',    # 0x79
+'Chan ',    # 0x7a
+'Shu ',    # 0x7b
+'Tong ',    # 0x7c
+'Pu ',    # 0x7d
+'Lin ',    # 0x7e
+'Wei ',    # 0x7f
+'Se ',    # 0x80
+'Se ',    # 0x81
+'Cheng ',    # 0x82
+'Jiong ',    # 0x83
+'Cheng ',    # 0x84
+'Hua ',    # 0x85
+'Jiao ',    # 0x86
+'Lao ',    # 0x87
+'Che ',    # 0x88
+'Gan ',    # 0x89
+'Cun ',    # 0x8a
+'Heng ',    # 0x8b
+'Si ',    # 0x8c
+'Shu ',    # 0x8d
+'Peng ',    # 0x8e
+'Han ',    # 0x8f
+'Yun ',    # 0x90
+'Liu ',    # 0x91
+'Hong ',    # 0x92
+'Fu ',    # 0x93
+'Hao ',    # 0x94
+'He ',    # 0x95
+'Xian ',    # 0x96
+'Jian ',    # 0x97
+'Shan ',    # 0x98
+'Xi ',    # 0x99
+'Oki ',    # 0x9a
+'[?] ',    # 0x9b
+'Lan ',    # 0x9c
+'[?] ',    # 0x9d
+'Yu ',    # 0x9e
+'Lin ',    # 0x9f
+'Min ',    # 0xa0
+'Zao ',    # 0xa1
+'Dang ',    # 0xa2
+'Wan ',    # 0xa3
+'Ze ',    # 0xa4
+'Xie ',    # 0xa5
+'Yu ',    # 0xa6
+'Li ',    # 0xa7
+'Shi ',    # 0xa8
+'Xue ',    # 0xa9
+'Ling ',    # 0xaa
+'Man ',    # 0xab
+'Zi ',    # 0xac
+'Yong ',    # 0xad
+'Kuai ',    # 0xae
+'Can ',    # 0xaf
+'Lian ',    # 0xb0
+'Dian ',    # 0xb1
+'Ye ',    # 0xb2
+'Ao ',    # 0xb3
+'Huan ',    # 0xb4
+'Zhen ',    # 0xb5
+'Chan ',    # 0xb6
+'Man ',    # 0xb7
+'Dan ',    # 0xb8
+'Dan ',    # 0xb9
+'Yi ',    # 0xba
+'Sui ',    # 0xbb
+'Pi ',    # 0xbc
+'Ju ',    # 0xbd
+'Ta ',    # 0xbe
+'Qin ',    # 0xbf
+'Ji ',    # 0xc0
+'Zhuo ',    # 0xc1
+'Lian ',    # 0xc2
+'Nong ',    # 0xc3
+'Guo ',    # 0xc4
+'Jin ',    # 0xc5
+'Fen ',    # 0xc6
+'Se ',    # 0xc7
+'Ji ',    # 0xc8
+'Sui ',    # 0xc9
+'Hui ',    # 0xca
+'Chu ',    # 0xcb
+'Ta ',    # 0xcc
+'Song ',    # 0xcd
+'Ding ',    # 0xce
+'[?] ',    # 0xcf
+'Zhu ',    # 0xd0
+'Lai ',    # 0xd1
+'Bin ',    # 0xd2
+'Lian ',    # 0xd3
+'Mi ',    # 0xd4
+'Shi ',    # 0xd5
+'Shu ',    # 0xd6
+'Mi ',    # 0xd7
+'Ning ',    # 0xd8
+'Ying ',    # 0xd9
+'Ying ',    # 0xda
+'Meng ',    # 0xdb
+'Jin ',    # 0xdc
+'Qi ',    # 0xdd
+'Pi ',    # 0xde
+'Ji ',    # 0xdf
+'Hao ',    # 0xe0
+'Ru ',    # 0xe1
+'Zui ',    # 0xe2
+'Wo ',    # 0xe3
+'Tao ',    # 0xe4
+'Yin ',    # 0xe5
+'Yin ',    # 0xe6
+'Dui ',    # 0xe7
+'Ci ',    # 0xe8
+'Huo ',    # 0xe9
+'Jing ',    # 0xea
+'Lan ',    # 0xeb
+'Jun ',    # 0xec
+'Ai ',    # 0xed
+'Pu ',    # 0xee
+'Zhuo ',    # 0xef
+'Wei ',    # 0xf0
+'Bin ',    # 0xf1
+'Gu ',    # 0xf2
+'Qian ',    # 0xf3
+'Xing ',    # 0xf4
+'Hama ',    # 0xf5
+'Kuo ',    # 0xf6
+'Fei ',    # 0xf7
+'[?] ',    # 0xf8
+'Boku ',    # 0xf9
+'Jian ',    # 0xfa
+'Wei ',    # 0xfb
+'Luo ',    # 0xfc
+'Zan ',    # 0xfd
+'Lu ',    # 0xfe
+'Li ',    # 0xff
+)
diff --git a/lib/unidecode/x070.py b/lib/unidecode/x070.py
new file mode 100644
index 00000000..b12567ff
--- /dev/null
+++ b/lib/unidecode/x070.py
@@ -0,0 +1,258 @@
+data = (
+'You ',    # 0x00
+'Yang ',    # 0x01
+'Lu ',    # 0x02
+'Si ',    # 0x03
+'Jie ',    # 0x04
+'Ying ',    # 0x05
+'Du ',    # 0x06
+'Wang ',    # 0x07
+'Hui ',    # 0x08
+'Xie ',    # 0x09
+'Pan ',    # 0x0a
+'Shen ',    # 0x0b
+'Biao ',    # 0x0c
+'Chan ',    # 0x0d
+'Mo ',    # 0x0e
+'Liu ',    # 0x0f
+'Jian ',    # 0x10
+'Pu ',    # 0x11
+'Se ',    # 0x12
+'Cheng ',    # 0x13
+'Gu ',    # 0x14
+'Bin ',    # 0x15
+'Huo ',    # 0x16
+'Xian ',    # 0x17
+'Lu ',    # 0x18
+'Qin ',    # 0x19
+'Han ',    # 0x1a
+'Ying ',    # 0x1b
+'Yong ',    # 0x1c
+'Li ',    # 0x1d
+'Jing ',    # 0x1e
+'Xiao ',    # 0x1f
+'Ying ',    # 0x20
+'Sui ',    # 0x21
+'Wei ',    # 0x22
+'Xie ',    # 0x23
+'Huai ',    # 0x24
+'Hao ',    # 0x25
+'Zhu ',    # 0x26
+'Long ',    # 0x27
+'Lai ',    # 0x28
+'Dui ',    # 0x29
+'Fan ',    # 0x2a
+'Hu ',    # 0x2b
+'Lai ',    # 0x2c
+'[?] ',    # 0x2d
+'[?] ',    # 0x2e
+'Ying ',    # 0x2f
+'Mi ',    # 0x30
+'Ji ',    # 0x31
+'Lian ',    # 0x32
+'Jian ',    # 0x33
+'Ying ',    # 0x34
+'Fen ',    # 0x35
+'Lin ',    # 0x36
+'Yi ',    # 0x37
+'Jian ',    # 0x38
+'Yue ',    # 0x39
+'Chan ',    # 0x3a
+'Dai ',    # 0x3b
+'Rang ',    # 0x3c
+'Jian ',    # 0x3d
+'Lan ',    # 0x3e
+'Fan ',    # 0x3f
+'Shuang ',    # 0x40
+'Yuan ',    # 0x41
+'Zhuo ',    # 0x42
+'Feng ',    # 0x43
+'She ',    # 0x44
+'Lei ',    # 0x45
+'Lan ',    # 0x46
+'Cong ',    # 0x47
+'Qu ',    # 0x48
+'Yong ',    # 0x49
+'Qian ',    # 0x4a
+'Fa ',    # 0x4b
+'Guan ',    # 0x4c
+'Que ',    # 0x4d
+'Yan ',    # 0x4e
+'Hao ',    # 0x4f
+'Hyeng ',    # 0x50
+'Sa ',    # 0x51
+'Zan ',    # 0x52
+'Luan ',    # 0x53
+'Yan ',    # 0x54
+'Li ',    # 0x55
+'Mi ',    # 0x56
+'Shan ',    # 0x57
+'Tan ',    # 0x58
+'Dang ',    # 0x59
+'Jiao ',    # 0x5a
+'Chan ',    # 0x5b
+'[?] ',    # 0x5c
+'Hao ',    # 0x5d
+'Ba ',    # 0x5e
+'Zhu ',    # 0x5f
+'Lan ',    # 0x60
+'Lan ',    # 0x61
+'Nang ',    # 0x62
+'Wan ',    # 0x63
+'Luan ',    # 0x64
+'Xun ',    # 0x65
+'Xian ',    # 0x66
+'Yan ',    # 0x67
+'Gan ',    # 0x68
+'Yan ',    # 0x69
+'Yu ',    # 0x6a
+'Huo ',    # 0x6b
+'Si ',    # 0x6c
+'Mie ',    # 0x6d
+'Guang ',    # 0x6e
+'Deng ',    # 0x6f
+'Hui ',    # 0x70
+'Xiao ',    # 0x71
+'Xiao ',    # 0x72
+'Hu ',    # 0x73
+'Hong ',    # 0x74
+'Ling ',    # 0x75
+'Zao ',    # 0x76
+'Zhuan ',    # 0x77
+'Jiu ',    # 0x78
+'Zha ',    # 0x79
+'Xie ',    # 0x7a
+'Chi ',    # 0x7b
+'Zhuo ',    # 0x7c
+'Zai ',    # 0x7d
+'Zai ',    # 0x7e
+'Can ',    # 0x7f
+'Yang ',    # 0x80
+'Qi ',    # 0x81
+'Zhong ',    # 0x82
+'Fen ',    # 0x83
+'Niu ',    # 0x84
+'Jiong ',    # 0x85
+'Wen ',    # 0x86
+'Po ',    # 0x87
+'Yi ',    # 0x88
+'Lu ',    # 0x89
+'Chui ',    # 0x8a
+'Pi ',    # 0x8b
+'Kai ',    # 0x8c
+'Pan ',    # 0x8d
+'Yan ',    # 0x8e
+'Kai ',    # 0x8f
+'Pang ',    # 0x90
+'Mu ',    # 0x91
+'Chao ',    # 0x92
+'Liao ',    # 0x93
+'Gui ',    # 0x94
+'Kang ',    # 0x95
+'Tun ',    # 0x96
+'Guang ',    # 0x97
+'Xin ',    # 0x98
+'Zhi ',    # 0x99
+'Guang ',    # 0x9a
+'Guang ',    # 0x9b
+'Wei ',    # 0x9c
+'Qiang ',    # 0x9d
+'[?] ',    # 0x9e
+'Da ',    # 0x9f
+'Xia ',    # 0xa0
+'Zheng ',    # 0xa1
+'Zhu ',    # 0xa2
+'Ke ',    # 0xa3
+'Zhao ',    # 0xa4
+'Fu ',    # 0xa5
+'Ba ',    # 0xa6
+'Duo ',    # 0xa7
+'Duo ',    # 0xa8
+'Ling ',    # 0xa9
+'Zhuo ',    # 0xaa
+'Xuan ',    # 0xab
+'Ju ',    # 0xac
+'Tan ',    # 0xad
+'Pao ',    # 0xae
+'Jiong ',    # 0xaf
+'Pao ',    # 0xb0
+'Tai ',    # 0xb1
+'Tai ',    # 0xb2
+'Bing ',    # 0xb3
+'Yang ',    # 0xb4
+'Tong ',    # 0xb5
+'Han ',    # 0xb6
+'Zhu ',    # 0xb7
+'Zha ',    # 0xb8
+'Dian ',    # 0xb9
+'Wei ',    # 0xba
+'Shi ',    # 0xbb
+'Lian ',    # 0xbc
+'Chi ',    # 0xbd
+'Huang ',    # 0xbe
+'[?] ',    # 0xbf
+'Hu ',    # 0xc0
+'Shuo ',    # 0xc1
+'Lan ',    # 0xc2
+'Jing ',    # 0xc3
+'Jiao ',    # 0xc4
+'Xu ',    # 0xc5
+'Xing ',    # 0xc6
+'Quan ',    # 0xc7
+'Lie ',    # 0xc8
+'Huan ',    # 0xc9
+'Yang ',    # 0xca
+'Xiao ',    # 0xcb
+'Xiu ',    # 0xcc
+'Xian ',    # 0xcd
+'Yin ',    # 0xce
+'Wu ',    # 0xcf
+'Zhou ',    # 0xd0
+'Yao ',    # 0xd1
+'Shi ',    # 0xd2
+'Wei ',    # 0xd3
+'Tong ',    # 0xd4
+'Xue ',    # 0xd5
+'Zai ',    # 0xd6
+'Kai ',    # 0xd7
+'Hong ',    # 0xd8
+'Luo ',    # 0xd9
+'Xia ',    # 0xda
+'Zhu ',    # 0xdb
+'Xuan ',    # 0xdc
+'Zheng ',    # 0xdd
+'Po ',    # 0xde
+'Yan ',    # 0xdf
+'Hui ',    # 0xe0
+'Guang ',    # 0xe1
+'Zhe ',    # 0xe2
+'Hui ',    # 0xe3
+'Kao ',    # 0xe4
+'[?] ',    # 0xe5
+'Fan ',    # 0xe6
+'Shao ',    # 0xe7
+'Ye ',    # 0xe8
+'Hui ',    # 0xe9
+'[?] ',    # 0xea
+'Tang ',    # 0xeb
+'Jin ',    # 0xec
+'Re ',    # 0xed
+'[?] ',    # 0xee
+'Xi ',    # 0xef
+'Fu ',    # 0xf0
+'Jiong ',    # 0xf1
+'Che ',    # 0xf2
+'Pu ',    # 0xf3
+'Jing ',    # 0xf4
+'Zhuo ',    # 0xf5
+'Ting ',    # 0xf6
+'Wan ',    # 0xf7
+'Hai ',    # 0xf8
+'Peng ',    # 0xf9
+'Lang ',    # 0xfa
+'Shan ',    # 0xfb
+'Hu ',    # 0xfc
+'Feng ',    # 0xfd
+'Chi ',    # 0xfe
+'Rong ',    # 0xff
+)
diff --git a/lib/unidecode/x071.py b/lib/unidecode/x071.py
new file mode 100644
index 00000000..bad8f7ea
--- /dev/null
+++ b/lib/unidecode/x071.py
@@ -0,0 +1,258 @@
+data = (
+'Hu ',    # 0x00
+'Xi ',    # 0x01
+'Shu ',    # 0x02
+'He ',    # 0x03
+'Xun ',    # 0x04
+'Ku ',    # 0x05
+'Jue ',    # 0x06
+'Xiao ',    # 0x07
+'Xi ',    # 0x08
+'Yan ',    # 0x09
+'Han ',    # 0x0a
+'Zhuang ',    # 0x0b
+'Jun ',    # 0x0c
+'Di ',    # 0x0d
+'Xie ',    # 0x0e
+'Ji ',    # 0x0f
+'Wu ',    # 0x10
+'[?] ',    # 0x11
+'[?] ',    # 0x12
+'Han ',    # 0x13
+'Yan ',    # 0x14
+'Huan ',    # 0x15
+'Men ',    # 0x16
+'Ju ',    # 0x17
+'Chou ',    # 0x18
+'Bei ',    # 0x19
+'Fen ',    # 0x1a
+'Lin ',    # 0x1b
+'Kun ',    # 0x1c
+'Hun ',    # 0x1d
+'Tun ',    # 0x1e
+'Xi ',    # 0x1f
+'Cui ',    # 0x20
+'Wu ',    # 0x21
+'Hong ',    # 0x22
+'Ju ',    # 0x23
+'Fu ',    # 0x24
+'Wo ',    # 0x25
+'Jiao ',    # 0x26
+'Cong ',    # 0x27
+'Feng ',    # 0x28
+'Ping ',    # 0x29
+'Qiong ',    # 0x2a
+'Ruo ',    # 0x2b
+'Xi ',    # 0x2c
+'Qiong ',    # 0x2d
+'Xin ',    # 0x2e
+'Zhuo ',    # 0x2f
+'Yan ',    # 0x30
+'Yan ',    # 0x31
+'Yi ',    # 0x32
+'Jue ',    # 0x33
+'Yu ',    # 0x34
+'Gang ',    # 0x35
+'Ran ',    # 0x36
+'Pi ',    # 0x37
+'Gu ',    # 0x38
+'[?] ',    # 0x39
+'Sheng ',    # 0x3a
+'Chang ',    # 0x3b
+'Shao ',    # 0x3c
+'[?] ',    # 0x3d
+'[?] ',    # 0x3e
+'[?] ',    # 0x3f
+'[?] ',    # 0x40
+'Chen ',    # 0x41
+'He ',    # 0x42
+'Kui ',    # 0x43
+'Zhong ',    # 0x44
+'Duan ',    # 0x45
+'Xia ',    # 0x46
+'Hui ',    # 0x47
+'Feng ',    # 0x48
+'Lian ',    # 0x49
+'Xuan ',    # 0x4a
+'Xing ',    # 0x4b
+'Huang ',    # 0x4c
+'Jiao ',    # 0x4d
+'Jian ',    # 0x4e
+'Bi ',    # 0x4f
+'Ying ',    # 0x50
+'Zhu ',    # 0x51
+'Wei ',    # 0x52
+'Tuan ',    # 0x53
+'Tian ',    # 0x54
+'Xi ',    # 0x55
+'Nuan ',    # 0x56
+'Nuan ',    # 0x57
+'Chan ',    # 0x58
+'Yan ',    # 0x59
+'Jiong ',    # 0x5a
+'Jiong ',    # 0x5b
+'Yu ',    # 0x5c
+'Mei ',    # 0x5d
+'Sha ',    # 0x5e
+'Wei ',    # 0x5f
+'Ye ',    # 0x60
+'Xin ',    # 0x61
+'Qiong ',    # 0x62
+'Rou ',    # 0x63
+'Mei ',    # 0x64
+'Huan ',    # 0x65
+'Xu ',    # 0x66
+'Zhao ',    # 0x67
+'Wei ',    # 0x68
+'Fan ',    # 0x69
+'Qiu ',    # 0x6a
+'Sui ',    # 0x6b
+'Yang ',    # 0x6c
+'Lie ',    # 0x6d
+'Zhu ',    # 0x6e
+'Jie ',    # 0x6f
+'Gao ',    # 0x70
+'Gua ',    # 0x71
+'Bao ',    # 0x72
+'Hu ',    # 0x73
+'Yun ',    # 0x74
+'Xia ',    # 0x75
+'[?] ',    # 0x76
+'[?] ',    # 0x77
+'Bian ',    # 0x78
+'Gou ',    # 0x79
+'Tui ',    # 0x7a
+'Tang ',    # 0x7b
+'Chao ',    # 0x7c
+'Shan ',    # 0x7d
+'N ',    # 0x7e
+'Bo ',    # 0x7f
+'Huang ',    # 0x80
+'Xie ',    # 0x81
+'Xi ',    # 0x82
+'Wu ',    # 0x83
+'Xi ',    # 0x84
+'Yun ',    # 0x85
+'He ',    # 0x86
+'He ',    # 0x87
+'Xi ',    # 0x88
+'Yun ',    # 0x89
+'Xiong ',    # 0x8a
+'Nai ',    # 0x8b
+'Shan ',    # 0x8c
+'Qiong ',    # 0x8d
+'Yao ',    # 0x8e
+'Xun ',    # 0x8f
+'Mi ',    # 0x90
+'Lian ',    # 0x91
+'Ying ',    # 0x92
+'Wen ',    # 0x93
+'Rong ',    # 0x94
+'Oozutsu ',    # 0x95
+'[?] ',    # 0x96
+'Qiang ',    # 0x97
+'Liu ',    # 0x98
+'Xi ',    # 0x99
+'Bi ',    # 0x9a
+'Biao ',    # 0x9b
+'Zong ',    # 0x9c
+'Lu ',    # 0x9d
+'Jian ',    # 0x9e
+'Shou ',    # 0x9f
+'Yi ',    # 0xa0
+'Lou ',    # 0xa1
+'Feng ',    # 0xa2
+'Sui ',    # 0xa3
+'Yi ',    # 0xa4
+'Tong ',    # 0xa5
+'Jue ',    # 0xa6
+'Zong ',    # 0xa7
+'Yun ',    # 0xa8
+'Hu ',    # 0xa9
+'Yi ',    # 0xaa
+'Zhi ',    # 0xab
+'Ao ',    # 0xac
+'Wei ',    # 0xad
+'Liao ',    # 0xae
+'Han ',    # 0xaf
+'Ou ',    # 0xb0
+'Re ',    # 0xb1
+'Jiong ',    # 0xb2
+'Man ',    # 0xb3
+'[?] ',    # 0xb4
+'Shang ',    # 0xb5
+'Cuan ',    # 0xb6
+'Zeng ',    # 0xb7
+'Jian ',    # 0xb8
+'Xi ',    # 0xb9
+'Xi ',    # 0xba
+'Xi ',    # 0xbb
+'Yi ',    # 0xbc
+'Xiao ',    # 0xbd
+'Chi ',    # 0xbe
+'Huang ',    # 0xbf
+'Chan ',    # 0xc0
+'Ye ',    # 0xc1
+'Qian ',    # 0xc2
+'Ran ',    # 0xc3
+'Yan ',    # 0xc4
+'Xian ',    # 0xc5
+'Qiao ',    # 0xc6
+'Zun ',    # 0xc7
+'Deng ',    # 0xc8
+'Dun ',    # 0xc9
+'Shen ',    # 0xca
+'Jiao ',    # 0xcb
+'Fen ',    # 0xcc
+'Si ',    # 0xcd
+'Liao ',    # 0xce
+'Yu ',    # 0xcf
+'Lin ',    # 0xd0
+'Tong ',    # 0xd1
+'Shao ',    # 0xd2
+'Fen ',    # 0xd3
+'Fan ',    # 0xd4
+'Yan ',    # 0xd5
+'Xun ',    # 0xd6
+'Lan ',    # 0xd7
+'Mei ',    # 0xd8
+'Tang ',    # 0xd9
+'Yi ',    # 0xda
+'Jing ',    # 0xdb
+'Men ',    # 0xdc
+'[?] ',    # 0xdd
+'[?] ',    # 0xde
+'Ying ',    # 0xdf
+'Yu ',    # 0xe0
+'Yi ',    # 0xe1
+'Xue ',    # 0xe2
+'Lan ',    # 0xe3
+'Tai ',    # 0xe4
+'Zao ',    # 0xe5
+'Can ',    # 0xe6
+'Sui ',    # 0xe7
+'Xi ',    # 0xe8
+'Que ',    # 0xe9
+'Cong ',    # 0xea
+'Lian ',    # 0xeb
+'Hui ',    # 0xec
+'Zhu ',    # 0xed
+'Xie ',    # 0xee
+'Ling ',    # 0xef
+'Wei ',    # 0xf0
+'Yi ',    # 0xf1
+'Xie ',    # 0xf2
+'Zhao ',    # 0xf3
+'Hui ',    # 0xf4
+'Tatsu ',    # 0xf5
+'Nung ',    # 0xf6
+'Lan ',    # 0xf7
+'Ru ',    # 0xf8
+'Xian ',    # 0xf9
+'Kao ',    # 0xfa
+'Xun ',    # 0xfb
+'Jin ',    # 0xfc
+'Chou ',    # 0xfd
+'Chou ',    # 0xfe
+'Yao ',    # 0xff
+)
diff --git a/lib/unidecode/x072.py b/lib/unidecode/x072.py
new file mode 100644
index 00000000..c91c93cb
--- /dev/null
+++ b/lib/unidecode/x072.py
@@ -0,0 +1,258 @@
+data = (
+'He ',    # 0x00
+'Lan ',    # 0x01
+'Biao ',    # 0x02
+'Rong ',    # 0x03
+'Li ',    # 0x04
+'Mo ',    # 0x05
+'Bao ',    # 0x06
+'Ruo ',    # 0x07
+'Lu ',    # 0x08
+'La ',    # 0x09
+'Ao ',    # 0x0a
+'Xun ',    # 0x0b
+'Kuang ',    # 0x0c
+'Shuo ',    # 0x0d
+'[?] ',    # 0x0e
+'Li ',    # 0x0f
+'Lu ',    # 0x10
+'Jue ',    # 0x11
+'Liao ',    # 0x12
+'Yan ',    # 0x13
+'Xi ',    # 0x14
+'Xie ',    # 0x15
+'Long ',    # 0x16
+'Ye ',    # 0x17
+'[?] ',    # 0x18
+'Rang ',    # 0x19
+'Yue ',    # 0x1a
+'Lan ',    # 0x1b
+'Cong ',    # 0x1c
+'Jue ',    # 0x1d
+'Tong ',    # 0x1e
+'Guan ',    # 0x1f
+'[?] ',    # 0x20
+'Che ',    # 0x21
+'Mi ',    # 0x22
+'Tang ',    # 0x23
+'Lan ',    # 0x24
+'Zhu ',    # 0x25
+'[?] ',    # 0x26
+'Ling ',    # 0x27
+'Cuan ',    # 0x28
+'Yu ',    # 0x29
+'Zhua ',    # 0x2a
+'Tsumekanmuri ',    # 0x2b
+'Pa ',    # 0x2c
+'Zheng ',    # 0x2d
+'Pao ',    # 0x2e
+'Cheng ',    # 0x2f
+'Yuan ',    # 0x30
+'Ai ',    # 0x31
+'Wei ',    # 0x32
+'[?] ',    # 0x33
+'Jue ',    # 0x34
+'Jue ',    # 0x35
+'Fu ',    # 0x36
+'Ye ',    # 0x37
+'Ba ',    # 0x38
+'Die ',    # 0x39
+'Ye ',    # 0x3a
+'Yao ',    # 0x3b
+'Zu ',    # 0x3c
+'Shuang ',    # 0x3d
+'Er ',    # 0x3e
+'Qiang ',    # 0x3f
+'Chuang ',    # 0x40
+'Ge ',    # 0x41
+'Zang ',    # 0x42
+'Die ',    # 0x43
+'Qiang ',    # 0x44
+'Yong ',    # 0x45
+'Qiang ',    # 0x46
+'Pian ',    # 0x47
+'Ban ',    # 0x48
+'Pan ',    # 0x49
+'Shao ',    # 0x4a
+'Jian ',    # 0x4b
+'Pai ',    # 0x4c
+'Du ',    # 0x4d
+'Chuang ',    # 0x4e
+'Tou ',    # 0x4f
+'Zha ',    # 0x50
+'Bian ',    # 0x51
+'Die ',    # 0x52
+'Bang ',    # 0x53
+'Bo ',    # 0x54
+'Chuang ',    # 0x55
+'You ',    # 0x56
+'[?] ',    # 0x57
+'Du ',    # 0x58
+'Ya ',    # 0x59
+'Cheng ',    # 0x5a
+'Niu ',    # 0x5b
+'Ushihen ',    # 0x5c
+'Pin ',    # 0x5d
+'Jiu ',    # 0x5e
+'Mou ',    # 0x5f
+'Tuo ',    # 0x60
+'Mu ',    # 0x61
+'Lao ',    # 0x62
+'Ren ',    # 0x63
+'Mang ',    # 0x64
+'Fang ',    # 0x65
+'Mao ',    # 0x66
+'Mu ',    # 0x67
+'Gang ',    # 0x68
+'Wu ',    # 0x69
+'Yan ',    # 0x6a
+'Ge ',    # 0x6b
+'Bei ',    # 0x6c
+'Si ',    # 0x6d
+'Jian ',    # 0x6e
+'Gu ',    # 0x6f
+'You ',    # 0x70
+'Ge ',    # 0x71
+'Sheng ',    # 0x72
+'Mu ',    # 0x73
+'Di ',    # 0x74
+'Qian ',    # 0x75
+'Quan ',    # 0x76
+'Quan ',    # 0x77
+'Zi ',    # 0x78
+'Te ',    # 0x79
+'Xi ',    # 0x7a
+'Mang ',    # 0x7b
+'Keng ',    # 0x7c
+'Qian ',    # 0x7d
+'Wu ',    # 0x7e
+'Gu ',    # 0x7f
+'Xi ',    # 0x80
+'Li ',    # 0x81
+'Li ',    # 0x82
+'Pou ',    # 0x83
+'Ji ',    # 0x84
+'Gang ',    # 0x85
+'Zhi ',    # 0x86
+'Ben ',    # 0x87
+'Quan ',    # 0x88
+'Run ',    # 0x89
+'Du ',    # 0x8a
+'Ju ',    # 0x8b
+'Jia ',    # 0x8c
+'Jian ',    # 0x8d
+'Feng ',    # 0x8e
+'Pian ',    # 0x8f
+'Ke ',    # 0x90
+'Ju ',    # 0x91
+'Kao ',    # 0x92
+'Chu ',    # 0x93
+'Xi ',    # 0x94
+'Bei ',    # 0x95
+'Luo ',    # 0x96
+'Jie ',    # 0x97
+'Ma ',    # 0x98
+'San ',    # 0x99
+'Wei ',    # 0x9a
+'Li ',    # 0x9b
+'Dun ',    # 0x9c
+'Tong ',    # 0x9d
+'[?] ',    # 0x9e
+'Jiang ',    # 0x9f
+'Ikenie ',    # 0xa0
+'Li ',    # 0xa1
+'Du ',    # 0xa2
+'Lie ',    # 0xa3
+'Pi ',    # 0xa4
+'Piao ',    # 0xa5
+'Bao ',    # 0xa6
+'Xi ',    # 0xa7
+'Chou ',    # 0xa8
+'Wei ',    # 0xa9
+'Kui ',    # 0xaa
+'Chou ',    # 0xab
+'Quan ',    # 0xac
+'Fan ',    # 0xad
+'Ba ',    # 0xae
+'Fan ',    # 0xaf
+'Qiu ',    # 0xb0
+'Ji ',    # 0xb1
+'Cai ',    # 0xb2
+'Chuo ',    # 0xb3
+'An ',    # 0xb4
+'Jie ',    # 0xb5
+'Zhuang ',    # 0xb6
+'Guang ',    # 0xb7
+'Ma ',    # 0xb8
+'You ',    # 0xb9
+'Kang ',    # 0xba
+'Bo ',    # 0xbb
+'Hou ',    # 0xbc
+'Ya ',    # 0xbd
+'Yin ',    # 0xbe
+'Huan ',    # 0xbf
+'Zhuang ',    # 0xc0
+'Yun ',    # 0xc1
+'Kuang ',    # 0xc2
+'Niu ',    # 0xc3
+'Di ',    # 0xc4
+'Qing ',    # 0xc5
+'Zhong ',    # 0xc6
+'Mu ',    # 0xc7
+'Bei ',    # 0xc8
+'Pi ',    # 0xc9
+'Ju ',    # 0xca
+'Ni ',    # 0xcb
+'Sheng ',    # 0xcc
+'Pao ',    # 0xcd
+'Xia ',    # 0xce
+'Tuo ',    # 0xcf
+'Hu ',    # 0xd0
+'Ling ',    # 0xd1
+'Fei ',    # 0xd2
+'Pi ',    # 0xd3
+'Ni ',    # 0xd4
+'Ao ',    # 0xd5
+'You ',    # 0xd6
+'Gou ',    # 0xd7
+'Yue ',    # 0xd8
+'Ju ',    # 0xd9
+'Dan ',    # 0xda
+'Po ',    # 0xdb
+'Gu ',    # 0xdc
+'Xian ',    # 0xdd
+'Ning ',    # 0xde
+'Huan ',    # 0xdf
+'Hen ',    # 0xe0
+'Jiao ',    # 0xe1
+'He ',    # 0xe2
+'Zhao ',    # 0xe3
+'Ji ',    # 0xe4
+'Xun ',    # 0xe5
+'Shan ',    # 0xe6
+'Ta ',    # 0xe7
+'Rong ',    # 0xe8
+'Shou ',    # 0xe9
+'Tong ',    # 0xea
+'Lao ',    # 0xeb
+'Du ',    # 0xec
+'Xia ',    # 0xed
+'Shi ',    # 0xee
+'Hua ',    # 0xef
+'Zheng ',    # 0xf0
+'Yu ',    # 0xf1
+'Sun ',    # 0xf2
+'Yu ',    # 0xf3
+'Bi ',    # 0xf4
+'Mang ',    # 0xf5
+'Xi ',    # 0xf6
+'Juan ',    # 0xf7
+'Li ',    # 0xf8
+'Xia ',    # 0xf9
+'Yin ',    # 0xfa
+'Suan ',    # 0xfb
+'Lang ',    # 0xfc
+'Bei ',    # 0xfd
+'Zhi ',    # 0xfe
+'Yan ',    # 0xff
+)
diff --git a/lib/unidecode/x073.py b/lib/unidecode/x073.py
new file mode 100644
index 00000000..4cf0176d
--- /dev/null
+++ b/lib/unidecode/x073.py
@@ -0,0 +1,258 @@
+data = (
+'Sha ',    # 0x00
+'Li ',    # 0x01
+'Han ',    # 0x02
+'Xian ',    # 0x03
+'Jing ',    # 0x04
+'Pai ',    # 0x05
+'Fei ',    # 0x06
+'Yao ',    # 0x07
+'Ba ',    # 0x08
+'Qi ',    # 0x09
+'Ni ',    # 0x0a
+'Biao ',    # 0x0b
+'Yin ',    # 0x0c
+'Lai ',    # 0x0d
+'Xi ',    # 0x0e
+'Jian ',    # 0x0f
+'Qiang ',    # 0x10
+'Kun ',    # 0x11
+'Yan ',    # 0x12
+'Guo ',    # 0x13
+'Zong ',    # 0x14
+'Mi ',    # 0x15
+'Chang ',    # 0x16
+'Yi ',    # 0x17
+'Zhi ',    # 0x18
+'Zheng ',    # 0x19
+'Ya ',    # 0x1a
+'Meng ',    # 0x1b
+'Cai ',    # 0x1c
+'Cu ',    # 0x1d
+'She ',    # 0x1e
+'Kari ',    # 0x1f
+'Cen ',    # 0x20
+'Luo ',    # 0x21
+'Hu ',    # 0x22
+'Zong ',    # 0x23
+'Ji ',    # 0x24
+'Wei ',    # 0x25
+'Feng ',    # 0x26
+'Wo ',    # 0x27
+'Yuan ',    # 0x28
+'Xing ',    # 0x29
+'Zhu ',    # 0x2a
+'Mao ',    # 0x2b
+'Wei ',    # 0x2c
+'Yuan ',    # 0x2d
+'Xian ',    # 0x2e
+'Tuan ',    # 0x2f
+'Ya ',    # 0x30
+'Nao ',    # 0x31
+'Xie ',    # 0x32
+'Jia ',    # 0x33
+'Hou ',    # 0x34
+'Bian ',    # 0x35
+'You ',    # 0x36
+'You ',    # 0x37
+'Mei ',    # 0x38
+'Zha ',    # 0x39
+'Yao ',    # 0x3a
+'Sun ',    # 0x3b
+'Bo ',    # 0x3c
+'Ming ',    # 0x3d
+'Hua ',    # 0x3e
+'Yuan ',    # 0x3f
+'Sou ',    # 0x40
+'Ma ',    # 0x41
+'Yuan ',    # 0x42
+'Dai ',    # 0x43
+'Yu ',    # 0x44
+'Shi ',    # 0x45
+'Hao ',    # 0x46
+'[?] ',    # 0x47
+'Yi ',    # 0x48
+'Zhen ',    # 0x49
+'Chuang ',    # 0x4a
+'Hao ',    # 0x4b
+'Man ',    # 0x4c
+'Jing ',    # 0x4d
+'Jiang ',    # 0x4e
+'Mu ',    # 0x4f
+'Zhang ',    # 0x50
+'Chan ',    # 0x51
+'Ao ',    # 0x52
+'Ao ',    # 0x53
+'Hao ',    # 0x54
+'Cui ',    # 0x55
+'Fen ',    # 0x56
+'Jue ',    # 0x57
+'Bi ',    # 0x58
+'Bi ',    # 0x59
+'Huang ',    # 0x5a
+'Pu ',    # 0x5b
+'Lin ',    # 0x5c
+'Yu ',    # 0x5d
+'Tong ',    # 0x5e
+'Yao ',    # 0x5f
+'Liao ',    # 0x60
+'Shuo ',    # 0x61
+'Xiao ',    # 0x62
+'Swu ',    # 0x63
+'Ton ',    # 0x64
+'Xi ',    # 0x65
+'Ge ',    # 0x66
+'Juan ',    # 0x67
+'Du ',    # 0x68
+'Hui ',    # 0x69
+'Kuai ',    # 0x6a
+'Xian ',    # 0x6b
+'Xie ',    # 0x6c
+'Ta ',    # 0x6d
+'Xian ',    # 0x6e
+'Xun ',    # 0x6f
+'Ning ',    # 0x70
+'Pin ',    # 0x71
+'Huo ',    # 0x72
+'Nou ',    # 0x73
+'Meng ',    # 0x74
+'Lie ',    # 0x75
+'Nao ',    # 0x76
+'Guang ',    # 0x77
+'Shou ',    # 0x78
+'Lu ',    # 0x79
+'Ta ',    # 0x7a
+'Xian ',    # 0x7b
+'Mi ',    # 0x7c
+'Rang ',    # 0x7d
+'Huan ',    # 0x7e
+'Nao ',    # 0x7f
+'Luo ',    # 0x80
+'Xian ',    # 0x81
+'Qi ',    # 0x82
+'Jue ',    # 0x83
+'Xuan ',    # 0x84
+'Miao ',    # 0x85
+'Zi ',    # 0x86
+'Lu ',    # 0x87
+'Lu ',    # 0x88
+'Yu ',    # 0x89
+'Su ',    # 0x8a
+'Wang ',    # 0x8b
+'Qiu ',    # 0x8c
+'Ga ',    # 0x8d
+'Ding ',    # 0x8e
+'Le ',    # 0x8f
+'Ba ',    # 0x90
+'Ji ',    # 0x91
+'Hong ',    # 0x92
+'Di ',    # 0x93
+'Quan ',    # 0x94
+'Gan ',    # 0x95
+'Jiu ',    # 0x96
+'Yu ',    # 0x97
+'Ji ',    # 0x98
+'Yu ',    # 0x99
+'Yang ',    # 0x9a
+'Ma ',    # 0x9b
+'Gong ',    # 0x9c
+'Wu ',    # 0x9d
+'Fu ',    # 0x9e
+'Wen ',    # 0x9f
+'Jie ',    # 0xa0
+'Ya ',    # 0xa1
+'Fen ',    # 0xa2
+'Bian ',    # 0xa3
+'Beng ',    # 0xa4
+'Yue ',    # 0xa5
+'Jue ',    # 0xa6
+'Yun ',    # 0xa7
+'Jue ',    # 0xa8
+'Wan ',    # 0xa9
+'Jian ',    # 0xaa
+'Mei ',    # 0xab
+'Dan ',    # 0xac
+'Pi ',    # 0xad
+'Wei ',    # 0xae
+'Huan ',    # 0xaf
+'Xian ',    # 0xb0
+'Qiang ',    # 0xb1
+'Ling ',    # 0xb2
+'Dai ',    # 0xb3
+'Yi ',    # 0xb4
+'An ',    # 0xb5
+'Ping ',    # 0xb6
+'Dian ',    # 0xb7
+'Fu ',    # 0xb8
+'Xuan ',    # 0xb9
+'Xi ',    # 0xba
+'Bo ',    # 0xbb
+'Ci ',    # 0xbc
+'Gou ',    # 0xbd
+'Jia ',    # 0xbe
+'Shao ',    # 0xbf
+'Po ',    # 0xc0
+'Ci ',    # 0xc1
+'Ke ',    # 0xc2
+'Ran ',    # 0xc3
+'Sheng ',    # 0xc4
+'Shen ',    # 0xc5
+'Yi ',    # 0xc6
+'Zu ',    # 0xc7
+'Jia ',    # 0xc8
+'Min ',    # 0xc9
+'Shan ',    # 0xca
+'Liu ',    # 0xcb
+'Bi ',    # 0xcc
+'Zhen ',    # 0xcd
+'Zhen ',    # 0xce
+'Jue ',    # 0xcf
+'Fa ',    # 0xd0
+'Long ',    # 0xd1
+'Jin ',    # 0xd2
+'Jiao ',    # 0xd3
+'Jian ',    # 0xd4
+'Li ',    # 0xd5
+'Guang ',    # 0xd6
+'Xian ',    # 0xd7
+'Zhou ',    # 0xd8
+'Gong ',    # 0xd9
+'Yan ',    # 0xda
+'Xiu ',    # 0xdb
+'Yang ',    # 0xdc
+'Xu ',    # 0xdd
+'Luo ',    # 0xde
+'Su ',    # 0xdf
+'Zhu ',    # 0xe0
+'Qin ',    # 0xe1
+'Ken ',    # 0xe2
+'Xun ',    # 0xe3
+'Bao ',    # 0xe4
+'Er ',    # 0xe5
+'Xiang ',    # 0xe6
+'Yao ',    # 0xe7
+'Xia ',    # 0xe8
+'Heng ',    # 0xe9
+'Gui ',    # 0xea
+'Chong ',    # 0xeb
+'Xu ',    # 0xec
+'Ban ',    # 0xed
+'Pei ',    # 0xee
+'[?] ',    # 0xef
+'Dang ',    # 0xf0
+'Ei ',    # 0xf1
+'Hun ',    # 0xf2
+'Wen ',    # 0xf3
+'E ',    # 0xf4
+'Cheng ',    # 0xf5
+'Ti ',    # 0xf6
+'Wu ',    # 0xf7
+'Wu ',    # 0xf8
+'Cheng ',    # 0xf9
+'Jun ',    # 0xfa
+'Mei ',    # 0xfb
+'Bei ',    # 0xfc
+'Ting ',    # 0xfd
+'Xian ',    # 0xfe
+'Chuo ',    # 0xff
+)
diff --git a/lib/unidecode/x074.py b/lib/unidecode/x074.py
new file mode 100644
index 00000000..312fc646
--- /dev/null
+++ b/lib/unidecode/x074.py
@@ -0,0 +1,258 @@
+data = (
+'Han ',    # 0x00
+'Xuan ',    # 0x01
+'Yan ',    # 0x02
+'Qiu ',    # 0x03
+'Quan ',    # 0x04
+'Lang ',    # 0x05
+'Li ',    # 0x06
+'Xiu ',    # 0x07
+'Fu ',    # 0x08
+'Liu ',    # 0x09
+'Ye ',    # 0x0a
+'Xi ',    # 0x0b
+'Ling ',    # 0x0c
+'Li ',    # 0x0d
+'Jin ',    # 0x0e
+'Lian ',    # 0x0f
+'Suo ',    # 0x10
+'Chiisai ',    # 0x11
+'[?] ',    # 0x12
+'Wan ',    # 0x13
+'Dian ',    # 0x14
+'Pin ',    # 0x15
+'Zhan ',    # 0x16
+'Cui ',    # 0x17
+'Min ',    # 0x18
+'Yu ',    # 0x19
+'Ju ',    # 0x1a
+'Chen ',    # 0x1b
+'Lai ',    # 0x1c
+'Wen ',    # 0x1d
+'Sheng ',    # 0x1e
+'Wei ',    # 0x1f
+'Dian ',    # 0x20
+'Chu ',    # 0x21
+'Zhuo ',    # 0x22
+'Pei ',    # 0x23
+'Cheng ',    # 0x24
+'Hu ',    # 0x25
+'Qi ',    # 0x26
+'E ',    # 0x27
+'Kun ',    # 0x28
+'Chang ',    # 0x29
+'Qi ',    # 0x2a
+'Beng ',    # 0x2b
+'Wan ',    # 0x2c
+'Lu ',    # 0x2d
+'Cong ',    # 0x2e
+'Guan ',    # 0x2f
+'Yan ',    # 0x30
+'Diao ',    # 0x31
+'Bei ',    # 0x32
+'Lin ',    # 0x33
+'Qin ',    # 0x34
+'Pi ',    # 0x35
+'Pa ',    # 0x36
+'Que ',    # 0x37
+'Zhuo ',    # 0x38
+'Qin ',    # 0x39
+'Fa ',    # 0x3a
+'[?] ',    # 0x3b
+'Qiong ',    # 0x3c
+'Du ',    # 0x3d
+'Jie ',    # 0x3e
+'Hun ',    # 0x3f
+'Yu ',    # 0x40
+'Mao ',    # 0x41
+'Mei ',    # 0x42
+'Chun ',    # 0x43
+'Xuan ',    # 0x44
+'Ti ',    # 0x45
+'Xing ',    # 0x46
+'Dai ',    # 0x47
+'Rou ',    # 0x48
+'Min ',    # 0x49
+'Zhen ',    # 0x4a
+'Wei ',    # 0x4b
+'Ruan ',    # 0x4c
+'Huan ',    # 0x4d
+'Jie ',    # 0x4e
+'Chuan ',    # 0x4f
+'Jian ',    # 0x50
+'Zhuan ',    # 0x51
+'Yang ',    # 0x52
+'Lian ',    # 0x53
+'Quan ',    # 0x54
+'Xia ',    # 0x55
+'Duan ',    # 0x56
+'Yuan ',    # 0x57
+'Ye ',    # 0x58
+'Nao ',    # 0x59
+'Hu ',    # 0x5a
+'Ying ',    # 0x5b
+'Yu ',    # 0x5c
+'Huang ',    # 0x5d
+'Rui ',    # 0x5e
+'Se ',    # 0x5f
+'Liu ',    # 0x60
+'Shi ',    # 0x61
+'Rong ',    # 0x62
+'Suo ',    # 0x63
+'Yao ',    # 0x64
+'Wen ',    # 0x65
+'Wu ',    # 0x66
+'Jin ',    # 0x67
+'Jin ',    # 0x68
+'Ying ',    # 0x69
+'Ma ',    # 0x6a
+'Tao ',    # 0x6b
+'Liu ',    # 0x6c
+'Tang ',    # 0x6d
+'Li ',    # 0x6e
+'Lang ',    # 0x6f
+'Gui ',    # 0x70
+'Zhen ',    # 0x71
+'Qiang ',    # 0x72
+'Cuo ',    # 0x73
+'Jue ',    # 0x74
+'Zhao ',    # 0x75
+'Yao ',    # 0x76
+'Ai ',    # 0x77
+'Bin ',    # 0x78
+'Tu ',    # 0x79
+'Chang ',    # 0x7a
+'Kun ',    # 0x7b
+'Zhuan ',    # 0x7c
+'Cong ',    # 0x7d
+'Jin ',    # 0x7e
+'Yi ',    # 0x7f
+'Cui ',    # 0x80
+'Cong ',    # 0x81
+'Qi ',    # 0x82
+'Li ',    # 0x83
+'Ying ',    # 0x84
+'Suo ',    # 0x85
+'Qiu ',    # 0x86
+'Xuan ',    # 0x87
+'Ao ',    # 0x88
+'Lian ',    # 0x89
+'Man ',    # 0x8a
+'Zhang ',    # 0x8b
+'Yin ',    # 0x8c
+'[?] ',    # 0x8d
+'Ying ',    # 0x8e
+'Zhi ',    # 0x8f
+'Lu ',    # 0x90
+'Wu ',    # 0x91
+'Deng ',    # 0x92
+'Xiou ',    # 0x93
+'Zeng ',    # 0x94
+'Xun ',    # 0x95
+'Qu ',    # 0x96
+'Dang ',    # 0x97
+'Lin ',    # 0x98
+'Liao ',    # 0x99
+'Qiong ',    # 0x9a
+'Su ',    # 0x9b
+'Huang ',    # 0x9c
+'Gui ',    # 0x9d
+'Pu ',    # 0x9e
+'Jing ',    # 0x9f
+'Fan ',    # 0xa0
+'Jin ',    # 0xa1
+'Liu ',    # 0xa2
+'Ji ',    # 0xa3
+'[?] ',    # 0xa4
+'Jing ',    # 0xa5
+'Ai ',    # 0xa6
+'Bi ',    # 0xa7
+'Can ',    # 0xa8
+'Qu ',    # 0xa9
+'Zao ',    # 0xaa
+'Dang ',    # 0xab
+'Jiao ',    # 0xac
+'Gun ',    # 0xad
+'Tan ',    # 0xae
+'Hui ',    # 0xaf
+'Huan ',    # 0xb0
+'Se ',    # 0xb1
+'Sui ',    # 0xb2
+'Tian ',    # 0xb3
+'[?] ',    # 0xb4
+'Yu ',    # 0xb5
+'Jin ',    # 0xb6
+'Lu ',    # 0xb7
+'Bin ',    # 0xb8
+'Shou ',    # 0xb9
+'Wen ',    # 0xba
+'Zui ',    # 0xbb
+'Lan ',    # 0xbc
+'Xi ',    # 0xbd
+'Ji ',    # 0xbe
+'Xuan ',    # 0xbf
+'Ruan ',    # 0xc0
+'Huo ',    # 0xc1
+'Gai ',    # 0xc2
+'Lei ',    # 0xc3
+'Du ',    # 0xc4
+'Li ',    # 0xc5
+'Zhi ',    # 0xc6
+'Rou ',    # 0xc7
+'Li ',    # 0xc8
+'Zan ',    # 0xc9
+'Qiong ',    # 0xca
+'Zhe ',    # 0xcb
+'Gui ',    # 0xcc
+'Sui ',    # 0xcd
+'La ',    # 0xce
+'Long ',    # 0xcf
+'Lu ',    # 0xd0
+'Li ',    # 0xd1
+'Zan ',    # 0xd2
+'Lan ',    # 0xd3
+'Ying ',    # 0xd4
+'Mi ',    # 0xd5
+'Xiang ',    # 0xd6
+'Xi ',    # 0xd7
+'Guan ',    # 0xd8
+'Dao ',    # 0xd9
+'Zan ',    # 0xda
+'Huan ',    # 0xdb
+'Gua ',    # 0xdc
+'Bo ',    # 0xdd
+'Die ',    # 0xde
+'Bao ',    # 0xdf
+'Hu ',    # 0xe0
+'Zhi ',    # 0xe1
+'Piao ',    # 0xe2
+'Ban ',    # 0xe3
+'Rang ',    # 0xe4
+'Li ',    # 0xe5
+'Wa ',    # 0xe6
+'Dekaguramu ',    # 0xe7
+'Jiang ',    # 0xe8
+'Qian ',    # 0xe9
+'Fan ',    # 0xea
+'Pen ',    # 0xeb
+'Fang ',    # 0xec
+'Dan ',    # 0xed
+'Weng ',    # 0xee
+'Ou ',    # 0xef
+'Deshiguramu ',    # 0xf0
+'Miriguramu ',    # 0xf1
+'Thon ',    # 0xf2
+'Hu ',    # 0xf3
+'Ling ',    # 0xf4
+'Yi ',    # 0xf5
+'Ping ',    # 0xf6
+'Ci ',    # 0xf7
+'Hekutogura ',    # 0xf8
+'Juan ',    # 0xf9
+'Chang ',    # 0xfa
+'Chi ',    # 0xfb
+'Sarake ',    # 0xfc
+'Dang ',    # 0xfd
+'Meng ',    # 0xfe
+'Pou ',    # 0xff
+)
diff --git a/lib/unidecode/x075.py b/lib/unidecode/x075.py
new file mode 100644
index 00000000..a356ac41
--- /dev/null
+++ b/lib/unidecode/x075.py
@@ -0,0 +1,258 @@
+data = (
+'Zhui ',    # 0x00
+'Ping ',    # 0x01
+'Bian ',    # 0x02
+'Zhou ',    # 0x03
+'Zhen ',    # 0x04
+'Senchigura ',    # 0x05
+'Ci ',    # 0x06
+'Ying ',    # 0x07
+'Qi ',    # 0x08
+'Xian ',    # 0x09
+'Lou ',    # 0x0a
+'Di ',    # 0x0b
+'Ou ',    # 0x0c
+'Meng ',    # 0x0d
+'Zhuan ',    # 0x0e
+'Peng ',    # 0x0f
+'Lin ',    # 0x10
+'Zeng ',    # 0x11
+'Wu ',    # 0x12
+'Pi ',    # 0x13
+'Dan ',    # 0x14
+'Weng ',    # 0x15
+'Ying ',    # 0x16
+'Yan ',    # 0x17
+'Gan ',    # 0x18
+'Dai ',    # 0x19
+'Shen ',    # 0x1a
+'Tian ',    # 0x1b
+'Tian ',    # 0x1c
+'Han ',    # 0x1d
+'Chang ',    # 0x1e
+'Sheng ',    # 0x1f
+'Qing ',    # 0x20
+'Sheng ',    # 0x21
+'Chan ',    # 0x22
+'Chan ',    # 0x23
+'Rui ',    # 0x24
+'Sheng ',    # 0x25
+'Su ',    # 0x26
+'Sen ',    # 0x27
+'Yong ',    # 0x28
+'Shuai ',    # 0x29
+'Lu ',    # 0x2a
+'Fu ',    # 0x2b
+'Yong ',    # 0x2c
+'Beng ',    # 0x2d
+'Feng ',    # 0x2e
+'Ning ',    # 0x2f
+'Tian ',    # 0x30
+'You ',    # 0x31
+'Jia ',    # 0x32
+'Shen ',    # 0x33
+'Zha ',    # 0x34
+'Dian ',    # 0x35
+'Fu ',    # 0x36
+'Nan ',    # 0x37
+'Dian ',    # 0x38
+'Ping ',    # 0x39
+'Ting ',    # 0x3a
+'Hua ',    # 0x3b
+'Ting ',    # 0x3c
+'Quan ',    # 0x3d
+'Zi ',    # 0x3e
+'Meng ',    # 0x3f
+'Bi ',    # 0x40
+'Qi ',    # 0x41
+'Liu ',    # 0x42
+'Xun ',    # 0x43
+'Liu ',    # 0x44
+'Chang ',    # 0x45
+'Mu ',    # 0x46
+'Yun ',    # 0x47
+'Fan ',    # 0x48
+'Fu ',    # 0x49
+'Geng ',    # 0x4a
+'Tian ',    # 0x4b
+'Jie ',    # 0x4c
+'Jie ',    # 0x4d
+'Quan ',    # 0x4e
+'Wei ',    # 0x4f
+'Fu ',    # 0x50
+'Tian ',    # 0x51
+'Mu ',    # 0x52
+'Tap ',    # 0x53
+'Pan ',    # 0x54
+'Jiang ',    # 0x55
+'Wa ',    # 0x56
+'Da ',    # 0x57
+'Nan ',    # 0x58
+'Liu ',    # 0x59
+'Ben ',    # 0x5a
+'Zhen ',    # 0x5b
+'Chu ',    # 0x5c
+'Mu ',    # 0x5d
+'Mu ',    # 0x5e
+'Ce ',    # 0x5f
+'Cen ',    # 0x60
+'Gai ',    # 0x61
+'Bi ',    # 0x62
+'Da ',    # 0x63
+'Zhi ',    # 0x64
+'Lue ',    # 0x65
+'Qi ',    # 0x66
+'Lue ',    # 0x67
+'Pan ',    # 0x68
+'Kesa ',    # 0x69
+'Fan ',    # 0x6a
+'Hua ',    # 0x6b
+'Yu ',    # 0x6c
+'Yu ',    # 0x6d
+'Mu ',    # 0x6e
+'Jun ',    # 0x6f
+'Yi ',    # 0x70
+'Liu ',    # 0x71
+'Yu ',    # 0x72
+'Die ',    # 0x73
+'Chou ',    # 0x74
+'Hua ',    # 0x75
+'Dang ',    # 0x76
+'Chuo ',    # 0x77
+'Ji ',    # 0x78
+'Wan ',    # 0x79
+'Jiang ',    # 0x7a
+'Sheng ',    # 0x7b
+'Chang ',    # 0x7c
+'Tuan ',    # 0x7d
+'Lei ',    # 0x7e
+'Ji ',    # 0x7f
+'Cha ',    # 0x80
+'Liu ',    # 0x81
+'Tatamu ',    # 0x82
+'Tuan ',    # 0x83
+'Lin ',    # 0x84
+'Jiang ',    # 0x85
+'Jiang ',    # 0x86
+'Chou ',    # 0x87
+'Bo ',    # 0x88
+'Die ',    # 0x89
+'Die ',    # 0x8a
+'Pi ',    # 0x8b
+'Nie ',    # 0x8c
+'Dan ',    # 0x8d
+'Shu ',    # 0x8e
+'Shu ',    # 0x8f
+'Zhi ',    # 0x90
+'Yi ',    # 0x91
+'Chuang ',    # 0x92
+'Nai ',    # 0x93
+'Ding ',    # 0x94
+'Bi ',    # 0x95
+'Jie ',    # 0x96
+'Liao ',    # 0x97
+'Gong ',    # 0x98
+'Ge ',    # 0x99
+'Jiu ',    # 0x9a
+'Zhou ',    # 0x9b
+'Xia ',    # 0x9c
+'Shan ',    # 0x9d
+'Xu ',    # 0x9e
+'Nue ',    # 0x9f
+'Li ',    # 0xa0
+'Yang ',    # 0xa1
+'Chen ',    # 0xa2
+'You ',    # 0xa3
+'Ba ',    # 0xa4
+'Jie ',    # 0xa5
+'Jue ',    # 0xa6
+'Zhi ',    # 0xa7
+'Xia ',    # 0xa8
+'Cui ',    # 0xa9
+'Bi ',    # 0xaa
+'Yi ',    # 0xab
+'Li ',    # 0xac
+'Zong ',    # 0xad
+'Chuang ',    # 0xae
+'Feng ',    # 0xaf
+'Zhu ',    # 0xb0
+'Pao ',    # 0xb1
+'Pi ',    # 0xb2
+'Gan ',    # 0xb3
+'Ke ',    # 0xb4
+'Ci ',    # 0xb5
+'Xie ',    # 0xb6
+'Qi ',    # 0xb7
+'Dan ',    # 0xb8
+'Zhen ',    # 0xb9
+'Fa ',    # 0xba
+'Zhi ',    # 0xbb
+'Teng ',    # 0xbc
+'Ju ',    # 0xbd
+'Ji ',    # 0xbe
+'Fei ',    # 0xbf
+'Qu ',    # 0xc0
+'Dian ',    # 0xc1
+'Jia ',    # 0xc2
+'Xian ',    # 0xc3
+'Cha ',    # 0xc4
+'Bing ',    # 0xc5
+'Ni ',    # 0xc6
+'Zheng ',    # 0xc7
+'Yong ',    # 0xc8
+'Jing ',    # 0xc9
+'Quan ',    # 0xca
+'Chong ',    # 0xcb
+'Tong ',    # 0xcc
+'Yi ',    # 0xcd
+'Kai ',    # 0xce
+'Wei ',    # 0xcf
+'Hui ',    # 0xd0
+'Duo ',    # 0xd1
+'Yang ',    # 0xd2
+'Chi ',    # 0xd3
+'Zhi ',    # 0xd4
+'Hen ',    # 0xd5
+'Ya ',    # 0xd6
+'Mei ',    # 0xd7
+'Dou ',    # 0xd8
+'Jing ',    # 0xd9
+'Xiao ',    # 0xda
+'Tong ',    # 0xdb
+'Tu ',    # 0xdc
+'Mang ',    # 0xdd
+'Pi ',    # 0xde
+'Xiao ',    # 0xdf
+'Suan ',    # 0xe0
+'Pu ',    # 0xe1
+'Li ',    # 0xe2
+'Zhi ',    # 0xe3
+'Cuo ',    # 0xe4
+'Duo ',    # 0xe5
+'Wu ',    # 0xe6
+'Sha ',    # 0xe7
+'Lao ',    # 0xe8
+'Shou ',    # 0xe9
+'Huan ',    # 0xea
+'Xian ',    # 0xeb
+'Yi ',    # 0xec
+'Peng ',    # 0xed
+'Zhang ',    # 0xee
+'Guan ',    # 0xef
+'Tan ',    # 0xf0
+'Fei ',    # 0xf1
+'Ma ',    # 0xf2
+'Lin ',    # 0xf3
+'Chi ',    # 0xf4
+'Ji ',    # 0xf5
+'Dian ',    # 0xf6
+'An ',    # 0xf7
+'Chi ',    # 0xf8
+'Bi ',    # 0xf9
+'Bei ',    # 0xfa
+'Min ',    # 0xfb
+'Gu ',    # 0xfc
+'Dui ',    # 0xfd
+'E ',    # 0xfe
+'Wei ',    # 0xff
+)
diff --git a/lib/unidecode/x076.py b/lib/unidecode/x076.py
new file mode 100644
index 00000000..fc8b1672
--- /dev/null
+++ b/lib/unidecode/x076.py
@@ -0,0 +1,258 @@
+data = (
+'Yu ',    # 0x00
+'Cui ',    # 0x01
+'Ya ',    # 0x02
+'Zhu ',    # 0x03
+'Cu ',    # 0x04
+'Dan ',    # 0x05
+'Shen ',    # 0x06
+'Zhung ',    # 0x07
+'Ji ',    # 0x08
+'Yu ',    # 0x09
+'Hou ',    # 0x0a
+'Feng ',    # 0x0b
+'La ',    # 0x0c
+'Yang ',    # 0x0d
+'Shen ',    # 0x0e
+'Tu ',    # 0x0f
+'Yu ',    # 0x10
+'Gua ',    # 0x11
+'Wen ',    # 0x12
+'Huan ',    # 0x13
+'Ku ',    # 0x14
+'Jia ',    # 0x15
+'Yin ',    # 0x16
+'Yi ',    # 0x17
+'Lu ',    # 0x18
+'Sao ',    # 0x19
+'Jue ',    # 0x1a
+'Chi ',    # 0x1b
+'Xi ',    # 0x1c
+'Guan ',    # 0x1d
+'Yi ',    # 0x1e
+'Wen ',    # 0x1f
+'Ji ',    # 0x20
+'Chuang ',    # 0x21
+'Ban ',    # 0x22
+'Lei ',    # 0x23
+'Liu ',    # 0x24
+'Chai ',    # 0x25
+'Shou ',    # 0x26
+'Nue ',    # 0x27
+'Dian ',    # 0x28
+'Da ',    # 0x29
+'Pie ',    # 0x2a
+'Tan ',    # 0x2b
+'Zhang ',    # 0x2c
+'Biao ',    # 0x2d
+'Shen ',    # 0x2e
+'Cu ',    # 0x2f
+'Luo ',    # 0x30
+'Yi ',    # 0x31
+'Zong ',    # 0x32
+'Chou ',    # 0x33
+'Zhang ',    # 0x34
+'Zhai ',    # 0x35
+'Sou ',    # 0x36
+'Suo ',    # 0x37
+'Que ',    # 0x38
+'Diao ',    # 0x39
+'Lou ',    # 0x3a
+'Lu ',    # 0x3b
+'Mo ',    # 0x3c
+'Jin ',    # 0x3d
+'Yin ',    # 0x3e
+'Ying ',    # 0x3f
+'Huang ',    # 0x40
+'Fu ',    # 0x41
+'Liao ',    # 0x42
+'Long ',    # 0x43
+'Qiao ',    # 0x44
+'Liu ',    # 0x45
+'Lao ',    # 0x46
+'Xian ',    # 0x47
+'Fei ',    # 0x48
+'Dan ',    # 0x49
+'Yin ',    # 0x4a
+'He ',    # 0x4b
+'Yan ',    # 0x4c
+'Ban ',    # 0x4d
+'Xian ',    # 0x4e
+'Guan ',    # 0x4f
+'Guai ',    # 0x50
+'Nong ',    # 0x51
+'Yu ',    # 0x52
+'Wei ',    # 0x53
+'Yi ',    # 0x54
+'Yong ',    # 0x55
+'Pi ',    # 0x56
+'Lei ',    # 0x57
+'Li ',    # 0x58
+'Shu ',    # 0x59
+'Dan ',    # 0x5a
+'Lin ',    # 0x5b
+'Dian ',    # 0x5c
+'Lin ',    # 0x5d
+'Lai ',    # 0x5e
+'Pie ',    # 0x5f
+'Ji ',    # 0x60
+'Chi ',    # 0x61
+'Yang ',    # 0x62
+'Xian ',    # 0x63
+'Jie ',    # 0x64
+'Zheng ',    # 0x65
+'[?] ',    # 0x66
+'Li ',    # 0x67
+'Huo ',    # 0x68
+'Lai ',    # 0x69
+'Shaku ',    # 0x6a
+'Dian ',    # 0x6b
+'Xian ',    # 0x6c
+'Ying ',    # 0x6d
+'Yin ',    # 0x6e
+'Qu ',    # 0x6f
+'Yong ',    # 0x70
+'Tan ',    # 0x71
+'Dian ',    # 0x72
+'Luo ',    # 0x73
+'Luan ',    # 0x74
+'Luan ',    # 0x75
+'Bo ',    # 0x76
+'[?] ',    # 0x77
+'Gui ',    # 0x78
+'Po ',    # 0x79
+'Fa ',    # 0x7a
+'Deng ',    # 0x7b
+'Fa ',    # 0x7c
+'Bai ',    # 0x7d
+'Bai ',    # 0x7e
+'Qie ',    # 0x7f
+'Bi ',    # 0x80
+'Zao ',    # 0x81
+'Zao ',    # 0x82
+'Mao ',    # 0x83
+'De ',    # 0x84
+'Pa ',    # 0x85
+'Jie ',    # 0x86
+'Huang ',    # 0x87
+'Gui ',    # 0x88
+'Ci ',    # 0x89
+'Ling ',    # 0x8a
+'Gao ',    # 0x8b
+'Mo ',    # 0x8c
+'Ji ',    # 0x8d
+'Jiao ',    # 0x8e
+'Peng ',    # 0x8f
+'Gao ',    # 0x90
+'Ai ',    # 0x91
+'E ',    # 0x92
+'Hao ',    # 0x93
+'Han ',    # 0x94
+'Bi ',    # 0x95
+'Wan ',    # 0x96
+'Chou ',    # 0x97
+'Qian ',    # 0x98
+'Xi ',    # 0x99
+'Ai ',    # 0x9a
+'Jiong ',    # 0x9b
+'Hao ',    # 0x9c
+'Huang ',    # 0x9d
+'Hao ',    # 0x9e
+'Ze ',    # 0x9f
+'Cui ',    # 0xa0
+'Hao ',    # 0xa1
+'Xiao ',    # 0xa2
+'Ye ',    # 0xa3
+'Po ',    # 0xa4
+'Hao ',    # 0xa5
+'Jiao ',    # 0xa6
+'Ai ',    # 0xa7
+'Xing ',    # 0xa8
+'Huang ',    # 0xa9
+'Li ',    # 0xaa
+'Piao ',    # 0xab
+'He ',    # 0xac
+'Jiao ',    # 0xad
+'Pi ',    # 0xae
+'Gan ',    # 0xaf
+'Pao ',    # 0xb0
+'Zhou ',    # 0xb1
+'Jun ',    # 0xb2
+'Qiu ',    # 0xb3
+'Cun ',    # 0xb4
+'Que ',    # 0xb5
+'Zha ',    # 0xb6
+'Gu ',    # 0xb7
+'Jun ',    # 0xb8
+'Jun ',    # 0xb9
+'Zhou ',    # 0xba
+'Zha ',    # 0xbb
+'Gu ',    # 0xbc
+'Zhan ',    # 0xbd
+'Du ',    # 0xbe
+'Min ',    # 0xbf
+'Qi ',    # 0xc0
+'Ying ',    # 0xc1
+'Yu ',    # 0xc2
+'Bei ',    # 0xc3
+'Zhao ',    # 0xc4
+'Zhong ',    # 0xc5
+'Pen ',    # 0xc6
+'He ',    # 0xc7
+'Ying ',    # 0xc8
+'He ',    # 0xc9
+'Yi ',    # 0xca
+'Bo ',    # 0xcb
+'Wan ',    # 0xcc
+'He ',    # 0xcd
+'Ang ',    # 0xce
+'Zhan ',    # 0xcf
+'Yan ',    # 0xd0
+'Jian ',    # 0xd1
+'He ',    # 0xd2
+'Yu ',    # 0xd3
+'Kui ',    # 0xd4
+'Fan ',    # 0xd5
+'Gai ',    # 0xd6
+'Dao ',    # 0xd7
+'Pan ',    # 0xd8
+'Fu ',    # 0xd9
+'Qiu ',    # 0xda
+'Sheng ',    # 0xdb
+'Dao ',    # 0xdc
+'Lu ',    # 0xdd
+'Zhan ',    # 0xde
+'Meng ',    # 0xdf
+'Li ',    # 0xe0
+'Jin ',    # 0xe1
+'Xu ',    # 0xe2
+'Jian ',    # 0xe3
+'Pan ',    # 0xe4
+'Guan ',    # 0xe5
+'An ',    # 0xe6
+'Lu ',    # 0xe7
+'Shu ',    # 0xe8
+'Zhou ',    # 0xe9
+'Dang ',    # 0xea
+'An ',    # 0xeb
+'Gu ',    # 0xec
+'Li ',    # 0xed
+'Mu ',    # 0xee
+'Cheng ',    # 0xef
+'Gan ',    # 0xf0
+'Xu ',    # 0xf1
+'Mang ',    # 0xf2
+'Mang ',    # 0xf3
+'Zhi ',    # 0xf4
+'Qi ',    # 0xf5
+'Ruan ',    # 0xf6
+'Tian ',    # 0xf7
+'Xiang ',    # 0xf8
+'Dun ',    # 0xf9
+'Xin ',    # 0xfa
+'Xi ',    # 0xfb
+'Pan ',    # 0xfc
+'Feng ',    # 0xfd
+'Dun ',    # 0xfe
+'Min ',    # 0xff
+)
diff --git a/lib/unidecode/x077.py b/lib/unidecode/x077.py
new file mode 100644
index 00000000..3ed6a36b
--- /dev/null
+++ b/lib/unidecode/x077.py
@@ -0,0 +1,258 @@
+data = (
+'Ming ',    # 0x00
+'Sheng ',    # 0x01
+'Shi ',    # 0x02
+'Yun ',    # 0x03
+'Mian ',    # 0x04
+'Pan ',    # 0x05
+'Fang ',    # 0x06
+'Miao ',    # 0x07
+'Dan ',    # 0x08
+'Mei ',    # 0x09
+'Mao ',    # 0x0a
+'Kan ',    # 0x0b
+'Xian ',    # 0x0c
+'Ou ',    # 0x0d
+'Shi ',    # 0x0e
+'Yang ',    # 0x0f
+'Zheng ',    # 0x10
+'Yao ',    # 0x11
+'Shen ',    # 0x12
+'Huo ',    # 0x13
+'Da ',    # 0x14
+'Zhen ',    # 0x15
+'Kuang ',    # 0x16
+'Ju ',    # 0x17
+'Shen ',    # 0x18
+'Chi ',    # 0x19
+'Sheng ',    # 0x1a
+'Mei ',    # 0x1b
+'Mo ',    # 0x1c
+'Zhu ',    # 0x1d
+'Zhen ',    # 0x1e
+'Zhen ',    # 0x1f
+'Mian ',    # 0x20
+'Di ',    # 0x21
+'Yuan ',    # 0x22
+'Die ',    # 0x23
+'Yi ',    # 0x24
+'Zi ',    # 0x25
+'Zi ',    # 0x26
+'Chao ',    # 0x27
+'Zha ',    # 0x28
+'Xuan ',    # 0x29
+'Bing ',    # 0x2a
+'Mi ',    # 0x2b
+'Long ',    # 0x2c
+'Sui ',    # 0x2d
+'Dong ',    # 0x2e
+'Mi ',    # 0x2f
+'Die ',    # 0x30
+'Yi ',    # 0x31
+'Er ',    # 0x32
+'Ming ',    # 0x33
+'Xuan ',    # 0x34
+'Chi ',    # 0x35
+'Kuang ',    # 0x36
+'Juan ',    # 0x37
+'Mou ',    # 0x38
+'Zhen ',    # 0x39
+'Tiao ',    # 0x3a
+'Yang ',    # 0x3b
+'Yan ',    # 0x3c
+'Mo ',    # 0x3d
+'Zhong ',    # 0x3e
+'Mai ',    # 0x3f
+'Zhao ',    # 0x40
+'Zheng ',    # 0x41
+'Mei ',    # 0x42
+'Jun ',    # 0x43
+'Shao ',    # 0x44
+'Han ',    # 0x45
+'Huan ',    # 0x46
+'Di ',    # 0x47
+'Cheng ',    # 0x48
+'Cuo ',    # 0x49
+'Juan ',    # 0x4a
+'E ',    # 0x4b
+'Wan ',    # 0x4c
+'Xian ',    # 0x4d
+'Xi ',    # 0x4e
+'Kun ',    # 0x4f
+'Lai ',    # 0x50
+'Jian ',    # 0x51
+'Shan ',    # 0x52
+'Tian ',    # 0x53
+'Hun ',    # 0x54
+'Wan ',    # 0x55
+'Ling ',    # 0x56
+'Shi ',    # 0x57
+'Qiong ',    # 0x58
+'Lie ',    # 0x59
+'Yai ',    # 0x5a
+'Jing ',    # 0x5b
+'Zheng ',    # 0x5c
+'Li ',    # 0x5d
+'Lai ',    # 0x5e
+'Sui ',    # 0x5f
+'Juan ',    # 0x60
+'Shui ',    # 0x61
+'Sui ',    # 0x62
+'Du ',    # 0x63
+'Bi ',    # 0x64
+'Bi ',    # 0x65
+'Mu ',    # 0x66
+'Hun ',    # 0x67
+'Ni ',    # 0x68
+'Lu ',    # 0x69
+'Yi ',    # 0x6a
+'Jie ',    # 0x6b
+'Cai ',    # 0x6c
+'Zhou ',    # 0x6d
+'Yu ',    # 0x6e
+'Hun ',    # 0x6f
+'Ma ',    # 0x70
+'Xia ',    # 0x71
+'Xing ',    # 0x72
+'Xi ',    # 0x73
+'Gun ',    # 0x74
+'Cai ',    # 0x75
+'Chun ',    # 0x76
+'Jian ',    # 0x77
+'Mei ',    # 0x78
+'Du ',    # 0x79
+'Hou ',    # 0x7a
+'Xuan ',    # 0x7b
+'Ti ',    # 0x7c
+'Kui ',    # 0x7d
+'Gao ',    # 0x7e
+'Rui ',    # 0x7f
+'Mou ',    # 0x80
+'Xu ',    # 0x81
+'Fa ',    # 0x82
+'Wen ',    # 0x83
+'Miao ',    # 0x84
+'Chou ',    # 0x85
+'Kui ',    # 0x86
+'Mi ',    # 0x87
+'Weng ',    # 0x88
+'Kou ',    # 0x89
+'Dang ',    # 0x8a
+'Chen ',    # 0x8b
+'Ke ',    # 0x8c
+'Sou ',    # 0x8d
+'Xia ',    # 0x8e
+'Qiong ',    # 0x8f
+'Mao ',    # 0x90
+'Ming ',    # 0x91
+'Man ',    # 0x92
+'Shui ',    # 0x93
+'Ze ',    # 0x94
+'Zhang ',    # 0x95
+'Yi ',    # 0x96
+'Diao ',    # 0x97
+'Ou ',    # 0x98
+'Mo ',    # 0x99
+'Shun ',    # 0x9a
+'Cong ',    # 0x9b
+'Lou ',    # 0x9c
+'Chi ',    # 0x9d
+'Man ',    # 0x9e
+'Piao ',    # 0x9f
+'Cheng ',    # 0xa0
+'Ji ',    # 0xa1
+'Meng ',    # 0xa2
+'[?] ',    # 0xa3
+'Run ',    # 0xa4
+'Pie ',    # 0xa5
+'Xi ',    # 0xa6
+'Qiao ',    # 0xa7
+'Pu ',    # 0xa8
+'Zhu ',    # 0xa9
+'Deng ',    # 0xaa
+'Shen ',    # 0xab
+'Shun ',    # 0xac
+'Liao ',    # 0xad
+'Che ',    # 0xae
+'Xian ',    # 0xaf
+'Kan ',    # 0xb0
+'Ye ',    # 0xb1
+'Xu ',    # 0xb2
+'Tong ',    # 0xb3
+'Mou ',    # 0xb4
+'Lin ',    # 0xb5
+'Kui ',    # 0xb6
+'Xian ',    # 0xb7
+'Ye ',    # 0xb8
+'Ai ',    # 0xb9
+'Hui ',    # 0xba
+'Zhan ',    # 0xbb
+'Jian ',    # 0xbc
+'Gu ',    # 0xbd
+'Zhao ',    # 0xbe
+'Qu ',    # 0xbf
+'Wei ',    # 0xc0
+'Chou ',    # 0xc1
+'Sao ',    # 0xc2
+'Ning ',    # 0xc3
+'Xun ',    # 0xc4
+'Yao ',    # 0xc5
+'Huo ',    # 0xc6
+'Meng ',    # 0xc7
+'Mian ',    # 0xc8
+'Bin ',    # 0xc9
+'Mian ',    # 0xca
+'Li ',    # 0xcb
+'Kuang ',    # 0xcc
+'Jue ',    # 0xcd
+'Xuan ',    # 0xce
+'Mian ',    # 0xcf
+'Huo ',    # 0xd0
+'Lu ',    # 0xd1
+'Meng ',    # 0xd2
+'Long ',    # 0xd3
+'Guan ',    # 0xd4
+'Man ',    # 0xd5
+'Xi ',    # 0xd6
+'Chu ',    # 0xd7
+'Tang ',    # 0xd8
+'Kan ',    # 0xd9
+'Zhu ',    # 0xda
+'Mao ',    # 0xdb
+'Jin ',    # 0xdc
+'Lin ',    # 0xdd
+'Yu ',    # 0xde
+'Shuo ',    # 0xdf
+'Ce ',    # 0xe0
+'Jue ',    # 0xe1
+'Shi ',    # 0xe2
+'Yi ',    # 0xe3
+'Shen ',    # 0xe4
+'Zhi ',    # 0xe5
+'Hou ',    # 0xe6
+'Shen ',    # 0xe7
+'Ying ',    # 0xe8
+'Ju ',    # 0xe9
+'Zhou ',    # 0xea
+'Jiao ',    # 0xeb
+'Cuo ',    # 0xec
+'Duan ',    # 0xed
+'Ai ',    # 0xee
+'Jiao ',    # 0xef
+'Zeng ',    # 0xf0
+'Huo ',    # 0xf1
+'Bai ',    # 0xf2
+'Shi ',    # 0xf3
+'Ding ',    # 0xf4
+'Qi ',    # 0xf5
+'Ji ',    # 0xf6
+'Zi ',    # 0xf7
+'Gan ',    # 0xf8
+'Wu ',    # 0xf9
+'Tuo ',    # 0xfa
+'Ku ',    # 0xfb
+'Qiang ',    # 0xfc
+'Xi ',    # 0xfd
+'Fan ',    # 0xfe
+'Kuang ',    # 0xff
+)
diff --git a/lib/unidecode/x078.py b/lib/unidecode/x078.py
new file mode 100644
index 00000000..23d677de
--- /dev/null
+++ b/lib/unidecode/x078.py
@@ -0,0 +1,258 @@
+data = (
+'Dang ',    # 0x00
+'Ma ',    # 0x01
+'Sha ',    # 0x02
+'Dan ',    # 0x03
+'Jue ',    # 0x04
+'Li ',    # 0x05
+'Fu ',    # 0x06
+'Min ',    # 0x07
+'Nuo ',    # 0x08
+'Huo ',    # 0x09
+'Kang ',    # 0x0a
+'Zhi ',    # 0x0b
+'Qi ',    # 0x0c
+'Kan ',    # 0x0d
+'Jie ',    # 0x0e
+'Fen ',    # 0x0f
+'E ',    # 0x10
+'Ya ',    # 0x11
+'Pi ',    # 0x12
+'Zhe ',    # 0x13
+'Yan ',    # 0x14
+'Sui ',    # 0x15
+'Zhuan ',    # 0x16
+'Che ',    # 0x17
+'Dun ',    # 0x18
+'Pan ',    # 0x19
+'Yan ',    # 0x1a
+'[?] ',    # 0x1b
+'Feng ',    # 0x1c
+'Fa ',    # 0x1d
+'Mo ',    # 0x1e
+'Zha ',    # 0x1f
+'Qu ',    # 0x20
+'Yu ',    # 0x21
+'Luo ',    # 0x22
+'Tuo ',    # 0x23
+'Tuo ',    # 0x24
+'Di ',    # 0x25
+'Zhai ',    # 0x26
+'Zhen ',    # 0x27
+'Ai ',    # 0x28
+'Fei ',    # 0x29
+'Mu ',    # 0x2a
+'Zhu ',    # 0x2b
+'Li ',    # 0x2c
+'Bian ',    # 0x2d
+'Nu ',    # 0x2e
+'Ping ',    # 0x2f
+'Peng ',    # 0x30
+'Ling ',    # 0x31
+'Pao ',    # 0x32
+'Le ',    # 0x33
+'Po ',    # 0x34
+'Bo ',    # 0x35
+'Po ',    # 0x36
+'Shen ',    # 0x37
+'Za ',    # 0x38
+'Nuo ',    # 0x39
+'Li ',    # 0x3a
+'Long ',    # 0x3b
+'Tong ',    # 0x3c
+'[?] ',    # 0x3d
+'Li ',    # 0x3e
+'Aragane ',    # 0x3f
+'Chu ',    # 0x40
+'Keng ',    # 0x41
+'Quan ',    # 0x42
+'Zhu ',    # 0x43
+'Kuang ',    # 0x44
+'Huo ',    # 0x45
+'E ',    # 0x46
+'Nao ',    # 0x47
+'Jia ',    # 0x48
+'Lu ',    # 0x49
+'Wei ',    # 0x4a
+'Ai ',    # 0x4b
+'Luo ',    # 0x4c
+'Ken ',    # 0x4d
+'Xing ',    # 0x4e
+'Yan ',    # 0x4f
+'Tong ',    # 0x50
+'Peng ',    # 0x51
+'Xi ',    # 0x52
+'[?] ',    # 0x53
+'Hong ',    # 0x54
+'Shuo ',    # 0x55
+'Xia ',    # 0x56
+'Qiao ',    # 0x57
+'[?] ',    # 0x58
+'Wei ',    # 0x59
+'Qiao ',    # 0x5a
+'[?] ',    # 0x5b
+'Keng ',    # 0x5c
+'Xiao ',    # 0x5d
+'Que ',    # 0x5e
+'Chan ',    # 0x5f
+'Lang ',    # 0x60
+'Hong ',    # 0x61
+'Yu ',    # 0x62
+'Xiao ',    # 0x63
+'Xia ',    # 0x64
+'Mang ',    # 0x65
+'Long ',    # 0x66
+'Iong ',    # 0x67
+'Che ',    # 0x68
+'Che ',    # 0x69
+'E ',    # 0x6a
+'Liu ',    # 0x6b
+'Ying ',    # 0x6c
+'Mang ',    # 0x6d
+'Que ',    # 0x6e
+'Yan ',    # 0x6f
+'Sha ',    # 0x70
+'Kun ',    # 0x71
+'Yu ',    # 0x72
+'[?] ',    # 0x73
+'Kaki ',    # 0x74
+'Lu ',    # 0x75
+'Chen ',    # 0x76
+'Jian ',    # 0x77
+'Nue ',    # 0x78
+'Song ',    # 0x79
+'Zhuo ',    # 0x7a
+'Keng ',    # 0x7b
+'Peng ',    # 0x7c
+'Yan ',    # 0x7d
+'Zhui ',    # 0x7e
+'Kong ',    # 0x7f
+'Ceng ',    # 0x80
+'Qi ',    # 0x81
+'Zong ',    # 0x82
+'Qing ',    # 0x83
+'Lin ',    # 0x84
+'Jun ',    # 0x85
+'Bo ',    # 0x86
+'Ding ',    # 0x87
+'Min ',    # 0x88
+'Diao ',    # 0x89
+'Jian ',    # 0x8a
+'He ',    # 0x8b
+'Lu ',    # 0x8c
+'Ai ',    # 0x8d
+'Sui ',    # 0x8e
+'Que ',    # 0x8f
+'Ling ',    # 0x90
+'Bei ',    # 0x91
+'Yin ',    # 0x92
+'Dui ',    # 0x93
+'Wu ',    # 0x94
+'Qi ',    # 0x95
+'Lun ',    # 0x96
+'Wan ',    # 0x97
+'Dian ',    # 0x98
+'Gang ',    # 0x99
+'Pei ',    # 0x9a
+'Qi ',    # 0x9b
+'Chen ',    # 0x9c
+'Ruan ',    # 0x9d
+'Yan ',    # 0x9e
+'Die ',    # 0x9f
+'Ding ',    # 0xa0
+'Du ',    # 0xa1
+'Tuo ',    # 0xa2
+'Jie ',    # 0xa3
+'Ying ',    # 0xa4
+'Bian ',    # 0xa5
+'Ke ',    # 0xa6
+'Bi ',    # 0xa7
+'Wei ',    # 0xa8
+'Shuo ',    # 0xa9
+'Zhen ',    # 0xaa
+'Duan ',    # 0xab
+'Xia ',    # 0xac
+'Dang ',    # 0xad
+'Ti ',    # 0xae
+'Nao ',    # 0xaf
+'Peng ',    # 0xb0
+'Jian ',    # 0xb1
+'Di ',    # 0xb2
+'Tan ',    # 0xb3
+'Cha ',    # 0xb4
+'Seki ',    # 0xb5
+'Qi ',    # 0xb6
+'[?] ',    # 0xb7
+'Feng ',    # 0xb8
+'Xuan ',    # 0xb9
+'Que ',    # 0xba
+'Que ',    # 0xbb
+'Ma ',    # 0xbc
+'Gong ',    # 0xbd
+'Nian ',    # 0xbe
+'Su ',    # 0xbf
+'E ',    # 0xc0
+'Ci ',    # 0xc1
+'Liu ',    # 0xc2
+'Si ',    # 0xc3
+'Tang ',    # 0xc4
+'Bang ',    # 0xc5
+'Hua ',    # 0xc6
+'Pi ',    # 0xc7
+'Wei ',    # 0xc8
+'Sang ',    # 0xc9
+'Lei ',    # 0xca
+'Cuo ',    # 0xcb
+'Zhen ',    # 0xcc
+'Xia ',    # 0xcd
+'Qi ',    # 0xce
+'Lian ',    # 0xcf
+'Pan ',    # 0xd0
+'Wei ',    # 0xd1
+'Yun ',    # 0xd2
+'Dui ',    # 0xd3
+'Zhe ',    # 0xd4
+'Ke ',    # 0xd5
+'La ',    # 0xd6
+'[?] ',    # 0xd7
+'Qing ',    # 0xd8
+'Gun ',    # 0xd9
+'Zhuan ',    # 0xda
+'Chan ',    # 0xdb
+'Qi ',    # 0xdc
+'Ao ',    # 0xdd
+'Peng ',    # 0xde
+'Lu ',    # 0xdf
+'Lu ',    # 0xe0
+'Kan ',    # 0xe1
+'Qiang ',    # 0xe2
+'Chen ',    # 0xe3
+'Yin ',    # 0xe4
+'Lei ',    # 0xe5
+'Biao ',    # 0xe6
+'Qi ',    # 0xe7
+'Mo ',    # 0xe8
+'Qi ',    # 0xe9
+'Cui ',    # 0xea
+'Zong ',    # 0xeb
+'Qing ',    # 0xec
+'Chuo ',    # 0xed
+'[?] ',    # 0xee
+'Ji ',    # 0xef
+'Shan ',    # 0xf0
+'Lao ',    # 0xf1
+'Qu ',    # 0xf2
+'Zeng ',    # 0xf3
+'Deng ',    # 0xf4
+'Jian ',    # 0xf5
+'Xi ',    # 0xf6
+'Lin ',    # 0xf7
+'Ding ',    # 0xf8
+'Dian ',    # 0xf9
+'Huang ',    # 0xfa
+'Pan ',    # 0xfb
+'Za ',    # 0xfc
+'Qiao ',    # 0xfd
+'Di ',    # 0xfe
+'Li ',    # 0xff
+)
diff --git a/lib/unidecode/x079.py b/lib/unidecode/x079.py
new file mode 100644
index 00000000..ed1c5143
--- /dev/null
+++ b/lib/unidecode/x079.py
@@ -0,0 +1,258 @@
+data = (
+'Tani ',    # 0x00
+'Jiao ',    # 0x01
+'[?] ',    # 0x02
+'Zhang ',    # 0x03
+'Qiao ',    # 0x04
+'Dun ',    # 0x05
+'Xian ',    # 0x06
+'Yu ',    # 0x07
+'Zhui ',    # 0x08
+'He ',    # 0x09
+'Huo ',    # 0x0a
+'Zhai ',    # 0x0b
+'Lei ',    # 0x0c
+'Ke ',    # 0x0d
+'Chu ',    # 0x0e
+'Ji ',    # 0x0f
+'Que ',    # 0x10
+'Dang ',    # 0x11
+'Yi ',    # 0x12
+'Jiang ',    # 0x13
+'Pi ',    # 0x14
+'Pi ',    # 0x15
+'Yu ',    # 0x16
+'Pin ',    # 0x17
+'Qi ',    # 0x18
+'Ai ',    # 0x19
+'Kai ',    # 0x1a
+'Jian ',    # 0x1b
+'Yu ',    # 0x1c
+'Ruan ',    # 0x1d
+'Meng ',    # 0x1e
+'Pao ',    # 0x1f
+'Ci ',    # 0x20
+'[?] ',    # 0x21
+'[?] ',    # 0x22
+'Mie ',    # 0x23
+'Ca ',    # 0x24
+'Xian ',    # 0x25
+'Kuang ',    # 0x26
+'Lei ',    # 0x27
+'Lei ',    # 0x28
+'Zhi ',    # 0x29
+'Li ',    # 0x2a
+'Li ',    # 0x2b
+'Fan ',    # 0x2c
+'Que ',    # 0x2d
+'Pao ',    # 0x2e
+'Ying ',    # 0x2f
+'Li ',    # 0x30
+'Long ',    # 0x31
+'Long ',    # 0x32
+'Mo ',    # 0x33
+'Bo ',    # 0x34
+'Shuang ',    # 0x35
+'Guan ',    # 0x36
+'Lan ',    # 0x37
+'Zan ',    # 0x38
+'Yan ',    # 0x39
+'Shi ',    # 0x3a
+'Shi ',    # 0x3b
+'Li ',    # 0x3c
+'Reng ',    # 0x3d
+'She ',    # 0x3e
+'Yue ',    # 0x3f
+'Si ',    # 0x40
+'Qi ',    # 0x41
+'Ta ',    # 0x42
+'Ma ',    # 0x43
+'Xie ',    # 0x44
+'Xian ',    # 0x45
+'Xian ',    # 0x46
+'Zhi ',    # 0x47
+'Qi ',    # 0x48
+'Zhi ',    # 0x49
+'Beng ',    # 0x4a
+'Dui ',    # 0x4b
+'Zhong ',    # 0x4c
+'[?] ',    # 0x4d
+'Yi ',    # 0x4e
+'Shi ',    # 0x4f
+'You ',    # 0x50
+'Zhi ',    # 0x51
+'Tiao ',    # 0x52
+'Fu ',    # 0x53
+'Fu ',    # 0x54
+'Mi ',    # 0x55
+'Zu ',    # 0x56
+'Zhi ',    # 0x57
+'Suan ',    # 0x58
+'Mei ',    # 0x59
+'Zuo ',    # 0x5a
+'Qu ',    # 0x5b
+'Hu ',    # 0x5c
+'Zhu ',    # 0x5d
+'Shen ',    # 0x5e
+'Sui ',    # 0x5f
+'Ci ',    # 0x60
+'Chai ',    # 0x61
+'Mi ',    # 0x62
+'Lu ',    # 0x63
+'Yu ',    # 0x64
+'Xiang ',    # 0x65
+'Wu ',    # 0x66
+'Tiao ',    # 0x67
+'Piao ',    # 0x68
+'Zhu ',    # 0x69
+'Gui ',    # 0x6a
+'Xia ',    # 0x6b
+'Zhi ',    # 0x6c
+'Ji ',    # 0x6d
+'Gao ',    # 0x6e
+'Zhen ',    # 0x6f
+'Gao ',    # 0x70
+'Shui ',    # 0x71
+'Jin ',    # 0x72
+'Chen ',    # 0x73
+'Gai ',    # 0x74
+'Kun ',    # 0x75
+'Di ',    # 0x76
+'Dao ',    # 0x77
+'Huo ',    # 0x78
+'Tao ',    # 0x79
+'Qi ',    # 0x7a
+'Gu ',    # 0x7b
+'Guan ',    # 0x7c
+'Zui ',    # 0x7d
+'Ling ',    # 0x7e
+'Lu ',    # 0x7f
+'Bing ',    # 0x80
+'Jin ',    # 0x81
+'Dao ',    # 0x82
+'Zhi ',    # 0x83
+'Lu ',    # 0x84
+'Shan ',    # 0x85
+'Bei ',    # 0x86
+'Zhe ',    # 0x87
+'Hui ',    # 0x88
+'You ',    # 0x89
+'Xi ',    # 0x8a
+'Yin ',    # 0x8b
+'Zi ',    # 0x8c
+'Huo ',    # 0x8d
+'Zhen ',    # 0x8e
+'Fu ',    # 0x8f
+'Yuan ',    # 0x90
+'Wu ',    # 0x91
+'Xian ',    # 0x92
+'Yang ',    # 0x93
+'Ti ',    # 0x94
+'Yi ',    # 0x95
+'Mei ',    # 0x96
+'Si ',    # 0x97
+'Di ',    # 0x98
+'[?] ',    # 0x99
+'Zhuo ',    # 0x9a
+'Zhen ',    # 0x9b
+'Yong ',    # 0x9c
+'Ji ',    # 0x9d
+'Gao ',    # 0x9e
+'Tang ',    # 0x9f
+'Si ',    # 0xa0
+'Ma ',    # 0xa1
+'Ta ',    # 0xa2
+'[?] ',    # 0xa3
+'Xuan ',    # 0xa4
+'Qi ',    # 0xa5
+'Yu ',    # 0xa6
+'Xi ',    # 0xa7
+'Ji ',    # 0xa8
+'Si ',    # 0xa9
+'Chan ',    # 0xaa
+'Tan ',    # 0xab
+'Kuai ',    # 0xac
+'Sui ',    # 0xad
+'Li ',    # 0xae
+'Nong ',    # 0xaf
+'Ni ',    # 0xb0
+'Dao ',    # 0xb1
+'Li ',    # 0xb2
+'Rang ',    # 0xb3
+'Yue ',    # 0xb4
+'Ti ',    # 0xb5
+'Zan ',    # 0xb6
+'Lei ',    # 0xb7
+'Rou ',    # 0xb8
+'Yu ',    # 0xb9
+'Yu ',    # 0xba
+'Chi ',    # 0xbb
+'Xie ',    # 0xbc
+'Qin ',    # 0xbd
+'He ',    # 0xbe
+'Tu ',    # 0xbf
+'Xiu ',    # 0xc0
+'Si ',    # 0xc1
+'Ren ',    # 0xc2
+'Tu ',    # 0xc3
+'Zi ',    # 0xc4
+'Cha ',    # 0xc5
+'Gan ',    # 0xc6
+'Yi ',    # 0xc7
+'Xian ',    # 0xc8
+'Bing ',    # 0xc9
+'Nian ',    # 0xca
+'Qiu ',    # 0xcb
+'Qiu ',    # 0xcc
+'Chong ',    # 0xcd
+'Fen ',    # 0xce
+'Hao ',    # 0xcf
+'Yun ',    # 0xd0
+'Ke ',    # 0xd1
+'Miao ',    # 0xd2
+'Zhi ',    # 0xd3
+'Geng ',    # 0xd4
+'Bi ',    # 0xd5
+'Zhi ',    # 0xd6
+'Yu ',    # 0xd7
+'Mi ',    # 0xd8
+'Ku ',    # 0xd9
+'Ban ',    # 0xda
+'Pi ',    # 0xdb
+'Ni ',    # 0xdc
+'Li ',    # 0xdd
+'You ',    # 0xde
+'Zu ',    # 0xdf
+'Pi ',    # 0xe0
+'Ba ',    # 0xe1
+'Ling ',    # 0xe2
+'Mo ',    # 0xe3
+'Cheng ',    # 0xe4
+'Nian ',    # 0xe5
+'Qin ',    # 0xe6
+'Yang ',    # 0xe7
+'Zuo ',    # 0xe8
+'Zhi ',    # 0xe9
+'Zhi ',    # 0xea
+'Shu ',    # 0xeb
+'Ju ',    # 0xec
+'Zi ',    # 0xed
+'Huo ',    # 0xee
+'Ji ',    # 0xef
+'Cheng ',    # 0xf0
+'Tong ',    # 0xf1
+'Zhi ',    # 0xf2
+'Huo ',    # 0xf3
+'He ',    # 0xf4
+'Yin ',    # 0xf5
+'Zi ',    # 0xf6
+'Zhi ',    # 0xf7
+'Jie ',    # 0xf8
+'Ren ',    # 0xf9
+'Du ',    # 0xfa
+'Yi ',    # 0xfb
+'Zhu ',    # 0xfc
+'Hui ',    # 0xfd
+'Nong ',    # 0xfe
+'Fu ',    # 0xff
+)
diff --git a/lib/unidecode/x07a.py b/lib/unidecode/x07a.py
new file mode 100644
index 00000000..b6d512cd
--- /dev/null
+++ b/lib/unidecode/x07a.py
@@ -0,0 +1,258 @@
+data = (
+'Xi ',    # 0x00
+'Kao ',    # 0x01
+'Lang ',    # 0x02
+'Fu ',    # 0x03
+'Ze ',    # 0x04
+'Shui ',    # 0x05
+'Lu ',    # 0x06
+'Kun ',    # 0x07
+'Gan ',    # 0x08
+'Geng ',    # 0x09
+'Ti ',    # 0x0a
+'Cheng ',    # 0x0b
+'Tu ',    # 0x0c
+'Shao ',    # 0x0d
+'Shui ',    # 0x0e
+'Ya ',    # 0x0f
+'Lun ',    # 0x10
+'Lu ',    # 0x11
+'Gu ',    # 0x12
+'Zuo ',    # 0x13
+'Ren ',    # 0x14
+'Zhun ',    # 0x15
+'Bang ',    # 0x16
+'Bai ',    # 0x17
+'Ji ',    # 0x18
+'Zhi ',    # 0x19
+'Zhi ',    # 0x1a
+'Kun ',    # 0x1b
+'Leng ',    # 0x1c
+'Peng ',    # 0x1d
+'Ke ',    # 0x1e
+'Bing ',    # 0x1f
+'Chou ',    # 0x20
+'Zu ',    # 0x21
+'Yu ',    # 0x22
+'Su ',    # 0x23
+'Lue ',    # 0x24
+'[?] ',    # 0x25
+'Yi ',    # 0x26
+'Xi ',    # 0x27
+'Bian ',    # 0x28
+'Ji ',    # 0x29
+'Fu ',    # 0x2a
+'Bi ',    # 0x2b
+'Nuo ',    # 0x2c
+'Jie ',    # 0x2d
+'Zhong ',    # 0x2e
+'Zong ',    # 0x2f
+'Xu ',    # 0x30
+'Cheng ',    # 0x31
+'Dao ',    # 0x32
+'Wen ',    # 0x33
+'Lian ',    # 0x34
+'Zi ',    # 0x35
+'Yu ',    # 0x36
+'Ji ',    # 0x37
+'Xu ',    # 0x38
+'Zhen ',    # 0x39
+'Zhi ',    # 0x3a
+'Dao ',    # 0x3b
+'Jia ',    # 0x3c
+'Ji ',    # 0x3d
+'Gao ',    # 0x3e
+'Gao ',    # 0x3f
+'Gu ',    # 0x40
+'Rong ',    # 0x41
+'Sui ',    # 0x42
+'You ',    # 0x43
+'Ji ',    # 0x44
+'Kang ',    # 0x45
+'Mu ',    # 0x46
+'Shan ',    # 0x47
+'Men ',    # 0x48
+'Zhi ',    # 0x49
+'Ji ',    # 0x4a
+'Lu ',    # 0x4b
+'Su ',    # 0x4c
+'Ji ',    # 0x4d
+'Ying ',    # 0x4e
+'Wen ',    # 0x4f
+'Qiu ',    # 0x50
+'Se ',    # 0x51
+'[?] ',    # 0x52
+'Yi ',    # 0x53
+'Huang ',    # 0x54
+'Qie ',    # 0x55
+'Ji ',    # 0x56
+'Sui ',    # 0x57
+'Xiao ',    # 0x58
+'Pu ',    # 0x59
+'Jiao ',    # 0x5a
+'Zhuo ',    # 0x5b
+'Tong ',    # 0x5c
+'Sai ',    # 0x5d
+'Lu ',    # 0x5e
+'Sui ',    # 0x5f
+'Nong ',    # 0x60
+'Se ',    # 0x61
+'Hui ',    # 0x62
+'Rang ',    # 0x63
+'Nuo ',    # 0x64
+'Yu ',    # 0x65
+'Bin ',    # 0x66
+'Ji ',    # 0x67
+'Tui ',    # 0x68
+'Wen ',    # 0x69
+'Cheng ',    # 0x6a
+'Huo ',    # 0x6b
+'Gong ',    # 0x6c
+'Lu ',    # 0x6d
+'Biao ',    # 0x6e
+'[?] ',    # 0x6f
+'Rang ',    # 0x70
+'Zhuo ',    # 0x71
+'Li ',    # 0x72
+'Zan ',    # 0x73
+'Xue ',    # 0x74
+'Wa ',    # 0x75
+'Jiu ',    # 0x76
+'Qiong ',    # 0x77
+'Xi ',    # 0x78
+'Qiong ',    # 0x79
+'Kong ',    # 0x7a
+'Yu ',    # 0x7b
+'Sen ',    # 0x7c
+'Jing ',    # 0x7d
+'Yao ',    # 0x7e
+'Chuan ',    # 0x7f
+'Zhun ',    # 0x80
+'Tu ',    # 0x81
+'Lao ',    # 0x82
+'Qie ',    # 0x83
+'Zhai ',    # 0x84
+'Yao ',    # 0x85
+'Bian ',    # 0x86
+'Bao ',    # 0x87
+'Yao ',    # 0x88
+'Bing ',    # 0x89
+'Wa ',    # 0x8a
+'Zhu ',    # 0x8b
+'Jiao ',    # 0x8c
+'Qiao ',    # 0x8d
+'Diao ',    # 0x8e
+'Wu ',    # 0x8f
+'Gui ',    # 0x90
+'Yao ',    # 0x91
+'Zhi ',    # 0x92
+'Chuang ',    # 0x93
+'Yao ',    # 0x94
+'Tiao ',    # 0x95
+'Jiao ',    # 0x96
+'Chuang ',    # 0x97
+'Jiong ',    # 0x98
+'Xiao ',    # 0x99
+'Cheng ',    # 0x9a
+'Kou ',    # 0x9b
+'Cuan ',    # 0x9c
+'Wo ',    # 0x9d
+'Dan ',    # 0x9e
+'Ku ',    # 0x9f
+'Ke ',    # 0xa0
+'Zhui ',    # 0xa1
+'Xu ',    # 0xa2
+'Su ',    # 0xa3
+'Guan ',    # 0xa4
+'Kui ',    # 0xa5
+'Dou ',    # 0xa6
+'[?] ',    # 0xa7
+'Yin ',    # 0xa8
+'Wo ',    # 0xa9
+'Wa ',    # 0xaa
+'Ya ',    # 0xab
+'Yu ',    # 0xac
+'Ju ',    # 0xad
+'Qiong ',    # 0xae
+'Yao ',    # 0xaf
+'Yao ',    # 0xb0
+'Tiao ',    # 0xb1
+'Chao ',    # 0xb2
+'Yu ',    # 0xb3
+'Tian ',    # 0xb4
+'Diao ',    # 0xb5
+'Ju ',    # 0xb6
+'Liao ',    # 0xb7
+'Xi ',    # 0xb8
+'Wu ',    # 0xb9
+'Kui ',    # 0xba
+'Chuang ',    # 0xbb
+'Zhao ',    # 0xbc
+'[?] ',    # 0xbd
+'Kuan ',    # 0xbe
+'Long ',    # 0xbf
+'Cheng ',    # 0xc0
+'Cui ',    # 0xc1
+'Piao ',    # 0xc2
+'Zao ',    # 0xc3
+'Cuan ',    # 0xc4
+'Qiao ',    # 0xc5
+'Qiong ',    # 0xc6
+'Dou ',    # 0xc7
+'Zao ',    # 0xc8
+'Long ',    # 0xc9
+'Qie ',    # 0xca
+'Li ',    # 0xcb
+'Chu ',    # 0xcc
+'Shi ',    # 0xcd
+'Fou ',    # 0xce
+'Qian ',    # 0xcf
+'Chu ',    # 0xd0
+'Hong ',    # 0xd1
+'Qi ',    # 0xd2
+'Qian ',    # 0xd3
+'Gong ',    # 0xd4
+'Shi ',    # 0xd5
+'Shu ',    # 0xd6
+'Miao ',    # 0xd7
+'Ju ',    # 0xd8
+'Zhan ',    # 0xd9
+'Zhu ',    # 0xda
+'Ling ',    # 0xdb
+'Long ',    # 0xdc
+'Bing ',    # 0xdd
+'Jing ',    # 0xde
+'Jing ',    # 0xdf
+'Zhang ',    # 0xe0
+'Yi ',    # 0xe1
+'Si ',    # 0xe2
+'Jun ',    # 0xe3
+'Hong ',    # 0xe4
+'Tong ',    # 0xe5
+'Song ',    # 0xe6
+'Jing ',    # 0xe7
+'Diao ',    # 0xe8
+'Yi ',    # 0xe9
+'Shu ',    # 0xea
+'Jing ',    # 0xeb
+'Qu ',    # 0xec
+'Jie ',    # 0xed
+'Ping ',    # 0xee
+'Duan ',    # 0xef
+'Shao ',    # 0xf0
+'Zhuan ',    # 0xf1
+'Ceng ',    # 0xf2
+'Deng ',    # 0xf3
+'Cui ',    # 0xf4
+'Huai ',    # 0xf5
+'Jing ',    # 0xf6
+'Kan ',    # 0xf7
+'Jing ',    # 0xf8
+'Zhu ',    # 0xf9
+'Zhu ',    # 0xfa
+'Le ',    # 0xfb
+'Peng ',    # 0xfc
+'Yu ',    # 0xfd
+'Chi ',    # 0xfe
+'Gan ',    # 0xff
+)
diff --git a/lib/unidecode/x07b.py b/lib/unidecode/x07b.py
new file mode 100644
index 00000000..c904395c
--- /dev/null
+++ b/lib/unidecode/x07b.py
@@ -0,0 +1,258 @@
+data = (
+'Mang ',    # 0x00
+'Zhu ',    # 0x01
+'Utsubo ',    # 0x02
+'Du ',    # 0x03
+'Ji ',    # 0x04
+'Xiao ',    # 0x05
+'Ba ',    # 0x06
+'Suan ',    # 0x07
+'Ji ',    # 0x08
+'Zhen ',    # 0x09
+'Zhao ',    # 0x0a
+'Sun ',    # 0x0b
+'Ya ',    # 0x0c
+'Zhui ',    # 0x0d
+'Yuan ',    # 0x0e
+'Hu ',    # 0x0f
+'Gang ',    # 0x10
+'Xiao ',    # 0x11
+'Cen ',    # 0x12
+'Pi ',    # 0x13
+'Bi ',    # 0x14
+'Jian ',    # 0x15
+'Yi ',    # 0x16
+'Dong ',    # 0x17
+'Shan ',    # 0x18
+'Sheng ',    # 0x19
+'Xia ',    # 0x1a
+'Di ',    # 0x1b
+'Zhu ',    # 0x1c
+'Na ',    # 0x1d
+'Chi ',    # 0x1e
+'Gu ',    # 0x1f
+'Li ',    # 0x20
+'Qie ',    # 0x21
+'Min ',    # 0x22
+'Bao ',    # 0x23
+'Tiao ',    # 0x24
+'Si ',    # 0x25
+'Fu ',    # 0x26
+'Ce ',    # 0x27
+'Ben ',    # 0x28
+'Pei ',    # 0x29
+'Da ',    # 0x2a
+'Zi ',    # 0x2b
+'Di ',    # 0x2c
+'Ling ',    # 0x2d
+'Ze ',    # 0x2e
+'Nu ',    # 0x2f
+'Fu ',    # 0x30
+'Gou ',    # 0x31
+'Fan ',    # 0x32
+'Jia ',    # 0x33
+'Ge ',    # 0x34
+'Fan ',    # 0x35
+'Shi ',    # 0x36
+'Mao ',    # 0x37
+'Po ',    # 0x38
+'Sey ',    # 0x39
+'Jian ',    # 0x3a
+'Qiong ',    # 0x3b
+'Long ',    # 0x3c
+'Souke ',    # 0x3d
+'Bian ',    # 0x3e
+'Luo ',    # 0x3f
+'Gui ',    # 0x40
+'Qu ',    # 0x41
+'Chi ',    # 0x42
+'Yin ',    # 0x43
+'Yao ',    # 0x44
+'Xian ',    # 0x45
+'Bi ',    # 0x46
+'Qiong ',    # 0x47
+'Gua ',    # 0x48
+'Deng ',    # 0x49
+'Jiao ',    # 0x4a
+'Jin ',    # 0x4b
+'Quan ',    # 0x4c
+'Sun ',    # 0x4d
+'Ru ',    # 0x4e
+'Fa ',    # 0x4f
+'Kuang ',    # 0x50
+'Zhu ',    # 0x51
+'Tong ',    # 0x52
+'Ji ',    # 0x53
+'Da ',    # 0x54
+'Xing ',    # 0x55
+'Ce ',    # 0x56
+'Zhong ',    # 0x57
+'Kou ',    # 0x58
+'Lai ',    # 0x59
+'Bi ',    # 0x5a
+'Shai ',    # 0x5b
+'Dang ',    # 0x5c
+'Zheng ',    # 0x5d
+'Ce ',    # 0x5e
+'Fu ',    # 0x5f
+'Yun ',    # 0x60
+'Tu ',    # 0x61
+'Pa ',    # 0x62
+'Li ',    # 0x63
+'Lang ',    # 0x64
+'Ju ',    # 0x65
+'Guan ',    # 0x66
+'Jian ',    # 0x67
+'Han ',    # 0x68
+'Tong ',    # 0x69
+'Xia ',    # 0x6a
+'Zhi ',    # 0x6b
+'Cheng ',    # 0x6c
+'Suan ',    # 0x6d
+'Shi ',    # 0x6e
+'Zhu ',    # 0x6f
+'Zuo ',    # 0x70
+'Xiao ',    # 0x71
+'Shao ',    # 0x72
+'Ting ',    # 0x73
+'Ce ',    # 0x74
+'Yan ',    # 0x75
+'Gao ',    # 0x76
+'Kuai ',    # 0x77
+'Gan ',    # 0x78
+'Chou ',    # 0x79
+'Kago ',    # 0x7a
+'Gang ',    # 0x7b
+'Yun ',    # 0x7c
+'O ',    # 0x7d
+'Qian ',    # 0x7e
+'Xiao ',    # 0x7f
+'Jian ',    # 0x80
+'Pu ',    # 0x81
+'Lai ',    # 0x82
+'Zou ',    # 0x83
+'Bi ',    # 0x84
+'Bi ',    # 0x85
+'Bi ',    # 0x86
+'Ge ',    # 0x87
+'Chi ',    # 0x88
+'Guai ',    # 0x89
+'Yu ',    # 0x8a
+'Jian ',    # 0x8b
+'Zhao ',    # 0x8c
+'Gu ',    # 0x8d
+'Chi ',    # 0x8e
+'Zheng ',    # 0x8f
+'Jing ',    # 0x90
+'Sha ',    # 0x91
+'Zhou ',    # 0x92
+'Lu ',    # 0x93
+'Bo ',    # 0x94
+'Ji ',    # 0x95
+'Lin ',    # 0x96
+'Suan ',    # 0x97
+'Jun ',    # 0x98
+'Fu ',    # 0x99
+'Zha ',    # 0x9a
+'Gu ',    # 0x9b
+'Kong ',    # 0x9c
+'Qian ',    # 0x9d
+'Quan ',    # 0x9e
+'Jun ',    # 0x9f
+'Chui ',    # 0xa0
+'Guan ',    # 0xa1
+'Yuan ',    # 0xa2
+'Ce ',    # 0xa3
+'Ju ',    # 0xa4
+'Bo ',    # 0xa5
+'Ze ',    # 0xa6
+'Qie ',    # 0xa7
+'Tuo ',    # 0xa8
+'Luo ',    # 0xa9
+'Dan ',    # 0xaa
+'Xiao ',    # 0xab
+'Ruo ',    # 0xac
+'Jian ',    # 0xad
+'Xuan ',    # 0xae
+'Bian ',    # 0xaf
+'Sun ',    # 0xb0
+'Xiang ',    # 0xb1
+'Xian ',    # 0xb2
+'Ping ',    # 0xb3
+'Zhen ',    # 0xb4
+'Sheng ',    # 0xb5
+'Hu ',    # 0xb6
+'Shi ',    # 0xb7
+'Zhu ',    # 0xb8
+'Yue ',    # 0xb9
+'Chun ',    # 0xba
+'Lu ',    # 0xbb
+'Wu ',    # 0xbc
+'Dong ',    # 0xbd
+'Xiao ',    # 0xbe
+'Ji ',    # 0xbf
+'Jie ',    # 0xc0
+'Huang ',    # 0xc1
+'Xing ',    # 0xc2
+'Mei ',    # 0xc3
+'Fan ',    # 0xc4
+'Chui ',    # 0xc5
+'Zhuan ',    # 0xc6
+'Pian ',    # 0xc7
+'Feng ',    # 0xc8
+'Zhu ',    # 0xc9
+'Hong ',    # 0xca
+'Qie ',    # 0xcb
+'Hou ',    # 0xcc
+'Qiu ',    # 0xcd
+'Miao ',    # 0xce
+'Qian ',    # 0xcf
+'[?] ',    # 0xd0
+'Kui ',    # 0xd1
+'Sik ',    # 0xd2
+'Lou ',    # 0xd3
+'Yun ',    # 0xd4
+'He ',    # 0xd5
+'Tang ',    # 0xd6
+'Yue ',    # 0xd7
+'Chou ',    # 0xd8
+'Gao ',    # 0xd9
+'Fei ',    # 0xda
+'Ruo ',    # 0xdb
+'Zheng ',    # 0xdc
+'Gou ',    # 0xdd
+'Nie ',    # 0xde
+'Qian ',    # 0xdf
+'Xiao ',    # 0xe0
+'Cuan ',    # 0xe1
+'Gong ',    # 0xe2
+'Pang ',    # 0xe3
+'Du ',    # 0xe4
+'Li ',    # 0xe5
+'Bi ',    # 0xe6
+'Zhuo ',    # 0xe7
+'Chu ',    # 0xe8
+'Shai ',    # 0xe9
+'Chi ',    # 0xea
+'Zhu ',    # 0xeb
+'Qiang ',    # 0xec
+'Long ',    # 0xed
+'Lan ',    # 0xee
+'Jian ',    # 0xef
+'Bu ',    # 0xf0
+'Li ',    # 0xf1
+'Hui ',    # 0xf2
+'Bi ',    # 0xf3
+'Di ',    # 0xf4
+'Cong ',    # 0xf5
+'Yan ',    # 0xf6
+'Peng ',    # 0xf7
+'Sen ',    # 0xf8
+'Zhuan ',    # 0xf9
+'Pai ',    # 0xfa
+'Piao ',    # 0xfb
+'Dou ',    # 0xfc
+'Yu ',    # 0xfd
+'Mie ',    # 0xfe
+'Zhuan ',    # 0xff
+)
diff --git a/lib/unidecode/x07c.py b/lib/unidecode/x07c.py
new file mode 100644
index 00000000..3379947a
--- /dev/null
+++ b/lib/unidecode/x07c.py
@@ -0,0 +1,258 @@
+data = (
+'Ze ',    # 0x00
+'Xi ',    # 0x01
+'Guo ',    # 0x02
+'Yi ',    # 0x03
+'Hu ',    # 0x04
+'Chan ',    # 0x05
+'Kou ',    # 0x06
+'Cu ',    # 0x07
+'Ping ',    # 0x08
+'Chou ',    # 0x09
+'Ji ',    # 0x0a
+'Gui ',    # 0x0b
+'Su ',    # 0x0c
+'Lou ',    # 0x0d
+'Zha ',    # 0x0e
+'Lu ',    # 0x0f
+'Nian ',    # 0x10
+'Suo ',    # 0x11
+'Cuan ',    # 0x12
+'Sasara ',    # 0x13
+'Suo ',    # 0x14
+'Le ',    # 0x15
+'Duan ',    # 0x16
+'Yana ',    # 0x17
+'Xiao ',    # 0x18
+'Bo ',    # 0x19
+'Mi ',    # 0x1a
+'Si ',    # 0x1b
+'Dang ',    # 0x1c
+'Liao ',    # 0x1d
+'Dan ',    # 0x1e
+'Dian ',    # 0x1f
+'Fu ',    # 0x20
+'Jian ',    # 0x21
+'Min ',    # 0x22
+'Kui ',    # 0x23
+'Dai ',    # 0x24
+'Qiao ',    # 0x25
+'Deng ',    # 0x26
+'Huang ',    # 0x27
+'Sun ',    # 0x28
+'Lao ',    # 0x29
+'Zan ',    # 0x2a
+'Xiao ',    # 0x2b
+'Du ',    # 0x2c
+'Shi ',    # 0x2d
+'Zan ',    # 0x2e
+'[?] ',    # 0x2f
+'Pai ',    # 0x30
+'Hata ',    # 0x31
+'Pai ',    # 0x32
+'Gan ',    # 0x33
+'Ju ',    # 0x34
+'Du ',    # 0x35
+'Lu ',    # 0x36
+'Yan ',    # 0x37
+'Bo ',    # 0x38
+'Dang ',    # 0x39
+'Sai ',    # 0x3a
+'Ke ',    # 0x3b
+'Long ',    # 0x3c
+'Qian ',    # 0x3d
+'Lian ',    # 0x3e
+'Bo ',    # 0x3f
+'Zhou ',    # 0x40
+'Lai ',    # 0x41
+'[?] ',    # 0x42
+'Lan ',    # 0x43
+'Kui ',    # 0x44
+'Yu ',    # 0x45
+'Yue ',    # 0x46
+'Hao ',    # 0x47
+'Zhen ',    # 0x48
+'Tai ',    # 0x49
+'Ti ',    # 0x4a
+'Mi ',    # 0x4b
+'Chou ',    # 0x4c
+'Ji ',    # 0x4d
+'[?] ',    # 0x4e
+'Hata ',    # 0x4f
+'Teng ',    # 0x50
+'Zhuan ',    # 0x51
+'Zhou ',    # 0x52
+'Fan ',    # 0x53
+'Sou ',    # 0x54
+'Zhou ',    # 0x55
+'Kuji ',    # 0x56
+'Zhuo ',    # 0x57
+'Teng ',    # 0x58
+'Lu ',    # 0x59
+'Lu ',    # 0x5a
+'Jian ',    # 0x5b
+'Tuo ',    # 0x5c
+'Ying ',    # 0x5d
+'Yu ',    # 0x5e
+'Lai ',    # 0x5f
+'Long ',    # 0x60
+'Shinshi ',    # 0x61
+'Lian ',    # 0x62
+'Lan ',    # 0x63
+'Qian ',    # 0x64
+'Yue ',    # 0x65
+'Zhong ',    # 0x66
+'Qu ',    # 0x67
+'Lian ',    # 0x68
+'Bian ',    # 0x69
+'Duan ',    # 0x6a
+'Zuan ',    # 0x6b
+'Li ',    # 0x6c
+'Si ',    # 0x6d
+'Luo ',    # 0x6e
+'Ying ',    # 0x6f
+'Yue ',    # 0x70
+'Zhuo ',    # 0x71
+'Xu ',    # 0x72
+'Mi ',    # 0x73
+'Di ',    # 0x74
+'Fan ',    # 0x75
+'Shen ',    # 0x76
+'Zhe ',    # 0x77
+'Shen ',    # 0x78
+'Nu ',    # 0x79
+'Xie ',    # 0x7a
+'Lei ',    # 0x7b
+'Xian ',    # 0x7c
+'Zi ',    # 0x7d
+'Ni ',    # 0x7e
+'Cun ',    # 0x7f
+'[?] ',    # 0x80
+'Qian ',    # 0x81
+'Kume ',    # 0x82
+'Bi ',    # 0x83
+'Ban ',    # 0x84
+'Wu ',    # 0x85
+'Sha ',    # 0x86
+'Kang ',    # 0x87
+'Rou ',    # 0x88
+'Fen ',    # 0x89
+'Bi ',    # 0x8a
+'Cui ',    # 0x8b
+'[?] ',    # 0x8c
+'Li ',    # 0x8d
+'Chi ',    # 0x8e
+'Nukamiso ',    # 0x8f
+'Ro ',    # 0x90
+'Ba ',    # 0x91
+'Li ',    # 0x92
+'Gan ',    # 0x93
+'Ju ',    # 0x94
+'Po ',    # 0x95
+'Mo ',    # 0x96
+'Cu ',    # 0x97
+'Nian ',    # 0x98
+'Zhou ',    # 0x99
+'Li ',    # 0x9a
+'Su ',    # 0x9b
+'Tiao ',    # 0x9c
+'Li ',    # 0x9d
+'Qi ',    # 0x9e
+'Su ',    # 0x9f
+'Hong ',    # 0xa0
+'Tong ',    # 0xa1
+'Zi ',    # 0xa2
+'Ce ',    # 0xa3
+'Yue ',    # 0xa4
+'Zhou ',    # 0xa5
+'Lin ',    # 0xa6
+'Zhuang ',    # 0xa7
+'Bai ',    # 0xa8
+'[?] ',    # 0xa9
+'Fen ',    # 0xaa
+'Ji ',    # 0xab
+'[?] ',    # 0xac
+'Sukumo ',    # 0xad
+'Liang ',    # 0xae
+'Xian ',    # 0xaf
+'Fu ',    # 0xb0
+'Liang ',    # 0xb1
+'Can ',    # 0xb2
+'Geng ',    # 0xb3
+'Li ',    # 0xb4
+'Yue ',    # 0xb5
+'Lu ',    # 0xb6
+'Ju ',    # 0xb7
+'Qi ',    # 0xb8
+'Cui ',    # 0xb9
+'Bai ',    # 0xba
+'Zhang ',    # 0xbb
+'Lin ',    # 0xbc
+'Zong ',    # 0xbd
+'Jing ',    # 0xbe
+'Guo ',    # 0xbf
+'Kouji ',    # 0xc0
+'San ',    # 0xc1
+'San ',    # 0xc2
+'Tang ',    # 0xc3
+'Bian ',    # 0xc4
+'Rou ',    # 0xc5
+'Mian ',    # 0xc6
+'Hou ',    # 0xc7
+'Xu ',    # 0xc8
+'Zong ',    # 0xc9
+'Hu ',    # 0xca
+'Jian ',    # 0xcb
+'Zan ',    # 0xcc
+'Ci ',    # 0xcd
+'Li ',    # 0xce
+'Xie ',    # 0xcf
+'Fu ',    # 0xd0
+'Ni ',    # 0xd1
+'Bei ',    # 0xd2
+'Gu ',    # 0xd3
+'Xiu ',    # 0xd4
+'Gao ',    # 0xd5
+'Tang ',    # 0xd6
+'Qiu ',    # 0xd7
+'Sukumo ',    # 0xd8
+'Cao ',    # 0xd9
+'Zhuang ',    # 0xda
+'Tang ',    # 0xdb
+'Mi ',    # 0xdc
+'San ',    # 0xdd
+'Fen ',    # 0xde
+'Zao ',    # 0xdf
+'Kang ',    # 0xe0
+'Jiang ',    # 0xe1
+'Mo ',    # 0xe2
+'San ',    # 0xe3
+'San ',    # 0xe4
+'Nuo ',    # 0xe5
+'Xi ',    # 0xe6
+'Liang ',    # 0xe7
+'Jiang ',    # 0xe8
+'Kuai ',    # 0xe9
+'Bo ',    # 0xea
+'Huan ',    # 0xeb
+'[?] ',    # 0xec
+'Zong ',    # 0xed
+'Xian ',    # 0xee
+'Nuo ',    # 0xef
+'Tuan ',    # 0xf0
+'Nie ',    # 0xf1
+'Li ',    # 0xf2
+'Zuo ',    # 0xf3
+'Di ',    # 0xf4
+'Nie ',    # 0xf5
+'Tiao ',    # 0xf6
+'Lan ',    # 0xf7
+'Mi ',    # 0xf8
+'Jiao ',    # 0xf9
+'Jiu ',    # 0xfa
+'Xi ',    # 0xfb
+'Gong ',    # 0xfc
+'Zheng ',    # 0xfd
+'Jiu ',    # 0xfe
+'You ',    # 0xff
+)
diff --git a/lib/unidecode/x07d.py b/lib/unidecode/x07d.py
new file mode 100644
index 00000000..241db29c
--- /dev/null
+++ b/lib/unidecode/x07d.py
@@ -0,0 +1,258 @@
+data = (
+'Ji ',    # 0x00
+'Cha ',    # 0x01
+'Zhou ',    # 0x02
+'Xun ',    # 0x03
+'Yue ',    # 0x04
+'Hong ',    # 0x05
+'Yu ',    # 0x06
+'He ',    # 0x07
+'Wan ',    # 0x08
+'Ren ',    # 0x09
+'Wen ',    # 0x0a
+'Wen ',    # 0x0b
+'Qiu ',    # 0x0c
+'Na ',    # 0x0d
+'Zi ',    # 0x0e
+'Tou ',    # 0x0f
+'Niu ',    # 0x10
+'Fou ',    # 0x11
+'Jie ',    # 0x12
+'Shu ',    # 0x13
+'Chun ',    # 0x14
+'Pi ',    # 0x15
+'Yin ',    # 0x16
+'Sha ',    # 0x17
+'Hong ',    # 0x18
+'Zhi ',    # 0x19
+'Ji ',    # 0x1a
+'Fen ',    # 0x1b
+'Yun ',    # 0x1c
+'Ren ',    # 0x1d
+'Dan ',    # 0x1e
+'Jin ',    # 0x1f
+'Su ',    # 0x20
+'Fang ',    # 0x21
+'Suo ',    # 0x22
+'Cui ',    # 0x23
+'Jiu ',    # 0x24
+'Zha ',    # 0x25
+'Kinu ',    # 0x26
+'Jin ',    # 0x27
+'Fu ',    # 0x28
+'Zhi ',    # 0x29
+'Ci ',    # 0x2a
+'Zi ',    # 0x2b
+'Chou ',    # 0x2c
+'Hong ',    # 0x2d
+'Zha ',    # 0x2e
+'Lei ',    # 0x2f
+'Xi ',    # 0x30
+'Fu ',    # 0x31
+'Xie ',    # 0x32
+'Shen ',    # 0x33
+'Bei ',    # 0x34
+'Zhu ',    # 0x35
+'Qu ',    # 0x36
+'Ling ',    # 0x37
+'Zhu ',    # 0x38
+'Shao ',    # 0x39
+'Gan ',    # 0x3a
+'Yang ',    # 0x3b
+'Fu ',    # 0x3c
+'Tuo ',    # 0x3d
+'Zhen ',    # 0x3e
+'Dai ',    # 0x3f
+'Zhuo ',    # 0x40
+'Shi ',    # 0x41
+'Zhong ',    # 0x42
+'Xian ',    # 0x43
+'Zu ',    # 0x44
+'Jiong ',    # 0x45
+'Ban ',    # 0x46
+'Ju ',    # 0x47
+'Mo ',    # 0x48
+'Shu ',    # 0x49
+'Zui ',    # 0x4a
+'Wata ',    # 0x4b
+'Jing ',    # 0x4c
+'Ren ',    # 0x4d
+'Heng ',    # 0x4e
+'Xie ',    # 0x4f
+'Jie ',    # 0x50
+'Zhu ',    # 0x51
+'Chou ',    # 0x52
+'Gua ',    # 0x53
+'Bai ',    # 0x54
+'Jue ',    # 0x55
+'Kuang ',    # 0x56
+'Hu ',    # 0x57
+'Ci ',    # 0x58
+'Geng ',    # 0x59
+'Geng ',    # 0x5a
+'Tao ',    # 0x5b
+'Xie ',    # 0x5c
+'Ku ',    # 0x5d
+'Jiao ',    # 0x5e
+'Quan ',    # 0x5f
+'Gai ',    # 0x60
+'Luo ',    # 0x61
+'Xuan ',    # 0x62
+'Bing ',    # 0x63
+'Xian ',    # 0x64
+'Fu ',    # 0x65
+'Gei ',    # 0x66
+'Tong ',    # 0x67
+'Rong ',    # 0x68
+'Tiao ',    # 0x69
+'Yin ',    # 0x6a
+'Lei ',    # 0x6b
+'Xie ',    # 0x6c
+'Quan ',    # 0x6d
+'Xu ',    # 0x6e
+'Lun ',    # 0x6f
+'Die ',    # 0x70
+'Tong ',    # 0x71
+'Si ',    # 0x72
+'Jiang ',    # 0x73
+'Xiang ',    # 0x74
+'Hui ',    # 0x75
+'Jue ',    # 0x76
+'Zhi ',    # 0x77
+'Jian ',    # 0x78
+'Juan ',    # 0x79
+'Chi ',    # 0x7a
+'Mian ',    # 0x7b
+'Zhen ',    # 0x7c
+'Lu ',    # 0x7d
+'Cheng ',    # 0x7e
+'Qiu ',    # 0x7f
+'Shu ',    # 0x80
+'Bang ',    # 0x81
+'Tong ',    # 0x82
+'Xiao ',    # 0x83
+'Wan ',    # 0x84
+'Qin ',    # 0x85
+'Geng ',    # 0x86
+'Xiu ',    # 0x87
+'Ti ',    # 0x88
+'Xiu ',    # 0x89
+'Xie ',    # 0x8a
+'Hong ',    # 0x8b
+'Xi ',    # 0x8c
+'Fu ',    # 0x8d
+'Ting ',    # 0x8e
+'Sui ',    # 0x8f
+'Dui ',    # 0x90
+'Kun ',    # 0x91
+'Fu ',    # 0x92
+'Jing ',    # 0x93
+'Hu ',    # 0x94
+'Zhi ',    # 0x95
+'Yan ',    # 0x96
+'Jiong ',    # 0x97
+'Feng ',    # 0x98
+'Ji ',    # 0x99
+'Sok ',    # 0x9a
+'Kase ',    # 0x9b
+'Zong ',    # 0x9c
+'Lin ',    # 0x9d
+'Duo ',    # 0x9e
+'Li ',    # 0x9f
+'Lu ',    # 0xa0
+'Liang ',    # 0xa1
+'Chou ',    # 0xa2
+'Quan ',    # 0xa3
+'Shao ',    # 0xa4
+'Qi ',    # 0xa5
+'Qi ',    # 0xa6
+'Zhun ',    # 0xa7
+'Qi ',    # 0xa8
+'Wan ',    # 0xa9
+'Qian ',    # 0xaa
+'Xian ',    # 0xab
+'Shou ',    # 0xac
+'Wei ',    # 0xad
+'Qi ',    # 0xae
+'Tao ',    # 0xaf
+'Wan ',    # 0xb0
+'Gang ',    # 0xb1
+'Wang ',    # 0xb2
+'Beng ',    # 0xb3
+'Zhui ',    # 0xb4
+'Cai ',    # 0xb5
+'Guo ',    # 0xb6
+'Cui ',    # 0xb7
+'Lun ',    # 0xb8
+'Liu ',    # 0xb9
+'Qi ',    # 0xba
+'Zhan ',    # 0xbb
+'Bei ',    # 0xbc
+'Chuo ',    # 0xbd
+'Ling ',    # 0xbe
+'Mian ',    # 0xbf
+'Qi ',    # 0xc0
+'Qie ',    # 0xc1
+'Tan ',    # 0xc2
+'Zong ',    # 0xc3
+'Gun ',    # 0xc4
+'Zou ',    # 0xc5
+'Yi ',    # 0xc6
+'Zi ',    # 0xc7
+'Xing ',    # 0xc8
+'Liang ',    # 0xc9
+'Jin ',    # 0xca
+'Fei ',    # 0xcb
+'Rui ',    # 0xcc
+'Min ',    # 0xcd
+'Yu ',    # 0xce
+'Zong ',    # 0xcf
+'Fan ',    # 0xd0
+'Lu ',    # 0xd1
+'Xu ',    # 0xd2
+'Yingl ',    # 0xd3
+'Zhang ',    # 0xd4
+'Kasuri ',    # 0xd5
+'Xu ',    # 0xd6
+'Xiang ',    # 0xd7
+'Jian ',    # 0xd8
+'Ke ',    # 0xd9
+'Xian ',    # 0xda
+'Ruan ',    # 0xdb
+'Mian ',    # 0xdc
+'Qi ',    # 0xdd
+'Duan ',    # 0xde
+'Zhong ',    # 0xdf
+'Di ',    # 0xe0
+'Min ',    # 0xe1
+'Miao ',    # 0xe2
+'Yuan ',    # 0xe3
+'Xie ',    # 0xe4
+'Bao ',    # 0xe5
+'Si ',    # 0xe6
+'Qiu ',    # 0xe7
+'Bian ',    # 0xe8
+'Huan ',    # 0xe9
+'Geng ',    # 0xea
+'Cong ',    # 0xeb
+'Mian ',    # 0xec
+'Wei ',    # 0xed
+'Fu ',    # 0xee
+'Wei ',    # 0xef
+'Yu ',    # 0xf0
+'Gou ',    # 0xf1
+'Miao ',    # 0xf2
+'Xie ',    # 0xf3
+'Lian ',    # 0xf4
+'Zong ',    # 0xf5
+'Bian ',    # 0xf6
+'Yun ',    # 0xf7
+'Yin ',    # 0xf8
+'Ti ',    # 0xf9
+'Gua ',    # 0xfa
+'Zhi ',    # 0xfb
+'Yun ',    # 0xfc
+'Cheng ',    # 0xfd
+'Chan ',    # 0xfe
+'Dai ',    # 0xff
+)
diff --git a/lib/unidecode/x07e.py b/lib/unidecode/x07e.py
new file mode 100644
index 00000000..131ef35c
--- /dev/null
+++ b/lib/unidecode/x07e.py
@@ -0,0 +1,258 @@
+data = (
+'Xia ',    # 0x00
+'Yuan ',    # 0x01
+'Zong ',    # 0x02
+'Xu ',    # 0x03
+'Nawa ',    # 0x04
+'Odoshi ',    # 0x05
+'Geng ',    # 0x06
+'Sen ',    # 0x07
+'Ying ',    # 0x08
+'Jin ',    # 0x09
+'Yi ',    # 0x0a
+'Zhui ',    # 0x0b
+'Ni ',    # 0x0c
+'Bang ',    # 0x0d
+'Gu ',    # 0x0e
+'Pan ',    # 0x0f
+'Zhou ',    # 0x10
+'Jian ',    # 0x11
+'Cuo ',    # 0x12
+'Quan ',    # 0x13
+'Shuang ',    # 0x14
+'Yun ',    # 0x15
+'Xia ',    # 0x16
+'Shuai ',    # 0x17
+'Xi ',    # 0x18
+'Rong ',    # 0x19
+'Tao ',    # 0x1a
+'Fu ',    # 0x1b
+'Yun ',    # 0x1c
+'Zhen ',    # 0x1d
+'Gao ',    # 0x1e
+'Ru ',    # 0x1f
+'Hu ',    # 0x20
+'Zai ',    # 0x21
+'Teng ',    # 0x22
+'Xian ',    # 0x23
+'Su ',    # 0x24
+'Zhen ',    # 0x25
+'Zong ',    # 0x26
+'Tao ',    # 0x27
+'Horo ',    # 0x28
+'Cai ',    # 0x29
+'Bi ',    # 0x2a
+'Feng ',    # 0x2b
+'Cu ',    # 0x2c
+'Li ',    # 0x2d
+'Suo ',    # 0x2e
+'Yin ',    # 0x2f
+'Xi ',    # 0x30
+'Zong ',    # 0x31
+'Lei ',    # 0x32
+'Zhuan ',    # 0x33
+'Qian ',    # 0x34
+'Man ',    # 0x35
+'Zhi ',    # 0x36
+'Lu ',    # 0x37
+'Mo ',    # 0x38
+'Piao ',    # 0x39
+'Lian ',    # 0x3a
+'Mi ',    # 0x3b
+'Xuan ',    # 0x3c
+'Zong ',    # 0x3d
+'Ji ',    # 0x3e
+'Shan ',    # 0x3f
+'Sui ',    # 0x40
+'Fan ',    # 0x41
+'Shuai ',    # 0x42
+'Beng ',    # 0x43
+'Yi ',    # 0x44
+'Sao ',    # 0x45
+'Mou ',    # 0x46
+'Zhou ',    # 0x47
+'Qiang ',    # 0x48
+'Hun ',    # 0x49
+'Sem ',    # 0x4a
+'Xi ',    # 0x4b
+'Jung ',    # 0x4c
+'Xiu ',    # 0x4d
+'Ran ',    # 0x4e
+'Xuan ',    # 0x4f
+'Hui ',    # 0x50
+'Qiao ',    # 0x51
+'Zeng ',    # 0x52
+'Zuo ',    # 0x53
+'Zhi ',    # 0x54
+'Shan ',    # 0x55
+'San ',    # 0x56
+'Lin ',    # 0x57
+'Yu ',    # 0x58
+'Fan ',    # 0x59
+'Liao ',    # 0x5a
+'Chuo ',    # 0x5b
+'Zun ',    # 0x5c
+'Jian ',    # 0x5d
+'Rao ',    # 0x5e
+'Chan ',    # 0x5f
+'Rui ',    # 0x60
+'Xiu ',    # 0x61
+'Hui ',    # 0x62
+'Hua ',    # 0x63
+'Zuan ',    # 0x64
+'Xi ',    # 0x65
+'Qiang ',    # 0x66
+'Un ',    # 0x67
+'Da ',    # 0x68
+'Sheng ',    # 0x69
+'Hui ',    # 0x6a
+'Xi ',    # 0x6b
+'Se ',    # 0x6c
+'Jian ',    # 0x6d
+'Jiang ',    # 0x6e
+'Huan ',    # 0x6f
+'Zao ',    # 0x70
+'Cong ',    # 0x71
+'Jie ',    # 0x72
+'Jiao ',    # 0x73
+'Bo ',    # 0x74
+'Chan ',    # 0x75
+'Yi ',    # 0x76
+'Nao ',    # 0x77
+'Sui ',    # 0x78
+'Yi ',    # 0x79
+'Shai ',    # 0x7a
+'Xu ',    # 0x7b
+'Ji ',    # 0x7c
+'Bin ',    # 0x7d
+'Qian ',    # 0x7e
+'Lan ',    # 0x7f
+'Pu ',    # 0x80
+'Xun ',    # 0x81
+'Zuan ',    # 0x82
+'Qi ',    # 0x83
+'Peng ',    # 0x84
+'Li ',    # 0x85
+'Mo ',    # 0x86
+'Lei ',    # 0x87
+'Xie ',    # 0x88
+'Zuan ',    # 0x89
+'Kuang ',    # 0x8a
+'You ',    # 0x8b
+'Xu ',    # 0x8c
+'Lei ',    # 0x8d
+'Xian ',    # 0x8e
+'Chan ',    # 0x8f
+'Kou ',    # 0x90
+'Lu ',    # 0x91
+'Chan ',    # 0x92
+'Ying ',    # 0x93
+'Cai ',    # 0x94
+'Xiang ',    # 0x95
+'Xian ',    # 0x96
+'Zui ',    # 0x97
+'Zuan ',    # 0x98
+'Luo ',    # 0x99
+'Xi ',    # 0x9a
+'Dao ',    # 0x9b
+'Lan ',    # 0x9c
+'Lei ',    # 0x9d
+'Lian ',    # 0x9e
+'Si ',    # 0x9f
+'Jiu ',    # 0xa0
+'Yu ',    # 0xa1
+'Hong ',    # 0xa2
+'Zhou ',    # 0xa3
+'Xian ',    # 0xa4
+'He ',    # 0xa5
+'Yue ',    # 0xa6
+'Ji ',    # 0xa7
+'Wan ',    # 0xa8
+'Kuang ',    # 0xa9
+'Ji ',    # 0xaa
+'Ren ',    # 0xab
+'Wei ',    # 0xac
+'Yun ',    # 0xad
+'Hong ',    # 0xae
+'Chun ',    # 0xaf
+'Pi ',    # 0xb0
+'Sha ',    # 0xb1
+'Gang ',    # 0xb2
+'Na ',    # 0xb3
+'Ren ',    # 0xb4
+'Zong ',    # 0xb5
+'Lun ',    # 0xb6
+'Fen ',    # 0xb7
+'Zhi ',    # 0xb8
+'Wen ',    # 0xb9
+'Fang ',    # 0xba
+'Zhu ',    # 0xbb
+'Yin ',    # 0xbc
+'Niu ',    # 0xbd
+'Shu ',    # 0xbe
+'Xian ',    # 0xbf
+'Gan ',    # 0xc0
+'Xie ',    # 0xc1
+'Fu ',    # 0xc2
+'Lian ',    # 0xc3
+'Zu ',    # 0xc4
+'Shen ',    # 0xc5
+'Xi ',    # 0xc6
+'Zhi ',    # 0xc7
+'Zhong ',    # 0xc8
+'Zhou ',    # 0xc9
+'Ban ',    # 0xca
+'Fu ',    # 0xcb
+'Zhuo ',    # 0xcc
+'Shao ',    # 0xcd
+'Yi ',    # 0xce
+'Jing ',    # 0xcf
+'Dai ',    # 0xd0
+'Bang ',    # 0xd1
+'Rong ',    # 0xd2
+'Jie ',    # 0xd3
+'Ku ',    # 0xd4
+'Rao ',    # 0xd5
+'Die ',    # 0xd6
+'Heng ',    # 0xd7
+'Hui ',    # 0xd8
+'Gei ',    # 0xd9
+'Xuan ',    # 0xda
+'Jiang ',    # 0xdb
+'Luo ',    # 0xdc
+'Jue ',    # 0xdd
+'Jiao ',    # 0xde
+'Tong ',    # 0xdf
+'Geng ',    # 0xe0
+'Xiao ',    # 0xe1
+'Juan ',    # 0xe2
+'Xiu ',    # 0xe3
+'Xi ',    # 0xe4
+'Sui ',    # 0xe5
+'Tao ',    # 0xe6
+'Ji ',    # 0xe7
+'Ti ',    # 0xe8
+'Ji ',    # 0xe9
+'Xu ',    # 0xea
+'Ling ',    # 0xeb
+'[?] ',    # 0xec
+'Xu ',    # 0xed
+'Qi ',    # 0xee
+'Fei ',    # 0xef
+'Chuo ',    # 0xf0
+'Zhang ',    # 0xf1
+'Gun ',    # 0xf2
+'Sheng ',    # 0xf3
+'Wei ',    # 0xf4
+'Mian ',    # 0xf5
+'Shou ',    # 0xf6
+'Beng ',    # 0xf7
+'Chou ',    # 0xf8
+'Tao ',    # 0xf9
+'Liu ',    # 0xfa
+'Quan ',    # 0xfb
+'Zong ',    # 0xfc
+'Zhan ',    # 0xfd
+'Wan ',    # 0xfe
+'Lu ',    # 0xff
+)
diff --git a/lib/unidecode/x07f.py b/lib/unidecode/x07f.py
new file mode 100644
index 00000000..0a708d6d
--- /dev/null
+++ b/lib/unidecode/x07f.py
@@ -0,0 +1,258 @@
+data = (
+'Zhui ',    # 0x00
+'Zi ',    # 0x01
+'Ke ',    # 0x02
+'Xiang ',    # 0x03
+'Jian ',    # 0x04
+'Mian ',    # 0x05
+'Lan ',    # 0x06
+'Ti ',    # 0x07
+'Miao ',    # 0x08
+'Qi ',    # 0x09
+'Yun ',    # 0x0a
+'Hui ',    # 0x0b
+'Si ',    # 0x0c
+'Duo ',    # 0x0d
+'Duan ',    # 0x0e
+'Bian ',    # 0x0f
+'Xian ',    # 0x10
+'Gou ',    # 0x11
+'Zhui ',    # 0x12
+'Huan ',    # 0x13
+'Di ',    # 0x14
+'Lu ',    # 0x15
+'Bian ',    # 0x16
+'Min ',    # 0x17
+'Yuan ',    # 0x18
+'Jin ',    # 0x19
+'Fu ',    # 0x1a
+'Ru ',    # 0x1b
+'Zhen ',    # 0x1c
+'Feng ',    # 0x1d
+'Shuai ',    # 0x1e
+'Gao ',    # 0x1f
+'Chan ',    # 0x20
+'Li ',    # 0x21
+'Yi ',    # 0x22
+'Jian ',    # 0x23
+'Bin ',    # 0x24
+'Piao ',    # 0x25
+'Man ',    # 0x26
+'Lei ',    # 0x27
+'Ying ',    # 0x28
+'Suo ',    # 0x29
+'Mou ',    # 0x2a
+'Sao ',    # 0x2b
+'Xie ',    # 0x2c
+'Liao ',    # 0x2d
+'Shan ',    # 0x2e
+'Zeng ',    # 0x2f
+'Jiang ',    # 0x30
+'Qian ',    # 0x31
+'Zao ',    # 0x32
+'Huan ',    # 0x33
+'Jiao ',    # 0x34
+'Zuan ',    # 0x35
+'Fou ',    # 0x36
+'Xie ',    # 0x37
+'Gang ',    # 0x38
+'Fou ',    # 0x39
+'Que ',    # 0x3a
+'Fou ',    # 0x3b
+'Kaakeru ',    # 0x3c
+'Bo ',    # 0x3d
+'Ping ',    # 0x3e
+'Hou ',    # 0x3f
+'[?] ',    # 0x40
+'Gang ',    # 0x41
+'Ying ',    # 0x42
+'Ying ',    # 0x43
+'Qing ',    # 0x44
+'Xia ',    # 0x45
+'Guan ',    # 0x46
+'Zun ',    # 0x47
+'Tan ',    # 0x48
+'Chang ',    # 0x49
+'Qi ',    # 0x4a
+'Weng ',    # 0x4b
+'Ying ',    # 0x4c
+'Lei ',    # 0x4d
+'Tan ',    # 0x4e
+'Lu ',    # 0x4f
+'Guan ',    # 0x50
+'Wang ',    # 0x51
+'Wang ',    # 0x52
+'Gang ',    # 0x53
+'Wang ',    # 0x54
+'Han ',    # 0x55
+'[?] ',    # 0x56
+'Luo ',    # 0x57
+'Fu ',    # 0x58
+'Mi ',    # 0x59
+'Fa ',    # 0x5a
+'Gu ',    # 0x5b
+'Zhu ',    # 0x5c
+'Ju ',    # 0x5d
+'Mao ',    # 0x5e
+'Gu ',    # 0x5f
+'Min ',    # 0x60
+'Gang ',    # 0x61
+'Ba ',    # 0x62
+'Gua ',    # 0x63
+'Ti ',    # 0x64
+'Juan ',    # 0x65
+'Fu ',    # 0x66
+'Lin ',    # 0x67
+'Yan ',    # 0x68
+'Zhao ',    # 0x69
+'Zui ',    # 0x6a
+'Gua ',    # 0x6b
+'Zhuo ',    # 0x6c
+'Yu ',    # 0x6d
+'Zhi ',    # 0x6e
+'An ',    # 0x6f
+'Fa ',    # 0x70
+'Nan ',    # 0x71
+'Shu ',    # 0x72
+'Si ',    # 0x73
+'Pi ',    # 0x74
+'Ma ',    # 0x75
+'Liu ',    # 0x76
+'Ba ',    # 0x77
+'Fa ',    # 0x78
+'Li ',    # 0x79
+'Chao ',    # 0x7a
+'Wei ',    # 0x7b
+'Bi ',    # 0x7c
+'Ji ',    # 0x7d
+'Zeng ',    # 0x7e
+'Tong ',    # 0x7f
+'Liu ',    # 0x80
+'Ji ',    # 0x81
+'Juan ',    # 0x82
+'Mi ',    # 0x83
+'Zhao ',    # 0x84
+'Luo ',    # 0x85
+'Pi ',    # 0x86
+'Ji ',    # 0x87
+'Ji ',    # 0x88
+'Luan ',    # 0x89
+'Yang ',    # 0x8a
+'Mie ',    # 0x8b
+'Qiang ',    # 0x8c
+'Ta ',    # 0x8d
+'Mei ',    # 0x8e
+'Yang ',    # 0x8f
+'You ',    # 0x90
+'You ',    # 0x91
+'Fen ',    # 0x92
+'Ba ',    # 0x93
+'Gao ',    # 0x94
+'Yang ',    # 0x95
+'Gu ',    # 0x96
+'Qiang ',    # 0x97
+'Zang ',    # 0x98
+'Gao ',    # 0x99
+'Ling ',    # 0x9a
+'Yi ',    # 0x9b
+'Zhu ',    # 0x9c
+'Di ',    # 0x9d
+'Xiu ',    # 0x9e
+'Qian ',    # 0x9f
+'Yi ',    # 0xa0
+'Xian ',    # 0xa1
+'Rong ',    # 0xa2
+'Qun ',    # 0xa3
+'Qun ',    # 0xa4
+'Qian ',    # 0xa5
+'Huan ',    # 0xa6
+'Zui ',    # 0xa7
+'Xian ',    # 0xa8
+'Yi ',    # 0xa9
+'Yashinau ',    # 0xaa
+'Qiang ',    # 0xab
+'Xian ',    # 0xac
+'Yu ',    # 0xad
+'Geng ',    # 0xae
+'Jie ',    # 0xaf
+'Tang ',    # 0xb0
+'Yuan ',    # 0xb1
+'Xi ',    # 0xb2
+'Fan ',    # 0xb3
+'Shan ',    # 0xb4
+'Fen ',    # 0xb5
+'Shan ',    # 0xb6
+'Lian ',    # 0xb7
+'Lei ',    # 0xb8
+'Geng ',    # 0xb9
+'Nou ',    # 0xba
+'Qiang ',    # 0xbb
+'Chan ',    # 0xbc
+'Yu ',    # 0xbd
+'Gong ',    # 0xbe
+'Yi ',    # 0xbf
+'Chong ',    # 0xc0
+'Weng ',    # 0xc1
+'Fen ',    # 0xc2
+'Hong ',    # 0xc3
+'Chi ',    # 0xc4
+'Chi ',    # 0xc5
+'Cui ',    # 0xc6
+'Fu ',    # 0xc7
+'Xia ',    # 0xc8
+'Pen ',    # 0xc9
+'Yi ',    # 0xca
+'La ',    # 0xcb
+'Yi ',    # 0xcc
+'Pi ',    # 0xcd
+'Ling ',    # 0xce
+'Liu ',    # 0xcf
+'Zhi ',    # 0xd0
+'Qu ',    # 0xd1
+'Xi ',    # 0xd2
+'Xie ',    # 0xd3
+'Xiang ',    # 0xd4
+'Xi ',    # 0xd5
+'Xi ',    # 0xd6
+'Qi ',    # 0xd7
+'Qiao ',    # 0xd8
+'Hui ',    # 0xd9
+'Hui ',    # 0xda
+'Xiao ',    # 0xdb
+'Se ',    # 0xdc
+'Hong ',    # 0xdd
+'Jiang ',    # 0xde
+'Di ',    # 0xdf
+'Cui ',    # 0xe0
+'Fei ',    # 0xe1
+'Tao ',    # 0xe2
+'Sha ',    # 0xe3
+'Chi ',    # 0xe4
+'Zhu ',    # 0xe5
+'Jian ',    # 0xe6
+'Xuan ',    # 0xe7
+'Shi ',    # 0xe8
+'Pian ',    # 0xe9
+'Zong ',    # 0xea
+'Wan ',    # 0xeb
+'Hui ',    # 0xec
+'Hou ',    # 0xed
+'He ',    # 0xee
+'He ',    # 0xef
+'Han ',    # 0xf0
+'Ao ',    # 0xf1
+'Piao ',    # 0xf2
+'Yi ',    # 0xf3
+'Lian ',    # 0xf4
+'Qu ',    # 0xf5
+'[?] ',    # 0xf6
+'Lin ',    # 0xf7
+'Pen ',    # 0xf8
+'Qiao ',    # 0xf9
+'Ao ',    # 0xfa
+'Fan ',    # 0xfb
+'Yi ',    # 0xfc
+'Hui ',    # 0xfd
+'Xuan ',    # 0xfe
+'Dao ',    # 0xff
+)
diff --git a/lib/unidecode/x080.py b/lib/unidecode/x080.py
new file mode 100644
index 00000000..11f324b4
--- /dev/null
+++ b/lib/unidecode/x080.py
@@ -0,0 +1,258 @@
+data = (
+'Yao ',    # 0x00
+'Lao ',    # 0x01
+'[?] ',    # 0x02
+'Kao ',    # 0x03
+'Mao ',    # 0x04
+'Zhe ',    # 0x05
+'Qi ',    # 0x06
+'Gou ',    # 0x07
+'Gou ',    # 0x08
+'Gou ',    # 0x09
+'Die ',    # 0x0a
+'Die ',    # 0x0b
+'Er ',    # 0x0c
+'Shua ',    # 0x0d
+'Ruan ',    # 0x0e
+'Er ',    # 0x0f
+'Nai ',    # 0x10
+'Zhuan ',    # 0x11
+'Lei ',    # 0x12
+'Ting ',    # 0x13
+'Zi ',    # 0x14
+'Geng ',    # 0x15
+'Chao ',    # 0x16
+'Hao ',    # 0x17
+'Yun ',    # 0x18
+'Pa ',    # 0x19
+'Pi ',    # 0x1a
+'Chi ',    # 0x1b
+'Si ',    # 0x1c
+'Chu ',    # 0x1d
+'Jia ',    # 0x1e
+'Ju ',    # 0x1f
+'He ',    # 0x20
+'Chu ',    # 0x21
+'Lao ',    # 0x22
+'Lun ',    # 0x23
+'Ji ',    # 0x24
+'Tang ',    # 0x25
+'Ou ',    # 0x26
+'Lou ',    # 0x27
+'Nou ',    # 0x28
+'Gou ',    # 0x29
+'Pang ',    # 0x2a
+'Ze ',    # 0x2b
+'Lou ',    # 0x2c
+'Ji ',    # 0x2d
+'Lao ',    # 0x2e
+'Huo ',    # 0x2f
+'You ',    # 0x30
+'Mo ',    # 0x31
+'Huai ',    # 0x32
+'Er ',    # 0x33
+'Zhe ',    # 0x34
+'Ting ',    # 0x35
+'Ye ',    # 0x36
+'Da ',    # 0x37
+'Song ',    # 0x38
+'Qin ',    # 0x39
+'Yun ',    # 0x3a
+'Chi ',    # 0x3b
+'Dan ',    # 0x3c
+'Dan ',    # 0x3d
+'Hong ',    # 0x3e
+'Geng ',    # 0x3f
+'Zhi ',    # 0x40
+'[?] ',    # 0x41
+'Nie ',    # 0x42
+'Dan ',    # 0x43
+'Zhen ',    # 0x44
+'Che ',    # 0x45
+'Ling ',    # 0x46
+'Zheng ',    # 0x47
+'You ',    # 0x48
+'Wa ',    # 0x49
+'Liao ',    # 0x4a
+'Long ',    # 0x4b
+'Zhi ',    # 0x4c
+'Ning ',    # 0x4d
+'Tiao ',    # 0x4e
+'Er ',    # 0x4f
+'Ya ',    # 0x50
+'Die ',    # 0x51
+'Gua ',    # 0x52
+'[?] ',    # 0x53
+'Lian ',    # 0x54
+'Hao ',    # 0x55
+'Sheng ',    # 0x56
+'Lie ',    # 0x57
+'Pin ',    # 0x58
+'Jing ',    # 0x59
+'Ju ',    # 0x5a
+'Bi ',    # 0x5b
+'Di ',    # 0x5c
+'Guo ',    # 0x5d
+'Wen ',    # 0x5e
+'Xu ',    # 0x5f
+'Ping ',    # 0x60
+'Cong ',    # 0x61
+'Shikato ',    # 0x62
+'[?] ',    # 0x63
+'Ting ',    # 0x64
+'Yu ',    # 0x65
+'Cong ',    # 0x66
+'Kui ',    # 0x67
+'Tsuraneru ',    # 0x68
+'Kui ',    # 0x69
+'Cong ',    # 0x6a
+'Lian ',    # 0x6b
+'Weng ',    # 0x6c
+'Kui ',    # 0x6d
+'Lian ',    # 0x6e
+'Lian ',    # 0x6f
+'Cong ',    # 0x70
+'Ao ',    # 0x71
+'Sheng ',    # 0x72
+'Song ',    # 0x73
+'Ting ',    # 0x74
+'Kui ',    # 0x75
+'Nie ',    # 0x76
+'Zhi ',    # 0x77
+'Dan ',    # 0x78
+'Ning ',    # 0x79
+'Qie ',    # 0x7a
+'Ji ',    # 0x7b
+'Ting ',    # 0x7c
+'Ting ',    # 0x7d
+'Long ',    # 0x7e
+'Yu ',    # 0x7f
+'Yu ',    # 0x80
+'Zhao ',    # 0x81
+'Si ',    # 0x82
+'Su ',    # 0x83
+'Yi ',    # 0x84
+'Su ',    # 0x85
+'Si ',    # 0x86
+'Zhao ',    # 0x87
+'Zhao ',    # 0x88
+'Rou ',    # 0x89
+'Yi ',    # 0x8a
+'Le ',    # 0x8b
+'Ji ',    # 0x8c
+'Qiu ',    # 0x8d
+'Ken ',    # 0x8e
+'Cao ',    # 0x8f
+'Ge ',    # 0x90
+'Di ',    # 0x91
+'Huan ',    # 0x92
+'Huang ',    # 0x93
+'Yi ',    # 0x94
+'Ren ',    # 0x95
+'Xiao ',    # 0x96
+'Ru ',    # 0x97
+'Zhou ',    # 0x98
+'Yuan ',    # 0x99
+'Du ',    # 0x9a
+'Gang ',    # 0x9b
+'Rong ',    # 0x9c
+'Gan ',    # 0x9d
+'Cha ',    # 0x9e
+'Wo ',    # 0x9f
+'Chang ',    # 0xa0
+'Gu ',    # 0xa1
+'Zhi ',    # 0xa2
+'Han ',    # 0xa3
+'Fu ',    # 0xa4
+'Fei ',    # 0xa5
+'Fen ',    # 0xa6
+'Pei ',    # 0xa7
+'Pang ',    # 0xa8
+'Jian ',    # 0xa9
+'Fang ',    # 0xaa
+'Zhun ',    # 0xab
+'You ',    # 0xac
+'Na ',    # 0xad
+'Hang ',    # 0xae
+'Ken ',    # 0xaf
+'Ran ',    # 0xb0
+'Gong ',    # 0xb1
+'Yu ',    # 0xb2
+'Wen ',    # 0xb3
+'Yao ',    # 0xb4
+'Jin ',    # 0xb5
+'Pi ',    # 0xb6
+'Qian ',    # 0xb7
+'Xi ',    # 0xb8
+'Xi ',    # 0xb9
+'Fei ',    # 0xba
+'Ken ',    # 0xbb
+'Jing ',    # 0xbc
+'Tai ',    # 0xbd
+'Shen ',    # 0xbe
+'Zhong ',    # 0xbf
+'Zhang ',    # 0xc0
+'Xie ',    # 0xc1
+'Shen ',    # 0xc2
+'Wei ',    # 0xc3
+'Zhou ',    # 0xc4
+'Die ',    # 0xc5
+'Dan ',    # 0xc6
+'Fei ',    # 0xc7
+'Ba ',    # 0xc8
+'Bo ',    # 0xc9
+'Qu ',    # 0xca
+'Tian ',    # 0xcb
+'Bei ',    # 0xcc
+'Gua ',    # 0xcd
+'Tai ',    # 0xce
+'Zi ',    # 0xcf
+'Ku ',    # 0xd0
+'Zhi ',    # 0xd1
+'Ni ',    # 0xd2
+'Ping ',    # 0xd3
+'Zi ',    # 0xd4
+'Fu ',    # 0xd5
+'Pang ',    # 0xd6
+'Zhen ',    # 0xd7
+'Xian ',    # 0xd8
+'Zuo ',    # 0xd9
+'Pei ',    # 0xda
+'Jia ',    # 0xdb
+'Sheng ',    # 0xdc
+'Zhi ',    # 0xdd
+'Bao ',    # 0xde
+'Mu ',    # 0xdf
+'Qu ',    # 0xe0
+'Hu ',    # 0xe1
+'Ke ',    # 0xe2
+'Yi ',    # 0xe3
+'Yin ',    # 0xe4
+'Xu ',    # 0xe5
+'Yang ',    # 0xe6
+'Long ',    # 0xe7
+'Dong ',    # 0xe8
+'Ka ',    # 0xe9
+'Lu ',    # 0xea
+'Jing ',    # 0xeb
+'Nu ',    # 0xec
+'Yan ',    # 0xed
+'Pang ',    # 0xee
+'Kua ',    # 0xef
+'Yi ',    # 0xf0
+'Guang ',    # 0xf1
+'Gai ',    # 0xf2
+'Ge ',    # 0xf3
+'Dong ',    # 0xf4
+'Zhi ',    # 0xf5
+'Xiao ',    # 0xf6
+'Xiong ',    # 0xf7
+'Xiong ',    # 0xf8
+'Er ',    # 0xf9
+'E ',    # 0xfa
+'Xing ',    # 0xfb
+'Pian ',    # 0xfc
+'Neng ',    # 0xfd
+'Zi ',    # 0xfe
+'Gui ',    # 0xff
+)
diff --git a/lib/unidecode/x081.py b/lib/unidecode/x081.py
new file mode 100644
index 00000000..01ca95d3
--- /dev/null
+++ b/lib/unidecode/x081.py
@@ -0,0 +1,258 @@
+data = (
+'Cheng ',    # 0x00
+'Tiao ',    # 0x01
+'Zhi ',    # 0x02
+'Cui ',    # 0x03
+'Mei ',    # 0x04
+'Xie ',    # 0x05
+'Cui ',    # 0x06
+'Xie ',    # 0x07
+'Mo ',    # 0x08
+'Mai ',    # 0x09
+'Ji ',    # 0x0a
+'Obiyaakasu ',    # 0x0b
+'[?] ',    # 0x0c
+'Kuai ',    # 0x0d
+'Sa ',    # 0x0e
+'Zang ',    # 0x0f
+'Qi ',    # 0x10
+'Nao ',    # 0x11
+'Mi ',    # 0x12
+'Nong ',    # 0x13
+'Luan ',    # 0x14
+'Wan ',    # 0x15
+'Bo ',    # 0x16
+'Wen ',    # 0x17
+'Guan ',    # 0x18
+'Qiu ',    # 0x19
+'Jiao ',    # 0x1a
+'Jing ',    # 0x1b
+'Rou ',    # 0x1c
+'Heng ',    # 0x1d
+'Cuo ',    # 0x1e
+'Lie ',    # 0x1f
+'Shan ',    # 0x20
+'Ting ',    # 0x21
+'Mei ',    # 0x22
+'Chun ',    # 0x23
+'Shen ',    # 0x24
+'Xie ',    # 0x25
+'De ',    # 0x26
+'Zui ',    # 0x27
+'Cu ',    # 0x28
+'Xiu ',    # 0x29
+'Xin ',    # 0x2a
+'Tuo ',    # 0x2b
+'Pao ',    # 0x2c
+'Cheng ',    # 0x2d
+'Nei ',    # 0x2e
+'Fu ',    # 0x2f
+'Dou ',    # 0x30
+'Tuo ',    # 0x31
+'Niao ',    # 0x32
+'Noy ',    # 0x33
+'Pi ',    # 0x34
+'Gu ',    # 0x35
+'Gua ',    # 0x36
+'Li ',    # 0x37
+'Lian ',    # 0x38
+'Zhang ',    # 0x39
+'Cui ',    # 0x3a
+'Jie ',    # 0x3b
+'Liang ',    # 0x3c
+'Zhou ',    # 0x3d
+'Pi ',    # 0x3e
+'Biao ',    # 0x3f
+'Lun ',    # 0x40
+'Pian ',    # 0x41
+'Guo ',    # 0x42
+'Kui ',    # 0x43
+'Chui ',    # 0x44
+'Dan ',    # 0x45
+'Tian ',    # 0x46
+'Nei ',    # 0x47
+'Jing ',    # 0x48
+'Jie ',    # 0x49
+'La ',    # 0x4a
+'Yi ',    # 0x4b
+'An ',    # 0x4c
+'Ren ',    # 0x4d
+'Shen ',    # 0x4e
+'Chuo ',    # 0x4f
+'Fu ',    # 0x50
+'Fu ',    # 0x51
+'Ju ',    # 0x52
+'Fei ',    # 0x53
+'Qiang ',    # 0x54
+'Wan ',    # 0x55
+'Dong ',    # 0x56
+'Pi ',    # 0x57
+'Guo ',    # 0x58
+'Zong ',    # 0x59
+'Ding ',    # 0x5a
+'Wu ',    # 0x5b
+'Mei ',    # 0x5c
+'Ruan ',    # 0x5d
+'Zhuan ',    # 0x5e
+'Zhi ',    # 0x5f
+'Cou ',    # 0x60
+'Gua ',    # 0x61
+'Ou ',    # 0x62
+'Di ',    # 0x63
+'An ',    # 0x64
+'Xing ',    # 0x65
+'Nao ',    # 0x66
+'Yu ',    # 0x67
+'Chuan ',    # 0x68
+'Nan ',    # 0x69
+'Yun ',    # 0x6a
+'Zhong ',    # 0x6b
+'Rou ',    # 0x6c
+'E ',    # 0x6d
+'Sai ',    # 0x6e
+'Tu ',    # 0x6f
+'Yao ',    # 0x70
+'Jian ',    # 0x71
+'Wei ',    # 0x72
+'Jiao ',    # 0x73
+'Yu ',    # 0x74
+'Jia ',    # 0x75
+'Duan ',    # 0x76
+'Bi ',    # 0x77
+'Chang ',    # 0x78
+'Fu ',    # 0x79
+'Xian ',    # 0x7a
+'Ni ',    # 0x7b
+'Mian ',    # 0x7c
+'Wa ',    # 0x7d
+'Teng ',    # 0x7e
+'Tui ',    # 0x7f
+'Bang ',    # 0x80
+'Qian ',    # 0x81
+'Lu ',    # 0x82
+'Wa ',    # 0x83
+'Sou ',    # 0x84
+'Tang ',    # 0x85
+'Su ',    # 0x86
+'Zhui ',    # 0x87
+'Ge ',    # 0x88
+'Yi ',    # 0x89
+'Bo ',    # 0x8a
+'Liao ',    # 0x8b
+'Ji ',    # 0x8c
+'Pi ',    # 0x8d
+'Xie ',    # 0x8e
+'Gao ',    # 0x8f
+'Lu ',    # 0x90
+'Bin ',    # 0x91
+'Ou ',    # 0x92
+'Chang ',    # 0x93
+'Lu ',    # 0x94
+'Guo ',    # 0x95
+'Pang ',    # 0x96
+'Chuai ',    # 0x97
+'Piao ',    # 0x98
+'Jiang ',    # 0x99
+'Fu ',    # 0x9a
+'Tang ',    # 0x9b
+'Mo ',    # 0x9c
+'Xi ',    # 0x9d
+'Zhuan ',    # 0x9e
+'Lu ',    # 0x9f
+'Jiao ',    # 0xa0
+'Ying ',    # 0xa1
+'Lu ',    # 0xa2
+'Zhi ',    # 0xa3
+'Tara ',    # 0xa4
+'Chun ',    # 0xa5
+'Lian ',    # 0xa6
+'Tong ',    # 0xa7
+'Peng ',    # 0xa8
+'Ni ',    # 0xa9
+'Zha ',    # 0xaa
+'Liao ',    # 0xab
+'Cui ',    # 0xac
+'Gui ',    # 0xad
+'Xiao ',    # 0xae
+'Teng ',    # 0xaf
+'Fan ',    # 0xb0
+'Zhi ',    # 0xb1
+'Jiao ',    # 0xb2
+'Shan ',    # 0xb3
+'Wu ',    # 0xb4
+'Cui ',    # 0xb5
+'Run ',    # 0xb6
+'Xiang ',    # 0xb7
+'Sui ',    # 0xb8
+'Fen ',    # 0xb9
+'Ying ',    # 0xba
+'Tan ',    # 0xbb
+'Zhua ',    # 0xbc
+'Dan ',    # 0xbd
+'Kuai ',    # 0xbe
+'Nong ',    # 0xbf
+'Tun ',    # 0xc0
+'Lian ',    # 0xc1
+'Bi ',    # 0xc2
+'Yong ',    # 0xc3
+'Jue ',    # 0xc4
+'Chu ',    # 0xc5
+'Yi ',    # 0xc6
+'Juan ',    # 0xc7
+'La ',    # 0xc8
+'Lian ',    # 0xc9
+'Sao ',    # 0xca
+'Tun ',    # 0xcb
+'Gu ',    # 0xcc
+'Qi ',    # 0xcd
+'Cui ',    # 0xce
+'Bin ',    # 0xcf
+'Xun ',    # 0xd0
+'Ru ',    # 0xd1
+'Huo ',    # 0xd2
+'Zang ',    # 0xd3
+'Xian ',    # 0xd4
+'Biao ',    # 0xd5
+'Xing ',    # 0xd6
+'Kuan ',    # 0xd7
+'La ',    # 0xd8
+'Yan ',    # 0xd9
+'Lu ',    # 0xda
+'Huo ',    # 0xdb
+'Zang ',    # 0xdc
+'Luo ',    # 0xdd
+'Qu ',    # 0xde
+'Zang ',    # 0xdf
+'Luan ',    # 0xe0
+'Ni ',    # 0xe1
+'Zang ',    # 0xe2
+'Chen ',    # 0xe3
+'Qian ',    # 0xe4
+'Wo ',    # 0xe5
+'Guang ',    # 0xe6
+'Zang ',    # 0xe7
+'Lin ',    # 0xe8
+'Guang ',    # 0xe9
+'Zi ',    # 0xea
+'Jiao ',    # 0xeb
+'Nie ',    # 0xec
+'Chou ',    # 0xed
+'Ji ',    # 0xee
+'Gao ',    # 0xef
+'Chou ',    # 0xf0
+'Mian ',    # 0xf1
+'Nie ',    # 0xf2
+'Zhi ',    # 0xf3
+'Zhi ',    # 0xf4
+'Ge ',    # 0xf5
+'Jian ',    # 0xf6
+'Die ',    # 0xf7
+'Zhi ',    # 0xf8
+'Xiu ',    # 0xf9
+'Tai ',    # 0xfa
+'Zhen ',    # 0xfb
+'Jiu ',    # 0xfc
+'Xian ',    # 0xfd
+'Yu ',    # 0xfe
+'Cha ',    # 0xff
+)
diff --git a/lib/unidecode/x082.py b/lib/unidecode/x082.py
new file mode 100644
index 00000000..daea2e23
--- /dev/null
+++ b/lib/unidecode/x082.py
@@ -0,0 +1,258 @@
+data = (
+'Yao ',    # 0x00
+'Yu ',    # 0x01
+'Chong ',    # 0x02
+'Xi ',    # 0x03
+'Xi ',    # 0x04
+'Jiu ',    # 0x05
+'Yu ',    # 0x06
+'Yu ',    # 0x07
+'Xing ',    # 0x08
+'Ju ',    # 0x09
+'Jiu ',    # 0x0a
+'Xin ',    # 0x0b
+'She ',    # 0x0c
+'She ',    # 0x0d
+'Yadoru ',    # 0x0e
+'Jiu ',    # 0x0f
+'Shi ',    # 0x10
+'Tan ',    # 0x11
+'Shu ',    # 0x12
+'Shi ',    # 0x13
+'Tian ',    # 0x14
+'Dan ',    # 0x15
+'Pu ',    # 0x16
+'Pu ',    # 0x17
+'Guan ',    # 0x18
+'Hua ',    # 0x19
+'Tan ',    # 0x1a
+'Chuan ',    # 0x1b
+'Shun ',    # 0x1c
+'Xia ',    # 0x1d
+'Wu ',    # 0x1e
+'Zhou ',    # 0x1f
+'Dao ',    # 0x20
+'Gang ',    # 0x21
+'Shan ',    # 0x22
+'Yi ',    # 0x23
+'[?] ',    # 0x24
+'Pa ',    # 0x25
+'Tai ',    # 0x26
+'Fan ',    # 0x27
+'Ban ',    # 0x28
+'Chuan ',    # 0x29
+'Hang ',    # 0x2a
+'Fang ',    # 0x2b
+'Ban ',    # 0x2c
+'Que ',    # 0x2d
+'Hesaki ',    # 0x2e
+'Zhong ',    # 0x2f
+'Jian ',    # 0x30
+'Cang ',    # 0x31
+'Ling ',    # 0x32
+'Zhu ',    # 0x33
+'Ze ',    # 0x34
+'Duo ',    # 0x35
+'Bo ',    # 0x36
+'Xian ',    # 0x37
+'Ge ',    # 0x38
+'Chuan ',    # 0x39
+'Jia ',    # 0x3a
+'Lu ',    # 0x3b
+'Hong ',    # 0x3c
+'Pang ',    # 0x3d
+'Xi ',    # 0x3e
+'[?] ',    # 0x3f
+'Fu ',    # 0x40
+'Zao ',    # 0x41
+'Feng ',    # 0x42
+'Li ',    # 0x43
+'Shao ',    # 0x44
+'Yu ',    # 0x45
+'Lang ',    # 0x46
+'Ting ',    # 0x47
+'[?] ',    # 0x48
+'Wei ',    # 0x49
+'Bo ',    # 0x4a
+'Meng ',    # 0x4b
+'Nian ',    # 0x4c
+'Ju ',    # 0x4d
+'Huang ',    # 0x4e
+'Shou ',    # 0x4f
+'Zong ',    # 0x50
+'Bian ',    # 0x51
+'Mao ',    # 0x52
+'Die ',    # 0x53
+'[?] ',    # 0x54
+'Bang ',    # 0x55
+'Cha ',    # 0x56
+'Yi ',    # 0x57
+'Sao ',    # 0x58
+'Cang ',    # 0x59
+'Cao ',    # 0x5a
+'Lou ',    # 0x5b
+'Dai ',    # 0x5c
+'Sori ',    # 0x5d
+'Yao ',    # 0x5e
+'Tong ',    # 0x5f
+'Yofune ',    # 0x60
+'Dang ',    # 0x61
+'Tan ',    # 0x62
+'Lu ',    # 0x63
+'Yi ',    # 0x64
+'Jie ',    # 0x65
+'Jian ',    # 0x66
+'Huo ',    # 0x67
+'Meng ',    # 0x68
+'Qi ',    # 0x69
+'Lu ',    # 0x6a
+'Lu ',    # 0x6b
+'Chan ',    # 0x6c
+'Shuang ',    # 0x6d
+'Gen ',    # 0x6e
+'Liang ',    # 0x6f
+'Jian ',    # 0x70
+'Jian ',    # 0x71
+'Se ',    # 0x72
+'Yan ',    # 0x73
+'Fu ',    # 0x74
+'Ping ',    # 0x75
+'Yan ',    # 0x76
+'Yan ',    # 0x77
+'Cao ',    # 0x78
+'Cao ',    # 0x79
+'Yi ',    # 0x7a
+'Le ',    # 0x7b
+'Ting ',    # 0x7c
+'Qiu ',    # 0x7d
+'Ai ',    # 0x7e
+'Nai ',    # 0x7f
+'Tiao ',    # 0x80
+'Jiao ',    # 0x81
+'Jie ',    # 0x82
+'Peng ',    # 0x83
+'Wan ',    # 0x84
+'Yi ',    # 0x85
+'Chai ',    # 0x86
+'Mian ',    # 0x87
+'Mie ',    # 0x88
+'Gan ',    # 0x89
+'Qian ',    # 0x8a
+'Yu ',    # 0x8b
+'Yu ',    # 0x8c
+'Shuo ',    # 0x8d
+'Qiong ',    # 0x8e
+'Tu ',    # 0x8f
+'Xia ',    # 0x90
+'Qi ',    # 0x91
+'Mang ',    # 0x92
+'Zi ',    # 0x93
+'Hui ',    # 0x94
+'Sui ',    # 0x95
+'Zhi ',    # 0x96
+'Xiang ',    # 0x97
+'Bi ',    # 0x98
+'Fu ',    # 0x99
+'Tun ',    # 0x9a
+'Wei ',    # 0x9b
+'Wu ',    # 0x9c
+'Zhi ',    # 0x9d
+'Qi ',    # 0x9e
+'Shan ',    # 0x9f
+'Wen ',    # 0xa0
+'Qian ',    # 0xa1
+'Ren ',    # 0xa2
+'Fou ',    # 0xa3
+'Kou ',    # 0xa4
+'Jie ',    # 0xa5
+'Lu ',    # 0xa6
+'Xu ',    # 0xa7
+'Ji ',    # 0xa8
+'Qin ',    # 0xa9
+'Qi ',    # 0xaa
+'Yuan ',    # 0xab
+'Fen ',    # 0xac
+'Ba ',    # 0xad
+'Rui ',    # 0xae
+'Xin ',    # 0xaf
+'Ji ',    # 0xb0
+'Hua ',    # 0xb1
+'Hua ',    # 0xb2
+'Fang ',    # 0xb3
+'Wu ',    # 0xb4
+'Jue ',    # 0xb5
+'Gou ',    # 0xb6
+'Zhi ',    # 0xb7
+'Yun ',    # 0xb8
+'Qin ',    # 0xb9
+'Ao ',    # 0xba
+'Chu ',    # 0xbb
+'Mao ',    # 0xbc
+'Ya ',    # 0xbd
+'Fei ',    # 0xbe
+'Reng ',    # 0xbf
+'Hang ',    # 0xc0
+'Cong ',    # 0xc1
+'Yin ',    # 0xc2
+'You ',    # 0xc3
+'Bian ',    # 0xc4
+'Yi ',    # 0xc5
+'Susa ',    # 0xc6
+'Wei ',    # 0xc7
+'Li ',    # 0xc8
+'Pi ',    # 0xc9
+'E ',    # 0xca
+'Xian ',    # 0xcb
+'Chang ',    # 0xcc
+'Cang ',    # 0xcd
+'Meng ',    # 0xce
+'Su ',    # 0xcf
+'Yi ',    # 0xd0
+'Yuan ',    # 0xd1
+'Ran ',    # 0xd2
+'Ling ',    # 0xd3
+'Tai ',    # 0xd4
+'Tiao ',    # 0xd5
+'Di ',    # 0xd6
+'Miao ',    # 0xd7
+'Qiong ',    # 0xd8
+'Li ',    # 0xd9
+'Yong ',    # 0xda
+'Ke ',    # 0xdb
+'Mu ',    # 0xdc
+'Pei ',    # 0xdd
+'Bao ',    # 0xde
+'Gou ',    # 0xdf
+'Min ',    # 0xe0
+'Yi ',    # 0xe1
+'Yi ',    # 0xe2
+'Ju ',    # 0xe3
+'Pi ',    # 0xe4
+'Ruo ',    # 0xe5
+'Ku ',    # 0xe6
+'Zhu ',    # 0xe7
+'Ni ',    # 0xe8
+'Bo ',    # 0xe9
+'Bing ',    # 0xea
+'Shan ',    # 0xeb
+'Qiu ',    # 0xec
+'Yao ',    # 0xed
+'Xian ',    # 0xee
+'Ben ',    # 0xef
+'Hong ',    # 0xf0
+'Ying ',    # 0xf1
+'Zha ',    # 0xf2
+'Dong ',    # 0xf3
+'Ju ',    # 0xf4
+'Die ',    # 0xf5
+'Nie ',    # 0xf6
+'Gan ',    # 0xf7
+'Hu ',    # 0xf8
+'Ping ',    # 0xf9
+'Mei ',    # 0xfa
+'Fu ',    # 0xfb
+'Sheng ',    # 0xfc
+'Gu ',    # 0xfd
+'Bi ',    # 0xfe
+'Wei ',    # 0xff
+)
diff --git a/lib/unidecode/x083.py b/lib/unidecode/x083.py
new file mode 100644
index 00000000..672cd5d8
--- /dev/null
+++ b/lib/unidecode/x083.py
@@ -0,0 +1,258 @@
+data = (
+'Fu ',    # 0x00
+'Zhuo ',    # 0x01
+'Mao ',    # 0x02
+'Fan ',    # 0x03
+'Qie ',    # 0x04
+'Mao ',    # 0x05
+'Mao ',    # 0x06
+'Ba ',    # 0x07
+'Zi ',    # 0x08
+'Mo ',    # 0x09
+'Zi ',    # 0x0a
+'Di ',    # 0x0b
+'Chi ',    # 0x0c
+'Ji ',    # 0x0d
+'Jing ',    # 0x0e
+'Long ',    # 0x0f
+'[?] ',    # 0x10
+'Niao ',    # 0x11
+'[?] ',    # 0x12
+'Xue ',    # 0x13
+'Ying ',    # 0x14
+'Qiong ',    # 0x15
+'Ge ',    # 0x16
+'Ming ',    # 0x17
+'Li ',    # 0x18
+'Rong ',    # 0x19
+'Yin ',    # 0x1a
+'Gen ',    # 0x1b
+'Qian ',    # 0x1c
+'Chai ',    # 0x1d
+'Chen ',    # 0x1e
+'Yu ',    # 0x1f
+'Xiu ',    # 0x20
+'Zi ',    # 0x21
+'Lie ',    # 0x22
+'Wu ',    # 0x23
+'Ji ',    # 0x24
+'Kui ',    # 0x25
+'Ce ',    # 0x26
+'Chong ',    # 0x27
+'Ci ',    # 0x28
+'Gou ',    # 0x29
+'Guang ',    # 0x2a
+'Mang ',    # 0x2b
+'Chi ',    # 0x2c
+'Jiao ',    # 0x2d
+'Jiao ',    # 0x2e
+'Fu ',    # 0x2f
+'Yu ',    # 0x30
+'Zhu ',    # 0x31
+'Zi ',    # 0x32
+'Jiang ',    # 0x33
+'Hui ',    # 0x34
+'Yin ',    # 0x35
+'Cha ',    # 0x36
+'Fa ',    # 0x37
+'Rong ',    # 0x38
+'Ru ',    # 0x39
+'Chong ',    # 0x3a
+'Mang ',    # 0x3b
+'Tong ',    # 0x3c
+'Zhong ',    # 0x3d
+'[?] ',    # 0x3e
+'Zhu ',    # 0x3f
+'Xun ',    # 0x40
+'Huan ',    # 0x41
+'Kua ',    # 0x42
+'Quan ',    # 0x43
+'Gai ',    # 0x44
+'Da ',    # 0x45
+'Jing ',    # 0x46
+'Xing ',    # 0x47
+'Quan ',    # 0x48
+'Cao ',    # 0x49
+'Jing ',    # 0x4a
+'Er ',    # 0x4b
+'An ',    # 0x4c
+'Shou ',    # 0x4d
+'Chi ',    # 0x4e
+'Ren ',    # 0x4f
+'Jian ',    # 0x50
+'Ti ',    # 0x51
+'Huang ',    # 0x52
+'Ping ',    # 0x53
+'Li ',    # 0x54
+'Jin ',    # 0x55
+'Lao ',    # 0x56
+'Shu ',    # 0x57
+'Zhuang ',    # 0x58
+'Da ',    # 0x59
+'Jia ',    # 0x5a
+'Rao ',    # 0x5b
+'Bi ',    # 0x5c
+'Ze ',    # 0x5d
+'Qiao ',    # 0x5e
+'Hui ',    # 0x5f
+'Qi ',    # 0x60
+'Dang ',    # 0x61
+'[?] ',    # 0x62
+'Rong ',    # 0x63
+'Hun ',    # 0x64
+'Ying ',    # 0x65
+'Luo ',    # 0x66
+'Ying ',    # 0x67
+'Xun ',    # 0x68
+'Jin ',    # 0x69
+'Sun ',    # 0x6a
+'Yin ',    # 0x6b
+'Mai ',    # 0x6c
+'Hong ',    # 0x6d
+'Zhou ',    # 0x6e
+'Yao ',    # 0x6f
+'Du ',    # 0x70
+'Wei ',    # 0x71
+'Chu ',    # 0x72
+'Dou ',    # 0x73
+'Fu ',    # 0x74
+'Ren ',    # 0x75
+'Yin ',    # 0x76
+'He ',    # 0x77
+'Bi ',    # 0x78
+'Bu ',    # 0x79
+'Yun ',    # 0x7a
+'Di ',    # 0x7b
+'Tu ',    # 0x7c
+'Sui ',    # 0x7d
+'Sui ',    # 0x7e
+'Cheng ',    # 0x7f
+'Chen ',    # 0x80
+'Wu ',    # 0x81
+'Bie ',    # 0x82
+'Xi ',    # 0x83
+'Geng ',    # 0x84
+'Li ',    # 0x85
+'Fu ',    # 0x86
+'Zhu ',    # 0x87
+'Mo ',    # 0x88
+'Li ',    # 0x89
+'Zhuang ',    # 0x8a
+'Ji ',    # 0x8b
+'Duo ',    # 0x8c
+'Qiu ',    # 0x8d
+'Sha ',    # 0x8e
+'Suo ',    # 0x8f
+'Chen ',    # 0x90
+'Feng ',    # 0x91
+'Ju ',    # 0x92
+'Mei ',    # 0x93
+'Meng ',    # 0x94
+'Xing ',    # 0x95
+'Jing ',    # 0x96
+'Che ',    # 0x97
+'Xin ',    # 0x98
+'Jun ',    # 0x99
+'Yan ',    # 0x9a
+'Ting ',    # 0x9b
+'Diao ',    # 0x9c
+'Cuo ',    # 0x9d
+'Wan ',    # 0x9e
+'Han ',    # 0x9f
+'You ',    # 0xa0
+'Cuo ',    # 0xa1
+'Jia ',    # 0xa2
+'Wang ',    # 0xa3
+'You ',    # 0xa4
+'Niu ',    # 0xa5
+'Shao ',    # 0xa6
+'Xian ',    # 0xa7
+'Lang ',    # 0xa8
+'Fu ',    # 0xa9
+'E ',    # 0xaa
+'Mo ',    # 0xab
+'Wen ',    # 0xac
+'Jie ',    # 0xad
+'Nan ',    # 0xae
+'Mu ',    # 0xaf
+'Kan ',    # 0xb0
+'Lai ',    # 0xb1
+'Lian ',    # 0xb2
+'Shi ',    # 0xb3
+'Wo ',    # 0xb4
+'Usagi ',    # 0xb5
+'Lian ',    # 0xb6
+'Huo ',    # 0xb7
+'You ',    # 0xb8
+'Ying ',    # 0xb9
+'Ying ',    # 0xba
+'Nuc ',    # 0xbb
+'Chun ',    # 0xbc
+'Mang ',    # 0xbd
+'Mang ',    # 0xbe
+'Ci ',    # 0xbf
+'Wan ',    # 0xc0
+'Jing ',    # 0xc1
+'Di ',    # 0xc2
+'Qu ',    # 0xc3
+'Dong ',    # 0xc4
+'Jian ',    # 0xc5
+'Zou ',    # 0xc6
+'Gu ',    # 0xc7
+'La ',    # 0xc8
+'Lu ',    # 0xc9
+'Ju ',    # 0xca
+'Wei ',    # 0xcb
+'Jun ',    # 0xcc
+'Nie ',    # 0xcd
+'Kun ',    # 0xce
+'He ',    # 0xcf
+'Pu ',    # 0xd0
+'Zi ',    # 0xd1
+'Gao ',    # 0xd2
+'Guo ',    # 0xd3
+'Fu ',    # 0xd4
+'Lun ',    # 0xd5
+'Chang ',    # 0xd6
+'Chou ',    # 0xd7
+'Song ',    # 0xd8
+'Chui ',    # 0xd9
+'Zhan ',    # 0xda
+'Men ',    # 0xdb
+'Cai ',    # 0xdc
+'Ba ',    # 0xdd
+'Li ',    # 0xde
+'Tu ',    # 0xdf
+'Bo ',    # 0xe0
+'Han ',    # 0xe1
+'Bao ',    # 0xe2
+'Qin ',    # 0xe3
+'Juan ',    # 0xe4
+'Xi ',    # 0xe5
+'Qin ',    # 0xe6
+'Di ',    # 0xe7
+'Jie ',    # 0xe8
+'Pu ',    # 0xe9
+'Dang ',    # 0xea
+'Jin ',    # 0xeb
+'Zhao ',    # 0xec
+'Tai ',    # 0xed
+'Geng ',    # 0xee
+'Hua ',    # 0xef
+'Gu ',    # 0xf0
+'Ling ',    # 0xf1
+'Fei ',    # 0xf2
+'Jin ',    # 0xf3
+'An ',    # 0xf4
+'Wang ',    # 0xf5
+'Beng ',    # 0xf6
+'Zhou ',    # 0xf7
+'Yan ',    # 0xf8
+'Ju ',    # 0xf9
+'Jian ',    # 0xfa
+'Lin ',    # 0xfb
+'Tan ',    # 0xfc
+'Shu ',    # 0xfd
+'Tian ',    # 0xfe
+'Dao ',    # 0xff
+)
diff --git a/lib/unidecode/x084.py b/lib/unidecode/x084.py
new file mode 100644
index 00000000..571a3607
--- /dev/null
+++ b/lib/unidecode/x084.py
@@ -0,0 +1,258 @@
+data = (
+'Hu ',    # 0x00
+'Qi ',    # 0x01
+'He ',    # 0x02
+'Cui ',    # 0x03
+'Tao ',    # 0x04
+'Chun ',    # 0x05
+'Bei ',    # 0x06
+'Chang ',    # 0x07
+'Huan ',    # 0x08
+'Fei ',    # 0x09
+'Lai ',    # 0x0a
+'Qi ',    # 0x0b
+'Meng ',    # 0x0c
+'Ping ',    # 0x0d
+'Wei ',    # 0x0e
+'Dan ',    # 0x0f
+'Sha ',    # 0x10
+'Huan ',    # 0x11
+'Yan ',    # 0x12
+'Yi ',    # 0x13
+'Tiao ',    # 0x14
+'Qi ',    # 0x15
+'Wan ',    # 0x16
+'Ce ',    # 0x17
+'Nai ',    # 0x18
+'Kutabireru ',    # 0x19
+'Tuo ',    # 0x1a
+'Jiu ',    # 0x1b
+'Tie ',    # 0x1c
+'Luo ',    # 0x1d
+'[?] ',    # 0x1e
+'[?] ',    # 0x1f
+'Meng ',    # 0x20
+'[?] ',    # 0x21
+'Yaji ',    # 0x22
+'[?] ',    # 0x23
+'Ying ',    # 0x24
+'Ying ',    # 0x25
+'Ying ',    # 0x26
+'Xiao ',    # 0x27
+'Sa ',    # 0x28
+'Qiu ',    # 0x29
+'Ke ',    # 0x2a
+'Xiang ',    # 0x2b
+'Wan ',    # 0x2c
+'Yu ',    # 0x2d
+'Yu ',    # 0x2e
+'Fu ',    # 0x2f
+'Lian ',    # 0x30
+'Xuan ',    # 0x31
+'Yuan ',    # 0x32
+'Nan ',    # 0x33
+'Ze ',    # 0x34
+'Wo ',    # 0x35
+'Chun ',    # 0x36
+'Xiao ',    # 0x37
+'Yu ',    # 0x38
+'Pian ',    # 0x39
+'Mao ',    # 0x3a
+'An ',    # 0x3b
+'E ',    # 0x3c
+'Luo ',    # 0x3d
+'Ying ',    # 0x3e
+'Huo ',    # 0x3f
+'Gua ',    # 0x40
+'Jiang ',    # 0x41
+'Mian ',    # 0x42
+'Zuo ',    # 0x43
+'Zuo ',    # 0x44
+'Ju ',    # 0x45
+'Bao ',    # 0x46
+'Rou ',    # 0x47
+'Xi ',    # 0x48
+'Xie ',    # 0x49
+'An ',    # 0x4a
+'Qu ',    # 0x4b
+'Jian ',    # 0x4c
+'Fu ',    # 0x4d
+'Lu ',    # 0x4e
+'Jing ',    # 0x4f
+'Pen ',    # 0x50
+'Feng ',    # 0x51
+'Hong ',    # 0x52
+'Hong ',    # 0x53
+'Hou ',    # 0x54
+'Yan ',    # 0x55
+'Tu ',    # 0x56
+'Zhu ',    # 0x57
+'Zi ',    # 0x58
+'Xiang ',    # 0x59
+'Shen ',    # 0x5a
+'Ge ',    # 0x5b
+'Jie ',    # 0x5c
+'Jing ',    # 0x5d
+'Mi ',    # 0x5e
+'Huang ',    # 0x5f
+'Shen ',    # 0x60
+'Pu ',    # 0x61
+'Gai ',    # 0x62
+'Dong ',    # 0x63
+'Zhou ',    # 0x64
+'Qian ',    # 0x65
+'Wei ',    # 0x66
+'Bo ',    # 0x67
+'Wei ',    # 0x68
+'Pa ',    # 0x69
+'Ji ',    # 0x6a
+'Hu ',    # 0x6b
+'Zang ',    # 0x6c
+'Jia ',    # 0x6d
+'Duan ',    # 0x6e
+'Yao ',    # 0x6f
+'Jun ',    # 0x70
+'Cong ',    # 0x71
+'Quan ',    # 0x72
+'Wei ',    # 0x73
+'Xian ',    # 0x74
+'Kui ',    # 0x75
+'Ting ',    # 0x76
+'Hun ',    # 0x77
+'Xi ',    # 0x78
+'Shi ',    # 0x79
+'Qi ',    # 0x7a
+'Lan ',    # 0x7b
+'Zong ',    # 0x7c
+'Yao ',    # 0x7d
+'Yuan ',    # 0x7e
+'Mei ',    # 0x7f
+'Yun ',    # 0x80
+'Shu ',    # 0x81
+'Di ',    # 0x82
+'Zhuan ',    # 0x83
+'Guan ',    # 0x84
+'Sukumo ',    # 0x85
+'Xue ',    # 0x86
+'Chan ',    # 0x87
+'Kai ',    # 0x88
+'Kui ',    # 0x89
+'[?] ',    # 0x8a
+'Jiang ',    # 0x8b
+'Lou ',    # 0x8c
+'Wei ',    # 0x8d
+'Pai ',    # 0x8e
+'[?] ',    # 0x8f
+'Sou ',    # 0x90
+'Yin ',    # 0x91
+'Shi ',    # 0x92
+'Chun ',    # 0x93
+'Shi ',    # 0x94
+'Yun ',    # 0x95
+'Zhen ',    # 0x96
+'Lang ',    # 0x97
+'Nu ',    # 0x98
+'Meng ',    # 0x99
+'He ',    # 0x9a
+'Que ',    # 0x9b
+'Suan ',    # 0x9c
+'Yuan ',    # 0x9d
+'Li ',    # 0x9e
+'Ju ',    # 0x9f
+'Xi ',    # 0xa0
+'Pang ',    # 0xa1
+'Chu ',    # 0xa2
+'Xu ',    # 0xa3
+'Tu ',    # 0xa4
+'Liu ',    # 0xa5
+'Wo ',    # 0xa6
+'Zhen ',    # 0xa7
+'Qian ',    # 0xa8
+'Zu ',    # 0xa9
+'Po ',    # 0xaa
+'Cuo ',    # 0xab
+'Yuan ',    # 0xac
+'Chu ',    # 0xad
+'Yu ',    # 0xae
+'Kuai ',    # 0xaf
+'Pan ',    # 0xb0
+'Pu ',    # 0xb1
+'Pu ',    # 0xb2
+'Na ',    # 0xb3
+'Shuo ',    # 0xb4
+'Xi ',    # 0xb5
+'Fen ',    # 0xb6
+'Yun ',    # 0xb7
+'Zheng ',    # 0xb8
+'Jian ',    # 0xb9
+'Ji ',    # 0xba
+'Ruo ',    # 0xbb
+'Cang ',    # 0xbc
+'En ',    # 0xbd
+'Mi ',    # 0xbe
+'Hao ',    # 0xbf
+'Sun ',    # 0xc0
+'Zhen ',    # 0xc1
+'Ming ',    # 0xc2
+'Sou ',    # 0xc3
+'Xu ',    # 0xc4
+'Liu ',    # 0xc5
+'Xi ',    # 0xc6
+'Gu ',    # 0xc7
+'Lang ',    # 0xc8
+'Rong ',    # 0xc9
+'Weng ',    # 0xca
+'Gai ',    # 0xcb
+'Cuo ',    # 0xcc
+'Shi ',    # 0xcd
+'Tang ',    # 0xce
+'Luo ',    # 0xcf
+'Ru ',    # 0xd0
+'Suo ',    # 0xd1
+'Xian ',    # 0xd2
+'Bei ',    # 0xd3
+'Yao ',    # 0xd4
+'Gui ',    # 0xd5
+'Bi ',    # 0xd6
+'Zong ',    # 0xd7
+'Gun ',    # 0xd8
+'Za ',    # 0xd9
+'Xiu ',    # 0xda
+'Ce ',    # 0xdb
+'Hai ',    # 0xdc
+'Lan ',    # 0xdd
+'[?] ',    # 0xde
+'Ji ',    # 0xdf
+'Li ',    # 0xe0
+'Can ',    # 0xe1
+'Lang ',    # 0xe2
+'Yu ',    # 0xe3
+'[?] ',    # 0xe4
+'Ying ',    # 0xe5
+'Mo ',    # 0xe6
+'Diao ',    # 0xe7
+'Tiao ',    # 0xe8
+'Mao ',    # 0xe9
+'Tong ',    # 0xea
+'Zhu ',    # 0xeb
+'Peng ',    # 0xec
+'An ',    # 0xed
+'Lian ',    # 0xee
+'Cong ',    # 0xef
+'Xi ',    # 0xf0
+'Ping ',    # 0xf1
+'Qiu ',    # 0xf2
+'Jin ',    # 0xf3
+'Chun ',    # 0xf4
+'Jie ',    # 0xf5
+'Wei ',    # 0xf6
+'Tui ',    # 0xf7
+'Cao ',    # 0xf8
+'Yu ',    # 0xf9
+'Yi ',    # 0xfa
+'Ji ',    # 0xfb
+'Liao ',    # 0xfc
+'Bi ',    # 0xfd
+'Lu ',    # 0xfe
+'Su ',    # 0xff
+)
diff --git a/lib/unidecode/x085.py b/lib/unidecode/x085.py
new file mode 100644
index 00000000..c11c513b
--- /dev/null
+++ b/lib/unidecode/x085.py
@@ -0,0 +1,258 @@
+data = (
+'Bu ',    # 0x00
+'Zhang ',    # 0x01
+'Luo ',    # 0x02
+'Jiang ',    # 0x03
+'Man ',    # 0x04
+'Yan ',    # 0x05
+'Ling ',    # 0x06
+'Ji ',    # 0x07
+'Piao ',    # 0x08
+'Gun ',    # 0x09
+'Han ',    # 0x0a
+'Di ',    # 0x0b
+'Su ',    # 0x0c
+'Lu ',    # 0x0d
+'She ',    # 0x0e
+'Shang ',    # 0x0f
+'Di ',    # 0x10
+'Mie ',    # 0x11
+'Xun ',    # 0x12
+'Man ',    # 0x13
+'Bo ',    # 0x14
+'Di ',    # 0x15
+'Cuo ',    # 0x16
+'Zhe ',    # 0x17
+'Sen ',    # 0x18
+'Xuan ',    # 0x19
+'Wei ',    # 0x1a
+'Hu ',    # 0x1b
+'Ao ',    # 0x1c
+'Mi ',    # 0x1d
+'Lou ',    # 0x1e
+'Cu ',    # 0x1f
+'Zhong ',    # 0x20
+'Cai ',    # 0x21
+'Po ',    # 0x22
+'Jiang ',    # 0x23
+'Mi ',    # 0x24
+'Cong ',    # 0x25
+'Niao ',    # 0x26
+'Hui ',    # 0x27
+'Jun ',    # 0x28
+'Yin ',    # 0x29
+'Jian ',    # 0x2a
+'Yan ',    # 0x2b
+'Shu ',    # 0x2c
+'Yin ',    # 0x2d
+'Kui ',    # 0x2e
+'Chen ',    # 0x2f
+'Hu ',    # 0x30
+'Sha ',    # 0x31
+'Kou ',    # 0x32
+'Qian ',    # 0x33
+'Ma ',    # 0x34
+'Zang ',    # 0x35
+'Sonoko ',    # 0x36
+'Qiang ',    # 0x37
+'Dou ',    # 0x38
+'Lian ',    # 0x39
+'Lin ',    # 0x3a
+'Kou ',    # 0x3b
+'Ai ',    # 0x3c
+'Bi ',    # 0x3d
+'Li ',    # 0x3e
+'Wei ',    # 0x3f
+'Ji ',    # 0x40
+'Xun ',    # 0x41
+'Sheng ',    # 0x42
+'Fan ',    # 0x43
+'Meng ',    # 0x44
+'Ou ',    # 0x45
+'Chan ',    # 0x46
+'Dian ',    # 0x47
+'Xun ',    # 0x48
+'Jiao ',    # 0x49
+'Rui ',    # 0x4a
+'Rui ',    # 0x4b
+'Lei ',    # 0x4c
+'Yu ',    # 0x4d
+'Qiao ',    # 0x4e
+'Chu ',    # 0x4f
+'Hua ',    # 0x50
+'Jian ',    # 0x51
+'Mai ',    # 0x52
+'Yun ',    # 0x53
+'Bao ',    # 0x54
+'You ',    # 0x55
+'Qu ',    # 0x56
+'Lu ',    # 0x57
+'Rao ',    # 0x58
+'Hui ',    # 0x59
+'E ',    # 0x5a
+'Teng ',    # 0x5b
+'Fei ',    # 0x5c
+'Jue ',    # 0x5d
+'Zui ',    # 0x5e
+'Fa ',    # 0x5f
+'Ru ',    # 0x60
+'Fen ',    # 0x61
+'Kui ',    # 0x62
+'Shun ',    # 0x63
+'Rui ',    # 0x64
+'Ya ',    # 0x65
+'Xu ',    # 0x66
+'Fu ',    # 0x67
+'Jue ',    # 0x68
+'Dang ',    # 0x69
+'Wu ',    # 0x6a
+'Tong ',    # 0x6b
+'Si ',    # 0x6c
+'Xiao ',    # 0x6d
+'Xi ',    # 0x6e
+'Long ',    # 0x6f
+'Yun ',    # 0x70
+'[?] ',    # 0x71
+'Qi ',    # 0x72
+'Jian ',    # 0x73
+'Yun ',    # 0x74
+'Sun ',    # 0x75
+'Ling ',    # 0x76
+'Yu ',    # 0x77
+'Xia ',    # 0x78
+'Yong ',    # 0x79
+'Ji ',    # 0x7a
+'Hong ',    # 0x7b
+'Si ',    # 0x7c
+'Nong ',    # 0x7d
+'Lei ',    # 0x7e
+'Xuan ',    # 0x7f
+'Yun ',    # 0x80
+'Yu ',    # 0x81
+'Xi ',    # 0x82
+'Hao ',    # 0x83
+'Bo ',    # 0x84
+'Hao ',    # 0x85
+'Ai ',    # 0x86
+'Wei ',    # 0x87
+'Hui ',    # 0x88
+'Wei ',    # 0x89
+'Ji ',    # 0x8a
+'Ci ',    # 0x8b
+'Xiang ',    # 0x8c
+'Luan ',    # 0x8d
+'Mie ',    # 0x8e
+'Yi ',    # 0x8f
+'Leng ',    # 0x90
+'Jiang ',    # 0x91
+'Can ',    # 0x92
+'Shen ',    # 0x93
+'Qiang ',    # 0x94
+'Lian ',    # 0x95
+'Ke ',    # 0x96
+'Yuan ',    # 0x97
+'Da ',    # 0x98
+'Ti ',    # 0x99
+'Tang ',    # 0x9a
+'Xie ',    # 0x9b
+'Bi ',    # 0x9c
+'Zhan ',    # 0x9d
+'Sun ',    # 0x9e
+'Lian ',    # 0x9f
+'Fan ',    # 0xa0
+'Ding ',    # 0xa1
+'Jie ',    # 0xa2
+'Gu ',    # 0xa3
+'Xie ',    # 0xa4
+'Shu ',    # 0xa5
+'Jian ',    # 0xa6
+'Kao ',    # 0xa7
+'Hong ',    # 0xa8
+'Sa ',    # 0xa9
+'Xin ',    # 0xaa
+'Xun ',    # 0xab
+'Yao ',    # 0xac
+'Hie ',    # 0xad
+'Sou ',    # 0xae
+'Shu ',    # 0xaf
+'Xun ',    # 0xb0
+'Dui ',    # 0xb1
+'Pin ',    # 0xb2
+'Wei ',    # 0xb3
+'Neng ',    # 0xb4
+'Chou ',    # 0xb5
+'Mai ',    # 0xb6
+'Ru ',    # 0xb7
+'Piao ',    # 0xb8
+'Tai ',    # 0xb9
+'Qi ',    # 0xba
+'Zao ',    # 0xbb
+'Chen ',    # 0xbc
+'Zhen ',    # 0xbd
+'Er ',    # 0xbe
+'Ni ',    # 0xbf
+'Ying ',    # 0xc0
+'Gao ',    # 0xc1
+'Cong ',    # 0xc2
+'Xiao ',    # 0xc3
+'Qi ',    # 0xc4
+'Fa ',    # 0xc5
+'Jian ',    # 0xc6
+'Xu ',    # 0xc7
+'Kui ',    # 0xc8
+'Jie ',    # 0xc9
+'Bian ',    # 0xca
+'Diao ',    # 0xcb
+'Mi ',    # 0xcc
+'Lan ',    # 0xcd
+'Jin ',    # 0xce
+'Cang ',    # 0xcf
+'Miao ',    # 0xd0
+'Qiong ',    # 0xd1
+'Qie ',    # 0xd2
+'Xian ',    # 0xd3
+'[?] ',    # 0xd4
+'Ou ',    # 0xd5
+'Xian ',    # 0xd6
+'Su ',    # 0xd7
+'Lu ',    # 0xd8
+'Yi ',    # 0xd9
+'Xu ',    # 0xda
+'Xie ',    # 0xdb
+'Li ',    # 0xdc
+'Yi ',    # 0xdd
+'La ',    # 0xde
+'Lei ',    # 0xdf
+'Xiao ',    # 0xe0
+'Di ',    # 0xe1
+'Zhi ',    # 0xe2
+'Bei ',    # 0xe3
+'Teng ',    # 0xe4
+'Yao ',    # 0xe5
+'Mo ',    # 0xe6
+'Huan ',    # 0xe7
+'Piao ',    # 0xe8
+'Fan ',    # 0xe9
+'Sou ',    # 0xea
+'Tan ',    # 0xeb
+'Tui ',    # 0xec
+'Qiong ',    # 0xed
+'Qiao ',    # 0xee
+'Wei ',    # 0xef
+'Liu ',    # 0xf0
+'Hui ',    # 0xf1
+'[?] ',    # 0xf2
+'Gao ',    # 0xf3
+'Yun ',    # 0xf4
+'[?] ',    # 0xf5
+'Li ',    # 0xf6
+'Shu ',    # 0xf7
+'Chu ',    # 0xf8
+'Ai ',    # 0xf9
+'Lin ',    # 0xfa
+'Zao ',    # 0xfb
+'Xuan ',    # 0xfc
+'Chen ',    # 0xfd
+'Lai ',    # 0xfe
+'Huo ',    # 0xff
+)
diff --git a/lib/unidecode/x086.py b/lib/unidecode/x086.py
new file mode 100644
index 00000000..38784a61
--- /dev/null
+++ b/lib/unidecode/x086.py
@@ -0,0 +1,258 @@
+data = (
+'Tuo ',    # 0x00
+'Wu ',    # 0x01
+'Rui ',    # 0x02
+'Rui ',    # 0x03
+'Qi ',    # 0x04
+'Heng ',    # 0x05
+'Lu ',    # 0x06
+'Su ',    # 0x07
+'Tui ',    # 0x08
+'Mang ',    # 0x09
+'Yun ',    # 0x0a
+'Pin ',    # 0x0b
+'Yu ',    # 0x0c
+'Xun ',    # 0x0d
+'Ji ',    # 0x0e
+'Jiong ',    # 0x0f
+'Xian ',    # 0x10
+'Mo ',    # 0x11
+'Hagi ',    # 0x12
+'Su ',    # 0x13
+'Jiong ',    # 0x14
+'[?] ',    # 0x15
+'Nie ',    # 0x16
+'Bo ',    # 0x17
+'Rang ',    # 0x18
+'Yi ',    # 0x19
+'Xian ',    # 0x1a
+'Yu ',    # 0x1b
+'Ju ',    # 0x1c
+'Lian ',    # 0x1d
+'Lian ',    # 0x1e
+'Yin ',    # 0x1f
+'Qiang ',    # 0x20
+'Ying ',    # 0x21
+'Long ',    # 0x22
+'Tong ',    # 0x23
+'Wei ',    # 0x24
+'Yue ',    # 0x25
+'Ling ',    # 0x26
+'Qu ',    # 0x27
+'Yao ',    # 0x28
+'Fan ',    # 0x29
+'Mi ',    # 0x2a
+'Lan ',    # 0x2b
+'Kui ',    # 0x2c
+'Lan ',    # 0x2d
+'Ji ',    # 0x2e
+'Dang ',    # 0x2f
+'Katsura ',    # 0x30
+'Lei ',    # 0x31
+'Lei ',    # 0x32
+'Hua ',    # 0x33
+'Feng ',    # 0x34
+'Zhi ',    # 0x35
+'Wei ',    # 0x36
+'Kui ',    # 0x37
+'Zhan ',    # 0x38
+'Huai ',    # 0x39
+'Li ',    # 0x3a
+'Ji ',    # 0x3b
+'Mi ',    # 0x3c
+'Lei ',    # 0x3d
+'Huai ',    # 0x3e
+'Luo ',    # 0x3f
+'Ji ',    # 0x40
+'Kui ',    # 0x41
+'Lu ',    # 0x42
+'Jian ',    # 0x43
+'San ',    # 0x44
+'[?] ',    # 0x45
+'Lei ',    # 0x46
+'Quan ',    # 0x47
+'Xiao ',    # 0x48
+'Yi ',    # 0x49
+'Luan ',    # 0x4a
+'Men ',    # 0x4b
+'Bie ',    # 0x4c
+'Hu ',    # 0x4d
+'Hu ',    # 0x4e
+'Lu ',    # 0x4f
+'Nue ',    # 0x50
+'Lu ',    # 0x51
+'Si ',    # 0x52
+'Xiao ',    # 0x53
+'Qian ',    # 0x54
+'Chu ',    # 0x55
+'Hu ',    # 0x56
+'Xu ',    # 0x57
+'Cuo ',    # 0x58
+'Fu ',    # 0x59
+'Xu ',    # 0x5a
+'Xu ',    # 0x5b
+'Lu ',    # 0x5c
+'Hu ',    # 0x5d
+'Yu ',    # 0x5e
+'Hao ',    # 0x5f
+'Jiao ',    # 0x60
+'Ju ',    # 0x61
+'Guo ',    # 0x62
+'Bao ',    # 0x63
+'Yan ',    # 0x64
+'Zhan ',    # 0x65
+'Zhan ',    # 0x66
+'Kui ',    # 0x67
+'Ban ',    # 0x68
+'Xi ',    # 0x69
+'Shu ',    # 0x6a
+'Chong ',    # 0x6b
+'Qiu ',    # 0x6c
+'Diao ',    # 0x6d
+'Ji ',    # 0x6e
+'Qiu ',    # 0x6f
+'Cheng ',    # 0x70
+'Shi ',    # 0x71
+'[?] ',    # 0x72
+'Di ',    # 0x73
+'Zhe ',    # 0x74
+'She ',    # 0x75
+'Yu ',    # 0x76
+'Gan ',    # 0x77
+'Zi ',    # 0x78
+'Hong ',    # 0x79
+'Hui ',    # 0x7a
+'Meng ',    # 0x7b
+'Ge ',    # 0x7c
+'Sui ',    # 0x7d
+'Xia ',    # 0x7e
+'Chai ',    # 0x7f
+'Shi ',    # 0x80
+'Yi ',    # 0x81
+'Ma ',    # 0x82
+'Xiang ',    # 0x83
+'Fang ',    # 0x84
+'E ',    # 0x85
+'Pa ',    # 0x86
+'Chi ',    # 0x87
+'Qian ',    # 0x88
+'Wen ',    # 0x89
+'Wen ',    # 0x8a
+'Rui ',    # 0x8b
+'Bang ',    # 0x8c
+'Bi ',    # 0x8d
+'Yue ',    # 0x8e
+'Yue ',    # 0x8f
+'Jun ',    # 0x90
+'Qi ',    # 0x91
+'Ran ',    # 0x92
+'Yin ',    # 0x93
+'Qi ',    # 0x94
+'Tian ',    # 0x95
+'Yuan ',    # 0x96
+'Jue ',    # 0x97
+'Hui ',    # 0x98
+'Qin ',    # 0x99
+'Qi ',    # 0x9a
+'Zhong ',    # 0x9b
+'Ya ',    # 0x9c
+'Ci ',    # 0x9d
+'Mu ',    # 0x9e
+'Wang ',    # 0x9f
+'Fen ',    # 0xa0
+'Fen ',    # 0xa1
+'Hang ',    # 0xa2
+'Gong ',    # 0xa3
+'Zao ',    # 0xa4
+'Fu ',    # 0xa5
+'Ran ',    # 0xa6
+'Jie ',    # 0xa7
+'Fu ',    # 0xa8
+'Chi ',    # 0xa9
+'Dou ',    # 0xaa
+'Piao ',    # 0xab
+'Xian ',    # 0xac
+'Ni ',    # 0xad
+'Te ',    # 0xae
+'Qiu ',    # 0xaf
+'You ',    # 0xb0
+'Zha ',    # 0xb1
+'Ping ',    # 0xb2
+'Chi ',    # 0xb3
+'You ',    # 0xb4
+'He ',    # 0xb5
+'Han ',    # 0xb6
+'Ju ',    # 0xb7
+'Li ',    # 0xb8
+'Fu ',    # 0xb9
+'Ran ',    # 0xba
+'Zha ',    # 0xbb
+'Gou ',    # 0xbc
+'Pi ',    # 0xbd
+'Bo ',    # 0xbe
+'Xian ',    # 0xbf
+'Zhu ',    # 0xc0
+'Diao ',    # 0xc1
+'Bie ',    # 0xc2
+'Bing ',    # 0xc3
+'Gu ',    # 0xc4
+'Ran ',    # 0xc5
+'Qu ',    # 0xc6
+'She ',    # 0xc7
+'Tie ',    # 0xc8
+'Ling ',    # 0xc9
+'Gu ',    # 0xca
+'Dan ',    # 0xcb
+'Gu ',    # 0xcc
+'Ying ',    # 0xcd
+'Li ',    # 0xce
+'Cheng ',    # 0xcf
+'Qu ',    # 0xd0
+'Mou ',    # 0xd1
+'Ge ',    # 0xd2
+'Ci ',    # 0xd3
+'Hui ',    # 0xd4
+'Hui ',    # 0xd5
+'Mang ',    # 0xd6
+'Fu ',    # 0xd7
+'Yang ',    # 0xd8
+'Wa ',    # 0xd9
+'Lie ',    # 0xda
+'Zhu ',    # 0xdb
+'Yi ',    # 0xdc
+'Xian ',    # 0xdd
+'Kuo ',    # 0xde
+'Jiao ',    # 0xdf
+'Li ',    # 0xe0
+'Yi ',    # 0xe1
+'Ping ',    # 0xe2
+'Ji ',    # 0xe3
+'Ha ',    # 0xe4
+'She ',    # 0xe5
+'Yi ',    # 0xe6
+'Wang ',    # 0xe7
+'Mo ',    # 0xe8
+'Qiong ',    # 0xe9
+'Qie ',    # 0xea
+'Gui ',    # 0xeb
+'Gong ',    # 0xec
+'Zhi ',    # 0xed
+'Man ',    # 0xee
+'Ebi ',    # 0xef
+'Zhi ',    # 0xf0
+'Jia ',    # 0xf1
+'Rao ',    # 0xf2
+'Si ',    # 0xf3
+'Qi ',    # 0xf4
+'Xing ',    # 0xf5
+'Lie ',    # 0xf6
+'Qiu ',    # 0xf7
+'Shao ',    # 0xf8
+'Yong ',    # 0xf9
+'Jia ',    # 0xfa
+'Shui ',    # 0xfb
+'Che ',    # 0xfc
+'Bai ',    # 0xfd
+'E ',    # 0xfe
+'Han ',    # 0xff
+)
diff --git a/lib/unidecode/x087.py b/lib/unidecode/x087.py
new file mode 100644
index 00000000..2a2b79aa
--- /dev/null
+++ b/lib/unidecode/x087.py
@@ -0,0 +1,258 @@
+data = (
+'Shu ',    # 0x00
+'Xuan ',    # 0x01
+'Feng ',    # 0x02
+'Shen ',    # 0x03
+'Zhen ',    # 0x04
+'Fu ',    # 0x05
+'Xian ',    # 0x06
+'Zhe ',    # 0x07
+'Wu ',    # 0x08
+'Fu ',    # 0x09
+'Li ',    # 0x0a
+'Lang ',    # 0x0b
+'Bi ',    # 0x0c
+'Chu ',    # 0x0d
+'Yuan ',    # 0x0e
+'You ',    # 0x0f
+'Jie ',    # 0x10
+'Dan ',    # 0x11
+'Yan ',    # 0x12
+'Ting ',    # 0x13
+'Dian ',    # 0x14
+'Shui ',    # 0x15
+'Hui ',    # 0x16
+'Gua ',    # 0x17
+'Zhi ',    # 0x18
+'Song ',    # 0x19
+'Fei ',    # 0x1a
+'Ju ',    # 0x1b
+'Mi ',    # 0x1c
+'Qi ',    # 0x1d
+'Qi ',    # 0x1e
+'Yu ',    # 0x1f
+'Jun ',    # 0x20
+'Zha ',    # 0x21
+'Meng ',    # 0x22
+'Qiang ',    # 0x23
+'Si ',    # 0x24
+'Xi ',    # 0x25
+'Lun ',    # 0x26
+'Li ',    # 0x27
+'Die ',    # 0x28
+'Tiao ',    # 0x29
+'Tao ',    # 0x2a
+'Kun ',    # 0x2b
+'Gan ',    # 0x2c
+'Han ',    # 0x2d
+'Yu ',    # 0x2e
+'Bang ',    # 0x2f
+'Fei ',    # 0x30
+'Pi ',    # 0x31
+'Wei ',    # 0x32
+'Dun ',    # 0x33
+'Yi ',    # 0x34
+'Yuan ',    # 0x35
+'Su ',    # 0x36
+'Quan ',    # 0x37
+'Qian ',    # 0x38
+'Rui ',    # 0x39
+'Ni ',    # 0x3a
+'Qing ',    # 0x3b
+'Wei ',    # 0x3c
+'Liang ',    # 0x3d
+'Guo ',    # 0x3e
+'Wan ',    # 0x3f
+'Dong ',    # 0x40
+'E ',    # 0x41
+'Ban ',    # 0x42
+'Di ',    # 0x43
+'Wang ',    # 0x44
+'Can ',    # 0x45
+'Yang ',    # 0x46
+'Ying ',    # 0x47
+'Guo ',    # 0x48
+'Chan ',    # 0x49
+'[?] ',    # 0x4a
+'La ',    # 0x4b
+'Ke ',    # 0x4c
+'Ji ',    # 0x4d
+'He ',    # 0x4e
+'Ting ',    # 0x4f
+'Mai ',    # 0x50
+'Xu ',    # 0x51
+'Mian ',    # 0x52
+'Yu ',    # 0x53
+'Jie ',    # 0x54
+'Shi ',    # 0x55
+'Xuan ',    # 0x56
+'Huang ',    # 0x57
+'Yan ',    # 0x58
+'Bian ',    # 0x59
+'Rou ',    # 0x5a
+'Wei ',    # 0x5b
+'Fu ',    # 0x5c
+'Yuan ',    # 0x5d
+'Mei ',    # 0x5e
+'Wei ',    # 0x5f
+'Fu ',    # 0x60
+'Ruan ',    # 0x61
+'Xie ',    # 0x62
+'You ',    # 0x63
+'Qiu ',    # 0x64
+'Mao ',    # 0x65
+'Xia ',    # 0x66
+'Ying ',    # 0x67
+'Shi ',    # 0x68
+'Chong ',    # 0x69
+'Tang ',    # 0x6a
+'Zhu ',    # 0x6b
+'Zong ',    # 0x6c
+'Ti ',    # 0x6d
+'Fu ',    # 0x6e
+'Yuan ',    # 0x6f
+'Hui ',    # 0x70
+'Meng ',    # 0x71
+'La ',    # 0x72
+'Du ',    # 0x73
+'Hu ',    # 0x74
+'Qiu ',    # 0x75
+'Die ',    # 0x76
+'Li ',    # 0x77
+'Gua ',    # 0x78
+'Yun ',    # 0x79
+'Ju ',    # 0x7a
+'Nan ',    # 0x7b
+'Lou ',    # 0x7c
+'Qun ',    # 0x7d
+'Rong ',    # 0x7e
+'Ying ',    # 0x7f
+'Jiang ',    # 0x80
+'[?] ',    # 0x81
+'Lang ',    # 0x82
+'Pang ',    # 0x83
+'Si ',    # 0x84
+'Xi ',    # 0x85
+'Ci ',    # 0x86
+'Xi ',    # 0x87
+'Yuan ',    # 0x88
+'Weng ',    # 0x89
+'Lian ',    # 0x8a
+'Sou ',    # 0x8b
+'Ban ',    # 0x8c
+'Rong ',    # 0x8d
+'Rong ',    # 0x8e
+'Ji ',    # 0x8f
+'Wu ',    # 0x90
+'Qiu ',    # 0x91
+'Han ',    # 0x92
+'Qin ',    # 0x93
+'Yi ',    # 0x94
+'Bi ',    # 0x95
+'Hua ',    # 0x96
+'Tang ',    # 0x97
+'Yi ',    # 0x98
+'Du ',    # 0x99
+'Nai ',    # 0x9a
+'He ',    # 0x9b
+'Hu ',    # 0x9c
+'Hui ',    # 0x9d
+'Ma ',    # 0x9e
+'Ming ',    # 0x9f
+'Yi ',    # 0xa0
+'Wen ',    # 0xa1
+'Ying ',    # 0xa2
+'Teng ',    # 0xa3
+'Yu ',    # 0xa4
+'Cang ',    # 0xa5
+'So ',    # 0xa6
+'Ebi ',    # 0xa7
+'Man ',    # 0xa8
+'[?] ',    # 0xa9
+'Shang ',    # 0xaa
+'Zhe ',    # 0xab
+'Cao ',    # 0xac
+'Chi ',    # 0xad
+'Di ',    # 0xae
+'Ao ',    # 0xaf
+'Lu ',    # 0xb0
+'Wei ',    # 0xb1
+'Zhi ',    # 0xb2
+'Tang ',    # 0xb3
+'Chen ',    # 0xb4
+'Piao ',    # 0xb5
+'Qu ',    # 0xb6
+'Pi ',    # 0xb7
+'Yu ',    # 0xb8
+'Jian ',    # 0xb9
+'Luo ',    # 0xba
+'Lou ',    # 0xbb
+'Qin ',    # 0xbc
+'Zhong ',    # 0xbd
+'Yin ',    # 0xbe
+'Jiang ',    # 0xbf
+'Shuai ',    # 0xc0
+'Wen ',    # 0xc1
+'Jiao ',    # 0xc2
+'Wan ',    # 0xc3
+'Zhi ',    # 0xc4
+'Zhe ',    # 0xc5
+'Ma ',    # 0xc6
+'Ma ',    # 0xc7
+'Guo ',    # 0xc8
+'Liu ',    # 0xc9
+'Mao ',    # 0xca
+'Xi ',    # 0xcb
+'Cong ',    # 0xcc
+'Li ',    # 0xcd
+'Man ',    # 0xce
+'Xiao ',    # 0xcf
+'Kamakiri ',    # 0xd0
+'Zhang ',    # 0xd1
+'Mang ',    # 0xd2
+'Xiang ',    # 0xd3
+'Mo ',    # 0xd4
+'Zui ',    # 0xd5
+'Si ',    # 0xd6
+'Qiu ',    # 0xd7
+'Te ',    # 0xd8
+'Zhi ',    # 0xd9
+'Peng ',    # 0xda
+'Peng ',    # 0xdb
+'Jiao ',    # 0xdc
+'Qu ',    # 0xdd
+'Bie ',    # 0xde
+'Liao ',    # 0xdf
+'Pan ',    # 0xe0
+'Gui ',    # 0xe1
+'Xi ',    # 0xe2
+'Ji ',    # 0xe3
+'Zhuan ',    # 0xe4
+'Huang ',    # 0xe5
+'Fei ',    # 0xe6
+'Lao ',    # 0xe7
+'Jue ',    # 0xe8
+'Jue ',    # 0xe9
+'Hui ',    # 0xea
+'Yin ',    # 0xeb
+'Chan ',    # 0xec
+'Jiao ',    # 0xed
+'Shan ',    # 0xee
+'Rao ',    # 0xef
+'Xiao ',    # 0xf0
+'Mou ',    # 0xf1
+'Chong ',    # 0xf2
+'Xun ',    # 0xf3
+'Si ',    # 0xf4
+'[?] ',    # 0xf5
+'Cheng ',    # 0xf6
+'Dang ',    # 0xf7
+'Li ',    # 0xf8
+'Xie ',    # 0xf9
+'Shan ',    # 0xfa
+'Yi ',    # 0xfb
+'Jing ',    # 0xfc
+'Da ',    # 0xfd
+'Chan ',    # 0xfe
+'Qi ',    # 0xff
+)
diff --git a/lib/unidecode/x088.py b/lib/unidecode/x088.py
new file mode 100644
index 00000000..f907ce92
--- /dev/null
+++ b/lib/unidecode/x088.py
@@ -0,0 +1,258 @@
+data = (
+'Ci ',    # 0x00
+'Xiang ',    # 0x01
+'She ',    # 0x02
+'Luo ',    # 0x03
+'Qin ',    # 0x04
+'Ying ',    # 0x05
+'Chai ',    # 0x06
+'Li ',    # 0x07
+'Ze ',    # 0x08
+'Xuan ',    # 0x09
+'Lian ',    # 0x0a
+'Zhu ',    # 0x0b
+'Ze ',    # 0x0c
+'Xie ',    # 0x0d
+'Mang ',    # 0x0e
+'Xie ',    # 0x0f
+'Qi ',    # 0x10
+'Rong ',    # 0x11
+'Jian ',    # 0x12
+'Meng ',    # 0x13
+'Hao ',    # 0x14
+'Ruan ',    # 0x15
+'Huo ',    # 0x16
+'Zhuo ',    # 0x17
+'Jie ',    # 0x18
+'Bin ',    # 0x19
+'He ',    # 0x1a
+'Mie ',    # 0x1b
+'Fan ',    # 0x1c
+'Lei ',    # 0x1d
+'Jie ',    # 0x1e
+'La ',    # 0x1f
+'Mi ',    # 0x20
+'Li ',    # 0x21
+'Chun ',    # 0x22
+'Li ',    # 0x23
+'Qiu ',    # 0x24
+'Nie ',    # 0x25
+'Lu ',    # 0x26
+'Du ',    # 0x27
+'Xiao ',    # 0x28
+'Zhu ',    # 0x29
+'Long ',    # 0x2a
+'Li ',    # 0x2b
+'Long ',    # 0x2c
+'Feng ',    # 0x2d
+'Ye ',    # 0x2e
+'Beng ',    # 0x2f
+'Shang ',    # 0x30
+'Gu ',    # 0x31
+'Juan ',    # 0x32
+'Ying ',    # 0x33
+'[?] ',    # 0x34
+'Xi ',    # 0x35
+'Can ',    # 0x36
+'Qu ',    # 0x37
+'Quan ',    # 0x38
+'Du ',    # 0x39
+'Can ',    # 0x3a
+'Man ',    # 0x3b
+'Jue ',    # 0x3c
+'Jie ',    # 0x3d
+'Zhu ',    # 0x3e
+'Zha ',    # 0x3f
+'Xie ',    # 0x40
+'Huang ',    # 0x41
+'Niu ',    # 0x42
+'Pei ',    # 0x43
+'Nu ',    # 0x44
+'Xin ',    # 0x45
+'Zhong ',    # 0x46
+'Mo ',    # 0x47
+'Er ',    # 0x48
+'Ke ',    # 0x49
+'Mie ',    # 0x4a
+'Xi ',    # 0x4b
+'Xing ',    # 0x4c
+'Yan ',    # 0x4d
+'Kan ',    # 0x4e
+'Yuan ',    # 0x4f
+'[?] ',    # 0x50
+'Ling ',    # 0x51
+'Xuan ',    # 0x52
+'Shu ',    # 0x53
+'Xian ',    # 0x54
+'Tong ',    # 0x55
+'Long ',    # 0x56
+'Jie ',    # 0x57
+'Xian ',    # 0x58
+'Ya ',    # 0x59
+'Hu ',    # 0x5a
+'Wei ',    # 0x5b
+'Dao ',    # 0x5c
+'Chong ',    # 0x5d
+'Wei ',    # 0x5e
+'Dao ',    # 0x5f
+'Zhun ',    # 0x60
+'Heng ',    # 0x61
+'Qu ',    # 0x62
+'Yi ',    # 0x63
+'Yi ',    # 0x64
+'Bu ',    # 0x65
+'Gan ',    # 0x66
+'Yu ',    # 0x67
+'Biao ',    # 0x68
+'Cha ',    # 0x69
+'Yi ',    # 0x6a
+'Shan ',    # 0x6b
+'Chen ',    # 0x6c
+'Fu ',    # 0x6d
+'Gun ',    # 0x6e
+'Fen ',    # 0x6f
+'Shuai ',    # 0x70
+'Jie ',    # 0x71
+'Na ',    # 0x72
+'Zhong ',    # 0x73
+'Dan ',    # 0x74
+'Ri ',    # 0x75
+'Zhong ',    # 0x76
+'Zhong ',    # 0x77
+'Xie ',    # 0x78
+'Qi ',    # 0x79
+'Xie ',    # 0x7a
+'Ran ',    # 0x7b
+'Zhi ',    # 0x7c
+'Ren ',    # 0x7d
+'Qin ',    # 0x7e
+'Jin ',    # 0x7f
+'Jun ',    # 0x80
+'Yuan ',    # 0x81
+'Mei ',    # 0x82
+'Chai ',    # 0x83
+'Ao ',    # 0x84
+'Niao ',    # 0x85
+'Hui ',    # 0x86
+'Ran ',    # 0x87
+'Jia ',    # 0x88
+'Tuo ',    # 0x89
+'Ling ',    # 0x8a
+'Dai ',    # 0x8b
+'Bao ',    # 0x8c
+'Pao ',    # 0x8d
+'Yao ',    # 0x8e
+'Zuo ',    # 0x8f
+'Bi ',    # 0x90
+'Shao ',    # 0x91
+'Tan ',    # 0x92
+'Ju ',    # 0x93
+'He ',    # 0x94
+'Shu ',    # 0x95
+'Xiu ',    # 0x96
+'Zhen ',    # 0x97
+'Yi ',    # 0x98
+'Pa ',    # 0x99
+'Bo ',    # 0x9a
+'Di ',    # 0x9b
+'Wa ',    # 0x9c
+'Fu ',    # 0x9d
+'Gun ',    # 0x9e
+'Zhi ',    # 0x9f
+'Zhi ',    # 0xa0
+'Ran ',    # 0xa1
+'Pan ',    # 0xa2
+'Yi ',    # 0xa3
+'Mao ',    # 0xa4
+'Tuo ',    # 0xa5
+'Na ',    # 0xa6
+'Kou ',    # 0xa7
+'Xian ',    # 0xa8
+'Chan ',    # 0xa9
+'Qu ',    # 0xaa
+'Bei ',    # 0xab
+'Gun ',    # 0xac
+'Xi ',    # 0xad
+'Ne ',    # 0xae
+'Bo ',    # 0xaf
+'Horo ',    # 0xb0
+'Fu ',    # 0xb1
+'Yi ',    # 0xb2
+'Chi ',    # 0xb3
+'Ku ',    # 0xb4
+'Ren ',    # 0xb5
+'Jiang ',    # 0xb6
+'Jia ',    # 0xb7
+'Cun ',    # 0xb8
+'Mo ',    # 0xb9
+'Jie ',    # 0xba
+'Er ',    # 0xbb
+'Luo ',    # 0xbc
+'Ru ',    # 0xbd
+'Zhu ',    # 0xbe
+'Gui ',    # 0xbf
+'Yin ',    # 0xc0
+'Cai ',    # 0xc1
+'Lie ',    # 0xc2
+'Kamishimo ',    # 0xc3
+'Yuki ',    # 0xc4
+'Zhuang ',    # 0xc5
+'Dang ',    # 0xc6
+'[?] ',    # 0xc7
+'Kun ',    # 0xc8
+'Ken ',    # 0xc9
+'Niao ',    # 0xca
+'Shu ',    # 0xcb
+'Jia ',    # 0xcc
+'Kun ',    # 0xcd
+'Cheng ',    # 0xce
+'Li ',    # 0xcf
+'Juan ',    # 0xd0
+'Shen ',    # 0xd1
+'Pou ',    # 0xd2
+'Ge ',    # 0xd3
+'Yi ',    # 0xd4
+'Yu ',    # 0xd5
+'Zhen ',    # 0xd6
+'Liu ',    # 0xd7
+'Qiu ',    # 0xd8
+'Qun ',    # 0xd9
+'Ji ',    # 0xda
+'Yi ',    # 0xdb
+'Bu ',    # 0xdc
+'Zhuang ',    # 0xdd
+'Shui ',    # 0xde
+'Sha ',    # 0xdf
+'Qun ',    # 0xe0
+'Li ',    # 0xe1
+'Lian ',    # 0xe2
+'Lian ',    # 0xe3
+'Ku ',    # 0xe4
+'Jian ',    # 0xe5
+'Fou ',    # 0xe6
+'Chan ',    # 0xe7
+'Bi ',    # 0xe8
+'Gun ',    # 0xe9
+'Tao ',    # 0xea
+'Yuan ',    # 0xeb
+'Ling ',    # 0xec
+'Chi ',    # 0xed
+'Chang ',    # 0xee
+'Chou ',    # 0xef
+'Duo ',    # 0xf0
+'Biao ',    # 0xf1
+'Liang ',    # 0xf2
+'Chang ',    # 0xf3
+'Pei ',    # 0xf4
+'Pei ',    # 0xf5
+'Fei ',    # 0xf6
+'Yuan ',    # 0xf7
+'Luo ',    # 0xf8
+'Guo ',    # 0xf9
+'Yan ',    # 0xfa
+'Du ',    # 0xfb
+'Xi ',    # 0xfc
+'Zhi ',    # 0xfd
+'Ju ',    # 0xfe
+'Qi ',    # 0xff
+)
diff --git a/lib/unidecode/x089.py b/lib/unidecode/x089.py
new file mode 100644
index 00000000..d23abc3c
--- /dev/null
+++ b/lib/unidecode/x089.py
@@ -0,0 +1,258 @@
+data = (
+'Ji ',    # 0x00
+'Zhi ',    # 0x01
+'Gua ',    # 0x02
+'Ken ',    # 0x03
+'Che ',    # 0x04
+'Ti ',    # 0x05
+'Ti ',    # 0x06
+'Fu ',    # 0x07
+'Chong ',    # 0x08
+'Xie ',    # 0x09
+'Bian ',    # 0x0a
+'Die ',    # 0x0b
+'Kun ',    # 0x0c
+'Duan ',    # 0x0d
+'Xiu ',    # 0x0e
+'Xiu ',    # 0x0f
+'He ',    # 0x10
+'Yuan ',    # 0x11
+'Bao ',    # 0x12
+'Bao ',    # 0x13
+'Fu ',    # 0x14
+'Yu ',    # 0x15
+'Tuan ',    # 0x16
+'Yan ',    # 0x17
+'Hui ',    # 0x18
+'Bei ',    # 0x19
+'Chu ',    # 0x1a
+'Lu ',    # 0x1b
+'Ena ',    # 0x1c
+'Hitoe ',    # 0x1d
+'Yun ',    # 0x1e
+'Da ',    # 0x1f
+'Gou ',    # 0x20
+'Da ',    # 0x21
+'Huai ',    # 0x22
+'Rong ',    # 0x23
+'Yuan ',    # 0x24
+'Ru ',    # 0x25
+'Nai ',    # 0x26
+'Jiong ',    # 0x27
+'Suo ',    # 0x28
+'Ban ',    # 0x29
+'Tun ',    # 0x2a
+'Chi ',    # 0x2b
+'Sang ',    # 0x2c
+'Niao ',    # 0x2d
+'Ying ',    # 0x2e
+'Jie ',    # 0x2f
+'Qian ',    # 0x30
+'Huai ',    # 0x31
+'Ku ',    # 0x32
+'Lian ',    # 0x33
+'Bao ',    # 0x34
+'Li ',    # 0x35
+'Zhe ',    # 0x36
+'Shi ',    # 0x37
+'Lu ',    # 0x38
+'Yi ',    # 0x39
+'Die ',    # 0x3a
+'Xie ',    # 0x3b
+'Xian ',    # 0x3c
+'Wei ',    # 0x3d
+'Biao ',    # 0x3e
+'Cao ',    # 0x3f
+'Ji ',    # 0x40
+'Jiang ',    # 0x41
+'Sen ',    # 0x42
+'Bao ',    # 0x43
+'Xiang ',    # 0x44
+'Chihaya ',    # 0x45
+'Pu ',    # 0x46
+'Jian ',    # 0x47
+'Zhuan ',    # 0x48
+'Jian ',    # 0x49
+'Zui ',    # 0x4a
+'Ji ',    # 0x4b
+'Dan ',    # 0x4c
+'Za ',    # 0x4d
+'Fan ',    # 0x4e
+'Bo ',    # 0x4f
+'Xiang ',    # 0x50
+'Xin ',    # 0x51
+'Bie ',    # 0x52
+'Rao ',    # 0x53
+'Man ',    # 0x54
+'Lan ',    # 0x55
+'Ao ',    # 0x56
+'Duo ',    # 0x57
+'Gui ',    # 0x58
+'Cao ',    # 0x59
+'Sui ',    # 0x5a
+'Nong ',    # 0x5b
+'Chan ',    # 0x5c
+'Lian ',    # 0x5d
+'Bi ',    # 0x5e
+'Jin ',    # 0x5f
+'Dang ',    # 0x60
+'Shu ',    # 0x61
+'Tan ',    # 0x62
+'Bi ',    # 0x63
+'Lan ',    # 0x64
+'Pu ',    # 0x65
+'Ru ',    # 0x66
+'Zhi ',    # 0x67
+'[?] ',    # 0x68
+'Shu ',    # 0x69
+'Wa ',    # 0x6a
+'Shi ',    # 0x6b
+'Bai ',    # 0x6c
+'Xie ',    # 0x6d
+'Bo ',    # 0x6e
+'Chen ',    # 0x6f
+'Lai ',    # 0x70
+'Long ',    # 0x71
+'Xi ',    # 0x72
+'Xian ',    # 0x73
+'Lan ',    # 0x74
+'Zhe ',    # 0x75
+'Dai ',    # 0x76
+'Tasuki ',    # 0x77
+'Zan ',    # 0x78
+'Shi ',    # 0x79
+'Jian ',    # 0x7a
+'Pan ',    # 0x7b
+'Yi ',    # 0x7c
+'Ran ',    # 0x7d
+'Ya ',    # 0x7e
+'Xi ',    # 0x7f
+'Xi ',    # 0x80
+'Yao ',    # 0x81
+'Feng ',    # 0x82
+'Tan ',    # 0x83
+'[?] ',    # 0x84
+'Biao ',    # 0x85
+'Fu ',    # 0x86
+'Ba ',    # 0x87
+'He ',    # 0x88
+'Ji ',    # 0x89
+'Ji ',    # 0x8a
+'Jian ',    # 0x8b
+'Guan ',    # 0x8c
+'Bian ',    # 0x8d
+'Yan ',    # 0x8e
+'Gui ',    # 0x8f
+'Jue ',    # 0x90
+'Pian ',    # 0x91
+'Mao ',    # 0x92
+'Mi ',    # 0x93
+'Mi ',    # 0x94
+'Mie ',    # 0x95
+'Shi ',    # 0x96
+'Si ',    # 0x97
+'Zhan ',    # 0x98
+'Luo ',    # 0x99
+'Jue ',    # 0x9a
+'Mi ',    # 0x9b
+'Tiao ',    # 0x9c
+'Lian ',    # 0x9d
+'Yao ',    # 0x9e
+'Zhi ',    # 0x9f
+'Jun ',    # 0xa0
+'Xi ',    # 0xa1
+'Shan ',    # 0xa2
+'Wei ',    # 0xa3
+'Xi ',    # 0xa4
+'Tian ',    # 0xa5
+'Yu ',    # 0xa6
+'Lan ',    # 0xa7
+'E ',    # 0xa8
+'Du ',    # 0xa9
+'Qin ',    # 0xaa
+'Pang ',    # 0xab
+'Ji ',    # 0xac
+'Ming ',    # 0xad
+'Ying ',    # 0xae
+'Gou ',    # 0xaf
+'Qu ',    # 0xb0
+'Zhan ',    # 0xb1
+'Jin ',    # 0xb2
+'Guan ',    # 0xb3
+'Deng ',    # 0xb4
+'Jian ',    # 0xb5
+'Luo ',    # 0xb6
+'Qu ',    # 0xb7
+'Jian ',    # 0xb8
+'Wei ',    # 0xb9
+'Jue ',    # 0xba
+'Qu ',    # 0xbb
+'Luo ',    # 0xbc
+'Lan ',    # 0xbd
+'Shen ',    # 0xbe
+'Di ',    # 0xbf
+'Guan ',    # 0xc0
+'Jian ',    # 0xc1
+'Guan ',    # 0xc2
+'Yan ',    # 0xc3
+'Gui ',    # 0xc4
+'Mi ',    # 0xc5
+'Shi ',    # 0xc6
+'Zhan ',    # 0xc7
+'Lan ',    # 0xc8
+'Jue ',    # 0xc9
+'Ji ',    # 0xca
+'Xi ',    # 0xcb
+'Di ',    # 0xcc
+'Tian ',    # 0xcd
+'Yu ',    # 0xce
+'Gou ',    # 0xcf
+'Jin ',    # 0xd0
+'Qu ',    # 0xd1
+'Jiao ',    # 0xd2
+'Jiu ',    # 0xd3
+'Jin ',    # 0xd4
+'Cu ',    # 0xd5
+'Jue ',    # 0xd6
+'Zhi ',    # 0xd7
+'Chao ',    # 0xd8
+'Ji ',    # 0xd9
+'Gu ',    # 0xda
+'Dan ',    # 0xdb
+'Zui ',    # 0xdc
+'Di ',    # 0xdd
+'Shang ',    # 0xde
+'Hua ',    # 0xdf
+'Quan ',    # 0xe0
+'Ge ',    # 0xe1
+'Chi ',    # 0xe2
+'Jie ',    # 0xe3
+'Gui ',    # 0xe4
+'Gong ',    # 0xe5
+'Hong ',    # 0xe6
+'Jie ',    # 0xe7
+'Hun ',    # 0xe8
+'Qiu ',    # 0xe9
+'Xing ',    # 0xea
+'Su ',    # 0xeb
+'Ni ',    # 0xec
+'Ji ',    # 0xed
+'Lu ',    # 0xee
+'Zhi ',    # 0xef
+'Zha ',    # 0xf0
+'Bi ',    # 0xf1
+'Xing ',    # 0xf2
+'Hu ',    # 0xf3
+'Shang ',    # 0xf4
+'Gong ',    # 0xf5
+'Zhi ',    # 0xf6
+'Xue ',    # 0xf7
+'Chu ',    # 0xf8
+'Xi ',    # 0xf9
+'Yi ',    # 0xfa
+'Lu ',    # 0xfb
+'Jue ',    # 0xfc
+'Xi ',    # 0xfd
+'Yan ',    # 0xfe
+'Xi ',    # 0xff
+)
diff --git a/lib/unidecode/x08a.py b/lib/unidecode/x08a.py
new file mode 100644
index 00000000..0b0fa0a6
--- /dev/null
+++ b/lib/unidecode/x08a.py
@@ -0,0 +1,258 @@
+data = (
+'Yan ',    # 0x00
+'Yan ',    # 0x01
+'Ding ',    # 0x02
+'Fu ',    # 0x03
+'Qiu ',    # 0x04
+'Qiu ',    # 0x05
+'Jiao ',    # 0x06
+'Hong ',    # 0x07
+'Ji ',    # 0x08
+'Fan ',    # 0x09
+'Xun ',    # 0x0a
+'Diao ',    # 0x0b
+'Hong ',    # 0x0c
+'Cha ',    # 0x0d
+'Tao ',    # 0x0e
+'Xu ',    # 0x0f
+'Jie ',    # 0x10
+'Yi ',    # 0x11
+'Ren ',    # 0x12
+'Xun ',    # 0x13
+'Yin ',    # 0x14
+'Shan ',    # 0x15
+'Qi ',    # 0x16
+'Tuo ',    # 0x17
+'Ji ',    # 0x18
+'Xun ',    # 0x19
+'Yin ',    # 0x1a
+'E ',    # 0x1b
+'Fen ',    # 0x1c
+'Ya ',    # 0x1d
+'Yao ',    # 0x1e
+'Song ',    # 0x1f
+'Shen ',    # 0x20
+'Yin ',    # 0x21
+'Xin ',    # 0x22
+'Jue ',    # 0x23
+'Xiao ',    # 0x24
+'Ne ',    # 0x25
+'Chen ',    # 0x26
+'You ',    # 0x27
+'Zhi ',    # 0x28
+'Xiong ',    # 0x29
+'Fang ',    # 0x2a
+'Xin ',    # 0x2b
+'Chao ',    # 0x2c
+'She ',    # 0x2d
+'Xian ',    # 0x2e
+'Sha ',    # 0x2f
+'Tun ',    # 0x30
+'Xu ',    # 0x31
+'Yi ',    # 0x32
+'Yi ',    # 0x33
+'Su ',    # 0x34
+'Chi ',    # 0x35
+'He ',    # 0x36
+'Shen ',    # 0x37
+'He ',    # 0x38
+'Xu ',    # 0x39
+'Zhen ',    # 0x3a
+'Zhu ',    # 0x3b
+'Zheng ',    # 0x3c
+'Gou ',    # 0x3d
+'Zi ',    # 0x3e
+'Zi ',    # 0x3f
+'Zhan ',    # 0x40
+'Gu ',    # 0x41
+'Fu ',    # 0x42
+'Quan ',    # 0x43
+'Die ',    # 0x44
+'Ling ',    # 0x45
+'Di ',    # 0x46
+'Yang ',    # 0x47
+'Li ',    # 0x48
+'Nao ',    # 0x49
+'Pan ',    # 0x4a
+'Zhou ',    # 0x4b
+'Gan ',    # 0x4c
+'Yi ',    # 0x4d
+'Ju ',    # 0x4e
+'Ao ',    # 0x4f
+'Zha ',    # 0x50
+'Tuo ',    # 0x51
+'Yi ',    # 0x52
+'Qu ',    # 0x53
+'Zhao ',    # 0x54
+'Ping ',    # 0x55
+'Bi ',    # 0x56
+'Xiong ',    # 0x57
+'Qu ',    # 0x58
+'Ba ',    # 0x59
+'Da ',    # 0x5a
+'Zu ',    # 0x5b
+'Tao ',    # 0x5c
+'Zhu ',    # 0x5d
+'Ci ',    # 0x5e
+'Zhe ',    # 0x5f
+'Yong ',    # 0x60
+'Xu ',    # 0x61
+'Xun ',    # 0x62
+'Yi ',    # 0x63
+'Huang ',    # 0x64
+'He ',    # 0x65
+'Shi ',    # 0x66
+'Cha ',    # 0x67
+'Jiao ',    # 0x68
+'Shi ',    # 0x69
+'Hen ',    # 0x6a
+'Cha ',    # 0x6b
+'Gou ',    # 0x6c
+'Gui ',    # 0x6d
+'Quan ',    # 0x6e
+'Hui ',    # 0x6f
+'Jie ',    # 0x70
+'Hua ',    # 0x71
+'Gai ',    # 0x72
+'Xiang ',    # 0x73
+'Wei ',    # 0x74
+'Shen ',    # 0x75
+'Chou ',    # 0x76
+'Tong ',    # 0x77
+'Mi ',    # 0x78
+'Zhan ',    # 0x79
+'Ming ',    # 0x7a
+'E ',    # 0x7b
+'Hui ',    # 0x7c
+'Yan ',    # 0x7d
+'Xiong ',    # 0x7e
+'Gua ',    # 0x7f
+'Er ',    # 0x80
+'Beng ',    # 0x81
+'Tiao ',    # 0x82
+'Chi ',    # 0x83
+'Lei ',    # 0x84
+'Zhu ',    # 0x85
+'Kuang ',    # 0x86
+'Kua ',    # 0x87
+'Wu ',    # 0x88
+'Yu ',    # 0x89
+'Teng ',    # 0x8a
+'Ji ',    # 0x8b
+'Zhi ',    # 0x8c
+'Ren ',    # 0x8d
+'Su ',    # 0x8e
+'Lang ',    # 0x8f
+'E ',    # 0x90
+'Kuang ',    # 0x91
+'E ',    # 0x92
+'Shi ',    # 0x93
+'Ting ',    # 0x94
+'Dan ',    # 0x95
+'Bo ',    # 0x96
+'Chan ',    # 0x97
+'You ',    # 0x98
+'Heng ',    # 0x99
+'Qiao ',    # 0x9a
+'Qin ',    # 0x9b
+'Shua ',    # 0x9c
+'An ',    # 0x9d
+'Yu ',    # 0x9e
+'Xiao ',    # 0x9f
+'Cheng ',    # 0xa0
+'Jie ',    # 0xa1
+'Xian ',    # 0xa2
+'Wu ',    # 0xa3
+'Wu ',    # 0xa4
+'Gao ',    # 0xa5
+'Song ',    # 0xa6
+'Pu ',    # 0xa7
+'Hui ',    # 0xa8
+'Jing ',    # 0xa9
+'Shuo ',    # 0xaa
+'Zhen ',    # 0xab
+'Shuo ',    # 0xac
+'Du ',    # 0xad
+'Yasashi ',    # 0xae
+'Chang ',    # 0xaf
+'Shui ',    # 0xb0
+'Jie ',    # 0xb1
+'Ke ',    # 0xb2
+'Qu ',    # 0xb3
+'Cong ',    # 0xb4
+'Xiao ',    # 0xb5
+'Sui ',    # 0xb6
+'Wang ',    # 0xb7
+'Xuan ',    # 0xb8
+'Fei ',    # 0xb9
+'Chi ',    # 0xba
+'Ta ',    # 0xbb
+'Yi ',    # 0xbc
+'Na ',    # 0xbd
+'Yin ',    # 0xbe
+'Diao ',    # 0xbf
+'Pi ',    # 0xc0
+'Chuo ',    # 0xc1
+'Chan ',    # 0xc2
+'Chen ',    # 0xc3
+'Zhun ',    # 0xc4
+'Ji ',    # 0xc5
+'Qi ',    # 0xc6
+'Tan ',    # 0xc7
+'Zhui ',    # 0xc8
+'Wei ',    # 0xc9
+'Ju ',    # 0xca
+'Qing ',    # 0xcb
+'Jian ',    # 0xcc
+'Zheng ',    # 0xcd
+'Ze ',    # 0xce
+'Zou ',    # 0xcf
+'Qian ',    # 0xd0
+'Zhuo ',    # 0xd1
+'Liang ',    # 0xd2
+'Jian ',    # 0xd3
+'Zhu ',    # 0xd4
+'Hao ',    # 0xd5
+'Lun ',    # 0xd6
+'Shen ',    # 0xd7
+'Biao ',    # 0xd8
+'Huai ',    # 0xd9
+'Pian ',    # 0xda
+'Yu ',    # 0xdb
+'Die ',    # 0xdc
+'Xu ',    # 0xdd
+'Pian ',    # 0xde
+'Shi ',    # 0xdf
+'Xuan ',    # 0xe0
+'Shi ',    # 0xe1
+'Hun ',    # 0xe2
+'Hua ',    # 0xe3
+'E ',    # 0xe4
+'Zhong ',    # 0xe5
+'Di ',    # 0xe6
+'Xie ',    # 0xe7
+'Fu ',    # 0xe8
+'Pu ',    # 0xe9
+'Ting ',    # 0xea
+'Jian ',    # 0xeb
+'Qi ',    # 0xec
+'Yu ',    # 0xed
+'Zi ',    # 0xee
+'Chuan ',    # 0xef
+'Xi ',    # 0xf0
+'Hui ',    # 0xf1
+'Yin ',    # 0xf2
+'An ',    # 0xf3
+'Xian ',    # 0xf4
+'Nan ',    # 0xf5
+'Chen ',    # 0xf6
+'Feng ',    # 0xf7
+'Zhu ',    # 0xf8
+'Yang ',    # 0xf9
+'Yan ',    # 0xfa
+'Heng ',    # 0xfb
+'Xuan ',    # 0xfc
+'Ge ',    # 0xfd
+'Nuo ',    # 0xfe
+'Qi ',    # 0xff
+)
diff --git a/lib/unidecode/x08b.py b/lib/unidecode/x08b.py
new file mode 100644
index 00000000..b89c37a2
--- /dev/null
+++ b/lib/unidecode/x08b.py
@@ -0,0 +1,258 @@
+data = (
+'Mou ',    # 0x00
+'Ye ',    # 0x01
+'Wei ',    # 0x02
+'[?] ',    # 0x03
+'Teng ',    # 0x04
+'Zou ',    # 0x05
+'Shan ',    # 0x06
+'Jian ',    # 0x07
+'Bo ',    # 0x08
+'Ku ',    # 0x09
+'Huang ',    # 0x0a
+'Huo ',    # 0x0b
+'Ge ',    # 0x0c
+'Ying ',    # 0x0d
+'Mi ',    # 0x0e
+'Xiao ',    # 0x0f
+'Mi ',    # 0x10
+'Xi ',    # 0x11
+'Qiang ',    # 0x12
+'Chen ',    # 0x13
+'Nue ',    # 0x14
+'Ti ',    # 0x15
+'Su ',    # 0x16
+'Bang ',    # 0x17
+'Chi ',    # 0x18
+'Qian ',    # 0x19
+'Shi ',    # 0x1a
+'Jiang ',    # 0x1b
+'Yuan ',    # 0x1c
+'Xie ',    # 0x1d
+'Xue ',    # 0x1e
+'Tao ',    # 0x1f
+'Yao ',    # 0x20
+'Yao ',    # 0x21
+'[?] ',    # 0x22
+'Yu ',    # 0x23
+'Biao ',    # 0x24
+'Cong ',    # 0x25
+'Qing ',    # 0x26
+'Li ',    # 0x27
+'Mo ',    # 0x28
+'Mo ',    # 0x29
+'Shang ',    # 0x2a
+'Zhe ',    # 0x2b
+'Miu ',    # 0x2c
+'Jian ',    # 0x2d
+'Ze ',    # 0x2e
+'Jie ',    # 0x2f
+'Lian ',    # 0x30
+'Lou ',    # 0x31
+'Can ',    # 0x32
+'Ou ',    # 0x33
+'Guan ',    # 0x34
+'Xi ',    # 0x35
+'Zhuo ',    # 0x36
+'Ao ',    # 0x37
+'Ao ',    # 0x38
+'Jin ',    # 0x39
+'Zhe ',    # 0x3a
+'Yi ',    # 0x3b
+'Hu ',    # 0x3c
+'Jiang ',    # 0x3d
+'Man ',    # 0x3e
+'Chao ',    # 0x3f
+'Han ',    # 0x40
+'Hua ',    # 0x41
+'Chan ',    # 0x42
+'Xu ',    # 0x43
+'Zeng ',    # 0x44
+'Se ',    # 0x45
+'Xi ',    # 0x46
+'She ',    # 0x47
+'Dui ',    # 0x48
+'Zheng ',    # 0x49
+'Nao ',    # 0x4a
+'Lan ',    # 0x4b
+'E ',    # 0x4c
+'Ying ',    # 0x4d
+'Jue ',    # 0x4e
+'Ji ',    # 0x4f
+'Zun ',    # 0x50
+'Jiao ',    # 0x51
+'Bo ',    # 0x52
+'Hui ',    # 0x53
+'Zhuan ',    # 0x54
+'Mu ',    # 0x55
+'Zen ',    # 0x56
+'Zha ',    # 0x57
+'Shi ',    # 0x58
+'Qiao ',    # 0x59
+'Tan ',    # 0x5a
+'Zen ',    # 0x5b
+'Pu ',    # 0x5c
+'Sheng ',    # 0x5d
+'Xuan ',    # 0x5e
+'Zao ',    # 0x5f
+'Tan ',    # 0x60
+'Dang ',    # 0x61
+'Sui ',    # 0x62
+'Qian ',    # 0x63
+'Ji ',    # 0x64
+'Jiao ',    # 0x65
+'Jing ',    # 0x66
+'Lian ',    # 0x67
+'Nou ',    # 0x68
+'Yi ',    # 0x69
+'Ai ',    # 0x6a
+'Zhan ',    # 0x6b
+'Pi ',    # 0x6c
+'Hui ',    # 0x6d
+'Hua ',    # 0x6e
+'Yi ',    # 0x6f
+'Yi ',    # 0x70
+'Shan ',    # 0x71
+'Rang ',    # 0x72
+'Nou ',    # 0x73
+'Qian ',    # 0x74
+'Zhui ',    # 0x75
+'Ta ',    # 0x76
+'Hu ',    # 0x77
+'Zhou ',    # 0x78
+'Hao ',    # 0x79
+'Ye ',    # 0x7a
+'Ying ',    # 0x7b
+'Jian ',    # 0x7c
+'Yu ',    # 0x7d
+'Jian ',    # 0x7e
+'Hui ',    # 0x7f
+'Du ',    # 0x80
+'Zhe ',    # 0x81
+'Xuan ',    # 0x82
+'Zan ',    # 0x83
+'Lei ',    # 0x84
+'Shen ',    # 0x85
+'Wei ',    # 0x86
+'Chan ',    # 0x87
+'Li ',    # 0x88
+'Yi ',    # 0x89
+'Bian ',    # 0x8a
+'Zhe ',    # 0x8b
+'Yan ',    # 0x8c
+'E ',    # 0x8d
+'Chou ',    # 0x8e
+'Wei ',    # 0x8f
+'Chou ',    # 0x90
+'Yao ',    # 0x91
+'Chan ',    # 0x92
+'Rang ',    # 0x93
+'Yin ',    # 0x94
+'Lan ',    # 0x95
+'Chen ',    # 0x96
+'Huo ',    # 0x97
+'Zhe ',    # 0x98
+'Huan ',    # 0x99
+'Zan ',    # 0x9a
+'Yi ',    # 0x9b
+'Dang ',    # 0x9c
+'Zhan ',    # 0x9d
+'Yan ',    # 0x9e
+'Du ',    # 0x9f
+'Yan ',    # 0xa0
+'Ji ',    # 0xa1
+'Ding ',    # 0xa2
+'Fu ',    # 0xa3
+'Ren ',    # 0xa4
+'Ji ',    # 0xa5
+'Jie ',    # 0xa6
+'Hong ',    # 0xa7
+'Tao ',    # 0xa8
+'Rang ',    # 0xa9
+'Shan ',    # 0xaa
+'Qi ',    # 0xab
+'Tuo ',    # 0xac
+'Xun ',    # 0xad
+'Yi ',    # 0xae
+'Xun ',    # 0xaf
+'Ji ',    # 0xb0
+'Ren ',    # 0xb1
+'Jiang ',    # 0xb2
+'Hui ',    # 0xb3
+'Ou ',    # 0xb4
+'Ju ',    # 0xb5
+'Ya ',    # 0xb6
+'Ne ',    # 0xb7
+'Xu ',    # 0xb8
+'E ',    # 0xb9
+'Lun ',    # 0xba
+'Xiong ',    # 0xbb
+'Song ',    # 0xbc
+'Feng ',    # 0xbd
+'She ',    # 0xbe
+'Fang ',    # 0xbf
+'Jue ',    # 0xc0
+'Zheng ',    # 0xc1
+'Gu ',    # 0xc2
+'He ',    # 0xc3
+'Ping ',    # 0xc4
+'Zu ',    # 0xc5
+'Shi ',    # 0xc6
+'Xiong ',    # 0xc7
+'Zha ',    # 0xc8
+'Su ',    # 0xc9
+'Zhen ',    # 0xca
+'Di ',    # 0xcb
+'Zou ',    # 0xcc
+'Ci ',    # 0xcd
+'Qu ',    # 0xce
+'Zhao ',    # 0xcf
+'Bi ',    # 0xd0
+'Yi ',    # 0xd1
+'Yi ',    # 0xd2
+'Kuang ',    # 0xd3
+'Lei ',    # 0xd4
+'Shi ',    # 0xd5
+'Gua ',    # 0xd6
+'Shi ',    # 0xd7
+'Jie ',    # 0xd8
+'Hui ',    # 0xd9
+'Cheng ',    # 0xda
+'Zhu ',    # 0xdb
+'Shen ',    # 0xdc
+'Hua ',    # 0xdd
+'Dan ',    # 0xde
+'Gou ',    # 0xdf
+'Quan ',    # 0xe0
+'Gui ',    # 0xe1
+'Xun ',    # 0xe2
+'Yi ',    # 0xe3
+'Zheng ',    # 0xe4
+'Gai ',    # 0xe5
+'Xiang ',    # 0xe6
+'Cha ',    # 0xe7
+'Hun ',    # 0xe8
+'Xu ',    # 0xe9
+'Zhou ',    # 0xea
+'Jie ',    # 0xeb
+'Wu ',    # 0xec
+'Yu ',    # 0xed
+'Qiao ',    # 0xee
+'Wu ',    # 0xef
+'Gao ',    # 0xf0
+'You ',    # 0xf1
+'Hui ',    # 0xf2
+'Kuang ',    # 0xf3
+'Shuo ',    # 0xf4
+'Song ',    # 0xf5
+'Ai ',    # 0xf6
+'Qing ',    # 0xf7
+'Zhu ',    # 0xf8
+'Zou ',    # 0xf9
+'Nuo ',    # 0xfa
+'Du ',    # 0xfb
+'Zhuo ',    # 0xfc
+'Fei ',    # 0xfd
+'Ke ',    # 0xfe
+'Wei ',    # 0xff
+)
diff --git a/lib/unidecode/x08c.py b/lib/unidecode/x08c.py
new file mode 100644
index 00000000..514c446b
--- /dev/null
+++ b/lib/unidecode/x08c.py
@@ -0,0 +1,258 @@
+data = (
+'Yu ',    # 0x00
+'Shui ',    # 0x01
+'Shen ',    # 0x02
+'Diao ',    # 0x03
+'Chan ',    # 0x04
+'Liang ',    # 0x05
+'Zhun ',    # 0x06
+'Sui ',    # 0x07
+'Tan ',    # 0x08
+'Shen ',    # 0x09
+'Yi ',    # 0x0a
+'Mou ',    # 0x0b
+'Chen ',    # 0x0c
+'Die ',    # 0x0d
+'Huang ',    # 0x0e
+'Jian ',    # 0x0f
+'Xie ',    # 0x10
+'Nue ',    # 0x11
+'Ye ',    # 0x12
+'Wei ',    # 0x13
+'E ',    # 0x14
+'Yu ',    # 0x15
+'Xuan ',    # 0x16
+'Chan ',    # 0x17
+'Zi ',    # 0x18
+'An ',    # 0x19
+'Yan ',    # 0x1a
+'Di ',    # 0x1b
+'Mi ',    # 0x1c
+'Pian ',    # 0x1d
+'Xu ',    # 0x1e
+'Mo ',    # 0x1f
+'Dang ',    # 0x20
+'Su ',    # 0x21
+'Xie ',    # 0x22
+'Yao ',    # 0x23
+'Bang ',    # 0x24
+'Shi ',    # 0x25
+'Qian ',    # 0x26
+'Mi ',    # 0x27
+'Jin ',    # 0x28
+'Man ',    # 0x29
+'Zhe ',    # 0x2a
+'Jian ',    # 0x2b
+'Miu ',    # 0x2c
+'Tan ',    # 0x2d
+'Zen ',    # 0x2e
+'Qiao ',    # 0x2f
+'Lan ',    # 0x30
+'Pu ',    # 0x31
+'Jue ',    # 0x32
+'Yan ',    # 0x33
+'Qian ',    # 0x34
+'Zhan ',    # 0x35
+'Chen ',    # 0x36
+'Gu ',    # 0x37
+'Qian ',    # 0x38
+'Hong ',    # 0x39
+'Xia ',    # 0x3a
+'Jue ',    # 0x3b
+'Hong ',    # 0x3c
+'Han ',    # 0x3d
+'Hong ',    # 0x3e
+'Xi ',    # 0x3f
+'Xi ',    # 0x40
+'Huo ',    # 0x41
+'Liao ',    # 0x42
+'Han ',    # 0x43
+'Du ',    # 0x44
+'Long ',    # 0x45
+'Dou ',    # 0x46
+'Jiang ',    # 0x47
+'Qi ',    # 0x48
+'Shi ',    # 0x49
+'Li ',    # 0x4a
+'Deng ',    # 0x4b
+'Wan ',    # 0x4c
+'Bi ',    # 0x4d
+'Shu ',    # 0x4e
+'Xian ',    # 0x4f
+'Feng ',    # 0x50
+'Zhi ',    # 0x51
+'Zhi ',    # 0x52
+'Yan ',    # 0x53
+'Yan ',    # 0x54
+'Shi ',    # 0x55
+'Chu ',    # 0x56
+'Hui ',    # 0x57
+'Tun ',    # 0x58
+'Yi ',    # 0x59
+'Tun ',    # 0x5a
+'Yi ',    # 0x5b
+'Jian ',    # 0x5c
+'Ba ',    # 0x5d
+'Hou ',    # 0x5e
+'E ',    # 0x5f
+'Cu ',    # 0x60
+'Xiang ',    # 0x61
+'Huan ',    # 0x62
+'Jian ',    # 0x63
+'Ken ',    # 0x64
+'Gai ',    # 0x65
+'Qu ',    # 0x66
+'Fu ',    # 0x67
+'Xi ',    # 0x68
+'Bin ',    # 0x69
+'Hao ',    # 0x6a
+'Yu ',    # 0x6b
+'Zhu ',    # 0x6c
+'Jia ',    # 0x6d
+'[?] ',    # 0x6e
+'Xi ',    # 0x6f
+'Bo ',    # 0x70
+'Wen ',    # 0x71
+'Huan ',    # 0x72
+'Bin ',    # 0x73
+'Di ',    # 0x74
+'Zong ',    # 0x75
+'Fen ',    # 0x76
+'Yi ',    # 0x77
+'Zhi ',    # 0x78
+'Bao ',    # 0x79
+'Chai ',    # 0x7a
+'Han ',    # 0x7b
+'Pi ',    # 0x7c
+'Na ',    # 0x7d
+'Pi ',    # 0x7e
+'Gou ',    # 0x7f
+'Na ',    # 0x80
+'You ',    # 0x81
+'Diao ',    # 0x82
+'Mo ',    # 0x83
+'Si ',    # 0x84
+'Xiu ',    # 0x85
+'Huan ',    # 0x86
+'Kun ',    # 0x87
+'He ',    # 0x88
+'He ',    # 0x89
+'Mo ',    # 0x8a
+'Han ',    # 0x8b
+'Mao ',    # 0x8c
+'Li ',    # 0x8d
+'Ni ',    # 0x8e
+'Bi ',    # 0x8f
+'Yu ',    # 0x90
+'Jia ',    # 0x91
+'Tuan ',    # 0x92
+'Mao ',    # 0x93
+'Pi ',    # 0x94
+'Xi ',    # 0x95
+'E ',    # 0x96
+'Ju ',    # 0x97
+'Mo ',    # 0x98
+'Chu ',    # 0x99
+'Tan ',    # 0x9a
+'Huan ',    # 0x9b
+'Jue ',    # 0x9c
+'Bei ',    # 0x9d
+'Zhen ',    # 0x9e
+'Yuan ',    # 0x9f
+'Fu ',    # 0xa0
+'Cai ',    # 0xa1
+'Gong ',    # 0xa2
+'Te ',    # 0xa3
+'Yi ',    # 0xa4
+'Hang ',    # 0xa5
+'Wan ',    # 0xa6
+'Pin ',    # 0xa7
+'Huo ',    # 0xa8
+'Fan ',    # 0xa9
+'Tan ',    # 0xaa
+'Guan ',    # 0xab
+'Ze ',    # 0xac
+'Zhi ',    # 0xad
+'Er ',    # 0xae
+'Zhu ',    # 0xaf
+'Shi ',    # 0xb0
+'Bi ',    # 0xb1
+'Zi ',    # 0xb2
+'Er ',    # 0xb3
+'Gui ',    # 0xb4
+'Pian ',    # 0xb5
+'Bian ',    # 0xb6
+'Mai ',    # 0xb7
+'Dai ',    # 0xb8
+'Sheng ',    # 0xb9
+'Kuang ',    # 0xba
+'Fei ',    # 0xbb
+'Tie ',    # 0xbc
+'Yi ',    # 0xbd
+'Chi ',    # 0xbe
+'Mao ',    # 0xbf
+'He ',    # 0xc0
+'Bi ',    # 0xc1
+'Lu ',    # 0xc2
+'Ren ',    # 0xc3
+'Hui ',    # 0xc4
+'Gai ',    # 0xc5
+'Pian ',    # 0xc6
+'Zi ',    # 0xc7
+'Jia ',    # 0xc8
+'Xu ',    # 0xc9
+'Zei ',    # 0xca
+'Jiao ',    # 0xcb
+'Gai ',    # 0xcc
+'Zang ',    # 0xcd
+'Jian ',    # 0xce
+'Ying ',    # 0xcf
+'Xun ',    # 0xd0
+'Zhen ',    # 0xd1
+'She ',    # 0xd2
+'Bin ',    # 0xd3
+'Bin ',    # 0xd4
+'Qiu ',    # 0xd5
+'She ',    # 0xd6
+'Chuan ',    # 0xd7
+'Zang ',    # 0xd8
+'Zhou ',    # 0xd9
+'Lai ',    # 0xda
+'Zan ',    # 0xdb
+'Si ',    # 0xdc
+'Chen ',    # 0xdd
+'Shang ',    # 0xde
+'Tian ',    # 0xdf
+'Pei ',    # 0xe0
+'Geng ',    # 0xe1
+'Xian ',    # 0xe2
+'Mai ',    # 0xe3
+'Jian ',    # 0xe4
+'Sui ',    # 0xe5
+'Fu ',    # 0xe6
+'Tan ',    # 0xe7
+'Cong ',    # 0xe8
+'Cong ',    # 0xe9
+'Zhi ',    # 0xea
+'Ji ',    # 0xeb
+'Zhang ',    # 0xec
+'Du ',    # 0xed
+'Jin ',    # 0xee
+'Xiong ',    # 0xef
+'Shun ',    # 0xf0
+'Yun ',    # 0xf1
+'Bao ',    # 0xf2
+'Zai ',    # 0xf3
+'Lai ',    # 0xf4
+'Feng ',    # 0xf5
+'Cang ',    # 0xf6
+'Ji ',    # 0xf7
+'Sheng ',    # 0xf8
+'Ai ',    # 0xf9
+'Zhuan ',    # 0xfa
+'Fu ',    # 0xfb
+'Gou ',    # 0xfc
+'Sai ',    # 0xfd
+'Ze ',    # 0xfe
+'Liao ',    # 0xff
+)
diff --git a/lib/unidecode/x08d.py b/lib/unidecode/x08d.py
new file mode 100644
index 00000000..ae63f226
--- /dev/null
+++ b/lib/unidecode/x08d.py
@@ -0,0 +1,258 @@
+data = (
+'Wei ',    # 0x00
+'Bai ',    # 0x01
+'Chen ',    # 0x02
+'Zhuan ',    # 0x03
+'Zhi ',    # 0x04
+'Zhui ',    # 0x05
+'Biao ',    # 0x06
+'Yun ',    # 0x07
+'Zeng ',    # 0x08
+'Tan ',    # 0x09
+'Zan ',    # 0x0a
+'Yan ',    # 0x0b
+'[?] ',    # 0x0c
+'Shan ',    # 0x0d
+'Wan ',    # 0x0e
+'Ying ',    # 0x0f
+'Jin ',    # 0x10
+'Gan ',    # 0x11
+'Xian ',    # 0x12
+'Zang ',    # 0x13
+'Bi ',    # 0x14
+'Du ',    # 0x15
+'Shu ',    # 0x16
+'Yan ',    # 0x17
+'[?] ',    # 0x18
+'Xuan ',    # 0x19
+'Long ',    # 0x1a
+'Gan ',    # 0x1b
+'Zang ',    # 0x1c
+'Bei ',    # 0x1d
+'Zhen ',    # 0x1e
+'Fu ',    # 0x1f
+'Yuan ',    # 0x20
+'Gong ',    # 0x21
+'Cai ',    # 0x22
+'Ze ',    # 0x23
+'Xian ',    # 0x24
+'Bai ',    # 0x25
+'Zhang ',    # 0x26
+'Huo ',    # 0x27
+'Zhi ',    # 0x28
+'Fan ',    # 0x29
+'Tan ',    # 0x2a
+'Pin ',    # 0x2b
+'Bian ',    # 0x2c
+'Gou ',    # 0x2d
+'Zhu ',    # 0x2e
+'Guan ',    # 0x2f
+'Er ',    # 0x30
+'Jian ',    # 0x31
+'Bi ',    # 0x32
+'Shi ',    # 0x33
+'Tie ',    # 0x34
+'Gui ',    # 0x35
+'Kuang ',    # 0x36
+'Dai ',    # 0x37
+'Mao ',    # 0x38
+'Fei ',    # 0x39
+'He ',    # 0x3a
+'Yi ',    # 0x3b
+'Zei ',    # 0x3c
+'Zhi ',    # 0x3d
+'Jia ',    # 0x3e
+'Hui ',    # 0x3f
+'Zi ',    # 0x40
+'Ren ',    # 0x41
+'Lu ',    # 0x42
+'Zang ',    # 0x43
+'Zi ',    # 0x44
+'Gai ',    # 0x45
+'Jin ',    # 0x46
+'Qiu ',    # 0x47
+'Zhen ',    # 0x48
+'Lai ',    # 0x49
+'She ',    # 0x4a
+'Fu ',    # 0x4b
+'Du ',    # 0x4c
+'Ji ',    # 0x4d
+'Shu ',    # 0x4e
+'Shang ',    # 0x4f
+'Si ',    # 0x50
+'Bi ',    # 0x51
+'Zhou ',    # 0x52
+'Geng ',    # 0x53
+'Pei ',    # 0x54
+'Tan ',    # 0x55
+'Lai ',    # 0x56
+'Feng ',    # 0x57
+'Zhui ',    # 0x58
+'Fu ',    # 0x59
+'Zhuan ',    # 0x5a
+'Sai ',    # 0x5b
+'Ze ',    # 0x5c
+'Yan ',    # 0x5d
+'Zan ',    # 0x5e
+'Yun ',    # 0x5f
+'Zeng ',    # 0x60
+'Shan ',    # 0x61
+'Ying ',    # 0x62
+'Gan ',    # 0x63
+'Chi ',    # 0x64
+'Xi ',    # 0x65
+'She ',    # 0x66
+'Nan ',    # 0x67
+'Xiong ',    # 0x68
+'Xi ',    # 0x69
+'Cheng ',    # 0x6a
+'He ',    # 0x6b
+'Cheng ',    # 0x6c
+'Zhe ',    # 0x6d
+'Xia ',    # 0x6e
+'Tang ',    # 0x6f
+'Zou ',    # 0x70
+'Zou ',    # 0x71
+'Li ',    # 0x72
+'Jiu ',    # 0x73
+'Fu ',    # 0x74
+'Zhao ',    # 0x75
+'Gan ',    # 0x76
+'Qi ',    # 0x77
+'Shan ',    # 0x78
+'Qiong ',    # 0x79
+'Qin ',    # 0x7a
+'Xian ',    # 0x7b
+'Ci ',    # 0x7c
+'Jue ',    # 0x7d
+'Qin ',    # 0x7e
+'Chi ',    # 0x7f
+'Ci ',    # 0x80
+'Chen ',    # 0x81
+'Chen ',    # 0x82
+'Die ',    # 0x83
+'Ju ',    # 0x84
+'Chao ',    # 0x85
+'Di ',    # 0x86
+'Se ',    # 0x87
+'Zhan ',    # 0x88
+'Zhu ',    # 0x89
+'Yue ',    # 0x8a
+'Qu ',    # 0x8b
+'Jie ',    # 0x8c
+'Chi ',    # 0x8d
+'Chu ',    # 0x8e
+'Gua ',    # 0x8f
+'Xue ',    # 0x90
+'Ci ',    # 0x91
+'Tiao ',    # 0x92
+'Duo ',    # 0x93
+'Lie ',    # 0x94
+'Gan ',    # 0x95
+'Suo ',    # 0x96
+'Cu ',    # 0x97
+'Xi ',    # 0x98
+'Zhao ',    # 0x99
+'Su ',    # 0x9a
+'Yin ',    # 0x9b
+'Ju ',    # 0x9c
+'Jian ',    # 0x9d
+'Que ',    # 0x9e
+'Tang ',    # 0x9f
+'Chuo ',    # 0xa0
+'Cui ',    # 0xa1
+'Lu ',    # 0xa2
+'Qu ',    # 0xa3
+'Dang ',    # 0xa4
+'Qiu ',    # 0xa5
+'Zi ',    # 0xa6
+'Ti ',    # 0xa7
+'Qu ',    # 0xa8
+'Chi ',    # 0xa9
+'Huang ',    # 0xaa
+'Qiao ',    # 0xab
+'Qiao ',    # 0xac
+'Yao ',    # 0xad
+'Zao ',    # 0xae
+'Ti ',    # 0xaf
+'[?] ',    # 0xb0
+'Zan ',    # 0xb1
+'Zan ',    # 0xb2
+'Zu ',    # 0xb3
+'Pa ',    # 0xb4
+'Bao ',    # 0xb5
+'Ku ',    # 0xb6
+'Ke ',    # 0xb7
+'Dun ',    # 0xb8
+'Jue ',    # 0xb9
+'Fu ',    # 0xba
+'Chen ',    # 0xbb
+'Jian ',    # 0xbc
+'Fang ',    # 0xbd
+'Zhi ',    # 0xbe
+'Sa ',    # 0xbf
+'Yue ',    # 0xc0
+'Pa ',    # 0xc1
+'Qi ',    # 0xc2
+'Yue ',    # 0xc3
+'Qiang ',    # 0xc4
+'Tuo ',    # 0xc5
+'Tai ',    # 0xc6
+'Yi ',    # 0xc7
+'Nian ',    # 0xc8
+'Ling ',    # 0xc9
+'Mei ',    # 0xca
+'Ba ',    # 0xcb
+'Die ',    # 0xcc
+'Ku ',    # 0xcd
+'Tuo ',    # 0xce
+'Jia ',    # 0xcf
+'Ci ',    # 0xd0
+'Pao ',    # 0xd1
+'Qia ',    # 0xd2
+'Zhu ',    # 0xd3
+'Ju ',    # 0xd4
+'Die ',    # 0xd5
+'Zhi ',    # 0xd6
+'Fu ',    # 0xd7
+'Pan ',    # 0xd8
+'Ju ',    # 0xd9
+'Shan ',    # 0xda
+'Bo ',    # 0xdb
+'Ni ',    # 0xdc
+'Ju ',    # 0xdd
+'Li ',    # 0xde
+'Gen ',    # 0xdf
+'Yi ',    # 0xe0
+'Ji ',    # 0xe1
+'Dai ',    # 0xe2
+'Xian ',    # 0xe3
+'Jiao ',    # 0xe4
+'Duo ',    # 0xe5
+'Zhu ',    # 0xe6
+'Zhuan ',    # 0xe7
+'Kua ',    # 0xe8
+'Zhuai ',    # 0xe9
+'Gui ',    # 0xea
+'Qiong ',    # 0xeb
+'Kui ',    # 0xec
+'Xiang ',    # 0xed
+'Chi ',    # 0xee
+'Lu ',    # 0xef
+'Beng ',    # 0xf0
+'Zhi ',    # 0xf1
+'Jia ',    # 0xf2
+'Tiao ',    # 0xf3
+'Cai ',    # 0xf4
+'Jian ',    # 0xf5
+'Ta ',    # 0xf6
+'Qiao ',    # 0xf7
+'Bi ',    # 0xf8
+'Xian ',    # 0xf9
+'Duo ',    # 0xfa
+'Ji ',    # 0xfb
+'Ju ',    # 0xfc
+'Ji ',    # 0xfd
+'Shu ',    # 0xfe
+'Tu ',    # 0xff
+)
diff --git a/lib/unidecode/x08e.py b/lib/unidecode/x08e.py
new file mode 100644
index 00000000..015ed1ea
--- /dev/null
+++ b/lib/unidecode/x08e.py
@@ -0,0 +1,258 @@
+data = (
+'Chu ',    # 0x00
+'Jing ',    # 0x01
+'Nie ',    # 0x02
+'Xiao ',    # 0x03
+'Bo ',    # 0x04
+'Chi ',    # 0x05
+'Qun ',    # 0x06
+'Mou ',    # 0x07
+'Shu ',    # 0x08
+'Lang ',    # 0x09
+'Yong ',    # 0x0a
+'Jiao ',    # 0x0b
+'Chou ',    # 0x0c
+'Qiao ',    # 0x0d
+'[?] ',    # 0x0e
+'Ta ',    # 0x0f
+'Jian ',    # 0x10
+'Qi ',    # 0x11
+'Wo ',    # 0x12
+'Wei ',    # 0x13
+'Zhuo ',    # 0x14
+'Jie ',    # 0x15
+'Ji ',    # 0x16
+'Nie ',    # 0x17
+'Ju ',    # 0x18
+'Ju ',    # 0x19
+'Lun ',    # 0x1a
+'Lu ',    # 0x1b
+'Leng ',    # 0x1c
+'Huai ',    # 0x1d
+'Ju ',    # 0x1e
+'Chi ',    # 0x1f
+'Wan ',    # 0x20
+'Quan ',    # 0x21
+'Ti ',    # 0x22
+'Bo ',    # 0x23
+'Zu ',    # 0x24
+'Qie ',    # 0x25
+'Ji ',    # 0x26
+'Cu ',    # 0x27
+'Zong ',    # 0x28
+'Cai ',    # 0x29
+'Zong ',    # 0x2a
+'Peng ',    # 0x2b
+'Zhi ',    # 0x2c
+'Zheng ',    # 0x2d
+'Dian ',    # 0x2e
+'Zhi ',    # 0x2f
+'Yu ',    # 0x30
+'Duo ',    # 0x31
+'Dun ',    # 0x32
+'Chun ',    # 0x33
+'Yong ',    # 0x34
+'Zhong ',    # 0x35
+'Di ',    # 0x36
+'Zhe ',    # 0x37
+'Chen ',    # 0x38
+'Chuai ',    # 0x39
+'Jian ',    # 0x3a
+'Gua ',    # 0x3b
+'Tang ',    # 0x3c
+'Ju ',    # 0x3d
+'Fu ',    # 0x3e
+'Zu ',    # 0x3f
+'Die ',    # 0x40
+'Pian ',    # 0x41
+'Rou ',    # 0x42
+'Nuo ',    # 0x43
+'Ti ',    # 0x44
+'Cha ',    # 0x45
+'Tui ',    # 0x46
+'Jian ',    # 0x47
+'Dao ',    # 0x48
+'Cuo ',    # 0x49
+'Xi ',    # 0x4a
+'Ta ',    # 0x4b
+'Qiang ',    # 0x4c
+'Zhan ',    # 0x4d
+'Dian ',    # 0x4e
+'Ti ',    # 0x4f
+'Ji ',    # 0x50
+'Nie ',    # 0x51
+'Man ',    # 0x52
+'Liu ',    # 0x53
+'Zhan ',    # 0x54
+'Bi ',    # 0x55
+'Chong ',    # 0x56
+'Lu ',    # 0x57
+'Liao ',    # 0x58
+'Cu ',    # 0x59
+'Tang ',    # 0x5a
+'Dai ',    # 0x5b
+'Suo ',    # 0x5c
+'Xi ',    # 0x5d
+'Kui ',    # 0x5e
+'Ji ',    # 0x5f
+'Zhi ',    # 0x60
+'Qiang ',    # 0x61
+'Di ',    # 0x62
+'Man ',    # 0x63
+'Zong ',    # 0x64
+'Lian ',    # 0x65
+'Beng ',    # 0x66
+'Zao ',    # 0x67
+'Nian ',    # 0x68
+'Bie ',    # 0x69
+'Tui ',    # 0x6a
+'Ju ',    # 0x6b
+'Deng ',    # 0x6c
+'Ceng ',    # 0x6d
+'Xian ',    # 0x6e
+'Fan ',    # 0x6f
+'Chu ',    # 0x70
+'Zhong ',    # 0x71
+'Dun ',    # 0x72
+'Bo ',    # 0x73
+'Cu ',    # 0x74
+'Zu ',    # 0x75
+'Jue ',    # 0x76
+'Jue ',    # 0x77
+'Lin ',    # 0x78
+'Ta ',    # 0x79
+'Qiao ',    # 0x7a
+'Qiao ',    # 0x7b
+'Pu ',    # 0x7c
+'Liao ',    # 0x7d
+'Dun ',    # 0x7e
+'Cuan ',    # 0x7f
+'Kuang ',    # 0x80
+'Zao ',    # 0x81
+'Ta ',    # 0x82
+'Bi ',    # 0x83
+'Bi ',    # 0x84
+'Zhu ',    # 0x85
+'Ju ',    # 0x86
+'Chu ',    # 0x87
+'Qiao ',    # 0x88
+'Dun ',    # 0x89
+'Chou ',    # 0x8a
+'Ji ',    # 0x8b
+'Wu ',    # 0x8c
+'Yue ',    # 0x8d
+'Nian ',    # 0x8e
+'Lin ',    # 0x8f
+'Lie ',    # 0x90
+'Zhi ',    # 0x91
+'Li ',    # 0x92
+'Zhi ',    # 0x93
+'Chan ',    # 0x94
+'Chu ',    # 0x95
+'Duan ',    # 0x96
+'Wei ',    # 0x97
+'Long ',    # 0x98
+'Lin ',    # 0x99
+'Xian ',    # 0x9a
+'Wei ',    # 0x9b
+'Zuan ',    # 0x9c
+'Lan ',    # 0x9d
+'Xie ',    # 0x9e
+'Rang ',    # 0x9f
+'Xie ',    # 0xa0
+'Nie ',    # 0xa1
+'Ta ',    # 0xa2
+'Qu ',    # 0xa3
+'Jie ',    # 0xa4
+'Cuan ',    # 0xa5
+'Zuan ',    # 0xa6
+'Xi ',    # 0xa7
+'Kui ',    # 0xa8
+'Jue ',    # 0xa9
+'Lin ',    # 0xaa
+'Shen ',    # 0xab
+'Gong ',    # 0xac
+'Dan ',    # 0xad
+'Segare ',    # 0xae
+'Qu ',    # 0xaf
+'Ti ',    # 0xb0
+'Duo ',    # 0xb1
+'Duo ',    # 0xb2
+'Gong ',    # 0xb3
+'Lang ',    # 0xb4
+'Nerau ',    # 0xb5
+'Luo ',    # 0xb6
+'Ai ',    # 0xb7
+'Ji ',    # 0xb8
+'Ju ',    # 0xb9
+'Tang ',    # 0xba
+'Utsuke ',    # 0xbb
+'[?] ',    # 0xbc
+'Yan ',    # 0xbd
+'Shitsuke ',    # 0xbe
+'Kang ',    # 0xbf
+'Qu ',    # 0xc0
+'Lou ',    # 0xc1
+'Lao ',    # 0xc2
+'Tuo ',    # 0xc3
+'Zhi ',    # 0xc4
+'Yagate ',    # 0xc5
+'Ti ',    # 0xc6
+'Dao ',    # 0xc7
+'Yagate ',    # 0xc8
+'Yu ',    # 0xc9
+'Che ',    # 0xca
+'Ya ',    # 0xcb
+'Gui ',    # 0xcc
+'Jun ',    # 0xcd
+'Wei ',    # 0xce
+'Yue ',    # 0xcf
+'Xin ',    # 0xd0
+'Di ',    # 0xd1
+'Xuan ',    # 0xd2
+'Fan ',    # 0xd3
+'Ren ',    # 0xd4
+'Shan ',    # 0xd5
+'Qiang ',    # 0xd6
+'Shu ',    # 0xd7
+'Tun ',    # 0xd8
+'Chen ',    # 0xd9
+'Dai ',    # 0xda
+'E ',    # 0xdb
+'Na ',    # 0xdc
+'Qi ',    # 0xdd
+'Mao ',    # 0xde
+'Ruan ',    # 0xdf
+'Ren ',    # 0xe0
+'Fan ',    # 0xe1
+'Zhuan ',    # 0xe2
+'Hong ',    # 0xe3
+'Hu ',    # 0xe4
+'Qu ',    # 0xe5
+'Huang ',    # 0xe6
+'Di ',    # 0xe7
+'Ling ',    # 0xe8
+'Dai ',    # 0xe9
+'Ao ',    # 0xea
+'Zhen ',    # 0xeb
+'Fan ',    # 0xec
+'Kuang ',    # 0xed
+'Ang ',    # 0xee
+'Peng ',    # 0xef
+'Bei ',    # 0xf0
+'Gu ',    # 0xf1
+'Ku ',    # 0xf2
+'Pao ',    # 0xf3
+'Zhu ',    # 0xf4
+'Rong ',    # 0xf5
+'E ',    # 0xf6
+'Ba ',    # 0xf7
+'Zhou ',    # 0xf8
+'Zhi ',    # 0xf9
+'Yao ',    # 0xfa
+'Ke ',    # 0xfb
+'Yi ',    # 0xfc
+'Qing ',    # 0xfd
+'Shi ',    # 0xfe
+'Ping ',    # 0xff
+)
diff --git a/lib/unidecode/x08f.py b/lib/unidecode/x08f.py
new file mode 100644
index 00000000..39d04a9c
--- /dev/null
+++ b/lib/unidecode/x08f.py
@@ -0,0 +1,258 @@
+data = (
+'Er ',    # 0x00
+'Qiong ',    # 0x01
+'Ju ',    # 0x02
+'Jiao ',    # 0x03
+'Guang ',    # 0x04
+'Lu ',    # 0x05
+'Kai ',    # 0x06
+'Quan ',    # 0x07
+'Zhou ',    # 0x08
+'Zai ',    # 0x09
+'Zhi ',    # 0x0a
+'She ',    # 0x0b
+'Liang ',    # 0x0c
+'Yu ',    # 0x0d
+'Shao ',    # 0x0e
+'You ',    # 0x0f
+'Huan ',    # 0x10
+'Yun ',    # 0x11
+'Zhe ',    # 0x12
+'Wan ',    # 0x13
+'Fu ',    # 0x14
+'Qing ',    # 0x15
+'Zhou ',    # 0x16
+'Ni ',    # 0x17
+'Ling ',    # 0x18
+'Zhe ',    # 0x19
+'Zhan ',    # 0x1a
+'Liang ',    # 0x1b
+'Zi ',    # 0x1c
+'Hui ',    # 0x1d
+'Wang ',    # 0x1e
+'Chuo ',    # 0x1f
+'Guo ',    # 0x20
+'Kan ',    # 0x21
+'Yi ',    # 0x22
+'Peng ',    # 0x23
+'Qian ',    # 0x24
+'Gun ',    # 0x25
+'Nian ',    # 0x26
+'Pian ',    # 0x27
+'Guan ',    # 0x28
+'Bei ',    # 0x29
+'Lun ',    # 0x2a
+'Pai ',    # 0x2b
+'Liang ',    # 0x2c
+'Ruan ',    # 0x2d
+'Rou ',    # 0x2e
+'Ji ',    # 0x2f
+'Yang ',    # 0x30
+'Xian ',    # 0x31
+'Chuan ',    # 0x32
+'Cou ',    # 0x33
+'Qun ',    # 0x34
+'Ge ',    # 0x35
+'You ',    # 0x36
+'Hong ',    # 0x37
+'Shu ',    # 0x38
+'Fu ',    # 0x39
+'Zi ',    # 0x3a
+'Fu ',    # 0x3b
+'Wen ',    # 0x3c
+'Ben ',    # 0x3d
+'Zhan ',    # 0x3e
+'Yu ',    # 0x3f
+'Wen ',    # 0x40
+'Tao ',    # 0x41
+'Gu ',    # 0x42
+'Zhen ',    # 0x43
+'Xia ',    # 0x44
+'Yuan ',    # 0x45
+'Lu ',    # 0x46
+'Jiu ',    # 0x47
+'Chao ',    # 0x48
+'Zhuan ',    # 0x49
+'Wei ',    # 0x4a
+'Hun ',    # 0x4b
+'Sori ',    # 0x4c
+'Che ',    # 0x4d
+'Jiao ',    # 0x4e
+'Zhan ',    # 0x4f
+'Pu ',    # 0x50
+'Lao ',    # 0x51
+'Fen ',    # 0x52
+'Fan ',    # 0x53
+'Lin ',    # 0x54
+'Ge ',    # 0x55
+'Se ',    # 0x56
+'Kan ',    # 0x57
+'Huan ',    # 0x58
+'Yi ',    # 0x59
+'Ji ',    # 0x5a
+'Dui ',    # 0x5b
+'Er ',    # 0x5c
+'Yu ',    # 0x5d
+'Xian ',    # 0x5e
+'Hong ',    # 0x5f
+'Lei ',    # 0x60
+'Pei ',    # 0x61
+'Li ',    # 0x62
+'Li ',    # 0x63
+'Lu ',    # 0x64
+'Lin ',    # 0x65
+'Che ',    # 0x66
+'Ya ',    # 0x67
+'Gui ',    # 0x68
+'Xuan ',    # 0x69
+'Di ',    # 0x6a
+'Ren ',    # 0x6b
+'Zhuan ',    # 0x6c
+'E ',    # 0x6d
+'Lun ',    # 0x6e
+'Ruan ',    # 0x6f
+'Hong ',    # 0x70
+'Ku ',    # 0x71
+'Ke ',    # 0x72
+'Lu ',    # 0x73
+'Zhou ',    # 0x74
+'Zhi ',    # 0x75
+'Yi ',    # 0x76
+'Hu ',    # 0x77
+'Zhen ',    # 0x78
+'Li ',    # 0x79
+'Yao ',    # 0x7a
+'Qing ',    # 0x7b
+'Shi ',    # 0x7c
+'Zai ',    # 0x7d
+'Zhi ',    # 0x7e
+'Jiao ',    # 0x7f
+'Zhou ',    # 0x80
+'Quan ',    # 0x81
+'Lu ',    # 0x82
+'Jiao ',    # 0x83
+'Zhe ',    # 0x84
+'Fu ',    # 0x85
+'Liang ',    # 0x86
+'Nian ',    # 0x87
+'Bei ',    # 0x88
+'Hui ',    # 0x89
+'Gun ',    # 0x8a
+'Wang ',    # 0x8b
+'Liang ',    # 0x8c
+'Chuo ',    # 0x8d
+'Zi ',    # 0x8e
+'Cou ',    # 0x8f
+'Fu ',    # 0x90
+'Ji ',    # 0x91
+'Wen ',    # 0x92
+'Shu ',    # 0x93
+'Pei ',    # 0x94
+'Yuan ',    # 0x95
+'Xia ',    # 0x96
+'Zhan ',    # 0x97
+'Lu ',    # 0x98
+'Che ',    # 0x99
+'Lin ',    # 0x9a
+'Xin ',    # 0x9b
+'Gu ',    # 0x9c
+'Ci ',    # 0x9d
+'Ci ',    # 0x9e
+'Pi ',    # 0x9f
+'Zui ',    # 0xa0
+'Bian ',    # 0xa1
+'La ',    # 0xa2
+'La ',    # 0xa3
+'Ci ',    # 0xa4
+'Xue ',    # 0xa5
+'Ban ',    # 0xa6
+'Bian ',    # 0xa7
+'Bian ',    # 0xa8
+'Bian ',    # 0xa9
+'[?] ',    # 0xaa
+'Bian ',    # 0xab
+'Ban ',    # 0xac
+'Ci ',    # 0xad
+'Bian ',    # 0xae
+'Bian ',    # 0xaf
+'Chen ',    # 0xb0
+'Ru ',    # 0xb1
+'Nong ',    # 0xb2
+'Nong ',    # 0xb3
+'Zhen ',    # 0xb4
+'Chuo ',    # 0xb5
+'Chuo ',    # 0xb6
+'Suberu ',    # 0xb7
+'Reng ',    # 0xb8
+'Bian ',    # 0xb9
+'Bian ',    # 0xba
+'Sip ',    # 0xbb
+'Ip ',    # 0xbc
+'Liao ',    # 0xbd
+'Da ',    # 0xbe
+'Chan ',    # 0xbf
+'Gan ',    # 0xc0
+'Qian ',    # 0xc1
+'Yu ',    # 0xc2
+'Yu ',    # 0xc3
+'Qi ',    # 0xc4
+'Xun ',    # 0xc5
+'Yi ',    # 0xc6
+'Guo ',    # 0xc7
+'Mai ',    # 0xc8
+'Qi ',    # 0xc9
+'Za ',    # 0xca
+'Wang ',    # 0xcb
+'Jia ',    # 0xcc
+'Zhun ',    # 0xcd
+'Ying ',    # 0xce
+'Ti ',    # 0xcf
+'Yun ',    # 0xd0
+'Jin ',    # 0xd1
+'Hang ',    # 0xd2
+'Ya ',    # 0xd3
+'Fan ',    # 0xd4
+'Wu ',    # 0xd5
+'Da ',    # 0xd6
+'E ',    # 0xd7
+'Huan ',    # 0xd8
+'Zhe ',    # 0xd9
+'Totemo ',    # 0xda
+'Jin ',    # 0xdb
+'Yuan ',    # 0xdc
+'Wei ',    # 0xdd
+'Lian ',    # 0xde
+'Chi ',    # 0xdf
+'Che ',    # 0xe0
+'Ni ',    # 0xe1
+'Tiao ',    # 0xe2
+'Zhi ',    # 0xe3
+'Yi ',    # 0xe4
+'Jiong ',    # 0xe5
+'Jia ',    # 0xe6
+'Chen ',    # 0xe7
+'Dai ',    # 0xe8
+'Er ',    # 0xe9
+'Di ',    # 0xea
+'Po ',    # 0xeb
+'Wang ',    # 0xec
+'Die ',    # 0xed
+'Ze ',    # 0xee
+'Tao ',    # 0xef
+'Shu ',    # 0xf0
+'Tuo ',    # 0xf1
+'Kep ',    # 0xf2
+'Jing ',    # 0xf3
+'Hui ',    # 0xf4
+'Tong ',    # 0xf5
+'You ',    # 0xf6
+'Mi ',    # 0xf7
+'Beng ',    # 0xf8
+'Ji ',    # 0xf9
+'Nai ',    # 0xfa
+'Yi ',    # 0xfb
+'Jie ',    # 0xfc
+'Zhui ',    # 0xfd
+'Lie ',    # 0xfe
+'Xun ',    # 0xff
+)
diff --git a/lib/unidecode/x090.py b/lib/unidecode/x090.py
new file mode 100644
index 00000000..ade65069
--- /dev/null
+++ b/lib/unidecode/x090.py
@@ -0,0 +1,258 @@
+data = (
+'Tui ',    # 0x00
+'Song ',    # 0x01
+'Gua ',    # 0x02
+'Tao ',    # 0x03
+'Pang ',    # 0x04
+'Hou ',    # 0x05
+'Ni ',    # 0x06
+'Dun ',    # 0x07
+'Jiong ',    # 0x08
+'Xuan ',    # 0x09
+'Xun ',    # 0x0a
+'Bu ',    # 0x0b
+'You ',    # 0x0c
+'Xiao ',    # 0x0d
+'Qiu ',    # 0x0e
+'Tou ',    # 0x0f
+'Zhu ',    # 0x10
+'Qiu ',    # 0x11
+'Di ',    # 0x12
+'Di ',    # 0x13
+'Tu ',    # 0x14
+'Jing ',    # 0x15
+'Ti ',    # 0x16
+'Dou ',    # 0x17
+'Yi ',    # 0x18
+'Zhe ',    # 0x19
+'Tong ',    # 0x1a
+'Guang ',    # 0x1b
+'Wu ',    # 0x1c
+'Shi ',    # 0x1d
+'Cheng ',    # 0x1e
+'Su ',    # 0x1f
+'Zao ',    # 0x20
+'Qun ',    # 0x21
+'Feng ',    # 0x22
+'Lian ',    # 0x23
+'Suo ',    # 0x24
+'Hui ',    # 0x25
+'Li ',    # 0x26
+'Sako ',    # 0x27
+'Lai ',    # 0x28
+'Ben ',    # 0x29
+'Cuo ',    # 0x2a
+'Jue ',    # 0x2b
+'Beng ',    # 0x2c
+'Huan ',    # 0x2d
+'Dai ',    # 0x2e
+'Lu ',    # 0x2f
+'You ',    # 0x30
+'Zhou ',    # 0x31
+'Jin ',    # 0x32
+'Yu ',    # 0x33
+'Chuo ',    # 0x34
+'Kui ',    # 0x35
+'Wei ',    # 0x36
+'Ti ',    # 0x37
+'Yi ',    # 0x38
+'Da ',    # 0x39
+'Yuan ',    # 0x3a
+'Luo ',    # 0x3b
+'Bi ',    # 0x3c
+'Nuo ',    # 0x3d
+'Yu ',    # 0x3e
+'Dang ',    # 0x3f
+'Sui ',    # 0x40
+'Dun ',    # 0x41
+'Sui ',    # 0x42
+'Yan ',    # 0x43
+'Chuan ',    # 0x44
+'Chi ',    # 0x45
+'Ti ',    # 0x46
+'Yu ',    # 0x47
+'Shi ',    # 0x48
+'Zhen ',    # 0x49
+'You ',    # 0x4a
+'Yun ',    # 0x4b
+'E ',    # 0x4c
+'Bian ',    # 0x4d
+'Guo ',    # 0x4e
+'E ',    # 0x4f
+'Xia ',    # 0x50
+'Huang ',    # 0x51
+'Qiu ',    # 0x52
+'Dao ',    # 0x53
+'Da ',    # 0x54
+'Wei ',    # 0x55
+'Appare ',    # 0x56
+'Yi ',    # 0x57
+'Gou ',    # 0x58
+'Yao ',    # 0x59
+'Chu ',    # 0x5a
+'Liu ',    # 0x5b
+'Xun ',    # 0x5c
+'Ta ',    # 0x5d
+'Di ',    # 0x5e
+'Chi ',    # 0x5f
+'Yuan ',    # 0x60
+'Su ',    # 0x61
+'Ta ',    # 0x62
+'Qian ',    # 0x63
+'[?] ',    # 0x64
+'Yao ',    # 0x65
+'Guan ',    # 0x66
+'Zhang ',    # 0x67
+'Ao ',    # 0x68
+'Shi ',    # 0x69
+'Ce ',    # 0x6a
+'Chi ',    # 0x6b
+'Su ',    # 0x6c
+'Zao ',    # 0x6d
+'Zhe ',    # 0x6e
+'Dun ',    # 0x6f
+'Di ',    # 0x70
+'Lou ',    # 0x71
+'Chi ',    # 0x72
+'Cuo ',    # 0x73
+'Lin ',    # 0x74
+'Zun ',    # 0x75
+'Rao ',    # 0x76
+'Qian ',    # 0x77
+'Xuan ',    # 0x78
+'Yu ',    # 0x79
+'Yi ',    # 0x7a
+'Wu ',    # 0x7b
+'Liao ',    # 0x7c
+'Ju ',    # 0x7d
+'Shi ',    # 0x7e
+'Bi ',    # 0x7f
+'Yao ',    # 0x80
+'Mai ',    # 0x81
+'Xie ',    # 0x82
+'Sui ',    # 0x83
+'Huan ',    # 0x84
+'Zhan ',    # 0x85
+'Teng ',    # 0x86
+'Er ',    # 0x87
+'Miao ',    # 0x88
+'Bian ',    # 0x89
+'Bian ',    # 0x8a
+'La ',    # 0x8b
+'Li ',    # 0x8c
+'Yuan ',    # 0x8d
+'Yao ',    # 0x8e
+'Luo ',    # 0x8f
+'Li ',    # 0x90
+'Yi ',    # 0x91
+'Ting ',    # 0x92
+'Deng ',    # 0x93
+'Qi ',    # 0x94
+'Yong ',    # 0x95
+'Shan ',    # 0x96
+'Han ',    # 0x97
+'Yu ',    # 0x98
+'Mang ',    # 0x99
+'Ru ',    # 0x9a
+'Qiong ',    # 0x9b
+'[?] ',    # 0x9c
+'Kuang ',    # 0x9d
+'Fu ',    # 0x9e
+'Kang ',    # 0x9f
+'Bin ',    # 0xa0
+'Fang ',    # 0xa1
+'Xing ',    # 0xa2
+'Na ',    # 0xa3
+'Xin ',    # 0xa4
+'Shen ',    # 0xa5
+'Bang ',    # 0xa6
+'Yuan ',    # 0xa7
+'Cun ',    # 0xa8
+'Huo ',    # 0xa9
+'Xie ',    # 0xaa
+'Bang ',    # 0xab
+'Wu ',    # 0xac
+'Ju ',    # 0xad
+'You ',    # 0xae
+'Han ',    # 0xaf
+'Tai ',    # 0xb0
+'Qiu ',    # 0xb1
+'Bi ',    # 0xb2
+'Pei ',    # 0xb3
+'Bing ',    # 0xb4
+'Shao ',    # 0xb5
+'Bei ',    # 0xb6
+'Wa ',    # 0xb7
+'Di ',    # 0xb8
+'Zou ',    # 0xb9
+'Ye ',    # 0xba
+'Lin ',    # 0xbb
+'Kuang ',    # 0xbc
+'Gui ',    # 0xbd
+'Zhu ',    # 0xbe
+'Shi ',    # 0xbf
+'Ku ',    # 0xc0
+'Yu ',    # 0xc1
+'Gai ',    # 0xc2
+'Ge ',    # 0xc3
+'Xi ',    # 0xc4
+'Zhi ',    # 0xc5
+'Ji ',    # 0xc6
+'Xun ',    # 0xc7
+'Hou ',    # 0xc8
+'Xing ',    # 0xc9
+'Jiao ',    # 0xca
+'Xi ',    # 0xcb
+'Gui ',    # 0xcc
+'Nuo ',    # 0xcd
+'Lang ',    # 0xce
+'Jia ',    # 0xcf
+'Kuai ',    # 0xd0
+'Zheng ',    # 0xd1
+'Otoko ',    # 0xd2
+'Yun ',    # 0xd3
+'Yan ',    # 0xd4
+'Cheng ',    # 0xd5
+'Dou ',    # 0xd6
+'Chi ',    # 0xd7
+'Lu ',    # 0xd8
+'Fu ',    # 0xd9
+'Wu ',    # 0xda
+'Fu ',    # 0xdb
+'Gao ',    # 0xdc
+'Hao ',    # 0xdd
+'Lang ',    # 0xde
+'Jia ',    # 0xdf
+'Geng ',    # 0xe0
+'Jun ',    # 0xe1
+'Ying ',    # 0xe2
+'Bo ',    # 0xe3
+'Xi ',    # 0xe4
+'Bei ',    # 0xe5
+'Li ',    # 0xe6
+'Yun ',    # 0xe7
+'Bu ',    # 0xe8
+'Xiao ',    # 0xe9
+'Qi ',    # 0xea
+'Pi ',    # 0xeb
+'Qing ',    # 0xec
+'Guo ',    # 0xed
+'Zhou ',    # 0xee
+'Tan ',    # 0xef
+'Zou ',    # 0xf0
+'Ping ',    # 0xf1
+'Lai ',    # 0xf2
+'Ni ',    # 0xf3
+'Chen ',    # 0xf4
+'You ',    # 0xf5
+'Bu ',    # 0xf6
+'Xiang ',    # 0xf7
+'Dan ',    # 0xf8
+'Ju ',    # 0xf9
+'Yong ',    # 0xfa
+'Qiao ',    # 0xfb
+'Yi ',    # 0xfc
+'Du ',    # 0xfd
+'Yan ',    # 0xfe
+'Mei ',    # 0xff
+)
diff --git a/lib/unidecode/x091.py b/lib/unidecode/x091.py
new file mode 100644
index 00000000..fa3dd766
--- /dev/null
+++ b/lib/unidecode/x091.py
@@ -0,0 +1,258 @@
+data = (
+'Ruo ',    # 0x00
+'Bei ',    # 0x01
+'E ',    # 0x02
+'Yu ',    # 0x03
+'Juan ',    # 0x04
+'Yu ',    # 0x05
+'Yun ',    # 0x06
+'Hou ',    # 0x07
+'Kui ',    # 0x08
+'Xiang ',    # 0x09
+'Xiang ',    # 0x0a
+'Sou ',    # 0x0b
+'Tang ',    # 0x0c
+'Ming ',    # 0x0d
+'Xi ',    # 0x0e
+'Ru ',    # 0x0f
+'Chu ',    # 0x10
+'Zi ',    # 0x11
+'Zou ',    # 0x12
+'Ju ',    # 0x13
+'Wu ',    # 0x14
+'Xiang ',    # 0x15
+'Yun ',    # 0x16
+'Hao ',    # 0x17
+'Yong ',    # 0x18
+'Bi ',    # 0x19
+'Mo ',    # 0x1a
+'Chao ',    # 0x1b
+'Fu ',    # 0x1c
+'Liao ',    # 0x1d
+'Yin ',    # 0x1e
+'Zhuan ',    # 0x1f
+'Hu ',    # 0x20
+'Qiao ',    # 0x21
+'Yan ',    # 0x22
+'Zhang ',    # 0x23
+'Fan ',    # 0x24
+'Qiao ',    # 0x25
+'Xu ',    # 0x26
+'Deng ',    # 0x27
+'Bi ',    # 0x28
+'Xin ',    # 0x29
+'Bi ',    # 0x2a
+'Ceng ',    # 0x2b
+'Wei ',    # 0x2c
+'Zheng ',    # 0x2d
+'Mao ',    # 0x2e
+'Shan ',    # 0x2f
+'Lin ',    # 0x30
+'Po ',    # 0x31
+'Dan ',    # 0x32
+'Meng ',    # 0x33
+'Ye ',    # 0x34
+'Cao ',    # 0x35
+'Kuai ',    # 0x36
+'Feng ',    # 0x37
+'Meng ',    # 0x38
+'Zou ',    # 0x39
+'Kuang ',    # 0x3a
+'Lian ',    # 0x3b
+'Zan ',    # 0x3c
+'Chan ',    # 0x3d
+'You ',    # 0x3e
+'Qi ',    # 0x3f
+'Yan ',    # 0x40
+'Chan ',    # 0x41
+'Zan ',    # 0x42
+'Ling ',    # 0x43
+'Huan ',    # 0x44
+'Xi ',    # 0x45
+'Feng ',    # 0x46
+'Zan ',    # 0x47
+'Li ',    # 0x48
+'You ',    # 0x49
+'Ding ',    # 0x4a
+'Qiu ',    # 0x4b
+'Zhuo ',    # 0x4c
+'Pei ',    # 0x4d
+'Zhou ',    # 0x4e
+'Yi ',    # 0x4f
+'Hang ',    # 0x50
+'Yu ',    # 0x51
+'Jiu ',    # 0x52
+'Yan ',    # 0x53
+'Zui ',    # 0x54
+'Mao ',    # 0x55
+'Dan ',    # 0x56
+'Xu ',    # 0x57
+'Tou ',    # 0x58
+'Zhen ',    # 0x59
+'Fen ',    # 0x5a
+'Sakenomoto ',    # 0x5b
+'[?] ',    # 0x5c
+'Yun ',    # 0x5d
+'Tai ',    # 0x5e
+'Tian ',    # 0x5f
+'Qia ',    # 0x60
+'Tuo ',    # 0x61
+'Zuo ',    # 0x62
+'Han ',    # 0x63
+'Gu ',    # 0x64
+'Su ',    # 0x65
+'Po ',    # 0x66
+'Chou ',    # 0x67
+'Zai ',    # 0x68
+'Ming ',    # 0x69
+'Luo ',    # 0x6a
+'Chuo ',    # 0x6b
+'Chou ',    # 0x6c
+'You ',    # 0x6d
+'Tong ',    # 0x6e
+'Zhi ',    # 0x6f
+'Xian ',    # 0x70
+'Jiang ',    # 0x71
+'Cheng ',    # 0x72
+'Yin ',    # 0x73
+'Tu ',    # 0x74
+'Xiao ',    # 0x75
+'Mei ',    # 0x76
+'Ku ',    # 0x77
+'Suan ',    # 0x78
+'Lei ',    # 0x79
+'Pu ',    # 0x7a
+'Zui ',    # 0x7b
+'Hai ',    # 0x7c
+'Yan ',    # 0x7d
+'Xi ',    # 0x7e
+'Niang ',    # 0x7f
+'Wei ',    # 0x80
+'Lu ',    # 0x81
+'Lan ',    # 0x82
+'Yan ',    # 0x83
+'Tao ',    # 0x84
+'Pei ',    # 0x85
+'Zhan ',    # 0x86
+'Chun ',    # 0x87
+'Tan ',    # 0x88
+'Zui ',    # 0x89
+'Chuo ',    # 0x8a
+'Cu ',    # 0x8b
+'Kun ',    # 0x8c
+'Ti ',    # 0x8d
+'Mian ',    # 0x8e
+'Du ',    # 0x8f
+'Hu ',    # 0x90
+'Xu ',    # 0x91
+'Xing ',    # 0x92
+'Tan ',    # 0x93
+'Jiu ',    # 0x94
+'Chun ',    # 0x95
+'Yun ',    # 0x96
+'Po ',    # 0x97
+'Ke ',    # 0x98
+'Sou ',    # 0x99
+'Mi ',    # 0x9a
+'Quan ',    # 0x9b
+'Chou ',    # 0x9c
+'Cuo ',    # 0x9d
+'Yun ',    # 0x9e
+'Yong ',    # 0x9f
+'Ang ',    # 0xa0
+'Zha ',    # 0xa1
+'Hai ',    # 0xa2
+'Tang ',    # 0xa3
+'Jiang ',    # 0xa4
+'Piao ',    # 0xa5
+'Shan ',    # 0xa6
+'Yu ',    # 0xa7
+'Li ',    # 0xa8
+'Zao ',    # 0xa9
+'Lao ',    # 0xaa
+'Yi ',    # 0xab
+'Jiang ',    # 0xac
+'Pu ',    # 0xad
+'Jiao ',    # 0xae
+'Xi ',    # 0xaf
+'Tan ',    # 0xb0
+'Po ',    # 0xb1
+'Nong ',    # 0xb2
+'Yi ',    # 0xb3
+'Li ',    # 0xb4
+'Ju ',    # 0xb5
+'Jiao ',    # 0xb6
+'Yi ',    # 0xb7
+'Niang ',    # 0xb8
+'Ru ',    # 0xb9
+'Xun ',    # 0xba
+'Chou ',    # 0xbb
+'Yan ',    # 0xbc
+'Ling ',    # 0xbd
+'Mi ',    # 0xbe
+'Mi ',    # 0xbf
+'Niang ',    # 0xc0
+'Xin ',    # 0xc1
+'Jiao ',    # 0xc2
+'Xi ',    # 0xc3
+'Mi ',    # 0xc4
+'Yan ',    # 0xc5
+'Bian ',    # 0xc6
+'Cai ',    # 0xc7
+'Shi ',    # 0xc8
+'You ',    # 0xc9
+'Shi ',    # 0xca
+'Shi ',    # 0xcb
+'Li ',    # 0xcc
+'Zhong ',    # 0xcd
+'Ye ',    # 0xce
+'Liang ',    # 0xcf
+'Li ',    # 0xd0
+'Jin ',    # 0xd1
+'Jin ',    # 0xd2
+'Qiu ',    # 0xd3
+'Yi ',    # 0xd4
+'Diao ',    # 0xd5
+'Dao ',    # 0xd6
+'Zhao ',    # 0xd7
+'Ding ',    # 0xd8
+'Po ',    # 0xd9
+'Qiu ',    # 0xda
+'He ',    # 0xdb
+'Fu ',    # 0xdc
+'Zhen ',    # 0xdd
+'Zhi ',    # 0xde
+'Ba ',    # 0xdf
+'Luan ',    # 0xe0
+'Fu ',    # 0xe1
+'Nai ',    # 0xe2
+'Diao ',    # 0xe3
+'Shan ',    # 0xe4
+'Qiao ',    # 0xe5
+'Kou ',    # 0xe6
+'Chuan ',    # 0xe7
+'Zi ',    # 0xe8
+'Fan ',    # 0xe9
+'Yu ',    # 0xea
+'Hua ',    # 0xeb
+'Han ',    # 0xec
+'Gong ',    # 0xed
+'Qi ',    # 0xee
+'Mang ',    # 0xef
+'Ri ',    # 0xf0
+'Di ',    # 0xf1
+'Si ',    # 0xf2
+'Xi ',    # 0xf3
+'Yi ',    # 0xf4
+'Chai ',    # 0xf5
+'Shi ',    # 0xf6
+'Tu ',    # 0xf7
+'Xi ',    # 0xf8
+'Nu ',    # 0xf9
+'Qian ',    # 0xfa
+'Ishiyumi ',    # 0xfb
+'Jian ',    # 0xfc
+'Pi ',    # 0xfd
+'Ye ',    # 0xfe
+'Yin ',    # 0xff
+)
diff --git a/lib/unidecode/x092.py b/lib/unidecode/x092.py
new file mode 100644
index 00000000..e752f4fe
--- /dev/null
+++ b/lib/unidecode/x092.py
@@ -0,0 +1,258 @@
+data = (
+'Ba ',    # 0x00
+'Fang ',    # 0x01
+'Chen ',    # 0x02
+'Xing ',    # 0x03
+'Tou ',    # 0x04
+'Yue ',    # 0x05
+'Yan ',    # 0x06
+'Fu ',    # 0x07
+'Pi ',    # 0x08
+'Na ',    # 0x09
+'Xin ',    # 0x0a
+'E ',    # 0x0b
+'Jue ',    # 0x0c
+'Dun ',    # 0x0d
+'Gou ',    # 0x0e
+'Yin ',    # 0x0f
+'Qian ',    # 0x10
+'Ban ',    # 0x11
+'Ji ',    # 0x12
+'Ren ',    # 0x13
+'Chao ',    # 0x14
+'Niu ',    # 0x15
+'Fen ',    # 0x16
+'Yun ',    # 0x17
+'Ji ',    # 0x18
+'Qin ',    # 0x19
+'Pi ',    # 0x1a
+'Guo ',    # 0x1b
+'Hong ',    # 0x1c
+'Yin ',    # 0x1d
+'Jun ',    # 0x1e
+'Shi ',    # 0x1f
+'Yi ',    # 0x20
+'Zhong ',    # 0x21
+'Nie ',    # 0x22
+'Gai ',    # 0x23
+'Ri ',    # 0x24
+'Huo ',    # 0x25
+'Tai ',    # 0x26
+'Kang ',    # 0x27
+'Habaki ',    # 0x28
+'Irori ',    # 0x29
+'Ngaak ',    # 0x2a
+'[?] ',    # 0x2b
+'Duo ',    # 0x2c
+'Zi ',    # 0x2d
+'Ni ',    # 0x2e
+'Tu ',    # 0x2f
+'Shi ',    # 0x30
+'Min ',    # 0x31
+'Gu ',    # 0x32
+'E ',    # 0x33
+'Ling ',    # 0x34
+'Bing ',    # 0x35
+'Yi ',    # 0x36
+'Gu ',    # 0x37
+'Ba ',    # 0x38
+'Pi ',    # 0x39
+'Yu ',    # 0x3a
+'Si ',    # 0x3b
+'Zuo ',    # 0x3c
+'Bu ',    # 0x3d
+'You ',    # 0x3e
+'Dian ',    # 0x3f
+'Jia ',    # 0x40
+'Zhen ',    # 0x41
+'Shi ',    # 0x42
+'Shi ',    # 0x43
+'Tie ',    # 0x44
+'Ju ',    # 0x45
+'Zhan ',    # 0x46
+'Shi ',    # 0x47
+'She ',    # 0x48
+'Xuan ',    # 0x49
+'Zhao ',    # 0x4a
+'Bao ',    # 0x4b
+'He ',    # 0x4c
+'Bi ',    # 0x4d
+'Sheng ',    # 0x4e
+'Chu ',    # 0x4f
+'Shi ',    # 0x50
+'Bo ',    # 0x51
+'Zhu ',    # 0x52
+'Chi ',    # 0x53
+'Za ',    # 0x54
+'Po ',    # 0x55
+'Tong ',    # 0x56
+'Qian ',    # 0x57
+'Fu ',    # 0x58
+'Zhai ',    # 0x59
+'Liu ',    # 0x5a
+'Qian ',    # 0x5b
+'Fu ',    # 0x5c
+'Li ',    # 0x5d
+'Yue ',    # 0x5e
+'Pi ',    # 0x5f
+'Yang ',    # 0x60
+'Ban ',    # 0x61
+'Bo ',    # 0x62
+'Jie ',    # 0x63
+'Gou ',    # 0x64
+'Shu ',    # 0x65
+'Zheng ',    # 0x66
+'Mu ',    # 0x67
+'Ni ',    # 0x68
+'Nie ',    # 0x69
+'Di ',    # 0x6a
+'Jia ',    # 0x6b
+'Mu ',    # 0x6c
+'Dan ',    # 0x6d
+'Shen ',    # 0x6e
+'Yi ',    # 0x6f
+'Si ',    # 0x70
+'Kuang ',    # 0x71
+'Ka ',    # 0x72
+'Bei ',    # 0x73
+'Jian ',    # 0x74
+'Tong ',    # 0x75
+'Xing ',    # 0x76
+'Hong ',    # 0x77
+'Jiao ',    # 0x78
+'Chi ',    # 0x79
+'Er ',    # 0x7a
+'Ge ',    # 0x7b
+'Bing ',    # 0x7c
+'Shi ',    # 0x7d
+'Mou ',    # 0x7e
+'Jia ',    # 0x7f
+'Yin ',    # 0x80
+'Jun ',    # 0x81
+'Zhou ',    # 0x82
+'Chong ',    # 0x83
+'Shang ',    # 0x84
+'Tong ',    # 0x85
+'Mo ',    # 0x86
+'Lei ',    # 0x87
+'Ji ',    # 0x88
+'Yu ',    # 0x89
+'Xu ',    # 0x8a
+'Ren ',    # 0x8b
+'Zun ',    # 0x8c
+'Zhi ',    # 0x8d
+'Qiong ',    # 0x8e
+'Shan ',    # 0x8f
+'Chi ',    # 0x90
+'Xian ',    # 0x91
+'Xing ',    # 0x92
+'Quan ',    # 0x93
+'Pi ',    # 0x94
+'Tie ',    # 0x95
+'Zhu ',    # 0x96
+'Hou ',    # 0x97
+'Ming ',    # 0x98
+'Kua ',    # 0x99
+'Yao ',    # 0x9a
+'Xian ',    # 0x9b
+'Xian ',    # 0x9c
+'Xiu ',    # 0x9d
+'Jun ',    # 0x9e
+'Cha ',    # 0x9f
+'Lao ',    # 0xa0
+'Ji ',    # 0xa1
+'Pi ',    # 0xa2
+'Ru ',    # 0xa3
+'Mi ',    # 0xa4
+'Yi ',    # 0xa5
+'Yin ',    # 0xa6
+'Guang ',    # 0xa7
+'An ',    # 0xa8
+'Diou ',    # 0xa9
+'You ',    # 0xaa
+'Se ',    # 0xab
+'Kao ',    # 0xac
+'Qian ',    # 0xad
+'Luan ',    # 0xae
+'Kasugai ',    # 0xaf
+'Ai ',    # 0xb0
+'Diao ',    # 0xb1
+'Han ',    # 0xb2
+'Rui ',    # 0xb3
+'Shi ',    # 0xb4
+'Keng ',    # 0xb5
+'Qiu ',    # 0xb6
+'Xiao ',    # 0xb7
+'Zhe ',    # 0xb8
+'Xiu ',    # 0xb9
+'Zang ',    # 0xba
+'Ti ',    # 0xbb
+'Cuo ',    # 0xbc
+'Gua ',    # 0xbd
+'Gong ',    # 0xbe
+'Zhong ',    # 0xbf
+'Dou ',    # 0xc0
+'Lu ',    # 0xc1
+'Mei ',    # 0xc2
+'Lang ',    # 0xc3
+'Wan ',    # 0xc4
+'Xin ',    # 0xc5
+'Yun ',    # 0xc6
+'Bei ',    # 0xc7
+'Wu ',    # 0xc8
+'Su ',    # 0xc9
+'Yu ',    # 0xca
+'Chan ',    # 0xcb
+'Ting ',    # 0xcc
+'Bo ',    # 0xcd
+'Han ',    # 0xce
+'Jia ',    # 0xcf
+'Hong ',    # 0xd0
+'Cuan ',    # 0xd1
+'Feng ',    # 0xd2
+'Chan ',    # 0xd3
+'Wan ',    # 0xd4
+'Zhi ',    # 0xd5
+'Si ',    # 0xd6
+'Xuan ',    # 0xd7
+'Wu ',    # 0xd8
+'Wu ',    # 0xd9
+'Tiao ',    # 0xda
+'Gong ',    # 0xdb
+'Zhuo ',    # 0xdc
+'Lue ',    # 0xdd
+'Xing ',    # 0xde
+'Qian ',    # 0xdf
+'Shen ',    # 0xe0
+'Han ',    # 0xe1
+'Lue ',    # 0xe2
+'Xie ',    # 0xe3
+'Chu ',    # 0xe4
+'Zheng ',    # 0xe5
+'Ju ',    # 0xe6
+'Xian ',    # 0xe7
+'Tie ',    # 0xe8
+'Mang ',    # 0xe9
+'Pu ',    # 0xea
+'Li ',    # 0xeb
+'Pan ',    # 0xec
+'Rui ',    # 0xed
+'Cheng ',    # 0xee
+'Gao ',    # 0xef
+'Li ',    # 0xf0
+'Te ',    # 0xf1
+'Pyeng ',    # 0xf2
+'Zhu ',    # 0xf3
+'[?] ',    # 0xf4
+'Tu ',    # 0xf5
+'Liu ',    # 0xf6
+'Zui ',    # 0xf7
+'Ju ',    # 0xf8
+'Chang ',    # 0xf9
+'Yuan ',    # 0xfa
+'Jian ',    # 0xfb
+'Gang ',    # 0xfc
+'Diao ',    # 0xfd
+'Tao ',    # 0xfe
+'Chang ',    # 0xff
+)
diff --git a/lib/unidecode/x093.py b/lib/unidecode/x093.py
new file mode 100644
index 00000000..82857e9a
--- /dev/null
+++ b/lib/unidecode/x093.py
@@ -0,0 +1,258 @@
+data = (
+'Lun ',    # 0x00
+'Kua ',    # 0x01
+'Ling ',    # 0x02
+'Bei ',    # 0x03
+'Lu ',    # 0x04
+'Li ',    # 0x05
+'Qiang ',    # 0x06
+'Pou ',    # 0x07
+'Juan ',    # 0x08
+'Min ',    # 0x09
+'Zui ',    # 0x0a
+'Peng ',    # 0x0b
+'An ',    # 0x0c
+'Pi ',    # 0x0d
+'Xian ',    # 0x0e
+'Ya ',    # 0x0f
+'Zhui ',    # 0x10
+'Lei ',    # 0x11
+'A ',    # 0x12
+'Kong ',    # 0x13
+'Ta ',    # 0x14
+'Kun ',    # 0x15
+'Du ',    # 0x16
+'Wei ',    # 0x17
+'Chui ',    # 0x18
+'Zi ',    # 0x19
+'Zheng ',    # 0x1a
+'Ben ',    # 0x1b
+'Nie ',    # 0x1c
+'Cong ',    # 0x1d
+'Qun ',    # 0x1e
+'Tan ',    # 0x1f
+'Ding ',    # 0x20
+'Qi ',    # 0x21
+'Qian ',    # 0x22
+'Zhuo ',    # 0x23
+'Qi ',    # 0x24
+'Yu ',    # 0x25
+'Jin ',    # 0x26
+'Guan ',    # 0x27
+'Mao ',    # 0x28
+'Chang ',    # 0x29
+'Tian ',    # 0x2a
+'Xi ',    # 0x2b
+'Lian ',    # 0x2c
+'Tao ',    # 0x2d
+'Gu ',    # 0x2e
+'Cuo ',    # 0x2f
+'Shu ',    # 0x30
+'Zhen ',    # 0x31
+'Lu ',    # 0x32
+'Meng ',    # 0x33
+'Lu ',    # 0x34
+'Hua ',    # 0x35
+'Biao ',    # 0x36
+'Ga ',    # 0x37
+'Lai ',    # 0x38
+'Ken ',    # 0x39
+'Kazari ',    # 0x3a
+'Bu ',    # 0x3b
+'Nai ',    # 0x3c
+'Wan ',    # 0x3d
+'Zan ',    # 0x3e
+'[?] ',    # 0x3f
+'De ',    # 0x40
+'Xian ',    # 0x41
+'[?] ',    # 0x42
+'Huo ',    # 0x43
+'Liang ',    # 0x44
+'[?] ',    # 0x45
+'Men ',    # 0x46
+'Kai ',    # 0x47
+'Ying ',    # 0x48
+'Di ',    # 0x49
+'Lian ',    # 0x4a
+'Guo ',    # 0x4b
+'Xian ',    # 0x4c
+'Du ',    # 0x4d
+'Tu ',    # 0x4e
+'Wei ',    # 0x4f
+'Cong ',    # 0x50
+'Fu ',    # 0x51
+'Rou ',    # 0x52
+'Ji ',    # 0x53
+'E ',    # 0x54
+'Rou ',    # 0x55
+'Chen ',    # 0x56
+'Ti ',    # 0x57
+'Zha ',    # 0x58
+'Hong ',    # 0x59
+'Yang ',    # 0x5a
+'Duan ',    # 0x5b
+'Xia ',    # 0x5c
+'Yu ',    # 0x5d
+'Keng ',    # 0x5e
+'Xing ',    # 0x5f
+'Huang ',    # 0x60
+'Wei ',    # 0x61
+'Fu ',    # 0x62
+'Zhao ',    # 0x63
+'Cha ',    # 0x64
+'Qie ',    # 0x65
+'She ',    # 0x66
+'Hong ',    # 0x67
+'Kui ',    # 0x68
+'Tian ',    # 0x69
+'Mou ',    # 0x6a
+'Qiao ',    # 0x6b
+'Qiao ',    # 0x6c
+'Hou ',    # 0x6d
+'Tou ',    # 0x6e
+'Cong ',    # 0x6f
+'Huan ',    # 0x70
+'Ye ',    # 0x71
+'Min ',    # 0x72
+'Jian ',    # 0x73
+'Duan ',    # 0x74
+'Jian ',    # 0x75
+'Song ',    # 0x76
+'Kui ',    # 0x77
+'Hu ',    # 0x78
+'Xuan ',    # 0x79
+'Duo ',    # 0x7a
+'Jie ',    # 0x7b
+'Zhen ',    # 0x7c
+'Bian ',    # 0x7d
+'Zhong ',    # 0x7e
+'Zi ',    # 0x7f
+'Xiu ',    # 0x80
+'Ye ',    # 0x81
+'Mei ',    # 0x82
+'Pai ',    # 0x83
+'Ai ',    # 0x84
+'Jie ',    # 0x85
+'[?] ',    # 0x86
+'Mei ',    # 0x87
+'Chuo ',    # 0x88
+'Ta ',    # 0x89
+'Bang ',    # 0x8a
+'Xia ',    # 0x8b
+'Lian ',    # 0x8c
+'Suo ',    # 0x8d
+'Xi ',    # 0x8e
+'Liu ',    # 0x8f
+'Zu ',    # 0x90
+'Ye ',    # 0x91
+'Nou ',    # 0x92
+'Weng ',    # 0x93
+'Rong ',    # 0x94
+'Tang ',    # 0x95
+'Suo ',    # 0x96
+'Qiang ',    # 0x97
+'Ge ',    # 0x98
+'Shuo ',    # 0x99
+'Chui ',    # 0x9a
+'Bo ',    # 0x9b
+'Pan ',    # 0x9c
+'Sa ',    # 0x9d
+'Bi ',    # 0x9e
+'Sang ',    # 0x9f
+'Gang ',    # 0xa0
+'Zi ',    # 0xa1
+'Wu ',    # 0xa2
+'Ying ',    # 0xa3
+'Huang ',    # 0xa4
+'Tiao ',    # 0xa5
+'Liu ',    # 0xa6
+'Kai ',    # 0xa7
+'Sun ',    # 0xa8
+'Sha ',    # 0xa9
+'Sou ',    # 0xaa
+'Wan ',    # 0xab
+'Hao ',    # 0xac
+'Zhen ',    # 0xad
+'Zhen ',    # 0xae
+'Luo ',    # 0xaf
+'Yi ',    # 0xb0
+'Yuan ',    # 0xb1
+'Tang ',    # 0xb2
+'Nie ',    # 0xb3
+'Xi ',    # 0xb4
+'Jia ',    # 0xb5
+'Ge ',    # 0xb6
+'Ma ',    # 0xb7
+'Juan ',    # 0xb8
+'Kasugai ',    # 0xb9
+'Habaki ',    # 0xba
+'Suo ',    # 0xbb
+'[?] ',    # 0xbc
+'[?] ',    # 0xbd
+'[?] ',    # 0xbe
+'Na ',    # 0xbf
+'Lu ',    # 0xc0
+'Suo ',    # 0xc1
+'Ou ',    # 0xc2
+'Zu ',    # 0xc3
+'Tuan ',    # 0xc4
+'Xiu ',    # 0xc5
+'Guan ',    # 0xc6
+'Xuan ',    # 0xc7
+'Lian ',    # 0xc8
+'Shou ',    # 0xc9
+'Ao ',    # 0xca
+'Man ',    # 0xcb
+'Mo ',    # 0xcc
+'Luo ',    # 0xcd
+'Bi ',    # 0xce
+'Wei ',    # 0xcf
+'Liu ',    # 0xd0
+'Di ',    # 0xd1
+'Qiao ',    # 0xd2
+'Cong ',    # 0xd3
+'Yi ',    # 0xd4
+'Lu ',    # 0xd5
+'Ao ',    # 0xd6
+'Keng ',    # 0xd7
+'Qiang ',    # 0xd8
+'Cui ',    # 0xd9
+'Qi ',    # 0xda
+'Chang ',    # 0xdb
+'Tang ',    # 0xdc
+'Man ',    # 0xdd
+'Yong ',    # 0xde
+'Chan ',    # 0xdf
+'Feng ',    # 0xe0
+'Jing ',    # 0xe1
+'Biao ',    # 0xe2
+'Shu ',    # 0xe3
+'Lou ',    # 0xe4
+'Xiu ',    # 0xe5
+'Cong ',    # 0xe6
+'Long ',    # 0xe7
+'Zan ',    # 0xe8
+'Jian ',    # 0xe9
+'Cao ',    # 0xea
+'Li ',    # 0xeb
+'Xia ',    # 0xec
+'Xi ',    # 0xed
+'Kang ',    # 0xee
+'[?] ',    # 0xef
+'Beng ',    # 0xf0
+'[?] ',    # 0xf1
+'[?] ',    # 0xf2
+'Zheng ',    # 0xf3
+'Lu ',    # 0xf4
+'Hua ',    # 0xf5
+'Ji ',    # 0xf6
+'Pu ',    # 0xf7
+'Hui ',    # 0xf8
+'Qiang ',    # 0xf9
+'Po ',    # 0xfa
+'Lin ',    # 0xfb
+'Suo ',    # 0xfc
+'Xiu ',    # 0xfd
+'San ',    # 0xfe
+'Cheng ',    # 0xff
+)
diff --git a/lib/unidecode/x094.py b/lib/unidecode/x094.py
new file mode 100644
index 00000000..17eb9ddb
--- /dev/null
+++ b/lib/unidecode/x094.py
@@ -0,0 +1,258 @@
+data = (
+'Kui ',    # 0x00
+'Si ',    # 0x01
+'Liu ',    # 0x02
+'Nao ',    # 0x03
+'Heng ',    # 0x04
+'Pie ',    # 0x05
+'Sui ',    # 0x06
+'Fan ',    # 0x07
+'Qiao ',    # 0x08
+'Quan ',    # 0x09
+'Yang ',    # 0x0a
+'Tang ',    # 0x0b
+'Xiang ',    # 0x0c
+'Jue ',    # 0x0d
+'Jiao ',    # 0x0e
+'Zun ',    # 0x0f
+'Liao ',    # 0x10
+'Jie ',    # 0x11
+'Lao ',    # 0x12
+'Dui ',    # 0x13
+'Tan ',    # 0x14
+'Zan ',    # 0x15
+'Ji ',    # 0x16
+'Jian ',    # 0x17
+'Zhong ',    # 0x18
+'Deng ',    # 0x19
+'Ya ',    # 0x1a
+'Ying ',    # 0x1b
+'Dui ',    # 0x1c
+'Jue ',    # 0x1d
+'Nou ',    # 0x1e
+'Ti ',    # 0x1f
+'Pu ',    # 0x20
+'Tie ',    # 0x21
+'[?] ',    # 0x22
+'[?] ',    # 0x23
+'Ding ',    # 0x24
+'Shan ',    # 0x25
+'Kai ',    # 0x26
+'Jian ',    # 0x27
+'Fei ',    # 0x28
+'Sui ',    # 0x29
+'Lu ',    # 0x2a
+'Juan ',    # 0x2b
+'Hui ',    # 0x2c
+'Yu ',    # 0x2d
+'Lian ',    # 0x2e
+'Zhuo ',    # 0x2f
+'Qiao ',    # 0x30
+'Qian ',    # 0x31
+'Zhuo ',    # 0x32
+'Lei ',    # 0x33
+'Bi ',    # 0x34
+'Tie ',    # 0x35
+'Huan ',    # 0x36
+'Ye ',    # 0x37
+'Duo ',    # 0x38
+'Guo ',    # 0x39
+'Dang ',    # 0x3a
+'Ju ',    # 0x3b
+'Fen ',    # 0x3c
+'Da ',    # 0x3d
+'Bei ',    # 0x3e
+'Yi ',    # 0x3f
+'Ai ',    # 0x40
+'Zong ',    # 0x41
+'Xun ',    # 0x42
+'Diao ',    # 0x43
+'Zhu ',    # 0x44
+'Heng ',    # 0x45
+'Zhui ',    # 0x46
+'Ji ',    # 0x47
+'Nie ',    # 0x48
+'Ta ',    # 0x49
+'Huo ',    # 0x4a
+'Qing ',    # 0x4b
+'Bin ',    # 0x4c
+'Ying ',    # 0x4d
+'Kui ',    # 0x4e
+'Ning ',    # 0x4f
+'Xu ',    # 0x50
+'Jian ',    # 0x51
+'Jian ',    # 0x52
+'Yari ',    # 0x53
+'Cha ',    # 0x54
+'Zhi ',    # 0x55
+'Mie ',    # 0x56
+'Li ',    # 0x57
+'Lei ',    # 0x58
+'Ji ',    # 0x59
+'Zuan ',    # 0x5a
+'Kuang ',    # 0x5b
+'Shang ',    # 0x5c
+'Peng ',    # 0x5d
+'La ',    # 0x5e
+'Du ',    # 0x5f
+'Shuo ',    # 0x60
+'Chuo ',    # 0x61
+'Lu ',    # 0x62
+'Biao ',    # 0x63
+'Bao ',    # 0x64
+'Lu ',    # 0x65
+'[?] ',    # 0x66
+'[?] ',    # 0x67
+'Long ',    # 0x68
+'E ',    # 0x69
+'Lu ',    # 0x6a
+'Xin ',    # 0x6b
+'Jian ',    # 0x6c
+'Lan ',    # 0x6d
+'Bo ',    # 0x6e
+'Jian ',    # 0x6f
+'Yao ',    # 0x70
+'Chan ',    # 0x71
+'Xiang ',    # 0x72
+'Jian ',    # 0x73
+'Xi ',    # 0x74
+'Guan ',    # 0x75
+'Cang ',    # 0x76
+'Nie ',    # 0x77
+'Lei ',    # 0x78
+'Cuan ',    # 0x79
+'Qu ',    # 0x7a
+'Pan ',    # 0x7b
+'Luo ',    # 0x7c
+'Zuan ',    # 0x7d
+'Luan ',    # 0x7e
+'Zao ',    # 0x7f
+'Nie ',    # 0x80
+'Jue ',    # 0x81
+'Tang ',    # 0x82
+'Shu ',    # 0x83
+'Lan ',    # 0x84
+'Jin ',    # 0x85
+'Qiu ',    # 0x86
+'Yi ',    # 0x87
+'Zhen ',    # 0x88
+'Ding ',    # 0x89
+'Zhao ',    # 0x8a
+'Po ',    # 0x8b
+'Diao ',    # 0x8c
+'Tu ',    # 0x8d
+'Qian ',    # 0x8e
+'Chuan ',    # 0x8f
+'Shan ',    # 0x90
+'Ji ',    # 0x91
+'Fan ',    # 0x92
+'Diao ',    # 0x93
+'Men ',    # 0x94
+'Nu ',    # 0x95
+'Xi ',    # 0x96
+'Chai ',    # 0x97
+'Xing ',    # 0x98
+'Gai ',    # 0x99
+'Bu ',    # 0x9a
+'Tai ',    # 0x9b
+'Ju ',    # 0x9c
+'Dun ',    # 0x9d
+'Chao ',    # 0x9e
+'Zhong ',    # 0x9f
+'Na ',    # 0xa0
+'Bei ',    # 0xa1
+'Gang ',    # 0xa2
+'Ban ',    # 0xa3
+'Qian ',    # 0xa4
+'Yao ',    # 0xa5
+'Qin ',    # 0xa6
+'Jun ',    # 0xa7
+'Wu ',    # 0xa8
+'Gou ',    # 0xa9
+'Kang ',    # 0xaa
+'Fang ',    # 0xab
+'Huo ',    # 0xac
+'Tou ',    # 0xad
+'Niu ',    # 0xae
+'Ba ',    # 0xaf
+'Yu ',    # 0xb0
+'Qian ',    # 0xb1
+'Zheng ',    # 0xb2
+'Qian ',    # 0xb3
+'Gu ',    # 0xb4
+'Bo ',    # 0xb5
+'E ',    # 0xb6
+'Po ',    # 0xb7
+'Bu ',    # 0xb8
+'Ba ',    # 0xb9
+'Yue ',    # 0xba
+'Zuan ',    # 0xbb
+'Mu ',    # 0xbc
+'Dan ',    # 0xbd
+'Jia ',    # 0xbe
+'Dian ',    # 0xbf
+'You ',    # 0xc0
+'Tie ',    # 0xc1
+'Bo ',    # 0xc2
+'Ling ',    # 0xc3
+'Shuo ',    # 0xc4
+'Qian ',    # 0xc5
+'Liu ',    # 0xc6
+'Bao ',    # 0xc7
+'Shi ',    # 0xc8
+'Xuan ',    # 0xc9
+'She ',    # 0xca
+'Bi ',    # 0xcb
+'Ni ',    # 0xcc
+'Pi ',    # 0xcd
+'Duo ',    # 0xce
+'Xing ',    # 0xcf
+'Kao ',    # 0xd0
+'Lao ',    # 0xd1
+'Er ',    # 0xd2
+'Mang ',    # 0xd3
+'Ya ',    # 0xd4
+'You ',    # 0xd5
+'Cheng ',    # 0xd6
+'Jia ',    # 0xd7
+'Ye ',    # 0xd8
+'Nao ',    # 0xd9
+'Zhi ',    # 0xda
+'Dang ',    # 0xdb
+'Tong ',    # 0xdc
+'Lu ',    # 0xdd
+'Diao ',    # 0xde
+'Yin ',    # 0xdf
+'Kai ',    # 0xe0
+'Zha ',    # 0xe1
+'Zhu ',    # 0xe2
+'Xian ',    # 0xe3
+'Ting ',    # 0xe4
+'Diu ',    # 0xe5
+'Xian ',    # 0xe6
+'Hua ',    # 0xe7
+'Quan ',    # 0xe8
+'Sha ',    # 0xe9
+'Jia ',    # 0xea
+'Yao ',    # 0xeb
+'Ge ',    # 0xec
+'Ming ',    # 0xed
+'Zheng ',    # 0xee
+'Se ',    # 0xef
+'Jiao ',    # 0xf0
+'Yi ',    # 0xf1
+'Chan ',    # 0xf2
+'Chong ',    # 0xf3
+'Tang ',    # 0xf4
+'An ',    # 0xf5
+'Yin ',    # 0xf6
+'Ru ',    # 0xf7
+'Zhu ',    # 0xf8
+'Lao ',    # 0xf9
+'Pu ',    # 0xfa
+'Wu ',    # 0xfb
+'Lai ',    # 0xfc
+'Te ',    # 0xfd
+'Lian ',    # 0xfe
+'Keng ',    # 0xff
+)
diff --git a/lib/unidecode/x095.py b/lib/unidecode/x095.py
new file mode 100644
index 00000000..4b363942
--- /dev/null
+++ b/lib/unidecode/x095.py
@@ -0,0 +1,258 @@
+data = (
+'Xiao ',    # 0x00
+'Suo ',    # 0x01
+'Li ',    # 0x02
+'Zheng ',    # 0x03
+'Chu ',    # 0x04
+'Guo ',    # 0x05
+'Gao ',    # 0x06
+'Tie ',    # 0x07
+'Xiu ',    # 0x08
+'Cuo ',    # 0x09
+'Lue ',    # 0x0a
+'Feng ',    # 0x0b
+'Xin ',    # 0x0c
+'Liu ',    # 0x0d
+'Kai ',    # 0x0e
+'Jian ',    # 0x0f
+'Rui ',    # 0x10
+'Ti ',    # 0x11
+'Lang ',    # 0x12
+'Qian ',    # 0x13
+'Ju ',    # 0x14
+'A ',    # 0x15
+'Qiang ',    # 0x16
+'Duo ',    # 0x17
+'Tian ',    # 0x18
+'Cuo ',    # 0x19
+'Mao ',    # 0x1a
+'Ben ',    # 0x1b
+'Qi ',    # 0x1c
+'De ',    # 0x1d
+'Kua ',    # 0x1e
+'Kun ',    # 0x1f
+'Chang ',    # 0x20
+'Xi ',    # 0x21
+'Gu ',    # 0x22
+'Luo ',    # 0x23
+'Chui ',    # 0x24
+'Zhui ',    # 0x25
+'Jin ',    # 0x26
+'Zhi ',    # 0x27
+'Xian ',    # 0x28
+'Juan ',    # 0x29
+'Huo ',    # 0x2a
+'Pou ',    # 0x2b
+'Tan ',    # 0x2c
+'Ding ',    # 0x2d
+'Jian ',    # 0x2e
+'Ju ',    # 0x2f
+'Meng ',    # 0x30
+'Zi ',    # 0x31
+'Qie ',    # 0x32
+'Ying ',    # 0x33
+'Kai ',    # 0x34
+'Qiang ',    # 0x35
+'Song ',    # 0x36
+'E ',    # 0x37
+'Cha ',    # 0x38
+'Qiao ',    # 0x39
+'Zhong ',    # 0x3a
+'Duan ',    # 0x3b
+'Sou ',    # 0x3c
+'Huang ',    # 0x3d
+'Huan ',    # 0x3e
+'Ai ',    # 0x3f
+'Du ',    # 0x40
+'Mei ',    # 0x41
+'Lou ',    # 0x42
+'Zi ',    # 0x43
+'Fei ',    # 0x44
+'Mei ',    # 0x45
+'Mo ',    # 0x46
+'Zhen ',    # 0x47
+'Bo ',    # 0x48
+'Ge ',    # 0x49
+'Nie ',    # 0x4a
+'Tang ',    # 0x4b
+'Juan ',    # 0x4c
+'Nie ',    # 0x4d
+'Na ',    # 0x4e
+'Liu ',    # 0x4f
+'Hao ',    # 0x50
+'Bang ',    # 0x51
+'Yi ',    # 0x52
+'Jia ',    # 0x53
+'Bin ',    # 0x54
+'Rong ',    # 0x55
+'Biao ',    # 0x56
+'Tang ',    # 0x57
+'Man ',    # 0x58
+'Luo ',    # 0x59
+'Beng ',    # 0x5a
+'Yong ',    # 0x5b
+'Jing ',    # 0x5c
+'Di ',    # 0x5d
+'Zu ',    # 0x5e
+'Xuan ',    # 0x5f
+'Liu ',    # 0x60
+'Tan ',    # 0x61
+'Jue ',    # 0x62
+'Liao ',    # 0x63
+'Pu ',    # 0x64
+'Lu ',    # 0x65
+'Dui ',    # 0x66
+'Lan ',    # 0x67
+'Pu ',    # 0x68
+'Cuan ',    # 0x69
+'Qiang ',    # 0x6a
+'Deng ',    # 0x6b
+'Huo ',    # 0x6c
+'Lei ',    # 0x6d
+'Huan ',    # 0x6e
+'Zhuo ',    # 0x6f
+'Lian ',    # 0x70
+'Yi ',    # 0x71
+'Cha ',    # 0x72
+'Biao ',    # 0x73
+'La ',    # 0x74
+'Chan ',    # 0x75
+'Xiang ',    # 0x76
+'Chang ',    # 0x77
+'Chang ',    # 0x78
+'Jiu ',    # 0x79
+'Ao ',    # 0x7a
+'Die ',    # 0x7b
+'Qu ',    # 0x7c
+'Liao ',    # 0x7d
+'Mi ',    # 0x7e
+'Chang ',    # 0x7f
+'Men ',    # 0x80
+'Ma ',    # 0x81
+'Shuan ',    # 0x82
+'Shan ',    # 0x83
+'Huo ',    # 0x84
+'Men ',    # 0x85
+'Yan ',    # 0x86
+'Bi ',    # 0x87
+'Han ',    # 0x88
+'Bi ',    # 0x89
+'San ',    # 0x8a
+'Kai ',    # 0x8b
+'Kang ',    # 0x8c
+'Beng ',    # 0x8d
+'Hong ',    # 0x8e
+'Run ',    # 0x8f
+'San ',    # 0x90
+'Xian ',    # 0x91
+'Xian ',    # 0x92
+'Jian ',    # 0x93
+'Min ',    # 0x94
+'Xia ',    # 0x95
+'Yuru ',    # 0x96
+'Dou ',    # 0x97
+'Zha ',    # 0x98
+'Nao ',    # 0x99
+'Jian ',    # 0x9a
+'Peng ',    # 0x9b
+'Xia ',    # 0x9c
+'Ling ',    # 0x9d
+'Bian ',    # 0x9e
+'Bi ',    # 0x9f
+'Run ',    # 0xa0
+'He ',    # 0xa1
+'Guan ',    # 0xa2
+'Ge ',    # 0xa3
+'Ge ',    # 0xa4
+'Fa ',    # 0xa5
+'Chu ',    # 0xa6
+'Hong ',    # 0xa7
+'Gui ',    # 0xa8
+'Min ',    # 0xa9
+'Se ',    # 0xaa
+'Kun ',    # 0xab
+'Lang ',    # 0xac
+'Lu ',    # 0xad
+'Ting ',    # 0xae
+'Sha ',    # 0xaf
+'Ju ',    # 0xb0
+'Yue ',    # 0xb1
+'Yue ',    # 0xb2
+'Chan ',    # 0xb3
+'Qu ',    # 0xb4
+'Lin ',    # 0xb5
+'Chang ',    # 0xb6
+'Shai ',    # 0xb7
+'Kun ',    # 0xb8
+'Yan ',    # 0xb9
+'Min ',    # 0xba
+'Yan ',    # 0xbb
+'E ',    # 0xbc
+'Hun ',    # 0xbd
+'Yu ',    # 0xbe
+'Wen ',    # 0xbf
+'Xiang ',    # 0xc0
+'Bao ',    # 0xc1
+'Xiang ',    # 0xc2
+'Qu ',    # 0xc3
+'Yao ',    # 0xc4
+'Wen ',    # 0xc5
+'Ban ',    # 0xc6
+'An ',    # 0xc7
+'Wei ',    # 0xc8
+'Yin ',    # 0xc9
+'Kuo ',    # 0xca
+'Que ',    # 0xcb
+'Lan ',    # 0xcc
+'Du ',    # 0xcd
+'[?] ',    # 0xce
+'Phwung ',    # 0xcf
+'Tian ',    # 0xd0
+'Nie ',    # 0xd1
+'Ta ',    # 0xd2
+'Kai ',    # 0xd3
+'He ',    # 0xd4
+'Que ',    # 0xd5
+'Chuang ',    # 0xd6
+'Guan ',    # 0xd7
+'Dou ',    # 0xd8
+'Qi ',    # 0xd9
+'Kui ',    # 0xda
+'Tang ',    # 0xdb
+'Guan ',    # 0xdc
+'Piao ',    # 0xdd
+'Kan ',    # 0xde
+'Xi ',    # 0xdf
+'Hui ',    # 0xe0
+'Chan ',    # 0xe1
+'Pi ',    # 0xe2
+'Dang ',    # 0xe3
+'Huan ',    # 0xe4
+'Ta ',    # 0xe5
+'Wen ',    # 0xe6
+'[?] ',    # 0xe7
+'Men ',    # 0xe8
+'Shuan ',    # 0xe9
+'Shan ',    # 0xea
+'Yan ',    # 0xeb
+'Han ',    # 0xec
+'Bi ',    # 0xed
+'Wen ',    # 0xee
+'Chuang ',    # 0xef
+'Run ',    # 0xf0
+'Wei ',    # 0xf1
+'Xian ',    # 0xf2
+'Hong ',    # 0xf3
+'Jian ',    # 0xf4
+'Min ',    # 0xf5
+'Kang ',    # 0xf6
+'Men ',    # 0xf7
+'Zha ',    # 0xf8
+'Nao ',    # 0xf9
+'Gui ',    # 0xfa
+'Wen ',    # 0xfb
+'Ta ',    # 0xfc
+'Min ',    # 0xfd
+'Lu ',    # 0xfe
+'Kai ',    # 0xff
+)
diff --git a/lib/unidecode/x096.py b/lib/unidecode/x096.py
new file mode 100644
index 00000000..738a4ea3
--- /dev/null
+++ b/lib/unidecode/x096.py
@@ -0,0 +1,258 @@
+data = (
+'Fa ',    # 0x00
+'Ge ',    # 0x01
+'He ',    # 0x02
+'Kun ',    # 0x03
+'Jiu ',    # 0x04
+'Yue ',    # 0x05
+'Lang ',    # 0x06
+'Du ',    # 0x07
+'Yu ',    # 0x08
+'Yan ',    # 0x09
+'Chang ',    # 0x0a
+'Xi ',    # 0x0b
+'Wen ',    # 0x0c
+'Hun ',    # 0x0d
+'Yan ',    # 0x0e
+'E ',    # 0x0f
+'Chan ',    # 0x10
+'Lan ',    # 0x11
+'Qu ',    # 0x12
+'Hui ',    # 0x13
+'Kuo ',    # 0x14
+'Que ',    # 0x15
+'Ge ',    # 0x16
+'Tian ',    # 0x17
+'Ta ',    # 0x18
+'Que ',    # 0x19
+'Kan ',    # 0x1a
+'Huan ',    # 0x1b
+'Fu ',    # 0x1c
+'Fu ',    # 0x1d
+'Le ',    # 0x1e
+'Dui ',    # 0x1f
+'Xin ',    # 0x20
+'Qian ',    # 0x21
+'Wu ',    # 0x22
+'Yi ',    # 0x23
+'Tuo ',    # 0x24
+'Yin ',    # 0x25
+'Yang ',    # 0x26
+'Dou ',    # 0x27
+'E ',    # 0x28
+'Sheng ',    # 0x29
+'Ban ',    # 0x2a
+'Pei ',    # 0x2b
+'Keng ',    # 0x2c
+'Yun ',    # 0x2d
+'Ruan ',    # 0x2e
+'Zhi ',    # 0x2f
+'Pi ',    # 0x30
+'Jing ',    # 0x31
+'Fang ',    # 0x32
+'Yang ',    # 0x33
+'Yin ',    # 0x34
+'Zhen ',    # 0x35
+'Jie ',    # 0x36
+'Cheng ',    # 0x37
+'E ',    # 0x38
+'Qu ',    # 0x39
+'Di ',    # 0x3a
+'Zu ',    # 0x3b
+'Zuo ',    # 0x3c
+'Dian ',    # 0x3d
+'Ling ',    # 0x3e
+'A ',    # 0x3f
+'Tuo ',    # 0x40
+'Tuo ',    # 0x41
+'Po ',    # 0x42
+'Bing ',    # 0x43
+'Fu ',    # 0x44
+'Ji ',    # 0x45
+'Lu ',    # 0x46
+'Long ',    # 0x47
+'Chen ',    # 0x48
+'Xing ',    # 0x49
+'Duo ',    # 0x4a
+'Lou ',    # 0x4b
+'Mo ',    # 0x4c
+'Jiang ',    # 0x4d
+'Shu ',    # 0x4e
+'Duo ',    # 0x4f
+'Xian ',    # 0x50
+'Er ',    # 0x51
+'Gui ',    # 0x52
+'Yu ',    # 0x53
+'Gai ',    # 0x54
+'Shan ',    # 0x55
+'Xun ',    # 0x56
+'Qiao ',    # 0x57
+'Xing ',    # 0x58
+'Chun ',    # 0x59
+'Fu ',    # 0x5a
+'Bi ',    # 0x5b
+'Xia ',    # 0x5c
+'Shan ',    # 0x5d
+'Sheng ',    # 0x5e
+'Zhi ',    # 0x5f
+'Pu ',    # 0x60
+'Dou ',    # 0x61
+'Yuan ',    # 0x62
+'Zhen ',    # 0x63
+'Chu ',    # 0x64
+'Xian ',    # 0x65
+'Tou ',    # 0x66
+'Nie ',    # 0x67
+'Yun ',    # 0x68
+'Xian ',    # 0x69
+'Pei ',    # 0x6a
+'Pei ',    # 0x6b
+'Zou ',    # 0x6c
+'Yi ',    # 0x6d
+'Dui ',    # 0x6e
+'Lun ',    # 0x6f
+'Yin ',    # 0x70
+'Ju ',    # 0x71
+'Chui ',    # 0x72
+'Chen ',    # 0x73
+'Pi ',    # 0x74
+'Ling ',    # 0x75
+'Tao ',    # 0x76
+'Xian ',    # 0x77
+'Lu ',    # 0x78
+'Sheng ',    # 0x79
+'Xian ',    # 0x7a
+'Yin ',    # 0x7b
+'Zhu ',    # 0x7c
+'Yang ',    # 0x7d
+'Reng ',    # 0x7e
+'Shan ',    # 0x7f
+'Chong ',    # 0x80
+'Yan ',    # 0x81
+'Yin ',    # 0x82
+'Yu ',    # 0x83
+'Ti ',    # 0x84
+'Yu ',    # 0x85
+'Long ',    # 0x86
+'Wei ',    # 0x87
+'Wei ',    # 0x88
+'Nie ',    # 0x89
+'Dui ',    # 0x8a
+'Sui ',    # 0x8b
+'An ',    # 0x8c
+'Huang ',    # 0x8d
+'Jie ',    # 0x8e
+'Sui ',    # 0x8f
+'Yin ',    # 0x90
+'Gai ',    # 0x91
+'Yan ',    # 0x92
+'Hui ',    # 0x93
+'Ge ',    # 0x94
+'Yun ',    # 0x95
+'Wu ',    # 0x96
+'Wei ',    # 0x97
+'Ai ',    # 0x98
+'Xi ',    # 0x99
+'Tang ',    # 0x9a
+'Ji ',    # 0x9b
+'Zhang ',    # 0x9c
+'Dao ',    # 0x9d
+'Ao ',    # 0x9e
+'Xi ',    # 0x9f
+'Yin ',    # 0xa0
+'[?] ',    # 0xa1
+'Rao ',    # 0xa2
+'Lin ',    # 0xa3
+'Tui ',    # 0xa4
+'Deng ',    # 0xa5
+'Pi ',    # 0xa6
+'Sui ',    # 0xa7
+'Sui ',    # 0xa8
+'Yu ',    # 0xa9
+'Xian ',    # 0xaa
+'Fen ',    # 0xab
+'Ni ',    # 0xac
+'Er ',    # 0xad
+'Ji ',    # 0xae
+'Dao ',    # 0xaf
+'Xi ',    # 0xb0
+'Yin ',    # 0xb1
+'E ',    # 0xb2
+'Hui ',    # 0xb3
+'Long ',    # 0xb4
+'Xi ',    # 0xb5
+'Li ',    # 0xb6
+'Li ',    # 0xb7
+'Li ',    # 0xb8
+'Zhui ',    # 0xb9
+'He ',    # 0xba
+'Zhi ',    # 0xbb
+'Zhun ',    # 0xbc
+'Jun ',    # 0xbd
+'Nan ',    # 0xbe
+'Yi ',    # 0xbf
+'Que ',    # 0xc0
+'Yan ',    # 0xc1
+'Qian ',    # 0xc2
+'Ya ',    # 0xc3
+'Xiong ',    # 0xc4
+'Ya ',    # 0xc5
+'Ji ',    # 0xc6
+'Gu ',    # 0xc7
+'Huan ',    # 0xc8
+'Zhi ',    # 0xc9
+'Gou ',    # 0xca
+'Jun ',    # 0xcb
+'Ci ',    # 0xcc
+'Yong ',    # 0xcd
+'Ju ',    # 0xce
+'Chu ',    # 0xcf
+'Hu ',    # 0xd0
+'Za ',    # 0xd1
+'Luo ',    # 0xd2
+'Yu ',    # 0xd3
+'Chou ',    # 0xd4
+'Diao ',    # 0xd5
+'Sui ',    # 0xd6
+'Han ',    # 0xd7
+'Huo ',    # 0xd8
+'Shuang ',    # 0xd9
+'Guan ',    # 0xda
+'Chu ',    # 0xdb
+'Za ',    # 0xdc
+'Yong ',    # 0xdd
+'Ji ',    # 0xde
+'Xi ',    # 0xdf
+'Chou ',    # 0xe0
+'Liu ',    # 0xe1
+'Li ',    # 0xe2
+'Nan ',    # 0xe3
+'Xue ',    # 0xe4
+'Za ',    # 0xe5
+'Ji ',    # 0xe6
+'Ji ',    # 0xe7
+'Yu ',    # 0xe8
+'Yu ',    # 0xe9
+'Xue ',    # 0xea
+'Na ',    # 0xeb
+'Fou ',    # 0xec
+'Se ',    # 0xed
+'Mu ',    # 0xee
+'Wen ',    # 0xef
+'Fen ',    # 0xf0
+'Pang ',    # 0xf1
+'Yun ',    # 0xf2
+'Li ',    # 0xf3
+'Li ',    # 0xf4
+'Ang ',    # 0xf5
+'Ling ',    # 0xf6
+'Lei ',    # 0xf7
+'An ',    # 0xf8
+'Bao ',    # 0xf9
+'Meng ',    # 0xfa
+'Dian ',    # 0xfb
+'Dang ',    # 0xfc
+'Xing ',    # 0xfd
+'Wu ',    # 0xfe
+'Zhao ',    # 0xff
+)
diff --git a/lib/unidecode/x097.py b/lib/unidecode/x097.py
new file mode 100644
index 00000000..7255f0f8
--- /dev/null
+++ b/lib/unidecode/x097.py
@@ -0,0 +1,258 @@
+data = (
+'Xu ',    # 0x00
+'Ji ',    # 0x01
+'Mu ',    # 0x02
+'Chen ',    # 0x03
+'Xiao ',    # 0x04
+'Zha ',    # 0x05
+'Ting ',    # 0x06
+'Zhen ',    # 0x07
+'Pei ',    # 0x08
+'Mei ',    # 0x09
+'Ling ',    # 0x0a
+'Qi ',    # 0x0b
+'Chou ',    # 0x0c
+'Huo ',    # 0x0d
+'Sha ',    # 0x0e
+'Fei ',    # 0x0f
+'Weng ',    # 0x10
+'Zhan ',    # 0x11
+'Yin ',    # 0x12
+'Ni ',    # 0x13
+'Chou ',    # 0x14
+'Tun ',    # 0x15
+'Lin ',    # 0x16
+'[?] ',    # 0x17
+'Dong ',    # 0x18
+'Ying ',    # 0x19
+'Wu ',    # 0x1a
+'Ling ',    # 0x1b
+'Shuang ',    # 0x1c
+'Ling ',    # 0x1d
+'Xia ',    # 0x1e
+'Hong ',    # 0x1f
+'Yin ',    # 0x20
+'Mo ',    # 0x21
+'Mai ',    # 0x22
+'Yun ',    # 0x23
+'Liu ',    # 0x24
+'Meng ',    # 0x25
+'Bin ',    # 0x26
+'Wu ',    # 0x27
+'Wei ',    # 0x28
+'Huo ',    # 0x29
+'Yin ',    # 0x2a
+'Xi ',    # 0x2b
+'Yi ',    # 0x2c
+'Ai ',    # 0x2d
+'Dan ',    # 0x2e
+'Deng ',    # 0x2f
+'Xian ',    # 0x30
+'Yu ',    # 0x31
+'Lu ',    # 0x32
+'Long ',    # 0x33
+'Dai ',    # 0x34
+'Ji ',    # 0x35
+'Pang ',    # 0x36
+'Yang ',    # 0x37
+'Ba ',    # 0x38
+'Pi ',    # 0x39
+'Wei ',    # 0x3a
+'[?] ',    # 0x3b
+'Xi ',    # 0x3c
+'Ji ',    # 0x3d
+'Mai ',    # 0x3e
+'Meng ',    # 0x3f
+'Meng ',    # 0x40
+'Lei ',    # 0x41
+'Li ',    # 0x42
+'Huo ',    # 0x43
+'Ai ',    # 0x44
+'Fei ',    # 0x45
+'Dai ',    # 0x46
+'Long ',    # 0x47
+'Ling ',    # 0x48
+'Ai ',    # 0x49
+'Feng ',    # 0x4a
+'Li ',    # 0x4b
+'Bao ',    # 0x4c
+'[?] ',    # 0x4d
+'He ',    # 0x4e
+'He ',    # 0x4f
+'Bing ',    # 0x50
+'Qing ',    # 0x51
+'Qing ',    # 0x52
+'Jing ',    # 0x53
+'Tian ',    # 0x54
+'Zhen ',    # 0x55
+'Jing ',    # 0x56
+'Cheng ',    # 0x57
+'Qing ',    # 0x58
+'Jing ',    # 0x59
+'Jing ',    # 0x5a
+'Dian ',    # 0x5b
+'Jing ',    # 0x5c
+'Tian ',    # 0x5d
+'Fei ',    # 0x5e
+'Fei ',    # 0x5f
+'Kao ',    # 0x60
+'Mi ',    # 0x61
+'Mian ',    # 0x62
+'Mian ',    # 0x63
+'Pao ',    # 0x64
+'Ye ',    # 0x65
+'Tian ',    # 0x66
+'Hui ',    # 0x67
+'Ye ',    # 0x68
+'Ge ',    # 0x69
+'Ding ',    # 0x6a
+'Cha ',    # 0x6b
+'Jian ',    # 0x6c
+'Ren ',    # 0x6d
+'Di ',    # 0x6e
+'Du ',    # 0x6f
+'Wu ',    # 0x70
+'Ren ',    # 0x71
+'Qin ',    # 0x72
+'Jin ',    # 0x73
+'Xue ',    # 0x74
+'Niu ',    # 0x75
+'Ba ',    # 0x76
+'Yin ',    # 0x77
+'Sa ',    # 0x78
+'Na ',    # 0x79
+'Mo ',    # 0x7a
+'Zu ',    # 0x7b
+'Da ',    # 0x7c
+'Ban ',    # 0x7d
+'Yi ',    # 0x7e
+'Yao ',    # 0x7f
+'Tao ',    # 0x80
+'Tuo ',    # 0x81
+'Jia ',    # 0x82
+'Hong ',    # 0x83
+'Pao ',    # 0x84
+'Yang ',    # 0x85
+'Tomo ',    # 0x86
+'Yin ',    # 0x87
+'Jia ',    # 0x88
+'Tao ',    # 0x89
+'Ji ',    # 0x8a
+'Xie ',    # 0x8b
+'An ',    # 0x8c
+'An ',    # 0x8d
+'Hen ',    # 0x8e
+'Gong ',    # 0x8f
+'Kohaze ',    # 0x90
+'Da ',    # 0x91
+'Qiao ',    # 0x92
+'Ting ',    # 0x93
+'Wan ',    # 0x94
+'Ying ',    # 0x95
+'Sui ',    # 0x96
+'Tiao ',    # 0x97
+'Qiao ',    # 0x98
+'Xuan ',    # 0x99
+'Kong ',    # 0x9a
+'Beng ',    # 0x9b
+'Ta ',    # 0x9c
+'Zhang ',    # 0x9d
+'Bing ',    # 0x9e
+'Kuo ',    # 0x9f
+'Ju ',    # 0xa0
+'La ',    # 0xa1
+'Xie ',    # 0xa2
+'Rou ',    # 0xa3
+'Bang ',    # 0xa4
+'Yi ',    # 0xa5
+'Qiu ',    # 0xa6
+'Qiu ',    # 0xa7
+'He ',    # 0xa8
+'Xiao ',    # 0xa9
+'Mu ',    # 0xaa
+'Ju ',    # 0xab
+'Jian ',    # 0xac
+'Bian ',    # 0xad
+'Di ',    # 0xae
+'Jian ',    # 0xaf
+'On ',    # 0xb0
+'Tao ',    # 0xb1
+'Gou ',    # 0xb2
+'Ta ',    # 0xb3
+'Bei ',    # 0xb4
+'Xie ',    # 0xb5
+'Pan ',    # 0xb6
+'Ge ',    # 0xb7
+'Bi ',    # 0xb8
+'Kuo ',    # 0xb9
+'Tang ',    # 0xba
+'Lou ',    # 0xbb
+'Gui ',    # 0xbc
+'Qiao ',    # 0xbd
+'Xue ',    # 0xbe
+'Ji ',    # 0xbf
+'Jian ',    # 0xc0
+'Jiang ',    # 0xc1
+'Chan ',    # 0xc2
+'Da ',    # 0xc3
+'Huo ',    # 0xc4
+'Xian ',    # 0xc5
+'Qian ',    # 0xc6
+'Du ',    # 0xc7
+'Wa ',    # 0xc8
+'Jian ',    # 0xc9
+'Lan ',    # 0xca
+'Wei ',    # 0xcb
+'Ren ',    # 0xcc
+'Fu ',    # 0xcd
+'Mei ',    # 0xce
+'Juan ',    # 0xcf
+'Ge ',    # 0xd0
+'Wei ',    # 0xd1
+'Qiao ',    # 0xd2
+'Han ',    # 0xd3
+'Chang ',    # 0xd4
+'[?] ',    # 0xd5
+'Rou ',    # 0xd6
+'Xun ',    # 0xd7
+'She ',    # 0xd8
+'Wei ',    # 0xd9
+'Ge ',    # 0xda
+'Bei ',    # 0xdb
+'Tao ',    # 0xdc
+'Gou ',    # 0xdd
+'Yun ',    # 0xde
+'[?] ',    # 0xdf
+'Bi ',    # 0xe0
+'Wei ',    # 0xe1
+'Hui ',    # 0xe2
+'Du ',    # 0xe3
+'Wa ',    # 0xe4
+'Du ',    # 0xe5
+'Wei ',    # 0xe6
+'Ren ',    # 0xe7
+'Fu ',    # 0xe8
+'Han ',    # 0xe9
+'Wei ',    # 0xea
+'Yun ',    # 0xeb
+'Tao ',    # 0xec
+'Jiu ',    # 0xed
+'Jiu ',    # 0xee
+'Xian ',    # 0xef
+'Xie ',    # 0xf0
+'Xian ',    # 0xf1
+'Ji ',    # 0xf2
+'Yin ',    # 0xf3
+'Za ',    # 0xf4
+'Yun ',    # 0xf5
+'Shao ',    # 0xf6
+'Le ',    # 0xf7
+'Peng ',    # 0xf8
+'Heng ',    # 0xf9
+'Ying ',    # 0xfa
+'Yun ',    # 0xfb
+'Peng ',    # 0xfc
+'Yin ',    # 0xfd
+'Yin ',    # 0xfe
+'Xiang ',    # 0xff
+)
diff --git a/lib/unidecode/x098.py b/lib/unidecode/x098.py
new file mode 100644
index 00000000..98160e77
--- /dev/null
+++ b/lib/unidecode/x098.py
@@ -0,0 +1,258 @@
+data = (
+'Hu ',    # 0x00
+'Ye ',    # 0x01
+'Ding ',    # 0x02
+'Qing ',    # 0x03
+'Pan ',    # 0x04
+'Xiang ',    # 0x05
+'Shun ',    # 0x06
+'Han ',    # 0x07
+'Xu ',    # 0x08
+'Yi ',    # 0x09
+'Xu ',    # 0x0a
+'Gu ',    # 0x0b
+'Song ',    # 0x0c
+'Kui ',    # 0x0d
+'Qi ',    # 0x0e
+'Hang ',    # 0x0f
+'Yu ',    # 0x10
+'Wan ',    # 0x11
+'Ban ',    # 0x12
+'Dun ',    # 0x13
+'Di ',    # 0x14
+'Dan ',    # 0x15
+'Pan ',    # 0x16
+'Po ',    # 0x17
+'Ling ',    # 0x18
+'Ce ',    # 0x19
+'Jing ',    # 0x1a
+'Lei ',    # 0x1b
+'He ',    # 0x1c
+'Qiao ',    # 0x1d
+'E ',    # 0x1e
+'E ',    # 0x1f
+'Wei ',    # 0x20
+'Jie ',    # 0x21
+'Gua ',    # 0x22
+'Shen ',    # 0x23
+'Yi ',    # 0x24
+'Shen ',    # 0x25
+'Hai ',    # 0x26
+'Dui ',    # 0x27
+'Pian ',    # 0x28
+'Ping ',    # 0x29
+'Lei ',    # 0x2a
+'Fu ',    # 0x2b
+'Jia ',    # 0x2c
+'Tou ',    # 0x2d
+'Hui ',    # 0x2e
+'Kui ',    # 0x2f
+'Jia ',    # 0x30
+'Le ',    # 0x31
+'Tian ',    # 0x32
+'Cheng ',    # 0x33
+'Ying ',    # 0x34
+'Jun ',    # 0x35
+'Hu ',    # 0x36
+'Han ',    # 0x37
+'Jing ',    # 0x38
+'Tui ',    # 0x39
+'Tui ',    # 0x3a
+'Pin ',    # 0x3b
+'Lai ',    # 0x3c
+'Tui ',    # 0x3d
+'Zi ',    # 0x3e
+'Zi ',    # 0x3f
+'Chui ',    # 0x40
+'Ding ',    # 0x41
+'Lai ',    # 0x42
+'Yan ',    # 0x43
+'Han ',    # 0x44
+'Jian ',    # 0x45
+'Ke ',    # 0x46
+'Cui ',    # 0x47
+'Jiong ',    # 0x48
+'Qin ',    # 0x49
+'Yi ',    # 0x4a
+'Sai ',    # 0x4b
+'Ti ',    # 0x4c
+'E ',    # 0x4d
+'E ',    # 0x4e
+'Yan ',    # 0x4f
+'Hun ',    # 0x50
+'Kan ',    # 0x51
+'Yong ',    # 0x52
+'Zhuan ',    # 0x53
+'Yan ',    # 0x54
+'Xian ',    # 0x55
+'Xin ',    # 0x56
+'Yi ',    # 0x57
+'Yuan ',    # 0x58
+'Sang ',    # 0x59
+'Dian ',    # 0x5a
+'Dian ',    # 0x5b
+'Jiang ',    # 0x5c
+'Ku ',    # 0x5d
+'Lei ',    # 0x5e
+'Liao ',    # 0x5f
+'Piao ',    # 0x60
+'Yi ',    # 0x61
+'Man ',    # 0x62
+'Qi ',    # 0x63
+'Rao ',    # 0x64
+'Hao ',    # 0x65
+'Qiao ',    # 0x66
+'Gu ',    # 0x67
+'Xun ',    # 0x68
+'Qian ',    # 0x69
+'Hui ',    # 0x6a
+'Zhan ',    # 0x6b
+'Ru ',    # 0x6c
+'Hong ',    # 0x6d
+'Bin ',    # 0x6e
+'Xian ',    # 0x6f
+'Pin ',    # 0x70
+'Lu ',    # 0x71
+'Lan ',    # 0x72
+'Nie ',    # 0x73
+'Quan ',    # 0x74
+'Ye ',    # 0x75
+'Ding ',    # 0x76
+'Qing ',    # 0x77
+'Han ',    # 0x78
+'Xiang ',    # 0x79
+'Shun ',    # 0x7a
+'Xu ',    # 0x7b
+'Xu ',    # 0x7c
+'Wan ',    # 0x7d
+'Gu ',    # 0x7e
+'Dun ',    # 0x7f
+'Qi ',    # 0x80
+'Ban ',    # 0x81
+'Song ',    # 0x82
+'Hang ',    # 0x83
+'Yu ',    # 0x84
+'Lu ',    # 0x85
+'Ling ',    # 0x86
+'Po ',    # 0x87
+'Jing ',    # 0x88
+'Jie ',    # 0x89
+'Jia ',    # 0x8a
+'Tian ',    # 0x8b
+'Han ',    # 0x8c
+'Ying ',    # 0x8d
+'Jiong ',    # 0x8e
+'Hai ',    # 0x8f
+'Yi ',    # 0x90
+'Pin ',    # 0x91
+'Hui ',    # 0x92
+'Tui ',    # 0x93
+'Han ',    # 0x94
+'Ying ',    # 0x95
+'Ying ',    # 0x96
+'Ke ',    # 0x97
+'Ti ',    # 0x98
+'Yong ',    # 0x99
+'E ',    # 0x9a
+'Zhuan ',    # 0x9b
+'Yan ',    # 0x9c
+'E ',    # 0x9d
+'Nie ',    # 0x9e
+'Man ',    # 0x9f
+'Dian ',    # 0xa0
+'Sang ',    # 0xa1
+'Hao ',    # 0xa2
+'Lei ',    # 0xa3
+'Zhan ',    # 0xa4
+'Ru ',    # 0xa5
+'Pin ',    # 0xa6
+'Quan ',    # 0xa7
+'Feng ',    # 0xa8
+'Biao ',    # 0xa9
+'Oroshi ',    # 0xaa
+'Fu ',    # 0xab
+'Xia ',    # 0xac
+'Zhan ',    # 0xad
+'Biao ',    # 0xae
+'Sa ',    # 0xaf
+'Ba ',    # 0xb0
+'Tai ',    # 0xb1
+'Lie ',    # 0xb2
+'Gua ',    # 0xb3
+'Xuan ',    # 0xb4
+'Shao ',    # 0xb5
+'Ju ',    # 0xb6
+'Bi ',    # 0xb7
+'Si ',    # 0xb8
+'Wei ',    # 0xb9
+'Yang ',    # 0xba
+'Yao ',    # 0xbb
+'Sou ',    # 0xbc
+'Kai ',    # 0xbd
+'Sao ',    # 0xbe
+'Fan ',    # 0xbf
+'Liu ',    # 0xc0
+'Xi ',    # 0xc1
+'Liao ',    # 0xc2
+'Piao ',    # 0xc3
+'Piao ',    # 0xc4
+'Liu ',    # 0xc5
+'Biao ',    # 0xc6
+'Biao ',    # 0xc7
+'Biao ',    # 0xc8
+'Liao ',    # 0xc9
+'[?] ',    # 0xca
+'Se ',    # 0xcb
+'Feng ',    # 0xcc
+'Biao ',    # 0xcd
+'Feng ',    # 0xce
+'Yang ',    # 0xcf
+'Zhan ',    # 0xd0
+'Biao ',    # 0xd1
+'Sa ',    # 0xd2
+'Ju ',    # 0xd3
+'Si ',    # 0xd4
+'Sou ',    # 0xd5
+'Yao ',    # 0xd6
+'Liu ',    # 0xd7
+'Piao ',    # 0xd8
+'Biao ',    # 0xd9
+'Biao ',    # 0xda
+'Fei ',    # 0xdb
+'Fan ',    # 0xdc
+'Fei ',    # 0xdd
+'Fei ',    # 0xde
+'Shi ',    # 0xdf
+'Shi ',    # 0xe0
+'Can ',    # 0xe1
+'Ji ',    # 0xe2
+'Ding ',    # 0xe3
+'Si ',    # 0xe4
+'Tuo ',    # 0xe5
+'Zhan ',    # 0xe6
+'Sun ',    # 0xe7
+'Xiang ',    # 0xe8
+'Tun ',    # 0xe9
+'Ren ',    # 0xea
+'Yu ',    # 0xeb
+'Juan ',    # 0xec
+'Chi ',    # 0xed
+'Yin ',    # 0xee
+'Fan ',    # 0xef
+'Fan ',    # 0xf0
+'Sun ',    # 0xf1
+'Yin ',    # 0xf2
+'Zhu ',    # 0xf3
+'Yi ',    # 0xf4
+'Zhai ',    # 0xf5
+'Bi ',    # 0xf6
+'Jie ',    # 0xf7
+'Tao ',    # 0xf8
+'Liu ',    # 0xf9
+'Ci ',    # 0xfa
+'Tie ',    # 0xfb
+'Si ',    # 0xfc
+'Bao ',    # 0xfd
+'Shi ',    # 0xfe
+'Duo ',    # 0xff
+)
diff --git a/lib/unidecode/x099.py b/lib/unidecode/x099.py
new file mode 100644
index 00000000..2adf3de8
--- /dev/null
+++ b/lib/unidecode/x099.py
@@ -0,0 +1,258 @@
+data = (
+'Hai ',    # 0x00
+'Ren ',    # 0x01
+'Tian ',    # 0x02
+'Jiao ',    # 0x03
+'Jia ',    # 0x04
+'Bing ',    # 0x05
+'Yao ',    # 0x06
+'Tong ',    # 0x07
+'Ci ',    # 0x08
+'Xiang ',    # 0x09
+'Yang ',    # 0x0a
+'Yang ',    # 0x0b
+'Er ',    # 0x0c
+'Yan ',    # 0x0d
+'Le ',    # 0x0e
+'Yi ',    # 0x0f
+'Can ',    # 0x10
+'Bo ',    # 0x11
+'Nei ',    # 0x12
+'E ',    # 0x13
+'Bu ',    # 0x14
+'Jun ',    # 0x15
+'Dou ',    # 0x16
+'Su ',    # 0x17
+'Yu ',    # 0x18
+'Shi ',    # 0x19
+'Yao ',    # 0x1a
+'Hun ',    # 0x1b
+'Guo ',    # 0x1c
+'Shi ',    # 0x1d
+'Jian ',    # 0x1e
+'Zhui ',    # 0x1f
+'Bing ',    # 0x20
+'Xian ',    # 0x21
+'Bu ',    # 0x22
+'Ye ',    # 0x23
+'Tan ',    # 0x24
+'Fei ',    # 0x25
+'Zhang ',    # 0x26
+'Wei ',    # 0x27
+'Guan ',    # 0x28
+'E ',    # 0x29
+'Nuan ',    # 0x2a
+'Hun ',    # 0x2b
+'Hu ',    # 0x2c
+'Huang ',    # 0x2d
+'Tie ',    # 0x2e
+'Hui ',    # 0x2f
+'Jian ',    # 0x30
+'Hou ',    # 0x31
+'He ',    # 0x32
+'Xing ',    # 0x33
+'Fen ',    # 0x34
+'Wei ',    # 0x35
+'Gu ',    # 0x36
+'Cha ',    # 0x37
+'Song ',    # 0x38
+'Tang ',    # 0x39
+'Bo ',    # 0x3a
+'Gao ',    # 0x3b
+'Xi ',    # 0x3c
+'Kui ',    # 0x3d
+'Liu ',    # 0x3e
+'Sou ',    # 0x3f
+'Tao ',    # 0x40
+'Ye ',    # 0x41
+'Yun ',    # 0x42
+'Mo ',    # 0x43
+'Tang ',    # 0x44
+'Man ',    # 0x45
+'Bi ',    # 0x46
+'Yu ',    # 0x47
+'Xiu ',    # 0x48
+'Jin ',    # 0x49
+'San ',    # 0x4a
+'Kui ',    # 0x4b
+'Zhuan ',    # 0x4c
+'Shan ',    # 0x4d
+'Chi ',    # 0x4e
+'Dan ',    # 0x4f
+'Yi ',    # 0x50
+'Ji ',    # 0x51
+'Rao ',    # 0x52
+'Cheng ',    # 0x53
+'Yong ',    # 0x54
+'Tao ',    # 0x55
+'Hui ',    # 0x56
+'Xiang ',    # 0x57
+'Zhan ',    # 0x58
+'Fen ',    # 0x59
+'Hai ',    # 0x5a
+'Meng ',    # 0x5b
+'Yan ',    # 0x5c
+'Mo ',    # 0x5d
+'Chan ',    # 0x5e
+'Xiang ',    # 0x5f
+'Luo ',    # 0x60
+'Zuan ',    # 0x61
+'Nang ',    # 0x62
+'Shi ',    # 0x63
+'Ding ',    # 0x64
+'Ji ',    # 0x65
+'Tuo ',    # 0x66
+'Xing ',    # 0x67
+'Tun ',    # 0x68
+'Xi ',    # 0x69
+'Ren ',    # 0x6a
+'Yu ',    # 0x6b
+'Chi ',    # 0x6c
+'Fan ',    # 0x6d
+'Yin ',    # 0x6e
+'Jian ',    # 0x6f
+'Shi ',    # 0x70
+'Bao ',    # 0x71
+'Si ',    # 0x72
+'Duo ',    # 0x73
+'Yi ',    # 0x74
+'Er ',    # 0x75
+'Rao ',    # 0x76
+'Xiang ',    # 0x77
+'Jia ',    # 0x78
+'Le ',    # 0x79
+'Jiao ',    # 0x7a
+'Yi ',    # 0x7b
+'Bing ',    # 0x7c
+'Bo ',    # 0x7d
+'Dou ',    # 0x7e
+'E ',    # 0x7f
+'Yu ',    # 0x80
+'Nei ',    # 0x81
+'Jun ',    # 0x82
+'Guo ',    # 0x83
+'Hun ',    # 0x84
+'Xian ',    # 0x85
+'Guan ',    # 0x86
+'Cha ',    # 0x87
+'Kui ',    # 0x88
+'Gu ',    # 0x89
+'Sou ',    # 0x8a
+'Chan ',    # 0x8b
+'Ye ',    # 0x8c
+'Mo ',    # 0x8d
+'Bo ',    # 0x8e
+'Liu ',    # 0x8f
+'Xiu ',    # 0x90
+'Jin ',    # 0x91
+'Man ',    # 0x92
+'San ',    # 0x93
+'Zhuan ',    # 0x94
+'Nang ',    # 0x95
+'Shou ',    # 0x96
+'Kui ',    # 0x97
+'Guo ',    # 0x98
+'Xiang ',    # 0x99
+'Fen ',    # 0x9a
+'Ba ',    # 0x9b
+'Ni ',    # 0x9c
+'Bi ',    # 0x9d
+'Bo ',    # 0x9e
+'Tu ',    # 0x9f
+'Han ',    # 0xa0
+'Fei ',    # 0xa1
+'Jian ',    # 0xa2
+'An ',    # 0xa3
+'Ai ',    # 0xa4
+'Fu ',    # 0xa5
+'Xian ',    # 0xa6
+'Wen ',    # 0xa7
+'Xin ',    # 0xa8
+'Fen ',    # 0xa9
+'Bin ',    # 0xaa
+'Xing ',    # 0xab
+'Ma ',    # 0xac
+'Yu ',    # 0xad
+'Feng ',    # 0xae
+'Han ',    # 0xaf
+'Di ',    # 0xb0
+'Tuo ',    # 0xb1
+'Tuo ',    # 0xb2
+'Chi ',    # 0xb3
+'Xun ',    # 0xb4
+'Zhu ',    # 0xb5
+'Zhi ',    # 0xb6
+'Pei ',    # 0xb7
+'Xin ',    # 0xb8
+'Ri ',    # 0xb9
+'Sa ',    # 0xba
+'Yin ',    # 0xbb
+'Wen ',    # 0xbc
+'Zhi ',    # 0xbd
+'Dan ',    # 0xbe
+'Lu ',    # 0xbf
+'You ',    # 0xc0
+'Bo ',    # 0xc1
+'Bao ',    # 0xc2
+'Kuai ',    # 0xc3
+'Tuo ',    # 0xc4
+'Yi ',    # 0xc5
+'Qu ',    # 0xc6
+'[?] ',    # 0xc7
+'Qu ',    # 0xc8
+'Jiong ',    # 0xc9
+'Bo ',    # 0xca
+'Zhao ',    # 0xcb
+'Yuan ',    # 0xcc
+'Peng ',    # 0xcd
+'Zhou ',    # 0xce
+'Ju ',    # 0xcf
+'Zhu ',    # 0xd0
+'Nu ',    # 0xd1
+'Ju ',    # 0xd2
+'Pi ',    # 0xd3
+'Zang ',    # 0xd4
+'Jia ',    # 0xd5
+'Ling ',    # 0xd6
+'Zhen ',    # 0xd7
+'Tai ',    # 0xd8
+'Fu ',    # 0xd9
+'Yang ',    # 0xda
+'Shi ',    # 0xdb
+'Bi ',    # 0xdc
+'Tuo ',    # 0xdd
+'Tuo ',    # 0xde
+'Si ',    # 0xdf
+'Liu ',    # 0xe0
+'Ma ',    # 0xe1
+'Pian ',    # 0xe2
+'Tao ',    # 0xe3
+'Zhi ',    # 0xe4
+'Rong ',    # 0xe5
+'Teng ',    # 0xe6
+'Dong ',    # 0xe7
+'Xun ',    # 0xe8
+'Quan ',    # 0xe9
+'Shen ',    # 0xea
+'Jiong ',    # 0xeb
+'Er ',    # 0xec
+'Hai ',    # 0xed
+'Bo ',    # 0xee
+'Zhu ',    # 0xef
+'Yin ',    # 0xf0
+'Luo ',    # 0xf1
+'Shuu ',    # 0xf2
+'Dan ',    # 0xf3
+'Xie ',    # 0xf4
+'Liu ',    # 0xf5
+'Ju ',    # 0xf6
+'Song ',    # 0xf7
+'Qin ',    # 0xf8
+'Mang ',    # 0xf9
+'Liang ',    # 0xfa
+'Han ',    # 0xfb
+'Tu ',    # 0xfc
+'Xuan ',    # 0xfd
+'Tui ',    # 0xfe
+'Jun ',    # 0xff
+)
diff --git a/lib/unidecode/x09a.py b/lib/unidecode/x09a.py
new file mode 100644
index 00000000..ed9cd937
--- /dev/null
+++ b/lib/unidecode/x09a.py
@@ -0,0 +1,258 @@
+data = (
+'E ',    # 0x00
+'Cheng ',    # 0x01
+'Xin ',    # 0x02
+'Ai ',    # 0x03
+'Lu ',    # 0x04
+'Zhui ',    # 0x05
+'Zhou ',    # 0x06
+'She ',    # 0x07
+'Pian ',    # 0x08
+'Kun ',    # 0x09
+'Tao ',    # 0x0a
+'Lai ',    # 0x0b
+'Zong ',    # 0x0c
+'Ke ',    # 0x0d
+'Qi ',    # 0x0e
+'Qi ',    # 0x0f
+'Yan ',    # 0x10
+'Fei ',    # 0x11
+'Sao ',    # 0x12
+'Yan ',    # 0x13
+'Jie ',    # 0x14
+'Yao ',    # 0x15
+'Wu ',    # 0x16
+'Pian ',    # 0x17
+'Cong ',    # 0x18
+'Pian ',    # 0x19
+'Qian ',    # 0x1a
+'Fei ',    # 0x1b
+'Huang ',    # 0x1c
+'Jian ',    # 0x1d
+'Huo ',    # 0x1e
+'Yu ',    # 0x1f
+'Ti ',    # 0x20
+'Quan ',    # 0x21
+'Xia ',    # 0x22
+'Zong ',    # 0x23
+'Kui ',    # 0x24
+'Rou ',    # 0x25
+'Si ',    # 0x26
+'Gua ',    # 0x27
+'Tuo ',    # 0x28
+'Kui ',    # 0x29
+'Sou ',    # 0x2a
+'Qian ',    # 0x2b
+'Cheng ',    # 0x2c
+'Zhi ',    # 0x2d
+'Liu ',    # 0x2e
+'Pang ',    # 0x2f
+'Teng ',    # 0x30
+'Xi ',    # 0x31
+'Cao ',    # 0x32
+'Du ',    # 0x33
+'Yan ',    # 0x34
+'Yuan ',    # 0x35
+'Zou ',    # 0x36
+'Sao ',    # 0x37
+'Shan ',    # 0x38
+'Li ',    # 0x39
+'Zhi ',    # 0x3a
+'Shuang ',    # 0x3b
+'Lu ',    # 0x3c
+'Xi ',    # 0x3d
+'Luo ',    # 0x3e
+'Zhang ',    # 0x3f
+'Mo ',    # 0x40
+'Ao ',    # 0x41
+'Can ',    # 0x42
+'Piao ',    # 0x43
+'Cong ',    # 0x44
+'Qu ',    # 0x45
+'Bi ',    # 0x46
+'Zhi ',    # 0x47
+'Yu ',    # 0x48
+'Xu ',    # 0x49
+'Hua ',    # 0x4a
+'Bo ',    # 0x4b
+'Su ',    # 0x4c
+'Xiao ',    # 0x4d
+'Lin ',    # 0x4e
+'Chan ',    # 0x4f
+'Dun ',    # 0x50
+'Liu ',    # 0x51
+'Tuo ',    # 0x52
+'Zeng ',    # 0x53
+'Tan ',    # 0x54
+'Jiao ',    # 0x55
+'Tie ',    # 0x56
+'Yan ',    # 0x57
+'Luo ',    # 0x58
+'Zhan ',    # 0x59
+'Jing ',    # 0x5a
+'Yi ',    # 0x5b
+'Ye ',    # 0x5c
+'Tuo ',    # 0x5d
+'Bin ',    # 0x5e
+'Zou ',    # 0x5f
+'Yan ',    # 0x60
+'Peng ',    # 0x61
+'Lu ',    # 0x62
+'Teng ',    # 0x63
+'Xiang ',    # 0x64
+'Ji ',    # 0x65
+'Shuang ',    # 0x66
+'Ju ',    # 0x67
+'Xi ',    # 0x68
+'Huan ',    # 0x69
+'Li ',    # 0x6a
+'Biao ',    # 0x6b
+'Ma ',    # 0x6c
+'Yu ',    # 0x6d
+'Tuo ',    # 0x6e
+'Xun ',    # 0x6f
+'Chi ',    # 0x70
+'Qu ',    # 0x71
+'Ri ',    # 0x72
+'Bo ',    # 0x73
+'Lu ',    # 0x74
+'Zang ',    # 0x75
+'Shi ',    # 0x76
+'Si ',    # 0x77
+'Fu ',    # 0x78
+'Ju ',    # 0x79
+'Zou ',    # 0x7a
+'Zhu ',    # 0x7b
+'Tuo ',    # 0x7c
+'Nu ',    # 0x7d
+'Jia ',    # 0x7e
+'Yi ',    # 0x7f
+'Tai ',    # 0x80
+'Xiao ',    # 0x81
+'Ma ',    # 0x82
+'Yin ',    # 0x83
+'Jiao ',    # 0x84
+'Hua ',    # 0x85
+'Luo ',    # 0x86
+'Hai ',    # 0x87
+'Pian ',    # 0x88
+'Biao ',    # 0x89
+'Li ',    # 0x8a
+'Cheng ',    # 0x8b
+'Yan ',    # 0x8c
+'Xin ',    # 0x8d
+'Qin ',    # 0x8e
+'Jun ',    # 0x8f
+'Qi ',    # 0x90
+'Qi ',    # 0x91
+'Ke ',    # 0x92
+'Zhui ',    # 0x93
+'Zong ',    # 0x94
+'Su ',    # 0x95
+'Can ',    # 0x96
+'Pian ',    # 0x97
+'Zhi ',    # 0x98
+'Kui ',    # 0x99
+'Sao ',    # 0x9a
+'Wu ',    # 0x9b
+'Ao ',    # 0x9c
+'Liu ',    # 0x9d
+'Qian ',    # 0x9e
+'Shan ',    # 0x9f
+'Piao ',    # 0xa0
+'Luo ',    # 0xa1
+'Cong ',    # 0xa2
+'Chan ',    # 0xa3
+'Zou ',    # 0xa4
+'Ji ',    # 0xa5
+'Shuang ',    # 0xa6
+'Xiang ',    # 0xa7
+'Gu ',    # 0xa8
+'Wei ',    # 0xa9
+'Wei ',    # 0xaa
+'Wei ',    # 0xab
+'Yu ',    # 0xac
+'Gan ',    # 0xad
+'Yi ',    # 0xae
+'Ang ',    # 0xaf
+'Tou ',    # 0xb0
+'Xie ',    # 0xb1
+'Bao ',    # 0xb2
+'Bi ',    # 0xb3
+'Chi ',    # 0xb4
+'Ti ',    # 0xb5
+'Di ',    # 0xb6
+'Ku ',    # 0xb7
+'Hai ',    # 0xb8
+'Qiao ',    # 0xb9
+'Gou ',    # 0xba
+'Kua ',    # 0xbb
+'Ge ',    # 0xbc
+'Tui ',    # 0xbd
+'Geng ',    # 0xbe
+'Pian ',    # 0xbf
+'Bi ',    # 0xc0
+'Ke ',    # 0xc1
+'Ka ',    # 0xc2
+'Yu ',    # 0xc3
+'Sui ',    # 0xc4
+'Lou ',    # 0xc5
+'Bo ',    # 0xc6
+'Xiao ',    # 0xc7
+'Pang ',    # 0xc8
+'Bo ',    # 0xc9
+'Ci ',    # 0xca
+'Kuan ',    # 0xcb
+'Bin ',    # 0xcc
+'Mo ',    # 0xcd
+'Liao ',    # 0xce
+'Lou ',    # 0xcf
+'Nao ',    # 0xd0
+'Du ',    # 0xd1
+'Zang ',    # 0xd2
+'Sui ',    # 0xd3
+'Ti ',    # 0xd4
+'Bin ',    # 0xd5
+'Kuan ',    # 0xd6
+'Lu ',    # 0xd7
+'Gao ',    # 0xd8
+'Gao ',    # 0xd9
+'Qiao ',    # 0xda
+'Kao ',    # 0xdb
+'Qiao ',    # 0xdc
+'Lao ',    # 0xdd
+'Zao ',    # 0xde
+'Biao ',    # 0xdf
+'Kun ',    # 0xe0
+'Kun ',    # 0xe1
+'Ti ',    # 0xe2
+'Fang ',    # 0xe3
+'Xiu ',    # 0xe4
+'Ran ',    # 0xe5
+'Mao ',    # 0xe6
+'Dan ',    # 0xe7
+'Kun ',    # 0xe8
+'Bin ',    # 0xe9
+'Fa ',    # 0xea
+'Tiao ',    # 0xeb
+'Peng ',    # 0xec
+'Zi ',    # 0xed
+'Fa ',    # 0xee
+'Ran ',    # 0xef
+'Ti ',    # 0xf0
+'Pao ',    # 0xf1
+'Pi ',    # 0xf2
+'Mao ',    # 0xf3
+'Fu ',    # 0xf4
+'Er ',    # 0xf5
+'Rong ',    # 0xf6
+'Qu ',    # 0xf7
+'Gong ',    # 0xf8
+'Xiu ',    # 0xf9
+'Gua ',    # 0xfa
+'Ji ',    # 0xfb
+'Peng ',    # 0xfc
+'Zhua ',    # 0xfd
+'Shao ',    # 0xfe
+'Sha ',    # 0xff
+)
diff --git a/lib/unidecode/x09b.py b/lib/unidecode/x09b.py
new file mode 100644
index 00000000..7fd0a2db
--- /dev/null
+++ b/lib/unidecode/x09b.py
@@ -0,0 +1,258 @@
+data = (
+'Ti ',    # 0x00
+'Li ',    # 0x01
+'Bin ',    # 0x02
+'Zong ',    # 0x03
+'Ti ',    # 0x04
+'Peng ',    # 0x05
+'Song ',    # 0x06
+'Zheng ',    # 0x07
+'Quan ',    # 0x08
+'Zong ',    # 0x09
+'Shun ',    # 0x0a
+'Jian ',    # 0x0b
+'Duo ',    # 0x0c
+'Hu ',    # 0x0d
+'La ',    # 0x0e
+'Jiu ',    # 0x0f
+'Qi ',    # 0x10
+'Lian ',    # 0x11
+'Zhen ',    # 0x12
+'Bin ',    # 0x13
+'Peng ',    # 0x14
+'Mo ',    # 0x15
+'San ',    # 0x16
+'Man ',    # 0x17
+'Man ',    # 0x18
+'Seng ',    # 0x19
+'Xu ',    # 0x1a
+'Lie ',    # 0x1b
+'Qian ',    # 0x1c
+'Qian ',    # 0x1d
+'Nong ',    # 0x1e
+'Huan ',    # 0x1f
+'Kuai ',    # 0x20
+'Ning ',    # 0x21
+'Bin ',    # 0x22
+'Lie ',    # 0x23
+'Rang ',    # 0x24
+'Dou ',    # 0x25
+'Dou ',    # 0x26
+'Nao ',    # 0x27
+'Hong ',    # 0x28
+'Xi ',    # 0x29
+'Dou ',    # 0x2a
+'Han ',    # 0x2b
+'Dou ',    # 0x2c
+'Dou ',    # 0x2d
+'Jiu ',    # 0x2e
+'Chang ',    # 0x2f
+'Yu ',    # 0x30
+'Yu ',    # 0x31
+'Li ',    # 0x32
+'Juan ',    # 0x33
+'Fu ',    # 0x34
+'Qian ',    # 0x35
+'Gui ',    # 0x36
+'Zong ',    # 0x37
+'Liu ',    # 0x38
+'Gui ',    # 0x39
+'Shang ',    # 0x3a
+'Yu ',    # 0x3b
+'Gui ',    # 0x3c
+'Mei ',    # 0x3d
+'Ji ',    # 0x3e
+'Qi ',    # 0x3f
+'Jie ',    # 0x40
+'Kui ',    # 0x41
+'Hun ',    # 0x42
+'Ba ',    # 0x43
+'Po ',    # 0x44
+'Mei ',    # 0x45
+'Xu ',    # 0x46
+'Yan ',    # 0x47
+'Xiao ',    # 0x48
+'Liang ',    # 0x49
+'Yu ',    # 0x4a
+'Tui ',    # 0x4b
+'Qi ',    # 0x4c
+'Wang ',    # 0x4d
+'Liang ',    # 0x4e
+'Wei ',    # 0x4f
+'Jian ',    # 0x50
+'Chi ',    # 0x51
+'Piao ',    # 0x52
+'Bi ',    # 0x53
+'Mo ',    # 0x54
+'Ji ',    # 0x55
+'Xu ',    # 0x56
+'Chou ',    # 0x57
+'Yan ',    # 0x58
+'Zhan ',    # 0x59
+'Yu ',    # 0x5a
+'Dao ',    # 0x5b
+'Ren ',    # 0x5c
+'Ji ',    # 0x5d
+'Eri ',    # 0x5e
+'Gong ',    # 0x5f
+'Tuo ',    # 0x60
+'Diao ',    # 0x61
+'Ji ',    # 0x62
+'Xu ',    # 0x63
+'E ',    # 0x64
+'E ',    # 0x65
+'Sha ',    # 0x66
+'Hang ',    # 0x67
+'Tun ',    # 0x68
+'Mo ',    # 0x69
+'Jie ',    # 0x6a
+'Shen ',    # 0x6b
+'Fan ',    # 0x6c
+'Yuan ',    # 0x6d
+'Bi ',    # 0x6e
+'Lu ',    # 0x6f
+'Wen ',    # 0x70
+'Hu ',    # 0x71
+'Lu ',    # 0x72
+'Za ',    # 0x73
+'Fang ',    # 0x74
+'Fen ',    # 0x75
+'Na ',    # 0x76
+'You ',    # 0x77
+'Namazu ',    # 0x78
+'Todo ',    # 0x79
+'He ',    # 0x7a
+'Xia ',    # 0x7b
+'Qu ',    # 0x7c
+'Han ',    # 0x7d
+'Pi ',    # 0x7e
+'Ling ',    # 0x7f
+'Tuo ',    # 0x80
+'Bo ',    # 0x81
+'Qiu ',    # 0x82
+'Ping ',    # 0x83
+'Fu ',    # 0x84
+'Bi ',    # 0x85
+'Ji ',    # 0x86
+'Wei ',    # 0x87
+'Ju ',    # 0x88
+'Diao ',    # 0x89
+'Bo ',    # 0x8a
+'You ',    # 0x8b
+'Gun ',    # 0x8c
+'Pi ',    # 0x8d
+'Nian ',    # 0x8e
+'Xing ',    # 0x8f
+'Tai ',    # 0x90
+'Bao ',    # 0x91
+'Fu ',    # 0x92
+'Zha ',    # 0x93
+'Ju ',    # 0x94
+'Gu ',    # 0x95
+'Kajika ',    # 0x96
+'Tong ',    # 0x97
+'[?] ',    # 0x98
+'Ta ',    # 0x99
+'Jie ',    # 0x9a
+'Shu ',    # 0x9b
+'Hou ',    # 0x9c
+'Xiang ',    # 0x9d
+'Er ',    # 0x9e
+'An ',    # 0x9f
+'Wei ',    # 0xa0
+'Tiao ',    # 0xa1
+'Zhu ',    # 0xa2
+'Yin ',    # 0xa3
+'Lie ',    # 0xa4
+'Luo ',    # 0xa5
+'Tong ',    # 0xa6
+'Yi ',    # 0xa7
+'Qi ',    # 0xa8
+'Bing ',    # 0xa9
+'Wei ',    # 0xaa
+'Jiao ',    # 0xab
+'Bu ',    # 0xac
+'Gui ',    # 0xad
+'Xian ',    # 0xae
+'Ge ',    # 0xaf
+'Hui ',    # 0xb0
+'Bora ',    # 0xb1
+'Mate ',    # 0xb2
+'Kao ',    # 0xb3
+'Gori ',    # 0xb4
+'Duo ',    # 0xb5
+'Jun ',    # 0xb6
+'Ti ',    # 0xb7
+'Man ',    # 0xb8
+'Xiao ',    # 0xb9
+'Za ',    # 0xba
+'Sha ',    # 0xbb
+'Qin ',    # 0xbc
+'Yu ',    # 0xbd
+'Nei ',    # 0xbe
+'Zhe ',    # 0xbf
+'Gun ',    # 0xc0
+'Geng ',    # 0xc1
+'Su ',    # 0xc2
+'Wu ',    # 0xc3
+'Qiu ',    # 0xc4
+'Ting ',    # 0xc5
+'Fu ',    # 0xc6
+'Wan ',    # 0xc7
+'You ',    # 0xc8
+'Li ',    # 0xc9
+'Sha ',    # 0xca
+'Sha ',    # 0xcb
+'Gao ',    # 0xcc
+'Meng ',    # 0xcd
+'Ugui ',    # 0xce
+'Asari ',    # 0xcf
+'Subashiri ',    # 0xd0
+'Kazunoko ',    # 0xd1
+'Yong ',    # 0xd2
+'Ni ',    # 0xd3
+'Zi ',    # 0xd4
+'Qi ',    # 0xd5
+'Qing ',    # 0xd6
+'Xiang ',    # 0xd7
+'Nei ',    # 0xd8
+'Chun ',    # 0xd9
+'Ji ',    # 0xda
+'Diao ',    # 0xdb
+'Qie ',    # 0xdc
+'Gu ',    # 0xdd
+'Zhou ',    # 0xde
+'Dong ',    # 0xdf
+'Lai ',    # 0xe0
+'Fei ',    # 0xe1
+'Ni ',    # 0xe2
+'Yi ',    # 0xe3
+'Kun ',    # 0xe4
+'Lu ',    # 0xe5
+'Jiu ',    # 0xe6
+'Chang ',    # 0xe7
+'Jing ',    # 0xe8
+'Lun ',    # 0xe9
+'Ling ',    # 0xea
+'Zou ',    # 0xeb
+'Li ',    # 0xec
+'Meng ',    # 0xed
+'Zong ',    # 0xee
+'Zhi ',    # 0xef
+'Nian ',    # 0xf0
+'Shachi ',    # 0xf1
+'Dojou ',    # 0xf2
+'Sukesou ',    # 0xf3
+'Shi ',    # 0xf4
+'Shen ',    # 0xf5
+'Hun ',    # 0xf6
+'Shi ',    # 0xf7
+'Hou ',    # 0xf8
+'Xing ',    # 0xf9
+'Zhu ',    # 0xfa
+'La ',    # 0xfb
+'Zong ',    # 0xfc
+'Ji ',    # 0xfd
+'Bian ',    # 0xfe
+'Bian ',    # 0xff
+)
diff --git a/lib/unidecode/x09c.py b/lib/unidecode/x09c.py
new file mode 100644
index 00000000..e7f7937f
--- /dev/null
+++ b/lib/unidecode/x09c.py
@@ -0,0 +1,258 @@
+data = (
+'Huan ',    # 0x00
+'Quan ',    # 0x01
+'Ze ',    # 0x02
+'Wei ',    # 0x03
+'Wei ',    # 0x04
+'Yu ',    # 0x05
+'Qun ',    # 0x06
+'Rou ',    # 0x07
+'Die ',    # 0x08
+'Huang ',    # 0x09
+'Lian ',    # 0x0a
+'Yan ',    # 0x0b
+'Qiu ',    # 0x0c
+'Qiu ',    # 0x0d
+'Jian ',    # 0x0e
+'Bi ',    # 0x0f
+'E ',    # 0x10
+'Yang ',    # 0x11
+'Fu ',    # 0x12
+'Sai ',    # 0x13
+'Jian ',    # 0x14
+'Xia ',    # 0x15
+'Tuo ',    # 0x16
+'Hu ',    # 0x17
+'Muroaji ',    # 0x18
+'Ruo ',    # 0x19
+'Haraka ',    # 0x1a
+'Wen ',    # 0x1b
+'Jian ',    # 0x1c
+'Hao ',    # 0x1d
+'Wu ',    # 0x1e
+'Fang ',    # 0x1f
+'Sao ',    # 0x20
+'Liu ',    # 0x21
+'Ma ',    # 0x22
+'Shi ',    # 0x23
+'Shi ',    # 0x24
+'Yin ',    # 0x25
+'Z ',    # 0x26
+'Teng ',    # 0x27
+'Ta ',    # 0x28
+'Yao ',    # 0x29
+'Ge ',    # 0x2a
+'Rong ',    # 0x2b
+'Qian ',    # 0x2c
+'Qi ',    # 0x2d
+'Wen ',    # 0x2e
+'Ruo ',    # 0x2f
+'Hatahata ',    # 0x30
+'Lian ',    # 0x31
+'Ao ',    # 0x32
+'Le ',    # 0x33
+'Hui ',    # 0x34
+'Min ',    # 0x35
+'Ji ',    # 0x36
+'Tiao ',    # 0x37
+'Qu ',    # 0x38
+'Jian ',    # 0x39
+'Sao ',    # 0x3a
+'Man ',    # 0x3b
+'Xi ',    # 0x3c
+'Qiu ',    # 0x3d
+'Biao ',    # 0x3e
+'Ji ',    # 0x3f
+'Ji ',    # 0x40
+'Zhu ',    # 0x41
+'Jiang ',    # 0x42
+'Qiu ',    # 0x43
+'Zhuan ',    # 0x44
+'Yong ',    # 0x45
+'Zhang ',    # 0x46
+'Kang ',    # 0x47
+'Xue ',    # 0x48
+'Bie ',    # 0x49
+'Jue ',    # 0x4a
+'Qu ',    # 0x4b
+'Xiang ',    # 0x4c
+'Bo ',    # 0x4d
+'Jiao ',    # 0x4e
+'Xun ',    # 0x4f
+'Su ',    # 0x50
+'Huang ',    # 0x51
+'Zun ',    # 0x52
+'Shan ',    # 0x53
+'Shan ',    # 0x54
+'Fan ',    # 0x55
+'Jue ',    # 0x56
+'Lin ',    # 0x57
+'Xun ',    # 0x58
+'Miao ',    # 0x59
+'Xi ',    # 0x5a
+'Eso ',    # 0x5b
+'Kyou ',    # 0x5c
+'Fen ',    # 0x5d
+'Guan ',    # 0x5e
+'Hou ',    # 0x5f
+'Kuai ',    # 0x60
+'Zei ',    # 0x61
+'Sao ',    # 0x62
+'Zhan ',    # 0x63
+'Gan ',    # 0x64
+'Gui ',    # 0x65
+'Sheng ',    # 0x66
+'Li ',    # 0x67
+'Chang ',    # 0x68
+'Hatahata ',    # 0x69
+'Shiira ',    # 0x6a
+'Mutsu ',    # 0x6b
+'Ru ',    # 0x6c
+'Ji ',    # 0x6d
+'Xu ',    # 0x6e
+'Huo ',    # 0x6f
+'Shiira ',    # 0x70
+'Li ',    # 0x71
+'Lie ',    # 0x72
+'Li ',    # 0x73
+'Mie ',    # 0x74
+'Zhen ',    # 0x75
+'Xiang ',    # 0x76
+'E ',    # 0x77
+'Lu ',    # 0x78
+'Guan ',    # 0x79
+'Li ',    # 0x7a
+'Xian ',    # 0x7b
+'Yu ',    # 0x7c
+'Dao ',    # 0x7d
+'Ji ',    # 0x7e
+'You ',    # 0x7f
+'Tun ',    # 0x80
+'Lu ',    # 0x81
+'Fang ',    # 0x82
+'Ba ',    # 0x83
+'He ',    # 0x84
+'Bo ',    # 0x85
+'Ping ',    # 0x86
+'Nian ',    # 0x87
+'Lu ',    # 0x88
+'You ',    # 0x89
+'Zha ',    # 0x8a
+'Fu ',    # 0x8b
+'Bo ',    # 0x8c
+'Bao ',    # 0x8d
+'Hou ',    # 0x8e
+'Pi ',    # 0x8f
+'Tai ',    # 0x90
+'Gui ',    # 0x91
+'Jie ',    # 0x92
+'Kao ',    # 0x93
+'Wei ',    # 0x94
+'Er ',    # 0x95
+'Tong ',    # 0x96
+'Ze ',    # 0x97
+'Hou ',    # 0x98
+'Kuai ',    # 0x99
+'Ji ',    # 0x9a
+'Jiao ',    # 0x9b
+'Xian ',    # 0x9c
+'Za ',    # 0x9d
+'Xiang ',    # 0x9e
+'Xun ',    # 0x9f
+'Geng ',    # 0xa0
+'Li ',    # 0xa1
+'Lian ',    # 0xa2
+'Jian ',    # 0xa3
+'Li ',    # 0xa4
+'Shi ',    # 0xa5
+'Tiao ',    # 0xa6
+'Gun ',    # 0xa7
+'Sha ',    # 0xa8
+'Wan ',    # 0xa9
+'Jun ',    # 0xaa
+'Ji ',    # 0xab
+'Yong ',    # 0xac
+'Qing ',    # 0xad
+'Ling ',    # 0xae
+'Qi ',    # 0xaf
+'Zou ',    # 0xb0
+'Fei ',    # 0xb1
+'Kun ',    # 0xb2
+'Chang ',    # 0xb3
+'Gu ',    # 0xb4
+'Ni ',    # 0xb5
+'Nian ',    # 0xb6
+'Diao ',    # 0xb7
+'Jing ',    # 0xb8
+'Shen ',    # 0xb9
+'Shi ',    # 0xba
+'Zi ',    # 0xbb
+'Fen ',    # 0xbc
+'Die ',    # 0xbd
+'Bi ',    # 0xbe
+'Chang ',    # 0xbf
+'Shi ',    # 0xc0
+'Wen ',    # 0xc1
+'Wei ',    # 0xc2
+'Sai ',    # 0xc3
+'E ',    # 0xc4
+'Qiu ',    # 0xc5
+'Fu ',    # 0xc6
+'Huang ',    # 0xc7
+'Quan ',    # 0xc8
+'Jiang ',    # 0xc9
+'Bian ',    # 0xca
+'Sao ',    # 0xcb
+'Ao ',    # 0xcc
+'Qi ',    # 0xcd
+'Ta ',    # 0xce
+'Yin ',    # 0xcf
+'Yao ',    # 0xd0
+'Fang ',    # 0xd1
+'Jian ',    # 0xd2
+'Le ',    # 0xd3
+'Biao ',    # 0xd4
+'Xue ',    # 0xd5
+'Bie ',    # 0xd6
+'Man ',    # 0xd7
+'Min ',    # 0xd8
+'Yong ',    # 0xd9
+'Wei ',    # 0xda
+'Xi ',    # 0xdb
+'Jue ',    # 0xdc
+'Shan ',    # 0xdd
+'Lin ',    # 0xde
+'Zun ',    # 0xdf
+'Huo ',    # 0xe0
+'Gan ',    # 0xe1
+'Li ',    # 0xe2
+'Zhan ',    # 0xe3
+'Guan ',    # 0xe4
+'Niao ',    # 0xe5
+'Yi ',    # 0xe6
+'Fu ',    # 0xe7
+'Li ',    # 0xe8
+'Jiu ',    # 0xe9
+'Bu ',    # 0xea
+'Yan ',    # 0xeb
+'Fu ',    # 0xec
+'Diao ',    # 0xed
+'Ji ',    # 0xee
+'Feng ',    # 0xef
+'Nio ',    # 0xf0
+'Gan ',    # 0xf1
+'Shi ',    # 0xf2
+'Feng ',    # 0xf3
+'Ming ',    # 0xf4
+'Bao ',    # 0xf5
+'Yuan ',    # 0xf6
+'Zhi ',    # 0xf7
+'Hu ',    # 0xf8
+'Qin ',    # 0xf9
+'Fu ',    # 0xfa
+'Fen ',    # 0xfb
+'Wen ',    # 0xfc
+'Jian ',    # 0xfd
+'Shi ',    # 0xfe
+'Yu ',    # 0xff
+)
diff --git a/lib/unidecode/x09d.py b/lib/unidecode/x09d.py
new file mode 100644
index 00000000..99d5859c
--- /dev/null
+++ b/lib/unidecode/x09d.py
@@ -0,0 +1,258 @@
+data = (
+'Fou ',    # 0x00
+'Yiao ',    # 0x01
+'Jue ',    # 0x02
+'Jue ',    # 0x03
+'Pi ',    # 0x04
+'Huan ',    # 0x05
+'Zhen ',    # 0x06
+'Bao ',    # 0x07
+'Yan ',    # 0x08
+'Ya ',    # 0x09
+'Zheng ',    # 0x0a
+'Fang ',    # 0x0b
+'Feng ',    # 0x0c
+'Wen ',    # 0x0d
+'Ou ',    # 0x0e
+'Te ',    # 0x0f
+'Jia ',    # 0x10
+'Nu ',    # 0x11
+'Ling ',    # 0x12
+'Mie ',    # 0x13
+'Fu ',    # 0x14
+'Tuo ',    # 0x15
+'Wen ',    # 0x16
+'Li ',    # 0x17
+'Bian ',    # 0x18
+'Zhi ',    # 0x19
+'Ge ',    # 0x1a
+'Yuan ',    # 0x1b
+'Zi ',    # 0x1c
+'Qu ',    # 0x1d
+'Xiao ',    # 0x1e
+'Zhi ',    # 0x1f
+'Dan ',    # 0x20
+'Ju ',    # 0x21
+'You ',    # 0x22
+'Gu ',    # 0x23
+'Zhong ',    # 0x24
+'Yu ',    # 0x25
+'Yang ',    # 0x26
+'Rong ',    # 0x27
+'Ya ',    # 0x28
+'Tie ',    # 0x29
+'Yu ',    # 0x2a
+'Shigi ',    # 0x2b
+'Ying ',    # 0x2c
+'Zhui ',    # 0x2d
+'Wu ',    # 0x2e
+'Er ',    # 0x2f
+'Gua ',    # 0x30
+'Ai ',    # 0x31
+'Zhi ',    # 0x32
+'Yan ',    # 0x33
+'Heng ',    # 0x34
+'Jiao ',    # 0x35
+'Ji ',    # 0x36
+'Lie ',    # 0x37
+'Zhu ',    # 0x38
+'Ren ',    # 0x39
+'Yi ',    # 0x3a
+'Hong ',    # 0x3b
+'Luo ',    # 0x3c
+'Ru ',    # 0x3d
+'Mou ',    # 0x3e
+'Ge ',    # 0x3f
+'Ren ',    # 0x40
+'Jiao ',    # 0x41
+'Xiu ',    # 0x42
+'Zhou ',    # 0x43
+'Zhi ',    # 0x44
+'Luo ',    # 0x45
+'Chidori ',    # 0x46
+'Toki ',    # 0x47
+'Ten ',    # 0x48
+'Luan ',    # 0x49
+'Jia ',    # 0x4a
+'Ji ',    # 0x4b
+'Yu ',    # 0x4c
+'Huan ',    # 0x4d
+'Tuo ',    # 0x4e
+'Bu ',    # 0x4f
+'Wu ',    # 0x50
+'Juan ',    # 0x51
+'Yu ',    # 0x52
+'Bo ',    # 0x53
+'Xun ',    # 0x54
+'Xun ',    # 0x55
+'Bi ',    # 0x56
+'Xi ',    # 0x57
+'Jun ',    # 0x58
+'Ju ',    # 0x59
+'Tu ',    # 0x5a
+'Jing ',    # 0x5b
+'Ti ',    # 0x5c
+'E ',    # 0x5d
+'E ',    # 0x5e
+'Kuang ',    # 0x5f
+'Hu ',    # 0x60
+'Wu ',    # 0x61
+'Shen ',    # 0x62
+'Lai ',    # 0x63
+'Ikaruga ',    # 0x64
+'Kakesu ',    # 0x65
+'Lu ',    # 0x66
+'Ping ',    # 0x67
+'Shu ',    # 0x68
+'Fu ',    # 0x69
+'An ',    # 0x6a
+'Zhao ',    # 0x6b
+'Peng ',    # 0x6c
+'Qin ',    # 0x6d
+'Qian ',    # 0x6e
+'Bei ',    # 0x6f
+'Diao ',    # 0x70
+'Lu ',    # 0x71
+'Que ',    # 0x72
+'Jian ',    # 0x73
+'Ju ',    # 0x74
+'Tu ',    # 0x75
+'Ya ',    # 0x76
+'Yuan ',    # 0x77
+'Qi ',    # 0x78
+'Li ',    # 0x79
+'Ye ',    # 0x7a
+'Zhui ',    # 0x7b
+'Kong ',    # 0x7c
+'Zhui ',    # 0x7d
+'Kun ',    # 0x7e
+'Sheng ',    # 0x7f
+'Qi ',    # 0x80
+'Jing ',    # 0x81
+'Yi ',    # 0x82
+'Yi ',    # 0x83
+'Jing ',    # 0x84
+'Zi ',    # 0x85
+'Lai ',    # 0x86
+'Dong ',    # 0x87
+'Qi ',    # 0x88
+'Chun ',    # 0x89
+'Geng ',    # 0x8a
+'Ju ',    # 0x8b
+'Qu ',    # 0x8c
+'Isuka ',    # 0x8d
+'Kikuitadaki ',    # 0x8e
+'Ji ',    # 0x8f
+'Shu ',    # 0x90
+'[?] ',    # 0x91
+'Chi ',    # 0x92
+'Miao ',    # 0x93
+'Rou ',    # 0x94
+'An ',    # 0x95
+'Qiu ',    # 0x96
+'Ti ',    # 0x97
+'Hu ',    # 0x98
+'Ti ',    # 0x99
+'E ',    # 0x9a
+'Jie ',    # 0x9b
+'Mao ',    # 0x9c
+'Fu ',    # 0x9d
+'Chun ',    # 0x9e
+'Tu ',    # 0x9f
+'Yan ',    # 0xa0
+'He ',    # 0xa1
+'Yuan ',    # 0xa2
+'Pian ',    # 0xa3
+'Yun ',    # 0xa4
+'Mei ',    # 0xa5
+'Hu ',    # 0xa6
+'Ying ',    # 0xa7
+'Dun ',    # 0xa8
+'Mu ',    # 0xa9
+'Ju ',    # 0xaa
+'Tsugumi ',    # 0xab
+'Cang ',    # 0xac
+'Fang ',    # 0xad
+'Gu ',    # 0xae
+'Ying ',    # 0xaf
+'Yuan ',    # 0xb0
+'Xuan ',    # 0xb1
+'Weng ',    # 0xb2
+'Shi ',    # 0xb3
+'He ',    # 0xb4
+'Chu ',    # 0xb5
+'Tang ',    # 0xb6
+'Xia ',    # 0xb7
+'Ruo ',    # 0xb8
+'Liu ',    # 0xb9
+'Ji ',    # 0xba
+'Gu ',    # 0xbb
+'Jian ',    # 0xbc
+'Zhun ',    # 0xbd
+'Han ',    # 0xbe
+'Zi ',    # 0xbf
+'Zi ',    # 0xc0
+'Ni ',    # 0xc1
+'Yao ',    # 0xc2
+'Yan ',    # 0xc3
+'Ji ',    # 0xc4
+'Li ',    # 0xc5
+'Tian ',    # 0xc6
+'Kou ',    # 0xc7
+'Ti ',    # 0xc8
+'Ti ',    # 0xc9
+'Ni ',    # 0xca
+'Tu ',    # 0xcb
+'Ma ',    # 0xcc
+'Jiao ',    # 0xcd
+'Gao ',    # 0xce
+'Tian ',    # 0xcf
+'Chen ',    # 0xd0
+'Li ',    # 0xd1
+'Zhuan ',    # 0xd2
+'Zhe ',    # 0xd3
+'Ao ',    # 0xd4
+'Yao ',    # 0xd5
+'Yi ',    # 0xd6
+'Ou ',    # 0xd7
+'Chi ',    # 0xd8
+'Zhi ',    # 0xd9
+'Liao ',    # 0xda
+'Rong ',    # 0xdb
+'Lou ',    # 0xdc
+'Bi ',    # 0xdd
+'Shuang ',    # 0xde
+'Zhuo ',    # 0xdf
+'Yu ',    # 0xe0
+'Wu ',    # 0xe1
+'Jue ',    # 0xe2
+'Yin ',    # 0xe3
+'Quan ',    # 0xe4
+'Si ',    # 0xe5
+'Jiao ',    # 0xe6
+'Yi ',    # 0xe7
+'Hua ',    # 0xe8
+'Bi ',    # 0xe9
+'Ying ',    # 0xea
+'Su ',    # 0xeb
+'Huang ',    # 0xec
+'Fan ',    # 0xed
+'Jiao ',    # 0xee
+'Liao ',    # 0xef
+'Yan ',    # 0xf0
+'Kao ',    # 0xf1
+'Jiu ',    # 0xf2
+'Xian ',    # 0xf3
+'Xian ',    # 0xf4
+'Tu ',    # 0xf5
+'Mai ',    # 0xf6
+'Zun ',    # 0xf7
+'Yu ',    # 0xf8
+'Ying ',    # 0xf9
+'Lu ',    # 0xfa
+'Tuan ',    # 0xfb
+'Xian ',    # 0xfc
+'Xue ',    # 0xfd
+'Yi ',    # 0xfe
+'Pi ',    # 0xff
+)
diff --git a/lib/unidecode/x09e.py b/lib/unidecode/x09e.py
new file mode 100644
index 00000000..8a392a23
--- /dev/null
+++ b/lib/unidecode/x09e.py
@@ -0,0 +1,258 @@
+data = (
+'Shu ',    # 0x00
+'Luo ',    # 0x01
+'Qi ',    # 0x02
+'Yi ',    # 0x03
+'Ji ',    # 0x04
+'Zhe ',    # 0x05
+'Yu ',    # 0x06
+'Zhan ',    # 0x07
+'Ye ',    # 0x08
+'Yang ',    # 0x09
+'Pi ',    # 0x0a
+'Ning ',    # 0x0b
+'Huo ',    # 0x0c
+'Mi ',    # 0x0d
+'Ying ',    # 0x0e
+'Meng ',    # 0x0f
+'Di ',    # 0x10
+'Yue ',    # 0x11
+'Yu ',    # 0x12
+'Lei ',    # 0x13
+'Bao ',    # 0x14
+'Lu ',    # 0x15
+'He ',    # 0x16
+'Long ',    # 0x17
+'Shuang ',    # 0x18
+'Yue ',    # 0x19
+'Ying ',    # 0x1a
+'Guan ',    # 0x1b
+'Qu ',    # 0x1c
+'Li ',    # 0x1d
+'Luan ',    # 0x1e
+'Niao ',    # 0x1f
+'Jiu ',    # 0x20
+'Ji ',    # 0x21
+'Yuan ',    # 0x22
+'Ming ',    # 0x23
+'Shi ',    # 0x24
+'Ou ',    # 0x25
+'Ya ',    # 0x26
+'Cang ',    # 0x27
+'Bao ',    # 0x28
+'Zhen ',    # 0x29
+'Gu ',    # 0x2a
+'Dong ',    # 0x2b
+'Lu ',    # 0x2c
+'Ya ',    # 0x2d
+'Xiao ',    # 0x2e
+'Yang ',    # 0x2f
+'Ling ',    # 0x30
+'Zhi ',    # 0x31
+'Qu ',    # 0x32
+'Yuan ',    # 0x33
+'Xue ',    # 0x34
+'Tuo ',    # 0x35
+'Si ',    # 0x36
+'Zhi ',    # 0x37
+'Er ',    # 0x38
+'Gua ',    # 0x39
+'Xiu ',    # 0x3a
+'Heng ',    # 0x3b
+'Zhou ',    # 0x3c
+'Ge ',    # 0x3d
+'Luan ',    # 0x3e
+'Hong ',    # 0x3f
+'Wu ',    # 0x40
+'Bo ',    # 0x41
+'Li ',    # 0x42
+'Juan ',    # 0x43
+'Hu ',    # 0x44
+'E ',    # 0x45
+'Yu ',    # 0x46
+'Xian ',    # 0x47
+'Ti ',    # 0x48
+'Wu ',    # 0x49
+'Que ',    # 0x4a
+'Miao ',    # 0x4b
+'An ',    # 0x4c
+'Kun ',    # 0x4d
+'Bei ',    # 0x4e
+'Peng ',    # 0x4f
+'Qian ',    # 0x50
+'Chun ',    # 0x51
+'Geng ',    # 0x52
+'Yuan ',    # 0x53
+'Su ',    # 0x54
+'Hu ',    # 0x55
+'He ',    # 0x56
+'E ',    # 0x57
+'Gu ',    # 0x58
+'Qiu ',    # 0x59
+'Zi ',    # 0x5a
+'Mei ',    # 0x5b
+'Mu ',    # 0x5c
+'Ni ',    # 0x5d
+'Yao ',    # 0x5e
+'Weng ',    # 0x5f
+'Liu ',    # 0x60
+'Ji ',    # 0x61
+'Ni ',    # 0x62
+'Jian ',    # 0x63
+'He ',    # 0x64
+'Yi ',    # 0x65
+'Ying ',    # 0x66
+'Zhe ',    # 0x67
+'Liao ',    # 0x68
+'Liao ',    # 0x69
+'Jiao ',    # 0x6a
+'Jiu ',    # 0x6b
+'Yu ',    # 0x6c
+'Lu ',    # 0x6d
+'Xuan ',    # 0x6e
+'Zhan ',    # 0x6f
+'Ying ',    # 0x70
+'Huo ',    # 0x71
+'Meng ',    # 0x72
+'Guan ',    # 0x73
+'Shuang ',    # 0x74
+'Lu ',    # 0x75
+'Jin ',    # 0x76
+'Ling ',    # 0x77
+'Jian ',    # 0x78
+'Xian ',    # 0x79
+'Cuo ',    # 0x7a
+'Jian ',    # 0x7b
+'Jian ',    # 0x7c
+'Yan ',    # 0x7d
+'Cuo ',    # 0x7e
+'Lu ',    # 0x7f
+'You ',    # 0x80
+'Cu ',    # 0x81
+'Ji ',    # 0x82
+'Biao ',    # 0x83
+'Cu ',    # 0x84
+'Biao ',    # 0x85
+'Zhu ',    # 0x86
+'Jun ',    # 0x87
+'Zhu ',    # 0x88
+'Jian ',    # 0x89
+'Mi ',    # 0x8a
+'Mi ',    # 0x8b
+'Wu ',    # 0x8c
+'Liu ',    # 0x8d
+'Chen ',    # 0x8e
+'Jun ',    # 0x8f
+'Lin ',    # 0x90
+'Ni ',    # 0x91
+'Qi ',    # 0x92
+'Lu ',    # 0x93
+'Jiu ',    # 0x94
+'Jun ',    # 0x95
+'Jing ',    # 0x96
+'Li ',    # 0x97
+'Xiang ',    # 0x98
+'Yan ',    # 0x99
+'Jia ',    # 0x9a
+'Mi ',    # 0x9b
+'Li ',    # 0x9c
+'She ',    # 0x9d
+'Zhang ',    # 0x9e
+'Lin ',    # 0x9f
+'Jing ',    # 0xa0
+'Ji ',    # 0xa1
+'Ling ',    # 0xa2
+'Yan ',    # 0xa3
+'Cu ',    # 0xa4
+'Mai ',    # 0xa5
+'Mai ',    # 0xa6
+'Ge ',    # 0xa7
+'Chao ',    # 0xa8
+'Fu ',    # 0xa9
+'Mian ',    # 0xaa
+'Mian ',    # 0xab
+'Fu ',    # 0xac
+'Pao ',    # 0xad
+'Qu ',    # 0xae
+'Qu ',    # 0xaf
+'Mou ',    # 0xb0
+'Fu ',    # 0xb1
+'Xian ',    # 0xb2
+'Lai ',    # 0xb3
+'Qu ',    # 0xb4
+'Mian ',    # 0xb5
+'[?] ',    # 0xb6
+'Feng ',    # 0xb7
+'Fu ',    # 0xb8
+'Qu ',    # 0xb9
+'Mian ',    # 0xba
+'Ma ',    # 0xbb
+'Mo ',    # 0xbc
+'Mo ',    # 0xbd
+'Hui ',    # 0xbe
+'Ma ',    # 0xbf
+'Zou ',    # 0xc0
+'Nen ',    # 0xc1
+'Fen ',    # 0xc2
+'Huang ',    # 0xc3
+'Huang ',    # 0xc4
+'Jin ',    # 0xc5
+'Guang ',    # 0xc6
+'Tian ',    # 0xc7
+'Tou ',    # 0xc8
+'Heng ',    # 0xc9
+'Xi ',    # 0xca
+'Kuang ',    # 0xcb
+'Heng ',    # 0xcc
+'Shu ',    # 0xcd
+'Li ',    # 0xce
+'Nian ',    # 0xcf
+'Chi ',    # 0xd0
+'Hei ',    # 0xd1
+'Hei ',    # 0xd2
+'Yi ',    # 0xd3
+'Qian ',    # 0xd4
+'Dan ',    # 0xd5
+'Xi ',    # 0xd6
+'Tuan ',    # 0xd7
+'Mo ',    # 0xd8
+'Mo ',    # 0xd9
+'Qian ',    # 0xda
+'Dai ',    # 0xdb
+'Chu ',    # 0xdc
+'You ',    # 0xdd
+'Dian ',    # 0xde
+'Yi ',    # 0xdf
+'Xia ',    # 0xe0
+'Yan ',    # 0xe1
+'Qu ',    # 0xe2
+'Mei ',    # 0xe3
+'Yan ',    # 0xe4
+'Jing ',    # 0xe5
+'Yu ',    # 0xe6
+'Li ',    # 0xe7
+'Dang ',    # 0xe8
+'Du ',    # 0xe9
+'Can ',    # 0xea
+'Yin ',    # 0xeb
+'An ',    # 0xec
+'Yan ',    # 0xed
+'Tan ',    # 0xee
+'An ',    # 0xef
+'Zhen ',    # 0xf0
+'Dai ',    # 0xf1
+'Can ',    # 0xf2
+'Yi ',    # 0xf3
+'Mei ',    # 0xf4
+'Dan ',    # 0xf5
+'Yan ',    # 0xf6
+'Du ',    # 0xf7
+'Lu ',    # 0xf8
+'Zhi ',    # 0xf9
+'Fen ',    # 0xfa
+'Fu ',    # 0xfb
+'Fu ',    # 0xfc
+'Min ',    # 0xfd
+'Min ',    # 0xfe
+'Yuan ',    # 0xff
+)
diff --git a/lib/unidecode/x09f.py b/lib/unidecode/x09f.py
new file mode 100644
index 00000000..acd59a69
--- /dev/null
+++ b/lib/unidecode/x09f.py
@@ -0,0 +1,257 @@
+data = (
+'Cu ',    # 0x00
+'Qu ',    # 0x01
+'Chao ',    # 0x02
+'Wa ',    # 0x03
+'Zhu ',    # 0x04
+'Zhi ',    # 0x05
+'Mang ',    # 0x06
+'Ao ',    # 0x07
+'Bie ',    # 0x08
+'Tuo ',    # 0x09
+'Bi ',    # 0x0a
+'Yuan ',    # 0x0b
+'Chao ',    # 0x0c
+'Tuo ',    # 0x0d
+'Ding ',    # 0x0e
+'Mi ',    # 0x0f
+'Nai ',    # 0x10
+'Ding ',    # 0x11
+'Zi ',    # 0x12
+'Gu ',    # 0x13
+'Gu ',    # 0x14
+'Dong ',    # 0x15
+'Fen ',    # 0x16
+'Tao ',    # 0x17
+'Yuan ',    # 0x18
+'Pi ',    # 0x19
+'Chang ',    # 0x1a
+'Gao ',    # 0x1b
+'Qi ',    # 0x1c
+'Yuan ',    # 0x1d
+'Tang ',    # 0x1e
+'Teng ',    # 0x1f
+'Shu ',    # 0x20
+'Shu ',    # 0x21
+'Fen ',    # 0x22
+'Fei ',    # 0x23
+'Wen ',    # 0x24
+'Ba ',    # 0x25
+'Diao ',    # 0x26
+'Tuo ',    # 0x27
+'Tong ',    # 0x28
+'Qu ',    # 0x29
+'Sheng ',    # 0x2a
+'Shi ',    # 0x2b
+'You ',    # 0x2c
+'Shi ',    # 0x2d
+'Ting ',    # 0x2e
+'Wu ',    # 0x2f
+'Nian ',    # 0x30
+'Jing ',    # 0x31
+'Hun ',    # 0x32
+'Ju ',    # 0x33
+'Yan ',    # 0x34
+'Tu ',    # 0x35
+'Ti ',    # 0x36
+'Xi ',    # 0x37
+'Xian ',    # 0x38
+'Yan ',    # 0x39
+'Lei ',    # 0x3a
+'Bi ',    # 0x3b
+'Yao ',    # 0x3c
+'Qiu ',    # 0x3d
+'Han ',    # 0x3e
+'Wu ',    # 0x3f
+'Wu ',    # 0x40
+'Hou ',    # 0x41
+'Xi ',    # 0x42
+'Ge ',    # 0x43
+'Zha ',    # 0x44
+'Xiu ',    # 0x45
+'Weng ',    # 0x46
+'Zha ',    # 0x47
+'Nong ',    # 0x48
+'Nang ',    # 0x49
+'Qi ',    # 0x4a
+'Zhai ',    # 0x4b
+'Ji ',    # 0x4c
+'Zi ',    # 0x4d
+'Ji ',    # 0x4e
+'Ji ',    # 0x4f
+'Qi ',    # 0x50
+'Ji ',    # 0x51
+'Chi ',    # 0x52
+'Chen ',    # 0x53
+'Chen ',    # 0x54
+'He ',    # 0x55
+'Ya ',    # 0x56
+'Ken ',    # 0x57
+'Xie ',    # 0x58
+'Pao ',    # 0x59
+'Cuo ',    # 0x5a
+'Shi ',    # 0x5b
+'Zi ',    # 0x5c
+'Chi ',    # 0x5d
+'Nian ',    # 0x5e
+'Ju ',    # 0x5f
+'Tiao ',    # 0x60
+'Ling ',    # 0x61
+'Ling ',    # 0x62
+'Chu ',    # 0x63
+'Quan ',    # 0x64
+'Xie ',    # 0x65
+'Ken ',    # 0x66
+'Nie ',    # 0x67
+'Jiu ',    # 0x68
+'Yao ',    # 0x69
+'Chuo ',    # 0x6a
+'Kun ',    # 0x6b
+'Yu ',    # 0x6c
+'Chu ',    # 0x6d
+'Yi ',    # 0x6e
+'Ni ',    # 0x6f
+'Cuo ',    # 0x70
+'Zou ',    # 0x71
+'Qu ',    # 0x72
+'Nen ',    # 0x73
+'Xian ',    # 0x74
+'Ou ',    # 0x75
+'E ',    # 0x76
+'Wo ',    # 0x77
+'Yi ',    # 0x78
+'Chuo ',    # 0x79
+'Zou ',    # 0x7a
+'Dian ',    # 0x7b
+'Chu ',    # 0x7c
+'Jin ',    # 0x7d
+'Ya ',    # 0x7e
+'Chi ',    # 0x7f
+'Chen ',    # 0x80
+'He ',    # 0x81
+'Ken ',    # 0x82
+'Ju ',    # 0x83
+'Ling ',    # 0x84
+'Pao ',    # 0x85
+'Tiao ',    # 0x86
+'Zi ',    # 0x87
+'Ken ',    # 0x88
+'Yu ',    # 0x89
+'Chuo ',    # 0x8a
+'Qu ',    # 0x8b
+'Wo ',    # 0x8c
+'Long ',    # 0x8d
+'Pang ',    # 0x8e
+'Gong ',    # 0x8f
+'Pang ',    # 0x90
+'Yan ',    # 0x91
+'Long ',    # 0x92
+'Long ',    # 0x93
+'Gong ',    # 0x94
+'Kan ',    # 0x95
+'Ta ',    # 0x96
+'Ling ',    # 0x97
+'Ta ',    # 0x98
+'Long ',    # 0x99
+'Gong ',    # 0x9a
+'Kan ',    # 0x9b
+'Gui ',    # 0x9c
+'Qiu ',    # 0x9d
+'Bie ',    # 0x9e
+'Gui ',    # 0x9f
+'Yue ',    # 0xa0
+'Chui ',    # 0xa1
+'He ',    # 0xa2
+'Jue ',    # 0xa3
+'Xie ',    # 0xa4
+'Yu ',    # 0xa5
+'[?]',    # 0xa6
+'[?]',    # 0xa7
+'[?]',    # 0xa8
+'[?]',    # 0xa9
+'[?]',    # 0xaa
+'[?]',    # 0xab
+'[?]',    # 0xac
+'[?]',    # 0xad
+'[?]',    # 0xae
+'[?]',    # 0xaf
+'[?]',    # 0xb0
+'[?]',    # 0xb1
+'[?]',    # 0xb2
+'[?]',    # 0xb3
+'[?]',    # 0xb4
+'[?]',    # 0xb5
+'[?]',    # 0xb6
+'[?]',    # 0xb7
+'[?]',    # 0xb8
+'[?]',    # 0xb9
+'[?]',    # 0xba
+'[?]',    # 0xbb
+'[?]',    # 0xbc
+'[?]',    # 0xbd
+'[?]',    # 0xbe
+'[?]',    # 0xbf
+'[?]',    # 0xc0
+'[?]',    # 0xc1
+'[?]',    # 0xc2
+'[?]',    # 0xc3
+'[?]',    # 0xc4
+'[?]',    # 0xc5
+'[?]',    # 0xc6
+'[?]',    # 0xc7
+'[?]',    # 0xc8
+'[?]',    # 0xc9
+'[?]',    # 0xca
+'[?]',    # 0xcb
+'[?]',    # 0xcc
+'[?]',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'[?]',    # 0xd0
+'[?]',    # 0xd1
+'[?]',    # 0xd2
+'[?]',    # 0xd3
+'[?]',    # 0xd4
+'[?]',    # 0xd5
+'[?]',    # 0xd6
+'[?]',    # 0xd7
+'[?]',    # 0xd8
+'[?]',    # 0xd9
+'[?]',    # 0xda
+'[?]',    # 0xdb
+'[?]',    # 0xdc
+'[?]',    # 0xdd
+'[?]',    # 0xde
+'[?]',    # 0xdf
+'[?]',    # 0xe0
+'[?]',    # 0xe1
+'[?]',    # 0xe2
+'[?]',    # 0xe3
+'[?]',    # 0xe4
+'[?]',    # 0xe5
+'[?]',    # 0xe6
+'[?]',    # 0xe7
+'[?]',    # 0xe8
+'[?]',    # 0xe9
+'[?]',    # 0xea
+'[?]',    # 0xeb
+'[?]',    # 0xec
+'[?]',    # 0xed
+'[?]',    # 0xee
+'[?]',    # 0xef
+'[?]',    # 0xf0
+'[?]',    # 0xf1
+'[?]',    # 0xf2
+'[?]',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x0a0.py b/lib/unidecode/x0a0.py
new file mode 100644
index 00000000..c25f17bc
--- /dev/null
+++ b/lib/unidecode/x0a0.py
@@ -0,0 +1,258 @@
+data = (
+'it',    # 0x00
+'ix',    # 0x01
+'i',    # 0x02
+'ip',    # 0x03
+'iet',    # 0x04
+'iex',    # 0x05
+'ie',    # 0x06
+'iep',    # 0x07
+'at',    # 0x08
+'ax',    # 0x09
+'a',    # 0x0a
+'ap',    # 0x0b
+'uox',    # 0x0c
+'uo',    # 0x0d
+'uop',    # 0x0e
+'ot',    # 0x0f
+'ox',    # 0x10
+'o',    # 0x11
+'op',    # 0x12
+'ex',    # 0x13
+'e',    # 0x14
+'wu',    # 0x15
+'bit',    # 0x16
+'bix',    # 0x17
+'bi',    # 0x18
+'bip',    # 0x19
+'biet',    # 0x1a
+'biex',    # 0x1b
+'bie',    # 0x1c
+'biep',    # 0x1d
+'bat',    # 0x1e
+'bax',    # 0x1f
+'ba',    # 0x20
+'bap',    # 0x21
+'buox',    # 0x22
+'buo',    # 0x23
+'buop',    # 0x24
+'bot',    # 0x25
+'box',    # 0x26
+'bo',    # 0x27
+'bop',    # 0x28
+'bex',    # 0x29
+'be',    # 0x2a
+'bep',    # 0x2b
+'but',    # 0x2c
+'bux',    # 0x2d
+'bu',    # 0x2e
+'bup',    # 0x2f
+'burx',    # 0x30
+'bur',    # 0x31
+'byt',    # 0x32
+'byx',    # 0x33
+'by',    # 0x34
+'byp',    # 0x35
+'byrx',    # 0x36
+'byr',    # 0x37
+'pit',    # 0x38
+'pix',    # 0x39
+'pi',    # 0x3a
+'pip',    # 0x3b
+'piex',    # 0x3c
+'pie',    # 0x3d
+'piep',    # 0x3e
+'pat',    # 0x3f
+'pax',    # 0x40
+'pa',    # 0x41
+'pap',    # 0x42
+'puox',    # 0x43
+'puo',    # 0x44
+'puop',    # 0x45
+'pot',    # 0x46
+'pox',    # 0x47
+'po',    # 0x48
+'pop',    # 0x49
+'put',    # 0x4a
+'pux',    # 0x4b
+'pu',    # 0x4c
+'pup',    # 0x4d
+'purx',    # 0x4e
+'pur',    # 0x4f
+'pyt',    # 0x50
+'pyx',    # 0x51
+'py',    # 0x52
+'pyp',    # 0x53
+'pyrx',    # 0x54
+'pyr',    # 0x55
+'bbit',    # 0x56
+'bbix',    # 0x57
+'bbi',    # 0x58
+'bbip',    # 0x59
+'bbiet',    # 0x5a
+'bbiex',    # 0x5b
+'bbie',    # 0x5c
+'bbiep',    # 0x5d
+'bbat',    # 0x5e
+'bbax',    # 0x5f
+'bba',    # 0x60
+'bbap',    # 0x61
+'bbuox',    # 0x62
+'bbuo',    # 0x63
+'bbuop',    # 0x64
+'bbot',    # 0x65
+'bbox',    # 0x66
+'bbo',    # 0x67
+'bbop',    # 0x68
+'bbex',    # 0x69
+'bbe',    # 0x6a
+'bbep',    # 0x6b
+'bbut',    # 0x6c
+'bbux',    # 0x6d
+'bbu',    # 0x6e
+'bbup',    # 0x6f
+'bburx',    # 0x70
+'bbur',    # 0x71
+'bbyt',    # 0x72
+'bbyx',    # 0x73
+'bby',    # 0x74
+'bbyp',    # 0x75
+'nbit',    # 0x76
+'nbix',    # 0x77
+'nbi',    # 0x78
+'nbip',    # 0x79
+'nbiex',    # 0x7a
+'nbie',    # 0x7b
+'nbiep',    # 0x7c
+'nbat',    # 0x7d
+'nbax',    # 0x7e
+'nba',    # 0x7f
+'nbap',    # 0x80
+'nbot',    # 0x81
+'nbox',    # 0x82
+'nbo',    # 0x83
+'nbop',    # 0x84
+'nbut',    # 0x85
+'nbux',    # 0x86
+'nbu',    # 0x87
+'nbup',    # 0x88
+'nburx',    # 0x89
+'nbur',    # 0x8a
+'nbyt',    # 0x8b
+'nbyx',    # 0x8c
+'nby',    # 0x8d
+'nbyp',    # 0x8e
+'nbyrx',    # 0x8f
+'nbyr',    # 0x90
+'hmit',    # 0x91
+'hmix',    # 0x92
+'hmi',    # 0x93
+'hmip',    # 0x94
+'hmiex',    # 0x95
+'hmie',    # 0x96
+'hmiep',    # 0x97
+'hmat',    # 0x98
+'hmax',    # 0x99
+'hma',    # 0x9a
+'hmap',    # 0x9b
+'hmuox',    # 0x9c
+'hmuo',    # 0x9d
+'hmuop',    # 0x9e
+'hmot',    # 0x9f
+'hmox',    # 0xa0
+'hmo',    # 0xa1
+'hmop',    # 0xa2
+'hmut',    # 0xa3
+'hmux',    # 0xa4
+'hmu',    # 0xa5
+'hmup',    # 0xa6
+'hmurx',    # 0xa7
+'hmur',    # 0xa8
+'hmyx',    # 0xa9
+'hmy',    # 0xaa
+'hmyp',    # 0xab
+'hmyrx',    # 0xac
+'hmyr',    # 0xad
+'mit',    # 0xae
+'mix',    # 0xaf
+'mi',    # 0xb0
+'mip',    # 0xb1
+'miex',    # 0xb2
+'mie',    # 0xb3
+'miep',    # 0xb4
+'mat',    # 0xb5
+'max',    # 0xb6
+'ma',    # 0xb7
+'map',    # 0xb8
+'muot',    # 0xb9
+'muox',    # 0xba
+'muo',    # 0xbb
+'muop',    # 0xbc
+'mot',    # 0xbd
+'mox',    # 0xbe
+'mo',    # 0xbf
+'mop',    # 0xc0
+'mex',    # 0xc1
+'me',    # 0xc2
+'mut',    # 0xc3
+'mux',    # 0xc4
+'mu',    # 0xc5
+'mup',    # 0xc6
+'murx',    # 0xc7
+'mur',    # 0xc8
+'myt',    # 0xc9
+'myx',    # 0xca
+'my',    # 0xcb
+'myp',    # 0xcc
+'fit',    # 0xcd
+'fix',    # 0xce
+'fi',    # 0xcf
+'fip',    # 0xd0
+'fat',    # 0xd1
+'fax',    # 0xd2
+'fa',    # 0xd3
+'fap',    # 0xd4
+'fox',    # 0xd5
+'fo',    # 0xd6
+'fop',    # 0xd7
+'fut',    # 0xd8
+'fux',    # 0xd9
+'fu',    # 0xda
+'fup',    # 0xdb
+'furx',    # 0xdc
+'fur',    # 0xdd
+'fyt',    # 0xde
+'fyx',    # 0xdf
+'fy',    # 0xe0
+'fyp',    # 0xe1
+'vit',    # 0xe2
+'vix',    # 0xe3
+'vi',    # 0xe4
+'vip',    # 0xe5
+'viet',    # 0xe6
+'viex',    # 0xe7
+'vie',    # 0xe8
+'viep',    # 0xe9
+'vat',    # 0xea
+'vax',    # 0xeb
+'va',    # 0xec
+'vap',    # 0xed
+'vot',    # 0xee
+'vox',    # 0xef
+'vo',    # 0xf0
+'vop',    # 0xf1
+'vex',    # 0xf2
+'vep',    # 0xf3
+'vut',    # 0xf4
+'vux',    # 0xf5
+'vu',    # 0xf6
+'vup',    # 0xf7
+'vurx',    # 0xf8
+'vur',    # 0xf9
+'vyt',    # 0xfa
+'vyx',    # 0xfb
+'vy',    # 0xfc
+'vyp',    # 0xfd
+'vyrx',    # 0xfe
+'vyr',    # 0xff
+)
diff --git a/lib/unidecode/x0a1.py b/lib/unidecode/x0a1.py
new file mode 100644
index 00000000..185dc8ba
--- /dev/null
+++ b/lib/unidecode/x0a1.py
@@ -0,0 +1,258 @@
+data = (
+'dit',    # 0x00
+'dix',    # 0x01
+'di',    # 0x02
+'dip',    # 0x03
+'diex',    # 0x04
+'die',    # 0x05
+'diep',    # 0x06
+'dat',    # 0x07
+'dax',    # 0x08
+'da',    # 0x09
+'dap',    # 0x0a
+'duox',    # 0x0b
+'duo',    # 0x0c
+'dot',    # 0x0d
+'dox',    # 0x0e
+'do',    # 0x0f
+'dop',    # 0x10
+'dex',    # 0x11
+'de',    # 0x12
+'dep',    # 0x13
+'dut',    # 0x14
+'dux',    # 0x15
+'du',    # 0x16
+'dup',    # 0x17
+'durx',    # 0x18
+'dur',    # 0x19
+'tit',    # 0x1a
+'tix',    # 0x1b
+'ti',    # 0x1c
+'tip',    # 0x1d
+'tiex',    # 0x1e
+'tie',    # 0x1f
+'tiep',    # 0x20
+'tat',    # 0x21
+'tax',    # 0x22
+'ta',    # 0x23
+'tap',    # 0x24
+'tuot',    # 0x25
+'tuox',    # 0x26
+'tuo',    # 0x27
+'tuop',    # 0x28
+'tot',    # 0x29
+'tox',    # 0x2a
+'to',    # 0x2b
+'top',    # 0x2c
+'tex',    # 0x2d
+'te',    # 0x2e
+'tep',    # 0x2f
+'tut',    # 0x30
+'tux',    # 0x31
+'tu',    # 0x32
+'tup',    # 0x33
+'turx',    # 0x34
+'tur',    # 0x35
+'ddit',    # 0x36
+'ddix',    # 0x37
+'ddi',    # 0x38
+'ddip',    # 0x39
+'ddiex',    # 0x3a
+'ddie',    # 0x3b
+'ddiep',    # 0x3c
+'ddat',    # 0x3d
+'ddax',    # 0x3e
+'dda',    # 0x3f
+'ddap',    # 0x40
+'dduox',    # 0x41
+'dduo',    # 0x42
+'dduop',    # 0x43
+'ddot',    # 0x44
+'ddox',    # 0x45
+'ddo',    # 0x46
+'ddop',    # 0x47
+'ddex',    # 0x48
+'dde',    # 0x49
+'ddep',    # 0x4a
+'ddut',    # 0x4b
+'ddux',    # 0x4c
+'ddu',    # 0x4d
+'ddup',    # 0x4e
+'ddurx',    # 0x4f
+'ddur',    # 0x50
+'ndit',    # 0x51
+'ndix',    # 0x52
+'ndi',    # 0x53
+'ndip',    # 0x54
+'ndiex',    # 0x55
+'ndie',    # 0x56
+'ndat',    # 0x57
+'ndax',    # 0x58
+'nda',    # 0x59
+'ndap',    # 0x5a
+'ndot',    # 0x5b
+'ndox',    # 0x5c
+'ndo',    # 0x5d
+'ndop',    # 0x5e
+'ndex',    # 0x5f
+'nde',    # 0x60
+'ndep',    # 0x61
+'ndut',    # 0x62
+'ndux',    # 0x63
+'ndu',    # 0x64
+'ndup',    # 0x65
+'ndurx',    # 0x66
+'ndur',    # 0x67
+'hnit',    # 0x68
+'hnix',    # 0x69
+'hni',    # 0x6a
+'hnip',    # 0x6b
+'hniet',    # 0x6c
+'hniex',    # 0x6d
+'hnie',    # 0x6e
+'hniep',    # 0x6f
+'hnat',    # 0x70
+'hnax',    # 0x71
+'hna',    # 0x72
+'hnap',    # 0x73
+'hnuox',    # 0x74
+'hnuo',    # 0x75
+'hnot',    # 0x76
+'hnox',    # 0x77
+'hnop',    # 0x78
+'hnex',    # 0x79
+'hne',    # 0x7a
+'hnep',    # 0x7b
+'hnut',    # 0x7c
+'nit',    # 0x7d
+'nix',    # 0x7e
+'ni',    # 0x7f
+'nip',    # 0x80
+'niex',    # 0x81
+'nie',    # 0x82
+'niep',    # 0x83
+'nax',    # 0x84
+'na',    # 0x85
+'nap',    # 0x86
+'nuox',    # 0x87
+'nuo',    # 0x88
+'nuop',    # 0x89
+'not',    # 0x8a
+'nox',    # 0x8b
+'no',    # 0x8c
+'nop',    # 0x8d
+'nex',    # 0x8e
+'ne',    # 0x8f
+'nep',    # 0x90
+'nut',    # 0x91
+'nux',    # 0x92
+'nu',    # 0x93
+'nup',    # 0x94
+'nurx',    # 0x95
+'nur',    # 0x96
+'hlit',    # 0x97
+'hlix',    # 0x98
+'hli',    # 0x99
+'hlip',    # 0x9a
+'hliex',    # 0x9b
+'hlie',    # 0x9c
+'hliep',    # 0x9d
+'hlat',    # 0x9e
+'hlax',    # 0x9f
+'hla',    # 0xa0
+'hlap',    # 0xa1
+'hluox',    # 0xa2
+'hluo',    # 0xa3
+'hluop',    # 0xa4
+'hlox',    # 0xa5
+'hlo',    # 0xa6
+'hlop',    # 0xa7
+'hlex',    # 0xa8
+'hle',    # 0xa9
+'hlep',    # 0xaa
+'hlut',    # 0xab
+'hlux',    # 0xac
+'hlu',    # 0xad
+'hlup',    # 0xae
+'hlurx',    # 0xaf
+'hlur',    # 0xb0
+'hlyt',    # 0xb1
+'hlyx',    # 0xb2
+'hly',    # 0xb3
+'hlyp',    # 0xb4
+'hlyrx',    # 0xb5
+'hlyr',    # 0xb6
+'lit',    # 0xb7
+'lix',    # 0xb8
+'li',    # 0xb9
+'lip',    # 0xba
+'liet',    # 0xbb
+'liex',    # 0xbc
+'lie',    # 0xbd
+'liep',    # 0xbe
+'lat',    # 0xbf
+'lax',    # 0xc0
+'la',    # 0xc1
+'lap',    # 0xc2
+'luot',    # 0xc3
+'luox',    # 0xc4
+'luo',    # 0xc5
+'luop',    # 0xc6
+'lot',    # 0xc7
+'lox',    # 0xc8
+'lo',    # 0xc9
+'lop',    # 0xca
+'lex',    # 0xcb
+'le',    # 0xcc
+'lep',    # 0xcd
+'lut',    # 0xce
+'lux',    # 0xcf
+'lu',    # 0xd0
+'lup',    # 0xd1
+'lurx',    # 0xd2
+'lur',    # 0xd3
+'lyt',    # 0xd4
+'lyx',    # 0xd5
+'ly',    # 0xd6
+'lyp',    # 0xd7
+'lyrx',    # 0xd8
+'lyr',    # 0xd9
+'git',    # 0xda
+'gix',    # 0xdb
+'gi',    # 0xdc
+'gip',    # 0xdd
+'giet',    # 0xde
+'giex',    # 0xdf
+'gie',    # 0xe0
+'giep',    # 0xe1
+'gat',    # 0xe2
+'gax',    # 0xe3
+'ga',    # 0xe4
+'gap',    # 0xe5
+'guot',    # 0xe6
+'guox',    # 0xe7
+'guo',    # 0xe8
+'guop',    # 0xe9
+'got',    # 0xea
+'gox',    # 0xeb
+'go',    # 0xec
+'gop',    # 0xed
+'get',    # 0xee
+'gex',    # 0xef
+'ge',    # 0xf0
+'gep',    # 0xf1
+'gut',    # 0xf2
+'gux',    # 0xf3
+'gu',    # 0xf4
+'gup',    # 0xf5
+'gurx',    # 0xf6
+'gur',    # 0xf7
+'kit',    # 0xf8
+'kix',    # 0xf9
+'ki',    # 0xfa
+'kip',    # 0xfb
+'kiex',    # 0xfc
+'kie',    # 0xfd
+'kiep',    # 0xfe
+'kat',    # 0xff
+)
diff --git a/lib/unidecode/x0a2.py b/lib/unidecode/x0a2.py
new file mode 100644
index 00000000..8ea89913
--- /dev/null
+++ b/lib/unidecode/x0a2.py
@@ -0,0 +1,258 @@
+data = (
+'kax',    # 0x00
+'ka',    # 0x01
+'kap',    # 0x02
+'kuox',    # 0x03
+'kuo',    # 0x04
+'kuop',    # 0x05
+'kot',    # 0x06
+'kox',    # 0x07
+'ko',    # 0x08
+'kop',    # 0x09
+'ket',    # 0x0a
+'kex',    # 0x0b
+'ke',    # 0x0c
+'kep',    # 0x0d
+'kut',    # 0x0e
+'kux',    # 0x0f
+'ku',    # 0x10
+'kup',    # 0x11
+'kurx',    # 0x12
+'kur',    # 0x13
+'ggit',    # 0x14
+'ggix',    # 0x15
+'ggi',    # 0x16
+'ggiex',    # 0x17
+'ggie',    # 0x18
+'ggiep',    # 0x19
+'ggat',    # 0x1a
+'ggax',    # 0x1b
+'gga',    # 0x1c
+'ggap',    # 0x1d
+'gguot',    # 0x1e
+'gguox',    # 0x1f
+'gguo',    # 0x20
+'gguop',    # 0x21
+'ggot',    # 0x22
+'ggox',    # 0x23
+'ggo',    # 0x24
+'ggop',    # 0x25
+'gget',    # 0x26
+'ggex',    # 0x27
+'gge',    # 0x28
+'ggep',    # 0x29
+'ggut',    # 0x2a
+'ggux',    # 0x2b
+'ggu',    # 0x2c
+'ggup',    # 0x2d
+'ggurx',    # 0x2e
+'ggur',    # 0x2f
+'mgiex',    # 0x30
+'mgie',    # 0x31
+'mgat',    # 0x32
+'mgax',    # 0x33
+'mga',    # 0x34
+'mgap',    # 0x35
+'mguox',    # 0x36
+'mguo',    # 0x37
+'mguop',    # 0x38
+'mgot',    # 0x39
+'mgox',    # 0x3a
+'mgo',    # 0x3b
+'mgop',    # 0x3c
+'mgex',    # 0x3d
+'mge',    # 0x3e
+'mgep',    # 0x3f
+'mgut',    # 0x40
+'mgux',    # 0x41
+'mgu',    # 0x42
+'mgup',    # 0x43
+'mgurx',    # 0x44
+'mgur',    # 0x45
+'hxit',    # 0x46
+'hxix',    # 0x47
+'hxi',    # 0x48
+'hxip',    # 0x49
+'hxiet',    # 0x4a
+'hxiex',    # 0x4b
+'hxie',    # 0x4c
+'hxiep',    # 0x4d
+'hxat',    # 0x4e
+'hxax',    # 0x4f
+'hxa',    # 0x50
+'hxap',    # 0x51
+'hxuot',    # 0x52
+'hxuox',    # 0x53
+'hxuo',    # 0x54
+'hxuop',    # 0x55
+'hxot',    # 0x56
+'hxox',    # 0x57
+'hxo',    # 0x58
+'hxop',    # 0x59
+'hxex',    # 0x5a
+'hxe',    # 0x5b
+'hxep',    # 0x5c
+'ngiex',    # 0x5d
+'ngie',    # 0x5e
+'ngiep',    # 0x5f
+'ngat',    # 0x60
+'ngax',    # 0x61
+'nga',    # 0x62
+'ngap',    # 0x63
+'nguot',    # 0x64
+'nguox',    # 0x65
+'nguo',    # 0x66
+'ngot',    # 0x67
+'ngox',    # 0x68
+'ngo',    # 0x69
+'ngop',    # 0x6a
+'ngex',    # 0x6b
+'nge',    # 0x6c
+'ngep',    # 0x6d
+'hit',    # 0x6e
+'hiex',    # 0x6f
+'hie',    # 0x70
+'hat',    # 0x71
+'hax',    # 0x72
+'ha',    # 0x73
+'hap',    # 0x74
+'huot',    # 0x75
+'huox',    # 0x76
+'huo',    # 0x77
+'huop',    # 0x78
+'hot',    # 0x79
+'hox',    # 0x7a
+'ho',    # 0x7b
+'hop',    # 0x7c
+'hex',    # 0x7d
+'he',    # 0x7e
+'hep',    # 0x7f
+'wat',    # 0x80
+'wax',    # 0x81
+'wa',    # 0x82
+'wap',    # 0x83
+'wuox',    # 0x84
+'wuo',    # 0x85
+'wuop',    # 0x86
+'wox',    # 0x87
+'wo',    # 0x88
+'wop',    # 0x89
+'wex',    # 0x8a
+'we',    # 0x8b
+'wep',    # 0x8c
+'zit',    # 0x8d
+'zix',    # 0x8e
+'zi',    # 0x8f
+'zip',    # 0x90
+'ziex',    # 0x91
+'zie',    # 0x92
+'ziep',    # 0x93
+'zat',    # 0x94
+'zax',    # 0x95
+'za',    # 0x96
+'zap',    # 0x97
+'zuox',    # 0x98
+'zuo',    # 0x99
+'zuop',    # 0x9a
+'zot',    # 0x9b
+'zox',    # 0x9c
+'zo',    # 0x9d
+'zop',    # 0x9e
+'zex',    # 0x9f
+'ze',    # 0xa0
+'zep',    # 0xa1
+'zut',    # 0xa2
+'zux',    # 0xa3
+'zu',    # 0xa4
+'zup',    # 0xa5
+'zurx',    # 0xa6
+'zur',    # 0xa7
+'zyt',    # 0xa8
+'zyx',    # 0xa9
+'zy',    # 0xaa
+'zyp',    # 0xab
+'zyrx',    # 0xac
+'zyr',    # 0xad
+'cit',    # 0xae
+'cix',    # 0xaf
+'ci',    # 0xb0
+'cip',    # 0xb1
+'ciet',    # 0xb2
+'ciex',    # 0xb3
+'cie',    # 0xb4
+'ciep',    # 0xb5
+'cat',    # 0xb6
+'cax',    # 0xb7
+'ca',    # 0xb8
+'cap',    # 0xb9
+'cuox',    # 0xba
+'cuo',    # 0xbb
+'cuop',    # 0xbc
+'cot',    # 0xbd
+'cox',    # 0xbe
+'co',    # 0xbf
+'cop',    # 0xc0
+'cex',    # 0xc1
+'ce',    # 0xc2
+'cep',    # 0xc3
+'cut',    # 0xc4
+'cux',    # 0xc5
+'cu',    # 0xc6
+'cup',    # 0xc7
+'curx',    # 0xc8
+'cur',    # 0xc9
+'cyt',    # 0xca
+'cyx',    # 0xcb
+'cy',    # 0xcc
+'cyp',    # 0xcd
+'cyrx',    # 0xce
+'cyr',    # 0xcf
+'zzit',    # 0xd0
+'zzix',    # 0xd1
+'zzi',    # 0xd2
+'zzip',    # 0xd3
+'zziet',    # 0xd4
+'zziex',    # 0xd5
+'zzie',    # 0xd6
+'zziep',    # 0xd7
+'zzat',    # 0xd8
+'zzax',    # 0xd9
+'zza',    # 0xda
+'zzap',    # 0xdb
+'zzox',    # 0xdc
+'zzo',    # 0xdd
+'zzop',    # 0xde
+'zzex',    # 0xdf
+'zze',    # 0xe0
+'zzep',    # 0xe1
+'zzux',    # 0xe2
+'zzu',    # 0xe3
+'zzup',    # 0xe4
+'zzurx',    # 0xe5
+'zzur',    # 0xe6
+'zzyt',    # 0xe7
+'zzyx',    # 0xe8
+'zzy',    # 0xe9
+'zzyp',    # 0xea
+'zzyrx',    # 0xeb
+'zzyr',    # 0xec
+'nzit',    # 0xed
+'nzix',    # 0xee
+'nzi',    # 0xef
+'nzip',    # 0xf0
+'nziex',    # 0xf1
+'nzie',    # 0xf2
+'nziep',    # 0xf3
+'nzat',    # 0xf4
+'nzax',    # 0xf5
+'nza',    # 0xf6
+'nzap',    # 0xf7
+'nzuox',    # 0xf8
+'nzuo',    # 0xf9
+'nzox',    # 0xfa
+'nzop',    # 0xfb
+'nzex',    # 0xfc
+'nze',    # 0xfd
+'nzux',    # 0xfe
+'nzu',    # 0xff
+)
diff --git a/lib/unidecode/x0a3.py b/lib/unidecode/x0a3.py
new file mode 100644
index 00000000..5e77aec0
--- /dev/null
+++ b/lib/unidecode/x0a3.py
@@ -0,0 +1,258 @@
+data = (
+'nzup',    # 0x00
+'nzurx',    # 0x01
+'nzur',    # 0x02
+'nzyt',    # 0x03
+'nzyx',    # 0x04
+'nzy',    # 0x05
+'nzyp',    # 0x06
+'nzyrx',    # 0x07
+'nzyr',    # 0x08
+'sit',    # 0x09
+'six',    # 0x0a
+'si',    # 0x0b
+'sip',    # 0x0c
+'siex',    # 0x0d
+'sie',    # 0x0e
+'siep',    # 0x0f
+'sat',    # 0x10
+'sax',    # 0x11
+'sa',    # 0x12
+'sap',    # 0x13
+'suox',    # 0x14
+'suo',    # 0x15
+'suop',    # 0x16
+'sot',    # 0x17
+'sox',    # 0x18
+'so',    # 0x19
+'sop',    # 0x1a
+'sex',    # 0x1b
+'se',    # 0x1c
+'sep',    # 0x1d
+'sut',    # 0x1e
+'sux',    # 0x1f
+'su',    # 0x20
+'sup',    # 0x21
+'surx',    # 0x22
+'sur',    # 0x23
+'syt',    # 0x24
+'syx',    # 0x25
+'sy',    # 0x26
+'syp',    # 0x27
+'syrx',    # 0x28
+'syr',    # 0x29
+'ssit',    # 0x2a
+'ssix',    # 0x2b
+'ssi',    # 0x2c
+'ssip',    # 0x2d
+'ssiex',    # 0x2e
+'ssie',    # 0x2f
+'ssiep',    # 0x30
+'ssat',    # 0x31
+'ssax',    # 0x32
+'ssa',    # 0x33
+'ssap',    # 0x34
+'ssot',    # 0x35
+'ssox',    # 0x36
+'sso',    # 0x37
+'ssop',    # 0x38
+'ssex',    # 0x39
+'sse',    # 0x3a
+'ssep',    # 0x3b
+'ssut',    # 0x3c
+'ssux',    # 0x3d
+'ssu',    # 0x3e
+'ssup',    # 0x3f
+'ssyt',    # 0x40
+'ssyx',    # 0x41
+'ssy',    # 0x42
+'ssyp',    # 0x43
+'ssyrx',    # 0x44
+'ssyr',    # 0x45
+'zhat',    # 0x46
+'zhax',    # 0x47
+'zha',    # 0x48
+'zhap',    # 0x49
+'zhuox',    # 0x4a
+'zhuo',    # 0x4b
+'zhuop',    # 0x4c
+'zhot',    # 0x4d
+'zhox',    # 0x4e
+'zho',    # 0x4f
+'zhop',    # 0x50
+'zhet',    # 0x51
+'zhex',    # 0x52
+'zhe',    # 0x53
+'zhep',    # 0x54
+'zhut',    # 0x55
+'zhux',    # 0x56
+'zhu',    # 0x57
+'zhup',    # 0x58
+'zhurx',    # 0x59
+'zhur',    # 0x5a
+'zhyt',    # 0x5b
+'zhyx',    # 0x5c
+'zhy',    # 0x5d
+'zhyp',    # 0x5e
+'zhyrx',    # 0x5f
+'zhyr',    # 0x60
+'chat',    # 0x61
+'chax',    # 0x62
+'cha',    # 0x63
+'chap',    # 0x64
+'chuot',    # 0x65
+'chuox',    # 0x66
+'chuo',    # 0x67
+'chuop',    # 0x68
+'chot',    # 0x69
+'chox',    # 0x6a
+'cho',    # 0x6b
+'chop',    # 0x6c
+'chet',    # 0x6d
+'chex',    # 0x6e
+'che',    # 0x6f
+'chep',    # 0x70
+'chux',    # 0x71
+'chu',    # 0x72
+'chup',    # 0x73
+'churx',    # 0x74
+'chur',    # 0x75
+'chyt',    # 0x76
+'chyx',    # 0x77
+'chy',    # 0x78
+'chyp',    # 0x79
+'chyrx',    # 0x7a
+'chyr',    # 0x7b
+'rrax',    # 0x7c
+'rra',    # 0x7d
+'rruox',    # 0x7e
+'rruo',    # 0x7f
+'rrot',    # 0x80
+'rrox',    # 0x81
+'rro',    # 0x82
+'rrop',    # 0x83
+'rret',    # 0x84
+'rrex',    # 0x85
+'rre',    # 0x86
+'rrep',    # 0x87
+'rrut',    # 0x88
+'rrux',    # 0x89
+'rru',    # 0x8a
+'rrup',    # 0x8b
+'rrurx',    # 0x8c
+'rrur',    # 0x8d
+'rryt',    # 0x8e
+'rryx',    # 0x8f
+'rry',    # 0x90
+'rryp',    # 0x91
+'rryrx',    # 0x92
+'rryr',    # 0x93
+'nrat',    # 0x94
+'nrax',    # 0x95
+'nra',    # 0x96
+'nrap',    # 0x97
+'nrox',    # 0x98
+'nro',    # 0x99
+'nrop',    # 0x9a
+'nret',    # 0x9b
+'nrex',    # 0x9c
+'nre',    # 0x9d
+'nrep',    # 0x9e
+'nrut',    # 0x9f
+'nrux',    # 0xa0
+'nru',    # 0xa1
+'nrup',    # 0xa2
+'nrurx',    # 0xa3
+'nrur',    # 0xa4
+'nryt',    # 0xa5
+'nryx',    # 0xa6
+'nry',    # 0xa7
+'nryp',    # 0xa8
+'nryrx',    # 0xa9
+'nryr',    # 0xaa
+'shat',    # 0xab
+'shax',    # 0xac
+'sha',    # 0xad
+'shap',    # 0xae
+'shuox',    # 0xaf
+'shuo',    # 0xb0
+'shuop',    # 0xb1
+'shot',    # 0xb2
+'shox',    # 0xb3
+'sho',    # 0xb4
+'shop',    # 0xb5
+'shet',    # 0xb6
+'shex',    # 0xb7
+'she',    # 0xb8
+'shep',    # 0xb9
+'shut',    # 0xba
+'shux',    # 0xbb
+'shu',    # 0xbc
+'shup',    # 0xbd
+'shurx',    # 0xbe
+'shur',    # 0xbf
+'shyt',    # 0xc0
+'shyx',    # 0xc1
+'shy',    # 0xc2
+'shyp',    # 0xc3
+'shyrx',    # 0xc4
+'shyr',    # 0xc5
+'rat',    # 0xc6
+'rax',    # 0xc7
+'ra',    # 0xc8
+'rap',    # 0xc9
+'ruox',    # 0xca
+'ruo',    # 0xcb
+'ruop',    # 0xcc
+'rot',    # 0xcd
+'rox',    # 0xce
+'ro',    # 0xcf
+'rop',    # 0xd0
+'rex',    # 0xd1
+'re',    # 0xd2
+'rep',    # 0xd3
+'rut',    # 0xd4
+'rux',    # 0xd5
+'ru',    # 0xd6
+'rup',    # 0xd7
+'rurx',    # 0xd8
+'rur',    # 0xd9
+'ryt',    # 0xda
+'ryx',    # 0xdb
+'ry',    # 0xdc
+'ryp',    # 0xdd
+'ryrx',    # 0xde
+'ryr',    # 0xdf
+'jit',    # 0xe0
+'jix',    # 0xe1
+'ji',    # 0xe2
+'jip',    # 0xe3
+'jiet',    # 0xe4
+'jiex',    # 0xe5
+'jie',    # 0xe6
+'jiep',    # 0xe7
+'juot',    # 0xe8
+'juox',    # 0xe9
+'juo',    # 0xea
+'juop',    # 0xeb
+'jot',    # 0xec
+'jox',    # 0xed
+'jo',    # 0xee
+'jop',    # 0xef
+'jut',    # 0xf0
+'jux',    # 0xf1
+'ju',    # 0xf2
+'jup',    # 0xf3
+'jurx',    # 0xf4
+'jur',    # 0xf5
+'jyt',    # 0xf6
+'jyx',    # 0xf7
+'jy',    # 0xf8
+'jyp',    # 0xf9
+'jyrx',    # 0xfa
+'jyr',    # 0xfb
+'qit',    # 0xfc
+'qix',    # 0xfd
+'qi',    # 0xfe
+'qip',    # 0xff
+)
diff --git a/lib/unidecode/x0a4.py b/lib/unidecode/x0a4.py
new file mode 100644
index 00000000..4fb6b264
--- /dev/null
+++ b/lib/unidecode/x0a4.py
@@ -0,0 +1,257 @@
+data = (
+'qiet',    # 0x00
+'qiex',    # 0x01
+'qie',    # 0x02
+'qiep',    # 0x03
+'quot',    # 0x04
+'quox',    # 0x05
+'quo',    # 0x06
+'quop',    # 0x07
+'qot',    # 0x08
+'qox',    # 0x09
+'qo',    # 0x0a
+'qop',    # 0x0b
+'qut',    # 0x0c
+'qux',    # 0x0d
+'qu',    # 0x0e
+'qup',    # 0x0f
+'qurx',    # 0x10
+'qur',    # 0x11
+'qyt',    # 0x12
+'qyx',    # 0x13
+'qy',    # 0x14
+'qyp',    # 0x15
+'qyrx',    # 0x16
+'qyr',    # 0x17
+'jjit',    # 0x18
+'jjix',    # 0x19
+'jji',    # 0x1a
+'jjip',    # 0x1b
+'jjiet',    # 0x1c
+'jjiex',    # 0x1d
+'jjie',    # 0x1e
+'jjiep',    # 0x1f
+'jjuox',    # 0x20
+'jjuo',    # 0x21
+'jjuop',    # 0x22
+'jjot',    # 0x23
+'jjox',    # 0x24
+'jjo',    # 0x25
+'jjop',    # 0x26
+'jjut',    # 0x27
+'jjux',    # 0x28
+'jju',    # 0x29
+'jjup',    # 0x2a
+'jjurx',    # 0x2b
+'jjur',    # 0x2c
+'jjyt',    # 0x2d
+'jjyx',    # 0x2e
+'jjy',    # 0x2f
+'jjyp',    # 0x30
+'njit',    # 0x31
+'njix',    # 0x32
+'nji',    # 0x33
+'njip',    # 0x34
+'njiet',    # 0x35
+'njiex',    # 0x36
+'njie',    # 0x37
+'njiep',    # 0x38
+'njuox',    # 0x39
+'njuo',    # 0x3a
+'njot',    # 0x3b
+'njox',    # 0x3c
+'njo',    # 0x3d
+'njop',    # 0x3e
+'njux',    # 0x3f
+'nju',    # 0x40
+'njup',    # 0x41
+'njurx',    # 0x42
+'njur',    # 0x43
+'njyt',    # 0x44
+'njyx',    # 0x45
+'njy',    # 0x46
+'njyp',    # 0x47
+'njyrx',    # 0x48
+'njyr',    # 0x49
+'nyit',    # 0x4a
+'nyix',    # 0x4b
+'nyi',    # 0x4c
+'nyip',    # 0x4d
+'nyiet',    # 0x4e
+'nyiex',    # 0x4f
+'nyie',    # 0x50
+'nyiep',    # 0x51
+'nyuox',    # 0x52
+'nyuo',    # 0x53
+'nyuop',    # 0x54
+'nyot',    # 0x55
+'nyox',    # 0x56
+'nyo',    # 0x57
+'nyop',    # 0x58
+'nyut',    # 0x59
+'nyux',    # 0x5a
+'nyu',    # 0x5b
+'nyup',    # 0x5c
+'xit',    # 0x5d
+'xix',    # 0x5e
+'xi',    # 0x5f
+'xip',    # 0x60
+'xiet',    # 0x61
+'xiex',    # 0x62
+'xie',    # 0x63
+'xiep',    # 0x64
+'xuox',    # 0x65
+'xuo',    # 0x66
+'xot',    # 0x67
+'xox',    # 0x68
+'xo',    # 0x69
+'xop',    # 0x6a
+'xyt',    # 0x6b
+'xyx',    # 0x6c
+'xy',    # 0x6d
+'xyp',    # 0x6e
+'xyrx',    # 0x6f
+'xyr',    # 0x70
+'yit',    # 0x71
+'yix',    # 0x72
+'yi',    # 0x73
+'yip',    # 0x74
+'yiet',    # 0x75
+'yiex',    # 0x76
+'yie',    # 0x77
+'yiep',    # 0x78
+'yuot',    # 0x79
+'yuox',    # 0x7a
+'yuo',    # 0x7b
+'yuop',    # 0x7c
+'yot',    # 0x7d
+'yox',    # 0x7e
+'yo',    # 0x7f
+'yop',    # 0x80
+'yut',    # 0x81
+'yux',    # 0x82
+'yu',    # 0x83
+'yup',    # 0x84
+'yurx',    # 0x85
+'yur',    # 0x86
+'yyt',    # 0x87
+'yyx',    # 0x88
+'yy',    # 0x89
+'yyp',    # 0x8a
+'yyrx',    # 0x8b
+'yyr',    # 0x8c
+'[?]',    # 0x8d
+'[?]',    # 0x8e
+'[?]',    # 0x8f
+'Qot',    # 0x90
+'Li',    # 0x91
+'Kit',    # 0x92
+'Nyip',    # 0x93
+'Cyp',    # 0x94
+'Ssi',    # 0x95
+'Ggop',    # 0x96
+'Gep',    # 0x97
+'Mi',    # 0x98
+'Hxit',    # 0x99
+'Lyr',    # 0x9a
+'Bbut',    # 0x9b
+'Mop',    # 0x9c
+'Yo',    # 0x9d
+'Put',    # 0x9e
+'Hxuo',    # 0x9f
+'Tat',    # 0xa0
+'Ga',    # 0xa1
+'[?]',    # 0xa2
+'[?]',    # 0xa3
+'Ddur',    # 0xa4
+'Bur',    # 0xa5
+'Gguo',    # 0xa6
+'Nyop',    # 0xa7
+'Tu',    # 0xa8
+'Op',    # 0xa9
+'Jjut',    # 0xaa
+'Zot',    # 0xab
+'Pyt',    # 0xac
+'Hmo',    # 0xad
+'Yit',    # 0xae
+'Vur',    # 0xaf
+'Shy',    # 0xb0
+'Vep',    # 0xb1
+'Za',    # 0xb2
+'Jo',    # 0xb3
+'[?]',    # 0xb4
+'Jjy',    # 0xb5
+'Got',    # 0xb6
+'Jjie',    # 0xb7
+'Wo',    # 0xb8
+'Du',    # 0xb9
+'Shur',    # 0xba
+'Lie',    # 0xbb
+'Cy',    # 0xbc
+'Cuop',    # 0xbd
+'Cip',    # 0xbe
+'Hxop',    # 0xbf
+'Shat',    # 0xc0
+'[?]',    # 0xc1
+'Shop',    # 0xc2
+'Che',    # 0xc3
+'Zziet',    # 0xc4
+'[?]',    # 0xc5
+'Ke',    # 0xc6
+'[?]',    # 0xc7
+'[?]',    # 0xc8
+'[?]',    # 0xc9
+'[?]',    # 0xca
+'[?]',    # 0xcb
+'[?]',    # 0xcc
+'[?]',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'[?]',    # 0xd0
+'[?]',    # 0xd1
+'[?]',    # 0xd2
+'[?]',    # 0xd3
+'[?]',    # 0xd4
+'[?]',    # 0xd5
+'[?]',    # 0xd6
+'[?]',    # 0xd7
+'[?]',    # 0xd8
+'[?]',    # 0xd9
+'[?]',    # 0xda
+'[?]',    # 0xdb
+'[?]',    # 0xdc
+'[?]',    # 0xdd
+'[?]',    # 0xde
+'[?]',    # 0xdf
+'[?]',    # 0xe0
+'[?]',    # 0xe1
+'[?]',    # 0xe2
+'[?]',    # 0xe3
+'[?]',    # 0xe4
+'[?]',    # 0xe5
+'[?]',    # 0xe6
+'[?]',    # 0xe7
+'[?]',    # 0xe8
+'[?]',    # 0xe9
+'[?]',    # 0xea
+'[?]',    # 0xeb
+'[?]',    # 0xec
+'[?]',    # 0xed
+'[?]',    # 0xee
+'[?]',    # 0xef
+'[?]',    # 0xf0
+'[?]',    # 0xf1
+'[?]',    # 0xf2
+'[?]',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x0ac.py b/lib/unidecode/x0ac.py
new file mode 100644
index 00000000..e627fab7
--- /dev/null
+++ b/lib/unidecode/x0ac.py
@@ -0,0 +1,258 @@
+data = (
+'ga',    # 0x00
+'gag',    # 0x01
+'gagg',    # 0x02
+'gags',    # 0x03
+'gan',    # 0x04
+'ganj',    # 0x05
+'ganh',    # 0x06
+'gad',    # 0x07
+'gal',    # 0x08
+'galg',    # 0x09
+'galm',    # 0x0a
+'galb',    # 0x0b
+'gals',    # 0x0c
+'galt',    # 0x0d
+'galp',    # 0x0e
+'galh',    # 0x0f
+'gam',    # 0x10
+'gab',    # 0x11
+'gabs',    # 0x12
+'gas',    # 0x13
+'gass',    # 0x14
+'gang',    # 0x15
+'gaj',    # 0x16
+'gac',    # 0x17
+'gak',    # 0x18
+'gat',    # 0x19
+'gap',    # 0x1a
+'gah',    # 0x1b
+'gae',    # 0x1c
+'gaeg',    # 0x1d
+'gaegg',    # 0x1e
+'gaegs',    # 0x1f
+'gaen',    # 0x20
+'gaenj',    # 0x21
+'gaenh',    # 0x22
+'gaed',    # 0x23
+'gael',    # 0x24
+'gaelg',    # 0x25
+'gaelm',    # 0x26
+'gaelb',    # 0x27
+'gaels',    # 0x28
+'gaelt',    # 0x29
+'gaelp',    # 0x2a
+'gaelh',    # 0x2b
+'gaem',    # 0x2c
+'gaeb',    # 0x2d
+'gaebs',    # 0x2e
+'gaes',    # 0x2f
+'gaess',    # 0x30
+'gaeng',    # 0x31
+'gaej',    # 0x32
+'gaec',    # 0x33
+'gaek',    # 0x34
+'gaet',    # 0x35
+'gaep',    # 0x36
+'gaeh',    # 0x37
+'gya',    # 0x38
+'gyag',    # 0x39
+'gyagg',    # 0x3a
+'gyags',    # 0x3b
+'gyan',    # 0x3c
+'gyanj',    # 0x3d
+'gyanh',    # 0x3e
+'gyad',    # 0x3f
+'gyal',    # 0x40
+'gyalg',    # 0x41
+'gyalm',    # 0x42
+'gyalb',    # 0x43
+'gyals',    # 0x44
+'gyalt',    # 0x45
+'gyalp',    # 0x46
+'gyalh',    # 0x47
+'gyam',    # 0x48
+'gyab',    # 0x49
+'gyabs',    # 0x4a
+'gyas',    # 0x4b
+'gyass',    # 0x4c
+'gyang',    # 0x4d
+'gyaj',    # 0x4e
+'gyac',    # 0x4f
+'gyak',    # 0x50
+'gyat',    # 0x51
+'gyap',    # 0x52
+'gyah',    # 0x53
+'gyae',    # 0x54
+'gyaeg',    # 0x55
+'gyaegg',    # 0x56
+'gyaegs',    # 0x57
+'gyaen',    # 0x58
+'gyaenj',    # 0x59
+'gyaenh',    # 0x5a
+'gyaed',    # 0x5b
+'gyael',    # 0x5c
+'gyaelg',    # 0x5d
+'gyaelm',    # 0x5e
+'gyaelb',    # 0x5f
+'gyaels',    # 0x60
+'gyaelt',    # 0x61
+'gyaelp',    # 0x62
+'gyaelh',    # 0x63
+'gyaem',    # 0x64
+'gyaeb',    # 0x65
+'gyaebs',    # 0x66
+'gyaes',    # 0x67
+'gyaess',    # 0x68
+'gyaeng',    # 0x69
+'gyaej',    # 0x6a
+'gyaec',    # 0x6b
+'gyaek',    # 0x6c
+'gyaet',    # 0x6d
+'gyaep',    # 0x6e
+'gyaeh',    # 0x6f
+'geo',    # 0x70
+'geog',    # 0x71
+'geogg',    # 0x72
+'geogs',    # 0x73
+'geon',    # 0x74
+'geonj',    # 0x75
+'geonh',    # 0x76
+'geod',    # 0x77
+'geol',    # 0x78
+'geolg',    # 0x79
+'geolm',    # 0x7a
+'geolb',    # 0x7b
+'geols',    # 0x7c
+'geolt',    # 0x7d
+'geolp',    # 0x7e
+'geolh',    # 0x7f
+'geom',    # 0x80
+'geob',    # 0x81
+'geobs',    # 0x82
+'geos',    # 0x83
+'geoss',    # 0x84
+'geong',    # 0x85
+'geoj',    # 0x86
+'geoc',    # 0x87
+'geok',    # 0x88
+'geot',    # 0x89
+'geop',    # 0x8a
+'geoh',    # 0x8b
+'ge',    # 0x8c
+'geg',    # 0x8d
+'gegg',    # 0x8e
+'gegs',    # 0x8f
+'gen',    # 0x90
+'genj',    # 0x91
+'genh',    # 0x92
+'ged',    # 0x93
+'gel',    # 0x94
+'gelg',    # 0x95
+'gelm',    # 0x96
+'gelb',    # 0x97
+'gels',    # 0x98
+'gelt',    # 0x99
+'gelp',    # 0x9a
+'gelh',    # 0x9b
+'gem',    # 0x9c
+'geb',    # 0x9d
+'gebs',    # 0x9e
+'ges',    # 0x9f
+'gess',    # 0xa0
+'geng',    # 0xa1
+'gej',    # 0xa2
+'gec',    # 0xa3
+'gek',    # 0xa4
+'get',    # 0xa5
+'gep',    # 0xa6
+'geh',    # 0xa7
+'gyeo',    # 0xa8
+'gyeog',    # 0xa9
+'gyeogg',    # 0xaa
+'gyeogs',    # 0xab
+'gyeon',    # 0xac
+'gyeonj',    # 0xad
+'gyeonh',    # 0xae
+'gyeod',    # 0xaf
+'gyeol',    # 0xb0
+'gyeolg',    # 0xb1
+'gyeolm',    # 0xb2
+'gyeolb',    # 0xb3
+'gyeols',    # 0xb4
+'gyeolt',    # 0xb5
+'gyeolp',    # 0xb6
+'gyeolh',    # 0xb7
+'gyeom',    # 0xb8
+'gyeob',    # 0xb9
+'gyeobs',    # 0xba
+'gyeos',    # 0xbb
+'gyeoss',    # 0xbc
+'gyeong',    # 0xbd
+'gyeoj',    # 0xbe
+'gyeoc',    # 0xbf
+'gyeok',    # 0xc0
+'gyeot',    # 0xc1
+'gyeop',    # 0xc2
+'gyeoh',    # 0xc3
+'gye',    # 0xc4
+'gyeg',    # 0xc5
+'gyegg',    # 0xc6
+'gyegs',    # 0xc7
+'gyen',    # 0xc8
+'gyenj',    # 0xc9
+'gyenh',    # 0xca
+'gyed',    # 0xcb
+'gyel',    # 0xcc
+'gyelg',    # 0xcd
+'gyelm',    # 0xce
+'gyelb',    # 0xcf
+'gyels',    # 0xd0
+'gyelt',    # 0xd1
+'gyelp',    # 0xd2
+'gyelh',    # 0xd3
+'gyem',    # 0xd4
+'gyeb',    # 0xd5
+'gyebs',    # 0xd6
+'gyes',    # 0xd7
+'gyess',    # 0xd8
+'gyeng',    # 0xd9
+'gyej',    # 0xda
+'gyec',    # 0xdb
+'gyek',    # 0xdc
+'gyet',    # 0xdd
+'gyep',    # 0xde
+'gyeh',    # 0xdf
+'go',    # 0xe0
+'gog',    # 0xe1
+'gogg',    # 0xe2
+'gogs',    # 0xe3
+'gon',    # 0xe4
+'gonj',    # 0xe5
+'gonh',    # 0xe6
+'god',    # 0xe7
+'gol',    # 0xe8
+'golg',    # 0xe9
+'golm',    # 0xea
+'golb',    # 0xeb
+'gols',    # 0xec
+'golt',    # 0xed
+'golp',    # 0xee
+'golh',    # 0xef
+'gom',    # 0xf0
+'gob',    # 0xf1
+'gobs',    # 0xf2
+'gos',    # 0xf3
+'goss',    # 0xf4
+'gong',    # 0xf5
+'goj',    # 0xf6
+'goc',    # 0xf7
+'gok',    # 0xf8
+'got',    # 0xf9
+'gop',    # 0xfa
+'goh',    # 0xfb
+'gwa',    # 0xfc
+'gwag',    # 0xfd
+'gwagg',    # 0xfe
+'gwags',    # 0xff
+)
diff --git a/lib/unidecode/x0ad.py b/lib/unidecode/x0ad.py
new file mode 100644
index 00000000..ac2cf2a5
--- /dev/null
+++ b/lib/unidecode/x0ad.py
@@ -0,0 +1,258 @@
+data = (
+'gwan',    # 0x00
+'gwanj',    # 0x01
+'gwanh',    # 0x02
+'gwad',    # 0x03
+'gwal',    # 0x04
+'gwalg',    # 0x05
+'gwalm',    # 0x06
+'gwalb',    # 0x07
+'gwals',    # 0x08
+'gwalt',    # 0x09
+'gwalp',    # 0x0a
+'gwalh',    # 0x0b
+'gwam',    # 0x0c
+'gwab',    # 0x0d
+'gwabs',    # 0x0e
+'gwas',    # 0x0f
+'gwass',    # 0x10
+'gwang',    # 0x11
+'gwaj',    # 0x12
+'gwac',    # 0x13
+'gwak',    # 0x14
+'gwat',    # 0x15
+'gwap',    # 0x16
+'gwah',    # 0x17
+'gwae',    # 0x18
+'gwaeg',    # 0x19
+'gwaegg',    # 0x1a
+'gwaegs',    # 0x1b
+'gwaen',    # 0x1c
+'gwaenj',    # 0x1d
+'gwaenh',    # 0x1e
+'gwaed',    # 0x1f
+'gwael',    # 0x20
+'gwaelg',    # 0x21
+'gwaelm',    # 0x22
+'gwaelb',    # 0x23
+'gwaels',    # 0x24
+'gwaelt',    # 0x25
+'gwaelp',    # 0x26
+'gwaelh',    # 0x27
+'gwaem',    # 0x28
+'gwaeb',    # 0x29
+'gwaebs',    # 0x2a
+'gwaes',    # 0x2b
+'gwaess',    # 0x2c
+'gwaeng',    # 0x2d
+'gwaej',    # 0x2e
+'gwaec',    # 0x2f
+'gwaek',    # 0x30
+'gwaet',    # 0x31
+'gwaep',    # 0x32
+'gwaeh',    # 0x33
+'goe',    # 0x34
+'goeg',    # 0x35
+'goegg',    # 0x36
+'goegs',    # 0x37
+'goen',    # 0x38
+'goenj',    # 0x39
+'goenh',    # 0x3a
+'goed',    # 0x3b
+'goel',    # 0x3c
+'goelg',    # 0x3d
+'goelm',    # 0x3e
+'goelb',    # 0x3f
+'goels',    # 0x40
+'goelt',    # 0x41
+'goelp',    # 0x42
+'goelh',    # 0x43
+'goem',    # 0x44
+'goeb',    # 0x45
+'goebs',    # 0x46
+'goes',    # 0x47
+'goess',    # 0x48
+'goeng',    # 0x49
+'goej',    # 0x4a
+'goec',    # 0x4b
+'goek',    # 0x4c
+'goet',    # 0x4d
+'goep',    # 0x4e
+'goeh',    # 0x4f
+'gyo',    # 0x50
+'gyog',    # 0x51
+'gyogg',    # 0x52
+'gyogs',    # 0x53
+'gyon',    # 0x54
+'gyonj',    # 0x55
+'gyonh',    # 0x56
+'gyod',    # 0x57
+'gyol',    # 0x58
+'gyolg',    # 0x59
+'gyolm',    # 0x5a
+'gyolb',    # 0x5b
+'gyols',    # 0x5c
+'gyolt',    # 0x5d
+'gyolp',    # 0x5e
+'gyolh',    # 0x5f
+'gyom',    # 0x60
+'gyob',    # 0x61
+'gyobs',    # 0x62
+'gyos',    # 0x63
+'gyoss',    # 0x64
+'gyong',    # 0x65
+'gyoj',    # 0x66
+'gyoc',    # 0x67
+'gyok',    # 0x68
+'gyot',    # 0x69
+'gyop',    # 0x6a
+'gyoh',    # 0x6b
+'gu',    # 0x6c
+'gug',    # 0x6d
+'gugg',    # 0x6e
+'gugs',    # 0x6f
+'gun',    # 0x70
+'gunj',    # 0x71
+'gunh',    # 0x72
+'gud',    # 0x73
+'gul',    # 0x74
+'gulg',    # 0x75
+'gulm',    # 0x76
+'gulb',    # 0x77
+'guls',    # 0x78
+'gult',    # 0x79
+'gulp',    # 0x7a
+'gulh',    # 0x7b
+'gum',    # 0x7c
+'gub',    # 0x7d
+'gubs',    # 0x7e
+'gus',    # 0x7f
+'guss',    # 0x80
+'gung',    # 0x81
+'guj',    # 0x82
+'guc',    # 0x83
+'guk',    # 0x84
+'gut',    # 0x85
+'gup',    # 0x86
+'guh',    # 0x87
+'gweo',    # 0x88
+'gweog',    # 0x89
+'gweogg',    # 0x8a
+'gweogs',    # 0x8b
+'gweon',    # 0x8c
+'gweonj',    # 0x8d
+'gweonh',    # 0x8e
+'gweod',    # 0x8f
+'gweol',    # 0x90
+'gweolg',    # 0x91
+'gweolm',    # 0x92
+'gweolb',    # 0x93
+'gweols',    # 0x94
+'gweolt',    # 0x95
+'gweolp',    # 0x96
+'gweolh',    # 0x97
+'gweom',    # 0x98
+'gweob',    # 0x99
+'gweobs',    # 0x9a
+'gweos',    # 0x9b
+'gweoss',    # 0x9c
+'gweong',    # 0x9d
+'gweoj',    # 0x9e
+'gweoc',    # 0x9f
+'gweok',    # 0xa0
+'gweot',    # 0xa1
+'gweop',    # 0xa2
+'gweoh',    # 0xa3
+'gwe',    # 0xa4
+'gweg',    # 0xa5
+'gwegg',    # 0xa6
+'gwegs',    # 0xa7
+'gwen',    # 0xa8
+'gwenj',    # 0xa9
+'gwenh',    # 0xaa
+'gwed',    # 0xab
+'gwel',    # 0xac
+'gwelg',    # 0xad
+'gwelm',    # 0xae
+'gwelb',    # 0xaf
+'gwels',    # 0xb0
+'gwelt',    # 0xb1
+'gwelp',    # 0xb2
+'gwelh',    # 0xb3
+'gwem',    # 0xb4
+'gweb',    # 0xb5
+'gwebs',    # 0xb6
+'gwes',    # 0xb7
+'gwess',    # 0xb8
+'gweng',    # 0xb9
+'gwej',    # 0xba
+'gwec',    # 0xbb
+'gwek',    # 0xbc
+'gwet',    # 0xbd
+'gwep',    # 0xbe
+'gweh',    # 0xbf
+'gwi',    # 0xc0
+'gwig',    # 0xc1
+'gwigg',    # 0xc2
+'gwigs',    # 0xc3
+'gwin',    # 0xc4
+'gwinj',    # 0xc5
+'gwinh',    # 0xc6
+'gwid',    # 0xc7
+'gwil',    # 0xc8
+'gwilg',    # 0xc9
+'gwilm',    # 0xca
+'gwilb',    # 0xcb
+'gwils',    # 0xcc
+'gwilt',    # 0xcd
+'gwilp',    # 0xce
+'gwilh',    # 0xcf
+'gwim',    # 0xd0
+'gwib',    # 0xd1
+'gwibs',    # 0xd2
+'gwis',    # 0xd3
+'gwiss',    # 0xd4
+'gwing',    # 0xd5
+'gwij',    # 0xd6
+'gwic',    # 0xd7
+'gwik',    # 0xd8
+'gwit',    # 0xd9
+'gwip',    # 0xda
+'gwih',    # 0xdb
+'gyu',    # 0xdc
+'gyug',    # 0xdd
+'gyugg',    # 0xde
+'gyugs',    # 0xdf
+'gyun',    # 0xe0
+'gyunj',    # 0xe1
+'gyunh',    # 0xe2
+'gyud',    # 0xe3
+'gyul',    # 0xe4
+'gyulg',    # 0xe5
+'gyulm',    # 0xe6
+'gyulb',    # 0xe7
+'gyuls',    # 0xe8
+'gyult',    # 0xe9
+'gyulp',    # 0xea
+'gyulh',    # 0xeb
+'gyum',    # 0xec
+'gyub',    # 0xed
+'gyubs',    # 0xee
+'gyus',    # 0xef
+'gyuss',    # 0xf0
+'gyung',    # 0xf1
+'gyuj',    # 0xf2
+'gyuc',    # 0xf3
+'gyuk',    # 0xf4
+'gyut',    # 0xf5
+'gyup',    # 0xf6
+'gyuh',    # 0xf7
+'geu',    # 0xf8
+'geug',    # 0xf9
+'geugg',    # 0xfa
+'geugs',    # 0xfb
+'geun',    # 0xfc
+'geunj',    # 0xfd
+'geunh',    # 0xfe
+'geud',    # 0xff
+)
diff --git a/lib/unidecode/x0ae.py b/lib/unidecode/x0ae.py
new file mode 100644
index 00000000..37a7abca
--- /dev/null
+++ b/lib/unidecode/x0ae.py
@@ -0,0 +1,258 @@
+data = (
+'geul',    # 0x00
+'geulg',    # 0x01
+'geulm',    # 0x02
+'geulb',    # 0x03
+'geuls',    # 0x04
+'geult',    # 0x05
+'geulp',    # 0x06
+'geulh',    # 0x07
+'geum',    # 0x08
+'geub',    # 0x09
+'geubs',    # 0x0a
+'geus',    # 0x0b
+'geuss',    # 0x0c
+'geung',    # 0x0d
+'geuj',    # 0x0e
+'geuc',    # 0x0f
+'geuk',    # 0x10
+'geut',    # 0x11
+'geup',    # 0x12
+'geuh',    # 0x13
+'gyi',    # 0x14
+'gyig',    # 0x15
+'gyigg',    # 0x16
+'gyigs',    # 0x17
+'gyin',    # 0x18
+'gyinj',    # 0x19
+'gyinh',    # 0x1a
+'gyid',    # 0x1b
+'gyil',    # 0x1c
+'gyilg',    # 0x1d
+'gyilm',    # 0x1e
+'gyilb',    # 0x1f
+'gyils',    # 0x20
+'gyilt',    # 0x21
+'gyilp',    # 0x22
+'gyilh',    # 0x23
+'gyim',    # 0x24
+'gyib',    # 0x25
+'gyibs',    # 0x26
+'gyis',    # 0x27
+'gyiss',    # 0x28
+'gying',    # 0x29
+'gyij',    # 0x2a
+'gyic',    # 0x2b
+'gyik',    # 0x2c
+'gyit',    # 0x2d
+'gyip',    # 0x2e
+'gyih',    # 0x2f
+'gi',    # 0x30
+'gig',    # 0x31
+'gigg',    # 0x32
+'gigs',    # 0x33
+'gin',    # 0x34
+'ginj',    # 0x35
+'ginh',    # 0x36
+'gid',    # 0x37
+'gil',    # 0x38
+'gilg',    # 0x39
+'gilm',    # 0x3a
+'gilb',    # 0x3b
+'gils',    # 0x3c
+'gilt',    # 0x3d
+'gilp',    # 0x3e
+'gilh',    # 0x3f
+'gim',    # 0x40
+'gib',    # 0x41
+'gibs',    # 0x42
+'gis',    # 0x43
+'giss',    # 0x44
+'ging',    # 0x45
+'gij',    # 0x46
+'gic',    # 0x47
+'gik',    # 0x48
+'git',    # 0x49
+'gip',    # 0x4a
+'gih',    # 0x4b
+'gga',    # 0x4c
+'ggag',    # 0x4d
+'ggagg',    # 0x4e
+'ggags',    # 0x4f
+'ggan',    # 0x50
+'gganj',    # 0x51
+'gganh',    # 0x52
+'ggad',    # 0x53
+'ggal',    # 0x54
+'ggalg',    # 0x55
+'ggalm',    # 0x56
+'ggalb',    # 0x57
+'ggals',    # 0x58
+'ggalt',    # 0x59
+'ggalp',    # 0x5a
+'ggalh',    # 0x5b
+'ggam',    # 0x5c
+'ggab',    # 0x5d
+'ggabs',    # 0x5e
+'ggas',    # 0x5f
+'ggass',    # 0x60
+'ggang',    # 0x61
+'ggaj',    # 0x62
+'ggac',    # 0x63
+'ggak',    # 0x64
+'ggat',    # 0x65
+'ggap',    # 0x66
+'ggah',    # 0x67
+'ggae',    # 0x68
+'ggaeg',    # 0x69
+'ggaegg',    # 0x6a
+'ggaegs',    # 0x6b
+'ggaen',    # 0x6c
+'ggaenj',    # 0x6d
+'ggaenh',    # 0x6e
+'ggaed',    # 0x6f
+'ggael',    # 0x70
+'ggaelg',    # 0x71
+'ggaelm',    # 0x72
+'ggaelb',    # 0x73
+'ggaels',    # 0x74
+'ggaelt',    # 0x75
+'ggaelp',    # 0x76
+'ggaelh',    # 0x77
+'ggaem',    # 0x78
+'ggaeb',    # 0x79
+'ggaebs',    # 0x7a
+'ggaes',    # 0x7b
+'ggaess',    # 0x7c
+'ggaeng',    # 0x7d
+'ggaej',    # 0x7e
+'ggaec',    # 0x7f
+'ggaek',    # 0x80
+'ggaet',    # 0x81
+'ggaep',    # 0x82
+'ggaeh',    # 0x83
+'ggya',    # 0x84
+'ggyag',    # 0x85
+'ggyagg',    # 0x86
+'ggyags',    # 0x87
+'ggyan',    # 0x88
+'ggyanj',    # 0x89
+'ggyanh',    # 0x8a
+'ggyad',    # 0x8b
+'ggyal',    # 0x8c
+'ggyalg',    # 0x8d
+'ggyalm',    # 0x8e
+'ggyalb',    # 0x8f
+'ggyals',    # 0x90
+'ggyalt',    # 0x91
+'ggyalp',    # 0x92
+'ggyalh',    # 0x93
+'ggyam',    # 0x94
+'ggyab',    # 0x95
+'ggyabs',    # 0x96
+'ggyas',    # 0x97
+'ggyass',    # 0x98
+'ggyang',    # 0x99
+'ggyaj',    # 0x9a
+'ggyac',    # 0x9b
+'ggyak',    # 0x9c
+'ggyat',    # 0x9d
+'ggyap',    # 0x9e
+'ggyah',    # 0x9f
+'ggyae',    # 0xa0
+'ggyaeg',    # 0xa1
+'ggyaegg',    # 0xa2
+'ggyaegs',    # 0xa3
+'ggyaen',    # 0xa4
+'ggyaenj',    # 0xa5
+'ggyaenh',    # 0xa6
+'ggyaed',    # 0xa7
+'ggyael',    # 0xa8
+'ggyaelg',    # 0xa9
+'ggyaelm',    # 0xaa
+'ggyaelb',    # 0xab
+'ggyaels',    # 0xac
+'ggyaelt',    # 0xad
+'ggyaelp',    # 0xae
+'ggyaelh',    # 0xaf
+'ggyaem',    # 0xb0
+'ggyaeb',    # 0xb1
+'ggyaebs',    # 0xb2
+'ggyaes',    # 0xb3
+'ggyaess',    # 0xb4
+'ggyaeng',    # 0xb5
+'ggyaej',    # 0xb6
+'ggyaec',    # 0xb7
+'ggyaek',    # 0xb8
+'ggyaet',    # 0xb9
+'ggyaep',    # 0xba
+'ggyaeh',    # 0xbb
+'ggeo',    # 0xbc
+'ggeog',    # 0xbd
+'ggeogg',    # 0xbe
+'ggeogs',    # 0xbf
+'ggeon',    # 0xc0
+'ggeonj',    # 0xc1
+'ggeonh',    # 0xc2
+'ggeod',    # 0xc3
+'ggeol',    # 0xc4
+'ggeolg',    # 0xc5
+'ggeolm',    # 0xc6
+'ggeolb',    # 0xc7
+'ggeols',    # 0xc8
+'ggeolt',    # 0xc9
+'ggeolp',    # 0xca
+'ggeolh',    # 0xcb
+'ggeom',    # 0xcc
+'ggeob',    # 0xcd
+'ggeobs',    # 0xce
+'ggeos',    # 0xcf
+'ggeoss',    # 0xd0
+'ggeong',    # 0xd1
+'ggeoj',    # 0xd2
+'ggeoc',    # 0xd3
+'ggeok',    # 0xd4
+'ggeot',    # 0xd5
+'ggeop',    # 0xd6
+'ggeoh',    # 0xd7
+'gge',    # 0xd8
+'ggeg',    # 0xd9
+'ggegg',    # 0xda
+'ggegs',    # 0xdb
+'ggen',    # 0xdc
+'ggenj',    # 0xdd
+'ggenh',    # 0xde
+'gged',    # 0xdf
+'ggel',    # 0xe0
+'ggelg',    # 0xe1
+'ggelm',    # 0xe2
+'ggelb',    # 0xe3
+'ggels',    # 0xe4
+'ggelt',    # 0xe5
+'ggelp',    # 0xe6
+'ggelh',    # 0xe7
+'ggem',    # 0xe8
+'ggeb',    # 0xe9
+'ggebs',    # 0xea
+'gges',    # 0xeb
+'ggess',    # 0xec
+'ggeng',    # 0xed
+'ggej',    # 0xee
+'ggec',    # 0xef
+'ggek',    # 0xf0
+'gget',    # 0xf1
+'ggep',    # 0xf2
+'ggeh',    # 0xf3
+'ggyeo',    # 0xf4
+'ggyeog',    # 0xf5
+'ggyeogg',    # 0xf6
+'ggyeogs',    # 0xf7
+'ggyeon',    # 0xf8
+'ggyeonj',    # 0xf9
+'ggyeonh',    # 0xfa
+'ggyeod',    # 0xfb
+'ggyeol',    # 0xfc
+'ggyeolg',    # 0xfd
+'ggyeolm',    # 0xfe
+'ggyeolb',    # 0xff
+)
diff --git a/lib/unidecode/x0af.py b/lib/unidecode/x0af.py
new file mode 100644
index 00000000..448d26bf
--- /dev/null
+++ b/lib/unidecode/x0af.py
@@ -0,0 +1,258 @@
+data = (
+'ggyeols',    # 0x00
+'ggyeolt',    # 0x01
+'ggyeolp',    # 0x02
+'ggyeolh',    # 0x03
+'ggyeom',    # 0x04
+'ggyeob',    # 0x05
+'ggyeobs',    # 0x06
+'ggyeos',    # 0x07
+'ggyeoss',    # 0x08
+'ggyeong',    # 0x09
+'ggyeoj',    # 0x0a
+'ggyeoc',    # 0x0b
+'ggyeok',    # 0x0c
+'ggyeot',    # 0x0d
+'ggyeop',    # 0x0e
+'ggyeoh',    # 0x0f
+'ggye',    # 0x10
+'ggyeg',    # 0x11
+'ggyegg',    # 0x12
+'ggyegs',    # 0x13
+'ggyen',    # 0x14
+'ggyenj',    # 0x15
+'ggyenh',    # 0x16
+'ggyed',    # 0x17
+'ggyel',    # 0x18
+'ggyelg',    # 0x19
+'ggyelm',    # 0x1a
+'ggyelb',    # 0x1b
+'ggyels',    # 0x1c
+'ggyelt',    # 0x1d
+'ggyelp',    # 0x1e
+'ggyelh',    # 0x1f
+'ggyem',    # 0x20
+'ggyeb',    # 0x21
+'ggyebs',    # 0x22
+'ggyes',    # 0x23
+'ggyess',    # 0x24
+'ggyeng',    # 0x25
+'ggyej',    # 0x26
+'ggyec',    # 0x27
+'ggyek',    # 0x28
+'ggyet',    # 0x29
+'ggyep',    # 0x2a
+'ggyeh',    # 0x2b
+'ggo',    # 0x2c
+'ggog',    # 0x2d
+'ggogg',    # 0x2e
+'ggogs',    # 0x2f
+'ggon',    # 0x30
+'ggonj',    # 0x31
+'ggonh',    # 0x32
+'ggod',    # 0x33
+'ggol',    # 0x34
+'ggolg',    # 0x35
+'ggolm',    # 0x36
+'ggolb',    # 0x37
+'ggols',    # 0x38
+'ggolt',    # 0x39
+'ggolp',    # 0x3a
+'ggolh',    # 0x3b
+'ggom',    # 0x3c
+'ggob',    # 0x3d
+'ggobs',    # 0x3e
+'ggos',    # 0x3f
+'ggoss',    # 0x40
+'ggong',    # 0x41
+'ggoj',    # 0x42
+'ggoc',    # 0x43
+'ggok',    # 0x44
+'ggot',    # 0x45
+'ggop',    # 0x46
+'ggoh',    # 0x47
+'ggwa',    # 0x48
+'ggwag',    # 0x49
+'ggwagg',    # 0x4a
+'ggwags',    # 0x4b
+'ggwan',    # 0x4c
+'ggwanj',    # 0x4d
+'ggwanh',    # 0x4e
+'ggwad',    # 0x4f
+'ggwal',    # 0x50
+'ggwalg',    # 0x51
+'ggwalm',    # 0x52
+'ggwalb',    # 0x53
+'ggwals',    # 0x54
+'ggwalt',    # 0x55
+'ggwalp',    # 0x56
+'ggwalh',    # 0x57
+'ggwam',    # 0x58
+'ggwab',    # 0x59
+'ggwabs',    # 0x5a
+'ggwas',    # 0x5b
+'ggwass',    # 0x5c
+'ggwang',    # 0x5d
+'ggwaj',    # 0x5e
+'ggwac',    # 0x5f
+'ggwak',    # 0x60
+'ggwat',    # 0x61
+'ggwap',    # 0x62
+'ggwah',    # 0x63
+'ggwae',    # 0x64
+'ggwaeg',    # 0x65
+'ggwaegg',    # 0x66
+'ggwaegs',    # 0x67
+'ggwaen',    # 0x68
+'ggwaenj',    # 0x69
+'ggwaenh',    # 0x6a
+'ggwaed',    # 0x6b
+'ggwael',    # 0x6c
+'ggwaelg',    # 0x6d
+'ggwaelm',    # 0x6e
+'ggwaelb',    # 0x6f
+'ggwaels',    # 0x70
+'ggwaelt',    # 0x71
+'ggwaelp',    # 0x72
+'ggwaelh',    # 0x73
+'ggwaem',    # 0x74
+'ggwaeb',    # 0x75
+'ggwaebs',    # 0x76
+'ggwaes',    # 0x77
+'ggwaess',    # 0x78
+'ggwaeng',    # 0x79
+'ggwaej',    # 0x7a
+'ggwaec',    # 0x7b
+'ggwaek',    # 0x7c
+'ggwaet',    # 0x7d
+'ggwaep',    # 0x7e
+'ggwaeh',    # 0x7f
+'ggoe',    # 0x80
+'ggoeg',    # 0x81
+'ggoegg',    # 0x82
+'ggoegs',    # 0x83
+'ggoen',    # 0x84
+'ggoenj',    # 0x85
+'ggoenh',    # 0x86
+'ggoed',    # 0x87
+'ggoel',    # 0x88
+'ggoelg',    # 0x89
+'ggoelm',    # 0x8a
+'ggoelb',    # 0x8b
+'ggoels',    # 0x8c
+'ggoelt',    # 0x8d
+'ggoelp',    # 0x8e
+'ggoelh',    # 0x8f
+'ggoem',    # 0x90
+'ggoeb',    # 0x91
+'ggoebs',    # 0x92
+'ggoes',    # 0x93
+'ggoess',    # 0x94
+'ggoeng',    # 0x95
+'ggoej',    # 0x96
+'ggoec',    # 0x97
+'ggoek',    # 0x98
+'ggoet',    # 0x99
+'ggoep',    # 0x9a
+'ggoeh',    # 0x9b
+'ggyo',    # 0x9c
+'ggyog',    # 0x9d
+'ggyogg',    # 0x9e
+'ggyogs',    # 0x9f
+'ggyon',    # 0xa0
+'ggyonj',    # 0xa1
+'ggyonh',    # 0xa2
+'ggyod',    # 0xa3
+'ggyol',    # 0xa4
+'ggyolg',    # 0xa5
+'ggyolm',    # 0xa6
+'ggyolb',    # 0xa7
+'ggyols',    # 0xa8
+'ggyolt',    # 0xa9
+'ggyolp',    # 0xaa
+'ggyolh',    # 0xab
+'ggyom',    # 0xac
+'ggyob',    # 0xad
+'ggyobs',    # 0xae
+'ggyos',    # 0xaf
+'ggyoss',    # 0xb0
+'ggyong',    # 0xb1
+'ggyoj',    # 0xb2
+'ggyoc',    # 0xb3
+'ggyok',    # 0xb4
+'ggyot',    # 0xb5
+'ggyop',    # 0xb6
+'ggyoh',    # 0xb7
+'ggu',    # 0xb8
+'ggug',    # 0xb9
+'ggugg',    # 0xba
+'ggugs',    # 0xbb
+'ggun',    # 0xbc
+'ggunj',    # 0xbd
+'ggunh',    # 0xbe
+'ggud',    # 0xbf
+'ggul',    # 0xc0
+'ggulg',    # 0xc1
+'ggulm',    # 0xc2
+'ggulb',    # 0xc3
+'gguls',    # 0xc4
+'ggult',    # 0xc5
+'ggulp',    # 0xc6
+'ggulh',    # 0xc7
+'ggum',    # 0xc8
+'ggub',    # 0xc9
+'ggubs',    # 0xca
+'ggus',    # 0xcb
+'gguss',    # 0xcc
+'ggung',    # 0xcd
+'gguj',    # 0xce
+'gguc',    # 0xcf
+'gguk',    # 0xd0
+'ggut',    # 0xd1
+'ggup',    # 0xd2
+'gguh',    # 0xd3
+'ggweo',    # 0xd4
+'ggweog',    # 0xd5
+'ggweogg',    # 0xd6
+'ggweogs',    # 0xd7
+'ggweon',    # 0xd8
+'ggweonj',    # 0xd9
+'ggweonh',    # 0xda
+'ggweod',    # 0xdb
+'ggweol',    # 0xdc
+'ggweolg',    # 0xdd
+'ggweolm',    # 0xde
+'ggweolb',    # 0xdf
+'ggweols',    # 0xe0
+'ggweolt',    # 0xe1
+'ggweolp',    # 0xe2
+'ggweolh',    # 0xe3
+'ggweom',    # 0xe4
+'ggweob',    # 0xe5
+'ggweobs',    # 0xe6
+'ggweos',    # 0xe7
+'ggweoss',    # 0xe8
+'ggweong',    # 0xe9
+'ggweoj',    # 0xea
+'ggweoc',    # 0xeb
+'ggweok',    # 0xec
+'ggweot',    # 0xed
+'ggweop',    # 0xee
+'ggweoh',    # 0xef
+'ggwe',    # 0xf0
+'ggweg',    # 0xf1
+'ggwegg',    # 0xf2
+'ggwegs',    # 0xf3
+'ggwen',    # 0xf4
+'ggwenj',    # 0xf5
+'ggwenh',    # 0xf6
+'ggwed',    # 0xf7
+'ggwel',    # 0xf8
+'ggwelg',    # 0xf9
+'ggwelm',    # 0xfa
+'ggwelb',    # 0xfb
+'ggwels',    # 0xfc
+'ggwelt',    # 0xfd
+'ggwelp',    # 0xfe
+'ggwelh',    # 0xff
+)
diff --git a/lib/unidecode/x0b0.py b/lib/unidecode/x0b0.py
new file mode 100644
index 00000000..20f41b3e
--- /dev/null
+++ b/lib/unidecode/x0b0.py
@@ -0,0 +1,258 @@
+data = (
+'ggwem',    # 0x00
+'ggweb',    # 0x01
+'ggwebs',    # 0x02
+'ggwes',    # 0x03
+'ggwess',    # 0x04
+'ggweng',    # 0x05
+'ggwej',    # 0x06
+'ggwec',    # 0x07
+'ggwek',    # 0x08
+'ggwet',    # 0x09
+'ggwep',    # 0x0a
+'ggweh',    # 0x0b
+'ggwi',    # 0x0c
+'ggwig',    # 0x0d
+'ggwigg',    # 0x0e
+'ggwigs',    # 0x0f
+'ggwin',    # 0x10
+'ggwinj',    # 0x11
+'ggwinh',    # 0x12
+'ggwid',    # 0x13
+'ggwil',    # 0x14
+'ggwilg',    # 0x15
+'ggwilm',    # 0x16
+'ggwilb',    # 0x17
+'ggwils',    # 0x18
+'ggwilt',    # 0x19
+'ggwilp',    # 0x1a
+'ggwilh',    # 0x1b
+'ggwim',    # 0x1c
+'ggwib',    # 0x1d
+'ggwibs',    # 0x1e
+'ggwis',    # 0x1f
+'ggwiss',    # 0x20
+'ggwing',    # 0x21
+'ggwij',    # 0x22
+'ggwic',    # 0x23
+'ggwik',    # 0x24
+'ggwit',    # 0x25
+'ggwip',    # 0x26
+'ggwih',    # 0x27
+'ggyu',    # 0x28
+'ggyug',    # 0x29
+'ggyugg',    # 0x2a
+'ggyugs',    # 0x2b
+'ggyun',    # 0x2c
+'ggyunj',    # 0x2d
+'ggyunh',    # 0x2e
+'ggyud',    # 0x2f
+'ggyul',    # 0x30
+'ggyulg',    # 0x31
+'ggyulm',    # 0x32
+'ggyulb',    # 0x33
+'ggyuls',    # 0x34
+'ggyult',    # 0x35
+'ggyulp',    # 0x36
+'ggyulh',    # 0x37
+'ggyum',    # 0x38
+'ggyub',    # 0x39
+'ggyubs',    # 0x3a
+'ggyus',    # 0x3b
+'ggyuss',    # 0x3c
+'ggyung',    # 0x3d
+'ggyuj',    # 0x3e
+'ggyuc',    # 0x3f
+'ggyuk',    # 0x40
+'ggyut',    # 0x41
+'ggyup',    # 0x42
+'ggyuh',    # 0x43
+'ggeu',    # 0x44
+'ggeug',    # 0x45
+'ggeugg',    # 0x46
+'ggeugs',    # 0x47
+'ggeun',    # 0x48
+'ggeunj',    # 0x49
+'ggeunh',    # 0x4a
+'ggeud',    # 0x4b
+'ggeul',    # 0x4c
+'ggeulg',    # 0x4d
+'ggeulm',    # 0x4e
+'ggeulb',    # 0x4f
+'ggeuls',    # 0x50
+'ggeult',    # 0x51
+'ggeulp',    # 0x52
+'ggeulh',    # 0x53
+'ggeum',    # 0x54
+'ggeub',    # 0x55
+'ggeubs',    # 0x56
+'ggeus',    # 0x57
+'ggeuss',    # 0x58
+'ggeung',    # 0x59
+'ggeuj',    # 0x5a
+'ggeuc',    # 0x5b
+'ggeuk',    # 0x5c
+'ggeut',    # 0x5d
+'ggeup',    # 0x5e
+'ggeuh',    # 0x5f
+'ggyi',    # 0x60
+'ggyig',    # 0x61
+'ggyigg',    # 0x62
+'ggyigs',    # 0x63
+'ggyin',    # 0x64
+'ggyinj',    # 0x65
+'ggyinh',    # 0x66
+'ggyid',    # 0x67
+'ggyil',    # 0x68
+'ggyilg',    # 0x69
+'ggyilm',    # 0x6a
+'ggyilb',    # 0x6b
+'ggyils',    # 0x6c
+'ggyilt',    # 0x6d
+'ggyilp',    # 0x6e
+'ggyilh',    # 0x6f
+'ggyim',    # 0x70
+'ggyib',    # 0x71
+'ggyibs',    # 0x72
+'ggyis',    # 0x73
+'ggyiss',    # 0x74
+'ggying',    # 0x75
+'ggyij',    # 0x76
+'ggyic',    # 0x77
+'ggyik',    # 0x78
+'ggyit',    # 0x79
+'ggyip',    # 0x7a
+'ggyih',    # 0x7b
+'ggi',    # 0x7c
+'ggig',    # 0x7d
+'ggigg',    # 0x7e
+'ggigs',    # 0x7f
+'ggin',    # 0x80
+'gginj',    # 0x81
+'gginh',    # 0x82
+'ggid',    # 0x83
+'ggil',    # 0x84
+'ggilg',    # 0x85
+'ggilm',    # 0x86
+'ggilb',    # 0x87
+'ggils',    # 0x88
+'ggilt',    # 0x89
+'ggilp',    # 0x8a
+'ggilh',    # 0x8b
+'ggim',    # 0x8c
+'ggib',    # 0x8d
+'ggibs',    # 0x8e
+'ggis',    # 0x8f
+'ggiss',    # 0x90
+'gging',    # 0x91
+'ggij',    # 0x92
+'ggic',    # 0x93
+'ggik',    # 0x94
+'ggit',    # 0x95
+'ggip',    # 0x96
+'ggih',    # 0x97
+'na',    # 0x98
+'nag',    # 0x99
+'nagg',    # 0x9a
+'nags',    # 0x9b
+'nan',    # 0x9c
+'nanj',    # 0x9d
+'nanh',    # 0x9e
+'nad',    # 0x9f
+'nal',    # 0xa0
+'nalg',    # 0xa1
+'nalm',    # 0xa2
+'nalb',    # 0xa3
+'nals',    # 0xa4
+'nalt',    # 0xa5
+'nalp',    # 0xa6
+'nalh',    # 0xa7
+'nam',    # 0xa8
+'nab',    # 0xa9
+'nabs',    # 0xaa
+'nas',    # 0xab
+'nass',    # 0xac
+'nang',    # 0xad
+'naj',    # 0xae
+'nac',    # 0xaf
+'nak',    # 0xb0
+'nat',    # 0xb1
+'nap',    # 0xb2
+'nah',    # 0xb3
+'nae',    # 0xb4
+'naeg',    # 0xb5
+'naegg',    # 0xb6
+'naegs',    # 0xb7
+'naen',    # 0xb8
+'naenj',    # 0xb9
+'naenh',    # 0xba
+'naed',    # 0xbb
+'nael',    # 0xbc
+'naelg',    # 0xbd
+'naelm',    # 0xbe
+'naelb',    # 0xbf
+'naels',    # 0xc0
+'naelt',    # 0xc1
+'naelp',    # 0xc2
+'naelh',    # 0xc3
+'naem',    # 0xc4
+'naeb',    # 0xc5
+'naebs',    # 0xc6
+'naes',    # 0xc7
+'naess',    # 0xc8
+'naeng',    # 0xc9
+'naej',    # 0xca
+'naec',    # 0xcb
+'naek',    # 0xcc
+'naet',    # 0xcd
+'naep',    # 0xce
+'naeh',    # 0xcf
+'nya',    # 0xd0
+'nyag',    # 0xd1
+'nyagg',    # 0xd2
+'nyags',    # 0xd3
+'nyan',    # 0xd4
+'nyanj',    # 0xd5
+'nyanh',    # 0xd6
+'nyad',    # 0xd7
+'nyal',    # 0xd8
+'nyalg',    # 0xd9
+'nyalm',    # 0xda
+'nyalb',    # 0xdb
+'nyals',    # 0xdc
+'nyalt',    # 0xdd
+'nyalp',    # 0xde
+'nyalh',    # 0xdf
+'nyam',    # 0xe0
+'nyab',    # 0xe1
+'nyabs',    # 0xe2
+'nyas',    # 0xe3
+'nyass',    # 0xe4
+'nyang',    # 0xe5
+'nyaj',    # 0xe6
+'nyac',    # 0xe7
+'nyak',    # 0xe8
+'nyat',    # 0xe9
+'nyap',    # 0xea
+'nyah',    # 0xeb
+'nyae',    # 0xec
+'nyaeg',    # 0xed
+'nyaegg',    # 0xee
+'nyaegs',    # 0xef
+'nyaen',    # 0xf0
+'nyaenj',    # 0xf1
+'nyaenh',    # 0xf2
+'nyaed',    # 0xf3
+'nyael',    # 0xf4
+'nyaelg',    # 0xf5
+'nyaelm',    # 0xf6
+'nyaelb',    # 0xf7
+'nyaels',    # 0xf8
+'nyaelt',    # 0xf9
+'nyaelp',    # 0xfa
+'nyaelh',    # 0xfb
+'nyaem',    # 0xfc
+'nyaeb',    # 0xfd
+'nyaebs',    # 0xfe
+'nyaes',    # 0xff
+)
diff --git a/lib/unidecode/x0b1.py b/lib/unidecode/x0b1.py
new file mode 100644
index 00000000..5aabeae2
--- /dev/null
+++ b/lib/unidecode/x0b1.py
@@ -0,0 +1,258 @@
+data = (
+'nyaess',    # 0x00
+'nyaeng',    # 0x01
+'nyaej',    # 0x02
+'nyaec',    # 0x03
+'nyaek',    # 0x04
+'nyaet',    # 0x05
+'nyaep',    # 0x06
+'nyaeh',    # 0x07
+'neo',    # 0x08
+'neog',    # 0x09
+'neogg',    # 0x0a
+'neogs',    # 0x0b
+'neon',    # 0x0c
+'neonj',    # 0x0d
+'neonh',    # 0x0e
+'neod',    # 0x0f
+'neol',    # 0x10
+'neolg',    # 0x11
+'neolm',    # 0x12
+'neolb',    # 0x13
+'neols',    # 0x14
+'neolt',    # 0x15
+'neolp',    # 0x16
+'neolh',    # 0x17
+'neom',    # 0x18
+'neob',    # 0x19
+'neobs',    # 0x1a
+'neos',    # 0x1b
+'neoss',    # 0x1c
+'neong',    # 0x1d
+'neoj',    # 0x1e
+'neoc',    # 0x1f
+'neok',    # 0x20
+'neot',    # 0x21
+'neop',    # 0x22
+'neoh',    # 0x23
+'ne',    # 0x24
+'neg',    # 0x25
+'negg',    # 0x26
+'negs',    # 0x27
+'nen',    # 0x28
+'nenj',    # 0x29
+'nenh',    # 0x2a
+'ned',    # 0x2b
+'nel',    # 0x2c
+'nelg',    # 0x2d
+'nelm',    # 0x2e
+'nelb',    # 0x2f
+'nels',    # 0x30
+'nelt',    # 0x31
+'nelp',    # 0x32
+'nelh',    # 0x33
+'nem',    # 0x34
+'neb',    # 0x35
+'nebs',    # 0x36
+'nes',    # 0x37
+'ness',    # 0x38
+'neng',    # 0x39
+'nej',    # 0x3a
+'nec',    # 0x3b
+'nek',    # 0x3c
+'net',    # 0x3d
+'nep',    # 0x3e
+'neh',    # 0x3f
+'nyeo',    # 0x40
+'nyeog',    # 0x41
+'nyeogg',    # 0x42
+'nyeogs',    # 0x43
+'nyeon',    # 0x44
+'nyeonj',    # 0x45
+'nyeonh',    # 0x46
+'nyeod',    # 0x47
+'nyeol',    # 0x48
+'nyeolg',    # 0x49
+'nyeolm',    # 0x4a
+'nyeolb',    # 0x4b
+'nyeols',    # 0x4c
+'nyeolt',    # 0x4d
+'nyeolp',    # 0x4e
+'nyeolh',    # 0x4f
+'nyeom',    # 0x50
+'nyeob',    # 0x51
+'nyeobs',    # 0x52
+'nyeos',    # 0x53
+'nyeoss',    # 0x54
+'nyeong',    # 0x55
+'nyeoj',    # 0x56
+'nyeoc',    # 0x57
+'nyeok',    # 0x58
+'nyeot',    # 0x59
+'nyeop',    # 0x5a
+'nyeoh',    # 0x5b
+'nye',    # 0x5c
+'nyeg',    # 0x5d
+'nyegg',    # 0x5e
+'nyegs',    # 0x5f
+'nyen',    # 0x60
+'nyenj',    # 0x61
+'nyenh',    # 0x62
+'nyed',    # 0x63
+'nyel',    # 0x64
+'nyelg',    # 0x65
+'nyelm',    # 0x66
+'nyelb',    # 0x67
+'nyels',    # 0x68
+'nyelt',    # 0x69
+'nyelp',    # 0x6a
+'nyelh',    # 0x6b
+'nyem',    # 0x6c
+'nyeb',    # 0x6d
+'nyebs',    # 0x6e
+'nyes',    # 0x6f
+'nyess',    # 0x70
+'nyeng',    # 0x71
+'nyej',    # 0x72
+'nyec',    # 0x73
+'nyek',    # 0x74
+'nyet',    # 0x75
+'nyep',    # 0x76
+'nyeh',    # 0x77
+'no',    # 0x78
+'nog',    # 0x79
+'nogg',    # 0x7a
+'nogs',    # 0x7b
+'non',    # 0x7c
+'nonj',    # 0x7d
+'nonh',    # 0x7e
+'nod',    # 0x7f
+'nol',    # 0x80
+'nolg',    # 0x81
+'nolm',    # 0x82
+'nolb',    # 0x83
+'nols',    # 0x84
+'nolt',    # 0x85
+'nolp',    # 0x86
+'nolh',    # 0x87
+'nom',    # 0x88
+'nob',    # 0x89
+'nobs',    # 0x8a
+'nos',    # 0x8b
+'noss',    # 0x8c
+'nong',    # 0x8d
+'noj',    # 0x8e
+'noc',    # 0x8f
+'nok',    # 0x90
+'not',    # 0x91
+'nop',    # 0x92
+'noh',    # 0x93
+'nwa',    # 0x94
+'nwag',    # 0x95
+'nwagg',    # 0x96
+'nwags',    # 0x97
+'nwan',    # 0x98
+'nwanj',    # 0x99
+'nwanh',    # 0x9a
+'nwad',    # 0x9b
+'nwal',    # 0x9c
+'nwalg',    # 0x9d
+'nwalm',    # 0x9e
+'nwalb',    # 0x9f
+'nwals',    # 0xa0
+'nwalt',    # 0xa1
+'nwalp',    # 0xa2
+'nwalh',    # 0xa3
+'nwam',    # 0xa4
+'nwab',    # 0xa5
+'nwabs',    # 0xa6
+'nwas',    # 0xa7
+'nwass',    # 0xa8
+'nwang',    # 0xa9
+'nwaj',    # 0xaa
+'nwac',    # 0xab
+'nwak',    # 0xac
+'nwat',    # 0xad
+'nwap',    # 0xae
+'nwah',    # 0xaf
+'nwae',    # 0xb0
+'nwaeg',    # 0xb1
+'nwaegg',    # 0xb2
+'nwaegs',    # 0xb3
+'nwaen',    # 0xb4
+'nwaenj',    # 0xb5
+'nwaenh',    # 0xb6
+'nwaed',    # 0xb7
+'nwael',    # 0xb8
+'nwaelg',    # 0xb9
+'nwaelm',    # 0xba
+'nwaelb',    # 0xbb
+'nwaels',    # 0xbc
+'nwaelt',    # 0xbd
+'nwaelp',    # 0xbe
+'nwaelh',    # 0xbf
+'nwaem',    # 0xc0
+'nwaeb',    # 0xc1
+'nwaebs',    # 0xc2
+'nwaes',    # 0xc3
+'nwaess',    # 0xc4
+'nwaeng',    # 0xc5
+'nwaej',    # 0xc6
+'nwaec',    # 0xc7
+'nwaek',    # 0xc8
+'nwaet',    # 0xc9
+'nwaep',    # 0xca
+'nwaeh',    # 0xcb
+'noe',    # 0xcc
+'noeg',    # 0xcd
+'noegg',    # 0xce
+'noegs',    # 0xcf
+'noen',    # 0xd0
+'noenj',    # 0xd1
+'noenh',    # 0xd2
+'noed',    # 0xd3
+'noel',    # 0xd4
+'noelg',    # 0xd5
+'noelm',    # 0xd6
+'noelb',    # 0xd7
+'noels',    # 0xd8
+'noelt',    # 0xd9
+'noelp',    # 0xda
+'noelh',    # 0xdb
+'noem',    # 0xdc
+'noeb',    # 0xdd
+'noebs',    # 0xde
+'noes',    # 0xdf
+'noess',    # 0xe0
+'noeng',    # 0xe1
+'noej',    # 0xe2
+'noec',    # 0xe3
+'noek',    # 0xe4
+'noet',    # 0xe5
+'noep',    # 0xe6
+'noeh',    # 0xe7
+'nyo',    # 0xe8
+'nyog',    # 0xe9
+'nyogg',    # 0xea
+'nyogs',    # 0xeb
+'nyon',    # 0xec
+'nyonj',    # 0xed
+'nyonh',    # 0xee
+'nyod',    # 0xef
+'nyol',    # 0xf0
+'nyolg',    # 0xf1
+'nyolm',    # 0xf2
+'nyolb',    # 0xf3
+'nyols',    # 0xf4
+'nyolt',    # 0xf5
+'nyolp',    # 0xf6
+'nyolh',    # 0xf7
+'nyom',    # 0xf8
+'nyob',    # 0xf9
+'nyobs',    # 0xfa
+'nyos',    # 0xfb
+'nyoss',    # 0xfc
+'nyong',    # 0xfd
+'nyoj',    # 0xfe
+'nyoc',    # 0xff
+)
diff --git a/lib/unidecode/x0b2.py b/lib/unidecode/x0b2.py
new file mode 100644
index 00000000..8b8aee41
--- /dev/null
+++ b/lib/unidecode/x0b2.py
@@ -0,0 +1,258 @@
+data = (
+'nyok',    # 0x00
+'nyot',    # 0x01
+'nyop',    # 0x02
+'nyoh',    # 0x03
+'nu',    # 0x04
+'nug',    # 0x05
+'nugg',    # 0x06
+'nugs',    # 0x07
+'nun',    # 0x08
+'nunj',    # 0x09
+'nunh',    # 0x0a
+'nud',    # 0x0b
+'nul',    # 0x0c
+'nulg',    # 0x0d
+'nulm',    # 0x0e
+'nulb',    # 0x0f
+'nuls',    # 0x10
+'nult',    # 0x11
+'nulp',    # 0x12
+'nulh',    # 0x13
+'num',    # 0x14
+'nub',    # 0x15
+'nubs',    # 0x16
+'nus',    # 0x17
+'nuss',    # 0x18
+'nung',    # 0x19
+'nuj',    # 0x1a
+'nuc',    # 0x1b
+'nuk',    # 0x1c
+'nut',    # 0x1d
+'nup',    # 0x1e
+'nuh',    # 0x1f
+'nweo',    # 0x20
+'nweog',    # 0x21
+'nweogg',    # 0x22
+'nweogs',    # 0x23
+'nweon',    # 0x24
+'nweonj',    # 0x25
+'nweonh',    # 0x26
+'nweod',    # 0x27
+'nweol',    # 0x28
+'nweolg',    # 0x29
+'nweolm',    # 0x2a
+'nweolb',    # 0x2b
+'nweols',    # 0x2c
+'nweolt',    # 0x2d
+'nweolp',    # 0x2e
+'nweolh',    # 0x2f
+'nweom',    # 0x30
+'nweob',    # 0x31
+'nweobs',    # 0x32
+'nweos',    # 0x33
+'nweoss',    # 0x34
+'nweong',    # 0x35
+'nweoj',    # 0x36
+'nweoc',    # 0x37
+'nweok',    # 0x38
+'nweot',    # 0x39
+'nweop',    # 0x3a
+'nweoh',    # 0x3b
+'nwe',    # 0x3c
+'nweg',    # 0x3d
+'nwegg',    # 0x3e
+'nwegs',    # 0x3f
+'nwen',    # 0x40
+'nwenj',    # 0x41
+'nwenh',    # 0x42
+'nwed',    # 0x43
+'nwel',    # 0x44
+'nwelg',    # 0x45
+'nwelm',    # 0x46
+'nwelb',    # 0x47
+'nwels',    # 0x48
+'nwelt',    # 0x49
+'nwelp',    # 0x4a
+'nwelh',    # 0x4b
+'nwem',    # 0x4c
+'nweb',    # 0x4d
+'nwebs',    # 0x4e
+'nwes',    # 0x4f
+'nwess',    # 0x50
+'nweng',    # 0x51
+'nwej',    # 0x52
+'nwec',    # 0x53
+'nwek',    # 0x54
+'nwet',    # 0x55
+'nwep',    # 0x56
+'nweh',    # 0x57
+'nwi',    # 0x58
+'nwig',    # 0x59
+'nwigg',    # 0x5a
+'nwigs',    # 0x5b
+'nwin',    # 0x5c
+'nwinj',    # 0x5d
+'nwinh',    # 0x5e
+'nwid',    # 0x5f
+'nwil',    # 0x60
+'nwilg',    # 0x61
+'nwilm',    # 0x62
+'nwilb',    # 0x63
+'nwils',    # 0x64
+'nwilt',    # 0x65
+'nwilp',    # 0x66
+'nwilh',    # 0x67
+'nwim',    # 0x68
+'nwib',    # 0x69
+'nwibs',    # 0x6a
+'nwis',    # 0x6b
+'nwiss',    # 0x6c
+'nwing',    # 0x6d
+'nwij',    # 0x6e
+'nwic',    # 0x6f
+'nwik',    # 0x70
+'nwit',    # 0x71
+'nwip',    # 0x72
+'nwih',    # 0x73
+'nyu',    # 0x74
+'nyug',    # 0x75
+'nyugg',    # 0x76
+'nyugs',    # 0x77
+'nyun',    # 0x78
+'nyunj',    # 0x79
+'nyunh',    # 0x7a
+'nyud',    # 0x7b
+'nyul',    # 0x7c
+'nyulg',    # 0x7d
+'nyulm',    # 0x7e
+'nyulb',    # 0x7f
+'nyuls',    # 0x80
+'nyult',    # 0x81
+'nyulp',    # 0x82
+'nyulh',    # 0x83
+'nyum',    # 0x84
+'nyub',    # 0x85
+'nyubs',    # 0x86
+'nyus',    # 0x87
+'nyuss',    # 0x88
+'nyung',    # 0x89
+'nyuj',    # 0x8a
+'nyuc',    # 0x8b
+'nyuk',    # 0x8c
+'nyut',    # 0x8d
+'nyup',    # 0x8e
+'nyuh',    # 0x8f
+'neu',    # 0x90
+'neug',    # 0x91
+'neugg',    # 0x92
+'neugs',    # 0x93
+'neun',    # 0x94
+'neunj',    # 0x95
+'neunh',    # 0x96
+'neud',    # 0x97
+'neul',    # 0x98
+'neulg',    # 0x99
+'neulm',    # 0x9a
+'neulb',    # 0x9b
+'neuls',    # 0x9c
+'neult',    # 0x9d
+'neulp',    # 0x9e
+'neulh',    # 0x9f
+'neum',    # 0xa0
+'neub',    # 0xa1
+'neubs',    # 0xa2
+'neus',    # 0xa3
+'neuss',    # 0xa4
+'neung',    # 0xa5
+'neuj',    # 0xa6
+'neuc',    # 0xa7
+'neuk',    # 0xa8
+'neut',    # 0xa9
+'neup',    # 0xaa
+'neuh',    # 0xab
+'nyi',    # 0xac
+'nyig',    # 0xad
+'nyigg',    # 0xae
+'nyigs',    # 0xaf
+'nyin',    # 0xb0
+'nyinj',    # 0xb1
+'nyinh',    # 0xb2
+'nyid',    # 0xb3
+'nyil',    # 0xb4
+'nyilg',    # 0xb5
+'nyilm',    # 0xb6
+'nyilb',    # 0xb7
+'nyils',    # 0xb8
+'nyilt',    # 0xb9
+'nyilp',    # 0xba
+'nyilh',    # 0xbb
+'nyim',    # 0xbc
+'nyib',    # 0xbd
+'nyibs',    # 0xbe
+'nyis',    # 0xbf
+'nyiss',    # 0xc0
+'nying',    # 0xc1
+'nyij',    # 0xc2
+'nyic',    # 0xc3
+'nyik',    # 0xc4
+'nyit',    # 0xc5
+'nyip',    # 0xc6
+'nyih',    # 0xc7
+'ni',    # 0xc8
+'nig',    # 0xc9
+'nigg',    # 0xca
+'nigs',    # 0xcb
+'nin',    # 0xcc
+'ninj',    # 0xcd
+'ninh',    # 0xce
+'nid',    # 0xcf
+'nil',    # 0xd0
+'nilg',    # 0xd1
+'nilm',    # 0xd2
+'nilb',    # 0xd3
+'nils',    # 0xd4
+'nilt',    # 0xd5
+'nilp',    # 0xd6
+'nilh',    # 0xd7
+'nim',    # 0xd8
+'nib',    # 0xd9
+'nibs',    # 0xda
+'nis',    # 0xdb
+'niss',    # 0xdc
+'ning',    # 0xdd
+'nij',    # 0xde
+'nic',    # 0xdf
+'nik',    # 0xe0
+'nit',    # 0xe1
+'nip',    # 0xe2
+'nih',    # 0xe3
+'da',    # 0xe4
+'dag',    # 0xe5
+'dagg',    # 0xe6
+'dags',    # 0xe7
+'dan',    # 0xe8
+'danj',    # 0xe9
+'danh',    # 0xea
+'dad',    # 0xeb
+'dal',    # 0xec
+'dalg',    # 0xed
+'dalm',    # 0xee
+'dalb',    # 0xef
+'dals',    # 0xf0
+'dalt',    # 0xf1
+'dalp',    # 0xf2
+'dalh',    # 0xf3
+'dam',    # 0xf4
+'dab',    # 0xf5
+'dabs',    # 0xf6
+'das',    # 0xf7
+'dass',    # 0xf8
+'dang',    # 0xf9
+'daj',    # 0xfa
+'dac',    # 0xfb
+'dak',    # 0xfc
+'dat',    # 0xfd
+'dap',    # 0xfe
+'dah',    # 0xff
+)
diff --git a/lib/unidecode/x0b3.py b/lib/unidecode/x0b3.py
new file mode 100644
index 00000000..830915aa
--- /dev/null
+++ b/lib/unidecode/x0b3.py
@@ -0,0 +1,258 @@
+data = (
+'dae',    # 0x00
+'daeg',    # 0x01
+'daegg',    # 0x02
+'daegs',    # 0x03
+'daen',    # 0x04
+'daenj',    # 0x05
+'daenh',    # 0x06
+'daed',    # 0x07
+'dael',    # 0x08
+'daelg',    # 0x09
+'daelm',    # 0x0a
+'daelb',    # 0x0b
+'daels',    # 0x0c
+'daelt',    # 0x0d
+'daelp',    # 0x0e
+'daelh',    # 0x0f
+'daem',    # 0x10
+'daeb',    # 0x11
+'daebs',    # 0x12
+'daes',    # 0x13
+'daess',    # 0x14
+'daeng',    # 0x15
+'daej',    # 0x16
+'daec',    # 0x17
+'daek',    # 0x18
+'daet',    # 0x19
+'daep',    # 0x1a
+'daeh',    # 0x1b
+'dya',    # 0x1c
+'dyag',    # 0x1d
+'dyagg',    # 0x1e
+'dyags',    # 0x1f
+'dyan',    # 0x20
+'dyanj',    # 0x21
+'dyanh',    # 0x22
+'dyad',    # 0x23
+'dyal',    # 0x24
+'dyalg',    # 0x25
+'dyalm',    # 0x26
+'dyalb',    # 0x27
+'dyals',    # 0x28
+'dyalt',    # 0x29
+'dyalp',    # 0x2a
+'dyalh',    # 0x2b
+'dyam',    # 0x2c
+'dyab',    # 0x2d
+'dyabs',    # 0x2e
+'dyas',    # 0x2f
+'dyass',    # 0x30
+'dyang',    # 0x31
+'dyaj',    # 0x32
+'dyac',    # 0x33
+'dyak',    # 0x34
+'dyat',    # 0x35
+'dyap',    # 0x36
+'dyah',    # 0x37
+'dyae',    # 0x38
+'dyaeg',    # 0x39
+'dyaegg',    # 0x3a
+'dyaegs',    # 0x3b
+'dyaen',    # 0x3c
+'dyaenj',    # 0x3d
+'dyaenh',    # 0x3e
+'dyaed',    # 0x3f
+'dyael',    # 0x40
+'dyaelg',    # 0x41
+'dyaelm',    # 0x42
+'dyaelb',    # 0x43
+'dyaels',    # 0x44
+'dyaelt',    # 0x45
+'dyaelp',    # 0x46
+'dyaelh',    # 0x47
+'dyaem',    # 0x48
+'dyaeb',    # 0x49
+'dyaebs',    # 0x4a
+'dyaes',    # 0x4b
+'dyaess',    # 0x4c
+'dyaeng',    # 0x4d
+'dyaej',    # 0x4e
+'dyaec',    # 0x4f
+'dyaek',    # 0x50
+'dyaet',    # 0x51
+'dyaep',    # 0x52
+'dyaeh',    # 0x53
+'deo',    # 0x54
+'deog',    # 0x55
+'deogg',    # 0x56
+'deogs',    # 0x57
+'deon',    # 0x58
+'deonj',    # 0x59
+'deonh',    # 0x5a
+'deod',    # 0x5b
+'deol',    # 0x5c
+'deolg',    # 0x5d
+'deolm',    # 0x5e
+'deolb',    # 0x5f
+'deols',    # 0x60
+'deolt',    # 0x61
+'deolp',    # 0x62
+'deolh',    # 0x63
+'deom',    # 0x64
+'deob',    # 0x65
+'deobs',    # 0x66
+'deos',    # 0x67
+'deoss',    # 0x68
+'deong',    # 0x69
+'deoj',    # 0x6a
+'deoc',    # 0x6b
+'deok',    # 0x6c
+'deot',    # 0x6d
+'deop',    # 0x6e
+'deoh',    # 0x6f
+'de',    # 0x70
+'deg',    # 0x71
+'degg',    # 0x72
+'degs',    # 0x73
+'den',    # 0x74
+'denj',    # 0x75
+'denh',    # 0x76
+'ded',    # 0x77
+'del',    # 0x78
+'delg',    # 0x79
+'delm',    # 0x7a
+'delb',    # 0x7b
+'dels',    # 0x7c
+'delt',    # 0x7d
+'delp',    # 0x7e
+'delh',    # 0x7f
+'dem',    # 0x80
+'deb',    # 0x81
+'debs',    # 0x82
+'des',    # 0x83
+'dess',    # 0x84
+'deng',    # 0x85
+'dej',    # 0x86
+'dec',    # 0x87
+'dek',    # 0x88
+'det',    # 0x89
+'dep',    # 0x8a
+'deh',    # 0x8b
+'dyeo',    # 0x8c
+'dyeog',    # 0x8d
+'dyeogg',    # 0x8e
+'dyeogs',    # 0x8f
+'dyeon',    # 0x90
+'dyeonj',    # 0x91
+'dyeonh',    # 0x92
+'dyeod',    # 0x93
+'dyeol',    # 0x94
+'dyeolg',    # 0x95
+'dyeolm',    # 0x96
+'dyeolb',    # 0x97
+'dyeols',    # 0x98
+'dyeolt',    # 0x99
+'dyeolp',    # 0x9a
+'dyeolh',    # 0x9b
+'dyeom',    # 0x9c
+'dyeob',    # 0x9d
+'dyeobs',    # 0x9e
+'dyeos',    # 0x9f
+'dyeoss',    # 0xa0
+'dyeong',    # 0xa1
+'dyeoj',    # 0xa2
+'dyeoc',    # 0xa3
+'dyeok',    # 0xa4
+'dyeot',    # 0xa5
+'dyeop',    # 0xa6
+'dyeoh',    # 0xa7
+'dye',    # 0xa8
+'dyeg',    # 0xa9
+'dyegg',    # 0xaa
+'dyegs',    # 0xab
+'dyen',    # 0xac
+'dyenj',    # 0xad
+'dyenh',    # 0xae
+'dyed',    # 0xaf
+'dyel',    # 0xb0
+'dyelg',    # 0xb1
+'dyelm',    # 0xb2
+'dyelb',    # 0xb3
+'dyels',    # 0xb4
+'dyelt',    # 0xb5
+'dyelp',    # 0xb6
+'dyelh',    # 0xb7
+'dyem',    # 0xb8
+'dyeb',    # 0xb9
+'dyebs',    # 0xba
+'dyes',    # 0xbb
+'dyess',    # 0xbc
+'dyeng',    # 0xbd
+'dyej',    # 0xbe
+'dyec',    # 0xbf
+'dyek',    # 0xc0
+'dyet',    # 0xc1
+'dyep',    # 0xc2
+'dyeh',    # 0xc3
+'do',    # 0xc4
+'dog',    # 0xc5
+'dogg',    # 0xc6
+'dogs',    # 0xc7
+'don',    # 0xc8
+'donj',    # 0xc9
+'donh',    # 0xca
+'dod',    # 0xcb
+'dol',    # 0xcc
+'dolg',    # 0xcd
+'dolm',    # 0xce
+'dolb',    # 0xcf
+'dols',    # 0xd0
+'dolt',    # 0xd1
+'dolp',    # 0xd2
+'dolh',    # 0xd3
+'dom',    # 0xd4
+'dob',    # 0xd5
+'dobs',    # 0xd6
+'dos',    # 0xd7
+'doss',    # 0xd8
+'dong',    # 0xd9
+'doj',    # 0xda
+'doc',    # 0xdb
+'dok',    # 0xdc
+'dot',    # 0xdd
+'dop',    # 0xde
+'doh',    # 0xdf
+'dwa',    # 0xe0
+'dwag',    # 0xe1
+'dwagg',    # 0xe2
+'dwags',    # 0xe3
+'dwan',    # 0xe4
+'dwanj',    # 0xe5
+'dwanh',    # 0xe6
+'dwad',    # 0xe7
+'dwal',    # 0xe8
+'dwalg',    # 0xe9
+'dwalm',    # 0xea
+'dwalb',    # 0xeb
+'dwals',    # 0xec
+'dwalt',    # 0xed
+'dwalp',    # 0xee
+'dwalh',    # 0xef
+'dwam',    # 0xf0
+'dwab',    # 0xf1
+'dwabs',    # 0xf2
+'dwas',    # 0xf3
+'dwass',    # 0xf4
+'dwang',    # 0xf5
+'dwaj',    # 0xf6
+'dwac',    # 0xf7
+'dwak',    # 0xf8
+'dwat',    # 0xf9
+'dwap',    # 0xfa
+'dwah',    # 0xfb
+'dwae',    # 0xfc
+'dwaeg',    # 0xfd
+'dwaegg',    # 0xfe
+'dwaegs',    # 0xff
+)
diff --git a/lib/unidecode/x0b4.py b/lib/unidecode/x0b4.py
new file mode 100644
index 00000000..7a6a5aaa
--- /dev/null
+++ b/lib/unidecode/x0b4.py
@@ -0,0 +1,258 @@
+data = (
+'dwaen',    # 0x00
+'dwaenj',    # 0x01
+'dwaenh',    # 0x02
+'dwaed',    # 0x03
+'dwael',    # 0x04
+'dwaelg',    # 0x05
+'dwaelm',    # 0x06
+'dwaelb',    # 0x07
+'dwaels',    # 0x08
+'dwaelt',    # 0x09
+'dwaelp',    # 0x0a
+'dwaelh',    # 0x0b
+'dwaem',    # 0x0c
+'dwaeb',    # 0x0d
+'dwaebs',    # 0x0e
+'dwaes',    # 0x0f
+'dwaess',    # 0x10
+'dwaeng',    # 0x11
+'dwaej',    # 0x12
+'dwaec',    # 0x13
+'dwaek',    # 0x14
+'dwaet',    # 0x15
+'dwaep',    # 0x16
+'dwaeh',    # 0x17
+'doe',    # 0x18
+'doeg',    # 0x19
+'doegg',    # 0x1a
+'doegs',    # 0x1b
+'doen',    # 0x1c
+'doenj',    # 0x1d
+'doenh',    # 0x1e
+'doed',    # 0x1f
+'doel',    # 0x20
+'doelg',    # 0x21
+'doelm',    # 0x22
+'doelb',    # 0x23
+'doels',    # 0x24
+'doelt',    # 0x25
+'doelp',    # 0x26
+'doelh',    # 0x27
+'doem',    # 0x28
+'doeb',    # 0x29
+'doebs',    # 0x2a
+'does',    # 0x2b
+'doess',    # 0x2c
+'doeng',    # 0x2d
+'doej',    # 0x2e
+'doec',    # 0x2f
+'doek',    # 0x30
+'doet',    # 0x31
+'doep',    # 0x32
+'doeh',    # 0x33
+'dyo',    # 0x34
+'dyog',    # 0x35
+'dyogg',    # 0x36
+'dyogs',    # 0x37
+'dyon',    # 0x38
+'dyonj',    # 0x39
+'dyonh',    # 0x3a
+'dyod',    # 0x3b
+'dyol',    # 0x3c
+'dyolg',    # 0x3d
+'dyolm',    # 0x3e
+'dyolb',    # 0x3f
+'dyols',    # 0x40
+'dyolt',    # 0x41
+'dyolp',    # 0x42
+'dyolh',    # 0x43
+'dyom',    # 0x44
+'dyob',    # 0x45
+'dyobs',    # 0x46
+'dyos',    # 0x47
+'dyoss',    # 0x48
+'dyong',    # 0x49
+'dyoj',    # 0x4a
+'dyoc',    # 0x4b
+'dyok',    # 0x4c
+'dyot',    # 0x4d
+'dyop',    # 0x4e
+'dyoh',    # 0x4f
+'du',    # 0x50
+'dug',    # 0x51
+'dugg',    # 0x52
+'dugs',    # 0x53
+'dun',    # 0x54
+'dunj',    # 0x55
+'dunh',    # 0x56
+'dud',    # 0x57
+'dul',    # 0x58
+'dulg',    # 0x59
+'dulm',    # 0x5a
+'dulb',    # 0x5b
+'duls',    # 0x5c
+'dult',    # 0x5d
+'dulp',    # 0x5e
+'dulh',    # 0x5f
+'dum',    # 0x60
+'dub',    # 0x61
+'dubs',    # 0x62
+'dus',    # 0x63
+'duss',    # 0x64
+'dung',    # 0x65
+'duj',    # 0x66
+'duc',    # 0x67
+'duk',    # 0x68
+'dut',    # 0x69
+'dup',    # 0x6a
+'duh',    # 0x6b
+'dweo',    # 0x6c
+'dweog',    # 0x6d
+'dweogg',    # 0x6e
+'dweogs',    # 0x6f
+'dweon',    # 0x70
+'dweonj',    # 0x71
+'dweonh',    # 0x72
+'dweod',    # 0x73
+'dweol',    # 0x74
+'dweolg',    # 0x75
+'dweolm',    # 0x76
+'dweolb',    # 0x77
+'dweols',    # 0x78
+'dweolt',    # 0x79
+'dweolp',    # 0x7a
+'dweolh',    # 0x7b
+'dweom',    # 0x7c
+'dweob',    # 0x7d
+'dweobs',    # 0x7e
+'dweos',    # 0x7f
+'dweoss',    # 0x80
+'dweong',    # 0x81
+'dweoj',    # 0x82
+'dweoc',    # 0x83
+'dweok',    # 0x84
+'dweot',    # 0x85
+'dweop',    # 0x86
+'dweoh',    # 0x87
+'dwe',    # 0x88
+'dweg',    # 0x89
+'dwegg',    # 0x8a
+'dwegs',    # 0x8b
+'dwen',    # 0x8c
+'dwenj',    # 0x8d
+'dwenh',    # 0x8e
+'dwed',    # 0x8f
+'dwel',    # 0x90
+'dwelg',    # 0x91
+'dwelm',    # 0x92
+'dwelb',    # 0x93
+'dwels',    # 0x94
+'dwelt',    # 0x95
+'dwelp',    # 0x96
+'dwelh',    # 0x97
+'dwem',    # 0x98
+'dweb',    # 0x99
+'dwebs',    # 0x9a
+'dwes',    # 0x9b
+'dwess',    # 0x9c
+'dweng',    # 0x9d
+'dwej',    # 0x9e
+'dwec',    # 0x9f
+'dwek',    # 0xa0
+'dwet',    # 0xa1
+'dwep',    # 0xa2
+'dweh',    # 0xa3
+'dwi',    # 0xa4
+'dwig',    # 0xa5
+'dwigg',    # 0xa6
+'dwigs',    # 0xa7
+'dwin',    # 0xa8
+'dwinj',    # 0xa9
+'dwinh',    # 0xaa
+'dwid',    # 0xab
+'dwil',    # 0xac
+'dwilg',    # 0xad
+'dwilm',    # 0xae
+'dwilb',    # 0xaf
+'dwils',    # 0xb0
+'dwilt',    # 0xb1
+'dwilp',    # 0xb2
+'dwilh',    # 0xb3
+'dwim',    # 0xb4
+'dwib',    # 0xb5
+'dwibs',    # 0xb6
+'dwis',    # 0xb7
+'dwiss',    # 0xb8
+'dwing',    # 0xb9
+'dwij',    # 0xba
+'dwic',    # 0xbb
+'dwik',    # 0xbc
+'dwit',    # 0xbd
+'dwip',    # 0xbe
+'dwih',    # 0xbf
+'dyu',    # 0xc0
+'dyug',    # 0xc1
+'dyugg',    # 0xc2
+'dyugs',    # 0xc3
+'dyun',    # 0xc4
+'dyunj',    # 0xc5
+'dyunh',    # 0xc6
+'dyud',    # 0xc7
+'dyul',    # 0xc8
+'dyulg',    # 0xc9
+'dyulm',    # 0xca
+'dyulb',    # 0xcb
+'dyuls',    # 0xcc
+'dyult',    # 0xcd
+'dyulp',    # 0xce
+'dyulh',    # 0xcf
+'dyum',    # 0xd0
+'dyub',    # 0xd1
+'dyubs',    # 0xd2
+'dyus',    # 0xd3
+'dyuss',    # 0xd4
+'dyung',    # 0xd5
+'dyuj',    # 0xd6
+'dyuc',    # 0xd7
+'dyuk',    # 0xd8
+'dyut',    # 0xd9
+'dyup',    # 0xda
+'dyuh',    # 0xdb
+'deu',    # 0xdc
+'deug',    # 0xdd
+'deugg',    # 0xde
+'deugs',    # 0xdf
+'deun',    # 0xe0
+'deunj',    # 0xe1
+'deunh',    # 0xe2
+'deud',    # 0xe3
+'deul',    # 0xe4
+'deulg',    # 0xe5
+'deulm',    # 0xe6
+'deulb',    # 0xe7
+'deuls',    # 0xe8
+'deult',    # 0xe9
+'deulp',    # 0xea
+'deulh',    # 0xeb
+'deum',    # 0xec
+'deub',    # 0xed
+'deubs',    # 0xee
+'deus',    # 0xef
+'deuss',    # 0xf0
+'deung',    # 0xf1
+'deuj',    # 0xf2
+'deuc',    # 0xf3
+'deuk',    # 0xf4
+'deut',    # 0xf5
+'deup',    # 0xf6
+'deuh',    # 0xf7
+'dyi',    # 0xf8
+'dyig',    # 0xf9
+'dyigg',    # 0xfa
+'dyigs',    # 0xfb
+'dyin',    # 0xfc
+'dyinj',    # 0xfd
+'dyinh',    # 0xfe
+'dyid',    # 0xff
+)
diff --git a/lib/unidecode/x0b5.py b/lib/unidecode/x0b5.py
new file mode 100644
index 00000000..9d4de3df
--- /dev/null
+++ b/lib/unidecode/x0b5.py
@@ -0,0 +1,258 @@
+data = (
+'dyil',    # 0x00
+'dyilg',    # 0x01
+'dyilm',    # 0x02
+'dyilb',    # 0x03
+'dyils',    # 0x04
+'dyilt',    # 0x05
+'dyilp',    # 0x06
+'dyilh',    # 0x07
+'dyim',    # 0x08
+'dyib',    # 0x09
+'dyibs',    # 0x0a
+'dyis',    # 0x0b
+'dyiss',    # 0x0c
+'dying',    # 0x0d
+'dyij',    # 0x0e
+'dyic',    # 0x0f
+'dyik',    # 0x10
+'dyit',    # 0x11
+'dyip',    # 0x12
+'dyih',    # 0x13
+'di',    # 0x14
+'dig',    # 0x15
+'digg',    # 0x16
+'digs',    # 0x17
+'din',    # 0x18
+'dinj',    # 0x19
+'dinh',    # 0x1a
+'did',    # 0x1b
+'dil',    # 0x1c
+'dilg',    # 0x1d
+'dilm',    # 0x1e
+'dilb',    # 0x1f
+'dils',    # 0x20
+'dilt',    # 0x21
+'dilp',    # 0x22
+'dilh',    # 0x23
+'dim',    # 0x24
+'dib',    # 0x25
+'dibs',    # 0x26
+'dis',    # 0x27
+'diss',    # 0x28
+'ding',    # 0x29
+'dij',    # 0x2a
+'dic',    # 0x2b
+'dik',    # 0x2c
+'dit',    # 0x2d
+'dip',    # 0x2e
+'dih',    # 0x2f
+'dda',    # 0x30
+'ddag',    # 0x31
+'ddagg',    # 0x32
+'ddags',    # 0x33
+'ddan',    # 0x34
+'ddanj',    # 0x35
+'ddanh',    # 0x36
+'ddad',    # 0x37
+'ddal',    # 0x38
+'ddalg',    # 0x39
+'ddalm',    # 0x3a
+'ddalb',    # 0x3b
+'ddals',    # 0x3c
+'ddalt',    # 0x3d
+'ddalp',    # 0x3e
+'ddalh',    # 0x3f
+'ddam',    # 0x40
+'ddab',    # 0x41
+'ddabs',    # 0x42
+'ddas',    # 0x43
+'ddass',    # 0x44
+'ddang',    # 0x45
+'ddaj',    # 0x46
+'ddac',    # 0x47
+'ddak',    # 0x48
+'ddat',    # 0x49
+'ddap',    # 0x4a
+'ddah',    # 0x4b
+'ddae',    # 0x4c
+'ddaeg',    # 0x4d
+'ddaegg',    # 0x4e
+'ddaegs',    # 0x4f
+'ddaen',    # 0x50
+'ddaenj',    # 0x51
+'ddaenh',    # 0x52
+'ddaed',    # 0x53
+'ddael',    # 0x54
+'ddaelg',    # 0x55
+'ddaelm',    # 0x56
+'ddaelb',    # 0x57
+'ddaels',    # 0x58
+'ddaelt',    # 0x59
+'ddaelp',    # 0x5a
+'ddaelh',    # 0x5b
+'ddaem',    # 0x5c
+'ddaeb',    # 0x5d
+'ddaebs',    # 0x5e
+'ddaes',    # 0x5f
+'ddaess',    # 0x60
+'ddaeng',    # 0x61
+'ddaej',    # 0x62
+'ddaec',    # 0x63
+'ddaek',    # 0x64
+'ddaet',    # 0x65
+'ddaep',    # 0x66
+'ddaeh',    # 0x67
+'ddya',    # 0x68
+'ddyag',    # 0x69
+'ddyagg',    # 0x6a
+'ddyags',    # 0x6b
+'ddyan',    # 0x6c
+'ddyanj',    # 0x6d
+'ddyanh',    # 0x6e
+'ddyad',    # 0x6f
+'ddyal',    # 0x70
+'ddyalg',    # 0x71
+'ddyalm',    # 0x72
+'ddyalb',    # 0x73
+'ddyals',    # 0x74
+'ddyalt',    # 0x75
+'ddyalp',    # 0x76
+'ddyalh',    # 0x77
+'ddyam',    # 0x78
+'ddyab',    # 0x79
+'ddyabs',    # 0x7a
+'ddyas',    # 0x7b
+'ddyass',    # 0x7c
+'ddyang',    # 0x7d
+'ddyaj',    # 0x7e
+'ddyac',    # 0x7f
+'ddyak',    # 0x80
+'ddyat',    # 0x81
+'ddyap',    # 0x82
+'ddyah',    # 0x83
+'ddyae',    # 0x84
+'ddyaeg',    # 0x85
+'ddyaegg',    # 0x86
+'ddyaegs',    # 0x87
+'ddyaen',    # 0x88
+'ddyaenj',    # 0x89
+'ddyaenh',    # 0x8a
+'ddyaed',    # 0x8b
+'ddyael',    # 0x8c
+'ddyaelg',    # 0x8d
+'ddyaelm',    # 0x8e
+'ddyaelb',    # 0x8f
+'ddyaels',    # 0x90
+'ddyaelt',    # 0x91
+'ddyaelp',    # 0x92
+'ddyaelh',    # 0x93
+'ddyaem',    # 0x94
+'ddyaeb',    # 0x95
+'ddyaebs',    # 0x96
+'ddyaes',    # 0x97
+'ddyaess',    # 0x98
+'ddyaeng',    # 0x99
+'ddyaej',    # 0x9a
+'ddyaec',    # 0x9b
+'ddyaek',    # 0x9c
+'ddyaet',    # 0x9d
+'ddyaep',    # 0x9e
+'ddyaeh',    # 0x9f
+'ddeo',    # 0xa0
+'ddeog',    # 0xa1
+'ddeogg',    # 0xa2
+'ddeogs',    # 0xa3
+'ddeon',    # 0xa4
+'ddeonj',    # 0xa5
+'ddeonh',    # 0xa6
+'ddeod',    # 0xa7
+'ddeol',    # 0xa8
+'ddeolg',    # 0xa9
+'ddeolm',    # 0xaa
+'ddeolb',    # 0xab
+'ddeols',    # 0xac
+'ddeolt',    # 0xad
+'ddeolp',    # 0xae
+'ddeolh',    # 0xaf
+'ddeom',    # 0xb0
+'ddeob',    # 0xb1
+'ddeobs',    # 0xb2
+'ddeos',    # 0xb3
+'ddeoss',    # 0xb4
+'ddeong',    # 0xb5
+'ddeoj',    # 0xb6
+'ddeoc',    # 0xb7
+'ddeok',    # 0xb8
+'ddeot',    # 0xb9
+'ddeop',    # 0xba
+'ddeoh',    # 0xbb
+'dde',    # 0xbc
+'ddeg',    # 0xbd
+'ddegg',    # 0xbe
+'ddegs',    # 0xbf
+'dden',    # 0xc0
+'ddenj',    # 0xc1
+'ddenh',    # 0xc2
+'dded',    # 0xc3
+'ddel',    # 0xc4
+'ddelg',    # 0xc5
+'ddelm',    # 0xc6
+'ddelb',    # 0xc7
+'ddels',    # 0xc8
+'ddelt',    # 0xc9
+'ddelp',    # 0xca
+'ddelh',    # 0xcb
+'ddem',    # 0xcc
+'ddeb',    # 0xcd
+'ddebs',    # 0xce
+'ddes',    # 0xcf
+'ddess',    # 0xd0
+'ddeng',    # 0xd1
+'ddej',    # 0xd2
+'ddec',    # 0xd3
+'ddek',    # 0xd4
+'ddet',    # 0xd5
+'ddep',    # 0xd6
+'ddeh',    # 0xd7
+'ddyeo',    # 0xd8
+'ddyeog',    # 0xd9
+'ddyeogg',    # 0xda
+'ddyeogs',    # 0xdb
+'ddyeon',    # 0xdc
+'ddyeonj',    # 0xdd
+'ddyeonh',    # 0xde
+'ddyeod',    # 0xdf
+'ddyeol',    # 0xe0
+'ddyeolg',    # 0xe1
+'ddyeolm',    # 0xe2
+'ddyeolb',    # 0xe3
+'ddyeols',    # 0xe4
+'ddyeolt',    # 0xe5
+'ddyeolp',    # 0xe6
+'ddyeolh',    # 0xe7
+'ddyeom',    # 0xe8
+'ddyeob',    # 0xe9
+'ddyeobs',    # 0xea
+'ddyeos',    # 0xeb
+'ddyeoss',    # 0xec
+'ddyeong',    # 0xed
+'ddyeoj',    # 0xee
+'ddyeoc',    # 0xef
+'ddyeok',    # 0xf0
+'ddyeot',    # 0xf1
+'ddyeop',    # 0xf2
+'ddyeoh',    # 0xf3
+'ddye',    # 0xf4
+'ddyeg',    # 0xf5
+'ddyegg',    # 0xf6
+'ddyegs',    # 0xf7
+'ddyen',    # 0xf8
+'ddyenj',    # 0xf9
+'ddyenh',    # 0xfa
+'ddyed',    # 0xfb
+'ddyel',    # 0xfc
+'ddyelg',    # 0xfd
+'ddyelm',    # 0xfe
+'ddyelb',    # 0xff
+)
diff --git a/lib/unidecode/x0b6.py b/lib/unidecode/x0b6.py
new file mode 100644
index 00000000..2800e3bc
--- /dev/null
+++ b/lib/unidecode/x0b6.py
@@ -0,0 +1,258 @@
+data = (
+'ddyels',    # 0x00
+'ddyelt',    # 0x01
+'ddyelp',    # 0x02
+'ddyelh',    # 0x03
+'ddyem',    # 0x04
+'ddyeb',    # 0x05
+'ddyebs',    # 0x06
+'ddyes',    # 0x07
+'ddyess',    # 0x08
+'ddyeng',    # 0x09
+'ddyej',    # 0x0a
+'ddyec',    # 0x0b
+'ddyek',    # 0x0c
+'ddyet',    # 0x0d
+'ddyep',    # 0x0e
+'ddyeh',    # 0x0f
+'ddo',    # 0x10
+'ddog',    # 0x11
+'ddogg',    # 0x12
+'ddogs',    # 0x13
+'ddon',    # 0x14
+'ddonj',    # 0x15
+'ddonh',    # 0x16
+'ddod',    # 0x17
+'ddol',    # 0x18
+'ddolg',    # 0x19
+'ddolm',    # 0x1a
+'ddolb',    # 0x1b
+'ddols',    # 0x1c
+'ddolt',    # 0x1d
+'ddolp',    # 0x1e
+'ddolh',    # 0x1f
+'ddom',    # 0x20
+'ddob',    # 0x21
+'ddobs',    # 0x22
+'ddos',    # 0x23
+'ddoss',    # 0x24
+'ddong',    # 0x25
+'ddoj',    # 0x26
+'ddoc',    # 0x27
+'ddok',    # 0x28
+'ddot',    # 0x29
+'ddop',    # 0x2a
+'ddoh',    # 0x2b
+'ddwa',    # 0x2c
+'ddwag',    # 0x2d
+'ddwagg',    # 0x2e
+'ddwags',    # 0x2f
+'ddwan',    # 0x30
+'ddwanj',    # 0x31
+'ddwanh',    # 0x32
+'ddwad',    # 0x33
+'ddwal',    # 0x34
+'ddwalg',    # 0x35
+'ddwalm',    # 0x36
+'ddwalb',    # 0x37
+'ddwals',    # 0x38
+'ddwalt',    # 0x39
+'ddwalp',    # 0x3a
+'ddwalh',    # 0x3b
+'ddwam',    # 0x3c
+'ddwab',    # 0x3d
+'ddwabs',    # 0x3e
+'ddwas',    # 0x3f
+'ddwass',    # 0x40
+'ddwang',    # 0x41
+'ddwaj',    # 0x42
+'ddwac',    # 0x43
+'ddwak',    # 0x44
+'ddwat',    # 0x45
+'ddwap',    # 0x46
+'ddwah',    # 0x47
+'ddwae',    # 0x48
+'ddwaeg',    # 0x49
+'ddwaegg',    # 0x4a
+'ddwaegs',    # 0x4b
+'ddwaen',    # 0x4c
+'ddwaenj',    # 0x4d
+'ddwaenh',    # 0x4e
+'ddwaed',    # 0x4f
+'ddwael',    # 0x50
+'ddwaelg',    # 0x51
+'ddwaelm',    # 0x52
+'ddwaelb',    # 0x53
+'ddwaels',    # 0x54
+'ddwaelt',    # 0x55
+'ddwaelp',    # 0x56
+'ddwaelh',    # 0x57
+'ddwaem',    # 0x58
+'ddwaeb',    # 0x59
+'ddwaebs',    # 0x5a
+'ddwaes',    # 0x5b
+'ddwaess',    # 0x5c
+'ddwaeng',    # 0x5d
+'ddwaej',    # 0x5e
+'ddwaec',    # 0x5f
+'ddwaek',    # 0x60
+'ddwaet',    # 0x61
+'ddwaep',    # 0x62
+'ddwaeh',    # 0x63
+'ddoe',    # 0x64
+'ddoeg',    # 0x65
+'ddoegg',    # 0x66
+'ddoegs',    # 0x67
+'ddoen',    # 0x68
+'ddoenj',    # 0x69
+'ddoenh',    # 0x6a
+'ddoed',    # 0x6b
+'ddoel',    # 0x6c
+'ddoelg',    # 0x6d
+'ddoelm',    # 0x6e
+'ddoelb',    # 0x6f
+'ddoels',    # 0x70
+'ddoelt',    # 0x71
+'ddoelp',    # 0x72
+'ddoelh',    # 0x73
+'ddoem',    # 0x74
+'ddoeb',    # 0x75
+'ddoebs',    # 0x76
+'ddoes',    # 0x77
+'ddoess',    # 0x78
+'ddoeng',    # 0x79
+'ddoej',    # 0x7a
+'ddoec',    # 0x7b
+'ddoek',    # 0x7c
+'ddoet',    # 0x7d
+'ddoep',    # 0x7e
+'ddoeh',    # 0x7f
+'ddyo',    # 0x80
+'ddyog',    # 0x81
+'ddyogg',    # 0x82
+'ddyogs',    # 0x83
+'ddyon',    # 0x84
+'ddyonj',    # 0x85
+'ddyonh',    # 0x86
+'ddyod',    # 0x87
+'ddyol',    # 0x88
+'ddyolg',    # 0x89
+'ddyolm',    # 0x8a
+'ddyolb',    # 0x8b
+'ddyols',    # 0x8c
+'ddyolt',    # 0x8d
+'ddyolp',    # 0x8e
+'ddyolh',    # 0x8f
+'ddyom',    # 0x90
+'ddyob',    # 0x91
+'ddyobs',    # 0x92
+'ddyos',    # 0x93
+'ddyoss',    # 0x94
+'ddyong',    # 0x95
+'ddyoj',    # 0x96
+'ddyoc',    # 0x97
+'ddyok',    # 0x98
+'ddyot',    # 0x99
+'ddyop',    # 0x9a
+'ddyoh',    # 0x9b
+'ddu',    # 0x9c
+'ddug',    # 0x9d
+'ddugg',    # 0x9e
+'ddugs',    # 0x9f
+'ddun',    # 0xa0
+'ddunj',    # 0xa1
+'ddunh',    # 0xa2
+'ddud',    # 0xa3
+'ddul',    # 0xa4
+'ddulg',    # 0xa5
+'ddulm',    # 0xa6
+'ddulb',    # 0xa7
+'dduls',    # 0xa8
+'ddult',    # 0xa9
+'ddulp',    # 0xaa
+'ddulh',    # 0xab
+'ddum',    # 0xac
+'ddub',    # 0xad
+'ddubs',    # 0xae
+'ddus',    # 0xaf
+'dduss',    # 0xb0
+'ddung',    # 0xb1
+'dduj',    # 0xb2
+'dduc',    # 0xb3
+'dduk',    # 0xb4
+'ddut',    # 0xb5
+'ddup',    # 0xb6
+'dduh',    # 0xb7
+'ddweo',    # 0xb8
+'ddweog',    # 0xb9
+'ddweogg',    # 0xba
+'ddweogs',    # 0xbb
+'ddweon',    # 0xbc
+'ddweonj',    # 0xbd
+'ddweonh',    # 0xbe
+'ddweod',    # 0xbf
+'ddweol',    # 0xc0
+'ddweolg',    # 0xc1
+'ddweolm',    # 0xc2
+'ddweolb',    # 0xc3
+'ddweols',    # 0xc4
+'ddweolt',    # 0xc5
+'ddweolp',    # 0xc6
+'ddweolh',    # 0xc7
+'ddweom',    # 0xc8
+'ddweob',    # 0xc9
+'ddweobs',    # 0xca
+'ddweos',    # 0xcb
+'ddweoss',    # 0xcc
+'ddweong',    # 0xcd
+'ddweoj',    # 0xce
+'ddweoc',    # 0xcf
+'ddweok',    # 0xd0
+'ddweot',    # 0xd1
+'ddweop',    # 0xd2
+'ddweoh',    # 0xd3
+'ddwe',    # 0xd4
+'ddweg',    # 0xd5
+'ddwegg',    # 0xd6
+'ddwegs',    # 0xd7
+'ddwen',    # 0xd8
+'ddwenj',    # 0xd9
+'ddwenh',    # 0xda
+'ddwed',    # 0xdb
+'ddwel',    # 0xdc
+'ddwelg',    # 0xdd
+'ddwelm',    # 0xde
+'ddwelb',    # 0xdf
+'ddwels',    # 0xe0
+'ddwelt',    # 0xe1
+'ddwelp',    # 0xe2
+'ddwelh',    # 0xe3
+'ddwem',    # 0xe4
+'ddweb',    # 0xe5
+'ddwebs',    # 0xe6
+'ddwes',    # 0xe7
+'ddwess',    # 0xe8
+'ddweng',    # 0xe9
+'ddwej',    # 0xea
+'ddwec',    # 0xeb
+'ddwek',    # 0xec
+'ddwet',    # 0xed
+'ddwep',    # 0xee
+'ddweh',    # 0xef
+'ddwi',    # 0xf0
+'ddwig',    # 0xf1
+'ddwigg',    # 0xf2
+'ddwigs',    # 0xf3
+'ddwin',    # 0xf4
+'ddwinj',    # 0xf5
+'ddwinh',    # 0xf6
+'ddwid',    # 0xf7
+'ddwil',    # 0xf8
+'ddwilg',    # 0xf9
+'ddwilm',    # 0xfa
+'ddwilb',    # 0xfb
+'ddwils',    # 0xfc
+'ddwilt',    # 0xfd
+'ddwilp',    # 0xfe
+'ddwilh',    # 0xff
+)
diff --git a/lib/unidecode/x0b7.py b/lib/unidecode/x0b7.py
new file mode 100644
index 00000000..483dddeb
--- /dev/null
+++ b/lib/unidecode/x0b7.py
@@ -0,0 +1,258 @@
+data = (
+'ddwim',    # 0x00
+'ddwib',    # 0x01
+'ddwibs',    # 0x02
+'ddwis',    # 0x03
+'ddwiss',    # 0x04
+'ddwing',    # 0x05
+'ddwij',    # 0x06
+'ddwic',    # 0x07
+'ddwik',    # 0x08
+'ddwit',    # 0x09
+'ddwip',    # 0x0a
+'ddwih',    # 0x0b
+'ddyu',    # 0x0c
+'ddyug',    # 0x0d
+'ddyugg',    # 0x0e
+'ddyugs',    # 0x0f
+'ddyun',    # 0x10
+'ddyunj',    # 0x11
+'ddyunh',    # 0x12
+'ddyud',    # 0x13
+'ddyul',    # 0x14
+'ddyulg',    # 0x15
+'ddyulm',    # 0x16
+'ddyulb',    # 0x17
+'ddyuls',    # 0x18
+'ddyult',    # 0x19
+'ddyulp',    # 0x1a
+'ddyulh',    # 0x1b
+'ddyum',    # 0x1c
+'ddyub',    # 0x1d
+'ddyubs',    # 0x1e
+'ddyus',    # 0x1f
+'ddyuss',    # 0x20
+'ddyung',    # 0x21
+'ddyuj',    # 0x22
+'ddyuc',    # 0x23
+'ddyuk',    # 0x24
+'ddyut',    # 0x25
+'ddyup',    # 0x26
+'ddyuh',    # 0x27
+'ddeu',    # 0x28
+'ddeug',    # 0x29
+'ddeugg',    # 0x2a
+'ddeugs',    # 0x2b
+'ddeun',    # 0x2c
+'ddeunj',    # 0x2d
+'ddeunh',    # 0x2e
+'ddeud',    # 0x2f
+'ddeul',    # 0x30
+'ddeulg',    # 0x31
+'ddeulm',    # 0x32
+'ddeulb',    # 0x33
+'ddeuls',    # 0x34
+'ddeult',    # 0x35
+'ddeulp',    # 0x36
+'ddeulh',    # 0x37
+'ddeum',    # 0x38
+'ddeub',    # 0x39
+'ddeubs',    # 0x3a
+'ddeus',    # 0x3b
+'ddeuss',    # 0x3c
+'ddeung',    # 0x3d
+'ddeuj',    # 0x3e
+'ddeuc',    # 0x3f
+'ddeuk',    # 0x40
+'ddeut',    # 0x41
+'ddeup',    # 0x42
+'ddeuh',    # 0x43
+'ddyi',    # 0x44
+'ddyig',    # 0x45
+'ddyigg',    # 0x46
+'ddyigs',    # 0x47
+'ddyin',    # 0x48
+'ddyinj',    # 0x49
+'ddyinh',    # 0x4a
+'ddyid',    # 0x4b
+'ddyil',    # 0x4c
+'ddyilg',    # 0x4d
+'ddyilm',    # 0x4e
+'ddyilb',    # 0x4f
+'ddyils',    # 0x50
+'ddyilt',    # 0x51
+'ddyilp',    # 0x52
+'ddyilh',    # 0x53
+'ddyim',    # 0x54
+'ddyib',    # 0x55
+'ddyibs',    # 0x56
+'ddyis',    # 0x57
+'ddyiss',    # 0x58
+'ddying',    # 0x59
+'ddyij',    # 0x5a
+'ddyic',    # 0x5b
+'ddyik',    # 0x5c
+'ddyit',    # 0x5d
+'ddyip',    # 0x5e
+'ddyih',    # 0x5f
+'ddi',    # 0x60
+'ddig',    # 0x61
+'ddigg',    # 0x62
+'ddigs',    # 0x63
+'ddin',    # 0x64
+'ddinj',    # 0x65
+'ddinh',    # 0x66
+'ddid',    # 0x67
+'ddil',    # 0x68
+'ddilg',    # 0x69
+'ddilm',    # 0x6a
+'ddilb',    # 0x6b
+'ddils',    # 0x6c
+'ddilt',    # 0x6d
+'ddilp',    # 0x6e
+'ddilh',    # 0x6f
+'ddim',    # 0x70
+'ddib',    # 0x71
+'ddibs',    # 0x72
+'ddis',    # 0x73
+'ddiss',    # 0x74
+'dding',    # 0x75
+'ddij',    # 0x76
+'ddic',    # 0x77
+'ddik',    # 0x78
+'ddit',    # 0x79
+'ddip',    # 0x7a
+'ddih',    # 0x7b
+'ra',    # 0x7c
+'rag',    # 0x7d
+'ragg',    # 0x7e
+'rags',    # 0x7f
+'ran',    # 0x80
+'ranj',    # 0x81
+'ranh',    # 0x82
+'rad',    # 0x83
+'ral',    # 0x84
+'ralg',    # 0x85
+'ralm',    # 0x86
+'ralb',    # 0x87
+'rals',    # 0x88
+'ralt',    # 0x89
+'ralp',    # 0x8a
+'ralh',    # 0x8b
+'ram',    # 0x8c
+'rab',    # 0x8d
+'rabs',    # 0x8e
+'ras',    # 0x8f
+'rass',    # 0x90
+'rang',    # 0x91
+'raj',    # 0x92
+'rac',    # 0x93
+'rak',    # 0x94
+'rat',    # 0x95
+'rap',    # 0x96
+'rah',    # 0x97
+'rae',    # 0x98
+'raeg',    # 0x99
+'raegg',    # 0x9a
+'raegs',    # 0x9b
+'raen',    # 0x9c
+'raenj',    # 0x9d
+'raenh',    # 0x9e
+'raed',    # 0x9f
+'rael',    # 0xa0
+'raelg',    # 0xa1
+'raelm',    # 0xa2
+'raelb',    # 0xa3
+'raels',    # 0xa4
+'raelt',    # 0xa5
+'raelp',    # 0xa6
+'raelh',    # 0xa7
+'raem',    # 0xa8
+'raeb',    # 0xa9
+'raebs',    # 0xaa
+'raes',    # 0xab
+'raess',    # 0xac
+'raeng',    # 0xad
+'raej',    # 0xae
+'raec',    # 0xaf
+'raek',    # 0xb0
+'raet',    # 0xb1
+'raep',    # 0xb2
+'raeh',    # 0xb3
+'rya',    # 0xb4
+'ryag',    # 0xb5
+'ryagg',    # 0xb6
+'ryags',    # 0xb7
+'ryan',    # 0xb8
+'ryanj',    # 0xb9
+'ryanh',    # 0xba
+'ryad',    # 0xbb
+'ryal',    # 0xbc
+'ryalg',    # 0xbd
+'ryalm',    # 0xbe
+'ryalb',    # 0xbf
+'ryals',    # 0xc0
+'ryalt',    # 0xc1
+'ryalp',    # 0xc2
+'ryalh',    # 0xc3
+'ryam',    # 0xc4
+'ryab',    # 0xc5
+'ryabs',    # 0xc6
+'ryas',    # 0xc7
+'ryass',    # 0xc8
+'ryang',    # 0xc9
+'ryaj',    # 0xca
+'ryac',    # 0xcb
+'ryak',    # 0xcc
+'ryat',    # 0xcd
+'ryap',    # 0xce
+'ryah',    # 0xcf
+'ryae',    # 0xd0
+'ryaeg',    # 0xd1
+'ryaegg',    # 0xd2
+'ryaegs',    # 0xd3
+'ryaen',    # 0xd4
+'ryaenj',    # 0xd5
+'ryaenh',    # 0xd6
+'ryaed',    # 0xd7
+'ryael',    # 0xd8
+'ryaelg',    # 0xd9
+'ryaelm',    # 0xda
+'ryaelb',    # 0xdb
+'ryaels',    # 0xdc
+'ryaelt',    # 0xdd
+'ryaelp',    # 0xde
+'ryaelh',    # 0xdf
+'ryaem',    # 0xe0
+'ryaeb',    # 0xe1
+'ryaebs',    # 0xe2
+'ryaes',    # 0xe3
+'ryaess',    # 0xe4
+'ryaeng',    # 0xe5
+'ryaej',    # 0xe6
+'ryaec',    # 0xe7
+'ryaek',    # 0xe8
+'ryaet',    # 0xe9
+'ryaep',    # 0xea
+'ryaeh',    # 0xeb
+'reo',    # 0xec
+'reog',    # 0xed
+'reogg',    # 0xee
+'reogs',    # 0xef
+'reon',    # 0xf0
+'reonj',    # 0xf1
+'reonh',    # 0xf2
+'reod',    # 0xf3
+'reol',    # 0xf4
+'reolg',    # 0xf5
+'reolm',    # 0xf6
+'reolb',    # 0xf7
+'reols',    # 0xf8
+'reolt',    # 0xf9
+'reolp',    # 0xfa
+'reolh',    # 0xfb
+'reom',    # 0xfc
+'reob',    # 0xfd
+'reobs',    # 0xfe
+'reos',    # 0xff
+)
diff --git a/lib/unidecode/x0b8.py b/lib/unidecode/x0b8.py
new file mode 100644
index 00000000..5c845ebc
--- /dev/null
+++ b/lib/unidecode/x0b8.py
@@ -0,0 +1,258 @@
+data = (
+'reoss',    # 0x00
+'reong',    # 0x01
+'reoj',    # 0x02
+'reoc',    # 0x03
+'reok',    # 0x04
+'reot',    # 0x05
+'reop',    # 0x06
+'reoh',    # 0x07
+'re',    # 0x08
+'reg',    # 0x09
+'regg',    # 0x0a
+'regs',    # 0x0b
+'ren',    # 0x0c
+'renj',    # 0x0d
+'renh',    # 0x0e
+'red',    # 0x0f
+'rel',    # 0x10
+'relg',    # 0x11
+'relm',    # 0x12
+'relb',    # 0x13
+'rels',    # 0x14
+'relt',    # 0x15
+'relp',    # 0x16
+'relh',    # 0x17
+'rem',    # 0x18
+'reb',    # 0x19
+'rebs',    # 0x1a
+'res',    # 0x1b
+'ress',    # 0x1c
+'reng',    # 0x1d
+'rej',    # 0x1e
+'rec',    # 0x1f
+'rek',    # 0x20
+'ret',    # 0x21
+'rep',    # 0x22
+'reh',    # 0x23
+'ryeo',    # 0x24
+'ryeog',    # 0x25
+'ryeogg',    # 0x26
+'ryeogs',    # 0x27
+'ryeon',    # 0x28
+'ryeonj',    # 0x29
+'ryeonh',    # 0x2a
+'ryeod',    # 0x2b
+'ryeol',    # 0x2c
+'ryeolg',    # 0x2d
+'ryeolm',    # 0x2e
+'ryeolb',    # 0x2f
+'ryeols',    # 0x30
+'ryeolt',    # 0x31
+'ryeolp',    # 0x32
+'ryeolh',    # 0x33
+'ryeom',    # 0x34
+'ryeob',    # 0x35
+'ryeobs',    # 0x36
+'ryeos',    # 0x37
+'ryeoss',    # 0x38
+'ryeong',    # 0x39
+'ryeoj',    # 0x3a
+'ryeoc',    # 0x3b
+'ryeok',    # 0x3c
+'ryeot',    # 0x3d
+'ryeop',    # 0x3e
+'ryeoh',    # 0x3f
+'rye',    # 0x40
+'ryeg',    # 0x41
+'ryegg',    # 0x42
+'ryegs',    # 0x43
+'ryen',    # 0x44
+'ryenj',    # 0x45
+'ryenh',    # 0x46
+'ryed',    # 0x47
+'ryel',    # 0x48
+'ryelg',    # 0x49
+'ryelm',    # 0x4a
+'ryelb',    # 0x4b
+'ryels',    # 0x4c
+'ryelt',    # 0x4d
+'ryelp',    # 0x4e
+'ryelh',    # 0x4f
+'ryem',    # 0x50
+'ryeb',    # 0x51
+'ryebs',    # 0x52
+'ryes',    # 0x53
+'ryess',    # 0x54
+'ryeng',    # 0x55
+'ryej',    # 0x56
+'ryec',    # 0x57
+'ryek',    # 0x58
+'ryet',    # 0x59
+'ryep',    # 0x5a
+'ryeh',    # 0x5b
+'ro',    # 0x5c
+'rog',    # 0x5d
+'rogg',    # 0x5e
+'rogs',    # 0x5f
+'ron',    # 0x60
+'ronj',    # 0x61
+'ronh',    # 0x62
+'rod',    # 0x63
+'rol',    # 0x64
+'rolg',    # 0x65
+'rolm',    # 0x66
+'rolb',    # 0x67
+'rols',    # 0x68
+'rolt',    # 0x69
+'rolp',    # 0x6a
+'rolh',    # 0x6b
+'rom',    # 0x6c
+'rob',    # 0x6d
+'robs',    # 0x6e
+'ros',    # 0x6f
+'ross',    # 0x70
+'rong',    # 0x71
+'roj',    # 0x72
+'roc',    # 0x73
+'rok',    # 0x74
+'rot',    # 0x75
+'rop',    # 0x76
+'roh',    # 0x77
+'rwa',    # 0x78
+'rwag',    # 0x79
+'rwagg',    # 0x7a
+'rwags',    # 0x7b
+'rwan',    # 0x7c
+'rwanj',    # 0x7d
+'rwanh',    # 0x7e
+'rwad',    # 0x7f
+'rwal',    # 0x80
+'rwalg',    # 0x81
+'rwalm',    # 0x82
+'rwalb',    # 0x83
+'rwals',    # 0x84
+'rwalt',    # 0x85
+'rwalp',    # 0x86
+'rwalh',    # 0x87
+'rwam',    # 0x88
+'rwab',    # 0x89
+'rwabs',    # 0x8a
+'rwas',    # 0x8b
+'rwass',    # 0x8c
+'rwang',    # 0x8d
+'rwaj',    # 0x8e
+'rwac',    # 0x8f
+'rwak',    # 0x90
+'rwat',    # 0x91
+'rwap',    # 0x92
+'rwah',    # 0x93
+'rwae',    # 0x94
+'rwaeg',    # 0x95
+'rwaegg',    # 0x96
+'rwaegs',    # 0x97
+'rwaen',    # 0x98
+'rwaenj',    # 0x99
+'rwaenh',    # 0x9a
+'rwaed',    # 0x9b
+'rwael',    # 0x9c
+'rwaelg',    # 0x9d
+'rwaelm',    # 0x9e
+'rwaelb',    # 0x9f
+'rwaels',    # 0xa0
+'rwaelt',    # 0xa1
+'rwaelp',    # 0xa2
+'rwaelh',    # 0xa3
+'rwaem',    # 0xa4
+'rwaeb',    # 0xa5
+'rwaebs',    # 0xa6
+'rwaes',    # 0xa7
+'rwaess',    # 0xa8
+'rwaeng',    # 0xa9
+'rwaej',    # 0xaa
+'rwaec',    # 0xab
+'rwaek',    # 0xac
+'rwaet',    # 0xad
+'rwaep',    # 0xae
+'rwaeh',    # 0xaf
+'roe',    # 0xb0
+'roeg',    # 0xb1
+'roegg',    # 0xb2
+'roegs',    # 0xb3
+'roen',    # 0xb4
+'roenj',    # 0xb5
+'roenh',    # 0xb6
+'roed',    # 0xb7
+'roel',    # 0xb8
+'roelg',    # 0xb9
+'roelm',    # 0xba
+'roelb',    # 0xbb
+'roels',    # 0xbc
+'roelt',    # 0xbd
+'roelp',    # 0xbe
+'roelh',    # 0xbf
+'roem',    # 0xc0
+'roeb',    # 0xc1
+'roebs',    # 0xc2
+'roes',    # 0xc3
+'roess',    # 0xc4
+'roeng',    # 0xc5
+'roej',    # 0xc6
+'roec',    # 0xc7
+'roek',    # 0xc8
+'roet',    # 0xc9
+'roep',    # 0xca
+'roeh',    # 0xcb
+'ryo',    # 0xcc
+'ryog',    # 0xcd
+'ryogg',    # 0xce
+'ryogs',    # 0xcf
+'ryon',    # 0xd0
+'ryonj',    # 0xd1
+'ryonh',    # 0xd2
+'ryod',    # 0xd3
+'ryol',    # 0xd4
+'ryolg',    # 0xd5
+'ryolm',    # 0xd6
+'ryolb',    # 0xd7
+'ryols',    # 0xd8
+'ryolt',    # 0xd9
+'ryolp',    # 0xda
+'ryolh',    # 0xdb
+'ryom',    # 0xdc
+'ryob',    # 0xdd
+'ryobs',    # 0xde
+'ryos',    # 0xdf
+'ryoss',    # 0xe0
+'ryong',    # 0xe1
+'ryoj',    # 0xe2
+'ryoc',    # 0xe3
+'ryok',    # 0xe4
+'ryot',    # 0xe5
+'ryop',    # 0xe6
+'ryoh',    # 0xe7
+'ru',    # 0xe8
+'rug',    # 0xe9
+'rugg',    # 0xea
+'rugs',    # 0xeb
+'run',    # 0xec
+'runj',    # 0xed
+'runh',    # 0xee
+'rud',    # 0xef
+'rul',    # 0xf0
+'rulg',    # 0xf1
+'rulm',    # 0xf2
+'rulb',    # 0xf3
+'ruls',    # 0xf4
+'rult',    # 0xf5
+'rulp',    # 0xf6
+'rulh',    # 0xf7
+'rum',    # 0xf8
+'rub',    # 0xf9
+'rubs',    # 0xfa
+'rus',    # 0xfb
+'russ',    # 0xfc
+'rung',    # 0xfd
+'ruj',    # 0xfe
+'ruc',    # 0xff
+)
diff --git a/lib/unidecode/x0b9.py b/lib/unidecode/x0b9.py
new file mode 100644
index 00000000..35340dc7
--- /dev/null
+++ b/lib/unidecode/x0b9.py
@@ -0,0 +1,258 @@
+data = (
+'ruk',    # 0x00
+'rut',    # 0x01
+'rup',    # 0x02
+'ruh',    # 0x03
+'rweo',    # 0x04
+'rweog',    # 0x05
+'rweogg',    # 0x06
+'rweogs',    # 0x07
+'rweon',    # 0x08
+'rweonj',    # 0x09
+'rweonh',    # 0x0a
+'rweod',    # 0x0b
+'rweol',    # 0x0c
+'rweolg',    # 0x0d
+'rweolm',    # 0x0e
+'rweolb',    # 0x0f
+'rweols',    # 0x10
+'rweolt',    # 0x11
+'rweolp',    # 0x12
+'rweolh',    # 0x13
+'rweom',    # 0x14
+'rweob',    # 0x15
+'rweobs',    # 0x16
+'rweos',    # 0x17
+'rweoss',    # 0x18
+'rweong',    # 0x19
+'rweoj',    # 0x1a
+'rweoc',    # 0x1b
+'rweok',    # 0x1c
+'rweot',    # 0x1d
+'rweop',    # 0x1e
+'rweoh',    # 0x1f
+'rwe',    # 0x20
+'rweg',    # 0x21
+'rwegg',    # 0x22
+'rwegs',    # 0x23
+'rwen',    # 0x24
+'rwenj',    # 0x25
+'rwenh',    # 0x26
+'rwed',    # 0x27
+'rwel',    # 0x28
+'rwelg',    # 0x29
+'rwelm',    # 0x2a
+'rwelb',    # 0x2b
+'rwels',    # 0x2c
+'rwelt',    # 0x2d
+'rwelp',    # 0x2e
+'rwelh',    # 0x2f
+'rwem',    # 0x30
+'rweb',    # 0x31
+'rwebs',    # 0x32
+'rwes',    # 0x33
+'rwess',    # 0x34
+'rweng',    # 0x35
+'rwej',    # 0x36
+'rwec',    # 0x37
+'rwek',    # 0x38
+'rwet',    # 0x39
+'rwep',    # 0x3a
+'rweh',    # 0x3b
+'rwi',    # 0x3c
+'rwig',    # 0x3d
+'rwigg',    # 0x3e
+'rwigs',    # 0x3f
+'rwin',    # 0x40
+'rwinj',    # 0x41
+'rwinh',    # 0x42
+'rwid',    # 0x43
+'rwil',    # 0x44
+'rwilg',    # 0x45
+'rwilm',    # 0x46
+'rwilb',    # 0x47
+'rwils',    # 0x48
+'rwilt',    # 0x49
+'rwilp',    # 0x4a
+'rwilh',    # 0x4b
+'rwim',    # 0x4c
+'rwib',    # 0x4d
+'rwibs',    # 0x4e
+'rwis',    # 0x4f
+'rwiss',    # 0x50
+'rwing',    # 0x51
+'rwij',    # 0x52
+'rwic',    # 0x53
+'rwik',    # 0x54
+'rwit',    # 0x55
+'rwip',    # 0x56
+'rwih',    # 0x57
+'ryu',    # 0x58
+'ryug',    # 0x59
+'ryugg',    # 0x5a
+'ryugs',    # 0x5b
+'ryun',    # 0x5c
+'ryunj',    # 0x5d
+'ryunh',    # 0x5e
+'ryud',    # 0x5f
+'ryul',    # 0x60
+'ryulg',    # 0x61
+'ryulm',    # 0x62
+'ryulb',    # 0x63
+'ryuls',    # 0x64
+'ryult',    # 0x65
+'ryulp',    # 0x66
+'ryulh',    # 0x67
+'ryum',    # 0x68
+'ryub',    # 0x69
+'ryubs',    # 0x6a
+'ryus',    # 0x6b
+'ryuss',    # 0x6c
+'ryung',    # 0x6d
+'ryuj',    # 0x6e
+'ryuc',    # 0x6f
+'ryuk',    # 0x70
+'ryut',    # 0x71
+'ryup',    # 0x72
+'ryuh',    # 0x73
+'reu',    # 0x74
+'reug',    # 0x75
+'reugg',    # 0x76
+'reugs',    # 0x77
+'reun',    # 0x78
+'reunj',    # 0x79
+'reunh',    # 0x7a
+'reud',    # 0x7b
+'reul',    # 0x7c
+'reulg',    # 0x7d
+'reulm',    # 0x7e
+'reulb',    # 0x7f
+'reuls',    # 0x80
+'reult',    # 0x81
+'reulp',    # 0x82
+'reulh',    # 0x83
+'reum',    # 0x84
+'reub',    # 0x85
+'reubs',    # 0x86
+'reus',    # 0x87
+'reuss',    # 0x88
+'reung',    # 0x89
+'reuj',    # 0x8a
+'reuc',    # 0x8b
+'reuk',    # 0x8c
+'reut',    # 0x8d
+'reup',    # 0x8e
+'reuh',    # 0x8f
+'ryi',    # 0x90
+'ryig',    # 0x91
+'ryigg',    # 0x92
+'ryigs',    # 0x93
+'ryin',    # 0x94
+'ryinj',    # 0x95
+'ryinh',    # 0x96
+'ryid',    # 0x97
+'ryil',    # 0x98
+'ryilg',    # 0x99
+'ryilm',    # 0x9a
+'ryilb',    # 0x9b
+'ryils',    # 0x9c
+'ryilt',    # 0x9d
+'ryilp',    # 0x9e
+'ryilh',    # 0x9f
+'ryim',    # 0xa0
+'ryib',    # 0xa1
+'ryibs',    # 0xa2
+'ryis',    # 0xa3
+'ryiss',    # 0xa4
+'rying',    # 0xa5
+'ryij',    # 0xa6
+'ryic',    # 0xa7
+'ryik',    # 0xa8
+'ryit',    # 0xa9
+'ryip',    # 0xaa
+'ryih',    # 0xab
+'ri',    # 0xac
+'rig',    # 0xad
+'rigg',    # 0xae
+'rigs',    # 0xaf
+'rin',    # 0xb0
+'rinj',    # 0xb1
+'rinh',    # 0xb2
+'rid',    # 0xb3
+'ril',    # 0xb4
+'rilg',    # 0xb5
+'rilm',    # 0xb6
+'rilb',    # 0xb7
+'rils',    # 0xb8
+'rilt',    # 0xb9
+'rilp',    # 0xba
+'rilh',    # 0xbb
+'rim',    # 0xbc
+'rib',    # 0xbd
+'ribs',    # 0xbe
+'ris',    # 0xbf
+'riss',    # 0xc0
+'ring',    # 0xc1
+'rij',    # 0xc2
+'ric',    # 0xc3
+'rik',    # 0xc4
+'rit',    # 0xc5
+'rip',    # 0xc6
+'rih',    # 0xc7
+'ma',    # 0xc8
+'mag',    # 0xc9
+'magg',    # 0xca
+'mags',    # 0xcb
+'man',    # 0xcc
+'manj',    # 0xcd
+'manh',    # 0xce
+'mad',    # 0xcf
+'mal',    # 0xd0
+'malg',    # 0xd1
+'malm',    # 0xd2
+'malb',    # 0xd3
+'mals',    # 0xd4
+'malt',    # 0xd5
+'malp',    # 0xd6
+'malh',    # 0xd7
+'mam',    # 0xd8
+'mab',    # 0xd9
+'mabs',    # 0xda
+'mas',    # 0xdb
+'mass',    # 0xdc
+'mang',    # 0xdd
+'maj',    # 0xde
+'mac',    # 0xdf
+'mak',    # 0xe0
+'mat',    # 0xe1
+'map',    # 0xe2
+'mah',    # 0xe3
+'mae',    # 0xe4
+'maeg',    # 0xe5
+'maegg',    # 0xe6
+'maegs',    # 0xe7
+'maen',    # 0xe8
+'maenj',    # 0xe9
+'maenh',    # 0xea
+'maed',    # 0xeb
+'mael',    # 0xec
+'maelg',    # 0xed
+'maelm',    # 0xee
+'maelb',    # 0xef
+'maels',    # 0xf0
+'maelt',    # 0xf1
+'maelp',    # 0xf2
+'maelh',    # 0xf3
+'maem',    # 0xf4
+'maeb',    # 0xf5
+'maebs',    # 0xf6
+'maes',    # 0xf7
+'maess',    # 0xf8
+'maeng',    # 0xf9
+'maej',    # 0xfa
+'maec',    # 0xfb
+'maek',    # 0xfc
+'maet',    # 0xfd
+'maep',    # 0xfe
+'maeh',    # 0xff
+)
diff --git a/lib/unidecode/x0ba.py b/lib/unidecode/x0ba.py
new file mode 100644
index 00000000..9ef82940
--- /dev/null
+++ b/lib/unidecode/x0ba.py
@@ -0,0 +1,258 @@
+data = (
+'mya',    # 0x00
+'myag',    # 0x01
+'myagg',    # 0x02
+'myags',    # 0x03
+'myan',    # 0x04
+'myanj',    # 0x05
+'myanh',    # 0x06
+'myad',    # 0x07
+'myal',    # 0x08
+'myalg',    # 0x09
+'myalm',    # 0x0a
+'myalb',    # 0x0b
+'myals',    # 0x0c
+'myalt',    # 0x0d
+'myalp',    # 0x0e
+'myalh',    # 0x0f
+'myam',    # 0x10
+'myab',    # 0x11
+'myabs',    # 0x12
+'myas',    # 0x13
+'myass',    # 0x14
+'myang',    # 0x15
+'myaj',    # 0x16
+'myac',    # 0x17
+'myak',    # 0x18
+'myat',    # 0x19
+'myap',    # 0x1a
+'myah',    # 0x1b
+'myae',    # 0x1c
+'myaeg',    # 0x1d
+'myaegg',    # 0x1e
+'myaegs',    # 0x1f
+'myaen',    # 0x20
+'myaenj',    # 0x21
+'myaenh',    # 0x22
+'myaed',    # 0x23
+'myael',    # 0x24
+'myaelg',    # 0x25
+'myaelm',    # 0x26
+'myaelb',    # 0x27
+'myaels',    # 0x28
+'myaelt',    # 0x29
+'myaelp',    # 0x2a
+'myaelh',    # 0x2b
+'myaem',    # 0x2c
+'myaeb',    # 0x2d
+'myaebs',    # 0x2e
+'myaes',    # 0x2f
+'myaess',    # 0x30
+'myaeng',    # 0x31
+'myaej',    # 0x32
+'myaec',    # 0x33
+'myaek',    # 0x34
+'myaet',    # 0x35
+'myaep',    # 0x36
+'myaeh',    # 0x37
+'meo',    # 0x38
+'meog',    # 0x39
+'meogg',    # 0x3a
+'meogs',    # 0x3b
+'meon',    # 0x3c
+'meonj',    # 0x3d
+'meonh',    # 0x3e
+'meod',    # 0x3f
+'meol',    # 0x40
+'meolg',    # 0x41
+'meolm',    # 0x42
+'meolb',    # 0x43
+'meols',    # 0x44
+'meolt',    # 0x45
+'meolp',    # 0x46
+'meolh',    # 0x47
+'meom',    # 0x48
+'meob',    # 0x49
+'meobs',    # 0x4a
+'meos',    # 0x4b
+'meoss',    # 0x4c
+'meong',    # 0x4d
+'meoj',    # 0x4e
+'meoc',    # 0x4f
+'meok',    # 0x50
+'meot',    # 0x51
+'meop',    # 0x52
+'meoh',    # 0x53
+'me',    # 0x54
+'meg',    # 0x55
+'megg',    # 0x56
+'megs',    # 0x57
+'men',    # 0x58
+'menj',    # 0x59
+'menh',    # 0x5a
+'med',    # 0x5b
+'mel',    # 0x5c
+'melg',    # 0x5d
+'melm',    # 0x5e
+'melb',    # 0x5f
+'mels',    # 0x60
+'melt',    # 0x61
+'melp',    # 0x62
+'melh',    # 0x63
+'mem',    # 0x64
+'meb',    # 0x65
+'mebs',    # 0x66
+'mes',    # 0x67
+'mess',    # 0x68
+'meng',    # 0x69
+'mej',    # 0x6a
+'mec',    # 0x6b
+'mek',    # 0x6c
+'met',    # 0x6d
+'mep',    # 0x6e
+'meh',    # 0x6f
+'myeo',    # 0x70
+'myeog',    # 0x71
+'myeogg',    # 0x72
+'myeogs',    # 0x73
+'myeon',    # 0x74
+'myeonj',    # 0x75
+'myeonh',    # 0x76
+'myeod',    # 0x77
+'myeol',    # 0x78
+'myeolg',    # 0x79
+'myeolm',    # 0x7a
+'myeolb',    # 0x7b
+'myeols',    # 0x7c
+'myeolt',    # 0x7d
+'myeolp',    # 0x7e
+'myeolh',    # 0x7f
+'myeom',    # 0x80
+'myeob',    # 0x81
+'myeobs',    # 0x82
+'myeos',    # 0x83
+'myeoss',    # 0x84
+'myeong',    # 0x85
+'myeoj',    # 0x86
+'myeoc',    # 0x87
+'myeok',    # 0x88
+'myeot',    # 0x89
+'myeop',    # 0x8a
+'myeoh',    # 0x8b
+'mye',    # 0x8c
+'myeg',    # 0x8d
+'myegg',    # 0x8e
+'myegs',    # 0x8f
+'myen',    # 0x90
+'myenj',    # 0x91
+'myenh',    # 0x92
+'myed',    # 0x93
+'myel',    # 0x94
+'myelg',    # 0x95
+'myelm',    # 0x96
+'myelb',    # 0x97
+'myels',    # 0x98
+'myelt',    # 0x99
+'myelp',    # 0x9a
+'myelh',    # 0x9b
+'myem',    # 0x9c
+'myeb',    # 0x9d
+'myebs',    # 0x9e
+'myes',    # 0x9f
+'myess',    # 0xa0
+'myeng',    # 0xa1
+'myej',    # 0xa2
+'myec',    # 0xa3
+'myek',    # 0xa4
+'myet',    # 0xa5
+'myep',    # 0xa6
+'myeh',    # 0xa7
+'mo',    # 0xa8
+'mog',    # 0xa9
+'mogg',    # 0xaa
+'mogs',    # 0xab
+'mon',    # 0xac
+'monj',    # 0xad
+'monh',    # 0xae
+'mod',    # 0xaf
+'mol',    # 0xb0
+'molg',    # 0xb1
+'molm',    # 0xb2
+'molb',    # 0xb3
+'mols',    # 0xb4
+'molt',    # 0xb5
+'molp',    # 0xb6
+'molh',    # 0xb7
+'mom',    # 0xb8
+'mob',    # 0xb9
+'mobs',    # 0xba
+'mos',    # 0xbb
+'moss',    # 0xbc
+'mong',    # 0xbd
+'moj',    # 0xbe
+'moc',    # 0xbf
+'mok',    # 0xc0
+'mot',    # 0xc1
+'mop',    # 0xc2
+'moh',    # 0xc3
+'mwa',    # 0xc4
+'mwag',    # 0xc5
+'mwagg',    # 0xc6
+'mwags',    # 0xc7
+'mwan',    # 0xc8
+'mwanj',    # 0xc9
+'mwanh',    # 0xca
+'mwad',    # 0xcb
+'mwal',    # 0xcc
+'mwalg',    # 0xcd
+'mwalm',    # 0xce
+'mwalb',    # 0xcf
+'mwals',    # 0xd0
+'mwalt',    # 0xd1
+'mwalp',    # 0xd2
+'mwalh',    # 0xd3
+'mwam',    # 0xd4
+'mwab',    # 0xd5
+'mwabs',    # 0xd6
+'mwas',    # 0xd7
+'mwass',    # 0xd8
+'mwang',    # 0xd9
+'mwaj',    # 0xda
+'mwac',    # 0xdb
+'mwak',    # 0xdc
+'mwat',    # 0xdd
+'mwap',    # 0xde
+'mwah',    # 0xdf
+'mwae',    # 0xe0
+'mwaeg',    # 0xe1
+'mwaegg',    # 0xe2
+'mwaegs',    # 0xe3
+'mwaen',    # 0xe4
+'mwaenj',    # 0xe5
+'mwaenh',    # 0xe6
+'mwaed',    # 0xe7
+'mwael',    # 0xe8
+'mwaelg',    # 0xe9
+'mwaelm',    # 0xea
+'mwaelb',    # 0xeb
+'mwaels',    # 0xec
+'mwaelt',    # 0xed
+'mwaelp',    # 0xee
+'mwaelh',    # 0xef
+'mwaem',    # 0xf0
+'mwaeb',    # 0xf1
+'mwaebs',    # 0xf2
+'mwaes',    # 0xf3
+'mwaess',    # 0xf4
+'mwaeng',    # 0xf5
+'mwaej',    # 0xf6
+'mwaec',    # 0xf7
+'mwaek',    # 0xf8
+'mwaet',    # 0xf9
+'mwaep',    # 0xfa
+'mwaeh',    # 0xfb
+'moe',    # 0xfc
+'moeg',    # 0xfd
+'moegg',    # 0xfe
+'moegs',    # 0xff
+)
diff --git a/lib/unidecode/x0bb.py b/lib/unidecode/x0bb.py
new file mode 100644
index 00000000..b92031be
--- /dev/null
+++ b/lib/unidecode/x0bb.py
@@ -0,0 +1,258 @@
+data = (
+'moen',    # 0x00
+'moenj',    # 0x01
+'moenh',    # 0x02
+'moed',    # 0x03
+'moel',    # 0x04
+'moelg',    # 0x05
+'moelm',    # 0x06
+'moelb',    # 0x07
+'moels',    # 0x08
+'moelt',    # 0x09
+'moelp',    # 0x0a
+'moelh',    # 0x0b
+'moem',    # 0x0c
+'moeb',    # 0x0d
+'moebs',    # 0x0e
+'moes',    # 0x0f
+'moess',    # 0x10
+'moeng',    # 0x11
+'moej',    # 0x12
+'moec',    # 0x13
+'moek',    # 0x14
+'moet',    # 0x15
+'moep',    # 0x16
+'moeh',    # 0x17
+'myo',    # 0x18
+'myog',    # 0x19
+'myogg',    # 0x1a
+'myogs',    # 0x1b
+'myon',    # 0x1c
+'myonj',    # 0x1d
+'myonh',    # 0x1e
+'myod',    # 0x1f
+'myol',    # 0x20
+'myolg',    # 0x21
+'myolm',    # 0x22
+'myolb',    # 0x23
+'myols',    # 0x24
+'myolt',    # 0x25
+'myolp',    # 0x26
+'myolh',    # 0x27
+'myom',    # 0x28
+'myob',    # 0x29
+'myobs',    # 0x2a
+'myos',    # 0x2b
+'myoss',    # 0x2c
+'myong',    # 0x2d
+'myoj',    # 0x2e
+'myoc',    # 0x2f
+'myok',    # 0x30
+'myot',    # 0x31
+'myop',    # 0x32
+'myoh',    # 0x33
+'mu',    # 0x34
+'mug',    # 0x35
+'mugg',    # 0x36
+'mugs',    # 0x37
+'mun',    # 0x38
+'munj',    # 0x39
+'munh',    # 0x3a
+'mud',    # 0x3b
+'mul',    # 0x3c
+'mulg',    # 0x3d
+'mulm',    # 0x3e
+'mulb',    # 0x3f
+'muls',    # 0x40
+'mult',    # 0x41
+'mulp',    # 0x42
+'mulh',    # 0x43
+'mum',    # 0x44
+'mub',    # 0x45
+'mubs',    # 0x46
+'mus',    # 0x47
+'muss',    # 0x48
+'mung',    # 0x49
+'muj',    # 0x4a
+'muc',    # 0x4b
+'muk',    # 0x4c
+'mut',    # 0x4d
+'mup',    # 0x4e
+'muh',    # 0x4f
+'mweo',    # 0x50
+'mweog',    # 0x51
+'mweogg',    # 0x52
+'mweogs',    # 0x53
+'mweon',    # 0x54
+'mweonj',    # 0x55
+'mweonh',    # 0x56
+'mweod',    # 0x57
+'mweol',    # 0x58
+'mweolg',    # 0x59
+'mweolm',    # 0x5a
+'mweolb',    # 0x5b
+'mweols',    # 0x5c
+'mweolt',    # 0x5d
+'mweolp',    # 0x5e
+'mweolh',    # 0x5f
+'mweom',    # 0x60
+'mweob',    # 0x61
+'mweobs',    # 0x62
+'mweos',    # 0x63
+'mweoss',    # 0x64
+'mweong',    # 0x65
+'mweoj',    # 0x66
+'mweoc',    # 0x67
+'mweok',    # 0x68
+'mweot',    # 0x69
+'mweop',    # 0x6a
+'mweoh',    # 0x6b
+'mwe',    # 0x6c
+'mweg',    # 0x6d
+'mwegg',    # 0x6e
+'mwegs',    # 0x6f
+'mwen',    # 0x70
+'mwenj',    # 0x71
+'mwenh',    # 0x72
+'mwed',    # 0x73
+'mwel',    # 0x74
+'mwelg',    # 0x75
+'mwelm',    # 0x76
+'mwelb',    # 0x77
+'mwels',    # 0x78
+'mwelt',    # 0x79
+'mwelp',    # 0x7a
+'mwelh',    # 0x7b
+'mwem',    # 0x7c
+'mweb',    # 0x7d
+'mwebs',    # 0x7e
+'mwes',    # 0x7f
+'mwess',    # 0x80
+'mweng',    # 0x81
+'mwej',    # 0x82
+'mwec',    # 0x83
+'mwek',    # 0x84
+'mwet',    # 0x85
+'mwep',    # 0x86
+'mweh',    # 0x87
+'mwi',    # 0x88
+'mwig',    # 0x89
+'mwigg',    # 0x8a
+'mwigs',    # 0x8b
+'mwin',    # 0x8c
+'mwinj',    # 0x8d
+'mwinh',    # 0x8e
+'mwid',    # 0x8f
+'mwil',    # 0x90
+'mwilg',    # 0x91
+'mwilm',    # 0x92
+'mwilb',    # 0x93
+'mwils',    # 0x94
+'mwilt',    # 0x95
+'mwilp',    # 0x96
+'mwilh',    # 0x97
+'mwim',    # 0x98
+'mwib',    # 0x99
+'mwibs',    # 0x9a
+'mwis',    # 0x9b
+'mwiss',    # 0x9c
+'mwing',    # 0x9d
+'mwij',    # 0x9e
+'mwic',    # 0x9f
+'mwik',    # 0xa0
+'mwit',    # 0xa1
+'mwip',    # 0xa2
+'mwih',    # 0xa3
+'myu',    # 0xa4
+'myug',    # 0xa5
+'myugg',    # 0xa6
+'myugs',    # 0xa7
+'myun',    # 0xa8
+'myunj',    # 0xa9
+'myunh',    # 0xaa
+'myud',    # 0xab
+'myul',    # 0xac
+'myulg',    # 0xad
+'myulm',    # 0xae
+'myulb',    # 0xaf
+'myuls',    # 0xb0
+'myult',    # 0xb1
+'myulp',    # 0xb2
+'myulh',    # 0xb3
+'myum',    # 0xb4
+'myub',    # 0xb5
+'myubs',    # 0xb6
+'myus',    # 0xb7
+'myuss',    # 0xb8
+'myung',    # 0xb9
+'myuj',    # 0xba
+'myuc',    # 0xbb
+'myuk',    # 0xbc
+'myut',    # 0xbd
+'myup',    # 0xbe
+'myuh',    # 0xbf
+'meu',    # 0xc0
+'meug',    # 0xc1
+'meugg',    # 0xc2
+'meugs',    # 0xc3
+'meun',    # 0xc4
+'meunj',    # 0xc5
+'meunh',    # 0xc6
+'meud',    # 0xc7
+'meul',    # 0xc8
+'meulg',    # 0xc9
+'meulm',    # 0xca
+'meulb',    # 0xcb
+'meuls',    # 0xcc
+'meult',    # 0xcd
+'meulp',    # 0xce
+'meulh',    # 0xcf
+'meum',    # 0xd0
+'meub',    # 0xd1
+'meubs',    # 0xd2
+'meus',    # 0xd3
+'meuss',    # 0xd4
+'meung',    # 0xd5
+'meuj',    # 0xd6
+'meuc',    # 0xd7
+'meuk',    # 0xd8
+'meut',    # 0xd9
+'meup',    # 0xda
+'meuh',    # 0xdb
+'myi',    # 0xdc
+'myig',    # 0xdd
+'myigg',    # 0xde
+'myigs',    # 0xdf
+'myin',    # 0xe0
+'myinj',    # 0xe1
+'myinh',    # 0xe2
+'myid',    # 0xe3
+'myil',    # 0xe4
+'myilg',    # 0xe5
+'myilm',    # 0xe6
+'myilb',    # 0xe7
+'myils',    # 0xe8
+'myilt',    # 0xe9
+'myilp',    # 0xea
+'myilh',    # 0xeb
+'myim',    # 0xec
+'myib',    # 0xed
+'myibs',    # 0xee
+'myis',    # 0xef
+'myiss',    # 0xf0
+'mying',    # 0xf1
+'myij',    # 0xf2
+'myic',    # 0xf3
+'myik',    # 0xf4
+'myit',    # 0xf5
+'myip',    # 0xf6
+'myih',    # 0xf7
+'mi',    # 0xf8
+'mig',    # 0xf9
+'migg',    # 0xfa
+'migs',    # 0xfb
+'min',    # 0xfc
+'minj',    # 0xfd
+'minh',    # 0xfe
+'mid',    # 0xff
+)
diff --git a/lib/unidecode/x0bc.py b/lib/unidecode/x0bc.py
new file mode 100644
index 00000000..c0b3f320
--- /dev/null
+++ b/lib/unidecode/x0bc.py
@@ -0,0 +1,258 @@
+data = (
+'mil',    # 0x00
+'milg',    # 0x01
+'milm',    # 0x02
+'milb',    # 0x03
+'mils',    # 0x04
+'milt',    # 0x05
+'milp',    # 0x06
+'milh',    # 0x07
+'mim',    # 0x08
+'mib',    # 0x09
+'mibs',    # 0x0a
+'mis',    # 0x0b
+'miss',    # 0x0c
+'ming',    # 0x0d
+'mij',    # 0x0e
+'mic',    # 0x0f
+'mik',    # 0x10
+'mit',    # 0x11
+'mip',    # 0x12
+'mih',    # 0x13
+'ba',    # 0x14
+'bag',    # 0x15
+'bagg',    # 0x16
+'bags',    # 0x17
+'ban',    # 0x18
+'banj',    # 0x19
+'banh',    # 0x1a
+'bad',    # 0x1b
+'bal',    # 0x1c
+'balg',    # 0x1d
+'balm',    # 0x1e
+'balb',    # 0x1f
+'bals',    # 0x20
+'balt',    # 0x21
+'balp',    # 0x22
+'balh',    # 0x23
+'bam',    # 0x24
+'bab',    # 0x25
+'babs',    # 0x26
+'bas',    # 0x27
+'bass',    # 0x28
+'bang',    # 0x29
+'baj',    # 0x2a
+'bac',    # 0x2b
+'bak',    # 0x2c
+'bat',    # 0x2d
+'bap',    # 0x2e
+'bah',    # 0x2f
+'bae',    # 0x30
+'baeg',    # 0x31
+'baegg',    # 0x32
+'baegs',    # 0x33
+'baen',    # 0x34
+'baenj',    # 0x35
+'baenh',    # 0x36
+'baed',    # 0x37
+'bael',    # 0x38
+'baelg',    # 0x39
+'baelm',    # 0x3a
+'baelb',    # 0x3b
+'baels',    # 0x3c
+'baelt',    # 0x3d
+'baelp',    # 0x3e
+'baelh',    # 0x3f
+'baem',    # 0x40
+'baeb',    # 0x41
+'baebs',    # 0x42
+'baes',    # 0x43
+'baess',    # 0x44
+'baeng',    # 0x45
+'baej',    # 0x46
+'baec',    # 0x47
+'baek',    # 0x48
+'baet',    # 0x49
+'baep',    # 0x4a
+'baeh',    # 0x4b
+'bya',    # 0x4c
+'byag',    # 0x4d
+'byagg',    # 0x4e
+'byags',    # 0x4f
+'byan',    # 0x50
+'byanj',    # 0x51
+'byanh',    # 0x52
+'byad',    # 0x53
+'byal',    # 0x54
+'byalg',    # 0x55
+'byalm',    # 0x56
+'byalb',    # 0x57
+'byals',    # 0x58
+'byalt',    # 0x59
+'byalp',    # 0x5a
+'byalh',    # 0x5b
+'byam',    # 0x5c
+'byab',    # 0x5d
+'byabs',    # 0x5e
+'byas',    # 0x5f
+'byass',    # 0x60
+'byang',    # 0x61
+'byaj',    # 0x62
+'byac',    # 0x63
+'byak',    # 0x64
+'byat',    # 0x65
+'byap',    # 0x66
+'byah',    # 0x67
+'byae',    # 0x68
+'byaeg',    # 0x69
+'byaegg',    # 0x6a
+'byaegs',    # 0x6b
+'byaen',    # 0x6c
+'byaenj',    # 0x6d
+'byaenh',    # 0x6e
+'byaed',    # 0x6f
+'byael',    # 0x70
+'byaelg',    # 0x71
+'byaelm',    # 0x72
+'byaelb',    # 0x73
+'byaels',    # 0x74
+'byaelt',    # 0x75
+'byaelp',    # 0x76
+'byaelh',    # 0x77
+'byaem',    # 0x78
+'byaeb',    # 0x79
+'byaebs',    # 0x7a
+'byaes',    # 0x7b
+'byaess',    # 0x7c
+'byaeng',    # 0x7d
+'byaej',    # 0x7e
+'byaec',    # 0x7f
+'byaek',    # 0x80
+'byaet',    # 0x81
+'byaep',    # 0x82
+'byaeh',    # 0x83
+'beo',    # 0x84
+'beog',    # 0x85
+'beogg',    # 0x86
+'beogs',    # 0x87
+'beon',    # 0x88
+'beonj',    # 0x89
+'beonh',    # 0x8a
+'beod',    # 0x8b
+'beol',    # 0x8c
+'beolg',    # 0x8d
+'beolm',    # 0x8e
+'beolb',    # 0x8f
+'beols',    # 0x90
+'beolt',    # 0x91
+'beolp',    # 0x92
+'beolh',    # 0x93
+'beom',    # 0x94
+'beob',    # 0x95
+'beobs',    # 0x96
+'beos',    # 0x97
+'beoss',    # 0x98
+'beong',    # 0x99
+'beoj',    # 0x9a
+'beoc',    # 0x9b
+'beok',    # 0x9c
+'beot',    # 0x9d
+'beop',    # 0x9e
+'beoh',    # 0x9f
+'be',    # 0xa0
+'beg',    # 0xa1
+'begg',    # 0xa2
+'begs',    # 0xa3
+'ben',    # 0xa4
+'benj',    # 0xa5
+'benh',    # 0xa6
+'bed',    # 0xa7
+'bel',    # 0xa8
+'belg',    # 0xa9
+'belm',    # 0xaa
+'belb',    # 0xab
+'bels',    # 0xac
+'belt',    # 0xad
+'belp',    # 0xae
+'belh',    # 0xaf
+'bem',    # 0xb0
+'beb',    # 0xb1
+'bebs',    # 0xb2
+'bes',    # 0xb3
+'bess',    # 0xb4
+'beng',    # 0xb5
+'bej',    # 0xb6
+'bec',    # 0xb7
+'bek',    # 0xb8
+'bet',    # 0xb9
+'bep',    # 0xba
+'beh',    # 0xbb
+'byeo',    # 0xbc
+'byeog',    # 0xbd
+'byeogg',    # 0xbe
+'byeogs',    # 0xbf
+'byeon',    # 0xc0
+'byeonj',    # 0xc1
+'byeonh',    # 0xc2
+'byeod',    # 0xc3
+'byeol',    # 0xc4
+'byeolg',    # 0xc5
+'byeolm',    # 0xc6
+'byeolb',    # 0xc7
+'byeols',    # 0xc8
+'byeolt',    # 0xc9
+'byeolp',    # 0xca
+'byeolh',    # 0xcb
+'byeom',    # 0xcc
+'byeob',    # 0xcd
+'byeobs',    # 0xce
+'byeos',    # 0xcf
+'byeoss',    # 0xd0
+'byeong',    # 0xd1
+'byeoj',    # 0xd2
+'byeoc',    # 0xd3
+'byeok',    # 0xd4
+'byeot',    # 0xd5
+'byeop',    # 0xd6
+'byeoh',    # 0xd7
+'bye',    # 0xd8
+'byeg',    # 0xd9
+'byegg',    # 0xda
+'byegs',    # 0xdb
+'byen',    # 0xdc
+'byenj',    # 0xdd
+'byenh',    # 0xde
+'byed',    # 0xdf
+'byel',    # 0xe0
+'byelg',    # 0xe1
+'byelm',    # 0xe2
+'byelb',    # 0xe3
+'byels',    # 0xe4
+'byelt',    # 0xe5
+'byelp',    # 0xe6
+'byelh',    # 0xe7
+'byem',    # 0xe8
+'byeb',    # 0xe9
+'byebs',    # 0xea
+'byes',    # 0xeb
+'byess',    # 0xec
+'byeng',    # 0xed
+'byej',    # 0xee
+'byec',    # 0xef
+'byek',    # 0xf0
+'byet',    # 0xf1
+'byep',    # 0xf2
+'byeh',    # 0xf3
+'bo',    # 0xf4
+'bog',    # 0xf5
+'bogg',    # 0xf6
+'bogs',    # 0xf7
+'bon',    # 0xf8
+'bonj',    # 0xf9
+'bonh',    # 0xfa
+'bod',    # 0xfb
+'bol',    # 0xfc
+'bolg',    # 0xfd
+'bolm',    # 0xfe
+'bolb',    # 0xff
+)
diff --git a/lib/unidecode/x0bd.py b/lib/unidecode/x0bd.py
new file mode 100644
index 00000000..6473883f
--- /dev/null
+++ b/lib/unidecode/x0bd.py
@@ -0,0 +1,258 @@
+data = (
+'bols',    # 0x00
+'bolt',    # 0x01
+'bolp',    # 0x02
+'bolh',    # 0x03
+'bom',    # 0x04
+'bob',    # 0x05
+'bobs',    # 0x06
+'bos',    # 0x07
+'boss',    # 0x08
+'bong',    # 0x09
+'boj',    # 0x0a
+'boc',    # 0x0b
+'bok',    # 0x0c
+'bot',    # 0x0d
+'bop',    # 0x0e
+'boh',    # 0x0f
+'bwa',    # 0x10
+'bwag',    # 0x11
+'bwagg',    # 0x12
+'bwags',    # 0x13
+'bwan',    # 0x14
+'bwanj',    # 0x15
+'bwanh',    # 0x16
+'bwad',    # 0x17
+'bwal',    # 0x18
+'bwalg',    # 0x19
+'bwalm',    # 0x1a
+'bwalb',    # 0x1b
+'bwals',    # 0x1c
+'bwalt',    # 0x1d
+'bwalp',    # 0x1e
+'bwalh',    # 0x1f
+'bwam',    # 0x20
+'bwab',    # 0x21
+'bwabs',    # 0x22
+'bwas',    # 0x23
+'bwass',    # 0x24
+'bwang',    # 0x25
+'bwaj',    # 0x26
+'bwac',    # 0x27
+'bwak',    # 0x28
+'bwat',    # 0x29
+'bwap',    # 0x2a
+'bwah',    # 0x2b
+'bwae',    # 0x2c
+'bwaeg',    # 0x2d
+'bwaegg',    # 0x2e
+'bwaegs',    # 0x2f
+'bwaen',    # 0x30
+'bwaenj',    # 0x31
+'bwaenh',    # 0x32
+'bwaed',    # 0x33
+'bwael',    # 0x34
+'bwaelg',    # 0x35
+'bwaelm',    # 0x36
+'bwaelb',    # 0x37
+'bwaels',    # 0x38
+'bwaelt',    # 0x39
+'bwaelp',    # 0x3a
+'bwaelh',    # 0x3b
+'bwaem',    # 0x3c
+'bwaeb',    # 0x3d
+'bwaebs',    # 0x3e
+'bwaes',    # 0x3f
+'bwaess',    # 0x40
+'bwaeng',    # 0x41
+'bwaej',    # 0x42
+'bwaec',    # 0x43
+'bwaek',    # 0x44
+'bwaet',    # 0x45
+'bwaep',    # 0x46
+'bwaeh',    # 0x47
+'boe',    # 0x48
+'boeg',    # 0x49
+'boegg',    # 0x4a
+'boegs',    # 0x4b
+'boen',    # 0x4c
+'boenj',    # 0x4d
+'boenh',    # 0x4e
+'boed',    # 0x4f
+'boel',    # 0x50
+'boelg',    # 0x51
+'boelm',    # 0x52
+'boelb',    # 0x53
+'boels',    # 0x54
+'boelt',    # 0x55
+'boelp',    # 0x56
+'boelh',    # 0x57
+'boem',    # 0x58
+'boeb',    # 0x59
+'boebs',    # 0x5a
+'boes',    # 0x5b
+'boess',    # 0x5c
+'boeng',    # 0x5d
+'boej',    # 0x5e
+'boec',    # 0x5f
+'boek',    # 0x60
+'boet',    # 0x61
+'boep',    # 0x62
+'boeh',    # 0x63
+'byo',    # 0x64
+'byog',    # 0x65
+'byogg',    # 0x66
+'byogs',    # 0x67
+'byon',    # 0x68
+'byonj',    # 0x69
+'byonh',    # 0x6a
+'byod',    # 0x6b
+'byol',    # 0x6c
+'byolg',    # 0x6d
+'byolm',    # 0x6e
+'byolb',    # 0x6f
+'byols',    # 0x70
+'byolt',    # 0x71
+'byolp',    # 0x72
+'byolh',    # 0x73
+'byom',    # 0x74
+'byob',    # 0x75
+'byobs',    # 0x76
+'byos',    # 0x77
+'byoss',    # 0x78
+'byong',    # 0x79
+'byoj',    # 0x7a
+'byoc',    # 0x7b
+'byok',    # 0x7c
+'byot',    # 0x7d
+'byop',    # 0x7e
+'byoh',    # 0x7f
+'bu',    # 0x80
+'bug',    # 0x81
+'bugg',    # 0x82
+'bugs',    # 0x83
+'bun',    # 0x84
+'bunj',    # 0x85
+'bunh',    # 0x86
+'bud',    # 0x87
+'bul',    # 0x88
+'bulg',    # 0x89
+'bulm',    # 0x8a
+'bulb',    # 0x8b
+'buls',    # 0x8c
+'bult',    # 0x8d
+'bulp',    # 0x8e
+'bulh',    # 0x8f
+'bum',    # 0x90
+'bub',    # 0x91
+'bubs',    # 0x92
+'bus',    # 0x93
+'buss',    # 0x94
+'bung',    # 0x95
+'buj',    # 0x96
+'buc',    # 0x97
+'buk',    # 0x98
+'but',    # 0x99
+'bup',    # 0x9a
+'buh',    # 0x9b
+'bweo',    # 0x9c
+'bweog',    # 0x9d
+'bweogg',    # 0x9e
+'bweogs',    # 0x9f
+'bweon',    # 0xa0
+'bweonj',    # 0xa1
+'bweonh',    # 0xa2
+'bweod',    # 0xa3
+'bweol',    # 0xa4
+'bweolg',    # 0xa5
+'bweolm',    # 0xa6
+'bweolb',    # 0xa7
+'bweols',    # 0xa8
+'bweolt',    # 0xa9
+'bweolp',    # 0xaa
+'bweolh',    # 0xab
+'bweom',    # 0xac
+'bweob',    # 0xad
+'bweobs',    # 0xae
+'bweos',    # 0xaf
+'bweoss',    # 0xb0
+'bweong',    # 0xb1
+'bweoj',    # 0xb2
+'bweoc',    # 0xb3
+'bweok',    # 0xb4
+'bweot',    # 0xb5
+'bweop',    # 0xb6
+'bweoh',    # 0xb7
+'bwe',    # 0xb8
+'bweg',    # 0xb9
+'bwegg',    # 0xba
+'bwegs',    # 0xbb
+'bwen',    # 0xbc
+'bwenj',    # 0xbd
+'bwenh',    # 0xbe
+'bwed',    # 0xbf
+'bwel',    # 0xc0
+'bwelg',    # 0xc1
+'bwelm',    # 0xc2
+'bwelb',    # 0xc3
+'bwels',    # 0xc4
+'bwelt',    # 0xc5
+'bwelp',    # 0xc6
+'bwelh',    # 0xc7
+'bwem',    # 0xc8
+'bweb',    # 0xc9
+'bwebs',    # 0xca
+'bwes',    # 0xcb
+'bwess',    # 0xcc
+'bweng',    # 0xcd
+'bwej',    # 0xce
+'bwec',    # 0xcf
+'bwek',    # 0xd0
+'bwet',    # 0xd1
+'bwep',    # 0xd2
+'bweh',    # 0xd3
+'bwi',    # 0xd4
+'bwig',    # 0xd5
+'bwigg',    # 0xd6
+'bwigs',    # 0xd7
+'bwin',    # 0xd8
+'bwinj',    # 0xd9
+'bwinh',    # 0xda
+'bwid',    # 0xdb
+'bwil',    # 0xdc
+'bwilg',    # 0xdd
+'bwilm',    # 0xde
+'bwilb',    # 0xdf
+'bwils',    # 0xe0
+'bwilt',    # 0xe1
+'bwilp',    # 0xe2
+'bwilh',    # 0xe3
+'bwim',    # 0xe4
+'bwib',    # 0xe5
+'bwibs',    # 0xe6
+'bwis',    # 0xe7
+'bwiss',    # 0xe8
+'bwing',    # 0xe9
+'bwij',    # 0xea
+'bwic',    # 0xeb
+'bwik',    # 0xec
+'bwit',    # 0xed
+'bwip',    # 0xee
+'bwih',    # 0xef
+'byu',    # 0xf0
+'byug',    # 0xf1
+'byugg',    # 0xf2
+'byugs',    # 0xf3
+'byun',    # 0xf4
+'byunj',    # 0xf5
+'byunh',    # 0xf6
+'byud',    # 0xf7
+'byul',    # 0xf8
+'byulg',    # 0xf9
+'byulm',    # 0xfa
+'byulb',    # 0xfb
+'byuls',    # 0xfc
+'byult',    # 0xfd
+'byulp',    # 0xfe
+'byulh',    # 0xff
+)
diff --git a/lib/unidecode/x0be.py b/lib/unidecode/x0be.py
new file mode 100644
index 00000000..85c184e7
--- /dev/null
+++ b/lib/unidecode/x0be.py
@@ -0,0 +1,258 @@
+data = (
+'byum',    # 0x00
+'byub',    # 0x01
+'byubs',    # 0x02
+'byus',    # 0x03
+'byuss',    # 0x04
+'byung',    # 0x05
+'byuj',    # 0x06
+'byuc',    # 0x07
+'byuk',    # 0x08
+'byut',    # 0x09
+'byup',    # 0x0a
+'byuh',    # 0x0b
+'beu',    # 0x0c
+'beug',    # 0x0d
+'beugg',    # 0x0e
+'beugs',    # 0x0f
+'beun',    # 0x10
+'beunj',    # 0x11
+'beunh',    # 0x12
+'beud',    # 0x13
+'beul',    # 0x14
+'beulg',    # 0x15
+'beulm',    # 0x16
+'beulb',    # 0x17
+'beuls',    # 0x18
+'beult',    # 0x19
+'beulp',    # 0x1a
+'beulh',    # 0x1b
+'beum',    # 0x1c
+'beub',    # 0x1d
+'beubs',    # 0x1e
+'beus',    # 0x1f
+'beuss',    # 0x20
+'beung',    # 0x21
+'beuj',    # 0x22
+'beuc',    # 0x23
+'beuk',    # 0x24
+'beut',    # 0x25
+'beup',    # 0x26
+'beuh',    # 0x27
+'byi',    # 0x28
+'byig',    # 0x29
+'byigg',    # 0x2a
+'byigs',    # 0x2b
+'byin',    # 0x2c
+'byinj',    # 0x2d
+'byinh',    # 0x2e
+'byid',    # 0x2f
+'byil',    # 0x30
+'byilg',    # 0x31
+'byilm',    # 0x32
+'byilb',    # 0x33
+'byils',    # 0x34
+'byilt',    # 0x35
+'byilp',    # 0x36
+'byilh',    # 0x37
+'byim',    # 0x38
+'byib',    # 0x39
+'byibs',    # 0x3a
+'byis',    # 0x3b
+'byiss',    # 0x3c
+'bying',    # 0x3d
+'byij',    # 0x3e
+'byic',    # 0x3f
+'byik',    # 0x40
+'byit',    # 0x41
+'byip',    # 0x42
+'byih',    # 0x43
+'bi',    # 0x44
+'big',    # 0x45
+'bigg',    # 0x46
+'bigs',    # 0x47
+'bin',    # 0x48
+'binj',    # 0x49
+'binh',    # 0x4a
+'bid',    # 0x4b
+'bil',    # 0x4c
+'bilg',    # 0x4d
+'bilm',    # 0x4e
+'bilb',    # 0x4f
+'bils',    # 0x50
+'bilt',    # 0x51
+'bilp',    # 0x52
+'bilh',    # 0x53
+'bim',    # 0x54
+'bib',    # 0x55
+'bibs',    # 0x56
+'bis',    # 0x57
+'biss',    # 0x58
+'bing',    # 0x59
+'bij',    # 0x5a
+'bic',    # 0x5b
+'bik',    # 0x5c
+'bit',    # 0x5d
+'bip',    # 0x5e
+'bih',    # 0x5f
+'bba',    # 0x60
+'bbag',    # 0x61
+'bbagg',    # 0x62
+'bbags',    # 0x63
+'bban',    # 0x64
+'bbanj',    # 0x65
+'bbanh',    # 0x66
+'bbad',    # 0x67
+'bbal',    # 0x68
+'bbalg',    # 0x69
+'bbalm',    # 0x6a
+'bbalb',    # 0x6b
+'bbals',    # 0x6c
+'bbalt',    # 0x6d
+'bbalp',    # 0x6e
+'bbalh',    # 0x6f
+'bbam',    # 0x70
+'bbab',    # 0x71
+'bbabs',    # 0x72
+'bbas',    # 0x73
+'bbass',    # 0x74
+'bbang',    # 0x75
+'bbaj',    # 0x76
+'bbac',    # 0x77
+'bbak',    # 0x78
+'bbat',    # 0x79
+'bbap',    # 0x7a
+'bbah',    # 0x7b
+'bbae',    # 0x7c
+'bbaeg',    # 0x7d
+'bbaegg',    # 0x7e
+'bbaegs',    # 0x7f
+'bbaen',    # 0x80
+'bbaenj',    # 0x81
+'bbaenh',    # 0x82
+'bbaed',    # 0x83
+'bbael',    # 0x84
+'bbaelg',    # 0x85
+'bbaelm',    # 0x86
+'bbaelb',    # 0x87
+'bbaels',    # 0x88
+'bbaelt',    # 0x89
+'bbaelp',    # 0x8a
+'bbaelh',    # 0x8b
+'bbaem',    # 0x8c
+'bbaeb',    # 0x8d
+'bbaebs',    # 0x8e
+'bbaes',    # 0x8f
+'bbaess',    # 0x90
+'bbaeng',    # 0x91
+'bbaej',    # 0x92
+'bbaec',    # 0x93
+'bbaek',    # 0x94
+'bbaet',    # 0x95
+'bbaep',    # 0x96
+'bbaeh',    # 0x97
+'bbya',    # 0x98
+'bbyag',    # 0x99
+'bbyagg',    # 0x9a
+'bbyags',    # 0x9b
+'bbyan',    # 0x9c
+'bbyanj',    # 0x9d
+'bbyanh',    # 0x9e
+'bbyad',    # 0x9f
+'bbyal',    # 0xa0
+'bbyalg',    # 0xa1
+'bbyalm',    # 0xa2
+'bbyalb',    # 0xa3
+'bbyals',    # 0xa4
+'bbyalt',    # 0xa5
+'bbyalp',    # 0xa6
+'bbyalh',    # 0xa7
+'bbyam',    # 0xa8
+'bbyab',    # 0xa9
+'bbyabs',    # 0xaa
+'bbyas',    # 0xab
+'bbyass',    # 0xac
+'bbyang',    # 0xad
+'bbyaj',    # 0xae
+'bbyac',    # 0xaf
+'bbyak',    # 0xb0
+'bbyat',    # 0xb1
+'bbyap',    # 0xb2
+'bbyah',    # 0xb3
+'bbyae',    # 0xb4
+'bbyaeg',    # 0xb5
+'bbyaegg',    # 0xb6
+'bbyaegs',    # 0xb7
+'bbyaen',    # 0xb8
+'bbyaenj',    # 0xb9
+'bbyaenh',    # 0xba
+'bbyaed',    # 0xbb
+'bbyael',    # 0xbc
+'bbyaelg',    # 0xbd
+'bbyaelm',    # 0xbe
+'bbyaelb',    # 0xbf
+'bbyaels',    # 0xc0
+'bbyaelt',    # 0xc1
+'bbyaelp',    # 0xc2
+'bbyaelh',    # 0xc3
+'bbyaem',    # 0xc4
+'bbyaeb',    # 0xc5
+'bbyaebs',    # 0xc6
+'bbyaes',    # 0xc7
+'bbyaess',    # 0xc8
+'bbyaeng',    # 0xc9
+'bbyaej',    # 0xca
+'bbyaec',    # 0xcb
+'bbyaek',    # 0xcc
+'bbyaet',    # 0xcd
+'bbyaep',    # 0xce
+'bbyaeh',    # 0xcf
+'bbeo',    # 0xd0
+'bbeog',    # 0xd1
+'bbeogg',    # 0xd2
+'bbeogs',    # 0xd3
+'bbeon',    # 0xd4
+'bbeonj',    # 0xd5
+'bbeonh',    # 0xd6
+'bbeod',    # 0xd7
+'bbeol',    # 0xd8
+'bbeolg',    # 0xd9
+'bbeolm',    # 0xda
+'bbeolb',    # 0xdb
+'bbeols',    # 0xdc
+'bbeolt',    # 0xdd
+'bbeolp',    # 0xde
+'bbeolh',    # 0xdf
+'bbeom',    # 0xe0
+'bbeob',    # 0xe1
+'bbeobs',    # 0xe2
+'bbeos',    # 0xe3
+'bbeoss',    # 0xe4
+'bbeong',    # 0xe5
+'bbeoj',    # 0xe6
+'bbeoc',    # 0xe7
+'bbeok',    # 0xe8
+'bbeot',    # 0xe9
+'bbeop',    # 0xea
+'bbeoh',    # 0xeb
+'bbe',    # 0xec
+'bbeg',    # 0xed
+'bbegg',    # 0xee
+'bbegs',    # 0xef
+'bben',    # 0xf0
+'bbenj',    # 0xf1
+'bbenh',    # 0xf2
+'bbed',    # 0xf3
+'bbel',    # 0xf4
+'bbelg',    # 0xf5
+'bbelm',    # 0xf6
+'bbelb',    # 0xf7
+'bbels',    # 0xf8
+'bbelt',    # 0xf9
+'bbelp',    # 0xfa
+'bbelh',    # 0xfb
+'bbem',    # 0xfc
+'bbeb',    # 0xfd
+'bbebs',    # 0xfe
+'bbes',    # 0xff
+)
diff --git a/lib/unidecode/x0bf.py b/lib/unidecode/x0bf.py
new file mode 100644
index 00000000..a7b3a718
--- /dev/null
+++ b/lib/unidecode/x0bf.py
@@ -0,0 +1,258 @@
+data = (
+'bbess',    # 0x00
+'bbeng',    # 0x01
+'bbej',    # 0x02
+'bbec',    # 0x03
+'bbek',    # 0x04
+'bbet',    # 0x05
+'bbep',    # 0x06
+'bbeh',    # 0x07
+'bbyeo',    # 0x08
+'bbyeog',    # 0x09
+'bbyeogg',    # 0x0a
+'bbyeogs',    # 0x0b
+'bbyeon',    # 0x0c
+'bbyeonj',    # 0x0d
+'bbyeonh',    # 0x0e
+'bbyeod',    # 0x0f
+'bbyeol',    # 0x10
+'bbyeolg',    # 0x11
+'bbyeolm',    # 0x12
+'bbyeolb',    # 0x13
+'bbyeols',    # 0x14
+'bbyeolt',    # 0x15
+'bbyeolp',    # 0x16
+'bbyeolh',    # 0x17
+'bbyeom',    # 0x18
+'bbyeob',    # 0x19
+'bbyeobs',    # 0x1a
+'bbyeos',    # 0x1b
+'bbyeoss',    # 0x1c
+'bbyeong',    # 0x1d
+'bbyeoj',    # 0x1e
+'bbyeoc',    # 0x1f
+'bbyeok',    # 0x20
+'bbyeot',    # 0x21
+'bbyeop',    # 0x22
+'bbyeoh',    # 0x23
+'bbye',    # 0x24
+'bbyeg',    # 0x25
+'bbyegg',    # 0x26
+'bbyegs',    # 0x27
+'bbyen',    # 0x28
+'bbyenj',    # 0x29
+'bbyenh',    # 0x2a
+'bbyed',    # 0x2b
+'bbyel',    # 0x2c
+'bbyelg',    # 0x2d
+'bbyelm',    # 0x2e
+'bbyelb',    # 0x2f
+'bbyels',    # 0x30
+'bbyelt',    # 0x31
+'bbyelp',    # 0x32
+'bbyelh',    # 0x33
+'bbyem',    # 0x34
+'bbyeb',    # 0x35
+'bbyebs',    # 0x36
+'bbyes',    # 0x37
+'bbyess',    # 0x38
+'bbyeng',    # 0x39
+'bbyej',    # 0x3a
+'bbyec',    # 0x3b
+'bbyek',    # 0x3c
+'bbyet',    # 0x3d
+'bbyep',    # 0x3e
+'bbyeh',    # 0x3f
+'bbo',    # 0x40
+'bbog',    # 0x41
+'bbogg',    # 0x42
+'bbogs',    # 0x43
+'bbon',    # 0x44
+'bbonj',    # 0x45
+'bbonh',    # 0x46
+'bbod',    # 0x47
+'bbol',    # 0x48
+'bbolg',    # 0x49
+'bbolm',    # 0x4a
+'bbolb',    # 0x4b
+'bbols',    # 0x4c
+'bbolt',    # 0x4d
+'bbolp',    # 0x4e
+'bbolh',    # 0x4f
+'bbom',    # 0x50
+'bbob',    # 0x51
+'bbobs',    # 0x52
+'bbos',    # 0x53
+'bboss',    # 0x54
+'bbong',    # 0x55
+'bboj',    # 0x56
+'bboc',    # 0x57
+'bbok',    # 0x58
+'bbot',    # 0x59
+'bbop',    # 0x5a
+'bboh',    # 0x5b
+'bbwa',    # 0x5c
+'bbwag',    # 0x5d
+'bbwagg',    # 0x5e
+'bbwags',    # 0x5f
+'bbwan',    # 0x60
+'bbwanj',    # 0x61
+'bbwanh',    # 0x62
+'bbwad',    # 0x63
+'bbwal',    # 0x64
+'bbwalg',    # 0x65
+'bbwalm',    # 0x66
+'bbwalb',    # 0x67
+'bbwals',    # 0x68
+'bbwalt',    # 0x69
+'bbwalp',    # 0x6a
+'bbwalh',    # 0x6b
+'bbwam',    # 0x6c
+'bbwab',    # 0x6d
+'bbwabs',    # 0x6e
+'bbwas',    # 0x6f
+'bbwass',    # 0x70
+'bbwang',    # 0x71
+'bbwaj',    # 0x72
+'bbwac',    # 0x73
+'bbwak',    # 0x74
+'bbwat',    # 0x75
+'bbwap',    # 0x76
+'bbwah',    # 0x77
+'bbwae',    # 0x78
+'bbwaeg',    # 0x79
+'bbwaegg',    # 0x7a
+'bbwaegs',    # 0x7b
+'bbwaen',    # 0x7c
+'bbwaenj',    # 0x7d
+'bbwaenh',    # 0x7e
+'bbwaed',    # 0x7f
+'bbwael',    # 0x80
+'bbwaelg',    # 0x81
+'bbwaelm',    # 0x82
+'bbwaelb',    # 0x83
+'bbwaels',    # 0x84
+'bbwaelt',    # 0x85
+'bbwaelp',    # 0x86
+'bbwaelh',    # 0x87
+'bbwaem',    # 0x88
+'bbwaeb',    # 0x89
+'bbwaebs',    # 0x8a
+'bbwaes',    # 0x8b
+'bbwaess',    # 0x8c
+'bbwaeng',    # 0x8d
+'bbwaej',    # 0x8e
+'bbwaec',    # 0x8f
+'bbwaek',    # 0x90
+'bbwaet',    # 0x91
+'bbwaep',    # 0x92
+'bbwaeh',    # 0x93
+'bboe',    # 0x94
+'bboeg',    # 0x95
+'bboegg',    # 0x96
+'bboegs',    # 0x97
+'bboen',    # 0x98
+'bboenj',    # 0x99
+'bboenh',    # 0x9a
+'bboed',    # 0x9b
+'bboel',    # 0x9c
+'bboelg',    # 0x9d
+'bboelm',    # 0x9e
+'bboelb',    # 0x9f
+'bboels',    # 0xa0
+'bboelt',    # 0xa1
+'bboelp',    # 0xa2
+'bboelh',    # 0xa3
+'bboem',    # 0xa4
+'bboeb',    # 0xa5
+'bboebs',    # 0xa6
+'bboes',    # 0xa7
+'bboess',    # 0xa8
+'bboeng',    # 0xa9
+'bboej',    # 0xaa
+'bboec',    # 0xab
+'bboek',    # 0xac
+'bboet',    # 0xad
+'bboep',    # 0xae
+'bboeh',    # 0xaf
+'bbyo',    # 0xb0
+'bbyog',    # 0xb1
+'bbyogg',    # 0xb2
+'bbyogs',    # 0xb3
+'bbyon',    # 0xb4
+'bbyonj',    # 0xb5
+'bbyonh',    # 0xb6
+'bbyod',    # 0xb7
+'bbyol',    # 0xb8
+'bbyolg',    # 0xb9
+'bbyolm',    # 0xba
+'bbyolb',    # 0xbb
+'bbyols',    # 0xbc
+'bbyolt',    # 0xbd
+'bbyolp',    # 0xbe
+'bbyolh',    # 0xbf
+'bbyom',    # 0xc0
+'bbyob',    # 0xc1
+'bbyobs',    # 0xc2
+'bbyos',    # 0xc3
+'bbyoss',    # 0xc4
+'bbyong',    # 0xc5
+'bbyoj',    # 0xc6
+'bbyoc',    # 0xc7
+'bbyok',    # 0xc8
+'bbyot',    # 0xc9
+'bbyop',    # 0xca
+'bbyoh',    # 0xcb
+'bbu',    # 0xcc
+'bbug',    # 0xcd
+'bbugg',    # 0xce
+'bbugs',    # 0xcf
+'bbun',    # 0xd0
+'bbunj',    # 0xd1
+'bbunh',    # 0xd2
+'bbud',    # 0xd3
+'bbul',    # 0xd4
+'bbulg',    # 0xd5
+'bbulm',    # 0xd6
+'bbulb',    # 0xd7
+'bbuls',    # 0xd8
+'bbult',    # 0xd9
+'bbulp',    # 0xda
+'bbulh',    # 0xdb
+'bbum',    # 0xdc
+'bbub',    # 0xdd
+'bbubs',    # 0xde
+'bbus',    # 0xdf
+'bbuss',    # 0xe0
+'bbung',    # 0xe1
+'bbuj',    # 0xe2
+'bbuc',    # 0xe3
+'bbuk',    # 0xe4
+'bbut',    # 0xe5
+'bbup',    # 0xe6
+'bbuh',    # 0xe7
+'bbweo',    # 0xe8
+'bbweog',    # 0xe9
+'bbweogg',    # 0xea
+'bbweogs',    # 0xeb
+'bbweon',    # 0xec
+'bbweonj',    # 0xed
+'bbweonh',    # 0xee
+'bbweod',    # 0xef
+'bbweol',    # 0xf0
+'bbweolg',    # 0xf1
+'bbweolm',    # 0xf2
+'bbweolb',    # 0xf3
+'bbweols',    # 0xf4
+'bbweolt',    # 0xf5
+'bbweolp',    # 0xf6
+'bbweolh',    # 0xf7
+'bbweom',    # 0xf8
+'bbweob',    # 0xf9
+'bbweobs',    # 0xfa
+'bbweos',    # 0xfb
+'bbweoss',    # 0xfc
+'bbweong',    # 0xfd
+'bbweoj',    # 0xfe
+'bbweoc',    # 0xff
+)
diff --git a/lib/unidecode/x0c0.py b/lib/unidecode/x0c0.py
new file mode 100644
index 00000000..35e50391
--- /dev/null
+++ b/lib/unidecode/x0c0.py
@@ -0,0 +1,258 @@
+data = (
+'bbweok',    # 0x00
+'bbweot',    # 0x01
+'bbweop',    # 0x02
+'bbweoh',    # 0x03
+'bbwe',    # 0x04
+'bbweg',    # 0x05
+'bbwegg',    # 0x06
+'bbwegs',    # 0x07
+'bbwen',    # 0x08
+'bbwenj',    # 0x09
+'bbwenh',    # 0x0a
+'bbwed',    # 0x0b
+'bbwel',    # 0x0c
+'bbwelg',    # 0x0d
+'bbwelm',    # 0x0e
+'bbwelb',    # 0x0f
+'bbwels',    # 0x10
+'bbwelt',    # 0x11
+'bbwelp',    # 0x12
+'bbwelh',    # 0x13
+'bbwem',    # 0x14
+'bbweb',    # 0x15
+'bbwebs',    # 0x16
+'bbwes',    # 0x17
+'bbwess',    # 0x18
+'bbweng',    # 0x19
+'bbwej',    # 0x1a
+'bbwec',    # 0x1b
+'bbwek',    # 0x1c
+'bbwet',    # 0x1d
+'bbwep',    # 0x1e
+'bbweh',    # 0x1f
+'bbwi',    # 0x20
+'bbwig',    # 0x21
+'bbwigg',    # 0x22
+'bbwigs',    # 0x23
+'bbwin',    # 0x24
+'bbwinj',    # 0x25
+'bbwinh',    # 0x26
+'bbwid',    # 0x27
+'bbwil',    # 0x28
+'bbwilg',    # 0x29
+'bbwilm',    # 0x2a
+'bbwilb',    # 0x2b
+'bbwils',    # 0x2c
+'bbwilt',    # 0x2d
+'bbwilp',    # 0x2e
+'bbwilh',    # 0x2f
+'bbwim',    # 0x30
+'bbwib',    # 0x31
+'bbwibs',    # 0x32
+'bbwis',    # 0x33
+'bbwiss',    # 0x34
+'bbwing',    # 0x35
+'bbwij',    # 0x36
+'bbwic',    # 0x37
+'bbwik',    # 0x38
+'bbwit',    # 0x39
+'bbwip',    # 0x3a
+'bbwih',    # 0x3b
+'bbyu',    # 0x3c
+'bbyug',    # 0x3d
+'bbyugg',    # 0x3e
+'bbyugs',    # 0x3f
+'bbyun',    # 0x40
+'bbyunj',    # 0x41
+'bbyunh',    # 0x42
+'bbyud',    # 0x43
+'bbyul',    # 0x44
+'bbyulg',    # 0x45
+'bbyulm',    # 0x46
+'bbyulb',    # 0x47
+'bbyuls',    # 0x48
+'bbyult',    # 0x49
+'bbyulp',    # 0x4a
+'bbyulh',    # 0x4b
+'bbyum',    # 0x4c
+'bbyub',    # 0x4d
+'bbyubs',    # 0x4e
+'bbyus',    # 0x4f
+'bbyuss',    # 0x50
+'bbyung',    # 0x51
+'bbyuj',    # 0x52
+'bbyuc',    # 0x53
+'bbyuk',    # 0x54
+'bbyut',    # 0x55
+'bbyup',    # 0x56
+'bbyuh',    # 0x57
+'bbeu',    # 0x58
+'bbeug',    # 0x59
+'bbeugg',    # 0x5a
+'bbeugs',    # 0x5b
+'bbeun',    # 0x5c
+'bbeunj',    # 0x5d
+'bbeunh',    # 0x5e
+'bbeud',    # 0x5f
+'bbeul',    # 0x60
+'bbeulg',    # 0x61
+'bbeulm',    # 0x62
+'bbeulb',    # 0x63
+'bbeuls',    # 0x64
+'bbeult',    # 0x65
+'bbeulp',    # 0x66
+'bbeulh',    # 0x67
+'bbeum',    # 0x68
+'bbeub',    # 0x69
+'bbeubs',    # 0x6a
+'bbeus',    # 0x6b
+'bbeuss',    # 0x6c
+'bbeung',    # 0x6d
+'bbeuj',    # 0x6e
+'bbeuc',    # 0x6f
+'bbeuk',    # 0x70
+'bbeut',    # 0x71
+'bbeup',    # 0x72
+'bbeuh',    # 0x73
+'bbyi',    # 0x74
+'bbyig',    # 0x75
+'bbyigg',    # 0x76
+'bbyigs',    # 0x77
+'bbyin',    # 0x78
+'bbyinj',    # 0x79
+'bbyinh',    # 0x7a
+'bbyid',    # 0x7b
+'bbyil',    # 0x7c
+'bbyilg',    # 0x7d
+'bbyilm',    # 0x7e
+'bbyilb',    # 0x7f
+'bbyils',    # 0x80
+'bbyilt',    # 0x81
+'bbyilp',    # 0x82
+'bbyilh',    # 0x83
+'bbyim',    # 0x84
+'bbyib',    # 0x85
+'bbyibs',    # 0x86
+'bbyis',    # 0x87
+'bbyiss',    # 0x88
+'bbying',    # 0x89
+'bbyij',    # 0x8a
+'bbyic',    # 0x8b
+'bbyik',    # 0x8c
+'bbyit',    # 0x8d
+'bbyip',    # 0x8e
+'bbyih',    # 0x8f
+'bbi',    # 0x90
+'bbig',    # 0x91
+'bbigg',    # 0x92
+'bbigs',    # 0x93
+'bbin',    # 0x94
+'bbinj',    # 0x95
+'bbinh',    # 0x96
+'bbid',    # 0x97
+'bbil',    # 0x98
+'bbilg',    # 0x99
+'bbilm',    # 0x9a
+'bbilb',    # 0x9b
+'bbils',    # 0x9c
+'bbilt',    # 0x9d
+'bbilp',    # 0x9e
+'bbilh',    # 0x9f
+'bbim',    # 0xa0
+'bbib',    # 0xa1
+'bbibs',    # 0xa2
+'bbis',    # 0xa3
+'bbiss',    # 0xa4
+'bbing',    # 0xa5
+'bbij',    # 0xa6
+'bbic',    # 0xa7
+'bbik',    # 0xa8
+'bbit',    # 0xa9
+'bbip',    # 0xaa
+'bbih',    # 0xab
+'sa',    # 0xac
+'sag',    # 0xad
+'sagg',    # 0xae
+'sags',    # 0xaf
+'san',    # 0xb0
+'sanj',    # 0xb1
+'sanh',    # 0xb2
+'sad',    # 0xb3
+'sal',    # 0xb4
+'salg',    # 0xb5
+'salm',    # 0xb6
+'salb',    # 0xb7
+'sals',    # 0xb8
+'salt',    # 0xb9
+'salp',    # 0xba
+'salh',    # 0xbb
+'sam',    # 0xbc
+'sab',    # 0xbd
+'sabs',    # 0xbe
+'sas',    # 0xbf
+'sass',    # 0xc0
+'sang',    # 0xc1
+'saj',    # 0xc2
+'sac',    # 0xc3
+'sak',    # 0xc4
+'sat',    # 0xc5
+'sap',    # 0xc6
+'sah',    # 0xc7
+'sae',    # 0xc8
+'saeg',    # 0xc9
+'saegg',    # 0xca
+'saegs',    # 0xcb
+'saen',    # 0xcc
+'saenj',    # 0xcd
+'saenh',    # 0xce
+'saed',    # 0xcf
+'sael',    # 0xd0
+'saelg',    # 0xd1
+'saelm',    # 0xd2
+'saelb',    # 0xd3
+'saels',    # 0xd4
+'saelt',    # 0xd5
+'saelp',    # 0xd6
+'saelh',    # 0xd7
+'saem',    # 0xd8
+'saeb',    # 0xd9
+'saebs',    # 0xda
+'saes',    # 0xdb
+'saess',    # 0xdc
+'saeng',    # 0xdd
+'saej',    # 0xde
+'saec',    # 0xdf
+'saek',    # 0xe0
+'saet',    # 0xe1
+'saep',    # 0xe2
+'saeh',    # 0xe3
+'sya',    # 0xe4
+'syag',    # 0xe5
+'syagg',    # 0xe6
+'syags',    # 0xe7
+'syan',    # 0xe8
+'syanj',    # 0xe9
+'syanh',    # 0xea
+'syad',    # 0xeb
+'syal',    # 0xec
+'syalg',    # 0xed
+'syalm',    # 0xee
+'syalb',    # 0xef
+'syals',    # 0xf0
+'syalt',    # 0xf1
+'syalp',    # 0xf2
+'syalh',    # 0xf3
+'syam',    # 0xf4
+'syab',    # 0xf5
+'syabs',    # 0xf6
+'syas',    # 0xf7
+'syass',    # 0xf8
+'syang',    # 0xf9
+'syaj',    # 0xfa
+'syac',    # 0xfb
+'syak',    # 0xfc
+'syat',    # 0xfd
+'syap',    # 0xfe
+'syah',    # 0xff
+)
diff --git a/lib/unidecode/x0c1.py b/lib/unidecode/x0c1.py
new file mode 100644
index 00000000..776847f4
--- /dev/null
+++ b/lib/unidecode/x0c1.py
@@ -0,0 +1,258 @@
+data = (
+'syae',    # 0x00
+'syaeg',    # 0x01
+'syaegg',    # 0x02
+'syaegs',    # 0x03
+'syaen',    # 0x04
+'syaenj',    # 0x05
+'syaenh',    # 0x06
+'syaed',    # 0x07
+'syael',    # 0x08
+'syaelg',    # 0x09
+'syaelm',    # 0x0a
+'syaelb',    # 0x0b
+'syaels',    # 0x0c
+'syaelt',    # 0x0d
+'syaelp',    # 0x0e
+'syaelh',    # 0x0f
+'syaem',    # 0x10
+'syaeb',    # 0x11
+'syaebs',    # 0x12
+'syaes',    # 0x13
+'syaess',    # 0x14
+'syaeng',    # 0x15
+'syaej',    # 0x16
+'syaec',    # 0x17
+'syaek',    # 0x18
+'syaet',    # 0x19
+'syaep',    # 0x1a
+'syaeh',    # 0x1b
+'seo',    # 0x1c
+'seog',    # 0x1d
+'seogg',    # 0x1e
+'seogs',    # 0x1f
+'seon',    # 0x20
+'seonj',    # 0x21
+'seonh',    # 0x22
+'seod',    # 0x23
+'seol',    # 0x24
+'seolg',    # 0x25
+'seolm',    # 0x26
+'seolb',    # 0x27
+'seols',    # 0x28
+'seolt',    # 0x29
+'seolp',    # 0x2a
+'seolh',    # 0x2b
+'seom',    # 0x2c
+'seob',    # 0x2d
+'seobs',    # 0x2e
+'seos',    # 0x2f
+'seoss',    # 0x30
+'seong',    # 0x31
+'seoj',    # 0x32
+'seoc',    # 0x33
+'seok',    # 0x34
+'seot',    # 0x35
+'seop',    # 0x36
+'seoh',    # 0x37
+'se',    # 0x38
+'seg',    # 0x39
+'segg',    # 0x3a
+'segs',    # 0x3b
+'sen',    # 0x3c
+'senj',    # 0x3d
+'senh',    # 0x3e
+'sed',    # 0x3f
+'sel',    # 0x40
+'selg',    # 0x41
+'selm',    # 0x42
+'selb',    # 0x43
+'sels',    # 0x44
+'selt',    # 0x45
+'selp',    # 0x46
+'selh',    # 0x47
+'sem',    # 0x48
+'seb',    # 0x49
+'sebs',    # 0x4a
+'ses',    # 0x4b
+'sess',    # 0x4c
+'seng',    # 0x4d
+'sej',    # 0x4e
+'sec',    # 0x4f
+'sek',    # 0x50
+'set',    # 0x51
+'sep',    # 0x52
+'seh',    # 0x53
+'syeo',    # 0x54
+'syeog',    # 0x55
+'syeogg',    # 0x56
+'syeogs',    # 0x57
+'syeon',    # 0x58
+'syeonj',    # 0x59
+'syeonh',    # 0x5a
+'syeod',    # 0x5b
+'syeol',    # 0x5c
+'syeolg',    # 0x5d
+'syeolm',    # 0x5e
+'syeolb',    # 0x5f
+'syeols',    # 0x60
+'syeolt',    # 0x61
+'syeolp',    # 0x62
+'syeolh',    # 0x63
+'syeom',    # 0x64
+'syeob',    # 0x65
+'syeobs',    # 0x66
+'syeos',    # 0x67
+'syeoss',    # 0x68
+'syeong',    # 0x69
+'syeoj',    # 0x6a
+'syeoc',    # 0x6b
+'syeok',    # 0x6c
+'syeot',    # 0x6d
+'syeop',    # 0x6e
+'syeoh',    # 0x6f
+'sye',    # 0x70
+'syeg',    # 0x71
+'syegg',    # 0x72
+'syegs',    # 0x73
+'syen',    # 0x74
+'syenj',    # 0x75
+'syenh',    # 0x76
+'syed',    # 0x77
+'syel',    # 0x78
+'syelg',    # 0x79
+'syelm',    # 0x7a
+'syelb',    # 0x7b
+'syels',    # 0x7c
+'syelt',    # 0x7d
+'syelp',    # 0x7e
+'syelh',    # 0x7f
+'syem',    # 0x80
+'syeb',    # 0x81
+'syebs',    # 0x82
+'syes',    # 0x83
+'syess',    # 0x84
+'syeng',    # 0x85
+'syej',    # 0x86
+'syec',    # 0x87
+'syek',    # 0x88
+'syet',    # 0x89
+'syep',    # 0x8a
+'syeh',    # 0x8b
+'so',    # 0x8c
+'sog',    # 0x8d
+'sogg',    # 0x8e
+'sogs',    # 0x8f
+'son',    # 0x90
+'sonj',    # 0x91
+'sonh',    # 0x92
+'sod',    # 0x93
+'sol',    # 0x94
+'solg',    # 0x95
+'solm',    # 0x96
+'solb',    # 0x97
+'sols',    # 0x98
+'solt',    # 0x99
+'solp',    # 0x9a
+'solh',    # 0x9b
+'som',    # 0x9c
+'sob',    # 0x9d
+'sobs',    # 0x9e
+'sos',    # 0x9f
+'soss',    # 0xa0
+'song',    # 0xa1
+'soj',    # 0xa2
+'soc',    # 0xa3
+'sok',    # 0xa4
+'sot',    # 0xa5
+'sop',    # 0xa6
+'soh',    # 0xa7
+'swa',    # 0xa8
+'swag',    # 0xa9
+'swagg',    # 0xaa
+'swags',    # 0xab
+'swan',    # 0xac
+'swanj',    # 0xad
+'swanh',    # 0xae
+'swad',    # 0xaf
+'swal',    # 0xb0
+'swalg',    # 0xb1
+'swalm',    # 0xb2
+'swalb',    # 0xb3
+'swals',    # 0xb4
+'swalt',    # 0xb5
+'swalp',    # 0xb6
+'swalh',    # 0xb7
+'swam',    # 0xb8
+'swab',    # 0xb9
+'swabs',    # 0xba
+'swas',    # 0xbb
+'swass',    # 0xbc
+'swang',    # 0xbd
+'swaj',    # 0xbe
+'swac',    # 0xbf
+'swak',    # 0xc0
+'swat',    # 0xc1
+'swap',    # 0xc2
+'swah',    # 0xc3
+'swae',    # 0xc4
+'swaeg',    # 0xc5
+'swaegg',    # 0xc6
+'swaegs',    # 0xc7
+'swaen',    # 0xc8
+'swaenj',    # 0xc9
+'swaenh',    # 0xca
+'swaed',    # 0xcb
+'swael',    # 0xcc
+'swaelg',    # 0xcd
+'swaelm',    # 0xce
+'swaelb',    # 0xcf
+'swaels',    # 0xd0
+'swaelt',    # 0xd1
+'swaelp',    # 0xd2
+'swaelh',    # 0xd3
+'swaem',    # 0xd4
+'swaeb',    # 0xd5
+'swaebs',    # 0xd6
+'swaes',    # 0xd7
+'swaess',    # 0xd8
+'swaeng',    # 0xd9
+'swaej',    # 0xda
+'swaec',    # 0xdb
+'swaek',    # 0xdc
+'swaet',    # 0xdd
+'swaep',    # 0xde
+'swaeh',    # 0xdf
+'soe',    # 0xe0
+'soeg',    # 0xe1
+'soegg',    # 0xe2
+'soegs',    # 0xe3
+'soen',    # 0xe4
+'soenj',    # 0xe5
+'soenh',    # 0xe6
+'soed',    # 0xe7
+'soel',    # 0xe8
+'soelg',    # 0xe9
+'soelm',    # 0xea
+'soelb',    # 0xeb
+'soels',    # 0xec
+'soelt',    # 0xed
+'soelp',    # 0xee
+'soelh',    # 0xef
+'soem',    # 0xf0
+'soeb',    # 0xf1
+'soebs',    # 0xf2
+'soes',    # 0xf3
+'soess',    # 0xf4
+'soeng',    # 0xf5
+'soej',    # 0xf6
+'soec',    # 0xf7
+'soek',    # 0xf8
+'soet',    # 0xf9
+'soep',    # 0xfa
+'soeh',    # 0xfb
+'syo',    # 0xfc
+'syog',    # 0xfd
+'syogg',    # 0xfe
+'syogs',    # 0xff
+)
diff --git a/lib/unidecode/x0c2.py b/lib/unidecode/x0c2.py
new file mode 100644
index 00000000..5b799cb6
--- /dev/null
+++ b/lib/unidecode/x0c2.py
@@ -0,0 +1,258 @@
+data = (
+'syon',    # 0x00
+'syonj',    # 0x01
+'syonh',    # 0x02
+'syod',    # 0x03
+'syol',    # 0x04
+'syolg',    # 0x05
+'syolm',    # 0x06
+'syolb',    # 0x07
+'syols',    # 0x08
+'syolt',    # 0x09
+'syolp',    # 0x0a
+'syolh',    # 0x0b
+'syom',    # 0x0c
+'syob',    # 0x0d
+'syobs',    # 0x0e
+'syos',    # 0x0f
+'syoss',    # 0x10
+'syong',    # 0x11
+'syoj',    # 0x12
+'syoc',    # 0x13
+'syok',    # 0x14
+'syot',    # 0x15
+'syop',    # 0x16
+'syoh',    # 0x17
+'su',    # 0x18
+'sug',    # 0x19
+'sugg',    # 0x1a
+'sugs',    # 0x1b
+'sun',    # 0x1c
+'sunj',    # 0x1d
+'sunh',    # 0x1e
+'sud',    # 0x1f
+'sul',    # 0x20
+'sulg',    # 0x21
+'sulm',    # 0x22
+'sulb',    # 0x23
+'suls',    # 0x24
+'sult',    # 0x25
+'sulp',    # 0x26
+'sulh',    # 0x27
+'sum',    # 0x28
+'sub',    # 0x29
+'subs',    # 0x2a
+'sus',    # 0x2b
+'suss',    # 0x2c
+'sung',    # 0x2d
+'suj',    # 0x2e
+'suc',    # 0x2f
+'suk',    # 0x30
+'sut',    # 0x31
+'sup',    # 0x32
+'suh',    # 0x33
+'sweo',    # 0x34
+'sweog',    # 0x35
+'sweogg',    # 0x36
+'sweogs',    # 0x37
+'sweon',    # 0x38
+'sweonj',    # 0x39
+'sweonh',    # 0x3a
+'sweod',    # 0x3b
+'sweol',    # 0x3c
+'sweolg',    # 0x3d
+'sweolm',    # 0x3e
+'sweolb',    # 0x3f
+'sweols',    # 0x40
+'sweolt',    # 0x41
+'sweolp',    # 0x42
+'sweolh',    # 0x43
+'sweom',    # 0x44
+'sweob',    # 0x45
+'sweobs',    # 0x46
+'sweos',    # 0x47
+'sweoss',    # 0x48
+'sweong',    # 0x49
+'sweoj',    # 0x4a
+'sweoc',    # 0x4b
+'sweok',    # 0x4c
+'sweot',    # 0x4d
+'sweop',    # 0x4e
+'sweoh',    # 0x4f
+'swe',    # 0x50
+'sweg',    # 0x51
+'swegg',    # 0x52
+'swegs',    # 0x53
+'swen',    # 0x54
+'swenj',    # 0x55
+'swenh',    # 0x56
+'swed',    # 0x57
+'swel',    # 0x58
+'swelg',    # 0x59
+'swelm',    # 0x5a
+'swelb',    # 0x5b
+'swels',    # 0x5c
+'swelt',    # 0x5d
+'swelp',    # 0x5e
+'swelh',    # 0x5f
+'swem',    # 0x60
+'sweb',    # 0x61
+'swebs',    # 0x62
+'swes',    # 0x63
+'swess',    # 0x64
+'sweng',    # 0x65
+'swej',    # 0x66
+'swec',    # 0x67
+'swek',    # 0x68
+'swet',    # 0x69
+'swep',    # 0x6a
+'sweh',    # 0x6b
+'swi',    # 0x6c
+'swig',    # 0x6d
+'swigg',    # 0x6e
+'swigs',    # 0x6f
+'swin',    # 0x70
+'swinj',    # 0x71
+'swinh',    # 0x72
+'swid',    # 0x73
+'swil',    # 0x74
+'swilg',    # 0x75
+'swilm',    # 0x76
+'swilb',    # 0x77
+'swils',    # 0x78
+'swilt',    # 0x79
+'swilp',    # 0x7a
+'swilh',    # 0x7b
+'swim',    # 0x7c
+'swib',    # 0x7d
+'swibs',    # 0x7e
+'swis',    # 0x7f
+'swiss',    # 0x80
+'swing',    # 0x81
+'swij',    # 0x82
+'swic',    # 0x83
+'swik',    # 0x84
+'swit',    # 0x85
+'swip',    # 0x86
+'swih',    # 0x87
+'syu',    # 0x88
+'syug',    # 0x89
+'syugg',    # 0x8a
+'syugs',    # 0x8b
+'syun',    # 0x8c
+'syunj',    # 0x8d
+'syunh',    # 0x8e
+'syud',    # 0x8f
+'syul',    # 0x90
+'syulg',    # 0x91
+'syulm',    # 0x92
+'syulb',    # 0x93
+'syuls',    # 0x94
+'syult',    # 0x95
+'syulp',    # 0x96
+'syulh',    # 0x97
+'syum',    # 0x98
+'syub',    # 0x99
+'syubs',    # 0x9a
+'syus',    # 0x9b
+'syuss',    # 0x9c
+'syung',    # 0x9d
+'syuj',    # 0x9e
+'syuc',    # 0x9f
+'syuk',    # 0xa0
+'syut',    # 0xa1
+'syup',    # 0xa2
+'syuh',    # 0xa3
+'seu',    # 0xa4
+'seug',    # 0xa5
+'seugg',    # 0xa6
+'seugs',    # 0xa7
+'seun',    # 0xa8
+'seunj',    # 0xa9
+'seunh',    # 0xaa
+'seud',    # 0xab
+'seul',    # 0xac
+'seulg',    # 0xad
+'seulm',    # 0xae
+'seulb',    # 0xaf
+'seuls',    # 0xb0
+'seult',    # 0xb1
+'seulp',    # 0xb2
+'seulh',    # 0xb3
+'seum',    # 0xb4
+'seub',    # 0xb5
+'seubs',    # 0xb6
+'seus',    # 0xb7
+'seuss',    # 0xb8
+'seung',    # 0xb9
+'seuj',    # 0xba
+'seuc',    # 0xbb
+'seuk',    # 0xbc
+'seut',    # 0xbd
+'seup',    # 0xbe
+'seuh',    # 0xbf
+'syi',    # 0xc0
+'syig',    # 0xc1
+'syigg',    # 0xc2
+'syigs',    # 0xc3
+'syin',    # 0xc4
+'syinj',    # 0xc5
+'syinh',    # 0xc6
+'syid',    # 0xc7
+'syil',    # 0xc8
+'syilg',    # 0xc9
+'syilm',    # 0xca
+'syilb',    # 0xcb
+'syils',    # 0xcc
+'syilt',    # 0xcd
+'syilp',    # 0xce
+'syilh',    # 0xcf
+'syim',    # 0xd0
+'syib',    # 0xd1
+'syibs',    # 0xd2
+'syis',    # 0xd3
+'syiss',    # 0xd4
+'sying',    # 0xd5
+'syij',    # 0xd6
+'syic',    # 0xd7
+'syik',    # 0xd8
+'syit',    # 0xd9
+'syip',    # 0xda
+'syih',    # 0xdb
+'si',    # 0xdc
+'sig',    # 0xdd
+'sigg',    # 0xde
+'sigs',    # 0xdf
+'sin',    # 0xe0
+'sinj',    # 0xe1
+'sinh',    # 0xe2
+'sid',    # 0xe3
+'sil',    # 0xe4
+'silg',    # 0xe5
+'silm',    # 0xe6
+'silb',    # 0xe7
+'sils',    # 0xe8
+'silt',    # 0xe9
+'silp',    # 0xea
+'silh',    # 0xeb
+'sim',    # 0xec
+'sib',    # 0xed
+'sibs',    # 0xee
+'sis',    # 0xef
+'siss',    # 0xf0
+'sing',    # 0xf1
+'sij',    # 0xf2
+'sic',    # 0xf3
+'sik',    # 0xf4
+'sit',    # 0xf5
+'sip',    # 0xf6
+'sih',    # 0xf7
+'ssa',    # 0xf8
+'ssag',    # 0xf9
+'ssagg',    # 0xfa
+'ssags',    # 0xfb
+'ssan',    # 0xfc
+'ssanj',    # 0xfd
+'ssanh',    # 0xfe
+'ssad',    # 0xff
+)
diff --git a/lib/unidecode/x0c3.py b/lib/unidecode/x0c3.py
new file mode 100644
index 00000000..bc81d642
--- /dev/null
+++ b/lib/unidecode/x0c3.py
@@ -0,0 +1,258 @@
+data = (
+'ssal',    # 0x00
+'ssalg',    # 0x01
+'ssalm',    # 0x02
+'ssalb',    # 0x03
+'ssals',    # 0x04
+'ssalt',    # 0x05
+'ssalp',    # 0x06
+'ssalh',    # 0x07
+'ssam',    # 0x08
+'ssab',    # 0x09
+'ssabs',    # 0x0a
+'ssas',    # 0x0b
+'ssass',    # 0x0c
+'ssang',    # 0x0d
+'ssaj',    # 0x0e
+'ssac',    # 0x0f
+'ssak',    # 0x10
+'ssat',    # 0x11
+'ssap',    # 0x12
+'ssah',    # 0x13
+'ssae',    # 0x14
+'ssaeg',    # 0x15
+'ssaegg',    # 0x16
+'ssaegs',    # 0x17
+'ssaen',    # 0x18
+'ssaenj',    # 0x19
+'ssaenh',    # 0x1a
+'ssaed',    # 0x1b
+'ssael',    # 0x1c
+'ssaelg',    # 0x1d
+'ssaelm',    # 0x1e
+'ssaelb',    # 0x1f
+'ssaels',    # 0x20
+'ssaelt',    # 0x21
+'ssaelp',    # 0x22
+'ssaelh',    # 0x23
+'ssaem',    # 0x24
+'ssaeb',    # 0x25
+'ssaebs',    # 0x26
+'ssaes',    # 0x27
+'ssaess',    # 0x28
+'ssaeng',    # 0x29
+'ssaej',    # 0x2a
+'ssaec',    # 0x2b
+'ssaek',    # 0x2c
+'ssaet',    # 0x2d
+'ssaep',    # 0x2e
+'ssaeh',    # 0x2f
+'ssya',    # 0x30
+'ssyag',    # 0x31
+'ssyagg',    # 0x32
+'ssyags',    # 0x33
+'ssyan',    # 0x34
+'ssyanj',    # 0x35
+'ssyanh',    # 0x36
+'ssyad',    # 0x37
+'ssyal',    # 0x38
+'ssyalg',    # 0x39
+'ssyalm',    # 0x3a
+'ssyalb',    # 0x3b
+'ssyals',    # 0x3c
+'ssyalt',    # 0x3d
+'ssyalp',    # 0x3e
+'ssyalh',    # 0x3f
+'ssyam',    # 0x40
+'ssyab',    # 0x41
+'ssyabs',    # 0x42
+'ssyas',    # 0x43
+'ssyass',    # 0x44
+'ssyang',    # 0x45
+'ssyaj',    # 0x46
+'ssyac',    # 0x47
+'ssyak',    # 0x48
+'ssyat',    # 0x49
+'ssyap',    # 0x4a
+'ssyah',    # 0x4b
+'ssyae',    # 0x4c
+'ssyaeg',    # 0x4d
+'ssyaegg',    # 0x4e
+'ssyaegs',    # 0x4f
+'ssyaen',    # 0x50
+'ssyaenj',    # 0x51
+'ssyaenh',    # 0x52
+'ssyaed',    # 0x53
+'ssyael',    # 0x54
+'ssyaelg',    # 0x55
+'ssyaelm',    # 0x56
+'ssyaelb',    # 0x57
+'ssyaels',    # 0x58
+'ssyaelt',    # 0x59
+'ssyaelp',    # 0x5a
+'ssyaelh',    # 0x5b
+'ssyaem',    # 0x5c
+'ssyaeb',    # 0x5d
+'ssyaebs',    # 0x5e
+'ssyaes',    # 0x5f
+'ssyaess',    # 0x60
+'ssyaeng',    # 0x61
+'ssyaej',    # 0x62
+'ssyaec',    # 0x63
+'ssyaek',    # 0x64
+'ssyaet',    # 0x65
+'ssyaep',    # 0x66
+'ssyaeh',    # 0x67
+'sseo',    # 0x68
+'sseog',    # 0x69
+'sseogg',    # 0x6a
+'sseogs',    # 0x6b
+'sseon',    # 0x6c
+'sseonj',    # 0x6d
+'sseonh',    # 0x6e
+'sseod',    # 0x6f
+'sseol',    # 0x70
+'sseolg',    # 0x71
+'sseolm',    # 0x72
+'sseolb',    # 0x73
+'sseols',    # 0x74
+'sseolt',    # 0x75
+'sseolp',    # 0x76
+'sseolh',    # 0x77
+'sseom',    # 0x78
+'sseob',    # 0x79
+'sseobs',    # 0x7a
+'sseos',    # 0x7b
+'sseoss',    # 0x7c
+'sseong',    # 0x7d
+'sseoj',    # 0x7e
+'sseoc',    # 0x7f
+'sseok',    # 0x80
+'sseot',    # 0x81
+'sseop',    # 0x82
+'sseoh',    # 0x83
+'sse',    # 0x84
+'sseg',    # 0x85
+'ssegg',    # 0x86
+'ssegs',    # 0x87
+'ssen',    # 0x88
+'ssenj',    # 0x89
+'ssenh',    # 0x8a
+'ssed',    # 0x8b
+'ssel',    # 0x8c
+'sselg',    # 0x8d
+'sselm',    # 0x8e
+'sselb',    # 0x8f
+'ssels',    # 0x90
+'sselt',    # 0x91
+'sselp',    # 0x92
+'sselh',    # 0x93
+'ssem',    # 0x94
+'sseb',    # 0x95
+'ssebs',    # 0x96
+'sses',    # 0x97
+'ssess',    # 0x98
+'sseng',    # 0x99
+'ssej',    # 0x9a
+'ssec',    # 0x9b
+'ssek',    # 0x9c
+'sset',    # 0x9d
+'ssep',    # 0x9e
+'sseh',    # 0x9f
+'ssyeo',    # 0xa0
+'ssyeog',    # 0xa1
+'ssyeogg',    # 0xa2
+'ssyeogs',    # 0xa3
+'ssyeon',    # 0xa4
+'ssyeonj',    # 0xa5
+'ssyeonh',    # 0xa6
+'ssyeod',    # 0xa7
+'ssyeol',    # 0xa8
+'ssyeolg',    # 0xa9
+'ssyeolm',    # 0xaa
+'ssyeolb',    # 0xab
+'ssyeols',    # 0xac
+'ssyeolt',    # 0xad
+'ssyeolp',    # 0xae
+'ssyeolh',    # 0xaf
+'ssyeom',    # 0xb0
+'ssyeob',    # 0xb1
+'ssyeobs',    # 0xb2
+'ssyeos',    # 0xb3
+'ssyeoss',    # 0xb4
+'ssyeong',    # 0xb5
+'ssyeoj',    # 0xb6
+'ssyeoc',    # 0xb7
+'ssyeok',    # 0xb8
+'ssyeot',    # 0xb9
+'ssyeop',    # 0xba
+'ssyeoh',    # 0xbb
+'ssye',    # 0xbc
+'ssyeg',    # 0xbd
+'ssyegg',    # 0xbe
+'ssyegs',    # 0xbf
+'ssyen',    # 0xc0
+'ssyenj',    # 0xc1
+'ssyenh',    # 0xc2
+'ssyed',    # 0xc3
+'ssyel',    # 0xc4
+'ssyelg',    # 0xc5
+'ssyelm',    # 0xc6
+'ssyelb',    # 0xc7
+'ssyels',    # 0xc8
+'ssyelt',    # 0xc9
+'ssyelp',    # 0xca
+'ssyelh',    # 0xcb
+'ssyem',    # 0xcc
+'ssyeb',    # 0xcd
+'ssyebs',    # 0xce
+'ssyes',    # 0xcf
+'ssyess',    # 0xd0
+'ssyeng',    # 0xd1
+'ssyej',    # 0xd2
+'ssyec',    # 0xd3
+'ssyek',    # 0xd4
+'ssyet',    # 0xd5
+'ssyep',    # 0xd6
+'ssyeh',    # 0xd7
+'sso',    # 0xd8
+'ssog',    # 0xd9
+'ssogg',    # 0xda
+'ssogs',    # 0xdb
+'sson',    # 0xdc
+'ssonj',    # 0xdd
+'ssonh',    # 0xde
+'ssod',    # 0xdf
+'ssol',    # 0xe0
+'ssolg',    # 0xe1
+'ssolm',    # 0xe2
+'ssolb',    # 0xe3
+'ssols',    # 0xe4
+'ssolt',    # 0xe5
+'ssolp',    # 0xe6
+'ssolh',    # 0xe7
+'ssom',    # 0xe8
+'ssob',    # 0xe9
+'ssobs',    # 0xea
+'ssos',    # 0xeb
+'ssoss',    # 0xec
+'ssong',    # 0xed
+'ssoj',    # 0xee
+'ssoc',    # 0xef
+'ssok',    # 0xf0
+'ssot',    # 0xf1
+'ssop',    # 0xf2
+'ssoh',    # 0xf3
+'sswa',    # 0xf4
+'sswag',    # 0xf5
+'sswagg',    # 0xf6
+'sswags',    # 0xf7
+'sswan',    # 0xf8
+'sswanj',    # 0xf9
+'sswanh',    # 0xfa
+'sswad',    # 0xfb
+'sswal',    # 0xfc
+'sswalg',    # 0xfd
+'sswalm',    # 0xfe
+'sswalb',    # 0xff
+)
diff --git a/lib/unidecode/x0c4.py b/lib/unidecode/x0c4.py
new file mode 100644
index 00000000..6288ca63
--- /dev/null
+++ b/lib/unidecode/x0c4.py
@@ -0,0 +1,258 @@
+data = (
+'sswals',    # 0x00
+'sswalt',    # 0x01
+'sswalp',    # 0x02
+'sswalh',    # 0x03
+'sswam',    # 0x04
+'sswab',    # 0x05
+'sswabs',    # 0x06
+'sswas',    # 0x07
+'sswass',    # 0x08
+'sswang',    # 0x09
+'sswaj',    # 0x0a
+'sswac',    # 0x0b
+'sswak',    # 0x0c
+'sswat',    # 0x0d
+'sswap',    # 0x0e
+'sswah',    # 0x0f
+'sswae',    # 0x10
+'sswaeg',    # 0x11
+'sswaegg',    # 0x12
+'sswaegs',    # 0x13
+'sswaen',    # 0x14
+'sswaenj',    # 0x15
+'sswaenh',    # 0x16
+'sswaed',    # 0x17
+'sswael',    # 0x18
+'sswaelg',    # 0x19
+'sswaelm',    # 0x1a
+'sswaelb',    # 0x1b
+'sswaels',    # 0x1c
+'sswaelt',    # 0x1d
+'sswaelp',    # 0x1e
+'sswaelh',    # 0x1f
+'sswaem',    # 0x20
+'sswaeb',    # 0x21
+'sswaebs',    # 0x22
+'sswaes',    # 0x23
+'sswaess',    # 0x24
+'sswaeng',    # 0x25
+'sswaej',    # 0x26
+'sswaec',    # 0x27
+'sswaek',    # 0x28
+'sswaet',    # 0x29
+'sswaep',    # 0x2a
+'sswaeh',    # 0x2b
+'ssoe',    # 0x2c
+'ssoeg',    # 0x2d
+'ssoegg',    # 0x2e
+'ssoegs',    # 0x2f
+'ssoen',    # 0x30
+'ssoenj',    # 0x31
+'ssoenh',    # 0x32
+'ssoed',    # 0x33
+'ssoel',    # 0x34
+'ssoelg',    # 0x35
+'ssoelm',    # 0x36
+'ssoelb',    # 0x37
+'ssoels',    # 0x38
+'ssoelt',    # 0x39
+'ssoelp',    # 0x3a
+'ssoelh',    # 0x3b
+'ssoem',    # 0x3c
+'ssoeb',    # 0x3d
+'ssoebs',    # 0x3e
+'ssoes',    # 0x3f
+'ssoess',    # 0x40
+'ssoeng',    # 0x41
+'ssoej',    # 0x42
+'ssoec',    # 0x43
+'ssoek',    # 0x44
+'ssoet',    # 0x45
+'ssoep',    # 0x46
+'ssoeh',    # 0x47
+'ssyo',    # 0x48
+'ssyog',    # 0x49
+'ssyogg',    # 0x4a
+'ssyogs',    # 0x4b
+'ssyon',    # 0x4c
+'ssyonj',    # 0x4d
+'ssyonh',    # 0x4e
+'ssyod',    # 0x4f
+'ssyol',    # 0x50
+'ssyolg',    # 0x51
+'ssyolm',    # 0x52
+'ssyolb',    # 0x53
+'ssyols',    # 0x54
+'ssyolt',    # 0x55
+'ssyolp',    # 0x56
+'ssyolh',    # 0x57
+'ssyom',    # 0x58
+'ssyob',    # 0x59
+'ssyobs',    # 0x5a
+'ssyos',    # 0x5b
+'ssyoss',    # 0x5c
+'ssyong',    # 0x5d
+'ssyoj',    # 0x5e
+'ssyoc',    # 0x5f
+'ssyok',    # 0x60
+'ssyot',    # 0x61
+'ssyop',    # 0x62
+'ssyoh',    # 0x63
+'ssu',    # 0x64
+'ssug',    # 0x65
+'ssugg',    # 0x66
+'ssugs',    # 0x67
+'ssun',    # 0x68
+'ssunj',    # 0x69
+'ssunh',    # 0x6a
+'ssud',    # 0x6b
+'ssul',    # 0x6c
+'ssulg',    # 0x6d
+'ssulm',    # 0x6e
+'ssulb',    # 0x6f
+'ssuls',    # 0x70
+'ssult',    # 0x71
+'ssulp',    # 0x72
+'ssulh',    # 0x73
+'ssum',    # 0x74
+'ssub',    # 0x75
+'ssubs',    # 0x76
+'ssus',    # 0x77
+'ssuss',    # 0x78
+'ssung',    # 0x79
+'ssuj',    # 0x7a
+'ssuc',    # 0x7b
+'ssuk',    # 0x7c
+'ssut',    # 0x7d
+'ssup',    # 0x7e
+'ssuh',    # 0x7f
+'ssweo',    # 0x80
+'ssweog',    # 0x81
+'ssweogg',    # 0x82
+'ssweogs',    # 0x83
+'ssweon',    # 0x84
+'ssweonj',    # 0x85
+'ssweonh',    # 0x86
+'ssweod',    # 0x87
+'ssweol',    # 0x88
+'ssweolg',    # 0x89
+'ssweolm',    # 0x8a
+'ssweolb',    # 0x8b
+'ssweols',    # 0x8c
+'ssweolt',    # 0x8d
+'ssweolp',    # 0x8e
+'ssweolh',    # 0x8f
+'ssweom',    # 0x90
+'ssweob',    # 0x91
+'ssweobs',    # 0x92
+'ssweos',    # 0x93
+'ssweoss',    # 0x94
+'ssweong',    # 0x95
+'ssweoj',    # 0x96
+'ssweoc',    # 0x97
+'ssweok',    # 0x98
+'ssweot',    # 0x99
+'ssweop',    # 0x9a
+'ssweoh',    # 0x9b
+'sswe',    # 0x9c
+'ssweg',    # 0x9d
+'sswegg',    # 0x9e
+'sswegs',    # 0x9f
+'sswen',    # 0xa0
+'sswenj',    # 0xa1
+'sswenh',    # 0xa2
+'sswed',    # 0xa3
+'sswel',    # 0xa4
+'sswelg',    # 0xa5
+'sswelm',    # 0xa6
+'sswelb',    # 0xa7
+'sswels',    # 0xa8
+'sswelt',    # 0xa9
+'sswelp',    # 0xaa
+'sswelh',    # 0xab
+'sswem',    # 0xac
+'ssweb',    # 0xad
+'sswebs',    # 0xae
+'sswes',    # 0xaf
+'sswess',    # 0xb0
+'ssweng',    # 0xb1
+'sswej',    # 0xb2
+'sswec',    # 0xb3
+'sswek',    # 0xb4
+'sswet',    # 0xb5
+'sswep',    # 0xb6
+'ssweh',    # 0xb7
+'sswi',    # 0xb8
+'sswig',    # 0xb9
+'sswigg',    # 0xba
+'sswigs',    # 0xbb
+'sswin',    # 0xbc
+'sswinj',    # 0xbd
+'sswinh',    # 0xbe
+'sswid',    # 0xbf
+'sswil',    # 0xc0
+'sswilg',    # 0xc1
+'sswilm',    # 0xc2
+'sswilb',    # 0xc3
+'sswils',    # 0xc4
+'sswilt',    # 0xc5
+'sswilp',    # 0xc6
+'sswilh',    # 0xc7
+'sswim',    # 0xc8
+'sswib',    # 0xc9
+'sswibs',    # 0xca
+'sswis',    # 0xcb
+'sswiss',    # 0xcc
+'sswing',    # 0xcd
+'sswij',    # 0xce
+'sswic',    # 0xcf
+'sswik',    # 0xd0
+'sswit',    # 0xd1
+'sswip',    # 0xd2
+'sswih',    # 0xd3
+'ssyu',    # 0xd4
+'ssyug',    # 0xd5
+'ssyugg',    # 0xd6
+'ssyugs',    # 0xd7
+'ssyun',    # 0xd8
+'ssyunj',    # 0xd9
+'ssyunh',    # 0xda
+'ssyud',    # 0xdb
+'ssyul',    # 0xdc
+'ssyulg',    # 0xdd
+'ssyulm',    # 0xde
+'ssyulb',    # 0xdf
+'ssyuls',    # 0xe0
+'ssyult',    # 0xe1
+'ssyulp',    # 0xe2
+'ssyulh',    # 0xe3
+'ssyum',    # 0xe4
+'ssyub',    # 0xe5
+'ssyubs',    # 0xe6
+'ssyus',    # 0xe7
+'ssyuss',    # 0xe8
+'ssyung',    # 0xe9
+'ssyuj',    # 0xea
+'ssyuc',    # 0xeb
+'ssyuk',    # 0xec
+'ssyut',    # 0xed
+'ssyup',    # 0xee
+'ssyuh',    # 0xef
+'sseu',    # 0xf0
+'sseug',    # 0xf1
+'sseugg',    # 0xf2
+'sseugs',    # 0xf3
+'sseun',    # 0xf4
+'sseunj',    # 0xf5
+'sseunh',    # 0xf6
+'sseud',    # 0xf7
+'sseul',    # 0xf8
+'sseulg',    # 0xf9
+'sseulm',    # 0xfa
+'sseulb',    # 0xfb
+'sseuls',    # 0xfc
+'sseult',    # 0xfd
+'sseulp',    # 0xfe
+'sseulh',    # 0xff
+)
diff --git a/lib/unidecode/x0c5.py b/lib/unidecode/x0c5.py
new file mode 100644
index 00000000..3f4778e7
--- /dev/null
+++ b/lib/unidecode/x0c5.py
@@ -0,0 +1,258 @@
+data = (
+'sseum',    # 0x00
+'sseub',    # 0x01
+'sseubs',    # 0x02
+'sseus',    # 0x03
+'sseuss',    # 0x04
+'sseung',    # 0x05
+'sseuj',    # 0x06
+'sseuc',    # 0x07
+'sseuk',    # 0x08
+'sseut',    # 0x09
+'sseup',    # 0x0a
+'sseuh',    # 0x0b
+'ssyi',    # 0x0c
+'ssyig',    # 0x0d
+'ssyigg',    # 0x0e
+'ssyigs',    # 0x0f
+'ssyin',    # 0x10
+'ssyinj',    # 0x11
+'ssyinh',    # 0x12
+'ssyid',    # 0x13
+'ssyil',    # 0x14
+'ssyilg',    # 0x15
+'ssyilm',    # 0x16
+'ssyilb',    # 0x17
+'ssyils',    # 0x18
+'ssyilt',    # 0x19
+'ssyilp',    # 0x1a
+'ssyilh',    # 0x1b
+'ssyim',    # 0x1c
+'ssyib',    # 0x1d
+'ssyibs',    # 0x1e
+'ssyis',    # 0x1f
+'ssyiss',    # 0x20
+'ssying',    # 0x21
+'ssyij',    # 0x22
+'ssyic',    # 0x23
+'ssyik',    # 0x24
+'ssyit',    # 0x25
+'ssyip',    # 0x26
+'ssyih',    # 0x27
+'ssi',    # 0x28
+'ssig',    # 0x29
+'ssigg',    # 0x2a
+'ssigs',    # 0x2b
+'ssin',    # 0x2c
+'ssinj',    # 0x2d
+'ssinh',    # 0x2e
+'ssid',    # 0x2f
+'ssil',    # 0x30
+'ssilg',    # 0x31
+'ssilm',    # 0x32
+'ssilb',    # 0x33
+'ssils',    # 0x34
+'ssilt',    # 0x35
+'ssilp',    # 0x36
+'ssilh',    # 0x37
+'ssim',    # 0x38
+'ssib',    # 0x39
+'ssibs',    # 0x3a
+'ssis',    # 0x3b
+'ssiss',    # 0x3c
+'ssing',    # 0x3d
+'ssij',    # 0x3e
+'ssic',    # 0x3f
+'ssik',    # 0x40
+'ssit',    # 0x41
+'ssip',    # 0x42
+'ssih',    # 0x43
+'a',    # 0x44
+'ag',    # 0x45
+'agg',    # 0x46
+'ags',    # 0x47
+'an',    # 0x48
+'anj',    # 0x49
+'anh',    # 0x4a
+'ad',    # 0x4b
+'al',    # 0x4c
+'alg',    # 0x4d
+'alm',    # 0x4e
+'alb',    # 0x4f
+'als',    # 0x50
+'alt',    # 0x51
+'alp',    # 0x52
+'alh',    # 0x53
+'am',    # 0x54
+'ab',    # 0x55
+'abs',    # 0x56
+'as',    # 0x57
+'ass',    # 0x58
+'ang',    # 0x59
+'aj',    # 0x5a
+'ac',    # 0x5b
+'ak',    # 0x5c
+'at',    # 0x5d
+'ap',    # 0x5e
+'ah',    # 0x5f
+'ae',    # 0x60
+'aeg',    # 0x61
+'aegg',    # 0x62
+'aegs',    # 0x63
+'aen',    # 0x64
+'aenj',    # 0x65
+'aenh',    # 0x66
+'aed',    # 0x67
+'ael',    # 0x68
+'aelg',    # 0x69
+'aelm',    # 0x6a
+'aelb',    # 0x6b
+'aels',    # 0x6c
+'aelt',    # 0x6d
+'aelp',    # 0x6e
+'aelh',    # 0x6f
+'aem',    # 0x70
+'aeb',    # 0x71
+'aebs',    # 0x72
+'aes',    # 0x73
+'aess',    # 0x74
+'aeng',    # 0x75
+'aej',    # 0x76
+'aec',    # 0x77
+'aek',    # 0x78
+'aet',    # 0x79
+'aep',    # 0x7a
+'aeh',    # 0x7b
+'ya',    # 0x7c
+'yag',    # 0x7d
+'yagg',    # 0x7e
+'yags',    # 0x7f
+'yan',    # 0x80
+'yanj',    # 0x81
+'yanh',    # 0x82
+'yad',    # 0x83
+'yal',    # 0x84
+'yalg',    # 0x85
+'yalm',    # 0x86
+'yalb',    # 0x87
+'yals',    # 0x88
+'yalt',    # 0x89
+'yalp',    # 0x8a
+'yalh',    # 0x8b
+'yam',    # 0x8c
+'yab',    # 0x8d
+'yabs',    # 0x8e
+'yas',    # 0x8f
+'yass',    # 0x90
+'yang',    # 0x91
+'yaj',    # 0x92
+'yac',    # 0x93
+'yak',    # 0x94
+'yat',    # 0x95
+'yap',    # 0x96
+'yah',    # 0x97
+'yae',    # 0x98
+'yaeg',    # 0x99
+'yaegg',    # 0x9a
+'yaegs',    # 0x9b
+'yaen',    # 0x9c
+'yaenj',    # 0x9d
+'yaenh',    # 0x9e
+'yaed',    # 0x9f
+'yael',    # 0xa0
+'yaelg',    # 0xa1
+'yaelm',    # 0xa2
+'yaelb',    # 0xa3
+'yaels',    # 0xa4
+'yaelt',    # 0xa5
+'yaelp',    # 0xa6
+'yaelh',    # 0xa7
+'yaem',    # 0xa8
+'yaeb',    # 0xa9
+'yaebs',    # 0xaa
+'yaes',    # 0xab
+'yaess',    # 0xac
+'yaeng',    # 0xad
+'yaej',    # 0xae
+'yaec',    # 0xaf
+'yaek',    # 0xb0
+'yaet',    # 0xb1
+'yaep',    # 0xb2
+'yaeh',    # 0xb3
+'eo',    # 0xb4
+'eog',    # 0xb5
+'eogg',    # 0xb6
+'eogs',    # 0xb7
+'eon',    # 0xb8
+'eonj',    # 0xb9
+'eonh',    # 0xba
+'eod',    # 0xbb
+'eol',    # 0xbc
+'eolg',    # 0xbd
+'eolm',    # 0xbe
+'eolb',    # 0xbf
+'eols',    # 0xc0
+'eolt',    # 0xc1
+'eolp',    # 0xc2
+'eolh',    # 0xc3
+'eom',    # 0xc4
+'eob',    # 0xc5
+'eobs',    # 0xc6
+'eos',    # 0xc7
+'eoss',    # 0xc8
+'eong',    # 0xc9
+'eoj',    # 0xca
+'eoc',    # 0xcb
+'eok',    # 0xcc
+'eot',    # 0xcd
+'eop',    # 0xce
+'eoh',    # 0xcf
+'e',    # 0xd0
+'eg',    # 0xd1
+'egg',    # 0xd2
+'egs',    # 0xd3
+'en',    # 0xd4
+'enj',    # 0xd5
+'enh',    # 0xd6
+'ed',    # 0xd7
+'el',    # 0xd8
+'elg',    # 0xd9
+'elm',    # 0xda
+'elb',    # 0xdb
+'els',    # 0xdc
+'elt',    # 0xdd
+'elp',    # 0xde
+'elh',    # 0xdf
+'em',    # 0xe0
+'eb',    # 0xe1
+'ebs',    # 0xe2
+'es',    # 0xe3
+'ess',    # 0xe4
+'eng',    # 0xe5
+'ej',    # 0xe6
+'ec',    # 0xe7
+'ek',    # 0xe8
+'et',    # 0xe9
+'ep',    # 0xea
+'eh',    # 0xeb
+'yeo',    # 0xec
+'yeog',    # 0xed
+'yeogg',    # 0xee
+'yeogs',    # 0xef
+'yeon',    # 0xf0
+'yeonj',    # 0xf1
+'yeonh',    # 0xf2
+'yeod',    # 0xf3
+'yeol',    # 0xf4
+'yeolg',    # 0xf5
+'yeolm',    # 0xf6
+'yeolb',    # 0xf7
+'yeols',    # 0xf8
+'yeolt',    # 0xf9
+'yeolp',    # 0xfa
+'yeolh',    # 0xfb
+'yeom',    # 0xfc
+'yeob',    # 0xfd
+'yeobs',    # 0xfe
+'yeos',    # 0xff
+)
diff --git a/lib/unidecode/x0c6.py b/lib/unidecode/x0c6.py
new file mode 100644
index 00000000..c6eeaeba
--- /dev/null
+++ b/lib/unidecode/x0c6.py
@@ -0,0 +1,258 @@
+data = (
+'yeoss',    # 0x00
+'yeong',    # 0x01
+'yeoj',    # 0x02
+'yeoc',    # 0x03
+'yeok',    # 0x04
+'yeot',    # 0x05
+'yeop',    # 0x06
+'yeoh',    # 0x07
+'ye',    # 0x08
+'yeg',    # 0x09
+'yegg',    # 0x0a
+'yegs',    # 0x0b
+'yen',    # 0x0c
+'yenj',    # 0x0d
+'yenh',    # 0x0e
+'yed',    # 0x0f
+'yel',    # 0x10
+'yelg',    # 0x11
+'yelm',    # 0x12
+'yelb',    # 0x13
+'yels',    # 0x14
+'yelt',    # 0x15
+'yelp',    # 0x16
+'yelh',    # 0x17
+'yem',    # 0x18
+'yeb',    # 0x19
+'yebs',    # 0x1a
+'yes',    # 0x1b
+'yess',    # 0x1c
+'yeng',    # 0x1d
+'yej',    # 0x1e
+'yec',    # 0x1f
+'yek',    # 0x20
+'yet',    # 0x21
+'yep',    # 0x22
+'yeh',    # 0x23
+'o',    # 0x24
+'og',    # 0x25
+'ogg',    # 0x26
+'ogs',    # 0x27
+'on',    # 0x28
+'onj',    # 0x29
+'onh',    # 0x2a
+'od',    # 0x2b
+'ol',    # 0x2c
+'olg',    # 0x2d
+'olm',    # 0x2e
+'olb',    # 0x2f
+'ols',    # 0x30
+'olt',    # 0x31
+'olp',    # 0x32
+'olh',    # 0x33
+'om',    # 0x34
+'ob',    # 0x35
+'obs',    # 0x36
+'os',    # 0x37
+'oss',    # 0x38
+'ong',    # 0x39
+'oj',    # 0x3a
+'oc',    # 0x3b
+'ok',    # 0x3c
+'ot',    # 0x3d
+'op',    # 0x3e
+'oh',    # 0x3f
+'wa',    # 0x40
+'wag',    # 0x41
+'wagg',    # 0x42
+'wags',    # 0x43
+'wan',    # 0x44
+'wanj',    # 0x45
+'wanh',    # 0x46
+'wad',    # 0x47
+'wal',    # 0x48
+'walg',    # 0x49
+'walm',    # 0x4a
+'walb',    # 0x4b
+'wals',    # 0x4c
+'walt',    # 0x4d
+'walp',    # 0x4e
+'walh',    # 0x4f
+'wam',    # 0x50
+'wab',    # 0x51
+'wabs',    # 0x52
+'was',    # 0x53
+'wass',    # 0x54
+'wang',    # 0x55
+'waj',    # 0x56
+'wac',    # 0x57
+'wak',    # 0x58
+'wat',    # 0x59
+'wap',    # 0x5a
+'wah',    # 0x5b
+'wae',    # 0x5c
+'waeg',    # 0x5d
+'waegg',    # 0x5e
+'waegs',    # 0x5f
+'waen',    # 0x60
+'waenj',    # 0x61
+'waenh',    # 0x62
+'waed',    # 0x63
+'wael',    # 0x64
+'waelg',    # 0x65
+'waelm',    # 0x66
+'waelb',    # 0x67
+'waels',    # 0x68
+'waelt',    # 0x69
+'waelp',    # 0x6a
+'waelh',    # 0x6b
+'waem',    # 0x6c
+'waeb',    # 0x6d
+'waebs',    # 0x6e
+'waes',    # 0x6f
+'waess',    # 0x70
+'waeng',    # 0x71
+'waej',    # 0x72
+'waec',    # 0x73
+'waek',    # 0x74
+'waet',    # 0x75
+'waep',    # 0x76
+'waeh',    # 0x77
+'oe',    # 0x78
+'oeg',    # 0x79
+'oegg',    # 0x7a
+'oegs',    # 0x7b
+'oen',    # 0x7c
+'oenj',    # 0x7d
+'oenh',    # 0x7e
+'oed',    # 0x7f
+'oel',    # 0x80
+'oelg',    # 0x81
+'oelm',    # 0x82
+'oelb',    # 0x83
+'oels',    # 0x84
+'oelt',    # 0x85
+'oelp',    # 0x86
+'oelh',    # 0x87
+'oem',    # 0x88
+'oeb',    # 0x89
+'oebs',    # 0x8a
+'oes',    # 0x8b
+'oess',    # 0x8c
+'oeng',    # 0x8d
+'oej',    # 0x8e
+'oec',    # 0x8f
+'oek',    # 0x90
+'oet',    # 0x91
+'oep',    # 0x92
+'oeh',    # 0x93
+'yo',    # 0x94
+'yog',    # 0x95
+'yogg',    # 0x96
+'yogs',    # 0x97
+'yon',    # 0x98
+'yonj',    # 0x99
+'yonh',    # 0x9a
+'yod',    # 0x9b
+'yol',    # 0x9c
+'yolg',    # 0x9d
+'yolm',    # 0x9e
+'yolb',    # 0x9f
+'yols',    # 0xa0
+'yolt',    # 0xa1
+'yolp',    # 0xa2
+'yolh',    # 0xa3
+'yom',    # 0xa4
+'yob',    # 0xa5
+'yobs',    # 0xa6
+'yos',    # 0xa7
+'yoss',    # 0xa8
+'yong',    # 0xa9
+'yoj',    # 0xaa
+'yoc',    # 0xab
+'yok',    # 0xac
+'yot',    # 0xad
+'yop',    # 0xae
+'yoh',    # 0xaf
+'u',    # 0xb0
+'ug',    # 0xb1
+'ugg',    # 0xb2
+'ugs',    # 0xb3
+'un',    # 0xb4
+'unj',    # 0xb5
+'unh',    # 0xb6
+'ud',    # 0xb7
+'ul',    # 0xb8
+'ulg',    # 0xb9
+'ulm',    # 0xba
+'ulb',    # 0xbb
+'uls',    # 0xbc
+'ult',    # 0xbd
+'ulp',    # 0xbe
+'ulh',    # 0xbf
+'um',    # 0xc0
+'ub',    # 0xc1
+'ubs',    # 0xc2
+'us',    # 0xc3
+'uss',    # 0xc4
+'ung',    # 0xc5
+'uj',    # 0xc6
+'uc',    # 0xc7
+'uk',    # 0xc8
+'ut',    # 0xc9
+'up',    # 0xca
+'uh',    # 0xcb
+'weo',    # 0xcc
+'weog',    # 0xcd
+'weogg',    # 0xce
+'weogs',    # 0xcf
+'weon',    # 0xd0
+'weonj',    # 0xd1
+'weonh',    # 0xd2
+'weod',    # 0xd3
+'weol',    # 0xd4
+'weolg',    # 0xd5
+'weolm',    # 0xd6
+'weolb',    # 0xd7
+'weols',    # 0xd8
+'weolt',    # 0xd9
+'weolp',    # 0xda
+'weolh',    # 0xdb
+'weom',    # 0xdc
+'weob',    # 0xdd
+'weobs',    # 0xde
+'weos',    # 0xdf
+'weoss',    # 0xe0
+'weong',    # 0xe1
+'weoj',    # 0xe2
+'weoc',    # 0xe3
+'weok',    # 0xe4
+'weot',    # 0xe5
+'weop',    # 0xe6
+'weoh',    # 0xe7
+'we',    # 0xe8
+'weg',    # 0xe9
+'wegg',    # 0xea
+'wegs',    # 0xeb
+'wen',    # 0xec
+'wenj',    # 0xed
+'wenh',    # 0xee
+'wed',    # 0xef
+'wel',    # 0xf0
+'welg',    # 0xf1
+'welm',    # 0xf2
+'welb',    # 0xf3
+'wels',    # 0xf4
+'welt',    # 0xf5
+'welp',    # 0xf6
+'welh',    # 0xf7
+'wem',    # 0xf8
+'web',    # 0xf9
+'webs',    # 0xfa
+'wes',    # 0xfb
+'wess',    # 0xfc
+'weng',    # 0xfd
+'wej',    # 0xfe
+'wec',    # 0xff
+)
diff --git a/lib/unidecode/x0c7.py b/lib/unidecode/x0c7.py
new file mode 100644
index 00000000..4c1a9e13
--- /dev/null
+++ b/lib/unidecode/x0c7.py
@@ -0,0 +1,258 @@
+data = (
+'wek',    # 0x00
+'wet',    # 0x01
+'wep',    # 0x02
+'weh',    # 0x03
+'wi',    # 0x04
+'wig',    # 0x05
+'wigg',    # 0x06
+'wigs',    # 0x07
+'win',    # 0x08
+'winj',    # 0x09
+'winh',    # 0x0a
+'wid',    # 0x0b
+'wil',    # 0x0c
+'wilg',    # 0x0d
+'wilm',    # 0x0e
+'wilb',    # 0x0f
+'wils',    # 0x10
+'wilt',    # 0x11
+'wilp',    # 0x12
+'wilh',    # 0x13
+'wim',    # 0x14
+'wib',    # 0x15
+'wibs',    # 0x16
+'wis',    # 0x17
+'wiss',    # 0x18
+'wing',    # 0x19
+'wij',    # 0x1a
+'wic',    # 0x1b
+'wik',    # 0x1c
+'wit',    # 0x1d
+'wip',    # 0x1e
+'wih',    # 0x1f
+'yu',    # 0x20
+'yug',    # 0x21
+'yugg',    # 0x22
+'yugs',    # 0x23
+'yun',    # 0x24
+'yunj',    # 0x25
+'yunh',    # 0x26
+'yud',    # 0x27
+'yul',    # 0x28
+'yulg',    # 0x29
+'yulm',    # 0x2a
+'yulb',    # 0x2b
+'yuls',    # 0x2c
+'yult',    # 0x2d
+'yulp',    # 0x2e
+'yulh',    # 0x2f
+'yum',    # 0x30
+'yub',    # 0x31
+'yubs',    # 0x32
+'yus',    # 0x33
+'yuss',    # 0x34
+'yung',    # 0x35
+'yuj',    # 0x36
+'yuc',    # 0x37
+'yuk',    # 0x38
+'yut',    # 0x39
+'yup',    # 0x3a
+'yuh',    # 0x3b
+'eu',    # 0x3c
+'eug',    # 0x3d
+'eugg',    # 0x3e
+'eugs',    # 0x3f
+'eun',    # 0x40
+'eunj',    # 0x41
+'eunh',    # 0x42
+'eud',    # 0x43
+'eul',    # 0x44
+'eulg',    # 0x45
+'eulm',    # 0x46
+'eulb',    # 0x47
+'euls',    # 0x48
+'eult',    # 0x49
+'eulp',    # 0x4a
+'eulh',    # 0x4b
+'eum',    # 0x4c
+'eub',    # 0x4d
+'eubs',    # 0x4e
+'eus',    # 0x4f
+'euss',    # 0x50
+'eung',    # 0x51
+'euj',    # 0x52
+'euc',    # 0x53
+'euk',    # 0x54
+'eut',    # 0x55
+'eup',    # 0x56
+'euh',    # 0x57
+'yi',    # 0x58
+'yig',    # 0x59
+'yigg',    # 0x5a
+'yigs',    # 0x5b
+'yin',    # 0x5c
+'yinj',    # 0x5d
+'yinh',    # 0x5e
+'yid',    # 0x5f
+'yil',    # 0x60
+'yilg',    # 0x61
+'yilm',    # 0x62
+'yilb',    # 0x63
+'yils',    # 0x64
+'yilt',    # 0x65
+'yilp',    # 0x66
+'yilh',    # 0x67
+'yim',    # 0x68
+'yib',    # 0x69
+'yibs',    # 0x6a
+'yis',    # 0x6b
+'yiss',    # 0x6c
+'ying',    # 0x6d
+'yij',    # 0x6e
+'yic',    # 0x6f
+'yik',    # 0x70
+'yit',    # 0x71
+'yip',    # 0x72
+'yih',    # 0x73
+'i',    # 0x74
+'ig',    # 0x75
+'igg',    # 0x76
+'igs',    # 0x77
+'in',    # 0x78
+'inj',    # 0x79
+'inh',    # 0x7a
+'id',    # 0x7b
+'il',    # 0x7c
+'ilg',    # 0x7d
+'ilm',    # 0x7e
+'ilb',    # 0x7f
+'ils',    # 0x80
+'ilt',    # 0x81
+'ilp',    # 0x82
+'ilh',    # 0x83
+'im',    # 0x84
+'ib',    # 0x85
+'ibs',    # 0x86
+'is',    # 0x87
+'iss',    # 0x88
+'ing',    # 0x89
+'ij',    # 0x8a
+'ic',    # 0x8b
+'ik',    # 0x8c
+'it',    # 0x8d
+'ip',    # 0x8e
+'ih',    # 0x8f
+'ja',    # 0x90
+'jag',    # 0x91
+'jagg',    # 0x92
+'jags',    # 0x93
+'jan',    # 0x94
+'janj',    # 0x95
+'janh',    # 0x96
+'jad',    # 0x97
+'jal',    # 0x98
+'jalg',    # 0x99
+'jalm',    # 0x9a
+'jalb',    # 0x9b
+'jals',    # 0x9c
+'jalt',    # 0x9d
+'jalp',    # 0x9e
+'jalh',    # 0x9f
+'jam',    # 0xa0
+'jab',    # 0xa1
+'jabs',    # 0xa2
+'jas',    # 0xa3
+'jass',    # 0xa4
+'jang',    # 0xa5
+'jaj',    # 0xa6
+'jac',    # 0xa7
+'jak',    # 0xa8
+'jat',    # 0xa9
+'jap',    # 0xaa
+'jah',    # 0xab
+'jae',    # 0xac
+'jaeg',    # 0xad
+'jaegg',    # 0xae
+'jaegs',    # 0xaf
+'jaen',    # 0xb0
+'jaenj',    # 0xb1
+'jaenh',    # 0xb2
+'jaed',    # 0xb3
+'jael',    # 0xb4
+'jaelg',    # 0xb5
+'jaelm',    # 0xb6
+'jaelb',    # 0xb7
+'jaels',    # 0xb8
+'jaelt',    # 0xb9
+'jaelp',    # 0xba
+'jaelh',    # 0xbb
+'jaem',    # 0xbc
+'jaeb',    # 0xbd
+'jaebs',    # 0xbe
+'jaes',    # 0xbf
+'jaess',    # 0xc0
+'jaeng',    # 0xc1
+'jaej',    # 0xc2
+'jaec',    # 0xc3
+'jaek',    # 0xc4
+'jaet',    # 0xc5
+'jaep',    # 0xc6
+'jaeh',    # 0xc7
+'jya',    # 0xc8
+'jyag',    # 0xc9
+'jyagg',    # 0xca
+'jyags',    # 0xcb
+'jyan',    # 0xcc
+'jyanj',    # 0xcd
+'jyanh',    # 0xce
+'jyad',    # 0xcf
+'jyal',    # 0xd0
+'jyalg',    # 0xd1
+'jyalm',    # 0xd2
+'jyalb',    # 0xd3
+'jyals',    # 0xd4
+'jyalt',    # 0xd5
+'jyalp',    # 0xd6
+'jyalh',    # 0xd7
+'jyam',    # 0xd8
+'jyab',    # 0xd9
+'jyabs',    # 0xda
+'jyas',    # 0xdb
+'jyass',    # 0xdc
+'jyang',    # 0xdd
+'jyaj',    # 0xde
+'jyac',    # 0xdf
+'jyak',    # 0xe0
+'jyat',    # 0xe1
+'jyap',    # 0xe2
+'jyah',    # 0xe3
+'jyae',    # 0xe4
+'jyaeg',    # 0xe5
+'jyaegg',    # 0xe6
+'jyaegs',    # 0xe7
+'jyaen',    # 0xe8
+'jyaenj',    # 0xe9
+'jyaenh',    # 0xea
+'jyaed',    # 0xeb
+'jyael',    # 0xec
+'jyaelg',    # 0xed
+'jyaelm',    # 0xee
+'jyaelb',    # 0xef
+'jyaels',    # 0xf0
+'jyaelt',    # 0xf1
+'jyaelp',    # 0xf2
+'jyaelh',    # 0xf3
+'jyaem',    # 0xf4
+'jyaeb',    # 0xf5
+'jyaebs',    # 0xf6
+'jyaes',    # 0xf7
+'jyaess',    # 0xf8
+'jyaeng',    # 0xf9
+'jyaej',    # 0xfa
+'jyaec',    # 0xfb
+'jyaek',    # 0xfc
+'jyaet',    # 0xfd
+'jyaep',    # 0xfe
+'jyaeh',    # 0xff
+)
diff --git a/lib/unidecode/x0c8.py b/lib/unidecode/x0c8.py
new file mode 100644
index 00000000..2dc75649
--- /dev/null
+++ b/lib/unidecode/x0c8.py
@@ -0,0 +1,258 @@
+data = (
+'jeo',    # 0x00
+'jeog',    # 0x01
+'jeogg',    # 0x02
+'jeogs',    # 0x03
+'jeon',    # 0x04
+'jeonj',    # 0x05
+'jeonh',    # 0x06
+'jeod',    # 0x07
+'jeol',    # 0x08
+'jeolg',    # 0x09
+'jeolm',    # 0x0a
+'jeolb',    # 0x0b
+'jeols',    # 0x0c
+'jeolt',    # 0x0d
+'jeolp',    # 0x0e
+'jeolh',    # 0x0f
+'jeom',    # 0x10
+'jeob',    # 0x11
+'jeobs',    # 0x12
+'jeos',    # 0x13
+'jeoss',    # 0x14
+'jeong',    # 0x15
+'jeoj',    # 0x16
+'jeoc',    # 0x17
+'jeok',    # 0x18
+'jeot',    # 0x19
+'jeop',    # 0x1a
+'jeoh',    # 0x1b
+'je',    # 0x1c
+'jeg',    # 0x1d
+'jegg',    # 0x1e
+'jegs',    # 0x1f
+'jen',    # 0x20
+'jenj',    # 0x21
+'jenh',    # 0x22
+'jed',    # 0x23
+'jel',    # 0x24
+'jelg',    # 0x25
+'jelm',    # 0x26
+'jelb',    # 0x27
+'jels',    # 0x28
+'jelt',    # 0x29
+'jelp',    # 0x2a
+'jelh',    # 0x2b
+'jem',    # 0x2c
+'jeb',    # 0x2d
+'jebs',    # 0x2e
+'jes',    # 0x2f
+'jess',    # 0x30
+'jeng',    # 0x31
+'jej',    # 0x32
+'jec',    # 0x33
+'jek',    # 0x34
+'jet',    # 0x35
+'jep',    # 0x36
+'jeh',    # 0x37
+'jyeo',    # 0x38
+'jyeog',    # 0x39
+'jyeogg',    # 0x3a
+'jyeogs',    # 0x3b
+'jyeon',    # 0x3c
+'jyeonj',    # 0x3d
+'jyeonh',    # 0x3e
+'jyeod',    # 0x3f
+'jyeol',    # 0x40
+'jyeolg',    # 0x41
+'jyeolm',    # 0x42
+'jyeolb',    # 0x43
+'jyeols',    # 0x44
+'jyeolt',    # 0x45
+'jyeolp',    # 0x46
+'jyeolh',    # 0x47
+'jyeom',    # 0x48
+'jyeob',    # 0x49
+'jyeobs',    # 0x4a
+'jyeos',    # 0x4b
+'jyeoss',    # 0x4c
+'jyeong',    # 0x4d
+'jyeoj',    # 0x4e
+'jyeoc',    # 0x4f
+'jyeok',    # 0x50
+'jyeot',    # 0x51
+'jyeop',    # 0x52
+'jyeoh',    # 0x53
+'jye',    # 0x54
+'jyeg',    # 0x55
+'jyegg',    # 0x56
+'jyegs',    # 0x57
+'jyen',    # 0x58
+'jyenj',    # 0x59
+'jyenh',    # 0x5a
+'jyed',    # 0x5b
+'jyel',    # 0x5c
+'jyelg',    # 0x5d
+'jyelm',    # 0x5e
+'jyelb',    # 0x5f
+'jyels',    # 0x60
+'jyelt',    # 0x61
+'jyelp',    # 0x62
+'jyelh',    # 0x63
+'jyem',    # 0x64
+'jyeb',    # 0x65
+'jyebs',    # 0x66
+'jyes',    # 0x67
+'jyess',    # 0x68
+'jyeng',    # 0x69
+'jyej',    # 0x6a
+'jyec',    # 0x6b
+'jyek',    # 0x6c
+'jyet',    # 0x6d
+'jyep',    # 0x6e
+'jyeh',    # 0x6f
+'jo',    # 0x70
+'jog',    # 0x71
+'jogg',    # 0x72
+'jogs',    # 0x73
+'jon',    # 0x74
+'jonj',    # 0x75
+'jonh',    # 0x76
+'jod',    # 0x77
+'jol',    # 0x78
+'jolg',    # 0x79
+'jolm',    # 0x7a
+'jolb',    # 0x7b
+'jols',    # 0x7c
+'jolt',    # 0x7d
+'jolp',    # 0x7e
+'jolh',    # 0x7f
+'jom',    # 0x80
+'job',    # 0x81
+'jobs',    # 0x82
+'jos',    # 0x83
+'joss',    # 0x84
+'jong',    # 0x85
+'joj',    # 0x86
+'joc',    # 0x87
+'jok',    # 0x88
+'jot',    # 0x89
+'jop',    # 0x8a
+'joh',    # 0x8b
+'jwa',    # 0x8c
+'jwag',    # 0x8d
+'jwagg',    # 0x8e
+'jwags',    # 0x8f
+'jwan',    # 0x90
+'jwanj',    # 0x91
+'jwanh',    # 0x92
+'jwad',    # 0x93
+'jwal',    # 0x94
+'jwalg',    # 0x95
+'jwalm',    # 0x96
+'jwalb',    # 0x97
+'jwals',    # 0x98
+'jwalt',    # 0x99
+'jwalp',    # 0x9a
+'jwalh',    # 0x9b
+'jwam',    # 0x9c
+'jwab',    # 0x9d
+'jwabs',    # 0x9e
+'jwas',    # 0x9f
+'jwass',    # 0xa0
+'jwang',    # 0xa1
+'jwaj',    # 0xa2
+'jwac',    # 0xa3
+'jwak',    # 0xa4
+'jwat',    # 0xa5
+'jwap',    # 0xa6
+'jwah',    # 0xa7
+'jwae',    # 0xa8
+'jwaeg',    # 0xa9
+'jwaegg',    # 0xaa
+'jwaegs',    # 0xab
+'jwaen',    # 0xac
+'jwaenj',    # 0xad
+'jwaenh',    # 0xae
+'jwaed',    # 0xaf
+'jwael',    # 0xb0
+'jwaelg',    # 0xb1
+'jwaelm',    # 0xb2
+'jwaelb',    # 0xb3
+'jwaels',    # 0xb4
+'jwaelt',    # 0xb5
+'jwaelp',    # 0xb6
+'jwaelh',    # 0xb7
+'jwaem',    # 0xb8
+'jwaeb',    # 0xb9
+'jwaebs',    # 0xba
+'jwaes',    # 0xbb
+'jwaess',    # 0xbc
+'jwaeng',    # 0xbd
+'jwaej',    # 0xbe
+'jwaec',    # 0xbf
+'jwaek',    # 0xc0
+'jwaet',    # 0xc1
+'jwaep',    # 0xc2
+'jwaeh',    # 0xc3
+'joe',    # 0xc4
+'joeg',    # 0xc5
+'joegg',    # 0xc6
+'joegs',    # 0xc7
+'joen',    # 0xc8
+'joenj',    # 0xc9
+'joenh',    # 0xca
+'joed',    # 0xcb
+'joel',    # 0xcc
+'joelg',    # 0xcd
+'joelm',    # 0xce
+'joelb',    # 0xcf
+'joels',    # 0xd0
+'joelt',    # 0xd1
+'joelp',    # 0xd2
+'joelh',    # 0xd3
+'joem',    # 0xd4
+'joeb',    # 0xd5
+'joebs',    # 0xd6
+'joes',    # 0xd7
+'joess',    # 0xd8
+'joeng',    # 0xd9
+'joej',    # 0xda
+'joec',    # 0xdb
+'joek',    # 0xdc
+'joet',    # 0xdd
+'joep',    # 0xde
+'joeh',    # 0xdf
+'jyo',    # 0xe0
+'jyog',    # 0xe1
+'jyogg',    # 0xe2
+'jyogs',    # 0xe3
+'jyon',    # 0xe4
+'jyonj',    # 0xe5
+'jyonh',    # 0xe6
+'jyod',    # 0xe7
+'jyol',    # 0xe8
+'jyolg',    # 0xe9
+'jyolm',    # 0xea
+'jyolb',    # 0xeb
+'jyols',    # 0xec
+'jyolt',    # 0xed
+'jyolp',    # 0xee
+'jyolh',    # 0xef
+'jyom',    # 0xf0
+'jyob',    # 0xf1
+'jyobs',    # 0xf2
+'jyos',    # 0xf3
+'jyoss',    # 0xf4
+'jyong',    # 0xf5
+'jyoj',    # 0xf6
+'jyoc',    # 0xf7
+'jyok',    # 0xf8
+'jyot',    # 0xf9
+'jyop',    # 0xfa
+'jyoh',    # 0xfb
+'ju',    # 0xfc
+'jug',    # 0xfd
+'jugg',    # 0xfe
+'jugs',    # 0xff
+)
diff --git a/lib/unidecode/x0c9.py b/lib/unidecode/x0c9.py
new file mode 100644
index 00000000..7e098327
--- /dev/null
+++ b/lib/unidecode/x0c9.py
@@ -0,0 +1,258 @@
+data = (
+'jun',    # 0x00
+'junj',    # 0x01
+'junh',    # 0x02
+'jud',    # 0x03
+'jul',    # 0x04
+'julg',    # 0x05
+'julm',    # 0x06
+'julb',    # 0x07
+'juls',    # 0x08
+'jult',    # 0x09
+'julp',    # 0x0a
+'julh',    # 0x0b
+'jum',    # 0x0c
+'jub',    # 0x0d
+'jubs',    # 0x0e
+'jus',    # 0x0f
+'juss',    # 0x10
+'jung',    # 0x11
+'juj',    # 0x12
+'juc',    # 0x13
+'juk',    # 0x14
+'jut',    # 0x15
+'jup',    # 0x16
+'juh',    # 0x17
+'jweo',    # 0x18
+'jweog',    # 0x19
+'jweogg',    # 0x1a
+'jweogs',    # 0x1b
+'jweon',    # 0x1c
+'jweonj',    # 0x1d
+'jweonh',    # 0x1e
+'jweod',    # 0x1f
+'jweol',    # 0x20
+'jweolg',    # 0x21
+'jweolm',    # 0x22
+'jweolb',    # 0x23
+'jweols',    # 0x24
+'jweolt',    # 0x25
+'jweolp',    # 0x26
+'jweolh',    # 0x27
+'jweom',    # 0x28
+'jweob',    # 0x29
+'jweobs',    # 0x2a
+'jweos',    # 0x2b
+'jweoss',    # 0x2c
+'jweong',    # 0x2d
+'jweoj',    # 0x2e
+'jweoc',    # 0x2f
+'jweok',    # 0x30
+'jweot',    # 0x31
+'jweop',    # 0x32
+'jweoh',    # 0x33
+'jwe',    # 0x34
+'jweg',    # 0x35
+'jwegg',    # 0x36
+'jwegs',    # 0x37
+'jwen',    # 0x38
+'jwenj',    # 0x39
+'jwenh',    # 0x3a
+'jwed',    # 0x3b
+'jwel',    # 0x3c
+'jwelg',    # 0x3d
+'jwelm',    # 0x3e
+'jwelb',    # 0x3f
+'jwels',    # 0x40
+'jwelt',    # 0x41
+'jwelp',    # 0x42
+'jwelh',    # 0x43
+'jwem',    # 0x44
+'jweb',    # 0x45
+'jwebs',    # 0x46
+'jwes',    # 0x47
+'jwess',    # 0x48
+'jweng',    # 0x49
+'jwej',    # 0x4a
+'jwec',    # 0x4b
+'jwek',    # 0x4c
+'jwet',    # 0x4d
+'jwep',    # 0x4e
+'jweh',    # 0x4f
+'jwi',    # 0x50
+'jwig',    # 0x51
+'jwigg',    # 0x52
+'jwigs',    # 0x53
+'jwin',    # 0x54
+'jwinj',    # 0x55
+'jwinh',    # 0x56
+'jwid',    # 0x57
+'jwil',    # 0x58
+'jwilg',    # 0x59
+'jwilm',    # 0x5a
+'jwilb',    # 0x5b
+'jwils',    # 0x5c
+'jwilt',    # 0x5d
+'jwilp',    # 0x5e
+'jwilh',    # 0x5f
+'jwim',    # 0x60
+'jwib',    # 0x61
+'jwibs',    # 0x62
+'jwis',    # 0x63
+'jwiss',    # 0x64
+'jwing',    # 0x65
+'jwij',    # 0x66
+'jwic',    # 0x67
+'jwik',    # 0x68
+'jwit',    # 0x69
+'jwip',    # 0x6a
+'jwih',    # 0x6b
+'jyu',    # 0x6c
+'jyug',    # 0x6d
+'jyugg',    # 0x6e
+'jyugs',    # 0x6f
+'jyun',    # 0x70
+'jyunj',    # 0x71
+'jyunh',    # 0x72
+'jyud',    # 0x73
+'jyul',    # 0x74
+'jyulg',    # 0x75
+'jyulm',    # 0x76
+'jyulb',    # 0x77
+'jyuls',    # 0x78
+'jyult',    # 0x79
+'jyulp',    # 0x7a
+'jyulh',    # 0x7b
+'jyum',    # 0x7c
+'jyub',    # 0x7d
+'jyubs',    # 0x7e
+'jyus',    # 0x7f
+'jyuss',    # 0x80
+'jyung',    # 0x81
+'jyuj',    # 0x82
+'jyuc',    # 0x83
+'jyuk',    # 0x84
+'jyut',    # 0x85
+'jyup',    # 0x86
+'jyuh',    # 0x87
+'jeu',    # 0x88
+'jeug',    # 0x89
+'jeugg',    # 0x8a
+'jeugs',    # 0x8b
+'jeun',    # 0x8c
+'jeunj',    # 0x8d
+'jeunh',    # 0x8e
+'jeud',    # 0x8f
+'jeul',    # 0x90
+'jeulg',    # 0x91
+'jeulm',    # 0x92
+'jeulb',    # 0x93
+'jeuls',    # 0x94
+'jeult',    # 0x95
+'jeulp',    # 0x96
+'jeulh',    # 0x97
+'jeum',    # 0x98
+'jeub',    # 0x99
+'jeubs',    # 0x9a
+'jeus',    # 0x9b
+'jeuss',    # 0x9c
+'jeung',    # 0x9d
+'jeuj',    # 0x9e
+'jeuc',    # 0x9f
+'jeuk',    # 0xa0
+'jeut',    # 0xa1
+'jeup',    # 0xa2
+'jeuh',    # 0xa3
+'jyi',    # 0xa4
+'jyig',    # 0xa5
+'jyigg',    # 0xa6
+'jyigs',    # 0xa7
+'jyin',    # 0xa8
+'jyinj',    # 0xa9
+'jyinh',    # 0xaa
+'jyid',    # 0xab
+'jyil',    # 0xac
+'jyilg',    # 0xad
+'jyilm',    # 0xae
+'jyilb',    # 0xaf
+'jyils',    # 0xb0
+'jyilt',    # 0xb1
+'jyilp',    # 0xb2
+'jyilh',    # 0xb3
+'jyim',    # 0xb4
+'jyib',    # 0xb5
+'jyibs',    # 0xb6
+'jyis',    # 0xb7
+'jyiss',    # 0xb8
+'jying',    # 0xb9
+'jyij',    # 0xba
+'jyic',    # 0xbb
+'jyik',    # 0xbc
+'jyit',    # 0xbd
+'jyip',    # 0xbe
+'jyih',    # 0xbf
+'ji',    # 0xc0
+'jig',    # 0xc1
+'jigg',    # 0xc2
+'jigs',    # 0xc3
+'jin',    # 0xc4
+'jinj',    # 0xc5
+'jinh',    # 0xc6
+'jid',    # 0xc7
+'jil',    # 0xc8
+'jilg',    # 0xc9
+'jilm',    # 0xca
+'jilb',    # 0xcb
+'jils',    # 0xcc
+'jilt',    # 0xcd
+'jilp',    # 0xce
+'jilh',    # 0xcf
+'jim',    # 0xd0
+'jib',    # 0xd1
+'jibs',    # 0xd2
+'jis',    # 0xd3
+'jiss',    # 0xd4
+'jing',    # 0xd5
+'jij',    # 0xd6
+'jic',    # 0xd7
+'jik',    # 0xd8
+'jit',    # 0xd9
+'jip',    # 0xda
+'jih',    # 0xdb
+'jja',    # 0xdc
+'jjag',    # 0xdd
+'jjagg',    # 0xde
+'jjags',    # 0xdf
+'jjan',    # 0xe0
+'jjanj',    # 0xe1
+'jjanh',    # 0xe2
+'jjad',    # 0xe3
+'jjal',    # 0xe4
+'jjalg',    # 0xe5
+'jjalm',    # 0xe6
+'jjalb',    # 0xe7
+'jjals',    # 0xe8
+'jjalt',    # 0xe9
+'jjalp',    # 0xea
+'jjalh',    # 0xeb
+'jjam',    # 0xec
+'jjab',    # 0xed
+'jjabs',    # 0xee
+'jjas',    # 0xef
+'jjass',    # 0xf0
+'jjang',    # 0xf1
+'jjaj',    # 0xf2
+'jjac',    # 0xf3
+'jjak',    # 0xf4
+'jjat',    # 0xf5
+'jjap',    # 0xf6
+'jjah',    # 0xf7
+'jjae',    # 0xf8
+'jjaeg',    # 0xf9
+'jjaegg',    # 0xfa
+'jjaegs',    # 0xfb
+'jjaen',    # 0xfc
+'jjaenj',    # 0xfd
+'jjaenh',    # 0xfe
+'jjaed',    # 0xff
+)
diff --git a/lib/unidecode/x0ca.py b/lib/unidecode/x0ca.py
new file mode 100644
index 00000000..20239b71
--- /dev/null
+++ b/lib/unidecode/x0ca.py
@@ -0,0 +1,258 @@
+data = (
+'jjael',    # 0x00
+'jjaelg',    # 0x01
+'jjaelm',    # 0x02
+'jjaelb',    # 0x03
+'jjaels',    # 0x04
+'jjaelt',    # 0x05
+'jjaelp',    # 0x06
+'jjaelh',    # 0x07
+'jjaem',    # 0x08
+'jjaeb',    # 0x09
+'jjaebs',    # 0x0a
+'jjaes',    # 0x0b
+'jjaess',    # 0x0c
+'jjaeng',    # 0x0d
+'jjaej',    # 0x0e
+'jjaec',    # 0x0f
+'jjaek',    # 0x10
+'jjaet',    # 0x11
+'jjaep',    # 0x12
+'jjaeh',    # 0x13
+'jjya',    # 0x14
+'jjyag',    # 0x15
+'jjyagg',    # 0x16
+'jjyags',    # 0x17
+'jjyan',    # 0x18
+'jjyanj',    # 0x19
+'jjyanh',    # 0x1a
+'jjyad',    # 0x1b
+'jjyal',    # 0x1c
+'jjyalg',    # 0x1d
+'jjyalm',    # 0x1e
+'jjyalb',    # 0x1f
+'jjyals',    # 0x20
+'jjyalt',    # 0x21
+'jjyalp',    # 0x22
+'jjyalh',    # 0x23
+'jjyam',    # 0x24
+'jjyab',    # 0x25
+'jjyabs',    # 0x26
+'jjyas',    # 0x27
+'jjyass',    # 0x28
+'jjyang',    # 0x29
+'jjyaj',    # 0x2a
+'jjyac',    # 0x2b
+'jjyak',    # 0x2c
+'jjyat',    # 0x2d
+'jjyap',    # 0x2e
+'jjyah',    # 0x2f
+'jjyae',    # 0x30
+'jjyaeg',    # 0x31
+'jjyaegg',    # 0x32
+'jjyaegs',    # 0x33
+'jjyaen',    # 0x34
+'jjyaenj',    # 0x35
+'jjyaenh',    # 0x36
+'jjyaed',    # 0x37
+'jjyael',    # 0x38
+'jjyaelg',    # 0x39
+'jjyaelm',    # 0x3a
+'jjyaelb',    # 0x3b
+'jjyaels',    # 0x3c
+'jjyaelt',    # 0x3d
+'jjyaelp',    # 0x3e
+'jjyaelh',    # 0x3f
+'jjyaem',    # 0x40
+'jjyaeb',    # 0x41
+'jjyaebs',    # 0x42
+'jjyaes',    # 0x43
+'jjyaess',    # 0x44
+'jjyaeng',    # 0x45
+'jjyaej',    # 0x46
+'jjyaec',    # 0x47
+'jjyaek',    # 0x48
+'jjyaet',    # 0x49
+'jjyaep',    # 0x4a
+'jjyaeh',    # 0x4b
+'jjeo',    # 0x4c
+'jjeog',    # 0x4d
+'jjeogg',    # 0x4e
+'jjeogs',    # 0x4f
+'jjeon',    # 0x50
+'jjeonj',    # 0x51
+'jjeonh',    # 0x52
+'jjeod',    # 0x53
+'jjeol',    # 0x54
+'jjeolg',    # 0x55
+'jjeolm',    # 0x56
+'jjeolb',    # 0x57
+'jjeols',    # 0x58
+'jjeolt',    # 0x59
+'jjeolp',    # 0x5a
+'jjeolh',    # 0x5b
+'jjeom',    # 0x5c
+'jjeob',    # 0x5d
+'jjeobs',    # 0x5e
+'jjeos',    # 0x5f
+'jjeoss',    # 0x60
+'jjeong',    # 0x61
+'jjeoj',    # 0x62
+'jjeoc',    # 0x63
+'jjeok',    # 0x64
+'jjeot',    # 0x65
+'jjeop',    # 0x66
+'jjeoh',    # 0x67
+'jje',    # 0x68
+'jjeg',    # 0x69
+'jjegg',    # 0x6a
+'jjegs',    # 0x6b
+'jjen',    # 0x6c
+'jjenj',    # 0x6d
+'jjenh',    # 0x6e
+'jjed',    # 0x6f
+'jjel',    # 0x70
+'jjelg',    # 0x71
+'jjelm',    # 0x72
+'jjelb',    # 0x73
+'jjels',    # 0x74
+'jjelt',    # 0x75
+'jjelp',    # 0x76
+'jjelh',    # 0x77
+'jjem',    # 0x78
+'jjeb',    # 0x79
+'jjebs',    # 0x7a
+'jjes',    # 0x7b
+'jjess',    # 0x7c
+'jjeng',    # 0x7d
+'jjej',    # 0x7e
+'jjec',    # 0x7f
+'jjek',    # 0x80
+'jjet',    # 0x81
+'jjep',    # 0x82
+'jjeh',    # 0x83
+'jjyeo',    # 0x84
+'jjyeog',    # 0x85
+'jjyeogg',    # 0x86
+'jjyeogs',    # 0x87
+'jjyeon',    # 0x88
+'jjyeonj',    # 0x89
+'jjyeonh',    # 0x8a
+'jjyeod',    # 0x8b
+'jjyeol',    # 0x8c
+'jjyeolg',    # 0x8d
+'jjyeolm',    # 0x8e
+'jjyeolb',    # 0x8f
+'jjyeols',    # 0x90
+'jjyeolt',    # 0x91
+'jjyeolp',    # 0x92
+'jjyeolh',    # 0x93
+'jjyeom',    # 0x94
+'jjyeob',    # 0x95
+'jjyeobs',    # 0x96
+'jjyeos',    # 0x97
+'jjyeoss',    # 0x98
+'jjyeong',    # 0x99
+'jjyeoj',    # 0x9a
+'jjyeoc',    # 0x9b
+'jjyeok',    # 0x9c
+'jjyeot',    # 0x9d
+'jjyeop',    # 0x9e
+'jjyeoh',    # 0x9f
+'jjye',    # 0xa0
+'jjyeg',    # 0xa1
+'jjyegg',    # 0xa2
+'jjyegs',    # 0xa3
+'jjyen',    # 0xa4
+'jjyenj',    # 0xa5
+'jjyenh',    # 0xa6
+'jjyed',    # 0xa7
+'jjyel',    # 0xa8
+'jjyelg',    # 0xa9
+'jjyelm',    # 0xaa
+'jjyelb',    # 0xab
+'jjyels',    # 0xac
+'jjyelt',    # 0xad
+'jjyelp',    # 0xae
+'jjyelh',    # 0xaf
+'jjyem',    # 0xb0
+'jjyeb',    # 0xb1
+'jjyebs',    # 0xb2
+'jjyes',    # 0xb3
+'jjyess',    # 0xb4
+'jjyeng',    # 0xb5
+'jjyej',    # 0xb6
+'jjyec',    # 0xb7
+'jjyek',    # 0xb8
+'jjyet',    # 0xb9
+'jjyep',    # 0xba
+'jjyeh',    # 0xbb
+'jjo',    # 0xbc
+'jjog',    # 0xbd
+'jjogg',    # 0xbe
+'jjogs',    # 0xbf
+'jjon',    # 0xc0
+'jjonj',    # 0xc1
+'jjonh',    # 0xc2
+'jjod',    # 0xc3
+'jjol',    # 0xc4
+'jjolg',    # 0xc5
+'jjolm',    # 0xc6
+'jjolb',    # 0xc7
+'jjols',    # 0xc8
+'jjolt',    # 0xc9
+'jjolp',    # 0xca
+'jjolh',    # 0xcb
+'jjom',    # 0xcc
+'jjob',    # 0xcd
+'jjobs',    # 0xce
+'jjos',    # 0xcf
+'jjoss',    # 0xd0
+'jjong',    # 0xd1
+'jjoj',    # 0xd2
+'jjoc',    # 0xd3
+'jjok',    # 0xd4
+'jjot',    # 0xd5
+'jjop',    # 0xd6
+'jjoh',    # 0xd7
+'jjwa',    # 0xd8
+'jjwag',    # 0xd9
+'jjwagg',    # 0xda
+'jjwags',    # 0xdb
+'jjwan',    # 0xdc
+'jjwanj',    # 0xdd
+'jjwanh',    # 0xde
+'jjwad',    # 0xdf
+'jjwal',    # 0xe0
+'jjwalg',    # 0xe1
+'jjwalm',    # 0xe2
+'jjwalb',    # 0xe3
+'jjwals',    # 0xe4
+'jjwalt',    # 0xe5
+'jjwalp',    # 0xe6
+'jjwalh',    # 0xe7
+'jjwam',    # 0xe8
+'jjwab',    # 0xe9
+'jjwabs',    # 0xea
+'jjwas',    # 0xeb
+'jjwass',    # 0xec
+'jjwang',    # 0xed
+'jjwaj',    # 0xee
+'jjwac',    # 0xef
+'jjwak',    # 0xf0
+'jjwat',    # 0xf1
+'jjwap',    # 0xf2
+'jjwah',    # 0xf3
+'jjwae',    # 0xf4
+'jjwaeg',    # 0xf5
+'jjwaegg',    # 0xf6
+'jjwaegs',    # 0xf7
+'jjwaen',    # 0xf8
+'jjwaenj',    # 0xf9
+'jjwaenh',    # 0xfa
+'jjwaed',    # 0xfb
+'jjwael',    # 0xfc
+'jjwaelg',    # 0xfd
+'jjwaelm',    # 0xfe
+'jjwaelb',    # 0xff
+)
diff --git a/lib/unidecode/x0cb.py b/lib/unidecode/x0cb.py
new file mode 100644
index 00000000..96d9c18b
--- /dev/null
+++ b/lib/unidecode/x0cb.py
@@ -0,0 +1,258 @@
+data = (
+'jjwaels',    # 0x00
+'jjwaelt',    # 0x01
+'jjwaelp',    # 0x02
+'jjwaelh',    # 0x03
+'jjwaem',    # 0x04
+'jjwaeb',    # 0x05
+'jjwaebs',    # 0x06
+'jjwaes',    # 0x07
+'jjwaess',    # 0x08
+'jjwaeng',    # 0x09
+'jjwaej',    # 0x0a
+'jjwaec',    # 0x0b
+'jjwaek',    # 0x0c
+'jjwaet',    # 0x0d
+'jjwaep',    # 0x0e
+'jjwaeh',    # 0x0f
+'jjoe',    # 0x10
+'jjoeg',    # 0x11
+'jjoegg',    # 0x12
+'jjoegs',    # 0x13
+'jjoen',    # 0x14
+'jjoenj',    # 0x15
+'jjoenh',    # 0x16
+'jjoed',    # 0x17
+'jjoel',    # 0x18
+'jjoelg',    # 0x19
+'jjoelm',    # 0x1a
+'jjoelb',    # 0x1b
+'jjoels',    # 0x1c
+'jjoelt',    # 0x1d
+'jjoelp',    # 0x1e
+'jjoelh',    # 0x1f
+'jjoem',    # 0x20
+'jjoeb',    # 0x21
+'jjoebs',    # 0x22
+'jjoes',    # 0x23
+'jjoess',    # 0x24
+'jjoeng',    # 0x25
+'jjoej',    # 0x26
+'jjoec',    # 0x27
+'jjoek',    # 0x28
+'jjoet',    # 0x29
+'jjoep',    # 0x2a
+'jjoeh',    # 0x2b
+'jjyo',    # 0x2c
+'jjyog',    # 0x2d
+'jjyogg',    # 0x2e
+'jjyogs',    # 0x2f
+'jjyon',    # 0x30
+'jjyonj',    # 0x31
+'jjyonh',    # 0x32
+'jjyod',    # 0x33
+'jjyol',    # 0x34
+'jjyolg',    # 0x35
+'jjyolm',    # 0x36
+'jjyolb',    # 0x37
+'jjyols',    # 0x38
+'jjyolt',    # 0x39
+'jjyolp',    # 0x3a
+'jjyolh',    # 0x3b
+'jjyom',    # 0x3c
+'jjyob',    # 0x3d
+'jjyobs',    # 0x3e
+'jjyos',    # 0x3f
+'jjyoss',    # 0x40
+'jjyong',    # 0x41
+'jjyoj',    # 0x42
+'jjyoc',    # 0x43
+'jjyok',    # 0x44
+'jjyot',    # 0x45
+'jjyop',    # 0x46
+'jjyoh',    # 0x47
+'jju',    # 0x48
+'jjug',    # 0x49
+'jjugg',    # 0x4a
+'jjugs',    # 0x4b
+'jjun',    # 0x4c
+'jjunj',    # 0x4d
+'jjunh',    # 0x4e
+'jjud',    # 0x4f
+'jjul',    # 0x50
+'jjulg',    # 0x51
+'jjulm',    # 0x52
+'jjulb',    # 0x53
+'jjuls',    # 0x54
+'jjult',    # 0x55
+'jjulp',    # 0x56
+'jjulh',    # 0x57
+'jjum',    # 0x58
+'jjub',    # 0x59
+'jjubs',    # 0x5a
+'jjus',    # 0x5b
+'jjuss',    # 0x5c
+'jjung',    # 0x5d
+'jjuj',    # 0x5e
+'jjuc',    # 0x5f
+'jjuk',    # 0x60
+'jjut',    # 0x61
+'jjup',    # 0x62
+'jjuh',    # 0x63
+'jjweo',    # 0x64
+'jjweog',    # 0x65
+'jjweogg',    # 0x66
+'jjweogs',    # 0x67
+'jjweon',    # 0x68
+'jjweonj',    # 0x69
+'jjweonh',    # 0x6a
+'jjweod',    # 0x6b
+'jjweol',    # 0x6c
+'jjweolg',    # 0x6d
+'jjweolm',    # 0x6e
+'jjweolb',    # 0x6f
+'jjweols',    # 0x70
+'jjweolt',    # 0x71
+'jjweolp',    # 0x72
+'jjweolh',    # 0x73
+'jjweom',    # 0x74
+'jjweob',    # 0x75
+'jjweobs',    # 0x76
+'jjweos',    # 0x77
+'jjweoss',    # 0x78
+'jjweong',    # 0x79
+'jjweoj',    # 0x7a
+'jjweoc',    # 0x7b
+'jjweok',    # 0x7c
+'jjweot',    # 0x7d
+'jjweop',    # 0x7e
+'jjweoh',    # 0x7f
+'jjwe',    # 0x80
+'jjweg',    # 0x81
+'jjwegg',    # 0x82
+'jjwegs',    # 0x83
+'jjwen',    # 0x84
+'jjwenj',    # 0x85
+'jjwenh',    # 0x86
+'jjwed',    # 0x87
+'jjwel',    # 0x88
+'jjwelg',    # 0x89
+'jjwelm',    # 0x8a
+'jjwelb',    # 0x8b
+'jjwels',    # 0x8c
+'jjwelt',    # 0x8d
+'jjwelp',    # 0x8e
+'jjwelh',    # 0x8f
+'jjwem',    # 0x90
+'jjweb',    # 0x91
+'jjwebs',    # 0x92
+'jjwes',    # 0x93
+'jjwess',    # 0x94
+'jjweng',    # 0x95
+'jjwej',    # 0x96
+'jjwec',    # 0x97
+'jjwek',    # 0x98
+'jjwet',    # 0x99
+'jjwep',    # 0x9a
+'jjweh',    # 0x9b
+'jjwi',    # 0x9c
+'jjwig',    # 0x9d
+'jjwigg',    # 0x9e
+'jjwigs',    # 0x9f
+'jjwin',    # 0xa0
+'jjwinj',    # 0xa1
+'jjwinh',    # 0xa2
+'jjwid',    # 0xa3
+'jjwil',    # 0xa4
+'jjwilg',    # 0xa5
+'jjwilm',    # 0xa6
+'jjwilb',    # 0xa7
+'jjwils',    # 0xa8
+'jjwilt',    # 0xa9
+'jjwilp',    # 0xaa
+'jjwilh',    # 0xab
+'jjwim',    # 0xac
+'jjwib',    # 0xad
+'jjwibs',    # 0xae
+'jjwis',    # 0xaf
+'jjwiss',    # 0xb0
+'jjwing',    # 0xb1
+'jjwij',    # 0xb2
+'jjwic',    # 0xb3
+'jjwik',    # 0xb4
+'jjwit',    # 0xb5
+'jjwip',    # 0xb6
+'jjwih',    # 0xb7
+'jjyu',    # 0xb8
+'jjyug',    # 0xb9
+'jjyugg',    # 0xba
+'jjyugs',    # 0xbb
+'jjyun',    # 0xbc
+'jjyunj',    # 0xbd
+'jjyunh',    # 0xbe
+'jjyud',    # 0xbf
+'jjyul',    # 0xc0
+'jjyulg',    # 0xc1
+'jjyulm',    # 0xc2
+'jjyulb',    # 0xc3
+'jjyuls',    # 0xc4
+'jjyult',    # 0xc5
+'jjyulp',    # 0xc6
+'jjyulh',    # 0xc7
+'jjyum',    # 0xc8
+'jjyub',    # 0xc9
+'jjyubs',    # 0xca
+'jjyus',    # 0xcb
+'jjyuss',    # 0xcc
+'jjyung',    # 0xcd
+'jjyuj',    # 0xce
+'jjyuc',    # 0xcf
+'jjyuk',    # 0xd0
+'jjyut',    # 0xd1
+'jjyup',    # 0xd2
+'jjyuh',    # 0xd3
+'jjeu',    # 0xd4
+'jjeug',    # 0xd5
+'jjeugg',    # 0xd6
+'jjeugs',    # 0xd7
+'jjeun',    # 0xd8
+'jjeunj',    # 0xd9
+'jjeunh',    # 0xda
+'jjeud',    # 0xdb
+'jjeul',    # 0xdc
+'jjeulg',    # 0xdd
+'jjeulm',    # 0xde
+'jjeulb',    # 0xdf
+'jjeuls',    # 0xe0
+'jjeult',    # 0xe1
+'jjeulp',    # 0xe2
+'jjeulh',    # 0xe3
+'jjeum',    # 0xe4
+'jjeub',    # 0xe5
+'jjeubs',    # 0xe6
+'jjeus',    # 0xe7
+'jjeuss',    # 0xe8
+'jjeung',    # 0xe9
+'jjeuj',    # 0xea
+'jjeuc',    # 0xeb
+'jjeuk',    # 0xec
+'jjeut',    # 0xed
+'jjeup',    # 0xee
+'jjeuh',    # 0xef
+'jjyi',    # 0xf0
+'jjyig',    # 0xf1
+'jjyigg',    # 0xf2
+'jjyigs',    # 0xf3
+'jjyin',    # 0xf4
+'jjyinj',    # 0xf5
+'jjyinh',    # 0xf6
+'jjyid',    # 0xf7
+'jjyil',    # 0xf8
+'jjyilg',    # 0xf9
+'jjyilm',    # 0xfa
+'jjyilb',    # 0xfb
+'jjyils',    # 0xfc
+'jjyilt',    # 0xfd
+'jjyilp',    # 0xfe
+'jjyilh',    # 0xff
+)
diff --git a/lib/unidecode/x0cc.py b/lib/unidecode/x0cc.py
new file mode 100644
index 00000000..58f819a0
--- /dev/null
+++ b/lib/unidecode/x0cc.py
@@ -0,0 +1,258 @@
+data = (
+'jjyim',    # 0x00
+'jjyib',    # 0x01
+'jjyibs',    # 0x02
+'jjyis',    # 0x03
+'jjyiss',    # 0x04
+'jjying',    # 0x05
+'jjyij',    # 0x06
+'jjyic',    # 0x07
+'jjyik',    # 0x08
+'jjyit',    # 0x09
+'jjyip',    # 0x0a
+'jjyih',    # 0x0b
+'jji',    # 0x0c
+'jjig',    # 0x0d
+'jjigg',    # 0x0e
+'jjigs',    # 0x0f
+'jjin',    # 0x10
+'jjinj',    # 0x11
+'jjinh',    # 0x12
+'jjid',    # 0x13
+'jjil',    # 0x14
+'jjilg',    # 0x15
+'jjilm',    # 0x16
+'jjilb',    # 0x17
+'jjils',    # 0x18
+'jjilt',    # 0x19
+'jjilp',    # 0x1a
+'jjilh',    # 0x1b
+'jjim',    # 0x1c
+'jjib',    # 0x1d
+'jjibs',    # 0x1e
+'jjis',    # 0x1f
+'jjiss',    # 0x20
+'jjing',    # 0x21
+'jjij',    # 0x22
+'jjic',    # 0x23
+'jjik',    # 0x24
+'jjit',    # 0x25
+'jjip',    # 0x26
+'jjih',    # 0x27
+'ca',    # 0x28
+'cag',    # 0x29
+'cagg',    # 0x2a
+'cags',    # 0x2b
+'can',    # 0x2c
+'canj',    # 0x2d
+'canh',    # 0x2e
+'cad',    # 0x2f
+'cal',    # 0x30
+'calg',    # 0x31
+'calm',    # 0x32
+'calb',    # 0x33
+'cals',    # 0x34
+'calt',    # 0x35
+'calp',    # 0x36
+'calh',    # 0x37
+'cam',    # 0x38
+'cab',    # 0x39
+'cabs',    # 0x3a
+'cas',    # 0x3b
+'cass',    # 0x3c
+'cang',    # 0x3d
+'caj',    # 0x3e
+'cac',    # 0x3f
+'cak',    # 0x40
+'cat',    # 0x41
+'cap',    # 0x42
+'cah',    # 0x43
+'cae',    # 0x44
+'caeg',    # 0x45
+'caegg',    # 0x46
+'caegs',    # 0x47
+'caen',    # 0x48
+'caenj',    # 0x49
+'caenh',    # 0x4a
+'caed',    # 0x4b
+'cael',    # 0x4c
+'caelg',    # 0x4d
+'caelm',    # 0x4e
+'caelb',    # 0x4f
+'caels',    # 0x50
+'caelt',    # 0x51
+'caelp',    # 0x52
+'caelh',    # 0x53
+'caem',    # 0x54
+'caeb',    # 0x55
+'caebs',    # 0x56
+'caes',    # 0x57
+'caess',    # 0x58
+'caeng',    # 0x59
+'caej',    # 0x5a
+'caec',    # 0x5b
+'caek',    # 0x5c
+'caet',    # 0x5d
+'caep',    # 0x5e
+'caeh',    # 0x5f
+'cya',    # 0x60
+'cyag',    # 0x61
+'cyagg',    # 0x62
+'cyags',    # 0x63
+'cyan',    # 0x64
+'cyanj',    # 0x65
+'cyanh',    # 0x66
+'cyad',    # 0x67
+'cyal',    # 0x68
+'cyalg',    # 0x69
+'cyalm',    # 0x6a
+'cyalb',    # 0x6b
+'cyals',    # 0x6c
+'cyalt',    # 0x6d
+'cyalp',    # 0x6e
+'cyalh',    # 0x6f
+'cyam',    # 0x70
+'cyab',    # 0x71
+'cyabs',    # 0x72
+'cyas',    # 0x73
+'cyass',    # 0x74
+'cyang',    # 0x75
+'cyaj',    # 0x76
+'cyac',    # 0x77
+'cyak',    # 0x78
+'cyat',    # 0x79
+'cyap',    # 0x7a
+'cyah',    # 0x7b
+'cyae',    # 0x7c
+'cyaeg',    # 0x7d
+'cyaegg',    # 0x7e
+'cyaegs',    # 0x7f
+'cyaen',    # 0x80
+'cyaenj',    # 0x81
+'cyaenh',    # 0x82
+'cyaed',    # 0x83
+'cyael',    # 0x84
+'cyaelg',    # 0x85
+'cyaelm',    # 0x86
+'cyaelb',    # 0x87
+'cyaels',    # 0x88
+'cyaelt',    # 0x89
+'cyaelp',    # 0x8a
+'cyaelh',    # 0x8b
+'cyaem',    # 0x8c
+'cyaeb',    # 0x8d
+'cyaebs',    # 0x8e
+'cyaes',    # 0x8f
+'cyaess',    # 0x90
+'cyaeng',    # 0x91
+'cyaej',    # 0x92
+'cyaec',    # 0x93
+'cyaek',    # 0x94
+'cyaet',    # 0x95
+'cyaep',    # 0x96
+'cyaeh',    # 0x97
+'ceo',    # 0x98
+'ceog',    # 0x99
+'ceogg',    # 0x9a
+'ceogs',    # 0x9b
+'ceon',    # 0x9c
+'ceonj',    # 0x9d
+'ceonh',    # 0x9e
+'ceod',    # 0x9f
+'ceol',    # 0xa0
+'ceolg',    # 0xa1
+'ceolm',    # 0xa2
+'ceolb',    # 0xa3
+'ceols',    # 0xa4
+'ceolt',    # 0xa5
+'ceolp',    # 0xa6
+'ceolh',    # 0xa7
+'ceom',    # 0xa8
+'ceob',    # 0xa9
+'ceobs',    # 0xaa
+'ceos',    # 0xab
+'ceoss',    # 0xac
+'ceong',    # 0xad
+'ceoj',    # 0xae
+'ceoc',    # 0xaf
+'ceok',    # 0xb0
+'ceot',    # 0xb1
+'ceop',    # 0xb2
+'ceoh',    # 0xb3
+'ce',    # 0xb4
+'ceg',    # 0xb5
+'cegg',    # 0xb6
+'cegs',    # 0xb7
+'cen',    # 0xb8
+'cenj',    # 0xb9
+'cenh',    # 0xba
+'ced',    # 0xbb
+'cel',    # 0xbc
+'celg',    # 0xbd
+'celm',    # 0xbe
+'celb',    # 0xbf
+'cels',    # 0xc0
+'celt',    # 0xc1
+'celp',    # 0xc2
+'celh',    # 0xc3
+'cem',    # 0xc4
+'ceb',    # 0xc5
+'cebs',    # 0xc6
+'ces',    # 0xc7
+'cess',    # 0xc8
+'ceng',    # 0xc9
+'cej',    # 0xca
+'cec',    # 0xcb
+'cek',    # 0xcc
+'cet',    # 0xcd
+'cep',    # 0xce
+'ceh',    # 0xcf
+'cyeo',    # 0xd0
+'cyeog',    # 0xd1
+'cyeogg',    # 0xd2
+'cyeogs',    # 0xd3
+'cyeon',    # 0xd4
+'cyeonj',    # 0xd5
+'cyeonh',    # 0xd6
+'cyeod',    # 0xd7
+'cyeol',    # 0xd8
+'cyeolg',    # 0xd9
+'cyeolm',    # 0xda
+'cyeolb',    # 0xdb
+'cyeols',    # 0xdc
+'cyeolt',    # 0xdd
+'cyeolp',    # 0xde
+'cyeolh',    # 0xdf
+'cyeom',    # 0xe0
+'cyeob',    # 0xe1
+'cyeobs',    # 0xe2
+'cyeos',    # 0xe3
+'cyeoss',    # 0xe4
+'cyeong',    # 0xe5
+'cyeoj',    # 0xe6
+'cyeoc',    # 0xe7
+'cyeok',    # 0xe8
+'cyeot',    # 0xe9
+'cyeop',    # 0xea
+'cyeoh',    # 0xeb
+'cye',    # 0xec
+'cyeg',    # 0xed
+'cyegg',    # 0xee
+'cyegs',    # 0xef
+'cyen',    # 0xf0
+'cyenj',    # 0xf1
+'cyenh',    # 0xf2
+'cyed',    # 0xf3
+'cyel',    # 0xf4
+'cyelg',    # 0xf5
+'cyelm',    # 0xf6
+'cyelb',    # 0xf7
+'cyels',    # 0xf8
+'cyelt',    # 0xf9
+'cyelp',    # 0xfa
+'cyelh',    # 0xfb
+'cyem',    # 0xfc
+'cyeb',    # 0xfd
+'cyebs',    # 0xfe
+'cyes',    # 0xff
+)
diff --git a/lib/unidecode/x0cd.py b/lib/unidecode/x0cd.py
new file mode 100644
index 00000000..dd6909a1
--- /dev/null
+++ b/lib/unidecode/x0cd.py
@@ -0,0 +1,258 @@
+data = (
+'cyess',    # 0x00
+'cyeng',    # 0x01
+'cyej',    # 0x02
+'cyec',    # 0x03
+'cyek',    # 0x04
+'cyet',    # 0x05
+'cyep',    # 0x06
+'cyeh',    # 0x07
+'co',    # 0x08
+'cog',    # 0x09
+'cogg',    # 0x0a
+'cogs',    # 0x0b
+'con',    # 0x0c
+'conj',    # 0x0d
+'conh',    # 0x0e
+'cod',    # 0x0f
+'col',    # 0x10
+'colg',    # 0x11
+'colm',    # 0x12
+'colb',    # 0x13
+'cols',    # 0x14
+'colt',    # 0x15
+'colp',    # 0x16
+'colh',    # 0x17
+'com',    # 0x18
+'cob',    # 0x19
+'cobs',    # 0x1a
+'cos',    # 0x1b
+'coss',    # 0x1c
+'cong',    # 0x1d
+'coj',    # 0x1e
+'coc',    # 0x1f
+'cok',    # 0x20
+'cot',    # 0x21
+'cop',    # 0x22
+'coh',    # 0x23
+'cwa',    # 0x24
+'cwag',    # 0x25
+'cwagg',    # 0x26
+'cwags',    # 0x27
+'cwan',    # 0x28
+'cwanj',    # 0x29
+'cwanh',    # 0x2a
+'cwad',    # 0x2b
+'cwal',    # 0x2c
+'cwalg',    # 0x2d
+'cwalm',    # 0x2e
+'cwalb',    # 0x2f
+'cwals',    # 0x30
+'cwalt',    # 0x31
+'cwalp',    # 0x32
+'cwalh',    # 0x33
+'cwam',    # 0x34
+'cwab',    # 0x35
+'cwabs',    # 0x36
+'cwas',    # 0x37
+'cwass',    # 0x38
+'cwang',    # 0x39
+'cwaj',    # 0x3a
+'cwac',    # 0x3b
+'cwak',    # 0x3c
+'cwat',    # 0x3d
+'cwap',    # 0x3e
+'cwah',    # 0x3f
+'cwae',    # 0x40
+'cwaeg',    # 0x41
+'cwaegg',    # 0x42
+'cwaegs',    # 0x43
+'cwaen',    # 0x44
+'cwaenj',    # 0x45
+'cwaenh',    # 0x46
+'cwaed',    # 0x47
+'cwael',    # 0x48
+'cwaelg',    # 0x49
+'cwaelm',    # 0x4a
+'cwaelb',    # 0x4b
+'cwaels',    # 0x4c
+'cwaelt',    # 0x4d
+'cwaelp',    # 0x4e
+'cwaelh',    # 0x4f
+'cwaem',    # 0x50
+'cwaeb',    # 0x51
+'cwaebs',    # 0x52
+'cwaes',    # 0x53
+'cwaess',    # 0x54
+'cwaeng',    # 0x55
+'cwaej',    # 0x56
+'cwaec',    # 0x57
+'cwaek',    # 0x58
+'cwaet',    # 0x59
+'cwaep',    # 0x5a
+'cwaeh',    # 0x5b
+'coe',    # 0x5c
+'coeg',    # 0x5d
+'coegg',    # 0x5e
+'coegs',    # 0x5f
+'coen',    # 0x60
+'coenj',    # 0x61
+'coenh',    # 0x62
+'coed',    # 0x63
+'coel',    # 0x64
+'coelg',    # 0x65
+'coelm',    # 0x66
+'coelb',    # 0x67
+'coels',    # 0x68
+'coelt',    # 0x69
+'coelp',    # 0x6a
+'coelh',    # 0x6b
+'coem',    # 0x6c
+'coeb',    # 0x6d
+'coebs',    # 0x6e
+'coes',    # 0x6f
+'coess',    # 0x70
+'coeng',    # 0x71
+'coej',    # 0x72
+'coec',    # 0x73
+'coek',    # 0x74
+'coet',    # 0x75
+'coep',    # 0x76
+'coeh',    # 0x77
+'cyo',    # 0x78
+'cyog',    # 0x79
+'cyogg',    # 0x7a
+'cyogs',    # 0x7b
+'cyon',    # 0x7c
+'cyonj',    # 0x7d
+'cyonh',    # 0x7e
+'cyod',    # 0x7f
+'cyol',    # 0x80
+'cyolg',    # 0x81
+'cyolm',    # 0x82
+'cyolb',    # 0x83
+'cyols',    # 0x84
+'cyolt',    # 0x85
+'cyolp',    # 0x86
+'cyolh',    # 0x87
+'cyom',    # 0x88
+'cyob',    # 0x89
+'cyobs',    # 0x8a
+'cyos',    # 0x8b
+'cyoss',    # 0x8c
+'cyong',    # 0x8d
+'cyoj',    # 0x8e
+'cyoc',    # 0x8f
+'cyok',    # 0x90
+'cyot',    # 0x91
+'cyop',    # 0x92
+'cyoh',    # 0x93
+'cu',    # 0x94
+'cug',    # 0x95
+'cugg',    # 0x96
+'cugs',    # 0x97
+'cun',    # 0x98
+'cunj',    # 0x99
+'cunh',    # 0x9a
+'cud',    # 0x9b
+'cul',    # 0x9c
+'culg',    # 0x9d
+'culm',    # 0x9e
+'culb',    # 0x9f
+'culs',    # 0xa0
+'cult',    # 0xa1
+'culp',    # 0xa2
+'culh',    # 0xa3
+'cum',    # 0xa4
+'cub',    # 0xa5
+'cubs',    # 0xa6
+'cus',    # 0xa7
+'cuss',    # 0xa8
+'cung',    # 0xa9
+'cuj',    # 0xaa
+'cuc',    # 0xab
+'cuk',    # 0xac
+'cut',    # 0xad
+'cup',    # 0xae
+'cuh',    # 0xaf
+'cweo',    # 0xb0
+'cweog',    # 0xb1
+'cweogg',    # 0xb2
+'cweogs',    # 0xb3
+'cweon',    # 0xb4
+'cweonj',    # 0xb5
+'cweonh',    # 0xb6
+'cweod',    # 0xb7
+'cweol',    # 0xb8
+'cweolg',    # 0xb9
+'cweolm',    # 0xba
+'cweolb',    # 0xbb
+'cweols',    # 0xbc
+'cweolt',    # 0xbd
+'cweolp',    # 0xbe
+'cweolh',    # 0xbf
+'cweom',    # 0xc0
+'cweob',    # 0xc1
+'cweobs',    # 0xc2
+'cweos',    # 0xc3
+'cweoss',    # 0xc4
+'cweong',    # 0xc5
+'cweoj',    # 0xc6
+'cweoc',    # 0xc7
+'cweok',    # 0xc8
+'cweot',    # 0xc9
+'cweop',    # 0xca
+'cweoh',    # 0xcb
+'cwe',    # 0xcc
+'cweg',    # 0xcd
+'cwegg',    # 0xce
+'cwegs',    # 0xcf
+'cwen',    # 0xd0
+'cwenj',    # 0xd1
+'cwenh',    # 0xd2
+'cwed',    # 0xd3
+'cwel',    # 0xd4
+'cwelg',    # 0xd5
+'cwelm',    # 0xd6
+'cwelb',    # 0xd7
+'cwels',    # 0xd8
+'cwelt',    # 0xd9
+'cwelp',    # 0xda
+'cwelh',    # 0xdb
+'cwem',    # 0xdc
+'cweb',    # 0xdd
+'cwebs',    # 0xde
+'cwes',    # 0xdf
+'cwess',    # 0xe0
+'cweng',    # 0xe1
+'cwej',    # 0xe2
+'cwec',    # 0xe3
+'cwek',    # 0xe4
+'cwet',    # 0xe5
+'cwep',    # 0xe6
+'cweh',    # 0xe7
+'cwi',    # 0xe8
+'cwig',    # 0xe9
+'cwigg',    # 0xea
+'cwigs',    # 0xeb
+'cwin',    # 0xec
+'cwinj',    # 0xed
+'cwinh',    # 0xee
+'cwid',    # 0xef
+'cwil',    # 0xf0
+'cwilg',    # 0xf1
+'cwilm',    # 0xf2
+'cwilb',    # 0xf3
+'cwils',    # 0xf4
+'cwilt',    # 0xf5
+'cwilp',    # 0xf6
+'cwilh',    # 0xf7
+'cwim',    # 0xf8
+'cwib',    # 0xf9
+'cwibs',    # 0xfa
+'cwis',    # 0xfb
+'cwiss',    # 0xfc
+'cwing',    # 0xfd
+'cwij',    # 0xfe
+'cwic',    # 0xff
+)
diff --git a/lib/unidecode/x0ce.py b/lib/unidecode/x0ce.py
new file mode 100644
index 00000000..4b993e89
--- /dev/null
+++ b/lib/unidecode/x0ce.py
@@ -0,0 +1,258 @@
+data = (
+'cwik',    # 0x00
+'cwit',    # 0x01
+'cwip',    # 0x02
+'cwih',    # 0x03
+'cyu',    # 0x04
+'cyug',    # 0x05
+'cyugg',    # 0x06
+'cyugs',    # 0x07
+'cyun',    # 0x08
+'cyunj',    # 0x09
+'cyunh',    # 0x0a
+'cyud',    # 0x0b
+'cyul',    # 0x0c
+'cyulg',    # 0x0d
+'cyulm',    # 0x0e
+'cyulb',    # 0x0f
+'cyuls',    # 0x10
+'cyult',    # 0x11
+'cyulp',    # 0x12
+'cyulh',    # 0x13
+'cyum',    # 0x14
+'cyub',    # 0x15
+'cyubs',    # 0x16
+'cyus',    # 0x17
+'cyuss',    # 0x18
+'cyung',    # 0x19
+'cyuj',    # 0x1a
+'cyuc',    # 0x1b
+'cyuk',    # 0x1c
+'cyut',    # 0x1d
+'cyup',    # 0x1e
+'cyuh',    # 0x1f
+'ceu',    # 0x20
+'ceug',    # 0x21
+'ceugg',    # 0x22
+'ceugs',    # 0x23
+'ceun',    # 0x24
+'ceunj',    # 0x25
+'ceunh',    # 0x26
+'ceud',    # 0x27
+'ceul',    # 0x28
+'ceulg',    # 0x29
+'ceulm',    # 0x2a
+'ceulb',    # 0x2b
+'ceuls',    # 0x2c
+'ceult',    # 0x2d
+'ceulp',    # 0x2e
+'ceulh',    # 0x2f
+'ceum',    # 0x30
+'ceub',    # 0x31
+'ceubs',    # 0x32
+'ceus',    # 0x33
+'ceuss',    # 0x34
+'ceung',    # 0x35
+'ceuj',    # 0x36
+'ceuc',    # 0x37
+'ceuk',    # 0x38
+'ceut',    # 0x39
+'ceup',    # 0x3a
+'ceuh',    # 0x3b
+'cyi',    # 0x3c
+'cyig',    # 0x3d
+'cyigg',    # 0x3e
+'cyigs',    # 0x3f
+'cyin',    # 0x40
+'cyinj',    # 0x41
+'cyinh',    # 0x42
+'cyid',    # 0x43
+'cyil',    # 0x44
+'cyilg',    # 0x45
+'cyilm',    # 0x46
+'cyilb',    # 0x47
+'cyils',    # 0x48
+'cyilt',    # 0x49
+'cyilp',    # 0x4a
+'cyilh',    # 0x4b
+'cyim',    # 0x4c
+'cyib',    # 0x4d
+'cyibs',    # 0x4e
+'cyis',    # 0x4f
+'cyiss',    # 0x50
+'cying',    # 0x51
+'cyij',    # 0x52
+'cyic',    # 0x53
+'cyik',    # 0x54
+'cyit',    # 0x55
+'cyip',    # 0x56
+'cyih',    # 0x57
+'ci',    # 0x58
+'cig',    # 0x59
+'cigg',    # 0x5a
+'cigs',    # 0x5b
+'cin',    # 0x5c
+'cinj',    # 0x5d
+'cinh',    # 0x5e
+'cid',    # 0x5f
+'cil',    # 0x60
+'cilg',    # 0x61
+'cilm',    # 0x62
+'cilb',    # 0x63
+'cils',    # 0x64
+'cilt',    # 0x65
+'cilp',    # 0x66
+'cilh',    # 0x67
+'cim',    # 0x68
+'cib',    # 0x69
+'cibs',    # 0x6a
+'cis',    # 0x6b
+'ciss',    # 0x6c
+'cing',    # 0x6d
+'cij',    # 0x6e
+'cic',    # 0x6f
+'cik',    # 0x70
+'cit',    # 0x71
+'cip',    # 0x72
+'cih',    # 0x73
+'ka',    # 0x74
+'kag',    # 0x75
+'kagg',    # 0x76
+'kags',    # 0x77
+'kan',    # 0x78
+'kanj',    # 0x79
+'kanh',    # 0x7a
+'kad',    # 0x7b
+'kal',    # 0x7c
+'kalg',    # 0x7d
+'kalm',    # 0x7e
+'kalb',    # 0x7f
+'kals',    # 0x80
+'kalt',    # 0x81
+'kalp',    # 0x82
+'kalh',    # 0x83
+'kam',    # 0x84
+'kab',    # 0x85
+'kabs',    # 0x86
+'kas',    # 0x87
+'kass',    # 0x88
+'kang',    # 0x89
+'kaj',    # 0x8a
+'kac',    # 0x8b
+'kak',    # 0x8c
+'kat',    # 0x8d
+'kap',    # 0x8e
+'kah',    # 0x8f
+'kae',    # 0x90
+'kaeg',    # 0x91
+'kaegg',    # 0x92
+'kaegs',    # 0x93
+'kaen',    # 0x94
+'kaenj',    # 0x95
+'kaenh',    # 0x96
+'kaed',    # 0x97
+'kael',    # 0x98
+'kaelg',    # 0x99
+'kaelm',    # 0x9a
+'kaelb',    # 0x9b
+'kaels',    # 0x9c
+'kaelt',    # 0x9d
+'kaelp',    # 0x9e
+'kaelh',    # 0x9f
+'kaem',    # 0xa0
+'kaeb',    # 0xa1
+'kaebs',    # 0xa2
+'kaes',    # 0xa3
+'kaess',    # 0xa4
+'kaeng',    # 0xa5
+'kaej',    # 0xa6
+'kaec',    # 0xa7
+'kaek',    # 0xa8
+'kaet',    # 0xa9
+'kaep',    # 0xaa
+'kaeh',    # 0xab
+'kya',    # 0xac
+'kyag',    # 0xad
+'kyagg',    # 0xae
+'kyags',    # 0xaf
+'kyan',    # 0xb0
+'kyanj',    # 0xb1
+'kyanh',    # 0xb2
+'kyad',    # 0xb3
+'kyal',    # 0xb4
+'kyalg',    # 0xb5
+'kyalm',    # 0xb6
+'kyalb',    # 0xb7
+'kyals',    # 0xb8
+'kyalt',    # 0xb9
+'kyalp',    # 0xba
+'kyalh',    # 0xbb
+'kyam',    # 0xbc
+'kyab',    # 0xbd
+'kyabs',    # 0xbe
+'kyas',    # 0xbf
+'kyass',    # 0xc0
+'kyang',    # 0xc1
+'kyaj',    # 0xc2
+'kyac',    # 0xc3
+'kyak',    # 0xc4
+'kyat',    # 0xc5
+'kyap',    # 0xc6
+'kyah',    # 0xc7
+'kyae',    # 0xc8
+'kyaeg',    # 0xc9
+'kyaegg',    # 0xca
+'kyaegs',    # 0xcb
+'kyaen',    # 0xcc
+'kyaenj',    # 0xcd
+'kyaenh',    # 0xce
+'kyaed',    # 0xcf
+'kyael',    # 0xd0
+'kyaelg',    # 0xd1
+'kyaelm',    # 0xd2
+'kyaelb',    # 0xd3
+'kyaels',    # 0xd4
+'kyaelt',    # 0xd5
+'kyaelp',    # 0xd6
+'kyaelh',    # 0xd7
+'kyaem',    # 0xd8
+'kyaeb',    # 0xd9
+'kyaebs',    # 0xda
+'kyaes',    # 0xdb
+'kyaess',    # 0xdc
+'kyaeng',    # 0xdd
+'kyaej',    # 0xde
+'kyaec',    # 0xdf
+'kyaek',    # 0xe0
+'kyaet',    # 0xe1
+'kyaep',    # 0xe2
+'kyaeh',    # 0xe3
+'keo',    # 0xe4
+'keog',    # 0xe5
+'keogg',    # 0xe6
+'keogs',    # 0xe7
+'keon',    # 0xe8
+'keonj',    # 0xe9
+'keonh',    # 0xea
+'keod',    # 0xeb
+'keol',    # 0xec
+'keolg',    # 0xed
+'keolm',    # 0xee
+'keolb',    # 0xef
+'keols',    # 0xf0
+'keolt',    # 0xf1
+'keolp',    # 0xf2
+'keolh',    # 0xf3
+'keom',    # 0xf4
+'keob',    # 0xf5
+'keobs',    # 0xf6
+'keos',    # 0xf7
+'keoss',    # 0xf8
+'keong',    # 0xf9
+'keoj',    # 0xfa
+'keoc',    # 0xfb
+'keok',    # 0xfc
+'keot',    # 0xfd
+'keop',    # 0xfe
+'keoh',    # 0xff
+)
diff --git a/lib/unidecode/x0cf.py b/lib/unidecode/x0cf.py
new file mode 100644
index 00000000..e825983e
--- /dev/null
+++ b/lib/unidecode/x0cf.py
@@ -0,0 +1,258 @@
+data = (
+'ke',    # 0x00
+'keg',    # 0x01
+'kegg',    # 0x02
+'kegs',    # 0x03
+'ken',    # 0x04
+'kenj',    # 0x05
+'kenh',    # 0x06
+'ked',    # 0x07
+'kel',    # 0x08
+'kelg',    # 0x09
+'kelm',    # 0x0a
+'kelb',    # 0x0b
+'kels',    # 0x0c
+'kelt',    # 0x0d
+'kelp',    # 0x0e
+'kelh',    # 0x0f
+'kem',    # 0x10
+'keb',    # 0x11
+'kebs',    # 0x12
+'kes',    # 0x13
+'kess',    # 0x14
+'keng',    # 0x15
+'kej',    # 0x16
+'kec',    # 0x17
+'kek',    # 0x18
+'ket',    # 0x19
+'kep',    # 0x1a
+'keh',    # 0x1b
+'kyeo',    # 0x1c
+'kyeog',    # 0x1d
+'kyeogg',    # 0x1e
+'kyeogs',    # 0x1f
+'kyeon',    # 0x20
+'kyeonj',    # 0x21
+'kyeonh',    # 0x22
+'kyeod',    # 0x23
+'kyeol',    # 0x24
+'kyeolg',    # 0x25
+'kyeolm',    # 0x26
+'kyeolb',    # 0x27
+'kyeols',    # 0x28
+'kyeolt',    # 0x29
+'kyeolp',    # 0x2a
+'kyeolh',    # 0x2b
+'kyeom',    # 0x2c
+'kyeob',    # 0x2d
+'kyeobs',    # 0x2e
+'kyeos',    # 0x2f
+'kyeoss',    # 0x30
+'kyeong',    # 0x31
+'kyeoj',    # 0x32
+'kyeoc',    # 0x33
+'kyeok',    # 0x34
+'kyeot',    # 0x35
+'kyeop',    # 0x36
+'kyeoh',    # 0x37
+'kye',    # 0x38
+'kyeg',    # 0x39
+'kyegg',    # 0x3a
+'kyegs',    # 0x3b
+'kyen',    # 0x3c
+'kyenj',    # 0x3d
+'kyenh',    # 0x3e
+'kyed',    # 0x3f
+'kyel',    # 0x40
+'kyelg',    # 0x41
+'kyelm',    # 0x42
+'kyelb',    # 0x43
+'kyels',    # 0x44
+'kyelt',    # 0x45
+'kyelp',    # 0x46
+'kyelh',    # 0x47
+'kyem',    # 0x48
+'kyeb',    # 0x49
+'kyebs',    # 0x4a
+'kyes',    # 0x4b
+'kyess',    # 0x4c
+'kyeng',    # 0x4d
+'kyej',    # 0x4e
+'kyec',    # 0x4f
+'kyek',    # 0x50
+'kyet',    # 0x51
+'kyep',    # 0x52
+'kyeh',    # 0x53
+'ko',    # 0x54
+'kog',    # 0x55
+'kogg',    # 0x56
+'kogs',    # 0x57
+'kon',    # 0x58
+'konj',    # 0x59
+'konh',    # 0x5a
+'kod',    # 0x5b
+'kol',    # 0x5c
+'kolg',    # 0x5d
+'kolm',    # 0x5e
+'kolb',    # 0x5f
+'kols',    # 0x60
+'kolt',    # 0x61
+'kolp',    # 0x62
+'kolh',    # 0x63
+'kom',    # 0x64
+'kob',    # 0x65
+'kobs',    # 0x66
+'kos',    # 0x67
+'koss',    # 0x68
+'kong',    # 0x69
+'koj',    # 0x6a
+'koc',    # 0x6b
+'kok',    # 0x6c
+'kot',    # 0x6d
+'kop',    # 0x6e
+'koh',    # 0x6f
+'kwa',    # 0x70
+'kwag',    # 0x71
+'kwagg',    # 0x72
+'kwags',    # 0x73
+'kwan',    # 0x74
+'kwanj',    # 0x75
+'kwanh',    # 0x76
+'kwad',    # 0x77
+'kwal',    # 0x78
+'kwalg',    # 0x79
+'kwalm',    # 0x7a
+'kwalb',    # 0x7b
+'kwals',    # 0x7c
+'kwalt',    # 0x7d
+'kwalp',    # 0x7e
+'kwalh',    # 0x7f
+'kwam',    # 0x80
+'kwab',    # 0x81
+'kwabs',    # 0x82
+'kwas',    # 0x83
+'kwass',    # 0x84
+'kwang',    # 0x85
+'kwaj',    # 0x86
+'kwac',    # 0x87
+'kwak',    # 0x88
+'kwat',    # 0x89
+'kwap',    # 0x8a
+'kwah',    # 0x8b
+'kwae',    # 0x8c
+'kwaeg',    # 0x8d
+'kwaegg',    # 0x8e
+'kwaegs',    # 0x8f
+'kwaen',    # 0x90
+'kwaenj',    # 0x91
+'kwaenh',    # 0x92
+'kwaed',    # 0x93
+'kwael',    # 0x94
+'kwaelg',    # 0x95
+'kwaelm',    # 0x96
+'kwaelb',    # 0x97
+'kwaels',    # 0x98
+'kwaelt',    # 0x99
+'kwaelp',    # 0x9a
+'kwaelh',    # 0x9b
+'kwaem',    # 0x9c
+'kwaeb',    # 0x9d
+'kwaebs',    # 0x9e
+'kwaes',    # 0x9f
+'kwaess',    # 0xa0
+'kwaeng',    # 0xa1
+'kwaej',    # 0xa2
+'kwaec',    # 0xa3
+'kwaek',    # 0xa4
+'kwaet',    # 0xa5
+'kwaep',    # 0xa6
+'kwaeh',    # 0xa7
+'koe',    # 0xa8
+'koeg',    # 0xa9
+'koegg',    # 0xaa
+'koegs',    # 0xab
+'koen',    # 0xac
+'koenj',    # 0xad
+'koenh',    # 0xae
+'koed',    # 0xaf
+'koel',    # 0xb0
+'koelg',    # 0xb1
+'koelm',    # 0xb2
+'koelb',    # 0xb3
+'koels',    # 0xb4
+'koelt',    # 0xb5
+'koelp',    # 0xb6
+'koelh',    # 0xb7
+'koem',    # 0xb8
+'koeb',    # 0xb9
+'koebs',    # 0xba
+'koes',    # 0xbb
+'koess',    # 0xbc
+'koeng',    # 0xbd
+'koej',    # 0xbe
+'koec',    # 0xbf
+'koek',    # 0xc0
+'koet',    # 0xc1
+'koep',    # 0xc2
+'koeh',    # 0xc3
+'kyo',    # 0xc4
+'kyog',    # 0xc5
+'kyogg',    # 0xc6
+'kyogs',    # 0xc7
+'kyon',    # 0xc8
+'kyonj',    # 0xc9
+'kyonh',    # 0xca
+'kyod',    # 0xcb
+'kyol',    # 0xcc
+'kyolg',    # 0xcd
+'kyolm',    # 0xce
+'kyolb',    # 0xcf
+'kyols',    # 0xd0
+'kyolt',    # 0xd1
+'kyolp',    # 0xd2
+'kyolh',    # 0xd3
+'kyom',    # 0xd4
+'kyob',    # 0xd5
+'kyobs',    # 0xd6
+'kyos',    # 0xd7
+'kyoss',    # 0xd8
+'kyong',    # 0xd9
+'kyoj',    # 0xda
+'kyoc',    # 0xdb
+'kyok',    # 0xdc
+'kyot',    # 0xdd
+'kyop',    # 0xde
+'kyoh',    # 0xdf
+'ku',    # 0xe0
+'kug',    # 0xe1
+'kugg',    # 0xe2
+'kugs',    # 0xe3
+'kun',    # 0xe4
+'kunj',    # 0xe5
+'kunh',    # 0xe6
+'kud',    # 0xe7
+'kul',    # 0xe8
+'kulg',    # 0xe9
+'kulm',    # 0xea
+'kulb',    # 0xeb
+'kuls',    # 0xec
+'kult',    # 0xed
+'kulp',    # 0xee
+'kulh',    # 0xef
+'kum',    # 0xf0
+'kub',    # 0xf1
+'kubs',    # 0xf2
+'kus',    # 0xf3
+'kuss',    # 0xf4
+'kung',    # 0xf5
+'kuj',    # 0xf6
+'kuc',    # 0xf7
+'kuk',    # 0xf8
+'kut',    # 0xf9
+'kup',    # 0xfa
+'kuh',    # 0xfb
+'kweo',    # 0xfc
+'kweog',    # 0xfd
+'kweogg',    # 0xfe
+'kweogs',    # 0xff
+)
diff --git a/lib/unidecode/x0d0.py b/lib/unidecode/x0d0.py
new file mode 100644
index 00000000..d6b38294
--- /dev/null
+++ b/lib/unidecode/x0d0.py
@@ -0,0 +1,258 @@
+data = (
+'kweon',    # 0x00
+'kweonj',    # 0x01
+'kweonh',    # 0x02
+'kweod',    # 0x03
+'kweol',    # 0x04
+'kweolg',    # 0x05
+'kweolm',    # 0x06
+'kweolb',    # 0x07
+'kweols',    # 0x08
+'kweolt',    # 0x09
+'kweolp',    # 0x0a
+'kweolh',    # 0x0b
+'kweom',    # 0x0c
+'kweob',    # 0x0d
+'kweobs',    # 0x0e
+'kweos',    # 0x0f
+'kweoss',    # 0x10
+'kweong',    # 0x11
+'kweoj',    # 0x12
+'kweoc',    # 0x13
+'kweok',    # 0x14
+'kweot',    # 0x15
+'kweop',    # 0x16
+'kweoh',    # 0x17
+'kwe',    # 0x18
+'kweg',    # 0x19
+'kwegg',    # 0x1a
+'kwegs',    # 0x1b
+'kwen',    # 0x1c
+'kwenj',    # 0x1d
+'kwenh',    # 0x1e
+'kwed',    # 0x1f
+'kwel',    # 0x20
+'kwelg',    # 0x21
+'kwelm',    # 0x22
+'kwelb',    # 0x23
+'kwels',    # 0x24
+'kwelt',    # 0x25
+'kwelp',    # 0x26
+'kwelh',    # 0x27
+'kwem',    # 0x28
+'kweb',    # 0x29
+'kwebs',    # 0x2a
+'kwes',    # 0x2b
+'kwess',    # 0x2c
+'kweng',    # 0x2d
+'kwej',    # 0x2e
+'kwec',    # 0x2f
+'kwek',    # 0x30
+'kwet',    # 0x31
+'kwep',    # 0x32
+'kweh',    # 0x33
+'kwi',    # 0x34
+'kwig',    # 0x35
+'kwigg',    # 0x36
+'kwigs',    # 0x37
+'kwin',    # 0x38
+'kwinj',    # 0x39
+'kwinh',    # 0x3a
+'kwid',    # 0x3b
+'kwil',    # 0x3c
+'kwilg',    # 0x3d
+'kwilm',    # 0x3e
+'kwilb',    # 0x3f
+'kwils',    # 0x40
+'kwilt',    # 0x41
+'kwilp',    # 0x42
+'kwilh',    # 0x43
+'kwim',    # 0x44
+'kwib',    # 0x45
+'kwibs',    # 0x46
+'kwis',    # 0x47
+'kwiss',    # 0x48
+'kwing',    # 0x49
+'kwij',    # 0x4a
+'kwic',    # 0x4b
+'kwik',    # 0x4c
+'kwit',    # 0x4d
+'kwip',    # 0x4e
+'kwih',    # 0x4f
+'kyu',    # 0x50
+'kyug',    # 0x51
+'kyugg',    # 0x52
+'kyugs',    # 0x53
+'kyun',    # 0x54
+'kyunj',    # 0x55
+'kyunh',    # 0x56
+'kyud',    # 0x57
+'kyul',    # 0x58
+'kyulg',    # 0x59
+'kyulm',    # 0x5a
+'kyulb',    # 0x5b
+'kyuls',    # 0x5c
+'kyult',    # 0x5d
+'kyulp',    # 0x5e
+'kyulh',    # 0x5f
+'kyum',    # 0x60
+'kyub',    # 0x61
+'kyubs',    # 0x62
+'kyus',    # 0x63
+'kyuss',    # 0x64
+'kyung',    # 0x65
+'kyuj',    # 0x66
+'kyuc',    # 0x67
+'kyuk',    # 0x68
+'kyut',    # 0x69
+'kyup',    # 0x6a
+'kyuh',    # 0x6b
+'keu',    # 0x6c
+'keug',    # 0x6d
+'keugg',    # 0x6e
+'keugs',    # 0x6f
+'keun',    # 0x70
+'keunj',    # 0x71
+'keunh',    # 0x72
+'keud',    # 0x73
+'keul',    # 0x74
+'keulg',    # 0x75
+'keulm',    # 0x76
+'keulb',    # 0x77
+'keuls',    # 0x78
+'keult',    # 0x79
+'keulp',    # 0x7a
+'keulh',    # 0x7b
+'keum',    # 0x7c
+'keub',    # 0x7d
+'keubs',    # 0x7e
+'keus',    # 0x7f
+'keuss',    # 0x80
+'keung',    # 0x81
+'keuj',    # 0x82
+'keuc',    # 0x83
+'keuk',    # 0x84
+'keut',    # 0x85
+'keup',    # 0x86
+'keuh',    # 0x87
+'kyi',    # 0x88
+'kyig',    # 0x89
+'kyigg',    # 0x8a
+'kyigs',    # 0x8b
+'kyin',    # 0x8c
+'kyinj',    # 0x8d
+'kyinh',    # 0x8e
+'kyid',    # 0x8f
+'kyil',    # 0x90
+'kyilg',    # 0x91
+'kyilm',    # 0x92
+'kyilb',    # 0x93
+'kyils',    # 0x94
+'kyilt',    # 0x95
+'kyilp',    # 0x96
+'kyilh',    # 0x97
+'kyim',    # 0x98
+'kyib',    # 0x99
+'kyibs',    # 0x9a
+'kyis',    # 0x9b
+'kyiss',    # 0x9c
+'kying',    # 0x9d
+'kyij',    # 0x9e
+'kyic',    # 0x9f
+'kyik',    # 0xa0
+'kyit',    # 0xa1
+'kyip',    # 0xa2
+'kyih',    # 0xa3
+'ki',    # 0xa4
+'kig',    # 0xa5
+'kigg',    # 0xa6
+'kigs',    # 0xa7
+'kin',    # 0xa8
+'kinj',    # 0xa9
+'kinh',    # 0xaa
+'kid',    # 0xab
+'kil',    # 0xac
+'kilg',    # 0xad
+'kilm',    # 0xae
+'kilb',    # 0xaf
+'kils',    # 0xb0
+'kilt',    # 0xb1
+'kilp',    # 0xb2
+'kilh',    # 0xb3
+'kim',    # 0xb4
+'kib',    # 0xb5
+'kibs',    # 0xb6
+'kis',    # 0xb7
+'kiss',    # 0xb8
+'king',    # 0xb9
+'kij',    # 0xba
+'kic',    # 0xbb
+'kik',    # 0xbc
+'kit',    # 0xbd
+'kip',    # 0xbe
+'kih',    # 0xbf
+'ta',    # 0xc0
+'tag',    # 0xc1
+'tagg',    # 0xc2
+'tags',    # 0xc3
+'tan',    # 0xc4
+'tanj',    # 0xc5
+'tanh',    # 0xc6
+'tad',    # 0xc7
+'tal',    # 0xc8
+'talg',    # 0xc9
+'talm',    # 0xca
+'talb',    # 0xcb
+'tals',    # 0xcc
+'talt',    # 0xcd
+'talp',    # 0xce
+'talh',    # 0xcf
+'tam',    # 0xd0
+'tab',    # 0xd1
+'tabs',    # 0xd2
+'tas',    # 0xd3
+'tass',    # 0xd4
+'tang',    # 0xd5
+'taj',    # 0xd6
+'tac',    # 0xd7
+'tak',    # 0xd8
+'tat',    # 0xd9
+'tap',    # 0xda
+'tah',    # 0xdb
+'tae',    # 0xdc
+'taeg',    # 0xdd
+'taegg',    # 0xde
+'taegs',    # 0xdf
+'taen',    # 0xe0
+'taenj',    # 0xe1
+'taenh',    # 0xe2
+'taed',    # 0xe3
+'tael',    # 0xe4
+'taelg',    # 0xe5
+'taelm',    # 0xe6
+'taelb',    # 0xe7
+'taels',    # 0xe8
+'taelt',    # 0xe9
+'taelp',    # 0xea
+'taelh',    # 0xeb
+'taem',    # 0xec
+'taeb',    # 0xed
+'taebs',    # 0xee
+'taes',    # 0xef
+'taess',    # 0xf0
+'taeng',    # 0xf1
+'taej',    # 0xf2
+'taec',    # 0xf3
+'taek',    # 0xf4
+'taet',    # 0xf5
+'taep',    # 0xf6
+'taeh',    # 0xf7
+'tya',    # 0xf8
+'tyag',    # 0xf9
+'tyagg',    # 0xfa
+'tyags',    # 0xfb
+'tyan',    # 0xfc
+'tyanj',    # 0xfd
+'tyanh',    # 0xfe
+'tyad',    # 0xff
+)
diff --git a/lib/unidecode/x0d1.py b/lib/unidecode/x0d1.py
new file mode 100644
index 00000000..c2bbd16d
--- /dev/null
+++ b/lib/unidecode/x0d1.py
@@ -0,0 +1,258 @@
+data = (
+'tyal',    # 0x00
+'tyalg',    # 0x01
+'tyalm',    # 0x02
+'tyalb',    # 0x03
+'tyals',    # 0x04
+'tyalt',    # 0x05
+'tyalp',    # 0x06
+'tyalh',    # 0x07
+'tyam',    # 0x08
+'tyab',    # 0x09
+'tyabs',    # 0x0a
+'tyas',    # 0x0b
+'tyass',    # 0x0c
+'tyang',    # 0x0d
+'tyaj',    # 0x0e
+'tyac',    # 0x0f
+'tyak',    # 0x10
+'tyat',    # 0x11
+'tyap',    # 0x12
+'tyah',    # 0x13
+'tyae',    # 0x14
+'tyaeg',    # 0x15
+'tyaegg',    # 0x16
+'tyaegs',    # 0x17
+'tyaen',    # 0x18
+'tyaenj',    # 0x19
+'tyaenh',    # 0x1a
+'tyaed',    # 0x1b
+'tyael',    # 0x1c
+'tyaelg',    # 0x1d
+'tyaelm',    # 0x1e
+'tyaelb',    # 0x1f
+'tyaels',    # 0x20
+'tyaelt',    # 0x21
+'tyaelp',    # 0x22
+'tyaelh',    # 0x23
+'tyaem',    # 0x24
+'tyaeb',    # 0x25
+'tyaebs',    # 0x26
+'tyaes',    # 0x27
+'tyaess',    # 0x28
+'tyaeng',    # 0x29
+'tyaej',    # 0x2a
+'tyaec',    # 0x2b
+'tyaek',    # 0x2c
+'tyaet',    # 0x2d
+'tyaep',    # 0x2e
+'tyaeh',    # 0x2f
+'teo',    # 0x30
+'teog',    # 0x31
+'teogg',    # 0x32
+'teogs',    # 0x33
+'teon',    # 0x34
+'teonj',    # 0x35
+'teonh',    # 0x36
+'teod',    # 0x37
+'teol',    # 0x38
+'teolg',    # 0x39
+'teolm',    # 0x3a
+'teolb',    # 0x3b
+'teols',    # 0x3c
+'teolt',    # 0x3d
+'teolp',    # 0x3e
+'teolh',    # 0x3f
+'teom',    # 0x40
+'teob',    # 0x41
+'teobs',    # 0x42
+'teos',    # 0x43
+'teoss',    # 0x44
+'teong',    # 0x45
+'teoj',    # 0x46
+'teoc',    # 0x47
+'teok',    # 0x48
+'teot',    # 0x49
+'teop',    # 0x4a
+'teoh',    # 0x4b
+'te',    # 0x4c
+'teg',    # 0x4d
+'tegg',    # 0x4e
+'tegs',    # 0x4f
+'ten',    # 0x50
+'tenj',    # 0x51
+'tenh',    # 0x52
+'ted',    # 0x53
+'tel',    # 0x54
+'telg',    # 0x55
+'telm',    # 0x56
+'telb',    # 0x57
+'tels',    # 0x58
+'telt',    # 0x59
+'telp',    # 0x5a
+'telh',    # 0x5b
+'tem',    # 0x5c
+'teb',    # 0x5d
+'tebs',    # 0x5e
+'tes',    # 0x5f
+'tess',    # 0x60
+'teng',    # 0x61
+'tej',    # 0x62
+'tec',    # 0x63
+'tek',    # 0x64
+'tet',    # 0x65
+'tep',    # 0x66
+'teh',    # 0x67
+'tyeo',    # 0x68
+'tyeog',    # 0x69
+'tyeogg',    # 0x6a
+'tyeogs',    # 0x6b
+'tyeon',    # 0x6c
+'tyeonj',    # 0x6d
+'tyeonh',    # 0x6e
+'tyeod',    # 0x6f
+'tyeol',    # 0x70
+'tyeolg',    # 0x71
+'tyeolm',    # 0x72
+'tyeolb',    # 0x73
+'tyeols',    # 0x74
+'tyeolt',    # 0x75
+'tyeolp',    # 0x76
+'tyeolh',    # 0x77
+'tyeom',    # 0x78
+'tyeob',    # 0x79
+'tyeobs',    # 0x7a
+'tyeos',    # 0x7b
+'tyeoss',    # 0x7c
+'tyeong',    # 0x7d
+'tyeoj',    # 0x7e
+'tyeoc',    # 0x7f
+'tyeok',    # 0x80
+'tyeot',    # 0x81
+'tyeop',    # 0x82
+'tyeoh',    # 0x83
+'tye',    # 0x84
+'tyeg',    # 0x85
+'tyegg',    # 0x86
+'tyegs',    # 0x87
+'tyen',    # 0x88
+'tyenj',    # 0x89
+'tyenh',    # 0x8a
+'tyed',    # 0x8b
+'tyel',    # 0x8c
+'tyelg',    # 0x8d
+'tyelm',    # 0x8e
+'tyelb',    # 0x8f
+'tyels',    # 0x90
+'tyelt',    # 0x91
+'tyelp',    # 0x92
+'tyelh',    # 0x93
+'tyem',    # 0x94
+'tyeb',    # 0x95
+'tyebs',    # 0x96
+'tyes',    # 0x97
+'tyess',    # 0x98
+'tyeng',    # 0x99
+'tyej',    # 0x9a
+'tyec',    # 0x9b
+'tyek',    # 0x9c
+'tyet',    # 0x9d
+'tyep',    # 0x9e
+'tyeh',    # 0x9f
+'to',    # 0xa0
+'tog',    # 0xa1
+'togg',    # 0xa2
+'togs',    # 0xa3
+'ton',    # 0xa4
+'tonj',    # 0xa5
+'tonh',    # 0xa6
+'tod',    # 0xa7
+'tol',    # 0xa8
+'tolg',    # 0xa9
+'tolm',    # 0xaa
+'tolb',    # 0xab
+'tols',    # 0xac
+'tolt',    # 0xad
+'tolp',    # 0xae
+'tolh',    # 0xaf
+'tom',    # 0xb0
+'tob',    # 0xb1
+'tobs',    # 0xb2
+'tos',    # 0xb3
+'toss',    # 0xb4
+'tong',    # 0xb5
+'toj',    # 0xb6
+'toc',    # 0xb7
+'tok',    # 0xb8
+'tot',    # 0xb9
+'top',    # 0xba
+'toh',    # 0xbb
+'twa',    # 0xbc
+'twag',    # 0xbd
+'twagg',    # 0xbe
+'twags',    # 0xbf
+'twan',    # 0xc0
+'twanj',    # 0xc1
+'twanh',    # 0xc2
+'twad',    # 0xc3
+'twal',    # 0xc4
+'twalg',    # 0xc5
+'twalm',    # 0xc6
+'twalb',    # 0xc7
+'twals',    # 0xc8
+'twalt',    # 0xc9
+'twalp',    # 0xca
+'twalh',    # 0xcb
+'twam',    # 0xcc
+'twab',    # 0xcd
+'twabs',    # 0xce
+'twas',    # 0xcf
+'twass',    # 0xd0
+'twang',    # 0xd1
+'twaj',    # 0xd2
+'twac',    # 0xd3
+'twak',    # 0xd4
+'twat',    # 0xd5
+'twap',    # 0xd6
+'twah',    # 0xd7
+'twae',    # 0xd8
+'twaeg',    # 0xd9
+'twaegg',    # 0xda
+'twaegs',    # 0xdb
+'twaen',    # 0xdc
+'twaenj',    # 0xdd
+'twaenh',    # 0xde
+'twaed',    # 0xdf
+'twael',    # 0xe0
+'twaelg',    # 0xe1
+'twaelm',    # 0xe2
+'twaelb',    # 0xe3
+'twaels',    # 0xe4
+'twaelt',    # 0xe5
+'twaelp',    # 0xe6
+'twaelh',    # 0xe7
+'twaem',    # 0xe8
+'twaeb',    # 0xe9
+'twaebs',    # 0xea
+'twaes',    # 0xeb
+'twaess',    # 0xec
+'twaeng',    # 0xed
+'twaej',    # 0xee
+'twaec',    # 0xef
+'twaek',    # 0xf0
+'twaet',    # 0xf1
+'twaep',    # 0xf2
+'twaeh',    # 0xf3
+'toe',    # 0xf4
+'toeg',    # 0xf5
+'toegg',    # 0xf6
+'toegs',    # 0xf7
+'toen',    # 0xf8
+'toenj',    # 0xf9
+'toenh',    # 0xfa
+'toed',    # 0xfb
+'toel',    # 0xfc
+'toelg',    # 0xfd
+'toelm',    # 0xfe
+'toelb',    # 0xff
+)
diff --git a/lib/unidecode/x0d2.py b/lib/unidecode/x0d2.py
new file mode 100644
index 00000000..052d462a
--- /dev/null
+++ b/lib/unidecode/x0d2.py
@@ -0,0 +1,258 @@
+data = (
+'toels',    # 0x00
+'toelt',    # 0x01
+'toelp',    # 0x02
+'toelh',    # 0x03
+'toem',    # 0x04
+'toeb',    # 0x05
+'toebs',    # 0x06
+'toes',    # 0x07
+'toess',    # 0x08
+'toeng',    # 0x09
+'toej',    # 0x0a
+'toec',    # 0x0b
+'toek',    # 0x0c
+'toet',    # 0x0d
+'toep',    # 0x0e
+'toeh',    # 0x0f
+'tyo',    # 0x10
+'tyog',    # 0x11
+'tyogg',    # 0x12
+'tyogs',    # 0x13
+'tyon',    # 0x14
+'tyonj',    # 0x15
+'tyonh',    # 0x16
+'tyod',    # 0x17
+'tyol',    # 0x18
+'tyolg',    # 0x19
+'tyolm',    # 0x1a
+'tyolb',    # 0x1b
+'tyols',    # 0x1c
+'tyolt',    # 0x1d
+'tyolp',    # 0x1e
+'tyolh',    # 0x1f
+'tyom',    # 0x20
+'tyob',    # 0x21
+'tyobs',    # 0x22
+'tyos',    # 0x23
+'tyoss',    # 0x24
+'tyong',    # 0x25
+'tyoj',    # 0x26
+'tyoc',    # 0x27
+'tyok',    # 0x28
+'tyot',    # 0x29
+'tyop',    # 0x2a
+'tyoh',    # 0x2b
+'tu',    # 0x2c
+'tug',    # 0x2d
+'tugg',    # 0x2e
+'tugs',    # 0x2f
+'tun',    # 0x30
+'tunj',    # 0x31
+'tunh',    # 0x32
+'tud',    # 0x33
+'tul',    # 0x34
+'tulg',    # 0x35
+'tulm',    # 0x36
+'tulb',    # 0x37
+'tuls',    # 0x38
+'tult',    # 0x39
+'tulp',    # 0x3a
+'tulh',    # 0x3b
+'tum',    # 0x3c
+'tub',    # 0x3d
+'tubs',    # 0x3e
+'tus',    # 0x3f
+'tuss',    # 0x40
+'tung',    # 0x41
+'tuj',    # 0x42
+'tuc',    # 0x43
+'tuk',    # 0x44
+'tut',    # 0x45
+'tup',    # 0x46
+'tuh',    # 0x47
+'tweo',    # 0x48
+'tweog',    # 0x49
+'tweogg',    # 0x4a
+'tweogs',    # 0x4b
+'tweon',    # 0x4c
+'tweonj',    # 0x4d
+'tweonh',    # 0x4e
+'tweod',    # 0x4f
+'tweol',    # 0x50
+'tweolg',    # 0x51
+'tweolm',    # 0x52
+'tweolb',    # 0x53
+'tweols',    # 0x54
+'tweolt',    # 0x55
+'tweolp',    # 0x56
+'tweolh',    # 0x57
+'tweom',    # 0x58
+'tweob',    # 0x59
+'tweobs',    # 0x5a
+'tweos',    # 0x5b
+'tweoss',    # 0x5c
+'tweong',    # 0x5d
+'tweoj',    # 0x5e
+'tweoc',    # 0x5f
+'tweok',    # 0x60
+'tweot',    # 0x61
+'tweop',    # 0x62
+'tweoh',    # 0x63
+'twe',    # 0x64
+'tweg',    # 0x65
+'twegg',    # 0x66
+'twegs',    # 0x67
+'twen',    # 0x68
+'twenj',    # 0x69
+'twenh',    # 0x6a
+'twed',    # 0x6b
+'twel',    # 0x6c
+'twelg',    # 0x6d
+'twelm',    # 0x6e
+'twelb',    # 0x6f
+'twels',    # 0x70
+'twelt',    # 0x71
+'twelp',    # 0x72
+'twelh',    # 0x73
+'twem',    # 0x74
+'tweb',    # 0x75
+'twebs',    # 0x76
+'twes',    # 0x77
+'twess',    # 0x78
+'tweng',    # 0x79
+'twej',    # 0x7a
+'twec',    # 0x7b
+'twek',    # 0x7c
+'twet',    # 0x7d
+'twep',    # 0x7e
+'tweh',    # 0x7f
+'twi',    # 0x80
+'twig',    # 0x81
+'twigg',    # 0x82
+'twigs',    # 0x83
+'twin',    # 0x84
+'twinj',    # 0x85
+'twinh',    # 0x86
+'twid',    # 0x87
+'twil',    # 0x88
+'twilg',    # 0x89
+'twilm',    # 0x8a
+'twilb',    # 0x8b
+'twils',    # 0x8c
+'twilt',    # 0x8d
+'twilp',    # 0x8e
+'twilh',    # 0x8f
+'twim',    # 0x90
+'twib',    # 0x91
+'twibs',    # 0x92
+'twis',    # 0x93
+'twiss',    # 0x94
+'twing',    # 0x95
+'twij',    # 0x96
+'twic',    # 0x97
+'twik',    # 0x98
+'twit',    # 0x99
+'twip',    # 0x9a
+'twih',    # 0x9b
+'tyu',    # 0x9c
+'tyug',    # 0x9d
+'tyugg',    # 0x9e
+'tyugs',    # 0x9f
+'tyun',    # 0xa0
+'tyunj',    # 0xa1
+'tyunh',    # 0xa2
+'tyud',    # 0xa3
+'tyul',    # 0xa4
+'tyulg',    # 0xa5
+'tyulm',    # 0xa6
+'tyulb',    # 0xa7
+'tyuls',    # 0xa8
+'tyult',    # 0xa9
+'tyulp',    # 0xaa
+'tyulh',    # 0xab
+'tyum',    # 0xac
+'tyub',    # 0xad
+'tyubs',    # 0xae
+'tyus',    # 0xaf
+'tyuss',    # 0xb0
+'tyung',    # 0xb1
+'tyuj',    # 0xb2
+'tyuc',    # 0xb3
+'tyuk',    # 0xb4
+'tyut',    # 0xb5
+'tyup',    # 0xb6
+'tyuh',    # 0xb7
+'teu',    # 0xb8
+'teug',    # 0xb9
+'teugg',    # 0xba
+'teugs',    # 0xbb
+'teun',    # 0xbc
+'teunj',    # 0xbd
+'teunh',    # 0xbe
+'teud',    # 0xbf
+'teul',    # 0xc0
+'teulg',    # 0xc1
+'teulm',    # 0xc2
+'teulb',    # 0xc3
+'teuls',    # 0xc4
+'teult',    # 0xc5
+'teulp',    # 0xc6
+'teulh',    # 0xc7
+'teum',    # 0xc8
+'teub',    # 0xc9
+'teubs',    # 0xca
+'teus',    # 0xcb
+'teuss',    # 0xcc
+'teung',    # 0xcd
+'teuj',    # 0xce
+'teuc',    # 0xcf
+'teuk',    # 0xd0
+'teut',    # 0xd1
+'teup',    # 0xd2
+'teuh',    # 0xd3
+'tyi',    # 0xd4
+'tyig',    # 0xd5
+'tyigg',    # 0xd6
+'tyigs',    # 0xd7
+'tyin',    # 0xd8
+'tyinj',    # 0xd9
+'tyinh',    # 0xda
+'tyid',    # 0xdb
+'tyil',    # 0xdc
+'tyilg',    # 0xdd
+'tyilm',    # 0xde
+'tyilb',    # 0xdf
+'tyils',    # 0xe0
+'tyilt',    # 0xe1
+'tyilp',    # 0xe2
+'tyilh',    # 0xe3
+'tyim',    # 0xe4
+'tyib',    # 0xe5
+'tyibs',    # 0xe6
+'tyis',    # 0xe7
+'tyiss',    # 0xe8
+'tying',    # 0xe9
+'tyij',    # 0xea
+'tyic',    # 0xeb
+'tyik',    # 0xec
+'tyit',    # 0xed
+'tyip',    # 0xee
+'tyih',    # 0xef
+'ti',    # 0xf0
+'tig',    # 0xf1
+'tigg',    # 0xf2
+'tigs',    # 0xf3
+'tin',    # 0xf4
+'tinj',    # 0xf5
+'tinh',    # 0xf6
+'tid',    # 0xf7
+'til',    # 0xf8
+'tilg',    # 0xf9
+'tilm',    # 0xfa
+'tilb',    # 0xfb
+'tils',    # 0xfc
+'tilt',    # 0xfd
+'tilp',    # 0xfe
+'tilh',    # 0xff
+)
diff --git a/lib/unidecode/x0d3.py b/lib/unidecode/x0d3.py
new file mode 100644
index 00000000..70a4701e
--- /dev/null
+++ b/lib/unidecode/x0d3.py
@@ -0,0 +1,258 @@
+data = (
+'tim',    # 0x00
+'tib',    # 0x01
+'tibs',    # 0x02
+'tis',    # 0x03
+'tiss',    # 0x04
+'ting',    # 0x05
+'tij',    # 0x06
+'tic',    # 0x07
+'tik',    # 0x08
+'tit',    # 0x09
+'tip',    # 0x0a
+'tih',    # 0x0b
+'pa',    # 0x0c
+'pag',    # 0x0d
+'pagg',    # 0x0e
+'pags',    # 0x0f
+'pan',    # 0x10
+'panj',    # 0x11
+'panh',    # 0x12
+'pad',    # 0x13
+'pal',    # 0x14
+'palg',    # 0x15
+'palm',    # 0x16
+'palb',    # 0x17
+'pals',    # 0x18
+'palt',    # 0x19
+'palp',    # 0x1a
+'palh',    # 0x1b
+'pam',    # 0x1c
+'pab',    # 0x1d
+'pabs',    # 0x1e
+'pas',    # 0x1f
+'pass',    # 0x20
+'pang',    # 0x21
+'paj',    # 0x22
+'pac',    # 0x23
+'pak',    # 0x24
+'pat',    # 0x25
+'pap',    # 0x26
+'pah',    # 0x27
+'pae',    # 0x28
+'paeg',    # 0x29
+'paegg',    # 0x2a
+'paegs',    # 0x2b
+'paen',    # 0x2c
+'paenj',    # 0x2d
+'paenh',    # 0x2e
+'paed',    # 0x2f
+'pael',    # 0x30
+'paelg',    # 0x31
+'paelm',    # 0x32
+'paelb',    # 0x33
+'paels',    # 0x34
+'paelt',    # 0x35
+'paelp',    # 0x36
+'paelh',    # 0x37
+'paem',    # 0x38
+'paeb',    # 0x39
+'paebs',    # 0x3a
+'paes',    # 0x3b
+'paess',    # 0x3c
+'paeng',    # 0x3d
+'paej',    # 0x3e
+'paec',    # 0x3f
+'paek',    # 0x40
+'paet',    # 0x41
+'paep',    # 0x42
+'paeh',    # 0x43
+'pya',    # 0x44
+'pyag',    # 0x45
+'pyagg',    # 0x46
+'pyags',    # 0x47
+'pyan',    # 0x48
+'pyanj',    # 0x49
+'pyanh',    # 0x4a
+'pyad',    # 0x4b
+'pyal',    # 0x4c
+'pyalg',    # 0x4d
+'pyalm',    # 0x4e
+'pyalb',    # 0x4f
+'pyals',    # 0x50
+'pyalt',    # 0x51
+'pyalp',    # 0x52
+'pyalh',    # 0x53
+'pyam',    # 0x54
+'pyab',    # 0x55
+'pyabs',    # 0x56
+'pyas',    # 0x57
+'pyass',    # 0x58
+'pyang',    # 0x59
+'pyaj',    # 0x5a
+'pyac',    # 0x5b
+'pyak',    # 0x5c
+'pyat',    # 0x5d
+'pyap',    # 0x5e
+'pyah',    # 0x5f
+'pyae',    # 0x60
+'pyaeg',    # 0x61
+'pyaegg',    # 0x62
+'pyaegs',    # 0x63
+'pyaen',    # 0x64
+'pyaenj',    # 0x65
+'pyaenh',    # 0x66
+'pyaed',    # 0x67
+'pyael',    # 0x68
+'pyaelg',    # 0x69
+'pyaelm',    # 0x6a
+'pyaelb',    # 0x6b
+'pyaels',    # 0x6c
+'pyaelt',    # 0x6d
+'pyaelp',    # 0x6e
+'pyaelh',    # 0x6f
+'pyaem',    # 0x70
+'pyaeb',    # 0x71
+'pyaebs',    # 0x72
+'pyaes',    # 0x73
+'pyaess',    # 0x74
+'pyaeng',    # 0x75
+'pyaej',    # 0x76
+'pyaec',    # 0x77
+'pyaek',    # 0x78
+'pyaet',    # 0x79
+'pyaep',    # 0x7a
+'pyaeh',    # 0x7b
+'peo',    # 0x7c
+'peog',    # 0x7d
+'peogg',    # 0x7e
+'peogs',    # 0x7f
+'peon',    # 0x80
+'peonj',    # 0x81
+'peonh',    # 0x82
+'peod',    # 0x83
+'peol',    # 0x84
+'peolg',    # 0x85
+'peolm',    # 0x86
+'peolb',    # 0x87
+'peols',    # 0x88
+'peolt',    # 0x89
+'peolp',    # 0x8a
+'peolh',    # 0x8b
+'peom',    # 0x8c
+'peob',    # 0x8d
+'peobs',    # 0x8e
+'peos',    # 0x8f
+'peoss',    # 0x90
+'peong',    # 0x91
+'peoj',    # 0x92
+'peoc',    # 0x93
+'peok',    # 0x94
+'peot',    # 0x95
+'peop',    # 0x96
+'peoh',    # 0x97
+'pe',    # 0x98
+'peg',    # 0x99
+'pegg',    # 0x9a
+'pegs',    # 0x9b
+'pen',    # 0x9c
+'penj',    # 0x9d
+'penh',    # 0x9e
+'ped',    # 0x9f
+'pel',    # 0xa0
+'pelg',    # 0xa1
+'pelm',    # 0xa2
+'pelb',    # 0xa3
+'pels',    # 0xa4
+'pelt',    # 0xa5
+'pelp',    # 0xa6
+'pelh',    # 0xa7
+'pem',    # 0xa8
+'peb',    # 0xa9
+'pebs',    # 0xaa
+'pes',    # 0xab
+'pess',    # 0xac
+'peng',    # 0xad
+'pej',    # 0xae
+'pec',    # 0xaf
+'pek',    # 0xb0
+'pet',    # 0xb1
+'pep',    # 0xb2
+'peh',    # 0xb3
+'pyeo',    # 0xb4
+'pyeog',    # 0xb5
+'pyeogg',    # 0xb6
+'pyeogs',    # 0xb7
+'pyeon',    # 0xb8
+'pyeonj',    # 0xb9
+'pyeonh',    # 0xba
+'pyeod',    # 0xbb
+'pyeol',    # 0xbc
+'pyeolg',    # 0xbd
+'pyeolm',    # 0xbe
+'pyeolb',    # 0xbf
+'pyeols',    # 0xc0
+'pyeolt',    # 0xc1
+'pyeolp',    # 0xc2
+'pyeolh',    # 0xc3
+'pyeom',    # 0xc4
+'pyeob',    # 0xc5
+'pyeobs',    # 0xc6
+'pyeos',    # 0xc7
+'pyeoss',    # 0xc8
+'pyeong',    # 0xc9
+'pyeoj',    # 0xca
+'pyeoc',    # 0xcb
+'pyeok',    # 0xcc
+'pyeot',    # 0xcd
+'pyeop',    # 0xce
+'pyeoh',    # 0xcf
+'pye',    # 0xd0
+'pyeg',    # 0xd1
+'pyegg',    # 0xd2
+'pyegs',    # 0xd3
+'pyen',    # 0xd4
+'pyenj',    # 0xd5
+'pyenh',    # 0xd6
+'pyed',    # 0xd7
+'pyel',    # 0xd8
+'pyelg',    # 0xd9
+'pyelm',    # 0xda
+'pyelb',    # 0xdb
+'pyels',    # 0xdc
+'pyelt',    # 0xdd
+'pyelp',    # 0xde
+'pyelh',    # 0xdf
+'pyem',    # 0xe0
+'pyeb',    # 0xe1
+'pyebs',    # 0xe2
+'pyes',    # 0xe3
+'pyess',    # 0xe4
+'pyeng',    # 0xe5
+'pyej',    # 0xe6
+'pyec',    # 0xe7
+'pyek',    # 0xe8
+'pyet',    # 0xe9
+'pyep',    # 0xea
+'pyeh',    # 0xeb
+'po',    # 0xec
+'pog',    # 0xed
+'pogg',    # 0xee
+'pogs',    # 0xef
+'pon',    # 0xf0
+'ponj',    # 0xf1
+'ponh',    # 0xf2
+'pod',    # 0xf3
+'pol',    # 0xf4
+'polg',    # 0xf5
+'polm',    # 0xf6
+'polb',    # 0xf7
+'pols',    # 0xf8
+'polt',    # 0xf9
+'polp',    # 0xfa
+'polh',    # 0xfb
+'pom',    # 0xfc
+'pob',    # 0xfd
+'pobs',    # 0xfe
+'pos',    # 0xff
+)
diff --git a/lib/unidecode/x0d4.py b/lib/unidecode/x0d4.py
new file mode 100644
index 00000000..87caad48
--- /dev/null
+++ b/lib/unidecode/x0d4.py
@@ -0,0 +1,258 @@
+data = (
+'poss',    # 0x00
+'pong',    # 0x01
+'poj',    # 0x02
+'poc',    # 0x03
+'pok',    # 0x04
+'pot',    # 0x05
+'pop',    # 0x06
+'poh',    # 0x07
+'pwa',    # 0x08
+'pwag',    # 0x09
+'pwagg',    # 0x0a
+'pwags',    # 0x0b
+'pwan',    # 0x0c
+'pwanj',    # 0x0d
+'pwanh',    # 0x0e
+'pwad',    # 0x0f
+'pwal',    # 0x10
+'pwalg',    # 0x11
+'pwalm',    # 0x12
+'pwalb',    # 0x13
+'pwals',    # 0x14
+'pwalt',    # 0x15
+'pwalp',    # 0x16
+'pwalh',    # 0x17
+'pwam',    # 0x18
+'pwab',    # 0x19
+'pwabs',    # 0x1a
+'pwas',    # 0x1b
+'pwass',    # 0x1c
+'pwang',    # 0x1d
+'pwaj',    # 0x1e
+'pwac',    # 0x1f
+'pwak',    # 0x20
+'pwat',    # 0x21
+'pwap',    # 0x22
+'pwah',    # 0x23
+'pwae',    # 0x24
+'pwaeg',    # 0x25
+'pwaegg',    # 0x26
+'pwaegs',    # 0x27
+'pwaen',    # 0x28
+'pwaenj',    # 0x29
+'pwaenh',    # 0x2a
+'pwaed',    # 0x2b
+'pwael',    # 0x2c
+'pwaelg',    # 0x2d
+'pwaelm',    # 0x2e
+'pwaelb',    # 0x2f
+'pwaels',    # 0x30
+'pwaelt',    # 0x31
+'pwaelp',    # 0x32
+'pwaelh',    # 0x33
+'pwaem',    # 0x34
+'pwaeb',    # 0x35
+'pwaebs',    # 0x36
+'pwaes',    # 0x37
+'pwaess',    # 0x38
+'pwaeng',    # 0x39
+'pwaej',    # 0x3a
+'pwaec',    # 0x3b
+'pwaek',    # 0x3c
+'pwaet',    # 0x3d
+'pwaep',    # 0x3e
+'pwaeh',    # 0x3f
+'poe',    # 0x40
+'poeg',    # 0x41
+'poegg',    # 0x42
+'poegs',    # 0x43
+'poen',    # 0x44
+'poenj',    # 0x45
+'poenh',    # 0x46
+'poed',    # 0x47
+'poel',    # 0x48
+'poelg',    # 0x49
+'poelm',    # 0x4a
+'poelb',    # 0x4b
+'poels',    # 0x4c
+'poelt',    # 0x4d
+'poelp',    # 0x4e
+'poelh',    # 0x4f
+'poem',    # 0x50
+'poeb',    # 0x51
+'poebs',    # 0x52
+'poes',    # 0x53
+'poess',    # 0x54
+'poeng',    # 0x55
+'poej',    # 0x56
+'poec',    # 0x57
+'poek',    # 0x58
+'poet',    # 0x59
+'poep',    # 0x5a
+'poeh',    # 0x5b
+'pyo',    # 0x5c
+'pyog',    # 0x5d
+'pyogg',    # 0x5e
+'pyogs',    # 0x5f
+'pyon',    # 0x60
+'pyonj',    # 0x61
+'pyonh',    # 0x62
+'pyod',    # 0x63
+'pyol',    # 0x64
+'pyolg',    # 0x65
+'pyolm',    # 0x66
+'pyolb',    # 0x67
+'pyols',    # 0x68
+'pyolt',    # 0x69
+'pyolp',    # 0x6a
+'pyolh',    # 0x6b
+'pyom',    # 0x6c
+'pyob',    # 0x6d
+'pyobs',    # 0x6e
+'pyos',    # 0x6f
+'pyoss',    # 0x70
+'pyong',    # 0x71
+'pyoj',    # 0x72
+'pyoc',    # 0x73
+'pyok',    # 0x74
+'pyot',    # 0x75
+'pyop',    # 0x76
+'pyoh',    # 0x77
+'pu',    # 0x78
+'pug',    # 0x79
+'pugg',    # 0x7a
+'pugs',    # 0x7b
+'pun',    # 0x7c
+'punj',    # 0x7d
+'punh',    # 0x7e
+'pud',    # 0x7f
+'pul',    # 0x80
+'pulg',    # 0x81
+'pulm',    # 0x82
+'pulb',    # 0x83
+'puls',    # 0x84
+'pult',    # 0x85
+'pulp',    # 0x86
+'pulh',    # 0x87
+'pum',    # 0x88
+'pub',    # 0x89
+'pubs',    # 0x8a
+'pus',    # 0x8b
+'puss',    # 0x8c
+'pung',    # 0x8d
+'puj',    # 0x8e
+'puc',    # 0x8f
+'puk',    # 0x90
+'put',    # 0x91
+'pup',    # 0x92
+'puh',    # 0x93
+'pweo',    # 0x94
+'pweog',    # 0x95
+'pweogg',    # 0x96
+'pweogs',    # 0x97
+'pweon',    # 0x98
+'pweonj',    # 0x99
+'pweonh',    # 0x9a
+'pweod',    # 0x9b
+'pweol',    # 0x9c
+'pweolg',    # 0x9d
+'pweolm',    # 0x9e
+'pweolb',    # 0x9f
+'pweols',    # 0xa0
+'pweolt',    # 0xa1
+'pweolp',    # 0xa2
+'pweolh',    # 0xa3
+'pweom',    # 0xa4
+'pweob',    # 0xa5
+'pweobs',    # 0xa6
+'pweos',    # 0xa7
+'pweoss',    # 0xa8
+'pweong',    # 0xa9
+'pweoj',    # 0xaa
+'pweoc',    # 0xab
+'pweok',    # 0xac
+'pweot',    # 0xad
+'pweop',    # 0xae
+'pweoh',    # 0xaf
+'pwe',    # 0xb0
+'pweg',    # 0xb1
+'pwegg',    # 0xb2
+'pwegs',    # 0xb3
+'pwen',    # 0xb4
+'pwenj',    # 0xb5
+'pwenh',    # 0xb6
+'pwed',    # 0xb7
+'pwel',    # 0xb8
+'pwelg',    # 0xb9
+'pwelm',    # 0xba
+'pwelb',    # 0xbb
+'pwels',    # 0xbc
+'pwelt',    # 0xbd
+'pwelp',    # 0xbe
+'pwelh',    # 0xbf
+'pwem',    # 0xc0
+'pweb',    # 0xc1
+'pwebs',    # 0xc2
+'pwes',    # 0xc3
+'pwess',    # 0xc4
+'pweng',    # 0xc5
+'pwej',    # 0xc6
+'pwec',    # 0xc7
+'pwek',    # 0xc8
+'pwet',    # 0xc9
+'pwep',    # 0xca
+'pweh',    # 0xcb
+'pwi',    # 0xcc
+'pwig',    # 0xcd
+'pwigg',    # 0xce
+'pwigs',    # 0xcf
+'pwin',    # 0xd0
+'pwinj',    # 0xd1
+'pwinh',    # 0xd2
+'pwid',    # 0xd3
+'pwil',    # 0xd4
+'pwilg',    # 0xd5
+'pwilm',    # 0xd6
+'pwilb',    # 0xd7
+'pwils',    # 0xd8
+'pwilt',    # 0xd9
+'pwilp',    # 0xda
+'pwilh',    # 0xdb
+'pwim',    # 0xdc
+'pwib',    # 0xdd
+'pwibs',    # 0xde
+'pwis',    # 0xdf
+'pwiss',    # 0xe0
+'pwing',    # 0xe1
+'pwij',    # 0xe2
+'pwic',    # 0xe3
+'pwik',    # 0xe4
+'pwit',    # 0xe5
+'pwip',    # 0xe6
+'pwih',    # 0xe7
+'pyu',    # 0xe8
+'pyug',    # 0xe9
+'pyugg',    # 0xea
+'pyugs',    # 0xeb
+'pyun',    # 0xec
+'pyunj',    # 0xed
+'pyunh',    # 0xee
+'pyud',    # 0xef
+'pyul',    # 0xf0
+'pyulg',    # 0xf1
+'pyulm',    # 0xf2
+'pyulb',    # 0xf3
+'pyuls',    # 0xf4
+'pyult',    # 0xf5
+'pyulp',    # 0xf6
+'pyulh',    # 0xf7
+'pyum',    # 0xf8
+'pyub',    # 0xf9
+'pyubs',    # 0xfa
+'pyus',    # 0xfb
+'pyuss',    # 0xfc
+'pyung',    # 0xfd
+'pyuj',    # 0xfe
+'pyuc',    # 0xff
+)
diff --git a/lib/unidecode/x0d5.py b/lib/unidecode/x0d5.py
new file mode 100644
index 00000000..4dc55f8e
--- /dev/null
+++ b/lib/unidecode/x0d5.py
@@ -0,0 +1,258 @@
+data = (
+'pyuk',    # 0x00
+'pyut',    # 0x01
+'pyup',    # 0x02
+'pyuh',    # 0x03
+'peu',    # 0x04
+'peug',    # 0x05
+'peugg',    # 0x06
+'peugs',    # 0x07
+'peun',    # 0x08
+'peunj',    # 0x09
+'peunh',    # 0x0a
+'peud',    # 0x0b
+'peul',    # 0x0c
+'peulg',    # 0x0d
+'peulm',    # 0x0e
+'peulb',    # 0x0f
+'peuls',    # 0x10
+'peult',    # 0x11
+'peulp',    # 0x12
+'peulh',    # 0x13
+'peum',    # 0x14
+'peub',    # 0x15
+'peubs',    # 0x16
+'peus',    # 0x17
+'peuss',    # 0x18
+'peung',    # 0x19
+'peuj',    # 0x1a
+'peuc',    # 0x1b
+'peuk',    # 0x1c
+'peut',    # 0x1d
+'peup',    # 0x1e
+'peuh',    # 0x1f
+'pyi',    # 0x20
+'pyig',    # 0x21
+'pyigg',    # 0x22
+'pyigs',    # 0x23
+'pyin',    # 0x24
+'pyinj',    # 0x25
+'pyinh',    # 0x26
+'pyid',    # 0x27
+'pyil',    # 0x28
+'pyilg',    # 0x29
+'pyilm',    # 0x2a
+'pyilb',    # 0x2b
+'pyils',    # 0x2c
+'pyilt',    # 0x2d
+'pyilp',    # 0x2e
+'pyilh',    # 0x2f
+'pyim',    # 0x30
+'pyib',    # 0x31
+'pyibs',    # 0x32
+'pyis',    # 0x33
+'pyiss',    # 0x34
+'pying',    # 0x35
+'pyij',    # 0x36
+'pyic',    # 0x37
+'pyik',    # 0x38
+'pyit',    # 0x39
+'pyip',    # 0x3a
+'pyih',    # 0x3b
+'pi',    # 0x3c
+'pig',    # 0x3d
+'pigg',    # 0x3e
+'pigs',    # 0x3f
+'pin',    # 0x40
+'pinj',    # 0x41
+'pinh',    # 0x42
+'pid',    # 0x43
+'pil',    # 0x44
+'pilg',    # 0x45
+'pilm',    # 0x46
+'pilb',    # 0x47
+'pils',    # 0x48
+'pilt',    # 0x49
+'pilp',    # 0x4a
+'pilh',    # 0x4b
+'pim',    # 0x4c
+'pib',    # 0x4d
+'pibs',    # 0x4e
+'pis',    # 0x4f
+'piss',    # 0x50
+'ping',    # 0x51
+'pij',    # 0x52
+'pic',    # 0x53
+'pik',    # 0x54
+'pit',    # 0x55
+'pip',    # 0x56
+'pih',    # 0x57
+'ha',    # 0x58
+'hag',    # 0x59
+'hagg',    # 0x5a
+'hags',    # 0x5b
+'han',    # 0x5c
+'hanj',    # 0x5d
+'hanh',    # 0x5e
+'had',    # 0x5f
+'hal',    # 0x60
+'halg',    # 0x61
+'halm',    # 0x62
+'halb',    # 0x63
+'hals',    # 0x64
+'halt',    # 0x65
+'halp',    # 0x66
+'halh',    # 0x67
+'ham',    # 0x68
+'hab',    # 0x69
+'habs',    # 0x6a
+'has',    # 0x6b
+'hass',    # 0x6c
+'hang',    # 0x6d
+'haj',    # 0x6e
+'hac',    # 0x6f
+'hak',    # 0x70
+'hat',    # 0x71
+'hap',    # 0x72
+'hah',    # 0x73
+'hae',    # 0x74
+'haeg',    # 0x75
+'haegg',    # 0x76
+'haegs',    # 0x77
+'haen',    # 0x78
+'haenj',    # 0x79
+'haenh',    # 0x7a
+'haed',    # 0x7b
+'hael',    # 0x7c
+'haelg',    # 0x7d
+'haelm',    # 0x7e
+'haelb',    # 0x7f
+'haels',    # 0x80
+'haelt',    # 0x81
+'haelp',    # 0x82
+'haelh',    # 0x83
+'haem',    # 0x84
+'haeb',    # 0x85
+'haebs',    # 0x86
+'haes',    # 0x87
+'haess',    # 0x88
+'haeng',    # 0x89
+'haej',    # 0x8a
+'haec',    # 0x8b
+'haek',    # 0x8c
+'haet',    # 0x8d
+'haep',    # 0x8e
+'haeh',    # 0x8f
+'hya',    # 0x90
+'hyag',    # 0x91
+'hyagg',    # 0x92
+'hyags',    # 0x93
+'hyan',    # 0x94
+'hyanj',    # 0x95
+'hyanh',    # 0x96
+'hyad',    # 0x97
+'hyal',    # 0x98
+'hyalg',    # 0x99
+'hyalm',    # 0x9a
+'hyalb',    # 0x9b
+'hyals',    # 0x9c
+'hyalt',    # 0x9d
+'hyalp',    # 0x9e
+'hyalh',    # 0x9f
+'hyam',    # 0xa0
+'hyab',    # 0xa1
+'hyabs',    # 0xa2
+'hyas',    # 0xa3
+'hyass',    # 0xa4
+'hyang',    # 0xa5
+'hyaj',    # 0xa6
+'hyac',    # 0xa7
+'hyak',    # 0xa8
+'hyat',    # 0xa9
+'hyap',    # 0xaa
+'hyah',    # 0xab
+'hyae',    # 0xac
+'hyaeg',    # 0xad
+'hyaegg',    # 0xae
+'hyaegs',    # 0xaf
+'hyaen',    # 0xb0
+'hyaenj',    # 0xb1
+'hyaenh',    # 0xb2
+'hyaed',    # 0xb3
+'hyael',    # 0xb4
+'hyaelg',    # 0xb5
+'hyaelm',    # 0xb6
+'hyaelb',    # 0xb7
+'hyaels',    # 0xb8
+'hyaelt',    # 0xb9
+'hyaelp',    # 0xba
+'hyaelh',    # 0xbb
+'hyaem',    # 0xbc
+'hyaeb',    # 0xbd
+'hyaebs',    # 0xbe
+'hyaes',    # 0xbf
+'hyaess',    # 0xc0
+'hyaeng',    # 0xc1
+'hyaej',    # 0xc2
+'hyaec',    # 0xc3
+'hyaek',    # 0xc4
+'hyaet',    # 0xc5
+'hyaep',    # 0xc6
+'hyaeh',    # 0xc7
+'heo',    # 0xc8
+'heog',    # 0xc9
+'heogg',    # 0xca
+'heogs',    # 0xcb
+'heon',    # 0xcc
+'heonj',    # 0xcd
+'heonh',    # 0xce
+'heod',    # 0xcf
+'heol',    # 0xd0
+'heolg',    # 0xd1
+'heolm',    # 0xd2
+'heolb',    # 0xd3
+'heols',    # 0xd4
+'heolt',    # 0xd5
+'heolp',    # 0xd6
+'heolh',    # 0xd7
+'heom',    # 0xd8
+'heob',    # 0xd9
+'heobs',    # 0xda
+'heos',    # 0xdb
+'heoss',    # 0xdc
+'heong',    # 0xdd
+'heoj',    # 0xde
+'heoc',    # 0xdf
+'heok',    # 0xe0
+'heot',    # 0xe1
+'heop',    # 0xe2
+'heoh',    # 0xe3
+'he',    # 0xe4
+'heg',    # 0xe5
+'hegg',    # 0xe6
+'hegs',    # 0xe7
+'hen',    # 0xe8
+'henj',    # 0xe9
+'henh',    # 0xea
+'hed',    # 0xeb
+'hel',    # 0xec
+'helg',    # 0xed
+'helm',    # 0xee
+'helb',    # 0xef
+'hels',    # 0xf0
+'helt',    # 0xf1
+'help',    # 0xf2
+'helh',    # 0xf3
+'hem',    # 0xf4
+'heb',    # 0xf5
+'hebs',    # 0xf6
+'hes',    # 0xf7
+'hess',    # 0xf8
+'heng',    # 0xf9
+'hej',    # 0xfa
+'hec',    # 0xfb
+'hek',    # 0xfc
+'het',    # 0xfd
+'hep',    # 0xfe
+'heh',    # 0xff
+)
diff --git a/lib/unidecode/x0d6.py b/lib/unidecode/x0d6.py
new file mode 100644
index 00000000..042ce2bd
--- /dev/null
+++ b/lib/unidecode/x0d6.py
@@ -0,0 +1,258 @@
+data = (
+'hyeo',    # 0x00
+'hyeog',    # 0x01
+'hyeogg',    # 0x02
+'hyeogs',    # 0x03
+'hyeon',    # 0x04
+'hyeonj',    # 0x05
+'hyeonh',    # 0x06
+'hyeod',    # 0x07
+'hyeol',    # 0x08
+'hyeolg',    # 0x09
+'hyeolm',    # 0x0a
+'hyeolb',    # 0x0b
+'hyeols',    # 0x0c
+'hyeolt',    # 0x0d
+'hyeolp',    # 0x0e
+'hyeolh',    # 0x0f
+'hyeom',    # 0x10
+'hyeob',    # 0x11
+'hyeobs',    # 0x12
+'hyeos',    # 0x13
+'hyeoss',    # 0x14
+'hyeong',    # 0x15
+'hyeoj',    # 0x16
+'hyeoc',    # 0x17
+'hyeok',    # 0x18
+'hyeot',    # 0x19
+'hyeop',    # 0x1a
+'hyeoh',    # 0x1b
+'hye',    # 0x1c
+'hyeg',    # 0x1d
+'hyegg',    # 0x1e
+'hyegs',    # 0x1f
+'hyen',    # 0x20
+'hyenj',    # 0x21
+'hyenh',    # 0x22
+'hyed',    # 0x23
+'hyel',    # 0x24
+'hyelg',    # 0x25
+'hyelm',    # 0x26
+'hyelb',    # 0x27
+'hyels',    # 0x28
+'hyelt',    # 0x29
+'hyelp',    # 0x2a
+'hyelh',    # 0x2b
+'hyem',    # 0x2c
+'hyeb',    # 0x2d
+'hyebs',    # 0x2e
+'hyes',    # 0x2f
+'hyess',    # 0x30
+'hyeng',    # 0x31
+'hyej',    # 0x32
+'hyec',    # 0x33
+'hyek',    # 0x34
+'hyet',    # 0x35
+'hyep',    # 0x36
+'hyeh',    # 0x37
+'ho',    # 0x38
+'hog',    # 0x39
+'hogg',    # 0x3a
+'hogs',    # 0x3b
+'hon',    # 0x3c
+'honj',    # 0x3d
+'honh',    # 0x3e
+'hod',    # 0x3f
+'hol',    # 0x40
+'holg',    # 0x41
+'holm',    # 0x42
+'holb',    # 0x43
+'hols',    # 0x44
+'holt',    # 0x45
+'holp',    # 0x46
+'holh',    # 0x47
+'hom',    # 0x48
+'hob',    # 0x49
+'hobs',    # 0x4a
+'hos',    # 0x4b
+'hoss',    # 0x4c
+'hong',    # 0x4d
+'hoj',    # 0x4e
+'hoc',    # 0x4f
+'hok',    # 0x50
+'hot',    # 0x51
+'hop',    # 0x52
+'hoh',    # 0x53
+'hwa',    # 0x54
+'hwag',    # 0x55
+'hwagg',    # 0x56
+'hwags',    # 0x57
+'hwan',    # 0x58
+'hwanj',    # 0x59
+'hwanh',    # 0x5a
+'hwad',    # 0x5b
+'hwal',    # 0x5c
+'hwalg',    # 0x5d
+'hwalm',    # 0x5e
+'hwalb',    # 0x5f
+'hwals',    # 0x60
+'hwalt',    # 0x61
+'hwalp',    # 0x62
+'hwalh',    # 0x63
+'hwam',    # 0x64
+'hwab',    # 0x65
+'hwabs',    # 0x66
+'hwas',    # 0x67
+'hwass',    # 0x68
+'hwang',    # 0x69
+'hwaj',    # 0x6a
+'hwac',    # 0x6b
+'hwak',    # 0x6c
+'hwat',    # 0x6d
+'hwap',    # 0x6e
+'hwah',    # 0x6f
+'hwae',    # 0x70
+'hwaeg',    # 0x71
+'hwaegg',    # 0x72
+'hwaegs',    # 0x73
+'hwaen',    # 0x74
+'hwaenj',    # 0x75
+'hwaenh',    # 0x76
+'hwaed',    # 0x77
+'hwael',    # 0x78
+'hwaelg',    # 0x79
+'hwaelm',    # 0x7a
+'hwaelb',    # 0x7b
+'hwaels',    # 0x7c
+'hwaelt',    # 0x7d
+'hwaelp',    # 0x7e
+'hwaelh',    # 0x7f
+'hwaem',    # 0x80
+'hwaeb',    # 0x81
+'hwaebs',    # 0x82
+'hwaes',    # 0x83
+'hwaess',    # 0x84
+'hwaeng',    # 0x85
+'hwaej',    # 0x86
+'hwaec',    # 0x87
+'hwaek',    # 0x88
+'hwaet',    # 0x89
+'hwaep',    # 0x8a
+'hwaeh',    # 0x8b
+'hoe',    # 0x8c
+'hoeg',    # 0x8d
+'hoegg',    # 0x8e
+'hoegs',    # 0x8f
+'hoen',    # 0x90
+'hoenj',    # 0x91
+'hoenh',    # 0x92
+'hoed',    # 0x93
+'hoel',    # 0x94
+'hoelg',    # 0x95
+'hoelm',    # 0x96
+'hoelb',    # 0x97
+'hoels',    # 0x98
+'hoelt',    # 0x99
+'hoelp',    # 0x9a
+'hoelh',    # 0x9b
+'hoem',    # 0x9c
+'hoeb',    # 0x9d
+'hoebs',    # 0x9e
+'hoes',    # 0x9f
+'hoess',    # 0xa0
+'hoeng',    # 0xa1
+'hoej',    # 0xa2
+'hoec',    # 0xa3
+'hoek',    # 0xa4
+'hoet',    # 0xa5
+'hoep',    # 0xa6
+'hoeh',    # 0xa7
+'hyo',    # 0xa8
+'hyog',    # 0xa9
+'hyogg',    # 0xaa
+'hyogs',    # 0xab
+'hyon',    # 0xac
+'hyonj',    # 0xad
+'hyonh',    # 0xae
+'hyod',    # 0xaf
+'hyol',    # 0xb0
+'hyolg',    # 0xb1
+'hyolm',    # 0xb2
+'hyolb',    # 0xb3
+'hyols',    # 0xb4
+'hyolt',    # 0xb5
+'hyolp',    # 0xb6
+'hyolh',    # 0xb7
+'hyom',    # 0xb8
+'hyob',    # 0xb9
+'hyobs',    # 0xba
+'hyos',    # 0xbb
+'hyoss',    # 0xbc
+'hyong',    # 0xbd
+'hyoj',    # 0xbe
+'hyoc',    # 0xbf
+'hyok',    # 0xc0
+'hyot',    # 0xc1
+'hyop',    # 0xc2
+'hyoh',    # 0xc3
+'hu',    # 0xc4
+'hug',    # 0xc5
+'hugg',    # 0xc6
+'hugs',    # 0xc7
+'hun',    # 0xc8
+'hunj',    # 0xc9
+'hunh',    # 0xca
+'hud',    # 0xcb
+'hul',    # 0xcc
+'hulg',    # 0xcd
+'hulm',    # 0xce
+'hulb',    # 0xcf
+'huls',    # 0xd0
+'hult',    # 0xd1
+'hulp',    # 0xd2
+'hulh',    # 0xd3
+'hum',    # 0xd4
+'hub',    # 0xd5
+'hubs',    # 0xd6
+'hus',    # 0xd7
+'huss',    # 0xd8
+'hung',    # 0xd9
+'huj',    # 0xda
+'huc',    # 0xdb
+'huk',    # 0xdc
+'hut',    # 0xdd
+'hup',    # 0xde
+'huh',    # 0xdf
+'hweo',    # 0xe0
+'hweog',    # 0xe1
+'hweogg',    # 0xe2
+'hweogs',    # 0xe3
+'hweon',    # 0xe4
+'hweonj',    # 0xe5
+'hweonh',    # 0xe6
+'hweod',    # 0xe7
+'hweol',    # 0xe8
+'hweolg',    # 0xe9
+'hweolm',    # 0xea
+'hweolb',    # 0xeb
+'hweols',    # 0xec
+'hweolt',    # 0xed
+'hweolp',    # 0xee
+'hweolh',    # 0xef
+'hweom',    # 0xf0
+'hweob',    # 0xf1
+'hweobs',    # 0xf2
+'hweos',    # 0xf3
+'hweoss',    # 0xf4
+'hweong',    # 0xf5
+'hweoj',    # 0xf6
+'hweoc',    # 0xf7
+'hweok',    # 0xf8
+'hweot',    # 0xf9
+'hweop',    # 0xfa
+'hweoh',    # 0xfb
+'hwe',    # 0xfc
+'hweg',    # 0xfd
+'hwegg',    # 0xfe
+'hwegs',    # 0xff
+)
diff --git a/lib/unidecode/x0d7.py b/lib/unidecode/x0d7.py
new file mode 100644
index 00000000..1dfb7296
--- /dev/null
+++ b/lib/unidecode/x0d7.py
@@ -0,0 +1,257 @@
+data = (
+'hwen',    # 0x00
+'hwenj',    # 0x01
+'hwenh',    # 0x02
+'hwed',    # 0x03
+'hwel',    # 0x04
+'hwelg',    # 0x05
+'hwelm',    # 0x06
+'hwelb',    # 0x07
+'hwels',    # 0x08
+'hwelt',    # 0x09
+'hwelp',    # 0x0a
+'hwelh',    # 0x0b
+'hwem',    # 0x0c
+'hweb',    # 0x0d
+'hwebs',    # 0x0e
+'hwes',    # 0x0f
+'hwess',    # 0x10
+'hweng',    # 0x11
+'hwej',    # 0x12
+'hwec',    # 0x13
+'hwek',    # 0x14
+'hwet',    # 0x15
+'hwep',    # 0x16
+'hweh',    # 0x17
+'hwi',    # 0x18
+'hwig',    # 0x19
+'hwigg',    # 0x1a
+'hwigs',    # 0x1b
+'hwin',    # 0x1c
+'hwinj',    # 0x1d
+'hwinh',    # 0x1e
+'hwid',    # 0x1f
+'hwil',    # 0x20
+'hwilg',    # 0x21
+'hwilm',    # 0x22
+'hwilb',    # 0x23
+'hwils',    # 0x24
+'hwilt',    # 0x25
+'hwilp',    # 0x26
+'hwilh',    # 0x27
+'hwim',    # 0x28
+'hwib',    # 0x29
+'hwibs',    # 0x2a
+'hwis',    # 0x2b
+'hwiss',    # 0x2c
+'hwing',    # 0x2d
+'hwij',    # 0x2e
+'hwic',    # 0x2f
+'hwik',    # 0x30
+'hwit',    # 0x31
+'hwip',    # 0x32
+'hwih',    # 0x33
+'hyu',    # 0x34
+'hyug',    # 0x35
+'hyugg',    # 0x36
+'hyugs',    # 0x37
+'hyun',    # 0x38
+'hyunj',    # 0x39
+'hyunh',    # 0x3a
+'hyud',    # 0x3b
+'hyul',    # 0x3c
+'hyulg',    # 0x3d
+'hyulm',    # 0x3e
+'hyulb',    # 0x3f
+'hyuls',    # 0x40
+'hyult',    # 0x41
+'hyulp',    # 0x42
+'hyulh',    # 0x43
+'hyum',    # 0x44
+'hyub',    # 0x45
+'hyubs',    # 0x46
+'hyus',    # 0x47
+'hyuss',    # 0x48
+'hyung',    # 0x49
+'hyuj',    # 0x4a
+'hyuc',    # 0x4b
+'hyuk',    # 0x4c
+'hyut',    # 0x4d
+'hyup',    # 0x4e
+'hyuh',    # 0x4f
+'heu',    # 0x50
+'heug',    # 0x51
+'heugg',    # 0x52
+'heugs',    # 0x53
+'heun',    # 0x54
+'heunj',    # 0x55
+'heunh',    # 0x56
+'heud',    # 0x57
+'heul',    # 0x58
+'heulg',    # 0x59
+'heulm',    # 0x5a
+'heulb',    # 0x5b
+'heuls',    # 0x5c
+'heult',    # 0x5d
+'heulp',    # 0x5e
+'heulh',    # 0x5f
+'heum',    # 0x60
+'heub',    # 0x61
+'heubs',    # 0x62
+'heus',    # 0x63
+'heuss',    # 0x64
+'heung',    # 0x65
+'heuj',    # 0x66
+'heuc',    # 0x67
+'heuk',    # 0x68
+'heut',    # 0x69
+'heup',    # 0x6a
+'heuh',    # 0x6b
+'hyi',    # 0x6c
+'hyig',    # 0x6d
+'hyigg',    # 0x6e
+'hyigs',    # 0x6f
+'hyin',    # 0x70
+'hyinj',    # 0x71
+'hyinh',    # 0x72
+'hyid',    # 0x73
+'hyil',    # 0x74
+'hyilg',    # 0x75
+'hyilm',    # 0x76
+'hyilb',    # 0x77
+'hyils',    # 0x78
+'hyilt',    # 0x79
+'hyilp',    # 0x7a
+'hyilh',    # 0x7b
+'hyim',    # 0x7c
+'hyib',    # 0x7d
+'hyibs',    # 0x7e
+'hyis',    # 0x7f
+'hyiss',    # 0x80
+'hying',    # 0x81
+'hyij',    # 0x82
+'hyic',    # 0x83
+'hyik',    # 0x84
+'hyit',    # 0x85
+'hyip',    # 0x86
+'hyih',    # 0x87
+'hi',    # 0x88
+'hig',    # 0x89
+'higg',    # 0x8a
+'higs',    # 0x8b
+'hin',    # 0x8c
+'hinj',    # 0x8d
+'hinh',    # 0x8e
+'hid',    # 0x8f
+'hil',    # 0x90
+'hilg',    # 0x91
+'hilm',    # 0x92
+'hilb',    # 0x93
+'hils',    # 0x94
+'hilt',    # 0x95
+'hilp',    # 0x96
+'hilh',    # 0x97
+'him',    # 0x98
+'hib',    # 0x99
+'hibs',    # 0x9a
+'his',    # 0x9b
+'hiss',    # 0x9c
+'hing',    # 0x9d
+'hij',    # 0x9e
+'hic',    # 0x9f
+'hik',    # 0xa0
+'hit',    # 0xa1
+'hip',    # 0xa2
+'hih',    # 0xa3
+'[?]',    # 0xa4
+'[?]',    # 0xa5
+'[?]',    # 0xa6
+'[?]',    # 0xa7
+'[?]',    # 0xa8
+'[?]',    # 0xa9
+'[?]',    # 0xaa
+'[?]',    # 0xab
+'[?]',    # 0xac
+'[?]',    # 0xad
+'[?]',    # 0xae
+'[?]',    # 0xaf
+'[?]',    # 0xb0
+'[?]',    # 0xb1
+'[?]',    # 0xb2
+'[?]',    # 0xb3
+'[?]',    # 0xb4
+'[?]',    # 0xb5
+'[?]',    # 0xb6
+'[?]',    # 0xb7
+'[?]',    # 0xb8
+'[?]',    # 0xb9
+'[?]',    # 0xba
+'[?]',    # 0xbb
+'[?]',    # 0xbc
+'[?]',    # 0xbd
+'[?]',    # 0xbe
+'[?]',    # 0xbf
+'[?]',    # 0xc0
+'[?]',    # 0xc1
+'[?]',    # 0xc2
+'[?]',    # 0xc3
+'[?]',    # 0xc4
+'[?]',    # 0xc5
+'[?]',    # 0xc6
+'[?]',    # 0xc7
+'[?]',    # 0xc8
+'[?]',    # 0xc9
+'[?]',    # 0xca
+'[?]',    # 0xcb
+'[?]',    # 0xcc
+'[?]',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'[?]',    # 0xd0
+'[?]',    # 0xd1
+'[?]',    # 0xd2
+'[?]',    # 0xd3
+'[?]',    # 0xd4
+'[?]',    # 0xd5
+'[?]',    # 0xd6
+'[?]',    # 0xd7
+'[?]',    # 0xd8
+'[?]',    # 0xd9
+'[?]',    # 0xda
+'[?]',    # 0xdb
+'[?]',    # 0xdc
+'[?]',    # 0xdd
+'[?]',    # 0xde
+'[?]',    # 0xdf
+'[?]',    # 0xe0
+'[?]',    # 0xe1
+'[?]',    # 0xe2
+'[?]',    # 0xe3
+'[?]',    # 0xe4
+'[?]',    # 0xe5
+'[?]',    # 0xe6
+'[?]',    # 0xe7
+'[?]',    # 0xe8
+'[?]',    # 0xe9
+'[?]',    # 0xea
+'[?]',    # 0xeb
+'[?]',    # 0xec
+'[?]',    # 0xed
+'[?]',    # 0xee
+'[?]',    # 0xef
+'[?]',    # 0xf0
+'[?]',    # 0xf1
+'[?]',    # 0xf2
+'[?]',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x0f9.py b/lib/unidecode/x0f9.py
new file mode 100644
index 00000000..6cc9e4cb
--- /dev/null
+++ b/lib/unidecode/x0f9.py
@@ -0,0 +1,258 @@
+data = (
+'Kay ',    # 0x00
+'Kayng ',    # 0x01
+'Ke ',    # 0x02
+'Ko ',    # 0x03
+'Kol ',    # 0x04
+'Koc ',    # 0x05
+'Kwi ',    # 0x06
+'Kwi ',    # 0x07
+'Kyun ',    # 0x08
+'Kul ',    # 0x09
+'Kum ',    # 0x0a
+'Na ',    # 0x0b
+'Na ',    # 0x0c
+'Na ',    # 0x0d
+'La ',    # 0x0e
+'Na ',    # 0x0f
+'Na ',    # 0x10
+'Na ',    # 0x11
+'Na ',    # 0x12
+'Na ',    # 0x13
+'Nak ',    # 0x14
+'Nak ',    # 0x15
+'Nak ',    # 0x16
+'Nak ',    # 0x17
+'Nak ',    # 0x18
+'Nak ',    # 0x19
+'Nak ',    # 0x1a
+'Nan ',    # 0x1b
+'Nan ',    # 0x1c
+'Nan ',    # 0x1d
+'Nan ',    # 0x1e
+'Nan ',    # 0x1f
+'Nan ',    # 0x20
+'Nam ',    # 0x21
+'Nam ',    # 0x22
+'Nam ',    # 0x23
+'Nam ',    # 0x24
+'Nap ',    # 0x25
+'Nap ',    # 0x26
+'Nap ',    # 0x27
+'Nang ',    # 0x28
+'Nang ',    # 0x29
+'Nang ',    # 0x2a
+'Nang ',    # 0x2b
+'Nang ',    # 0x2c
+'Nay ',    # 0x2d
+'Nayng ',    # 0x2e
+'No ',    # 0x2f
+'No ',    # 0x30
+'No ',    # 0x31
+'No ',    # 0x32
+'No ',    # 0x33
+'No ',    # 0x34
+'No ',    # 0x35
+'No ',    # 0x36
+'No ',    # 0x37
+'No ',    # 0x38
+'No ',    # 0x39
+'No ',    # 0x3a
+'Nok ',    # 0x3b
+'Nok ',    # 0x3c
+'Nok ',    # 0x3d
+'Nok ',    # 0x3e
+'Nok ',    # 0x3f
+'Nok ',    # 0x40
+'Non ',    # 0x41
+'Nong ',    # 0x42
+'Nong ',    # 0x43
+'Nong ',    # 0x44
+'Nong ',    # 0x45
+'Noy ',    # 0x46
+'Noy ',    # 0x47
+'Noy ',    # 0x48
+'Noy ',    # 0x49
+'Nwu ',    # 0x4a
+'Nwu ',    # 0x4b
+'Nwu ',    # 0x4c
+'Nwu ',    # 0x4d
+'Nwu ',    # 0x4e
+'Nwu ',    # 0x4f
+'Nwu ',    # 0x50
+'Nwu ',    # 0x51
+'Nuk ',    # 0x52
+'Nuk ',    # 0x53
+'Num ',    # 0x54
+'Nung ',    # 0x55
+'Nung ',    # 0x56
+'Nung ',    # 0x57
+'Nung ',    # 0x58
+'Nung ',    # 0x59
+'Twu ',    # 0x5a
+'La ',    # 0x5b
+'Lak ',    # 0x5c
+'Lak ',    # 0x5d
+'Lan ',    # 0x5e
+'Lyeng ',    # 0x5f
+'Lo ',    # 0x60
+'Lyul ',    # 0x61
+'Li ',    # 0x62
+'Pey ',    # 0x63
+'Pen ',    # 0x64
+'Pyen ',    # 0x65
+'Pwu ',    # 0x66
+'Pwul ',    # 0x67
+'Pi ',    # 0x68
+'Sak ',    # 0x69
+'Sak ',    # 0x6a
+'Sam ',    # 0x6b
+'Sayk ',    # 0x6c
+'Sayng ',    # 0x6d
+'Sep ',    # 0x6e
+'Sey ',    # 0x6f
+'Sway ',    # 0x70
+'Sin ',    # 0x71
+'Sim ',    # 0x72
+'Sip ',    # 0x73
+'Ya ',    # 0x74
+'Yak ',    # 0x75
+'Yak ',    # 0x76
+'Yang ',    # 0x77
+'Yang ',    # 0x78
+'Yang ',    # 0x79
+'Yang ',    # 0x7a
+'Yang ',    # 0x7b
+'Yang ',    # 0x7c
+'Yang ',    # 0x7d
+'Yang ',    # 0x7e
+'Ye ',    # 0x7f
+'Ye ',    # 0x80
+'Ye ',    # 0x81
+'Ye ',    # 0x82
+'Ye ',    # 0x83
+'Ye ',    # 0x84
+'Ye ',    # 0x85
+'Ye ',    # 0x86
+'Ye ',    # 0x87
+'Ye ',    # 0x88
+'Ye ',    # 0x89
+'Yek ',    # 0x8a
+'Yek ',    # 0x8b
+'Yek ',    # 0x8c
+'Yek ',    # 0x8d
+'Yen ',    # 0x8e
+'Yen ',    # 0x8f
+'Yen ',    # 0x90
+'Yen ',    # 0x91
+'Yen ',    # 0x92
+'Yen ',    # 0x93
+'Yen ',    # 0x94
+'Yen ',    # 0x95
+'Yen ',    # 0x96
+'Yen ',    # 0x97
+'Yen ',    # 0x98
+'Yen ',    # 0x99
+'Yen ',    # 0x9a
+'Yen ',    # 0x9b
+'Yel ',    # 0x9c
+'Yel ',    # 0x9d
+'Yel ',    # 0x9e
+'Yel ',    # 0x9f
+'Yel ',    # 0xa0
+'Yel ',    # 0xa1
+'Yem ',    # 0xa2
+'Yem ',    # 0xa3
+'Yem ',    # 0xa4
+'Yem ',    # 0xa5
+'Yem ',    # 0xa6
+'Yep ',    # 0xa7
+'Yeng ',    # 0xa8
+'Yeng ',    # 0xa9
+'Yeng ',    # 0xaa
+'Yeng ',    # 0xab
+'Yeng ',    # 0xac
+'Yeng ',    # 0xad
+'Yeng ',    # 0xae
+'Yeng ',    # 0xaf
+'Yeng ',    # 0xb0
+'Yeng ',    # 0xb1
+'Yeng ',    # 0xb2
+'Yeng ',    # 0xb3
+'Yeng ',    # 0xb4
+'Yey ',    # 0xb5
+'Yey ',    # 0xb6
+'Yey ',    # 0xb7
+'Yey ',    # 0xb8
+'O ',    # 0xb9
+'Yo ',    # 0xba
+'Yo ',    # 0xbb
+'Yo ',    # 0xbc
+'Yo ',    # 0xbd
+'Yo ',    # 0xbe
+'Yo ',    # 0xbf
+'Yo ',    # 0xc0
+'Yo ',    # 0xc1
+'Yo ',    # 0xc2
+'Yo ',    # 0xc3
+'Yong ',    # 0xc4
+'Wun ',    # 0xc5
+'Wen ',    # 0xc6
+'Yu ',    # 0xc7
+'Yu ',    # 0xc8
+'Yu ',    # 0xc9
+'Yu ',    # 0xca
+'Yu ',    # 0xcb
+'Yu ',    # 0xcc
+'Yu ',    # 0xcd
+'Yu ',    # 0xce
+'Yu ',    # 0xcf
+'Yu ',    # 0xd0
+'Yuk ',    # 0xd1
+'Yuk ',    # 0xd2
+'Yuk ',    # 0xd3
+'Yun ',    # 0xd4
+'Yun ',    # 0xd5
+'Yun ',    # 0xd6
+'Yun ',    # 0xd7
+'Yul ',    # 0xd8
+'Yul ',    # 0xd9
+'Yul ',    # 0xda
+'Yul ',    # 0xdb
+'Yung ',    # 0xdc
+'I ',    # 0xdd
+'I ',    # 0xde
+'I ',    # 0xdf
+'I ',    # 0xe0
+'I ',    # 0xe1
+'I ',    # 0xe2
+'I ',    # 0xe3
+'I ',    # 0xe4
+'I ',    # 0xe5
+'I ',    # 0xe6
+'I ',    # 0xe7
+'I ',    # 0xe8
+'I ',    # 0xe9
+'I ',    # 0xea
+'Ik ',    # 0xeb
+'Ik ',    # 0xec
+'In ',    # 0xed
+'In ',    # 0xee
+'In ',    # 0xef
+'In ',    # 0xf0
+'In ',    # 0xf1
+'In ',    # 0xf2
+'In ',    # 0xf3
+'Im ',    # 0xf4
+'Im ',    # 0xf5
+'Im ',    # 0xf6
+'Ip ',    # 0xf7
+'Ip ',    # 0xf8
+'Ip ',    # 0xf9
+'Cang ',    # 0xfa
+'Cek ',    # 0xfb
+'Ci ',    # 0xfc
+'Cip ',    # 0xfd
+'Cha ',    # 0xfe
+'Chek ',    # 0xff
+)
diff --git a/lib/unidecode/x0fa.py b/lib/unidecode/x0fa.py
new file mode 100644
index 00000000..3d4e705c
--- /dev/null
+++ b/lib/unidecode/x0fa.py
@@ -0,0 +1,257 @@
+data = (
+'Chey ',    # 0x00
+'Thak ',    # 0x01
+'Thak ',    # 0x02
+'Thang ',    # 0x03
+'Thayk ',    # 0x04
+'Thong ',    # 0x05
+'Pho ',    # 0x06
+'Phok ',    # 0x07
+'Hang ',    # 0x08
+'Hang ',    # 0x09
+'Hyen ',    # 0x0a
+'Hwak ',    # 0x0b
+'Wu ',    # 0x0c
+'Huo ',    # 0x0d
+'[?] ',    # 0x0e
+'[?] ',    # 0x0f
+'Zhong ',    # 0x10
+'[?] ',    # 0x11
+'Qing ',    # 0x12
+'[?] ',    # 0x13
+'[?] ',    # 0x14
+'Xi ',    # 0x15
+'Zhu ',    # 0x16
+'Yi ',    # 0x17
+'Li ',    # 0x18
+'Shen ',    # 0x19
+'Xiang ',    # 0x1a
+'Fu ',    # 0x1b
+'Jing ',    # 0x1c
+'Jing ',    # 0x1d
+'Yu ',    # 0x1e
+'[?] ',    # 0x1f
+'Hagi ',    # 0x20
+'[?] ',    # 0x21
+'Zhu ',    # 0x22
+'[?] ',    # 0x23
+'[?] ',    # 0x24
+'Yi ',    # 0x25
+'Du ',    # 0x26
+'[?] ',    # 0x27
+'[?] ',    # 0x28
+'[?] ',    # 0x29
+'Fan ',    # 0x2a
+'Si ',    # 0x2b
+'Guan ',    # 0x2c
+'[?]',    # 0x2d
+'[?]',    # 0x2e
+'[?]',    # 0x2f
+'[?]',    # 0x30
+'[?]',    # 0x31
+'[?]',    # 0x32
+'[?]',    # 0x33
+'[?]',    # 0x34
+'[?]',    # 0x35
+'[?]',    # 0x36
+'[?]',    # 0x37
+'[?]',    # 0x38
+'[?]',    # 0x39
+'[?]',    # 0x3a
+'[?]',    # 0x3b
+'[?]',    # 0x3c
+'[?]',    # 0x3d
+'[?]',    # 0x3e
+'[?]',    # 0x3f
+'[?]',    # 0x40
+'[?]',    # 0x41
+'[?]',    # 0x42
+'[?]',    # 0x43
+'[?]',    # 0x44
+'[?]',    # 0x45
+'[?]',    # 0x46
+'[?]',    # 0x47
+'[?]',    # 0x48
+'[?]',    # 0x49
+'[?]',    # 0x4a
+'[?]',    # 0x4b
+'[?]',    # 0x4c
+'[?]',    # 0x4d
+'[?]',    # 0x4e
+'[?]',    # 0x4f
+'[?]',    # 0x50
+'[?]',    # 0x51
+'[?]',    # 0x52
+'[?]',    # 0x53
+'[?]',    # 0x54
+'[?]',    # 0x55
+'[?]',    # 0x56
+'[?]',    # 0x57
+'[?]',    # 0x58
+'[?]',    # 0x59
+'[?]',    # 0x5a
+'[?]',    # 0x5b
+'[?]',    # 0x5c
+'[?]',    # 0x5d
+'[?]',    # 0x5e
+'[?]',    # 0x5f
+'[?]',    # 0x60
+'[?]',    # 0x61
+'[?]',    # 0x62
+'[?]',    # 0x63
+'[?]',    # 0x64
+'[?]',    # 0x65
+'[?]',    # 0x66
+'[?]',    # 0x67
+'[?]',    # 0x68
+'[?]',    # 0x69
+'[?]',    # 0x6a
+'[?]',    # 0x6b
+'[?]',    # 0x6c
+'[?]',    # 0x6d
+'[?]',    # 0x6e
+'[?]',    # 0x6f
+'[?]',    # 0x70
+'[?]',    # 0x71
+'[?]',    # 0x72
+'[?]',    # 0x73
+'[?]',    # 0x74
+'[?]',    # 0x75
+'[?]',    # 0x76
+'[?]',    # 0x77
+'[?]',    # 0x78
+'[?]',    # 0x79
+'[?]',    # 0x7a
+'[?]',    # 0x7b
+'[?]',    # 0x7c
+'[?]',    # 0x7d
+'[?]',    # 0x7e
+'[?]',    # 0x7f
+'[?]',    # 0x80
+'[?]',    # 0x81
+'[?]',    # 0x82
+'[?]',    # 0x83
+'[?]',    # 0x84
+'[?]',    # 0x85
+'[?]',    # 0x86
+'[?]',    # 0x87
+'[?]',    # 0x88
+'[?]',    # 0x89
+'[?]',    # 0x8a
+'[?]',    # 0x8b
+'[?]',    # 0x8c
+'[?]',    # 0x8d
+'[?]',    # 0x8e
+'[?]',    # 0x8f
+'[?]',    # 0x90
+'[?]',    # 0x91
+'[?]',    # 0x92
+'[?]',    # 0x93
+'[?]',    # 0x94
+'[?]',    # 0x95
+'[?]',    # 0x96
+'[?]',    # 0x97
+'[?]',    # 0x98
+'[?]',    # 0x99
+'[?]',    # 0x9a
+'[?]',    # 0x9b
+'[?]',    # 0x9c
+'[?]',    # 0x9d
+'[?]',    # 0x9e
+'[?]',    # 0x9f
+'[?]',    # 0xa0
+'[?]',    # 0xa1
+'[?]',    # 0xa2
+'[?]',    # 0xa3
+'[?]',    # 0xa4
+'[?]',    # 0xa5
+'[?]',    # 0xa6
+'[?]',    # 0xa7
+'[?]',    # 0xa8
+'[?]',    # 0xa9
+'[?]',    # 0xaa
+'[?]',    # 0xab
+'[?]',    # 0xac
+'[?]',    # 0xad
+'[?]',    # 0xae
+'[?]',    # 0xaf
+'[?]',    # 0xb0
+'[?]',    # 0xb1
+'[?]',    # 0xb2
+'[?]',    # 0xb3
+'[?]',    # 0xb4
+'[?]',    # 0xb5
+'[?]',    # 0xb6
+'[?]',    # 0xb7
+'[?]',    # 0xb8
+'[?]',    # 0xb9
+'[?]',    # 0xba
+'[?]',    # 0xbb
+'[?]',    # 0xbc
+'[?]',    # 0xbd
+'[?]',    # 0xbe
+'[?]',    # 0xbf
+'[?]',    # 0xc0
+'[?]',    # 0xc1
+'[?]',    # 0xc2
+'[?]',    # 0xc3
+'[?]',    # 0xc4
+'[?]',    # 0xc5
+'[?]',    # 0xc6
+'[?]',    # 0xc7
+'[?]',    # 0xc8
+'[?]',    # 0xc9
+'[?]',    # 0xca
+'[?]',    # 0xcb
+'[?]',    # 0xcc
+'[?]',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'[?]',    # 0xd0
+'[?]',    # 0xd1
+'[?]',    # 0xd2
+'[?]',    # 0xd3
+'[?]',    # 0xd4
+'[?]',    # 0xd5
+'[?]',    # 0xd6
+'[?]',    # 0xd7
+'[?]',    # 0xd8
+'[?]',    # 0xd9
+'[?]',    # 0xda
+'[?]',    # 0xdb
+'[?]',    # 0xdc
+'[?]',    # 0xdd
+'[?]',    # 0xde
+'[?]',    # 0xdf
+'[?]',    # 0xe0
+'[?]',    # 0xe1
+'[?]',    # 0xe2
+'[?]',    # 0xe3
+'[?]',    # 0xe4
+'[?]',    # 0xe5
+'[?]',    # 0xe6
+'[?]',    # 0xe7
+'[?]',    # 0xe8
+'[?]',    # 0xe9
+'[?]',    # 0xea
+'[?]',    # 0xeb
+'[?]',    # 0xec
+'[?]',    # 0xed
+'[?]',    # 0xee
+'[?]',    # 0xef
+'[?]',    # 0xf0
+'[?]',    # 0xf1
+'[?]',    # 0xf2
+'[?]',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'[?]',    # 0xf9
+'[?]',    # 0xfa
+'[?]',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x0fb.py b/lib/unidecode/x0fb.py
new file mode 100644
index 00000000..bf69dbb9
--- /dev/null
+++ b/lib/unidecode/x0fb.py
@@ -0,0 +1,258 @@
+data = (
+'ff',    # 0x00
+'fi',    # 0x01
+'fl',    # 0x02
+'ffi',    # 0x03
+'ffl',    # 0x04
+'st',    # 0x05
+'st',    # 0x06
+'[?]',    # 0x07
+'[?]',    # 0x08
+'[?]',    # 0x09
+'[?]',    # 0x0a
+'[?]',    # 0x0b
+'[?]',    # 0x0c
+'[?]',    # 0x0d
+'[?]',    # 0x0e
+'[?]',    # 0x0f
+'[?]',    # 0x10
+'[?]',    # 0x11
+'[?]',    # 0x12
+'mn',    # 0x13
+'me',    # 0x14
+'mi',    # 0x15
+'vn',    # 0x16
+'mkh',    # 0x17
+'[?]',    # 0x18
+'[?]',    # 0x19
+'[?]',    # 0x1a
+'[?]',    # 0x1b
+'[?]',    # 0x1c
+'yi',    # 0x1d
+'',    # 0x1e
+'ay',    # 0x1f
+'`',    # 0x20
+'',    # 0x21
+'d',    # 0x22
+'h',    # 0x23
+'k',    # 0x24
+'l',    # 0x25
+'m',    # 0x26
+'m',    # 0x27
+'t',    # 0x28
+'+',    # 0x29
+'sh',    # 0x2a
+'s',    # 0x2b
+'sh',    # 0x2c
+'s',    # 0x2d
+'a',    # 0x2e
+'a',    # 0x2f
+'',    # 0x30
+'b',    # 0x31
+'g',    # 0x32
+'d',    # 0x33
+'h',    # 0x34
+'v',    # 0x35
+'z',    # 0x36
+'[?]',    # 0x37
+'t',    # 0x38
+'y',    # 0x39
+'k',    # 0x3a
+'k',    # 0x3b
+'l',    # 0x3c
+'[?]',    # 0x3d
+'l',    # 0x3e
+'[?]',    # 0x3f
+'n',    # 0x40
+'n',    # 0x41
+'[?]',    # 0x42
+'p',    # 0x43
+'p',    # 0x44
+'[?]',    # 0x45
+'ts',    # 0x46
+'ts',    # 0x47
+'r',    # 0x48
+'sh',    # 0x49
+'t',    # 0x4a
+'vo',    # 0x4b
+'b',    # 0x4c
+'k',    # 0x4d
+'p',    # 0x4e
+'l',    # 0x4f
+'',    # 0x50
+'',    # 0x51
+'',    # 0x52
+'',    # 0x53
+'',    # 0x54
+'',    # 0x55
+'',    # 0x56
+'',    # 0x57
+'',    # 0x58
+'',    # 0x59
+'',    # 0x5a
+'',    # 0x5b
+'',    # 0x5c
+'',    # 0x5d
+'',    # 0x5e
+'',    # 0x5f
+'',    # 0x60
+'',    # 0x61
+'',    # 0x62
+'',    # 0x63
+'',    # 0x64
+'',    # 0x65
+'',    # 0x66
+'',    # 0x67
+'',    # 0x68
+'',    # 0x69
+'',    # 0x6a
+'',    # 0x6b
+'',    # 0x6c
+'',    # 0x6d
+'',    # 0x6e
+'',    # 0x6f
+'',    # 0x70
+'',    # 0x71
+'',    # 0x72
+'',    # 0x73
+'',    # 0x74
+'',    # 0x75
+'',    # 0x76
+'',    # 0x77
+'',    # 0x78
+'',    # 0x79
+'',    # 0x7a
+'',    # 0x7b
+'',    # 0x7c
+'',    # 0x7d
+'',    # 0x7e
+'',    # 0x7f
+'',    # 0x80
+'',    # 0x81
+'',    # 0x82
+'',    # 0x83
+'',    # 0x84
+'',    # 0x85
+'',    # 0x86
+'',    # 0x87
+'',    # 0x88
+'',    # 0x89
+'',    # 0x8a
+'',    # 0x8b
+'',    # 0x8c
+'',    # 0x8d
+'',    # 0x8e
+'',    # 0x8f
+'',    # 0x90
+'',    # 0x91
+'',    # 0x92
+'',    # 0x93
+'',    # 0x94
+'',    # 0x95
+'',    # 0x96
+'',    # 0x97
+'',    # 0x98
+'',    # 0x99
+'',    # 0x9a
+'',    # 0x9b
+'',    # 0x9c
+'',    # 0x9d
+'',    # 0x9e
+'',    # 0x9f
+'',    # 0xa0
+'',    # 0xa1
+'',    # 0xa2
+'',    # 0xa3
+'',    # 0xa4
+'',    # 0xa5
+'',    # 0xa6
+'',    # 0xa7
+'',    # 0xa8
+'',    # 0xa9
+'',    # 0xaa
+'',    # 0xab
+'',    # 0xac
+'',    # 0xad
+'',    # 0xae
+'',    # 0xaf
+'',    # 0xb0
+'',    # 0xb1
+'[?]',    # 0xb2
+'[?]',    # 0xb3
+'[?]',    # 0xb4
+'[?]',    # 0xb5
+'[?]',    # 0xb6
+'[?]',    # 0xb7
+'[?]',    # 0xb8
+'[?]',    # 0xb9
+'[?]',    # 0xba
+'[?]',    # 0xbb
+'[?]',    # 0xbc
+'[?]',    # 0xbd
+'[?]',    # 0xbe
+'[?]',    # 0xbf
+'[?]',    # 0xc0
+'[?]',    # 0xc1
+'[?]',    # 0xc2
+'[?]',    # 0xc3
+'[?]',    # 0xc4
+'[?]',    # 0xc5
+'[?]',    # 0xc6
+'[?]',    # 0xc7
+'[?]',    # 0xc8
+'[?]',    # 0xc9
+'[?]',    # 0xca
+'[?]',    # 0xcb
+'[?]',    # 0xcc
+'[?]',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'[?]',    # 0xd0
+'[?]',    # 0xd1
+'[?]',    # 0xd2
+'',    # 0xd3
+'',    # 0xd4
+'',    # 0xd5
+'',    # 0xd6
+'',    # 0xd7
+'',    # 0xd8
+'',    # 0xd9
+'',    # 0xda
+'',    # 0xdb
+'',    # 0xdc
+'',    # 0xdd
+'',    # 0xde
+'',    # 0xdf
+'',    # 0xe0
+'',    # 0xe1
+'',    # 0xe2
+'',    # 0xe3
+'',    # 0xe4
+'',    # 0xe5
+'',    # 0xe6
+'',    # 0xe7
+'',    # 0xe8
+'',    # 0xe9
+'',    # 0xea
+'',    # 0xeb
+'',    # 0xec
+'',    # 0xed
+'',    # 0xee
+'',    # 0xef
+'',    # 0xf0
+'',    # 0xf1
+'',    # 0xf2
+'',    # 0xf3
+'',    # 0xf4
+'',    # 0xf5
+'',    # 0xf6
+'',    # 0xf7
+'',    # 0xf8
+'',    # 0xf9
+'',    # 0xfa
+'',    # 0xfb
+'',    # 0xfc
+'',    # 0xfd
+'',    # 0xfe
+'',    # 0xff
+)
diff --git a/lib/unidecode/x0fc.py b/lib/unidecode/x0fc.py
new file mode 100644
index 00000000..298b1dc3
--- /dev/null
+++ b/lib/unidecode/x0fc.py
@@ -0,0 +1,258 @@
+data = (
+'',    # 0x00
+'',    # 0x01
+'',    # 0x02
+'',    # 0x03
+'',    # 0x04
+'',    # 0x05
+'',    # 0x06
+'',    # 0x07
+'',    # 0x08
+'',    # 0x09
+'',    # 0x0a
+'',    # 0x0b
+'',    # 0x0c
+'',    # 0x0d
+'',    # 0x0e
+'',    # 0x0f
+'',    # 0x10
+'',    # 0x11
+'',    # 0x12
+'',    # 0x13
+'',    # 0x14
+'',    # 0x15
+'',    # 0x16
+'',    # 0x17
+'',    # 0x18
+'',    # 0x19
+'',    # 0x1a
+'',    # 0x1b
+'',    # 0x1c
+'',    # 0x1d
+'',    # 0x1e
+'',    # 0x1f
+'',    # 0x20
+'',    # 0x21
+'',    # 0x22
+'',    # 0x23
+'',    # 0x24
+'',    # 0x25
+'',    # 0x26
+'',    # 0x27
+'',    # 0x28
+'',    # 0x29
+'',    # 0x2a
+'',    # 0x2b
+'',    # 0x2c
+'',    # 0x2d
+'',    # 0x2e
+'',    # 0x2f
+'',    # 0x30
+'',    # 0x31
+'',    # 0x32
+'',    # 0x33
+'',    # 0x34
+'',    # 0x35
+'',    # 0x36
+'',    # 0x37
+'',    # 0x38
+'',    # 0x39
+'',    # 0x3a
+'',    # 0x3b
+'',    # 0x3c
+'',    # 0x3d
+'',    # 0x3e
+'',    # 0x3f
+'',    # 0x40
+'',    # 0x41
+'',    # 0x42
+'',    # 0x43
+'',    # 0x44
+'',    # 0x45
+'',    # 0x46
+'',    # 0x47
+'',    # 0x48
+'',    # 0x49
+'',    # 0x4a
+'',    # 0x4b
+'',    # 0x4c
+'',    # 0x4d
+'',    # 0x4e
+'',    # 0x4f
+'',    # 0x50
+'',    # 0x51
+'',    # 0x52
+'',    # 0x53
+'',    # 0x54
+'',    # 0x55
+'',    # 0x56
+'',    # 0x57
+'',    # 0x58
+'',    # 0x59
+'',    # 0x5a
+'',    # 0x5b
+'',    # 0x5c
+'',    # 0x5d
+'',    # 0x5e
+'',    # 0x5f
+'',    # 0x60
+'',    # 0x61
+'',    # 0x62
+'',    # 0x63
+'',    # 0x64
+'',    # 0x65
+'',    # 0x66
+'',    # 0x67
+'',    # 0x68
+'',    # 0x69
+'',    # 0x6a
+'',    # 0x6b
+'',    # 0x6c
+'',    # 0x6d
+'',    # 0x6e
+'',    # 0x6f
+'',    # 0x70
+'',    # 0x71
+'',    # 0x72
+'',    # 0x73
+'',    # 0x74
+'',    # 0x75
+'',    # 0x76
+'',    # 0x77
+'',    # 0x78
+'',    # 0x79
+'',    # 0x7a
+'',    # 0x7b
+'',    # 0x7c
+'',    # 0x7d
+'',    # 0x7e
+'',    # 0x7f
+'',    # 0x80
+'',    # 0x81
+'',    # 0x82
+'',    # 0x83
+'',    # 0x84
+'',    # 0x85
+'',    # 0x86
+'',    # 0x87
+'',    # 0x88
+'',    # 0x89
+'',    # 0x8a
+'',    # 0x8b
+'',    # 0x8c
+'',    # 0x8d
+'',    # 0x8e
+'',    # 0x8f
+'',    # 0x90
+'',    # 0x91
+'',    # 0x92
+'',    # 0x93
+'',    # 0x94
+'',    # 0x95
+'',    # 0x96
+'',    # 0x97
+'',    # 0x98
+'',    # 0x99
+'',    # 0x9a
+'',    # 0x9b
+'',    # 0x9c
+'',    # 0x9d
+'',    # 0x9e
+'',    # 0x9f
+'',    # 0xa0
+'',    # 0xa1
+'',    # 0xa2
+'',    # 0xa3
+'',    # 0xa4
+'',    # 0xa5
+'',    # 0xa6
+'',    # 0xa7
+'',    # 0xa8
+'',    # 0xa9
+'',    # 0xaa
+'',    # 0xab
+'',    # 0xac
+'',    # 0xad
+'',    # 0xae
+'',    # 0xaf
+'',    # 0xb0
+'',    # 0xb1
+'',    # 0xb2
+'',    # 0xb3
+'',    # 0xb4
+'',    # 0xb5
+'',    # 0xb6
+'',    # 0xb7
+'',    # 0xb8
+'',    # 0xb9
+'',    # 0xba
+'',    # 0xbb
+'',    # 0xbc
+'',    # 0xbd
+'',    # 0xbe
+'',    # 0xbf
+'',    # 0xc0
+'',    # 0xc1
+'',    # 0xc2
+'',    # 0xc3
+'',    # 0xc4
+'',    # 0xc5
+'',    # 0xc6
+'',    # 0xc7
+'',    # 0xc8
+'',    # 0xc9
+'',    # 0xca
+'',    # 0xcb
+'',    # 0xcc
+'',    # 0xcd
+'',    # 0xce
+'',    # 0xcf
+'',    # 0xd0
+'',    # 0xd1
+'',    # 0xd2
+'',    # 0xd3
+'',    # 0xd4
+'',    # 0xd5
+'',    # 0xd6
+'',    # 0xd7
+'',    # 0xd8
+'',    # 0xd9
+'',    # 0xda
+'',    # 0xdb
+'',    # 0xdc
+'',    # 0xdd
+'',    # 0xde
+'',    # 0xdf
+'',    # 0xe0
+'',    # 0xe1
+'',    # 0xe2
+'',    # 0xe3
+'',    # 0xe4
+'',    # 0xe5
+'',    # 0xe6
+'',    # 0xe7
+'',    # 0xe8
+'',    # 0xe9
+'',    # 0xea
+'',    # 0xeb
+'',    # 0xec
+'',    # 0xed
+'',    # 0xee
+'',    # 0xef
+'',    # 0xf0
+'',    # 0xf1
+'',    # 0xf2
+'',    # 0xf3
+'',    # 0xf4
+'',    # 0xf5
+'',    # 0xf6
+'',    # 0xf7
+'',    # 0xf8
+'',    # 0xf9
+'',    # 0xfa
+'',    # 0xfb
+'',    # 0xfc
+'',    # 0xfd
+'',    # 0xfe
+'',    # 0xff
+)
diff --git a/lib/unidecode/x0fd.py b/lib/unidecode/x0fd.py
new file mode 100644
index 00000000..892bcb05
--- /dev/null
+++ b/lib/unidecode/x0fd.py
@@ -0,0 +1,257 @@
+data = (
+'',    # 0x00
+'',    # 0x01
+'',    # 0x02
+'',    # 0x03
+'',    # 0x04
+'',    # 0x05
+'',    # 0x06
+'',    # 0x07
+'',    # 0x08
+'',    # 0x09
+'',    # 0x0a
+'',    # 0x0b
+'',    # 0x0c
+'',    # 0x0d
+'',    # 0x0e
+'',    # 0x0f
+'',    # 0x10
+'',    # 0x11
+'',    # 0x12
+'',    # 0x13
+'',    # 0x14
+'',    # 0x15
+'',    # 0x16
+'',    # 0x17
+'',    # 0x18
+'',    # 0x19
+'',    # 0x1a
+'',    # 0x1b
+'',    # 0x1c
+'',    # 0x1d
+'',    # 0x1e
+'',    # 0x1f
+'',    # 0x20
+'',    # 0x21
+'',    # 0x22
+'',    # 0x23
+'',    # 0x24
+'',    # 0x25
+'',    # 0x26
+'',    # 0x27
+'',    # 0x28
+'',    # 0x29
+'',    # 0x2a
+'',    # 0x2b
+'',    # 0x2c
+'',    # 0x2d
+'',    # 0x2e
+'',    # 0x2f
+'',    # 0x30
+'',    # 0x31
+'',    # 0x32
+'',    # 0x33
+'',    # 0x34
+'',    # 0x35
+'',    # 0x36
+'',    # 0x37
+'',    # 0x38
+'',    # 0x39
+'',    # 0x3a
+'',    # 0x3b
+'',    # 0x3c
+'',    # 0x3d
+'',    # 0x3e
+'',    # 0x3f
+'[?]',    # 0x40
+'[?]',    # 0x41
+'[?]',    # 0x42
+'[?]',    # 0x43
+'[?]',    # 0x44
+'[?]',    # 0x45
+'[?]',    # 0x46
+'[?]',    # 0x47
+'[?]',    # 0x48
+'[?]',    # 0x49
+'[?]',    # 0x4a
+'[?]',    # 0x4b
+'[?]',    # 0x4c
+'[?]',    # 0x4d
+'[?]',    # 0x4e
+'[?]',    # 0x4f
+'',    # 0x50
+'',    # 0x51
+'',    # 0x52
+'',    # 0x53
+'',    # 0x54
+'',    # 0x55
+'',    # 0x56
+'',    # 0x57
+'',    # 0x58
+'',    # 0x59
+'',    # 0x5a
+'',    # 0x5b
+'',    # 0x5c
+'',    # 0x5d
+'',    # 0x5e
+'',    # 0x5f
+'',    # 0x60
+'',    # 0x61
+'',    # 0x62
+'',    # 0x63
+'',    # 0x64
+'',    # 0x65
+'',    # 0x66
+'',    # 0x67
+'',    # 0x68
+'',    # 0x69
+'',    # 0x6a
+'',    # 0x6b
+'',    # 0x6c
+'',    # 0x6d
+'',    # 0x6e
+'',    # 0x6f
+'',    # 0x70
+'',    # 0x71
+'',    # 0x72
+'',    # 0x73
+'',    # 0x74
+'',    # 0x75
+'',    # 0x76
+'',    # 0x77
+'',    # 0x78
+'',    # 0x79
+'',    # 0x7a
+'',    # 0x7b
+'',    # 0x7c
+'',    # 0x7d
+'',    # 0x7e
+'',    # 0x7f
+'',    # 0x80
+'',    # 0x81
+'',    # 0x82
+'',    # 0x83
+'',    # 0x84
+'',    # 0x85
+'',    # 0x86
+'',    # 0x87
+'',    # 0x88
+'',    # 0x89
+'',    # 0x8a
+'',    # 0x8b
+'',    # 0x8c
+'',    # 0x8d
+'',    # 0x8e
+'',    # 0x8f
+'[?]',    # 0x90
+'[?]',    # 0x91
+'',    # 0x92
+'',    # 0x93
+'',    # 0x94
+'',    # 0x95
+'',    # 0x96
+'',    # 0x97
+'',    # 0x98
+'',    # 0x99
+'',    # 0x9a
+'',    # 0x9b
+'',    # 0x9c
+'',    # 0x9d
+'',    # 0x9e
+'',    # 0x9f
+'',    # 0xa0
+'',    # 0xa1
+'',    # 0xa2
+'',    # 0xa3
+'',    # 0xa4
+'',    # 0xa5
+'',    # 0xa6
+'',    # 0xa7
+'',    # 0xa8
+'',    # 0xa9
+'',    # 0xaa
+'',    # 0xab
+'',    # 0xac
+'',    # 0xad
+'',    # 0xae
+'',    # 0xaf
+'',    # 0xb0
+'',    # 0xb1
+'',    # 0xb2
+'',    # 0xb3
+'',    # 0xb4
+'',    # 0xb5
+'',    # 0xb6
+'',    # 0xb7
+'',    # 0xb8
+'',    # 0xb9
+'',    # 0xba
+'',    # 0xbb
+'',    # 0xbc
+'',    # 0xbd
+'',    # 0xbe
+'',    # 0xbf
+'',    # 0xc0
+'',    # 0xc1
+'',    # 0xc2
+'',    # 0xc3
+'',    # 0xc4
+'',    # 0xc5
+'',    # 0xc6
+'',    # 0xc7
+'[?]',    # 0xc8
+'[?]',    # 0xc9
+'[?]',    # 0xca
+'[?]',    # 0xcb
+'[?]',    # 0xcc
+'[?]',    # 0xcd
+'[?]',    # 0xce
+'[?]',    # 0xcf
+'[?]',    # 0xd0
+'[?]',    # 0xd1
+'[?]',    # 0xd2
+'[?]',    # 0xd3
+'[?]',    # 0xd4
+'[?]',    # 0xd5
+'[?]',    # 0xd6
+'[?]',    # 0xd7
+'[?]',    # 0xd8
+'[?]',    # 0xd9
+'[?]',    # 0xda
+'[?]',    # 0xdb
+'[?]',    # 0xdc
+'[?]',    # 0xdd
+'[?]',    # 0xde
+'[?]',    # 0xdf
+'[?]',    # 0xe0
+'[?]',    # 0xe1
+'[?]',    # 0xe2
+'[?]',    # 0xe3
+'[?]',    # 0xe4
+'[?]',    # 0xe5
+'[?]',    # 0xe6
+'[?]',    # 0xe7
+'[?]',    # 0xe8
+'[?]',    # 0xe9
+'[?]',    # 0xea
+'[?]',    # 0xeb
+'[?]',    # 0xec
+'[?]',    # 0xed
+'[?]',    # 0xee
+'[?]',    # 0xef
+'',    # 0xf0
+'',    # 0xf1
+'',    # 0xf2
+'',    # 0xf3
+'',    # 0xf4
+'',    # 0xf5
+'',    # 0xf6
+'',    # 0xf7
+'',    # 0xf8
+'',    # 0xf9
+'',    # 0xfa
+'',    # 0xfb
+'[?]',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+)
diff --git a/lib/unidecode/x0fe.py b/lib/unidecode/x0fe.py
new file mode 100644
index 00000000..60e86179
--- /dev/null
+++ b/lib/unidecode/x0fe.py
@@ -0,0 +1,258 @@
+data = (
+'[?]',    # 0x00
+'[?]',    # 0x01
+'[?]',    # 0x02
+'[?]',    # 0x03
+'[?]',    # 0x04
+'[?]',    # 0x05
+'[?]',    # 0x06
+'[?]',    # 0x07
+'[?]',    # 0x08
+'[?]',    # 0x09
+'[?]',    # 0x0a
+'[?]',    # 0x0b
+'[?]',    # 0x0c
+'[?]',    # 0x0d
+'[?]',    # 0x0e
+'[?]',    # 0x0f
+'[?]',    # 0x10
+'[?]',    # 0x11
+'[?]',    # 0x12
+'[?]',    # 0x13
+'[?]',    # 0x14
+'[?]',    # 0x15
+'[?]',    # 0x16
+'[?]',    # 0x17
+'[?]',    # 0x18
+'[?]',    # 0x19
+'[?]',    # 0x1a
+'[?]',    # 0x1b
+'[?]',    # 0x1c
+'[?]',    # 0x1d
+'[?]',    # 0x1e
+'[?]',    # 0x1f
+'',    # 0x20
+'',    # 0x21
+'',    # 0x22
+'~',    # 0x23
+'[?]',    # 0x24
+'[?]',    # 0x25
+'[?]',    # 0x26
+'[?]',    # 0x27
+'[?]',    # 0x28
+'[?]',    # 0x29
+'[?]',    # 0x2a
+'[?]',    # 0x2b
+'[?]',    # 0x2c
+'[?]',    # 0x2d
+'[?]',    # 0x2e
+'[?]',    # 0x2f
+'..',    # 0x30
+'--',    # 0x31
+'-',    # 0x32
+'_',    # 0x33
+'_',    # 0x34
+'(',    # 0x35
+') ',    # 0x36
+'{',    # 0x37
+'} ',    # 0x38
+'[',    # 0x39
+'] ',    # 0x3a
+'[(',    # 0x3b
+')] ',    # 0x3c
+'<<',    # 0x3d
+'>> ',    # 0x3e
+'<',    # 0x3f
+'> ',    # 0x40
+'[',    # 0x41
+'] ',    # 0x42
+'{',    # 0x43
+'}',    # 0x44
+'[?]',    # 0x45
+'[?]',    # 0x46
+'[?]',    # 0x47
+'[?]',    # 0x48
+'',    # 0x49
+'',    # 0x4a
+'',    # 0x4b
+'',    # 0x4c
+'',    # 0x4d
+'',    # 0x4e
+'',    # 0x4f
+',',    # 0x50
+',',    # 0x51
+'.',    # 0x52
+'',    # 0x53
+';',    # 0x54
+':',    # 0x55
+'?',    # 0x56
+'!',    # 0x57
+'-',    # 0x58
+'(',    # 0x59
+')',    # 0x5a
+'{',    # 0x5b
+'}',    # 0x5c
+'{',    # 0x5d
+'}',    # 0x5e
+'#',    # 0x5f
+'&',    # 0x60
+'*',    # 0x61
+'+',    # 0x62
+'-',    # 0x63
+'<',    # 0x64
+'>',    # 0x65
+'=',    # 0x66
+'',    # 0x67
+'\\',    # 0x68
+'$',    # 0x69
+'%',    # 0x6a
+'@',    # 0x6b
+'[?]',    # 0x6c
+'[?]',    # 0x6d
+'[?]',    # 0x6e
+'[?]',    # 0x6f
+'',    # 0x70
+'',    # 0x71
+'',    # 0x72
+'[?]',    # 0x73
+'',    # 0x74
+'[?]',    # 0x75
+'',    # 0x76
+'',    # 0x77
+'',    # 0x78
+'',    # 0x79
+'',    # 0x7a
+'',    # 0x7b
+'',    # 0x7c
+'',    # 0x7d
+'',    # 0x7e
+'',    # 0x7f
+'',    # 0x80
+'',    # 0x81
+'',    # 0x82
+'',    # 0x83
+'',    # 0x84
+'',    # 0x85
+'',    # 0x86
+'',    # 0x87
+'',    # 0x88
+'',    # 0x89
+'',    # 0x8a
+'',    # 0x8b
+'',    # 0x8c
+'',    # 0x8d
+'',    # 0x8e
+'',    # 0x8f
+'',    # 0x90
+'',    # 0x91
+'',    # 0x92
+'',    # 0x93
+'',    # 0x94
+'',    # 0x95
+'',    # 0x96
+'',    # 0x97
+'',    # 0x98
+'',    # 0x99
+'',    # 0x9a
+'',    # 0x9b
+'',    # 0x9c
+'',    # 0x9d
+'',    # 0x9e
+'',    # 0x9f
+'',    # 0xa0
+'',    # 0xa1
+'',    # 0xa2
+'',    # 0xa3
+'',    # 0xa4
+'',    # 0xa5
+'',    # 0xa6
+'',    # 0xa7
+'',    # 0xa8
+'',    # 0xa9
+'',    # 0xaa
+'',    # 0xab
+'',    # 0xac
+'',    # 0xad
+'',    # 0xae
+'',    # 0xaf
+'',    # 0xb0
+'',    # 0xb1
+'',    # 0xb2
+'',    # 0xb3
+'',    # 0xb4
+'',    # 0xb5
+'',    # 0xb6
+'',    # 0xb7
+'',    # 0xb8
+'',    # 0xb9
+'',    # 0xba
+'',    # 0xbb
+'',    # 0xbc
+'',    # 0xbd
+'',    # 0xbe
+'',    # 0xbf
+'',    # 0xc0
+'',    # 0xc1
+'',    # 0xc2
+'',    # 0xc3
+'',    # 0xc4
+'',    # 0xc5
+'',    # 0xc6
+'',    # 0xc7
+'',    # 0xc8
+'',    # 0xc9
+'',    # 0xca
+'',    # 0xcb
+'',    # 0xcc
+'',    # 0xcd
+'',    # 0xce
+'',    # 0xcf
+'',    # 0xd0
+'',    # 0xd1
+'',    # 0xd2
+'',    # 0xd3
+'',    # 0xd4
+'',    # 0xd5
+'',    # 0xd6
+'',    # 0xd7
+'',    # 0xd8
+'',    # 0xd9
+'',    # 0xda
+'',    # 0xdb
+'',    # 0xdc
+'',    # 0xdd
+'',    # 0xde
+'',    # 0xdf
+'',    # 0xe0
+'',    # 0xe1
+'',    # 0xe2
+'',    # 0xe3
+'',    # 0xe4
+'',    # 0xe5
+'',    # 0xe6
+'',    # 0xe7
+'',    # 0xe8
+'',    # 0xe9
+'',    # 0xea
+'',    # 0xeb
+'',    # 0xec
+'',    # 0xed
+'',    # 0xee
+'',    # 0xef
+'',    # 0xf0
+'',    # 0xf1
+'',    # 0xf2
+'',    # 0xf3
+'',    # 0xf4
+'',    # 0xf5
+'',    # 0xf6
+'',    # 0xf7
+'',    # 0xf8
+'',    # 0xf9
+'',    # 0xfa
+'',    # 0xfb
+'',    # 0xfc
+'[?]',    # 0xfd
+'[?]',    # 0xfe
+'',    # 0xff
+)
diff --git a/lib/unidecode/x0ff.py b/lib/unidecode/x0ff.py
new file mode 100644
index 00000000..04410151
--- /dev/null
+++ b/lib/unidecode/x0ff.py
@@ -0,0 +1,258 @@
+data = (
+'[?]',    # 0x00
+'!',    # 0x01
+'"',    # 0x02
+'#',    # 0x03
+'$',    # 0x04
+'%',    # 0x05
+'&',    # 0x06
+'\'',    # 0x07
+'(',    # 0x08
+')',    # 0x09
+'*',    # 0x0a
+'+',    # 0x0b
+',',    # 0x0c
+'-',    # 0x0d
+'.',    # 0x0e
+'/',    # 0x0f
+'0',    # 0x10
+'1',    # 0x11
+'2',    # 0x12
+'3',    # 0x13
+'4',    # 0x14
+'5',    # 0x15
+'6',    # 0x16
+'7',    # 0x17
+'8',    # 0x18
+'9',    # 0x19
+':',    # 0x1a
+';',    # 0x1b
+'<',    # 0x1c
+'=',    # 0x1d
+'>',    # 0x1e
+'?',    # 0x1f
+'@',    # 0x20
+'A',    # 0x21
+'B',    # 0x22
+'C',    # 0x23
+'D',    # 0x24
+'E',    # 0x25
+'F',    # 0x26
+'G',    # 0x27
+'H',    # 0x28
+'I',    # 0x29
+'J',    # 0x2a
+'K',    # 0x2b
+'L',    # 0x2c
+'M',    # 0x2d
+'N',    # 0x2e
+'O',    # 0x2f
+'P',    # 0x30
+'Q',    # 0x31
+'R',    # 0x32
+'S',    # 0x33
+'T',    # 0x34
+'U',    # 0x35
+'V',    # 0x36
+'W',    # 0x37
+'X',    # 0x38
+'Y',    # 0x39
+'Z',    # 0x3a
+'[',    # 0x3b
+'\\',    # 0x3c
+']',    # 0x3d
+'^',    # 0x3e
+'_',    # 0x3f
+'`',    # 0x40
+'a',    # 0x41
+'b',    # 0x42
+'c',    # 0x43
+'d',    # 0x44
+'e',    # 0x45
+'f',    # 0x46
+'g',    # 0x47
+'h',    # 0x48
+'i',    # 0x49
+'j',    # 0x4a
+'k',    # 0x4b
+'l',    # 0x4c
+'m',    # 0x4d
+'n',    # 0x4e
+'o',    # 0x4f
+'p',    # 0x50
+'q',    # 0x51
+'r',    # 0x52
+'s',    # 0x53
+'t',    # 0x54
+'u',    # 0x55
+'v',    # 0x56
+'w',    # 0x57
+'x',    # 0x58
+'y',    # 0x59
+'z',    # 0x5a
+'{',    # 0x5b
+'|',    # 0x5c
+'}',    # 0x5d
+'~',    # 0x5e
+'[?]',    # 0x5f
+'[?]',    # 0x60
+'.',    # 0x61
+'[',    # 0x62
+']',    # 0x63
+',',    # 0x64
+'*',    # 0x65
+'wo',    # 0x66
+'a',    # 0x67
+'i',    # 0x68
+'u',    # 0x69
+'e',    # 0x6a
+'o',    # 0x6b
+'ya',    # 0x6c
+'yu',    # 0x6d
+'yo',    # 0x6e
+'tu',    # 0x6f
+'+',    # 0x70
+'a',    # 0x71
+'i',    # 0x72
+'u',    # 0x73
+'e',    # 0x74
+'o',    # 0x75
+'ka',    # 0x76
+'ki',    # 0x77
+'ku',    # 0x78
+'ke',    # 0x79
+'ko',    # 0x7a
+'sa',    # 0x7b
+'si',    # 0x7c
+'su',    # 0x7d
+'se',    # 0x7e
+'so',    # 0x7f
+'ta',    # 0x80
+'ti',    # 0x81
+'tu',    # 0x82
+'te',    # 0x83
+'to',    # 0x84
+'na',    # 0x85
+'ni',    # 0x86
+'nu',    # 0x87
+'ne',    # 0x88
+'no',    # 0x89
+'ha',    # 0x8a
+'hi',    # 0x8b
+'hu',    # 0x8c
+'he',    # 0x8d
+'ho',    # 0x8e
+'ma',    # 0x8f
+'mi',    # 0x90
+'mu',    # 0x91
+'me',    # 0x92
+'mo',    # 0x93
+'ya',    # 0x94
+'yu',    # 0x95
+'yo',    # 0x96
+'ra',    # 0x97
+'ri',    # 0x98
+'ru',    # 0x99
+'re',    # 0x9a
+'ro',    # 0x9b
+'wa',    # 0x9c
+'n',    # 0x9d
+':',    # 0x9e
+';',    # 0x9f
+'',    # 0xa0
+'g',    # 0xa1
+'gg',    # 0xa2
+'gs',    # 0xa3
+'n',    # 0xa4
+'nj',    # 0xa5
+'nh',    # 0xa6
+'d',    # 0xa7
+'dd',    # 0xa8
+'r',    # 0xa9
+'lg',    # 0xaa
+'lm',    # 0xab
+'lb',    # 0xac
+'ls',    # 0xad
+'lt',    # 0xae
+'lp',    # 0xaf
+'rh',    # 0xb0
+'m',    # 0xb1
+'b',    # 0xb2
+'bb',    # 0xb3
+'bs',    # 0xb4
+'s',    # 0xb5
+'ss',    # 0xb6
+'',    # 0xb7
+'j',    # 0xb8
+'jj',    # 0xb9
+'c',    # 0xba
+'k',    # 0xbb
+'t',    # 0xbc
+'p',    # 0xbd
+'h',    # 0xbe
+'[?]',    # 0xbf
+'[?]',    # 0xc0
+'[?]',    # 0xc1
+'a',    # 0xc2
+'ae',    # 0xc3
+'ya',    # 0xc4
+'yae',    # 0xc5
+'eo',    # 0xc6
+'e',    # 0xc7
+'[?]',    # 0xc8
+'[?]',    # 0xc9
+'yeo',    # 0xca
+'ye',    # 0xcb
+'o',    # 0xcc
+'wa',    # 0xcd
+'wae',    # 0xce
+'oe',    # 0xcf
+'[?]',    # 0xd0
+'[?]',    # 0xd1
+'yo',    # 0xd2
+'u',    # 0xd3
+'weo',    # 0xd4
+'we',    # 0xd5
+'wi',    # 0xd6
+'yu',    # 0xd7
+'[?]',    # 0xd8
+'[?]',    # 0xd9
+'eu',    # 0xda
+'yi',    # 0xdb
+'i',    # 0xdc
+'[?]',    # 0xdd
+'[?]',    # 0xde
+'[?]',    # 0xdf
+'/C',    # 0xe0
+'PS',    # 0xe1
+'!',    # 0xe2
+'-',    # 0xe3
+'|',    # 0xe4
+'Y=',    # 0xe5
+'W=',    # 0xe6
+'[?]',    # 0xe7
+'|',    # 0xe8
+'-',    # 0xe9
+'|',    # 0xea
+'-',    # 0xeb
+'|',    # 0xec
+'#',    # 0xed
+'O',    # 0xee
+'[?]',    # 0xef
+'[?]',    # 0xf0
+'[?]',    # 0xf1
+'[?]',    # 0xf2
+'[?]',    # 0xf3
+'[?]',    # 0xf4
+'[?]',    # 0xf5
+'[?]',    # 0xf6
+'[?]',    # 0xf7
+'[?]',    # 0xf8
+'{',    # 0xf9
+'|',    # 0xfa
+'}',    # 0xfb
+'',    # 0xfc
+'',    # 0xfd
+'',    # 0xfe
+'',    # 0xff
+)
diff --git a/lib/unidecode/x1d4.py b/lib/unidecode/x1d4.py
new file mode 100644
index 00000000..53795931
--- /dev/null
+++ b/lib/unidecode/x1d4.py
@@ -0,0 +1,258 @@
+data = (
+'A',    # 0x00
+'B',    # 0x01
+'C',    # 0x02
+'D',    # 0x03
+'E',    # 0x04
+'F',    # 0x05
+'G',    # 0x06
+'H',    # 0x07
+'I',    # 0x08
+'J',    # 0x09
+'K',    # 0x0a
+'L',    # 0x0b
+'M',    # 0x0c
+'N',    # 0x0d
+'O',    # 0x0e
+'P',    # 0x0f
+'Q',    # 0x10
+'R',    # 0x11
+'S',    # 0x12
+'T',    # 0x13
+'U',    # 0x14
+'V',    # 0x15
+'W',    # 0x16
+'X',    # 0x17
+'Y',    # 0x18
+'Z',    # 0x19
+'a',    # 0x1a
+'b',    # 0x1b
+'c',    # 0x1c
+'d',    # 0x1d
+'e',    # 0x1e
+'f',    # 0x1f
+'g',    # 0x20
+'h',    # 0x21
+'i',    # 0x22
+'j',    # 0x23
+'k',    # 0x24
+'l',    # 0x25
+'m',    # 0x26
+'n',    # 0x27
+'o',    # 0x28
+'p',    # 0x29
+'q',    # 0x2a
+'r',    # 0x2b
+'s',    # 0x2c
+'t',    # 0x2d
+'u',    # 0x2e
+'v',    # 0x2f
+'w',    # 0x30
+'x',    # 0x31
+'y',    # 0x32
+'z',    # 0x33
+'A',    # 0x34
+'B',    # 0x35
+'C',    # 0x36
+'D',    # 0x37
+'E',    # 0x38
+'F',    # 0x39
+'G',    # 0x3a
+'H',    # 0x3b
+'I',    # 0x3c
+'J',    # 0x3d
+'K',    # 0x3e
+'L',    # 0x3f
+'M',    # 0x40
+'N',    # 0x41
+'O',    # 0x42
+'P',    # 0x43
+'Q',    # 0x44
+'R',    # 0x45
+'S',    # 0x46
+'T',    # 0x47
+'U',    # 0x48
+'V',    # 0x49
+'W',    # 0x4a
+'X',    # 0x4b
+'Y',    # 0x4c
+'Z',    # 0x4d
+'a',    # 0x4e
+'b',    # 0x4f
+'c',    # 0x50
+'d',    # 0x51
+'e',    # 0x52
+'f',    # 0x53
+'g',    # 0x54
+'',    # 0x55
+'i',    # 0x56
+'j',    # 0x57
+'k',    # 0x58
+'l',    # 0x59
+'m',    # 0x5a
+'n',    # 0x5b
+'o',    # 0x5c
+'p',    # 0x5d
+'q',    # 0x5e
+'r',    # 0x5f
+'s',    # 0x60
+'t',    # 0x61
+'u',    # 0x62
+'v',    # 0x63
+'w',    # 0x64
+'x',    # 0x65
+'y',    # 0x66
+'z',    # 0x67
+'A',    # 0x68
+'B',    # 0x69
+'C',    # 0x6a
+'D',    # 0x6b
+'E',    # 0x6c
+'F',    # 0x6d
+'G',    # 0x6e
+'H',    # 0x6f
+'I',    # 0x70
+'J',    # 0x71
+'K',    # 0x72
+'L',    # 0x73
+'M',    # 0x74
+'N',    # 0x75
+'O',    # 0x76
+'P',    # 0x77
+'Q',    # 0x78
+'R',    # 0x79
+'S',    # 0x7a
+'T',    # 0x7b
+'U',    # 0x7c
+'V',    # 0x7d
+'W',    # 0x7e
+'X',    # 0x7f
+'Y',    # 0x80
+'Z',    # 0x81
+'a',    # 0x82
+'b',    # 0x83
+'c',    # 0x84
+'d',    # 0x85
+'e',    # 0x86
+'f',    # 0x87
+'g',    # 0x88
+'h',    # 0x89
+'i',    # 0x8a
+'j',    # 0x8b
+'k',    # 0x8c
+'l',    # 0x8d
+'m',    # 0x8e
+'n',    # 0x8f
+'o',    # 0x90
+'p',    # 0x91
+'q',    # 0x92
+'r',    # 0x93
+'s',    # 0x94
+'t',    # 0x95
+'u',    # 0x96
+'v',    # 0x97
+'w',    # 0x98
+'x',    # 0x99
+'y',    # 0x9a
+'z',    # 0x9b
+'A',    # 0x9c
+'',    # 0x9d
+'C',    # 0x9e
+'D',    # 0x9f
+'',    # 0xa0
+'',    # 0xa1
+'G',    # 0xa2
+'',    # 0xa3
+'',    # 0xa4
+'J',    # 0xa5
+'K',    # 0xa6
+'',    # 0xa7
+'',    # 0xa8
+'N',    # 0xa9
+'O',    # 0xaa
+'P',    # 0xab
+'Q',    # 0xac
+'',    # 0xad
+'S',    # 0xae
+'T',    # 0xaf
+'U',    # 0xb0
+'V',    # 0xb1
+'W',    # 0xb2
+'X',    # 0xb3
+'Y',    # 0xb4
+'Z',    # 0xb5
+'a',    # 0xb6
+'b',    # 0xb7
+'c',    # 0xb8
+'d',    # 0xb9
+'',    # 0xba
+'f',    # 0xbb
+'',    # 0xbc
+'h',    # 0xbd
+'i',    # 0xbe
+'j',    # 0xbf
+'k',    # 0xc0
+'l',    # 0xc1
+'m',    # 0xc2
+'n',    # 0xc3
+'',    # 0xc4
+'p',    # 0xc5
+'q',    # 0xc6
+'r',    # 0xc7
+'s',    # 0xc8
+'t',    # 0xc9
+'u',    # 0xca
+'v',    # 0xcb
+'w',    # 0xcc
+'x',    # 0xcd
+'y',    # 0xce
+'z',    # 0xcf
+'A',    # 0xd0
+'B',    # 0xd1
+'C',    # 0xd2
+'D',    # 0xd3
+'E',    # 0xd4
+'F',    # 0xd5
+'G',    # 0xd6
+'H',    # 0xd7
+'I',    # 0xd8
+'J',    # 0xd9
+'K',    # 0xda
+'L',    # 0xdb
+'M',    # 0xdc
+'N',    # 0xdd
+'O',    # 0xde
+'P',    # 0xdf
+'Q',    # 0xe0
+'R',    # 0xe1
+'S',    # 0xe2
+'T',    # 0xe3
+'U',    # 0xe4
+'V',    # 0xe5
+'W',    # 0xe6
+'X',    # 0xe7
+'Y',    # 0xe8
+'Z',    # 0xe9
+'a',    # 0xea
+'b',    # 0xeb
+'c',    # 0xec
+'d',    # 0xed
+'e',    # 0xee
+'f',    # 0xef
+'g',    # 0xf0
+'h',    # 0xf1
+'i',    # 0xf2
+'j',    # 0xf3
+'k',    # 0xf4
+'l',    # 0xf5
+'m',    # 0xf6
+'n',    # 0xf7
+'o',    # 0xf8
+'p',    # 0xf9
+'q',    # 0xfa
+'r',    # 0xfb
+'s',    # 0xfc
+'t',    # 0xfd
+'u',    # 0xfe
+'v',    # 0xff
+)
diff --git a/lib/unidecode/x1d5.py b/lib/unidecode/x1d5.py
new file mode 100644
index 00000000..6ec605ba
--- /dev/null
+++ b/lib/unidecode/x1d5.py
@@ -0,0 +1,258 @@
+data = (
+'w',    # 0x00
+'x',    # 0x01
+'y',    # 0x02
+'z',    # 0x03
+'A',    # 0x04
+'B',    # 0x05
+'',    # 0x06
+'D',    # 0x07
+'E',    # 0x08
+'F',    # 0x09
+'G',    # 0x0a
+'',    # 0x0b
+'',    # 0x0c
+'J',    # 0x0d
+'K',    # 0x0e
+'L',    # 0x0f
+'M',    # 0x10
+'N',    # 0x11
+'O',    # 0x12
+'P',    # 0x13
+'Q',    # 0x14
+'',    # 0x15
+'S',    # 0x16
+'T',    # 0x17
+'U',    # 0x18
+'V',    # 0x19
+'W',    # 0x1a
+'X',    # 0x1b
+'Y',    # 0x1c
+'',    # 0x1d
+'a',    # 0x1e
+'b',    # 0x1f
+'c',    # 0x20
+'d',    # 0x21
+'e',    # 0x22
+'f',    # 0x23
+'g',    # 0x24
+'h',    # 0x25
+'i',    # 0x26
+'j',    # 0x27
+'k',    # 0x28
+'l',    # 0x29
+'m',    # 0x2a
+'n',    # 0x2b
+'o',    # 0x2c
+'p',    # 0x2d
+'q',    # 0x2e
+'r',    # 0x2f
+'s',    # 0x30
+'t',    # 0x31
+'u',    # 0x32
+'v',    # 0x33
+'w',    # 0x34
+'x',    # 0x35
+'y',    # 0x36
+'z',    # 0x37
+'A',    # 0x38
+'B',    # 0x39
+'',    # 0x3a
+'D',    # 0x3b
+'E',    # 0x3c
+'F',    # 0x3d
+'G',    # 0x3e
+'',    # 0x3f
+'I',    # 0x40
+'J',    # 0x41
+'K',    # 0x42
+'L',    # 0x43
+'M',    # 0x44
+'',    # 0x45
+'O',    # 0x46
+'',    # 0x47
+'',    # 0x48
+'',    # 0x49
+'S',    # 0x4a
+'T',    # 0x4b
+'U',    # 0x4c
+'V',    # 0x4d
+'W',    # 0x4e
+'X',    # 0x4f
+'Y',    # 0x50
+'',    # 0x51
+'a',    # 0x52
+'b',    # 0x53
+'c',    # 0x54
+'d',    # 0x55
+'e',    # 0x56
+'f',    # 0x57
+'g',    # 0x58
+'h',    # 0x59
+'i',    # 0x5a
+'j',    # 0x5b
+'k',    # 0x5c
+'l',    # 0x5d
+'m',    # 0x5e
+'n',    # 0x5f
+'o',    # 0x60
+'p',    # 0x61
+'q',    # 0x62
+'r',    # 0x63
+'s',    # 0x64
+'t',    # 0x65
+'u',    # 0x66
+'v',    # 0x67
+'w',    # 0x68
+'x',    # 0x69
+'y',    # 0x6a
+'z',    # 0x6b
+'A',    # 0x6c
+'B',    # 0x6d
+'C',    # 0x6e
+'D',    # 0x6f
+'E',    # 0x70
+'F',    # 0x71
+'G',    # 0x72
+'H',    # 0x73
+'I',    # 0x74
+'J',    # 0x75
+'K',    # 0x76
+'L',    # 0x77
+'M',    # 0x78
+'N',    # 0x79
+'O',    # 0x7a
+'P',    # 0x7b
+'Q',    # 0x7c
+'R',    # 0x7d
+'S',    # 0x7e
+'T',    # 0x7f
+'U',    # 0x80
+'V',    # 0x81
+'W',    # 0x82
+'X',    # 0x83
+'Y',    # 0x84
+'Z',    # 0x85
+'a',    # 0x86
+'b',    # 0x87
+'c',    # 0x88
+'d',    # 0x89
+'e',    # 0x8a
+'f',    # 0x8b
+'g',    # 0x8c
+'h',    # 0x8d
+'i',    # 0x8e
+'j',    # 0x8f
+'k',    # 0x90
+'l',    # 0x91
+'m',    # 0x92
+'n',    # 0x93
+'o',    # 0x94
+'p',    # 0x95
+'q',    # 0x96
+'r',    # 0x97
+'s',    # 0x98
+'t',    # 0x99
+'u',    # 0x9a
+'v',    # 0x9b
+'w',    # 0x9c
+'x',    # 0x9d
+'y',    # 0x9e
+'z',    # 0x9f
+'A',    # 0xa0
+'B',    # 0xa1
+'C',    # 0xa2
+'D',    # 0xa3
+'E',    # 0xa4
+'F',    # 0xa5
+'G',    # 0xa6
+'H',    # 0xa7
+'I',    # 0xa8
+'J',    # 0xa9
+'K',    # 0xaa
+'L',    # 0xab
+'M',    # 0xac
+'N',    # 0xad
+'O',    # 0xae
+'P',    # 0xaf
+'Q',    # 0xb0
+'R',    # 0xb1
+'S',    # 0xb2
+'T',    # 0xb3
+'U',    # 0xb4
+'V',    # 0xb5
+'W',    # 0xb6
+'X',    # 0xb7
+'Y',    # 0xb8
+'Z',    # 0xb9
+'a',    # 0xba
+'b',    # 0xbb
+'c',    # 0xbc
+'d',    # 0xbd
+'e',    # 0xbe
+'f',    # 0xbf
+'g',    # 0xc0
+'h',    # 0xc1
+'i',    # 0xc2
+'j',    # 0xc3
+'k',    # 0xc4
+'l',    # 0xc5
+'m',    # 0xc6
+'n',    # 0xc7
+'o',    # 0xc8
+'p',    # 0xc9
+'q',    # 0xca
+'r',    # 0xcb
+'s',    # 0xcc
+'t',    # 0xcd
+'u',    # 0xce
+'v',    # 0xcf
+'w',    # 0xd0
+'x',    # 0xd1
+'y',    # 0xd2
+'z',    # 0xd3
+'A',    # 0xd4
+'B',    # 0xd5
+'C',    # 0xd6
+'D',    # 0xd7
+'E',    # 0xd8
+'F',    # 0xd9
+'G',    # 0xda
+'H',    # 0xdb
+'I',    # 0xdc
+'J',    # 0xdd
+'K',    # 0xde
+'L',    # 0xdf
+'M',    # 0xe0
+'N',    # 0xe1
+'O',    # 0xe2
+'P',    # 0xe3
+'Q',    # 0xe4
+'R',    # 0xe5
+'S',    # 0xe6
+'T',    # 0xe7
+'U',    # 0xe8
+'V',    # 0xe9
+'W',    # 0xea
+'X',    # 0xeb
+'Y',    # 0xec
+'Z',    # 0xed
+'a',    # 0xee
+'b',    # 0xef
+'c',    # 0xf0
+'d',    # 0xf1
+'e',    # 0xf2
+'f',    # 0xf3
+'g',    # 0xf4
+'h',    # 0xf5
+'i',    # 0xf6
+'j',    # 0xf7
+'k',    # 0xf8
+'l',    # 0xf9
+'m',    # 0xfa
+'n',    # 0xfb
+'o',    # 0xfc
+'p',    # 0xfd
+'q',    # 0xfe
+'r',    # 0xff
+)
diff --git a/lib/unidecode/x1d6.py b/lib/unidecode/x1d6.py
new file mode 100644
index 00000000..c06a855d
--- /dev/null
+++ b/lib/unidecode/x1d6.py
@@ -0,0 +1,258 @@
+data = (
+'s',    # 0x00
+'t',    # 0x01
+'u',    # 0x02
+'v',    # 0x03
+'w',    # 0x04
+'x',    # 0x05
+'y',    # 0x06
+'z',    # 0x07
+'A',    # 0x08
+'B',    # 0x09
+'C',    # 0x0a
+'D',    # 0x0b
+'E',    # 0x0c
+'F',    # 0x0d
+'G',    # 0x0e
+'H',    # 0x0f
+'I',    # 0x10
+'J',    # 0x11
+'K',    # 0x12
+'L',    # 0x13
+'M',    # 0x14
+'N',    # 0x15
+'O',    # 0x16
+'P',    # 0x17
+'Q',    # 0x18
+'R',    # 0x19
+'S',    # 0x1a
+'T',    # 0x1b
+'U',    # 0x1c
+'V',    # 0x1d
+'W',    # 0x1e
+'X',    # 0x1f
+'Y',    # 0x20
+'Z',    # 0x21
+'a',    # 0x22
+'b',    # 0x23
+'c',    # 0x24
+'d',    # 0x25
+'e',    # 0x26
+'f',    # 0x27
+'g',    # 0x28
+'h',    # 0x29
+'i',    # 0x2a
+'j',    # 0x2b
+'k',    # 0x2c
+'l',    # 0x2d
+'m',    # 0x2e
+'n',    # 0x2f
+'o',    # 0x30
+'p',    # 0x31
+'q',    # 0x32
+'r',    # 0x33
+'s',    # 0x34
+'t',    # 0x35
+'u',    # 0x36
+'v',    # 0x37
+'w',    # 0x38
+'x',    # 0x39
+'y',    # 0x3a
+'z',    # 0x3b
+'A',    # 0x3c
+'B',    # 0x3d
+'C',    # 0x3e
+'D',    # 0x3f
+'E',    # 0x40
+'F',    # 0x41
+'G',    # 0x42
+'H',    # 0x43
+'I',    # 0x44
+'J',    # 0x45
+'K',    # 0x46
+'L',    # 0x47
+'M',    # 0x48
+'N',    # 0x49
+'O',    # 0x4a
+'P',    # 0x4b
+'Q',    # 0x4c
+'R',    # 0x4d
+'S',    # 0x4e
+'T',    # 0x4f
+'U',    # 0x50
+'V',    # 0x51
+'W',    # 0x52
+'X',    # 0x53
+'Y',    # 0x54
+'Z',    # 0x55
+'a',    # 0x56
+'b',    # 0x57
+'c',    # 0x58
+'d',    # 0x59
+'e',    # 0x5a
+'f',    # 0x5b
+'g',    # 0x5c
+'h',    # 0x5d
+'i',    # 0x5e
+'j',    # 0x5f
+'k',    # 0x60
+'l',    # 0x61
+'m',    # 0x62
+'n',    # 0x63
+'o',    # 0x64
+'p',    # 0x65
+'q',    # 0x66
+'r',    # 0x67
+'s',    # 0x68
+'t',    # 0x69
+'u',    # 0x6a
+'v',    # 0x6b
+'w',    # 0x6c
+'x',    # 0x6d
+'y',    # 0x6e
+'z',    # 0x6f
+'A',    # 0x70
+'B',    # 0x71
+'C',    # 0x72
+'D',    # 0x73
+'E',    # 0x74
+'F',    # 0x75
+'G',    # 0x76
+'H',    # 0x77
+'I',    # 0x78
+'J',    # 0x79
+'K',    # 0x7a
+'L',    # 0x7b
+'M',    # 0x7c
+'N',    # 0x7d
+'O',    # 0x7e
+'P',    # 0x7f
+'Q',    # 0x80
+'R',    # 0x81
+'S',    # 0x82
+'T',    # 0x83
+'U',    # 0x84
+'V',    # 0x85
+'W',    # 0x86
+'X',    # 0x87
+'Y',    # 0x88
+'Z',    # 0x89
+'a',    # 0x8a
+'b',    # 0x8b
+'c',    # 0x8c
+'d',    # 0x8d
+'e',    # 0x8e
+'f',    # 0x8f
+'g',    # 0x90
+'h',    # 0x91
+'i',    # 0x92
+'j',    # 0x93
+'k',    # 0x94
+'l',    # 0x95
+'m',    # 0x96
+'n',    # 0x97
+'o',    # 0x98
+'p',    # 0x99
+'q',    # 0x9a
+'r',    # 0x9b
+'s',    # 0x9c
+'t',    # 0x9d
+'u',    # 0x9e
+'v',    # 0x9f
+'w',    # 0xa0
+'x',    # 0xa1
+'y',    # 0xa2
+'z',    # 0xa3
+'i',    # 0xa4
+'j',    # 0xa5
+'',    # 0xa6
+'',    # 0xa7
+'Alpha',    # 0xa8
+'Beta',    # 0xa9
+'Gamma',    # 0xaa
+'Delta',    # 0xab
+'Epsilon',    # 0xac
+'Zeta',    # 0xad
+'Eta',    # 0xae
+'Theta',    # 0xaf
+'Iota',    # 0xb0
+'Kappa',    # 0xb1
+'Lamda',    # 0xb2
+'Mu',    # 0xb3
+'Nu',    # 0xb4
+'Xi',    # 0xb5
+'Omicron',    # 0xb6
+'Pi',    # 0xb7
+'Rho',    # 0xb8
+'Theta',    # 0xb9
+'Sigma',    # 0xba
+'Tau',    # 0xbb
+'Upsilon',    # 0xbc
+'Phi',    # 0xbd
+'Chi',    # 0xbe
+'Psi',    # 0xbf
+'Omega',    # 0xc0
+'nabla',    # 0xc1
+'alpha',    # 0xc2
+'beta',    # 0xc3
+'gamma',    # 0xc4
+'delta',    # 0xc5
+'epsilon',    # 0xc6
+'zeta',    # 0xc7
+'eta',    # 0xc8
+'theta',    # 0xc9
+'iota',    # 0xca
+'kappa',    # 0xcb
+'lamda',    # 0xcc
+'mu',    # 0xcd
+'nu',    # 0xce
+'xi',    # 0xcf
+'omicron',    # 0xd0
+'pi',    # 0xd1
+'rho',    # 0xd2
+'sigma',    # 0xd3
+'sigma',    # 0xd4
+'tai',    # 0xd5
+'upsilon',    # 0xd6
+'phi',    # 0xd7
+'chi',    # 0xd8
+'psi',    # 0xd9
+'omega',    # 0xda
+'',    # 0xdb
+'',    # 0xdc
+'',    # 0xdd
+'',    # 0xde
+'',    # 0xdf
+'',    # 0xe0
+'',    # 0xe1
+'',    # 0xe2
+'',    # 0xe3
+'',    # 0xe4
+'',    # 0xe5
+'',    # 0xe6
+'',    # 0xe7
+'',    # 0xe8
+'',    # 0xe9
+'',    # 0xea
+'',    # 0xeb
+'',    # 0xec
+'',    # 0xed
+'',    # 0xee
+'',    # 0xef
+'',    # 0xf0
+'',    # 0xf1
+'',    # 0xf2
+'',    # 0xf3
+'',    # 0xf4
+'',    # 0xf5
+'',    # 0xf6
+'',    # 0xf7
+'',    # 0xf8
+'',    # 0xf9
+'',    # 0xfa
+'',    # 0xfb
+'',    # 0xfc
+'',    # 0xfd
+'',    # 0xfe
+'',    # 0xff
+)
diff --git a/lib/unidecode/x1d7.py b/lib/unidecode/x1d7.py
new file mode 100644
index 00000000..6943bf45
--- /dev/null
+++ b/lib/unidecode/x1d7.py
@@ -0,0 +1,258 @@
+data = (
+'',    # 0x00
+'',    # 0x01
+'',    # 0x02
+'',    # 0x03
+'',    # 0x04
+'',    # 0x05
+'',    # 0x06
+'',    # 0x07
+'',    # 0x08
+'',    # 0x09
+'',    # 0x0a
+'',    # 0x0b
+'',    # 0x0c
+'',    # 0x0d
+'',    # 0x0e
+'',    # 0x0f
+'',    # 0x10
+'',    # 0x11
+'',    # 0x12
+'',    # 0x13
+'',    # 0x14
+'',    # 0x15
+'',    # 0x16
+'',    # 0x17
+'',    # 0x18
+'',    # 0x19
+'',    # 0x1a
+'',    # 0x1b
+'',    # 0x1c
+'',    # 0x1d
+'',    # 0x1e
+'',    # 0x1f
+'',    # 0x20
+'',    # 0x21
+'',    # 0x22
+'',    # 0x23
+'',    # 0x24
+'',    # 0x25
+'',    # 0x26
+'',    # 0x27
+'',    # 0x28
+'',    # 0x29
+'',    # 0x2a
+'',    # 0x2b
+'',    # 0x2c
+'',    # 0x2d
+'',    # 0x2e
+'',    # 0x2f
+'',    # 0x30
+'',    # 0x31
+'',    # 0x32
+'',    # 0x33
+'',    # 0x34
+'',    # 0x35
+'',    # 0x36
+'',    # 0x37
+'',    # 0x38
+'',    # 0x39
+'',    # 0x3a
+'',    # 0x3b
+'',    # 0x3c
+'',    # 0x3d
+'',    # 0x3e
+'',    # 0x3f
+'',    # 0x40
+'',    # 0x41
+'',    # 0x42
+'',    # 0x43
+'',    # 0x44
+'',    # 0x45
+'',    # 0x46
+'',    # 0x47
+'',    # 0x48
+'',    # 0x49
+'',    # 0x4a
+'',    # 0x4b
+'',    # 0x4c
+'',    # 0x4d
+'',    # 0x4e
+'',    # 0x4f
+'',    # 0x50
+'',    # 0x51
+'',    # 0x52
+'',    # 0x53
+'',    # 0x54
+'',    # 0x55
+'',    # 0x56
+'',    # 0x57
+'',    # 0x58
+'',    # 0x59
+'',    # 0x5a
+'',    # 0x5b
+'',    # 0x5c
+'',    # 0x5d
+'',    # 0x5e
+'',    # 0x5f
+'',    # 0x60
+'',    # 0x61
+'',    # 0x62
+'',    # 0x63
+'',    # 0x64
+'',    # 0x65
+'',    # 0x66
+'',    # 0x67
+'',    # 0x68
+'',    # 0x69
+'',    # 0x6a
+'',    # 0x6b
+'',    # 0x6c
+'',    # 0x6d
+'',    # 0x6e
+'',    # 0x6f
+'',    # 0x70
+'',    # 0x71
+'',    # 0x72
+'',    # 0x73
+'',    # 0x74
+'',    # 0x75
+'',    # 0x76
+'',    # 0x77
+'',    # 0x78
+'',    # 0x79
+'',    # 0x7a
+'',    # 0x7b
+'',    # 0x7c
+'',    # 0x7d
+'',    # 0x7e
+'',    # 0x7f
+'',    # 0x80
+'',    # 0x81
+'',    # 0x82
+'',    # 0x83
+'',    # 0x84
+'',    # 0x85
+'',    # 0x86
+'',    # 0x87
+'',    # 0x88
+'',    # 0x89
+'',    # 0x8a
+'',    # 0x8b
+'',    # 0x8c
+'',    # 0x8d
+'',    # 0x8e
+'',    # 0x8f
+'',    # 0x90
+'',    # 0x91
+'',    # 0x92
+'',    # 0x93
+'',    # 0x94
+'',    # 0x95
+'',    # 0x96
+'',    # 0x97
+'',    # 0x98
+'',    # 0x99
+'',    # 0x9a
+'',    # 0x9b
+'',    # 0x9c
+'',    # 0x9d
+'',    # 0x9e
+'',    # 0x9f
+'',    # 0xa0
+'',    # 0xa1
+'',    # 0xa2
+'',    # 0xa3
+'',    # 0xa4
+'',    # 0xa5
+'',    # 0xa6
+'',    # 0xa7
+'',    # 0xa8
+'',    # 0xa9
+'',    # 0xaa
+'',    # 0xab
+'',    # 0xac
+'',    # 0xad
+'',    # 0xae
+'',    # 0xaf
+'',    # 0xb0
+'',    # 0xb1
+'',    # 0xb2
+'',    # 0xb3
+'',    # 0xb4
+'',    # 0xb5
+'',    # 0xb6
+'',    # 0xb7
+'',    # 0xb8
+'',    # 0xb9
+'',    # 0xba
+'',    # 0xbb
+'',    # 0xbc
+'',    # 0xbd
+'',    # 0xbe
+'',    # 0xbf
+'',    # 0xc0
+'',    # 0xc1
+'',    # 0xc2
+'',    # 0xc3
+'',    # 0xc4
+'',    # 0xc5
+'',    # 0xc6
+'',    # 0xc7
+'',    # 0xc8
+'',    # 0xc9
+'',    # 0xca
+'',    # 0xcb
+'',    # 0xcc
+'',    # 0xcd
+'0',    # 0xce
+'1',    # 0xcf
+'2',    # 0xd0
+'3',    # 0xd1
+'4',    # 0xd2
+'5',    # 0xd3
+'6',    # 0xd4
+'7',    # 0xd5
+'8',    # 0xd6
+'9',    # 0xd7
+'0',    # 0xd8
+'1',    # 0xd9
+'2',    # 0xda
+'3',    # 0xdb
+'4',    # 0xdc
+'5',    # 0xdd
+'6',    # 0xde
+'7',    # 0xdf
+'8',    # 0xe0
+'9',    # 0xe1
+'0',    # 0xe2
+'1',    # 0xe3
+'2',    # 0xe4
+'3',    # 0xe5
+'4',    # 0xe6
+'5',    # 0xe7
+'6',    # 0xe8
+'7',    # 0xe9
+'8',    # 0xea
+'9',    # 0xeb
+'0',    # 0xec
+'1',    # 0xed
+'2',    # 0xee
+'3',    # 0xef
+'4',    # 0xf0
+'5',    # 0xf1
+'6',    # 0xf2
+'7',    # 0xf3
+'8',    # 0xf4
+'9',    # 0xf5
+'0',    # 0xf6
+'1',    # 0xf7
+'2',    # 0xf8
+'3',    # 0xf9
+'4',    # 0xfa
+'5',    # 0xfb
+'6',    # 0xfc
+'7',    # 0xfd
+'8',    # 0xfe
+'9',    # 0xff
+)
diff --git a/lib/urllib3/__init__.py b/lib/urllib3/__init__.py
deleted file mode 100644
index c6fa3821..00000000
--- a/lib/urllib3/__init__.py
+++ /dev/null
@@ -1,102 +0,0 @@
-"""
-Python HTTP library with thread-safe connection pooling, file post support, user friendly, and more
-"""
-from __future__ import absolute_import
-
-# Set default logging handler to avoid "No handler found" warnings.
-import logging
-import warnings
-from logging import NullHandler
-
-from . import exceptions
-from ._version import __version__
-from .connectionpool import HTTPConnectionPool, HTTPSConnectionPool, connection_from_url
-from .filepost import encode_multipart_formdata
-from .poolmanager import PoolManager, ProxyManager, proxy_from_url
-from .response import HTTPResponse
-from .util.request import make_headers
-from .util.retry import Retry
-from .util.timeout import Timeout
-from .util.url import get_host
-
-# === NOTE TO REPACKAGERS AND VENDORS ===
-# Please delete this block, this logic is only
-# for urllib3 being distributed via PyPI.
-# See: https://github.com/urllib3/urllib3/issues/2680
-try:
-    import urllib3_secure_extra  # type: ignore # noqa: F401
-except ImportError:
-    pass
-else:
-    warnings.warn(
-        "'urllib3[secure]' extra is deprecated and will be removed "
-        "in a future release of urllib3 2.x. Read more in this issue: "
-        "https://github.com/urllib3/urllib3/issues/2680",
-        category=DeprecationWarning,
-        stacklevel=2,
-    )
-
-__author__ = "Andrey Petrov (andrey.petrov@shazow.net)"
-__license__ = "MIT"
-__version__ = __version__
-
-__all__ = (
-    "HTTPConnectionPool",
-    "HTTPSConnectionPool",
-    "PoolManager",
-    "ProxyManager",
-    "HTTPResponse",
-    "Retry",
-    "Timeout",
-    "add_stderr_logger",
-    "connection_from_url",
-    "disable_warnings",
-    "encode_multipart_formdata",
-    "get_host",
-    "make_headers",
-    "proxy_from_url",
-)
-
-logging.getLogger(__name__).addHandler(NullHandler())
-
-
-def add_stderr_logger(level=logging.DEBUG):
-    """
-    Helper for quickly adding a StreamHandler to the logger. Useful for
-    debugging.
-
-    Returns the handler after adding it.
-    """
-    # This method needs to be in this __init__.py to get the __name__ correct
-    # even if urllib3 is vendored within another package.
-    logger = logging.getLogger(__name__)
-    handler = logging.StreamHandler()
-    handler.setFormatter(logging.Formatter("%(asctime)s %(levelname)s %(message)s"))
-    logger.addHandler(handler)
-    logger.setLevel(level)
-    logger.debug("Added a stderr logging handler to logger: %s", __name__)
-    return handler
-
-
-# ... Clean up.
-del NullHandler
-
-
-# All warning filters *must* be appended unless you're really certain that they
-# shouldn't be: otherwise, it's very hard for users to use most Python
-# mechanisms to silence them.
-# SecurityWarning's always go off by default.
-warnings.simplefilter("always", exceptions.SecurityWarning, append=True)
-# SubjectAltNameWarning's should go off once per host
-warnings.simplefilter("default", exceptions.SubjectAltNameWarning, append=True)
-# InsecurePlatformWarning's don't vary between requests, so we keep it default.
-warnings.simplefilter("default", exceptions.InsecurePlatformWarning, append=True)
-# SNIMissingWarnings should go off only once.
-warnings.simplefilter("default", exceptions.SNIMissingWarning, append=True)
-
-
-def disable_warnings(category=exceptions.HTTPWarning):
-    """
-    Helper for quickly disabling all urllib3 warnings.
-    """
-    warnings.simplefilter("ignore", category)
diff --git a/lib/urllib3/_collections.py b/lib/urllib3/_collections.py
deleted file mode 100644
index da9857e9..00000000
--- a/lib/urllib3/_collections.py
+++ /dev/null
@@ -1,337 +0,0 @@
-from __future__ import absolute_import
-
-try:
-    from collections.abc import Mapping, MutableMapping
-except ImportError:
-    from collections import Mapping, MutableMapping
-try:
-    from threading import RLock
-except ImportError:  # Platform-specific: No threads available
-
-    class RLock:
-        def __enter__(self):
-            pass
-
-        def __exit__(self, exc_type, exc_value, traceback):
-            pass
-
-
-from collections import OrderedDict
-
-from .exceptions import InvalidHeader
-from .packages import six
-from .packages.six import iterkeys, itervalues
-
-__all__ = ["RecentlyUsedContainer", "HTTPHeaderDict"]
-
-
-_Null = object()
-
-
-class RecentlyUsedContainer(MutableMapping):
-    """
-    Provides a thread-safe dict-like container which maintains up to
-    ``maxsize`` keys while throwing away the least-recently-used keys beyond
-    ``maxsize``.
-
-    :param maxsize:
-        Maximum number of recent elements to retain.
-
-    :param dispose_func:
-        Every time an item is evicted from the container,
-        ``dispose_func(value)`` is called.  Callback which will get called
-    """
-
-    ContainerCls = OrderedDict
-
-    def __init__(self, maxsize=10, dispose_func=None):
-        self._maxsize = maxsize
-        self.dispose_func = dispose_func
-
-        self._container = self.ContainerCls()
-        self.lock = RLock()
-
-    def __getitem__(self, key):
-        # Re-insert the item, moving it to the end of the eviction line.
-        with self.lock:
-            item = self._container.pop(key)
-            self._container[key] = item
-            return item
-
-    def __setitem__(self, key, value):
-        evicted_value = _Null
-        with self.lock:
-            # Possibly evict the existing value of 'key'
-            evicted_value = self._container.get(key, _Null)
-            self._container[key] = value
-
-            # If we didn't evict an existing value, we might have to evict the
-            # least recently used item from the beginning of the container.
-            if len(self._container) > self._maxsize:
-                _key, evicted_value = self._container.popitem(last=False)
-
-        if self.dispose_func and evicted_value is not _Null:
-            self.dispose_func(evicted_value)
-
-    def __delitem__(self, key):
-        with self.lock:
-            value = self._container.pop(key)
-
-        if self.dispose_func:
-            self.dispose_func(value)
-
-    def __len__(self):
-        with self.lock:
-            return len(self._container)
-
-    def __iter__(self):
-        raise NotImplementedError(
-            "Iteration over this class is unlikely to be threadsafe."
-        )
-
-    def clear(self):
-        with self.lock:
-            # Copy pointers to all values, then wipe the mapping
-            values = list(itervalues(self._container))
-            self._container.clear()
-
-        if self.dispose_func:
-            for value in values:
-                self.dispose_func(value)
-
-    def keys(self):
-        with self.lock:
-            return list(iterkeys(self._container))
-
-
-class HTTPHeaderDict(MutableMapping):
-    """
-    :param headers:
-        An iterable of field-value pairs. Must not contain multiple field names
-        when compared case-insensitively.
-
-    :param kwargs:
-        Additional field-value pairs to pass in to ``dict.update``.
-
-    A ``dict`` like container for storing HTTP Headers.
-
-    Field names are stored and compared case-insensitively in compliance with
-    RFC 7230. Iteration provides the first case-sensitive key seen for each
-    case-insensitive pair.
-
-    Using ``__setitem__`` syntax overwrites fields that compare equal
-    case-insensitively in order to maintain ``dict``'s api. For fields that
-    compare equal, instead create a new ``HTTPHeaderDict`` and use ``.add``
-    in a loop.
-
-    If multiple fields that are equal case-insensitively are passed to the
-    constructor or ``.update``, the behavior is undefined and some will be
-    lost.
-
-    >>> headers = HTTPHeaderDict()
-    >>> headers.add('Set-Cookie', 'foo=bar')
-    >>> headers.add('set-cookie', 'baz=quxx')
-    >>> headers['content-length'] = '7'
-    >>> headers['SET-cookie']
-    'foo=bar, baz=quxx'
-    >>> headers['Content-Length']
-    '7'
-    """
-
-    def __init__(self, headers=None, **kwargs):
-        super(HTTPHeaderDict, self).__init__()
-        self._container = OrderedDict()
-        if headers is not None:
-            if isinstance(headers, HTTPHeaderDict):
-                self._copy_from(headers)
-            else:
-                self.extend(headers)
-        if kwargs:
-            self.extend(kwargs)
-
-    def __setitem__(self, key, val):
-        self._container[key.lower()] = [key, val]
-        return self._container[key.lower()]
-
-    def __getitem__(self, key):
-        val = self._container[key.lower()]
-        return ", ".join(val[1:])
-
-    def __delitem__(self, key):
-        del self._container[key.lower()]
-
-    def __contains__(self, key):
-        return key.lower() in self._container
-
-    def __eq__(self, other):
-        if not isinstance(other, Mapping) and not hasattr(other, "keys"):
-            return False
-        if not isinstance(other, type(self)):
-            other = type(self)(other)
-        return dict((k.lower(), v) for k, v in self.itermerged()) == dict(
-            (k.lower(), v) for k, v in other.itermerged()
-        )
-
-    def __ne__(self, other):
-        return not self.__eq__(other)
-
-    if six.PY2:  # Python 2
-        iterkeys = MutableMapping.iterkeys
-        itervalues = MutableMapping.itervalues
-
-    __marker = object()
-
-    def __len__(self):
-        return len(self._container)
-
-    def __iter__(self):
-        # Only provide the originally cased names
-        for vals in self._container.values():
-            yield vals[0]
-
-    def pop(self, key, default=__marker):
-        """D.pop(k[,d]) -> v, remove specified key and return the corresponding value.
-        If key is not found, d is returned if given, otherwise KeyError is raised.
-        """
-        # Using the MutableMapping function directly fails due to the private marker.
-        # Using ordinary dict.pop would expose the internal structures.
-        # So let's reinvent the wheel.
-        try:
-            value = self[key]
-        except KeyError:
-            if default is self.__marker:
-                raise
-            return default
-        else:
-            del self[key]
-            return value
-
-    def discard(self, key):
-        try:
-            del self[key]
-        except KeyError:
-            pass
-
-    def add(self, key, val):
-        """Adds a (name, value) pair, doesn't overwrite the value if it already
-        exists.
-
-        >>> headers = HTTPHeaderDict(foo='bar')
-        >>> headers.add('Foo', 'baz')
-        >>> headers['foo']
-        'bar, baz'
-        """
-        key_lower = key.lower()
-        new_vals = [key, val]
-        # Keep the common case aka no item present as fast as possible
-        vals = self._container.setdefault(key_lower, new_vals)
-        if new_vals is not vals:
-            vals.append(val)
-
-    def extend(self, *args, **kwargs):
-        """Generic import function for any type of header-like object.
-        Adapted version of MutableMapping.update in order to insert items
-        with self.add instead of self.__setitem__
-        """
-        if len(args) > 1:
-            raise TypeError(
-                "extend() takes at most 1 positional "
-                "arguments ({0} given)".format(len(args))
-            )
-        other = args[0] if len(args) >= 1 else ()
-
-        if isinstance(other, HTTPHeaderDict):
-            for key, val in other.iteritems():
-                self.add(key, val)
-        elif isinstance(other, Mapping):
-            for key in other:
-                self.add(key, other[key])
-        elif hasattr(other, "keys"):
-            for key in other.keys():
-                self.add(key, other[key])
-        else:
-            for key, value in other:
-                self.add(key, value)
-
-        for key, value in kwargs.items():
-            self.add(key, value)
-
-    def getlist(self, key, default=__marker):
-        """Returns a list of all the values for the named field. Returns an
-        empty list if the key doesn't exist."""
-        try:
-            vals = self._container[key.lower()]
-        except KeyError:
-            if default is self.__marker:
-                return []
-            return default
-        else:
-            return vals[1:]
-
-    # Backwards compatibility for httplib
-    getheaders = getlist
-    getallmatchingheaders = getlist
-    iget = getlist
-
-    # Backwards compatibility for http.cookiejar
-    get_all = getlist
-
-    def __repr__(self):
-        return "%s(%s)" % (type(self).__name__, dict(self.itermerged()))
-
-    def _copy_from(self, other):
-        for key in other:
-            val = other.getlist(key)
-            if isinstance(val, list):
-                # Don't need to convert tuples
-                val = list(val)
-            self._container[key.lower()] = [key] + val
-
-    def copy(self):
-        clone = type(self)()
-        clone._copy_from(self)
-        return clone
-
-    def iteritems(self):
-        """Iterate over all header lines, including duplicate ones."""
-        for key in self:
-            vals = self._container[key.lower()]
-            for val in vals[1:]:
-                yield vals[0], val
-
-    def itermerged(self):
-        """Iterate over all headers, merging duplicate ones together."""
-        for key in self:
-            val = self._container[key.lower()]
-            yield val[0], ", ".join(val[1:])
-
-    def items(self):
-        return list(self.iteritems())
-
-    @classmethod
-    def from_httplib(cls, message):  # Python 2
-        """Read headers from a Python 2 httplib message object."""
-        # python2.7 does not expose a proper API for exporting multiheaders
-        # efficiently. This function re-reads raw lines from the message
-        # object and extracts the multiheaders properly.
-        obs_fold_continued_leaders = (" ", "\t")
-        headers = []
-
-        for line in message.headers:
-            if line.startswith(obs_fold_continued_leaders):
-                if not headers:
-                    # We received a header line that starts with OWS as described
-                    # in RFC-7230 S3.2.4. This indicates a multiline header, but
-                    # there exists no previous header to which we can attach it.
-                    raise InvalidHeader(
-                        "Header continuation with no previous header: %s" % line
-                    )
-                else:
-                    key, value = headers[-1]
-                    headers[-1] = (key, value + " " + line.strip())
-                    continue
-
-            key, value = line.split(":", 1)
-            headers.append((key, value.strip()))
-
-        return cls(headers)
diff --git a/lib/urllib3/_version.py b/lib/urllib3/_version.py
deleted file mode 100644
index d69ca314..00000000
--- a/lib/urllib3/_version.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# This file is protected via CODEOWNERS
-__version__ = "1.26.16"
diff --git a/lib/urllib3/connection.py b/lib/urllib3/connection.py
deleted file mode 100644
index 54b96b19..00000000
--- a/lib/urllib3/connection.py
+++ /dev/null
@@ -1,572 +0,0 @@
-from __future__ import absolute_import
-
-import datetime
-import logging
-import os
-import re
-import socket
-import warnings
-from socket import error as SocketError
-from socket import timeout as SocketTimeout
-
-from .packages import six
-from .packages.six.moves.http_client import HTTPConnection as _HTTPConnection
-from .packages.six.moves.http_client import HTTPException  # noqa: F401
-from .util.proxy import create_proxy_ssl_context
-
-try:  # Compiled with SSL?
-    import ssl
-
-    BaseSSLError = ssl.SSLError
-except (ImportError, AttributeError):  # Platform-specific: No SSL.
-    ssl = None
-
-    class BaseSSLError(BaseException):
-        pass
-
-
-try:
-    # Python 3: not a no-op, we're adding this to the namespace so it can be imported.
-    ConnectionError = ConnectionError
-except NameError:
-    # Python 2
-    class ConnectionError(Exception):
-        pass
-
-
-try:  # Python 3:
-    # Not a no-op, we're adding this to the namespace so it can be imported.
-    BrokenPipeError = BrokenPipeError
-except NameError:  # Python 2:
-
-    class BrokenPipeError(Exception):
-        pass
-
-
-from ._collections import HTTPHeaderDict  # noqa (historical, removed in v2)
-from ._version import __version__
-from .exceptions import (
-    ConnectTimeoutError,
-    NewConnectionError,
-    SubjectAltNameWarning,
-    SystemTimeWarning,
-)
-from .util import SKIP_HEADER, SKIPPABLE_HEADERS, connection
-from .util.ssl_ import (
-    assert_fingerprint,
-    create_urllib3_context,
-    is_ipaddress,
-    resolve_cert_reqs,
-    resolve_ssl_version,
-    ssl_wrap_socket,
-)
-from .util.ssl_match_hostname import CertificateError, match_hostname
-
-log = logging.getLogger(__name__)
-
-port_by_scheme = {"http": 80, "https": 443}
-
-# When it comes time to update this value as a part of regular maintenance
-# (ie test_recent_date is failing) update it to ~6 months before the current date.
-RECENT_DATE = datetime.date(2022, 1, 1)
-
-_CONTAINS_CONTROL_CHAR_RE = re.compile(r"[^-!#$%&'*+.^_`|~0-9a-zA-Z]")
-
-
-class HTTPConnection(_HTTPConnection, object):
-    """
-    Based on :class:`http.client.HTTPConnection` but provides an extra constructor
-    backwards-compatibility layer between older and newer Pythons.
-
-    Additional keyword parameters are used to configure attributes of the connection.
-    Accepted parameters include:
-
-    - ``strict``: See the documentation on :class:`urllib3.connectionpool.HTTPConnectionPool`
-    - ``source_address``: Set the source address for the current connection.
-    - ``socket_options``: Set specific options on the underlying socket. If not specified, then
-      defaults are loaded from ``HTTPConnection.default_socket_options`` which includes disabling
-      Nagle's algorithm (sets TCP_NODELAY to 1) unless the connection is behind a proxy.
-
-      For example, if you wish to enable TCP Keep Alive in addition to the defaults,
-      you might pass:
-
-      .. code-block:: python
-
-         HTTPConnection.default_socket_options + [
-             (socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1),
-         ]
-
-      Or you may want to disable the defaults by passing an empty list (e.g., ``[]``).
-    """
-
-    default_port = port_by_scheme["http"]
-
-    #: Disable Nagle's algorithm by default.
-    #: ``[(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)]``
-    default_socket_options = [(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)]
-
-    #: Whether this connection verifies the host's certificate.
-    is_verified = False
-
-    #: Whether this proxy connection (if used) verifies the proxy host's
-    #: certificate.
-    proxy_is_verified = None
-
-    def __init__(self, *args, **kw):
-        if not six.PY2:
-            kw.pop("strict", None)
-
-        # Pre-set source_address.
-        self.source_address = kw.get("source_address")
-
-        #: The socket options provided by the user. If no options are
-        #: provided, we use the default options.
-        self.socket_options = kw.pop("socket_options", self.default_socket_options)
-
-        # Proxy options provided by the user.
-        self.proxy = kw.pop("proxy", None)
-        self.proxy_config = kw.pop("proxy_config", None)
-
-        _HTTPConnection.__init__(self, *args, **kw)
-
-    @property
-    def host(self):
-        """
-        Getter method to remove any trailing dots that indicate the hostname is an FQDN.
-
-        In general, SSL certificates don't include the trailing dot indicating a
-        fully-qualified domain name, and thus, they don't validate properly when
-        checked against a domain name that includes the dot. In addition, some
-        servers may not expect to receive the trailing dot when provided.
-
-        However, the hostname with trailing dot is critical to DNS resolution; doing a
-        lookup with the trailing dot will properly only resolve the appropriate FQDN,
-        whereas a lookup without a trailing dot will search the system's search domain
-        list. Thus, it's important to keep the original host around for use only in
-        those cases where it's appropriate (i.e., when doing DNS lookup to establish the
-        actual TCP connection across which we're going to send HTTP requests).
-        """
-        return self._dns_host.rstrip(".")
-
-    @host.setter
-    def host(self, value):
-        """
-        Setter for the `host` property.
-
-        We assume that only urllib3 uses the _dns_host attribute; httplib itself
-        only uses `host`, and it seems reasonable that other libraries follow suit.
-        """
-        self._dns_host = value
-
-    def _new_conn(self):
-        """Establish a socket connection and set nodelay settings on it.
-
-        :return: New socket connection.
-        """
-        extra_kw = {}
-        if self.source_address:
-            extra_kw["source_address"] = self.source_address
-
-        if self.socket_options:
-            extra_kw["socket_options"] = self.socket_options
-
-        try:
-            conn = connection.create_connection(
-                (self._dns_host, self.port), self.timeout, **extra_kw
-            )
-
-        except SocketTimeout:
-            raise ConnectTimeoutError(
-                self,
-                "Connection to %s timed out. (connect timeout=%s)"
-                % (self.host, self.timeout),
-            )
-
-        except SocketError as e:
-            raise NewConnectionError(
-                self, "Failed to establish a new connection: %s" % e
-            )
-
-        return conn
-
-    def _is_using_tunnel(self):
-        # Google App Engine's httplib does not define _tunnel_host
-        return getattr(self, "_tunnel_host", None)
-
-    def _prepare_conn(self, conn):
-        self.sock = conn
-        if self._is_using_tunnel():
-            # TODO: Fix tunnel so it doesn't depend on self.sock state.
-            self._tunnel()
-            # Mark this connection as not reusable
-            self.auto_open = 0
-
-    def connect(self):
-        conn = self._new_conn()
-        self._prepare_conn(conn)
-
-    def putrequest(self, method, url, *args, **kwargs):
-        """ """
-        # Empty docstring because the indentation of CPython's implementation
-        # is broken but we don't want this method in our documentation.
-        match = _CONTAINS_CONTROL_CHAR_RE.search(method)
-        if match:
-            raise ValueError(
-                "Method cannot contain non-token characters %r (found at least %r)"
-                % (method, match.group())
-            )
-
-        return _HTTPConnection.putrequest(self, method, url, *args, **kwargs)
-
-    def putheader(self, header, *values):
-        """ """
-        if not any(isinstance(v, str) and v == SKIP_HEADER for v in values):
-            _HTTPConnection.putheader(self, header, *values)
-        elif six.ensure_str(header.lower()) not in SKIPPABLE_HEADERS:
-            raise ValueError(
-                "urllib3.util.SKIP_HEADER only supports '%s'"
-                % ("', '".join(map(str.title, sorted(SKIPPABLE_HEADERS))),)
-            )
-
-    def request(self, method, url, body=None, headers=None):
-        # Update the inner socket's timeout value to send the request.
-        # This only triggers if the connection is re-used.
-        if getattr(self, "sock", None) is not None:
-            self.sock.settimeout(self.timeout)
-
-        if headers is None:
-            headers = {}
-        else:
-            # Avoid modifying the headers passed into .request()
-            headers = headers.copy()
-        if "user-agent" not in (six.ensure_str(k.lower()) for k in headers):
-            headers["User-Agent"] = _get_default_user_agent()
-        super(HTTPConnection, self).request(method, url, body=body, headers=headers)
-
-    def request_chunked(self, method, url, body=None, headers=None):
-        """
-        Alternative to the common request method, which sends the
-        body with chunked encoding and not as one block
-        """
-        headers = headers or {}
-        header_keys = set([six.ensure_str(k.lower()) for k in headers])
-        skip_accept_encoding = "accept-encoding" in header_keys
-        skip_host = "host" in header_keys
-        self.putrequest(
-            method, url, skip_accept_encoding=skip_accept_encoding, skip_host=skip_host
-        )
-        if "user-agent" not in header_keys:
-            self.putheader("User-Agent", _get_default_user_agent())
-        for header, value in headers.items():
-            self.putheader(header, value)
-        if "transfer-encoding" not in header_keys:
-            self.putheader("Transfer-Encoding", "chunked")
-        self.endheaders()
-
-        if body is not None:
-            stringish_types = six.string_types + (bytes,)
-            if isinstance(body, stringish_types):
-                body = (body,)
-            for chunk in body:
-                if not chunk:
-                    continue
-                if not isinstance(chunk, bytes):
-                    chunk = chunk.encode("utf8")
-                len_str = hex(len(chunk))[2:]
-                to_send = bytearray(len_str.encode())
-                to_send += b"\r\n"
-                to_send += chunk
-                to_send += b"\r\n"
-                self.send(to_send)
-
-        # After the if clause, to always have a closed body
-        self.send(b"0\r\n\r\n")
-
-
-class HTTPSConnection(HTTPConnection):
-    """
-    Many of the parameters to this constructor are passed to the underlying SSL
-    socket by means of :py:func:`urllib3.util.ssl_wrap_socket`.
-    """
-
-    default_port = port_by_scheme["https"]
-
-    cert_reqs = None
-    ca_certs = None
-    ca_cert_dir = None
-    ca_cert_data = None
-    ssl_version = None
-    assert_fingerprint = None
-    tls_in_tls_required = False
-
-    def __init__(
-        self,
-        host,
-        port=None,
-        key_file=None,
-        cert_file=None,
-        key_password=None,
-        strict=None,
-        timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
-        ssl_context=None,
-        server_hostname=None,
-        **kw
-    ):
-
-        HTTPConnection.__init__(self, host, port, strict=strict, timeout=timeout, **kw)
-
-        self.key_file = key_file
-        self.cert_file = cert_file
-        self.key_password = key_password
-        self.ssl_context = ssl_context
-        self.server_hostname = server_hostname
-
-        # Required property for Google AppEngine 1.9.0 which otherwise causes
-        # HTTPS requests to go out as HTTP. (See Issue #356)
-        self._protocol = "https"
-
-    def set_cert(
-        self,
-        key_file=None,
-        cert_file=None,
-        cert_reqs=None,
-        key_password=None,
-        ca_certs=None,
-        assert_hostname=None,
-        assert_fingerprint=None,
-        ca_cert_dir=None,
-        ca_cert_data=None,
-    ):
-        """
-        This method should only be called once, before the connection is used.
-        """
-        # If cert_reqs is not provided we'll assume CERT_REQUIRED unless we also
-        # have an SSLContext object in which case we'll use its verify_mode.
-        if cert_reqs is None:
-            if self.ssl_context is not None:
-                cert_reqs = self.ssl_context.verify_mode
-            else:
-                cert_reqs = resolve_cert_reqs(None)
-
-        self.key_file = key_file
-        self.cert_file = cert_file
-        self.cert_reqs = cert_reqs
-        self.key_password = key_password
-        self.assert_hostname = assert_hostname
-        self.assert_fingerprint = assert_fingerprint
-        self.ca_certs = ca_certs and os.path.expanduser(ca_certs)
-        self.ca_cert_dir = ca_cert_dir and os.path.expanduser(ca_cert_dir)
-        self.ca_cert_data = ca_cert_data
-
-    def connect(self):
-        # Add certificate verification
-        self.sock = conn = self._new_conn()
-        hostname = self.host
-        tls_in_tls = False
-
-        if self._is_using_tunnel():
-            if self.tls_in_tls_required:
-                self.sock = conn = self._connect_tls_proxy(hostname, conn)
-                tls_in_tls = True
-
-            # Calls self._set_hostport(), so self.host is
-            # self._tunnel_host below.
-            self._tunnel()
-            # Mark this connection as not reusable
-            self.auto_open = 0
-
-            # Override the host with the one we're requesting data from.
-            hostname = self._tunnel_host
-
-        server_hostname = hostname
-        if self.server_hostname is not None:
-            server_hostname = self.server_hostname
-
-        is_time_off = datetime.date.today() < RECENT_DATE
-        if is_time_off:
-            warnings.warn(
-                (
-                    "System time is way off (before {0}). This will probably "
-                    "lead to SSL verification errors"
-                ).format(RECENT_DATE),
-                SystemTimeWarning,
-            )
-
-        # Wrap socket using verification with the root certs in
-        # trusted_root_certs
-        default_ssl_context = False
-        if self.ssl_context is None:
-            default_ssl_context = True
-            self.ssl_context = create_urllib3_context(
-                ssl_version=resolve_ssl_version(self.ssl_version),
-                cert_reqs=resolve_cert_reqs(self.cert_reqs),
-            )
-
-        context = self.ssl_context
-        context.verify_mode = resolve_cert_reqs(self.cert_reqs)
-
-        # Try to load OS default certs if none are given.
-        # Works well on Windows (requires Python3.4+)
-        if (
-            not self.ca_certs
-            and not self.ca_cert_dir
-            and not self.ca_cert_data
-            and default_ssl_context
-            and hasattr(context, "load_default_certs")
-        ):
-            context.load_default_certs()
-
-        self.sock = ssl_wrap_socket(
-            sock=conn,
-            keyfile=self.key_file,
-            certfile=self.cert_file,
-            key_password=self.key_password,
-            ca_certs=self.ca_certs,
-            ca_cert_dir=self.ca_cert_dir,
-            ca_cert_data=self.ca_cert_data,
-            server_hostname=server_hostname,
-            ssl_context=context,
-            tls_in_tls=tls_in_tls,
-        )
-
-        # If we're using all defaults and the connection
-        # is TLSv1 or TLSv1.1 we throw a DeprecationWarning
-        # for the host.
-        if (
-            default_ssl_context
-            and self.ssl_version is None
-            and hasattr(self.sock, "version")
-            and self.sock.version() in {"TLSv1", "TLSv1.1"}
-        ):
-            warnings.warn(
-                "Negotiating TLSv1/TLSv1.1 by default is deprecated "
-                "and will be disabled in urllib3 v2.0.0. Connecting to "
-                "'%s' with '%s' can be enabled by explicitly opting-in "
-                "with 'ssl_version'" % (self.host, self.sock.version()),
-                DeprecationWarning,
-            )
-
-        if self.assert_fingerprint:
-            assert_fingerprint(
-                self.sock.getpeercert(binary_form=True), self.assert_fingerprint
-            )
-        elif (
-            context.verify_mode != ssl.CERT_NONE
-            and not getattr(context, "check_hostname", False)
-            and self.assert_hostname is not False
-        ):
-            # While urllib3 attempts to always turn off hostname matching from
-            # the TLS library, this cannot always be done. So we check whether
-            # the TLS Library still thinks it's matching hostnames.
-            cert = self.sock.getpeercert()
-            if not cert.get("subjectAltName", ()):
-                warnings.warn(
-                    (
-                        "Certificate for {0} has no `subjectAltName`, falling back to check for a "
-                        "`commonName` for now. This feature is being removed by major browsers and "
-                        "deprecated by RFC 2818. (See https://github.com/urllib3/urllib3/issues/497 "
-                        "for details.)".format(hostname)
-                    ),
-                    SubjectAltNameWarning,
-                )
-            _match_hostname(cert, self.assert_hostname or server_hostname)
-
-        self.is_verified = (
-            context.verify_mode == ssl.CERT_REQUIRED
-            or self.assert_fingerprint is not None
-        )
-
-    def _connect_tls_proxy(self, hostname, conn):
-        """
-        Establish a TLS connection to the proxy using the provided SSL context.
-        """
-        proxy_config = self.proxy_config
-        ssl_context = proxy_config.ssl_context
-        if ssl_context:
-            # If the user provided a proxy context, we assume CA and client
-            # certificates have already been set
-            return ssl_wrap_socket(
-                sock=conn,
-                server_hostname=hostname,
-                ssl_context=ssl_context,
-            )
-
-        ssl_context = create_proxy_ssl_context(
-            self.ssl_version,
-            self.cert_reqs,
-            self.ca_certs,
-            self.ca_cert_dir,
-            self.ca_cert_data,
-        )
-
-        # If no cert was provided, use only the default options for server
-        # certificate validation
-        socket = ssl_wrap_socket(
-            sock=conn,
-            ca_certs=self.ca_certs,
-            ca_cert_dir=self.ca_cert_dir,
-            ca_cert_data=self.ca_cert_data,
-            server_hostname=hostname,
-            ssl_context=ssl_context,
-        )
-
-        if ssl_context.verify_mode != ssl.CERT_NONE and not getattr(
-            ssl_context, "check_hostname", False
-        ):
-            # While urllib3 attempts to always turn off hostname matching from
-            # the TLS library, this cannot always be done. So we check whether
-            # the TLS Library still thinks it's matching hostnames.
-            cert = socket.getpeercert()
-            if not cert.get("subjectAltName", ()):
-                warnings.warn(
-                    (
-                        "Certificate for {0} has no `subjectAltName`, falling back to check for a "
-                        "`commonName` for now. This feature is being removed by major browsers and "
-                        "deprecated by RFC 2818. (See https://github.com/urllib3/urllib3/issues/497 "
-                        "for details.)".format(hostname)
-                    ),
-                    SubjectAltNameWarning,
-                )
-            _match_hostname(cert, hostname)
-
-        self.proxy_is_verified = ssl_context.verify_mode == ssl.CERT_REQUIRED
-        return socket
-
-
-def _match_hostname(cert, asserted_hostname):
-    # Our upstream implementation of ssl.match_hostname()
-    # only applies this normalization to IP addresses so it doesn't
-    # match DNS SANs so we do the same thing!
-    stripped_hostname = asserted_hostname.strip("u[]")
-    if is_ipaddress(stripped_hostname):
-        asserted_hostname = stripped_hostname
-
-    try:
-        match_hostname(cert, asserted_hostname)
-    except CertificateError as e:
-        log.warning(
-            "Certificate did not match expected hostname: %s. Certificate: %s",
-            asserted_hostname,
-            cert,
-        )
-        # Add cert to exception and reraise so client code can inspect
-        # the cert when catching the exception, if they want to
-        e._peer_cert = cert
-        raise
-
-
-def _get_default_user_agent():
-    return "python-urllib3/%s" % __version__
-
-
-class DummyConnection(object):
-    """Used to detect a failed ConnectionCls import."""
-
-    pass
-
-
-if not ssl:
-    HTTPSConnection = DummyConnection  # noqa: F811
-
-
-VerifiedHTTPSConnection = HTTPSConnection
diff --git a/lib/urllib3/connectionpool.py b/lib/urllib3/connectionpool.py
deleted file mode 100644
index 96844d93..00000000
--- a/lib/urllib3/connectionpool.py
+++ /dev/null
@@ -1,1132 +0,0 @@
-from __future__ import absolute_import
-
-import errno
-import logging
-import re
-import socket
-import sys
-import warnings
-from socket import error as SocketError
-from socket import timeout as SocketTimeout
-
-from .connection import (
-    BaseSSLError,
-    BrokenPipeError,
-    DummyConnection,
-    HTTPConnection,
-    HTTPException,
-    HTTPSConnection,
-    VerifiedHTTPSConnection,
-    port_by_scheme,
-)
-from .exceptions import (
-    ClosedPoolError,
-    EmptyPoolError,
-    HeaderParsingError,
-    HostChangedError,
-    InsecureRequestWarning,
-    LocationValueError,
-    MaxRetryError,
-    NewConnectionError,
-    ProtocolError,
-    ProxyError,
-    ReadTimeoutError,
-    SSLError,
-    TimeoutError,
-)
-from .packages import six
-from .packages.six.moves import queue
-from .request import RequestMethods
-from .response import HTTPResponse
-from .util.connection import is_connection_dropped
-from .util.proxy import connection_requires_http_tunnel
-from .util.queue import LifoQueue
-from .util.request import set_file_position
-from .util.response import assert_header_parsing
-from .util.retry import Retry
-from .util.ssl_match_hostname import CertificateError
-from .util.timeout import Timeout
-from .util.url import Url, _encode_target
-from .util.url import _normalize_host as normalize_host
-from .util.url import get_host, parse_url
-
-try:  # Platform-specific: Python 3
-    import weakref
-
-    weakref_finalize = weakref.finalize
-except AttributeError:  # Platform-specific: Python 2
-    from .packages.backports.weakref_finalize import weakref_finalize
-
-xrange = six.moves.xrange
-
-log = logging.getLogger(__name__)
-
-_Default = object()
-
-
-# Pool objects
-class ConnectionPool(object):
-    """
-    Base class for all connection pools, such as
-    :class:`.HTTPConnectionPool` and :class:`.HTTPSConnectionPool`.
-
-    .. note::
-       ConnectionPool.urlopen() does not normalize or percent-encode target URIs
-       which is useful if your target server doesn't support percent-encoded
-       target URIs.
-    """
-
-    scheme = None
-    QueueCls = LifoQueue
-
-    def __init__(self, host, port=None):
-        if not host:
-            raise LocationValueError("No host specified.")
-
-        self.host = _normalize_host(host, scheme=self.scheme)
-        self._proxy_host = host.lower()
-        self.port = port
-
-    def __str__(self):
-        return "%s(host=%r, port=%r)" % (type(self).__name__, self.host, self.port)
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        self.close()
-        # Return False to re-raise any potential exceptions
-        return False
-
-    def close(self):
-        """
-        Close all pooled connections and disable the pool.
-        """
-        pass
-
-
-# This is taken from http://hg.python.org/cpython/file/7aaba721ebc0/Lib/socket.py#l252
-_blocking_errnos = {errno.EAGAIN, errno.EWOULDBLOCK}
-
-
-class HTTPConnectionPool(ConnectionPool, RequestMethods):
-    """
-    Thread-safe connection pool for one host.
-
-    :param host:
-        Host used for this HTTP Connection (e.g. "localhost"), passed into
-        :class:`http.client.HTTPConnection`.
-
-    :param port:
-        Port used for this HTTP Connection (None is equivalent to 80), passed
-        into :class:`http.client.HTTPConnection`.
-
-    :param strict:
-        Causes BadStatusLine to be raised if the status line can't be parsed
-        as a valid HTTP/1.0 or 1.1 status line, passed into
-        :class:`http.client.HTTPConnection`.
-
-        .. note::
-           Only works in Python 2. This parameter is ignored in Python 3.
-
-    :param timeout:
-        Socket timeout in seconds for each individual connection. This can
-        be a float or integer, which sets the timeout for the HTTP request,
-        or an instance of :class:`urllib3.util.Timeout` which gives you more
-        fine-grained control over request timeouts. After the constructor has
-        been parsed, this is always a `urllib3.util.Timeout` object.
-
-    :param maxsize:
-        Number of connections to save that can be reused. More than 1 is useful
-        in multithreaded situations. If ``block`` is set to False, more
-        connections will be created but they will not be saved once they've
-        been used.
-
-    :param block:
-        If set to True, no more than ``maxsize`` connections will be used at
-        a time. When no free connections are available, the call will block
-        until a connection has been released. This is a useful side effect for
-        particular multithreaded situations where one does not want to use more
-        than maxsize connections per host to prevent flooding.
-
-    :param headers:
-        Headers to include with all requests, unless other headers are given
-        explicitly.
-
-    :param retries:
-        Retry configuration to use by default with requests in this pool.
-
-    :param _proxy:
-        Parsed proxy URL, should not be used directly, instead, see
-        :class:`urllib3.ProxyManager`
-
-    :param _proxy_headers:
-        A dictionary with proxy headers, should not be used directly,
-        instead, see :class:`urllib3.ProxyManager`
-
-    :param \\**conn_kw:
-        Additional parameters are used to create fresh :class:`urllib3.connection.HTTPConnection`,
-        :class:`urllib3.connection.HTTPSConnection` instances.
-    """
-
-    scheme = "http"
-    ConnectionCls = HTTPConnection
-    ResponseCls = HTTPResponse
-
-    def __init__(
-        self,
-        host,
-        port=None,
-        strict=False,
-        timeout=Timeout.DEFAULT_TIMEOUT,
-        maxsize=1,
-        block=False,
-        headers=None,
-        retries=None,
-        _proxy=None,
-        _proxy_headers=None,
-        _proxy_config=None,
-        **conn_kw
-    ):
-        ConnectionPool.__init__(self, host, port)
-        RequestMethods.__init__(self, headers)
-
-        self.strict = strict
-
-        if not isinstance(timeout, Timeout):
-            timeout = Timeout.from_float(timeout)
-
-        if retries is None:
-            retries = Retry.DEFAULT
-
-        self.timeout = timeout
-        self.retries = retries
-
-        self.pool = self.QueueCls(maxsize)
-        self.block = block
-
-        self.proxy = _proxy
-        self.proxy_headers = _proxy_headers or {}
-        self.proxy_config = _proxy_config
-
-        # Fill the queue up so that doing get() on it will block properly
-        for _ in xrange(maxsize):
-            self.pool.put(None)
-
-        # These are mostly for testing and debugging purposes.
-        self.num_connections = 0
-        self.num_requests = 0
-        self.conn_kw = conn_kw
-
-        if self.proxy:
-            # Enable Nagle's algorithm for proxies, to avoid packet fragmentation.
-            # We cannot know if the user has added default socket options, so we cannot replace the
-            # list.
-            self.conn_kw.setdefault("socket_options", [])
-
-            self.conn_kw["proxy"] = self.proxy
-            self.conn_kw["proxy_config"] = self.proxy_config
-
-        # Do not pass 'self' as callback to 'finalize'.
-        # Then the 'finalize' would keep an endless living (leak) to self.
-        # By just passing a reference to the pool allows the garbage collector
-        # to free self if nobody else has a reference to it.
-        pool = self.pool
-
-        # Close all the HTTPConnections in the pool before the
-        # HTTPConnectionPool object is garbage collected.
-        weakref_finalize(self, _close_pool_connections, pool)
-
-    def _new_conn(self):
-        """
-        Return a fresh :class:`HTTPConnection`.
-        """
-        self.num_connections += 1
-        log.debug(
-            "Starting new HTTP connection (%d): %s:%s",
-            self.num_connections,
-            self.host,
-            self.port or "80",
-        )
-
-        conn = self.ConnectionCls(
-            host=self.host,
-            port=self.port,
-            timeout=self.timeout.connect_timeout,
-            strict=self.strict,
-            **self.conn_kw
-        )
-        return conn
-
-    def _get_conn(self, timeout=None):
-        """
-        Get a connection. Will return a pooled connection if one is available.
-
-        If no connections are available and :prop:`.block` is ``False``, then a
-        fresh connection is returned.
-
-        :param timeout:
-            Seconds to wait before giving up and raising
-            :class:`urllib3.exceptions.EmptyPoolError` if the pool is empty and
-            :prop:`.block` is ``True``.
-        """
-        conn = None
-        try:
-            conn = self.pool.get(block=self.block, timeout=timeout)
-
-        except AttributeError:  # self.pool is None
-            raise ClosedPoolError(self, "Pool is closed.")
-
-        except queue.Empty:
-            if self.block:
-                raise EmptyPoolError(
-                    self,
-                    "Pool reached maximum size and no more connections are allowed.",
-                )
-            pass  # Oh well, we'll create a new connection then
-
-        # If this is a persistent connection, check if it got disconnected
-        if conn and is_connection_dropped(conn):
-            log.debug("Resetting dropped connection: %s", self.host)
-            conn.close()
-            if getattr(conn, "auto_open", 1) == 0:
-                # This is a proxied connection that has been mutated by
-                # http.client._tunnel() and cannot be reused (since it would
-                # attempt to bypass the proxy)
-                conn = None
-
-        return conn or self._new_conn()
-
-    def _put_conn(self, conn):
-        """
-        Put a connection back into the pool.
-
-        :param conn:
-            Connection object for the current host and port as returned by
-            :meth:`._new_conn` or :meth:`._get_conn`.
-
-        If the pool is already full, the connection is closed and discarded
-        because we exceeded maxsize. If connections are discarded frequently,
-        then maxsize should be increased.
-
-        If the pool is closed, then the connection will be closed and discarded.
-        """
-        try:
-            self.pool.put(conn, block=False)
-            return  # Everything is dandy, done.
-        except AttributeError:
-            # self.pool is None.
-            pass
-        except queue.Full:
-            # This should never happen if self.block == True
-            log.warning(
-                "Connection pool is full, discarding connection: %s. Connection pool size: %s",
-                self.host,
-                self.pool.qsize(),
-            )
-        # Connection never got put back into the pool, close it.
-        if conn:
-            conn.close()
-
-    def _validate_conn(self, conn):
-        """
-        Called right before a request is made, after the socket is created.
-        """
-        pass
-
-    def _prepare_proxy(self, conn):
-        # Nothing to do for HTTP connections.
-        pass
-
-    def _get_timeout(self, timeout):
-        """Helper that always returns a :class:`urllib3.util.Timeout`"""
-        if timeout is _Default:
-            return self.timeout.clone()
-
-        if isinstance(timeout, Timeout):
-            return timeout.clone()
-        else:
-            # User passed us an int/float. This is for backwards compatibility,
-            # can be removed later
-            return Timeout.from_float(timeout)
-
-    def _raise_timeout(self, err, url, timeout_value):
-        """Is the error actually a timeout? Will raise a ReadTimeout or pass"""
-
-        if isinstance(err, SocketTimeout):
-            raise ReadTimeoutError(
-                self, url, "Read timed out. (read timeout=%s)" % timeout_value
-            )
-
-        # See the above comment about EAGAIN in Python 3. In Python 2 we have
-        # to specifically catch it and throw the timeout error
-        if hasattr(err, "errno") and err.errno in _blocking_errnos:
-            raise ReadTimeoutError(
-                self, url, "Read timed out. (read timeout=%s)" % timeout_value
-            )
-
-        # Catch possible read timeouts thrown as SSL errors. If not the
-        # case, rethrow the original. We need to do this because of:
-        # http://bugs.python.org/issue10272
-        if "timed out" in str(err) or "did not complete (read)" in str(
-            err
-        ):  # Python < 2.7.4
-            raise ReadTimeoutError(
-                self, url, "Read timed out. (read timeout=%s)" % timeout_value
-            )
-
-    def _make_request(
-        self, conn, method, url, timeout=_Default, chunked=False, **httplib_request_kw
-    ):
-        """
-        Perform a request on a given urllib connection object taken from our
-        pool.
-
-        :param conn:
-            a connection from one of our connection pools
-
-        :param timeout:
-            Socket timeout in seconds for the request. This can be a
-            float or integer, which will set the same timeout value for
-            the socket connect and the socket read, or an instance of
-            :class:`urllib3.util.Timeout`, which gives you more fine-grained
-            control over your timeouts.
-        """
-        self.num_requests += 1
-
-        timeout_obj = self._get_timeout(timeout)
-        timeout_obj.start_connect()
-        conn.timeout = Timeout.resolve_default_timeout(timeout_obj.connect_timeout)
-
-        # Trigger any extra validation we need to do.
-        try:
-            self._validate_conn(conn)
-        except (SocketTimeout, BaseSSLError) as e:
-            # Py2 raises this as a BaseSSLError, Py3 raises it as socket timeout.
-            self._raise_timeout(err=e, url=url, timeout_value=conn.timeout)
-            raise
-
-        # conn.request() calls http.client.*.request, not the method in
-        # urllib3.request. It also calls makefile (recv) on the socket.
-        try:
-            if chunked:
-                conn.request_chunked(method, url, **httplib_request_kw)
-            else:
-                conn.request(method, url, **httplib_request_kw)
-
-        # We are swallowing BrokenPipeError (errno.EPIPE) since the server is
-        # legitimately able to close the connection after sending a valid response.
-        # With this behaviour, the received response is still readable.
-        except BrokenPipeError:
-            # Python 3
-            pass
-        except IOError as e:
-            # Python 2 and macOS/Linux
-            # EPIPE and ESHUTDOWN are BrokenPipeError on Python 2, and EPROTOTYPE is needed on macOS
-            # https://erickt.github.io/blog/2014/11/19/adventures-in-debugging-a-potential-osx-kernel-bug/
-            if e.errno not in {
-                errno.EPIPE,
-                errno.ESHUTDOWN,
-                errno.EPROTOTYPE,
-            }:
-                raise
-
-        # Reset the timeout for the recv() on the socket
-        read_timeout = timeout_obj.read_timeout
-
-        # App Engine doesn't have a sock attr
-        if getattr(conn, "sock", None):
-            # In Python 3 socket.py will catch EAGAIN and return None when you
-            # try and read into the file pointer created by http.client, which
-            # instead raises a BadStatusLine exception. Instead of catching
-            # the exception and assuming all BadStatusLine exceptions are read
-            # timeouts, check for a zero timeout before making the request.
-            if read_timeout == 0:
-                raise ReadTimeoutError(
-                    self, url, "Read timed out. (read timeout=%s)" % read_timeout
-                )
-            if read_timeout is Timeout.DEFAULT_TIMEOUT:
-                conn.sock.settimeout(socket.getdefaulttimeout())
-            else:  # None or a value
-                conn.sock.settimeout(read_timeout)
-
-        # Receive the response from the server
-        try:
-            try:
-                # Python 2.7, use buffering of HTTP responses
-                httplib_response = conn.getresponse(buffering=True)
-            except TypeError:
-                # Python 3
-                try:
-                    httplib_response = conn.getresponse()
-                except BaseException as e:
-                    # Remove the TypeError from the exception chain in
-                    # Python 3 (including for exceptions like SystemExit).
-                    # Otherwise it looks like a bug in the code.
-                    six.raise_from(e, None)
-        except (SocketTimeout, BaseSSLError, SocketError) as e:
-            self._raise_timeout(err=e, url=url, timeout_value=read_timeout)
-            raise
-
-        # AppEngine doesn't have a version attr.
-        http_version = getattr(conn, "_http_vsn_str", "HTTP/?")
-        log.debug(
-            '%s://%s:%s "%s %s %s" %s %s',
-            self.scheme,
-            self.host,
-            self.port,
-            method,
-            url,
-            http_version,
-            httplib_response.status,
-            httplib_response.length,
-        )
-
-        try:
-            assert_header_parsing(httplib_response.msg)
-        except (HeaderParsingError, TypeError) as hpe:  # Platform-specific: Python 3
-            log.warning(
-                "Failed to parse headers (url=%s): %s",
-                self._absolute_url(url),
-                hpe,
-                exc_info=True,
-            )
-
-        return httplib_response
-
-    def _absolute_url(self, path):
-        return Url(scheme=self.scheme, host=self.host, port=self.port, path=path).url
-
-    def close(self):
-        """
-        Close all pooled connections and disable the pool.
-        """
-        if self.pool is None:
-            return
-        # Disable access to the pool
-        old_pool, self.pool = self.pool, None
-
-        # Close all the HTTPConnections in the pool.
-        _close_pool_connections(old_pool)
-
-    def is_same_host(self, url):
-        """
-        Check if the given ``url`` is a member of the same host as this
-        connection pool.
-        """
-        if url.startswith("/"):
-            return True
-
-        # TODO: Add optional support for socket.gethostbyname checking.
-        scheme, host, port = get_host(url)
-        if host is not None:
-            host = _normalize_host(host, scheme=scheme)
-
-        # Use explicit default port for comparison when none is given
-        if self.port and not port:
-            port = port_by_scheme.get(scheme)
-        elif not self.port and port == port_by_scheme.get(scheme):
-            port = None
-
-        return (scheme, host, port) == (self.scheme, self.host, self.port)
-
-    def urlopen(
-        self,
-        method,
-        url,
-        body=None,
-        headers=None,
-        retries=None,
-        redirect=True,
-        assert_same_host=True,
-        timeout=_Default,
-        pool_timeout=None,
-        release_conn=None,
-        chunked=False,
-        body_pos=None,
-        **response_kw
-    ):
-        """
-        Get a connection from the pool and perform an HTTP request. This is the
-        lowest level call for making a request, so you'll need to specify all
-        the raw details.
-
-        .. note::
-
-           More commonly, it's appropriate to use a convenience method provided
-           by :class:`.RequestMethods`, such as :meth:`request`.
-
-        .. note::
-
-           `release_conn` will only behave as expected if
-           `preload_content=False` because we want to make
-           `preload_content=False` the default behaviour someday soon without
-           breaking backwards compatibility.
-
-        :param method:
-            HTTP request method (such as GET, POST, PUT, etc.)
-
-        :param url:
-            The URL to perform the request on.
-
-        :param body:
-            Data to send in the request body, either :class:`str`, :class:`bytes`,
-            an iterable of :class:`str`/:class:`bytes`, or a file-like object.
-
-        :param headers:
-            Dictionary of custom headers to send, such as User-Agent,
-            If-None-Match, etc. If None, pool headers are used. If provided,
-            these headers completely replace any pool-specific headers.
-
-        :param retries:
-            Configure the number of retries to allow before raising a
-            :class:`~urllib3.exceptions.MaxRetryError` exception.
-
-            Pass ``None`` to retry until you receive a response. Pass a
-            :class:`~urllib3.util.retry.Retry` object for fine-grained control
-            over different types of retries.
-            Pass an integer number to retry connection errors that many times,
-            but no other types of errors. Pass zero to never retry.
-
-            If ``False``, then retries are disabled and any exception is raised
-            immediately. Also, instead of raising a MaxRetryError on redirects,
-            the redirect response will be returned.
-
-        :type retries: :class:`~urllib3.util.retry.Retry`, False, or an int.
-
-        :param redirect:
-            If True, automatically handle redirects (status codes 301, 302,
-            303, 307, 308). Each redirect counts as a retry. Disabling retries
-            will disable redirect, too.
-
-        :param assert_same_host:
-            If ``True``, will make sure that the host of the pool requests is
-            consistent else will raise HostChangedError. When ``False``, you can
-            use the pool on an HTTP proxy and request foreign hosts.
-
-        :param timeout:
-            If specified, overrides the default timeout for this one
-            request. It may be a float (in seconds) or an instance of
-            :class:`urllib3.util.Timeout`.
-
-        :param pool_timeout:
-            If set and the pool is set to block=True, then this method will
-            block for ``pool_timeout`` seconds and raise EmptyPoolError if no
-            connection is available within the time period.
-
-        :param release_conn:
-            If False, then the urlopen call will not release the connection
-            back into the pool once a response is received (but will release if
-            you read the entire contents of the response such as when
-            `preload_content=True`). This is useful if you're not preloading
-            the response's content immediately. You will need to call
-            ``r.release_conn()`` on the response ``r`` to return the connection
-            back into the pool. If None, it takes the value of
-            ``response_kw.get('preload_content', True)``.
-
-        :param chunked:
-            If True, urllib3 will send the body using chunked transfer
-            encoding. Otherwise, urllib3 will send the body using the standard
-            content-length form. Defaults to False.
-
-        :param int body_pos:
-            Position to seek to in file-like body in the event of a retry or
-            redirect. Typically this won't need to be set because urllib3 will
-            auto-populate the value when needed.
-
-        :param \\**response_kw:
-            Additional parameters are passed to
-            :meth:`urllib3.response.HTTPResponse.from_httplib`
-        """
-
-        parsed_url = parse_url(url)
-        destination_scheme = parsed_url.scheme
-
-        if headers is None:
-            headers = self.headers
-
-        if not isinstance(retries, Retry):
-            retries = Retry.from_int(retries, redirect=redirect, default=self.retries)
-
-        if release_conn is None:
-            release_conn = response_kw.get("preload_content", True)
-
-        # Check host
-        if assert_same_host and not self.is_same_host(url):
-            raise HostChangedError(self, url, retries)
-
-        # Ensure that the URL we're connecting to is properly encoded
-        if url.startswith("/"):
-            url = six.ensure_str(_encode_target(url))
-        else:
-            url = six.ensure_str(parsed_url.url)
-
-        conn = None
-
-        # Track whether `conn` needs to be released before
-        # returning/raising/recursing. Update this variable if necessary, and
-        # leave `release_conn` constant throughout the function. That way, if
-        # the function recurses, the original value of `release_conn` will be
-        # passed down into the recursive call, and its value will be respected.
-        #
-        # See issue #651 [1] for details.
-        #
-        # [1] <https://github.com/urllib3/urllib3/issues/651>
-        release_this_conn = release_conn
-
-        http_tunnel_required = connection_requires_http_tunnel(
-            self.proxy, self.proxy_config, destination_scheme
-        )
-
-        # Merge the proxy headers. Only done when not using HTTP CONNECT. We
-        # have to copy the headers dict so we can safely change it without those
-        # changes being reflected in anyone else's copy.
-        if not http_tunnel_required:
-            headers = headers.copy()
-            headers.update(self.proxy_headers)
-
-        # Must keep the exception bound to a separate variable or else Python 3
-        # complains about UnboundLocalError.
-        err = None
-
-        # Keep track of whether we cleanly exited the except block. This
-        # ensures we do proper cleanup in finally.
-        clean_exit = False
-
-        # Rewind body position, if needed. Record current position
-        # for future rewinds in the event of a redirect/retry.
-        body_pos = set_file_position(body, body_pos)
-
-        try:
-            # Request a connection from the queue.
-            timeout_obj = self._get_timeout(timeout)
-            conn = self._get_conn(timeout=pool_timeout)
-
-            conn.timeout = timeout_obj.connect_timeout
-
-            is_new_proxy_conn = self.proxy is not None and not getattr(
-                conn, "sock", None
-            )
-            if is_new_proxy_conn and http_tunnel_required:
-                self._prepare_proxy(conn)
-
-            # Make the request on the httplib connection object.
-            httplib_response = self._make_request(
-                conn,
-                method,
-                url,
-                timeout=timeout_obj,
-                body=body,
-                headers=headers,
-                chunked=chunked,
-            )
-
-            # If we're going to release the connection in ``finally:``, then
-            # the response doesn't need to know about the connection. Otherwise
-            # it will also try to release it and we'll have a double-release
-            # mess.
-            response_conn = conn if not release_conn else None
-
-            # Pass method to Response for length checking
-            response_kw["request_method"] = method
-
-            # Import httplib's response into our own wrapper object
-            response = self.ResponseCls.from_httplib(
-                httplib_response,
-                pool=self,
-                connection=response_conn,
-                retries=retries,
-                **response_kw
-            )
-
-            # Everything went great!
-            clean_exit = True
-
-        except EmptyPoolError:
-            # Didn't get a connection from the pool, no need to clean up
-            clean_exit = True
-            release_this_conn = False
-            raise
-
-        except (
-            TimeoutError,
-            HTTPException,
-            SocketError,
-            ProtocolError,
-            BaseSSLError,
-            SSLError,
-            CertificateError,
-        ) as e:
-            # Discard the connection for these exceptions. It will be
-            # replaced during the next _get_conn() call.
-            clean_exit = False
-
-            def _is_ssl_error_message_from_http_proxy(ssl_error):
-                # We're trying to detect the message 'WRONG_VERSION_NUMBER' but
-                # SSLErrors are kinda all over the place when it comes to the message,
-                # so we try to cover our bases here!
-                message = " ".join(re.split("[^a-z]", str(ssl_error).lower()))
-                return (
-                    "wrong version number" in message or "unknown protocol" in message
-                )
-
-            # Try to detect a common user error with proxies which is to
-            # set an HTTP proxy to be HTTPS when it should be 'http://'
-            # (ie {'http': 'http://proxy', 'https': 'https://proxy'})
-            # Instead we add a nice error message and point to a URL.
-            if (
-                isinstance(e, BaseSSLError)
-                and self.proxy
-                and _is_ssl_error_message_from_http_proxy(e)
-                and conn.proxy
-                and conn.proxy.scheme == "https"
-            ):
-                e = ProxyError(
-                    "Your proxy appears to only use HTTP and not HTTPS, "
-                    "try changing your proxy URL to be HTTP. See: "
-                    "https://urllib3.readthedocs.io/en/1.26.x/advanced-usage.html"
-                    "#https-proxy-error-http-proxy",
-                    SSLError(e),
-                )
-            elif isinstance(e, (BaseSSLError, CertificateError)):
-                e = SSLError(e)
-            elif isinstance(e, (SocketError, NewConnectionError)) and self.proxy:
-                e = ProxyError("Cannot connect to proxy.", e)
-            elif isinstance(e, (SocketError, HTTPException)):
-                e = ProtocolError("Connection aborted.", e)
-
-            retries = retries.increment(
-                method, url, error=e, _pool=self, _stacktrace=sys.exc_info()[2]
-            )
-            retries.sleep()
-
-            # Keep track of the error for the retry warning.
-            err = e
-
-        finally:
-            if not clean_exit:
-                # We hit some kind of exception, handled or otherwise. We need
-                # to throw the connection away unless explicitly told not to.
-                # Close the connection, set the variable to None, and make sure
-                # we put the None back in the pool to avoid leaking it.
-                conn = conn and conn.close()
-                release_this_conn = True
-
-            if release_this_conn:
-                # Put the connection back to be reused. If the connection is
-                # expired then it will be None, which will get replaced with a
-                # fresh connection during _get_conn.
-                self._put_conn(conn)
-
-        if not conn:
-            # Try again
-            log.warning(
-                "Retrying (%r) after connection broken by '%r': %s", retries, err, url
-            )
-            return self.urlopen(
-                method,
-                url,
-                body,
-                headers,
-                retries,
-                redirect,
-                assert_same_host,
-                timeout=timeout,
-                pool_timeout=pool_timeout,
-                release_conn=release_conn,
-                chunked=chunked,
-                body_pos=body_pos,
-                **response_kw
-            )
-
-        # Handle redirect?
-        redirect_location = redirect and response.get_redirect_location()
-        if redirect_location:
-            if response.status == 303:
-                method = "GET"
-
-            try:
-                retries = retries.increment(method, url, response=response, _pool=self)
-            except MaxRetryError:
-                if retries.raise_on_redirect:
-                    response.drain_conn()
-                    raise
-                return response
-
-            response.drain_conn()
-            retries.sleep_for_retry(response)
-            log.debug("Redirecting %s -> %s", url, redirect_location)
-            return self.urlopen(
-                method,
-                redirect_location,
-                body,
-                headers,
-                retries=retries,
-                redirect=redirect,
-                assert_same_host=assert_same_host,
-                timeout=timeout,
-                pool_timeout=pool_timeout,
-                release_conn=release_conn,
-                chunked=chunked,
-                body_pos=body_pos,
-                **response_kw
-            )
-
-        # Check if we should retry the HTTP response.
-        has_retry_after = bool(response.headers.get("Retry-After"))
-        if retries.is_retry(method, response.status, has_retry_after):
-            try:
-                retries = retries.increment(method, url, response=response, _pool=self)
-            except MaxRetryError:
-                if retries.raise_on_status:
-                    response.drain_conn()
-                    raise
-                return response
-
-            response.drain_conn()
-            retries.sleep(response)
-            log.debug("Retry: %s", url)
-            return self.urlopen(
-                method,
-                url,
-                body,
-                headers,
-                retries=retries,
-                redirect=redirect,
-                assert_same_host=assert_same_host,
-                timeout=timeout,
-                pool_timeout=pool_timeout,
-                release_conn=release_conn,
-                chunked=chunked,
-                body_pos=body_pos,
-                **response_kw
-            )
-
-        return response
-
-
-class HTTPSConnectionPool(HTTPConnectionPool):
-    """
-    Same as :class:`.HTTPConnectionPool`, but HTTPS.
-
-    :class:`.HTTPSConnection` uses one of ``assert_fingerprint``,
-    ``assert_hostname`` and ``host`` in this order to verify connections.
-    If ``assert_hostname`` is False, no verification is done.
-
-    The ``key_file``, ``cert_file``, ``cert_reqs``, ``ca_certs``,
-    ``ca_cert_dir``, ``ssl_version``, ``key_password`` are only used if :mod:`ssl`
-    is available and are fed into :meth:`urllib3.util.ssl_wrap_socket` to upgrade
-    the connection socket into an SSL socket.
-    """
-
-    scheme = "https"
-    ConnectionCls = HTTPSConnection
-
-    def __init__(
-        self,
-        host,
-        port=None,
-        strict=False,
-        timeout=Timeout.DEFAULT_TIMEOUT,
-        maxsize=1,
-        block=False,
-        headers=None,
-        retries=None,
-        _proxy=None,
-        _proxy_headers=None,
-        key_file=None,
-        cert_file=None,
-        cert_reqs=None,
-        key_password=None,
-        ca_certs=None,
-        ssl_version=None,
-        assert_hostname=None,
-        assert_fingerprint=None,
-        ca_cert_dir=None,
-        **conn_kw
-    ):
-
-        HTTPConnectionPool.__init__(
-            self,
-            host,
-            port,
-            strict,
-            timeout,
-            maxsize,
-            block,
-            headers,
-            retries,
-            _proxy,
-            _proxy_headers,
-            **conn_kw
-        )
-
-        self.key_file = key_file
-        self.cert_file = cert_file
-        self.cert_reqs = cert_reqs
-        self.key_password = key_password
-        self.ca_certs = ca_certs
-        self.ca_cert_dir = ca_cert_dir
-        self.ssl_version = ssl_version
-        self.assert_hostname = assert_hostname
-        self.assert_fingerprint = assert_fingerprint
-
-    def _prepare_conn(self, conn):
-        """
-        Prepare the ``connection`` for :meth:`urllib3.util.ssl_wrap_socket`
-        and establish the tunnel if proxy is used.
-        """
-
-        if isinstance(conn, VerifiedHTTPSConnection):
-            conn.set_cert(
-                key_file=self.key_file,
-                key_password=self.key_password,
-                cert_file=self.cert_file,
-                cert_reqs=self.cert_reqs,
-                ca_certs=self.ca_certs,
-                ca_cert_dir=self.ca_cert_dir,
-                assert_hostname=self.assert_hostname,
-                assert_fingerprint=self.assert_fingerprint,
-            )
-            conn.ssl_version = self.ssl_version
-        return conn
-
-    def _prepare_proxy(self, conn):
-        """
-        Establishes a tunnel connection through HTTP CONNECT.
-
-        Tunnel connection is established early because otherwise httplib would
-        improperly set Host: header to proxy's IP:port.
-        """
-
-        conn.set_tunnel(self._proxy_host, self.port, self.proxy_headers)
-
-        if self.proxy.scheme == "https":
-            conn.tls_in_tls_required = True
-
-        conn.connect()
-
-    def _new_conn(self):
-        """
-        Return a fresh :class:`http.client.HTTPSConnection`.
-        """
-        self.num_connections += 1
-        log.debug(
-            "Starting new HTTPS connection (%d): %s:%s",
-            self.num_connections,
-            self.host,
-            self.port or "443",
-        )
-
-        if not self.ConnectionCls or self.ConnectionCls is DummyConnection:
-            raise SSLError(
-                "Can't connect to HTTPS URL because the SSL module is not available."
-            )
-
-        actual_host = self.host
-        actual_port = self.port
-        if self.proxy is not None:
-            actual_host = self.proxy.host
-            actual_port = self.proxy.port
-
-        conn = self.ConnectionCls(
-            host=actual_host,
-            port=actual_port,
-            timeout=self.timeout.connect_timeout,
-            strict=self.strict,
-            cert_file=self.cert_file,
-            key_file=self.key_file,
-            key_password=self.key_password,
-            **self.conn_kw
-        )
-
-        return self._prepare_conn(conn)
-
-    def _validate_conn(self, conn):
-        """
-        Called right before a request is made, after the socket is created.
-        """
-        super(HTTPSConnectionPool, self)._validate_conn(conn)
-
-        # Force connect early to allow us to validate the connection.
-        if not getattr(conn, "sock", None):  # AppEngine might not have  `.sock`
-            conn.connect()
-
-        if not conn.is_verified:
-            warnings.warn(
-                (
-                    "Unverified HTTPS request is being made to host '%s'. "
-                    "Adding certificate verification is strongly advised. See: "
-                    "https://urllib3.readthedocs.io/en/1.26.x/advanced-usage.html"
-                    "#ssl-warnings" % conn.host
-                ),
-                InsecureRequestWarning,
-            )
-
-        if getattr(conn, "proxy_is_verified", None) is False:
-            warnings.warn(
-                (
-                    "Unverified HTTPS connection done to an HTTPS proxy. "
-                    "Adding certificate verification is strongly advised. See: "
-                    "https://urllib3.readthedocs.io/en/1.26.x/advanced-usage.html"
-                    "#ssl-warnings"
-                ),
-                InsecureRequestWarning,
-            )
-
-
-def connection_from_url(url, **kw):
-    """
-    Given a url, return an :class:`.ConnectionPool` instance of its host.
-
-    This is a shortcut for not having to parse out the scheme, host, and port
-    of the url before creating an :class:`.ConnectionPool` instance.
-
-    :param url:
-        Absolute URL string that must include the scheme. Port is optional.
-
-    :param \\**kw:
-        Passes additional parameters to the constructor of the appropriate
-        :class:`.ConnectionPool`. Useful for specifying things like
-        timeout, maxsize, headers, etc.
-
-    Example::
-
-        >>> conn = connection_from_url('http://google.com/')
-        >>> r = conn.request('GET', '/')
-    """
-    scheme, host, port = get_host(url)
-    port = port or port_by_scheme.get(scheme, 80)
-    if scheme == "https":
-        return HTTPSConnectionPool(host, port=port, **kw)
-    else:
-        return HTTPConnectionPool(host, port=port, **kw)
-
-
-def _normalize_host(host, scheme):
-    """
-    Normalize hosts for comparisons and use with sockets.
-    """
-
-    host = normalize_host(host, scheme)
-
-    # httplib doesn't like it when we include brackets in IPv6 addresses
-    # Specifically, if we include brackets but also pass the port then
-    # httplib crazily doubles up the square brackets on the Host header.
-    # Instead, we need to make sure we never pass ``None`` as the port.
-    # However, for backward compatibility reasons we can't actually
-    # *assert* that.  See http://bugs.python.org/issue28539
-    if host.startswith("[") and host.endswith("]"):
-        host = host[1:-1]
-    return host
-
-
-def _close_pool_connections(pool):
-    """Drains a queue of connections and closes each one."""
-    try:
-        while True:
-            conn = pool.get(block=False)
-            if conn:
-                conn.close()
-    except queue.Empty:
-        pass  # Done.
diff --git a/lib/urllib3/contrib/__init__.py b/lib/urllib3/contrib/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/urllib3/contrib/_appengine_environ.py b/lib/urllib3/contrib/_appengine_environ.py
deleted file mode 100644
index 8765b907..00000000
--- a/lib/urllib3/contrib/_appengine_environ.py
+++ /dev/null
@@ -1,36 +0,0 @@
-"""
-This module provides means to detect the App Engine environment.
-"""
-
-import os
-
-
-def is_appengine():
-    return is_local_appengine() or is_prod_appengine()
-
-
-def is_appengine_sandbox():
-    """Reports if the app is running in the first generation sandbox.
-
-    The second generation runtimes are technically still in a sandbox, but it
-    is much less restrictive, so generally you shouldn't need to check for it.
-    see https://cloud.google.com/appengine/docs/standard/runtimes
-    """
-    return is_appengine() and os.environ["APPENGINE_RUNTIME"] == "python27"
-
-
-def is_local_appengine():
-    return "APPENGINE_RUNTIME" in os.environ and os.environ.get(
-        "SERVER_SOFTWARE", ""
-    ).startswith("Development/")
-
-
-def is_prod_appengine():
-    return "APPENGINE_RUNTIME" in os.environ and os.environ.get(
-        "SERVER_SOFTWARE", ""
-    ).startswith("Google App Engine/")
-
-
-def is_prod_appengine_mvms():
-    """Deprecated."""
-    return False
diff --git a/lib/urllib3/contrib/_securetransport/__init__.py b/lib/urllib3/contrib/_securetransport/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/urllib3/contrib/_securetransport/bindings.py b/lib/urllib3/contrib/_securetransport/bindings.py
deleted file mode 100644
index 264d564d..00000000
--- a/lib/urllib3/contrib/_securetransport/bindings.py
+++ /dev/null
@@ -1,519 +0,0 @@
-"""
-This module uses ctypes to bind a whole bunch of functions and constants from
-SecureTransport. The goal here is to provide the low-level API to
-SecureTransport. These are essentially the C-level functions and constants, and
-they're pretty gross to work with.
-
-This code is a bastardised version of the code found in Will Bond's oscrypto
-library. An enormous debt is owed to him for blazing this trail for us. For
-that reason, this code should be considered to be covered both by urllib3's
-license and by oscrypto's:
-
-    Copyright (c) 2015-2016 Will Bond <will@wbond.net>
-
-    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.
-"""
-from __future__ import absolute_import
-
-import platform
-from ctypes import (
-    CDLL,
-    CFUNCTYPE,
-    POINTER,
-    c_bool,
-    c_byte,
-    c_char_p,
-    c_int32,
-    c_long,
-    c_size_t,
-    c_uint32,
-    c_ulong,
-    c_void_p,
-)
-from ctypes.util import find_library
-
-from ...packages.six import raise_from
-
-if platform.system() != "Darwin":
-    raise ImportError("Only macOS is supported")
-
-version = platform.mac_ver()[0]
-version_info = tuple(map(int, version.split(".")))
-if version_info < (10, 8):
-    raise OSError(
-        "Only OS X 10.8 and newer are supported, not %s.%s"
-        % (version_info[0], version_info[1])
-    )
-
-
-def load_cdll(name, macos10_16_path):
-    """Loads a CDLL by name, falling back to known path on 10.16+"""
-    try:
-        # Big Sur is technically 11 but we use 10.16 due to the Big Sur
-        # beta being labeled as 10.16.
-        if version_info >= (10, 16):
-            path = macos10_16_path
-        else:
-            path = find_library(name)
-        if not path:
-            raise OSError  # Caught and reraised as 'ImportError'
-        return CDLL(path, use_errno=True)
-    except OSError:
-        raise_from(ImportError("The library %s failed to load" % name), None)
-
-
-Security = load_cdll(
-    "Security", "/System/Library/Frameworks/Security.framework/Security"
-)
-CoreFoundation = load_cdll(
-    "CoreFoundation",
-    "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation",
-)
-
-
-Boolean = c_bool
-CFIndex = c_long
-CFStringEncoding = c_uint32
-CFData = c_void_p
-CFString = c_void_p
-CFArray = c_void_p
-CFMutableArray = c_void_p
-CFDictionary = c_void_p
-CFError = c_void_p
-CFType = c_void_p
-CFTypeID = c_ulong
-
-CFTypeRef = POINTER(CFType)
-CFAllocatorRef = c_void_p
-
-OSStatus = c_int32
-
-CFDataRef = POINTER(CFData)
-CFStringRef = POINTER(CFString)
-CFArrayRef = POINTER(CFArray)
-CFMutableArrayRef = POINTER(CFMutableArray)
-CFDictionaryRef = POINTER(CFDictionary)
-CFArrayCallBacks = c_void_p
-CFDictionaryKeyCallBacks = c_void_p
-CFDictionaryValueCallBacks = c_void_p
-
-SecCertificateRef = POINTER(c_void_p)
-SecExternalFormat = c_uint32
-SecExternalItemType = c_uint32
-SecIdentityRef = POINTER(c_void_p)
-SecItemImportExportFlags = c_uint32
-SecItemImportExportKeyParameters = c_void_p
-SecKeychainRef = POINTER(c_void_p)
-SSLProtocol = c_uint32
-SSLCipherSuite = c_uint32
-SSLContextRef = POINTER(c_void_p)
-SecTrustRef = POINTER(c_void_p)
-SSLConnectionRef = c_uint32
-SecTrustResultType = c_uint32
-SecTrustOptionFlags = c_uint32
-SSLProtocolSide = c_uint32
-SSLConnectionType = c_uint32
-SSLSessionOption = c_uint32
-
-
-try:
-    Security.SecItemImport.argtypes = [
-        CFDataRef,
-        CFStringRef,
-        POINTER(SecExternalFormat),
-        POINTER(SecExternalItemType),
-        SecItemImportExportFlags,
-        POINTER(SecItemImportExportKeyParameters),
-        SecKeychainRef,
-        POINTER(CFArrayRef),
-    ]
-    Security.SecItemImport.restype = OSStatus
-
-    Security.SecCertificateGetTypeID.argtypes = []
-    Security.SecCertificateGetTypeID.restype = CFTypeID
-
-    Security.SecIdentityGetTypeID.argtypes = []
-    Security.SecIdentityGetTypeID.restype = CFTypeID
-
-    Security.SecKeyGetTypeID.argtypes = []
-    Security.SecKeyGetTypeID.restype = CFTypeID
-
-    Security.SecCertificateCreateWithData.argtypes = [CFAllocatorRef, CFDataRef]
-    Security.SecCertificateCreateWithData.restype = SecCertificateRef
-
-    Security.SecCertificateCopyData.argtypes = [SecCertificateRef]
-    Security.SecCertificateCopyData.restype = CFDataRef
-
-    Security.SecCopyErrorMessageString.argtypes = [OSStatus, c_void_p]
-    Security.SecCopyErrorMessageString.restype = CFStringRef
-
-    Security.SecIdentityCreateWithCertificate.argtypes = [
-        CFTypeRef,
-        SecCertificateRef,
-        POINTER(SecIdentityRef),
-    ]
-    Security.SecIdentityCreateWithCertificate.restype = OSStatus
-
-    Security.SecKeychainCreate.argtypes = [
-        c_char_p,
-        c_uint32,
-        c_void_p,
-        Boolean,
-        c_void_p,
-        POINTER(SecKeychainRef),
-    ]
-    Security.SecKeychainCreate.restype = OSStatus
-
-    Security.SecKeychainDelete.argtypes = [SecKeychainRef]
-    Security.SecKeychainDelete.restype = OSStatus
-
-    Security.SecPKCS12Import.argtypes = [
-        CFDataRef,
-        CFDictionaryRef,
-        POINTER(CFArrayRef),
-    ]
-    Security.SecPKCS12Import.restype = OSStatus
-
-    SSLReadFunc = CFUNCTYPE(OSStatus, SSLConnectionRef, c_void_p, POINTER(c_size_t))
-    SSLWriteFunc = CFUNCTYPE(
-        OSStatus, SSLConnectionRef, POINTER(c_byte), POINTER(c_size_t)
-    )
-
-    Security.SSLSetIOFuncs.argtypes = [SSLContextRef, SSLReadFunc, SSLWriteFunc]
-    Security.SSLSetIOFuncs.restype = OSStatus
-
-    Security.SSLSetPeerID.argtypes = [SSLContextRef, c_char_p, c_size_t]
-    Security.SSLSetPeerID.restype = OSStatus
-
-    Security.SSLSetCertificate.argtypes = [SSLContextRef, CFArrayRef]
-    Security.SSLSetCertificate.restype = OSStatus
-
-    Security.SSLSetCertificateAuthorities.argtypes = [SSLContextRef, CFTypeRef, Boolean]
-    Security.SSLSetCertificateAuthorities.restype = OSStatus
-
-    Security.SSLSetConnection.argtypes = [SSLContextRef, SSLConnectionRef]
-    Security.SSLSetConnection.restype = OSStatus
-
-    Security.SSLSetPeerDomainName.argtypes = [SSLContextRef, c_char_p, c_size_t]
-    Security.SSLSetPeerDomainName.restype = OSStatus
-
-    Security.SSLHandshake.argtypes = [SSLContextRef]
-    Security.SSLHandshake.restype = OSStatus
-
-    Security.SSLRead.argtypes = [SSLContextRef, c_char_p, c_size_t, POINTER(c_size_t)]
-    Security.SSLRead.restype = OSStatus
-
-    Security.SSLWrite.argtypes = [SSLContextRef, c_char_p, c_size_t, POINTER(c_size_t)]
-    Security.SSLWrite.restype = OSStatus
-
-    Security.SSLClose.argtypes = [SSLContextRef]
-    Security.SSLClose.restype = OSStatus
-
-    Security.SSLGetNumberSupportedCiphers.argtypes = [SSLContextRef, POINTER(c_size_t)]
-    Security.SSLGetNumberSupportedCiphers.restype = OSStatus
-
-    Security.SSLGetSupportedCiphers.argtypes = [
-        SSLContextRef,
-        POINTER(SSLCipherSuite),
-        POINTER(c_size_t),
-    ]
-    Security.SSLGetSupportedCiphers.restype = OSStatus
-
-    Security.SSLSetEnabledCiphers.argtypes = [
-        SSLContextRef,
-        POINTER(SSLCipherSuite),
-        c_size_t,
-    ]
-    Security.SSLSetEnabledCiphers.restype = OSStatus
-
-    Security.SSLGetNumberEnabledCiphers.argtype = [SSLContextRef, POINTER(c_size_t)]
-    Security.SSLGetNumberEnabledCiphers.restype = OSStatus
-
-    Security.SSLGetEnabledCiphers.argtypes = [
-        SSLContextRef,
-        POINTER(SSLCipherSuite),
-        POINTER(c_size_t),
-    ]
-    Security.SSLGetEnabledCiphers.restype = OSStatus
-
-    Security.SSLGetNegotiatedCipher.argtypes = [SSLContextRef, POINTER(SSLCipherSuite)]
-    Security.SSLGetNegotiatedCipher.restype = OSStatus
-
-    Security.SSLGetNegotiatedProtocolVersion.argtypes = [
-        SSLContextRef,
-        POINTER(SSLProtocol),
-    ]
-    Security.SSLGetNegotiatedProtocolVersion.restype = OSStatus
-
-    Security.SSLCopyPeerTrust.argtypes = [SSLContextRef, POINTER(SecTrustRef)]
-    Security.SSLCopyPeerTrust.restype = OSStatus
-
-    Security.SecTrustSetAnchorCertificates.argtypes = [SecTrustRef, CFArrayRef]
-    Security.SecTrustSetAnchorCertificates.restype = OSStatus
-
-    Security.SecTrustSetAnchorCertificatesOnly.argstypes = [SecTrustRef, Boolean]
-    Security.SecTrustSetAnchorCertificatesOnly.restype = OSStatus
-
-    Security.SecTrustEvaluate.argtypes = [SecTrustRef, POINTER(SecTrustResultType)]
-    Security.SecTrustEvaluate.restype = OSStatus
-
-    Security.SecTrustGetCertificateCount.argtypes = [SecTrustRef]
-    Security.SecTrustGetCertificateCount.restype = CFIndex
-
-    Security.SecTrustGetCertificateAtIndex.argtypes = [SecTrustRef, CFIndex]
-    Security.SecTrustGetCertificateAtIndex.restype = SecCertificateRef
-
-    Security.SSLCreateContext.argtypes = [
-        CFAllocatorRef,
-        SSLProtocolSide,
-        SSLConnectionType,
-    ]
-    Security.SSLCreateContext.restype = SSLContextRef
-
-    Security.SSLSetSessionOption.argtypes = [SSLContextRef, SSLSessionOption, Boolean]
-    Security.SSLSetSessionOption.restype = OSStatus
-
-    Security.SSLSetProtocolVersionMin.argtypes = [SSLContextRef, SSLProtocol]
-    Security.SSLSetProtocolVersionMin.restype = OSStatus
-
-    Security.SSLSetProtocolVersionMax.argtypes = [SSLContextRef, SSLProtocol]
-    Security.SSLSetProtocolVersionMax.restype = OSStatus
-
-    try:
-        Security.SSLSetALPNProtocols.argtypes = [SSLContextRef, CFArrayRef]
-        Security.SSLSetALPNProtocols.restype = OSStatus
-    except AttributeError:
-        # Supported only in 10.12+
-        pass
-
-    Security.SecCopyErrorMessageString.argtypes = [OSStatus, c_void_p]
-    Security.SecCopyErrorMessageString.restype = CFStringRef
-
-    Security.SSLReadFunc = SSLReadFunc
-    Security.SSLWriteFunc = SSLWriteFunc
-    Security.SSLContextRef = SSLContextRef
-    Security.SSLProtocol = SSLProtocol
-    Security.SSLCipherSuite = SSLCipherSuite
-    Security.SecIdentityRef = SecIdentityRef
-    Security.SecKeychainRef = SecKeychainRef
-    Security.SecTrustRef = SecTrustRef
-    Security.SecTrustResultType = SecTrustResultType
-    Security.SecExternalFormat = SecExternalFormat
-    Security.OSStatus = OSStatus
-
-    Security.kSecImportExportPassphrase = CFStringRef.in_dll(
-        Security, "kSecImportExportPassphrase"
-    )
-    Security.kSecImportItemIdentity = CFStringRef.in_dll(
-        Security, "kSecImportItemIdentity"
-    )
-
-    # CoreFoundation time!
-    CoreFoundation.CFRetain.argtypes = [CFTypeRef]
-    CoreFoundation.CFRetain.restype = CFTypeRef
-
-    CoreFoundation.CFRelease.argtypes = [CFTypeRef]
-    CoreFoundation.CFRelease.restype = None
-
-    CoreFoundation.CFGetTypeID.argtypes = [CFTypeRef]
-    CoreFoundation.CFGetTypeID.restype = CFTypeID
-
-    CoreFoundation.CFStringCreateWithCString.argtypes = [
-        CFAllocatorRef,
-        c_char_p,
-        CFStringEncoding,
-    ]
-    CoreFoundation.CFStringCreateWithCString.restype = CFStringRef
-
-    CoreFoundation.CFStringGetCStringPtr.argtypes = [CFStringRef, CFStringEncoding]
-    CoreFoundation.CFStringGetCStringPtr.restype = c_char_p
-
-    CoreFoundation.CFStringGetCString.argtypes = [
-        CFStringRef,
-        c_char_p,
-        CFIndex,
-        CFStringEncoding,
-    ]
-    CoreFoundation.CFStringGetCString.restype = c_bool
-
-    CoreFoundation.CFDataCreate.argtypes = [CFAllocatorRef, c_char_p, CFIndex]
-    CoreFoundation.CFDataCreate.restype = CFDataRef
-
-    CoreFoundation.CFDataGetLength.argtypes = [CFDataRef]
-    CoreFoundation.CFDataGetLength.restype = CFIndex
-
-    CoreFoundation.CFDataGetBytePtr.argtypes = [CFDataRef]
-    CoreFoundation.CFDataGetBytePtr.restype = c_void_p
-
-    CoreFoundation.CFDictionaryCreate.argtypes = [
-        CFAllocatorRef,
-        POINTER(CFTypeRef),
-        POINTER(CFTypeRef),
-        CFIndex,
-        CFDictionaryKeyCallBacks,
-        CFDictionaryValueCallBacks,
-    ]
-    CoreFoundation.CFDictionaryCreate.restype = CFDictionaryRef
-
-    CoreFoundation.CFDictionaryGetValue.argtypes = [CFDictionaryRef, CFTypeRef]
-    CoreFoundation.CFDictionaryGetValue.restype = CFTypeRef
-
-    CoreFoundation.CFArrayCreate.argtypes = [
-        CFAllocatorRef,
-        POINTER(CFTypeRef),
-        CFIndex,
-        CFArrayCallBacks,
-    ]
-    CoreFoundation.CFArrayCreate.restype = CFArrayRef
-
-    CoreFoundation.CFArrayCreateMutable.argtypes = [
-        CFAllocatorRef,
-        CFIndex,
-        CFArrayCallBacks,
-    ]
-    CoreFoundation.CFArrayCreateMutable.restype = CFMutableArrayRef
-
-    CoreFoundation.CFArrayAppendValue.argtypes = [CFMutableArrayRef, c_void_p]
-    CoreFoundation.CFArrayAppendValue.restype = None
-
-    CoreFoundation.CFArrayGetCount.argtypes = [CFArrayRef]
-    CoreFoundation.CFArrayGetCount.restype = CFIndex
-
-    CoreFoundation.CFArrayGetValueAtIndex.argtypes = [CFArrayRef, CFIndex]
-    CoreFoundation.CFArrayGetValueAtIndex.restype = c_void_p
-
-    CoreFoundation.kCFAllocatorDefault = CFAllocatorRef.in_dll(
-        CoreFoundation, "kCFAllocatorDefault"
-    )
-    CoreFoundation.kCFTypeArrayCallBacks = c_void_p.in_dll(
-        CoreFoundation, "kCFTypeArrayCallBacks"
-    )
-    CoreFoundation.kCFTypeDictionaryKeyCallBacks = c_void_p.in_dll(
-        CoreFoundation, "kCFTypeDictionaryKeyCallBacks"
-    )
-    CoreFoundation.kCFTypeDictionaryValueCallBacks = c_void_p.in_dll(
-        CoreFoundation, "kCFTypeDictionaryValueCallBacks"
-    )
-
-    CoreFoundation.CFTypeRef = CFTypeRef
-    CoreFoundation.CFArrayRef = CFArrayRef
-    CoreFoundation.CFStringRef = CFStringRef
-    CoreFoundation.CFDictionaryRef = CFDictionaryRef
-
-except (AttributeError):
-    raise ImportError("Error initializing ctypes")
-
-
-class CFConst(object):
-    """
-    A class object that acts as essentially a namespace for CoreFoundation
-    constants.
-    """
-
-    kCFStringEncodingUTF8 = CFStringEncoding(0x08000100)
-
-
-class SecurityConst(object):
-    """
-    A class object that acts as essentially a namespace for Security constants.
-    """
-
-    kSSLSessionOptionBreakOnServerAuth = 0
-
-    kSSLProtocol2 = 1
-    kSSLProtocol3 = 2
-    kTLSProtocol1 = 4
-    kTLSProtocol11 = 7
-    kTLSProtocol12 = 8
-    # SecureTransport does not support TLS 1.3 even if there's a constant for it
-    kTLSProtocol13 = 10
-    kTLSProtocolMaxSupported = 999
-
-    kSSLClientSide = 1
-    kSSLStreamType = 0
-
-    kSecFormatPEMSequence = 10
-
-    kSecTrustResultInvalid = 0
-    kSecTrustResultProceed = 1
-    # This gap is present on purpose: this was kSecTrustResultConfirm, which
-    # is deprecated.
-    kSecTrustResultDeny = 3
-    kSecTrustResultUnspecified = 4
-    kSecTrustResultRecoverableTrustFailure = 5
-    kSecTrustResultFatalTrustFailure = 6
-    kSecTrustResultOtherError = 7
-
-    errSSLProtocol = -9800
-    errSSLWouldBlock = -9803
-    errSSLClosedGraceful = -9805
-    errSSLClosedNoNotify = -9816
-    errSSLClosedAbort = -9806
-
-    errSSLXCertChainInvalid = -9807
-    errSSLCrypto = -9809
-    errSSLInternal = -9810
-    errSSLCertExpired = -9814
-    errSSLCertNotYetValid = -9815
-    errSSLUnknownRootCert = -9812
-    errSSLNoRootCert = -9813
-    errSSLHostNameMismatch = -9843
-    errSSLPeerHandshakeFail = -9824
-    errSSLPeerUserCancelled = -9839
-    errSSLWeakPeerEphemeralDHKey = -9850
-    errSSLServerAuthCompleted = -9841
-    errSSLRecordOverflow = -9847
-
-    errSecVerifyFailed = -67808
-    errSecNoTrustSettings = -25263
-    errSecItemNotFound = -25300
-    errSecInvalidTrustSettings = -25262
-
-    # Cipher suites. We only pick the ones our default cipher string allows.
-    # Source: https://developer.apple.com/documentation/security/1550981-ssl_cipher_suite_values
-    TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 = 0xC02C
-    TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 = 0xC030
-    TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 = 0xC02B
-    TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 = 0xC02F
-    TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 = 0xCCA9
-    TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 = 0xCCA8
-    TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 = 0x009F
-    TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 = 0x009E
-    TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384 = 0xC024
-    TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384 = 0xC028
-    TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA = 0xC00A
-    TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA = 0xC014
-    TLS_DHE_RSA_WITH_AES_256_CBC_SHA256 = 0x006B
-    TLS_DHE_RSA_WITH_AES_256_CBC_SHA = 0x0039
-    TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 = 0xC023
-    TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 = 0xC027
-    TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA = 0xC009
-    TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA = 0xC013
-    TLS_DHE_RSA_WITH_AES_128_CBC_SHA256 = 0x0067
-    TLS_DHE_RSA_WITH_AES_128_CBC_SHA = 0x0033
-    TLS_RSA_WITH_AES_256_GCM_SHA384 = 0x009D
-    TLS_RSA_WITH_AES_128_GCM_SHA256 = 0x009C
-    TLS_RSA_WITH_AES_256_CBC_SHA256 = 0x003D
-    TLS_RSA_WITH_AES_128_CBC_SHA256 = 0x003C
-    TLS_RSA_WITH_AES_256_CBC_SHA = 0x0035
-    TLS_RSA_WITH_AES_128_CBC_SHA = 0x002F
-    TLS_AES_128_GCM_SHA256 = 0x1301
-    TLS_AES_256_GCM_SHA384 = 0x1302
-    TLS_AES_128_CCM_8_SHA256 = 0x1305
-    TLS_AES_128_CCM_SHA256 = 0x1304
diff --git a/lib/urllib3/contrib/_securetransport/low_level.py b/lib/urllib3/contrib/_securetransport/low_level.py
deleted file mode 100644
index fa0b245d..00000000
--- a/lib/urllib3/contrib/_securetransport/low_level.py
+++ /dev/null
@@ -1,397 +0,0 @@
-"""
-Low-level helpers for the SecureTransport bindings.
-
-These are Python functions that are not directly related to the high-level APIs
-but are necessary to get them to work. They include a whole bunch of low-level
-CoreFoundation messing about and memory management. The concerns in this module
-are almost entirely about trying to avoid memory leaks and providing
-appropriate and useful assistance to the higher-level code.
-"""
-import base64
-import ctypes
-import itertools
-import os
-import re
-import ssl
-import struct
-import tempfile
-
-from .bindings import CFConst, CoreFoundation, Security
-
-# This regular expression is used to grab PEM data out of a PEM bundle.
-_PEM_CERTS_RE = re.compile(
-    b"-----BEGIN CERTIFICATE-----\n(.*?)\n-----END CERTIFICATE-----", re.DOTALL
-)
-
-
-def _cf_data_from_bytes(bytestring):
-    """
-    Given a bytestring, create a CFData object from it. This CFData object must
-    be CFReleased by the caller.
-    """
-    return CoreFoundation.CFDataCreate(
-        CoreFoundation.kCFAllocatorDefault, bytestring, len(bytestring)
-    )
-
-
-def _cf_dictionary_from_tuples(tuples):
-    """
-    Given a list of Python tuples, create an associated CFDictionary.
-    """
-    dictionary_size = len(tuples)
-
-    # We need to get the dictionary keys and values out in the same order.
-    keys = (t[0] for t in tuples)
-    values = (t[1] for t in tuples)
-    cf_keys = (CoreFoundation.CFTypeRef * dictionary_size)(*keys)
-    cf_values = (CoreFoundation.CFTypeRef * dictionary_size)(*values)
-
-    return CoreFoundation.CFDictionaryCreate(
-        CoreFoundation.kCFAllocatorDefault,
-        cf_keys,
-        cf_values,
-        dictionary_size,
-        CoreFoundation.kCFTypeDictionaryKeyCallBacks,
-        CoreFoundation.kCFTypeDictionaryValueCallBacks,
-    )
-
-
-def _cfstr(py_bstr):
-    """
-    Given a Python binary data, create a CFString.
-    The string must be CFReleased by the caller.
-    """
-    c_str = ctypes.c_char_p(py_bstr)
-    cf_str = CoreFoundation.CFStringCreateWithCString(
-        CoreFoundation.kCFAllocatorDefault,
-        c_str,
-        CFConst.kCFStringEncodingUTF8,
-    )
-    return cf_str
-
-
-def _create_cfstring_array(lst):
-    """
-    Given a list of Python binary data, create an associated CFMutableArray.
-    The array must be CFReleased by the caller.
-
-    Raises an ssl.SSLError on failure.
-    """
-    cf_arr = None
-    try:
-        cf_arr = CoreFoundation.CFArrayCreateMutable(
-            CoreFoundation.kCFAllocatorDefault,
-            0,
-            ctypes.byref(CoreFoundation.kCFTypeArrayCallBacks),
-        )
-        if not cf_arr:
-            raise MemoryError("Unable to allocate memory!")
-        for item in lst:
-            cf_str = _cfstr(item)
-            if not cf_str:
-                raise MemoryError("Unable to allocate memory!")
-            try:
-                CoreFoundation.CFArrayAppendValue(cf_arr, cf_str)
-            finally:
-                CoreFoundation.CFRelease(cf_str)
-    except BaseException as e:
-        if cf_arr:
-            CoreFoundation.CFRelease(cf_arr)
-        raise ssl.SSLError("Unable to allocate array: %s" % (e,))
-    return cf_arr
-
-
-def _cf_string_to_unicode(value):
-    """
-    Creates a Unicode string from a CFString object. Used entirely for error
-    reporting.
-
-    Yes, it annoys me quite a lot that this function is this complex.
-    """
-    value_as_void_p = ctypes.cast(value, ctypes.POINTER(ctypes.c_void_p))
-
-    string = CoreFoundation.CFStringGetCStringPtr(
-        value_as_void_p, CFConst.kCFStringEncodingUTF8
-    )
-    if string is None:
-        buffer = ctypes.create_string_buffer(1024)
-        result = CoreFoundation.CFStringGetCString(
-            value_as_void_p, buffer, 1024, CFConst.kCFStringEncodingUTF8
-        )
-        if not result:
-            raise OSError("Error copying C string from CFStringRef")
-        string = buffer.value
-    if string is not None:
-        string = string.decode("utf-8")
-    return string
-
-
-def _assert_no_error(error, exception_class=None):
-    """
-    Checks the return code and throws an exception if there is an error to
-    report
-    """
-    if error == 0:
-        return
-
-    cf_error_string = Security.SecCopyErrorMessageString(error, None)
-    output = _cf_string_to_unicode(cf_error_string)
-    CoreFoundation.CFRelease(cf_error_string)
-
-    if output is None or output == u"":
-        output = u"OSStatus %s" % error
-
-    if exception_class is None:
-        exception_class = ssl.SSLError
-
-    raise exception_class(output)
-
-
-def _cert_array_from_pem(pem_bundle):
-    """
-    Given a bundle of certs in PEM format, turns them into a CFArray of certs
-    that can be used to validate a cert chain.
-    """
-    # Normalize the PEM bundle's line endings.
-    pem_bundle = pem_bundle.replace(b"\r\n", b"\n")
-
-    der_certs = [
-        base64.b64decode(match.group(1)) for match in _PEM_CERTS_RE.finditer(pem_bundle)
-    ]
-    if not der_certs:
-        raise ssl.SSLError("No root certificates specified")
-
-    cert_array = CoreFoundation.CFArrayCreateMutable(
-        CoreFoundation.kCFAllocatorDefault,
-        0,
-        ctypes.byref(CoreFoundation.kCFTypeArrayCallBacks),
-    )
-    if not cert_array:
-        raise ssl.SSLError("Unable to allocate memory!")
-
-    try:
-        for der_bytes in der_certs:
-            certdata = _cf_data_from_bytes(der_bytes)
-            if not certdata:
-                raise ssl.SSLError("Unable to allocate memory!")
-            cert = Security.SecCertificateCreateWithData(
-                CoreFoundation.kCFAllocatorDefault, certdata
-            )
-            CoreFoundation.CFRelease(certdata)
-            if not cert:
-                raise ssl.SSLError("Unable to build cert object!")
-
-            CoreFoundation.CFArrayAppendValue(cert_array, cert)
-            CoreFoundation.CFRelease(cert)
-    except Exception:
-        # We need to free the array before the exception bubbles further.
-        # We only want to do that if an error occurs: otherwise, the caller
-        # should free.
-        CoreFoundation.CFRelease(cert_array)
-        raise
-
-    return cert_array
-
-
-def _is_cert(item):
-    """
-    Returns True if a given CFTypeRef is a certificate.
-    """
-    expected = Security.SecCertificateGetTypeID()
-    return CoreFoundation.CFGetTypeID(item) == expected
-
-
-def _is_identity(item):
-    """
-    Returns True if a given CFTypeRef is an identity.
-    """
-    expected = Security.SecIdentityGetTypeID()
-    return CoreFoundation.CFGetTypeID(item) == expected
-
-
-def _temporary_keychain():
-    """
-    This function creates a temporary Mac keychain that we can use to work with
-    credentials. This keychain uses a one-time password and a temporary file to
-    store the data. We expect to have one keychain per socket. The returned
-    SecKeychainRef must be freed by the caller, including calling
-    SecKeychainDelete.
-
-    Returns a tuple of the SecKeychainRef and the path to the temporary
-    directory that contains it.
-    """
-    # Unfortunately, SecKeychainCreate requires a path to a keychain. This
-    # means we cannot use mkstemp to use a generic temporary file. Instead,
-    # we're going to create a temporary directory and a filename to use there.
-    # This filename will be 8 random bytes expanded into base64. We also need
-    # some random bytes to password-protect the keychain we're creating, so we
-    # ask for 40 random bytes.
-    random_bytes = os.urandom(40)
-    filename = base64.b16encode(random_bytes[:8]).decode("utf-8")
-    password = base64.b16encode(random_bytes[8:])  # Must be valid UTF-8
-    tempdirectory = tempfile.mkdtemp()
-
-    keychain_path = os.path.join(tempdirectory, filename).encode("utf-8")
-
-    # We now want to create the keychain itself.
-    keychain = Security.SecKeychainRef()
-    status = Security.SecKeychainCreate(
-        keychain_path, len(password), password, False, None, ctypes.byref(keychain)
-    )
-    _assert_no_error(status)
-
-    # Having created the keychain, we want to pass it off to the caller.
-    return keychain, tempdirectory
-
-
-def _load_items_from_file(keychain, path):
-    """
-    Given a single file, loads all the trust objects from it into arrays and
-    the keychain.
-    Returns a tuple of lists: the first list is a list of identities, the
-    second a list of certs.
-    """
-    certificates = []
-    identities = []
-    result_array = None
-
-    with open(path, "rb") as f:
-        raw_filedata = f.read()
-
-    try:
-        filedata = CoreFoundation.CFDataCreate(
-            CoreFoundation.kCFAllocatorDefault, raw_filedata, len(raw_filedata)
-        )
-        result_array = CoreFoundation.CFArrayRef()
-        result = Security.SecItemImport(
-            filedata,  # cert data
-            None,  # Filename, leaving it out for now
-            None,  # What the type of the file is, we don't care
-            None,  # what's in the file, we don't care
-            0,  # import flags
-            None,  # key params, can include passphrase in the future
-            keychain,  # The keychain to insert into
-            ctypes.byref(result_array),  # Results
-        )
-        _assert_no_error(result)
-
-        # A CFArray is not very useful to us as an intermediary
-        # representation, so we are going to extract the objects we want
-        # and then free the array. We don't need to keep hold of keys: the
-        # keychain already has them!
-        result_count = CoreFoundation.CFArrayGetCount(result_array)
-        for index in range(result_count):
-            item = CoreFoundation.CFArrayGetValueAtIndex(result_array, index)
-            item = ctypes.cast(item, CoreFoundation.CFTypeRef)
-
-            if _is_cert(item):
-                CoreFoundation.CFRetain(item)
-                certificates.append(item)
-            elif _is_identity(item):
-                CoreFoundation.CFRetain(item)
-                identities.append(item)
-    finally:
-        if result_array:
-            CoreFoundation.CFRelease(result_array)
-
-        CoreFoundation.CFRelease(filedata)
-
-    return (identities, certificates)
-
-
-def _load_client_cert_chain(keychain, *paths):
-    """
-    Load certificates and maybe keys from a number of files. Has the end goal
-    of returning a CFArray containing one SecIdentityRef, and then zero or more
-    SecCertificateRef objects, suitable for use as a client certificate trust
-    chain.
-    """
-    # Ok, the strategy.
-    #
-    # This relies on knowing that macOS will not give you a SecIdentityRef
-    # unless you have imported a key into a keychain. This is a somewhat
-    # artificial limitation of macOS (for example, it doesn't necessarily
-    # affect iOS), but there is nothing inside Security.framework that lets you
-    # get a SecIdentityRef without having a key in a keychain.
-    #
-    # So the policy here is we take all the files and iterate them in order.
-    # Each one will use SecItemImport to have one or more objects loaded from
-    # it. We will also point at a keychain that macOS can use to work with the
-    # private key.
-    #
-    # Once we have all the objects, we'll check what we actually have. If we
-    # already have a SecIdentityRef in hand, fab: we'll use that. Otherwise,
-    # we'll take the first certificate (which we assume to be our leaf) and
-    # ask the keychain to give us a SecIdentityRef with that cert's associated
-    # key.
-    #
-    # We'll then return a CFArray containing the trust chain: one
-    # SecIdentityRef and then zero-or-more SecCertificateRef objects. The
-    # responsibility for freeing this CFArray will be with the caller. This
-    # CFArray must remain alive for the entire connection, so in practice it
-    # will be stored with a single SSLSocket, along with the reference to the
-    # keychain.
-    certificates = []
-    identities = []
-
-    # Filter out bad paths.
-    paths = (path for path in paths if path)
-
-    try:
-        for file_path in paths:
-            new_identities, new_certs = _load_items_from_file(keychain, file_path)
-            identities.extend(new_identities)
-            certificates.extend(new_certs)
-
-        # Ok, we have everything. The question is: do we have an identity? If
-        # not, we want to grab one from the first cert we have.
-        if not identities:
-            new_identity = Security.SecIdentityRef()
-            status = Security.SecIdentityCreateWithCertificate(
-                keychain, certificates[0], ctypes.byref(new_identity)
-            )
-            _assert_no_error(status)
-            identities.append(new_identity)
-
-            # We now want to release the original certificate, as we no longer
-            # need it.
-            CoreFoundation.CFRelease(certificates.pop(0))
-
-        # We now need to build a new CFArray that holds the trust chain.
-        trust_chain = CoreFoundation.CFArrayCreateMutable(
-            CoreFoundation.kCFAllocatorDefault,
-            0,
-            ctypes.byref(CoreFoundation.kCFTypeArrayCallBacks),
-        )
-        for item in itertools.chain(identities, certificates):
-            # ArrayAppendValue does a CFRetain on the item. That's fine,
-            # because the finally block will release our other refs to them.
-            CoreFoundation.CFArrayAppendValue(trust_chain, item)
-
-        return trust_chain
-    finally:
-        for obj in itertools.chain(identities, certificates):
-            CoreFoundation.CFRelease(obj)
-
-
-TLS_PROTOCOL_VERSIONS = {
-    "SSLv2": (0, 2),
-    "SSLv3": (3, 0),
-    "TLSv1": (3, 1),
-    "TLSv1.1": (3, 2),
-    "TLSv1.2": (3, 3),
-}
-
-
-def _build_tls_unknown_ca_alert(version):
-    """
-    Builds a TLS alert record for an unknown CA.
-    """
-    ver_maj, ver_min = TLS_PROTOCOL_VERSIONS[version]
-    severity_fatal = 0x02
-    description_unknown_ca = 0x30
-    msg = struct.pack(">BB", severity_fatal, description_unknown_ca)
-    msg_len = len(msg)
-    record_type_alert = 0x15
-    record = struct.pack(">BBBH", record_type_alert, ver_maj, ver_min, msg_len) + msg
-    return record
diff --git a/lib/urllib3/contrib/appengine.py b/lib/urllib3/contrib/appengine.py
deleted file mode 100644
index a5a6d910..00000000
--- a/lib/urllib3/contrib/appengine.py
+++ /dev/null
@@ -1,314 +0,0 @@
-"""
-This module provides a pool manager that uses Google App Engine's
-`URLFetch Service <https://cloud.google.com/appengine/docs/python/urlfetch>`_.
-
-Example usage::
-
-    from urllib3 import PoolManager
-    from urllib3.contrib.appengine import AppEngineManager, is_appengine_sandbox
-
-    if is_appengine_sandbox():
-        # AppEngineManager uses AppEngine's URLFetch API behind the scenes
-        http = AppEngineManager()
-    else:
-        # PoolManager uses a socket-level API behind the scenes
-        http = PoolManager()
-
-    r = http.request('GET', 'https://google.com/')
-
-There are `limitations <https://cloud.google.com/appengine/docs/python/\
-urlfetch/#Python_Quotas_and_limits>`_ to the URLFetch service and it may not be
-the best choice for your application. There are three options for using
-urllib3 on Google App Engine:
-
-1. You can use :class:`AppEngineManager` with URLFetch. URLFetch is
-   cost-effective in many circumstances as long as your usage is within the
-   limitations.
-2. You can use a normal :class:`~urllib3.PoolManager` by enabling sockets.
-   Sockets also have `limitations and restrictions
-   <https://cloud.google.com/appengine/docs/python/sockets/\
-   #limitations-and-restrictions>`_ and have a lower free quota than URLFetch.
-   To use sockets, be sure to specify the following in your ``app.yaml``::
-
-        env_variables:
-            GAE_USE_SOCKETS_HTTPLIB : 'true'
-
-3. If you are using `App Engine Flexible
-<https://cloud.google.com/appengine/docs/flexible/>`_, you can use the standard
-:class:`PoolManager` without any configuration or special environment variables.
-"""
-
-from __future__ import absolute_import
-
-import io
-import logging
-import warnings
-
-from ..exceptions import (
-    HTTPError,
-    HTTPWarning,
-    MaxRetryError,
-    ProtocolError,
-    SSLError,
-    TimeoutError,
-)
-from ..packages.six.moves.urllib.parse import urljoin
-from ..request import RequestMethods
-from ..response import HTTPResponse
-from ..util.retry import Retry
-from ..util.timeout import Timeout
-from . import _appengine_environ
-
-try:
-    from google.appengine.api import urlfetch
-except ImportError:
-    urlfetch = None
-
-
-log = logging.getLogger(__name__)
-
-
-class AppEnginePlatformWarning(HTTPWarning):
-    pass
-
-
-class AppEnginePlatformError(HTTPError):
-    pass
-
-
-class AppEngineManager(RequestMethods):
-    """
-    Connection manager for Google App Engine sandbox applications.
-
-    This manager uses the URLFetch service directly instead of using the
-    emulated httplib, and is subject to URLFetch limitations as described in
-    the App Engine documentation `here
-    <https://cloud.google.com/appengine/docs/python/urlfetch>`_.
-
-    Notably it will raise an :class:`AppEnginePlatformError` if:
-        * URLFetch is not available.
-        * If you attempt to use this on App Engine Flexible, as full socket
-          support is available.
-        * If a request size is more than 10 megabytes.
-        * If a response size is more than 32 megabytes.
-        * If you use an unsupported request method such as OPTIONS.
-
-    Beyond those cases, it will raise normal urllib3 errors.
-    """
-
-    def __init__(
-        self,
-        headers=None,
-        retries=None,
-        validate_certificate=True,
-        urlfetch_retries=True,
-    ):
-        if not urlfetch:
-            raise AppEnginePlatformError(
-                "URLFetch is not available in this environment."
-            )
-
-        warnings.warn(
-            "urllib3 is using URLFetch on Google App Engine sandbox instead "
-            "of sockets. To use sockets directly instead of URLFetch see "
-            "https://urllib3.readthedocs.io/en/1.26.x/reference/urllib3.contrib.html.",
-            AppEnginePlatformWarning,
-        )
-
-        RequestMethods.__init__(self, headers)
-        self.validate_certificate = validate_certificate
-        self.urlfetch_retries = urlfetch_retries
-
-        self.retries = retries or Retry.DEFAULT
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        # Return False to re-raise any potential exceptions
-        return False
-
-    def urlopen(
-        self,
-        method,
-        url,
-        body=None,
-        headers=None,
-        retries=None,
-        redirect=True,
-        timeout=Timeout.DEFAULT_TIMEOUT,
-        **response_kw
-    ):
-
-        retries = self._get_retries(retries, redirect)
-
-        try:
-            follow_redirects = redirect and retries.redirect != 0 and retries.total
-            response = urlfetch.fetch(
-                url,
-                payload=body,
-                method=method,
-                headers=headers or {},
-                allow_truncated=False,
-                follow_redirects=self.urlfetch_retries and follow_redirects,
-                deadline=self._get_absolute_timeout(timeout),
-                validate_certificate=self.validate_certificate,
-            )
-        except urlfetch.DeadlineExceededError as e:
-            raise TimeoutError(self, e)
-
-        except urlfetch.InvalidURLError as e:
-            if "too large" in str(e):
-                raise AppEnginePlatformError(
-                    "URLFetch request too large, URLFetch only "
-                    "supports requests up to 10mb in size.",
-                    e,
-                )
-            raise ProtocolError(e)
-
-        except urlfetch.DownloadError as e:
-            if "Too many redirects" in str(e):
-                raise MaxRetryError(self, url, reason=e)
-            raise ProtocolError(e)
-
-        except urlfetch.ResponseTooLargeError as e:
-            raise AppEnginePlatformError(
-                "URLFetch response too large, URLFetch only supports"
-                "responses up to 32mb in size.",
-                e,
-            )
-
-        except urlfetch.SSLCertificateError as e:
-            raise SSLError(e)
-
-        except urlfetch.InvalidMethodError as e:
-            raise AppEnginePlatformError(
-                "URLFetch does not support method: %s" % method, e
-            )
-
-        http_response = self._urlfetch_response_to_http_response(
-            response, retries=retries, **response_kw
-        )
-
-        # Handle redirect?
-        redirect_location = redirect and http_response.get_redirect_location()
-        if redirect_location:
-            # Check for redirect response
-            if self.urlfetch_retries and retries.raise_on_redirect:
-                raise MaxRetryError(self, url, "too many redirects")
-            else:
-                if http_response.status == 303:
-                    method = "GET"
-
-                try:
-                    retries = retries.increment(
-                        method, url, response=http_response, _pool=self
-                    )
-                except MaxRetryError:
-                    if retries.raise_on_redirect:
-                        raise MaxRetryError(self, url, "too many redirects")
-                    return http_response
-
-                retries.sleep_for_retry(http_response)
-                log.debug("Redirecting %s -> %s", url, redirect_location)
-                redirect_url = urljoin(url, redirect_location)
-                return self.urlopen(
-                    method,
-                    redirect_url,
-                    body,
-                    headers,
-                    retries=retries,
-                    redirect=redirect,
-                    timeout=timeout,
-                    **response_kw
-                )
-
-        # Check if we should retry the HTTP response.
-        has_retry_after = bool(http_response.headers.get("Retry-After"))
-        if retries.is_retry(method, http_response.status, has_retry_after):
-            retries = retries.increment(method, url, response=http_response, _pool=self)
-            log.debug("Retry: %s", url)
-            retries.sleep(http_response)
-            return self.urlopen(
-                method,
-                url,
-                body=body,
-                headers=headers,
-                retries=retries,
-                redirect=redirect,
-                timeout=timeout,
-                **response_kw
-            )
-
-        return http_response
-
-    def _urlfetch_response_to_http_response(self, urlfetch_resp, **response_kw):
-
-        if is_prod_appengine():
-            # Production GAE handles deflate encoding automatically, but does
-            # not remove the encoding header.
-            content_encoding = urlfetch_resp.headers.get("content-encoding")
-
-            if content_encoding == "deflate":
-                del urlfetch_resp.headers["content-encoding"]
-
-        transfer_encoding = urlfetch_resp.headers.get("transfer-encoding")
-        # We have a full response's content,
-        # so let's make sure we don't report ourselves as chunked data.
-        if transfer_encoding == "chunked":
-            encodings = transfer_encoding.split(",")
-            encodings.remove("chunked")
-            urlfetch_resp.headers["transfer-encoding"] = ",".join(encodings)
-
-        original_response = HTTPResponse(
-            # In order for decoding to work, we must present the content as
-            # a file-like object.
-            body=io.BytesIO(urlfetch_resp.content),
-            msg=urlfetch_resp.header_msg,
-            headers=urlfetch_resp.headers,
-            status=urlfetch_resp.status_code,
-            **response_kw
-        )
-
-        return HTTPResponse(
-            body=io.BytesIO(urlfetch_resp.content),
-            headers=urlfetch_resp.headers,
-            status=urlfetch_resp.status_code,
-            original_response=original_response,
-            **response_kw
-        )
-
-    def _get_absolute_timeout(self, timeout):
-        if timeout is Timeout.DEFAULT_TIMEOUT:
-            return None  # Defer to URLFetch's default.
-        if isinstance(timeout, Timeout):
-            if timeout._read is not None or timeout._connect is not None:
-                warnings.warn(
-                    "URLFetch does not support granular timeout settings, "
-                    "reverting to total or default URLFetch timeout.",
-                    AppEnginePlatformWarning,
-                )
-            return timeout.total
-        return timeout
-
-    def _get_retries(self, retries, redirect):
-        if not isinstance(retries, Retry):
-            retries = Retry.from_int(retries, redirect=redirect, default=self.retries)
-
-        if retries.connect or retries.read or retries.redirect:
-            warnings.warn(
-                "URLFetch only supports total retries and does not "
-                "recognize connect, read, or redirect retry parameters.",
-                AppEnginePlatformWarning,
-            )
-
-        return retries
-
-
-# Alias methods from _appengine_environ to maintain public API interface.
-
-is_appengine = _appengine_environ.is_appengine
-is_appengine_sandbox = _appengine_environ.is_appengine_sandbox
-is_local_appengine = _appengine_environ.is_local_appengine
-is_prod_appengine = _appengine_environ.is_prod_appengine
-is_prod_appengine_mvms = _appengine_environ.is_prod_appengine_mvms
diff --git a/lib/urllib3/contrib/ntlmpool.py b/lib/urllib3/contrib/ntlmpool.py
deleted file mode 100644
index 47166575..00000000
--- a/lib/urllib3/contrib/ntlmpool.py
+++ /dev/null
@@ -1,130 +0,0 @@
-"""
-NTLM authenticating pool, contributed by erikcederstran
-
-Issue #10, see: http://code.google.com/p/urllib3/issues/detail?id=10
-"""
-from __future__ import absolute_import
-
-import warnings
-from logging import getLogger
-
-from ntlm import ntlm
-
-from .. import HTTPSConnectionPool
-from ..packages.six.moves.http_client import HTTPSConnection
-
-warnings.warn(
-    "The 'urllib3.contrib.ntlmpool' module is deprecated and will be removed "
-    "in urllib3 v2.0 release, urllib3 is not able to support it properly due "
-    "to reasons listed in issue: https://github.com/urllib3/urllib3/issues/2282. "
-    "If you are a user of this module please comment in the mentioned issue.",
-    DeprecationWarning,
-)
-
-log = getLogger(__name__)
-
-
-class NTLMConnectionPool(HTTPSConnectionPool):
-    """
-    Implements an NTLM authentication version of an urllib3 connection pool
-    """
-
-    scheme = "https"
-
-    def __init__(self, user, pw, authurl, *args, **kwargs):
-        """
-        authurl is a random URL on the server that is protected by NTLM.
-        user is the Windows user, probably in the DOMAIN\\username format.
-        pw is the password for the user.
-        """
-        super(NTLMConnectionPool, self).__init__(*args, **kwargs)
-        self.authurl = authurl
-        self.rawuser = user
-        user_parts = user.split("\\", 1)
-        self.domain = user_parts[0].upper()
-        self.user = user_parts[1]
-        self.pw = pw
-
-    def _new_conn(self):
-        # Performs the NTLM handshake that secures the connection. The socket
-        # must be kept open while requests are performed.
-        self.num_connections += 1
-        log.debug(
-            "Starting NTLM HTTPS connection no. %d: https://%s%s",
-            self.num_connections,
-            self.host,
-            self.authurl,
-        )
-
-        headers = {"Connection": "Keep-Alive"}
-        req_header = "Authorization"
-        resp_header = "www-authenticate"
-
-        conn = HTTPSConnection(host=self.host, port=self.port)
-
-        # Send negotiation message
-        headers[req_header] = "NTLM %s" % ntlm.create_NTLM_NEGOTIATE_MESSAGE(
-            self.rawuser
-        )
-        log.debug("Request headers: %s", headers)
-        conn.request("GET", self.authurl, None, headers)
-        res = conn.getresponse()
-        reshdr = dict(res.headers)
-        log.debug("Response status: %s %s", res.status, res.reason)
-        log.debug("Response headers: %s", reshdr)
-        log.debug("Response data: %s [...]", res.read(100))
-
-        # Remove the reference to the socket, so that it can not be closed by
-        # the response object (we want to keep the socket open)
-        res.fp = None
-
-        # Server should respond with a challenge message
-        auth_header_values = reshdr[resp_header].split(", ")
-        auth_header_value = None
-        for s in auth_header_values:
-            if s[:5] == "NTLM ":
-                auth_header_value = s[5:]
-        if auth_header_value is None:
-            raise Exception(
-                "Unexpected %s response header: %s" % (resp_header, reshdr[resp_header])
-            )
-
-        # Send authentication message
-        ServerChallenge, NegotiateFlags = ntlm.parse_NTLM_CHALLENGE_MESSAGE(
-            auth_header_value
-        )
-        auth_msg = ntlm.create_NTLM_AUTHENTICATE_MESSAGE(
-            ServerChallenge, self.user, self.domain, self.pw, NegotiateFlags
-        )
-        headers[req_header] = "NTLM %s" % auth_msg
-        log.debug("Request headers: %s", headers)
-        conn.request("GET", self.authurl, None, headers)
-        res = conn.getresponse()
-        log.debug("Response status: %s %s", res.status, res.reason)
-        log.debug("Response headers: %s", dict(res.headers))
-        log.debug("Response data: %s [...]", res.read()[:100])
-        if res.status != 200:
-            if res.status == 401:
-                raise Exception("Server rejected request: wrong username or password")
-            raise Exception("Wrong server response: %s %s" % (res.status, res.reason))
-
-        res.fp = None
-        log.debug("Connection established")
-        return conn
-
-    def urlopen(
-        self,
-        method,
-        url,
-        body=None,
-        headers=None,
-        retries=3,
-        redirect=True,
-        assert_same_host=True,
-    ):
-        if headers is None:
-            headers = {}
-        headers["Connection"] = "Keep-Alive"
-        return super(NTLMConnectionPool, self).urlopen(
-            method, url, body, headers, retries, redirect, assert_same_host
-        )
diff --git a/lib/urllib3/contrib/pyopenssl.py b/lib/urllib3/contrib/pyopenssl.py
deleted file mode 100644
index 1ed214b1..00000000
--- a/lib/urllib3/contrib/pyopenssl.py
+++ /dev/null
@@ -1,518 +0,0 @@
-"""
-TLS with SNI_-support for Python 2. Follow these instructions if you would
-like to verify TLS certificates in Python 2. Note, the default libraries do
-*not* do certificate checking; you need to do additional work to validate
-certificates yourself.
-
-This needs the following packages installed:
-
-* `pyOpenSSL`_ (tested with 16.0.0)
-* `cryptography`_ (minimum 1.3.4, from pyopenssl)
-* `idna`_ (minimum 2.0, from cryptography)
-
-However, pyopenssl depends on cryptography, which depends on idna, so while we
-use all three directly here we end up having relatively few packages required.
-
-You can install them with the following command:
-
-.. code-block:: bash
-
-    $ python -m pip install pyopenssl cryptography idna
-
-To activate certificate checking, call
-:func:`~urllib3.contrib.pyopenssl.inject_into_urllib3` from your Python code
-before you begin making HTTP requests. This can be done in a ``sitecustomize``
-module, or at any other time before your application begins using ``urllib3``,
-like this:
-
-.. code-block:: python
-
-    try:
-        import urllib3.contrib.pyopenssl
-        urllib3.contrib.pyopenssl.inject_into_urllib3()
-    except ImportError:
-        pass
-
-Now you can use :mod:`urllib3` as you normally would, and it will support SNI
-when the required modules are installed.
-
-Activating this module also has the positive side effect of disabling SSL/TLS
-compression in Python 2 (see `CRIME attack`_).
-
-.. _sni: https://en.wikipedia.org/wiki/Server_Name_Indication
-.. _crime attack: https://en.wikipedia.org/wiki/CRIME_(security_exploit)
-.. _pyopenssl: https://www.pyopenssl.org
-.. _cryptography: https://cryptography.io
-.. _idna: https://github.com/kjd/idna
-"""
-from __future__ import absolute_import
-
-import OpenSSL.crypto
-import OpenSSL.SSL
-from cryptography import x509
-from cryptography.hazmat.backends.openssl import backend as openssl_backend
-
-try:
-    from cryptography.x509 import UnsupportedExtension
-except ImportError:
-    # UnsupportedExtension is gone in cryptography >= 2.1.0
-    class UnsupportedExtension(Exception):
-        pass
-
-
-from io import BytesIO
-from socket import error as SocketError
-from socket import timeout
-
-try:  # Platform-specific: Python 2
-    from socket import _fileobject
-except ImportError:  # Platform-specific: Python 3
-    _fileobject = None
-    from ..packages.backports.makefile import backport_makefile
-
-import logging
-import ssl
-import sys
-import warnings
-
-from .. import util
-from ..packages import six
-from ..util.ssl_ import PROTOCOL_TLS_CLIENT
-
-warnings.warn(
-    "'urllib3.contrib.pyopenssl' module is deprecated and will be removed "
-    "in a future release of urllib3 2.x. Read more in this issue: "
-    "https://github.com/urllib3/urllib3/issues/2680",
-    category=DeprecationWarning,
-    stacklevel=2,
-)
-
-__all__ = ["inject_into_urllib3", "extract_from_urllib3"]
-
-# SNI always works.
-HAS_SNI = True
-
-# Map from urllib3 to PyOpenSSL compatible parameter-values.
-_openssl_versions = {
-    util.PROTOCOL_TLS: OpenSSL.SSL.SSLv23_METHOD,
-    PROTOCOL_TLS_CLIENT: OpenSSL.SSL.SSLv23_METHOD,
-    ssl.PROTOCOL_TLSv1: OpenSSL.SSL.TLSv1_METHOD,
-}
-
-if hasattr(ssl, "PROTOCOL_SSLv3") and hasattr(OpenSSL.SSL, "SSLv3_METHOD"):
-    _openssl_versions[ssl.PROTOCOL_SSLv3] = OpenSSL.SSL.SSLv3_METHOD
-
-if hasattr(ssl, "PROTOCOL_TLSv1_1") and hasattr(OpenSSL.SSL, "TLSv1_1_METHOD"):
-    _openssl_versions[ssl.PROTOCOL_TLSv1_1] = OpenSSL.SSL.TLSv1_1_METHOD
-
-if hasattr(ssl, "PROTOCOL_TLSv1_2") and hasattr(OpenSSL.SSL, "TLSv1_2_METHOD"):
-    _openssl_versions[ssl.PROTOCOL_TLSv1_2] = OpenSSL.SSL.TLSv1_2_METHOD
-
-
-_stdlib_to_openssl_verify = {
-    ssl.CERT_NONE: OpenSSL.SSL.VERIFY_NONE,
-    ssl.CERT_OPTIONAL: OpenSSL.SSL.VERIFY_PEER,
-    ssl.CERT_REQUIRED: OpenSSL.SSL.VERIFY_PEER
-    + OpenSSL.SSL.VERIFY_FAIL_IF_NO_PEER_CERT,
-}
-_openssl_to_stdlib_verify = dict((v, k) for k, v in _stdlib_to_openssl_verify.items())
-
-# OpenSSL will only write 16K at a time
-SSL_WRITE_BLOCKSIZE = 16384
-
-orig_util_HAS_SNI = util.HAS_SNI
-orig_util_SSLContext = util.ssl_.SSLContext
-
-
-log = logging.getLogger(__name__)
-
-
-def inject_into_urllib3():
-    "Monkey-patch urllib3 with PyOpenSSL-backed SSL-support."
-
-    _validate_dependencies_met()
-
-    util.SSLContext = PyOpenSSLContext
-    util.ssl_.SSLContext = PyOpenSSLContext
-    util.HAS_SNI = HAS_SNI
-    util.ssl_.HAS_SNI = HAS_SNI
-    util.IS_PYOPENSSL = True
-    util.ssl_.IS_PYOPENSSL = True
-
-
-def extract_from_urllib3():
-    "Undo monkey-patching by :func:`inject_into_urllib3`."
-
-    util.SSLContext = orig_util_SSLContext
-    util.ssl_.SSLContext = orig_util_SSLContext
-    util.HAS_SNI = orig_util_HAS_SNI
-    util.ssl_.HAS_SNI = orig_util_HAS_SNI
-    util.IS_PYOPENSSL = False
-    util.ssl_.IS_PYOPENSSL = False
-
-
-def _validate_dependencies_met():
-    """
-    Verifies that PyOpenSSL's package-level dependencies have been met.
-    Throws `ImportError` if they are not met.
-    """
-    # Method added in `cryptography==1.1`; not available in older versions
-    from cryptography.x509.extensions import Extensions
-
-    if getattr(Extensions, "get_extension_for_class", None) is None:
-        raise ImportError(
-            "'cryptography' module missing required functionality.  "
-            "Try upgrading to v1.3.4 or newer."
-        )
-
-    # pyOpenSSL 0.14 and above use cryptography for OpenSSL bindings. The _x509
-    # attribute is only present on those versions.
-    from OpenSSL.crypto import X509
-
-    x509 = X509()
-    if getattr(x509, "_x509", None) is None:
-        raise ImportError(
-            "'pyOpenSSL' module missing required functionality. "
-            "Try upgrading to v0.14 or newer."
-        )
-
-
-def _dnsname_to_stdlib(name):
-    """
-    Converts a dNSName SubjectAlternativeName field to the form used by the
-    standard library on the given Python version.
-
-    Cryptography produces a dNSName as a unicode string that was idna-decoded
-    from ASCII bytes. We need to idna-encode that string to get it back, and
-    then on Python 3 we also need to convert to unicode via UTF-8 (the stdlib
-    uses PyUnicode_FromStringAndSize on it, which decodes via UTF-8).
-
-    If the name cannot be idna-encoded then we return None signalling that
-    the name given should be skipped.
-    """
-
-    def idna_encode(name):
-        """
-        Borrowed wholesale from the Python Cryptography Project. It turns out
-        that we can't just safely call `idna.encode`: it can explode for
-        wildcard names. This avoids that problem.
-        """
-        import idna
-
-        try:
-            for prefix in [u"*.", u"."]:
-                if name.startswith(prefix):
-                    name = name[len(prefix) :]
-                    return prefix.encode("ascii") + idna.encode(name)
-            return idna.encode(name)
-        except idna.core.IDNAError:
-            return None
-
-    # Don't send IPv6 addresses through the IDNA encoder.
-    if ":" in name:
-        return name
-
-    name = idna_encode(name)
-    if name is None:
-        return None
-    elif sys.version_info >= (3, 0):
-        name = name.decode("utf-8")
-    return name
-
-
-def get_subj_alt_name(peer_cert):
-    """
-    Given an PyOpenSSL certificate, provides all the subject alternative names.
-    """
-    # Pass the cert to cryptography, which has much better APIs for this.
-    if hasattr(peer_cert, "to_cryptography"):
-        cert = peer_cert.to_cryptography()
-    else:
-        der = OpenSSL.crypto.dump_certificate(OpenSSL.crypto.FILETYPE_ASN1, peer_cert)
-        cert = x509.load_der_x509_certificate(der, openssl_backend)
-
-    # We want to find the SAN extension. Ask Cryptography to locate it (it's
-    # faster than looping in Python)
-    try:
-        ext = cert.extensions.get_extension_for_class(x509.SubjectAlternativeName).value
-    except x509.ExtensionNotFound:
-        # No such extension, return the empty list.
-        return []
-    except (
-        x509.DuplicateExtension,
-        UnsupportedExtension,
-        x509.UnsupportedGeneralNameType,
-        UnicodeError,
-    ) as e:
-        # A problem has been found with the quality of the certificate. Assume
-        # no SAN field is present.
-        log.warning(
-            "A problem was encountered with the certificate that prevented "
-            "urllib3 from finding the SubjectAlternativeName field. This can "
-            "affect certificate validation. The error was %s",
-            e,
-        )
-        return []
-
-    # We want to return dNSName and iPAddress fields. We need to cast the IPs
-    # back to strings because the match_hostname function wants them as
-    # strings.
-    # Sadly the DNS names need to be idna encoded and then, on Python 3, UTF-8
-    # decoded. This is pretty frustrating, but that's what the standard library
-    # does with certificates, and so we need to attempt to do the same.
-    # We also want to skip over names which cannot be idna encoded.
-    names = [
-        ("DNS", name)
-        for name in map(_dnsname_to_stdlib, ext.get_values_for_type(x509.DNSName))
-        if name is not None
-    ]
-    names.extend(
-        ("IP Address", str(name)) for name in ext.get_values_for_type(x509.IPAddress)
-    )
-
-    return names
-
-
-class WrappedSocket(object):
-    """API-compatibility wrapper for Python OpenSSL's Connection-class.
-
-    Note: _makefile_refs, _drop() and _reuse() are needed for the garbage
-    collector of pypy.
-    """
-
-    def __init__(self, connection, socket, suppress_ragged_eofs=True):
-        self.connection = connection
-        self.socket = socket
-        self.suppress_ragged_eofs = suppress_ragged_eofs
-        self._makefile_refs = 0
-        self._closed = False
-
-    def fileno(self):
-        return self.socket.fileno()
-
-    # Copy-pasted from Python 3.5 source code
-    def _decref_socketios(self):
-        if self._makefile_refs > 0:
-            self._makefile_refs -= 1
-        if self._closed:
-            self.close()
-
-    def recv(self, *args, **kwargs):
-        try:
-            data = self.connection.recv(*args, **kwargs)
-        except OpenSSL.SSL.SysCallError as e:
-            if self.suppress_ragged_eofs and e.args == (-1, "Unexpected EOF"):
-                return b""
-            else:
-                raise SocketError(str(e))
-        except OpenSSL.SSL.ZeroReturnError:
-            if self.connection.get_shutdown() == OpenSSL.SSL.RECEIVED_SHUTDOWN:
-                return b""
-            else:
-                raise
-        except OpenSSL.SSL.WantReadError:
-            if not util.wait_for_read(self.socket, self.socket.gettimeout()):
-                raise timeout("The read operation timed out")
-            else:
-                return self.recv(*args, **kwargs)
-
-        # TLS 1.3 post-handshake authentication
-        except OpenSSL.SSL.Error as e:
-            raise ssl.SSLError("read error: %r" % e)
-        else:
-            return data
-
-    def recv_into(self, *args, **kwargs):
-        try:
-            return self.connection.recv_into(*args, **kwargs)
-        except OpenSSL.SSL.SysCallError as e:
-            if self.suppress_ragged_eofs and e.args == (-1, "Unexpected EOF"):
-                return 0
-            else:
-                raise SocketError(str(e))
-        except OpenSSL.SSL.ZeroReturnError:
-            if self.connection.get_shutdown() == OpenSSL.SSL.RECEIVED_SHUTDOWN:
-                return 0
-            else:
-                raise
-        except OpenSSL.SSL.WantReadError:
-            if not util.wait_for_read(self.socket, self.socket.gettimeout()):
-                raise timeout("The read operation timed out")
-            else:
-                return self.recv_into(*args, **kwargs)
-
-        # TLS 1.3 post-handshake authentication
-        except OpenSSL.SSL.Error as e:
-            raise ssl.SSLError("read error: %r" % e)
-
-    def settimeout(self, timeout):
-        return self.socket.settimeout(timeout)
-
-    def _send_until_done(self, data):
-        while True:
-            try:
-                return self.connection.send(data)
-            except OpenSSL.SSL.WantWriteError:
-                if not util.wait_for_write(self.socket, self.socket.gettimeout()):
-                    raise timeout()
-                continue
-            except OpenSSL.SSL.SysCallError as e:
-                raise SocketError(str(e))
-
-    def sendall(self, data):
-        total_sent = 0
-        while total_sent < len(data):
-            sent = self._send_until_done(
-                data[total_sent : total_sent + SSL_WRITE_BLOCKSIZE]
-            )
-            total_sent += sent
-
-    def shutdown(self):
-        # FIXME rethrow compatible exceptions should we ever use this
-        self.connection.shutdown()
-
-    def close(self):
-        if self._makefile_refs < 1:
-            try:
-                self._closed = True
-                return self.connection.close()
-            except OpenSSL.SSL.Error:
-                return
-        else:
-            self._makefile_refs -= 1
-
-    def getpeercert(self, binary_form=False):
-        x509 = self.connection.get_peer_certificate()
-
-        if not x509:
-            return x509
-
-        if binary_form:
-            return OpenSSL.crypto.dump_certificate(OpenSSL.crypto.FILETYPE_ASN1, x509)
-
-        return {
-            "subject": ((("commonName", x509.get_subject().CN),),),
-            "subjectAltName": get_subj_alt_name(x509),
-        }
-
-    def version(self):
-        return self.connection.get_protocol_version_name()
-
-    def _reuse(self):
-        self._makefile_refs += 1
-
-    def _drop(self):
-        if self._makefile_refs < 1:
-            self.close()
-        else:
-            self._makefile_refs -= 1
-
-
-if _fileobject:  # Platform-specific: Python 2
-
-    def makefile(self, mode, bufsize=-1):
-        self._makefile_refs += 1
-        return _fileobject(self, mode, bufsize, close=True)
-
-else:  # Platform-specific: Python 3
-    makefile = backport_makefile
-
-WrappedSocket.makefile = makefile
-
-
-class PyOpenSSLContext(object):
-    """
-    I am a wrapper class for the PyOpenSSL ``Context`` object. I am responsible
-    for translating the interface of the standard library ``SSLContext`` object
-    to calls into PyOpenSSL.
-    """
-
-    def __init__(self, protocol):
-        self.protocol = _openssl_versions[protocol]
-        self._ctx = OpenSSL.SSL.Context(self.protocol)
-        self._options = 0
-        self.check_hostname = False
-
-    @property
-    def options(self):
-        return self._options
-
-    @options.setter
-    def options(self, value):
-        self._options = value
-        self._ctx.set_options(value)
-
-    @property
-    def verify_mode(self):
-        return _openssl_to_stdlib_verify[self._ctx.get_verify_mode()]
-
-    @verify_mode.setter
-    def verify_mode(self, value):
-        self._ctx.set_verify(_stdlib_to_openssl_verify[value], _verify_callback)
-
-    def set_default_verify_paths(self):
-        self._ctx.set_default_verify_paths()
-
-    def set_ciphers(self, ciphers):
-        if isinstance(ciphers, six.text_type):
-            ciphers = ciphers.encode("utf-8")
-        self._ctx.set_cipher_list(ciphers)
-
-    def load_verify_locations(self, cafile=None, capath=None, cadata=None):
-        if cafile is not None:
-            cafile = cafile.encode("utf-8")
-        if capath is not None:
-            capath = capath.encode("utf-8")
-        try:
-            self._ctx.load_verify_locations(cafile, capath)
-            if cadata is not None:
-                self._ctx.load_verify_locations(BytesIO(cadata))
-        except OpenSSL.SSL.Error as e:
-            raise ssl.SSLError("unable to load trusted certificates: %r" % e)
-
-    def load_cert_chain(self, certfile, keyfile=None, password=None):
-        self._ctx.use_certificate_chain_file(certfile)
-        if password is not None:
-            if not isinstance(password, six.binary_type):
-                password = password.encode("utf-8")
-            self._ctx.set_passwd_cb(lambda *_: password)
-        self._ctx.use_privatekey_file(keyfile or certfile)
-
-    def set_alpn_protocols(self, protocols):
-        protocols = [six.ensure_binary(p) for p in protocols]
-        return self._ctx.set_alpn_protos(protocols)
-
-    def wrap_socket(
-        self,
-        sock,
-        server_side=False,
-        do_handshake_on_connect=True,
-        suppress_ragged_eofs=True,
-        server_hostname=None,
-    ):
-        cnx = OpenSSL.SSL.Connection(self._ctx, sock)
-
-        if isinstance(server_hostname, six.text_type):  # Platform-specific: Python 3
-            server_hostname = server_hostname.encode("utf-8")
-
-        if server_hostname is not None:
-            cnx.set_tlsext_host_name(server_hostname)
-
-        cnx.set_connect_state()
-
-        while True:
-            try:
-                cnx.do_handshake()
-            except OpenSSL.SSL.WantReadError:
-                if not util.wait_for_read(sock, sock.gettimeout()):
-                    raise timeout("select timed out")
-                continue
-            except OpenSSL.SSL.Error as e:
-                raise ssl.SSLError("bad handshake: %r" % e)
-            break
-
-        return WrappedSocket(cnx, sock)
-
-
-def _verify_callback(cnx, x509, err_no, err_depth, return_code):
-    return err_no == 0
diff --git a/lib/urllib3/contrib/securetransport.py b/lib/urllib3/contrib/securetransport.py
deleted file mode 100644
index 6c46a3b9..00000000
--- a/lib/urllib3/contrib/securetransport.py
+++ /dev/null
@@ -1,921 +0,0 @@
-"""
-SecureTranport support for urllib3 via ctypes.
-
-This makes platform-native TLS available to urllib3 users on macOS without the
-use of a compiler. This is an important feature because the Python Package
-Index is moving to become a TLSv1.2-or-higher server, and the default OpenSSL
-that ships with macOS is not capable of doing TLSv1.2. The only way to resolve
-this is to give macOS users an alternative solution to the problem, and that
-solution is to use SecureTransport.
-
-We use ctypes here because this solution must not require a compiler. That's
-because pip is not allowed to require a compiler either.
-
-This is not intended to be a seriously long-term solution to this problem.
-The hope is that PEP 543 will eventually solve this issue for us, at which
-point we can retire this contrib module. But in the short term, we need to
-solve the impending tire fire that is Python on Mac without this kind of
-contrib module. So...here we are.
-
-To use this module, simply import and inject it::
-
-    import urllib3.contrib.securetransport
-    urllib3.contrib.securetransport.inject_into_urllib3()
-
-Happy TLSing!
-
-This code is a bastardised version of the code found in Will Bond's oscrypto
-library. An enormous debt is owed to him for blazing this trail for us. For
-that reason, this code should be considered to be covered both by urllib3's
-license and by oscrypto's:
-
-.. code-block::
-
-    Copyright (c) 2015-2016 Will Bond <will@wbond.net>
-
-    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.
-"""
-from __future__ import absolute_import
-
-import contextlib
-import ctypes
-import errno
-import os.path
-import shutil
-import socket
-import ssl
-import struct
-import threading
-import weakref
-
-import six
-
-from .. import util
-from ..util.ssl_ import PROTOCOL_TLS_CLIENT
-from ._securetransport.bindings import CoreFoundation, Security, SecurityConst
-from ._securetransport.low_level import (
-    _assert_no_error,
-    _build_tls_unknown_ca_alert,
-    _cert_array_from_pem,
-    _create_cfstring_array,
-    _load_client_cert_chain,
-    _temporary_keychain,
-)
-
-try:  # Platform-specific: Python 2
-    from socket import _fileobject
-except ImportError:  # Platform-specific: Python 3
-    _fileobject = None
-    from ..packages.backports.makefile import backport_makefile
-
-__all__ = ["inject_into_urllib3", "extract_from_urllib3"]
-
-# SNI always works
-HAS_SNI = True
-
-orig_util_HAS_SNI = util.HAS_SNI
-orig_util_SSLContext = util.ssl_.SSLContext
-
-# This dictionary is used by the read callback to obtain a handle to the
-# calling wrapped socket. This is a pretty silly approach, but for now it'll
-# do. I feel like I should be able to smuggle a handle to the wrapped socket
-# directly in the SSLConnectionRef, but for now this approach will work I
-# guess.
-#
-# We need to lock around this structure for inserts, but we don't do it for
-# reads/writes in the callbacks. The reasoning here goes as follows:
-#
-#    1. It is not possible to call into the callbacks before the dictionary is
-#       populated, so once in the callback the id must be in the dictionary.
-#    2. The callbacks don't mutate the dictionary, they only read from it, and
-#       so cannot conflict with any of the insertions.
-#
-# This is good: if we had to lock in the callbacks we'd drastically slow down
-# the performance of this code.
-_connection_refs = weakref.WeakValueDictionary()
-_connection_ref_lock = threading.Lock()
-
-# Limit writes to 16kB. This is OpenSSL's limit, but we'll cargo-cult it over
-# for no better reason than we need *a* limit, and this one is right there.
-SSL_WRITE_BLOCKSIZE = 16384
-
-# This is our equivalent of util.ssl_.DEFAULT_CIPHERS, but expanded out to
-# individual cipher suites. We need to do this because this is how
-# SecureTransport wants them.
-CIPHER_SUITES = [
-    SecurityConst.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
-    SecurityConst.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-    SecurityConst.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
-    SecurityConst.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
-    SecurityConst.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
-    SecurityConst.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
-    SecurityConst.TLS_DHE_RSA_WITH_AES_256_GCM_SHA384,
-    SecurityConst.TLS_DHE_RSA_WITH_AES_128_GCM_SHA256,
-    SecurityConst.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384,
-    SecurityConst.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
-    SecurityConst.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
-    SecurityConst.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
-    SecurityConst.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384,
-    SecurityConst.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
-    SecurityConst.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
-    SecurityConst.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-    SecurityConst.TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,
-    SecurityConst.TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
-    SecurityConst.TLS_DHE_RSA_WITH_AES_128_CBC_SHA256,
-    SecurityConst.TLS_DHE_RSA_WITH_AES_128_CBC_SHA,
-    SecurityConst.TLS_AES_256_GCM_SHA384,
-    SecurityConst.TLS_AES_128_GCM_SHA256,
-    SecurityConst.TLS_RSA_WITH_AES_256_GCM_SHA384,
-    SecurityConst.TLS_RSA_WITH_AES_128_GCM_SHA256,
-    SecurityConst.TLS_AES_128_CCM_8_SHA256,
-    SecurityConst.TLS_AES_128_CCM_SHA256,
-    SecurityConst.TLS_RSA_WITH_AES_256_CBC_SHA256,
-    SecurityConst.TLS_RSA_WITH_AES_128_CBC_SHA256,
-    SecurityConst.TLS_RSA_WITH_AES_256_CBC_SHA,
-    SecurityConst.TLS_RSA_WITH_AES_128_CBC_SHA,
-]
-
-# Basically this is simple: for PROTOCOL_SSLv23 we turn it into a low of
-# TLSv1 and a high of TLSv1.2. For everything else, we pin to that version.
-# TLSv1 to 1.2 are supported on macOS 10.8+
-_protocol_to_min_max = {
-    util.PROTOCOL_TLS: (SecurityConst.kTLSProtocol1, SecurityConst.kTLSProtocol12),
-    PROTOCOL_TLS_CLIENT: (SecurityConst.kTLSProtocol1, SecurityConst.kTLSProtocol12),
-}
-
-if hasattr(ssl, "PROTOCOL_SSLv2"):
-    _protocol_to_min_max[ssl.PROTOCOL_SSLv2] = (
-        SecurityConst.kSSLProtocol2,
-        SecurityConst.kSSLProtocol2,
-    )
-if hasattr(ssl, "PROTOCOL_SSLv3"):
-    _protocol_to_min_max[ssl.PROTOCOL_SSLv3] = (
-        SecurityConst.kSSLProtocol3,
-        SecurityConst.kSSLProtocol3,
-    )
-if hasattr(ssl, "PROTOCOL_TLSv1"):
-    _protocol_to_min_max[ssl.PROTOCOL_TLSv1] = (
-        SecurityConst.kTLSProtocol1,
-        SecurityConst.kTLSProtocol1,
-    )
-if hasattr(ssl, "PROTOCOL_TLSv1_1"):
-    _protocol_to_min_max[ssl.PROTOCOL_TLSv1_1] = (
-        SecurityConst.kTLSProtocol11,
-        SecurityConst.kTLSProtocol11,
-    )
-if hasattr(ssl, "PROTOCOL_TLSv1_2"):
-    _protocol_to_min_max[ssl.PROTOCOL_TLSv1_2] = (
-        SecurityConst.kTLSProtocol12,
-        SecurityConst.kTLSProtocol12,
-    )
-
-
-def inject_into_urllib3():
-    """
-    Monkey-patch urllib3 with SecureTransport-backed SSL-support.
-    """
-    util.SSLContext = SecureTransportContext
-    util.ssl_.SSLContext = SecureTransportContext
-    util.HAS_SNI = HAS_SNI
-    util.ssl_.HAS_SNI = HAS_SNI
-    util.IS_SECURETRANSPORT = True
-    util.ssl_.IS_SECURETRANSPORT = True
-
-
-def extract_from_urllib3():
-    """
-    Undo monkey-patching by :func:`inject_into_urllib3`.
-    """
-    util.SSLContext = orig_util_SSLContext
-    util.ssl_.SSLContext = orig_util_SSLContext
-    util.HAS_SNI = orig_util_HAS_SNI
-    util.ssl_.HAS_SNI = orig_util_HAS_SNI
-    util.IS_SECURETRANSPORT = False
-    util.ssl_.IS_SECURETRANSPORT = False
-
-
-def _read_callback(connection_id, data_buffer, data_length_pointer):
-    """
-    SecureTransport read callback. This is called by ST to request that data
-    be returned from the socket.
-    """
-    wrapped_socket = None
-    try:
-        wrapped_socket = _connection_refs.get(connection_id)
-        if wrapped_socket is None:
-            return SecurityConst.errSSLInternal
-        base_socket = wrapped_socket.socket
-
-        requested_length = data_length_pointer[0]
-
-        timeout = wrapped_socket.gettimeout()
-        error = None
-        read_count = 0
-
-        try:
-            while read_count < requested_length:
-                if timeout is None or timeout >= 0:
-                    if not util.wait_for_read(base_socket, timeout):
-                        raise socket.error(errno.EAGAIN, "timed out")
-
-                remaining = requested_length - read_count
-                buffer = (ctypes.c_char * remaining).from_address(
-                    data_buffer + read_count
-                )
-                chunk_size = base_socket.recv_into(buffer, remaining)
-                read_count += chunk_size
-                if not chunk_size:
-                    if not read_count:
-                        return SecurityConst.errSSLClosedGraceful
-                    break
-        except (socket.error) as e:
-            error = e.errno
-
-            if error is not None and error != errno.EAGAIN:
-                data_length_pointer[0] = read_count
-                if error == errno.ECONNRESET or error == errno.EPIPE:
-                    return SecurityConst.errSSLClosedAbort
-                raise
-
-        data_length_pointer[0] = read_count
-
-        if read_count != requested_length:
-            return SecurityConst.errSSLWouldBlock
-
-        return 0
-    except Exception as e:
-        if wrapped_socket is not None:
-            wrapped_socket._exception = e
-        return SecurityConst.errSSLInternal
-
-
-def _write_callback(connection_id, data_buffer, data_length_pointer):
-    """
-    SecureTransport write callback. This is called by ST to request that data
-    actually be sent on the network.
-    """
-    wrapped_socket = None
-    try:
-        wrapped_socket = _connection_refs.get(connection_id)
-        if wrapped_socket is None:
-            return SecurityConst.errSSLInternal
-        base_socket = wrapped_socket.socket
-
-        bytes_to_write = data_length_pointer[0]
-        data = ctypes.string_at(data_buffer, bytes_to_write)
-
-        timeout = wrapped_socket.gettimeout()
-        error = None
-        sent = 0
-
-        try:
-            while sent < bytes_to_write:
-                if timeout is None or timeout >= 0:
-                    if not util.wait_for_write(base_socket, timeout):
-                        raise socket.error(errno.EAGAIN, "timed out")
-                chunk_sent = base_socket.send(data)
-                sent += chunk_sent
-
-                # This has some needless copying here, but I'm not sure there's
-                # much value in optimising this data path.
-                data = data[chunk_sent:]
-        except (socket.error) as e:
-            error = e.errno
-
-            if error is not None and error != errno.EAGAIN:
-                data_length_pointer[0] = sent
-                if error == errno.ECONNRESET or error == errno.EPIPE:
-                    return SecurityConst.errSSLClosedAbort
-                raise
-
-        data_length_pointer[0] = sent
-
-        if sent != bytes_to_write:
-            return SecurityConst.errSSLWouldBlock
-
-        return 0
-    except Exception as e:
-        if wrapped_socket is not None:
-            wrapped_socket._exception = e
-        return SecurityConst.errSSLInternal
-
-
-# We need to keep these two objects references alive: if they get GC'd while
-# in use then SecureTransport could attempt to call a function that is in freed
-# memory. That would be...uh...bad. Yeah, that's the word. Bad.
-_read_callback_pointer = Security.SSLReadFunc(_read_callback)
-_write_callback_pointer = Security.SSLWriteFunc(_write_callback)
-
-
-class WrappedSocket(object):
-    """
-    API-compatibility wrapper for Python's OpenSSL wrapped socket object.
-
-    Note: _makefile_refs, _drop(), and _reuse() are needed for the garbage
-    collector of PyPy.
-    """
-
-    def __init__(self, socket):
-        self.socket = socket
-        self.context = None
-        self._makefile_refs = 0
-        self._closed = False
-        self._exception = None
-        self._keychain = None
-        self._keychain_dir = None
-        self._client_cert_chain = None
-
-        # We save off the previously-configured timeout and then set it to
-        # zero. This is done because we use select and friends to handle the
-        # timeouts, but if we leave the timeout set on the lower socket then
-        # Python will "kindly" call select on that socket again for us. Avoid
-        # that by forcing the timeout to zero.
-        self._timeout = self.socket.gettimeout()
-        self.socket.settimeout(0)
-
-    @contextlib.contextmanager
-    def _raise_on_error(self):
-        """
-        A context manager that can be used to wrap calls that do I/O from
-        SecureTransport. If any of the I/O callbacks hit an exception, this
-        context manager will correctly propagate the exception after the fact.
-        This avoids silently swallowing those exceptions.
-
-        It also correctly forces the socket closed.
-        """
-        self._exception = None
-
-        # We explicitly don't catch around this yield because in the unlikely
-        # event that an exception was hit in the block we don't want to swallow
-        # it.
-        yield
-        if self._exception is not None:
-            exception, self._exception = self._exception, None
-            self.close()
-            raise exception
-
-    def _set_ciphers(self):
-        """
-        Sets up the allowed ciphers. By default this matches the set in
-        util.ssl_.DEFAULT_CIPHERS, at least as supported by macOS. This is done
-        custom and doesn't allow changing at this time, mostly because parsing
-        OpenSSL cipher strings is going to be a freaking nightmare.
-        """
-        ciphers = (Security.SSLCipherSuite * len(CIPHER_SUITES))(*CIPHER_SUITES)
-        result = Security.SSLSetEnabledCiphers(
-            self.context, ciphers, len(CIPHER_SUITES)
-        )
-        _assert_no_error(result)
-
-    def _set_alpn_protocols(self, protocols):
-        """
-        Sets up the ALPN protocols on the context.
-        """
-        if not protocols:
-            return
-        protocols_arr = _create_cfstring_array(protocols)
-        try:
-            result = Security.SSLSetALPNProtocols(self.context, protocols_arr)
-            _assert_no_error(result)
-        finally:
-            CoreFoundation.CFRelease(protocols_arr)
-
-    def _custom_validate(self, verify, trust_bundle):
-        """
-        Called when we have set custom validation. We do this in two cases:
-        first, when cert validation is entirely disabled; and second, when
-        using a custom trust DB.
-        Raises an SSLError if the connection is not trusted.
-        """
-        # If we disabled cert validation, just say: cool.
-        if not verify:
-            return
-
-        successes = (
-            SecurityConst.kSecTrustResultUnspecified,
-            SecurityConst.kSecTrustResultProceed,
-        )
-        try:
-            trust_result = self._evaluate_trust(trust_bundle)
-            if trust_result in successes:
-                return
-            reason = "error code: %d" % (trust_result,)
-        except Exception as e:
-            # Do not trust on error
-            reason = "exception: %r" % (e,)
-
-        # SecureTransport does not send an alert nor shuts down the connection.
-        rec = _build_tls_unknown_ca_alert(self.version())
-        self.socket.sendall(rec)
-        # close the connection immediately
-        # l_onoff = 1, activate linger
-        # l_linger = 0, linger for 0 seoncds
-        opts = struct.pack("ii", 1, 0)
-        self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER, opts)
-        self.close()
-        raise ssl.SSLError("certificate verify failed, %s" % reason)
-
-    def _evaluate_trust(self, trust_bundle):
-        # We want data in memory, so load it up.
-        if os.path.isfile(trust_bundle):
-            with open(trust_bundle, "rb") as f:
-                trust_bundle = f.read()
-
-        cert_array = None
-        trust = Security.SecTrustRef()
-
-        try:
-            # Get a CFArray that contains the certs we want.
-            cert_array = _cert_array_from_pem(trust_bundle)
-
-            # Ok, now the hard part. We want to get the SecTrustRef that ST has
-            # created for this connection, shove our CAs into it, tell ST to
-            # ignore everything else it knows, and then ask if it can build a
-            # chain. This is a buuuunch of code.
-            result = Security.SSLCopyPeerTrust(self.context, ctypes.byref(trust))
-            _assert_no_error(result)
-            if not trust:
-                raise ssl.SSLError("Failed to copy trust reference")
-
-            result = Security.SecTrustSetAnchorCertificates(trust, cert_array)
-            _assert_no_error(result)
-
-            result = Security.SecTrustSetAnchorCertificatesOnly(trust, True)
-            _assert_no_error(result)
-
-            trust_result = Security.SecTrustResultType()
-            result = Security.SecTrustEvaluate(trust, ctypes.byref(trust_result))
-            _assert_no_error(result)
-        finally:
-            if trust:
-                CoreFoundation.CFRelease(trust)
-
-            if cert_array is not None:
-                CoreFoundation.CFRelease(cert_array)
-
-        return trust_result.value
-
-    def handshake(
-        self,
-        server_hostname,
-        verify,
-        trust_bundle,
-        min_version,
-        max_version,
-        client_cert,
-        client_key,
-        client_key_passphrase,
-        alpn_protocols,
-    ):
-        """
-        Actually performs the TLS handshake. This is run automatically by
-        wrapped socket, and shouldn't be needed in user code.
-        """
-        # First, we do the initial bits of connection setup. We need to create
-        # a context, set its I/O funcs, and set the connection reference.
-        self.context = Security.SSLCreateContext(
-            None, SecurityConst.kSSLClientSide, SecurityConst.kSSLStreamType
-        )
-        result = Security.SSLSetIOFuncs(
-            self.context, _read_callback_pointer, _write_callback_pointer
-        )
-        _assert_no_error(result)
-
-        # Here we need to compute the handle to use. We do this by taking the
-        # id of self modulo 2**31 - 1. If this is already in the dictionary, we
-        # just keep incrementing by one until we find a free space.
-        with _connection_ref_lock:
-            handle = id(self) % 2147483647
-            while handle in _connection_refs:
-                handle = (handle + 1) % 2147483647
-            _connection_refs[handle] = self
-
-        result = Security.SSLSetConnection(self.context, handle)
-        _assert_no_error(result)
-
-        # If we have a server hostname, we should set that too.
-        if server_hostname:
-            if not isinstance(server_hostname, bytes):
-                server_hostname = server_hostname.encode("utf-8")
-
-            result = Security.SSLSetPeerDomainName(
-                self.context, server_hostname, len(server_hostname)
-            )
-            _assert_no_error(result)
-
-        # Setup the ciphers.
-        self._set_ciphers()
-
-        # Setup the ALPN protocols.
-        self._set_alpn_protocols(alpn_protocols)
-
-        # Set the minimum and maximum TLS versions.
-        result = Security.SSLSetProtocolVersionMin(self.context, min_version)
-        _assert_no_error(result)
-
-        result = Security.SSLSetProtocolVersionMax(self.context, max_version)
-        _assert_no_error(result)
-
-        # If there's a trust DB, we need to use it. We do that by telling
-        # SecureTransport to break on server auth. We also do that if we don't
-        # want to validate the certs at all: we just won't actually do any
-        # authing in that case.
-        if not verify or trust_bundle is not None:
-            result = Security.SSLSetSessionOption(
-                self.context, SecurityConst.kSSLSessionOptionBreakOnServerAuth, True
-            )
-            _assert_no_error(result)
-
-        # If there's a client cert, we need to use it.
-        if client_cert:
-            self._keychain, self._keychain_dir = _temporary_keychain()
-            self._client_cert_chain = _load_client_cert_chain(
-                self._keychain, client_cert, client_key
-            )
-            result = Security.SSLSetCertificate(self.context, self._client_cert_chain)
-            _assert_no_error(result)
-
-        while True:
-            with self._raise_on_error():
-                result = Security.SSLHandshake(self.context)
-
-                if result == SecurityConst.errSSLWouldBlock:
-                    raise socket.timeout("handshake timed out")
-                elif result == SecurityConst.errSSLServerAuthCompleted:
-                    self._custom_validate(verify, trust_bundle)
-                    continue
-                else:
-                    _assert_no_error(result)
-                    break
-
-    def fileno(self):
-        return self.socket.fileno()
-
-    # Copy-pasted from Python 3.5 source code
-    def _decref_socketios(self):
-        if self._makefile_refs > 0:
-            self._makefile_refs -= 1
-        if self._closed:
-            self.close()
-
-    def recv(self, bufsiz):
-        buffer = ctypes.create_string_buffer(bufsiz)
-        bytes_read = self.recv_into(buffer, bufsiz)
-        data = buffer[:bytes_read]
-        return data
-
-    def recv_into(self, buffer, nbytes=None):
-        # Read short on EOF.
-        if self._closed:
-            return 0
-
-        if nbytes is None:
-            nbytes = len(buffer)
-
-        buffer = (ctypes.c_char * nbytes).from_buffer(buffer)
-        processed_bytes = ctypes.c_size_t(0)
-
-        with self._raise_on_error():
-            result = Security.SSLRead(
-                self.context, buffer, nbytes, ctypes.byref(processed_bytes)
-            )
-
-        # There are some result codes that we want to treat as "not always
-        # errors". Specifically, those are errSSLWouldBlock,
-        # errSSLClosedGraceful, and errSSLClosedNoNotify.
-        if result == SecurityConst.errSSLWouldBlock:
-            # If we didn't process any bytes, then this was just a time out.
-            # However, we can get errSSLWouldBlock in situations when we *did*
-            # read some data, and in those cases we should just read "short"
-            # and return.
-            if processed_bytes.value == 0:
-                # Timed out, no data read.
-                raise socket.timeout("recv timed out")
-        elif result in (
-            SecurityConst.errSSLClosedGraceful,
-            SecurityConst.errSSLClosedNoNotify,
-        ):
-            # The remote peer has closed this connection. We should do so as
-            # well. Note that we don't actually return here because in
-            # principle this could actually be fired along with return data.
-            # It's unlikely though.
-            self.close()
-        else:
-            _assert_no_error(result)
-
-        # Ok, we read and probably succeeded. We should return whatever data
-        # was actually read.
-        return processed_bytes.value
-
-    def settimeout(self, timeout):
-        self._timeout = timeout
-
-    def gettimeout(self):
-        return self._timeout
-
-    def send(self, data):
-        processed_bytes = ctypes.c_size_t(0)
-
-        with self._raise_on_error():
-            result = Security.SSLWrite(
-                self.context, data, len(data), ctypes.byref(processed_bytes)
-            )
-
-        if result == SecurityConst.errSSLWouldBlock and processed_bytes.value == 0:
-            # Timed out
-            raise socket.timeout("send timed out")
-        else:
-            _assert_no_error(result)
-
-        # We sent, and probably succeeded. Tell them how much we sent.
-        return processed_bytes.value
-
-    def sendall(self, data):
-        total_sent = 0
-        while total_sent < len(data):
-            sent = self.send(data[total_sent : total_sent + SSL_WRITE_BLOCKSIZE])
-            total_sent += sent
-
-    def shutdown(self):
-        with self._raise_on_error():
-            Security.SSLClose(self.context)
-
-    def close(self):
-        # TODO: should I do clean shutdown here? Do I have to?
-        if self._makefile_refs < 1:
-            self._closed = True
-            if self.context:
-                CoreFoundation.CFRelease(self.context)
-                self.context = None
-            if self._client_cert_chain:
-                CoreFoundation.CFRelease(self._client_cert_chain)
-                self._client_cert_chain = None
-            if self._keychain:
-                Security.SecKeychainDelete(self._keychain)
-                CoreFoundation.CFRelease(self._keychain)
-                shutil.rmtree(self._keychain_dir)
-                self._keychain = self._keychain_dir = None
-            return self.socket.close()
-        else:
-            self._makefile_refs -= 1
-
-    def getpeercert(self, binary_form=False):
-        # Urgh, annoying.
-        #
-        # Here's how we do this:
-        #
-        # 1. Call SSLCopyPeerTrust to get hold of the trust object for this
-        #    connection.
-        # 2. Call SecTrustGetCertificateAtIndex for index 0 to get the leaf.
-        # 3. To get the CN, call SecCertificateCopyCommonName and process that
-        #    string so that it's of the appropriate type.
-        # 4. To get the SAN, we need to do something a bit more complex:
-        #    a. Call SecCertificateCopyValues to get the data, requesting
-        #       kSecOIDSubjectAltName.
-        #    b. Mess about with this dictionary to try to get the SANs out.
-        #
-        # This is gross. Really gross. It's going to be a few hundred LoC extra
-        # just to repeat something that SecureTransport can *already do*. So my
-        # operating assumption at this time is that what we want to do is
-        # instead to just flag to urllib3 that it shouldn't do its own hostname
-        # validation when using SecureTransport.
-        if not binary_form:
-            raise ValueError("SecureTransport only supports dumping binary certs")
-        trust = Security.SecTrustRef()
-        certdata = None
-        der_bytes = None
-
-        try:
-            # Grab the trust store.
-            result = Security.SSLCopyPeerTrust(self.context, ctypes.byref(trust))
-            _assert_no_error(result)
-            if not trust:
-                # Probably we haven't done the handshake yet. No biggie.
-                return None
-
-            cert_count = Security.SecTrustGetCertificateCount(trust)
-            if not cert_count:
-                # Also a case that might happen if we haven't handshaked.
-                # Handshook? Handshaken?
-                return None
-
-            leaf = Security.SecTrustGetCertificateAtIndex(trust, 0)
-            assert leaf
-
-            # Ok, now we want the DER bytes.
-            certdata = Security.SecCertificateCopyData(leaf)
-            assert certdata
-
-            data_length = CoreFoundation.CFDataGetLength(certdata)
-            data_buffer = CoreFoundation.CFDataGetBytePtr(certdata)
-            der_bytes = ctypes.string_at(data_buffer, data_length)
-        finally:
-            if certdata:
-                CoreFoundation.CFRelease(certdata)
-            if trust:
-                CoreFoundation.CFRelease(trust)
-
-        return der_bytes
-
-    def version(self):
-        protocol = Security.SSLProtocol()
-        result = Security.SSLGetNegotiatedProtocolVersion(
-            self.context, ctypes.byref(protocol)
-        )
-        _assert_no_error(result)
-        if protocol.value == SecurityConst.kTLSProtocol13:
-            raise ssl.SSLError("SecureTransport does not support TLS 1.3")
-        elif protocol.value == SecurityConst.kTLSProtocol12:
-            return "TLSv1.2"
-        elif protocol.value == SecurityConst.kTLSProtocol11:
-            return "TLSv1.1"
-        elif protocol.value == SecurityConst.kTLSProtocol1:
-            return "TLSv1"
-        elif protocol.value == SecurityConst.kSSLProtocol3:
-            return "SSLv3"
-        elif protocol.value == SecurityConst.kSSLProtocol2:
-            return "SSLv2"
-        else:
-            raise ssl.SSLError("Unknown TLS version: %r" % protocol)
-
-    def _reuse(self):
-        self._makefile_refs += 1
-
-    def _drop(self):
-        if self._makefile_refs < 1:
-            self.close()
-        else:
-            self._makefile_refs -= 1
-
-
-if _fileobject:  # Platform-specific: Python 2
-
-    def makefile(self, mode, bufsize=-1):
-        self._makefile_refs += 1
-        return _fileobject(self, mode, bufsize, close=True)
-
-else:  # Platform-specific: Python 3
-
-    def makefile(self, mode="r", buffering=None, *args, **kwargs):
-        # We disable buffering with SecureTransport because it conflicts with
-        # the buffering that ST does internally (see issue #1153 for more).
-        buffering = 0
-        return backport_makefile(self, mode, buffering, *args, **kwargs)
-
-
-WrappedSocket.makefile = makefile
-
-
-class SecureTransportContext(object):
-    """
-    I am a wrapper class for the SecureTransport library, to translate the
-    interface of the standard library ``SSLContext`` object to calls into
-    SecureTransport.
-    """
-
-    def __init__(self, protocol):
-        self._min_version, self._max_version = _protocol_to_min_max[protocol]
-        self._options = 0
-        self._verify = False
-        self._trust_bundle = None
-        self._client_cert = None
-        self._client_key = None
-        self._client_key_passphrase = None
-        self._alpn_protocols = None
-
-    @property
-    def check_hostname(self):
-        """
-        SecureTransport cannot have its hostname checking disabled. For more,
-        see the comment on getpeercert() in this file.
-        """
-        return True
-
-    @check_hostname.setter
-    def check_hostname(self, value):
-        """
-        SecureTransport cannot have its hostname checking disabled. For more,
-        see the comment on getpeercert() in this file.
-        """
-        pass
-
-    @property
-    def options(self):
-        # TODO: Well, crap.
-        #
-        # So this is the bit of the code that is the most likely to cause us
-        # trouble. Essentially we need to enumerate all of the SSL options that
-        # users might want to use and try to see if we can sensibly translate
-        # them, or whether we should just ignore them.
-        return self._options
-
-    @options.setter
-    def options(self, value):
-        # TODO: Update in line with above.
-        self._options = value
-
-    @property
-    def verify_mode(self):
-        return ssl.CERT_REQUIRED if self._verify else ssl.CERT_NONE
-
-    @verify_mode.setter
-    def verify_mode(self, value):
-        self._verify = True if value == ssl.CERT_REQUIRED else False
-
-    def set_default_verify_paths(self):
-        # So, this has to do something a bit weird. Specifically, what it does
-        # is nothing.
-        #
-        # This means that, if we had previously had load_verify_locations
-        # called, this does not undo that. We need to do that because it turns
-        # out that the rest of the urllib3 code will attempt to load the
-        # default verify paths if it hasn't been told about any paths, even if
-        # the context itself was sometime earlier. We resolve that by just
-        # ignoring it.
-        pass
-
-    def load_default_certs(self):
-        return self.set_default_verify_paths()
-
-    def set_ciphers(self, ciphers):
-        # For now, we just require the default cipher string.
-        if ciphers != util.ssl_.DEFAULT_CIPHERS:
-            raise ValueError("SecureTransport doesn't support custom cipher strings")
-
-    def load_verify_locations(self, cafile=None, capath=None, cadata=None):
-        # OK, we only really support cadata and cafile.
-        if capath is not None:
-            raise ValueError("SecureTransport does not support cert directories")
-
-        # Raise if cafile does not exist.
-        if cafile is not None:
-            with open(cafile):
-                pass
-
-        self._trust_bundle = cafile or cadata
-
-    def load_cert_chain(self, certfile, keyfile=None, password=None):
-        self._client_cert = certfile
-        self._client_key = keyfile
-        self._client_cert_passphrase = password
-
-    def set_alpn_protocols(self, protocols):
-        """
-        Sets the ALPN protocols that will later be set on the context.
-
-        Raises a NotImplementedError if ALPN is not supported.
-        """
-        if not hasattr(Security, "SSLSetALPNProtocols"):
-            raise NotImplementedError(
-                "SecureTransport supports ALPN only in macOS 10.12+"
-            )
-        self._alpn_protocols = [six.ensure_binary(p) for p in protocols]
-
-    def wrap_socket(
-        self,
-        sock,
-        server_side=False,
-        do_handshake_on_connect=True,
-        suppress_ragged_eofs=True,
-        server_hostname=None,
-    ):
-        # So, what do we do here? Firstly, we assert some properties. This is a
-        # stripped down shim, so there is some functionality we don't support.
-        # See PEP 543 for the real deal.
-        assert not server_side
-        assert do_handshake_on_connect
-        assert suppress_ragged_eofs
-
-        # Ok, we're good to go. Now we want to create the wrapped socket object
-        # and store it in the appropriate place.
-        wrapped_socket = WrappedSocket(sock)
-
-        # Now we can handshake
-        wrapped_socket.handshake(
-            server_hostname,
-            self._verify,
-            self._trust_bundle,
-            self._min_version,
-            self._max_version,
-            self._client_cert,
-            self._client_key,
-            self._client_key_passphrase,
-            self._alpn_protocols,
-        )
-        return wrapped_socket
diff --git a/lib/urllib3/contrib/socks.py b/lib/urllib3/contrib/socks.py
deleted file mode 100644
index c326e80d..00000000
--- a/lib/urllib3/contrib/socks.py
+++ /dev/null
@@ -1,216 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-This module contains provisional support for SOCKS proxies from within
-urllib3. This module supports SOCKS4, SOCKS4A (an extension of SOCKS4), and
-SOCKS5. To enable its functionality, either install PySocks or install this
-module with the ``socks`` extra.
-
-The SOCKS implementation supports the full range of urllib3 features. It also
-supports the following SOCKS features:
-
-- SOCKS4A (``proxy_url='socks4a://...``)
-- SOCKS4 (``proxy_url='socks4://...``)
-- SOCKS5 with remote DNS (``proxy_url='socks5h://...``)
-- SOCKS5 with local DNS (``proxy_url='socks5://...``)
-- Usernames and passwords for the SOCKS proxy
-
-.. note::
-   It is recommended to use ``socks5h://`` or ``socks4a://`` schemes in
-   your ``proxy_url`` to ensure that DNS resolution is done from the remote
-   server instead of client-side when connecting to a domain name.
-
-SOCKS4 supports IPv4 and domain names with the SOCKS4A extension. SOCKS5
-supports IPv4, IPv6, and domain names.
-
-When connecting to a SOCKS4 proxy the ``username`` portion of the ``proxy_url``
-will be sent as the ``userid`` section of the SOCKS request:
-
-.. code-block:: python
-
-    proxy_url="socks4a://<userid>@proxy-host"
-
-When connecting to a SOCKS5 proxy the ``username`` and ``password`` portion
-of the ``proxy_url`` will be sent as the username/password to authenticate
-with the proxy:
-
-.. code-block:: python
-
-    proxy_url="socks5h://<username>:<password>@proxy-host"
-
-"""
-from __future__ import absolute_import
-
-try:
-    import socks
-except ImportError:
-    import warnings
-
-    from ..exceptions import DependencyWarning
-
-    warnings.warn(
-        (
-            "SOCKS support in urllib3 requires the installation of optional "
-            "dependencies: specifically, PySocks.  For more information, see "
-            "https://urllib3.readthedocs.io/en/1.26.x/contrib.html#socks-proxies"
-        ),
-        DependencyWarning,
-    )
-    raise
-
-from socket import error as SocketError
-from socket import timeout as SocketTimeout
-
-from ..connection import HTTPConnection, HTTPSConnection
-from ..connectionpool import HTTPConnectionPool, HTTPSConnectionPool
-from ..exceptions import ConnectTimeoutError, NewConnectionError
-from ..poolmanager import PoolManager
-from ..util.url import parse_url
-
-try:
-    import ssl
-except ImportError:
-    ssl = None
-
-
-class SOCKSConnection(HTTPConnection):
-    """
-    A plain-text HTTP connection that connects via a SOCKS proxy.
-    """
-
-    def __init__(self, *args, **kwargs):
-        self._socks_options = kwargs.pop("_socks_options")
-        super(SOCKSConnection, self).__init__(*args, **kwargs)
-
-    def _new_conn(self):
-        """
-        Establish a new connection via the SOCKS proxy.
-        """
-        extra_kw = {}
-        if self.source_address:
-            extra_kw["source_address"] = self.source_address
-
-        if self.socket_options:
-            extra_kw["socket_options"] = self.socket_options
-
-        try:
-            conn = socks.create_connection(
-                (self.host, self.port),
-                proxy_type=self._socks_options["socks_version"],
-                proxy_addr=self._socks_options["proxy_host"],
-                proxy_port=self._socks_options["proxy_port"],
-                proxy_username=self._socks_options["username"],
-                proxy_password=self._socks_options["password"],
-                proxy_rdns=self._socks_options["rdns"],
-                timeout=self.timeout,
-                **extra_kw
-            )
-
-        except SocketTimeout:
-            raise ConnectTimeoutError(
-                self,
-                "Connection to %s timed out. (connect timeout=%s)"
-                % (self.host, self.timeout),
-            )
-
-        except socks.ProxyError as e:
-            # This is fragile as hell, but it seems to be the only way to raise
-            # useful errors here.
-            if e.socket_err:
-                error = e.socket_err
-                if isinstance(error, SocketTimeout):
-                    raise ConnectTimeoutError(
-                        self,
-                        "Connection to %s timed out. (connect timeout=%s)"
-                        % (self.host, self.timeout),
-                    )
-                else:
-                    raise NewConnectionError(
-                        self, "Failed to establish a new connection: %s" % error
-                    )
-            else:
-                raise NewConnectionError(
-                    self, "Failed to establish a new connection: %s" % e
-                )
-
-        except SocketError as e:  # Defensive: PySocks should catch all these.
-            raise NewConnectionError(
-                self, "Failed to establish a new connection: %s" % e
-            )
-
-        return conn
-
-
-# We don't need to duplicate the Verified/Unverified distinction from
-# urllib3/connection.py here because the HTTPSConnection will already have been
-# correctly set to either the Verified or Unverified form by that module. This
-# means the SOCKSHTTPSConnection will automatically be the correct type.
-class SOCKSHTTPSConnection(SOCKSConnection, HTTPSConnection):
-    pass
-
-
-class SOCKSHTTPConnectionPool(HTTPConnectionPool):
-    ConnectionCls = SOCKSConnection
-
-
-class SOCKSHTTPSConnectionPool(HTTPSConnectionPool):
-    ConnectionCls = SOCKSHTTPSConnection
-
-
-class SOCKSProxyManager(PoolManager):
-    """
-    A version of the urllib3 ProxyManager that routes connections via the
-    defined SOCKS proxy.
-    """
-
-    pool_classes_by_scheme = {
-        "http": SOCKSHTTPConnectionPool,
-        "https": SOCKSHTTPSConnectionPool,
-    }
-
-    def __init__(
-        self,
-        proxy_url,
-        username=None,
-        password=None,
-        num_pools=10,
-        headers=None,
-        **connection_pool_kw
-    ):
-        parsed = parse_url(proxy_url)
-
-        if username is None and password is None and parsed.auth is not None:
-            split = parsed.auth.split(":")
-            if len(split) == 2:
-                username, password = split
-        if parsed.scheme == "socks5":
-            socks_version = socks.PROXY_TYPE_SOCKS5
-            rdns = False
-        elif parsed.scheme == "socks5h":
-            socks_version = socks.PROXY_TYPE_SOCKS5
-            rdns = True
-        elif parsed.scheme == "socks4":
-            socks_version = socks.PROXY_TYPE_SOCKS4
-            rdns = False
-        elif parsed.scheme == "socks4a":
-            socks_version = socks.PROXY_TYPE_SOCKS4
-            rdns = True
-        else:
-            raise ValueError("Unable to determine SOCKS version from %s" % proxy_url)
-
-        self.proxy_url = proxy_url
-
-        socks_options = {
-            "socks_version": socks_version,
-            "proxy_host": parsed.host,
-            "proxy_port": parsed.port,
-            "username": username,
-            "password": password,
-            "rdns": rdns,
-        }
-        connection_pool_kw["_socks_options"] = socks_options
-
-        super(SOCKSProxyManager, self).__init__(
-            num_pools, headers, **connection_pool_kw
-        )
-
-        self.pool_classes_by_scheme = SOCKSProxyManager.pool_classes_by_scheme
diff --git a/lib/urllib3/exceptions.py b/lib/urllib3/exceptions.py
deleted file mode 100644
index cba6f3f5..00000000
--- a/lib/urllib3/exceptions.py
+++ /dev/null
@@ -1,323 +0,0 @@
-from __future__ import absolute_import
-
-from .packages.six.moves.http_client import IncompleteRead as httplib_IncompleteRead
-
-# Base Exceptions
-
-
-class HTTPError(Exception):
-    """Base exception used by this module."""
-
-    pass
-
-
-class HTTPWarning(Warning):
-    """Base warning used by this module."""
-
-    pass
-
-
-class PoolError(HTTPError):
-    """Base exception for errors caused within a pool."""
-
-    def __init__(self, pool, message):
-        self.pool = pool
-        HTTPError.__init__(self, "%s: %s" % (pool, message))
-
-    def __reduce__(self):
-        # For pickling purposes.
-        return self.__class__, (None, None)
-
-
-class RequestError(PoolError):
-    """Base exception for PoolErrors that have associated URLs."""
-
-    def __init__(self, pool, url, message):
-        self.url = url
-        PoolError.__init__(self, pool, message)
-
-    def __reduce__(self):
-        # For pickling purposes.
-        return self.__class__, (None, self.url, None)
-
-
-class SSLError(HTTPError):
-    """Raised when SSL certificate fails in an HTTPS connection."""
-
-    pass
-
-
-class ProxyError(HTTPError):
-    """Raised when the connection to a proxy fails."""
-
-    def __init__(self, message, error, *args):
-        super(ProxyError, self).__init__(message, error, *args)
-        self.original_error = error
-
-
-class DecodeError(HTTPError):
-    """Raised when automatic decoding based on Content-Type fails."""
-
-    pass
-
-
-class ProtocolError(HTTPError):
-    """Raised when something unexpected happens mid-request/response."""
-
-    pass
-
-
-#: Renamed to ProtocolError but aliased for backwards compatibility.
-ConnectionError = ProtocolError
-
-
-# Leaf Exceptions
-
-
-class MaxRetryError(RequestError):
-    """Raised when the maximum number of retries is exceeded.
-
-    :param pool: The connection pool
-    :type pool: :class:`~urllib3.connectionpool.HTTPConnectionPool`
-    :param string url: The requested Url
-    :param exceptions.Exception reason: The underlying error
-
-    """
-
-    def __init__(self, pool, url, reason=None):
-        self.reason = reason
-
-        message = "Max retries exceeded with url: %s (Caused by %r)" % (url, reason)
-
-        RequestError.__init__(self, pool, url, message)
-
-
-class HostChangedError(RequestError):
-    """Raised when an existing pool gets a request for a foreign host."""
-
-    def __init__(self, pool, url, retries=3):
-        message = "Tried to open a foreign host with url: %s" % url
-        RequestError.__init__(self, pool, url, message)
-        self.retries = retries
-
-
-class TimeoutStateError(HTTPError):
-    """Raised when passing an invalid state to a timeout"""
-
-    pass
-
-
-class TimeoutError(HTTPError):
-    """Raised when a socket timeout error occurs.
-
-    Catching this error will catch both :exc:`ReadTimeoutErrors
-    <ReadTimeoutError>` and :exc:`ConnectTimeoutErrors <ConnectTimeoutError>`.
-    """
-
-    pass
-
-
-class ReadTimeoutError(TimeoutError, RequestError):
-    """Raised when a socket timeout occurs while receiving data from a server"""
-
-    pass
-
-
-# This timeout error does not have a URL attached and needs to inherit from the
-# base HTTPError
-class ConnectTimeoutError(TimeoutError):
-    """Raised when a socket timeout occurs while connecting to a server"""
-
-    pass
-
-
-class NewConnectionError(ConnectTimeoutError, PoolError):
-    """Raised when we fail to establish a new connection. Usually ECONNREFUSED."""
-
-    pass
-
-
-class EmptyPoolError(PoolError):
-    """Raised when a pool runs out of connections and no more are allowed."""
-
-    pass
-
-
-class ClosedPoolError(PoolError):
-    """Raised when a request enters a pool after the pool has been closed."""
-
-    pass
-
-
-class LocationValueError(ValueError, HTTPError):
-    """Raised when there is something wrong with a given URL input."""
-
-    pass
-
-
-class LocationParseError(LocationValueError):
-    """Raised when get_host or similar fails to parse the URL input."""
-
-    def __init__(self, location):
-        message = "Failed to parse: %s" % location
-        HTTPError.__init__(self, message)
-
-        self.location = location
-
-
-class URLSchemeUnknown(LocationValueError):
-    """Raised when a URL input has an unsupported scheme."""
-
-    def __init__(self, scheme):
-        message = "Not supported URL scheme %s" % scheme
-        super(URLSchemeUnknown, self).__init__(message)
-
-        self.scheme = scheme
-
-
-class ResponseError(HTTPError):
-    """Used as a container for an error reason supplied in a MaxRetryError."""
-
-    GENERIC_ERROR = "too many error responses"
-    SPECIFIC_ERROR = "too many {status_code} error responses"
-
-
-class SecurityWarning(HTTPWarning):
-    """Warned when performing security reducing actions"""
-
-    pass
-
-
-class SubjectAltNameWarning(SecurityWarning):
-    """Warned when connecting to a host with a certificate missing a SAN."""
-
-    pass
-
-
-class InsecureRequestWarning(SecurityWarning):
-    """Warned when making an unverified HTTPS request."""
-
-    pass
-
-
-class SystemTimeWarning(SecurityWarning):
-    """Warned when system time is suspected to be wrong"""
-
-    pass
-
-
-class InsecurePlatformWarning(SecurityWarning):
-    """Warned when certain TLS/SSL configuration is not available on a platform."""
-
-    pass
-
-
-class SNIMissingWarning(HTTPWarning):
-    """Warned when making a HTTPS request without SNI available."""
-
-    pass
-
-
-class DependencyWarning(HTTPWarning):
-    """
-    Warned when an attempt is made to import a module with missing optional
-    dependencies.
-    """
-
-    pass
-
-
-class ResponseNotChunked(ProtocolError, ValueError):
-    """Response needs to be chunked in order to read it as chunks."""
-
-    pass
-
-
-class BodyNotHttplibCompatible(HTTPError):
-    """
-    Body should be :class:`http.client.HTTPResponse` like
-    (have an fp attribute which returns raw chunks) for read_chunked().
-    """
-
-    pass
-
-
-class IncompleteRead(HTTPError, httplib_IncompleteRead):
-    """
-    Response length doesn't match expected Content-Length
-
-    Subclass of :class:`http.client.IncompleteRead` to allow int value
-    for ``partial`` to avoid creating large objects on streamed reads.
-    """
-
-    def __init__(self, partial, expected):
-        super(IncompleteRead, self).__init__(partial, expected)
-
-    def __repr__(self):
-        return "IncompleteRead(%i bytes read, %i more expected)" % (
-            self.partial,
-            self.expected,
-        )
-
-
-class InvalidChunkLength(HTTPError, httplib_IncompleteRead):
-    """Invalid chunk length in a chunked response."""
-
-    def __init__(self, response, length):
-        super(InvalidChunkLength, self).__init__(
-            response.tell(), response.length_remaining
-        )
-        self.response = response
-        self.length = length
-
-    def __repr__(self):
-        return "InvalidChunkLength(got length %r, %i bytes read)" % (
-            self.length,
-            self.partial,
-        )
-
-
-class InvalidHeader(HTTPError):
-    """The header provided was somehow invalid."""
-
-    pass
-
-
-class ProxySchemeUnknown(AssertionError, URLSchemeUnknown):
-    """ProxyManager does not support the supplied scheme"""
-
-    # TODO(t-8ch): Stop inheriting from AssertionError in v2.0.
-
-    def __init__(self, scheme):
-        # 'localhost' is here because our URL parser parses
-        # localhost:8080 -> scheme=localhost, remove if we fix this.
-        if scheme == "localhost":
-            scheme = None
-        if scheme is None:
-            message = "Proxy URL had no scheme, should start with http:// or https://"
-        else:
-            message = (
-                "Proxy URL had unsupported scheme %s, should use http:// or https://"
-                % scheme
-            )
-        super(ProxySchemeUnknown, self).__init__(message)
-
-
-class ProxySchemeUnsupported(ValueError):
-    """Fetching HTTPS resources through HTTPS proxies is unsupported"""
-
-    pass
-
-
-class HeaderParsingError(HTTPError):
-    """Raised by assert_header_parsing, but we convert it to a log.warning statement."""
-
-    def __init__(self, defects, unparsed_data):
-        message = "%s, unparsed data: %r" % (defects or "Unknown", unparsed_data)
-        super(HeaderParsingError, self).__init__(message)
-
-
-class UnrewindableBodyError(HTTPError):
-    """urllib3 encountered an error when trying to rewind a body"""
-
-    pass
diff --git a/lib/urllib3/fields.py b/lib/urllib3/fields.py
deleted file mode 100644
index 9d630f49..00000000
--- a/lib/urllib3/fields.py
+++ /dev/null
@@ -1,274 +0,0 @@
-from __future__ import absolute_import
-
-import email.utils
-import mimetypes
-import re
-
-from .packages import six
-
-
-def guess_content_type(filename, default="application/octet-stream"):
-    """
-    Guess the "Content-Type" of a file.
-
-    :param filename:
-        The filename to guess the "Content-Type" of using :mod:`mimetypes`.
-    :param default:
-        If no "Content-Type" can be guessed, default to `default`.
-    """
-    if filename:
-        return mimetypes.guess_type(filename)[0] or default
-    return default
-
-
-def format_header_param_rfc2231(name, value):
-    """
-    Helper function to format and quote a single header parameter using the
-    strategy defined in RFC 2231.
-
-    Particularly useful for header parameters which might contain
-    non-ASCII values, like file names. This follows
-    `RFC 2388 Section 4.4 <https://tools.ietf.org/html/rfc2388#section-4.4>`_.
-
-    :param name:
-        The name of the parameter, a string expected to be ASCII only.
-    :param value:
-        The value of the parameter, provided as ``bytes`` or `str``.
-    :ret:
-        An RFC-2231-formatted unicode string.
-    """
-    if isinstance(value, six.binary_type):
-        value = value.decode("utf-8")
-
-    if not any(ch in value for ch in '"\\\r\n'):
-        result = u'%s="%s"' % (name, value)
-        try:
-            result.encode("ascii")
-        except (UnicodeEncodeError, UnicodeDecodeError):
-            pass
-        else:
-            return result
-
-    if six.PY2:  # Python 2:
-        value = value.encode("utf-8")
-
-    # encode_rfc2231 accepts an encoded string and returns an ascii-encoded
-    # string in Python 2 but accepts and returns unicode strings in Python 3
-    value = email.utils.encode_rfc2231(value, "utf-8")
-    value = "%s*=%s" % (name, value)
-
-    if six.PY2:  # Python 2:
-        value = value.decode("utf-8")
-
-    return value
-
-
-_HTML5_REPLACEMENTS = {
-    u"\u0022": u"%22",
-    # Replace "\" with "\\".
-    u"\u005C": u"\u005C\u005C",
-}
-
-# All control characters from 0x00 to 0x1F *except* 0x1B.
-_HTML5_REPLACEMENTS.update(
-    {
-        six.unichr(cc): u"%{:02X}".format(cc)
-        for cc in range(0x00, 0x1F + 1)
-        if cc not in (0x1B,)
-    }
-)
-
-
-def _replace_multiple(value, needles_and_replacements):
-    def replacer(match):
-        return needles_and_replacements[match.group(0)]
-
-    pattern = re.compile(
-        r"|".join([re.escape(needle) for needle in needles_and_replacements.keys()])
-    )
-
-    result = pattern.sub(replacer, value)
-
-    return result
-
-
-def format_header_param_html5(name, value):
-    """
-    Helper function to format and quote a single header parameter using the
-    HTML5 strategy.
-
-    Particularly useful for header parameters which might contain
-    non-ASCII values, like file names. This follows the `HTML5 Working Draft
-    Section 4.10.22.7`_ and matches the behavior of curl and modern browsers.
-
-    .. _HTML5 Working Draft Section 4.10.22.7:
-        https://w3c.github.io/html/sec-forms.html#multipart-form-data
-
-    :param name:
-        The name of the parameter, a string expected to be ASCII only.
-    :param value:
-        The value of the parameter, provided as ``bytes`` or `str``.
-    :ret:
-        A unicode string, stripped of troublesome characters.
-    """
-    if isinstance(value, six.binary_type):
-        value = value.decode("utf-8")
-
-    value = _replace_multiple(value, _HTML5_REPLACEMENTS)
-
-    return u'%s="%s"' % (name, value)
-
-
-# For backwards-compatibility.
-format_header_param = format_header_param_html5
-
-
-class RequestField(object):
-    """
-    A data container for request body parameters.
-
-    :param name:
-        The name of this request field. Must be unicode.
-    :param data:
-        The data/value body.
-    :param filename:
-        An optional filename of the request field. Must be unicode.
-    :param headers:
-        An optional dict-like object of headers to initially use for the field.
-    :param header_formatter:
-        An optional callable that is used to encode and format the headers. By
-        default, this is :func:`format_header_param_html5`.
-    """
-
-    def __init__(
-        self,
-        name,
-        data,
-        filename=None,
-        headers=None,
-        header_formatter=format_header_param_html5,
-    ):
-        self._name = name
-        self._filename = filename
-        self.data = data
-        self.headers = {}
-        if headers:
-            self.headers = dict(headers)
-        self.header_formatter = header_formatter
-
-    @classmethod
-    def from_tuples(cls, fieldname, value, header_formatter=format_header_param_html5):
-        """
-        A :class:`~urllib3.fields.RequestField` factory from old-style tuple parameters.
-
-        Supports constructing :class:`~urllib3.fields.RequestField` from
-        parameter of key/value strings AND key/filetuple. A filetuple is a
-        (filename, data, MIME type) tuple where the MIME type is optional.
-        For example::
-
-            'foo': 'bar',
-            'fakefile': ('foofile.txt', 'contents of foofile'),
-            'realfile': ('barfile.txt', open('realfile').read()),
-            'typedfile': ('bazfile.bin', open('bazfile').read(), 'image/jpeg'),
-            'nonamefile': 'contents of nonamefile field',
-
-        Field names and filenames must be unicode.
-        """
-        if isinstance(value, tuple):
-            if len(value) == 3:
-                filename, data, content_type = value
-            else:
-                filename, data = value
-                content_type = guess_content_type(filename)
-        else:
-            filename = None
-            content_type = None
-            data = value
-
-        request_param = cls(
-            fieldname, data, filename=filename, header_formatter=header_formatter
-        )
-        request_param.make_multipart(content_type=content_type)
-
-        return request_param
-
-    def _render_part(self, name, value):
-        """
-        Overridable helper function to format a single header parameter. By
-        default, this calls ``self.header_formatter``.
-
-        :param name:
-            The name of the parameter, a string expected to be ASCII only.
-        :param value:
-            The value of the parameter, provided as a unicode string.
-        """
-
-        return self.header_formatter(name, value)
-
-    def _render_parts(self, header_parts):
-        """
-        Helper function to format and quote a single header.
-
-        Useful for single headers that are composed of multiple items. E.g.,
-        'Content-Disposition' fields.
-
-        :param header_parts:
-            A sequence of (k, v) tuples or a :class:`dict` of (k, v) to format
-            as `k1="v1"; k2="v2"; ...`.
-        """
-        parts = []
-        iterable = header_parts
-        if isinstance(header_parts, dict):
-            iterable = header_parts.items()
-
-        for name, value in iterable:
-            if value is not None:
-                parts.append(self._render_part(name, value))
-
-        return u"; ".join(parts)
-
-    def render_headers(self):
-        """
-        Renders the headers for this request field.
-        """
-        lines = []
-
-        sort_keys = ["Content-Disposition", "Content-Type", "Content-Location"]
-        for sort_key in sort_keys:
-            if self.headers.get(sort_key, False):
-                lines.append(u"%s: %s" % (sort_key, self.headers[sort_key]))
-
-        for header_name, header_value in self.headers.items():
-            if header_name not in sort_keys:
-                if header_value:
-                    lines.append(u"%s: %s" % (header_name, header_value))
-
-        lines.append(u"\r\n")
-        return u"\r\n".join(lines)
-
-    def make_multipart(
-        self, content_disposition=None, content_type=None, content_location=None
-    ):
-        """
-        Makes this request field into a multipart request field.
-
-        This method overrides "Content-Disposition", "Content-Type" and
-        "Content-Location" headers to the request parameter.
-
-        :param content_type:
-            The 'Content-Type' of the request body.
-        :param content_location:
-            The 'Content-Location' of the request body.
-
-        """
-        self.headers["Content-Disposition"] = content_disposition or u"form-data"
-        self.headers["Content-Disposition"] += u"; ".join(
-            [
-                u"",
-                self._render_parts(
-                    ((u"name", self._name), (u"filename", self._filename))
-                ),
-            ]
-        )
-        self.headers["Content-Type"] = content_type
-        self.headers["Content-Location"] = content_location
diff --git a/lib/urllib3/packages/__init__.py b/lib/urllib3/packages/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/urllib3/packages/backports/__init__.py b/lib/urllib3/packages/backports/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/urllib3/packages/backports/makefile.py b/lib/urllib3/packages/backports/makefile.py
deleted file mode 100644
index b8fb2154..00000000
--- a/lib/urllib3/packages/backports/makefile.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-backports.makefile
-~~~~~~~~~~~~~~~~~~
-
-Backports the Python 3 ``socket.makefile`` method for use with anything that
-wants to create a "fake" socket object.
-"""
-import io
-from socket import SocketIO
-
-
-def backport_makefile(
-    self, mode="r", buffering=None, encoding=None, errors=None, newline=None
-):
-    """
-    Backport of ``socket.makefile`` from Python 3.5.
-    """
-    if not set(mode) <= {"r", "w", "b"}:
-        raise ValueError("invalid mode %r (only r, w, b allowed)" % (mode,))
-    writing = "w" in mode
-    reading = "r" in mode or not writing
-    assert reading or writing
-    binary = "b" in mode
-    rawmode = ""
-    if reading:
-        rawmode += "r"
-    if writing:
-        rawmode += "w"
-    raw = SocketIO(self, rawmode)
-    self._makefile_refs += 1
-    if buffering is None:
-        buffering = -1
-    if buffering < 0:
-        buffering = io.DEFAULT_BUFFER_SIZE
-    if buffering == 0:
-        if not binary:
-            raise ValueError("unbuffered streams must be binary")
-        return raw
-    if reading and writing:
-        buffer = io.BufferedRWPair(raw, raw, buffering)
-    elif reading:
-        buffer = io.BufferedReader(raw, buffering)
-    else:
-        assert writing
-        buffer = io.BufferedWriter(raw, buffering)
-    if binary:
-        return buffer
-    text = io.TextIOWrapper(buffer, encoding, errors, newline)
-    text.mode = mode
-    return text
diff --git a/lib/urllib3/packages/backports/weakref_finalize.py b/lib/urllib3/packages/backports/weakref_finalize.py
deleted file mode 100644
index a2f2966e..00000000
--- a/lib/urllib3/packages/backports/weakref_finalize.py
+++ /dev/null
@@ -1,155 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-backports.weakref_finalize
-~~~~~~~~~~~~~~~~~~
-
-Backports the Python 3 ``weakref.finalize`` method.
-"""
-from __future__ import absolute_import
-
-import itertools
-import sys
-from weakref import ref
-
-__all__ = ["weakref_finalize"]
-
-
-class weakref_finalize(object):
-    """Class for finalization of weakrefable objects
-    finalize(obj, func, *args, **kwargs) returns a callable finalizer
-    object which will be called when obj is garbage collected. The
-    first time the finalizer is called it evaluates func(*arg, **kwargs)
-    and returns the result. After this the finalizer is dead, and
-    calling it just returns None.
-    When the program exits any remaining finalizers for which the
-    atexit attribute is true will be run in reverse order of creation.
-    By default atexit is true.
-    """
-
-    # Finalizer objects don't have any state of their own.  They are
-    # just used as keys to lookup _Info objects in the registry.  This
-    # ensures that they cannot be part of a ref-cycle.
-
-    __slots__ = ()
-    _registry = {}
-    _shutdown = False
-    _index_iter = itertools.count()
-    _dirty = False
-    _registered_with_atexit = False
-
-    class _Info(object):
-        __slots__ = ("weakref", "func", "args", "kwargs", "atexit", "index")
-
-    def __init__(self, obj, func, *args, **kwargs):
-        if not self._registered_with_atexit:
-            # We may register the exit function more than once because
-            # of a thread race, but that is harmless
-            import atexit
-
-            atexit.register(self._exitfunc)
-            weakref_finalize._registered_with_atexit = True
-        info = self._Info()
-        info.weakref = ref(obj, self)
-        info.func = func
-        info.args = args
-        info.kwargs = kwargs or None
-        info.atexit = True
-        info.index = next(self._index_iter)
-        self._registry[self] = info
-        weakref_finalize._dirty = True
-
-    def __call__(self, _=None):
-        """If alive then mark as dead and return func(*args, **kwargs);
-        otherwise return None"""
-        info = self._registry.pop(self, None)
-        if info and not self._shutdown:
-            return info.func(*info.args, **(info.kwargs or {}))
-
-    def detach(self):
-        """If alive then mark as dead and return (obj, func, args, kwargs);
-        otherwise return None"""
-        info = self._registry.get(self)
-        obj = info and info.weakref()
-        if obj is not None and self._registry.pop(self, None):
-            return (obj, info.func, info.args, info.kwargs or {})
-
-    def peek(self):
-        """If alive then return (obj, func, args, kwargs);
-        otherwise return None"""
-        info = self._registry.get(self)
-        obj = info and info.weakref()
-        if obj is not None:
-            return (obj, info.func, info.args, info.kwargs or {})
-
-    @property
-    def alive(self):
-        """Whether finalizer is alive"""
-        return self in self._registry
-
-    @property
-    def atexit(self):
-        """Whether finalizer should be called at exit"""
-        info = self._registry.get(self)
-        return bool(info) and info.atexit
-
-    @atexit.setter
-    def atexit(self, value):
-        info = self._registry.get(self)
-        if info:
-            info.atexit = bool(value)
-
-    def __repr__(self):
-        info = self._registry.get(self)
-        obj = info and info.weakref()
-        if obj is None:
-            return "<%s object at %#x; dead>" % (type(self).__name__, id(self))
-        else:
-            return "<%s object at %#x; for %r at %#x>" % (
-                type(self).__name__,
-                id(self),
-                type(obj).__name__,
-                id(obj),
-            )
-
-    @classmethod
-    def _select_for_exit(cls):
-        # Return live finalizers marked for exit, oldest first
-        L = [(f, i) for (f, i) in cls._registry.items() if i.atexit]
-        L.sort(key=lambda item: item[1].index)
-        return [f for (f, i) in L]
-
-    @classmethod
-    def _exitfunc(cls):
-        # At shutdown invoke finalizers for which atexit is true.
-        # This is called once all other non-daemonic threads have been
-        # joined.
-        reenable_gc = False
-        try:
-            if cls._registry:
-                import gc
-
-                if gc.isenabled():
-                    reenable_gc = True
-                    gc.disable()
-                pending = None
-                while True:
-                    if pending is None or weakref_finalize._dirty:
-                        pending = cls._select_for_exit()
-                        weakref_finalize._dirty = False
-                    if not pending:
-                        break
-                    f = pending.pop()
-                    try:
-                        # gc is disabled, so (assuming no daemonic
-                        # threads) the following is the only line in
-                        # this function which might trigger creation
-                        # of a new finalizer
-                        f()
-                    except Exception:
-                        sys.excepthook(*sys.exc_info())
-                    assert f not in cls._registry
-        finally:
-            # prevent any more finalizers from executing during shutdown
-            weakref_finalize._shutdown = True
-            if reenable_gc:
-                gc.enable()
diff --git a/lib/urllib3/packages/six.py b/lib/urllib3/packages/six.py
deleted file mode 100644
index f099a3dc..00000000
--- a/lib/urllib3/packages/six.py
+++ /dev/null
@@ -1,1076 +0,0 @@
-# Copyright (c) 2010-2020 Benjamin Peterson
-#
-# 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.
-
-"""Utilities for writing code that runs on Python 2 and 3"""
-
-from __future__ import absolute_import
-
-import functools
-import itertools
-import operator
-import sys
-import types
-
-__author__ = "Benjamin Peterson <benjamin@python.org>"
-__version__ = "1.16.0"
-
-
-# Useful for very coarse version differentiation.
-PY2 = sys.version_info[0] == 2
-PY3 = sys.version_info[0] == 3
-PY34 = sys.version_info[0:2] >= (3, 4)
-
-if PY3:
-    string_types = (str,)
-    integer_types = (int,)
-    class_types = (type,)
-    text_type = str
-    binary_type = bytes
-
-    MAXSIZE = sys.maxsize
-else:
-    string_types = (basestring,)
-    integer_types = (int, long)
-    class_types = (type, types.ClassType)
-    text_type = unicode
-    binary_type = str
-
-    if sys.platform.startswith("java"):
-        # Jython always uses 32 bits.
-        MAXSIZE = int((1 << 31) - 1)
-    else:
-        # It's possible to have sizeof(long) != sizeof(Py_ssize_t).
-        class X(object):
-            def __len__(self):
-                return 1 << 31
-
-        try:
-            len(X())
-        except OverflowError:
-            # 32-bit
-            MAXSIZE = int((1 << 31) - 1)
-        else:
-            # 64-bit
-            MAXSIZE = int((1 << 63) - 1)
-        del X
-
-if PY34:
-    from importlib.util import spec_from_loader
-else:
-    spec_from_loader = None
-
-
-def _add_doc(func, doc):
-    """Add documentation to a function."""
-    func.__doc__ = doc
-
-
-def _import_module(name):
-    """Import module, returning the module after the last dot."""
-    __import__(name)
-    return sys.modules[name]
-
-
-class _LazyDescr(object):
-    def __init__(self, name):
-        self.name = name
-
-    def __get__(self, obj, tp):
-        result = self._resolve()
-        setattr(obj, self.name, result)  # Invokes __set__.
-        try:
-            # This is a bit ugly, but it avoids running this again by
-            # removing this descriptor.
-            delattr(obj.__class__, self.name)
-        except AttributeError:
-            pass
-        return result
-
-
-class MovedModule(_LazyDescr):
-    def __init__(self, name, old, new=None):
-        super(MovedModule, self).__init__(name)
-        if PY3:
-            if new is None:
-                new = name
-            self.mod = new
-        else:
-            self.mod = old
-
-    def _resolve(self):
-        return _import_module(self.mod)
-
-    def __getattr__(self, attr):
-        _module = self._resolve()
-        value = getattr(_module, attr)
-        setattr(self, attr, value)
-        return value
-
-
-class _LazyModule(types.ModuleType):
-    def __init__(self, name):
-        super(_LazyModule, self).__init__(name)
-        self.__doc__ = self.__class__.__doc__
-
-    def __dir__(self):
-        attrs = ["__doc__", "__name__"]
-        attrs += [attr.name for attr in self._moved_attributes]
-        return attrs
-
-    # Subclasses should override this
-    _moved_attributes = []
-
-
-class MovedAttribute(_LazyDescr):
-    def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None):
-        super(MovedAttribute, self).__init__(name)
-        if PY3:
-            if new_mod is None:
-                new_mod = name
-            self.mod = new_mod
-            if new_attr is None:
-                if old_attr is None:
-                    new_attr = name
-                else:
-                    new_attr = old_attr
-            self.attr = new_attr
-        else:
-            self.mod = old_mod
-            if old_attr is None:
-                old_attr = name
-            self.attr = old_attr
-
-    def _resolve(self):
-        module = _import_module(self.mod)
-        return getattr(module, self.attr)
-
-
-class _SixMetaPathImporter(object):
-
-    """
-    A meta path importer to import six.moves and its submodules.
-
-    This class implements a PEP302 finder and loader. It should be compatible
-    with Python 2.5 and all existing versions of Python3
-    """
-
-    def __init__(self, six_module_name):
-        self.name = six_module_name
-        self.known_modules = {}
-
-    def _add_module(self, mod, *fullnames):
-        for fullname in fullnames:
-            self.known_modules[self.name + "." + fullname] = mod
-
-    def _get_module(self, fullname):
-        return self.known_modules[self.name + "." + fullname]
-
-    def find_module(self, fullname, path=None):
-        if fullname in self.known_modules:
-            return self
-        return None
-
-    def find_spec(self, fullname, path, target=None):
-        if fullname in self.known_modules:
-            return spec_from_loader(fullname, self)
-        return None
-
-    def __get_module(self, fullname):
-        try:
-            return self.known_modules[fullname]
-        except KeyError:
-            raise ImportError("This loader does not know module " + fullname)
-
-    def load_module(self, fullname):
-        try:
-            # in case of a reload
-            return sys.modules[fullname]
-        except KeyError:
-            pass
-        mod = self.__get_module(fullname)
-        if isinstance(mod, MovedModule):
-            mod = mod._resolve()
-        else:
-            mod.__loader__ = self
-        sys.modules[fullname] = mod
-        return mod
-
-    def is_package(self, fullname):
-        """
-        Return true, if the named module is a package.
-
-        We need this method to get correct spec objects with
-        Python 3.4 (see PEP451)
-        """
-        return hasattr(self.__get_module(fullname), "__path__")
-
-    def get_code(self, fullname):
-        """Return None
-
-        Required, if is_package is implemented"""
-        self.__get_module(fullname)  # eventually raises ImportError
-        return None
-
-    get_source = get_code  # same as get_code
-
-    def create_module(self, spec):
-        return self.load_module(spec.name)
-
-    def exec_module(self, module):
-        pass
-
-
-_importer = _SixMetaPathImporter(__name__)
-
-
-class _MovedItems(_LazyModule):
-
-    """Lazy loading of moved objects"""
-
-    __path__ = []  # mark as package
-
-
-_moved_attributes = [
-    MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"),
-    MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"),
-    MovedAttribute(
-        "filterfalse", "itertools", "itertools", "ifilterfalse", "filterfalse"
-    ),
-    MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
-    MovedAttribute("intern", "__builtin__", "sys"),
-    MovedAttribute("map", "itertools", "builtins", "imap", "map"),
-    MovedAttribute("getcwd", "os", "os", "getcwdu", "getcwd"),
-    MovedAttribute("getcwdb", "os", "os", "getcwd", "getcwdb"),
-    MovedAttribute("getoutput", "commands", "subprocess"),
-    MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"),
-    MovedAttribute(
-        "reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"
-    ),
-    MovedAttribute("reduce", "__builtin__", "functools"),
-    MovedAttribute("shlex_quote", "pipes", "shlex", "quote"),
-    MovedAttribute("StringIO", "StringIO", "io"),
-    MovedAttribute("UserDict", "UserDict", "collections"),
-    MovedAttribute("UserList", "UserList", "collections"),
-    MovedAttribute("UserString", "UserString", "collections"),
-    MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
-    MovedAttribute("zip", "itertools", "builtins", "izip", "zip"),
-    MovedAttribute(
-        "zip_longest", "itertools", "itertools", "izip_longest", "zip_longest"
-    ),
-    MovedModule("builtins", "__builtin__"),
-    MovedModule("configparser", "ConfigParser"),
-    MovedModule(
-        "collections_abc",
-        "collections",
-        "collections.abc" if sys.version_info >= (3, 3) else "collections",
-    ),
-    MovedModule("copyreg", "copy_reg"),
-    MovedModule("dbm_gnu", "gdbm", "dbm.gnu"),
-    MovedModule("dbm_ndbm", "dbm", "dbm.ndbm"),
-    MovedModule(
-        "_dummy_thread",
-        "dummy_thread",
-        "_dummy_thread" if sys.version_info < (3, 9) else "_thread",
-    ),
-    MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
-    MovedModule("http_cookies", "Cookie", "http.cookies"),
-    MovedModule("html_entities", "htmlentitydefs", "html.entities"),
-    MovedModule("html_parser", "HTMLParser", "html.parser"),
-    MovedModule("http_client", "httplib", "http.client"),
-    MovedModule("email_mime_base", "email.MIMEBase", "email.mime.base"),
-    MovedModule("email_mime_image", "email.MIMEImage", "email.mime.image"),
-    MovedModule("email_mime_multipart", "email.MIMEMultipart", "email.mime.multipart"),
-    MovedModule(
-        "email_mime_nonmultipart", "email.MIMENonMultipart", "email.mime.nonmultipart"
-    ),
-    MovedModule("email_mime_text", "email.MIMEText", "email.mime.text"),
-    MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),
-    MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
-    MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),
-    MovedModule("cPickle", "cPickle", "pickle"),
-    MovedModule("queue", "Queue"),
-    MovedModule("reprlib", "repr"),
-    MovedModule("socketserver", "SocketServer"),
-    MovedModule("_thread", "thread", "_thread"),
-    MovedModule("tkinter", "Tkinter"),
-    MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"),
-    MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"),
-    MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"),
-    MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"),
-    MovedModule("tkinter_tix", "Tix", "tkinter.tix"),
-    MovedModule("tkinter_ttk", "ttk", "tkinter.ttk"),
-    MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"),
-    MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"),
-    MovedModule("tkinter_colorchooser", "tkColorChooser", "tkinter.colorchooser"),
-    MovedModule("tkinter_commondialog", "tkCommonDialog", "tkinter.commondialog"),
-    MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"),
-    MovedModule("tkinter_font", "tkFont", "tkinter.font"),
-    MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"),
-    MovedModule("tkinter_tksimpledialog", "tkSimpleDialog", "tkinter.simpledialog"),
-    MovedModule("urllib_parse", __name__ + ".moves.urllib_parse", "urllib.parse"),
-    MovedModule("urllib_error", __name__ + ".moves.urllib_error", "urllib.error"),
-    MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"),
-    MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
-    MovedModule("xmlrpc_client", "xmlrpclib", "xmlrpc.client"),
-    MovedModule("xmlrpc_server", "SimpleXMLRPCServer", "xmlrpc.server"),
-]
-# Add windows specific modules.
-if sys.platform == "win32":
-    _moved_attributes += [
-        MovedModule("winreg", "_winreg"),
-    ]
-
-for attr in _moved_attributes:
-    setattr(_MovedItems, attr.name, attr)
-    if isinstance(attr, MovedModule):
-        _importer._add_module(attr, "moves." + attr.name)
-del attr
-
-_MovedItems._moved_attributes = _moved_attributes
-
-moves = _MovedItems(__name__ + ".moves")
-_importer._add_module(moves, "moves")
-
-
-class Module_six_moves_urllib_parse(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_parse"""
-
-
-_urllib_parse_moved_attributes = [
-    MovedAttribute("ParseResult", "urlparse", "urllib.parse"),
-    MovedAttribute("SplitResult", "urlparse", "urllib.parse"),
-    MovedAttribute("parse_qs", "urlparse", "urllib.parse"),
-    MovedAttribute("parse_qsl", "urlparse", "urllib.parse"),
-    MovedAttribute("urldefrag", "urlparse", "urllib.parse"),
-    MovedAttribute("urljoin", "urlparse", "urllib.parse"),
-    MovedAttribute("urlparse", "urlparse", "urllib.parse"),
-    MovedAttribute("urlsplit", "urlparse", "urllib.parse"),
-    MovedAttribute("urlunparse", "urlparse", "urllib.parse"),
-    MovedAttribute("urlunsplit", "urlparse", "urllib.parse"),
-    MovedAttribute("quote", "urllib", "urllib.parse"),
-    MovedAttribute("quote_plus", "urllib", "urllib.parse"),
-    MovedAttribute("unquote", "urllib", "urllib.parse"),
-    MovedAttribute("unquote_plus", "urllib", "urllib.parse"),
-    MovedAttribute(
-        "unquote_to_bytes", "urllib", "urllib.parse", "unquote", "unquote_to_bytes"
-    ),
-    MovedAttribute("urlencode", "urllib", "urllib.parse"),
-    MovedAttribute("splitquery", "urllib", "urllib.parse"),
-    MovedAttribute("splittag", "urllib", "urllib.parse"),
-    MovedAttribute("splituser", "urllib", "urllib.parse"),
-    MovedAttribute("splitvalue", "urllib", "urllib.parse"),
-    MovedAttribute("uses_fragment", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_netloc", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_params", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_query", "urlparse", "urllib.parse"),
-    MovedAttribute("uses_relative", "urlparse", "urllib.parse"),
-]
-for attr in _urllib_parse_moved_attributes:
-    setattr(Module_six_moves_urllib_parse, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_parse._moved_attributes = _urllib_parse_moved_attributes
-
-_importer._add_module(
-    Module_six_moves_urllib_parse(__name__ + ".moves.urllib_parse"),
-    "moves.urllib_parse",
-    "moves.urllib.parse",
-)
-
-
-class Module_six_moves_urllib_error(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_error"""
-
-
-_urllib_error_moved_attributes = [
-    MovedAttribute("URLError", "urllib2", "urllib.error"),
-    MovedAttribute("HTTPError", "urllib2", "urllib.error"),
-    MovedAttribute("ContentTooShortError", "urllib", "urllib.error"),
-]
-for attr in _urllib_error_moved_attributes:
-    setattr(Module_six_moves_urllib_error, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_error._moved_attributes = _urllib_error_moved_attributes
-
-_importer._add_module(
-    Module_six_moves_urllib_error(__name__ + ".moves.urllib.error"),
-    "moves.urllib_error",
-    "moves.urllib.error",
-)
-
-
-class Module_six_moves_urllib_request(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_request"""
-
-
-_urllib_request_moved_attributes = [
-    MovedAttribute("urlopen", "urllib2", "urllib.request"),
-    MovedAttribute("install_opener", "urllib2", "urllib.request"),
-    MovedAttribute("build_opener", "urllib2", "urllib.request"),
-    MovedAttribute("pathname2url", "urllib", "urllib.request"),
-    MovedAttribute("url2pathname", "urllib", "urllib.request"),
-    MovedAttribute("getproxies", "urllib", "urllib.request"),
-    MovedAttribute("Request", "urllib2", "urllib.request"),
-    MovedAttribute("OpenerDirector", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPDefaultErrorHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPRedirectHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPCookieProcessor", "urllib2", "urllib.request"),
-    MovedAttribute("ProxyHandler", "urllib2", "urllib.request"),
-    MovedAttribute("BaseHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPPasswordMgr", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPPasswordMgrWithDefaultRealm", "urllib2", "urllib.request"),
-    MovedAttribute("AbstractBasicAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPBasicAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("ProxyBasicAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("AbstractDigestAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPDigestAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("ProxyDigestAuthHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPSHandler", "urllib2", "urllib.request"),
-    MovedAttribute("FileHandler", "urllib2", "urllib.request"),
-    MovedAttribute("FTPHandler", "urllib2", "urllib.request"),
-    MovedAttribute("CacheFTPHandler", "urllib2", "urllib.request"),
-    MovedAttribute("UnknownHandler", "urllib2", "urllib.request"),
-    MovedAttribute("HTTPErrorProcessor", "urllib2", "urllib.request"),
-    MovedAttribute("urlretrieve", "urllib", "urllib.request"),
-    MovedAttribute("urlcleanup", "urllib", "urllib.request"),
-    MovedAttribute("URLopener", "urllib", "urllib.request"),
-    MovedAttribute("FancyURLopener", "urllib", "urllib.request"),
-    MovedAttribute("proxy_bypass", "urllib", "urllib.request"),
-    MovedAttribute("parse_http_list", "urllib2", "urllib.request"),
-    MovedAttribute("parse_keqv_list", "urllib2", "urllib.request"),
-]
-for attr in _urllib_request_moved_attributes:
-    setattr(Module_six_moves_urllib_request, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_request._moved_attributes = _urllib_request_moved_attributes
-
-_importer._add_module(
-    Module_six_moves_urllib_request(__name__ + ".moves.urllib.request"),
-    "moves.urllib_request",
-    "moves.urllib.request",
-)
-
-
-class Module_six_moves_urllib_response(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_response"""
-
-
-_urllib_response_moved_attributes = [
-    MovedAttribute("addbase", "urllib", "urllib.response"),
-    MovedAttribute("addclosehook", "urllib", "urllib.response"),
-    MovedAttribute("addinfo", "urllib", "urllib.response"),
-    MovedAttribute("addinfourl", "urllib", "urllib.response"),
-]
-for attr in _urllib_response_moved_attributes:
-    setattr(Module_six_moves_urllib_response, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_response._moved_attributes = _urllib_response_moved_attributes
-
-_importer._add_module(
-    Module_six_moves_urllib_response(__name__ + ".moves.urllib.response"),
-    "moves.urllib_response",
-    "moves.urllib.response",
-)
-
-
-class Module_six_moves_urllib_robotparser(_LazyModule):
-
-    """Lazy loading of moved objects in six.moves.urllib_robotparser"""
-
-
-_urllib_robotparser_moved_attributes = [
-    MovedAttribute("RobotFileParser", "robotparser", "urllib.robotparser"),
-]
-for attr in _urllib_robotparser_moved_attributes:
-    setattr(Module_six_moves_urllib_robotparser, attr.name, attr)
-del attr
-
-Module_six_moves_urllib_robotparser._moved_attributes = (
-    _urllib_robotparser_moved_attributes
-)
-
-_importer._add_module(
-    Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib.robotparser"),
-    "moves.urllib_robotparser",
-    "moves.urllib.robotparser",
-)
-
-
-class Module_six_moves_urllib(types.ModuleType):
-
-    """Create a six.moves.urllib namespace that resembles the Python 3 namespace"""
-
-    __path__ = []  # mark as package
-    parse = _importer._get_module("moves.urllib_parse")
-    error = _importer._get_module("moves.urllib_error")
-    request = _importer._get_module("moves.urllib_request")
-    response = _importer._get_module("moves.urllib_response")
-    robotparser = _importer._get_module("moves.urllib_robotparser")
-
-    def __dir__(self):
-        return ["parse", "error", "request", "response", "robotparser"]
-
-
-_importer._add_module(
-    Module_six_moves_urllib(__name__ + ".moves.urllib"), "moves.urllib"
-)
-
-
-def add_move(move):
-    """Add an item to six.moves."""
-    setattr(_MovedItems, move.name, move)
-
-
-def remove_move(name):
-    """Remove item from six.moves."""
-    try:
-        delattr(_MovedItems, name)
-    except AttributeError:
-        try:
-            del moves.__dict__[name]
-        except KeyError:
-            raise AttributeError("no such move, %r" % (name,))
-
-
-if PY3:
-    _meth_func = "__func__"
-    _meth_self = "__self__"
-
-    _func_closure = "__closure__"
-    _func_code = "__code__"
-    _func_defaults = "__defaults__"
-    _func_globals = "__globals__"
-else:
-    _meth_func = "im_func"
-    _meth_self = "im_self"
-
-    _func_closure = "func_closure"
-    _func_code = "func_code"
-    _func_defaults = "func_defaults"
-    _func_globals = "func_globals"
-
-
-try:
-    advance_iterator = next
-except NameError:
-
-    def advance_iterator(it):
-        return it.next()
-
-
-next = advance_iterator
-
-
-try:
-    callable = callable
-except NameError:
-
-    def callable(obj):
-        return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
-
-
-if PY3:
-
-    def get_unbound_function(unbound):
-        return unbound
-
-    create_bound_method = types.MethodType
-
-    def create_unbound_method(func, cls):
-        return func
-
-    Iterator = object
-else:
-
-    def get_unbound_function(unbound):
-        return unbound.im_func
-
-    def create_bound_method(func, obj):
-        return types.MethodType(func, obj, obj.__class__)
-
-    def create_unbound_method(func, cls):
-        return types.MethodType(func, None, cls)
-
-    class Iterator(object):
-        def next(self):
-            return type(self).__next__(self)
-
-    callable = callable
-_add_doc(
-    get_unbound_function, """Get the function out of a possibly unbound function"""
-)
-
-
-get_method_function = operator.attrgetter(_meth_func)
-get_method_self = operator.attrgetter(_meth_self)
-get_function_closure = operator.attrgetter(_func_closure)
-get_function_code = operator.attrgetter(_func_code)
-get_function_defaults = operator.attrgetter(_func_defaults)
-get_function_globals = operator.attrgetter(_func_globals)
-
-
-if PY3:
-
-    def iterkeys(d, **kw):
-        return iter(d.keys(**kw))
-
-    def itervalues(d, **kw):
-        return iter(d.values(**kw))
-
-    def iteritems(d, **kw):
-        return iter(d.items(**kw))
-
-    def iterlists(d, **kw):
-        return iter(d.lists(**kw))
-
-    viewkeys = operator.methodcaller("keys")
-
-    viewvalues = operator.methodcaller("values")
-
-    viewitems = operator.methodcaller("items")
-else:
-
-    def iterkeys(d, **kw):
-        return d.iterkeys(**kw)
-
-    def itervalues(d, **kw):
-        return d.itervalues(**kw)
-
-    def iteritems(d, **kw):
-        return d.iteritems(**kw)
-
-    def iterlists(d, **kw):
-        return d.iterlists(**kw)
-
-    viewkeys = operator.methodcaller("viewkeys")
-
-    viewvalues = operator.methodcaller("viewvalues")
-
-    viewitems = operator.methodcaller("viewitems")
-
-_add_doc(iterkeys, "Return an iterator over the keys of a dictionary.")
-_add_doc(itervalues, "Return an iterator over the values of a dictionary.")
-_add_doc(iteritems, "Return an iterator over the (key, value) pairs of a dictionary.")
-_add_doc(
-    iterlists, "Return an iterator over the (key, [values]) pairs of a dictionary."
-)
-
-
-if PY3:
-
-    def b(s):
-        return s.encode("latin-1")
-
-    def u(s):
-        return s
-
-    unichr = chr
-    import struct
-
-    int2byte = struct.Struct(">B").pack
-    del struct
-    byte2int = operator.itemgetter(0)
-    indexbytes = operator.getitem
-    iterbytes = iter
-    import io
-
-    StringIO = io.StringIO
-    BytesIO = io.BytesIO
-    del io
-    _assertCountEqual = "assertCountEqual"
-    if sys.version_info[1] <= 1:
-        _assertRaisesRegex = "assertRaisesRegexp"
-        _assertRegex = "assertRegexpMatches"
-        _assertNotRegex = "assertNotRegexpMatches"
-    else:
-        _assertRaisesRegex = "assertRaisesRegex"
-        _assertRegex = "assertRegex"
-        _assertNotRegex = "assertNotRegex"
-else:
-
-    def b(s):
-        return s
-
-    # Workaround for standalone backslash
-
-    def u(s):
-        return unicode(s.replace(r"\\", r"\\\\"), "unicode_escape")
-
-    unichr = unichr
-    int2byte = chr
-
-    def byte2int(bs):
-        return ord(bs[0])
-
-    def indexbytes(buf, i):
-        return ord(buf[i])
-
-    iterbytes = functools.partial(itertools.imap, ord)
-    import StringIO
-
-    StringIO = BytesIO = StringIO.StringIO
-    _assertCountEqual = "assertItemsEqual"
-    _assertRaisesRegex = "assertRaisesRegexp"
-    _assertRegex = "assertRegexpMatches"
-    _assertNotRegex = "assertNotRegexpMatches"
-_add_doc(b, """Byte literal""")
-_add_doc(u, """Text literal""")
-
-
-def assertCountEqual(self, *args, **kwargs):
-    return getattr(self, _assertCountEqual)(*args, **kwargs)
-
-
-def assertRaisesRegex(self, *args, **kwargs):
-    return getattr(self, _assertRaisesRegex)(*args, **kwargs)
-
-
-def assertRegex(self, *args, **kwargs):
-    return getattr(self, _assertRegex)(*args, **kwargs)
-
-
-def assertNotRegex(self, *args, **kwargs):
-    return getattr(self, _assertNotRegex)(*args, **kwargs)
-
-
-if PY3:
-    exec_ = getattr(moves.builtins, "exec")
-
-    def reraise(tp, value, tb=None):
-        try:
-            if value is None:
-                value = tp()
-            if value.__traceback__ is not tb:
-                raise value.with_traceback(tb)
-            raise value
-        finally:
-            value = None
-            tb = None
-
-else:
-
-    def exec_(_code_, _globs_=None, _locs_=None):
-        """Execute code in a namespace."""
-        if _globs_ is None:
-            frame = sys._getframe(1)
-            _globs_ = frame.f_globals
-            if _locs_ is None:
-                _locs_ = frame.f_locals
-            del frame
-        elif _locs_ is None:
-            _locs_ = _globs_
-        exec ("""exec _code_ in _globs_, _locs_""")
-
-    exec_(
-        """def reraise(tp, value, tb=None):
-    try:
-        raise tp, value, tb
-    finally:
-        tb = None
-"""
-    )
-
-
-if sys.version_info[:2] > (3,):
-    exec_(
-        """def raise_from(value, from_value):
-    try:
-        raise value from from_value
-    finally:
-        value = None
-"""
-    )
-else:
-
-    def raise_from(value, from_value):
-        raise value
-
-
-print_ = getattr(moves.builtins, "print", None)
-if print_ is None:
-
-    def print_(*args, **kwargs):
-        """The new-style print function for Python 2.4 and 2.5."""
-        fp = kwargs.pop("file", sys.stdout)
-        if fp is None:
-            return
-
-        def write(data):
-            if not isinstance(data, basestring):
-                data = str(data)
-            # If the file has an encoding, encode unicode with it.
-            if (
-                isinstance(fp, file)
-                and isinstance(data, unicode)
-                and fp.encoding is not None
-            ):
-                errors = getattr(fp, "errors", None)
-                if errors is None:
-                    errors = "strict"
-                data = data.encode(fp.encoding, errors)
-            fp.write(data)
-
-        want_unicode = False
-        sep = kwargs.pop("sep", None)
-        if sep is not None:
-            if isinstance(sep, unicode):
-                want_unicode = True
-            elif not isinstance(sep, str):
-                raise TypeError("sep must be None or a string")
-        end = kwargs.pop("end", None)
-        if end is not None:
-            if isinstance(end, unicode):
-                want_unicode = True
-            elif not isinstance(end, str):
-                raise TypeError("end must be None or a string")
-        if kwargs:
-            raise TypeError("invalid keyword arguments to print()")
-        if not want_unicode:
-            for arg in args:
-                if isinstance(arg, unicode):
-                    want_unicode = True
-                    break
-        if want_unicode:
-            newline = unicode("\n")
-            space = unicode(" ")
-        else:
-            newline = "\n"
-            space = " "
-        if sep is None:
-            sep = space
-        if end is None:
-            end = newline
-        for i, arg in enumerate(args):
-            if i:
-                write(sep)
-            write(arg)
-        write(end)
-
-
-if sys.version_info[:2] < (3, 3):
-    _print = print_
-
-    def print_(*args, **kwargs):
-        fp = kwargs.get("file", sys.stdout)
-        flush = kwargs.pop("flush", False)
-        _print(*args, **kwargs)
-        if flush and fp is not None:
-            fp.flush()
-
-
-_add_doc(reraise, """Reraise an exception.""")
-
-if sys.version_info[0:2] < (3, 4):
-    # This does exactly the same what the :func:`py3:functools.update_wrapper`
-    # function does on Python versions after 3.2. It sets the ``__wrapped__``
-    # attribute on ``wrapper`` object and it doesn't raise an error if any of
-    # the attributes mentioned in ``assigned`` and ``updated`` are missing on
-    # ``wrapped`` object.
-    def _update_wrapper(
-        wrapper,
-        wrapped,
-        assigned=functools.WRAPPER_ASSIGNMENTS,
-        updated=functools.WRAPPER_UPDATES,
-    ):
-        for attr in assigned:
-            try:
-                value = getattr(wrapped, attr)
-            except AttributeError:
-                continue
-            else:
-                setattr(wrapper, attr, value)
-        for attr in updated:
-            getattr(wrapper, attr).update(getattr(wrapped, attr, {}))
-        wrapper.__wrapped__ = wrapped
-        return wrapper
-
-    _update_wrapper.__doc__ = functools.update_wrapper.__doc__
-
-    def wraps(
-        wrapped,
-        assigned=functools.WRAPPER_ASSIGNMENTS,
-        updated=functools.WRAPPER_UPDATES,
-    ):
-        return functools.partial(
-            _update_wrapper, wrapped=wrapped, assigned=assigned, updated=updated
-        )
-
-    wraps.__doc__ = functools.wraps.__doc__
-
-else:
-    wraps = functools.wraps
-
-
-def with_metaclass(meta, *bases):
-    """Create a base class with a metaclass."""
-    # This requires a bit of explanation: the basic idea is to make a dummy
-    # metaclass for one level of class instantiation that replaces itself with
-    # the actual metaclass.
-    class metaclass(type):
-        def __new__(cls, name, this_bases, d):
-            if sys.version_info[:2] >= (3, 7):
-                # This version introduced PEP 560 that requires a bit
-                # of extra care (we mimic what is done by __build_class__).
-                resolved_bases = types.resolve_bases(bases)
-                if resolved_bases is not bases:
-                    d["__orig_bases__"] = bases
-            else:
-                resolved_bases = bases
-            return meta(name, resolved_bases, d)
-
-        @classmethod
-        def __prepare__(cls, name, this_bases):
-            return meta.__prepare__(name, bases)
-
-    return type.__new__(metaclass, "temporary_class", (), {})
-
-
-def add_metaclass(metaclass):
-    """Class decorator for creating a class with a metaclass."""
-
-    def wrapper(cls):
-        orig_vars = cls.__dict__.copy()
-        slots = orig_vars.get("__slots__")
-        if slots is not None:
-            if isinstance(slots, str):
-                slots = [slots]
-            for slots_var in slots:
-                orig_vars.pop(slots_var)
-        orig_vars.pop("__dict__", None)
-        orig_vars.pop("__weakref__", None)
-        if hasattr(cls, "__qualname__"):
-            orig_vars["__qualname__"] = cls.__qualname__
-        return metaclass(cls.__name__, cls.__bases__, orig_vars)
-
-    return wrapper
-
-
-def ensure_binary(s, encoding="utf-8", errors="strict"):
-    """Coerce **s** to six.binary_type.
-
-    For Python 2:
-      - `unicode` -> encoded to `str`
-      - `str` -> `str`
-
-    For Python 3:
-      - `str` -> encoded to `bytes`
-      - `bytes` -> `bytes`
-    """
-    if isinstance(s, binary_type):
-        return s
-    if isinstance(s, text_type):
-        return s.encode(encoding, errors)
-    raise TypeError("not expecting type '%s'" % type(s))
-
-
-def ensure_str(s, encoding="utf-8", errors="strict"):
-    """Coerce *s* to `str`.
-
-    For Python 2:
-      - `unicode` -> encoded to `str`
-      - `str` -> `str`
-
-    For Python 3:
-      - `str` -> `str`
-      - `bytes` -> decoded to `str`
-    """
-    # Optimization: Fast return for the common case.
-    if type(s) is str:
-        return s
-    if PY2 and isinstance(s, text_type):
-        return s.encode(encoding, errors)
-    elif PY3 and isinstance(s, binary_type):
-        return s.decode(encoding, errors)
-    elif not isinstance(s, (text_type, binary_type)):
-        raise TypeError("not expecting type '%s'" % type(s))
-    return s
-
-
-def ensure_text(s, encoding="utf-8", errors="strict"):
-    """Coerce *s* to six.text_type.
-
-    For Python 2:
-      - `unicode` -> `unicode`
-      - `str` -> `unicode`
-
-    For Python 3:
-      - `str` -> `str`
-      - `bytes` -> decoded to `str`
-    """
-    if isinstance(s, binary_type):
-        return s.decode(encoding, errors)
-    elif isinstance(s, text_type):
-        return s
-    else:
-        raise TypeError("not expecting type '%s'" % type(s))
-
-
-def python_2_unicode_compatible(klass):
-    """
-    A class decorator that defines __unicode__ and __str__ methods under Python 2.
-    Under Python 3 it does nothing.
-
-    To support Python 2 and 3 with a single code base, define a __str__ method
-    returning text and apply this decorator to the class.
-    """
-    if PY2:
-        if "__str__" not in klass.__dict__:
-            raise ValueError(
-                "@python_2_unicode_compatible cannot be applied "
-                "to %s because it doesn't define __str__()." % klass.__name__
-            )
-        klass.__unicode__ = klass.__str__
-        klass.__str__ = lambda self: self.__unicode__().encode("utf-8")
-    return klass
-
-
-# Complete the moves implementation.
-# This code is at the end of this module to speed up module loading.
-# Turn this module into a package.
-__path__ = []  # required for PEP 302 and PEP 451
-__package__ = __name__  # see PEP 366 @ReservedAssignment
-if globals().get("__spec__") is not None:
-    __spec__.submodule_search_locations = []  # PEP 451 @UndefinedVariable
-# Remove other six meta path importers, since they cause problems. This can
-# happen if six is removed from sys.modules and then reloaded. (Setuptools does
-# this for some reason.)
-if sys.meta_path:
-    for i, importer in enumerate(sys.meta_path):
-        # Here's some real nastiness: Another "instance" of the six module might
-        # be floating around. Therefore, we can't use isinstance() to check for
-        # the six meta path importer, since the other six instance will have
-        # inserted an importer with different class.
-        if (
-            type(importer).__name__ == "_SixMetaPathImporter"
-            and importer.name == __name__
-        ):
-            del sys.meta_path[i]
-            break
-    del i, importer
-# Finally, add the importer to the meta path import hook.
-sys.meta_path.append(_importer)
diff --git a/lib/urllib3/poolmanager.py b/lib/urllib3/poolmanager.py
deleted file mode 100644
index 14b10daf..00000000
--- a/lib/urllib3/poolmanager.py
+++ /dev/null
@@ -1,537 +0,0 @@
-from __future__ import absolute_import
-
-import collections
-import functools
-import logging
-
-from ._collections import RecentlyUsedContainer
-from .connectionpool import HTTPConnectionPool, HTTPSConnectionPool, port_by_scheme
-from .exceptions import (
-    LocationValueError,
-    MaxRetryError,
-    ProxySchemeUnknown,
-    ProxySchemeUnsupported,
-    URLSchemeUnknown,
-)
-from .packages import six
-from .packages.six.moves.urllib.parse import urljoin
-from .request import RequestMethods
-from .util.proxy import connection_requires_http_tunnel
-from .util.retry import Retry
-from .util.url import parse_url
-
-__all__ = ["PoolManager", "ProxyManager", "proxy_from_url"]
-
-
-log = logging.getLogger(__name__)
-
-SSL_KEYWORDS = (
-    "key_file",
-    "cert_file",
-    "cert_reqs",
-    "ca_certs",
-    "ssl_version",
-    "ca_cert_dir",
-    "ssl_context",
-    "key_password",
-    "server_hostname",
-)
-
-# All known keyword arguments that could be provided to the pool manager, its
-# pools, or the underlying connections. This is used to construct a pool key.
-_key_fields = (
-    "key_scheme",  # str
-    "key_host",  # str
-    "key_port",  # int
-    "key_timeout",  # int or float or Timeout
-    "key_retries",  # int or Retry
-    "key_strict",  # bool
-    "key_block",  # bool
-    "key_source_address",  # str
-    "key_key_file",  # str
-    "key_key_password",  # str
-    "key_cert_file",  # str
-    "key_cert_reqs",  # str
-    "key_ca_certs",  # str
-    "key_ssl_version",  # str
-    "key_ca_cert_dir",  # str
-    "key_ssl_context",  # instance of ssl.SSLContext or urllib3.util.ssl_.SSLContext
-    "key_maxsize",  # int
-    "key_headers",  # dict
-    "key__proxy",  # parsed proxy url
-    "key__proxy_headers",  # dict
-    "key__proxy_config",  # class
-    "key_socket_options",  # list of (level (int), optname (int), value (int or str)) tuples
-    "key__socks_options",  # dict
-    "key_assert_hostname",  # bool or string
-    "key_assert_fingerprint",  # str
-    "key_server_hostname",  # str
-)
-
-#: The namedtuple class used to construct keys for the connection pool.
-#: All custom key schemes should include the fields in this key at a minimum.
-PoolKey = collections.namedtuple("PoolKey", _key_fields)
-
-_proxy_config_fields = ("ssl_context", "use_forwarding_for_https")
-ProxyConfig = collections.namedtuple("ProxyConfig", _proxy_config_fields)
-
-
-def _default_key_normalizer(key_class, request_context):
-    """
-    Create a pool key out of a request context dictionary.
-
-    According to RFC 3986, both the scheme and host are case-insensitive.
-    Therefore, this function normalizes both before constructing the pool
-    key for an HTTPS request. If you wish to change this behaviour, provide
-    alternate callables to ``key_fn_by_scheme``.
-
-    :param key_class:
-        The class to use when constructing the key. This should be a namedtuple
-        with the ``scheme`` and ``host`` keys at a minimum.
-    :type  key_class: namedtuple
-    :param request_context:
-        A dictionary-like object that contain the context for a request.
-    :type  request_context: dict
-
-    :return: A namedtuple that can be used as a connection pool key.
-    :rtype:  PoolKey
-    """
-    # Since we mutate the dictionary, make a copy first
-    context = request_context.copy()
-    context["scheme"] = context["scheme"].lower()
-    context["host"] = context["host"].lower()
-
-    # These are both dictionaries and need to be transformed into frozensets
-    for key in ("headers", "_proxy_headers", "_socks_options"):
-        if key in context and context[key] is not None:
-            context[key] = frozenset(context[key].items())
-
-    # The socket_options key may be a list and needs to be transformed into a
-    # tuple.
-    socket_opts = context.get("socket_options")
-    if socket_opts is not None:
-        context["socket_options"] = tuple(socket_opts)
-
-    # Map the kwargs to the names in the namedtuple - this is necessary since
-    # namedtuples can't have fields starting with '_'.
-    for key in list(context.keys()):
-        context["key_" + key] = context.pop(key)
-
-    # Default to ``None`` for keys missing from the context
-    for field in key_class._fields:
-        if field not in context:
-            context[field] = None
-
-    return key_class(**context)
-
-
-#: A dictionary that maps a scheme to a callable that creates a pool key.
-#: This can be used to alter the way pool keys are constructed, if desired.
-#: Each PoolManager makes a copy of this dictionary so they can be configured
-#: globally here, or individually on the instance.
-key_fn_by_scheme = {
-    "http": functools.partial(_default_key_normalizer, PoolKey),
-    "https": functools.partial(_default_key_normalizer, PoolKey),
-}
-
-pool_classes_by_scheme = {"http": HTTPConnectionPool, "https": HTTPSConnectionPool}
-
-
-class PoolManager(RequestMethods):
-    """
-    Allows for arbitrary requests while transparently keeping track of
-    necessary connection pools for you.
-
-    :param num_pools:
-        Number of connection pools to cache before discarding the least
-        recently used pool.
-
-    :param headers:
-        Headers to include with all requests, unless other headers are given
-        explicitly.
-
-    :param \\**connection_pool_kw:
-        Additional parameters are used to create fresh
-        :class:`urllib3.connectionpool.ConnectionPool` instances.
-
-    Example::
-
-        >>> manager = PoolManager(num_pools=2)
-        >>> r = manager.request('GET', 'http://google.com/')
-        >>> r = manager.request('GET', 'http://google.com/mail')
-        >>> r = manager.request('GET', 'http://yahoo.com/')
-        >>> len(manager.pools)
-        2
-
-    """
-
-    proxy = None
-    proxy_config = None
-
-    def __init__(self, num_pools=10, headers=None, **connection_pool_kw):
-        RequestMethods.__init__(self, headers)
-        self.connection_pool_kw = connection_pool_kw
-        self.pools = RecentlyUsedContainer(num_pools)
-
-        # Locally set the pool classes and keys so other PoolManagers can
-        # override them.
-        self.pool_classes_by_scheme = pool_classes_by_scheme
-        self.key_fn_by_scheme = key_fn_by_scheme.copy()
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        self.clear()
-        # Return False to re-raise any potential exceptions
-        return False
-
-    def _new_pool(self, scheme, host, port, request_context=None):
-        """
-        Create a new :class:`urllib3.connectionpool.ConnectionPool` based on host, port, scheme, and
-        any additional pool keyword arguments.
-
-        If ``request_context`` is provided, it is provided as keyword arguments
-        to the pool class used. This method is used to actually create the
-        connection pools handed out by :meth:`connection_from_url` and
-        companion methods. It is intended to be overridden for customization.
-        """
-        pool_cls = self.pool_classes_by_scheme[scheme]
-        if request_context is None:
-            request_context = self.connection_pool_kw.copy()
-
-        # Although the context has everything necessary to create the pool,
-        # this function has historically only used the scheme, host, and port
-        # in the positional args. When an API change is acceptable these can
-        # be removed.
-        for key in ("scheme", "host", "port"):
-            request_context.pop(key, None)
-
-        if scheme == "http":
-            for kw in SSL_KEYWORDS:
-                request_context.pop(kw, None)
-
-        return pool_cls(host, port, **request_context)
-
-    def clear(self):
-        """
-        Empty our store of pools and direct them all to close.
-
-        This will not affect in-flight connections, but they will not be
-        re-used after completion.
-        """
-        self.pools.clear()
-
-    def connection_from_host(self, host, port=None, scheme="http", pool_kwargs=None):
-        """
-        Get a :class:`urllib3.connectionpool.ConnectionPool` based on the host, port, and scheme.
-
-        If ``port`` isn't given, it will be derived from the ``scheme`` using
-        ``urllib3.connectionpool.port_by_scheme``. If ``pool_kwargs`` is
-        provided, it is merged with the instance's ``connection_pool_kw``
-        variable and used to create the new connection pool, if one is
-        needed.
-        """
-
-        if not host:
-            raise LocationValueError("No host specified.")
-
-        request_context = self._merge_pool_kwargs(pool_kwargs)
-        request_context["scheme"] = scheme or "http"
-        if not port:
-            port = port_by_scheme.get(request_context["scheme"].lower(), 80)
-        request_context["port"] = port
-        request_context["host"] = host
-
-        return self.connection_from_context(request_context)
-
-    def connection_from_context(self, request_context):
-        """
-        Get a :class:`urllib3.connectionpool.ConnectionPool` based on the request context.
-
-        ``request_context`` must at least contain the ``scheme`` key and its
-        value must be a key in ``key_fn_by_scheme`` instance variable.
-        """
-        scheme = request_context["scheme"].lower()
-        pool_key_constructor = self.key_fn_by_scheme.get(scheme)
-        if not pool_key_constructor:
-            raise URLSchemeUnknown(scheme)
-        pool_key = pool_key_constructor(request_context)
-
-        return self.connection_from_pool_key(pool_key, request_context=request_context)
-
-    def connection_from_pool_key(self, pool_key, request_context=None):
-        """
-        Get a :class:`urllib3.connectionpool.ConnectionPool` based on the provided pool key.
-
-        ``pool_key`` should be a namedtuple that only contains immutable
-        objects. At a minimum it must have the ``scheme``, ``host``, and
-        ``port`` fields.
-        """
-        with self.pools.lock:
-            # If the scheme, host, or port doesn't match existing open
-            # connections, open a new ConnectionPool.
-            pool = self.pools.get(pool_key)
-            if pool:
-                return pool
-
-            # Make a fresh ConnectionPool of the desired type
-            scheme = request_context["scheme"]
-            host = request_context["host"]
-            port = request_context["port"]
-            pool = self._new_pool(scheme, host, port, request_context=request_context)
-            self.pools[pool_key] = pool
-
-        return pool
-
-    def connection_from_url(self, url, pool_kwargs=None):
-        """
-        Similar to :func:`urllib3.connectionpool.connection_from_url`.
-
-        If ``pool_kwargs`` is not provided and a new pool needs to be
-        constructed, ``self.connection_pool_kw`` is used to initialize
-        the :class:`urllib3.connectionpool.ConnectionPool`. If ``pool_kwargs``
-        is provided, it is used instead. Note that if a new pool does not
-        need to be created for the request, the provided ``pool_kwargs`` are
-        not used.
-        """
-        u = parse_url(url)
-        return self.connection_from_host(
-            u.host, port=u.port, scheme=u.scheme, pool_kwargs=pool_kwargs
-        )
-
-    def _merge_pool_kwargs(self, override):
-        """
-        Merge a dictionary of override values for self.connection_pool_kw.
-
-        This does not modify self.connection_pool_kw and returns a new dict.
-        Any keys in the override dictionary with a value of ``None`` are
-        removed from the merged dictionary.
-        """
-        base_pool_kwargs = self.connection_pool_kw.copy()
-        if override:
-            for key, value in override.items():
-                if value is None:
-                    try:
-                        del base_pool_kwargs[key]
-                    except KeyError:
-                        pass
-                else:
-                    base_pool_kwargs[key] = value
-        return base_pool_kwargs
-
-    def _proxy_requires_url_absolute_form(self, parsed_url):
-        """
-        Indicates if the proxy requires the complete destination URL in the
-        request.  Normally this is only needed when not using an HTTP CONNECT
-        tunnel.
-        """
-        if self.proxy is None:
-            return False
-
-        return not connection_requires_http_tunnel(
-            self.proxy, self.proxy_config, parsed_url.scheme
-        )
-
-    def _validate_proxy_scheme_url_selection(self, url_scheme):
-        """
-        Validates that were not attempting to do TLS in TLS connections on
-        Python2 or with unsupported SSL implementations.
-        """
-        if self.proxy is None or url_scheme != "https":
-            return
-
-        if self.proxy.scheme != "https":
-            return
-
-        if six.PY2 and not self.proxy_config.use_forwarding_for_https:
-            raise ProxySchemeUnsupported(
-                "Contacting HTTPS destinations through HTTPS proxies "
-                "'via CONNECT tunnels' is not supported in Python 2"
-            )
-
-    def urlopen(self, method, url, redirect=True, **kw):
-        """
-        Same as :meth:`urllib3.HTTPConnectionPool.urlopen`
-        with custom cross-host redirect logic and only sends the request-uri
-        portion of the ``url``.
-
-        The given ``url`` parameter must be absolute, such that an appropriate
-        :class:`urllib3.connectionpool.ConnectionPool` can be chosen for it.
-        """
-        u = parse_url(url)
-        self._validate_proxy_scheme_url_selection(u.scheme)
-
-        conn = self.connection_from_host(u.host, port=u.port, scheme=u.scheme)
-
-        kw["assert_same_host"] = False
-        kw["redirect"] = False
-
-        if "headers" not in kw:
-            kw["headers"] = self.headers.copy()
-
-        if self._proxy_requires_url_absolute_form(u):
-            response = conn.urlopen(method, url, **kw)
-        else:
-            response = conn.urlopen(method, u.request_uri, **kw)
-
-        redirect_location = redirect and response.get_redirect_location()
-        if not redirect_location:
-            return response
-
-        # Support relative URLs for redirecting.
-        redirect_location = urljoin(url, redirect_location)
-
-        # RFC 7231, Section 6.4.4
-        if response.status == 303:
-            method = "GET"
-
-        retries = kw.get("retries")
-        if not isinstance(retries, Retry):
-            retries = Retry.from_int(retries, redirect=redirect)
-
-        # Strip headers marked as unsafe to forward to the redirected location.
-        # Check remove_headers_on_redirect to avoid a potential network call within
-        # conn.is_same_host() which may use socket.gethostbyname() in the future.
-        if retries.remove_headers_on_redirect and not conn.is_same_host(
-            redirect_location
-        ):
-            headers = list(six.iterkeys(kw["headers"]))
-            for header in headers:
-                if header.lower() in retries.remove_headers_on_redirect:
-                    kw["headers"].pop(header, None)
-
-        try:
-            retries = retries.increment(method, url, response=response, _pool=conn)
-        except MaxRetryError:
-            if retries.raise_on_redirect:
-                response.drain_conn()
-                raise
-            return response
-
-        kw["retries"] = retries
-        kw["redirect"] = redirect
-
-        log.info("Redirecting %s -> %s", url, redirect_location)
-
-        response.drain_conn()
-        return self.urlopen(method, redirect_location, **kw)
-
-
-class ProxyManager(PoolManager):
-    """
-    Behaves just like :class:`PoolManager`, but sends all requests through
-    the defined proxy, using the CONNECT method for HTTPS URLs.
-
-    :param proxy_url:
-        The URL of the proxy to be used.
-
-    :param proxy_headers:
-        A dictionary containing headers that will be sent to the proxy. In case
-        of HTTP they are being sent with each request, while in the
-        HTTPS/CONNECT case they are sent only once. Could be used for proxy
-        authentication.
-
-    :param proxy_ssl_context:
-        The proxy SSL context is used to establish the TLS connection to the
-        proxy when using HTTPS proxies.
-
-    :param use_forwarding_for_https:
-        (Defaults to False) If set to True will forward requests to the HTTPS
-        proxy to be made on behalf of the client instead of creating a TLS
-        tunnel via the CONNECT method. **Enabling this flag means that request
-        and response headers and content will be visible from the HTTPS proxy**
-        whereas tunneling keeps request and response headers and content
-        private.  IP address, target hostname, SNI, and port are always visible
-        to an HTTPS proxy even when this flag is disabled.
-
-    Example:
-        >>> proxy = urllib3.ProxyManager('http://localhost:3128/')
-        >>> r1 = proxy.request('GET', 'http://google.com/')
-        >>> r2 = proxy.request('GET', 'http://httpbin.org/')
-        >>> len(proxy.pools)
-        1
-        >>> r3 = proxy.request('GET', 'https://httpbin.org/')
-        >>> r4 = proxy.request('GET', 'https://twitter.com/')
-        >>> len(proxy.pools)
-        3
-
-    """
-
-    def __init__(
-        self,
-        proxy_url,
-        num_pools=10,
-        headers=None,
-        proxy_headers=None,
-        proxy_ssl_context=None,
-        use_forwarding_for_https=False,
-        **connection_pool_kw
-    ):
-
-        if isinstance(proxy_url, HTTPConnectionPool):
-            proxy_url = "%s://%s:%i" % (
-                proxy_url.scheme,
-                proxy_url.host,
-                proxy_url.port,
-            )
-        proxy = parse_url(proxy_url)
-
-        if proxy.scheme not in ("http", "https"):
-            raise ProxySchemeUnknown(proxy.scheme)
-
-        if not proxy.port:
-            port = port_by_scheme.get(proxy.scheme, 80)
-            proxy = proxy._replace(port=port)
-
-        self.proxy = proxy
-        self.proxy_headers = proxy_headers or {}
-        self.proxy_ssl_context = proxy_ssl_context
-        self.proxy_config = ProxyConfig(proxy_ssl_context, use_forwarding_for_https)
-
-        connection_pool_kw["_proxy"] = self.proxy
-        connection_pool_kw["_proxy_headers"] = self.proxy_headers
-        connection_pool_kw["_proxy_config"] = self.proxy_config
-
-        super(ProxyManager, self).__init__(num_pools, headers, **connection_pool_kw)
-
-    def connection_from_host(self, host, port=None, scheme="http", pool_kwargs=None):
-        if scheme == "https":
-            return super(ProxyManager, self).connection_from_host(
-                host, port, scheme, pool_kwargs=pool_kwargs
-            )
-
-        return super(ProxyManager, self).connection_from_host(
-            self.proxy.host, self.proxy.port, self.proxy.scheme, pool_kwargs=pool_kwargs
-        )
-
-    def _set_proxy_headers(self, url, headers=None):
-        """
-        Sets headers needed by proxies: specifically, the Accept and Host
-        headers. Only sets headers not provided by the user.
-        """
-        headers_ = {"Accept": "*/*"}
-
-        netloc = parse_url(url).netloc
-        if netloc:
-            headers_["Host"] = netloc
-
-        if headers:
-            headers_.update(headers)
-        return headers_
-
-    def urlopen(self, method, url, redirect=True, **kw):
-        "Same as HTTP(S)ConnectionPool.urlopen, ``url`` must be absolute."
-        u = parse_url(url)
-        if not connection_requires_http_tunnel(self.proxy, self.proxy_config, u.scheme):
-            # For connections using HTTP CONNECT, httplib sets the necessary
-            # headers on the CONNECT to the proxy. If we're not using CONNECT,
-            # we'll definitely need to set 'Host' at the very least.
-            headers = kw.get("headers", self.headers)
-            kw["headers"] = self._set_proxy_headers(url, headers)
-
-        return super(ProxyManager, self).urlopen(method, url, redirect=redirect, **kw)
-
-
-def proxy_from_url(url, **kw):
-    return ProxyManager(proxy_url=url, **kw)
diff --git a/lib/urllib3/request.py b/lib/urllib3/request.py
deleted file mode 100644
index 398386a5..00000000
--- a/lib/urllib3/request.py
+++ /dev/null
@@ -1,170 +0,0 @@
-from __future__ import absolute_import
-
-from .filepost import encode_multipart_formdata
-from .packages.six.moves.urllib.parse import urlencode
-
-__all__ = ["RequestMethods"]
-
-
-class RequestMethods(object):
-    """
-    Convenience mixin for classes who implement a :meth:`urlopen` method, such
-    as :class:`urllib3.HTTPConnectionPool` and
-    :class:`urllib3.PoolManager`.
-
-    Provides behavior for making common types of HTTP request methods and
-    decides which type of request field encoding to use.
-
-    Specifically,
-
-    :meth:`.request_encode_url` is for sending requests whose fields are
-    encoded in the URL (such as GET, HEAD, DELETE).
-
-    :meth:`.request_encode_body` is for sending requests whose fields are
-    encoded in the *body* of the request using multipart or www-form-urlencoded
-    (such as for POST, PUT, PATCH).
-
-    :meth:`.request` is for making any kind of request, it will look up the
-    appropriate encoding format and use one of the above two methods to make
-    the request.
-
-    Initializer parameters:
-
-    :param headers:
-        Headers to include with all requests, unless other headers are given
-        explicitly.
-    """
-
-    _encode_url_methods = {"DELETE", "GET", "HEAD", "OPTIONS"}
-
-    def __init__(self, headers=None):
-        self.headers = headers or {}
-
-    def urlopen(
-        self,
-        method,
-        url,
-        body=None,
-        headers=None,
-        encode_multipart=True,
-        multipart_boundary=None,
-        **kw
-    ):  # Abstract
-        raise NotImplementedError(
-            "Classes extending RequestMethods must implement "
-            "their own ``urlopen`` method."
-        )
-
-    def request(self, method, url, fields=None, headers=None, **urlopen_kw):
-        """
-        Make a request using :meth:`urlopen` with the appropriate encoding of
-        ``fields`` based on the ``method`` used.
-
-        This is a convenience method that requires the least amount of manual
-        effort. It can be used in most situations, while still having the
-        option to drop down to more specific methods when necessary, such as
-        :meth:`request_encode_url`, :meth:`request_encode_body`,
-        or even the lowest level :meth:`urlopen`.
-        """
-        method = method.upper()
-
-        urlopen_kw["request_url"] = url
-
-        if method in self._encode_url_methods:
-            return self.request_encode_url(
-                method, url, fields=fields, headers=headers, **urlopen_kw
-            )
-        else:
-            return self.request_encode_body(
-                method, url, fields=fields, headers=headers, **urlopen_kw
-            )
-
-    def request_encode_url(self, method, url, fields=None, headers=None, **urlopen_kw):
-        """
-        Make a request using :meth:`urlopen` with the ``fields`` encoded in
-        the url. This is useful for request methods like GET, HEAD, DELETE, etc.
-        """
-        if headers is None:
-            headers = self.headers
-
-        extra_kw = {"headers": headers}
-        extra_kw.update(urlopen_kw)
-
-        if fields:
-            url += "?" + urlencode(fields)
-
-        return self.urlopen(method, url, **extra_kw)
-
-    def request_encode_body(
-        self,
-        method,
-        url,
-        fields=None,
-        headers=None,
-        encode_multipart=True,
-        multipart_boundary=None,
-        **urlopen_kw
-    ):
-        """
-        Make a request using :meth:`urlopen` with the ``fields`` encoded in
-        the body. This is useful for request methods like POST, PUT, PATCH, etc.
-
-        When ``encode_multipart=True`` (default), then
-        :func:`urllib3.encode_multipart_formdata` is used to encode
-        the payload with the appropriate content type. Otherwise
-        :func:`urllib.parse.urlencode` is used with the
-        'application/x-www-form-urlencoded' content type.
-
-        Multipart encoding must be used when posting files, and it's reasonably
-        safe to use it in other times too. However, it may break request
-        signing, such as with OAuth.
-
-        Supports an optional ``fields`` parameter of key/value strings AND
-        key/filetuple. A filetuple is a (filename, data, MIME type) tuple where
-        the MIME type is optional. For example::
-
-            fields = {
-                'foo': 'bar',
-                'fakefile': ('foofile.txt', 'contents of foofile'),
-                'realfile': ('barfile.txt', open('realfile').read()),
-                'typedfile': ('bazfile.bin', open('bazfile').read(),
-                              'image/jpeg'),
-                'nonamefile': 'contents of nonamefile field',
-            }
-
-        When uploading a file, providing a filename (the first parameter of the
-        tuple) is optional but recommended to best mimic behavior of browsers.
-
-        Note that if ``headers`` are supplied, the 'Content-Type' header will
-        be overwritten because it depends on the dynamic random boundary string
-        which is used to compose the body of the request. The random boundary
-        string can be explicitly set with the ``multipart_boundary`` parameter.
-        """
-        if headers is None:
-            headers = self.headers
-
-        extra_kw = {"headers": {}}
-
-        if fields:
-            if "body" in urlopen_kw:
-                raise TypeError(
-                    "request got values for both 'fields' and 'body', can only specify one."
-                )
-
-            if encode_multipart:
-                body, content_type = encode_multipart_formdata(
-                    fields, boundary=multipart_boundary
-                )
-            else:
-                body, content_type = (
-                    urlencode(fields),
-                    "application/x-www-form-urlencoded",
-                )
-
-            extra_kw["body"] = body
-            extra_kw["headers"] = {"Content-Type": content_type}
-
-        extra_kw["headers"].update(headers)
-        extra_kw.update(urlopen_kw)
-
-        return self.urlopen(method, url, **extra_kw)
diff --git a/lib/urllib3/response.py b/lib/urllib3/response.py
deleted file mode 100644
index 0bd13d40..00000000
--- a/lib/urllib3/response.py
+++ /dev/null
@@ -1,885 +0,0 @@
-from __future__ import absolute_import
-
-import io
-import logging
-import sys
-import warnings
-import zlib
-from contextlib import contextmanager
-from socket import error as SocketError
-from socket import timeout as SocketTimeout
-
-try:
-    try:
-        import brotlicffi as brotli
-    except ImportError:
-        import brotli
-except ImportError:
-    brotli = None
-
-from . import util
-from ._collections import HTTPHeaderDict
-from .connection import BaseSSLError, HTTPException
-from .exceptions import (
-    BodyNotHttplibCompatible,
-    DecodeError,
-    HTTPError,
-    IncompleteRead,
-    InvalidChunkLength,
-    InvalidHeader,
-    ProtocolError,
-    ReadTimeoutError,
-    ResponseNotChunked,
-    SSLError,
-)
-from .packages import six
-from .util.response import is_fp_closed, is_response_to_head
-
-log = logging.getLogger(__name__)
-
-
-class DeflateDecoder(object):
-    def __init__(self):
-        self._first_try = True
-        self._data = b""
-        self._obj = zlib.decompressobj()
-
-    def __getattr__(self, name):
-        return getattr(self._obj, name)
-
-    def decompress(self, data):
-        if not data:
-            return data
-
-        if not self._first_try:
-            return self._obj.decompress(data)
-
-        self._data += data
-        try:
-            decompressed = self._obj.decompress(data)
-            if decompressed:
-                self._first_try = False
-                self._data = None
-            return decompressed
-        except zlib.error:
-            self._first_try = False
-            self._obj = zlib.decompressobj(-zlib.MAX_WBITS)
-            try:
-                return self.decompress(self._data)
-            finally:
-                self._data = None
-
-
-class GzipDecoderState(object):
-
-    FIRST_MEMBER = 0
-    OTHER_MEMBERS = 1
-    SWALLOW_DATA = 2
-
-
-class GzipDecoder(object):
-    def __init__(self):
-        self._obj = zlib.decompressobj(16 + zlib.MAX_WBITS)
-        self._state = GzipDecoderState.FIRST_MEMBER
-
-    def __getattr__(self, name):
-        return getattr(self._obj, name)
-
-    def decompress(self, data):
-        ret = bytearray()
-        if self._state == GzipDecoderState.SWALLOW_DATA or not data:
-            return bytes(ret)
-        while True:
-            try:
-                ret += self._obj.decompress(data)
-            except zlib.error:
-                previous_state = self._state
-                # Ignore data after the first error
-                self._state = GzipDecoderState.SWALLOW_DATA
-                if previous_state == GzipDecoderState.OTHER_MEMBERS:
-                    # Allow trailing garbage acceptable in other gzip clients
-                    return bytes(ret)
-                raise
-            data = self._obj.unused_data
-            if not data:
-                return bytes(ret)
-            self._state = GzipDecoderState.OTHER_MEMBERS
-            self._obj = zlib.decompressobj(16 + zlib.MAX_WBITS)
-
-
-if brotli is not None:
-
-    class BrotliDecoder(object):
-        # Supports both 'brotlipy' and 'Brotli' packages
-        # since they share an import name. The top branches
-        # are for 'brotlipy' and bottom branches for 'Brotli'
-        def __init__(self):
-            self._obj = brotli.Decompressor()
-            if hasattr(self._obj, "decompress"):
-                self.decompress = self._obj.decompress
-            else:
-                self.decompress = self._obj.process
-
-        def flush(self):
-            if hasattr(self._obj, "flush"):
-                return self._obj.flush()
-            return b""
-
-
-class MultiDecoder(object):
-    """
-    From RFC7231:
-        If one or more encodings have been applied to a representation, the
-        sender that applied the encodings MUST generate a Content-Encoding
-        header field that lists the content codings in the order in which
-        they were applied.
-    """
-
-    def __init__(self, modes):
-        self._decoders = [_get_decoder(m.strip()) for m in modes.split(",")]
-
-    def flush(self):
-        return self._decoders[0].flush()
-
-    def decompress(self, data):
-        for d in reversed(self._decoders):
-            data = d.decompress(data)
-        return data
-
-
-def _get_decoder(mode):
-    if "," in mode:
-        return MultiDecoder(mode)
-
-    if mode == "gzip":
-        return GzipDecoder()
-
-    if brotli is not None and mode == "br":
-        return BrotliDecoder()
-
-    return DeflateDecoder()
-
-
-class HTTPResponse(io.IOBase):
-    """
-    HTTP Response container.
-
-    Backwards-compatible with :class:`http.client.HTTPResponse` but the response ``body`` is
-    loaded and decoded on-demand when the ``data`` property is accessed.  This
-    class is also compatible with the Python standard library's :mod:`io`
-    module, and can hence be treated as a readable object in the context of that
-    framework.
-
-    Extra parameters for behaviour not present in :class:`http.client.HTTPResponse`:
-
-    :param preload_content:
-        If True, the response's body will be preloaded during construction.
-
-    :param decode_content:
-        If True, will attempt to decode the body based on the
-        'content-encoding' header.
-
-    :param original_response:
-        When this HTTPResponse wrapper is generated from an :class:`http.client.HTTPResponse`
-        object, it's convenient to include the original for debug purposes. It's
-        otherwise unused.
-
-    :param retries:
-        The retries contains the last :class:`~urllib3.util.retry.Retry` that
-        was used during the request.
-
-    :param enforce_content_length:
-        Enforce content length checking. Body returned by server must match
-        value of Content-Length header, if present. Otherwise, raise error.
-    """
-
-    CONTENT_DECODERS = ["gzip", "deflate"]
-    if brotli is not None:
-        CONTENT_DECODERS += ["br"]
-    REDIRECT_STATUSES = [301, 302, 303, 307, 308]
-
-    def __init__(
-        self,
-        body="",
-        headers=None,
-        status=0,
-        version=0,
-        reason=None,
-        strict=0,
-        preload_content=True,
-        decode_content=True,
-        original_response=None,
-        pool=None,
-        connection=None,
-        msg=None,
-        retries=None,
-        enforce_content_length=False,
-        request_method=None,
-        request_url=None,
-        auto_close=True,
-    ):
-
-        if isinstance(headers, HTTPHeaderDict):
-            self.headers = headers
-        else:
-            self.headers = HTTPHeaderDict(headers)
-        self.status = status
-        self.version = version
-        self.reason = reason
-        self.strict = strict
-        self.decode_content = decode_content
-        self.retries = retries
-        self.enforce_content_length = enforce_content_length
-        self.auto_close = auto_close
-
-        self._decoder = None
-        self._body = None
-        self._fp = None
-        self._original_response = original_response
-        self._fp_bytes_read = 0
-        self.msg = msg
-        self._request_url = request_url
-
-        if body and isinstance(body, (six.string_types, bytes)):
-            self._body = body
-
-        self._pool = pool
-        self._connection = connection
-
-        if hasattr(body, "read"):
-            self._fp = body
-
-        # Are we using the chunked-style of transfer encoding?
-        self.chunked = False
-        self.chunk_left = None
-        tr_enc = self.headers.get("transfer-encoding", "").lower()
-        # Don't incur the penalty of creating a list and then discarding it
-        encodings = (enc.strip() for enc in tr_enc.split(","))
-        if "chunked" in encodings:
-            self.chunked = True
-
-        # Determine length of response
-        self.length_remaining = self._init_length(request_method)
-
-        # If requested, preload the body.
-        if preload_content and not self._body:
-            self._body = self.read(decode_content=decode_content)
-
-    def get_redirect_location(self):
-        """
-        Should we redirect and where to?
-
-        :returns: Truthy redirect location string if we got a redirect status
-            code and valid location. ``None`` if redirect status and no
-            location. ``False`` if not a redirect status code.
-        """
-        if self.status in self.REDIRECT_STATUSES:
-            return self.headers.get("location")
-
-        return False
-
-    def release_conn(self):
-        if not self._pool or not self._connection:
-            return
-
-        self._pool._put_conn(self._connection)
-        self._connection = None
-
-    def drain_conn(self):
-        """
-        Read and discard any remaining HTTP response data in the response connection.
-
-        Unread data in the HTTPResponse connection blocks the connection from being released back to the pool.
-        """
-        try:
-            self.read()
-        except (HTTPError, SocketError, BaseSSLError, HTTPException):
-            pass
-
-    @property
-    def data(self):
-        # For backwards-compat with earlier urllib3 0.4 and earlier.
-        if self._body:
-            return self._body
-
-        if self._fp:
-            return self.read(cache_content=True)
-
-    @property
-    def connection(self):
-        return self._connection
-
-    def isclosed(self):
-        return is_fp_closed(self._fp)
-
-    def tell(self):
-        """
-        Obtain the number of bytes pulled over the wire so far. May differ from
-        the amount of content returned by :meth:``urllib3.response.HTTPResponse.read``
-        if bytes are encoded on the wire (e.g, compressed).
-        """
-        return self._fp_bytes_read
-
-    def _init_length(self, request_method):
-        """
-        Set initial length value for Response content if available.
-        """
-        length = self.headers.get("content-length")
-
-        if length is not None:
-            if self.chunked:
-                # This Response will fail with an IncompleteRead if it can't be
-                # received as chunked. This method falls back to attempt reading
-                # the response before raising an exception.
-                log.warning(
-                    "Received response with both Content-Length and "
-                    "Transfer-Encoding set. This is expressly forbidden "
-                    "by RFC 7230 sec 3.3.2. Ignoring Content-Length and "
-                    "attempting to process response as Transfer-Encoding: "
-                    "chunked."
-                )
-                return None
-
-            try:
-                # RFC 7230 section 3.3.2 specifies multiple content lengths can
-                # be sent in a single Content-Length header
-                # (e.g. Content-Length: 42, 42). This line ensures the values
-                # are all valid ints and that as long as the `set` length is 1,
-                # all values are the same. Otherwise, the header is invalid.
-                lengths = set([int(val) for val in length.split(",")])
-                if len(lengths) > 1:
-                    raise InvalidHeader(
-                        "Content-Length contained multiple "
-                        "unmatching values (%s)" % length
-                    )
-                length = lengths.pop()
-            except ValueError:
-                length = None
-            else:
-                if length < 0:
-                    length = None
-
-        # Convert status to int for comparison
-        # In some cases, httplib returns a status of "_UNKNOWN"
-        try:
-            status = int(self.status)
-        except ValueError:
-            status = 0
-
-        # Check for responses that shouldn't include a body
-        if status in (204, 304) or 100 <= status < 200 or request_method == "HEAD":
-            length = 0
-
-        return length
-
-    def _init_decoder(self):
-        """
-        Set-up the _decoder attribute if necessary.
-        """
-        # Note: content-encoding value should be case-insensitive, per RFC 7230
-        # Section 3.2
-        content_encoding = self.headers.get("content-encoding", "").lower()
-        if self._decoder is None:
-            if content_encoding in self.CONTENT_DECODERS:
-                self._decoder = _get_decoder(content_encoding)
-            elif "," in content_encoding:
-                encodings = [
-                    e.strip()
-                    for e in content_encoding.split(",")
-                    if e.strip() in self.CONTENT_DECODERS
-                ]
-                if len(encodings):
-                    self._decoder = _get_decoder(content_encoding)
-
-    DECODER_ERROR_CLASSES = (IOError, zlib.error)
-    if brotli is not None:
-        DECODER_ERROR_CLASSES += (brotli.error,)
-
-    def _decode(self, data, decode_content, flush_decoder):
-        """
-        Decode the data passed in and potentially flush the decoder.
-        """
-        if not decode_content:
-            return data
-
-        try:
-            if self._decoder:
-                data = self._decoder.decompress(data)
-        except self.DECODER_ERROR_CLASSES as e:
-            content_encoding = self.headers.get("content-encoding", "").lower()
-            raise DecodeError(
-                "Received response with content-encoding: %s, but "
-                "failed to decode it." % content_encoding,
-                e,
-            )
-        if flush_decoder:
-            data += self._flush_decoder()
-
-        return data
-
-    def _flush_decoder(self):
-        """
-        Flushes the decoder. Should only be called if the decoder is actually
-        being used.
-        """
-        if self._decoder:
-            buf = self._decoder.decompress(b"")
-            return buf + self._decoder.flush()
-
-        return b""
-
-    @contextmanager
-    def _error_catcher(self):
-        """
-        Catch low-level python exceptions, instead re-raising urllib3
-        variants, so that low-level exceptions are not leaked in the
-        high-level api.
-
-        On exit, release the connection back to the pool.
-        """
-        clean_exit = False
-
-        try:
-            try:
-                yield
-
-            except SocketTimeout:
-                # FIXME: Ideally we'd like to include the url in the ReadTimeoutError but
-                # there is yet no clean way to get at it from this context.
-                raise ReadTimeoutError(self._pool, None, "Read timed out.")
-
-            except BaseSSLError as e:
-                # FIXME: Is there a better way to differentiate between SSLErrors?
-                if "read operation timed out" not in str(e):
-                    # SSL errors related to framing/MAC get wrapped and reraised here
-                    raise SSLError(e)
-
-                raise ReadTimeoutError(self._pool, None, "Read timed out.")
-
-            except (HTTPException, SocketError) as e:
-                # This includes IncompleteRead.
-                raise ProtocolError("Connection broken: %r" % e, e)
-
-            # If no exception is thrown, we should avoid cleaning up
-            # unnecessarily.
-            clean_exit = True
-        finally:
-            # If we didn't terminate cleanly, we need to throw away our
-            # connection.
-            if not clean_exit:
-                # The response may not be closed but we're not going to use it
-                # anymore so close it now to ensure that the connection is
-                # released back to the pool.
-                if self._original_response:
-                    self._original_response.close()
-
-                # Closing the response may not actually be sufficient to close
-                # everything, so if we have a hold of the connection close that
-                # too.
-                if self._connection:
-                    self._connection.close()
-
-            # If we hold the original response but it's closed now, we should
-            # return the connection back to the pool.
-            if self._original_response and self._original_response.isclosed():
-                self.release_conn()
-
-    def _fp_read(self, amt):
-        """
-        Read a response with the thought that reading the number of bytes
-        larger than can fit in a 32-bit int at a time via SSL in some
-        known cases leads to an overflow error that has to be prevented
-        if `amt` or `self.length_remaining` indicate that a problem may
-        happen.
-
-        The known cases:
-          * 3.8 <= CPython < 3.9.7 because of a bug
-            https://github.com/urllib3/urllib3/issues/2513#issuecomment-1152559900.
-          * urllib3 injected with pyOpenSSL-backed SSL-support.
-          * CPython < 3.10 only when `amt` does not fit 32-bit int.
-        """
-        assert self._fp
-        c_int_max = 2 ** 31 - 1
-        if (
-            (
-                (amt and amt > c_int_max)
-                or (self.length_remaining and self.length_remaining > c_int_max)
-            )
-            and not util.IS_SECURETRANSPORT
-            and (util.IS_PYOPENSSL or sys.version_info < (3, 10))
-        ):
-            buffer = io.BytesIO()
-            # Besides `max_chunk_amt` being a maximum chunk size, it
-            # affects memory overhead of reading a response by this
-            # method in CPython.
-            # `c_int_max` equal to 2 GiB - 1 byte is the actual maximum
-            # chunk size that does not lead to an overflow error, but
-            # 256 MiB is a compromise.
-            max_chunk_amt = 2 ** 28
-            while amt is None or amt != 0:
-                if amt is not None:
-                    chunk_amt = min(amt, max_chunk_amt)
-                    amt -= chunk_amt
-                else:
-                    chunk_amt = max_chunk_amt
-                data = self._fp.read(chunk_amt)
-                if not data:
-                    break
-                buffer.write(data)
-                del data  # to reduce peak memory usage by `max_chunk_amt`.
-            return buffer.getvalue()
-        else:
-            # StringIO doesn't like amt=None
-            return self._fp.read(amt) if amt is not None else self._fp.read()
-
-    def read(self, amt=None, decode_content=None, cache_content=False):
-        """
-        Similar to :meth:`http.client.HTTPResponse.read`, but with two additional
-        parameters: ``decode_content`` and ``cache_content``.
-
-        :param amt:
-            How much of the content to read. If specified, caching is skipped
-            because it doesn't make sense to cache partial content as the full
-            response.
-
-        :param decode_content:
-            If True, will attempt to decode the body based on the
-            'content-encoding' header.
-
-        :param cache_content:
-            If True, will save the returned data such that the same result is
-            returned despite of the state of the underlying file object. This
-            is useful if you want the ``.data`` property to continue working
-            after having ``.read()`` the file object. (Overridden if ``amt`` is
-            set.)
-        """
-        self._init_decoder()
-        if decode_content is None:
-            decode_content = self.decode_content
-
-        if self._fp is None:
-            return
-
-        flush_decoder = False
-        fp_closed = getattr(self._fp, "closed", False)
-
-        with self._error_catcher():
-            data = self._fp_read(amt) if not fp_closed else b""
-            if amt is None:
-                flush_decoder = True
-            else:
-                cache_content = False
-                if (
-                    amt != 0 and not data
-                ):  # Platform-specific: Buggy versions of Python.
-                    # Close the connection when no data is returned
-                    #
-                    # This is redundant to what httplib/http.client _should_
-                    # already do.  However, versions of python released before
-                    # December 15, 2012 (http://bugs.python.org/issue16298) do
-                    # not properly close the connection in all cases. There is
-                    # no harm in redundantly calling close.
-                    self._fp.close()
-                    flush_decoder = True
-                    if self.enforce_content_length and self.length_remaining not in (
-                        0,
-                        None,
-                    ):
-                        # This is an edge case that httplib failed to cover due
-                        # to concerns of backward compatibility. We're
-                        # addressing it here to make sure IncompleteRead is
-                        # raised during streaming, so all calls with incorrect
-                        # Content-Length are caught.
-                        raise IncompleteRead(self._fp_bytes_read, self.length_remaining)
-
-        if data:
-            self._fp_bytes_read += len(data)
-            if self.length_remaining is not None:
-                self.length_remaining -= len(data)
-
-            data = self._decode(data, decode_content, flush_decoder)
-
-            if cache_content:
-                self._body = data
-
-        return data
-
-    def stream(self, amt=2 ** 16, decode_content=None):
-        """
-        A generator wrapper for the read() method. A call will block until
-        ``amt`` bytes have been read from the connection or until the
-        connection is closed.
-
-        :param amt:
-            How much of the content to read. The generator will return up to
-            much data per iteration, but may return less. This is particularly
-            likely when using compressed data. However, the empty string will
-            never be returned.
-
-        :param decode_content:
-            If True, will attempt to decode the body based on the
-            'content-encoding' header.
-        """
-        if self.chunked and self.supports_chunked_reads():
-            for line in self.read_chunked(amt, decode_content=decode_content):
-                yield line
-        else:
-            while not is_fp_closed(self._fp):
-                data = self.read(amt=amt, decode_content=decode_content)
-
-                if data:
-                    yield data
-
-    @classmethod
-    def from_httplib(ResponseCls, r, **response_kw):
-        """
-        Given an :class:`http.client.HTTPResponse` instance ``r``, return a
-        corresponding :class:`urllib3.response.HTTPResponse` object.
-
-        Remaining parameters are passed to the HTTPResponse constructor, along
-        with ``original_response=r``.
-        """
-        headers = r.msg
-
-        if not isinstance(headers, HTTPHeaderDict):
-            if six.PY2:
-                # Python 2.7
-                headers = HTTPHeaderDict.from_httplib(headers)
-            else:
-                headers = HTTPHeaderDict(headers.items())
-
-        # HTTPResponse objects in Python 3 don't have a .strict attribute
-        strict = getattr(r, "strict", 0)
-        resp = ResponseCls(
-            body=r,
-            headers=headers,
-            status=r.status,
-            version=r.version,
-            reason=r.reason,
-            strict=strict,
-            original_response=r,
-            **response_kw
-        )
-        return resp
-
-    # Backwards-compatibility methods for http.client.HTTPResponse
-    def getheaders(self):
-        warnings.warn(
-            "HTTPResponse.getheaders() is deprecated and will be removed "
-            "in urllib3 v2.1.0. Instead access HTTPResponse.headers directly.",
-            category=DeprecationWarning,
-            stacklevel=2,
-        )
-        return self.headers
-
-    def getheader(self, name, default=None):
-        warnings.warn(
-            "HTTPResponse.getheader() is deprecated and will be removed "
-            "in urllib3 v2.1.0. Instead use HTTPResponse.headers.get(name, default).",
-            category=DeprecationWarning,
-            stacklevel=2,
-        )
-        return self.headers.get(name, default)
-
-    # Backwards compatibility for http.cookiejar
-    def info(self):
-        return self.headers
-
-    # Overrides from io.IOBase
-    def close(self):
-        if not self.closed:
-            self._fp.close()
-
-        if self._connection:
-            self._connection.close()
-
-        if not self.auto_close:
-            io.IOBase.close(self)
-
-    @property
-    def closed(self):
-        if not self.auto_close:
-            return io.IOBase.closed.__get__(self)
-        elif self._fp is None:
-            return True
-        elif hasattr(self._fp, "isclosed"):
-            return self._fp.isclosed()
-        elif hasattr(self._fp, "closed"):
-            return self._fp.closed
-        else:
-            return True
-
-    def fileno(self):
-        if self._fp is None:
-            raise IOError("HTTPResponse has no file to get a fileno from")
-        elif hasattr(self._fp, "fileno"):
-            return self._fp.fileno()
-        else:
-            raise IOError(
-                "The file-like object this HTTPResponse is wrapped "
-                "around has no file descriptor"
-            )
-
-    def flush(self):
-        if (
-            self._fp is not None
-            and hasattr(self._fp, "flush")
-            and not getattr(self._fp, "closed", False)
-        ):
-            return self._fp.flush()
-
-    def readable(self):
-        # This method is required for `io` module compatibility.
-        return True
-
-    def readinto(self, b):
-        # This method is required for `io` module compatibility.
-        temp = self.read(len(b))
-        if len(temp) == 0:
-            return 0
-        else:
-            b[: len(temp)] = temp
-            return len(temp)
-
-    def supports_chunked_reads(self):
-        """
-        Checks if the underlying file-like object looks like a
-        :class:`http.client.HTTPResponse` object. We do this by testing for
-        the fp attribute. If it is present we assume it returns raw chunks as
-        processed by read_chunked().
-        """
-        return hasattr(self._fp, "fp")
-
-    def _update_chunk_length(self):
-        # First, we'll figure out length of a chunk and then
-        # we'll try to read it from socket.
-        if self.chunk_left is not None:
-            return
-        line = self._fp.fp.readline()
-        line = line.split(b";", 1)[0]
-        try:
-            self.chunk_left = int(line, 16)
-        except ValueError:
-            # Invalid chunked protocol response, abort.
-            self.close()
-            raise InvalidChunkLength(self, line)
-
-    def _handle_chunk(self, amt):
-        returned_chunk = None
-        if amt is None:
-            chunk = self._fp._safe_read(self.chunk_left)
-            returned_chunk = chunk
-            self._fp._safe_read(2)  # Toss the CRLF at the end of the chunk.
-            self.chunk_left = None
-        elif amt < self.chunk_left:
-            value = self._fp._safe_read(amt)
-            self.chunk_left = self.chunk_left - amt
-            returned_chunk = value
-        elif amt == self.chunk_left:
-            value = self._fp._safe_read(amt)
-            self._fp._safe_read(2)  # Toss the CRLF at the end of the chunk.
-            self.chunk_left = None
-            returned_chunk = value
-        else:  # amt > self.chunk_left
-            returned_chunk = self._fp._safe_read(self.chunk_left)
-            self._fp._safe_read(2)  # Toss the CRLF at the end of the chunk.
-            self.chunk_left = None
-        return returned_chunk
-
-    def read_chunked(self, amt=None, decode_content=None):
-        """
-        Similar to :meth:`HTTPResponse.read`, but with an additional
-        parameter: ``decode_content``.
-
-        :param amt:
-            How much of the content to read. If specified, caching is skipped
-            because it doesn't make sense to cache partial content as the full
-            response.
-
-        :param decode_content:
-            If True, will attempt to decode the body based on the
-            'content-encoding' header.
-        """
-        self._init_decoder()
-        # FIXME: Rewrite this method and make it a class with a better structured logic.
-        if not self.chunked:
-            raise ResponseNotChunked(
-                "Response is not chunked. "
-                "Header 'transfer-encoding: chunked' is missing."
-            )
-        if not self.supports_chunked_reads():
-            raise BodyNotHttplibCompatible(
-                "Body should be http.client.HTTPResponse like. "
-                "It should have have an fp attribute which returns raw chunks."
-            )
-
-        with self._error_catcher():
-            # Don't bother reading the body of a HEAD request.
-            if self._original_response and is_response_to_head(self._original_response):
-                self._original_response.close()
-                return
-
-            # If a response is already read and closed
-            # then return immediately.
-            if self._fp.fp is None:
-                return
-
-            while True:
-                self._update_chunk_length()
-                if self.chunk_left == 0:
-                    break
-                chunk = self._handle_chunk(amt)
-                decoded = self._decode(
-                    chunk, decode_content=decode_content, flush_decoder=False
-                )
-                if decoded:
-                    yield decoded
-
-            if decode_content:
-                # On CPython and PyPy, we should never need to flush the
-                # decoder. However, on Jython we *might* need to, so
-                # lets defensively do it anyway.
-                decoded = self._flush_decoder()
-                if decoded:  # Platform-specific: Jython.
-                    yield decoded
-
-            # Chunk content ends with \r\n: discard it.
-            while True:
-                line = self._fp.fp.readline()
-                if not line:
-                    # Some sites may not end with '\r\n'.
-                    break
-                if line == b"\r\n":
-                    break
-
-            # We read everything; close the "file".
-            if self._original_response:
-                self._original_response.close()
-
-    def geturl(self):
-        """
-        Returns the URL that was the source of this response.
-        If the request that generated this response redirected, this method
-        will return the final redirect location.
-        """
-        if self.retries is not None and len(self.retries.history):
-            return self.retries.history[-1].redirect_location
-        else:
-            return self._request_url
-
-    def __iter__(self):
-        buffer = []
-        for chunk in self.stream(decode_content=True):
-            if b"\n" in chunk:
-                chunk = chunk.split(b"\n")
-                yield b"".join(buffer) + chunk[0] + b"\n"
-                for x in chunk[1:-1]:
-                    yield x + b"\n"
-                if chunk[-1]:
-                    buffer = [chunk[-1]]
-                else:
-                    buffer = []
-            else:
-                buffer.append(chunk)
-        if buffer:
-            yield b"".join(buffer)
diff --git a/lib/urllib3/util/__init__.py b/lib/urllib3/util/__init__.py
deleted file mode 100644
index 4547fc52..00000000
--- a/lib/urllib3/util/__init__.py
+++ /dev/null
@@ -1,49 +0,0 @@
-from __future__ import absolute_import
-
-# For backwards compatibility, provide imports that used to be here.
-from .connection import is_connection_dropped
-from .request import SKIP_HEADER, SKIPPABLE_HEADERS, make_headers
-from .response import is_fp_closed
-from .retry import Retry
-from .ssl_ import (
-    ALPN_PROTOCOLS,
-    HAS_SNI,
-    IS_PYOPENSSL,
-    IS_SECURETRANSPORT,
-    PROTOCOL_TLS,
-    SSLContext,
-    assert_fingerprint,
-    resolve_cert_reqs,
-    resolve_ssl_version,
-    ssl_wrap_socket,
-)
-from .timeout import Timeout, current_time
-from .url import Url, get_host, parse_url, split_first
-from .wait import wait_for_read, wait_for_write
-
-__all__ = (
-    "HAS_SNI",
-    "IS_PYOPENSSL",
-    "IS_SECURETRANSPORT",
-    "SSLContext",
-    "PROTOCOL_TLS",
-    "ALPN_PROTOCOLS",
-    "Retry",
-    "Timeout",
-    "Url",
-    "assert_fingerprint",
-    "current_time",
-    "is_connection_dropped",
-    "is_fp_closed",
-    "get_host",
-    "parse_url",
-    "make_headers",
-    "resolve_cert_reqs",
-    "resolve_ssl_version",
-    "split_first",
-    "ssl_wrap_socket",
-    "wait_for_read",
-    "wait_for_write",
-    "SKIP_HEADER",
-    "SKIPPABLE_HEADERS",
-)
diff --git a/lib/urllib3/util/connection.py b/lib/urllib3/util/connection.py
deleted file mode 100644
index 6af1138f..00000000
--- a/lib/urllib3/util/connection.py
+++ /dev/null
@@ -1,149 +0,0 @@
-from __future__ import absolute_import
-
-import socket
-
-from ..contrib import _appengine_environ
-from ..exceptions import LocationParseError
-from ..packages import six
-from .wait import NoWayToWaitForSocketError, wait_for_read
-
-
-def is_connection_dropped(conn):  # Platform-specific
-    """
-    Returns True if the connection is dropped and should be closed.
-
-    :param conn:
-        :class:`http.client.HTTPConnection` object.
-
-    Note: For platforms like AppEngine, this will always return ``False`` to
-    let the platform handle connection recycling transparently for us.
-    """
-    sock = getattr(conn, "sock", False)
-    if sock is False:  # Platform-specific: AppEngine
-        return False
-    if sock is None:  # Connection already closed (such as by httplib).
-        return True
-    try:
-        # Returns True if readable, which here means it's been dropped
-        return wait_for_read(sock, timeout=0.0)
-    except NoWayToWaitForSocketError:  # Platform-specific: AppEngine
-        return False
-
-
-# This function is copied from socket.py in the Python 2.7 standard
-# library test suite. Added to its signature is only `socket_options`.
-# One additional modification is that we avoid binding to IPv6 servers
-# discovered in DNS if the system doesn't have IPv6 functionality.
-def create_connection(
-    address,
-    timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
-    source_address=None,
-    socket_options=None,
-):
-    """Connect to *address* and return the socket object.
-
-    Convenience function.  Connect to *address* (a 2-tuple ``(host,
-    port)``) and return the socket object.  Passing the optional
-    *timeout* parameter will set the timeout on the socket instance
-    before attempting to connect.  If no *timeout* is supplied, the
-    global default timeout setting returned by :func:`socket.getdefaulttimeout`
-    is used.  If *source_address* is set it must be a tuple of (host, port)
-    for the socket to bind as a source address before making the connection.
-    An host of '' or port 0 tells the OS to use the default.
-    """
-
-    host, port = address
-    if host.startswith("["):
-        host = host.strip("[]")
-    err = None
-
-    # Using the value from allowed_gai_family() in the context of getaddrinfo lets
-    # us select whether to work with IPv4 DNS records, IPv6 records, or both.
-    # The original create_connection function always returns all records.
-    family = allowed_gai_family()
-
-    try:
-        host.encode("idna")
-    except UnicodeError:
-        return six.raise_from(
-            LocationParseError(u"'%s', label empty or too long" % host), None
-        )
-
-    for res in socket.getaddrinfo(host, port, family, socket.SOCK_STREAM):
-        af, socktype, proto, canonname, sa = res
-        sock = None
-        try:
-            sock = socket.socket(af, socktype, proto)
-
-            # If provided, set socket level options before connecting.
-            _set_socket_options(sock, socket_options)
-
-            if timeout is not socket._GLOBAL_DEFAULT_TIMEOUT:
-                sock.settimeout(timeout)
-            if source_address:
-                sock.bind(source_address)
-            sock.connect(sa)
-            return sock
-
-        except socket.error as e:
-            err = e
-            if sock is not None:
-                sock.close()
-                sock = None
-
-    if err is not None:
-        raise err
-
-    raise socket.error("getaddrinfo returns an empty list")
-
-
-def _set_socket_options(sock, options):
-    if options is None:
-        return
-
-    for opt in options:
-        sock.setsockopt(*opt)
-
-
-def allowed_gai_family():
-    """This function is designed to work in the context of
-    getaddrinfo, where family=socket.AF_UNSPEC is the default and
-    will perform a DNS search for both IPv6 and IPv4 records."""
-
-    family = socket.AF_INET
-    if HAS_IPV6:
-        family = socket.AF_UNSPEC
-    return family
-
-
-def _has_ipv6(host):
-    """Returns True if the system can bind an IPv6 address."""
-    sock = None
-    has_ipv6 = False
-
-    # App Engine doesn't support IPV6 sockets and actually has a quota on the
-    # number of sockets that can be used, so just early out here instead of
-    # creating a socket needlessly.
-    # See https://github.com/urllib3/urllib3/issues/1446
-    if _appengine_environ.is_appengine_sandbox():
-        return False
-
-    if socket.has_ipv6:
-        # has_ipv6 returns true if cPython was compiled with IPv6 support.
-        # It does not tell us if the system has IPv6 support enabled. To
-        # determine that we must bind to an IPv6 address.
-        # https://github.com/urllib3/urllib3/pull/611
-        # https://bugs.python.org/issue658327
-        try:
-            sock = socket.socket(socket.AF_INET6)
-            sock.bind((host, 0))
-            has_ipv6 = True
-        except Exception:
-            pass
-
-    if sock:
-        sock.close()
-    return has_ipv6
-
-
-HAS_IPV6 = _has_ipv6("::1")
diff --git a/lib/urllib3/util/proxy.py b/lib/urllib3/util/proxy.py
deleted file mode 100644
index 2199cc7b..00000000
--- a/lib/urllib3/util/proxy.py
+++ /dev/null
@@ -1,57 +0,0 @@
-from .ssl_ import create_urllib3_context, resolve_cert_reqs, resolve_ssl_version
-
-
-def connection_requires_http_tunnel(
-    proxy_url=None, proxy_config=None, destination_scheme=None
-):
-    """
-    Returns True if the connection requires an HTTP CONNECT through the proxy.
-
-    :param URL proxy_url:
-        URL of the proxy.
-    :param ProxyConfig proxy_config:
-        Proxy configuration from poolmanager.py
-    :param str destination_scheme:
-        The scheme of the destination. (i.e https, http, etc)
-    """
-    # If we're not using a proxy, no way to use a tunnel.
-    if proxy_url is None:
-        return False
-
-    # HTTP destinations never require tunneling, we always forward.
-    if destination_scheme == "http":
-        return False
-
-    # Support for forwarding with HTTPS proxies and HTTPS destinations.
-    if (
-        proxy_url.scheme == "https"
-        and proxy_config
-        and proxy_config.use_forwarding_for_https
-    ):
-        return False
-
-    # Otherwise always use a tunnel.
-    return True
-
-
-def create_proxy_ssl_context(
-    ssl_version, cert_reqs, ca_certs=None, ca_cert_dir=None, ca_cert_data=None
-):
-    """
-    Generates a default proxy ssl context if one hasn't been provided by the
-    user.
-    """
-    ssl_context = create_urllib3_context(
-        ssl_version=resolve_ssl_version(ssl_version),
-        cert_reqs=resolve_cert_reqs(cert_reqs),
-    )
-
-    if (
-        not ca_certs
-        and not ca_cert_dir
-        and not ca_cert_data
-        and hasattr(ssl_context, "load_default_certs")
-    ):
-        ssl_context.load_default_certs()
-
-    return ssl_context
diff --git a/lib/urllib3/util/queue.py b/lib/urllib3/util/queue.py
deleted file mode 100644
index 41784104..00000000
--- a/lib/urllib3/util/queue.py
+++ /dev/null
@@ -1,22 +0,0 @@
-import collections
-
-from ..packages import six
-from ..packages.six.moves import queue
-
-if six.PY2:
-    # Queue is imported for side effects on MS Windows. See issue #229.
-    import Queue as _unused_module_Queue  # noqa: F401
-
-
-class LifoQueue(queue.Queue):
-    def _init(self, _):
-        self.queue = collections.deque()
-
-    def _qsize(self, len=len):
-        return len(self.queue)
-
-    def _put(self, item):
-        self.queue.append(item)
-
-    def _get(self):
-        return self.queue.pop()
diff --git a/lib/urllib3/util/request.py b/lib/urllib3/util/request.py
deleted file mode 100644
index b574b081..00000000
--- a/lib/urllib3/util/request.py
+++ /dev/null
@@ -1,146 +0,0 @@
-from __future__ import absolute_import
-
-from base64 import b64encode
-
-from ..exceptions import UnrewindableBodyError
-from ..packages.six import b, integer_types
-
-# Pass as a value within ``headers`` to skip
-# emitting some HTTP headers that are added automatically.
-# The only headers that are supported are ``Accept-Encoding``,
-# ``Host``, and ``User-Agent``.
-SKIP_HEADER = "@@@SKIP_HEADER@@@"
-SKIPPABLE_HEADERS = frozenset(["accept-encoding", "host", "user-agent"])
-
-ACCEPT_ENCODING = "gzip,deflate"
-try:
-    try:
-        import brotlicffi as _unused_module_brotli  # noqa: F401
-    except ImportError:
-        import brotli as _unused_module_brotli  # noqa: F401
-except ImportError:
-    pass
-else:
-    ACCEPT_ENCODING += ",br"
-
-_FAILEDTELL = object()
-
-
-def make_headers(
-    keep_alive=None,
-    accept_encoding=None,
-    user_agent=None,
-    basic_auth=None,
-    proxy_basic_auth=None,
-    disable_cache=None,
-):
-    """
-    Shortcuts for generating request headers.
-
-    :param keep_alive:
-        If ``True``, adds 'connection: keep-alive' header.
-
-    :param accept_encoding:
-        Can be a boolean, list, or string.
-        ``True`` translates to 'gzip,deflate'.
-        List will get joined by comma.
-        String will be used as provided.
-
-    :param user_agent:
-        String representing the user-agent you want, such as
-        "python-urllib3/0.6"
-
-    :param basic_auth:
-        Colon-separated username:password string for 'authorization: basic ...'
-        auth header.
-
-    :param proxy_basic_auth:
-        Colon-separated username:password string for 'proxy-authorization: basic ...'
-        auth header.
-
-    :param disable_cache:
-        If ``True``, adds 'cache-control: no-cache' header.
-
-    Example::
-
-        >>> make_headers(keep_alive=True, user_agent="Batman/1.0")
-        {'connection': 'keep-alive', 'user-agent': 'Batman/1.0'}
-        >>> make_headers(accept_encoding=True)
-        {'accept-encoding': 'gzip,deflate'}
-    """
-    headers = {}
-    if accept_encoding:
-        if isinstance(accept_encoding, str):
-            pass
-        elif isinstance(accept_encoding, list):
-            accept_encoding = ",".join(accept_encoding)
-        else:
-            accept_encoding = ACCEPT_ENCODING
-        headers["accept-encoding"] = accept_encoding
-
-    if user_agent:
-        headers["user-agent"] = user_agent
-
-    if keep_alive:
-        headers["connection"] = "keep-alive"
-
-    if basic_auth:
-        headers["authorization"] = "Basic " + b64encode(b(basic_auth)).decode("utf-8")
-
-    if proxy_basic_auth:
-        headers["proxy-authorization"] = "Basic " + b64encode(
-            b(proxy_basic_auth)
-        ).decode("utf-8")
-
-    if disable_cache:
-        headers["cache-control"] = "no-cache"
-
-    return headers
-
-
-def set_file_position(body, pos):
-    """
-    If a position is provided, move file to that point.
-    Otherwise, we'll attempt to record a position for future use.
-    """
-    if pos is not None:
-        rewind_body(body, pos)
-    elif getattr(body, "tell", None) is not None:
-        try:
-            pos = body.tell()
-        except (IOError, OSError):
-            # This differentiates from None, allowing us to catch
-            # a failed `tell()` later when trying to rewind the body.
-            pos = _FAILEDTELL
-
-    return pos
-
-
-def rewind_body(body, body_pos):
-    """
-    Attempt to rewind body to a certain position.
-    Primarily used for request redirects and retries.
-
-    :param body:
-        File-like object that supports seek.
-
-    :param int pos:
-        Position to seek to in file.
-    """
-    body_seek = getattr(body, "seek", None)
-    if body_seek is not None and isinstance(body_pos, integer_types):
-        try:
-            body_seek(body_pos)
-        except (IOError, OSError):
-            raise UnrewindableBodyError(
-                "An error occurred when rewinding request body for redirect/retry."
-            )
-    elif body_pos is _FAILEDTELL:
-        raise UnrewindableBodyError(
-            "Unable to record file position for rewinding "
-            "request body during a redirect/retry."
-        )
-    else:
-        raise ValueError(
-            "body_pos must be of type integer, instead it was %s." % type(body_pos)
-        )
diff --git a/lib/urllib3/util/response.py b/lib/urllib3/util/response.py
deleted file mode 100644
index 5ea609cc..00000000
--- a/lib/urllib3/util/response.py
+++ /dev/null
@@ -1,107 +0,0 @@
-from __future__ import absolute_import
-
-from email.errors import MultipartInvariantViolationDefect, StartBoundaryNotFoundDefect
-
-from ..exceptions import HeaderParsingError
-from ..packages.six.moves import http_client as httplib
-
-
-def is_fp_closed(obj):
-    """
-    Checks whether a given file-like object is closed.
-
-    :param obj:
-        The file-like object to check.
-    """
-
-    try:
-        # Check `isclosed()` first, in case Python3 doesn't set `closed`.
-        # GH Issue #928
-        return obj.isclosed()
-    except AttributeError:
-        pass
-
-    try:
-        # Check via the official file-like-object way.
-        return obj.closed
-    except AttributeError:
-        pass
-
-    try:
-        # Check if the object is a container for another file-like object that
-        # gets released on exhaustion (e.g. HTTPResponse).
-        return obj.fp is None
-    except AttributeError:
-        pass
-
-    raise ValueError("Unable to determine whether fp is closed.")
-
-
-def assert_header_parsing(headers):
-    """
-    Asserts whether all headers have been successfully parsed.
-    Extracts encountered errors from the result of parsing headers.
-
-    Only works on Python 3.
-
-    :param http.client.HTTPMessage headers: Headers to verify.
-
-    :raises urllib3.exceptions.HeaderParsingError:
-        If parsing errors are found.
-    """
-
-    # This will fail silently if we pass in the wrong kind of parameter.
-    # To make debugging easier add an explicit check.
-    if not isinstance(headers, httplib.HTTPMessage):
-        raise TypeError("expected httplib.Message, got {0}.".format(type(headers)))
-
-    defects = getattr(headers, "defects", None)
-    get_payload = getattr(headers, "get_payload", None)
-
-    unparsed_data = None
-    if get_payload:
-        # get_payload is actually email.message.Message.get_payload;
-        # we're only interested in the result if it's not a multipart message
-        if not headers.is_multipart():
-            payload = get_payload()
-
-            if isinstance(payload, (bytes, str)):
-                unparsed_data = payload
-    if defects:
-        # httplib is assuming a response body is available
-        # when parsing headers even when httplib only sends
-        # header data to parse_headers() This results in
-        # defects on multipart responses in particular.
-        # See: https://github.com/urllib3/urllib3/issues/800
-
-        # So we ignore the following defects:
-        # - StartBoundaryNotFoundDefect:
-        #     The claimed start boundary was never found.
-        # - MultipartInvariantViolationDefect:
-        #     A message claimed to be a multipart but no subparts were found.
-        defects = [
-            defect
-            for defect in defects
-            if not isinstance(
-                defect, (StartBoundaryNotFoundDefect, MultipartInvariantViolationDefect)
-            )
-        ]
-
-    if defects or unparsed_data:
-        raise HeaderParsingError(defects=defects, unparsed_data=unparsed_data)
-
-
-def is_response_to_head(response):
-    """
-    Checks whether the request of a response has been a HEAD-request.
-    Handles the quirks of AppEngine.
-
-    :param http.client.HTTPResponse response:
-        Response to check if the originating request
-        used 'HEAD' as a method.
-    """
-    # FIXME: Can we do this somehow without accessing private httplib _method?
-    method = response._method
-    if isinstance(method, int):  # Platform-specific: Appengine
-        return method == 3
-    return method.upper() == "HEAD"
diff --git a/lib/urllib3/util/retry.py b/lib/urllib3/util/retry.py
deleted file mode 100644
index 2490d5e5..00000000
--- a/lib/urllib3/util/retry.py
+++ /dev/null
@@ -1,620 +0,0 @@
-from __future__ import absolute_import
-
-import email
-import logging
-import re
-import time
-import warnings
-from collections import namedtuple
-from itertools import takewhile
-
-from ..exceptions import (
-    ConnectTimeoutError,
-    InvalidHeader,
-    MaxRetryError,
-    ProtocolError,
-    ProxyError,
-    ReadTimeoutError,
-    ResponseError,
-)
-from ..packages import six
-
-log = logging.getLogger(__name__)
-
-
-# Data structure for representing the metadata of requests that result in a retry.
-RequestHistory = namedtuple(
-    "RequestHistory", ["method", "url", "error", "status", "redirect_location"]
-)
-
-
-# TODO: In v2 we can remove this sentinel and metaclass with deprecated options.
-_Default = object()
-
-
-class _RetryMeta(type):
-    @property
-    def DEFAULT_METHOD_WHITELIST(cls):
-        warnings.warn(
-            "Using 'Retry.DEFAULT_METHOD_WHITELIST' is deprecated and "
-            "will be removed in v2.0. Use 'Retry.DEFAULT_ALLOWED_METHODS' instead",
-            DeprecationWarning,
-        )
-        return cls.DEFAULT_ALLOWED_METHODS
-
-    @DEFAULT_METHOD_WHITELIST.setter
-    def DEFAULT_METHOD_WHITELIST(cls, value):
-        warnings.warn(
-            "Using 'Retry.DEFAULT_METHOD_WHITELIST' is deprecated and "
-            "will be removed in v2.0. Use 'Retry.DEFAULT_ALLOWED_METHODS' instead",
-            DeprecationWarning,
-        )
-        cls.DEFAULT_ALLOWED_METHODS = value
-
-    @property
-    def DEFAULT_REDIRECT_HEADERS_BLACKLIST(cls):
-        warnings.warn(
-            "Using 'Retry.DEFAULT_REDIRECT_HEADERS_BLACKLIST' is deprecated and "
-            "will be removed in v2.0. Use 'Retry.DEFAULT_REMOVE_HEADERS_ON_REDIRECT' instead",
-            DeprecationWarning,
-        )
-        return cls.DEFAULT_REMOVE_HEADERS_ON_REDIRECT
-
-    @DEFAULT_REDIRECT_HEADERS_BLACKLIST.setter
-    def DEFAULT_REDIRECT_HEADERS_BLACKLIST(cls, value):
-        warnings.warn(
-            "Using 'Retry.DEFAULT_REDIRECT_HEADERS_BLACKLIST' is deprecated and "
-            "will be removed in v2.0. Use 'Retry.DEFAULT_REMOVE_HEADERS_ON_REDIRECT' instead",
-            DeprecationWarning,
-        )
-        cls.DEFAULT_REMOVE_HEADERS_ON_REDIRECT = value
-
-    @property
-    def BACKOFF_MAX(cls):
-        warnings.warn(
-            "Using 'Retry.BACKOFF_MAX' is deprecated and "
-            "will be removed in v2.0. Use 'Retry.DEFAULT_BACKOFF_MAX' instead",
-            DeprecationWarning,
-        )
-        return cls.DEFAULT_BACKOFF_MAX
-
-    @BACKOFF_MAX.setter
-    def BACKOFF_MAX(cls, value):
-        warnings.warn(
-            "Using 'Retry.BACKOFF_MAX' is deprecated and "
-            "will be removed in v2.0. Use 'Retry.DEFAULT_BACKOFF_MAX' instead",
-            DeprecationWarning,
-        )
-        cls.DEFAULT_BACKOFF_MAX = value
-
-
-@six.add_metaclass(_RetryMeta)
-class Retry(object):
-    """Retry configuration.
-
-    Each retry attempt will create a new Retry object with updated values, so
-    they can be safely reused.
-
-    Retries can be defined as a default for a pool::
-
-        retries = Retry(connect=5, read=2, redirect=5)
-        http = PoolManager(retries=retries)
-        response = http.request('GET', 'http://example.com/')
-
-    Or per-request (which overrides the default for the pool)::
-
-        response = http.request('GET', 'http://example.com/', retries=Retry(10))
-
-    Retries can be disabled by passing ``False``::
-
-        response = http.request('GET', 'http://example.com/', retries=False)
-
-    Errors will be wrapped in :class:`~urllib3.exceptions.MaxRetryError` unless
-    retries are disabled, in which case the causing exception will be raised.
-
-    :param int total:
-        Total number of retries to allow. Takes precedence over other counts.
-
-        Set to ``None`` to remove this constraint and fall back on other
-        counts.
-
-        Set to ``0`` to fail on the first retry.
-
-        Set to ``False`` to disable and imply ``raise_on_redirect=False``.
-
-    :param int connect:
-        How many connection-related errors to retry on.
-
-        These are errors raised before the request is sent to the remote server,
-        which we assume has not triggered the server to process the request.
-
-        Set to ``0`` to fail on the first retry of this type.
-
-    :param int read:
-        How many times to retry on read errors.
-
-        These errors are raised after the request was sent to the server, so the
-        request may have side-effects.
-
-        Set to ``0`` to fail on the first retry of this type.
-
-    :param int redirect:
-        How many redirects to perform. Limit this to avoid infinite redirect
-        loops.
-
-        A redirect is a HTTP response with a status code 301, 302, 303, 307 or
-        308.
-
-        Set to ``0`` to fail on the first retry of this type.
-
-        Set to ``False`` to disable and imply ``raise_on_redirect=False``.
-
-    :param int status:
-        How many times to retry on bad status codes.
-
-        These are retries made on responses, where status code matches
-        ``status_forcelist``.
-
-        Set to ``0`` to fail on the first retry of this type.
-
-    :param int other:
-        How many times to retry on other errors.
-
-        Other errors are errors that are not connect, read, redirect or status errors.
-        These errors might be raised after the request was sent to the server, so the
-        request might have side-effects.
-
-        Set to ``0`` to fail on the first retry of this type.
-
-        If ``total`` is not set, it's a good idea to set this to 0 to account
-        for unexpected edge cases and avoid infinite retry loops.
-
-    :param iterable allowed_methods:
-        Set of uppercased HTTP method verbs that we should retry on.
-
-        By default, we only retry on methods which are considered to be
-        idempotent (multiple requests with the same parameters end with the
-        same state). See :attr:`Retry.DEFAULT_ALLOWED_METHODS`.
-
-        Set to a ``False`` value to retry on any verb.
-
-        .. warning::
-
-            Previously this parameter was named ``method_whitelist``, that
-            usage is deprecated in v1.26.0 and will be removed in v2.0.
-
-    :param iterable status_forcelist:
-        A set of integer HTTP status codes that we should force a retry on.
-        A retry is initiated if the request method is in ``allowed_methods``
-        and the response status code is in ``status_forcelist``.
-
-        By default, this is disabled with ``None``.
-
-    :param float backoff_factor:
-        A backoff factor to apply between attempts after the second try
-        (most errors are resolved immediately by a second try without a
-        delay). urllib3 will sleep for::
-
-            {backoff factor} * (2 ** ({number of total retries} - 1))
-
-        seconds. If the backoff_factor is 0.1, then :func:`.sleep` will sleep
-        for [0.0s, 0.2s, 0.4s, ...] between retries. It will never be longer
-        than :attr:`Retry.DEFAULT_BACKOFF_MAX`.
-
-        By default, backoff is disabled (set to 0).
-
-    :param bool raise_on_redirect: Whether, if the number of redirects is
-        exhausted, to raise a MaxRetryError, or to return a response with a
-        response code in the 3xx range.
-
-    :param bool raise_on_status: Similar meaning to ``raise_on_redirect``:
-        whether we should raise an exception, or return a response,
-        if status falls in ``status_forcelist`` range and retries have
-        been exhausted.
-
-    :param tuple history: The history of the request encountered during
-        each call to :meth:`~Retry.increment`. The list is in the order
-        the requests occurred. Each list item is of class :class:`RequestHistory`.
-
-    :param bool respect_retry_after_header:
-        Whether to respect Retry-After header on status codes defined as
-        :attr:`Retry.RETRY_AFTER_STATUS_CODES` or not.
-
-    :param iterable remove_headers_on_redirect:
-        Sequence of headers to remove from the request when a response
-        indicating a redirect is returned before firing off the redirected
-        request.
-    """
-
-    #: Default methods to be used for ``allowed_methods``
-    DEFAULT_ALLOWED_METHODS = frozenset(
-        ["HEAD", "GET", "PUT", "DELETE", "OPTIONS", "TRACE"]
-    )
-
-    #: Default status codes to be used for ``status_forcelist``
-    RETRY_AFTER_STATUS_CODES = frozenset([413, 429, 503])
-
-    #: Default headers to be used for ``remove_headers_on_redirect``
-    DEFAULT_REMOVE_HEADERS_ON_REDIRECT = frozenset(["Authorization"])
-
-    #: Maximum backoff time.
-    DEFAULT_BACKOFF_MAX = 120
-
-    def __init__(
-        self,
-        total=10,
-        connect=None,
-        read=None,
-        redirect=None,
-        status=None,
-        other=None,
-        allowed_methods=_Default,
-        status_forcelist=None,
-        backoff_factor=0,
-        raise_on_redirect=True,
-        raise_on_status=True,
-        history=None,
-        respect_retry_after_header=True,
-        remove_headers_on_redirect=_Default,
-        # TODO: Deprecated, remove in v2.0
-        method_whitelist=_Default,
-    ):
-
-        if method_whitelist is not _Default:
-            if allowed_methods is not _Default:
-                raise ValueError(
-                    "Using both 'allowed_methods' and "
-                    "'method_whitelist' together is not allowed. "
-                    "Instead only use 'allowed_methods'"
-                )
-            warnings.warn(
-                "Using 'method_whitelist' with Retry is deprecated and "
-                "will be removed in v2.0. Use 'allowed_methods' instead",
-                DeprecationWarning,
-                stacklevel=2,
-            )
-            allowed_methods = method_whitelist
-        if allowed_methods is _Default:
-            allowed_methods = self.DEFAULT_ALLOWED_METHODS
-        if remove_headers_on_redirect is _Default:
-            remove_headers_on_redirect = self.DEFAULT_REMOVE_HEADERS_ON_REDIRECT
-
-        self.total = total
-        self.connect = connect
-        self.read = read
-        self.status = status
-        self.other = other
-
-        if redirect is False or total is False:
-            redirect = 0
-            raise_on_redirect = False
-
-        self.redirect = redirect
-        self.status_forcelist = status_forcelist or set()
-        self.allowed_methods = allowed_methods
-        self.backoff_factor = backoff_factor
-        self.raise_on_redirect = raise_on_redirect
-        self.raise_on_status = raise_on_status
-        self.history = history or tuple()
-        self.respect_retry_after_header = respect_retry_after_header
-        self.remove_headers_on_redirect = frozenset(
-            [h.lower() for h in remove_headers_on_redirect]
-        )
-
-    def new(self, **kw):
-        params = dict(
-            total=self.total,
-            connect=self.connect,
-            read=self.read,
-            redirect=self.redirect,
-            status=self.status,
-            other=self.other,
-            status_forcelist=self.status_forcelist,
-            backoff_factor=self.backoff_factor,
-            raise_on_redirect=self.raise_on_redirect,
-            raise_on_status=self.raise_on_status,
-            history=self.history,
-            remove_headers_on_redirect=self.remove_headers_on_redirect,
-            respect_retry_after_header=self.respect_retry_after_header,
-        )
-
-        # TODO: If already given in **kw we use what's given to us
-        # If not given we need to figure out what to pass. We decide
-        # based on whether our class has the 'method_whitelist' property
-        # and if so we pass the deprecated 'method_whitelist' otherwise
-        # we use 'allowed_methods'. Remove in v2.0
-        if "method_whitelist" not in kw and "allowed_methods" not in kw:
-            if "method_whitelist" in self.__dict__:
-                warnings.warn(
-                    "Using 'method_whitelist' with Retry is deprecated and "
-                    "will be removed in v2.0. Use 'allowed_methods' instead",
-                    DeprecationWarning,
-                )
-                params["method_whitelist"] = self.allowed_methods
-            else:
-                params["allowed_methods"] = self.allowed_methods
-
-        params.update(kw)
-        return type(self)(**params)
-
-    @classmethod
-    def from_int(cls, retries, redirect=True, default=None):
-        """Backwards-compatibility for the old retries format."""
-        if retries is None:
-            retries = default if default is not None else cls.DEFAULT
-
-        if isinstance(retries, Retry):
-            return retries
-
-        redirect = bool(redirect) and None
-        new_retries = cls(retries, redirect=redirect)
-        log.debug("Converted retries value: %r -> %r", retries, new_retries)
-        return new_retries
-
-    def get_backoff_time(self):
-        """Formula for computing the current backoff
-
-        :rtype: float
-        """
-        # We want to consider only the last consecutive errors sequence (Ignore redirects).
-        consecutive_errors_len = len(
-            list(
-                takewhile(lambda x: x.redirect_location is None, reversed(self.history))
-            )
-        )
-        if consecutive_errors_len <= 1:
-            return 0
-
-        backoff_value = self.backoff_factor * (2 ** (consecutive_errors_len - 1))
-        return min(self.DEFAULT_BACKOFF_MAX, backoff_value)
-
-    def parse_retry_after(self, retry_after):
-        # Whitespace: https://tools.ietf.org/html/rfc7230#section-3.2.4
-        if re.match(r"^\s*[0-9]+\s*$", retry_after):
-            seconds = int(retry_after)
-        else:
-            retry_date_tuple = email.utils.parsedate_tz(retry_after)
-            if retry_date_tuple is None:
-                raise InvalidHeader("Invalid Retry-After header: %s" % retry_after)
-            if retry_date_tuple[9] is None:  # Python 2
-                # Assume UTC if no timezone was specified
-                # On Python2.7, parsedate_tz returns None for a timezone offset
-                # instead of 0 if no timezone is given, where mktime_tz treats
-                # a None timezone offset as local time.
-                retry_date_tuple = retry_date_tuple[:9] + (0,) + retry_date_tuple[10:]
-
-            retry_date = email.utils.mktime_tz(retry_date_tuple)
-            seconds = retry_date - time.time()
-
-        if seconds < 0:
-            seconds = 0
-
-        return seconds
-
-    def get_retry_after(self, response):
-        """Get the value of Retry-After in seconds."""
-
-        retry_after = response.headers.get("Retry-After")
-
-        if retry_after is None:
-            return None
-
-        return self.parse_retry_after(retry_after)
-
-    def sleep_for_retry(self, response=None):
-        retry_after = self.get_retry_after(response)
-        if retry_after:
-            time.sleep(retry_after)
-            return True
-
-        return False
-
-    def _sleep_backoff(self):
-        backoff = self.get_backoff_time()
-        if backoff <= 0:
-            return
-        time.sleep(backoff)
-
-    def sleep(self, response=None):
-        """Sleep between retry attempts.
-
-        This method will respect a server's ``Retry-After`` response header
-        and sleep the duration of the time requested. If that is not present, it
-        will use an exponential backoff. By default, the backoff factor is 0 and
-        this method will return immediately.
-        """
-
-        if self.respect_retry_after_header and response:
-            slept = self.sleep_for_retry(response)
-            if slept:
-                return
-
-        self._sleep_backoff()
-
-    def _is_connection_error(self, err):
-        """Errors when we're fairly sure that the server did not receive the
-        request, so it should be safe to retry.
-        """
-        if isinstance(err, ProxyError):
-            err = err.original_error
-        return isinstance(err, ConnectTimeoutError)
-
-    def _is_read_error(self, err):
-        """Errors that occur after the request has been started, so we should
-        assume that the server began processing it.
-        """
-        return isinstance(err, (ReadTimeoutError, ProtocolError))
-
-    def _is_method_retryable(self, method):
-        """Checks if a given HTTP method should be retried upon, depending if
-        it is included in the allowed_methods
-        """
-        # TODO: For now favor if the Retry implementation sets its own method_whitelist
-        # property outside of our constructor to avoid breaking custom implementations.
-        if "method_whitelist" in self.__dict__:
-            warnings.warn(
-                "Using 'method_whitelist' with Retry is deprecated and "
-                "will be removed in v2.0. Use 'allowed_methods' instead",
-                DeprecationWarning,
-            )
-            allowed_methods = self.method_whitelist
-        else:
-            allowed_methods = self.allowed_methods
-
-        if allowed_methods and method.upper() not in allowed_methods:
-            return False
-        return True
-
-    def is_retry(self, method, status_code, has_retry_after=False):
-        """Is this method/status code retryable? (Based on allowlists and control
-        variables such as the number of total retries to allow, whether to
-        respect the Retry-After header, whether this header is present, and
-        whether the returned status code is on the list of status codes to
-        be retried upon on the presence of the aforementioned header)
-        """
-        if not self._is_method_retryable(method):
-            return False
-
-        if self.status_forcelist and status_code in self.status_forcelist:
-            return True
-
-        return (
-            self.total
-            and self.respect_retry_after_header
-            and has_retry_after
-            and (status_code in self.RETRY_AFTER_STATUS_CODES)
-        )
-
-    def is_exhausted(self):
-        """Are we out of retries?"""
-        retry_counts = (
-            self.total,
-            self.connect,
-            self.read,
-            self.redirect,
-            self.status,
-            self.other,
-        )
-        retry_counts = list(filter(None, retry_counts))
-        if not retry_counts:
-            return False
-
-        return min(retry_counts) < 0
-
-    def increment(
-        self,
-        method=None,
-        url=None,
-        response=None,
-        error=None,
-        _pool=None,
-        _stacktrace=None,
-    ):
-        """Return a new Retry object with incremented retry counters.
-
-        :param response: A response object, or None, if the server did not
-            return a response.
-        :type response: :class:`~urllib3.response.HTTPResponse`
-        :param Exception error: An error encountered during the request, or
-            None if the response was received successfully.
-
-        :return: A new ``Retry`` object.
-        """
-        if self.total is False and error:
-            # Disabled, indicate to re-raise the error.
-            raise six.reraise(type(error), error, _stacktrace)
-
-        total = self.total
-        if total is not None:
-            total -= 1
-
-        connect = self.connect
-        read = self.read
-        redirect = self.redirect
-        status_count = self.status
-        other = self.other
-        cause = "unknown"
-        status = None
-        redirect_location = None
-
-        if error and self._is_connection_error(error):
-            # Connect retry?
-            if connect is False:
-                raise six.reraise(type(error), error, _stacktrace)
-            elif connect is not None:
-                connect -= 1
-
-        elif error and self._is_read_error(error):
-            # Read retry?
-            if read is False or not self._is_method_retryable(method):
-                raise six.reraise(type(error), error, _stacktrace)
-            elif read is not None:
-                read -= 1
-
-        elif error:
-            # Other retry?
-            if other is not None:
-                other -= 1
-
-        elif response and response.get_redirect_location():
-            # Redirect retry?
-            if redirect is not None:
-                redirect -= 1
-            cause = "too many redirects"
-            redirect_location = response.get_redirect_location()
-            status = response.status
-
-        else:
-            # Incrementing because of a server error like a 500 in
-            # status_forcelist and the given method is in the allowed_methods
-            cause = ResponseError.GENERIC_ERROR
-            if response and response.status:
-                if status_count is not None:
-                    status_count -= 1
-                cause = ResponseError.SPECIFIC_ERROR.format(status_code=response.status)
-                status = response.status
-
-        history = self.history + (
-            RequestHistory(method, url, error, status, redirect_location),
-        )
-
-        new_retry = self.new(
-            total=total,
-            connect=connect,
-            read=read,
-            redirect=redirect,
-            status=status_count,
-            other=other,
-            history=history,
-        )
-
-        if new_retry.is_exhausted():
-            raise MaxRetryError(_pool, url, error or ResponseError(cause))
-
-        log.debug("Incremented Retry for (url='%s'): %r", url, new_retry)
-
-        return new_retry
-
-    def __repr__(self):
-        return (
-            "{cls.__name__}(total={self.total}, connect={self.connect}, "
-            "read={self.read}, redirect={self.redirect}, status={self.status})"
-        ).format(cls=type(self), self=self)
-
-    def __getattr__(self, item):
-        if item == "method_whitelist":
-            # TODO: Remove this deprecated alias in v2.0
-            warnings.warn(
-                "Using 'method_whitelist' with Retry is deprecated and "
-                "will be removed in v2.0. Use 'allowed_methods' instead",
-                DeprecationWarning,
-            )
-            return self.allowed_methods
-        try:
-            return getattr(super(Retry, self), item)
-        except AttributeError:
-            return getattr(Retry, item)
-
-
-# For backwards compatibility (equivalent to pre-v1.9):
-Retry.DEFAULT = Retry(3)
diff --git a/lib/urllib3/util/ssl_.py b/lib/urllib3/util/ssl_.py
deleted file mode 100644
index 8f867812..00000000
--- a/lib/urllib3/util/ssl_.py
+++ /dev/null
@@ -1,495 +0,0 @@
-from __future__ import absolute_import
-
-import hmac
-import os
-import sys
-import warnings
-from binascii import hexlify, unhexlify
-from hashlib import md5, sha1, sha256
-
-from ..exceptions import (
-    InsecurePlatformWarning,
-    ProxySchemeUnsupported,
-    SNIMissingWarning,
-    SSLError,
-)
-from ..packages import six
-from .url import BRACELESS_IPV6_ADDRZ_RE, IPV4_RE
-
-SSLContext = None
-SSLTransport = None
-HAS_SNI = False
-IS_PYOPENSSL = False
-IS_SECURETRANSPORT = False
-ALPN_PROTOCOLS = ["http/1.1"]
-
-# Maps the length of a digest to a possible hash function producing this digest
-HASHFUNC_MAP = {32: md5, 40: sha1, 64: sha256}
-
-
-def _const_compare_digest_backport(a, b):
-    """
-    Compare two digests of equal length in constant time.
-
-    The digests must be of type str/bytes.
-    Returns True if the digests match, and False otherwise.
-    """
-    result = abs(len(a) - len(b))
-    for left, right in zip(bytearray(a), bytearray(b)):
-        result |= left ^ right
-    return result == 0
-
-
-_const_compare_digest = getattr(hmac, "compare_digest", _const_compare_digest_backport)
-
-try:  # Test for SSL features
-    import ssl
-    from ssl import CERT_REQUIRED, wrap_socket
-except ImportError:
-    pass
-
-try:
-    from ssl import HAS_SNI  # Has SNI?
-except ImportError:
-    pass
-
-try:
-    from .ssltransport import SSLTransport
-except ImportError:
-    pass
-
-
-try:  # Platform-specific: Python 3.6
-    from ssl import PROTOCOL_TLS
-
-    PROTOCOL_SSLv23 = PROTOCOL_TLS
-except ImportError:
-    try:
-        from ssl import PROTOCOL_SSLv23 as PROTOCOL_TLS
-
-        PROTOCOL_SSLv23 = PROTOCOL_TLS
-    except ImportError:
-        PROTOCOL_SSLv23 = PROTOCOL_TLS = 2
-
-try:
-    from ssl import PROTOCOL_TLS_CLIENT
-except ImportError:
-    PROTOCOL_TLS_CLIENT = PROTOCOL_TLS
-
-
-try:
-    from ssl import OP_NO_COMPRESSION, OP_NO_SSLv2, OP_NO_SSLv3
-except ImportError:
-    OP_NO_SSLv2, OP_NO_SSLv3 = 0x1000000, 0x2000000
-    OP_NO_COMPRESSION = 0x20000
-
-
-try:  # OP_NO_TICKET was added in Python 3.6
-    from ssl import OP_NO_TICKET
-except ImportError:
-    OP_NO_TICKET = 0x4000
-
-
-# A secure default.
-# Sources for more information on TLS ciphers:
-#
-# - https://wiki.mozilla.org/Security/Server_Side_TLS
-# - https://www.ssllabs.com/projects/best-practices/index.html
-# - https://hynek.me/articles/hardening-your-web-servers-ssl-ciphers/
-#
-# The general intent is:
-# - prefer cipher suites that offer perfect forward secrecy (DHE/ECDHE),
-# - prefer ECDHE over DHE for better performance,
-# - prefer any AES-GCM and ChaCha20 over any AES-CBC for better performance and
-#   security,
-# - prefer AES-GCM over ChaCha20 because hardware-accelerated AES is common,
-# - disable NULL authentication, MD5 MACs, DSS, and other
-#   insecure ciphers for security reasons.
-# - NOTE: TLS 1.3 cipher suites are managed through a different interface
-#   not exposed by CPython (yet!) and are enabled by default if they're available.
-DEFAULT_CIPHERS = ":".join(
-    [
-        "ECDHE+AESGCM",
-        "ECDHE+CHACHA20",
-        "DHE+AESGCM",
-        "DHE+CHACHA20",
-        "ECDH+AESGCM",
-        "DH+AESGCM",
-        "ECDH+AES",
-        "DH+AES",
-        "RSA+AESGCM",
-        "RSA+AES",
-        "!aNULL",
-        "!eNULL",
-        "!MD5",
-        "!DSS",
-    ]
-)
-
-try:
-    from ssl import SSLContext  # Modern SSL?
-except ImportError:
-
-    class SSLContext(object):  # Platform-specific: Python 2
-        def __init__(self, protocol_version):
-            self.protocol = protocol_version
-            # Use default values from a real SSLContext
-            self.check_hostname = False
-            self.verify_mode = ssl.CERT_NONE
-            self.ca_certs = None
-            self.options = 0
-            self.certfile = None
-            self.keyfile = None
-            self.ciphers = None
-
-        def load_cert_chain(self, certfile, keyfile):
-            self.certfile = certfile
-            self.keyfile = keyfile
-
-        def load_verify_locations(self, cafile=None, capath=None, cadata=None):
-            self.ca_certs = cafile
-
-            if capath is not None:
-                raise SSLError("CA directories not supported in older Pythons")
-
-            if cadata is not None:
-                raise SSLError("CA data not supported in older Pythons")
-
-        def set_ciphers(self, cipher_suite):
-            self.ciphers = cipher_suite
-
-        def wrap_socket(self, socket, server_hostname=None, server_side=False):
-            warnings.warn(
-                "A true SSLContext object is not available. This prevents "
-                "urllib3 from configuring SSL appropriately and may cause "
-                "certain SSL connections to fail. You can upgrade to a newer "
-                "version of Python to solve this. For more information, see "
-                "https://urllib3.readthedocs.io/en/1.26.x/advanced-usage.html"
-                "#ssl-warnings",
-                InsecurePlatformWarning,
-            )
-            kwargs = {
-                "keyfile": self.keyfile,
-                "certfile": self.certfile,
-                "ca_certs": self.ca_certs,
-                "cert_reqs": self.verify_mode,
-                "ssl_version": self.protocol,
-                "server_side": server_side,
-            }
-            return wrap_socket(socket, ciphers=self.ciphers, **kwargs)
-
-
-def assert_fingerprint(cert, fingerprint):
-    """
-    Checks if given fingerprint matches the supplied certificate.
-
-    :param cert:
-        Certificate as bytes object.
-    :param fingerprint:
-        Fingerprint as string of hexdigits, can be interspersed by colons.
-    """
-
-    fingerprint = fingerprint.replace(":", "").lower()
-    digest_length = len(fingerprint)
-    hashfunc = HASHFUNC_MAP.get(digest_length)
-    if not hashfunc:
-        raise SSLError("Fingerprint of invalid length: {0}".format(fingerprint))
-
-    # We need encode() here for py32; works on py2 and p33.
-    fingerprint_bytes = unhexlify(fingerprint.encode())
-
-    cert_digest = hashfunc(cert).digest()
-
-    if not _const_compare_digest(cert_digest, fingerprint_bytes):
-        raise SSLError(
-            'Fingerprints did not match. Expected "{0}", got "{1}".'.format(
-                fingerprint, hexlify(cert_digest)
-            )
-        )
-
-
-def resolve_cert_reqs(candidate):
-    """
-    Resolves the argument to a numeric constant, which can be passed to
-    the wrap_socket function/method from the ssl module.
-    Defaults to :data:`ssl.CERT_REQUIRED`.
-    If given a string it is assumed to be the name of the constant in the
-    :mod:`ssl` module or its abbreviation.
-    (So you can specify `REQUIRED` instead of `CERT_REQUIRED`.
-    If it's neither `None` nor a string we assume it is already the numeric
-    constant which can directly be passed to wrap_socket.
-    """
-    if candidate is None:
-        return CERT_REQUIRED
-
-    if isinstance(candidate, str):
-        res = getattr(ssl, candidate, None)
-        if res is None:
-            res = getattr(ssl, "CERT_" + candidate)
-        return res
-
-    return candidate
-
-
-def resolve_ssl_version(candidate):
-    """
-    like resolve_cert_reqs
-    """
-    if candidate is None:
-        return PROTOCOL_TLS
-
-    if isinstance(candidate, str):
-        res = getattr(ssl, candidate, None)
-        if res is None:
-            res = getattr(ssl, "PROTOCOL_" + candidate)
-        return res
-
-    return candidate
-
-
-def create_urllib3_context(
-    ssl_version=None, cert_reqs=None, options=None, ciphers=None
-):
-    """All arguments have the same meaning as ``ssl_wrap_socket``.
-
-    By default, this function does a lot of the same work that
-    ``ssl.create_default_context`` does on Python 3.4+. It:
-
-    - Disables SSLv2, SSLv3, and compression
-    - Sets a restricted set of server ciphers
-
-    If you wish to enable SSLv3, you can do::
-
-        from urllib3.util import ssl_
-        context = ssl_.create_urllib3_context()
-        context.options &= ~ssl_.OP_NO_SSLv3
-
-    You can do the same to enable compression (substituting ``COMPRESSION``
-    for ``SSLv3`` in the last line above).
-
-    :param ssl_version:
-        The desired protocol version to use. This will default to
-        PROTOCOL_SSLv23 which will negotiate the highest protocol that both
-        the server and your installation of OpenSSL support.
-    :param cert_reqs:
-        Whether to require the certificate verification. This defaults to
-        ``ssl.CERT_REQUIRED``.
-    :param options:
-        Specific OpenSSL options. These default to ``ssl.OP_NO_SSLv2``,
-        ``ssl.OP_NO_SSLv3``, ``ssl.OP_NO_COMPRESSION``, and ``ssl.OP_NO_TICKET``.
-    :param ciphers:
-        Which cipher suites to allow the server to select.
-    :returns:
-        Constructed SSLContext object with specified options
-    :rtype: SSLContext
-    """
-    # PROTOCOL_TLS is deprecated in Python 3.10
-    if not ssl_version or ssl_version == PROTOCOL_TLS:
-        ssl_version = PROTOCOL_TLS_CLIENT
-
-    context = SSLContext(ssl_version)
-
-    context.set_ciphers(ciphers or DEFAULT_CIPHERS)
-
-    # Setting the default here, as we may have no ssl module on import
-    cert_reqs = ssl.CERT_REQUIRED if cert_reqs is None else cert_reqs
-
-    if options is None:
-        options = 0
-        # SSLv2 is easily broken and is considered harmful and dangerous
-        options |= OP_NO_SSLv2
-        # SSLv3 has several problems and is now dangerous
-        options |= OP_NO_SSLv3
-        # Disable compression to prevent CRIME attacks for OpenSSL 1.0+
-        # (issue #309)
-        options |= OP_NO_COMPRESSION
-        # TLSv1.2 only. Unless set explicitly, do not request tickets.
-        # This may save some bandwidth on wire, and although the ticket is encrypted,
-        # there is a risk associated with it being on wire,
-        # if the server is not rotating its ticketing keys properly.
-        options |= OP_NO_TICKET
-
-    context.options |= options
-
-    # Enable post-handshake authentication for TLS 1.3, see GH #1634. PHA is
-    # necessary for conditional client cert authentication with TLS 1.3.
-    # The attribute is None for OpenSSL <= 1.1.0 or does not exist in older
-    # versions of Python.  We only enable on Python 3.7.4+ or if certificate
-    # verification is enabled to work around Python issue #37428
-    # See: https://bugs.python.org/issue37428
-    if (cert_reqs == ssl.CERT_REQUIRED or sys.version_info >= (3, 7, 4)) and getattr(
-        context, "post_handshake_auth", None
-    ) is not None:
-        context.post_handshake_auth = True
-
-    def disable_check_hostname():
-        if (
-            getattr(context, "check_hostname", None) is not None
-        ):  # Platform-specific: Python 3.2
-            # We do our own verification, including fingerprints and alternative
-            # hostnames. So disable it here
-            context.check_hostname = False
-
-    # The order of the below lines setting verify_mode and check_hostname
-    # matter due to safe-guards SSLContext has to prevent an SSLContext with
-    # check_hostname=True, verify_mode=NONE/OPTIONAL. This is made even more
-    # complex because we don't know whether PROTOCOL_TLS_CLIENT will be used
-    # or not so we don't know the initial state of the freshly created SSLContext.
-    if cert_reqs == ssl.CERT_REQUIRED:
-        context.verify_mode = cert_reqs
-        disable_check_hostname()
-    else:
-        disable_check_hostname()
-        context.verify_mode = cert_reqs
-
-    # Enable logging of TLS session keys via defacto standard environment variable
-    # 'SSLKEYLOGFILE', if the feature is available (Python 3.8+). Skip empty values.
-    if hasattr(context, "keylog_filename"):
-        sslkeylogfile = os.environ.get("SSLKEYLOGFILE")
-        if sslkeylogfile:
-            context.keylog_filename = sslkeylogfile
-
-    return context
-
-
-def ssl_wrap_socket(
-    sock,
-    keyfile=None,
-    certfile=None,
-    cert_reqs=None,
-    ca_certs=None,
-    server_hostname=None,
-    ssl_version=None,
-    ciphers=None,
-    ssl_context=None,
-    ca_cert_dir=None,
-    key_password=None,
-    ca_cert_data=None,
-    tls_in_tls=False,
-):
-    """
-    All arguments except for server_hostname, ssl_context, and ca_cert_dir have
-    the same meaning as they do when using :func:`ssl.wrap_socket`.
-
-    :param server_hostname:
-        When SNI is supported, the expected hostname of the certificate
-    :param ssl_context:
-        A pre-made :class:`SSLContext` object. If none is provided, one will
-        be created using :func:`create_urllib3_context`.
-    :param ciphers:
-        A string of ciphers we wish the client to support.
-    :param ca_cert_dir:
-        A directory containing CA certificates in multiple separate files, as
-        supported by OpenSSL's -CApath flag or the capath argument to
-        SSLContext.load_verify_locations().
-    :param key_password:
-        Optional password if the keyfile is encrypted.
-    :param ca_cert_data:
-        Optional string containing CA certificates in PEM format suitable for
-        passing as the cadata parameter to SSLContext.load_verify_locations()
-    :param tls_in_tls:
-        Use SSLTransport to wrap the existing socket.
-    """
-    context = ssl_context
-    if context is None:
-        # Note: This branch of code and all the variables in it are no longer
-        # used by urllib3 itself. We should consider deprecating and removing
-        # this code.
-        context = create_urllib3_context(ssl_version, cert_reqs, ciphers=ciphers)
-
-    if ca_certs or ca_cert_dir or ca_cert_data:
-        try:
-            context.load_verify_locations(ca_certs, ca_cert_dir, ca_cert_data)
-        except (IOError, OSError) as e:
-            raise SSLError(e)
-
-    elif ssl_context is None and hasattr(context, "load_default_certs"):
-        # try to load OS default certs; works well on Windows (require Python3.4+)
-        context.load_default_certs()
-
-    # Attempt to detect if we get the goofy behavior of the
-    # keyfile being encrypted and OpenSSL asking for the
-    # passphrase via the terminal and instead error out.
-    if keyfile and key_password is None and _is_key_file_encrypted(keyfile):
-        raise SSLError("Client private key is encrypted, password is required")
-
-    if certfile:
-        if key_password is None:
-            context.load_cert_chain(certfile, keyfile)
-        else:
-            context.load_cert_chain(certfile, keyfile, key_password)
-
-    try:
-        if hasattr(context, "set_alpn_protocols"):
-            context.set_alpn_protocols(ALPN_PROTOCOLS)
-    except NotImplementedError:  # Defensive: in CI, we always have set_alpn_protocols
-        pass
-
-    # If we detect server_hostname is an IP address then the SNI
-    # extension should not be used according to RFC3546 Section 3.1
-    use_sni_hostname = server_hostname and not is_ipaddress(server_hostname)
-    # SecureTransport uses server_hostname in certificate verification.
-    send_sni = (use_sni_hostname and HAS_SNI) or (
-        IS_SECURETRANSPORT and server_hostname
-    )
-    # Do not warn the user if server_hostname is an invalid SNI hostname.
-    if not HAS_SNI and use_sni_hostname:
-        warnings.warn(
-            "An HTTPS request has been made, but the SNI (Server Name "
-            "Indication) extension to TLS is not available on this platform. "
-            "This may cause the server to present an incorrect TLS "
-            "certificate, which can cause validation failures. You can upgrade to "
-            "a newer version of Python to solve this. For more information, see "
-            "https://urllib3.readthedocs.io/en/1.26.x/advanced-usage.html"
-            "#ssl-warnings",
-            SNIMissingWarning,
-        )
-
-    if send_sni:
-        ssl_sock = _ssl_wrap_socket_impl(
-            sock, context, tls_in_tls, server_hostname=server_hostname
-        )
-    else:
-        ssl_sock = _ssl_wrap_socket_impl(sock, context, tls_in_tls)
-    return ssl_sock
-
-
-def is_ipaddress(hostname):
-    """Detects whether the hostname given is an IPv4 or IPv6 address.
-    Also detects IPv6 addresses with Zone IDs.
-
-    :param str hostname: Hostname to examine.
-    :return: True if the hostname is an IP address, False otherwise.
-    """
-    if not six.PY2 and isinstance(hostname, bytes):
-        # IDN A-label bytes are ASCII compatible.
-        hostname = hostname.decode("ascii")
-    return bool(IPV4_RE.match(hostname) or BRACELESS_IPV6_ADDRZ_RE.match(hostname))
-
-
-def _is_key_file_encrypted(key_file):
-    """Detects if a key file is encrypted or not."""
-    with open(key_file, "r") as f:
-        for line in f:
-            # Look for Proc-Type: 4,ENCRYPTED
-            if "ENCRYPTED" in line:
-                return True
-
-    return False
-
-
-def _ssl_wrap_socket_impl(sock, ssl_context, tls_in_tls, server_hostname=None):
-    if tls_in_tls:
-        if not SSLTransport:
-            # Import error, ssl is not available.
-            raise ProxySchemeUnsupported(
-                "TLS in TLS requires support for the 'ssl' module"
-            )
-
-        SSLTransport._validate_ssl_context_for_tls_in_tls(ssl_context)
-        return SSLTransport(sock, ssl_context, server_hostname)
-
-    if server_hostname:
-        return ssl_context.wrap_socket(sock, server_hostname=server_hostname)
-    else:
-        return ssl_context.wrap_socket(sock)
diff --git a/lib/urllib3/util/ssl_match_hostname.py b/lib/urllib3/util/ssl_match_hostname.py
deleted file mode 100644
index 1dd950c4..00000000
--- a/lib/urllib3/util/ssl_match_hostname.py
+++ /dev/null
@@ -1,159 +0,0 @@
-"""The match_hostname() function from Python 3.3.3, essential when using SSL."""
-
-# Note: This file is under the PSF license as the code comes from the python
-# stdlib.   http://docs.python.org/3/license.html
-
-import re
-import sys
-
-# ipaddress has been backported to 2.6+ in pypi.  If it is installed on the
-# system, use it to handle IPAddress ServerAltnames (this was added in
-# python-3.5) otherwise only do DNS matching.  This allows
-# util.ssl_match_hostname to continue to be used in Python 2.7.
-try:
-    import ipaddress
-except ImportError:
-    ipaddress = None
-
-__version__ = "3.5.0.1"
-
-
-class CertificateError(ValueError):
-    pass
-
-
-def _dnsname_match(dn, hostname, max_wildcards=1):
-    """Matching according to RFC 6125, section 6.4.3
-
-    http://tools.ietf.org/html/rfc6125#section-6.4.3
-    """
-    pats = []
-    if not dn:
-        return False
-
-    # Ported from python3-syntax:
-    # leftmost, *remainder = dn.split(r'.')
-    parts = dn.split(r".")
-    leftmost = parts[0]
-    remainder = parts[1:]
-
-    wildcards = leftmost.count("*")
-    if wildcards > max_wildcards:
-        # Issue #17980: avoid denials of service by refusing more
-        # than one wildcard per fragment.  A survey of established
-        # policy among SSL implementations showed it to be a
-        # reasonable choice.
-        raise CertificateError(
-            "too many wildcards in certificate DNS name: " + repr(dn)
-        )
-
-    # speed up common case w/o wildcards
-    if not wildcards:
-        return dn.lower() == hostname.lower()
-
-    # RFC 6125, section 6.4.3, subitem 1.
-    # The client SHOULD NOT attempt to match a presented identifier in which
-    # the wildcard character comprises a label other than the left-most label.
-    if leftmost == "*":
-        # When '*' is a fragment by itself, it matches a non-empty dotless
-        # fragment.
-        pats.append("[^.]+")
-    elif leftmost.startswith("xn--") or hostname.startswith("xn--"):
-        # RFC 6125, section 6.4.3, subitem 3.
-        # The client SHOULD NOT attempt to match a presented identifier
-        # where the wildcard character is embedded within an A-label or
-        # U-label of an internationalized domain name.
-        pats.append(re.escape(leftmost))
-    else:
-        # Otherwise, '*' matches any dotless string, e.g. www*
-        pats.append(re.escape(leftmost).replace(r"\*", "[^.]*"))
-
-    # add the remaining fragments, ignore any wildcards
-    for frag in remainder:
-        pats.append(re.escape(frag))
-
-    pat = re.compile(r"\A" + r"\.".join(pats) + r"\Z", re.IGNORECASE)
-    return pat.match(hostname)
-
-
-def _to_unicode(obj):
-    if isinstance(obj, str) and sys.version_info < (3,):
-        # ignored flake8 # F821 to support python 2.7 function
-        obj = unicode(obj, encoding="ascii", errors="strict")  # noqa: F821
-    return obj
-
-
-def _ipaddress_match(ipname, host_ip):
-    """Exact matching of IP addresses.
-
-    RFC 6125 explicitly doesn't define an algorithm for this
-    (section 1.7.2 - "Out of Scope").
-    """
-    # OpenSSL may add a trailing newline to a subjectAltName's IP address
-    # Divergence from upstream: ipaddress can't handle byte str
-    ip = ipaddress.ip_address(_to_unicode(ipname).rstrip())
-    return ip == host_ip
-
-
-def match_hostname(cert, hostname):
-    """Verify that *cert* (in decoded format as returned by
-    SSLSocket.getpeercert()) matches the *hostname*.  RFC 2818 and RFC 6125
-    rules are followed, but IP addresses are not accepted for *hostname*.
-
-    CertificateError is raised on failure. On success, the function
-    returns nothing.
-    """
-    if not cert:
-        raise ValueError(
-            "empty or no certificate, match_hostname needs a "
-            "SSL socket or SSL context with either "
-            "CERT_OPTIONAL or CERT_REQUIRED"
-        )
-    try:
-        # Divergence from upstream: ipaddress can't handle byte str
-        host_ip = ipaddress.ip_address(_to_unicode(hostname))
-    except (UnicodeError, ValueError):
-        # ValueError: Not an IP address (common case)
-        # UnicodeError: Divergence from upstream: Have to deal with ipaddress not taking
-        # byte strings.  addresses should be all ascii, so we consider it not
-        # an ipaddress in this case
-        host_ip = None
-    except AttributeError:
-        # Divergence from upstream: Make ipaddress library optional
-        if ipaddress is None:
-            host_ip = None
-        else:  # Defensive
-            raise
-    dnsnames = []
-    san = cert.get("subjectAltName", ())
-    for key, value in san:
-        if key == "DNS":
-            if host_ip is None and _dnsname_match(value, hostname):
-                return
-            dnsnames.append(value)
-        elif key == "IP Address":
-            if host_ip is not None and _ipaddress_match(value, host_ip):
-                return
-            dnsnames.append(value)
-    if not dnsnames:
-        # The subject is only checked when there is no dNSName entry
-        # in subjectAltName
-        for sub in cert.get("subject", ()):
-            for key, value in sub:
-                # XXX according to RFC 2818, the most specific Common Name
-                # must be used.
-                if key == "commonName":
-                    if _dnsname_match(value, hostname):
-                        return
-                    dnsnames.append(value)
-    if len(dnsnames) > 1:
-        raise CertificateError(
-            "hostname %r "
-            "doesn't match either of %s" % (hostname, ", ".join(map(repr, dnsnames)))
-        )
-    elif len(dnsnames) == 1:
-        raise CertificateError("hostname %r doesn't match %r" % (hostname, dnsnames[0]))
-    else:
-        raise CertificateError(
-            "no appropriate commonName or subjectAltName fields were found"
-        )
diff --git a/lib/urllib3/util/ssltransport.py b/lib/urllib3/util/ssltransport.py
deleted file mode 100644
index 4a7105d1..00000000
--- a/lib/urllib3/util/ssltransport.py
+++ /dev/null
@@ -1,221 +0,0 @@
-import io
-import socket
-import ssl
-
-from ..exceptions import ProxySchemeUnsupported
-from ..packages import six
-
-SSL_BLOCKSIZE = 16384
-
-
-class SSLTransport:
-    """
-    The SSLTransport wraps an existing socket and establishes an SSL connection.
-
-    Contrary to Python's implementation of SSLSocket, it allows you to chain
-    multiple TLS connections together. It's particularly useful if you need to
-    implement TLS within TLS.
-
-    The class supports most of the socket API operations.
-    """
-
-    @staticmethod
-    def _validate_ssl_context_for_tls_in_tls(ssl_context):
-        """
-        Raises a ProxySchemeUnsupported if the provided ssl_context can't be used
-        for TLS in TLS.
-
-        The only requirement is that the ssl_context provides the 'wrap_bio'
-        methods.
-        """
-
-        if not hasattr(ssl_context, "wrap_bio"):
-            if six.PY2:
-                raise ProxySchemeUnsupported(
-                    "TLS in TLS requires SSLContext.wrap_bio() which isn't "
-                    "supported on Python 2"
-                )
-            else:
-                raise ProxySchemeUnsupported(
-                    "TLS in TLS requires SSLContext.wrap_bio() which isn't "
-                    "available on non-native SSLContext"
-                )
-
-    def __init__(
-        self, socket, ssl_context, server_hostname=None, suppress_ragged_eofs=True
-    ):
-        """
-        Create an SSLTransport around socket using the provided ssl_context.
-        """
-        self.incoming = ssl.MemoryBIO()
-        self.outgoing = ssl.MemoryBIO()
-
-        self.suppress_ragged_eofs = suppress_ragged_eofs
-        self.socket = socket
-
-        self.sslobj = ssl_context.wrap_bio(
-            self.incoming, self.outgoing, server_hostname=server_hostname
-        )
-
-        # Perform initial handshake.
-        self._ssl_io_loop(self.sslobj.do_handshake)
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, *_):
-        self.close()
-
-    def fileno(self):
-        return self.socket.fileno()
-
-    def read(self, len=1024, buffer=None):
-        return self._wrap_ssl_read(len, buffer)
-
-    def recv(self, len=1024, flags=0):
-        if flags != 0:
-            raise ValueError("non-zero flags not allowed in calls to recv")
-        return self._wrap_ssl_read(len)
-
-    def recv_into(self, buffer, nbytes=None, flags=0):
-        if flags != 0:
-            raise ValueError("non-zero flags not allowed in calls to recv_into")
-        if buffer and (nbytes is None):
-            nbytes = len(buffer)
-        elif nbytes is None:
-            nbytes = 1024
-        return self.read(nbytes, buffer)
-
-    def sendall(self, data, flags=0):
-        if flags != 0:
-            raise ValueError("non-zero flags not allowed in calls to sendall")
-        count = 0
-        with memoryview(data) as view, view.cast("B") as byte_view:
-            amount = len(byte_view)
-            while count < amount:
-                v = self.send(byte_view[count:])
-                count += v
-
-    def send(self, data, flags=0):
-        if flags != 0:
-            raise ValueError("non-zero flags not allowed in calls to send")
-        response = self._ssl_io_loop(self.sslobj.write, data)
-        return response
-
-    def makefile(
-        self, mode="r", buffering=None, encoding=None, errors=None, newline=None
-    ):
-        """
-        Python's httpclient uses makefile and buffered io when reading HTTP
-        messages and we need to support it.
-
-        This is unfortunately a copy and paste of socket.py makefile with small
-        changes to point to the socket directly.
-        """
-        if not set(mode) <= {"r", "w", "b"}:
-            raise ValueError("invalid mode %r (only r, w, b allowed)" % (mode,))
-
-        writing = "w" in mode
-        reading = "r" in mode or not writing
-        assert reading or writing
-        binary = "b" in mode
-        rawmode = ""
-        if reading:
-            rawmode += "r"
-        if writing:
-            rawmode += "w"
-        raw = socket.SocketIO(self, rawmode)
-        self.socket._io_refs += 1
-        if buffering is None:
-            buffering = -1
-        if buffering < 0:
-            buffering = io.DEFAULT_BUFFER_SIZE
-        if buffering == 0:
-            if not binary:
-                raise ValueError("unbuffered streams must be binary")
-            return raw
-        if reading and writing:
-            buffer = io.BufferedRWPair(raw, raw, buffering)
-        elif reading:
-            buffer = io.BufferedReader(raw, buffering)
-        else:
-            assert writing
-            buffer = io.BufferedWriter(raw, buffering)
-        if binary:
-            return buffer
-        text = io.TextIOWrapper(buffer, encoding, errors, newline)
-        text.mode = mode
-        return text
-
-    def unwrap(self):
-        self._ssl_io_loop(self.sslobj.unwrap)
-
-    def close(self):
-        self.socket.close()
-
-    def getpeercert(self, binary_form=False):
-        return self.sslobj.getpeercert(binary_form)
-
-    def version(self):
-        return self.sslobj.version()
-
-    def cipher(self):
-        return self.sslobj.cipher()
-
-    def selected_alpn_protocol(self):
-        return self.sslobj.selected_alpn_protocol()
-
-    def selected_npn_protocol(self):
-        return self.sslobj.selected_npn_protocol()
-
-    def shared_ciphers(self):
-        return self.sslobj.shared_ciphers()
-
-    def compression(self):
-        return self.sslobj.compression()
-
-    def settimeout(self, value):
-        self.socket.settimeout(value)
-
-    def gettimeout(self):
-        return self.socket.gettimeout()
-
-    def _decref_socketios(self):
-        self.socket._decref_socketios()
-
-    def _wrap_ssl_read(self, len, buffer=None):
-        try:
-            return self._ssl_io_loop(self.sslobj.read, len, buffer)
-        except ssl.SSLError as e:
-            if e.errno == ssl.SSL_ERROR_EOF and self.suppress_ragged_eofs:
-                return 0  # eof, return 0.
-            else:
-                raise
-
-    def _ssl_io_loop(self, func, *args):
-        """Performs an I/O loop between incoming/outgoing and the socket."""
-        should_loop = True
-        ret = None
-
-        while should_loop:
-            errno = None
-            try:
-                ret = func(*args)
-            except ssl.SSLError as e:
-                if e.errno not in (ssl.SSL_ERROR_WANT_READ, ssl.SSL_ERROR_WANT_WRITE):
-                    # WANT_READ, and WANT_WRITE are expected, others are not.
-                    raise e
-                errno = e.errno
-
-            buf = self.outgoing.read()
-            self.socket.sendall(buf)
-
-            if errno is None:
-                should_loop = False
-            elif errno == ssl.SSL_ERROR_WANT_READ:
-                buf = self.socket.recv(SSL_BLOCKSIZE)
-                if buf:
-                    self.incoming.write(buf)
-                else:
-                    self.incoming.write_eof()
-        return ret
diff --git a/lib/urllib3/util/timeout.py b/lib/urllib3/util/timeout.py
deleted file mode 100644
index 78e18a62..00000000
--- a/lib/urllib3/util/timeout.py
+++ /dev/null
@@ -1,271 +0,0 @@
-from __future__ import absolute_import
-
-import time
-
-# The default socket timeout, used by httplib to indicate that no timeout was; specified by the user
-from socket import _GLOBAL_DEFAULT_TIMEOUT, getdefaulttimeout
-
-from ..exceptions import TimeoutStateError
-
-# A sentinel value to indicate that no timeout was specified by the user in
-# urllib3
-_Default = object()
-
-
-# Use time.monotonic if available.
-current_time = getattr(time, "monotonic", time.time)
-
-
-class Timeout(object):
-    """Timeout configuration.
-
-    Timeouts can be defined as a default for a pool:
-
-    .. code-block:: python
-
-       timeout = Timeout(connect=2.0, read=7.0)
-       http = PoolManager(timeout=timeout)
-       response = http.request('GET', 'http://example.com/')
-
-    Or per-request (which overrides the default for the pool):
-
-    .. code-block:: python
-
-       response = http.request('GET', 'http://example.com/', timeout=Timeout(10))
-
-    Timeouts can be disabled by setting all the parameters to ``None``:
-
-    .. code-block:: python
-
-       no_timeout = Timeout(connect=None, read=None)
-       response = http.request('GET', 'http://example.com/, timeout=no_timeout)
-
-
-    :param total:
-        This combines the connect and read timeouts into one; the read timeout
-        will be set to the time leftover from the connect attempt. In the
-        event that both a connect timeout and a total are specified, or a read
-        timeout and a total are specified, the shorter timeout will be applied.
-
-        Defaults to None.
-
-    :type total: int, float, or None
-
-    :param connect:
-        The maximum amount of time (in seconds) to wait for a connection
-        attempt to a server to succeed. Omitting the parameter will default the
-        connect timeout to the system default, probably `the global default
-        timeout in socket.py
-        <http://hg.python.org/cpython/file/603b4d593758/Lib/socket.py#l535>`_.
-        None will set an infinite timeout for connection attempts.
-
-    :type connect: int, float, or None
-
-    :param read:
-        The maximum amount of time (in seconds) to wait between consecutive
-        read operations for a response from the server. Omitting the parameter
-        will default the read timeout to the system default, probably `the
-        global default timeout in socket.py
-        <http://hg.python.org/cpython/file/603b4d593758/Lib/socket.py#l535>`_.
-        None will set an infinite timeout.
-
-    :type read: int, float, or None
-
-    .. note::
-
-        Many factors can affect the total amount of time for urllib3 to return
-        an HTTP response.
-
-        For example, Python's DNS resolver does not obey the timeout specified
-        on the socket. Other factors that can affect total request time include
-        high CPU load, high swap, the program running at a low priority level,
-        or other behaviors.
-
-        In addition, the read and total timeouts only measure the time between
-        read operations on the socket connecting the client and the server,
-        not the total amount of time for the request to return a complete
-        response. For most requests, the timeout is raised because the server
-        has not sent the first byte in the specified time. This is not always
-        the case; if a server streams one byte every fifteen seconds, a timeout
-        of 20 seconds will not trigger, even though the request will take
-        several minutes to complete.
-
-        If your goal is to cut off any request after a set amount of wall clock
-        time, consider having a second "watcher" thread to cut off a slow
-        request.
-    """
-
-    #: A sentinel object representing the default timeout value
-    DEFAULT_TIMEOUT = _GLOBAL_DEFAULT_TIMEOUT
-
-    def __init__(self, total=None, connect=_Default, read=_Default):
-        self._connect = self._validate_timeout(connect, "connect")
-        self._read = self._validate_timeout(read, "read")
-        self.total = self._validate_timeout(total, "total")
-        self._start_connect = None
-
-    def __repr__(self):
-        return "%s(connect=%r, read=%r, total=%r)" % (
-            type(self).__name__,
-            self._connect,
-            self._read,
-            self.total,
-        )
-
-    # __str__ provided for backwards compatibility
-    __str__ = __repr__
-
-    @classmethod
-    def resolve_default_timeout(cls, timeout):
-        return getdefaulttimeout() if timeout is cls.DEFAULT_TIMEOUT else timeout
-
-    @classmethod
-    def _validate_timeout(cls, value, name):
-        """Check that a timeout attribute is valid.
-
-        :param value: The timeout value to validate
-        :param name: The name of the timeout attribute to validate. This is
-            used to specify in error messages.
-        :return: The validated and casted version of the given value.
-        :raises ValueError: If it is a numeric value less than or equal to
-            zero, or the type is not an integer, float, or None.
-        """
-        if value is _Default:
-            return cls.DEFAULT_TIMEOUT
-
-        if value is None or value is cls.DEFAULT_TIMEOUT:
-            return value
-
-        if isinstance(value, bool):
-            raise ValueError(
-                "Timeout cannot be a boolean value. It must "
-                "be an int, float or None."
-            )
-        try:
-            float(value)
-        except (TypeError, ValueError):
-            raise ValueError(
-                "Timeout value %s was %s, but it must be an "
-                "int, float or None." % (name, value)
-            )
-
-        try:
-            if value <= 0:
-                raise ValueError(
-                    "Attempted to set %s timeout to %s, but the "
-                    "timeout cannot be set to a value less "
-                    "than or equal to 0." % (name, value)
-                )
-        except TypeError:
-            # Python 3
-            raise ValueError(
-                "Timeout value %s was %s, but it must be an "
-                "int, float or None." % (name, value)
-            )
-
-        return value
-
-    @classmethod
-    def from_float(cls, timeout):
-        """Create a new Timeout from a legacy timeout value.
-
-        The timeout value used by httplib.py sets the same timeout on the
-        connect(), and recv() socket requests. This creates a :class:`Timeout`
-        object that sets the individual timeouts to the ``timeout`` value
-        passed to this function.
-
-        :param timeout: The legacy timeout value.
-        :type timeout: integer, float, sentinel default object, or None
-        :return: Timeout object
-        :rtype: :class:`Timeout`
-        """
-        return Timeout(read=timeout, connect=timeout)
-
-    def clone(self):
-        """Create a copy of the timeout object
-
-        Timeout properties are stored per-pool but each request needs a fresh
-        Timeout object to ensure each one has its own start/stop configured.
-
-        :return: a copy of the timeout object
-        :rtype: :class:`Timeout`
-        """
-        # We can't use copy.deepcopy because that will also create a new object
-        # for _GLOBAL_DEFAULT_TIMEOUT, which socket.py uses as a sentinel to
-        # detect the user default.
-        return Timeout(connect=self._connect, read=self._read, total=self.total)
-
-    def start_connect(self):
-        """Start the timeout clock, used during a connect() attempt
-
-        :raises urllib3.exceptions.TimeoutStateError: if you attempt
-            to start a timer that has been started already.
-        """
-        if self._start_connect is not None:
-            raise TimeoutStateError("Timeout timer has already been started.")
-        self._start_connect = current_time()
-        return self._start_connect
-
-    def get_connect_duration(self):
-        """Gets the time elapsed since the call to :meth:`start_connect`.
-
-        :return: Elapsed time in seconds.
-        :rtype: float
-        :raises urllib3.exceptions.TimeoutStateError: if you attempt
-            to get duration for a timer that hasn't been started.
-        """
-        if self._start_connect is None:
-            raise TimeoutStateError(
-                "Can't get connect duration for timer that has not started."
-            )
-        return current_time() - self._start_connect
-
-    @property
-    def connect_timeout(self):
-        """Get the value to use when setting a connection timeout.
-
-        This will be a positive float or integer, the value None
-        (never timeout), or the default system timeout.
-
-        :return: Connect timeout.
-        :rtype: int, float, :attr:`Timeout.DEFAULT_TIMEOUT` or None
-        """
-        if self.total is None:
-            return self._connect
-
-        if self._connect is None or self._connect is self.DEFAULT_TIMEOUT:
-            return self.total
-
-        return min(self._connect, self.total)
-
-    @property
-    def read_timeout(self):
-        """Get the value for the read timeout.
-
-        This assumes some time has elapsed in the connection timeout and
-        computes the read timeout appropriately.
-
-        If self.total is set, the read timeout is dependent on the amount of
-        time taken by the connect timeout. If the connection time has not been
-        established, a :exc:`~urllib3.exceptions.TimeoutStateError` will be
-        raised.
-
-        :return: Value to use for the read timeout.
-        :rtype: int, float, :attr:`Timeout.DEFAULT_TIMEOUT` or None
-        :raises urllib3.exceptions.TimeoutStateError: If :meth:`start_connect`
-            has not yet been called on this object.
-        """
-        if (
-            self.total is not None
-            and self.total is not self.DEFAULT_TIMEOUT
-            and self._read is not None
-            and self._read is not self.DEFAULT_TIMEOUT
-        ):
-            # In case the connect timeout has not yet been established.
-            if self._start_connect is None:
-                return self._read
-            return max(0, min(self.total - self.get_connect_duration(), self._read))
-        elif self.total is not None and self.total is not self.DEFAULT_TIMEOUT:
-            return max(0, self.total - self.get_connect_duration())
-        else:
-            return self._read
diff --git a/lib/urllib3/util/url.py b/lib/urllib3/util/url.py
deleted file mode 100644
index e5682d3b..00000000
--- a/lib/urllib3/util/url.py
+++ /dev/null
@@ -1,435 +0,0 @@
-from __future__ import absolute_import
-
-import re
-from collections import namedtuple
-
-from ..exceptions import LocationParseError
-from ..packages import six
-
-url_attrs = ["scheme", "auth", "host", "port", "path", "query", "fragment"]
-
-# We only want to normalize urls with an HTTP(S) scheme.
-# urllib3 infers URLs without a scheme (None) to be http.
-NORMALIZABLE_SCHEMES = ("http", "https", None)
-
-# Almost all of these patterns were derived from the
-# 'rfc3986' module: https://github.com/python-hyper/rfc3986
-PERCENT_RE = re.compile(r"%[a-fA-F0-9]{2}")
-SCHEME_RE = re.compile(r"^(?:[a-zA-Z][a-zA-Z0-9+-]*:|/)")
-URI_RE = re.compile(
-    r"^(?:([a-zA-Z][a-zA-Z0-9+.-]*):)?"
-    r"(?://([^\\/?#]*))?"
-    r"([^?#]*)"
-    r"(?:\?([^#]*))?"
-    r"(?:#(.*))?$",
-    re.UNICODE | re.DOTALL,
-)
-
-IPV4_PAT = r"(?:[0-9]{1,3}\.){3}[0-9]{1,3}"
-HEX_PAT = "[0-9A-Fa-f]{1,4}"
-LS32_PAT = "(?:{hex}:{hex}|{ipv4})".format(hex=HEX_PAT, ipv4=IPV4_PAT)
-_subs = {"hex": HEX_PAT, "ls32": LS32_PAT}
-_variations = [
-    #                            6( h16 ":" ) ls32
-    "(?:%(hex)s:){6}%(ls32)s",
-    #                       "::" 5( h16 ":" ) ls32
-    "::(?:%(hex)s:){5}%(ls32)s",
-    # [               h16 ] "::" 4( h16 ":" ) ls32
-    "(?:%(hex)s)?::(?:%(hex)s:){4}%(ls32)s",
-    # [ *1( h16 ":" ) h16 ] "::" 3( h16 ":" ) ls32
-    "(?:(?:%(hex)s:)?%(hex)s)?::(?:%(hex)s:){3}%(ls32)s",
-    # [ *2( h16 ":" ) h16 ] "::" 2( h16 ":" ) ls32
-    "(?:(?:%(hex)s:){0,2}%(hex)s)?::(?:%(hex)s:){2}%(ls32)s",
-    # [ *3( h16 ":" ) h16 ] "::"    h16 ":"   ls32
-    "(?:(?:%(hex)s:){0,3}%(hex)s)?::%(hex)s:%(ls32)s",
-    # [ *4( h16 ":" ) h16 ] "::"              ls32
-    "(?:(?:%(hex)s:){0,4}%(hex)s)?::%(ls32)s",
-    # [ *5( h16 ":" ) h16 ] "::"              h16
-    "(?:(?:%(hex)s:){0,5}%(hex)s)?::%(hex)s",
-    # [ *6( h16 ":" ) h16 ] "::"
-    "(?:(?:%(hex)s:){0,6}%(hex)s)?::",
-]
-
-UNRESERVED_PAT = r"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._\-~"
-IPV6_PAT = "(?:" + "|".join([x % _subs for x in _variations]) + ")"
-ZONE_ID_PAT = "(?:%25|%)(?:[" + UNRESERVED_PAT + "]|%[a-fA-F0-9]{2})+"
-IPV6_ADDRZ_PAT = r"\[" + IPV6_PAT + r"(?:" + ZONE_ID_PAT + r")?\]"
-REG_NAME_PAT = r"(?:[^\[\]%:/?#]|%[a-fA-F0-9]{2})*"
-TARGET_RE = re.compile(r"^(/[^?#]*)(?:\?([^#]*))?(?:#.*)?$")
-
-IPV4_RE = re.compile("^" + IPV4_PAT + "$")
-IPV6_RE = re.compile("^" + IPV6_PAT + "$")
-IPV6_ADDRZ_RE = re.compile("^" + IPV6_ADDRZ_PAT + "$")
-BRACELESS_IPV6_ADDRZ_RE = re.compile("^" + IPV6_ADDRZ_PAT[2:-2] + "$")
-ZONE_ID_RE = re.compile("(" + ZONE_ID_PAT + r")\]$")
-
-_HOST_PORT_PAT = ("^(%s|%s|%s)(?::0*?(|0|[1-9][0-9]{0,4}))?$") % (
-    REG_NAME_PAT,
-    IPV4_PAT,
-    IPV6_ADDRZ_PAT,
-)
-_HOST_PORT_RE = re.compile(_HOST_PORT_PAT, re.UNICODE | re.DOTALL)
-
-UNRESERVED_CHARS = set(
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._-~"
-)
-SUB_DELIM_CHARS = set("!$&'()*+,;=")
-USERINFO_CHARS = UNRESERVED_CHARS | SUB_DELIM_CHARS | {":"}
-PATH_CHARS = USERINFO_CHARS | {"@", "/"}
-QUERY_CHARS = FRAGMENT_CHARS = PATH_CHARS | {"?"}
-
-
-class Url(namedtuple("Url", url_attrs)):
-    """
-    Data structure for representing an HTTP URL. Used as a return value for
-    :func:`parse_url`. Both the scheme and host are normalized as they are
-    both case-insensitive according to RFC 3986.
-    """
-
-    __slots__ = ()
-
-    def __new__(
-        cls,
-        scheme=None,
-        auth=None,
-        host=None,
-        port=None,
-        path=None,
-        query=None,
-        fragment=None,
-    ):
-        if path and not path.startswith("/"):
-            path = "/" + path
-        if scheme is not None:
-            scheme = scheme.lower()
-        return super(Url, cls).__new__(
-            cls, scheme, auth, host, port, path, query, fragment
-        )
-
-    @property
-    def hostname(self):
-        """For backwards-compatibility with urlparse. We're nice like that."""
-        return self.host
-
-    @property
-    def request_uri(self):
-        """Absolute path including the query string."""
-        uri = self.path or "/"
-
-        if self.query is not None:
-            uri += "?" + self.query
-
-        return uri
-
-    @property
-    def netloc(self):
-        """Network location including host and port"""
-        if self.port:
-            return "%s:%d" % (self.host, self.port)
-        return self.host
-
-    @property
-    def url(self):
-        """
-        Convert self into a url
-
-        This function should more or less round-trip with :func:`.parse_url`. The
-        returned url may not be exactly the same as the url inputted to
-        :func:`.parse_url`, but it should be equivalent by the RFC (e.g., urls
-        with a blank port will have : removed).
-
-        Example: ::
-
-            >>> U = parse_url('http://google.com/mail/')
-            >>> U.url
-            'http://google.com/mail/'
-            >>> Url('http', 'username:password', 'host.com', 80,
-            ... '/path', 'query', 'fragment').url
-            'http://username:password@host.com:80/path?query#fragment'
-        """
-        scheme, auth, host, port, path, query, fragment = self
-        url = u""
-
-        # We use "is not None" we want things to happen with empty strings (or 0 port)
-        if scheme is not None:
-            url += scheme + u"://"
-        if auth is not None:
-            url += auth + u"@"
-        if host is not None:
-            url += host
-        if port is not None:
-            url += u":" + str(port)
-        if path is not None:
-            url += path
-        if query is not None:
-            url += u"?" + query
-        if fragment is not None:
-            url += u"#" + fragment
-
-        return url
-
-    def __str__(self):
-        return self.url
-
-
-def split_first(s, delims):
-    """
-    .. deprecated:: 1.25
-
-    Given a string and an iterable of delimiters, split on the first found
-    delimiter. Return two split parts and the matched delimiter.
-
-    If not found, then the first part is the full input string.
-
-    Example::
-
-        >>> split_first('foo/bar?baz', '?/=')
-        ('foo', 'bar?baz', '/')
-        >>> split_first('foo/bar?baz', '123')
-        ('foo/bar?baz', '', None)
-
-    Scales linearly with number of delims. Not ideal for large number of delims.
-    """
-    min_idx = None
-    min_delim = None
-    for d in delims:
-        idx = s.find(d)
-        if idx < 0:
-            continue
-
-        if min_idx is None or idx < min_idx:
-            min_idx = idx
-            min_delim = d
-
-    if min_idx is None or min_idx < 0:
-        return s, "", None
-
-    return s[:min_idx], s[min_idx + 1 :], min_delim
-
-
-def _encode_invalid_chars(component, allowed_chars, encoding="utf-8"):
-    """Percent-encodes a URI component without reapplying
-    onto an already percent-encoded component.
-    """
-    if component is None:
-        return component
-
-    component = six.ensure_text(component)
-
-    # Normalize existing percent-encoded bytes.
-    # Try to see if the component we're encoding is already percent-encoded
-    # so we can skip all '%' characters but still encode all others.
-    component, percent_encodings = PERCENT_RE.subn(
-        lambda match: match.group(0).upper(), component
-    )
-
-    uri_bytes = component.encode("utf-8", "surrogatepass")
-    is_percent_encoded = percent_encodings == uri_bytes.count(b"%")
-    encoded_component = bytearray()
-
-    for i in range(0, len(uri_bytes)):
-        # Will return a single character bytestring on both Python 2 & 3
-        byte = uri_bytes[i : i + 1]
-        byte_ord = ord(byte)
-        if (is_percent_encoded and byte == b"%") or (
-            byte_ord < 128 and byte.decode() in allowed_chars
-        ):
-            encoded_component += byte
-            continue
-        encoded_component.extend(b"%" + (hex(byte_ord)[2:].encode().zfill(2).upper()))
-
-    return encoded_component.decode(encoding)
-
-
-def _remove_path_dot_segments(path):
-    # See http://tools.ietf.org/html/rfc3986#section-5.2.4 for pseudo-code
-    segments = path.split("/")  # Turn the path into a list of segments
-    output = []  # Initialize the variable to use to store output
-
-    for segment in segments:
-        # '.' is the current directory, so ignore it, it is superfluous
-        if segment == ".":
-            continue
-        # Anything other than '..', should be appended to the output
-        elif segment != "..":
-            output.append(segment)
-        # In this case segment == '..', if we can, we should pop the last
-        # element
-        elif output:
-            output.pop()
-
-    # If the path starts with '/' and the output is empty or the first string
-    # is non-empty
-    if path.startswith("/") and (not output or output[0]):
-        output.insert(0, "")
-
-    # If the path starts with '/.' or '/..' ensure we add one more empty
-    # string to add a trailing '/'
-    if path.endswith(("/.", "/..")):
-        output.append("")
-
-    return "/".join(output)
-
-
-def _normalize_host(host, scheme):
-    if host:
-        if isinstance(host, six.binary_type):
-            host = six.ensure_str(host)
-
-        if scheme in NORMALIZABLE_SCHEMES:
-            is_ipv6 = IPV6_ADDRZ_RE.match(host)
-            if is_ipv6:
-                # IPv6 hosts of the form 'a::b%zone' are encoded in a URL as
-                # such per RFC 6874: 'a::b%25zone'. Unquote the ZoneID
-                # separator as necessary to return a valid RFC 4007 scoped IP.
-                match = ZONE_ID_RE.search(host)
-                if match:
-                    start, end = match.span(1)
-                    zone_id = host[start:end]
-
-                    if zone_id.startswith("%25") and zone_id != "%25":
-                        zone_id = zone_id[3:]
-                    else:
-                        zone_id = zone_id[1:]
-                    zone_id = "%" + _encode_invalid_chars(zone_id, UNRESERVED_CHARS)
-                    return host[:start].lower() + zone_id + host[end:]
-                else:
-                    return host.lower()
-            elif not IPV4_RE.match(host):
-                return six.ensure_str(
-                    b".".join([_idna_encode(label) for label in host.split(".")])
-                )
-    return host
-
-
-def _idna_encode(name):
-    if name and any(ord(x) >= 128 for x in name):
-        try:
-            import idna
-        except ImportError:
-            six.raise_from(
-                LocationParseError("Unable to parse URL without the 'idna' module"),
-                None,
-            )
-        try:
-            return idna.encode(name.lower(), strict=True, std3_rules=True)
-        except idna.IDNAError:
-            six.raise_from(
-                LocationParseError(u"Name '%s' is not a valid IDNA label" % name), None
-            )
-    return name.lower().encode("ascii")
-
-
-def _encode_target(target):
-    """Percent-encodes a request target so that there are no invalid characters"""
-    path, query = TARGET_RE.match(target).groups()
-    target = _encode_invalid_chars(path, PATH_CHARS)
-    query = _encode_invalid_chars(query, QUERY_CHARS)
-    if query is not None:
-        target += "?" + query
-    return target
-
-
-def parse_url(url):
-    """
-    Given a url, return a parsed :class:`.Url` namedtuple. Best-effort is
-    performed to parse incomplete urls. Fields not provided will be None.
-    This parser is RFC 3986 and RFC 6874 compliant.
-
-    The parser logic and helper functions are based heavily on
-    work done in the ``rfc3986`` module.
-
-    :param str url: URL to parse into a :class:`.Url` namedtuple.
-
-    Partly backwards-compatible with :mod:`urlparse`.
-
-    Example::
-
-        >>> parse_url('http://google.com/mail/')
-        Url(scheme='http', host='google.com', port=None, path='/mail/', ...)
-        >>> parse_url('google.com:80')
-        Url(scheme=None, host='google.com', port=80, path=None, ...)
-        >>> parse_url('/foo?bar')
-        Url(scheme=None, host=None, port=None, path='/foo', query='bar', ...)
-    """
-    if not url:
-        # Empty
-        return Url()
-
-    source_url = url
-    if not SCHEME_RE.search(url):
-        url = "//" + url
-
-    try:
-        scheme, authority, path, query, fragment = URI_RE.match(url).groups()
-        normalize_uri = scheme is None or scheme.lower() in NORMALIZABLE_SCHEMES
-
-        if scheme:
-            scheme = scheme.lower()
-
-        if authority:
-            auth, _, host_port = authority.rpartition("@")
-            auth = auth or None
-            host, port = _HOST_PORT_RE.match(host_port).groups()
-            if auth and normalize_uri:
-                auth = _encode_invalid_chars(auth, USERINFO_CHARS)
-            if port == "":
-                port = None
-        else:
-            auth, host, port = None, None, None
-
-        if port is not None:
-            port = int(port)
-            if not (0 <= port <= 65535):
-                raise LocationParseError(url)
-
-        host = _normalize_host(host, scheme)
-
-        if normalize_uri and path:
-            path = _remove_path_dot_segments(path)
-            path = _encode_invalid_chars(path, PATH_CHARS)
-        if normalize_uri and query:
-            query = _encode_invalid_chars(query, QUERY_CHARS)
-        if normalize_uri and fragment:
-            fragment = _encode_invalid_chars(fragment, FRAGMENT_CHARS)
-
-    except (ValueError, AttributeError):
-        return six.raise_from(LocationParseError(source_url), None)
-
-    # For the sake of backwards compatibility we put empty
-    # string values for path if there are any defined values
-    # beyond the path in the URL.
-    # TODO: Remove this when we break backwards compatibility.
-    if not path:
-        if query is not None or fragment is not None:
-            path = ""
-        else:
-            path = None
-
-    # Ensure that each part of the URL is a `str` for
-    # backwards compatibility.
-    if isinstance(url, six.text_type):
-        ensure_func = six.ensure_text
-    else:
-        ensure_func = six.ensure_str
-
-    def ensure_type(x):
-        return x if x is None else ensure_func(x)
-
-    return Url(
-        scheme=ensure_type(scheme),
-        auth=ensure_type(auth),
-        host=ensure_type(host),
-        port=port,
-        path=ensure_type(path),
-        query=ensure_type(query),
-        fragment=ensure_type(fragment),
-    )
-
-
-def get_host(url):
-    """
-    Deprecated. Use :func:`parse_url` instead.
-    """
-    p = parse_url(url)
-    return p.scheme or "http", p.hostname, p.port
diff --git a/lib/urllib3/util/wait.py b/lib/urllib3/util/wait.py
deleted file mode 100644
index 21b4590b..00000000
--- a/lib/urllib3/util/wait.py
+++ /dev/null
@@ -1,152 +0,0 @@
-import errno
-import select
-import sys
-from functools import partial
-
-try:
-    from time import monotonic
-except ImportError:
-    from time import time as monotonic
-
-__all__ = ["NoWayToWaitForSocketError", "wait_for_read", "wait_for_write"]
-
-
-class NoWayToWaitForSocketError(Exception):
-    pass
-
-
-# How should we wait on sockets?
-#
-# There are two types of APIs you can use for waiting on sockets: the fancy
-# modern stateful APIs like epoll/kqueue, and the older stateless APIs like
-# select/poll. The stateful APIs are more efficient when you have a lots of
-# sockets to keep track of, because you can set them up once and then use them
-# lots of times. But we only ever want to wait on a single socket at a time
-# and don't want to keep track of state, so the stateless APIs are actually
-# more efficient. So we want to use select() or poll().
-#
-# Now, how do we choose between select() and poll()? On traditional Unixes,
-# select() has a strange calling convention that makes it slow, or fail
-# altogether, for high-numbered file descriptors. The point of poll() is to fix
-# that, so on Unixes, we prefer poll().
-#
-# On Windows, there is no poll() (or at least Python doesn't provide a wrapper
-# for it), but that's OK, because on Windows, select() doesn't have this
-# strange calling convention; plain select() works fine.
-#
-# So: on Windows we use select(), and everywhere else we use poll(). We also
-# fall back to select() in case poll() is somehow broken or missing.
-
-if sys.version_info >= (3, 5):
-    # Modern Python, that retries syscalls by default
-    def _retry_on_intr(fn, timeout):
-        return fn(timeout)
-
-else:
-    # Old and broken Pythons.
-    def _retry_on_intr(fn, timeout):
-        if timeout is None:
-            deadline = float("inf")
-        else:
-            deadline = monotonic() + timeout
-
-        while True:
-            try:
-                return fn(timeout)
-            # OSError for 3 <= pyver < 3.5, select.error for pyver <= 2.7
-            except (OSError, select.error) as e:
-                # 'e.args[0]' incantation works for both OSError and select.error
-                if e.args[0] != errno.EINTR:
-                    raise
-                else:
-                    timeout = deadline - monotonic()
-                    if timeout < 0:
-                        timeout = 0
-                    if timeout == float("inf"):
-                        timeout = None
-                    continue
-
-
-def select_wait_for_socket(sock, read=False, write=False, timeout=None):
-    if not read and not write:
-        raise RuntimeError("must specify at least one of read=True, write=True")
-    rcheck = []
-    wcheck = []
-    if read:
-        rcheck.append(sock)
-    if write:
-        wcheck.append(sock)
-    # When doing a non-blocking connect, most systems signal success by
-    # marking the socket writable. Windows, though, signals success by marked
-    # it as "exceptional". We paper over the difference by checking the write
-    # sockets for both conditions. (The stdlib selectors module does the same
-    # thing.)
-    fn = partial(select.select, rcheck, wcheck, wcheck)
-    rready, wready, xready = _retry_on_intr(fn, timeout)
-    return bool(rready or wready or xready)
-
-
-def poll_wait_for_socket(sock, read=False, write=False, timeout=None):
-    if not read and not write:
-        raise RuntimeError("must specify at least one of read=True, write=True")
-    mask = 0
-    if read:
-        mask |= select.POLLIN
-    if write:
-        mask |= select.POLLOUT
-    poll_obj = select.poll()
-    poll_obj.register(sock, mask)
-
-    # For some reason, poll() takes timeout in milliseconds
-    def do_poll(t):
-        if t is not None:
-            t *= 1000
-        return poll_obj.poll(t)
-
-    return bool(_retry_on_intr(do_poll, timeout))
-
-
-def null_wait_for_socket(*args, **kwargs):
-    raise NoWayToWaitForSocketError("no select-equivalent available")
-
-
-def _have_working_poll():
-    # Apparently some systems have a select.poll that fails as soon as you try
-    # to use it, either due to strange configuration or broken monkeypatching
-    # from libraries like eventlet/greenlet.
-    try:
-        poll_obj = select.poll()
-        _retry_on_intr(poll_obj.poll, 0)
-    except (AttributeError, OSError):
-        return False
-    else:
-        return True
-
-
-def wait_for_socket(*args, **kwargs):
-    # We delay choosing which implementation to use until the first time we're
-    # called. We could do it at import time, but then we might make the wrong
-    # decision if someone goes wild with monkeypatching select.poll after
-    # we're imported.
-    global wait_for_socket
-    if _have_working_poll():
-        wait_for_socket = poll_wait_for_socket
-    elif hasattr(select, "select"):
-        wait_for_socket = select_wait_for_socket
-    else:  # Platform-specific: Appengine.
-        wait_for_socket = null_wait_for_socket
-    return wait_for_socket(*args, **kwargs)
-
-
-def wait_for_read(sock, timeout=None):
-    """Waits for reading to be available on a given socket.
-    Returns True if the socket is readable, or False if the timeout expired.
-    """
-    return wait_for_socket(sock, read=True, timeout=timeout)
-
-
-def wait_for_write(sock, timeout=None):
-    """Waits for writing to be available on a given socket.
-    Returns True if the socket is readable, or False if the timeout expired.
-    """
-    return wait_for_socket(sock, write=True, timeout=timeout)
diff --git a/lib/webencodings/__init__.py b/lib/webencodings/__init__.py
deleted file mode 100644
index d21d697c..00000000
--- a/lib/webencodings/__init__.py
+++ /dev/null
@@ -1,342 +0,0 @@
-# coding: utf-8
-"""
-
-    webencodings
-    ~~~~~~~~~~~~
-
-    This is a Python implementation of the `WHATWG Encoding standard
-    <http://encoding.spec.whatwg.org/>`. See README for details.
-
-    :copyright: Copyright 2012 by Simon Sapin
-    :license: BSD, see LICENSE for details.
-
-"""
-
-from __future__ import unicode_literals
-
-import codecs
-
-from .labels import LABELS
-
-
-VERSION = '0.5.1'
-
-
-# Some names in Encoding are not valid Python aliases. Remap these.
-PYTHON_NAMES = {
-    'iso-8859-8-i': 'iso-8859-8',
-    'x-mac-cyrillic': 'mac-cyrillic',
-    'macintosh': 'mac-roman',
-    'windows-874': 'cp874'}
-
-CACHE = {}
-
-
-def ascii_lower(string):
-    r"""Transform (only) ASCII letters to lower case: A-Z is mapped to a-z.
-
-    :param string: An Unicode string.
-    :returns: A new Unicode string.
-
-    This is used for `ASCII case-insensitive
-    <http://encoding.spec.whatwg.org/#ascii-case-insensitive>`_
-    matching of encoding labels.
-    The same matching is also used, among other things,
-    for `CSS keywords <http://dev.w3.org/csswg/css-values/#keywords>`_.
-
-    This is different from the :meth:`~py:str.lower` method of Unicode strings
-    which also affect non-ASCII characters,
-    sometimes mapping them into the ASCII range:
-
-        >>> keyword = u'Bac\N{KELVIN SIGN}ground'
-        >>> assert keyword.lower() == u'background'
-        >>> assert ascii_lower(keyword) != keyword.lower()
-        >>> assert ascii_lower(keyword) == u'bac\N{KELVIN SIGN}ground'
-
-    """
-    # This turns out to be faster than unicode.translate()
-    return string.encode('utf8').lower().decode('utf8')
-
-
-def lookup(label):
-    """
-    Look for an encoding by its label.
-    This is the spec’s `get an encoding
-    <http://encoding.spec.whatwg.org/#concept-encoding-get>`_ algorithm.
-    Supported labels are listed there.
-
-    :param label: A string.
-    :returns:
-        An :class:`Encoding` object, or :obj:`None` for an unknown label.
-
-    """
-    # Only strip ASCII whitespace: U+0009, U+000A, U+000C, U+000D, and U+0020.
-    label = ascii_lower(label.strip('\t\n\f\r '))
-    name = LABELS.get(label)
-    if name is None:
-        return None
-    encoding = CACHE.get(name)
-    if encoding is None:
-        if name == 'x-user-defined':
-            from .x_user_defined import codec_info
-        else:
-            python_name = PYTHON_NAMES.get(name, name)
-            # Any python_name value that gets to here should be valid.
-            codec_info = codecs.lookup(python_name)
-        encoding = Encoding(name, codec_info)
-        CACHE[name] = encoding
-    return encoding
-
-
-def _get_encoding(encoding_or_label):
-    """
-    Accept either an encoding object or label.
-
-    :param encoding: An :class:`Encoding` object or a label string.
-    :returns: An :class:`Encoding` object.
-    :raises: :exc:`~exceptions.LookupError` for an unknown label.
-
-    """
-    if hasattr(encoding_or_label, 'codec_info'):
-        return encoding_or_label
-
-    encoding = lookup(encoding_or_label)
-    if encoding is None:
-        raise LookupError('Unknown encoding label: %r' % encoding_or_label)
-    return encoding
-
-
-class Encoding(object):
-    """Reresents a character encoding such as UTF-8,
-    that can be used for decoding or encoding.
-
-    .. attribute:: name
-
-        Canonical name of the encoding
-
-    .. attribute:: codec_info
-
-        The actual implementation of the encoding,
-        a stdlib :class:`~codecs.CodecInfo` object.
-        See :func:`codecs.register`.
-
-    """
-    def __init__(self, name, codec_info):
-        self.name = name
-        self.codec_info = codec_info
-
-    def __repr__(self):
-        return '<Encoding %s>' % self.name
-
-
-#: The UTF-8 encoding. Should be used for new content and formats.
-UTF8 = lookup('utf-8')
-
-_UTF16LE = lookup('utf-16le')
-_UTF16BE = lookup('utf-16be')
-
-
-def decode(input, fallback_encoding, errors='replace'):
-    """
-    Decode a single string.
-
-    :param input: A byte string
-    :param fallback_encoding:
-        An :class:`Encoding` object or a label string.
-        The encoding to use if :obj:`input` does note have a BOM.
-    :param errors: Type of error handling. See :func:`codecs.register`.
-    :raises: :exc:`~exceptions.LookupError` for an unknown encoding label.
-    :return:
-        A ``(output, encoding)`` tuple of an Unicode string
-        and an :obj:`Encoding`.
-
-    """
-    # Fail early if `encoding` is an invalid label.
-    fallback_encoding = _get_encoding(fallback_encoding)
-    bom_encoding, input = _detect_bom(input)
-    encoding = bom_encoding or fallback_encoding
-    return encoding.codec_info.decode(input, errors)[0], encoding
-
-
-def _detect_bom(input):
-    """Return (bom_encoding, input), with any BOM removed from the input."""
-    if input.startswith(b'\xFF\xFE'):
-        return _UTF16LE, input[2:]
-    if input.startswith(b'\xFE\xFF'):
-        return _UTF16BE, input[2:]
-    if input.startswith(b'\xEF\xBB\xBF'):
-        return UTF8, input[3:]
-    return None, input
-
-
-def encode(input, encoding=UTF8, errors='strict'):
-    """
-    Encode a single string.
-
-    :param input: An Unicode string.
-    :param encoding: An :class:`Encoding` object or a label string.
-    :param errors: Type of error handling. See :func:`codecs.register`.
-    :raises: :exc:`~exceptions.LookupError` for an unknown encoding label.
-    :return: A byte string.
-
-    """
-    return _get_encoding(encoding).codec_info.encode(input, errors)[0]
-
-
-def iter_decode(input, fallback_encoding, errors='replace'):
-    """
-    "Pull"-based decoder.
-
-    :param input:
-        An iterable of byte strings.
-
-        The input is first consumed just enough to determine the encoding
-        based on the precense of a BOM,
-        then consumed on demand when the return value is.
-    :param fallback_encoding:
-        An :class:`Encoding` object or a label string.
-        The encoding to use if :obj:`input` does note have a BOM.
-    :param errors: Type of error handling. See :func:`codecs.register`.
-    :raises: :exc:`~exceptions.LookupError` for an unknown encoding label.
-    :returns:
-        An ``(output, encoding)`` tuple.
-        :obj:`output` is an iterable of Unicode strings,
-        :obj:`encoding` is the :obj:`Encoding` that is being used.
-
-    """
-
-    decoder = IncrementalDecoder(fallback_encoding, errors)
-    generator = _iter_decode_generator(input, decoder)
-    encoding = next(generator)
-    return generator, encoding
-
-
-def _iter_decode_generator(input, decoder):
-    """Return a generator that first yields the :obj:`Encoding`,
-    then yields output chukns as Unicode strings.
-
-    """
-    decode = decoder.decode
-    input = iter(input)
-    for chunck in input:
-        output = decode(chunck)
-        if output:
-            assert decoder.encoding is not None
-            yield decoder.encoding
-            yield output
-            break
-    else:
-        # Input exhausted without determining the encoding
-        output = decode(b'', final=True)
-        assert decoder.encoding is not None
-        yield decoder.encoding
-        if output:
-            yield output
-        return
-
-    for chunck in input:
-        output = decode(chunck)
-        if output:
-            yield output
-    output = decode(b'', final=True)
-    if output:
-        yield output
-
-
-def iter_encode(input, encoding=UTF8, errors='strict'):
-    """
-    “Pull�-based encoder.
-
-    :param input: An iterable of Unicode strings.
-    :param encoding: An :class:`Encoding` object or a label string.
-    :param errors: Type of error handling. See :func:`codecs.register`.
-    :raises: :exc:`~exceptions.LookupError` for an unknown encoding label.
-    :returns: An iterable of byte strings.
-
-    """
-    # Fail early if `encoding` is an invalid label.
-    encode = IncrementalEncoder(encoding, errors).encode
-    return _iter_encode_generator(input, encode)
-
-
-def _iter_encode_generator(input, encode):
-    for chunck in input:
-        output = encode(chunck)
-        if output:
-            yield output
-    output = encode('', final=True)
-    if output:
-        yield output
-
-
-class IncrementalDecoder(object):
-    """
-    “Push�-based decoder.
-
-    :param fallback_encoding:
-        An :class:`Encoding` object or a label string.
-        The encoding to use if :obj:`input` does note have a BOM.
-    :param errors: Type of error handling. See :func:`codecs.register`.
-    :raises: :exc:`~exceptions.LookupError` for an unknown encoding label.
-
-    """
-    def __init__(self, fallback_encoding, errors='replace'):
-        # Fail early if `encoding` is an invalid label.
-        self._fallback_encoding = _get_encoding(fallback_encoding)
-        self._errors = errors
-        self._buffer = b''
-        self._decoder = None
-        #: The actual :class:`Encoding` that is being used,
-        #: or :obj:`None` if that is not determined yet.
-        #: (Ie. if there is not enough input yet to determine
-        #: if there is a BOM.)
-        self.encoding = None  # Not known yet.
-
-    def decode(self, input, final=False):
-        """Decode one chunk of the input.
-
-        :param input: A byte string.
-        :param final:
-            Indicate that no more input is available.
-            Must be :obj:`True` if this is the last call.
-        :returns: An Unicode string.
-
-        """
-        decoder = self._decoder
-        if decoder is not None:
-            return decoder(input, final)
-
-        input = self._buffer + input
-        encoding, input = _detect_bom(input)
-        if encoding is None:
-            if len(input) < 3 and not final:  # Not enough data yet.
-                self._buffer = input
-                return ''
-            else:  # No BOM
-                encoding = self._fallback_encoding
-        decoder = encoding.codec_info.incrementaldecoder(self._errors).decode
-        self._decoder = decoder
-        self.encoding = encoding
-        return decoder(input, final)
-
-
-class IncrementalEncoder(object):
-    """
-    “Push�-based encoder.
-
-    :param encoding: An :class:`Encoding` object or a label string.
-    :param errors: Type of error handling. See :func:`codecs.register`.
-    :raises: :exc:`~exceptions.LookupError` for an unknown encoding label.
-
-    .. method:: encode(input, final=False)
-
-        :param input: An Unicode string.
-        :param final:
-            Indicate that no more input is available.
-            Must be :obj:`True` if this is the last call.
-        :returns: A byte string.
-
-    """
-    def __init__(self, encoding=UTF8, errors='strict'):
-        encoding = _get_encoding(encoding)
-        self.encode = encoding.codec_info.incrementalencoder(errors).encode
diff --git a/lib/webencodings/labels.py b/lib/webencodings/labels.py
deleted file mode 100644
index 29cbf91e..00000000
--- a/lib/webencodings/labels.py
+++ /dev/null
@@ -1,231 +0,0 @@
-"""
-
-    webencodings.labels
-    ~~~~~~~~~~~~~~~~~~~
-
-    Map encoding labels to their name.
-
-    :copyright: Copyright 2012 by Simon Sapin
-    :license: BSD, see LICENSE for details.
-
-"""
-
-# XXX Do not edit!
-# This file is automatically generated by mklabels.py
-
-LABELS = {
-    'unicode-1-1-utf-8':   'utf-8',
-    'utf-8':               'utf-8',
-    'utf8':                'utf-8',
-    '866':                 'ibm866',
-    'cp866':               'ibm866',
-    'csibm866':            'ibm866',
-    'ibm866':              'ibm866',
-    'csisolatin2':         'iso-8859-2',
-    'iso-8859-2':          'iso-8859-2',
-    'iso-ir-101':          'iso-8859-2',
-    'iso8859-2':           'iso-8859-2',
-    'iso88592':            'iso-8859-2',
-    'iso_8859-2':          'iso-8859-2',
-    'iso_8859-2:1987':     'iso-8859-2',
-    'l2':                  'iso-8859-2',
-    'latin2':              'iso-8859-2',
-    'csisolatin3':         'iso-8859-3',
-    'iso-8859-3':          'iso-8859-3',
-    'iso-ir-109':          'iso-8859-3',
-    'iso8859-3':           'iso-8859-3',
-    'iso88593':            'iso-8859-3',
-    'iso_8859-3':          'iso-8859-3',
-    'iso_8859-3:1988':     'iso-8859-3',
-    'l3':                  'iso-8859-3',
-    'latin3':              'iso-8859-3',
-    'csisolatin4':         'iso-8859-4',
-    'iso-8859-4':          'iso-8859-4',
-    'iso-ir-110':          'iso-8859-4',
-    'iso8859-4':           'iso-8859-4',
-    'iso88594':            'iso-8859-4',
-    'iso_8859-4':          'iso-8859-4',
-    'iso_8859-4:1988':     'iso-8859-4',
-    'l4':                  'iso-8859-4',
-    'latin4':              'iso-8859-4',
-    'csisolatincyrillic':  'iso-8859-5',
-    'cyrillic':            'iso-8859-5',
-    'iso-8859-5':          'iso-8859-5',
-    'iso-ir-144':          'iso-8859-5',
-    'iso8859-5':           'iso-8859-5',
-    'iso88595':            'iso-8859-5',
-    'iso_8859-5':          'iso-8859-5',
-    'iso_8859-5:1988':     'iso-8859-5',
-    'arabic':              'iso-8859-6',
-    'asmo-708':            'iso-8859-6',
-    'csiso88596e':         'iso-8859-6',
-    'csiso88596i':         'iso-8859-6',
-    'csisolatinarabic':    'iso-8859-6',
-    'ecma-114':            'iso-8859-6',
-    'iso-8859-6':          'iso-8859-6',
-    'iso-8859-6-e':        'iso-8859-6',
-    'iso-8859-6-i':        'iso-8859-6',
-    'iso-ir-127':          'iso-8859-6',
-    'iso8859-6':           'iso-8859-6',
-    'iso88596':            'iso-8859-6',
-    'iso_8859-6':          'iso-8859-6',
-    'iso_8859-6:1987':     'iso-8859-6',
-    'csisolatingreek':     'iso-8859-7',
-    'ecma-118':            'iso-8859-7',
-    'elot_928':            'iso-8859-7',
-    'greek':               'iso-8859-7',
-    'greek8':              'iso-8859-7',
-    'iso-8859-7':          'iso-8859-7',
-    'iso-ir-126':          'iso-8859-7',
-    'iso8859-7':           'iso-8859-7',
-    'iso88597':            'iso-8859-7',
-    'iso_8859-7':          'iso-8859-7',
-    'iso_8859-7:1987':     'iso-8859-7',
-    'sun_eu_greek':        'iso-8859-7',
-    'csiso88598e':         'iso-8859-8',
-    'csisolatinhebrew':    'iso-8859-8',
-    'hebrew':              'iso-8859-8',
-    'iso-8859-8':          'iso-8859-8',
-    'iso-8859-8-e':        'iso-8859-8',
-    'iso-ir-138':          'iso-8859-8',
-    'iso8859-8':           'iso-8859-8',
-    'iso88598':            'iso-8859-8',
-    'iso_8859-8':          'iso-8859-8',
-    'iso_8859-8:1988':     'iso-8859-8',
-    'visual':              'iso-8859-8',
-    'csiso88598i':         'iso-8859-8-i',
-    'iso-8859-8-i':        'iso-8859-8-i',
-    'logical':             'iso-8859-8-i',
-    'csisolatin6':         'iso-8859-10',
-    'iso-8859-10':         'iso-8859-10',
-    'iso-ir-157':          'iso-8859-10',
-    'iso8859-10':          'iso-8859-10',
-    'iso885910':           'iso-8859-10',
-    'l6':                  'iso-8859-10',
-    'latin6':              'iso-8859-10',
-    'iso-8859-13':         'iso-8859-13',
-    'iso8859-13':          'iso-8859-13',
-    'iso885913':           'iso-8859-13',
-    'iso-8859-14':         'iso-8859-14',
-    'iso8859-14':          'iso-8859-14',
-    'iso885914':           'iso-8859-14',
-    'csisolatin9':         'iso-8859-15',
-    'iso-8859-15':         'iso-8859-15',
-    'iso8859-15':          'iso-8859-15',
-    'iso885915':           'iso-8859-15',
-    'iso_8859-15':         'iso-8859-15',
-    'l9':                  'iso-8859-15',
-    'iso-8859-16':         'iso-8859-16',
-    'cskoi8r':             'koi8-r',
-    'koi':                 'koi8-r',
-    'koi8':                'koi8-r',
-    'koi8-r':              'koi8-r',
-    'koi8_r':              'koi8-r',
-    'koi8-u':              'koi8-u',
-    'csmacintosh':         'macintosh',
-    'mac':                 'macintosh',
-    'macintosh':           'macintosh',
-    'x-mac-roman':         'macintosh',
-    'dos-874':             'windows-874',
-    'iso-8859-11':         'windows-874',
-    'iso8859-11':          'windows-874',
-    'iso885911':           'windows-874',
-    'tis-620':             'windows-874',
-    'windows-874':         'windows-874',
-    'cp1250':              'windows-1250',
-    'windows-1250':        'windows-1250',
-    'x-cp1250':            'windows-1250',
-    'cp1251':              'windows-1251',
-    'windows-1251':        'windows-1251',
-    'x-cp1251':            'windows-1251',
-    'ansi_x3.4-1968':      'windows-1252',
-    'ascii':               'windows-1252',
-    'cp1252':              'windows-1252',
-    'cp819':               'windows-1252',
-    'csisolatin1':         'windows-1252',
-    'ibm819':              'windows-1252',
-    'iso-8859-1':          'windows-1252',
-    'iso-ir-100':          'windows-1252',
-    'iso8859-1':           'windows-1252',
-    'iso88591':            'windows-1252',
-    'iso_8859-1':          'windows-1252',
-    'iso_8859-1:1987':     'windows-1252',
-    'l1':                  'windows-1252',
-    'latin1':              'windows-1252',
-    'us-ascii':            'windows-1252',
-    'windows-1252':        'windows-1252',
-    'x-cp1252':            'windows-1252',
-    'cp1253':              'windows-1253',
-    'windows-1253':        'windows-1253',
-    'x-cp1253':            'windows-1253',
-    'cp1254':              'windows-1254',
-    'csisolatin5':         'windows-1254',
-    'iso-8859-9':          'windows-1254',
-    'iso-ir-148':          'windows-1254',
-    'iso8859-9':           'windows-1254',
-    'iso88599':            'windows-1254',
-    'iso_8859-9':          'windows-1254',
-    'iso_8859-9:1989':     'windows-1254',
-    'l5':                  'windows-1254',
-    'latin5':              'windows-1254',
-    'windows-1254':        'windows-1254',
-    'x-cp1254':            'windows-1254',
-    'cp1255':              'windows-1255',
-    'windows-1255':        'windows-1255',
-    'x-cp1255':            'windows-1255',
-    'cp1256':              'windows-1256',
-    'windows-1256':        'windows-1256',
-    'x-cp1256':            'windows-1256',
-    'cp1257':              'windows-1257',
-    'windows-1257':        'windows-1257',
-    'x-cp1257':            'windows-1257',
-    'cp1258':              'windows-1258',
-    'windows-1258':        'windows-1258',
-    'x-cp1258':            'windows-1258',
-    'x-mac-cyrillic':      'x-mac-cyrillic',
-    'x-mac-ukrainian':     'x-mac-cyrillic',
-    'chinese':             'gbk',
-    'csgb2312':            'gbk',
-    'csiso58gb231280':     'gbk',
-    'gb2312':              'gbk',
-    'gb_2312':             'gbk',
-    'gb_2312-80':          'gbk',
-    'gbk':                 'gbk',
-    'iso-ir-58':           'gbk',
-    'x-gbk':               'gbk',
-    'gb18030':             'gb18030',
-    'hz-gb-2312':          'hz-gb-2312',
-    'big5':                'big5',
-    'big5-hkscs':          'big5',
-    'cn-big5':             'big5',
-    'csbig5':              'big5',
-    'x-x-big5':            'big5',
-    'cseucpkdfmtjapanese': 'euc-jp',
-    'euc-jp':              'euc-jp',
-    'x-euc-jp':            'euc-jp',
-    'csiso2022jp':         'iso-2022-jp',
-    'iso-2022-jp':         'iso-2022-jp',
-    'csshiftjis':          'shift_jis',
-    'ms_kanji':            'shift_jis',
-    'shift-jis':           'shift_jis',
-    'shift_jis':           'shift_jis',
-    'sjis':                'shift_jis',
-    'windows-31j':         'shift_jis',
-    'x-sjis':              'shift_jis',
-    'cseuckr':             'euc-kr',
-    'csksc56011987':       'euc-kr',
-    'euc-kr':              'euc-kr',
-    'iso-ir-149':          'euc-kr',
-    'korean':              'euc-kr',
-    'ks_c_5601-1987':      'euc-kr',
-    'ks_c_5601-1989':      'euc-kr',
-    'ksc5601':             'euc-kr',
-    'ksc_5601':            'euc-kr',
-    'windows-949':         'euc-kr',
-    'csiso2022kr':         'iso-2022-kr',
-    'iso-2022-kr':         'iso-2022-kr',
-    'utf-16be':            'utf-16be',
-    'utf-16':              'utf-16le',
-    'utf-16le':            'utf-16le',
-    'x-user-defined':      'x-user-defined',
-}
diff --git a/lib/webencodings/mklabels.py b/lib/webencodings/mklabels.py
deleted file mode 100644
index 295dc928..00000000
--- a/lib/webencodings/mklabels.py
+++ /dev/null
@@ -1,59 +0,0 @@
-"""
-
-    webencodings.mklabels
-    ~~~~~~~~~~~~~~~~~~~~~
-
-    Regenarate the webencodings.labels module.
-
-    :copyright: Copyright 2012 by Simon Sapin
-    :license: BSD, see LICENSE for details.
-
-"""
-
-import json
-try:
-    from urllib import urlopen
-except ImportError:
-    from urllib.request import urlopen
-
-
-def assert_lower(string):
-    assert string == string.lower()
-    return string
-
-
-def generate(url):
-    parts = ['''\
-"""
-
-    webencodings.labels
-    ~~~~~~~~~~~~~~~~~~~
-
-    Map encoding labels to their name.
-
-    :copyright: Copyright 2012 by Simon Sapin
-    :license: BSD, see LICENSE for details.
-
-"""
-
-# XXX Do not edit!
-# This file is automatically generated by mklabels.py
-
-LABELS = {
-''']
-    labels = [
-        (repr(assert_lower(label)).lstrip('u'),
-         repr(encoding['name']).lstrip('u'))
-        for category in json.loads(urlopen(url).read().decode('ascii'))
-        for encoding in category['encodings']
-        for label in encoding['labels']]
-    max_len = max(len(label) for label, name in labels)
-    parts.extend(
-        '    %s:%s %s,\n' % (label, ' ' * (max_len - len(label)), name)
-        for label, name in labels)
-    parts.append('}')
-    return ''.join(parts)
-
-
-if __name__ == '__main__':
-    print(generate('http://encoding.spec.whatwg.org/encodings.json'))
diff --git a/lib/webencodings/tests.py b/lib/webencodings/tests.py
deleted file mode 100644
index e12c10d0..00000000
--- a/lib/webencodings/tests.py
+++ /dev/null
@@ -1,153 +0,0 @@
-# coding: utf-8
-"""
-
-    webencodings.tests
-    ~~~~~~~~~~~~~~~~~~
-
-    A basic test suite for Encoding.
-
-    :copyright: Copyright 2012 by Simon Sapin
-    :license: BSD, see LICENSE for details.
-
-"""
-
-from __future__ import unicode_literals
-
-from . import (lookup, LABELS, decode, encode, iter_decode, iter_encode,
-               IncrementalDecoder, IncrementalEncoder, UTF8)
-
-
-def assert_raises(exception, function, *args, **kwargs):
-    try:
-        function(*args, **kwargs)
-    except exception:
-        return
-    else:  # pragma: no cover
-        raise AssertionError('Did not raise %s.' % exception)
-
-
-def test_labels():
-    assert lookup('utf-8').name == 'utf-8'
-    assert lookup('Utf-8').name == 'utf-8'
-    assert lookup('UTF-8').name == 'utf-8'
-    assert lookup('utf8').name == 'utf-8'
-    assert lookup('utf8').name == 'utf-8'
-    assert lookup('utf8 ').name == 'utf-8'
-    assert lookup(' \r\nutf8\t').name == 'utf-8'
-    assert lookup('u8') is None  # Python label.
-    assert lookup('utf-8 ') is None  # Non-ASCII white space.
-
-    assert lookup('US-ASCII').name == 'windows-1252'
-    assert lookup('iso-8859-1').name == 'windows-1252'
-    assert lookup('latin1').name == 'windows-1252'
-    assert lookup('LATIN1').name == 'windows-1252'
-    assert lookup('latin-1') is None
-    assert lookup('LATÄ°N1') is None  # ASCII-only case insensitivity.
-
-
-def test_all_labels():
-    for label in LABELS:
-        assert decode(b'', label) == ('', lookup(label))
-        assert encode('', label) == b''
-        for repeat in [0, 1, 12]:
-            output, _ = iter_decode([b''] * repeat, label)
-            assert list(output) == []
-            assert list(iter_encode([''] * repeat, label)) == []
-        decoder = IncrementalDecoder(label)
-        assert decoder.decode(b'') == ''
-        assert decoder.decode(b'', final=True) == ''
-        encoder = IncrementalEncoder(label)
-        assert encoder.encode('') == b''
-        assert encoder.encode('', final=True) == b''
-    # All encoding names are valid labels too:
-    for name in set(LABELS.values()):
-        assert lookup(name).name == name
-
-
-def test_invalid_label():
-    assert_raises(LookupError, decode, b'\xEF\xBB\xBF\xc3\xa9', 'invalid')
-    assert_raises(LookupError, encode, 'é', 'invalid')
-    assert_raises(LookupError, iter_decode, [], 'invalid')
-    assert_raises(LookupError, iter_encode, [], 'invalid')
-    assert_raises(LookupError, IncrementalDecoder, 'invalid')
-    assert_raises(LookupError, IncrementalEncoder, 'invalid')
-
-
-def test_decode():
-    assert decode(b'\x80', 'latin1') == ('€', lookup('latin1'))
-    assert decode(b'\x80', lookup('latin1')) == ('€', lookup('latin1'))
-    assert decode(b'\xc3\xa9', 'utf8') == ('é', lookup('utf8'))
-    assert decode(b'\xc3\xa9', UTF8) == ('é', lookup('utf8'))
-    assert decode(b'\xc3\xa9', 'ascii') == ('é', lookup('ascii'))
-    assert decode(b'\xEF\xBB\xBF\xc3\xa9', 'ascii') == ('é', lookup('utf8'))  # UTF-8 with BOM
-
-    assert decode(b'\xFE\xFF\x00\xe9', 'ascii') == ('é', lookup('utf-16be'))  # UTF-16-BE with BOM
-    assert decode(b'\xFF\xFE\xe9\x00', 'ascii') == ('é', lookup('utf-16le'))  # UTF-16-LE with BOM
-    assert decode(b'\xFE\xFF\xe9\x00', 'ascii') == ('\ue900', lookup('utf-16be'))
-    assert decode(b'\xFF\xFE\x00\xe9', 'ascii') == ('\ue900', lookup('utf-16le'))
-
-    assert decode(b'\x00\xe9', 'UTF-16BE') == ('é', lookup('utf-16be'))
-    assert decode(b'\xe9\x00', 'UTF-16LE') == ('é', lookup('utf-16le'))
-    assert decode(b'\xe9\x00', 'UTF-16') == ('é', lookup('utf-16le'))
-
-    assert decode(b'\xe9\x00', 'UTF-16BE') == ('\ue900', lookup('utf-16be'))
-    assert decode(b'\x00\xe9', 'UTF-16LE') == ('\ue900', lookup('utf-16le'))
-    assert decode(b'\x00\xe9', 'UTF-16') == ('\ue900', lookup('utf-16le'))
-
-
-def test_encode():
-    assert encode('é', 'latin1') == b'\xe9'
-    assert encode('é', 'utf8') == b'\xc3\xa9'
-    assert encode('é', 'utf8') == b'\xc3\xa9'
-    assert encode('é', 'utf-16') == b'\xe9\x00'
-    assert encode('é', 'utf-16le') == b'\xe9\x00'
-    assert encode('é', 'utf-16be') == b'\x00\xe9'
-
-
-def test_iter_decode():
-    def iter_decode_to_string(input, fallback_encoding):
-        output, _encoding = iter_decode(input, fallback_encoding)
-        return ''.join(output)
-    assert iter_decode_to_string([], 'latin1') == ''
-    assert iter_decode_to_string([b''], 'latin1') == ''
-    assert iter_decode_to_string([b'\xe9'], 'latin1') == 'é'
-    assert iter_decode_to_string([b'hello'], 'latin1') == 'hello'
-    assert iter_decode_to_string([b'he', b'llo'], 'latin1') == 'hello'
-    assert iter_decode_to_string([b'hell', b'o'], 'latin1') == 'hello'
-    assert iter_decode_to_string([b'\xc3\xa9'], 'latin1') == 'é'
-    assert iter_decode_to_string([b'\xEF\xBB\xBF\xc3\xa9'], 'latin1') == 'é'
-    assert iter_decode_to_string([
-        b'\xEF\xBB\xBF', b'\xc3', b'\xa9'], 'latin1') == 'é'
-    assert iter_decode_to_string([
-        b'\xEF\xBB\xBF', b'a', b'\xc3'], 'latin1') == 'a\uFFFD'
-    assert iter_decode_to_string([
-        b'', b'\xEF', b'', b'', b'\xBB\xBF\xc3', b'\xa9'], 'latin1') == 'é'
-    assert iter_decode_to_string([b'\xEF\xBB\xBF'], 'latin1') == ''
-    assert iter_decode_to_string([b'\xEF\xBB'], 'latin1') == 'ï»'
-    assert iter_decode_to_string([b'\xFE\xFF\x00\xe9'], 'latin1') == 'é'
-    assert iter_decode_to_string([b'\xFF\xFE\xe9\x00'], 'latin1') == 'é'
-    assert iter_decode_to_string([
-        b'', b'\xFF', b'', b'', b'\xFE\xe9', b'\x00'], 'latin1') == 'é'
-    assert iter_decode_to_string([
-        b'', b'h\xe9', b'llo'], 'x-user-defined') == 'h\uF7E9llo'
-
-
-def test_iter_encode():
-    assert b''.join(iter_encode([], 'latin1')) == b''
-    assert b''.join(iter_encode([''], 'latin1')) == b''
-    assert b''.join(iter_encode(['é'], 'latin1')) == b'\xe9'
-    assert b''.join(iter_encode(['', 'é', '', ''], 'latin1')) == b'\xe9'
-    assert b''.join(iter_encode(['', 'é', '', ''], 'utf-16')) == b'\xe9\x00'
-    assert b''.join(iter_encode(['', 'é', '', ''], 'utf-16le')) == b'\xe9\x00'
-    assert b''.join(iter_encode(['', 'é', '', ''], 'utf-16be')) == b'\x00\xe9'
-    assert b''.join(iter_encode([
-        '', 'h\uF7E9', '', 'llo'], 'x-user-defined')) == b'h\xe9llo'
-
-
-def test_x_user_defined():
-    encoded = b'2,\x0c\x0b\x1aO\xd9#\xcb\x0f\xc9\xbbt\xcf\xa8\xca'
-    decoded = '2,\x0c\x0b\x1aO\uf7d9#\uf7cb\x0f\uf7c9\uf7bbt\uf7cf\uf7a8\uf7ca'
-    encoded = b'aa'
-    decoded = 'aa'
-    assert decode(encoded, 'x-user-defined') == (decoded, lookup('x-user-defined'))
-    assert encode(decoded, 'x-user-defined') == encoded
diff --git a/lib/webencodings/x_user_defined.py b/lib/webencodings/x_user_defined.py
deleted file mode 100644
index d16e3260..00000000
--- a/lib/webencodings/x_user_defined.py
+++ /dev/null
@@ -1,325 +0,0 @@
-# coding: utf-8
-"""
-
-    webencodings.x_user_defined
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    An implementation of the x-user-defined encoding.
-
-    :copyright: Copyright 2012 by Simon Sapin
-    :license: BSD, see LICENSE for details.
-
-"""
-
-from __future__ import unicode_literals
-
-import codecs
-
-
-### Codec APIs
-
-class Codec(codecs.Codec):
-
-    def encode(self, input, errors='strict'):
-        return codecs.charmap_encode(input, errors, encoding_table)
-
-    def decode(self, input, errors='strict'):
-        return codecs.charmap_decode(input, errors, decoding_table)
-
-
-class IncrementalEncoder(codecs.IncrementalEncoder):
-    def encode(self, input, final=False):
-        return codecs.charmap_encode(input, self.errors, encoding_table)[0]
-
-
-class IncrementalDecoder(codecs.IncrementalDecoder):
-    def decode(self, input, final=False):
-        return codecs.charmap_decode(input, self.errors, decoding_table)[0]
-
-
-class StreamWriter(Codec, codecs.StreamWriter):
-    pass
-
-
-class StreamReader(Codec, codecs.StreamReader):
-    pass
-
-
-### encodings module API
-
-codec_info = codecs.CodecInfo(
-    name='x-user-defined',
-    encode=Codec().encode,
-    decode=Codec().decode,
-    incrementalencoder=IncrementalEncoder,
-    incrementaldecoder=IncrementalDecoder,
-    streamreader=StreamReader,
-    streamwriter=StreamWriter,
-)
-
-
-### Decoding Table
-
-# Python 3:
-# for c in range(256): print('    %r' % chr(c if c < 128 else c + 0xF700))
-decoding_table = (
-    '\x00'
-    '\x01'
-    '\x02'
-    '\x03'
-    '\x04'
-    '\x05'
-    '\x06'
-    '\x07'
-    '\x08'
-    '\t'
-    '\n'
-    '\x0b'
-    '\x0c'
-    '\r'
-    '\x0e'
-    '\x0f'
-    '\x10'
-    '\x11'
-    '\x12'
-    '\x13'
-    '\x14'
-    '\x15'
-    '\x16'
-    '\x17'
-    '\x18'
-    '\x19'
-    '\x1a'
-    '\x1b'
-    '\x1c'
-    '\x1d'
-    '\x1e'
-    '\x1f'
-    ' '
-    '!'
-    '"'
-    '#'
-    '$'
-    '%'
-    '&'
-    "'"
-    '('
-    ')'
-    '*'
-    '+'
-    ','
-    '-'
-    '.'
-    '/'
-    '0'
-    '1'
-    '2'
-    '3'
-    '4'
-    '5'
-    '6'
-    '7'
-    '8'
-    '9'
-    ':'
-    ';'
-    '<'
-    '='
-    '>'
-    '?'
-    '@'
-    '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'
-    '{'
-    '|'
-    '}'
-    '~'
-    '\x7f'
-    '\uf780'
-    '\uf781'
-    '\uf782'
-    '\uf783'
-    '\uf784'
-    '\uf785'
-    '\uf786'
-    '\uf787'
-    '\uf788'
-    '\uf789'
-    '\uf78a'
-    '\uf78b'
-    '\uf78c'
-    '\uf78d'
-    '\uf78e'
-    '\uf78f'
-    '\uf790'
-    '\uf791'
-    '\uf792'
-    '\uf793'
-    '\uf794'
-    '\uf795'
-    '\uf796'
-    '\uf797'
-    '\uf798'
-    '\uf799'
-    '\uf79a'
-    '\uf79b'
-    '\uf79c'
-    '\uf79d'
-    '\uf79e'
-    '\uf79f'
-    '\uf7a0'
-    '\uf7a1'
-    '\uf7a2'
-    '\uf7a3'
-    '\uf7a4'
-    '\uf7a5'
-    '\uf7a6'
-    '\uf7a7'
-    '\uf7a8'
-    '\uf7a9'
-    '\uf7aa'
-    '\uf7ab'
-    '\uf7ac'
-    '\uf7ad'
-    '\uf7ae'
-    '\uf7af'
-    '\uf7b0'
-    '\uf7b1'
-    '\uf7b2'
-    '\uf7b3'
-    '\uf7b4'
-    '\uf7b5'
-    '\uf7b6'
-    '\uf7b7'
-    '\uf7b8'
-    '\uf7b9'
-    '\uf7ba'
-    '\uf7bb'
-    '\uf7bc'
-    '\uf7bd'
-    '\uf7be'
-    '\uf7bf'
-    '\uf7c0'
-    '\uf7c1'
-    '\uf7c2'
-    '\uf7c3'
-    '\uf7c4'
-    '\uf7c5'
-    '\uf7c6'
-    '\uf7c7'
-    '\uf7c8'
-    '\uf7c9'
-    '\uf7ca'
-    '\uf7cb'
-    '\uf7cc'
-    '\uf7cd'
-    '\uf7ce'
-    '\uf7cf'
-    '\uf7d0'
-    '\uf7d1'
-    '\uf7d2'
-    '\uf7d3'
-    '\uf7d4'
-    '\uf7d5'
-    '\uf7d6'
-    '\uf7d7'
-    '\uf7d8'
-    '\uf7d9'
-    '\uf7da'
-    '\uf7db'
-    '\uf7dc'
-    '\uf7dd'
-    '\uf7de'
-    '\uf7df'
-    '\uf7e0'
-    '\uf7e1'
-    '\uf7e2'
-    '\uf7e3'
-    '\uf7e4'
-    '\uf7e5'
-    '\uf7e6'
-    '\uf7e7'
-    '\uf7e8'
-    '\uf7e9'
-    '\uf7ea'
-    '\uf7eb'
-    '\uf7ec'
-    '\uf7ed'
-    '\uf7ee'
-    '\uf7ef'
-    '\uf7f0'
-    '\uf7f1'
-    '\uf7f2'
-    '\uf7f3'
-    '\uf7f4'
-    '\uf7f5'
-    '\uf7f6'
-    '\uf7f7'
-    '\uf7f8'
-    '\uf7f9'
-    '\uf7fa'
-    '\uf7fb'
-    '\uf7fc'
-    '\uf7fd'
-    '\uf7fe'
-    '\uf7ff'
-)
-
-### Encoding table
-encoding_table = codecs.charmap_build(decoding_table)
diff --git a/lib/websocket/__init__.py b/lib/websocket/__init__.py
index 559b38a6..311c6772 100644
--- a/lib/websocket/__init__.py
+++ b/lib/websocket/__init__.py
@@ -1,26 +1,25 @@
 """
-__init__.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright (C) 2010 Hiroki Ohtani(liris)
 
-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
+    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.
 
-    http://www.apache.org/licenses/LICENSE-2.0
+    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-1335  USA
 
-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.
 """
-from ._abnf import *
-from ._app import WebSocketApp as WebSocketApp, setReconnect as setReconnect
 from ._core import *
-from ._exceptions import *
-from ._logging import *
-from ._socket import *
+from ._app import WebSocketApp
 
-__version__ = "1.8.0"
+__version__ = "0.32.0"
diff --git a/lib/websocket/_abnf.py b/lib/websocket/_abnf.py
index d7754e0d..5f5b1b86 100644
--- a/lib/websocket/_abnf.py
+++ b/lib/websocket/_abnf.py
@@ -1,74 +1,30 @@
-import array
-import os
-import struct
-import sys
-from threading import Lock
-from typing import Callable, Optional, Union
-
-from ._exceptions import WebSocketPayloadException, WebSocketProtocolException
-from ._utils import validate_utf8
-
 """
-_abnf.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright (C) 2010 Hiroki Ohtani(liris)
 
-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
+    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.
 
-    http://www.apache.org/licenses/LICENSE-2.0
+    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-1335  USA
 
-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.
 """
-
-try:
-    # If wsaccel is available, use compiled routines to mask data.
-    # wsaccel only provides around a 10% speed boost compared
-    # to the websocket-client _mask() implementation.
-    # Note that wsaccel is unmaintained.
-    from wsaccel.xormask import XorMaskerSimple
-
-    def _mask(mask_value: array.array, data_value: array.array) -> bytes:
-        mask_result: bytes = XorMaskerSimple(mask_value).process(data_value)
-        return mask_result
-
-except ImportError:
-    # wsaccel is not available, use websocket-client _mask()
-    native_byteorder = sys.byteorder
-
-    def _mask(mask_value: array.array, data_value: array.array) -> bytes:
-        datalen = len(data_value)
-        int_data_value = int.from_bytes(data_value, native_byteorder)
-        int_mask_value = int.from_bytes(
-            mask_value * (datalen // 4) + mask_value[: datalen % 4], native_byteorder
-        )
-        return (int_data_value ^ int_mask_value).to_bytes(datalen, native_byteorder)
-
-
-__all__ = [
-    "ABNF",
-    "continuous_frame",
-    "frame_buffer",
-    "STATUS_NORMAL",
-    "STATUS_GOING_AWAY",
-    "STATUS_PROTOCOL_ERROR",
-    "STATUS_UNSUPPORTED_DATA_TYPE",
-    "STATUS_STATUS_NOT_AVAILABLE",
-    "STATUS_ABNORMAL_CLOSED",
-    "STATUS_INVALID_PAYLOAD",
-    "STATUS_POLICY_VIOLATION",
-    "STATUS_MESSAGE_TOO_BIG",
-    "STATUS_INVALID_EXTENSION",
-    "STATUS_UNEXPECTED_CONDITION",
-    "STATUS_BAD_GATEWAY",
-    "STATUS_TLS_HANDSHAKE_ERROR",
-]
+import six
+import array
+import struct
+import os
+from ._exceptions import *
+from ._utils import validate_utf8
 
 # closing frame status codes.
 STATUS_NORMAL = 1000
@@ -82,9 +38,6 @@ STATUS_POLICY_VIOLATION = 1008
 STATUS_MESSAGE_TOO_BIG = 1009
 STATUS_INVALID_EXTENSION = 1010
 STATUS_UNEXPECTED_CONDITION = 1011
-STATUS_SERVICE_RESTART = 1012
-STATUS_TRY_AGAIN_LATER = 1013
-STATUS_BAD_GATEWAY = 1014
 STATUS_TLS_HANDSHAKE_ERROR = 1015
 
 VALID_CLOSE_STATUS = (
@@ -97,36 +50,26 @@ VALID_CLOSE_STATUS = (
     STATUS_MESSAGE_TOO_BIG,
     STATUS_INVALID_EXTENSION,
     STATUS_UNEXPECTED_CONDITION,
-    STATUS_SERVICE_RESTART,
-    STATUS_TRY_AGAIN_LATER,
-    STATUS_BAD_GATEWAY,
-)
+    )
 
-
-class ABNF:
+class ABNF(object):
     """
     ABNF frame class.
-    See http://tools.ietf.org/html/rfc5234
+    see http://tools.ietf.org/html/rfc5234
     and http://tools.ietf.org/html/rfc6455#section-5.2
     """
 
     # operation code values.
-    OPCODE_CONT = 0x0
-    OPCODE_TEXT = 0x1
+    OPCODE_CONT   = 0x0
+    OPCODE_TEXT   = 0x1
     OPCODE_BINARY = 0x2
-    OPCODE_CLOSE = 0x8
-    OPCODE_PING = 0x9
-    OPCODE_PONG = 0xA
+    OPCODE_CLOSE  = 0x8
+    OPCODE_PING   = 0x9
+    OPCODE_PONG   = 0xa
 
     # available operation code value tuple
-    OPCODES = (
-        OPCODE_CONT,
-        OPCODE_TEXT,
-        OPCODE_BINARY,
-        OPCODE_CLOSE,
-        OPCODE_PING,
-        OPCODE_PONG,
-    )
+    OPCODES = (OPCODE_CONT, OPCODE_TEXT, OPCODE_BINARY, OPCODE_CLOSE,
+                OPCODE_PING, OPCODE_PONG)
 
     # opcode human readable string
     OPCODE_MAP = {
@@ -135,44 +78,34 @@ class ABNF:
         OPCODE_BINARY: "binary",
         OPCODE_CLOSE: "close",
         OPCODE_PING: "ping",
-        OPCODE_PONG: "pong",
-    }
+        OPCODE_PONG: "pong"
+        }
 
-    # data length threshold.
-    LENGTH_7 = 0x7E
+    # data length threashold.
+    LENGTH_7  = 0x7e
     LENGTH_16 = 1 << 16
     LENGTH_63 = 1 << 63
 
-    def __init__(
-        self,
-        fin: int = 0,
-        rsv1: int = 0,
-        rsv2: int = 0,
-        rsv3: int = 0,
-        opcode: int = OPCODE_TEXT,
-        mask_value: int = 1,
-        data: Union[str, bytes, None] = "",
-    ) -> None:
+    def __init__(self, fin=0, rsv1=0, rsv2=0, rsv3=0,
+                 opcode=OPCODE_TEXT, mask=1, data=""):
         """
-        Constructor for ABNF. Please check RFC for arguments.
+        Constructor for ABNF.
+        please check RFC for arguments.
         """
         self.fin = fin
         self.rsv1 = rsv1
         self.rsv2 = rsv2
         self.rsv3 = rsv3
         self.opcode = opcode
-        self.mask_value = mask_value
-        if data is None:
+        self.mask = mask
+        if data == None:
             data = ""
         self.data = data
         self.get_mask_key = os.urandom
 
-    def validate(self, skip_utf8_validation: bool = False) -> None:
+    def validate(self, skip_utf8_validation=False):
         """
-        Validate the ABNF frame.
-
-        Parameters
-        ----------
+        validate the ABNF frame.
         skip_utf8_validation: skip utf8 validation.
         """
         if self.rsv1 or self.rsv2 or self.rsv3:
@@ -193,41 +126,39 @@ class ABNF:
             if l > 2 and not skip_utf8_validation and not validate_utf8(self.data[2:]):
                 raise WebSocketProtocolException("Invalid close frame.")
 
-            code = 256 * int(self.data[0]) + int(self.data[1])
+            code = 256*six.byte2int(self.data[0:1]) + six.byte2int(self.data[1:2])
             if not self._is_valid_close_status(code):
-                raise WebSocketProtocolException("Invalid close opcode %r", code)
+                raise WebSocketProtocolException("Invalid close opcode.")
+
+    def _is_valid_close_status(self, code):
+        return code in VALID_CLOSE_STATUS or (3000 <= code <5000)
+
+    def __str__(self):
+        return "fin=" + str(self.fin) \
+                + " opcode=" + str(self.opcode) \
+                + " data=" + str(self.data)
 
     @staticmethod
-    def _is_valid_close_status(code: int) -> bool:
-        return code in VALID_CLOSE_STATUS or (3000 <= code < 5000)
-
-    def __str__(self) -> str:
-        return f"fin={self.fin} opcode={self.opcode} data={self.data}"
-
-    @staticmethod
-    def create_frame(data: Union[bytes, str], opcode: int, fin: int = 1) -> "ABNF":
+    def create_frame(data, opcode, fin=1):
         """
-        Create frame to send text, binary and other data.
+        create frame to send text, binary and other data.
 
-        Parameters
-        ----------
-        data: str
-            data to send. This is string value(byte array).
-            If opcode is OPCODE_TEXT and this value is unicode,
-            data value is converted into unicode string, automatically.
-        opcode: int
-            operation code. please see OPCODE_MAP.
-        fin: int
-            fin flag. if set to 0, create continue fragmentation.
+        data: data to send. This is string value(byte array).
+            if opcode is OPCODE_TEXT and this value is uniocde,
+            data value is conveted into unicode string, automatically.
+
+        opcode: operation code. please see OPCODE_XXX.
+
+        fin: fin flag. if set to 0, create continue fragmentation.
         """
-        if opcode == ABNF.OPCODE_TEXT and isinstance(data, str):
+        if opcode == ABNF.OPCODE_TEXT and isinstance(data, six.text_type):
             data = data.encode("utf-8")
         # mask must be set if send data from client
         return ABNF(fin, 0, 0, 0, opcode, 1, data)
 
-    def format(self) -> bytes:
+    def format(self):
         """
-        Format this object to string(byte array) to send data to server.
+        format this object to string(byte array) to send data to server.
         """
         if any(x not in (0, 1) for x in [self.fin, self.rsv1, self.rsv2, self.rsv3]):
             raise ValueError("not 0 or 1")
@@ -237,169 +168,174 @@ class ABNF:
         if length >= ABNF.LENGTH_63:
             raise ValueError("data is too long")
 
-        frame_header = chr(
-            self.fin << 7
-            | self.rsv1 << 6
-            | self.rsv2 << 5
-            | self.rsv3 << 4
-            | self.opcode
-        ).encode("latin-1")
+        frame_header = chr(self.fin << 7
+                           | self.rsv1 << 6 | self.rsv2 << 5 | self.rsv3 << 4
+                           | self.opcode)
         if length < ABNF.LENGTH_7:
-            frame_header += chr(self.mask_value << 7 | length).encode("latin-1")
+            frame_header += chr(self.mask << 7 | length)
+            frame_header = six.b(frame_header)
         elif length < ABNF.LENGTH_16:
-            frame_header += chr(self.mask_value << 7 | 0x7E).encode("latin-1")
+            frame_header += chr(self.mask << 7 | 0x7e)
+            frame_header = six.b(frame_header)
             frame_header += struct.pack("!H", length)
         else:
-            frame_header += chr(self.mask_value << 7 | 0x7F).encode("latin-1")
+            frame_header += chr(self.mask << 7 | 0x7f)
+            frame_header = six.b(frame_header)
             frame_header += struct.pack("!Q", length)
 
-        if not self.mask_value:
-            if isinstance(self.data, str):
-                self.data = self.data.encode("utf-8")
+        if not self.mask:
             return frame_header + self.data
-        mask_key = self.get_mask_key(4)
-        return frame_header + self._get_masked(mask_key)
+        else:
+            mask_key = self.get_mask_key(4)
+            return frame_header + self._get_masked(mask_key)
 
-    def _get_masked(self, mask_key: Union[str, bytes]) -> bytes:
+    def _get_masked(self, mask_key):
         s = ABNF.mask(mask_key, self.data)
 
-        if isinstance(mask_key, str):
-            mask_key = mask_key.encode("utf-8")
+        if isinstance(mask_key, six.text_type):
+            mask_key = mask_key.encode('utf-8')
 
         return mask_key + s
 
     @staticmethod
-    def mask(mask_key: Union[str, bytes], data: Union[str, bytes]) -> bytes:
+    def mask(mask_key, data):
         """
-        Mask or unmask data. Just do xor for each byte
+        mask or unmask data. Just do xor for each byte
 
-        Parameters
-        ----------
-        mask_key: bytes or str
-            4 byte mask.
-        data: bytes or str
-            data to mask/unmask.
+        mask_key: 4 byte string(byte).
+
+        data: data to mask/unmask.
         """
-        if data is None:
+        if data == None:
             data = ""
+        if isinstance(mask_key, six.text_type):
+            mask_key = six.b(mask_key)
 
-        if isinstance(mask_key, str):
-            mask_key = mask_key.encode("latin-1")
+        if isinstance(data, six.text_type):
+            data = six.b(data)
 
-        if isinstance(data, str):
-            data = data.encode("latin-1")
+        _m = array.array("B", mask_key)
+        _d = array.array("B", data)
+        for i in range(len(_d)):
+            _d[i] ^= _m[i % 4]
 
-        return _mask(array.array("B", mask_key), array.array("B", data))
+        if six.PY3:
+            return _d.tobytes()
+        else:
+            return _d.tostring()
 
 
-class frame_buffer:
+class frame_buffer(object):
     _HEADER_MASK_INDEX = 5
-    _HEADER_LENGTH_INDEX = 6
+    _HEADER_LENGHT_INDEX = 6
 
-    def __init__(
-        self, recv_fn: Callable[[int], int], skip_utf8_validation: bool
-    ) -> None:
+    def __init__(self, recv_fn, skip_utf8_validation):
         self.recv = recv_fn
         self.skip_utf8_validation = skip_utf8_validation
         # Buffers over the packets from the layer beneath until desired amount
         # bytes of bytes are received.
-        self.recv_buffer: list = []
+        self.recv_buffer = []
         self.clear()
-        self.lock = Lock()
 
-    def clear(self) -> None:
-        self.header: Optional[tuple] = None
-        self.length: Optional[int] = None
-        self.mask_value: Union[bytes, str, None] = None
+    def clear(self):
+        self.header = None
+        self.length = None
+        self.mask = None
 
-    def has_received_header(self) -> bool:
-        return self.header is None
+    def has_received_header(self):
+        return  self.header is None
 
-    def recv_header(self) -> None:
+    def recv_header(self):
         header = self.recv_strict(2)
         b1 = header[0]
+
+        if six.PY2:
+            b1 = ord(b1)
+
         fin = b1 >> 7 & 1
         rsv1 = b1 >> 6 & 1
         rsv2 = b1 >> 5 & 1
         rsv3 = b1 >> 4 & 1
-        opcode = b1 & 0xF
+        opcode = b1 & 0xf
         b2 = header[1]
+
+        if six.PY2:
+            b2 = ord(b2)
+
         has_mask = b2 >> 7 & 1
-        length_bits = b2 & 0x7F
+        length_bits = b2 & 0x7f
 
         self.header = (fin, rsv1, rsv2, rsv3, opcode, has_mask, length_bits)
 
-    def has_mask(self) -> Union[bool, int]:
+    def has_mask(self):
         if not self.header:
             return False
-        header_val: int = self.header[frame_buffer._HEADER_MASK_INDEX]
-        return header_val
+        return self.header[frame_buffer._HEADER_MASK_INDEX]
 
-    def has_received_length(self) -> bool:
+
+    def has_received_length(self):
         return self.length is None
 
-    def recv_length(self) -> None:
-        bits = self.header[frame_buffer._HEADER_LENGTH_INDEX]
-        length_bits = bits & 0x7F
-        if length_bits == 0x7E:
+    def recv_length(self):
+        bits = self.header[frame_buffer._HEADER_LENGHT_INDEX]
+        length_bits = bits & 0x7f
+        if length_bits == 0x7e:
             v = self.recv_strict(2)
             self.length = struct.unpack("!H", v)[0]
-        elif length_bits == 0x7F:
+        elif length_bits == 0x7f:
             v = self.recv_strict(8)
             self.length = struct.unpack("!Q", v)[0]
         else:
             self.length = length_bits
 
-    def has_received_mask(self) -> bool:
-        return self.mask_value is None
+    def has_received_mask(self):
+        return self.mask is None
 
-    def recv_mask(self) -> None:
-        self.mask_value = self.recv_strict(4) if self.has_mask() else ""
+    def recv_mask(self):
+        self.mask = self.recv_strict(4) if self.has_mask() else ""
 
-    def recv_frame(self) -> ABNF:
-        with self.lock:
-            # Header
-            if self.has_received_header():
-                self.recv_header()
-            (fin, rsv1, rsv2, rsv3, opcode, has_mask, _) = self.header
+    def recv_frame(self):
+        # Header
+        if self.has_received_header():
+            self.recv_header()
+        (fin, rsv1, rsv2, rsv3, opcode, has_mask, _) = self.header
 
-            # Frame length
-            if self.has_received_length():
-                self.recv_length()
-            length = self.length
+        # Frame length
+        if self.has_received_length():
+            self.recv_length()
+        length = self.length
 
-            # Mask
-            if self.has_received_mask():
-                self.recv_mask()
-            mask_value = self.mask_value
+        # Mask
+        if self.has_received_mask():
+            self.recv_mask()
+        mask = self.mask
 
-            # Payload
-            payload = self.recv_strict(length)
-            if has_mask:
-                payload = ABNF.mask(mask_value, payload)
+        # Payload
+        payload = self.recv_strict(length)
+        if has_mask:
+            payload = ABNF.mask(mask, payload)
 
-            # Reset for next frame
-            self.clear()
+        # Reset for next frame
+        self.clear()
 
-            frame = ABNF(fin, rsv1, rsv2, rsv3, opcode, has_mask, payload)
-            frame.validate(self.skip_utf8_validation)
+        frame = ABNF(fin, rsv1, rsv2, rsv3, opcode, has_mask, payload)
+        frame.validate(self.skip_utf8_validation)
 
         return frame
 
-    def recv_strict(self, bufsize: int) -> bytes:
-        shortage = bufsize - sum(map(len, self.recv_buffer))
+    def recv_strict(self, bufsize):
+        shortage = bufsize - sum(len(x) for x in self.recv_buffer)
         while shortage > 0:
             # Limit buffer size that we pass to socket.recv() to avoid
             # fragmenting the heap -- the number of bytes recv() actually
             # reads is limited by socket buffer and is relatively small,
             # yet passing large numbers repeatedly causes lots of large
-            # buffers allocated and then shrunk, which results in
-            # fragmentation.
-            bytes_ = self.recv(min(16384, shortage))
-            self.recv_buffer.append(bytes_)
-            shortage -= len(bytes_)
+            # buffers allocated and then shrunk, which results in fragmentation.
+            bytes = self.recv(min(16384, shortage))
+            self.recv_buffer.append(bytes)
+            shortage -= len(bytes)
 
-        unified = b"".join(self.recv_buffer)
+        unified = six.b("").join(self.recv_buffer)
 
         if shortage == 0:
             self.recv_buffer = []
@@ -409,23 +345,20 @@ class frame_buffer:
             return unified[:bufsize]
 
 
-class continuous_frame:
-    def __init__(self, fire_cont_frame: bool, skip_utf8_validation: bool) -> None:
+class continuous_frame(object):
+    def __init__(self, fire_cont_frame, skip_utf8_validation):
         self.fire_cont_frame = fire_cont_frame
         self.skip_utf8_validation = skip_utf8_validation
-        self.cont_data: Optional[list] = None
-        self.recving_frames: Optional[int] = None
+        self.cont_data = None
+        self.recving_frames = None
 
-    def validate(self, frame: ABNF) -> None:
+    def validate(self, frame):
         if not self.recving_frames and frame.opcode == ABNF.OPCODE_CONT:
             raise WebSocketProtocolException("Illegal frame")
-        if self.recving_frames and frame.opcode in (
-            ABNF.OPCODE_TEXT,
-            ABNF.OPCODE_BINARY,
-        ):
+        if self.recving_frames and frame.opcode in (ABNF.OPCODE_TEXT, ABNF.OPCODE_BINARY):
             raise WebSocketProtocolException("Illegal frame")
 
-    def add(self, frame: ABNF) -> None:
+    def add(self, frame):
         if self.cont_data:
             self.cont_data[1] += frame.data
         else:
@@ -436,18 +369,14 @@ class continuous_frame:
         if frame.fin:
             self.recving_frames = None
 
-    def is_fire(self, frame: ABNF) -> Union[bool, int]:
+    def is_fire(self, frame):
         return frame.fin or self.fire_cont_frame
 
-    def extract(self, frame: ABNF) -> tuple:
+    def extract(self, frame):
         data = self.cont_data
         self.cont_data = None
         frame.data = data[1]
-        if (
-            not self.fire_cont_frame
-            and data[0] == ABNF.OPCODE_TEXT
-            and not self.skip_utf8_validation
-            and not validate_utf8(frame.data)
-        ):
-            raise WebSocketPayloadException(f"cannot decode: {repr(frame.data)}")
-        return data[0], frame
+        if not self.fire_cont_frame and data[0] == ABNF.OPCODE_TEXT and not self.skip_utf8_validation and not validate_utf8(frame.data):
+            raise WebSocketPayloadException("cannot decode: " + repr(frame.data))
+
+        return [data[0], frame]
diff --git a/lib/websocket/_app.py b/lib/websocket/_app.py
index 9fee7654..9f8940f5 100644
--- a/lib/websocket/_app.py
+++ b/lib/websocket/_app.py
@@ -1,677 +1,236 @@
-import inspect
-import selectors
-import socket
-import threading
-import time
-from typing import Any, Callable, Optional, Union
-
-from . import _logging
-from ._abnf import ABNF
-from ._core import WebSocket, getdefaulttimeout
-from ._exceptions import (
-    WebSocketConnectionClosedException,
-    WebSocketException,
-    WebSocketTimeoutException,
-)
-from ._ssl_compat import SSLEOFError
-from ._url import parse_url
-
 """
-_app.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright (C) 2010 Hiroki Ohtani(liris)
 
-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
+    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.
 
-    http://www.apache.org/licenses/LICENSE-2.0
+    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-1335  USA
 
-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.
 """
 
+"""
+WebSocketApp provides higher level APIs.
+"""
+import threading
+import time
+import traceback
+import sys
+import select
+import six
+
+from ._core import WebSocket, getdefaulttimeout
+from ._exceptions import *
+from ._logging import *
+from websocket._abnf import ABNF
+
 __all__ = ["WebSocketApp"]
 
-RECONNECT = 0
 
-
-def setReconnect(reconnectInterval: int) -> None:
-    global RECONNECT
-    RECONNECT = reconnectInterval
-
-
-class DispatcherBase:
+class WebSocketApp(object):
     """
-    DispatcherBase
+    Higher level of APIs are provided.
+    The interface is like JavaScript WebSocket object.
     """
-
-    def __init__(self, app: Any, ping_timeout: Union[float, int, None]) -> None:
-        self.app = app
-        self.ping_timeout = ping_timeout
-
-    def timeout(self, seconds: Union[float, int, None], callback: Callable) -> None:
-        time.sleep(seconds)
-        callback()
-
-    def reconnect(self, seconds: int, reconnector: Callable) -> None:
-        try:
-            _logging.info(
-                f"reconnect() - retrying in {seconds} seconds [{len(inspect.stack())} frames in stack]"
-            )
-            time.sleep(seconds)
-            reconnector(reconnecting=True)
-        except KeyboardInterrupt as e:
-            _logging.info(f"User exited {e}")
-            raise e
-
-
-class Dispatcher(DispatcherBase):
-    """
-    Dispatcher
-    """
-
-    def read(
-        self,
-        sock: socket.socket,
-        read_callback: Callable,
-        check_callback: Callable,
-    ) -> None:
-        sel = selectors.DefaultSelector()
-        sel.register(self.app.sock.sock, selectors.EVENT_READ)
-        try:
-            while self.app.keep_running:
-                if sel.select(self.ping_timeout):
-                    if not read_callback():
-                        break
-                check_callback()
-        finally:
-            sel.close()
-
-
-class SSLDispatcher(DispatcherBase):
-    """
-    SSLDispatcher
-    """
-
-    def read(
-        self,
-        sock: socket.socket,
-        read_callback: Callable,
-        check_callback: Callable,
-    ) -> None:
-        sock = self.app.sock.sock
-        sel = selectors.DefaultSelector()
-        sel.register(sock, selectors.EVENT_READ)
-        try:
-            while self.app.keep_running:
-                if self.select(sock, sel):
-                    if not read_callback():
-                        break
-                check_callback()
-        finally:
-            sel.close()
-
-    def select(self, sock, sel: selectors.DefaultSelector):
-        sock = self.app.sock.sock
-        if sock.pending():
-            return [
-                sock,
-            ]
-
-        r = sel.select(self.ping_timeout)
-
-        if len(r) > 0:
-            return r[0][0]
-
-
-class WrappedDispatcher:
-    """
-    WrappedDispatcher
-    """
-
-    def __init__(self, app, ping_timeout: Union[float, int, None], dispatcher) -> None:
-        self.app = app
-        self.ping_timeout = ping_timeout
-        self.dispatcher = dispatcher
-        dispatcher.signal(2, dispatcher.abort)  # keyboard interrupt
-
-    def read(
-        self,
-        sock: socket.socket,
-        read_callback: Callable,
-        check_callback: Callable,
-    ) -> None:
-        self.dispatcher.read(sock, read_callback)
-        self.ping_timeout and self.timeout(self.ping_timeout, check_callback)
-
-    def timeout(self, seconds: float, callback: Callable) -> None:
-        self.dispatcher.timeout(seconds, callback)
-
-    def reconnect(self, seconds: int, reconnector: Callable) -> None:
-        self.timeout(seconds, reconnector)
-
-
-class WebSocketApp:
-    """
-    Higher level of APIs are provided. The interface is like JavaScript WebSocket object.
-    """
-
-    def __init__(
-        self,
-        url: str,
-        header: Union[list, dict, Callable, None] = None,
-        on_open: Optional[Callable[[WebSocket], None]] = None,
-        on_reconnect: Optional[Callable[[WebSocket], None]] = None,
-        on_message: Optional[Callable[[WebSocket, Any], None]] = None,
-        on_error: Optional[Callable[[WebSocket, Any], None]] = None,
-        on_close: Optional[Callable[[WebSocket, Any, Any], None]] = None,
-        on_ping: Optional[Callable] = None,
-        on_pong: Optional[Callable] = None,
-        on_cont_message: Optional[Callable] = None,
-        keep_running: bool = True,
-        get_mask_key: Optional[Callable] = None,
-        cookie: Optional[str] = None,
-        subprotocols: Optional[list] = None,
-        on_data: Optional[Callable] = None,
-        socket: Optional[socket.socket] = None,
-    ) -> None:
+    def __init__(self, url, header=[],
+                 on_open=None, on_message=None, on_error=None,
+                 on_close=None, on_ping=None, on_pong=None,
+                 on_cont_message=None,
+                 keep_running=True, get_mask_key=None, cookie=None,
+                 subprotocols=None):
         """
-        WebSocketApp initialization
-
-        Parameters
-        ----------
-        url: str
-            Websocket url.
-        header: list or dict or Callable
-            Custom header for websocket handshake.
-            If the parameter is a callable object, it is called just before the connection attempt.
-            The returned dict or list is used as custom header value.
-            This could be useful in order to properly setup timestamp dependent headers.
-        on_open: function
-            Callback object which is called at opening websocket.
-            on_open has one argument.
-            The 1st argument is this class object.
-        on_reconnect: function
-            Callback object which is called at reconnecting websocket.
-            on_reconnect has one argument.
-            The 1st argument is this class object.
-        on_message: function
-            Callback object which is called when received data.
-            on_message has 2 arguments.
-            The 1st argument is this class object.
-            The 2nd argument is utf-8 data received from the server.
-        on_error: function
-            Callback object which is called when we get error.
-            on_error has 2 arguments.
-            The 1st argument is this class object.
-            The 2nd argument is exception object.
-        on_close: function
-            Callback object which is called when connection is closed.
-            on_close has 3 arguments.
-            The 1st argument is this class object.
-            The 2nd argument is close_status_code.
-            The 3rd argument is close_msg.
-        on_cont_message: function
-            Callback object which is called when a continuation
-            frame is received.
-            on_cont_message has 3 arguments.
-            The 1st argument is this class object.
-            The 2nd argument is utf-8 string which we get from the server.
-            The 3rd argument is continue flag. if 0, the data continue
-            to next frame data
-        on_data: function
-            Callback object which is called when a message received.
-            This is called before on_message or on_cont_message,
-            and then on_message or on_cont_message is called.
-            on_data has 4 argument.
-            The 1st argument is this class object.
-            The 2nd argument is utf-8 string which we get from the server.
-            The 3rd argument is data type. ABNF.OPCODE_TEXT or ABNF.OPCODE_BINARY will be came.
-            The 4th argument is continue flag. If 0, the data continue
-        keep_running: bool
-            This parameter is obsolete and ignored.
-        get_mask_key: function
-            A callable function to get new mask keys, see the
-            WebSocket.set_mask_key's docstring for more information.
-        cookie: str
-            Cookie value.
-        subprotocols: list
-            List of available sub protocols. Default is None.
-        socket: socket
-            Pre-initialized stream socket.
+        url: websocket url.
+        header: custom header for websocket handshake.
+        on_open: callable object which is called at opening websocket.
+          this function has one argument. The arugment is this class object.
+        on_message: callbale object which is called when recieved data.
+         on_message has 2 arguments.
+         The 1st arugment is this class object.
+         The passing 2nd arugment is utf-8 string which we get from the server.
+        on_error: callable object which is called when we get error.
+         on_error has 2 arguments.
+         The 1st arugment is this class object.
+         The passing 2nd arugment is exception object.
+        on_close: callable object which is called when closed the connection.
+         this function has one argument. The arugment is this class object.
+        on_cont_message: callback object which is called when recieve continued
+         frame data.
+         on_message has 3 arguments.
+         The 1st arugment is this class object.
+         The passing 2nd arugment is utf-8 string which we get from the server.
+         The 3rd arugment is continue flag. if 0, the data continue
+         to next frame data
+        keep_running: a boolean flag indicating whether the app's main loop
+          should keep running, defaults to True
+        get_mask_key: a callable to produce new mask keys,
+          see the WebSocket.set_mask_key's docstring for more information
+        subprotocols: array of available sub protocols. default is None.
         """
         self.url = url
-        self.header = header if header is not None else []
+        self.header = header
         self.cookie = cookie
-
         self.on_open = on_open
-        self.on_reconnect = on_reconnect
         self.on_message = on_message
-        self.on_data = on_data
         self.on_error = on_error
         self.on_close = on_close
         self.on_ping = on_ping
         self.on_pong = on_pong
         self.on_cont_message = on_cont_message
-        self.keep_running = False
+        self.keep_running = keep_running
         self.get_mask_key = get_mask_key
-        self.sock: Optional[WebSocket] = None
-        self.last_ping_tm = float(0)
-        self.last_pong_tm = float(0)
-        self.ping_thread: Optional[threading.Thread] = None
-        self.stop_ping: Optional[threading.Event] = None
-        self.ping_interval = float(0)
-        self.ping_timeout: Union[float, int, None] = None
-        self.ping_payload = ""
+        self.sock = None
+        self.last_ping_tm = 0
         self.subprotocols = subprotocols
-        self.prepared_socket = socket
-        self.has_errored = False
-        self.has_done_teardown = False
-        self.has_done_teardown_lock = threading.Lock()
 
-    def send(self, data: Union[bytes, str], opcode: int = ABNF.OPCODE_TEXT) -> None:
+    def send(self, data, opcode=ABNF.OPCODE_TEXT):
         """
-        send message
-
-        Parameters
-        ----------
-        data: str
-            Message to send. If you set opcode to OPCODE_TEXT,
-            data must be utf-8 string or unicode.
-        opcode: int
-            Operation code of data. Default is OPCODE_TEXT.
+        send message.
+        data: message to send. If you set opcode to OPCODE_TEXT,
+              data must be utf-8 string or unicode.
+        opcode: operation code of data. default is OPCODE_TEXT.
         """
 
         if not self.sock or self.sock.send(data, opcode) == 0:
             raise WebSocketConnectionClosedException("Connection is already closed.")
 
-    def send_text(self, text_data: str) -> None:
+    def close(self):
         """
-        Sends UTF-8 encoded text.
-        """
-        if not self.sock or self.sock.send(text_data, ABNF.OPCODE_TEXT) == 0:
-            raise WebSocketConnectionClosedException("Connection is already closed.")
-
-    def send_bytes(self, data: Union[bytes, bytearray]) -> None:
-        """
-        Sends a sequence of bytes.
-        """
-        if not self.sock or self.sock.send(data, ABNF.OPCODE_BINARY) == 0:
-            raise WebSocketConnectionClosedException("Connection is already closed.")
-
-    def close(self, **kwargs) -> None:
-        """
-        Close websocket connection.
+        close websocket connection.
         """
         self.keep_running = False
         if self.sock:
-            self.sock.close(**kwargs)
-            self.sock = None
+            self.sock.close()
 
-    def _start_ping_thread(self) -> None:
-        self.last_ping_tm = self.last_pong_tm = float(0)
-        self.stop_ping = threading.Event()
-        self.ping_thread = threading.Thread(target=self._send_ping)
-        self.ping_thread.daemon = True
-        self.ping_thread.start()
-
-    def _stop_ping_thread(self) -> None:
-        if self.stop_ping:
-            self.stop_ping.set()
-        if self.ping_thread and self.ping_thread.is_alive():
-            self.ping_thread.join(3)
-        self.last_ping_tm = self.last_pong_tm = float(0)
-
-    def _send_ping(self) -> None:
-        if self.stop_ping.wait(self.ping_interval) or self.keep_running is False:
-            return
-        while not self.stop_ping.wait(self.ping_interval) and self.keep_running is True:
+    def _send_ping(self, interval, event):
+        while not event.wait(interval):
+            self.last_ping_tm = time.time()
             if self.sock:
-                self.last_ping_tm = time.time()
-                try:
-                    _logging.debug("Sending ping")
-                    self.sock.ping(self.ping_payload)
-                except Exception as e:
-                    _logging.debug(f"Failed to send ping: {e}")
+                self.sock.ping()
 
-    def run_forever(
-        self,
-        sockopt: tuple = None,
-        sslopt: dict = None,
-        ping_interval: Union[float, int] = 0,
-        ping_timeout: Union[float, int, None] = None,
-        ping_payload: str = "",
-        http_proxy_host: str = None,
-        http_proxy_port: Union[int, str] = None,
-        http_no_proxy: list = None,
-        http_proxy_auth: tuple = None,
-        http_proxy_timeout: Optional[float] = None,
-        skip_utf8_validation: bool = False,
-        host: str = None,
-        origin: str = None,
-        dispatcher=None,
-        suppress_origin: bool = False,
-        proxy_type: str = None,
-        reconnect: int = None,
-    ) -> bool:
+    def run_forever(self, sockopt=None, sslopt=None,
+                    ping_interval=0, ping_timeout=None,
+                    http_proxy_host=None, http_proxy_port=None,
+                    http_no_proxy=None, http_proxy_auth=None,
+                    skip_utf8_validation=False,
+                    host=None, origin=None):
         """
-        Run event loop for WebSocket framework.
-
-        This loop is an infinite loop and is alive while websocket is available.
-
-        Parameters
-        ----------
-        sockopt: tuple
-            Values for socket.setsockopt.
+        run event loop for WebSocket framework.
+        This loop is infinite loop and is alive during websocket is available.
+        sockopt: values for socket.setsockopt.
             sockopt must be tuple
-            and each element is argument of sock.setsockopt.
-        sslopt: dict
-            Optional dict object for ssl socket option.
-        ping_interval: int or float
-            Automatically send "ping" command
-            every specified period (in seconds).
-            If set to 0, no ping is sent periodically.
-        ping_timeout: int or float
-            Timeout (in seconds) if the pong message is not received.
-        ping_payload: str
-            Payload message to send with each ping.
-        http_proxy_host: str
-            HTTP proxy host name.
-        http_proxy_port: int or str
-            HTTP proxy port. If not set, set to 80.
-        http_no_proxy: list
-            Whitelisted host names that don't use the proxy.
-        http_proxy_timeout: int or float
-            HTTP proxy timeout, default is 60 sec as per python-socks.
-        http_proxy_auth: tuple
-            HTTP proxy auth information. tuple of username and password. Default is None.
-        skip_utf8_validation: bool
-            skip utf8 validation.
-        host: str
-            update host header.
-        origin: str
-            update origin header.
-        dispatcher: Dispatcher object
-            customize reading data from socket.
-        suppress_origin: bool
-            suppress outputting origin header.
-        proxy_type: str
-            type of proxy from: http, socks4, socks4a, socks5, socks5h
-        reconnect: int
-            delay interval when reconnecting
-
-        Returns
-        -------
-        teardown: bool
-            False if the `WebSocketApp` is closed or caught KeyboardInterrupt,
-            True if any other exception was raised during a loop.
+            and each element is argument of sock.setscokopt.
+        sslopt: ssl socket optional dict.
+        ping_interval: automatically send "ping" command
+            every specified period(second)
+            if set to 0, not send automatically.
+        ping_timeout: timeout(second) if the pong message is not recieved.
+        http_proxy_host: http proxy host name.
+        http_proxy_port: http proxy port. If not set, set to 80.
+        http_no_proxy: host names, which doesn't use proxy.
+        skip_utf8_validation: skip utf8 validation.
+        host: update host header.
+        origin: update origin header.
         """
 
-        if reconnect is None:
-            reconnect = RECONNECT
-
-        if ping_timeout is not None and ping_timeout <= 0:
-            raise WebSocketException("Ensure ping_timeout > 0")
-        if ping_interval is not None and ping_interval < 0:
-            raise WebSocketException("Ensure ping_interval >= 0")
-        if ping_timeout and ping_interval and ping_interval <= ping_timeout:
-            raise WebSocketException("Ensure ping_interval > ping_timeout")
-        if not sockopt:
-            sockopt = ()
-        if not sslopt:
+        if not ping_timeout or ping_timeout <= 0:
+            ping_timeout = None
+        if sockopt is None:
+            sockopt = []
+        if sslopt is None:
             sslopt = {}
         if self.sock:
             raise WebSocketException("socket is already opened")
-
-        self.ping_interval = ping_interval
-        self.ping_timeout = ping_timeout
-        self.ping_payload = ping_payload
-        self.has_done_teardown = False
-        self.keep_running = True
-
-        def teardown(close_frame: ABNF = None):
-            """
-            Tears down the connection.
-
-            Parameters
-            ----------
-            close_frame: ABNF frame
-                If close_frame is set, the on_close handler is invoked
-                with the statusCode and reason from the provided frame.
-            """
-
-            # teardown() is called in many code paths to ensure resources are cleaned up and on_close is fired.
-            # To ensure the work is only done once, we use this bool and lock.
-            with self.has_done_teardown_lock:
-                if self.has_done_teardown:
-                    return
-                self.has_done_teardown = True
-
-            self._stop_ping_thread()
-            self.keep_running = False
-            if self.sock:
-                self.sock.close()
-            close_status_code, close_reason = self._get_close_args(
-                close_frame if close_frame else None
-            )
-            self.sock = None
-
-            # Finally call the callback AFTER all teardown is complete
-            self._callback(self.on_close, close_status_code, close_reason)
-
-        def setSock(reconnecting: bool = False) -> None:
-            if reconnecting and self.sock:
-                self.sock.shutdown()
-
-            self.sock = WebSocket(
-                self.get_mask_key,
-                sockopt=sockopt,
-                sslopt=sslopt,
-                fire_cont_frame=self.on_cont_message is not None,
-                skip_utf8_validation=skip_utf8_validation,
-                enable_multithread=True,
-            )
-
-            self.sock.settimeout(getdefaulttimeout())
-            try:
-                header = self.header() if callable(self.header) else self.header
-
-                self.sock.connect(
-                    self.url,
-                    header=header,
-                    cookie=self.cookie,
-                    http_proxy_host=http_proxy_host,
-                    http_proxy_port=http_proxy_port,
-                    http_no_proxy=http_no_proxy,
-                    http_proxy_auth=http_proxy_auth,
-                    http_proxy_timeout=http_proxy_timeout,
-                    subprotocols=self.subprotocols,
-                    host=host,
-                    origin=origin,
-                    suppress_origin=suppress_origin,
-                    proxy_type=proxy_type,
-                    socket=self.prepared_socket,
-                )
-
-                _logging.info("Websocket connected")
-
-                if self.ping_interval:
-                    self._start_ping_thread()
-
-                if reconnecting and self.on_reconnect:
-                    self._callback(self.on_reconnect)
-                else:
-                    self._callback(self.on_open)
-
-                dispatcher.read(self.sock.sock, read, check)
-            except (
-                WebSocketConnectionClosedException,
-                ConnectionRefusedError,
-                KeyboardInterrupt,
-                SystemExit,
-                Exception,
-            ) as e:
-                handleDisconnect(e, reconnecting)
-
-        def read() -> bool:
-            if not self.keep_running:
-                return teardown()
-
-            try:
-                op_code, frame = self.sock.recv_data_frame(True)
-            except (
-                WebSocketConnectionClosedException,
-                KeyboardInterrupt,
-                SSLEOFError,
-            ) as e:
-                if custom_dispatcher:
-                    return handleDisconnect(e, bool(reconnect))
-                else:
-                    raise e
-
-            if op_code == ABNF.OPCODE_CLOSE:
-                return teardown(frame)
-            elif op_code == ABNF.OPCODE_PING:
-                self._callback(self.on_ping, frame.data)
-            elif op_code == ABNF.OPCODE_PONG:
-                self.last_pong_tm = time.time()
-                self._callback(self.on_pong, frame.data)
-            elif op_code == ABNF.OPCODE_CONT and self.on_cont_message:
-                self._callback(self.on_data, frame.data, frame.opcode, frame.fin)
-                self._callback(self.on_cont_message, frame.data, frame.fin)
-            else:
-                data = frame.data
-                if op_code == ABNF.OPCODE_TEXT and not skip_utf8_validation:
-                    data = data.decode("utf-8")
-                self._callback(self.on_data, data, frame.opcode, True)
-                self._callback(self.on_message, data)
-
-            return True
-
-        def check() -> bool:
-            if self.ping_timeout:
-                has_timeout_expired = (
-                    time.time() - self.last_ping_tm > self.ping_timeout
-                )
-                has_pong_not_arrived_after_last_ping = (
-                    self.last_pong_tm - self.last_ping_tm < 0
-                )
-                has_pong_arrived_too_late = (
-                    self.last_pong_tm - self.last_ping_tm > self.ping_timeout
-                )
-
-                if (
-                    self.last_ping_tm
-                    and has_timeout_expired
-                    and (
-                        has_pong_not_arrived_after_last_ping
-                        or has_pong_arrived_too_late
-                    )
-                ):
-                    raise WebSocketTimeoutException("ping/pong timed out")
-            return True
-
-        def handleDisconnect(
-            e: Union[
-                WebSocketConnectionClosedException,
-                ConnectionRefusedError,
-                KeyboardInterrupt,
-                SystemExit,
-                Exception,
-            ],
-            reconnecting: bool = False,
-        ) -> bool:
-            self.has_errored = True
-            self._stop_ping_thread()
-            if not reconnecting:
-                self._callback(self.on_error, e)
-
-            if isinstance(e, (KeyboardInterrupt, SystemExit)):
-                teardown()
-                # Propagate further
-                raise
-
-            if reconnect:
-                _logging.info(f"{e} - reconnect")
-                if custom_dispatcher:
-                    _logging.debug(
-                        f"Calling custom dispatcher reconnect [{len(inspect.stack())} frames in stack]"
-                    )
-                    dispatcher.reconnect(reconnect, setSock)
-            else:
-                _logging.error(f"{e} - goodbye")
-                teardown()
-
-        custom_dispatcher = bool(dispatcher)
-        dispatcher = self.create_dispatcher(
-            ping_timeout, dispatcher, parse_url(self.url)[3]
-        )
+        thread = None
+        close_frame = None
 
         try:
-            setSock()
-            if not custom_dispatcher and reconnect:
-                while self.keep_running:
-                    _logging.debug(
-                        f"Calling dispatcher reconnect [{len(inspect.stack())} frames in stack]"
-                    )
-                    dispatcher.reconnect(reconnect, setSock)
-        except (KeyboardInterrupt, Exception) as e:
-            _logging.info(f"tearing down on exception {e}")
-            teardown()
+            self.sock = WebSocket(self.get_mask_key,
+                sockopt=sockopt, sslopt=sslopt,
+                fire_cont_frame=self.on_cont_message and True or False,
+                skip_utf8_validation=skip_utf8_validation)
+            self.sock.settimeout(getdefaulttimeout())
+            self.sock.connect(self.url, header=self.header, cookie=self.cookie,
+                http_proxy_host=http_proxy_host,
+                http_proxy_port=http_proxy_port,
+                http_no_proxy=http_no_proxy, http_proxy_auth=http_proxy_auth,
+                subprotocols=self.subprotocols,
+                host=host, origin=origin)
+            self._callback(self.on_open)
+
+            if ping_interval:
+                event = threading.Event()
+                thread = threading.Thread(target=self._send_ping, args=(ping_interval, event))
+                thread.setDaemon(True)
+                thread.start()
+
+            while self.sock.connected:
+                r, w, e = select.select((self.sock.sock, ), (), (), ping_timeout)
+                if not self.keep_running:
+                    break
+                if ping_timeout and self.last_ping_tm and time.time() - self.last_ping_tm > ping_timeout:
+                    self.last_ping_tm = 0
+                    raise WebSocketTimeoutException("ping timed out")
+
+                if r:
+                    op_code, frame = self.sock.recv_data_frame(True)
+                    if op_code == ABNF.OPCODE_CLOSE:
+                        close_frame = frame
+                        break
+                    elif op_code == ABNF.OPCODE_PING:
+                        self._callback(self.on_ping, frame.data)
+                    elif op_code == ABNF.OPCODE_PONG:
+                        self._callback(self.on_pong, frame.data)
+                    elif op_code == ABNF.OPCODE_CONT and self.on_cont_message:
+                        self._callback(self.on_cont_message, frame.data, frame.fin)
+                    else:
+                        data = frame.data
+                        if six.PY3 and frame.opcode == ABNF.OPCODE_TEXT:
+                            data = data.decode("utf-8")
+                        self._callback(self.on_message, data)
+        except Exception as e:
+            self._callback(self.on_error, e)
         finally:
-            if not custom_dispatcher:
-                # Ensure teardown was called before returning from run_forever
-                teardown()
+            if thread:
+                event.set()
+                thread.join()
+                self.keep_running = False
+            self.sock.close()
+            self._callback(self.on_close,
+                *self._get_close_args(close_frame.data if close_frame else None))
+            self.sock = None
 
-        return self.has_errored
+    def _get_close_args(self, data):
+        """ this functions extracts the code, reason from the close body
+        if they exists, and if the self.on_close except three arguments """
+        import inspect
+        # if the on_close callback is "old", just return empty list
+        if not self.on_close or len(inspect.getargspec(self.on_close).args) != 3:
+            return []
 
-    def create_dispatcher(
-        self,
-        ping_timeout: Union[float, int, None],
-        dispatcher: Optional[DispatcherBase] = None,
-        is_ssl: bool = False,
-    ) -> Union[Dispatcher, SSLDispatcher, WrappedDispatcher]:
-        if dispatcher:  # If custom dispatcher is set, use WrappedDispatcher
-            return WrappedDispatcher(self, ping_timeout, dispatcher)
-        timeout = ping_timeout or 10
-        if is_ssl:
-            return SSLDispatcher(self, timeout)
-        return Dispatcher(self, timeout)
+        if data and len(data) >= 2:
+            code = 256*six.byte2int(data[0:1]) + six.byte2int(data[1:2])
+            reason = data[2:].decode('utf-8')
+            return [code, reason]
 
-    def _get_close_args(self, close_frame: ABNF) -> list:
-        """
-        _get_close_args extracts the close code and reason from the close body
-        if it exists (RFC6455 says WebSocket Connection Close Code is optional)
-        """
-        # Need to catch the case where close_frame is None
-        # Otherwise the following if statement causes an error
-        if not self.on_close or not close_frame:
-            return [None, None]
+        return [None, None]
 
-        # Extract close frame status code
-        if close_frame.data and len(close_frame.data) >= 2:
-            close_status_code = 256 * int(close_frame.data[0]) + int(
-                close_frame.data[1]
-            )
-            reason = close_frame.data[2:]
-            if isinstance(reason, bytes):
-                reason = reason.decode("utf-8")
-            return [close_status_code, reason]
-        else:
-            # Most likely reached this because len(close_frame_data.data) < 2
-            return [None, None]
-
-    def _callback(self, callback, *args) -> None:
+    def _callback(self, callback, *args):
         if callback:
             try:
                 callback(self, *args)
-
             except Exception as e:
-                _logging.error(f"error from callback {callback}: {e}")
-                if self.on_error:
-                    self.on_error(self, e)
+                error(e)
+                if isEnabledForDebug():
+                    _, _, tb = sys.exc_info()
+                    traceback.print_tb(tb)
diff --git a/lib/websocket/_cookiejar.py b/lib/websocket/_cookiejar.py
deleted file mode 100644
index 7480e5fc..00000000
--- a/lib/websocket/_cookiejar.py
+++ /dev/null
@@ -1,75 +0,0 @@
-import http.cookies
-from typing import Optional
-
-"""
-_cookiejar.py
-websocket - WebSocket client library for Python
-
-Copyright 2024 engn33r
-
-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.
-"""
-
-
-class SimpleCookieJar:
-    def __init__(self) -> None:
-        self.jar: dict = {}
-
-    def add(self, set_cookie: Optional[str]) -> None:
-        if set_cookie:
-            simple_cookie = http.cookies.SimpleCookie(set_cookie)
-
-            for v in simple_cookie.values():
-                if domain := v.get("domain"):
-                    if not domain.startswith("."):
-                        domain = f".{domain}"
-                    cookie = (
-                        self.jar.get(domain)
-                        if self.jar.get(domain)
-                        else http.cookies.SimpleCookie()
-                    )
-                    cookie.update(simple_cookie)
-                    self.jar[domain.lower()] = cookie
-
-    def set(self, set_cookie: str) -> None:
-        if set_cookie:
-            simple_cookie = http.cookies.SimpleCookie(set_cookie)
-
-            for v in simple_cookie.values():
-                if domain := v.get("domain"):
-                    if not domain.startswith("."):
-                        domain = f".{domain}"
-                    self.jar[domain.lower()] = simple_cookie
-
-    def get(self, host: str) -> str:
-        if not host:
-            return ""
-
-        cookies = []
-        for domain, _ in self.jar.items():
-            host = host.lower()
-            if host.endswith(domain) or host == domain[1:]:
-                cookies.append(self.jar.get(domain))
-
-        return "; ".join(
-            filter(
-                None,
-                sorted(
-                    [
-                        f"{k}={v.value}"
-                        for cookie in filter(None, cookies)
-                        for k, v in cookie.items()
-                    ]
-                ),
-            )
-        )
diff --git a/lib/websocket/_core.py b/lib/websocket/_core.py
index f940ed05..4d7ddecd 100644
--- a/lib/websocket/_core.py
+++ b/lib/websocket/_core.py
@@ -1,100 +1,147 @@
-import socket
-import struct
-import threading
-import time
-from typing import Optional, Union
-
-# websocket modules
-from ._abnf import ABNF, STATUS_NORMAL, continuous_frame, frame_buffer
-from ._exceptions import WebSocketProtocolException, WebSocketConnectionClosedException
-from ._handshake import SUPPORTED_REDIRECT_STATUSES, handshake
-from ._http import connect, proxy_info
-from ._logging import debug, error, trace, isEnabledForError, isEnabledForTrace
-from ._socket import getdefaulttimeout, recv, send, sock_opt
-from ._ssl_compat import ssl
-from ._utils import NoLock
-
 """
-_core.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright (C) 2010 Hiroki Ohtani(liris)
 
-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
+    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.
 
-    http://www.apache.org/licenses/LICENSE-2.0
+    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.
 
-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.
+    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-1335  USA
+
+"""
+from __future__ import print_function
+
+
+import six
+import socket
+
+if six.PY3:
+    from base64 import encodebytes as base64encode
+else:
+    from base64 import encodestring as base64encode
+
+import struct
+import threading
+
+# websocket modules
+from ._exceptions import *
+from ._abnf import *
+from ._socket import *
+from ._utils import *
+from ._url import *
+from ._logging import *
+from ._http import *
+from ._handshake import *
+from ._ssl_compat import *
+
+"""
+websocket python client.
+=========================
+
+This version support only hybi-13.
+Please see http://tools.ietf.org/html/rfc6455 for protocol.
 """
 
-__all__ = ["WebSocket", "create_connection"]
+
+def create_connection(url, timeout=None, **options):
+    """
+    connect to url and return websocket object.
+
+    Connect to url and return the WebSocket object.
+    Passing optional timeout parameter will set the timeout on the socket.
+    If no timeout is supplied,
+    the global default timeout setting returned by getdefauttimeout() is used.
+    You can customize using 'options'.
+    If you set "header" list object, you can set your own custom header.
+
+    >>> conn = create_connection("ws://echo.websocket.org/",
+         ...     header=["User-Agent: MyProgram",
+         ...             "x-custom: header"])
 
 
-class WebSocket:
+    timeout: socket timeout time. This value is integer.
+             if you set None for this value,
+             it means "use default_timeout value"
+
+
+    options: "header" -> custom http header list.
+             "cookie" -> cookie value.
+             "origin" -> custom origin url.
+             "host"   -> custom host header string.
+             "http_proxy_host" - http proxy host name.
+             "http_proxy_port" - http proxy port. If not set, set to 80.
+             "http_no_proxy"   - host names, which doesn't use proxy.
+             "http_proxy_auth" - http proxy auth infomation.
+                                    tuple of username and password.
+                                    default is None
+             "enable_multithread" -> enable lock for multithread.
+             "sockopt" -> socket options
+             "sslopt" -> ssl option
+             "subprotocols" - array of available sub protocols.
+                              default is None.
+             "skip_utf8_validation" - skip utf8 validation.
+    """
+    sockopt = options.get("sockopt", [])
+    sslopt = options.get("sslopt", {})
+    fire_cont_frame = options.get("fire_cont_frame", False)
+    enable_multithread = options.get("enable_multithread", False)
+    skip_utf8_validation = options.get("skip_utf8_validation", False)
+    websock = WebSocket(sockopt=sockopt, sslopt=sslopt,
+                        fire_cont_frame=fire_cont_frame,
+                        enable_multithread=enable_multithread,
+                        skip_utf8_validation=skip_utf8_validation)
+    websock.settimeout(timeout if timeout is not None else getdefaulttimeout())
+    websock.connect(url, **options)
+    return websock
+
+
+class WebSocket(object):
     """
     Low level WebSocket interface.
+    This class is based on
+      The WebSocket protocol draft-hixie-thewebsocketprotocol-76
+      http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-76
 
-    This class is based on the WebSocket protocol `draft-hixie-thewebsocketprotocol-76 <http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-76>`_
-
-    We can connect to the websocket server and send/receive data.
-    The following example is an echo client.
+    We can connect to the websocket server and send/recieve data.
+    The following example is a echo client.
 
     >>> import websocket
     >>> ws = websocket.WebSocket()
-    >>> ws.connect("ws://echo.websocket.events")
-    >>> ws.recv()
-    'echo.websocket.events sponsored by Lob.com'
+    >>> ws.connect("ws://echo.websocket.org")
     >>> ws.send("Hello, Server")
-    19
     >>> ws.recv()
     'Hello, Server'
     >>> ws.close()
 
-    Parameters
-    ----------
-    get_mask_key: func
-        A callable function to get new mask keys, see the
-        WebSocket.set_mask_key's docstring for more information.
-    sockopt: tuple
-        Values for socket.setsockopt.
-        sockopt must be tuple and each element is argument of sock.setsockopt.
-    sslopt: dict
-        Optional dict object for ssl socket options. See FAQ for details.
-    fire_cont_frame: bool
-        Fire recv event for each cont frame. Default is False.
-    enable_multithread: bool
-        If set to True, lock send method.
-    skip_utf8_validation: bool
-        Skip utf8 validation.
+    get_mask_key: a callable to produce new mask keys, see the set_mask_key
+      function's docstring for more details
+    sockopt: values for socket.setsockopt.
+        sockopt must be tuple and each element is argument of sock.setscokopt.
+    sslopt: dict object for ssl socket option.
+    fire_cont_frame: fire recv event for each cont frame. default is False
+    enable_multithread: if set to True, lock send method.
+    skip_utf8_validation: skip utf8 validation.
     """
 
-    def __init__(
-        self,
-        get_mask_key=None,
-        sockopt=None,
-        sslopt=None,
-        fire_cont_frame: bool = False,
-        enable_multithread: bool = True,
-        skip_utf8_validation: bool = False,
-        **_,
-    ):
+    def __init__(self, get_mask_key=None, sockopt=None, sslopt=None,
+                 fire_cont_frame=False, enable_multithread=False,
+                 skip_utf8_validation=False):
         """
-        Initialize WebSocket object.
-
-        Parameters
-        ----------
-        sslopt: dict
-            Optional dict object for ssl socket options. See FAQ for details.
+        Initalize WebSocket object.
         """
         self.sock_opt = sock_opt(sockopt, sslopt)
         self.handshake_response = None
-        self.sock: Optional[socket.socket] = None
+        self.sock = None
 
         self.connected = False
         self.get_mask_key = get_mask_key
@@ -104,10 +151,8 @@ class WebSocket:
 
         if enable_multithread:
             self.lock = threading.Lock()
-            self.readlock = threading.Lock()
         else:
             self.lock = NoLock()
-            self.readlock = NoLock()
 
     def __iter__(self):
         """
@@ -127,38 +172,27 @@ class WebSocket:
 
     def set_mask_key(self, func):
         """
-        Set function to create mask key. You can customize mask key generator.
+        set function to create musk key. You can custumize mask key generator.
         Mainly, this is for testing purpose.
 
-        Parameters
-        ----------
-        func: func
-            callable object. the func takes 1 argument as integer.
-            The argument means length of mask key.
-            This func must return string(byte array),
-            which length is argument specified.
+        func: callable object. the fuct must 1 argument as integer.
+              The argument means length of mask key.
+              This func must be return string(byte array),
+              which length is argument specified.
         """
         self.get_mask_key = func
 
-    def gettimeout(self) -> Union[float, int, None]:
+    def gettimeout(self):
         """
-        Get the websocket timeout (in seconds) as an int or float
-
-        Returns
-        ----------
-        timeout: int or float
-             returns timeout value (in seconds). This value could be either float/integer.
+        Get the websocket timeout(second).
         """
         return self.sock_opt.timeout
 
-    def settimeout(self, timeout: Union[float, int, None]):
+    def settimeout(self, timeout):
         """
         Set the timeout to the websocket.
 
-        Parameters
-        ----------
-        timeout: int or float
-            timeout time (in seconds). This value could be either float/integer.
+        timeout: timeout time(second).
         """
         self.sock_opt.timeout = timeout
         if self.sock:
@@ -168,7 +202,7 @@ class WebSocket:
 
     def getsubprotocol(self):
         """
-        Get subprotocol
+        get subprotocol
         """
         if self.handshake_response:
             return self.handshake_response.subprotocol
@@ -179,7 +213,7 @@ class WebSocket:
 
     def getstatus(self):
         """
-        Get handshake status
+        get handshake status
         """
         if self.handshake_response:
             return self.handshake_response.status
@@ -190,19 +224,13 @@ class WebSocket:
 
     def getheaders(self):
         """
-        Get handshake response header
+        get handshake response header
         """
         if self.handshake_response:
             return self.handshake_response.headers
         else:
             return None
 
-    def is_ssl(self):
-        try:
-            return isinstance(self.sock, ssl.SSLSocket)
-        except:
-            return False
-
     headers = property(getheaders)
 
     def connect(self, url, **options):
@@ -213,65 +241,32 @@ class WebSocket:
         If you set "header" list object, you can set your own custom header.
 
         >>> ws = WebSocket()
-        >>> ws.connect("ws://echo.websocket.events",
+        >>> ws.connect("ws://echo.websocket.org/",
                 ...     header=["User-Agent: MyProgram",
                 ...             "x-custom: header"])
 
-        Parameters
-        ----------
-        header: list or dict
-            Custom http header list or dict.
-        cookie: str
-            Cookie value.
-        origin: str
-            Custom origin url.
-        connection: str
-            Custom connection header value.
-            Default value "Upgrade" set in _handshake.py
-        suppress_origin: bool
-            Suppress outputting origin header.
-        host: str
-            Custom host header string.
-        timeout: int or float
-            Socket timeout time. This value is an integer or float.
-            If you set None for this value, it means "use default_timeout value"
-        http_proxy_host: str
-            HTTP proxy host name.
-        http_proxy_port: str or int
-            HTTP proxy port. Default is 80.
-        http_no_proxy: list
-            Whitelisted host names that don't use the proxy.
-        http_proxy_auth: tuple
-            HTTP proxy auth information. Tuple of username and password. Default is None.
-        http_proxy_timeout: int or float
-            HTTP proxy timeout, default is 60 sec as per python-socks.
-        redirect_limit: int
-            Number of redirects to follow.
-        subprotocols: list
-            List of available subprotocols. Default is None.
-        socket: socket
-            Pre-initialized stream socket.
+        timeout: socket timeout time. This value is integer.
+                 if you set None for this value,
+                 it means "use default_timeout value"
+
+        options: "header" -> custom http header list.
+                 "cookie" -> cookie value.
+                 "origin" -> custom origin url.
+                 "host"   -> custom host header string.
+                 "http_proxy_host" - http proxy host name.
+                 "http_proxy_port" - http proxy port. If not set, set to 80.
+                 "http_no_proxy"   - host names, which doesn't use proxy.
+                 "http_proxy_auth" - http proxy auth infomation.
+                                     tuple of username and password.
+                                     defualt is None
+                 "subprotocols" - array of available sub protocols.
+                                  default is None.
+
         """
-        self.sock_opt.timeout = options.get("timeout", self.sock_opt.timeout)
-        self.sock, addrs = connect(
-            url, self.sock_opt, proxy_info(**options), options.pop("socket", None)
-        )
+        self.sock, addrs = connect(url, self.sock_opt, proxy_info(**options))
 
         try:
-            self.handshake_response = handshake(self.sock, url, *addrs, **options)
-            for _ in range(options.pop("redirect_limit", 3)):
-                if self.handshake_response.status in SUPPORTED_REDIRECT_STATUSES:
-                    url = self.handshake_response.headers["location"]
-                    self.sock.close()
-                    self.sock, addrs = connect(
-                        url,
-                        self.sock_opt,
-                        proxy_info(**options),
-                        options.pop("socket", None),
-                    )
-                    self.handshake_response = handshake(
-                        self.sock, url, *addrs, **options
-                    )
+            self.handshake_response = handshake(self.sock, *addrs, **options)
             self.connected = True
         except:
             if self.sock:
@@ -279,40 +274,27 @@ class WebSocket:
                 self.sock = None
             raise
 
-    def send(self, payload: Union[bytes, str], opcode: int = ABNF.OPCODE_TEXT) -> int:
+    def send(self, payload, opcode=ABNF.OPCODE_TEXT):
         """
         Send the data as string.
 
-        Parameters
-        ----------
-        payload: str
-            Payload must be utf-8 string or unicode,
-            If the opcode is OPCODE_TEXT.
-            Otherwise, it must be string(byte array).
-        opcode: int
-            Operation code (opcode) to send.
+        payload: Payload must be utf-8 string or unicode,
+                  if the opcode is OPCODE_TEXT.
+                  Otherwise, it must be string(byte array)
+
+        opcode: operation code to send. Please see OPCODE_XXX.
         """
 
         frame = ABNF.create_frame(payload, opcode)
         return self.send_frame(frame)
 
-    def send_text(self, text_data: str) -> int:
-        """
-        Sends UTF-8 encoded text.
-        """
-        return self.send(text_data, ABNF.OPCODE_TEXT)
-
-    def send_bytes(self, data: Union[bytes, bytearray]) -> int:
-        """
-        Sends a sequence of bytes.
-        """
-        return self.send(data, ABNF.OPCODE_BINARY)
-
-    def send_frame(self, frame) -> int:
+    def send_frame(self, frame):
         """
         Send the data frame.
 
-        >>> ws = create_connection("ws://echo.websocket.events")
+        frame: frame data created  by ABNF.create_frame
+
+        >>> ws = create_connection("ws://echo.websocket.org/")
         >>> frame = ABNF.create_frame("Hello", ABNF.OPCODE_TEXT)
         >>> ws.send_frame(frame)
         >>> cont_frame = ABNF.create_frame("My name is ", ABNF.OPCODE_CONT, 0)
@@ -320,18 +302,13 @@ class WebSocket:
         >>> cont_frame = ABNF.create_frame("Foo Bar", ABNF.OPCODE_CONT, 1)
         >>> ws.send_frame(frame)
 
-        Parameters
-        ----------
-        frame: ABNF frame
-            frame data created by ABNF.create_frame
         """
         if self.get_mask_key:
             frame.get_mask_key = self.get_mask_key
         data = frame.format()
         length = len(data)
-        if isEnabledForTrace():
-            trace(f"++Sent raw: {repr(data)}")
-            trace(f"++Sent decoded: {frame.__str__()}")
+        trace("send: " + repr(data))
+
         with self.lock:
             while data:
                 l = self._send(data)
@@ -339,114 +316,71 @@ class WebSocket:
 
         return length
 
-    def send_binary(self, payload: bytes) -> int:
-        """
-        Send a binary message (OPCODE_BINARY).
-
-        Parameters
-        ----------
-        payload: bytes
-            payload of message to send.
-        """
+    def send_binary(self, payload):
         return self.send(payload, ABNF.OPCODE_BINARY)
 
-    def ping(self, payload: Union[str, bytes] = ""):
+    def ping(self, payload=""):
         """
-        Send ping data.
+        send ping data.
 
-        Parameters
-        ----------
-        payload: str
-            data payload to send server.
+        payload: data payload to send server.
         """
-        if isinstance(payload, str):
+        if isinstance(payload, six.text_type):
             payload = payload.encode("utf-8")
         self.send(payload, ABNF.OPCODE_PING)
 
-    def pong(self, payload: Union[str, bytes] = ""):
+    def pong(self, payload):
         """
-        Send pong data.
+        send pong data.
 
-        Parameters
-        ----------
-        payload: str
-            data payload to send server.
+        payload: data payload to send server.
         """
-        if isinstance(payload, str):
+        if isinstance(payload, six.text_type):
             payload = payload.encode("utf-8")
         self.send(payload, ABNF.OPCODE_PONG)
 
-    def recv(self) -> Union[str, bytes]:
+    def recv(self):
         """
         Receive string data(byte array) from the server.
 
-        Returns
-        ----------
-        data: string (byte array) value.
+        return value: string(byte array) value.
         """
-        with self.readlock:
-            opcode, data = self.recv_data()
-        if opcode == ABNF.OPCODE_TEXT:
-            data_received: Union[bytes, str] = data
-            if isinstance(data_received, bytes):
-                return data_received.decode("utf-8")
-            elif isinstance(data_received, str):
-                return data_received
-        elif opcode == ABNF.OPCODE_BINARY:
-            data_binary: bytes = data
-            return data_binary
+        opcode, data = self.recv_data()
+        if six.PY3 and opcode == ABNF.OPCODE_TEXT:
+            return data.decode("utf-8")
+        elif opcode == ABNF.OPCODE_TEXT or opcode == ABNF.OPCODE_BINARY:
+            return data
         else:
-            return ""
+            return ''
 
-    def recv_data(self, control_frame: bool = False) -> tuple:
+    def recv_data(self, control_frame=False):
         """
-        Receive data with operation code.
+        Recieve data with operation code.
 
-        Parameters
-        ----------
-        control_frame: bool
-            a boolean flag indicating whether to return control frame
-            data, defaults to False
+        control_frame: a boolean flag indicating whether to return control frame
+        data, defaults to False
 
-        Returns
-        -------
-        opcode, frame.data: tuple
-            tuple of operation code and string(byte array) value.
+        return  value: tuple of operation code and string(byte array) value.
         """
         opcode, frame = self.recv_data_frame(control_frame)
         return opcode, frame.data
 
-    def recv_data_frame(self, control_frame: bool = False) -> tuple:
+    def recv_data_frame(self, control_frame=False):
         """
-        Receive data with operation code.
+        Recieve data with operation code.
 
-        If a valid ping message is received, a pong response is sent.
+        control_frame: a boolean flag indicating whether to return control frame
+        data, defaults to False
 
-        Parameters
-        ----------
-        control_frame: bool
-            a boolean flag indicating whether to return control frame
-            data, defaults to False
-
-        Returns
-        -------
-        frame.opcode, frame: tuple
-            tuple of operation code and string(byte array) value.
+        return  value: tuple of operation code and string(byte array) value.
         """
         while True:
             frame = self.recv_frame()
-            if isEnabledForTrace():
-                trace(f"++Rcv raw: {repr(frame.format())}")
-                trace(f"++Rcv decoded: {frame.__str__()}")
             if not frame:
                 # handle error:
                 # 'NoneType' object has no attribute 'opcode'
-                raise WebSocketProtocolException(f"Not a valid frame {frame}")
-            elif frame.opcode in (
-                ABNF.OPCODE_TEXT,
-                ABNF.OPCODE_BINARY,
-                ABNF.OPCODE_CONT,
-            ):
+                raise WebSocketProtocolException("Not a valid frame %s" % frame)
+            elif frame.opcode in (ABNF.OPCODE_TEXT, ABNF.OPCODE_BINARY, ABNF.OPCODE_CONT):
                 self.cont_frame.validate(frame)
                 self.cont_frame.add(frame)
 
@@ -455,107 +389,86 @@ class WebSocket:
 
             elif frame.opcode == ABNF.OPCODE_CLOSE:
                 self.send_close()
-                return frame.opcode, frame
+                return (frame.opcode, frame)
             elif frame.opcode == ABNF.OPCODE_PING:
                 if len(frame.data) < 126:
                     self.pong(frame.data)
                 else:
                     raise WebSocketProtocolException("Ping message is too long")
                 if control_frame:
-                    return frame.opcode, frame
+                    return (frame.opcode, frame)
             elif frame.opcode == ABNF.OPCODE_PONG:
                 if control_frame:
-                    return frame.opcode, frame
+                    return (frame.opcode, frame)
 
     def recv_frame(self):
         """
-        Receive data as frame from server.
+        recieve data as frame from server.
 
-        Returns
-        -------
-        self.frame_buffer.recv_frame(): ABNF frame object
+        return value: ABNF frame object.
         """
         return self.frame_buffer.recv_frame()
 
-    def send_close(self, status: int = STATUS_NORMAL, reason: bytes = b""):
+    def send_close(self, status=STATUS_NORMAL, reason=six.b("")):
         """
-        Send close data to the server.
+        send close data to the server.
 
-        Parameters
-        ----------
-        status: int
-            Status code to send. See STATUS_XXX.
-        reason: str or bytes
-            The reason to close. This must be string or UTF-8 bytes.
+        status: status code to send. see STATUS_XXX.
+
+        reason: the reason to close. This must be string or bytes.
         """
         if status < 0 or status >= ABNF.LENGTH_16:
             raise ValueError("code is invalid range")
         self.connected = False
-        self.send(struct.pack("!H", status) + reason, ABNF.OPCODE_CLOSE)
+        self.send(struct.pack('!H', status) + reason, ABNF.OPCODE_CLOSE)
 
-    def close(self, status: int = STATUS_NORMAL, reason: bytes = b"", timeout: int = 3):
+    def close(self, status=STATUS_NORMAL, reason=six.b("")):
         """
         Close Websocket object
 
-        Parameters
-        ----------
-        status: int
-            Status code to send. See VALID_CLOSE_STATUS in ABNF.
-        reason: bytes
-            The reason to close in UTF-8.
-        timeout: int or float
-            Timeout until receive a close frame.
-            If None, it will wait forever until receive a close frame.
-        """
-        if not self.connected:
-            return
-        if status < 0 or status >= ABNF.LENGTH_16:
-            raise ValueError("code is invalid range")
+        status: status code to send. see STATUS_XXX.
 
-        try:
-            self.connected = False
-            self.send(struct.pack("!H", status) + reason, ABNF.OPCODE_CLOSE)
-            sock_timeout = self.sock.gettimeout()
-            self.sock.settimeout(timeout)
-            start_time = time.time()
-            while timeout is None or time.time() - start_time < timeout:
+        reason: the reason to close. This must be string.
+        """
+        if self.connected:
+            if status < 0 or status >= ABNF.LENGTH_16:
+                raise ValueError("code is invalid range")
+
+            try:
+                self.connected = False
+                self.send(struct.pack('!H', status) + reason, ABNF.OPCODE_CLOSE)
+                timeout = self.sock.gettimeout()
+                self.sock.settimeout(3)
                 try:
                     frame = self.recv_frame()
-                    if frame.opcode != ABNF.OPCODE_CLOSE:
-                        continue
                     if isEnabledForError():
-                        recv_status = struct.unpack("!H", frame.data[0:2])[0]
-                        if recv_status >= 3000 and recv_status <= 4999:
-                            debug(f"close status: {repr(recv_status)}")
-                        elif recv_status != STATUS_NORMAL:
-                            error(f"close status: {repr(recv_status)}")
-                    break
+                        recv_status = struct.unpack("!H", frame.data)[0]
+                        if recv_status != STATUS_NORMAL:
+                            error("close status: " + repr(recv_status))
                 except:
-                    break
-            self.sock.settimeout(sock_timeout)
-            self.sock.shutdown(socket.SHUT_RDWR)
-        except:
-            pass
+                    pass
+                self.sock.settimeout(timeout)
+                self.sock.shutdown(socket.SHUT_RDWR)
+            except:
+                pass
 
         self.shutdown()
 
     def abort(self):
         """
-        Low-level asynchronous abort, wakes up other threads that are waiting in recv_*
+        Low-level asynchonous abort, wakes up other threads that are waiting in recv_*
         """
         if self.connected:
             self.sock.shutdown(socket.SHUT_RDWR)
 
     def shutdown(self):
-        """
-        close socket, immediately.
-        """
+        "close socket, immediately."
         if self.sock:
             self.sock.close()
             self.sock = None
             self.connected = False
 
-    def _send(self, data: Union[str, bytes]):
+    def _send(self, data):
         return send(self.sock, data)
 
     def _recv(self, bufsize):
@@ -567,81 +480,3 @@ class WebSocket:
             self.sock = None
             self.connected = False
             raise
-
-
-def create_connection(url: str, timeout=None, class_=WebSocket, **options):
-    """
-    Connect to url and return websocket object.
-
-    Connect to url and return the WebSocket object.
-    Passing optional timeout parameter will set the timeout on the socket.
-    If no timeout is supplied,
-    the global default timeout setting returned by getdefaulttimeout() is used.
-    You can customize using 'options'.
-    If you set "header" list object, you can set your own custom header.
-
-    >>> conn = create_connection("ws://echo.websocket.events",
-         ...     header=["User-Agent: MyProgram",
-         ...             "x-custom: header"])
-
-    Parameters
-    ----------
-    class_: class
-        class to instantiate when creating the connection. It has to implement
-        settimeout and connect. It's __init__ should be compatible with
-        WebSocket.__init__, i.e. accept all of it's kwargs.
-    header: list or dict
-        custom http header list or dict.
-    cookie: str
-        Cookie value.
-    origin: str
-        custom origin url.
-    suppress_origin: bool
-        suppress outputting origin header.
-    host: str
-        custom host header string.
-    timeout: int or float
-        socket timeout time. This value could be either float/integer.
-        If set to None, it uses the default_timeout value.
-    http_proxy_host: str
-        HTTP proxy host name.
-    http_proxy_port: str or int
-        HTTP proxy port. If not set, set to 80.
-    http_no_proxy: list
-        Whitelisted host names that don't use the proxy.
-    http_proxy_auth: tuple
-        HTTP proxy auth information. tuple of username and password. Default is None.
-    http_proxy_timeout: int or float
-        HTTP proxy timeout, default is 60 sec as per python-socks.
-    enable_multithread: bool
-        Enable lock for multithread.
-    redirect_limit: int
-        Number of redirects to follow.
-    sockopt: tuple
-        Values for socket.setsockopt.
-        sockopt must be a tuple and each element is an argument of sock.setsockopt.
-    sslopt: dict
-        Optional dict object for ssl socket options. See FAQ for details.
-    subprotocols: list
-        List of available subprotocols. Default is None.
-    skip_utf8_validation: bool
-        Skip utf8 validation.
-    socket: socket
-        Pre-initialized stream socket.
-    """
-    sockopt = options.pop("sockopt", [])
-    sslopt = options.pop("sslopt", {})
-    fire_cont_frame = options.pop("fire_cont_frame", False)
-    enable_multithread = options.pop("enable_multithread", True)
-    skip_utf8_validation = options.pop("skip_utf8_validation", False)
-    websock = class_(
-        sockopt=sockopt,
-        sslopt=sslopt,
-        fire_cont_frame=fire_cont_frame,
-        enable_multithread=enable_multithread,
-        skip_utf8_validation=skip_utf8_validation,
-        **options,
-    )
-    websock.settimeout(timeout if timeout is not None else getdefaulttimeout())
-    websock.connect(url, **options)
-    return websock
diff --git a/lib/websocket/_exceptions.py b/lib/websocket/_exceptions.py
index cd196e44..9b1791d9 100644
--- a/lib/websocket/_exceptions.py
+++ b/lib/websocket/_exceptions.py
@@ -1,94 +1,65 @@
 """
-_exceptions.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright (C) 2010 Hiroki Ohtani(liris)
 
-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
+    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.
 
-    http://www.apache.org/licenses/LICENSE-2.0
+    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-1335  USA
 
-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.
 """
 
 
+"""
+define websocket exceptions
+"""
+
 class WebSocketException(Exception):
     """
-    WebSocket exception class.
+    websocket exeception class.
     """
-
     pass
 
-
 class WebSocketProtocolException(WebSocketException):
     """
-    If the WebSocket protocol is invalid, this exception will be raised.
+    If the webscoket protocol is invalid, this exception will be raised.
     """
-
     pass
 
-
 class WebSocketPayloadException(WebSocketException):
     """
-    If the WebSocket payload is invalid, this exception will be raised.
+    If the webscoket payload is invalid, this exception will be raised.
     """
-
     pass
 
-
 class WebSocketConnectionClosedException(WebSocketException):
     """
     If remote host closed the connection or some network error happened,
     this exception will be raised.
     """
-
     pass
 
-
 class WebSocketTimeoutException(WebSocketException):
     """
     WebSocketTimeoutException will be raised at socket timeout during read/write data.
     """
-
     pass
 
-
 class WebSocketProxyException(WebSocketException):
     """
-    WebSocketProxyException will be raised when proxy error occurred.
+    WebSocketProxyException will be raised when proxy error occured.
     """
-
     pass
 
 
-class WebSocketBadStatusException(WebSocketException):
-    """
-    WebSocketBadStatusException will be raised when we get bad handshake status code.
-    """
-
-    def __init__(
-        self,
-        message: str,
-        status_code: int,
-        status_message=None,
-        resp_headers=None,
-        resp_body=None,
-    ):
-        super().__init__(message)
-        self.status_code = status_code
-        self.resp_headers = resp_headers
-        self.resp_body = resp_body
-
-
-class WebSocketAddressException(WebSocketException):
-    """
-    If the websocket address info cannot be found, this exception will be raised.
-    """
-
-    pass
diff --git a/lib/websocket/_handshake.py b/lib/websocket/_handshake.py
index 7bd61b82..d8876e75 100644
--- a/lib/websocket/_handshake.py
+++ b/lib/websocket/_handshake.py
@@ -1,70 +1,61 @@
 """
-_handshake.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright (C) 2010 Hiroki Ohtani(liris)
 
-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
+    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.
 
-    http://www.apache.org/licenses/LICENSE-2.0
+    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-1335  USA
 
-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.
 """
+
+import six
+if six.PY3:
+    from base64 import encodebytes as base64encode
+else:
+    from base64 import encodestring as base64encode
+
+import uuid
 import hashlib
-import hmac
-import os
-from base64 import encodebytes as base64encode
-from http import HTTPStatus
 
-from ._cookiejar import SimpleCookieJar
-from ._exceptions import WebSocketException, WebSocketBadStatusException
-from ._http import read_headers
-from ._logging import dump, error
-from ._socket import send
+from ._logging import *
+from ._url import *
+from ._socket import*
+from ._http import *
+from ._exceptions import *
 
-__all__ = ["handshake_response", "handshake", "SUPPORTED_REDIRECT_STATUSES"]
+__all__ = ["handshake_response", "handshake"]
 
 # websocket supported version.
 VERSION = 13
 
-SUPPORTED_REDIRECT_STATUSES = (
-    HTTPStatus.MOVED_PERMANENTLY,
-    HTTPStatus.FOUND,
-    HTTPStatus.SEE_OTHER,
-    HTTPStatus.TEMPORARY_REDIRECT,
-    HTTPStatus.PERMANENT_REDIRECT,
-)
-SUCCESS_STATUSES = SUPPORTED_REDIRECT_STATUSES + (HTTPStatus.SWITCHING_PROTOCOLS,)
 
-CookieJar = SimpleCookieJar()
-
-
-class handshake_response:
-    def __init__(self, status: int, headers: dict, subprotocol):
+class handshake_response(object):
+    def __init__(self, status, headers, subprotocol):
         self.status = status
         self.headers = headers
         self.subprotocol = subprotocol
-        CookieJar.add(headers.get("set-cookie"))
 
 
-def handshake(
-    sock, url: str, hostname: str, port: int, resource: str, **options
-) -> handshake_response:
-    headers, key = _get_handshake_headers(resource, url, hostname, port, options)
+def handshake(sock, hostname, port, resource, **options):
+    headers, key = _get_handshake_headers(resource, hostname, port, options)
 
     header_str = "\r\n".join(headers)
     send(sock, header_str)
     dump("request header", header_str)
 
     status, resp = _get_resp_headers(sock)
-    if status in SUPPORTED_REDIRECT_STATUSES:
-        return handshake_response(status, resp, None)
     success, subproto = _validate(resp, key, options.get("subprotocols"))
     if not success:
         raise WebSocketException("Invalid WebSocket Header")
@@ -72,131 +63,93 @@ def handshake(
     return handshake_response(status, resp, subproto)
 
 
-def _pack_hostname(hostname: str) -> str:
-    # IPv6 address
-    if ":" in hostname:
-        return f"[{hostname}]"
-    return hostname
-
-
-def _get_handshake_headers(
-    resource: str, url: str, host: str, port: int, options: dict
-) -> tuple:
-    headers = [f"GET {resource} HTTP/1.1", "Upgrade: websocket"]
-    if port in [80, 443]:
-        hostport = _pack_hostname(host)
+def _get_handshake_headers(resource, host, port, options):
+    headers = []
+    headers.append("GET %s HTTP/1.1" % resource)
+    headers.append("Upgrade: websocket")
+    headers.append("Connection: Upgrade")
+    if port == 80:
+        hostport = host
     else:
-        hostport = f"{_pack_hostname(host)}:{port}"
-    if options.get("host"):
-        headers.append(f'Host: {options["host"]}')
-    else:
-        headers.append(f"Host: {hostport}")
+        hostport = "%s:%d" % (host, port)
 
-    # scheme indicates whether http or https is used in Origin
-    # The same approach is used in parse_url of _url.py to set default port
-    scheme, url = url.split(":", 1)
-    if not options.get("suppress_origin"):
-        if "origin" in options and options["origin"] is not None:
-            headers.append(f'Origin: {options["origin"]}')
-        elif scheme == "wss":
-            headers.append(f"Origin: https://{hostport}")
-        else:
-            headers.append(f"Origin: http://{hostport}")
+    if "host" in options and options["host"]:
+        headers.append("Host: %s" % options["host"])
+    else:
+        headers.append("Host: %s" % hostport)
+
+    if "origin" in options and options["origin"]:
+        headers.append("Origin: %s" % options["origin"])
+    else:
+        headers.append("Origin: http://%s" % hostport)
 
     key = _create_sec_websocket_key()
+    headers.append("Sec-WebSocket-Key: %s" % key)
+    headers.append("Sec-WebSocket-Version: %s" % VERSION)
 
-    # Append Sec-WebSocket-Key & Sec-WebSocket-Version if not manually specified
-    if not options.get("header") or "Sec-WebSocket-Key" not in options["header"]:
-        headers.append(f"Sec-WebSocket-Key: {key}")
-    else:
-        key = options["header"]["Sec-WebSocket-Key"]
+    subprotocols = options.get("subprotocols")
+    if subprotocols:
+        headers.append("Sec-WebSocket-Protocol: %s" % ",".join(subprotocols))
 
-    if not options.get("header") or "Sec-WebSocket-Version" not in options["header"]:
-        headers.append(f"Sec-WebSocket-Version: {VERSION}")
+    if "header" in options:
+        headers.extend(options["header"])
 
-    if not options.get("connection"):
-        headers.append("Connection: Upgrade")
-    else:
-        headers.append(options["connection"])
+    cookie = options.get("cookie", None)
 
-    if subprotocols := options.get("subprotocols"):
-        headers.append(f'Sec-WebSocket-Protocol: {",".join(subprotocols)}')
+    if cookie:
+        headers.append("Cookie: %s" % cookie)
 
-    if header := options.get("header"):
-        if isinstance(header, dict):
-            header = [": ".join([k, v]) for k, v in header.items() if v is not None]
-        headers.extend(header)
+    headers.append("")
+    headers.append("")
 
-    server_cookie = CookieJar.get(host)
-    client_cookie = options.get("cookie", None)
-
-    if cookie := "; ".join(filter(None, [server_cookie, client_cookie])):
-        headers.append(f"Cookie: {cookie}")
-
-    headers.extend(("", ""))
     return headers, key
 
 
-def _get_resp_headers(sock, success_statuses: tuple = SUCCESS_STATUSES) -> tuple:
-    status, resp_headers, status_message = read_headers(sock)
-    if status not in success_statuses:
-        content_len = resp_headers.get("content-length")
-        if content_len:
-            response_body = sock.recv(
-                int(content_len)
-            )  # read the body of the HTTP error message response and include it in the exception
-        else:
-            response_body = None
-        raise WebSocketBadStatusException(
-            f"Handshake status {status} {status_message} -+-+- {resp_headers} -+-+- {response_body}",
-            status,
-            status_message,
-            resp_headers,
-            response_body,
-        )
+def _get_resp_headers(sock, success_status=101):
+    status, resp_headers = read_headers(sock)
+    if status != success_status:
+        raise WebSocketException("Handshake status %d" % status)
     return status, resp_headers
 
-
 _HEADERS_TO_CHECK = {
     "upgrade": "websocket",
     "connection": "upgrade",
-}
+    }
 
 
-def _validate(headers, key: str, subprotocols) -> tuple:
+def _validate(headers, key, subprotocols):
     subproto = None
     for k, v in _HEADERS_TO_CHECK.items():
         r = headers.get(k, None)
         if not r:
             return False, None
-        r = [x.strip().lower() for x in r.split(",")]
-        if v not in r:
+        r = r.lower()
+        if v != r:
             return False, None
 
     if subprotocols:
-        subproto = headers.get("sec-websocket-protocol", None)
-        if not subproto or subproto.lower() not in [s.lower() for s in subprotocols]:
-            error(f"Invalid subprotocol: {subprotocols}")
+        subproto = headers.get("sec-websocket-protocol", None).lower()
+        if not subproto or subproto not in [s.lower() for s in subprotocols]:
+            error("Invalid subprotocol: " + str(subprotocols))
             return False, None
-        subproto = subproto.lower()
 
     result = headers.get("sec-websocket-accept", None)
     if not result:
         return False, None
     result = result.lower()
 
-    if isinstance(result, str):
-        result = result.encode("utf-8")
+    if isinstance(result, six.text_type):
+        result = result.encode('utf-8')
 
-    value = f"{key}258EAFA5-E914-47DA-95CA-C5AB0DC85B11".encode("utf-8")
+    value = (key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11").encode('utf-8')
     hashed = base64encode(hashlib.sha1(value).digest()).strip().lower()
-
-    if hmac.compare_digest(hashed, result):
+    success = (hashed == result)
+    if success:
         return True, subproto
     else:
         return False, None
 
 
-def _create_sec_websocket_key() -> str:
-    randomness = os.urandom(16)
-    return base64encode(randomness).decode("utf-8").strip()
+def _create_sec_websocket_key():
+    uid = uuid.uuid4()
+    return base64encode(uid.bytes).decode('utf-8').strip()
diff --git a/lib/websocket/_http.py b/lib/websocket/_http.py
index 9b1bf859..7b4e55e6 100644
--- a/lib/websocket/_http.py
+++ b/lib/websocket/_http.py
@@ -1,150 +1,68 @@
 """
-_http.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright (C) 2010 Hiroki Ohtani(liris)
 
-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
+    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.
 
-    http://www.apache.org/licenses/LICENSE-2.0
+    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-1335  USA
 
-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.
 """
+
+import six
+import socket
 import errno
 import os
-import socket
-from base64 import encodebytes as base64encode
+import sys
 
-from ._exceptions import (
-    WebSocketAddressException,
-    WebSocketException,
-    WebSocketProxyException,
-)
-from ._logging import debug, dump, trace
-from ._socket import DEFAULT_SOCKET_OPTION, recv_line, send
-from ._ssl_compat import HAVE_SSL, ssl
-from ._url import get_proxy_info, parse_url
+if six.PY3:
+    from base64 import encodebytes as base64encode
+else:
+    from base64 import encodestring as base64encode
+
+from ._logging import *
+from ._url import *
+from ._socket import*
+from ._exceptions import *
+from ._ssl_compat import *
 
 __all__ = ["proxy_info", "connect", "read_headers"]
 
-try:
-    from python_socks._errors import *
-    from python_socks._types import ProxyType
-    from python_socks.sync import Proxy
-
-    HAVE_PYTHON_SOCKS = True
-except:
-    HAVE_PYTHON_SOCKS = False
-
-    class ProxyError(Exception):
-        pass
-
-    class ProxyTimeoutError(Exception):
-        pass
-
-    class ProxyConnectionError(Exception):
-        pass
-
-
-class proxy_info:
+class proxy_info(object):
     def __init__(self, **options):
-        self.proxy_host = options.get("http_proxy_host", None)
-        if self.proxy_host:
-            self.proxy_port = options.get("http_proxy_port", 0)
-            self.auth = options.get("http_proxy_auth", None)
+        self.host = options.get("http_proxy_host", None)
+        if self.host:
+            self.port = options.get("http_proxy_port", 0)
+            self.auth =  options.get("http_proxy_auth", None)
             self.no_proxy = options.get("http_no_proxy", None)
-            self.proxy_protocol = options.get("proxy_type", "http")
-            # Note: If timeout not specified, default python-socks timeout is 60 seconds
-            self.proxy_timeout = options.get("http_proxy_timeout", None)
-            if self.proxy_protocol not in [
-                "http",
-                "socks4",
-                "socks4a",
-                "socks5",
-                "socks5h",
-            ]:
-                raise ProxyError(
-                    "Only http, socks4, socks5 proxy protocols are supported"
-                )
         else:
-            self.proxy_port = 0
+            self.port = 0
             self.auth = None
             self.no_proxy = None
-            self.proxy_protocol = "http"
-
-
-def _start_proxied_socket(url: str, options, proxy) -> tuple:
-    if not HAVE_PYTHON_SOCKS:
-        raise WebSocketException(
-            "Python Socks is needed for SOCKS proxying but is not available"
-        )
 
+def connect(url, options, proxy):
     hostname, port, resource, is_secure = parse_url(url)
-
-    if proxy.proxy_protocol == "socks4":
-        rdns = False
-        proxy_type = ProxyType.SOCKS4
-    # socks4a sends DNS through proxy
-    elif proxy.proxy_protocol == "socks4a":
-        rdns = True
-        proxy_type = ProxyType.SOCKS4
-    elif proxy.proxy_protocol == "socks5":
-        rdns = False
-        proxy_type = ProxyType.SOCKS5
-    # socks5h sends DNS through proxy
-    elif proxy.proxy_protocol == "socks5h":
-        rdns = True
-        proxy_type = ProxyType.SOCKS5
-
-    ws_proxy = Proxy.create(
-        proxy_type=proxy_type,
-        host=proxy.proxy_host,
-        port=int(proxy.proxy_port),
-        username=proxy.auth[0] if proxy.auth else None,
-        password=proxy.auth[1] if proxy.auth else None,
-        rdns=rdns,
-    )
-
-    sock = ws_proxy.connect(hostname, port, timeout=proxy.proxy_timeout)
-
-    if is_secure:
-        if HAVE_SSL:
-            sock = _ssl_socket(sock, options.sslopt, hostname)
-        else:
-            raise WebSocketException("SSL not available.")
-
-    return sock, (hostname, port, resource)
-
-
-def connect(url: str, options, proxy, socket):
-    # Use _start_proxied_socket() only for socks4 or socks5 proxy
-    # Use _tunnel() for http proxy
-    # TODO: Use python-socks for http protocol also, to standardize flow
-    if proxy.proxy_host and not socket and proxy.proxy_protocol != "http":
-        return _start_proxied_socket(url, options, proxy)
-
-    hostname, port_from_url, resource, is_secure = parse_url(url)
-
-    if socket:
-        return socket, (hostname, port_from_url, resource)
-
-    addrinfo_list, need_tunnel, auth = _get_addrinfo_list(
-        hostname, port_from_url, is_secure, proxy
-    )
+    addrinfo_list, need_tunnel, auth = _get_addrinfo_list(hostname, port, is_secure, proxy)
     if not addrinfo_list:
-        raise WebSocketException(f"Host not found.: {hostname}:{port_from_url}")
+        raise WebSocketException(
+            "Host not found.: " + hostname + ":" + str(port))
 
     sock = None
     try:
         sock = _open_socket(addrinfo_list, options.sockopt, options.timeout)
         if need_tunnel:
-            sock = _tunnel(sock, hostname, port_from_url, auth)
+            sock = _tunnel(sock, hostname, port, auth)
 
         if is_secure:
             if HAVE_SSL:
@@ -152,50 +70,30 @@ def connect(url: str, options, proxy, socket):
             else:
                 raise WebSocketException("SSL not available.")
 
-        return sock, (hostname, port_from_url, resource)
+        return sock, (hostname, port, resource)
     except:
         if sock:
             sock.close()
         raise
 
 
-def _get_addrinfo_list(hostname, port: int, is_secure: bool, proxy) -> tuple:
-    phost, pport, pauth = get_proxy_info(
-        hostname,
-        is_secure,
-        proxy.proxy_host,
-        proxy.proxy_port,
-        proxy.auth,
-        proxy.no_proxy,
-    )
-    try:
-        # when running on windows 10, getaddrinfo without socktype returns a socktype 0.
-        # This generates an error exception: `_on_error: exception Socket type must be stream or datagram, not 0`
-        # or `OSError: [Errno 22] Invalid argument` when creating socket. Force the socket type to SOCK_STREAM.
-        if not phost:
-            addrinfo_list = socket.getaddrinfo(
-                hostname, port, 0, socket.SOCK_STREAM, socket.SOL_TCP
-            )
-            return addrinfo_list, False, None
-        else:
-            pport = pport and pport or 80
-            # when running on windows 10, the getaddrinfo used above
-            # returns a socktype 0. This generates an error exception:
-            # _on_error: exception Socket type must be stream or datagram, not 0
-            # Force the socket type to SOCK_STREAM
-            addrinfo_list = socket.getaddrinfo(
-                phost, pport, 0, socket.SOCK_STREAM, socket.SOL_TCP
-            )
-            return addrinfo_list, True, pauth
-    except socket.gaierror as e:
-        raise WebSocketAddressException(e)
+def _get_addrinfo_list(hostname, port, is_secure, proxy):
+    phost, pport, pauth = get_proxy_info(hostname, is_secure,
+        proxy.host, proxy.port, proxy.auth, proxy.no_proxy)
+    if not phost:
+        addrinfo_list = socket.getaddrinfo(hostname, port, 0, 0, socket.SOL_TCP)
+        return addrinfo_list, False, None
+    else:
+        pport = pport and pport or 80
+        addrinfo_list = socket.getaddrinfo(phost, pport, 0, 0, socket.SOL_TCP)
+        return addrinfo_list, True, pauth
 
 
 def _open_socket(addrinfo_list, sockopt, timeout):
     err = None
     for addrinfo in addrinfo_list:
-        family, socktype, proto = addrinfo[:3]
-        sock = socket.socket(family, socktype, proto)
+        family = addrinfo[0]
+        sock = socket.socket(family)
         sock.settimeout(timeout)
         for opts in DEFAULT_SOCKET_OPTION:
             sock.setsockopt(*opts)
@@ -203,171 +101,115 @@ def _open_socket(addrinfo_list, sockopt, timeout):
             sock.setsockopt(*opts)
 
         address = addrinfo[4]
-        err = None
-        while not err:
-            try:
-                sock.connect(address)
-            except socket.error as error:
-                sock.close()
-                error.remote_ip = str(address[0])
-                try:
-                    eConnRefused = (
-                        errno.ECONNREFUSED,
-                        errno.WSAECONNREFUSED,
-                        errno.ENETUNREACH,
-                    )
-                except AttributeError:
-                    eConnRefused = (errno.ECONNREFUSED, errno.ENETUNREACH)
-                if error.errno not in eConnRefused:
-                    raise error
+        try:
+            sock.connect(address)
+        except socket.error as error:
+            error.remote_ip = str(address[0])
+            if error.errno in (errno.ECONNREFUSED, ):
                 err = error
                 continue
             else:
-                break
+                raise
         else:
-            continue
-        break
+            break
     else:
-        if err:
-            raise err
+        raise err
 
     return sock
 
 
-def _wrap_sni_socket(sock: socket.socket, sslopt: dict, hostname, check_hostname):
-    context = sslopt.get("context", None)
-    if not context:
-        context = ssl.SSLContext(sslopt.get("ssl_version", ssl.PROTOCOL_TLS_CLIENT))
-        # Non default context need to manually enable SSLKEYLOGFILE support by setting the keylog_filename attribute.
-        # For more details see also:
-        # * https://docs.python.org/3.8/library/ssl.html?highlight=sslkeylogfile#context-creation
-        # * https://docs.python.org/3.8/library/ssl.html?highlight=sslkeylogfile#ssl.SSLContext.keylog_filename
-        context.keylog_filename = os.environ.get("SSLKEYLOGFILE", None)
+def _can_use_sni():
+    return (six.PY2 and sys.version_info[1] >= 7 and sys.version_info[2] >= 9) or (six.PY3 and sys.version_info[2] >= 2)
 
-        if sslopt.get("cert_reqs", ssl.CERT_NONE) != ssl.CERT_NONE:
-            cafile = sslopt.get("ca_certs", None)
-            capath = sslopt.get("ca_cert_path", None)
-            if cafile or capath:
-                context.load_verify_locations(cafile=cafile, capath=capath)
-            elif hasattr(context, "load_default_certs"):
-                context.load_default_certs(ssl.Purpose.SERVER_AUTH)
-        if sslopt.get("certfile", None):
-            context.load_cert_chain(
-                sslopt["certfile"],
-                sslopt.get("keyfile", None),
-                sslopt.get("password", None),
-            )
 
-        # Python 3.10 switch to PROTOCOL_TLS_CLIENT defaults to "cert_reqs = ssl.CERT_REQUIRED" and "check_hostname = True"
-        # If both disabled, set check_hostname before verify_mode
-        # see https://github.com/liris/websocket-client/commit/b96a2e8fa765753e82eea531adb19716b52ca3ca#commitcomment-10803153
-        if sslopt.get("cert_reqs", ssl.CERT_NONE) == ssl.CERT_NONE and not sslopt.get(
-            "check_hostname", False
-        ):
-            context.check_hostname = False
-            context.verify_mode = ssl.CERT_NONE
-        else:
-            context.check_hostname = sslopt.get("check_hostname", True)
-            context.verify_mode = sslopt.get("cert_reqs", ssl.CERT_REQUIRED)
+def _wrap_sni_socket(sock, sslopt, hostname, check_hostname):
+    context = ssl.SSLContext(sslopt.get('ssl_version', ssl.PROTOCOL_SSLv23))
 
-        if "ciphers" in sslopt:
-            context.set_ciphers(sslopt["ciphers"])
-        if "cert_chain" in sslopt:
-            certfile, keyfile, password = sslopt["cert_chain"]
-            context.load_cert_chain(certfile, keyfile, password)
-        if "ecdh_curve" in sslopt:
-            context.set_ecdh_curve(sslopt["ecdh_curve"])
+    context.load_verify_locations(cafile=sslopt.get('ca_certs', None))
+    # see https://github.com/liris/websocket-client/commit/b96a2e8fa765753e82eea531adb19716b52ca3ca#commitcomment-10803153
+    context.verify_mode = sslopt['cert_reqs']
+    if HAVE_CONTEXT_CHECK_HOSTNAME:
+        context.check_hostname = check_hostname
+    if 'ciphers' in sslopt:
+        context.set_ciphers(sslopt['ciphers'])
 
     return context.wrap_socket(
         sock,
-        do_handshake_on_connect=sslopt.get("do_handshake_on_connect", True),
-        suppress_ragged_eofs=sslopt.get("suppress_ragged_eofs", True),
+        do_handshake_on_connect=sslopt.get('do_handshake_on_connect', True),
+        suppress_ragged_eofs=sslopt.get('suppress_ragged_eofs', True),
         server_hostname=hostname,
     )
 
 
-def _ssl_socket(sock: socket.socket, user_sslopt: dict, hostname):
-    sslopt: dict = {"cert_reqs": ssl.CERT_REQUIRED}
+def _ssl_socket(sock, user_sslopt, hostname):
+    sslopt = dict(cert_reqs=ssl.CERT_REQUIRED)
+    certPath = os.path.join(
+        os.path.dirname(__file__), "cacert.pem")
+    if os.path.isfile(certPath):
+        sslopt['ca_certs'] = certPath
     sslopt.update(user_sslopt)
+    check_hostname = sslopt["cert_reqs"] != ssl.CERT_NONE and sslopt.pop('check_hostname', True)
 
-    cert_path = os.environ.get("WEBSOCKET_CLIENT_CA_BUNDLE")
-    if (
-        cert_path
-        and os.path.isfile(cert_path)
-        and user_sslopt.get("ca_certs", None) is None
-    ):
-        sslopt["ca_certs"] = cert_path
-    elif (
-        cert_path
-        and os.path.isdir(cert_path)
-        and user_sslopt.get("ca_cert_path", None) is None
-    ):
-        sslopt["ca_cert_path"] = cert_path
+    if _can_use_sni():
+        sock = _wrap_sni_socket(sock, sslopt, hostname, check_hostname)
+    else:
+        sslopt.pop('check_hostname', True)
+        sock = ssl.wrap_socket(sock, **sslopt)
 
-    if sslopt.get("server_hostname", None):
-        hostname = sslopt["server_hostname"]
-
-    check_hostname = sslopt.get("check_hostname", True)
-    sock = _wrap_sni_socket(sock, sslopt, hostname, check_hostname)
+    if not HAVE_CONTEXT_CHECK_HOSTNAME and check_hostname:
+        match_hostname(sock.getpeercert(), hostname)
 
     return sock
 
-
-def _tunnel(sock: socket.socket, host, port: int, auth) -> socket.socket:
+def _tunnel(sock, host, port, auth):
     debug("Connecting proxy...")
-    connect_header = f"CONNECT {host}:{port} HTTP/1.1\r\n"
-    connect_header += f"Host: {host}:{port}\r\n"
-
+    connect_header = "CONNECT %s:%d HTTP/1.0\r\n" % (host, port)
     # TODO: support digest auth.
     if auth and auth[0]:
         auth_str = auth[0]
         if auth[1]:
-            auth_str += f":{auth[1]}"
-        encoded_str = base64encode(auth_str.encode()).strip().decode().replace("\n", "")
-        connect_header += f"Proxy-Authorization: Basic {encoded_str}\r\n"
+            auth_str += ":" + auth[1]
+        encoded_str = base64encode(auth_str.encode()).strip().decode()
+        connect_header += "Proxy-Authorization: Basic %s\r\n" % encoded_str
     connect_header += "\r\n"
     dump("request header", connect_header)
 
     send(sock, connect_header)
 
     try:
-        status, _, _ = read_headers(sock)
+        status, resp_headers = read_headers(sock)
     except Exception as e:
         raise WebSocketProxyException(str(e))
 
     if status != 200:
-        raise WebSocketProxyException(f"failed CONNECT via proxy status: {status}")
-
+        raise WebSocketProxyException(
+            "failed CONNECT via proxy status: %r" + status)
+    
     return sock
 
-
-def read_headers(sock: socket.socket) -> tuple:
+def read_headers(sock):
     status = None
-    status_message = None
-    headers: dict = {}
+    headers = {}
     trace("--- response header ---")
 
     while True:
         line = recv_line(sock)
-        line = line.decode("utf-8").strip()
+        line = line.decode('utf-8').strip()
         if not line:
             break
         trace(line)
         if not status:
+
             status_info = line.split(" ", 2)
             status = int(status_info[1])
-            if len(status_info) > 2:
-                status_message = status_info[2]
         else:
             kv = line.split(":", 1)
-            if len(kv) != 2:
-                raise WebSocketException("Invalid header")
-            key, value = kv
-            if key.lower() == "set-cookie" and headers.get("set-cookie"):
-                headers["set-cookie"] = headers.get("set-cookie") + "; " + value.strip()
+            if len(kv) == 2:
+                key, value = kv
+                headers[key.lower()] = value.strip().lower()
             else:
-                headers[key.lower()] = value.strip()
+                raise WebSocketException("Invalid header")
 
     trace("-----------------------")
 
-    return status, headers, status_message
+    return status, headers
diff --git a/lib/websocket/_logging.py b/lib/websocket/_logging.py
index 0f673d3a..1d2d5de5 100644
--- a/lib/websocket/_logging.py
+++ b/lib/websocket/_logging.py
@@ -1,106 +1,71 @@
-import logging
-
 """
-_logging.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright (C) 2010 Hiroki Ohtani(liris)
 
-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
+    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.
 
-    http://www.apache.org/licenses/LICENSE-2.0
+    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-1335  USA
 
-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.
 """
 
-_logger = logging.getLogger("websocket")
-try:
-    from logging import NullHandler
-except ImportError:
-
-    class NullHandler(logging.Handler):
-        def emit(self, record) -> None:
-            pass
-
-
-_logger.addHandler(NullHandler())
+import logging
 
+_logger = logging.getLogger()
 _traceEnabled = False
 
-__all__ = [
-    "enableTrace",
-    "dump",
-    "error",
-    "warning",
-    "debug",
-    "trace",
-    "isEnabledForError",
-    "isEnabledForDebug",
-    "isEnabledForTrace",
-]
+__all__ = ["enableTrace", "dump", "error", "debug", "trace",
+           "isEnabledForError", "isEnabledForDebug"]
 
 
-def enableTrace(
-    traceable: bool,
-    handler: logging.StreamHandler = logging.StreamHandler(),
-    level: str = "DEBUG",
-) -> None:
+def enableTrace(tracable):
     """
-    Turn on/off the traceability.
+    turn on/off the tracability.
 
-    Parameters
-    ----------
-    traceable: bool
-        If set to True, traceability is enabled.
+    tracable: boolean value. if set True, tracability is enabled.
     """
     global _traceEnabled
-    _traceEnabled = traceable
-    if traceable:
-        _logger.addHandler(handler)
-        _logger.setLevel(getattr(logging, level))
+    _traceEnabled = tracable
+    if tracable:
+        if not _logger.handlers:
+            _logger.addHandler(logging.StreamHandler())
+        _logger.setLevel(logging.DEBUG)
 
 
-def dump(title: str, message: str) -> None:
+def dump(title, message):
     if _traceEnabled:
-        _logger.debug(f"--- {title} ---")
+        _logger.debug("--- " + title + " ---")
         _logger.debug(message)
         _logger.debug("-----------------------")
 
 
-def error(msg: str) -> None:
+def error(msg):
     _logger.error(msg)
 
 
-def warning(msg: str) -> None:
-    _logger.warning(msg)
-
-
-def debug(msg: str) -> None:
+def debug(msg):
     _logger.debug(msg)
 
 
-def info(msg: str) -> None:
-    _logger.info(msg)
-
-
-def trace(msg: str) -> None:
+def trace(msg):
     if _traceEnabled:
         _logger.debug(msg)
 
 
-def isEnabledForError() -> bool:
+def isEnabledForError():
     return _logger.isEnabledFor(logging.ERROR)
 
 
-def isEnabledForDebug() -> bool:
+def isEnabledForDebug():
     return _logger.isEnabledFor(logging.DEBUG)
-
-
-def isEnabledForTrace() -> bool:
-    return _traceEnabled
diff --git a/lib/websocket/_socket.py b/lib/websocket/_socket.py
index 81094ffc..315c8080 100644
--- a/lib/websocket/_socket.py
+++ b/lib/websocket/_socket.py
@@ -1,34 +1,32 @@
-import errno
-import selectors
-import socket
-from typing import Union
-
-from ._exceptions import (
-    WebSocketConnectionClosedException,
-    WebSocketTimeoutException,
-)
-from ._ssl_compat import SSLError, SSLWantReadError, SSLWantWriteError
-from ._utils import extract_error_code, extract_err_message
-
 """
-_socket.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright (C) 2010 Hiroki Ohtani(liris)
 
-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
+    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.
 
-    http://www.apache.org/licenses/LICENSE-2.0
+    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-1335  USA
 
-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.
 """
 
+import socket
+import six
+
+from ._exceptions import *
+from ._utils import *
+from ._ssl_compat import *
+
 DEFAULT_SOCKET_OPTION = [(socket.SOL_TCP, socket.TCP_NODELAY, 1)]
 if hasattr(socket, "SO_KEEPALIVE"):
     DEFAULT_SOCKET_OPTION.append((socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1))
@@ -41,19 +39,11 @@ if hasattr(socket, "TCP_KEEPCNT"):
 
 _default_timeout = None
 
-__all__ = [
-    "DEFAULT_SOCKET_OPTION",
-    "sock_opt",
-    "setdefaulttimeout",
-    "getdefaulttimeout",
-    "recv",
-    "recv_line",
-    "send",
-]
+__all__ = ["DEFAULT_SOCKET_OPTION", "sock_opt", "setdefaulttimeout", "getdefaulttimeout",
+           "recv", "recv_line", "send"]
 
-
-class sock_opt:
-    def __init__(self, sockopt: list, sslopt: dict) -> None:
+class sock_opt(object):
+    def __init__(self, sockopt, sslopt):
         if sockopt is None:
             sockopt = []
         if sslopt is None:
@@ -62,127 +52,70 @@ class sock_opt:
         self.sslopt = sslopt
         self.timeout = None
 
-
-def setdefaulttimeout(timeout: Union[int, float, None]) -> None:
+def setdefaulttimeout(timeout):
     """
     Set the global timeout setting to connect.
 
-    Parameters
-    ----------
-    timeout: int or float
-        default socket timeout time (in seconds)
+    timeout: default socket timeout time. This value is second.
     """
     global _default_timeout
     _default_timeout = timeout
 
 
-def getdefaulttimeout() -> Union[int, float, None]:
+def getdefaulttimeout():
     """
-    Get default timeout
-
-    Returns
-    ----------
-    _default_timeout: int or float
-        Return the global timeout setting (in seconds) to connect.
+    Return the global timeout setting(second) to connect.
     """
     return _default_timeout
 
 
-def recv(sock: socket.socket, bufsize: int) -> bytes:
+def recv(sock, bufsize):
     if not sock:
         raise WebSocketConnectionClosedException("socket is already closed.")
 
-    def _recv():
-        try:
-            return sock.recv(bufsize)
-        except SSLWantReadError:
-            pass
-        except socket.error as exc:
-            error_code = extract_error_code(exc)
-            if error_code not in [errno.EAGAIN, errno.EWOULDBLOCK]:
-                raise
-
-        sel = selectors.DefaultSelector()
-        sel.register(sock, selectors.EVENT_READ)
-
-        r = sel.select(sock.gettimeout())
-        sel.close()
-
-        if r:
-            return sock.recv(bufsize)
-
     try:
-        if sock.gettimeout() == 0:
-            bytes_ = sock.recv(bufsize)
-        else:
-            bytes_ = _recv()
-    except TimeoutError:
-        raise WebSocketTimeoutException("Connection timed out")
+        bytes = sock.recv(bufsize)
     except socket.timeout as e:
         message = extract_err_message(e)
         raise WebSocketTimeoutException(message)
     except SSLError as e:
         message = extract_err_message(e)
-        if isinstance(message, str) and "timed out" in message:
+        if message == "The read operation timed out":
             raise WebSocketTimeoutException(message)
         else:
             raise
 
-    if not bytes_:
-        raise WebSocketConnectionClosedException("Connection to remote host was lost.")
+    if not bytes:
+        raise WebSocketConnectionClosedException("Connection is already closed.")
 
-    return bytes_
+    return bytes
 
 
-def recv_line(sock: socket.socket) -> bytes:
+def recv_line(sock):
     line = []
     while True:
         c = recv(sock, 1)
         line.append(c)
-        if c == b"\n":
+        if c == six.b("\n"):
             break
-    return b"".join(line)
+    return six.b("").join(line)
 
 
-def send(sock: socket.socket, data: Union[bytes, str]) -> int:
-    if isinstance(data, str):
-        data = data.encode("utf-8")
+def send(sock, data):
+    if isinstance(data, six.text_type):
+        data = data.encode('utf-8')
 
     if not sock:
         raise WebSocketConnectionClosedException("socket is already closed.")
 
-    def _send():
-        try:
-            return sock.send(data)
-        except SSLWantWriteError:
-            pass
-        except socket.error as exc:
-            error_code = extract_error_code(exc)
-            if error_code is None:
-                raise
-            if error_code not in [errno.EAGAIN, errno.EWOULDBLOCK]:
-                raise
-
-        sel = selectors.DefaultSelector()
-        sel.register(sock, selectors.EVENT_WRITE)
-
-        w = sel.select(sock.gettimeout())
-        sel.close()
-
-        if w:
-            return sock.send(data)
-
     try:
-        if sock.gettimeout() == 0:
-            return sock.send(data)
-        else:
-            return _send()
+        return sock.send(data)
     except socket.timeout as e:
         message = extract_err_message(e)
         raise WebSocketTimeoutException(message)
     except Exception as e:
         message = extract_err_message(e)
-        if isinstance(message, str) and "timed out" in message:
+        if message and "timed out" in message:
             raise WebSocketTimeoutException(message)
         else:
             raise
diff --git a/lib/websocket/_ssl_compat.py b/lib/websocket/_ssl_compat.py
index 0a8a32b5..d41ca790 100644
--- a/lib/websocket/_ssl_compat.py
+++ b/lib/websocket/_ssl_compat.py
@@ -1,48 +1,45 @@
 """
-_ssl_compat.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright (C) 2010 Hiroki Ohtani(liris)
 
-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
+    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.
 
-    http://www.apache.org/licenses/LICENSE-2.0
+    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-1335  USA
 
-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.
 """
-__all__ = [
-    "HAVE_SSL",
-    "ssl",
-    "SSLError",
-    "SSLEOFError",
-    "SSLWantReadError",
-    "SSLWantWriteError",
-]
+
+__all__ = ["HAVE_SSL", "ssl", "SSLError"]
 
 try:
     import ssl
-    from ssl import SSLError, SSLEOFError, SSLWantReadError, SSLWantWriteError
+    from ssl import SSLError
+    if hasattr(ssl, 'SSLContext') and hasattr(ssl.SSLContext, 'check_hostname'):
+        HAVE_CONTEXT_CHECK_HOSTNAME = True
+    else:
+        HAVE_CONTEXT_CHECK_HOSTNAME = False
+        if hasattr(ssl, "match_hostname"):
+            from ssl import match_hostname
+        else:
+            from backports.ssl_match_hostname import match_hostname
+        __all__.append("match_hostname")
+    __all__.append("HAVE_CONTEXT_CHECK_HOSTNAME")
 
     HAVE_SSL = True
 except ImportError:
-    # dummy class of SSLError for environment without ssl support
+    # dummy class of SSLError for ssl none-support environment.
     class SSLError(Exception):
         pass
 
-    class SSLEOFError(Exception):
-        pass
-
-    class SSLWantReadError(Exception):
-        pass
-
-    class SSLWantWriteError(Exception):
-        pass
-
-    ssl = None
     HAVE_SSL = False
diff --git a/lib/websocket/_url.py b/lib/websocket/_url.py
index 90213171..703b7154 100644
--- a/lib/websocket/_url.py
+++ b/lib/websocket/_url.py
@@ -1,48 +1,44 @@
-import os
-import socket
-import struct
-from typing import Optional
-from urllib.parse import unquote, urlparse
-from ._exceptions import WebSocketProxyException
-
 """
-_url.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright (C) 2010 Hiroki Ohtani(liris)
 
-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
+    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.
 
-    http://www.apache.org/licenses/LICENSE-2.0
+    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-1335  USA
 
-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.
 """
 
+from six.moves.urllib.parse import urlparse
+import os
+
 __all__ = ["parse_url", "get_proxy_info"]
 
 
-def parse_url(url: str) -> tuple:
+def parse_url(url):
     """
     parse url and the result is tuple of
     (hostname, port, resource path and the flag of secure mode)
 
-    Parameters
-    ----------
-    url: str
-        url string.
+    url: url string.
     """
     if ":" not in url:
         raise ValueError("url is invalid")
 
     scheme, url = url.split(":", 1)
 
-    parsed = urlparse(url, scheme="http")
+    parsed = urlparse(url, scheme="ws")
     if parsed.hostname:
         hostname = parsed.hostname
     else:
@@ -68,123 +64,63 @@ def parse_url(url: str) -> tuple:
         resource = "/"
 
     if parsed.query:
-        resource += f"?{parsed.query}"
+        resource += "?" + parsed.query
 
-    return hostname, port, resource, is_secure
+    return (hostname, port, resource, is_secure)
 
 
 DEFAULT_NO_PROXY_HOST = ["localhost", "127.0.0.1"]
 
 
-def _is_ip_address(addr: str) -> bool:
-    try:
-        socket.inet_aton(addr)
-    except socket.error:
-        return False
-    else:
-        return True
-
-
-def _is_subnet_address(hostname: str) -> bool:
-    try:
-        addr, netmask = hostname.split("/")
-        return _is_ip_address(addr) and 0 <= int(netmask) < 32
-    except ValueError:
-        return False
-
-
-def _is_address_in_network(ip: str, net: str) -> bool:
-    ipaddr: int = struct.unpack("!I", socket.inet_aton(ip))[0]
-    netaddr, netmask = net.split("/")
-    netaddr: int = struct.unpack("!I", socket.inet_aton(netaddr))[0]
-
-    netmask = (0xFFFFFFFF << (32 - int(netmask))) & 0xFFFFFFFF
-    return ipaddr & netmask == netaddr
-
-
-def _is_no_proxy_host(hostname: str, no_proxy: Optional[list]) -> bool:
+def _is_no_proxy_host(hostname, no_proxy):
     if not no_proxy:
-        if v := os.environ.get("no_proxy", os.environ.get("NO_PROXY", "")).replace(
-            " ", ""
-        ):
-            no_proxy = v.split(",")
+        v = os.environ.get("no_proxy", "").replace(" ", "")
+        no_proxy = v.split(",")
     if not no_proxy:
         no_proxy = DEFAULT_NO_PROXY_HOST
 
-    if "*" in no_proxy:
-        return True
-    if hostname in no_proxy:
-        return True
-    if _is_ip_address(hostname):
-        return any(
-            [
-                _is_address_in_network(hostname, subnet)
-                for subnet in no_proxy
-                if _is_subnet_address(subnet)
-            ]
-        )
-    for domain in [domain for domain in no_proxy if domain.startswith(".")]:
-        if hostname.endswith(domain):
-            return True
-    return False
+    return hostname in no_proxy
 
 
-def get_proxy_info(
-    hostname: str,
-    is_secure: bool,
-    proxy_host: Optional[str] = None,
-    proxy_port: int = 0,
-    proxy_auth: Optional[tuple] = None,
-    no_proxy: Optional[list] = None,
-    proxy_type: str = "http",
-) -> tuple:
+def get_proxy_info(hostname, is_secure,
+            proxy_host=None, proxy_port=0, proxy_auth=None, no_proxy=None):
     """
-    Try to retrieve proxy host and port from environment
+    try to retrieve proxy host and port from environment
     if not provided in options.
-    Result is (proxy_host, proxy_port, proxy_auth).
+    result is (proxy_host, proxy_port, proxy_auth).
     proxy_auth is tuple of username and password
-    of proxy authentication information.
+     of proxy authentication information.
 
-    Parameters
-    ----------
-    hostname: str
-        Websocket server name.
-    is_secure: bool
-        Is the connection secure? (wss) looks for "https_proxy" in env
-        instead of "http_proxy"
-    proxy_host: str
-        http proxy host name.
-    proxy_port: str or int
-        http proxy port.
-    no_proxy: list
-        Whitelisted host names that don't use the proxy.
-    proxy_auth: tuple
-        HTTP proxy auth information. Tuple of username and password. Default is None.
-    proxy_type: str
-        Specify the proxy protocol (http, socks4, socks4a, socks5, socks5h). Default is "http".
-        Use socks4a or socks5h if you want to send DNS requests through the proxy.
+    hostname: websocket server name.
+
+    is_secure:  is the connection secure? (wss)
+                looks for "https_proxy" in env
+                before falling back to "http_proxy"
+
+    options:    "http_proxy_host" - http proxy host name.
+                "http_proxy_port" - http proxy port.
+                "http_no_proxy"   - host names, which doesn't use proxy.
+                "http_proxy_auth" - http proxy auth infomation.
+                                    tuple of username and password.
+                                    defualt is None
     """
     if _is_no_proxy_host(hostname, no_proxy):
         return None, 0, None
 
     if proxy_host:
-        if not proxy_port:
-            raise WebSocketProxyException("Cannot use port 0 when proxy_host specified")
         port = proxy_port
         auth = proxy_auth
         return proxy_host, port, auth
 
-    env_key = "https_proxy" if is_secure else "http_proxy"
-    value = os.environ.get(env_key, os.environ.get(env_key.upper(), "")).replace(
-        " ", ""
-    )
-    if value:
-        proxy = urlparse(value)
-        auth = (
-            (unquote(proxy.username), unquote(proxy.password))
-            if proxy.username
-            else None
-        )
-        return proxy.hostname, proxy.port, auth
+    env_keys = ["http_proxy"]
+    if is_secure:
+        env_keys.insert(0, "https_proxy")
+
+    for key in env_keys:
+        value = os.environ.get(key, None)
+        if value:
+            proxy = urlparse(value)
+            auth = (proxy.username, proxy.password) if proxy.username else None
+            return proxy.hostname, proxy.port, auth
 
     return None, 0, None
diff --git a/lib/websocket/_utils.py b/lib/websocket/_utils.py
index 65f3c0da..dda1d0c1 100644
--- a/lib/websocket/_utils.py
+++ b/lib/websocket/_utils.py
@@ -1,459 +1,88 @@
-from typing import Union
-
 """
-_url.py
 websocket - WebSocket client library for Python
 
-Copyright 2024 engn33r
+Copyright (C) 2010 Hiroki Ohtani(liris)
 
-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
+    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.
 
-    http://www.apache.org/licenses/LICENSE-2.0
+    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-1335  USA
 
-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.
 """
-__all__ = ["NoLock", "validate_utf8", "extract_err_message", "extract_error_code"]
 
+import six
 
-class NoLock:
-    def __enter__(self) -> None:
+__all__ = ["NoLock", "validate_utf8", "extract_err_message"]
+
+class NoLock(object):
+    def __enter__(self):
         pass
 
-    def __exit__(self, exc_type, exc_value, traceback) -> None:
+    def __exit__(self,type, value, traceback):
         pass
 
 
-try:
-    # If wsaccel is available we use compiled routines to validate UTF-8
-    # strings.
-    from wsaccel.utf8validator import Utf8Validator
+# UTF-8 validator
+# python implementation of http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
 
-    def _validate_utf8(utfbytes: Union[str, bytes]) -> bool:
-        result: bool = Utf8Validator().validate(utfbytes)[0]
-        return result
+UTF8_ACCEPT = 0
+UTF8_REJECT=12
 
-except ImportError:
-    # UTF-8 validator
-    # python implementation of http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
+_UTF8D = [
+    # The first part of the table maps bytes to character classes that
+    # to reduce the size of the transition table and create bitmasks.
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,  9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
+    7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
+    8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+    10,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3, 11,6,6,6,5,8,8,8,8,8,8,8,8,8,8,8,
 
-    _UTF8_ACCEPT = 0
-    _UTF8_REJECT = 12
+    # The second part is a transition table that maps a combination
+    # of a state of the automaton and a character class to a state.
+    0,12,24,36,60,96,84,12,12,12,48,72, 12,12,12,12,12,12,12,12,12,12,12,12,
+    12, 0,12,12,12,12,12, 0,12, 0,12,12, 12,24,12,12,12,12,12,24,12,24,12,12,
+    12,12,12,12,12,12,12,24,12,12,12,12, 12,24,12,12,12,12,12,12,12,24,12,12,
+    12,12,12,12,12,12,12,36,12,36,12,12, 12,36,12,12,12,12,12,36,12,36,12,12,
+    12,36,12,12,12,12,12,12,12,12,12,12, ]
 
-    _UTF8D = [
-        # The first part of the table maps bytes to character classes that
-        # to reduce the size of the transition table and create bitmasks.
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        1,
-        9,
-        9,
-        9,
-        9,
-        9,
-        9,
-        9,
-        9,
-        9,
-        9,
-        9,
-        9,
-        9,
-        9,
-        9,
-        9,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        7,
-        8,
-        8,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        2,
-        10,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        3,
-        4,
-        3,
-        3,
-        11,
-        6,
-        6,
-        6,
-        5,
-        8,
-        8,
-        8,
-        8,
-        8,
-        8,
-        8,
-        8,
-        8,
-        8,
-        8,
-        # The second part is a transition table that maps a combination
-        # of a state of the automaton and a character class to a state.
-        0,
-        12,
-        24,
-        36,
-        60,
-        96,
-        84,
-        12,
-        12,
-        12,
-        48,
-        72,
-        12,
-        12,
-        12,
-        12,
-        12,
-        12,
-        12,
-        12,
-        12,
-        12,
-        12,
-        12,
-        12,
-        0,
-        12,
-        12,
-        12,
-        12,
-        12,
-        0,
-        12,
-        0,
-        12,
-        12,
-        12,
-        24,
-        12,
-        12,
-        12,
-        12,
-        12,
-        24,
-        12,
-        24,
-        12,
-        12,
-        12,
-        12,
-        12,
-        12,
-        12,
-        12,
-        12,
-        24,
-        12,
-        12,
-        12,
-        12,
-        12,
-        24,
-        12,
-        12,
-        12,
-        12,
-        12,
-        12,
-        12,
-        24,
-        12,
-        12,
-        12,
-        12,
-        12,
-        12,
-        12,
-        12,
-        12,
-        36,
-        12,
-        36,
-        12,
-        12,
-        12,
-        36,
-        12,
-        12,
-        12,
-        12,
-        12,
-        36,
-        12,
-        36,
-        12,
-        12,
-        12,
-        36,
-        12,
-        12,
-        12,
-        12,
-        12,
-        12,
-        12,
-        12,
-        12,
-        12,
-    ]
+def _decode(state, codep, ch):
+    tp = _UTF8D[ch]
 
-    def _decode(state: int, codep: int, ch: int) -> tuple:
-        tp = _UTF8D[ch]
+    codep = (ch & 0x3f ) | (codep << 6) if (state != UTF8_ACCEPT)  else (0xff >> tp) & (ch)
+    state = _UTF8D[256 + state + tp]
 
-        codep = (
-            (ch & 0x3F) | (codep << 6) if (state != _UTF8_ACCEPT) else (0xFF >> tp) & ch
-        )
-        state = _UTF8D[256 + state + tp]
+    return state, codep;
 
-        return state, codep
-
-    def _validate_utf8(utfbytes: Union[str, bytes]) -> bool:
-        state = _UTF8_ACCEPT
-        codep = 0
-        for i in utfbytes:
-            state, codep = _decode(state, codep, int(i))
-            if state == _UTF8_REJECT:
-                return False
-
-        return True
-
-
-def validate_utf8(utfbytes: Union[str, bytes]) -> bool:
+def validate_utf8(utfbytes):
     """
     validate utf8 byte string.
     utfbytes: utf byte string to check.
     return value: if valid utf8 string, return true. Otherwise, return false.
     """
-    return _validate_utf8(utfbytes)
+    state = UTF8_ACCEPT
+    codep = 0
+    for i in utfbytes:
+        if six.PY2:
+            i = ord(i)
+        state, codep = _decode(state, codep, i)
+        if state == UTF8_REJECT:
+            return False
+
+    return True
 
 
-def extract_err_message(exception: Exception) -> Union[str, None]:
-    if exception.args:
-        exception_message: str = exception.args[0]
-        return exception_message
-    else:
-        return None
-
-
-def extract_error_code(exception: Exception) -> Union[int, None]:
-    if exception.args and len(exception.args) > 1:
-        return exception.args[0] if isinstance(exception.args[0], int) else None
+def extract_err_message(exception):
+    return getattr(exception, 'strerror', str(exception))
diff --git a/lib/websocket/_wsdump.py b/lib/websocket/_wsdump.py
deleted file mode 100644
index d4d76dc5..00000000
--- a/lib/websocket/_wsdump.py
+++ /dev/null
@@ -1,244 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-wsdump.py
-websocket - WebSocket client library for Python
-
-Copyright 2024 engn33r
-
-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.
-"""
-
-import argparse
-import code
-import gzip
-import ssl
-import sys
-import threading
-import time
-import zlib
-from urllib.parse import urlparse
-
-import websocket
-
-try:
-    import readline
-except ImportError:
-    pass
-
-
-def get_encoding() -> str:
-    encoding = getattr(sys.stdin, "encoding", "")
-    if not encoding:
-        return "utf-8"
-    else:
-        return encoding.lower()
-
-
-OPCODE_DATA = (websocket.ABNF.OPCODE_TEXT, websocket.ABNF.OPCODE_BINARY)
-ENCODING = get_encoding()
-
-
-class VAction(argparse.Action):
-    def __call__(
-        self,
-        parser: argparse.Namespace,
-        args: tuple,
-        values: str,
-        option_string: str = None,
-    ) -> None:
-        if values is None:
-            values = "1"
-        try:
-            values = int(values)
-        except ValueError:
-            values = values.count("v") + 1
-        setattr(args, self.dest, values)
-
-
-def parse_args() -> argparse.Namespace:
-    parser = argparse.ArgumentParser(description="WebSocket Simple Dump Tool")
-    parser.add_argument(
-        "url", metavar="ws_url", help="websocket url. ex. ws://echo.websocket.events/"
-    )
-    parser.add_argument("-p", "--proxy", help="proxy url. ex. http://127.0.0.1:8080")
-    parser.add_argument(
-        "-v",
-        "--verbose",
-        default=0,
-        nargs="?",
-        action=VAction,
-        dest="verbose",
-        help="set verbose mode. If set to 1, show opcode. "
-        "If set to 2, enable to trace  websocket module",
-    )
-    parser.add_argument(
-        "-n", "--nocert", action="store_true", help="Ignore invalid SSL cert"
-    )
-    parser.add_argument("-r", "--raw", action="store_true", help="raw output")
-    parser.add_argument("-s", "--subprotocols", nargs="*", help="Set subprotocols")
-    parser.add_argument("-o", "--origin", help="Set origin")
-    parser.add_argument(
-        "--eof-wait",
-        default=0,
-        type=int,
-        help="wait time(second) after 'EOF' received.",
-    )
-    parser.add_argument("-t", "--text", help="Send initial text")
-    parser.add_argument(
-        "--timings", action="store_true", help="Print timings in seconds"
-    )
-    parser.add_argument("--headers", help="Set custom headers. Use ',' as separator")
-
-    return parser.parse_args()
-
-
-class RawInput:
-    def raw_input(self, prompt: str = "") -> str:
-        line = input(prompt)
-
-        if ENCODING and ENCODING != "utf-8" and not isinstance(line, str):
-            line = line.decode(ENCODING).encode("utf-8")
-        elif isinstance(line, str):
-            line = line.encode("utf-8")
-
-        return line
-
-
-class InteractiveConsole(RawInput, code.InteractiveConsole):
-    def write(self, data: str) -> None:
-        sys.stdout.write("\033[2K\033[E")
-        # sys.stdout.write("\n")
-        sys.stdout.write("\033[34m< " + data + "\033[39m")
-        sys.stdout.write("\n> ")
-        sys.stdout.flush()
-
-    def read(self) -> str:
-        return self.raw_input("> ")
-
-
-class NonInteractive(RawInput):
-    def write(self, data: str) -> None:
-        sys.stdout.write(data)
-        sys.stdout.write("\n")
-        sys.stdout.flush()
-
-    def read(self) -> str:
-        return self.raw_input("")
-
-
-def main() -> None:
-    start_time = time.time()
-    args = parse_args()
-    if args.verbose > 1:
-        websocket.enableTrace(True)
-    options = {}
-    if args.proxy:
-        p = urlparse(args.proxy)
-        options["http_proxy_host"] = p.hostname
-        options["http_proxy_port"] = p.port
-    if args.origin:
-        options["origin"] = args.origin
-    if args.subprotocols:
-        options["subprotocols"] = args.subprotocols
-    opts = {}
-    if args.nocert:
-        opts = {"cert_reqs": ssl.CERT_NONE, "check_hostname": False}
-    if args.headers:
-        options["header"] = list(map(str.strip, args.headers.split(",")))
-    ws = websocket.create_connection(args.url, sslopt=opts, **options)
-    if args.raw:
-        console = NonInteractive()
-    else:
-        console = InteractiveConsole()
-        print("Press Ctrl+C to quit")
-
-    def recv() -> tuple:
-        try:
-            frame = ws.recv_frame()
-        except websocket.WebSocketException:
-            return websocket.ABNF.OPCODE_CLOSE, ""
-        if not frame:
-            raise websocket.WebSocketException(f"Not a valid frame {frame}")
-        elif frame.opcode in OPCODE_DATA:
-            return frame.opcode, frame.data
-        elif frame.opcode == websocket.ABNF.OPCODE_CLOSE:
-            ws.send_close()
-            return frame.opcode, ""
-        elif frame.opcode == websocket.ABNF.OPCODE_PING:
-            ws.pong(frame.data)
-            return frame.opcode, frame.data
-
-        return frame.opcode, frame.data
-
-    def recv_ws() -> None:
-        while True:
-            opcode, data = recv()
-            msg = None
-            if opcode == websocket.ABNF.OPCODE_TEXT and isinstance(data, bytes):
-                data = str(data, "utf-8")
-            if (
-                isinstance(data, bytes) and len(data) > 2 and data[:2] == b"\037\213"
-            ):  # gzip magick
-                try:
-                    data = "[gzip] " + str(gzip.decompress(data), "utf-8")
-                except:
-                    pass
-            elif isinstance(data, bytes):
-                try:
-                    data = "[zlib] " + str(
-                        zlib.decompress(data, -zlib.MAX_WBITS), "utf-8"
-                    )
-                except:
-                    pass
-
-            if isinstance(data, bytes):
-                data = repr(data)
-
-            if args.verbose:
-                msg = f"{websocket.ABNF.OPCODE_MAP.get(opcode)}: {data}"
-            else:
-                msg = data
-
-            if msg is not None:
-                if args.timings:
-                    console.write(f"{time.time() - start_time}: {msg}")
-                else:
-                    console.write(msg)
-
-            if opcode == websocket.ABNF.OPCODE_CLOSE:
-                break
-
-    thread = threading.Thread(target=recv_ws)
-    thread.daemon = True
-    thread.start()
-
-    if args.text:
-        ws.send(args.text)
-
-    while True:
-        try:
-            message = console.read()
-            ws.send(message)
-        except KeyboardInterrupt:
-            return
-        except EOFError:
-            time.sleep(args.eof_wait)
-            return
-
-
-if __name__ == "__main__":
-    try:
-        main()
-    except Exception as e:
-        print(e)
diff --git a/lib/websocket/cacert.pem b/lib/websocket/cacert.pem
new file mode 100644
index 00000000..e908bb6a
--- /dev/null
+++ b/lib/websocket/cacert.pem
@@ -0,0 +1,4966 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# Issuer: CN=GTE CyberTrust Global Root O=GTE Corporation OU=GTE CyberTrust Solutions, Inc.
+# Subject: CN=GTE CyberTrust Global Root O=GTE Corporation OU=GTE CyberTrust Solutions, Inc.
+# Label: "GTE CyberTrust Global Root"
+# Serial: 421
+# MD5 Fingerprint: ca:3d:d3:68:f1:03:5c:d0:32:fa:b8:2b:59:e8:5a:db
+# SHA1 Fingerprint: 97:81:79:50:d8:1c:96:70:cc:34:d8:09:cf:79:44:31:36:7e:f4:74
+# SHA256 Fingerprint: a5:31:25:18:8d:21:10:aa:96:4b:02:c7:b7:c6:da:32:03:17:08:94:e5:fb:71:ff:fb:66:67:d5:e6:81:0a:36
+-----BEGIN CERTIFICATE-----
+MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYD
+VQQKEw9HVEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNv
+bHV0aW9ucywgSW5jLjEjMCEGA1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJv
+b3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEzMjM1OTAwWjB1MQswCQYDVQQGEwJV
+UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJU
+cnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0IEds
+b2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrH
+iM3dFw4usJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTS
+r41tiGeA5u2ylc9yMcqlHHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X4
+04Wqk2kmhXBIgD8SFcd5tB8FLztimQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAG3r
+GwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMWM4ETCJ57NE7fQMh017l9
+3PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OFNMQkpw0P
+lZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/
+-----END CERTIFICATE-----
+
+# Issuer: CN=Thawte Server CA O=Thawte Consulting cc OU=Certification Services Division
+# Subject: CN=Thawte Server CA O=Thawte Consulting cc OU=Certification Services Division
+# Label: "Thawte Server CA"
+# Serial: 1
+# MD5 Fingerprint: c5:70:c4:a2:ed:53:78:0c:c8:10:53:81:64:cb:d0:1d
+# SHA1 Fingerprint: 23:e5:94:94:51:95:f2:41:48:03:b4:d5:64:d2:a3:a3:f5:d8:8b:8c
+# SHA256 Fingerprint: b4:41:0b:73:e2:e6:ea:ca:47:fb:c4:2f:8f:a4:01:8a:f4:38:1d:c5:4c:fa:a8:44:50:46:1e:ed:09:45:4d:e9
+-----BEGIN CERTIFICATE-----
+MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
+VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEm
+MCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wHhcNOTYwODAx
+MDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT
+DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3
+dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNl
+cyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3
+DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD
+gY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl/Kj0R1HahbUgdJSGHg91
+yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg71CcEJRCX
+L+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGj
+EzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG
+7oWDTSEwjsrZqG9JGubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6e
+QNuozDJ0uW8NxuOzRAvZim+aKZuZGCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZ
+qdq5snUb9kLy78fyGPmJvKP/iiMucEc=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Thawte Premium Server CA O=Thawte Consulting cc OU=Certification Services Division
+# Subject: CN=Thawte Premium Server CA O=Thawte Consulting cc OU=Certification Services Division
+# Label: "Thawte Premium Server CA"
+# Serial: 1
+# MD5 Fingerprint: 06:9f:69:79:16:66:90:02:1b:8c:8c:a2:c3:07:6f:3a
+# SHA1 Fingerprint: 62:7f:8d:78:27:65:63:99:d2:7d:7f:90:44:c9:fe:b3:f3:3e:fa:9a
+# SHA256 Fingerprint: ab:70:36:36:5c:71:54:aa:29:c2:c2:9f:5d:41:91:16:3b:16:2a:22:25:01:13:57:d5:6d:07:ff:a7:bc:1f:72
+-----BEGIN CERTIFICATE-----
+MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx
+FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
+VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy
+dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t
+MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB
+MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG
+A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp
+b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl
+cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv
+bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE
+VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ
+ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR
+uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
+9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI
+hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM
+pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg==
+-----END CERTIFICATE-----
+
+# Issuer: O=Equifax OU=Equifax Secure Certificate Authority
+# Subject: O=Equifax OU=Equifax Secure Certificate Authority
+# Label: "Equifax Secure CA"
+# Serial: 903804111
+# MD5 Fingerprint: 67:cb:9d:c0:13:24:8a:82:9b:b2:17:1e:d1:1b:ec:d4
+# SHA1 Fingerprint: d2:32:09:ad:23:d3:14:23:21:74:e4:0d:7f:9d:62:13:97:86:63:3a
+# SHA256 Fingerprint: 08:29:7a:40:47:db:a2:36:80:c7:31:db:6e:31:76:53:ca:78:48:e1:be:bd:3a:0b:01:79:a7:07:f9:2c:f1:78
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
+UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy
+dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1
+MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx
+dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f
+BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A
+cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC
+AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ
+MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm
+aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw
+ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj
+IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF
+MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
+A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
+7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh
+1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4
+-----END CERTIFICATE-----
+
+# Issuer: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority
+# Subject: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority
+# Label: "Verisign Class 3 Public Primary Certification Authority"
+# Serial: 149843929435818692848040365716851702463
+# MD5 Fingerprint: 10:fc:63:5d:f6:26:3e:0d:f3:25:be:5f:79:cd:67:67
+# SHA1 Fingerprint: 74:2c:31:92:e6:07:e4:24:eb:45:49:54:2b:e1:bb:c5:3e:61:74:e2
+# SHA256 Fingerprint: e7:68:56:34:ef:ac:f6:9a:ce:93:9a:6b:25:5b:7b:4f:ab:ef:42:93:5b:50:a2:65:ac:b5:cb:60:27:e4:4e:70
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
+cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
+MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
+BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
+BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
+I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
+CSqGSIb3DQEBAgUAA4GBALtMEivPLCYATxQT3ab7/AoRhIzzKBxnki98tsX63/Do
+lbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59AhWM1pF+NEHJwZRDmJXNyc
+AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k
+-----END CERTIFICATE-----
+
+# Issuer: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority - G2/(c) 1998 VeriSign, Inc. - For authorized use only/VeriSign Trust Network
+# Subject: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority - G2/(c) 1998 VeriSign, Inc. - For authorized use only/VeriSign Trust Network
+# Label: "Verisign Class 3 Public Primary Certification Authority - G2"
+# Serial: 167285380242319648451154478808036881606
+# MD5 Fingerprint: a2:33:9b:4c:74:78:73:d4:6c:e7:c1:f3:8d:cb:5c:e9
+# SHA1 Fingerprint: 85:37:1c:a6:e5:50:14:3d:ce:28:03:47:1b:de:3a:09:e8:f8:77:0f
+# SHA256 Fingerprint: 83:ce:3c:12:29:68:8a:59:3d:48:5f:81:97:3c:0f:91:95:43:1e:da:37:cc:5e:36:43:0e:79:c7:a8:88:63:8b
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
+c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
+MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
+emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
+DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMg
+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
+YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
+MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCOFoUgRm1HP9SFIIThbbP4
+pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71lSk8UOg0
+13gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwID
+AQABMA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSk
+U01UbSuvDV1Ai2TT1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7i
+F6YM40AIOw7n60RzKprxaZLvcRTDOaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpY
+oJ2daZH9
+-----END CERTIFICATE-----
+
+# Issuer: CN=GlobalSign Root CA O=GlobalSign nv-sa OU=Root CA
+# Subject: CN=GlobalSign Root CA O=GlobalSign nv-sa OU=Root CA
+# Label: "GlobalSign Root CA"
+# Serial: 4835703278459707669005204
+# MD5 Fingerprint: 3e:45:52:15:09:51:92:e1:b7:5d:37:9f:b1:87:29:8a
+# SHA1 Fingerprint: b1:bc:96:8b:d4:f4:9d:62:2a:a8:9a:81:f2:15:01:52:a4:1d:82:9c
+# SHA256 Fingerprint: eb:d4:10:40:e4:bb:3e:c7:42:c9:e3:81:d3:1e:f2:a4:1a:48:b6:68:5c:96:e7:ce:f3:c1:df:6c:d4:33:1c:99
+-----BEGIN CERTIFICATE-----
+MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG
+A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
+b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw
+MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
+YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT
+aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ
+jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp
+xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp
+1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG
+snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ
+U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8
+9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E
+BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B
+AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz
+yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE
+38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP
+AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad
+DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME
+HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
+-----END CERTIFICATE-----
+
+# Issuer: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R2
+# Subject: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R2
+# Label: "GlobalSign Root CA - R2"
+# Serial: 4835703278459682885658125
+# MD5 Fingerprint: 94:14:77:7e:3e:5e:fd:8f:30:bd:41:b0:cf:e7:d0:30
+# SHA1 Fingerprint: 75:e0:ab:b6:13:85:12:27:1c:04:f8:5f:dd:de:38:e4:b7:24:2e:fe
+# SHA256 Fingerprint: ca:42:dd:41:74:5f:d0:b8:1e:b9:02:36:2c:f9:d8:bf:71:9d:a1:bd:1b:1e:fc:94:6f:5b:4c:99:f4:2c:1b:9e
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4G
+A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNp
+Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1
+MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMjETMBEG
+A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6ErPL
+v4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8
+eoLrvozps6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklq
+tTleiDTsvHgMCJiEbKjNS7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzd
+C9XZzPnqJworc5HGnRusyMvo4KD0L5CLTfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pa
+zq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6CygPCm48CAwEAAaOBnDCB
+mTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUm+IH
+V2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5n
+bG9iYWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG
+3lm0mi3f3BmGLjANBgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4Gs
+J0/WwbgcQ3izDJr86iw8bmEbTUsp9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO
+291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu01yiPqFbQfXf5WRDLenVOavS
+ot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG79G+dwfCMNYxd
+AfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
+TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 1 Policy Validation Authority
+# Subject: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 1 Policy Validation Authority
+# Label: "ValiCert Class 1 VA"
+# Serial: 1
+# MD5 Fingerprint: 65:58:ab:15:ad:57:6c:1e:a8:a7:b5:69:ac:bf:ff:eb
+# SHA1 Fingerprint: e5:df:74:3c:b6:01:c4:9b:98:43:dc:ab:8c:e8:6a:81:10:9f:e4:8e
+# SHA256 Fingerprint: f4:c1:49:55:1a:30:13:a3:5b:c7:bf:fe:17:a7:f3:44:9b:c1:ab:5b:5a:0a:e7:4b:06:c2:3b:90:00:4c:01:04
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNTIyMjM0OFoXDTE5MDYy
+NTIyMjM0OFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYWYJ6ibiWuqYvaG9Y
+LqdUHAZu9OqNSLwxlBfw8068srg1knaw0KWlAdcAAxIiGQj4/xEjm84H9b9pGib+
+TunRf50sQB1ZaG6m+FiwnRqP0z/x3BkGgagO4DrdyFNFCQbmD3DD+kCmDuJWBQ8Y
+TfwggtFzVXSNdnKgHZ0dwN0/cQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFBoPUn0
+LBwGlN+VYH+Wexf+T3GtZMjdd9LvWVXoP+iOBSoh8gfStadS/pyxtuJbdxdA6nLW
+I8sogTLDAHkY7FkXicnGah5xyf23dKUlRWnFSKsZ4UWKJWsZ7uW7EvV/96aNUcPw
+nXS3qT6gpf+2SQMT2iLM7XGCK5nPOrf1LXLI
+-----END CERTIFICATE-----
+
+# Issuer: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 2 Policy Validation Authority
+# Subject: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 2 Policy Validation Authority
+# Label: "ValiCert Class 2 VA"
+# Serial: 1
+# MD5 Fingerprint: a9:23:75:9b:ba:49:36:6e:31:c2:db:f2:e7:66:ba:87
+# SHA1 Fingerprint: 31:7a:2a:d0:7f:2b:33:5e:f5:a1:c3:4e:4b:57:e8:b7:d8:f1:fc:a6
+# SHA256 Fingerprint: 58:d0:17:27:9c:d4:dc:63:ab:dd:b1:96:a6:c9:90:6c:30:c4:e0:87:83:ea:e8:c1:60:99:54:d6:93:55:59:6b
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy
+NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY
+dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9
+WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS
+v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v
+UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu
+IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC
+W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd
+-----END CERTIFICATE-----
+
+# Issuer: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 3 Policy Validation Authority
+# Subject: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 3 Policy Validation Authority
+# Label: "RSA Root Certificate 1"
+# Serial: 1
+# MD5 Fingerprint: a2:6f:53:b7:ee:40:db:4a:68:e7:fa:18:d9:10:4b:72
+# SHA1 Fingerprint: 69:bd:8c:f4:9c:d3:00:fb:59:2e:17:93:ca:55:6a:f3:ec:aa:35:fb
+# SHA256 Fingerprint: bc:23:f9:8a:31:3c:b9:2d:e3:bb:fc:3a:5a:9f:44:61:ac:39:49:4c:4a:e1:5a:9e:9d:f1:31:e9:9b:73:01:9a
+-----BEGIN CERTIFICATE-----
+MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
+IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
+BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
+aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
+9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMjIzM1oXDTE5MDYy
+NjAwMjIzM1owgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
+azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
+YXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
+Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
+cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjmFGWHOjVsQaBalfD
+cnWTq8+epvzzFlLWLU2fNUSoLgRNB0mKOCn1dzfnt6td3zZxFJmP3MKS8edgkpfs
+2Ejcv8ECIMYkpChMMFp2bbFc893enhBxoYjHW5tBbcqwuI4V7q0zK89HBFx1cQqY
+JJgpp0lZpd34t0NiYfPT4tBVPwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFa7AliE
+Zwgs3x/be0kz9dNnnfS0ChCzycUs4pJqcXgn8nCDQtM+z6lU9PHYkhaM0QTLS6vJ
+n0WuPIqpsHEzXcjFV9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/A
+PhmcGcwTTYJBtYze4D1gCCAPRX5ron+jjBXu
+-----END CERTIFICATE-----
+
+# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G3 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 1999 VeriSign, Inc. - For authorized use only
+# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G3 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 1999 VeriSign, Inc. - For authorized use only
+# Label: "Verisign Class 3 Public Primary Certification Authority - G3"
+# Serial: 206684696279472310254277870180966723415
+# MD5 Fingerprint: cd:68:b6:a7:c7:c4:ce:75:e0:1d:4f:57:44:61:92:09
+# SHA1 Fingerprint: 13:2d:0d:45:53:4b:69:97:cd:b2:d5:c3:39:e2:55:76:60:9b:5c:c6
+# SHA256 Fingerprint: eb:04:cf:5e:b1:f3:9a:fa:76:2f:2b:b1:20:f2:96:cb:a5:20:c1:b9:7d:b1:58:95:65:b8:1c:b9:a1:7b:72:44
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
+cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
+LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
+aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
+VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
+aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
+bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
+IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b
+N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t
+KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu
+kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm
+CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ
+Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu
+imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te
+2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe
+DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
+/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p
+F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt
+TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=VeriSign Class 4 Public Primary Certification Authority - G3 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 1999 VeriSign, Inc. - For authorized use only
+# Subject: CN=VeriSign Class 4 Public Primary Certification Authority - G3 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 1999 VeriSign, Inc. - For authorized use only
+# Label: "Verisign Class 4 Public Primary Certification Authority - G3"
+# Serial: 314531972711909413743075096039378935511
+# MD5 Fingerprint: db:c8:f2:27:2e:b1:ea:6a:29:23:5d:fe:56:3e:33:df
+# SHA1 Fingerprint: c8:ec:8c:87:92:69:cb:4b:ab:39:e9:8d:7e:57:67:f3:14:95:73:9d
+# SHA256 Fingerprint: e3:89:36:0d:0f:db:ae:b3:d2:50:58:4b:47:30:31:4e:22:2f:39:c1:56:a0:20:14:4e:8d:96:05:61:79:15:06
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
+cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
+LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
+aWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
+VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
+aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
+bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
+IENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK3LpRFpxlmr8Y+1
+GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaStBO3IFsJ
++mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0Gbd
+U6LM8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLm
+NxdLMEYH5IBtptiWLugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XY
+ufTsgsbSPZUd5cBPhMnZo0QoBmrXRazwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/
+ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAj/ola09b5KROJ1WrIhVZPMq1
+CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXttmhwwjIDLk5Mq
+g6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm
+fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c
+2NU8Qh0XwRJdRTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/
+bLvSHgCwIe34QWKCudiyxLtGUPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Entrust.net Secure Server Certification Authority O=Entrust.net OU=www.entrust.net/CPS incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
+# Subject: CN=Entrust.net Secure Server Certification Authority O=Entrust.net OU=www.entrust.net/CPS incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
+# Label: "Entrust.net Secure Server CA"
+# Serial: 927650371
+# MD5 Fingerprint: df:f2:80:73:cc:f1:e6:61:73:fc:f5:42:e9:c5:7c:ee
+# SHA1 Fingerprint: 99:a6:9b:e6:1a:fe:88:6b:4d:2b:82:00:7c:b8:54:fc:31:7e:15:39
+# SHA256 Fingerprint: 62:f2:40:27:8c:56:4c:4d:d8:bf:7d:9d:4f:6f:36:6e:a8:94:d2:2f:5f:34:d9:89:a9:83:ac:ec:2f:ff:ed:50
+-----BEGIN CERTIFICATE-----
+MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
+VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5u
+ZXQvQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMc
+KGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5u
+ZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05OTA1
+MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIGA1UE
+ChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5j
+b3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF
+bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUg
+U2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUA
+A4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQaO2f55M28Qpku0f1BBc/
+I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5gXpa0zf3
+wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OC
+AdcwggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHb
+oIHYpIHVMIHSMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5
+BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1p
+dHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1pdGVk
+MTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRp
+b24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu
+dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0
+MFqBDzIwMTkwNTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8Bdi
+E1U9s/8KAGv7UISX8+1i0BowHQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAa
+MAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EABAwwChsEVjQuMAMCBJAwDQYJKoZI
+hvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyNEwr75Ji174z4xRAN
+95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9n9cd
+2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Entrust.net Certification Authority (2048) O=Entrust.net OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
+# Subject: CN=Entrust.net Certification Authority (2048) O=Entrust.net OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
+# Label: "Entrust.net Premium 2048 Secure Server CA"
+# Serial: 946069240
+# MD5 Fingerprint: ee:29:31:bc:32:7e:9a:e6:e8:b5:f7:51:b4:34:71:90
+# SHA1 Fingerprint: 50:30:06:09:1d:97:d4:f5:ae:39:f7:cb:e7:92:7d:7d:65:2d:34:31
+# SHA256 Fingerprint: 6d:c4:71:72:e0:1c:bc:b0:bf:62:58:0d:89:5f:e2:b8:ac:9a:d4:f8:73:80:1e:0c:10:b9:c8:37:d2:1e:b1:77
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChML
+RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBp
+bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5
+IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQxNzUwNTFaFw0yOTA3
+MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3
+LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxp
+YWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEG
+A1UEAxMqRW50cnVzdC5uZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgp
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArU1LqRKGsuqjIAcVFmQq
+K0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOLGp18EzoOH1u3Hs/lJBQe
+sYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSrhRSGlVuX
+MlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVT
+XTzWnLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/
+HoZdenoVve8AjhUiVBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH
+4QIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
+HQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJKoZIhvcNAQEFBQADggEBADub
+j1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPyT/4xmf3IDExo
+U8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
+zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5b
+u/8j72gZyxKTJ1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+
+bYQLCIt+jerXmCHG8+c8eS9enNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/Er
+fF6adulZkMV8gzURZVE=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Baltimore CyberTrust Root O=Baltimore OU=CyberTrust
+# Subject: CN=Baltimore CyberTrust Root O=Baltimore OU=CyberTrust
+# Label: "Baltimore CyberTrust Root"
+# Serial: 33554617
+# MD5 Fingerprint: ac:b6:94:a5:9c:17:e0:d7:91:52:9b:b1:97:06:a6:e4
+# SHA1 Fingerprint: d4:de:20:d0:5e:66:fc:53:fe:1a:50:88:2c:78:db:28:52:ca:e4:74
+# SHA256 Fingerprint: 16:af:57:a9:f6:76:b0:ab:12:60:95:aa:5e:ba:de:f2:2a:b3:11:19:d6:44:ac:95:cd:4b:93:db:f3:f2:6a:eb
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
+RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
+VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
+DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
+ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
+VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
+mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
+IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
+mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
+XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
+dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
+jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
+BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
+DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
+9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
+jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
+Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
+ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
+R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
+-----END CERTIFICATE-----
+
+# Issuer: CN=Equifax Secure Global eBusiness CA-1 O=Equifax Secure Inc.
+# Subject: CN=Equifax Secure Global eBusiness CA-1 O=Equifax Secure Inc.
+# Label: "Equifax Secure Global eBusiness CA"
+# Serial: 1
+# MD5 Fingerprint: 8f:5d:77:06:27:c4:98:3c:5b:93:78:e7:d7:7d:9b:cc
+# SHA1 Fingerprint: 7e:78:4a:10:1c:82:65:cc:2d:e1:f1:6d:47:b4:40:ca:d9:0a:19:45
+# SHA256 Fingerprint: 5f:0b:62:ea:b5:e3:53:ea:65:21:65:16:58:fb:b6:53:59:f4:43:28:0a:4a:fb:d1:04:d7:7d:10:f9:f0:4c:07
+-----BEGIN CERTIFICATE-----
+MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBT
+ZWN1cmUgR2xvYmFsIGVCdXNpbmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIw
+MDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0VxdWlmYXggU2Vj
+dXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEdsb2JhbCBlQnVzaW5l
+c3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRVPEnC
+UdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc
+58O/gGzNqfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/
+o5brhTMhHD4ePmBudpxnhcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAH
+MA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUvqigdHJQa0S3ySPY+6j/s1dr
+aGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hsMA0GCSqGSIb3DQEBBAUA
+A4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okENI7SS+RkA
+Z70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv
+8qIYNMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV
+-----END CERTIFICATE-----
+
+# Issuer: CN=Equifax Secure eBusiness CA-1 O=Equifax Secure Inc.
+# Subject: CN=Equifax Secure eBusiness CA-1 O=Equifax Secure Inc.
+# Label: "Equifax Secure eBusiness CA 1"
+# Serial: 4
+# MD5 Fingerprint: 64:9c:ef:2e:44:fc:c6:8f:52:07:d0:51:73:8f:cb:3d
+# SHA1 Fingerprint: da:40:18:8b:91:89:a3:ed:ee:ae:da:97:fe:2f:9d:f5:b7:d1:8a:41
+# SHA256 Fingerprint: cf:56:ff:46:a4:a1:86:10:9d:d9:65:84:b5:ee:b5:8a:51:0c:42:75:b0:e5:f9:4f:40:bb:ae:86:5e:19:f6:73
+-----BEGIN CERTIFICATE-----
+MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBT
+ZWN1cmUgZUJ1c2luZXNzIENBLTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQw
+MDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5j
+LjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENBLTEwgZ8wDQYJ
+KoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ1MRo
+RvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBu
+WqDZQu4aIZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKw
+Env+j6YDAgMBAAGjZjBkMBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTAD
+AQH/MB8GA1UdIwQYMBaAFEp4MlIR21kWNl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRK
+eDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQFAAOBgQB1W6ibAxHm6VZM
+zfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5lSE/9dR+
+WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN
+/Bf+KpYrtWKmpj29f5JZzVoqgrI3eQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=AddTrust Class 1 CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Subject: CN=AddTrust Class 1 CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Label: "AddTrust Low-Value Services Root"
+# Serial: 1
+# MD5 Fingerprint: 1e:42:95:02:33:92:6b:b9:5f:c0:7f:da:d6:b2:4b:fc
+# SHA1 Fingerprint: cc:ab:0e:a0:4c:23:01:d6:69:7b:dd:37:9f:cd:12:eb:24:e3:94:9d
+# SHA256 Fingerprint: 8c:72:09:27:9a:c0:4e:27:5e:16:d0:7f:d3:b7:75:e8:01:54:b5:96:80:46:e3:1f:52:dd:25:76:63:24:e9:a7
+-----BEGIN CERTIFICATE-----
+MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
+b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMw
+MTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYD
+VQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ul
+CDtbKRY654eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6n
+tGO0/7Gcrjyvd7ZWxbWroulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyl
+dI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1Zmne3yzxbrww2ywkEtvrNTVokMsAsJch
+PXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJuiGMx1I4S+6+JNM3GOGvDC
++Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8wHQYDVR0O
+BBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8E
+BTADAQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBl
+MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFk
+ZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENB
+IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxtZBsfzQ3duQH6lmM0MkhHma6X
+7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0PhiVYrqW9yTkkz
+43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
+eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJl
+pz/+0WatC7xrmYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOA
+WiFeIc9TVPC6b4nbqKqVz4vjccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
+-----END CERTIFICATE-----
+
+# Issuer: CN=AddTrust External CA Root O=AddTrust AB OU=AddTrust External TTP Network
+# Subject: CN=AddTrust External CA Root O=AddTrust AB OU=AddTrust External TTP Network
+# Label: "AddTrust External Root"
+# Serial: 1
+# MD5 Fingerprint: 1d:35:54:04:85:78:b0:3f:42:42:4d:bf:20:73:0a:3f
+# SHA1 Fingerprint: 02:fa:f3:e2:91:43:54:68:60:78:57:69:4d:f5:e4:5b:68:85:18:68
+# SHA256 Fingerprint: 68:7f:a4:51:38:22:78:ff:f0:c8:b1:1f:8d:43:d5:76:67:1c:6e:b2:bc:ea:b4:13:fb:83:d9:65:d0:6d:2f:f2
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
+IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
+MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
+FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
+bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
+dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
+H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
+uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
+mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
+a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
+E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
+WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
+VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
+Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
+cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
+IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
+AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
+YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
+6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
+Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
+c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
+mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
+-----END CERTIFICATE-----
+
+# Issuer: CN=AddTrust Public CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Subject: CN=AddTrust Public CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Label: "AddTrust Public Services Root"
+# Serial: 1
+# MD5 Fingerprint: c1:62:3e:23:c5:82:73:9c:03:59:4b:2b:e9:77:49:7f
+# SHA1 Fingerprint: 2a:b6:28:48:5e:78:fb:f3:ad:9e:79:10:dd:6b:df:99:72:2c:96:e5
+# SHA256 Fingerprint: 07:91:ca:07:49:b2:07:82:aa:d3:c7:d7:bd:0c:df:c9:48:58:35:84:3e:b2:d7:99:60:09:ce:43:ab:6c:69:27
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
+b3JrMSAwHgYDVQQDExdBZGRUcnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAx
+MDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtB
+ZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIDAeBgNV
+BAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV
+6tsfSlbunyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nX
+GCwwfQ56HmIexkvA/X1id9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnP
+dzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSGAa2Il+tmzV7R/9x98oTaunet3IAIx6eH
+1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAwHM+A+WD+eeSI8t0A65RF
+62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0GA1UdDgQW
+BBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUw
+AwEB/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDEL
+MAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRU
+cnVzdCBUVFAgTmV0d29yazEgMB4GA1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJv
+b3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4JNojVhaTdt02KLmuG7jD8WS6
+IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL+YPoRNWyQSW/
+iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao
+GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh
+4SINhwBk/ox9Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQm
+XiLsks3/QppEIW1cxeMiHV9HEufOX1362KqxMy3ZdvJOOjMMK7MtkAY=
+-----END CERTIFICATE-----
+
+# Issuer: CN=AddTrust Qualified CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Subject: CN=AddTrust Qualified CA Root O=AddTrust AB OU=AddTrust TTP Network
+# Label: "AddTrust Qualified Certificates Root"
+# Serial: 1
+# MD5 Fingerprint: 27:ec:39:47:cd:da:5a:af:e2:9a:01:65:21:a9:4c:bb
+# SHA1 Fingerprint: 4d:23:78:ec:91:95:39:b5:00:7f:75:8f:03:3b:21:1e:c5:4d:8b:cf
+# SHA256 Fingerprint: 80:95:21:08:05:db:4b:bc:35:5e:44:28:d8:fd:6e:c2:cd:e3:ab:5f:b9:7a:99:42:98:8e:b8:f4:dc:d0:60:16
+-----BEGIN CERTIFICATE-----
+MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEU
+MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
+b3JrMSMwIQYDVQQDExpBZGRUcnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1
+MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcxCzAJBgNVBAYTAlNFMRQwEgYDVQQK
+EwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIzAh
+BgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwq
+xBb/4Oxx64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G
+87B4pfYOQnrjfxvM0PC3KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i
+2O+tCBGaKZnhqkRFmhJePp1tUvznoD1oL/BLcHwTOK28FSXx1s6rosAx1i+f4P8U
+WfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GRwVY18BTcZTYJbqukB8c1
+0cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HUMIHRMB0G
+A1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0T
+AQH/BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6Fr
+pGkwZzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQL
+ExRBZGRUcnVzdCBUVFAgTmV0d29yazEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlm
+aWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBABmrder4i2VhlRO6aQTv
+hsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxGGuoYQ992zPlm
+hpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
+dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3
+P6CxB9bpT9zeRXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9Y
+iQBCYz95OdBEsIJuQRno3eDBiFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5no
+xqE=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Entrust Root Certification Authority O=Entrust, Inc. OU=www.entrust.net/CPS is incorporated by reference/(c) 2006 Entrust, Inc.
+# Subject: CN=Entrust Root Certification Authority O=Entrust, Inc. OU=www.entrust.net/CPS is incorporated by reference/(c) 2006 Entrust, Inc.
+# Label: "Entrust Root Certification Authority"
+# Serial: 1164660820
+# MD5 Fingerprint: d6:a5:c3:ed:5d:dd:3e:00:c1:3d:87:92:1f:1d:3f:e4
+# SHA1 Fingerprint: b3:1e:b1:b7:40:e3:6c:84:02:da:dc:37:d4:4d:f5:d4:67:49:52:f9
+# SHA256 Fingerprint: 73:c1:76:43:4f:1b:c6:d5:ad:f4:5b:0e:76:e7:27:28:7c:8d:e5:76:16:c1:e6:e6:14:1a:2b:2c:bc:7d:8e:4c
+-----BEGIN CERTIFICATE-----
+MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0
+Lm5ldC9DUFMgaXMgaW5jb3Jwb3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMW
+KGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsGA1UEAxMkRW50cnVzdCBSb290IENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0MloXDTI2MTEyNzIw
+NTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMTkw
+NwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSBy
+ZWZlcmVuY2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNV
+BAMTJEVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALaVtkNC+sZtKm9I35RMOVcF7sN5EUFo
+Nu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYszA9u3g3s+IIRe7bJWKKf4
+4LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOwwCj0Yzfv9
+KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGI
+rb68j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi
+94DkZfs0Nw4pgHBNrziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOB
+sDCBrTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAi
+gA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1MzQyWjAfBgNVHSMEGDAWgBRo
+kORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DHhmak8fdLQ/uE
+vW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
+A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9t
+O1KzKtvn1ISMY/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6Zua
+AGAT/3B+XxFNSRuzFVJ7yVTav52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP
+9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTSW3iDVuycNsMm4hH2Z0kdkquM++v/
+eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0tHuu2guQOHXvgR1m
+0vdXcDazv/wor3ElhVsT/h5/WrQ8
+-----END CERTIFICATE-----
+
+# Issuer: O=RSA Security Inc OU=RSA Security 2048 V3
+# Subject: O=RSA Security Inc OU=RSA Security 2048 V3
+# Label: "RSA Security 2048 v3"
+# Serial: 13297492616345471454730593562152402946
+# MD5 Fingerprint: 77:0d:19:b1:21:fd:00:42:9c:3e:0c:a5:dd:0b:02:8e
+# SHA1 Fingerprint: 25:01:90:19:cf:fb:d9:99:1c:b7:68:25:74:8d:94:5f:30:93:95:42
+# SHA256 Fingerprint: af:8b:67:62:a1:e5:28:22:81:61:a9:5d:5c:55:9e:e2:66:27:8f:75:d7:9e:83:01:89:a5:03:50:6a:bd:6b:4c
+-----BEGIN CERTIFICATE-----
+MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6
+MRkwFwYDVQQKExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJp
+dHkgMjA0OCBWMzAeFw0wMTAyMjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAX
+BgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAbBgNVBAsTFFJTQSBTZWN1cml0eSAy
+MDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt49VcdKA3Xtp
+eafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7Jylg
+/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGl
+wSMiuLgbWhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnh
+AMFRD0xS+ARaqn1y07iHKrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2
+PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP+Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpu
+AWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
+BjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4EFgQUB8NR
+MKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYc
+HnmYv/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/
+Zb5gEydxiKRz44Rj0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+
+f00/FGj1EVDVwfSQpQgdMWD/YIwjVAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVO
+rSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395nzIlQnQFgCi/vcEkllgVsRch
+6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kApKnXwiJPZ9d3
+7CAFYd4=
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Global CA O=GeoTrust Inc.
+# Subject: CN=GeoTrust Global CA O=GeoTrust Inc.
+# Label: "GeoTrust Global CA"
+# Serial: 144470
+# MD5 Fingerprint: f7:75:ab:29:fb:51:4e:b7:77:5e:ff:05:3c:99:8e:f5
+# SHA1 Fingerprint: de:28:f4:a4:ff:e5:b9:2f:a3:c5:03:d1:a3:49:a7:f9:96:2a:82:12
+# SHA256 Fingerprint: ff:85:6a:2d:25:1d:cd:88:d3:66:56:f4:50:12:67:98:cf:ab:aa:de:40:79:9c:72:2d:e4:d2:b5:db:36:a7:3a
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
+MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
+YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
+R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
+9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
+fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
+iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
+1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
+bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
+MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
+ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
+uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
+Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
+tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
+PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
+hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
+5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Global CA 2 O=GeoTrust Inc.
+# Subject: CN=GeoTrust Global CA 2 O=GeoTrust Inc.
+# Label: "GeoTrust Global CA 2"
+# Serial: 1
+# MD5 Fingerprint: 0e:40:a7:6c:de:03:5d:8f:d1:0f:e4:d1:8d:f9:6c:a9
+# SHA1 Fingerprint: a9:e9:78:08:14:37:58:88:f2:05:19:b0:6d:2b:0d:2b:60:16:90:7d
+# SHA256 Fingerprint: ca:2d:82:a0:86:77:07:2f:8a:b6:76:4f:f0:35:67:6c:fe:3e:5e:32:5e:01:21:72:df:3f:92:09:6d:b7:9b:85
+-----BEGIN CERTIFICATE-----
+MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEW
+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFs
+IENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3Qg
+R2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvPE1A
+PRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/NTL8
+Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hL
+TytCOb1kLUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL
+5mkWRxHCJ1kDs6ZgwiFAVvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7
+S4wMcoKK+xfNAGw6EzywhIdLFnopsk/bHdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe
+2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNHK266ZUap
+EBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6td
+EPx7srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv
+/NgdRN3ggX+d6YvhZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywN
+A0ZF66D0f0hExghAzN4bcLUprbqLOzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0
+abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkCx1YAzUm5s2x7UwQa4qjJqhIF
+I8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqFH4z1Ir+rzoPz
+4iIprn2DQKi6bA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Universal CA O=GeoTrust Inc.
+# Subject: CN=GeoTrust Universal CA O=GeoTrust Inc.
+# Label: "GeoTrust Universal CA"
+# Serial: 1
+# MD5 Fingerprint: 92:65:58:8b:a2:1a:31:72:73:68:5c:b4:a5:7a:07:48
+# SHA1 Fingerprint: e6:21:f3:35:43:79:05:9a:4b:68:30:9d:8a:2f:74:22:15:87:ec:79
+# SHA256 Fingerprint: a0:45:9b:9f:63:b2:25:59:f5:fa:5d:4c:6d:b3:f9:f7:2f:f1:93:42:03:35:78:f0:73:bf:1d:1b:46:cb:b9:12
+-----BEGIN CERTIFICATE-----
+MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEW
+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVy
+c2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UE
+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0
+IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYV
+VaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8
+cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTT
+QjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFh
+F7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2v
+c7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/w
+mZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xd
+VHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCX
+teGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZ
+f9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfRe
+Bi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+
+nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB
+/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQY
+MBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG
+9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
+aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fX
+IwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzyn
+ANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0z
+uzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqN
+Pnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKja
+QI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKW
+koRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9
+ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQt
+DF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/Sfuvm
+bJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw=
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Universal CA 2 O=GeoTrust Inc.
+# Subject: CN=GeoTrust Universal CA 2 O=GeoTrust Inc.
+# Label: "GeoTrust Universal CA 2"
+# Serial: 1
+# MD5 Fingerprint: 34:fc:b8:d0:36:db:9e:14:b3:c2:f2:db:8f:e4:94:c7
+# SHA1 Fingerprint: 37:9a:19:7b:41:85:45:35:0c:a6:03:69:f3:3c:2e:af:47:4f:20:79
+# SHA256 Fingerprint: a0:23:4f:3b:c8:52:7c:a5:62:8e:ec:81:ad:5d:69:89:5d:a5:68:0d:c9:1d:1c:b8:47:7f:33:f8:78:b9:5b:0b
+-----BEGIN CERTIFICATE-----
+MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEW
+MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVy
+c2FsIENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYD
+VQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1
+c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0DE81
+WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUG
+FF+3Qs17j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdq
+XbboW0W63MOhBW9Wjo8QJqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxL
+se4YuU6W3Nx2/zu+z18DwPw76L5GG//aQMJS9/7jOvdqdzXQ2o3rXhhqMcceujwb
+KNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2WP0+GfPtDCapkzj4T8Fd
+IgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP20gaXT73
+y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRt
+hAAnZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgoc
+QIgfksILAAX/8sgCSqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4
+Lt1ZrtmhN79UNdxzMk+MBB4zsslG8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAfBgNV
+HSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8EBAMCAYYwDQYJ
+KoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
+dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQ
+L1EuxBRa3ugZ4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgr
+Fg5fNuH8KrUwJM/gYwx7WBr+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSo
+ag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpqA1Ihn0CoZ1Dy81of398j9tx4TuaY
+T1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpgY+RdM4kX2TGq2tbz
+GDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiPpm8m
+1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJV
+OCiNUW7dFGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH
+6aLcr34YEoP9VhdBLtUpgn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwX
+QMAJKOSLakhT2+zNVVXxxvjpoixMptEmX36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
+-----END CERTIFICATE-----
+
+# Issuer: CN=America Online Root Certification Authority 1 O=America Online Inc.
+# Subject: CN=America Online Root Certification Authority 1 O=America Online Inc.
+# Label: "America Online Root Certification Authority 1"
+# Serial: 1
+# MD5 Fingerprint: 14:f1:08:ad:9d:fa:64:e2:89:e7:1c:cf:a8:ad:7d:5e
+# SHA1 Fingerprint: 39:21:c1:15:c1:5d:0e:ca:5c:cb:5b:c4:f0:7d:21:d8:05:0b:56:6a
+# SHA256 Fingerprint: 77:40:73:12:c6:3a:15:3d:5b:c0:0b:4e:51:75:9c:df:da:c2:37:dc:2a:33:b6:79:46:e9:8e:9b:fa:68:0a:e3
+-----BEGIN CERTIFICATE-----
+MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTQW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBP
+bmxpbmUgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyODA2
+MDAwMFoXDTM3MTExOTIwNDMwMFowYzELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0Ft
+ZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2EgT25saW5lIFJvb3Qg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAKgv6KRpBgNHw+kqmP8ZonCaxlCyfqXfaE0bfA+2l2h9LaaLl+lk
+hsmj76CGv2BlnEtUiMJIxUo5vxTjWVXlGbR0yLQFOVwWpeKVBeASrlmLojNoWBym
+1BW32J/X3HGrfpq/m44zDyL9Hy7nBzbvYjnF3cu6JRQj3gzGPTzOggjmZj7aUTsW
+OqMFf6Dch9Wc/HKpoH145LcxVR5lu9RhsCFg7RAycsWSJR74kEoYeEfffjA3PlAb
+2xzTa5qGUwew76wGePiEmf4hjUyAtgyC9mZweRrTT6PP8c9GsEsPPt2IYriMqQko
+O3rHl+Ee5fSfwMCuJKDIodkP1nsmgmkyPacCAwEAAaNjMGEwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUAK3Zo/Z59m50qX8zPYEX10zPM94wHwYDVR0jBBgwFoAU
+AK3Zo/Z59m50qX8zPYEX10zPM94wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB
+BQUAA4IBAQB8itEfGDeC4Liwo+1WlchiYZwFos3CYiZhzRAW18y0ZTTQEYqtqKkF
+Zu90821fnZmv9ov761KyBZiibyrFVL0lvV+uyIbqRizBs73B6UlwGBaXCBOMIOAb
+LjpHyx7kADCVW/RFo8AasAFOq73AI25jP4BKxQft3OJvx8Fi8eNy1gTIdGcL+oir
+oQHIb/AUr9KZzVGTfu0uOMe9zkZQPXLjeSWdm4grECDdpbgyn43gKd8hdIaC2y+C
+MMbHNYaz+ZZfRtsMRf3zUMNvxsNIrUam4SdHCh0Om7bCd39j8uB9Gr784N/Xx6ds
+sPmuujz9dLQR6FgNgLzTqIA6me11zEZ7
+-----END CERTIFICATE-----
+
+# Issuer: CN=America Online Root Certification Authority 2 O=America Online Inc.
+# Subject: CN=America Online Root Certification Authority 2 O=America Online Inc.
+# Label: "America Online Root Certification Authority 2"
+# Serial: 1
+# MD5 Fingerprint: d6:ed:3c:ca:e2:66:0f:af:10:43:0d:77:9b:04:09:bf
+# SHA1 Fingerprint: 85:b5:ff:67:9b:0c:79:96:1f:c8:6e:44:22:00:46:13:db:17:92:84
+# SHA256 Fingerprint: 7d:3b:46:5a:60:14:e5:26:c0:af:fc:ee:21:27:d2:31:17:27:ad:81:1c:26:84:2d:00:6a:f3:73:06:cc:80:bd
+-----BEGIN CERTIFICATE-----
+MIIFpDCCA4ygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTQW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBP
+bmxpbmUgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAyMB4XDTAyMDUyODA2
+MDAwMFoXDTM3MDkyOTE0MDgwMFowYzELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0Ft
+ZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2EgT25saW5lIFJvb3Qg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAMxBRR3pPU0Q9oyxQcngXssNt79Hc9PwVU3dxgz6sWYFas14tNwC
+206B89enfHG8dWOgXeMHDEjsJcQDIPT/DjsS/5uN4cbVG7RtIuOx238hZK+GvFci
+KtZHgVdEglZTvYYUAQv8f3SkWq7xuhG1m1hagLQ3eAkzfDJHA1zEpYNI9FdWboE2
+JxhP7JsowtS013wMPgwr38oE18aO6lhOqKSlGBxsRZijQdEt0sdtjRnxrXm3gT+9
+BoInLRBYBbV4Bbkv2wxrkJB+FFk4u5QkE+XRnRTf04JNRvCAOVIyD+OEsnpD8l7e
+Xz8d3eOyG6ChKiMDbi4BFYdcpnV1x5dhvt6G3NRI270qv0pV2uh9UPu0gBe4lL8B
+PeraunzgWGcXuVjgiIZGZ2ydEEdYMtA1fHkqkKJaEBEjNa0vzORKW6fIJ/KD3l67
+Xnfn6KVuY8INXWHQjNJsWiEOyiijzirplcdIz5ZvHZIlyMbGwcEMBawmxNJ10uEq
+Z8A9W6Wa6897GqidFEXlD6CaZd4vKL3Ob5Rmg0gp2OpljK+T2WSfVVcmv2/LNzGZ
+o2C7HK2JNDJiuEMhBnIMoVxtRsX6Kc8w3onccVvdtjc+31D1uAclJuW8tf48ArO3
++L5DwYcRlJ4jbBeKuIonDFRH8KmzwICMoCfrHRnjB453cMor9H124HhnAgMBAAGj
+YzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE1FwWg4u3OpaaEg5+31IqEj
+FNeeMB8GA1UdIwQYMBaAFE1FwWg4u3OpaaEg5+31IqEjFNeeMA4GA1UdDwEB/wQE
+AwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAZ2sGuV9FOypLM7PmG2tZTiLMubekJcmn
+xPBUlgtk87FYT15R/LKXeydlwuXK5w0MJXti4/qftIe3RUavg6WXSIylvfEWK5t2
+LHo1YGwRgJfMqZJS5ivmae2p+DYtLHe/YUjRYwu5W1LtGLBDQiKmsXeu3mnFzccc
+obGlHBD7GL4acN3Bkku+KVqdPzW+5X1R+FXgJXUjhx5c3LqdsKyzadsXg8n33gy8
+CNyRnqjQ1xU3c6U1uPx+xURABsPr+CKAXEfOAuMRn0T//ZoyzH1kUQ7rVyZ2OuMe
+IjzCpjbdGe+n/BLzJsBZMYVMnNjP36TMzCmT/5RtdlwTCJfy7aULTd3oyWgOZtMA
+DjMSW7yV5TKQqLPGbIOtd+6Lfn6xqavT4fG2wLHqiMDn05DpKJKUe2h7lyoKZy2F
+AjgQ5ANh1NolNscIWC2hp1GvMApJ9aZphwctREZ2jirlmjvXGKL8nDgQzMY70rUX
+Om/9riW99XJZZLF0KjhfGEzfz3EEWjbUvy+ZnOjZurGV5gJLIaFb1cFPj65pbVPb
+AZO1XB4Y3WRayhgoPmMEEf0cjQAPuDffZ4qdZqkCapH/E8ovXYO8h5Ns3CRRFgQl
+Zvqz2cK6Kb6aSDiCmfS/O0oxGfm/jiEzFMpPVF/7zvuPcX/9XhmgD0uRuMRUvAaw
+RY8mkaKO/qk=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Visa eCommerce Root O=VISA OU=Visa International Service Association
+# Subject: CN=Visa eCommerce Root O=VISA OU=Visa International Service Association
+# Label: "Visa eCommerce Root"
+# Serial: 25952180776285836048024890241505565794
+# MD5 Fingerprint: fc:11:b8:d8:08:93:30:00:6d:23:f9:7e:eb:52:1e:02
+# SHA1 Fingerprint: 70:17:9b:86:8c:00:a4:fa:60:91:52:22:3f:9f:3e:32:bd:e0:05:62
+# SHA256 Fingerprint: 69:fa:c9:bd:55:fb:0a:c7:8d:53:bb:ee:5c:f1:d5:97:98:9f:d0:aa:ab:20:a2:51:51:bd:f1:73:3e:e7:d1:22
+-----BEGIN CERTIFICATE-----
+MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBr
+MQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRl
+cm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv
+bW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2WhcNMjIwNjI0MDAxNjEyWjBrMQsw
+CQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5h
+dGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1l
+cmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h
+2mCxlCfLF9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4E
+lpF7sDPwsRROEW+1QK8bRaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdV
+ZqW1LS7YgFmypw23RuwhY/81q6UCzyr0TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq
+299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI/k4+oKsGGelT84ATB+0t
+vz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzsGHxBvfaL
+dXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD
+AgEGMB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUF
+AAOCAQEAX/FBfXxcCLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcR
+zCSs00Rsca4BIGsDoo8Ytyk6feUWYFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3
+LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pzzkWKsKZJ/0x9nXGIxHYdkFsd
+7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBuYQa7FkKMcPcw
+++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
+398znM/jra6O1I7mT1GvFpLgXPYHDw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Certum CA O=Unizeto Sp. z o.o.
+# Subject: CN=Certum CA O=Unizeto Sp. z o.o.
+# Label: "Certum Root CA"
+# Serial: 65568
+# MD5 Fingerprint: 2c:8f:9f:66:1d:18:90:b1:47:26:9d:8e:86:82:8c:a9
+# SHA1 Fingerprint: 62:52:dc:40:f7:11:43:a2:2f:de:9e:f7:34:8e:06:42:51:b1:81:18
+# SHA256 Fingerprint: d8:e0:fe:bc:1d:b2:e3:8d:00:94:0f:37:d2:7d:41:34:4d:99:3e:73:4b:99:d5:65:6d:97:78:d4:d8:14:36:24
+-----BEGIN CERTIFICATE-----
+MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
+QTAeFw0wMjA2MTExMDQ2MzlaFw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBM
+MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
+QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6xwS7TT3zNJc4YPk/E
+jG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdLkKWo
+ePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GI
+ULdtlkIJ89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapu
+Ob7kky/ZR6By6/qmW6/KUz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUg
+AKpoC6EahQGcxEZjgoi2IrHu/qpGWX7PNSzVttpd90gzFFS269lvzs2I1qsb2pY7
+HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
+uI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+GXYkHAQa
+TOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTg
+xSvgGrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1q
+CjqTE5s7FCMTY5w/0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5x
+O/fIR/RpbxXyEV6DHpx8Uq79AtoSqFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs
+6GAqm4VKQPNriiTsBhYscw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=AAA Certificate Services O=Comodo CA Limited
+# Subject: CN=AAA Certificate Services O=Comodo CA Limited
+# Label: "Comodo AAA Services root"
+# Serial: 1
+# MD5 Fingerprint: 49:79:04:b0:eb:87:19:ac:47:b0:bc:11:51:9b:74:d0
+# SHA1 Fingerprint: d1:eb:23:a4:6d:17:d6:8f:d9:25:64:c2:f1:f1:60:17:64:d8:e3:49
+# SHA256 Fingerprint: d7:a7:a0:fb:5d:7e:27:31:d7:71:e9:48:4e:bc:de:f7:1d:5f:0c:3e:0a:29:48:78:2b:c8:3e:e0:ea:69:9e:f4
+-----BEGIN CERTIFICATE-----
+MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj
+YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL
+MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
+BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM
+GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua
+BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe
+3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4
+YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR
+rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm
+ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
+oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v
+QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t
+b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF
+AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q
+GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
+Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2
+G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi
+l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3
+smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Secure Certificate Services O=Comodo CA Limited
+# Subject: CN=Secure Certificate Services O=Comodo CA Limited
+# Label: "Comodo Secure Services root"
+# Serial: 1
+# MD5 Fingerprint: d3:d9:bd:ae:9f:ac:67:24:b3:c8:1b:52:e1:b9:a9:bd
+# SHA1 Fingerprint: 4a:65:d5:f4:1d:ef:39:b8:b8:90:4a:4a:d3:64:81:33:cf:c7:a1:d1
+# SHA256 Fingerprint: bd:81:ce:3b:4f:65:91:d1:1a:67:b5:fc:7a:47:fd:ef:25:52:1b:f9:aa:4e:18:b9:e3:df:2e:34:a7:80:3b:e8
+-----BEGIN CERTIFICATE-----
+MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEb
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRp
+ZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVow
+fjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAiBgNV
+BAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPM
+cm3ye5drswfxdySRXyWP9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3S
+HpR7LZQdqnXXs5jLrLxkU0C8j6ysNstcrbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996
+CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rCoznl2yY4rYsK7hljxxwk
+3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3Vp6ea5EQz
+6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNV
+HQ4EFgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
+EwEB/wQFMAMBAf8wgYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2Rv
+Y2EuY29tL1NlY3VyZUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRw
+Oi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmww
+DQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm4J4oqF7Tt/Q0
+5qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj
+Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtI
+gKvcnDe4IRRLDXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJ
+aD61JlfutuC23bkpgHl9j6PwpCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDl
+izeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1HRR3B7Hzs/Sk=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Trusted Certificate Services O=Comodo CA Limited
+# Subject: CN=Trusted Certificate Services O=Comodo CA Limited
+# Label: "Comodo Trusted Services root"
+# Serial: 1
+# MD5 Fingerprint: 91:1b:3f:6e:cd:9e:ab:ee:07:fe:1f:71:d2:b3:61:27
+# SHA1 Fingerprint: e1:9f:e3:0e:8b:84:60:9e:80:9b:17:0d:72:a8:c5:ba:6e:14:09:bd
+# SHA256 Fingerprint: 3f:06:e5:56:81:d4:96:f5:be:16:9e:b5:38:9f:9f:2b:8f:f6:1e:17:08:df:68:81:72:48:49:cd:5d:27:cb:69
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEb
+MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
+GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0
+aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEwMDAwMDBaFw0yODEyMzEyMzU5NTla
+MH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
+BgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUwIwYD
+VQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWW
+fnJSoBVC21ndZHoa0Lh73TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMt
+TGo87IvDktJTdyR0nAducPy9C1t2ul/y/9c3S0pgePfw+spwtOpZqqPOSC+pw7IL
+fhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6juljatEPmsbS9Is6FARW
+1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsSivnkBbA7
+kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0G
+A1UdDgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21v
+ZG9jYS5jb20vVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRo
+dHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMu
+Y3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8NtwuleGFTQQuS9/
+HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32
+pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxIS
+jBc/lDb+XbDABHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+
+xqFx7D+gIIxmOom0jtTYsU0lR+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/Atyjcn
+dBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O9y5Xt5hwXsjEeLBi
+-----END CERTIFICATE-----
+
+# Issuer: CN=QuoVadis Root Certification Authority O=QuoVadis Limited OU=Root Certification Authority
+# Subject: CN=QuoVadis Root Certification Authority O=QuoVadis Limited OU=Root Certification Authority
+# Label: "QuoVadis Root CA"
+# Serial: 985026699
+# MD5 Fingerprint: 27:de:36:fe:72:b7:00:03:00:9d:f4:f0:1e:6c:04:24
+# SHA1 Fingerprint: de:3f:40:bd:50:93:d3:9b:6c:60:f6:da:bc:07:62:01:00:89:76:c9
+# SHA256 Fingerprint: a4:5e:de:3b:bb:f0:9c:8a:e1:5c:72:ef:c0:72:68:d6:93:a2:1c:99:6f:d5:1e:67:ca:07:94:60:fd:6d:88:73
+-----BEGIN CERTIFICATE-----
+MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC
+TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz
+MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw
+IwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR
+dW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp
+li4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D
+rOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ
+WCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug
+F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospU
+xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCC
+Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVv
+dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREw
+ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNl
+IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBh
+c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy
+ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
+Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI
+KwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T
+KbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq
+y+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p
+dGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD
+VQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL
+MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk
+fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf8
+7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1R
+cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0y
+mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQW
+xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK
+SnQ2+Q==
+-----END CERTIFICATE-----
+
+# Issuer: CN=QuoVadis Root CA 2 O=QuoVadis Limited
+# Subject: CN=QuoVadis Root CA 2 O=QuoVadis Limited
+# Label: "QuoVadis Root CA 2"
+# Serial: 1289
+# MD5 Fingerprint: 5e:39:7b:dd:f8:ba:ec:82:e9:ac:62:ba:0c:54:00:2b
+# SHA1 Fingerprint: ca:3a:fb:cf:12:40:36:4b:44:b2:16:20:88:80:48:39:19:93:7c:f7
+# SHA256 Fingerprint: 85:a0:dd:7d:d7:20:ad:b7:ff:05:f8:3d:54:2b:20:9d:c7:ff:45:28:f7:d6:77:b1:83:89:fe:a5:e5:c4:9e:86
+-----BEGIN CERTIFICATE-----
+MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
+GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
+b3QgQ0EgMjAeFw0wNjExMjQxODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNV
+BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
+YWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCa
+GMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6XJxg
+Fyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55J
+WpzmM+Yklvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bB
+rrcCaoF6qUWD4gXmuVbBlDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp
++ARz8un+XJiM9XOva7R+zdRcAitMOeGylZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1
+ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt66/3FsvbzSUr5R/7mp/i
+Ucw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1JdxnwQ5hYIiz
+PtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og
+/zOhD7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UH
+oycR7hYQe7xFSkyyBNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuI
+yV77zGHcizN300QyNQliBJIWENieJ0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1Ud
+EwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBQahGK8SEwzJQTU7tD2
+A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGUa6FJpEcwRTEL
+MAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
+ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2f
+BluornFdLwUvZ+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzn
+g/iN/Ae42l9NLmeyhP3ZRPx3UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2Bl
+fF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodmVjB3pjd4M1IQWK4/YY7yarHvGH5K
+WWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK+JDSV6IZUaUtl0Ha
+B0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrWIozc
+hLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPR
+TUIZ3Ph1WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWD
+mbA4CD/pXvk1B+TJYm5Xf6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0Z
+ohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y
+4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8VCLAAVBpQ570su9t+Oza
+8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
+-----END CERTIFICATE-----
+
+# Issuer: CN=QuoVadis Root CA 3 O=QuoVadis Limited
+# Subject: CN=QuoVadis Root CA 3 O=QuoVadis Limited
+# Label: "QuoVadis Root CA 3"
+# Serial: 1478
+# MD5 Fingerprint: 31:85:3c:62:94:97:63:b9:aa:fd:89:4e:af:6f:e0:cf
+# SHA1 Fingerprint: 1f:49:14:f7:d8:74:95:1d:dd:ae:02:c0:be:fd:3a:2d:82:75:51:85
+# SHA256 Fingerprint: 18:f1:fc:7f:20:5d:f8:ad:dd:eb:7f:e0:07:dd:57:e3:af:37:5a:9c:4d:8d:73:54:6b:f4:f1:fe:d1:e1:8d:35
+-----BEGIN CERTIFICATE-----
+MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
+GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
+b3QgQ0EgMzAeFw0wNjExMjQxOTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNV
+BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
+YWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDM
+V0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNggDhoB
+4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUr
+H556VOijKTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd
+8lyyBTNvijbO0BNO/79KDDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9Cabwv
+vWhDFlaJKjdhkf2mrk7AyxRllDdLkgbvBNDInIjbC3uBr7E9KsRlOni27tyAsdLT
+mZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwpp5ijJUMv7/FfJuGITfhe
+btfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8nT8KKdjc
+T5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDt
+WAEXMJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZ
+c6tsgLjoC2SToJyMGf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A
+4iLItLRkT9a6fUg+qGkM17uGcclzuD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYD
+VR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHTBgkrBgEEAb5YAAMwgcUwgZMG
+CCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmljYXRlIGNvbnN0
+aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
+aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVu
+dC4wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2Nw
+czALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4G
+A1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4ywLQoUmkRzBFMQswCQYDVQQGEwJC
+TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UEAxMSUXVvVmFkaXMg
+Um9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZVqyM0
+7ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSem
+d1o417+shvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd
++LJ2w/w4E6oM3kJpK27zPOuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B
+4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadN
+t54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp8kokUvd0/bpO5qgdAm6x
+DYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBCbjPsMZ57
+k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6s
+zHXug/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0j
+Wy10QJLZYxkNc91pvGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeT
+mJlglFwjz1onl14LBQaTNx47aTbrqZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK
+4SVhM7JZG+Ju1zdXtg2pEto=
+-----END CERTIFICATE-----
+
+# Issuer: O=SECOM Trust.net OU=Security Communication RootCA1
+# Subject: O=SECOM Trust.net OU=Security Communication RootCA1
+# Label: "Security Communication Root CA"
+# Serial: 0
+# MD5 Fingerprint: f1:bc:63:6a:54:e0:b5:27:f5:cd:e7:1a:e3:4d:6e:4a
+# SHA1 Fingerprint: 36:b1:2b:49:f9:81:9e:d7:4c:9e:bc:38:0f:c6:56:8f:5d:ac:b2:f7
+# SHA256 Fingerprint: e7:5e:72:ed:9f:56:0e:ec:6e:b4:80:00:73:a4:3f:c3:ad:19:19:5a:39:22:82:01:78:95:97:4a:99:02:6b:6c
+-----BEGIN CERTIFICATE-----
+MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEY
+MBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21t
+dW5pY2F0aW9uIFJvb3RDQTEwHhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5
+WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYD
+VQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw8yl8
+9f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJ
+DKaVv0uMDPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9
+Ms+k2Y7CI9eNqPPYJayX5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/N
+QV3Is00qVUarH9oe4kA92819uZKAnDfdDJZkndwi92SL32HeFZRSFaB9UslLqCHJ
+xrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2JChzAgMBAAGjPzA9MB0G
+A1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYwDwYDVR0T
+AQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vG
+kl3g0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfr
+Uj94nK9NrvjVT8+amCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5
+Bw+SUEmK3TGXX8npN6o7WWWXlDLJs58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJU
+JRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ6rBK+1YWc26sTfcioU+tHXot
+RSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAiFL39vmwLAw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Sonera Class2 CA O=Sonera
+# Subject: CN=Sonera Class2 CA O=Sonera
+# Label: "Sonera Class 2 Root CA"
+# Serial: 29
+# MD5 Fingerprint: a3:ec:75:0f:2e:88:df:fa:48:01:4e:0b:5c:48:6f:fb
+# SHA1 Fingerprint: 37:f7:6d:e6:07:7c:90:c5:b1:3e:93:1a:b7:41:10:b4:f2:e4:9a:27
+# SHA256 Fingerprint: 79:08:b4:03:14:c1:38:10:0b:51:8d:07:35:80:7f:fb:fc:f8:51:8a:00:95:33:71:05:ba:38:6b:15:3d:d9:27
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP
+MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx
+MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV
+BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o
+Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt
+5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s
+3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej
+vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu
+8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw
+DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG
+MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil
+zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/
+3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD
+FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6
+Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2
+ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M
+-----END CERTIFICATE-----
+
+# Issuer: CN=Staat der Nederlanden Root CA O=Staat der Nederlanden
+# Subject: CN=Staat der Nederlanden Root CA O=Staat der Nederlanden
+# Label: "Staat der Nederlanden Root CA"
+# Serial: 10000010
+# MD5 Fingerprint: 60:84:7c:5a:ce:db:0c:d4:cb:a7:e9:fe:02:c6:a9:c0
+# SHA1 Fingerprint: 10:1d:fa:3f:d5:0b:cb:bb:9b:b5:60:0c:19:55:a4:1a:f4:73:3a:04
+# SHA256 Fingerprint: d4:1d:82:9e:8c:16:59:82:2a:f9:3f:ce:62:bf:fc:de:26:4f:c8:4e:8b:95:0c:5f:f2:75:d0:52:35:46:95:a3
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJO
+TDEeMBwGA1UEChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFh
+dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEy
+MTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4wHAYDVQQKExVTdGFhdCBkZXIgTmVk
+ZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxhbmRlbiBSb290IENB
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFtvszn
+ExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw71
+9tV2U02PjLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MO
+hXeiD+EwR+4A5zN9RGcaC1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+U
+tFE5A3+y3qcym7RHjm+0Sq7lr7HcsBthvJly3uSJt3omXdozSVtSnA71iq3DuD3o
+BmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn622r+I/q85Ej0ZytqERAh
+SQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRVHSAAMDww
+OgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMv
+cm9vdC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA
+7Jbg0zTBLL9s+DANBgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k
+/rvuFbQvBgwp8qiSpGEN/KtcCFtREytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzm
+eafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbwMVcoEoJz6TMvplW0C5GUR5z6
+u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3ynGQI0DvDKcWy
+7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
+iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==
+-----END CERTIFICATE-----
+
+# Issuer: O=TDC Internet OU=TDC Internet Root CA
+# Subject: O=TDC Internet OU=TDC Internet Root CA
+# Label: "TDC Internet Root CA"
+# Serial: 986490188
+# MD5 Fingerprint: 91:f4:03:55:20:a1:f8:63:2c:62:de:ac:fb:61:1c:8e
+# SHA1 Fingerprint: 21:fc:bd:8e:7f:6c:af:05:1b:d1:b3:43:ec:a8:e7:61:47:f2:0f:8a
+# SHA256 Fingerprint: 48:98:c6:88:8c:0c:ff:b0:d3:e3:1a:ca:8a:37:d4:e3:51:5f:f7:46:d0:26:35:d8:66:46:cf:a0:a3:18:5a:e7
+-----BEGIN CERTIFICATE-----
+MIIEKzCCAxOgAwIBAgIEOsylTDANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJE
+SzEVMBMGA1UEChMMVERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQg
+Um9vdCBDQTAeFw0wMTA0MDUxNjMzMTdaFw0yMTA0MDUxNzAzMTdaMEMxCzAJBgNV
+BAYTAkRLMRUwEwYDVQQKEwxUREMgSW50ZXJuZXQxHTAbBgNVBAsTFFREQyBJbnRl
+cm5ldCBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxLhA
+vJHVYx/XmaCLDEAedLdInUaMArLgJF/wGROnN4NrXceO+YQwzho7+vvOi20jxsNu
+Zp+Jpd/gQlBn+h9sHvTQBda/ytZO5GhgbEaqHF1j4QeGDmUApy6mcca8uYGoOn0a
+0vnRrEvLznWv3Hv6gXPU/Lq9QYjUdLP5Xjg6PEOo0pVOd20TDJ2PeAG3WiAfAzc1
+4izbSysseLlJ28TQx5yc5IogCSEWVmb/Bexb4/DPqyQkXsN/cHoSxNK1EKC2IeGN
+eGlVRGn1ypYcNIUXJXfi9i8nmHj9eQY6otZaQ8H/7AQ77hPv01ha/5Lr7K7a8jcD
+R0G2l8ktCkEiu7vmpwIDAQABo4IBJTCCASEwEQYJYIZIAYb4QgEBBAQDAgAHMGUG
+A1UdHwReMFwwWqBYoFakVDBSMQswCQYDVQQGEwJESzEVMBMGA1UEChMMVERDIElu
+dGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTENMAsGA1UEAxME
+Q1JMMTArBgNVHRAEJDAigA8yMDAxMDQwNTE2MzMxN1qBDzIwMjEwNDA1MTcwMzE3
+WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUbGQBx/2FbazI2p5QCIUItTxWqFAw
+HQYDVR0OBBYEFGxkAcf9hW2syNqeUAiFCLU8VqhQMAwGA1UdEwQFMAMBAf8wHQYJ
+KoZIhvZ9B0EABBAwDhsIVjUuMDo0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4IBAQBO
+Q8zR3R0QGwZ/t6T609lN+yOfI1Rb5osvBCiLtSdtiaHsmGnc540mgwV5dOy0uaOX
+wTUA/RXaOYE6lTGQ3pfphqiZdwzlWqCE/xIWrG64jcN7ksKsLtB9KOy282A4aW8+
+2ARVPp7MVdK6/rtHBNcK2RYKNCn1WBPVT8+PVkuzHu7TmHnaCB4Mb7j4Fifvwm89
+9qNLPg7kbWzbO0ESm70NRyN/PErQr8Cv9u8btRXE64PECV90i9kR+8JWsTz4cMo0
+jUNAE4z9mQNUecYu6oah9jrUCbz0vGbMPVjQV0kK7iXiQe4T+Zs4NNEA9X7nlB38
+aQNiuJkFBT1reBK9sG9l
+-----END CERTIFICATE-----
+
+# Issuer: CN=UTN - DATACorp SGC O=The USERTRUST Network OU=http://www.usertrust.com
+# Subject: CN=UTN - DATACorp SGC O=The USERTRUST Network OU=http://www.usertrust.com
+# Label: "UTN DATACorp SGC Root CA"
+# Serial: 91374294542884689855167577680241077609
+# MD5 Fingerprint: b3:a5:3e:77:21:6d:ac:4a:c0:c9:fb:d5:41:3d:ca:06
+# SHA1 Fingerprint: 58:11:9f:0e:12:82:87:ea:50:fd:d9:87:45:6f:4f:78:dc:fa:d6:d4
+# SHA256 Fingerprint: 85:fb:2f:91:dd:12:27:5a:01:45:b6:36:53:4f:84:02:4a:d6:8b:69:b8:ee:88:68:4f:f7:11:37:58:05:b3:48
+-----BEGIN CERTIFICATE-----
+MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCB
+kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw
+IFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBaMIGTMQswCQYDVQQG
+EwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYD
+VQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cu
+dXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6
+E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZ
+D0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK
+4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykq
+lXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulW
+bfXv33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQAB
+o4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRT
+MtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3Js
+LnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUEIzAhBggr
+BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IB
+AQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft
+Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyj
+j98C5OBxOvG0I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVH
+KWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv
+2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3
+mfnGV/TJVTl4uix5yaaIK/QI
+-----END CERTIFICATE-----
+
+# Issuer: CN=UTN-USERFirst-Hardware O=The USERTRUST Network OU=http://www.usertrust.com
+# Subject: CN=UTN-USERFirst-Hardware O=The USERTRUST Network OU=http://www.usertrust.com
+# Label: "UTN USERFirst Hardware Root CA"
+# Serial: 91374294542884704022267039221184531197
+# MD5 Fingerprint: 4c:56:41:e5:0d:bb:2b:e8:ca:a3:ed:18:08:ad:43:39
+# SHA1 Fingerprint: 04:83:ed:33:99:ac:36:08:05:87:22:ed:bc:5e:46:00:e3:be:f9:d7
+# SHA256 Fingerprint: 6e:a5:47:41:d0:04:66:7e:ed:1b:48:16:63:4a:a3:a7:9e:6e:4b:96:95:0f:82:79:da:fc:8d:9b:d8:81:21:37
+-----BEGIN CERTIFICATE-----
+MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCB
+lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
+Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
+dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt
+SGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgxOTIyWjCBlzELMAkG
+A1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEe
+MBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8v
+d3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdh
+cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn
+0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlIwrthdBKWHTxqctU8EGc6Oe0rE81m65UJ
+M6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFdtqdt++BxF2uiiPsA3/4a
+MXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8i4fDidNd
+oI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqI
+DsjfPe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9Ksy
+oUhbAgMBAAGjgbkwgbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFKFyXyYbKJhDlV0HN9WFlp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0
+dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LUhhcmR3YXJlLmNy
+bDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUFBwMGBggrBgEF
+BQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
+//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28Gpgoiskli
+CE7/yMgUsogWXecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gE
+CJChicsZUN/KHAG8HQQZexB2lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t
+3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kniCrVWFCVH/A7HFe7fRQ5YiuayZSS
+KqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67nfhmqA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Chambers of Commerce Root O=AC Camerfirma SA CIF A82743287 OU=http://www.chambersign.org
+# Subject: CN=Chambers of Commerce Root O=AC Camerfirma SA CIF A82743287 OU=http://www.chambersign.org
+# Label: "Camerfirma Chambers of Commerce Root"
+# Serial: 0
+# MD5 Fingerprint: b0:01:ee:14:d9:af:29:18:94:76:8e:f1:69:33:2a:84
+# SHA1 Fingerprint: 6e:3a:55:a4:19:0c:19:5c:93:84:3c:c0:db:72:2e:31:30:61:f0:b1
+# SHA256 Fingerprint: 0c:25:8a:12:a5:67:4a:ef:25:f2:8b:a7:dc:fa:ec:ee:a3:48:e5:41:e6:f5:cc:4e:e6:3b:71:b3:61:60:6a:c3
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEn
+MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
+ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMg
+b2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAxNjEzNDNaFw0zNzA5MzAxNjEzNDRa
+MH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZpcm1hIFNBIENJRiBB
+ODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3JnMSIw
+IAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0B
+AQEFAAOCAQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtb
+unXF/KGIJPov7coISjlUxFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0d
+BmpAPrMMhe5cG3nCYsS4No41XQEMIwRHNaqbYE6gZj3LJgqcQKH0XZi/caulAGgq
+7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jWDA+wWFjbw2Y3npuRVDM3
+0pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFVd9oKDMyX
+roDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIG
+A1UdEwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5j
+aGFtYmVyc2lnbi5vcmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p
+26EpW1eLTXYGduHRooowDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIA
+BzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hhbWJlcnNpZ24ub3JnMCcGA1Ud
+EgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYDVR0gBFEwTzBN
+BgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
+aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEB
+AAxBl8IahsAifJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZd
+p0AJPaxJRUXcLo0waLIJuvvDL8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi
+1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wNUPf6s+xCX6ndbcj0dc97wXImsQEc
+XCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/nADydb47kMgkdTXg0
+eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1erfu
+tGWaIZDgqtCYvDi1czyL+Nw=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Global Chambersign Root O=AC Camerfirma SA CIF A82743287 OU=http://www.chambersign.org
+# Subject: CN=Global Chambersign Root O=AC Camerfirma SA CIF A82743287 OU=http://www.chambersign.org
+# Label: "Camerfirma Global Chambersign Root"
+# Serial: 0
+# MD5 Fingerprint: c5:e6:7b:bf:06:d0:4f:43:ed:c4:7a:65:8a:fb:6b:19
+# SHA1 Fingerprint: 33:9b:6b:14:50:24:9b:55:7a:01:87:72:84:d9:e0:2f:c3:d2:d8:e9
+# SHA256 Fingerprint: ef:3c:b4:17:fc:8e:bf:6f:97:87:6c:9e:4e:ce:39:de:1e:a5:fe:64:91:41:d1:02:8b:7d:11:c0:b2:29:8c:ed
+-----BEGIN CERTIFICATE-----
+MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEn
+MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
+ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENo
+YW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYxNDE4WhcNMzcwOTMwMTYxNDE4WjB9
+MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgy
+NzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4G
+A1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUA
+A4IBDQAwggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0
+Mi+ITaFgCPS3CU6gSS9J1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/s
+QJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8Oby4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpV
+eAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl6DJWk0aJqCWKZQbua795
+B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c8lCrEqWh
+z0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0T
+AQH/BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1i
+ZXJzaWduLm9yZy9jaGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4w
+TcbOX60Qq+UDpfqpFDAOBgNVHQ8BAf8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAH
+MCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBjaGFtYmVyc2lnbi5vcmcwKgYD
+VR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9yZzBbBgNVHSAE
+VDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh
+bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0B
+AQUFAAOCAQEAPDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUM
+bKGKfKX0j//U2K0X1S0E0T9YgOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXi
+ryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJPJ7oKXqJ1/6v/2j1pReQvayZzKWG
+VwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4IBHNfTIzSJRUTN3c
+ecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREest2d/
+AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
+-----END CERTIFICATE-----
+
+# Issuer: CN=NetLock Kozjegyzoi (Class A) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Subject: CN=NetLock Kozjegyzoi (Class A) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Label: "NetLock Notary (Class A) Root"
+# Serial: 259
+# MD5 Fingerprint: 86:38:6d:5e:49:63:6c:85:5c:db:6d:dc:94:b7:d0:f7
+# SHA1 Fingerprint: ac:ed:5f:65:53:fd:25:ce:01:5f:1f:7a:48:3b:6a:74:9f:61:78:c6
+# SHA256 Fingerprint: 7f:12:cd:5f:7e:5e:29:0e:c7:d8:51:79:d5:b7:2c:20:a5:be:75:08:ff:db:5b:f8:1a:b9:68:4a:7f:c9:f6:67
+-----BEGIN CERTIFICATE-----
+MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhV
+MRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMe
+TmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0
+dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFzcyBB
+KSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oXDTE5MDIxOTIzMTQ0
+N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhC
+dWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQu
+MRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBL
+b3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSMD7tM9DceqQWC2ObhbHDqeLVu0ThEDaiD
+zl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZz+qMkjvN9wfcZnSX9EUi
+3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC/tmwqcm8
+WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LY
+Oph7tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2Esi
+NCubMvJIH5+hCoR64sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCC
+ApswDgYDVR0PAQH/BAQDAgAGMBIGA1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4
+QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZRUxFTSEgRXplbiB0
+YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRhdGFz
+aSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu
+IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtm
+ZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMg
+ZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVs
+amFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJhc2EgbWVndGFsYWxoYXRv
+IGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBzOi8vd3d3
+Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6
+ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1
+YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3Qg
+dG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRs
+b2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNAbmV0bG9jay5uZXQuMA0G
+CSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5ayZrU3/b39/zcT0mwBQO
+xmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjPytoUMaFP
+0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQ
+QeJBCWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxk
+f1qbFFgBJ34TUMdrKuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK
+8CtmdWOMovsEPoMOmzbwGOQmIMOM8CgHrTwXZoi1/baI
+-----END CERTIFICATE-----
+
+# Issuer: CN=NetLock Uzleti (Class B) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Subject: CN=NetLock Uzleti (Class B) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Label: "NetLock Business (Class B) Root"
+# Serial: 105
+# MD5 Fingerprint: 39:16:aa:b9:6a:41:e1:14:69:df:9e:6c:3b:72:dc:b6
+# SHA1 Fingerprint: 87:9f:4b:ee:05:df:98:58:3b:e3:60:d6:33:e7:0d:3f:fe:98:71:af
+# SHA256 Fingerprint: 39:df:7b:68:2b:7b:93:8f:84:71:54:81:cc:de:8d:60:d8:f2:2e:c5:98:87:7d:0a:aa:c1:2b:59:18:2b:03:12
+-----BEGIN CERTIFICATE-----
+MIIFSzCCBLSgAwIBAgIBaTANBgkqhkiG9w0BAQQFADCBmTELMAkGA1UEBhMCSFUx
+ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0
+b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTIwMAYDVQQD
+EylOZXRMb2NrIFV6bGV0aSAoQ2xhc3MgQikgVGFudXNpdHZhbnlraWFkbzAeFw05
+OTAyMjUxNDEwMjJaFw0xOTAyMjAxNDEwMjJaMIGZMQswCQYDVQQGEwJIVTERMA8G
+A1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNh
+Z2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxMjAwBgNVBAMTKU5l
+dExvY2sgVXpsZXRpIChDbGFzcyBCKSBUYW51c2l0dmFueWtpYWRvMIGfMA0GCSqG
+SIb3DQEBAQUAA4GNADCBiQKBgQCx6gTsIKAjwo84YM/HRrPVG/77uZmeBNwcf4xK
+gZjupNTKihe5In+DCnVMm8Bp2GQ5o+2So/1bXHQawEfKOml2mrriRBf8TKPV/riX
+iK+IA4kfpPIEPsgHC+b5sy96YhQJRhTKZPWLgLViqNhr1nGTLbO/CVRY7QbrqHvc
+Q7GhaQIDAQABo4ICnzCCApswEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8E
+BAMCAAYwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1G
+SUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFu
+b3MgU3pvbGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBh
+bGFwamFuIGtlc3p1bHQuIEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExv
+Y2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGln
+aXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0
+IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJh
+c2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGph
+biBhIGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJo
+ZXRvIGF6IGVsbGVub3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBP
+UlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmlj
+YXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBo
+dHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNA
+bmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4GBAATbrowXr/gOkDFOzT4JwG06
+sPgzTEdM43WIEJessDgVkcYplswhwG08pXTP2IKlOcNl40JwuyKQ433bNXbhoLXa
+n3BukxowOR0w2y7jfLKRstE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKS
+NitjrFgBazMpUIaD8QFI
+-----END CERTIFICATE-----
+
+# Issuer: CN=NetLock Expressz (Class C) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Subject: CN=NetLock Expressz (Class C) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
+# Label: "NetLock Express (Class C) Root"
+# Serial: 104
+# MD5 Fingerprint: 4f:eb:f1:f0:70:c2:80:63:5d:58:9f:da:12:3c:a9:c4
+# SHA1 Fingerprint: e3:92:51:2f:0a:cf:f5:05:df:f6:de:06:7f:75:37:e1:65:ea:57:4b
+# SHA256 Fingerprint: 0b:5e:ed:4e:84:64:03:cf:55:e0:65:84:84:40:ed:2a:82:75:8b:f5:b9:aa:1f:25:3d:46:13:cf:a0:80:ff:3f
+-----BEGIN CERTIFICATE-----
+MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUx
+ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0
+b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQD
+EytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBDKSBUYW51c2l0dmFueWtpYWRvMB4X
+DTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJBgNVBAYTAkhVMREw
+DwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9u
+c2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMr
+TmV0TG9jayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzAN
+BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNA
+OoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3ZW3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC
+2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63euyucYT2BDMIJTLrdKwW
+RMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQwDgYDVR0P
+AQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEW
+ggJNRklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0
+YWxhbm9zIFN6b2xnYWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFz
+b2sgYWxhcGphbiBrZXN6dWx0LiBBIGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBO
+ZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1iaXp0b3NpdGFzYSB2ZWRpLiBB
+IGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0ZWxlIGF6IGVs
+b2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBs
+ZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25s
+YXBqYW4gYSBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kg
+a2VyaGV0byBheiBlbGxlbm9yemVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4g
+SU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5kIHRoZSB1c2Ugb2YgdGhpcyBjZXJ0
+aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQUyBhdmFpbGFibGUg
+YXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwgYXQg
+Y3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmY
+ta3UzbM2xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2g
+pO0u9f38vf5NNwgMvOOWgyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4
+Fp1hBWeAyNDYpQcCNJgEjTME1A==
+-----END CERTIFICATE-----
+
+# Issuer: CN=XRamp Global Certification Authority O=XRamp Security Services Inc OU=www.xrampsecurity.com
+# Subject: CN=XRamp Global Certification Authority O=XRamp Security Services Inc OU=www.xrampsecurity.com
+# Label: "XRamp Global CA Root"
+# Serial: 107108908803651509692980124233745014957
+# MD5 Fingerprint: a1:0b:44:b3:ca:10:d8:00:6e:9d:0f:d8:0f:92:0a:d1
+# SHA1 Fingerprint: b8:01:86:d1:eb:9c:86:a5:41:04:cf:30:54:f3:4c:52:b7:e5:58:c6
+# SHA256 Fingerprint: ce:cd:dc:90:50:99:d8:da:df:c5:b1:d2:09:b7:37:cb:e2:c1:8c:fb:2c:10:c0:ff:0b:cf:0d:32:86:fc:1a:a2
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB
+gjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEk
+MCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRY
+UmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcx
+NDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3
+dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2Vy
+dmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS6
+38eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCP
+KZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7Q
+DxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4
+qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRa
+JSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNVi
+PvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0P
+BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASs
+jVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0
+eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQAD
+ggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfAR
+vbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
+qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLa
+IR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSy
+i6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQ
+O+7ETPTsJ3xCwnR8gooJybQDJbw=
+-----END CERTIFICATE-----
+
+# Issuer: O=The Go Daddy Group, Inc. OU=Go Daddy Class 2 Certification Authority
+# Subject: O=The Go Daddy Group, Inc. OU=Go Daddy Class 2 Certification Authority
+# Label: "Go Daddy Class 2 CA"
+# Serial: 0
+# MD5 Fingerprint: 91:de:06:25:ab:da:fd:32:17:0c:bb:25:17:2a:84:67
+# SHA1 Fingerprint: 27:96:ba:e6:3f:18:01:e2:77:26:1b:a0:d7:77:70:02:8f:20:ee:e4
+# SHA256 Fingerprint: c3:84:6b:f2:4b:9e:93:ca:64:27:4c:0e:c6:7c:1e:cc:5e:02:4f:fc:ac:d2:d7:40:19:35:0e:81:fe:54:6a:e4
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh
+MB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBE
+YWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3
+MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRo
+ZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3Mg
+MiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN
+ADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCA
+PVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6w
+wdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXi
+EqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMY
+avx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+
+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLE
+sNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h
+/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5
+IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNy
+OO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7P
+TMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
+HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mER
+dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf
+ReYNnyicsbkqWletNw+vHX/bvZ8=
+-----END CERTIFICATE-----
+
+# Issuer: O=Starfield Technologies, Inc. OU=Starfield Class 2 Certification Authority
+# Subject: O=Starfield Technologies, Inc. OU=Starfield Class 2 Certification Authority
+# Label: "Starfield Class 2 CA"
+# Serial: 0
+# MD5 Fingerprint: 32:4a:4b:bb:c8:63:69:9b:be:74:9a:c6:dd:1d:46:24
+# SHA1 Fingerprint: ad:7e:1c:28:b0:64:ef:8f:60:03:40:20:14:c3:d0:e3:37:0e:b5:8a
+# SHA256 Fingerprint: 14:65:fa:20:53:97:b8:76:fa:a6:f0:a9:95:8e:55:90:e4:0f:cc:7f:aa:4f:b7:c2:c8:67:75:21:fb:5f:b6:58
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzEl
+MCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMp
+U3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQw
+NjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBoMQswCQYDVQQGEwJVUzElMCMGA1UE
+ChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZp
+ZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqGSIb3
+DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf
+8MOh2tTYbitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN
++lq2cwQlZut3f+dZxkqZJRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0
+X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVmepsZGD3/cVE8MC5fvj13c7JdBmzDI1aa
+K4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSNF4Azbl5KXZnJHoe0nRrA
+1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HFMIHCMB0G
+A1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fR
+zt0fhvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0
+YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBD
+bGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGsafPzWdqbAYcaT1epoXkJKtv3
+L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLMPUxA2IGvd56D
+eruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
+xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynp
+VSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEY
+WQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q=
+-----END CERTIFICATE-----
+
+# Issuer: CN=StartCom Certification Authority O=StartCom Ltd. OU=Secure Digital Certificate Signing
+# Subject: CN=StartCom Certification Authority O=StartCom Ltd. OU=Secure Digital Certificate Signing
+# Label: "StartCom Certification Authority"
+# Serial: 1
+# MD5 Fingerprint: 22:4d:8f:8a:fc:f7:35:c2:bb:57:34:90:7b:8b:22:16
+# SHA1 Fingerprint: 3e:2b:f7:f2:03:1b:96:f3:8c:e6:c4:d8:a8:5d:3e:2d:58:47:6a:0f
+# SHA256 Fingerprint: c7:66:a9:be:f2:d4:07:1c:86:3a:31:aa:49:20:e8:13:b2:d1:98:60:8c:b7:b7:cf:e2:11:43:b8:36:df:09:ea
+-----BEGIN CERTIFICATE-----
+MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
+Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9
+MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
+U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
+cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
+pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
+OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
+Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
+Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
+HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
+Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
++2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
+Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
+26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
+AQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
+FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9j
+ZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3Js
+LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFM
+BgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0
+Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFy
+dGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3Rh
+cnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlh
+YmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2Yg
+dGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFp
+bGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJ
+YIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNT
+TCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ
+9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8
+jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUW
+FjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJz
+ewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1
+ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5L
+EUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYu
+L6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
+yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuC
+O3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6V
+um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh
+NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14=
+-----END CERTIFICATE-----
+
+# Issuer: O=Government Root Certification Authority
+# Subject: O=Government Root Certification Authority
+# Label: "Taiwan GRCA"
+# Serial: 42023070807708724159991140556527066870
+# MD5 Fingerprint: 37:85:44:53:32:45:1f:20:f0:f3:95:e1:25:c4:43:4e
+# SHA1 Fingerprint: f4:8b:11:bf:de:ab:be:94:54:20:71:e6:41:de:6b:be:88:2b:40:b9
+# SHA256 Fingerprint: 76:00:29:5e:ef:e8:5b:9e:1f:d6:24:db:76:06:2a:aa:ae:59:81:8a:54:d2:77:4c:d4:c0:b2:c0:11:31:e1:b3
+-----BEGIN CERTIFICATE-----
+MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/
+MQswCQYDVQQGEwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5MB4XDTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1ow
+PzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dvdmVybm1lbnQgUm9vdCBDZXJ0aWZp
+Y2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+AJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qNw8XR
+IePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1q
+gQdW8or5BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKy
+yhwOeYHWtXBiCAEuTk8O1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAts
+F/tnyMKtsc2AtJfcdgEWFelq16TheEfOhtX7MfP6Mb40qij7cEwdScevLJ1tZqa2
+jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wovJ5pGfaENda1UhhXcSTvx
+ls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7Q3hub/FC
+VGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHK
+YS1tB6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoH
+EgKXTiCQ8P8NHuJBO9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThN
+Xo+EHWbNxWCWtFJaBYmOlXqYwZE8lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1Ud
+DgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNVHRMEBTADAQH/MDkGBGcqBwAE
+MTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg209yewDL7MTqK
+UWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
+TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyf
+qzvS/3WXy6TjZwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaK
+ZEk9GhiHkASfQlK3T8v+R0F2Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFE
+JPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlUD7gsL0u8qV1bYH+Mh6XgUmMqvtg7
+hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6QzDxARvBMB1uUO07+1
+EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+HbkZ6Mm
+nD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WX
+udpVBrkk7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44Vbnz
+ssQwmSNOXfJIoRIM3BKQCZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDe
+LMDDav7v3Aun+kbfYNucpllQdSNpc5Oy+fwC00fmcc4QAu4njIT/rEUNE1yDMuAl
+pYYsfPQS
+-----END CERTIFICATE-----
+
+# Issuer: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
+# Subject: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
+# Label: "Firmaprofesional Root CA"
+# Serial: 1
+# MD5 Fingerprint: 11:92:79:40:3c:b1:83:40:e5:ab:66:4a:67:92:80:df
+# SHA1 Fingerprint: a9:62:8f:4b:98:a9:1b:48:35:ba:d2:c1:46:32:86:bb:66:64:6a:8c
+# SHA256 Fingerprint: c1:cf:0b:52:09:64:35:e3:f1:b7:1d:aa:ec:45:5a:23:11:c8:40:4f:55:83:a9:e2:13:c6:9d:85:7d:94:33:05
+-----BEGIN CERTIFICATE-----
+MIIEVzCCAz+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCRVMx
+IjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1
+dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20w
+HhcNMDExMDI0MjIwMDAwWhcNMTMxMDI0MjIwMDAwWjCBnTELMAkGA1UEBhMCRVMx
+IjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1
+dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20w
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnIwNvbyOlXnjOlSztlB5u
+Cp4Bx+ow0Syd3Tfom5h5VtP8c9/Qit5Vj1H5WuretXDE7aTt/6MNbg9kUDGvASdY
+rv5sp0ovFy3Tc9UTHI9ZpTQsHVQERc1ouKDAA6XPhUJHlShbz++AbOCQl4oBPB3z
+hxAwJkh91/zpnZFx/0GaqUC1N5wpIE8fUuOgfRNtVLcK3ulqTgesrBlf3H5idPay
+BQC6haD9HThuy1q7hryUZzM1gywfI834yJFxzJeL764P3CkDG8A563DtwW4O2GcL
+iam8NeTvtjS0pbbELaW+0MOUJEjb35bTALVmGotmBQ/dPz/LP6pemkr4tErvlTcb
+AgMBAAGjgZ8wgZwwKgYDVR0RBCMwIYYfaHR0cDovL3d3dy5maXJtYXByb2Zlc2lv
+bmFsLmNvbTASBgNVHRMBAf8ECDAGAQH/AgEBMCsGA1UdEAQkMCKADzIwMDExMDI0
+MjIwMDAwWoEPMjAxMzEwMjQyMjAwMDBaMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
+FgQUMwugZtHq2s7eYpMEKFK1FH84aLcwDQYJKoZIhvcNAQEFBQADggEBAEdz/o0n
+VPD11HecJ3lXV7cVVuzH2Fi3AQL0M+2TUIiefEaxvT8Ub/GzR0iLjJcG1+p+o1wq
+u00vR+L4OQbJnC4xGgN49Lw4xiKLMzHwFgQEffl25EvXwOaD7FnMP97/T2u3Z36m
+hoEyIwOdyPdfwUpgpZKpsaSgYMN4h7Mi8yrrW6ntBas3D7Hi05V2Y1Z0jFhyGzfl
+ZKG+TQyTmAyX9odtsz/ny4Cm7YjHX1BiAuiZdBbQ5rQ58SfLyEDW44YQqSMSkuBp
+QWOnryULwMWSyx6Yo1q6xTMPoJcB3X/ge9YGVM+h4k0460tQtcsm9MracEpqoeJ5
+quGnM/b9Sh/22WA=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Wells Fargo Root Certificate Authority O=Wells Fargo OU=Wells Fargo Certification Authority
+# Subject: CN=Wells Fargo Root Certificate Authority O=Wells Fargo OU=Wells Fargo Certification Authority
+# Label: "Wells Fargo Root CA"
+# Serial: 971282334
+# MD5 Fingerprint: 20:0b:4a:7a:88:a7:a9:42:86:8a:5f:74:56:7b:88:05
+# SHA1 Fingerprint: 93:e6:ab:22:03:03:b5:23:28:dc:da:56:9e:ba:e4:d1:d1:cc:fb:65
+# SHA256 Fingerprint: 03:45:8b:6a:be:ec:c2:14:95:3d:97:14:9a:f4:53:91:69:1d:e9:f9:cd:cc:26:47:86:3a:3d:67:c9:5c:24:3b
+-----BEGIN CERTIFICATE-----
+MIID5TCCAs2gAwIBAgIEOeSXnjANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UEBhMC
+VVMxFDASBgNVBAoTC1dlbGxzIEZhcmdvMSwwKgYDVQQLEyNXZWxscyBGYXJnbyBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEvMC0GA1UEAxMmV2VsbHMgRmFyZ28gUm9v
+dCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDAxMDExMTY0MTI4WhcNMjEwMTE0
+MTY0MTI4WjCBgjELMAkGA1UEBhMCVVMxFDASBgNVBAoTC1dlbGxzIEZhcmdvMSww
+KgYDVQQLEyNXZWxscyBGYXJnbyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEvMC0G
+A1UEAxMmV2VsbHMgRmFyZ28gUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVqDM7Jvk0/82bfuUER84A4n13
+5zHCLielTWi5MbqNQ1mXx3Oqfz1cQJ4F5aHiidlMuD+b+Qy0yGIZLEWukR5zcUHE
+SxP9cMIlrCL1dQu3U+SlK93OvRw6esP3E48mVJwWa2uv+9iWsWCaSOAlIiR5NM4O
+JgALTqv9i86C1y8IcGjBqAr5dE8Hq6T54oN+J3N0Prj5OEL8pahbSCOz6+MlsoCu
+ltQKnMJ4msZoGK43YjdeUXWoWGPAUe5AeH6orxqg4bB4nVCMe+ez/I4jsNtlAHCE
+AQgAFG5Uhpq6zPk3EPbg3oQtnaSFN9OH4xXQwReQfhkhahKpdv0SAulPIV4XAgMB
+AAGjYTBfMA8GA1UdEwEB/wQFMAMBAf8wTAYDVR0gBEUwQzBBBgtghkgBhvt7hwcB
+CzAyMDAGCCsGAQUFBwIBFiRodHRwOi8vd3d3LndlbGxzZmFyZ28uY29tL2NlcnRw
+b2xpY3kwDQYJKoZIhvcNAQEFBQADggEBANIn3ZwKdyu7IvICtUpKkfnRLb7kuxpo
+7w6kAOnu5+/u9vnldKTC2FJYxHT7zmu1Oyl5GFrvm+0fazbuSCUlFLZWohDo7qd/
+0D+j0MNdJu4HzMPBJCGHHt8qElNvQRbn7a6U+oxy+hNH8Dx+rn0ROhPs7fpvcmR7
+nX1/Jv16+yWt6j4pf0zjAFcysLPp7VMX2YuyFA4w6OXVE8Zkr8QA1dhYJPz1j+zx
+x32l2w8n0cbyQIjmH/ZhqPRCyLk306m+LFZ4wnKbWV01QIroTmMatukgalHizqSQ
+33ZwmVxwQ023tqcZZE6St8WRPH9IFmV7Fv3L/PvZ1dZPIWU7Sn9Ho/s=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Swisscom Root CA 1 O=Swisscom OU=Digital Certificate Services
+# Subject: CN=Swisscom Root CA 1 O=Swisscom OU=Digital Certificate Services
+# Label: "Swisscom Root CA 1"
+# Serial: 122348795730808398873664200247279986742
+# MD5 Fingerprint: f8:38:7c:77:88:df:2c:16:68:2e:c2:e2:52:4b:b8:f9
+# SHA1 Fingerprint: 5f:3a:fc:0a:8b:64:f6:86:67:34:74:df:7e:a9:a2:fe:f9:fa:7a:51
+# SHA256 Fingerprint: 21:db:20:12:36:60:bb:2e:d4:18:20:5d:a1:1e:e7:a8:5a:65:e2:bc:6e:55:b5:af:7e:78:99:c8:a2:66:d9:2e
+-----BEGIN CERTIFICATE-----
+MIIF2TCCA8GgAwIBAgIQXAuFXAvnWUHfV8w/f52oNjANBgkqhkiG9w0BAQUFADBk
+MQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3Qg
+Q0EgMTAeFw0wNTA4MTgxMjA2MjBaFw0yNTA4MTgyMjA2MjBaMGQxCzAJBgNVBAYT
+AmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGlnaXRhbCBDZXJ0aWZp
+Y2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAxMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0LmwqAzZuz8h+BvVM5OAFmUgdbI9
+m2BtRsiMMW8Xw/qabFbtPMWRV8PNq5ZJkCoZSx6jbVfd8StiKHVFXqrWW/oLJdih
+FvkcxC7mlSpnzNApbjyFNDhhSbEAn9Y6cV9Nbc5fuankiX9qUvrKm/LcqfmdmUc/
+TilftKaNXXsLmREDA/7n29uj/x2lzZAeAR81sH8A25Bvxn570e56eqeqDFdvpG3F
+EzuwpdntMhy0XmeLVNxzh+XTF3xmUHJd1BpYwdnP2IkCb6dJtDZd0KTeByy2dbco
+kdaXvij1mB7qWybJvbCXc9qukSbraMH5ORXWZ0sKbU/Lz7DkQnGMU3nn7uHbHaBu
+HYwadzVcFh4rUx80i9Fs/PJnB3r1re3WmquhsUvhzDdf/X/NTa64H5xD+SpYVUNF
+vJbNcA78yeNmuk6NO4HLFWR7uZToXTNShXEuT46iBhFRyePLoW4xCGQMwtI89Tbo
+19AOeCMgkckkKmUpWyL3Ic6DXqTz3kvTaI9GdVyDCW4pa8RwjPWd1yAv/0bSKzjC
+L3UcPX7ape8eYIVpQtPM+GP+HkM5haa2Y0EQs3MevNP6yn0WR+Kn1dCjigoIlmJW
+bjTb2QK5MHXjBNLnj8KwEUAKrNVxAmKLMb7dxiNYMUJDLXT5xp6mig/p/r+D5kNX
+JLrvRjSq1xIBOO0CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0hBBYw
+FDASBgdghXQBUwABBgdghXQBUwABMBIGA1UdEwEB/wQIMAYBAf8CAQcwHwYDVR0j
+BBgwFoAUAyUv3m+CATpcLNwroWm1Z9SM0/0wHQYDVR0OBBYEFAMlL95vggE6XCzc
+K6FptWfUjNP9MA0GCSqGSIb3DQEBBQUAA4ICAQA1EMvspgQNDQ/NwNurqPKIlwzf
+ky9NfEBWMXrrpA9gzXrzvsMnjgM+pN0S734edAY8PzHyHHuRMSG08NBsl9Tpl7Ik
+Vh5WwzW9iAUPWxAaZOHHgjD5Mq2eUCzneAXQMbFamIp1TpBcahQq4FJHgmDmHtqB
+sfsUC1rxn9KVuj7QG9YVHaO+htXbD8BJZLsuUBlL0iT43R4HVtA4oJVwIHaM190e
+3p9xxCPvgxNcoyQVTSlAPGrEqdi3pkSlDfTgnXceQHAm/NrZNuR55LU/vJtlvrsR
+ls/bxig5OgjOR1tTWsWZ/l2p3e9M1MalrQLmjAcSHm8D0W+go/MpvRLHUKKwf4ip
+mXeascClOS5cfGniLLDqN2qk4Vrh9VDlg++luyqI54zb/W1elxmofmZ1a3Hqv7HH
+b6D0jqTsNFFbjCYDcKF31QESVwA12yPeDooomf2xEG9L/zgtYE4snOtnta1J7ksf
+rK/7DZBaZmBwXarNeNQk7shBoJMBkpxqnvy5JMWzFYJ+vq6VK+uxwNrjAWALXmms
+hFZhvnEX/h0TD/7Gh0Xp/jKgGg0TpJRVcaUWi7rKibCyx/yP2FS1k2Kdzs9Z+z0Y
+zirLNRWCXf9UIltxUvu3yf5gmwBBZPCqKuy2QkPOiWaByIufOVQDJdMWNY6E0F/6
+MBr1mmz0DlP5OlvRHA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=DigiCert Assured ID Root CA O=DigiCert Inc OU=www.digicert.com
+# Subject: CN=DigiCert Assured ID Root CA O=DigiCert Inc OU=www.digicert.com
+# Label: "DigiCert Assured ID Root CA"
+# Serial: 17154717934120587862167794914071425081
+# MD5 Fingerprint: 87:ce:0b:7b:2a:0e:49:00:e1:58:71:9b:37:a8:93:72
+# SHA1 Fingerprint: 05:63:b8:63:0d:62:d7:5a:bb:c8:ab:1e:4b:df:b5:a8:99:b2:4d:43
+# SHA256 Fingerprint: 3e:90:99:b5:01:5e:8f:48:6c:00:bc:ea:9d:11:1e:e7:21:fa:ba:35:5a:89:bc:f1:df:69:56:1e:3d:c6:32:5c
+-----BEGIN CERTIFICATE-----
+MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBl
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv
+b3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzExMTEwMDAwMDAwWjBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl
+cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7c
+JpSIqvTO9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYP
+mDI2dsze3Tyoou9q+yHyUmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+
+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4
+VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpyoeb6pNnVFzF1roV9Iq4/
+AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whfGHdPAgMB
+AAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW
+BBRF66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYun
+pyGd823IDzANBgkqhkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRC
+dWKuh+vy1dneVrOfzM4UKLkNl2BcEkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTf
+fwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38FnSbNd67IJKusm7Xi+fT8r87cm
+NW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i8b5QZ7dsvfPx
+H2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
+-----END CERTIFICATE-----
+
+# Issuer: CN=DigiCert Global Root CA O=DigiCert Inc OU=www.digicert.com
+# Subject: CN=DigiCert Global Root CA O=DigiCert Inc OU=www.digicert.com
+# Label: "DigiCert Global Root CA"
+# Serial: 10944719598952040374951832963794454346
+# MD5 Fingerprint: 79:e4:a9:84:0d:7d:3a:96:d7:c0:4f:e2:43:4c:89:2e
+# SHA1 Fingerprint: a8:98:5d:3a:65:e5:e5:c4:b2:d7:d6:6d:40:c6:dd:2f:b1:9c:54:36
+# SHA256 Fingerprint: 43:48:a0:e9:44:4c:78:cb:26:5e:05:8d:5e:89:44:b4:d8:4f:96:62:bd:26:db:25:7f:89:34:a4:43:c7:01:61
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
+QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT
+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
+b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB
+CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97
+nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt
+43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P
+T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4
+gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO
+BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR
+TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw
+DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr
+hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg
+06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF
+PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls
+YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
+CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
+-----END CERTIFICATE-----
+
+# Issuer: CN=DigiCert High Assurance EV Root CA O=DigiCert Inc OU=www.digicert.com
+# Subject: CN=DigiCert High Assurance EV Root CA O=DigiCert Inc OU=www.digicert.com
+# Label: "DigiCert High Assurance EV Root CA"
+# Serial: 3553400076410547919724730734378100087
+# MD5 Fingerprint: d4:74:de:57:5c:39:b2:d3:9c:85:83:c5:c0:65:49:8a
+# SHA1 Fingerprint: 5f:b7:ee:06:33:e2:59:db:ad:0c:4c:9a:e6:d3:8f:1a:61:c7:dc:25
+# SHA256 Fingerprint: 74:31:e5:f4:c3:c1:ce:46:90:77:4f:0b:61:e0:54:40:88:3b:a9:a0:1e:d0:0b:a6:ab:d7:80:6e:d3:b1:18:cf
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
+ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL
+MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3
+LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug
+RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm
++9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW
+PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM
+xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB
+Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3
+hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg
+EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF
+MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA
+FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec
+nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z
+eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF
+hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2
+Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
+vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep
++OkuE6N36B9K
+-----END CERTIFICATE-----
+
+# Issuer: CN=Class 2 Primary CA O=Certplus
+# Subject: CN=Class 2 Primary CA O=Certplus
+# Label: "Certplus Class 2 Primary CA"
+# Serial: 177770208045934040241468760488327595043
+# MD5 Fingerprint: 88:2c:8c:52:b8:a2:3c:f3:f7:bb:03:ea:ae:ac:42:0b
+# SHA1 Fingerprint: 74:20:74:41:72:9c:dd:92:ec:79:31:d8:23:10:8d:c2:81:92:e2:bb
+# SHA256 Fingerprint: 0f:99:3c:8a:ef:97:ba:af:56:87:14:0e:d5:9a:d1:82:1b:b4:af:ac:f0:aa:9a:58:b5:d5:7a:33:8a:3a:fb:cb
+-----BEGIN CERTIFICATE-----
+MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAw
+PTELMAkGA1UEBhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFz
+cyAyIFByaW1hcnkgQ0EwHhcNOTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9
+MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2VydHBsdXMxGzAZBgNVBAMTEkNsYXNz
+IDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxQ
+ltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR5aiR
+VhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyL
+kcAbmXuZVg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCd
+EgETjdyAYveVqUSISnFOYFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yas
+H7WLO7dDWWuwJKZtkIvEcupdM5i3y95ee++U8Rs+yskhwcWYAqqi9lt3m/V+llU0
+HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRMECDAGAQH/AgEKMAsGA1Ud
+DwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJYIZIAYb4
+QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMu
+Y29tL0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/
+AN9WM2K191EBkOvDP9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8
+yfFC82x/xXp8HVGIutIKPidd3i1RTtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMR
+FcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+7UCmnYR0ObncHoUW2ikbhiMA
+ybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW//1IMwrh3KWB
+kJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
+l7+ijrRU
+-----END CERTIFICATE-----
+
+# Issuer: CN=DST Root CA X3 O=Digital Signature Trust Co.
+# Subject: CN=DST Root CA X3 O=Digital Signature Trust Co.
+# Label: "DST Root CA X3"
+# Serial: 91299735575339953335919266965803778155
+# MD5 Fingerprint: 41:03:52:dc:0f:f7:50:1b:16:f0:02:8e:ba:6f:45:c5
+# SHA1 Fingerprint: da:c9:02:4f:54:d8:f6:df:94:93:5f:b1:73:26:38:ca:6a:d7:7c:13
+# SHA256 Fingerprint: 06:87:26:03:31:a7:24:03:d9:09:f1:05:e6:9b:cf:0d:32:e1:bd:24:93:ff:c6:d9:20:6d:11:bc:d6:77:07:39
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
+PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
+Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
+rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
+OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
+xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
+7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
+aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
+SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
+ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
+AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
+R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
+JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
+Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
+
+# Issuer: CN=DST ACES CA X6 O=Digital Signature Trust OU=DST ACES
+# Subject: CN=DST ACES CA X6 O=Digital Signature Trust OU=DST ACES
+# Label: "DST ACES CA X6"
+# Serial: 17771143917277623872238992636097467865
+# MD5 Fingerprint: 21:d8:4c:82:2b:99:09:33:a2:eb:14:24:8d:8e:5f:e8
+# SHA1 Fingerprint: 40:54:da:6f:1c:3f:40:74:ac:ed:0f:ec:cd:db:79:d1:53:fb:90:1d
+# SHA256 Fingerprint: 76:7c:95:5a:76:41:2c:89:af:68:8e:90:a1:c7:0f:55:6c:fd:6b:60:25:db:ea:10:41:6d:7e:b6:83:1f:8c:40
+-----BEGIN CERTIFICATE-----
+MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBb
+MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3Qx
+ETAPBgNVBAsTCERTVCBBQ0VTMRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0w
+MzExMjAyMTE5NThaFw0xNzExMjAyMTE5NThaMFsxCzAJBgNVBAYTAlVTMSAwHgYD
+VQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UECxMIRFNUIEFDRVMx
+FzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPu
+ktKe1jzIDZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7
+gLFViYsx+tC3dr5BPTCapCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZH
+fAjIgrrep4c9oW24MFbCswKBXy314powGCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4a
+ahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPyMjwmR/onJALJfh1biEIT
+ajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1UdEwEB/wQF
+MAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rk
+c3QuY29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjto
+dHRwOi8vd3d3LnRydXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMt
+aW5kZXguaHRtbDAdBgNVHQ4EFgQUCXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZI
+hvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V25FYrnJmQ6AgwbN99Pe7lv7Uk
+QIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6tFr8hlxCBPeP/
+h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq
+nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpR
+rscL9yuwNwXsvFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf2
+9w4LTJxoeHtxMcfrHuBnQfO3oKfN5XozNmr6mis=
+-----END CERTIFICATE-----
+
+# Issuer: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=(c) 2005 TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş.
+# Subject: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=(c) 2005 TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş.
+# Label: "TURKTRUST Certificate Services Provider Root 1"
+# Serial: 1
+# MD5 Fingerprint: f1:6a:22:18:c9:cd:df:ce:82:1d:1d:b7:78:5c:a9:a5
+# SHA1 Fingerprint: 79:98:a3:08:e1:4d:65:85:e6:c2:1e:15:3a:71:9f:ba:5a:d3:4a:d9
+# SHA256 Fingerprint: 44:04:e3:3b:5e:14:0d:cf:99:80:51:fd:fc:80:28:c7:c8:16:15:c5:ee:73:7b:11:1b:58:82:33:a9:b5:35:a0
+-----BEGIN CERTIFICATE-----
+MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOc
+UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
+c8SxMQswCQYDVQQGDAJUUjEPMA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykg
+MjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8
+dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMxMDI3MTdaFw0xNTAz
+MjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsgU2Vy
+dGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYD
+VQQHDAZBTktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kg
+xLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEu
+xZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7
+XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GXyGl8hMW0kWxsE2qkVa2k
+heiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8iSi9BB35J
+YbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5C
+urKZ8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1
+JuTm5Rh8i27fbMx4W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51
+b0dewQIDAQABoxAwDjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV
+9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46sWrv7/hg0Uw2ZkUd82YCdAR7
+kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxEq8Sn5RTOPEFh
+fEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy
+B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdA
+aLX/7KfS0zgYnNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKS
+RGQDJereW26fyfJOrN3H
+-----END CERTIFICATE-----
+
+# Issuer: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş. (c) Kasım 2005
+# Subject: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş. (c) Kasım 2005
+# Label: "TURKTRUST Certificate Services Provider Root 2"
+# Serial: 1
+# MD5 Fingerprint: 37:a5:6e:d4:b1:25:84:97:b7:fd:56:15:7a:f9:a2:00
+# SHA1 Fingerprint: b4:35:d4:e1:11:9d:1c:66:90:a7:49:eb:b3:94:bd:63:7b:a7:82:b7
+# SHA256 Fingerprint: c4:70:cf:54:7e:23:02:b9:77:fb:29:dd:71:a8:9a:7b:6c:1f:60:77:7b:03:29:f5:60:17:f3:28:bf:4f:6b:e6
+-----BEGIN CERTIFICATE-----
+MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOc
+UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
+c8SxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xS
+S1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kg
+SGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcNMDUxMTA3MTAwNzU3
+WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBFbGVrdHJv
+bmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJU
+UjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSw
+bGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWe
+LiAoYykgS2FzxLFtIDIwMDUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqeLCDe2JAOCtFp0if7qnef
+J1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKIx+XlZEdh
+R3n9wFHxwZnn3M5q+6+1ATDcRhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJ
+Qv2gQrSdiVFVKc8bcLyEVK3BEx+Y9C52YItdP5qtygy/p1Zbj3e41Z55SZI/4PGX
+JHpsmxcPbe9TmJEr5A++WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1p
+zpwACPI2/z7woQ8arBT9pmAPAgMBAAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58S
+Fq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
+KoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/nttRbj2hWyfIvwq
+ECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4
+Jl3vpao6+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFz
+gw2lGh1uEpJ+hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotH
+uFEJjOp9zYhys2AzsfAKRO8P9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LS
+y3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9Rnuk5UrbnBEI=
+-----END CERTIFICATE-----
+
+# Issuer: CN=SwissSign Gold CA - G2 O=SwissSign AG
+# Subject: CN=SwissSign Gold CA - G2 O=SwissSign AG
+# Label: "SwissSign Gold CA - G2"
+# Serial: 13492815561806991280
+# MD5 Fingerprint: 24:77:d9:a8:91:d1:3b:fa:88:2d:c2:ff:f8:cd:33:93
+# SHA1 Fingerprint: d8:c5:38:8a:b7:30:1b:1b:6e:d4:7a:e6:45:25:3a:6f:9f:1a:27:61
+# SHA256 Fingerprint: 62:dd:0b:e9:b9:f5:0a:16:3e:a0:f8:e7:5c:05:3b:1e:ca:57:ea:55:c8:68:8f:64:7c:68:81:f2:c8:35:7b:95
+-----BEGIN CERTIFICATE-----
+MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV
+BAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2ln
+biBHb2xkIENBIC0gRzIwHhcNMDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBF
+MQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMR8wHQYDVQQDExZT
+d2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
+CgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUqt2/8
+76LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+
+bbqBHH5CjCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c
+6bM8K8vzARO/Ws/BtQpgvd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqE
+emA8atufK+ze3gE/bk3lUIbLtK/tREDFylqM2tIrfKjuvqblCqoOpd8FUrdVxyJd
+MmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvRAiTysybUa9oEVeXBCsdt
+MDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuendjIj3o02y
+MszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69y
+FGkOpeUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPi
+aG59je883WX0XaxR7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxM
+gI93e2CaHt+28kgeDrpOVG2Y4OGiGqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCB
+qTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWyV7
+lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64OfPAeGZe6Drn
+8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
+L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe6
+45R88a7A3hfm5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczO
+UYrHUDFu4Up+GC9pWbY9ZIEr44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5
+O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCC
+bwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yv
+GPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a
+77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCC
+hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid3
+92qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEpp
+Ld6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+w
+ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt
+Qc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
+-----END CERTIFICATE-----
+
+# Issuer: CN=SwissSign Silver CA - G2 O=SwissSign AG
+# Subject: CN=SwissSign Silver CA - G2 O=SwissSign AG
+# Label: "SwissSign Silver CA - G2"
+# Serial: 5700383053117599563
+# MD5 Fingerprint: e0:06:a1:c9:7d:cf:c9:fc:0d:c0:56:75:96:d8:62:13
+# SHA1 Fingerprint: 9b:aa:e5:9f:56:ee:21:cb:43:5a:be:25:93:df:a7:f0:40:d1:1d:cb
+# SHA256 Fingerprint: be:6c:4d:a2:bb:b9:ba:59:b6:f3:93:97:68:37:42:46:c3:c0:05:99:3f:a9:8f:02:0d:1d:ed:be:d4:8a:81:d5
+-----BEGIN CERTIFICATE-----
+MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UE
+BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWdu
+IFNpbHZlciBDQSAtIEcyMB4XDTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0Nlow
+RzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMY
+U3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644N0Mv
+Fz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7br
+YT7QbNHm+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieF
+nbAVlDLaYQ1HTWBCrpJH6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH
+6ATK72oxh9TAtvmUcXtnZLi2kUpCe2UuMGoM9ZDulebyzYLs2aFK7PayS+VFheZt
+eJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5hqAaEuSh6XzjZG6k4sIN/
+c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5FZGkECwJ
+MoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRH
+HTBsROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTf
+jNFusB3hB48IHpmccelM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb6
+5i/4z3GcRm25xBWNOHkDRUjvxF3XCO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOB
+rDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU
+F6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRBtjpbO8tFnb0c
+wpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
+cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIB
+AHPGgeAn0i0P4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShp
+WJHckRE1qTodvBqlYJ7YH39FkWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9
+xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L3XWgwF15kIwb4FDm3jH+mHtwX6WQ
+2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx/uNncqCxv1yL5PqZ
+IseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFaDGi8
+aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2X
+em1ZqSqPe97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQR
+dAtq/gsD/KNVV4n+SsuuWxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/
+OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJDIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+
+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ubDgEj8Z+7fNzcbBGXJbLy
+tGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Primary Certification Authority O=GeoTrust Inc.
+# Subject: CN=GeoTrust Primary Certification Authority O=GeoTrust Inc.
+# Label: "GeoTrust Primary Certification Authority"
+# Serial: 32798226551256963324313806436981982369
+# MD5 Fingerprint: 02:26:c3:01:5e:08:30:37:43:a9:d0:7d:cf:37:e6:bf
+# SHA1 Fingerprint: 32:3c:11:8e:1b:f7:b8:b6:52:54:e2:e2:10:0d:d6:02:90:37:f0:96
+# SHA256 Fingerprint: 37:d5:10:06:c5:12:ea:ab:62:64:21:f1:ec:8c:92:01:3f:c5:f8:2a:e9:8e:e5:33:eb:46:19:b8:de:b4:d0:6c
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBY
+MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMo
+R2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEx
+MjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
+Ew1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQcmltYXJ5IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9
+AWbK7hWNb6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjA
+ZIVcFU2Ix7e64HXprQU9nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE0
+7e9GceBrAqg1cmuXm2bgyxx5X9gaBGgeRwLmnWDiNpcB3841kt++Z8dtd1k7j53W
+kBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGttm/81w7a4DSwDRp35+MI
+mO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJ
+KoZIhvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ1
+6CePbJC/kRYkRj5KTs4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl
+4b7UVXGYNTq+k+qurUKykG/g/CFNNWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6K
+oKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHaFloxt/m0cYASSJlyc1pZU8Fj
+UjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG1riR/aYNKxoU
+AT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
+-----END CERTIFICATE-----
+
+# Issuer: CN=thawte Primary Root CA O=thawte, Inc. OU=Certification Services Division/(c) 2006 thawte, Inc. - For authorized use only
+# Subject: CN=thawte Primary Root CA O=thawte, Inc. OU=Certification Services Division/(c) 2006 thawte, Inc. - For authorized use only
+# Label: "thawte Primary Root CA"
+# Serial: 69529181992039203566298953787712940909
+# MD5 Fingerprint: 8c:ca:dc:0b:22:ce:f5:be:72:ac:41:1a:11:a8:d8:12
+# SHA1 Fingerprint: 91:c6:d6:ee:3e:8a:c8:63:84:e5:48:c2:99:29:5c:75:6c:81:7b:81
+# SHA256 Fingerprint: 8d:72:2f:81:a9:c1:13:c0:79:1d:f1:36:a2:96:6d:b2:6c:95:0a:97:1d:b4:6b:41:99:f4:ea:54:b7:8b:fb:9f
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCB
+qTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
+Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
+MDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNV
+BAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3MDAwMDAwWhcNMzYw
+NzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5j
+LjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYG
+A1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsoPD7gFnUnMekz52hWXMJEEUMDSxuaPFs
+W0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ1CRfBsDMRJSUjQJib+ta
+3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGcq/gcfomk
+6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6
+Sk/KaAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94J
+NqR32HuHUETVPm4pafs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XP
+r87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUFAAOCAQEAeRHAS7ORtvzw6WfU
+DW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeEuzLlQRHAd9mz
+YJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2
+/qxAeeWsEG89jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/
+LHbTY5xZ3Y+m4Q6gLkH3LpVHz7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7
+jVaMaA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G5 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2006 VeriSign, Inc. - For authorized use only
+# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G5 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2006 VeriSign, Inc. - For authorized use only
+# Label: "VeriSign Class 3 Public Primary Certification Authority - G5"
+# Serial: 33037644167568058970164719475676101450
+# MD5 Fingerprint: cb:17:e4:31:67:3e:e2:09:fe:45:57:93:f3:0a:fa:1c
+# SHA1 Fingerprint: 4e:b6:d5:78:49:9b:1c:cf:5f:58:1e:ad:56:be:3d:9b:67:44:a5:e5
+# SHA256 Fingerprint: 9a:cf:ab:7e:43:c8:d8:80:d0:6b:26:2a:94:de:ee:e4:b4:65:99:89:c3:d0:ca:f1:9b:af:64:05:e4:1a:b7:df
+-----BEGIN CERTIFICATE-----
+MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
+U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
+ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
+ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
+U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
+aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1
+nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex
+t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz
+SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG
+BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+
+rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/
+NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
+BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH
+BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
+aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv
+MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE
+p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y
+5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK
+WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ
+4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N
+hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
+-----END CERTIFICATE-----
+
+# Issuer: CN=SecureTrust CA O=SecureTrust Corporation
+# Subject: CN=SecureTrust CA O=SecureTrust Corporation
+# Label: "SecureTrust CA"
+# Serial: 17199774589125277788362757014266862032
+# MD5 Fingerprint: dc:32:c3:a7:6d:25:57:c7:68:09:9d:ea:2d:a9:a2:d1
+# SHA1 Fingerprint: 87:82:c6:c3:04:35:3b:cf:d2:96:92:d2:59:3e:7d:44:d9:34:ff:11
+# SHA256 Fingerprint: f1:c1:b5:0a:e5:a2:0d:d8:03:0e:c9:f6:bc:24:82:3d:d3:67:b5:25:57:59:b4:e7:1b:61:fc:e9:f7:37:5d:73
+-----BEGIN CERTIFICATE-----
+MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBI
+MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
+FzAVBgNVBAMTDlNlY3VyZVRydXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIz
+MTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAeBgNVBAoTF1NlY3VyZVRydXN0IENv
+cnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQXOZEz
+Zum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO
+0gMdA+9tDWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIao
+wW8xQmxSPmjL8xk037uHGFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj
+7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b01k/unK8RCSc43Oz969XL0Imnal0ugBS
+8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmHursCAwEAAaOBnTCBmjAT
+BgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCeg
+JYYjaHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGC
+NxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt3
+6Z3q059c4EVlew3KW+JwULKUBRSuSceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/
+3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHfmbx8IVQr5Fiiu1cprp6poxkm
+D5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZnMUFdAvnZyPS
+CPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
+3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Secure Global CA O=SecureTrust Corporation
+# Subject: CN=Secure Global CA O=SecureTrust Corporation
+# Label: "Secure Global CA"
+# Serial: 9751836167731051554232119481456978597
+# MD5 Fingerprint: cf:f4:27:0d:d4:ed:dc:65:16:49:6d:3d:da:bf:6e:de
+# SHA1 Fingerprint: 3a:44:73:5a:e5:81:90:1f:24:86:61:46:1e:3b:9c:c4:5f:f5:3a:1b
+# SHA256 Fingerprint: 42:00:f5:04:3a:c8:59:0e:bb:52:7d:20:9e:d1:50:30:29:fb:cb:d4:1c:a1:b5:06:ec:27:f1:5a:de:7d:ac:69
+-----BEGIN CERTIFICATE-----
+MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBK
+MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
+GTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkx
+MjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3Qg
+Q29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jxYDiJ
+iQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa
+/FHtaMbQbqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJ
+jnIFHovdRIWCQtBJwB1g8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnI
+HmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYVHDGA76oYa8J719rO+TMg1fW9ajMtgQT7
+sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi0XPnj3pDAgMBAAGjgZ0w
+gZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1UdEwEB/wQF
+MAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCsw
+KaAnoCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsG
+AQQBgjcVAQQDAgEAMA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0L
+URYD7xh8yOOvaliTFGCRsoTciE6+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXO
+H0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cnCDpOGR86p1hcF895P4vkp9Mm
+I50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/53CYNv6ZHdAbY
+iNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
+f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
+-----END CERTIFICATE-----
+
+# Issuer: CN=COMODO Certification Authority O=COMODO CA Limited
+# Subject: CN=COMODO Certification Authority O=COMODO CA Limited
+# Label: "COMODO Certification Authority"
+# Serial: 104350513648249232941998508985834464573
+# MD5 Fingerprint: 5c:48:dc:f7:42:72:ec:56:94:6d:1c:cc:71:35:80:75
+# SHA1 Fingerprint: 66:31:bf:9e:f7:4f:9e:b6:c9:d5:a6:0c:ba:6a:be:d1:f7:bd:ef:7b
+# SHA256 Fingerprint: 0c:2c:d6:3d:f7:80:6f:a3:99:ed:e8:09:11:6b:57:5b:f8:79:89:f0:65:18:f9:80:8c:86:05:03:17:8b:af:66
+-----BEGIN CERTIFICATE-----
+MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCB
+gTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNV
+BAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEyMDEwMDAw
+MDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3Jl
+YXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01P
+RE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3
+UcEbVASY06m/weaKXTuH+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI
+2GqGd0S7WWaXUF601CxwRM/aN5VCaTwwxHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8
+Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV4EajcNxo2f8ESIl33rXp
++2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA1KGzqSX+
+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5O
+nKVIrLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW
+/zAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6g
+PKA6hjhodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9u
+QXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOCAQEAPpiem/Yb6dc5t3iuHXIY
+SdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CPOGEIqB6BCsAv
+IC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
+RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4
+zJVSk/BwJVmcIGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5dd
+BA6+C4OmF4O5MBKgxTMVBbkN+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IB
+ZQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Network Solutions Certificate Authority O=Network Solutions L.L.C.
+# Subject: CN=Network Solutions Certificate Authority O=Network Solutions L.L.C.
+# Label: "Network Solutions Certificate Authority"
+# Serial: 116697915152937497490437556386812487904
+# MD5 Fingerprint: d3:f3:a6:16:c0:fa:6b:1d:59:b1:2d:96:4d:0e:11:2e
+# SHA1 Fingerprint: 74:f8:a3:c3:ef:e7:b3:90:06:4b:83:90:3c:21:64:60:20:e5:df:ce
+# SHA256 Fingerprint: 15:f0:ba:00:a3:ac:7a:f3:ac:88:4c:07:2b:10:11:a0:77:bd:77:c0:97:f4:01:64:b2:f8:59:8a:bd:83:86:0c
+-----BEGIN CERTIFICATE-----
+MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBi
+MQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
+MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMxMjM1OTU5WjBiMQswCQYDVQQGEwJV
+UzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydO
+ZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwz
+c7MEL7xxjOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPP
+OCwGJgl6cvf6UDL4wpPTaaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rl
+mGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXTcrA/vGp97Eh/jcOrqnErU2lBUzS1sLnF
+BgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc/Qzpf14Dl847ABSHJ3A4
+qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMBAAGjgZcw
+gZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIB
+BjAPBgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwu
+bmV0c29sc3NsLmNvbS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3Jp
+dHkuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc8
+6fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q4LqILPxFzBiwmZVRDuwduIj/
+h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/GGUsyfJj4akH
+/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
+wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHN
+pGxlaKFJdlxDydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
+-----END CERTIFICATE-----
+
+# Issuer: CN=WellsSecure Public Root Certificate Authority O=Wells Fargo WellsSecure OU=Wells Fargo Bank NA
+# Subject: CN=WellsSecure Public Root Certificate Authority O=Wells Fargo WellsSecure OU=Wells Fargo Bank NA
+# Label: "WellsSecure Public Root Certificate Authority"
+# Serial: 1
+# MD5 Fingerprint: 15:ac:a5:c2:92:2d:79:bc:e8:7f:cb:67:ed:02:cf:36
+# SHA1 Fingerprint: e7:b4:f6:9d:61:ec:90:69:db:7e:90:a7:40:1a:3c:f4:7d:4f:e8:ee
+# SHA256 Fingerprint: a7:12:72:ae:aa:a3:cf:e8:72:7f:7f:b3:9f:0f:b3:d1:e5:42:6e:90:60:b0:6e:e6:f1:3e:9a:3c:58:33:cd:43
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMx
+IDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxs
+cyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9v
+dCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDcxMjEzMTcwNzU0WhcNMjIxMjE0
+MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdl
+bGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQD
+DC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+r
+WxxTkqxtnt3CxC5FlAM1iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjU
+Dk/41itMpBb570OYj7OeUt9tkTmPOL13i0Nj67eT/DBMHAGTthP796EfvyXhdDcs
+HqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8bJVhHlfXBIEyg1J55oNj
+z7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiBK0HmOFaf
+SZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/Slwxl
+AgMBAAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqG
+KGh0dHA6Ly9jcmwucGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0P
+AQH/BAQDAgHGMB0GA1UdDgQWBBQmlRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0j
+BIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGBi6SBiDCBhTELMAkGA1UEBhMC
+VVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNX
+ZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEB
+ALkVsUSRzCPIK0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd
+/ZDJPHV3V3p9+N701NX3leZ0bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pB
+A4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSljqHyita04pO2t/caaH/+Xc/77szWn
+k4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+esE2fDbbFwRnzVlhE9
+iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJtylv
+2G0xffX8oRAHh84vWdw+WNs=
+-----END CERTIFICATE-----
+
+# Issuer: CN=COMODO ECC Certification Authority O=COMODO CA Limited
+# Subject: CN=COMODO ECC Certification Authority O=COMODO CA Limited
+# Label: "COMODO ECC Certification Authority"
+# Serial: 41578283867086692638256921589707938090
+# MD5 Fingerprint: 7c:62:ff:74:9d:31:53:5e:68:4a:d5:78:aa:1e:bf:23
+# SHA1 Fingerprint: 9f:74:4e:9f:2b:4d:ba:ec:0f:31:2c:50:b6:56:3b:8e:2d:93:c3:11
+# SHA256 Fingerprint: 17:93:92:7a:06:14:54:97:89:ad:ce:2f:8f:34:f7:f0:b6:6d:0f:3a:e3:a3:b8:4d:21:ec:15:db:ba:4f:ad:c7
+-----BEGIN CERTIFICATE-----
+MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTEL
+MAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
+BxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMT
+IkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwMzA2MDAw
+MDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdy
+ZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09N
+T0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSR
+FtSrYpn1PlILBs5BAH+X4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0J
+cfRK9ChQtP6IHG4/bC8vCVlbpVsLM5niwz2J+Wos77LTBumjQjBAMB0GA1UdDgQW
+BBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VGFAkK+qDm
+fQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdv
+GDeAU/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
+-----END CERTIFICATE-----
+
+# Issuer: CN=IGC/A O=PM/SGDN OU=DCSSI
+# Subject: CN=IGC/A O=PM/SGDN OU=DCSSI
+# Label: "IGC/A"
+# Serial: 245102874772
+# MD5 Fingerprint: 0c:7f:dd:6a:f4:2a:b9:c8:9b:bd:20:7e:a9:db:5c:37
+# SHA1 Fingerprint: 60:d6:89:74:b5:c2:65:9e:8a:0f:c1:88:7c:88:d2:46:69:1b:18:2c
+# SHA256 Fingerprint: b9:be:a7:86:0a:96:2e:a3:61:1d:ab:97:ab:6d:a3:e2:1c:10:68:b9:7d:55:57:5e:d0:e1:12:79:c1:1c:89:32
+-----BEGIN CERTIFICATE-----
+MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYT
+AkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQ
+TS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG
+9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMB4XDTAyMTIxMzE0MjkyM1oXDTIw
+MTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAM
+BgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEO
+MAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2
+LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaI
+s9z4iPf930Pfeo2aSVz2TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2
+xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCWSo7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4
+u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYyHF2fYPepraX/z9E0+X1b
+F8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNdfrGoRpAx
+Vs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGd
+PDPQtQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNV
+HSAEDjAMMAoGCCqBegF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAx
+NjAfBgNVHSMEGDAWgBSjBS8YYFDCiQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUF
+AAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RKq89toB9RlPhJy3Q2FLwV3duJ
+L92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3QMZsyK10XZZOY
+YLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg
+Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2a
+NjSaTFR+FwNIlQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R
+0982gaEbeC9xs/FZTEYYKKuF0mBWWg==
+-----END CERTIFICATE-----
+
+# Issuer: O=SECOM Trust Systems CO.,LTD. OU=Security Communication EV RootCA1
+# Subject: O=SECOM Trust Systems CO.,LTD. OU=Security Communication EV RootCA1
+# Label: "Security Communication EV RootCA1"
+# Serial: 0
+# MD5 Fingerprint: 22:2d:a6:01:ea:7c:0a:f7:f0:6c:56:43:3f:77:76:d3
+# SHA1 Fingerprint: fe:b8:c4:32:dc:f9:76:9a:ce:ae:3d:d8:90:8f:fd:28:86:65:64:7d
+# SHA256 Fingerprint: a2:2d:ba:68:1e:97:37:6e:2d:39:7d:72:8a:ae:3a:9b:62:96:b9:fd:ba:60:bc:2e:11:f6:47:f2:c6:75:fb:37
+-----BEGIN CERTIFICATE-----
+MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDEl
+MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMh
+U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIz
+MloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09N
+IFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNlY3VyaXR5IENvbW11
+bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSE
+RMqm4miO/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gO
+zXppFodEtZDkBp2uoQSXWHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5
+bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4zZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDF
+MxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4bepJz11sS6/vmsJWXMY1
+VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK9U2vP9eC
+OKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HW
+tWS3irO4G8za+6xmiEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZ
+q51ihPZRwSzJIxXYKLerJRO1RuGGAv8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDb
+EJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnWmHyojf6GPgcWkuF75x3sM3Z+
+Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEWT1MKZPlO9L9O
+VL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490
+-----END CERTIFICATE-----
+
+# Issuer: CN=OISTE WISeKey Global Root GA CA O=WISeKey OU=Copyright (c) 2005/OISTE Foundation Endorsed
+# Subject: CN=OISTE WISeKey Global Root GA CA O=WISeKey OU=Copyright (c) 2005/OISTE Foundation Endorsed
+# Label: "OISTE WISeKey Global Root GA CA"
+# Serial: 86718877871133159090080555911823548314
+# MD5 Fingerprint: bc:6c:51:33:a7:e9:d3:66:63:54:15:72:1b:21:92:93
+# SHA1 Fingerprint: 59:22:a1:e1:5a:ea:16:35:21:f8:98:39:6a:46:46:b0:44:1b:0f:a9
+# SHA256 Fingerprint: 41:c9:23:86:6a:b4:ca:d6:b7:ad:57:80:81:58:2e:02:07:97:a6:cb:df:4f:ff:78:ce:83:96:b3:89:37:d7:f5
+-----BEGIN CERTIFICATE-----
+MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCB
+ijELMAkGA1UEBhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHly
+aWdodCAoYykgMjAwNTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
+ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQSBDQTAeFw0w
+NTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYDVQQGEwJDSDEQMA4G
+A1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIwIAYD
+VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBX
+SVNlS2V5IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAy0+zAJs9Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxR
+VVuuk+g3/ytr6dTqvirdqFEr12bDYVxgAsj1znJ7O7jyTmUIms2kahnBAbtzptf2
+w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbDd50kc3vkDIzh2TbhmYsF
+mQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ/yxViJGg
+4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t9
+4B3RLoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQw
+EAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOx
+SPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vImMMkQyh2I+3QZH4VFvbBsUfk2
+ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4+vg1YFkCExh8
+vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
+hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZi
+Fj4A4xylNoEYokxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ
+/L7fCg0=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Microsec e-Szigno Root CA O=Microsec Ltd. OU=e-Szigno CA
+# Subject: CN=Microsec e-Szigno Root CA O=Microsec Ltd. OU=e-Szigno CA
+# Label: "Microsec e-Szigno Root CA"
+# Serial: 272122594155480254301341951808045322001
+# MD5 Fingerprint: f0:96:b6:2f:c5:10:d5:67:8e:83:25:32:e8:5e:2e:e5
+# SHA1 Fingerprint: 23:88:c9:d3:71:cc:9e:96:3d:ff:7d:3c:a7:ce:fc:d6:25:ec:19:0d
+# SHA256 Fingerprint: 32:7a:3d:76:1a:ba:de:a0:34:eb:99:84:06:27:5c:b1:a4:77:6e:fd:ae:2f:df:6d:01:68:ea:1c:4f:55:67:d0
+-----BEGIN CERTIFICATE-----
+MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAw
+cjELMAkGA1UEBhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNy
+b3NlYyBMdGQuMRQwEgYDVQQLEwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9z
+ZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0MDYxMjI4NDRaFw0xNzA0MDYxMjI4
+NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEWMBQGA1UEChMN
+TWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMTGU1p
+Y3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2u
+uO/TEdyB5s87lozWbxXGd36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+
+LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/NoqdNAoI/gqyFxuEPkEeZlApxcpMqyabA
+vjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjcQR/Ji3HWVBTji1R4P770
+Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJPqW+jqpx
+62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcB
+AQRbMFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3Aw
+LQYIKwYBBQUHMAKGIWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAP
+BgNVHRMBAf8EBTADAQH/MIIBcwYDVR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIB
+AQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3LmUtc3ppZ25vLmh1L1NaU1ov
+MIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0AdAB2AOEAbgB5
+ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn
+AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABT
+AHoAbwBsAGcA4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABh
+ACAAcwB6AGUAcgBpAG4AdAAgAGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABo
+AHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMAegBpAGcAbgBvAC4AaAB1AC8AUwBa
+AFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6Ly93d3cuZS1zemln
+bm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NOPU1p
+Y3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxP
+PU1pY3Jvc2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZv
+Y2F0aW9uTGlzdDtiaW5hcnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuB
+EGluZm9AZS1zemlnbm8uaHWkdzB1MSMwIQYDVQQDDBpNaWNyb3NlYyBlLVN6aWdu
+w7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhTWjEWMBQGA1UEChMNTWlj
+cm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhVMIGsBgNV
+HSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJI
+VTERMA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDAS
+BgNVBAsTC2UtU3ppZ25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBS
+b290IENBghEAzLjnv04pGv2i3GalHCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS
+8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMTnGZjWS7KXHAM/IO8VbH0jgds
+ZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FEaGAHQzAxQmHl
+7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a
+86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfR
+hUZLphK3dehKyVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/
+MPMMNz7UwiiAc7EBt51alhQBS6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Certigna O=Dhimyotis
+# Subject: CN=Certigna O=Dhimyotis
+# Label: "Certigna"
+# Serial: 18364802974209362175
+# MD5 Fingerprint: ab:57:a6:5b:7d:42:82:19:b5:d8:58:26:28:5e:fd:ff
+# SHA1 Fingerprint: b1:2e:13:63:45:86:a4:6f:1a:b2:60:68:37:58:2d:c4:ac:fd:94:97
+# SHA256 Fingerprint: e3:b6:a2:db:2e:d7:ce:48:84:2f:7a:c5:32:41:c7:b7:1d:54:14:4b:fb:40:c1:1f:3f:1d:0b:42:f5:ee:a1:2d
+-----BEGIN CERTIFICATE-----
+MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNV
+BAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4X
+DTA3MDYyOTE1MTMwNVoXDTI3MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQ
+BgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwIQ2VydGlnbmEwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7qXOEm7RFHYeGifBZ4
+QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyHGxny
+gQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbw
+zBfsV1/pogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q
+130yGLMLLGq/jj8UEYkgDncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2
+JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKfIrjxwo1p3Po6WAbfAgMBAAGjgbwwgbkw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQtCRZvgHyUtVF9lo53BEw
+ZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJBgNVBAYT
+AkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzj
+AQ/JSP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG
+9w0BAQUFAAOCAQEAhQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8h
+bV6lUmPOEvjvKtpv6zf+EwLHyzs+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFnc
+fca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1kluPBS1xp81HlDQwY9qcEQCYsuu
+HWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY1gkIl2PlwS6w
+t0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
+WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=AC Raíz Certicámara S.A. O=Sociedad Cameral de Certificación Digital - Certicámara S.A.
+# Subject: CN=AC Raíz Certicámara S.A. O=Sociedad Cameral de Certificación Digital - Certicámara S.A.
+# Label: "AC Ra\xC3\xADz Certic\xC3\xA1mara S.A."
+# Serial: 38908203973182606954752843738508300
+# MD5 Fingerprint: 93:2a:3e:f6:fd:23:69:0d:71:20:d4:2b:47:99:2b:a6
+# SHA1 Fingerprint: cb:a1:c5:f8:b0:e3:5e:b8:b9:45:12:d3:f9:34:a2:e9:06:10:d3:36
+# SHA256 Fingerprint: a6:c5:1e:0d:a5:ca:0a:93:09:d2:e4:c0:e4:0c:2a:f9:10:7a:ae:82:03:85:7f:e1:98:e3:e7:69:e3:43:08:5c
+-----BEGIN CERTIFICATE-----
+MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsx
+CzAJBgNVBAYTAkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRp
+ZmljYWNpw7NuIERpZ2l0YWwgLSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwa
+QUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4wHhcNMDYxMTI3MjA0NjI5WhcNMzAw
+NDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+U29jaWVkYWQgQ2Ft
+ZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJhIFMu
+QS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkq
+hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeG
+qentLhM0R7LQcNzJPNCNyu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzL
+fDe3fezTf3MZsGqy2IiKLUV0qPezuMDU2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQ
+Y5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU34ojC2I+GdV75LaeHM/J4
+Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP2yYe68yQ
+54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+b
+MMCm8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48j
+ilSH5L887uvDdUhfHjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++Ej
+YfDIJss2yKHzMI+ko6Kh3VOz3vCaMh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/zt
+A/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK5lw1omdMEWux+IBkAC1vImHF
+rEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1bczwmPS9KvqfJ
+pxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
+AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCB
+lTCBkgYEVR0gADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFy
+YS5jb20vZHBjLzBaBggrBgEFBQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW50
+7WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2UgcHVlZGVuIGVuY29udHJhciBlbiBs
+YSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEfAygPU3zmpFmps4p6
+xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuXEpBc
+unvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/
+Jre7Ir5v/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dp
+ezy4ydV/NgIlqmjCMRW3MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42
+gzmRkBDI8ck1fj+404HGIGQatlDCIaR43NAvO2STdPCWkPHv+wlaNECW8DYSwaN0
+jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wkeZBWN7PGKX6jD/EpOe9+
+XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f/RWmnkJD
+W2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/
+RL5hRqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35r
+MDOhYil/SrnhLecUIw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxk
+BYn8eNZcLCZDqQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=TC TrustCenter Class 2 CA II O=TC TrustCenter GmbH OU=TC TrustCenter Class 2 CA
+# Subject: CN=TC TrustCenter Class 2 CA II O=TC TrustCenter GmbH OU=TC TrustCenter Class 2 CA
+# Label: "TC TrustCenter Class 2 CA II"
+# Serial: 941389028203453866782103406992443
+# MD5 Fingerprint: ce:78:33:5c:59:78:01:6e:18:ea:b9:36:a0:b9:2e:23
+# SHA1 Fingerprint: ae:50:83:ed:7c:f4:5c:bc:8f:61:c6:21:fe:68:5d:79:42:21:15:6e
+# SHA256 Fingerprint: e6:b8:f8:76:64:85:f8:07:ae:7f:8d:ac:16:70:46:1f:07:c0:a1:3e:ef:3a:1f:f7:17:53:8d:7a:ba:d3:91:b4
+-----BEGIN CERTIFICATE-----
+MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjEL
+MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNV
+BAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0
+Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYwMTEyMTQzODQzWhcNMjUxMjMxMjI1
+OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21i
+SDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UEAxMc
+VEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jf
+tMjWQ+nEdVl//OEd+DFwIxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKg
+uNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2J
+XjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQXa7pIXSSTYtZgo+U4+lK
+8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7uSNQZu+99
+5OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3
+kUrL84J6E1wIqzCB7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRy
+dXN0Y2VudGVyLmRlL2NybC92Mi90Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6
+Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBUcnVzdENlbnRlciUyMENsYXNz
+JTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21iSCxPVT1yb290
+Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
+TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iS
+GNn3Bzn1LL4GdXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprt
+ZjluS5TmVfwLG4t3wVMTZonZKNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8
+au0WOB9/WIFaGusyiC2y8zl3gK9etmF1KdsjTYjKUCjLhdLTEKJZbtOTVAB6okaV
+hgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kPJOzHdiEoZa5X6AeI
+dUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfkvQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=TC TrustCenter Class 3 CA II O=TC TrustCenter GmbH OU=TC TrustCenter Class 3 CA
+# Subject: CN=TC TrustCenter Class 3 CA II O=TC TrustCenter GmbH OU=TC TrustCenter Class 3 CA
+# Label: "TC TrustCenter Class 3 CA II"
+# Serial: 1506523511417715638772220530020799
+# MD5 Fingerprint: 56:5f:aa:80:61:12:17:f6:67:21:e6:2b:6d:61:56:8e
+# SHA1 Fingerprint: 80:25:ef:f4:6e:70:c8:d4:72:24:65:84:fe:40:3b:8a:8d:6a:db:f5
+# SHA256 Fingerprint: 8d:a0:84:fc:f9:9c:e0:77:22:f8:9b:32:05:93:98:06:fa:5c:b8:11:e1:c8:13:f6:a1:08:c7:d3:36:b3:40:8e
+-----BEGIN CERTIFICATE-----
+MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjEL
+MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNV
+BAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0
+Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYwMTEyMTQ0MTU3WhcNMjUxMjMxMjI1
+OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21i
+SDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UEAxMc
+VEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJW
+Ht4bNwcwIi9v8Qbxq63WyKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+Q
+Vl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo6SI7dYnWRBpl8huXJh0obazovVkdKyT2
+1oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZuV3bOx4a+9P/FRQI2Alq
+ukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk2ZyqBwi1
+Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NX
+XAek0CSnwPIA1DCB7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRy
+dXN0Y2VudGVyLmRlL2NybC92Mi90Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6
+Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBUcnVzdENlbnRlciUyMENsYXNz
+JTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21iSCxPVT1yb290
+Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
+TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlN
+irTzwppVMXzEO2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8
+TtXqluJucsG7Kv5sbviRmEb8yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6
+g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9IJqDnxrcOfHFcqMRA/07QlIp2+gB
+95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal092Y+tTmBvTwtiBj
+S+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc5A==
+-----END CERTIFICATE-----
+
+# Issuer: CN=TC TrustCenter Universal CA I O=TC TrustCenter GmbH OU=TC TrustCenter Universal CA
+# Subject: CN=TC TrustCenter Universal CA I O=TC TrustCenter GmbH OU=TC TrustCenter Universal CA
+# Label: "TC TrustCenter Universal CA I"
+# Serial: 601024842042189035295619584734726
+# MD5 Fingerprint: 45:e1:a5:72:c5:a9:36:64:40:9e:f5:e4:58:84:67:8c
+# SHA1 Fingerprint: 6b:2f:34:ad:89:58:be:62:fd:b0:6b:5c:ce:bb:9d:d9:4f:4e:39:f3
+# SHA256 Fingerprint: eb:f3:c0:2a:87:89:b1:fb:7d:51:19:95:d6:63:b7:29:06:d9:13:ce:0d:5e:10:56:8a:8a:77:e2:58:61:67:e7
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTEL
+MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNV
+BAsTG1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1
+c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcNMDYwMzIyMTU1NDI4WhcNMjUxMjMx
+MjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIg
+R21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYwJAYD
+VQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSR
+JJZ4Hgmgm5qVSkr1YnwCqMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3T
+fCZdzHd55yx4Oagmcw6iXSVphU9VDprvxrlE4Vc93x9UIuVvZaozhDrzznq+VZeu
+jRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtwag+1m7Z3W0hZneTvWq3z
+wZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9OgdwZu5GQ
+fezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYD
+VR0jBBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0G
+CSqGSIb3DQEBBQUAA4IBAQAo0uCG1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X1
+7caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/CyvwbZ71q+s2IhtNerNXxTPqYn
+8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3ghUJGooWMNjs
+ydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT
+ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/
+2TYcuiUaUj0a7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY
+-----END CERTIFICATE-----
+
+# Issuer: CN=Deutsche Telekom Root CA 2 O=Deutsche Telekom AG OU=T-TeleSec Trust Center
+# Subject: CN=Deutsche Telekom Root CA 2 O=Deutsche Telekom AG OU=T-TeleSec Trust Center
+# Label: "Deutsche Telekom Root CA 2"
+# Serial: 38
+# MD5 Fingerprint: 74:01:4a:91:b1:08:c4:58:ce:47:cd:f0:dd:11:53:08
+# SHA1 Fingerprint: 85:a4:08:c0:9c:19:3e:5d:51:58:7d:cd:d6:13:30:fd:8c:de:37:bf
+# SHA256 Fingerprint: b6:19:1a:50:d0:c3:97:7f:7d:a9:9b:cd:aa:c8:6a:22:7d:ae:b9:67:9e:c7:0b:a3:b0:c9:d9:22:71:c1:70:d3
+-----BEGIN CERTIFICATE-----
+MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEc
+MBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2Vj
+IFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENB
+IDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5MjM1OTAwWjBxMQswCQYDVQQGEwJE
+RTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxl
+U2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290
+IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEU
+ha88EOQ5bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhC
+QN/Po7qCWWqSG6wcmtoIKyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1Mjwr
+rFDa1sPeg5TKqAyZMg4ISFZbavva4VhYAUlfckE8FQYBjl2tqriTtM2e66foai1S
+NNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aKSe5TBY8ZTNXeWHmb0moc
+QqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTVjlsB9WoH
+txa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAP
+BgNVHRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC
+AQEAlGRZrTlk5ynrE/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756Abrsp
+tJh6sTtU6zkXR34ajgv8HzFZMQSyzhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpa
+IzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8rZ7/gFnkm0W09juwzTkZmDLl
+6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4Gdyd1Lx+4ivn+
+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
+Cm26OWMohpLzGITY+9HPBVZkVw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=ComSign Secured CA O=ComSign
+# Subject: CN=ComSign Secured CA O=ComSign
+# Label: "ComSign Secured CA"
+# Serial: 264725503855295744117309814499492384489
+# MD5 Fingerprint: 40:01:25:06:8d:21:43:6a:0e:43:00:9c:e7:43:f3:d5
+# SHA1 Fingerprint: f9:cd:0e:2c:da:76:24:c1:8f:bd:f0:f0:ab:b6:45:b8:f7:fe:d5:7a
+# SHA256 Fingerprint: 50:79:41:c7:44:60:a0:b4:70:86:22:0d:4e:99:32:57:2a:b5:d1:b5:bb:cb:89:80:ab:1c:b1:76:51:a8:44:d2
+-----BEGIN CERTIFICATE-----
+MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAw
+PDEbMBkGA1UEAxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWdu
+MQswCQYDVQQGEwJJTDAeFw0wNDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwx
+GzAZBgNVBAMTEkNvbVNpZ24gU2VjdXJlZCBDQTEQMA4GA1UEChMHQ29tU2lnbjEL
+MAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGtWhf
+HZQVw6QIVS3joFd67+l0Kru5fFdJGhFeTymHDEjWaueP1H5XJLkGieQcPOqs49oh
+gHMhCu95mGwfCP+hUH3ymBvJVG8+pSjsIQQPRbsHPaHA+iqYHU4Gk/v1iDurX8sW
+v+bznkqH7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg/8HZaWSLWapW7ha9B20IZFKF3ue
+Mv5WJDmyVIRD9YTC2LxBkMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr
+9gOUCXDeFhF6K+h2j0kQmHe5Y1yLM5d19guMsqtb3nQgJT/j8xH5h2iGNXHDHYwt
+6+UarA9z1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUwAwEB/zBEBgNVHR8EPTA7
+MDmgN6A1hjNodHRwOi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29tU2lnblNl
+Y3VyZWRDQS5jcmwwDgYDVR0PAQH/BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58
+ADsAj8c+DkWfHl3sMB0GA1UdDgQWBBTBS+1wtvc+fAA7AI/HPg5Fnx5d7DANBgkq
+hkiG9w0BAQUFAAOCAQEAFs/ukhNQq3sUnjO2QiBq1BW9Cav8cujvR3qQrFHBZE7p
+iL1DRYHjZiM/EoZNGeQFsOY3wo3aBijJD4mkU6l1P7CW+6tMM1X5eCZGbxs2mPtC
+dsGCuY7e+0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtpFhpFfTMDZflScZAmlaxMDPWL
+kz/MdXSFmLr/YnpNH4n+rr2UAJm/EaXc4HnFFgt9AmEd6oX5AhVP51qJThRv4zdL
+hfXBPGHg/QVBspJ/wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8+/21OGVZOIJFsnzQz
+OjRXUDpvgV4GxvU+fE6OK85lBi5d0ipTdF7Tbieejw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Cybertrust Global Root O=Cybertrust, Inc
+# Subject: CN=Cybertrust Global Root O=Cybertrust, Inc
+# Label: "Cybertrust Global Root"
+# Serial: 4835703278459682877484360
+# MD5 Fingerprint: 72:e4:4a:87:e3:69:40:80:77:ea:bc:e3:f4:ff:f0:e1
+# SHA1 Fingerprint: 5f:43:e5:b1:bf:f8:78:8c:ac:1c:c7:ca:4a:9a:c6:22:2b:cc:34:c6
+# SHA256 Fingerprint: 96:0a:df:00:63:e9:63:56:75:0c:29:65:dd:0a:08:67:da:0b:9c:bd:6e:77:71:4a:ea:fb:23:49:ab:39:3d:a3
+-----BEGIN CERTIFICATE-----
+MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYG
+A1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2Jh
+bCBSb290MB4XDTA2MTIxNTA4MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UE
+ChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBS
+b290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+Mi8vRRQZhP/8NN5
+7CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW0ozS
+J8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2y
+HLtgwEZLAfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iP
+t3sMpTjr3kfb1V05/Iin89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNz
+FtApD0mpSPCzqrdsxacwOUBdrsTiXSZT8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAY
+XSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/
+MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2MDSgMqAw
+hi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3Js
+MB8GA1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUA
+A4IBAQBW7wojoFROlZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMj
+Wqd8BfP9IjsO0QbE2zZMcwSO5bAi5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUx
+XOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2hO0j9n0Hq0V+09+zv+mKts2o
+omcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+TX3EJIrduPuoc
+A06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
+WL1WMRJOEcgh4LMRkWXbtKaIOM5V
+-----END CERTIFICATE-----
+
+# Issuer: O=Chunghwa Telecom Co., Ltd. OU=ePKI Root Certification Authority
+# Subject: O=Chunghwa Telecom Co., Ltd. OU=ePKI Root Certification Authority
+# Label: "ePKI Root Certification Authority"
+# Serial: 28956088682735189655030529057352760477
+# MD5 Fingerprint: 1b:2e:00:ca:26:06:90:3d:ad:fe:6f:15:68:d3:6b:b3
+# SHA1 Fingerprint: 67:65:0d:f1:7e:8e:7e:5b:82:40:a4:f4:56:4b:cf:e2:3d:69:c6:f0
+# SHA256 Fingerprint: c0:a6:f4:dc:63:a2:4b:fd:cf:54:ef:2a:6a:08:2a:0a:72:de:35:80:3e:2f:f5:ff:52:7a:e5:d8:72:06:df:d5
+-----BEGIN CERTIFICATE-----
+MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBe
+MQswCQYDVQQGEwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0
+ZC4xKjAoBgNVBAsMIWVQS0kgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
+Fw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMxMjdaMF4xCzAJBgNVBAYTAlRXMSMw
+IQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEqMCgGA1UECwwhZVBL
+SSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAH
+SyZbCUNsIZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAh
+ijHyl3SJCRImHJ7K2RKilTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3X
+DZoTM1PRYfl61dd4s5oz9wCGzh1NlDivqOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1
+TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX12ruOzjjK9SXDrkb5wdJ
+fzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0OWQqraffA
+sgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uU
+WH1+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLS
+nT0IFaUQAS2zMnaolQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pH
+dmX2Os+PYhcZewoozRrSgx4hxyy/vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJip
+NiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXiZo1jDiVN1Rmy5nk3pyKdVDEC
+AwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/QkqiMAwGA1UdEwQF
+MAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
+ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGB
+uvl2ICO1J2B01GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6Yl
+PwZpVnPDimZI+ymBV3QGypzqKOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkP
+JXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdVxrsStZf0X4OFunHB2WyBEXYKCrC/
+gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEPNXubrjlpC2JgQCA2
+j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+rGNm6
+5ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUB
+o2M3IUxExJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS
+/jQ6fbjpKdx2qcgw+BRxgMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2z
+Gp1iro2C6pSe3VkQw63d4k3jMdXH7OjysP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTE
+W9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmODBCEIZ43ygknQW/2xzQ+D
+hNQ+IIX3Sj0rnP0qCglN6oH4EZw=
+-----END CERTIFICATE-----
+
+# Issuer: CN=TÜBİTAK UEKAE Kök Sertifika Hizmet Sağlayıcısı - Sürüm 3 O=Türkiye Bilimsel ve Teknolojik Araştırma Kurumu - TÜBİTAK OU=Ulusal Elektronik ve Kriptoloji Araştırma Enstitüsü - UEKAE/Kamu Sertifikasyon Merkezi
+# Subject: CN=TÜBİTAK UEKAE Kök Sertifika Hizmet Sağlayıcısı - Sürüm 3 O=Türkiye Bilimsel ve Teknolojik Araştırma Kurumu - TÜBİTAK OU=Ulusal Elektronik ve Kriptoloji Araştırma Enstitüsü - UEKAE/Kamu Sertifikasyon Merkezi
+# Label: "T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3"
+# Serial: 17
+# MD5 Fingerprint: ed:41:f5:8c:50:c5:2b:9c:73:e6:ee:6c:eb:c2:a8:26
+# SHA1 Fingerprint: 1b:4b:39:61:26:27:6b:64:91:a2:68:6d:d7:02:43:21:2d:1f:1d:96
+# SHA256 Fingerprint: e4:c7:34:30:d7:a5:b5:09:25:df:43:37:0a:0d:21:6e:9a:79:b9:d6:db:83:73:a0:c6:9e:b1:cc:31:c7:c5:2a
+-----BEGIN CERTIFICATE-----
+MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRS
+MRgwFgYDVQQHDA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJp
+bGltc2VsIHZlIFRla25vbG9qaWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSw
+VEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ryb25payB2ZSBLcmlwdG9sb2ppIEFy
+YcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNVBAsMGkthbXUgU2Vy
+dGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUgS8O2
+ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAe
+Fw0wNzA4MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIx
+GDAWBgNVBAcMD0dlYnplIC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmls
+aW1zZWwgdmUgVGVrbm9sb2ppayBBcmHFn3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBU
+QUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZlIEtyaXB0b2xvamkgQXJh
+xZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2FtdSBTZXJ0
+aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7Zr
+IFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4h
+gb46ezzb8R1Sf1n68yJMlaCQvEhOEav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yK
+O7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1xnnRFDDtG1hba+818qEhTsXO
+fJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR6Oqeyjh1jmKw
+lZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
+hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQID
+AQABo0IwQDAdBgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmP
+NOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4N5EY3ATIZJkrGG2AA1nJrvhY0D7t
+wyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLTy9LQQfMmNkqblWwM
+7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYhLBOh
+gLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5n
+oN+J1q2MdqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUs
+yZyQ2uypQjyttgI=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Buypass Class 2 CA 1 O=Buypass AS-983163327
+# Subject: CN=Buypass Class 2 CA 1 O=Buypass AS-983163327
+# Label: "Buypass Class 2 CA 1"
+# Serial: 1
+# MD5 Fingerprint: b8:08:9a:f0:03:cc:1b:0d:c8:6c:0b:76:a1:75:64:23
+# SHA1 Fingerprint: a0:a1:ab:90:c9:fc:84:7b:3b:12:61:e8:97:7d:5f:d3:22:61:d3:cc
+# SHA256 Fingerprint: 0f:4e:9c:dd:26:4b:02:55:50:d1:70:80:63:40:21:4f:e9:44:34:c9:b0:2f:69:7e:c7:10:fc:5f:ea:fb:5e:38
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3Mg
+Q2xhc3MgMiBDQSAxMB4XDTA2MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzEL
+MAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYD
+VQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7McXA0
+ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLX
+l18xoS830r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVB
+HfCuuCkslFJgNJQ72uA40Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B
+5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/RuFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3
+WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0PAQH/BAQD
+AgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLP
+gcIV1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+
+DKhQ7SLHrQVMdvvt7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKu
+BctN518fV4bVIJwo+28TOPX2EZL2fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHs
+h7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5wwDX3OaJdZtB7WZ+oRxKaJyOk
+LY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
+-----END CERTIFICATE-----
+
+# Issuer: CN=Buypass Class 3 CA 1 O=Buypass AS-983163327
+# Subject: CN=Buypass Class 3 CA 1 O=Buypass AS-983163327
+# Label: "Buypass Class 3 CA 1"
+# Serial: 2
+# MD5 Fingerprint: df:3c:73:59:81:e7:39:50:81:04:4c:34:a2:cb:b3:7b
+# SHA1 Fingerprint: 61:57:3a:11:df:0e:d8:7e:d5:92:65:22:ea:d0:56:d7:44:b3:23:71
+# SHA256 Fingerprint: b7:b1:2b:17:1f:82:1d:aa:99:0c:d0:fe:50:87:b1:28:44:8b:a8:e5:18:4f:84:c5:1e:02:b5:c8:fb:96:2b:24
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3Mg
+Q2xhc3MgMyBDQSAxMB4XDTA1MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzEL
+MAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYD
+VQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKxifZg
+isRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//z
+NIqeKNc0n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI
++MkcVyzwPX6UvCWThOiaAJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2R
+hzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+
+mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0PAQH/BAQD
+AgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFP
+Bdy7pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27s
+EzNxZy5p+qksP2bAEllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2
+mSlf56oBzKwzqBwKu5HEA6BvtjT5htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yC
+e/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQjel/wroQk5PMr+4okoyeYZdow
+dXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915
+-----END CERTIFICATE-----
+
+# Issuer: CN=EBG Elektronik Sertifika Hizmet Sağlayıcısı O=EBG Bilişim Teknolojileri ve Hizmetleri A.Ş.
+# Subject: CN=EBG Elektronik Sertifika Hizmet Sağlayıcısı O=EBG Bilişim Teknolojileri ve Hizmetleri A.Ş.
+# Label: "EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1"
+# Serial: 5525761995591021570
+# MD5 Fingerprint: 2c:20:26:9d:cb:1a:4a:00:85:b5:b7:5a:ae:c2:01:37
+# SHA1 Fingerprint: 8c:96:ba:eb:dd:2b:07:07:48:ee:30:32:66:a0:f3:98:6e:7c:ae:58
+# SHA256 Fingerprint: 35:ae:5b:dd:d8:f7:ae:63:5c:ff:ba:56:82:a8:f0:0b:95:f4:84:62:c7:10:8e:e9:a0:e5:29:2b:07:4a:af:b2
+-----BEGIN CERTIFICATE-----
+MIIF5zCCA8+gAwIBAgIITK9zQhyOdAIwDQYJKoZIhvcNAQEFBQAwgYAxODA2BgNV
+BAMML0VCRyBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
+c8SxMTcwNQYDVQQKDC5FQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXpt
+ZXRsZXJpIEEuxZ4uMQswCQYDVQQGEwJUUjAeFw0wNjA4MTcwMDIxMDlaFw0xNjA4
+MTQwMDMxMDlaMIGAMTgwNgYDVQQDDC9FQkcgRWxla3Ryb25payBTZXJ0aWZpa2Eg
+SGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTE3MDUGA1UECgwuRUJHIEJpbGnFn2ltIFRl
+a25vbG9qaWxlcmkgdmUgSGl6bWV0bGVyaSBBLsWeLjELMAkGA1UEBhMCVFIwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDuoIRh0DpqZhAy2DE4f6en5f2h
+4fuXd7hxlugTlkaDT7byX3JWbhNgpQGR4lvFzVcfd2NR/y8927k/qqk153nQ9dAk
+tiHq6yOU/im/+4mRDGSaBUorzAzu8T2bgmmkTPiab+ci2hC6X5L8GCcKqKpE+i4s
+tPtGmggDg3KriORqcsnlZR9uKg+ds+g75AxuetpX/dfreYteIAbTdgtsApWjluTL
+dlHRKJ2hGvxEok3MenaoDT2/F08iiFD9rrbskFBKW5+VQarKD7JK/oCZTqNGFav4
+c0JqwmZ2sQomFd2TkuzbqV9UIlKRcF0T6kjsbgNs2d1s/OsNA/+mgxKb8amTD8Um
+TDGyY5lhcucqZJnSuOl14nypqZoaqsNW2xCaPINStnuWt6yHd6i58mcLlEOzrz5z
++kI2sSXFCjEmN1ZnuqMLfdb3ic1nobc6HmZP9qBVFCVMLDMNpkGMvQQxahByCp0O
+Lna9XvNRiYuoP1Vzv9s6xiQFlpJIqkuNKgPlV5EQ9GooFW5Hd4RcUXSfGenmHmMW
+OeMRFeNYGkS9y8RsZteEBt8w9DeiQyJ50hBs37vmExH8nYQKE3vwO9D8owrXieqW
+fo1IhR5kX9tUoqzVegJ5a9KK8GfaZXINFHDk6Y54jzJ0fFfy1tb0Nokb+Clsi7n2
+l9GkLqq+CxnCRelwXQIDAJ3Zo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
+/wQEAwIBBjAdBgNVHQ4EFgQU587GT/wWZ5b6SqMHwQSny2re2kcwHwYDVR0jBBgw
+FoAU587GT/wWZ5b6SqMHwQSny2re2kcwDQYJKoZIhvcNAQEFBQADggIBAJuYml2+
+8ygjdsZs93/mQJ7ANtyVDR2tFcU22NU57/IeIl6zgrRdu0waypIN30ckHrMk2pGI
+6YNw3ZPX6bqz3xZaPt7gyPvT/Wwp+BVGoGgmzJNSroIBk5DKd8pNSe/iWtkqvTDO
+TLKBtjDOWU/aWR1qeqRFsIImgYZ29fUQALjuswnoT4cCB64kXPBfrAowzIpAoHME
+wfuJJPaaHFy3PApnNgUIMbOv2AFoKuB4j3TeuFGkjGwgPaL7s9QJ/XvCgKqTbCmY
+Iai7FvOpEl90tYeY8pUm3zTvilORiF0alKM/fCL414i6poyWqD1SNGKfAB5UVUJn
+xk1Gj7sURT0KlhaOEKGXmdXTMIXM3rRyt7yKPBgpaP3ccQfuJDlq+u2lrDgv+R4Q
+DgZxGhBM/nV+/x5XOULK1+EVoVZVWRvRo68R2E7DpSvvkL/A7IITW43WciyTTo9q
+Kd+FPNMN4KIYEsxVL0e3p5sC/kH2iExt2qkBR4NkJ2IQgtYSe14DHzSpyZH+r11t
+hie3I6p1GMog57AP14kOpmciY/SDQSsGS7tY1dHXt7kQY9iJSrSq3RZj9W6+YKH4
+7ejWkE8axsWgKdOnIaj1Wjz3x0miIZpKlVIglnKaZsv30oZDfCK+lvm9AahH3eU7
+QPl1K5srRmSGjR70j/sHd9DqSaIcjVIUpgqT
+-----END CERTIFICATE-----
+
+# Issuer: O=certSIGN OU=certSIGN ROOT CA
+# Subject: O=certSIGN OU=certSIGN ROOT CA
+# Label: "certSIGN ROOT CA"
+# Serial: 35210227249154
+# MD5 Fingerprint: 18:98:c0:d6:e9:3a:fc:f9:b0:f5:0c:f7:4b:01:44:17
+# SHA1 Fingerprint: fa:b7:ee:36:97:26:62:fb:2d:b0:2a:f6:bf:03:fd:e8:7c:4b:2f:9b
+# SHA256 Fingerprint: ea:a9:62:c4:fa:4a:6b:af:eb:e4:15:19:6d:35:1c:cd:88:8d:4f:53:f3:fa:8a:e6:d7:c4:66:a9:4e:60:42:bb
+-----BEGIN CERTIFICATE-----
+MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYT
+AlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBD
+QTAeFw0wNjA3MDQxNzIwMDRaFw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJP
+MREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7IJUqOtdu0KBuqV5Do
+0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHHrfAQ
+UySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5d
+RdY4zTW2ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQ
+OA7+j0xbm0bqQfWwCHTD0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwv
+JoIQ4uNllAoEwF73XVv4EOLQunpL+943AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08C
+AwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAcYwHQYDVR0O
+BBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IBAQA+0hyJ
+LjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecY
+MnQ8SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ
+44gx+FkagQnIl6Z0x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6I
+Jd1hJyMctTEHBDa0GpC9oHRxUIltvBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNw
+i/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7NzTogVZ96edhBiIL5VaZVDADlN
+9u6wWk5JRFRYX0KD
+-----END CERTIFICATE-----
+
+# Issuer: CN=CNNIC ROOT O=CNNIC
+# Subject: CN=CNNIC ROOT O=CNNIC
+# Label: "CNNIC ROOT"
+# Serial: 1228079105
+# MD5 Fingerprint: 21:bc:82:ab:49:c4:13:3b:4b:b2:2b:5c:6b:90:9c:19
+# SHA1 Fingerprint: 8b:af:4c:9b:1d:f0:2a:92:f7:da:12:8e:b9:1b:ac:f4:98:60:4b:6f
+# SHA256 Fingerprint: e2:83:93:77:3d:a8:45:a6:79:f2:08:0c:c7:fb:44:a3:b7:a1:c3:79:2c:b7:eb:77:29:fd:cb:6a:8d:99:ae:a7
+-----BEGIN CERTIFICATE-----
+MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJD
+TjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2
+MDcwOTE0WhcNMjcwNDE2MDcwOTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMF
+Q05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzDo+/hn7E7SIX1mlwh
+IhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tizVHa6
+dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZO
+V/kbZKKTVrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrC
+GHn2emU1z5DrvTOTn1OrczvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gN
+v7Sg2Ca+I19zN38m5pIEo3/PIKe38zrKy5nLAgMBAAGjczBxMBEGCWCGSAGG+EIB
+AQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscCwQ7vptU7ETAPBgNVHRMB
+Af8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991SlgrHAsEO
+76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnK
+OOK5Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvH
+ugDnuL8BV8F3RTIMO/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7Hgvi
+yJA/qIYM/PmLXoXLT1tLYhFHxUV8BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fL
+buXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2G8kS1sHNzYDzAgE8yGnLRUhj
+2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5mmxE=
+-----END CERTIFICATE-----
+
+# Issuer: O=Japanese Government OU=ApplicationCA
+# Subject: O=Japanese Government OU=ApplicationCA
+# Label: "ApplicationCA - Japanese Government"
+# Serial: 49
+# MD5 Fingerprint: 7e:23:4e:5b:a7:a5:b4:25:e9:00:07:74:11:62:ae:d6
+# SHA1 Fingerprint: 7f:8a:b0:cf:d0:51:87:6a:66:f3:36:0f:47:c8:8d:8c:d3:35:fc:74
+# SHA256 Fingerprint: 2d:47:43:7d:e1:79:51:21:5a:12:f3:c5:8e:51:c7:29:a5:80:26:ef:1f:cc:0a:5f:b3:d9:dc:01:2f:60:0d:19
+-----BEGIN CERTIFICATE-----
+MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEc
+MBoGA1UEChMTSmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRp
+b25DQTAeFw0wNzEyMTIxNTAwMDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYT
+AkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zlcm5tZW50MRYwFAYDVQQLEw1BcHBs
+aWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp23gdE6H
+j6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4fl+K
+f5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55
+IrmTwcrNwVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cw
+FO5cjFW6WY2H/CPek9AEjP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDiht
+QWEjdnjDuGWk81quzMKq2edY3rZ+nYVunyoKb58DKTCXKB28t89UKU5RMfkntigm
+/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRUWssmP3HMlEYNllPqa0jQ
+k/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNVBAYTAkpQ
+MRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOC
+seODvOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ggEBADlqRHZ3ODrso2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJ
+hyzjVOGjprIIC8CFqMjSnHH2HZ9g/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+
+eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYDio+nEhEMy/0/ecGc/WLuo89U
+DNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmWdupwX3kSa+Sj
+B1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
+rosot4LKGAfmt1t06SAZf7IbiVQ=
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Primary Certification Authority - G3 O=GeoTrust Inc. OU=(c) 2008 GeoTrust Inc. - For authorized use only
+# Subject: CN=GeoTrust Primary Certification Authority - G3 O=GeoTrust Inc. OU=(c) 2008 GeoTrust Inc. - For authorized use only
+# Label: "GeoTrust Primary Certification Authority - G3"
+# Serial: 28809105769928564313984085209975885599
+# MD5 Fingerprint: b5:e8:34:36:c9:10:44:58:48:70:6d:2e:83:d4:b8:05
+# SHA1 Fingerprint: 03:9e:ed:b8:0b:e7:a0:3c:69:53:89:3b:20:d2:d9:32:3a:4c:2a:fd
+# SHA256 Fingerprint: b4:78:b8:12:25:0d:f8:78:63:5c:2a:a7:ec:7d:15:5e:aa:62:5e:e8:29:16:e2:cd:29:43:61:88:6c:d1:fb:d4
+-----BEGIN CERTIFICATE-----
+MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCB
+mDELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsT
+MChjKSAyMDA4IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIzNTk1OVowgZgxCzAJ
+BgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
+MjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0
+BgNVBAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz
++uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5jK/BGvESyiaHAKAxJcCGVn2TAppMSAmUm
+hsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdEc5IiaacDiGydY8hS2pgn
+5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3CIShwiP/W
+JmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exAL
+DmKudlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZC
+huOl1UcCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
+HQYDVR0OBBYEFMR5yo6hTgMdHNxr2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IB
+AQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9cr5HqQ6XErhK8WTTOd8lNNTB
+zU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbEAp7aDHdlDkQN
+kv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
+AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUH
+SJsMC8tJP33st/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2G
+spki4cErx5z481+oghLrGREt
+-----END CERTIFICATE-----
+
+# Issuer: CN=thawte Primary Root CA - G2 O=thawte, Inc. OU=(c) 2007 thawte, Inc. - For authorized use only
+# Subject: CN=thawte Primary Root CA - G2 O=thawte, Inc. OU=(c) 2007 thawte, Inc. - For authorized use only
+# Label: "thawte Primary Root CA - G2"
+# Serial: 71758320672825410020661621085256472406
+# MD5 Fingerprint: 74:9d:ea:60:24:c4:fd:22:53:3e:cc:3a:72:d9:29:4f
+# SHA1 Fingerprint: aa:db:bc:22:23:8f:c4:01:a1:27:bb:38:dd:f4:1d:db:08:9e:f0:12
+# SHA256 Fingerprint: a4:31:0d:50:af:18:a6:44:71:90:37:2a:86:af:af:8b:95:1f:fb:43:1d:83:7f:1e:56:88:b4:59:71:ed:15:57
+-----BEGIN CERTIFICATE-----
+MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDEL
+MAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMp
+IDIwMDcgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAi
+BgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMjAeFw0wNzExMDUwMDAw
+MDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
+d3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBGb3Ig
+YXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9v
+dCBDQSAtIEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/
+BebfowJPDQfGAFG6DAJSLSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6
+papu+7qzcMBniKI11KOasf2twu8x+qi58/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmtgAMADna3+FGO6Lts6K
+DPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUNG4k8VIZ3
+KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41ox
+XZ3Krr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=thawte Primary Root CA - G3 O=thawte, Inc. OU=Certification Services Division/(c) 2008 thawte, Inc. - For authorized use only
+# Subject: CN=thawte Primary Root CA - G3 O=thawte, Inc. OU=Certification Services Division/(c) 2008 thawte, Inc. - For authorized use only
+# Label: "thawte Primary Root CA - G3"
+# Serial: 127614157056681299805556476275995414779
+# MD5 Fingerprint: fb:1b:5d:43:8a:94:cd:44:c6:76:f2:43:4b:47:e7:31
+# SHA1 Fingerprint: f1:8b:53:8d:1b:e9:03:b6:a6:f0:56:43:5b:17:15:89:ca:f3:6b:f2
+# SHA256 Fingerprint: 4b:03:f4:58:07:ad:70:f2:1b:fc:2c:ae:71:c9:fd:e4:60:4c:06:4c:f5:ff:b6:86:ba:e5:db:aa:d7:fd:d3:4c
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCB
+rjELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
+Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
+MDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNV
+BAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0wODA0MDIwMDAwMDBa
+Fw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3Rl
+LCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9u
+MTgwNgYDVQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXpl
+ZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEcz
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsr8nLPvb2FvdeHsbnndm
+gcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2AtP0LMqmsywCPLLEHd5N/8
+YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC+BsUa0Lf
+b1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS9
+9irY7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2S
+zhkGcuYMXDhpxwTWvGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUk
+OQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNV
+HQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJKoZIhvcNAQELBQADggEBABpA
+2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweKA3rD6z8KLFIW
+oCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
+t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7c
+KUGRIjxpp7sC8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fM
+m7v/OeZWYdMKp8RcTGB7BXcmer/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZu
+MdRAGmI0Nj81Aa6sY6A=
+-----END CERTIFICATE-----
+
+# Issuer: CN=GeoTrust Primary Certification Authority - G2 O=GeoTrust Inc. OU=(c) 2007 GeoTrust Inc. - For authorized use only
+# Subject: CN=GeoTrust Primary Certification Authority - G2 O=GeoTrust Inc. OU=(c) 2007 GeoTrust Inc. - For authorized use only
+# Label: "GeoTrust Primary Certification Authority - G2"
+# Serial: 80682863203381065782177908751794619243
+# MD5 Fingerprint: 01:5e:d8:6b:bd:6f:3d:8e:a1:31:f8:12:e0:98:73:6a
+# SHA1 Fingerprint: 8d:17:84:d5:37:f3:03:7d:ec:70:fe:57:8b:51:9a:99:e6:10:d7:b0
+# SHA256 Fingerprint: 5e:db:7a:c4:3b:82:a0:6a:87:61:e8:d7:be:49:79:eb:f2:61:1f:7d:d7:9b:f9:1c:1c:6b:56:6a:21:9e:d7:66
+-----BEGIN CERTIFICATE-----
+MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDEL
+MAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChj
+KSAyMDA3IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2
+MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1OVowgZgxCzAJBgNV
+BAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykgMjAw
+NyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNV
+BAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
+MjB2MBAGByqGSM49AgEGBSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcL
+So17VDs6bl8VAsBQps8lL33KSLjHUGMcKiEIfJo22Av+0SbFWDEwKCXzXV2juLal
+tJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+EVXVMAoG
+CCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGT
+qQ7mndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBucz
+rD6ogRLQy7rQkgu2npaqBA+K
+-----END CERTIFICATE-----
+
+# Issuer: CN=VeriSign Universal Root Certification Authority O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2008 VeriSign, Inc. - For authorized use only
+# Subject: CN=VeriSign Universal Root Certification Authority O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2008 VeriSign, Inc. - For authorized use only
+# Label: "VeriSign Universal Root Certification Authority"
+# Serial: 85209574734084581917763752644031726877
+# MD5 Fingerprint: 8e:ad:b5:01:aa:4d:81:e4:8c:1d:d1:e1:14:00:95:19
+# SHA1 Fingerprint: 36:79:ca:35:66:87:72:30:4d:30:a5:fb:87:3b:0f:a7:7b:b7:0d:54
+# SHA256 Fingerprint: 23:99:56:11:27:a5:71:25:de:8c:ef:ea:61:0d:df:2f:a0:78:b5:c8:06:7f:4e:82:82:90:bf:b8:60:e8:4b:3c
+-----BEGIN CERTIFICATE-----
+MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCB
+vTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJp
+U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MTgwNgYDVQQDEy9W
+ZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
+Fw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJVUzEX
+MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0
+IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9y
+IGF1dGhvcml6ZWQgdXNlIG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNh
+bCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj1mCOkdeQmIN65lgZOIzF
+9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGPMiJhgsWH
+H26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+H
+LL729fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN
+/BMReYTtXlT2NJ8IAfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPT
+rJ9VAMf2CGqUuV/c4DPxhGD5WycRtPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0GCCsGAQUFBwEMBGEwX6FdoFsw
+WTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2Oa8PPgGrUSBgs
+exkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
+DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4
+sAPmLGd75JR3Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+
+seQxIcaBlVZaDrHC1LGmWazxY8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz
+4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTxP/jgdFcrGJ2BtMQo2pSXpXDrrB2+
+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+PwGZsY6rp2aQW9IHR
+lRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4mJO3
+7M2CYfE45k+XmCpajQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G4 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2007 VeriSign, Inc. - For authorized use only
+# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G4 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2007 VeriSign, Inc. - For authorized use only
+# Label: "VeriSign Class 3 Public Primary Certification Authority - G4"
+# Serial: 63143484348153506665311985501458640051
+# MD5 Fingerprint: 3a:52:e1:e7:fd:6f:3a:e3:6f:f3:6f:99:1b:f9:22:41
+# SHA1 Fingerprint: 22:d5:d8:df:8f:02:31:d1:8d:f7:9d:b7:cf:8a:2d:64:c9:3f:6c:3a
+# SHA256 Fingerprint: 69:dd:d7:ea:90:bb:57:c9:3e:13:5d:c8:5e:a6:fc:d5:48:0b:60:32:39:bd:c4:54:fc:75:8b:2a:26:cf:7f:79
+-----BEGIN CERTIFICATE-----
+MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
+ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2ln
+biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
+U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
+aXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJp
+U2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwg
+SW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2ln
+biBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8Utpkmw4tXNherJI9/gHm
+GUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGzrl0Bp3ve
+fLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJ
+aW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYj
+aHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMW
+kf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMDA2gAMGUCMGYhDBgmYFo4e1ZC
+4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIxAJw9SDkjOVga
+FRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
+-----END CERTIFICATE-----
+
+# Issuer: CN=NetLock Arany (Class Gold) Főtanúsítvány O=NetLock Kft. OU=Tanúsítványkiadók (Certification Services)
+# Subject: CN=NetLock Arany (Class Gold) Főtanúsítvány O=NetLock Kft. OU=Tanúsítványkiadók (Certification Services)
+# Label: "NetLock Arany (Class Gold) Főtanúsítvány"
+# Serial: 80544274841616
+# MD5 Fingerprint: c5:a1:b7:ff:73:dd:d6:d7:34:32:18:df:fc:3c:ad:88
+# SHA1 Fingerprint: 06:08:3f:59:3f:15:a1:04:a0:69:a4:6b:a9:03:d0:06:b7:97:09:91
+# SHA256 Fingerprint: 6c:61:da:c3:a2:de:f0:31:50:6b:e0:36:d2:a6:fe:40:19:94:fb:d1:3d:f9:c8:d4:66:59:92:74:c4:46:ec:98
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQG
+EwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3
+MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNl
+cnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBBcmFueSAoQ2xhc3MgR29sZCkgRsWR
+dGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgxMjA2MTUwODIxWjCB
+pzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxOZXRM
+b2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlm
+aWNhdGlvbiBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNz
+IEdvbGQpIEbFkXRhbsO6c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAxCRec75LbRTDofTjl5Bu0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrT
+lF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw/HpYzY6b7cNGbIRwXdrz
+AZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAkH3B5r9s5
+VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRG
+ILdwfzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2
+BJtr+UBdADTHLpl1neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAG
+AQH/AgEEMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2M
+U9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwWqZw8UQCgwBEIBaeZ5m8BiFRh
+bvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTtaYtOUZcTh5m2C
++C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
+bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2F
+uLjbvrW5KfnaNwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2
+XjG4Kvte9nHfRCaexOYNkbQudZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Staat der Nederlanden Root CA - G2 O=Staat der Nederlanden
+# Subject: CN=Staat der Nederlanden Root CA - G2 O=Staat der Nederlanden
+# Label: "Staat der Nederlanden Root CA - G2"
+# Serial: 10000012
+# MD5 Fingerprint: 7c:a5:0f:f8:5b:9a:7d:6d:30:ae:54:5a:e3:42:a2:8a
+# SHA1 Fingerprint: 59:af:82:79:91:86:c7:b4:75:07:cb:cf:03:57:46:eb:04:dd:b7:16
+# SHA256 Fingerprint: 66:8c:83:94:7d:a6:3b:72:4b:ec:e1:74:3c:31:a0:e6:ae:d0:db:8e:c5:b3:1b:e3:77:bb:78:4f:91:b6:71:6f
+-----BEGIN CERTIFICATE-----
+MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJO
+TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFh
+dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oX
+DTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMCTkwxHjAcBgNVBAoMFVN0YWF0IGRl
+ciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5lZGVybGFuZGVuIFJv
+b3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ5291
+qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8Sp
+uOUfiUtnvWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPU
+Z5uW6M7XxgpT0GtJlvOjCwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvE
+pMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiile7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp
+5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCROME4HYYEhLoaJXhena/M
+UGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpICT0ugpTN
+GmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy
+5V6548r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv
+6q012iDTiIJh8BIitrzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEK
+eN5KzlW/HdXZt1bv8Hb/C3m1r737qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6
+B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMBAAGjgZcwgZQwDwYDVR0TAQH/
+BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcCARYxaHR0cDov
+L3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqG
+SIb3DQEBCwUAA4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLyS
+CZa59sCrI2AGeYwRTlHSeYAz+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen
+5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwjf/ST7ZwaUb7dRUG/kSS0H4zpX897
+IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaNkqbG9AclVMwWVxJK
+gnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfkCpYL
++63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxL
+vJxxcypFURmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkm
+bEgeqmiSBeGCc1qb3AdbCG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvk
+N1trSt8sV4pAWja63XVECDdCcAz+3F4hoKOKwJCcaNpQ5kUQR3i2TtJlycM33+FC
+Y7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoVIPVVYpbtbZNQvOSqeK3Z
+ywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm66+KAQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=CA Disig O=Disig a.s.
+# Subject: CN=CA Disig O=Disig a.s.
+# Label: "CA Disig"
+# Serial: 1
+# MD5 Fingerprint: 3f:45:96:39:e2:50:87:f7:bb:fe:98:0c:3c:20:98:e6
+# SHA1 Fingerprint: 2a:c8:d5:8b:57:ce:bf:2f:49:af:f2:fc:76:8f:51:14:62:90:7a:41
+# SHA256 Fingerprint: 92:bf:51:19:ab:ec:ca:d0:b1:33:2d:c4:e1:d0:5f:ba:75:b5:67:90:44:ee:0c:a2:6e:93:1f:74:4f:2f:33:cf
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzET
+MBEGA1UEBxMKQnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UE
+AxMIQ0EgRGlzaWcwHhcNMDYwMzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQsw
+CQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcg
+YS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgmGErE
+Nx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnX
+mjxUizkDPw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYD
+XcDtab86wYqg6I7ZuUUohwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhW
+S8+2rT+MitcE5eN4TPWGqvWP+j1scaMtymfraHtuM6kMgiioTGohQBUgDCZbg8Kp
+FhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8wgfwwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0PAQH/BAQD
+AgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cu
+ZGlzaWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5z
+ay9jYS9jcmwvY2FfZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2sv
+Y2EvY3JsL2NhX2Rpc2lnLmNybDAaBgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEw
+DQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59tWDYcPQuBDRIrRhCA/ec8J9B6
+yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3mkkp7M5+cTxq
+EEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
+CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeB
+EicTXxChds6KezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFN
+PGO+I++MzVpQuGhU+QqZMxEA4Z7CRneC9VkGjCFMhwnN5ag=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Juur-SK O=AS Sertifitseerimiskeskus
+# Subject: CN=Juur-SK O=AS Sertifitseerimiskeskus
+# Label: "Juur-SK"
+# Serial: 999181308
+# MD5 Fingerprint: aa:8e:5d:d9:f8:db:0a:58:b7:8d:26:87:6c:82:35:55
+# SHA1 Fingerprint: 40:9d:4b:d9:17:b5:5c:27:b6:9b:64:cb:98:22:44:0d:cd:09:b8:89
+# SHA256 Fingerprint: ec:c3:e9:c3:40:75:03:be:e0:91:aa:95:2f:41:34:8f:f8:8b:aa:86:3b:22:64:be:fa:c8:07:90:15:74:e9:39
+-----BEGIN CERTIFICATE-----
+MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcN
+AQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZp
+dHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMw
+MVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQsw
+CQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEQ
+MA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOB
+SvZiF3tfTQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkz
+ABpTpyHhOEvWgxutr2TC+Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvH
+LCu3GFH+4Hv2qEivbDtPL+/40UceJlfwUR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMP
+PbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDaTpxt4brNj3pssAki14sL
+2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQFMAMBAf8w
+ggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwIC
+MIHDHoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDk
+AGwAagBhAHMAdABhAHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0
+AHMAZQBlAHIAaQBtAGkAcwBrAGUAcwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABz
+AGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABrAGkAbgBuAGkAdABhAG0AaQBz
+AGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nwcy8wKwYDVR0f
+BCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE
+FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcY
+P2/v6X2+MA4GA1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOi
+CfP+JmeaUOTDBS8rNXiRTHyoERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+g
+kcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyLabVAyJRld/JXIWY7zoVAtjNjGr95
+HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678IIbsSt4beDI3poHS
+na9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkhMp6q
+qIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0Z
+TbvGRNs2yyqcjg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Hongkong Post Root CA 1 O=Hongkong Post
+# Subject: CN=Hongkong Post Root CA 1 O=Hongkong Post
+# Label: "Hongkong Post Root CA 1"
+# Serial: 1000
+# MD5 Fingerprint: a8:0d:6f:39:78:b9:43:6d:77:42:6d:98:5a:cc:23:ca
+# SHA1 Fingerprint: d6:da:a8:20:8d:09:d2:15:4d:24:b5:2f:cb:34:6e:b2:58:b2:8a:58
+# SHA256 Fingerprint: f9:e6:7d:33:6c:51:00:2a:c0:54:c6:32:02:2d:66:dd:a2:e7:e3:ff:f1:0a:d0:61:ed:31:d8:bb:b4:10:cf:b2
+-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsx
+FjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3Qg
+Um9vdCBDQSAxMB4XDTAzMDUxNTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkG
+A1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdr
+b25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1ApzQ
+jVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEn
+PzlTCeqrauh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjh
+ZY4bXSNmO7ilMlHIhqqhqZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9
+nnV0ttgCXjqQesBCNnLsak3c78QA3xMYV18meMjWCnl3v/evt3a5pQuEF10Q6m/h
+q5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgED
+MA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7ih9legYsC
+mEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI3
+7piol7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clB
+oiMBdDhViw+5LmeiIAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJs
+EhTkYY2sEJCehFC78JZvRZ+K88psT/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpO
+fMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilTc4afU9hDDl3WY4JxHYB0yvbi
+AmvZWg==
+-----END CERTIFICATE-----
+
+# Issuer: CN=SecureSign RootCA11 O=Japan Certification Services, Inc.
+# Subject: CN=SecureSign RootCA11 O=Japan Certification Services, Inc.
+# Label: "SecureSign RootCA11"
+# Serial: 1
+# MD5 Fingerprint: b7:52:74:e2:92:b4:80:93:f2:75:e4:cc:d7:f2:ea:26
+# SHA1 Fingerprint: 3b:c4:9f:48:f8:f3:73:a0:9c:1e:bd:f8:5b:b1:c3:65:c7:d8:11:b3
+# SHA256 Fingerprint: bf:0f:ee:fb:9e:3a:58:1a:d5:f9:e9:db:75:89:98:57:43:d2:61:08:5c:4d:31:4f:6f:5d:72:59:aa:42:16:12
+-----BEGIN CERTIFICATE-----
+MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDEr
+MCkGA1UEChMiSmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoG
+A1UEAxMTU2VjdXJlU2lnbiBSb290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0
+MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSswKQYDVQQKEyJKYXBhbiBDZXJ0aWZp
+Y2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1cmVTaWduIFJvb3RD
+QTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvLTJsz
+i1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8
+h9uuywGOwvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOV
+MdrAG/LuYpmGYz+/3ZMqg6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9
+UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rPO7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni
+8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitAbpSACW22s293bzUIUPsC
+h8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZXt94wDgYD
+VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
+AKChOBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xm
+KbabfSVSSUOrTC4rbnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQ
+X5Ucv+2rIrVls4W6ng+4reV6G4pQOh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWr
+QbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01y8hSyn+B/tlr0/cR7SXf+Of5
+pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061lgeLKBObjBmN
+QSdJQO7e5iNEOdyhIta6A/I=
+-----END CERTIFICATE-----
+
+# Issuer: CN=ACEDICOM Root O=EDICOM OU=PKI
+# Subject: CN=ACEDICOM Root O=EDICOM OU=PKI
+# Label: "ACEDICOM Root"
+# Serial: 7029493972724711941
+# MD5 Fingerprint: 42:81:a0:e2:1c:e3:55:10:de:55:89:42:65:96:22:e6
+# SHA1 Fingerprint: e0:b4:32:2e:b2:f6:a5:68:b6:54:53:84:48:18:4a:50:36:87:43:84
+# SHA256 Fingerprint: 03:95:0f:b4:9a:53:1f:3e:19:91:94:23:98:df:a9:e0:ea:32:d7:ba:1c:dd:9b:c8:5d:b5:7e:d9:40:0b:43:4a
+-----BEGIN CERTIFICATE-----
+MIIFtTCCA52gAwIBAgIIYY3HhjsBggUwDQYJKoZIhvcNAQEFBQAwRDEWMBQGA1UE
+AwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00x
+CzAJBgNVBAYTAkVTMB4XDTA4MDQxODE2MjQyMloXDTI4MDQxMzE2MjQyMlowRDEW
+MBQGA1UEAwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZF
+RElDT00xCzAJBgNVBAYTAkVTMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEA/5KV4WgGdrQsyFhIyv2AVClVYyT/kGWbEHV7w2rbYgIB8hiGtXxaOLHkWLn7
+09gtn70yN78sFW2+tfQh0hOR2QetAQXW8713zl9CgQr5auODAKgrLlUTY4HKRxx7
+XBZXehuDYAQ6PmXDzQHe3qTWDLqO3tkE7hdWIpuPY/1NFgu3e3eM+SW10W2ZEi5P
+Grjm6gSSrj0RuVFCPYewMYWveVqc/udOXpJPQ/yrOq2lEiZmueIM15jO1FillUAK
+t0SdE3QrwqXrIhWYENiLxQSfHY9g5QYbm8+5eaA9oiM/Qj9r+hwDezCNzmzAv+Yb
+X79nuIQZ1RXve8uQNjFiybwCq0Zfm/4aaJQ0PZCOrfbkHQl/Sog4P75n/TSW9R28
+MHTLOO7VbKvU/PQAtwBbhTIWdjPp2KOZnQUAqhbm84F9b32qhm2tFXTTxKJxqvQU
+fecyuB+81fFOvW8XAjnXDpVCOscAPukmYxHqC9FK/xidstd7LzrZlvvoHpKuE1XI
+2Sf23EgbsCTBheN3nZqk8wwRHQ3ItBTutYJXCb8gWH8vIiPYcMt5bMlL8qkqyPyH
+K9caUPgn6C9D4zq92Fdx/c6mUlv53U3t5fZvie27k5x2IXXwkkwp9y+cAS7+UEae
+ZAwUswdbxcJzbPEHXEUkFDWug/FqTYl6+rPYLWbwNof1K1MCAwEAAaOBqjCBpzAP
+BgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKaz4SsrSbbXc6GqlPUB53NlTKxQ
+MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUprPhKytJttdzoaqU9QHnc2VMrFAw
+RAYDVR0gBD0wOzA5BgRVHSAAMDEwLwYIKwYBBQUHAgEWI2h0dHA6Ly9hY2VkaWNv
+bS5lZGljb21ncm91cC5jb20vZG9jMA0GCSqGSIb3DQEBBQUAA4ICAQDOLAtSUWIm
+fQwng4/F9tqgaHtPkl7qpHMyEVNEskTLnewPeUKzEKbHDZ3Ltvo/Onzqv4hTGzz3
+gvoFNTPhNahXwOf9jU8/kzJPeGYDdwdY6ZXIfj7QeQCM8htRM5u8lOk6e25SLTKe
+I6RF+7YuE7CLGLHdztUdp0J/Vb77W7tH1PwkzQSulgUV1qzOMPPKC8W64iLgpq0i
+5ALudBF/TP94HTXa5gI06xgSYXcGCRZj6hitoocf8seACQl1ThCojz2GuHURwCRi
+ipZ7SkXp7FnFvmuD5uHorLUwHv4FB4D54SMNUI8FmP8sX+g7tq3PgbUhh8oIKiMn
+MCArz+2UW6yyetLHKKGKC5tNSixthT8Jcjxn4tncB7rrZXtaAWPWkFtPF2Y9fwsZ
+o5NjEFIqnxQWWOLcpfShFosOkYuByptZ+thrkQdlVV9SH686+5DdaaVbnG0OLLb6
+zqylfDJKZ0DcMDQj3dcEI2bw/FWAp/tmGYI1Z2JwOV5vx+qQQEQIHriy1tvuWacN
+GHk0vFQYXlPKNFHtRQrmjseCNj6nOGOpMCwXEGCSn1WHElkQwg9naRHMTh5+Spqt
+r0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3otkYNbn5XOmeUwssfnHdK
+Z05phkOTOPu220+DkdRgfks+KzgHVZhepA==
+-----END CERTIFICATE-----
+
+# Issuer: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority
+# Subject: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority
+# Label: "Verisign Class 3 Public Primary Certification Authority"
+# Serial: 80507572722862485515306429940691309246
+# MD5 Fingerprint: ef:5a:f1:33:ef:f1:cd:bb:51:02:ee:12:14:4b:96:c4
+# SHA1 Fingerprint: a1:db:63:93:91:6f:17:e4:18:55:09:40:04:15:c7:02:40:b0:ae:6b
+# SHA256 Fingerprint: a4:b6:b3:99:6f:c2:f3:06:b3:fd:86:81:bd:63:41:3d:8c:50:09:cc:4f:a3:29:c2:cc:f0:e2:fa:1b:14:03:05
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
+cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
+MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
+BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
+BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
+I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
+CSqGSIb3DQEBBQUAA4GBABByUqkFFBkyCEHwxWsKzH4PIRnN5GfcX6kb5sroc50i
+2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWXbj9T/UWZYB2oK0z5XqcJ
+2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/D/xwzoiQ
+-----END CERTIFICATE-----
+
+# Issuer: CN=Microsec e-Szigno Root CA 2009 O=Microsec Ltd.
+# Subject: CN=Microsec e-Szigno Root CA 2009 O=Microsec Ltd.
+# Label: "Microsec e-Szigno Root CA 2009"
+# Serial: 14014712776195784473
+# MD5 Fingerprint: f8:49:f4:03:bc:44:2d:83:be:48:69:7d:29:64:fc:b1
+# SHA1 Fingerprint: 89:df:74:fe:5c:f4:0f:4a:80:f9:e3:37:7d:54:da:91:e1:01:31:8e
+# SHA256 Fingerprint: 3c:5f:81:fe:a5:fa:b8:2c:64:bf:a2:ea:ec:af:cd:e8:e0:77:fc:86:20:a7:ca:e5:37:16:3d:f3:6e:db:f3:78
+-----BEGIN CERTIFICATE-----
+MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYD
+VQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0
+ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0G
+CSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTAeFw0wOTA2MTYxMTMwMThaFw0y
+OTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3Qx
+FjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3pp
+Z25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
+dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvP
+kd6mJviZpWNwrZuuyjNAfW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tc
+cbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG0IMZfcChEhyVbUr02MelTTMuhTlAdX4U
+fIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKApxn1ntxVUwOXewdI/5n7
+N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm1HxdrtbC
+xkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1
++rUCAwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
+A1UdDgQWBBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPM
+Pcu1SCOhGnqmKrs0aDAbBgNVHREEFDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqG
+SIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0olZMEyL/azXm4Q5DwpL7v8u8h
+mLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfXI/OMn74dseGk
+ddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
+tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c
+2Pm2G2JwCz02yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5t
+HMN1Rq41Bab2XD0h7lbwyYIiLXpUq3DDfSJlgnCW
+-----END CERTIFICATE-----
+
+# Issuer: CN=e-Guven Kok Elektronik Sertifika Hizmet Saglayicisi O=Elektronik Bilgi Guvenligi A.S.
+# Subject: CN=e-Guven Kok Elektronik Sertifika Hizmet Saglayicisi O=Elektronik Bilgi Guvenligi A.S.
+# Label: "E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi"
+# Serial: 91184789765598910059173000485363494069
+# MD5 Fingerprint: 3d:41:29:cb:1e:aa:11:74:cd:5d:b0:62:af:b0:43:5b
+# SHA1 Fingerprint: dd:e1:d2:a9:01:80:2e:1d:87:5e:84:b3:80:7e:4b:b1:fd:99:41:34
+# SHA256 Fingerprint: e6:09:07:84:65:a4:19:78:0c:b6:ac:4c:1c:0b:fb:46:53:d9:d9:cc:6e:b3:94:6e:b7:f3:d6:99:97:ba:d5:98
+-----BEGIN CERTIFICATE-----
+MIIDtjCCAp6gAwIBAgIQRJmNPMADJ72cdpW56tustTANBgkqhkiG9w0BAQUFADB1
+MQswCQYDVQQGEwJUUjEoMCYGA1UEChMfRWxla3Ryb25payBCaWxnaSBHdXZlbmxp
+Z2kgQS5TLjE8MDoGA1UEAxMzZS1HdXZlbiBLb2sgRWxla3Ryb25payBTZXJ0aWZp
+a2EgSGl6bWV0IFNhZ2xheWljaXNpMB4XDTA3MDEwNDExMzI0OFoXDTE3MDEwNDEx
+MzI0OFowdTELMAkGA1UEBhMCVFIxKDAmBgNVBAoTH0VsZWt0cm9uaWsgQmlsZ2kg
+R3V2ZW5saWdpIEEuUy4xPDA6BgNVBAMTM2UtR3V2ZW4gS29rIEVsZWt0cm9uaWsg
+U2VydGlmaWthIEhpem1ldCBTYWdsYXlpY2lzaTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAMMSIJ6wXgBljU5Gu4Bc6SwGl9XzcslwuedLZYDBS75+PNdU
+MZTe1RK6UxYC6lhj71vY8+0qGqpxSKPcEC1fX+tcS5yWCEIlKBHMilpiAVDV6wlT
+L/jDj/6z/P2douNffb7tC+Bg62nsM+3YjfsSSYMAyYuXjDtzKjKzEve5TfL0TW3H
+5tYmNwjy2f1rXKPlSFxYvEK+A1qBuhw1DADT9SN+cTAIJjjcJRFHLfO6IxClv7wC
+90Nex/6wN1CZew+TzuZDLMN+DfIcQ2Zgy2ExR4ejT669VmxMvLz4Bcpk9Ok0oSy1
+c+HCPujIyTQlCFzz7abHlJ+tiEMl1+E5YP6sOVkCAwEAAaNCMEAwDgYDVR0PAQH/
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ/uRLOU1fqRTy7ZVZoE
+VtstxNulMA0GCSqGSIb3DQEBBQUAA4IBAQB/X7lTW2M9dTLn+sR0GstG30ZpHFLP
+qk/CaOv/gKlR6D1id4k9CnU58W5dF4dvaAXBlGzZXd/aslnLpRCKysw5zZ/rTt5S
+/wzw9JKp8mxTq5vSR6AfdPebmvEvFZ96ZDAYBzwqD2fK/A+JYZ1lpTzlvBNbCNvj
+/+27BrtqBrF6T2XGgv0enIu1De5Iu7i9qgi0+6N8y5/NkHZchpZ4Vwpm+Vganf2X
+KWDeEaaQHBkc7gGWIjQ0LpH5t8Qn0Xvmv/uARFoW5evg1Ao4vOSR49XrXMGs3xtq
+fJ7lddK2l4fbzIcrQzqECK+rPNv3PGYxhrCdU3nt+CPeQuMtgvEP5fqX
+-----END CERTIFICATE-----
+
+# Issuer: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R3
+# Subject: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R3
+# Label: "GlobalSign Root CA - R3"
+# Serial: 4835703278459759426209954
+# MD5 Fingerprint: c5:df:b8:49:ca:05:13:55:ee:2d:ba:1a:c3:3e:b0:28
+# SHA1 Fingerprint: d6:9b:56:11:48:f0:1c:77:c5:45:78:c1:09:26:df:5b:85:69:76:ad
+# SHA256 Fingerprint: cb:b5:22:d7:b7:f1:27:ad:6a:01:13:86:5b:df:1c:d4:10:2e:7d:07:59:af:63:5a:7c:f4:72:0d:c9:63:c5:3b
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4G
+A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNp
+Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4
+MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEG
+A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWtiHL8
+RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsT
+gHeMCOFJ0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmm
+KPZpO/bLyCiR5Z2KYVc3rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zd
+QQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjlOCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZ
+XriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2xmmFghcCAwEAAaNCMEAw
+DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI/wS3+o
+LkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZU
+RUm7lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMp
+jjM5RcOO5LlXbKr8EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK
+6fBdRoyV3XpYKBovHd7NADdBj+1EbddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQX
+mcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18YIvDQVETI53O9zJrlAGomecs
+Mx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7rkpeDMdmztcpH
+WD9f
+-----END CERTIFICATE-----
+
+# Issuer: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
+# Subject: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
+# Label: "Autoridad de Certificacion Firmaprofesional CIF A62634068"
+# Serial: 6047274297262753887
+# MD5 Fingerprint: 73:3a:74:7a:ec:bb:a3:96:a6:c2:e4:e2:c8:9b:c0:c3
+# SHA1 Fingerprint: ae:c5:fb:3f:c8:e1:bf:c4:e5:4f:03:07:5a:9a:e8:00:b7:f7:b6:fa
+# SHA256 Fingerprint: 04:04:80:28:bf:1f:28:64:d4:8f:9a:d4:d8:32:94:36:6a:82:88:56:55:3f:3b:14:30:3f:90:14:7f:5d:40:ef
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UE
+BhMCRVMxQjBABgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1h
+cHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEy
+MzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUg
+Q2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBBNjI2MzQwNjgwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDDUtd9
+thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQM
+cas9UX4PB99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefG
+L9ItWY16Ck6WaVICqjaY7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15i
+NA9wBj4gGFrO93IbJWyTdBSTo3OxDqqHECNZXyAFGUftaI6SEspd/NYrspI8IM/h
+X68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyIplD9amML9ZMWGxmPsu2b
+m8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctXMbScyJCy
+Z/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirja
+EbsXLZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/T
+KI8xWVvTyQKmtFLKbpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF
+6NkBiDkal4ZkQdU7hwxu+g/GvUgUvzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVh
+OSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNHDhpkLzCBpgYD
+VR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
+cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBv
+ACAAZABlACAAbABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBl
+AGwAbwBuAGEAIAAwADgAMAAxADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF
+661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx51tkljYyGOylMnfX40S2wBEqgLk9
+am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qkR71kMrv2JYSiJ0L1
+ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaPT481
+PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS
+3a/DTg4fJl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5k
+SeTy36LssUzAKh3ntLFlosS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF
+3dvd6qJ2gHN99ZwExEWN57kci57q13XRcrHedUTnQn3iV2t93Jm8PYMo6oCTjcVM
+ZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoRsaS8I8nkvof/uZS2+F0g
+StRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTDKCOM/icz
+Q0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQB
+jLMi6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
+-----END CERTIFICATE-----
+
+# Issuer: CN=Izenpe.com O=IZENPE S.A.
+# Subject: CN=Izenpe.com O=IZENPE S.A.
+# Label: "Izenpe.com"
+# Serial: 917563065490389241595536686991402621
+# MD5 Fingerprint: a6:b0:cd:85:80:da:5c:50:34:a3:39:90:2f:55:67:73
+# SHA1 Fingerprint: 2f:78:3d:25:52:18:a7:4a:65:39:71:b5:2c:a2:9c:45:15:6f:e9:19
+# SHA256 Fingerprint: 25:30:cc:8e:98:32:15:02:ba:d9:6f:9b:1f:ba:1b:09:9e:2d:29:9e:0f:45:48:bb:91:4f:36:3b:c0:d4:53:1f
+-----BEGIN CERTIFICATE-----
+MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4
+MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6
+ZW5wZS5jb20wHhcNMDcxMjEzMTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYD
+VQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5j
+b20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ03rKDx6sp4boFmVq
+scIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAKClaO
+xdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6H
+LmYRY2xU+zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFX
+uaOKmMPsOzTFlUFpfnXCPCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQD
+yCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxTOTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+
+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbKF7jJeodWLBoBHmy+E60Q
+rLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK0GqfvEyN
+BjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8L
+hij+0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIB
+QFqNeb+Lz0vPqhbBleStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+
+HMh3/1uaD7euBUbl8agW7EekFwIDAQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2lu
+Zm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+SVpFTlBFIFMuQS4gLSBDSUYg
+QTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBGNjIgUzgxQzBB
+BgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
+MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwHQYDVR0OBBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUA
+A4ICAQB4pgwWSp9MiDrAyw6lFn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWb
+laQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbgakEyrkgPH7UIBzg/YsfqikuFgba56
+awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8qhT/AQKM6WfxZSzwo
+JNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Csg1lw
+LDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCT
+VyvehQP5aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGk
+LhObNA5me0mrZJfQRsN5nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJb
+UjWumDqtujWTI6cfSN01RpiyEGjkpTHCClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/
+QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZoQ0iy2+tzJOeRf1SktoA+
+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1ZWrOZyGls
+QyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Chambers of Commerce Root - 2008 O=AC Camerfirma S.A.
+# Subject: CN=Chambers of Commerce Root - 2008 O=AC Camerfirma S.A.
+# Label: "Chambers of Commerce Root - 2008"
+# Serial: 11806822484801597146
+# MD5 Fingerprint: 5e:80:9e:84:5a:0e:65:0b:17:02:f3:55:18:2a:3e:d7
+# SHA1 Fingerprint: 78:6a:74:ac:76:ab:14:7f:9c:6a:30:50:ba:9e:a8:7e:fe:9a:ce:3c
+# SHA256 Fingerprint: 06:3e:4a:fa:c4:91:df:d3:32:f3:08:9b:85:42:e9:46:17:d8:93:d7:fe:94:4e:10:a7:93:7e:e2:9d:96:93:c0
+-----BEGIN CERTIFICATE-----
+MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
+VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
+IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
+MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xKTAnBgNVBAMTIENoYW1iZXJz
+IG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEyMjk1MFoXDTM4MDcz
+MTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBj
+dXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIw
+EAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEp
+MCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW9
+28sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKAXuFixrYp4YFs8r/lfTJq
+VKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorjh40G072Q
+DuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR
+5gN/ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfL
+ZEFHcpOrUMPrCXZkNNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05a
+Sd+pZgvMPMZ4fKecHePOjlO+Bd5gD2vlGts/4+EhySnB8esHnFIbAURRPHsl18Tl
+UlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331lubKgdaX8ZSD6e2wsWsSaR6s
++12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ0wlf2eOKNcx5
+Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
+ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAx
+hduub+84Mxh2EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNV
+HQ4EFgQU+SSsD7K1+HnA+mCIG8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1
++HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpN
+YWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29t
+L2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVy
+ZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAt
+IDIwMDiCCQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRV
+HSAAMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20w
+DQYJKoZIhvcNAQEFBQADggIBAJASryI1wqM58C7e6bXpeHxIvj99RZJe6dqxGfwW
+PJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH3qLPaYRgM+gQDROpI9CF
+5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbURWpGqOt1
+glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaH
+FoI6M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2
+pSB7+R5KBWIBpih1YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MD
+xvbxrN8y8NmBGuScvfaAFPDRLLmF9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QG
+tjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcKzBIKinmwPQN/aUv0NCB9szTq
+jktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvGnrDQWzilm1De
+fhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
+OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZ
+d0jQ
+-----END CERTIFICATE-----
+
+# Issuer: CN=Global Chambersign Root - 2008 O=AC Camerfirma S.A.
+# Subject: CN=Global Chambersign Root - 2008 O=AC Camerfirma S.A.
+# Label: "Global Chambersign Root - 2008"
+# Serial: 14541511773111788494
+# MD5 Fingerprint: 9e:80:ff:78:01:0c:2e:c1:36:bd:fe:96:90:6e:08:f3
+# SHA1 Fingerprint: 4a:bd:ee:ec:95:0d:35:9c:89:ae:c7:52:a1:2c:5b:29:f6:d6:aa:0c
+# SHA256 Fingerprint: 13:63:35:43:93:34:a7:69:80:16:a0:d3:24:de:72:28:4e:07:9d:7b:52:20:bb:8f:bd:74:78:16:ee:be:ba:ca
+-----BEGIN CERTIFICATE-----
+MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
+VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
+IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
+MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
+aGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMxNDBaFw0zODA3MzEx
+MjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3Vy
+cmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAG
+A1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAl
+BgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBAMDfVtPkOpt2RbQT2//BthmLN0EYlVJH6xed
+KYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXfXjaOcNFccUMd2drvXNL7
+G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0ZJJ0YPP2
+zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4
+ddPB/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyG
+HoiMvvKRhI9lNNgATH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2
+Id3UwD2ln58fQ1DJu7xsepeY7s2MH/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3V
+yJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfeOx2YItaswTXbo6Al/3K1dh3e
+beksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSFHTynyQbehP9r
+6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
+wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsog
+zCtLkykPAgMBAAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQW
+BBS5CcqcHtvTbDprru1U8VuTBjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDpr
+ru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UEBhMCRVUxQzBBBgNVBAcTOk1hZHJp
+ZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJmaXJtYS5jb20vYWRk
+cmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJmaXJt
+YSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiC
+CQDJzdPp1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCow
+KAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZI
+hvcNAQEFBQADggIBAICIf3DekijZBZRG/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZ
+UohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6ReAJ3spED8IXDneRRXoz
+X1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/sdZ7LoR/x
+fxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVz
+a2Mg9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yyd
+Yhz2rXzdpjEetrHHfoUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMd
+SqlapskD7+3056huirRXhOukP9DuqqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9O
+AP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETrP3iZ8ntxPjzxmKfFGBI/5rso
+M0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVqc5iJWzouE4ge
+v8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
+09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
+-----END CERTIFICATE-----
+
+# Issuer: CN=Go Daddy Root Certificate Authority - G2 O=GoDaddy.com, Inc.
+# Subject: CN=Go Daddy Root Certificate Authority - G2 O=GoDaddy.com, Inc.
+# Label: "Go Daddy Root Certificate Authority - G2"
+# Serial: 0
+# MD5 Fingerprint: 80:3a:bc:22:c1:e6:fb:8d:9b:3b:27:4a:32:1b:9a:01
+# SHA1 Fingerprint: 47:be:ab:c9:22:ea:e8:0e:78:78:34:62:a7:9f:45:c2:54:fd:e6:8b
+# SHA256 Fingerprint: 45:14:0b:32:47:eb:9c:c8:c5:b4:f0:d7:b5:30:91:f7:32:92:08:9e:6e:5a:63:e2:74:9d:d3:ac:a9:19:8e:da
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoT
+EUdvRGFkZHkuY29tLCBJbmMuMTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRp
+ZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIz
+NTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQH
+EwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8GA1UE
+AxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKD
+E6bFIEMBO4Tx5oVJnyfq9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH
+/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD+qK+ihVqf94Lw7YZFAXK6sOoBJQ7Rnwy
+DfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutdfMh8+7ArU6SSYmlRJQVh
+GkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMlNAJWJwGR
+tDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEA
+AaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
+FDqahQcQZyi27/a9BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmX
+WWcDYfF+OwYxdS2hII5PZYe096acvNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu
+9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r5N9ss4UXnT3ZJE95kTXWXwTr
+gIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYVN8Gb5DKj7Tjo
+2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
+LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI
+4uJEvlz36hz1
+-----END CERTIFICATE-----
+
+# Issuer: CN=Starfield Root Certificate Authority - G2 O=Starfield Technologies, Inc.
+# Subject: CN=Starfield Root Certificate Authority - G2 O=Starfield Technologies, Inc.
+# Label: "Starfield Root Certificate Authority - G2"
+# Serial: 0
+# MD5 Fingerprint: d6:39:81:c6:52:7e:96:69:fc:fc:ca:66:ed:05:f2:96
+# SHA1 Fingerprint: b5:1c:06:7c:ee:2b:0c:3d:f8:55:ab:2d:92:f4:fe:39:d4:e7:0f:0e
+# SHA256 Fingerprint: 2c:e1:cb:0b:f9:d2:f9:e1:02:99:3f:be:21:51:52:c3:b2:dd:0c:ab:de:1c:68:e5:31:9b:83:91:54:db:b7:f5
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
+HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVs
+ZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAw
+MFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
+b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVj
+aG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZp
+Y2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAL3twQP89o/8ArFvW59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMg
+nLRJdzIpVv257IzdIvpy3Cdhl+72WoTsbhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1
+HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNkN3mSwOxGXn/hbVNMYq/N
+Hwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7NfZTD4p7dN
+dloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0
+HZbUJtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
+BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0G
+CSqGSIb3DQEBCwUAA4IBAQARWfolTwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjU
+sHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx4mcujJUDJi5DnUox9g61DLu3
+4jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUwF5okxBDgBPfg
+8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
+pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1
+mMpYjn0q7pBZc2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
+-----END CERTIFICATE-----
+
+# Issuer: CN=Starfield Services Root Certificate Authority - G2 O=Starfield Technologies, Inc.
+# Subject: CN=Starfield Services Root Certificate Authority - G2 O=Starfield Technologies, Inc.
+# Label: "Starfield Services Root Certificate Authority - G2"
+# Serial: 0
+# MD5 Fingerprint: 17:35:74:af:7b:61:1c:eb:f4:f9:3c:e2:ee:40:f9:a2
+# SHA1 Fingerprint: 92:5a:8f:8d:2c:6d:04:e0:66:5f:59:6a:ff:22:d8:63:e8:25:6f:3f
+# SHA256 Fingerprint: 56:8d:69:05:a2:c8:87:08:a4:b3:02:51:90:ed:cf:ed:b1:97:4a:60:6a:13:c6:e5:29:0f:cb:2a:e6:3e:da:b5
+-----BEGIN CERTIFICATE-----
+MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
+HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVs
+ZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
+MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNVBAYTAlVTMRAwDgYD
+VQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFy
+ZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2Vy
+dmljZXMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20p
+OsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm2
+8xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4PahHQUw2eeBGg6345AWh1K
+Ts9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLPLJGmpufe
+hRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk
+6mFBrMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAw
+DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+q
+AdcwKziIorhtSpzyEZGDMA0GCSqGSIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMI
+bw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPPE95Dz+I0swSdHynVv/heyNXB
+ve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTyxQGjhdByPq1z
+qwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
+iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn
+0q23KXB56jzaYyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCN
+sSi6
+-----END CERTIFICATE-----
+
+# Issuer: CN=AffirmTrust Commercial O=AffirmTrust
+# Subject: CN=AffirmTrust Commercial O=AffirmTrust
+# Label: "AffirmTrust Commercial"
+# Serial: 8608355977964138876
+# MD5 Fingerprint: 82:92:ba:5b:ef:cd:8a:6f:a6:3d:55:f9:84:f6:d6:b7
+# SHA1 Fingerprint: f9:b5:b6:32:45:5f:9c:be:ec:57:5f:80:dc:e9:6e:2c:c7:b2:78:b7
+# SHA256 Fingerprint: 03:76:ab:1d:54:c5:f9:80:3c:e4:b2:e2:01:a0:ee:7e:ef:7b:57:b6:36:e8:a9:3c:9b:8d:48:60:c9:6f:5f:a7
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
+dCBDb21tZXJjaWFsMB4XDTEwMDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDEL
+MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
+cm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6EqdbDuKP
+Hx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yr
+ba0F8PrVC8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPAL
+MeIrJmqbTFeurCA+ukV6BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1
+yHp52UKqK39c/s4mT6NmgTWvRLpUHhwwMmWd5jyTXlBOeuM61G7MGvv50jeuJCqr
+VwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNVHQ4EFgQUnZPGU4teyq8/
+nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
+KoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYG
+XUPGhi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNj
+vbz4YYCanrHOQnDiqX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivt
+Z8SOyUOyXGsViQK8YvxO8rUzqrJv0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9g
+N53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0khsUlHRUe072o0EclNmsxZt9YC
+nlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
+-----END CERTIFICATE-----
+
+# Issuer: CN=AffirmTrust Networking O=AffirmTrust
+# Subject: CN=AffirmTrust Networking O=AffirmTrust
+# Label: "AffirmTrust Networking"
+# Serial: 8957382827206547757
+# MD5 Fingerprint: 42:65:ca:be:01:9a:9a:4c:a9:8c:41:49:cd:c0:d5:7f
+# SHA1 Fingerprint: 29:36:21:02:8b:20:ed:02:f5:66:c5:32:d1:d6:ed:90:9f:45:00:2f
+# SHA256 Fingerprint: 0a:81:ec:5a:92:97:77:f1:45:90:4a:f3:8d:5d:50:9f:66:b5:e2:c5:8f:cd:b5:31:05:8b:0e:17:f3:f0:b4:1b
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
+dCBOZXR3b3JraW5nMB4XDTEwMDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDEL
+MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
+cm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SEHi3y
+YJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbua
+kCNrmreIdIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRL
+QESxG9fhwoXA3hA/Pe24/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp
+6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gbh+0t+nvujArjqWaJGctB+d1ENmHP4ndG
+yH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNVHQ4EFgQUBx/S55zawm6i
+QLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
+KoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfO
+tDIuUFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzu
+QY0x2+c06lkh1QF612S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZ
+Lgo/bNjR9eUJtGxUAArgFU2HdW23WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4u
+olu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9/ZFvgrG+CJPbFEfxojfHRZ48
+x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
+-----END CERTIFICATE-----
+
+# Issuer: CN=AffirmTrust Premium O=AffirmTrust
+# Subject: CN=AffirmTrust Premium O=AffirmTrust
+# Label: "AffirmTrust Premium"
+# Serial: 7893706540734352110
+# MD5 Fingerprint: c4:5d:0e:48:b6:ac:28:30:4e:0a:bc:f9:38:16:87:57
+# SHA1 Fingerprint: d8:a6:33:2c:e0:03:6f:b1:85:f6:63:4f:7d:6a:06:65:26:32:28:27
+# SHA256 Fingerprint: 70:a7:3f:7f:37:6b:60:07:42:48:90:45:34:b1:14:82:d5:bf:0e:69:8e:cc:49:8d:f5:25:77:eb:f2:e9:3b:9a
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVz
+dCBQcmVtaXVtMB4XDTEwMDEyOTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkG
+A1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1U
+cnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxBLf
+qV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtnBKAQ
+JG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ
++jjeRFcV5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrS
+s8PhaJyJ+HoAVt70VZVs+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5
+HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmdGPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d7
+70O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5Rp9EixAqnOEhss/n/fauG
+V+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NIS+LI+H+S
+qHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S
+5u046uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4Ia
+C1nEWTJ3s7xgaVY5/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TX
+OwF0lkLgAOIua+rF7nKsu7/+6qqo+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYE
+FJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
+BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByvMiPIs0laUZx2
+KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
+Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B
+8OWycvpEgjNC6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQ
+MKSOyARiqcTtNd56l+0OOF6SL5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc
+0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK+4w1IX2COPKpVJEZNZOUbWo6xbLQ
+u4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmVBtWVyuEklut89pMF
+u+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFgIxpH
+YoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8
+GKa1qF60g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaO
+RtGdFNrHF+QFlozEJLUbzxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6e
+KeC2uAloGRwYQw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=AffirmTrust Premium ECC O=AffirmTrust
+# Subject: CN=AffirmTrust Premium ECC O=AffirmTrust
+# Label: "AffirmTrust Premium ECC"
+# Serial: 8401224907861490260
+# MD5 Fingerprint: 64:b0:09:55:cf:b1:d5:99:e2:be:13:ab:a6:5d:ea:4d
+# SHA1 Fingerprint: b8:23:6b:00:2f:1d:16:86:53:01:55:6c:11:a4:37:ca:eb:ff:c3:bb
+# SHA256 Fingerprint: bd:71:fd:f6:da:97:e4:cf:62:d1:64:7a:dd:25:81:b0:7d:79:ad:f8:39:7e:b4:ec:ba:9c:5e:84:88:82:14:23
+-----BEGIN CERTIFICATE-----
+MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMC
+VVMxFDASBgNVBAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQ
+cmVtaXVtIEVDQzAeFw0xMDAxMjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJ
+BgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEgMB4GA1UEAwwXQWZmaXJt
+VHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNMF4bFZ0D
+0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQN8O9
+ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0G
+A1UdDgQWBBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4G
+A1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/Vs
+aobgxCd05DhT1wV/GzTjxi+zygk8N53X57hG8f2h4nECMEJZh0PUUd+60wkyWs6I
+flc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKMeQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Certum Trusted Network CA O=Unizeto Technologies S.A. OU=Certum Certification Authority
+# Subject: CN=Certum Trusted Network CA O=Unizeto Technologies S.A. OU=Certum Certification Authority
+# Label: "Certum Trusted Network CA"
+# Serial: 279744
+# MD5 Fingerprint: d5:e9:81:40:c5:18:69:fc:46:2c:89:75:62:0f:aa:78
+# SHA1 Fingerprint: 07:e0:32:e0:20:b7:2c:3f:19:2f:06:28:a2:59:3a:19:a7:0f:06:9e
+# SHA256 Fingerprint: 5c:58:46:8d:55:f5:8e:49:7e:74:39:82:d2:b5:00:10:b6:d1:65:37:4a:cf:83:a7:d4:a3:2d:b7:68:c4:40:8e
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBM
+MSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5D
+ZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBU
+cnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIyMTIwNzM3WhcNMjkxMjMxMTIwNzM3
+WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMg
+Uy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSIw
+IAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rH
+UV+rpDKmYYe2bg+G0jACl/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LM
+TXPb865Px1bVWqeWifrzq2jUI4ZZJ88JJ7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVU
+BBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4fOQtf/WsX+sWn7Et0brM
+kUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0cvW0QM8x
+AcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNV
+HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15y
+sHhE49wcrwn9I0j6vSrEuVUEtRCjjSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfL
+I9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1mS1FhIrlQgnXdAIv94nYmem8
+J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5ajZt3hrvJBW8qY
+VoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
+03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Certinomis - Autorité Racine O=Certinomis OU=0002 433998903
+# Subject: CN=Certinomis - Autorité Racine O=Certinomis OU=0002 433998903
+# Label: "Certinomis - Autorité Racine"
+# Serial: 1
+# MD5 Fingerprint: 7f:30:78:8c:03:e3:ca:c9:0a:e2:c9:ea:1e:aa:55:1a
+# SHA1 Fingerprint: 2e:14:da:ec:28:f0:fa:1e:8e:38:9a:4e:ab:eb:26:c0:0a:d3:83:c3
+# SHA256 Fingerprint: fc:bf:e2:88:62:06:f7:2b:27:59:3c:8b:07:02:97:e1:2d:76:9e:d1:0e:d7:93:07:05:a8:09:8e:ff:c1:4d:17
+-----BEGIN CERTIFICATE-----
+MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjET
+MBEGA1UEChMKQ2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAk
+BgNVBAMMHUNlcnRpbm9taXMgLSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4
+Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkGA1UEBhMCRlIxEzARBgNVBAoTCkNl
+cnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYwJAYDVQQDDB1DZXJ0
+aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jY
+F1AMnmHawE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N
+8y4oH3DfVS9O7cdxbwlyLu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWe
+rP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K
+/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92NjMD2AR5vpTESOH2VwnHu
+7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9qc1pkIuVC
+28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6
+lSTClrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1E
+nn1So2+WLhl+HPNbxxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB
+0iSVL1N6aaLwD4ZFjliCK0wi1F6g530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql09
+5gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna4NH4+ej9Uji29YnfAgMBAAGj
+WzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQN
+jLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ
+KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9s
+ov3/4gbIOZ/xWqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZM
+OH8oMDX/nyNTt7buFHAAQCvaR6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q
+619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40nJ+U8/aGH88bc62UeYdocMMzpXDn
+2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1BCxMjidPJC+iKunqj
+o3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjvJL1v
+nxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG
+5ERQL1TEqkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWq
+pdEdnV1j6CTmNhTih60bWfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZb
+dsLLO7XSAPCjDuGtbkD326C00EauFddEwk01+dIL8hf2rGbVJLJP0RyZwG71fet0
+BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/vgt2Fl43N+bYdJeimUV5
+-----END CERTIFICATE-----
+
+# Issuer: CN=Root CA Generalitat Valenciana O=Generalitat Valenciana OU=PKIGVA
+# Subject: CN=Root CA Generalitat Valenciana O=Generalitat Valenciana OU=PKIGVA
+# Label: "Root CA Generalitat Valenciana"
+# Serial: 994436456
+# MD5 Fingerprint: 2c:8c:17:5e:b1:54:ab:93:17:b5:36:5a:db:d1:c6:f2
+# SHA1 Fingerprint: a0:73:e5:c5:bd:43:61:0d:86:4c:21:13:0a:85:58:57:cc:9c:ea:46
+# SHA256 Fingerprint: 8c:4e:df:d0:43:48:f3:22:96:9e:7e:29:a4:cd:4d:ca:00:46:55:06:1c:16:e1:b0:76:42:2e:f3:42:ad:63:0e
+-----BEGIN CERTIFICATE-----
+MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJF
+UzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJ
+R1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcN
+MDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3WjBoMQswCQYDVQQGEwJFUzEfMB0G
+A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScw
+JQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke+
+WmmmO3I2F0zo37i7L3bhQEZ0ZQKQUgi0/6iMweDHiVYQOTPvaLRfX9ptI6GJXiKj
+SgbwJ/BXufjpTjJ3Cj9BZPPrZe52/lSqfR0grvPXdMIKX/UIKFIIzFVd0g/bmoGl
+u6GzwZTNVOAydTGRGmKy3nXiz0+J2ZGQD0EbtFpKd71ng+CT516nDOeB0/RSrFOy
+A8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXteJajCq+TA81yc477OMUxk
+Hl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMBAAGjggM7
+MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBr
+aS5ndmEuZXMwEgYDVR0TAQH/BAgwBgEB/wIBAjCCAjQGA1UdIASCAiswggInMIIC
+IwYKKwYBBAG/VQIBADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8A
+cgBpAGQAYQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIA
+YQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIAYQBsAGkAdABhAHQAIABWAGEA
+bABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQByAGEAYwBpAPMA
+bgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA
+aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMA
+aQBvAG4AYQBtAGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQA
+ZQAgAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEA
+YwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBuAHQAcgBhACAAZQBuACAAbABhACAA
+ZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAAOgAvAC8AdwB3AHcA
+LgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0dHA6
+Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk+y
+eAT8MIGVBgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk+yeAT8oWykajBoMQsw
+CQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0G
+A1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVu
+Y2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRhTvW1yEICKrNcda3Fbcrn
+lD+laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdzCkj+IHLt
+b8zog2EWRpABlUt9jppSCS/2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg
+9J63NI8KJr2XXPR5OkowGcytT6CYirQxlyric21+eLj4iIlPsSKRZEv1UN4D2+XF
+ducTZnV+ZfsBn5OHiJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmC
+IoaZM3Fa6hlXPZHNqcCjbgcTpsnt+GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM=
+-----END CERTIFICATE-----
+
+# Issuer: CN=A-Trust-nQual-03 O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH OU=A-Trust-nQual-03
+# Subject: CN=A-Trust-nQual-03 O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH OU=A-Trust-nQual-03
+# Label: "A-Trust-nQual-03"
+# Serial: 93214
+# MD5 Fingerprint: 49:63:ae:27:f4:d5:95:3d:d8:db:24:86:b8:9c:07:53
+# SHA1 Fingerprint: d3:c0:63:f2:19:ed:07:3e:34:ad:5d:75:0b:32:76:29:ff:d5:9a:f2
+# SHA256 Fingerprint: 79:3c:bf:45:59:b9:fd:e3:8a:b2:2d:f1:68:69:f6:98:81:ae:14:c4:b0:13:9a:c7:88:a7:8a:1a:fc:ca:02:fb
+-----BEGIN CERTIFICATE-----
+MIIDzzCCAregAwIBAgIDAWweMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJB
+VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp
+bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5R
+dWFsLTAzMRkwFwYDVQQDDBBBLVRydXN0LW5RdWFsLTAzMB4XDTA1MDgxNzIyMDAw
+MFoXDTE1MDgxNzIyMDAwMFowgY0xCzAJBgNVBAYTAkFUMUgwRgYDVQQKDD9BLVRy
+dXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0ZW52
+ZXJrZWhyIEdtYkgxGTAXBgNVBAsMEEEtVHJ1c3QtblF1YWwtMDMxGTAXBgNVBAMM
+EEEtVHJ1c3QtblF1YWwtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCtPWFuA/OQO8BBC4SAzewqo51ru27CQoT3URThoKgtUaNR8t4j8DRE/5TrzAUj
+lUC5B3ilJfYKvUWG6Nm9wASOhURh73+nyfrBJcyFLGM/BWBzSQXgYHiVEEvc+RFZ
+znF/QJuKqiTfC0Li21a8StKlDJu3Qz7dg9MmEALP6iPESU7l0+m0iKsMrmKS1GWH
+2WrX9IWf5DMiJaXlyDO6w8dB3F/GaswADm0yqLaHNgBid5seHzTLkDx4iHQF63n1
+k3Flyp3HaxgtPVxO59X4PzF9j4fsCiIvI+n+u33J4PTs63zEsMMtYrWacdaxaujs
+2e3Vcuy+VwHOBVWf3tFgiBCzAgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYD
+VR0OBAoECERqlWdVeRFPMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC
+AQEAVdRU0VlIXLOThaq/Yy/kgM40ozRiPvbY7meIMQQDbwvUB/tOdQ/TLtPAF8fG
+KOwGDREkDg6lXb+MshOWcdzUzg4NCmgybLlBMRmrsQd7TZjTXLDR8KdCoLXEjq/+
+8T/0709GAHbrAvv5ndJAlseIOrifEXnzgGWovR/TeIGgUUw3tKZdJXDRZslo+S4R
+FGjxVJgIrCaSD96JntT6s3kr0qN51OyLrIdTaEJMUVF0HhsnLuP1Hyl0Te2v9+GS
+mYHovjrHF1D2t8b8m7CKa9aIA5GPBnc6hQLdmNVDeD/GMBWsm2vLV7eJUYs66MmE
+DNuxUCAKGkq6ahq97BvIxYSazQ==
+-----END CERTIFICATE-----
+
+# Issuer: CN=TWCA Root Certification Authority O=TAIWAN-CA OU=Root CA
+# Subject: CN=TWCA Root Certification Authority O=TAIWAN-CA OU=Root CA
+# Label: "TWCA Root Certification Authority"
+# Serial: 1
+# MD5 Fingerprint: aa:08:8f:f6:f9:7b:b7:f2:b1:a7:1e:9b:ea:ea:bd:79
+# SHA1 Fingerprint: cf:9e:87:6d:d3:eb:fc:42:26:97:a3:b5:a3:7a:a0:76:a9:06:23:48
+# SHA256 Fingerprint: bf:d8:8f:e1:10:1c:41:ae:3e:80:1b:f8:be:56:35:0e:e9:ba:d1:a6:b9:bd:51:5e:dc:5c:6d:5b:87:11:ac:44
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzES
+MBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFU
+V0NBIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMz
+WhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJVEFJV0FO
+LUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFE
+AcK0HMMxQhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HH
+K3XLfJ+utdGdIzdjp9xCoi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeX
+RfwZVzsrb+RH9JlF/h3x+JejiB03HFyP4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/z
+rX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1ry+UPizgN7gr8/g+YnzAx
+3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkq
+hkiG9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeC
+MErJk/9q56YAf4lCmtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdls
+XebQ79NqZp4VKIV66IIArB6nCWlWQtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62D
+lhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVYT0bf+215WfKEIlKuD8z7fDvn
+aspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocnyYh0igzyXxfkZ
+YiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
+-----END CERTIFICATE-----
+
+# Issuer: O=SECOM Trust Systems CO.,LTD. OU=Security Communication RootCA2
+# Subject: O=SECOM Trust Systems CO.,LTD. OU=Security Communication RootCA2
+# Label: "Security Communication RootCA2"
+# Serial: 0
+# MD5 Fingerprint: 6c:39:7d:a4:0e:55:59:b2:3f:d6:41:b1:12:50:de:43
+# SHA1 Fingerprint: 5f:3b:8c:f2:f8:10:b3:7d:78:b4:ce:ec:19:19:c3:73:34:b9:c7:74
+# SHA256 Fingerprint: 51:3b:2c:ec:b8:10:d4:cd:e5:dd:85:39:1a:df:c6:c2:dd:60:d8:7b:b7:36:d2:b5:21:48:4a:a4:7a:0e:be:f6
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDEl
+MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMe
+U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoX
+DTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRy
+dXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3VyaXR5IENvbW11bmlj
+YXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAV
+OVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGr
+zbl+dp+++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVM
+VAX3NuRFg3sUZdbcDE3R3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQ
+hNBqyjoGADdH5H5XTz+L62e4iKrFvlNVspHEfbmwhRkGeC7bYRr6hfVKkaHnFtWO
+ojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1KEOtOghY6rCcMU/Gt1SSw
+awNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8QIH4D5cs
+OPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
+DQEBCwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpF
+coJxDjrSzG+ntKEju/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXc
+okgfGT+Ok+vx+hfuzU7jBBJV1uXk3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8
+t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6qtnRGEmyR7jTV7JqR50S+kDFy
+1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29mvVXIwAHIRc/
+SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
+-----END CERTIFICATE-----
+
+# Issuer: CN=Hellenic Academic and Research Institutions RootCA 2011 O=Hellenic Academic and Research Institutions Cert. Authority
+# Subject: CN=Hellenic Academic and Research Institutions RootCA 2011 O=Hellenic Academic and Research Institutions Cert. Authority
+# Label: "Hellenic Academic and Research Institutions RootCA 2011"
+# Serial: 0
+# MD5 Fingerprint: 73:9f:4c:4b:73:5b:79:e9:fa:ba:1c:ef:6e:cb:d5:c9
+# SHA1 Fingerprint: fe:45:65:9b:79:03:5b:98:a1:61:b5:51:2e:ac:da:58:09:48:22:4d
+# SHA256 Fingerprint: bc:10:4f:15:a4:8b:e7:09:dc:a5:42:a7:e1:d4:b9:df:6f:05:45:27:e8:02:ea:a9:2d:59:54:44:25:8a:fe:71
+-----BEGIN CERTIFICATE-----
+MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1Ix
+RDBCBgNVBAoTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1
+dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1p
+YyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIFJvb3RDQSAyMDExMB4XDTExMTIw
+NjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYTAkdSMUQwQgYDVQQK
+EztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENl
+cnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJl
+c2VhcmNoIEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPz
+dYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJ
+fel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa71HFK9+WXesyHgLacEns
+bgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u8yBRQlqD
+75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSP
+FEDH3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNV
+HRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp
+5dgTBCPuQSUwRwYDVR0eBEAwPqA8MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQu
+b3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQub3JnMA0GCSqGSIb3DQEBBQUA
+A4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVtXdMiKahsog2p
+6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
+TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7
+dIsXRSZMFpGD/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8Acys
+Nnq/onN694/BtZqhFLKPM58N7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXI
+l7WdmplNsDz4SgCbZN2fOUvRJ9e4
+-----END CERTIFICATE-----
+
+# Issuer: CN=Actalis Authentication Root CA O=Actalis S.p.A./03358520967
+# Subject: CN=Actalis Authentication Root CA O=Actalis S.p.A./03358520967
+# Label: "Actalis Authentication Root CA"
+# Serial: 6271844772424770508
+# MD5 Fingerprint: 69:c1:0d:4f:07:a3:1b:c3:fe:56:3d:04:bc:11:f6:a6
+# SHA1 Fingerprint: f3:73:b3:87:06:5a:28:84:8a:f2:f3:4a:ce:19:2b:dd:c7:8e:9c:ac
+# SHA256 Fingerprint: 55:92:60:84:ec:96:3a:64:b9:6e:2a:be:01:ce:0b:a8:6a:64:fb:fe:bc:c7:aa:b5:af:c1:55:b3:7f:d7:60:66
+-----BEGIN CERTIFICATE-----
+MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UE
+BhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8w
+MzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
+IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDkyMjExMjIwMlowazELMAkGA1UEBhMC
+SVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1
+ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENB
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNv
+UTufClrJwkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX
+4ay8IMKx4INRimlNAJZaby/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9
+KK3giq0itFZljoZUj5NDKd45RnijMCO6zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/
+gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1fYVEiVRvjRuPjPdA1Yprb
+rxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2oxgkg4YQ
+51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2F
+be8lEfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxe
+KF+w6D9Fz8+vm2/7hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4F
+v6MGn8i1zeQf1xcGDXqVdFUNaBr8EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbn
+fpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5jF66CyCU3nuDuP/jVo23Eek7
+jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLYiDrIn3hm7Ynz
+ezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
+ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQAL
+e3KHwGCmSUyIWOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70
+jsNjLiNmsGe+b7bAEzlgqqI0JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDz
+WochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKxK3JCaKygvU5a2hi/a5iB0P2avl4V
+SM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+Xlff1ANATIGk0k9j
+pwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC4yyX
+X04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+Ok
+fcvHlXHo2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7R
+K4X9p2jIugErsWx0Hbhzlefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btU
+ZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXemOR/qnuOf0GZvBeyqdn6/axag67XH/JJU
+LysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9vwGYT7JZVEc+NHt4bVaT
+LnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
+-----END CERTIFICATE-----
+
+# Issuer: O=Trustis Limited OU=Trustis FPS Root CA
+# Subject: O=Trustis Limited OU=Trustis FPS Root CA
+# Label: "Trustis FPS Root CA"
+# Serial: 36053640375399034304724988975563710553
+# MD5 Fingerprint: 30:c9:e7:1e:6b:e6:14:eb:65:b2:16:69:20:31:67:4d
+# SHA1 Fingerprint: 3b:c0:38:0b:33:c3:f6:a6:0c:86:15:22:93:d9:df:f5:4b:81:c0:04
+# SHA256 Fingerprint: c1:b4:82:99:ab:a5:20:8f:e9:63:0a:ce:55:ca:68:a0:3e:da:5a:51:9c:88:02:a0:d3:a6:73:be:8f:8e:55:7d
+-----BEGIN CERTIFICATE-----
+MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBF
+MQswCQYDVQQGEwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQL
+ExNUcnVzdGlzIEZQUyBSb290IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTEx
+MzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNVBAoTD1RydXN0aXMgTGltaXRlZDEc
+MBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQRUN+
+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihH
+iTHcDnlkH5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjj
+vSkCqPoc4Vu5g6hBSLwacY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA
+0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zto3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlB
+OrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEAAaNTMFEwDwYDVR0TAQH/
+BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAdBgNVHQ4E
+FgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01
+GX2cGE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmW
+zaD+vkAMXBJV+JOCyinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP4
+1BIy+Q7DsdwyhEQsb8tGD+pmQQ9P8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZE
+f1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHVl/9D7S3B2l0pKoU/rGXuhg8F
+jZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYliB6XzCGcKQEN
+ZetX2fNXlrtIzYE=
+-----END CERTIFICATE-----
+
+# Issuer: CN=StartCom Certification Authority O=StartCom Ltd. OU=Secure Digital Certificate Signing
+# Subject: CN=StartCom Certification Authority O=StartCom Ltd. OU=Secure Digital Certificate Signing
+# Label: "StartCom Certification Authority"
+# Serial: 45
+# MD5 Fingerprint: c9:3b:0d:84:41:fc:a4:76:79:23:08:57:de:10:19:16
+# SHA1 Fingerprint: a3:f1:33:3f:e2:42:bf:cf:c5:d1:4e:8f:39:42:98:40:68:10:d1:a0
+# SHA256 Fingerprint: e1:78:90:ee:09:a3:fb:f4:f4:8b:9c:41:4a:17:d6:37:b7:a5:06:47:e9:bc:75:23:22:72:7f:cc:17:42:a9:11
+-----BEGIN CERTIFICATE-----
+MIIHhzCCBW+gAwIBAgIBLTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
+Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM3WhcNMzYwOTE3MTk0NjM2WjB9
+MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
+U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
+cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
+pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
+OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
+Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
+Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
+HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
+Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
++2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
+Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
+26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
+AQABo4ICEDCCAgwwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
+VR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMB8GA1UdIwQYMBaAFE4L7xqkQFul
+F2mHMMo0aEPQQa7yMIIBWgYDVR0gBIIBUTCCAU0wggFJBgsrBgEEAYG1NwEBATCC
+ATgwLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5w
+ZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVybWVk
+aWF0ZS5wZGYwgc8GCCsGAQUFBwICMIHCMCcWIFN0YXJ0IENvbW1lcmNpYWwgKFN0
+YXJ0Q29tKSBMdGQuMAMCAQEagZZMaW1pdGVkIExpYWJpbGl0eSwgcmVhZCB0aGUg
+c2VjdGlvbiAqTGVnYWwgTGltaXRhdGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0
+aWZpY2F0aW9uIEF1dGhvcml0eSBQb2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93
+d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgG
+CWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1
+dGhvcml0eTANBgkqhkiG9w0BAQsFAAOCAgEAjo/n3JR5fPGFf59Jb2vKXfuM/gTF
+wWLRfUKKvFO3lANmMD+x5wqnUCBVJX92ehQN6wQOQOY+2IirByeDqXWmN3PH/UvS
+Ta0XQMhGvjt/UfzDtgUx3M2FIk5xt/JxXrAaxrqTi3iSSoX4eA+D/i+tLPfkpLst
+0OcNOrg+zvZ49q5HJMqjNTbOx8aHmNrs++myziebiMMEofYLWWivydsQD032ZGNc
+pRJvkrKTlMeIFw6Ttn5ii5B/q06f/ON1FE8qMt9bDeD1e5MNq6HPh+GlBEXoPBKl
+CcWw0bdT82AUuoVpaiF8H3VhFyAXe2w7QSlc4axa0c2Mm+tgHRns9+Ww2vl5GKVF
+P0lDV9LdJNUso/2RjSe15esUBppMeyG7Oq0wBhjA2MFrLH9ZXF2RsXAiV+uKa0hK
+1Q8p7MZAwC+ITGgBF3f0JBlPvfrhsiAhS90a2Cl9qrjeVOwhVYBsHvUwyKMQ5bLm
+KhQxw4UtjJixhlpPiVktucf3HMiKf8CdBUrmQk9io20ppB+Fq9vlgcitKj1MXVuE
+JnHEhV5xJMqlG2zYYdMa4FTbzrqpMrUi9nNBCV24F10OD5mQ1kfabwo6YigUZ4LZ
+8dCAWZvLMdibD4x3TrVoivJs9iQOLWxwxXPR3hTQcY+203sC9uO41Alua551hDnm
+fyWl8kgAwKQB2j8=
+-----END CERTIFICATE-----
+
+# Issuer: CN=StartCom Certification Authority G2 O=StartCom Ltd.
+# Subject: CN=StartCom Certification Authority G2 O=StartCom Ltd.
+# Label: "StartCom Certification Authority G2"
+# Serial: 59
+# MD5 Fingerprint: 78:4b:fb:9e:64:82:0a:d3:b8:4c:62:f3:64:f2:90:64
+# SHA1 Fingerprint: 31:f1:fd:68:22:63:20:ee:c6:3b:3f:9d:ea:4a:3e:53:7c:7c:39:17
+# SHA256 Fingerprint: c7:ba:65:67:de:93:a7:98:ae:1f:aa:79:1e:71:2d:37:8f:ae:1f:93:c4:39:7f:ea:44:1b:b7:cb:e6:fd:59:95
+-----BEGIN CERTIFICATE-----
+MIIFYzCCA0ugAwIBAgIBOzANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJJTDEW
+MBQGA1UEChMNU3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkgRzIwHhcNMTAwMTAxMDEwMDAxWhcNMzkxMjMxMjM1
+OTAxWjBTMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjEsMCoG
+A1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRzIwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2iTZbB7cgNr2Cu+EWIAOVeq8Oo1XJ
+JZlKxdBWQYeQTSFgpBSHO839sj60ZwNq7eEPS8CRhXBF4EKe3ikj1AENoBB5uNsD
+vfOpL9HG4A/LnooUCri99lZi8cVytjIl2bLzvWXFDSxu1ZJvGIsAQRSCb0AgJnoo
+D/Uefyf3lLE3PbfHkffiAez9lInhzG7TNtYKGXmu1zSCZf98Qru23QumNK9LYP5/
+Q0kGi4xDuFby2X8hQxfqp0iVAXV16iulQ5XqFYSdCI0mblWbq9zSOdIxHWDirMxW
+RST1HFSr7obdljKF+ExP6JV2tgXdNiNnvP8V4so75qbsO+wmETRIjfaAKxojAuuK
+HDp2KntWFhxyKrOq42ClAJ8Em+JvHhRYW6Vsi1g8w7pOOlz34ZYrPu8HvKTlXcxN
+nw3h3Kq74W4a7I/htkxNeXJdFzULHdfBR9qWJODQcqhaX2YtENwvKhOuJv4KHBnM
+0D4LnMgJLvlblnpHnOl68wVQdJVznjAJ85eCXuaPOQgeWeU1FEIT/wCc976qUM/i
+UUjXuG+v+E5+M5iSFGI6dWPPe/regjupuznixL0sAA7IF6wT700ljtizkC+p2il9
+Ha90OrInwMEePnWjFqmveiJdnxMaz6eg6+OGCtP95paV1yPIN93EfKo2rJgaErHg
+TuixO/XWb/Ew1wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
+AwIBBjAdBgNVHQ4EFgQUS8W0QGutHLOlHGVuRjaJhwUMDrYwDQYJKoZIhvcNAQEL
+BQADggIBAHNXPyzVlTJ+N9uWkusZXn5T50HsEbZH77Xe7XRcxfGOSeD8bpkTzZ+K
+2s06Ctg6Wgk/XzTQLwPSZh0avZyQN8gMjgdalEVGKua+etqhqaRpEpKwfTbURIfX
+UfEpY9Z1zRbkJ4kd+MIySP3bmdCPX1R0zKxnNBFi2QwKN4fRoxdIjtIXHfbX/dtl
+6/2o1PXWT6RbdejF0mCy2wl+JYt7ulKSnj7oxXehPOBKc2thz4bcQ///If4jXSRK
+9dNtD2IEBVeC2m6kMyV5Sy5UGYvMLD0w6dEG/+gyRr61M3Z3qAFdlsHB1b6uJcDJ
+HgoJIIihDsnzb02CVAAgp9KP5DlUFy6NHrgbuxu9mk47EDTcnIhT76IxW1hPkWLI
+wpqazRVdOKnWvvgTtZ8SafJQYqz7Fzf07rh1Z2AQ+4NQ+US1dZxAF7L+/XldblhY
+XzD8AK6vM8EOTmy6p6ahfzLbOOCxchcKK5HsamMm7YnUeMx0HgX4a/6ManY5Ka5l
+IxKVCCIcl85bBu4M4ru8H0ST9tg4RQUh7eStqxK2A6RCLi3ECToDZ2mEmuFZkIoo
+hdVddLHRDiBYmxOlsGOm7XtH/UVVMKTumtTm4ofvmMkyghEpIrwACjFeLQ/Ajulr
+so8uBtjRkcfGEvRM/TAXw8HaOFvjqermobp573PYtlNXLfbQ4ddI
+-----END CERTIFICATE-----
+
+# Issuer: CN=Buypass Class 2 Root CA O=Buypass AS-983163327
+# Subject: CN=Buypass Class 2 Root CA O=Buypass AS-983163327
+# Label: "Buypass Class 2 Root CA"
+# Serial: 2
+# MD5 Fingerprint: 46:a7:d2:fe:45:fb:64:5a:a8:59:90:9b:78:44:9b:29
+# SHA1 Fingerprint: 49:0a:75:74:de:87:0a:47:fe:58:ee:f6:c7:6b:eb:c6:0b:12:40:99
+# SHA256 Fingerprint: 9a:11:40:25:19:7c:5b:b9:5d:94:e6:3d:55:cd:43:79:08:47:b6:46:b2:3c:df:11:ad:a4:a0:0e:ff:15:fb:48
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
+Q2xhc3MgMiBSb290IENBMB4XDTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1ow
+TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
+HgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1g1Lr
+6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPV
+L4O2fuPn9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC91
+1K2GScuVr1QGbNgGE41b/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHx
+MlAQTn/0hpPshNOOvEu/XAFOBz3cFIqUCqTqc/sLUegTBxj6DvEr0VQVfTzh97QZ
+QmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeffawrbD02TTqigzXsu8lkB
+arcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgIzRFo1clr
+Us3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLi
+FRhnBkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRS
+P/TizPJhk9H9Z2vXUq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN
+9SG9dKpN6nIDSdvHXx1iY8f93ZHsM+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxP
+AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMmAd+BikoL1Rpzz
+uvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAU18h
+9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
+A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3t
+OluwlN5E40EIosHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo
++fsicdl9sz1Gv7SEr5AcD48Saq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7
+KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYdDnkM/crqJIByw5c/8nerQyIKx+u2
+DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWDLfJ6v9r9jv6ly0Us
+H8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0oyLQ
+I+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK7
+5t98biGCwWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h
+3PFaTWwyI0PurKju7koSCTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPz
+Y11aWOIv4x3kqdbQCtCev9eBCfHJxyYNrJgWVqA=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Buypass Class 3 Root CA O=Buypass AS-983163327
+# Subject: CN=Buypass Class 3 Root CA O=Buypass AS-983163327
+# Label: "Buypass Class 3 Root CA"
+# Serial: 2
+# MD5 Fingerprint: 3d:3b:18:9e:2c:64:5a:e8:d5:88:ce:0e:f9:37:c2:ec
+# SHA1 Fingerprint: da:fa:f7:fa:66:84:ec:06:8f:14:50:bd:c7:c2:81:a5:bc:a9:64:57
+# SHA256 Fingerprint: ed:f7:eb:bc:a2:7a:2a:38:4d:38:7b:7d:40:10:c6:66:e2:ed:b4:84:3e:4c:29:b4:ae:1d:5b:93:32:e6:b2:4d
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
+Q2xhc3MgMyBSb290IENBMB4XDTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFow
+TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
+HgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRHsJ8Y
+ZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3E
+N3coTRiR5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9
+tznDDgFHmV0ST9tD+leh7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX
+0DJq1l1sDPGzbjniazEuOQAnFN44wOwZZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c
+/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH2xc519woe2v1n/MuwU8X
+KhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV/afmiSTY
+zIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvS
+O1UQRwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D
+34xFMFbG02SrZvPAXpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgP
+K9Dx2hzLabjKSWJtyNBjYt1gD1iqj6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3
+AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFEe4zf/lb+74suwv
+Tg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAACAj
+QTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
+cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXS
+IGrs/CIBKM+GuIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2
+HJLw5QY33KbmkJs4j1xrG0aGQ0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsa
+O5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8ZORK15FTAaggiG6cX0S5y2CBNOxv
+033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2KSb12tjE8nVhz36u
+dmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz6MkE
+kbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg41
+3OEMXbugUZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvD
+u79leNKGef9JOxqDDPDeeOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq
+4/g7u9xN12TyUb7mqqta6THuBrxzvxNiCp/HuZc=
+-----END CERTIFICATE-----
+
+# Issuer: CN=T-TeleSec GlobalRoot Class 3 O=T-Systems Enterprise Services GmbH OU=T-Systems Trust Center
+# Subject: CN=T-TeleSec GlobalRoot Class 3 O=T-Systems Enterprise Services GmbH OU=T-Systems Trust Center
+# Label: "T-TeleSec GlobalRoot Class 3"
+# Serial: 1
+# MD5 Fingerprint: ca:fb:40:a8:4e:39:92:8a:1d:fe:8e:2f:c4:27:ea:ef
+# SHA1 Fingerprint: 55:a6:72:3e:cb:f2:ec:cd:c3:23:74:70:19:9d:2a:be:11:e3:81:d1
+# SHA256 Fingerprint: fd:73:da:d3:1c:64:4f:f1:b4:3b:ef:0c:cd:da:96:71:0b:9c:d9:87:5e:ca:7e:31:70:7a:f3:e9:6d:52:2b:bd
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUx
+KzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAd
+BgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNl
+YyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgxMDAxMTAyOTU2WhcNMzMxMDAxMjM1
+OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnBy
+aXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50
+ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN
+8ELg63iIVl6bmlQdTQyK9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/
+RLyTPWGrTs0NvvAgJ1gORH8EGoel15YUNpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4
+hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZFiP0Zf3WHHx+xGwpzJFu5
+ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W0eDrXltM
+EnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGj
+QjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1
+A/d2O2GCahKqGFPrAyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOy
+WL6ukK2YJ5f+AbGwUgC4TeQbIXQbfsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ
+1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzTucpH9sry9uetuUg/vBa3wW30
+6gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7hP0HHRwA11fXT
+91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
+e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4p
+TpPDpFQUWw==
+-----END CERTIFICATE-----
+
+# Issuer: CN=EE Certification Centre Root CA O=AS Sertifitseerimiskeskus
+# Subject: CN=EE Certification Centre Root CA O=AS Sertifitseerimiskeskus
+# Label: "EE Certification Centre Root CA"
+# Serial: 112324828676200291871926431888494945866
+# MD5 Fingerprint: 43:5e:88:d4:7d:1a:4a:7e:fd:84:2e:52:eb:01:d4:6f
+# SHA1 Fingerprint: c9:a8:b9:e7:55:80:5e:58:e3:53:77:a7:25:eb:af:c3:7b:27:cc:d7
+# SHA256 Fingerprint: 3e:84:ba:43:42:90:85:16:e7:75:73:c0:99:2f:09:79:ca:08:4e:46:85:68:1f:f1:95:cc:ba:8a:22:9b:8a:76
+-----BEGIN CERTIFICATE-----
+MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1
+MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1
+czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYG
+CSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIwMTAxMDMwMTAxMDMwWhgPMjAzMDEy
+MTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlBUyBTZXJ0aWZpdHNl
+ZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRyZSBS
+b290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUy
+euuOF0+W2Ap7kaJjbMeMTC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvO
+bntl8jixwKIy72KyaOBhU8E2lf/slLo2rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIw
+WFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw93X2PaRka9ZP585ArQ/d
+MtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtNP2MbRMNE
+1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/
+zQas8fElyalL1BSZMEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYB
+BQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEF
+BQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+RjxY6hUFaTlrg4wCQiZrxTFGGV
+v9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqMlIpPnTX/dqQG
+E5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
+uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIW
+iAYLtqZLICjU3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/v
+GVCJYMzpJJUPwssd8m92kMfMdcGWxZ0=
+-----END CERTIFICATE-----
+
+# Issuer: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş. (c) Aralık 2007
+# Subject: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş. (c) Aralık 2007
+# Label: "TURKTRUST Certificate Services Provider Root 2007"
+# Serial: 1
+# MD5 Fingerprint: 2b:70:20:56:86:82:a0:18:c8:07:53:12:28:70:21:72
+# SHA1 Fingerprint: f1:7f:6f:b6:31:dc:99:e3:a3:c8:7f:fe:1c:f1:81:10:88:d9:60:33
+# SHA256 Fingerprint: 97:8c:d9:66:f2:fa:a0:7b:a7:aa:95:00:d9:c0:2e:9d:77:f2:cd:ad:a6:ad:6b:a7:4a:f4:b9:1c:66:59:3c:50
+-----BEGIN CERTIFICATE-----
+MIIEPTCCAyWgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvzE/MD0GA1UEAww2VMOc
+UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
+c8SxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMV4wXAYDVQQKDFVUw5xS
+S1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kg
+SGl6bWV0bGVyaSBBLsWeLiAoYykgQXJhbMSxayAyMDA3MB4XDTA3MTIyNTE4Mzcx
+OVoXDTE3MTIyMjE4MzcxOVowgb8xPzA9BgNVBAMMNlTDnFJLVFJVU1QgRWxla3Ry
+b25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTELMAkGA1UEBhMC
+VFIxDzANBgNVBAcMBkFua2FyYTFeMFwGA1UECgxVVMOcUktUUlVTVCBCaWxnaSDE
+sGxldGnFn2ltIHZlIEJpbGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7F
+ni4gKGMpIEFyYWzEsWsgMjAwNzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAKu3PgqMyKVYFeaK7yc9SrToJdPNM8Ig3BnuiD9NYvDdE3ePYakqtdTyuTFY
+KTsvP2qcb3N2Je40IIDu6rfwxArNK4aUyeNgsURSsloptJGXg9i3phQvKUmi8wUG
++7RP2qFsmmaf8EMJyupyj+sA1zU511YXRxcw9L6/P8JorzZAwan0qafoEGsIiveG
+HtyaKhUG9qPw9ODHFNRRf8+0222vR5YXm3dx2KdxnSQM9pQ/hTEST7ruToK4uT6P
+IzdezKKqdfcYbwnTrqdUKDT74eA7YH2gvnmJhsifLfkKS8RQouf9eRbHegsYz85M
+733WB2+Y8a+xwXrXgTW4qhe04MsCAwEAAaNCMEAwHQYDVR0OBBYEFCnFkKslrxHk
+Yb+j/4hhkeYO/pyBMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0G
+CSqGSIb3DQEBBQUAA4IBAQAQDdr4Ouwo0RSVgrESLFF6QSU2TJ/sPx+EnWVUXKgW
+AkD6bho3hO9ynYYKVZ1WKKxmLNA6VpM0ByWtCLCPyA8JWcqdmBzlVPi5RX9ql2+I
+aE1KBiY3iAIOtsbWcpnOa3faYjGkVh+uX4132l32iPwa2Z61gfAyuOOI0JzzaqC5
+mxRZNTZPz/OOXl0XrRWV2N2y1RVuAE6zS89mlOTgzbUF2mNXi+WzqtvALhyQRNsa
+XRik7r4EW5nVcV9VZWRi1aKbBFmGyGJ353yCRWo9F7/snXUMrqNvWtMvmDb08PUZ
+qxFdyKbjKlhqQgnDvZImZjINXQhVdP+MmNAKpoRq0Tl9
+-----END CERTIFICATE-----
+
+# Issuer: CN=D-TRUST Root Class 3 CA 2 2009 O=D-Trust GmbH
+# Subject: CN=D-TRUST Root Class 3 CA 2 2009 O=D-Trust GmbH
+# Label: "D-TRUST Root Class 3 CA 2 2009"
+# Serial: 623603
+# MD5 Fingerprint: cd:e0:25:69:8d:47:ac:9c:89:35:90:f7:fd:51:3d:2f
+# SHA1 Fingerprint: 58:e8:ab:b0:36:15:33:fb:80:f7:9b:1b:6d:29:d3:ff:8d:5f:00:f0
+# SHA256 Fingerprint: 49:e7:a4:42:ac:f0:ea:62:87:05:00:54:b5:25:64:b6:50:e4:f4:9e:42:e3:48:d6:aa:38:e0:39:e9:57:b1:c1
+-----BEGIN CERTIFICATE-----
+MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRF
+MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBD
+bGFzcyAzIENBIDIgMjAwOTAeFw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NTha
+ME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMM
+HkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOADER03
+UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42
+tSHKXzlABF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9R
+ySPocq60vFYJfxLLHLGvKZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsM
+lFqVlNpQmvH/pStmMaTJOKDfHR+4CS7zp+hnUquVH+BGPtikw8paxTGA6Eian5Rp
+/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUCAwEAAaOCARowggEWMA8G
+A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ4PGEMA4G
+A1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVj
+dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUy
+MENBJTIwMiUyMDIwMDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRl
+cmV2b2NhdGlvbmxpc3QwQ6BBoD+GPWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3Js
+L2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAwOS5jcmwwDQYJKoZIhvcNAQEL
+BQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm2H6NMLVwMeni
+acfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
+o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4K
+zCUqNQT4YJEVdT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8
+PIWmawomDeCTmGCufsYkl4phX5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3Y
+Johw1+qRzT65ysCQblrGXnRl11z+o+I=
+-----END CERTIFICATE-----
+
+# Issuer: CN=D-TRUST Root Class 3 CA 2 EV 2009 O=D-Trust GmbH
+# Subject: CN=D-TRUST Root Class 3 CA 2 EV 2009 O=D-Trust GmbH
+# Label: "D-TRUST Root Class 3 CA 2 EV 2009"
+# Serial: 623604
+# MD5 Fingerprint: aa:c6:43:2c:5e:2d:cd:c4:34:c0:50:4f:11:02:4f:b6
+# SHA1 Fingerprint: 96:c9:1b:0b:95:b4:10:98:42:fa:d0:d8:22:79:fe:60:fa:b9:16:83
+# SHA256 Fingerprint: ee:c5:49:6b:98:8c:e9:86:25:b9:34:09:2e:ec:29:08:be:d0:b0:f3:16:c2:d4:73:0c:84:ea:f1:f3:d3:48:81
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRF
+MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBD
+bGFzcyAzIENBIDIgRVYgMjAwOTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUw
+NDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNV
+BAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAwOTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfSegpn
+ljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM0
+3TP1YtHhzRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6Z
+qQTMFexgaDbtCHu39b+T7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lR
+p75mpoo6Kr3HGrHhFPC+Oh25z1uxav60sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8
+HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure3511H3a6UCAwEAAaOCASQw
+ggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyvcop9Ntea
+HNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFw
+Oi8vZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xh
+c3MlMjAzJTIwQ0ElMjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1E
+RT9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0MEagRKBChkBodHRwOi8vd3d3LmQt
+dHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xhc3NfM19jYV8yX2V2XzIwMDku
+Y3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+PPoeUSbrh/Yp
+3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
+nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNF
+CSuGdXzfX2lXANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7na
+xpeG0ILD5EJt/rDiZE4OJudANCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqX
+KVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVvw9y4AyHqnxbxLFS1
+-----END CERTIFICATE-----
+
+# Issuer: CN=Autoridad de Certificacion Raiz del Estado Venezolano O=Sistema Nacional de Certificacion Electronica OU=Superintendencia de Servicios de Certificacion Electronica
+# Subject: CN=PSCProcert O=Sistema Nacional de Certificacion Electronica OU=Proveedor de Certificados PROCERT
+# Label: "PSCProcert"
+# Serial: 11
+# MD5 Fingerprint: e6:24:e9:12:01:ae:0c:de:8e:85:c4:ce:a3:12:dd:ec
+# SHA1 Fingerprint: 70:c1:8d:74:b4:28:81:0a:e4:fd:a5:75:d7:01:9f:99:b0:3d:50:74
+# SHA256 Fingerprint: 3c:fc:3c:14:d1:f6:84:ff:17:e3:8c:43:ca:44:0c:00:b9:67:ec:93:3e:8b:fe:06:4c:a1:d7:2c:90:f2:ad:b0
+-----BEGIN CERTIFICATE-----
+MIIJhjCCB26gAwIBAgIBCzANBgkqhkiG9w0BAQsFADCCAR4xPjA8BgNVBAMTNUF1
+dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIFJhaXogZGVsIEVzdGFkbyBWZW5lem9s
+YW5vMQswCQYDVQQGEwJWRTEQMA4GA1UEBxMHQ2FyYWNhczEZMBcGA1UECBMQRGlz
+dHJpdG8gQ2FwaXRhbDE2MDQGA1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0
+aWZpY2FjaW9uIEVsZWN0cm9uaWNhMUMwQQYDVQQLEzpTdXBlcmludGVuZGVuY2lh
+IGRlIFNlcnZpY2lvcyBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMSUwIwYJ
+KoZIhvcNAQkBFhZhY3JhaXpAc3VzY2VydGUuZ29iLnZlMB4XDTEwMTIyODE2NTEw
+MFoXDTIwMTIyNTIzNTk1OVowgdExJjAkBgkqhkiG9w0BCQEWF2NvbnRhY3RvQHBy
+b2NlcnQubmV0LnZlMQ8wDQYDVQQHEwZDaGFjYW8xEDAOBgNVBAgTB01pcmFuZGEx
+KjAoBgNVBAsTIVByb3ZlZWRvciBkZSBDZXJ0aWZpY2Fkb3MgUFJPQ0VSVDE2MDQG
+A1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9u
+aWNhMQswCQYDVQQGEwJWRTETMBEGA1UEAxMKUFNDUHJvY2VydDCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBANW39KOUM6FGqVVhSQ2oh3NekS1wwQYalNo9
+7BVCwfWMrmoX8Yqt/ICV6oNEolt6Vc5Pp6XVurgfoCfAUFM+jbnADrgV3NZs+J74
+BCXfgI8Qhd19L3uA3VcAZCP4bsm+lU/hdezgfl6VzbHvvnpC2Mks0+saGiKLt38G
+ieU89RLAu9MLmV+QfI4tL3czkkohRqipCKzx9hEC2ZUWno0vluYC3XXCFCpa1sl9
+JcLB/KpnheLsvtF8PPqv1W7/U0HU9TI4seJfxPmOEO8GqQKJ/+MMbpfg353bIdD0
+PghpbNjU5Db4g7ayNo+c7zo3Fn2/omnXO1ty0K+qP1xmk6wKImG20qCZyFSTXai2
+0b1dCl53lKItwIKOvMoDKjSuc/HUtQy9vmebVOvh+qBa7Dh+PsHMosdEMXXqP+UH
+0quhJZb25uSgXTcYOWEAM11G1ADEtMo88aKjPvM6/2kwLkDd9p+cJsmWN63nOaK/
+6mnbVSKVUyqUtd+tFjiBdWbjxywbk5yqjKPK2Ww8F22c3HxT4CAnQzb5EuE8XL1m
+v6JpIzi4mWCZDlZTOpx+FIywBm/xhnaQr/2v/pDGj59/i5IjnOcVdo/Vi5QTcmn7
+K2FjiO/mpF7moxdqWEfLcU8UC17IAggmosvpr2uKGcfLFFb14dq12fy/czja+eev
+bqQ34gcnAgMBAAGjggMXMIIDEzASBgNVHRMBAf8ECDAGAQH/AgEBMDcGA1UdEgQw
+MC6CD3N1c2NlcnRlLmdvYi52ZaAbBgVghl4CAqASDBBSSUYtRy0yMDAwNDAzNi0w
+MB0GA1UdDgQWBBRBDxk4qpl/Qguk1yeYVKIXTC1RVDCCAVAGA1UdIwSCAUcwggFD
+gBStuyIdxuDSAaj9dlBSk+2YwU2u06GCASakggEiMIIBHjE+MDwGA1UEAxM1QXV0
+b3JpZGFkIGRlIENlcnRpZmljYWNpb24gUmFpeiBkZWwgRXN0YWRvIFZlbmV6b2xh
+bm8xCzAJBgNVBAYTAlZFMRAwDgYDVQQHEwdDYXJhY2FzMRkwFwYDVQQIExBEaXN0
+cml0byBDYXBpdGFsMTYwNAYDVQQKEy1TaXN0ZW1hIE5hY2lvbmFsIGRlIENlcnRp
+ZmljYWNpb24gRWxlY3Ryb25pY2ExQzBBBgNVBAsTOlN1cGVyaW50ZW5kZW5jaWEg
+ZGUgU2VydmljaW9zIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25pY2ExJTAjBgkq
+hkiG9w0BCQEWFmFjcmFpekBzdXNjZXJ0ZS5nb2IudmWCAQowDgYDVR0PAQH/BAQD
+AgEGME0GA1UdEQRGMESCDnByb2NlcnQubmV0LnZloBUGBWCGXgIBoAwMClBTQy0w
+MDAwMDKgGwYFYIZeAgKgEgwQUklGLUotMzE2MzUzNzMtNzB2BgNVHR8EbzBtMEag
+RKBChkBodHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9sY3IvQ0VSVElGSUNBRE8t
+UkFJWi1TSEEzODRDUkxERVIuY3JsMCOgIaAfhh1sZGFwOi8vYWNyYWl6LnN1c2Nl
+cnRlLmdvYi52ZTA3BggrBgEFBQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6Ly9v
+Y3NwLnN1c2NlcnRlLmdvYi52ZTBBBgNVHSAEOjA4MDYGBmCGXgMBAjAsMCoGCCsG
+AQUFBwIBFh5odHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9kcGMwDQYJKoZIhvcN
+AQELBQADggIBACtZ6yKZu4SqT96QxtGGcSOeSwORR3C7wJJg7ODU523G0+1ng3dS
+1fLld6c2suNUvtm7CpsR72H0xpkzmfWvADmNg7+mvTV+LFwxNG9s2/NkAZiqlCxB
+3RWGymspThbASfzXg0gTB1GEMVKIu4YXx2sviiCtxQuPcD4quxtxj7mkoP3Yldmv
+Wb8lK5jpY5MvYB7Eqvh39YtsL+1+LrVPQA3uvFd359m21D+VJzog1eWuq2w1n8Gh
+HVnchIHuTQfiSLaeS5UtQbHh6N5+LwUeaO6/u5BlOsju6rEYNxxik6SgMexxbJHm
+pHmJWhSnFFAFTKQAVzAswbVhltw+HoSvOULP5dAssSS830DD7X9jSr3hTxJkhpXz
+sOfIt+FTvZLm8wyWuevo5pLtp4EJFAv8lXrPj9Y0TzYS3F7RNHXGRoAvlQSMx4bE
+qCaJqD8Zm4G7UaRKhqsLEQ+xrmNTbSjq3TNWOByyrYDT13K9mmyZY+gAu0F2Bbdb
+mRiKw7gSXFbPVgx96OLP7bx0R/vu0xdOIk9W/1DzLuY5poLWccret9W6aAjtmcz9
+opLLabid+Qqkpj5PkygqYWwHJgD/ll9ohri4zspV4KuxPX+Y1zMOWj3YeMLEYC/H
+YvBhkdI4sPaeVdtAgAUSM84dkpvRabP/v/GSCmE1P93+hvS84Bpxs2Km
+-----END CERTIFICATE-----
+
+# Issuer: CN=China Internet Network Information Center EV Certificates Root O=China Internet Network Information Center
+# Subject: CN=China Internet Network Information Center EV Certificates Root O=China Internet Network Information Center
+# Label: "China Internet Network Information Center EV Certificates Root"
+# Serial: 1218379777
+# MD5 Fingerprint: 55:5d:63:00:97:bd:6a:97:f5:67:ab:4b:fb:6e:63:15
+# SHA1 Fingerprint: 4f:99:aa:93:fb:2b:d1:37:26:a1:99:4a:ce:7f:f0:05:f2:93:5d:1e
+# SHA256 Fingerprint: 1c:01:c6:f4:db:b2:fe:fc:22:55:8b:2b:ca:32:56:3f:49:84:4a:cf:c3:2b:7b:e4:b0:ff:59:9f:9e:8c:7a:f7
+-----BEGIN CERTIFICATE-----
+MIID9zCCAt+gAwIBAgIESJ8AATANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMC
+Q04xMjAwBgNVBAoMKUNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24g
+Q2VudGVyMUcwRQYDVQQDDD5DaGluYSBJbnRlcm5ldCBOZXR3b3JrIEluZm9ybWF0
+aW9uIENlbnRlciBFViBDZXJ0aWZpY2F0ZXMgUm9vdDAeFw0xMDA4MzEwNzExMjVa
+Fw0zMDA4MzEwNzExMjVaMIGKMQswCQYDVQQGEwJDTjEyMDAGA1UECgwpQ2hpbmEg
+SW50ZXJuZXQgTmV0d29yayBJbmZvcm1hdGlvbiBDZW50ZXIxRzBFBgNVBAMMPkNo
+aW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyIEVWIENlcnRp
+ZmljYXRlcyBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm35z
+7r07eKpkQ0H1UN+U8i6yjUqORlTSIRLIOTJCBumD1Z9S7eVnAztUwYyZmczpwA//
+DdmEEbK40ctb3B75aDFk4Zv6dOtouSCV98YPjUesWgbdYavi7NifFy2cyjw1l1Vx
+zUOFsUcW9SxTgHbP0wBkvUCZ3czY28Sf1hNfQYOL+Q2HklY0bBoQCxfVWhyXWIQ8
+hBouXJE0bhlffxdpxWXvayHG1VA6v2G5BY3vbzQ6sm8UY78WO5upKv23KzhmBsUs
+4qpnHkWnjQRmQvaPK++IIGmPMowUc9orhpFjIpryp9vOiYurXccUwVswah+xt54u
+gQEC7c+WXmPbqOY4twIDAQABo2MwYTAfBgNVHSMEGDAWgBR8cks5x8DbYqVPm6oY
+NJKiyoOCWTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
+FgQUfHJLOcfA22KlT5uqGDSSosqDglkwDQYJKoZIhvcNAQEFBQADggEBACrDx0M3
+j92tpLIM7twUbY8opJhJywyA6vPtI2Z1fcXTIWd50XPFtQO3WKwMVC/GVhMPMdoG
+52U7HW8228gd+f2ABsqjPWYWqJ1MFn3AlUa1UeTiH9fqBk1jjZaM7+czV0I664zB
+echNdn3e9rG3geCg+aF4RhcaVpjwTj2rHO3sOdwHSPdj/gauwqRcalsyiMXHM4Ws
+ZkJHwlgkmeHlPuV1LI5D1l08eB6olYIpUNHRFrrvwb562bTYzB5MRuF3sTGrvSrI
+zo9uoV1/A3U05K2JRVRevq4opbs/eHnrc7MKDf2+yfdWrPa37S+bISnHOLaVxATy
+wy39FCqQmbkHzJ8=
+-----END CERTIFICATE-----
+
+# Issuer: CN=Swisscom Root CA 2 O=Swisscom OU=Digital Certificate Services
+# Subject: CN=Swisscom Root CA 2 O=Swisscom OU=Digital Certificate Services
+# Label: "Swisscom Root CA 2"
+# Serial: 40698052477090394928831521023204026294
+# MD5 Fingerprint: 5b:04:69:ec:a5:83:94:63:18:a7:86:d0:e4:f2:6e:19
+# SHA1 Fingerprint: 77:47:4f:c6:30:e4:0f:4c:47:64:3f:84:ba:b8:c6:95:4a:8a:41:ec
+# SHA256 Fingerprint: f0:9b:12:2c:71:14:f4:a0:9b:d4:ea:4f:4a:99:d5:58:b4:6e:4c:25:cd:81:14:0d:29:c0:56:13:91:4c:38:41
+-----BEGIN CERTIFICATE-----
+MIIF2TCCA8GgAwIBAgIQHp4o6Ejy5e/DfEoeWhhntjANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3Qg
+Q0EgMjAeFw0xMTA2MjQwODM4MTRaFw0zMTA2MjUwNzM4MTRaMGQxCzAJBgNVBAYT
+AmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGlnaXRhbCBDZXJ0aWZp
+Y2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAyMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlUJOhJ1R5tMJ6HJaI2nbeHCOFvEr
+jw0DzpPMLgAIe6szjPTpQOYXTKueuEcUMncy3SgM3hhLX3af+Dk7/E6J2HzFZ++r
+0rk0X2s682Q2zsKwzxNoysjL67XiPS4h3+os1OD5cJZM/2pYmLcX5BtS5X4HAB1f
+2uY+lQS3aYg5oUFgJWFLlTloYhyxCwWJwDaCFCE/rtuh/bxvHGCGtlOUSbkrRsVP
+ACu/obvLP+DHVxxX6NZp+MEkUp2IVd3Chy50I9AU/SpHWrumnf2U5NGKpV+GY3aF
+y6//SSj8gO1MedK75MDvAe5QQQg1I3ArqRa0jG6F6bYRzzHdUyYb3y1aSgJA/MTA
+tukxGggo5WDDH8SQjhBiYEQN7Aq+VRhxLKX0srwVYv8c474d2h5Xszx+zYIdkeNL
+6yxSNLCK/RJOlrDrcH+eOfdmQrGrrFLadkBXeyq96G4DsguAhYidDMfCd7Camlf0
+uPoTXGiTOmekl9AbmbeGMktg2M7v0Ax/lZ9vh0+Hio5fCHyqW/xavqGRn1V9TrAL
+acywlKinh/LTSlDcX3KwFnUey7QYYpqwpzmqm59m2I2mbJYV4+by+PGDYmy7Velh
+k6M99bFXi08jsJvllGov34zflVEpYKELKeRcVVi3qPyZ7iVNTA6z00yPhOgpD/0Q
+VAKFyPnlw4vP5w8CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0hBBYw
+FDASBgdghXQBUwIBBgdghXQBUwIBMBIGA1UdEwEB/wQIMAYBAf8CAQcwHQYDVR0O
+BBYEFE0mICKJS9PVpAqhb97iEoHF8TwuMB8GA1UdIwQYMBaAFE0mICKJS9PVpAqh
+b97iEoHF8TwuMA0GCSqGSIb3DQEBCwUAA4ICAQAyCrKkG8t9voJXiblqf/P0wS4R
+fbgZPnm3qKhyN2abGu2sEzsOv2LwnN+ee6FTSA5BesogpxcbtnjsQJHzQq0Qw1zv
+/2BZf82Fo4s9SBwlAjxnffUy6S8w5X2lejjQ82YqZh6NM4OKb3xuqFp1mrjX2lhI
+REeoTPpMSQpKwhI3qEAMw8jh0FcNlzKVxzqfl9NX+Ave5XLzo9v/tdhZsnPdTSpx
+srpJ9csc1fV5yJmz/MFMdOO0vSk3FQQoHt5FRnDsr7p4DooqzgB53MBfGWcsa0vv
+aGgLQ+OswWIJ76bdZWGgr4RVSJFSHMYlkSrQwSIjYVmvRRGFHQEkNI/Ps/8XciAT
+woCqISxxOQ7Qj1zB09GOInJGTB2Wrk9xseEFKZZZ9LuedT3PDTcNYtsmjGOpI99n
+Bjx8Oto0QuFmtEYE3saWmA9LSHokMnWRn6z3aOkquVVlzl1h0ydw2Df+n7mvoC5W
+t6NlUe07qxS/TFED6F+KBZvuim6c779o+sjaC+NCydAXFJy3SuCvkychVSa1ZC+N
+8f+mQAWFBVzKBxlcCxMoTFh/wqXvRdpg065lYZ1Tg3TCrvJcwhbtkj6EPnNgiLx2
+9CzP0H1907he0ZESEOnN3col49XtmS++dYFLJPlFRpTJKSFTnCZFqhMX5OfNeOI5
+wSsSnqaeG8XmDtkx2Q==
+-----END CERTIFICATE-----
+
+# Issuer: CN=Swisscom Root EV CA 2 O=Swisscom OU=Digital Certificate Services
+# Subject: CN=Swisscom Root EV CA 2 O=Swisscom OU=Digital Certificate Services
+# Label: "Swisscom Root EV CA 2"
+# Serial: 322973295377129385374608406479535262296
+# MD5 Fingerprint: 7b:30:34:9f:dd:0a:4b:6b:35:ca:31:51:28:5d:ae:ec
+# SHA1 Fingerprint: e7:a1:90:29:d3:d5:52:dc:0d:0f:c6:92:d3:ea:88:0d:15:2e:1a:6b
+# SHA256 Fingerprint: d9:5f:ea:3c:a4:ee:dc:e7:4c:d7:6e:75:fc:6d:1f:f6:2c:44:1f:0f:a8:bc:77:f0:34:b1:9e:5d:b2:58:01:5d
+-----BEGIN CERTIFICATE-----
+MIIF4DCCA8igAwIBAgIRAPL6ZOJ0Y9ON/RAdBB92ylgwDQYJKoZIhvcNAQELBQAw
+ZzELMAkGA1UEBhMCY2gxETAPBgNVBAoTCFN3aXNzY29tMSUwIwYDVQQLExxEaWdp
+dGFsIENlcnRpZmljYXRlIFNlcnZpY2VzMR4wHAYDVQQDExVTd2lzc2NvbSBSb290
+IEVWIENBIDIwHhcNMTEwNjI0MDk0NTA4WhcNMzEwNjI1MDg0NTA4WjBnMQswCQYD
+VQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2Vy
+dGlmaWNhdGUgU2VydmljZXMxHjAcBgNVBAMTFVN3aXNzY29tIFJvb3QgRVYgQ0Eg
+MjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMT3HS9X6lds93BdY7Bx
+UglgRCgzo3pOCvrY6myLURYaVa5UJsTMRQdBTxB5f3HSek4/OE6zAMaVylvNwSqD
+1ycfMQ4jFrclyxy0uYAyXhqdk/HoPGAsp15XGVhRXrwsVgu42O+LgrQ8uMIkqBPH
+oCE2G3pXKSinLr9xJZDzRINpUKTk4RtiGZQJo/PDvO/0vezbE53PnUgJUmfANykR
+HvvSEaeFGHR55E+FFOtSN+KxRdjMDUN/rhPSays/p8LiqG12W0OfvrSdsyaGOx9/
+5fLoZigWJdBLlzin5M8J0TbDC77aO0RYjb7xnglrPvMyxyuHxuxenPaHZa0zKcQv
+idm5y8kDnftslFGXEBuGCxobP/YCfnvUxVFkKJ3106yDgYjTdLRZncHrYTNaRdHL
+OdAGalNgHa/2+2m8atwBz735j9m9W8E6X47aD0upm50qKGsaCnw8qyIL5XctcfaC
+NYGu+HuB5ur+rPQam3Rc6I8k9l2dRsQs0h4rIWqDJ2dVSqTjyDKXZpBy2uPUZC5f
+46Fq9mDU5zXNysRojddxyNMkM3OxbPlq4SjbX8Y96L5V5jcb7STZDxmPX2MYWFCB
+UWVv8p9+agTnNCRxunZLWB4ZvRVgRaoMEkABnRDixzgHcgplwLa7JSnaFp6LNYth
+7eVxV4O1PHGf40+/fh6Bn0GXAgMBAAGjgYYwgYMwDgYDVR0PAQH/BAQDAgGGMB0G
+A1UdIQQWMBQwEgYHYIV0AVMCAgYHYIV0AVMCAjASBgNVHRMBAf8ECDAGAQH/AgED
+MB0GA1UdDgQWBBRF2aWBbj2ITY1x0kbBbkUe88SAnTAfBgNVHSMEGDAWgBRF2aWB
+bj2ITY1x0kbBbkUe88SAnTANBgkqhkiG9w0BAQsFAAOCAgEAlDpzBp9SSzBc1P6x
+XCX5145v9Ydkn+0UjrgEjihLj6p7jjm02Vj2e6E1CqGdivdj5eu9OYLU43otb98T
+PLr+flaYC/NUn81ETm484T4VvwYmneTwkLbUwp4wLh/vx3rEUMfqe9pQy3omywC0
+Wqu1kx+AiYQElY2NfwmTv9SoqORjbdlk5LgpWgi/UOGED1V7XwgiG/W9mR4U9s70
+WBCCswo9GcG/W6uqmdjyMb3lOGbcWAXH7WMaLgqXfIeTK7KK4/HsGOV1timH59yL
+Gn602MnTihdsfSlEvoqq9X46Lmgxk7lq2prg2+kupYTNHAq4Sgj5nPFhJpiTt3tm
+7JFe3VE/23MPrQRYCd0EApUKPtN236YQHoA96M2kZNEzx5LH4k5E4wnJTsJdhw4S
+nr8PyQUQ3nqjsTzyP6WqJ3mtMX0f/fwZacXduT98zca0wjAefm6S139hdlqP65VN
+vBFuIXxZN5nQBrz5Bm0yFqXZaajh3DyAHmBR3NdUIR7KYndP+tiPsys6DXhyyWhB
+WkdKwqPrGtcKqzwyVcgKEZzfdNbwQBUdyLmPtTbFr/giuMod89a2GQ+fYWVq6nTI
+fI/DT11lgh/ZDYnadXL77/FHZxOzyNEZiCcmmpl5fx7kLD977vHeTYuWl8PVP3wb
+I+2ksx0WckNLIOFZfsLorSa/ovc=
+-----END CERTIFICATE-----
+
+# Issuer: CN=CA Disig Root R1 O=Disig a.s.
+# Subject: CN=CA Disig Root R1 O=Disig a.s.
+# Label: "CA Disig Root R1"
+# Serial: 14052245610670616104
+# MD5 Fingerprint: be:ec:11:93:9a:f5:69:21:bc:d7:c1:c0:67:89:cc:2a
+# SHA1 Fingerprint: 8e:1c:74:f8:a6:20:b9:e5:8a:f4:61:fa:ec:2b:47:56:51:1a:52:c6
+# SHA256 Fingerprint: f9:6f:23:f4:c3:e7:9c:07:7a:46:98:8d:5a:f5:90:06:76:a0:f0:39:cb:64:5d:d1:75:49:b2:16:c8:24:40:ce
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAMMDmu5QkG4oMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNV
+BAYTAlNLMRMwEQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMu
+MRkwFwYDVQQDExBDQSBEaXNpZyBSb290IFIxMB4XDTEyMDcxOTA5MDY1NloXDTQy
+MDcxOTA5MDY1NlowUjELMAkGA1UEBhMCU0sxEzARBgNVBAcTCkJyYXRpc2xhdmEx
+EzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERpc2lnIFJvb3QgUjEw
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCqw3j33Jijp1pedxiy3QRk
+D2P9m5YJgNXoqqXinCaUOuiZc4yd39ffg/N4T0Dhf9Kn0uXKE5Pn7cZ3Xza1lK/o
+OI7bm+V8u8yN63Vz4STN5qctGS7Y1oprFOsIYgrY3LMATcMjfF9DCCMyEtztDK3A
+fQ+lekLZWnDZv6fXARz2m6uOt0qGeKAeVjGu74IKgEH3G8muqzIm1Cxr7X1r5OJe
+IgpFy4QxTaz+29FHuvlglzmxZcfe+5nkCiKxLU3lSCZpq+Kq8/v8kiky6bM+TR8n
+oc2OuRf7JT7JbvN32g0S9l3HuzYQ1VTW8+DiR0jm3hTaYVKvJrT1cU/J19IG32PK
+/yHoWQbgCNWEFVP3Q+V8xaCJmGtzxmjOZd69fwX3se72V6FglcXM6pM6vpmumwKj
+rckWtc7dXpl4fho5frLABaTAgqWjR56M6ly2vGfb5ipN0gTco65F97yLnByn1tUD
+3AjLLhbKXEAz6GfDLuemROoRRRw1ZS0eRWEkG4IupZ0zXWX4Qfkuy5Q/H6MMMSRE
+7cderVC6xkGbrPAXZcD4XW9boAo0PO7X6oifmPmvTiT6l7Jkdtqr9O3jw2Dv1fkC
+yC2fg69naQanMVXVz0tv/wQFx1isXxYb5dKj6zHbHzMVTdDypVP1y+E9Tmgt2BLd
+qvLmTZtJ5cUoobqwWsagtQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUiQq0OJMa5qvum5EY+fU8PjXQ04IwDQYJKoZI
+hvcNAQEFBQADggIBADKL9p1Kyb4U5YysOMo6CdQbzoaz3evUuii+Eq5FLAR0rBNR
+xVgYZk2C2tXck8An4b58n1KeElb21Zyp9HWc+jcSjxyT7Ff+Bw+r1RL3D65hXlaA
+SfX8MPWbTx9BLxyE04nH4toCdu0Jz2zBuByDHBb6lM19oMgY0sidbvW9adRtPTXo
+HqJPYNcHKfyyo6SdbhWSVhlMCrDpfNIZTUJG7L399ldb3Zh+pE3McgODWF3vkzpB
+emOqfDqo9ayk0d2iLbYq/J8BjuIQscTK5GfbVSUZP/3oNn6z4eGBrxEWi1CXYBmC
+AMBrTXO40RMHPuq2MU/wQppt4hF05ZSsjYSVPCGvxdpHyN85YmLLW1AL14FABZyb
+7bq2ix4Eb5YgOe2kfSnbSM6C3NQCjR0EMVrHS/BsYVLXtFHCgWzN4funodKSds+x
+DzdYpPJScWc/DIh4gInByLUfkmO+p3qKViwaqKactV2zY9ATIKHrkWzQjX2v3wvk
+F7mGnjixlAxYjOBVqjtjbZqJYLhkKpLGN/R+Q0O3c+gB53+XD9fyexn9GtePyfqF
+a3qdnom2piiZk4hA9z7NUaPK6u95RyG1/jLix8NRb76AdPCkwzryT+lf3xkK8jsT
+Q6wxpLPn6/wY1gGp8yqPNg7rtLG8t0zJa7+h89n07eLw4+1knj0vllJPgFOL
+-----END CERTIFICATE-----
+
+# Issuer: CN=CA Disig Root R2 O=Disig a.s.
+# Subject: CN=CA Disig Root R2 O=Disig a.s.
+# Label: "CA Disig Root R2"
+# Serial: 10572350602393338211
+# MD5 Fingerprint: 26:01:fb:d8:27:a7:17:9a:45:54:38:1a:43:01:3b:03
+# SHA1 Fingerprint: b5:61:eb:ea:a4:de:e4:25:4b:69:1a:98:a5:57:47:c2:34:c7:d9:71
+# SHA256 Fingerprint: e2:3d:4a:03:6d:7b:70:e9:f5:95:b1:42:20:79:d2:b9:1e:df:bb:1f:b6:51:a0:63:3e:aa:8a:9d:c5:f8:07:03
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNV
+BAYTAlNLMRMwEQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMu
+MRkwFwYDVQQDExBDQSBEaXNpZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQy
+MDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sxEzARBgNVBAcTCkJyYXRpc2xhdmEx
+EzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERpc2lnIFJvb3QgUjIw
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbCw3Oe
+NcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNH
+PWSb6WiaxswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3I
+x2ymrdMxp7zo5eFm1tL7A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbe
+QTg06ov80egEFGEtQX6sx3dOy1FU+16SGBsEWmjGycT6txOgmLcRK7fWV8x8nhfR
+yyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqVg8NTEQxzHQuyRpDRQjrO
+QG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa5Beny912
+H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJ
+QfYEkoopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUD
+i/ZnWejBBhG93c+AAk9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORs
+nLMOPReisjQS1n6yqEm70XooQL6iFh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1
+rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5uQu0wDQYJKoZI
+hvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
+tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqf
+GopTpti72TVVsRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkb
+lvdhuDvEK7Z4bLQjb/D907JedR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka
++elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W81k/BfDxujRNt+3vrMNDcTa/F1bal
+TFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjxmHHEt38OFdAlab0i
+nSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01utI3
+gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18Dr
+G5gPcFw0sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3Os
+zMOl6W8KjptlwlCFtaOgUxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8x
+L4ysEr3vQCj8KWefshNPZiTEUxnpHikV7+ZtsH8tZ/3zbBt1RqPlShfppNcL
+-----END CERTIFICATE-----
diff --git a/lib/websocket/py.typed b/lib/websocket/py.typed
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/websocket/tests/data/header01.txt b/lib/websocket/tests/data/header01.txt
index 3142b43b..d44d24c2 100644
--- a/lib/websocket/tests/data/header01.txt
+++ b/lib/websocket/tests/data/header01.txt
@@ -1,6 +1,6 @@
-HTTP/1.1 101 WebSocket Protocol Handshake
-Connection: Upgrade 
-Upgrade: WebSocket
-Sec-WebSocket-Accept: Kxep+hNu9n51529fGidYu7a3wO0=
-some_header: something
-
+HTTP/1.1 101 WebSocket Protocol Handshake
+Connection: Upgrade 
+Upgrade: WebSocket
+Sec-WebSocket-Accept: Kxep+hNu9n51529fGidYu7a3wO0=
+some_header: something
+
diff --git a/lib/websocket/tests/data/header02.txt b/lib/websocket/tests/data/header02.txt
index a9dd2ce3..f481de92 100644
--- a/lib/websocket/tests/data/header02.txt
+++ b/lib/websocket/tests/data/header02.txt
@@ -1,6 +1,6 @@
-HTTP/1.1 101 WebSocket Protocol Handshake
-Connection: Upgrade
-Upgrade WebSocket
-Sec-WebSocket-Accept: Kxep+hNu9n51529fGidYu7a3wO0=
-some_header: something
-
+HTTP/1.1 101 WebSocket Protocol Handshake
+Connection: Upgrade
+Upgrade WebSocket
+Sec-WebSocket-Accept: Kxep+hNu9n51529fGidYu7a3wO0=
+some_header: something
+
diff --git a/lib/websocket/tests/data/header03.txt b/lib/websocket/tests/data/header03.txt
deleted file mode 100644
index 1a81dc70..00000000
--- a/lib/websocket/tests/data/header03.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-HTTP/1.1 101 WebSocket Protocol Handshake
-Connection: Upgrade, Keep-Alive
-Upgrade: WebSocket
-Sec-WebSocket-Accept: Kxep+hNu9n51529fGidYu7a3wO0=
-Set-Cookie: Token=ABCDE
-Set-Cookie: Token=FGHIJ
-some_header: something
-
diff --git a/lib/websocket/tests/echo-server.py b/lib/websocket/tests/echo-server.py
deleted file mode 100644
index 5d1e8708..00000000
--- a/lib/websocket/tests/echo-server.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-
-# From https://github.com/aaugustin/websockets/blob/main/example/echo.py
-
-import asyncio
-import os
-
-import websockets
-
-LOCAL_WS_SERVER_PORT = int(os.environ.get("LOCAL_WS_SERVER_PORT", "8765"))
-
-
-async def echo(websocket):
-    async for message in websocket:
-        await websocket.send(message)
-
-
-async def main():
-    async with websockets.serve(echo, "localhost", LOCAL_WS_SERVER_PORT):
-        await asyncio.Future()  # run forever
-
-
-asyncio.run(main())
diff --git a/lib/websocket/tests/test_abnf.py b/lib/websocket/tests/test_abnf.py
deleted file mode 100644
index a749f13b..00000000
--- a/lib/websocket/tests/test_abnf.py
+++ /dev/null
@@ -1,125 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-import unittest
-
-from websocket._abnf import ABNF, frame_buffer
-from websocket._exceptions import WebSocketProtocolException
-
-"""
-test_abnf.py
-websocket - WebSocket client library for Python
-
-Copyright 2024 engn33r
-
-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.
-"""
-
-
-class ABNFTest(unittest.TestCase):
-    def test_init(self):
-        a = ABNF(0, 0, 0, 0, opcode=ABNF.OPCODE_PING)
-        self.assertEqual(a.fin, 0)
-        self.assertEqual(a.rsv1, 0)
-        self.assertEqual(a.rsv2, 0)
-        self.assertEqual(a.rsv3, 0)
-        self.assertEqual(a.opcode, 9)
-        self.assertEqual(a.data, "")
-        a_bad = ABNF(0, 1, 0, 0, opcode=77)
-        self.assertEqual(a_bad.rsv1, 1)
-        self.assertEqual(a_bad.opcode, 77)
-
-    def test_validate(self):
-        a_invalid_ping = ABNF(0, 0, 0, 0, opcode=ABNF.OPCODE_PING)
-        self.assertRaises(
-            WebSocketProtocolException,
-            a_invalid_ping.validate,
-            skip_utf8_validation=False,
-        )
-        a_bad_rsv_value = ABNF(0, 1, 0, 0, opcode=ABNF.OPCODE_TEXT)
-        self.assertRaises(
-            WebSocketProtocolException,
-            a_bad_rsv_value.validate,
-            skip_utf8_validation=False,
-        )
-        a_bad_opcode = ABNF(0, 0, 0, 0, opcode=77)
-        self.assertRaises(
-            WebSocketProtocolException,
-            a_bad_opcode.validate,
-            skip_utf8_validation=False,
-        )
-        a_bad_close_frame = ABNF(0, 0, 0, 0, opcode=ABNF.OPCODE_CLOSE, data=b"\x01")
-        self.assertRaises(
-            WebSocketProtocolException,
-            a_bad_close_frame.validate,
-            skip_utf8_validation=False,
-        )
-        a_bad_close_frame_2 = ABNF(
-            0, 0, 0, 0, opcode=ABNF.OPCODE_CLOSE, data=b"\x01\x8a\xaa\xff\xdd"
-        )
-        self.assertRaises(
-            WebSocketProtocolException,
-            a_bad_close_frame_2.validate,
-            skip_utf8_validation=False,
-        )
-        a_bad_close_frame_3 = ABNF(
-            0, 0, 0, 0, opcode=ABNF.OPCODE_CLOSE, data=b"\x03\xe7"
-        )
-        self.assertRaises(
-            WebSocketProtocolException,
-            a_bad_close_frame_3.validate,
-            skip_utf8_validation=True,
-        )
-
-    def test_mask(self):
-        abnf_none_data = ABNF(
-            0, 0, 0, 0, opcode=ABNF.OPCODE_PING, mask_value=1, data=None
-        )
-        bytes_val = b"aaaa"
-        self.assertEqual(abnf_none_data._get_masked(bytes_val), bytes_val)
-        abnf_str_data = ABNF(
-            0, 0, 0, 0, opcode=ABNF.OPCODE_PING, mask_value=1, data="a"
-        )
-        self.assertEqual(abnf_str_data._get_masked(bytes_val), b"aaaa\x00")
-
-    def test_format(self):
-        abnf_bad_rsv_bits = ABNF(2, 0, 0, 0, opcode=ABNF.OPCODE_TEXT)
-        self.assertRaises(ValueError, abnf_bad_rsv_bits.format)
-        abnf_bad_opcode = ABNF(0, 0, 0, 0, opcode=5)
-        self.assertRaises(ValueError, abnf_bad_opcode.format)
-        abnf_length_10 = ABNF(0, 0, 0, 0, opcode=ABNF.OPCODE_TEXT, data="abcdefghij")
-        self.assertEqual(b"\x01", abnf_length_10.format()[0].to_bytes(1, "big"))
-        self.assertEqual(b"\x8a", abnf_length_10.format()[1].to_bytes(1, "big"))
-        self.assertEqual("fin=0 opcode=1 data=abcdefghij", abnf_length_10.__str__())
-        abnf_length_20 = ABNF(
-            0, 0, 0, 0, opcode=ABNF.OPCODE_BINARY, data="abcdefghijabcdefghij"
-        )
-        self.assertEqual(b"\x02", abnf_length_20.format()[0].to_bytes(1, "big"))
-        self.assertEqual(b"\x94", abnf_length_20.format()[1].to_bytes(1, "big"))
-        abnf_no_mask = ABNF(
-            0, 0, 0, 0, opcode=ABNF.OPCODE_TEXT, mask_value=0, data=b"\x01\x8a\xcc"
-        )
-        self.assertEqual(b"\x01\x03\x01\x8a\xcc", abnf_no_mask.format())
-
-    def test_frame_buffer(self):
-        fb = frame_buffer(0, True)
-        self.assertEqual(fb.recv, 0)
-        self.assertEqual(fb.skip_utf8_validation, True)
-        fb.clear
-        self.assertEqual(fb.header, None)
-        self.assertEqual(fb.length, None)
-        self.assertEqual(fb.mask_value, None)
-        self.assertEqual(fb.has_mask(), False)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/lib/websocket/tests/test_app.py b/lib/websocket/tests/test_app.py
deleted file mode 100644
index 18eace54..00000000
--- a/lib/websocket/tests/test_app.py
+++ /dev/null
@@ -1,352 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-import os
-import os.path
-import ssl
-import threading
-import unittest
-
-import websocket as ws
-
-"""
-test_app.py
-websocket - WebSocket client library for Python
-
-Copyright 2024 engn33r
-
-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.
-"""
-
-# Skip test to access the internet unless TEST_WITH_INTERNET == 1
-TEST_WITH_INTERNET = os.environ.get("TEST_WITH_INTERNET", "0") == "1"
-# Skip tests relying on local websockets server unless LOCAL_WS_SERVER_PORT != -1
-LOCAL_WS_SERVER_PORT = os.environ.get("LOCAL_WS_SERVER_PORT", "-1")
-TEST_WITH_LOCAL_SERVER = LOCAL_WS_SERVER_PORT != "-1"
-TRACEABLE = True
-
-
-class WebSocketAppTest(unittest.TestCase):
-    class NotSetYet:
-        """A marker class for signalling that a value hasn't been set yet."""
-
-    def setUp(self):
-        ws.enableTrace(TRACEABLE)
-
-        WebSocketAppTest.keep_running_open = WebSocketAppTest.NotSetYet()
-        WebSocketAppTest.keep_running_close = WebSocketAppTest.NotSetYet()
-        WebSocketAppTest.get_mask_key_id = WebSocketAppTest.NotSetYet()
-        WebSocketAppTest.on_error_data = WebSocketAppTest.NotSetYet()
-
-    def tearDown(self):
-        WebSocketAppTest.keep_running_open = WebSocketAppTest.NotSetYet()
-        WebSocketAppTest.keep_running_close = WebSocketAppTest.NotSetYet()
-        WebSocketAppTest.get_mask_key_id = WebSocketAppTest.NotSetYet()
-        WebSocketAppTest.on_error_data = WebSocketAppTest.NotSetYet()
-
-    def close(self):
-        pass
-
-    @unittest.skipUnless(
-        TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled"
-    )
-    def test_keep_running(self):
-        """A WebSocketApp should keep running as long as its self.keep_running
-        is not False (in the boolean context).
-        """
-
-        def on_open(self, *args, **kwargs):
-            """Set the keep_running flag for later inspection and immediately
-            close the connection.
-            """
-            self.send("hello!")
-            WebSocketAppTest.keep_running_open = self.keep_running
-            self.keep_running = False
-
-        def on_message(_, message):
-            print(message)
-            self.close()
-
-        def on_close(self, *args, **kwargs):
-            """Set the keep_running flag for the test to use."""
-            WebSocketAppTest.keep_running_close = self.keep_running
-
-        app = ws.WebSocketApp(
-            f"ws://127.0.0.1:{LOCAL_WS_SERVER_PORT}",
-            on_open=on_open,
-            on_close=on_close,
-            on_message=on_message,
-        )
-        app.run_forever()
-
-    #    @unittest.skipUnless(TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled")
-    @unittest.skipUnless(False, "Test disabled for now (requires rel)")
-    def test_run_forever_dispatcher(self):
-        """A WebSocketApp should keep running as long as its self.keep_running
-        is not False (in the boolean context).
-        """
-
-        def on_open(self, *args, **kwargs):
-            """Send a message, receive, and send one more"""
-            self.send("hello!")
-            self.recv()
-            self.send("goodbye!")
-
-        def on_message(_, message):
-            print(message)
-            self.close()
-
-        app = ws.WebSocketApp(
-            f"ws://127.0.0.1:{LOCAL_WS_SERVER_PORT}",
-            on_open=on_open,
-            on_message=on_message,
-        )
-        app.run_forever(dispatcher="Dispatcher")  # doesn't work
-
-    #        app.run_forever(dispatcher=rel)          # would work
-    #        rel.dispatch()
-
-    @unittest.skipUnless(
-        TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled"
-    )
-    def test_run_forever_teardown_clean_exit(self):
-        """The WebSocketApp.run_forever() method should return `False` when the application ends gracefully."""
-        app = ws.WebSocketApp(f"ws://127.0.0.1:{LOCAL_WS_SERVER_PORT}")
-        threading.Timer(interval=0.2, function=app.close).start()
-        teardown = app.run_forever()
-        self.assertEqual(teardown, False)
-
-    @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def test_sock_mask_key(self):
-        """A WebSocketApp should forward the received mask_key function down
-        to the actual socket.
-        """
-
-        def my_mask_key_func():
-            return "\x00\x00\x00\x00"
-
-        app = ws.WebSocketApp(
-            "wss://api-pub.bitfinex.com/ws/1", get_mask_key=my_mask_key_func
-        )
-
-        # if numpy is installed, this assertion fail
-        # Note: We can't use 'is' for comparing the functions directly, need to use 'id'.
-        self.assertEqual(id(app.get_mask_key), id(my_mask_key_func))
-
-    @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def test_invalid_ping_interval_ping_timeout(self):
-        """Test exception handling if ping_interval < ping_timeout"""
-
-        def on_ping(app, _):
-            print("Got a ping!")
-            app.close()
-
-        def on_pong(app, _):
-            print("Got a pong! No need to respond")
-            app.close()
-
-        app = ws.WebSocketApp(
-            "wss://api-pub.bitfinex.com/ws/1", on_ping=on_ping, on_pong=on_pong
-        )
-        self.assertRaises(
-            ws.WebSocketException,
-            app.run_forever,
-            ping_interval=1,
-            ping_timeout=2,
-            sslopt={"cert_reqs": ssl.CERT_NONE},
-        )
-
-    @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def test_ping_interval(self):
-        """Test WebSocketApp proper ping functionality"""
-
-        def on_ping(app, _):
-            print("Got a ping!")
-            app.close()
-
-        def on_pong(app, _):
-            print("Got a pong! No need to respond")
-            app.close()
-
-        app = ws.WebSocketApp(
-            "wss://api-pub.bitfinex.com/ws/1", on_ping=on_ping, on_pong=on_pong
-        )
-        app.run_forever(
-            ping_interval=2, ping_timeout=1, sslopt={"cert_reqs": ssl.CERT_NONE}
-        )
-
-    @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def test_opcode_close(self):
-        """Test WebSocketApp close opcode"""
-
-        app = ws.WebSocketApp("wss://tsock.us1.twilio.com/v3/wsconnect")
-        app.run_forever(ping_interval=2, ping_timeout=1, ping_payload="Ping payload")
-
-    # This is commented out because the URL no longer responds in the expected way
-    # @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    # def testOpcodeBinary(self):
-    #     """ Test WebSocketApp binary opcode
-    #     """
-    #     app = ws.WebSocketApp('wss://streaming.vn.teslamotors.com/streaming/')
-    #     app.run_forever(ping_interval=2, ping_timeout=1, ping_payload="Ping payload")
-
-    @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def test_bad_ping_interval(self):
-        """A WebSocketApp handling of negative ping_interval"""
-        app = ws.WebSocketApp("wss://api-pub.bitfinex.com/ws/1")
-        self.assertRaises(
-            ws.WebSocketException,
-            app.run_forever,
-            ping_interval=-5,
-            sslopt={"cert_reqs": ssl.CERT_NONE},
-        )
-
-    @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def test_bad_ping_timeout(self):
-        """A WebSocketApp handling of negative ping_timeout"""
-        app = ws.WebSocketApp("wss://api-pub.bitfinex.com/ws/1")
-        self.assertRaises(
-            ws.WebSocketException,
-            app.run_forever,
-            ping_timeout=-3,
-            sslopt={"cert_reqs": ssl.CERT_NONE},
-        )
-
-    @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def test_close_status_code(self):
-        """Test extraction of close frame status code and close reason in WebSocketApp"""
-
-        def on_close(wsapp, close_status_code, close_msg):
-            print("on_close reached")
-
-        app = ws.WebSocketApp(
-            "wss://tsock.us1.twilio.com/v3/wsconnect", on_close=on_close
-        )
-        closeframe = ws.ABNF(
-            opcode=ws.ABNF.OPCODE_CLOSE, data=b"\x03\xe8no-init-from-client"
-        )
-        self.assertEqual([1000, "no-init-from-client"], app._get_close_args(closeframe))
-
-        closeframe = ws.ABNF(opcode=ws.ABNF.OPCODE_CLOSE, data=b"")
-        self.assertEqual([None, None], app._get_close_args(closeframe))
-
-        app2 = ws.WebSocketApp("wss://tsock.us1.twilio.com/v3/wsconnect")
-        closeframe = ws.ABNF(opcode=ws.ABNF.OPCODE_CLOSE, data=b"")
-        self.assertEqual([None, None], app2._get_close_args(closeframe))
-
-        self.assertRaises(
-            ws.WebSocketConnectionClosedException,
-            app.send,
-            data="test if connection is closed",
-        )
-
-    @unittest.skipUnless(
-        TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled"
-    )
-    def test_callback_function_exception(self):
-        """Test callback function exception handling"""
-
-        exc = None
-        passed_app = None
-
-        def on_open(app):
-            raise RuntimeError("Callback failed")
-
-        def on_error(app, err):
-            nonlocal passed_app
-            passed_app = app
-            nonlocal exc
-            exc = err
-
-        def on_pong(app, _):
-            app.close()
-
-        app = ws.WebSocketApp(
-            f"ws://127.0.0.1:{LOCAL_WS_SERVER_PORT}",
-            on_open=on_open,
-            on_error=on_error,
-            on_pong=on_pong,
-        )
-        app.run_forever(ping_interval=2, ping_timeout=1)
-
-        self.assertEqual(passed_app, app)
-        self.assertIsInstance(exc, RuntimeError)
-        self.assertEqual(str(exc), "Callback failed")
-
-    @unittest.skipUnless(
-        TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled"
-    )
-    def test_callback_method_exception(self):
-        """Test callback method exception handling"""
-
-        class Callbacks:
-            def __init__(self):
-                self.exc = None
-                self.passed_app = None
-                self.app = ws.WebSocketApp(
-                    f"ws://127.0.0.1:{LOCAL_WS_SERVER_PORT}",
-                    on_open=self.on_open,
-                    on_error=self.on_error,
-                    on_pong=self.on_pong,
-                )
-                self.app.run_forever(ping_interval=2, ping_timeout=1)
-
-            def on_open(self, _):
-                raise RuntimeError("Callback failed")
-
-            def on_error(self, app, err):
-                self.passed_app = app
-                self.exc = err
-
-            def on_pong(self, app, _):
-                app.close()
-
-        callbacks = Callbacks()
-
-        self.assertEqual(callbacks.passed_app, callbacks.app)
-        self.assertIsInstance(callbacks.exc, RuntimeError)
-        self.assertEqual(str(callbacks.exc), "Callback failed")
-
-    @unittest.skipUnless(
-        TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled"
-    )
-    def test_reconnect(self):
-        """Test reconnect"""
-        pong_count = 0
-        exc = None
-
-        def on_error(_, err):
-            nonlocal exc
-            exc = err
-
-        def on_pong(app, _):
-            nonlocal pong_count
-            pong_count += 1
-            if pong_count == 1:
-                # First pong, shutdown socket, enforce read error
-                app.sock.shutdown()
-            if pong_count >= 2:
-                # Got second pong after reconnect
-                app.close()
-
-        app = ws.WebSocketApp(
-            f"ws://127.0.0.1:{LOCAL_WS_SERVER_PORT}", on_pong=on_pong, on_error=on_error
-        )
-        app.run_forever(ping_interval=2, ping_timeout=1, reconnect=3)
-
-        self.assertEqual(pong_count, 2)
-        self.assertIsInstance(exc, ws.WebSocketTimeoutException)
-        self.assertEqual(str(exc), "ping/pong timed out")
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/lib/websocket/tests/test_cookiejar.py b/lib/websocket/tests/test_cookiejar.py
deleted file mode 100644
index 67eddb62..00000000
--- a/lib/websocket/tests/test_cookiejar.py
+++ /dev/null
@@ -1,123 +0,0 @@
-import unittest
-
-from websocket._cookiejar import SimpleCookieJar
-
-"""
-test_cookiejar.py
-websocket - WebSocket client library for Python
-
-Copyright 2024 engn33r
-
-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.
-"""
-
-
-class CookieJarTest(unittest.TestCase):
-    def test_add(self):
-        cookie_jar = SimpleCookieJar()
-        cookie_jar.add("")
-        self.assertFalse(
-            cookie_jar.jar, "Cookie with no domain should not be added to the jar"
-        )
-
-        cookie_jar = SimpleCookieJar()
-        cookie_jar.add("a=b")
-        self.assertFalse(
-            cookie_jar.jar, "Cookie with no domain should not be added to the jar"
-        )
-
-        cookie_jar = SimpleCookieJar()
-        cookie_jar.add("a=b; domain=.abc")
-        self.assertTrue(".abc" in cookie_jar.jar)
-
-        cookie_jar = SimpleCookieJar()
-        cookie_jar.add("a=b; domain=abc")
-        self.assertTrue(".abc" in cookie_jar.jar)
-        self.assertTrue("abc" not in cookie_jar.jar)
-
-        cookie_jar = SimpleCookieJar()
-        cookie_jar.add("a=b; c=d; domain=abc")
-        self.assertEqual(cookie_jar.get("abc"), "a=b; c=d")
-        self.assertEqual(cookie_jar.get(None), "")
-
-        cookie_jar = SimpleCookieJar()
-        cookie_jar.add("a=b; c=d; domain=abc")
-        cookie_jar.add("e=f; domain=abc")
-        self.assertEqual(cookie_jar.get("abc"), "a=b; c=d; e=f")
-
-        cookie_jar = SimpleCookieJar()
-        cookie_jar.add("a=b; c=d; domain=abc")
-        cookie_jar.add("e=f; domain=.abc")
-        self.assertEqual(cookie_jar.get("abc"), "a=b; c=d; e=f")
-
-        cookie_jar = SimpleCookieJar()
-        cookie_jar.add("a=b; c=d; domain=abc")
-        cookie_jar.add("e=f; domain=xyz")
-        self.assertEqual(cookie_jar.get("abc"), "a=b; c=d")
-        self.assertEqual(cookie_jar.get("xyz"), "e=f")
-        self.assertEqual(cookie_jar.get("something"), "")
-
-    def test_set(self):
-        cookie_jar = SimpleCookieJar()
-        cookie_jar.set("a=b")
-        self.assertFalse(
-            cookie_jar.jar, "Cookie with no domain should not be added to the jar"
-        )
-
-        cookie_jar = SimpleCookieJar()
-        cookie_jar.set("a=b; domain=.abc")
-        self.assertTrue(".abc" in cookie_jar.jar)
-
-        cookie_jar = SimpleCookieJar()
-        cookie_jar.set("a=b; domain=abc")
-        self.assertTrue(".abc" in cookie_jar.jar)
-        self.assertTrue("abc" not in cookie_jar.jar)
-
-        cookie_jar = SimpleCookieJar()
-        cookie_jar.set("a=b; c=d; domain=abc")
-        self.assertEqual(cookie_jar.get("abc"), "a=b; c=d")
-
-        cookie_jar = SimpleCookieJar()
-        cookie_jar.set("a=b; c=d; domain=abc")
-        cookie_jar.set("e=f; domain=abc")
-        self.assertEqual(cookie_jar.get("abc"), "e=f")
-
-        cookie_jar = SimpleCookieJar()
-        cookie_jar.set("a=b; c=d; domain=abc")
-        cookie_jar.set("e=f; domain=.abc")
-        self.assertEqual(cookie_jar.get("abc"), "e=f")
-
-        cookie_jar = SimpleCookieJar()
-        cookie_jar.set("a=b; c=d; domain=abc")
-        cookie_jar.set("e=f; domain=xyz")
-        self.assertEqual(cookie_jar.get("abc"), "a=b; c=d")
-        self.assertEqual(cookie_jar.get("xyz"), "e=f")
-        self.assertEqual(cookie_jar.get("something"), "")
-
-    def test_get(self):
-        cookie_jar = SimpleCookieJar()
-        cookie_jar.set("a=b; c=d; domain=abc.com")
-        self.assertEqual(cookie_jar.get("abc.com"), "a=b; c=d")
-        self.assertEqual(cookie_jar.get("x.abc.com"), "a=b; c=d")
-        self.assertEqual(cookie_jar.get("abc.com.es"), "")
-        self.assertEqual(cookie_jar.get("xabc.com"), "")
-
-        cookie_jar.set("a=b; c=d; domain=.abc.com")
-        self.assertEqual(cookie_jar.get("abc.com"), "a=b; c=d")
-        self.assertEqual(cookie_jar.get("x.abc.com"), "a=b; c=d")
-        self.assertEqual(cookie_jar.get("abc.com.es"), "")
-        self.assertEqual(cookie_jar.get("xabc.com"), "")
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/lib/websocket/tests/test_http.py b/lib/websocket/tests/test_http.py
deleted file mode 100644
index f495e635..00000000
--- a/lib/websocket/tests/test_http.py
+++ /dev/null
@@ -1,370 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-import os
-import os.path
-import socket
-import ssl
-import unittest
-
-import websocket
-from websocket._exceptions import WebSocketProxyException, WebSocketException
-from websocket._http import (
-    _get_addrinfo_list,
-    _start_proxied_socket,
-    _tunnel,
-    connect,
-    proxy_info,
-    read_headers,
-    HAVE_PYTHON_SOCKS,
-)
-
-"""
-test_http.py
-websocket - WebSocket client library for Python
-
-Copyright 2024 engn33r
-
-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.
-"""
-
-try:
-    from python_socks._errors import ProxyConnectionError, ProxyError, ProxyTimeoutError
-except:
-    from websocket._http import ProxyConnectionError, ProxyError, ProxyTimeoutError
-
-# Skip test to access the internet unless TEST_WITH_INTERNET == 1
-TEST_WITH_INTERNET = os.environ.get("TEST_WITH_INTERNET", "0") == "1"
-TEST_WITH_PROXY = os.environ.get("TEST_WITH_PROXY", "0") == "1"
-# Skip tests relying on local websockets server unless LOCAL_WS_SERVER_PORT != -1
-LOCAL_WS_SERVER_PORT = os.environ.get("LOCAL_WS_SERVER_PORT", "-1")
-TEST_WITH_LOCAL_SERVER = LOCAL_WS_SERVER_PORT != "-1"
-
-
-class SockMock:
-    def __init__(self):
-        self.data = []
-        self.sent = []
-
-    def add_packet(self, data):
-        self.data.append(data)
-
-    def gettimeout(self):
-        return None
-
-    def recv(self, bufsize):
-        if self.data:
-            e = self.data.pop(0)
-            if isinstance(e, Exception):
-                raise e
-            if len(e) > bufsize:
-                self.data.insert(0, e[bufsize:])
-            return e[:bufsize]
-
-    def send(self, data):
-        self.sent.append(data)
-        return len(data)
-
-    def close(self):
-        pass
-
-
-class HeaderSockMock(SockMock):
-    def __init__(self, fname):
-        SockMock.__init__(self)
-        path = os.path.join(os.path.dirname(__file__), fname)
-        with open(path, "rb") as f:
-            self.add_packet(f.read())
-
-
-class OptsList:
-    def __init__(self):
-        self.timeout = 1
-        self.sockopt = []
-        self.sslopt = {"cert_reqs": ssl.CERT_NONE}
-
-
-class HttpTest(unittest.TestCase):
-    def test_read_header(self):
-        status, header, _ = read_headers(HeaderSockMock("data/header01.txt"))
-        self.assertEqual(status, 101)
-        self.assertEqual(header["connection"], "Upgrade")
-        # header02.txt is intentionally malformed
-        self.assertRaises(
-            WebSocketException, read_headers, HeaderSockMock("data/header02.txt")
-        )
-
-    def test_tunnel(self):
-        self.assertRaises(
-            WebSocketProxyException,
-            _tunnel,
-            HeaderSockMock("data/header01.txt"),
-            "example.com",
-            80,
-            ("username", "password"),
-        )
-        self.assertRaises(
-            WebSocketProxyException,
-            _tunnel,
-            HeaderSockMock("data/header02.txt"),
-            "example.com",
-            80,
-            ("username", "password"),
-        )
-
-    @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def test_connect(self):
-        # Not currently testing an actual proxy connection, so just check whether proxy errors are raised. This requires internet for a DNS lookup
-        if HAVE_PYTHON_SOCKS:
-            # Need this check, otherwise case where python_socks is not installed triggers
-            # websocket._exceptions.WebSocketException: Python Socks is needed for SOCKS proxying but is not available
-            self.assertRaises(
-                (ProxyTimeoutError, OSError),
-                _start_proxied_socket,
-                "wss://example.com",
-                OptsList(),
-                proxy_info(
-                    http_proxy_host="example.com",
-                    http_proxy_port="8080",
-                    proxy_type="socks4",
-                    http_proxy_timeout=1,
-                ),
-            )
-            self.assertRaises(
-                (ProxyTimeoutError, OSError),
-                _start_proxied_socket,
-                "wss://example.com",
-                OptsList(),
-                proxy_info(
-                    http_proxy_host="example.com",
-                    http_proxy_port="8080",
-                    proxy_type="socks4a",
-                    http_proxy_timeout=1,
-                ),
-            )
-            self.assertRaises(
-                (ProxyTimeoutError, OSError),
-                _start_proxied_socket,
-                "wss://example.com",
-                OptsList(),
-                proxy_info(
-                    http_proxy_host="example.com",
-                    http_proxy_port="8080",
-                    proxy_type="socks5",
-                    http_proxy_timeout=1,
-                ),
-            )
-            self.assertRaises(
-                (ProxyTimeoutError, OSError),
-                _start_proxied_socket,
-                "wss://example.com",
-                OptsList(),
-                proxy_info(
-                    http_proxy_host="example.com",
-                    http_proxy_port="8080",
-                    proxy_type="socks5h",
-                    http_proxy_timeout=1,
-                ),
-            )
-            self.assertRaises(
-                ProxyConnectionError,
-                connect,
-                "wss://example.com",
-                OptsList(),
-                proxy_info(
-                    http_proxy_host="127.0.0.1",
-                    http_proxy_port=9999,
-                    proxy_type="socks4",
-                    http_proxy_timeout=1,
-                ),
-                None,
-            )
-
-        self.assertRaises(
-            TypeError,
-            _get_addrinfo_list,
-            None,
-            80,
-            True,
-            proxy_info(
-                http_proxy_host="127.0.0.1", http_proxy_port="9999", proxy_type="http"
-            ),
-        )
-        self.assertRaises(
-            TypeError,
-            _get_addrinfo_list,
-            None,
-            80,
-            True,
-            proxy_info(
-                http_proxy_host="127.0.0.1", http_proxy_port="9999", proxy_type="http"
-            ),
-        )
-        self.assertRaises(
-            socket.timeout,
-            connect,
-            "wss://google.com",
-            OptsList(),
-            proxy_info(
-                http_proxy_host="8.8.8.8",
-                http_proxy_port=9999,
-                proxy_type="http",
-                http_proxy_timeout=1,
-            ),
-            None,
-        )
-        self.assertEqual(
-            connect(
-                "wss://google.com",
-                OptsList(),
-                proxy_info(
-                    http_proxy_host="8.8.8.8", http_proxy_port=8080, proxy_type="http"
-                ),
-                True,
-            ),
-            (True, ("google.com", 443, "/")),
-        )
-        # The following test fails on Mac OS with a gaierror, not an OverflowError
-        # self.assertRaises(OverflowError, connect, "wss://example.com", OptsList(), proxy_info(http_proxy_host="127.0.0.1", http_proxy_port=99999, proxy_type="socks4", timeout=2), False)
-
-    @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    @unittest.skipUnless(
-        TEST_WITH_PROXY, "This test requires a HTTP proxy to be running on port 8899"
-    )
-    @unittest.skipUnless(
-        TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled"
-    )
-    def test_proxy_connect(self):
-        ws = websocket.WebSocket()
-        ws.connect(
-            f"ws://127.0.0.1:{LOCAL_WS_SERVER_PORT}",
-            http_proxy_host="127.0.0.1",
-            http_proxy_port="8899",
-            proxy_type="http",
-        )
-        ws.send("Hello, Server")
-        server_response = ws.recv()
-        self.assertEqual(server_response, "Hello, Server")
-        # self.assertEqual(_start_proxied_socket("wss://api.bitfinex.com/ws/2", OptsList(), proxy_info(http_proxy_host="127.0.0.1", http_proxy_port="8899", proxy_type="http"))[1], ("api.bitfinex.com", 443, '/ws/2'))
-        self.assertEqual(
-            _get_addrinfo_list(
-                "api.bitfinex.com",
-                443,
-                True,
-                proxy_info(
-                    http_proxy_host="127.0.0.1",
-                    http_proxy_port="8899",
-                    proxy_type="http",
-                ),
-            ),
-            (
-                socket.getaddrinfo(
-                    "127.0.0.1", 8899, 0, socket.SOCK_STREAM, socket.SOL_TCP
-                ),
-                True,
-                None,
-            ),
-        )
-        self.assertEqual(
-            connect(
-                "wss://api.bitfinex.com/ws/2",
-                OptsList(),
-                proxy_info(
-                    http_proxy_host="127.0.0.1", http_proxy_port=8899, proxy_type="http"
-                ),
-                None,
-            )[1],
-            ("api.bitfinex.com", 443, "/ws/2"),
-        )
-        # TODO: Test SOCKS4 and SOCK5 proxies with unit tests
-
-    @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def test_sslopt(self):
-        ssloptions = {
-            "check_hostname": False,
-            "server_hostname": "ServerName",
-            "ssl_version": ssl.PROTOCOL_TLS_CLIENT,
-            "ciphers": "TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:\
-                        TLS_AES_128_GCM_SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:\
-                        ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:\
-                        ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:\
-                        DHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:\
-                        ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-GCM-SHA256:\
-                        ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:\
-                        DHE-RSA-AES256-SHA256:ECDHE-ECDSA-AES128-SHA256:\
-                        ECDHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA256:\
-                        ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA",
-            "ecdh_curve": "prime256v1",
-        }
-        ws_ssl1 = websocket.WebSocket(sslopt=ssloptions)
-        ws_ssl1.connect("wss://api.bitfinex.com/ws/2")
-        ws_ssl1.send("Hello")
-        ws_ssl1.close()
-
-        ws_ssl2 = websocket.WebSocket(sslopt={"check_hostname": True})
-        ws_ssl2.connect("wss://api.bitfinex.com/ws/2")
-        ws_ssl2.close
-
-    def test_proxy_info(self):
-        self.assertEqual(
-            proxy_info(
-                http_proxy_host="127.0.0.1", http_proxy_port="8080", proxy_type="http"
-            ).proxy_protocol,
-            "http",
-        )
-        self.assertRaises(
-            ProxyError,
-            proxy_info,
-            http_proxy_host="127.0.0.1",
-            http_proxy_port="8080",
-            proxy_type="badval",
-        )
-        self.assertEqual(
-            proxy_info(
-                http_proxy_host="example.com", http_proxy_port="8080", proxy_type="http"
-            ).proxy_host,
-            "example.com",
-        )
-        self.assertEqual(
-            proxy_info(
-                http_proxy_host="127.0.0.1", http_proxy_port="8080", proxy_type="http"
-            ).proxy_port,
-            "8080",
-        )
-        self.assertEqual(
-            proxy_info(
-                http_proxy_host="127.0.0.1", http_proxy_port="8080", proxy_type="http"
-            ).auth,
-            None,
-        )
-        self.assertEqual(
-            proxy_info(
-                http_proxy_host="127.0.0.1",
-                http_proxy_port="8080",
-                proxy_type="http",
-                http_proxy_auth=("my_username123", "my_pass321"),
-            ).auth[0],
-            "my_username123",
-        )
-        self.assertEqual(
-            proxy_info(
-                http_proxy_host="127.0.0.1",
-                http_proxy_port="8080",
-                proxy_type="http",
-                http_proxy_auth=("my_username123", "my_pass321"),
-            ).auth[1],
-            "my_pass321",
-        )
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/lib/websocket/tests/test_url.py b/lib/websocket/tests/test_url.py
deleted file mode 100644
index 110fdfad..00000000
--- a/lib/websocket/tests/test_url.py
+++ /dev/null
@@ -1,464 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-import os
-import unittest
-
-from websocket._url import (
-    _is_address_in_network,
-    _is_no_proxy_host,
-    get_proxy_info,
-    parse_url,
-)
-from websocket._exceptions import WebSocketProxyException
-
-"""
-test_url.py
-websocket - WebSocket client library for Python
-
-Copyright 2024 engn33r
-
-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.
-"""
-
-
-class UrlTest(unittest.TestCase):
-    def test_address_in_network(self):
-        self.assertTrue(_is_address_in_network("127.0.0.1", "127.0.0.0/8"))
-        self.assertTrue(_is_address_in_network("127.1.0.1", "127.0.0.0/8"))
-        self.assertFalse(_is_address_in_network("127.1.0.1", "127.0.0.0/24"))
-
-    def test_parse_url(self):
-        p = parse_url("ws://www.example.com/r")
-        self.assertEqual(p[0], "www.example.com")
-        self.assertEqual(p[1], 80)
-        self.assertEqual(p[2], "/r")
-        self.assertEqual(p[3], False)
-
-        p = parse_url("ws://www.example.com/r/")
-        self.assertEqual(p[0], "www.example.com")
-        self.assertEqual(p[1], 80)
-        self.assertEqual(p[2], "/r/")
-        self.assertEqual(p[3], False)
-
-        p = parse_url("ws://www.example.com/")
-        self.assertEqual(p[0], "www.example.com")
-        self.assertEqual(p[1], 80)
-        self.assertEqual(p[2], "/")
-        self.assertEqual(p[3], False)
-
-        p = parse_url("ws://www.example.com")
-        self.assertEqual(p[0], "www.example.com")
-        self.assertEqual(p[1], 80)
-        self.assertEqual(p[2], "/")
-        self.assertEqual(p[3], False)
-
-        p = parse_url("ws://www.example.com:8080/r")
-        self.assertEqual(p[0], "www.example.com")
-        self.assertEqual(p[1], 8080)
-        self.assertEqual(p[2], "/r")
-        self.assertEqual(p[3], False)
-
-        p = parse_url("ws://www.example.com:8080/")
-        self.assertEqual(p[0], "www.example.com")
-        self.assertEqual(p[1], 8080)
-        self.assertEqual(p[2], "/")
-        self.assertEqual(p[3], False)
-
-        p = parse_url("ws://www.example.com:8080")
-        self.assertEqual(p[0], "www.example.com")
-        self.assertEqual(p[1], 8080)
-        self.assertEqual(p[2], "/")
-        self.assertEqual(p[3], False)
-
-        p = parse_url("wss://www.example.com:8080/r")
-        self.assertEqual(p[0], "www.example.com")
-        self.assertEqual(p[1], 8080)
-        self.assertEqual(p[2], "/r")
-        self.assertEqual(p[3], True)
-
-        p = parse_url("wss://www.example.com:8080/r?key=value")
-        self.assertEqual(p[0], "www.example.com")
-        self.assertEqual(p[1], 8080)
-        self.assertEqual(p[2], "/r?key=value")
-        self.assertEqual(p[3], True)
-
-        self.assertRaises(ValueError, parse_url, "http://www.example.com/r")
-
-        p = parse_url("ws://[2a03:4000:123:83::3]/r")
-        self.assertEqual(p[0], "2a03:4000:123:83::3")
-        self.assertEqual(p[1], 80)
-        self.assertEqual(p[2], "/r")
-        self.assertEqual(p[3], False)
-
-        p = parse_url("ws://[2a03:4000:123:83::3]:8080/r")
-        self.assertEqual(p[0], "2a03:4000:123:83::3")
-        self.assertEqual(p[1], 8080)
-        self.assertEqual(p[2], "/r")
-        self.assertEqual(p[3], False)
-
-        p = parse_url("wss://[2a03:4000:123:83::3]/r")
-        self.assertEqual(p[0], "2a03:4000:123:83::3")
-        self.assertEqual(p[1], 443)
-        self.assertEqual(p[2], "/r")
-        self.assertEqual(p[3], True)
-
-        p = parse_url("wss://[2a03:4000:123:83::3]:8080/r")
-        self.assertEqual(p[0], "2a03:4000:123:83::3")
-        self.assertEqual(p[1], 8080)
-        self.assertEqual(p[2], "/r")
-        self.assertEqual(p[3], True)
-
-
-class IsNoProxyHostTest(unittest.TestCase):
-    def setUp(self):
-        self.no_proxy = os.environ.get("no_proxy", None)
-        if "no_proxy" in os.environ:
-            del os.environ["no_proxy"]
-
-    def tearDown(self):
-        if self.no_proxy:
-            os.environ["no_proxy"] = self.no_proxy
-        elif "no_proxy" in os.environ:
-            del os.environ["no_proxy"]
-
-    def test_match_all(self):
-        self.assertTrue(_is_no_proxy_host("any.websocket.org", ["*"]))
-        self.assertTrue(_is_no_proxy_host("192.168.0.1", ["*"]))
-        self.assertFalse(_is_no_proxy_host("192.168.0.1", ["192.168.1.1"]))
-        self.assertFalse(
-            _is_no_proxy_host("any.websocket.org", ["other.websocket.org"])
-        )
-        self.assertTrue(
-            _is_no_proxy_host("any.websocket.org", ["other.websocket.org", "*"])
-        )
-        os.environ["no_proxy"] = "*"
-        self.assertTrue(_is_no_proxy_host("any.websocket.org", None))
-        self.assertTrue(_is_no_proxy_host("192.168.0.1", None))
-        os.environ["no_proxy"] = "other.websocket.org, *"
-        self.assertTrue(_is_no_proxy_host("any.websocket.org", None))
-
-    def test_ip_address(self):
-        self.assertTrue(_is_no_proxy_host("127.0.0.1", ["127.0.0.1"]))
-        self.assertFalse(_is_no_proxy_host("127.0.0.2", ["127.0.0.1"]))
-        self.assertTrue(
-            _is_no_proxy_host("127.0.0.1", ["other.websocket.org", "127.0.0.1"])
-        )
-        self.assertFalse(
-            _is_no_proxy_host("127.0.0.2", ["other.websocket.org", "127.0.0.1"])
-        )
-        os.environ["no_proxy"] = "127.0.0.1"
-        self.assertTrue(_is_no_proxy_host("127.0.0.1", None))
-        self.assertFalse(_is_no_proxy_host("127.0.0.2", None))
-        os.environ["no_proxy"] = "other.websocket.org, 127.0.0.1"
-        self.assertTrue(_is_no_proxy_host("127.0.0.1", None))
-        self.assertFalse(_is_no_proxy_host("127.0.0.2", None))
-
-    def test_ip_address_in_range(self):
-        self.assertTrue(_is_no_proxy_host("127.0.0.1", ["127.0.0.0/8"]))
-        self.assertTrue(_is_no_proxy_host("127.0.0.2", ["127.0.0.0/8"]))
-        self.assertFalse(_is_no_proxy_host("127.1.0.1", ["127.0.0.0/24"]))
-        os.environ["no_proxy"] = "127.0.0.0/8"
-        self.assertTrue(_is_no_proxy_host("127.0.0.1", None))
-        self.assertTrue(_is_no_proxy_host("127.0.0.2", None))
-        os.environ["no_proxy"] = "127.0.0.0/24"
-        self.assertFalse(_is_no_proxy_host("127.1.0.1", None))
-
-    def test_hostname_match(self):
-        self.assertTrue(_is_no_proxy_host("my.websocket.org", ["my.websocket.org"]))
-        self.assertTrue(
-            _is_no_proxy_host(
-                "my.websocket.org", ["other.websocket.org", "my.websocket.org"]
-            )
-        )
-        self.assertFalse(_is_no_proxy_host("my.websocket.org", ["other.websocket.org"]))
-        os.environ["no_proxy"] = "my.websocket.org"
-        self.assertTrue(_is_no_proxy_host("my.websocket.org", None))
-        self.assertFalse(_is_no_proxy_host("other.websocket.org", None))
-        os.environ["no_proxy"] = "other.websocket.org, my.websocket.org"
-        self.assertTrue(_is_no_proxy_host("my.websocket.org", None))
-
-    def test_hostname_match_domain(self):
-        self.assertTrue(_is_no_proxy_host("any.websocket.org", [".websocket.org"]))
-        self.assertTrue(_is_no_proxy_host("my.other.websocket.org", [".websocket.org"]))
-        self.assertTrue(
-            _is_no_proxy_host(
-                "any.websocket.org", ["my.websocket.org", ".websocket.org"]
-            )
-        )
-        self.assertFalse(_is_no_proxy_host("any.websocket.com", [".websocket.org"]))
-        os.environ["no_proxy"] = ".websocket.org"
-        self.assertTrue(_is_no_proxy_host("any.websocket.org", None))
-        self.assertTrue(_is_no_proxy_host("my.other.websocket.org", None))
-        self.assertFalse(_is_no_proxy_host("any.websocket.com", None))
-        os.environ["no_proxy"] = "my.websocket.org, .websocket.org"
-        self.assertTrue(_is_no_proxy_host("any.websocket.org", None))
-
-
-class ProxyInfoTest(unittest.TestCase):
-    def setUp(self):
-        self.http_proxy = os.environ.get("http_proxy", None)
-        self.https_proxy = os.environ.get("https_proxy", None)
-        self.no_proxy = os.environ.get("no_proxy", None)
-        if "http_proxy" in os.environ:
-            del os.environ["http_proxy"]
-        if "https_proxy" in os.environ:
-            del os.environ["https_proxy"]
-        if "no_proxy" in os.environ:
-            del os.environ["no_proxy"]
-
-    def tearDown(self):
-        if self.http_proxy:
-            os.environ["http_proxy"] = self.http_proxy
-        elif "http_proxy" in os.environ:
-            del os.environ["http_proxy"]
-
-        if self.https_proxy:
-            os.environ["https_proxy"] = self.https_proxy
-        elif "https_proxy" in os.environ:
-            del os.environ["https_proxy"]
-
-        if self.no_proxy:
-            os.environ["no_proxy"] = self.no_proxy
-        elif "no_proxy" in os.environ:
-            del os.environ["no_proxy"]
-
-    def test_proxy_from_args(self):
-        self.assertRaises(
-            WebSocketProxyException,
-            get_proxy_info,
-            "echo.websocket.events",
-            False,
-            proxy_host="localhost",
-        )
-        self.assertEqual(
-            get_proxy_info(
-                "echo.websocket.events", False, proxy_host="localhost", proxy_port=3128
-            ),
-            ("localhost", 3128, None),
-        )
-        self.assertEqual(
-            get_proxy_info(
-                "echo.websocket.events", True, proxy_host="localhost", proxy_port=3128
-            ),
-            ("localhost", 3128, None),
-        )
-
-        self.assertEqual(
-            get_proxy_info(
-                "echo.websocket.events",
-                False,
-                proxy_host="localhost",
-                proxy_port=9001,
-                proxy_auth=("a", "b"),
-            ),
-            ("localhost", 9001, ("a", "b")),
-        )
-        self.assertEqual(
-            get_proxy_info(
-                "echo.websocket.events",
-                False,
-                proxy_host="localhost",
-                proxy_port=3128,
-                proxy_auth=("a", "b"),
-            ),
-            ("localhost", 3128, ("a", "b")),
-        )
-        self.assertEqual(
-            get_proxy_info(
-                "echo.websocket.events",
-                True,
-                proxy_host="localhost",
-                proxy_port=8765,
-                proxy_auth=("a", "b"),
-            ),
-            ("localhost", 8765, ("a", "b")),
-        )
-        self.assertEqual(
-            get_proxy_info(
-                "echo.websocket.events",
-                True,
-                proxy_host="localhost",
-                proxy_port=3128,
-                proxy_auth=("a", "b"),
-            ),
-            ("localhost", 3128, ("a", "b")),
-        )
-
-        self.assertEqual(
-            get_proxy_info(
-                "echo.websocket.events",
-                True,
-                proxy_host="localhost",
-                proxy_port=3128,
-                no_proxy=["example.com"],
-                proxy_auth=("a", "b"),
-            ),
-            ("localhost", 3128, ("a", "b")),
-        )
-        self.assertEqual(
-            get_proxy_info(
-                "echo.websocket.events",
-                True,
-                proxy_host="localhost",
-                proxy_port=3128,
-                no_proxy=["echo.websocket.events"],
-                proxy_auth=("a", "b"),
-            ),
-            (None, 0, None),
-        )
-
-        self.assertEqual(
-            get_proxy_info(
-                "echo.websocket.events",
-                True,
-                proxy_host="localhost",
-                proxy_port=3128,
-                no_proxy=[".websocket.events"],
-            ),
-            (None, 0, None),
-        )
-
-    def test_proxy_from_env(self):
-        os.environ["http_proxy"] = "http://localhost/"
-        self.assertEqual(
-            get_proxy_info("echo.websocket.events", False), ("localhost", None, None)
-        )
-        os.environ["http_proxy"] = "http://localhost:3128/"
-        self.assertEqual(
-            get_proxy_info("echo.websocket.events", False), ("localhost", 3128, None)
-        )
-
-        os.environ["http_proxy"] = "http://localhost/"
-        os.environ["https_proxy"] = "http://localhost2/"
-        self.assertEqual(
-            get_proxy_info("echo.websocket.events", False), ("localhost", None, None)
-        )
-        os.environ["http_proxy"] = "http://localhost:3128/"
-        os.environ["https_proxy"] = "http://localhost2:3128/"
-        self.assertEqual(
-            get_proxy_info("echo.websocket.events", False), ("localhost", 3128, None)
-        )
-
-        os.environ["http_proxy"] = "http://localhost/"
-        os.environ["https_proxy"] = "http://localhost2/"
-        self.assertEqual(
-            get_proxy_info("echo.websocket.events", True), ("localhost2", None, None)
-        )
-        os.environ["http_proxy"] = "http://localhost:3128/"
-        os.environ["https_proxy"] = "http://localhost2:3128/"
-        self.assertEqual(
-            get_proxy_info("echo.websocket.events", True), ("localhost2", 3128, None)
-        )
-
-        os.environ["http_proxy"] = ""
-        os.environ["https_proxy"] = "http://localhost2/"
-        self.assertEqual(
-            get_proxy_info("echo.websocket.events", True), ("localhost2", None, None)
-        )
-        self.assertEqual(
-            get_proxy_info("echo.websocket.events", False), (None, 0, None)
-        )
-        os.environ["http_proxy"] = ""
-        os.environ["https_proxy"] = "http://localhost2:3128/"
-        self.assertEqual(
-            get_proxy_info("echo.websocket.events", True), ("localhost2", 3128, None)
-        )
-        self.assertEqual(
-            get_proxy_info("echo.websocket.events", False), (None, 0, None)
-        )
-
-        os.environ["http_proxy"] = "http://localhost/"
-        os.environ["https_proxy"] = ""
-        self.assertEqual(get_proxy_info("echo.websocket.events", True), (None, 0, None))
-        self.assertEqual(
-            get_proxy_info("echo.websocket.events", False), ("localhost", None, None)
-        )
-        os.environ["http_proxy"] = "http://localhost:3128/"
-        os.environ["https_proxy"] = ""
-        self.assertEqual(get_proxy_info("echo.websocket.events", True), (None, 0, None))
-        self.assertEqual(
-            get_proxy_info("echo.websocket.events", False), ("localhost", 3128, None)
-        )
-
-        os.environ["http_proxy"] = "http://a:b@localhost/"
-        self.assertEqual(
-            get_proxy_info("echo.websocket.events", False),
-            ("localhost", None, ("a", "b")),
-        )
-        os.environ["http_proxy"] = "http://a:b@localhost:3128/"
-        self.assertEqual(
-            get_proxy_info("echo.websocket.events", False),
-            ("localhost", 3128, ("a", "b")),
-        )
-
-        os.environ["http_proxy"] = "http://a:b@localhost/"
-        os.environ["https_proxy"] = "http://a:b@localhost2/"
-        self.assertEqual(
-            get_proxy_info("echo.websocket.events", False),
-            ("localhost", None, ("a", "b")),
-        )
-        os.environ["http_proxy"] = "http://a:b@localhost:3128/"
-        os.environ["https_proxy"] = "http://a:b@localhost2:3128/"
-        self.assertEqual(
-            get_proxy_info("echo.websocket.events", False),
-            ("localhost", 3128, ("a", "b")),
-        )
-
-        os.environ["http_proxy"] = "http://a:b@localhost/"
-        os.environ["https_proxy"] = "http://a:b@localhost2/"
-        self.assertEqual(
-            get_proxy_info("echo.websocket.events", True),
-            ("localhost2", None, ("a", "b")),
-        )
-        os.environ["http_proxy"] = "http://a:b@localhost:3128/"
-        os.environ["https_proxy"] = "http://a:b@localhost2:3128/"
-        self.assertEqual(
-            get_proxy_info("echo.websocket.events", True),
-            ("localhost2", 3128, ("a", "b")),
-        )
-
-        os.environ[
-            "http_proxy"
-        ] = "http://john%40example.com:P%40SSWORD@localhost:3128/"
-        os.environ[
-            "https_proxy"
-        ] = "http://john%40example.com:P%40SSWORD@localhost2:3128/"
-        self.assertEqual(
-            get_proxy_info("echo.websocket.events", True),
-            ("localhost2", 3128, ("john@example.com", "P@SSWORD")),
-        )
-
-        os.environ["http_proxy"] = "http://a:b@localhost/"
-        os.environ["https_proxy"] = "http://a:b@localhost2/"
-        os.environ["no_proxy"] = "example1.com,example2.com"
-        self.assertEqual(
-            get_proxy_info("example.1.com", True), ("localhost2", None, ("a", "b"))
-        )
-        os.environ["http_proxy"] = "http://a:b@localhost:3128/"
-        os.environ["https_proxy"] = "http://a:b@localhost2:3128/"
-        os.environ["no_proxy"] = "example1.com,example2.com, echo.websocket.events"
-        self.assertEqual(get_proxy_info("echo.websocket.events", True), (None, 0, None))
-        os.environ["http_proxy"] = "http://a:b@localhost:3128/"
-        os.environ["https_proxy"] = "http://a:b@localhost2:3128/"
-        os.environ["no_proxy"] = "example1.com,example2.com, .websocket.events"
-        self.assertEqual(get_proxy_info("echo.websocket.events", True), (None, 0, None))
-
-        os.environ["http_proxy"] = "http://a:b@localhost:3128/"
-        os.environ["https_proxy"] = "http://a:b@localhost2:3128/"
-        os.environ["no_proxy"] = "127.0.0.0/8, 192.168.0.0/16"
-        self.assertEqual(get_proxy_info("127.0.0.1", False), (None, 0, None))
-        self.assertEqual(get_proxy_info("192.168.1.1", False), (None, 0, None))
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/lib/websocket/tests/test_websocket.py b/lib/websocket/tests/test_websocket.py
index a1d7ad5b..6accaefd 100644
--- a/lib/websocket/tests/test_websocket.py
+++ b/lib/websocket/tests/test_websocket.py
@@ -1,58 +1,56 @@
 # -*- coding: utf-8 -*-
 #
+
+import six
+import sys
+sys.path[0:0] = [""]
+
 import os
 import os.path
+import base64
 import socket
-import unittest
-from base64 import decodebytes as base64decode
-
-import websocket as ws
-from websocket._exceptions import WebSocketBadStatusException, WebSocketAddressException
-from websocket._handshake import _create_sec_websocket_key
-from websocket._handshake import _validate as _validate_header
-from websocket._http import read_headers
-from websocket._utils import validate_utf8
-
-"""
-test_websocket.py
-websocket - WebSocket client library for Python
-
-Copyright 2024 engn33r
-
-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.
-"""
-
 try:
-    import ssl
+    from ssl import SSLError
 except ImportError:
     # dummy class of SSLError for ssl none-support environment.
     class SSLError(Exception):
         pass
 
+if sys.version_info[0] == 2 and sys.version_info[1] < 7:
+    import unittest2 as unittest
+else:
+    import unittest
 
-# Skip test to access the internet unless TEST_WITH_INTERNET == 1
-TEST_WITH_INTERNET = os.environ.get("TEST_WITH_INTERNET", "0") == "1"
-# Skip tests relying on local websockets server unless LOCAL_WS_SERVER_PORT != -1
-LOCAL_WS_SERVER_PORT = os.environ.get("LOCAL_WS_SERVER_PORT", "-1")
-TEST_WITH_LOCAL_SERVER = LOCAL_WS_SERVER_PORT != "-1"
-TRACEABLE = True
+import uuid
+
+if six.PY3:
+    from base64 import decodebytes as base64decode
+else:
+    from base64 import decodestring as base64decode
 
 
-def create_mask_key(_):
+# websocket-client
+import websocket as ws
+from websocket._handshake import _create_sec_websocket_key
+from websocket._url import parse_url, get_proxy_info
+from websocket._utils import validate_utf8
+from websocket._handshake import _validate as _validate_header
+from websocket._http import read_headers
+
+
+# Skip test to access the internet.
+TEST_WITH_INTERNET = os.environ.get('TEST_WITH_INTERNET', '0') == '1'
+
+# Skip Secure WebSocket test.
+TEST_SECURE_WS = True
+TRACABLE = False
+
+
+def create_mask_key(n):
     return "abcd"
 
 
-class SockMock:
+class SockMock(object):
     def __init__(self):
         self.data = []
         self.sent = []
@@ -60,9 +58,6 @@ class SockMock:
     def add_packet(self, data):
         self.data.append(data)
 
-    def gettimeout(self):
-        return None
-
     def recv(self, bufsize):
         if self.data:
             e = self.data.pop(0)
@@ -81,6 +76,7 @@ class SockMock:
 
 
 class HeaderSockMock(SockMock):
+
     def __init__(self, fname):
         SockMock.__init__(self)
         path = os.path.join(os.path.dirname(__file__), fname)
@@ -90,35 +86,113 @@ class HeaderSockMock(SockMock):
 
 class WebSocketTest(unittest.TestCase):
     def setUp(self):
-        ws.enableTrace(TRACEABLE)
+        ws.enableTrace(TRACABLE)
 
     def tearDown(self):
         pass
 
-    def test_default_timeout(self):
+    def testDefaultTimeout(self):
         self.assertEqual(ws.getdefaulttimeout(), None)
         ws.setdefaulttimeout(10)
         self.assertEqual(ws.getdefaulttimeout(), 10)
         ws.setdefaulttimeout(None)
 
-    def test_ws_key(self):
+    def testParseUrl(self):
+        p = parse_url("ws://www.example.com/r")
+        self.assertEqual(p[0], "www.example.com")
+        self.assertEqual(p[1], 80)
+        self.assertEqual(p[2], "/r")
+        self.assertEqual(p[3], False)
+
+        p = parse_url("ws://www.example.com/r/")
+        self.assertEqual(p[0], "www.example.com")
+        self.assertEqual(p[1], 80)
+        self.assertEqual(p[2], "/r/")
+        self.assertEqual(p[3], False)
+
+        p = parse_url("ws://www.example.com/")
+        self.assertEqual(p[0], "www.example.com")
+        self.assertEqual(p[1], 80)
+        self.assertEqual(p[2], "/")
+        self.assertEqual(p[3], False)
+
+        p = parse_url("ws://www.example.com")
+        self.assertEqual(p[0], "www.example.com")
+        self.assertEqual(p[1], 80)
+        self.assertEqual(p[2], "/")
+        self.assertEqual(p[3], False)
+
+        p = parse_url("ws://www.example.com:8080/r")
+        self.assertEqual(p[0], "www.example.com")
+        self.assertEqual(p[1], 8080)
+        self.assertEqual(p[2], "/r")
+        self.assertEqual(p[3], False)
+
+        p = parse_url("ws://www.example.com:8080/")
+        self.assertEqual(p[0], "www.example.com")
+        self.assertEqual(p[1], 8080)
+        self.assertEqual(p[2], "/")
+        self.assertEqual(p[3], False)
+
+        p = parse_url("ws://www.example.com:8080")
+        self.assertEqual(p[0], "www.example.com")
+        self.assertEqual(p[1], 8080)
+        self.assertEqual(p[2], "/")
+        self.assertEqual(p[3], False)
+
+        p = parse_url("wss://www.example.com:8080/r")
+        self.assertEqual(p[0], "www.example.com")
+        self.assertEqual(p[1], 8080)
+        self.assertEqual(p[2], "/r")
+        self.assertEqual(p[3], True)
+
+        p = parse_url("wss://www.example.com:8080/r?key=value")
+        self.assertEqual(p[0], "www.example.com")
+        self.assertEqual(p[1], 8080)
+        self.assertEqual(p[2], "/r?key=value")
+        self.assertEqual(p[3], True)
+
+        self.assertRaises(ValueError, parse_url, "http://www.example.com/r")
+
+        if sys.version_info[0] == 2 and sys.version_info[1] < 7:
+            return
+
+        p = parse_url("ws://[2a03:4000:123:83::3]/r")
+        self.assertEqual(p[0], "2a03:4000:123:83::3")
+        self.assertEqual(p[1], 80)
+        self.assertEqual(p[2], "/r")
+        self.assertEqual(p[3], False)
+
+        p = parse_url("ws://[2a03:4000:123:83::3]:8080/r")
+        self.assertEqual(p[0], "2a03:4000:123:83::3")
+        self.assertEqual(p[1], 8080)
+        self.assertEqual(p[2], "/r")
+        self.assertEqual(p[3], False)
+
+        p = parse_url("wss://[2a03:4000:123:83::3]/r")
+        self.assertEqual(p[0], "2a03:4000:123:83::3")
+        self.assertEqual(p[1], 443)
+        self.assertEqual(p[2], "/r")
+        self.assertEqual(p[3], True)
+
+        p = parse_url("wss://[2a03:4000:123:83::3]:8080/r")
+        self.assertEqual(p[0], "2a03:4000:123:83::3")
+        self.assertEqual(p[1], 8080)
+        self.assertEqual(p[2], "/r")
+        self.assertEqual(p[3], True)
+
+    def testWSKey(self):
         key = _create_sec_websocket_key()
         self.assertTrue(key != 24)
-        self.assertTrue("Â¥n" not in key)
+        self.assertTrue(six.u("Â¥n") not in key)
 
-    def test_nonce(self):
-        """WebSocket key should be a random 16-byte nonce."""
-        key = _create_sec_websocket_key()
-        nonce = base64decode(key.encode("utf-8"))
-        self.assertEqual(16, len(nonce))
-
-    def test_ws_utils(self):
+    def testWsUtils(self):
         key = "c6b8hTg4EeGb2gQMztV1/g=="
         required_header = {
             "upgrade": "websocket",
             "connection": "upgrade",
             "sec-websocket-accept": "Kxep+hNu9n51529fGidYu7a3wO0=",
-        }
+            }
         self.assertEqual(_validate_header(required_header, key, None), (True, None))
 
         header = required_header.copy()
@@ -141,150 +215,133 @@ class WebSocketTest(unittest.TestCase):
 
         header = required_header.copy()
         header["sec-websocket-protocol"] = "sub1"
-        self.assertEqual(
-            _validate_header(header, key, ["sub1", "sub2"]), (True, "sub1")
-        )
-        # This case will print out a logging error using the error() function, but that is expected
+        self.assertEqual(_validate_header(header, key, ["sub1", "sub2"]), (True, "sub1"))
         self.assertEqual(_validate_header(header, key, ["sub2", "sub3"]), (False, None))
 
         header = required_header.copy()
         header["sec-websocket-protocol"] = "sUb1"
-        self.assertEqual(
-            _validate_header(header, key, ["Sub1", "suB2"]), (True, "sub1")
-        )
+        self.assertEqual(_validate_header(header, key, ["Sub1", "suB2"]), (True, "sub1"))
 
-        header = required_header.copy()
-        # This case will print out a logging error using the error() function, but that is expected
-        self.assertEqual(_validate_header(header, key, ["Sub1", "suB2"]), (False, None))
 
-    def test_read_header(self):
-        status, header, _ = read_headers(HeaderSockMock("data/header01.txt"))
+    def testReadHeader(self):
+        status, header = read_headers(HeaderSockMock("data/header01.txt"))
         self.assertEqual(status, 101)
-        self.assertEqual(header["connection"], "Upgrade")
-
-        status, header, _ = read_headers(HeaderSockMock("data/header03.txt"))
-        self.assertEqual(status, 101)
-        self.assertEqual(header["connection"], "Upgrade, Keep-Alive")
+        self.assertEqual(header["connection"], "upgrade")
 
         HeaderSockMock("data/header02.txt")
-        self.assertRaises(
-            ws.WebSocketException, read_headers, HeaderSockMock("data/header02.txt")
-        )
+        self.assertRaises(ws.WebSocketException, read_headers, HeaderSockMock("data/header02.txt"))
 
-    def test_send(self):
+    def testSend(self):
         # TODO: add longer frame data
         sock = ws.WebSocket()
         sock.set_mask_key(create_mask_key)
         s = sock.sock = HeaderSockMock("data/header01.txt")
         sock.send("Hello")
-        self.assertEqual(s.sent[0], b"\x81\x85abcd)\x07\x0f\x08\x0e")
+        self.assertEqual(s.sent[0], six.b("\x81\x85abcd)\x07\x0f\x08\x0e"))
 
         sock.send("�ん���")
-        self.assertEqual(
-            s.sent[1],
-            b"\x81\x8fabcd\x82\xe3\xf0\x87\xe3\xf1\x80\xe5\xca\x81\xe2\xc5\x82\xe3\xcc",
-        )
+        self.assertEqual(s.sent[1], six.b("\x81\x8fabcd\x82\xe3\xf0\x87\xe3\xf1\x80\xe5\xca\x81\xe2\xc5\x82\xe3\xcc"))
 
-        #        sock.send("x" * 5000)
-        #        self.assertEqual(s.sent[1], b'\x81\x8fabcd\x82\xe3\xf0\x87\xe3\xf1\x80\xe5\xca\x81\xe2\xc5\x82\xe3\xcc")
+        sock.send(u"�ん���")
+        self.assertEqual(s.sent[1], six.b("\x81\x8fabcd\x82\xe3\xf0\x87\xe3\xf1\x80\xe5\xca\x81\xe2\xc5\x82\xe3\xcc"))
 
-        self.assertEqual(sock.send_binary(b"1111111111101"), 19)
+        sock.send("x" * 127)
 
-    def test_recv(self):
+    def testRecv(self):
         # TODO: add longer frame data
         sock = ws.WebSocket()
         s = sock.sock = SockMock()
-        something = (
-            b"\x81\x8fabcd\x82\xe3\xf0\x87\xe3\xf1\x80\xe5\xca\x81\xe2\xc5\x82\xe3\xcc"
-        )
+        something = six.b("\x81\x8fabcd\x82\xe3\xf0\x87\xe3\xf1\x80\xe5\xca\x81\xe2\xc5\x82\xe3\xcc")
         s.add_packet(something)
         data = sock.recv()
         self.assertEqual(data, "�ん���")
 
-        s.add_packet(b"\x81\x85abcd)\x07\x0f\x08\x0e")
+        s.add_packet(six.b("\x81\x85abcd)\x07\x0f\x08\x0e"))
         data = sock.recv()
         self.assertEqual(data, "Hello")
 
     @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def test_iter(self):
+    def testIter(self):
         count = 2
-        s = ws.create_connection("wss://api.bitfinex.com/ws/2")
-        s.send('{"event": "subscribe", "channel": "ticker"}')
-        for _ in s:
+        for rsvp in ws.create_connection('ws://stream.meetup.com/2/rsvps'):
             count -= 1
             if count == 0:
                 break
 
     @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def test_next(self):
-        sock = ws.create_connection("wss://api.bitfinex.com/ws/2")
+    def testNext(self):
+        sock = ws.create_connection('ws://stream.meetup.com/2/rsvps')
         self.assertEqual(str, type(next(sock)))
 
-    def test_internal_recv_strict(self):
+    def testInternalRecvStrict(self):
         sock = ws.WebSocket()
         s = sock.sock = SockMock()
-        s.add_packet(b"foo")
+        s.add_packet(six.b("foo"))
         s.add_packet(socket.timeout())
-        s.add_packet(b"bar")
+        s.add_packet(six.b("bar"))
         # s.add_packet(SSLError("The read operation timed out"))
-        s.add_packet(b"baz")
+        s.add_packet(six.b("baz"))
         with self.assertRaises(ws.WebSocketTimeoutException):
-            sock.frame_buffer.recv_strict(9)
+            data = sock.frame_buffer.recv_strict(9)
+        # if six.PY2:
+        #     with self.assertRaises(ws.WebSocketTimeoutException):
+        #         data = sock._recv_strict(9)
+        # else:
         #     with self.assertRaises(SSLError):
         #         data = sock._recv_strict(9)
         data = sock.frame_buffer.recv_strict(9)
-        self.assertEqual(data, b"foobarbaz")
+        self.assertEqual(data, six.b("foobarbaz"))
         with self.assertRaises(ws.WebSocketConnectionClosedException):
-            sock.frame_buffer.recv_strict(1)
+            data = sock.frame_buffer.recv_strict(1)
 
-    def test_recv_timeout(self):
+    def testRecvTimeout(self):
         sock = ws.WebSocket()
         s = sock.sock = SockMock()
-        s.add_packet(b"\x81")
+        s.add_packet(six.b("\x81"))
         s.add_packet(socket.timeout())
-        s.add_packet(b"\x8dabcd\x29\x07\x0f\x08\x0e")
+        s.add_packet(six.b("\x8dabcd\x29\x07\x0f\x08\x0e"))
         s.add_packet(socket.timeout())
-        s.add_packet(b"\x4e\x43\x33\x0e\x10\x0f\x00\x40")
+        s.add_packet(six.b("\x4e\x43\x33\x0e\x10\x0f\x00\x40"))
         with self.assertRaises(ws.WebSocketTimeoutException):
-            sock.recv()
+            data = sock.recv()
         with self.assertRaises(ws.WebSocketTimeoutException):
-            sock.recv()
+            data = sock.recv()
         data = sock.recv()
         self.assertEqual(data, "Hello, World!")
         with self.assertRaises(ws.WebSocketConnectionClosedException):
-            sock.recv()
+            data = sock.recv()
 
-    def test_recv_with_simple_fragmentation(self):
+    def testRecvWithSimpleFragmentation(self):
         sock = ws.WebSocket()
         s = sock.sock = SockMock()
         # OPCODE=TEXT, FIN=0, MSG="Brevity is "
-        s.add_packet(b"\x01\x8babcd#\x10\x06\x12\x08\x16\x1aD\x08\x11C")
+        s.add_packet(six.b("\x01\x8babcd#\x10\x06\x12\x08\x16\x1aD\x08\x11C"))
         # OPCODE=CONT, FIN=1, MSG="the soul of wit"
-        s.add_packet(b"\x80\x8fabcd\x15\n\x06D\x12\r\x16\x08A\r\x05D\x16\x0b\x17")
+        s.add_packet(six.b("\x80\x8fabcd\x15\n\x06D\x12\r\x16\x08A\r\x05D\x16\x0b\x17"))
         data = sock.recv()
         self.assertEqual(data, "Brevity is the soul of wit")
         with self.assertRaises(ws.WebSocketConnectionClosedException):
             sock.recv()
 
-    def test_recv_with_fire_event_of_fragmentation(self):
+    def testRecvWithFireEventOfFragmentation(self):
         sock = ws.WebSocket(fire_cont_frame=True)
         s = sock.sock = SockMock()
         # OPCODE=TEXT, FIN=0, MSG="Brevity is "
-        s.add_packet(b"\x01\x8babcd#\x10\x06\x12\x08\x16\x1aD\x08\x11C")
+        s.add_packet(six.b("\x01\x8babcd#\x10\x06\x12\x08\x16\x1aD\x08\x11C"))
         # OPCODE=CONT, FIN=0, MSG="Brevity is "
-        s.add_packet(b"\x00\x8babcd#\x10\x06\x12\x08\x16\x1aD\x08\x11C")
+        s.add_packet(six.b("\x00\x8babcd#\x10\x06\x12\x08\x16\x1aD\x08\x11C"))
         # OPCODE=CONT, FIN=1, MSG="the soul of wit"
-        s.add_packet(b"\x80\x8fabcd\x15\n\x06D\x12\r\x16\x08A\r\x05D\x16\x0b\x17")
+        s.add_packet(six.b("\x80\x8fabcd\x15\n\x06D\x12\r\x16\x08A\r\x05D\x16\x0b\x17"))
 
         _, data = sock.recv_data()
-        self.assertEqual(data, b"Brevity is ")
+        self.assertEqual(data, six.b("Brevity is "))
         _, data = sock.recv_data()
-        self.assertEqual(data, b"Brevity is ")
+        self.assertEqual(data, six.b("Brevity is "))
         _, data = sock.recv_data()
-        self.assertEqual(data, b"the soul of wit")
+        self.assertEqual(data, six.b("the soul of wit"))
 
         # OPCODE=CONT, FIN=0, MSG="Brevity is "
-        s.add_packet(b"\x80\x8babcd#\x10\x06\x12\x08\x16\x1aD\x08\x11C")
+        s.add_packet(six.b("\x80\x8babcd#\x10\x06\x12\x08\x16\x1aD\x08\x11C"))
 
         with self.assertRaises(ws.WebSocketException):
             sock.recv_data()
@@ -292,205 +349,311 @@ class WebSocketTest(unittest.TestCase):
         with self.assertRaises(ws.WebSocketConnectionClosedException):
             sock.recv()
 
-    def test_close(self):
+    def testClose(self):
         sock = ws.WebSocket()
+        sock.sock = SockMock()
         sock.connected = True
-        sock.close
+        sock.close()
+        self.assertEqual(sock.connected, False)
 
         sock = ws.WebSocket()
         s = sock.sock = SockMock()
         sock.connected = True
-        s.add_packet(b"\x88\x80\x17\x98p\x84")
+        s.add_packet(six.b('\x88\x80\x17\x98p\x84'))
         sock.recv()
         self.assertEqual(sock.connected, False)
 
-    def test_recv_cont_fragmentation(self):
+    def testRecvContFragmentation(self):
         sock = ws.WebSocket()
         s = sock.sock = SockMock()
         # OPCODE=CONT, FIN=1, MSG="the soul of wit"
-        s.add_packet(b"\x80\x8fabcd\x15\n\x06D\x12\r\x16\x08A\r\x05D\x16\x0b\x17")
+        s.add_packet(six.b("\x80\x8fabcd\x15\n\x06D\x12\r\x16\x08A\r\x05D\x16\x0b\x17"))
         self.assertRaises(ws.WebSocketException, sock.recv)
 
-    def test_recv_with_prolonged_fragmentation(self):
+    def testRecvWithProlongedFragmentation(self):
         sock = ws.WebSocket()
         s = sock.sock = SockMock()
         # OPCODE=TEXT, FIN=0, MSG="Once more unto the breach, "
-        s.add_packet(
-            b"\x01\x9babcd.\x0c\x00\x01A\x0f\x0c\x16\x04B\x16\n\x15\rC\x10\t\x07C\x06\x13\x07\x02\x07\tNC"
-        )
+        s.add_packet(six.b("\x01\x9babcd.\x0c\x00\x01A\x0f\x0c\x16\x04B\x16\n\x15" \
+                           "\rC\x10\t\x07C\x06\x13\x07\x02\x07\tNC"))
         # OPCODE=CONT, FIN=0, MSG="dear friends, "
-        s.add_packet(b"\x00\x8eabcd\x05\x07\x02\x16A\x04\x11\r\x04\x0c\x07\x17MB")
+        s.add_packet(six.b("\x00\x8eabcd\x05\x07\x02\x16A\x04\x11\r\x04\x0c\x07" \
+                           "\x17MB"))
         # OPCODE=CONT, FIN=1, MSG="once more"
-        s.add_packet(b"\x80\x89abcd\x0e\x0c\x00\x01A\x0f\x0c\x16\x04")
+        s.add_packet(six.b("\x80\x89abcd\x0e\x0c\x00\x01A\x0f\x0c\x16\x04"))
         data = sock.recv()
-        self.assertEqual(data, "Once more unto the breach, dear friends, once more")
+        self.assertEqual(
+            data,
+            "Once more unto the breach, dear friends, once more")
         with self.assertRaises(ws.WebSocketConnectionClosedException):
             sock.recv()
 
-    def test_recv_with_fragmentation_and_control_frame(self):
+    def testRecvWithFragmentationAndControlFrame(self):
         sock = ws.WebSocket()
         sock.set_mask_key(create_mask_key)
         s = sock.sock = SockMock()
         # OPCODE=TEXT, FIN=0, MSG="Too much "
-        s.add_packet(b"\x01\x89abcd5\r\x0cD\x0c\x17\x00\x0cA")
+        s.add_packet(six.b("\x01\x89abcd5\r\x0cD\x0c\x17\x00\x0cA"))
         # OPCODE=PING, FIN=1, MSG="Please PONG this"
-        s.add_packet(b"\x89\x90abcd1\x0e\x06\x05\x12\x07C4.,$D\x15\n\n\x17")
+        s.add_packet(six.b("\x89\x90abcd1\x0e\x06\x05\x12\x07C4.,$D\x15\n\n\x17"))
         # OPCODE=CONT, FIN=1, MSG="of a good thing"
-        s.add_packet(b"\x80\x8fabcd\x0e\x04C\x05A\x05\x0c\x0b\x05B\x17\x0c\x08\x0c\x04")
+        s.add_packet(six.b("\x80\x8fabcd\x0e\x04C\x05A\x05\x0c\x0b\x05B\x17\x0c" \
+                           "\x08\x0c\x04"))
         data = sock.recv()
         self.assertEqual(data, "Too much of a good thing")
         with self.assertRaises(ws.WebSocketConnectionClosedException):
             sock.recv()
         self.assertEqual(
-            s.sent[0], b"\x8a\x90abcd1\x0e\x06\x05\x12\x07C4.,$D\x15\n\n\x17"
-        )
+            s.sent[0],
+            six.b("\x8a\x90abcd1\x0e\x06\x05\x12\x07C4.,$D\x15\n\n\x17"))
 
-    @unittest.skipUnless(
-        TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled"
-    )
-    def test_websocket(self):
-        s = ws.create_connection(f"ws://127.0.0.1:{LOCAL_WS_SERVER_PORT}")
+    @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
+    def testWebSocket(self):
+        s = ws.create_connection("ws://echo.websocket.org/")
         self.assertNotEqual(s, None)
         s.send("Hello, World")
-        result = s.next()
-        s.fileno()
+        result = s.recv()
         self.assertEqual(result, "Hello, World")
 
-        s.send("��ゃ�ゃ���世界")
+        s.send(u"��ゃ�ゃ���世界")
         result = s.recv()
         self.assertEqual(result, "��ゃ�ゃ���世界")
-        self.assertRaises(ValueError, s.send_close, -1, "")
         s.close()
 
-    @unittest.skipUnless(
-        TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled"
-    )
-    def test_ping_pong(self):
-        s = ws.create_connection(f"ws://127.0.0.1:{LOCAL_WS_SERVER_PORT}")
+    @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
+    def testPingPong(self):
+        s = ws.create_connection("ws://echo.websocket.org/")
         self.assertNotEqual(s, None)
         s.ping("Hello")
         s.pong("Hi")
         s.close()
 
     @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def test_support_redirect(self):
-        s = ws.WebSocket()
-        self.assertRaises(WebSocketBadStatusException, s.connect, "ws://google.com/")
-        # Need to find a URL that has a redirect code leading to a websocket
+    @unittest.skipUnless(TEST_SECURE_WS, "wss://echo.websocket.org doesn't work well.")
+    def testSecureWebSocket(self):
+        if 1:
+            import ssl
+            s = ws.create_connection("wss://echo.websocket.org/")
+            self.assertNotEqual(s, None)
+            self.assertTrue(isinstance(s.sock, ssl.SSLSocket))
+            s.send("Hello, World")
+            result = s.recv()
+            self.assertEqual(result, "Hello, World")
+            s.send(u"��ゃ�ゃ���世界")
+            result = s.recv()
+            self.assertEqual(result, "��ゃ�ゃ���世界")
+            s.close()
+        #except:
+        #    pass
 
     @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def test_secure_websocket(self):
-        s = ws.create_connection("wss://api.bitfinex.com/ws/2")
+    def testWebSocketWihtCustomHeader(self):
+        s = ws.create_connection("ws://echo.websocket.org/",
+                                 headers={"User-Agent": "PythonWebsocketClient"})
         self.assertNotEqual(s, None)
-        self.assertTrue(isinstance(s.sock, ssl.SSLSocket))
-        self.assertEqual(s.getstatus(), 101)
-        self.assertNotEqual(s.getheaders(), None)
-        s.settimeout(10)
-        self.assertEqual(s.gettimeout(), 10)
-        self.assertEqual(s.getsubprotocol(), None)
-        s.abort()
-
-    @unittest.skipUnless(
-        TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled"
-    )
-    def test_websocket_with_custom_header(self):
-        s = ws.create_connection(
-            f"ws://127.0.0.1:{LOCAL_WS_SERVER_PORT}",
-            headers={"User-Agent": "PythonWebsocketClient"},
-        )
-        self.assertNotEqual(s, None)
-        self.assertEqual(s.getsubprotocol(), None)
         s.send("Hello, World")
         result = s.recv()
         self.assertEqual(result, "Hello, World")
-        self.assertRaises(ValueError, s.close, -1, "")
         s.close()
 
-    @unittest.skipUnless(
-        TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled"
-    )
-    def test_after_close(self):
-        s = ws.create_connection(f"ws://127.0.0.1:{LOCAL_WS_SERVER_PORT}")
+    @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
+    def testAfterClose(self):
+        s = ws.create_connection("ws://echo.websocket.org/")
         self.assertNotEqual(s, None)
         s.close()
         self.assertRaises(ws.WebSocketConnectionClosedException, s.send, "Hello")
         self.assertRaises(ws.WebSocketConnectionClosedException, s.recv)
 
+    def testUUID4(self):
+        """ WebSocket key should be a UUID4.
+        """
+        key = _create_sec_websocket_key()
+        u = uuid.UUID(bytes=base64decode(key.encode("utf-8")))
+        self.assertEqual(4, u.version)
+
+
+class WebSocketAppTest(unittest.TestCase):
+
+    class NotSetYet(object):
+        """ A marker class for signalling that a value hasn't been set yet.
+        """
+
+    def setUp(self):
+        ws.enableTrace(TRACABLE)
+
+        WebSocketAppTest.keep_running_open = WebSocketAppTest.NotSetYet()
+        WebSocketAppTest.keep_running_close = WebSocketAppTest.NotSetYet()
+        WebSocketAppTest.get_mask_key_id = WebSocketAppTest.NotSetYet()
+
+    def tearDown(self):
+        WebSocketAppTest.keep_running_open = WebSocketAppTest.NotSetYet()
+        WebSocketAppTest.keep_running_close = WebSocketAppTest.NotSetYet()
+        WebSocketAppTest.get_mask_key_id = WebSocketAppTest.NotSetYet()
+
+    @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
+    def testKeepRunning(self):
+        """ A WebSocketApp should keep running as long as its self.keep_running
+        is not False (in the boolean context).
+        """
+
+        def on_open(self, *args, **kwargs):
+            """ Set the keep_running flag for later inspection and immediately
+            close the connection.
+            """
+            WebSocketAppTest.keep_running_open = self.keep_running
+
+            self.close()
+
+        def on_close(self, *args, **kwargs):
+            """ Set the keep_running flag for the test to use.
+            """
+            WebSocketAppTest.keep_running_close = self.keep_running
+
+        app = ws.WebSocketApp('ws://echo.websocket.org/', on_open=on_open, on_close=on_close)
+        app.run_forever()
+
+        self.assertFalse(isinstance(WebSocketAppTest.keep_running_open,
+                                    WebSocketAppTest.NotSetYet))
+
+        self.assertFalse(isinstance(WebSocketAppTest.keep_running_close,
+                                    WebSocketAppTest.NotSetYet))
+
+        self.assertEqual(True, WebSocketAppTest.keep_running_open)
+        self.assertEqual(False, WebSocketAppTest.keep_running_close)
+
+    @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
+    def testSockMaskKey(self):
+        """ A WebSocketApp should forward the received mask_key function down
+        to the actual socket.
+        """
+
+        def my_mask_key_func():
+            pass
+
+        def on_open(self, *args, **kwargs):
+            """ Set the value so the test can use it later on and immediately
+            close the connection.
+            """
+            WebSocketAppTest.get_mask_key_id = id(self.get_mask_key)
+            self.close()
+
+        app = ws.WebSocketApp('ws://echo.websocket.org/', on_open=on_open, get_mask_key=my_mask_key_func)
+        app.run_forever()
+
+        # Note: We can't use 'is' for comparing the functions directly, need to use 'id'.
+        self.assertEqual(WebSocketAppTest.get_mask_key_id, id(my_mask_key_func))
+
 
 class SockOptTest(unittest.TestCase):
-    @unittest.skipUnless(
-        TEST_WITH_LOCAL_SERVER, "Tests using local websocket server are disabled"
-    )
-    def test_sockopt(self):
+    @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
+    def testSockOpt(self):
         sockopt = ((socket.IPPROTO_TCP, socket.TCP_NODELAY, 1),)
-        s = ws.create_connection(
-            f"ws://127.0.0.1:{LOCAL_WS_SERVER_PORT}", sockopt=sockopt
-        )
-        self.assertNotEqual(
-            s.sock.getsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY), 0
-        )
+        s = ws.create_connection("ws://echo.websocket.org", sockopt=sockopt)
+        self.assertNotEqual(s.sock.getsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY), 0)
         s.close()
 
-
 class UtilsTest(unittest.TestCase):
-    def test_utf8_validator(self):
-        state = validate_utf8(b"\xf0\x90\x80\x80")
+    def testUtf8Validator(self):
+        state = validate_utf8(six.b('\xf0\x90\x80\x80'))
         self.assertEqual(state, True)
-        state = validate_utf8(
-            b"\xce\xba\xe1\xbd\xb9\xcf\x83\xce\xbc\xce\xb5\xed\xa0\x80edited"
-        )
+        state = validate_utf8(six.b('\xce\xba\xe1\xbd\xb9\xcf\x83\xce\xbc\xce\xb5\xed\xa0\x80edited'))
         self.assertEqual(state, False)
-        state = validate_utf8(b"")
+        state = validate_utf8(six.b(''))
         self.assertEqual(state, True)
 
+class ProxyInfoTest(unittest.TestCase):
+    def setUp(self):
+        self.http_proxy = os.environ.get("http_proxy", None)
+        self.https_proxy = os.environ.get("https_proxy", None)
+        if "http_proxy" in os.environ:
+            del os.environ["http_proxy"]
+        if "https_proxy" in os.environ:
+            del os.environ["https_proxy"]
 
-class HandshakeTest(unittest.TestCase):
-    @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def test_http_ssl(self):
-        websock1 = ws.WebSocket(
-            sslopt={"cert_chain": ssl.get_default_verify_paths().capath},
-            enable_multithread=False,
-        )
-        self.assertRaises(ValueError, websock1.connect, "wss://api.bitfinex.com/ws/2")
-        websock2 = ws.WebSocket(sslopt={"certfile": "myNonexistentCertFile"})
-        self.assertRaises(
-            FileNotFoundError, websock2.connect, "wss://api.bitfinex.com/ws/2"
-        )
+    def tearDown(self):
+        if self.http_proxy:
+            os.environ["http_proxy"] = self.http_proxy
+        elif "http_proxy" in os.environ:
+            del os.environ["http_proxy"]
+
+        if self.https_proxy:
+            os.environ["https_proxy"] = self.https_proxy
+        elif "https_proxy" in os.environ:
+            del os.environ["https_proxy"]
+
+
+    def testProxyFromArgs(self):
+        self.assertEqual(get_proxy_info("echo.websocket.org", False, proxy_host="localhost"), ("localhost", 0, None))
+        self.assertEqual(get_proxy_info("echo.websocket.org", False, proxy_host="localhost", proxy_port=3128), ("localhost", 3128, None))
+        self.assertEqual(get_proxy_info("echo.websocket.org", True, proxy_host="localhost"), ("localhost", 0, None))
+        self.assertEqual(get_proxy_info("echo.websocket.org", True, proxy_host="localhost", proxy_port=3128), ("localhost", 3128, None))
+
+        self.assertEqual(get_proxy_info("echo.websocket.org", False, proxy_host="localhost", proxy_auth=("a", "b")),
+            ("localhost", 0, ("a", "b")))
+        self.assertEqual(get_proxy_info("echo.websocket.org", False, proxy_host="localhost", proxy_port=3128, proxy_auth=("a", "b")),
+            ("localhost", 3128, ("a", "b")))
+        self.assertEqual(get_proxy_info("echo.websocket.org", True, proxy_host="localhost", proxy_auth=("a", "b")),
+            ("localhost", 0, ("a", "b")))
+        self.assertEqual(get_proxy_info("echo.websocket.org", True, proxy_host="localhost", proxy_port=3128, proxy_auth=("a", "b")),
+            ("localhost", 3128, ("a", "b")))
+
+        self.assertEqual(get_proxy_info("echo.websocket.org", True, proxy_host="localhost", proxy_port=3128, no_proxy=["example.com"], proxy_auth=("a", "b")),
+            ("localhost", 3128, ("a", "b")))
+        self.assertEqual(get_proxy_info("echo.websocket.org", True, proxy_host="localhost", proxy_port=3128, no_proxy=["echo.websocket.org"], proxy_auth=("a", "b")),
+            (None, 0, None))
+
+
+    def testProxyFromEnv(self):
+        os.environ["http_proxy"] = "http://localhost/"
+        self.assertEqual(get_proxy_info("echo.websocket.org", False), ("localhost", None, None))
+        os.environ["http_proxy"] = "http://localhost:3128/"
+        self.assertEqual(get_proxy_info("echo.websocket.org", False), ("localhost", 3128, None))
+
+        os.environ["http_proxy"] = "http://localhost/"
+        os.environ["https_proxy"] = "http://localhost2/"
+        self.assertEqual(get_proxy_info("echo.websocket.org", False), ("localhost", None, None))
+        os.environ["http_proxy"] = "http://localhost:3128/"
+        os.environ["https_proxy"] = "http://localhost2:3128/"
+        self.assertEqual(get_proxy_info("echo.websocket.org", False), ("localhost", 3128, None))
+
+        os.environ["http_proxy"] = "http://localhost/"
+        os.environ["https_proxy"] = "http://localhost2/"
+        self.assertEqual(get_proxy_info("echo.websocket.org", True), ("localhost2", None, None))
+        os.environ["http_proxy"] = "http://localhost:3128/"
+        os.environ["https_proxy"] = "http://localhost2:3128/"
+        self.assertEqual(get_proxy_info("echo.websocket.org", True), ("localhost2", 3128, None))
+
+
+        os.environ["http_proxy"] = "http://a:b@localhost/"
+        self.assertEqual(get_proxy_info("echo.websocket.org", False), ("localhost", None, ("a", "b")))
+        os.environ["http_proxy"] = "http://a:b@localhost:3128/"
+        self.assertEqual(get_proxy_info("echo.websocket.org", False), ("localhost", 3128, ("a", "b")))
+
+        os.environ["http_proxy"] = "http://a:b@localhost/"
+        os.environ["https_proxy"] = "http://a:b@localhost2/"
+        self.assertEqual(get_proxy_info("echo.websocket.org", False), ("localhost", None, ("a", "b")))
+        os.environ["http_proxy"] = "http://a:b@localhost:3128/"
+        os.environ["https_proxy"] = "http://a:b@localhost2:3128/"
+        self.assertEqual(get_proxy_info("echo.websocket.org", False), ("localhost", 3128, ("a", "b")))
+
+        os.environ["http_proxy"] = "http://a:b@localhost/"
+        os.environ["https_proxy"] = "http://a:b@localhost2/"
+        self.assertEqual(get_proxy_info("echo.websocket.org", True), ("localhost2", None, ("a", "b")))
+        os.environ["http_proxy"] = "http://a:b@localhost:3128/"
+        os.environ["https_proxy"] = "http://a:b@localhost2:3128/"
+        self.assertEqual(get_proxy_info("echo.websocket.org", True), ("localhost2", 3128, ("a", "b")))
+
+        os.environ["http_proxy"] = "http://a:b@localhost/"
+        os.environ["https_proxy"] = "http://a:b@localhost2/"
+        os.environ["no_proxy"] = "example1.com,example2.com"
+        self.assertEqual(get_proxy_info("example.1.com", True), ("localhost2", None, ("a", "b")))
+        os.environ["http_proxy"] = "http://a:b@localhost:3128/"
+        os.environ["https_proxy"] = "http://a:b@localhost2:3128/"
+        os.environ["no_proxy"] = "example1.com,example2.com, echo.websocket.org"
+        self.assertEqual(get_proxy_info("echo.websocket.org", True), (None, 0, None))
 
-    @unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
-    def test_manual_headers(self):
-        websock3 = ws.WebSocket(
-            sslopt={
-                "ca_certs": ssl.get_default_verify_paths().cafile,
-                "ca_cert_path": ssl.get_default_verify_paths().capath,
-            }
-        )
-        self.assertRaises(
-            WebSocketBadStatusException,
-            websock3.connect,
-            "wss://api.bitfinex.com/ws/2",
-            cookie="chocolate",
-            origin="testing_websockets.com",
-            host="echo.websocket.events/websocket-client-test",
-            subprotocols=["testproto"],
-            connection="Upgrade",
-            header={
-                "CustomHeader1": "123",
-                "Cookie": "TestValue",
-                "Sec-WebSocket-Key": "k9kFAUWNAMmf5OEMfTlOEA==",
-                "Sec-WebSocket-Protocol": "newprotocol",
-            },
-        )
 
-    def test_ipv6(self):
-        websock2 = ws.WebSocket()
-        self.assertRaises(ValueError, websock2.connect, "2001:4860:4860::8888")
 
-    def test_bad_urls(self):
-        websock3 = ws.WebSocket()
-        self.assertRaises(ValueError, websock3.connect, "ws//example.com")
-        self.assertRaises(WebSocketAddressException, websock3.connect, "ws://example")
-        self.assertRaises(ValueError, websock3.connect, "example.com")
 
 
 if __name__ == "__main__":
diff --git a/lib/xmltodict.py b/lib/xmltodict.py
index 098f6276..746a4bcd 100644
--- a/lib/xmltodict.py
+++ b/lib/xmltodict.py
@@ -4,17 +4,32 @@
 from xml.parsers import expat
 from xml.sax.saxutils import XMLGenerator
 from xml.sax.xmlreader import AttributesImpl
-from io import StringIO
+try:  # pragma no cover
+    from cStringIO import StringIO
+except ImportError:  # pragma no cover
+    try:
+        from StringIO import StringIO
+    except ImportError:
+        from io import StringIO
+try:  # pragma no cover
+    from collections import OrderedDict
+except ImportError:  # pragma no cover
+    try:
+        from ordereddict import OrderedDict
+    except ImportError:
+        OrderedDict = dict
 
-_dict = dict
-import platform
-if tuple(map(int, platform.python_version_tuple()[:2])) < (3, 7):
-    from collections import OrderedDict as _dict
-
-from inspect import isgenerator
+try:  # pragma no cover
+    _basestring = basestring
+except NameError:  # pragma no cover
+    _basestring = str
+try:  # pragma no cover
+    _unicode = unicode
+except NameError:  # pragma no cover
+    _unicode = str
 
 __author__ = 'Martin Blech'
-__version__ = "0.14.2"
+__version__ = '0.9.2'
 __license__ = 'MIT'
 
 
@@ -22,7 +37,7 @@ class ParsingInterrupted(Exception):
     pass
 
 
-class _DictSAXHandler:
+class _DictSAXHandler(object):
     def __init__(self,
                  item_depth=0,
                  item_callback=lambda *args: True,
@@ -32,15 +47,13 @@ class _DictSAXHandler:
                  force_cdata=False,
                  cdata_separator='',
                  postprocessor=None,
-                 dict_constructor=_dict,
+                 dict_constructor=OrderedDict,
                  strip_whitespace=True,
                  namespace_separator=':',
-                 namespaces=None,
-                 force_list=None,
-                 comment_key='#comment'):
+                 namespaces=None):
         self.path = []
         self.stack = []
-        self.data = []
+        self.data = None
         self.item = None
         self.item_depth = item_depth
         self.xml_attribs = xml_attribs
@@ -54,21 +67,15 @@ class _DictSAXHandler:
         self.strip_whitespace = strip_whitespace
         self.namespace_separator = namespace_separator
         self.namespaces = namespaces
-        self.namespace_declarations = dict_constructor()
-        self.force_list = force_list
-        self.comment_key = comment_key
 
     def _build_name(self, full_name):
-        if self.namespaces is None:
+        if not self.namespaces:
             return full_name
         i = full_name.rfind(self.namespace_separator)
         if i == -1:
             return full_name
         namespace, name = full_name[:i], full_name[i+1:]
-        try:
-            short_namespace = self.namespaces[namespace]
-        except KeyError:
-            short_namespace = namespace
+        short_namespace = self.namespaces.get(namespace, namespace)
         if not short_namespace:
             return name
         else:
@@ -79,51 +86,34 @@ class _DictSAXHandler:
             return attrs
         return self.dict_constructor(zip(attrs[0::2], attrs[1::2]))
 
-    def startNamespaceDecl(self, prefix, uri):
-        self.namespace_declarations[prefix or ''] = uri
-
     def startElement(self, full_name, attrs):
         name = self._build_name(full_name)
         attrs = self._attrs_to_dict(attrs)
-        if attrs and self.namespace_declarations:
-            attrs['xmlns'] = self.namespace_declarations
-            self.namespace_declarations = self.dict_constructor()
         self.path.append((name, attrs or None))
-        if len(self.path) >= self.item_depth:
+        if len(self.path) > self.item_depth:
             self.stack.append((self.item, self.data))
             if self.xml_attribs:
-                attr_entries = []
-                for key, value in attrs.items():
-                    key = self.attr_prefix+self._build_name(key)
-                    if self.postprocessor:
-                        entry = self.postprocessor(self.path, key, value)
-                    else:
-                        entry = (key, value)
-                    if entry:
-                        attr_entries.append(entry)
-                attrs = self.dict_constructor(attr_entries)
+                attrs = self.dict_constructor(
+                    (self.attr_prefix+self._build_name(key), value)
+                    for (key, value) in attrs.items())
             else:
                 attrs = None
             self.item = attrs or None
-            self.data = []
+            self.data = None
 
     def endElement(self, full_name):
         name = self._build_name(full_name)
         if len(self.path) == self.item_depth:
             item = self.item
             if item is None:
-                item = (None if not self.data
-                        else self.cdata_separator.join(self.data))
-
+                item = self.data
             should_continue = self.item_callback(self.path, item)
             if not should_continue:
-                raise ParsingInterrupted
-        if self.stack:
-            data = (None if not self.data
-                    else self.cdata_separator.join(self.data))
-            item = self.item
+                raise ParsingInterrupted()
+        if len(self.stack):
+            item, data = self.item, self.data
             self.item, self.data = self.stack.pop()
-            if self.strip_whitespace and data:
+            if self.strip_whitespace and data is not None:
                 data = data.strip() or None
             if data and self.force_cdata and item is None:
                 item = self.dict_constructor()
@@ -134,20 +124,14 @@ class _DictSAXHandler:
             else:
                 self.item = self.push_data(self.item, name, data)
         else:
-            self.item = None
-            self.data = []
+            self.item = self.data = None
         self.path.pop()
 
     def characters(self, data):
         if not self.data:
-            self.data = [data]
+            self.data = data
         else:
-            self.data.append(data)
-
-    def comments(self, data):
-        if self.strip_whitespace:
-            data = data.strip()
-        self.item = self.push_data(self.item, self.comment_key, data)
+            self.data += self.cdata_separator + data
 
     def push_data(self, item, key, data):
         if self.postprocessor is not None:
@@ -164,28 +148,15 @@ class _DictSAXHandler:
             else:
                 item[key] = [value, data]
         except KeyError:
-            if self._should_force_list(key, data):
-                item[key] = [data]
-            else:
-                item[key] = data
+            item[key] = data
         return item
 
-    def _should_force_list(self, key, value):
-        if not self.force_list:
-            return False
-        if isinstance(self.force_list, bool):
-            return self.force_list
-        try:
-            return key in self.force_list
-        except TypeError:
-            return self.force_list(self.path[:-1], key, value)
-
 
 def parse(xml_input, encoding=None, expat=expat, process_namespaces=False,
-          namespace_separator=':', disable_entities=True, process_comments=False, **kwargs):
+          namespace_separator=':', **kwargs):
     """Parse the given XML input and convert it into a dictionary.
 
-    `xml_input` can either be a `string`, a file-like object, or a generator of strings.
+    `xml_input` can either be a `string` or a file-like object.
 
     If `xml_attribs` is `True`, element attributes are put in the dictionary
     among regular child elements, using `@` as a prefix to avoid collisions. If
@@ -218,7 +189,7 @@ def parse(xml_input, encoding=None, expat=expat, process_namespaces=False,
     Streaming example::
 
         >>> def handle(path, item):
-        ...     print('path:%s item:%s' % (path, item))
+        ...     print 'path:%s item:%s' % (path, item)
         ...     return True
         ...
         >>> xmltodict.parse(\"\"\"
@@ -240,85 +211,21 @@ def parse(xml_input, encoding=None, expat=expat, process_namespaces=False,
         ...         return key, value
         >>> xmltodict.parse('<a><b>1</b><b>2</b><b>x</b></a>',
         ...                 postprocessor=postprocessor)
-        {'a': {'b:int': [1, 2], 'b': 'x'}}
+        OrderedDict([(u'a', OrderedDict([(u'b:int', [1, 2]), (u'b', u'x')]))])
 
     You can pass an alternate version of `expat` (such as `defusedexpat`) by
     using the `expat` parameter. E.g:
 
         >>> import defusedexpat
         >>> xmltodict.parse('<a>hello</a>', expat=defusedexpat.pyexpat)
-        {'a': 'hello'}
+        OrderedDict([(u'a', u'hello')])
 
-    You can use the force_list argument to force lists to be created even
-    when there is only a single child of a given level of hierarchy. The
-    force_list argument is a tuple of keys. If the key for a given level
-    of hierarchy is in the force_list argument, that level of hierarchy
-    will have a list as a child (even if there is only one sub-element).
-    The index_keys operation takes precedence over this. This is applied
-    after any user-supplied postprocessor has already run.
-
-        For example, given this input:
-        <servers>
-          <server>
-            <name>host1</name>
-            <os>Linux</os>
-            <interfaces>
-              <interface>
-                <name>em0</name>
-                <ip_address>10.0.0.1</ip_address>
-              </interface>
-            </interfaces>
-          </server>
-        </servers>
-
-        If called with force_list=('interface',), it will produce
-        this dictionary:
-        {'servers':
-          {'server':
-            {'name': 'host1',
-             'os': 'Linux'},
-             'interfaces':
-              {'interface':
-                [ {'name': 'em0', 'ip_address': '10.0.0.1' } ] } } }
-
-        `force_list` can also be a callable that receives `path`, `key` and
-        `value`. This is helpful in cases where the logic that decides whether
-        a list should be forced is more complex.
-
-
-        If `process_comment` is `True` then comment will be added with comment_key
-        (default=`'#comment'`) to then tag which contains comment
-
-            For example, given this input:
-            <a>
-              <b>
-                <!-- b comment -->
-                <c>
-                    <!-- c comment -->
-                    1
-                </c>
-                <d>2</d>
-              </b>
-            </a>
-
-            If called with process_comment=True, it will produce
-            this dictionary:
-            'a': {
-                'b': {
-                    '#comment': 'b comment',
-                    'c': {
-
-                        '#comment': 'c comment',
-                        '#text': '1',
-                    },
-                    'd': '2',
-                },
-            }
     """
     handler = _DictSAXHandler(namespace_separator=namespace_separator,
                               **kwargs)
-    if isinstance(xml_input, str):
-        encoding = encoding or 'utf-8'
+    if isinstance(xml_input, _unicode):
+        if not encoding:
+            encoding = 'utf-8'
         xml_input = xml_input.encode(encoding)
     if not process_namespaces:
         namespace_separator = None
@@ -331,50 +238,17 @@ def parse(xml_input, encoding=None, expat=expat, process_namespaces=False,
     except AttributeError:
         # Jython's expat does not support ordered_attributes
         pass
-    parser.StartNamespaceDeclHandler = handler.startNamespaceDecl
     parser.StartElementHandler = handler.startElement
     parser.EndElementHandler = handler.endElement
     parser.CharacterDataHandler = handler.characters
-    if process_comments:
-        parser.CommentHandler = handler.comments
     parser.buffer_text = True
-    if disable_entities:
-        try:
-            # Attempt to disable DTD in Jython's expat parser (Xerces-J).
-            feature = "http://apache.org/xml/features/disallow-doctype-decl"
-            parser._reader.setFeature(feature, True)
-        except AttributeError:
-            # For CPython / expat parser.
-            # Anything not handled ends up here and entities aren't expanded.
-            parser.DefaultHandler = lambda x: None
-            # Expects an integer return; zero means failure -> expat.ExpatError.
-            parser.ExternalEntityRefHandler = lambda *x: 1
-    if hasattr(xml_input, 'read'):
+    try:
         parser.ParseFile(xml_input)
-    elif isgenerator(xml_input):
-        for chunk in xml_input:
-            parser.Parse(chunk, False)
-        parser.Parse(b'', True)
-    else:
+    except (TypeError, AttributeError):
         parser.Parse(xml_input, True)
     return handler.item
 
 
-def _process_namespace(name, namespaces, ns_sep=':', attr_prefix='@'):
-    if not namespaces:
-        return name
-    try:
-        ns, name = name.rsplit(ns_sep, 1)
-    except ValueError:
-        pass
-    else:
-        ns_res = namespaces.get(ns.strip(attr_prefix))
-        name = '{}{}{}{}'.format(
-            attr_prefix if ns.startswith(attr_prefix) else '',
-            ns_res, ns_sep, name) if ns_res else name
-    return name
-
-
 def _emit(key, value, content_handler,
           attr_prefix='@',
           cdata_key='#text',
@@ -383,54 +257,36 @@ def _emit(key, value, content_handler,
           pretty=False,
           newl='\n',
           indent='\t',
-          namespace_separator=':',
-          namespaces=None,
-          full_document=True,
-          expand_iter=None):
-    key = _process_namespace(key, namespaces, namespace_separator, attr_prefix)
+          full_document=True):
     if preprocessor is not None:
         result = preprocessor(key, value)
         if result is None:
             return
         key, value = result
-    if not hasattr(value, '__iter__') or isinstance(value, (str, dict)):
+    if (not hasattr(value, '__iter__')
+            or isinstance(value, _basestring)
+            or isinstance(value, dict)):
         value = [value]
     for index, v in enumerate(value):
         if full_document and depth == 0 and index > 0:
             raise ValueError('document with multiple roots')
         if v is None:
-            v = _dict()
-        elif isinstance(v, bool):
-            v = 'true' if v else 'false'
-        elif not isinstance(v, (dict, str)):
-            if expand_iter and hasattr(v, '__iter__'):
-                v = _dict(((expand_iter, v),))
-            else:
-                v = str(v)
-        if isinstance(v, str):
-            v = _dict(((cdata_key, v),))
+            v = OrderedDict()
+        elif not isinstance(v, dict):
+            v = _unicode(v)
+        if isinstance(v, _basestring):
+            v = OrderedDict(((cdata_key, v),))
         cdata = None
-        attrs = _dict()
+        attrs = OrderedDict()
         children = []
         for ik, iv in v.items():
             if ik == cdata_key:
                 cdata = iv
                 continue
             if ik.startswith(attr_prefix):
-                ik = _process_namespace(ik, namespaces, namespace_separator,
-                                        attr_prefix)
-                if ik == '@xmlns' and isinstance(iv, dict):
-                    for k, v in iv.items():
-                        attr = 'xmlns{}'.format(f':{k}' if k else '')
-                        attrs[attr] = str(v)
-                    continue
-                if not isinstance(iv, str):
-                    iv = str(iv)
                 attrs[ik[len(attr_prefix):]] = iv
                 continue
             children.append((ik, iv))
-        if isinstance(indent, int):
-            indent = ' ' * indent
         if pretty:
             content_handler.ignorableWhitespace(depth * indent)
         content_handler.startElement(key, AttributesImpl(attrs))
@@ -439,9 +295,7 @@ def _emit(key, value, content_handler,
         for child_key, child_value in children:
             _emit(child_key, child_value, content_handler,
                   attr_prefix, cdata_key, depth+1, preprocessor,
-                  pretty, newl, indent, namespaces=namespaces,
-                  namespace_separator=namespace_separator,
-                  expand_iter=expand_iter)
+                  pretty, newl, indent)
         if cdata is not None:
             content_handler.characters(cdata)
         if pretty and children:
@@ -452,7 +306,6 @@ def _emit(key, value, content_handler,
 
 
 def unparse(input_dict, output=None, encoding='utf-8', full_document=True,
-            short_empty_elements=False,
             **kwargs):
     """Emit an XML document for the given `input_dict` (reverse of `parse`).
 
@@ -474,10 +327,7 @@ def unparse(input_dict, output=None, encoding='utf-8', full_document=True,
     if output is None:
         output = StringIO()
         must_return = True
-    if short_empty_elements:
-        content_handler = XMLGenerator(output, encoding, True)
-    else:
-        content_handler = XMLGenerator(output, encoding)
+    content_handler = XMLGenerator(output, encoding)
     if full_document:
         content_handler.startDocument()
     for key, value in input_dict.items():
@@ -493,26 +343,19 @@ def unparse(input_dict, output=None, encoding='utf-8', full_document=True,
             pass
         return value
 
-
 if __name__ == '__main__':  # pragma: no cover
     import sys
     import marshal
-    try:
-        stdin = sys.stdin.buffer
-        stdout = sys.stdout.buffer
-    except AttributeError:
-        stdin = sys.stdin
-        stdout = sys.stdout
 
     (item_depth,) = sys.argv[1:]
     item_depth = int(item_depth)
 
     def handle_item(path, item):
-        marshal.dump((path, item), stdout)
+        marshal.dump((path, item), sys.stdout)
         return True
 
     try:
-        root = parse(stdin,
+        root = parse(sys.stdin,
                      item_depth=item_depth,
                      item_callback=handle_item,
                      dict_constructor=dict)
diff --git a/lib/yaml/__init__.py b/lib/yaml/__init__.py
new file mode 100644
index 00000000..76e19e13
--- /dev/null
+++ b/lib/yaml/__init__.py
@@ -0,0 +1,315 @@
+
+from error import *
+
+from tokens import *
+from events import *
+from nodes import *
+
+from loader import *
+from dumper import *
+
+__version__ = '3.11'
+
+try:
+    from cyaml import *
+    __with_libyaml__ = True
+except ImportError:
+    __with_libyaml__ = False
+
+def scan(stream, Loader=Loader):
+    """
+    Scan a YAML stream and produce scanning tokens.
+    """
+    loader = Loader(stream)
+    try:
+        while loader.check_token():
+            yield loader.get_token()
+    finally:
+        loader.dispose()
+
+def parse(stream, Loader=Loader):
+    """
+    Parse a YAML stream and produce parsing events.
+    """
+    loader = Loader(stream)
+    try:
+        while loader.check_event():
+            yield loader.get_event()
+    finally:
+        loader.dispose()
+
+def compose(stream, Loader=Loader):
+    """
+    Parse the first YAML document in a stream
+    and produce the corresponding representation tree.
+    """
+    loader = Loader(stream)
+    try:
+        return loader.get_single_node()
+    finally:
+        loader.dispose()
+
+def compose_all(stream, Loader=Loader):
+    """
+    Parse all YAML documents in a stream
+    and produce corresponding representation trees.
+    """
+    loader = Loader(stream)
+    try:
+        while loader.check_node():
+            yield loader.get_node()
+    finally:
+        loader.dispose()
+
+def load(stream, Loader=Loader):
+    """
+    Parse the first YAML document in a stream
+    and produce the corresponding Python object.
+    """
+    loader = Loader(stream)
+    try:
+        return loader.get_single_data()
+    finally:
+        loader.dispose()
+
+def load_all(stream, Loader=Loader):
+    """
+    Parse all YAML documents in a stream
+    and produce corresponding Python objects.
+    """
+    loader = Loader(stream)
+    try:
+        while loader.check_data():
+            yield loader.get_data()
+    finally:
+        loader.dispose()
+
+def safe_load(stream):
+    """
+    Parse the first YAML document in a stream
+    and produce the corresponding Python object.
+    Resolve only basic YAML tags.
+    """
+    return load(stream, SafeLoader)
+
+def safe_load_all(stream):
+    """
+    Parse all YAML documents in a stream
+    and produce corresponding Python objects.
+    Resolve only basic YAML tags.
+    """
+    return load_all(stream, SafeLoader)
+
+def emit(events, stream=None, Dumper=Dumper,
+        canonical=None, indent=None, width=None,
+        allow_unicode=None, line_break=None):
+    """
+    Emit YAML parsing events into a stream.
+    If stream is None, return the produced string instead.
+    """
+    getvalue = None
+    if stream is None:
+        from StringIO import StringIO
+        stream = StringIO()
+        getvalue = stream.getvalue
+    dumper = Dumper(stream, canonical=canonical, indent=indent, width=width,
+            allow_unicode=allow_unicode, line_break=line_break)
+    try:
+        for event in events:
+            dumper.emit(event)
+    finally:
+        dumper.dispose()
+    if getvalue:
+        return getvalue()
+
+def serialize_all(nodes, stream=None, Dumper=Dumper,
+        canonical=None, indent=None, width=None,
+        allow_unicode=None, line_break=None,
+        encoding='utf-8', explicit_start=None, explicit_end=None,
+        version=None, tags=None):
+    """
+    Serialize a sequence of representation trees into a YAML stream.
+    If stream is None, return the produced string instead.
+    """
+    getvalue = None
+    if stream is None:
+        if encoding is None:
+            from StringIO import StringIO
+        else:
+            from cStringIO import StringIO
+        stream = StringIO()
+        getvalue = stream.getvalue
+    dumper = Dumper(stream, canonical=canonical, indent=indent, width=width,
+            allow_unicode=allow_unicode, line_break=line_break,
+            encoding=encoding, version=version, tags=tags,
+            explicit_start=explicit_start, explicit_end=explicit_end)
+    try:
+        dumper.open()
+        for node in nodes:
+            dumper.serialize(node)
+        dumper.close()
+    finally:
+        dumper.dispose()
+    if getvalue:
+        return getvalue()
+
+def serialize(node, stream=None, Dumper=Dumper, **kwds):
+    """
+    Serialize a representation tree into a YAML stream.
+    If stream is None, return the produced string instead.
+    """
+    return serialize_all([node], stream, Dumper=Dumper, **kwds)
+
+def dump_all(documents, stream=None, Dumper=Dumper,
+        default_style=None, default_flow_style=None,
+        canonical=None, indent=None, width=None,
+        allow_unicode=None, line_break=None,
+        encoding='utf-8', explicit_start=None, explicit_end=None,
+        version=None, tags=None):
+    """
+    Serialize a sequence of Python objects into a YAML stream.
+    If stream is None, return the produced string instead.
+    """
+    getvalue = None
+    if stream is None:
+        if encoding is None:
+            from StringIO import StringIO
+        else:
+            from cStringIO import StringIO
+        stream = StringIO()
+        getvalue = stream.getvalue
+    dumper = Dumper(stream, default_style=default_style,
+            default_flow_style=default_flow_style,
+            canonical=canonical, indent=indent, width=width,
+            allow_unicode=allow_unicode, line_break=line_break,
+            encoding=encoding, version=version, tags=tags,
+            explicit_start=explicit_start, explicit_end=explicit_end)
+    try:
+        dumper.open()
+        for data in documents:
+            dumper.represent(data)
+        dumper.close()
+    finally:
+        dumper.dispose()
+    if getvalue:
+        return getvalue()
+
+def dump(data, stream=None, Dumper=Dumper, **kwds):
+    """
+    Serialize a Python object into a YAML stream.
+    If stream is None, return the produced string instead.
+    """
+    return dump_all([data], stream, Dumper=Dumper, **kwds)
+
+def safe_dump_all(documents, stream=None, **kwds):
+    """
+    Serialize a sequence of Python objects into a YAML stream.
+    Produce only basic YAML tags.
+    If stream is None, return the produced string instead.
+    """
+    return dump_all(documents, stream, Dumper=SafeDumper, **kwds)
+
+def safe_dump(data, stream=None, **kwds):
+    """
+    Serialize a Python object into a YAML stream.
+    Produce only basic YAML tags.
+    If stream is None, return the produced string instead.
+    """
+    return dump_all([data], stream, Dumper=SafeDumper, **kwds)
+
+def add_implicit_resolver(tag, regexp, first=None,
+        Loader=Loader, Dumper=Dumper):
+    """
+    Add an implicit scalar detector.
+    If an implicit scalar value matches the given regexp,
+    the corresponding tag is assigned to the scalar.
+    first is a sequence of possible initial characters or None.
+    """
+    Loader.add_implicit_resolver(tag, regexp, first)
+    Dumper.add_implicit_resolver(tag, regexp, first)
+
+def add_path_resolver(tag, path, kind=None, Loader=Loader, Dumper=Dumper):
+    """
+    Add a path based resolver for the given tag.
+    A path is a list of keys that forms a path
+    to a node in the representation tree.
+    Keys can be string values, integers, or None.
+    """
+    Loader.add_path_resolver(tag, path, kind)
+    Dumper.add_path_resolver(tag, path, kind)
+
+def add_constructor(tag, constructor, Loader=Loader):
+    """
+    Add a constructor for the given tag.
+    Constructor is a function that accepts a Loader instance
+    and a node object and produces the corresponding Python object.
+    """
+    Loader.add_constructor(tag, constructor)
+
+def add_multi_constructor(tag_prefix, multi_constructor, Loader=Loader):
+    """
+    Add a multi-constructor for the given tag prefix.
+    Multi-constructor is called for a node if its tag starts with tag_prefix.
+    Multi-constructor accepts a Loader instance, a tag suffix,
+    and a node object and produces the corresponding Python object.
+    """
+    Loader.add_multi_constructor(tag_prefix, multi_constructor)
+
+def add_representer(data_type, representer, Dumper=Dumper):
+    """
+    Add a representer for the given type.
+    Representer is a function accepting a Dumper instance
+    and an instance of the given data type
+    and producing the corresponding representation node.
+    """
+    Dumper.add_representer(data_type, representer)
+
+def add_multi_representer(data_type, multi_representer, Dumper=Dumper):
+    """
+    Add a representer for the given type.
+    Multi-representer is a function accepting a Dumper instance
+    and an instance of the given data type or subtype
+    and producing the corresponding representation node.
+    """
+    Dumper.add_multi_representer(data_type, multi_representer)
+
+class YAMLObjectMetaclass(type):
+    """
+    The metaclass for YAMLObject.
+    """
+    def __init__(cls, name, bases, kwds):
+        super(YAMLObjectMetaclass, cls).__init__(name, bases, kwds)
+        if 'yaml_tag' in kwds and kwds['yaml_tag'] is not None:
+            cls.yaml_loader.add_constructor(cls.yaml_tag, cls.from_yaml)
+            cls.yaml_dumper.add_representer(cls, cls.to_yaml)
+
+class YAMLObject(object):
+    """
+    An object that can dump itself to a YAML stream
+    and load itself from a YAML stream.
+    """
+
+    __metaclass__ = YAMLObjectMetaclass
+    __slots__ = ()  # no direct instantiation, so allow immutable subclasses
+
+    yaml_loader = Loader
+    yaml_dumper = Dumper
+
+    yaml_tag = None
+    yaml_flow_style = None
+
+    def from_yaml(cls, loader, node):
+        """
+        Convert a representation node to a Python object.
+        """
+        return loader.construct_yaml_object(node, cls)
+    from_yaml = classmethod(from_yaml)
+
+    def to_yaml(cls, dumper, data):
+        """
+        Convert a Python object to a representation node.
+        """
+        return dumper.represent_yaml_object(cls.yaml_tag, data, cls,
+                flow_style=cls.yaml_flow_style)
+    to_yaml = classmethod(to_yaml)
+
diff --git a/lib/yaml/composer.py b/lib/yaml/composer.py
new file mode 100644
index 00000000..06e5ac78
--- /dev/null
+++ b/lib/yaml/composer.py
@@ -0,0 +1,139 @@
+
+__all__ = ['Composer', 'ComposerError']
+
+from error import MarkedYAMLError
+from events import *
+from nodes import *
+
+class ComposerError(MarkedYAMLError):
+    pass
+
+class Composer(object):
+
+    def __init__(self):
+        self.anchors = {}
+
+    def check_node(self):
+        # Drop the STREAM-START event.
+        if self.check_event(StreamStartEvent):
+            self.get_event()
+
+        # If there are more documents available?
+        return not self.check_event(StreamEndEvent)
+
+    def get_node(self):
+        # Get the root node of the next document.
+        if not self.check_event(StreamEndEvent):
+            return self.compose_document()
+
+    def get_single_node(self):
+        # Drop the STREAM-START event.
+        self.get_event()
+
+        # Compose a document if the stream is not empty.
+        document = None
+        if not self.check_event(StreamEndEvent):
+            document = self.compose_document()
+
+        # Ensure that the stream contains no more documents.
+        if not self.check_event(StreamEndEvent):
+            event = self.get_event()
+            raise ComposerError("expected a single document in the stream",
+                    document.start_mark, "but found another document",
+                    event.start_mark)
+
+        # Drop the STREAM-END event.
+        self.get_event()
+
+        return document
+
+    def compose_document(self):
+        # Drop the DOCUMENT-START event.
+        self.get_event()
+
+        # Compose the root node.
+        node = self.compose_node(None, None)
+
+        # Drop the DOCUMENT-END event.
+        self.get_event()
+
+        self.anchors = {}
+        return node
+
+    def compose_node(self, parent, index):
+        if self.check_event(AliasEvent):
+            event = self.get_event()
+            anchor = event.anchor
+            if anchor not in self.anchors:
+                raise ComposerError(None, None, "found undefined alias %r"
+                        % anchor.encode('utf-8'), event.start_mark)
+            return self.anchors[anchor]
+        event = self.peek_event()
+        anchor = event.anchor
+        if anchor is not None:
+            if anchor in self.anchors:
+                raise ComposerError("found duplicate anchor %r; first occurence"
+                        % anchor.encode('utf-8'), self.anchors[anchor].start_mark,
+                        "second occurence", event.start_mark)
+        self.descend_resolver(parent, index)
+        if self.check_event(ScalarEvent):
+            node = self.compose_scalar_node(anchor)
+        elif self.check_event(SequenceStartEvent):
+            node = self.compose_sequence_node(anchor)
+        elif self.check_event(MappingStartEvent):
+            node = self.compose_mapping_node(anchor)
+        self.ascend_resolver()
+        return node
+
+    def compose_scalar_node(self, anchor):
+        event = self.get_event()
+        tag = event.tag
+        if tag is None or tag == u'!':
+            tag = self.resolve(ScalarNode, event.value, event.implicit)
+        node = ScalarNode(tag, event.value,
+                event.start_mark, event.end_mark, style=event.style)
+        if anchor is not None:
+            self.anchors[anchor] = node
+        return node
+
+    def compose_sequence_node(self, anchor):
+        start_event = self.get_event()
+        tag = start_event.tag
+        if tag is None or tag == u'!':
+            tag = self.resolve(SequenceNode, None, start_event.implicit)
+        node = SequenceNode(tag, [],
+                start_event.start_mark, None,
+                flow_style=start_event.flow_style)
+        if anchor is not None:
+            self.anchors[anchor] = node
+        index = 0
+        while not self.check_event(SequenceEndEvent):
+            node.value.append(self.compose_node(node, index))
+            index += 1
+        end_event = self.get_event()
+        node.end_mark = end_event.end_mark
+        return node
+
+    def compose_mapping_node(self, anchor):
+        start_event = self.get_event()
+        tag = start_event.tag
+        if tag is None or tag == u'!':
+            tag = self.resolve(MappingNode, None, start_event.implicit)
+        node = MappingNode(tag, [],
+                start_event.start_mark, None,
+                flow_style=start_event.flow_style)
+        if anchor is not None:
+            self.anchors[anchor] = node
+        while not self.check_event(MappingEndEvent):
+            #key_event = self.peek_event()
+            item_key = self.compose_node(node, None)
+            #if item_key in node.value:
+            #    raise ComposerError("while composing a mapping", start_event.start_mark,
+            #            "found duplicate key", key_event.start_mark)
+            item_value = self.compose_node(node, item_key)
+            #node.value[item_key] = item_value
+            node.value.append((item_key, item_value))
+        end_event = self.get_event()
+        node.end_mark = end_event.end_mark
+        return node
+
diff --git a/lib/yaml/constructor.py b/lib/yaml/constructor.py
new file mode 100644
index 00000000..abbff97b
--- /dev/null
+++ b/lib/yaml/constructor.py
@@ -0,0 +1,675 @@
+
+__all__ = ['BaseConstructor', 'SafeConstructor', 'Constructor',
+    'ConstructorError']
+
+from error import *
+from nodes import *
+
+import datetime
+
+import binascii, re, sys, types
+
+class ConstructorError(MarkedYAMLError):
+    pass
+
+class BaseConstructor(object):
+
+    yaml_constructors = {}
+    yaml_multi_constructors = {}
+
+    def __init__(self):
+        self.constructed_objects = {}
+        self.recursive_objects = {}
+        self.state_generators = []
+        self.deep_construct = False
+
+    def check_data(self):
+        # If there are more documents available?
+        return self.check_node()
+
+    def get_data(self):
+        # Construct and return the next document.
+        if self.check_node():
+            return self.construct_document(self.get_node())
+
+    def get_single_data(self):
+        # Ensure that the stream contains a single document and construct it.
+        node = self.get_single_node()
+        if node is not None:
+            return self.construct_document(node)
+        return None
+
+    def construct_document(self, node):
+        data = self.construct_object(node)
+        while self.state_generators:
+            state_generators = self.state_generators
+            self.state_generators = []
+            for generator in state_generators:
+                for dummy in generator:
+                    pass
+        self.constructed_objects = {}
+        self.recursive_objects = {}
+        self.deep_construct = False
+        return data
+
+    def construct_object(self, node, deep=False):
+        if node in self.constructed_objects:
+            return self.constructed_objects[node]
+        if deep:
+            old_deep = self.deep_construct
+            self.deep_construct = True
+        if node in self.recursive_objects:
+            raise ConstructorError(None, None,
+                    "found unconstructable recursive node", node.start_mark)
+        self.recursive_objects[node] = None
+        constructor = None
+        tag_suffix = None
+        if node.tag in self.yaml_constructors:
+            constructor = self.yaml_constructors[node.tag]
+        else:
+            for tag_prefix in self.yaml_multi_constructors:
+                if node.tag.startswith(tag_prefix):
+                    tag_suffix = node.tag[len(tag_prefix):]
+                    constructor = self.yaml_multi_constructors[tag_prefix]
+                    break
+            else:
+                if None in self.yaml_multi_constructors:
+                    tag_suffix = node.tag
+                    constructor = self.yaml_multi_constructors[None]
+                elif None in self.yaml_constructors:
+                    constructor = self.yaml_constructors[None]
+                elif isinstance(node, ScalarNode):
+                    constructor = self.__class__.construct_scalar
+                elif isinstance(node, SequenceNode):
+                    constructor = self.__class__.construct_sequence
+                elif isinstance(node, MappingNode):
+                    constructor = self.__class__.construct_mapping
+        if tag_suffix is None:
+            data = constructor(self, node)
+        else:
+            data = constructor(self, tag_suffix, node)
+        if isinstance(data, types.GeneratorType):
+            generator = data
+            data = generator.next()
+            if self.deep_construct:
+                for dummy in generator:
+                    pass
+            else:
+                self.state_generators.append(generator)
+        self.constructed_objects[node] = data
+        del self.recursive_objects[node]
+        if deep:
+            self.deep_construct = old_deep
+        return data
+
+    def construct_scalar(self, node):
+        if not isinstance(node, ScalarNode):
+            raise ConstructorError(None, None,
+                    "expected a scalar node, but found %s" % node.id,
+                    node.start_mark)
+        return node.value
+
+    def construct_sequence(self, node, deep=False):
+        if not isinstance(node, SequenceNode):
+            raise ConstructorError(None, None,
+                    "expected a sequence node, but found %s" % node.id,
+                    node.start_mark)
+        return [self.construct_object(child, deep=deep)
+                for child in node.value]
+
+    def construct_mapping(self, node, deep=False):
+        if not isinstance(node, MappingNode):
+            raise ConstructorError(None, None,
+                    "expected a mapping node, but found %s" % node.id,
+                    node.start_mark)
+        mapping = {}
+        for key_node, value_node in node.value:
+            key = self.construct_object(key_node, deep=deep)
+            try:
+                hash(key)
+            except TypeError, exc:
+                raise ConstructorError("while constructing a mapping", node.start_mark,
+                        "found unacceptable key (%s)" % exc, key_node.start_mark)
+            value = self.construct_object(value_node, deep=deep)
+            mapping[key] = value
+        return mapping
+
+    def construct_pairs(self, node, deep=False):
+        if not isinstance(node, MappingNode):
+            raise ConstructorError(None, None,
+                    "expected a mapping node, but found %s" % node.id,
+                    node.start_mark)
+        pairs = []
+        for key_node, value_node in node.value:
+            key = self.construct_object(key_node, deep=deep)
+            value = self.construct_object(value_node, deep=deep)
+            pairs.append((key, value))
+        return pairs
+
+    def add_constructor(cls, tag, constructor):
+        if not 'yaml_constructors' in cls.__dict__:
+            cls.yaml_constructors = cls.yaml_constructors.copy()
+        cls.yaml_constructors[tag] = constructor
+    add_constructor = classmethod(add_constructor)
+
+    def add_multi_constructor(cls, tag_prefix, multi_constructor):
+        if not 'yaml_multi_constructors' in cls.__dict__:
+            cls.yaml_multi_constructors = cls.yaml_multi_constructors.copy()
+        cls.yaml_multi_constructors[tag_prefix] = multi_constructor
+    add_multi_constructor = classmethod(add_multi_constructor)
+
+class SafeConstructor(BaseConstructor):
+
+    def construct_scalar(self, node):
+        if isinstance(node, MappingNode):
+            for key_node, value_node in node.value:
+                if key_node.tag == u'tag:yaml.org,2002:value':
+                    return self.construct_scalar(value_node)
+        return BaseConstructor.construct_scalar(self, node)
+
+    def flatten_mapping(self, node):
+        merge = []
+        index = 0
+        while index < len(node.value):
+            key_node, value_node = node.value[index]
+            if key_node.tag == u'tag:yaml.org,2002:merge':
+                del node.value[index]
+                if isinstance(value_node, MappingNode):
+                    self.flatten_mapping(value_node)
+                    merge.extend(value_node.value)
+                elif isinstance(value_node, SequenceNode):
+                    submerge = []
+                    for subnode in value_node.value:
+                        if not isinstance(subnode, MappingNode):
+                            raise ConstructorError("while constructing a mapping",
+                                    node.start_mark,
+                                    "expected a mapping for merging, but found %s"
+                                    % subnode.id, subnode.start_mark)
+                        self.flatten_mapping(subnode)
+                        submerge.append(subnode.value)
+                    submerge.reverse()
+                    for value in submerge:
+                        merge.extend(value)
+                else:
+                    raise ConstructorError("while constructing a mapping", node.start_mark,
+                            "expected a mapping or list of mappings for merging, but found %s"
+                            % value_node.id, value_node.start_mark)
+            elif key_node.tag == u'tag:yaml.org,2002:value':
+                key_node.tag = u'tag:yaml.org,2002:str'
+                index += 1
+            else:
+                index += 1
+        if merge:
+            node.value = merge + node.value
+
+    def construct_mapping(self, node, deep=False):
+        if isinstance(node, MappingNode):
+            self.flatten_mapping(node)
+        return BaseConstructor.construct_mapping(self, node, deep=deep)
+
+    def construct_yaml_null(self, node):
+        self.construct_scalar(node)
+        return None
+
+    bool_values = {
+        u'yes':     True,
+        u'no':      False,
+        u'true':    True,
+        u'false':   False,
+        u'on':      True,
+        u'off':     False,
+    }
+
+    def construct_yaml_bool(self, node):
+        value = self.construct_scalar(node)
+        return self.bool_values[value.lower()]
+
+    def construct_yaml_int(self, node):
+        value = str(self.construct_scalar(node))
+        value = value.replace('_', '')
+        sign = +1
+        if value[0] == '-':
+            sign = -1
+        if value[0] in '+-':
+            value = value[1:]
+        if value == '0':
+            return 0
+        elif value.startswith('0b'):
+            return sign*int(value[2:], 2)
+        elif value.startswith('0x'):
+            return sign*int(value[2:], 16)
+        elif value[0] == '0':
+            return sign*int(value, 8)
+        elif ':' in value:
+            digits = [int(part) for part in value.split(':')]
+            digits.reverse()
+            base = 1
+            value = 0
+            for digit in digits:
+                value += digit*base
+                base *= 60
+            return sign*value
+        else:
+            return sign*int(value)
+
+    inf_value = 1e300
+    while inf_value != inf_value*inf_value:
+        inf_value *= inf_value
+    nan_value = -inf_value/inf_value   # Trying to make a quiet NaN (like C99).
+
+    def construct_yaml_float(self, node):
+        value = str(self.construct_scalar(node))
+        value = value.replace('_', '').lower()
+        sign = +1
+        if value[0] == '-':
+            sign = -1
+        if value[0] in '+-':
+            value = value[1:]
+        if value == '.inf':
+            return sign*self.inf_value
+        elif value == '.nan':
+            return self.nan_value
+        elif ':' in value:
+            digits = [float(part) for part in value.split(':')]
+            digits.reverse()
+            base = 1
+            value = 0.0
+            for digit in digits:
+                value += digit*base
+                base *= 60
+            return sign*value
+        else:
+            return sign*float(value)
+
+    def construct_yaml_binary(self, node):
+        value = self.construct_scalar(node)
+        try:
+            return str(value).decode('base64')
+        except (binascii.Error, UnicodeEncodeError), exc:
+            raise ConstructorError(None, None,
+                    "failed to decode base64 data: %s" % exc, node.start_mark)
+
+    timestamp_regexp = re.compile(
+            ur'''^(?P<year>[0-9][0-9][0-9][0-9])
+                -(?P<month>[0-9][0-9]?)
+                -(?P<day>[0-9][0-9]?)
+                (?:(?:[Tt]|[ \t]+)
+                (?P<hour>[0-9][0-9]?)
+                :(?P<minute>[0-9][0-9])
+                :(?P<second>[0-9][0-9])
+                (?:\.(?P<fraction>[0-9]*))?
+                (?:[ \t]*(?P<tz>Z|(?P<tz_sign>[-+])(?P<tz_hour>[0-9][0-9]?)
+                (?::(?P<tz_minute>[0-9][0-9]))?))?)?$''', re.X)
+
+    def construct_yaml_timestamp(self, node):
+        value = self.construct_scalar(node)
+        match = self.timestamp_regexp.match(node.value)
+        values = match.groupdict()
+        year = int(values['year'])
+        month = int(values['month'])
+        day = int(values['day'])
+        if not values['hour']:
+            return datetime.date(year, month, day)
+        hour = int(values['hour'])
+        minute = int(values['minute'])
+        second = int(values['second'])
+        fraction = 0
+        if values['fraction']:
+            fraction = values['fraction'][:6]
+            while len(fraction) < 6:
+                fraction += '0'
+            fraction = int(fraction)
+        delta = None
+        if values['tz_sign']:
+            tz_hour = int(values['tz_hour'])
+            tz_minute = int(values['tz_minute'] or 0)
+            delta = datetime.timedelta(hours=tz_hour, minutes=tz_minute)
+            if values['tz_sign'] == '-':
+                delta = -delta
+        data = datetime.datetime(year, month, day, hour, minute, second, fraction)
+        if delta:
+            data -= delta
+        return data
+
+    def construct_yaml_omap(self, node):
+        # Note: we do not check for duplicate keys, because it's too
+        # CPU-expensive.
+        omap = []
+        yield omap
+        if not isinstance(node, SequenceNode):
+            raise ConstructorError("while constructing an ordered map", node.start_mark,
+                    "expected a sequence, but found %s" % node.id, node.start_mark)
+        for subnode in node.value:
+            if not isinstance(subnode, MappingNode):
+                raise ConstructorError("while constructing an ordered map", node.start_mark,
+                        "expected a mapping of length 1, but found %s" % subnode.id,
+                        subnode.start_mark)
+            if len(subnode.value) != 1:
+                raise ConstructorError("while constructing an ordered map", node.start_mark,
+                        "expected a single mapping item, but found %d items" % len(subnode.value),
+                        subnode.start_mark)
+            key_node, value_node = subnode.value[0]
+            key = self.construct_object(key_node)
+            value = self.construct_object(value_node)
+            omap.append((key, value))
+
+    def construct_yaml_pairs(self, node):
+        # Note: the same code as `construct_yaml_omap`.
+        pairs = []
+        yield pairs
+        if not isinstance(node, SequenceNode):
+            raise ConstructorError("while constructing pairs", node.start_mark,
+                    "expected a sequence, but found %s" % node.id, node.start_mark)
+        for subnode in node.value:
+            if not isinstance(subnode, MappingNode):
+                raise ConstructorError("while constructing pairs", node.start_mark,
+                        "expected a mapping of length 1, but found %s" % subnode.id,
+                        subnode.start_mark)
+            if len(subnode.value) != 1:
+                raise ConstructorError("while constructing pairs", node.start_mark,
+                        "expected a single mapping item, but found %d items" % len(subnode.value),
+                        subnode.start_mark)
+            key_node, value_node = subnode.value[0]
+            key = self.construct_object(key_node)
+            value = self.construct_object(value_node)
+            pairs.append((key, value))
+
+    def construct_yaml_set(self, node):
+        data = set()
+        yield data
+        value = self.construct_mapping(node)
+        data.update(value)
+
+    def construct_yaml_str(self, node):
+        value = self.construct_scalar(node)
+        try:
+            return value.encode('ascii')
+        except UnicodeEncodeError:
+            return value
+
+    def construct_yaml_seq(self, node):
+        data = []
+        yield data
+        data.extend(self.construct_sequence(node))
+
+    def construct_yaml_map(self, node):
+        data = {}
+        yield data
+        value = self.construct_mapping(node)
+        data.update(value)
+
+    def construct_yaml_object(self, node, cls):
+        data = cls.__new__(cls)
+        yield data
+        if hasattr(data, '__setstate__'):
+            state = self.construct_mapping(node, deep=True)
+            data.__setstate__(state)
+        else:
+            state = self.construct_mapping(node)
+            data.__dict__.update(state)
+
+    def construct_undefined(self, node):
+        raise ConstructorError(None, None,
+                "could not determine a constructor for the tag %r" % node.tag.encode('utf-8'),
+                node.start_mark)
+
+SafeConstructor.add_constructor(
+        u'tag:yaml.org,2002:null',
+        SafeConstructor.construct_yaml_null)
+
+SafeConstructor.add_constructor(
+        u'tag:yaml.org,2002:bool',
+        SafeConstructor.construct_yaml_bool)
+
+SafeConstructor.add_constructor(
+        u'tag:yaml.org,2002:int',
+        SafeConstructor.construct_yaml_int)
+
+SafeConstructor.add_constructor(
+        u'tag:yaml.org,2002:float',
+        SafeConstructor.construct_yaml_float)
+
+SafeConstructor.add_constructor(
+        u'tag:yaml.org,2002:binary',
+        SafeConstructor.construct_yaml_binary)
+
+SafeConstructor.add_constructor(
+        u'tag:yaml.org,2002:timestamp',
+        SafeConstructor.construct_yaml_timestamp)
+
+SafeConstructor.add_constructor(
+        u'tag:yaml.org,2002:omap',
+        SafeConstructor.construct_yaml_omap)
+
+SafeConstructor.add_constructor(
+        u'tag:yaml.org,2002:pairs',
+        SafeConstructor.construct_yaml_pairs)
+
+SafeConstructor.add_constructor(
+        u'tag:yaml.org,2002:set',
+        SafeConstructor.construct_yaml_set)
+
+SafeConstructor.add_constructor(
+        u'tag:yaml.org,2002:str',
+        SafeConstructor.construct_yaml_str)
+
+SafeConstructor.add_constructor(
+        u'tag:yaml.org,2002:seq',
+        SafeConstructor.construct_yaml_seq)
+
+SafeConstructor.add_constructor(
+        u'tag:yaml.org,2002:map',
+        SafeConstructor.construct_yaml_map)
+
+SafeConstructor.add_constructor(None,
+        SafeConstructor.construct_undefined)
+
+class Constructor(SafeConstructor):
+
+    def construct_python_str(self, node):
+        return self.construct_scalar(node).encode('utf-8')
+
+    def construct_python_unicode(self, node):
+        return self.construct_scalar(node)
+
+    def construct_python_long(self, node):
+        return long(self.construct_yaml_int(node))
+
+    def construct_python_complex(self, node):
+       return complex(self.construct_scalar(node))
+
+    def construct_python_tuple(self, node):
+        return tuple(self.construct_sequence(node))
+
+    def find_python_module(self, name, mark):
+        if not name:
+            raise ConstructorError("while constructing a Python module", mark,
+                    "expected non-empty name appended to the tag", mark)
+        try:
+            __import__(name)
+        except ImportError, exc:
+            raise ConstructorError("while constructing a Python module", mark,
+                    "cannot find module %r (%s)" % (name.encode('utf-8'), exc), mark)
+        return sys.modules[name]
+
+    def find_python_name(self, name, mark):
+        if not name:
+            raise ConstructorError("while constructing a Python object", mark,
+                    "expected non-empty name appended to the tag", mark)
+        if u'.' in name:
+            module_name, object_name = name.rsplit('.', 1)
+        else:
+            module_name = '__builtin__'
+            object_name = name
+        try:
+            __import__(module_name)
+        except ImportError, exc:
+            raise ConstructorError("while constructing a Python object", mark,
+                    "cannot find module %r (%s)" % (module_name.encode('utf-8'), exc), mark)
+        module = sys.modules[module_name]
+        if not hasattr(module, object_name):
+            raise ConstructorError("while constructing a Python object", mark,
+                    "cannot find %r in the module %r" % (object_name.encode('utf-8'),
+                        module.__name__), mark)
+        return getattr(module, object_name)
+
+    def construct_python_name(self, suffix, node):
+        value = self.construct_scalar(node)
+        if value:
+            raise ConstructorError("while constructing a Python name", node.start_mark,
+                    "expected the empty value, but found %r" % value.encode('utf-8'),
+                    node.start_mark)
+        return self.find_python_name(suffix, node.start_mark)
+
+    def construct_python_module(self, suffix, node):
+        value = self.construct_scalar(node)
+        if value:
+            raise ConstructorError("while constructing a Python module", node.start_mark,
+                    "expected the empty value, but found %r" % value.encode('utf-8'),
+                    node.start_mark)
+        return self.find_python_module(suffix, node.start_mark)
+
+    class classobj: pass
+
+    def make_python_instance(self, suffix, node,
+            args=None, kwds=None, newobj=False):
+        if not args:
+            args = []
+        if not kwds:
+            kwds = {}
+        cls = self.find_python_name(suffix, node.start_mark)
+        if newobj and isinstance(cls, type(self.classobj))  \
+                and not args and not kwds:
+            instance = self.classobj()
+            instance.__class__ = cls
+            return instance
+        elif newobj and isinstance(cls, type):
+            return cls.__new__(cls, *args, **kwds)
+        else:
+            return cls(*args, **kwds)
+
+    def set_python_instance_state(self, instance, state):
+        if hasattr(instance, '__setstate__'):
+            instance.__setstate__(state)
+        else:
+            slotstate = {}
+            if isinstance(state, tuple) and len(state) == 2:
+                state, slotstate = state
+            if hasattr(instance, '__dict__'):
+                instance.__dict__.update(state)
+            elif state:
+                slotstate.update(state)
+            for key, value in slotstate.items():
+                setattr(object, key, value)
+
+    def construct_python_object(self, suffix, node):
+        # Format:
+        #   !!python/object:module.name { ... state ... }
+        instance = self.make_python_instance(suffix, node, newobj=True)
+        yield instance
+        deep = hasattr(instance, '__setstate__')
+        state = self.construct_mapping(node, deep=deep)
+        self.set_python_instance_state(instance, state)
+
+    def construct_python_object_apply(self, suffix, node, newobj=False):
+        # Format:
+        #   !!python/object/apply       # (or !!python/object/new)
+        #   args: [ ... arguments ... ]
+        #   kwds: { ... keywords ... }
+        #   state: ... state ...
+        #   listitems: [ ... listitems ... ]
+        #   dictitems: { ... dictitems ... }
+        # or short format:
+        #   !!python/object/apply [ ... arguments ... ]
+        # The difference between !!python/object/apply and !!python/object/new
+        # is how an object is created, check make_python_instance for details.
+        if isinstance(node, SequenceNode):
+            args = self.construct_sequence(node, deep=True)
+            kwds = {}
+            state = {}
+            listitems = []
+            dictitems = {}
+        else:
+            value = self.construct_mapping(node, deep=True)
+            args = value.get('args', [])
+            kwds = value.get('kwds', {})
+            state = value.get('state', {})
+            listitems = value.get('listitems', [])
+            dictitems = value.get('dictitems', {})
+        instance = self.make_python_instance(suffix, node, args, kwds, newobj)
+        if state:
+            self.set_python_instance_state(instance, state)
+        if listitems:
+            instance.extend(listitems)
+        if dictitems:
+            for key in dictitems:
+                instance[key] = dictitems[key]
+        return instance
+
+    def construct_python_object_new(self, suffix, node):
+        return self.construct_python_object_apply(suffix, node, newobj=True)
+
+Constructor.add_constructor(
+    u'tag:yaml.org,2002:python/none',
+    Constructor.construct_yaml_null)
+
+Constructor.add_constructor(
+    u'tag:yaml.org,2002:python/bool',
+    Constructor.construct_yaml_bool)
+
+Constructor.add_constructor(
+    u'tag:yaml.org,2002:python/str',
+    Constructor.construct_python_str)
+
+Constructor.add_constructor(
+    u'tag:yaml.org,2002:python/unicode',
+    Constructor.construct_python_unicode)
+
+Constructor.add_constructor(
+    u'tag:yaml.org,2002:python/int',
+    Constructor.construct_yaml_int)
+
+Constructor.add_constructor(
+    u'tag:yaml.org,2002:python/long',
+    Constructor.construct_python_long)
+
+Constructor.add_constructor(
+    u'tag:yaml.org,2002:python/float',
+    Constructor.construct_yaml_float)
+
+Constructor.add_constructor(
+    u'tag:yaml.org,2002:python/complex',
+    Constructor.construct_python_complex)
+
+Constructor.add_constructor(
+    u'tag:yaml.org,2002:python/list',
+    Constructor.construct_yaml_seq)
+
+Constructor.add_constructor(
+    u'tag:yaml.org,2002:python/tuple',
+    Constructor.construct_python_tuple)
+
+Constructor.add_constructor(
+    u'tag:yaml.org,2002:python/dict',
+    Constructor.construct_yaml_map)
+
+Constructor.add_multi_constructor(
+    u'tag:yaml.org,2002:python/name:',
+    Constructor.construct_python_name)
+
+Constructor.add_multi_constructor(
+    u'tag:yaml.org,2002:python/module:',
+    Constructor.construct_python_module)
+
+Constructor.add_multi_constructor(
+    u'tag:yaml.org,2002:python/object:',
+    Constructor.construct_python_object)
+
+Constructor.add_multi_constructor(
+    u'tag:yaml.org,2002:python/object/apply:',
+    Constructor.construct_python_object_apply)
+
+Constructor.add_multi_constructor(
+    u'tag:yaml.org,2002:python/object/new:',
+    Constructor.construct_python_object_new)
+
diff --git a/lib/yaml/cyaml.py b/lib/yaml/cyaml.py
new file mode 100644
index 00000000..68dcd751
--- /dev/null
+++ b/lib/yaml/cyaml.py
@@ -0,0 +1,85 @@
+
+__all__ = ['CBaseLoader', 'CSafeLoader', 'CLoader',
+        'CBaseDumper', 'CSafeDumper', 'CDumper']
+
+from _yaml import CParser, CEmitter
+
+from constructor import *
+
+from serializer import *
+from representer import *
+
+from resolver import *
+
+class CBaseLoader(CParser, BaseConstructor, BaseResolver):
+
+    def __init__(self, stream):
+        CParser.__init__(self, stream)
+        BaseConstructor.__init__(self)
+        BaseResolver.__init__(self)
+
+class CSafeLoader(CParser, SafeConstructor, Resolver):
+
+    def __init__(self, stream):
+        CParser.__init__(self, stream)
+        SafeConstructor.__init__(self)
+        Resolver.__init__(self)
+
+class CLoader(CParser, Constructor, Resolver):
+
+    def __init__(self, stream):
+        CParser.__init__(self, stream)
+        Constructor.__init__(self)
+        Resolver.__init__(self)
+
+class CBaseDumper(CEmitter, BaseRepresenter, BaseResolver):
+
+    def __init__(self, stream,
+            default_style=None, default_flow_style=None,
+            canonical=None, indent=None, width=None,
+            allow_unicode=None, line_break=None,
+            encoding=None, explicit_start=None, explicit_end=None,
+            version=None, tags=None):
+        CEmitter.__init__(self, stream, canonical=canonical,
+                indent=indent, width=width, encoding=encoding,
+                allow_unicode=allow_unicode, line_break=line_break,
+                explicit_start=explicit_start, explicit_end=explicit_end,
+                version=version, tags=tags)
+        Representer.__init__(self, default_style=default_style,
+                default_flow_style=default_flow_style)
+        Resolver.__init__(self)
+
+class CSafeDumper(CEmitter, SafeRepresenter, Resolver):
+
+    def __init__(self, stream,
+            default_style=None, default_flow_style=None,
+            canonical=None, indent=None, width=None,
+            allow_unicode=None, line_break=None,
+            encoding=None, explicit_start=None, explicit_end=None,
+            version=None, tags=None):
+        CEmitter.__init__(self, stream, canonical=canonical,
+                indent=indent, width=width, encoding=encoding,
+                allow_unicode=allow_unicode, line_break=line_break,
+                explicit_start=explicit_start, explicit_end=explicit_end,
+                version=version, tags=tags)
+        SafeRepresenter.__init__(self, default_style=default_style,
+                default_flow_style=default_flow_style)
+        Resolver.__init__(self)
+
+class CDumper(CEmitter, Serializer, Representer, Resolver):
+
+    def __init__(self, stream,
+            default_style=None, default_flow_style=None,
+            canonical=None, indent=None, width=None,
+            allow_unicode=None, line_break=None,
+            encoding=None, explicit_start=None, explicit_end=None,
+            version=None, tags=None):
+        CEmitter.__init__(self, stream, canonical=canonical,
+                indent=indent, width=width, encoding=encoding,
+                allow_unicode=allow_unicode, line_break=line_break,
+                explicit_start=explicit_start, explicit_end=explicit_end,
+                version=version, tags=tags)
+        Representer.__init__(self, default_style=default_style,
+                default_flow_style=default_flow_style)
+        Resolver.__init__(self)
+
diff --git a/lib/yaml/dumper.py b/lib/yaml/dumper.py
new file mode 100644
index 00000000..f811d2c9
--- /dev/null
+++ b/lib/yaml/dumper.py
@@ -0,0 +1,62 @@
+
+__all__ = ['BaseDumper', 'SafeDumper', 'Dumper']
+
+from emitter import *
+from serializer import *
+from representer import *
+from resolver import *
+
+class BaseDumper(Emitter, Serializer, BaseRepresenter, BaseResolver):
+
+    def __init__(self, stream,
+            default_style=None, default_flow_style=None,
+            canonical=None, indent=None, width=None,
+            allow_unicode=None, line_break=None,
+            encoding=None, explicit_start=None, explicit_end=None,
+            version=None, tags=None):
+        Emitter.__init__(self, stream, canonical=canonical,
+                indent=indent, width=width,
+                allow_unicode=allow_unicode, line_break=line_break)
+        Serializer.__init__(self, encoding=encoding,
+                explicit_start=explicit_start, explicit_end=explicit_end,
+                version=version, tags=tags)
+        Representer.__init__(self, default_style=default_style,
+                default_flow_style=default_flow_style)
+        Resolver.__init__(self)
+
+class SafeDumper(Emitter, Serializer, SafeRepresenter, Resolver):
+
+    def __init__(self, stream,
+            default_style=None, default_flow_style=None,
+            canonical=None, indent=None, width=None,
+            allow_unicode=None, line_break=None,
+            encoding=None, explicit_start=None, explicit_end=None,
+            version=None, tags=None):
+        Emitter.__init__(self, stream, canonical=canonical,
+                indent=indent, width=width,
+                allow_unicode=allow_unicode, line_break=line_break)
+        Serializer.__init__(self, encoding=encoding,
+                explicit_start=explicit_start, explicit_end=explicit_end,
+                version=version, tags=tags)
+        SafeRepresenter.__init__(self, default_style=default_style,
+                default_flow_style=default_flow_style)
+        Resolver.__init__(self)
+
+class Dumper(Emitter, Serializer, Representer, Resolver):
+
+    def __init__(self, stream,
+            default_style=None, default_flow_style=None,
+            canonical=None, indent=None, width=None,
+            allow_unicode=None, line_break=None,
+            encoding=None, explicit_start=None, explicit_end=None,
+            version=None, tags=None):
+        Emitter.__init__(self, stream, canonical=canonical,
+                indent=indent, width=width,
+                allow_unicode=allow_unicode, line_break=line_break)
+        Serializer.__init__(self, encoding=encoding,
+                explicit_start=explicit_start, explicit_end=explicit_end,
+                version=version, tags=tags)
+        Representer.__init__(self, default_style=default_style,
+                default_flow_style=default_flow_style)
+        Resolver.__init__(self)
+
diff --git a/lib/yaml/emitter.py b/lib/yaml/emitter.py
new file mode 100644
index 00000000..488337f2
--- /dev/null
+++ b/lib/yaml/emitter.py
@@ -0,0 +1,1140 @@
+
+# Emitter expects events obeying the following grammar:
+# stream ::= STREAM-START document* STREAM-END
+# document ::= DOCUMENT-START node DOCUMENT-END
+# node ::= SCALAR | sequence | mapping
+# sequence ::= SEQUENCE-START node* SEQUENCE-END
+# mapping ::= MAPPING-START (node node)* MAPPING-END
+
+__all__ = ['Emitter', 'EmitterError']
+
+from error import YAMLError
+from events import *
+
+class EmitterError(YAMLError):
+    pass
+
+class ScalarAnalysis(object):
+    def __init__(self, scalar, empty, multiline,
+            allow_flow_plain, allow_block_plain,
+            allow_single_quoted, allow_double_quoted,
+            allow_block):
+        self.scalar = scalar
+        self.empty = empty
+        self.multiline = multiline
+        self.allow_flow_plain = allow_flow_plain
+        self.allow_block_plain = allow_block_plain
+        self.allow_single_quoted = allow_single_quoted
+        self.allow_double_quoted = allow_double_quoted
+        self.allow_block = allow_block
+
+class Emitter(object):
+
+    DEFAULT_TAG_PREFIXES = {
+        u'!' : u'!',
+        u'tag:yaml.org,2002:' : u'!!',
+    }
+
+    def __init__(self, stream, canonical=None, indent=None, width=None,
+            allow_unicode=None, line_break=None):
+
+        # The stream should have the methods `write` and possibly `flush`.
+        self.stream = stream
+
+        # Encoding can be overriden by STREAM-START.
+        self.encoding = None
+
+        # Emitter is a state machine with a stack of states to handle nested
+        # structures.
+        self.states = []
+        self.state = self.expect_stream_start
+
+        # Current event and the event queue.
+        self.events = []
+        self.event = None
+
+        # The current indentation level and the stack of previous indents.
+        self.indents = []
+        self.indent = None
+
+        # Flow level.
+        self.flow_level = 0
+
+        # Contexts.
+        self.root_context = False
+        self.sequence_context = False
+        self.mapping_context = False
+        self.simple_key_context = False
+
+        # Characteristics of the last emitted character:
+        #  - current position.
+        #  - is it a whitespace?
+        #  - is it an indention character
+        #    (indentation space, '-', '?', or ':')?
+        self.line = 0
+        self.column = 0
+        self.whitespace = True
+        self.indention = True
+
+        # Whether the document requires an explicit document indicator
+        self.open_ended = False
+
+        # Formatting details.
+        self.canonical = canonical
+        self.allow_unicode = allow_unicode
+        self.best_indent = 2
+        if indent and 1 < indent < 10:
+            self.best_indent = indent
+        self.best_width = 80
+        if width and width > self.best_indent*2:
+            self.best_width = width
+        self.best_line_break = u'\n'
+        if line_break in [u'\r', u'\n', u'\r\n']:
+            self.best_line_break = line_break
+
+        # Tag prefixes.
+        self.tag_prefixes = None
+
+        # Prepared anchor and tag.
+        self.prepared_anchor = None
+        self.prepared_tag = None
+
+        # Scalar analysis and style.
+        self.analysis = None
+        self.style = None
+
+    def dispose(self):
+        # Reset the state attributes (to clear self-references)
+        self.states = []
+        self.state = None
+
+    def emit(self, event):
+        self.events.append(event)
+        while not self.need_more_events():
+            self.event = self.events.pop(0)
+            self.state()
+            self.event = None
+
+    # In some cases, we wait for a few next events before emitting.
+
+    def need_more_events(self):
+        if not self.events:
+            return True
+        event = self.events[0]
+        if isinstance(event, DocumentStartEvent):
+            return self.need_events(1)
+        elif isinstance(event, SequenceStartEvent):
+            return self.need_events(2)
+        elif isinstance(event, MappingStartEvent):
+            return self.need_events(3)
+        else:
+            return False
+
+    def need_events(self, count):
+        level = 0
+        for event in self.events[1:]:
+            if isinstance(event, (DocumentStartEvent, CollectionStartEvent)):
+                level += 1
+            elif isinstance(event, (DocumentEndEvent, CollectionEndEvent)):
+                level -= 1
+            elif isinstance(event, StreamEndEvent):
+                level = -1
+            if level < 0:
+                return False
+        return (len(self.events) < count+1)
+
+    def increase_indent(self, flow=False, indentless=False):
+        self.indents.append(self.indent)
+        if self.indent is None:
+            if flow:
+                self.indent = self.best_indent
+            else:
+                self.indent = 0
+        elif not indentless:
+            self.indent += self.best_indent
+
+    # States.
+
+    # Stream handlers.
+
+    def expect_stream_start(self):
+        if isinstance(self.event, StreamStartEvent):
+            if self.event.encoding and not getattr(self.stream, 'encoding', None):
+                self.encoding = self.event.encoding
+            self.write_stream_start()
+            self.state = self.expect_first_document_start
+        else:
+            raise EmitterError("expected StreamStartEvent, but got %s"
+                    % self.event)
+
+    def expect_nothing(self):
+        raise EmitterError("expected nothing, but got %s" % self.event)
+
+    # Document handlers.
+
+    def expect_first_document_start(self):
+        return self.expect_document_start(first=True)
+
+    def expect_document_start(self, first=False):
+        if isinstance(self.event, DocumentStartEvent):
+            if (self.event.version or self.event.tags) and self.open_ended:
+                self.write_indicator(u'...', True)
+                self.write_indent()
+            if self.event.version:
+                version_text = self.prepare_version(self.event.version)
+                self.write_version_directive(version_text)
+            self.tag_prefixes = self.DEFAULT_TAG_PREFIXES.copy()
+            if self.event.tags:
+                handles = self.event.tags.keys()
+                handles.sort()
+                for handle in handles:
+                    prefix = self.event.tags[handle]
+                    self.tag_prefixes[prefix] = handle
+                    handle_text = self.prepare_tag_handle(handle)
+                    prefix_text = self.prepare_tag_prefix(prefix)
+                    self.write_tag_directive(handle_text, prefix_text)
+            implicit = (first and not self.event.explicit and not self.canonical
+                    and not self.event.version and not self.event.tags
+                    and not self.check_empty_document())
+            if not implicit:
+                self.write_indent()
+                self.write_indicator(u'---', True)
+                if self.canonical:
+                    self.write_indent()
+            self.state = self.expect_document_root
+        elif isinstance(self.event, StreamEndEvent):
+            if self.open_ended:
+                self.write_indicator(u'...', True)
+                self.write_indent()
+            self.write_stream_end()
+            self.state = self.expect_nothing
+        else:
+            raise EmitterError("expected DocumentStartEvent, but got %s"
+                    % self.event)
+
+    def expect_document_end(self):
+        if isinstance(self.event, DocumentEndEvent):
+            self.write_indent()
+            if self.event.explicit:
+                self.write_indicator(u'...', True)
+                self.write_indent()
+            self.flush_stream()
+            self.state = self.expect_document_start
+        else:
+            raise EmitterError("expected DocumentEndEvent, but got %s"
+                    % self.event)
+
+    def expect_document_root(self):
+        self.states.append(self.expect_document_end)
+        self.expect_node(root=True)
+
+    # Node handlers.
+
+    def expect_node(self, root=False, sequence=False, mapping=False,
+            simple_key=False):
+        self.root_context = root
+        self.sequence_context = sequence
+        self.mapping_context = mapping
+        self.simple_key_context = simple_key
+        if isinstance(self.event, AliasEvent):
+            self.expect_alias()
+        elif isinstance(self.event, (ScalarEvent, CollectionStartEvent)):
+            self.process_anchor(u'&')
+            self.process_tag()
+            if isinstance(self.event, ScalarEvent):
+                self.expect_scalar()
+            elif isinstance(self.event, SequenceStartEvent):
+                if self.flow_level or self.canonical or self.event.flow_style   \
+                        or self.check_empty_sequence():
+                    self.expect_flow_sequence()
+                else:
+                    self.expect_block_sequence()
+            elif isinstance(self.event, MappingStartEvent):
+                if self.flow_level or self.canonical or self.event.flow_style   \
+                        or self.check_empty_mapping():
+                    self.expect_flow_mapping()
+                else:
+                    self.expect_block_mapping()
+        else:
+            raise EmitterError("expected NodeEvent, but got %s" % self.event)
+
+    def expect_alias(self):
+        if self.event.anchor is None:
+            raise EmitterError("anchor is not specified for alias")
+        self.process_anchor(u'*')
+        self.state = self.states.pop()
+
+    def expect_scalar(self):
+        self.increase_indent(flow=True)
+        self.process_scalar()
+        self.indent = self.indents.pop()
+        self.state = self.states.pop()
+
+    # Flow sequence handlers.
+
+    def expect_flow_sequence(self):
+        self.write_indicator(u'[', True, whitespace=True)
+        self.flow_level += 1
+        self.increase_indent(flow=True)
+        self.state = self.expect_first_flow_sequence_item
+
+    def expect_first_flow_sequence_item(self):
+        if isinstance(self.event, SequenceEndEvent):
+            self.indent = self.indents.pop()
+            self.flow_level -= 1
+            self.write_indicator(u']', False)
+            self.state = self.states.pop()
+        else:
+            if self.canonical or self.column > self.best_width:
+                self.write_indent()
+            self.states.append(self.expect_flow_sequence_item)
+            self.expect_node(sequence=True)
+
+    def expect_flow_sequence_item(self):
+        if isinstance(self.event, SequenceEndEvent):
+            self.indent = self.indents.pop()
+            self.flow_level -= 1
+            if self.canonical:
+                self.write_indicator(u',', False)
+                self.write_indent()
+            self.write_indicator(u']', False)
+            self.state = self.states.pop()
+        else:
+            self.write_indicator(u',', False)
+            if self.canonical or self.column > self.best_width:
+                self.write_indent()
+            self.states.append(self.expect_flow_sequence_item)
+            self.expect_node(sequence=True)
+
+    # Flow mapping handlers.
+
+    def expect_flow_mapping(self):
+        self.write_indicator(u'{', True, whitespace=True)
+        self.flow_level += 1
+        self.increase_indent(flow=True)
+        self.state = self.expect_first_flow_mapping_key
+
+    def expect_first_flow_mapping_key(self):
+        if isinstance(self.event, MappingEndEvent):
+            self.indent = self.indents.pop()
+            self.flow_level -= 1
+            self.write_indicator(u'}', False)
+            self.state = self.states.pop()
+        else:
+            if self.canonical or self.column > self.best_width:
+                self.write_indent()
+            if not self.canonical and self.check_simple_key():
+                self.states.append(self.expect_flow_mapping_simple_value)
+                self.expect_node(mapping=True, simple_key=True)
+            else:
+                self.write_indicator(u'?', True)
+                self.states.append(self.expect_flow_mapping_value)
+                self.expect_node(mapping=True)
+
+    def expect_flow_mapping_key(self):
+        if isinstance(self.event, MappingEndEvent):
+            self.indent = self.indents.pop()
+            self.flow_level -= 1
+            if self.canonical:
+                self.write_indicator(u',', False)
+                self.write_indent()
+            self.write_indicator(u'}', False)
+            self.state = self.states.pop()
+        else:
+            self.write_indicator(u',', False)
+            if self.canonical or self.column > self.best_width:
+                self.write_indent()
+            if not self.canonical and self.check_simple_key():
+                self.states.append(self.expect_flow_mapping_simple_value)
+                self.expect_node(mapping=True, simple_key=True)
+            else:
+                self.write_indicator(u'?', True)
+                self.states.append(self.expect_flow_mapping_value)
+                self.expect_node(mapping=True)
+
+    def expect_flow_mapping_simple_value(self):
+        self.write_indicator(u':', False)
+        self.states.append(self.expect_flow_mapping_key)
+        self.expect_node(mapping=True)
+
+    def expect_flow_mapping_value(self):
+        if self.canonical or self.column > self.best_width:
+            self.write_indent()
+        self.write_indicator(u':', True)
+        self.states.append(self.expect_flow_mapping_key)
+        self.expect_node(mapping=True)
+
+    # Block sequence handlers.
+
+    def expect_block_sequence(self):
+        indentless = (self.mapping_context and not self.indention)
+        self.increase_indent(flow=False, indentless=indentless)
+        self.state = self.expect_first_block_sequence_item
+
+    def expect_first_block_sequence_item(self):
+        return self.expect_block_sequence_item(first=True)
+
+    def expect_block_sequence_item(self, first=False):
+        if not first and isinstance(self.event, SequenceEndEvent):
+            self.indent = self.indents.pop()
+            self.state = self.states.pop()
+        else:
+            self.write_indent()
+            self.write_indicator(u'-', True, indention=True)
+            self.states.append(self.expect_block_sequence_item)
+            self.expect_node(sequence=True)
+
+    # Block mapping handlers.
+
+    def expect_block_mapping(self):
+        self.increase_indent(flow=False)
+        self.state = self.expect_first_block_mapping_key
+
+    def expect_first_block_mapping_key(self):
+        return self.expect_block_mapping_key(first=True)
+
+    def expect_block_mapping_key(self, first=False):
+        if not first and isinstance(self.event, MappingEndEvent):
+            self.indent = self.indents.pop()
+            self.state = self.states.pop()
+        else:
+            self.write_indent()
+            if self.check_simple_key():
+                self.states.append(self.expect_block_mapping_simple_value)
+                self.expect_node(mapping=True, simple_key=True)
+            else:
+                self.write_indicator(u'?', True, indention=True)
+                self.states.append(self.expect_block_mapping_value)
+                self.expect_node(mapping=True)
+
+    def expect_block_mapping_simple_value(self):
+        self.write_indicator(u':', False)
+        self.states.append(self.expect_block_mapping_key)
+        self.expect_node(mapping=True)
+
+    def expect_block_mapping_value(self):
+        self.write_indent()
+        self.write_indicator(u':', True, indention=True)
+        self.states.append(self.expect_block_mapping_key)
+        self.expect_node(mapping=True)
+
+    # Checkers.
+
+    def check_empty_sequence(self):
+        return (isinstance(self.event, SequenceStartEvent) and self.events
+                and isinstance(self.events[0], SequenceEndEvent))
+
+    def check_empty_mapping(self):
+        return (isinstance(self.event, MappingStartEvent) and self.events
+                and isinstance(self.events[0], MappingEndEvent))
+
+    def check_empty_document(self):
+        if not isinstance(self.event, DocumentStartEvent) or not self.events:
+            return False
+        event = self.events[0]
+        return (isinstance(event, ScalarEvent) and event.anchor is None
+                and event.tag is None and event.implicit and event.value == u'')
+
+    def check_simple_key(self):
+        length = 0
+        if isinstance(self.event, NodeEvent) and self.event.anchor is not None:
+            if self.prepared_anchor is None:
+                self.prepared_anchor = self.prepare_anchor(self.event.anchor)
+            length += len(self.prepared_anchor)
+        if isinstance(self.event, (ScalarEvent, CollectionStartEvent))  \
+                and self.event.tag is not None:
+            if self.prepared_tag is None:
+                self.prepared_tag = self.prepare_tag(self.event.tag)
+            length += len(self.prepared_tag)
+        if isinstance(self.event, ScalarEvent):
+            if self.analysis is None:
+                self.analysis = self.analyze_scalar(self.event.value)
+            length += len(self.analysis.scalar)
+        return (length < 128 and (isinstance(self.event, AliasEvent)
+            or (isinstance(self.event, ScalarEvent)
+                    and not self.analysis.empty and not self.analysis.multiline)
+            or self.check_empty_sequence() or self.check_empty_mapping()))
+
+    # Anchor, Tag, and Scalar processors.
+
+    def process_anchor(self, indicator):
+        if self.event.anchor is None:
+            self.prepared_anchor = None
+            return
+        if self.prepared_anchor is None:
+            self.prepared_anchor = self.prepare_anchor(self.event.anchor)
+        if self.prepared_anchor:
+            self.write_indicator(indicator+self.prepared_anchor, True)
+        self.prepared_anchor = None
+
+    def process_tag(self):
+        tag = self.event.tag
+        if isinstance(self.event, ScalarEvent):
+            if self.style is None:
+                self.style = self.choose_scalar_style()
+            if ((not self.canonical or tag is None) and
+                ((self.style == '' and self.event.implicit[0])
+                        or (self.style != '' and self.event.implicit[1]))):
+                self.prepared_tag = None
+                return
+            if self.event.implicit[0] and tag is None:
+                tag = u'!'
+                self.prepared_tag = None
+        else:
+            if (not self.canonical or tag is None) and self.event.implicit:
+                self.prepared_tag = None
+                return
+        if tag is None:
+            raise EmitterError("tag is not specified")
+        if self.prepared_tag is None:
+            self.prepared_tag = self.prepare_tag(tag)
+        if self.prepared_tag:
+            self.write_indicator(self.prepared_tag, True)
+        self.prepared_tag = None
+
+    def choose_scalar_style(self):
+        if self.analysis is None:
+            self.analysis = self.analyze_scalar(self.event.value)
+        if self.event.style == '"' or self.canonical:
+            return '"'
+        if not self.event.style and self.event.implicit[0]:
+            if (not (self.simple_key_context and
+                    (self.analysis.empty or self.analysis.multiline))
+                and (self.flow_level and self.analysis.allow_flow_plain
+                    or (not self.flow_level and self.analysis.allow_block_plain))):
+                return ''
+        if self.event.style and self.event.style in '|>':
+            if (not self.flow_level and not self.simple_key_context
+                    and self.analysis.allow_block):
+                return self.event.style
+        if not self.event.style or self.event.style == '\'':
+            if (self.analysis.allow_single_quoted and
+                    not (self.simple_key_context and self.analysis.multiline)):
+                return '\''
+        return '"'
+
+    def process_scalar(self):
+        if self.analysis is None:
+            self.analysis = self.analyze_scalar(self.event.value)
+        if self.style is None:
+            self.style = self.choose_scalar_style()
+        split = (not self.simple_key_context)
+        #if self.analysis.multiline and split    \
+        #        and (not self.style or self.style in '\'\"'):
+        #    self.write_indent()
+        if self.style == '"':
+            self.write_double_quoted(self.analysis.scalar, split)
+        elif self.style == '\'':
+            self.write_single_quoted(self.analysis.scalar, split)
+        elif self.style == '>':
+            self.write_folded(self.analysis.scalar)
+        elif self.style == '|':
+            self.write_literal(self.analysis.scalar)
+        else:
+            self.write_plain(self.analysis.scalar, split)
+        self.analysis = None
+        self.style = None
+
+    # Analyzers.
+
+    def prepare_version(self, version):
+        major, minor = version
+        if major != 1:
+            raise EmitterError("unsupported YAML version: %d.%d" % (major, minor))
+        return u'%d.%d' % (major, minor)
+
+    def prepare_tag_handle(self, handle):
+        if not handle:
+            raise EmitterError("tag handle must not be empty")
+        if handle[0] != u'!' or handle[-1] != u'!':
+            raise EmitterError("tag handle must start and end with '!': %r"
+                    % (handle.encode('utf-8')))
+        for ch in handle[1:-1]:
+            if not (u'0' <= ch <= u'9' or u'A' <= ch <= u'Z' or u'a' <= ch <= u'z'  \
+                    or ch in u'-_'):
+                raise EmitterError("invalid character %r in the tag handle: %r"
+                        % (ch.encode('utf-8'), handle.encode('utf-8')))
+        return handle
+
+    def prepare_tag_prefix(self, prefix):
+        if not prefix:
+            raise EmitterError("tag prefix must not be empty")
+        chunks = []
+        start = end = 0
+        if prefix[0] == u'!':
+            end = 1
+        while end < len(prefix):
+            ch = prefix[end]
+            if u'0' <= ch <= u'9' or u'A' <= ch <= u'Z' or u'a' <= ch <= u'z'   \
+                    or ch in u'-;/?!:@&=+$,_.~*\'()[]':
+                end += 1
+            else:
+                if start < end:
+                    chunks.append(prefix[start:end])
+                start = end = end+1
+                data = ch.encode('utf-8')
+                for ch in data:
+                    chunks.append(u'%%%02X' % ord(ch))
+        if start < end:
+            chunks.append(prefix[start:end])
+        return u''.join(chunks)
+
+    def prepare_tag(self, tag):
+        if not tag:
+            raise EmitterError("tag must not be empty")
+        if tag == u'!':
+            return tag
+        handle = None
+        suffix = tag
+        prefixes = self.tag_prefixes.keys()
+        prefixes.sort()
+        for prefix in prefixes:
+            if tag.startswith(prefix)   \
+                    and (prefix == u'!' or len(prefix) < len(tag)):
+                handle = self.tag_prefixes[prefix]
+                suffix = tag[len(prefix):]
+        chunks = []
+        start = end = 0
+        while end < len(suffix):
+            ch = suffix[end]
+            if u'0' <= ch <= u'9' or u'A' <= ch <= u'Z' or u'a' <= ch <= u'z'   \
+                    or ch in u'-;/?:@&=+$,_.~*\'()[]'   \
+                    or (ch == u'!' and handle != u'!'):
+                end += 1
+            else:
+                if start < end:
+                    chunks.append(suffix[start:end])
+                start = end = end+1
+                data = ch.encode('utf-8')
+                for ch in data:
+                    chunks.append(u'%%%02X' % ord(ch))
+        if start < end:
+            chunks.append(suffix[start:end])
+        suffix_text = u''.join(chunks)
+        if handle:
+            return u'%s%s' % (handle, suffix_text)
+        else:
+            return u'!<%s>' % suffix_text
+
+    def prepare_anchor(self, anchor):
+        if not anchor:
+            raise EmitterError("anchor must not be empty")
+        for ch in anchor:
+            if not (u'0' <= ch <= u'9' or u'A' <= ch <= u'Z' or u'a' <= ch <= u'z'  \
+                    or ch in u'-_'):
+                raise EmitterError("invalid character %r in the anchor: %r"
+                        % (ch.encode('utf-8'), anchor.encode('utf-8')))
+        return anchor
+
+    def analyze_scalar(self, scalar):
+
+        # Empty scalar is a special case.
+        if not scalar:
+            return ScalarAnalysis(scalar=scalar, empty=True, multiline=False,
+                    allow_flow_plain=False, allow_block_plain=True,
+                    allow_single_quoted=True, allow_double_quoted=True,
+                    allow_block=False)
+
+        # Indicators and special characters.
+        block_indicators = False
+        flow_indicators = False
+        line_breaks = False
+        special_characters = False
+
+        # Important whitespace combinations.
+        leading_space = False
+        leading_break = False
+        trailing_space = False
+        trailing_break = False
+        break_space = False
+        space_break = False
+
+        # Check document indicators.
+        if scalar.startswith(u'---') or scalar.startswith(u'...'):
+            block_indicators = True
+            flow_indicators = True
+
+        # First character or preceded by a whitespace.
+        preceeded_by_whitespace = True
+
+        # Last character or followed by a whitespace.
+        followed_by_whitespace = (len(scalar) == 1 or
+                scalar[1] in u'\0 \t\r\n\x85\u2028\u2029')
+
+        # The previous character is a space.
+        previous_space = False
+
+        # The previous character is a break.
+        previous_break = False
+
+        index = 0
+        while index < len(scalar):
+            ch = scalar[index]
+
+            # Check for indicators.
+            if index == 0:
+                # Leading indicators are special characters.
+                if ch in u'#,[]{}&*!|>\'\"%@`':
+                    flow_indicators = True
+                    block_indicators = True
+                if ch in u'?:':
+                    flow_indicators = True
+                    if followed_by_whitespace:
+                        block_indicators = True
+                if ch == u'-' and followed_by_whitespace:
+                    flow_indicators = True
+                    block_indicators = True
+            else:
+                # Some indicators cannot appear within a scalar as well.
+                if ch in u',?[]{}':
+                    flow_indicators = True
+                if ch == u':':
+                    flow_indicators = True
+                    if followed_by_whitespace:
+                        block_indicators = True
+                if ch == u'#' and preceeded_by_whitespace:
+                    flow_indicators = True
+                    block_indicators = True
+
+            # Check for line breaks, special, and unicode characters.
+            if ch in u'\n\x85\u2028\u2029':
+                line_breaks = True
+            if not (ch == u'\n' or u'\x20' <= ch <= u'\x7E'):
+                if (ch == u'\x85' or u'\xA0' <= ch <= u'\uD7FF'
+                        or u'\uE000' <= ch <= u'\uFFFD') and ch != u'\uFEFF':
+                    unicode_characters = True
+                    if not self.allow_unicode:
+                        special_characters = True
+                else:
+                    special_characters = True
+
+            # Detect important whitespace combinations.
+            if ch == u' ':
+                if index == 0:
+                    leading_space = True
+                if index == len(scalar)-1:
+                    trailing_space = True
+                if previous_break:
+                    break_space = True
+                previous_space = True
+                previous_break = False
+            elif ch in u'\n\x85\u2028\u2029':
+                if index == 0:
+                    leading_break = True
+                if index == len(scalar)-1:
+                    trailing_break = True
+                if previous_space:
+                    space_break = True
+                previous_space = False
+                previous_break = True
+            else:
+                previous_space = False
+                previous_break = False
+
+            # Prepare for the next character.
+            index += 1
+            preceeded_by_whitespace = (ch in u'\0 \t\r\n\x85\u2028\u2029')
+            followed_by_whitespace = (index+1 >= len(scalar) or
+                    scalar[index+1] in u'\0 \t\r\n\x85\u2028\u2029')
+
+        # Let's decide what styles are allowed.
+        allow_flow_plain = True
+        allow_block_plain = True
+        allow_single_quoted = True
+        allow_double_quoted = True
+        allow_block = True
+
+        # Leading and trailing whitespaces are bad for plain scalars.
+        if (leading_space or leading_break
+                or trailing_space or trailing_break):
+            allow_flow_plain = allow_block_plain = False
+
+        # We do not permit trailing spaces for block scalars.
+        if trailing_space:
+            allow_block = False
+
+        # Spaces at the beginning of a new line are only acceptable for block
+        # scalars.
+        if break_space:
+            allow_flow_plain = allow_block_plain = allow_single_quoted = False
+
+        # Spaces followed by breaks, as well as special character are only
+        # allowed for double quoted scalars.
+        if space_break or special_characters:
+            allow_flow_plain = allow_block_plain =  \
+            allow_single_quoted = allow_block = False
+
+        # Although the plain scalar writer supports breaks, we never emit
+        # multiline plain scalars.
+        if line_breaks:
+            allow_flow_plain = allow_block_plain = False
+
+        # Flow indicators are forbidden for flow plain scalars.
+        if flow_indicators:
+            allow_flow_plain = False
+
+        # Block indicators are forbidden for block plain scalars.
+        if block_indicators:
+            allow_block_plain = False
+
+        return ScalarAnalysis(scalar=scalar,
+                empty=False, multiline=line_breaks,
+                allow_flow_plain=allow_flow_plain,
+                allow_block_plain=allow_block_plain,
+                allow_single_quoted=allow_single_quoted,
+                allow_double_quoted=allow_double_quoted,
+                allow_block=allow_block)
+
+    # Writers.
+
+    def flush_stream(self):
+        if hasattr(self.stream, 'flush'):
+            self.stream.flush()
+
+    def write_stream_start(self):
+        # Write BOM if needed.
+        if self.encoding and self.encoding.startswith('utf-16'):
+            self.stream.write(u'\uFEFF'.encode(self.encoding))
+
+    def write_stream_end(self):
+        self.flush_stream()
+
+    def write_indicator(self, indicator, need_whitespace,
+            whitespace=False, indention=False):
+        if self.whitespace or not need_whitespace:
+            data = indicator
+        else:
+            data = u' '+indicator
+        self.whitespace = whitespace
+        self.indention = self.indention and indention
+        self.column += len(data)
+        self.open_ended = False
+        if self.encoding:
+            data = data.encode(self.encoding)
+        self.stream.write(data)
+
+    def write_indent(self):
+        indent = self.indent or 0
+        if not self.indention or self.column > indent   \
+                or (self.column == indent and not self.whitespace):
+            self.write_line_break()
+        if self.column < indent:
+            self.whitespace = True
+            data = u' '*(indent-self.column)
+            self.column = indent
+            if self.encoding:
+                data = data.encode(self.encoding)
+            self.stream.write(data)
+
+    def write_line_break(self, data=None):
+        if data is None:
+            data = self.best_line_break
+        self.whitespace = True
+        self.indention = True
+        self.line += 1
+        self.column = 0
+        if self.encoding:
+            data = data.encode(self.encoding)
+        self.stream.write(data)
+
+    def write_version_directive(self, version_text):
+        data = u'%%YAML %s' % version_text
+        if self.encoding:
+            data = data.encode(self.encoding)
+        self.stream.write(data)
+        self.write_line_break()
+
+    def write_tag_directive(self, handle_text, prefix_text):
+        data = u'%%TAG %s %s' % (handle_text, prefix_text)
+        if self.encoding:
+            data = data.encode(self.encoding)
+        self.stream.write(data)
+        self.write_line_break()
+
+    # Scalar streams.
+
+    def write_single_quoted(self, text, split=True):
+        self.write_indicator(u'\'', True)
+        spaces = False
+        breaks = False
+        start = end = 0
+        while end <= len(text):
+            ch = None
+            if end < len(text):
+                ch = text[end]
+            if spaces:
+                if ch is None or ch != u' ':
+                    if start+1 == end and self.column > self.best_width and split   \
+                            and start != 0 and end != len(text):
+                        self.write_indent()
+                    else:
+                        data = text[start:end]
+                        self.column += len(data)
+                        if self.encoding:
+                            data = data.encode(self.encoding)
+                        self.stream.write(data)
+                    start = end
+            elif breaks:
+                if ch is None or ch not in u'\n\x85\u2028\u2029':
+                    if text[start] == u'\n':
+                        self.write_line_break()
+                    for br in text[start:end]:
+                        if br == u'\n':
+                            self.write_line_break()
+                        else:
+                            self.write_line_break(br)
+                    self.write_indent()
+                    start = end
+            else:
+                if ch is None or ch in u' \n\x85\u2028\u2029' or ch == u'\'':
+                    if start < end:
+                        data = text[start:end]
+                        self.column += len(data)
+                        if self.encoding:
+                            data = data.encode(self.encoding)
+                        self.stream.write(data)
+                        start = end
+            if ch == u'\'':
+                data = u'\'\''
+                self.column += 2
+                if self.encoding:
+                    data = data.encode(self.encoding)
+                self.stream.write(data)
+                start = end + 1
+            if ch is not None:
+                spaces = (ch == u' ')
+                breaks = (ch in u'\n\x85\u2028\u2029')
+            end += 1
+        self.write_indicator(u'\'', False)
+
+    ESCAPE_REPLACEMENTS = {
+        u'\0':      u'0',
+        u'\x07':    u'a',
+        u'\x08':    u'b',
+        u'\x09':    u't',
+        u'\x0A':    u'n',
+        u'\x0B':    u'v',
+        u'\x0C':    u'f',
+        u'\x0D':    u'r',
+        u'\x1B':    u'e',
+        u'\"':      u'\"',
+        u'\\':      u'\\',
+        u'\x85':    u'N',
+        u'\xA0':    u'_',
+        u'\u2028':  u'L',
+        u'\u2029':  u'P',
+    }
+
+    def write_double_quoted(self, text, split=True):
+        self.write_indicator(u'"', True)
+        start = end = 0
+        while end <= len(text):
+            ch = None
+            if end < len(text):
+                ch = text[end]
+            if ch is None or ch in u'"\\\x85\u2028\u2029\uFEFF' \
+                    or not (u'\x20' <= ch <= u'\x7E'
+                        or (self.allow_unicode
+                            and (u'\xA0' <= ch <= u'\uD7FF'
+                                or u'\uE000' <= ch <= u'\uFFFD'))):
+                if start < end:
+                    data = text[start:end]
+                    self.column += len(data)
+                    if self.encoding:
+                        data = data.encode(self.encoding)
+                    self.stream.write(data)
+                    start = end
+                if ch is not None:
+                    if ch in self.ESCAPE_REPLACEMENTS:
+                        data = u'\\'+self.ESCAPE_REPLACEMENTS[ch]
+                    elif ch <= u'\xFF':
+                        data = u'\\x%02X' % ord(ch)
+                    elif ch <= u'\uFFFF':
+                        data = u'\\u%04X' % ord(ch)
+                    else:
+                        data = u'\\U%08X' % ord(ch)
+                    self.column += len(data)
+                    if self.encoding:
+                        data = data.encode(self.encoding)
+                    self.stream.write(data)
+                    start = end+1
+            if 0 < end < len(text)-1 and (ch == u' ' or start >= end)   \
+                    and self.column+(end-start) > self.best_width and split:
+                data = text[start:end]+u'\\'
+                if start < end:
+                    start = end
+                self.column += len(data)
+                if self.encoding:
+                    data = data.encode(self.encoding)
+                self.stream.write(data)
+                self.write_indent()
+                self.whitespace = False
+                self.indention = False
+                if text[start] == u' ':
+                    data = u'\\'
+                    self.column += len(data)
+                    if self.encoding:
+                        data = data.encode(self.encoding)
+                    self.stream.write(data)
+            end += 1
+        self.write_indicator(u'"', False)
+
+    def determine_block_hints(self, text):
+        hints = u''
+        if text:
+            if text[0] in u' \n\x85\u2028\u2029':
+                hints += unicode(self.best_indent)
+            if text[-1] not in u'\n\x85\u2028\u2029':
+                hints += u'-'
+            elif len(text) == 1 or text[-2] in u'\n\x85\u2028\u2029':
+                hints += u'+'
+        return hints
+
+    def write_folded(self, text):
+        hints = self.determine_block_hints(text)
+        self.write_indicator(u'>'+hints, True)
+        if hints[-1:] == u'+':
+            self.open_ended = True
+        self.write_line_break()
+        leading_space = True
+        spaces = False
+        breaks = True
+        start = end = 0
+        while end <= len(text):
+            ch = None
+            if end < len(text):
+                ch = text[end]
+            if breaks:
+                if ch is None or ch not in u'\n\x85\u2028\u2029':
+                    if not leading_space and ch is not None and ch != u' '  \
+                            and text[start] == u'\n':
+                        self.write_line_break()
+                    leading_space = (ch == u' ')
+                    for br in text[start:end]:
+                        if br == u'\n':
+                            self.write_line_break()
+                        else:
+                            self.write_line_break(br)
+                    if ch is not None:
+                        self.write_indent()
+                    start = end
+            elif spaces:
+                if ch != u' ':
+                    if start+1 == end and self.column > self.best_width:
+                        self.write_indent()
+                    else:
+                        data = text[start:end]
+                        self.column += len(data)
+                        if self.encoding:
+                            data = data.encode(self.encoding)
+                        self.stream.write(data)
+                    start = end
+            else:
+                if ch is None or ch in u' \n\x85\u2028\u2029':
+                    data = text[start:end]
+                    self.column += len(data)
+                    if self.encoding:
+                        data = data.encode(self.encoding)
+                    self.stream.write(data)
+                    if ch is None:
+                        self.write_line_break()
+                    start = end
+            if ch is not None:
+                breaks = (ch in u'\n\x85\u2028\u2029')
+                spaces = (ch == u' ')
+            end += 1
+
+    def write_literal(self, text):
+        hints = self.determine_block_hints(text)
+        self.write_indicator(u'|'+hints, True)
+        if hints[-1:] == u'+':
+            self.open_ended = True
+        self.write_line_break()
+        breaks = True
+        start = end = 0
+        while end <= len(text):
+            ch = None
+            if end < len(text):
+                ch = text[end]
+            if breaks:
+                if ch is None or ch not in u'\n\x85\u2028\u2029':
+                    for br in text[start:end]:
+                        if br == u'\n':
+                            self.write_line_break()
+                        else:
+                            self.write_line_break(br)
+                    if ch is not None:
+                        self.write_indent()
+                    start = end
+            else:
+                if ch is None or ch in u'\n\x85\u2028\u2029':
+                    data = text[start:end]
+                    if self.encoding:
+                        data = data.encode(self.encoding)
+                    self.stream.write(data)
+                    if ch is None:
+                        self.write_line_break()
+                    start = end
+            if ch is not None:
+                breaks = (ch in u'\n\x85\u2028\u2029')
+            end += 1
+
+    def write_plain(self, text, split=True):
+        if self.root_context:
+            self.open_ended = True
+        if not text:
+            return
+        if not self.whitespace:
+            data = u' '
+            self.column += len(data)
+            if self.encoding:
+                data = data.encode(self.encoding)
+            self.stream.write(data)
+        self.whitespace = False
+        self.indention = False
+        spaces = False
+        breaks = False
+        start = end = 0
+        while end <= len(text):
+            ch = None
+            if end < len(text):
+                ch = text[end]
+            if spaces:
+                if ch != u' ':
+                    if start+1 == end and self.column > self.best_width and split:
+                        self.write_indent()
+                        self.whitespace = False
+                        self.indention = False
+                    else:
+                        data = text[start:end]
+                        self.column += len(data)
+                        if self.encoding:
+                            data = data.encode(self.encoding)
+                        self.stream.write(data)
+                    start = end
+            elif breaks:
+                if ch not in u'\n\x85\u2028\u2029':
+                    if text[start] == u'\n':
+                        self.write_line_break()
+                    for br in text[start:end]:
+                        if br == u'\n':
+                            self.write_line_break()
+                        else:
+                            self.write_line_break(br)
+                    self.write_indent()
+                    self.whitespace = False
+                    self.indention = False
+                    start = end
+            else:
+                if ch is None or ch in u' \n\x85\u2028\u2029':
+                    data = text[start:end]
+                    self.column += len(data)
+                    if self.encoding:
+                        data = data.encode(self.encoding)
+                    self.stream.write(data)
+                    start = end
+            if ch is not None:
+                spaces = (ch == u' ')
+                breaks = (ch in u'\n\x85\u2028\u2029')
+            end += 1
+
diff --git a/lib/yaml/error.py b/lib/yaml/error.py
new file mode 100644
index 00000000..577686db
--- /dev/null
+++ b/lib/yaml/error.py
@@ -0,0 +1,75 @@
+
+__all__ = ['Mark', 'YAMLError', 'MarkedYAMLError']
+
+class Mark(object):
+
+    def __init__(self, name, index, line, column, buffer, pointer):
+        self.name = name
+        self.index = index
+        self.line = line
+        self.column = column
+        self.buffer = buffer
+        self.pointer = pointer
+
+    def get_snippet(self, indent=4, max_length=75):
+        if self.buffer is None:
+            return None
+        head = ''
+        start = self.pointer
+        while start > 0 and self.buffer[start-1] not in u'\0\r\n\x85\u2028\u2029':
+            start -= 1
+            if self.pointer-start > max_length/2-1:
+                head = ' ... '
+                start += 5
+                break
+        tail = ''
+        end = self.pointer
+        while end < len(self.buffer) and self.buffer[end] not in u'\0\r\n\x85\u2028\u2029':
+            end += 1
+            if end-self.pointer > max_length/2-1:
+                tail = ' ... '
+                end -= 5
+                break
+        snippet = self.buffer[start:end].encode('utf-8')
+        return ' '*indent + head + snippet + tail + '\n'  \
+                + ' '*(indent+self.pointer-start+len(head)) + '^'
+
+    def __str__(self):
+        snippet = self.get_snippet()
+        where = "  in \"%s\", line %d, column %d"   \
+                % (self.name, self.line+1, self.column+1)
+        if snippet is not None:
+            where += ":\n"+snippet
+        return where
+
+class YAMLError(Exception):
+    pass
+
+class MarkedYAMLError(YAMLError):
+
+    def __init__(self, context=None, context_mark=None,
+            problem=None, problem_mark=None, note=None):
+        self.context = context
+        self.context_mark = context_mark
+        self.problem = problem
+        self.problem_mark = problem_mark
+        self.note = note
+
+    def __str__(self):
+        lines = []
+        if self.context is not None:
+            lines.append(self.context)
+        if self.context_mark is not None  \
+            and (self.problem is None or self.problem_mark is None
+                    or self.context_mark.name != self.problem_mark.name
+                    or self.context_mark.line != self.problem_mark.line
+                    or self.context_mark.column != self.problem_mark.column):
+            lines.append(str(self.context_mark))
+        if self.problem is not None:
+            lines.append(self.problem)
+        if self.problem_mark is not None:
+            lines.append(str(self.problem_mark))
+        if self.note is not None:
+            lines.append(self.note)
+        return '\n'.join(lines)
+
diff --git a/lib/yaml/events.py b/lib/yaml/events.py
new file mode 100644
index 00000000..f79ad389
--- /dev/null
+++ b/lib/yaml/events.py
@@ -0,0 +1,86 @@
+
+# Abstract classes.
+
+class Event(object):
+    def __init__(self, start_mark=None, end_mark=None):
+        self.start_mark = start_mark
+        self.end_mark = end_mark
+    def __repr__(self):
+        attributes = [key for key in ['anchor', 'tag', 'implicit', 'value']
+                if hasattr(self, key)]
+        arguments = ', '.join(['%s=%r' % (key, getattr(self, key))
+                for key in attributes])
+        return '%s(%s)' % (self.__class__.__name__, arguments)
+
+class NodeEvent(Event):
+    def __init__(self, anchor, start_mark=None, end_mark=None):
+        self.anchor = anchor
+        self.start_mark = start_mark
+        self.end_mark = end_mark
+
+class CollectionStartEvent(NodeEvent):
+    def __init__(self, anchor, tag, implicit, start_mark=None, end_mark=None,
+            flow_style=None):
+        self.anchor = anchor
+        self.tag = tag
+        self.implicit = implicit
+        self.start_mark = start_mark
+        self.end_mark = end_mark
+        self.flow_style = flow_style
+
+class CollectionEndEvent(Event):
+    pass
+
+# Implementations.
+
+class StreamStartEvent(Event):
+    def __init__(self, start_mark=None, end_mark=None, encoding=None):
+        self.start_mark = start_mark
+        self.end_mark = end_mark
+        self.encoding = encoding
+
+class StreamEndEvent(Event):
+    pass
+
+class DocumentStartEvent(Event):
+    def __init__(self, start_mark=None, end_mark=None,
+            explicit=None, version=None, tags=None):
+        self.start_mark = start_mark
+        self.end_mark = end_mark
+        self.explicit = explicit
+        self.version = version
+        self.tags = tags
+
+class DocumentEndEvent(Event):
+    def __init__(self, start_mark=None, end_mark=None,
+            explicit=None):
+        self.start_mark = start_mark
+        self.end_mark = end_mark
+        self.explicit = explicit
+
+class AliasEvent(NodeEvent):
+    pass
+
+class ScalarEvent(NodeEvent):
+    def __init__(self, anchor, tag, implicit, value,
+            start_mark=None, end_mark=None, style=None):
+        self.anchor = anchor
+        self.tag = tag
+        self.implicit = implicit
+        self.value = value
+        self.start_mark = start_mark
+        self.end_mark = end_mark
+        self.style = style
+
+class SequenceStartEvent(CollectionStartEvent):
+    pass
+
+class SequenceEndEvent(CollectionEndEvent):
+    pass
+
+class MappingStartEvent(CollectionStartEvent):
+    pass
+
+class MappingEndEvent(CollectionEndEvent):
+    pass
+
diff --git a/lib/yaml/loader.py b/lib/yaml/loader.py
new file mode 100644
index 00000000..293ff467
--- /dev/null
+++ b/lib/yaml/loader.py
@@ -0,0 +1,40 @@
+
+__all__ = ['BaseLoader', 'SafeLoader', 'Loader']
+
+from reader import *
+from scanner import *
+from parser import *
+from composer import *
+from constructor import *
+from resolver import *
+
+class BaseLoader(Reader, Scanner, Parser, Composer, BaseConstructor, BaseResolver):
+
+    def __init__(self, stream):
+        Reader.__init__(self, stream)
+        Scanner.__init__(self)
+        Parser.__init__(self)
+        Composer.__init__(self)
+        BaseConstructor.__init__(self)
+        BaseResolver.__init__(self)
+
+class SafeLoader(Reader, Scanner, Parser, Composer, SafeConstructor, Resolver):
+
+    def __init__(self, stream):
+        Reader.__init__(self, stream)
+        Scanner.__init__(self)
+        Parser.__init__(self)
+        Composer.__init__(self)
+        SafeConstructor.__init__(self)
+        Resolver.__init__(self)
+
+class Loader(Reader, Scanner, Parser, Composer, Constructor, Resolver):
+
+    def __init__(self, stream):
+        Reader.__init__(self, stream)
+        Scanner.__init__(self)
+        Parser.__init__(self)
+        Composer.__init__(self)
+        Constructor.__init__(self)
+        Resolver.__init__(self)
+
diff --git a/lib/yaml/nodes.py b/lib/yaml/nodes.py
new file mode 100644
index 00000000..c4f070c4
--- /dev/null
+++ b/lib/yaml/nodes.py
@@ -0,0 +1,49 @@
+
+class Node(object):
+    def __init__(self, tag, value, start_mark, end_mark):
+        self.tag = tag
+        self.value = value
+        self.start_mark = start_mark
+        self.end_mark = end_mark
+    def __repr__(self):
+        value = self.value
+        #if isinstance(value, list):
+        #    if len(value) == 0:
+        #        value = '<empty>'
+        #    elif len(value) == 1:
+        #        value = '<1 item>'
+        #    else:
+        #        value = '<%d items>' % len(value)
+        #else:
+        #    if len(value) > 75:
+        #        value = repr(value[:70]+u' ... ')
+        #    else:
+        #        value = repr(value)
+        value = repr(value)
+        return '%s(tag=%r, value=%s)' % (self.__class__.__name__, self.tag, value)
+
+class ScalarNode(Node):
+    id = 'scalar'
+    def __init__(self, tag, value,
+            start_mark=None, end_mark=None, style=None):
+        self.tag = tag
+        self.value = value
+        self.start_mark = start_mark
+        self.end_mark = end_mark
+        self.style = style
+
+class CollectionNode(Node):
+    def __init__(self, tag, value,
+            start_mark=None, end_mark=None, flow_style=None):
+        self.tag = tag
+        self.value = value
+        self.start_mark = start_mark
+        self.end_mark = end_mark
+        self.flow_style = flow_style
+
+class SequenceNode(CollectionNode):
+    id = 'sequence'
+
+class MappingNode(CollectionNode):
+    id = 'mapping'
+
diff --git a/lib/yaml/parser.py b/lib/yaml/parser.py
new file mode 100644
index 00000000..ffec9552
--- /dev/null
+++ b/lib/yaml/parser.py
@@ -0,0 +1,589 @@
+
+# The following YAML grammar is LL(1) and is parsed by a recursive descent
+# parser.
+#
+# stream            ::= STREAM-START implicit_document? explicit_document* STREAM-END
+# implicit_document ::= block_node DOCUMENT-END*
+# explicit_document ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
+# block_node_or_indentless_sequence ::=
+#                       ALIAS
+#                       | properties (block_content | indentless_block_sequence)?
+#                       | block_content
+#                       | indentless_block_sequence
+# block_node        ::= ALIAS
+#                       | properties block_content?
+#                       | block_content
+# flow_node         ::= ALIAS
+#                       | properties flow_content?
+#                       | flow_content
+# properties        ::= TAG ANCHOR? | ANCHOR TAG?
+# block_content     ::= block_collection | flow_collection | SCALAR
+# flow_content      ::= flow_collection | SCALAR
+# block_collection  ::= block_sequence | block_mapping
+# flow_collection   ::= flow_sequence | flow_mapping
+# block_sequence    ::= BLOCK-SEQUENCE-START (BLOCK-ENTRY block_node?)* BLOCK-END
+# indentless_sequence   ::= (BLOCK-ENTRY block_node?)+
+# block_mapping     ::= BLOCK-MAPPING_START
+#                       ((KEY block_node_or_indentless_sequence?)?
+#                       (VALUE block_node_or_indentless_sequence?)?)*
+#                       BLOCK-END
+# flow_sequence     ::= FLOW-SEQUENCE-START
+#                       (flow_sequence_entry FLOW-ENTRY)*
+#                       flow_sequence_entry?
+#                       FLOW-SEQUENCE-END
+# flow_sequence_entry   ::= flow_node | KEY flow_node? (VALUE flow_node?)?
+# flow_mapping      ::= FLOW-MAPPING-START
+#                       (flow_mapping_entry FLOW-ENTRY)*
+#                       flow_mapping_entry?
+#                       FLOW-MAPPING-END
+# flow_mapping_entry    ::= flow_node | KEY flow_node? (VALUE flow_node?)?
+#
+# FIRST sets:
+#
+# stream: { STREAM-START }
+# explicit_document: { DIRECTIVE DOCUMENT-START }
+# implicit_document: FIRST(block_node)
+# block_node: { ALIAS TAG ANCHOR SCALAR BLOCK-SEQUENCE-START BLOCK-MAPPING-START FLOW-SEQUENCE-START FLOW-MAPPING-START }
+# flow_node: { ALIAS ANCHOR TAG SCALAR FLOW-SEQUENCE-START FLOW-MAPPING-START }
+# block_content: { BLOCK-SEQUENCE-START BLOCK-MAPPING-START FLOW-SEQUENCE-START FLOW-MAPPING-START SCALAR }
+# flow_content: { FLOW-SEQUENCE-START FLOW-MAPPING-START SCALAR }
+# block_collection: { BLOCK-SEQUENCE-START BLOCK-MAPPING-START }
+# flow_collection: { FLOW-SEQUENCE-START FLOW-MAPPING-START }
+# block_sequence: { BLOCK-SEQUENCE-START }
+# block_mapping: { BLOCK-MAPPING-START }
+# block_node_or_indentless_sequence: { ALIAS ANCHOR TAG SCALAR BLOCK-SEQUENCE-START BLOCK-MAPPING-START FLOW-SEQUENCE-START FLOW-MAPPING-START BLOCK-ENTRY }
+# indentless_sequence: { ENTRY }
+# flow_collection: { FLOW-SEQUENCE-START FLOW-MAPPING-START }
+# flow_sequence: { FLOW-SEQUENCE-START }
+# flow_mapping: { FLOW-MAPPING-START }
+# flow_sequence_entry: { ALIAS ANCHOR TAG SCALAR FLOW-SEQUENCE-START FLOW-MAPPING-START KEY }
+# flow_mapping_entry: { ALIAS ANCHOR TAG SCALAR FLOW-SEQUENCE-START FLOW-MAPPING-START KEY }
+
+__all__ = ['Parser', 'ParserError']
+
+from error import MarkedYAMLError
+from tokens import *
+from events import *
+from scanner import *
+
+class ParserError(MarkedYAMLError):
+    pass
+
+class Parser(object):
+    # Since writing a recursive-descendant parser is a straightforward task, we
+    # do not give many comments here.
+
+    DEFAULT_TAGS = {
+        u'!':   u'!',
+        u'!!':  u'tag:yaml.org,2002:',
+    }
+
+    def __init__(self):
+        self.current_event = None
+        self.yaml_version = None
+        self.tag_handles = {}
+        self.states = []
+        self.marks = []
+        self.state = self.parse_stream_start
+
+    def dispose(self):
+        # Reset the state attributes (to clear self-references)
+        self.states = []
+        self.state = None
+
+    def check_event(self, *choices):
+        # Check the type of the next event.
+        if self.current_event is None:
+            if self.state:
+                self.current_event = self.state()
+        if self.current_event is not None:
+            if not choices:
+                return True
+            for choice in choices:
+                if isinstance(self.current_event, choice):
+                    return True
+        return False
+
+    def peek_event(self):
+        # Get the next event.
+        if self.current_event is None:
+            if self.state:
+                self.current_event = self.state()
+        return self.current_event
+
+    def get_event(self):
+        # Get the next event and proceed further.
+        if self.current_event is None:
+            if self.state:
+                self.current_event = self.state()
+        value = self.current_event
+        self.current_event = None
+        return value
+
+    # stream    ::= STREAM-START implicit_document? explicit_document* STREAM-END
+    # implicit_document ::= block_node DOCUMENT-END*
+    # explicit_document ::= DIRECTIVE* DOCUMENT-START block_node? DOCUMENT-END*
+
+    def parse_stream_start(self):
+
+        # Parse the stream start.
+        token = self.get_token()
+        event = StreamStartEvent(token.start_mark, token.end_mark,
+                encoding=token.encoding)
+
+        # Prepare the next state.
+        self.state = self.parse_implicit_document_start
+
+        return event
+
+    def parse_implicit_document_start(self):
+
+        # Parse an implicit document.
+        if not self.check_token(DirectiveToken, DocumentStartToken,
+                StreamEndToken):
+            self.tag_handles = self.DEFAULT_TAGS
+            token = self.peek_token()
+            start_mark = end_mark = token.start_mark
+            event = DocumentStartEvent(start_mark, end_mark,
+                    explicit=False)
+
+            # Prepare the next state.
+            self.states.append(self.parse_document_end)
+            self.state = self.parse_block_node
+
+            return event
+
+        else:
+            return self.parse_document_start()
+
+    def parse_document_start(self):
+
+        # Parse any extra document end indicators.
+        while self.check_token(DocumentEndToken):
+            self.get_token()
+
+        # Parse an explicit document.
+        if not self.check_token(StreamEndToken):
+            token = self.peek_token()
+            start_mark = token.start_mark
+            version, tags = self.process_directives()
+            if not self.check_token(DocumentStartToken):
+                raise ParserError(None, None,
+                        "expected '<document start>', but found %r"
+                        % self.peek_token().id,
+                        self.peek_token().start_mark)
+            token = self.get_token()
+            end_mark = token.end_mark
+            event = DocumentStartEvent(start_mark, end_mark,
+                    explicit=True, version=version, tags=tags)
+            self.states.append(self.parse_document_end)
+            self.state = self.parse_document_content
+        else:
+            # Parse the end of the stream.
+            token = self.get_token()
+            event = StreamEndEvent(token.start_mark, token.end_mark)
+            assert not self.states
+            assert not self.marks
+            self.state = None
+        return event
+
+    def parse_document_end(self):
+
+        # Parse the document end.
+        token = self.peek_token()
+        start_mark = end_mark = token.start_mark
+        explicit = False
+        if self.check_token(DocumentEndToken):
+            token = self.get_token()
+            end_mark = token.end_mark
+            explicit = True
+        event = DocumentEndEvent(start_mark, end_mark,
+                explicit=explicit)
+
+        # Prepare the next state.
+        self.state = self.parse_document_start
+
+        return event
+
+    def parse_document_content(self):
+        if self.check_token(DirectiveToken,
+                DocumentStartToken, DocumentEndToken, StreamEndToken):
+            event = self.process_empty_scalar(self.peek_token().start_mark)
+            self.state = self.states.pop()
+            return event
+        else:
+            return self.parse_block_node()
+
+    def process_directives(self):
+        self.yaml_version = None
+        self.tag_handles = {}
+        while self.check_token(DirectiveToken):
+            token = self.get_token()
+            if token.name == u'YAML':
+                if self.yaml_version is not None:
+                    raise ParserError(None, None,
+                            "found duplicate YAML directive", token.start_mark)
+                major, minor = token.value
+                if major != 1:
+                    raise ParserError(None, None,
+                            "found incompatible YAML document (version 1.* is required)",
+                            token.start_mark)
+                self.yaml_version = token.value
+            elif token.name == u'TAG':
+                handle, prefix = token.value
+                if handle in self.tag_handles:
+                    raise ParserError(None, None,
+                            "duplicate tag handle %r" % handle.encode('utf-8'),
+                            token.start_mark)
+                self.tag_handles[handle] = prefix
+        if self.tag_handles:
+            value = self.yaml_version, self.tag_handles.copy()
+        else:
+            value = self.yaml_version, None
+        for key in self.DEFAULT_TAGS:
+            if key not in self.tag_handles:
+                self.tag_handles[key] = self.DEFAULT_TAGS[key]
+        return value
+
+    # block_node_or_indentless_sequence ::= ALIAS
+    #               | properties (block_content | indentless_block_sequence)?
+    #               | block_content
+    #               | indentless_block_sequence
+    # block_node    ::= ALIAS
+    #                   | properties block_content?
+    #                   | block_content
+    # flow_node     ::= ALIAS
+    #                   | properties flow_content?
+    #                   | flow_content
+    # properties    ::= TAG ANCHOR? | ANCHOR TAG?
+    # block_content     ::= block_collection | flow_collection | SCALAR
+    # flow_content      ::= flow_collection | SCALAR
+    # block_collection  ::= block_sequence | block_mapping
+    # flow_collection   ::= flow_sequence | flow_mapping
+
+    def parse_block_node(self):
+        return self.parse_node(block=True)
+
+    def parse_flow_node(self):
+        return self.parse_node()
+
+    def parse_block_node_or_indentless_sequence(self):
+        return self.parse_node(block=True, indentless_sequence=True)
+
+    def parse_node(self, block=False, indentless_sequence=False):
+        if self.check_token(AliasToken):
+            token = self.get_token()
+            event = AliasEvent(token.value, token.start_mark, token.end_mark)
+            self.state = self.states.pop()
+        else:
+            anchor = None
+            tag = None
+            start_mark = end_mark = tag_mark = None
+            if self.check_token(AnchorToken):
+                token = self.get_token()
+                start_mark = token.start_mark
+                end_mark = token.end_mark
+                anchor = token.value
+                if self.check_token(TagToken):
+                    token = self.get_token()
+                    tag_mark = token.start_mark
+                    end_mark = token.end_mark
+                    tag = token.value
+            elif self.check_token(TagToken):
+                token = self.get_token()
+                start_mark = tag_mark = token.start_mark
+                end_mark = token.end_mark
+                tag = token.value
+                if self.check_token(AnchorToken):
+                    token = self.get_token()
+                    end_mark = token.end_mark
+                    anchor = token.value
+            if tag is not None:
+                handle, suffix = tag
+                if handle is not None:
+                    if handle not in self.tag_handles:
+                        raise ParserError("while parsing a node", start_mark,
+                                "found undefined tag handle %r" % handle.encode('utf-8'),
+                                tag_mark)
+                    tag = self.tag_handles[handle]+suffix
+                else:
+                    tag = suffix
+            #if tag == u'!':
+            #    raise ParserError("while parsing a node", start_mark,
+            #            "found non-specific tag '!'", tag_mark,
+            #            "Please check 'http://pyyaml.org/wiki/YAMLNonSpecificTag' and share your opinion.")
+            if start_mark is None:
+                start_mark = end_mark = self.peek_token().start_mark
+            event = None
+            implicit = (tag is None or tag == u'!')
+            if indentless_sequence and self.check_token(BlockEntryToken):
+                end_mark = self.peek_token().end_mark
+                event = SequenceStartEvent(anchor, tag, implicit,
+                        start_mark, end_mark)
+                self.state = self.parse_indentless_sequence_entry
+            else:
+                if self.check_token(ScalarToken):
+                    token = self.get_token()
+                    end_mark = token.end_mark
+                    if (token.plain and tag is None) or tag == u'!':
+                        implicit = (True, False)
+                    elif tag is None:
+                        implicit = (False, True)
+                    else:
+                        implicit = (False, False)
+                    event = ScalarEvent(anchor, tag, implicit, token.value,
+                            start_mark, end_mark, style=token.style)
+                    self.state = self.states.pop()
+                elif self.check_token(FlowSequenceStartToken):
+                    end_mark = self.peek_token().end_mark
+                    event = SequenceStartEvent(anchor, tag, implicit,
+                            start_mark, end_mark, flow_style=True)
+                    self.state = self.parse_flow_sequence_first_entry
+                elif self.check_token(FlowMappingStartToken):
+                    end_mark = self.peek_token().end_mark
+                    event = MappingStartEvent(anchor, tag, implicit,
+                            start_mark, end_mark, flow_style=True)
+                    self.state = self.parse_flow_mapping_first_key
+                elif block and self.check_token(BlockSequenceStartToken):
+                    end_mark = self.peek_token().start_mark
+                    event = SequenceStartEvent(anchor, tag, implicit,
+                            start_mark, end_mark, flow_style=False)
+                    self.state = self.parse_block_sequence_first_entry
+                elif block and self.check_token(BlockMappingStartToken):
+                    end_mark = self.peek_token().start_mark
+                    event = MappingStartEvent(anchor, tag, implicit,
+                            start_mark, end_mark, flow_style=False)
+                    self.state = self.parse_block_mapping_first_key
+                elif anchor is not None or tag is not None:
+                    # Empty scalars are allowed even if a tag or an anchor is
+                    # specified.
+                    event = ScalarEvent(anchor, tag, (implicit, False), u'',
+                            start_mark, end_mark)
+                    self.state = self.states.pop()
+                else:
+                    if block:
+                        node = 'block'
+                    else:
+                        node = 'flow'
+                    token = self.peek_token()
+                    raise ParserError("while parsing a %s node" % node, start_mark,
+                            "expected the node content, but found %r" % token.id,
+                            token.start_mark)
+        return event
+
+    # block_sequence ::= BLOCK-SEQUENCE-START (BLOCK-ENTRY block_node?)* BLOCK-END
+
+    def parse_block_sequence_first_entry(self):
+        token = self.get_token()
+        self.marks.append(token.start_mark)
+        return self.parse_block_sequence_entry()
+
+    def parse_block_sequence_entry(self):
+        if self.check_token(BlockEntryToken):
+            token = self.get_token()
+            if not self.check_token(BlockEntryToken, BlockEndToken):
+                self.states.append(self.parse_block_sequence_entry)
+                return self.parse_block_node()
+            else:
+                self.state = self.parse_block_sequence_entry
+                return self.process_empty_scalar(token.end_mark)
+        if not self.check_token(BlockEndToken):
+            token = self.peek_token()
+            raise ParserError("while parsing a block collection", self.marks[-1],
+                    "expected <block end>, but found %r" % token.id, token.start_mark)
+        token = self.get_token()
+        event = SequenceEndEvent(token.start_mark, token.end_mark)
+        self.state = self.states.pop()
+        self.marks.pop()
+        return event
+
+    # indentless_sequence ::= (BLOCK-ENTRY block_node?)+
+
+    def parse_indentless_sequence_entry(self):
+        if self.check_token(BlockEntryToken):
+            token = self.get_token()
+            if not self.check_token(BlockEntryToken,
+                    KeyToken, ValueToken, BlockEndToken):
+                self.states.append(self.parse_indentless_sequence_entry)
+                return self.parse_block_node()
+            else:
+                self.state = self.parse_indentless_sequence_entry
+                return self.process_empty_scalar(token.end_mark)
+        token = self.peek_token()
+        event = SequenceEndEvent(token.start_mark, token.start_mark)
+        self.state = self.states.pop()
+        return event
+
+    # block_mapping     ::= BLOCK-MAPPING_START
+    #                       ((KEY block_node_or_indentless_sequence?)?
+    #                       (VALUE block_node_or_indentless_sequence?)?)*
+    #                       BLOCK-END
+
+    def parse_block_mapping_first_key(self):
+        token = self.get_token()
+        self.marks.append(token.start_mark)
+        return self.parse_block_mapping_key()
+
+    def parse_block_mapping_key(self):
+        if self.check_token(KeyToken):
+            token = self.get_token()
+            if not self.check_token(KeyToken, ValueToken, BlockEndToken):
+                self.states.append(self.parse_block_mapping_value)
+                return self.parse_block_node_or_indentless_sequence()
+            else:
+                self.state = self.parse_block_mapping_value
+                return self.process_empty_scalar(token.end_mark)
+        if not self.check_token(BlockEndToken):
+            token = self.peek_token()
+            raise ParserError("while parsing a block mapping", self.marks[-1],
+                    "expected <block end>, but found %r" % token.id, token.start_mark)
+        token = self.get_token()
+        event = MappingEndEvent(token.start_mark, token.end_mark)
+        self.state = self.states.pop()
+        self.marks.pop()
+        return event
+
+    def parse_block_mapping_value(self):
+        if self.check_token(ValueToken):
+            token = self.get_token()
+            if not self.check_token(KeyToken, ValueToken, BlockEndToken):
+                self.states.append(self.parse_block_mapping_key)
+                return self.parse_block_node_or_indentless_sequence()
+            else:
+                self.state = self.parse_block_mapping_key
+                return self.process_empty_scalar(token.end_mark)
+        else:
+            self.state = self.parse_block_mapping_key
+            token = self.peek_token()
+            return self.process_empty_scalar(token.start_mark)
+
+    # flow_sequence     ::= FLOW-SEQUENCE-START
+    #                       (flow_sequence_entry FLOW-ENTRY)*
+    #                       flow_sequence_entry?
+    #                       FLOW-SEQUENCE-END
+    # flow_sequence_entry   ::= flow_node | KEY flow_node? (VALUE flow_node?)?
+    #
+    # Note that while production rules for both flow_sequence_entry and
+    # flow_mapping_entry are equal, their interpretations are different.
+    # For `flow_sequence_entry`, the part `KEY flow_node? (VALUE flow_node?)?`
+    # generate an inline mapping (set syntax).
+
+    def parse_flow_sequence_first_entry(self):
+        token = self.get_token()
+        self.marks.append(token.start_mark)
+        return self.parse_flow_sequence_entry(first=True)
+
+    def parse_flow_sequence_entry(self, first=False):
+        if not self.check_token(FlowSequenceEndToken):
+            if not first:
+                if self.check_token(FlowEntryToken):
+                    self.get_token()
+                else:
+                    token = self.peek_token()
+                    raise ParserError("while parsing a flow sequence", self.marks[-1],
+                            "expected ',' or ']', but got %r" % token.id, token.start_mark)
+
+            if self.check_token(KeyToken):
+                token = self.peek_token()
+                event = MappingStartEvent(None, None, True,
+                        token.start_mark, token.end_mark,
+                        flow_style=True)
+                self.state = self.parse_flow_sequence_entry_mapping_key
+                return event
+            elif not self.check_token(FlowSequenceEndToken):
+                self.states.append(self.parse_flow_sequence_entry)
+                return self.parse_flow_node()
+        token = self.get_token()
+        event = SequenceEndEvent(token.start_mark, token.end_mark)
+        self.state = self.states.pop()
+        self.marks.pop()
+        return event
+
+    def parse_flow_sequence_entry_mapping_key(self):
+        token = self.get_token()
+        if not self.check_token(ValueToken,
+                FlowEntryToken, FlowSequenceEndToken):
+            self.states.append(self.parse_flow_sequence_entry_mapping_value)
+            return self.parse_flow_node()
+        else:
+            self.state = self.parse_flow_sequence_entry_mapping_value
+            return self.process_empty_scalar(token.end_mark)
+
+    def parse_flow_sequence_entry_mapping_value(self):
+        if self.check_token(ValueToken):
+            token = self.get_token()
+            if not self.check_token(FlowEntryToken, FlowSequenceEndToken):
+                self.states.append(self.parse_flow_sequence_entry_mapping_end)
+                return self.parse_flow_node()
+            else:
+                self.state = self.parse_flow_sequence_entry_mapping_end
+                return self.process_empty_scalar(token.end_mark)
+        else:
+            self.state = self.parse_flow_sequence_entry_mapping_end
+            token = self.peek_token()
+            return self.process_empty_scalar(token.start_mark)
+
+    def parse_flow_sequence_entry_mapping_end(self):
+        self.state = self.parse_flow_sequence_entry
+        token = self.peek_token()
+        return MappingEndEvent(token.start_mark, token.start_mark)
+
+    # flow_mapping  ::= FLOW-MAPPING-START
+    #                   (flow_mapping_entry FLOW-ENTRY)*
+    #                   flow_mapping_entry?
+    #                   FLOW-MAPPING-END
+    # flow_mapping_entry    ::= flow_node | KEY flow_node? (VALUE flow_node?)?
+
+    def parse_flow_mapping_first_key(self):
+        token = self.get_token()
+        self.marks.append(token.start_mark)
+        return self.parse_flow_mapping_key(first=True)
+
+    def parse_flow_mapping_key(self, first=False):
+        if not self.check_token(FlowMappingEndToken):
+            if not first:
+                if self.check_token(FlowEntryToken):
+                    self.get_token()
+                else:
+                    token = self.peek_token()
+                    raise ParserError("while parsing a flow mapping", self.marks[-1],
+                            "expected ',' or '}', but got %r" % token.id, token.start_mark)
+            if self.check_token(KeyToken):
+                token = self.get_token()
+                if not self.check_token(ValueToken,
+                        FlowEntryToken, FlowMappingEndToken):
+                    self.states.append(self.parse_flow_mapping_value)
+                    return self.parse_flow_node()
+                else:
+                    self.state = self.parse_flow_mapping_value
+                    return self.process_empty_scalar(token.end_mark)
+            elif not self.check_token(FlowMappingEndToken):
+                self.states.append(self.parse_flow_mapping_empty_value)
+                return self.parse_flow_node()
+        token = self.get_token()
+        event = MappingEndEvent(token.start_mark, token.end_mark)
+        self.state = self.states.pop()
+        self.marks.pop()
+        return event
+
+    def parse_flow_mapping_value(self):
+        if self.check_token(ValueToken):
+            token = self.get_token()
+            if not self.check_token(FlowEntryToken, FlowMappingEndToken):
+                self.states.append(self.parse_flow_mapping_key)
+                return self.parse_flow_node()
+            else:
+                self.state = self.parse_flow_mapping_key
+                return self.process_empty_scalar(token.end_mark)
+        else:
+            self.state = self.parse_flow_mapping_key
+            token = self.peek_token()
+            return self.process_empty_scalar(token.start_mark)
+
+    def parse_flow_mapping_empty_value(self):
+        self.state = self.parse_flow_mapping_key
+        return self.process_empty_scalar(self.peek_token().start_mark)
+
+    def process_empty_scalar(self, mark):
+        return ScalarEvent(None, None, (True, False), u'', mark, mark)
+
diff --git a/lib/yaml/reader.py b/lib/yaml/reader.py
new file mode 100644
index 00000000..3249e6b9
--- /dev/null
+++ b/lib/yaml/reader.py
@@ -0,0 +1,190 @@
+# This module contains abstractions for the input stream. You don't have to
+# looks further, there are no pretty code.
+#
+# We define two classes here.
+#
+#   Mark(source, line, column)
+# It's just a record and its only use is producing nice error messages.
+# Parser does not use it for any other purposes.
+#
+#   Reader(source, data)
+# Reader determines the encoding of `data` and converts it to unicode.
+# Reader provides the following methods and attributes:
+#   reader.peek(length=1) - return the next `length` characters
+#   reader.forward(length=1) - move the current position to `length` characters.
+#   reader.index - the number of the current character.
+#   reader.line, stream.column - the line and the column of the current character.
+
+__all__ = ['Reader', 'ReaderError']
+
+from error import YAMLError, Mark
+
+import codecs, re
+
+class ReaderError(YAMLError):
+
+    def __init__(self, name, position, character, encoding, reason):
+        self.name = name
+        self.character = character
+        self.position = position
+        self.encoding = encoding
+        self.reason = reason
+
+    def __str__(self):
+        if isinstance(self.character, str):
+            return "'%s' codec can't decode byte #x%02x: %s\n"  \
+                    "  in \"%s\", position %d"    \
+                    % (self.encoding, ord(self.character), self.reason,
+                            self.name, self.position)
+        else:
+            return "unacceptable character #x%04x: %s\n"    \
+                    "  in \"%s\", position %d"    \
+                    % (self.character, self.reason,
+                            self.name, self.position)
+
+class Reader(object):
+    # Reader:
+    # - determines the data encoding and converts it to unicode,
+    # - checks if characters are in allowed range,
+    # - adds '\0' to the end.
+
+    # Reader accepts
+    #  - a `str` object,
+    #  - a `unicode` object,
+    #  - a file-like object with its `read` method returning `str`,
+    #  - a file-like object with its `read` method returning `unicode`.
+
+    # Yeah, it's ugly and slow.
+
+    def __init__(self, stream):
+        self.name = None
+        self.stream = None
+        self.stream_pointer = 0
+        self.eof = True
+        self.buffer = u''
+        self.pointer = 0
+        self.raw_buffer = None
+        self.raw_decode = None
+        self.encoding = None
+        self.index = 0
+        self.line = 0
+        self.column = 0
+        if isinstance(stream, unicode):
+            self.name = "<unicode string>"
+            self.check_printable(stream)
+            self.buffer = stream+u'\0'
+        elif isinstance(stream, str):
+            self.name = "<string>"
+            self.raw_buffer = stream
+            self.determine_encoding()
+        else:
+            self.stream = stream
+            self.name = getattr(stream, 'name', "<file>")
+            self.eof = False
+            self.raw_buffer = ''
+            self.determine_encoding()
+
+    def peek(self, index=0):
+        try:
+            return self.buffer[self.pointer+index]
+        except IndexError:
+            self.update(index+1)
+            return self.buffer[self.pointer+index]
+
+    def prefix(self, length=1):
+        if self.pointer+length >= len(self.buffer):
+            self.update(length)
+        return self.buffer[self.pointer:self.pointer+length]
+
+    def forward(self, length=1):
+        if self.pointer+length+1 >= len(self.buffer):
+            self.update(length+1)
+        while length:
+            ch = self.buffer[self.pointer]
+            self.pointer += 1
+            self.index += 1
+            if ch in u'\n\x85\u2028\u2029'  \
+                    or (ch == u'\r' and self.buffer[self.pointer] != u'\n'):
+                self.line += 1
+                self.column = 0
+            elif ch != u'\uFEFF':
+                self.column += 1
+            length -= 1
+
+    def get_mark(self):
+        if self.stream is None:
+            return Mark(self.name, self.index, self.line, self.column,
+                    self.buffer, self.pointer)
+        else:
+            return Mark(self.name, self.index, self.line, self.column,
+                    None, None)
+
+    def determine_encoding(self):
+        while not self.eof and len(self.raw_buffer) < 2:
+            self.update_raw()
+        if not isinstance(self.raw_buffer, unicode):
+            if self.raw_buffer.startswith(codecs.BOM_UTF16_LE):
+                self.raw_decode = codecs.utf_16_le_decode
+                self.encoding = 'utf-16-le'
+            elif self.raw_buffer.startswith(codecs.BOM_UTF16_BE):
+                self.raw_decode = codecs.utf_16_be_decode
+                self.encoding = 'utf-16-be'
+            else:
+                self.raw_decode = codecs.utf_8_decode
+                self.encoding = 'utf-8'
+        self.update(1)
+
+    NON_PRINTABLE = re.compile(u'[^\x09\x0A\x0D\x20-\x7E\x85\xA0-\uD7FF\uE000-\uFFFD]')
+    def check_printable(self, data):
+        match = self.NON_PRINTABLE.search(data)
+        if match:
+            character = match.group()
+            position = self.index+(len(self.buffer)-self.pointer)+match.start()
+            raise ReaderError(self.name, position, ord(character),
+                    'unicode', "special characters are not allowed")
+
+    def update(self, length):
+        if self.raw_buffer is None:
+            return
+        self.buffer = self.buffer[self.pointer:]
+        self.pointer = 0
+        while len(self.buffer) < length:
+            if not self.eof:
+                self.update_raw()
+            if self.raw_decode is not None:
+                try:
+                    data, converted = self.raw_decode(self.raw_buffer,
+                            'strict', self.eof)
+                except UnicodeDecodeError, exc:
+                    character = exc.object[exc.start]
+                    if self.stream is not None:
+                        position = self.stream_pointer-len(self.raw_buffer)+exc.start
+                    else:
+                        position = exc.start
+                    raise ReaderError(self.name, position, character,
+                            exc.encoding, exc.reason)
+            else:
+                data = self.raw_buffer
+                converted = len(data)
+            self.check_printable(data)
+            self.buffer += data
+            self.raw_buffer = self.raw_buffer[converted:]
+            if self.eof:
+                self.buffer += u'\0'
+                self.raw_buffer = None
+                break
+
+    def update_raw(self, size=1024):
+        data = self.stream.read(size)
+        if data:
+            self.raw_buffer += data
+            self.stream_pointer += len(data)
+        else:
+            self.eof = True
+
+#try:
+#    import psyco
+#    psyco.bind(Reader)
+#except ImportError:
+#    pass
+
diff --git a/lib/yaml/representer.py b/lib/yaml/representer.py
new file mode 100644
index 00000000..5f4fc70d
--- /dev/null
+++ b/lib/yaml/representer.py
@@ -0,0 +1,484 @@
+
+__all__ = ['BaseRepresenter', 'SafeRepresenter', 'Representer',
+    'RepresenterError']
+
+from error import *
+from nodes import *
+
+import datetime
+
+import sys, copy_reg, types
+
+class RepresenterError(YAMLError):
+    pass
+
+class BaseRepresenter(object):
+
+    yaml_representers = {}
+    yaml_multi_representers = {}
+
+    def __init__(self, default_style=None, default_flow_style=None):
+        self.default_style = default_style
+        self.default_flow_style = default_flow_style
+        self.represented_objects = {}
+        self.object_keeper = []
+        self.alias_key = None
+
+    def represent(self, data):
+        node = self.represent_data(data)
+        self.serialize(node)
+        self.represented_objects = {}
+        self.object_keeper = []
+        self.alias_key = None
+
+    def get_classobj_bases(self, cls):
+        bases = [cls]
+        for base in cls.__bases__:
+            bases.extend(self.get_classobj_bases(base))
+        return bases
+
+    def represent_data(self, data):
+        if self.ignore_aliases(data):
+            self.alias_key = None
+        else:
+            self.alias_key = id(data)
+        if self.alias_key is not None:
+            if self.alias_key in self.represented_objects:
+                node = self.represented_objects[self.alias_key]
+                #if node is None:
+                #    raise RepresenterError("recursive objects are not allowed: %r" % data)
+                return node
+            #self.represented_objects[alias_key] = None
+            self.object_keeper.append(data)
+        data_types = type(data).__mro__
+        if type(data) is types.InstanceType:
+            data_types = self.get_classobj_bases(data.__class__)+list(data_types)
+        if data_types[0] in self.yaml_representers:
+            node = self.yaml_representers[data_types[0]](self, data)
+        else:
+            for data_type in data_types:
+                if data_type in self.yaml_multi_representers:
+                    node = self.yaml_multi_representers[data_type](self, data)
+                    break
+            else:
+                if None in self.yaml_multi_representers:
+                    node = self.yaml_multi_representers[None](self, data)
+                elif None in self.yaml_representers:
+                    node = self.yaml_representers[None](self, data)
+                else:
+                    node = ScalarNode(None, unicode(data))
+        #if alias_key is not None:
+        #    self.represented_objects[alias_key] = node
+        return node
+
+    def add_representer(cls, data_type, representer):
+        if not 'yaml_representers' in cls.__dict__:
+            cls.yaml_representers = cls.yaml_representers.copy()
+        cls.yaml_representers[data_type] = representer
+    add_representer = classmethod(add_representer)
+
+    def add_multi_representer(cls, data_type, representer):
+        if not 'yaml_multi_representers' in cls.__dict__:
+            cls.yaml_multi_representers = cls.yaml_multi_representers.copy()
+        cls.yaml_multi_representers[data_type] = representer
+    add_multi_representer = classmethod(add_multi_representer)
+
+    def represent_scalar(self, tag, value, style=None):
+        if style is None:
+            style = self.default_style
+        node = ScalarNode(tag, value, style=style)
+        if self.alias_key is not None:
+            self.represented_objects[self.alias_key] = node
+        return node
+
+    def represent_sequence(self, tag, sequence, flow_style=None):
+        value = []
+        node = SequenceNode(tag, value, flow_style=flow_style)
+        if self.alias_key is not None:
+            self.represented_objects[self.alias_key] = node
+        best_style = True
+        for item in sequence:
+            node_item = self.represent_data(item)
+            if not (isinstance(node_item, ScalarNode) and not node_item.style):
+                best_style = False
+            value.append(node_item)
+        if flow_style is None:
+            if self.default_flow_style is not None:
+                node.flow_style = self.default_flow_style
+            else:
+                node.flow_style = best_style
+        return node
+
+    def represent_mapping(self, tag, mapping, flow_style=None):
+        value = []
+        node = MappingNode(tag, value, flow_style=flow_style)
+        if self.alias_key is not None:
+            self.represented_objects[self.alias_key] = node
+        best_style = True
+        if hasattr(mapping, 'items'):
+            mapping = mapping.items()
+            mapping.sort()
+        for item_key, item_value in mapping:
+            node_key = self.represent_data(item_key)
+            node_value = self.represent_data(item_value)
+            if not (isinstance(node_key, ScalarNode) and not node_key.style):
+                best_style = False
+            if not (isinstance(node_value, ScalarNode) and not node_value.style):
+                best_style = False
+            value.append((node_key, node_value))
+        if flow_style is None:
+            if self.default_flow_style is not None:
+                node.flow_style = self.default_flow_style
+            else:
+                node.flow_style = best_style
+        return node
+
+    def ignore_aliases(self, data):
+        return False
+
+class SafeRepresenter(BaseRepresenter):
+
+    def ignore_aliases(self, data):
+        if data in [None, ()]:
+            return True
+        if isinstance(data, (str, unicode, bool, int, float)):
+            return True
+
+    def represent_none(self, data):
+        return self.represent_scalar(u'tag:yaml.org,2002:null',
+                u'null')
+
+    def represent_str(self, data):
+        tag = None
+        style = None
+        try:
+            data = unicode(data, 'ascii')
+            tag = u'tag:yaml.org,2002:str'
+        except UnicodeDecodeError:
+            try:
+                data = unicode(data, 'utf-8')
+                tag = u'tag:yaml.org,2002:str'
+            except UnicodeDecodeError:
+                data = data.encode('base64')
+                tag = u'tag:yaml.org,2002:binary'
+                style = '|'
+        return self.represent_scalar(tag, data, style=style)
+
+    def represent_unicode(self, data):
+        return self.represent_scalar(u'tag:yaml.org,2002:str', data)
+
+    def represent_bool(self, data):
+        if data:
+            value = u'true'
+        else:
+            value = u'false'
+        return self.represent_scalar(u'tag:yaml.org,2002:bool', value)
+
+    def represent_int(self, data):
+        return self.represent_scalar(u'tag:yaml.org,2002:int', unicode(data))
+
+    def represent_long(self, data):
+        return self.represent_scalar(u'tag:yaml.org,2002:int', unicode(data))
+
+    inf_value = 1e300
+    while repr(inf_value) != repr(inf_value*inf_value):
+        inf_value *= inf_value
+
+    def represent_float(self, data):
+        if data != data or (data == 0.0 and data == 1.0):
+            value = u'.nan'
+        elif data == self.inf_value:
+            value = u'.inf'
+        elif data == -self.inf_value:
+            value = u'-.inf'
+        else:
+            value = unicode(repr(data)).lower()
+            # Note that in some cases `repr(data)` represents a float number
+            # without the decimal parts.  For instance:
+            #   >>> repr(1e17)
+            #   '1e17'
+            # Unfortunately, this is not a valid float representation according
+            # to the definition of the `!!float` tag.  We fix this by adding
+            # '.0' before the 'e' symbol.
+            if u'.' not in value and u'e' in value:
+                value = value.replace(u'e', u'.0e', 1)
+        return self.represent_scalar(u'tag:yaml.org,2002:float', value)
+
+    def represent_list(self, data):
+        #pairs = (len(data) > 0 and isinstance(data, list))
+        #if pairs:
+        #    for item in data:
+        #        if not isinstance(item, tuple) or len(item) != 2:
+        #            pairs = False
+        #            break
+        #if not pairs:
+            return self.represent_sequence(u'tag:yaml.org,2002:seq', data)
+        #value = []
+        #for item_key, item_value in data:
+        #    value.append(self.represent_mapping(u'tag:yaml.org,2002:map',
+        #        [(item_key, item_value)]))
+        #return SequenceNode(u'tag:yaml.org,2002:pairs', value)
+
+    def represent_dict(self, data):
+        return self.represent_mapping(u'tag:yaml.org,2002:map', data)
+
+    def represent_set(self, data):
+        value = {}
+        for key in data:
+            value[key] = None
+        return self.represent_mapping(u'tag:yaml.org,2002:set', value)
+
+    def represent_date(self, data):
+        value = unicode(data.isoformat())
+        return self.represent_scalar(u'tag:yaml.org,2002:timestamp', value)
+
+    def represent_datetime(self, data):
+        value = unicode(data.isoformat(' '))
+        return self.represent_scalar(u'tag:yaml.org,2002:timestamp', value)
+
+    def represent_yaml_object(self, tag, data, cls, flow_style=None):
+        if hasattr(data, '__getstate__'):
+            state = data.__getstate__()
+        else:
+            state = data.__dict__.copy()
+        return self.represent_mapping(tag, state, flow_style=flow_style)
+
+    def represent_undefined(self, data):
+        raise RepresenterError("cannot represent an object: %s" % data)
+
+SafeRepresenter.add_representer(type(None),
+        SafeRepresenter.represent_none)
+
+SafeRepresenter.add_representer(str,
+        SafeRepresenter.represent_str)
+
+SafeRepresenter.add_representer(unicode,
+        SafeRepresenter.represent_unicode)
+
+SafeRepresenter.add_representer(bool,
+        SafeRepresenter.represent_bool)
+
+SafeRepresenter.add_representer(int,
+        SafeRepresenter.represent_int)
+
+SafeRepresenter.add_representer(long,
+        SafeRepresenter.represent_long)
+
+SafeRepresenter.add_representer(float,
+        SafeRepresenter.represent_float)
+
+SafeRepresenter.add_representer(list,
+        SafeRepresenter.represent_list)
+
+SafeRepresenter.add_representer(tuple,
+        SafeRepresenter.represent_list)
+
+SafeRepresenter.add_representer(dict,
+        SafeRepresenter.represent_dict)
+
+SafeRepresenter.add_representer(set,
+        SafeRepresenter.represent_set)
+
+SafeRepresenter.add_representer(datetime.date,
+        SafeRepresenter.represent_date)
+
+SafeRepresenter.add_representer(datetime.datetime,
+        SafeRepresenter.represent_datetime)
+
+SafeRepresenter.add_representer(None,
+        SafeRepresenter.represent_undefined)
+
+class Representer(SafeRepresenter):
+
+    def represent_str(self, data):
+        tag = None
+        style = None
+        try:
+            data = unicode(data, 'ascii')
+            tag = u'tag:yaml.org,2002:str'
+        except UnicodeDecodeError:
+            try:
+                data = unicode(data, 'utf-8')
+                tag = u'tag:yaml.org,2002:python/str'
+            except UnicodeDecodeError:
+                data = data.encode('base64')
+                tag = u'tag:yaml.org,2002:binary'
+                style = '|'
+        return self.represent_scalar(tag, data, style=style)
+
+    def represent_unicode(self, data):
+        tag = None
+        try:
+            data.encode('ascii')
+            tag = u'tag:yaml.org,2002:python/unicode'
+        except UnicodeEncodeError:
+            tag = u'tag:yaml.org,2002:str'
+        return self.represent_scalar(tag, data)
+
+    def represent_long(self, data):
+        tag = u'tag:yaml.org,2002:int'
+        if int(data) is not data:
+            tag = u'tag:yaml.org,2002:python/long'
+        return self.represent_scalar(tag, unicode(data))
+
+    def represent_complex(self, data):
+        if data.imag == 0.0:
+            data = u'%r' % data.real
+        elif data.real == 0.0:
+            data = u'%rj' % data.imag
+        elif data.imag > 0:
+            data = u'%r+%rj' % (data.real, data.imag)
+        else:
+            data = u'%r%rj' % (data.real, data.imag)
+        return self.represent_scalar(u'tag:yaml.org,2002:python/complex', data)
+
+    def represent_tuple(self, data):
+        return self.represent_sequence(u'tag:yaml.org,2002:python/tuple', data)
+
+    def represent_name(self, data):
+        name = u'%s.%s' % (data.__module__, data.__name__)
+        return self.represent_scalar(u'tag:yaml.org,2002:python/name:'+name, u'')
+
+    def represent_module(self, data):
+        return self.represent_scalar(
+                u'tag:yaml.org,2002:python/module:'+data.__name__, u'')
+
+    def represent_instance(self, data):
+        # For instances of classic classes, we use __getinitargs__ and
+        # __getstate__ to serialize the data.
+
+        # If data.__getinitargs__ exists, the object must be reconstructed by
+        # calling cls(**args), where args is a tuple returned by
+        # __getinitargs__. Otherwise, the cls.__init__ method should never be
+        # called and the class instance is created by instantiating a trivial
+        # class and assigning to the instance's __class__ variable.
+
+        # If data.__getstate__ exists, it returns the state of the object.
+        # Otherwise, the state of the object is data.__dict__.
+
+        # We produce either a !!python/object or !!python/object/new node.
+        # If data.__getinitargs__ does not exist and state is a dictionary, we
+        # produce a !!python/object node . Otherwise we produce a
+        # !!python/object/new node.
+
+        cls = data.__class__
+        class_name = u'%s.%s' % (cls.__module__, cls.__name__)
+        args = None
+        state = None
+        if hasattr(data, '__getinitargs__'):
+            args = list(data.__getinitargs__())
+        if hasattr(data, '__getstate__'):
+            state = data.__getstate__()
+        else:
+            state = data.__dict__
+        if args is None and isinstance(state, dict):
+            return self.represent_mapping(
+                    u'tag:yaml.org,2002:python/object:'+class_name, state)
+        if isinstance(state, dict) and not state:
+            return self.represent_sequence(
+                    u'tag:yaml.org,2002:python/object/new:'+class_name, args)
+        value = {}
+        if args:
+            value['args'] = args
+        value['state'] = state
+        return self.represent_mapping(
+                u'tag:yaml.org,2002:python/object/new:'+class_name, value)
+
+    def represent_object(self, data):
+        # We use __reduce__ API to save the data. data.__reduce__ returns
+        # a tuple of length 2-5:
+        #   (function, args, state, listitems, dictitems)
+
+        # For reconstructing, we calls function(*args), then set its state,
+        # listitems, and dictitems if they are not None.
+
+        # A special case is when function.__name__ == '__newobj__'. In this
+        # case we create the object with args[0].__new__(*args).
+
+        # Another special case is when __reduce__ returns a string - we don't
+        # support it.
+
+        # We produce a !!python/object, !!python/object/new or
+        # !!python/object/apply node.
+
+        cls = type(data)
+        if cls in copy_reg.dispatch_table:
+            reduce = copy_reg.dispatch_table[cls](data)
+        elif hasattr(data, '__reduce_ex__'):
+            reduce = data.__reduce_ex__(2)
+        elif hasattr(data, '__reduce__'):
+            reduce = data.__reduce__()
+        else:
+            raise RepresenterError("cannot represent object: %r" % data)
+        reduce = (list(reduce)+[None]*5)[:5]
+        function, args, state, listitems, dictitems = reduce
+        args = list(args)
+        if state is None:
+            state = {}
+        if listitems is not None:
+            listitems = list(listitems)
+        if dictitems is not None:
+            dictitems = dict(dictitems)
+        if function.__name__ == '__newobj__':
+            function = args[0]
+            args = args[1:]
+            tag = u'tag:yaml.org,2002:python/object/new:'
+            newobj = True
+        else:
+            tag = u'tag:yaml.org,2002:python/object/apply:'
+            newobj = False
+        function_name = u'%s.%s' % (function.__module__, function.__name__)
+        if not args and not listitems and not dictitems \
+                and isinstance(state, dict) and newobj:
+            return self.represent_mapping(
+                    u'tag:yaml.org,2002:python/object:'+function_name, state)
+        if not listitems and not dictitems  \
+                and isinstance(state, dict) and not state:
+            return self.represent_sequence(tag+function_name, args)
+        value = {}
+        if args:
+            value['args'] = args
+        if state or not isinstance(state, dict):
+            value['state'] = state
+        if listitems:
+            value['listitems'] = listitems
+        if dictitems:
+            value['dictitems'] = dictitems
+        return self.represent_mapping(tag+function_name, value)
+
+Representer.add_representer(str,
+        Representer.represent_str)
+
+Representer.add_representer(unicode,
+        Representer.represent_unicode)
+
+Representer.add_representer(long,
+        Representer.represent_long)
+
+Representer.add_representer(complex,
+        Representer.represent_complex)
+
+Representer.add_representer(tuple,
+        Representer.represent_tuple)
+
+Representer.add_representer(type,
+        Representer.represent_name)
+
+Representer.add_representer(types.ClassType,
+        Representer.represent_name)
+
+Representer.add_representer(types.FunctionType,
+        Representer.represent_name)
+
+Representer.add_representer(types.BuiltinFunctionType,
+        Representer.represent_name)
+
+Representer.add_representer(types.ModuleType,
+        Representer.represent_module)
+
+Representer.add_multi_representer(types.InstanceType,
+        Representer.represent_instance)
+
+Representer.add_multi_representer(object,
+        Representer.represent_object)
+
diff --git a/lib/yaml/resolver.py b/lib/yaml/resolver.py
new file mode 100644
index 00000000..6b5ab875
--- /dev/null
+++ b/lib/yaml/resolver.py
@@ -0,0 +1,224 @@
+
+__all__ = ['BaseResolver', 'Resolver']
+
+from error import *
+from nodes import *
+
+import re
+
+class ResolverError(YAMLError):
+    pass
+
+class BaseResolver(object):
+
+    DEFAULT_SCALAR_TAG = u'tag:yaml.org,2002:str'
+    DEFAULT_SEQUENCE_TAG = u'tag:yaml.org,2002:seq'
+    DEFAULT_MAPPING_TAG = u'tag:yaml.org,2002:map'
+
+    yaml_implicit_resolvers = {}
+    yaml_path_resolvers = {}
+
+    def __init__(self):
+        self.resolver_exact_paths = []
+        self.resolver_prefix_paths = []
+
+    def add_implicit_resolver(cls, tag, regexp, first):
+        if not 'yaml_implicit_resolvers' in cls.__dict__:
+            cls.yaml_implicit_resolvers = cls.yaml_implicit_resolvers.copy()
+        if first is None:
+            first = [None]
+        for ch in first:
+            cls.yaml_implicit_resolvers.setdefault(ch, []).append((tag, regexp))
+    add_implicit_resolver = classmethod(add_implicit_resolver)
+
+    def add_path_resolver(cls, tag, path, kind=None):
+        # Note: `add_path_resolver` is experimental.  The API could be changed.
+        # `new_path` is a pattern that is matched against the path from the
+        # root to the node that is being considered.  `node_path` elements are
+        # tuples `(node_check, index_check)`.  `node_check` is a node class:
+        # `ScalarNode`, `SequenceNode`, `MappingNode` or `None`.  `None`
+        # matches any kind of a node.  `index_check` could be `None`, a boolean
+        # value, a string value, or a number.  `None` and `False` match against
+        # any _value_ of sequence and mapping nodes.  `True` matches against
+        # any _key_ of a mapping node.  A string `index_check` matches against
+        # a mapping value that corresponds to a scalar key which content is
+        # equal to the `index_check` value.  An integer `index_check` matches
+        # against a sequence value with the index equal to `index_check`.
+        if not 'yaml_path_resolvers' in cls.__dict__:
+            cls.yaml_path_resolvers = cls.yaml_path_resolvers.copy()
+        new_path = []
+        for element in path:
+            if isinstance(element, (list, tuple)):
+                if len(element) == 2:
+                    node_check, index_check = element
+                elif len(element) == 1:
+                    node_check = element[0]
+                    index_check = True
+                else:
+                    raise ResolverError("Invalid path element: %s" % element)
+            else:
+                node_check = None
+                index_check = element
+            if node_check is str:
+                node_check = ScalarNode
+            elif node_check is list:
+                node_check = SequenceNode
+            elif node_check is dict:
+                node_check = MappingNode
+            elif node_check not in [ScalarNode, SequenceNode, MappingNode]  \
+                    and not isinstance(node_check, basestring)  \
+                    and node_check is not None:
+                raise ResolverError("Invalid node checker: %s" % node_check)
+            if not isinstance(index_check, (basestring, int))   \
+                    and index_check is not None:
+                raise ResolverError("Invalid index checker: %s" % index_check)
+            new_path.append((node_check, index_check))
+        if kind is str:
+            kind = ScalarNode
+        elif kind is list:
+            kind = SequenceNode
+        elif kind is dict:
+            kind = MappingNode
+        elif kind not in [ScalarNode, SequenceNode, MappingNode]    \
+                and kind is not None:
+            raise ResolverError("Invalid node kind: %s" % kind)
+        cls.yaml_path_resolvers[tuple(new_path), kind] = tag
+    add_path_resolver = classmethod(add_path_resolver)
+
+    def descend_resolver(self, current_node, current_index):
+        if not self.yaml_path_resolvers:
+            return
+        exact_paths = {}
+        prefix_paths = []
+        if current_node:
+            depth = len(self.resolver_prefix_paths)
+            for path, kind in self.resolver_prefix_paths[-1]:
+                if self.check_resolver_prefix(depth, path, kind,
+                        current_node, current_index):
+                    if len(path) > depth:
+                        prefix_paths.append((path, kind))
+                    else:
+                        exact_paths[kind] = self.yaml_path_resolvers[path, kind]
+        else:
+            for path, kind in self.yaml_path_resolvers:
+                if not path:
+                    exact_paths[kind] = self.yaml_path_resolvers[path, kind]
+                else:
+                    prefix_paths.append((path, kind))
+        self.resolver_exact_paths.append(exact_paths)
+        self.resolver_prefix_paths.append(prefix_paths)
+
+    def ascend_resolver(self):
+        if not self.yaml_path_resolvers:
+            return
+        self.resolver_exact_paths.pop()
+        self.resolver_prefix_paths.pop()
+
+    def check_resolver_prefix(self, depth, path, kind,
+            current_node, current_index):
+        node_check, index_check = path[depth-1]
+        if isinstance(node_check, basestring):
+            if current_node.tag != node_check:
+                return
+        elif node_check is not None:
+            if not isinstance(current_node, node_check):
+                return
+        if index_check is True and current_index is not None:
+            return
+        if (index_check is False or index_check is None)    \
+                and current_index is None:
+            return
+        if isinstance(index_check, basestring):
+            if not (isinstance(current_index, ScalarNode)
+                    and index_check == current_index.value):
+                return
+        elif isinstance(index_check, int) and not isinstance(index_check, bool):
+            if index_check != current_index:
+                return
+        return True
+
+    def resolve(self, kind, value, implicit):
+        if kind is ScalarNode and implicit[0]:
+            if value == u'':
+                resolvers = self.yaml_implicit_resolvers.get(u'', [])
+            else:
+                resolvers = self.yaml_implicit_resolvers.get(value[0], [])
+            resolvers += self.yaml_implicit_resolvers.get(None, [])
+            for tag, regexp in resolvers:
+                if regexp.match(value):
+                    return tag
+            implicit = implicit[1]
+        if self.yaml_path_resolvers:
+            exact_paths = self.resolver_exact_paths[-1]
+            if kind in exact_paths:
+                return exact_paths[kind]
+            if None in exact_paths:
+                return exact_paths[None]
+        if kind is ScalarNode:
+            return self.DEFAULT_SCALAR_TAG
+        elif kind is SequenceNode:
+            return self.DEFAULT_SEQUENCE_TAG
+        elif kind is MappingNode:
+            return self.DEFAULT_MAPPING_TAG
+
+class Resolver(BaseResolver):
+    pass
+
+Resolver.add_implicit_resolver(
+        u'tag:yaml.org,2002:bool',
+        re.compile(ur'''^(?:yes|Yes|YES|no|No|NO
+                    |true|True|TRUE|false|False|FALSE
+                    |on|On|ON|off|Off|OFF)$''', re.X),
+        list(u'yYnNtTfFoO'))
+
+Resolver.add_implicit_resolver(
+        u'tag:yaml.org,2002:float',
+        re.compile(ur'''^(?:[-+]?(?:[0-9][0-9_]*)\.[0-9_]*(?:[eE][-+][0-9]+)?
+                    |\.[0-9_]+(?:[eE][-+][0-9]+)?
+                    |[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\.[0-9_]*
+                    |[-+]?\.(?:inf|Inf|INF)
+                    |\.(?:nan|NaN|NAN))$''', re.X),
+        list(u'-+0123456789.'))
+
+Resolver.add_implicit_resolver(
+        u'tag:yaml.org,2002:int',
+        re.compile(ur'''^(?:[-+]?0b[0-1_]+
+                    |[-+]?0[0-7_]+
+                    |[-+]?(?:0|[1-9][0-9_]*)
+                    |[-+]?0x[0-9a-fA-F_]+
+                    |[-+]?[1-9][0-9_]*(?::[0-5]?[0-9])+)$''', re.X),
+        list(u'-+0123456789'))
+
+Resolver.add_implicit_resolver(
+        u'tag:yaml.org,2002:merge',
+        re.compile(ur'^(?:<<)$'),
+        [u'<'])
+
+Resolver.add_implicit_resolver(
+        u'tag:yaml.org,2002:null',
+        re.compile(ur'''^(?: ~
+                    |null|Null|NULL
+                    | )$''', re.X),
+        [u'~', u'n', u'N', u''])
+
+Resolver.add_implicit_resolver(
+        u'tag:yaml.org,2002:timestamp',
+        re.compile(ur'''^(?:[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]
+                    |[0-9][0-9][0-9][0-9] -[0-9][0-9]? -[0-9][0-9]?
+                     (?:[Tt]|[ \t]+)[0-9][0-9]?
+                     :[0-9][0-9] :[0-9][0-9] (?:\.[0-9]*)?
+                     (?:[ \t]*(?:Z|[-+][0-9][0-9]?(?::[0-9][0-9])?))?)$''', re.X),
+        list(u'0123456789'))
+
+Resolver.add_implicit_resolver(
+        u'tag:yaml.org,2002:value',
+        re.compile(ur'^(?:=)$'),
+        [u'='])
+
+# The following resolver is only for documentation purposes. It cannot work
+# because plain scalars cannot start with '!', '&', or '*'.
+Resolver.add_implicit_resolver(
+        u'tag:yaml.org,2002:yaml',
+        re.compile(ur'^(?:!|&|\*)$'),
+        list(u'!&*'))
+
diff --git a/lib/yaml/scanner.py b/lib/yaml/scanner.py
new file mode 100644
index 00000000..4e578581
--- /dev/null
+++ b/lib/yaml/scanner.py
@@ -0,0 +1,1457 @@
+
+# Scanner produces tokens of the following types:
+# STREAM-START
+# STREAM-END
+# DIRECTIVE(name, value)
+# DOCUMENT-START
+# DOCUMENT-END
+# BLOCK-SEQUENCE-START
+# BLOCK-MAPPING-START
+# BLOCK-END
+# FLOW-SEQUENCE-START
+# FLOW-MAPPING-START
+# FLOW-SEQUENCE-END
+# FLOW-MAPPING-END
+# BLOCK-ENTRY
+# FLOW-ENTRY
+# KEY
+# VALUE
+# ALIAS(value)
+# ANCHOR(value)
+# TAG(value)
+# SCALAR(value, plain, style)
+#
+# Read comments in the Scanner code for more details.
+#
+
+__all__ = ['Scanner', 'ScannerError']
+
+from error import MarkedYAMLError
+from tokens import *
+
+class ScannerError(MarkedYAMLError):
+    pass
+
+class SimpleKey(object):
+    # See below simple keys treatment.
+
+    def __init__(self, token_number, required, index, line, column, mark):
+        self.token_number = token_number
+        self.required = required
+        self.index = index
+        self.line = line
+        self.column = column
+        self.mark = mark
+
+class Scanner(object):
+
+    def __init__(self):
+        """Initialize the scanner."""
+        # It is assumed that Scanner and Reader will have a common descendant.
+        # Reader do the dirty work of checking for BOM and converting the
+        # input data to Unicode. It also adds NUL to the end.
+        #
+        # Reader supports the following methods
+        #   self.peek(i=0)       # peek the next i-th character
+        #   self.prefix(l=1)     # peek the next l characters
+        #   self.forward(l=1)    # read the next l characters and move the pointer.
+
+        # Had we reached the end of the stream?
+        self.done = False
+
+        # The number of unclosed '{' and '['. `flow_level == 0` means block
+        # context.
+        self.flow_level = 0
+
+        # List of processed tokens that are not yet emitted.
+        self.tokens = []
+
+        # Add the STREAM-START token.
+        self.fetch_stream_start()
+
+        # Number of tokens that were emitted through the `get_token` method.
+        self.tokens_taken = 0
+
+        # The current indentation level.
+        self.indent = -1
+
+        # Past indentation levels.
+        self.indents = []
+
+        # Variables related to simple keys treatment.
+
+        # A simple key is a key that is not denoted by the '?' indicator.
+        # Example of simple keys:
+        #   ---
+        #   block simple key: value
+        #   ? not a simple key:
+        #   : { flow simple key: value }
+        # We emit the KEY token before all keys, so when we find a potential
+        # simple key, we try to locate the corresponding ':' indicator.
+        # Simple keys should be limited to a single line and 1024 characters.
+
+        # Can a simple key start at the current position? A simple key may
+        # start:
+        # - at the beginning of the line, not counting indentation spaces
+        #       (in block context),
+        # - after '{', '[', ',' (in the flow context),
+        # - after '?', ':', '-' (in the block context).
+        # In the block context, this flag also signifies if a block collection
+        # may start at the current position.
+        self.allow_simple_key = True
+
+        # Keep track of possible simple keys. This is a dictionary. The key
+        # is `flow_level`; there can be no more that one possible simple key
+        # for each level. The value is a SimpleKey record:
+        #   (token_number, required, index, line, column, mark)
+        # A simple key may start with ALIAS, ANCHOR, TAG, SCALAR(flow),
+        # '[', or '{' tokens.
+        self.possible_simple_keys = {}
+
+    # Public methods.
+
+    def check_token(self, *choices):
+        # Check if the next token is one of the given types.
+        while self.need_more_tokens():
+            self.fetch_more_tokens()
+        if self.tokens:
+            if not choices:
+                return True
+            for choice in choices:
+                if isinstance(self.tokens[0], choice):
+                    return True
+        return False
+
+    def peek_token(self):
+        # Return the next token, but do not delete if from the queue.
+        while self.need_more_tokens():
+            self.fetch_more_tokens()
+        if self.tokens:
+            return self.tokens[0]
+
+    def get_token(self):
+        # Return the next token.
+        while self.need_more_tokens():
+            self.fetch_more_tokens()
+        if self.tokens:
+            self.tokens_taken += 1
+            return self.tokens.pop(0)
+
+    # Private methods.
+
+    def need_more_tokens(self):
+        if self.done:
+            return False
+        if not self.tokens:
+            return True
+        # The current token may be a potential simple key, so we
+        # need to look further.
+        self.stale_possible_simple_keys()
+        if self.next_possible_simple_key() == self.tokens_taken:
+            return True
+
+    def fetch_more_tokens(self):
+
+        # Eat whitespaces and comments until we reach the next token.
+        self.scan_to_next_token()
+
+        # Remove obsolete possible simple keys.
+        self.stale_possible_simple_keys()
+
+        # Compare the current indentation and column. It may add some tokens
+        # and decrease the current indentation level.
+        self.unwind_indent(self.column)
+
+        # Peek the next character.
+        ch = self.peek()
+
+        # Is it the end of stream?
+        if ch == u'\0':
+            return self.fetch_stream_end()
+
+        # Is it a directive?
+        if ch == u'%' and self.check_directive():
+            return self.fetch_directive()
+
+        # Is it the document start?
+        if ch == u'-' and self.check_document_start():
+            return self.fetch_document_start()
+
+        # Is it the document end?
+        if ch == u'.' and self.check_document_end():
+            return self.fetch_document_end()
+
+        # TODO: support for BOM within a stream.
+        #if ch == u'\uFEFF':
+        #    return self.fetch_bom()    <-- issue BOMToken
+
+        # Note: the order of the following checks is NOT significant.
+
+        # Is it the flow sequence start indicator?
+        if ch == u'[':
+            return self.fetch_flow_sequence_start()
+
+        # Is it the flow mapping start indicator?
+        if ch == u'{':
+            return self.fetch_flow_mapping_start()
+
+        # Is it the flow sequence end indicator?
+        if ch == u']':
+            return self.fetch_flow_sequence_end()
+
+        # Is it the flow mapping end indicator?
+        if ch == u'}':
+            return self.fetch_flow_mapping_end()
+
+        # Is it the flow entry indicator?
+        if ch == u',':
+            return self.fetch_flow_entry()
+
+        # Is it the block entry indicator?
+        if ch == u'-' and self.check_block_entry():
+            return self.fetch_block_entry()
+
+        # Is it the key indicator?
+        if ch == u'?' and self.check_key():
+            return self.fetch_key()
+
+        # Is it the value indicator?
+        if ch == u':' and self.check_value():
+            return self.fetch_value()
+
+        # Is it an alias?
+        if ch == u'*':
+            return self.fetch_alias()
+
+        # Is it an anchor?
+        if ch == u'&':
+            return self.fetch_anchor()
+
+        # Is it a tag?
+        if ch == u'!':
+            return self.fetch_tag()
+
+        # Is it a literal scalar?
+        if ch == u'|' and not self.flow_level:
+            return self.fetch_literal()
+
+        # Is it a folded scalar?
+        if ch == u'>' and not self.flow_level:
+            return self.fetch_folded()
+
+        # Is it a single quoted scalar?
+        if ch == u'\'':
+            return self.fetch_single()
+
+        # Is it a double quoted scalar?
+        if ch == u'\"':
+            return self.fetch_double()
+
+        # It must be a plain scalar then.
+        if self.check_plain():
+            return self.fetch_plain()
+
+        # No? It's an error. Let's produce a nice error message.
+        raise ScannerError("while scanning for the next token", None,
+                "found character %r that cannot start any token"
+                % ch.encode('utf-8'), self.get_mark())
+
+    # Simple keys treatment.
+
+    def next_possible_simple_key(self):
+        # Return the number of the nearest possible simple key. Actually we
+        # don't need to loop through the whole dictionary. We may replace it
+        # with the following code:
+        #   if not self.possible_simple_keys:
+        #       return None
+        #   return self.possible_simple_keys[
+        #           min(self.possible_simple_keys.keys())].token_number
+        min_token_number = None
+        for level in self.possible_simple_keys:
+            key = self.possible_simple_keys[level]
+            if min_token_number is None or key.token_number < min_token_number:
+                min_token_number = key.token_number
+        return min_token_number
+
+    def stale_possible_simple_keys(self):
+        # Remove entries that are no longer possible simple keys. According to
+        # the YAML specification, simple keys
+        # - should be limited to a single line,
+        # - should be no longer than 1024 characters.
+        # Disabling this procedure will allow simple keys of any length and
+        # height (may cause problems if indentation is broken though).
+        for level in self.possible_simple_keys.keys():
+            key = self.possible_simple_keys[level]
+            if key.line != self.line  \
+                    or self.index-key.index > 1024:
+                if key.required:
+                    raise ScannerError("while scanning a simple key", key.mark,
+                            "could not found expected ':'", self.get_mark())
+                del self.possible_simple_keys[level]
+
+    def save_possible_simple_key(self):
+        # The next token may start a simple key. We check if it's possible
+        # and save its position. This function is called for
+        #   ALIAS, ANCHOR, TAG, SCALAR(flow), '[', and '{'.
+
+        # Check if a simple key is required at the current position.
+        required = not self.flow_level and self.indent == self.column
+
+        # A simple key is required only if it is the first token in the current
+        # line. Therefore it is always allowed.
+        assert self.allow_simple_key or not required
+
+        # The next token might be a simple key. Let's save it's number and
+        # position.
+        if self.allow_simple_key:
+            self.remove_possible_simple_key()
+            token_number = self.tokens_taken+len(self.tokens)
+            key = SimpleKey(token_number, required,
+                    self.index, self.line, self.column, self.get_mark())
+            self.possible_simple_keys[self.flow_level] = key
+
+    def remove_possible_simple_key(self):
+        # Remove the saved possible key position at the current flow level.
+        if self.flow_level in self.possible_simple_keys:
+            key = self.possible_simple_keys[self.flow_level]
+
+            if key.required:
+                raise ScannerError("while scanning a simple key", key.mark,
+                        "could not found expected ':'", self.get_mark())
+
+            del self.possible_simple_keys[self.flow_level]
+
+    # Indentation functions.
+
+    def unwind_indent(self, column):
+
+        ## In flow context, tokens should respect indentation.
+        ## Actually the condition should be `self.indent >= column` according to
+        ## the spec. But this condition will prohibit intuitively correct
+        ## constructions such as
+        ## key : {
+        ## }
+        #if self.flow_level and self.indent > column:
+        #    raise ScannerError(None, None,
+        #            "invalid intendation or unclosed '[' or '{'",
+        #            self.get_mark())
+
+        # In the flow context, indentation is ignored. We make the scanner less
+        # restrictive then specification requires.
+        if self.flow_level:
+            return
+
+        # In block context, we may need to issue the BLOCK-END tokens.
+        while self.indent > column:
+            mark = self.get_mark()
+            self.indent = self.indents.pop()
+            self.tokens.append(BlockEndToken(mark, mark))
+
+    def add_indent(self, column):
+        # Check if we need to increase indentation.
+        if self.indent < column:
+            self.indents.append(self.indent)
+            self.indent = column
+            return True
+        return False
+
+    # Fetchers.
+
+    def fetch_stream_start(self):
+        # We always add STREAM-START as the first token and STREAM-END as the
+        # last token.
+
+        # Read the token.
+        mark = self.get_mark()
+
+        # Add STREAM-START.
+        self.tokens.append(StreamStartToken(mark, mark,
+            encoding=self.encoding))
+
+
+    def fetch_stream_end(self):
+
+        # Set the current intendation to -1.
+        self.unwind_indent(-1)
+
+        # Reset simple keys.
+        self.remove_possible_simple_key()
+        self.allow_simple_key = False
+        self.possible_simple_keys = {}
+
+        # Read the token.
+        mark = self.get_mark()
+
+        # Add STREAM-END.
+        self.tokens.append(StreamEndToken(mark, mark))
+
+        # The steam is finished.
+        self.done = True
+
+    def fetch_directive(self):
+
+        # Set the current intendation to -1.
+        self.unwind_indent(-1)
+
+        # Reset simple keys.
+        self.remove_possible_simple_key()
+        self.allow_simple_key = False
+
+        # Scan and add DIRECTIVE.
+        self.tokens.append(self.scan_directive())
+
+    def fetch_document_start(self):
+        self.fetch_document_indicator(DocumentStartToken)
+
+    def fetch_document_end(self):
+        self.fetch_document_indicator(DocumentEndToken)
+
+    def fetch_document_indicator(self, TokenClass):
+
+        # Set the current intendation to -1.
+        self.unwind_indent(-1)
+
+        # Reset simple keys. Note that there could not be a block collection
+        # after '---'.
+        self.remove_possible_simple_key()
+        self.allow_simple_key = False
+
+        # Add DOCUMENT-START or DOCUMENT-END.
+        start_mark = self.get_mark()
+        self.forward(3)
+        end_mark = self.get_mark()
+        self.tokens.append(TokenClass(start_mark, end_mark))
+
+    def fetch_flow_sequence_start(self):
+        self.fetch_flow_collection_start(FlowSequenceStartToken)
+
+    def fetch_flow_mapping_start(self):
+        self.fetch_flow_collection_start(FlowMappingStartToken)
+
+    def fetch_flow_collection_start(self, TokenClass):
+
+        # '[' and '{' may start a simple key.
+        self.save_possible_simple_key()
+
+        # Increase the flow level.
+        self.flow_level += 1
+
+        # Simple keys are allowed after '[' and '{'.
+        self.allow_simple_key = True
+
+        # Add FLOW-SEQUENCE-START or FLOW-MAPPING-START.
+        start_mark = self.get_mark()
+        self.forward()
+        end_mark = self.get_mark()
+        self.tokens.append(TokenClass(start_mark, end_mark))
+
+    def fetch_flow_sequence_end(self):
+        self.fetch_flow_collection_end(FlowSequenceEndToken)
+
+    def fetch_flow_mapping_end(self):
+        self.fetch_flow_collection_end(FlowMappingEndToken)
+
+    def fetch_flow_collection_end(self, TokenClass):
+
+        # Reset possible simple key on the current level.
+        self.remove_possible_simple_key()
+
+        # Decrease the flow level.
+        self.flow_level -= 1
+
+        # No simple keys after ']' or '}'.
+        self.allow_simple_key = False
+
+        # Add FLOW-SEQUENCE-END or FLOW-MAPPING-END.
+        start_mark = self.get_mark()
+        self.forward()
+        end_mark = self.get_mark()
+        self.tokens.append(TokenClass(start_mark, end_mark))
+
+    def fetch_flow_entry(self):
+
+        # Simple keys are allowed after ','.
+        self.allow_simple_key = True
+
+        # Reset possible simple key on the current level.
+        self.remove_possible_simple_key()
+
+        # Add FLOW-ENTRY.
+        start_mark = self.get_mark()
+        self.forward()
+        end_mark = self.get_mark()
+        self.tokens.append(FlowEntryToken(start_mark, end_mark))
+
+    def fetch_block_entry(self):
+
+        # Block context needs additional checks.
+        if not self.flow_level:
+
+            # Are we allowed to start a new entry?
+            if not self.allow_simple_key:
+                raise ScannerError(None, None,
+                        "sequence entries are not allowed here",
+                        self.get_mark())
+
+            # We may need to add BLOCK-SEQUENCE-START.
+            if self.add_indent(self.column):
+                mark = self.get_mark()
+                self.tokens.append(BlockSequenceStartToken(mark, mark))
+
+        # It's an error for the block entry to occur in the flow context,
+        # but we let the parser detect this.
+        else:
+            pass
+
+        # Simple keys are allowed after '-'.
+        self.allow_simple_key = True
+
+        # Reset possible simple key on the current level.
+        self.remove_possible_simple_key()
+
+        # Add BLOCK-ENTRY.
+        start_mark = self.get_mark()
+        self.forward()
+        end_mark = self.get_mark()
+        self.tokens.append(BlockEntryToken(start_mark, end_mark))
+
+    def fetch_key(self):
+
+        # Block context needs additional checks.
+        if not self.flow_level:
+
+            # Are we allowed to start a key (not nessesary a simple)?
+            if not self.allow_simple_key:
+                raise ScannerError(None, None,
+                        "mapping keys are not allowed here",
+                        self.get_mark())
+
+            # We may need to add BLOCK-MAPPING-START.
+            if self.add_indent(self.column):
+                mark = self.get_mark()
+                self.tokens.append(BlockMappingStartToken(mark, mark))
+
+        # Simple keys are allowed after '?' in the block context.
+        self.allow_simple_key = not self.flow_level
+
+        # Reset possible simple key on the current level.
+        self.remove_possible_simple_key()
+
+        # Add KEY.
+        start_mark = self.get_mark()
+        self.forward()
+        end_mark = self.get_mark()
+        self.tokens.append(KeyToken(start_mark, end_mark))
+
+    def fetch_value(self):
+
+        # Do we determine a simple key?
+        if self.flow_level in self.possible_simple_keys:
+
+            # Add KEY.
+            key = self.possible_simple_keys[self.flow_level]
+            del self.possible_simple_keys[self.flow_level]
+            self.tokens.insert(key.token_number-self.tokens_taken,
+                    KeyToken(key.mark, key.mark))
+
+            # If this key starts a new block mapping, we need to add
+            # BLOCK-MAPPING-START.
+            if not self.flow_level:
+                if self.add_indent(key.column):
+                    self.tokens.insert(key.token_number-self.tokens_taken,
+                            BlockMappingStartToken(key.mark, key.mark))
+
+            # There cannot be two simple keys one after another.
+            self.allow_simple_key = False
+
+        # It must be a part of a complex key.
+        else:
+
+            # Block context needs additional checks.
+            # (Do we really need them? They will be catched by the parser
+            # anyway.)
+            if not self.flow_level:
+
+                # We are allowed to start a complex value if and only if
+                # we can start a simple key.
+                if not self.allow_simple_key:
+                    raise ScannerError(None, None,
+                            "mapping values are not allowed here",
+                            self.get_mark())
+
+            # If this value starts a new block mapping, we need to add
+            # BLOCK-MAPPING-START.  It will be detected as an error later by
+            # the parser.
+            if not self.flow_level:
+                if self.add_indent(self.column):
+                    mark = self.get_mark()
+                    self.tokens.append(BlockMappingStartToken(mark, mark))
+
+            # Simple keys are allowed after ':' in the block context.
+            self.allow_simple_key = not self.flow_level
+
+            # Reset possible simple key on the current level.
+            self.remove_possible_simple_key()
+
+        # Add VALUE.
+        start_mark = self.get_mark()
+        self.forward()
+        end_mark = self.get_mark()
+        self.tokens.append(ValueToken(start_mark, end_mark))
+
+    def fetch_alias(self):
+
+        # ALIAS could be a simple key.
+        self.save_possible_simple_key()
+
+        # No simple keys after ALIAS.
+        self.allow_simple_key = False
+
+        # Scan and add ALIAS.
+        self.tokens.append(self.scan_anchor(AliasToken))
+
+    def fetch_anchor(self):
+
+        # ANCHOR could start a simple key.
+        self.save_possible_simple_key()
+
+        # No simple keys after ANCHOR.
+        self.allow_simple_key = False
+
+        # Scan and add ANCHOR.
+        self.tokens.append(self.scan_anchor(AnchorToken))
+
+    def fetch_tag(self):
+
+        # TAG could start a simple key.
+        self.save_possible_simple_key()
+
+        # No simple keys after TAG.
+        self.allow_simple_key = False
+
+        # Scan and add TAG.
+        self.tokens.append(self.scan_tag())
+
+    def fetch_literal(self):
+        self.fetch_block_scalar(style='|')
+
+    def fetch_folded(self):
+        self.fetch_block_scalar(style='>')
+
+    def fetch_block_scalar(self, style):
+
+        # A simple key may follow a block scalar.
+        self.allow_simple_key = True
+
+        # Reset possible simple key on the current level.
+        self.remove_possible_simple_key()
+
+        # Scan and add SCALAR.
+        self.tokens.append(self.scan_block_scalar(style))
+
+    def fetch_single(self):
+        self.fetch_flow_scalar(style='\'')
+
+    def fetch_double(self):
+        self.fetch_flow_scalar(style='"')
+
+    def fetch_flow_scalar(self, style):
+
+        # A flow scalar could be a simple key.
+        self.save_possible_simple_key()
+
+        # No simple keys after flow scalars.
+        self.allow_simple_key = False
+
+        # Scan and add SCALAR.
+        self.tokens.append(self.scan_flow_scalar(style))
+
+    def fetch_plain(self):
+
+        # A plain scalar could be a simple key.
+        self.save_possible_simple_key()
+
+        # No simple keys after plain scalars. But note that `scan_plain` will
+        # change this flag if the scan is finished at the beginning of the
+        # line.
+        self.allow_simple_key = False
+
+        # Scan and add SCALAR. May change `allow_simple_key`.
+        self.tokens.append(self.scan_plain())
+
+    # Checkers.
+
+    def check_directive(self):
+
+        # DIRECTIVE:        ^ '%' ...
+        # The '%' indicator is already checked.
+        if self.column == 0:
+            return True
+
+    def check_document_start(self):
+
+        # DOCUMENT-START:   ^ '---' (' '|'\n')
+        if self.column == 0:
+            if self.prefix(3) == u'---'  \
+                    and self.peek(3) in u'\0 \t\r\n\x85\u2028\u2029':
+                return True
+
+    def check_document_end(self):
+
+        # DOCUMENT-END:     ^ '...' (' '|'\n')
+        if self.column == 0:
+            if self.prefix(3) == u'...'  \
+                    and self.peek(3) in u'\0 \t\r\n\x85\u2028\u2029':
+                return True
+
+    def check_block_entry(self):
+
+        # BLOCK-ENTRY:      '-' (' '|'\n')
+        return self.peek(1) in u'\0 \t\r\n\x85\u2028\u2029'
+
+    def check_key(self):
+
+        # KEY(flow context):    '?'
+        if self.flow_level:
+            return True
+
+        # KEY(block context):   '?' (' '|'\n')
+        else:
+            return self.peek(1) in u'\0 \t\r\n\x85\u2028\u2029'
+
+    def check_value(self):
+
+        # VALUE(flow context):  ':'
+        if self.flow_level:
+            return True
+
+        # VALUE(block context): ':' (' '|'\n')
+        else:
+            return self.peek(1) in u'\0 \t\r\n\x85\u2028\u2029'
+
+    def check_plain(self):
+
+        # A plain scalar may start with any non-space character except:
+        #   '-', '?', ':', ',', '[', ']', '{', '}',
+        #   '#', '&', '*', '!', '|', '>', '\'', '\"',
+        #   '%', '@', '`'.
+        #
+        # It may also start with
+        #   '-', '?', ':'
+        # if it is followed by a non-space character.
+        #
+        # Note that we limit the last rule to the block context (except the
+        # '-' character) because we want the flow context to be space
+        # independent.
+        ch = self.peek()
+        return ch not in u'\0 \t\r\n\x85\u2028\u2029-?:,[]{}#&*!|>\'\"%@`'  \
+                or (self.peek(1) not in u'\0 \t\r\n\x85\u2028\u2029'
+                        and (ch == u'-' or (not self.flow_level and ch in u'?:')))
+
+    # Scanners.
+
+    def scan_to_next_token(self):
+        # We ignore spaces, line breaks and comments.
+        # If we find a line break in the block context, we set the flag
+        # `allow_simple_key` on.
+        # The byte order mark is stripped if it's the first character in the
+        # stream. We do not yet support BOM inside the stream as the
+        # specification requires. Any such mark will be considered as a part
+        # of the document.
+        #
+        # TODO: We need to make tab handling rules more sane. A good rule is
+        #   Tabs cannot precede tokens
+        #   BLOCK-SEQUENCE-START, BLOCK-MAPPING-START, BLOCK-END,
+        #   KEY(block), VALUE(block), BLOCK-ENTRY
+        # So the checking code is
+        #   if <TAB>:
+        #       self.allow_simple_keys = False
+        # We also need to add the check for `allow_simple_keys == True` to
+        # `unwind_indent` before issuing BLOCK-END.
+        # Scanners for block, flow, and plain scalars need to be modified.
+
+        if self.index == 0 and self.peek() == u'\uFEFF':
+            self.forward()
+        found = False
+        while not found:
+            while self.peek() == u' ':
+                self.forward()
+            if self.peek() == u'#':
+                while self.peek() not in u'\0\r\n\x85\u2028\u2029':
+                    self.forward()
+            if self.scan_line_break():
+                if not self.flow_level:
+                    self.allow_simple_key = True
+            else:
+                found = True
+
+    def scan_directive(self):
+        # See the specification for details.
+        start_mark = self.get_mark()
+        self.forward()
+        name = self.scan_directive_name(start_mark)
+        value = None
+        if name == u'YAML':
+            value = self.scan_yaml_directive_value(start_mark)
+            end_mark = self.get_mark()
+        elif name == u'TAG':
+            value = self.scan_tag_directive_value(start_mark)
+            end_mark = self.get_mark()
+        else:
+            end_mark = self.get_mark()
+            while self.peek() not in u'\0\r\n\x85\u2028\u2029':
+                self.forward()
+        self.scan_directive_ignored_line(start_mark)
+        return DirectiveToken(name, value, start_mark, end_mark)
+
+    def scan_directive_name(self, start_mark):
+        # See the specification for details.
+        length = 0
+        ch = self.peek(length)
+        while u'0' <= ch <= u'9' or u'A' <= ch <= u'Z' or u'a' <= ch <= u'z'    \
+                or ch in u'-_':
+            length += 1
+            ch = self.peek(length)
+        if not length:
+            raise ScannerError("while scanning a directive", start_mark,
+                    "expected alphabetic or numeric character, but found %r"
+                    % ch.encode('utf-8'), self.get_mark())
+        value = self.prefix(length)
+        self.forward(length)
+        ch = self.peek()
+        if ch not in u'\0 \r\n\x85\u2028\u2029':
+            raise ScannerError("while scanning a directive", start_mark,
+                    "expected alphabetic or numeric character, but found %r"
+                    % ch.encode('utf-8'), self.get_mark())
+        return value
+
+    def scan_yaml_directive_value(self, start_mark):
+        # See the specification for details.
+        while self.peek() == u' ':
+            self.forward()
+        major = self.scan_yaml_directive_number(start_mark)
+        if self.peek() != '.':
+            raise ScannerError("while scanning a directive", start_mark,
+                    "expected a digit or '.', but found %r"
+                    % self.peek().encode('utf-8'),
+                    self.get_mark())
+        self.forward()
+        minor = self.scan_yaml_directive_number(start_mark)
+        if self.peek() not in u'\0 \r\n\x85\u2028\u2029':
+            raise ScannerError("while scanning a directive", start_mark,
+                    "expected a digit or ' ', but found %r"
+                    % self.peek().encode('utf-8'),
+                    self.get_mark())
+        return (major, minor)
+
+    def scan_yaml_directive_number(self, start_mark):
+        # See the specification for details.
+        ch = self.peek()
+        if not (u'0' <= ch <= u'9'):
+            raise ScannerError("while scanning a directive", start_mark,
+                    "expected a digit, but found %r" % ch.encode('utf-8'),
+                    self.get_mark())
+        length = 0
+        while u'0' <= self.peek(length) <= u'9':
+            length += 1
+        value = int(self.prefix(length))
+        self.forward(length)
+        return value
+
+    def scan_tag_directive_value(self, start_mark):
+        # See the specification for details.
+        while self.peek() == u' ':
+            self.forward()
+        handle = self.scan_tag_directive_handle(start_mark)
+        while self.peek() == u' ':
+            self.forward()
+        prefix = self.scan_tag_directive_prefix(start_mark)
+        return (handle, prefix)
+
+    def scan_tag_directive_handle(self, start_mark):
+        # See the specification for details.
+        value = self.scan_tag_handle('directive', start_mark)
+        ch = self.peek()
+        if ch != u' ':
+            raise ScannerError("while scanning a directive", start_mark,
+                    "expected ' ', but found %r" % ch.encode('utf-8'),
+                    self.get_mark())
+        return value
+
+    def scan_tag_directive_prefix(self, start_mark):
+        # See the specification for details.
+        value = self.scan_tag_uri('directive', start_mark)
+        ch = self.peek()
+        if ch not in u'\0 \r\n\x85\u2028\u2029':
+            raise ScannerError("while scanning a directive", start_mark,
+                    "expected ' ', but found %r" % ch.encode('utf-8'),
+                    self.get_mark())
+        return value
+
+    def scan_directive_ignored_line(self, start_mark):
+        # See the specification for details.
+        while self.peek() == u' ':
+            self.forward()
+        if self.peek() == u'#':
+            while self.peek() not in u'\0\r\n\x85\u2028\u2029':
+                self.forward()
+        ch = self.peek()
+        if ch not in u'\0\r\n\x85\u2028\u2029':
+            raise ScannerError("while scanning a directive", start_mark,
+                    "expected a comment or a line break, but found %r"
+                        % ch.encode('utf-8'), self.get_mark())
+        self.scan_line_break()
+
+    def scan_anchor(self, TokenClass):
+        # The specification does not restrict characters for anchors and
+        # aliases. This may lead to problems, for instance, the document:
+        #   [ *alias, value ]
+        # can be interpteted in two ways, as
+        #   [ "value" ]
+        # and
+        #   [ *alias , "value" ]
+        # Therefore we restrict aliases to numbers and ASCII letters.
+        start_mark = self.get_mark()
+        indicator = self.peek()
+        if indicator == u'*':
+            name = 'alias'
+        else:
+            name = 'anchor'
+        self.forward()
+        length = 0
+        ch = self.peek(length)
+        while u'0' <= ch <= u'9' or u'A' <= ch <= u'Z' or u'a' <= ch <= u'z'    \
+                or ch in u'-_':
+            length += 1
+            ch = self.peek(length)
+        if not length:
+            raise ScannerError("while scanning an %s" % name, start_mark,
+                    "expected alphabetic or numeric character, but found %r"
+                    % ch.encode('utf-8'), self.get_mark())
+        value = self.prefix(length)
+        self.forward(length)
+        ch = self.peek()
+        if ch not in u'\0 \t\r\n\x85\u2028\u2029?:,]}%@`':
+            raise ScannerError("while scanning an %s" % name, start_mark,
+                    "expected alphabetic or numeric character, but found %r"
+                    % ch.encode('utf-8'), self.get_mark())
+        end_mark = self.get_mark()
+        return TokenClass(value, start_mark, end_mark)
+
+    def scan_tag(self):
+        # See the specification for details.
+        start_mark = self.get_mark()
+        ch = self.peek(1)
+        if ch == u'<':
+            handle = None
+            self.forward(2)
+            suffix = self.scan_tag_uri('tag', start_mark)
+            if self.peek() != u'>':
+                raise ScannerError("while parsing a tag", start_mark,
+                        "expected '>', but found %r" % self.peek().encode('utf-8'),
+                        self.get_mark())
+            self.forward()
+        elif ch in u'\0 \t\r\n\x85\u2028\u2029':
+            handle = None
+            suffix = u'!'
+            self.forward()
+        else:
+            length = 1
+            use_handle = False
+            while ch not in u'\0 \r\n\x85\u2028\u2029':
+                if ch == u'!':
+                    use_handle = True
+                    break
+                length += 1
+                ch = self.peek(length)
+            handle = u'!'
+            if use_handle:
+                handle = self.scan_tag_handle('tag', start_mark)
+            else:
+                handle = u'!'
+                self.forward()
+            suffix = self.scan_tag_uri('tag', start_mark)
+        ch = self.peek()
+        if ch not in u'\0 \r\n\x85\u2028\u2029':
+            raise ScannerError("while scanning a tag", start_mark,
+                    "expected ' ', but found %r" % ch.encode('utf-8'),
+                    self.get_mark())
+        value = (handle, suffix)
+        end_mark = self.get_mark()
+        return TagToken(value, start_mark, end_mark)
+
+    def scan_block_scalar(self, style):
+        # See the specification for details.
+
+        if style == '>':
+            folded = True
+        else:
+            folded = False
+
+        chunks = []
+        start_mark = self.get_mark()
+
+        # Scan the header.
+        self.forward()
+        chomping, increment = self.scan_block_scalar_indicators(start_mark)
+        self.scan_block_scalar_ignored_line(start_mark)
+
+        # Determine the indentation level and go to the first non-empty line.
+        min_indent = self.indent+1
+        if min_indent < 1:
+            min_indent = 1
+        if increment is None:
+            breaks, max_indent, end_mark = self.scan_block_scalar_indentation()
+            indent = max(min_indent, max_indent)
+        else:
+            indent = min_indent+increment-1
+            breaks, end_mark = self.scan_block_scalar_breaks(indent)
+        line_break = u''
+
+        # Scan the inner part of the block scalar.
+        while self.column == indent and self.peek() != u'\0':
+            chunks.extend(breaks)
+            leading_non_space = self.peek() not in u' \t'
+            length = 0
+            while self.peek(length) not in u'\0\r\n\x85\u2028\u2029':
+                length += 1
+            chunks.append(self.prefix(length))
+            self.forward(length)
+            line_break = self.scan_line_break()
+            breaks, end_mark = self.scan_block_scalar_breaks(indent)
+            if self.column == indent and self.peek() != u'\0':
+
+                # Unfortunately, folding rules are ambiguous.
+                #
+                # This is the folding according to the specification:
+
+                if folded and line_break == u'\n'   \
+                        and leading_non_space and self.peek() not in u' \t':
+                    if not breaks:
+                        chunks.append(u' ')
+                else:
+                    chunks.append(line_break)
+
+                # This is Clark Evans's interpretation (also in the spec
+                # examples):
+                #
+                #if folded and line_break == u'\n':
+                #    if not breaks:
+                #        if self.peek() not in ' \t':
+                #            chunks.append(u' ')
+                #        else:
+                #            chunks.append(line_break)
+                #else:
+                #    chunks.append(line_break)
+            else:
+                break
+
+        # Chomp the tail.
+        if chomping is not False:
+            chunks.append(line_break)
+        if chomping is True:
+            chunks.extend(breaks)
+
+        # We are done.
+        return ScalarToken(u''.join(chunks), False, start_mark, end_mark,
+                style)
+
+    def scan_block_scalar_indicators(self, start_mark):
+        # See the specification for details.
+        chomping = None
+        increment = None
+        ch = self.peek()
+        if ch in u'+-':
+            if ch == '+':
+                chomping = True
+            else:
+                chomping = False
+            self.forward()
+            ch = self.peek()
+            if ch in u'0123456789':
+                increment = int(ch)
+                if increment == 0:
+                    raise ScannerError("while scanning a block scalar", start_mark,
+                            "expected indentation indicator in the range 1-9, but found 0",
+                            self.get_mark())
+                self.forward()
+        elif ch in u'0123456789':
+            increment = int(ch)
+            if increment == 0:
+                raise ScannerError("while scanning a block scalar", start_mark,
+                        "expected indentation indicator in the range 1-9, but found 0",
+                        self.get_mark())
+            self.forward()
+            ch = self.peek()
+            if ch in u'+-':
+                if ch == '+':
+                    chomping = True
+                else:
+                    chomping = False
+                self.forward()
+        ch = self.peek()
+        if ch not in u'\0 \r\n\x85\u2028\u2029':
+            raise ScannerError("while scanning a block scalar", start_mark,
+                    "expected chomping or indentation indicators, but found %r"
+                        % ch.encode('utf-8'), self.get_mark())
+        return chomping, increment
+
+    def scan_block_scalar_ignored_line(self, start_mark):
+        # See the specification for details.
+        while self.peek() == u' ':
+            self.forward()
+        if self.peek() == u'#':
+            while self.peek() not in u'\0\r\n\x85\u2028\u2029':
+                self.forward()
+        ch = self.peek()
+        if ch not in u'\0\r\n\x85\u2028\u2029':
+            raise ScannerError("while scanning a block scalar", start_mark,
+                    "expected a comment or a line break, but found %r"
+                        % ch.encode('utf-8'), self.get_mark())
+        self.scan_line_break()
+
+    def scan_block_scalar_indentation(self):
+        # See the specification for details.
+        chunks = []
+        max_indent = 0
+        end_mark = self.get_mark()
+        while self.peek() in u' \r\n\x85\u2028\u2029':
+            if self.peek() != u' ':
+                chunks.append(self.scan_line_break())
+                end_mark = self.get_mark()
+            else:
+                self.forward()
+                if self.column > max_indent:
+                    max_indent = self.column
+        return chunks, max_indent, end_mark
+
+    def scan_block_scalar_breaks(self, indent):
+        # See the specification for details.
+        chunks = []
+        end_mark = self.get_mark()
+        while self.column < indent and self.peek() == u' ':
+            self.forward()
+        while self.peek() in u'\r\n\x85\u2028\u2029':
+            chunks.append(self.scan_line_break())
+            end_mark = self.get_mark()
+            while self.column < indent and self.peek() == u' ':
+                self.forward()
+        return chunks, end_mark
+
+    def scan_flow_scalar(self, style):
+        # See the specification for details.
+        # Note that we loose indentation rules for quoted scalars. Quoted
+        # scalars don't need to adhere indentation because " and ' clearly
+        # mark the beginning and the end of them. Therefore we are less
+        # restrictive then the specification requires. We only need to check
+        # that document separators are not included in scalars.
+        if style == '"':
+            double = True
+        else:
+            double = False
+        chunks = []
+        start_mark = self.get_mark()
+        quote = self.peek()
+        self.forward()
+        chunks.extend(self.scan_flow_scalar_non_spaces(double, start_mark))
+        while self.peek() != quote:
+            chunks.extend(self.scan_flow_scalar_spaces(double, start_mark))
+            chunks.extend(self.scan_flow_scalar_non_spaces(double, start_mark))
+        self.forward()
+        end_mark = self.get_mark()
+        return ScalarToken(u''.join(chunks), False, start_mark, end_mark,
+                style)
+
+    ESCAPE_REPLACEMENTS = {
+        u'0':   u'\0',
+        u'a':   u'\x07',
+        u'b':   u'\x08',
+        u't':   u'\x09',
+        u'\t':  u'\x09',
+        u'n':   u'\x0A',
+        u'v':   u'\x0B',
+        u'f':   u'\x0C',
+        u'r':   u'\x0D',
+        u'e':   u'\x1B',
+        u' ':   u'\x20',
+        u'\"':  u'\"',
+        u'\\':  u'\\',
+        u'N':   u'\x85',
+        u'_':   u'\xA0',
+        u'L':   u'\u2028',
+        u'P':   u'\u2029',
+    }
+
+    ESCAPE_CODES = {
+        u'x':   2,
+        u'u':   4,
+        u'U':   8,
+    }
+
+    def scan_flow_scalar_non_spaces(self, double, start_mark):
+        # See the specification for details.
+        chunks = []
+        while True:
+            length = 0
+            while self.peek(length) not in u'\'\"\\\0 \t\r\n\x85\u2028\u2029':
+                length += 1
+            if length:
+                chunks.append(self.prefix(length))
+                self.forward(length)
+            ch = self.peek()
+            if not double and ch == u'\'' and self.peek(1) == u'\'':
+                chunks.append(u'\'')
+                self.forward(2)
+            elif (double and ch == u'\'') or (not double and ch in u'\"\\'):
+                chunks.append(ch)
+                self.forward()
+            elif double and ch == u'\\':
+                self.forward()
+                ch = self.peek()
+                if ch in self.ESCAPE_REPLACEMENTS:
+                    chunks.append(self.ESCAPE_REPLACEMENTS[ch])
+                    self.forward()
+                elif ch in self.ESCAPE_CODES:
+                    length = self.ESCAPE_CODES[ch]
+                    self.forward()
+                    for k in range(length):
+                        if self.peek(k) not in u'0123456789ABCDEFabcdef':
+                            raise ScannerError("while scanning a double-quoted scalar", start_mark,
+                                    "expected escape sequence of %d hexdecimal numbers, but found %r" %
+                                        (length, self.peek(k).encode('utf-8')), self.get_mark())
+                    code = int(self.prefix(length), 16)
+                    chunks.append(unichr(code))
+                    self.forward(length)
+                elif ch in u'\r\n\x85\u2028\u2029':
+                    self.scan_line_break()
+                    chunks.extend(self.scan_flow_scalar_breaks(double, start_mark))
+                else:
+                    raise ScannerError("while scanning a double-quoted scalar", start_mark,
+                            "found unknown escape character %r" % ch.encode('utf-8'), self.get_mark())
+            else:
+                return chunks
+
+    def scan_flow_scalar_spaces(self, double, start_mark):
+        # See the specification for details.
+        chunks = []
+        length = 0
+        while self.peek(length) in u' \t':
+            length += 1
+        whitespaces = self.prefix(length)
+        self.forward(length)
+        ch = self.peek()
+        if ch == u'\0':
+            raise ScannerError("while scanning a quoted scalar", start_mark,
+                    "found unexpected end of stream", self.get_mark())
+        elif ch in u'\r\n\x85\u2028\u2029':
+            line_break = self.scan_line_break()
+            breaks = self.scan_flow_scalar_breaks(double, start_mark)
+            if line_break != u'\n':
+                chunks.append(line_break)
+            elif not breaks:
+                chunks.append(u' ')
+            chunks.extend(breaks)
+        else:
+            chunks.append(whitespaces)
+        return chunks
+
+    def scan_flow_scalar_breaks(self, double, start_mark):
+        # See the specification for details.
+        chunks = []
+        while True:
+            # Instead of checking indentation, we check for document
+            # separators.
+            prefix = self.prefix(3)
+            if (prefix == u'---' or prefix == u'...')   \
+                    and self.peek(3) in u'\0 \t\r\n\x85\u2028\u2029':
+                raise ScannerError("while scanning a quoted scalar", start_mark,
+                        "found unexpected document separator", self.get_mark())
+            while self.peek() in u' \t':
+                self.forward()
+            if self.peek() in u'\r\n\x85\u2028\u2029':
+                chunks.append(self.scan_line_break())
+            else:
+                return chunks
+
+    def scan_plain(self):
+        # See the specification for details.
+        # We add an additional restriction for the flow context:
+        #   plain scalars in the flow context cannot contain ',', ':' and '?'.
+        # We also keep track of the `allow_simple_key` flag here.
+        # Indentation rules are loosed for the flow context.
+        chunks = []
+        start_mark = self.get_mark()
+        end_mark = start_mark
+        indent = self.indent+1
+        # We allow zero indentation for scalars, but then we need to check for
+        # document separators at the beginning of the line.
+        #if indent == 0:
+        #    indent = 1
+        spaces = []
+        while True:
+            length = 0
+            if self.peek() == u'#':
+                break
+            while True:
+                ch = self.peek(length)
+                if ch in u'\0 \t\r\n\x85\u2028\u2029'   \
+                        or (not self.flow_level and ch == u':' and
+                                self.peek(length+1) in u'\0 \t\r\n\x85\u2028\u2029') \
+                        or (self.flow_level and ch in u',:?[]{}'):
+                    break
+                length += 1
+            # It's not clear what we should do with ':' in the flow context.
+            if (self.flow_level and ch == u':'
+                    and self.peek(length+1) not in u'\0 \t\r\n\x85\u2028\u2029,[]{}'):
+                self.forward(length)
+                raise ScannerError("while scanning a plain scalar", start_mark,
+                    "found unexpected ':'", self.get_mark(),
+                    "Please check http://pyyaml.org/wiki/YAMLColonInFlowContext for details.")
+            if length == 0:
+                break
+            self.allow_simple_key = False
+            chunks.extend(spaces)
+            chunks.append(self.prefix(length))
+            self.forward(length)
+            end_mark = self.get_mark()
+            spaces = self.scan_plain_spaces(indent, start_mark)
+            if not spaces or self.peek() == u'#' \
+                    or (not self.flow_level and self.column < indent):
+                break
+        return ScalarToken(u''.join(chunks), True, start_mark, end_mark)
+
+    def scan_plain_spaces(self, indent, start_mark):
+        # See the specification for details.
+        # The specification is really confusing about tabs in plain scalars.
+        # We just forbid them completely. Do not use tabs in YAML!
+        chunks = []
+        length = 0
+        while self.peek(length) in u' ':
+            length += 1
+        whitespaces = self.prefix(length)
+        self.forward(length)
+        ch = self.peek()
+        if ch in u'\r\n\x85\u2028\u2029':
+            line_break = self.scan_line_break()
+            self.allow_simple_key = True
+            prefix = self.prefix(3)
+            if (prefix == u'---' or prefix == u'...')   \
+                    and self.peek(3) in u'\0 \t\r\n\x85\u2028\u2029':
+                return
+            breaks = []
+            while self.peek() in u' \r\n\x85\u2028\u2029':
+                if self.peek() == ' ':
+                    self.forward()
+                else:
+                    breaks.append(self.scan_line_break())
+                    prefix = self.prefix(3)
+                    if (prefix == u'---' or prefix == u'...')   \
+                            and self.peek(3) in u'\0 \t\r\n\x85\u2028\u2029':
+                        return
+            if line_break != u'\n':
+                chunks.append(line_break)
+            elif not breaks:
+                chunks.append(u' ')
+            chunks.extend(breaks)
+        elif whitespaces:
+            chunks.append(whitespaces)
+        return chunks
+
+    def scan_tag_handle(self, name, start_mark):
+        # See the specification for details.
+        # For some strange reasons, the specification does not allow '_' in
+        # tag handles. I have allowed it anyway.
+        ch = self.peek()
+        if ch != u'!':
+            raise ScannerError("while scanning a %s" % name, start_mark,
+                    "expected '!', but found %r" % ch.encode('utf-8'),
+                    self.get_mark())
+        length = 1
+        ch = self.peek(length)
+        if ch != u' ':
+            while u'0' <= ch <= u'9' or u'A' <= ch <= u'Z' or u'a' <= ch <= u'z'    \
+                    or ch in u'-_':
+                length += 1
+                ch = self.peek(length)
+            if ch != u'!':
+                self.forward(length)
+                raise ScannerError("while scanning a %s" % name, start_mark,
+                        "expected '!', but found %r" % ch.encode('utf-8'),
+                        self.get_mark())
+            length += 1
+        value = self.prefix(length)
+        self.forward(length)
+        return value
+
+    def scan_tag_uri(self, name, start_mark):
+        # See the specification for details.
+        # Note: we do not check if URI is well-formed.
+        chunks = []
+        length = 0
+        ch = self.peek(length)
+        while u'0' <= ch <= u'9' or u'A' <= ch <= u'Z' or u'a' <= ch <= u'z'    \
+                or ch in u'-;/?:@&=+$,_.!~*\'()[]%':
+            if ch == u'%':
+                chunks.append(self.prefix(length))
+                self.forward(length)
+                length = 0
+                chunks.append(self.scan_uri_escapes(name, start_mark))
+            else:
+                length += 1
+            ch = self.peek(length)
+        if length:
+            chunks.append(self.prefix(length))
+            self.forward(length)
+            length = 0
+        if not chunks:
+            raise ScannerError("while parsing a %s" % name, start_mark,
+                    "expected URI, but found %r" % ch.encode('utf-8'),
+                    self.get_mark())
+        return u''.join(chunks)
+
+    def scan_uri_escapes(self, name, start_mark):
+        # See the specification for details.
+        bytes = []
+        mark = self.get_mark()
+        while self.peek() == u'%':
+            self.forward()
+            for k in range(2):
+                if self.peek(k) not in u'0123456789ABCDEFabcdef':
+                    raise ScannerError("while scanning a %s" % name, start_mark,
+                            "expected URI escape sequence of 2 hexdecimal numbers, but found %r" %
+                                (self.peek(k).encode('utf-8')), self.get_mark())
+            bytes.append(chr(int(self.prefix(2), 16)))
+            self.forward(2)
+        try:
+            value = unicode(''.join(bytes), 'utf-8')
+        except UnicodeDecodeError, exc:
+            raise ScannerError("while scanning a %s" % name, start_mark, str(exc), mark)
+        return value
+
+    def scan_line_break(self):
+        # Transforms:
+        #   '\r\n'      :   '\n'
+        #   '\r'        :   '\n'
+        #   '\n'        :   '\n'
+        #   '\x85'      :   '\n'
+        #   '\u2028'    :   '\u2028'
+        #   '\u2029     :   '\u2029'
+        #   default     :   ''
+        ch = self.peek()
+        if ch in u'\r\n\x85':
+            if self.prefix(2) == u'\r\n':
+                self.forward(2)
+            else:
+                self.forward()
+            return u'\n'
+        elif ch in u'\u2028\u2029':
+            self.forward()
+            return ch
+        return u''
+
+#try:
+#    import psyco
+#    psyco.bind(Scanner)
+#except ImportError:
+#    pass
+
diff --git a/lib/yaml/serializer.py b/lib/yaml/serializer.py
new file mode 100644
index 00000000..0bf1e96d
--- /dev/null
+++ b/lib/yaml/serializer.py
@@ -0,0 +1,111 @@
+
+__all__ = ['Serializer', 'SerializerError']
+
+from error import YAMLError
+from events import *
+from nodes import *
+
+class SerializerError(YAMLError):
+    pass
+
+class Serializer(object):
+
+    ANCHOR_TEMPLATE = u'id%03d'
+
+    def __init__(self, encoding=None,
+            explicit_start=None, explicit_end=None, version=None, tags=None):
+        self.use_encoding = encoding
+        self.use_explicit_start = explicit_start
+        self.use_explicit_end = explicit_end
+        self.use_version = version
+        self.use_tags = tags
+        self.serialized_nodes = {}
+        self.anchors = {}
+        self.last_anchor_id = 0
+        self.closed = None
+
+    def open(self):
+        if self.closed is None:
+            self.emit(StreamStartEvent(encoding=self.use_encoding))
+            self.closed = False
+        elif self.closed:
+            raise SerializerError("serializer is closed")
+        else:
+            raise SerializerError("serializer is already opened")
+
+    def close(self):
+        if self.closed is None:
+            raise SerializerError("serializer is not opened")
+        elif not self.closed:
+            self.emit(StreamEndEvent())
+            self.closed = True
+
+    #def __del__(self):
+    #    self.close()
+
+    def serialize(self, node):
+        if self.closed is None:
+            raise SerializerError("serializer is not opened")
+        elif self.closed:
+            raise SerializerError("serializer is closed")
+        self.emit(DocumentStartEvent(explicit=self.use_explicit_start,
+            version=self.use_version, tags=self.use_tags))
+        self.anchor_node(node)
+        self.serialize_node(node, None, None)
+        self.emit(DocumentEndEvent(explicit=self.use_explicit_end))
+        self.serialized_nodes = {}
+        self.anchors = {}
+        self.last_anchor_id = 0
+
+    def anchor_node(self, node):
+        if node in self.anchors:
+            if self.anchors[node] is None:
+                self.anchors[node] = self.generate_anchor(node)
+        else:
+            self.anchors[node] = None
+            if isinstance(node, SequenceNode):
+                for item in node.value:
+                    self.anchor_node(item)
+            elif isinstance(node, MappingNode):
+                for key, value in node.value:
+                    self.anchor_node(key)
+                    self.anchor_node(value)
+
+    def generate_anchor(self, node):
+        self.last_anchor_id += 1
+        return self.ANCHOR_TEMPLATE % self.last_anchor_id
+
+    def serialize_node(self, node, parent, index):
+        alias = self.anchors[node]
+        if node in self.serialized_nodes:
+            self.emit(AliasEvent(alias))
+        else:
+            self.serialized_nodes[node] = True
+            self.descend_resolver(parent, index)
+            if isinstance(node, ScalarNode):
+                detected_tag = self.resolve(ScalarNode, node.value, (True, False))
+                default_tag = self.resolve(ScalarNode, node.value, (False, True))
+                implicit = (node.tag == detected_tag), (node.tag == default_tag)
+                self.emit(ScalarEvent(alias, node.tag, implicit, node.value,
+                    style=node.style))
+            elif isinstance(node, SequenceNode):
+                implicit = (node.tag
+                            == self.resolve(SequenceNode, node.value, True))
+                self.emit(SequenceStartEvent(alias, node.tag, implicit,
+                    flow_style=node.flow_style))
+                index = 0
+                for item in node.value:
+                    self.serialize_node(item, node, index)
+                    index += 1
+                self.emit(SequenceEndEvent())
+            elif isinstance(node, MappingNode):
+                implicit = (node.tag
+                            == self.resolve(MappingNode, node.value, True))
+                self.emit(MappingStartEvent(alias, node.tag, implicit,
+                    flow_style=node.flow_style))
+                for key, value in node.value:
+                    self.serialize_node(key, node, None)
+                    self.serialize_node(value, node, key)
+                self.emit(MappingEndEvent())
+            self.ascend_resolver()
+
diff --git a/lib/yaml/tokens.py b/lib/yaml/tokens.py
new file mode 100644
index 00000000..4d0b48a3
--- /dev/null
+++ b/lib/yaml/tokens.py
@@ -0,0 +1,104 @@
+
+class Token(object):
+    def __init__(self, start_mark, end_mark):
+        self.start_mark = start_mark
+        self.end_mark = end_mark
+    def __repr__(self):
+        attributes = [key for key in self.__dict__
+                if not key.endswith('_mark')]
+        attributes.sort()
+        arguments = ', '.join(['%s=%r' % (key, getattr(self, key))
+                for key in attributes])
+        return '%s(%s)' % (self.__class__.__name__, arguments)
+
+#class BOMToken(Token):
+#    id = '<byte order mark>'
+
+class DirectiveToken(Token):
+    id = '<directive>'
+    def __init__(self, name, value, start_mark, end_mark):
+        self.name = name
+        self.value = value
+        self.start_mark = start_mark
+        self.end_mark = end_mark
+
+class DocumentStartToken(Token):
+    id = '<document start>'
+
+class DocumentEndToken(Token):
+    id = '<document end>'
+
+class StreamStartToken(Token):
+    id = '<stream start>'
+    def __init__(self, start_mark=None, end_mark=None,
+            encoding=None):
+        self.start_mark = start_mark
+        self.end_mark = end_mark
+        self.encoding = encoding
+
+class StreamEndToken(Token):
+    id = '<stream end>'
+
+class BlockSequenceStartToken(Token):
+    id = '<block sequence start>'
+
+class BlockMappingStartToken(Token):
+    id = '<block mapping start>'
+
+class BlockEndToken(Token):
+    id = '<block end>'
+
+class FlowSequenceStartToken(Token):
+    id = '['
+
+class FlowMappingStartToken(Token):
+    id = '{'
+
+class FlowSequenceEndToken(Token):
+    id = ']'
+
+class FlowMappingEndToken(Token):
+    id = '}'
+
+class KeyToken(Token):
+    id = '?'
+
+class ValueToken(Token):
+    id = ':'
+
+class BlockEntryToken(Token):
+    id = '-'
+
+class FlowEntryToken(Token):
+    id = ','
+
+class AliasToken(Token):
+    id = '<alias>'
+    def __init__(self, value, start_mark, end_mark):
+        self.value = value
+        self.start_mark = start_mark
+        self.end_mark = end_mark
+
+class AnchorToken(Token):
+    id = '<anchor>'
+    def __init__(self, value, start_mark, end_mark):
+        self.value = value
+        self.start_mark = start_mark
+        self.end_mark = end_mark
+
+class TagToken(Token):
+    id = '<tag>'
+    def __init__(self, value, start_mark, end_mark):
+        self.value = value
+        self.start_mark = start_mark
+        self.end_mark = end_mark
+
+class ScalarToken(Token):
+    id = '<scalar>'
+    def __init__(self, value, plain, start_mark, end_mark, style=None):
+        self.value = value
+        self.plain = plain
+        self.start_mark = start_mark
+        self.end_mark = end_mark
+        self.style = style
+
diff --git a/lib/zc/lockfile/README.txt b/lib/zc/lockfile/README.txt
deleted file mode 100644
index 89ef33e9..00000000
--- a/lib/zc/lockfile/README.txt
+++ /dev/null
@@ -1,70 +0,0 @@
-Lock file support
-=================
-
-The ZODB lock_file module provides support for creating file system
-locks.  These are locks that are implemented with lock files and
-OS-provided locking facilities.  To create a lock, instantiate a
-LockFile object with a file name:
-
-    >>> import zc.lockfile
-    >>> lock = zc.lockfile.LockFile('lock')
-
-If we try to lock the same name, we'll get a lock error:
-
-    >>> import zope.testing.loggingsupport
-    >>> handler = zope.testing.loggingsupport.InstalledHandler('zc.lockfile')
-    >>> try:
-    ...     zc.lockfile.LockFile('lock')
-    ... except zc.lockfile.LockError:
-    ...     print("Can't lock file")
-    Can't lock file
-
-.. We don't log failure to acquire.
-
-    >>> for record in handler.records: # doctest: +ELLIPSIS
-    ...     print(record.levelname+' '+record.getMessage())
-
-To release the lock, use it's close method:
-
-    >>> lock.close()
-
-The lock file is not removed.  It is left behind:
-
-    >>> import os
-    >>> os.path.exists('lock')
-    True
-
-Of course, now that we've released the lock, we can create it again:
-
-    >>> lock = zc.lockfile.LockFile('lock')
-    >>> lock.close()
-
-.. Cleanup
-
-    >>> import os
-    >>> os.remove('lock')
-
-Hostname in lock file
-=====================
-
-In a container environment (e.g. Docker), the PID is typically always
-identical even if multiple containers are running under the same operating
-system instance.
-
-Clearly, inspecting lock files doesn't then help much in debugging. To identify
-the container which created the lock file, we need information about the
-container in the lock file. Since Docker uses the container identifier or name
-as the hostname, this information can be stored in the lock file in addition to
-or instead of the PID.
-
-Use the ``content_template`` keyword argument to ``LockFile`` to specify a
-custom lock file content format:
-
-    >>> lock = zc.lockfile.LockFile('lock', content_template='{pid};{hostname}')
-    >>> lock.close()
-
-If you now inspected the lock file, you would see e.g.:
-
-    $ cat lock
-     123;myhostname
-
diff --git a/lib/zc/lockfile/__init__.py b/lib/zc/lockfile/__init__.py
deleted file mode 100644
index f93917b0..00000000
--- a/lib/zc/lockfile/__init__.py
+++ /dev/null
@@ -1,128 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
-#
-##############################################################################
-import logging
-import os
-
-
-logger = logging.getLogger("zc.lockfile")
-
-
-class LockError(Exception):
-    """Couldn't get a lock
-    """
-
-
-try:
-    import fcntl
-except ImportError:
-    try:
-        import msvcrt
-    except ImportError:
-        def _lock_file(file):
-            raise TypeError('No file-locking support on this platform')
-
-        def _unlock_file(file):
-            raise TypeError('No file-locking support on this platform')
-
-    else:
-        # Windows
-        def _lock_file(file):
-            # Lock just the first byte
-            try:
-                msvcrt.locking(file.fileno(), msvcrt.LK_NBLCK, 1)
-            except OSError:
-                raise LockError("Couldn't lock %r" % file.name)
-
-        def _unlock_file(file):
-            try:
-                file.seek(0)
-                msvcrt.locking(file.fileno(), msvcrt.LK_UNLCK, 1)
-            except OSError:
-                raise LockError("Couldn't unlock %r" % file.name)
-
-else:
-    # Unix
-    _flags = fcntl.LOCK_EX | fcntl.LOCK_NB
-
-    def _lock_file(file):
-        try:
-            fcntl.flock(file.fileno(), _flags)
-        except OSError:
-            raise LockError("Couldn't lock %r" % file.name)
-
-    def _unlock_file(file):
-        fcntl.flock(file.fileno(), fcntl.LOCK_UN)
-
-
-class LazyHostName:
-    """Avoid importing socket and calling gethostname() unnecessarily"""
-
-    def __str__(self):
-        import socket
-        return socket.gethostname()
-
-
-class SimpleLockFile:
-
-    _fp = None
-
-    def __init__(self, path):
-        self._path = path
-        try:
-            # Try to open for writing without truncation:
-            fp = open(path, 'r+')
-        except OSError:
-            # If the file doesn't exist, we'll get an IO error, try a+
-            # Note that there may be a race here. Multiple processes
-            # could fail on the r+ open and open the file a+, but only
-            # one will get the the lock and write a pid.
-            fp = open(path, 'a+')
-
-        try:
-            _lock_file(fp)
-            self._fp = fp
-        except BaseException:
-            fp.close()
-            raise
-
-        # Lock acquired
-        self._on_lock()
-        fp.flush()
-
-    def close(self):
-        if self._fp is not None:
-            _unlock_file(self._fp)
-            self._fp.close()
-            self._fp = None
-
-    def _on_lock(self):
-        """
-        Allow subclasses to supply behavior to occur following
-        lock acquisition.
-        """
-
-
-class LockFile(SimpleLockFile):
-
-    def __init__(self, path, content_template='{pid}'):
-        self._content_template = content_template
-        super().__init__(path)
-
-    def _on_lock(self):
-        content = self._content_template.format(
-            pid=os.getpid(),
-            hostname=LazyHostName(),
-        )
-        self._fp.write(" %s\n" % content)
-        self._fp.truncate()
diff --git a/lib/zc/lockfile/tests.py b/lib/zc/lockfile/tests.py
deleted file mode 100644
index ae9ffca5..00000000
--- a/lib/zc/lockfile/tests.py
+++ /dev/null
@@ -1,203 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2004 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-import doctest
-import os
-import tempfile
-import threading
-import time
-import unittest
-from unittest.mock import Mock
-from unittest.mock import patch
-
-from zope.testing import setupstack
-
-import zc.lockfile
-
-
-def inc():
-    while True:
-        try:
-            lock = zc.lockfile.LockFile('f.lock')
-        except zc.lockfile.LockError:
-            continue
-        else:
-            break
-    f = open('f', 'r+b')
-    v = int(f.readline().strip())
-    time.sleep(0.01)
-    v += 1
-    f.seek(0)
-    f.write(('%d\n' % v).encode('ASCII'))
-    f.close()
-    lock.close()
-
-
-def many_threads_read_and_write():
-    r"""
-    >>> with open('f', 'w+b') as file:
-    ...     _ = file.write(b'0\n')
-    >>> with open('f.lock', 'w+b') as file:
-    ...     _ = file.write(b'0\n')
-
-    >>> n = 50
-    >>> threads = [threading.Thread(target=inc) for i in range(n)]
-    >>> _ = [thread.start() for thread in threads]
-    >>> _ = [thread.join() for thread in threads]
-    >>> with open('f', 'rb') as file:
-    ...     saved = int(file.read().strip())
-    >>> saved == n
-    True
-
-    >>> os.remove('f')
-
-    We should only have one pid in the lock file:
-
-    >>> f = open('f.lock')
-    >>> len(f.read().strip().split())
-    1
-    >>> f.close()
-
-    >>> os.remove('f.lock')
-
-    """
-
-
-def pid_in_lockfile():
-    r"""
-    >>> import os, zc.lockfile
-    >>> pid = os.getpid()
-    >>> lock = zc.lockfile.LockFile("f.lock")
-    >>> f = open("f.lock")
-    >>> _ = f.seek(1)
-    >>> f.read().strip() == str(pid)
-    True
-    >>> f.close()
-
-    Make sure that locking twice does not overwrite the old pid:
-
-    >>> lock = zc.lockfile.LockFile("f.lock")
-    Traceback (most recent call last):
-      ...
-    zc.lockfile.LockError: Couldn't lock 'f.lock'
-
-    >>> f = open("f.lock")
-    >>> _ = f.seek(1)
-    >>> f.read().strip() == str(pid)
-    True
-    >>> f.close()
-
-    >>> lock.close()
-    """
-
-
-def hostname_in_lockfile():
-    r"""
-    hostname is correctly written into the lock file when it's included in the
-    lock file content template
-
-    >>> import zc.lockfile
-    >>> with patch('socket.gethostname', Mock(return_value='myhostname')):
-    ...     lock = zc.lockfile.LockFile(
-    ...         "f.lock", content_template='{hostname}')
-    >>> f = open("f.lock")
-    >>> _ = f.seek(1)
-    >>> f.read().rstrip()
-    'myhostname'
-    >>> f.close()
-
-    Make sure that locking twice does not overwrite the old hostname:
-
-    >>> lock = zc.lockfile.LockFile("f.lock", content_template='{hostname}')
-    Traceback (most recent call last):
-      ...
-    zc.lockfile.LockError: Couldn't lock 'f.lock'
-
-    >>> f = open("f.lock")
-    >>> _ = f.seek(1)
-    >>> f.read().rstrip()
-    'myhostname'
-    >>> f.close()
-
-    >>> lock.close()
-    """
-
-
-class TestLogger:
-    def __init__(self):
-        self.log_entries = []
-
-    def exception(self, msg, *args):
-        self.log_entries.append((msg,) + args)
-
-
-class LockFileLogEntryTestCase(unittest.TestCase):
-    """Tests for logging in case of lock failure"""
-
-    def setUp(self):
-        self.here = os.getcwd()
-        self.tmp = tempfile.mkdtemp(prefix='zc.lockfile-test-')
-        os.chdir(self.tmp)
-
-    def tearDown(self):
-        os.chdir(self.here)
-        setupstack.rmtree(self.tmp)
-
-    def test_log_formatting(self):
-        # PID and hostname are parsed and logged from lock file on failure
-        with patch('os.getpid', Mock(return_value=123)):
-            with patch('socket.gethostname', Mock(return_value='myhostname')):
-                lock = zc.lockfile.LockFile(
-                    'f.lock', content_template='{pid}/{hostname}')
-                with open('f.lock') as f:
-                    self.assertEqual(' 123/myhostname\n', f.read())
-
-                lock.close()
-
-    def test_unlock_and_lock_while_multiprocessing_process_running(self):
-        import multiprocessing
-
-        lock = zc.lockfile.LockFile('l')
-        q = multiprocessing.Queue()
-        p = multiprocessing.Process(target=q.get)
-        p.daemon = True
-        p.start()
-
-        # release and re-acquire should work (obviously)
-        lock.close()
-        lock = zc.lockfile.LockFile('l')
-        self.assertTrue(p.is_alive())
-
-        q.put(0)
-        lock.close()
-        p.join()
-
-    def test_simple_lock(self):
-        assert isinstance(zc.lockfile.SimpleLockFile, type)
-        lock = zc.lockfile.SimpleLockFile('s')
-        with self.assertRaises(zc.lockfile.LockError):
-            zc.lockfile.SimpleLockFile('s')
-        lock.close()
-        zc.lockfile.SimpleLockFile('s').close()
-
-
-def test_suite():
-    suite = unittest.TestSuite()
-    suite.addTest(doctest.DocFileSuite(
-        'README.txt',
-        setUp=setupstack.setUpDirectory, tearDown=setupstack.tearDown))
-    suite.addTest(doctest.DocTestSuite(
-        setUp=setupstack.setUpDirectory, tearDown=setupstack.tearDown))
-    # Add unittest test cases from this module
-    suite.addTest(unittest.defaultTestLoader.loadTestsFromName(__name__))
-    return suite
diff --git a/lib/zipp/__init__.py b/lib/zipp/__init__.py
deleted file mode 100644
index 031d9d4f..00000000
--- a/lib/zipp/__init__.py
+++ /dev/null
@@ -1,455 +0,0 @@
-"""
-A Path-like interface for zipfiles.
-
-This codebase is shared between zipfile.Path in the stdlib
-and zipp in PyPI. See
-https://github.com/python/importlib_metadata/wiki/Development-Methodology
-for more detail.
-"""
-
-import functools
-import io
-import itertools
-import pathlib
-import posixpath
-import re
-import stat
-import sys
-import zipfile
-
-from .compat.py310 import text_encoding
-from .glob import Translator
-
-from ._functools import save_method_args
-
-
-__all__ = ['Path']
-
-
-def _parents(path):
-    """
-    Given a path with elements separated by
-    posixpath.sep, generate all parents of that path.
-
-    >>> list(_parents('b/d'))
-    ['b']
-    >>> list(_parents('/b/d/'))
-    ['/b']
-    >>> list(_parents('b/d/f/'))
-    ['b/d', 'b']
-    >>> list(_parents('b'))
-    []
-    >>> list(_parents(''))
-    []
-    """
-    return itertools.islice(_ancestry(path), 1, None)
-
-
-def _ancestry(path):
-    """
-    Given a path with elements separated by
-    posixpath.sep, generate all elements of that path.
-
-    >>> list(_ancestry('b/d'))
-    ['b/d', 'b']
-    >>> list(_ancestry('/b/d/'))
-    ['/b/d', '/b']
-    >>> list(_ancestry('b/d/f/'))
-    ['b/d/f', 'b/d', 'b']
-    >>> list(_ancestry('b'))
-    ['b']
-    >>> list(_ancestry(''))
-    []
-
-    Multiple separators are treated like a single.
-
-    >>> list(_ancestry('//b//d///f//'))
-    ['//b//d///f', '//b//d', '//b']
-    """
-    path = path.rstrip(posixpath.sep)
-    while path.rstrip(posixpath.sep):
-        yield path
-        path, tail = posixpath.split(path)
-
-
-_dedupe = dict.fromkeys
-"""Deduplicate an iterable in original order"""
-
-
-def _difference(minuend, subtrahend):
-    """
-    Return items in minuend not in subtrahend, retaining order
-    with O(1) lookup.
-    """
-    return itertools.filterfalse(set(subtrahend).__contains__, minuend)
-
-
-class InitializedState:
-    """
-    Mix-in to save the initialization state for pickling.
-    """
-
-    @save_method_args
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-    def __getstate__(self):
-        return self._saved___init__.args, self._saved___init__.kwargs
-
-    def __setstate__(self, state):
-        args, kwargs = state
-        super().__init__(*args, **kwargs)
-
-
-class CompleteDirs(InitializedState, zipfile.ZipFile):
-    """
-    A ZipFile subclass that ensures that implied directories
-    are always included in the namelist.
-
-    >>> list(CompleteDirs._implied_dirs(['foo/bar.txt', 'foo/bar/baz.txt']))
-    ['foo/', 'foo/bar/']
-    >>> list(CompleteDirs._implied_dirs(['foo/bar.txt', 'foo/bar/baz.txt', 'foo/bar/']))
-    ['foo/']
-    """
-
-    @staticmethod
-    def _implied_dirs(names):
-        parents = itertools.chain.from_iterable(map(_parents, names))
-        as_dirs = (p + posixpath.sep for p in parents)
-        return _dedupe(_difference(as_dirs, names))
-
-    def namelist(self):
-        names = super().namelist()
-        return names + list(self._implied_dirs(names))
-
-    def _name_set(self):
-        return set(self.namelist())
-
-    def resolve_dir(self, name):
-        """
-        If the name represents a directory, return that name
-        as a directory (with the trailing slash).
-        """
-        names = self._name_set()
-        dirname = name + '/'
-        dir_match = name not in names and dirname in names
-        return dirname if dir_match else name
-
-    def getinfo(self, name):
-        """
-        Supplement getinfo for implied dirs.
-        """
-        try:
-            return super().getinfo(name)
-        except KeyError:
-            if not name.endswith('/') or name not in self._name_set():
-                raise
-            return zipfile.ZipInfo(filename=name)
-
-    @classmethod
-    def make(cls, source):
-        """
-        Given a source (filename or zipfile), return an
-        appropriate CompleteDirs subclass.
-        """
-        if isinstance(source, CompleteDirs):
-            return source
-
-        if not isinstance(source, zipfile.ZipFile):
-            return cls(source)
-
-        # Only allow for FastLookup when supplied zipfile is read-only
-        if 'r' not in source.mode:
-            cls = CompleteDirs
-
-        source.__class__ = cls
-        return source
-
-    @classmethod
-    def inject(cls, zf: zipfile.ZipFile) -> zipfile.ZipFile:
-        """
-        Given a writable zip file zf, inject directory entries for
-        any directories implied by the presence of children.
-        """
-        for name in cls._implied_dirs(zf.namelist()):
-            zf.writestr(name, b"")
-        return zf
-
-
-class FastLookup(CompleteDirs):
-    """
-    ZipFile subclass to ensure implicit
-    dirs exist and are resolved rapidly.
-    """
-
-    def namelist(self):
-        return self._namelist
-
-    @functools.cached_property
-    def _namelist(self):
-        return super().namelist()
-
-    def _name_set(self):
-        return self._name_set_prop
-
-    @functools.cached_property
-    def _name_set_prop(self):
-        return super()._name_set()
-
-
-def _extract_text_encoding(encoding=None, *args, **kwargs):
-    # compute stack level so that the caller of the caller sees any warning.
-    is_pypy = sys.implementation.name == 'pypy'
-    stack_level = 3 + is_pypy
-    return text_encoding(encoding, stack_level), args, kwargs
-
-
-class Path:
-    """
-    A :class:`importlib.resources.abc.Traversable` interface for zip files.
-
-    Implements many of the features users enjoy from
-    :class:`pathlib.Path`.
-
-    Consider a zip file with this structure::
-
-        .
-        ├── a.txt
-        └── b
-            ├── c.txt
-            └── d
-                └── e.txt
-
-    >>> data = io.BytesIO()
-    >>> zf = zipfile.ZipFile(data, 'w')
-    >>> zf.writestr('a.txt', 'content of a')
-    >>> zf.writestr('b/c.txt', 'content of c')
-    >>> zf.writestr('b/d/e.txt', 'content of e')
-    >>> zf.filename = 'mem/abcde.zip'
-
-    Path accepts the zipfile object itself or a filename
-
-    >>> path = Path(zf)
-
-    From there, several path operations are available.
-
-    Directory iteration (including the zip file itself):
-
-    >>> a, b = path.iterdir()
-    >>> a
-    Path('mem/abcde.zip', 'a.txt')
-    >>> b
-    Path('mem/abcde.zip', 'b/')
-
-    name property:
-
-    >>> b.name
-    'b'
-
-    join with divide operator:
-
-    >>> c = b / 'c.txt'
-    >>> c
-    Path('mem/abcde.zip', 'b/c.txt')
-    >>> c.name
-    'c.txt'
-
-    Read text:
-
-    >>> c.read_text(encoding='utf-8')
-    'content of c'
-
-    existence:
-
-    >>> c.exists()
-    True
-    >>> (b / 'missing.txt').exists()
-    False
-
-    Coercion to string:
-
-    >>> import os
-    >>> str(c).replace(os.sep, posixpath.sep)
-    'mem/abcde.zip/b/c.txt'
-
-    At the root, ``name``, ``filename``, and ``parent``
-    resolve to the zipfile.
-
-    >>> str(path)
-    'mem/abcde.zip/'
-    >>> path.name
-    'abcde.zip'
-    >>> path.filename == pathlib.Path('mem/abcde.zip')
-    True
-    >>> str(path.parent)
-    'mem'
-
-    If the zipfile has no filename, such attributes are not
-    valid and accessing them will raise an Exception.
-
-    >>> zf.filename = None
-    >>> path.name
-    Traceback (most recent call last):
-    ...
-    TypeError: ...
-
-    >>> path.filename
-    Traceback (most recent call last):
-    ...
-    TypeError: ...
-
-    >>> path.parent
-    Traceback (most recent call last):
-    ...
-    TypeError: ...
-
-    # workaround python/cpython#106763
-    >>> pass
-    """
-
-    __repr = "{self.__class__.__name__}({self.root.filename!r}, {self.at!r})"
-
-    def __init__(self, root, at=""):
-        """
-        Construct a Path from a ZipFile or filename.
-
-        Note: When the source is an existing ZipFile object,
-        its type (__class__) will be mutated to a
-        specialized type. If the caller wishes to retain the
-        original type, the caller should either create a
-        separate ZipFile object or pass a filename.
-        """
-        self.root = FastLookup.make(root)
-        self.at = at
-
-    def __eq__(self, other):
-        """
-        >>> Path(zipfile.ZipFile(io.BytesIO(), 'w')) == 'foo'
-        False
-        """
-        if self.__class__ is not other.__class__:
-            return NotImplemented
-        return (self.root, self.at) == (other.root, other.at)
-
-    def __hash__(self):
-        return hash((self.root, self.at))
-
-    def open(self, mode='r', *args, pwd=None, **kwargs):
-        """
-        Open this entry as text or binary following the semantics
-        of ``pathlib.Path.open()`` by passing arguments through
-        to io.TextIOWrapper().
-        """
-        if self.is_dir():
-            raise IsADirectoryError(self)
-        zip_mode = mode[0]
-        if zip_mode == 'r' and not self.exists():
-            raise FileNotFoundError(self)
-        stream = self.root.open(self.at, zip_mode, pwd=pwd)
-        if 'b' in mode:
-            if args or kwargs:
-                raise ValueError("encoding args invalid for binary operation")
-            return stream
-        # Text mode:
-        encoding, args, kwargs = _extract_text_encoding(*args, **kwargs)
-        return io.TextIOWrapper(stream, encoding, *args, **kwargs)
-
-    def _base(self):
-        return pathlib.PurePosixPath(self.at or self.root.filename)
-
-    @property
-    def name(self):
-        return self._base().name
-
-    @property
-    def suffix(self):
-        return self._base().suffix
-
-    @property
-    def suffixes(self):
-        return self._base().suffixes
-
-    @property
-    def stem(self):
-        return self._base().stem
-
-    @property
-    def filename(self):
-        return pathlib.Path(self.root.filename).joinpath(self.at)
-
-    def read_text(self, *args, **kwargs):
-        encoding, args, kwargs = _extract_text_encoding(*args, **kwargs)
-        with self.open('r', encoding, *args, **kwargs) as strm:
-            return strm.read()
-
-    def read_bytes(self):
-        with self.open('rb') as strm:
-            return strm.read()
-
-    def _is_child(self, path):
-        return posixpath.dirname(path.at.rstrip("/")) == self.at.rstrip("/")
-
-    def _next(self, at):
-        return self.__class__(self.root, at)
-
-    def is_dir(self):
-        return not self.at or self.at.endswith("/")
-
-    def is_file(self):
-        return self.exists() and not self.is_dir()
-
-    def exists(self):
-        return self.at in self.root._name_set()
-
-    def iterdir(self):
-        if not self.is_dir():
-            raise ValueError("Can't listdir a file")
-        subs = map(self._next, self.root.namelist())
-        return filter(self._is_child, subs)
-
-    def match(self, path_pattern):
-        return pathlib.PurePosixPath(self.at).match(path_pattern)
-
-    def is_symlink(self):
-        """
-        Return whether this path is a symlink.
-        """
-        info = self.root.getinfo(self.at)
-        mode = info.external_attr >> 16
-        return stat.S_ISLNK(mode)
-
-    def glob(self, pattern):
-        if not pattern:
-            raise ValueError(f"Unacceptable pattern: {pattern!r}")
-
-        prefix = re.escape(self.at)
-        tr = Translator(seps='/')
-        matches = re.compile(prefix + tr.translate(pattern)).fullmatch
-        return map(self._next, filter(matches, self.root.namelist()))
-
-    def rglob(self, pattern):
-        return self.glob(f'**/{pattern}')
-
-    def relative_to(self, other, *extra):
-        return posixpath.relpath(str(self), str(other.joinpath(*extra)))
-
-    def __str__(self):
-        return posixpath.join(self.root.filename, self.at)
-
-    def __repr__(self):
-        return self.__repr.format(self=self)
-
-    def joinpath(self, *other):
-        next = posixpath.join(self.at, *other)
-        return self._next(self.root.resolve_dir(next))
-
-    __truediv__ = joinpath
-
-    @property
-    def parent(self):
-        if not self.at:
-            return self.filename.parent
-        parent_at = posixpath.dirname(self.at.rstrip('/'))
-        if parent_at:
-            parent_at += '/'
-        return self._next(parent_at)
diff --git a/lib/zipp/_functools.py b/lib/zipp/_functools.py
deleted file mode 100644
index f75ae2b0..00000000
--- a/lib/zipp/_functools.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import collections
-import functools
-
-
-# from jaraco.functools 4.0.2
-def save_method_args(method):
-    """
-    Wrap a method such that when it is called, the args and kwargs are
-    saved on the method.
-    """
-    args_and_kwargs = collections.namedtuple('args_and_kwargs', 'args kwargs')
-
-    @functools.wraps(method)
-    def wrapper(self, /, *args, **kwargs):
-        attr_name = '_saved_' + method.__name__
-        attr = args_and_kwargs(args, kwargs)
-        setattr(self, attr_name, attr)
-        return method(self, *args, **kwargs)
-
-    return wrapper
diff --git a/lib/zipp/compat/__init__.py b/lib/zipp/compat/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/lib/zipp/compat/overlay.py b/lib/zipp/compat/overlay.py
deleted file mode 100644
index 5a97ee7c..00000000
--- a/lib/zipp/compat/overlay.py
+++ /dev/null
@@ -1,37 +0,0 @@
-"""
-Expose zipp.Path as .zipfile.Path.
-
-Includes everything else in ``zipfile`` to match future usage. Just
-use:
-
->>> from zipp.compat.overlay import zipfile
-
-in place of ``import zipfile``.
-
-Relative imports are supported too.
-
->>> from zipp.compat.overlay.zipfile import ZipInfo
-
-The ``zipfile`` object added to ``sys.modules`` needs to be
-hashable (#126).
-
->>> _ = hash(sys.modules['zipp.compat.overlay.zipfile'])
-"""
-
-import importlib
-import sys
-import types
-
-import zipp
-
-
-class HashableNamespace(types.SimpleNamespace):
-    def __hash__(self):
-        return hash(tuple(vars(self)))
-
-
-zipfile = HashableNamespace(**vars(importlib.import_module('zipfile')))
-zipfile.Path = zipp.Path
-zipfile._path = zipp
-
-sys.modules[__name__ + '.zipfile'] = zipfile  # type: ignore[assignment]
diff --git a/lib/zipp/compat/py310.py b/lib/zipp/compat/py310.py
deleted file mode 100644
index e1e7ec22..00000000
--- a/lib/zipp/compat/py310.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import io
-import sys
-
-
-def _text_encoding(encoding, stacklevel=2, /):  # pragma: no cover
-    return encoding
-
-
-text_encoding = (
-    io.text_encoding  # type: ignore[unused-ignore, attr-defined]
-    if sys.version_info > (3, 10)
-    else _text_encoding
-)
diff --git a/lib/zipp/glob.py b/lib/zipp/glob.py
deleted file mode 100644
index 4ed74cc4..00000000
--- a/lib/zipp/glob.py
+++ /dev/null
@@ -1,113 +0,0 @@
-import os
-import re
-
-_default_seps = os.sep + str(os.altsep) * bool(os.altsep)
-
-
-class Translator:
-    """
-    >>> Translator('xyz')
-    Traceback (most recent call last):
-    ...
-    AssertionError: Invalid separators
-
-    >>> Translator('')
-    Traceback (most recent call last):
-    ...
-    AssertionError: Invalid separators
-    """
-
-    seps: str
-
-    def __init__(self, seps: str = _default_seps):
-        assert seps and set(seps) <= set(_default_seps), "Invalid separators"
-        self.seps = seps
-
-    def translate(self, pattern):
-        """
-        Given a glob pattern, produce a regex that matches it.
-        """
-        return self.extend(self.match_dirs(self.translate_core(pattern)))
-
-    def extend(self, pattern):
-        r"""
-        Extend regex for pattern-wide concerns.
-
-        Apply '(?s:)' to create a non-matching group that
-        matches newlines (valid on Unix).
-
-        Append '\Z' to imply fullmatch even when match is used.
-        """
-        return rf'(?s:{pattern})\Z'
-
-    def match_dirs(self, pattern):
-        """
-        Ensure that zipfile.Path directory names are matched.
-
-        zipfile.Path directory names always end in a slash.
-        """
-        return rf'{pattern}[/]?'
-
-    def translate_core(self, pattern):
-        r"""
-        Given a glob pattern, produce a regex that matches it.
-
-        >>> t = Translator()
-        >>> t.translate_core('*.txt').replace('\\\\', '')
-        '[^/]*\\.txt'
-        >>> t.translate_core('a?txt')
-        'a[^/]txt'
-        >>> t.translate_core('**/*').replace('\\\\', '')
-        '.*/[^/][^/]*'
-        """
-        self.restrict_rglob(pattern)
-        return ''.join(map(self.replace, separate(self.star_not_empty(pattern))))
-
-    def replace(self, match):
-        """
-        Perform the replacements for a match from :func:`separate`.
-        """
-        return match.group('set') or (
-            re.escape(match.group(0))
-            .replace('\\*\\*', r'.*')
-            .replace('\\*', rf'[^{re.escape(self.seps)}]*')
-            .replace('\\?', r'[^/]')
-        )
-
-    def restrict_rglob(self, pattern):
-        """
-        Raise ValueError if ** appears in anything but a full path segment.
-
-        >>> Translator().translate('**foo')
-        Traceback (most recent call last):
-        ...
-        ValueError: ** must appear alone in a path segment
-        """
-        seps_pattern = rf'[{re.escape(self.seps)}]+'
-        segments = re.split(seps_pattern, pattern)
-        if any('**' in segment and segment != '**' for segment in segments):
-            raise ValueError("** must appear alone in a path segment")
-
-    def star_not_empty(self, pattern):
-        """
-        Ensure that * will not match an empty segment.
-        """
-
-        def handle_segment(match):
-            segment = match.group(0)
-            return '?*' if segment == '*' else segment
-
-        not_seps_pattern = rf'[^{re.escape(self.seps)}]+'
-        return re.sub(not_seps_pattern, handle_segment, pattern)
-
-
-def separate(pattern):
-    """
-    Separate out character sets to avoid translating their contents.
-
-    >>> [m.group(0) for m in separate('*.txt')]
-    ['*.txt']
-    >>> [m.group(0) for m in separate('a[?]txt')]
-    ['a', '[?]', 'txt']
-    """
-    return re.finditer(r'([^\[]+)|(?P<set>[\[].*?[\]])|([\[][^\]]*$)', pattern)
diff --git a/package/Tautulli-macos.spec b/package/Tautulli-macos.spec
deleted file mode 100644
index 8ffe6ba5..00000000
--- a/package/Tautulli-macos.spec
+++ /dev/null
@@ -1,58 +0,0 @@
-# -*- mode: python ; coding: utf-8 -*-
-
-import sys
-sys.modules['FixTk'] = None
-
-import os
-VERSION = os.getenv('VERSION', '0.0.0')
-
-block_cipher = None
-
-analysis = Analysis(
-    ['../Tautulli.py'],
-    pathex=['lib'],
-    datas=[
-        ('../data', 'data'),
-        ('../CHANGELOG.md', '.'),
-        ('../LICENSE', '.'),
-        ('../branch.txt', '.'),
-        ('../version.txt', '.'),
-        ('../lib/ipwhois/data', 'ipwhois/data')
-    ],
-    excludes=['FixTk', 'tcl', 'tk', '_tkinter', 'tkinter', 'Tkinter'],
-    hiddenimports=['pkg_resources.py2_warn', 'Foundation', 'AppKit', 'cheroot.ssl', 'cheroot.ssl.builtin'],
-    cipher=block_cipher
-)
-pyz = PYZ(
-    analysis.pure,
-    analysis.zipped_data,
-    cipher=block_cipher
-)
-exe = EXE(
-    pyz,
-    analysis.scripts,
-    exclude_binaries=True,
-    name='Tautulli',
-    console=False,
-    icon='../data/interfaces/default/images/logo-circle.icns',
-    contents_directory='.',
-    target_arch='universal2'
-)
-coll = COLLECT(
-    exe,
-    analysis.binaries,
-    analysis.zipfiles,
-    analysis.datas,
-    name='Tautulli'
-)
-app = BUNDLE(
-    coll,
-    name='Tautulli.app',
-    icon='../data/interfaces/default/images/logo-circle.icns',
-    bundle_identifier='com.Tautulli.Tautulli',
-    version=VERSION,
-    info_plist={
-        'LSUIElement': True,
-        'NSHighResolutionCapable': True
-    }
-)
diff --git a/package/Tautulli-windows.spec b/package/Tautulli-windows.spec
deleted file mode 100644
index 18f4219f..00000000
--- a/package/Tautulli-windows.spec
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- mode: python ; coding: utf-8 -*-
-
-import sys
-sys.modules['FixTk'] = None
-
-block_cipher = None
-
-analysis = Analysis(
-    ['..\\Tautulli.py'],
-    pathex=['lib'],
-    datas=[
-        ('..\\data', 'data'),
-        ('..\\CHANGELOG.md', '.'),
-        ('..\\LICENSE', '.'),
-        ('..\\branch.txt', '.'),
-        ('..\\version.txt', '.'),
-        ('..\\lib\\ipwhois\\data', 'data')
-    ],
-    excludes=['FixTk', 'tcl', 'tk', '_tkinter', 'tkinter', 'Tkinter'],
-    hiddenimports=['pkg_resources.py2_warn', 'cheroot.ssl', 'cheroot.ssl.builtin'],
-    cipher=block_cipher
-)
-pyz = PYZ(
-    analysis.pure,
-    analysis.zipped_data,
-    cipher=block_cipher
-)
-exe = EXE(
-    pyz,
-    analysis.scripts,
-    exclude_binaries=True,
-    name='Tautulli',
-    console=False,
-    icon='..\\data\\interfaces\\default\\images\\logo-circle.ico',
-    contents_directory='.'
-)
-coll = COLLECT(
-    exe,
-    analysis.binaries,
-    analysis.zipfiles,
-    analysis.datas,
-    name='Tautulli'
-)
diff --git a/package/Tautulli.nsi b/package/Tautulli.nsi
deleted file mode 100644
index 7232c23f..00000000
--- a/package/Tautulli.nsi
+++ /dev/null
@@ -1,258 +0,0 @@
-############################################################################################
-#      NSIS Installation Script created by NSIS Quick Setup Script Generator v1.09.18
-#               Entirely Edited with NullSoft Scriptable Installation System                
-#              by Vlasis K. Barkas aka Red Wine red_wine@freemail.gr Sep 2006               
-############################################################################################
-
-!define APP_NAME "Tautulli"
-!define COMP_NAME "Tautulli"
-!define WEB_SITE "https://tautulli.com"
-!define COPYRIGHT "Tautulli © 2025"
-!define DESCRIPTION "Monitor your Plex Media Server"
-!define APP_ICON "..\dist\Tautulli\data\interfaces\default\images\logo-circle.ico"
-!define LICENSE_TXT "..\dist\Tautulli\LICENSE"
-!define MAIN_APP_EXE "Tautulli.exe"
-!define INSTALL_TYPE "SetShellVarContext current"
-!define REG_ROOT "HKCU"
-!define REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\${MAIN_APP_EXE}"
-!define UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}"
-
-!define REG_START_MENU "Start Menu Folder"
-
-var SM_Folder
-
-######################################################################
-
-VIProductVersion  "${VERSION}"
-VIAddVersionKey "ProductName"  "${APP_NAME}"
-VIAddVersionKey "CompanyName"  "${COMP_NAME}"
-VIAddVersionKey "LegalCopyright"  "${COPYRIGHT}"
-VIAddVersionKey "FileDescription"  "${DESCRIPTION}"
-VIAddVersionKey "FileVersion"  "${VERSION}"
-
-######################################################################
-
-Unicode True
-SetCompressor ZLIB
-Name "${APP_NAME}"
-Caption "${APP_NAME}"
-OutFile "${INSTALLER_NAME}"
-BrandingText "${APP_NAME}"
-XPStyle on
-InstallDirRegKey "${REG_ROOT}" "${REG_APP_PATH}" ""
-InstallDir "$PROGRAMFILES64\${APP_NAME}"
-
-######################################################################
-
-!define nsProcess::FindProcess `!insertmacro nsProcess::FindProcess`
-
-!macro nsProcess::FindProcess _FILE _ERR
-	nsProcess::_FindProcess /NOUNLOAD `${_FILE}`
-	Pop ${_ERR}
-!macroend
-
-
-!define nsProcess::KillProcess `!insertmacro nsProcess::KillProcess`
-
-!macro nsProcess::KillProcess _FILE _ERR
-	nsProcess::_KillProcess /NOUNLOAD `${_FILE}`
-	Pop ${_ERR}
-!macroend
-
-!define nsProcess::CloseProcess `!insertmacro nsProcess::CloseProcess`
-
-!macro nsProcess::CloseProcess _FILE _ERR
-	nsProcess::_CloseProcess /NOUNLOAD `${_FILE}`
-	Pop ${_ERR}
-!macroend
-
-
-!define nsProcess::Unload `!insertmacro nsProcess::Unload`
-
-!macro nsProcess::Unload
-	nsProcess::_Unload
-!macroend
-
-######################################################################
-
-!include Sections.nsh
-
-Var /GLOBAL nolaunch
-
-!include "MUI.nsh"
-
-!define MUI_ABORTWARNING
-!define MUI_UNABORTWARNING
-
-!define MUI_ICON "${APP_ICON}"
-
-!insertmacro MUI_PAGE_WELCOME
-
-!ifdef LICENSE_TXT
-!insertmacro MUI_PAGE_LICENSE "${LICENSE_TXT}"
-!endif
-
-!ifdef REG_START_MENU
-!define MUI_STARTMENUPAGE_DEFAULTFOLDER "${APP_NAME}"
-!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${REG_ROOT}"
-!define MUI_STARTMENUPAGE_REGISTRY_KEY "${UNINSTALL_PATH}"
-!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${REG_START_MENU}"
-!insertmacro MUI_PAGE_STARTMENU Application $SM_Folder
-!endif
-
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-
-!define MUI_FINISHPAGE_RUN "$INSTDIR\${MAIN_APP_EXE}"
-!define MUI_FINISHPAGE_RUN_PARAMETERS $nolaunch
-!insertmacro MUI_PAGE_FINISH
-
-!insertmacro MUI_UNPAGE_CONFIRM
-
-!insertmacro MUI_UNPAGE_INSTFILES
-
-!insertmacro MUI_UNPAGE_FINISH
-
-!insertmacro MUI_LANGUAGE "English"
-
-######################################################################
-
-Section -MainProgram
-Call UninstallPrevious
-
-${INSTALL_TYPE}
-SetOverwrite on
-SetOutPath "$INSTDIR"
-File /nonfatal /a /r "..\dist\${APP_NAME}\"
-
-IfSilent 0 +2
-ExecShell "" "$INSTDIR\${MAIN_APP_EXE}" $nolaunch
-SectionEnd
-
-######################################################################
-
-Section -Icons_Reg
-SetOutPath "$INSTDIR"
-WriteUninstaller "$INSTDIR\uninstall.exe"
-
-!ifdef REG_START_MENU
-!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-CreateDirectory "$SMPROGRAMS\$SM_Folder"
-CreateShortCut "$SMPROGRAMS\$SM_Folder\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}"
-CreateShortCut "$DESKTOP\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}"
-CreateShortCut "$SMPROGRAMS\$SM_Folder\Uninstall ${APP_NAME}.lnk" "$INSTDIR\uninstall.exe"
-
-!ifdef WEB_SITE
-WriteIniStr "$INSTDIR\${APP_NAME} website.url" "InternetShortcut" "URL" "${WEB_SITE}"
-CreateShortCut "$SMPROGRAMS\$SM_Folder\${APP_NAME} Website.lnk" "$INSTDIR\${APP_NAME} website.url"
-!endif
-!insertmacro MUI_STARTMENU_WRITE_END
-!endif
-
-!ifndef REG_START_MENU
-CreateDirectory "$SMPROGRAMS\${APP_NAME}"
-CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}"
-CreateShortCut "$DESKTOP\${APP_NAME}.lnk" "$INSTDIR\${MAIN_APP_EXE}"
-CreateShortCut "$SMPROGRAMS\${APP_NAME}\Uninstall ${APP_NAME}.lnk" "$INSTDIR\uninstall.exe"
-
-!ifdef WEB_SITE
-WriteIniStr "$INSTDIR\${APP_NAME} website.url" "InternetShortcut" "URL" "${WEB_SITE}"
-CreateShortCut "$SMPROGRAMS\${APP_NAME}\${APP_NAME} Website.lnk" "$INSTDIR\${APP_NAME} website.url"
-!endif
-!endif
-
-WriteRegStr ${REG_ROOT} "${REG_APP_PATH}" "" "$INSTDIR\${MAIN_APP_EXE}"
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}"  "DisplayName" "${APP_NAME}"
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}"  "UninstallString" "$INSTDIR\uninstall.exe"
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}"  "DisplayIcon" "$INSTDIR\${MAIN_APP_EXE}"
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}"  "DisplayVersion" "${VERSION}"
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}"  "Publisher" "${COMP_NAME}"
-
-!ifdef WEB_SITE
-WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}"  "URLInfoAbout" "${WEB_SITE}"
-!endif
-SectionEnd
-
-######################################################################
-
-Section Uninstall
-${INSTALL_TYPE}
-Delete "$INSTDIR\uninstall.exe"
-!ifdef WEB_SITE
-Delete "$INSTDIR\${APP_NAME} website.url"
-!endif
-
-RmDir /r "$INSTDIR"
-RmDir "$INSTDIR"
-
-!ifdef REG_START_MENU
-!insertmacro MUI_STARTMENU_GETFOLDER "Application" $SM_Folder
-Delete "$SMPROGRAMS\$SM_Folder\${APP_NAME}.lnk"
-Delete "$SMPROGRAMS\$SM_Folder\Uninstall ${APP_NAME}.lnk"
-!ifdef WEB_SITE
-Delete "$SMPROGRAMS\$SM_Folder\${APP_NAME} Website.lnk"
-!endif
-Delete "$DESKTOP\${APP_NAME}.lnk"
-
-RmDir "$SMPROGRAMS\$SM_Folder"
-!endif
-
-!ifndef REG_START_MENU
-Delete "$SMPROGRAMS\${APP_NAME}\${APP_NAME}.lnk"
-Delete "$SMPROGRAMS\${APP_NAME}\Uninstall ${APP_NAME}.lnk"
-!ifdef WEB_SITE
-Delete "$SMPROGRAMS\${APP_NAME}\${APP_NAME} Website.lnk"
-!endif
-Delete "$DESKTOP\${APP_NAME}.lnk"
-
-RmDir "$SMPROGRAMS\${APP_NAME}"
-!endif
-
-DeleteRegKey ${REG_ROOT} "${REG_APP_PATH}"
-DeleteRegKey ${REG_ROOT} "${UNINSTALL_PATH}"
-SectionEnd
-
-######################################################################
-
-Function .onInit
-  IfSilent 0 +2
-  StrCpy $nolaunch "--nolaunch"
-  
-  IfSilent +5 0
-  Loop:
-    ${nsProcess::FindProcess} ${MAIN_APP_EXE} $R0
-    StrCmp $R0 0 0 NoAbort
-    MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION "${APP_NAME} is still running. Please shutdown ${APP_NAME} before continuing." IDCANCEL End IDRETRY Loop
-  Goto Loop
-  End:
-	Abort
-  NoAbort:
-FunctionEnd
-
-Function un.onInit
-  IfSilent +5 0
-  Loop:
-    ${nsProcess::FindProcess} ${MAIN_APP_EXE} $R0
-    StrCmp $R0 0 0 NoAbort
-    MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION "${APP_NAME} is still running. Please shutdown ${APP_NAME} before continuing." IDCANCEL End IDRETRY Loop
-  Goto Loop
-  End:
-	Abort
-  NoAbort:
-FunctionEnd
-
-######################################################################
-
-Function UninstallPrevious
-  ; Check for uninstaller.
-  ReadRegStr $R0 "${REG_ROOT}" "${UNINSTALL_PATH}" "UninstallString"
-  ${If} $R0 == ""
-    Goto Done
-  ${EndIf}
-  DetailPrint "Removing previous installation."
-  ; Run the uninstaller silently.
-  ExecWait '"$R0" /S _?=$INSTDIR'
-  Done:
-FunctionEnd
-
-######################################################################
diff --git a/package/macos-scripts/postinstall b/package/macos-scripts/postinstall
deleted file mode 100755
index 260749fc..00000000
--- a/package/macos-scripts/postinstall
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-dialogText=`osascript -e 'set dialogText to button returned of (display dialog "Installation complete. Start Tautulli?" buttons {"Start", "Close"})'`;
-if [[ $dialogText == 'Start' ]]
-then
-    open /Applications/Tautulli.app
-else
-    exit 0;
-fi
diff --git a/package/macos-scripts/preinstall b/package/macos-scripts/preinstall
deleted file mode 100755
index e2599e19..00000000
--- a/package/macos-scripts/preinstall
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-function check_tautulli_running () {
-    if pgrep -x "Tautulli" > /dev/null
-    then
-        dialogText=`osascript -e 'set dialogText to button returned of (display dialog "Tautulli is still running. Please shutdown Tautulli before continuing." buttons {"Retry", "Abort"})'`;
-
-        if [[ $dialogText == 'Retry' ]]
-        then
-            check_tautulli_running;
-        elif [[ $dialogText == 'Abort' ]]
-        then
-            exit 1;
-        fi
-    else
-        exit 0;
-    fi
-}
-
-check_tautulli_running;
diff --git a/package/nsis-plugins/x86-unicode/nsProcess.dll b/package/nsis-plugins/x86-unicode/nsProcess.dll
deleted file mode 100644
index 2478624e..00000000
Binary files a/package/nsis-plugins/x86-unicode/nsProcess.dll and /dev/null differ
diff --git a/package/requirements-package.txt b/package/requirements-package.txt
deleted file mode 100644
index 5837f631..00000000
--- a/package/requirements-package.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-apscheduler==3.10.1
-cryptography==44.0.2
-importlib-metadata==8.5.0
-importlib-resources==6.4.5
-pyinstaller==6.10.0
-pyopenssl==25.0.0
-
-pyobjc-core==10.3.1; platform_system == "Darwin"
-pyobjc-framework-Cocoa==10.3.1; platform_system == "Darwin"
-
-pywin32==308; platform_system == "Windows"
diff --git a/plexpy/__init__.py b/plexpy/__init__.py
index cafc0127..038cf14d 100644
--- a/plexpy/__init__.py
+++ b/plexpy/__init__.py
@@ -1,28 +1,26 @@
-# This file is part of Tautulli.
+# This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
-import ctypes
-import datetime
 import os
-import queue
-import sqlite3
 import sys
 import subprocess
 import threading
+import sqlite3
+import cherrypy
+import datetime
 import uuid
-
 # Some cut down versions of Python may not include this module and it's not critical for us
 try:
     import webbrowser
@@ -32,31 +30,9 @@ except ImportError:
 
 from apscheduler.schedulers.background import BackgroundScheduler
 from apscheduler.triggers.interval import IntervalTrigger
-from ga4mp import GtagMP
-import pytz
-
-from plexpy import activity_handler
-from plexpy import activity_pinger
-from plexpy import common
-from plexpy import database
-from plexpy import datafactory
-from plexpy import exporter
-from plexpy import helpers
-from plexpy import libraries
-from plexpy import logger
-from plexpy import mobile_app
-from plexpy import newsletters
-from plexpy import newsletter_handler
-from plexpy import notification_handler
-from plexpy import notifiers
-from plexpy import plex
-from plexpy import plextv
-from plexpy import users
-from plexpy import versioncheck
-from plexpy import web_socket
-from plexpy import webstart
-from plexpy import config
 
+from plexpy import versioncheck, logger, activity_pinger, plextv
+import plexpy.config
 
 PROG_DIR = None
 FULL_PATH = None
@@ -65,283 +41,138 @@ ARGS = None
 SIGNAL = None
 
 SYS_PLATFORM = None
-SYS_LANGUAGE = None
 SYS_ENCODING = None
 
 QUIET = False
-VERBOSE = False
+VERBOSE = True
 DAEMON = False
 CREATEPID = False
 PIDFILE = None
-NOFORK = False
-DOCKER = False
-DOCKER_MOUNT = False
-SNAP = False
-SNAP_MIGRATE = False
-FROZEN = False
 
-SCHED = None
+SCHED = BackgroundScheduler()
 SCHED_LOCK = threading.Lock()
 
-NOTIFY_QUEUE = queue.Queue()
-
 INIT_LOCK = threading.Lock()
 _INITIALIZED = False
-_STARTED = False
-_UPDATE = False
+started = False
 
 DATA_DIR = None
 
 CONFIG = None
-CONFIG_FILE = None
 
 DB_FILE = None
 
+LOG_LIST = []
+
 INSTALL_TYPE = None
 CURRENT_VERSION = None
 LATEST_VERSION = None
 COMMITS_BEHIND = None
-PREV_RELEASE = None
-LATEST_RELEASE = None
-UPDATE_AVAILABLE = False
 
 UMASK = None
 
-HTTP_PORT = None
-HTTP_ROOT = None
-AUTH_ENABLED = None
-
-DEV = False
-
-WEBSOCKET = None
-WS_CONNECTED = False
-PLEX_SERVER_UP = None
-PLEX_REMOTE_ACCESS_UP = None
-
-TRACKER = None
-
-WIN_SYS_TRAY_ICON = None
-MAC_SYS_TRAY_ICON = None
-
-SYS_TIMEZONE = None
-SYS_UTC_OFFSET = None
-
+POLLING_FAILOVER = False
 
 def initialize(config_file):
     with INIT_LOCK:
 
         global CONFIG
-        global CONFIG_FILE
-        global VERBOSE
         global _INITIALIZED
         global CURRENT_VERSION
         global LATEST_VERSION
-        global PREV_RELEASE
         global UMASK
-        global _UPDATE
+        global POLLING_FAILOVER
 
-        try:
-            CONFIG = config.Config(config_file)
-        except:
-            alert_message('Failed to start Tautulli: Config file is corrupted.\n\n%s' % config_file)
-            raise SystemExit("Unable to initialize Tautulli due to a corrupted config file. Exiting...")
-
-        CONFIG_FILE = config_file
+        CONFIG = plexpy.config.Config(config_file)
 
         assert CONFIG is not None
 
         if _INITIALIZED:
             return False
 
-        if SNAP_MIGRATE:
-            snap_common = os.environ['SNAP_COMMON']
-            old_data_dir = os.path.join(snap_common, 'Tautulli')
-            CONFIG.HTTPS_CERT = CONFIG.HTTPS_CERT.replace(old_data_dir, DATA_DIR)
-            CONFIG.HTTPS_CERT_CHAIN = CONFIG.HTTPS_CERT_CHAIN.replace(old_data_dir, DATA_DIR)
-            CONFIG.HTTPS_KEY = CONFIG.HTTPS_KEY.replace(old_data_dir, DATA_DIR)
-            CONFIG.LOG_DIR = CONFIG.LOG_DIR.replace(old_data_dir, DATA_DIR)
-            CONFIG.BACKUP_DIR = CONFIG.BACKUP_DIR.replace(old_data_dir, DATA_DIR)
-            CONFIG.CACHE_DIR = CONFIG.CACHE_DIR.replace(old_data_dir, DATA_DIR)
-            CONFIG.EXPORT_DIR = CONFIG.EXPORT_DIR.replace(old_data_dir, DATA_DIR)
-            CONFIG.NEWSLETTER_DIR = CONFIG.NEWSLETTER_DIR.replace(old_data_dir, DATA_DIR)
-
         if CONFIG.HTTP_PORT < 21 or CONFIG.HTTP_PORT > 65535:
-            logger.warn("HTTP_PORT out of bounds: 21 < %s < 65535", CONFIG.HTTP_PORT)
+            plexpy.logger.warn(
+                'HTTP_PORT out of bounds: 21 < %s < 65535', CONFIG.HTTP_PORT)
             CONFIG.HTTP_PORT = 8181
 
-        if not CONFIG.HTTPS_CERT:
+        if CONFIG.HTTPS_CERT == '':
             CONFIG.HTTPS_CERT = os.path.join(DATA_DIR, 'server.crt')
-        if not CONFIG.HTTPS_KEY:
+        if CONFIG.HTTPS_KEY == '':
             CONFIG.HTTPS_KEY = os.path.join(DATA_DIR, 'server.key')
 
-        CONFIG.LOG_DIR, log_writable = check_folder_writable(
-            CONFIG.LOG_DIR, os.path.join(DATA_DIR, 'logs'), 'logs')
-        if not log_writable and not QUIET:
-            sys.stderr.write("Unable to create the log directory. Logging to screen only.\n")
+        if not CONFIG.LOG_DIR:
+            CONFIG.LOG_DIR = os.path.join(DATA_DIR, 'logs')
 
-        VERBOSE = VERBOSE or bool(CONFIG.VERBOSE_LOGS)
+        if not os.path.exists(CONFIG.LOG_DIR):
+            try:
+                os.makedirs(CONFIG.LOG_DIR)
+            except OSError:
+                CONFIG.LOG_DIR = None
+
+                if not QUIET:
+                    sys.stderr.write("Unable to create the log directory. " \
+                                     "Logging to screen only.\n")
 
         # Start the logger, disable console if needed
-        logger.initLogger(console=not QUIET, log_dir=CONFIG.LOG_DIR if log_writable else None,
+        logger.initLogger(console=not QUIET, log_dir=CONFIG.LOG_DIR,
                           verbose=VERBOSE)
 
-        os.environ['PLEXAPI_CONFIG_PATH'] = os.path.join(DATA_DIR, 'plexapi.config.ini')
-        os.environ['PLEXAPI_LOG_PATH'] = os.path.join(CONFIG.LOG_DIR, 'plexapi.log')
-        os.environ['PLEXAPI_LOG_LEVEL'] = 'DEBUG'
-        plex.initialize_plexapi()
-
-        if DOCKER:
-            build = '[Docker] '
-        elif SNAP:
-            build = '[Snap] '
-        elif FROZEN:
-            build = '[Bundle] '
-        else:
-            build = ''
-
-        logger.info("Starting Tautulli {}".format(
-            common.RELEASE
-        ))
-        logger.info("{}{} {} ({}{})".format(
-            build, common.PLATFORM, common.PLATFORM_RELEASE, common.PLATFORM_VERSION,
-            ' - {}'.format(common.PLATFORM_LINUX_DISTRO) if common.PLATFORM_LINUX_DISTRO else ''
-        ))
-        logger.info("{} (UTC{})".format(
-            str(SYS_TIMEZONE), SYS_UTC_OFFSET
-        ))
-        logger.info("Language {}{} / Encoding {}".format(
-            SYS_LANGUAGE, f' (override {CONFIG.PMS_LANGUAGE})' if CONFIG.PMS_LANGUAGE else '', SYS_ENCODING
-        ))
-        logger.info("Python {}".format(
-            sys.version.replace('\n', '')
-        ))
-        logger.info("SQLite {}".format(
-            sqlite3.sqlite_version
-        ))
-
-        logger.info("Program Dir: {}".format(
-            PROG_DIR
-        ))
-        logger.info("Config File: {}".format(
-            CONFIG_FILE
-        ))
-        logger.info("Database File: {}".format(
-            DB_FILE
-        ))
-
-        if DOCKER and not DOCKER_MOUNT:
-            logger.warn(
-                "Docker /config volume not mounted. Using a Docker volume instead. "
-                "All data may be cleared when the container is recreated or updated."
-            )
-
-        CONFIG.BACKUP_DIR, _ = check_folder_writable(
-            CONFIG.BACKUP_DIR, os.path.join(DATA_DIR, 'backups'), 'backups')
-        CONFIG.CACHE_DIR, _ = check_folder_writable(
-            CONFIG.CACHE_DIR, os.path.join(DATA_DIR, 'cache'), 'cache')
-        CONFIG.EXPORT_DIR, _ = check_folder_writable(
-            CONFIG.EXPORT_DIR, os.path.join(DATA_DIR, 'exports'), 'exports')
-        CONFIG.NEWSLETTER_DIR, _ = check_folder_writable(
-            CONFIG.NEWSLETTER_DIR, os.path.join(DATA_DIR, 'newsletters'), 'newsletters')
+        if not CONFIG.CACHE_DIR:
+            # Put the cache dir in the data dir for now
+            CONFIG.CACHE_DIR = os.path.join(DATA_DIR, 'cache')
+        if not os.path.exists(CONFIG.CACHE_DIR):
+            try:
+                os.makedirs(CONFIG.CACHE_DIR)
+            except OSError as e:
+                logger.error("Could not create cache dir '%s': %s", DATA_DIR, e)
 
         # Initialize the database
-        logger.info("Checking if the database upgrades are required...")
+        logger.info('Checking to see if the database has all tables....')
         try:
             dbcheck()
         except Exception as e:
-            logger.error("Can't connect to the database: %s" % e)
+            logger.error("Can't connect to the database: %s", e)
 
-        # Perform upgrades
-        logger.info("Checking if configuration upgrades are required...")
-        try:
-            upgrade()
-        except Exception as e:
-            logger.error("Could not perform upgrades: %s" % e)
-
-        # Add notifier configs to logger blacklist
-        newsletters.blacklist_logger()
-        notifiers.blacklist_logger()
-        mobile_app.blacklist_logger()
-
-        # Check if Tautulli has a uuid
+        # Check if PlexPy has a uuid
         if CONFIG.PMS_UUID == '' or not CONFIG.PMS_UUID:
-            logger.debug("Generating UUID...")
-            CONFIG.PMS_UUID = generate_uuid()
+            my_uuid = generate_uuid()
+            CONFIG.__setattr__('PMS_UUID', my_uuid)
             CONFIG.write()
 
-        # Check if Tautulli has an API key
-        if CONFIG.API_KEY == '':
-            logger.debug("Generating API key...")
-            CONFIG.API_KEY = generate_uuid()
-            CONFIG.write()
-
-        # Check if Tautulli has a jwt_secret
-        if CONFIG.JWT_SECRET == '' or not CONFIG.JWT_SECRET or CONFIG.JWT_UPDATE_SECRET:
-            logger.debug("Generating JWT secret...")
-            CONFIG.JWT_SECRET = generate_uuid()
-            CONFIG.JWT_UPDATE_SECRET = False
-            CONFIG.write()
-
-        # Get the previous version from the file
-        version_lock_file = os.path.join(DATA_DIR, "version.lock")
-        prev_version = None
-        if os.path.isfile(version_lock_file):
-            try:
-                with open(version_lock_file, "r") as fp:
-                    prev_version = fp.read()
-            except IOError as e:
-                logger.error("Unable to read previous version from file '%s': %s" %
-                             (version_lock_file, e))
-
         # Get the currently installed version. Returns None, 'win32' or the git
         # hash.
-        CURRENT_VERSION, CONFIG.GIT_REMOTE, CONFIG.GIT_BRANCH = versioncheck.get_version()
+        CURRENT_VERSION, CONFIG.GIT_BRANCH = versioncheck.getVersion()
 
         # Write current version to a file, so we know which version did work.
-        # This allows one to restore to that version. The idea is that if we
-        # arrive here, most parts of Tautulli seem to work.
+        # This allowes one to restore to that version. The idea is that if we
+        # arrive here, most parts of PlexPy seem to work.
         if CURRENT_VERSION:
+            version_lock_file = os.path.join(DATA_DIR, "version.lock")
+
             try:
                 with open(version_lock_file, "w") as fp:
                     fp.write(CURRENT_VERSION)
             except IOError as e:
-                logger.error("Unable to write current version to file '%s': %s" %
-                             (version_lock_file, e))
+                logger.error("Unable to write current version to file '%s': %s",
+                             version_lock_file, e)
 
         # Check for new versions
         if CONFIG.CHECK_GITHUB_ON_STARTUP and CONFIG.CHECK_GITHUB:
             try:
-                versioncheck.check_update(use_cache=True)
+                LATEST_VERSION = versioncheck.checkGithub()
             except:
                 logger.exception("Unhandled exception")
                 LATEST_VERSION = CURRENT_VERSION
         else:
             LATEST_VERSION = CURRENT_VERSION
 
-        # Get the previous release from the file
-        release_file = os.path.join(DATA_DIR, "release.lock")
-        PREV_RELEASE = common.RELEASE
-        if os.path.isfile(release_file):
-            try:
-                with open(release_file, "r") as fp:
-                    PREV_RELEASE = fp.read()
-            except IOError as e:
-                logger.error("Unable to read previous release from file '%s': %s" %
-                             (release_file, e))
+        # Get the real PMS urls for SSL and remote access
+        if CONFIG.PMS_TOKEN and CONFIG.PMS_IP and CONFIG.PMS_PORT:
+            plextv.get_real_pms_url()
 
-        # Check if the release was updated
-        if common.RELEASE != PREV_RELEASE:
-            CONFIG.UPDATE_SHOW_CHANGELOG = 1
-            CONFIG.write()
-            _UPDATE = True
-
-        # Write current release version to file for update checking
-        try:
-            with open(release_file, "w") as fp:
-                fp.write(common.RELEASE)
-        except IOError as e:
-            logger.error("Unable to write current release to file '%s': %s" %
-                         (release_file, e))
+        # Refresh the users list on startup
+        if CONFIG.PMS_TOKEN and CONFIG.REFRESH_USERS_ON_STARTUP:
+            plextv.refresh_users()
 
         # Store the original umask
         UMASK = os.umask(0)
@@ -354,8 +185,8 @@ def initialize(config_file):
 def daemonize():
     if threading.activeCount() != 1:
         logger.warn(
-            "There are %r active threads. Daemonizing may cause"
-            " strange behavior.",
+            'There are %r active threads. Daemonizing may cause'
+            ' strange behavior.',
             threading.enumerate())
 
     sys.stdout.flush()
@@ -366,7 +197,7 @@ def daemonize():
         pid = os.fork()  # @UndefinedVariable - only available in UNIX
         if pid != 0:
             sys.exit(0)
-    except OSError as e:
+    except OSError, e:
         raise RuntimeError("1st fork failed: %s [%d]", e.strerror, e.errno)
 
     os.setsid()
@@ -380,10 +211,10 @@ def daemonize():
         pid = os.fork()  # @UndefinedVariable - only available in UNIX
         if pid != 0:
             sys.exit(0)
-    except OSError as e:
+    except OSError, e:
         raise RuntimeError("2nd fork failed: %s [%d]", e.strerror, e.errno)
 
-    dev_null = open('/dev/null', 'r')
+    dev_null = file('/dev/null', 'r')
     os.dup2(dev_null.fileno(), sys.stdin.fileno())
 
     si = open('/dev/null', "r")
@@ -395,17 +226,17 @@ def daemonize():
     os.dup2(se.fileno(), sys.stderr.fileno())
 
     pid = os.getpid()
-    logger.info("Daemonized to PID: %d", pid)
+    logger.info('Daemonized to PID: %d', pid)
 
     if CREATEPID:
         logger.info("Writing PID %d to %s", pid, PIDFILE)
-        with open(PIDFILE, 'w') as fp:
+        with file(PIDFILE, 'w') as fp:
             fp.write("%s\n" % pid)
 
 
 def launch_browser(host, port, root):
     if not no_browser:
-        if host in ('0.0.0.0', '::'):
+        if host == '0.0.0.0':
             host = 'localhost'
 
         if CONFIG.ENABLE_HTTPS:
@@ -416,7 +247,7 @@ def launch_browser(host, port, root):
         try:
             webbrowser.open('%s://%s:%i%s' % (protocol, host, port, root))
         except Exception as e:
-            logger.error("Could not launch browser: %s" % e)
+            logger.error('Could not launch browser: %s', e)
 
 
 def initialize_scheduler():
@@ -424,76 +255,59 @@ def initialize_scheduler():
     Start the scheduled background tasks. Re-schedule if interval settings changed.
     """
 
+
+
     with SCHED_LOCK:
 
         # Check if scheduler should be started
         start_jobs = not len(SCHED.get_jobs())
 
         # Update check
-        github_hours = CONFIG.CHECK_GITHUB_INTERVAL if CONFIG.CHECK_GITHUB_INTERVAL and CONFIG.CHECK_GITHUB else 0
-        pms_update_check_hours = CONFIG.PMS_UPDATE_CHECK_INTERVAL if 1 <= CONFIG.PMS_UPDATE_CHECK_INTERVAL else 24
-
-        schedule_job(versioncheck.check_update, 'Check GitHub for updates',
-                     hours=github_hours, minutes=0, seconds=0, args=(True, True))
-
-        backup_hours = CONFIG.BACKUP_INTERVAL if 1 <= CONFIG.BACKUP_INTERVAL <= 24 else 6
-
-        schedule_job(database.optimize_db, 'Optimize Tautulli database',
-                     hours=24, minutes=0, seconds=0)
-        schedule_job(database.make_backup, 'Backup Tautulli database',
-                     hours=backup_hours, minutes=0, seconds=0, args=(True, True))
-        schedule_job(config.make_backup, 'Backup Tautulli config',
-                     hours=backup_hours, minutes=0, seconds=0, args=(True, True))
-
-        if WS_CONNECTED and CONFIG.PMS_IP and CONFIG.PMS_TOKEN:
-            schedule_job(plextv.get_server_resources, 'Refresh Plex server URLs',
-                         hours=12 * (not bool(CONFIG.PMS_URL_MANUAL)), minutes=0, seconds=0)
-
-            schedule_job(activity_pinger.check_server_updates, 'Check for Plex updates',
-                         hours=pms_update_check_hours * bool(CONFIG.MONITOR_PMS_UPDATES), minutes=0, seconds=0)
-
-            # Refresh the users list and libraries list
-            user_hours = CONFIG.REFRESH_USERS_INTERVAL if 1 <= CONFIG.REFRESH_USERS_INTERVAL <= 24 else 12
-            library_hours = CONFIG.REFRESH_LIBRARIES_INTERVAL if 1 <= CONFIG.REFRESH_LIBRARIES_INTERVAL <= 24 else 12
-
-            schedule_job(users.refresh_users, 'Refresh users list',
-                         hours=user_hours, minutes=0, seconds=0)
-            schedule_job(libraries.refresh_libraries, 'Refresh libraries list',
-                         hours=library_hours, minutes=0, seconds=0)
-
-            schedule_job(activity_pinger.connect_server, 'Check for server response',
-                         hours=0, minutes=0, seconds=0)
-            schedule_job(web_socket.send_ping, 'Websocket ping',
-                         hours=0, minutes=0, seconds=10 * bool(CONFIG.WEBSOCKET_MONITOR_PING_PONG))
-
+        if CONFIG.CHECK_GITHUB_INTERVAL and CONFIG.CHECK_GITHUB:
+            minutes = CONFIG.CHECK_GITHUB_INTERVAL
         else:
-            # Cancel all jobs
-            schedule_job(plextv.get_server_resources, 'Refresh Plex server URLs',
-                         hours=0, minutes=0, seconds=0)
+            minutes = 0
+        schedule_job(versioncheck.checkGithub, 'Check GitHub for updates', hours=0, minutes=minutes)
 
-            schedule_job(activity_pinger.check_server_updates, 'Check for Plex updates',
-                         hours=0, minutes=0, seconds=0)
+        # Start checking for new sessions at set interval
+        if CONFIG.MONITORING_INTERVAL:
+            # Our interval should never be less than 30 seconds
+            if CONFIG.MONITORING_INTERVAL > 30:
+                seconds = CONFIG.MONITORING_INTERVAL
+            else:
+                seconds = 30
+        else:
+            seconds = 0
 
-            schedule_job(users.refresh_users, 'Refresh users list',
-                         hours=0, minutes=0, seconds=0)
-            schedule_job(libraries.refresh_libraries, 'Refresh libraries list',
-                         hours=0, minutes=0, seconds=0)
+        if CONFIG.PMS_IP and CONFIG.PMS_TOKEN:
+            schedule_job(plextv.get_real_pms_url, 'Refresh Plex Server URLs', hours=12, minutes=0, seconds=0)
 
-            # Schedule job to reconnect server
-            schedule_job(activity_pinger.connect_server, 'Check for server response',
-                         hours=0, minutes=0, seconds=30, args=(False,))
-            schedule_job(web_socket.send_ping, 'Websocket ping',
-                         hours=0, minutes=0, seconds=0)
+            # If we're not using websockets then fall back to polling
+            if not CONFIG.MONITORING_USE_WEBSOCKET or POLLING_FAILOVER:
+                schedule_job(activity_pinger.check_active_sessions, 'Check for active sessions',
+                             hours=0, minutes=0, seconds=seconds)
+
+        # Refresh the users list
+        if CONFIG.REFRESH_USERS_INTERVAL:
+            hours = CONFIG.REFRESH_USERS_INTERVAL
+        else:
+            hours = 0
+
+        if CONFIG.PMS_TOKEN:
+            schedule_job(plextv.refresh_users, 'Refresh users list', hours=hours, minutes=0, seconds=0)
 
         # Start scheduler
         if start_jobs and len(SCHED.get_jobs()):
             try:
                 SCHED.start()
             except Exception as e:
-                logger.error(e)
+                logger.info(e)
+
+                # Debug
+                #SCHED.print_jobs()
 
 
-def schedule_job(func, name, hours=0, minutes=0, seconds=0, args=None):
+def schedule_job(function, name, hours=0, minutes=0, seconds=0):
     """
     Start scheduled job if starting or restarting plexpy.
     Reschedule job if Interval Settings have changed.
@@ -507,79 +321,21 @@ def schedule_job(func, name, hours=0, minutes=0, seconds=0, args=None):
             SCHED.remove_job(name)
             logger.info("Removed background task: %s", name)
         elif job.trigger.interval != datetime.timedelta(hours=hours, minutes=minutes):
-            SCHED.reschedule_job(
-                name, trigger=IntervalTrigger(
-                    hours=hours, minutes=minutes, seconds=seconds, timezone=pytz.UTC),
-                args=args)
+            SCHED.reschedule_job(name, trigger=IntervalTrigger(
+                hours=hours, minutes=minutes, seconds=seconds))
             logger.info("Re-scheduled background task: %s", name)
     elif hours > 0 or minutes > 0 or seconds > 0:
-        SCHED.add_job(
-            func, id=name, trigger=IntervalTrigger(
-                hours=hours, minutes=minutes, seconds=seconds, timezone=pytz.UTC),
-            args=args, misfire_grace_time=None)
+        SCHED.add_job(function, id=name, trigger=IntervalTrigger(
+            hours=hours, minutes=minutes, seconds=seconds))
         logger.info("Scheduled background task: %s", name)
 
 
 def start():
-    global _STARTED
+    global started
 
     if _INITIALIZED:
-        logger.filter_usernames()
-
-        # Start refreshes on a separate thread
-        threading.Thread(target=startup_refresh).start()
-
-        global SCHED
-        SCHED = BackgroundScheduler(timezone=pytz.UTC)
-        activity_handler.ACTIVITY_SCHED = BackgroundScheduler(timezone=pytz.UTC)
-        newsletter_handler.NEWSLETTER_SCHED = BackgroundScheduler(timezone=pytz.UTC)
-
-        # Start the scheduler for stale stream callbacks
-        activity_handler.ACTIVITY_SCHED.start()
-
-        # Start background notification thread
-        notification_handler.start_threads(num_threads=CONFIG.NOTIFICATION_THREADS)
-        notifiers.check_browser_enabled()
-
-        # Schedule newsletters
-        newsletter_handler.NEWSLETTER_SCHED.start()
-        newsletter_handler.schedule_newsletters()
-
-        # Cancel processing exports
-        exporter.cancel_exports()
-
-        if CONFIG.SYSTEM_ANALYTICS:
-            global TRACKER
-            TRACKER = initialize_tracker()
-
-            # Send system analytics events
-            if not CONFIG.FIRST_RUN_COMPLETE:
-                analytics_event(name='install')
-
-            elif _UPDATE:
-                analytics_event(name='update')
-
-            analytics_event(name='start')
-
-        _STARTED = True
-
-
-def startup_refresh():
-    # Get the real PMS urls for SSL and remote access
-    if CONFIG.PMS_TOKEN and CONFIG.PMS_IP and CONFIG.PMS_PORT:
-        plextv.get_server_resources()
-
-    # Connect server after server resource is refreshed
-    if CONFIG.FIRST_RUN_COMPLETE:
-        activity_pinger.connect_server(log=True, startup=True)
-
-    # Refresh the users list on startup
-    if CONFIG.PMS_TOKEN and CONFIG.REFRESH_USERS_ON_STARTUP:
-        users.refresh_users()
-
-    # Refresh the libraries list on startup
-    if CONFIG.PMS_IP and CONFIG.PMS_TOKEN and CONFIG.REFRESH_LIBRARIES_ON_STARTUP:
-        libraries.refresh_libraries()
+        initialize_scheduler()
+        started = True
 
 
 def sig_handler(signum=None, frame=None):
@@ -592,2376 +348,339 @@ def dbcheck():
     conn_db = sqlite3.connect(DB_FILE)
     c_db = conn_db.cursor()
 
-    # schema table :: This is a table which keeps track of the database version
-    c_db.execute(
-        "CREATE TABLE IF NOT EXISTS version_info (key TEXT UNIQUE, value TEXT)"
-    )
-
     # sessions table :: This is a temp table that logs currently active sessions
     c_db.execute(
-        "CREATE TABLE IF NOT EXISTS sessions (id INTEGER PRIMARY KEY AUTOINCREMENT, session_key INTEGER, session_id TEXT, "
-        "transcode_key TEXT, rating_key INTEGER, section_id INTEGER, media_type TEXT, started INTEGER, stopped INTEGER, "
-        "paused_counter INTEGER DEFAULT 0, state TEXT, user_id INTEGER, user TEXT, friendly_name TEXT, "
-        "ip_address TEXT, machine_id TEXT, bandwidth INTEGER, location TEXT, player TEXT, product TEXT, platform TEXT, "
-        "title TEXT, parent_title TEXT, grandparent_title TEXT, original_title TEXT, full_title TEXT, "
-        "media_index INTEGER, parent_media_index INTEGER, "
-        "thumb TEXT, parent_thumb TEXT, grandparent_thumb TEXT, year INTEGER, "
-        "parent_rating_key INTEGER, grandparent_rating_key INTEGER, "
-        "originally_available_at TEXT, added_at INTEGER, guid TEXT, "
-        "view_offset INTEGER DEFAULT 0, duration INTEGER, video_decision TEXT, audio_decision TEXT, "
-        "transcode_decision TEXT, container TEXT, bitrate INTEGER, width INTEGER, height INTEGER, "
-        "video_codec TEXT, video_bitrate INTEGER, video_resolution TEXT, video_width INTEGER, video_height INTEGER, "
-        "video_framerate TEXT, video_scan_type TEXT, video_full_resolution TEXT, "
-        "video_dynamic_range TEXT, aspect_ratio TEXT, "
-        "audio_codec TEXT, audio_bitrate INTEGER, audio_channels INTEGER, audio_language TEXT, audio_language_code TEXT, "
-        "subtitle_codec TEXT, subtitle_forced INTEGER, subtitle_language TEXT, "
-        "stream_bitrate INTEGER, stream_video_resolution TEXT, quality_profile TEXT, "
-        "stream_container_decision TEXT, stream_container TEXT, "
-        "stream_video_decision TEXT, stream_video_codec TEXT, stream_video_bitrate INTEGER, stream_video_width INTEGER, "
-        "stream_video_height INTEGER, stream_video_framerate TEXT, stream_video_scan_type TEXT, stream_video_full_resolution TEXT, "
-        "stream_video_dynamic_range TEXT, "
-        "stream_audio_decision TEXT, stream_audio_codec TEXT, stream_audio_bitrate INTEGER, stream_audio_channels INTEGER, "
-        "stream_audio_language TEXT, stream_audio_language_code TEXT, "
-        "subtitles INTEGER, stream_subtitle_decision TEXT, stream_subtitle_codec TEXT, "
-        "stream_subtitle_forced INTEGER, stream_subtitle_language TEXT, "
-        "transcode_protocol TEXT, transcode_container TEXT, "
-        "transcode_video_codec TEXT, transcode_audio_codec TEXT, transcode_audio_channels INTEGER,"
-        "transcode_width INTEGER, transcode_height INTEGER, "
-        "transcode_hw_decoding INTEGER, transcode_hw_encoding INTEGER, "
-        "optimized_version INTEGER, optimized_version_profile TEXT, optimized_version_title TEXT, "
-        "synced_version INTEGER, synced_version_profile TEXT, "
-        "live INTEGER, live_uuid TEXT, "
-        "channel_call_sign TEXT, channel_id TEXT, channel_identifier TEXT, channel_title TEXT, channel_thumb TEXT, channel_vcn TEXT, "
-        "secure INTEGER, relayed INTEGER, "
-        "buffer_count INTEGER DEFAULT 0, buffer_last_triggered INTEGER, last_paused INTEGER, watched INTEGER DEFAULT 0, "
-        "intro INTEGER DEFAULT 0, credits INTEGER DEFAULT 0, commercial INTEGER DEFAULT 0, marker INTEGER DEFAULT 0, "
-        "initial_stream INTEGER DEFAULT 1, write_attempts INTEGER DEFAULT 0, raw_stream_info TEXT, "
-        "rating_key_websocket TEXT)"
-    )
-
-    # sessions_continued table :: This is a temp table that keeps track of continued streaming sessions
-    c_db.execute(
-        "CREATE TABLE IF NOT EXISTS sessions_continued (id INTEGER PRIMARY KEY AUTOINCREMENT, "
-        "user_id INTEGER, machine_id TEXT, media_type TEXT, stopped INTEGER)"
+        'CREATE TABLE IF NOT EXISTS sessions (id INTEGER PRIMARY KEY AUTOINCREMENT, '
+        'session_key INTEGER, rating_key INTEGER, media_type TEXT, started INTEGER, '
+        'paused_counter INTEGER DEFAULT 0, state TEXT, user_id INTEGER, user TEXT, friendly_name TEXT, '
+        'ip_address TEXT, machine_id TEXT, player TEXT, platform TEXT, title TEXT, parent_title TEXT, '
+        'grandparent_title TEXT, parent_rating_key INTEGER, grandparent_rating_key INTEGER, '
+        'view_offset INTEGER DEFAULT 0, duration INTEGER, video_decision TEXT, audio_decision TEXT, '
+        'width INTEGER, height INTEGER, container TEXT, video_codec TEXT, audio_codec TEXT, '
+        'bitrate INTEGER, video_resolution TEXT, video_framerate TEXT, aspect_ratio TEXT, '
+        'audio_channels INTEGER, transcode_protocol TEXT, transcode_container TEXT, '
+        'transcode_video_codec TEXT, transcode_audio_codec TEXT, transcode_audio_channels INTEGER,'
+        'transcode_width INTEGER, transcode_height INTEGER, buffer_count INTEGER DEFAULT 0, '
+        'buffer_last_triggered INTEGER, last_paused INTEGER)'
     )
 
     # session_history table :: This is a history table which logs essential stream details
     c_db.execute(
-        "CREATE TABLE IF NOT EXISTS session_history (id INTEGER PRIMARY KEY AUTOINCREMENT, reference_id INTEGER, "
-        "started INTEGER, stopped INTEGER, rating_key INTEGER, user_id INTEGER, user TEXT, "
-        "ip_address TEXT, paused_counter INTEGER DEFAULT 0, player TEXT, product TEXT, product_version TEXT, "
-        "platform TEXT, platform_version TEXT, profile TEXT, machine_id TEXT, "
-        "bandwidth INTEGER, location TEXT, quality_profile TEXT, secure INTEGER, relayed INTEGER, "
-        "parent_rating_key INTEGER, grandparent_rating_key INTEGER, media_type TEXT, section_id INTEGER, "
-        "view_offset INTEGER DEFAULT 0)"
+        'CREATE TABLE IF NOT EXISTS session_history (id INTEGER PRIMARY KEY AUTOINCREMENT, reference_id INTEGER, '
+        'started INTEGER, stopped INTEGER, rating_key INTEGER, user_id INTEGER, user TEXT, '
+        'ip_address TEXT, paused_counter INTEGER DEFAULT 0, player TEXT, platform TEXT, machine_id TEXT, '
+        'parent_rating_key INTEGER, grandparent_rating_key INTEGER, media_type TEXT, view_offset INTEGER DEFAULT 0)'
     )
 
-    # session_history_media_info table :: This is a table which logs each session"s media info
+    # session_history_media_info table :: This is a table which logs each session's media info
     c_db.execute(
-        "CREATE TABLE IF NOT EXISTS session_history_media_info (id INTEGER PRIMARY KEY, rating_key INTEGER, "
-        "video_decision TEXT, audio_decision TEXT, transcode_decision TEXT, duration INTEGER DEFAULT 0, "
-        "container TEXT, bitrate INTEGER, width INTEGER, height INTEGER, video_bitrate INTEGER, video_bit_depth INTEGER, "
-        "video_codec TEXT, video_codec_level TEXT, video_width INTEGER, video_height INTEGER, video_resolution TEXT, "
-        "video_framerate TEXT, video_scan_type TEXT, video_full_resolution TEXT, video_dynamic_range TEXT, aspect_ratio TEXT, "
-        "audio_bitrate INTEGER, audio_codec TEXT, audio_channels INTEGER, audio_language TEXT, audio_language_code TEXT, "
-        "subtitles INTEGER, subtitle_codec TEXT, subtitle_forced, subtitle_language TEXT,"
-        "transcode_protocol TEXT, transcode_container TEXT, transcode_video_codec TEXT, transcode_audio_codec TEXT, "
-        "transcode_audio_channels INTEGER, transcode_width INTEGER, transcode_height INTEGER, "
-        "transcode_hw_requested INTEGER, transcode_hw_full_pipeline INTEGER, "
-        "transcode_hw_decode TEXT, transcode_hw_decode_title TEXT, transcode_hw_decoding INTEGER, "
-        "transcode_hw_encode TEXT, transcode_hw_encode_title TEXT, transcode_hw_encoding INTEGER, "
-        "stream_container TEXT, stream_container_decision TEXT, stream_bitrate INTEGER, "
-        "stream_video_decision TEXT, stream_video_bitrate INTEGER, stream_video_codec TEXT, stream_video_codec_level TEXT, "
-        "stream_video_bit_depth INTEGER, stream_video_height INTEGER, stream_video_width INTEGER, stream_video_resolution TEXT, "
-        "stream_video_framerate TEXT, stream_video_scan_type TEXT, stream_video_full_resolution TEXT, stream_video_dynamic_range TEXT, "
-        "stream_audio_decision TEXT, stream_audio_codec TEXT, stream_audio_bitrate INTEGER, stream_audio_channels INTEGER, "
-        "stream_audio_language TEXT, stream_audio_language_code TEXT, "
-        "stream_subtitle_decision TEXT, stream_subtitle_codec TEXT, "
-        "stream_subtitle_container TEXT, stream_subtitle_forced INTEGER, stream_subtitle_language TEXT, "
-        "synced_version INTEGER, synced_version_profile TEXT, "
-        "optimized_version INTEGER, optimized_version_profile TEXT, optimized_version_title TEXT)"
+        'CREATE TABLE IF NOT EXISTS session_history_media_info (id INTEGER PRIMARY KEY, '
+        'rating_key INTEGER, video_decision TEXT, audio_decision TEXT, duration INTEGER DEFAULT 0, width INTEGER, '
+        'height INTEGER, container TEXT, video_codec TEXT, audio_codec TEXT, bitrate INTEGER, video_resolution TEXT, '
+        'video_framerate TEXT, aspect_ratio TEXT, audio_channels INTEGER, transcode_protocol TEXT, '
+        'transcode_container TEXT, transcode_video_codec TEXT, transcode_audio_codec TEXT, '
+        'transcode_audio_channels INTEGER, transcode_width INTEGER, transcode_height INTEGER)'
     )
 
-    # session_history_metadata table :: This is a table which logs each session"s media metadata
+    # session_history_metadata table :: This is a table which logs each session's media metadata
     c_db.execute(
-        "CREATE TABLE IF NOT EXISTS session_history_metadata (id INTEGER PRIMARY KEY, "
-        "rating_key INTEGER, parent_rating_key INTEGER, grandparent_rating_key INTEGER, "
-        "title TEXT, parent_title TEXT, grandparent_title TEXT, original_title TEXT, full_title TEXT, "
-        "media_index INTEGER, parent_media_index INTEGER, "
-        "thumb TEXT, parent_thumb TEXT, grandparent_thumb TEXT, "
-        "art TEXT, media_type TEXT, year INTEGER, originally_available_at TEXT, added_at INTEGER, updated_at INTEGER, "
-        "last_viewed_at INTEGER, content_rating TEXT, summary TEXT, tagline TEXT, rating TEXT, "
-        "duration INTEGER DEFAULT 0, guid TEXT, directors TEXT, writers TEXT, actors TEXT, genres TEXT, studio TEXT, "
-        "labels TEXT, live INTEGER DEFAULT 0, "
-        "channel_call_sign TEXT, channel_id TEXT, channel_identifier TEXT, channel_title TEXT, channel_thumb TEXT, channel_vcn TEXT, "
-        "marker_credits_first INTEGER DEFAULT NULL, marker_credits_final INTEGER DEFAULT NULL)"
+        'CREATE TABLE IF NOT EXISTS session_history_metadata (id INTEGER PRIMARY KEY, '
+        'rating_key INTEGER, parent_rating_key INTEGER, grandparent_rating_key INTEGER, '
+        'title TEXT, parent_title TEXT, grandparent_title TEXT, full_title TEXT, media_index INTEGER, '
+        'parent_media_index INTEGER, thumb TEXT, parent_thumb TEXT, grandparent_thumb TEXT, art TEXT, media_type TEXT, '
+        'year INTEGER, originally_available_at TEXT, added_at INTEGER, updated_at INTEGER, last_viewed_at INTEGER, '
+        'content_rating TEXT, summary TEXT, tagline TEXT, rating TEXT, duration INTEGER DEFAULT 0, guid TEXT, '
+        'directors TEXT, writers TEXT, actors TEXT, genres TEXT, studio TEXT)'
+        ''
     )
 
     # users table :: This table keeps record of the friends list
     c_db.execute(
-        "CREATE TABLE IF NOT EXISTS users (id INTEGER PRIMARY KEY AUTOINCREMENT, "
-        "user_id INTEGER DEFAULT NULL UNIQUE, username TEXT NOT NULL, friendly_name TEXT, "
-        "thumb TEXT, custom_avatar_url TEXT, title TEXT, email TEXT, "
-        "is_active INTEGER DEFAULT 1, is_admin INTEGER DEFAULT 0, is_home_user INTEGER DEFAULT NULL, "
-        "is_allow_sync INTEGER DEFAULT NULL, is_restricted INTEGER DEFAULT NULL, "
-        "do_notify INTEGER DEFAULT 1, keep_history INTEGER DEFAULT 1, deleted_user INTEGER DEFAULT 0, "
-        "allow_guest INTEGER DEFAULT 0, user_token TEXT, server_token TEXT, shared_libraries TEXT, "
-        "filter_all TEXT, filter_movies TEXT, filter_tv TEXT, filter_music TEXT, filter_photos TEXT)"
+        'CREATE TABLE IF NOT EXISTS users (id INTEGER PRIMARY KEY AUTOINCREMENT, '
+        'user_id INTEGER DEFAULT NULL UNIQUE, username TEXT NOT NULL UNIQUE, '
+        'friendly_name TEXT, thumb TEXT, email TEXT, is_home_user INTEGER DEFAULT NULL, '
+        'is_allow_sync INTEGER DEFAULT NULL, is_restricted INTEGER DEFAULT NULL, do_notify INTEGER DEFAULT 1, '
+        'keep_history INTEGER DEFAULT 1, custom_avatar_url TEXT)'
     )
 
-    # library_sections table :: This table keeps record of the servers library sections
-    c_db.execute(
-        "CREATE TABLE IF NOT EXISTS library_sections (id INTEGER PRIMARY KEY AUTOINCREMENT, "
-        "server_id TEXT, section_id INTEGER, section_name TEXT, section_type TEXT, agent TEXT, "
-        "thumb TEXT, custom_thumb_url TEXT, art TEXT, custom_art_url TEXT, "
-        "count INTEGER, parent_count INTEGER, child_count INTEGER, is_active INTEGER DEFAULT 1, "
-        "do_notify INTEGER DEFAULT 1, do_notify_created INTEGER DEFAULT 1, keep_history INTEGER DEFAULT 1, "
-        "deleted_section INTEGER DEFAULT 0, UNIQUE(server_id, section_id))"
-    )
+    # Upgrade sessions table from earlier versions
+    try:
+        c_db.execute('SELECT started from sessions')
+    except sqlite3.OperationalError:
+        logger.debug(u"Altering database. Updating database table sessions.")
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN started INTEGER'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN paused_counter INTEGER DEFAULT 0'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN state TEXT'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN user TEXT'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN machine_id TEXT'
+        )
 
-    # user_login table :: This table keeps record of the Tautulli guest logins
-    c_db.execute(
-        "CREATE TABLE IF NOT EXISTS user_login (id INTEGER PRIMARY KEY AUTOINCREMENT, "
-        "timestamp INTEGER, user_id INTEGER, user TEXT, user_group TEXT, "
-        "ip_address TEXT, host TEXT, user_agent TEXT, success INTEGER DEFAULT 1,"
-        "expiry TEXT, jwt_token TEXT)"
-    )
+    # Upgrade sessions table from earlier versions
+    try:
+        c_db.execute('SELECT title from sessions')
+    except sqlite3.OperationalError:
+        logger.debug(u"Altering database. Updating database table sessions.")
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN title TEXT'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN parent_title TEXT'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN grandparent_title TEXT'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN friendly_name TEXT'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN player TEXT'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN user_id INTEGER'
+        )
 
-    # notifiers table :: This table keeps record of the notification agent settings
-    c_db.execute(
-        "CREATE TABLE IF NOT EXISTS notifiers (id INTEGER PRIMARY KEY AUTOINCREMENT, "
-        "agent_id INTEGER, agent_name TEXT, agent_label TEXT, friendly_name TEXT, notifier_config TEXT, "
-        "on_play INTEGER DEFAULT 0, on_stop INTEGER DEFAULT 0, on_pause INTEGER DEFAULT 0, "
-        "on_resume INTEGER DEFAULT 0, on_change INTEGER DEFAULT 0, on_buffer INTEGER DEFAULT 0, "
-        "on_error INTEGER DEFAULT 0, "
-        "on_intro INTEGER DEFAULT 0, on_credits INTEGER DEFAULT 0, on_commercial INTEGER DEFAULT 0, "
-        "on_watched INTEGER DEFAULT 0, on_created INTEGER DEFAULT 0, "
-        "on_extdown INTEGER DEFAULT 0, on_intdown INTEGER DEFAULT 0, "
-        "on_extup INTEGER DEFAULT 0, on_intup INTEGER DEFAULT 0, on_pmsupdate INTEGER DEFAULT 0, "
-        "on_concurrent INTEGER DEFAULT 0, on_newdevice INTEGER DEFAULT 0, on_plexpyupdate INTEGER DEFAULT 0, "
-        "on_plexpydbcorrupt INTEGER DEFAULT 0, "
-        "on_play_subject TEXT, on_stop_subject TEXT, on_pause_subject TEXT, "
-        "on_resume_subject TEXT, on_change_subject TEXT, on_buffer_subject TEXT, on_error_subject TEXT, "
-        "on_intro_subject TEXT, on_credits_subject TEXT, on_commercial_subject TEXT,"
-        "on_watched_subject TEXT, on_created_subject TEXT, on_extdown_subject TEXT, on_intdown_subject TEXT, "
-        "on_extup_subject TEXT, on_intup_subject TEXT, on_pmsupdate_subject TEXT, "
-        "on_concurrent_subject TEXT, on_newdevice_subject TEXT, on_plexpyupdate_subject TEXT, "
-        "on_plexpydbcorrupt_subject TEXT, "
-        "on_play_body TEXT, on_stop_body TEXT, on_pause_body TEXT, "
-        "on_resume_body TEXT, on_change_body TEXT, on_buffer_body TEXT, on_error_body TEXT, "
-        "on_intro_body TEXT, on_credits_body TEXT, on_commercial_body TEXT, "
-        "on_watched_body TEXT, on_created_body TEXT, on_extdown_body TEXT, on_intdown_body TEXT, "
-        "on_extup_body TEXT, on_intup_body TEXT, on_pmsupdate_body TEXT, "
-        "on_concurrent_body TEXT, on_newdevice_body TEXT, on_plexpyupdate_body TEXT, "
-        "on_plexpydbcorrupt_body TEXT, "
-        "custom_conditions TEXT, custom_conditions_logic TEXT)"
-    )
+    # Upgrade sessions table from earlier versions
+    try:
+        c_db.execute('SELECT ip_address from sessions')
+    except sqlite3.OperationalError:
+        logger.debug(u"Altering database. Updating database table sessions.")
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN ip_address TEXT'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN platform TEXT'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN parent_rating_key INTEGER'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN grandparent_rating_key INTEGER'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN view_offset INTEGER DEFAULT 0'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN duration INTEGER'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN video_decision TEXT'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN audio_decision TEXT'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN width INTEGER'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN height INTEGER'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN container TEXT'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN video_codec TEXT'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN audio_codec TEXT'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN bitrate INTEGER'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN video_resolution TEXT'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN video_framerate TEXT'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN aspect_ratio TEXT'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN audio_channels INTEGER'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN transcode_protocol TEXT'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN transcode_container TEXT'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN transcode_video_codec TEXT'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN transcode_audio_codec TEXT'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN transcode_audio_channels INTEGER'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN transcode_width INTEGER'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN transcode_height INTEGER'
+        )
+
+    # Upgrade session_history_metadata table from earlier versions
+    try:
+        c_db.execute('SELECT full_title from session_history_metadata')
+    except sqlite3.OperationalError:
+        logger.debug(u"Altering database. Updating database table session_history_metadata.")
+        c_db.execute(
+            'ALTER TABLE session_history_metadata ADD COLUMN full_title TEXT'
+        )
+
+    # Upgrade session_history_metadata table from earlier versions
+    try:
+        c_db.execute('SELECT tagline from session_history_metadata')
+    except sqlite3.OperationalError:
+        logger.debug(u"Altering database. Updating database table session_history_metadata.")
+        c_db.execute(
+            'ALTER TABLE session_history_metadata ADD COLUMN tagline TEXT'
+        )
 
     # notify_log table :: This is a table which logs notifications sent
     c_db.execute(
-        "CREATE TABLE IF NOT EXISTS notify_log (id INTEGER PRIMARY KEY AUTOINCREMENT, timestamp INTEGER, "
-        "session_key INTEGER, rating_key INTEGER, parent_rating_key INTEGER, grandparent_rating_key INTEGER, "
-        "user_id INTEGER, user TEXT, notifier_id INTEGER, agent_id INTEGER, agent_name TEXT, notify_action TEXT, "
-        "subject_text TEXT, body_text TEXT, script_args TEXT, success INTEGER DEFAULT 0, tag TEXT)"
+        'CREATE TABLE IF NOT EXISTS notify_log (id INTEGER PRIMARY KEY AUTOINCREMENT, '
+        'session_key INTEGER, rating_key INTEGER, user_id INTEGER, user TEXT, '
+        'agent_id INTEGER, agent_name TEXT, on_play INTEGER, on_stop INTEGER, on_watched INTEGER, '
+        'on_pause INTEGER, on_resume INTEGER, on_buffer INTEGER)'
     )
 
-    # newsletters table :: This table keeps record of the newsletter settings
-    c_db.execute(
-        "CREATE TABLE IF NOT EXISTS newsletters (id INTEGER PRIMARY KEY AUTOINCREMENT, "
-        "agent_id INTEGER, agent_name TEXT, agent_label TEXT, id_name TEXT NOT NULL, "
-        "friendly_name TEXT, newsletter_config TEXT, email_config TEXT, "
-        "subject TEXT, body TEXT, message TEXT, "
-        "cron TEXT NOT NULL DEFAULT '0 0 * * 0', active INTEGER DEFAULT 0)"
-    )
-
-    # newsletter_log table :: This is a table which logs newsletters sent
-    c_db.execute(
-        "CREATE TABLE IF NOT EXISTS newsletter_log (id INTEGER PRIMARY KEY AUTOINCREMENT, timestamp INTEGER, "
-        "newsletter_id INTEGER, agent_id INTEGER, agent_name TEXT, notify_action TEXT, "
-        "subject_text TEXT, body_text TEXT, message_text TEXT, start_date TEXT, end_date TEXT, "
-        "start_time INTEGER, end_time INTEGER, uuid TEXT UNIQUE, filename TEXT, email_msg_id TEXT, "
-        "success INTEGER DEFAULT 0)"
-    )
-
-    # recently_added table :: This table keeps record of recently added items
-    c_db.execute(
-        "CREATE TABLE IF NOT EXISTS recently_added (id INTEGER PRIMARY KEY AUTOINCREMENT, "
-        "added_at INTEGER, pms_identifier TEXT, section_id INTEGER, "
-        "rating_key INTEGER, parent_rating_key INTEGER, grandparent_rating_key INTEGER, media_type TEXT, "
-        "media_info TEXT)"
-    )
-
-    # mobile_devices table :: This table keeps record of devices linked with the mobile app
-    c_db.execute(
-        "CREATE TABLE IF NOT EXISTS mobile_devices (id INTEGER PRIMARY KEY AUTOINCREMENT, "
-        "device_id TEXT NOT NULL UNIQUE, device_token TEXT, device_name TEXT, "
-        "platform TEXT, version TEXT, friendly_name TEXT, "
-        "onesignal_id TEXT, last_seen INTEGER, official INTEGER DEFAULT 0)"
-    )
-
-    # tvmaze_lookup table :: This table keeps record of the TVmaze lookups
-    c_db.execute(
-        "CREATE TABLE IF NOT EXISTS tvmaze_lookup (id INTEGER PRIMARY KEY AUTOINCREMENT, "
-        "rating_key INTEGER, thetvdb_id INTEGER, imdb_id TEXT, "
-        "tvmaze_id INTEGER, tvmaze_url TEXT, tvmaze_json TEXT)"
-    )
-
-    # themoviedb_lookup table :: This table keeps record of the TheMovieDB lookups
-    c_db.execute(
-        "CREATE TABLE IF NOT EXISTS themoviedb_lookup (id INTEGER PRIMARY KEY AUTOINCREMENT, "
-        "rating_key INTEGER, thetvdb_id INTEGER, imdb_id TEXT, "
-        "themoviedb_id INTEGER, themoviedb_url TEXT, themoviedb_json TEXT)"
-    )
-
-    # musicbrainz_lookup table :: This table keeps record of the MusicBrainz lookups
-    c_db.execute(
-        "CREATE TABLE IF NOT EXISTS musicbrainz_lookup (id INTEGER PRIMARY KEY AUTOINCREMENT, "
-        "rating_key INTEGER, musicbrainz_id INTEGER, musicbrainz_url TEXT, musicbrainz_type TEXT, "
-        "musicbrainz_json TEXT)"
-    )
-
-    # image_hash_lookup table :: This table keeps record of the image hash lookups
-    c_db.execute(
-        "CREATE TABLE IF NOT EXISTS image_hash_lookup (id INTEGER PRIMARY KEY AUTOINCREMENT, "
-        "img_hash TEXT UNIQUE, img TEXT, rating_key INTEGER, width INTEGER, height INTEGER, "
-        "opacity INTEGER, background TEXT, blur INTEGER, fallback TEXT)"
-    )
-
-    # imgur_lookup table :: This table keeps record of the Imgur uploads
-    c_db.execute(
-        "CREATE TABLE IF NOT EXISTS imgur_lookup (id INTEGER PRIMARY KEY AUTOINCREMENT, "
-        "img_hash TEXT, imgur_title TEXT, imgur_url TEXT, delete_hash TEXT)"
-    )
-
-    # cloudinary_lookup table :: This table keeps record of the Cloudinary uploads
-    c_db.execute(
-        "CREATE TABLE IF NOT EXISTS cloudinary_lookup (id INTEGER PRIMARY KEY AUTOINCREMENT, "
-        "img_hash TEXT, cloudinary_title TEXT, cloudinary_url TEXT)"
-    )
-
-    # exports table :: This table keeps record of the exported files
-    c_db.execute(
-        "CREATE TABLE IF NOT EXISTS exports (id INTEGER PRIMARY KEY AUTOINCREMENT, "
-        "timestamp INTEGER, section_id INTEGER, user_id INTEGER, rating_key INTEGER, media_type TEXT, "
-        "title TEXT, file_format TEXT, "
-        "metadata_level INTEGER, media_info_level INTEGER, "
-        "thumb_level INTEGER DEFAULT 0, art_level INTEGER DEFAULT 0, logo_level INTEGER DEFAULT 0, "
-        "custom_fields TEXT, individual_files INTEGER DEFAULT 0, "
-        "file_size INTEGER DEFAULT 0, complete INTEGER DEFAULT 0, "
-        "exported_items INTEGER DEFAULT 0, total_items INTEGER DEFAULT 0)"
-    )
-
-    # Upgrade sessions table from earlier versions
+    # Upgrade users table from earlier versions
     try:
-        c_db.execute("SELECT started FROM sessions")
+        c_db.execute('SELECT do_notify from users')
     except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
+        logger.debug(u"Altering database. Updating database table users.")
         c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN started INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN paused_counter INTEGER DEFAULT 0"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN state TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN user TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN machine_id TEXT"
+            'ALTER TABLE users ADD COLUMN do_notify INTEGER DEFAULT 1'
         )
 
-    # Upgrade sessions table from earlier versions
+    # Upgrade users table from earlier versions
     try:
-        c_db.execute("SELECT title FROM sessions")
+        c_db.execute('SELECT keep_history from users')
     except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
+        logger.debug(u"Altering database. Updating database table users.")
         c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN title TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN parent_title TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN grandparent_title TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN friendly_name TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN player TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN user_id INTEGER"
+            'ALTER TABLE users ADD COLUMN keep_history INTEGER DEFAULT 1'
         )
 
-    # Upgrade sessions table from earlier versions
+    # Upgrade notify_log table from earlier versions
     try:
-        c_db.execute("SELECT ip_address FROM sessions")
+        c_db.execute('SELECT on_pause from notify_log')
     except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
+        logger.debug(u"Altering database. Updating database table notify_log.")
         c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN ip_address TEXT"
+            'ALTER TABLE notify_log ADD COLUMN on_pause INTEGER'
         )
         c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN platform TEXT"
+            'ALTER TABLE notify_log ADD COLUMN on_resume INTEGER'
         )
         c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN parent_rating_key INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN grandparent_rating_key INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN view_offset INTEGER DEFAULT 0"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN duration INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN video_decision TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN audio_decision TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN width INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN height INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN container TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN video_codec TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN audio_codec TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN bitrate INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN video_resolution TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN video_framerate TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN aspect_ratio TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN audio_channels INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN transcode_protocol TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN transcode_container TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN transcode_video_codec TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN transcode_audio_codec TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN transcode_audio_channels INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN transcode_width INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN transcode_height INTEGER"
+            'ALTER TABLE notify_log ADD COLUMN on_buffer INTEGER'
         )
 
     # Upgrade sessions table from earlier versions
     try:
-        c_db.execute("SELECT buffer_count FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN buffer_count INTEGER DEFAULT 0"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN buffer_last_triggered INTEGER"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT last_paused FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN last_paused INTEGER"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT section_id FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN section_id INTEGER"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT stopped FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stopped INTEGER"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT transcode_key FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN transcode_key TEXT"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT write_attempts FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN write_attempts INTEGER DEFAULT 0"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT transcode_decision FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN transcode_decision TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN full_title TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN media_index INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN parent_media_index INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN thumb TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN parent_thumb TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN grandparent_thumb TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN year INTEGER"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT raw_stream_info FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN product TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN optimized_version INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN optimized_version_profile TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN synced_version INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN video_bitrate INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN video_width INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN video_height INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN audio_bitrate INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN subtitle_codec TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stream_bitrate INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stream_video_resolution TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN quality_profile TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stream_container_decision TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stream_container TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stream_video_decision TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stream_video_codec TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stream_video_bitrate INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stream_video_width INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stream_video_height INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stream_video_framerate TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stream_audio_decision TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stream_audio_codec TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stream_audio_bitrate INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stream_audio_channels INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN subtitles INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stream_subtitle_decision TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stream_subtitle_codec TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN raw_stream_info TEXT"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT video_height FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN video_height INTEGER"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT subtitles FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN subtitles INTEGER"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT synced_version_profile FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN synced_version_profile TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN optimized_version_title TEXT"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT transcode_hw_decoding FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN transcode_hw_decoding INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN transcode_hw_encoding INTEGER"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT watched FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN watched INTEGER DEFAULT 0"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT live FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN live INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN live_uuid TEXT"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT session_id FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN session_id TEXT"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT original_title FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN original_title TEXT"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT secure FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN secure INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN relayed INTEGER"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT rating_key_websocket FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN rating_key_websocket TEXT"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT video_scan_type FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN video_scan_type TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN video_full_resolution TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stream_video_scan_type TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stream_video_full_resolution TEXT"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT video_dynamic_range FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN video_dynamic_range TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stream_video_dynamic_range TEXT"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT channel_identifier FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN channel_call_sign TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN channel_identifier TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN channel_thumb TEXT"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT originally_available_at FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN originally_available_at TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN added_at INTEGER"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT guid FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN guid TEXT"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT bandwidth FROM sessions")
+        c_db.execute('SELECT buffer_count from sessions')
     except sqlite3.OperationalError:
         logger.debug(u"Altering database. Updating database table sessions.")
         c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN bandwidth INTEGER"
+            'ALTER TABLE sessions ADD COLUMN buffer_count INTEGER DEFAULT 0'
         )
         c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN location TEXT"
+            'ALTER TABLE sessions ADD COLUMN buffer_last_triggered INTEGER'
+        )
+
+    # Upgrade users table from earlier versions
+    try:
+        c_db.execute('SELECT custom_avatar_url from users')
+    except sqlite3.OperationalError:
+        logger.debug(u"Altering database. Updating database table users.")
+        c_db.execute(
+            'ALTER TABLE users ADD COLUMN custom_avatar_url TEXT'
         )
 
     # Upgrade sessions table from earlier versions
     try:
-        c_db.execute("SELECT initial_stream FROM sessions")
+        c_db.execute('SELECT last_paused from sessions')
     except sqlite3.OperationalError:
         logger.debug(u"Altering database. Updating database table sessions.")
         c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN initial_stream INTEGER DEFAULT 1"
+            'ALTER TABLE sessions ADD COLUMN last_paused INTEGER'
         )
 
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT audio_language FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug(u"Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN audio_language TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN audio_language_code TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stream_audio_language TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stream_audio_language_code TEXT"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT subtitle_language FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug(u"Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN subtitle_language TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stream_subtitle_language TEXT"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT subtitle_forced FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug(u"Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN subtitle_forced INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN stream_subtitle_forced INTEGER"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT intro FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug(u"Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN intro INTEGER DEFAULT 0"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN credits INTEGER DEFAULT 0"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT commercial FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug(u"Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN commercial INTEGER DEFAULT 0"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT marker FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug(u"Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN marker INTEGER DEFAULT 0"
-        )
-
-    # Upgrade sessions table from earlier versions
-    try:
-        c_db.execute("SELECT channel_id FROM sessions")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table sessions.")
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN channel_id TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN channel_title TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE sessions ADD COLUMN channel_vcn TEXT"
-        )
+    # Add "Local" user to database as default unauthenticated user.
+    result = c_db.execute('SELECT id FROM users WHERE username = "Local"')
+    if not result.fetchone():
+        logger.debug(u'User "Local" does not exist. Adding user.')
+        c_db.execute('INSERT INTO users (user_id, username) VALUES (0, "Local")')
 
     # Upgrade session_history table from earlier versions
     try:
-        c_db.execute("SELECT reference_id FROM session_history")
+        c_db.execute('SELECT reference_id from session_history')
     except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table session_history.")
+        logger.debug(u"Altering database. Updating database table session_history.")
         c_db.execute(
-            "ALTER TABLE session_history ADD COLUMN reference_id INTEGER DEFAULT 0"
+            'ALTER TABLE session_history ADD COLUMN reference_id INTEGER DEFAULT 0'
         )
         # Set reference_id to the first row where (user_id = previous row, rating_key != previous row) and user_id = user_id
         c_db.execute(
-            "UPDATE session_history " \
-            "SET reference_id = (SELECT (CASE \
+            'UPDATE session_history ' \
+            'SET reference_id = (SELECT (CASE \
              WHEN (SELECT MIN(id) FROM session_history WHERE id > ( \
                  SELECT MAX(id) FROM session_history \
                  WHERE (user_id = t1.user_id AND rating_key <> t1.rating_key AND id < t1.id)) AND user_id = t1.user_id) IS NULL \
              THEN (SELECT MIN(id) FROM session_history WHERE (user_id = t1.user_id)) \
              ELSE (SELECT MIN(id) FROM session_history WHERE id > ( \
                  SELECT MAX(id) FROM session_history \
-                 WHERE (user_id = t1.user_id AND rating_key <> t1.rating_key AND id < t1.id)) AND user_id = t1.user_id) END) " \
-            "FROM session_history AS t1 " \
-            "WHERE t1.id = session_history.id) "
-        )
-
-    # Upgrade session_history table from earlier versions
-    try:
-        c_db.execute("SELECT bandwidth FROM session_history")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table session_history.")
-        c_db.execute(
-            "ALTER TABLE session_history ADD COLUMN platform_version TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history ADD COLUMN product TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history ADD COLUMN product_version TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history ADD COLUMN profile TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history ADD COLUMN bandwidth INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history ADD COLUMN location TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history ADD COLUMN quality_profile TEXT"
-        )
-
-    # Upgrade session_history table from earlier versions
-    try:
-        c_db.execute("SELECT secure FROM session_history")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table session_history.")
-        c_db.execute(
-            "ALTER TABLE session_history ADD COLUMN secure INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history ADD COLUMN relayed INTEGER"
-        )
-
-    # Upgrade session_history table from earlier versions
-    try:
-        result = c_db.execute("SELECT platform FROM session_history "
-                              "WHERE platform = 'windows'").fetchall()
-        if len(result) > 0:
-            logger.debug("Altering database. Capitalizing Windows platform values in session_history table.")
-            c_db.execute(
-                "UPDATE session_history SET platform = 'Windows' WHERE platform = 'windows' "
-            )
-    except sqlite3.OperationalError:
-        logger.warn("Unable to capitalize Windows platform values in session_history table.")
-
-    # Upgrade session_history table from earlier versions
-    try:
-        result = c_db.execute("SELECT platform FROM session_history "
-                              "WHERE platform = 'macos'").fetchall()
-        if len(result) > 0:
-            logger.debug("Altering database. Capitalizing macOS platform values in session_history table.")
-            c_db.execute(
-                "UPDATE session_history SET platform = 'macOS' WHERE platform = 'macos' "
-            )
-    except sqlite3.OperationalError:
-        logger.warn("Unable to capitalize macOS platform values in session_history table.")
-
-    # Upgrade session_history_metadata table from earlier versions
-    try:
-        c_db.execute("SELECT full_title FROM session_history_metadata")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table session_history_metadata.")
-        c_db.execute(
-            "ALTER TABLE session_history_metadata ADD COLUMN full_title TEXT"
-        )
-
-    # Upgrade session_history_metadata table from earlier versions
-    try:
-        c_db.execute("SELECT tagline FROM session_history_metadata")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table session_history_metadata.")
-        c_db.execute(
-            "ALTER TABLE session_history_metadata ADD COLUMN tagline TEXT"
-        )
-
-    # Upgrade session_history_metadata table from earlier versions
-    try:
-        c_db.execute("SELECT labels FROM session_history_metadata")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table session_history_metadata.")
-        c_db.execute(
-            "ALTER TABLE session_history_metadata ADD COLUMN labels TEXT"
-        )
-
-    # Upgrade session_history_metadata table from earlier versions
-    try:
-        c_db.execute("SELECT original_title FROM session_history_metadata")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table session_history_metadata.")
-        c_db.execute(
-            "ALTER TABLE session_history_metadata ADD COLUMN original_title TEXT"
-        )
-
-    # Upgrade session_history_metadata table from earlier versions
-    try:
-        c_db.execute("SELECT live FROM session_history_metadata")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table session_history_metadata.")
-        c_db.execute(
-            "ALTER TABLE session_history_metadata ADD COLUMN live INTEGER DEFAULT 0"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_metadata ADD COLUMN channel_call_sign TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_metadata ADD COLUMN channel_identifier TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_metadata ADD COLUMN channel_thumb TEXT"
-        )
-
-    # Upgrade session_history_metadata table from earlier versions
-    try:
-        c_db.execute("SELECT marker_credits_first FROM session_history_metadata")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table session_history_metadata.")
-        c_db.execute(
-            "ALTER TABLE session_history_metadata ADD COLUMN marker_credits_first INTEGER DEFAULT NULL"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_metadata ADD COLUMN marker_credits_final INTEGER DEFAULT NULL"
-        )
-
-    # Upgrade session_history_metadata table from earlier versions
-    try:
-        c_db.execute("SELECT channel_id FROM session_history_metadata")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table session_history_metadata.")
-        c_db.execute(
-            "ALTER TABLE session_history_metadata ADD COLUMN channel_id TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_metadata ADD COLUMN channel_title TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_metadata ADD COLUMN channel_vcn TEXT"
-        )
-
-    # Upgrade session_history_media_info table from earlier versions
-    try:
-        c_db.execute("SELECT transcode_decision FROM session_history_media_info")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table session_history_media_info.")
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN transcode_decision TEXT"
-        )
-        c_db.execute(
-            "UPDATE session_history_media_info SET transcode_decision = (CASE "
-            "WHEN video_decision = 'transcode' OR audio_decision = 'transcode' THEN 'transcode' "
-            "WHEN video_decision = 'copy' OR audio_decision = 'copy' THEN 'copy' "
-            "WHEN video_decision = 'direct play' OR audio_decision = 'direct play' THEN 'direct play' END)"
-        )
-
-    # Upgrade session_history_media_info table from earlier versions
-    try:
-        c_db.execute("SELECT subtitles FROM session_history_media_info")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table session_history_media_info.")
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN video_bit_depth INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN video_bitrate INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN video_codec_level TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN video_width INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN video_height INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN audio_bitrate INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN transcode_hw_requested INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN transcode_hw_full_pipeline INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN transcode_hw_decode TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN transcode_hw_encode TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN transcode_hw_decode_title TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN transcode_hw_encode_title TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_container TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_container_decision TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_bitrate INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_video_decision TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_video_bitrate INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_video_codec TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_video_codec_level TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_video_bit_depth INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_video_height INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_video_width INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_video_resolution TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_video_framerate TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_audio_decision TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_audio_codec TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_audio_bitrate INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_audio_channels INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_subtitle_decision TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_subtitle_codec TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_subtitle_container TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_subtitle_forced INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN subtitles INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN synced_version INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN optimized_version INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN optimized_version_profile TEXT"
-        )
-        c_db.execute(
-            "UPDATE session_history_media_info SET video_resolution=REPLACE(video_resolution, 'p', '')"
-        )
-        c_db.execute(
-            "UPDATE session_history_media_info SET video_resolution=REPLACE(video_resolution, 'SD', 'sd')"
-        )
-
-    # Upgrade session_history_media_info table from earlier versions
-    try:
-        c_db.execute("SELECT subtitle_codec FROM session_history_media_info")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table session_history_media_info.")
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN subtitle_codec TEXT"
-        )
-
-    # Upgrade session_history_media_info table from earlier versions
-    try:
-        c_db.execute("SELECT synced_version_profile FROM session_history_media_info")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table session_history_media_info.")
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN synced_version_profile TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN optimized_version_title TEXT"
-        )
-
-    # Upgrade session_history_media_info table from earlier versions
-    try:
-        c_db.execute("SELECT transcode_hw_decoding FROM session_history_media_info")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table session_history_media_info.")
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN transcode_hw_decoding INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN transcode_hw_encoding INTEGER"
-        )
-        c_db.execute(
-            "UPDATE session_history_media_info SET subtitle_codec = '' WHERE subtitle_codec IS NULL"
-        )
-
-    # Upgrade session_history_media_info table from earlier versions
-    try:
-        result = c_db.execute("SELECT stream_container FROM session_history_media_info "
-                              "WHERE stream_container IS NULL").fetchall()
-        if len(result) > 0:
-            logger.debug("Altering database. Removing NULL values from session_history_media_info table.")
-            c_db.execute(
-                "UPDATE session_history_media_info SET stream_container = '' WHERE stream_container IS NULL"
-            )
-            c_db.execute(
-                "UPDATE session_history_media_info SET stream_video_codec = '' WHERE stream_video_codec IS NULL"
-            )
-            c_db.execute(
-                "UPDATE session_history_media_info SET stream_audio_codec = '' WHERE stream_audio_codec IS NULL"
-            )
-            c_db.execute(
-                "UPDATE session_history_media_info SET stream_subtitle_codec = '' WHERE stream_subtitle_codec IS NULL"
-            )
-    except sqlite3.OperationalError:
-        logger.warn("Unable to remove NULL values from session_history_media_info table.")
-
-    # Upgrade session_history_media_info table from earlier versions
-    try:
-        c_db.execute("SELECT video_scan_type FROM session_history_media_info")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table session_history_media_info.")
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN video_scan_type TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN video_full_resolution TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_video_scan_type TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_video_full_resolution TEXT"
-        )
-        c_db.execute(
-            "UPDATE session_history_media_info SET video_scan_type = 'progressive' "
-            "WHERE video_resolution != ''"
-        )
-        c_db.execute(
-            "UPDATE session_history_media_info SET stream_video_scan_type = 'progressive' "
-            "WHERE stream_video_resolution != '' AND stream_video_resolution IS NOT NULL"
-        )
-        c_db.execute(
-            "UPDATE session_history_media_info SET video_full_resolution = (CASE "
-            "WHEN video_resolution = '' OR video_resolution = 'SD' OR video_resolution = '4k' THEN video_resolution "
-            "WHEN video_resolution = 'sd' THEN 'SD' "
-            "ELSE video_resolution || 'p' END)"
-        )
-        c_db.execute(
-            "UPDATE session_history_media_info SET stream_video_full_resolution = ( "
-            "CASE WHEN stream_video_resolution = '' OR stream_video_resolution = 'SD' OR stream_video_resolution = '4k' "
-            "THEN stream_video_resolution "
-            "WHEN stream_video_resolution = 'sd' THEN 'SD' "
-            "ELSE stream_video_resolution || 'p' END)"
-        )
-
-    # Upgrade session_history_media_info table from earlier versions
-    try:
-        c_db.execute("SELECT video_dynamic_range FROM session_history_media_info")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table session_history_media_info.")
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN video_dynamic_range TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_video_dynamic_range TEXT"
-        )
-
-    result = c_db.execute("SELECT * FROM session_history_media_info "
-                          "WHERE video_dynamic_range = 'SDR' AND stream_video_dynamic_range = 'HDR'").fetchone()
-    if result:
-        c_db.execute(
-            "UPDATE session_history_media_info SET stream_video_dynamic_range = 'SDR' "
-            "WHERE video_dynamic_range = 'SDR' AND stream_video_dynamic_range = 'HDR'"
-        )
-    
-    # Upgrade session_history_media_info table from earlier versions
-    try:
-        c_db.execute("SELECT audio_language FROM session_history_media_info")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table session_history_media_info.")
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN audio_language TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN audio_language_code TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_audio_language TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_audio_language_code TEXT"
-        ) 
-    
-    # Upgrade session_history_media_info table from earlier versions
-    try:
-        c_db.execute("SELECT subtitle_language FROM session_history_media_info")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table session_history_media_info.")
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN subtitle_language TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN stream_subtitle_language TEXT"
-        )
-
-    # Upgrade session_history_media_info table from earlier versions
-    try:
-        c_db.execute("SELECT subtitle_forced FROM session_history_media_info")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table session_history_media_info.")
-        c_db.execute(
-            "ALTER TABLE session_history_media_info ADD COLUMN subtitle_forced INTEGER"
-        )
-
-    # Upgrade session_history table from earlier versions
-    try:
-        c_db.execute("SELECT section_id FROM session_history")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table session_history.")
-        c_db.execute(
-            "ALTER TABLE session_history ADD COLUMN section_id INTEGER"
-        )
-        c_db.execute(
-            "UPDATE session_history SET section_id = ("
-            "SELECT section_id FROM session_history_metadata "
-            "WHERE session_history_metadata.id = session_history.id)"
-        )
-        c_db.execute(
-            "CREATE TABLE IF NOT EXISTS session_history_metadata_temp (id INTEGER PRIMARY KEY, "
-            "rating_key INTEGER, parent_rating_key INTEGER, grandparent_rating_key INTEGER, "
-            "title TEXT, parent_title TEXT, grandparent_title TEXT, original_title TEXT, full_title TEXT, "
-            "media_index INTEGER, parent_media_index INTEGER, "
-            "thumb TEXT, parent_thumb TEXT, grandparent_thumb TEXT, "
-            "art TEXT, media_type TEXT, year INTEGER, originally_available_at TEXT, added_at INTEGER, updated_at INTEGER, "
-            "last_viewed_at INTEGER, content_rating TEXT, summary TEXT, tagline TEXT, rating TEXT, "
-            "duration INTEGER DEFAULT 0, guid TEXT, directors TEXT, writers TEXT, actors TEXT, genres TEXT, studio TEXT, "
-            "labels TEXT, live INTEGER DEFAULT 0, channel_call_sign TEXT, channel_identifier TEXT, channel_thumb TEXT)"
-        )
-        c_db.execute(
-            "INSERT INTO session_history_metadata_temp (id, rating_key, parent_rating_key, grandparent_rating_key, "
-            "title, parent_title, grandparent_title, original_title, full_title, "
-            "media_index, parent_media_index, "
-            "thumb, parent_thumb, grandparent_thumb, "
-            "art, media_type, year, originally_available_at, added_at, updated_at, "
-            "last_viewed_at, content_rating, summary, tagline, rating, "
-            "duration, guid, directors, writers, actors, genres, studio, "
-            "labels, live, channel_call_sign, channel_identifier, channel_thumb) "
-            "SELECT id, rating_key, parent_rating_key, grandparent_rating_key, "
-            "title, parent_title, grandparent_title, original_title, full_title, "
-            "media_index, parent_media_index, "
-            "thumb, parent_thumb, grandparent_thumb, "
-            "art, media_type, year, originally_available_at, added_at, updated_at, "
-            "last_viewed_at, content_rating, summary, tagline, rating, "
-            "duration, guid, directors, writers, actors, genres, studio, "
-            "labels, live, channel_call_sign, channel_identifier, channel_thumb "
-            "FROM session_history_metadata"
-        )
-        c_db.execute(
-            "DROP TABLE session_history_metadata"
-        )
-        c_db.execute(
-            "ALTER TABLE session_history_metadata_temp RENAME TO session_history_metadata"
-        )
-
-    # Upgrade users table from earlier versions
-    try:
-        c_db.execute("SELECT do_notify FROM users")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table users.")
-        c_db.execute(
-            "ALTER TABLE users ADD COLUMN do_notify INTEGER DEFAULT 1"
-        )
-
-    # Upgrade users table from earlier versions
-    try:
-        c_db.execute("SELECT keep_history FROM users")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table users.")
-        c_db.execute(
-            "ALTER TABLE users ADD COLUMN keep_history INTEGER DEFAULT 1"
-        )
-
-    # Upgrade users table from earlier versions
-    try:
-        c_db.execute("SELECT custom_avatar_url FROM users")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table users.")
-        c_db.execute(
-            "ALTER TABLE users ADD COLUMN custom_avatar_url TEXT"
-        )
-
-    # Upgrade users table from earlier versions
-    try:
-        c_db.execute("SELECT deleted_user FROM users")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table users.")
-        c_db.execute(
-            "ALTER TABLE users ADD COLUMN deleted_user INTEGER DEFAULT 0"
-        )
-
-    # Upgrade users table from earlier versions
-    try:
-        c_db.execute("SELECT allow_guest FROM users")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table users.")
-        c_db.execute(
-            "ALTER TABLE users ADD COLUMN allow_guest INTEGER DEFAULT 0"
-        )
-        c_db.execute(
-            "ALTER TABLE users ADD COLUMN user_token TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE users ADD COLUMN server_token TEXT"
-        )
-
-    # Upgrade users table from earlier versions
-    try:
-        c_db.execute("SELECT shared_libraries FROM users")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table users.")
-        c_db.execute(
-            "ALTER TABLE users ADD COLUMN shared_libraries TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE users ADD COLUMN filter_all TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE users ADD COLUMN filter_movies TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE users ADD COLUMN filter_tv TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE users ADD COLUMN filter_music TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE users ADD COLUMN filter_photos TEXT"
-        )
-
-    # Upgrade users table from earlier versions
-    try:
-        c_db.execute("SELECT is_admin FROM users")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table users.")
-        c_db.execute(
-            "ALTER TABLE users ADD COLUMN is_admin INTEGER DEFAULT 0"
-        )
-
-    # Upgrade users table from earlier versions
-    try:
-        c_db.execute("SELECT is_active FROM users")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table users.")
-        c_db.execute(
-            "ALTER TABLE users ADD COLUMN is_active INTEGER DEFAULT 1"
-        )
-
-    # Upgrade users table from earlier versions
-    try:
-        c_db.execute("SELECT title FROM users")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table users.")
-        c_db.execute(
-            "ALTER TABLE users ADD COLUMN title TEXT"
-        )
-
-    try:
-        result = c_db.execute("SELECT * FROM users WHERE friendly_name = username").fetchall()
-        if result:
-            logger.debug("Altering database. Resetting user friendly names equal to username.")
-            c_db.execute("UPDATE users SET friendly_name = NULL WHERE friendly_name = username")
-    except sqlite3.OperationalError:
-       pass
-
-    # Upgrade notify_log table from earlier versions
-    try:
-        c_db.execute("SELECT poster_url FROM notify_log")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table notify_log.")
-        c_db.execute(
-            "ALTER TABLE notify_log ADD COLUMN poster_url TEXT"
-        )
-
-    # Upgrade notify_log table from earlier versions (populate table with data from notify_log)
-    try:
-        c_db.execute("SELECT timestamp FROM notify_log")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table notify_log.")
-        c_db.execute(
-            "CREATE TABLE IF NOT EXISTS notify_log_temp (id INTEGER PRIMARY KEY AUTOINCREMENT, timestamp INTEGER, "
-            "session_key INTEGER, rating_key INTEGER, parent_rating_key INTEGER, grandparent_rating_key INTEGER, "
-            "user_id INTEGER, user TEXT, agent_id INTEGER, agent_name TEXT, notify_action TEXT, "
-            "subject_text TEXT, body_text TEXT, script_args TEXT, poster_url TEXT)"
-        )
-        c_db.execute(
-            "INSERT INTO notify_log_temp (session_key, rating_key, user_id, user, agent_id, agent_name, "
-            "poster_url, timestamp, notify_action) "
-            "SELECT session_key, rating_key, user_id, user, agent_id, agent_name, poster_url, timestamp, "
-            "notify_action FROM notify_log_temp "
-            "UNION ALL SELECT session_key, rating_key, user_id, user, agent_id, agent_name, poster_url, "
-            "on_play, 'play' FROM notify_log WHERE on_play "
-            "UNION ALL SELECT session_key, rating_key, user_id, user, agent_id, agent_name, poster_url, "
-            "on_stop, 'stop' FROM notify_log WHERE on_stop "
-            "UNION ALL SELECT session_key, rating_key, user_id, user, agent_id, agent_name, poster_url, "
-            "on_watched, 'watched' FROM notify_log WHERE on_watched "
-            "UNION ALL SELECT session_key, rating_key, user_id, user, agent_id, agent_name, poster_url, "
-            "on_pause, 'pause' FROM notify_log WHERE on_pause "
-            "UNION ALL SELECT session_key, rating_key, user_id, user, agent_id, agent_name, poster_url, "
-            "on_resume, 'resume' FROM notify_log WHERE on_resume "
-            "UNION ALL SELECT session_key, rating_key, user_id, user, agent_id, agent_name, poster_url, "
-            "on_buffer, 'buffer' FROM notify_log WHERE on_buffer "
-            "UNION ALL SELECT session_key, rating_key, user_id, user, agent_id, agent_name, poster_url, "
-            "on_created, 'created' FROM notify_log WHERE on_created "
-            "ORDER BY timestamp ")
-        c_db.execute(
-            "DROP TABLE notify_log"
-        )
-        c_db.execute(
-            "ALTER TABLE notify_log_temp RENAME TO notify_log"
-        )
-
-    # Upgrade notify_log table from earlier versions
-    try:
-        c_db.execute("SELECT notifier_id FROM notify_log")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table notify_log.")
-        c_db.execute(
-            "ALTER TABLE notify_log ADD COLUMN notifier_id INTEGER"
-        )
-
-    # Upgrade notify_log table from earlier versions
-    try:
-        c_db.execute("SELECT success FROM notify_log")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table notify_log.")
-        c_db.execute(
-            "ALTER TABLE notify_log ADD COLUMN success INTEGER DEFAULT 0"
-        )
-        c_db.execute(
-            "UPDATE notify_log SET success = 1"
-        )
-
-    # Upgrade notify_log table from earlier versions
-    try:
-        c_db.execute("SELECT tag FROM notify_log")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table notify_log.")
-        c_db.execute(
-            "ALTER TABLE notify_log ADD COLUMN tag TEXT"
-        )
-
-    # Upgrade newsletter_log table from earlier versions
-    try:
-        c_db.execute("SELECT start_time FROM newsletter_log")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table newsletter_log.")
-        c_db.execute(
-            "ALTER TABLE newsletter_log ADD COLUMN start_time INTEGER"
-        )
-        c_db.execute(
-            "ALTER TABLE newsletter_log ADD COLUMN end_time INTEGER"
-        )
-
-    # Upgrade newsletter_log table from earlier versions
-    try:
-        c_db.execute("SELECT filename FROM newsletter_log")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table newsletter_log.")
-        c_db.execute(
-            "ALTER TABLE newsletter_log ADD COLUMN filename TEXT"
-        )
-
-    # Upgrade newsletter_log table from earlier versions
-    try:
-        c_db.execute("SELECT email_msg_id FROM newsletter_log")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table newsletter_log.")
-        c_db.execute(
-            "ALTER TABLE newsletter_log ADD COLUMN email_msg_id TEXT"
-        )
-
-    # Upgrade newsletters table from earlier versions
-    try:
-        c_db.execute("SELECT id_name FROM newsletters")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table newsletters.")
-        c_db.execute(
-            "ALTER TABLE newsletters ADD COLUMN id_name TEXT NOT NULL"
-        )
-
-    # Upgrade newsletters table from earlier versions
-    try:
-        result = c_db.execute("SELECT SQL FROM sqlite_master WHERE type='table' AND name='newsletters'").fetchone()
-        if "TEXT NOT NULL DEFAULT \"0 0 * * 0\"" in result[0]:
-            logger.debug("Altering database. Updating default cron value in newsletters table.")
-            c_db.execute(
-                "CREATE TABLE newsletters_temp (id INTEGER PRIMARY KEY AUTOINCREMENT, "
-                "agent_id INTEGER, agent_name TEXT, agent_label TEXT, id_name TEXT NOT NULL, "
-                "friendly_name TEXT, newsletter_config TEXT, email_config TEXT, "
-                "subject TEXT, body TEXT, message TEXT, "
-                "cron TEXT NOT NULL DEFAULT '0 0 * * 0', active INTEGER DEFAULT 0)"
-            )
-            c_db.execute(
-                "INSERT INTO newsletters_temp (id, agent_id, agent_name, agent_label, id_name, "
-                "friendly_name, newsletter_config, email_config, subject, body, message, cron, active) "
-                "SELECT id, agent_id, agent_name, agent_label, id_name, "
-                "friendly_name, newsletter_config, email_config, subject, body, message, cron, active "
-                "FROM newsletters"
-            )
-            c_db.execute(
-                "DROP TABLE newsletters"
-            )
-            c_db.execute(
-                "ALTER TABLE newsletters_temp RENAME TO newsletters"
-            )
-    except sqlite3.OperationalError:
-        logger.warn("Unable to update default cron value in newsletters table.")
-        try:
-            c_db.execute(
-                "DROP TABLE newsletters_temp"
-            )
-        except:
-            pass
-
-    # Upgrade library_sections table from earlier versions (remove UNIQUE constraint on section_id)
-    try:
-        result = c_db.execute("SELECT SQL FROM sqlite_master WHERE type='table' AND name='library_sections'").fetchone()
-        if "section_id INTEGER UNIQUE" in result[0]:
-            logger.debug("Altering database. Removing unique constraint on section_id from library_sections table.")
-            c_db.execute(
-                "CREATE TABLE library_sections_temp (id INTEGER PRIMARY KEY AUTOINCREMENT, "
-                "server_id TEXT, section_id INTEGER, section_name TEXT, section_type TEXT, "
-                "thumb TEXT, custom_thumb_url TEXT, art TEXT, count INTEGER, parent_count INTEGER, child_count INTEGER, "
-                "do_notify INTEGER DEFAULT 1, do_notify_created INTEGER DEFAULT 1, keep_history INTEGER DEFAULT 1, "
-                "deleted_section INTEGER DEFAULT 0, UNIQUE(server_id, section_id))"
-            )
-            c_db.execute(
-                "INSERT INTO library_sections_temp (id, server_id, section_id, section_name, section_type, "
-                "thumb, custom_thumb_url, art, count, parent_count, child_count, do_notify, do_notify_created, "
-                "keep_history, deleted_section) "
-                "SELECT id, server_id, section_id, section_name, section_type, "
-                "thumb, custom_thumb_url, art, count, parent_count, child_count, do_notify, do_notify_created, "
-                "keep_history, deleted_section "
-                "FROM library_sections"
-            )
-            c_db.execute(
-                "DROP TABLE library_sections"
-            )
-            c_db.execute(
-                "ALTER TABLE library_sections_temp RENAME TO library_sections"
-            )
-    except sqlite3.OperationalError:
-        logger.warn("Unable to remove section_id unique constraint from library_sections.")
-        try:
-            c_db.execute(
-                "DROP TABLE library_sections_temp"
-            )
-        except:
-            pass
-
-    # Upgrade library_sections table from earlier versions (remove duplicated libraries)
-    try:
-        result = c_db.execute("SELECT * FROM library_sections WHERE server_id = ''").fetchall()
-        if len(result) > 0:
-            logger.debug("Altering database. Removing duplicate libraries from library_sections table.")
-            c_db.execute(
-                "DELETE FROM library_sections WHERE server_id = ''"
-            )
-    except sqlite3.OperationalError:
-        logger.warn("Unable to remove duplicate libraries from library_sections table.")
-
-    # Upgrade library_sections table from earlier versions
-    try:
-        c_db.execute("SELECT agent FROM library_sections")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table library_sections.")
-        c_db.execute(
-            "ALTER TABLE library_sections ADD COLUMN agent TEXT"
-        )
-
-    # Upgrade library_sections table from earlier versions
-    try:
-        c_db.execute("SELECT custom_art_url FROM library_sections")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table library_sections.")
-        c_db.execute(
-            "ALTER TABLE library_sections ADD COLUMN custom_art_url TEXT"
-        )
-
-    # Upgrade library_sections table from earlier versions
-    try:
-        c_db.execute("SELECT is_active FROM library_sections")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table library_sections.")
-        c_db.execute(
-            "ALTER TABLE library_sections ADD COLUMN is_active INTEGER DEFAULT 1"
-        )
-
-    # Upgrade library_sections table from earlier versions
-    try:
-        result = c_db.execute("SELECT thumb, art FROM library_sections WHERE section_id = ?",
-                              [common.LIVE_TV_SECTION_ID]).fetchone()
-        if result and (not result[0] or not result[1]):
-            logger.debug("Altering database. Updating database table library_sections.")
-            c_db.execute("UPDATE library_sections SET thumb = ?, art =? WHERE section_id = ?",
-                         [common.DEFAULT_LIVE_TV_THUMB,
-                          common.DEFAULT_LIVE_TV_ART_FULL,
-                          common.LIVE_TV_SECTION_ID])
-    except sqlite3.OperationalError:
-        pass
-
-    # Upgrade users table from earlier versions (remove UNIQUE constraint on username)
-    try:
-        result = c_db.execute("SELECT SQL FROM sqlite_master WHERE type='table' AND name='users'").fetchone()
-        if "username TEXT NOT NULL UNIQUE" in result[0]:
-            logger.debug("Altering database. Removing unique constraint on username from users table.")
-            c_db.execute(
-                "CREATE TABLE users_temp (id INTEGER PRIMARY KEY AUTOINCREMENT, "
-                "user_id INTEGER DEFAULT NULL UNIQUE, username TEXT NOT NULL, friendly_name TEXT, "
-                "thumb TEXT, custom_avatar_url TEXT, email TEXT, is_home_user INTEGER DEFAULT NULL, "
-                "is_allow_sync INTEGER DEFAULT NULL, is_restricted INTEGER DEFAULT NULL, do_notify INTEGER DEFAULT 1, "
-                "keep_history INTEGER DEFAULT 1, deleted_user INTEGER DEFAULT 0)"
-            )
-            c_db.execute(
-                "INSERT INTO users_temp (id, user_id, username, friendly_name, thumb, custom_avatar_url, "
-                "email, is_home_user, is_allow_sync, is_restricted, do_notify, keep_history, deleted_user) "
-                "SELECT id, user_id, username, friendly_name, thumb, custom_avatar_url, "
-                "email, is_home_user, is_allow_sync, is_restricted, do_notify, keep_history, deleted_user "
-                "FROM users"
-            )
-            c_db.execute(
-                "DROP TABLE users"
-            )
-            c_db.execute(
-                "ALTER TABLE users_temp RENAME TO users"
-            )
-    except sqlite3.OperationalError:
-        logger.warn("Unable to remove username unique constraint from users.")
-        try:
-            c_db.execute(
-                "DROP TABLE users_temp"
-            )
-        except:
-            pass
-
-    # Upgrade mobile_devices table from earlier versions
-    try:
-        result = c_db.execute("SELECT SQL FROM sqlite_master WHERE type='table' AND name='mobile_devices'").fetchone()
-        if "device_token TEXT NOT NULL UNIQUE" in result[0]:
-            logger.debug("Altering database. Dropping and recreating mobile_devices table.")
-            c_db.execute(
-                "DROP TABLE mobile_devices"
-            )
-            c_db.execute(
-                "CREATE TABLE IF NOT EXISTS mobile_devices (id INTEGER PRIMARY KEY AUTOINCREMENT, "
-                "device_id TEXT NOT NULL UNIQUE, device_token TEXT, device_name TEXT, friendly_name TEXT)"
-            )
-    except sqlite3.OperationalError:
-        logger.warn("Failed to recreate mobile_devices table.")
-        pass
-
-    # Upgrade mobile_devices table from earlier versions
-    try:
-        c_db.execute("SELECT last_seen FROM mobile_devices")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table mobile_devices.")
-        c_db.execute(
-            "ALTER TABLE mobile_devices ADD COLUMN last_seen INTEGER"
-        )
-
-    # Upgrade mobile_devices table from earlier versions
-    try:
-        c_db.execute("SELECT official FROM mobile_devices")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table mobile_devices.")
-        c_db.execute(
-            "ALTER TABLE mobile_devices ADD COLUMN official INTEGER DEFAULT 0"
-        )
-        # Update official mobile device flag
-        for device_id, in c_db.execute("SELECT device_id FROM mobile_devices").fetchall():
-            c_db.execute("UPDATE mobile_devices SET official = ? WHERE device_id = ?",
-                         [mobile_app.validate_onesignal_id(device_id), device_id])
-
-    # Upgrade mobile_devices table from earlier versions
-    try:
-        c_db.execute("SELECT onesignal_id FROM mobile_devices")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table mobile_devices.")
-        c_db.execute(
-            "ALTER TABLE mobile_devices ADD COLUMN onesignal_id TEXT"
-        )
-
-    # Upgrade mobile_devices table from earlier versions
-    try:
-        c_db.execute("SELECT platform FROM mobile_devices")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table mobile_devices.")
-        c_db.execute(
-            "ALTER TABLE mobile_devices ADD COLUMN platform TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE mobile_devices ADD COLUMN version TEXT"
-        )
-        # Update mobile device platforms
-        for device_id, in c_db.execute(
-                "SELECT device_id FROM mobile_devices WHERE official > 0").fetchall():
-            c_db.execute("UPDATE mobile_devices SET platform = ? WHERE device_id = ?",
-                         ["android", device_id])
-
-    # Upgrade notifiers table from earlier versions
-    try:
-        c_db.execute("SELECT custom_conditions FROM notifiers")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table notifiers.")
-        c_db.execute(
-            "ALTER TABLE notifiers ADD COLUMN custom_conditions TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE notifiers ADD COLUMN custom_conditions_logic TEXT"
-        )
-
-    # Upgrade notifiers table from earlier versions
-    try:
-        c_db.execute("SELECT on_change FROM notifiers")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table notifiers.")
-        c_db.execute(
-            "ALTER TABLE notifiers ADD COLUMN on_change INTEGER DEFAULT 0"
-        )
-        c_db.execute(
-            "ALTER TABLE notifiers ADD COLUMN on_change_subject TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE notifiers ADD COLUMN on_change_body TEXT"
-        )
-
-    # Upgrade notifiers table from earlier versions
-    try:
-        c_db.execute("SELECT on_plexpydbcorrupt FROM notifiers")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table notifiers.")
-        c_db.execute(
-            "ALTER TABLE notifiers ADD COLUMN on_plexpydbcorrupt INTEGER DEFAULT 0"
-        )
-        c_db.execute(
-            "ALTER TABLE notifiers ADD COLUMN on_plexpydbcorrupt_subject TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE notifiers ADD COLUMN on_plexpydbcorrupt_body TEXT"
-        )
-
-    # Upgrade notifiers table from earlier versions
-    try:
-        c_db.execute("SELECT on_error FROM notifiers")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table notifiers.")
-        c_db.execute(
-            "ALTER TABLE notifiers ADD COLUMN on_error INTEGER DEFAULT 0"
-        )
-        c_db.execute(
-            "ALTER TABLE notifiers ADD COLUMN on_error_subject TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE notifiers ADD COLUMN on_error_body TEXT"
-        )
-
-    # Upgrade notifiers table from earlier versions
-    try:
-        c_db.execute("SELECT on_intro FROM notifiers")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table notifiers.")
-        c_db.execute(
-            "ALTER TABLE notifiers ADD COLUMN on_intro INTEGER DEFAULT 0"
-        )
-        c_db.execute(
-            "ALTER TABLE notifiers ADD COLUMN on_intro_subject TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE notifiers ADD COLUMN on_intro_body TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE notifiers ADD COLUMN on_credits INTEGER DEFAULT 0"
-        )
-        c_db.execute(
-            "ALTER TABLE notifiers ADD COLUMN on_credits_subject TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE notifiers ADD COLUMN on_credits_body TEXT"
-        )
-
-    # Upgrade notifiers table from earlier versions
-    try:
-        c_db.execute("SELECT on_commercial FROM notifiers")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table notifiers.")
-        c_db.execute(
-            "ALTER TABLE notifiers ADD COLUMN on_commercial INTEGER DEFAULT 0"
-        )
-        c_db.execute(
-            "ALTER TABLE notifiers ADD COLUMN on_commercial_subject TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE notifiers ADD COLUMN on_commercial_body TEXT"
-        )
-
-    # Upgrade tvmaze_lookup table from earlier versions
-    try:
-        c_db.execute("SELECT rating_key FROM tvmaze_lookup")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table tvmaze_lookup.")
-        c_db.execute(
-            "ALTER TABLE tvmaze_lookup ADD COLUMN rating_key INTEGER"
-        )
-        c_db.execute(
-            "DROP INDEX IF EXISTS idx_tvmaze_lookup_thetvdb_id"
-        )
-        c_db.execute(
-            "DROP INDEX IF EXISTS idx_tvmaze_lookup_imdb_id"
-        )
-
-    # Upgrade themoviedb_lookup table from earlier versions
-    try:
-        c_db.execute("SELECT rating_key FROM themoviedb_lookup")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table themoviedb_lookup.")
-        c_db.execute(
-            "ALTER TABLE themoviedb_lookup ADD COLUMN rating_key INTEGER"
-        )
-        c_db.execute(
-            "DROP INDEX IF EXISTS idx_themoviedb_lookup_thetvdb_id"
-        )
-        c_db.execute(
-            "DROP INDEX IF EXISTS idx_themoviedb_lookup_imdb_id"
-        )
-
-    # Upgrade user_login table from earlier versions
-    try:
-        c_db.execute("SELECT success FROM user_login")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table user_login.")
-        c_db.execute(
-            "ALTER TABLE user_login ADD COLUMN success INTEGER DEFAULT 1"
-        )
-
-    # Upgrade user_login table from earlier versions
-    try:
-        c_db.execute("SELECT expiry FROM user_login")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table user_login.")
-        c_db.execute(
-            "ALTER TABLE user_login ADD COLUMN expiry TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE user_login ADD COLUMN jwt_token TEXT"
-        )
-
-    # Rename notifiers in the database
-    result = c_db.execute("SELECT agent_label FROM notifiers "
-                          "WHERE agent_label = 'XBMC' "
-                          "OR agent_label = 'OSX Notify' "
-                          "OR agent_name = 'androidapp'").fetchone()
-    if result:
-        logger.debug("Altering database. Renaming notifiers.")
-        c_db.execute(
-            "UPDATE notifiers SET agent_label = 'Kodi' WHERE agent_label = 'XBMC'"
-        )
-        c_db.execute(
-            "UPDATE notifiers SET agent_label = 'macOS Notification Center' WHERE agent_label = 'OSX Notify'"
-        )
-        c_db.execute(
-            "UPDATE notifiers SET agent_name = 'remoteapp', agent_label = 'Tautulli Remote App' "
-            "WHERE agent_name = 'androidapp'"
-        )
-
-    # Upgrade exports table from earlier versions
-    try:
-        c_db.execute("SELECT thumb_level FROM exports")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table exports.")
-        c_db.execute(
-            "ALTER TABLE exports ADD COLUMN thumb_level INTEGER DEFAULT 0"
-        )
-        c_db.execute(
-            "UPDATE exports SET thumb_level = 9 WHERE include_thumb = 1"
-        )
-        c_db.execute(
-            "ALTER TABLE exports ADD COLUMN art_level INTEGER DEFAULT 0"
-        )
-        c_db.execute(
-            "UPDATE exports SET art_level = 9 WHERE include_art = 1"
-        )
-
-    # Upgrade exports table from earlier versions
-    try:
-        c_db.execute("SELECT title FROM exports")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table exports.")
-        c_db.execute(
-            "ALTER TABLE exports ADD COLUMN title TEXT"
-        )
-        c_db.execute(
-            "ALTER TABLE exports ADD COLUMN individual_files INTEGER DEFAULT 0"
-        )
-
-    # Upgrade exports table from earlier versions
-    try:
-        c_db.execute("SELECT total_items FROM exports")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table exports.")
-        c_db.execute(
-            "ALTER TABLE exports ADD COLUMN exported_items INTEGER DEFAULT 0"
-        )
-        c_db.execute(
-            "ALTER TABLE exports ADD COLUMN total_items INTEGER DEFAULT 0"
-        )
-
-    # Upgrade exports table from earlier versions
-    try:
-        c_db.execute("SELECT logo_level FROM exports")
-    except sqlite3.OperationalError:
-        logger.debug("Altering database. Updating database table exports.")
-        c_db.execute(
-            "ALTER TABLE exports ADD COLUMN logo_level INTEGER DEFAULT 0"
-        )
-
-    # Fix unique constraints
-    try:
-        c_db.execute("DELETE FROM tvmaze_lookup "
-                     "WHERE id NOT IN (SELECT MIN(id) FROM tvmaze_lookup GROUP BY rating_key)")
-    except sqlite3.OperationalError:
-        pass
-
-    try:
-        c_db.execute("DELETE FROM themoviedb_lookup "
-                     "WHERE id NOT IN (SELECT MIN(id) FROM themoviedb_lookup GROUP BY rating_key)")
-    except sqlite3.OperationalError:
-        pass
-
-    try:
-        c_db.execute("DELETE FROM musicbrainz_lookup "
-                     "WHERE id NOT IN (SELECT MIN(id) FROM musicbrainz_lookup GROUP BY rating_key)")
-    except sqlite3.OperationalError:
-        pass
-
-    try:
-        c_db.execute("DELETE FROM image_hash_lookup "
-                     "WHERE id NOT IN (SELECT MIN(id) FROM image_hash_lookup GROUP BY img_hash)")
-    except sqlite3.OperationalError:
-        pass
-
-    try:
-        c_db.execute("DELETE FROM cloudinary_lookup "
-                     "WHERE id NOT IN (SELECT MIN(id) FROM cloudinary_lookup GROUP BY img_hash)")
-    except sqlite3.OperationalError:
-        pass
-
-    try:
-        c_db.execute("DELETE FROM imgur_lookup "
-                     "WHERE id NOT IN (SELECT MIN(id) FROM imgur_lookup GROUP BY img_hash)")
-    except sqlite3.OperationalError:
-        pass
-
-    # Add "Local" user to database as default unauthenticated user.
-    result = c_db.execute("SELECT id FROM users WHERE username = 'Local'")
-    if not result.fetchone():
-        logger.debug("User 'Local' does not exist. Adding user.")
-        c_db.execute("INSERT INTO users (user_id, username) VALUES (0, 'Local')")
-
-    # Create session_history table indices
-    c_db.execute(
-        "CREATE INDEX IF NOT EXISTS idx_session_history_media_type "
-        "ON session_history (media_type)"
-    )
-    c_db.execute(
-        "CREATE INDEX IF NOT EXISTS idx_session_history_media_type_stopped "
-        "ON session_history (media_type, stopped ASC)"
-    )
-    c_db.execute(
-        "CREATE INDEX IF NOT EXISTS idx_session_history_rating_key "
-        "ON session_history (rating_key)"
-    )
-    c_db.execute(
-        "CREATE INDEX IF NOT EXISTS idx_session_history_parent_rating_key "
-        "ON session_history (parent_rating_key)"
-    )
-    c_db.execute(
-        "CREATE INDEX IF NOT EXISTS idx_session_history_grandparent_rating_key "
-        "ON session_history (grandparent_rating_key)"
-    )
-    c_db.execute(
-        "CREATE INDEX IF NOT EXISTS idx_session_history_user "
-        "ON session_history (user)"
-    )
-    c_db.execute(
-        "CREATE INDEX IF NOT EXISTS idx_session_history_user_id "
-        "ON session_history (user_id)"
-    )
-    c_db.execute(
-        "CREATE INDEX IF NOT EXISTS idx_session_history_user_id_stopped "
-        "ON session_history (user_id, stopped ASC)"
-    )
-    c_db.execute(
-        "CREATE INDEX IF NOT EXISTS idx_session_history_section_id "
-        "ON session_history (section_id)"
-    )
-    c_db.execute(
-        "CREATE INDEX IF NOT EXISTS idx_session_history_section_id_stopped "
-        "ON session_history (section_id, stopped ASC)"
-    )
-    c_db.execute(
-        "CREATE INDEX IF NOT EXISTS idx_session_history_reference_id "
-        "ON session_history (reference_id ASC)"
-    )
-
-    # Create session_history_metadata table indices
-    c_db.execute(
-        "CREATE INDEX IF NOT EXISTS idx_session_history_metadata_rating_key "
-        "ON session_history_metadata (rating_key)"
-    )
-    c_db.execute(
-        "CREATE INDEX IF NOT EXISTS idx_session_history_metadata_guid "
-        "ON session_history_metadata (guid)"
-    )
-    c_db.execute(
-        "CREATE INDEX IF NOT EXISTS idx_session_history_metadata_live "
-        "ON session_history_metadata (live)"
-    )
-
-    # Create session_history_media_info table indices
-    c_db.execute(
-        "CREATE INDEX IF NOT EXISTS idx_session_history_media_info_transcode_decision "
-        "ON session_history_media_info (transcode_decision)"
-    )
-
-    # Create lookup table indices
-    c_db.execute(
-        "CREATE UNIQUE INDEX IF NOT EXISTS idx_tvmaze_lookup "
-        "ON tvmaze_lookup (rating_key)"
-    )
-    c_db.execute(
-        "CREATE UNIQUE INDEX IF NOT EXISTS idx_themoviedb_lookup "
-        "ON themoviedb_lookup (rating_key)"
-    )
-    c_db.execute(
-        "CREATE UNIQUE INDEX IF NOT EXISTS idx_musicbrainz_lookup "
-        "ON musicbrainz_lookup (rating_key)"
-    )
-    c_db.execute(
-        "CREATE UNIQUE INDEX IF NOT EXISTS idx_image_hash_lookup "
-        "ON image_hash_lookup (img_hash)"
-    )
-    c_db.execute(
-        "CREATE UNIQUE INDEX IF NOT EXISTS idx_cloudinary_lookup "
-        "ON cloudinary_lookup (img_hash)"
-    )
-    c_db.execute(
-        "CREATE UNIQUE INDEX IF NOT EXISTS idx_imgur_lookup "
-        "ON imgur_lookup (img_hash)"
-    )
-    c_db.execute(
-        "CREATE UNIQUE INDEX IF NOT EXISTS idx_sessions_continued "
-        "ON sessions_continued (user_id, machine_id, media_type)"
-    )
-
-    # Set database version
-    result = c_db.execute("SELECT value FROM version_info WHERE key = 'version'").fetchone()
-    if not result:
-        c_db.execute(
-            "INSERT OR REPLACE INTO version_info (key, value) VALUES ('version', ?)",
-            [common.RELEASE]
-        )
-    elif helpers.version_to_tuple(result[0]) < helpers.version_to_tuple(common.RELEASE):
-        c_db.execute(
-            "UPDATE version_info SET value = ? WHERE key = 'version'",
-            [common.RELEASE]
+                 WHERE (user_id = t1.user_id AND rating_key <> t1.rating_key AND id < t1.id)) AND user_id = t1.user_id) END) ' \
+            'FROM session_history AS t1 ' \
+            'WHERE t1.id = session_history.id) '
         )
 
     conn_db.commit()
     c_db.close()
 
-    # Migrate poster_urls to imgur_lookup table
-    try:
-        db = database.MonitorDatabase()
-        result = db.select("SELECT SQL FROM sqlite_master WHERE type='table' AND name='poster_urls'")
-        if result:
-            result = db.select("SELECT * FROM poster_urls")
-            logger.debug("Altering database. Updating database table imgur_lookup.")
-
-            data_factory = datafactory.DataFactory()
-
-            for row in result:
-                img_hash = notification_handler.set_hash_image_info(
-                    rating_key=row['rating_key'], width=1000, height=1500, fallback='poster')
-                data_factory.set_img_info(img_hash=img_hash, img_title=row['poster_title'],
-                                          img_url=row['poster_url'], delete_hash=row['delete_hash'],
-                                          service='imgur')
-
-            db.action('DROP TABLE poster_urls')
-    except sqlite3.OperationalError:
-        pass
-
-
-def upgrade():
-    if CONFIG.UPGRADE_FLAG == 0:
-        mobile_app.revalidate_onesignal_ids()
-        CONFIG.UPGRADE_FLAG = 1
-        CONFIG.write()
-
-    return
-
-
-def shutdown(restart=False, update=False, checkout=False, reset=False):
-    webstart.stop()
-
-    # Shutdown the websocket connection
-    if WEBSOCKET:
-        web_socket.shutdown()
-
-    if SCHED.running:
-        SCHED.shutdown(wait=False)
-    if activity_handler.ACTIVITY_SCHED.running:
-        activity_handler.ACTIVITY_SCHED.shutdown(wait=False)
-
-    # Stop the notification threads
-    for i in range(CONFIG.NOTIFICATION_THREADS):
-        NOTIFY_QUEUE.put(None)
+def shutdown(restart=False, update=False):
+    cherrypy.engine.exit()
+    SCHED.shutdown(wait=False)
 
     CONFIG.write()
 
+    if not restart and not update:
+        logger.info('PlexPy is shutting down...')
+
     if update:
-        logger.info("Tautulli is updating...")
+        logger.info('PlexPy is updating...')
         try:
             versioncheck.update()
         except Exception as e:
-            logger.warn("Tautulli failed to update: %s. Restarting." % e)
-
-    if checkout:
-        logger.info("Tautulli is switching the git branch...")
-        try:
-            versioncheck.checkout_git_branch()
-        except Exception as e:
-            logger.warn("Tautulli failed to switch git branch: %s. Restarting." % e)
-
-    if reset:
-        logger.info("Tautulli is resetting the git install...")
-        try:
-            versioncheck.reset_git_install()
-        except Exception as e:
-            logger.warn("Tautulli failed to reset git install: %s. Restarting." % e)
+            logger.warn('PlexPy failed to update: %s. Restarting.', e)
 
     if CREATEPID:
-        logger.info("Removing PID file: %s", PIDFILE)
-        try:
-            os.remove(PIDFILE)
-        except OSError:
-            logger.warn("Failed to remove PID file '%s'", PIDFILE)
+        logger.info('Removing pidfile %s', PIDFILE)
+        os.remove(PIDFILE)
 
     if restart:
-        logger.info("Tautulli is restarting...")
-
-        exe = sys.executable
-        if FROZEN:
-            args = [exe]
-        else:
-            args = [exe, FULL_PATH]
-        args += ARGS
-        if '--nolaunch' not in args:
-            args += ['--nolaunch']
-
-        # Separate out logger so we can shutdown logger after
-        if NOFORK:
-            logger.info("Running as service, not forking. Exiting...")
-        else:
-            logger.info("Restarting Tautulli with %s", args)
-
-        # os.execv fails with spaced names on Windows
-        # https://bugs.python.org/issue19066
-        if NOFORK:
-            pass
-        elif common.PLATFORM in ('Windows', 'Darwin'):
-            subprocess.Popen(args, cwd=os.getcwd())
-        else:
-            os.execv(exe, args)
-
-    else:
-        logger.info("Tautulli is shutting down...")
-
-    logger.shutdown()
-
-    if WIN_SYS_TRAY_ICON:
-        WIN_SYS_TRAY_ICON.shutdown()
-    elif MAC_SYS_TRAY_ICON:
-        MAC_SYS_TRAY_ICON.shutdown()
+        logger.info('PlexPy is restarting...')
+        popen_list = [sys.executable, FULL_PATH]
+        popen_list += ARGS
+        if '--nolaunch' not in popen_list:
+            popen_list += ['--nolaunch']
+        logger.info('Restarting PlexPy with %s', popen_list)
+        subprocess.Popen(popen_list, cwd=os.getcwd())
 
     os._exit(0)
 
-
 def generate_uuid():
-    return uuid.uuid4().hex
-
-
-def initialize_tracker():
-    tracker = GtagMP(
-        api_secret='Cl_LjAKUT26AS22YZwqaPw',
-        measurement_id='G-NH1M4BYM2P',
-        client_id=CONFIG.PMS_UUID
-    )
-    return tracker
-
-
-def analytics_event(name, **kwargs):
-    event = TRACKER.create_new_event(name=name)
-    event.set_event_param('name', common.PRODUCT)
-    event.set_event_param('version', common.RELEASE)
-    event.set_event_param('install', INSTALL_TYPE)
-    event.set_event_param('branch', CONFIG.GIT_BRANCH)
-    event.set_event_param('platform', common.PLATFORM)
-    event.set_event_param('platformRelease', common.PLATFORM_RELEASE)
-    event.set_event_param('platformVersion', common.PLATFORM_VERSION[:100])
-    event.set_event_param('linuxDistro', common.PLATFORM_LINUX_DISTRO)
-    event.set_event_param('pythonVersion', common.PYTHON_VERSION)
-    event.set_event_param('language', SYS_LANGUAGE)
-    event.set_event_param('encoding', SYS_ENCODING)
-    event.set_event_param('timezone', str(SYS_TIMEZONE))
-    event.set_event_param('timezoneUTCOffset', f'UTC{SYS_UTC_OFFSET}')
-
-    for key, value in kwargs.items():
-        event.set_event_param(key, value)
-
-    plex_tv = plextv.PlexTV()
-    ip_address = plex_tv.get_public_ip(output_format='text')
-    geolocation = plex_tv.get_geoip_lookup(ip_address) or {}
-
-    event.set_event_param('country', geolocation.get('country', 'Unknown'))
-    event.set_event_param('countryCode', geolocation.get('code', 'Unknown'))
-
-    if TRACKER:
-        try:
-            TRACKER.send(events=[event])
-        except Exception as e:
-            logger.warn("Failed to send analytics event for name '%s': %s" % (name, e))
-
-
-def check_folder_writable(folder, fallback, name):
-    if not folder:
-        folder = fallback
-
-    if not os.path.exists(folder):
-        try:
-            os.makedirs(folder)
-        except OSError as e:
-            logger.error("Could not create %s dir '%s': %s" % (name, folder, e))
-            if fallback and folder != fallback:
-                logger.warn("Falling back to %s dir '%s'" % (name, fallback))
-                return check_folder_writable(None, fallback, name)
-            else:
-                return folder, None
-
-    if not os.access(folder, os.W_OK):
-        logger.error("Cannot write to %s dir '%s'" % (name, folder))
-        if fallback and folder != fallback:
-            logger.warn("Falling back to %s dir '%s'" % (name, fallback))
-            return check_folder_writable(None, fallback, name)
-        else:
-            return folder, False
-
-    return folder, True
-
-
-def get_tautulli_info():
-    tautulli = {
-        'tautulli_install_type': INSTALL_TYPE,
-        'tautulli_version': common.RELEASE,
-        'tautulli_branch': CONFIG.GIT_BRANCH,
-        'tautulli_commit': CURRENT_VERSION,
-        'tautulli_platform':common.PLATFORM,
-        'tautulli_platform_release': common.PLATFORM_RELEASE,
-        'tautulli_platform_version': common.PLATFORM_VERSION,
-        'tautulli_platform_linux_distro': common.PLATFORM_LINUX_DISTRO,
-        'tautulli_platform_device_name': common.PLATFORM_DEVICE_NAME,
-        'tautulli_python_version': common.PYTHON_VERSION,
-    }
-    return tautulli
-
-
-def alert_message(msg, title='Tautulli Startup Error'):
-    if common.PLATFORM == 'Windows':
-        ctypes.windll.user32.MessageBoxW(0, str(msg), str(title), 0)
-    elif common.PLATFORM == 'Darwin':
-        applescript = 'display dialog "%s" with title "%s"' \
-                      'with icon caution buttons {"OK"}' % (msg, title)
-        os.system("osascript -e '%s'" % applescript)
+    logger.debug(u"Generating UUID...")
+    return uuid.uuid4().hex
\ No newline at end of file
diff --git a/plexpy/activity_handler.py b/plexpy/activity_handler.py
index 8c10b922..675eb891 100644
--- a/plexpy/activity_handler.py
+++ b/plexpy/activity_handler.py
@@ -1,739 +1,215 @@
-# This file is part of Tautulli.
+# This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
-import datetime
-import os
 import time
-
-from apscheduler.triggers.date import DateTrigger
-import pytz
-
 import plexpy
-from plexpy import activity_processor
-from plexpy import common
-from plexpy import datafactory
-from plexpy import helpers
-from plexpy import logger
-from plexpy import notification_handler
-from plexpy import pmsconnect
 
-
-ACTIVITY_SCHED = None
-
-RECENTLY_ADDED_QUEUE = {}
+from plexpy import logger, pmsconnect, activity_processor, threading, notification_handler
 
 
 class ActivityHandler(object):
 
     def __init__(self, timeline):
-        self.ap = activity_processor.ActivityProcessor()
         self.timeline = timeline
+        # print timeline
 
-        self.session_key = None
-        self.rating_key = None
+    def is_valid_session(self):
+        if 'sessionKey' in self.timeline:
+            if str(self.timeline['sessionKey']).isdigit():
+                return True
 
-        self.is_valid_session = ('sessionKey' in self.timeline and str(self.timeline['sessionKey']).isdigit())
-        if self.is_valid_session:
-            self.session_key = int(self.timeline['sessionKey'])
-            self.rating_key = str(self.timeline['ratingKey'])
+        return False
 
-        self.key = self.timeline.get('key')
-        self.state = self.timeline.get('state')
-        self.view_offset = self.timeline.get('viewOffset')
-        self.transcode_key = self.timeline.get('transcodeSession', '')
+    def get_session_key(self):
+        if self.is_valid_session():
+            return int(self.timeline['sessionKey'])
 
-        self.db_session = None
-        self.session = None
-        self.metadata = None
+        return None
 
-    def get_db_session(self):
-        # Retrieve the session data from our temp table
-        self.db_session = self.ap.get_session_by_key(session_key=self.session_key)
-
-    def get_metadata(self, skip_cache=False):
-        if self.metadata is None:
-            cache_key = None if skip_cache else self.session_key
-            pms_connect = pmsconnect.PmsConnect()
-            metadata = pms_connect.get_metadata_details(rating_key=self.rating_key, cache_key=cache_key)
-
-            if metadata:
-                self.metadata = metadata
-
-    def get_live_session(self, skip_cache=False):
+    def get_live_session(self):
         pms_connect = pmsconnect.PmsConnect()
-        session_list = pms_connect.get_current_activity(skip_cache=skip_cache)
+        session_list = pms_connect.get_current_activity()
 
-        if session_list:
-            for session in session_list['sessions']:
-                if int(session['session_key']) == self.session_key:
-                    # Live sessions don't have rating keys in sessions
-                    # Get it from the websocket data
-                    if not session['rating_key']:
-                        session['rating_key'] = self.rating_key
-                    session['rating_key_websocket'] = self.rating_key
-                    self.session = session
-                    return session
+        for session in session_list['sessions']:
+            if int(session['session_key']) == self.get_session_key():
+                return session
 
-    def update_db_session(self, notify=False):
-        if self.session is None:
-            self.get_live_session()
+        return None
 
-        if self.session:
-            # Update our session temp table values
-            self.ap.write_session(session=self.session, notify=notify)
-
-        self.set_session_state()
-
-    def set_session_state(self, view_offset=None):
-        self.ap.set_session_state(
-            session_key=self.session_key,
-            state=self.state,
-            view_offset=view_offset or self.view_offset,
-            stopped=helpers.timestamp()
-        )
-        self.get_db_session()
-        
-    def put_notification(self, notify_action, **kwargs):
-        notification = {'stream_data': self.db_session.copy(), 'notify_action': notify_action}
-        notification.update(kwargs)
-        plexpy.NOTIFY_QUEUE.put(notification)
+    def update_db_session(self):
+        # Update our session temp table values
+        monitor_proc = activity_processor.ActivityProcessor()
+        monitor_proc.write_session(session=self.get_live_session(), notify=False)
 
     def on_start(self):
-        self.get_live_session(skip_cache=True)
+        if self.is_valid_session():
+            logger.debug(u"PlexPy ActivityHandler :: Session %s has started." % str(self.get_session_key()))
 
-        if not self.session:
-            return
+            # Fire off notifications
+            threading.Thread(target=notification_handler.notify,
+                             kwargs=dict(stream_data=self.get_live_session(), notify_action='play')).start()
 
-        # Some DLNA clients create a new session temporarily when browsing the library
-        # Wait and get session again to make sure it is an actual session
-        if self.session['platform'] == 'DLNA':
-            time.sleep(1)
-            self.get_live_session()
-            if not self.session:
-                return
-
-        logger.debug("Tautulli ActivityHandler :: Session %s started by user %s (%s) with ratingKey %s (%s)%s."
-                        % (str(self.session['session_key']), str(self.session['user_id']), self.session['username'],
-                        str(self.session['rating_key']), self.session['full_title'], ' [Live TV]' if self.session['live'] else ''))
-
-        # Write the new session to our temp session table
-        self.update_db_session(notify=True)
-
-        # Schedule a callback to force stop a stale stream 5 minutes later
-        schedule_callback('session_key-{}'.format(self.session_key),
-                            func=force_stop_stream,
-                            args=[self.session_key, self.session['full_title'], self.session['username']],
-                            minutes=5)
-        
-        self.check_markers()
-
-    def on_stop(self, force_stop=False):
-        logger.debug("Tautulli ActivityHandler :: Session %s %sstopped."
-                        % (str(self.session_key), 'force ' if force_stop else ''))
-
-        # Set the session last_paused timestamp
-        self.ap.set_session_last_paused(session_key=self.session_key, timestamp=None)
-
-        # Update the session state and viewOffset
-        # Set force_stop to true to disable the state set
-        if not force_stop:
-            # Set the view offset equal to the duration if it is within the last 10 seconds
-            if self.db_session['duration'] > 0 and self.db_session['duration'] - self.view_offset <= 10000:
-                view_offset = self.db_session['duration']
-            else:
-                view_offset = self.view_offset
-            self.set_session_state(view_offset=view_offset)
-
-        # Write it to the history table
-        row_id = self.ap.write_session_history(session=self.db_session)
-
-        if row_id:
-            self.put_notification('on_stop')
-
-            schedule_callback('session_key-{}'.format(self.session_key), remove_job=True)
-
-            # Remove the session from our temp session table
-            logger.debug("Tautulli ActivityHandler :: Removing sessionKey %s ratingKey %s from session queue"
-                            % (str(self.session_key), str(self.rating_key)))
-            self.ap.delete_session(row_id=row_id)
-            delete_metadata_cache(self.session_key)
-        else:
-            schedule_callback('session_key-{}'.format(self.session_key),
-                                func=force_stop_stream,
-                                args=[self.session_key, self.db_session['full_title'], self.db_session['user']],
-                                seconds=30)
-
-    def on_pause(self, still_paused=False):
-        if not still_paused:
-            logger.debug("Tautulli ActivityHandler :: Session %s paused." % str(self.session_key))
-
-        # Set the session last_paused timestamp
-        self.ap.set_session_last_paused(session_key=self.session_key, timestamp=helpers.timestamp())
-
-        self.update_db_session()
-
-        if not still_paused:
-            self.put_notification('on_pause')
-
-    def on_resume(self):
-        logger.debug("Tautulli ActivityHandler :: Session %s resumed." % str(self.session_key))
-
-        # Set the session last_paused timestamp
-        self.ap.set_session_last_paused(session_key=self.session_key, timestamp=None)
-
-        self.update_db_session()
-
-        self.put_notification('on_resume')
-
-    def on_buffer(self):
-        logger.debug("Tautulli ActivityHandler :: Session %s is buffering." % self.session_key)
-
-        # Increment our buffer count
-        self.ap.increment_session_buffer_count(session_key=self.session_key)
-
-        # Get our current buffer count
-        current_buffer_count = self.ap.get_session_buffer_count(self.session_key)
-        logger.debug("Tautulli ActivityHandler :: Session %s buffer count is %s." %
-                        (self.session_key, current_buffer_count))
-
-        # Get our last triggered time
-        buffer_last_triggered = self.ap.get_session_buffer_trigger_time(self.session_key)
-
-        self.update_db_session()
-
-        time_since_last_trigger = 0
-        if buffer_last_triggered:
-            logger.debug("Tautulli ActivityHandler :: Session %s buffer last triggered at %s." %
-                            (self.session_key, buffer_last_triggered))
-            time_since_last_trigger = helpers.timestamp() - int(buffer_last_triggered)
-
-        if current_buffer_count >= plexpy.CONFIG.BUFFER_THRESHOLD and time_since_last_trigger == 0 or \
-                time_since_last_trigger >= plexpy.CONFIG.BUFFER_WAIT:
-            self.ap.set_session_buffer_trigger_time(session_key=self.session_key)
-
-            self.put_notification('on_buffer')
-
-    def on_error(self):
-        logger.debug("Tautulli ActivityHandler :: Session %s encountered an error." % str(self.session_key))
-
-        self.update_db_session()
-
-        self.put_notification('on_error')
-
-    def on_change(self):
-        logger.debug("Tautulli ActivityHandler :: Session %s has changed transcode decision." % str(self.session_key))
-
-        self.update_db_session()
-
-        self.put_notification('on_change')
-
-    def on_intro(self, marker):
-        logger.debug("Tautulli ActivityHandler :: Session %s reached intro marker." % str(self.session_key))
-
-        self.set_session_state(view_offset=marker['start_time_offset'])
-
-        self.put_notification('on_intro', marker=marker)
-
-    def on_commercial(self, marker):
-        logger.debug("Tautulli ActivityHandler :: Session %s reached commercial marker." % str(self.session_key))
-
-        self.set_session_state(view_offset=marker['start_time_offset'])
-
-        self.put_notification('on_commercial', marker=marker)
-
-    def on_credits(self, marker):
-        logger.debug("Tautulli ActivityHandler :: Session %s reached credits marker." % str(self.session_key))
-
-        self.set_session_state(view_offset=marker['start_time_offset'])
-
-        self.put_notification('on_credits', marker=marker)
-
-    def on_watched(self, marker=None):
-        logger.debug("Tautulli ActivityHandler :: Session %s watched." % str(self.session_key))
-
-        if marker:
-            self.set_session_state(view_offset=marker['start_time_offset'])
-        else:
+            # Write the new session to our temp session table
             self.update_db_session()
 
-        watched_notifiers = notification_handler.get_notify_state_enabled(
-            session=self.db_session, notify_action='on_watched', notified=False)
+    def on_stop(self, force_stop=False):
+        if self.is_valid_session():
+            logger.debug(u"PlexPy ActivityHandler :: Session %s has stopped." % str(self.get_session_key()))
 
-        for d in watched_notifiers:
-            self.put_notification('on_watched', notifier_id=d['notifier_id'])
+            # Set the session last_paused timestamp
+            ap = activity_processor.ActivityProcessor()
+            ap.set_session_last_paused(session_key=self.get_session_key(), timestamp=None)
 
-    # This function receives events from our websocket connection
-    def process(self):
-        if not self.is_valid_session:
-            return
-        
-        self.get_db_session()
-
-        if not self.db_session:
-            # We don't have this session in our table yet, start a new one.
-            if self.state != 'buffering':
-                self.on_start()
-            return
-
-        # If we already have this session in the temp table, check for state changes
-        # Re-schedule the callback to reset the 5 minutes timer
-        schedule_callback('session_key-{}'.format(self.session_key),
-                            func=force_stop_stream,
-                            args=[self.session_key, self.db_session['full_title'], self.db_session['user']],
-                            minutes=5)
-
-        last_state = self.db_session['state']
-        last_rating_key = str(self.db_session['rating_key'])
-        last_live_uuid = self.db_session['live_uuid']
-        last_transcode_key = self.db_session['transcode_key']
-        if isinstance(last_transcode_key, str):
-            last_transcode_key = last_transcode_key.split('/')[-1]
-        last_paused = self.db_session['last_paused']
-        last_rating_key_websocket = self.db_session['rating_key_websocket']
-        last_guid = self.db_session['guid']
-
-        # Get the live tv session uuid
-        this_live_uuid = self.key.split('/')[-1] if self.key.startswith('/livetv/sessions') else None
-
-        this_guid = last_guid
-        # Check guid for live TV metadata every 60 seconds
-        if self.db_session['live'] and helpers.timestamp() - self.db_session['stopped'] > 60:
-            self.get_metadata(skip_cache=True)
-            if self.metadata:
-                this_guid = self.metadata['guid']
-
-        # Check for stream offset notifications
-        self.check_markers()
-        self.check_watched()
-
-        # Make sure the same item is being played
-        if (self.rating_key == last_rating_key
-                or self.rating_key == last_rating_key_websocket
-                or this_live_uuid == last_live_uuid) \
-                and this_guid == last_guid:
             # Update the session state and viewOffset
-            if self.state == 'playing':
-                # Update the session in our temp session table
-                # if the last set temporary stopped time exceeds 60 seconds
-                if helpers.timestamp() - self.db_session['stopped'] > 60:
-                    self.update_db_session()
+            # Set force_stop to true to disable the state set
+            if not force_stop:
+                ap.set_session_state(session_key=self.get_session_key(),
+                                     state=self.timeline['state'],
+                                     view_offset=self.timeline['viewOffset'])
 
-            # Start our state checks
-            if self.state != last_state:
-                if self.state == 'paused':
-                    self.on_pause()
-                elif last_paused and self.state == 'playing':
-                    self.on_resume()
-                elif self.state == 'stopped':
-                    self.on_stop()
-                elif self.state == 'error':
-                    self.on_error()
+            # Retrieve the session data from our temp table
+            db_session = ap.get_session_by_key(session_key=self.get_session_key())
 
-            elif self.state == 'paused':
-                # Update the session last_paused timestamp
-                self.on_pause(still_paused=True)
+            # Fire off notifications
+            threading.Thread(target=notification_handler.notify,
+                             kwargs=dict(stream_data=db_session, notify_action='stop')).start()
 
-            if self.state == 'buffering':
-                self.on_buffer()
+            # Write it to the history table
+            monitor_proc = activity_processor.ActivityProcessor()
+            monitor_proc.write_session_history(session=db_session)
 
-            if self.transcode_key != last_transcode_key and self.state != 'stopped':
-                self.on_change()
+            # Remove the session from our temp session table
+            ap.delete_session(session_key=self.get_session_key())
 
-        # If a client doesn't register stop events (I'm looking at you PHT!) check if the ratingKey has changed
-        else:
-            # Manually stop and start
-            # Set force_stop so that we don't overwrite our last viewOffset
-            self.on_stop(force_stop=True)
-            self.on_start()
+    def on_pause(self):
+        if self.is_valid_session():
+            logger.debug(u"PlexPy ActivityHandler :: Session %s has been paused." % str(self.get_session_key()))
 
-    def check_markers(self):
-        # Monitor if the stream has reached the intro or credit marker offsets
-        self.get_metadata()
+            # Set the session last_paused timestamp
+            ap = activity_processor.ActivityProcessor()
+            ap.set_session_last_paused(session_key=self.get_session_key(), timestamp=int(time.time()))
 
-        marker_flag = False
+            # Update the session state and viewOffset
+            ap.set_session_state(session_key=self.get_session_key(),
+                                 state=self.timeline['state'],
+                                 view_offset=self.timeline['viewOffset'])
 
-        for marker_idx, marker in enumerate(self.metadata['markers'], start=1):
-            # Websocket events only fire every 10 seconds
-            # Check if the marker is within 10 seconds of the current viewOffset
-            if marker['start_time_offset'] - 10000 <= self.view_offset <= marker['end_time_offset']:
-                marker_flag = True
+            # Retrieve the session data from our temp table
+            db_session = ap.get_session_by_key(session_key=self.get_session_key())
 
-                if self.db_session['marker'] != marker_idx:
-                    self.ap.set_marker(session_key=self.session_key, marker_idx=marker_idx, marker_type=marker['type'])
+            # Fire off notifications
+            threading.Thread(target=notification_handler.notify,
+                             kwargs=dict(stream_data=db_session, notify_action='pause')).start()
 
-                    if self.view_offset < marker['start_time_offset']:
-                        # Schedule a callback for the exact offset of the marker
-                        schedule_callback(
-                            'session_key-{}-marker-{}'.format(self.session_key, marker_idx),
-                            func=self._marker_callback,
-                            args=[marker],
-                            milliseconds=marker['start_time_offset'] - self.view_offset
-                        )
-                    else:
-                        self._marker_callback(marker)
+    def on_resume(self):
+        if self.is_valid_session():
+            logger.debug(u"PlexPy ActivityHandler :: Session %s has been resumed." % str(self.get_session_key()))
 
-                break
+            # Set the session last_paused timestamp
+            ap = activity_processor.ActivityProcessor()
+            ap.set_session_last_paused(session_key=self.get_session_key(), timestamp=None)
 
-        if not marker_flag:
-            self.ap.set_marker(session_key=self.session_key, marker_idx=0)
+            # Update the session state and viewOffset
+            ap.set_session_state(session_key=self.get_session_key(),
+                                 state=self.timeline['state'],
+                                 view_offset=self.timeline['viewOffset'])
 
-    def _marker_callback(self, marker):
-        if self.get_live_session():
-            # Reset ActivityProcessor object for new database thread
-            self.ap = activity_processor.ActivityProcessor()
+            # Retrieve the session data from our temp table
+            db_session = ap.get_session_by_key(session_key=self.get_session_key())
 
-            if marker['type'] == 'intro':
-                self.on_intro(marker)
-            elif marker['type'] == 'commercial':
-                self.on_commercial(marker)
-            elif marker['type'] == 'credits':
-                self.on_credits(marker)
+            # Fire off notifications
+            threading.Thread(target=notification_handler.notify,
+                             kwargs=dict(stream_data=db_session, notify_action='resume')).start()
 
-                if not self.db_session['watched']:
-                    if marker['final'] and plexpy.CONFIG.WATCHED_MARKER == 1:
-                        self._marker_watched(marker)
-                    elif marker['first'] and (plexpy.CONFIG.WATCHED_MARKER in (2, 3)):
-                        self._marker_watched(marker)
+    def on_buffer(self):
+        if self.is_valid_session():
+            logger.debug(u"PlexPy ActivityHandler :: Session %s is buffering." % self.get_session_key())
+            ap = activity_processor.ActivityProcessor()
+            db_stream = ap.get_session_by_key(session_key=self.get_session_key())
 
-    def _marker_watched(self, marker):
-        if not self.db_session['watched']:
-            self._watched_callback(marker)
+            # Increment our buffer count
+            ap.increment_session_buffer_count(session_key=self.get_session_key())
 
-    def check_watched(self):
-        if plexpy.CONFIG.WATCHED_MARKER == 1 or plexpy.CONFIG.WATCHED_MARKER == 2:
-            return
+            # Get our current buffer count
+            current_buffer_count = ap.get_session_buffer_count(self.get_session_key())
+            logger.debug(u"PlexPy ActivityHandler :: Session %s buffer count is %s." %
+                         (self.get_session_key(), current_buffer_count))
 
-        # Monitor if the stream has reached the watch percentage for notifications
-        if not self.db_session['watched'] and self.state != 'buffering' and helpers.check_watched(
-            self.db_session['media_type'], self.view_offset, self.db_session['duration']
-        ):
-            self._watched_callback()
+            # Get our last triggered time
+            buffer_last_triggered = ap.get_session_buffer_trigger_time(self.get_session_key())
 
-    def _watched_callback(self, marker=None):
-        self.ap.set_watched(session_key=self.session_key)
-        self.on_watched(marker)
+            time_since_last_trigger = 0
+            if buffer_last_triggered:
+                logger.debug(u"PlexPy ActivityHandler :: Session %s buffer last triggered at %s." %
+                             (self.get_session_key(), buffer_last_triggered))
+                time_since_last_trigger = int(time.time()) - int(buffer_last_triggered)
 
-
-class TimelineHandler(object):
-
-    def __init__(self, timeline):
-        self.timeline = timeline
-
-        self.rating_key = None
-
-        self.is_item = ('itemID' in self.timeline)
-        if self.is_item:
-            self.rating_key = int(self.timeline['itemID'])
-
-        self.parent_rating_key = helpers.cast_to_int(self.timeline.get('parentItemID')) or None
-        self.grandparent_rating_key = helpers.cast_to_int(self.timeline.get('rootItemID')) or None
-        self.identifier = self.timeline.get('identifier')
-        self.state_type = self.timeline.get('state')
-        self.media_type = common.MEDIA_TYPE_VALUES.get(self.timeline.get('type'))
-        self.section_id = helpers.cast_to_int(self.timeline.get('sectionID', 0))
-        self.title = self.timeline.get('title', 'Unknown')
-        self.metadata_state = self.timeline.get('metadataState')
-        self.media_state = self.timeline.get('mediaState')
-        self.queue_size = self.timeline.get('queueSize')
+            if current_buffer_count >= plexpy.CONFIG.BUFFER_THRESHOLD and time_since_last_trigger == 0 or \
+                            time_since_last_trigger >= plexpy.CONFIG.BUFFER_WAIT:
+                ap.set_session_buffer_trigger_time(session_key=self.get_session_key())
+                threading.Thread(target=notification_handler.notify,
+                                 kwargs=dict(stream_data=db_stream, notify_action='buffer')).start()
 
     # This function receives events from our websocket connection
     def process(self):
-        if not self.is_item:
-            return
-        
-        # Return if it is not a library event (i.e. DVR EPG event)
-        if self.identifier != 'com.plexapp.plugins.library':
-            return
+        if self.is_valid_session():
+            from plexpy import helpers
 
-        global RECENTLY_ADDED_QUEUE
+            ap = activity_processor.ActivityProcessor()
+            db_session = ap.get_session_by_key(session_key=self.get_session_key())
 
-        # Add a new media item to the recently added queue
-        if self.media_type and self.section_id > 0 and self.state_type == 0 and self.metadata_state == 'created':
+            this_state = self.timeline['state']
+            this_key = str(self.timeline['ratingKey'])
 
-            if self.media_type in ('episode', 'track'):
-                grandparent_set = RECENTLY_ADDED_QUEUE.get(self.grandparent_rating_key, set())
-                grandparent_set.add(self.parent_rating_key)
-                RECENTLY_ADDED_QUEUE[self.grandparent_rating_key] = grandparent_set
+            # If we already have this session in the temp table, check for state changes
+            if db_session:
+                last_state = db_session['state']
+                last_key = str(db_session['rating_key'])
 
-                parent_set = RECENTLY_ADDED_QUEUE.get(self.parent_rating_key, set())
-                parent_set.add(self.rating_key)
-                RECENTLY_ADDED_QUEUE[self.parent_rating_key] = parent_set
+                # Make sure the same item is being played
+                if this_key == last_key:
+                    # Update the session state and viewOffset
+                    if this_state == 'playing':
+                        ap.set_session_state(session_key=self.get_session_key(),
+                                             state=this_state,
+                                             view_offset=self.timeline['viewOffset'])
+                    # Start our state checks
+                    if this_state != last_state:
+                        if this_state == 'paused':
+                            self.on_pause()
+                        elif last_state == 'paused' and this_state == 'playing':
+                            self.on_resume()
+                        elif this_state == 'stopped':
+                            self.on_stop()
+                    elif this_state == 'buffering':
+                        self.on_buffer()
+                # If a client doesn't register stop events (I'm looking at you PHT!) check if the ratingKey has changed
+                else:
+                    # Manually stop and start
+                    # Set force_stop so that we don't overwrite our last viewOffset
+                    self.on_stop(force_stop=True)
+                    self.on_start()
 
-                RECENTLY_ADDED_QUEUE[self.rating_key] = {self.grandparent_rating_key}
-
-                logger.debug("Tautulli TimelineHandler :: Library item '%s' (%s, grandparent %s) "
-                                "added to recently added queue."
-                                % (self.title, str(self.rating_key), str(self.grandparent_rating_key)))
-
-                # Schedule a callback to clear the recently added queue
-                schedule_callback('rating_key-{}'.format(self.grandparent_rating_key),
-                                    func=clear_recently_added_queue,
-                                    args=[self.grandparent_rating_key, self.title],
-                                    seconds=plexpy.CONFIG.NOTIFY_RECENTLY_ADDED_DELAY)
-
-            elif self.media_type in ('season', 'album'):
-                parent_set = RECENTLY_ADDED_QUEUE.get(self.parent_rating_key, set())
-                parent_set.add(self.rating_key)
-                RECENTLY_ADDED_QUEUE[self.parent_rating_key] = parent_set
-
-                logger.debug("Tautulli TimelineHandler :: Library item '%s' (%s , parent %s) "
-                                "added to recently added queue."
-                                % (self.title, str(self.rating_key), str(self.parent_rating_key)))
-
-                # Schedule a callback to clear the recently added queue
-                schedule_callback('rating_key-{}'.format(self.parent_rating_key),
-                                    func=clear_recently_added_queue,
-                                    args=[self.parent_rating_key, self.title],
-                                    seconds=plexpy.CONFIG.NOTIFY_RECENTLY_ADDED_DELAY)
-
-            elif self.media_type in ('movie', 'show', 'artist'):
-                queue_set = RECENTLY_ADDED_QUEUE.get(self.rating_key, set())
-                RECENTLY_ADDED_QUEUE[self.rating_key] = queue_set
-
-                logger.debug("Tautulli TimelineHandler :: Library item '%s' (%s) "
-                                "added to recently added queue."
-                                % (self.title, str(self.rating_key)))
-
-                # Schedule a callback to clear the recently added queue
-                schedule_callback('rating_key-{}'.format(self.rating_key),
-                                    func=clear_recently_added_queue,
-                                    args=[self.rating_key, self.title],
-                                    seconds=plexpy.CONFIG.NOTIFY_RECENTLY_ADDED_DELAY)
-
-        # A movie, show, or artist is done processing
-        elif self.media_type in ('movie', 'show', 'artist') and self.section_id > 0 and \
-                self.state_type == 5 and self.metadata_state is None and self.queue_size is None and \
-                self.rating_key in RECENTLY_ADDED_QUEUE:
-
-            logger.debug("Tautulli TimelineHandler :: Library item '%s' (%s) "
-                            "done processing metadata."
-                            % (self.title, str(self.rating_key)))
-
-        # An item was deleted, make sure it is removed from the queue
-        elif self.state_type == 9 and self.metadata_state == 'deleted':
-            if self.rating_key in RECENTLY_ADDED_QUEUE and not RECENTLY_ADDED_QUEUE[self.rating_key]:
-                logger.debug("Tautulli TimelineHandler :: Library item %s "
-                                "removed from recently added queue."
-                                % str(self.rating_key))
-                del_keys(self.rating_key)
-
-                # Remove the callback if the item is removed
-                schedule_callback('rating_key-{}'.format(self.rating_key), remove_job=True)
-
-
-class ReachabilityHandler(object):
-
-    def __init__(self, data):
-        self.data = data
-
-        self.is_reachable = self.data.get('reachability', False)
-
-    def remote_access_enabled(self):
-        pms_connect = pmsconnect.PmsConnect()
-        pref = pms_connect.get_server_pref(pref='PublishServerOnPlexOnlineKey')
-        return helpers.bool_true(pref)
-
-    def on_extdown(self, server_response):
-        plexpy.NOTIFY_QUEUE.put({'notify_action': 'on_extdown', 'remote_access_info': server_response})
-
-    def on_extup(self, server_response):
-        plexpy.NOTIFY_QUEUE.put({'notify_action': 'on_extup', 'remote_access_info': server_response})
-
-    def process(self):
-        # Check if remote access is enabled
-        if not self.remote_access_enabled():
-            return
-
-        # Do nothing if remote access is still up and hasn't changed
-        if self.is_reachable and plexpy.PLEX_REMOTE_ACCESS_UP:
-            return
-
-        pms_connect = pmsconnect.PmsConnect()
-        server_response = pms_connect.get_server_response()
-
-        if not server_response:
-            return
-
-        # Waiting for port mapping
-        if server_response['mapping_state'] == 'waiting':
-            logger.warn("Tautulli ReachabilityHandler :: Remote access waiting for port mapping.")
-
-        elif plexpy.PLEX_REMOTE_ACCESS_UP is not False and server_response['reason']:
-            logger.warn("Tautulli ReachabilityHandler :: Remote access failed: %s" % server_response['reason'])
-            logger.info("Tautulli ReachabilityHandler :: Plex remote access is down.")
-
-            plexpy.PLEX_REMOTE_ACCESS_UP = False
-
-            if not ACTIVITY_SCHED.get_job('on_extdown'):
-                logger.debug("Tautulli ReachabilityHandler :: Scheduling remote access down callback in %d seconds.",
-                                plexpy.CONFIG.NOTIFY_REMOTE_ACCESS_THRESHOLD)
-                schedule_callback('on_extdown', func=self.on_extdown, args=[server_response],
-                                    seconds=plexpy.CONFIG.NOTIFY_REMOTE_ACCESS_THRESHOLD)
-
-        elif plexpy.PLEX_REMOTE_ACCESS_UP is False and not server_response['reason']:
-            logger.info("Tautulli ReachabilityHandler :: Plex remote access is back up.")
-
-            plexpy.PLEX_REMOTE_ACCESS_UP = True
-
-            if ACTIVITY_SCHED.get_job('on_extdown'):
-                logger.debug("Tautulli ReachabilityHandler :: Cancelling scheduled remote access down callback.")
-                schedule_callback('on_extdown', remove_job=True)
-            else:
-                self.on_extup(server_response)
-
-        elif plexpy.PLEX_REMOTE_ACCESS_UP is None:
-            plexpy.PLEX_REMOTE_ACCESS_UP = self.is_reachable
-
-
-def del_keys(key):
-    if isinstance(key, set):
-        for child_key in key:
-            del_keys(child_key)
-    elif key in RECENTLY_ADDED_QUEUE:
-        del_keys(RECENTLY_ADDED_QUEUE.pop(key))
-
-
-def schedule_callback(id, func=None, remove_job=False, args=None, **kwargs):
-    if ACTIVITY_SCHED.get_job(id):
-        if remove_job:
-            ACTIVITY_SCHED.remove_job(id)
-        else:
-            ACTIVITY_SCHED.reschedule_job(
-                id, args=args, trigger=DateTrigger(
-                    run_date=datetime.datetime.now(pytz.UTC) + datetime.timedelta(**kwargs),
-                    timezone=pytz.UTC))
-    elif not remove_job:
-        ACTIVITY_SCHED.add_job(
-            func, args=args, id=id, trigger=DateTrigger(
-                run_date=datetime.datetime.now(pytz.UTC) + datetime.timedelta(**kwargs),
-                timezone=pytz.UTC),
-            misfire_grace_time=None)
-
-
-def force_stop_stream(session_key, title, user):
-    ap = activity_processor.ActivityProcessor()
-    session = ap.get_session_by_key(session_key=session_key)
-
-    row_id = ap.write_session_history(session=session)
-
-    if row_id:
-        plexpy.NOTIFY_QUEUE.put({'stream_data': session.copy(), 'notify_action': 'on_stop'})
-
-        # If session is written to the database successfully, remove the session from the session table
-        logger.info("Tautulli ActivityHandler :: Removing stale stream with sessionKey %s ratingKey %s from session queue"
-                    % (session['session_key'], session['rating_key']))
-        ap.delete_session(row_id=row_id)
-        delete_metadata_cache(session_key)
-
-    else:
-        session['write_attempts'] += 1
-
-        if session['write_attempts'] < plexpy.CONFIG.SESSION_DB_WRITE_ATTEMPTS:
-            logger.warn("Tautulli ActivityHandler :: Failed to write stream with sessionKey %s ratingKey %s to the database. " \
-                        "Will try again in 30 seconds. Write attempt %s."
-                        % (session['session_key'], session['rating_key'], str(session['write_attempts'])))
-            ap.increment_write_attempts(session_key=session_key)
-
-            # Reschedule for 30 seconds later
-            schedule_callback('session_key-{}'.format(session_key), func=force_stop_stream,
-                              args=[session_key, session['full_title'], session['user']], seconds=30)
-
-        else:
-            logger.warn("Tautulli ActivityHandler :: Failed to write stream with sessionKey %s ratingKey %s to the database. " \
-                        "Removing session from the database. Write attempt %s."
-                        % (session['session_key'], session['rating_key'], str(session['write_attempts'])))
-            logger.info("Tautulli ActivityHandler :: Removing stale stream with sessionKey %s ratingKey %s from session queue"
-                        % (session['session_key'], session['rating_key']))
-            ap.delete_session(session_key=session_key)
-            delete_metadata_cache(session_key)
-
-
-def clear_recently_added_queue(rating_key, title):
-    logger.debug("Tautulli TimelineHandler :: Starting callback for library item '%s' (%s) after delay.",
-                 title, str(rating_key))
-
-    child_keys = RECENTLY_ADDED_QUEUE[rating_key]
-
-    if plexpy.CONFIG.NOTIFY_GROUP_RECENTLY_ADDED_GRANDPARENT and len(child_keys) > 1:
-        on_created(rating_key, child_keys=child_keys)
-
-    elif child_keys:
-        for child_key in child_keys:
-            grandchild_keys = RECENTLY_ADDED_QUEUE.get(child_key, [])
-
-            if plexpy.CONFIG.NOTIFY_GROUP_RECENTLY_ADDED_PARENT and len(grandchild_keys) > 1:
-                on_created(child_key, child_keys=grandchild_keys)
-
-            elif grandchild_keys:
-                for grandchild_key in grandchild_keys:
-                    on_created(grandchild_key)
+                # Monitor if the stream has reached the watch percentage for notifications
+                # The only purpose of this is for notifications
+                progress_percent = helpers.get_percent(self.timeline['viewOffset'], db_session['duration'])
+                if progress_percent >= plexpy.CONFIG.NOTIFY_WATCHED_PERCENT and this_state != 'buffering':
+                    threading.Thread(target=notification_handler.notify,
+                                     kwargs=dict(stream_data=db_session, notify_action='watched')).start()
 
             else:
-                on_created(child_key)
-
-    else:
-        on_created(rating_key)
-
-    # Remove all keys
-    del_keys(rating_key)
-
-
-def on_created(rating_key, **kwargs):
-    pms_connect = pmsconnect.PmsConnect()
-    metadata = pms_connect.get_metadata_details(rating_key)
-
-    logger.debug("Tautulli TimelineHandler :: Library item '%s' (%s) added to Plex.",
-                 metadata['full_title'], str(rating_key))
-
-    if metadata:
-        notify = True
-        # now = helpers.timestamp()
-        #
-        # if helpers.cast_to_int(metadata['added_at']) < now - 86400:  # Updated more than 24 hours ago
-        #     logger.debug("Tautulli TimelineHandler :: Library item %s added more than 24 hours ago. Not notifying."
-        #                  % str(rating_key))
-        #     notify = False
-
-        data_factory = datafactory.DataFactory()
-        if 'child_keys' not in kwargs:
-            if data_factory.get_recently_added_item(rating_key):
-                logger.debug("Tautulli TimelineHandler :: Library item %s added already. Not notifying again."
-                             % str(rating_key))
-                notify = False
-
-        if notify:
-            data = {'timeline_data': metadata, 'notify_action': 'on_created'}
-            data.update(kwargs)
-            plexpy.NOTIFY_QUEUE.put(data)
-
-        all_keys = [rating_key]
-        if 'child_keys' in kwargs:
-            all_keys.extend(kwargs['child_keys'])
-
-        for key in all_keys:
-            data_factory.set_recently_added_item(key)
-
-        logger.debug("Added %s items to the recently_added database table." % str(len(all_keys)))
-
-    else:
-        logger.error("Tautulli TimelineHandler :: Unable to retrieve metadata for rating_key %s" % str(rating_key))
-
-
-def delete_metadata_cache(session_key):
-    try:
-        os.remove(os.path.join(plexpy.CONFIG.CACHE_DIR, 'session_metadata', 'metadata-sessionKey-%s.json' % session_key))
-    except OSError as e:
-        logger.error("Tautulli ActivityHandler :: Failed to remove metadata cache file (sessionKey %s): %s"
-                     % (session_key, e))
+                # We don't have this session in our table yet, start a new one.
+                if this_state != 'buffering':
+                    self.on_start()
\ No newline at end of file
diff --git a/plexpy/activity_pinger.py b/plexpy/activity_pinger.py
index 22688027..1b99cf05 100644
--- a/plexpy/activity_pinger.py
+++ b/plexpy/activity_pinger.py
@@ -1,58 +1,50 @@
-# This file is part of Tautulli.
+# This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
+
+from plexpy import logger, pmsconnect, notification_handler, database, helpers, activity_processor
 
 import threading
-
 import plexpy
-from plexpy import activity_handler
-from plexpy import activity_processor
-from plexpy import database
-from plexpy import helpers
-from plexpy import logger
-from plexpy import notification_handler
-from plexpy import plextv
-from plexpy import pmsconnect
-from plexpy import web_socket
-
+import time
 
 monitor_lock = threading.Lock()
-ext_ping_count = 0
-ext_ping_error = None
-int_ping_count = 0
 
 
 def check_active_sessions(ws_request=False):
 
     with monitor_lock:
-        monitor_db = database.MonitorDatabase()
-        monitor_process = activity_processor.ActivityProcessor()
-        db_streams = monitor_process.get_sessions()
-
-        # Clear the metadata cache
-        for stream in db_streams:
-            activity_handler.delete_metadata_cache(stream['session_key'])
-
         pms_connect = pmsconnect.PmsConnect()
         session_list = pms_connect.get_current_activity()
-
-        logger.debug("Tautulli Monitor :: Checking for active streams.")
+        monitor_db = database.MonitorDatabase()
+        monitor_process = activity_processor.ActivityProcessor()
+        # logger.debug(u"PlexPy Monitor :: Checking for active streams.")
 
         if session_list:
             media_container = session_list['sessions']
 
             # Check our temp table for what we must do with the new streams
+            db_streams = monitor_db.select('SELECT started, session_key, rating_key, media_type, title, parent_title, '
+                                           'grandparent_title, user_id, user, friendly_name, ip_address, player, '
+                                           'platform, machine_id, parent_rating_key, grandparent_rating_key, state, '
+                                           'view_offset, duration, video_decision, audio_decision, width, height, '
+                                           'container, video_codec, audio_codec, bitrate, video_resolution, '
+                                           'video_framerate, aspect_ratio, audio_channels, transcode_protocol, '
+                                           'transcode_container, transcode_video_codec, transcode_audio_codec, '
+                                           'transcode_audio_channels, transcode_width, transcode_height, '
+                                           'paused_counter, last_paused '
+                                           'FROM sessions')
             for stream in db_streams:
                 if any(d['session_key'] == str(stream['session_key']) and d['rating_key'] == str(stream['rating_key'])
                        for d in media_container):
@@ -64,41 +56,38 @@ def check_active_sessions(ws_request=False):
                             # Here we can check the play states
                             if session['state'] != stream['state']:
                                 if session['state'] == 'paused':
-                                    logger.debug("Tautulli Monitor :: Session %s paused." % stream['session_key'])
-
-                                    plexpy.NOTIFY_QUEUE.put({'stream_data': stream.copy(), 'notify_action': 'on_pause'})
+                                    # Push any notifications -
+                                    # Push it on it's own thread so we don't hold up our db actions
+                                    threading.Thread(target=notification_handler.notify,
+                                                     kwargs=dict(stream_data=stream, notify_action='pause')).start()
 
                                 if session['state'] == 'playing' and stream['state'] == 'paused':
-                                    logger.debug("Tautulli Monitor :: Session %s resumed." % stream['session_key'])
-
-                                    plexpy.NOTIFY_QUEUE.put({'stream_data': stream.copy(), 'notify_action': 'on_resume'})
-
-                                if session['state'] == 'error':
-                                    logger.debug("Tautulli Monitor :: Session %s encountered an error." % stream['session_key'])
-
-                                    plexpy.NOTIFY_QUEUE.put({'stream_data': stream.copy(), 'notify_action': 'on_error'})
+                                    # Push any notifications -
+                                    # Push it on it's own thread so we don't hold up our db actions
+                                    threading.Thread(target=notification_handler.notify,
+                                                     kwargs=dict(stream_data=stream, notify_action='resume')).start()
 
                             if stream['state'] == 'paused' and not ws_request:
                                 # The stream is still paused so we need to increment the paused_counter
                                 # Using the set config parameter as the interval, probably not the most accurate but
                                 # it will have to do for now. If it's a websocket request don't use this method.
                                 paused_counter = int(stream['paused_counter']) + plexpy.CONFIG.MONITORING_INTERVAL
-                                monitor_db.action("UPDATE sessions SET paused_counter = ? "
-                                                  "WHERE session_key = ? AND rating_key = ?",
+                                monitor_db.action('UPDATE sessions SET paused_counter = ? '
+                                                  'WHERE session_key = ? AND rating_key = ?',
                                                   [paused_counter, stream['session_key'], stream['rating_key']])
 
                             if session['state'] == 'buffering' and plexpy.CONFIG.BUFFER_THRESHOLD > 0:
                                 # The stream is buffering so we need to increment the buffer_count
                                 # We're going just increment on every monitor ping,
                                 # would be difficult to keep track otherwise
-                                monitor_db.action("UPDATE sessions SET buffer_count = buffer_count + 1 "
-                                                  "WHERE session_key = ? AND rating_key = ?",
+                                monitor_db.action('UPDATE sessions SET buffer_count = buffer_count + 1 '
+                                                  'WHERE session_key = ? AND rating_key = ?',
                                                   [stream['session_key'], stream['rating_key']])
 
                                 # Check the current buffer count and last buffer to determine if we should notify
-                                buffer_values = monitor_db.select("SELECT buffer_count, buffer_last_triggered "
-                                                                  "FROM sessions "
-                                                                  "WHERE session_key = ? AND rating_key = ?",
+                                buffer_values = monitor_db.select('SELECT buffer_count, buffer_last_triggered '
+                                                                  'FROM sessions '
+                                                                  'WHERE session_key = ? AND rating_key = ?',
                                                                   [stream['session_key'], stream['rating_key']])
 
                                 if buffer_values[0]['buffer_count'] >= plexpy.CONFIG.BUFFER_THRESHOLD:
@@ -106,154 +95,70 @@ def check_active_sessions(ws_request=False):
                                     # Push it on it's own thread so we don't hold up our db actions
                                     # Our first buffer notification
                                     if buffer_values[0]['buffer_count'] == plexpy.CONFIG.BUFFER_THRESHOLD:
-                                        logger.info("Tautulli Monitor :: User '%s' has triggered a buffer warning."
+                                        logger.info(u"PlexPy Monitor :: User '%s' has triggered a buffer warning."
                                                     % stream['user'])
                                         # Set the buffer trigger time
-                                        monitor_db.action("UPDATE sessions "
-                                                          "SET buffer_last_triggered = strftime('%s', 'now') "
-                                                          "WHERE session_key = ? AND rating_key = ?",
+                                        monitor_db.action('UPDATE sessions '
+                                                          'SET buffer_last_triggered = strftime("%s","now") '
+                                                          'WHERE session_key = ? AND rating_key = ?',
                                                           [stream['session_key'], stream['rating_key']])
 
-                                        plexpy.NOTIFY_QUEUE.put({'stream_data': stream.copy(), 'notify_action': 'on_buffer'})
-
+                                        threading.Thread(target=notification_handler.notify,
+                                                         kwargs=dict(stream_data=stream, notify_action='buffer')).start()
                                     else:
                                         # Subsequent buffer notifications after wait time
-                                        if helpers.timestamp() > buffer_values[0]['buffer_last_triggered'] + \
+                                        if int(time.time()) > buffer_values[0]['buffer_last_triggered'] + \
                                                 plexpy.CONFIG.BUFFER_WAIT:
-                                            logger.info("Tautulli Monitor :: User '%s' has triggered multiple buffer warnings."
+                                            logger.info(u"PlexPy Monitor :: User '%s' has triggered multiple buffer warnings."
                                                     % stream['user'])
                                             # Set the buffer trigger time
-                                            monitor_db.action("UPDATE sessions "
-                                                              "SET buffer_last_triggered = strftime('%s', 'now') "
-                                                              "WHERE session_key = ? AND rating_key = ?",
+                                            monitor_db.action('UPDATE sessions '
+                                                              'SET buffer_last_triggered = strftime("%s","now") '
+                                                              'WHERE session_key = ? AND rating_key = ?',
                                                               [stream['session_key'], stream['rating_key']])
 
-                                            plexpy.NOTIFY_QUEUE.put({'stream_data': stream.copy(), 'notify_action': 'on_buffer'})
+                                            threading.Thread(target=notification_handler.notify,
+                                                             kwargs=dict(stream_data=stream, notify_action='buffer')).start()
 
-                                logger.debug("Tautulli Monitor :: Session %s is buffering. Count is now %s. Last triggered %s."
-                                             % (stream['session_key'],
-                                                buffer_values[0]['buffer_count'],
-                                                buffer_values[0]['buffer_last_triggered']))
+                                logger.debug(u"PlexPy Monitor :: Stream buffering. Count is now %s. Last triggered %s."
+                                             % (buffer_values[0][0], buffer_values[0][1]))
 
                             # Check if the user has reached the offset in the media we defined as the "watched" percent
                             # Don't trigger if state is buffer as some clients push the progress to the end when
                             # buffering on start.
-                            if session['state'] != 'buffering':
-                                progress_percent = helpers.get_percent(session['view_offset'], session['duration'])
-                                notify_states = notification_handler.get_notify_state(session=session)
-                                if (session['media_type'] == 'movie' and progress_percent >= plexpy.CONFIG.MOVIE_WATCHED_PERCENT or
-                                    session['media_type'] == 'episode' and progress_percent >= plexpy.CONFIG.TV_WATCHED_PERCENT or
-                                    session['media_type'] == 'track' and progress_percent >= plexpy.CONFIG.MUSIC_WATCHED_PERCENT) \
-                                    and not any(d['notify_action'] == 'on_watched' for d in notify_states):
-                                    plexpy.NOTIFY_QUEUE.put({'stream_data': stream.copy(), 'notify_action': 'on_watched'})
+                            if session['view_offset'] and session['duration'] and session['state'] != 'buffering':
+                                if helpers.get_percent(session['view_offset'],
+                                                       session['duration']) > plexpy.CONFIG.NOTIFY_WATCHED_PERCENT:
+                                    # Push any notifications -
+                                    # Push it on it's own thread so we don't hold up our db actions
+                                    threading.Thread(target=notification_handler.notify,
+                                                     kwargs=dict(stream_data=stream, notify_action='watched')).start()
 
                 else:
                     # The user has stopped playing a stream
-                    if stream['state'] != 'stopped':
-                        logger.debug("Tautulli Monitor :: Session %s stopped." % stream['session_key'])
+                    logger.debug(u"PlexPy Monitor :: Removing sessionKey %s ratingKey %s from session queue"
+                                 % (stream['session_key'], stream['rating_key']))
+                    monitor_db.action('DELETE FROM sessions WHERE session_key = ? AND rating_key = ?',
+                                      [stream['session_key'], stream['rating_key']])
 
-                        if not stream['stopped']:
-                            # Set the stream stop time
-                            stream['stopped'] = helpers.timestamp()
-                            monitor_db.action("UPDATE sessions SET stopped = ?, state = ? "
-                                              "WHERE session_key = ? AND rating_key = ?",
-                                              [stream['stopped'], 'stopped', stream['session_key'], stream['rating_key']])
+                    # Check if the user has reached the offset in the media we defined as the "watched" percent
+                    if stream['view_offset'] and stream['duration']:
+                        if helpers.get_percent(stream['view_offset'],
+                                               stream['duration']) > plexpy.CONFIG.NOTIFY_WATCHED_PERCENT:
+                            # Push any notifications -
+                            # Push it on it's own thread so we don't hold up our db actions
+                            threading.Thread(target=notification_handler.notify,
+                                             kwargs=dict(stream_data=stream, notify_action='watched')).start()
 
-                        progress_percent = helpers.get_percent(stream['view_offset'], stream['duration'])
-                        notify_states = notification_handler.get_notify_state(session=stream)
-                        if (stream['media_type'] == 'movie' and progress_percent >= plexpy.CONFIG.MOVIE_WATCHED_PERCENT or
-                            stream['media_type'] == 'episode' and progress_percent >= plexpy.CONFIG.TV_WATCHED_PERCENT or
-                            stream['media_type'] == 'track' and progress_percent >= plexpy.CONFIG.MUSIC_WATCHED_PERCENT) \
-                            and not any(d['notify_action'] == 'on_watched' for d in notify_states):
-                            plexpy.NOTIFY_QUEUE.put({'stream_data': stream.copy(), 'notify_action': 'on_watched'})
-
-                        plexpy.NOTIFY_QUEUE.put({'stream_data': stream.copy(), 'notify_action': 'on_stop'})
+                    # Push any notifications - Push it on it's own thread so we don't hold up our db actions
+                    threading.Thread(target=notification_handler.notify,
+                                     kwargs=dict(stream_data=stream, notify_action='stop')).start()
 
                     # Write the item history on playback stop
-                    row_id = monitor_process.write_session_history(session=stream)
-
-                    if row_id:
-                        # If session is written to the database successfully, remove the session from the session table
-                        logger.debug("Tautulli Monitor :: Removing sessionKey %s ratingKey %s from session queue"
-                                     % (stream['session_key'], stream['rating_key']))
-                        monitor_process.delete_session(row_id=row_id)
-                    else:
-                        stream['write_attempts'] += 1
-
-                        if stream['write_attempts'] < plexpy.CONFIG.SESSION_DB_WRITE_ATTEMPTS:
-                            logger.warn("Tautulli Monitor :: Failed to write sessionKey %s ratingKey %s to the database. " \
-                                        "Will try again on the next pass. Write attempt %s."
-                                        % (stream['session_key'], stream['rating_key'], str(stream['write_attempts'])))
-                            monitor_process.increment_write_attempts(session_key=stream['session_key'])
-                        else:
-                            logger.warn("Tautulli Monitor :: Failed to write sessionKey %s ratingKey %s to the database. " \
-                                        "Removing session from the database. Write attempt %s."
-                                        % (stream['session_key'], stream['rating_key'], str(stream['write_attempts'])))
-                            logger.debug("Tautulli Monitor :: Removing sessionKey %s ratingKey %s from session queue"
-                                         % (stream['session_key'], stream['rating_key']))
-                            monitor_process.delete_session(session_key=stream['session_key'])
+                    monitor_process.write_session_history(session=stream)
 
             # Process the newly received session data
             for session in media_container:
-                new_session = monitor_process.write_session(session)
-
-                if new_session:
-                    logger.debug("Tautulli Monitor :: Session %s started by user %s (%s) with ratingKey %s (%s)%s."
-                                 % (str(session['session_key']), str(session['user_id']), session['username'],
-                                    str(session['rating_key']), session['full_title'], '[Live TV]' if session['live'] else ''))
-
+                monitor_process.write_session(session)
         else:
-            logger.debug("Tautulli Monitor :: Unable to read session list.")
-
-
-def connect_server(log=True, startup=False):
-    if plexpy.CONFIG.PMS_IS_CLOUD:
-        if log:
-            logger.info("Tautulli Monitor :: Checking for Plex Cloud server status...")
-
-        plex_tv = plextv.PlexTV()
-        status = plex_tv.get_cloud_server_status()
-
-        if status is True:
-            logger.info("Tautulli Monitor :: Plex Cloud server is active.")
-        elif status is False:
-            if log:
-                logger.info("Tautulli Monitor :: Plex Cloud server is sleeping.")
-        else:
-            if log:
-                logger.error("Tautulli Monitor :: Failed to retrieve Plex Cloud server status.")
-
-        if not status and startup:
-            web_socket.on_disconnect()
-
-    else:
-        status = True
-
-    if status:
-        if log and not startup:
-            logger.info("Tautulli Monitor :: Attempting to reconnect Plex server...")
-
-        try:
-            web_socket.start_thread()
-        except Exception as e:
-            logger.error("Websocket :: Unable to open connection: %s." % e)
-
-
-def check_server_updates():
-
-    with monitor_lock:
-        logger.info("Tautulli Monitor :: Checking for PMS updates...")
-
-        plex_tv = plextv.PlexTV()
-        download_info = plex_tv.get_plex_update()
-
-        if download_info:
-            logger.info("Tautulli Monitor :: Current PMS version: %s", plexpy.CONFIG.PMS_VERSION)
-
-            if download_info['update_available']:
-                logger.info("Tautulli Monitor :: PMS update available version: %s", download_info['version'])
-
-                plexpy.NOTIFY_QUEUE.put({'notify_action': 'on_pmsupdate', 'pms_download_info': download_info})
-
-            else:
-                logger.info("Tautulli Monitor :: No PMS update available.")
+            logger.debug(u"PlexPy Monitor :: Unable to read session list.")
diff --git a/plexpy/activity_processor.py b/plexpy/activity_processor.py
index db0545da..95b43fe1 100644
--- a/plexpy/activity_processor.py
+++ b/plexpy/activity_processor.py
@@ -1,764 +1,403 @@
-# This file is part of Tautulli.
+# This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
-from collections import defaultdict
-import json
+from plexpy import logger, pmsconnect, notification_handler, log_reader, database
 
+import threading
 import plexpy
-from plexpy import database
-from plexpy import helpers
-from plexpy import libraries
-from plexpy import logger
-from plexpy import pmsconnect
-from plexpy import users
+import re
+import time
 
 
 class ActivityProcessor(object):
 
+    def __init__(self):
+        self.db = database.MonitorDatabase()
+
     def write_session(self, session=None, notify=True):
         if session:
-            db = database.MonitorDatabase()
-
-            values = {'session_key': session.get('session_key', ''),
-                      'session_id': session.get('session_id', ''),
-                      'transcode_key': session.get('transcode_key', ''),
-                      'section_id': session.get('section_id', ''),
-                      'rating_key': session.get('rating_key', ''),
-                      'media_type': session.get('media_type', ''),
-                      'state': session.get('state', ''),
-                      'user_id': session.get('user_id', ''),
-                      'user': session.get('user', ''),
-                      'machine_id': session.get('machine_id', ''),
-                      'title': session.get('title', ''),
-                      'parent_title': session.get('parent_title', ''),
-                      'grandparent_title': session.get('grandparent_title', ''),
-                      'original_title': session.get('original_title', ''),
-                      'full_title': session.get('full_title', ''),
-                      'media_index': session.get('media_index', ''),
-                      'parent_media_index': session.get('parent_media_index', ''),
-                      'thumb': session.get('thumb', ''),
-                      'parent_thumb': session.get('parent_thumb', ''),
-                      'grandparent_thumb': session.get('grandparent_thumb', ''),
-                      'year': session.get('year', ''),
-                      'friendly_name': session.get('friendly_name', ''),
-                      'ip_address': session.get('ip_address', ''),
-                      'bandwidth': session.get('bandwidth', 0),
-                      'location': session.get('location', ''),
-                      'player': session.get('player', ''),
-                      'product': session.get('product', ''),
-                      'platform': session.get('platform', ''),
-                      'parent_rating_key': session.get('parent_rating_key', ''),
-                      'grandparent_rating_key': session.get('grandparent_rating_key', ''),
-                      'originally_available_at': session.get('originally_available_at', ''),
-                      'added_at': session.get('added_at', ''),
-                      'guid': session.get('guid', ''),
-                      'view_offset': session.get('view_offset', ''),
-                      'duration': session.get('duration', '') or 0,
-                      'video_decision': session.get('video_decision', ''),
-                      'audio_decision': session.get('audio_decision', ''),
-                      'transcode_decision': session.get('transcode_decision', ''),
-                      'width': session.get('width', ''),
-                      'height': session.get('height', ''),
-                      'container': session.get('container', ''),
-                      'bitrate': session.get('bitrate', ''),
-                      'video_codec': session.get('video_codec', ''),
-                      'video_bitrate': session.get('video_bitrate', ''),
-                      'video_width': session.get('video_width', ''),
-                      'video_height': session.get('video_height', ''),
-                      'video_resolution': session.get('video_resolution', ''),
-                      'video_framerate': session.get('video_framerate', ''),
-                      'video_scan_type': session.get('video_scan_type', ''),
-                      'video_full_resolution': session.get('video_full_resolution', ''),
-                      'video_dynamic_range': session.get('video_dynamic_range', ''),
-                      'aspect_ratio': session.get('aspect_ratio', ''),
-                      'audio_codec': session.get('audio_codec', ''),
-                      'audio_bitrate': session.get('audio_bitrate', ''),
-                      'audio_channels': session.get('audio_channels', ''),
-                      'audio_language': session.get('audio_language', ''),
-                      'audio_language_code': session.get('audio_language_code', ''),
-                      'subtitle_codec': session.get('subtitle_codec', ''),
-                      'subtitle_forced': session.get('subtitle_forced', ''),
-                      'subtitle_language': session.get('subtitle_language', ''),
-                      'transcode_protocol': session.get('transcode_protocol', ''),
-                      'transcode_container': session.get('transcode_container', ''),
-                      'transcode_video_codec': session.get('transcode_video_codec', ''),
-                      'transcode_audio_codec': session.get('transcode_audio_codec', ''),
-                      'transcode_audio_channels': session.get('transcode_audio_channels', ''),
-                      'transcode_width': session.get('stream_video_width', ''),
-                      'transcode_height': session.get('stream_video_height', ''),
-                      'transcode_hw_decoding': session.get('transcode_hw_decoding', ''),
-                      'transcode_hw_encoding': session.get('transcode_hw_encoding', ''),
-                      'synced_version': session.get('synced_version', ''),
-                      'synced_version_profile': session.get('synced_version_profile', ''),
-                      'optimized_version': session.get('optimized_version', ''),
-                      'optimized_version_profile': session.get('optimized_version_profile', ''),
-                      'optimized_version_title': session.get('optimized_version_title', ''),
-                      'stream_bitrate': session.get('stream_bitrate', ''),
-                      'stream_video_resolution': session.get('stream_video_resolution', ''),
-                      'quality_profile': session.get('quality_profile', ''),
-                      'stream_container_decision': session.get('stream_container_decision', ''),
-                      'stream_container': session.get('stream_container', ''),
-                      'stream_video_decision': session.get('stream_video_decision', ''),
-                      'stream_video_codec': session.get('stream_video_codec', ''),
-                      'stream_video_bitrate': session.get('stream_video_bitrate', ''),
-                      'stream_video_width': session.get('stream_video_width', ''),
-                      'stream_video_height': session.get('stream_video_height', ''),
-                      'stream_video_framerate': session.get('stream_video_framerate', ''),
-                      'stream_video_scan_type': session.get('stream_video_scan_type', ''),
-                      'stream_video_full_resolution': session.get('stream_video_full_resolution', ''),
-                      'stream_video_dynamic_range': session.get('stream_video_dynamic_range', ''),
-                      'stream_audio_decision': session.get('stream_audio_decision', ''),
-                      'stream_audio_codec': session.get('stream_audio_codec', ''),
-                      'stream_audio_bitrate': session.get('stream_audio_bitrate', ''),
-                      'stream_audio_channels': session.get('stream_audio_channels', ''),
-                      'stream_audio_language': session.get('stream_audio_language', ''),
-                      'stream_audio_language_code': session.get('stream_audio_language_code', ''),
-                      'stream_subtitle_decision': session.get('stream_subtitle_decision', ''),
-                      'stream_subtitle_codec': session.get('stream_subtitle_codec', ''),
-                      'stream_subtitle_forced': session.get('stream_subtitle_forced', ''),
-                      'stream_subtitle_language': session.get('stream_subtitle_language', ''),
-                      'subtitles': session.get('subtitles', 0),
-                      'live': session.get('live', 0),
-                      'live_uuid': session.get('live_uuid', ''),
-                      'secure': session.get('secure', None),
-                      'relayed': session.get('relayed', 0),
-                      'rating_key_websocket': session.get('rating_key_websocket', ''),
-                      'raw_stream_info': json.dumps(session),
-                      'channel_call_sign': session.get('channel_call_sign', ''),
-                      'channel_id': session.get('channel_id', ''),
-                      'channel_identifier': session.get('channel_identifier', ''),
-                      'channel_title': session.get('channel_title', ''),
-                      'channel_thumb': session.get('channel_thumb', ''),
-                      'channel_vcn': session.get('channel_vcn', ''),
-                      'stopped': helpers.timestamp()
+            values = {'session_key': session['session_key'],
+                      'rating_key': session['rating_key'],
+                      'media_type': session['media_type'],
+                      'state': session['state'],
+                      'user_id': session['user_id'],
+                      'user': session['user'],
+                      'machine_id': session['machine_id'],
+                      'title': session['title'],
+                      'parent_title': session['parent_title'],
+                      'grandparent_title': session['grandparent_title'],
+                      'friendly_name': session['friendly_name'],
+                      'player': session['player'],
+                      'platform': session['platform'],
+                      'parent_rating_key': session['parent_rating_key'],
+                      'grandparent_rating_key': session['grandparent_rating_key'],
+                      'view_offset': session['view_offset'],
+                      'duration': session['duration'],
+                      'video_decision': session['video_decision'],
+                      'audio_decision': session['audio_decision'],
+                      'width': session['width'],
+                      'height': session['height'],
+                      'container': session['container'],
+                      'video_codec': session['video_codec'],
+                      'audio_codec': session['audio_codec'],
+                      'bitrate': session['bitrate'],
+                      'video_resolution': session['video_resolution'],
+                      'video_framerate': session['video_framerate'],
+                      'aspect_ratio': session['aspect_ratio'],
+                      'audio_channels': session['audio_channels'],
+                      'transcode_protocol': session['transcode_protocol'],
+                      'transcode_container': session['transcode_container'],
+                      'transcode_video_codec': session['transcode_video_codec'],
+                      'transcode_audio_codec': session['transcode_audio_codec'],
+                      'transcode_audio_channels': session['transcode_audio_channels'],
+                      'transcode_width': session['transcode_width'],
+                      'transcode_height': session['transcode_height']
                       }
 
-            keys = {'session_key': session.get('session_key', ''),
-                    'rating_key': session.get('rating_key', '')}
+            keys = {'session_key': session['session_key'],
+                    'rating_key': session['rating_key']}
 
-            result = db.upsert('sessions', values, keys)
+            result = self.db.upsert('sessions', values, keys)
 
             if result == 'insert':
-                # If it's our first write then time stamp it.
-                started = helpers.timestamp()
-                initial_stream = self.is_initial_stream(user_id=values['user_id'],
-                                                        machine_id=values['machine_id'],
-                                                        media_type=values['media_type'],
-                                                        started=started)
-                timestamp = {'started': started, 'initial_stream': initial_stream}
-                db.upsert('sessions', timestamp, keys)
-
-                # Check if any notification agents have notifications enabled
+                # Push any notifications - Push it on it's own thread so we don't hold up our db actions
                 if notify:
-                    session.update(timestamp)
-                    plexpy.NOTIFY_QUEUE.put({'stream_data': session.copy(), 'notify_action': 'on_play'})
+                    threading.Thread(target=notification_handler.notify,
+                                     kwargs=dict(stream_data=values, notify_action='play')).start()
 
-                # Add Live TV library if it hasn't been added
-                if values['live']:
-                    libraries.add_live_tv_library()
+                started = int(time.time())
 
-                return True
+                # Try and grab IP address from logs
+                if plexpy.CONFIG.IP_LOGGING_ENABLE and plexpy.CONFIG.PMS_LOGS_FOLDER:
+                    ip_address = self.find_session_ip(rating_key=session['rating_key'],
+                                                      machine_id=session['machine_id'])
+                else:
+                    ip_address = None
+
+                timestamp = {'started': started,
+                             'ip_address': ip_address}
+
+                # If it's our first write then time stamp it.
+                self.db.upsert('sessions', timestamp, keys)
 
     def write_session_history(self, session=None, import_metadata=None, is_import=False, import_ignore_interval=0):
-        section_id = session['section_id'] if not is_import else import_metadata['section_id']
+        from plexpy import users
 
-        if not is_import:
-            user_data = users.Users()
-            user_details = user_data.get_details(user_id=session['user_id'])
-
-            library_data = libraries.Libraries()
-            library_details = library_data.get_details(section_id=section_id)
-
-            # Return false if failed to retrieve user or library details
-            if not user_details or not library_details:
-                return False
+        user_data = users.Users()
+        user_details = user_data.get_user_friendly_name(user=session['user'])
 
         if session:
             logging_enabled = False
 
-            # Reload json from raw stream info
-            if session.get('raw_stream_info'):
-                raw_stream_info = json.loads(session['raw_stream_info'])
-                # Don't overwrite id, session_key, stopped, view_offset
-                raw_stream_info.pop('id', None)
-                raw_stream_info.pop('session_key', None)
-                raw_stream_info.pop('stopped', None)
-                raw_stream_info.pop('view_offset', None)
-                session.update(raw_stream_info)
-
-            session = defaultdict(str, session)
-
             if is_import:
                 if str(session['stopped']).isdigit():
                     stopped = int(session['stopped'])
                 else:
-                    stopped = helpers.timestamp()
-            elif session['stopped']:
-                stopped = int(session['stopped'])
+                    stopped = int(time.time())
             else:
-                stopped = helpers.timestamp()
-                self.set_session_state(session_key=session['session_key'],
-                                       state='stopped',
-                                       stopped=stopped)
+                stopped = int(time.time())
 
-            if not is_import:
-                self.write_continued_session(user_id=session['user_id'],
-                                             machine_id=session['machine_id'],
-                                             media_type=session['media_type'],
-                                             stopped=stopped)
-
-            if str(session['rating_key']).isdigit() and session['media_type'] in ('movie', 'episode', 'track'):
+            if plexpy.CONFIG.VIDEO_LOGGING_ENABLE and str(session['rating_key']).isdigit() and \
+                    (session['media_type'] == 'movie' or session['media_type'] == 'episode'):
+                logging_enabled = True
+            elif plexpy.CONFIG.MUSIC_LOGGING_ENABLE and str(session['rating_key']).isdigit() and \
+                    session['media_type'] == 'track':
                 logging_enabled = True
             else:
-                logger.debug("Tautulli ActivityProcessor :: Session %s ratingKey %s not logged. "
-                             "Does not meet logging criteria. Media type is '%s'" %
-                             (session['session_key'], session['rating_key'], session['media_type']))
-                return session['id']
+                logger.debug(u"PlexPy ActivityProcessor :: ratingKey %s not logged. Does not meet logging criteria. "
+                             u"Media type is '%s'" % (session['rating_key'], session['media_type']))
 
-            real_play_time = stopped - helpers.cast_to_int(session['started']) - helpers.cast_to_int(session['paused_counter'])
+            if str(session['paused_counter']).isdigit():
+                real_play_time = stopped - session['started'] - int(session['paused_counter'])
+            else:
+                real_play_time = stopped - session['started']
 
-            if not is_import and plexpy.CONFIG.LOGGING_IGNORE_INTERVAL:
+            if plexpy.CONFIG.LOGGING_IGNORE_INTERVAL and not is_import:
                 if (session['media_type'] == 'movie' or session['media_type'] == 'episode') and \
                         (real_play_time < int(plexpy.CONFIG.LOGGING_IGNORE_INTERVAL)):
                     logging_enabled = False
-                    logger.debug("Tautulli ActivityProcessor :: Play duration for session %s ratingKey %s is %s secs "
-                                 "which is less than %s seconds, so we're not logging it." %
-                                 (session['session_key'], session['rating_key'], str(real_play_time),
-                                  plexpy.CONFIG.LOGGING_IGNORE_INTERVAL))
-            if not is_import and session['media_type'] == 'track':
-                if real_play_time < 15 and helpers.cast_to_int(session['duration']) >= 30:
+                    logger.debug(u"PlexPy ActivityProcessor :: Play duration for ratingKey %s is %s secs which is less than %s "
+                                 u"seconds, so we're not logging it." %
+                                 (session['rating_key'], str(real_play_time), plexpy.CONFIG.LOGGING_IGNORE_INTERVAL))
+            if session['media_type'] == 'track' and not is_import:
+                if real_play_time < 15 and session['duration'] >= 30:
                     logging_enabled = False
-                    logger.debug("Tautulli ActivityProcessor :: Play duration for session %s ratingKey %s is %s secs, "
-                                 "looks like it was skipped so we're not logging it" %
-                                 (session['session_key'], session['rating_key'], str(real_play_time)))
+                    logger.debug(u"PlexPy ActivityProcessor :: Play duration for ratingKey %s is %s secs, "
+                                 u"looks like it was skipped so we're not logging it" %
+                                 (session['rating_key'], str(real_play_time)))
             elif is_import and import_ignore_interval:
                 if (session['media_type'] == 'movie' or session['media_type'] == 'episode') and \
                         (real_play_time < int(import_ignore_interval)):
                     logging_enabled = False
-                    logger.debug("Tautulli ActivityProcessor :: Play duration for ratingKey %s is %s secs which is less than %s "
-                                 "seconds, so we're not logging it." %
-                                 (session['rating_key'], str(real_play_time), import_ignore_interval))
+                    logger.debug(u"PlexPy ActivityProcessor :: Play duration for ratingKey %s is %s secs which is less than %s "
+                                 u"seconds, so we're not logging it." %
+                                 (session['rating_key'], str(real_play_time),
+                                  import_ignore_interval))
 
-            if not is_import and not user_details['keep_history']:
+            if not user_details['keep_history'] and not is_import:
                 logging_enabled = False
-                logger.debug("Tautulli ActivityProcessor :: History logging for user '%s' is disabled." % user_details['username'])
-            elif not is_import and not library_details['keep_history']:
-                logging_enabled = False
-                logger.debug("Tautulli ActivityProcessor :: History logging for library '%s' is disabled." % library_details['section_name'])
+                logger.debug(u"PlexPy ActivityProcessor :: History logging for user '%s' is disabled." % session['user'])
 
             if logging_enabled:
-                db = database.MonitorDatabase()
+                # logger.debug(u"PlexPy ActivityProcessor :: Attempting to write to session_history table...")
+                query = 'INSERT INTO session_history (started, stopped, rating_key, parent_rating_key, ' \
+                        'grandparent_rating_key, media_type, user_id, user, ip_address, paused_counter, player, ' \
+                        'platform, machine_id, view_offset) VALUES ' \
+                        '(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)'
 
-                media_info = {}
+                args = [session['started'], stopped, session['rating_key'], session['parent_rating_key'],
+                        session['grandparent_rating_key'], session['media_type'], session['user_id'], session['user'],
+                        session['ip_address'], session['paused_counter'], session['player'], session['platform'],
+                        session['machine_id'], session['view_offset']]
 
-                # Fetch metadata first so we can return false if it fails
-                if not is_import:
-                    logger.debug("Tautulli ActivityProcessor :: Fetching metadata for item ratingKey %s" % session['rating_key'])
-                    pms_connect = pmsconnect.PmsConnect()
-                    if session['live']:
-                        metadata = pms_connect.get_metadata_details(rating_key=str(session['rating_key']),
-                                                                    cache_key=session['session_key'],
-                                                                    return_cache=True)
-                    else:
-                        metadata = pms_connect.get_metadata_details(rating_key=str(session['rating_key']))
+                # logger.debug(u"PlexPy ActivityProcessor :: Writing session_history transaction...")
+                self.db.action(query=query, args=args)
 
-                    if session['live'] and not metadata:
-                        metadata = session
-                    elif not metadata:
-                        return False
-                    else:
-                        if 'media_info' in metadata and len(metadata['media_info']) > 0:
-                            media_info = metadata['media_info'][0]
-                else:
-                    metadata = import_metadata
-                    ## TODO: Fix media info from imports. Temporary media info from import session.
-                    media_info = session
+                # Check if we should group the session, select the last two rows from the user
+                query = 'SELECT id, rating_key, user_id, reference_id FROM session_history \
+                         WHERE user_id = ? ORDER BY id DESC LIMIT 2 '
 
-                # logger.debug("Tautulli ActivityProcessor :: Attempting to write sessionKey %s to session_history table..."
-                #              % session['session_key'])
-                keys = {'id': None}
-                values = {'started': session['started'],
-                          'stopped': stopped,
-                          'rating_key': session['rating_key'],
-                          'parent_rating_key': session['parent_rating_key'],
-                          'grandparent_rating_key': session['grandparent_rating_key'],
-                          'media_type': session['media_type'],
-                          'user_id': session['user_id'],
-                          'user': session['user'],
-                          'ip_address': session['ip_address'],
-                          'paused_counter': session['paused_counter'],
-                          'player': session['player'],
-                          'product': session['product'],
-                          'product_version': session['product_version'],
-                          'platform': session['platform'],
-                          'platform_version': session['platform_version'],
-                          'profile': session['profile'],
-                          'machine_id': session['machine_id'],
-                          'bandwidth': session['bandwidth'],
-                          'location': session['location'],
-                          'quality_profile': session['quality_profile'],
-                          'view_offset': session['view_offset'],
-                          'section_id': metadata['section_id'],
-                          'secure': session['secure'],
-                          'relayed': session['relayed']
-                          }
+                args = [session['user_id']]
 
-                # logger.debug("Tautulli ActivityProcessor :: Writing sessionKey %s session_history transaction..."
-                #              % session['session_key'])
-                db.upsert(table_name='session_history', key_dict=keys, value_dict=values)
-
-                # Get the last insert row id
-                last_id = db.last_insert_id()
-                self.group_history(last_id, session, metadata)
+                result = self.db.select(query=query, args=args)
                 
-                # logger.debug("Tautulli ActivityProcessor :: Successfully written history item, last id for session_history is %s"
+                new_session = {'id': result[0][0],
+                               'rating_key': result[0][1],
+                               'user_id': result[0][2],
+                               'reference_id': result[0][3]}
+
+                if len(result) == 1:
+                    prev_session = None
+                else:
+                    prev_session = {'id': result[1][0],
+                                    'rating_key': result[1][1],
+                                    'user_id': result[1][2],
+                                    'reference_id': result[1][3]}
+
+                query = 'UPDATE session_history SET reference_id = ? WHERE id = ? '
+                # If rating_key is the same in the previous session, then set the reference_id to the previous row, else set the reference_id to the new id
+                if (prev_session is not None) and (prev_session['rating_key'] == new_session['rating_key']):
+                    args = [prev_session['reference_id'], new_session['id']]
+                else:
+                    args = [new_session['id'], new_session['id']]
+
+                self.db.action(query=query, args=args)
+                
+                # logger.debug(u"PlexPy ActivityProcessor :: Successfully written history item, last id for session_history is %s"
                 #              % last_id)
 
                 # Write the session_history_media_info table
+                # logger.debug(u"PlexPy ActivityProcessor :: Attempting to write to session_history_media_info table...")
+                query = 'INSERT INTO session_history_media_info (id, rating_key, video_decision, audio_decision, ' \
+                        'duration, width, height, container, video_codec, audio_codec, bitrate, video_resolution, ' \
+                        'video_framerate, aspect_ratio, audio_channels, transcode_protocol, transcode_container, ' \
+                        'transcode_video_codec, transcode_audio_codec, transcode_audio_channels, transcode_width, ' \
+                        'transcode_height) VALUES ' \
+                        '(last_insert_rowid(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)'
 
-                # logger.debug("Tautulli ActivityProcessor :: Attempting to write to sessionKey %s session_history_media_info table..."
-                #              % session['session_key'])
-                keys = {'id': last_id}
-                values = {'rating_key': session['rating_key'],
-                          'video_decision': session['video_decision'],
-                          'audio_decision': session['audio_decision'],
-                          'transcode_decision': session['transcode_decision'],
-                          'duration': session['duration'],
-                          'container': session['container'],
-                          'bitrate': session['bitrate'],
-                          'width': session['width'],
-                          'height': session['height'],
-                          'video_bit_depth': session['video_bit_depth'],
-                          'video_bitrate': session['video_bitrate'],
-                          'video_codec': session['video_codec'],
-                          'video_codec_level': session['video_codec_level'],
-                          'video_width': session['video_width'],
-                          'video_height': session['video_height'],
-                          'video_resolution': session['video_resolution'],
-                          'video_framerate': session['video_framerate'],
-                          'video_scan_type': session['video_scan_type'],
-                          'video_full_resolution': session['video_full_resolution'],
-                          'video_dynamic_range': session['video_dynamic_range'],
-                          'aspect_ratio': session['aspect_ratio'],
-                          'audio_codec': session['audio_codec'],
-                          'audio_bitrate': session['audio_bitrate'],
-                          'audio_channels': session['audio_channels'],
-                          'audio_language': session['audio_language'],
-                          'audio_language_code': session['audio_language_code'],
-                          'subtitle_codec': session['subtitle_codec'],
-                          'subtitle_forced': session['subtitle_forced'],
-                          'subtitle_language': session['subtitle_language'],
-                          'transcode_protocol': session['transcode_protocol'],
-                          'transcode_container': session['transcode_container'],
-                          'transcode_video_codec': session['transcode_video_codec'],
-                          'transcode_audio_codec': session['transcode_audio_codec'],
-                          'transcode_audio_channels': session['transcode_audio_channels'],
-                          'transcode_width': session['transcode_width'],
-                          'transcode_height': session['transcode_height'],
-                          'transcode_hw_requested': session['transcode_hw_requested'],
-                          'transcode_hw_full_pipeline': session['transcode_hw_full_pipeline'],
-                          'transcode_hw_decoding': session['transcode_hw_decoding'],
-                          'transcode_hw_decode': session['transcode_hw_decode'],
-                          'transcode_hw_decode_title': session['transcode_hw_decode_title'],
-                          'transcode_hw_encoding': session['transcode_hw_encoding'],
-                          'transcode_hw_encode': session['transcode_hw_encode'],
-                          'transcode_hw_encode_title': session['transcode_hw_encode_title'],
-                          'stream_container': session['stream_container'],
-                          'stream_container_decision': session['stream_container_decision'],
-                          'stream_bitrate': session['stream_bitrate'],
-                          'stream_video_decision': session['stream_video_decision'],
-                          'stream_video_bitrate': session['stream_video_bitrate'],
-                          'stream_video_codec': session['stream_video_codec'],
-                          'stream_video_codec_level': session['stream_video_codec_level'],
-                          'stream_video_bit_depth': session['stream_video_bit_depth'],
-                          'stream_video_height': session['stream_video_height'],
-                          'stream_video_width': session['stream_video_width'],
-                          'stream_video_resolution': session['stream_video_resolution'],
-                          'stream_video_framerate': session['stream_video_framerate'],
-                          'stream_video_scan_type': session['stream_video_scan_type'],
-                          'stream_video_full_resolution': session['stream_video_full_resolution'],
-                          'stream_video_dynamic_range': session['stream_video_dynamic_range'],
-                          'stream_audio_decision': session['stream_audio_decision'],
-                          'stream_audio_codec': session['stream_audio_codec'],
-                          'stream_audio_bitrate': session['stream_audio_bitrate'],
-                          'stream_audio_channels': session['stream_audio_channels'],
-                          'stream_audio_language': session['stream_audio_language'],
-                          'stream_audio_language_code': session['stream_audio_language_code'],
-                          'stream_subtitle_decision': session['stream_subtitle_decision'],
-                          'stream_subtitle_codec': session['stream_subtitle_codec'],
-                          'stream_subtitle_container': session['stream_subtitle_container'],
-                          'stream_subtitle_forced': session['stream_subtitle_forced'],
-                          'stream_subtitle_language': session['stream_subtitle_language'],
-                          'subtitles': session['subtitles'],
-                          'synced_version': session['synced_version'],
-                          'synced_version_profile': session['synced_version_profile'],
-                          'optimized_version': session['optimized_version'],
-                          'optimized_version_profile': session['optimized_version_profile'],
-                          'optimized_version_title': session['optimized_version_title']
-                          }
+                args = [session['rating_key'], session['video_decision'], session['audio_decision'],
+                        session['duration'], session['width'], session['height'], session['container'],
+                        session['video_codec'], session['audio_codec'], session['bitrate'],
+                        session['video_resolution'], session['video_framerate'], session['aspect_ratio'],
+                        session['audio_channels'], session['transcode_protocol'], session['transcode_container'],
+                        session['transcode_video_codec'], session['transcode_audio_codec'],
+                        session['transcode_audio_channels'], session['transcode_width'], session['transcode_height']]
 
-                # logger.debug("Tautulli ActivityProcessor :: Writing sessionKey %s session_history_media_info transaction..."
-                #              % session['session_key'])
-                db.upsert(table_name='session_history_media_info', key_dict=keys, value_dict=values)
+                # logger.debug(u"PlexPy ActivityProcessor :: Writing session_history_media_info transaction...")
+                self.db.action(query=query, args=args)
+
+                if not is_import:
+                    logger.debug(u"PlexPy ActivityProcessor :: Fetching metadata for item ratingKey %s" % session['rating_key'])
+                    pms_connect = pmsconnect.PmsConnect()
+                    result = pms_connect.get_metadata_details(rating_key=str(session['rating_key']))
+                    metadata = result['metadata']
+                else:
+                    metadata = import_metadata
 
                 # Write the session_history_metadata table
                 directors = ";".join(metadata['directors'])
                 writers = ";".join(metadata['writers'])
                 actors = ";".join(metadata['actors'])
                 genres = ";".join(metadata['genres'])
-                labels = ";".join(metadata['labels'])
 
-                marker_credits_first = None
-                marker_credits_final = None
-                for marker in metadata['markers']:
-                    if marker['first']:
-                        marker_credits_first = marker['start_time_offset']
-                    if marker['final']:
-                        marker_credits_final = marker['start_time_offset']
-
-                # logger.debug("Tautulli ActivityProcessor :: Attempting to write to sessionKey %s session_history_metadata table..."
-                #              % session['session_key'])
-                keys = {'id': last_id}
-                values = {'rating_key': session['rating_key'],
-                          'parent_rating_key': session['parent_rating_key'],
-                          'grandparent_rating_key': session['grandparent_rating_key'],
-                          'title': session['title'],
-                          'parent_title': session['parent_title'],
-                          'grandparent_title': session['grandparent_title'],
-                          'original_title': session['original_title'],
-                          'full_title': session['full_title'],
-                          'media_index': metadata['media_index'],
-                          'parent_media_index': metadata['parent_media_index'],
-                          'thumb': metadata['thumb'],
-                          'parent_thumb': metadata['parent_thumb'],
-                          'grandparent_thumb': metadata['grandparent_thumb'],
-                          'art': metadata['art'],
-                          'media_type': session['media_type'],
-                          'year': metadata['year'],
-                          'originally_available_at': metadata['originally_available_at'],
-                          'added_at': metadata['added_at'],
-                          'updated_at': metadata['updated_at'],
-                          'last_viewed_at': metadata['last_viewed_at'],
-                          'content_rating': metadata['content_rating'],
-                          'summary': metadata['summary'],
-                          'tagline': metadata['tagline'],
-                          'rating': metadata['rating'],
-                          'duration': metadata['duration'],
-                          'guid': metadata['guid'],
-                          'directors': directors,
-                          'writers': writers,
-                          'actors': actors,
-                          'genres': genres,
-                          'studio': metadata['studio'],
-                          'labels': labels,
-                          'live': session['live'],
-                          'channel_call_sign': media_info.get('channel_call_sign', session.get('channel_call_sign', '')),
-                          'channel_id': media_info.get('channel_id', session.get('channel_id', '')),
-                          'channel_identifier': media_info.get('channel_identifier', session.get('channel_identifier', '')),
-                          'channel_title': media_info.get('channel_title', session.get('channel_title', '')),
-                          'channel_thumb': media_info.get('channel_thumb', session.get('channel_thumb', '')),
-                          'channel_vcn': media_info.get('channel_vcn', session.get('channel_vcn', '')),
-                          'marker_credits_first': marker_credits_first,
-                          'marker_credits_final': marker_credits_final
-                          }
-
-                # logger.debug("Tautulli ActivityProcessor :: Writing sessionKey %s session_history_metadata transaction..."
-                #              % session['session_key'])
-                db.upsert(table_name='session_history_metadata', key_dict=keys, value_dict=values)
-
-            # Return the session row id when the session is successfully written to the database
-            return session['id']
-
-    def group_history(self, last_id, session, metadata=None):
-        new_session = prev_session = None
-        prev_watched = None
-
-        db = database.MonitorDatabase()
-
-        if session['live']:
-            # Check if we should group the session, select the last guid from the user within the last day
-            query = "SELECT session_history.id, session_history_metadata.guid, session_history.reference_id " \
-                    "FROM session_history " \
-                    "JOIN session_history_metadata ON session_history.id == session_history_metadata.id " \
-                    "WHERE session_history.id <= ? AND session_history.user_id = ? " \
-                    "AND datetime(session_history.started, 'unixepoch', 'localtime') > datetime('now', '-1 day') " \
-                    "ORDER BY session_history.id DESC LIMIT 1 "
-
-            args = [last_id, session['user_id']]
-
-            result = db.select(query=query, args=args)
-
-            if len(result) > 0:
-                new_session = {'id': last_id,
-                               'guid': metadata['guid'] if metadata else session['guid'],
-                               'reference_id': last_id}
-
-                prev_session = {'id': result[0]['id'],
-                                'guid': result[0]['guid'],
-                                'reference_id': result[0]['reference_id']}
-                
-                prev_watched = False
-
-        else:
-            # Check if we should group the session, select the last two rows from the user
-            query = "SELECT id, rating_key, view_offset, reference_id FROM session_history " \
-                    "WHERE id <= ? AND user_id = ? AND rating_key = ? ORDER BY id DESC LIMIT 2 "
-
-            args = [last_id, session['user_id'], session['rating_key']]
-
-            result = db.select(query=query, args=args)
-
-            if len(result) > 1:
-                new_session = {'id': result[0]['id'],
-                               'rating_key': result[0]['rating_key'],
-                               'view_offset': helpers.cast_to_int(result[0]['view_offset']),
-                               'reference_id': result[0]['reference_id']}
-
-                prev_session = {'id': result[1]['id'],
-                                'rating_key': result[1]['rating_key'],
-                                'view_offset': helpers.cast_to_int(result[1]['view_offset']),
-                                'reference_id': result[1]['reference_id']}
-
-                if metadata:
-                    marker_first, marker_final = helpers.get_first_final_marker(metadata['markers'])
+                # Build media item title
+                if session['media_type'] == 'episode' or session['media_type'] == 'track':
+                    full_title = '%s - %s' % (metadata['grandparent_title'], metadata['title'])
+                elif session['media_type'] == 'movie':
+                    full_title = metadata['title']
                 else:
-                    marker_first = session['marker_credits_first']
-                    marker_final = session['marker_credits_final']
+                    full_title = metadata['title']
 
-                prev_watched = helpers.check_watched(
-                    session['media_type'], prev_session['view_offset'], session['duration'],
-                    marker_first, marker_final
-                )
+                # logger.debug(u"PlexPy ActivityProcessor :: Attempting to write to session_history_metadata table...")
+                query = 'INSERT INTO session_history_metadata (id, rating_key, parent_rating_key, ' \
+                        'grandparent_rating_key, title, parent_title, grandparent_title, full_title, media_index, ' \
+                        'parent_media_index, thumb, parent_thumb, grandparent_thumb, art, media_type, year, ' \
+                        'originally_available_at, added_at, updated_at, last_viewed_at, content_rating, summary, ' \
+                        'tagline, rating, duration, guid, directors, writers, actors, genres, studio) VALUES ' \
+                        '(last_insert_rowid(), ' \
+                        '?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)'
 
-        query = "UPDATE session_history SET reference_id = ? WHERE id = ? "
+                args = [session['rating_key'], session['parent_rating_key'], session['grandparent_rating_key'],
+                        session['title'], session['parent_title'], session['grandparent_title'], full_title,
+                        metadata['index'], metadata['parent_index'], metadata['thumb'], metadata['parent_thumb'],
+                        metadata['grandparent_thumb'], metadata['art'], session['media_type'], metadata['year'],
+                        metadata['originally_available_at'], metadata['added_at'], metadata['updated_at'],
+                        metadata['last_viewed_at'], metadata['content_rating'], metadata['summary'], metadata['tagline'], 
+                        metadata['rating'], metadata['duration'], metadata['guid'], directors, writers, actors, genres, metadata['studio']]
 
-        # If previous session view offset less than watched threshold,
-        # and new session view offset is greater,
-        # then set the reference_id to the previous row,
-        # else set the reference_id to the new id
-        if prev_watched is False and (
-            not session['live'] and prev_session['view_offset'] <= new_session['view_offset'] or 
-            session['live'] and prev_session['guid'] == new_session['guid']
-        ):
-            if metadata:
-                logger.debug("Tautulli ActivityProcessor :: Grouping history for sessionKey %s", session['session_key'])
-            args = [prev_session['reference_id'], new_session['id']]
+                # logger.debug(u"PlexPy ActivityProcessor :: Writing session_history_metadata transaction...")
+                self.db.action(query=query, args=args)
 
-        else:
-            if metadata:
-                logger.debug("Tautulli ActivityProcessor :: Not grouping history for sessionKey %s", session['session_key'])
-            args = [last_id, last_id]
+    def find_session_ip(self, rating_key=None, machine_id=None):
 
-        db.action(query=query, args=args)
+        logger.debug(u"PlexPy ActivityProcessor :: Requesting log lines...")
+        log_lines = log_reader.get_log_tail(window=5000, parsed=False)
 
-    def get_sessions(self, user_id=None, ip_address=None):
-        db = database.MonitorDatabase()
-        query = "SELECT * FROM sessions"
-        args = []
+        rating_key_line = 'ratingKey=' + rating_key
+        rating_key_line_2 = 'metadata%2F' + rating_key
+        machine_id_line = 'session=' + machine_id
 
-        if str(user_id).isdigit():
-            ip = " GROUP BY ip_address" if ip_address else ""
-            query += " WHERE user_id = ?" + ip
-            args.append(user_id)
+        for line in reversed(log_lines):
+            # We're good if we find a line with both machine id and rating key
+            # This is usually when there is a transcode session
+            if machine_id_line in line and (rating_key_line in line or rating_key_line_2 in line):
+                # Currently only checking for ipv4 addresses
+                ipv4 = re.findall(r'[0-9]+(?:\.[0-9]+){3}', line)
+                if ipv4:
+                    # The logged IP will always be the first match and we don't want localhost entries
+                    if ipv4[0] != '127.0.0.1':
+                        logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s "
+                                     u"and machineIdentifier %s."
+                                     % (ipv4[0], rating_key, machine_id))
+                        return ipv4[0]
 
-        sessions = db.select(query, args)
-        return sessions
+        logger.debug(u"PlexPy ActivityProcessor :: Unable to find IP address on first pass. "
+                     u"Attempting fallback check in 5 seconds...")
+
+        # Wait for the log to catch up and read in new lines
+        time.sleep(5)
+
+        logger.debug(u"PlexPy ActivityProcessor :: Requesting log lines...")
+        log_lines = log_reader.get_log_tail(window=5000, parsed=False)
+
+        for line in reversed(log_lines):
+            if 'GET /:/timeline' in line and (rating_key_line in line or rating_key_line_2 in line):
+                # Currently only checking for ipv4 addresses
+                # This method can return the wrong IP address if more than one user
+                # starts watching the same media item around the same time.
+                ipv4 = re.findall(r'[0-9]+(?:\.[0-9]+){3}', line)
+                if ipv4:
+                    # The logged IP will always be the first match and we don't want localhost entries
+                    if ipv4[0] != '127.0.0.1':
+                        logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s." %
+                                     (ipv4[0], rating_key))
+                        return ipv4[0]
+
+        logger.debug(u"PlexPy ActivityProcessor :: Unable to find IP address on fallback search. Not logging IP address.")
+
+        return None
 
     def get_session_by_key(self, session_key=None):
-        db = database.MonitorDatabase()
         if str(session_key).isdigit():
-            session = db.select_single("SELECT * FROM sessions "
-                                            "WHERE session_key = ? ",
-                                            args=[session_key])
-            if session:
-                return session
+            result = self.db.select('SELECT started, session_key, rating_key, media_type, title, parent_title, '
+                                    'grandparent_title, user_id, user, friendly_name, ip_address, player, '
+                                    'platform, machine_id, parent_rating_key, grandparent_rating_key, state, '
+                                    'view_offset, duration, video_decision, audio_decision, width, height, '
+                                    'container, video_codec, audio_codec, bitrate, video_resolution, '
+                                    'video_framerate, aspect_ratio, audio_channels, transcode_protocol, '
+                                    'transcode_container, transcode_video_codec, transcode_audio_codec, '
+                                    'transcode_audio_channels, transcode_width, transcode_height, '
+                                    'paused_counter, last_paused '
+                                    'FROM sessions WHERE session_key = ? LIMIT 1', args=[session_key])
+            for session in result:
+                if session:
+                    return session
 
         return None
 
-    def get_session_by_id(self, session_id=None):
-        db = database.MonitorDatabase()
-        if session_id:
-            session = db.select_single("SELECT * FROM sessions "
-                                            "WHERE session_id = ? ",
-                                            args=[session_id])
-            if session:
-                return session
-
-        return None
-
-    def set_session_state(self, session_key=None, state=None, **kwargs):
-        db = database.MonitorDatabase()
-        if str(session_key).isdigit():
-            values = {}
-
+    def set_session_state(self, session_key=None, state=None, view_offset=0):
+        if str(session_key).isdigit() and str(view_offset).isdigit():
+            values = {'view_offset': int(view_offset)}
             if state:
                 values['state'] = state
 
-            for k, v in kwargs.items():
-                values[k] = v
-
             keys = {'session_key': session_key}
-            result = db.upsert('sessions', values, keys)
+            result = self.db.upsert('sessions', values, keys)
 
             return result
 
         return None
 
-    def delete_session(self, session_key=None, row_id=None):
-        db = database.MonitorDatabase()
+    def delete_session(self, session_key=None):
         if str(session_key).isdigit():
-            db.action("DELETE FROM sessions WHERE session_key = ?", [session_key])
-        elif str(row_id).isdigit():
-            db.action("DELETE FROM sessions WHERE id = ?", [row_id])
+            self.db.action('DELETE FROM sessions WHERE session_key = ?', [session_key])
 
     def set_session_last_paused(self, session_key=None, timestamp=None):
-        db = database.MonitorDatabase()
         if str(session_key).isdigit():
-            result = db.select("SELECT last_paused, paused_counter "
-                                    "FROM sessions "
-                                    "WHERE session_key = ?", args=[session_key])
+            result = self.db.select('SELECT last_paused, paused_counter '
+                                    'FROM sessions '
+                                    'WHERE session_key = ?', args=[session_key])
 
             paused_counter = None
             for session in result:
                 if session['last_paused']:
-                    paused_offset = helpers.timestamp() - int(session['last_paused'])
+                    paused_offset = int(time.time()) - int(session['last_paused'])
                     if session['paused_counter']:
                         paused_counter = int(session['paused_counter']) + int(paused_offset)
                     else:
                         paused_counter = int(paused_offset)
 
-            values = {'last_paused': timestamp}
-
+            values = {'state': 'playing',
+                      'last_paused': timestamp
+                      }
             if paused_counter:
                 values['paused_counter'] = paused_counter
 
             keys = {'session_key': session_key}
-            db.upsert('sessions', values, keys)
+            self.db.upsert('sessions', values, keys)
 
     def increment_session_buffer_count(self, session_key=None):
-        db = database.MonitorDatabase()
         if str(session_key).isdigit():
-            db.action("UPDATE sessions SET buffer_count = buffer_count + 1 "
-                           "WHERE session_key = ?",
+            self.db.action('UPDATE sessions SET buffer_count = buffer_count + 1 '
+                           'WHERE session_key = ?',
                            [session_key])
 
     def get_session_buffer_count(self, session_key=None):
-        db = database.MonitorDatabase()
         if str(session_key).isdigit():
-            buffer_count = db.select_single("SELECT buffer_count "
-                                                 "FROM sessions "
-                                                 "WHERE session_key = ?",
+            buffer_count = self.db.select_single('SELECT buffer_count '
+                                                 'FROM sessions '
+                                                 'WHERE session_key = ?',
                                                  [session_key])
             if buffer_count:
-                return buffer_count['buffer_count']
+                return buffer_count
 
             return 0
 
     def set_session_buffer_trigger_time(self, session_key=None):
-        db = database.MonitorDatabase()
         if str(session_key).isdigit():
-            db.action("UPDATE sessions SET buffer_last_triggered = strftime('%s', 'now') "
-                           "WHERE session_key = ?",
+            self.db.action('UPDATE sessions SET buffer_last_triggered = strftime("%s","now") '
+                           'WHERE session_key = ?',
                            [session_key])
 
     def get_session_buffer_trigger_time(self, session_key=None):
-        db = database.MonitorDatabase()
         if str(session_key).isdigit():
-            last_time = db.select_single("SELECT buffer_last_triggered "
-                                              "FROM sessions "
-                                              "WHERE session_key = ?",
+            last_time = self.db.select_single('SELECT buffer_last_triggered '
+                                              'FROM sessions '
+                                              'WHERE session_key = ?',
                                               [session_key])
             if last_time:
-                return last_time['buffer_last_triggered']
+                return last_time
 
-            return None
-
-    def set_temp_stopped(self):
-        db = database.MonitorDatabase()
-        stopped_time = helpers.timestamp()
-        db.action("UPDATE sessions SET stopped = ?", [stopped_time])
-
-    def increment_write_attempts(self, session_key=None):
-        db = database.MonitorDatabase()
-        if str(session_key).isdigit():
-            session = self.get_session_by_key(session_key=session_key)
-            db.action("UPDATE sessions SET write_attempts = ? WHERE session_key = ?",
-                           [session['write_attempts'] + 1, session_key])
-
-    def set_marker(self, session_key=None, marker_idx=None, marker_type=None):
-        db = database.MonitorDatabase()
-        marker_args = [
-            int(marker_type == 'intro'),
-            int(marker_type == 'commercial'),
-            int(marker_type == 'credits')
-        ]
-        db.action("UPDATE sessions SET intro = ?, commercial = ?, credits = ?, marker = ? "
-                       "WHERE session_key = ?",
-                       marker_args + [marker_idx, session_key])
-
-    def set_watched(self, session_key=None):
-        db = database.MonitorDatabase()
-        db.action("UPDATE sessions SET watched = ? "
-                       "WHERE session_key = ?",
-                       [1, session_key])
-
-    def write_continued_session(self, user_id=None, machine_id=None, media_type=None, stopped=None):
-        db = database.MonitorDatabase()
-        keys = {'user_id': user_id, 'machine_id': machine_id, 'media_type': media_type}
-        values = {'stopped': stopped}
-        db.upsert(table_name='sessions_continued', key_dict=keys, value_dict=values)
-
-    def is_initial_stream(self, user_id=None, machine_id=None, media_type=None, started=None):
-        db = database.MonitorDatabase()
-        last_session = db.select_single("SELECT stopped "
-                                             "FROM sessions_continued "
-                                             "WHERE user_id = ? AND machine_id = ? AND media_type = ? "
-                                             "ORDER BY stopped DESC",
-                                             [user_id, machine_id, media_type])
-        return int(started - last_session.get('stopped', 0) >= plexpy.CONFIG.NOTIFY_CONTINUED_SESSION_THRESHOLD)
-
-    def regroup_history(self):
-        logger.info("Tautulli ActivityProcessor :: Creating database backup...")
-        if not database.make_backup():
-            return False
-
-        logger.info("Tautulli ActivityProcessor :: Regrouping session history...")
-
-        db = database.MonitorDatabase()
-        query = (
-            "SELECT * FROM session_history "
-            "JOIN session_history_metadata ON session_history.id = session_history_metadata.id"
-        )
-        results = db.select(query)
-        count = len(results)
-        progress = 0
-
-        for i, session in enumerate(results, start=1):
-            if int(i / count * 10) > progress:
-                progress = int(i / count * 10)
-                logger.info("Tautulli ActivityProcessor :: Regrouping session history: %d%%", progress * 10)
-
-            try:
-                self.group_history(session['id'], session)
-            except Exception as e:
-                logger.error("Tautulli ActivityProcessor :: Error regrouping session history: %s", e)
-                return False
-
-        logger.info("Tautulli ActivityProcessor :: Regrouping session history complete.")
-        return True
-
-
-def regroup_history():
-    ActivityProcessor().regroup_history()
+            return None
\ No newline at end of file
diff --git a/plexpy/api.py b/plexpy/api.py
new file mode 100644
index 00000000..38714b35
--- /dev/null
+++ b/plexpy/api.py
@@ -0,0 +1,499 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+#  This file is part of PlexPy.
+#
+#  PlexPy is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  PlexPy 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 PlexPy.  If not, see <http://www.gnu.org/licenses/>.
+
+from plexpy import versioncheck, logger, plextv, pmsconnect, datafactory, graphs, users
+import os
+import plexpy
+import json
+import traceback
+import cherrypy
+import re
+import hashlib
+import random
+import xmltodict
+
+cmd_list = ['getLogs', 'getVersion', 'checkGithub', 'shutdown',
+            'getSettings', 'restart', 'update', 'getApikey', 'getHistory',
+            'getMetadata', 'getUserips', 'getPlayby', 'getSync']
+
+
+class Api(object):
+    def __init__(self, out='json'):
+
+        self.apikey = None
+        self.authenticated = False
+        self.cmd = None
+        self.kwargs = None
+        # For the responses
+        self.data = None
+        self.msg = None
+        self.result_type = 'error'
+        # Possible general params
+        self.callback = None
+        self.out_type = out
+        self.debug = None
+
+    def checkParams(self, *args, **kwargs):
+
+        if not plexpy.CONFIG.API_ENABLED:
+            self.msg = 'API not enabled'
+        elif not plexpy.CONFIG.API_KEY:
+            self.msg = 'API key not generated'
+        elif len(plexpy.CONFIG.API_KEY) != 32:
+            self.msg = 'API key not generated correctly'
+        elif 'apikey' not in kwargs:
+            self.msg = 'Parameter apikey is required'
+        elif kwargs.get('apikey', '') != plexpy.CONFIG.API_KEY:
+            self.msg = 'Invalid apikey'
+        elif 'cmd' not in kwargs:
+            self.msg = 'Parameter %s required. possible commands are: %s' % ', '.join(cmd_list)
+        elif 'cmd' in kwargs and kwargs.get('cmd') not in cmd_list:
+            self.msg = 'Unknown command, %s possible commands are: %s' % (kwargs.get('cmd', ''), ', '.join(cmd_list))
+
+        # Set default values or remove them from kwargs
+
+        self.callback = kwargs.pop('callback', None)
+        self.apikey = kwargs.pop('apikey', None)
+        self.cmd = kwargs.pop('cmd', None)
+        self.debug = kwargs.pop('debug', False)
+        # Allow override for the api.
+        self.out_type = kwargs.pop('out_type', 'json')
+
+        if self.apikey == plexpy.CONFIG.API_KEY and plexpy.CONFIG.API_ENABLED and self.cmd in cmd_list:
+            self.authenticated = True
+            self.msg = None
+        elif self.cmd == 'getApikey' and plexpy.CONFIG.API_ENABLED:
+            self.authenticated = True
+            # Remove the old error msg
+            self.msg = None
+
+        self.kwargs = kwargs
+
+    def _responds(self, result_type='success', data=None, msg=''):
+
+        if data is None:
+            data = {}
+        return {"response": {"result": result_type, "message": msg, "data": data}}
+
+    def _out_as(self, out):
+
+        if self.out_type == 'json':
+            cherrypy.response.headers['Content-Type'] = 'application/json;charset=UTF-8'
+            try:
+                out = json.dumps(out, indent=4, sort_keys=True)
+                if self.callback is not None:
+                    cherrypy.response.headers['Content-Type'] = 'application/javascript'
+                    # wrap with JSONP call if requested
+                    out = self.callback + '(' + out + ');'
+            # if we fail to generate the output fake an error
+            except Exception as e:
+                logger.info(u"API :: " + traceback.format_exc())
+                out['message'] = traceback.format_exc()
+                out['result'] = 'error'
+        if self.out_type == 'xml':
+            cherrypy.response.headers['Content-Type'] = 'application/xml'
+            try:
+                out = xmltodict.unparse(out, pretty=True)
+            except ValueError as e:
+                logger.error('Failed to parse xml result')
+                try:
+                    out['message'] = e
+                    out['result'] = 'error'
+                    out = xmltodict.unparse(out, pretty=True)
+
+                except Exception as e:
+                    logger.error('Failed to parse xml result error message')
+                    out = '''<?xml version="1.0" encoding="utf-8"?>
+                                <response>
+                                    <message>%s</message>
+                                    <data></data>
+                                    <result>error</result>
+                                </response>
+                          ''' % e
+
+        return out
+
+    def fetchData(self):
+
+        logger.info('Recieved API command: %s' % self.cmd)
+        if self.cmd and self.authenticated:
+            methodtocall = getattr(self, "_" + self.cmd)
+            # Let the traceback hit cherrypy so we can
+            # see the traceback there
+            if self.debug:
+                methodtocall(**self.kwargs)
+            else:
+                try:
+                    methodtocall(**self.kwargs)
+                except Exception as e:
+                    logger.error(traceback.format_exc())
+
+        # Im just lazy, fix me plx
+        if self.data or isinstance(self.data, (dict, list)):
+            if len(self.data):
+                self.result_type = 'success'
+
+        return self._out_as(self._responds(result_type=self.result_type, msg=self.msg, data=self.data))
+
+    def _dic_from_query(self, query):
+
+        myDB = database.DBConnection()
+        rows = myDB.select(query)
+
+        rows_as_dic = []
+
+        for row in rows:
+            row_as_dic = dict(zip(row.keys(), row))
+            rows_as_dic.append(row_as_dic)
+
+        return rows_as_dic
+
+    def _getApikey(self, username='', password=''):
+        """ Returns api key, requires username and password is active """
+
+        apikey = hashlib.sha224(str(random.getrandbits(256))).hexdigest()[0:32]
+        if plexpy.CONFIG.HTTP_USERNAME and plexpy.CONFIG.HTTP_PASSWORD:
+            if username == plexpy.HTTP_USERNAME and password == plexpy.CONFIG.HTTP_PASSWORD:
+                if plexpy.CONFIG.API_KEY:
+                    self.data = plexpy.CONFIG.API_KEY
+                else:
+                    self.data = apikey
+                    plexpy.CONFIG.API_KEY = apikey
+                    plexpy.CONFIG.write()
+            else:
+                self.msg = 'Authentication is enabled, please add the correct username and password to the parameters'
+        else:
+            if plexpy.CONFIG.API_KEY:
+                self.data = plexpy.CONFIG.API_KEY
+            else:
+                # Make a apikey if the doesn't exist
+                self.data = apikey
+                plexpy.CONFIG.API_KEY = apikey
+                plexpy.CONFIG.write()
+
+        return self.data
+
+    def _getLogs(self, sort='', search='', order='desc', regex='', **kwargs):
+        """
+            Returns the log
+
+            Returns [{"response":
+                                {"msg": "Hey",
+                                 "result": "success"},
+                                 "data": [{"time": "29-sept.2015",
+                                            "thread: "MainThread",
+                                            "msg: "Called x from y",
+                                            "loglevel": "DEBUG"
+                                           }
+                                        ]
+
+                                }
+                    ]
+        """
+        logfile = os.path.join(plexpy.CONFIG.LOG_DIR, 'plexpy.log')
+        templog = []
+        start = int(kwargs.get('start', 0))
+        end = int(kwargs.get('end', 0))
+
+        if regex:
+            logger.debug('Filtering log using regex %s' % regex)
+            reg = re.compile('u' + regex, flags=re.I)
+
+        for line in open(logfile, 'r').readlines():
+            temp_loglevel_and_time = None
+
+            try:
+                temp_loglevel_and_time = line.split('- ')
+                loglvl = temp_loglevel_and_time[1].split(' :')[0].strip()
+                tl_tread = line.split(' :: ')
+                if loglvl is None:
+                    msg = line.replace('\n', '')
+                else:
+                    msg = line.split(' : ')[1].replace('\n', '')
+                thread = tl_tread[1].split(' : ')[0]
+            except IndexError:
+                # We assume this is a traceback
+                tl = (len(templog) - 1)
+                templog[tl]['msg'] += line.replace('\n', '')
+                continue
+
+            if len(line) > 1 and temp_loglevel_and_time is not None and loglvl in line:
+
+                d = {
+                    'time': temp_loglevel_and_time[0],
+                    'loglevel': loglvl,
+                    'msg': msg.replace('\n', ''),
+                    'thread': thread
+                }
+                templog.append(d)
+
+        if end > 0:
+                logger.debug('Slicing the log from %s to %s' % (start, end))
+                templog = templog[start:end]
+
+        if sort:
+            logger.debug('Sorting log based on %s' % sort)
+            templog = sorted(templog, key=lambda k: k[sort])
+
+        if search:
+            logger.debug('Searching log values for %s' % search)
+            tt = [d for d in templog for k, v in d.items() if search.lower() in v.lower()]
+
+            if len(tt):
+                templog = tt
+
+        if regex:
+            tt = []
+            for l in templog:
+                stringdict = ' '.join('{}{}'.format(k, v) for k, v in l.items())
+                if reg.search(stringdict):
+                    tt.append(l)
+
+            if len(tt):
+                templog = tt
+
+        if order == 'desc':
+            templog = templog[::-1]
+
+        self.data = templog
+        return templog
+
+    def _getVersion(self, **kwargs):
+        self.data = {
+            'git_path': plexpy.CONFIG.GIT_PATH,
+            'install_type': plexpy.INSTALL_TYPE,
+            'current_version': plexpy.CURRENT_VERSION,
+            'latest_version': plexpy.LATEST_VERSION,
+            'commits_behind': plexpy.COMMITS_BEHIND,
+        }
+        self.result_type = 'success'
+
+    def _checkGithub(self, **kwargs):
+        versioncheck.checkGithub()
+        self._getVersion()
+
+    def _shutdown(self, **kwargs):
+        plexpy.SIGNAL = 'shutdown'
+        self.msg = 'Shutting down plexpy'
+        self.result_type = 'success'
+
+    def _restart(self, **kwargs):
+        plexpy.SIGNAL = 'restart'
+        self.msg = 'Restarting plexpy'
+        self.result_type = 'success'
+
+    def _update(self, **kwargs):
+        plexpy.SIGNAL = 'update'
+        self.msg = 'Updating plexpy'
+        self.result_type = 'success'
+
+    def _getHistory(self, user=None, user_id=None, rating_key='', parent_rating_key='', grandparent_rating_key='', start_date='', **kwargs):
+
+        custom_where = []
+        if user_id:
+            custom_where = [['user_id', user_id]]
+        elif user:
+            custom_where = [['user', user]]
+        if 'rating_key' in kwargs:
+            rating_key = kwargs.get('rating_key', "")
+            custom_where = [['rating_key', rating_key]]
+        if 'parent_rating_key' in kwargs:
+            rating_key = kwargs.get('parent_rating_key', "")
+            custom_where = [['parent_rating_key', rating_key]]
+        if 'grandparent_rating_key' in kwargs:
+            rating_key = kwargs.get('grandparent_rating_key', "")
+            custom_where = [['grandparent_rating_key', rating_key]]
+        if 'start_date' in kwargs:
+            start_date = kwargs.get('start_date', "")
+            custom_where = [['strftime("%Y-%m-%d", datetime(date, "unixepoch", "localtime"))', start_date]]
+
+        data_factory = datafactory.DataFactory()
+        history = data_factory.get_history(kwargs=kwargs, custom_where=custom_where)
+
+        self.data = history
+        return self.data
+
+    def _getSync(self, machine_id=None, user_id=None, **kwargs):
+
+        pms_connect = pmsconnect.PmsConnect()
+        server_id = pms_connect.get_server_identity()
+
+        plex_tv = plextv.PlexTV()
+        if not machine_id:
+            result = plex_tv.get_synced_items(machine_id=server_id['machine_identifier'], user_id=user_id)
+        else:
+            result = plex_tv.get_synced_items(machine_id=machine_id, user_id=user_id)
+
+        if result:
+            self.data = result
+            return result
+        else:
+            self.msg = 'Unable to retrieve sync data for user'
+            logger.warn('Unable to retrieve sync data for user.')
+
+    def _getMetadata(self, rating_key='', **kwargs):
+
+        pms_connect = pmsconnect.PmsConnect()
+        result = pms_connect.get_metadata(rating_key, 'dict')
+
+        if result:
+            self.data = result
+            return result
+        else:
+            self.msg = 'Unable to retrive metadata %s' % rating_key
+            logger.warn('Unable to retrieve data.')
+
+    def _getSettings(self):
+        interface_dir = os.path.join(plexpy.PROG_DIR, 'data/interfaces/')
+        interface_list = [name for name in os.listdir(interface_dir) if
+                          os.path.isdir(os.path.join(interface_dir, name))]
+
+        config = {
+            "http_host": plexpy.CONFIG.HTTP_HOST,
+            "http_username": plexpy.CONFIG.HTTP_USERNAME,
+            "http_port": plexpy.CONFIG.HTTP_PORT,
+            "http_password": plexpy.CONFIG.HTTP_PASSWORD,
+            "launch_browser": bool(plexpy.CONFIG.LAUNCH_BROWSER),
+            "enable_https": bool(plexpy.CONFIG.ENABLE_HTTPS),
+            "https_cert": plexpy.CONFIG.HTTPS_CERT,
+            "https_key": plexpy.CONFIG.HTTPS_KEY,
+            "api_enabled": plexpy.CONFIG.API_ENABLED,
+            "api_key": plexpy.CONFIG.API_KEY,
+            "update_db_interval": plexpy.CONFIG.UPDATE_DB_INTERVAL,
+            "freeze_db": bool(plexpy.CONFIG.FREEZE_DB),
+            "log_dir": plexpy.CONFIG.LOG_DIR,
+            "cache_dir": plexpy.CONFIG.CACHE_DIR,
+            "check_github": bool(plexpy.CONFIG.CHECK_GITHUB),
+            "interface_list": interface_list,
+            "cache_sizemb": plexpy.CONFIG.CACHE_SIZEMB,
+            "pms_identifier": plexpy.CONFIG.PMS_IDENTIFIER,
+            "pms_ip": plexpy.CONFIG.PMS_IP,
+            "pms_logs_folder": plexpy.CONFIG.PMS_LOGS_FOLDER,
+            "pms_port": plexpy.CONFIG.PMS_PORT,
+            "pms_token": plexpy.CONFIG.PMS_TOKEN,
+            "pms_ssl": bool(plexpy.CONFIG.PMS_SSL),
+            "pms_use_bif": bool(plexpy.CONFIG.PMS_USE_BIF),
+            "pms_uuid": plexpy.CONFIG.PMS_UUID,
+            "date_format": plexpy.CONFIG.DATE_FORMAT,
+            "time_format": plexpy.CONFIG.TIME_FORMAT,
+            "grouping_global_history": bool(plexpy.CONFIG.GROUPING_GLOBAL_HISTORY),
+            "grouping_user_history": bool(plexpy.CONFIG.GROUPING_USER_HISTORY),
+            "grouping_charts": bool(plexpy.CONFIG.GROUPING_CHARTS),
+            "tv_notify_enable": bool(plexpy.CONFIG.TV_NOTIFY_ENABLE),
+            "movie_notify_enable": bool(plexpy.CONFIG.MOVIE_NOTIFY_ENABLE),
+            "music_notify_enable": bool(plexpy.CONFIG.MUSIC_NOTIFY_ENABLE),
+            "tv_notify_on_start": bool(plexpy.CONFIG.TV_NOTIFY_ON_START),
+            "movie_notify_on_start": bool(plexpy.CONFIG.MOVIE_NOTIFY_ON_START),
+            "music_notify_on_start": bool(plexpy.CONFIG.MUSIC_NOTIFY_ON_START),
+            "tv_notify_on_stop": bool(plexpy.CONFIG.TV_NOTIFY_ON_STOP),
+            "movie_notify_on_stop": bool(plexpy.CONFIG.MOVIE_NOTIFY_ON_STOP),
+            "music_notify_on_stop": bool(plexpy.CONFIG.MUSIC_NOTIFY_ON_STOP),
+            "tv_notify_on_pause": bool(plexpy.CONFIG.TV_NOTIFY_ON_PAUSE),
+            "movie_notify_on_pause": bool(plexpy.CONFIG.MOVIE_NOTIFY_ON_PAUSE),
+            "music_notify_on_pause": bool(plexpy.CONFIG.MUSIC_NOTIFY_ON_PAUSE),
+            "monitoring_interval": plexpy.CONFIG.MONITORING_INTERVAL,
+            "refresh_users_interval": plexpy.CONFIG.REFRESH_USERS_INTERVAL,
+            "refresh_users_on_startup": bool(plexpy.CONFIG.REFRESH_USERS_ON_STARTUP),
+            "ip_logging_enable": bool(plexpy.CONFIG.IP_LOGGING_ENABLE),
+            "video_logging_enable": bool(plexpy.CONFIG.VIDEO_LOGGING_ENABLE),
+            "music_logging_enable": bool(plexpy.CONFIG.MUSIC_LOGGING_ENABLE),
+            "logging_ignore_interval": plexpy.CONFIG.LOGGING_IGNORE_INTERVAL,
+            "pms_is_remote": bool(plexpy.CONFIG.PMS_IS_REMOTE),
+            "notify_watched_percent": plexpy.CONFIG.NOTIFY_WATCHED_PERCENT,
+            "notify_on_start_subject_text": plexpy.CONFIG.NOTIFY_ON_START_SUBJECT_TEXT,
+            "notify_on_start_body_text": plexpy.CONFIG.NOTIFY_ON_START_BODY_TEXT,
+            "notify_on_stop_subject_text": plexpy.CONFIG.NOTIFY_ON_STOP_SUBJECT_TEXT,
+            "notify_on_stop_body_text": plexpy.CONFIG.NOTIFY_ON_STOP_BODY_TEXT,
+            "notify_on_pause_subject_text": plexpy.CONFIG.NOTIFY_ON_PAUSE_SUBJECT_TEXT,
+            "notify_on_pause_body_text": plexpy.CONFIG.NOTIFY_ON_PAUSE_BODY_TEXT,
+            "notify_on_resume_subject_text": plexpy.CONFIG.NOTIFY_ON_RESUME_SUBJECT_TEXT,
+            "notify_on_resume_body_text": plexpy.CONFIG.NOTIFY_ON_RESUME_BODY_TEXT,
+            "notify_on_buffer_subject_text": plexpy.CONFIG.NOTIFY_ON_BUFFER_SUBJECT_TEXT,
+            "notify_on_buffer_body_text": plexpy.CONFIG.NOTIFY_ON_BUFFER_BODY_TEXT,
+            "notify_on_watched_subject_text": plexpy.CONFIG.NOTIFY_ON_WATCHED_SUBJECT_TEXT,
+            "notify_on_watched_body_text": plexpy.CONFIG.NOTIFY_ON_WATCHED_BODY_TEXT,
+            "home_stats_length": plexpy.CONFIG.HOME_STATS_LENGTH,
+            "home_stats_type": bool(plexpy.CONFIG.HOME_STATS_TYPE),
+            "home_stats_count": plexpy.CONFIG.HOME_STATS_COUNT,
+            "home_stats_cards": plexpy.CONFIG.HOME_STATS_CARDS,
+            "home_library_cards": plexpy.CONFIG.HOME_LIBRARY_CARDS,
+            "buffer_threshold": plexpy.CONFIG.BUFFER_THRESHOLD,
+            "buffer_wait": plexpy.CONFIG.BUFFER_WAIT
+        }
+
+        self.data = config
+        return config
+
+    def _getUserips(self, user_id=None, user=None, **kwargs):
+        custom_where = []
+        if user_id:
+            custom_where = [['user_id', user_id]]
+        elif user:
+            custom_where = [['user', user]]
+
+        user_data = users.Users()
+        history = user_data.get_user_unique_ips(kwargs=kwargs,
+                                                custom_where=custom_where)
+
+        if history:
+            self.data = history
+            return history
+        else:
+            self.msg = 'Failed to find users ips'
+
+    def _getPlayby(self, time_range='30', y_axis='plays', playtype='total_plays_per_month', **kwargs):
+
+        graph = graphs.Graphs()
+        if playtype == 'total_plays_per_month':
+            result = graph.get_total_plays_per_month(y_axis=y_axis)
+
+        elif playtype == 'total_plays_per_day':
+            result = graph.get_total_plays_per_day(time_range=time_range, y_axis=y_axis)
+
+        elif playtype == 'total_plays_per_hourofday':
+            result = graph.get_total_plays_per_hourofday(time_range=time_range, y_axis=y_axis)
+
+        elif playtype == 'total_plays_per_dayofweek':
+            result = graph.get_total_plays_per_dayofweek(time_range=time_range, y_axis=y_axis)
+
+        elif playtype == 'stream_type_by_top_10_users':
+            result = graph.get_stream_type_by_top_10_users(time_range=time_range, y_axis=y_axis)
+
+        elif playtype == 'stream_type_by_top_10_platforms':
+            result = graph.get_stream_type_by_top_10_platforms(time_range=time_range, y_axis=y_axis)
+
+        elif playtype == 'total_plays_by_stream_resolution':
+            result = graph.get_total_plays_by_stream_resolution(time_range=time_range, y_axis=y_axis)
+
+        elif playtype == 'total_plays_by_source_resolution':
+            result = graph.get_total_plays_by_source_resolution(time_range=time_range, y_axis=y_axis)
+
+        elif playtype == 'total_plays_per_stream_type':
+            result = graph.get_total_plays_per_stream_type(time_range=time_range, y_axis=y_axis)
+
+        elif playtype == 'total_plays_by_top_10_users':
+            result = graph.get_total_plays_by_top_10_users(time_range=time_range, y_axis=y_axis)
+
+        elif playtype == 'total_plays_by_top_10_platforms':
+            result = graph.get_total_plays_by_top_10_platforms(time_range=time_range, y_axis=y_axis)
+
+        if result:
+            self.data = result
+            return result
+        else:
+            logger.warn('Unable to retrieve %s from db' % playtype)
diff --git a/plexpy/api2.py b/plexpy/api2.py
deleted file mode 100644
index b4328f96..00000000
--- a/plexpy/api2.py
+++ /dev/null
@@ -1,815 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# This file is part of Tautulli.
-#
-#  Tautulli is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  Tautulli 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
-
-from hashing_passwords import check_hash
-from io import open
-
-import hashlib
-import inspect
-import json
-import os
-import random
-import re
-import time
-import traceback
-
-import cherrypy
-import xmltodict
-
-import plexpy
-from plexpy import common
-from plexpy import config
-from plexpy import database
-from plexpy import helpers
-from plexpy import libraries
-from plexpy import logger
-from plexpy import mobile_app
-from plexpy import notification_handler
-from plexpy import notifiers
-from plexpy import newsletter_handler
-from plexpy import newsletters
-from plexpy import plextv
-from plexpy import users
-
-
-class API2(object):
-    def __init__(self, **kwargs):
-        self._api_valid_methods = self._api_docs().keys()
-        self._api_authenticated = False
-        self._api_out_type = 'json'  # default
-        self._api_msg = None
-        self._api_debug = None
-        self._api_cmd = None
-        self._api_apikey = None
-        self._api_callback = None  # JSONP
-        self._api_result_type = 'error'
-        self._api_response_code = None
-        self._api_profileme = None  # For profiling the api call
-        self._api_kwargs = None  # Cleaned kwargs
-        self._api_app = False
-
-    def _api_docs(self, md=False):
-        """ Makes the api docs. """
-
-        docs = {}
-        for f, _ in inspect.getmembers(self, predicate=inspect.ismethod):
-            if not f.startswith('_') and not f.startswith('_api'):
-                if md is True:
-                    docs[f] = inspect.getdoc(getattr(self, f)) if inspect.getdoc(getattr(self, f)) else None
-                else:
-                    docs[f] = ' '.join(inspect.getdoc(getattr(self, f)).split()) if inspect.getdoc(getattr(self, f)) else None
-        return docs
-
-    def docs_md(self):
-        """ Return the api docs formatted with markdown."""
-
-        return self._api_make_md()
-
-    def docs(self):
-        """ Return the api docs as a dict where commands are keys, docstring are value."""
-
-        return self._api_docs()
-
-    def _api_validate(self, *args, **kwargs):
-        """ Sets class vars and remove unneeded parameters. """
-
-        if not plexpy.CONFIG.API_ENABLED:
-            self._api_msg = 'API not enabled'
-            self._api_response_code = 404
-
-        elif not plexpy.CONFIG.API_KEY:
-            self._api_msg = 'API key not generated'
-            self._api_response_code = 401
-
-        elif len(plexpy.CONFIG.API_KEY) != 32:
-            self._api_msg = 'API key not generated correctly'
-            self._api_response_code = 401
-
-        elif 'apikey' not in kwargs:
-            self._api_msg = 'Parameter apikey is required'
-            self._api_response_code = 401
-
-        elif 'cmd' not in kwargs:
-            self._api_msg = 'Parameter cmd is required. Possible commands are: %s' % ', '.join(self._api_valid_methods)
-            self._api_response_code = 400
-
-        elif 'cmd' in kwargs and kwargs.get('cmd') not in self._api_valid_methods:
-            self._api_msg = 'Unknown command: %s. Possible commands are: %s' % (kwargs.get('cmd', ''), ', '.join(sorted(self._api_valid_methods)))
-            self._api_response_code = 400
-
-        self._api_callback = kwargs.pop('callback', None)
-        self._api_apikey = kwargs.pop('apikey', None)
-        self._api_cmd = kwargs.pop('cmd', None)
-        self._api_debug = kwargs.pop('debug', False)
-        self._api_profileme = kwargs.pop('profileme', None)
-        # Allow override for the api.
-        self._api_out_type = kwargs.pop('out_type', 'json')
-
-        if 'app' in kwargs and helpers.bool_true(kwargs.pop('app')):
-            self._api_app = True
-
-        if plexpy.CONFIG.API_ENABLED and not self._api_msg or self._api_cmd in ('get_apikey', 'docs', 'docs_md'):
-            if not self._api_app and self._api_apikey == plexpy.CONFIG.API_KEY:
-                self._api_authenticated = True
-
-            elif self._api_app and mobile_app.get_temp_device_token(self._api_apikey) and \
-                    self._api_cmd == 'register_device':
-                self._api_authenticated = True
-
-            elif self._api_app and mobile_app.get_mobile_device_by_token(self._api_apikey):
-                mobile_app.set_last_seen(self._api_apikey)
-                self._api_authenticated = True
-
-            else:
-                self._api_msg = 'Invalid apikey'
-                self._api_response_code = 401
-
-            if self._api_authenticated and self._api_cmd in self._api_valid_methods:
-                self._api_msg = None
-                self._api_kwargs = kwargs
-
-            elif not self._api_authenticated and self._api_cmd in ('get_apikey', 'docs', 'docs_md'):
-                self._api_authenticated = True
-                # Remove the old error msg
-                self._api_msg = None
-                self._api_kwargs = kwargs
-
-        if self._api_msg:
-            logger.api_debug('Tautulli APIv2 :: %s.' % self._api_msg)
-
-        logger.api_debug('Tautulli APIv2 :: Cleaned kwargs: %s' % self._api_kwargs)
-
-        return self._api_kwargs
-
-    def get_logs(self, sort='', search='', order='desc', regex='', start=0, end=0, **kwargs):
-        """
-            Get the Tautulli logs.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                sort (str):         "time", "thread", "msg", "loglevel"
-                search (str):       A string to search for
-                order (str):        "desc" or "asc"
-                regex (str):        A regex string to search for
-                start (int):        Row number to start from
-                end (int):          Row number to end at
-
-            Returns:
-                json:
-                    [{"loglevel": "DEBUG",
-                      "msg": "Latest version is 2d10b0748c7fa2ee4cf59960c3d3fffc6aa9512b",
-                      "thread": "MainThread",
-                      "time": "2016-05-08 09:36:51 "
-                      },
-                     {...},
-                     {...}
-                     ]
-            ```
-        """
-        logfile = os.path.join(plexpy.CONFIG.LOG_DIR, logger.FILENAME)
-        templog = []
-        start = int(start)
-        end = int(end)
-
-        if regex:
-            logger.api_debug("Tautulli APIv2 :: Filtering log using regex '%s'" % regex)
-            reg = re.compile(regex, flags=re.I)
-
-        with open(logfile, 'r', encoding='utf-8') as f:
-            for line in f.readlines():
-                temp_loglevel_and_time = None
-
-                try:
-                    temp_loglevel_and_time = line.split('- ')
-                    loglvl = temp_loglevel_and_time[1].split(' :')[0].strip()
-                    tl_tread = line.split(' :: ')
-                    if loglvl is None:
-                        msg = line.replace('\n', '')
-                    else:
-                        msg = line.split(' : ')[1].replace('\n', '')
-                    thread = tl_tread[1].split(' : ')[0]
-                except IndexError:
-                    # We assume this is a traceback
-                    tl = (len(templog) - 1)
-                    templog[tl]['msg'] += helpers.sanitize(line.replace('\n', ''))
-                    continue
-
-                if len(line) > 1 and temp_loglevel_and_time is not None and loglvl in line:
-
-                    d = {
-                        'time': temp_loglevel_and_time[0],
-                        'loglevel': loglvl,
-                        'msg': helpers.sanitize(msg.replace('\n', '')),
-                        'thread': thread
-                    }
-                    templog.append(d)
-
-        if order == 'desc':
-            templog = templog[::-1]
-
-        if end > 0 or start > 0:
-            logger.api_debug("Tautulli APIv2 :: Slicing the log from %s to %s" % (start, end))
-            templog = templog[start:end]
-
-        if sort:
-            logger.api_debug("Tautulli APIv2 :: Sorting log based on '%s'" % sort)
-            templog = sorted(templog, key=lambda k: k[sort])
-
-        if search:
-            logger.api_debug("Tautulli APIv2 :: Searching log values for '%s'" % search)
-            tt = [d for d in templog for k, v in d.items() if search.lower() in v.lower()]
-
-            if len(tt):
-                templog = tt
-
-        if regex:
-            tt = []
-            for l in templog:
-                stringdict = ' '.join('{}{}'.format(k, v) for k, v in l.items())
-                if reg.search(stringdict):
-                    tt.append(l)
-
-            if len(tt):
-                templog = tt
-
-        return templog
-
-    def get_settings(self, key=''):
-        """ Gets all settings from the config file.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                key (str):      Name of a config section to return
-
-            Returns:
-                json:
-                    {"General": {"api_enabled": true, ...}
-                     "Advanced": {"cache_sizemb": "32", ...},
-                     ...
-                     }
-            ```
-        """
-        interface_dir = os.path.join(plexpy.PROG_DIR, 'data/interfaces/')
-        interface_list = [name for name in os.listdir(interface_dir) if
-                          os.path.isdir(os.path.join(interface_dir, name))]
-
-        conf = plexpy.CONFIG._config
-        settings = {}
-
-        # Truthify the dict
-        for k, v in conf.items():
-            if isinstance(v, dict):
-                d = {}
-                for kk, vv in v.items():
-                    if kk.upper() in config._DO_NOT_DOWNLOAD_KEYS:
-                        vv = None
-                    if vv == '0' or vv == '1':
-                        d[kk] = bool(vv)
-                    else:
-                        d[kk] = vv
-                settings[k] = d
-            if k == 'General':
-                settings[k]['interface'] = interface_dir
-                settings[k]['interface_list'] = interface_list
-
-        if key:
-            return settings.get(key)
-
-        return settings
-
-    def sql(self, query=''):
-        """ Query the Tautulli database with raw SQL. Automatically makes a backup of
-            the database if the latest backup is older then 24h. `api_sql` must be
-            manually enabled in the config file while Tautulli is shut down.
-
-            ```
-            Required parameters:
-                query (str):        The SQL query
-
-            Optional parameters:
-                None
-
-            Returns:
-                None
-            ```
-        """
-        if not plexpy.CONFIG.API_SQL:
-            self._api_msg = 'SQL not enabled for the API.'
-            return
-
-        if not query:
-            self._api_msg = 'No SQL query provided.'
-            return
-
-        # allow the user to shoot them self
-        # in the foot but not in the head..
-        if not len(os.listdir(plexpy.CONFIG.BACKUP_DIR)):
-            self.backup_db()
-        else:
-            # If the backup is less then 24 h old lets make a backup
-            if not any(os.path.getctime(os.path.join(plexpy.CONFIG.BACKUP_DIR, file_)) > (time.time() - 86400)
-                    and file_.endswith('.db') for file_ in os.listdir(plexpy.CONFIG.BACKUP_DIR)):
-                self.backup_db()
-
-        db = database.MonitorDatabase()
-        rows = db.select(query)
-        return rows
-
-    def backup_config(self):
-        """ Create a manual backup of the `config.ini` file."""
-
-        data = config.make_backup()
-        self._api_result_type = 'success' if data else 'error'
-
-        return data
-
-    def backup_db(self):
-        """ Create a manual backup of the `plexpy.db` file."""
-
-        data = database.make_backup()
-        self._api_result_type = 'success' if data else 'error'
-
-        return data
-
-    def restart(self, **kwargs):
-        """ Restart Tautulli."""
-
-        plexpy.SIGNAL = 'restart'
-        self._api_msg = 'Restarting Tautulli'
-        self._api_result_type = 'success'
-
-    def update(self, **kwargs):
-        """ Update Tautulli."""
-
-        plexpy.SIGNAL = 'update'
-        self._api_msg = 'Updating Tautulli'
-        self._api_result_type = 'success'
-
-    def refresh_libraries_list(self, **kwargs):
-        """ Refresh the Tautulli libraries list."""
-        data = libraries.refresh_libraries()
-        self._api_result_type = 'success' if data else 'error'
-
-        return data
-
-    def refresh_users_list(self, **kwargs):
-        """ Refresh the Tautulli users list."""
-        data = users.refresh_users()
-        self._api_result_type = 'success' if data else 'error'
-
-        return data
-
-    def register_device(self, device_id='', device_name='', platform=None, version=None,
-                        friendly_name='', onesignal_id=None, min_version='', **kwargs):
-        """ Registers the Tautulli Remote App.
-
-            ```
-            Required parameters:
-                device_id (str):          The unique device identifier for the mobile device
-                device_name (str):        The device name of the mobile device
-
-            Optional parameters:
-                platform (str):           The platform of the mobile devices
-                version (str):            The version of the app
-                friendly_name (str):      A friendly name to identify the mobile device
-                onesignal_id (str):       The OneSignal id for the mobile device
-                min_version (str):        The minimum Tautulli version supported by the mobile device, e.g. v2.5.6
-
-            Returns:
-                json:
-                    {"pms_identifier": "08u2phnlkdshf890bhdlksghnljsahgleikjfg9t",
-                     "pms_ip": "10.10.10.1",
-                     "pms_is_remote": 0,
-                     "pms_name": "Winterfell-Server",
-                     "pms_platform": "Windows",
-                     "pms_plexpass": 1,
-                     "pms_port": 32400,
-                     "pms_ssl": 0,
-                     "pms_url": "http://10.10.10.1:32400",
-                     "pms_url_manual": 0,
-                     "pms_version": "1.20.0.3133-fede5bdc7"
-                     "server_id": "2ce060c87958445d8399a7a0c5663755",
-                     "tautulli_install_type": "git",
-                     "tautulli_branch": "master",
-                     "tautulli_commit": "14b98a32e085d969f010f0249c3d2f660db50880",
-                     "tautulli_platform": "Windows",
-                     "tautulli_platform_device_name": "Winterfell-PC",
-                     "tautulli_platform_linux_distro": "",
-                     "tautulli_platform_release": "10",
-                     "tautulli_platform_version": "10.0.18362",
-                     "tautulli_python_version": "3.8.3"
-                     "tautulli_version": "v2.5.6",
-                     }
-            ```
-        """
-        if not device_id:
-            self._api_msg = 'Device registration failed: no device id provided.'
-            self._api_result_type = 'error'
-            return
-
-        elif not device_name:
-            self._api_msg = 'Device registration failed: no device name provided.'
-            self._api_result_type = 'error'
-            return
-
-        elif min_version and helpers.version_to_tuple(min_version) > helpers.version_to_tuple(common.RELEASE):
-            self._api_msg = 'Device registration failed: Tautulli version {} ' \
-                            'does not meet the minimum requirement of {}.'.format(common.RELEASE, min_version)
-            self._api_result_type = 'error'
-            return
-
-        ## TODO: Temporary for backwards compatibility, assume device_id is onesignal_id
-        if device_id and onesignal_id is None:
-            onesignal_id = device_id
-
-        result = mobile_app.add_mobile_device(device_id=device_id,
-                                              device_name=device_name,
-                                              device_token=self._api_apikey,
-                                              platform=platform,
-                                              version=version,
-                                              friendly_name=friendly_name,
-                                              onesignal_id=onesignal_id)
-
-        if result:
-            self._api_msg = 'Device registration successful.'
-            self._api_result_type = 'success'
-
-            mobile_app.set_temp_device_token(self._api_apikey, success=True)
-
-            plex_server = plextv.get_server_resources(return_info=True)
-            tautulli = plexpy.get_tautulli_info()
-
-            data = {"server_id": plexpy.CONFIG.PMS_UUID}
-            data.update(plex_server)
-            data.update(tautulli)
-
-            return data
-
-        else:
-            self._api_msg = 'Device registration failed: database error.'
-            self._api_result_type = 'error'
-
-        return
-
-    def notify(self, notifier_id='', subject='', body='', **kwargs):
-        """ Send a notification using Tautulli.
-
-            ```
-            Required parameters:
-                notifier_id (int):      The ID number of the notification agent
-                subject (str):          The subject of the message
-                body (str):             The body of the message
-
-            Optional parameters:
-                headers (str):          The JSON headers for webhook notifications
-                script_args (str):      The arguments for script notifications
-
-            Returns:
-                json:
-                    {"notification_id": 1}
-            ```
-        """
-        if not notifier_id:
-            self._api_msg = 'Notification failed: no notifier id provided.'
-            self._api_result_type = 'error'
-            return
-
-        notifier = notifiers.get_notifier_config(notifier_id=notifier_id)
-
-        if not notifier:
-            self._api_msg = 'Notification failed: invalid notifier_id provided %s.' % notifier_id
-            self._api_result_type = 'error'
-            return
-
-        logger.api_debug('Tautulli APIv2 :: Sending notification.')
-        success = notification_handler.notify(notifier_id=notifier_id,
-                                              notify_action='api',
-                                              subject=subject,
-                                              body=body,
-                                              **kwargs)
-
-        if isinstance(success, int):
-            self._api_msg = 'Notification sent.'
-            self._api_result_type = 'success'
-            return {'notification_id': success}
-        else:
-            self._api_msg = 'Notification failed.'
-            self._api_result_type = 'error'
-            return
-
-    def notify_newsletter(self, newsletter_id='', subject='', body='', message='', **kwargs):
-        """ Send a newsletter using Tautulli.
-
-            ```
-            Required parameters:
-                newsletter_id (int):    The ID number of the newsletter agent
-
-            Optional parameters:
-                subject (str):          The subject of the newsletter
-                body (str):             The body of the newsletter
-                message (str):          The message of the newsletter
-
-            Returns:
-                json:
-                    {"newsletter_notification_id": 1}
-            ```
-        """
-        if not newsletter_id:
-            self._api_msg = 'Newsletter failed: no newsletter id provided.'
-            self._api_result_type = 'error'
-            return
-
-        newsletter = newsletters.get_newsletter_config(newsletter_id=newsletter_id)
-
-        if not newsletter:
-            self._api_msg = 'Newsletter failed: invalid newsletter_id provided %s.' % newsletter_id
-            self._api_result_type = 'error'
-            return
-
-        logger.api_debug('Tautulli APIv2 :: Sending newsletter.')
-        success = newsletter_handler.notify(newsletter_id=newsletter_id,
-                                            notify_action='api',
-                                            subject=subject,
-                                            body=body,
-                                            message=message,
-                                            **kwargs)
-
-        if isinstance(success, int):
-            self._api_msg = 'Newsletter sent.'
-            self._api_result_type = 'success'
-            return {'newsletter_notification_id': success}
-        else:
-            self._api_msg = 'Newsletter failed.'
-            self._api_result_type = 'error'
-            return
-
-    def _api_make_md(self):
-        """ Tries to make a API.md to simplify the api docs. """
-
-        head = '''## General structure
-The API endpoint is
-```
-http://IP_ADDRESS:PORT + [/HTTP_ROOT] + /api/v2?apikey=$apikey&cmd=$command
-```
-
-Example:
-```
-http://localhost:8181/api/v2?apikey=66198313a092496b8a725867d2223b5f&cmd=get_metadata&rating_key=153037
-```
-
-Response example (default `json`)
-```
-{
-    "response": {
-        "data": [
-            {
-                "loglevel": "INFO",
-                "msg": "Signal 2 caught, saving and exiting...",
-                "thread": "MainThread",
-                "time": "22-sep-2015 01:42:56 "
-            }
-        ],
-        "message": null,
-        "result": "success"
-    }
-}
-```
-```
-General optional parameters:
-
-    out_type:   "json" or "xml"
-    callback:   "pong"
-    debug:      1
-```
-
-## API methods'''
-
-        body = ''
-        doc = self._api_docs(md=True)
-        for k in sorted(doc):
-            v = doc.get(k)
-            body += '### %s\n' % k
-            body += '' if not v else v + '\n'
-            body += '\n\n'
-
-        result = head + '\n\n' + body
-        return '<pre>' + result + '</pre>'
-
-    def get_apikey(self, username='', password=''):
-        """ Get the apikey. Username and password are required
-            if auth is enabled. Makes and saves the apikey if it does not exist.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                username (str):     Your Tautulli username
-                password (str):     Your Tautulli password
-
-            Returns:
-                string:             "apikey"
-            ```
-         """
-        data = None
-        apikey = hashlib.sha224(str(random.getrandbits(256)).encode('utf-8')).hexdigest()[0:32]
-        if plexpy.CONFIG.HTTP_USERNAME and plexpy.CONFIG.HTTP_PASSWORD:
-            authenticated = username == plexpy.CONFIG.HTTP_USERNAME and check_hash(password, plexpy.CONFIG.HTTP_PASSWORD)
-
-            if authenticated:
-                if plexpy.CONFIG.API_KEY:
-                    data = plexpy.CONFIG.API_KEY
-                else:
-                    data = apikey
-                    plexpy.CONFIG.API_KEY = apikey
-                    plexpy.CONFIG.write()
-            else:
-                self._api_msg = 'Authentication is enabled, please add the correct username and password to the parameters'
-        else:
-            if plexpy.CONFIG.API_KEY:
-                data = plexpy.CONFIG.API_KEY
-            else:
-                # Make a apikey if the doesn't exist
-                data = apikey
-                plexpy.CONFIG.API_KEY = apikey
-                plexpy.CONFIG.write()
-
-        return data
-
-    def _api_responds(self, result_type='error', data=None, msg=''):
-        """ Formats the result to a predefined dict so we can change it the to
-            the desired output by _api_out_as """
-
-        if data is None:
-            data = {}
-        return {"response": {"result": result_type, "message": msg, "data": data}}
-
-    def _api_out_as(self, out):
-        """ Formats the response to the desired output """
-
-        if self._api_cmd == 'docs_md':
-            return out['response']['data']
-
-        elif self._api_cmd and self._api_cmd.startswith('download_'):
-            return out['response']['data']
-
-        elif self._api_cmd == 'pms_image_proxy':
-            if 'return_hash' not in self._api_kwargs:
-                return out['response']['data']
-
-        elif self._api_cmd == 'get_geoip_lookup':
-            # Remove nested data and put error message inside data for backwards compatibility
-            out['response']['data'] = out['response']['data'].get('data')
-            if not out['response']['data']:
-                out['response']['data'] = {'error': out['response']['message']}
-
-        if self._api_out_type == 'json':
-            cherrypy.response.headers['Content-Type'] = 'application/json;charset=UTF-8'
-            try:
-                if self._api_debug:
-                    out = json.dumps(out, indent=4, sort_keys=True, ensure_ascii=False)
-                else:
-                    out = json.dumps(out, ensure_ascii=False)
-                if self._api_callback is not None:
-                    cherrypy.response.headers['Content-Type'] = 'application/javascript'
-                    # wrap with JSONP call if requested
-                    out = self._api_callback + '(' + out + ');'
-            # if we fail to generate the output fake an error
-            except Exception as e:
-                logger.api_exception('Tautulli APIv2 :: ' + traceback.format_exc())
-                self._api_response_code = 500
-                out['message'] = traceback.format_exc()
-                out['result'] = 'error'
-
-        elif self._api_out_type == 'xml':
-            cherrypy.response.headers['Content-Type'] = 'application/xml;charset=UTF-8'
-            try:
-                out = xmltodict.unparse(out, pretty=True)
-            except Exception as e:
-                logger.api_error('Tautulli APIv2 :: Failed to parse xml result')
-                self._api_response_code = 500
-                try:
-                    out['message'] = e
-                    out['result'] = 'error'
-                    out = xmltodict.unparse(out, pretty=True)
-
-                except Exception as e:
-                    logger.api_error('Tautulli APIv2 :: Failed to parse xml result error message %s' % e)
-                    out = '''<?xml version="1.0" encoding="utf-8"?>
-                                <response>
-                                    <message>%s</message>
-                                    <data></data>
-                                    <result>error</result>
-                                </response>
-                          ''' % e
-
-        return out.encode('utf-8')
-
-    def _api_run(self, *args, **kwargs):
-        """ handles the stuff from the handler """
-
-        # Make sure the device ID is not shown in the logs
-        if kwargs.get('cmd') == 'register_device':
-            if kwargs.get('device_id'):
-                logger._BLACKLIST_WORDS.add(kwargs['device_id'])
-            if kwargs.get('onesignal_id'):
-                logger._BLACKLIST_WORDS.add(kwargs['onesignal_id'])
-
-        elif kwargs.get('cmd') == 'get_apikey':
-            if kwargs.get('password'):
-                logger._BLACKLIST_WORDS.add(kwargs['password'])
-
-        result = None
-        logger.api_debug('Tautulli APIv2 :: API called with kwargs: %s' % kwargs)
-
-        self._api_validate(**kwargs)
-
-        if self._api_cmd and self._api_authenticated:
-            call = getattr(self, self._api_cmd)
-
-            # Profile is written to console.
-            if self._api_profileme:
-                from profilehooks import profile
-                call = profile(call, immediate=True)
-
-            # We allow this to fail so we get a
-            # traceback in the browser
-            try:
-
-                result = call(**self._api_kwargs)
-            except Exception as e:
-                logger.api_error('Tautulli APIv2 :: Failed to run %s with %s: %s' % (self._api_cmd, self._api_kwargs, e))
-                self._api_response_code = 500
-                if self._api_debug:
-                    cherrypy.request.show_tracebacks = True
-                    # Reraise the exception so the traceback hits the browser
-                    raise
-                self._api_msg = 'Check the logs for errors'
-
-        ret = None
-        # The api decorated function can return different result types.
-        # convert it to a list/dict before we change it to the users
-        # wanted output
-        try:
-            if isinstance(result, (dict, list)):
-                ret = result
-            elif result is not None:
-                raise Exception
-        except Exception:
-            try:
-                ret = json.loads(result)
-            except (ValueError, TypeError):
-                try:
-                    ret = xmltodict.parse(result, attr_prefix='')
-                except:
-                    pass
-
-        # Fallback if we cant "parse the response"
-        if ret is None:
-            ret = result
-
-        if (ret is not None or self._api_result_type == 'success') and self._api_authenticated:
-            # To allow override for restart etc
-            # if the call returns some data we are gonna assume its a success
-            self._api_result_type = 'success'
-            self._api_response_code = 200
-
-        # Since some of them methods use a api like response for the ui
-        # {result: error, message: 'Some shit happened'}
-        if isinstance(ret, dict):
-            if ret.get('message'):
-                self._api_msg = ret.pop('message', None)
-
-            if ret.get('result'):
-                self._api_result_type = ret.pop('result', None)
-
-        if self._api_result_type == 'success' and not self._api_response_code:
-            self._api_response_code = 200
-        elif self._api_result_type == 'error' and self._api_response_code != 500:
-            self._api_response_code = 400
-
-        if not self._api_response_code:
-            self._api_response_code = 500
-
-        cherrypy.response.status = self._api_response_code
-        return self._api_out_as(self._api_responds(result_type=self._api_result_type, msg=self._api_msg, data=ret))
diff --git a/plexpy/classes.py b/plexpy/classes.py
new file mode 100644
index 00000000..8f220996
--- /dev/null
+++ b/plexpy/classes.py
@@ -0,0 +1,67 @@
+#  This file is part of PlexPy.
+#
+#  PlexPy is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  PlexPy 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 PlexPy.  If not, see <http://www.gnu.org/licenses/>.
+
+#########################################
+## Stolen from Sick-Beard's classes.py ##
+#########################################
+
+
+import urllib
+
+from common import USER_AGENT
+
+
+class PlexPyURLopener(urllib.FancyURLopener):
+    version = USER_AGENT
+
+
+class AuthURLOpener(PlexPyURLopener):
+    """
+    URLOpener class that supports http auth without needing interactive password entry.
+    If the provided username/password don't work it simply fails.
+
+    user: username to use for HTTP auth
+    pw: password to use for HTTP auth
+    """
+
+    def __init__(self, user, pw):
+        self.username = user
+        self.password = pw
+
+        # remember if we've tried the username/password before
+        self.numTries = 0
+
+        # call the base class
+        urllib.FancyURLopener.__init__(self)
+
+    def prompt_user_passwd(self, host, realm):
+        """
+        Override this function and instead of prompting just give the
+        username/password that were provided when the class was instantiated.
+        """
+
+        # if this is the first try then provide a username/password
+        if self.numTries == 0:
+            self.numTries = 1
+            return (self.username, self.password)
+
+        # if we've tried before then return blank which cancels the request
+        else:
+            return ('', '')
+
+    # this is pretty much just a hack for convenience
+    def openit(self, url):
+        self.numTries = 0
+        return PlexPyURLopener.open(self, url)
diff --git a/plexpy/common.py b/plexpy/common.py
index d057cee9..d3f740a2 100644
--- a/plexpy/common.py
+++ b/plexpy/common.py
@@ -1,716 +1,44 @@
-# -*- coding: utf-8 -*-
-
-#  This file is part of Tautulli.
+#  This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
-import distro
+'''
+Created on Aug 1, 2011
+
+@author: Michael
+'''
 import platform
-from collections import OrderedDict
 
 from plexpy import version
 
-
 # Identify Our Application
-PRODUCT = 'Tautulli'
-PLATFORM = platform.system()
-PLATFORM_RELEASE = platform.release()
-PLATFORM_VERSION = platform.version()
-PLATFORM_LINUX_DISTRO = ' '.join(x for x in distro.linux_distribution() if x)
-PLATFORM_DEVICE_NAME = platform.node()
-PYTHON_VERSION = platform.python_version()
-BRANCH = version.PLEXPY_BRANCH
-RELEASE = version.PLEXPY_RELEASE_VERSION
+USER_AGENT = 'PlexPy/-' + version.PLEXPY_VERSION + ' v' + version.PLEXPY_RELEASE_VERSION + ' (' + platform.system() + \
+             ' ' + platform.release() + ')'
 
-USER_AGENT = '{}/{} ({} {})'.format(PRODUCT, RELEASE, PLATFORM, PLATFORM_RELEASE)
+PLATFORM = platform.system()
+PLATFORM_VERSION = platform.release()
+BRANCH = version.PLEXPY_VERSION
+VERSION_NUMBER = version.PLEXPY_RELEASE_VERSION
+
+# Notification Types
+NOTIFY_STARTED = 1
+NOTIFY_STOPPED = 2
+
+notify_strings = {}
+notify_strings[NOTIFY_STARTED] = "Playback started"
+notify_strings[NOTIFY_STOPPED] = "Playback stopped"
 
 DEFAULT_USER_THUMB = "interfaces/default/images/gravatar-default-80x80.png"
 DEFAULT_POSTER_THUMB = "interfaces/default/images/poster.png"
-DEFAULT_COVER_THUMB = "interfaces/default/images/cover.png"
-DEFAULT_ART = "interfaces/default/images/art.png"
-DEFAULT_LIVE_TV_POSTER_THUMB = "interfaces/default/images/poster-live.png"
-DEFAULT_LIVE_TV_ART = "interfaces/default/images/art-live.png"
-DEFAULT_LIVE_TV_ART_FULL = "interfaces/default/images/art-live-full.png"
-DEFAULT_LIVE_TV_THUMB = "interfaces/default/images/libraries/live.png"
-
-ONLINE_POSTER_THUMB = "https://tautulli.com/images/poster.png"
-ONLINE_COVER_THUMB = "https://tautulli.com/images/cover.png"
-ONLINE_ART = "https://tautulli.com/images/art.png"
-
-LIVE_TV_SECTION_ID = 999999  # Fake section_id for Live TV library
-LIVE_TV_SECTION_NAME = "Live TV"  # Fake section_name for Live TV library
-
-DEFAULT_IMAGES = {
-    'poster': DEFAULT_POSTER_THUMB,
-    'cover': DEFAULT_COVER_THUMB,
-    'art': DEFAULT_ART,
-    'poster-live': DEFAULT_LIVE_TV_POSTER_THUMB,
-    'art-live': DEFAULT_LIVE_TV_ART,
-    'art-live-full': DEFAULT_LIVE_TV_ART_FULL,
-    'user': DEFAULT_USER_THUMB
-}
-
-MEDIA_TYPE_HEADERS = {
-    'movie': 'Movies',
-    'show': 'TV Shows',
-    'season': 'Seasons',
-    'episode': 'Episodes',
-    'artist': 'Artists',
-    'album': 'Albums',
-    'track': 'Tracks',
-    'video': 'Videos',
-    'audio': 'Tracks',
-    'photo': 'Photos'
-}
-
-MEDIA_TYPE_VALUES = {
-    1: 'movie',
-    2: 'show',
-    3: 'season',
-    4: 'episode',
-    5: 'trailer',
-    6: 'comic',
-    7: 'person',
-    8: 'artist',
-    9: 'album',
-    10: 'track',
-    11: 'picture',
-    12: 'clip',
-    13: 'photo',
-    14: 'photoalbum',
-    15: 'playlist',
-    16: 'playlistFolder',
-    18: 'collection',
-    42: 'optimizedVersion'
-}
-
-PLATFORM_NAME_OVERRIDES = {
-    'Konvergo': 'Plex Media Player',
-    'Mystery 3': 'Playstation 3',
-    'Mystery 4': 'Playstation 4',
-    'Mystery 5': 'Xbox 360',
-    'WebMAF': 'Playstation 4',
-    'windows': 'Windows',
-    'osx': 'macOS',
-    'macos': 'macOS',
-}
-
-PMS_PLATFORM_NAME_OVERRIDES = {
-    'MacOSX': 'Mac'
-}
-
-PLATFORM_NAMES = {
-    'android': 'android',
-    'apple tv': 'atv',
-    'chrome': 'chrome',
-    'chromecast': 'chromecast',
-    'dlna': 'dlna',
-    'firefox': 'firefox',
-    'internet explorer': 'ie',
-    'ios': 'ios',
-    'ipad': 'ios',
-    'iphone': 'ios',
-    'kodi': 'kodi',
-    'linux': 'linux',
-    'nexus': 'android',
-    'macos': 'macos',
-    'microsoft edge': 'msedge',
-    'netcast': 'lg',
-    'opera': 'opera',
-    'osx': 'macos',
-    'playstation': 'playstation',
-    'plex home theater': 'plex',
-    'plex media player': 'plex',
-    'plexamp': 'plexamp',
-    'plextogether': 'synclounge',
-    'roku': 'roku',
-    'safari': 'safari',
-    'samsung': 'samsung',
-    'synclounge': 'synclounge',
-    'tivo': 'tivo',
-    'tizen': 'samsung',
-    'tvos': 'atv',
-    'vizio': 'opera',
-    'webos': 'lg',
-    'wiiu': 'wiiu',
-    'windows': 'windows',
-    'windows phone': 'wp',
-    'xbmc': 'xbmc',
-    'xbox': 'xbox'
-}
-PLATFORM_NAMES = OrderedDict(sorted(list(PLATFORM_NAMES.items()), key=lambda k: k[0], reverse=True))
-
-MEDIA_FLAGS_AUDIO = {
-    'ac.?3': 'dolby_digital',
-    'truehd': 'dolby_truehd',
-    '(dca|dta)': 'dts',
-    'dts(hd_|-hd|-)?ma': 'dca-ma',
-    'vorbis': 'ogg'
-}
-MEDIA_FLAGS_VIDEO = {
-    'avc1': 'h264',
-    'wmv(1|2)': 'wmv',
-    'wmv3': 'wmvhd'
-}
-
-AUDIO_CODEC_OVERRIDES = {
-    'truehd': 'TrueHD'
-}
-
-VIDEO_RESOLUTION_OVERRIDES = {
-    'sd': 'SD',
-    '2k': '2k',
-    '4k': '4k'
-}
-
-AUDIO_CHANNELS = {
-    '1': 'Mono',
-    '2': 'Stereo',
-    '3': '2.1',
-    '4': '3.1',
-    '6': '5.1',
-    '7': '6.1',
-    '8': '7.1'
-}
-
-VIDEO_QUALITY_PROFILES = {
-    20000: '20 Mbps 1080p',
-    12000: '12 Mbps 1080p',
-    10000: '10 Mbps 1080p',
-    8000: '8 Mbps 1080p',
-    4000: '4 Mbps 720p',
-    3000: '3 Mbps 720p',
-    2000: '2 Mbps 720p',
-    1500: '1.5 Mbps 480p',
-    720: '0.7 Mbps 328p',
-    320: '0.3 Mbps 240p',
-    208: '0.2 Mbps 160p',
-    96: '0.096 Mbps',
-    64: '0.064 Mbps'
-}
-VIDEO_QUALITY_PROFILES = OrderedDict(sorted(list(VIDEO_QUALITY_PROFILES.items()), key=lambda k: k[0], reverse=True))
-
-AUDIO_QUALITY_PROFILES = {
-    512: '512 kbps',
-    320: '320 kbps',
-    256: '256 kbps',
-    192: '192 kbps',
-    128: '128 kbps',
-    96: '96 kbps'
-}
-AUDIO_QUALITY_PROFILES = OrderedDict(sorted(list(AUDIO_QUALITY_PROFILES.items()), key=lambda k: k[0], reverse=True))
-
-HW_DECODERS = [
-    'd3d11va',
-    'dxva2',
-    'videotoolbox',
-    'mediacodecndk',
-    'vaapi',
-    'nvdec'
-]
-HW_ENCODERS = [
-    'qsv',
-    'mf',
-    'videotoolbox',
-    'mediacodecndk',
-    'vaapi',
-    'nvenc'
-]
-
-EXTRA_TYPES = {
-    '1': 'Trailer',
-    '2': 'Deleted Scene',
-    '3': 'Interview',
-    '5': 'Behind the Scenes',
-    '6': 'Scene',
-    '10': 'Featurette',
-    '11': 'Short'
-}
-
-SCHEDULER_LIST = [
-    ('Check GitHub for updates', 'scheduled'),
-    ('Check for server response', 'websocket'),
-    ('Check for active sessions', 'websocket'),
-    ('Check for recently added items', 'websocket'),
-    ('Check for server remote access', 'websocket'),
-    ('Check for Plex updates', 'scheduled'),
-    ('Refresh users list', 'scheduled'),
-    ('Refresh libraries list', 'scheduled'),
-    ('Refresh Plex server URLs', 'scheduled'),
-    ('Optimize Tautulli database', 'scheduled'),
-    ('Backup Tautulli database', 'scheduled'),
-    ('Backup Tautulli config', 'scheduled')
-]
-SCHEDULER_LIST = OrderedDict(SCHEDULER_LIST)
-
-DATE_TIME_FORMATS = [
-    {
-        'category': 'Year',
-        'parameters': [
-            {'value': 'YYYY', 'description': 'Numeric, four digits', 'example': '1999, 2003'},
-            {'value': 'YY', 'description': 'Numeric, two digits', 'example': '99, 03'}
-        ]
-     },
-    {
-        'category': 'Month',
-        'parameters': [
-            {'value': 'MMMM', 'description': 'Textual, full', 'example': 'January-December'},
-            {'value': 'MMM', 'description': 'Textual, three letters', 'example': 'Jan-Dec'},
-            {'value': 'MM', 'description': 'Numeric, with leading zeros', 'example': '01-12'},
-            {'value': 'M', 'description': 'Numeric, without leading zeros', 'example': '1-12'},
-            {'value': 'Mo', 'description': 'Numeric, with suffix', 'example': '1st, 2nd ... 12th'},
-        ]
-     },
-    {
-        'category': 'Day of the Year',
-        'parameters': [
-            {'value': 'DDDD', 'description': 'Numeric, with leading zeros', 'example': '001-365'},
-            {'value': 'DDD', 'description': 'Numeric, without leading zeros', 'example': '1-365'},
-            {'value': 'DDDo', 'description': 'Numeric, with suffix', 'example': '1st, 2nd, ... 365th'},
-        ]
-     },
-    {
-        'category': 'Day of the Month',
-        'parameters': [
-            {'value': 'DD', 'description': 'Numeric, with leading zeros', 'example': '01-31'},
-            {'value': 'D', 'description': 'Numeric, without leading zeros', 'example': '1-31'},
-            {'value': 'Do', 'description': 'Numeric, with suffix', 'example': '1st, 2nd ... 31st'},
-        ]
-     },
-    {
-        'category': 'Day of the Week',
-        'parameters': [
-            {'value': 'dddd', 'description': 'Textual, full', 'example': 'Sunday-Saturday'},
-            {'value': 'ddd', 'description': 'Textual, three letters', 'example': 'Sun-Sat'},
-            {'value': 'dd', 'description': 'Textual, two letters', 'example': 'Su-Sa'},
-            {'value': 'd', 'description': 'Numeric', 'example': '0-6'},
-            {'value': 'do', 'description': 'Numeric, with suffix', 'example': '0th, 1st ... 6th'},
-        ]
-     },
-    {
-        'category': 'Hour',
-        'parameters': [
-            {'value': 'HH', 'description': '24-hour, with leading zeros', 'example': '00-23'},
-            {'value': 'H', 'description': '24-hour, without leading zeros', 'example': '0-23'},
-            {'value': 'hh', 'description': '12-hour, with leading zeros', 'example': '01-12'},
-            {'value': 'h', 'description': '12-hour, without leading zeros', 'example': '1-12'},
-        ]
-     },
-    {
-        'category': 'Minute',
-        'parameters': [
-            {'value': 'mm', 'description': 'Numeric, with leading zeros', 'example': '00-59'},
-            {'value': 'm', 'description': 'Numeric, without leading zeros', 'example': '0-59'},
-        ]
-     },
-    {
-        'category': 'Second',
-        'parameters': [
-            {'value': 'ss', 'description': 'Numeric, with leading zeros', 'example': '00-59'},
-            {'value': 's', 'description': 'Numeric, without leading zeros', 'example': '0-59'},
-        ]
-     },
-    {
-        'category': 'AM / PM',
-        'parameters': [
-            {'value': 'A', 'description': 'AM/PM uppercase', 'example': 'AM, PM'},
-            {'value': 'a', 'description': 'am/pm lowercase', 'example': 'am, pm'},
-        ]
-     },
-    {
-        'category': 'Timezone',
-        'parameters': [
-            {'value': 'ZZ', 'description': 'UTC offset', 'example': '+0100, -0700'},
-            {'value': 'Z', 'description': 'UTC offset', 'example': '+01:00, -07:00'},
-        ]
-     },
-    {
-        'category': 'Timestamp',
-        'parameters': [
-            {'value': 'X', 'description': 'Unix timestamp', 'example': 'E.g. 1456887825'},
-        ]
-     },
-]
-
-NOTIFICATION_PARAMETERS = [
-    {
-        'category': 'Global',
-        'parameters': [
-             {'name': 'Tautulli Version', 'type': 'str', 'value': 'tautulli_version', 'description': 'The current version of Tautulli.'},
-             {'name': 'Tautulli Remote', 'type': 'str', 'value': 'tautulli_remote', 'description': 'The current git remote of Tautulli.'},
-             {'name': 'Tautulli Branch', 'type': 'str', 'value': 'tautulli_branch', 'description': 'The current git branch of Tautulli.'},
-             {'name': 'Tautulli Commit', 'type': 'str', 'value': 'tautulli_commit', 'description': 'The current git commit hash of Tautulli.'},
-             {'name': 'Server Name', 'type': 'str', 'value': 'server_name', 'description': 'The name of your Plex Server.'},
-             {'name': 'Server IP', 'type': 'str', 'value': 'server_ip', 'description': 'The connection IP address for your Plex Server.'},
-             {'name': 'Server Port', 'type': 'int', 'value': 'server_port', 'description': 'The connection port for your Plex Server.'},
-             {'name': 'Server URL', 'type': 'str', 'value': 'server_url', 'description': 'The connection URL for your Plex Server.'},
-             {'name': 'Server Platform', 'type': 'str', 'value': 'server_platform', 'description': 'The platform of your Plex Server.'},
-             {'name': 'Server Version', 'type': 'str', 'value': 'server_version', 'description': 'The current version of your Plex Server.'},
-             {'name': 'Server ID', 'type': 'str', 'value': 'server_machine_id', 'description': 'The unique identifier for your Plex Server.'},
-             {'name': 'Action', 'type': 'str', 'value': 'action', 'description': 'The action that triggered the notification.'},
-             {'name': 'Current Year', 'type': 'int', 'value': 'current_year', 'description': 'The year when the notification is triggered.'},
-             {'name': 'Current Month', 'type': 'int', 'value': 'current_month', 'description': 'The month when the notification is triggered.', 'example': '1 to 12'},
-             {'name': 'Current Day', 'type': 'int', 'value': 'current_day', 'description': 'The day when the notification is triggered.', 'example': '1 to 31'},
-             {'name': 'Current Hour', 'type': 'int', 'value': 'current_hour', 'description': 'The hour when the notification is triggered.', 'example': '0 to 23'},
-             {'name': 'Current Minute', 'type': 'int', 'value': 'current_minute', 'description': 'The minute when the notification is triggered.', 'example': '0 to 59'},
-             {'name': 'Current Second', 'type': 'int', 'value': 'current_second', 'description': 'The second when the notification is triggered.', 'example': '0 to 59'},
-             {'name': 'Current Weekday', 'type': 'int', 'value': 'current_weekday', 'description': 'The ISO weekday when the notification is triggered.', 'example': '1 (Mon) to 7 (Sun)'},
-             {'name': 'Current Week', 'type': 'int', 'value': 'current_week', 'description': 'The ISO week number when the notification is triggered.', 'example': '1 to 52'},
-             {'name': 'Datestamp', 'type': 'str', 'value': 'datestamp', 'description': 'The date (in date format) when the notification is triggered.'},
-             {'name': 'Timestamp', 'type': 'str', 'value': 'timestamp', 'description': 'The time (in time format) when the notification is triggered.'},
-             {'name': 'Unix Time', 'type': 'int', 'value': 'unixtime', 'description': 'The unix timestamp when the notification is triggered.'},
-             {'name': 'UTC Time', 'type': 'int', 'value': 'utctime', 'description': 'The UTC timestamp in ISO format when the notification is triggered.'},
-        ]
-     },
-    {
-        'category': 'Stream Details',
-        'parameters': [
-             {'name': 'Streams', 'type': 'int', 'value': 'streams', 'description': 'The total number of concurrent streams.'},
-             {'name': 'LAN Streams', 'type': 'int', 'value': 'lan_streams', 'description': 'The total number of concurrent LAN streams.'},
-             {'name': 'WAN Streams', 'type': 'int', 'value': 'wan_streams', 'description': 'The total number of concurrent WAN streams.'},
-             {'name': 'Direct Plays', 'type': 'int', 'value': 'direct_plays', 'description': 'The total number of concurrent direct plays.'},
-             {'name': 'Direct Streams', 'type': 'int', 'value': 'direct_streams', 'description': 'The total number of concurrent direct streams.'},
-             {'name': 'Transcodes', 'type': 'int', 'value': 'transcodes', 'description': 'The total number of concurrent transcodes.'},
-             {'name': 'Total Bandwidth', 'type': 'int', 'value': 'total_bandwidth', 'description': 'The total Plex Streaming Brain reserved bandwidth (in kbps).', 'help_text': 'not the used bandwidth'},
-             {'name': 'LAN Bandwidth', 'type': 'int', 'value': 'lan_bandwidth', 'description': 'The total Plex Streaming Brain reserved LAN bandwidth (in kbps).', 'help_text': 'not the used bandwidth'},
-             {'name': 'WAN Bandwidth', 'type': 'int', 'value': 'wan_bandwidth', 'description': 'The total Plex Streaming Brain reserved WAN bandwidth (in kbps).', 'help_text': 'not the used bandwidth'},
-             {'name': 'User Streams', 'type': 'int', 'value': 'user_streams', 'description': 'The number of concurrent streams by the user streaming.'},
-             {'name': 'User Direct Plays', 'type': 'int', 'value': 'user_direct_plays', 'description': 'The number of concurrent direct plays by the user streaming.'},
-             {'name': 'User Direct Streams', 'type': 'int', 'value': 'user_direct_streams', 'description': 'The number of concurrent direct streams by the user streaming.'},
-             {'name': 'User Transcodes', 'type': 'int', 'value': 'user_transcodes', 'description': 'The number of concurrent transcodes by the user streaming.'},
-             {'name': 'User', 'type': 'str', 'value': 'user', 'description': 'The friendly name of the user streaming.'},
-             {'name': 'Username', 'type': 'str', 'value': 'username', 'description': 'The username of the user streaming.'},
-             {'name': 'User Email', 'type': 'str', 'value': 'user_email', 'description': 'The email address of the user streaming.'},
-             {'name': 'User Thumb', 'type': 'str', 'value': 'user_thumb', 'description': 'The profile picture URL of the user streaming.'},
-             {'name': 'Device', 'type': 'str', 'value': 'device', 'description': 'The type of client device being used for playback.'},
-             {'name': 'Platform', 'type': 'str', 'value': 'platform', 'description': 'The type of client platform being used for playback.'},
-             {'name': 'Platform Version', 'type': 'str', 'value': 'platform_version', 'description': 'The version number of the client platform being used for playback.'},
-             {'name': 'Product', 'type': 'str', 'value': 'product', 'description': 'The type of client product being used for playback.'},
-             {'name': 'Product Version', 'type': 'str', 'value': 'product_version', 'description': 'The version number of client product being used for playback.'},
-             {'name': 'Player', 'type': 'str', 'value': 'player', 'description': 'The name of the player being used for playback.'},
-             {'name': 'Initial Stream', 'type': 'int', 'value': 'initial_stream', 'description': 'If the stream is the initial stream of a continuous streaming session.', 'example': '0 or 1'},
-             {'name': 'IP Address', 'type': 'str', 'value': 'ip_address', 'description': 'The IP address of the device being used for playback.'},
-             {'name': 'Started Datestamp', 'type': 'str', 'value': 'started_datestamp', 'description': 'The date (in date format) when the stream started.'},
-             {'name': 'Started Timestamp', 'type': 'str', 'value': 'started_timestamp', 'description': 'The time (in time format) when the stream started.'},
-             {'name': 'Started Unix Time', 'type': 'int', 'value': 'started_unixtime', 'description': 'The unix timestamp when the stream started.'},
-             {'name': 'Stopped Datestamp', 'type': 'str', 'value': 'stopped_datestamp', 'description': 'The date (in date format) when the stream stopped.'},
-             {'name': 'Stopped Timestamp', 'type': 'str', 'value': 'stopped_timestamp', 'description': 'The time (in time format) when the stream stopped.'},
-             {'name': 'Stopped Unix Time', 'type': 'int', 'value': 'stopped_unixtime', 'description': 'The unix timestamp when the stream stopped.'},
-             {'name': 'Stream Duration', 'type': 'int', 'value': 'stream_duration', 'description': 'The duration (in minutes) for the stream.'},
-             {'name': 'Stream Duration (sec)', 'type': 'int', 'value': 'stream_duration_sec', 'description': 'The duration (in seconds) for the stream.'},
-             {'name': 'Stream Time', 'type': 'str', 'value': 'stream_time', 'description': 'The duration (in time format) of the stream.'},
-             {'name': 'Remaining Duration', 'type': 'int', 'value': 'remaining_duration', 'description': 'The remaining duration (in minutes) of the stream.'},
-             {'name': 'Remaining Duration (sec)', 'type': 'int', 'value': 'remaining_duration_sec', 'description': 'The remaining duration (in seconds) of the stream.'},
-             {'name': 'Remaining Time', 'type': 'str', 'value': 'remaining_time', 'description': 'The remaining duration (in time format) of the stream.'},
-             {'name': 'Progress Duration', 'type': 'int', 'value': 'progress_duration', 'description': 'The last reported offset (in minutes) of the stream.'},
-             {'name': 'Progress Duration (sec)', 'type': 'int', 'value': 'progress_duration_sec', 'description': 'The last reported offset (in seconds) of the stream.'},
-             {'name': 'Progress Time', 'type': 'str', 'value': 'progress_time', 'description': 'The last reported offset (in time format) of the stream.'},
-             {'name': 'Progress Percent', 'type': 'int', 'value': 'progress_percent', 'description': 'The last reported progress percent of the stream.'},
-             {'name': 'View Offset (ms)', 'type': 'int', 'value': 'view_offset', 'description': 'The current view offset (in milliseconds) for the stream.'},
-             {'name': 'Transcode Decision', 'type': 'str', 'value': 'transcode_decision', 'description': 'The transcode decision of the stream.'},
-             {'name': 'Container Decision', 'type': 'str', 'value': 'container_decision', 'description': 'The container transcode decision of the stream.'},
-             {'name': 'Video Decision', 'type': 'str', 'value': 'video_decision', 'description': 'The video transcode decision of the stream.'},
-             {'name': 'Audio Decision', 'type': 'str', 'value': 'audio_decision', 'description': 'The audio transcode decision of the stream.'},
-             {'name': 'Subtitle Decision', 'type': 'str', 'value': 'subtitle_decision', 'description': 'The subtitle transcode decision of the stream.'},
-             {'name': 'Quality Profile', 'type': 'str', 'value': 'quality_profile', 'description': 'The Plex quality profile of the stream.', 'example': 'e.g. Original, 4 Mbps 720p, etc.'},
-             {'name': 'Optimized Version', 'type': 'int', 'value': 'optimized_version', 'description': 'If the stream is an optimized version.', 'example': '0 or 1'},
-             {'name': 'Optimized Version Profile', 'type': 'str', 'value': 'optimized_version_profile', 'description': 'The optimized version profile of the stream.'},
-             {'name': 'Synced Version', 'type': 'int', 'value': 'synced_version', 'description': 'If the stream is an synced version.', 'example': '0 or 1'},
-             {'name': 'Live', 'type': 'int', 'value': 'live', 'description': 'If the stream is live TV.', 'example': '0 or 1'},
-             {'name': 'Marker Start Time', 'type': 'int', 'value': 'marker_start', 'description': 'The intro or credits marker start time offset in milliseconds.'},
-             {'name': 'Marker End Time', 'type': 'int', 'value': 'marker_end', 'description': 'The intro or credits marker end time offset in milliseconds.'},
-             {'name': 'Credits Marker First', 'type': 'int', 'value': 'credits_marker_first', 'description': 'If the marker is the first credits marker.', 'example': '0 or 1'},
-             {'name': 'Credits Marker Final', 'type': 'int', 'value': 'credits_marker_final', 'description': 'If the marker is the final credits marker.', 'example': '0 or 1'},
-             {'name': 'Channel Call Sign', 'type': 'str', 'value': 'channel_call_sign', 'description': 'The Live TV channel call sign.'},
-             {'name': 'Channel ID', 'type': 'str', 'value': 'channel_id', 'description': 'The Live TV channel number.'},
-             {'name': 'Channel Identifier', 'type': 'str', 'value': 'channel_identifier', 'description': 'The Live TV channel identifier.'},
-             {'name': 'Channel Title', 'type': 'str', 'value': 'channel_title', 'description': 'The Live TV channel title.'},
-             {'name': 'Channel Thumb', 'type': 'str', 'value': 'channel_thumb', 'description': 'The URL for the Live TV channel logo.'},
-             {'name': 'Channel VCN', 'type': 'str', 'value': 'channel_title', 'description': 'The Live TV tuner channel number.'},
-             {'name': 'Secure', 'type': 'int', 'value': 'secure', 'description': 'If the stream is using a secure connection.', 'example': '0 or 1'},
-             {'name': 'Relayed', 'type': 'int', 'value': 'relayed', 'description': 'If the stream is using Plex Relay.', 'example': '0 or 1'},
-             {'name': 'Stream Local', 'type': 'int', 'value': 'stream_local', 'description': 'If the stream is local.', 'example': '0 or 1'},
-             {'name': 'Stream Location', 'type': 'str', 'value': 'stream_location', 'description': 'The network location of the stream.', 'example': 'lan or wan'},
-             {'name': 'Stream Bandwidth', 'type': 'int', 'value': 'stream_bandwidth', 'description': 'The Plex Streaming Brain reserved bandwidth (in kbps) of the stream.', 'help_text': 'not the used bandwidth'},
-             {'name': 'Stream Container', 'type': 'str', 'value': 'stream_container', 'description': 'The media container of the stream.'},
-             {'name': 'Stream Bitrate', 'type': 'int', 'value': 'stream_bitrate', 'description': 'The bitrate (in kbps) of the stream.'},
-             {'name': 'Stream Aspect Ratio', 'type': 'float', 'value': 'stream_aspect_ratio', 'description': 'The aspect ratio of the stream.'},
-             {'name': 'Stream Video Codec', 'type': 'str', 'value': 'stream_video_codec', 'description': 'The video codec of the stream.'},
-             {'name': 'Stream Video Codec Level', 'type': 'int', 'value': 'stream_video_codec_level', 'description': 'The video codec level of the stream.'},
-             {'name': 'Stream Video Bitrate', 'type': 'int', 'value': 'stream_video_bitrate', 'description': 'The video bitrate (in kbps) of the stream.'},
-             {'name': 'Stream Video Bit Depth', 'type': 'int', 'value': 'stream_video_bit_depth', 'description': 'The video bit depth of the stream.'},
-             {'name': 'Stream Video Chroma Subsampling', 'type': 'str', 'value': 'stream_video_chroma_subsampling', 'description': 'The video chroma subsampling of the stream.'},
-             {'name': 'Stream Video Color Primaries', 'type': 'str', 'value': 'stream_video_color_primaries', 'description': 'The video color primaries of the stream.'},
-             {'name': 'Stream Video Color Range', 'type': 'str', 'value': 'stream_video_color_range', 'description': 'The video color range of the stream.'},
-             {'name': 'Stream Video Color Space', 'type': 'str', 'value': 'stream_video_color_space', 'description': 'The video color space of the stream.'},
-             {'name': 'Stream Video Color Transfer Function', 'type': 'str', 'value': 'stream_video_color_trc', 'description': 'The video transfer function of the stream.'},
-             {'name': 'Stream Video Dynamic Range', 'type': 'str', 'value': 'stream_video_dynamic_range', 'description': 'The video dynamic range of the stream.', 'example': 'HDR or SDR'},
-             {'name': 'Stream Video DOVI Present', 'type': 'int', 'value': 'stream_video_dovi_present', 'description': 'If Dolby Vision is present in the stream.', 'example': '0 or 1'},
-             {'name': 'Stream Video DOVI Level', 'type': 'int', 'value': 'stream_video_dovi_level', 'description': 'The Dolby Vision level of the stream.'},
-             {'name': 'Stream Video DOVI Profile', 'type': 'int', 'value': 'stream_video_dovi_profile', 'description': 'The Dolby Vision profile of the stream.',},
-             {'name': 'Stream Video Framerate', 'type': 'str', 'value': 'stream_video_framerate', 'description': 'The video framerate of the stream.'},
-             {'name': 'Stream Video Full Resolution', 'type': 'str', 'value': 'stream_video_full_resolution', 'description': 'The video resolution of the stream with scan type.'},
-             {'name': 'Stream Video Ref Frames', 'type': 'int', 'value': 'stream_video_ref_frames', 'description': 'The video reference frames of the stream.'},
-             {'name': 'Stream Video Resolution', 'type': 'str', 'value': 'stream_video_resolution', 'description': 'The video resolution of the stream.'},
-             {'name': 'Stream Video Scan Type', 'type': 'str', 'value': 'stream_video_scan_type', 'description': 'The video scan type of the stream.'},
-             {'name': 'Stream Video Height', 'type': 'int', 'value': 'stream_video_height', 'description': 'The video height of the stream.'},
-             {'name': 'Stream Video Width', 'type': 'int', 'value': 'stream_video_width', 'description': 'The video width of the stream.'},
-             {'name': 'Stream Video Language', 'type': 'str', 'value': 'stream_video_language', 'description': 'The video language of the stream.'},
-             {'name': 'Stream Video Language Code', 'type': 'str', 'value': 'stream_video_language_code', 'description': 'The video language code of the stream.'},
-             {'name': 'Stream Audio Bitrate', 'type': 'int', 'value': 'stream_audio_bitrate', 'description': 'The audio bitrate of the stream.'},
-             {'name': 'Stream Audio Bitrate Mode', 'type': 'str', 'value': 'stream_audio_bitrate_mode', 'description': 'The audio bitrate mode of the stream.', 'example': 'cbr or vbr'},
-             {'name': 'Stream Audio Codec', 'type': 'str', 'value': 'stream_audio_codec', 'description': 'The audio codec of the stream.'},
-             {'name': 'Stream Audio Channels', 'type': 'float', 'value': 'stream_audio_channels', 'description': 'The audio channels of the stream.'},
-             {'name': 'Stream Audio Channel Layout', 'type': 'str', 'value': 'stream_audio_channel_layout', 'description': 'The audio channel layout of the stream.'},
-             {'name': 'Stream Audio Sample Rate', 'type': 'int', 'value': 'stream_audio_sample_rate', 'description': 'The audio sample rate (in Hz) of the stream.'},
-             {'name': 'Stream Audio Language', 'type': 'str', 'value': 'stream_audio_language', 'description': 'The audio language of the stream.'},
-             {'name': 'Stream Audio Language Code', 'type': 'str', 'value': 'stream_audio_language_code', 'description': 'The audio language code of the stream.'},
-             {'name': 'Stream Audio Profile', 'type': 'str', 'value': 'stream_audio_profile', 'description': 'The audio profile of the stream.'},
-             {'name': 'Stream Subtitle Codec', 'type': 'str', 'value': 'stream_subtitle_codec', 'description': 'The subtitle codec of the stream.'},
-             {'name': 'Stream Subtitle Container', 'type': 'str', 'value': 'stream_subtitle_container', 'description': 'The subtitle container of the stream.'},
-             {'name': 'Stream Subtitle Format', 'type': 'str', 'value': 'stream_subtitle_format', 'description': 'The subtitle format of the stream.'},
-             {'name': 'Stream Subtitle Forced', 'type': 'int', 'value': 'stream_subtitle_forced', 'description': 'If the subtitles are forced.', 'example': '0 or 1'},
-             {'name': 'Stream Subtitle Language', 'type': 'str', 'value': 'stream_subtitle_language', 'description': 'The subtitle language of the stream.'},
-             {'name': 'Stream Subtitle Language Code', 'type': 'str', 'value': 'stream_subtitle_language_code', 'description': 'The subtitle language code of the stream.'},
-             {'name': 'Stream Subtitle Location', 'type': 'str', 'value': 'stream_subtitle_location', 'description': 'The subtitle location of the stream.'},
-             {'name': 'Transcode Container', 'type': 'str', 'value': 'transcode_container', 'description': 'The media container of the transcoded stream.'},
-             {'name': 'Transcode Video Codec', 'type': 'str', 'value': 'transcode_video_codec', 'description': 'The video codec of the transcoded stream.'},
-             {'name': 'Transcode Video Width', 'type': 'int', 'value': 'transcode_video_width', 'description': 'The video width of the transcoded stream.'},
-             {'name': 'Transcode Video Height', 'type': 'int', 'value': 'transcode_video_height', 'description': 'The video height of the transcoded stream.'},
-             {'name': 'Transcode Audio Codec', 'type': 'str', 'value': 'transcode_audio_codec', 'description': 'The audio codec of the transcoded stream.'},
-             {'name': 'Transcode Audio Channels', 'type': 'float', 'value': 'transcode_audio_channels', 'description': 'The audio channels of the transcoded stream.'},
-             {'name': 'Transcode HW Requested', 'type': 'int', 'value': 'transcode_hw_requested', 'description': 'If hardware decoding/encoding was requested.', 'example': '0 or 1'},
-             {'name': 'Transcode HW Decoding', 'type': 'int', 'value': 'transcode_hw_decoding', 'description': 'If hardware decoding is used.', 'example': '0 or 1'},
-             {'name': 'Transcode HW Decoding Codec', 'type': 'str', 'value': 'transcode_hw_decode', 'description': 'The hardware decoding codec.'},
-             {'name': 'Transcode HW Decoding Title', 'type': 'str', 'value': 'transcode_hw_decode_title', 'description': 'The hardware decoding codec title.'},
-             {'name': 'Transcode HW Encoding', 'type': 'int', 'value': 'transcode_hw_encoding', 'description': 'If hardware encoding is used.', 'example': '0 or 1'},
-             {'name': 'Transcode HW Encoding Codec', 'type': 'str', 'value': 'transcode_hw_encode', 'description': 'The hardware encoding codec.'},
-             {'name': 'Transcode HW Encoding Title', 'type': 'str', 'value': 'transcode_hw_encode_title', 'description': 'The hardware encoding codec title.'},
-             {'name': 'Session Key', 'type': 'str', 'value': 'session_key', 'description': 'The unique identifier for the session.'},
-             {'name': 'Transcode Key', 'type': 'str', 'value': 'transcode_key', 'description': 'The unique identifier for the transcode session.'},
-             {'name': 'Session ID', 'type': 'str', 'value': 'session_id', 'description': 'The unique identifier for the stream.'},
-             {'name': 'User ID', 'type': 'int', 'value': 'user_id', 'description': 'The unique identifier for the user.'},
-             {'name': 'Machine ID', 'type': 'str', 'value': 'machine_id', 'description': 'The unique identifier for the player.'},
-         ]
-     },
-    {
-        'category': 'Source Metadata Details',
-        'parameters': [
-             {'name': 'Media Type', 'type': 'str', 'value': 'media_type', 'description': 'The type of media.', 'example': 'movie, show, season, episode, artist, album, track, clip'},
-             {'name': 'Library Name', 'type': 'str', 'value': 'library_name', 'description': 'The library name of the item.'},
-             {'name': 'Title', 'type': 'str', 'value': 'title', 'description': 'The full title of the item.'},
-             {'name': 'Edition Title', 'type': 'str', 'value': 'edition_title', 'description': 'The edition title of the movie.'},
-             {'name': 'Show Name', 'type': 'str', 'value': 'show_name', 'description': 'The title of the TV show.'},
-             {'name': 'Season Name', 'type': 'str', 'value': 'season_name', 'description': 'The title of the TV season.'},
-             {'name': 'Episode Name', 'type': 'str', 'value': 'episode_name', 'description': 'The title of the TV episode.'},
-             {'name': 'Artist Name', 'type': 'str', 'value': 'artist_name', 'description': 'The name of the artist.'},
-             {'name': 'Album Name', 'type': 'str', 'value': 'album_name', 'description': 'The title of the album.'},
-             {'name': 'Track Name', 'type': 'str', 'value': 'track_name', 'description': 'The title of the track.'},
-             {'name': 'Track Artist', 'type': 'str', 'value': 'track_artist', 'description': 'The name of the artist of the track.'},
-             {'name': 'Season Number', 'type': 'int', 'value': 'season_num', 'description': 'The season number.', 'example': 'e.g. 1, or 1-3'},
-             {'name': 'Season Number 00', 'type': 'int', 'value': 'season_num00', 'description': 'The two digit season number.', 'example': 'e.g. 01, or 01-03'},
-             {'name': 'Episode Number', 'type': 'int', 'value': 'episode_num', 'description': 'The episode number.', 'example': 'e.g. 6, or 6-10'},
-             {'name': 'Episode Number 00', 'type': 'int', 'value': 'episode_num00', 'description': 'The two digit episode number.', 'example': 'e.g. 06, or 06-10'},
-             {'name': 'Disc Number', 'type': 'int', 'value': 'disc_num', 'description': 'The disc number.', 'example': 'e.g. 2'},
-             {'name': 'Disc Number 00', 'type': 'int', 'value': 'disc_num00', 'description': 'The two digit disc number.', 'example': 'e.g. 02'},
-             {'name': 'Track Number', 'type': 'int', 'value': 'track_num', 'description': 'The track number.', 'example': 'e.g. 4, or 4-10'},
-             {'name': 'Track Number 00', 'type': 'int', 'value': 'track_num00', 'description': 'The two digit track number.', 'example': 'e.g. 04, or 04-10'},
-             {'name': 'Season Count', 'type': 'int', 'value': 'season_count', 'description': 'The number of seasons in a grouped recently added notification.'},
-             {'name': 'Episode Count', 'type': 'int', 'value': 'episode_count', 'description': 'The number of episodes in a grouped recently added notification.'},
-             {'name': 'Album Count', 'type': 'int', 'value': 'album_count', 'description': 'The number of albums in a grouped recently added notification.'},
-             {'name': 'Track Count', 'type': 'int', 'value': 'track_count', 'description': 'The number of tracks in a grouped recently added notification.'},
-             {'name': 'Year', 'type': 'int', 'value': 'year', 'description': 'The release year for the item.'},
-             {'name': 'Show Year', 'type': 'int', 'value': 'show_year', 'description': 'The release year of the TV show.'},
-             {'name': 'Release Date', 'type': 'str', 'value': 'release_date', 'description': 'The release date (in date format) for the item.'},
-             {'name': 'Air Date', 'type': 'str', 'value': 'air_date', 'description': 'The air date (in date format) for the item.'},
-             {'name': 'Added Date', 'type': 'str', 'value': 'added_date', 'description': 'The date (in date format) the item was added to Plex.'},
-             {'name': 'Updated Date', 'type': 'str', 'value': 'updated_date', 'description': 'The date (in date format) the item was updated on Plex.'},
-             {'name': 'Last Viewed Date', 'type': 'str', 'value': 'last_viewed_date', 'description': 'The date (in date format) the item was last viewed on Plex.'},
-             {'name': 'Studio', 'type': 'str', 'value': 'studio', 'description': 'The studio for the item.'},
-             {'name': 'Content Rating', 'type': 'str', 'value': 'content_rating', 'description': 'The content rating for the item.', 'example': 'e.g. TV-MA, TV-PG, etc.'},
-             {'name': 'Directors', 'type': 'str', 'value': 'directors', 'description': 'A list of directors for the item.'},
-             {'name': 'Writers', 'type': 'str', 'value': 'writers', 'description': 'A list of writers for the item.'},
-             {'name': 'Actors', 'type': 'str', 'value': 'actors', 'description': 'A list of actors for the item.'},
-             {'name': 'Genres', 'type': 'str', 'value': 'genres', 'description': 'A list of genres for the item.'},
-             {'name': 'Labels', 'type': 'str', 'value': 'labels', 'description': 'A list of labels for the item.'},
-             {'name': 'Collections', 'type': 'str', 'value': 'collections', 'description': 'A list of collections for the item.'},
-             {'name': 'Summary', 'type': 'str', 'value': 'summary', 'description': 'A short plot summary for the item.'},
-             {'name': 'Tagline', 'type': 'str', 'value': 'tagline', 'description': 'A tagline for the media item.'},
-             {'name': 'Rating', 'type': 'float', 'value': 'rating', 'description': 'The rating (out of 10) for the item.'},
-             {'name': 'Critic Rating', 'type': 'int', 'value': 'critic_rating', 'description': 'The critic rating (%) for the item.', 'help_text': 'Ratings source must be Rotten Tomatoes for the Plex Movie agent'},
-             {'name': 'Audience Rating', 'type': 'float', 'value': 'audience_rating', 'description': 'The audience rating for the item.', 'help_text': 'Rating out of 10 for IMDB, percentage (%) for Rotten Tomatoes and TMDB.'},
-             {'name': 'User Rating', 'type': 'float', 'value': 'user_rating', 'description': 'The user (star) rating (out of 10) for the item.'},
-             {'name': 'Duration', 'type': 'int', 'value': 'duration', 'description': 'The duration (in minutes) for the item.'},
-             {'name': 'Duration (sec)', 'type': 'int', 'value': 'duration_sec', 'description': 'The duration (in seconds) for the item.'},
-             {'name': 'Duration (ms)', 'type': 'int', 'value': 'duration_ms', 'description': 'The duration (in milliseconds) for the item.'},
-             {'name': 'Duration Time', 'type': 'str', 'value': 'duration_time', 'description': 'The duration (in time format) for the item.'},
-             {'name': 'Poster URL', 'type': 'str', 'value': 'poster_url', 'description': 'A URL for the movie, TV show, or album poster.'},
-             {'name': 'Plex ID', 'type': 'str', 'value': 'plex_id', 'description': 'The Plex ID for the item.', 'example': 'e.g. 5d7769a9594b2b001e6a6b7e'},
-             {'name': 'Plex URL', 'type': 'str', 'value': 'plex_url', 'description': 'The Plex URL to your server for the item.'},
-             {'name': 'Plex Slug', 'type': 'str', 'value': 'plex_slug', 'description': 'The Plex URL slug for the item.'},
-             {'name': 'Plex Watch URL', 'type': 'str', 'value': 'plex_watch_url', 'description': 'The Plex URL to watch.plex.tv for the item.'},
-             {'name': 'IMDB ID', 'type': 'str', 'value': 'imdb_id', 'description': 'The IMDB ID for the movie or TV show.', 'example': 'e.g. tt2488496'},
-             {'name': 'IMDB URL', 'type': 'str', 'value': 'imdb_url', 'description': 'The IMDB URL for the movie or TV show.'},
-             {'name': 'TVDB ID', 'type': 'int', 'value': 'thetvdb_id', 'description': 'The TVDB ID for the movie or TV show.', 'example': 'e.g. 121361'},
-             {'name': 'TVDB URL', 'type': 'str', 'value': 'thetvdb_url', 'description': 'The TVDB URL for the movie or TV show.'},
-             {'name': 'TMDB ID', 'type': 'int', 'value': 'themoviedb_id', 'description': 'The TMDb ID for the movie or TV show.', 'example': 'e.g. 15260'},
-             {'name': 'TMDB URL', 'type': 'str', 'value': 'themoviedb_url', 'description': 'The TMDb URL for the movie or TV show.'},
-             {'name': 'TVmaze ID', 'type': 'int', 'value': 'tvmaze_id', 'description': 'The TVmaze ID for the TV show.', 'example': 'e.g. 290'},
-             {'name': 'TVmaze URL', 'type': 'str', 'value': 'tvmaze_url', 'description': 'The TVmaze URL for the TV show.'},
-             {'name': 'MusicBrainz ID', 'type': 'str', 'value': 'musicbrainz_id', 'description': 'The MusicBrainz ID for the artist, album, or track.', 'example': 'e.g. b670dfcf-9824-4309-a57e-03595aaba286'},
-             {'name': 'MusicBrainz URL', 'type': 'str', 'value': 'musicbrainz_url', 'description': 'The MusicBrainz URL for the artist, album, or track.'},
-             {'name': 'AniDB ID', 'type': 'str', 'value': 'anidb_id', 'description': 'The AniDB ID for the Anime', 'example': 'e.g. 69', 'help_text': 'TV show library agent must be HAMA'},
-             {'name': 'AniDB URL', 'type': 'str', 'value': 'anidb_url', 'description': 'The AniDB URL for the Anime', 'help_text': 'TV show library agent must be HAMA'},
-             {'name': 'Last.fm URL', 'type': 'str', 'value': 'lastfm_url', 'description': 'The Last.fm URL for the album.', 'help_text': 'Music library agent must be Last.fm'},
-             {'name': 'Trakt.tv URL', 'type': 'str', 'value': 'trakt_url', 'description': 'The trakt.tv URL for the movie or TV show.'},
-             {'name': 'Container', 'type': 'str', 'value': 'container', 'description': 'The media container of the original media.'},
-             {'name': 'Bitrate', 'type': 'int', 'value': 'bitrate', 'description': 'The bitrate of the original media.'},
-             {'name': 'Aspect Ratio', 'type': 'float', 'value': 'aspect_ratio', 'description': 'The aspect ratio of the original media.'},
-             {'name': 'Video Codec', 'type': 'str', 'value': 'video_codec', 'description': 'The video codec of the original media.'},
-             {'name': 'Video Codec Level', 'type': 'int', 'value': 'video_codec_level', 'description': 'The video codec level of the original media.'},
-             {'name': 'Video Bitrate', 'type': 'int', 'value': 'video_bitrate', 'description': 'The video bitrate of the original media.'},
-             {'name': 'Video Bit Depth', 'type': 'int', 'value': 'video_bit_depth', 'description': 'The video bit depth of the original media.'},
-             {'name': 'Video Chroma Subsampling', 'type': 'str', 'value': 'video_chroma_subsampling', 'description': 'The video chroma subsampling of the original media.'},
-             {'name': 'Video Color Primaries', 'type': 'str', 'value': 'video_color_primaries', 'description': 'The video color primaries of the original media.'},
-             {'name': 'Video Color Range', 'type': 'str', 'value': 'video_color_range', 'description': 'The video color range of the original media.'},
-             {'name': 'Video Color Space', 'type': 'str', 'value': 'video_color_space', 'description': 'The video color space of the original media.'},
-             {'name': 'Video Color Transfer Function', 'type': 'str', 'value': 'video_color_trc', 'description': 'The video transfer function of the original media.'},
-             {'name': 'Video Dynamic Range', 'type': 'str', 'value': 'video_dynamic_range', 'description': 'The video dynamic range of the original media.', 'example': 'HDR or SDR'},
-             {'name': 'Video DOVI Present', 'type': 'int', 'value': 'video_dovi_present', 'description': 'If Dolby Vision is present in the original media.', 'example': '0 or 1'},
-             {'name': 'Video DOVI Level', 'type': 'int', 'value': 'video_dovi_level', 'description': 'The Dolby Vision level of the original media.'},
-             {'name': 'Video DOVI Profile', 'type': 'int', 'value': 'video_dovi_profile', 'description': 'The Dolby Vision profile of the original media.',},
-             {'name': 'Video Framerate', 'type': 'str', 'value': 'video_framerate', 'description': 'The video framerate of the original media.'},
-             {'name': 'Video Full Resolution', 'type': 'str', 'value': 'video_full_resolution', 'description': 'The video resolution of the original media with scan type.'},
-             {'name': 'Video Ref Frames', 'type': 'int', 'value': 'video_ref_frames', 'description': 'The video reference frames of the original media.'},
-             {'name': 'Video Resolution', 'type': 'str', 'value': 'video_resolution', 'description': 'The video resolution of the original media.'},
-             {'name': 'Video Scan Type', 'type': 'str', 'value': 'video_scan_type', 'description': 'The video scan type of the original media.'},
-             {'name': 'Video Height', 'type': 'int', 'value': 'video_height', 'description': 'The video height of the original media.'},
-             {'name': 'Video Width', 'type': 'int', 'value': 'video_width', 'description': 'The video width of the original media.'},
-             {'name': 'Video Language', 'type': 'str', 'value': 'video_language', 'description': 'The video language of the original media.'},
-             {'name': 'Video Language Code', 'type': 'str', 'value': 'video_language_code', 'description': 'The video language code of the original media.'},
-             {'name': 'Audio Bitrate', 'type': 'int', 'value': 'audio_bitrate', 'description': 'The audio bitrate of the original media.'},
-             {'name': 'Audio Bitrate Mode', 'type': 'str', 'value': 'audio_bitrate_mode', 'description': 'The audio bitrate mode of the original media.', 'example': 'cbr or vbr'},
-             {'name': 'Audio Codec', 'type': 'str', 'value': 'audio_codec', 'description': 'The audio codec of the original media.'},
-             {'name': 'Audio Channels', 'type': 'float', 'value': 'audio_channels', 'description': 'The audio channels of the original media.'},
-             {'name': 'Audio Channel Layout', 'type': 'str', 'value': 'audio_channel_layout', 'description': 'The audio channel layout of the original media.'},
-             {'name': 'Audio Sample Rate', 'type': 'int', 'value': 'audio_sample_rate', 'description': 'The audio sample rate (in Hz) of the original media.'},
-             {'name': 'Audio Language', 'type': 'str', 'value': 'audio_language', 'description': 'The audio language of the original media.'},
-             {'name': 'Audio Language Code', 'type': 'str', 'value': 'audio_language_code', 'description': 'The audio language code of the original media.'},
-             {'name': 'Audio Profile', 'type': 'str', 'value': 'audio_profile', 'description': 'The audio profile of the original media.'},
-             {'name': 'Subtitle Codec', 'type': 'str', 'value': 'subtitle_codec', 'description': 'The subtitle codec of the original media.'},
-             {'name': 'Subtitle Container', 'type': 'str', 'value': 'subtitle_container', 'description': 'The subtitle container of the original media.'},
-             {'name': 'Subtitle Format', 'type': 'str', 'value': 'subtitle_format', 'description': 'The subtitle format of the original media.'},
-             {'name': 'Subtitle Forced', 'type': 'int', 'value': 'subtitle_forced', 'description': 'If the subtitles are forced.', 'example': '0 or 1'},
-             {'name': 'Subtitle Location', 'type': 'str', 'value': 'subtitle_location', 'description': 'The subtitle location of the original media.'},
-             {'name': 'Subtitle Language', 'type': 'str', 'value': 'subtitle_language', 'description': 'The subtitle language of the original media.'},
-             {'name': 'Subtitle Language Code', 'type': 'str', 'value': 'subtitle_language_code', 'description': 'The subtitle language code of the original media.'},
-             {'name': 'File', 'type': 'str', 'value': 'file', 'description': 'The file path to the item.'},
-             {'name': 'Filename', 'type': 'str', 'value': 'filename', 'description': 'The file name of the item.'},
-             {'name': 'File Size', 'type': 'str', 'value': 'file_size', 'description': 'The file size of the item in human readable format.', 'example': '1.2 GB'},
-             {'name': 'File Size Bytes', 'type': 'int', 'value': 'file_size_bytes', 'description': 'The file size of the item in bytes.'},
-             {'name': 'Guid', 'type': 'str', 'value': 'guid', 'description': 'The full guid for the item.'},
-             {'name': 'Section ID', 'type': 'int', 'value': 'section_id', 'description': 'The unique identifier for the library.'},
-             {'name': 'Rating Key', 'type': 'int', 'value': 'rating_key', 'description': 'The unique identifier for the movie, episode, or track.'},
-             {'name': 'Parent Rating Key', 'type': 'int', 'value': 'parent_rating_key', 'description': 'The unique identifier for the season or album.'},
-             {'name': 'Grandparent Rating Key', 'type': 'int', 'value': 'grandparent_rating_key', 'description': 'The unique identifier for the TV show or artist.'},
-             {'name': 'Art', 'type': 'str', 'value': 'art', 'description': 'The Plex API path to the background art for the media.'},
-             {'name': 'Thumb', 'type': 'str', 'value': 'thumb', 'description': 'The Plex API path to the thumbnail for the movie or episode.'},
-             {'name': 'Parent Thumb', 'type': 'str', 'value': 'parent_thumb', 'description': 'The Plex API path to the thumbnail for the season or album.'},
-             {'name': 'Grandparent Thumb', 'type': 'str', 'value': 'grandparent_thumb', 'description': 'The Plex API path to the thumbnail for the TV show or artist.'},
-             {'name': 'Poster Thumb', 'type': 'str', 'value': 'poster_thumb', 'description': 'The Plex API path to the thumbnail for the poster image.'},
-             {'name': 'Poster Title', 'type': 'str', 'value': 'poster_title', 'description': 'The title for the poster image.'},
-             {'name': 'Indexes', 'type': 'int', 'value': 'indexes', 'description': 'If the media has video preview thumbnails.', 'example': '0 or 1'},
-         ]
-     },
-    {
-        'category': 'Plex Remote Access',
-        'parameters': [
-            {'name': 'Remote Access Mapping State', 'type': 'str', 'value': 'remote_access_mapping_state', 'description': 'The mapping state of the Plex remote access port.'},
-            {'name': 'Remote Access Mapping Error', 'type': 'str', 'value': 'remote_access_mapping_error', 'description': 'The mapping error of the Plex remote access port.'},
-            {'name': 'Remote Access Public IP Address', 'type': 'str', 'value': 'remote_access_public_address', 'description': 'The Plex remote access public IP address.'},
-            {'name': 'Remote Access Public Port', 'type': 'str', 'value': 'remote_access_public_port', 'description': 'The Plex remote access public port.'},
-            {'name': 'Remote Access Private IP Address', 'type': 'str', 'value': 'remote_access_private_address', 'description': 'The Plex remote access private IP address.'},
-            {'name': 'Remote Access Private Port', 'type': 'str', 'value': 'remote_access_private_port', 'description': 'The Plex remote access private port.'},
-            {'name': 'Remote Access Failure Reason', 'type': 'str', 'value': 'remote_access_reason', 'description': 'The failure reason for Plex remote access going down.'},
-        ]
-     },
-    {
-        'category': 'Plex Update Available',
-        'parameters': [
-             {'name': 'Update Version', 'type': 'str', 'value': 'update_version', 'description': 'The available update version for your Plex Server.'},
-             {'name': 'Update Url', 'type': 'str', 'value': 'update_url', 'description': 'The download URL for the available update.'},
-             {'name': 'Update Release Date', 'type': 'str', 'value': 'update_release_date', 'description': 'The release date (in date format) of the available update.'},
-             {'name': 'Update Channel', 'type': 'str', 'value': 'update_channel', 'description': 'The update channel.', 'example': 'Public or Plex Pass'},
-             {'name': 'Update Platform', 'type': 'str', 'value': 'update_platform', 'description': 'The platform of your Plex Server.'},
-             {'name': 'Update Distro', 'type': 'str', 'value': 'update_distro', 'description': 'The distro of your Plex Server.'},
-             {'name': 'Update Distro Build', 'type': 'str', 'value': 'update_distro_build', 'description': 'The distro build of your Plex Server.'},
-             {'name': 'Update Requirements', 'type': 'str', 'value': 'update_requirements', 'description': 'The requirements for the available update.'},
-             {'name': 'Update Extra Info', 'type': 'str', 'value': 'update_extra_info', 'description': 'Any extra info for the available update.'},
-             {'name': 'Update Changelog Added', 'type': 'str', 'value': 'update_changelog_added', 'description': 'The added changelog for the available update.'},
-             {'name': 'Update Changelog Fixed', 'type': 'str', 'value': 'update_changelog_fixed', 'description': 'The fixed changelog for the available update.'},
-         ]
-     },
-    {
-        'category': 'Tautulli Update Available',
-        'parameters': [
-             {'name': 'Tautulli Update Version', 'type': 'str', 'value': 'tautulli_update_version', 'description': 'The available update version for Tautulli.'},
-             {'name': 'Tautulli Update Release URL', 'type': 'str', 'value': 'tautulli_update_release_url', 'description': 'The release page URL on GitHub.'},
-             {'name': 'Tautulli Update Exe', 'type': 'str', 'value': 'tautulli_update_exe', 'description': 'The Windows exe download URL for the available update.'},
-             {'name': 'Tautulli Update Pkg', 'type': 'str', 'value': 'tautulli_update_pkg', 'description': 'The MacOS pkg download URL for the available update.'},
-             {'name': 'Tautulli Update Tar', 'type': 'str', 'value': 'tautulli_update_tar', 'description': 'The tar download URL for the available update.'},
-             {'name': 'Tautulli Update Zip', 'type': 'str', 'value': 'tautulli_update_zip', 'description': 'The zip download URL for the available update.'},
-             {'name': 'Tautulli Update Commit', 'type': 'str', 'value': 'tautulli_update_commit', 'description': 'The commit hash for the available update.'},
-             {'name': 'Tautulli Update Behind', 'type': 'int', 'value': 'tautulli_update_behind', 'description': 'The number of commits behind for the available update.'},
-             {'name': 'Tautulli Update Changelog', 'type': 'str', 'value': 'tautulli_update_changelog', 'description': 'The changelog for the available update.'},
-        ]
-     },
-]
-
-NEWSLETTER_PARAMETERS = [
-    {
-        'category': 'Global',
-        'parameters': [
-            {'name': 'Server Name', 'type': 'str', 'value': 'server_name', 'description': 'The name of your Plex Server.'},
-            {'name': 'Start Date', 'type': 'str', 'value': 'start_date', 'description': 'The start date of the newsletter.'},
-            {'name': 'End Date', 'type': 'str', 'value': 'end_date', 'description': 'The end date of the newsletter.'},
-            {'name': 'Current Year', 'type': 'int', 'value': 'current_year', 'description': 'The year of the start date of the newsletter.'},
-            {'name': 'Current Month', 'type': 'int', 'value': 'current_month', 'description': 'The month of the start date of the newsletter.', 'example': '1 to 12'},
-            {'name': 'Current Day', 'type': 'int', 'value': 'current_day', 'description': 'The day of the start date of the newsletter.', 'example': '1 to 31'},
-            {'name': 'Current Hour', 'type': 'int', 'value': 'current_hour', 'description': 'The hour of the start date of the newsletter.', 'example': '0 to 23'},
-            {'name': 'Current Minute', 'type': 'int', 'value': 'current_minute', 'description': 'The minute of the start date of the newsletter.', 'example': '0 to 59'},
-            {'name': 'Current Second', 'type': 'int', 'value': 'current_second', 'description': 'The second of the start date of the newsletter.', 'example': '0 to 59'},
-            {'name': 'Current Weekday', 'type': 'int', 'value': 'current_weekday', 'description': 'The ISO weekday of the start date of the newsletter.', 'example': '1 (Mon) to 7 (Sun)'},
-            {'name': 'Current Week', 'type': 'int', 'value': 'current_week', 'description': 'The ISO week number of the start date of the newsletter.', 'example': '1 to 52'},
-            {'name': 'Newsletter Time Frame', 'type': 'int', 'value': 'newsletter_time_frame', 'description': 'The time frame included in the newsletter.'},
-            {'name': 'Newsletter Time Frame Units', 'type': 'str', 'value': 'newsletter_time_frame_units', 'description': 'The time frame units included in the newsletter.'},
-            {'name': 'Newsletter URL', 'type': 'str', 'value': 'newsletter_url', 'description': 'The self-hosted URL to the newsletter.'},
-            {'name': 'Newsletter Static URL', 'type': 'str', 'value': 'newsletter_static_url', 'description': 'The static self-hosted URL to the latest scheduled newsletter for the agent.'},
-            {'name': 'Newsletter UUID', 'type': 'str', 'value': 'newsletter_uuid', 'description': 'The unique identifier for the newsletter.'},
-            {'name': 'Newsletter ID', 'type': 'int', 'value': 'newsletter_id', 'description': 'The unique ID number for the newsletter agent.'},
-            {'name': 'Newsletter ID Name', 'type': 'int', 'value': 'newsletter_id_name', 'description': 'The unique ID name for the newsletter agent.'},
-            {'name': 'Newsletter Password', 'type': 'str', 'value': 'newsletter_password', 'description': 'The password required to view the newsletter if enabled.'},
-        ]
-     },
-    {
-        'category': 'Recently Added',
-        'parameters': [
-            {'name': 'Included Libraries', 'type': 'str', 'value': 'newsletter_libraries', 'description': 'The list of libraries included in the newsletter.'},
-        ]
-    }
-]
-
-
-NOTIFICATION_PARAMETERS_TYPES = {
-    parameter['value']: parameter['type'] for category in NOTIFICATION_PARAMETERS for parameter in category['parameters']
-}
+DEFAULT_COVER_THUMB = "interfaces/default/images/cover.png"
\ No newline at end of file
diff --git a/plexpy/config.py b/plexpy/config.py
index 2c4fa8b4..f9e65086 100644
--- a/plexpy/config.py
+++ b/plexpy/config.py
@@ -1,469 +1,239 @@
-# This file is part of Tautulli.
-#
-#  Tautulli is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  Tautulli 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
-
+import plexpy.logger
+import itertools
 import os
 import re
-import shutil
-import time
-import threading
-
-from configobj import ConfigObj, ParseError
-from hashing_passwords import make_hash
-
-import plexpy
-from plexpy import helpers
-from plexpy import logger
+from configobj import ConfigObj
 
 
 def bool_int(value):
     """
     Casts a config value into a 0 or 1
     """
-    if isinstance(value, str):
+    if isinstance(value, basestring):
         if value.lower() in ('', '0', 'false', 'f', 'no', 'n', 'off'):
             value = 0
     return int(bool(value))
 
 
-FILENAME = "config.ini"
 
 _CONFIG_DEFINITIONS = {
-    'ALLOW_GUEST_ACCESS': (int, 'General', 0),
     'DATE_FORMAT': (str, 'General', 'YYYY-MM-DD'),
-    'PMS_CLIENT_ID': (str, 'PMS', ''),
+    'GROUPING_GLOBAL_HISTORY': (int, 'PlexWatch', 0),
+    'GROUPING_USER_HISTORY': (int, 'PlexWatch', 0),
+    'GROUPING_CHARTS': (int, 'PlexWatch', 0),
+    'PLEXWATCH_DATABASE': (str, 'PlexWatch', ''),
     'PMS_IDENTIFIER': (str, 'PMS', ''),
     'PMS_IP': (str, 'PMS', '127.0.0.1'),
-    'PMS_IS_CLOUD': (int, 'PMS', 0),
     'PMS_IS_REMOTE': (int, 'PMS', 0),
-    'PMS_LANGUAGE': (str, 'PMS', ''),
     'PMS_LOGS_FOLDER': (str, 'PMS', ''),
-    'PMS_LOGS_LINE_CAP': (int, 'PMS', 1000),
-    'PMS_NAME': (str, 'PMS', ''),
-    'PMS_NAME_OVERRIDE': (str, 'PMS', ''),
     'PMS_PORT': (int, 'PMS', 32400),
     'PMS_TOKEN': (str, 'PMS', ''),
-    'PMS_SSL': (int, 'PMS', 0),
+    'PMS_SSL': (int, 'General', 0),
     'PMS_URL': (str, 'PMS', ''),
-    'PMS_URL_OVERRIDE': (str, 'PMS', ''),
-    'PMS_URL_MANUAL': (int, 'PMS', 0),
     'PMS_USE_BIF': (int, 'PMS', 0),
     'PMS_UUID': (str, 'PMS', ''),
-    'PMS_TIMEOUT': (int, 'Advanced', 15),
-    'PMS_PLEXPASS': (int, 'PMS', 0),
-    'PMS_PLATFORM': (str, 'PMS', ''),
-    'PMS_VERSION': (str, 'PMS', ''),
-    'PMS_UPDATE_CHANNEL': (str, 'PMS', 'plex'),
-    'PMS_UPDATE_DISTRO': (str, 'PMS', ''),
-    'PMS_UPDATE_DISTRO_BUILD': (str, 'PMS', ''),
-    'PMS_UPDATE_CHECK_INTERVAL': (int, 'Advanced', 24),
-    'PMS_WEB_URL': (str, 'PMS', 'https://app.plex.tv/desktop'),
     'TIME_FORMAT': (str, 'General', 'HH:mm'),
-    'ANON_REDIRECT': (str, 'General', ''),
-    'ANON_REDIRECT_DYNAMIC': (int, 'General', 1),
-    'API_ENABLED': (int, 'General', 1),
+    'API_ENABLED': (int, 'General', 0),
     'API_KEY': (str, 'General', ''),
-    'API_SQL': (int, 'General', 0),
-    'BUFFER_THRESHOLD': (int, 'Monitoring', 10),
+    'BOXCAR_ENABLED': (int, 'Boxcar', 0),
+    'BOXCAR_TOKEN': (str, 'Boxcar', ''),
+    'BOXCAR_SOUND': (str, 'Boxcar', ''),
+    'BOXCAR_ON_PLAY': (int, 'Boxcar', 0),
+    'BOXCAR_ON_STOP': (int, 'Boxcar', 0),
+    'BOXCAR_ON_PAUSE': (int, 'Boxcar', 0),
+    'BOXCAR_ON_RESUME': (int, 'Boxcar', 0),
+    'BOXCAR_ON_BUFFER': (int, 'Boxcar', 0),
+    'BOXCAR_ON_WATCHED': (int, 'Boxcar', 0),
+    'BUFFER_THRESHOLD': (int, 'Monitoring', 3),
     'BUFFER_WAIT': (int, 'Monitoring', 900),
-    'BACKUP_DAYS': (int, 'General', 3),
-    'BACKUP_DIR': (str, 'General', ''),
-    'BACKUP_INTERVAL': (int, 'General', 6),
     'CACHE_DIR': (str, 'General', ''),
-    'CACHE_IMAGES': (int, 'General', 1),
     'CACHE_SIZEMB': (int, 'Advanced', 32),
-    'CHECK_DOCKER_MOUNT': (int, 'Advanced', 1),
     'CHECK_GITHUB': (int, 'General', 1),
-    'CHECK_GITHUB_INTERVAL': (int, 'General', 6),
+    'CHECK_GITHUB_INTERVAL': (int, 'General', 360),
     'CHECK_GITHUB_ON_STARTUP': (int, 'General', 1),
-    'CHECK_GITHUB_CACHE_SECONDS': (int, 'Advanced', 3600),
     'CLEANUP_FILES': (int, 'General', 0),
-    'CLOUDINARY_CLOUD_NAME': (str, 'Cloudinary', ''),
-    'CLOUDINARY_API_KEY': (str, 'Cloudinary', ''),
-    'CLOUDINARY_API_SECRET': (str, 'Cloudinary', ''),
-    'CONFIG_VERSION': (int, 'Advanced', 0),
+    'CONFIG_VERSION': (str, 'General', '0'),
     'DO_NOT_OVERRIDE_GIT_BRANCH': (int, 'General', 0),
+    'EMAIL_ENABLED': (int, 'Email', 0),
+    'EMAIL_FROM': (str, 'Email', ''),
+    'EMAIL_TO': (str, 'Email', ''),
+    'EMAIL_SMTP_SERVER': (str, 'Email', ''),
+    'EMAIL_SMTP_USER': (str, 'Email', ''),
+    'EMAIL_SMTP_PASSWORD': (str, 'Email', ''),
+    'EMAIL_SMTP_PORT': (int, 'Email', 25),
+    'EMAIL_TLS': (int, 'Email', 0),
+    'EMAIL_ON_PLAY': (int, 'Email', 0),
+    'EMAIL_ON_STOP': (int, 'Email', 0),
+    'EMAIL_ON_PAUSE': (int, 'Email', 0),
+    'EMAIL_ON_RESUME': (int, 'Email', 0),
+    'EMAIL_ON_BUFFER': (int, 'Email', 0),
+    'EMAIL_ON_WATCHED': (int, 'Email', 0),
     'ENABLE_HTTPS': (int, 'General', 0),
-    'EXPORT_DIR': (str, 'General', ''),
-    'EXPORT_THREADS': (int, 'Advanced', 8),
     'FIRST_RUN_COMPLETE': (int, 'General', 0),
     'FREEZE_DB': (int, 'General', 0),
-    'GET_FILE_SIZES': (int, 'General', 0),
-    'GET_FILE_SIZES_HOLD': (dict, 'General', {'section_ids': [], 'rating_keys': []}),
     'GIT_BRANCH': (str, 'General', 'master'),
     'GIT_PATH': (str, 'General', ''),
-    'GIT_REMOTE': (str, 'General', 'origin'),
-    'GIT_TOKEN': (str, 'General', ''),
-    'GIT_USER': (str, 'General', 'Tautulli'),
-    'GIT_REPO': (str, 'General', 'Tautulli'),
-    'GROUP_HISTORY_TABLES': (int, 'General', 1),
-    'HISTORY_TABLE_ACTIVITY': (int, 'General', 1),
-    'HOME_SECTIONS': (list, 'General', ['current_activity', 'watch_stats', 'library_stats', 'recently_added']),
-    'HOME_LIBRARY_CARDS': (list, 'General', []),
-    'HOME_STATS_CARDS': (list, 'General', ['top_movies', 'popular_movies', 'top_tv', 'popular_tv', 'top_music',
-        'popular_music', 'last_watched', 'top_libraries', 'top_users', 'top_platforms', 'most_concurrent']),
-    'HOME_REFRESH_INTERVAL': (int, 'General', 10),
-    'HTTPS_CREATE_CERT': (int, 'General', 1),
+    'GIT_USER': (str, 'General', 'drzoidberg33'),
+    'GROUP_HISTORY_TABLES': (int, 'General', 0),
+    'GROWL_ENABLED': (int, 'Growl', 0),
+    'GROWL_HOST': (str, 'Growl', ''),
+    'GROWL_PASSWORD': (str, 'Growl', ''),
+    'GROWL_ON_PLAY': (int, 'Growl', 0),
+    'GROWL_ON_STOP': (int, 'Growl', 0),
+    'GROWL_ON_PAUSE': (int, 'Growl', 0),
+    'GROWL_ON_RESUME': (int, 'Growl', 0),
+    'GROWL_ON_BUFFER': (int, 'Growl', 0),
+    'GROWL_ON_WATCHED': (int, 'Growl', 0),
+    'HOME_LIBRARY_CARDS': (str, 'General', 'library_statistics_first'),
+    'HOME_STATS_LENGTH': (int, 'General', 30),
+    'HOME_STATS_TYPE': (int, 'General', 0),
+    'HOME_STATS_COUNT': (int, 'General', 5),
+    'HOME_STATS_CARDS': (str, 'General', 'watch_statistics, top_tv, popular_tv, top_movies, popular_movies, top_music, popular_music, top_users, top_platforms, last_watched'),
     'HTTPS_CERT': (str, 'General', ''),
-    'HTTPS_CERT_CHAIN': (str, 'General', ''),
     'HTTPS_KEY': (str, 'General', ''),
-    'HTTPS_DOMAIN': (str, 'General', 'localhost'),
-    'HTTPS_IP': (str, 'General', '127.0.0.1'),
-    'HTTPS_MIN_TLS_VERSION': (str, 'Advanced', 'TLSv1.2'),
-    'HTTP_BASIC_AUTH': (int, 'General', 0),
-    'HTTP_ENVIRONMENT': (str, 'General', 'production'),
-    'HTTP_HASH_PASSWORD': (int, 'General', 1),
-    'HTTP_HASHED_PASSWORD': (int, 'General', 1),
     'HTTP_HOST': (str, 'General', '0.0.0.0'),
     'HTTP_PASSWORD': (str, 'General', ''),
     'HTTP_PORT': (int, 'General', 8181),
     'HTTP_PROXY': (int, 'General', 0),
-    'HTTP_ROOT': (str, 'General', ''),
+    'HTTP_ROOT': (str, 'General', '/'),
     'HTTP_USERNAME': (str, 'General', ''),
-    'HTTP_PLEX_ADMIN': (int, 'General', 0),
-    'HTTP_BASE_URL': (str, 'General', ''),
-    'HTTP_RATE_LIMIT_ATTEMPTS': (int, 'General', 10),
-    'HTTP_RATE_LIMIT_ATTEMPTS_INTERVAL': (int, 'General', 300),
-    'HTTP_RATE_LIMIT_LOCKOUT_TIME': (int, 'General', 300),
-    'HTTP_THREAD_POOL': (int, 'General', 10),
     'INTERFACE': (str, 'General', 'default'),
-    'IMGUR_CLIENT_ID': (str, 'Monitoring', ''),
-    'JOURNAL_MODE': (str, 'Advanced', 'WAL'),
+    'IP_LOGGING_ENABLE': (int, 'General', 0),
+    'JOURNAL_MODE': (str, 'Advanced', 'wal'),
     'LAUNCH_BROWSER': (int, 'General', 1),
-    'LAUNCH_STARTUP': (int, 'General', 1),
-    'LOG_BLACKLIST': (int, 'General', 1),
-    'LOG_BLACKLIST_USERNAMES': (int, 'General', 1),
     'LOG_DIR': (str, 'General', ''),
     'LOGGING_IGNORE_INTERVAL': (int, 'Monitoring', 120),
-    'METADATA_CACHE_SECONDS': (int, 'Advanced', 1800),
-    'MOVIE_WATCHED_PERCENT': (int, 'Monitoring', 85),
-    'MUSIC_WATCHED_PERCENT': (int, 'Monitoring', 85),
-    'MUSICBRAINZ_LOOKUP': (int, 'General', 0),
-    'MONITOR_PMS_UPDATES': (int, 'Monitoring', 0),
+    'MOVIE_NOTIFY_ENABLE': (int, 'Monitoring', 0),
+    'MOVIE_NOTIFY_ON_START': (int, 'Monitoring', 1),
+    'MOVIE_NOTIFY_ON_STOP': (int, 'Monitoring', 0),
+    'MOVIE_NOTIFY_ON_PAUSE': (int, 'Monitoring', 0),
+    'MUSIC_NOTIFY_ENABLE': (int, 'Monitoring', 0),
+    'MUSIC_NOTIFY_ON_START': (int, 'Monitoring', 1),
+    'MUSIC_NOTIFY_ON_STOP': (int, 'Monitoring', 0),
+    'MUSIC_NOTIFY_ON_PAUSE': (int, 'Monitoring', 0),
+    'MUSIC_LOGGING_ENABLE': (int, 'Monitoring', 0),
     'MONITORING_INTERVAL': (int, 'Monitoring', 60),
-    'NEWSLETTER_AUTH': (int, 'Newsletter', 0),
-    'NEWSLETTER_PASSWORD': (str, 'Newsletter', ''),
-    'NEWSLETTER_CUSTOM_DIR': (str, 'Newsletter', ''),
-    'NEWSLETTER_INLINE_STYLES': (int, 'Newsletter', 1),
-    'NEWSLETTER_TEMPLATES': (str, 'Newsletter', 'newsletters'),
-    'NEWSLETTER_DIR': (str, 'Newsletter', ''),
-    'NEWSLETTER_SELF_HOSTED': (int, 'Newsletter', 0),
-    'NOTIFICATION_THREADS': (int, 'Advanced', 2),
+    'MONITORING_USE_WEBSOCKET': (int, 'Monitoring', 0),
+    'NMA_APIKEY': (str, 'NMA', ''),
+    'NMA_ENABLED': (int, 'NMA', 0),
+    'NMA_PRIORITY': (int, 'NMA', 0),
+    'NMA_ON_PLAY': (int, 'NMA', 0),
+    'NMA_ON_STOP': (int, 'NMA', 0),
+    'NMA_ON_PAUSE': (int, 'NMA', 0),
+    'NMA_ON_RESUME': (int, 'NMA', 0),
+    'NMA_ON_BUFFER': (int, 'NMA', 0),
+    'NMA_ON_WATCHED': (int, 'NMA', 0),
     'NOTIFY_CONSECUTIVE': (int, 'Monitoring', 1),
-    'NOTIFY_CONTINUED_SESSION_THRESHOLD': (int, 'Monitoring', 15),
-    'NOTIFY_GROUP_RECENTLY_ADDED_GRANDPARENT': (int, 'Monitoring', 1),
-    'NOTIFY_GROUP_RECENTLY_ADDED_PARENT': (int, 'Monitoring', 1),
-    'NOTIFY_UPLOAD_POSTERS': (int, 'Monitoring', 0),
-    'NOTIFY_RECENTLY_ADDED_DELAY': (int, 'Monitoring', 300),
-    'NOTIFY_RECENTLY_ADDED_GRANDPARENT': (int, 'Monitoring', 0),
-    'NOTIFY_RECENTLY_ADDED_UPGRADE': (int, 'Monitoring', 0),
-    'NOTIFY_REMOTE_ACCESS_THRESHOLD': (int, 'Monitoring', 60),
-    'NOTIFY_CONCURRENT_BY_IP': (int, 'Monitoring', 0),
-    'NOTIFY_CONCURRENT_IPV6_CIDR': (str, 'Monitoring', '/64'),
-    'NOTIFY_CONCURRENT_THRESHOLD': (int, 'Monitoring', 2),
-    'NOTIFY_NEW_DEVICE_INITIAL_ONLY': (int, 'Monitoring', 1),
-    'NOTIFY_SERVER_CONNECTION_THRESHOLD': (int, 'Monitoring', 60),
-    'NOTIFY_SERVER_UPDATE_REPEAT': (int, 'Monitoring', 0),
-    'NOTIFY_PLEXPY_UPDATE_REPEAT': (int, 'Monitoring', 0),
-    'NOTIFY_TEXT_EVAL': (int, 'Advanced', 0),
-    'PLEXPY_AUTO_UPDATE': (int, 'General', 0),
-    'REFRESH_LIBRARIES_INTERVAL': (int, 'Monitoring', 12),
-    'REFRESH_LIBRARIES_ON_STARTUP': (int, 'Monitoring', 1),
+    'NOTIFY_WATCHED_PERCENT': (int, 'Monitoring', 85),
+    'NOTIFY_ON_START_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'),
+    'NOTIFY_ON_START_BODY_TEXT': (str, 'Monitoring', '{user} ({player}) started playing {title}.'),
+    'NOTIFY_ON_STOP_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'),
+    'NOTIFY_ON_STOP_BODY_TEXT': (str, 'Monitoring', '{user} ({player}) has stopped {title}.'),
+    'NOTIFY_ON_PAUSE_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'),
+    'NOTIFY_ON_PAUSE_BODY_TEXT': (str, 'Monitoring', '{user} ({player}) has paused {title}.'),
+    'NOTIFY_ON_RESUME_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'),
+    'NOTIFY_ON_RESUME_BODY_TEXT': (str, 'Monitoring', '{user} ({player}) has resumed {title}.'),
+    'NOTIFY_ON_BUFFER_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'),
+    'NOTIFY_ON_BUFFER_BODY_TEXT': (str, 'Monitoring', '{user} ({player}) is buffering {title}.'),
+    'NOTIFY_ON_WATCHED_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'),
+    'NOTIFY_ON_WATCHED_BODY_TEXT': (str, 'Monitoring', '{user} ({player}) has watched {title}.'),
+    'OSX_NOTIFY_APP': (str, 'OSX_Notify', '/Applications/PlexPy'),
+    'OSX_NOTIFY_ENABLED': (int, 'OSX_Notify', 0),
+    'OSX_NOTIFY_ON_PLAY': (int, 'OSX_Notify', 0),
+    'OSX_NOTIFY_ON_STOP': (int, 'OSX_Notify', 0),
+    'OSX_NOTIFY_ON_PAUSE': (int, 'OSX_Notify', 0),
+    'OSX_NOTIFY_ON_RESUME': (int, 'OSX_Notify', 0),
+    'OSX_NOTIFY_ON_BUFFER': (int, 'OSX_Notify', 0),
+    'OSX_NOTIFY_ON_WATCHED': (int, 'OSX_Notify', 0),
+    'PLEX_CLIENT_HOST': (str, 'Plex', ''),
+    'PLEX_ENABLED': (int, 'Plex', 0),
+    'PLEX_PASSWORD': (str, 'Plex', ''),
+    'PLEX_USERNAME': (str, 'Plex', ''),
+    'PLEX_ON_PLAY': (int, 'Plex', 0),
+    'PLEX_ON_STOP': (int, 'Plex', 0),
+    'PLEX_ON_PAUSE': (int, 'Plex', 0),
+    'PLEX_ON_RESUME': (int, 'Plex', 0),
+    'PLEX_ON_BUFFER': (int, 'Plex', 0),
+    'PLEX_ON_WATCHED': (int, 'Plex', 0),
+    'PROWL_ENABLED': (int, 'Prowl', 0),
+    'PROWL_KEYS': (str, 'Prowl', ''),
+    'PROWL_PRIORITY': (int, 'Prowl', 0),
+    'PROWL_ON_PLAY': (int, 'Prowl', 0),
+    'PROWL_ON_STOP': (int, 'Prowl', 0),
+    'PROWL_ON_PAUSE': (int, 'Prowl', 0),
+    'PROWL_ON_RESUME': (int, 'Prowl', 0),
+    'PROWL_ON_BUFFER': (int, 'Prowl', 0),
+    'PROWL_ON_WATCHED': (int, 'Prowl', 0),
+    'PUSHALOT_APIKEY': (str, 'Pushalot', ''),
+    'PUSHALOT_ENABLED': (int, 'Pushalot', 0),
+    'PUSHALOT_ON_PLAY': (int, 'Pushalot', 0),
+    'PUSHALOT_ON_STOP': (int, 'Pushalot', 0),
+    'PUSHALOT_ON_PAUSE': (int, 'Pushalot', 0),
+    'PUSHALOT_ON_RESUME': (int, 'Pushalot', 0),
+    'PUSHALOT_ON_BUFFER': (int, 'Pushalot', 0),
+    'PUSHALOT_ON_WATCHED': (int, 'Pushalot', 0),
+    'PUSHBULLET_APIKEY': (str, 'PushBullet', ''),
+    'PUSHBULLET_DEVICEID': (str, 'PushBullet', ''),
+    'PUSHBULLET_CHANNEL_TAG': (str, 'PushBullet', ''),
+    'PUSHBULLET_ENABLED': (int, 'PushBullet', 0),
+    'PUSHBULLET_ON_PLAY': (int, 'PushBullet', 0),
+    'PUSHBULLET_ON_STOP': (int, 'PushBullet', 0),
+    'PUSHBULLET_ON_PAUSE': (int, 'PushBullet', 0),
+    'PUSHBULLET_ON_RESUME': (int, 'PushBullet', 0),
+    'PUSHBULLET_ON_BUFFER': (int, 'PushBullet', 0),
+    'PUSHBULLET_ON_WATCHED': (int, 'PushBullet', 0),
+    'PUSHOVER_APITOKEN': (str, 'Pushover', ''),
+    'PUSHOVER_ENABLED': (int, 'Pushover', 0),
+    'PUSHOVER_KEYS': (str, 'Pushover', ''),
+    'PUSHOVER_PRIORITY': (int, 'Pushover', 0),
+    'PUSHOVER_SOUND': (str, 'Pushover', ''),
+    'PUSHOVER_ON_PLAY': (int, 'Pushover', 0),
+    'PUSHOVER_ON_STOP': (int, 'Pushover', 0),
+    'PUSHOVER_ON_PAUSE': (int, 'Pushover', 0),
+    'PUSHOVER_ON_RESUME': (int, 'Pushover', 0),
+    'PUSHOVER_ON_BUFFER': (int, 'Pushover', 0),
+    'PUSHOVER_ON_WATCHED': (int, 'Pushover', 0),
     'REFRESH_USERS_INTERVAL': (int, 'Monitoring', 12),
     'REFRESH_USERS_ON_STARTUP': (int, 'Monitoring', 1),
-    'SESSION_DB_WRITE_ATTEMPTS': (int, 'Advanced', 5),
-    'SHOW_ADVANCED_SETTINGS': (int, 'General', 0),
-    'SYNCHRONOUS_MODE': (str, 'Advanced', 'NORMAL'),
-    'THEMOVIEDB_APIKEY': (str, 'General', 'e9a6655bae34bf694a0f3e33338dc28e'),
-    'THEMOVIEDB_LOOKUP': (int, 'General', 0),
-    'TVMAZE_LOOKUP': (int, 'General', 0),
-    'TV_WATCHED_PERCENT': (int, 'Monitoring', 85),
+    'TV_NOTIFY_ENABLE': (int, 'Monitoring', 0),
+    'TV_NOTIFY_ON_START': (int, 'Monitoring', 1),
+    'TV_NOTIFY_ON_STOP': (int, 'Monitoring', 0),
+    'TV_NOTIFY_ON_PAUSE': (int, 'Monitoring', 0),
+    'TWITTER_ENABLED': (int, 'Twitter', 0),
+    'TWITTER_PASSWORD': (str, 'Twitter', ''),
+    'TWITTER_PREFIX': (str, 'Twitter', 'PlexPy'),
+    'TWITTER_USERNAME': (str, 'Twitter', ''),
+    'TWITTER_ON_PLAY': (int, 'Twitter', 0),
+    'TWITTER_ON_STOP': (int, 'Twitter', 0),
+    'TWITTER_ON_PAUSE': (int, 'Twitter', 0),
+    'TWITTER_ON_RESUME': (int, 'Twitter', 0),
+    'TWITTER_ON_BUFFER': (int, 'Twitter', 0),
+    'TWITTER_ON_WATCHED': (int, 'Twitter', 0),
     'UPDATE_DB_INTERVAL': (int, 'General', 24),
-    'UPDATE_SHOW_CHANGELOG': (int, 'General', 1),
-    'UPGRADE_FLAG': (int, 'Advanced', 0),
-    'VERBOSE_LOGS': (int, 'Advanced', 1),
     'VERIFY_SSL_CERT': (bool_int, 'Advanced', 1),
-    'WATCHED_MARKER': (int, 'Monitoring', 3),
-    'WEBSOCKET_MONITOR_PING_PONG': (int, 'Advanced', 0),
-    'WEBSOCKET_CONNECTION_ATTEMPTS': (int, 'Advanced', 5),
-    'WEBSOCKET_CONNECTION_TIMEOUT': (int, 'Advanced', 5),
-    'WEEK_START_MONDAY': (int, 'General', 0),
-    'JWT_SECRET': (str, 'Advanced', ''),
-    'JWT_UPDATE_SECRET': (bool_int, 'Advanced', 0),
-    'SYSTEM_ANALYTICS': (int, 'Advanced', 1),
-    'SYS_TRAY_ICON': (int, 'General', 1),
+    'VIDEO_LOGGING_ENABLE': (int, 'Monitoring', 1),
+    'XBMC_ENABLED': (int, 'XBMC', 0),
+    'XBMC_HOST': (str, 'XBMC', ''),
+    'XBMC_PASSWORD': (str, 'XBMC', ''),
+    'XBMC_USERNAME': (str, 'XBMC', ''),
+    'XBMC_ON_PLAY': (int, 'XBMC', 0),
+    'XBMC_ON_STOP': (int, 'XBMC', 0),
+    'XBMC_ON_PAUSE': (int, 'XBMC', 0),
+    'XBMC_ON_RESUME': (int, 'XBMC', 0),
+    'XBMC_ON_BUFFER': (int, 'XBMC', 0),
+    'XBMC_ON_WATCHED': (int, 'XBMC', 0)
 }
-
-_BLACKLIST_KEYS = ['_APITOKEN', '_TOKEN', '_KEY', '_SECRET', '_PASSWORD', '_APIKEY', '_ID', '_HOOK']
-_WHITELIST_KEYS = ['HTTPS_KEY']
-
-_DO_NOT_IMPORT_KEYS = [
-    'FIRST_RUN_COMPLETE', 'GET_FILE_SIZES_HOLD', 'GIT_PATH', 'PMS_LOGS_FOLDER',
-    'BACKUP_DIR', 'CACHE_DIR', 'EXPORT_DIR', 'LOG_DIR', 'NEWSLETTER_DIR', 'NEWSLETTER_CUSTOM_DIR',
-    'HTTP_HOST', 'HTTP_PORT', 'HTTP_ROOT',
-    'HTTP_USERNAME', 'HTTP_PASSWORD', 'HTTP_HASH_PASSWORD', 'HTTP_HASHED_PASSWORD',
-    'ENABLE_HTTPS', 'HTTPS_CREATE_CERT', 'HTTPS_CERT', 'HTTPS_CERT_CHAIN', 'HTTPS_KEY',
-    'PMS_TOKEN', 'JWT_SECRET'
-]
-_DO_NOT_IMPORT_KEYS_DOCKER = [
-    'PLEXPY_AUTO_UPDATE', 'GIT_REMOTE', 'GIT_BRANCH'
-]
-_DO_NOT_DOWNLOAD_KEYS = [
-    'PMS_TOKEN', 'JWT_SECRET'
-]
-
-IS_IMPORTING = False
-IMPORT_THREAD = None
-
-SETTINGS = [
-    'ANON_REDIRECT',
-    'API_KEY',
-    'BACKUP_DAYS',
-    'BACKUP_DIR',
-    'BACKUP_INTERVAL',
-    'BUFFER_THRESHOLD',
-    'BUFFER_WAIT',
-    'CACHE_DIR',
-    'CHECK_GITHUB_INTERVAL',
-    'CLOUDINARY_API_KEY',
-    'CLOUDINARY_API_SECRET',
-    'CLOUDINARY_CLOUD_NAME',
-    'DATE_FORMAT',
-    'EXPORT_DIR',
-    'GIT_BRANCH',
-    'GIT_PATH',
-    'GIT_REMOTE',
-    'GIT_TOKEN',
-    'HOME_LIBRARY_CARDS',
-    'HOME_REFRESH_INTERVAL',
-    'HOME_SECTIONS',
-    'HOME_STATS_CARDS',
-    'HTTPS_CERT',
-    'HTTPS_CERT_CHAIN',
-    'HTTPS_DOMAIN',
-    'HTTPS_IP',
-    'HTTPS_KEY',
-    'HTTP_BASE_URL',
-    'HTTP_PASSWORD',
-    'HTTP_PORT',
-    'HTTP_ROOT',
-    'HTTP_USERNAME',
-    'IMGUR_CLIENT_ID',
-    'LOGGING_IGNORE_INTERVAL',
-    'LOG_DIR',
-    'MOVIE_WATCHED_PERCENT',
-    'MUSIC_WATCHED_PERCENT',
-    'NEWSLETTER_AUTH',
-    'NEWSLETTER_CUSTOM_DIR',
-    'NEWSLETTER_DIR',
-    'NEWSLETTER_PASSWORD',
-    'NOTIFY_CONCURRENT_THRESHOLD',
-    'NOTIFY_CONTINUED_SESSION_THRESHOLD',
-    'NOTIFY_RECENTLY_ADDED_DELAY',
-    'NOTIFY_REMOTE_ACCESS_THRESHOLD',
-    'NOTIFY_SERVER_CONNECTION_THRESHOLD',
-    'NOTIFY_UPLOAD_POSTERS',
-    'PMS_CLIENT_ID',
-    'PMS_IDENTIFIER',
-    'PMS_IP',
-    'PMS_IS_CLOUD',
-    'PMS_IS_REMOTE',
-    'PMS_LOGS_FOLDER',
-    'PMS_NAME',
-    'PMS_PORT',
-    'PMS_SSL',
-    'PMS_UPDATE_CHANNEL',
-    'PMS_UPDATE_CHECK_INTERVAL',
-    'PMS_UPDATE_DISTRO',
-    'PMS_UPDATE_DISTRO_BUILD',
-    'PMS_URL',
-    'PMS_VERSION',
-    'PMS_WEB_URL',
-    'REFRESH_LIBRARIES_INTERVAL',
-    'REFRESH_USERS_INTERVAL',
-    'SHOW_ADVANCED_SETTINGS',
-    'TIME_FORMAT',
-    'TV_WATCHED_PERCENT',
-    'WATCHED_MARKER'
-]
-
-CHECKED_SETTINGS = [
-    'ALLOW_GUEST_ACCESS',
-    'ANON_REDIRECT_DYNAMIC',
-    'API_ENABLED',
-    'CACHE_IMAGES',
-    'CHECK_GITHUB',
-    'ENABLE_HTTPS',
-    'GET_FILE_SIZES',
-    'GROUP_HISTORY_TABLES',
-    'HISTORY_TABLE_ACTIVITY',
-    'HTTPS_CREATE_CERT',
-    'HTTP_PLEX_ADMIN',
-    'HTTP_PROXY',
-    'LAUNCH_BROWSER',
-    'LAUNCH_STARTUP',
-    'LOG_BLACKLIST',
-    'LOG_BLACKLIST_USERNAMES',
-    'MONITOR_PMS_UPDATES',
-    'MUSICBRAINZ_LOOKUP',
-    'NEWSLETTER_INLINE_STYLES',
-    'NEWSLETTER_SELF_HOSTED',
-    'NOTIFY_CONCURRENT_BY_IP',
-    'NOTIFY_CONSECUTIVE',
-    'NOTIFY_GROUP_RECENTLY_ADDED_GRANDPARENT',
-    'NOTIFY_GROUP_RECENTLY_ADDED_PARENT',
-    'NOTIFY_NEW_DEVICE_INITIAL_ONLY',
-    'NOTIFY_PLEXPY_UPDATE_REPEAT',
-    'NOTIFY_RECENTLY_ADDED_UPGRADE',
-    'NOTIFY_SERVER_UPDATE_REPEAT',
-    'PLEXPY_AUTO_UPDATE',
-    'PMS_URL_MANUAL',
-    'REFRESH_LIBRARIES_ON_STARTUP',
-    'REFRESH_USERS_ON_STARTUP',
-    'SYS_TRAY_ICON',
-    'THEMOVIEDB_LOOKUP',
-    'TVMAZE_LOOKUP',
-    'WEEK_START_MONDAY',
-]
-
-
-def set_is_importing(value):
-    global IS_IMPORTING
-    IS_IMPORTING = value
-
-
-def set_import_thread(config=None, backup=False):
-    global IMPORT_THREAD
-    if config:
-        if IMPORT_THREAD:
-            return
-        IMPORT_THREAD = threading.Thread(target=import_tautulli_config,
-                                         kwargs={'config': config, 'backup': backup})
-    else:
-        IMPORT_THREAD = None
-
-
-def import_tautulli_config(config=None, backup=False):
-    if IS_IMPORTING:
-        logger.warn("Tautulli Config :: Another Tautulli config is currently being imported. "
-                    "Please wait until it is complete before importing another config.")
-        return False
-
-    if backup:
-        # Make a backup of the current config first
-        logger.info("Tautulli Config :: Creating a config backup before importing.")
-        if not make_backup():
-            logger.error("Tautulli Config :: Failed to import Tautulli config: failed to create config backup")
-            return False
-
-    # Create a new Config object with the imported config file
-    try:
-        imported_config = Config(config, is_import=True)
-    except:
-        logger.error("Tautulli Config :: Failed to import Tautulli config: error reading imported config file")
-        return False
-
-    logger.info("Tautulli Config :: Importing Tautulli config '%s'...", config)
-    set_is_importing(True)
-
-    # Remove keys that should not be imported
-    for key in _DO_NOT_IMPORT_KEYS:
-        delattr(imported_config, key)
-    if plexpy.DOCKER or plexpy.SNAP:
-        for key in _DO_NOT_IMPORT_KEYS_DOCKER:
-            delattr(imported_config, key)
-
-    # Merge the imported config file into the current config file
-    plexpy.CONFIG._config.merge(imported_config._config)
-    plexpy.CONFIG.write()
-
-    logger.info("Tautulli Config :: Tautulli config import complete.")
-    set_import_thread(None)
-    set_is_importing(False)
-
-    # Restart to apply changes
-    plexpy.SIGNAL = 'restart'
-
-
-def make_backup(cleanup=False, scheduler=False):
-    """ Makes a backup of config file, removes all but the last 5 backups """
-
-    if scheduler:
-        backup_file = 'config.backup-{}.sched.ini'.format(helpers.now())
-    else:
-        backup_file = 'config.backup-{}.ini'.format(helpers.now())
-    backup_folder = plexpy.CONFIG.BACKUP_DIR
-    backup_file_fp = os.path.join(backup_folder, backup_file)
-
-    # In case the user has deleted it manually
-    if not os.path.exists(backup_folder):
-        os.makedirs(backup_folder)
-
-    plexpy.CONFIG.write()
-    shutil.copyfile(plexpy.CONFIG_FILE, backup_file_fp)
-
-    if cleanup:
-        now = time.time()
-        # Delete all scheduled backup older than BACKUP_DAYS.
-        for root, dirs, files in os.walk(backup_folder):
-            ini_files = [os.path.join(root, f) for f in files if f.endswith('.sched.ini')]
-            for file_ in ini_files:
-                if os.stat(file_).st_mtime < now - plexpy.CONFIG.BACKUP_DAYS * 86400:
-                    try:
-                        os.remove(file_)
-                    except OSError as e:
-                        logger.error("Tautulli Config :: Failed to delete %s from the backup folder: %s" % (file_, e))
-
-    if backup_file in os.listdir(backup_folder):
-        logger.debug("Tautulli Config :: Successfully backed up %s to %s" % (plexpy.CONFIG_FILE, backup_file))
-        return True
-    else:
-        logger.error("Tautulli Config :: Failed to backup %s to %s" % (plexpy.CONFIG_FILE, backup_file))
-        return False
-
-
 # pylint:disable=R0902
 # it might be nice to refactor for fewer instance variables
 class Config(object):
     """ Wraps access to particular values in a config file """
 
-    def __init__(self, config_file, is_import=False):
+    def __init__(self, config_file):
         """ Initialize the config with values from a file """
         self._config_file = config_file
-        try:
-            self._config = ConfigObj(self._config_file, encoding='utf-8')
-        except ParseError as e:
-            logger.error("Tautulli Config :: Error reading configuration file: %s", e)
-            raise
-
-        for key in _CONFIG_DEFINITIONS:
+        self._config = ConfigObj(self._config_file, encoding='utf-8')
+        for key in _CONFIG_DEFINITIONS.keys():
             self.check_setting(key)
-        if not is_import:
-            self._upgrade()
-            self._blacklist()
-
-    def _blacklist(self):
-        """ Add tokens and passwords to blacklisted words in logger """
-        blacklist = set()
-
-        for key, subkeys in self._config.items():
-            for subkey, value in subkeys.items():
-                if isinstance(value, str) and len(value.strip()) > 5 and \
-                    subkey.upper() not in _WHITELIST_KEYS and any(bk in subkey.upper() for bk in _BLACKLIST_KEYS):
-                    blacklist.add(value.strip())
-
-        logger._BLACKLIST_WORDS.update(blacklist)
 
     def _define(self, name):
         key = name.upper()
@@ -479,48 +249,20 @@ class Config(object):
         """ Check if INI section exists, if not create it """
         if section not in self._config:
             self._config[section] = {}
+            return True
+        else:
+            return False
 
-    def check_setting(self, name):
-        """ Check if INI key exists, if not create it """
-        key, definition_type, section, ini_key, default = self._define(name)
+    def check_setting(self, key):
+        """ Cast any value in the config to the right type or use the default """
+        key, definition_type, section, ini_key, default = self._define(key)
         self.check_section(section)
-        value = self._config[section].get(ini_key, default)
-        self._config[section][ini_key] = self._cast_setting(definition_type, value, default)
-    
-    def get_setting(self, name):
-        """ Get the value of a setting, either from the config file or environment variable """
-        key, definition_type, section, ini_key, default = self._define(name)
-        # Check if the key is in the environment variables
-        value = self._from_env(key)
-        if not value:
-            # If not, check if the key is in the config file
-            value = self._config[section].get(ini_key, default)
-        return self._cast_setting(definition_type, value, default)
-    
-    def set_setting(self, name, value):
-        """ Set the value of a setting in the config file """
-        key, definition_type, section, ini_key, default = self._define(name)
-        # Check if the key is in the environment variables
-        env_value = self._from_env(key)
-        if env_value:
-            logger.warn("Tautulli Config :: '%s' set by environment variable. Setting not saved to config.", key)
-            return
-
-        # If not, set the value in the config file
-        self._config[section][ini_key] = self._cast_setting(definition_type, value, default)
-        return self._config[section][ini_key]
-    
-    def _from_env(self, key):
-        """ Get key from environment variables, if it exists """
-        env_key = f"TAUTULLI_{key}"
-        return os.environ.get(env_key)
-    
-    def _cast_setting(self, definition_type, value, default=None):
-        """ Cast the value to the correct type, or use the default if it fails """
         try:
-            return definition_type(value)
+            my_val = definition_type(self._config[section][ini_key])
         except Exception:
-            return definition_type(default)
+            my_val = definition_type(default)
+            self._config[section][ini_key] = my_val
+        return my_val
 
     def write(self):
         """ Make a copy of the stored config and write it to the configured file """
@@ -536,7 +278,7 @@ class Config(object):
                 new_config[key][subkey] = value
 
         # next make sure that everything we expect to have defined is so
-        for key in _CONFIG_DEFINITIONS:
+        for key in _CONFIG_DEFINITIONS.keys():
             key, definition_type, section, ini_key, default = self._define(key)
             self.check_setting(key)
             if section not in new_config:
@@ -544,24 +286,22 @@ class Config(object):
             new_config[section][ini_key] = self._config[section][ini_key]
 
         # Write it to file
-        logger.info("Tautulli Config :: Writing configuration to file")
+        plexpy.logger.info("Writing configuration to file")
 
         try:
             new_config.write()
         except IOError as e:
-            logger.error("Tautulli Config :: Error writing configuration file: %s", e)
-
-        self._blacklist()
+            plexpy.logger.error("Error writing configuration file: %s", e)
 
     def __getattr__(self, name):
         """
         Returns something from the ini unless it is a real property
         of the configuration object or is not all caps.
         """
-        if not re.match(r'[A-Z0-9_]+$', name):
+        if not re.match(r'[A-Z_]+$', name):
             return super(Config, self).__getattr__(name)
         else:
-            return self.get_setting(name)
+            return self.check_setting(name)
 
     def __setattr__(self, name, value):
         """
@@ -571,158 +311,15 @@ class Config(object):
         if not re.match(r'[A-Z_]+$', name):
             super(Config, self).__setattr__(name, value)
             return value
-        else:
-            return self.set_setting(name, value)
-
-    def __delattr__(self, name):
-        """
-        Deletes a key from the configuration object.
-        """
-        if not re.match(r'[A-Z_]+$', name):
-            return super(Config, self).__delattr__(name)
         else:
             key, definition_type, section, ini_key, default = self._define(name)
-            del self._config[section][ini_key]
+            self._config[section][ini_key] = definition_type(value)
+            return self._config[section][ini_key]
 
     def process_kwargs(self, kwargs):
         """
         Given a big bunch of key value pairs, apply them to the ini.
         """
         for name, value in kwargs.items():
-            self.__setattr__(name.upper(), value)
-
-    def _upgrade(self):
-        """
-        Upgrades config file from previous versions and bumps up config version
-        """
-        if self.CONFIG_VERSION == 0:
-            self.CONFIG_VERSION = 1
-
-        if self.CONFIG_VERSION == 1:
-            # Change home_stats_cards to list
-            if self.HOME_STATS_CARDS:
-                home_stats_cards = ''.join(self.HOME_STATS_CARDS).split(', ')
-                if 'watch_statistics' in home_stats_cards:
-                    home_stats_cards.remove('watch_statistics')
-                    self.HOME_STATS_CARDS = home_stats_cards
-            # Change home_library_cards to list
-            if self.HOME_LIBRARY_CARDS:
-                home_library_cards = ''.join(self.HOME_LIBRARY_CARDS).split(', ')
-                if 'library_statistics' in home_library_cards:
-                    home_library_cards.remove('library_statistics')
-                    self.HOME_LIBRARY_CARDS = home_library_cards
-
-            self.CONFIG_VERSION = 2
-
-        if self.CONFIG_VERSION == 2:
-            self.CONFIG_VERSION = 3
-
-        if self.CONFIG_VERSION == 3:
-            if self.HTTP_ROOT == '/':
-                self.HTTP_ROOT = ''
-
-            self.CONFIG_VERSION = 4
-
-        if self.CONFIG_VERSION == 4:
-
-            self.CONFIG_VERSION = 5
-
-        if self.CONFIG_VERSION == 5:
-            self.MONITOR_PMS_UPDATES = 0
-
-            self.CONFIG_VERSION = 6
-
-        if self.CONFIG_VERSION == 6:
-            if self.GIT_USER.lower() == 'drzoidberg33':
-                self.GIT_USER = 'JonnyWong16'
-
-            self.CONFIG_VERSION = 7
-
-        if self.CONFIG_VERSION == 7:
-            self.CONFIG_VERSION = 8
-
-        if self.CONFIG_VERSION == 8:
-            self.CONFIG_VERSION = 9
-
-        if self.CONFIG_VERSION == 9:
-            if self.PMS_UPDATE_CHANNEL == 'plexpass':
-                self.PMS_UPDATE_CHANNEL = 'beta'
-
-            self.CONFIG_VERSION = 10
-
-        if self.CONFIG_VERSION == 10:
-            self.GIT_USER = 'Tautulli'
-            self.GIT_REPO = 'Tautulli'
-
-            self.CONFIG_VERSION = 11
-
-        if self.CONFIG_VERSION == 11:
-            self.ANON_REDIRECT = self.ANON_REDIRECT.replace('http://www.nullrefer.com/?',
-                                                            'https://www.nullrefer.com/?')
-            self.CONFIG_VERSION = 12
-
-        if self.CONFIG_VERSION == 12:
-            self.BUFFER_THRESHOLD = max(self.BUFFER_THRESHOLD, 10)
-
-            self.CONFIG_VERSION = 13
-
-        if self.CONFIG_VERSION == 13:
-            self.CONFIG_VERSION = 14
-
-        if self.CONFIG_VERSION == 14:
-            if plexpy.DOCKER:
-                self.PLEXPY_AUTO_UPDATE = 0
-
-            self.CONFIG_VERSION = 15
-
-        if self.CONFIG_VERSION == 15:
-            if self.HTTP_ROOT and self.HTTP_ROOT != '/':
-                self.JWT_UPDATE_SECRET = True
-
-            self.CONFIG_VERSION = 16
-
-        if self.CONFIG_VERSION == 16:
-            if plexpy.SNAP:
-                self.PLEXPY_AUTO_UPDATE = 0
-
-            self.CONFIG_VERSION = 17
-
-        if self.CONFIG_VERSION == 17:
-            home_stats_cards = self.HOME_STATS_CARDS
-            if 'top_users' in home_stats_cards:
-                top_users_index = home_stats_cards.index('top_users')
-                home_stats_cards.insert(top_users_index, 'top_libraries')
-            else:
-                home_stats_cards.append('top_libraries')
-            self.HOME_STATS_CARDS = home_stats_cards
-
-            self.CONFIG_VERSION = 18
-
-        if self.CONFIG_VERSION == 18:
-            if self.CHECK_GITHUB_INTERVAL > 24:
-                self.CHECK_GITHUB_INTERVAL = (
-                        int(self.CHECK_GITHUB_INTERVAL // 60)
-                        + (self.CHECK_GITHUB_INTERVAL % 60 > 0)
-                )
-
-            self.CONFIG_VERSION = 19
-
-        if self.CONFIG_VERSION == 19:
-            if self.HTTP_PASSWORD and not self.HTTP_HASHED_PASSWORD:
-                self.HTTP_PASSWORD = make_hash(self.HTTP_PASSWORD)
-            self.HTTP_HASH_PASSWORD = 1
-            self.HTTP_HASHED_PASSWORD = 1
-
-            self.CONFIG_VERSION = 20
-
-        if self.CONFIG_VERSION == 20:
-            if self.PMS_UUID:
-                self.FIRST_RUN_COMPLETE = 1
-
-            self.CONFIG_VERSION = 21
-
-        if self.CONFIG_VERSION == 21:
-            if not self.ANON_REDIRECT_DYNAMIC and not self.ANON_REDIRECT:
-                self.ANON_REDIRECT_DYNAMIC = 1
-
-            self.CONFIG_VERSION = 22
+            key, definition_type, section, ini_key, default = self._define(name)
+            self._config[section][ini_key] = definition_type(value)
\ No newline at end of file
diff --git a/plexpy/database.py b/plexpy/database.py
index e70d6c77..75528c86 100644
--- a/plexpy/database.py
+++ b/plexpy/database.py
@@ -1,383 +1,43 @@
-# This file is part of Tautulli.
+# This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
-import os
-import sqlite3
-import shutil
-import threading
-import time
-
-import plexpy
-from plexpy import helpers
 from plexpy import logger
 
+import sqlite3
+import os
+import plexpy
+import time
+import threading
 
-FILENAME = "tautulli.db"
 db_lock = threading.Lock()
 
-IS_IMPORTING = False
-
-
-def set_is_importing(value):
-    global IS_IMPORTING
-    IS_IMPORTING = value
-
-
-def validate_database(database=None):
-    try:
-        connection = sqlite3.connect(database, timeout=20)
-    except (sqlite3.OperationalError, sqlite3.DatabaseError, ValueError) as e:
-        logger.error("Tautulli Database :: Invalid database specified: %s", e)
-        return 'Invalid database specified'
-    except Exception as e:
-        logger.error("Tautulli Database :: Uncaught exception: %s", e)
-        return 'Uncaught exception'
-
-    try:
-        connection.execute("SELECT started from session_history")
-        connection.close()
-    except (sqlite3.OperationalError, sqlite3.DatabaseError, ValueError) as e:
-        logger.error("Tautulli Database :: Invalid database specified: %s", e)
-        return 'Invalid database specified'
-    except Exception as e:
-        logger.error("Tautulli Database :: Uncaught exception: %s", e)
-        return 'Uncaught exception'
-
-    return 'success'
-
-
-def import_tautulli_db(database=None, method=None, backup=False):
-    if IS_IMPORTING:
-        logger.warn("Tautulli Database :: Another Tautulli database is currently being imported. "
-                    "Please wait until it is complete before importing another database.")
-        return False
-
-    db_validate = validate_database(database=database)
-    if not db_validate == 'success':
-        logger.error("Tautulli Database :: Failed to import Tautulli database: %s", db_validate)
-        return False
-
-    if method not in ('merge', 'overwrite'):
-        logger.error("Tautulli Database :: Failed to import Tautulli database: invalid import method '%s'", method)
-        return False
-
-    if backup:
-        # Make a backup of the current database first
-        logger.info("Tautulli Database :: Creating a database backup before importing.")
-        if not make_backup():
-            logger.error("Tautulli Database :: Failed to import Tautulli database: failed to create database backup")
-            return False
-
-    logger.info("Tautulli Database :: Importing Tautulli database '%s' with import method '%s'...", database, method)
-    set_is_importing(True)
-
-    db = MonitorDatabase()
-    db.connection.execute("BEGIN IMMEDIATE")
-    db.connection.execute("ATTACH ? AS import_db", [database])
-
-    try:
-        version_info = db.select_single("SELECT * FROM import_db.version_info WHERE key = 'version'")
-        import_db_version = version_info['value']
-    except (sqlite3.OperationalError, KeyError):
-        import_db_version = 'v2.6.10'
-
-    logger.info("Tautulli Database :: Import Tautulli database version: %s", import_db_version)
-    import_db_version = helpers.version_to_tuple(import_db_version)
-
-    # Get the current number of used ids in the session_history table
-    session_history_seq = db.select_single("SELECT seq FROM sqlite_sequence WHERE name = 'session_history'")
-    session_history_rows = session_history_seq.get('seq', 0)
-
-    session_history_tables = ('session_history', 'session_history_metadata', 'session_history_media_info')
-
-    if method == 'merge':
-        logger.info("Tautulli Database :: Creating temporary database tables to re-index grouped session history.")
-        for table_name in session_history_tables:
-            db.action("CREATE TABLE {table}_copy AS SELECT * FROM import_db.{table}".format(table=table_name))
-            db.action("UPDATE {table}_copy SET id = id + ?".format(table=table_name),
-                      [session_history_rows])
-            if table_name == 'session_history':
-                db.action("UPDATE {table}_copy SET reference_id = reference_id + ?".format(table=table_name),
-                          [session_history_rows])
-
-    # Migrate section_id from session_history_metadata to session_history
-    if import_db_version < helpers.version_to_tuple('v2.7.0'):
-        if method == 'merge':
-            from_db_name = 'main'
-            copy = '_copy'
-        else:
-            from_db_name = 'import_db'
-            copy = ''
-        db.action("ALTER TABLE {from_db}.session_history{copy} "
-                  "ADD COLUMN section_id INTEGER".format(from_db=from_db_name,
-                                                         copy=copy))
-        db.action("UPDATE {from_db}.session_history{copy} SET section_id = ("
-                  "SELECT section_id FROM {from_db}.session_history_metadata{copy} "
-                  "WHERE {from_db}.session_history_metadata{copy}.id = "
-                  "{from_db}.session_history{copy}.id)".format(from_db=from_db_name,
-                                                               copy=copy))
-
-    # Keep track of all table columns so that duplicates can be removed after importing
-    table_columns = {}
-
-    tables = db.select("SELECT name FROM import_db.sqlite_master "
-                       "WHERE type = 'table' AND name NOT LIKE 'sqlite_%'"
-                       "ORDER BY name")
-    for table in tables:
-        table_name = table['name']
-        if table_name == 'sessions' or table_name == 'version_info':
-            # Skip temporary sessions table
-            continue
-
-        current_table = db.select("PRAGMA main.table_info({table})".format(table=table_name))
-        if not current_table:
-            # Skip table does not exits
-            continue
-
-        logger.info("Tautulli Database :: Importing database table '%s'.", table_name)
-
-        if method == 'overwrite':
-            # Clear the table and reset the autoincrement ids
-            db.action("DELETE FROM {table}".format(table=table_name))
-            db.action("DELETE FROM sqlite_sequence WHERE name = ?", [table_name])
-
-        if method == 'merge' and table_name in session_history_tables:
-            from_db_name = 'main'
-            from_table_name = table_name + '_copy'
-        else:
-            from_db_name = 'import_db'
-            from_table_name = table_name
-
-        # Get the list of columns to import
-        current_columns = [c['name'] for c in current_table]
-        import_table = db.select("PRAGMA {from_db}.table_info({from_table})".format(from_db=from_db_name,
-                                                                                    from_table=from_table_name))
-
-        if method == 'merge' and table_name not in session_history_tables:
-            import_columns = [c['name'] for c in import_table if c['name'] in current_columns and not c['pk']]
-        else:
-            import_columns = [c['name'] for c in import_table if c['name'] in current_columns]
-
-        table_columns[table_name] = import_columns
-        insert_columns = ', '.join(import_columns)
-
-        # Insert the data with ignore instead of replace to be safe
-        db.action("INSERT OR IGNORE INTO {table} ({columns}) "
-                  "SELECT {columns} FROM {from_db}.{from_table}".format(table=table_name,
-                                                                        columns=insert_columns,
-                                                                        from_db=from_db_name,
-                                                                        from_table=from_table_name))
-
-    db.connection.execute("DETACH import_db")
-
-    if method == 'merge':
-        for table_name, columns in sorted(table_columns.items()):
-            duplicate_columns = ', '.join([c for c in columns if c not in ('id', 'reference_id')])
-            logger.info("Tautulli Database :: Removing duplicate rows from database table '%s'.", table_name)
-            if table_name in session_history_tables[1:]:
-                db.action("DELETE FROM {table} WHERE id NOT IN "
-                          "(SELECT id FROM session_history)".format(table=table_name))
-            else:
-                db.action("DELETE FROM {table} WHERE id NOT IN "
-                          "(SELECT MIN(id) FROM {table} GROUP BY {columns})".format(table=table_name,
-                                                                                    columns=duplicate_columns))
-
-        logger.info("Tautulli Database :: Deleting temporary database tables.")
-        for table_name in session_history_tables:
-            db.action("DROP TABLE {table}_copy".format(table=table_name))
-
-    vacuum()
-
-    logger.info("Tautulli Database :: Tautulli database import complete.")
-    set_is_importing(False)
-
-    logger.info("Tautulli Database :: Deleting cached database: %s", database)
-    os.remove(database)
-
-
-def integrity_check():
+def drop_session_db():
     monitor_db = MonitorDatabase()
-    result = monitor_db.select_single("PRAGMA integrity_check")
-    return result
+    monitor_db.action('DROP TABLE sessions')
 
-
-def clear_table(table=None):
-    if table:
-        monitor_db = MonitorDatabase()
-
-        logger.debug("Tautulli Database :: Clearing database table '%s'." % table)
-        try:
-            monitor_db.action("DELETE FROM %s" % table)
-            vacuum()
-            return True
-        except Exception as e:
-            logger.error("Tautulli Database :: Failed to clear database table '%s': %s." % (table, e))
-            return False
-
-
-def delete_sessions():
-    logger.info("Tautulli Database :: Clearing temporary sessions from database.")
-    return clear_table('sessions')
-
-
-def delete_recently_added():
-    logger.info("Tautulli Database :: Clearing recently added items from database.")
-    return clear_table('recently_added')
-
-
-def delete_exports():
-    logger.info("Tautulli Database :: Clearing exported items from database.")
-    return clear_table('exports')
-
-
-def delete_rows_from_table(table, row_ids):
-    if row_ids and isinstance(row_ids, str):
-        row_ids = list(map(helpers.cast_to_int, row_ids.split(',')))
-
-    if row_ids:
-        logger.info("Tautulli Database :: Deleting row ids %s from %s database table", row_ids, table)
-
-        # SQlite versions prior to 3.32.0 (2020-05-22) have maximum variable limit of 999
-        # https://sqlite.org/limits.html
-        sqlite_max_variable_number = 999
-
-        monitor_db = MonitorDatabase()
-        try:
-            for row_ids_group in helpers.chunk(row_ids, sqlite_max_variable_number):
-                query = "DELETE FROM " + table + " WHERE id IN (%s) " % ','.join(['?'] * len(row_ids_group))
-                monitor_db.action(query, row_ids_group)
-            vacuum()
-        except Exception as e:
-            logger.error("Tautulli Database :: Failed to delete rows from %s database table: %s" % (table, e))
-            return False
-
-    return True
-
-
-def delete_session_history_rows(row_ids=None):
-    success = []
-    for table in ('session_history', 'session_history_media_info', 'session_history_metadata'):
-        success.append(delete_rows_from_table(table=table, row_ids=row_ids))
-    return all(success)
-
-
-def delete_user_history(user_id=None):
-    if str(user_id).isdigit():
-        monitor_db = MonitorDatabase()
-
-        # Get all history associated with the user_id
-        result = monitor_db.select("SELECT id FROM session_history WHERE user_id = ?",
-                                   [user_id])
-        row_ids = [row['id'] for row in result]
-
-        logger.info("Tautulli Database :: Deleting all history for user_id %s from database." % user_id)
-        return delete_session_history_rows(row_ids=row_ids)
-
-
-def delete_library_history(section_id=None):
-    if str(section_id).isdigit():
-        monitor_db = MonitorDatabase()
-
-        # Get all history associated with the section_id
-        result = monitor_db.select("SELECT id FROM session_history WHERE section_id = ?",
-                                   [section_id])
-        row_ids = [row['id'] for row in result]
-
-        logger.info("Tautulli Database :: Deleting all history for library section_id %s from database." % section_id)
-        return delete_session_history_rows(row_ids=row_ids)
-
-
-def vacuum():
+def clear_history_tables():
+    logger.debug(u"PlexPy Database :: Deleting all session_history records... No turning back now bub.")
     monitor_db = MonitorDatabase()
+    monitor_db.action('DELETE FROM session_history')
+    monitor_db.action('DELETE FROM session_history_media_info')
+    monitor_db.action('DELETE FROM session_history_metadata')
+    monitor_db.action('VACUUM;')
 
-    logger.info("Tautulli Database :: Vacuuming database.")
-    try:
-        monitor_db.action("VACUUM")
-    except Exception as e:
-        logger.error("Tautulli Database :: Failed to vacuum database: %s" % e)
-
-
-def optimize():
-    monitor_db = MonitorDatabase()
-
-    logger.info("Tautulli Database :: Optimizing database.")
-    try:
-        monitor_db.action("PRAGMA optimize")
-    except Exception as e:
-        logger.error("Tautulli Database :: Failed to optimize database: %s" % e)
-
-
-def optimize_db():
-    vacuum()
-    optimize()
-
-
-def db_filename(filename=None):
-    """ Returns the filepath to the db """
-    if filename is None:
-        return os.path.join(plexpy.DATA_DIR, FILENAME)
-    return filename
-
-
-def make_backup(cleanup=False, scheduler=False):
-    """ Makes a backup of db, removes all but the last 5 backups """
-
-    # Check the integrity of the database first
-    integrity = (integrity_check()['integrity_check'] == 'ok')
-
-    corrupt = ''
-    if not integrity:
-        corrupt = '.corrupt'
-        plexpy.NOTIFY_QUEUE.put({'notify_action': 'on_plexpydbcorrupt'})
-
-    if scheduler:
-        backup_file = 'tautulli.backup-{}{}.sched.db'.format(helpers.now(), corrupt)
-    else:
-        backup_file = 'tautulli.backup-{}{}.db'.format(helpers.now(), corrupt)
-    backup_folder = plexpy.CONFIG.BACKUP_DIR
-    backup_file_fp = os.path.join(backup_folder, backup_file)
-
-    # In case the user has deleted it manually
-    if not os.path.exists(backup_folder):
-        os.makedirs(backup_folder)
-
-    db = MonitorDatabase()
-    db.connection.execute("BEGIN IMMEDIATE")
-    shutil.copyfile(db_filename(), backup_file_fp)
-    db.connection.rollback()
-
-    # Only cleanup if the database integrity is okay
-    if cleanup and integrity:
-        now = time.time()
-        # Delete all scheduled backup older than BACKUP_DAYS.
-        for root, dirs, files in os.walk(backup_folder):
-            db_files = [os.path.join(root, f) for f in files if f.endswith('.sched.db')]
-            for file_ in db_files:
-                if os.stat(file_).st_mtime < now - plexpy.CONFIG.BACKUP_DAYS * 86400:
-                    try:
-                        os.remove(file_)
-                    except OSError as e:
-                        logger.error("Tautulli Database :: Failed to delete %s from the backup folder: %s" % (file_, e))
-
-    if backup_file in os.listdir(backup_folder):
-        logger.debug("Tautulli Database :: Successfully backed up %s to %s" % (db_filename(), backup_file))
-        return True
-    else:
-        logger.error("Tautulli Database :: Failed to backup %s to %s" % (db_filename(), backup_file))
-        return False
+def db_filename(filename="plexpy.db"):
 
+    return os.path.join(plexpy.DATA_DIR, filename)
 
 def get_cache_size():
     # This will protect against typecasting problems produced by empty string and None settings
@@ -387,26 +47,18 @@ def get_cache_size():
     return int(plexpy.CONFIG.CACHE_SIZEMB)
 
 
-def dict_factory(cursor, row):
-    d = {}
-    for idx, col in enumerate(cursor.description):
-        d[col[0]] = row[idx]
-
-    return d
-
-
 class MonitorDatabase(object):
 
-    def __init__(self, filename=None):
-        self.filename = db_filename(filename)
-        self.connection = sqlite3.connect(self.filename, timeout=20)
-        # Set database synchronous mode (default NORMAL)
-        self.connection.execute("PRAGMA synchronous = %s" % plexpy.CONFIG.SYNCHRONOUS_MODE)
-        # Set database journal mode (default WAL)
+    def __init__(self, filename='plexpy.db'):
+        self.filename = filename
+        self.connection = sqlite3.connect(db_filename(filename), timeout=20)
+        # Don't wait for the disk to finish writing
+        self.connection.execute("PRAGMA synchronous = OFF")
+        # Journal disabled since we never do rollbacks
         self.connection.execute("PRAGMA journal_mode = %s" % plexpy.CONFIG.JOURNAL_MODE)
-        # Set database cache size (default 32MB)
-        self.connection.execute("PRAGMA cache_size = -%s" % (get_cache_size() * 1024))
-        self.connection.row_factory = dict_factory
+        # 64mb of cache memory, probably need to make it user configurable
+        self.connection.execute("PRAGMA cache_size=-%s" % (get_cache_size() * 1024))
+        self.connection.row_factory = sqlite3.Row
 
     def action(self, query, args=None, return_last_id=False):
         if query is None:
@@ -426,18 +78,17 @@ class MonitorDatabase(object):
                     # Our transaction was successful, leave the loop
                     break
 
-                except sqlite3.OperationalError as e:
-                    e = str(e)
-                    if "unable to open database file" in e or "database is locked" in e:
-                        logger.warn("Tautulli Database :: Database Error: %s", e)
+                except sqlite3.OperationalError, e:
+                    if "unable to open database file" in e.message or "database is locked" in e.message:
+                        logger.warn('Database Error: %s', e)
                         attempts += 1
                         time.sleep(1)
                     else:
-                        logger.error("Tautulli Database :: Database error: %s", e)
+                        logger.error('Database error: %s', e)
                         raise
 
-                except sqlite3.DatabaseError as e:
-                    logger.error("Tautulli Database :: Fatal Error executing %s :: %s", query, e)
+                except sqlite3.DatabaseError, e:
+                    logger.error('Fatal Error executing %s :: %s', query, e)
                     raise
 
             return sql_result
@@ -453,10 +104,10 @@ class MonitorDatabase(object):
 
     def select_single(self, query, args=None):
 
-        sql_results = self.action(query, args).fetchone()
+        sql_results = self.action(query, args).fetchone()[0]
 
         if sql_results is None or sql_results == "":
-            return {}
+            return ""
 
         return sql_results
 
@@ -465,33 +116,23 @@ class MonitorDatabase(object):
         trans_type = 'update'
         changes_before = self.connection.total_changes
 
-        gen_params = lambda my_dict: [x + " = ?" for x in my_dict]
+        gen_params = lambda my_dict: [x + " = ?" for x in my_dict.keys()]
 
         update_query = "UPDATE " + table_name + " SET " + ", ".join(gen_params(value_dict)) + \
                        " WHERE " + " AND ".join(gen_params(key_dict))
 
-        self.action(update_query, list(value_dict.values()) + list(key_dict.values()))
+        self.action(update_query, value_dict.values() + key_dict.values())
 
         if self.connection.total_changes == changes_before:
             trans_type = 'insert'
             insert_query = (
-                "INSERT INTO " + table_name + " (" + ", ".join(list(value_dict.keys()) + list(key_dict.keys())) + ")" +
-                " VALUES (" + ", ".join(["?"] * len(list(value_dict.keys()) + list(key_dict.keys()))) + ")"
+                "INSERT INTO " + table_name + " (" + ", ".join(value_dict.keys() + key_dict.keys()) + ")" +
+                " VALUES (" + ", ".join(["?"] * len(value_dict.keys() + key_dict.keys())) + ")"
             )
             try:
-                self.action(insert_query, list(value_dict.values()) + list(key_dict.values()))
+                self.action(insert_query, value_dict.values() + key_dict.values())
             except sqlite3.IntegrityError:
-                logger.info("Tautulli Database :: Queries failed: %s and %s", update_query, insert_query)
+                logger.info('Queries failed: %s and %s', update_query, insert_query)
 
         # We want to know if it was an update or insert
         return trans_type
-
-    def last_insert_id(self):
-        # Get the last insert row id
-        result = self.select_single(query="SELECT last_insert_rowid() AS last_id")
-        if result:
-            return result.get('last_id', None)
-        
-    def __del__(self):
-        # Close the database connection when object is garbage collected
-        self.connection.close()
diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index d48d3ea8..f09ae30c 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -1,38 +1,21 @@
-# -*- coding: utf-8 -*-
-
-# This file is part of Tautulli.
+# This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
-import json
+from plexpy import logger, datatables, common, database, helpers
 
-import plexpy
-from plexpy import common
-from plexpy import database
-from plexpy import datatables
-from plexpy import helpers
-from plexpy import logger
-from plexpy import pmsconnect
-from plexpy import session
-from plexpy import users
-
-# Temporarily store update_metadata row ids in memory to prevent rating_key collisions
-_UPDATE_METADATA_IDS = {
-    'grandparent_rating_key_ids': set(),
-    'parent_rating_key_ids': set(),
-    'rating_key_ids': set()
-}
+import datetime
 
 
 class DataFactory(object):
@@ -43,170 +26,49 @@ class DataFactory(object):
     def __init__(self):
         pass
 
-    def get_datatables_history(self, kwargs=None, custom_where=None, grouping=None, include_activity=None):
+    def get_history(self, kwargs=None, custom_where=None, grouping=0, watched_percent=85):
         data_tables = datatables.DataTables()
-
-        if custom_where is None:
-            custom_where = []
-
-        if grouping is None:
-            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
-
-        if include_activity is None:
-            include_activity = plexpy.CONFIG.HISTORY_TABLE_ACTIVITY
-
-        if session.get_session_user_id():
-            session_user_id = str(session.get_session_user_id())
-            added = False
-
-            for c_where in custom_where:
-                if 'user_id' in c_where[0]:
-                    if isinstance(c_where[1], list) and session_user_id not in c_where[1]:
-                        c_where[1].append(session_user_id)
-                    elif isinstance(c_where[1], str) and c_where[1] != session_user_id:
-                        c_where[1] = [c_where[1], session_user_id]
-                    added = True
-                    break
-
-            if not added:
-                custom_where.append(['session_history.user_id', [session.get_session_user_id()]])
-
+        
         group_by = ['session_history.reference_id'] if grouping else ['session_history.id']
 
-        columns = [
-            "session_history.reference_id",
-            "session_history.id AS row_id",
-            "MAX(started) AS date",
-            "MIN(started) AS started",
-            "MAX(stopped) AS stopped",
-            "SUM(CASE WHEN stopped > 0 THEN (stopped - started) ELSE 0 END) - \
-             SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) AS play_duration",
-            "SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) AS paused_counter",
-            "session_history.view_offset",
-            "session_history.user_id",
-            "session_history.user",
-            "(CASE WHEN users.friendly_name IS NULL OR TRIM(users.friendly_name) = '' \
-             THEN users.username ELSE users.friendly_name END) AS friendly_name",
-            "users.thumb AS user_thumb",
-            "users.custom_avatar_url AS custom_thumb",
-            "platform",
-            "product",
-            "player",
-            "ip_address",
-            "machine_id",
-            "location",
-            "secure",
-            "relayed",
-            "session_history.media_type",
-            "(CASE WHEN session_history_metadata.live = 1 THEN 'live' ELSE session_history.media_type END) \
-             AS media_type_live",
-            "session_history_metadata.rating_key",
-            "session_history_metadata.parent_rating_key",
-            "session_history_metadata.grandparent_rating_key",
-            "session_history_metadata.full_title",
-            "session_history_metadata.title",
-            "session_history_metadata.parent_title",
-            "session_history_metadata.grandparent_title",
-            "session_history_metadata.original_title",
-            "session_history_metadata.year",
-            "session_history_metadata.media_index",
-            "session_history_metadata.parent_media_index",
-            "session_history_metadata.thumb",
-            "session_history_metadata.parent_thumb",
-            "session_history_metadata.grandparent_thumb",
-            "session_history_metadata.live",
-            "session_history_metadata.added_at",
-            "session_history_metadata.originally_available_at",
-            "session_history_metadata.guid",
-            "MAX((CASE WHEN (view_offset IS NULL OR view_offset = '') THEN 0.1 ELSE view_offset * 1.0 END) / \
-             (CASE WHEN (session_history_metadata.duration IS NULL OR session_history_metadata.duration = '') \
-             THEN 1.0 ELSE session_history_metadata.duration * 1.0 END) * 100) AS percent_complete",
-            "session_history_metadata.duration",
-            "session_history_metadata.marker_credits_first",
-            "session_history_metadata.marker_credits_final",
-            "session_history_media_info.transcode_decision",
-            "COUNT(*) AS group_count",
-            "GROUP_CONCAT(session_history.id) AS group_ids",
-            "NULL AS state",
-            "NULL AS session_key"
-            ]
-
-        if include_activity:
-            table_name_union = 'sessions'
-            # Very hacky way to match the custom where parameters for the unioned table
-            custom_where_union = [[c[0].split('.')[-1], c[1]] for c in custom_where]
-            group_by_union = ['session_key']
-
-            columns_union = [
-                "NULL AS reference_id",
-                "NULL AS row_id",
-                "started AS date",
-                "started",
-                "stopped",
-                "SUM(CASE WHEN stopped > 0 THEN (stopped - started) ELSE (strftime('%s', 'now') - started) END) - \
-                 SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) AS play_duration",
-                "SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) AS paused_counter",
-                "view_offset",
-                "user_id",
-                "user",
-                "(CASE WHEN friendly_name IS NULL OR TRIM(friendly_name) = '' \
-                 THEN user ELSE friendly_name END) AS friendly_name",
-                "NULL AS user_thumb",
-                "NULL AS custom_thumb",
-                "platform",
-                "product",
-                "player",
-                "ip_address",
-                "machine_id",
-                "location",
-                "secure",
-                "relayed",
-                "media_type",
-                "(CASE WHEN live = 1 THEN 'live' ELSE media_type END) AS media_type_live",
-                "rating_key",
-                "parent_rating_key",
-                "grandparent_rating_key",
-                "full_title",
-                "title",
-                "parent_title",
-                "grandparent_title",
-                "original_title",
-                "year",
-                "media_index",
-                "parent_media_index",
-                "thumb",
-                "parent_thumb",
-                "grandparent_thumb",
-                "live",
-                "added_at",
-                "originally_available_at",
-                "guid",
-                "MAX((CASE WHEN (view_offset IS NULL OR view_offset = '') THEN 0.1 ELSE view_offset * 1.0 END) / \
-                 (CASE WHEN (duration IS NULL OR duration = '') \
-                 THEN 1.0 ELSE duration * 1.0 END) * 100) AS percent_complete",
-                "duration",
-                "NULL AS marker_credits_first",
-                "NULL AS marker_credits_final",
-                "transcode_decision",
-                "NULL AS group_count",
-                "NULL AS group_ids",
-                "state",
-                "session_key"
-                ]
-
-        else:
-            table_name_union = None
-            custom_where_union = group_by_union = columns_union = []
-
+        columns = ['session_history.reference_id',
+                   'session_history.id',
+                   'started AS date',
+                   'MIN(started) AS started',
+                   'MAX(stopped) AS stopped',
+                   'SUM(CASE WHEN stopped > 0 THEN (stopped - started) ELSE 0 END) - \
+		            SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) AS duration', 
+                   'SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) AS paused_counter', 
+                   'session_history.user_id',
+                   'session_history.user',
+                   '(CASE WHEN users.friendly_name IS NULL THEN user ELSE users.friendly_name END) as friendly_name',
+                   'platform',
+                   'player',
+                   'ip_address',
+                   'session_history_metadata.media_type',
+                   'session_history_metadata.rating_key',
+                   'session_history_metadata.parent_rating_key',
+                   'session_history_metadata.grandparent_rating_key',
+                   'session_history_metadata.full_title',
+                   'session_history_metadata.parent_title',
+                   'session_history_metadata.year',
+                   'session_history_metadata.media_index',
+                   'session_history_metadata.parent_media_index',
+                   'session_history_metadata.thumb',
+                   'session_history_metadata.parent_thumb',
+                   'session_history_metadata.grandparent_thumb',
+                   '((CASE WHEN view_offset IS NULL THEN 0.1 ELSE view_offset * 1.0 END) / \
+		            (CASE WHEN session_history_metadata.duration IS NULL THEN 1.0 ELSE session_history_metadata.duration * 1.0 END) * 100) AS percent_complete',
+                   'session_history_media_info.video_decision',
+                   'session_history_media_info.audio_decision',
+                   'COUNT(*) AS group_count',
+                   'GROUP_CONCAT(session_history.id) AS group_ids'
+                   ]
         try:
             query = data_tables.ssp_query(table_name='session_history',
-                                          table_name_union=table_name_union,
                                           columns=columns,
-                                          columns_union=columns_union,
                                           custom_where=custom_where,
-                                          custom_where_union=custom_where_union,
                                           group_by=group_by,
-                                          group_by_union=group_by_union,
                                           join_types=['LEFT OUTER JOIN',
                                                       'JOIN',
                                                       'JOIN'],
@@ -217,690 +79,454 @@ class DataFactory(object):
                                                       ['session_history.id', 'session_history_metadata.id'],
                                                       ['session_history.id', 'session_history_media_info.id']],
                                           kwargs=kwargs)
-        except Exception as e:
-            logger.warn("Tautulli DataFactory :: Unable to execute database query for get_history: %s." % e)
+        except:
+            logger.warn("Unable to execute database query.")
             return {'recordsFiltered': 0,
                     'recordsTotal': 0,
                     'draw': 0,
-                    'data': [],
-                    'filter_duration': '0',
-                    'total_duration': '0'}
+                    'data': 'null',
+                    'error': 'Unable to execute database query.'}
 
         history = query['result']
-
-        filter_duration = 0
-        total_duration = self.get_total_duration(custom_where=custom_where)
-
-        watched_percent = {'movie': plexpy.CONFIG.MOVIE_WATCHED_PERCENT,
-                           'episode': plexpy.CONFIG.TV_WATCHED_PERCENT,
-                           'track': plexpy.CONFIG.MUSIC_WATCHED_PERCENT,
-                           'photo': 0,
-                           'clip': plexpy.CONFIG.TV_WATCHED_PERCENT
-                           }
-
+        
         rows = []
-
-        users_lookup = {}
-
         for item in history:
-            if item['state']:
-                # Get user thumb from database for current activity
-                if not users_lookup:
-                    # Cache user lookup
-                    users_lookup = {u['user_id']: u['thumb'] for u in users.Users().get_users()}
-
-                item['user_thumb'] = users_lookup.get(item['user_id'])
-
-            filter_duration += helpers.cast_to_int(item['play_duration'])
-
-            if item['media_type'] == 'episode' and item['parent_thumb']:
-                thumb = item['parent_thumb']
-            elif item['media_type'] == 'episode':
-                thumb = item['grandparent_thumb']
+            if item["media_type"] == 'episode' and item["parent_thumb"]:
+                thumb = item["parent_thumb"]
+            elif item["media_type"] == 'episode':
+                thumb = item["grandparent_thumb"]
             else:
-                thumb = item['thumb']
+                thumb = item["thumb"]
 
-            if item['live']:
-                item['percent_complete'] = 100
-
-            base_watched_value = watched_percent[item['media_type']] / 4.0
-
-            if item['live'] or helpers.check_watched(
-                item['media_type'], item['view_offset'], item['duration'],
-                item['marker_credits_first'], item['marker_credits_final']
-            ):
+            if item['percent_complete'] >= watched_percent:
                 watched_status = 1
-            elif item['percent_complete'] >= base_watched_value * 3.0:
-                watched_status = 0.75
-            elif item['percent_complete'] >= base_watched_value * 2.0:
-                watched_status = 0.50
-            elif item['percent_complete'] >= base_watched_value:
-                watched_status = 0.25
+            elif item['percent_complete'] >= watched_percent/2:
+                watched_status = 0.5
             else:
                 watched_status = 0
 
             # Rename Mystery platform names
-            platform = common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform'])
+            platform_names = {'Mystery 3': 'Playstation 3',
+                              'Mystery 4': 'Playstation 4',
+                              'Mystery 5': 'Xbox 360'}
+            platform = platform_names.get(item["platform"], item["platform"])
 
-            if item['custom_thumb'] and item['custom_thumb'] != item['user_thumb']:
-                user_thumb = item['custom_thumb']
-            elif item['user_thumb']:
-                user_thumb = item['user_thumb']
-            else:
-                user_thumb = common.DEFAULT_USER_THUMB
-
-            row = {'reference_id': item['reference_id'],
-                   'row_id': item['row_id'],
-                   'id': item['row_id'],
-                   'date': item['date'],
-                   'started': item['started'],
-                   'stopped': item['stopped'],
-                   'duration': item['play_duration'],  # Keep for backwards compatibility
-                   'play_duration': item['play_duration'],
-                   'paused_counter': item['paused_counter'],
-                   'user_id': item['user_id'],
-                   'user': item['user'],
-                   'friendly_name': item['friendly_name'],
-                   'user_thumb': user_thumb,
-                   'platform': platform,
-                   'product': item['product'],
-                   'player': item['player'],
-                   'ip_address': item['ip_address'],
-                   'live': item['live'],
-                   'machine_id': item['machine_id'],
-                   'location': item['location'],
-                   'secure': item['secure'],
-                   'relayed': item['relayed'],
-                   'media_type': item['media_type'],
-                   'rating_key': item['rating_key'],
-                   'parent_rating_key': item['parent_rating_key'],
-                   'grandparent_rating_key': item['grandparent_rating_key'],
-                   'full_title': item['full_title'],
-                   'title': item['title'],
-                   'parent_title': item['parent_title'],
-                   'grandparent_title': item['grandparent_title'],
-                   'original_title': item['original_title'],
-                   'year': item['year'],
-                   'media_index': item['media_index'],
-                   'parent_media_index': item['parent_media_index'],
-                   'thumb': thumb,
-                   'originally_available_at': item['originally_available_at'],
-                   'guid': item['guid'],
-                   'transcode_decision': item['transcode_decision'],
-                   'percent_complete': int(round(item['percent_complete'])),
-                   'watched_status': watched_status,
-                   'group_count': item['group_count'],
-                   'group_ids': item['group_ids'],
-                   'state': item['state'],
-                   'session_key': item['session_key']
+            row = {"reference_id": item["reference_id"],
+                   "id": item["id"],
+                   "date": item["date"],
+                   "started": item["started"],
+                   "stopped": item["stopped"],
+                   "duration": item["duration"],
+                   "paused_counter": item["paused_counter"],
+                   "user_id": item["user_id"],
+                   "user": item["user"],
+                   "friendly_name": item["friendly_name"],
+                   "platform": platform,
+                   "player": item["player"],
+                   "ip_address": item["ip_address"],
+                   "media_type": item["media_type"],
+                   "rating_key": item["rating_key"],
+                   "parent_rating_key": item["parent_rating_key"],
+                   "grandparent_rating_key": item["grandparent_rating_key"],
+                   "full_title": item["full_title"],
+                   "parent_title": item["parent_title"],
+                   "year": item["year"],
+                   "media_index": item["media_index"],
+                   "parent_media_index": item["parent_media_index"],
+                   "thumb": thumb,
+                   "video_decision": item["video_decision"],
+                   "audio_decision": item["audio_decision"],
+                   "percent_complete": int(round(item['percent_complete'])),
+                   "watched_status": watched_status,
+                   "group_count": item["group_count"],
+                   "group_ids": item["group_ids"]
                    }
 
             rows.append(row)
-
+        
         dict = {'recordsFiltered': query['filteredCount'],
                 'recordsTotal': query['totalCount'],
-                'data': session.friendly_name_to_username(rows),
-                'draw': query['draw'],
-                'filter_duration': helpers.human_duration(filter_duration, units='s'),
-                'total_duration': helpers.human_duration(total_duration, units='s')
-                }
+                'data': rows,
+                'draw': query['draw']
+        }
 
         return dict
 
-    def get_home_stats(self, grouping=None, time_range=30, stats_type='plays',
-                       stats_start=0, stats_count=10, stat_id='', stats_cards=None,
-                       section_id=None, user_id=None, before=None, after=None):
+    def get_home_stats(self, time_range='30', stats_type=0, stats_count='5', stats_cards='', notify_watched_percent='85'):
         monitor_db = database.MonitorDatabase()
 
-        time_range = helpers.cast_to_int(time_range)
-
-        stats_start = helpers.cast_to_int(stats_start)
-        stats_count = helpers.cast_to_int(stats_count)
-        if stat_id:
-            stats_cards = [stat_id]
-        if grouping is None:
-            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
-        if stats_cards is None:
-            stats_cards = plexpy.CONFIG.HOME_STATS_CARDS
-
-        where_timeframe = ''
-        if before:
-            where_timeframe += "AND strftime('%%Y-%%m-%%d', datetime(started, 'unixepoch', 'localtime')) <= '%s' " % before
-            if not after:
-                timestamp = helpers.YMD_to_timestamp(before) - time_range * 24 * 60 * 60
-                where_timeframe += "AND session_history.stopped >= %s " % timestamp
-        if after:
-            where_timeframe += "AND strftime('%%Y-%%m-%%d', datetime(started, 'unixepoch', 'localtime')) >= '%s' " % after
-            if not before:
-                timestamp = helpers.YMD_to_timestamp(after) + time_range * 24 * 60 * 60
-                where_timeframe += "AND session_history.stopped <= %s " % timestamp
-        if not (before and after):
-            timestamp = helpers.timestamp() - time_range * 24 * 60 * 60
-            where_timeframe += "AND session_history.stopped >= %s" % timestamp
-
-        where_id = ''
-        if section_id:
-            where_id += 'AND session_history.section_id = %s ' % section_id
-        if user_id:
-            where_id += 'AND session_history.user_id = %s ' % user_id
-
-        group_by = 'session_history.reference_id' if grouping else 'session_history.id'
-        sort_type = 'total_duration' if stats_type == 'duration' else 'total_plays'
+        sort_type = 'total_plays' if stats_type == 0 else 'total_duration'
 
         home_stats = []
 
         for stat in stats_cards:
-            if stat == 'top_movies':
-                top_movies = []
-                try:
-                    query = "SELECT sh.id, shm.full_title, shm.year, sh.rating_key, shm.thumb, sh.section_id, " \
-                            "shm.art, sh.media_type, shm.content_rating, shm.labels, sh.started, shm.live, shm.guid, " \
-                            "MAX(sh.started) AS last_watch, COUNT(sh.id) AS total_plays, SUM(sh.d) AS total_duration " \
-                            "FROM (SELECT *, SUM(CASE WHEN stopped > 0 THEN (stopped - started) - " \
-                            "       (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) " \
-                            "       AS d " \
-                            "   FROM session_history " \
-                            "   WHERE session_history.media_type = 'movie' %s %s " \
-                            "   GROUP BY %s) AS sh " \
-                            "JOIN session_history_metadata AS shm ON shm.id = sh.id " \
-                            "GROUP BY shm.full_title, shm.year " \
-                            "ORDER BY %s DESC, sh.started DESC " \
-                            "LIMIT %s OFFSET %s " % (where_timeframe, where_id, group_by, sort_type, stats_count, stats_start)
-                    result = monitor_db.select(query)
-                except Exception as e:
-                    logger.warn("Tautulli DataFactory :: Unable to execute database query for get_home_stats: top_movies: %s." % e)
-                    return None
-
-                for item in result:
-                    row = {'title': item['full_title'],
-                           'year': item['year'],
-                           'total_plays': item['total_plays'],
-                           'total_duration': item['total_duration'],
-                           'users_watched': '',
-                           'rating_key': item['rating_key'],
-                           'grandparent_rating_key': '',
-                           'last_play': item['last_watch'],
-                           'grandparent_thumb': '',
-                           'thumb': item['thumb'],
-                           'art': item['art'],
-                           'section_id': item['section_id'],
-                           'media_type': item['media_type'],
-                           'content_rating': item['content_rating'],
-                           'labels': item['labels'].split(';') if item['labels'] else (),
-                           'user': '',
-                           'friendly_name': '',
-                           'platform': '',
-                           'live': item['live'],
-                           'guid': item['guid'],
-                           'row_id': item['id']
-                           }
-                    top_movies.append(row)
-
-                home_stats.append({'stat_id': stat,
-                                   'stat_type': sort_type,
-                                   'stat_title': 'Most Watched Movies',
-                                   'rows': session.mask_session_info(top_movies)})
-
-            elif stat == 'popular_movies':
-                popular_movies = []
-                try:
-                    query = "SELECT sh.id, shm.full_title, shm.year, sh.rating_key, shm.thumb, sh.section_id, " \
-                            "shm.art, sh.media_type, shm.content_rating, shm.labels, sh.started, shm.live, shm.guid, " \
-                            "COUNT(DISTINCT sh.user_id) AS users_watched, " \
-                            "MAX(sh.started) AS last_watch, COUNT(sh.id) as total_plays, SUM(sh.d) AS total_duration " \
-                            "FROM (SELECT *, SUM(CASE WHEN stopped > 0 THEN (stopped - started) - " \
-                            "       (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) " \
-                            "       AS d " \
-                            "   FROM session_history " \
-                            "   WHERE session_history.media_type = 'movie' %s %s " \
-                            "   GROUP BY %s) AS sh " \
-                            "JOIN session_history_metadata AS shm ON shm.id = sh.id " \
-                            "GROUP BY shm.full_title, shm.year " \
-                            "ORDER BY users_watched DESC, %s DESC, sh.started DESC " \
-                            "LIMIT %s OFFSET %s " % (where_timeframe, where_id, group_by, sort_type, stats_count, stats_start)
-                    result = monitor_db.select(query)
-                except Exception as e:
-                    logger.warn("Tautulli DataFactory :: Unable to execute database query for get_home_stats: popular_movies: %s." % e)
-                    return None
-
-                for item in result:
-                    row = {'title': item['full_title'],
-                           'year': item['year'],
-                           'users_watched': item['users_watched'],
-                           'rating_key': item['rating_key'],
-                           'grandparent_rating_key': '',
-                           'last_play': item['last_watch'],
-                           'total_plays': item['total_plays'],
-                           'grandparent_thumb': '',
-                           'thumb': item['thumb'],
-                           'art': item['art'],
-                           'section_id': item['section_id'],
-                           'media_type': item['media_type'],
-                           'content_rating': item['content_rating'],
-                           'labels': item['labels'].split(';') if item['labels'] else (),
-                           'user': '',
-                           'friendly_name': '',
-                           'platform': '',
-                           'live': item['live'],
-                           'guid': item['guid'],
-                           'row_id': item['id']
-                           }
-                    popular_movies.append(row)
-
-                home_stats.append({'stat_id': stat,
-                                   'stat_title': 'Most Popular Movies',
-                                   'rows': session.mask_session_info(popular_movies)})
-
-            elif stat == 'top_tv':
+            if stat == 'top_tv':
                 top_tv = []
                 try:
-                    query = "SELECT sh.id, shm.grandparent_title, sh.grandparent_rating_key, " \
-                            "shm.grandparent_thumb, sh.section_id, " \
-                            "shm.year, sh.rating_key, shm.art, sh.media_type, " \
-                            "shm.content_rating, shm.labels, sh.started, shm.live, shm.guid, " \
-                            "MAX(sh.started) AS last_watch, COUNT(sh.id) AS total_plays, SUM(sh.d) AS total_duration " \
-                            "FROM (SELECT *, SUM(CASE WHEN stopped > 0 THEN (stopped - started) - " \
-                            "       (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) " \
-                            "       AS d " \
-                            "   FROM session_history " \
-                            "   WHERE session_history.media_type = 'episode' %s %s " \
-                            "   GROUP BY %s) AS sh " \
-                            "JOIN session_history_metadata AS shm ON shm.id = sh.id " \
-                            "GROUP BY shm.grandparent_title " \
-                            "ORDER BY %s DESC, sh.started DESC " \
-                            "LIMIT %s OFFSET %s " % (where_timeframe, where_id, group_by, sort_type, stats_count, stats_start)
+                    query = 'SELECT session_history_metadata.id, ' \
+                            'session_history_metadata.grandparent_title, ' \
+                            'COUNT(session_history_metadata.grandparent_title) as total_plays, ' \
+                            'SUM(case when session_history.stopped > 0 ' \
+                            'then (session_history.stopped - session_history.started) ' \
+                            ' - (case when session_history.paused_counter is NULL then 0 else session_history.paused_counter end) ' \
+                            'else 0 end) as total_duration, ' \
+                            'session_history_metadata.grandparent_rating_key, ' \
+                            'MAX(session_history.started) as last_watch,' \
+                            'session_history_metadata.grandparent_thumb ' \
+                            'FROM session_history_metadata ' \
+                            'JOIN session_history on session_history_metadata.id = session_history.id ' \
+                            'WHERE datetime(session_history.stopped, "unixepoch", "localtime") ' \
+                            '>= datetime("now", "-%s days", "localtime") ' \
+                            'AND session_history_metadata.media_type = "episode" ' \
+                            'GROUP BY session_history_metadata.grandparent_title ' \
+                            'ORDER BY %s DESC LIMIT %s' % (time_range, sort_type, stats_count)
                     result = monitor_db.select(query)
-                except Exception as e:
-                    logger.warn("Tautulli DataFactory :: Unable to execute database query for get_home_stats: top_tv: %s." % e)
+                except:
+                    logger.warn("Unable to execute database query.")
                     return None
 
                 for item in result:
-                    row = {'title': item['grandparent_title'],
-                           'year': item['year'],
-                           'total_plays': item['total_plays'],
-                           'total_duration': item['total_duration'],
+                    row = {'title': item[1],
+                           'total_plays': item[2],
+                           'total_duration': item[3],
                            'users_watched': '',
-                           'rating_key': item['rating_key'] if item['live'] else item['grandparent_rating_key'],
-                           'grandparent_rating_key': item['grandparent_rating_key'],
-                           'last_play': item['last_watch'],
-                           'grandparent_thumb': item['grandparent_thumb'],
-                           'thumb': item['grandparent_thumb'],
-                           'art': item['art'],
-                           'section_id': item['section_id'],
-                           'media_type': item['media_type'],
-                           'content_rating': item['content_rating'],
-                           'labels': item['labels'].split(';') if item['labels'] else (),
+                           'rating_key': item[4],
+                           'last_play': item[5],
+                           'grandparent_thumb': item[6],
+                           'thumb': '',
                            'user': '',
                            'friendly_name': '',
+                           'platform_type': '',
                            'platform': '',
-                           'live': item['live'],
-                           'guid': item['guid'],
-                           'row_id': item['id']
+                           'row_id': item[0]
                            }
                     top_tv.append(row)
 
                 home_stats.append({'stat_id': stat,
                                    'stat_type': sort_type,
-                                   'stat_title': 'Most Watched TV Shows',
-                                   'rows': session.mask_session_info(top_tv)})
+                                   'rows': top_tv})
 
             elif stat == 'popular_tv':
                 popular_tv = []
                 try:
-                    query = "SELECT sh.id, shm.grandparent_title, sh.grandparent_rating_key, " \
-                            "shm.grandparent_thumb, sh.section_id, " \
-                            "shm.year, sh.rating_key, shm.art, sh.media_type, " \
-                            "shm.content_rating, shm.labels, sh.started, shm.live, shm.guid, " \
-                            "COUNT(DISTINCT sh.user_id) AS users_watched, " \
-                            "MAX(sh.started) AS last_watch, COUNT(sh.id) as total_plays, SUM(sh.d) AS total_duration " \
-                            "FROM (SELECT *, SUM(CASE WHEN stopped > 0 THEN (stopped - started) - " \
-                            "       (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) " \
-                            "       AS d " \
-                            "   FROM session_history " \
-                            "   WHERE session_history.media_type = 'episode' %s %s " \
-                            "   GROUP BY %s) AS sh " \
-                            "JOIN session_history_metadata AS shm ON shm.id = sh.id " \
-                            "GROUP BY shm.grandparent_title " \
-                            "ORDER BY users_watched DESC, %s DESC, sh.started DESC " \
-                            "LIMIT %s OFFSET %s " % (where_timeframe, where_id, group_by, sort_type, stats_count, stats_start)
+                    query = 'SELECT session_history_metadata.id, ' \
+                            'session_history_metadata.grandparent_title, ' \
+                            'COUNT(DISTINCT session_history.user_id) as users_watched, ' \
+                            'session_history_metadata.grandparent_rating_key, ' \
+                            'MAX(session_history.started) as last_watch, ' \
+                            'COUNT(session_history.id) as total_plays, ' \
+                            'SUM(case when session_history.stopped > 0 ' \
+                            'then (session_history.stopped - session_history.started) ' \
+                            ' - (case when session_history.paused_counter is NULL then 0 else session_history.paused_counter end) ' \
+                            'else 0 end) as total_duration, ' \
+                            'session_history_metadata.grandparent_thumb ' \
+                            'FROM session_history_metadata ' \
+                            'JOIN session_history ON session_history_metadata.id = session_history.id ' \
+                            'WHERE datetime(session_history.stopped, "unixepoch", "localtime") ' \
+                            '>= datetime("now", "-%s days", "localtime") ' \
+                            'AND session_history_metadata.media_type = "episode" ' \
+                            'GROUP BY session_history_metadata.grandparent_title ' \
+                            'ORDER BY users_watched DESC, %s DESC ' \
+                            'LIMIT %s' % (time_range, sort_type, stats_count)
                     result = monitor_db.select(query)
-                except Exception as e:
-                    logger.warn("Tautulli DataFactory :: Unable to execute database query for get_home_stats: popular_tv: %s." % e)
+                except:
+                    logger.warn("Unable to execute database query.")
                     return None
 
                 for item in result:
-                    row = {'title': item['grandparent_title'],
-                           'year': item['year'],
-                           'users_watched': item['users_watched'],
-                           'rating_key': item['rating_key'] if item['live'] else item['grandparent_rating_key'],
-                           'grandparent_rating_key': item['grandparent_rating_key'],
-                           'last_play': item['last_watch'],
-                           'total_plays': item['total_plays'],
-                           'grandparent_thumb': item['grandparent_thumb'],
-                           'thumb': item['grandparent_thumb'],
-                           'art': item['art'],
-                           'section_id': item['section_id'],
-                           'media_type': item['media_type'],
-                           'content_rating': item['content_rating'],
-                           'labels': item['labels'].split(';') if item['labels'] else (),
+                    row = {'title': item[1],
+                           'users_watched': item[2],
+                           'rating_key': item[3],
+                           'last_play': item[4],
+                           'total_plays': item[5],
+                           'grandparent_thumb': item[7],
+                           'thumb': '',
                            'user': '',
                            'friendly_name': '',
+                           'platform_type': '',
                            'platform': '',
-                           'live': item['live'],
-                           'guid': item['guid'],
-                           'row_id': item['id']
+                           'row_id': item[0]
                            }
                     popular_tv.append(row)
 
                 home_stats.append({'stat_id': stat,
-                                   'stat_title': 'Most Popular TV Shows',
-                                   'rows': session.mask_session_info(popular_tv)})
+                                   'rows': popular_tv})
+
+            elif stat == 'top_movies':
+                top_movies = []
+                try:
+                    query = 'SELECT session_history_metadata.id, ' \
+                            'session_history_metadata.full_title, ' \
+                            'COUNT(session_history_metadata.full_title) as total_plays, ' \
+                            'SUM(case when session_history.stopped > 0 ' \
+                            'then (session_history.stopped - session_history.started) ' \
+                            ' - (case when session_history.paused_counter is NULL then 0 else session_history.paused_counter end) ' \
+                            'else 0 end) as total_duration, ' \
+                            'session_history_metadata.rating_key, ' \
+                            'MAX(session_history.started) as last_watch,' \
+                            'session_history_metadata.thumb ' \
+                            'FROM session_history_metadata ' \
+                            'JOIN session_history on session_history_metadata.id = session_history.id ' \
+                            'WHERE datetime(session_history.stopped, "unixepoch", "localtime") ' \
+                            '>= datetime("now", "-%s days", "localtime") ' \
+                            'AND session_history_metadata.media_type = "movie" ' \
+                            'GROUP BY session_history_metadata.full_title ' \
+                            'ORDER BY %s DESC LIMIT %s' % (time_range, sort_type, stats_count)
+                    result = monitor_db.select(query)
+                except:
+                    logger.warn("Unable to execute database query.")
+                    return None
+
+                for item in result:
+                    row = {'title': item[1],
+                           'total_plays': item[2],
+                           'total_duration': item[3],
+                           'users_watched': '',
+                           'rating_key': item[4],
+                           'last_play': item[5],
+                           'grandparent_thumb': '',
+                           'thumb': item[6],
+                           'user': '',
+                           'friendly_name': '',
+                           'platform_type': '',
+                           'platform': '',
+                           'row_id': item[0]
+                           }
+                    top_movies.append(row)
+
+                home_stats.append({'stat_id': stat,
+                                   'stat_type': sort_type,
+                                   'rows': top_movies})
+
+            elif stat == 'popular_movies':
+                popular_movies = []
+                try:
+                    query = 'SELECT session_history_metadata.id, ' \
+                            'session_history_metadata.full_title, ' \
+                            'COUNT(DISTINCT session_history.user_id) as users_watched, ' \
+                            'session_history_metadata.rating_key, ' \
+                            'MAX(session_history.started) as last_watch, ' \
+                            'COUNT(session_history.id) as total_plays, ' \
+                            'SUM(case when session_history.stopped > 0 ' \
+                            'then (session_history.stopped - session_history.started) ' \
+                            ' - (case when session_history.paused_counter is NULL then 0 else session_history.paused_counter end) ' \
+                            'else 0 end) as total_duration, ' \
+                            'session_history_metadata.thumb ' \
+                            'FROM session_history_metadata ' \
+                            'JOIN session_history ON session_history_metadata.id = session_history.id ' \
+                            'WHERE datetime(session_history.stopped, "unixepoch", "localtime") ' \
+                            '>= datetime("now", "-%s days", "localtime") ' \
+                            'AND session_history_metadata.media_type = "movie" ' \
+                            'GROUP BY session_history_metadata.full_title ' \
+                            'ORDER BY users_watched DESC, %s DESC ' \
+                            'LIMIT %s' % (time_range, sort_type, stats_count)
+                    result = monitor_db.select(query)
+                except:
+                    logger.warn("Unable to execute database query.")
+                    return None
+
+                for item in result:
+                    row = {'title': item[1],
+                           'users_watched': item[2],
+                           'rating_key': item[3],
+                           'last_play': item[4],
+                           'total_plays': item[5],
+                           'grandparent_thumb': '',
+                           'thumb': item[7],
+                           'user': '',
+                           'friendly_name': '',
+                           'platform_type': '',
+                           'platform': '',
+                           'row_id': item[0]
+                           }
+                    popular_movies.append(row)
+
+                home_stats.append({'stat_id': stat,
+                                   'rows': popular_movies})
 
             elif stat == 'top_music':
                 top_music = []
                 try:
-                    query = "SELECT sh.id, shm.grandparent_title, shm.original_title, shm.year, " \
-                            "sh.grandparent_rating_key, shm.grandparent_thumb, sh.section_id, " \
-                            "shm.art, sh.media_type, shm.content_rating, shm.labels, sh.started, shm.live, shm.guid, " \
-                            "MAX(sh.started) AS last_watch, COUNT(sh.id) AS total_plays, SUM(sh.d) AS total_duration " \
-                            "FROM (SELECT *, SUM(CASE WHEN stopped > 0 THEN (stopped - started) - " \
-                            "       (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) " \
-                            "       AS d " \
-                            "   FROM session_history " \
-                            "   WHERE session_history.media_type = 'track' %s %s " \
-                            "   GROUP BY %s) AS sh " \
-                            "JOIN session_history_metadata AS shm ON shm.id = sh.id " \
-                            "GROUP BY shm.original_title, shm.grandparent_title " \
-                            "ORDER BY %s DESC, sh.started DESC " \
-                            "LIMIT %s OFFSET %s " % (where_timeframe, where_id, group_by, sort_type, stats_count, stats_start)
+                    query = 'SELECT session_history_metadata.id, ' \
+                            'session_history_metadata.grandparent_title, ' \
+                            'COUNT(session_history_metadata.grandparent_title) as total_plays, ' \
+                            'SUM(case when session_history.stopped > 0 ' \
+                            'then (session_history.stopped - session_history.started) ' \
+                            ' - (case when session_history.paused_counter is NULL then 0 else session_history.paused_counter end) ' \
+                            'else 0 end) as total_duration, ' \
+                            'session_history_metadata.grandparent_rating_key, ' \
+                            'MAX(session_history.started) as last_watch,' \
+                            'session_history_metadata.grandparent_thumb ' \
+                            'FROM session_history_metadata ' \
+                            'JOIN session_history on session_history_metadata.id = session_history.id ' \
+                            'WHERE datetime(session_history.stopped, "unixepoch", "localtime") ' \
+                            '>= datetime("now", "-%s days", "localtime") ' \
+                            'AND session_history_metadata.media_type = "track" ' \
+                            'GROUP BY session_history_metadata.grandparent_title ' \
+                            'ORDER BY %s DESC LIMIT %s' % (time_range, sort_type, stats_count)
                     result = monitor_db.select(query)
-                except Exception as e:
-                    logger.warn("Tautulli DataFactory :: Unable to execute database query for get_home_stats: top_music: %s." % e)
+                except:
+                    logger.warn("Unable to execute database query.")
                     return None
 
                 for item in result:
-                    row = {'title': item['original_title'] or item['grandparent_title'],
-                           'year': item['year'],
-                           'total_plays': item['total_plays'],
-                           'total_duration': item['total_duration'],
+                    row = {'title': item[1],
+                           'total_plays': item[2],
+                           'total_duration': item[3],
                            'users_watched': '',
-                           'rating_key': item['grandparent_rating_key'],
-                           'grandparent_rating_key': item['grandparent_rating_key'],
-                           'last_play': item['last_watch'],
-                           'grandparent_thumb': item['grandparent_thumb'],
-                           'thumb': item['grandparent_thumb'],
-                           'art': item['art'],
-                           'section_id': item['section_id'],
-                           'media_type': item['media_type'],
-                           'content_rating': item['content_rating'],
-                           'labels': item['labels'].split(';') if item['labels'] else (),
+                           'rating_key': item[4],
+                           'last_play': item[5],
+                           'grandparent_thumb': item[6],
+                           'thumb': '',
                            'user': '',
                            'friendly_name': '',
+                           'platform_type': '',
                            'platform': '',
-                           'live': item['live'],
-                           'guid': item['guid'],
-                           'row_id': item['id']
+                           'row_id': item[0]
                            }
                     top_music.append(row)
 
                 home_stats.append({'stat_id': stat,
                                    'stat_type': sort_type,
-                                   'stat_title': 'Most Played Artists',
-                                   'rows': session.mask_session_info(top_music)})
+                                   'rows': top_music})
 
             elif stat == 'popular_music':
                 popular_music = []
                 try:
-                    query = "SELECT sh.id, shm.grandparent_title, shm.original_title, shm.year, " \
-                            "sh.grandparent_rating_key, shm.grandparent_thumb, sh.section_id, " \
-                            "shm.art, sh.media_type, shm.content_rating, shm.labels, sh.started, shm.live, shm.guid, " \
-                            "COUNT(DISTINCT sh.user_id) AS users_watched, " \
-                            "MAX(sh.started) AS last_watch, COUNT(sh.id) as total_plays, SUM(sh.d) AS total_duration " \
-                            "FROM (SELECT *, SUM(CASE WHEN stopped > 0 THEN (stopped - started) - " \
-                            "       (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) " \
-                            "       AS d " \
-                            "   FROM session_history " \
-                            "   WHERE session_history.media_type = 'track' %s %s " \
-                            "   GROUP BY %s) AS sh " \
-                            "JOIN session_history_metadata AS shm ON shm.id = sh.id " \
-                            "GROUP BY shm.original_title, shm.grandparent_title " \
-                            "ORDER BY users_watched DESC, %s DESC, sh.started DESC " \
-                            "LIMIT %s OFFSET %s " % (where_timeframe, where_id, group_by, sort_type, stats_count, stats_start)
+                    query = 'SELECT session_history_metadata.id, ' \
+                            'session_history_metadata.grandparent_title, ' \
+                            'COUNT(DISTINCT session_history.user_id) as users_watched, ' \
+                            'session_history_metadata.grandparent_rating_key, ' \
+                            'MAX(session_history.started) as last_watch, ' \
+                            'COUNT(session_history.id) as total_plays, ' \
+                            'SUM(case when session_history.stopped > 0 ' \
+                            'then (session_history.stopped - session_history.started) ' \
+                            ' - (case when session_history.paused_counter is NULL then 0 else session_history.paused_counter end) ' \
+                            'else 0 end) as total_duration, ' \
+                            'session_history_metadata.grandparent_thumb ' \
+                            'FROM session_history_metadata ' \
+                            'JOIN session_history ON session_history_metadata.id = session_history.id ' \
+                            'WHERE datetime(session_history.stopped, "unixepoch", "localtime") ' \
+                            '>= datetime("now", "-%s days", "localtime") ' \
+                            'AND session_history_metadata.media_type = "track" ' \
+                            'GROUP BY session_history_metadata.grandparent_title ' \
+                            'ORDER BY users_watched DESC, %s DESC ' \
+                            'LIMIT %s' % (time_range, sort_type, stats_count)
                     result = monitor_db.select(query)
-                except Exception as e:
-                    logger.warn("Tautulli DataFactory :: Unable to execute database query for get_home_stats: popular_music: %s." % e)
+                except:
+                    logger.warn("Unable to execute database query.")
                     return None
 
                 for item in result:
-                    row = {'title': item['original_title'] or item['grandparent_title'],
-                           'year': item['year'],
-                           'users_watched': item['users_watched'],
-                           'rating_key': item['grandparent_rating_key'],
-                           'grandparent_rating_key': item['grandparent_rating_key'],
-                           'last_play': item['last_watch'],
-                           'total_plays': item['total_plays'],
-                           'grandparent_thumb': item['grandparent_thumb'],
-                           'thumb': item['grandparent_thumb'],
-                           'art': item['art'],
-                           'section_id': item['section_id'],
-                           'media_type': item['media_type'],
-                           'content_rating': item['content_rating'],
-                           'labels': item['labels'].split(';') if item['labels'] else (),
+                    row = {'title': item[1],
+                           'users_watched': item[2],
+                           'rating_key': item[3],
+                           'last_play': item[4],
+                           'total_plays': item[5],
+                           'grandparent_thumb': item[7],
+                           'thumb': '',
                            'user': '',
                            'friendly_name': '',
+                           'platform_type': '',
                            'platform': '',
-                           'live': item['live'],
-                           'guid': item['guid'],
-                           'row_id': item['id']
+                           'row_id': item[0]
                            }
                     popular_music.append(row)
 
                 home_stats.append({'stat_id': stat,
-                                   'stat_title': 'Most Popular Artists',
-                                   'rows': session.mask_session_info(popular_music)})
-
-            elif stat == 'top_libraries':
-                top_libraries = []
-                try:
-                    query = "SELECT sh.id, shm.title, shm.grandparent_title, shm.full_title, shm.year, " \
-                            "shm.media_index, shm.parent_media_index, " \
-                            "sh.rating_key, shm.grandparent_rating_key, shm.thumb, shm.grandparent_thumb, " \
-                            "sh.user, sh.user_id, sh.player, sh.section_id, " \
-                            "shm.art, sh.media_type, shm.content_rating, shm.labels, shm.live, shm.guid, " \
-                            "ls.section_name, ls.section_type, " \
-                            "ls.thumb AS library_thumb, ls.custom_thumb_url AS custom_thumb, " \
-                            "ls.art AS library_art, ls.custom_art_url AS custom_art, " \
-                            "sh.started, " \
-                            "MAX(sh.started) AS last_watch, COUNT(sh.id) AS total_plays, SUM(sh.d) AS total_duration " \
-                            "FROM (SELECT *, SUM(CASE WHEN stopped > 0 THEN (stopped - started) - " \
-                            "       (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) " \
-                            "       AS d " \
-                            "   FROM session_history " \
-                            "   WHERE %s %s " \
-                            "   GROUP BY %s) AS sh " \
-                            "JOIN session_history_metadata AS shm ON shm.id = sh.id " \
-                            "LEFT OUTER JOIN (SELECT * FROM library_sections WHERE deleted_section = 0) " \
-                            "   AS ls ON sh.section_id = ls.section_id " \
-                            "GROUP BY sh.section_id " \
-                            "ORDER BY %s DESC, sh.started DESC " \
-                            "LIMIT %s OFFSET %s " % (where_timeframe[4:], where_id, group_by, sort_type, stats_count, stats_start)
-                    result = monitor_db.select(query)
-                except Exception as e:
-                    logger.warn("Tautulli DataFactory :: Unable to execute database query for get_home_stats: top_libraries: %s." % e)
-                    return None
-
-                for item in result:
-                    if item['custom_thumb'] and item['custom_thumb'] != item['library_thumb']:
-                        library_thumb = item['custom_thumb']
-                    elif item['library_thumb']:
-                        library_thumb = item['library_thumb']
-                    else:
-                        library_thumb = common.DEFAULT_COVER_THUMB
-
-                    if item['custom_art'] and item['custom_art'] != item['library_art']:
-                        library_art = item['custom_art']
-                    elif item['library_art'] == common.DEFAULT_LIVE_TV_ART_FULL:
-                        library_art = common.DEFAULT_LIVE_TV_ART
-                    else:
-                        library_art = item['library_art']
-
-                    if not item['grandparent_thumb'] or item['grandparent_thumb'] == '':
-                        thumb = item['thumb']
-                    else:
-                        thumb = item['grandparent_thumb']
-
-                    row = {
-                        'total_plays': item['total_plays'],
-                        'total_duration': item['total_duration'],
-                        'section_type': item['section_type'],
-                        'section_name': item['section_name'],
-                        'section_id': item['section_id'],
-                        'last_play': item['last_watch'],
-                        'library_thumb': library_thumb,
-                        'library_art': library_art,
-                        'thumb': thumb,
-                        'grandparent_thumb': item['grandparent_thumb'],
-                        'art': item['art'],
-                        'user': '',
-                        'friendly_name': '',
-                        'users_watched': '',
-                        'platform': '',
-                        'title': item['full_title'],
-                        'grandparent_title': item['grandparent_title'],
-                        'grandchild_title': item['title'],
-                        'year': item['year'],
-                        'media_index': item['media_index'],
-                        'parent_media_index': item['parent_media_index'],
-                        'rating_key': item['rating_key'],
-                        'grandparent_rating_key': item['grandparent_rating_key'],
-                        'media_type': item['media_type'],
-                        'content_rating': item['content_rating'],
-                        'labels': item['labels'].split(';') if item['labels'] else (),
-                        'live': item['live'],
-                        'guid': item['guid'],
-                        'row_id': item['id']
-                    }
-                    top_libraries.append(row)
-
-                home_stats.append({'stat_id': stat,
-                                   'stat_type': sort_type,
-                                   'stat_title': 'Most Active Libraries',
-                                   'rows': session.mask_session_info(top_libraries)})
+                                   'rows': popular_music})
 
             elif stat == 'top_users':
                 top_users = []
                 try:
-                    query = "SELECT sh.id, shm.title, shm.grandparent_title, shm.full_title, shm.year, " \
-                            "shm.media_index, shm.parent_media_index, " \
-                            "sh.rating_key, shm.grandparent_rating_key, shm.thumb, shm.grandparent_thumb, " \
-                            "sh.user, sh.user_id, sh.player, sh.section_id, " \
-                            "shm.art, sh.media_type, shm.content_rating, shm.labels, shm.live, shm.guid, " \
-                            "u.thumb AS user_thumb, u.custom_avatar_url AS custom_thumb, " \
-                            "sh.started, " \
-                            "(CASE WHEN u.friendly_name IS NULL OR TRIM(u.friendly_name) = ''" \
-                            "   THEN u.username ELSE u.friendly_name END) " \
-                            "   AS friendly_name, " \
-                            "MAX(sh.started) AS last_watch, COUNT(sh.id) AS total_plays, SUM(sh.d) AS total_duration " \
-                            "FROM (SELECT *, SUM(CASE WHEN stopped > 0 THEN (stopped - started) - " \
-                            "       (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) " \
-                            "       AS d " \
-                            "   FROM session_history " \
-                            "   WHERE %s %s " \
-                            "   GROUP BY %s) AS sh " \
-                            "JOIN session_history_metadata AS shm ON shm.id = sh.id " \
-                            "LEFT OUTER JOIN users AS u ON sh.user_id = u.user_id " \
-                            "GROUP BY sh.user_id " \
-                            "ORDER BY %s DESC, sh.started DESC " \
-                            "LIMIT %s OFFSET %s " % (where_timeframe[4:], where_id, group_by, sort_type, stats_count, stats_start)
+                    query = 'SELECT session_history.user, ' \
+                            '(case when users.friendly_name is null then session_history.user else ' \
+                            'users.friendly_name end) as friendly_name,' \
+                            'COUNT(session_history.id) as total_plays, ' \
+                            'SUM(case when session_history.stopped > 0 ' \
+                            'then (session_history.stopped - session_history.started) ' \
+                            ' - (case when session_history.paused_counter is NULL then 0 else session_history.paused_counter end) ' \
+                            'else 0 end) as total_duration, ' \
+                            'MAX(session_history.started) as last_watch, ' \
+                            'users.custom_avatar_url as thumb, ' \
+                            'users.user_id ' \
+                            'FROM session_history ' \
+                            'JOIN session_history_metadata ON session_history.id = session_history_metadata.id ' \
+                            'LEFT OUTER JOIN users ON session_history.user_id = users.user_id ' \
+                            'WHERE datetime(session_history.stopped, "unixepoch", "localtime") >= ' \
+                            'datetime("now", "-%s days", "localtime") '\
+                            'GROUP BY session_history.user_id ' \
+                            'ORDER BY %s DESC LIMIT %s' % (time_range, sort_type, stats_count)
                     result = monitor_db.select(query)
-                except Exception as e:
-                    logger.warn("Tautulli DataFactory :: Unable to execute database query for get_home_stats: top_users: %s." % e)
+                except:
+                    logger.warn("Unable to execute database query.")
                     return None
 
                 for item in result:
-                    if item['custom_thumb'] and item['custom_thumb'] != item['user_thumb']:
-                        user_thumb = item['custom_thumb']
-                    elif item['user_thumb']:
-                        user_thumb = item['user_thumb']
-                    else:
+                    if not item[5] or item[5] == '':
                         user_thumb = common.DEFAULT_USER_THUMB
-
-                    if not item['grandparent_thumb'] or item['grandparent_thumb'] == '':
-                        thumb = item['thumb']
                     else:
-                        thumb = item['grandparent_thumb']
+                        user_thumb = item[5]
 
-                    row = {'user': item['user'],
-                           'user_id': item['user_id'],
-                           'friendly_name': item['friendly_name'],
-                           'total_plays': item['total_plays'],
-                           'total_duration': item['total_duration'],
-                           'last_play': item['last_watch'],
+                    row = {'user': item[0],
+                           'user_id': item[6],
+                           'friendly_name': item[1],
+                           'total_plays': item[2],
+                           'total_duration': item[3],
+                           'last_play': item[4],
                            'user_thumb': user_thumb,
-                           'thumb': thumb,
-                           'grandparent_thumb': item['grandparent_thumb'],
-                           'art': item['art'],
+                           'grandparent_thumb': '',
                            'users_watched': '',
+                           'rating_key': '',
+                           'title': '',
+                           'platform_type': '',
                            'platform': '',
-                           'title': item['full_title'],
-                           'grandparent_title': item['grandparent_title'],
-                           'grandchild_title': item['title'],
-                           'year': item['year'],
-                           'media_index': item['media_index'],
-                           'parent_media_index': item['parent_media_index'],
-                           'rating_key': item['rating_key'],
-                           'grandparent_rating_key': item['grandparent_rating_key'],
-                           'media_type': item['media_type'],
-                           'content_rating': item['content_rating'],
-                           'labels': item['labels'].split(';') if item['labels'] else (),
-                           'live': item['live'],
-                           'guid': item['guid'],
-                           'row_id': item['id']
-                           }
+                           'row_id': ''
+                    }
                     top_users.append(row)
 
                 home_stats.append({'stat_id': stat,
                                    'stat_type': sort_type,
-                                   'stat_title': 'Most Active Users',
-                                   'rows': session.mask_session_info(top_users)})
+                                   'rows': top_users})
 
             elif stat == 'top_platforms':
                 top_platform = []
 
                 try:
-                    query = "SELECT sh.platform, sh.started, " \
-                            "MAX(sh.started) AS last_watch, COUNT(sh.id) AS total_plays, SUM(sh.d) AS total_duration " \
-                            "FROM (SELECT *, SUM(CASE WHEN stopped > 0 THEN (stopped - started) - " \
-                            "       (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) " \
-                            "       AS d " \
-                            "   FROM session_history " \
-                            "   WHERE %s %s " \
-                            "   GROUP BY %s) AS sh " \
-                            "GROUP BY sh.platform " \
-                            "ORDER BY %s DESC, sh.started DESC " \
-                            "LIMIT %s OFFSET %s " % (where_timeframe[4:], where_id, group_by, sort_type, stats_count, stats_start)
+                    query = 'SELECT session_history.platform, ' \
+                            'COUNT(session_history.id) as total_plays, ' \
+                            'SUM(case when session_history.stopped > 0 ' \
+                            'then (session_history.stopped - session_history.started) ' \
+                            ' - (case when session_history.paused_counter is NULL then 0 else session_history.paused_counter end) ' \
+                            'else 0 end) as total_duration, ' \
+                            'MAX(session_history.started) as last_watch ' \
+                            'FROM session_history ' \
+                            'WHERE datetime(session_history.stopped, "unixepoch", "localtime") ' \
+                            '>= datetime("now", "-%s days", "localtime") ' \
+                            'GROUP BY session_history.platform ' \
+                            'ORDER BY %s DESC LIMIT %s' % (time_range, sort_type, stats_count)
                     result = monitor_db.select(query)
-                except Exception as e:
-                    logger.warn("Tautulli DataFactory :: Unable to execute database query for get_home_stats: top_platforms: %s." % e)
+                except:
+                    logger.warn("Unable to execute database query.")
                     return None
 
                 for item in result:
                     # Rename Mystery platform names
-                    platform = common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform'])
-                    platform_name = next((v for k, v in common.PLATFORM_NAMES.items() if k in platform.lower()), 'default')
+                    platform_names = {'Mystery 3': 'Playstation 3',
+                                      'Mystery 4': 'Playstation 4',
+                                      'Mystery 5': 'Xbox 360'}
+                    platform_type = platform_names.get(item[0], item[0])
 
-                    row = {'total_plays': item['total_plays'],
-                           'total_duration': item['total_duration'],
-                           'last_play': item['last_watch'],
-                           'platform': platform,
-                           'platform_name': platform_name,
+                    row = {'platform': item[0],
+                           'total_plays': item[1],
+                           'total_duration': item[2],
+                           'last_play': item[3],
+                           'platform_type': platform_type,
                            'title': '',
                            'thumb': '',
                            'grandparent_thumb': '',
-                           'art': '',
                            'users_watched': '',
                            'rating_key': '',
-                           'grandparent_rating_key': '',
                            'user': '',
                            'friendly_name': '',
                            'row_id': ''
@@ -909,703 +535,210 @@ class DataFactory(object):
 
                 home_stats.append({'stat_id': stat,
                                    'stat_type': sort_type,
-                                   'stat_title': 'Most Active Platforms',
-                                   'rows': session.mask_session_info(top_platform, mask_metadata=False)})
+                                   'rows': top_platform})
 
             elif stat == 'last_watched':
-
-                movie_watched_percent = plexpy.CONFIG.MOVIE_WATCHED_PERCENT
-                tv_watched_percent = plexpy.CONFIG.TV_WATCHED_PERCENT
-
-                if plexpy.CONFIG.WATCHED_MARKER == 1:
-                    watched_threshold = (
-                        "(CASE WHEN shm.marker_credits_final IS NULL "
-                        "THEN sh._duration * (CASE WHEN sh.media_type = 'movie' THEN %d ELSE %d END) / 100.0 "
-                        "ELSE shm.marker_credits_final END) "
-                        "AS watched_threshold"
-                    ) % (movie_watched_percent, tv_watched_percent)
-                    watched_where = "_view_offset >= watched_threshold"
-                elif plexpy.CONFIG.WATCHED_MARKER == 2:
-                    watched_threshold = (
-                        "(CASE WHEN shm.marker_credits_first IS NULL "
-                        "THEN sh._duration * (CASE WHEN sh.media_type = 'movie' THEN %d ELSE %d END) / 100.0 "
-                        "ELSE shm.marker_credits_first END) "
-                        "AS watched_threshold"
-                    ) % (movie_watched_percent, tv_watched_percent)
-                    watched_where = "_view_offset >= watched_threshold"
-                elif plexpy.CONFIG.WATCHED_MARKER == 3:
-                    watched_threshold = (
-                        "MIN("
-                        "(CASE WHEN shm.marker_credits_first IS NULL "
-                        "THEN sh._duration * (CASE WHEN sh.media_type = 'movie' THEN %d ELSE %d END) / 100.0 "
-                        "ELSE shm.marker_credits_first END), "
-                        "sh._duration * (CASE WHEN sh.media_type = 'movie' THEN %d ELSE %d END) / 100.0) "
-                        "AS watched_threshold"
-                    ) % (movie_watched_percent, tv_watched_percent, movie_watched_percent, tv_watched_percent)
-                    watched_where = "_view_offset >= watched_threshold"
-                else:
-                    watched_threshold = "NULL AS watched_threshold"
-                    watched_where = (
-                        "sh.media_type == 'movie' AND percent_complete >= %d "
-                        "OR sh.media_type == 'episode' AND percent_complete >= %d"
-                    ) % (movie_watched_percent, tv_watched_percent)
-
                 last_watched = []
                 try:
-                    query = "SELECT sh.id, shm.title, shm.grandparent_title, shm.full_title, shm.year, " \
-                            "shm.media_index, shm.parent_media_index, " \
-                            "sh.rating_key, shm.grandparent_rating_key, shm.thumb, shm.grandparent_thumb, " \
-                            "sh.user, sh.user_id, u.custom_avatar_url as user_thumb, sh.player, sh.section_id, " \
-                            "shm.art, sh.media_type, shm.content_rating, shm.labels, shm.live, shm.guid, " \
-                            "(CASE WHEN u.friendly_name IS NULL OR TRIM(u.friendly_name) = ''" \
-                            "   THEN u.username ELSE u.friendly_name END) " \
-                            "   AS friendly_name, " \
-                            "MAX(sh.started) AS last_watch, sh._view_offset, sh._duration, " \
-                            "(sh._view_offset / sh._duration * 100) AS percent_complete, " \
-                            "%s " \
-                            "FROM (SELECT *, MAX(session_history.id), " \
-                            "   (CASE WHEN view_offset IS NULL THEN 0.1 ELSE view_offset * 1.0 END) AS _view_offset, " \
-                            "   (CASE WHEN duration IS NULL THEN 1.0 ELSE duration * 1.0 END) AS _duration " \
-                            "   FROM session_history " \
-                            "   JOIN session_history_metadata ON session_history_metadata.id = session_history.id " \
-                            "   WHERE (session_history.media_type = 'movie' " \
-                            "           OR session_history.media_type = 'episode') %s %s " \
-                            "   GROUP BY %s) AS sh " \
-                            "JOIN session_history_metadata AS shm ON shm.id = sh.id " \
-                            "LEFT OUTER JOIN users AS u ON sh.user_id = u.user_id " \
-                            "WHERE %s " \
-                            "GROUP BY sh.id " \
-                            "ORDER BY last_watch DESC " \
-                            "LIMIT %s OFFSET %s" % (watched_threshold,
-                                                    where_timeframe, where_id, group_by, watched_where,
-                                                    stats_count, stats_start)
+                    query = 'SELECT session_history_metadata.id, ' \
+                            'session_history.user, ' \
+                            '(case when users.friendly_name is null then session_history.user else ' \
+                            'users.friendly_name end) as friendly_name,' \
+                            'users.user_id, ' \
+                            'users.custom_avatar_url as user_thumb, ' \
+                            'session_history_metadata.full_title, ' \
+                            'session_history_metadata.rating_key, ' \
+                            'session_history_metadata.thumb, ' \
+                            'session_history_metadata.grandparent_thumb, ' \
+                            'MAX(session_history.started) as last_watch, ' \
+                            'session_history.player as platform, ' \
+                            '((CASE WHEN session_history.view_offset IS NULL THEN 0.1 ELSE \
+                             session_history.view_offset * 1.0 END) / \
+                             (CASE WHEN session_history_metadata.duration IS NULL THEN 1.0 ELSE \
+                             session_history_metadata.duration * 1.0 END) * 100) as percent_complete ' \
+                            'FROM session_history_metadata ' \
+                            'JOIN session_history ON session_history_metadata.id = session_history.id ' \
+                            'LEFT OUTER JOIN users ON session_history.user_id = users.user_id ' \
+                            'WHERE datetime(session_history.stopped, "unixepoch", "localtime") ' \
+                            '>= datetime("now", "-%s days", "localtime") ' \
+                            'AND (session_history_metadata.media_type = "movie" ' \
+                            'OR session_history_metadata.media_type = "episode") ' \
+                            'AND percent_complete >= %s ' \
+                            'GROUP BY session_history_metadata.full_title ' \
+                            'ORDER BY last_watch DESC ' \
+                            'LIMIT %s' % (time_range, notify_watched_percent, stats_count)
                     result = monitor_db.select(query)
-                except Exception as e:
-                    logger.warn("Tautulli DataFactory :: Unable to execute database query for get_home_stats: last_watched: %s." % e)
+                except:
+                    logger.warn("Unable to execute database query.")
                     return None
 
                 for item in result:
-                    if not item['grandparent_thumb'] or item['grandparent_thumb'] == '':
-                        thumb = item['thumb']
+                    if not item[8] or item[8] == '':
+                        thumb = item[7]
                     else:
-                        thumb = item['grandparent_thumb']
+                        thumb = item[8]
 
-                    row = {'row_id': item['id'],
-                           'user': item['user'],
-                           'friendly_name': item['friendly_name'],
-                           'user_id': item['user_id'],
-                           'user_thumb': item['user_thumb'],
-                           'title': item['full_title'],
-                           'grandparent_title': item['grandparent_title'],
-                           'grandchild_title': item['title'],
-                           'year': item['year'],
-                           'media_index': item['media_index'],
-                           'parent_media_index': item['parent_media_index'],
-                           'rating_key': item['rating_key'],
-                           'grandparent_rating_key': item['grandparent_rating_key'],
+                    row = {'row_id': item[0],
+                           'user': item[1],
+                           'friendly_name': item[2],
+                           'user_id': item[3],
+                           'user_thumb': item[4],
+                           'title': item[5],
+                           'rating_key': item[6],
                            'thumb': thumb,
-                           'grandparent_thumb': item['grandparent_thumb'],
-                           'art': item['art'],
-                           'section_id': item['section_id'],
-                           'media_type': item['media_type'],
-                           'content_rating': item['content_rating'],
-                           'labels': item['labels'].split(';') if item['labels'] else (),
-                           'last_watch': item['last_watch'],
-                           'live': item['live'],
-                           'guid': item['guid'],
-                           'player': item['player']
+                           'grandparent_thumb': item[8],
+                           'last_watch': item[9],
+                           'platform_type': item[10],
                            }
                     last_watched.append(row)
 
                 home_stats.append({'stat_id': stat,
-                                   'stat_title': 'Recently Watched',
-                                   'rows': session.mask_session_info(last_watched)})
+                                   'rows': last_watched})
 
-            elif stat == 'most_concurrent':
-
-                def calc_most_concurrent(title, result):
-                    '''
-                    Function to calculate most concurrent streams
-                    Input: Stat title, SQLite query result
-                    Output: Dict {title, count, started, stopped}
-                    '''
-                    times = []
-                    for item in result:
-                        times.append({'time': str(item['started']) + 'B', 'count': 1})
-                        times.append({'time': str(item['stopped']) + 'A', 'count': -1})
-                    times = sorted(times, key=lambda k: k['time'])
-
-                    count = 0
-                    last_count = 0
-                    last_start = ''
-                    concurrent = {'title': title,
-                                  'count': 0,
-                                  'started': None,
-                                  'stopped': None
-                                  }
-
-                    for d in times:
-                        if d['count'] == 1:
-                            count += d['count']
-                            if count >= last_count:
-                                last_start = d['time']
-                        else:
-                            if count >= last_count:
-                                last_count = count
-                                concurrent['count'] = count
-                                concurrent['started'] = last_start[:-1]
-                                concurrent['stopped'] = d['time'][:-1]
-                            count += d['count']
-
-                    return concurrent
-
-                most_concurrent = []
-
-                try:
-                    base_query = "SELECT sh.started, sh.stopped " \
-                                 "FROM session_history AS sh " \
-                                 "JOIN session_history_media_info AS shmi ON sh.id = shmi.id " \
-                                 "WHERE %s " % where_timeframe[4:].replace('session_history.', 'sh.')
-
-                    title = 'Concurrent Streams'
-                    query = base_query
-                    result = monitor_db.select(query)
-                    if result:
-                        most_concurrent.append(calc_most_concurrent(title, result))
-
-                    title = 'Concurrent Transcodes'
-                    query = base_query \
-                          + "AND shmi.transcode_decision = 'transcode' "
-                    result = monitor_db.select(query)
-                    if result:
-                        most_concurrent.append(calc_most_concurrent(title, result))
-
-                    title = 'Concurrent Direct Streams'
-                    query = base_query \
-                          + "AND shmi.transcode_decision = 'copy' "
-                    result = monitor_db.select(query)
-                    if result:
-                        most_concurrent.append(calc_most_concurrent(title, result))
-
-                    title = 'Concurrent Direct Plays'
-                    query = base_query \
-                          + "AND shmi.transcode_decision = 'direct play' "
-                    result = monitor_db.select(query)
-                    if result:
-                        most_concurrent.append(calc_most_concurrent(title, result))
-                except Exception as e:
-                    logger.warn("Tautulli DataFactory :: Unable to execute database query for get_home_stats: most_concurrent: %s." % e)
-                    return None
-
-                home_stats.append({'stat_id': stat,
-                                   'stat_title': 'Most Concurrent Streams',
-                                   'rows': most_concurrent})
-
-        if stat_id and home_stats:
-            return home_stats[0]
         return home_stats
 
-    def get_library_stats(self, library_cards=[]):
+    def get_stream_details(self, row_id=None):
         monitor_db = database.MonitorDatabase()
 
-        if session.get_session_shared_libraries():
-            library_cards = session.get_session_shared_libraries()
-
-        library_stats = []
-
-        try:
-            query = "SELECT ls.id, ls.section_id, ls.section_name, ls.section_type, ls.thumb AS library_thumb, " \
-                    "ls.custom_thumb_url AS custom_thumb, ls.art AS library_art, ls.custom_art_url AS custom_art, " \
-                    "ls.count, ls.parent_count, ls.child_count, " \
-                    "sh.id, shm.title, shm.grandparent_title, shm.full_title, shm.year, " \
-                    "shm.media_index, shm.parent_media_index, " \
-                    "sh.rating_key, shm.grandparent_rating_key, shm.thumb, shm.grandparent_thumb, " \
-                    "sh.user, sh.user_id, sh.player, " \
-                    "shm.art, sh.media_type, shm.content_rating, shm.labels, shm.live, shm.guid, " \
-                    "MAX(sh.started) AS last_watch " \
-                    "FROM library_sections AS ls " \
-                    "LEFT OUTER JOIN session_history AS sh ON ls.section_id = sh.section_id " \
-                    "LEFT OUTER JOIN session_history_metadata AS shm ON sh.id = shm.id " \
-                    "WHERE ls.section_id IN (%s) AND ls.deleted_section = 0 " \
-                    "GROUP BY ls.id " \
-                    "ORDER BY ls.section_type, ls.count DESC, ls.parent_count DESC, ls.child_count DESC " % ",".join(library_cards)
-            result = monitor_db.select(query)
-        except Exception as e:
-            logger.warn("Tautulli DataFactory :: Unable to execute database query for get_library_stats: %s." % e)
-            return None
-
-        for item in result:
-            if item['custom_thumb'] and item['custom_thumb'] != item['library_thumb']:
-                library_thumb = item['custom_thumb']
-            elif item['library_thumb']:
-                library_thumb = item['library_thumb']
-            else:
-                library_thumb = common.DEFAULT_COVER_THUMB
-
-            if item['custom_art'] and item['custom_art'] != item['library_art']:
-                library_art = item['custom_art']
-            else:
-                library_art = item['library_art']
-
-            if not item['grandparent_thumb'] or item['grandparent_thumb'] == '':
-                thumb = item['thumb']
-            else:
-                thumb = item['grandparent_thumb']
-
-            library = {'section_id': item['section_id'],
-                       'section_name': item['section_name'],
-                       'section_type': item['section_type'],
-                       'library_thumb': library_thumb,
-                       'library_art': library_art,
-                       'count': item['count'],
-                       'child_count': item['parent_count'],
-                       'grandchild_count': item['child_count'],
-                       'thumb': thumb or '',
-                       'grandparent_thumb': item['grandparent_thumb'] or '',
-                       'art': item['art'] or '',
-                       'title': item['full_title'],
-                       'grandparent_title': item['grandparent_title'],
-                       'grandchild_title': item['title'],
-                       'year': item['year'],
-                       'media_index': item['media_index'],
-                       'parent_media_index': item['parent_media_index'],
-                       'rating_key': item['rating_key'],
-                       'grandparent_rating_key': item['grandparent_rating_key'],
-                       'media_type': item['media_type'],
-                       'content_rating': item['content_rating'],
-                       'labels': item['labels'].split(';') if item['labels'] else (),
-                       'live': item['live'],
-                       'guid': item['guid'],
-                       'row_id': item['id']
-                       }
-            library_stats.append(library)
-
-        library_stats = session.mask_session_info(library_stats)
-        library_stats = helpers.group_by_keys(library_stats, 'section_type')
-
-        return library_stats
-
-    def get_watch_time_stats(self, rating_key=None, guid=None, media_type=None, grouping=None, query_days=None):
-        if rating_key is None and guid is None:
-            return []
-
-        if grouping is None:
-            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
-
-        if query_days and query_days is not None:
-            query_days = map(helpers.cast_to_int, str(query_days).split(','))
-        else:
-            query_days = [1, 7, 30, 0]
-
-        timestamp = helpers.timestamp()
-
-        monitor_db = database.MonitorDatabase()
-
-        item_watch_time_stats = []
-
-        section_ids = set()
-
-        group_by = 'session_history.reference_id' if grouping else 'session_history.id'
-
-        if media_type in ('collection', 'playlist'):
-            pms_connect = pmsconnect.PmsConnect()
-            result = pms_connect.get_item_children(rating_key=rating_key, media_type=media_type)
-            rating_keys = [child['rating_key'] for child in result['children_list']]
-        else:
-            rating_keys = [rating_key]
-
-        rating_keys_arg = ','.join(['?'] * len(rating_keys))
-
-        for days in query_days:
-            timestamp_query = timestamp - days * 24 * 60 * 60
-
-            try:
-                if days > 0:
-                    if str(rating_key).isdigit():
-                        query = "SELECT (SUM(stopped - started) - " \
-                                "SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END)) AS total_time, " \
-                                "COUNT(DISTINCT %s) AS total_plays, section_id " \
-                                "FROM session_history " \
-                                "JOIN session_history_metadata ON session_history_metadata.id = session_history.id " \
-                                "WHERE stopped >= ? " \
-                                "AND (session_history.grandparent_rating_key IN (%s) " \
-                                "OR session_history.parent_rating_key IN (%s) " \
-                                "OR session_history.rating_key IN (%s))" % (
-                                    group_by, rating_keys_arg, rating_keys_arg, rating_keys_arg
-                                )
-                        
-                        result = monitor_db.select(query, args=[timestamp_query] + rating_keys * 3)
-                    elif guid:
-                        query = "SELECT (SUM(stopped - started) - " \
-                                "SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END)) AS total_time, " \
-                                "COUNT(DISTINCT %s) AS total_plays, section_id " \
-                                "FROM session_history " \
-                                "JOIN session_history_metadata ON session_history_metadata.id = session_history.id " \
-                                "WHERE stopped >= ? " \
-                                "AND session_history_metadata.guid = ? " % group_by
-
-                        result = monitor_db.select(query, args=[timestamp_query, guid])
-                    else:
-                        result = []
-                else:
-                    if str(rating_key).isdigit():
-                        query = "SELECT (SUM(stopped - started) - " \
-                                "SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END)) AS total_time, " \
-                                "COUNT(DISTINCT %s) AS total_plays, section_id " \
-                                "FROM session_history " \
-                                "JOIN session_history_metadata ON session_history_metadata.id = session_history.id " \
-                                "WHERE (session_history.grandparent_rating_key IN (%s) " \
-                                "OR session_history.parent_rating_key IN (%s) " \
-                                "OR session_history.rating_key IN (%s))" % (
-                                    group_by, rating_keys_arg, rating_keys_arg, rating_keys_arg
-                                )
-                        
-                        result = monitor_db.select(query, args=rating_keys * 3)
-                    elif guid:
-                        query = "SELECT (SUM(stopped - started) - " \
-                                "SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END)) AS total_time, " \
-                                "COUNT(DISTINCT %s) AS total_plays, section_id " \
-                                "FROM session_history " \
-                                "JOIN session_history_metadata ON session_history_metadata.id = session_history.id " \
-                                "WHERE session_history_metadata.guid = ? " % group_by
-
-                        result = monitor_db.select(query, args=[guid])
-                    else:
-                        result = []
-            except Exception as e:
-                logger.warn("Tautulli Libraries :: Unable to execute database query for get_watch_time_stats: %s." % e)
-                result = []
-
-            for item in result:
-                section_ids.add(item['section_id'])
-
-                if item['total_time']:
-                    total_time = item['total_time']
-                    total_plays = item['total_plays']
-                else:
-                    total_time = 0
-                    total_plays = 0
-
-                row = {'query_days': days,
-                       'total_time': total_time,
-                       'total_plays': total_plays
-                       }
-
-                item_watch_time_stats.append(row)
-
-        if any(not session.allow_session_library(section_id) for section_id in section_ids):
-            return []
-
-        return item_watch_time_stats
-
-    def get_user_stats(self, rating_key=None, guid=None, media_type=None, grouping=None):
-        if grouping is None:
-            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
-
-        monitor_db = database.MonitorDatabase()
-
-        user_stats = []
-
-        section_ids = set()
-        
-        group_by = 'session_history.reference_id' if grouping else 'session_history.id'
-
-        if media_type in ('collection', 'playlist'):
-            pms_connect = pmsconnect.PmsConnect()
-            result = pms_connect.get_item_children(rating_key=rating_key, media_type=media_type)
-            rating_keys = [child['rating_key'] for child in result['children_list']]
-        else:
-            rating_keys = [rating_key]
-
-        rating_keys_arg = ','.join(['?'] * len(rating_keys))
-
-        try:
-            if str(rating_key).isdigit():
-                query = "SELECT (CASE WHEN users.friendly_name IS NULL OR TRIM(users.friendly_name) = '' " \
-                        "THEN users.username ELSE users.friendly_name END) AS friendly_name, " \
-                        "users.user_id, users.username, users.thumb, users.custom_avatar_url AS custom_thumb, " \
-                        "COUNT(DISTINCT %s) AS total_plays, (SUM(stopped - started) - " \
-                        "SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END)) AS total_time, " \
-                        "section_id " \
-                        "FROM session_history " \
-                        "JOIN session_history_metadata ON session_history_metadata.id = session_history.id " \
-                        "JOIN users ON users.user_id = session_history.user_id " \
-                        "WHERE (session_history.grandparent_rating_key IN (%s) " \
-                        "OR session_history.parent_rating_key IN (%s) " \
-                        "OR session_history.rating_key IN (%s)) " \
-                        "GROUP BY users.user_id " \
-                        "ORDER BY total_plays DESC, total_time DESC" % (
-                            group_by, rating_keys_arg, rating_keys_arg, rating_keys_arg
-                        )
-
-                result = monitor_db.select(query, args=rating_keys * 3)
-            elif guid:
-                query = "SELECT (CASE WHEN users.friendly_name IS NULL OR TRIM(users.friendly_name) = '' " \
-                        "THEN users.username ELSE users.friendly_name END) AS friendly_name, " \
-                        "users.user_id, users.username, users.thumb, users.custom_avatar_url AS custom_thumb, " \
-                        "COUNT(DISTINCT %s) AS total_plays, (SUM(stopped - started) - " \
-                        "SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END)) AS total_time, " \
-                        "section_id " \
-                        "FROM session_history " \
-                        "JOIN session_history_metadata ON session_history_metadata.id = session_history.id " \
-                        "JOIN users ON users.user_id = session_history.user_id " \
-                        "WHERE session_history_metadata.guid = ? " \
-                        "GROUP BY users.user_id " \
-                        "ORDER BY total_plays DESC, total_time DESC" % group_by
-
-                result = monitor_db.select(query, args=[guid])
-            else:
-                result = []
-        except Exception as e:
-            logger.warn("Tautulli Libraries :: Unable to execute database query for get_user_stats: %s." % e)
-            result = []
-
-        for item in result:
-            section_ids.add(item['section_id'])
-
-            if item['custom_thumb'] and item['custom_thumb'] != item['thumb']:
-                user_thumb = item['custom_thumb']
-            elif item['thumb']:
-                user_thumb = item['thumb']
-            else:
-                user_thumb = common.DEFAULT_USER_THUMB
-
-            row = {'friendly_name': item['friendly_name'],
-                   'user_id': item['user_id'],
-                   'user_thumb': user_thumb,
-                   'username': item['username'],
-                   'total_plays': item['total_plays'],
-                   'total_time': item['total_time']
-                   }
-            user_stats.append(row)
-
-        if any(not session.allow_session_library(section_id) for section_id in section_ids):
-            return []
-
-        return session.mask_session_info(user_stats, mask_metadata=False)
-
-    def get_stream_details(self, row_id=None, session_key=None):
-        monitor_db = database.MonitorDatabase()
-
-        user_cond = ''
-        table = 'session_history' if row_id else 'sessions'
-        if session.get_session_user_id():
-            user_cond = "AND %s.user_id = %s " % (table, session.get_session_user_id())
-
         if row_id:
-            query = "SELECT bitrate, video_full_resolution, " \
-                    "optimized_version, optimized_version_profile, optimized_version_title, " \
-                    "synced_version, synced_version_profile, " \
-                    "container, video_codec, video_bitrate, video_width, video_height, video_framerate, " \
-                    "video_dynamic_range, aspect_ratio, " \
-                    "audio_codec, audio_bitrate, audio_channels, audio_language, audio_language_code, " \
-                    "subtitle_codec, subtitle_forced, subtitle_language, " \
-                    "stream_bitrate, stream_video_full_resolution, quality_profile, stream_container_decision, stream_container, " \
-                    "stream_video_decision, stream_video_codec, stream_video_bitrate, stream_video_width, stream_video_height, " \
-                    "stream_video_framerate, stream_video_dynamic_range, " \
-                    "stream_audio_decision, stream_audio_codec, stream_audio_bitrate, stream_audio_channels, " \
-                    "stream_audio_language, stream_audio_language_code, " \
-                    "subtitles, stream_subtitle_decision, stream_subtitle_codec, stream_subtitle_forced, stream_subtitle_language, " \
-                    "transcode_hw_decoding, transcode_hw_encoding, " \
-                    "video_decision, audio_decision, transcode_decision, width, height, container, " \
-                    "transcode_container, transcode_video_codec, transcode_audio_codec, transcode_audio_channels, " \
-                    "transcode_width, transcode_height, " \
-                    "session_history_metadata.media_type, title, grandparent_title, original_title " \
-                    "FROM session_history_media_info " \
-                    "JOIN session_history ON session_history_media_info.id = session_history.id " \
-                    "JOIN session_history_metadata ON session_history_media_info.id = session_history_metadata.id " \
-                    "WHERE session_history_media_info.id = ? %s" % user_cond
+            query = 'SELECT container, bitrate, video_resolution, width, height, aspect_ratio, video_framerate, ' \
+                    'video_codec, audio_codec, audio_channels, video_decision, transcode_video_codec, transcode_height, ' \
+                    'transcode_width, audio_decision, transcode_audio_codec, transcode_audio_channels, media_type, ' \
+                    'title, grandparent_title ' \
+                    'from session_history_media_info ' \
+                    'join session_history_metadata on session_history_media_info.id = session_history_metadata.id ' \
+                    'where session_history_media_info.id = ?'
             result = monitor_db.select(query, args=[row_id])
-        elif session_key:
-            query = "SELECT bitrate, video_full_resolution, " \
-                    "optimized_version, optimized_version_profile, optimized_version_title, " \
-                    "synced_version, synced_version_profile, " \
-                    "container, video_codec, video_bitrate, video_width, video_height, video_framerate, " \
-                    "video_dynamic_range, aspect_ratio, " \
-                    "audio_codec, audio_bitrate, audio_channels, audio_language, audio_language_code, " \
-                    "subtitle_codec, subtitle_forced, subtitle_language, " \
-                    "stream_bitrate, stream_video_full_resolution, quality_profile, stream_container_decision, stream_container, " \
-                    "stream_video_decision, stream_video_codec, stream_video_bitrate, stream_video_width, stream_video_height, " \
-                    "stream_video_framerate, stream_video_dynamic_range, " \
-                    "stream_audio_decision, stream_audio_codec, stream_audio_bitrate, stream_audio_channels, " \
-                    "stream_audio_language, stream_audio_language_code, " \
-                    "subtitles, stream_subtitle_decision, stream_subtitle_codec, stream_subtitle_forced, stream_subtitle_language, " \
-                    "transcode_hw_decoding, transcode_hw_encoding, " \
-                    "video_decision, audio_decision, transcode_decision, width, height, container, " \
-                    "transcode_container, transcode_video_codec, transcode_audio_codec, transcode_audio_channels, " \
-                    "transcode_width, transcode_height, " \
-                    "media_type, title, grandparent_title, original_title " \
-                    "FROM sessions " \
-                    "WHERE session_key = ? %s" % user_cond
-            result = monitor_db.select(query, args=[session_key])
         else:
             return None
 
         stream_output = {}
 
         for item in result:
-            pre_tautulli = 0
-
-            # For backwards compatibility. Pick one new Tautulli key to check and override with old values.
-            if not item['stream_container']:
-                item['stream_video_full_resolution'] = item['video_full_resolution']
-                item['stream_container'] = item['transcode_container'] or item['container']
-                item['stream_video_decision'] = item['video_decision']
-                item['stream_video_codec'] = item['transcode_video_codec'] or item['video_codec']
-                item['stream_video_width'] = item['transcode_width'] or item['width']
-                item['stream_video_height'] = item['transcode_height'] or item['height']
-                item['stream_audio_decision'] = item['audio_decision']
-                item['stream_audio_codec'] = item['transcode_audio_codec'] or item['audio_codec']
-                item['stream_audio_channels'] = item['transcode_audio_channels'] or item['audio_channels']
-                item['video_width'] = item['width']
-                item['video_height'] = item['height']
-                pre_tautulli = 1
-
-            stream_output = {'bitrate': item['bitrate'],
-                             'video_full_resolution': item['video_full_resolution'],
-                             'optimized_version': item['optimized_version'],
-                             'optimized_version_profile': item['optimized_version_profile'],
-                             'optimized_version_title': item['optimized_version_title'],
-                             'synced_version': item['synced_version'],
-                             'synced_version_profile': item['synced_version_profile'],
-                             'container': item['container'],
-                             'video_codec': item['video_codec'],
-                             'video_bitrate': item['video_bitrate'],
-                             'video_width': item['video_width'],
-                             'video_height': item['video_height'],
-                             'video_framerate': item['video_framerate'],
-                             'video_dynamic_range': item['video_dynamic_range'],
-                             'aspect_ratio': item['aspect_ratio'],
-                             'audio_codec': item['audio_codec'],
-                             'audio_bitrate': item['audio_bitrate'],
-                             'audio_channels': item['audio_channels'],
-                             'audio_language': item['audio_language'],
-                             'audio_language_code': item['audio_language_code'],
-                             'subtitle_codec': item['subtitle_codec'],
-                             'subtitle_forced': item['subtitle_forced'],
-                             'subtitle_language': item['subtitle_language'],
-                             'stream_bitrate': item['stream_bitrate'],
-                             'stream_video_full_resolution': item['stream_video_full_resolution'],
-                             'quality_profile': item['quality_profile'],
-                             'stream_container_decision': item['stream_container_decision'],
-                             'stream_container': item['stream_container'],
-                             'stream_video_decision': item['stream_video_decision'],
-                             'stream_video_codec': item['stream_video_codec'],
-                             'stream_video_bitrate': item['stream_video_bitrate'],
-                             'stream_video_width': item['stream_video_width'],
-                             'stream_video_height': item['stream_video_height'],
-                             'stream_video_framerate': item['stream_video_framerate'],
-                             'stream_video_dynamic_range': item['stream_video_dynamic_range'],
-                             'stream_audio_decision': item['stream_audio_decision'],
-                             'stream_audio_codec': item['stream_audio_codec'],
-                             'stream_audio_bitrate': item['stream_audio_bitrate'],
-                             'stream_audio_channels': item['stream_audio_channels'],
-                             'stream_audio_language': item['stream_audio_language'],
-                             'stream_audio_language_code': item['stream_audio_language_code'],
-                             'subtitles': item['subtitles'],
-                             'stream_subtitle_decision': item['stream_subtitle_decision'],
-                             'stream_subtitle_codec': item['stream_subtitle_codec'],
-                             'stream_subtitle_forced': item['stream_subtitle_forced'],
-                             'stream_subtitle_language': item['stream_subtitle_language'],
-                             'transcode_hw_decoding': item['transcode_hw_decoding'],
-                             'transcode_hw_encoding': item['transcode_hw_encoding'],
-                             'video_decision': item['video_decision'],
-                             'audio_decision': item['audio_decision'],
-                             'media_type': item['media_type'],
-                             'title': item['title'],
-                             'grandparent_title': item['grandparent_title'],
-                             'original_title': item['original_title'],
-                             'current_session': 1 if session_key else 0,
-                             'pre_tautulli': pre_tautulli
+            stream_output = {'container': item[0],
+                             'bitrate': item[1],
+                             'video_resolution': item[2],
+                             'width': item[3],
+                             'height': item[4],
+                             'aspect_ratio': item[5],
+                             'video_framerate': item[6],
+                             'video_codec': item[7],
+                             'audio_codec': item[8],
+                             'audio_channels': item[9],
+                             'transcode_video_dec': item[10],
+                             'transcode_video_codec': item[11],
+                             'transcode_height': item[12],
+                             'transcode_width': item[13],
+                             'transcode_audio_dec': item[14],
+                             'transcode_audio_codec': item[15],
+                             'transcode_audio_channels': item[16],
+                             'media_type': item[17],
+                             'title': item[18],
+                             'grandparent_title': item[19]
                              }
 
-        stream_output = {k: v or '' for k, v in stream_output.items()}
         return stream_output
 
-    def get_metadata_details(self, rating_key='', guid=''):
+    def get_recently_watched(self, user=None, user_id=None, limit='10'):
+        monitor_db = database.MonitorDatabase()
+        recently_watched = []
+
+        if not limit.isdigit():
+            limit = '10'
+
+        try:
+            if user_id:
+                query = 'SELECT session_history.id, session_history.media_type, session_history.rating_key, session_history.parent_rating_key, ' \
+                        'title, parent_title, grandparent_title, thumb, parent_thumb, grandparent_thumb, media_index, parent_media_index, ' \
+                        'year, started, user ' \
+                        'FROM session_history_metadata ' \
+                        'JOIN session_history ON session_history_metadata.id = session_history.id ' \
+                        'WHERE user_id = ? ' \
+                        'GROUP BY (CASE WHEN session_history.media_type = "track" THEN session_history.parent_rating_key ' \
+                        ' ELSE session_history.rating_key END) ' \
+                        'ORDER BY started DESC LIMIT ?'
+                result = monitor_db.select(query, args=[user_id, limit])
+            elif user:
+                query = 'SELECT session_history.id, session_history.media_type, session_history.rating_key, session_history.parent_rating_key, ' \
+                        'title, parent_title, grandparent_title, thumb, parent_thumb, grandparent_thumb, media_index, parent_media_index, ' \
+                        'year, started, user ' \
+                        'FROM session_history_metadata ' \
+                        'JOIN session_history ON session_history_metadata.id = session_history.id ' \
+                        'WHERE user = ? ' \
+                        'GROUP BY (CASE WHEN session_history.media_type = "track" THEN session_history.parent_rating_key ' \
+                        ' ELSE session_history.rating_key END) ' \
+                        'ORDER BY started DESC LIMIT ?'
+                result = monitor_db.select(query, args=[user, limit])
+            else:
+                query = 'SELECT session_history.id, session_history.media_type, session_history.rating_key, session_history.parent_rating_key, ' \
+                        'title, parent_title, grandparent_title, thumb, parent_thumb, grandparent_thumb, media_index, parent_media_index, ' \
+                        'year, started, user ' \
+                        'FROM session_history_metadata ' \
+                        'JOIN session_history ON session_history_metadata.id = session_history.id ' \
+                        'GROUP BY (CASE WHEN session_history.media_type = "track" THEN session_history.parent_rating_key ' \
+                        ' ELSE session_history.rating_key END) ' \
+                        'ORDER BY started DESC LIMIT ?'
+                result = monitor_db.select(query, args=[limit])
+        except:
+            logger.warn("Unable to execute database query.")
+            return None
+
+        for row in result:
+                if row[1] == 'episode' and row[8]:
+                    thumb = row[8]
+                elif row[1] == 'episode':
+                    thumb = row[9]
+                else:
+                    thumb = row[7]
+
+                recent_output = {'row_id': row[0],
+                                 'type': row[1],
+                                 'rating_key': row[2],
+                                 'title': row[4],
+                                 'parent_title': row[5],
+                                 'grandparent_title': row[6],
+                                 'thumb': thumb,
+                                 'index': row[10],
+                                 'parent_index': row[11],
+                                 'year': row[12],
+                                 'time': row[13],
+                                 'user': row[14]
+                                 }
+                recently_watched.append(recent_output)
+
+        return recently_watched
+
+    def get_metadata_details(self, row_id):
         monitor_db = database.MonitorDatabase()
 
-        if rating_key or guid:
-            if guid:
-                where = "session_history_metadata.guid LIKE ?"
-                args = [guid.split('?')[0] + '%']  # SQLite LIKE wildcard
-            else:
-                where = "session_history_metadata.rating_key = ?"
-                args = [rating_key]
-
-            query = "SELECT session_history.section_id, session_history_metadata.id, " \
-                    "session_history_metadata.rating_key, session_history_metadata.parent_rating_key, " \
-                    "session_history_metadata.grandparent_rating_key, session_history_metadata.title, " \
-                    "session_history_metadata.parent_title, session_history_metadata.grandparent_title, " \
-                    "session_history_metadata.original_title, session_history_metadata.full_title, " \
-                    "library_sections.section_name, " \
-                    "session_history_metadata.media_index, session_history_metadata.parent_media_index, " \
-                    "session_history_metadata.thumb, " \
-                    "session_history_metadata.parent_thumb, session_history_metadata.grandparent_thumb, " \
-                    "session_history_metadata.art, session_history_metadata.media_type, session_history_metadata.year, " \
-                    "session_history_metadata.originally_available_at, session_history_metadata.added_at, " \
-                    "session_history_metadata.updated_at, session_history_metadata.last_viewed_at, " \
-                    "session_history_metadata.content_rating, session_history_metadata.summary, " \
-                    "session_history_metadata.tagline, session_history_metadata.rating, session_history_metadata.duration, " \
-                    "session_history_metadata.guid, session_history_metadata.directors, session_history_metadata.writers, " \
-                    "session_history_metadata.actors, session_history_metadata.genres, session_history_metadata.studio, " \
-                    "session_history_metadata.labels, " \
-                    "session_history_media_info.container, session_history_media_info.bitrate, " \
-                    "session_history_media_info.video_codec, session_history_media_info.video_resolution, " \
-                    "session_history_media_info.video_full_resolution, " \
-                    "session_history_media_info.video_framerate, session_history_media_info.audio_codec, " \
-                    "session_history_media_info.audio_channels, session_history_metadata.live, " \
-                    "session_history_metadata.channel_call_sign, session_history_metadata.channel_id, " \
-                    "session_history_metadata.channel_identifier, session_history_metadata.channel_title, " \
-                    "session_history_metadata.channel_thumb, session_history_metadata.channel_vcn " \
-                    "FROM session_history_metadata " \
-                    "JOIN library_sections ON session_history.section_id = library_sections.section_id " \
-                    "JOIN session_history ON session_history_metadata.id = session_history.id " \
-                    "JOIN session_history_media_info ON session_history_metadata.id = session_history_media_info.id " \
-                    "WHERE %s " \
-                    "ORDER BY session_history_metadata.id DESC " \
-                    "LIMIT 1" % where
-            result = monitor_db.select(query=query, args=args)
+        if row_id:
+            query = 'SELECT rating_key, parent_rating_key, grandparent_rating_key, title, parent_title, grandparent_title, ' \
+                    'full_title, media_index, parent_media_index, thumb, parent_thumb, grandparent_thumb, art, media_type, ' \
+                    'year, originally_available_at, added_at, updated_at, last_viewed_at, content_rating, summary, tagline, ' \
+                    'rating, duration, guid, directors, writers, actors, genres, studio ' \
+                    'FROM session_history_metadata ' \
+                    'WHERE id = ?'
+            result = monitor_db.select(query=query, args=[row_id])
         else:
             result = []
 
-        metadata_list = []
-
+        metadata = {}
         for item in result:
             directors = item['directors'].split(';') if item['directors'] else []
             writers = item['writers'].split(';') if item['writers'] else []
             actors = item['actors'].split(';') if item['actors'] else []
             genres = item['genres'].split(';') if item['genres'] else []
-            labels = item['labels'].split(';') if item['labels'] else []
 
-            media_info = [{'container': item['container'],
-                           'bitrate': item['bitrate'],
-                           'video_codec': item['video_codec'],
-                           'video_resolution': item['video_resolution'],
-                           'video_full_resolution': item['video_full_resolution'],
-                           'video_framerate': item['video_framerate'],
-                           'audio_codec': item['audio_codec'],
-                           'audio_channels': item['audio_channels'],
-                           'channel_call_sign': item['channel_call_sign'],
-                           'channel_id': item['channel_id'],
-                           'channel_identifier': item['channel_identifier'],
-                           'channel_title': item['channel_title'],
-                           'channel_thumb': item['channel_thumb'],
-                           'channel_vcn': item['channel_vcn']
-                           }]
-
-            metadata = {'media_type': item['media_type'],
+            metadata = {'type': item['media_type'],
                         'rating_key': item['rating_key'],
                         'parent_rating_key': item['parent_rating_key'],
                         'grandparent_rating_key': item['grandparent_rating_key'],
                         'grandparent_title': item['grandparent_title'],
-                        'original_title': item['original_title'],
-                        'parent_media_index': item['parent_media_index'],
+                        'parent_index': item['parent_media_index'],
                         'parent_title': item['parent_title'],
-                        'media_index': item['media_index'],
+                        'index': item['media_index'],
                         'studio': item['studio'],
                         'title': item['title'],
-                        'full_title': item['full_title'],
                         'content_rating': item['content_rating'],
                         'summary': item['summary'],
                         'tagline': item['tagline'],
@@ -1621,325 +754,69 @@ class DataFactory(object):
                         'updated_at': item['updated_at'],
                         'last_viewed_at': item['last_viewed_at'],
                         'guid': item['guid'],
-                        'directors': directors,
                         'writers': writers,
-                        'actors': actors,
+                        'directors': directors,
                         'genres': genres,
-                        'labels': labels,
-                        'library_name': item['section_name'],
-                        'section_id': item['section_id'],
-                        'live': item['live'],
-                        'media_info': media_info
+                        'actors': actors
                         }
-            metadata_list.append(metadata)
 
-        filtered_metadata_list = session.filter_session_info(metadata_list, filter_key='section_id')
+        return metadata
 
-        if filtered_metadata_list:
-            return filtered_metadata_list[0]
+    def delete_session_history_rows(self, row_id=None):
+        monitor_db = database.MonitorDatabase()
+
+        if row_id.isdigit():
+            logger.info(u"PlexPy DataFactory :: Deleting row id %s from the session history database." % row_id)
+            session_history_del = \
+                monitor_db.action('DELETE FROM session_history WHERE id = ?', [row_id])
+            session_history_media_info_del = \
+                monitor_db.action('DELETE FROM session_history_media_info WHERE id = ?', [row_id])
+            session_history_metadata_del = \
+                monitor_db.action('DELETE FROM session_history_metadata WHERE id = ?', [row_id])
+
+            return 'Deleted rows %s.' % row_id
         else:
-            return []
+            return 'Unable to delete rows. Input row not valid.'
 
-    def get_total_duration(self, custom_where=None):
+    def delete_all_user_history(self, user_id=None):
         monitor_db = database.MonitorDatabase()
 
-        where, args = datatables.build_custom_where(custom_where=custom_where)
+        if user_id.isdigit():
+            logger.info(u"PlexPy DataFactory :: Deleting all history for user id %s from database." % user_id)
+            session_history_media_info_del = \
+                monitor_db.action('DELETE FROM '
+                                  'session_history_media_info '
+                                  'WHERE session_history_media_info.id IN (SELECT session_history_media_info.id '
+                                  'FROM session_history_media_info '
+                                  'JOIN session_history ON session_history_media_info.id = session_history.id '
+                                  'WHERE session_history.user_id = ?)', [user_id])
+            session_history_metadata_del = \
+                monitor_db.action('DELETE FROM '
+                                  'session_history_metadata '
+                                  'WHERE session_history_metadata.id IN (SELECT session_history_metadata.id '
+                                  'FROM session_history_metadata '
+                                  'JOIN session_history ON session_history_metadata.id = session_history.id '
+                                  'WHERE session_history.user_id = ?)', [user_id])
+            session_history_del = \
+                monitor_db.action('DELETE FROM '
+                                  'session_history '
+                                  'WHERE session_history.user_id = ?', [user_id])
 
-        try:
-            query = "SELECT SUM(CASE WHEN stopped > 0 THEN (stopped - started) ELSE 0 END) - " \
-                    "SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) AS total_duration, " \
-                    "(CASE WHEN session_history_metadata.live = 1 THEN 'live' ELSE session_history.media_type END) " \
-                    "AS media_type_live " \
-                    "FROM session_history " \
-                    "JOIN session_history_metadata ON session_history_metadata.id = session_history.id " \
-                    "JOIN session_history_media_info ON session_history_media_info.id = session_history.id " \
-                    "%s " % where
-            result = monitor_db.select(query, args=args)
-        except Exception as e:
-            logger.warn("Tautulli DataFactory :: Unable to execute database query for get_total_duration: %s." % e)
-            return None
-
-        total_duration = 0
-        for item in result:
-            total_duration = item['total_duration']
-
-        return total_duration
-
-    def get_session_ip(self, session_key=''):
-        monitor_db = database.MonitorDatabase()
-
-        ip_address = 'N/A'
-
-        user_cond = ''
-        if session.get_session_user_id():
-            user_cond = 'AND user_id = %s ' % session.get_session_user_id()
-
-        if session_key:
-            try:
-                query = "SELECT ip_address FROM sessions WHERE session_key = %d %s" % (int(session_key), user_cond)
-                result = monitor_db.select(query)
-            except Exception as e:
-                logger.warn("Tautulli DataFactory :: Unable to execute database query for get_session_ip: %s." % e)
-                return ip_address
+            return 'Deleted all items for user_id %s.' % user_id
         else:
-            return ip_address
-
-        for item in result:
-            ip_address = item['ip_address']
-
-        return ip_address
-
-    def get_img_info(self, img=None, rating_key=None, width=None, height=None,
-                     opacity=None, background=None, blur=None, fallback=None,
-                     order_by='', service=None):
-        monitor_db = database.MonitorDatabase()
-
-        img_info = []
-
-        where_params = []
-        args = []
-
-        if img is not None:
-            where_params.append('img')
-            args.append(img)
-        if rating_key is not None:
-            where_params.append('rating_key')
-            args.append(rating_key)
-        if width is not None:
-            where_params.append('width')
-            args.append(width)
-        if height is not None:
-            where_params.append('height')
-            args.append(height)
-        if opacity is not None:
-            where_params.append('opacity')
-            args.append(opacity)
-        if background is not None:
-            where_params.append('background')
-            args.append(background)
-        if blur is not None:
-            where_params.append('blur')
-            args.append(blur)
-        if fallback is not None:
-            where_params.append('fallback')
-            args.append(fallback)
-
-        where = ''
-        if where_params:
-            where = "WHERE " + " AND ".join([w + " = ?" for w in where_params])
-
-        if order_by:
-            order_by = "ORDER BY " + order_by + " DESC"
-
-        if service == 'imgur':
-            query = "SELECT imgur_title AS img_title, imgur_url AS img_url FROM imgur_lookup " \
-                    "JOIN image_hash_lookup ON imgur_lookup.img_hash = image_hash_lookup.img_hash " \
-                    "%s %s" % (where, order_by)
-        elif service == 'cloudinary':
-            query = "SELECT cloudinary_title AS img_title, cloudinary_url AS img_url FROM cloudinary_lookup " \
-                    "JOIN image_hash_lookup ON cloudinary_lookup.img_hash = image_hash_lookup.img_hash " \
-                    "%s %s" % (where, order_by)
-        else:
-            logger.warn("Tautulli DataFactory :: Unable to execute database query for get_img_info: "
-                        "service not provided.")
-            return img_info
-
-        try:
-            img_info = monitor_db.select(query, args=args)
-        except Exception as e:
-            logger.warn("Tautulli DataFactory :: Unable to execute database query for get_img_info: %s." % e)
-
-        return img_info
-
-    def set_img_info(self, img_hash=None, img_title=None, img_url=None, delete_hash=None, service=None):
-        monitor_db = database.MonitorDatabase()
-
-        keys = {'img_hash': img_hash}
-
-        if service == 'imgur':
-            table = 'imgur_lookup'
-            values = {'imgur_title': img_title,
-                      'imgur_url': img_url,
-                      'delete_hash': delete_hash}
-        elif service == 'cloudinary':
-            table = 'cloudinary_lookup'
-            values = {'cloudinary_title': img_title,
-                      'cloudinary_url': img_url}
-        else:
-            logger.warn("Tautulli DataFactory :: Unable to execute database query for set_img_info: "
-                        "service not provided.")
-            return
-
-        monitor_db.upsert(table, key_dict=keys, value_dict=values)
-
-    def delete_img_info(self, rating_key=None, service='', delete_all=False):
-        monitor_db = database.MonitorDatabase()
-
-        if not delete_all:
-            service = helpers.get_img_service()
-
-        if not rating_key and not delete_all:
-            logger.error("Tautulli DataFactory :: Unable to delete hosted images: rating_key not provided.")
-            return False
-
-        where = ''
-        args = []
-        log_msg = ''
-        if rating_key:
-            where = "WHERE rating_key = ?"
-            args = [rating_key]
-            log_msg = ' for rating_key %s' % rating_key
-
-        if service.lower() == 'imgur':
-            # Delete from Imgur
-            query = "SELECT imgur_title, delete_hash, fallback FROM imgur_lookup " \
-                    "JOIN image_hash_lookup ON imgur_lookup.img_hash = image_hash_lookup.img_hash %s" % where
-            results = monitor_db.select(query, args=args)
-
-            for imgur_info in results:
-                if imgur_info['delete_hash']:
-                    helpers.delete_from_imgur(delete_hash=imgur_info['delete_hash'],
-                                              img_title=imgur_info['imgur_title'],
-                                              fallback=imgur_info['fallback'])
-
-            logger.info("Tautulli DataFactory :: Deleting Imgur info%s from the database."
-                        % log_msg)
-            result = monitor_db.action("DELETE FROM imgur_lookup WHERE img_hash "
-                                       "IN (SELECT img_hash FROM image_hash_lookup %s)" % where,
-                                       args)
-
-        elif service.lower() == 'cloudinary':
-            # Delete from Cloudinary
-            query = "SELECT cloudinary_title, rating_key, fallback FROM cloudinary_lookup " \
-                    "JOIN image_hash_lookup ON cloudinary_lookup.img_hash = image_hash_lookup.img_hash %s " \
-                    "GROUP BY rating_key" % where
-            results = monitor_db.select(query, args=args)
-
-            if delete_all:
-                helpers.delete_from_cloudinary(delete_all=delete_all)
-            else:
-                for cloudinary_info in results:
-                    helpers.delete_from_cloudinary(rating_key=cloudinary_info['rating_key'])
-
-            logger.info("Tautulli DataFactory :: Deleting Cloudinary info%s from the database."
-                        % log_msg)
-            result = monitor_db.action("DELETE FROM cloudinary_lookup WHERE img_hash "
-                                       "IN (SELECT img_hash FROM image_hash_lookup %s)" % where,
-                                       args)
-
-        else:
-            logger.error("Tautulli DataFactory :: Unable to delete hosted images: invalid service '%s' provided."
-                         % service)
-
-        return service
-
-    def get_poster_info(self, rating_key='', metadata=None, service=None):
-        poster_key = ''
-        if str(rating_key).isdigit():
-            poster_key = rating_key
-        elif metadata:
-            if metadata['media_type'] in ('movie', 'show', 'artist', 'collection'):
-                poster_key = metadata['rating_key']
-            elif metadata['media_type'] in ('season', 'album'):
-                poster_key = metadata['rating_key']
-            elif metadata['media_type'] in ('episode', 'track'):
-                poster_key = metadata['parent_rating_key']
-
-        poster_info = {}
-
-        if poster_key:
-            service = service or helpers.get_img_service()
-
-            if service:
-                img_info = self.get_img_info(rating_key=poster_key,
-                                             order_by='height',
-                                             fallback='poster',
-                                             service=service)
-                if img_info:
-                    poster_info = {'poster_title': img_info[0]['img_title'],
-                                   'poster_url': img_info[0]['img_url'],
-                                   'img_service': service.capitalize()}
-
-        return poster_info
-
-    def get_lookup_info(self, rating_key='', metadata=None):
-        monitor_db = database.MonitorDatabase()
-
-        lookup_key = ''
-        if str(rating_key).isdigit():
-            lookup_key = rating_key
-        elif metadata:
-            if metadata['media_type'] in ('movie', 'show', 'artist', 'album', 'track'):
-                lookup_key = metadata['rating_key']
-            elif metadata['media_type'] == 'season':
-                lookup_key = metadata['parent_rating_key']
-            elif metadata['media_type'] == 'episode':
-                lookup_key = metadata['grandparent_rating_key']
-
-        lookup_info = {'tvmaze_id': '',
-                       'themoviedb_id': '',
-                       'musizbrainz_id': ''}
-
-        if lookup_key:
-            try:
-                query = 'SELECT tvmaze_id FROM tvmaze_lookup ' \
-                        'WHERE rating_key = ?'
-                tvmaze_info = monitor_db.select_single(query, args=[lookup_key])
-                if tvmaze_info:
-                    lookup_info['tvmaze_id'] = tvmaze_info['tvmaze_id']
-
-                query = 'SELECT themoviedb_id FROM themoviedb_lookup ' \
-                        'WHERE rating_key = ?'
-                themoviedb_info = monitor_db.select_single(query, args=[lookup_key])
-                if themoviedb_info:
-                    lookup_info['themoviedb_id'] = themoviedb_info['themoviedb_id']
-
-                query = 'SELECT musicbrainz_id FROM musicbrainz_lookup ' \
-                        'WHERE rating_key = ?'
-                musicbrainz_info = monitor_db.select_single(query, args=[lookup_key])
-                if musicbrainz_info:
-                    lookup_info['musicbrainz_id'] = musicbrainz_info['musicbrainz_id']
-
-            except Exception as e:
-                logger.warn("Tautulli DataFactory :: Unable to execute database query for get_lookup_info: %s." % e)
-
-        return lookup_info
-
-    def delete_lookup_info(self, rating_key='', service='', delete_all=False):
-        if not rating_key and not delete_all:
-            logger.error("Tautulli DataFactory :: Unable to delete lookup info: rating_key not provided.")
-            return False
-
-        monitor_db = database.MonitorDatabase()
-
-        if rating_key:
-            logger.info("Tautulli DataFactory :: Deleting lookup info for rating_key %s from the database."
-                        % rating_key)
-            result_themoviedb = monitor_db.action("DELETE FROM themoviedb_lookup WHERE rating_key = ?", [rating_key])
-            result_tvmaze = monitor_db.action("DELETE FROM tvmaze_lookup WHERE rating_key = ?", [rating_key])
-            result_musicbrainz = monitor_db.action("DELETE FROM musicbrainz_lookup WHERE rating_key = ?", [rating_key])
-            return bool(result_themoviedb or result_tvmaze or result_musicbrainz)
-        elif service and delete_all:
-            if service.lower() in ('themoviedb', 'tvmaze', 'musicbrainz'):
-                logger.info("Tautulli DataFactory :: Deleting all lookup info for '%s' from the database."
-                            % service)
-                result = monitor_db.action("DELETE FROM %s_lookup" % service.lower())
-                return bool(result)
-            else:
-                logger.error("Tautulli DataFactory :: Unable to delete lookup info: invalid service '%s' provided."
-                             % service)
+            return 'Unable to delete items. Input user_id not valid.'
 
     def get_search_query(self, rating_key=''):
         monitor_db = database.MonitorDatabase()
 
         if rating_key:
-            query = "SELECT rating_key, parent_rating_key, grandparent_rating_key, title, parent_title, grandparent_title, " \
-                    "media_index, parent_media_index, year, media_type " \
-                    "FROM session_history_metadata " \
-                    "WHERE rating_key = ? " \
-                    "OR parent_rating_key = ? " \
-                    "OR grandparent_rating_key = ? " \
-                    "LIMIT 1"
+            query = 'SELECT rating_key, parent_rating_key, grandparent_rating_key, title, parent_title, grandparent_title, ' \
+                    'media_index, parent_media_index, year, media_type ' \
+                    'FROM session_history_metadata ' \
+                    'WHERE rating_key = ? ' \
+                    'OR parent_rating_key = ? ' \
+                    'OR grandparent_rating_key = ? ' \
+                    'LIMIT 1'
             result = monitor_db.select(query=query, args=[rating_key, rating_key, rating_key])
         else:
             result = []
@@ -1977,7 +854,7 @@ class DataFactory(object):
                     media_type = 'artist'
 
         if query_string and media_type:
-            query = {'query_string': query_string,
+            query = {'query_string': query_string.replace('"', ''),
                      'title': title,
                      'parent_title': parent_title,
                      'grandparent_title': grandparent_title,
@@ -2006,26 +883,25 @@ class DataFactory(object):
 
         # Get the grandparent rating key
         try:
-            query = "SELECT rating_key, parent_rating_key, grandparent_rating_key " \
-                    "FROM session_history_metadata " \
-                    "WHERE rating_key = ? " \
-                    "OR parent_rating_key = ? " \
-                    "OR grandparent_rating_key = ? " \
-                    "LIMIT 1"
+            query = 'SELECT rating_key, parent_rating_key, grandparent_rating_key ' \
+                    'FROM session_history_metadata ' \
+                    'WHERE rating_key = ? ' \
+                    'OR parent_rating_key = ? ' \
+                    'OR grandparent_rating_key = ? ' \
+                    'LIMIT 1'
             result = monitor_db.select(query=query, args=[rating_key, rating_key, rating_key])
 
             grandparent_rating_key = result[0]['grandparent_rating_key']
 
-        except Exception as e:
-            logger.warn("Tautulli DataFactory :: Unable to execute database query for get_rating_keys_list: %s." % e)
+        except:
+            logger.warn("Unable to execute database query.")
             return {}
 
-        query = "SELECT rating_key, parent_rating_key, grandparent_rating_key, title, parent_title, grandparent_title, " \
-                "media_index, parent_media_index " \
-                "FROM session_history_metadata " \
-                "WHERE {0} = ? " \
-                "GROUP BY {1} " \
-                "ORDER BY {1} DESC "
+        query = 'SELECT rating_key, parent_rating_key, grandparent_rating_key, title, parent_title, grandparent_title, ' \
+                'media_index, parent_media_index ' \
+                'FROM session_history_metadata ' \
+                'WHERE {0} = ? ' \
+                'GROUP BY {1} '
 
         # get grandparent_rating_keys
         grandparents = {}
@@ -2042,35 +918,35 @@ class DataFactory(object):
                 result = monitor_db.select(query=query.format('parent_rating_key', 'rating_key'),
                                            args=[item['parent_rating_key']])
                 for item in result:
-                    key = item['media_index'] if item['media_index'] else str(item['title']).lower()
+                    key = item['media_index']
                     children.update({key: {'rating_key': item['rating_key']}})
 
-                key = item['parent_media_index'] if match_type == 'index' else str(item['parent_title']).lower()
+                key = item['parent_media_index'] if match_type == 'index' else item['parent_title']
                 parents.update({key:
                                 {'rating_key': item['parent_rating_key'],
                                  'children': children}
                                 })
 
-            key = 0 if match_type == 'index' else str(item['grandparent_title']).lower()
+            key = 0 if match_type == 'index' else item['grandparent_title']
             grandparents.update({key:
                                  {'rating_key': item['grandparent_rating_key'],
                                   'children': parents}
                                  })
 
         key_list = grandparents
-
+        
         return key_list
 
-    def update_metadata(self, old_key_list='', new_key_list='', media_type='', single_update=False):
-        pms_connect = pmsconnect.PmsConnect()
+    def update_rating_key(self, old_key_list='', new_key_list='', media_type=''):
         monitor_db = database.MonitorDatabase()
 
         # function to map rating keys pairs
         def get_pairs(old, new):
             pairs = {}
-            for k, v in old.items():
+            for k, v in old.iteritems():
                 if k in new:
-                    pairs.update({v['rating_key']: new[k]['rating_key']})
+                    if v['rating_key'] != new[k]['rating_key']:
+                        pairs.update({v['rating_key']: new[k]['rating_key']})
                     if 'children' in old[k]:
                         pairs.update(get_pairs(old[k]['children'], new[k]['children']))
 
@@ -2080,378 +956,52 @@ class DataFactory(object):
         mapping = {}
         if old_key_list and new_key_list:
             mapping = get_pairs(old_key_list, new_key_list)
-
+        
         if mapping:
-            logger.info("Tautulli DataFactory :: Updating metadata in the database.")
+            logger.info(u"PlexPy DataFactory :: Updating rating keys in the database.")
+            for old_key, new_key in mapping.iteritems():
+                # check rating_key (3 tables)
+                monitor_db.action('UPDATE session_history SET rating_key = ? WHERE rating_key = ?', 
+                                  [new_key, old_key])
+                monitor_db.action('UPDATE session_history_media_info SET rating_key = ? WHERE rating_key = ?', 
+                                  [new_key, old_key])
+                monitor_db.action('UPDATE session_history_metadata SET rating_key = ? WHERE rating_key = ?', 
+                                  [new_key, old_key])
 
-            global _UPDATE_METADATA_IDS
-            if single_update:
-                _UPDATE_METADATA_IDS = {
-                    'grandparent_rating_key_ids': set(),
-                    'parent_rating_key_ids': set(),
-                    'rating_key_ids': set()
-                }
+                # check parent_rating_key (2 tables)
+                monitor_db.action('UPDATE session_history SET parent_rating_key = ? WHERE parent_rating_key = ?', 
+                                  [new_key, old_key])
+                monitor_db.action('UPDATE session_history_metadata SET parent_rating_key = ? WHERE parent_rating_key = ?', 
+                                  [new_key, old_key])
 
-            for old_key, new_key in mapping.items():
-                metadata = pms_connect.get_metadata_details(new_key)
+                # check grandparent_rating_key (2 tables)
+                monitor_db.action('UPDATE session_history SET grandparent_rating_key = ? WHERE grandparent_rating_key = ?', 
+                                  [new_key, old_key])
+                monitor_db.action('UPDATE session_history_metadata SET grandparent_rating_key = ? WHERE grandparent_rating_key = ?', 
+                                  [new_key, old_key])
 
-                if metadata:
-                    logger.debug("Tautulli DataFactory :: Mapping for rating_key %s -> %s (%s)",
-                                 old_key, new_key, metadata['media_type'])
+                # check thumb (1 table)
+                monitor_db.action('UPDATE session_history_metadata SET thumb = replace(thumb, ?, ?) \
+                                  WHERE thumb LIKE "/library/metadata/%s/thumb/%%"' % old_key, 
+                                  [old_key, new_key])
 
-                    if metadata['media_type'] == 'show' or metadata['media_type'] == 'artist':
-                        # check grandparent_rating_key (2 tables)
-                        query = (
-                            "SELECT id FROM session_history "
-                            "WHERE grandparent_rating_key = ? "
-                        )
-                        args = [old_key]
+                # check parent_thumb (1 table)
+                monitor_db.action('UPDATE session_history_metadata SET parent_thumb = replace(parent_thumb, ?, ?) \
+                                  WHERE parent_thumb LIKE "/library/metadata/%s/thumb/%%"' % old_key, 
+                                  [old_key, new_key])
 
-                        if _UPDATE_METADATA_IDS['grandparent_rating_key_ids']:
-                            query += "AND id NOT IN (%s)" % ",".join(_UPDATE_METADATA_IDS['grandparent_rating_key_ids'])
+                # check grandparent_thumb (1 table)
+                monitor_db.action('UPDATE session_history_metadata SET grandparent_thumb = replace(grandparent_thumb, ?, ?) \
+                                  WHERE grandparent_thumb LIKE "/library/metadata/%s/thumb/%%"' % old_key, 
+                                  [old_key, new_key])
 
-                        ids = [str(row['id']) for row in monitor_db.select(query, args)]
-                        if ids:
-                            _UPDATE_METADATA_IDS['grandparent_rating_key_ids'].update(ids)
-                        else:
-                            continue
+                # check art (1 table)
+                monitor_db.action('UPDATE session_history_metadata SET art = replace(art, ?, ?) \
+                                  WHERE art LIKE "/library/metadata/%s/art/%%"' % old_key, 
+                                  [old_key, new_key])
 
-                        monitor_db.action(
-                            "UPDATE session_history SET grandparent_rating_key = ? "
-                            "WHERE id IN (%s)" % ",".join(ids),
-                            [new_key]
-                        )
-                        monitor_db.action(
-                            "UPDATE session_history_metadata SET grandparent_rating_key = ? "
-                            "WHERE id IN (%s)" % ",".join(ids),
-                            [new_key]
-                        )
-
-                    elif metadata['media_type'] == 'season' or metadata['media_type'] == 'album':
-                        # check parent_rating_key (2 tables)
-                        query = (
-                            "SELECT id FROM session_history "
-                            "WHERE parent_rating_key = ? "
-                        )
-                        args = [old_key]
-
-                        if _UPDATE_METADATA_IDS['parent_rating_key_ids']:
-                            query += "AND id NOT IN (%s)" % ",".join(_UPDATE_METADATA_IDS['parent_rating_key_ids'])
-
-                        ids = [str(row['id']) for row in monitor_db.select(query, args)]
-                        if ids:
-                            _UPDATE_METADATA_IDS['parent_rating_key_ids'].update(ids)
-                        else:
-                            continue
-
-                        monitor_db.action(
-                            "UPDATE session_history SET parent_rating_key = ? "
-                            "WHERE id IN (%s)" % ",".join(ids),
-                            [new_key]
-                        )
-                        monitor_db.action(
-                            "UPDATE session_history_metadata SET parent_rating_key = ? "
-                            "WHERE id IN (%s)" % ",".join(ids),
-                            [new_key]
-                        )
-
-                    else:
-                        # check rating_key (2 tables)
-                        query = (
-                            "SELECT id FROM session_history "
-                            "WHERE rating_key = ? "
-                        )
-                        args = [old_key]
-
-                        if _UPDATE_METADATA_IDS['rating_key_ids']:
-                            query += "AND id NOT IN (%s)" % ",".join(_UPDATE_METADATA_IDS['rating_key_ids'])
-
-                        ids = [str(row['id']) for row in monitor_db.select(query, args)]
-                        if ids:
-                            _UPDATE_METADATA_IDS['rating_key_ids'].update(ids)
-                        else:
-                            continue
-
-                        monitor_db.action(
-                            "UPDATE session_history SET rating_key = ? "
-                            "WHERE id IN (%s)" % ",".join(ids),
-                            [new_key]
-                        )
-                        monitor_db.action(
-                            "UPDATE session_history_media_info SET rating_key = ? "
-                            "WHERE id IN (%s)" % ",".join(ids),
-                            [new_key]
-                        )
-
-                        # update session_history_metadata table
-                        self.update_metadata_details(old_key, new_key, metadata, ids)
-
-            return 'Updated metadata in database.'
+            return 'Updated rating key in database.'
         else:
-            return 'Unable to update metadata in database. No changes were made.'
-
-    def update_metadata_details(self, old_rating_key='', new_rating_key='', metadata=None, ids=None):
-
-        if metadata:
-            # Create full_title
-            if metadata['media_type'] == 'episode':
-                full_title = '%s - %s' % (metadata['grandparent_title'], metadata['title'])
-            elif metadata['media_type'] == 'track':
-                full_title = '%s - %s' % (metadata['title'],
-                                          metadata['original_title'] or metadata['grandparent_title'])
-            else:
-                full_title = metadata['title']
-
-            directors = ";".join(metadata['directors'])
-            writers = ";".join(metadata['writers'])
-            actors = ";".join(metadata['actors'])
-            genres = ";".join(metadata['genres'])
-            labels = ";".join(metadata['labels'])
-
-            logger.debug("Tautulli DataFactory :: Updating metadata in the database for rating_key %s -> %s.",
-                         old_rating_key, new_rating_key)
-
-            monitor_db = database.MonitorDatabase()
-
-            query = "UPDATE session_history SET section_id = ? " \
-                    "WHERE id IN (%s)" % ",".join(ids)
-            args = [metadata['section_id']]
-            monitor_db.action(query=query, args=args)
-
-            # Update the session_history_metadata table
-            query = "UPDATE session_history_metadata SET rating_key = ?, parent_rating_key = ?, " \
-                    "grandparent_rating_key = ?, title = ?, parent_title = ?, grandparent_title = ?, " \
-                    "original_title = ?, full_title = ?, " \
-                    "media_index = ?, parent_media_index = ?, thumb = ?, parent_thumb = ?, " \
-                    "grandparent_thumb = ?, art = ?, media_type = ?, year = ?, originally_available_at = ?, " \
-                    "added_at = ?, updated_at = ?, last_viewed_at = ?, content_rating = ?, summary = ?, " \
-                    "tagline = ?, rating = ?, duration = ?, guid = ?, directors = ?, writers = ?, actors = ?, " \
-                    "genres = ?, studio = ?, labels = ? " \
-                    "WHERE id IN (%s)" % ",".join(ids)
-
-            args = [metadata['rating_key'], metadata['parent_rating_key'], metadata['grandparent_rating_key'],
-                    metadata['title'], metadata['parent_title'], metadata['grandparent_title'],
-                    metadata['original_title'], full_title,
-                    metadata['media_index'], metadata['parent_media_index'], metadata['thumb'],
-                    metadata['parent_thumb'], metadata['grandparent_thumb'], metadata['art'], metadata['media_type'],
-                    metadata['year'], metadata['originally_available_at'], metadata['added_at'], metadata['updated_at'],
-                    metadata['last_viewed_at'], metadata['content_rating'], metadata['summary'], metadata['tagline'],
-                    metadata['rating'], metadata['duration'], metadata['guid'], directors, writers, actors, genres,
-                    metadata['studio'], labels]
-
-            monitor_db.action(query=query, args=args)
-
-    def get_notification_log(self, kwargs=None):
-        data_tables = datatables.DataTables()
-
-        columns = ["notify_log.id",
-                   "notify_log.timestamp",
-                   "notify_log.session_key",
-                   "notify_log.rating_key",
-                   "notify_log.user_id",
-                   "notify_log.user",
-                   "notify_log.notifier_id",
-                   "notify_log.agent_id",
-                   "notify_log.agent_name",
-                   "notify_log.notify_action",
-                   "notify_log.subject_text",
-                   "notify_log.body_text",
-                   "notify_log.success"
-                   ]
-        try:
-            query = data_tables.ssp_query(table_name='notify_log',
-                                          columns=columns,
-                                          custom_where=[],
-                                          group_by=[],
-                                          join_types=[],
-                                          join_tables=[],
-                                          join_evals=[],
-                                          kwargs=kwargs)
-        except Exception as e:
-            logger.warn("Tautulli DataFactory :: Unable to execute database query for get_notification_log: %s." % e)
-            return {'recordsFiltered': 0,
-                    'recordsTotal': 0,
-                    'draw': 0,
-                    'data': []}
-
-        notifications = query['result']
-
-        rows = []
-        for item in notifications:
-            if item['body_text']:
-                body_text = item['body_text'].replace('\r\n', '<br />').replace('\n', '<br />')
-            else:
-                body_text = ''
-
-            row = {'id': item['id'],
-                   'timestamp': item['timestamp'],
-                   'session_key': item['session_key'],
-                   'rating_key': item['rating_key'],
-                   'user_id': item['user_id'],
-                   'user': item['user'],
-                   'notifier_id': item['notifier_id'],
-                   'agent_id': item['agent_id'],
-                   'agent_name': item['agent_name'],
-                   'notify_action': item['notify_action'],
-                   'subject_text': item['subject_text'],
-                   'body_text': body_text,
-                   'success': item['success']
-                   }
-
-            rows.append(row)
-
-        dict = {'recordsFiltered': query['filteredCount'],
-                'recordsTotal': query['totalCount'],
-                'data': rows,
-                'draw': query['draw']
-                }
-
-        return dict
-
-    def delete_notification_log(self):
-        monitor_db = database.MonitorDatabase()
-
-        try:
-            logger.info("Tautulli DataFactory :: Clearing notification logs from database.")
-            monitor_db.action("DELETE FROM notify_log")
-            monitor_db.action("VACUUM")
-            return True
-        except Exception as e:
-            logger.warn("Tautulli DataFactory :: Unable to execute database query for delete_notification_log: %s." % e)
-            return False
-
-    def get_newsletter_log(self, kwargs=None):
-        data_tables = datatables.DataTables()
-
-        columns = ["newsletter_log.id",
-                   "newsletter_log.timestamp",
-                   "newsletter_log.newsletter_id",
-                   "newsletter_log.agent_id",
-                   "newsletter_log.agent_name",
-                   "newsletter_log.notify_action",
-                   "newsletter_log.subject_text",
-                   "newsletter_log.body_text",
-                   "newsletter_log.start_date",
-                   "newsletter_log.end_date",
-                   "newsletter_log.uuid",
-                   "newsletter_log.success"
-                   ]
-        try:
-            query = data_tables.ssp_query(table_name='newsletter_log',
-                                          columns=columns,
-                                          custom_where=[],
-                                          group_by=[],
-                                          join_types=[],
-                                          join_tables=[],
-                                          join_evals=[],
-                                          kwargs=kwargs)
-        except Exception as e:
-            logger.warn("Tautulli DataFactory :: Unable to execute database query for get_newsletter_log: %s." % e)
-            return {'recordsFiltered': 0,
-                    'recordsTotal': 0,
-                    'draw': 0,
-                    'data': []}
-
-        newsletters = query['result']
-
-        rows = []
-        for item in newsletters:
-            row = {'id': item['id'],
-                   'timestamp': item['timestamp'],
-                   'newsletter_id': item['newsletter_id'],
-                   'agent_id': item['agent_id'],
-                   'agent_name': item['agent_name'],
-                   'notify_action': item['notify_action'],
-                   'subject_text': item['subject_text'],
-                   'body_text': item['body_text'],
-                   'start_date': item['start_date'],
-                   'end_date': item['end_date'],
-                   'uuid': item['uuid'],
-                   'success': item['success']
-                   }
-
-            rows.append(row)
-
-        dict = {'recordsFiltered': query['filteredCount'],
-                'recordsTotal': query['totalCount'],
-                'data': rows,
-                'draw': query['draw']
-                }
-
-        return dict
-
-    def delete_newsletter_log(self):
-        monitor_db = database.MonitorDatabase()
-
-        try:
-            logger.info("Tautulli DataFactory :: Clearing newsletter logs from database.")
-            monitor_db.action("DELETE FROM newsletter_log")
-            monitor_db.action("VACUUM")
-            return True
-        except Exception as e:
-            logger.warn("Tautulli DataFactory :: Unable to execute database query for delete_newsletter_log: %s." % e)
-            return False
-
-    def get_user_devices(self, user_id='', history_only=True):
-        monitor_db = database.MonitorDatabase()
-
-        if user_id:
-            if history_only:
-                query = "SELECT machine_id FROM session_history " \
-                        "WHERE user_id = ? " \
-                        "GROUP BY machine_id"
-            else:
-                query = "SELECT * FROM (" \
-                        "SELECT user_id, machine_id FROM session_history " \
-                        "UNION SELECT user_id, machine_id from sessions_continued) " \
-                        "WHERE user_id = ? " \
-                        "GROUP BY machine_id"
-
-            try:
-                result = monitor_db.select(query=query, args=[user_id])
-            except Exception as e:
-                logger.warn("Tautulli DataFactory :: Unable to execute database query for get_user_devices: %s." % e)
-                return []
-        else:
-            return []
-
-        return [d['machine_id'] for d in result]
-
-    def get_recently_added_item(self, rating_key=''):
-        monitor_db = database.MonitorDatabase()
-
-        if rating_key:
-            try:
-                query = "SELECT * FROM recently_added WHERE rating_key = ?"
-                result = monitor_db.select(query=query, args=[rating_key])
-            except Exception as e:
-                logger.warn("Tautulli DataFactory :: Unable to execute database query for get_recently_added_item: %s." % e)
-                return []
-        else:
-            return []
-
-        return result
-
-    def set_recently_added_item(self, rating_key=''):
-        monitor_db = database.MonitorDatabase()
-
-        pms_connect = pmsconnect.PmsConnect()
-        metadata = pms_connect.get_metadata_details(rating_key)
-
-        keys = {'rating_key': metadata['rating_key']}
-
-        values = {'added_at': metadata['added_at'],
-                  'section_id': metadata['section_id'],
-                  'parent_rating_key': metadata['parent_rating_key'],
-                  'grandparent_rating_key': metadata['grandparent_rating_key'],
-                  'media_type': metadata['media_type'],
-                  'media_info': json.dumps(metadata['media_info'])
-                  }
-
-        try:
-            monitor_db.upsert(table_name='recently_added', key_dict=keys, value_dict=values)
-        except Exception as e:
-            logger.warn("Tautulli DataFactory :: Unable to execute database query for set_recently_added_item: %s." % e)
-            return False
-
-        return True
+            return 'No updated rating key needed in database. No changes were made.'
+        # for debugging
+        #return mapping
\ No newline at end of file
diff --git a/plexpy/datatables.py b/plexpy/datatables.py
index 49dedacc..3a499085 100644
--- a/plexpy/datatables.py
+++ b/plexpy/datatables.py
@@ -1,25 +1,22 @@
-# This file is part of Tautulli.
+# This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
+
+from plexpy import logger, helpers, database
 
 import re
 
-import plexpy
-from plexpy import database
-from plexpy import helpers
-from plexpy import logger
-
 
 class DataTables(object):
     """
@@ -31,77 +28,159 @@ class DataTables(object):
 
     def ssp_query(self,
                   table_name=None,
-                  table_name_union=None,
                   columns=[],
-                  columns_union=[],
                   custom_where=[],
-                  custom_where_union=[],
                   group_by=[],
-                  group_by_union=[],
                   join_types=[],
                   join_tables=[],
                   join_evals=[],
                   kwargs=None):
 
         if not table_name:
-            logger.error('Tautulli DataTables :: No table name received.')
+            logger.error('PlexPy DataTables :: No table name received.')
             return None
 
+        # Set default variable values
+        parameters = {}
+        args = []
+        group = ''
+        order = ''
+        where = ''
+        join = ''
+        c_where = ''
+
         # Fetch all our parameters
         if kwargs.get('json_data'):
             parameters = helpers.process_json_kwargs(json_kwargs=kwargs.get('json_data'))
         else:
-            logger.error('Tautulli DataTables :: Parameters for Datatables must be sent as a serialised json object '
+            logger.error('PlexPy DataTables :: Parameters for Datatables must be sent as a serialised json object '
                          'named json_data.')
             return None
 
-        extracted_columns = extract_columns(columns=columns)
-        join = build_join(join_types, join_tables, join_evals)
-        group = build_grouping(group_by)
-        c_where, cw_args = build_custom_where(custom_where)
-        order = build_order(parameters['order'],
-                                 extracted_columns['column_named'],
-                                 parameters['columns'])
-        where, w_args = build_where(parameters['search']['value'],
-                                         extracted_columns['column_named'],
-                                         parameters['columns'])
+        dt_columns = parameters['columns']
+        extracted_columns = self.extract_columns(columns=columns)
 
-        # Build union parameters
-        if table_name_union:
-            extracted_columns_union = extract_columns(columns=columns_union)
-            group_u = build_grouping(group_by_union)
-            c_where_u, cwu_args = build_custom_where(custom_where_union)
-            union = 'UNION SELECT %s FROM %s %s %s' % (extracted_columns_union['column_string'],
-                                                       table_name_union,
-                                                       c_where_u,
-                                                       group_u)
+        # Build grouping
+        if group_by:
+            for g in group_by:
+                group += g + ', '
+            if group:
+                grouping = True
+                group = 'GROUP BY ' + group.rstrip(', ')
         else:
-            union = ''
-            cwu_args = []
+            grouping = False
 
-        args = cw_args + cwu_args + w_args
+        # Build ordering
+        for o in parameters['order']:
+            sort_order = ' COLLATE NOCASE'
+            if o['dir'] == 'desc':
+                sort_order = ' COLLATE NOCASE DESC'
+            # We first see if a name was sent though for the column sort.
+            if dt_columns[int(o['column'])]['data']:
+                # We have a name, now check if it's a valid column name for our query
+                # so we don't just inject a random value
+                if any(d.lower() == dt_columns[int(o['column'])]['data'].lower()
+                       for d in extracted_columns['column_named']):
+                    order += dt_columns[int(o['column'])]['data'] + '%s' % sort_order
+                else:
+                    # if we receive a bogus name, rather not sort at all.
+                    pass
+            # If no name exists for the column, just use the column index to sort
+            else:
+                order += extracted_columns['column_named'][int(o['column'])]
 
-        # Build the query
-        query = 'SELECT * FROM (SELECT %s FROM %s %s %s %s %s) %s %s' \
-                % (extracted_columns['column_string'], table_name, join, c_where, group, union, where, order)
+            order += ', '
 
-        # logger.debug("Query: %s" % query)
+        if order:
+            order = 'ORDER BY ' + order.rstrip(', ')
+
+        # Build where parameters
+        if parameters['search']['value']:
+            counter = 0
+            for s in parameters['columns']:
+                if s['searchable']:
+                    # We first see if a name was sent though for the column search.
+                    if s['data']:
+                        # We have a name, now check if it's a valid column name for our query
+                        # so we don't just inject a random value
+                        if any(d.lower() == s['data'].lower() for d in extracted_columns['column_named']):
+                            where += s['data'] + ' LIKE ? OR '
+                            args.append('%' + parameters['search']['value'] + '%')
+                        else:
+                            # if we receive a bogus name, rather not search at all.
+                            pass
+                    # If no name exists for the column, just use the column index to search
+                    else:
+                        where += extracted_columns['column_named'][counter] + ' LIKE ? OR '
+                        args.append('%' + parameters['search']['value'] + '%')
+
+                counter += 1
+
+            if where:
+                where = 'WHERE ' + where.rstrip(' OR ')
+
+        # Build join parameters
+        if join_types:
+            counter = 0
+            for join_type in join_types:
+                if join_type.upper() == 'LEFT OUTER JOIN':
+                    join_item = 'LEFT OUTER JOIN %s ON %s = %s ' % \
+                                (join_tables[counter], join_evals[counter][0], join_evals[counter][1])
+                elif join_type.upper() == 'JOIN' or join_type.upper() == 'INNER JOIN':
+                    join_item = 'JOIN %s ON %s = %s ' % \
+                                (join_tables[counter], join_evals[counter][0], join_evals[counter][1])
+                else:
+                    join_item = ''
+
+                counter += 1
+                join += join_item
+
+        # Build custom where parameters
+        if custom_where:
+            for w in custom_where:
+                c_where += w[0] + ' = ? AND '
+
+                # The order of our args changes if we are grouping
+                if grouping:
+                    args.insert(0, w[1])
+                else:
+                    args.append(w[1])
+
+            if c_where:
+                c_where = 'WHERE ' + c_where.rstrip(' AND ')
+
+        # Build our queries
+        if grouping:
+            if c_where == '':
+                query = 'SELECT * FROM (SELECT %s FROM %s %s %s) %s %s' \
+                        % (extracted_columns['column_string'], table_name, join, group,
+                           where, order)
+            else:
+                query = 'SELECT * FROM (SELECT %s FROM %s %s %s %s) %s %s' \
+                        % (extracted_columns['column_string'], table_name, join, c_where, group,
+                           where, order)
+        else:
+            if c_where == '':
+                query = 'SELECT %s FROM %s %s %s %s' \
+                        % (extracted_columns['column_string'], table_name, join, where,
+                           order)
+            else:
+                query = 'SELECT * FROM (SELECT %s FROM %s %s %s %s) %s' \
+                        % (extracted_columns['column_string'], table_name, join, where,
+                           order, c_where)
+
+        # logger.debug(u"Query: %s" % query)
 
         # Execute the query
         filtered = self.ssp_db.select(query, args=args)
 
-        # Remove NULL rows
-        filtered = [row for row in filtered if not all(v is None for v in row.values())]
-
         # Build grand totals
-        totalcount = self.ssp_db.select('SELECT COUNT(id) as total_count from %s' % table_name)[0]['total_count']
+        totalcount = self.ssp_db.select('SELECT COUNT(id) from %s' % table_name)[0][0]
 
         # Get draw counter
         draw_counter = int(parameters['draw'])
 
-        # Paginate results
         result = filtered[parameters['start']:(parameters['start'] + parameters['length'])]
-
         output = {'result': result,
                   'draw': draw_counter,
                   'filteredCount': len(filtered),
@@ -109,192 +188,62 @@ class DataTables(object):
 
         return output
 
+    # This method extracts column data from our column list
+    # The first parameter is required, the match_columns parameter is optional and will cause the function to
+    # only return results if the value also exists in the match_columns 'data' field
+    @staticmethod
+    def extract_columns(columns=None, match_columns=None):
+        columns_string = ''
+        columns_literal = []
+        columns_named = []
+        columns_order = []
 
-def build_grouping(group_by=[]):
-    # Build grouping
-    group = ''
+        for column in columns:
+            # We allow using "as" in column names for more complex sql functions.
+            # This function breaks up the column to get all it's parts.
+            as_search = re.compile(' as ', re.IGNORECASE)
 
-    for g in group_by:
-        group += g + ', '
-    if group:
-        group = 'GROUP BY ' + group.rstrip(', ')
-
-    return group
-
-
-def build_join(join_types=[], join_tables=[], join_evals=[]):
-    # Build join parameters
-    join = ''
-
-    for i, join_type in enumerate(join_types):
-        if join_type.upper() == 'LEFT OUTER JOIN':
-            join += 'LEFT OUTER JOIN %s ON %s = %s ' % (join_tables[i], join_evals[i][0], join_evals[i][1])
-        elif join_type.upper() == 'JOIN' or join_type.upper() == 'INNER JOIN':
-            join += 'JOIN %s ON %s = %s ' % (join_tables[i], join_evals[i][0], join_evals[i][1])
-
-    return join
-
-
-def build_custom_where(custom_where=[]):
-    # Build custom where parameters
-    c_where = ''
-    args = []
-
-    for w in custom_where:
-        and_or = ' OR ' if w[0].endswith('OR') else ' AND '
-        w[0] = w[0].rstrip(' OR')
-
-        if w[0].endswith(' IN') and isinstance(w[1], (list, tuple)) and len(w[1]):
-            c_where += w[0] + '(' + ','.join(['?'] * len(w[1])) + ')' + and_or
-            args += w[1]
-        elif isinstance(w[1], (list, tuple)) and len(w[1]):
-            c_where += '('
-            for w_ in w[1]:
-                if w_ is None:
-                    c_where += w[0] + ' IS NULL'
-                elif w[0].endswith(' LIKE'):
-                    c_where += w[0] + ' ?'
-                    args.append(w_)
-                elif w[0].endswith('<') or w[0].endswith('>'):
-                    c_where += w[0] + '= ?'
-                    args.append(w_)
+            if re.search(as_search, column):
+                column_named = re.split(as_search, column)[1].rpartition('.')[-1]
+                column_literal = re.split(as_search, column)[0]
+                column_order = re.split(as_search, column)[1]
+                if match_columns:
+                    if any(d['data'].lower() == column_named.lower() for d in match_columns):
+                        columns_string += column + ', '
+                        columns_literal.append(column_literal)
+                        columns_named.append(column_named)
+                        columns_order.append(column_order)
                 else:
-                    c_where += w[0] + ' = ?'
-                    args.append(w_)
-                c_where += ' OR '
-            c_where = c_where.rstrip(' OR ') + ')' + and_or
-        else:
-            if w[1] is None:
-                c_where += w[0] + ' IS NULL'
-            elif w[0].endswith(' LIKE'):
-                c_where += w[0] + ' ?'
-                args.append(w[1])
-            elif w[0].endswith('<') or w[0].endswith('>'):
-                c_where += w[0] + '= ?'
-                args.append(w[1])
-            else:
-                c_where += w[0] + ' = ?'
-                args.append(w[1])
-
-            c_where += and_or
-
-    if c_where:
-        c_where = 'WHERE ' + c_where.rstrip(' AND ').rstrip(' OR ')
-
-    return c_where, args
-
-
-def build_order(order_param=[], columns=[], dt_columns=[]):
-    # Build ordering
-    order = ''
-
-    for o in order_param:
-        sort_order = ' COLLATE NOCASE'
-        if o['dir'] == 'desc':
-            sort_order += ' DESC'
-        # We first see if a name was sent though for the column sort.
-        if dt_columns[int(o['column'])]['data']:
-            # We have a name, now check if it's a valid column name for our query
-            # so we don't just inject a random value
-            if any(d.lower() == dt_columns[int(o['column'])]['data'].lower()
-                   for d in columns):
-                order += dt_columns[int(o['column'])]['data'] + '%s, ' % sort_order
-            else:
-                # if we receive a bogus name, rather not sort at all.
-                pass
-        # If no name exists for the column, just use the column index to sort
-        else:
-            order += columns[int(o['column'])] + ', '
-
-    if order:
-        order = 'ORDER BY ' + order.rstrip(', ')
-
-    return order
-
-
-def build_where(search_param='', columns=[], dt_columns=[]):
-    # Build where parameters
-    where = ''
-    args = []
-
-    if search_param:
-        for i, s in enumerate(dt_columns):
-            if s['searchable']:
-                # We first see if a name was sent though for the column search.
-                if s['data']:
-                    # We have a name, now check if it's a valid column name for our query
-                    # so we don't just inject a random value
-                    if any(d.lower() == s['data'].lower() for d in columns):
-                        where += s['data'] + ' LIKE ? OR '
-                        args.append('%' + search_param + '%')
-                    else:
-                        # if we receive a bogus name, rather not search at all.
-                        pass
-                # If no name exists for the column, just use the column index to search
-                else:
-                    where += columns[i] + ' LIKE ? OR '
-                    args.append('%' + search_param + '%')
-        if where:
-            where = 'WHERE ' + where.rstrip(' OR ')
-
-    return where, args
-
-
-# This method extracts column data from our column list
-# The first parameter is required, the match_columns parameter is optional and will cause the function to
-# only return results if the value also exists in the match_columns 'data' field
-def extract_columns(columns=None, match_columns=None):
-    columns_string = ''
-    columns_literal = []
-    columns_named = []
-    columns_order = []
-
-    for column in columns:
-        # We allow using "as" in column names for more complex sql functions.
-        # This function breaks up the column to get all it's parts.
-        as_search = re.compile(' as ', re.IGNORECASE)
-
-        if re.search(as_search, column):
-            column_named = re.split(as_search, column)[1].rpartition('.')[-1]
-            column_literal = re.split(as_search, column)[0]
-            column_order = re.split(as_search, column)[1]
-            if match_columns:
-                if any(d['data'].lower() == column_named.lower() for d in match_columns):
                     columns_string += column + ', '
                     columns_literal.append(column_literal)
                     columns_named.append(column_named)
                     columns_order.append(column_order)
             else:
-                columns_string += column + ', '
-                columns_literal.append(column_literal)
-                columns_named.append(column_named)
-                columns_order.append(column_order)
-        else:
-            column_named = column.rpartition('.')[-1]
-            if match_columns:
-                if any(d['data'].lower() == column_named.lower() for d in match_columns):
+                column_named = column.rpartition('.')[-1]
+                if match_columns:
+                    if any(d['data'].lower() == column_named.lower() for d in match_columns):
+                        columns_string += column + ', '
+                        columns_literal.append(column)
+                        columns_named.append(column_named)
+                        columns_order.append(column)
+                else:
                     columns_string += column + ', '
                     columns_literal.append(column)
                     columns_named.append(column_named)
                     columns_order.append(column)
-            else:
-                columns_string += column + ', '
-                columns_literal.append(column)
-                columns_named.append(column_named)
-                columns_order.append(column)
 
-    columns_string = columns_string.rstrip(', ')
+        columns_string = columns_string.rstrip(', ')
 
-    # We return a dict of the column params
-    # column_string is a comma separated list of the exact column variables received.
-    # column_literal is the text before the "as" if we have an "as". Usually a function.
-    # column_named is the text after the "as", if we have an "as". Any table prefix is also stripped off.
-    #   We use this to match with columns received from the Datatables request.
-    # column_order is the text after the "as", if we have an "as". Any table prefix is left intact.
-    column_data = {'column_string': columns_string,
-                   'column_literal': columns_literal,
-                   'column_named': columns_named,
-                   'column_order': columns_order
-                   }
+        # We return a dict of the column params
+        # column_string is a comma seperated list of the exact column variables received.
+        # column_literal is the text before the "as" if we have an "as". Usually a function.
+        # column_named is the text after the "as", if we have an "as". Any table prefix is also stripped off.
+        #   We use this to match with columns received from the Datatables request.
+        # column_order is the text after the "as", if we have an "as". Any table prefix is left intact.
+        column_data = {'column_string': columns_string,
+                       'column_literal': columns_literal,
+                       'column_named': columns_named,
+                       'column_order': columns_order
+                       }
 
-    return column_data
+        return column_data
diff --git a/plexpy/exceptions.py b/plexpy/exceptions.py
index cbbb0b2a..7709f8c1 100644
--- a/plexpy/exceptions.py
+++ b/plexpy/exceptions.py
@@ -1,21 +1,21 @@
-#  This file is part of Tautulli.
+#  This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
 
 class PlexPyException(Exception):
     """
-    Generic Tautulli Exception - should never be thrown, only subclassed
+    Generic PlexPy Exception - should never be thrown, only subclassed
     """
 
diff --git a/plexpy/exporter.py b/plexpy/exporter.py
deleted file mode 100644
index b1e07de2..00000000
--- a/plexpy/exporter.py
+++ /dev/null
@@ -1,2754 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# This file is part of Tautulli.
-#
-#  Tautulli is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  Tautulli 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
-
-import csv
-import json
-import os
-import requests
-import shutil
-import threading
-
-from functools import partial, reduce
-from io import open
-from multiprocessing.dummy import Pool as ThreadPool
-
-import plexpy
-from plexpy import database
-from plexpy import datatables
-from plexpy import helpers
-from plexpy import logger
-from plexpy import users
-from plexpy.plex import Plex
-
-
-class Export(object):
-    # True/False for allowed (thumb, art, logo) image export
-    MEDIA_TYPES = {
-        'movie': (True, True, True),
-        'show': (True, True, True),
-        'season': (True, True, True),
-        'episode': (False, False, True),
-        'artist': (True, True, False),
-        'album': (True, True, False),
-        'track': (False, False, False),
-        'photoalbum': (False, False, False),
-        'photo': (False, False, False),
-        'clip': (False, False, False),
-        'collection': (True, True, False),
-        'playlist': (True, True, False)
-    }
-    PLURAL_MEDIA_TYPES = {
-        'movie': 'movies',
-        'show': 'shows',
-        'season': 'seasons',
-        'episode': 'episodes',
-        'artist': 'artists',
-        'album': 'albums',
-        'track': 'tracks',
-        'photoalbum': 'photoalbums',
-        'photo': 'photos',
-        'clip': 'clips',
-        'collection': 'collections',
-        'playlist': 'playlists',
-        'item': 'items'
-    }
-    CHILD_MEDIA_TYPES = {
-        'movie': [],
-        'show': ['season'],
-        'season': ['episode'],
-        'episode': [],
-        'artist': ['album'],
-        'album': ['track'],
-        'track': [],
-        'photoalbum': ['photoalbum', 'photo', 'clip'],
-        'photo': [],
-        'clip': [],
-        'collection': ['item'],
-        'playlist': ['item']
-    }
-    TREE_MEDIA_TYPES = [
-        ('episode', 'season', 'show'),
-        ('track', 'album', 'artist'),
-        ('photo', 'photoalbum'),
-        ('clip', 'photoalbum'),
-        ('item', 'collection'),
-        ('item', 'playlist')
-    ]
-    METADATA_LEVELS = (0, 1, 2, 3, 9)
-    MEDIA_INFO_LEVELS = (0, 1, 2, 3, 9)
-    IMAGE_LEVELS = (0, 1, 2, 9)
-    FILE_FORMATS = ('csv', 'json', 'xml', 'm3u')
-    EXPORT_TYPES = ('all', 'collection', 'playlist')
-
-    def __init__(self, section_id=None, user_id=None, rating_key=None, file_format='csv',
-                 metadata_level=1, media_info_level=1,
-                 thumb_level=0, art_level=0, logo_level=0,
-                 custom_fields='', export_type='all', individual_files=False):
-        self.section_id = helpers.cast_to_int(section_id) or None
-        self.user_id = helpers.cast_to_int(user_id) or None
-        self.rating_key = helpers.cast_to_int(rating_key) or None
-        self.file_format = str(file_format).lower()
-        self.metadata_level = helpers.cast_to_int(metadata_level)
-        self.media_info_level = helpers.cast_to_int(media_info_level)
-        self.thumb_level = helpers.cast_to_int(thumb_level)
-        self.art_level = helpers.cast_to_int(art_level)
-        self.logo_level = helpers.cast_to_int(logo_level)
-        self.custom_fields = custom_fields.replace(' ', '')
-        self._custom_fields = {}
-        self.export_type = str(export_type).lower() or 'all'
-        self.individual_files = individual_files
-
-        self.timestamp = helpers.timestamp()
-
-        self.media_type = None
-        self.obj = None
-        self.obj_title = None
-
-        self.directory = None
-        self.filename = None
-        self.title = None
-        self.export_id = None
-        self.file_size = 0
-        self.exported_thumb = False
-        self.exported_art = False
-        self.exported_logo = False
-        self._reload_check_files = False
-
-        self.total_items = 0
-        self.exported_items = 0
-        self.success = False
-
-        # Reset export options for m3u
-        if self.file_format == 'm3u':
-            self.metadata_level = 1
-            self.media_info_level = 1
-            self.thumb_level = 0
-            self.art_level = 0
-            self.logo_level = 0
-            self.custom_fields = ''
-
-    def return_attrs(self, media_type, flatten=False):
-        # o: current object
-        # e: element in object attribute value list
-
-        def movie_attrs():
-            _movie_attrs = {
-                'addedAt': helpers.datetime_to_iso,
-                'art': None,
-                'artBlurHash': None,
-                'artFile': lambda o: self.get_image(o, 'art'),
-                'artProvider': lambda o: self.get_image_provider(o, 'art'),
-                'audienceRating': None,
-                'audienceRatingImage': None,
-                'chapters': {
-                    'id': None,
-                    'tag': None,
-                    'index': None,
-                    'start': None,
-                    'end': None,
-                    'thumb': None
-                },
-                'chapterSource': None,
-                'collections': {
-                    'id': None,
-                    'tag': None
-                },
-                'contentRating': None,
-                'countries': {
-                    'id': None,
-                    'tag': None
-                },
-                'directors': {
-                    'id': None,
-                    'tag': None
-                },
-                'duration': None,
-                'durationHuman': lambda o: helpers.human_duration(getattr(o, 'duration', 0)),
-                'editionTitle': None,
-                'enableCreditsMarkerGeneration': None,
-                'fields': {
-                    'name': None,
-                    'locked': None
-                },
-                'genres': {
-                    'id': None,
-                    'tag': None
-                },
-                'guid': None,
-                'guids': {
-                    'id': None
-                },
-                'hasCreditsMarker': None,
-                'hasPreviewThumbnails': None,
-                'hasVoiceActivity': None,
-                'key': None,
-                'labels': {
-                    'id': None,
-                    'tag': None
-                },
-                'languageOverride': None,
-                'lastRatedAt': helpers.datetime_to_iso,
-                'lastViewedAt': helpers.datetime_to_iso,
-                'librarySectionID': None,
-                'librarySectionKey': None,
-                'librarySectionTitle': None,
-                'locations': None,
-                'logo': lambda o: next((i.url for i in o.images if i.type == 'clearLogo'), None),
-                'logoFile': lambda o: self.get_image(o, 'logo'),
-                'logoProvider': lambda o: self.get_image_provider(o, 'logo'),
-                'markers': {
-                    'end': None,
-                    'final': None,
-                    'first': None,
-                    'id': None,
-                    'start': None,
-                    'type': None
-                },
-                'media': {
-                    'aspectRatio': None,
-                    'audioChannels': None,
-                    'audioCodec': None,
-                    'audioProfile': None,
-                    'bitrate': None,
-                    'container': None,
-                    'duration': None,
-                    'height': None,
-                    'id': None,
-                    'isOptimizedVersion': None,
-                    'has64bitOffsets': None,
-                    'hasVoiceActivity': None,
-                    'optimizedForStreaming': None,
-                    'proxyType': None,
-                    'target': None,
-                    'title': None,
-                    'videoCodec': None,
-                    'videoFrameRate': None,
-                    'videoProfile': None,
-                    'videoResolution': None,
-                    'width': None,
-                    'hdr': lambda o: self.get_any_hdr(o, 'movie'),
-                    'parts': {
-                        'accessible': None,
-                        'audioProfile': None,
-                        'container': None,
-                        'deepAnalysisVersion': None,
-                        'duration': None,
-                        'exists': None,
-                        'file': None,
-                        'has64bitOffsets': None,
-                        'hasPreviewThumbnails': None,
-                        'hasThumbnail': None,
-                        'id': None,
-                        'indexes': None,
-                        'key': None,
-                        'optimizedForStreaming': None,
-                        'packetLength': None,
-                        'requiredBandwidths': None,
-                        'size': None,
-                        'sizeHuman': lambda o: helpers.human_file_size(getattr(o, 'size', 0)),
-                        'syncItemId': None,
-                        'syncState': None,
-                        'videoProfile': None,
-                        'videoStreams': {
-                            'bitrate': None,
-                            'codec': None,
-                            'default': None,
-                            'displayTitle': None,
-                            'extendedDisplayTitle': None,
-                            'id': None,
-                            'index': None,
-                            'key': None,
-                            'language': None,
-                            'languageCode': None,
-                            'languageTag': None,
-                            'requiredBandwidths': None,
-                            'selected': None,
-                            'streamType': None,
-                            'title': None,
-                            'type': None,
-                            'anamorphic': None,
-                            'bitDepth': None,
-                            'cabac': None,
-                            'chromaLocation': None,
-                            'chromaSubsampling': None,
-                            'codecID': None,
-                            'codedHeight': None,
-                            'codedWidth': None,
-                            'colorPrimaries': None,
-                            'colorRange': None,
-                            'colorSpace': None,
-                            'colorTrc': None,
-                            'DOVIBLCompatID': None,
-                            'DOVIBLPresent': None,
-                            'DOVIELPresent': None,
-                            'DOVILevel': None,
-                            'DOVIPresent': None,
-                            'DOVIProfile': None,
-                            'DOVIRPUPresent': None,
-                            'DOVIVersion': None,
-                            'duration': None,
-                            'frameRate': None,
-                            'frameRateMode': None,
-                            'hasScalingMatrix': None,
-                            'hdr': lambda o: helpers.is_hdr(getattr(o, 'bitDepth', 0), getattr(o, 'colorSpace', '')),
-                            'height': None,
-                            'level': None,
-                            'pixelAspectRatio': None,
-                            'pixelFormat': None,
-                            'profile': None,
-                            'refFrames': None,
-                            'scanType': None,
-                            'streamIdentifier': None,
-                            'width': None
-                        },
-                        'audioStreams': {
-                            'bitrate': None,
-                            'codec': None,
-                            'default': None,
-                            'displayTitle': None,
-                            'extendedDisplayTitle': None,
-                            'id': None,
-                            'index': None,
-                            'key': None,
-                            'language': None,
-                            'languageCode': None,
-                            'languageTag': None,
-                            'requiredBandwidths': None,
-                            'selected': None,
-                            'streamType': None,
-                            'title': None,
-                            'type': None,
-                            'audioChannelLayout': None,
-                            'bitDepth': None,
-                            'bitrateMode': None,
-                            'channels': None,
-                            'duration': None,
-                            'profile': None,
-                            'samplingRate': None,
-                            'streamIdentifier': None,
-                            'visualImpaired': None
-                        },
-                        'subtitleStreams': {
-                            'canAutoSync': None,
-                            'codec': None,
-                            'default': None,
-                            'displayTitle': None,
-                            'extendedDisplayTitle': None,
-                            'id': None,
-                            'index': None,
-                            'key': None,
-                            'language': None,
-                            'languageCode': None,
-                            'languageTag': None,
-                            'requiredBandwidths': None,
-                            'selected': None,
-                            'streamType': None,
-                            'title': None,
-                            'type': None,
-                            'container': None,
-                            'forced': None,
-                            'format': None,
-                            'headerCompression': None,
-                            'hearingImpaired': None,
-                            'perfectMatch': None,
-                            'providerTitle': None,
-                            'score': None,
-                            'sourceKey': None,
-                            'transient': None,
-                            'userID': None
-                        }
-                    }
-                },
-                'metadataDirectory': None,
-                'originallyAvailableAt': partial(helpers.datetime_to_iso, to_date=True),
-                'originalTitle': None,
-                'producers': {
-                    'id': None,
-                    'tag': None
-                },
-                'rating': None,
-                'ratingImage': None,
-                'ratingKey': None,
-                'roles': {
-                    'id': None,
-                    'tag': None,
-                    'role': None,
-                    'thumb': None
-                },
-                'slug': None,
-                'studio': None,
-                'summary': None,
-                'tagline': None,
-                'theme': None,
-                'thumb': None,
-                'thumbBlurHash': None,
-                'thumbFile': lambda o: self.get_image(o, 'thumb'),
-                'thumbProvider': lambda o: self.get_image_provider(o, 'thumb'),
-                'title': None,
-                'titleSort': None,
-                'type': None,
-                'updatedAt': helpers.datetime_to_iso,
-                'useOriginalTitle': None,
-                'userRating': None,
-                'viewCount': None,
-                'viewOffset': None,
-                'writers': {
-                    'id': None,
-                    'tag': None
-                },
-                'year': None
-            }
-            return _movie_attrs
-
-        def show_attrs():
-            _show_attrs = {
-                'addedAt': helpers.datetime_to_iso,
-                'art': None,
-                'artBlurHash': None,
-                'artFile': lambda o: self.get_image(o, 'art'),
-                'artProvider': lambda o: self.get_image_provider(o, 'art'),
-                'audienceRating': None,
-                'audienceRatingImage': None,
-                'audioLanguage': None,
-                'autoDeletionItemPolicyUnwatchedLibrary': None,
-                'autoDeletionItemPolicyWatchedLibrary': None,
-                'childCount': None,
-                'collections': {
-                    'id': None,
-                    'tag': None
-                },
-                'contentRating': None,
-                'duration': None,
-                'durationHuman': lambda o: helpers.human_duration(getattr(o, 'duration', 0)),
-                'enableCreditsMarkerGeneration': None,
-                'episodeSort': None,
-                'fields': {
-                    'name': None,
-                    'locked': None
-                },
-                'flattenSeasons': None,
-                'genres': {
-                    'id': None,
-                    'tag': None
-                },
-                'guid': None,
-                'guids': {
-                    'id': None
-                },
-                'index': None,
-                'key': None,
-                'labels': {
-                    'id': None,
-                    'tag': None
-                },
-                'languageOverride': None,
-                'lastRatedAt': helpers.datetime_to_iso,
-                'lastViewedAt': helpers.datetime_to_iso,
-                'leafCount': None,
-                'librarySectionID': None,
-                'librarySectionKey': None,
-                'librarySectionTitle': None,
-                'locations': None,
-                'logo': lambda o: next((i.url for i in o.images if i.type == 'clearLogo'), None),
-                'logoFile': lambda o: self.get_image(o, 'logo'),
-                'logoProvider': lambda o: self.get_image_provider(o, 'logo'),
-                'metadataDirectory': None,
-                'network': None,
-                'originallyAvailableAt': partial(helpers.datetime_to_iso, to_date=True),
-                'originalTitle': None,
-                'rating': None,
-                'ratingKey': None,
-                'roles': {
-                    'id': None,
-                    'tag': None,
-                    'role': None,
-                    'thumb': None
-                },
-                'seasonCount': None,
-                'showOrdering': None,
-                'slug': None,
-                'studio': None,
-                'subtitleLanguage': None,
-                'subtitleMode': None,
-                'summary': None,
-                'tagline': None,
-                'theme': None,
-                'thumb': None,
-                'thumbBlurHash': None,
-                'thumbFile': lambda o: self.get_image(o, 'thumb'),
-                'thumbProvider': lambda o: self.get_image_provider(o, 'thumb'),
-                'title': None,
-                'titleSort': None,
-                'type': None,
-                'updatedAt': helpers.datetime_to_iso,
-                'useOriginalTitle': None,
-                'userRating': None,
-                'viewCount': None,
-                'viewedLeafCount': None,
-                'year': None,
-                'seasons': lambda e: self.export_obj(e)
-            }
-            return _show_attrs
-
-        def season_attrs():
-            _season_attrs = {
-                'addedAt': helpers.datetime_to_iso,
-                'art': None,
-                'artBlurHash': None,
-                'artFile': lambda o: self.get_image(o, 'art'),
-                'artProvider': lambda o: self.get_image_provider(o, 'art'),
-                'audioLanguage': None,
-                'collections': {
-                    'id': None,
-                    'tag': None
-                },
-                'fields': {
-                    'name': None,
-                    'locked': None
-                },
-                'guid': None,
-                'guids': {
-                    'id': None
-                },
-                'index': None,
-                'key': None,
-                'labels': {
-                    'id': None,
-                    'tag': None
-                },
-                'lastRatedAt': helpers.datetime_to_iso,
-                'lastViewedAt': helpers.datetime_to_iso,
-                'leafCount': None,
-                'librarySectionID': None,
-                'librarySectionKey': None,
-                'librarySectionTitle': None,
-                'logo': lambda o: next((i.url for i in o.images if i.type == 'clearLogo'), None),
-                'logoFile': lambda o: self.get_image(o, 'logo'),
-                'logoProvider': lambda o: self.get_image_provider(o, 'logo'),
-                'metadataDirectory': None,
-                'parentGuid': None,
-                'parentIndex': None,
-                'parentKey': None,
-                'parentRatingKey': None,
-                'parentStudio': None,
-                'parentTheme': None,
-                'parentThumb': None,
-                'parentTitle': None,
-                'ratingKey': None,
-                'seasonNumber': None,
-                'slug': None,
-                'subtitleLanguage': None,
-                'subtitleMode': None,
-                'summary': None,
-                'thumb': None,
-                'thumbBlurHash': None,
-                'thumbFile': lambda o: self.get_image(o, 'thumb'),
-                'thumbProvider': lambda o: self.get_image_provider(o, 'thumb'),
-                'title': None,
-                'titleSort': None,
-                'type': None,
-                'updatedAt': helpers.datetime_to_iso,
-                'userRating': None,
-                'viewCount': None,
-                'viewedLeafCount': None,
-                'year': None,
-                'episodes': lambda e: self.export_obj(e)
-            }
-            return _season_attrs
-
-        def episode_attrs():
-            _episode_attrs = {
-                'addedAt': helpers.datetime_to_iso,
-                'art': None,
-                'artBlurHash': None,
-                'artFile': lambda o: self.get_image(o, 'art'),
-                'artProvider': lambda o: self.get_image_provider(o, 'art'),
-                'audienceRating': None,
-                'audienceRatingImage': None,
-                'chapters': {
-                    'id': None,
-                    'tag': None,
-                    'index': None,
-                    'start': None,
-                    'end': None,
-                    'thumb': None
-                },
-                'chapterSource': None,
-                'collections': {
-                    'id': None,
-                    'tag': None
-                },
-                'contentRating': None,
-                'directors': {
-                    'id': None,
-                    'tag': None
-                },
-                'duration': None,
-                'durationHuman': lambda o: helpers.human_duration(getattr(o, 'duration', 0)),
-                'episodeNumber': None,
-                'fields': {
-                    'name': None,
-                    'locked': None
-                },
-                'grandparentArt': None,
-                'grandparentGuid': None,
-                'grandparentKey': None,
-                'grandparentRatingKey': None,
-                'grandparentTheme': None,
-                'grandparentThumb': None,
-                'grandparentTitle': None,
-                'guid': None,
-                'guids': {
-                    'id': None
-                },
-                'hasCommercialMarker': None,
-                'hasCreditsMarker': None,
-                'hasIntroMarker': None,
-                'hasPreviewThumbnails': None,
-                'hasVoiceActivity': None,
-                'index': None,
-                'key': None,
-                'labels': {
-                    'id': None,
-                    'tag': None
-                },
-                'lastRatedAt': helpers.datetime_to_iso,
-                'lastViewedAt': helpers.datetime_to_iso,
-                'librarySectionID': None,
-                'librarySectionKey': None,
-                'librarySectionTitle': None,
-                'locations': None,
-                'logo': lambda o: next((i.url for i in o.images if i.type == 'clearLogo'), None),
-                'logoFile': lambda o: self.get_image(o, 'logo'),
-                'logoProvider': lambda o: self.get_image_provider(o, 'logo'),
-                'markers': {
-                    'end': None,
-                    'final': None,
-                    'first': None,
-                    'id': None,
-                    'start': None,
-                    'type': None
-                },
-                'media': {
-                    'aspectRatio': None,
-                    'audioChannels': None,
-                    'audioCodec': None,
-                    'audioProfile': None,
-                    'bitrate': None,
-                    'container': None,
-                    'duration': None,
-                    'height': None,
-                    'id': None,
-                    'isOptimizedVersion': None,
-                    'has64bitOffsets': None,
-                    'hasVoiceActivity': None,
-                    'optimizedForStreaming': None,
-                    'proxyType': None,
-                    'target': None,
-                    'title': None,
-                    'videoCodec': None,
-                    'videoFrameRate': None,
-                    'videoProfile': None,
-                    'videoResolution': None,
-                    'width': None,
-                    'hdr': lambda o: self.get_any_hdr(o, 'episode'),
-                    'parts': {
-                        'accessible': None,
-                        'audioProfile': None,
-                        'container': None,
-                        'deepAnalysisVersion': None,
-                        'duration': None,
-                        'exists': None,
-                        'file': None,
-                        'has64bitOffsets': None,
-                        'hasPreviewThumbnails': None,
-                        'hasThumbnail': None,
-                        'id': None,
-                        'indexes': None,
-                        'key': None,
-                        'optimizedForStreaming': None,
-                        'packetLength': None,
-                        'requiredBandwidths': None,
-                        'size': None,
-                        'sizeHuman': lambda o: helpers.human_file_size(getattr(o, 'size', 0)),
-                        'syncItemId': None,
-                        'syncState': None,
-                        'videoProfile': None,
-                        'videoStreams': {
-                            'bitrate': None,
-                            'codec': None,
-                            'default': None,
-                            'displayTitle': None,
-                            'extendedDisplayTitle': None,
-                            'id': None,
-                            'index': None,
-                            'key': None,
-                            'language': None,
-                            'languageCode': None,
-                            'languageTag': None,
-                            'requiredBandwidths': None,
-                            'selected': None,
-                            'streamType': None,
-                            'title': None,
-                            'type': None,
-                            'anamorphic': None,
-                            'bitDepth': None,
-                            'cabac': None,
-                            'chromaLocation': None,
-                            'chromaSubsampling': None,
-                            'codecID': None,
-                            'codedHeight': None,
-                            'codedWidth': None,
-                            'colorPrimaries': None,
-                            'colorRange': None,
-                            'colorSpace': None,
-                            'colorTrc': None,
-                            'DOVIBLCompatID': None,
-                            'DOVIBLPresent': None,
-                            'DOVIELPresent': None,
-                            'DOVILevel': None,
-                            'DOVIPresent': None,
-                            'DOVIProfile': None,
-                            'DOVIRPUPresent': None,
-                            'DOVIVersion': None,
-                            'duration': None,
-                            'frameRate': None,
-                            'frameRateMode': None,
-                            'hasScalingMatrix': None,
-                            'hdr': lambda o: helpers.is_hdr(getattr(o, 'bitDepth', 0), getattr(o, 'colorTrc', '')),
-                            'height': None,
-                            'level': None,
-                            'pixelAspectRatio': None,
-                            'pixelFormat': None,
-                            'profile': None,
-                            'refFrames': None,
-                            'scanType': None,
-                            'streamIdentifier': None,
-                            'width': None
-                        },
-                        'audioStreams': {
-                            'bitrate': None,
-                            'codec': None,
-                            'default': None,
-                            'displayTitle': None,
-                            'extendedDisplayTitle': None,
-                            'id': None,
-                            'index': None,
-                            'key': None,
-                            'language': None,
-                            'languageCode': None,
-                            'languageTag': None,
-                            'requiredBandwidths': None,
-                            'selected': None,
-                            'streamType': None,
-                            'title': None,
-                            'type': None,
-                            'audioChannelLayout': None,
-                            'bitDepth': None,
-                            'bitrateMode': None,
-                            'channels': None,
-                            'duration': None,
-                            'profile': None,
-                            'samplingRate': None,
-                            'streamIdentifier': None,
-                            'visualImpaired': None
-                        },
-                        'subtitleStreams': {
-                            'canAutoSync': None,
-                            'codec': None,
-                            'default': None,
-                            'displayTitle': None,
-                            'extendedDisplayTitle': None,
-                            'id': None,
-                            'index': None,
-                            'key': None,
-                            'language': None,
-                            'languageCode': None,
-                            'languageTag': None,
-                            'requiredBandwidths': None,
-                            'selected': None,
-                            'streamType': None,
-                            'title': None,
-                            'type': None,
-                            'container': None,
-                            'forced': None,
-                            'format': None,
-                            'headerCompression': None,
-                            'hearingImpaired': None,
-                            'perfectMatch': None,
-                            'providerTitle': None,
-                            'score': None,
-                            'sourceKey': None,
-                            'transient': None,
-                            'userID': None
-                        }
-                    }
-                },
-                'metadataDirectory': None,
-                'originallyAvailableAt': partial(helpers.datetime_to_iso, to_date=True),
-                'parentGuid': None,
-                'parentIndex': None,
-                'parentKey': None,
-                'parentRatingKey': None,
-                'parentThumb': None,
-                'parentTitle': None,
-                'parentYear': None,
-                'producers': {
-                    'id': None,
-                    'tag': None
-                },
-                'rating': None,
-                'ratingKey': None,
-                'roles': {
-                    'id': None,
-                    'tag': None,
-                    'role': None,
-                    'thumb': None
-                },
-                'seasonEpisode': None,
-                'seasonNumber': None,
-                'slug': None,
-                'summary': None,
-                'thumb': None,
-                'thumbBlurHash': None,
-                'thumbFile': lambda o: self.get_image(o, 'thumb'),
-                'thumbProvider': lambda o: self.get_image_provider(o, 'thumb'),
-                'title': None,
-                'titleSort': None,
-                'type': None,
-                'updatedAt': helpers.datetime_to_iso,
-                'userRating': None,
-                'viewCount': None,
-                'viewOffset': None,
-                'writers': {
-                    'id': None,
-                    'tag': None
-                },
-                'year': None
-            }
-            return _episode_attrs
-
-        def artist_attrs():
-            _artist_attrs = {
-                'addedAt': helpers.datetime_to_iso,
-                'albumSort': None,
-                'art': None,
-                'artBlurHash': None,
-                'artFile': lambda o: self.get_image(o, 'art'),
-                'artProvider': lambda o: self.get_image_provider(o, 'art'),
-                'collections': {
-                    'id': None,
-                    'tag': None
-                },
-                'countries': {
-                    'id': None,
-                    'tag': None
-                },
-                'fields': {
-                    'name': None,
-                    'locked': None
-                },
-                'genres': {
-                    'id': None,
-                    'tag': None
-                },
-                'guid': None,
-                'guids': {
-                    'id': None
-                },
-                'index': None,
-                'key': None,
-                'labels': {
-                    'id': None,
-                    'tag': None
-                },
-                'lastRatedAt': helpers.datetime_to_iso,
-                'lastViewedAt': helpers.datetime_to_iso,
-                'librarySectionID': None,
-                'librarySectionKey': None,
-                'librarySectionTitle': None,
-                'locations': None,
-                'metadataDirectory': None,
-                'moods': {
-                    'id': None,
-                    'tag': None
-                },
-                'rating': None,
-                'ratingKey': None,
-                'similar': {
-                    'id': None,
-                    'tag': None
-                },
-                'styles': {
-                    'id': None,
-                    'tag': None
-                },
-                'summary': None,
-                'theme': None,
-                'thumb': None,
-                'thumbBlurHash': None,
-                'thumbFile': lambda o: self.get_image(o, 'thumb'),
-                'thumbProvider': lambda o: self.get_image_provider(o, 'thumb'),
-                'title': None,
-                'titleSort': None,
-                'type': None,
-                'updatedAt': helpers.datetime_to_iso,
-                'userRating': None,
-                'viewCount': None,
-                'albums': lambda e: self.export_obj(e)
-            }
-            return _artist_attrs
-
-        def album_attrs():
-            _album_attrs = {
-                'addedAt': helpers.datetime_to_iso,
-                'art': None,
-                'artBlurHash': None,
-                'artFile': lambda o: self.get_image(o, 'art'),
-                'artProvider': lambda o: self.get_image_provider(o, 'art'),
-                'collections': {
-                    'id': None,
-                    'tag': None
-                },
-                'fields': {
-                    'name': None,
-                    'locked': None
-                },
-                'formats': {
-                    'id': None,
-                    'tag': None
-                },
-                'genres': {
-                    'id': None,
-                    'tag': None
-                },
-                'guid': None,
-                'guids': {
-                    'id': None
-                },
-                'hasSonicAnalysis': None,
-                'index': None,
-                'key': None,
-                'labels': {
-                    'id': None,
-                    'tag': None
-                },
-                'lastRatedAt': helpers.datetime_to_iso,
-                'lastViewedAt': helpers.datetime_to_iso,
-                'leafCount': None,
-                'librarySectionID': None,
-                'librarySectionKey': None,
-                'librarySectionTitle': None,
-                'loudnessAnalysisVersion': None,
-                'metadataDirectory': None,
-                'moods': {
-                    'id': None,
-                    'tag': None
-                },
-                'musicAnalysisVersion': None,
-                'originallyAvailableAt': partial(helpers.datetime_to_iso, to_date=True),
-                'parentGuid': None,
-                'parentKey': None,
-                'parentRatingKey': None,
-                'parentTheme': None,
-                'parentThumb': None,
-                'parentTitle': None,
-                'rating': None,
-                'ratingKey': None,
-                'studio': None,
-                'styles': {
-                    'id': None,
-                    'tag': None
-                },
-                'subformats': {
-                    'id': None,
-                    'tag': None
-                },
-                'summary': None,
-                'thumb': None,
-                'thumbBlurHash': None,
-                'thumbFile': lambda o: self.get_image(o, 'thumb'),
-                'thumbProvider': lambda o: self.get_image_provider(o, 'thumb'),
-                'title': None,
-                'titleSort': None,
-                'type': None,
-                'updatedAt': helpers.datetime_to_iso,
-                'userRating': None,
-                'viewCount': None,
-                'viewedLeafCount': None,
-                'year': None,
-                'tracks': lambda e: self.export_obj(e)
-            }
-            return _album_attrs
-
-        def track_attrs():
-            _track_attrs = {
-                'addedAt': helpers.datetime_to_iso,
-                'art': None,
-                'artBlurHash': None,
-                'chapters': {
-                    'id': None,
-                    'tag': None,
-                    'index': None,
-                    'start': None,
-                    'end': None,
-                    'thumb': None
-                },
-                'chapterSource': None,
-                'collections': {
-                    'id': None,
-                    'tag': None
-                },
-                'duration': None,
-                'durationHuman': lambda o: helpers.human_duration(getattr(o, 'duration', 0)),
-                'fields': {
-                    'name': None,
-                    'locked': None
-                },
-                'genres': {
-                    'id': None,
-                    'tag': None
-                },
-                'grandparentArt': None,
-                'grandparentGuid': None,
-                'grandparentKey': None,
-                'grandparentRatingKey': None,
-                'grandparentTheme': None,
-                'grandparentThumb': None,
-                'grandparentTitle': None,
-                'guid': None,
-                'guids': {
-                    'id': None
-                },
-                'hasSonicAnalysis': None,
-                'index': None,
-                'key': None,
-                'labels': {
-                    'id': None,
-                    'tag': None
-                },
-                'lastRatedAt': helpers.datetime_to_iso,
-                'lastViewedAt': helpers.datetime_to_iso,
-                'librarySectionID': None,
-                'librarySectionKey': None,
-                'librarySectionTitle': None,
-                'locations': None,
-                'media': {
-                    'audioChannels': None,
-                    'audioCodec': None,
-                    'audioProfile': None,
-                    'bitrate': None,
-                    'container': None,
-                    'duration': None,
-                    'id': None,
-                    'title': None,
-                    'parts': {
-                        'accessible': None,
-                        'audioProfile': None,
-                        'container': None,
-                        'deepAnalysisVersion': None,
-                        'duration': None,
-                        'exists': None,
-                        'file': None,
-                        'hasThumbnail': None,
-                        'id': None,
-                        'key': None,
-                        'requiredBandwidths': None,
-                        'size': None,
-                        'sizeHuman': lambda o: helpers.human_file_size(getattr(o, 'size', 0)),
-                        'syncItemId': None,
-                        'syncState': None,
-                        'audioStreams': {
-                            'bitrate': None,
-                            'codec': None,
-                            'default': None,
-                            'displayTitle': None,
-                            'extendedDisplayTitle': None,
-                            'id': None,
-                            'index': None,
-                            'key': None,
-                            'language': None,
-                            'languageCode': None,
-                            'languageTag': None,
-                            'requiredBandwidths': None,
-                            'selected': None,
-                            'streamType': None,
-                            'title': None,
-                            'type': None,
-                            'albumGain': None,
-                            'albumPeak': None,
-                            'albumRange': None,
-                            'audioChannelLayout': None,
-                            'bitDepth': None,
-                            'bitrateMode': None,
-                            'channels': None,
-                            'duration': None,
-                            'endRamp': None,
-                            'gain': None,
-                            'loudness': None,
-                            'lra': None,
-                            'peak': None,
-                            'profile': None,
-                            'samplingRate': None,
-                            'startRamp': None,
-                            'streamIdentifier': None,
-                            'visualImpaired': None
-                        },
-                        'lyricStreams': {
-                            'codec': None,
-                            'default': None,
-                            'displayTitle': None,
-                            'extendedDisplayTitle': None,
-                            'id': None,
-                            'index': None,
-                            'key': None,
-                            'language': None,
-                            'languageCode': None,
-                            'languageTag': None,
-                            'requiredBandwidths': None,
-                            'selected': None,
-                            'streamType': None,
-                            'title': None,
-                            'type': None,
-                            'format': None,
-                            'minLines': None,
-                            'provider': None,
-                            'timed': None
-                        }
-                    }
-                },
-                'metadataDirectory': None,
-                'moods': {
-                    'id': None,
-                    'tag': None
-                },
-                'musicAnalysisVersion': None,
-                'originalTitle': None,
-                'parentGuid': None,
-                'parentIndex': None,
-                'parentKey': None,
-                'parentRatingKey': None,
-                'parentThumb': None,
-                'parentTitle': None,
-                'ratingCount': None,
-                'ratingKey': None,
-                'skipCount': None,
-                'summary': None,
-                'thumb': None,
-                'thumbBlurHash': None,
-                'title': None,
-                'titleSort': None,
-                'trackNumber': None,
-                'type': None,
-                'updatedAt': helpers.datetime_to_iso,
-                'userRating': None,
-                'viewCount': None,
-                'viewOffset': None,
-                'year': None,
-            }
-            return _track_attrs
-
-        def photo_album_attrs():
-            _photo_album_attrs = {
-                'addedAt': helpers.datetime_to_iso,
-                'art': None,
-                'composite': None,
-                'fields': {
-                    'name': None,
-                    'locked': None
-                },
-                'guid': None,
-                'index': None,
-                'key': None,
-                'lastRatedAt': helpers.datetime_to_iso,
-                'librarySectionID': None,
-                'librarySectionKey': None,
-                'librarySectionTitle': None,
-                'metadataDirectory': None,
-                'ratingKey': None,
-                'summary': None,
-                'thumb': None,
-                'title': None,
-                'titleSort': None,
-                'type': lambda e: 'photoalbum' if e == 'photo' else e,
-                'updatedAt': helpers.datetime_to_iso,
-                'userRating': None,
-                'photoalbums': lambda o: [self.export_obj(e) for e in getattr(o, 'albums')()],
-                'photos': lambda e: self.export_obj(e),
-                'clips': lambda e: self.export_obj(e)
-            }
-            return _photo_album_attrs
-
-        def photo_attrs():
-            _photo_attrs = {
-                'addedAt': helpers.datetime_to_iso,
-                'createdAtAccuracy': None,
-                'createdAtTZOffset': None,
-                'fields': {
-                    'name': None,
-                    'locked': None
-                },
-                'guid': None,
-                'index': None,
-                'key': None,
-                'lastRatedAt': helpers.datetime_to_iso,
-                'librarySectionID': None,
-                'librarySectionKey': None,
-                'librarySectionTitle': None,
-                'locations': None,
-                'metadataDirectory': None,
-                'originallyAvailableAt': partial(helpers.datetime_to_iso, to_date=True),
-                'parentGuid': None,
-                'parentIndex': None,
-                'parentKey': None,
-                'parentRatingKey': None,
-                'parentThumb': None,
-                'parentTitle': None,
-                'ratingKey': None,
-                'summary': None,
-                'thumb': None,
-                'title': None,
-                'titleSort': None,
-                'type': None,
-                'updatedAt': helpers.datetime_to_iso,
-                'userRating': None,
-                'year': None,
-                'media': {
-                    'aperture': None,
-                    'aspectRatio': None,
-                    'container': None,
-                    'exposure': None,
-                    'height': None,
-                    'id': None,
-                    'iso': None,
-                    'lens': None,
-                    'make': None,
-                    'model': None,
-                    'width': None,
-                    'parts': {
-                        'accessible': None,
-                        'container': None,
-                        'exists': None,
-                        'file': None,
-                        'id': None,
-                        'key': None,
-                        'size': None,
-                        'sizeHuman': lambda o: helpers.human_file_size(getattr(o, 'size', 0)),
-                    }
-                },
-                'tag': {
-                    'id': None,
-                    'tag': None,
-                    'title': None
-                }
-            }
-            return _photo_attrs
-
-        def collection_attrs():
-            _collection_attrs = {
-                'addedAt': helpers.datetime_to_iso,
-                'art': None,
-                'artBlurHash': None,
-                'artFile': lambda o: self.get_image(o, 'art'),
-                'artProvider': lambda o: self.get_image_provider(o, 'art'),
-                'childCount': None,
-                'collectionFilterBasedOnUser': None,
-                'collectionMode': None,
-                'collectionSort': None,
-                'contentRating': None,
-                'fields': {
-                    'name': None,
-                    'locked': None
-                },
-                'guid': None,
-                'index': None,
-                'key': None,
-                'labels': {
-                    'id': None,
-                    'tag': None
-                },
-                'lastRatedAt': helpers.datetime_to_iso,
-                'librarySectionID': None,
-                'librarySectionKey': None,
-                'librarySectionTitle': None,
-                'maxYear': None,
-                'metadataDirectory': None,
-                'minYear': None,
-                'ratingKey': None,
-                'subtype': None,
-                'summary': None,
-                'theme': None,
-                'thumb': None,
-                'thumbBlurHash': None,
-                'thumbFile': lambda o: self.get_image(o, 'thumb'),
-                'thumbProvider': lambda o: self.get_image_provider(o, 'poster'),
-                'title': None,
-                'titleSort': None,
-                'type': None,
-                'updatedAt': helpers.datetime_to_iso,
-                'userRating': None,
-                'items': lambda e: self.export_obj(e)
-            }
-            return _collection_attrs
-
-        def playlist_attrs():
-            _playlist_attrs = {
-                'addedAt': helpers.datetime_to_iso,
-                'composite': None,
-                'content': None,
-                'duration': None,
-                'durationHuman': lambda o: helpers.human_duration(getattr(o, 'duration', 0)),
-                'guid': None,
-                'icon': None,
-                'key': None,
-                'leafCount': None,
-                'metadataDirectory': None,
-                'playlistType': None,
-                'ratingKey': None,
-                'smart': None,
-                'sourceURI': None,
-                'summary': None,
-                'title': None,
-                'type': None,
-                'updatedAt': helpers.datetime_to_iso,
-                'items': lambda e: self.export_obj(e)
-            }
-            return _playlist_attrs
-
-        _media_types = {
-            'movie': movie_attrs,
-            'show': show_attrs,
-            'season': season_attrs,
-            'episode': episode_attrs,
-            'artist': artist_attrs,
-            'album': album_attrs,
-            'track': track_attrs,
-            'photoalbum': photo_album_attrs,
-            'photo': photo_attrs,
-            'clip': episode_attrs,  # Assume clip is the same as an episode
-            'collection': collection_attrs,
-            'playlist': playlist_attrs,
-        }
-
-        media_attrs = _media_types[media_type]()
-
-        if flatten:
-            media_attrs = helpers.flatten_dict(media_attrs)[0]
-
-        return media_attrs
-
-    def return_levels(self, media_type, reverse_map=False):
-        def movie_levels():
-            _media_type = 'movie'
-            _metadata_levels = {
-                1: [
-                    'ratingKey', 'title', 'titleSort', 'originalTitle', 'editionTitle', 'originallyAvailableAt', 'year', 'addedAt',
-                    'rating', 'ratingImage', 'audienceRating', 'audienceRatingImage', 'userRating', 'contentRating',
-                    'studio', 'tagline', 'summary', 'guid', 'duration', 'durationHuman', 'type',
-                    'hasCreditsMarker'
-                ],
-                2: [
-                    'directors.tag', 'writers.tag', 'producers.tag', 'roles.tag', 'roles.role',
-                    'countries.tag', 'genres.tag', 'collections.tag', 'labels.tag',
-                    'fields.name', 'fields.locked', 'guids.id',
-                    'markers.type', 'markers.start', 'markers.end', 'markers.first', 'markers.final'
-                ],
-                3: [
-                    'art', 'thumb', 'key', 'chapterSource',
-                    'chapters.tag', 'chapters.index', 'chapters.start', 'chapters.end', 'chapters.thumb',
-                    'updatedAt', 'lastViewedAt', 'viewCount', 'lastRatedAt', 'hasPreviewThumbnails', 'hasVoiceActivity'
-                ],
-                9: self._get_all_metadata_attrs(_media_type)
-            }
-            _media_info_levels = {
-                1: [
-                    'locations', 'media.aspectRatio', 'media.audioChannels', 'media.audioCodec', 'media.audioProfile',
-                    'media.bitrate', 'media.container', 'media.duration', 'media.height', 'media.width',
-                    'media.videoCodec', 'media.videoFrameRate', 'media.videoProfile', 'media.videoResolution',
-                    'media.isOptimizedVersion', 'media.hdr'
-                ],
-                2: [
-                    'media.parts.file', 'media.parts.duration',
-                    'media.parts.container', 'media.parts.indexes', 'media.parts.size', 'media.parts.sizeHuman',
-                    'media.parts.audioProfile', 'media.parts.videoProfile',
-                    'media.parts.optimizedForStreaming', 'media.parts.deepAnalysisVersion',
-                    'media.parts.hasPreviewThumbnails'
-                ],
-                3: [
-                    'media.parts.videoStreams.codec', 'media.parts.videoStreams.bitrate',
-                    'media.parts.videoStreams.language', 'media.parts.videoStreams.languageCode',
-                    'media.parts.videoStreams.title', 'media.parts.videoStreams.displayTitle',
-                    'media.parts.videoStreams.extendedDisplayTitle', 'media.parts.videoStreams.hdr',
-                    'media.parts.videoStreams.bitDepth', 'media.parts.videoStreams.colorSpace',
-                    'media.parts.videoStreams.frameRate', 'media.parts.videoStreams.level',
-                    'media.parts.videoStreams.profile', 'media.parts.videoStreams.refFrames',
-                    'media.parts.videoStreams.scanType', 'media.parts.videoStreams.default',
-                    'media.parts.videoStreams.height', 'media.parts.videoStreams.width',
-                    'media.parts.audioStreams.codec', 'media.parts.audioStreams.bitrate',
-                    'media.parts.audioStreams.language', 'media.parts.audioStreams.languageCode',
-                    'media.parts.audioStreams.title', 'media.parts.audioStreams.displayTitle',
-                    'media.parts.audioStreams.extendedDisplayTitle', 'media.parts.audioStreams.bitDepth',
-                    'media.parts.audioStreams.channels', 'media.parts.audioStreams.audioChannelLayout',
-                    'media.parts.audioStreams.profile', 'media.parts.audioStreams.samplingRate',
-                    'media.parts.audioStreams.default',
-                    'media.parts.subtitleStreams.codec', 'media.parts.subtitleStreams.format',
-                    'media.parts.subtitleStreams.language', 'media.parts.subtitleStreams.languageCode',
-                    'media.parts.subtitleStreams.title', 'media.parts.subtitleStreams.displayTitle',
-                    'media.parts.subtitleStreams.extendedDisplayTitle', 'media.parts.subtitleStreams.forced',
-                    'media.parts.subtitleStreams.default', 'media.parts.subtitleStreams.container'
-                ],
-                9: [
-                    'locations', 'media'
-                ]
-            }
-            return _metadata_levels, _media_info_levels
-
-        def show_levels():
-            _media_type = 'show'
-            _metadata_levels = {
-                1: [
-                    'ratingKey', 'title', 'titleSort', 'originallyAvailableAt', 'originalTitle', 'year', 'addedAt',
-                    'rating', 'audienceRating', 'audienceRatingImage', 'userRating', 'contentRating', 'network',
-                    'studio', 'tagline', 'summary', 'guid', 'duration', 'durationHuman', 'type', 'childCount', 'seasonCount',
-                    'seasons'
-                ],
-                2: [
-                    'roles.tag', 'roles.role',
-                    'genres.tag', 'collections.tag', 'labels.tag',
-                    'fields.name', 'fields.locked', 'guids.id'
-                ],
-                3: [
-                    'art', 'thumb', 'theme', 'key',
-                    'updatedAt', 'lastViewedAt', 'viewCount', 'lastRatedAt'
-                ],
-                9: self._get_all_metadata_attrs(_media_type)
-            }
-            _media_info_levels = {}
-            return _metadata_levels, _media_info_levels
-
-        def season_levels():
-            _media_type = 'season'
-            _metadata_levels = {
-                1: [
-                    'ratingKey', 'title', 'titleSort', 'addedAt', 'year',
-                    'userRating',
-                    'summary', 'guid', 'type', 'seasonNumber',
-                    'parentTitle', 'parentRatingKey', 'parentGuid',
-                    'episodes'
-                ],
-                2: [
-                    'collections.tag',
-                    'fields.name', 'fields.locked', 'guids.id'
-                ],
-                3: [
-                    'art', 'thumb', 'key',
-                    'updatedAt', 'lastViewedAt', 'viewCount', 'lastRatedAt',
-                    'parentKey', 'parentTheme', 'parentThumb'
-                ],
-                9: self._get_all_metadata_attrs(_media_type)
-            }
-            _media_info_levels = {}
-            return _metadata_levels, _media_info_levels
-
-        def episode_levels():
-            _media_type = 'episode'
-            _metadata_levels = {
-                1: [
-                    'ratingKey', 'title', 'titleSort', 'originallyAvailableAt', 'year', 'addedAt',
-                    'rating', 'audienceRating', 'audienceRatingImage', 'userRating', 'contentRating',
-                    'summary', 'guid', 'duration', 'durationHuman', 'type', 'episodeNumber', 'seasonEpisode',
-                    'parentTitle', 'parentRatingKey', 'parentGuid', 'parentYear', 'seasonNumber',
-                    'grandparentTitle', 'grandparentRatingKey', 'grandparentGuid',
-                    'hasCommercialMarker', 'hasCreditsMarker', 'hasIntroMarker'
-                ],
-                2: [
-                    'collections.tag', 'directors.tag', 'writers.tag', 'producers.tag', 'roles.tag', 'roles.role',
-                    'fields.name', 'fields.locked', 'guids.id',
-                    'markers.type', 'markers.start', 'markers.end', 'markers.first', 'markers.final'
-                ],
-                3: [
-                    'art', 'thumb', 'key', 'chapterSource',
-                    'chapters.tag', 'chapters.index', 'chapters.start', 'chapters.end', 'chapters.thumb',
-                    'updatedAt', 'lastViewedAt', 'viewCount', 'lastRatedAt', 'hasPreviewThumbnails', 'hasVoiceActivity',
-                    'parentThumb', 'parentKey',
-                    'grandparentArt', 'grandparentThumb', 'grandparentTheme', 'grandparentKey'
-                ],
-                9: self._get_all_metadata_attrs(_media_type)
-            }
-            _media_info_levels = {
-                1: [
-                    'locations', 'media.aspectRatio', 'media.audioChannels', 'media.audioCodec', 'media.audioProfile',
-                    'media.bitrate', 'media.container', 'media.duration', 'media.height', 'media.width',
-                    'media.videoCodec', 'media.videoFrameRate', 'media.videoProfile', 'media.videoResolution',
-                    'media.isOptimizedVersion', 'media.hdr'
-                ],
-                2: [
-                    'media.parts.file', 'media.parts.duration',
-                    'media.parts.container', 'media.parts.indexes', 'media.parts.size', 'media.parts.sizeHuman',
-                    'media.parts.audioProfile', 'media.parts.videoProfile',
-                    'media.parts.optimizedForStreaming', 'media.parts.deepAnalysisVersion',
-                    'media.parts.hasPreviewThumbnails'
-                ],
-                3: [
-                    'media.parts.videoStreams.codec', 'media.parts.videoStreams.bitrate',
-                    'media.parts.videoStreams.language', 'media.parts.videoStreams.languageCode',
-                    'media.parts.videoStreams.title', 'media.parts.videoStreams.displayTitle',
-                    'media.parts.videoStreams.extendedDisplayTitle', 'media.parts.videoStreams.hdr',
-                    'media.parts.videoStreams.bitDepth', 'media.parts.videoStreams.colorSpace',
-                    'media.parts.videoStreams.frameRate', 'media.parts.videoStreams.level',
-                    'media.parts.videoStreams.profile', 'media.parts.videoStreams.refFrames',
-                    'media.parts.videoStreams.scanType', 'media.parts.videoStreams.default',
-                    'media.parts.videoStreams.height', 'media.parts.videoStreams.width',
-                    'media.parts.audioStreams.codec', 'media.parts.audioStreams.bitrate',
-                    'media.parts.audioStreams.language', 'media.parts.audioStreams.languageCode',
-                    'media.parts.audioStreams.title', 'media.parts.audioStreams.displayTitle',
-                    'media.parts.audioStreams.extendedDisplayTitle', 'media.parts.audioStreams.bitDepth',
-                    'media.parts.audioStreams.channels', 'media.parts.audioStreams.audioChannelLayout',
-                    'media.parts.audioStreams.profile', 'media.parts.audioStreams.samplingRate',
-                    'media.parts.audioStreams.default',
-                    'media.parts.subtitleStreams.codec', 'media.parts.subtitleStreams.format',
-                    'media.parts.subtitleStreams.language', 'media.parts.subtitleStreams.languageCode',
-                    'media.parts.subtitleStreams.title', 'media.parts.subtitleStreams.displayTitle',
-                    'media.parts.subtitleStreams.extendedDisplayTitle', 'media.parts.subtitleStreams.forced',
-                    'media.parts.subtitleStreams.default', 'media.parts.subtitleStreams.container'
-                ],
-                9: [
-                    'locations', 'media'
-                ]
-            }
-            return _metadata_levels, _media_info_levels
-
-        def artist_levels():
-            _media_type = 'artist'
-            _metadata_levels = {
-                1: [
-                    'ratingKey', 'title', 'titleSort', 'addedAt',
-                    'rating', 'userRating',
-                    'summary', 'guid', 'type',
-                    'albums'
-                ],
-                2: [
-                    'collections.tag', 'genres.tag', 'countries.tag', 'moods.tag', 'similar.tag', 'styles.tag',
-                    'fields.name', 'fields.locked', 'guids.id'
-                ],
-                3: [
-                    'art', 'thumb', 'key',
-                    'updatedAt', 'lastViewedAt', 'viewCount', 'lastRatedAt'
-                ],
-                9: self._get_all_metadata_attrs(_media_type)
-            }
-            _media_info_levels = {}
-            return _metadata_levels, _media_info_levels
-
-        def album_levels():
-            _media_type = 'album'
-            _metadata_levels = {
-                1: [
-                    'ratingKey', 'title', 'titleSort', 'originallyAvailableAt', 'addedAt',
-                    'rating', 'userRating', 'studio', 'year',
-                    'summary', 'guid', 'type', 'index',
-                    'parentTitle', 'parentRatingKey', 'parentGuid',
-                    'hasSonicAnalysis',
-                    'tracks'
-                ],
-                2: [
-                    'collections.tag', 'formats.tag', 'genres.tag', 'labels.tag',
-                    'moods.tag', 'styles.tag', 'subformats.tag',
-                    'fields.name', 'fields.locked', 'guids.id'
-                ],
-                3: [
-                    'art', 'thumb', 'key',
-                    'updatedAt', 'lastViewedAt', 'viewCount', 'lastRatedAt',
-                    'parentKey', 'parentThumb'
-                ],
-                9: self._get_all_metadata_attrs(_media_type)
-            }
-            _media_info_levels = {}
-            return _metadata_levels, _media_info_levels
-
-        def track_levels():
-            _media_type = 'track'
-            _metadata_levels = {
-                1: [
-                    'ratingKey', 'title', 'titleSort', 'originalTitle', 'year', 'addedAt',
-                    'userRating', 'ratingCount',
-                    'summary', 'guid', 'duration', 'durationHuman', 'type', 'trackNumber',
-                    'parentTitle', 'parentRatingKey', 'parentGuid', 'parentIndex',
-                    'grandparentTitle', 'grandparentRatingKey', 'grandparentGuid',
-                    'hasSonicAnalysis'
-                ],
-                2: [
-                    'collections.tag', 'genres.tag', 'moods.tag',
-                    'fields.name', 'fields.locked', 'guids.id'
-                ],
-                3: [
-                    'art', 'thumb', 'key',
-                    'updatedAt', 'lastViewedAt', 'viewCount', 'lastRatedAt',
-                    'parentThumb', 'parentKey',
-                    'grandparentArt', 'grandparentThumb', 'grandparentKey'
-                ],
-                9: self._get_all_metadata_attrs(_media_type)
-            }
-            _media_info_levels = {
-                1: [
-                    'locations', 'media.audioChannels', 'media.audioCodec',
-                    'media.audioProfile',
-                    'media.bitrate', 'media.container', 'media.duration'
-                ],
-                2: [
-                    'media.parts.file', 'media.parts.duration',
-                    'media.parts.container', 'media.parts.size', 'media.parts.sizeHuman',
-                    'media.parts.audioProfile',
-                    'media.parts.deepAnalysisVersion', 'media.parts.hasThumbnail'
-                ],
-                3: [
-                    'media.parts.audioStreams.codec', 'media.parts.audioStreams.bitrate',
-                    'media.parts.audioStreams.title', 'media.parts.audioStreams.displayTitle',
-                    'media.parts.audioStreams.extendedDisplayTitle',
-                    'media.parts.audioStreams.channels', 'media.parts.audioStreams.audioChannelLayout',
-                    'media.parts.audioStreams.samplingRate',
-                    'media.parts.audioStreams.default',
-                    'media.parts.audioStreams.albumGain', 'media.parts.audioStreams.albumPeak',
-                    'media.parts.audioStreams.albumRange',
-                    'media.parts.audioStreams.loudness', 'media.parts.audioStreams.gain',
-                    'media.parts.audioStreams.lra', 'media.parts.audioStreams.peak',
-                    'media.parts.audioStreams.startRamp', 'media.parts.audioStreams.endRamp',
-                    'media.parts.lyricStreams.codec', 'media.parts.lyricStreams.format',
-                    'media.parts.lyricStreams.title', 'media.parts.lyricStreams.displayTitle',
-                    'media.parts.lyricStreams.extendedDisplayTitle',
-                    'media.parts.lyricStreams.default', 'media.parts.lyricStreams.minLines',
-                    'media.parts.lyricStreams.provider', 'media.parts.lyricStreams.timed',
-                ],
-                9: [
-                    'locations', 'media'
-                ]
-            }
-            return _metadata_levels, _media_info_levels
-
-        def photo_album_levels():
-            _media_type = 'photoalbum'
-            _metadata_levels = {
-                1: [
-                    'ratingKey', 'title', 'titleSort', 'addedAt',
-                    'summary', 'guid', 'type', 'index', 'userRating',
-                    'photoalbums', 'photos', 'clips'
-                ],
-                2: [
-                    'fields.name', 'fields.locked'
-                ],
-                3: [
-                    'art', 'thumb', 'key',
-                    'updatedAt', 'lastRatedAt'
-                ],
-                9: self._get_all_metadata_attrs(_media_type)
-            }
-            _media_info_levels = {}
-            return _metadata_levels, _media_info_levels
-
-        def photo_levels():
-            _media_type = 'photo'
-            _metadata_levels = {
-                1: [
-                    'ratingKey', 'title', 'titleSort', 'year', 'originallyAvailableAt', 'addedAt',
-                    'summary', 'guid', 'type', 'index', 'userRating',
-                    'parentTitle', 'parentRatingKey', 'parentGuid', 'parentIndex',
-                    'createdAtAccuracy', 'createdAtTZOffset'
-                ],
-                2: [
-                    'tag.tag', 'tag.title'
-                ],
-                3: [
-                    'thumb', 'key',
-                    'updatedAt', 'lastRatedAt',
-                    'parentThumb', 'parentKey'
-                ],
-                9: self._get_all_metadata_attrs(_media_type)
-            }
-            _media_info_levels = {
-                1: [
-                    'locations', 'media.aspectRatio', 'media.aperture', 'media.exposure',
-                    'media.container', 'media.height', 'media.width',
-                    'media.iso', 'media.lens', 'media.make', 'media.model'
-                ],
-                2: [
-                    'media.parts.file',
-                    'media.parts.container', 'media.parts.size', 'media.parts.sizeHuman'
-                ],
-                3: [
-                ],
-                9: [
-                    'locations', 'media'
-                ]
-            }
-            return _metadata_levels, _media_info_levels
-
-        def collection_levels():
-            _media_type = 'collection'
-            _metadata_levels = {
-                1: [
-                    'ratingKey', 'title', 'titleSort', 'minYear', 'maxYear', 'addedAt',
-                    'contentRating', 'userRating',
-                    'summary', 'guid', 'type', 'subtype', 'childCount',
-                    'collectionMode', 'collectionSort',
-                    'items'
-                ],
-                2: [
-                    'labels.tag',
-                    'fields.name', 'fields.locked'
-                ],
-                3: [
-                    'art', 'thumb', 'key',
-                    'updatedAt', 'lastRatedAt'
-                ],
-                9: self._get_all_metadata_attrs(_media_type)
-            }
-            _media_info_levels = {}
-            return _metadata_levels, _media_info_levels
-
-        def playlist_levels():
-            _media_type = 'playlist'
-            _metadata_levels = {
-                1: [
-                    'ratingKey', 'title', 'addedAt',
-                    'summary', 'guid', 'type', 'duration', 'durationHuman',
-                    'playlistType', 'smart',
-                    'items'
-                ],
-                2: [
-                ],
-                3: [
-                    'composite', 'key',
-                    'updatedAt'
-                ],
-                9: self._get_all_metadata_attrs(_media_type)
-            }
-            _media_info_levels = {}
-            return _metadata_levels, _media_info_levels
-
-        _media_types = {
-            'movie': movie_levels,
-            'show': show_levels,
-            'season': season_levels,
-            'episode': episode_levels,
-            'artist': artist_levels,
-            'album': album_levels,
-            'track': track_levels,
-            'photoalbum': photo_album_levels,
-            'photo': photo_levels,
-            'clip': episode_levels,  # Assume clip is the same as an episode
-            'collection': collection_levels,
-            'playlist': playlist_levels
-        }
-
-        metadata_levels, media_info_levels = _media_types[media_type]()
-
-        if reverse_map:
-            metadata_levels = {attr: level for level, attrs in reversed(sorted(metadata_levels.items()))
-                               for attr in attrs}
-            media_info_levels = {attr: level for level, attrs in reversed(sorted(media_info_levels.items()))
-                                 for attr in attrs}
-
-        return metadata_levels, media_info_levels
-
-    def return_attrs_level_map(self, media_type, prefix=''):
-        media_attrs = self.return_attrs(media_type, flatten=True)
-        metadata_levels, media_info_levels = self.return_levels(media_type, reverse_map=True)
-
-        child_media_types = [self.PLURAL_MEDIA_TYPES[m] for m in self.CHILD_MEDIA_TYPES[media_type]]
-
-        metadata_levels_map = {}
-        media_info_levels_map = {}
-
-        for attr in media_attrs:
-            # Skip the main child attribute
-            if attr in child_media_types:
-                continue
-
-            metadata_level = metadata_levels.get(
-                attr, max(self.METADATA_LEVELS) if not self.is_media_info_attr(attr) else None)
-            media_info_level = media_info_levels.get(
-                attr, max(self.MEDIA_INFO_LEVELS) if self.is_media_info_attr(attr) else None)
-
-            if metadata_level is not None:
-                metadata_levels_map[prefix + attr] = metadata_level
-            elif media_info_level is not None:
-                media_info_levels_map[prefix + attr] = media_info_level
-
-        return metadata_levels_map, media_info_levels_map
-
-    def export(self):
-        msg = ''
-        if not self.section_id and not self.user_id and not self.rating_key:
-            msg = "Export called but no section_id, user_id, or rating_key provided."
-        elif self.metadata_level not in self.METADATA_LEVELS:
-            msg = "Export called with invalid metadata_level '{}'.".format(self.metadata_level)
-        elif self.media_info_level not in self.MEDIA_INFO_LEVELS:
-            msg = "Export called with invalid media_info_level '{}'.".format(self.media_info_level)
-        elif self.thumb_level not in self.IMAGE_LEVELS:
-            msg = "Export called with invalid thumb_level '{}'.".format(self.thumb_level)
-        elif self.art_level not in self.IMAGE_LEVELS:
-            msg = "Export called with invalid art_level '{}'.".format(self.art_level)
-        elif self.logo_level not in self.IMAGE_LEVELS:
-            msg = "Export called with invalid logo_level '{}'.".format(self.logo_level)
-        elif self.file_format not in self.FILE_FORMATS:
-            msg = "Export called with invalid file_format '{}'.".format(self.file_format)
-        elif self.export_type not in self.EXPORT_TYPES:
-            msg = "Export called with invalid export_type '{}'.".format(self.export_type)
-        elif self.user_id and self.export_type != 'playlist':
-            msg = "Export called with invalid export_type '{}'. " \
-                  "Only export_type 'playlist' is allowed for user export."
-        elif self.individual_files and self.rating_key:
-            msg = "Individual file export is only allowed for library or user export."
-
-        if msg:
-            logger.error("Tautulli Exporter :: %s", msg)
-            return msg
-
-        if self.user_id:
-            user_data = users.Users()
-            user_info = user_data.get_details(user_id=self.user_id)
-            user_tokens = user_data.get_tokens(user_id=self.user_id)
-            plex_token = user_tokens['server_token']
-        else:
-            plex_token = plexpy.CONFIG.PMS_TOKEN
-
-        plex = Plex(token=plex_token)
-
-        if self.rating_key:
-            logger.debug(
-                "Tautulli Exporter :: Export called with rating_key %s, "
-                "metadata_level %d, media_info_level %d, thumb_level %s, art_level %s, logo_level %s, "
-                "file_format %s",
-                self.rating_key, self.metadata_level, self.media_info_level,
-                self.thumb_level, self.art_level, self.logo_level, self.file_format)
-
-            self.obj = plex.get_item(self.rating_key)
-            self.media_type = self._media_type(self.obj)
-
-            if self.media_type != 'playlist':
-                self.section_id = self.obj.librarySectionID
-
-            if self.media_type in ('season', 'episode', 'album', 'track'):
-                self.obj_title = self.obj._defaultSyncTitle()
-            else:
-                self.obj_title = self.obj.title
-
-        elif self.user_id:
-            logger.debug(
-                "Tautulli Exporter :: Export called with user_id %s, "
-                "metadata_level %d, media_info_level %d, thumb_level %s, art_level %s, logo_level %s, "
-                "export_type %s, file_format %s",
-                self.user_id, self.metadata_level, self.media_info_level,
-                self.thumb_level, self.art_level, self.logo_level, self.export_type, self.file_format)
-
-            self.obj = plex.PlexServer
-            self.media_type = self.export_type
-
-            self.obj_title = user_info['username']
-
-        elif self.section_id:
-            logger.debug(
-                "Tautulli Exporter :: Export called with section_id %s, "
-                "metadata_level %d, media_info_level %d, thumb_level %s, art_level %s, logo_level %s, "
-                "export_type %s, file_format %s",
-                self.section_id, self.metadata_level, self.media_info_level,
-                self.thumb_level, self.art_level, self.logo_level, self.export_type, self.file_format)
-
-            self.obj = plex.get_library(self.section_id)
-            if self.export_type == 'all':
-                self.media_type = self.obj.type
-            else:
-                self.media_type = self.export_type
-
-            self.obj_title = self.obj.title
-
-        else:
-            msg = "Export called but no section_id, user_id, or rating_key provided."
-            logger.error("Tautulli Exporter :: %s", msg)
-            return msg
-
-        if self.media_type not in self.MEDIA_TYPES:
-            msg = "Cannot export media type '{}'.".format(self.media_type)
-            logger.error("Tautulli Exporter :: %s", msg)
-            return msg
-
-        if not self.MEDIA_TYPES[self.media_type][0]:
-            self.thumb_level = 0
-        if not self.MEDIA_TYPES[self.media_type][1]:
-            self.art_level = 0
-        if not self.MEDIA_TYPES[self.media_type][2]:
-            self.logo_level = 0
-
-        self._process_custom_fields()
-
-        self.directory = self._filename(directory=True)
-        self.filename = self._filename()
-        self.title = self._filename(extension=False)
-
-        self.export_id = self.add_export()
-        if not self.export_id:
-            msg = "Failed to export '{}'.".format(self.directory)
-            logger.error("Tautulli Exporter :: %s", msg)
-            return msg
-
-        threading.Thread(target=self._real_export).start()
-
-        return self.export_id
-
-    def add_export(self):
-        keys = {
-            'timestamp': self.timestamp,
-            'section_id': self.section_id,
-            'user_id': self.user_id,
-            'rating_key': self.rating_key,
-            'media_type': self.media_type
-        }
-
-        values = {
-            'title': self.title,
-            'file_format': self.file_format,
-            'metadata_level': self.metadata_level,
-            'media_info_level': self.media_info_level,
-            'thumb_level': self.thumb_level,
-            'art_level': self.art_level,
-            'logo_level': self.logo_level,
-            'custom_fields': self.custom_fields,
-            'individual_files': self.individual_files
-        }
-
-        db = database.MonitorDatabase()
-        try:
-            db.upsert(table_name='exports', key_dict=keys, value_dict=values)
-            return db.last_insert_id()
-        except Exception as e:
-            logger.error("Tautulli Exporter :: Unable to save export to database: %s", e)
-            return False
-
-    def set_export_state(self):
-        if self.success:
-            complete = 1
-        else:
-            complete = -1
-
-        keys = {
-            'id': self.export_id
-        }
-        values = {
-            'thumb_level': self.thumb_level,
-            'art_level': self.art_level,
-            'logo_level': self.logo_level,
-            'complete': complete,
-            'file_size': self.file_size
-        }
-
-        db = database.MonitorDatabase()
-        db.upsert(table_name='exports', key_dict=keys, value_dict=values)
-
-    def set_export_progress(self):
-        keys = {
-            'id': self.export_id
-        }
-        values = {
-            'total_items': self.total_items,
-            'exported_items': self.exported_items
-        }
-
-        db = database.MonitorDatabase()
-        db.upsert(table_name='exports', key_dict=keys, value_dict=values)
-
-    def _real_export(self):
-        logger.info("Tautulli Exporter :: Starting export for '%s'...", self.title)
-
-        if self.rating_key:
-            items = [self.obj]
-        elif self.user_id:
-            # Only playlists export allowed for users
-            items = self.obj.playlists()
-        else:
-            if self.export_type != 'all':
-                export_method = self.export_type + 's'
-            else:
-                export_method = self.export_type
-            method = getattr(self.obj, export_method)
-            items = method()
-
-        self.total_items = len(items)
-        logger.info("Tautulli Exporter :: Exporting %d item(s).", self.total_items)
-
-        pool = ThreadPool(processes=plexpy.CONFIG.EXPORT_THREADS)
-        items = [ExportObject(self, item) for item in items]
-
-        try:
-            result = pool.map(self._do_export, items)
-
-            if self.individual_files:
-                for item, item_result in zip(items, result):
-                    self._save_file([item_result], obj=item)
-                    self._exported_images(item.title)
-
-            else:
-                self._save_file(result, obj=self)
-                self._exported_images(self.title)
-
-            self.thumb_level = self.thumb_level or 10 if self.exported_thumb else 0
-            self.art_level = self.art_level or 10 if self.exported_art else 0
-            self.logo_level = self.logo_level or 10 if self.exported_logo else 0
-
-            self.file_size += sum(item.file_size for item in items)
-
-            self.success = True
-
-            dirpath = get_export_dirpath(self.directory)
-            logger.info("Tautulli Exporter :: Successfully exported to '%s'", dirpath)
-
-        except Exception as e:
-            logger.exception("Tautulli Exporter :: Failed to export '%s': %s", self.title, e)
-
-        finally:
-            pool.close()
-            pool.join()
-            self.set_export_state()
-
-    def _do_export(self, item):
-        result = item._export_obj()
-        self.exported_items += 1
-        self.set_export_progress()
-        return result
-
-    def _save_file(self, result, obj=None):
-        filename = obj.filename
-        dirpath = get_export_dirpath(self.directory)
-        filepath = os.path.join(dirpath, filename)
-
-        if not os.path.exists(dirpath):
-            os.makedirs(dirpath)
-
-        if self.file_format == 'csv':
-            csv_data = helpers.flatten_dict(result)
-            csv_headers = sorted(set().union(*csv_data), key=helpers.sort_attrs)
-            # Move ratingKey, title, and titleSort to front of headers
-            for key in ('titleSort', 'title', 'ratingKey'):
-                csv_headers = helpers.move_to_front(csv_headers, key)
-            with open(filepath, 'w', encoding='utf-8', newline='') as outfile:
-                writer = csv.DictWriter(outfile, csv_headers)
-                writer.writeheader()
-                writer.writerows(csv_data)
-
-        elif self.file_format == 'json':
-            json_data = json.dumps(helpers.sort_obj(result), indent=4, ensure_ascii=False)
-            with open(filepath, 'w', encoding='utf-8') as outfile:
-                outfile.write(json_data)
-
-        elif self.file_format == 'xml':
-            xml_data = self.data_to_xml(result, obj)
-            with open(filepath, 'w', encoding='utf-8') as outfile:
-                outfile.write(xml_data)
-
-        elif self.file_format == 'm3u':
-            m3u_data = self.data_to_m3u(result, obj)
-            with open(filepath, 'w', encoding='utf-8') as outfile:
-                outfile.write(m3u_data)
-
-        self.file_size += os.path.getsize(filepath)
-
-    def _exported_images(self, title):
-        dirpath = get_export_dirpath(self.directory)
-
-        for root, dirs, files in os.walk(dirpath):
-            if any(f.endswith('.thumb.jpg') for f in files):
-                self.exported_thumb = True
-            elif any(f.endswith('.art.jpg') for f in files):
-                self.exported_art = True
-            elif any(f.endswith('.logo.jpg') for f in files):
-                self.exported_logo = True
-
-    def _media_type(self, obj):
-        return 'photoalbum' if self.is_photoalbum(obj) else obj.type
-
-    def _filename(self, obj=None, directory=False, extension=True):
-        if obj:
-            media_type = self._media_type(obj)
-            if media_type in ('season', 'episode', 'album', 'track'):
-                title = obj._defaultSyncTitle()
-            else:
-                title = obj.title
-            filename = '{} - {} [{}]'.format(
-                media_type.capitalize(), title, obj.ratingKey)
-
-        elif self.rating_key:
-            filename = '{} - {} [{}]'.format(
-                self.media_type.capitalize(), self.obj_title, self.rating_key)
-
-        elif self.user_id:
-            filename = 'User - {} - {} [{}]'.format(
-                self.obj_title, self.export_type.capitalize(), self.user_id)
-
-        elif self.section_id:
-            filename = 'Library - {} - {} [{}]'.format(
-                self.obj_title, self.export_type.capitalize(), self.section_id)
-
-        else:
-            filename = 'Export - Unknown'
-
-        filename = helpers.clean_filename(filename)
-        if directory:
-            return format_export_directory(filename, self.timestamp)
-        elif extension:
-            return format_export_filename(filename, self.file_format)
-        return filename
-
-    def _process_custom_fields(self):
-        if self.custom_fields:
-            logger.debug("Tautulli Exporter :: Processing custom fields: %s", self.custom_fields)
-
-        for field in self.custom_fields.split(','):
-            field = field.strip()
-            if not field:
-                continue
-
-            media_type, field = self._parse_custom_field(self.media_type, field)
-
-            if media_type in self._custom_fields:
-                self._custom_fields[media_type].add(field)
-            else:
-                self._custom_fields[media_type] = {field}
-
-        for tree in self.TREE_MEDIA_TYPES:
-            for child_media_type, parent_media_type in zip(tree[:-1], tree[1:]):
-                if child_media_type in self._custom_fields:
-                    plural_child_media_type = self.PLURAL_MEDIA_TYPES[child_media_type]
-                    if parent_media_type in self._custom_fields:
-                        self._custom_fields[parent_media_type].add(plural_child_media_type)
-                    else:
-                        self._custom_fields[parent_media_type] = {plural_child_media_type}
-
-    def _parse_custom_field(self, media_type, field):
-        for child_media_type in self.CHILD_MEDIA_TYPES.get(media_type, []):
-            plural_key = self.PLURAL_MEDIA_TYPES[child_media_type]
-            if field.startswith(plural_key + '.'):
-                media_type, field = field.split('.', maxsplit=1)
-                media_type, field = self._parse_custom_field(child_media_type, field)
-
-        return media_type, field
-
-    def _get_all_metadata_attrs(self, media_type):
-        exclude_attrs = ('locations', 'media', 'artFile', 'thumbFile', 'logoFile')
-        all_attrs = self.return_attrs(media_type)
-        return [attr for attr in all_attrs if attr not in exclude_attrs]
-
-    def _get_export_attrs(self, media_type):
-        media_attrs = self.return_attrs(media_type)
-        metadata_level_attrs, media_info_level_attrs = self.return_levels(media_type)
-
-        export_attrs_list = []
-        export_attrs_set = set()
-
-        for level, attrs in metadata_level_attrs.items():
-            if level <= self.metadata_level:
-                export_attrs_set.update(attrs)
-
-        for level, attrs in media_info_level_attrs.items():
-            if level <= self.media_info_level:
-                export_attrs_set.update(attrs)
-
-        if self.thumb_level:
-            if 'thumbFile' in media_attrs and self.MEDIA_TYPES[media_type][0]:
-                export_attrs_set.add('thumbFile')
-        if self.art_level:
-            if 'artFile' in media_attrs and self.MEDIA_TYPES[media_type][1]:
-                export_attrs_set.add('artFile')
-        if self.logo_level:
-            if 'logoFile' in media_attrs and self.MEDIA_TYPES[media_type][2]:
-                export_attrs_set.add('logoFile')
-
-        if media_type in self._custom_fields:
-            export_attrs_set.update(self._custom_fields[media_type])
-
-        for child_media_type in self.CHILD_MEDIA_TYPES.get(media_type):
-            if child_media_type in self._custom_fields:
-                export_attrs_set.add(self.PLURAL_MEDIA_TYPES[child_media_type])
-
-        if media_type != self.media_type:
-            if self.media_type == 'collection' and 'item' in self._custom_fields:
-                export_attrs_set.update(self._custom_fields['item'])
-            elif self.media_type == 'playlist' and 'item' in self._custom_fields:
-                export_attrs_set.update(self._custom_fields['item'])
-
-        if 'media.parts.accessible' in export_attrs_set or 'media.parts.exists' in export_attrs_set or \
-                self.media_info_level == 9:
-            self._reload_check_files = True
-
-        for attr in export_attrs_set:
-            try:
-                value = helpers.get_dict_value_by_path(media_attrs, attr)
-            except (KeyError, TypeError):
-                logger.warn("Tautulli Exporter :: Unknown export attribute '%s', skipping...", attr)
-                continue
-
-            export_attrs_list.append(value)
-
-        return reduce(helpers.dict_merge, export_attrs_list, {})
-
-    @staticmethod
-    def is_media_info_attr(attr):
-        return attr.startswith('media.') or attr == 'locations'
-
-    @staticmethod
-    def is_photoalbum(obj):
-        return obj.type == 'photo' and obj.TAG == 'Directory'
-
-    def data_to_xml(self, data, obj):
-        xml_metadata = {obj.media_type: helpers.sort_obj(data), 'title': obj.title, 'type': obj.media_type}
-        if obj.rating_key:
-            xml_metadata['ratingKey'] = obj.rating_key
-        if obj.user_id:
-            xml_metadata['userID'] = obj.user_id
-        if obj.section_id:
-            xml_metadata['sectionID'] = obj.section_id
-
-        return helpers.dict_to_xml(xml_metadata, root_node='export', indent=4)
-
-    def data_to_m3u(self, data, obj):
-        items = self._get_m3u_items(data)
-
-        m3u_metadata = {'title': obj.title, 'type': obj.media_type}
-        if obj.rating_key:
-            m3u_metadata['ratingKey'] = obj.rating_key
-        if obj.user_id:
-            m3u_metadata['userID'] = obj.user_id
-        if obj.section_id:
-            m3u_metadata['sectionID'] = obj.section_id
-
-        m3u = '#EXTM3U\n'
-        m3u += '# Playlist: {title}\n# {metadata}\n\n'.format(title=obj.title, metadata=json.dumps(m3u_metadata))
-        m3u_item_template = '# {metadata}\n#EXTINF:{duration},{title}\n{location}\n'
-        m3u_items = []
-
-        for item in items:
-            m3u_values = {
-                'duration': item.pop('duration'),
-                'title': item.pop('title'),
-                'location': item.pop('location'),
-                'metadata': json.dumps(item)
-            }
-            m3u_items.append(m3u_item_template.format(**m3u_values))
-
-        m3u = m3u + '\n'.join(m3u_items)
-
-        return m3u
-
-    def _get_m3u_items(self, data):
-        items = []
-
-        for d in data:
-            if d.get('locations', []):
-                if 'grandparentTitle' in d:
-                    full_title = '{} - {}'.format(d.get('originalTitle') or d['grandparentTitle'], d['title'])
-                else:
-                    full_title = d['title']
-                metadata = {
-                    'type': d['type'],
-                    'ratingKey': d['ratingKey'],
-                    'duration': d.get('duration', 5),
-                    'title': full_title,
-                    'location': '\n'.join(d['locations'])  # Add all locations
-                }
-                items.append(metadata)
-
-            for child_media_type in self.CHILD_MEDIA_TYPES[d['type']]:
-                child_locations = self._get_m3u_items(d[self.PLURAL_MEDIA_TYPES[child_media_type]])
-                items.extend(child_locations)
-
-        return items
-
-    def _export_obj(self):
-        pass
-
-    def export_obj(self, obj):
-        media_type = self._media_type(obj)
-        export_attrs = self._get_export_attrs(media_type)
-
-        # Reload ~plexapi.base.PlexPartialObject
-        if hasattr(obj, 'isPartialObject') and obj.isPartialObject():
-            obj = obj.reload(checkFiles=self._reload_check_files)
-
-        return helpers.get_attrs_to_dict(obj, attrs=export_attrs)
-
-    def get_any_hdr(self, item, media_type):
-        root = self.return_attrs(media_type)['media']
-        attrs = helpers.get_dict_value_by_path(root, 'parts.videoStreams.hdr')
-        media = helpers.get_attrs_to_dict(item, attrs)
-        return any(vs.get('hdr') for p in media.get('parts', []) for vs in p.get('videoStreams', []))
-
-    def _get_cached_images(self, item, image):
-        if image == 'art':
-            if not hasattr(item, '_arts'):
-                item._arts = item.arts()
-            return getattr(item, '_arts', [])
-        elif image == 'logo':
-            if not hasattr(item, '_logos'):
-                item._logos = item.logos()
-            return getattr(item, '_logos', [])
-        else:
-            if not hasattr(item, '_posters'):
-                item._posters = item.posters()
-            return getattr(item, '_posters', [])
-        
-    def _get_selected_image(self, item, image):
-        images = self._get_cached_images(item, image)
-        return next((im for im in images if im.selected), None)
-
-    def get_image(self, item, image):
-        media_type = item.type
-        rating_key = item.ratingKey
-
-        export_image = True
-        if self.thumb_level == 1 or self.art_level == 1 or self.logo_level == 1:
-            selected = self._get_selected_image(item, image)
-            export_image = selected and selected.ratingKey.startswith('upload://')
-        elif self.thumb_level == 2 or self.art_level == 2 or self.logo_level == 2:
-            export_image = any(field.locked and field.name == image
-                               for field in item.fields)
-        elif self.thumb_level == 9 or self.art_level == 9 or self.logo_level == 9:
-            export_image = True
-
-        if not export_image and image + 'File' in self._custom_fields.get(media_type, set()):
-            export_image = True
-
-        if not export_image:
-            return
-
-        image_url = None
-        if image == 'thumb':
-            image_url = item.thumbUrl
-        elif image == 'art':
-            image_url = item.artUrl
-        elif image == 'logo':
-            image_url = item.logoUrl
-
-        if not image_url:
-            return
-
-        r = requests.get(image_url, stream=True)
-        if r.status_code != 200:
-            return
-
-        if media_type in ('season', 'episode', 'album', 'track'):
-            item_title = item._defaultSyncTitle()
-        else:
-            item_title = item.title
-
-        dirpath = get_export_dirpath(self.directory, images_directory=self.title)
-        filename = helpers.clean_filename('{} [{}].{}.jpg'.format(item_title, rating_key, image))
-        filepath = os.path.join(dirpath, filename)
-
-        if not os.path.exists(dirpath):
-            os.makedirs(dirpath)
-
-        with open(filepath, 'wb') as outfile:
-            for chunk in r:
-                outfile.write(chunk)
-
-        self.file_size += os.path.getsize(filepath)
-
-        return os.path.join(os.path.basename(dirpath), filename)
-
-    def get_image_provider(self, item, image):
-        selected = self._get_selected_image(item, image)
-        if selected:
-            return 'upload' if selected.ratingKey.startswith('upload://') else selected.provider
-
-
-class ExportObject(Export):
-    def __init__(self, export, obj):
-        super(ExportObject, self).__init__()
-        self.__dict__.update(export.__dict__)
-
-        self.obj = obj
-        self.rating_key = self.obj.ratingKey
-        self.filename = self._filename(obj=self.obj)
-        self.title = self._filename(obj=self.obj, extension=False)
-
-    def _export_obj(self):
-        result = self.export_obj(self.obj)
-        self.obj = None  # Clear the object to prevent memory leak
-        return result
-
-
-def get_export(export_id):
-    db = database.MonitorDatabase()
-    result = db.select_single("SELECT timestamp, title, file_format, thumb_level, art_level, logo_level, "
-                              "individual_files, complete "
-                              "FROM exports WHERE id = ?",
-                              [export_id])
-
-    if result:
-        if result['individual_files']:
-            result['filename'] = None
-            result['exists'] = check_export_exists(result['title'], result['timestamp'])
-        else:
-            result['filename'] = '{}.{}'.format(result['title'], result['file_format'])
-            result['exists'] = check_export_exists(result['title'], result['timestamp'], result['filename'])
-
-    return result
-
-
-def delete_export(export_id):
-    if str(export_id).isdigit():
-        deleted = True
-
-        result = get_export(export_id=export_id)
-        if result and check_export_exists(result['title'], result['timestamp']):  # Only check if folder exists
-            dirpath = get_export_dirpath(result['title'], result['timestamp'])
-            logger.info("Tautulli Exporter :: Deleting export '%s'.", dirpath)
-            try:
-                shutil.rmtree(dirpath, ignore_errors=True)
-            except OSError as e:
-                logger.error("Tautulli Exporter :: Failed to delete export '%s': %s", dirpath, e)
-                deleted = False
-
-        if deleted:
-            logger.info("Tautulli Exporter :: Deleting export_id %s from the database.", export_id)
-            db = database.MonitorDatabase()
-            result = db.action("DELETE FROM exports WHERE id = ?", args=[export_id])
-
-        return deleted
-    else:
-        return False
-
-
-def delete_all_exports():
-    logger.info("Tautulli Exporter :: Deleting all exports from the export directory.")
-
-    export_dir = plexpy.CONFIG.EXPORT_DIR
-    try:
-        shutil.rmtree(export_dir, ignore_errors=True)
-    except OSError as e:
-        logger.error("Tautulli Exporter :: Failed to delete export directory '%s': %s", export_dir, e)
-
-    if not os.path.exists(export_dir):
-        os.makedirs(export_dir)
-
-    database.delete_exports()
-    return True
-
-
-def cancel_exports():
-    db = database.MonitorDatabase()
-    db.action("UPDATE exports SET complete = -1 WHERE complete = 0")
-
-
-def get_export_datatable(section_id=None, user_id=None, rating_key=None, kwargs=None):
-    default_return = {'recordsFiltered': 0,
-                      'recordsTotal': 0,
-                      'draw': 0,
-                      'data': []}
-
-    data_tables = datatables.DataTables()
-
-    custom_where = []
-    if section_id:
-        custom_where.append(['exports.section_id', section_id])
-    if user_id:
-        custom_where.append(['exports.user_id', user_id])
-    if rating_key:
-        custom_where.append(['exports.rating_key', rating_key])
-
-    columns = ["exports.id AS export_id",
-               "exports.timestamp",
-               "exports.section_id",
-               "exports.user_id",
-               "exports.rating_key",
-               "exports.media_type",
-               "CASE WHEN exports.media_type = 'photoalbum' THEN 'Photo Album' ELSE "
-               "UPPER(SUBSTR(exports.media_type, 1, 1)) || SUBSTR(exports.media_type, 2) END "
-               "AS media_type_title",
-               "exports.title",
-               "exports.file_format",
-               "exports.metadata_level",
-               "exports.media_info_level",
-               "exports.thumb_level",
-               "exports.art_level",
-               "exports.logo_level",
-               "exports.custom_fields",
-               "exports.individual_files",
-               "exports.file_size",
-               "exports.complete",
-               "exports.total_items",
-               "exports.exported_items"
-               ]
-    try:
-        query = data_tables.ssp_query(table_name='exports',
-                                      columns=columns,
-                                      custom_where=custom_where,
-                                      group_by=[],
-                                      join_types=[],
-                                      join_tables=[],
-                                      join_evals=[],
-                                      kwargs=kwargs)
-    except Exception as e:
-        logger.warn("Tautulli Exporter :: Unable to execute database query for get_export_datatable: %s.", e)
-        return default_return
-
-    result = query['result']
-
-    rows = []
-    for item in result:
-        if item['individual_files']:
-            filename = None
-            exists = check_export_exists(item['title'], item['timestamp'])
-        else:
-            filename = format_export_filename(item['title'], item['file_format'])
-            exists = check_export_exists(item['title'], item['timestamp'], filename)
-
-        row = {'export_id': item['export_id'],
-               'timestamp': item['timestamp'],
-               'section_id': item['section_id'],
-               'user_id': item['user_id'],
-               'rating_key': item['rating_key'],
-               'media_type': item['media_type'],
-               'media_type_title': item['media_type_title'],
-               'title': item['title'],
-               'filename': filename,
-               'file_format': item['file_format'],
-               'metadata_level': item['metadata_level'],
-               'media_info_level': item['media_info_level'],
-               'thumb_level': item['thumb_level'],
-               'art_level': item['art_level'],
-               'logo_level': item['logo_level'],
-               'custom_fields': item['custom_fields'],
-               'individual_files': item['individual_files'],
-               'file_size': item['file_size'],
-               'complete': item['complete'],
-               'exported_items': item['exported_items'],
-               'total_items': item['total_items'],
-               'exists': exists
-               }
-
-        rows.append(row)
-
-    result = {'recordsFiltered': query['filteredCount'],
-              'recordsTotal': query['totalCount'],
-              'data': rows,
-              'draw': query['draw']
-              }
-
-    return result
-
-
-def format_export_directory(title, timestamp):
-    return '{}.{}'.format(title, helpers.timestamp_to_YMDHMS(timestamp))
-
-
-def format_export_filename(title, file_format):
-    return '{}.{}'.format(title, file_format)
-
-
-def get_export_dirpath(title, timestamp=None, images_directory=None):
-    if timestamp:
-        title = format_export_directory(title, timestamp)
-    dirpath = os.path.join(plexpy.CONFIG.EXPORT_DIR, title)
-    if images_directory:
-        dirpath = os.path.join(dirpath, '{}.images'.format(images_directory))
-    return dirpath
-
-
-def get_export_filepath(title, timestamp, filename):
-    dirpath = get_export_dirpath(title, timestamp)
-    return os.path.join(dirpath, filename)
-
-
-def check_export_exists(title, timestamp, filename=None):
-    if filename:
-        return os.path.isfile(get_export_filepath(title, timestamp, filename))
-    return os.path.isdir(get_export_dirpath(title, timestamp))
-
-
-def get_custom_fields(media_type, sub_media_type=None):
-    custom_fields = {
-        'metadata_fields': [],
-        'media_info_fields': []
-    }
-
-    collection_sub_media_types = {'movie', 'show', 'artist', 'album', 'photoalbum'}
-    playlist_sub_media_types = {'video', 'audio', 'photo'}
-    sub_media_type = {s.strip().lower() for s in sub_media_type.split(',')}
-
-    export = Export()
-
-    if media_type not in export.MEDIA_TYPES:
-        return custom_fields
-    elif media_type == 'collection' and not sub_media_type.issubset(collection_sub_media_types):
-        return custom_fields
-    elif media_type == 'playlist' and not sub_media_type.issubset(playlist_sub_media_types):
-        return custom_fields
-
-    sub_media_types = list(sub_media_type.difference(playlist_sub_media_types))
-    if media_type == 'playlist' and 'video' in sub_media_type:
-        sub_media_types += ['movie', 'episode']
-    elif media_type == 'playlist' and 'audio' in sub_media_type:
-        sub_media_types += ['track']
-    elif media_type == 'playlist' and 'photo' in sub_media_type:
-        sub_media_types += ['photo']
-
-    metadata_levels_map, media_info_levels_map = export.return_attrs_level_map(media_type)
-
-    for sub_media_type in sub_media_types:
-        for child_media_type in export.CHILD_MEDIA_TYPES[media_type]:
-            prefix = ''
-
-            while child_media_type:
-                if child_media_type == 'item':
-                    fields_child_media_type = sub_media_type
-                else:
-                    fields_child_media_type = child_media_type
-
-                prefix = prefix + export.PLURAL_MEDIA_TYPES[child_media_type] + '.'
-
-                child_metadata_levels_map, child_media_info_levels_map = export.return_attrs_level_map(
-                    fields_child_media_type, prefix=prefix)
-
-                metadata_levels_map.update(child_metadata_levels_map)
-                media_info_levels_map.update(child_media_info_levels_map)
-
-                if child_media_type == 'photoalbum':
-                    # Don't recurse photoalbum again
-                    break
-
-                child_media_type = export.CHILD_MEDIA_TYPES.get(fields_child_media_type)
-                if child_media_type:
-                    child_media_type = child_media_type[0]
-
-    custom_fields['metadata_fields'] = [{'field': attr, 'level': level}
-                                        for attr, level in sorted(metadata_levels_map.items()) if level]
-    custom_fields['media_info_fields'] = [{'field': attr, 'level': level}
-                                          for attr, level in sorted(media_info_levels_map.items()) if level]
-
-    return custom_fields
-
-
-def build_export_docs():
-    export = Export()
-
-    section_head = '### <a id="{anchor}">{section}</a>\n\n'
-    section_details = '<details>\n' \
-                      '<summary><strong>{field_type} Fields</strong></summary><br>\n\n' \
-                      '{table}\n' \
-                      '</details>'
-
-    table_head = '| {field_type} Field | Level 0 | Level 1 | Level 2 | Level 3 | Level 9 |\n' \
-                 '| :--- | :---: | :---: | :---: | :---: | :---: |\n'
-    table_row = '| `{attr}` | {level0} | {level1} | {level2} | {level3} | {level9} |'
-
-    def _child_rows(_media_type):
-        child_table_rows = []
-        for child_media_type in export.CHILD_MEDIA_TYPES[_media_type]:
-            child_plural_media_type = export.PLURAL_MEDIA_TYPES[child_media_type]
-            if child_media_type == 'photoalbum':
-                child_section_title = 'Photo Albums'
-            else:
-                child_section_title = child_plural_media_type.capitalize()
-            child_text = u'\u2713<br>Includes [{}](#{}-{}) Level {{}}'.format(
-                child_section_title, media_type, child_media_type)
-            child_row = {
-                'attr': child_plural_media_type,
-                'level0': '',
-                'level1': child_text.format(1),
-                'level2': child_text.format(2),
-                'level3': child_text.format(3),
-                'level9': child_text.format(9),
-            }
-            child_table_rows.append(table_row.format(**child_row))
-        return child_table_rows
-
-    sections = []
-
-    for media_type, (thumb, art, logo) in export.MEDIA_TYPES.items():
-        if media_type == 'photoalbum':
-            section_title = 'Photo Albums'
-        else:
-            section_title = export.PLURAL_MEDIA_TYPES[media_type].capitalize()
-
-        details = []
-        table_child_rows = _child_rows(media_type)
-
-        metadata_levels_map, media_info_levels_map = export.return_attrs_level_map(media_type)
-
-        # Metadata Fields table
-        table_rows = []
-        for attr, level in sorted(metadata_levels_map.items(), key=helpers.sort_attrs):
-            if thumb and attr == 'thumbFile' or art and attr == 'artFile' or logo and attr == 'logoFile':
-                text = 'Refer to [Image Exports](#image-export)'
-                row = {
-                    'attr': attr,
-                    'level0': text,
-                    'level1': '',
-                    'level2': '',
-                    'level3': '',
-                    'level9': ''
-                }
-            else:
-                row = {
-                    'attr': attr,
-                    'level0': u'\u2713' if level <= 0 else '',
-                    'level1': u'\u2713' if level <= 1 else '',
-                    'level2': u'\u2713' if level <= 2 else '',
-                    'level3': u'\u2713' if level <= 3 else '',
-                    'level9': u'\u2713' if level <= 9 else ''
-                }
-            table_rows.append(table_row.format(**row))
-        table_rows += table_child_rows
-        metadata_table = table_head.format(field_type='Metadata') + '\n'.join(table_rows)
-        details.append(section_details.format(field_type='Metadata', table=metadata_table))
-
-        # Media Info Fields table
-        table_rows = []
-        for attr, level in sorted(media_info_levels_map.items(), key=helpers.sort_attrs):
-            row = {
-                'attr': attr,
-                'level0': u'\u2713' if level <= 0 else '',
-                'level1': u'\u2713' if level <= 1 else '',
-                'level2': u'\u2713' if level <= 2 else '',
-                'level3': u'\u2713' if level <= 3 else '',
-                'level9': u'\u2713' if level <= 9 else ''
-            }
-            table_rows.append(table_row.format(**row))
-        table_rows += table_child_rows
-        media_info_table = table_head.format(field_type='Media Info') + '\n'.join(table_rows)
-        details.append(section_details.format(field_type='Media Info', table=media_info_table))
-
-        section = section_head.format(anchor=media_type, section=section_title) + '\n\n'.join(details)
-
-        if media_type == 'collection':
-            section += (
-                '\n\n* <a id="collection-item">**Note:**</a> Collection `items` can be '
-                '[Movies](#movie), '
-                '[Shows](#show), [Seasons](#season), [Episodes](#episode), '
-                '[Artists](#artist), [Albums](#album), or [Tracks](#track) '
-                'depending on the type of collection.'
-            )
-        elif media_type == 'playlist':
-            section += (
-                '\n\n* <a id="playlist-item">**Note:**</a> Playlist `items` can be '
-                '[Movies](#movie), [Episodes](#episode), [Tracks](#track), or [Photos](#photo) '
-                'depending on the type of playlist.'
-            )
-
-        sections.append(section)
-
-    docs = '\n\n\n'.join(sections)
-    return helpers.sanitize(docs)
diff --git a/plexpy/graphs.py b/plexpy/graphs.py
index 771b4eaf..7de362a9 100644
--- a/plexpy/graphs.py
+++ b/plexpy/graphs.py
@@ -1,97 +1,64 @@
-# -*- coding: utf-8 -*-
-
-# This file is part of Tautulli.
+# This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
+
+from plexpy import logger, database, helpers
 
 import datetime
 
-import arrow
-
-import plexpy
-from plexpy import common
-from plexpy import database
-from plexpy import helpers
-from plexpy import logger
-from plexpy import libraries
-from plexpy import session
-
 
 class Graphs(object):
 
     def __init__(self):
         pass
 
-    def get_total_plays_per_day(self, time_range='30', y_axis='plays', user_id=None, grouping=None):
+    def get_total_plays_per_day(self, time_range='30', y_axis='plays'):
         monitor_db = database.MonitorDatabase()
 
-        time_range = helpers.cast_to_int(time_range) or 30
-        timestamp = helpers.timestamp() - time_range * 24 * 60 * 60
-
-        user_cond = self._make_user_cond(user_id)
-
-        if grouping is None:
-            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
-
-        group_by = 'session_history.reference_id' if grouping else 'session_history.id'
+        if not time_range.isdigit():
+            time_range = '30'
 
         try:
             if y_axis == 'plays':
-                query = "SELECT sh.date_played, " \
-                        "SUM(CASE WHEN sh.media_type = 'episode' AND shm.live = 0 THEN 1 ELSE 0 END) AS tv_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'movie' AND shm.live = 0 THEN 1 ELSE 0 END) AS movie_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'track' AND shm.live = 0 THEN 1 ELSE 0 END) AS music_count, " \
-                        "SUM(shm.live) AS live_count " \
-                        "FROM (SELECT *," \
-                        "      date(started, 'unixepoch', 'localtime') AS date_played " \
-                        "    FROM session_history " \
-                        "    WHERE session_history.stopped >= %s %s " \
-                        "    GROUP BY date_played, %s) AS sh " \
-                        "JOIN session_history_metadata AS shm ON shm.id = sh.id " \
-                        "GROUP BY sh.date_played " \
-                        "ORDER BY sh.started" % (timestamp, user_cond, group_by)
+                query = 'SELECT date(started, "unixepoch", "localtime") as date_played, ' \
+                        'SUM(case when media_type = "episode" then 1 else 0 end) as tv_count, ' \
+                        'SUM(case when media_type = "movie" then 1 else 0 end) as movie_count, ' \
+                        'SUM(case when media_type = "track" then 1 else 0 end) as music_count ' \
+                        'FROM session_history ' \
+                        'WHERE datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") ' \
+                        'GROUP BY date_played ' \
+                        'ORDER BY started ASC' % time_range
 
                 result = monitor_db.select(query)
             else:
-                query = "SELECT sh.date_played, " \
-                        "SUM(CASE WHEN sh.media_type = 'episode' AND shm.live = 0 " \
-                        "  THEN sh.d ELSE 0 END) AS tv_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'movie' AND shm.live = 0 " \
-                        "  THEN sh.d ELSE 0 END) AS movie_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'track' AND shm.live = 0 " \
-                        "  THEN sh.d ELSE 0 END) AS music_count, " \
-                        "SUM(CASE WHEN shm.live = 1 " \
-                        "  THEN sh.d ELSE 0 END) AS live_count " \
-                        "FROM (SELECT *," \
-                        "      date(started, 'unixepoch', 'localtime') AS date_played," \
-                        "      SUM(CASE WHEN stopped > 0 THEN (stopped - started) - " \
-                        "        (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) " \
-                        "        AS d " \
-                        "    FROM session_history " \
-                        "    WHERE session_history.stopped >= %s %s" \
-                        "    GROUP BY date_played, %s) AS sh " \
-                        "JOIN session_history_metadata AS shm ON shm.id = sh.id " \
-                        "GROUP BY sh.date_played " \
-                        "ORDER BY sh.started" % (timestamp, user_cond, group_by)
+                query = 'SELECT date(started, "unixepoch", "localtime") as date_played, ' \
+                        'SUM(case when media_type = "episode" and stopped > 0 then (stopped - started) ' \
+                        ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_duration, ' \
+                        'SUM(case when media_type = "movie" and stopped > 0 then (stopped - started) ' \
+                        ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_duration, ' \
+                        'SUM(case when media_type = "track" and stopped > 0 then (stopped - started) ' \
+                        ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_duration ' \
+                        'FROM session_history ' \
+                        'WHERE datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") ' \
+                        'GROUP BY date_played ' \
+                        'ORDER BY started ASC' % time_range
 
                 result = monitor_db.select(query)
-        except Exception as e:
-            logger.warn("Tautulli Graphs :: Unable to execute database query for get_total_plays_per_day: %s." % e)
+        except:
+            logger.warn("Unable to execute database query.")
             return None
 
-        result_by_date_played = {item['date_played']: item for item in result}
-
         # create our date range as some days may not have any data
         # but we still want to display them
         base = datetime.date.today()
@@ -101,23 +68,27 @@ class Graphs(object):
         series_1 = []
         series_2 = []
         series_3 = []
-        series_4 = []
 
         for date_item in sorted(date_list):
             date_string = date_item.strftime('%Y-%m-%d')
             categories.append(date_string)
-
-            result_date = result_by_date_played.get(date_string, {})
-
-            series_1_value = result_date.get('tv_count', 0)
-            series_2_value = result_date.get('movie_count', 0)
-            series_3_value = result_date.get('music_count', 0)
-            series_4_value = result_date.get('live_count', 0)
+            series_1_value = 0
+            series_2_value = 0
+            series_3_value = 0
+            for item in result:
+                if date_string == item[0]:
+                    series_1_value = item[1]
+                    series_2_value = item[2]
+                    series_3_value = item[3]
+                    break
+                else:
+                    series_1_value = 0
+                    series_2_value = 0
+                    series_3_value = 0
 
             series_1.append(series_1_value)
             series_2.append(series_2_value)
             series_3.append(series_3_value)
-            series_4.append(series_4_value)
 
         series_1_output = {'name': 'TV',
                            'data': series_1}
@@ -125,131 +96,88 @@ class Graphs(object):
                            'data': series_2}
         series_3_output = {'name': 'Music',
                            'data': series_3}
-        series_4_output = {'name': 'Live TV',
-                           'data': series_4}
-
-        series_output = []
-        if libraries.has_library_type('show'):
-            series_output.append(series_1_output)
-        if libraries.has_library_type('movie'):
-            series_output.append(series_2_output)
-        if libraries.has_library_type('artist'):
-            series_output.append(series_3_output)
-        if libraries.has_library_type('live'):
-            series_output.append(series_4_output)
-
-        if len(series_output) > 0:
-            series_total = [sum(x) for x in zip(*[x['data'] for x in series_output])]
-            series_total_output = {'name': 'Total',
-                                   'data': series_total}
-            series_output.append(series_total_output)
 
         output = {'categories': categories,
-                  'series': series_output}
+                  'series': [series_1_output, series_2_output, series_3_output]}
         return output
 
-    def get_total_plays_per_dayofweek(self, time_range='30', y_axis='plays', user_id=None, grouping=None):
+    def get_total_plays_per_dayofweek(self, time_range='30', y_axis='plays'):
         monitor_db = database.MonitorDatabase()
 
-        time_range = helpers.cast_to_int(time_range) or 30
-        timestamp = helpers.timestamp() - time_range * 24 * 60 * 60
+        if not time_range.isdigit():
+            time_range = '30'
 
-        user_cond = self._make_user_cond(user_id)
+        if y_axis == 'plays':
+            query = 'SELECT strftime("%w", datetime(started, "unixepoch", "localtime")) as daynumber, ' \
+                    'case cast (strftime("%w", datetime(started, "unixepoch", "localtime")) as integer) ' \
+                    'when 0 then "Sunday" ' \
+                    'when 1 then "Monday" ' \
+                    'when 2 then "Tuesday" ' \
+                    'when 3 then "Wednesday" ' \
+                    'when 4 then "Thursday" ' \
+                    'when 5 then "Friday" ' \
+                    'else "Saturday" end as dayofweek, ' \
+                    'SUM(case when media_type = "episode" then 1 else 0 end) as tv_count, ' \
+                    'SUM(case when media_type = "movie" then 1 else 0 end) as movie_count, ' \
+                    'SUM(case when media_type = "track" then 1 else 0 end) as music_count ' \
+                    'FROM session_history ' \
+                    'WHERE datetime(stopped, "unixepoch", "localtime") >= ' \
+                    'datetime("now", "-' + time_range + ' days", "localtime") ' \
+                    'GROUP BY dayofweek ' \
+                    'ORDER BY daynumber'
 
-        if grouping is None:
-            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
-
-        group_by = 'session_history.reference_id' if grouping else 'session_history.id'
-
-        try:
-            if y_axis == 'plays':
-                query = "SELECT sh.daynumber, " \
-                        "(CASE sh.daynumber " \
-                        "  WHEN 0 THEN 'Sunday' " \
-                        "  WHEN 1 THEN 'Monday' " \
-                        "  WHEN 2 THEN 'Tuesday' " \
-                        "  WHEN 3 THEN 'Wednesday' " \
-                        "  WHEN 4 THEN 'Thursday' " \
-                        "  WHEN 5 THEN 'Friday' " \
-                        "  ELSE 'Saturday' END) AS dayofweek, " \
-                        "SUM(CASE WHEN sh.media_type = 'episode' AND shm.live = 0 THEN 1 ELSE 0 END) AS tv_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'movie' AND shm.live = 0 THEN 1 ELSE 0 END) AS movie_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'track' AND shm.live = 0 THEN 1 ELSE 0 END) AS music_count, " \
-                        "SUM(shm.live) AS live_count " \
-                        "FROM (SELECT *, " \
-                        "      CAST(strftime('%%w', date(started, 'unixepoch', 'localtime')) AS INTEGER) AS daynumber" \
-                        "    FROM session_history " \
-                        "    WHERE session_history.stopped >= %s %s " \
-                        "    GROUP BY daynumber, %s) AS sh " \
-                        "JOIN session_history_metadata AS shm ON shm.id = sh.id " \
-                        "GROUP BY dayofweek " \
-                        "ORDER BY sh.daynumber" % (timestamp, user_cond, group_by)
-
-                result = monitor_db.select(query)
-            else:
-                query = "SELECT sh.daynumber, " \
-                        "(CASE sh.daynumber " \
-                        "  WHEN 0 THEN 'Sunday' " \
-                        "  WHEN 1 THEN 'Monday' " \
-                        "  WHEN 2 THEN 'Tuesday' " \
-                        "  WHEN 3 THEN 'Wednesday' " \
-                        "  WHEN 4 THEN 'Thursday' " \
-                        "  WHEN 5 THEN 'Friday' " \
-                        "  ELSE 'Saturday' END) AS dayofweek, " \
-                        "SUM(CASE WHEN sh.media_type = 'episode' AND shm.live = 0 " \
-                        "  THEN sh.d ELSE 0 END) AS tv_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'movie' AND shm.live = 0 " \
-                        "  THEN sh.d ELSE 0 END) AS movie_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'track' AND shm.live = 0 " \
-                        "  THEN sh.d ELSE 0 END) AS music_count, " \
-                        "SUM(CASE WHEN shm.live = 1 " \
-                        "  THEN sh.d ELSE 0 END) AS live_count " \
-                        "FROM (SELECT *, " \
-                        "      CAST(strftime('%%w', date(started, 'unixepoch', 'localtime')) AS INTEGER) AS daynumber, " \
-                        "      SUM(CASE WHEN stopped > 0 THEN (stopped - started) - " \
-                        "        (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) " \
-                        "        AS d " \
-                        "    FROM session_history " \
-                        "    WHERE session_history.stopped >= %s %s" \
-                        "    GROUP BY daynumber, %s) AS sh " \
-                        "JOIN session_history_metadata AS shm ON shm.id = sh.id " \
-                        "GROUP BY dayofweek " \
-                        "ORDER BY sh.daynumber" % (timestamp, user_cond, group_by)
-
-                result = monitor_db.select(query)
-        except Exception as e:
-            logger.warn("Tautulli Graphs :: Unable to execute database query for get_total_plays_per_dayofweek: %s." % e)
-            return None
-
-        result_by_dayofweek = {item['dayofweek']: item for item in result}
-
-        if plexpy.CONFIG.WEEK_START_MONDAY:
-            days_list = ['Monday', 'Tuesday', 'Wednesday',
-                         'Thursday', 'Friday', 'Saturday', 'Sunday']
+            result = monitor_db.select(query)
         else:
-            days_list = ['Sunday', 'Monday', 'Tuesday', 'Wednesday',
-                         'Thursday', 'Friday', 'Saturday']
+            query = 'SELECT strftime("%w", datetime(started, "unixepoch", "localtime")) as daynumber, ' \
+                    'case cast (strftime("%w", datetime(started, "unixepoch", "localtime")) as integer) ' \
+                    'when 0 then "Sunday" ' \
+                    'when 1 then "Monday" ' \
+                    'when 2 then "Tuesday" ' \
+                    'when 3 then "Wednesday" ' \
+                    'when 4 then "Thursday" ' \
+                    'when 5 then "Friday" ' \
+                    'else "Saturday" end as dayofweek, ' \
+                    'SUM(case when media_type = "episode" and stopped > 0 then (stopped - started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_duration, ' \
+                    'SUM(case when media_type = "movie" and stopped > 0 then (stopped - started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_duration, ' \
+                    'SUM(case when media_type = "track" and stopped > 0 then (stopped - started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_duration ' \
+                    'FROM session_history ' \
+                    'WHERE datetime(stopped, "unixepoch", "localtime") >= ' \
+                    'datetime("now", "-' + time_range + ' days", "localtime") ' \
+                    'GROUP BY dayofweek ' \
+                    'ORDER BY daynumber'
+
+            result = monitor_db.select(query)
+
+        days_list = ['Sunday', 'Monday', 'Tuesday', 'Wednesday',
+                     'Thursday', 'Friday', 'Saturday']
 
         categories = []
         series_1 = []
         series_2 = []
         series_3 = []
-        series_4 = []
 
         for day_item in days_list:
             categories.append(day_item)
-
-            result_day = result_by_dayofweek.get(day_item, {})
-
-            series_1_value = result_day.get('tv_count', 0)
-            series_2_value = result_day.get('movie_count', 0)
-            series_3_value = result_day.get('music_count', 0)
-            series_4_value = result_day.get('live_count', 0)
+            series_1_value = 0
+            series_2_value = 0
+            series_3_value = 0
+            for item in result:
+                if day_item == item[1]:
+                    series_1_value = item[2]
+                    series_2_value = item[3]
+                    series_3_value = item[4]
+                    break
+                else:
+                    series_1_value = 0
+                    series_2_value = 0
+                    series_3_value = 0
 
             series_1.append(series_1_value)
             series_2.append(series_2_value)
             series_3.append(series_3_value)
-            series_4.append(series_4_value)
 
         series_1_output = {'name': 'TV',
                            'data': series_1}
@@ -257,107 +185,74 @@ class Graphs(object):
                            'data': series_2}
         series_3_output = {'name': 'Music',
                            'data': series_3}
-        series_4_output = {'name': 'Live TV',
-                           'data': series_4}
-
-        series_output = []
-        if libraries.has_library_type('show'):
-            series_output.append(series_1_output)
-        if libraries.has_library_type('movie'):
-            series_output.append(series_2_output)
-        if libraries.has_library_type('artist'):
-            series_output.append(series_3_output)
-        if libraries.has_library_type('live'):
-            series_output.append(series_4_output)
 
         output = {'categories': categories,
-                  'series': series_output}
+                  'series': [series_1_output, series_2_output, series_3_output]}
         return output
 
-    def get_total_plays_per_hourofday(self, time_range='30', y_axis='plays', user_id=None, grouping=None):
+    def get_total_plays_per_hourofday(self, time_range='30', y_axis='plays'):
         monitor_db = database.MonitorDatabase()
 
-        time_range = helpers.cast_to_int(time_range) or 30
-        timestamp = helpers.timestamp() - time_range * 24 * 60 * 60
+        if not time_range.isdigit():
+            time_range = '30'
 
-        user_cond = self._make_user_cond(user_id)
+        if y_axis == 'plays':
+            query = 'select strftime("%H", datetime(started, "unixepoch", "localtime")) as hourofday, ' \
+                    'SUM(case when media_type = "episode" then 1 else 0 end) as tv_count, ' \
+                    'SUM(case when media_type = "movie" then 1 else 0 end) as movie_count, ' \
+                    'SUM(case when media_type = "track" then 1 else 0 end) as music_count ' \
+                    'FROM session_history ' \
+                    'WHERE datetime(stopped, "unixepoch", "localtime") >= ' \
+                    'datetime("now", "-' + time_range + ' days", "localtime") ' \
+                    'GROUP BY hourofday ' \
+                    'ORDER BY hourofday'
 
-        if grouping is None:
-            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
+            result = monitor_db.select(query)
+        else:
+            query = 'select strftime("%H", datetime(started, "unixepoch", "localtime")) as hourofday, ' \
+                    'SUM(case when media_type = "episode" and stopped > 0 then (stopped - started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_duration, ' \
+                    'SUM(case when media_type = "movie" and stopped > 0 then (stopped - started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_duration, ' \
+                    'SUM(case when media_type = "track" and stopped > 0 then (stopped - started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_duration ' \
+                    'FROM session_history ' \
+                    'WHERE datetime(stopped, "unixepoch", "localtime") >= ' \
+                    'datetime("now", "-' + time_range + ' days", "localtime") ' \
+                    'GROUP BY hourofday ' \
+                    'ORDER BY hourofday'
 
-        group_by = 'session_history.reference_id' if grouping else 'session_history.id'
+            result = monitor_db.select(query)
 
-        try:
-            if y_axis == 'plays':
-                query = "SELECT sh.hourofday, " \
-                        "SUM(CASE WHEN sh.media_type = 'episode' AND shm.live = 0 THEN 1 ELSE 0 END) AS tv_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'movie' AND shm.live = 0 THEN 1 ELSE 0 END) AS movie_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'track' AND shm.live = 0 THEN 1 ELSE 0 END) AS music_count, " \
-                        "SUM(shm.live) AS live_count " \
-                        "FROM (SELECT *, " \
-                        "      strftime('%%H', datetime(started, 'unixepoch', 'localtime')) AS hourofday" \
-                        "    FROM session_history " \
-                        "    WHERE session_history.stopped >= %s %s " \
-                        "    GROUP BY hourofday, %s) AS sh " \
-                        "JOIN session_history_metadata AS shm ON shm.id = sh.id " \
-                        "GROUP BY sh.hourofday " \
-                        "ORDER BY sh.hourofday" % (timestamp, user_cond, group_by)
-
-                result = monitor_db.select(query)
-            else:
-                query = "SELECT sh.hourofday, " \
-                        "SUM(CASE WHEN sh.media_type = 'episode' AND shm.live = 0 " \
-                        "  THEN sh.d ELSE 0 END) AS tv_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'movie' AND shm.live = 0 " \
-                        "  THEN sh.d ELSE 0 END) AS movie_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'track' AND shm.live = 0 " \
-                        "  THEN sh.d ELSE 0 END) AS music_count, " \
-                        "SUM(CASE WHEN shm.live = 1 " \
-                        "  THEN sh.d ELSE 0 END) AS live_count " \
-                        "FROM (SELECT *, " \
-                        "      strftime('%%H', datetime(started, 'unixepoch', 'localtime')) AS hourofday, " \
-                        "      SUM(CASE WHEN stopped > 0 THEN (stopped - started) - " \
-                        "        (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) " \
-                        "        AS d " \
-                        "    FROM session_history " \
-                        "    WHERE session_history.stopped >= %s %s" \
-                        "    GROUP BY hourofday, %s) AS sh " \
-                        "JOIN session_history_metadata AS shm ON shm.id = sh.id " \
-                        "GROUP BY sh.hourofday " \
-                        "ORDER BY sh.hourofday" % (timestamp, user_cond, group_by)
-
-                result = monitor_db.select(query)
-        except Exception as e:
-            logger.warn("Tautulli Graphs :: Unable to execute database query for get_total_plays_per_hourofday: %s." % e)
-            return None
-
-        result_by_hourofday = {item['hourofday']: item for item in result}
-
-        hours_list = ['00', '01', '02', '03', '04', '05',
-                      '06', '07', '08', '09', '10', '11',
-                      '12', '13', '14', '15', '16', '17',
-                      '18', '19', '20', '21', '22', '23']
+        hours_list = ['00','01','02','03','04','05',
+                      '06','07','08','09','10','11',
+                      '12','13','14','15','16','17',
+                      '18','19','20','21','22','23']
 
         categories = []
         series_1 = []
         series_2 = []
         series_3 = []
-        series_4 = []
 
         for hour_item in hours_list:
             categories.append(hour_item)
-
-            result_hour = result_by_hourofday.get(hour_item, {})
-
-            series_1_value = result_hour.get('tv_count', 0)
-            series_2_value = result_hour.get('movie_count', 0)
-            series_3_value = result_hour.get('music_count', 0)
-            series_4_value = result_hour.get('live_count', 0)
+            series_1_value = 0
+            series_2_value = 0
+            series_3_value = 0
+            for item in result:
+                if hour_item == item[0]:
+                    series_1_value = item[1]
+                    series_2_value = item[2]
+                    series_3_value = item[3]
+                    break
+                else:
+                    series_1_value = 0
+                    series_2_value = 0
+                    series_3_value = 0
 
             series_1.append(series_1_value)
             series_2.append(series_2_value)
             series_3.append(series_3_value)
-            series_4.append(series_4_value)
 
         series_1_output = {'name': 'TV',
                            'data': series_1}
@@ -365,477 +260,275 @@ class Graphs(object):
                            'data': series_2}
         series_3_output = {'name': 'Music',
                            'data': series_3}
-        series_4_output = {'name': 'Live TV',
-                           'data': series_4}
-
-        series_output = []
-        if libraries.has_library_type('show'):
-            series_output.append(series_1_output)
-        if libraries.has_library_type('movie'):
-            series_output.append(series_2_output)
-        if libraries.has_library_type('artist'):
-            series_output.append(series_3_output)
-        if libraries.has_library_type('live'):
-            series_output.append(series_4_output)
 
         output = {'categories': categories,
-                  'series': series_output}
+                  'series': [series_1_output, series_2_output, series_3_output]}
         return output
 
-    def get_total_plays_per_month(self, time_range='12', y_axis='plays', user_id=None, grouping=None):
+    def get_total_plays_per_month(self, y_axis='plays'):
+        import time as time
+
         monitor_db = database.MonitorDatabase()
+        if y_axis == 'plays':
+            query = 'SELECT strftime("%Y-%m", datetime(started, "unixepoch", "localtime")) as datestring, ' \
+                    'SUM(case when media_type = "episode" then 1 else 0 end) as tv_count, ' \
+                    'SUM(case when media_type = "movie" then 1 else 0 end) as movie_count, ' \
+                    'SUM(case when media_type = "track" then 1 else 0 end) as music_count ' \
+                    'FROM session_history ' \
+                    'WHERE datetime(started, "unixepoch", "localtime") >= datetime("now", "-12 months", "localtime") ' \
+                    'GROUP BY strftime("%Y-%m", datetime(started, "unixepoch", "localtime")) ' \
+                    'ORDER BY datestring DESC LIMIT 12'
 
-        time_range = helpers.cast_to_int(time_range) or 12
-        timestamp = arrow.get(helpers.timestamp()).shift(months=-time_range).floor('month').timestamp()
+            result = monitor_db.select(query)
+        else:
+            query = 'SELECT strftime("%Y-%m", datetime(started, "unixepoch", "localtime")) as datestring, ' \
+                    'SUM(case when media_type = "episode" and stopped > 0 then (stopped - started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_duration, ' \
+                    'SUM(case when media_type = "movie" and stopped > 0 then (stopped - started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_duration, ' \
+                    'SUM(case when media_type = "track" and stopped > 0 then (stopped - started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_duration ' \
+                    'FROM session_history ' \
+                    'WHERE datetime(started, "unixepoch", "localtime") >= datetime("now", "-12 months", "localtime") ' \
+                    'GROUP BY strftime("%Y-%m", datetime(started, "unixepoch", "localtime")) ' \
+                    'ORDER BY datestring DESC LIMIT 12'
 
-        user_cond = self._make_user_cond(user_id)
-
-        if grouping is None:
-            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
-
-        group_by = 'session_history.reference_id' if grouping else 'session_history.id'
-
-        try:
-            if y_axis == 'plays':
-                query = "SELECT sh.datestring, " \
-                        "SUM(CASE WHEN sh.media_type = 'episode' AND shm.live = 0 THEN 1 ELSE 0 END) AS tv_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'movie' AND shm.live = 0 THEN 1 ELSE 0 END) AS movie_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'track' AND shm.live = 0 THEN 1 ELSE 0 END) AS music_count, " \
-                        "SUM(shm.live) AS live_count " \
-                        "FROM (SELECT *, " \
-                        "      strftime('%%Y-%%m', datetime(started, 'unixepoch', 'localtime')) AS datestring" \
-                        "    FROM session_history " \
-                        "    WHERE session_history.stopped >= %s %s " \
-                        "    GROUP BY datestring, %s) AS sh " \
-                        "JOIN session_history_metadata AS shm ON shm.id = sh.id " \
-                        "GROUP BY sh.datestring " \
-                        "ORDER BY sh.datestring" % (timestamp, user_cond, group_by)
-
-                result = monitor_db.select(query)
-            else:
-                query = "SELECT sh.datestring, " \
-                        "SUM(CASE WHEN sh.media_type = 'episode' AND shm.live = 0 " \
-                        "  THEN sh.d ELSE 0 END) AS tv_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'movie' AND shm.live = 0 " \
-                        "  THEN sh.d ELSE 0 END) AS movie_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'track' AND shm.live = 0 " \
-                        "  THEN sh.d ELSE 0 END) AS music_count, " \
-                        "SUM(CASE WHEN shm.live = 1 " \
-                        "  THEN sh.d ELSE 0 END) AS live_count " \
-                        "FROM (SELECT *, " \
-                        "      strftime('%%Y-%%m', datetime(started, 'unixepoch', 'localtime')) AS datestring, " \
-                        "      SUM(CASE WHEN stopped > 0 THEN (stopped - started) - " \
-                        "        (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) " \
-                        "        AS d " \
-                        "    FROM session_history " \
-                        "    WHERE session_history.stopped >= %s %s" \
-                        "    GROUP BY datestring, %s) AS sh " \
-                        "JOIN session_history_metadata AS shm ON shm.id = sh.id " \
-                        "GROUP BY sh.datestring " \
-                        "ORDER BY sh.datestring" % (timestamp, user_cond, group_by)
-
-                result = monitor_db.select(query)
-        except Exception as e:
-            logger.warn("Tautulli Graphs :: Unable to execute database query for get_total_plays_per_month: %s." % e)
-            return None
-
-        result_by_datestring = {item['datestring']: item for item in result}
+            result = monitor_db.select(query)
 
         # create our date range as some months may not have any data
         # but we still want to display them
-        dt_today = datetime.date.today()
-        dt = dt_today
-        month_range = [dt]
-        for n in range(int(time_range)-1):
-            if not ((dt_today.month-n) % 12)-1:
-                dt = datetime.date(dt.year-1, 12, 1)
-            else:
-                dt = datetime.date(dt.year, dt.month-1, 1)
-            month_range.append(dt)
+        x = 12
+        base = time.localtime()
+        month_range = [time.localtime(
+            time.mktime((base.tm_year, base.tm_mon - n, 1, 0, 0, 0, 0, 0, 0))) for n in range(x)]
 
         categories = []
         series_1 = []
         series_2 = []
         series_3 = []
-        series_4 = []
 
-        for dt in sorted(month_range):
+        for month_item in sorted(month_range):
+            dt = datetime.datetime(*month_item[:6])
             date_string = dt.strftime('%Y-%m')
+
             categories.append(dt.strftime('%b %Y'))
-
-            result_date = result_by_datestring.get(date_string, {})
-
-            series_1_value = result_date.get('tv_count', 0)
-            series_2_value = result_date.get('movie_count', 0)
-            series_3_value = result_date.get('music_count', 0)
-            series_4_value = result_date.get('live_count', 0)
-
-            series_1.append(series_1_value)
-            series_2.append(series_2_value)
-            series_3.append(series_3_value)
-            series_4.append(series_4_value)
-
-        series_1_output = {'name': 'TV',
-                           'data': series_1}
-        series_2_output = {'name': 'Movies',
-                           'data': series_2}
-        series_3_output = {'name': 'Music',
-                           'data': series_3}
-        series_4_output = {'name': 'Live TV',
-                           'data': series_4}
-
-        series_output = []
-        if libraries.has_library_type('show'):
-            series_output.append(series_1_output)
-        if libraries.has_library_type('movie'):
-            series_output.append(series_2_output)
-        if libraries.has_library_type('artist'):
-            series_output.append(series_3_output)
-        if libraries.has_library_type('live'):
-            series_output.append(series_4_output)
-
-        output = {'categories': categories,
-                  'series': series_output}
-        return output
-
-    def get_total_plays_by_top_10_platforms(self, time_range='30', y_axis='plays', user_id=None, grouping=None):
-        monitor_db = database.MonitorDatabase()
-
-        time_range = helpers.cast_to_int(time_range) or 30
-        timestamp = helpers.timestamp() - time_range * 24 * 60 * 60
-
-        user_cond = self._make_user_cond(user_id)
-
-        if grouping is None:
-            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
-
-        group_by = 'session_history.reference_id' if grouping else 'session_history.id'
-
-        try:
-            if y_axis == 'plays':
-                query = "SELECT sh.platform, " \
-                        "SUM(CASE WHEN sh.media_type = 'episode' AND shm.live = 0 THEN 1 ELSE 0 END) AS tv_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'movie' AND shm.live = 0 THEN 1 ELSE 0 END) AS movie_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'track' AND shm.live = 0 THEN 1 ELSE 0 END) AS music_count, " \
-                        "SUM(shm.live) AS live_count, " \
-                        "COUNT(sh.id) AS total_count " \
-                        "FROM (SELECT * " \
-                        "    FROM session_history " \
-                        "    WHERE session_history.stopped >= %s %s " \
-                        "    GROUP BY %s) AS sh " \
-                        "JOIN session_history_metadata AS shm ON shm.id = sh.id " \
-                        "GROUP BY sh.platform " \
-                        "ORDER BY total_count DESC, sh.platform ASC " \
-                        "LIMIT 10" % (timestamp, user_cond, group_by)
-
-                result = monitor_db.select(query)
-            else:
-                query = "SELECT sh.platform, " \
-                        "SUM(CASE WHEN sh.media_type = 'episode' AND shm.live = 0 " \
-                        "  THEN sh.d ELSE 0 END) AS tv_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'movie' AND shm.live = 0 " \
-                        "  THEN sh.d ELSE 0 END) AS movie_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'track' AND shm.live = 0 " \
-                        "  THEN sh.d ELSE 0 END) AS music_count, " \
-                        "SUM(CASE WHEN shm.live = 1 " \
-                        "  THEN sh.d ELSE 0 END) AS live_count, " \
-                        "SUM(sh.d) AS total_duration " \
-                        "FROM (SELECT *, " \
-                        "      SUM(CASE WHEN stopped > 0 THEN (stopped - started) - " \
-                        "        (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) " \
-                        "        AS d " \
-                        "    FROM session_history " \
-                        "    WHERE session_history.stopped >= %s %s" \
-                        "    GROUP BY %s) AS sh " \
-                        "JOIN session_history_metadata AS shm ON shm.id = sh.id " \
-                        "GROUP BY sh.platform " \
-                        "ORDER BY total_duration DESC " \
-                        "LIMIT 10" % (timestamp, user_cond, group_by)
-
-                result = monitor_db.select(query)
-        except Exception as e:
-            logger.warn("Tautulli Graphs :: Unable to execute database query for get_total_plays_by_top_10_platforms: %s." % e)
-            return None
-
-        categories = []
-        series_1 = []
-        series_2 = []
-        series_3 = []
-        series_4 = []
-
-        for item in result:
-            categories.append(common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform']))
-
-            series_1.append(item['tv_count'])
-            series_2.append(item['movie_count'])
-            series_3.append(item['music_count'])
-            series_4.append(item['live_count'])
-
-        series_1_output = {'name': 'TV',
-                           'data': series_1}
-        series_2_output = {'name': 'Movies',
-                           'data': series_2}
-        series_3_output = {'name': 'Music',
-                           'data': series_3}
-        series_4_output = {'name': 'Live TV',
-                           'data': series_4}
-
-        series_output = []
-        if libraries.has_library_type('show'):
-            series_output.append(series_1_output)
-        if libraries.has_library_type('movie'):
-            series_output.append(series_2_output)
-        if libraries.has_library_type('artist'):
-            series_output.append(series_3_output)
-        if libraries.has_library_type('live'):
-            series_output.append(series_4_output)
-
-        output = {'categories': categories,
-                  'series': series_output}
-        return output
-
-    def get_total_plays_by_top_10_users(self, time_range='30', y_axis='plays', user_id=None, grouping=None):
-        monitor_db = database.MonitorDatabase()
-
-        time_range = helpers.cast_to_int(time_range) or 30
-        timestamp = helpers.timestamp() - time_range * 24 * 60 * 60
-
-        user_cond = self._make_user_cond(user_id)
-
-        if grouping is None:
-            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
-
-        group_by = 'session_history.reference_id' if grouping else 'session_history.id'
-
-        try:
-            if y_axis == 'plays':
-                query = "SELECT u.user_id, u.username, " \
-                        "(CASE WHEN u.friendly_name IS NULL OR TRIM(u.friendly_name) = '' " \
-                        "  THEN u.username ELSE u.friendly_name END) AS friendly_name," \
-                        "SUM(CASE WHEN sh.media_type = 'episode' AND shm.live = 0 THEN 1 ELSE 0 END) AS tv_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'movie' AND shm.live = 0 THEN 1 ELSE 0 END) AS movie_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'track' AND shm.live = 0 THEN 1 ELSE 0 END) AS music_count, " \
-                        "SUM(shm.live) AS live_count, " \
-                        "COUNT(sh.id) AS total_count " \
-                        "FROM (SELECT * " \
-                        "    FROM session_history " \
-                        "    WHERE session_history.stopped >= %s %s " \
-                        "    GROUP BY %s) AS sh " \
-                        "JOIN session_history_metadata AS shm ON shm.id = sh.id " \
-                        "JOIN users AS u ON u.user_id = sh.user_id " \
-                        "GROUP BY sh.user_id " \
-                        "ORDER BY total_count DESC " \
-                        "LIMIT 10" % (timestamp, user_cond, group_by)
-
-                result = monitor_db.select(query)
-            else:
-                query = "SELECT u.user_id, u.username, " \
-                        "(CASE WHEN u.friendly_name IS NULL OR TRIM(u.friendly_name) = '' " \
-                        " THEN u.username ELSE u.friendly_name END) AS friendly_name," \
-                        "SUM(CASE WHEN sh.media_type = 'episode' AND shm.live = 0 " \
-                        "  THEN sh.d ELSE 0 END) AS tv_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'movie' AND shm.live = 0 " \
-                        "  THEN sh.d ELSE 0 END) AS movie_count, " \
-                        "SUM(CASE WHEN sh.media_type = 'track' AND shm.live = 0 " \
-                        "  THEN sh.d ELSE 0 END) AS music_count, " \
-                        "SUM(CASE WHEN shm.live = 1 " \
-                        "  THEN sh.d ELSE 0 END) AS live_count, " \
-                        "SUM(sh.d) AS total_duration " \
-                        "FROM (SELECT *, " \
-                        "      SUM(CASE WHEN stopped > 0 THEN (stopped - started) - " \
-                        "         (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) " \
-                        "         AS d " \
-                        "    FROM session_history " \
-                        "    WHERE session_history.stopped >= %s %s" \
-                        "    GROUP BY %s) AS sh " \
-                        "JOIN session_history_metadata AS shm ON shm.id = sh.id " \
-                        "JOIN users AS u ON u.user_id = sh.user_id " \
-                        "GROUP BY sh.user_id " \
-                        "ORDER BY total_duration DESC " \
-                        "LIMIT 10" % (timestamp, user_cond, group_by)
-
-                result = monitor_db.select(query)
-        except Exception as e:
-            logger.warn("Tautulli Graphs :: Unable to execute database query for get_total_plays_by_top_10_users: %s." % e)
-            return None
-
-        categories = []
-        series_1 = []
-        series_2 = []
-        series_3 = []
-        series_4 = []
-
-        session_user_id = session.get_session_user_id()
-
-        for item in result:
-            if session_user_id:
-                categories.append(item['username'] if str(item['user_id']) == session_user_id else 'Plex User')
-            else:
-                categories.append(item['friendly_name'])
-
-            series_1.append(item['tv_count'])
-            series_2.append(item['movie_count'])
-            series_3.append(item['music_count'])
-            series_4.append(item['live_count'])
-
-        series_1_output = {'name': 'TV',
-                           'data': series_1}
-        series_2_output = {'name': 'Movies',
-                           'data': series_2}
-        series_3_output = {'name': 'Music',
-                           'data': series_3}
-        series_4_output = {'name': 'Live TV',
-                           'data': series_4}
-
-        series_output = []
-        if libraries.has_library_type('show'):
-            series_output.append(series_1_output)
-        if libraries.has_library_type('movie'):
-            series_output.append(series_2_output)
-        if libraries.has_library_type('artist'):
-            series_output.append(series_3_output)
-        if libraries.has_library_type('live'):
-            series_output.append(series_4_output)
-
-        output = {'categories': categories,
-                  'series': series_output}
-        return output
-
-    def get_total_plays_per_stream_type(self, time_range='30', y_axis='plays', user_id=None, grouping=None):
-        monitor_db = database.MonitorDatabase()
-
-        time_range = helpers.cast_to_int(time_range) or 30
-        timestamp = helpers.timestamp() - time_range * 24 * 60 * 60
-
-        user_cond = self._make_user_cond(user_id)
-
-        if grouping is None:
-            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
-
-        group_by = 'session_history.reference_id' if grouping else 'session_history.id'
-
-        try:
-            if y_axis == 'plays':
-                query = "SELECT sh.date_played, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'direct play' THEN 1 ELSE 0 END) AS dp_count, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'copy' THEN 1 ELSE 0 END) AS ds_count, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'transcode' THEN 1 ELSE 0 END) AS tc_count " \
-                        "FROM (SELECT *, " \
-                        "      date(started, 'unixepoch', 'localtime') AS date_played " \
-                        "    FROM session_history " \
-                        "    WHERE session_history.stopped >= %s %s " \
-                        "    GROUP BY date_played, %s) AS sh " \
-                        "JOIN session_history_media_info AS shmi ON shmi.id = sh.id " \
-                        "GROUP BY sh.date_played " \
-                        "ORDER BY sh.started" % (timestamp, user_cond, group_by)
-
-                result = monitor_db.select(query)
-            else:
-                query = "SELECT sh.date_played, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'direct play' THEN sh.d ELSE 0 END) AS dp_count, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'copy' THEN sh.d ELSE 0 END) AS ds_count, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'transcode' THEN sh.d ELSE 0 END) AS tc_count " \
-                        "FROM (SELECT *, " \
-                        "      date(started, 'unixepoch', 'localtime') AS date_played," \
-                        "      SUM(CASE WHEN stopped > 0 THEN (stopped - started) - " \
-                        "        (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) " \
-                        "        AS d " \
-                        "    FROM session_history " \
-                        "    WHERE session_history.stopped >= %s %s" \
-                        "    GROUP BY date_played, %s) AS sh " \
-                        "JOIN session_history_media_info AS shmi ON shmi.id = sh.id " \
-                        "GROUP BY sh.date_played " \
-                        "ORDER BY sh.started" % (timestamp, user_cond, group_by)
-
-                result = monitor_db.select(query)
-        except Exception as e:
-            logger.warn("Tautulli Graphs :: Unable to execute database query for get_total_plays_per_stream_type: %s." % e)
-            return None
-
-        result_by_date_played = {item['date_played']: item for item in result}
-
-        # create our date range as some days may not have any data
-        # but we still want to display them
-        base = datetime.date.today()
-        date_list = [base - datetime.timedelta(days=x) for x in range(0, int(time_range))]
-
-        categories = []
-        series_1 = []
-        series_2 = []
-        series_3 = []
-
-        for date_item in sorted(date_list):
-            date_string = date_item.strftime('%Y-%m-%d')
-            categories.append(date_string)
-
-            result_date = result_by_date_played.get(date_string, {})
-
-            series_1_value = result_date.get('dp_count', 0)
-            series_2_value = result_date.get('ds_count', 0)
-            series_3_value = result_date.get('tc_count', 0)
+            series_1_value = 0
+            series_2_value = 0
+            series_3_value = 0
+            for item in result:
+                if date_string == item[0]:
+                    series_1_value = item[1]
+                    series_2_value = item[2]
+                    series_3_value = item[3]
+                    break
+                else:
+                    series_1_value = 0
+                    series_2_value = 0
+                    series_3_value = 0
 
             series_1.append(series_1_value)
             series_2.append(series_2_value)
             series_3.append(series_3_value)
 
-        series_1_output = {'name': 'Direct Play',
+        series_1_output = {'name': 'TV',
                            'data': series_1}
-        series_2_output = {'name': 'Direct Stream',
+        series_2_output = {'name': 'Movies',
                            'data': series_2}
-        series_3_output = {'name': 'Transcode',
+        series_3_output = {'name': 'Music',
                            'data': series_3}
 
         output = {'categories': categories,
                   'series': [series_1_output, series_2_output, series_3_output]}
         return output
 
-    def get_total_concurrent_streams_per_stream_type(self, time_range='30', user_id=None):
+    def get_total_plays_by_top_10_platforms(self, time_range='30', y_axis='plays'):
         monitor_db = database.MonitorDatabase()
 
-        time_range = helpers.cast_to_int(time_range) or 30
-        timestamp = helpers.timestamp() - time_range * 24 * 60 * 60
+        if not time_range.isdigit():
+            time_range = '30'
 
-        user_cond = self._make_user_cond(user_id, 'WHERE')
-        
-        def calc_most_concurrent(result):
-            times = []
-            for item in result:
-                times.append({'time': str(item['started']) + 'B', 'count': 1})
-                times.append({'time': str(item['stopped']) + 'A', 'count': -1})
-            times = sorted(times, key=lambda k: k['time'])
-
-            count = 0
-            final_count = 0
-            last_count = 0
-
-            for d in times:
-                if d['count'] == 1:
-                    count += d['count']
-                else:
-                    if count >= last_count:
-                        last_count = count
-                        final_count = count
-                    count += d['count']
-
-            return final_count
-
-        try:
-            query = "SELECT sh.date_played, sh.started, sh.stopped, shmi.transcode_decision " \
-                    "FROM (SELECT *, " \
-                        "date(started, 'unixepoch', 'localtime') AS date_played " \
-                        "FROM session_history %s " \
-                        "GROUP BY id) AS sh " \
-                    "JOIN session_history_media_info AS shmi ON sh.id = shmi.id " \
-                    "WHERE sh.stopped >= %s " \
-                    "ORDER BY sh.started" % (user_cond, timestamp)
+        if y_axis == 'plays':
+            query = 'SELECT platform, ' \
+                    'SUM(case when media_type = "episode" then 1 else 0 end) as tv_count, ' \
+                    'SUM(case when media_type = "movie" then 1 else 0 end) as movie_count, ' \
+                    'SUM(case when media_type = "track" then 1 else 0 end) as music_count, ' \
+                    'COUNT(id) as total_count ' \
+                    'FROM session_history ' \
+                    'WHERE (datetime(stopped, "unixepoch", "localtime") >= ' \
+                    'datetime("now", "-' + time_range + ' days", "localtime")) ' \
+                    'GROUP BY platform ' \
+                    'ORDER BY total_count DESC ' \
+                    'LIMIT 10'
 
             result = monitor_db.select(query)
-        except Exception as e:
-            logger.warn("Tautulli Graphs :: Unable to execute database query for get_total_plays_per_stream_type: %s." % e)
-            return None
+        else:
+            query = 'SELECT platform, ' \
+                    'SUM(case when media_type = "episode" and stopped > 0 then (stopped - started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_duration, ' \
+                    'SUM(case when media_type = "movie" and stopped > 0 then (stopped - started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_duration, ' \
+                    'SUM(case when media_type = "track" and stopped > 0 then (stopped - started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_duration, ' \
+                    'SUM(case when stopped > 0 then (stopped - started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as total_duration ' \
+                    'FROM session_history ' \
+                    'WHERE (datetime(stopped, "unixepoch", "localtime") >= ' \
+                    'datetime("now", "-' + time_range + ' days", "localtime")) ' \
+                    'GROUP BY platform ' \
+                    'ORDER BY total_duration DESC ' \
+                    'LIMIT 10'
 
-        result_by_date_and_decision = helpers.group_by_keys(result, ('date_played', 'transcode_decision'))
-        result_by_date = helpers.group_by_keys(result, 'date_played')
+            result = monitor_db.select(query)
+
+        categories = []
+        series_1 = []
+        series_2 = []
+        series_3 = []
+
+        for item in result:
+            categories.append(item[0])
+            series_1.append(item[1])
+            series_2.append(item[2])
+            series_3.append(item[3])
+
+        # Rename Mystery platform names
+        platform_names = [('Mystery 3', 'Playstation 3'),
+                          ('Mystery 4', 'Playstation 4'),
+                          ('Mystery 5', 'Xbox 360')]
+        for old_name, new_name in platform_names:
+            categories = [item.replace(old_name, new_name) for item in categories]
+
+        series_1_output = {'name': 'TV',
+                           'data': series_1}
+        series_2_output = {'name': 'Movies',
+                           'data': series_2}
+        series_3_output = {'name': 'Music',
+                           'data': series_3}
+
+        output = {'categories': categories,
+                  'series': [series_1_output, series_2_output, series_3_output]}
+        return output
+
+    def get_total_plays_by_top_10_users(self, time_range='30', y_axis='plays'):
+        monitor_db = database.MonitorDatabase()
+
+        if not time_range.isdigit():
+            time_range = '30'
+
+        if y_axis == 'plays':
+            query = 'SELECT ' \
+                    '(case when users.friendly_name is null then session_history.user else ' \
+                    'users.friendly_name end) as friendly_name,' \
+                    'SUM(case when media_type = "episode" then 1 else 0 end) as tv_count, ' \
+                    'SUM(case when media_type = "movie" then 1 else 0 end) as movie_count, ' \
+                    'SUM(case when media_type = "track" then 1 else 0 end) as music_count, ' \
+                    'COUNT(session_history.id) as total_count ' \
+                    'FROM session_history ' \
+                    'JOIN users on session_history.user_id = users.user_id ' \
+                    'WHERE (datetime(session_history.stopped, "unixepoch", "localtime") >= ' \
+                    'datetime("now", "-' + time_range + ' days", "localtime")) ' \
+                    'GROUP BY session_history.user_id ' \
+                    'ORDER BY total_count DESC ' \
+                    'LIMIT 10'
+
+            result = monitor_db.select(query)
+        else:
+            query = 'SELECT ' \
+                    '(case when users.friendly_name is null then session_history.user else ' \
+                    'users.friendly_name end) as friendly_name,' \
+                    'SUM(case when media_type = "episode" and stopped > 0 then (stopped - started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_duration, ' \
+                    'SUM(case when media_type = "movie" and stopped > 0 then (stopped - started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_duration, ' \
+                    'SUM(case when media_type = "track" and stopped > 0 then (stopped - started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_duration, ' \
+                    'SUM(case when stopped > 0 then (stopped - started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as total_duration ' \
+                    'FROM session_history ' \
+                    'JOIN users on session_history.user_id = users.user_id ' \
+                    'WHERE (datetime(session_history.stopped, "unixepoch", "localtime") >= ' \
+                    'datetime("now", "-' + time_range + ' days", "localtime")) ' \
+                    'GROUP BY session_history.user_id ' \
+                    'ORDER BY total_duration DESC ' \
+                    'LIMIT 10'
+
+            result = monitor_db.select(query)
+
+        categories = []
+        series_1 = []
+        series_2 = []
+        series_3 = []
+
+        for item in result:
+            categories.append(item[0])
+            series_1.append(item[1])
+            series_2.append(item[2])
+            series_3.append(item[3])
+
+        series_1_output = {'name': 'TV',
+                           'data': series_1}
+        series_2_output = {'name': 'Movies',
+                           'data': series_2}
+        series_3_output = {'name': 'Music',
+                           'data': series_3}
+
+        output = {'categories': categories,
+                  'series': [series_1_output, series_2_output, series_3_output]}
+        return output
+
+    def get_total_plays_per_stream_type(self, time_range='30', y_axis='plays'):
+        monitor_db = database.MonitorDatabase()
+
+        if not time_range.isdigit():
+            time_range = '30'
+
+        try:
+            if y_axis == 'plays':
+                query = 'SELECT date(session_history.started, "unixepoch", "localtime") as date_played, ' \
+                        'SUM(case when session_history_media_info.video_decision = "direct play" ' \
+                        'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play") ' \
+                        'then 1 else 0 end) as dp_count, ' \
+                        'SUM(case when session_history_media_info.video_decision = "copy" ' \
+                        'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy") ' \
+                        'then 1 else 0 end) as ds_count, ' \
+                        'SUM(case when session_history_media_info.video_decision = "transcode" ' \
+                        'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode") ' \
+                        'then 1 else 0 end) as tc_count ' \
+                        'FROM session_history ' \
+                        'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
+                        'WHERE (datetime(session_history.stopped, "unixepoch", "localtime") >= ' \
+                        'datetime("now", "-%s days", "localtime")) AND ' \
+                        '(session_history.media_type = "episode" OR session_history.media_type = "movie" OR session_history.media_type = "track") ' \
+                        'GROUP BY date_played ' \
+                        'ORDER BY started ASC' % time_range
+
+                result = monitor_db.select(query)
+            else:
+                query = 'SELECT date(session_history.started, "unixepoch", "localtime") as date_played, ' \
+                        'SUM(case when (session_history_media_info.video_decision = "direct play" ' \
+                        'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play")) ' \
+                        'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
+                        ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as dp_duration, ' \
+                        'SUM(case when (session_history_media_info.video_decision = "copy" ' \
+                        'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy")) ' \
+                        'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
+                        ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as ds_duration, ' \
+                        'SUM(case when (session_history_media_info.video_decision = "transcode" ' \
+                        'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode")) ' \
+                        'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
+                        ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tc_duration ' \
+                        'FROM session_history ' \
+                        'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
+                        'WHERE datetime(session_history.stopped, "unixepoch", "localtime") >= ' \
+                        'datetime("now", "-%s days", "localtime") AND ' \
+                        '(session_history.media_type = "episode" OR session_history.media_type = "movie" OR session_history.media_type = "track") ' \
+                        'GROUP BY date_played ' \
+                        'ORDER BY started ASC' % time_range
+
+                result = monitor_db.select(query)
+        except:
+            logger.warn("Unable to execute database query.")
+            return None
 
         # create our date range as some days may not have any data
         # but we still want to display them
@@ -846,109 +539,27 @@ class Graphs(object):
         series_1 = []
         series_2 = []
         series_3 = []
-        series_4 = []
 
         for date_item in sorted(date_list):
             date_string = date_item.strftime('%Y-%m-%d')
             categories.append(date_string)
-
-            series_1_value = calc_most_concurrent(
-                result_by_date_and_decision.get((date_string, 'direct play'), [])
-            )
-            series_2_value = calc_most_concurrent(
-                result_by_date_and_decision.get((date_string, 'copy'), [])
-            )
-            series_3_value = calc_most_concurrent(
-                result_by_date_and_decision.get((date_string, 'transcode'), [])
-            )
-            series_4_value = calc_most_concurrent(
-                result_by_date.get(date_string, [])
-            )
+            series_1_value = 0
+            series_2_value = 0
+            series_3_value = 0
+            for item in result:
+                if date_string == item[0]:
+                    series_1_value = item[1]
+                    series_2_value = item[2]
+                    series_3_value = item[3]
+                    break
+                else:
+                    series_1_value = 0
+                    series_2_value = 0
+                    series_3_value = 0
 
             series_1.append(series_1_value)
             series_2.append(series_2_value)
             series_3.append(series_3_value)
-            series_4.append(series_4_value)
-
-        series_1_output = {'name': 'Direct Play',
-                           'data': series_1}
-        series_2_output = {'name': 'Direct Stream',
-                           'data': series_2}
-        series_3_output = {'name': 'Transcode',
-                           'data': series_3}
-        series_4_output = {'name': 'Max. Concurrent Streams',
-                           'data': series_4}
-
-        output = {'categories': categories,
-                  'series': [series_1_output, series_2_output, series_3_output, series_4_output]}
-        return output
-
-    def get_total_plays_by_source_resolution(self, time_range='30', y_axis='plays', user_id=None, grouping=None):
-        monitor_db = database.MonitorDatabase()
-
-        time_range = helpers.cast_to_int(time_range) or 30
-        timestamp = helpers.timestamp() - time_range * 24 * 60 * 60
-
-        user_cond = self._make_user_cond(user_id)
-
-        if grouping is None:
-            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
-
-        group_by = 'session_history.reference_id' if grouping else 'session_history.id'
-
-        try:
-            if y_axis == 'plays':
-                query = "SELECT shmi.video_full_resolution AS resolution, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'direct play' THEN 1 ELSE 0 END) AS dp_count, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'copy' THEN 1 ELSE 0 END) AS ds_count, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'transcode' THEN 1 ELSE 0 END) AS tc_count, " \
-                        "COUNT(sh.id) AS total_count " \
-                        "FROM (SELECT * " \
-                        "    FROM session_history " \
-                        "    WHERE session_history.stopped >= %s " \
-                        "    AND session_history.media_type IN ('movie', 'episode') %s " \
-                        "    GROUP BY %s) AS sh " \
-                        "JOIN session_history_media_info AS shmi ON shmi.id = sh.id " \
-                        "GROUP BY resolution " \
-                        "ORDER BY total_count DESC " \
-                        "LIMIT 10" % (timestamp, user_cond, group_by)
-
-                result = monitor_db.select(query)
-            else:
-                query = "SELECT shmi.video_full_resolution AS resolution," \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'direct play' THEN sh.d ELSE 0 END) AS dp_count, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'copy' THEN sh.d ELSE 0 END) AS ds_count, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'transcode' THEN sh.d ELSE 0 END) AS tc_count, " \
-                        "SUM(sh.d) AS total_duration " \
-                        "FROM (SELECT *, " \
-                        "      SUM(CASE WHEN stopped > 0 THEN (stopped - started) - " \
-                        "        (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) " \
-                        "        AS d " \
-                        "    FROM session_history " \
-                        "    WHERE session_history.stopped >= %s " \
-                        "    AND session_history.media_type IN ('movie', 'episode') %s " \
-                        "    GROUP BY %s) AS sh " \
-                        "JOIN session_history_media_info AS shmi ON shmi.id = sh.id " \
-                        "GROUP BY resolution " \
-                        "ORDER BY total_duration DESC " \
-                        "LIMIT 10" % (timestamp, user_cond, group_by)
-
-                result = monitor_db.select(query)
-        except Exception as e:
-            logger.warn("Tautulli Graphs :: Unable to execute database query for get_total_plays_by_source_resolution: %s." % e)
-            return None
-
-        categories = []
-        series_1 = []
-        series_2 = []
-        series_3 = []
-
-        for item in result:
-            categories.append(item['resolution'])
-
-            series_1.append(item['dp_count'])
-            series_2.append(item['ds_count'])
-            series_3.append(item['tc_count'])
 
         series_1_output = {'name': 'Direct Play',
                            'data': series_1}
@@ -961,86 +572,60 @@ class Graphs(object):
                   'series': [series_1_output, series_2_output, series_3_output]}
         return output
 
-    def get_total_plays_by_stream_resolution(self, time_range='30', y_axis='plays', user_id=None, grouping=None):
+    def get_total_plays_by_source_resolution(self, time_range='30', y_axis='plays'):
         monitor_db = database.MonitorDatabase()
 
-        time_range = helpers.cast_to_int(time_range) or 30
-        timestamp = helpers.timestamp() - time_range * 24 * 60 * 60
+        if not time_range.isdigit():
+            time_range = '30'
 
-        user_cond = self._make_user_cond(user_id)
+        if y_axis == 'plays':
+            query = 'SELECT session_history_media_info.video_resolution AS resolution, ' \
+                    'SUM(case when session_history_media_info.video_decision = "direct play" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play") ' \
+                    'then 1 else 0 end) as dp_count, ' \
+                    'SUM(case when session_history_media_info.video_decision = "copy" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy") ' \
+                    'then 1 else 0 end) as ds_count, ' \
+                    'SUM(case when session_history_media_info.video_decision = "transcode" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode") ' \
+                    'then 1 else 0 end) as tc_count, ' \
+                    'COUNT(session_history.id) as total_count ' \
+                    'FROM session_history ' \
+                    'JOIN session_history_media_info on session_history.id = session_history_media_info.id ' \
+                    'WHERE (datetime(session_history.stopped, "unixepoch", "localtime") >= ' \
+                    'datetime("now", "-' + time_range + ' days", "localtime")) AND ' \
+                    '(session_history.media_type = "episode" OR session_history.media_type = "movie") ' \
+                    'GROUP BY resolution ' \
+                    'ORDER BY total_count DESC ' \
+                    'LIMIT 10'
 
-        if grouping is None:
-            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
+            result = monitor_db.select(query)
+        else:
+            query = 'SELECT session_history_media_info.video_resolution AS resolution,' \
+                    'SUM(case when (session_history_media_info.video_decision = "direct play" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play")) ' \
+                    'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as dp_duration, ' \
+                    'SUM(case when (session_history_media_info.video_decision = "copy" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy")) ' \
+                    'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as ds_duration, ' \
+                    'SUM(case when (session_history_media_info.video_decision = "transcode" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode")) ' \
+                    'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tc_duration, ' \
+                    'SUM(case when stopped > 0 then (stopped - started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as total_duration ' \
+                    'FROM session_history ' \
+                    'JOIN session_history_media_info on session_history.id = session_history_media_info.id ' \
+                    'WHERE (datetime(session_history.stopped, "unixepoch", "localtime") >= ' \
+                    'datetime("now", "-' + time_range + ' days", "localtime")) AND ' \
+                    '(session_history.media_type = "episode" OR session_history.media_type = "movie") ' \
+                    'GROUP BY resolution ' \
+                    'ORDER BY total_duration DESC ' \
+                    'LIMIT 10'
 
-        group_by = 'session_history.reference_id' if grouping else 'session_history.id'
-
-        try:
-            if y_axis == 'plays':
-                query = "SELECT " \
-                        "(CASE WHEN shmi.stream_video_full_resolution IS NULL THEN " \
-                        "  (CASE WHEN shmi.video_decision = 'transcode' THEN " \
-                        "    (CASE " \
-                        "      WHEN shmi.transcode_height <= 360 THEN 'SD' " \
-                        "      WHEN shmi.transcode_height <= 480 THEN '480' " \
-                        "      WHEN shmi.transcode_height <= 576 THEN '576' " \
-                        "      WHEN shmi.transcode_height <= 720 THEN '720' " \
-                        "      WHEN shmi.transcode_height <= 1080 THEN '1080' " \
-                        "      WHEN shmi.transcode_height <= 1440 THEN 'QHD' " \
-                        "      WHEN shmi.transcode_height <= 2160 THEN '4k' " \
-                        "      ELSE 'unknown' END)" \
-                        "    ELSE shmi.video_full_resolution END) " \
-                        "  ELSE shmi.stream_video_full_resolution END) AS resolution, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'direct play' THEN 1 ELSE 0 END) AS dp_count, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'copy' THEN 1 ELSE 0 END) AS ds_count, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'transcode' THEN 1 ELSE 0 END) AS tc_count, " \
-                        "COUNT(sh.id) AS total_count " \
-                        "FROM (SELECT * " \
-                        "    FROM session_history " \
-                        "    WHERE session_history.stopped >= %s " \
-                        "    AND session_history.media_type IN ('movie', 'episode') %s " \
-                        "    GROUP BY %s) AS sh " \
-                        "JOIN session_history_media_info AS shmi ON shmi.id = sh.id " \
-                        "GROUP BY resolution " \
-                        "ORDER BY total_count DESC " \
-                        "LIMIT 10" % (timestamp, user_cond, group_by)
-
-                result = monitor_db.select(query)
-            else:
-                query = "SELECT " \
-                        "(CASE WHEN shmi.stream_video_full_resolution IS NULL THEN " \
-                        "  (CASE WHEN shmi.video_decision = 'transcode' THEN " \
-                        "    (CASE " \
-                        "      WHEN shmi.transcode_height <= 360 THEN 'SD' " \
-                        "      WHEN shmi.transcode_height <= 480 THEN '480' " \
-                        "      WHEN shmi.transcode_height <= 576 THEN '576' " \
-                        "      WHEN shmi.transcode_height <= 720 THEN '720' " \
-                        "      WHEN shmi.transcode_height <= 1080 THEN '1080' " \
-                        "      WHEN shmi.transcode_height <= 1440 THEN 'QHD' " \
-                        "      WHEN shmi.transcode_height <= 2160 THEN '4k' " \
-                        "      ELSE 'unknown' END)" \
-                        "    ELSE shmi.video_full_resolution END) " \
-                        "  ELSE shmi.stream_video_full_resolution END) AS resolution, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'direct play' THEN sh.d ELSE 0 END) AS dp_count, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'copy' THEN sh.d ELSE 0 END) AS ds_count, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'transcode' THEN sh.d ELSE 0 END) AS tc_count, " \
-                        "SUM(sh.d) AS total_duration " \
-                        "FROM (SELECT *, " \
-                        "      SUM(CASE WHEN stopped > 0 THEN (stopped - started) - " \
-                        "        (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) " \
-                        "        AS d " \
-                        "    FROM session_history " \
-                        "    WHERE session_history.stopped >= %s " \
-                        "    AND session_history.media_type IN ('movie', 'episode') %s " \
-                        "    GROUP BY %s) AS sh " \
-                        "JOIN session_history_media_info AS shmi ON shmi.id = sh.id " \
-                        "GROUP BY resolution " \
-                        "ORDER BY total_duration DESC " \
-                        "LIMIT 10" % (timestamp, user_cond, group_by)
-
-                result = monitor_db.select(query)
-        except Exception as e:
-            logger.warn("Tautulli Graphs :: Unable to execute database query for get_total_plays_by_stream_resolution: %s." % e)
-            return None
+            result = monitor_db.select(query)
 
         categories = []
         series_1 = []
@@ -1048,11 +633,10 @@ class Graphs(object):
         series_3 = []
 
         for item in result:
-            categories.append(item['resolution'])
-
-            series_1.append(item['dp_count'])
-            series_2.append(item['ds_count'])
-            series_3.append(item['tc_count'])
+            categories.append(item[0])
+            series_1.append(item[1])
+            series_2.append(item[2])
+            series_3.append(item[3])
 
         series_1_output = {'name': 'Direct Play',
                            'data': series_1}
@@ -1065,58 +649,80 @@ class Graphs(object):
                   'series': [series_1_output, series_2_output, series_3_output]}
         return output
 
-    def get_stream_type_by_top_10_platforms(self, time_range='30', y_axis='plays', user_id=None, grouping=None):
+    def get_total_plays_by_stream_resolution(self, time_range='30', y_axis='plays'):
         monitor_db = database.MonitorDatabase()
 
-        time_range = helpers.cast_to_int(time_range) or 30
-        timestamp = helpers.timestamp() - time_range * 24 * 60 * 60
+        if not time_range.isdigit():
+            time_range = '30'
 
-        user_cond = self._make_user_cond(user_id)
+        if y_axis == 'plays':
+            query = 'SELECT ' \
+                    '(case when session_history_media_info.video_decision = "transcode" then ' \
+                    '(case ' \
+                    'when session_history_media_info.transcode_height <= 360 then "sd" ' \
+                    'when session_history_media_info.transcode_height <= 480 then "480" ' \
+                    'when session_history_media_info.transcode_height <= 576 then "576" ' \
+                    'when session_history_media_info.transcode_height <= 720 then "720" ' \
+                    'when session_history_media_info.transcode_height <= 1080 then "1080" ' \
+                    'when session_history_media_info.transcode_height <= 1440 then "QHD" ' \
+                    'when session_history_media_info.transcode_height <= 2160 then "4K" ' \
+                    'else "unknown" end) else session_history_media_info.video_resolution end) as resolution, ' \
+                    'SUM(case when session_history_media_info.video_decision = "direct play" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play") ' \
+                    'then 1 else 0 end) as dp_count, ' \
+                    'SUM(case when session_history_media_info.video_decision = "copy" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy") ' \
+                    'then 1 else 0 end) as ds_count, ' \
+                    'SUM(case when session_history_media_info.video_decision = "transcode" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode") ' \
+                    'then 1 else 0 end) as tc_count, ' \
+                    'COUNT(session_history.id) as total_count ' \
+                    'FROM session_history ' \
+                    'JOIN session_history_media_info on session_history.id = session_history_media_info.id ' \
+                    'WHERE (datetime(session_history.stopped, "unixepoch", "localtime") >= ' \
+                    'datetime("now", "-' + time_range + ' days", "localtime")) AND ' \
+                    '(session_history.media_type = "episode" OR session_history.media_type = "movie") ' \
+                    'GROUP BY resolution ' \
+                    'ORDER BY total_count DESC ' \
+                    'LIMIT 10'
 
-        if grouping is None:
-            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
+            result = monitor_db.select(query)
+        else:
+            query = 'SELECT ' \
+                    '(case when session_history_media_info.video_decision = "transcode" then ' \
+                    '(case ' \
+                    'when session_history_media_info.transcode_height <= 360 then "sd" ' \
+                    'when session_history_media_info.transcode_height <= 480 then "480" ' \
+                    'when session_history_media_info.transcode_height <= 576 then "576" ' \
+                    'when session_history_media_info.transcode_height <= 720 then "720" ' \
+                    'when session_history_media_info.transcode_height <= 1080 then "1080" ' \
+                    'when session_history_media_info.transcode_height <= 1440 then "QHD" ' \
+                    'when session_history_media_info.transcode_height <= 2160 then "4K" ' \
+                    'else "unknown" end) else session_history_media_info.video_resolution end) as resolution, ' \
+                    'SUM(case when (session_history_media_info.video_decision = "direct play" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play")) ' \
+                    'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as dp_duration, ' \
+                    'SUM(case when (session_history_media_info.video_decision = "copy" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy")) ' \
+                    'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as ds_duration, ' \
+                    'SUM(case when (session_history_media_info.video_decision = "transcode" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode")) ' \
+                    'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tc_duration, ' \
+                    'SUM(case when stopped > 0 then (stopped - started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as total_duration ' \
+                    'FROM session_history ' \
+                    'JOIN session_history_media_info on session_history.id = session_history_media_info.id ' \
+                    'WHERE (datetime(session_history.stopped, "unixepoch", "localtime") >= ' \
+                    'datetime("now", "-' + time_range + ' days", "localtime")) AND ' \
+                    '(session_history.media_type = "episode" OR session_history.media_type = "movie") ' \
+                    'GROUP BY resolution ' \
+                    'ORDER BY total_duration DESC ' \
+                    'LIMIT 10'
 
-        group_by = 'session_history.reference_id' if grouping else 'session_history.id'
-
-        try:
-            if y_axis == 'plays':
-                query = "SELECT sh.platform, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'direct play' THEN 1 ELSE 0 END) AS dp_count, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'copy' THEN 1 ELSE 0 END) AS ds_count, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'transcode' THEN 1 ELSE 0 END) AS tc_count, " \
-                        "COUNT(sh.id) AS total_count " \
-                        "FROM (SELECT * " \
-                        "    FROM session_history " \
-                        "    WHERE session_history.stopped >= %s %s " \
-                        "    GROUP BY %s) AS sh " \
-                        "JOIN session_history_media_info AS shmi ON shmi.id = sh.id " \
-                        "GROUP BY sh.platform " \
-                        "ORDER BY total_count DESC " \
-                        "LIMIT 10" % (timestamp, user_cond, group_by)
-
-                result = monitor_db.select(query)
-            else:
-                query = "SELECT sh.platform, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'direct play' THEN sh.d ELSE 0 END) AS dp_count, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'copy' THEN sh.d ELSE 0 END) AS ds_count, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'transcode' THEN sh.d ELSE 0 END) AS tc_count, " \
-                        "SUM(sh.d) AS total_duration " \
-                        "FROM (SELECT *, " \
-                        "      SUM(CASE WHEN stopped > 0 THEN (stopped - started) - " \
-                        "        (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) " \
-                        "        AS d " \
-                        "    FROM session_history " \
-                        "    WHERE session_history.stopped >= %s %s " \
-                        "    GROUP BY %s) AS sh " \
-                        "JOIN session_history_media_info AS shmi ON shmi.id = sh.id " \
-                        "GROUP BY sh.platform " \
-                        "ORDER BY total_duration DESC " \
-                        "LIMIT 10" % (timestamp, user_cond, group_by)
-
-                result = monitor_db.select(query)
-        except Exception as e:
-            logger.warn("Tautulli Graphs :: Unable to execute database query for get_stream_type_by_top_10_platforms: %s." % e)
-            return None
+            result = monitor_db.select(query)
 
         categories = []
         series_1 = []
@@ -1124,11 +730,95 @@ class Graphs(object):
         series_3 = []
 
         for item in result:
-            categories.append(common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform']))
+            categories.append(item[0])
+            series_1.append(item[1])
+            series_2.append(item[2])
+            series_3.append(item[3])
 
-            series_1.append(item['dp_count'])
-            series_2.append(item['ds_count'])
-            series_3.append(item['tc_count'])
+        series_1_output = {'name': 'Direct Play',
+                           'data': series_1}
+        series_2_output = {'name': 'Direct Stream',
+                           'data': series_2}
+        series_3_output = {'name': 'Transcode',
+                           'data': series_3}
+
+        output = {'categories': categories,
+                  'series': [series_1_output, series_2_output, series_3_output]}
+        return output
+
+    def get_stream_type_by_top_10_platforms(self, time_range='30', y_axis='plays'):
+        monitor_db = database.MonitorDatabase()
+
+        if not time_range.isdigit():
+            time_range = '30'
+
+        if y_axis == 'plays':
+            query = 'SELECT ' \
+                    'session_history.platform as platform, ' \
+                    'SUM(case when session_history_media_info.video_decision = "direct play" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play") ' \
+                    'then 1 else 0 end) as dp_count, ' \
+                    'SUM(case when session_history_media_info.video_decision = "copy" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy") ' \
+                    'then 1 else 0 end) as ds_count, ' \
+                    'SUM(case when session_history_media_info.video_decision = "transcode" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode") ' \
+                    'then 1 else 0 end) as tc_count, ' \
+                    'COUNT(session_history.id) as total_count ' \
+                    'FROM session_history ' \
+                    'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
+                    'WHERE datetime(session_history.started, "unixepoch", "localtime") >= ' \
+                    'datetime("now", "-' + time_range + ' days", "localtime") AND ' \
+                    '(session_history.media_type = "episode" OR session_history.media_type = "movie" OR session_history.media_type = "track") ' \
+                    'GROUP BY platform ' \
+                    'ORDER BY total_count DESC LIMIT 10'
+
+            result = monitor_db.select(query)
+        else:
+            query = 'SELECT ' \
+                    'session_history.platform as platform, ' \
+                    'SUM(case when (session_history_media_info.video_decision = "direct play" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play")) ' \
+                    'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as dp_duration, ' \
+                    'SUM(case when (session_history_media_info.video_decision = "copy" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy")) ' \
+                    'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as ds_duration, ' \
+                    'SUM(case when (session_history_media_info.video_decision = "transcode" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode")) ' \
+                    'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tc_duration, ' \
+                    'SUM(case when session_history.stopped > 0 ' \
+                    'then (session_history.stopped - session_history.started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as total_duration ' \
+                    'FROM session_history ' \
+                    'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
+                    'WHERE datetime(session_history.started, "unixepoch", "localtime") >= ' \
+                    'datetime("now", "-' + time_range + ' days", "localtime") AND ' \
+                    '(session_history.media_type = "episode" OR session_history.media_type = "movie" OR session_history.media_type = "track") ' \
+                    'GROUP BY platform ' \
+                    'ORDER BY total_duration DESC LIMIT 10'
+
+            result = monitor_db.select(query)
+
+        categories = []
+        series_1 = []
+        series_2 = []
+        series_3 = []
+
+        for item in result:
+            categories.append(item[0])
+            series_1.append(item[1])
+            series_2.append(item[2])
+            series_3.append(item[3])
+
+        # Rename Mystery platform names
+        platform_names = [('Mystery 3', 'Playstation 3'),
+                          ('Mystery 4', 'Playstation 4'),
+                          ('Mystery 5', 'Xbox 360')]
+        for old_name, new_name in platform_names:
+            categories = [item.replace(old_name, new_name) for item in categories]
 
         series_1_output = {'name': 'Direct Play',
                            'data': series_1}
@@ -1142,81 +832,74 @@ class Graphs(object):
 
         return output
 
-    def get_stream_type_by_top_10_users(self, time_range='30', y_axis='plays', user_id=None, grouping=None):
+    def get_stream_type_by_top_10_users(self, time_range='30', y_axis='plays'):
         monitor_db = database.MonitorDatabase()
 
-        time_range = helpers.cast_to_int(time_range) or 30
-        timestamp = helpers.timestamp() - time_range * 24 * 60 * 60
+        if not time_range.isdigit():
+            time_range = '30'
 
-        user_cond = self._make_user_cond(user_id)
+        if y_axis == 'plays':
+            query = 'SELECT ' \
+                    'CASE WHEN users.friendly_name is null then users.username else users.friendly_name end as username, ' \
+                    'SUM(case when session_history_media_info.video_decision = "direct play" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play") ' \
+                    'then 1 else 0 end) as dp_count, ' \
+                    'SUM(case when session_history_media_info.video_decision = "copy" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy") ' \
+                    'then 1 else 0 end) as ds_count, ' \
+                    'SUM(case when session_history_media_info.video_decision = "transcode" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode") ' \
+                    'then 1 else 0 end) as tc_count, ' \
+                    'COUNT(session_history.id) as total_count ' \
+                    'FROM session_history ' \
+                    'JOIN users ON session_history.user_id = users.user_id ' \
+                    'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
+                    'WHERE datetime(session_history.started, "unixepoch", "localtime") >= ' \
+                    'datetime("now", "-' + time_range + ' days", "localtime") AND ' \
+                    '(session_history.media_type = "episode" OR session_history.media_type = "movie" OR session_history.media_type = "track") ' \
+                    'GROUP BY username ' \
+                    'ORDER BY total_count DESC LIMIT 10'
 
-        if grouping is None:
-            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
+            result = monitor_db.select(query)
+        else:
+            query = 'SELECT ' \
+                    'CASE WHEN users.friendly_name is null then users.username else users.friendly_name end as username, ' \
+                    'SUM(case when (session_history_media_info.video_decision = "direct play" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play")) ' \
+                    'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as dp_duration, ' \
+                    'SUM(case when (session_history_media_info.video_decision = "copy" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy")) ' \
+                    'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as ds_duration, ' \
+                    'SUM(case when (session_history_media_info.video_decision = "transcode" ' \
+                    'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode")) ' \
+                    'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tc_duration, ' \
+                    'SUM(case when session_history.stopped > 0 ' \
+                    'then (session_history.stopped - session_history.started) ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as total_duration ' \
+                    'FROM session_history ' \
+                    'JOIN users ON session_history.user_id = users.user_id ' \
+                    'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
+                    'WHERE datetime(session_history.started, "unixepoch", "localtime") >= ' \
+                    'datetime("now", "-' + time_range + ' days", "localtime") AND ' \
+                    '(session_history.media_type = "episode" OR session_history.media_type = "movie" OR session_history.media_type = "track") ' \
+                    'GROUP BY username ' \
+                    'ORDER BY total_duration DESC LIMIT 10'
 
-        group_by = 'session_history.reference_id' if grouping else 'session_history.id'
-
-        try:
-            if y_axis == 'plays':
-                query = "SELECT u.user_id, u.username, " \
-                        "(CASE WHEN u.friendly_name IS NULL OR TRIM(u.friendly_name) = '' " \
-                        "  THEN u.username ELSE u.friendly_name END) AS friendly_name," \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'direct play' THEN 1 ELSE 0 END) AS dp_count, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'copy' THEN 1 ELSE 0 END) AS ds_count, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'transcode' THEN 1 ELSE 0 END) AS tc_count, " \
-                        "COUNT(sh.id) AS total_count " \
-                        "FROM (SELECT * " \
-                        "    FROM session_history " \
-                        "    WHERE session_history.stopped >= %s %s " \
-                        "    GROUP BY %s) AS sh " \
-                        "JOIN session_history_media_info AS shmi ON shmi.id = sh.id " \
-                        "JOIN users AS u ON u.user_id = sh.user_id " \
-                        "GROUP BY u.user_id " \
-                        "ORDER BY total_count DESC " \
-                        "LIMIT 10" % (timestamp, user_cond, group_by)
-
-                result = monitor_db.select(query)
-            else:
-                query = "SELECT u.user_id, u.username, " \
-                        "(CASE WHEN u.friendly_name IS NULL OR TRIM(u.friendly_name) = '' " \
-                        "  THEN u.username ELSE u.friendly_name END) AS friendly_name," \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'direct play' THEN sh.d ELSE 0 END) AS dp_count, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'copy' THEN sh.d ELSE 0 END) AS ds_count, " \
-                        "SUM(CASE WHEN shmi.transcode_decision = 'transcode' THEN sh.d ELSE 0 END) AS tc_count, " \
-                        "SUM(sh.d) AS total_duration " \
-                        "FROM (SELECT *, " \
-                        "      SUM(CASE WHEN stopped > 0 THEN (stopped - started) - " \
-                        "        (CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) ELSE 0 END) " \
-                        "        AS d " \
-                        "    FROM session_history " \
-                        "    WHERE session_history.stopped >= %s %s " \
-                        "    GROUP BY %s) AS sh " \
-                        "JOIN session_history_media_info AS shmi ON shmi.id = sh.id " \
-                        "JOIN users AS u ON u.user_id = sh.user_id " \
-                        "GROUP BY u.user_id " \
-                        "ORDER BY total_duration DESC " \
-                        "LIMIT 10" % (timestamp, user_cond, group_by)
-
-                result = monitor_db.select(query)
-        except Exception as e:
-            logger.warn("Tautulli Graphs :: Unable to execute database query for get_stream_type_by_top_10_users: %s." % e)
-            return None
+            result = monitor_db.select(query)
 
         categories = []
         series_1 = []
         series_2 = []
         series_3 = []
 
-        session_user_id = session.get_session_user_id()
-
         for item in result:
-            if session_user_id:
-                categories.append(item['username'] if str(item['user_id']) == session_user_id else 'Plex User')
-            else:
-                categories.append(item['friendly_name'])
-
-            series_1.append(item['dp_count'])
-            series_2.append(item['ds_count'])
-            series_3.append(item['tc_count'])
+            categories.append(item[0])
+            series_1.append(item[1])
+            series_2.append(item[2])
+            series_3.append(item[3])
 
         series_1_output = {'name': 'Direct Play',
                            'data': series_1}
@@ -1229,17 +912,3 @@ class Graphs(object):
                   'series': [series_1_output, series_2_output, series_3_output]}
 
         return output
-
-    def _make_user_cond(self, user_id, cond_prefix='AND'):
-        """
-        Expects user_id to be a comma-separated list of ints.
-        """
-        user_cond = ''
-
-        if session.get_session_user_id() and user_id and user_id != str(session.get_session_user_id()):
-            user_cond = cond_prefix + ' session_history.user_id = %s ' % session.get_session_user_id()
-        elif user_id:
-            user_ids = helpers.split_strip(user_id)
-            if all(id.isdigit() for id in user_ids):
-                user_cond = cond_prefix + ' session_history.user_id IN (%s) ' % ','.join(user_ids)
-        return user_cond
diff --git a/plexpy/helpers.py b/plexpy/helpers.py
index ddf100d1..f81cbd84 100644
--- a/plexpy/helpers.py
+++ b/plexpy/helpers.py
@@ -1,90 +1,47 @@
-# -*- coding: utf-8 -*-
-
-#  This file is part of Tautulli.
+#  This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
-import arrow
-import base64
-import cloudinary
-from cloudinary.api import delete_resources_by_tag
-from cloudinary.uploader import upload
-from cloudinary.utils import cloudinary_url
-from collections import OrderedDict
-from datetime import date, datetime, timezone
-from functools import reduce, wraps
-from itertools import groupby
-from future.moves.itertools import islice, zip_longest
-from ipaddress import ip_address, ip_network, IPv4Address
-import ipwhois
-import ipwhois.exceptions
-import ipwhois.utils
-from IPy import IP
-import json
-import math
-import operator
-import os
-import re
-import shlex
-import socket
-import string
-import sys
-import time
-import unicodedata
-from urllib.parse import urlencode
+from operator import itemgetter
 from xml.dom import minidom
-import xmltodict
 
+import unicodedata
 import plexpy
-from plexpy import common
-from plexpy import logger
-from plexpy import request
-from plexpy.api2 import API2
+import datetime
+import fnmatch
+import shutil
+import time
+import sys
+import re
+import os
+import json
+import xmltodict
+import math
 
 
-def addtoapi(*dargs, **dkwargs):
-    """ Helper decorator that adds function to the API class.
-        is used to reuse as much code as possible
+def multikeysort(items, columns):
+    comparers = [((itemgetter(col[1:].strip()), -1) if col.startswith('-') else (itemgetter(col.strip()), 1)) for col in columns]
 
-        args:
-            dargs: (string, optional) Used to rename a function
+    def comparer(left, right):
+        for fn, mult in comparers:
+            result = cmp(fn(left), fn(right))
+            if result:
+                return mult * result
+        else:
+            return 0
 
-        Example:
-            @addtoapi("i_was_renamed", "im_a_second_alias")
-            @addtoapi()
-
-    """
-    def rd(function):
-        @wraps(function)
-        def wrapper(*args, **kwargs):
-            return function(*args, **kwargs)
-
-        if dargs:
-            # To rename the function if it sucks.. and
-            # allow compat with old api.
-            for n in dargs:
-                if function.__doc__ and len(function.__doc__):
-                    function.__doc__ = function.__doc__.strip()
-                setattr(API2, n, function)
-            return wrapper
-
-        if function.__doc__ and len(function.__doc__):
-            function.__doc__ = function.__doc__.strip()
-        setattr(API2, function.__name__, function)
-        return wrapper
-
-    return rd
+    return sorted(items, cmp=comparer)
 
 
 def checked(variable):
@@ -102,7 +59,7 @@ def radio(variable, pos):
         return ''
 
 
-def latinToAscii(unicrap, replace=False):
+def latinToAscii(unicrap):
     """
     From couch potato
     """
@@ -135,22 +92,19 @@ def latinToAscii(unicrap, replace=False):
     }
 
     r = ''
-    if unicrap:
-        for i in unicrap:
-            if ord(i) in xlate:
-                r += xlate[ord(i)]
-            elif ord(i) >= 0x80:
-                if replace:
-                    r += '?'
-            else:
-                r += str(i)
-
+    for i in unicrap:
+        if ord(i) in xlate:
+            r += xlate[ord(i)]
+        elif ord(i) >= 0x80:
+            pass
+        else:
+            r += str(i)
     return r
 
 
 def convert_milliseconds(ms):
 
-    seconds = ms // 1000
+    seconds = ms / 1000
     gmtime = time.gmtime(seconds)
     if seconds > 3600:
         minutes = time.strftime("%H:%M:%S", gmtime)
@@ -159,29 +113,16 @@ def convert_milliseconds(ms):
 
     return minutes
 
-
-def convert_milliseconds_to_seconds(ms):
-    if str(ms).isdigit():
-        seconds = float(ms) / 1000
-        return math.trunc(seconds)
-    return 0
-
-
 def convert_milliseconds_to_minutes(ms):
+
     if str(ms).isdigit():
         seconds = float(ms) / 1000
         minutes = round(seconds / 60, 0)
+
         return math.trunc(minutes)
+
     return 0
 
-
-def seconds_to_minutes(s):
-    if str(s).isdigit():
-        minutes = round(s / 60, 0)
-        return math.trunc(minutes)
-    return 0
-
-
 def convert_seconds(s):
 
     gmtime = time.gmtime(s)
@@ -193,120 +134,15 @@ def convert_seconds(s):
     return minutes
 
 
-def convert_seconds_to_minutes(s):
-
-    if str(s).isdigit():
-        minutes = round(float(s) / 60, 0)
-
-        return math.trunc(minutes)
-
-    return 0
-
-
-def timestamp():
-    return int(time.time())
-
-
 def today():
-    today = date.today()
-    yyyymmdd = date.isoformat(today)
-
+    today = datetime.date.today()
+    yyyymmdd = datetime.date.isoformat(today)
     return yyyymmdd
 
 
-def utc_now_iso():
-    utcnow = datetime.now(tz=timezone.utc).replace(tzinfo=None)
-
-    return utcnow.isoformat()
-
-
-def now(sep=False):
-    return timestamp_to_YMDHMS(timestamp(), sep=sep)
-
-
-def YMD_to_timestamp(ymd):
-    return datetime.strptime(ymd, "%Y-%m-%d").timestamp()
-
-
-def timestamp_to_YMDHMS(ts, sep=False, ymd=False):
-    dt = timestamp_to_datetime(ts)
-    if sep:
-        if ymd:
-            return dt.strftime("%Y-%m-%d")
-        return dt.strftime("%Y-%m-%d %H:%M:%S")
-    if ymd:
-        return dt.strftime("%Y%m%d")
-    return dt.strftime("%Y%m%d%H%M%S")
-
-
-def timestamp_to_datetime(ts):
-    return datetime.fromtimestamp(ts)
-
-
-def iso_to_YMD(iso):
-    return iso_to_datetime(iso).strftime("%Y-%m-%d")
-
-
-def iso_to_datetime(iso):
-    return arrow.get(iso).datetime
-
-
-def datetime_to_iso(dt, to_date=False):
-    if isinstance(dt, datetime):
-        if to_date:
-            dt = dt.date()
-        return dt.isoformat()
-    return dt
-
-
-def human_duration(ms, sig='dhm', units='ms', return_seconds=300000):
-    factors = {'d': 86400000,
-               'h': 3600000,
-               'm': 60000,
-               's': 1000,
-               'ms': 1}
-
-    if str(ms).isdigit() and ms > 0:
-        if return_seconds and ms < return_seconds:
-            sig = 'dhms'
-
-        r = factors[sig[-1]]
-        ms = round(ms * factors[units] / r) * r
-
-        d, h = divmod(ms, factors['d'])
-        h, m = divmod(h, factors['h'])
-        m, s = divmod(m, factors['m'])
-        s, ms = divmod(s, factors['s'])
-
-        hd_list = []
-        if sig >= 'd' and d > 0:
-            d = d + 1 if sig == 'd' and h >= 12 else d
-            hd_list.append(str(d) + ' day' + ('s' if d > 1 else ''))
-
-        if sig >= 'dh' and h > 0:
-            h = h + 1 if sig == 'dh' and m >= 30 else h
-            hd_list.append(str(h) + ' hr' + ('s' if h > 1 else ''))
-
-        if sig >= 'dhm' and m > 0:
-            m = m + 1 if sig == 'dhm' and s >= 30 else m
-            hd_list.append(str(m) + ' min' + ('s' if m > 1 else ''))
-
-        if sig >= 'dhms' and s > 0:
-            hd_list.append(str(s) + ' sec' + ('s' if s > 1 else ''))
-
-        hd = ' '.join(hd_list)
-    else:
-        hd = '0'
-
-    return hd
-
-
-def format_timedelta_Hms(td):
-    s = td.total_seconds()
-    hours = s // 3600
-    minutes = (s % 3600) // 60
-    seconds = s % 60
-    return '{:02d}:{:02d}:{:02d}'.format(int(hours), int(minutes), int(seconds))
+def now():
+    now = datetime.datetime.now()
+    return now.strftime("%Y-%m-%d %H:%M:%S")
 
 
 def get_age(date):
@@ -326,13 +162,13 @@ def get_age(date):
 
 def bytes_to_mb(bytes):
 
-    mb = float(bytes) / 1048576
+    mb = int(bytes) / 1048576
     size = '%.1f MB' % mb
     return size
 
 
 def mb_to_bytes(mb_str):
-    result = re.search(r'^(\d+(?:\.\d+)?)\s?(?:mb)?', mb_str, flags=re.I)
+    result = re.search('^(\d+(?:\.\d+)?)\s?(?:mb)?', mb_str, flags=re.I)
     if result:
         return int(float(result.group(1)) * 1048576)
 
@@ -341,7 +177,7 @@ def piratesize(size):
     split = size.split(" ")
     factor = float(split[0])
     unit = split[1].upper()
-
+    
     if unit == 'MiB':
         size = factor * 1048576
     elif unit == 'MB':
@@ -367,7 +203,7 @@ def replace_all(text, dic, normalize=False):
     if not text:
         return ''
 
-    for i, j in dic.items():
+    for i, j in dic.iteritems():
         if normalize:
             try:
                 if sys.platform == 'darwin':
@@ -382,9 +218,9 @@ def replace_all(text, dic, normalize=False):
 
 def replace_illegal_chars(string, type="file"):
     if type == "file":
-        string = re.sub(r'[\?"*:|<>/]', '_', string)
+        string = re.sub('[\?"*:|<>/]', '_', string)
     if type == "folder":
-        string = re.sub(r'[:\?<>"|]', '_', string)
+        string = re.sub('[:\?<>"|]', '_', string)
 
     return string
 
@@ -392,14 +228,14 @@ def replace_illegal_chars(string, type="file"):
 def cleanName(string):
 
     pass1 = latinToAscii(string).lower()
-    out_string = re.sub(r'[\.\-\/\!\@\#\$\%\^\&\*\(\)\+\-\"\'\,\;\:\[\]\{\}\<\>\=\_]', '', pass1).encode('utf-8')
+    out_string = re.sub('[\.\-\/\!\@\#\$\%\^\&\*\(\)\+\-\"\'\,\;\:\[\]\{\}\<\>\=\_]', '', pass1).encode('utf-8')
 
     return out_string
 
 
 def cleanTitle(title):
 
-    title = re.sub(r'[\.\-\/\_]', ' ', title).lower()
+    title = re.sub('[\.\-\/\_]', ' ', title).lower()
 
     # Strip out extra whitespace
     title = ' '.join(title.split())
@@ -409,17 +245,6 @@ def cleanTitle(title):
     return title
 
 
-def clean_filename(filename, replace='_'):
-    whitelist = "-_.()[] {}{}".format(string.ascii_letters, string.digits)
-    cleaned_filename = unicodedata.normalize('NFKD', filename).encode('ASCII', 'ignore').decode()
-    cleaned_filename = ''.join(c if c in whitelist else replace for c in cleaned_filename)
-    return cleaned_filename
-
-
-def split_strip(s, delimiter=','):
-    return [x.strip() for x in str(s).split(delimiter) if x.strip()]
-
-
 def split_path(f):
     """
     Split a path into components, starting with the drive letter (if any). Given
@@ -472,40 +297,35 @@ def split_string(mystring, splitvar=','):
         mylist.append(each_word.strip())
     return mylist
 
-
 def create_https_certificates(ssl_cert, ssl_key):
     """
-    Create a self-signed HTTPS certificate and store in it in
+    Create a pair of self-signed HTTPS certificares and store in them in
     'ssl_cert' and 'ssl_key'. Method assumes pyOpenSSL is installed.
 
     This code is stolen from SickBeard (http://github.com/midgetspy/Sick-Beard).
     """
-    try:
-        from OpenSSL import crypto
-    except ImportError:
-        logger.error("Unable to generate self-signed certificates: Missing pyOpenSSL module.")
-        return False
-    from certgen import createKeyPair, createSelfSignedCertificate, TYPE_RSA
 
-    issuer = common.PRODUCT
-    serial = timestamp()
-    not_before = 0
-    not_after = 60 * 60 * 24 * 365 * 10  # ten years
-    domains = ['DNS:' + d.strip() for d in plexpy.CONFIG.HTTPS_DOMAIN.split(',') if d]
-    ips = ['IP:' + d.strip() for d in plexpy.CONFIG.HTTPS_IP.split(',') if d]
-    alt_names = ','.join(domains + ips).encode('utf-8')
+    from plexpy import logger
+
+    from OpenSSL import crypto
+    from certgen import createKeyPair, createCertRequest, createCertificate, \
+        TYPE_RSA, serial
+
+    # Create the CA Certificate
+    cakey = createKeyPair(TYPE_RSA, 2048)
+    careq = createCertRequest(cakey, CN="Certificate Authority")
+    cacert = createCertificate(careq, (careq, cakey), serial, (0, 60 * 60 * 24 * 365 * 10)) # ten years
 
-    # Create the self-signed Tautulli certificate
-    logger.debug("Generating self-signed SSL certificate.")
     pkey = createKeyPair(TYPE_RSA, 2048)
-    cert = createSelfSignedCertificate(issuer, pkey, serial, not_before, not_after, alt_names)
+    req = createCertRequest(pkey, CN="PlexPy")
+    cert = createCertificate(req, (cacert, cakey), serial, (0, 60 * 60 * 24 * 365 * 10)) # ten years
 
     # Save the key and certificate to disk
     try:
-        with open(ssl_cert, "w") as fp:
-            fp.write(crypto.dump_certificate(crypto.FILETYPE_PEM, cert).decode('utf-8'))
         with open(ssl_key, "w") as fp:
-            fp.write(crypto.dump_privatekey(crypto.FILETYPE_PEM, pkey).decode('utf-8'))
+            fp.write(crypto.dump_privatekey(crypto.FILETYPE_PEM, pkey))
+        with open(ssl_cert, "w") as fp:
+            fp.write(crypto.dump_certificate(crypto.FILETYPE_PEM, cert))
     except IOError as e:
         logger.error("Error creating SSL key and certificate: %s", e)
         return False
@@ -513,39 +333,11 @@ def create_https_certificates(ssl_cert, ssl_key):
     return True
 
 
-def cast_to_int(s):
-    try:
-        return int(s)
-    except (ValueError, TypeError):
-        return 0
-
-
 def cast_to_float(s):
     try:
         return float(s)
-    except (ValueError, TypeError):
-        return 0
-
-
-def helper_divmod(a, b):
-    try:
-        return divmod(a, b)
-    except (ValueError, TypeError):
-        return 0
-
-
-def helper_len(s):
-    try:
-        return len(s)
-    except (ValueError, TypeError):
-        return 0
-
-
-def helper_round(n, ndigits=None):
-    try:
-        return round(n, ndigits)
-    except (ValueError, TypeError):
-        return 0
+    except ValueError:
+        return -1
 
 
 def convert_xml_to_json(xml):
@@ -560,30 +352,27 @@ def convert_xml_to_dict(xml):
 
 def get_percent(value1, value2):
 
-    value1 = cast_to_float(value1)
-    value2 = cast_to_float(value2)
+    if str(value1).isdigit() and str(value2).isdigit():
+        value1 = cast_to_float(value1)
+        value2 = cast_to_float(value2)
+    else:
+        return 0
 
     if value1 != 0 and value2 != 0:
         percent = (value1 / value2) * 100
     else:
         percent = 0
 
-    return math.trunc(round(percent, 0))
-
-
-def hex_to_int(hex):
-    try:
-        return int(hex, 16)
-    except (ValueError, TypeError):
-        return 0
-
+    return math.trunc(percent)
 
 def parse_xml(unparsed=None):
+    from plexpy import logger
+
     if unparsed:
         try:
             xml_parse = minidom.parseString(unparsed)
             return xml_parse
-        except Exception as e:
+        except Exception, e:
             logger.warn("Error parsing XML. %s" % e)
             return []
         except:
@@ -593,11 +382,10 @@ def parse_xml(unparsed=None):
         logger.warn("XML parse request made but no data received.")
         return []
 
-
+"""
+Validate xml keys to make sure they exist and return their attribute value, return blank value is none found
+"""
 def get_xml_attr(xml_key, attribute, return_bool=False, default_return=''):
-    """
-    Validate xml keys to make sure they exist and return their attribute value, return blank value is none found
-    """
     if xml_key.getAttribute(attribute):
         if return_bool:
             return True
@@ -609,1129 +397,9 @@ def get_xml_attr(xml_key, attribute, return_bool=False, default_return=''):
         else:
             return default_return
 
-
 def process_json_kwargs(json_kwargs):
     params = {}
     if json_kwargs:
         params = json.loads(json_kwargs)
 
     return params
-
-
-def process_datatable_rows(rows, json_data, default_sort, search_cols=None, sort_keys=None):
-    if search_cols is None:
-        search_cols = []
-    if sort_keys is None:
-        sort_keys = {}
-
-    results = []
-
-    total_count = len(rows)
-
-    # Search results
-    search_value = json_data['search']['value'].lower()
-    if search_value:
-        searchable_columns = [d['data'] for d in json_data['columns'] if d['searchable']] + search_cols
-        for row in rows:
-            for k, v in row.items():
-                if k in sort_keys:
-                    value = sort_keys[k].get(v, v)
-                else:
-                    value = v
-                value = str(value).lower()
-                if k in searchable_columns and search_value in value:
-                    results.append(row)
-                    break
-    else:
-        results = rows
-
-    filtered_count = len(results)
-
-    # Sort results
-    results = sorted(results, key=lambda k: k[default_sort].lower())
-    sort_order = json_data['order']
-    for order in reversed(sort_order):
-        sort_key = json_data['columns'][int(order['column'])]['data']
-        reverse = True if order['dir'] == 'desc' else False
-        results = sorted(results, key=lambda k: sort_helper(k, sort_key, sort_keys), reverse=reverse)
-
-    # Paginate results
-    results = results[json_data['start']:(json_data['start'] + json_data['length'])]
-
-    data = {
-        'results': results,
-        'total_count': total_count,
-        'filtered_count': filtered_count
-    }
-
-    return data
-
-
-def sort_helper(k, sort_key, sort_keys):
-    v = k[sort_key]
-    if sort_key in sort_keys:
-        v = sort_keys[sort_key].get(k[sort_key], v)
-    if isinstance(v, str):
-        v = v.lower()
-    return v
-
-
-def sanitize_out(*dargs, **dkwargs):
-    """ Helper decorator that sanitized the output
-    """
-    def rd(function):
-        @wraps(function)
-        def wrapper(*args, **kwargs):
-            return sanitize(function(*args, **kwargs))
-        return wrapper
-    return rd
-
-
-def sanitize(obj):
-    if isinstance(obj, str):
-        return str(obj).replace('<', '&lt;').replace('>', '&gt;')
-    elif isinstance(obj, list):
-        return [sanitize(o) for o in obj]
-    elif isinstance(obj, dict):
-        return {k: sanitize(v) for k, v in obj.items()}
-    elif isinstance(obj, tuple):
-        return tuple(sanitize(list(obj)))
-    else:
-        return obj
-
-
-def is_public_ip(host):
-    ip = is_valid_ip(get_ip(host))
-    ip_version = ip.version()
-    ip_type = ip.iptype()
-    if ip and ip_type != 'LOOPBACK' and (
-            ip_version == 4 and ip_type == 'PUBLIC' or
-            ip_version == 6 and 'LOCAL' not in ip_type):
-        return True
-    return False
-
-
-def get_ip(host):
-    ip_address = ''
-    if is_valid_ip(host):
-        return host
-    elif not re.match(r'^[0-9]+(?:\.[0-9]+){3}(?!\d*-[a-z0-9]{6})$', host):
-        try:
-            ip_address = socket.getaddrinfo(host, None)[0][4][0]
-            logger.debug("IP Checker :: Resolved %s to %s." % (host, ip_address))
-        except:
-            logger.error("IP Checker :: Bad IP or hostname provided: %s." % host)
-    return ip_address
-
-
-def is_valid_ip(address):
-    try:
-        return IP(address)
-    except TypeError:
-        return False
-    except ValueError:
-        return False
-
-
-def whois_lookup(ip_address):
-
-    nets = []
-    err = None
-    try:
-        whois = ipwhois.IPWhois(ip_address).lookup_whois(retry_count=0,
-                                                         asn_methods=['dns', 'whois', 'http'])
-        countries = ipwhois.utils.get_countries()
-        nets = whois['nets']
-        for net in nets:
-            net['country'] = countries.get(net['country'])
-            if net['postal_code']:
-                 net['postal_code'] = net['postal_code'].replace('-', ' ')
-    except ValueError as e:
-        err = 'Invalid IP address provided: %s.' % ip_address
-    except ipwhois.exceptions.IPDefinedError as e:
-        err = '%s' % e
-    except ipwhois.exceptions.ASNRegistryError as e:
-        err = '%s' % e
-    except Exception as e:
-        err = 'Error: %s' % e
-
-    host = ''
-    try:
-        host = ipwhois.Net(ip_address).get_host(retry_count=0)[0]
-    except Exception as e:
-        host = 'Not available'
-
-    whois_info = {"host": host,
-                  "nets": nets
-                  }
-
-    if err:
-        whois_info['error'] = err
-
-    return whois_info
-
-
-def anon_url(*url):
-    # Removed anonymous redirect and just return the URL
-    return '' if None in url else ''.join(str(s) for s in url)
-
-
-def get_img_service(include_self=False):
-    if plexpy.CONFIG.NOTIFY_UPLOAD_POSTERS == 1:
-        return 'imgur'
-    elif plexpy.CONFIG.NOTIFY_UPLOAD_POSTERS == 2 and include_self:
-        return 'self-hosted'
-    elif plexpy.CONFIG.NOTIFY_UPLOAD_POSTERS == 3:
-        return 'cloudinary'
-    else:
-        return None
-
-
-def upload_to_imgur(img_data, img_title='', rating_key='', fallback=''):
-    """ Uploads an image to Imgur """
-    img_url = delete_hash = ''
-
-    if not plexpy.CONFIG.IMGUR_CLIENT_ID:
-        logger.error("Tautulli Helpers :: Cannot upload image to Imgur. No Imgur client id specified in the settings.")
-        return img_url, delete_hash
-
-    headers = {'Authorization': 'Client-ID %s' % plexpy.CONFIG.IMGUR_CLIENT_ID}
-    data = {'image': base64.b64encode(img_data),
-            'title': img_title.encode('utf-8'),
-            'name': str(rating_key) + '.png',
-            'type': 'png'}
-
-    response, err_msg, req_msg = request.request_response2('https://api.imgur.com/3/image', 'POST',
-                                                           headers=headers, data=data)
-
-    if response and not err_msg:
-        logger.debug("Tautulli Helpers :: Image '{}' ({}) uploaded to Imgur.".format(img_title, fallback))
-        imgur_response_data = response.json().get('data')
-        img_url = imgur_response_data.get('link', '').replace('http://', 'https://')
-        delete_hash = imgur_response_data.get('deletehash', '')
-    else:
-        if err_msg:
-            logger.error("Tautulli Helpers :: Unable to upload image '{}' ({}) to Imgur: {}".format(img_title, fallback, err_msg))
-        else:
-            logger.error("Tautulli Helpers :: Unable to upload image '{}' ({}) to Imgur.".format(img_title, fallback))
-
-        if req_msg:
-            logger.debug("Tautulli Helpers :: Request response: {}".format(req_msg))
-
-    return img_url, delete_hash
-
-
-def delete_from_imgur(delete_hash, img_title='', fallback=''):
-    """ Deletes an image from Imgur """
-    if not plexpy.CONFIG.IMGUR_CLIENT_ID:
-        logger.error("Tautulli Helpers :: Cannot delete image from Imgur. No Imgur client id specified in the settings.")
-        return False
-
-    headers = {'Authorization': 'Client-ID %s' % plexpy.CONFIG.IMGUR_CLIENT_ID}
-
-    response, err_msg, req_msg = request.request_response2('https://api.imgur.com/3/image/%s' % delete_hash, 'DELETE',
-                                                           headers=headers)
-
-    if response and not err_msg:
-        logger.debug("Tautulli Helpers :: Image '{}' ({}) deleted from Imgur.".format(img_title, fallback))
-        return True
-    else:
-        if err_msg:
-            logger.error("Tautulli Helpers :: Unable to delete image '{}' ({}) from Imgur: {}".format(img_title, fallback, err_msg))
-        else:
-            logger.error("Tautulli Helpers :: Unable to delete image '{}' ({}) from Imgur.".format(img_title, fallback))
-        return False
-
-
-def upload_to_cloudinary(img_data, img_title='', rating_key='', fallback=''):
-    """ Uploads an image to Cloudinary """
-    img_url = ''
-
-    if not plexpy.CONFIG.CLOUDINARY_CLOUD_NAME or not plexpy.CONFIG.CLOUDINARY_API_KEY or not plexpy.CONFIG.CLOUDINARY_API_SECRET:
-        logger.error("Tautulli Helpers :: Cannot upload image to Cloudinary. Cloudinary settings not specified in the settings.")
-        return img_url
-
-    cloudinary.config(
-        cloud_name=plexpy.CONFIG.CLOUDINARY_CLOUD_NAME,
-        api_key=plexpy.CONFIG.CLOUDINARY_API_KEY,
-        api_secret=plexpy.CONFIG.CLOUDINARY_API_SECRET
-    )
-
-    try:
-        response = upload((img_title, img_data),
-                          public_id='{}_{}'.format(fallback, rating_key),
-                          tags=['tautulli', fallback, str(rating_key)],
-                          context={'title': img_title, 'rating_key': str(rating_key), 'fallback': fallback})
-        logger.debug("Tautulli Helpers :: Image '{}' ({}) uploaded to Cloudinary.".format(img_title, fallback))
-        img_url = response.get('url', '')
-    except Exception as e:
-        logger.error("Tautulli Helpers :: Unable to upload image '{}' ({}) to Cloudinary: {}".format(img_title, fallback, e))
-
-    return img_url
-
-
-def delete_from_cloudinary(rating_key=None, delete_all=False):
-    """ Deletes an image from Cloudinary """
-    if not plexpy.CONFIG.CLOUDINARY_CLOUD_NAME or not plexpy.CONFIG.CLOUDINARY_API_KEY or not plexpy.CONFIG.CLOUDINARY_API_SECRET:
-        logger.error("Tautulli Helpers :: Cannot delete image from Cloudinary. Cloudinary settings not specified in the settings.")
-        return False
-
-    cloudinary.config(
-        cloud_name=plexpy.CONFIG.CLOUDINARY_CLOUD_NAME,
-        api_key=plexpy.CONFIG.CLOUDINARY_API_KEY,
-        api_secret=plexpy.CONFIG.CLOUDINARY_API_SECRET
-    )
-
-    if delete_all:
-        partial = True
-        next_cursor = ''
-        while partial is True:
-            r = delete_resources_by_tag('tautulli', next_cursor=next_cursor)
-            partial = r.get('partial', False)
-            next_cursor = r.get('next_cursor', '')
-        logger.debug("Tautulli Helpers :: Deleted all images from Cloudinary.")
-    elif rating_key:
-        delete_resources_by_tag(str(rating_key))
-        logger.debug("Tautulli Helpers :: Deleted images from Cloudinary with rating_key {}.".format(rating_key))
-    else:
-        logger.debug("Tautulli Helpers :: Unable to delete images from Cloudinary: No rating_key provided.")
-
-    return True
-
-
-def cloudinary_transform(rating_key=None, width=1000, height=1500, opacity=100, background='000000', blur=0,
-                         img_format='png', img_title='', fallback=None):
-    url = ''
-
-    if not plexpy.CONFIG.CLOUDINARY_CLOUD_NAME or not plexpy.CONFIG.CLOUDINARY_API_KEY or not plexpy.CONFIG.CLOUDINARY_API_SECRET:
-        logger.error("Tautulli Helpers :: Cannot transform image on Cloudinary. Cloudinary settings not specified in the settings.")
-        return url
-
-    cloudinary.config(
-        cloud_name=plexpy.CONFIG.CLOUDINARY_CLOUD_NAME,
-        api_key=plexpy.CONFIG.CLOUDINARY_API_KEY,
-        api_secret=plexpy.CONFIG.CLOUDINARY_API_SECRET
-    )
-
-    img_options = {'format': img_format,
-                   'fetch_format': 'auto',
-                   'quality': 'auto',
-                   'version': timestamp(),
-                   'secure': True}
-
-    if width != 1000:
-        img_options['width'] = str(width)
-        img_options['crop'] = 'fill'
-    if height != 1500:
-        img_options['height'] = str(height)
-        img_options['crop'] = 'fill'
-    if opacity != 100:
-        img_options['opacity'] = opacity
-    if background != '000000':
-        img_options['background'] = 'rgb:{}'.format(background)
-    if blur != 0:
-        img_options['effect'] = 'blur:{}'.format(blur * 100)
-
-    try:
-        url, options = cloudinary_url('{}_{}'.format(fallback, rating_key), **img_options)
-        logger.debug("Tautulli Helpers :: Image '{}' ({}) transformed on Cloudinary.".format(img_title, fallback))
-    except Exception as e:
-        logger.error("Tautulli Helpers :: Unable to transform image '{}' ({}) on Cloudinary: {}".format(img_title, fallback, e))
-
-    return url
-
-
-def build_datatables_json(kwargs, dt_columns, default_sort_col=None):
-    """ Builds datatables json data
-
-        dt_columns:    list of tuples [("column name", "orderable", "searchable"), ...]
-    """
-
-    columns = [{"data": c[0], "orderable": c[1], "searchable": c[2]} for c in dt_columns]
-
-    if not default_sort_col:
-        default_sort_col = dt_columns[0][0]
-
-    column_names = [c[0] for c in dt_columns]
-    order_columns = [c.strip() for c in kwargs.pop("order_column", default_sort_col).split(",")]
-    order_dirs = [d.strip() for d in kwargs.pop("order_dir", "desc").split(",")]
-
-    order = []
-    for c, d in zip_longest(order_columns, order_dirs, fillvalue=""):
-        try:
-            order_column = column_names.index(c)
-        except ValueError:
-            continue
-
-        if d.lower() in ("asc", "desc"):
-            order_dir = d.lower()
-        else:
-            order_dir = "desc"
-
-        order.append({"column": order_column, "dir": order_dir})
-
-    # Build json data
-    json_data = {"draw": 1,
-                 "columns": columns,
-                 "order": order,
-                 "start": int(kwargs.pop("start", 0)),
-                 "length": int(kwargs.pop("length", 25)),
-                 "search": {"value": kwargs.pop("search", "")}
-                 }
-    return json.dumps(json_data)
-
-
-def human_file_size(bytes, si=True):
-    if str(bytes).isdigit():
-        bytes = cast_to_float(bytes)
-    else:
-        return bytes
-
-    #thresh = 1000 if si else 1024
-    thresh = 1024  # Always divide by 2^10 but display SI units
-    if bytes < thresh:
-        return str(bytes) + ' B'
-
-    if si:
-        units = ('kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB')
-    else:
-        units = ('KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB')
-
-    u = -1
-
-    while bytes >= thresh and u < len(units):
-        bytes /= thresh
-        u += 1
-
-    return "{0:.2f} {1}".format(bytes, units[u])
-
-
-def parse_condition_logic_string(s, num_cond=0):
-    """ Parse a logic string into a nested list
-    Based on http://stackoverflow.com/a/23185606
-    """
-    valid_tokens = re.compile(r'(\(|\)|and|or)')
-    conditions_pattern = re.compile(r'{\d+}')
-
-    tokens = [x.strip() for x in re.split(valid_tokens, s.lower()) if x.strip()]
-
-    stack = [[]]
-
-    cond_next = True
-    bool_next = False
-    open_bracket_next = True
-    close_bracket_next = False
-    nest_and = 0
-    nest_nest_and = 0
-
-    for i, x in enumerate(tokens):
-        if open_bracket_next and x == '(':
-            stack[-1].append([])
-            stack.append(stack[-1][-1])
-            cond_next = True
-            bool_next = False
-            open_bracket_next = True
-            close_bracket_next = False
-            if nest_and:
-                nest_nest_and += 1
-
-        elif close_bracket_next and x == ')':
-            stack.pop()
-            if not stack:
-                raise ValueError('opening bracket is missing')
-            cond_next = False
-            bool_next = True
-            open_bracket_next = False
-            close_bracket_next = True
-            if nest_and > 0 and nest_nest_and > 0 and nest_and == nest_nest_and:
-                stack.pop()
-                nest_and -= 1
-                nest_nest_and -= 1
-
-        elif cond_next and re.match(conditions_pattern, x):
-            try:
-                num = int(x[1:-1])
-            except:
-                raise ValueError('invalid condition logic')
-            if not 0 < num <= num_cond:
-                raise ValueError('invalid condition number in condition logic')
-            stack[-1].append(num)
-            cond_next = False
-            bool_next = True
-            open_bracket_next = False
-            close_bracket_next = True
-            if nest_and > nest_nest_and:
-                stack.pop()
-                nest_and -= 1
-
-        elif bool_next and x == 'and' and i < len(tokens)-1:
-            stack[-1].append([])
-            stack.append(stack[-1][-1])
-            stack[-1].append(stack[-2].pop(-2))
-            stack[-1].append(x)
-            cond_next = True
-            bool_next = False
-            open_bracket_next = True
-            close_bracket_next = False
-            nest_and += 1
-
-        elif bool_next and x == 'or' and i < len(tokens)-1:
-            stack[-1].append(x)
-            cond_next = True
-            bool_next = False
-            open_bracket_next = True
-            close_bracket_next = False
-
-        else:
-            raise ValueError('invalid condition logic')
-
-    if len(stack) > 1:
-        raise ValueError('closing bracket is missing')
-
-    return stack.pop()
-
-
-def nested_list_to_string(l):
-    for i, x in enumerate(l):
-        if isinstance(x, list):
-            l[i] = nested_list_to_string(x)
-    s = '(' + ' '.join(l) + ')'
-    return s
-
-
-def eval_logic_groups_to_bool(logic_groups, eval_conds):
-    first_cond = logic_groups[0]
-
-    if isinstance(first_cond, list):
-        result = eval_logic_groups_to_bool(first_cond, eval_conds)
-    else:
-        result = eval_conds[first_cond]
-
-    for op, cond in zip(logic_groups[1::2], logic_groups[2::2]):
-        if isinstance(cond, list):
-            eval_cond = eval_logic_groups_to_bool(cond, eval_conds)
-        else:
-            eval_cond = eval_conds[cond]
-
-        if op == 'and':
-            result = result and eval_cond
-        elif op == 'or':
-            result = result or eval_cond
-
-    return result
-
-
-def get_plexpy_url(hostname=None):
-    if plexpy.CONFIG.ENABLE_HTTPS:
-        scheme = 'https'
-    else:
-        scheme = 'http'
-
-    if hostname is None and plexpy.CONFIG.HTTP_HOST in ('0.0.0.0', '::'):
-        # Only returns IPv4 address
-        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-        s.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
-        s.settimeout(0)
-        try:
-            s.connect(('<broadcast>', 1))
-            hostname = s.getsockname()[0]
-        except socket.error:
-            try:
-                hostname = socket.gethostbyname(socket.gethostname())
-            except socket.gaierror:
-                pass
-        finally:
-            s.close()
-
-        if not hostname:
-            hostname = 'localhost'
-    elif hostname == 'localhost' and plexpy.CONFIG.HTTP_HOST not in ('0.0.0.0', '::'):
-        hostname = plexpy.CONFIG.HTTP_HOST
-    else:
-        hostname = hostname or plexpy.CONFIG.HTTP_HOST
-
-    if plexpy.HTTP_PORT not in (80, 443):
-        port = ':' + str(plexpy.HTTP_PORT)
-    else:
-        port = ''
-
-    if plexpy.HTTP_ROOT is not None and plexpy.HTTP_ROOT.strip('/'):
-        root = '/' + plexpy.HTTP_ROOT.strip('/')
-    else:
-        root = ''
-
-    return scheme + '://' + hostname + port + root
-
-
-def momentjs_to_arrow(format, duration=False):
-    invalid_formats = ['Mo', 'DDDo', 'do']
-    if duration:
-        invalid_formats += ['A', 'a']
-    for f in invalid_formats:
-        format = format.replace(f, '')
-    return format
-
-
-def grouper(iterable, n, fillvalue=None):
-    "Collect data into fixed-length chunks or blocks"
-    # grouper('ABCDEFG', 3, 'x') --> ABC DEF Gxx
-    args = [iter(iterable)] * n
-    return zip_longest(fillvalue=fillvalue, *args)
-
-
-def group_by_keys(iterable, keys):
-    if not isinstance(keys, (list, tuple)):
-        keys = [keys]
-
-    key_function = operator.itemgetter(*keys)
-    sorted_iterable = sorted(iterable, key=key_function)
-    return {key: list(group) for key, group in groupby(sorted_iterable, key_function)}
-
-
-def chunk(it, size):
-    it = iter(it)
-    return iter(lambda: tuple(islice(it, size)), ())
-
-
-def traverse_map(obj, func):
-    if isinstance(obj, list):
-        new_obj = []
-        for i in obj:
-            new_obj.append(traverse_map(i, func))
-
-    elif isinstance(obj, dict):
-        new_obj = {}
-        for k, v in obj.items():
-            new_obj[traverse_map(k, func)] = traverse_map(v, func)
-
-    else:
-        new_obj = func(obj)
-
-    return new_obj
-
-
-def split_args(args=None):
-    if isinstance(args, list):
-        return args
-    elif isinstance(args, str):
-        args = shlex.split(args)
-        return args
-    return []
-
-
-def mask_config_passwords(config):
-    if isinstance(config, list):
-        for cfg in config:
-            if 'password' in cfg.get('name', '') and cfg.get('value', '') != '':
-                cfg['value'] = '    '
-
-    elif isinstance(config, dict):
-        for cfg, val in config.items():
-            # Check for a password config keys and if the password is not blank
-            if 'password' in cfg and val != '':
-                # Set the password to blank so it is not exposed in the HTML form
-                config[cfg] = '    '
-
-    return config
-
-
-def bool_true(value, return_none=False):
-    if value is None and return_none:
-        return None
-    elif value is True or value == 1:
-        return True
-    elif isinstance(value, str) and value.lower() in ('1', 'true', 't', 'yes', 'y', 'on'):
-        return True
-    return False
-
-
-def sort_attrs(attr):
-    if isinstance(attr, (list, tuple)):
-        a = attr[0].split('.')
-    else:
-        a = attr.split('.')
-    return len(a), a
-
-
-def sort_obj(obj):
-    if isinstance(obj, list):
-        result_obj = []
-        for item in obj:
-            result_obj.append(sort_obj(item))
-    elif isinstance(obj, dict):
-        result_start = []
-        result_end = []
-        for k, v in obj.items():
-            if isinstance(v, list):
-                for item in v:
-                    if isinstance(item, dict):
-                        result_end.append([k, sort_obj(v)])
-                    else:
-                        result_start.append([k, sort_obj(v)])
-                if not v:
-                    result_end.append([k, v])
-            else:
-                result_start.append([k, sort_obj(v)])
-
-        result_obj = OrderedDict(sorted(result_start) + sorted(result_end))
-    else:
-        result_obj = obj
-
-    return result_obj
-
-
-def get_attrs_to_dict(obj, attrs):
-    d = {}
-
-    for attr, sub in attrs.items():
-        no_attr = False
-
-        if isinstance(obj, dict):
-            value = obj.get(attr, None)
-        else:
-            try:
-                value = getattr(obj, attr)
-            except AttributeError:
-                no_attr = True
-                value = None
-
-        if callable(value):
-            value = value()
-
-        if isinstance(sub, str):
-            if isinstance(value, list):
-                value = [getattr(o, sub, None) for o in value]
-            else:
-                value = getattr(value, sub, None)
-        elif isinstance(sub, dict):
-            if isinstance(value, list):
-                value = [get_attrs_to_dict(o, sub) for o in value] or [get_attrs_to_dict({}, sub)]
-            else:
-                value = get_attrs_to_dict(value, sub)
-        elif callable(sub):
-            if isinstance(value, list):
-                value = [sub(o) for o in value]
-            else:
-                if no_attr:
-                    value = sub(obj)
-                else:
-                    value = sub(value)
-
-        d[attr] = value
-
-    return d
-
-
-def flatten_dict(obj):
-    return flatten_tree(flatten_keys(obj))
-
-
-def flatten_keys(obj, key='', sep='.'):
-    if isinstance(obj, list):
-        new_obj = [flatten_keys(o, key=key) for o in obj]
-    elif isinstance(obj, dict):
-        new_key = key + sep if key else ''
-        new_obj = {new_key + k: flatten_keys(v, key=new_key + k) for k, v in obj.items()}
-    else:
-        new_obj = obj
-
-    return new_obj
-
-
-def flatten_tree(obj, key=''):
-    if isinstance(obj, list):
-        new_rows = []
-
-        for o in obj:
-            if isinstance(o, dict):
-                new_rows.extend(flatten_tree(o))
-            else:
-                new_rows.append({key: o})
-
-    elif isinstance(obj, dict):
-        common_keys = {}
-        all_rows = [[common_keys]]
-
-        for k, v in obj.items():
-            if isinstance(v, list):
-                all_rows.append(flatten_tree(v, k))
-            elif isinstance(v, dict):
-                common_keys.update(*flatten_tree(v))
-            else:
-                common_keys[k] = v
-
-        new_rows = [{k: v for r in row for k, v in r.items()}
-                    for row in zip_longest(*all_rows, fillvalue={})]
-
-    else:
-        new_rows = []
-
-    return new_rows
-
-
-# https://stackoverflow.com/a/14692747
-def get_by_path(root, items):
-    """Access a nested object in root by item sequence."""
-    return reduce(operator.getitem, items, root)
-
-
-def set_by_path(root, items, value):
-    """Set a value in a nested object in root by item sequence."""
-    get_by_path(root, items[:-1])[items[-1]] = value
-
-
-def get_dict_value_by_path(root, attr):
-    split_attr = attr.split('.')
-    value = get_by_path(root, split_attr)
-    for _attr in reversed(split_attr):
-        value = {_attr: value}
-    return value
-
-
-# https://stackoverflow.com/a/7205107
-def dict_merge(a, b, path=None):
-    if path is None:
-        path = []
-    for key in b:
-        if key in a:
-            if isinstance(a[key], dict) and isinstance(b[key], dict):
-                dict_merge(a[key], b[key], path + [str(key)])
-            elif a[key] == b[key]:
-                pass
-            else:
-                pass
-        else:
-            a[key] = b[key]
-    return a
-
-
-#https://stackoverflow.com/a/26853961
-def dict_update(*dict_args):
-    """
-    Given any number of dictionaries, shallow copy and merge into a new dict,
-    precedence goes to key value pairs in latter dictionaries.
-    """
-    result = {}
-    for dictionary in dict_args:
-        result.update(dictionary)
-    return result
-
-
-# https://stackoverflow.com/a/28703510
-def escape_xml(value):
-    if value is None:
-        return ''
-
-    value = str(value) \
-        .replace("&", "&amp;") \
-        .replace("<", "&lt;") \
-        .replace(">", "&gt;") \
-        .replace('"', "&quot;") \
-        .replace("'", "&apos;")
-    return value
-
-
-# https://gist.github.com/reimund/5435343/
-def dict_to_xml(d, root_node=None, indent=None, level=0):
-    line_break = '' if indent is None else '\n'
-    wrap = not bool(root_node is None or isinstance(d, list))
-    root = root_node or 'objects'
-    root_singular = root[:-1] if root.endswith('s') and isinstance(d, list) else root
-    xml = ''
-    children = []
-
-    if isinstance(d, dict):
-        for key, value in sorted(d.items()):
-            if isinstance(value, dict):
-                children.append(dict_to_xml(value, key, indent, level + 1))
-            elif isinstance(value, list):
-                children.append(dict_to_xml(value, key, indent, level + 1))
-            else:
-                xml = '{} {}="{}"'.format(xml, key, escape_xml(value))
-    elif isinstance(d, list):
-        for value in d:
-            # Custom tag replacement for collections/playlists
-            if isinstance(value, dict) and root in ('children', 'items'):
-                root_singular = value.get('type', root_singular)
-            children.append(dict_to_xml(value, root_singular, indent, level))
-    else:
-        children.append(escape_xml(d))
-
-    end_tag = '>' if len(children) > 0 else '/>'
-    end_tag += line_break if isinstance(d, list) or isinstance(d, dict) else ''
-    spaces = ' ' * level * (indent or 0)
-
-    if wrap or isinstance(d, dict):
-        xml = '{}<{}{}{}'.format(spaces, root, xml, end_tag)
-
-    if len(children) > 0:
-        for child in children:
-            xml = '{}{}'.format(xml, child)
-
-        if wrap or isinstance(d, dict):
-            spaces = spaces if isinstance(d, dict) else ''
-            xml = '{}{}</{}>{}'.format(xml, spaces, root, line_break)
-
-    return xml
-
-
-def move_to_front(l, value):
-    try:
-        l.insert(0, l.pop(l.index(value)))
-    except (ValueError, IndexError):
-        pass
-    return l
-
-
-def is_hdr(bit_depth, color_trc):
-    bit_depth = cast_to_int(bit_depth)
-    return bit_depth > 8 and (color_trc == 'smpte2084' or color_trc == 'arib-std-b67')
-
-
-def version_to_tuple(version):
-    return tuple(cast_to_int(v) for v in version.strip('v').replace('-', '.').split('.'))
-
-
-# https://stackoverflow.com/a/1855118
-def zipdir(path, ziph):
-    # ziph is zipfile handle
-    for root, dirs, files in os.walk(path):
-        for file in files:
-            ziph.write(os.path.join(root, file),
-                       arcname=os.path.relpath(os.path.join(root, file),
-                                               os.path.join(path, '.')))
-
-
-def page(endpoint, *args, **kwargs):
-    endpoints = {
-        'pms_image_proxy': pms_image_proxy,
-        'info': info_page,
-        'library': library_page,
-        'user': user_page
-    }
-
-    params = {}
-
-    if endpoint in endpoints:
-        params = endpoints[endpoint](*args, **kwargs)
-
-    return endpoint + '?' + urlencode(params)
-
-
-def pms_image_proxy(img=None, rating_key=None, width=None, height=None,
-                    opacity=None, background=None, blur=None, img_format=None,
-                    fallback=None, refresh=None, clip=None):
-    params = {}
-
-    if img is not None:
-        params['img'] = img
-    if rating_key is not None:
-        params['rating_key'] = rating_key
-    if width is not None:
-        params['width'] = width
-    if height is not None:
-        params['height'] = height
-    if opacity is not None:
-        params['opacity'] = opacity
-    if background is not None:
-        params['background'] = background
-    if blur is not None:
-        params['blur'] = blur
-    if img_format is not None:
-        params['img_format'] = img_format
-    if fallback is not None:
-        params['fallback'] = fallback
-    if refresh is not None:
-        params['refresh'] = 'true'
-    if clip is not None:
-        params['clip'] = 'true'
-
-    return params
-
-
-def info_page(rating_key=None, guid=None, history=None, live=None):
-    params = {}
-
-    if live and history:
-        params['guid'] = guid
-    else:
-        params['rating_key'] = rating_key
-
-    if history:
-        params['source'] = 'history'
-
-    return params
-
-
-def library_page(section_id=None):
-    params = {}
-
-    if section_id is not None:
-        params['section_id'] = section_id
-
-    return params
-
-
-def user_page(user_id=None, user=None):
-    params = {}
-
-    if user_id is not None:
-        params['user_id'] = user_id
-    if user is not None:
-        params['user'] = user
-
-    return params
-
-
-def browse_path(path=None, include_hidden=False, filter_ext=''):
-    output = []
-
-    if os.name == 'nt' and path.lower() == 'my computer':
-        drives = ['%s:\\' % d for d in string.ascii_uppercase if os.path.exists('%s:' % d)]
-        for drive in drives:
-            out = {
-                'key': base64.b64encode(drive.encode('UTF-8')),
-                'path': drive,
-                'title': drive,
-                'type': 'folder',
-                'icon': 'folder'
-            }
-            output.append(out)
-
-    if os.path.isfile(path):
-        path = os.path.dirname(path)
-
-    if not os.path.isdir(path):
-        return output
-
-    if path != os.path.dirname(path):
-        parent_path = os.path.dirname(path)
-        out = {
-            'key': base64.b64encode(parent_path.encode('UTF-8')),
-            'path': parent_path,
-            'title': '..',
-            'type': 'folder',
-            'icon': 'level-up-alt'
-        }
-        output.append(out)
-    elif os.name == 'nt':
-        parent_path = 'My Computer'
-        out = {
-            'key': base64.b64encode(parent_path.encode('UTF-8')),
-            'path': parent_path,
-            'title': parent_path,
-            'type': 'folder',
-            'icon': 'level-up-alt'
-        }
-        output.append(out)
-
-    for root, dirs, files in os.walk(path):
-        for d in sorted(dirs):
-            if not include_hidden and d.startswith('.'):
-                continue
-            dir_path = os.path.join(root, d)
-            out = {
-                'key': base64.b64encode(dir_path.encode('UTF-8')),
-                'path': dir_path,
-                'title': d,
-                'type': 'folder',
-                'icon': 'folder'
-            }
-            output.append(out)
-
-        if filter_ext == '.folderonly':
-            break
-
-        for f in sorted(files):
-            if not include_hidden and f.startswith('.'):
-                continue
-            if filter_ext and not f.endswith(filter_ext):
-                continue
-            file_path = os.path.join(root, f)
-            out = {
-                'key': base64.b64encode(file_path.encode('UTF-8')),
-                'path': file_path,
-                'title': f,
-                'type': 'file',
-                'icon': 'file'
-            }
-            output.append(out)
-
-        break
-
-    return output
-
-
-def delete_file(file_path):
-    logger.info("Tautulli Helpers :: Deleting file: %s", file_path)
-    try:
-        os.remove(file_path)
-        return True
-    except OSError:
-        logger.error("Tautulli Helpers :: Failed to delete file: %s", file_path)
-        return False
-
-
-def short_season(title):
-    if title.startswith('Season ') and title[7:].isdigit():
-        return 'S%s' % title[7:]
-    return title
-
-
-def get_first_final_marker(markers):
-    first = None
-    final = None
-    for marker in markers:
-        if marker['first']:
-            first = marker
-        if marker['final']:
-            final = marker
-    return first, final
-
-
-def check_watched(media_type, view_offset, duration, marker_credits_first=None, marker_credits_final=None):
-    if isinstance(marker_credits_first, dict):
-        marker_credits_first = marker_credits_first['start_time_offset']
-    if isinstance(marker_credits_final, dict):
-        marker_credits_final = marker_credits_final['start_time_offset']
-
-    view_offset = cast_to_int(view_offset)
-    duration = cast_to_int(duration)
-
-    watched_percent = {
-        'movie': plexpy.CONFIG.MOVIE_WATCHED_PERCENT,
-        'episode': plexpy.CONFIG.TV_WATCHED_PERCENT,
-        'track': plexpy.CONFIG.MUSIC_WATCHED_PERCENT,
-        'clip': plexpy.CONFIG.TV_WATCHED_PERCENT
-    }
-    threshold = watched_percent.get(media_type, 0) / 100 * duration
-    if not threshold:
-        return False
-
-    if plexpy.CONFIG.WATCHED_MARKER == 1 and marker_credits_final:
-        return view_offset >= marker_credits_final
-    elif plexpy.CONFIG.WATCHED_MARKER == 2 and marker_credits_first:
-        return view_offset >= marker_credits_first
-    elif plexpy.CONFIG.WATCHED_MARKER == 3 and marker_credits_first:
-        return view_offset >= min(threshold, marker_credits_first)
-    else:
-        return view_offset >= threshold
-
-
-def pms_name():
-    return plexpy.CONFIG.PMS_NAME_OVERRIDE or plexpy.CONFIG.PMS_NAME
-
-
-def ip_type(ip: str) -> str:
-    try:
-        return "IPv4" if type(ip_address(ip)) is IPv4Address else "IPv6"
-    except ValueError:
-        return "Invalid"
-
-
-def get_ipv6_network_address(ip: str) -> str:
-    cidr = "/64"
-    cidr_pattern = re.compile(r'^/(1([0-1]\d|2[0-8]))$|^/(\d\d)$|^/[1-9]$')
-    if cidr_pattern.match(plexpy.CONFIG.NOTIFY_CONCURRENT_IPV6_CIDR):
-        cidr = plexpy.CONFIG.NOTIFY_CONCURRENT_IPV6_CIDR
-    return str(ip_network(ip+cidr, strict=False).network_address)
diff --git a/plexpy/http_handler.py b/plexpy/http_handler.py
index 3ba32a6e..abcf7ec7 100644
--- a/plexpy/http_handler.py
+++ b/plexpy/http_handler.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # This file is part of PlexPy.
@@ -15,16 +16,10 @@
 #  You should have received a copy of the GNU General Public License
 #  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
-from multiprocessing.dummy import Pool as ThreadPool
-from urllib.parse import urljoin
-
-import certifi
-import requests
-import urllib3
-
-import plexpy
-from plexpy import helpers
-from plexpy import logger
+from plexpy import logger, helpers
+from httplib import HTTPSConnection
+from httplib import HTTPConnection
+import ssl
 
 
 class HTTPHandler(object):
@@ -32,193 +27,91 @@ class HTTPHandler(object):
     Retrieve data from Plex Server
     """
 
-    def __init__(self, urls, headers=None, token=None, timeout=10, ssl_verify=True, silent=False):
-        self._valid_request_types = {'GET', 'POST', 'PUT', 'DELETE'}
-        self._silent = silent
-
-        if isinstance(urls, str):
-            self.urls = urls.split() or urls.split(',')
-        else:
-            self.urls = urls
-
-        if headers:
-            self.headers = headers
-        else:
-            self.headers = {
-                'X-Plex-Product': plexpy.common.PRODUCT,
-                'X-Plex-Version': plexpy.common.RELEASE,
-                'X-Plex-Client-Identifier': plexpy.CONFIG.PMS_CLIENT_ID or plexpy.CONFIG.PMS_UUID,
-                'X-Plex-Platform': plexpy.common.PLATFORM,
-                'X-Plex-Platform-Version': plexpy.common.PLATFORM_RELEASE,
-                'X-Plex-Device': '{} {}'.format(plexpy.common.PLATFORM,
-                                                plexpy.common.PLATFORM_RELEASE),
-                'X-Plex-Device-Name': '{} ({})'.format(plexpy.common.PLATFORM_DEVICE_NAME,
-                                                       plexpy.common.PRODUCT),
-                'X-Plex-Language': plexpy.CONFIG.PMS_LANGUAGE or plexpy.SYS_LANGUAGE
-            }
-
+    def __init__(self, host, port, token, ssl_verify=True):
+        self.host = host
+        self.port = str(port)
         self.token = token
-        if self.token:
-            self.headers['X-Plex-Token'] = self.token
+        self.ssl_verify = ssl_verify
 
-        self._session = requests.Session()
-        self.timeout = timeout
-        self.ssl_verify = certifi.where() if ssl_verify else False
-        if not self.ssl_verify:
-            urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
-
-        self.uri = None
-        self.data = None
-        self.request_type = 'GET'
-        self.output_format = 'raw'
-        self.return_response = False
-        self.return_type = False
-        self.callback = None
-        self.raise_errors = True
-        self.request_kwargs = {}
+    """
+    Handle the HTTP requests.
 
+    Output: object
+    """
     def make_request(self,
-                     uri=None,
-                     headers=None,
-                     data=None,
+                     uri=None, proto='HTTP',
                      request_type='GET',
+                     headers=None,
                      output_format='raw',
-                     return_response=False,
                      return_type=False,
-                     no_token=False,
-                     timeout=None,
-                     callback=None,
-                     raise_errors=True,
-                     **request_kwargs):
-        """
-        Handle the HTTP requests.
+                     no_token=False):
 
-        Output: list
-        """
+        valid_request_types = ['GET', 'POST', 'PUT', 'DELETE']
 
-        self.uri = str(uri)
-        self.data = data
-        self.request_type = request_type.upper()
-        self.output_format = output_format.lower()
-        self.return_response = return_response
-        self.return_type = return_type
-        self.callback = callback
-        self.raise_errors = raise_errors
-        self.timeout = timeout or self.timeout
-        self.request_kwargs = request_kwargs
-
-        if self.request_type not in self._valid_request_types:
-            logger.debug("HTTP request made but unsupported request type given.")
+        if request_type.upper() not in valid_request_types:
+            logger.debug(u"HTTP request made but unsupported request type given.")
             return None
 
         if uri:
-            request_urls = [urljoin(str(url), self.uri) for url in self.urls]
+            if proto.upper() == 'HTTPS':
+                if not self.ssl_verify and hasattr(ssl, '_create_unverified_context'):
+                    context = ssl._create_unverified_context()
+                    handler = HTTPSConnection(host=self.host, port=self.port, timeout=10, context=context)
+                    logger.warn(u"PlexPy HTTP Handler :: Unverified HTTPS request made. This connection is not secure.")
+                else:
+                    handler = HTTPSConnection(host=self.host, port=self.port, timeout=10)
+            else:
+                handler = HTTPConnection(host=self.host, port=self.port, timeout=10)
 
-            if no_token:
-                self.headers.pop('X-Plex-Token', None)
-            if headers:
-                self.headers.update(headers)
-
-            responses = []
-            for r in self._http_requests_pool(request_urls):
-                responses.append(r)
-
-            return responses[0]
-
-        else:
-            logger.debug("HTTP request made but no uri endpoint provided.")
-            return None
-
-    def _http_requests_pool(self, urls, workers=10, chunk=None):
-        """Generator function to request urls in chunks"""
-        # From cpython
-        if chunk is None:
-            chunk, extra = divmod(len(urls), workers * 4)
-            if extra:
-                chunk += 1
-            if len(urls) == 0:
-                chunk = 0
-
-        if len(urls) == 1:
-            yield self._http_requests_single(urls[0])
-        else:
-            pool = ThreadPool(workers)
+            token_string = ''
+            if not no_token:
+                if uri.find('?') > 0:
+                    token_string = '&X-Plex-Token=' + self.token
+                else:
+                    token_string = '?X-Plex-Token=' + self.token
 
             try:
-                for work in pool.imap_unordered(self._http_requests_single, urls, chunk):
-                    yield work
-            except Exception as e:
-                if not self._silent:
-                    logger.error("Failed to yield request: %s" % e)
-            finally:
-                pool.close()
-                pool.join()
+                if headers:
+                    handler.request(request_type, uri + token_string, headers=headers)
+                else:
+                    handler.request(request_type, uri + token_string)
+                response = handler.getresponse()
+                request_status = response.status
+                request_content = response.read()
+                content_type = response.getheader('content-type')
+            except IOError, e:
+                logger.warn(u"Failed to access uri endpoint %s with error %s" % (uri, e))
+                return None
+            except Exception, e:
+                logger.warn(u"Failed to access uri endpoint %s. Is your server maybe accepting SSL connections only? %s" % (uri, e))
+                return None
+            except:
+                logger.warn(u"Failed to access uri endpoint %s with Uncaught exception." % uri)
+                return None
 
-    def _http_requests_single(self, url):
-        """Request the data from the url"""
-        err = False
-        error_msg = "Failed to access uri endpoint %s. " % self.uri
-        try:
-            r = self._session.request(self.request_type, url, headers=self.headers, data=self.data,
-                                      timeout=self.timeout, verify=self.ssl_verify, **self.request_kwargs)
-            if self.raise_errors:
-                r.raise_for_status()
-        except requests.exceptions.Timeout as e:
-            err = True
-            if not self._silent:
-                logger.error(error_msg + "Request timed out: %s", e)
-        except requests.exceptions.SSLError as e:
-            err = True
-            if not self._silent:
-                logger.error(error_msg + "Is your server maybe accepting SSL connections only? %s", e)
-        except requests.exceptions.HTTPError as e:
-            err = True
-            if not self._silent:
-                logger.error(error_msg + "Status code %s", e)
-        except requests.exceptions.ConnectionError as e:
-            err = True
-            if not self._silent:
-                logger.error(error_msg + "Connection error: %s", e)
-        except requests.exceptions.RequestException as e:
-            err = True
-            if not self._silent:
-                logger.error(error_msg + "Uncaught exception: %s", e)
+            if request_status == 200:
+                try:
+                    if output_format == 'dict':
+                        output = helpers.convert_xml_to_dict(request_content)
+                    elif output_format == 'json':
+                        output = helpers.convert_xml_to_json(request_content)
+                    elif output_format == 'xml':
+                        output = helpers.parse_xml(request_content)
+                    else:
+                        output = request_content
 
-        if self.return_response:
-            return r
-        elif err:
-            return None
+                    if return_type:
+                        return output, content_type
 
-        response_status = r.status_code
-        response_content = r.content
-        response_headers = r.headers
+                    return output
 
-        if response_status in (200, 201):
-            return self._http_format_output(response_content, response_headers)
+                except Exception as e:
+                    logger.warn(u"Failed format response from uri %s to %s error %s" % (uri, output_format, e))
+                    return None
 
-    def _http_format_output(self, response_content, response_headers):
-        """Formats the request response to the desired type"""
-        try:
-            if self.output_format == 'text':
-                output = response_content.decode('utf-8', 'ignore')
-            elif self.output_format == 'dict':
-                output = helpers.convert_xml_to_dict(response_content)
-            elif self.output_format == 'json':
-                output = helpers.convert_xml_to_json(response_content)
-            elif self.output_format == 'xml':
-                output = helpers.parse_xml(response_content)
             else:
-                output = response_content
-
-            if self.callback:
-                return self.callback(output)
-
-            if self.return_type:
-                return output, response_headers['Content-Type']
-
-            return output
-
-        except Exception as e:
-            if not self._silent:
-                logger.warn("Failed format response from uri %s to %s error %s" % (self.uri, self.output_format, e))
+                logger.warn(u"Failed to access uri endpoint %s. Status code %r" % (uri, request_status))
+                return None
+        else:
+            logger.debug(u"HTTP request made but no enpoint given.")
             return None
diff --git a/plexpy/libraries.py b/plexpy/libraries.py
deleted file mode 100644
index 454f6128..00000000
--- a/plexpy/libraries.py
+++ /dev/null
@@ -1,1192 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# This file is part of Tautulli.
-#
-#  Tautulli is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  Tautulli 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
-
-import json
-import os
-
-import plexpy
-from plexpy import common
-from plexpy import database
-from plexpy import datatables
-from plexpy import helpers
-from plexpy import logger
-from plexpy import plextv
-from plexpy import pmsconnect
-from plexpy import session
-from plexpy import users
-from plexpy.plex import Plex
-
-
-def refresh_libraries():
-    logger.info("Tautulli Libraries :: Requesting libraries list refresh...")
-
-    server_id = plexpy.CONFIG.PMS_IDENTIFIER
-    if not server_id:
-        logger.error("Tautulli Libraries :: No PMS identifier, cannot refresh libraries. Verify server in settings.")
-        return
-
-    library_sections = pmsconnect.PmsConnect().get_library_details()
-
-    if library_sections:
-        monitor_db = database.MonitorDatabase()
-
-        library_keys = []
-        new_keys = []
-
-        # Keep track of section_id to update is_active status
-        section_ids = [common.LIVE_TV_SECTION_ID]  # Live TV library always considered active
-
-        for section in library_sections:
-            section_ids.append(helpers.cast_to_int(section['section_id']))
-
-            section_keys = {'server_id': server_id,
-                            'section_id': section['section_id']}
-            section_values = {'server_id': server_id,
-                              'section_id': section['section_id'],
-                              'section_name': section['section_name'],
-                              'section_type': section['section_type'],
-                              'agent': section['agent'],
-                              'thumb': section['thumb'],
-                              'art': section['art'],
-                              'count': section['count'],
-                              'parent_count': section.get('parent_count', None),
-                              'child_count': section.get('child_count', None),
-                              'is_active': section['is_active']
-                              }
-
-            result = monitor_db.upsert('library_sections', key_dict=section_keys, value_dict=section_values)
-
-            library_keys.append(section['section_id'])
-
-            if result == 'insert':
-                new_keys.append(section['section_id'])
-
-        add_live_tv_library(refresh=True)
-
-        query = "UPDATE library_sections SET is_active = 0 WHERE server_id != ? OR " \
-                "section_id NOT IN ({})".format(", ".join(["?"] * len(section_ids)))
-        monitor_db.action(query=query, args=[plexpy.CONFIG.PMS_IDENTIFIER] + section_ids)
-
-        new_keys = plexpy.CONFIG.HOME_LIBRARY_CARDS + new_keys
-        plexpy.CONFIG.__setattr__('HOME_LIBRARY_CARDS', new_keys)
-        plexpy.CONFIG.write()
-
-        logger.info("Tautulli Libraries :: Libraries list refreshed.")
-        return True
-    else:
-        logger.warn("Tautulli Libraries :: Unable to refresh libraries list.")
-        return False
-
-
-def add_live_tv_library(refresh=False):
-    monitor_db = database.MonitorDatabase()
-    result = monitor_db.select_single("SELECT * FROM library_sections "
-                                      "WHERE section_id = ? and server_id = ?",
-                                      [common.LIVE_TV_SECTION_ID, plexpy.CONFIG.PMS_IDENTIFIER])
-
-    if result and not refresh or not result and refresh:
-        return
-
-    if not refresh:
-        logger.info("Tautulli Libraries :: Adding Live TV library to the database.")
-
-    section_keys = {'server_id': plexpy.CONFIG.PMS_IDENTIFIER,
-                    'section_id': common.LIVE_TV_SECTION_ID}
-    section_values = {'server_id': plexpy.CONFIG.PMS_IDENTIFIER,
-                      'section_id': common.LIVE_TV_SECTION_ID,
-                      'section_name': common.LIVE_TV_SECTION_NAME,
-                      'section_type': 'live',
-                      'thumb': common.DEFAULT_LIVE_TV_THUMB,
-                      'art': common.DEFAULT_LIVE_TV_ART_FULL,
-                      'is_active': 1
-                      }
-
-    result = monitor_db.upsert('library_sections', key_dict=section_keys, value_dict=section_values)
-
-
-def has_library_type(section_type):
-    monitor_db = database.MonitorDatabase()
-    query = "SELECT * FROM library_sections WHERE section_type = ? AND deleted_section = 0"
-    args = [section_type]
-    result = monitor_db.select_single(query=query, args=args)
-    return bool(result)
-
-
-def get_collections(section_id=None):
-    plex = Plex(token=session.get_session_user_token())
-    library = plex.get_library(section_id)
-
-    if library.type not in ('movie', 'show', 'artist'):
-        return []
-
-    collections = library.collections()
-
-    collections_list = []
-    for collection in collections:
-        collection._autoReload = False
-
-        collection_mode = collection.collectionMode
-        if collection_mode is None:
-            collection_mode = -1
-
-        collection_sort = collection.collectionSort
-        if collection_sort is None:
-            collection_sort = 0
-
-        collection_dict = {
-            'addedAt': helpers.datetime_to_iso(collection.addedAt),
-            'art': collection.art,
-            'childCount': collection.childCount,
-            'collectionMode': collection_mode,
-            'collectionPublished': collection.collectionPublished,
-            'collectionSort': collection_sort,
-            'contentRating': collection.contentRating,
-            'guid': collection.guid,
-            'librarySectionID': collection.librarySectionID,
-            'librarySectionTitle': collection.librarySectionTitle,
-            'maxYear': collection.maxYear,
-            'minYear': collection.minYear,
-            'ratingKey': collection.ratingKey,
-            'smart': collection.smart,
-            'subtype': collection.subtype,
-            'summary': collection.summary,
-            'thumb': collection.thumb,
-            'title': collection.title,
-            'titleSort': collection.titleSort or collection.title,
-            'type': collection.type,
-            'updatedAt': helpers.datetime_to_iso(collection.updatedAt)
-        }
-        collections_list.append(collection_dict)
-
-    return collections_list
-
-
-def get_collections_list(section_id=None, **kwargs):
-    if not section_id:
-        default_return = {'recordsFiltered': 0,
-                          'recordsTotal': 0,
-                          'draw': 0,
-                          'data': []}
-        return default_return
-
-    collections = get_collections(section_id=section_id)
-
-    # Get datatables JSON data
-    json_data = helpers.process_json_kwargs(json_kwargs=kwargs['json_data'])
-
-    search_cols = ['title']
-
-    sort_keys = {
-        'collectionMode': {
-            -1: 'Library Default',
-            0: 'Hide collection',
-            1: 'Hide items in this collection',
-            2: 'Show this collection and its items'
-        },
-        'collectionSort': {
-            0: 'Release date',
-            1: 'Alphabetical',
-            2: 'Custom'
-        }
-    }
-
-    results = helpers.process_datatable_rows(
-        collections, json_data, default_sort='titleSort',
-        search_cols=search_cols, sort_keys=sort_keys)
-
-    data = {
-        'recordsFiltered': results['filtered_count'],
-        'recordsTotal': results['total_count'],
-        'data': results['results'],
-        'draw': int(json_data['draw'])
-    }
-
-    return data
-
-
-def get_playlists(section_id=None, user_id=None):
-    if user_id and not session.get_session_user_id():
-        user_tokens = users.Users().get_tokens(user_id=user_id)
-        plex_token = user_tokens['server_token']
-    else:
-        plex_token = session.get_session_user_token()
-
-    if not plex_token:
-        return []
-
-    plex = Plex(token=plex_token)
-
-    if user_id:
-        playlists = plex.PlexServer.playlists()
-    else:
-        library = plex.get_library(section_id)
-        playlists = library.playlists()
-
-    playlists_list = []
-    for playlist in playlists:
-        playlist._autoReload = False
-
-        playlist_dict = {
-            'addedAt': helpers.datetime_to_iso(playlist.addedAt),
-            'composite': playlist.composite,
-            'duration': playlist.duration,
-            'guid': playlist.guid,
-            'leafCount': playlist.leafCount,
-            'librarySectionID': section_id,
-            'playlistType': playlist.playlistType,
-            'ratingKey': playlist.ratingKey,
-            'smart': playlist.smart,
-            'summary': playlist.summary,
-            'title': playlist.title,
-            'type': playlist.type,
-            'updatedAt': helpers.datetime_to_iso(playlist.updatedAt),
-            'userID': user_id
-        }
-        playlists_list.append(playlist_dict)
-
-    return playlists_list
-
-
-def get_playlists_list(section_id=None, user_id=None, **kwargs):
-    if not section_id and not user_id:
-        default_return = {'recordsFiltered': 0,
-                          'recordsTotal': 0,
-                          'draw': 0,
-                          'data': []}
-        return default_return
-
-    playlists = get_playlists(section_id=section_id, user_id=user_id)
-
-    # Get datatables JSON data
-    json_data = helpers.process_json_kwargs(json_kwargs=kwargs['json_data'])
-
-    results = helpers.process_datatable_rows(
-        playlists, json_data, default_sort='title')
-
-    data = {
-        'recordsFiltered': results['filtered_count'],
-        'recordsTotal': results['total_count'],
-        'data': results['results'],
-        'draw': int(json_data['draw'])
-    }
-
-    return data
-
-
-class Libraries(object):
-
-    def __init__(self):
-        pass
-
-    def get_datatables_list(self, kwargs=None, grouping=None):
-        default_return = {'recordsFiltered': 0,
-                          'recordsTotal': 0,
-                          'draw': 0,
-                          'data': []}
-
-        data_tables = datatables.DataTables()
-
-        custom_where = [['library_sections.deleted_section', 0]]
-
-        if grouping is None:
-            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
-
-        if session.get_session_shared_libraries():
-            custom_where.append(['library_sections.section_id', session.get_session_shared_libraries()])
-
-        group_by = 'session_history.reference_id' if grouping else 'session_history.id'
-
-        columns = ["library_sections.id AS row_id",
-                   "library_sections.server_id",
-                   "library_sections.section_id",
-                   "library_sections.section_name",
-                   "library_sections.section_type",
-                   "library_sections.count",
-                   "library_sections.parent_count",
-                   "library_sections.child_count",
-                   "library_sections.thumb AS library_thumb",
-                   "library_sections.custom_thumb_url AS custom_thumb",
-                   "library_sections.art AS library_art",
-                   "library_sections.custom_art_url AS custom_art",
-                   "COUNT(DISTINCT %s) AS plays" % group_by,
-                   "SUM(CASE WHEN session_history.stopped > 0 THEN (session_history.stopped - session_history.started) \
-                    ELSE 0 END) - SUM(CASE WHEN session_history.paused_counter IS NULL THEN 0 ELSE \
-                    session_history.paused_counter END) AS duration",
-                   "MAX(session_history.started) AS last_accessed",
-                   "MAX(session_history.id) AS history_row_id",
-                   "session_history_metadata.full_title AS last_played",
-                   "session_history.rating_key",
-                   "session_history_metadata.media_type",
-                   "session_history_metadata.thumb",
-                   "session_history_metadata.parent_thumb",
-                   "session_history_metadata.grandparent_thumb",
-                   "session_history_metadata.parent_title",
-                   "session_history_metadata.year",
-                   "session_history_metadata.media_index",
-                   "session_history_metadata.parent_media_index",
-                   "session_history_metadata.content_rating",
-                   "session_history_metadata.labels",
-                   "session_history_metadata.live",
-                   "session_history_metadata.added_at",
-                   "session_history_metadata.originally_available_at",
-                   "session_history_metadata.guid",
-                   "library_sections.do_notify",
-                   "library_sections.do_notify_created",
-                   "library_sections.keep_history",
-                   "library_sections.is_active"
-                   ]
-        try:
-            query = data_tables.ssp_query(table_name='library_sections',
-                                          columns=columns,
-                                          custom_where=custom_where,
-                                          group_by=['library_sections.server_id', 'library_sections.section_id'],
-                                          join_types=['LEFT OUTER JOIN',
-                                                      'LEFT OUTER JOIN',
-                                                      'LEFT OUTER JOIN'],
-                                          join_tables=['session_history',
-                                                       'session_history_metadata',
-                                                       'session_history_media_info'],
-                                          join_evals=[['session_history.section_id', 'library_sections.section_id'],
-                                                      ['session_history.id', 'session_history_metadata.id'],
-                                                      ['session_history.id', 'session_history_media_info.id']],
-                                          kwargs=kwargs)
-        except Exception as e:
-            logger.warn("Tautulli Libraries :: Unable to execute database query for get_list: %s." % e)
-            return default_return
-
-        result = query['result']
-
-        rows = []
-        for item in result:
-            if item['media_type'] == 'episode' and item['parent_thumb']:
-                thumb = item['parent_thumb']
-            elif item['media_type'] == 'episode':
-                thumb = item['grandparent_thumb']
-            else:
-                thumb = item['thumb']
-
-            if item['custom_thumb'] and item['custom_thumb'] != item['library_thumb']:
-                library_thumb = item['custom_thumb']
-            elif item['library_thumb']:
-                library_thumb = item['library_thumb']
-            else:
-                library_thumb = common.DEFAULT_COVER_THUMB
-
-            if item['custom_art'] and item['custom_art'] != item['library_art']:
-                library_art = item['custom_art']
-            else:
-                library_art = item['library_art']
-
-            row = {'row_id': item['row_id'],
-                   'server_id': item['server_id'],
-                   'section_id': item['section_id'],
-                   'section_name': item['section_name'],
-                   'section_type': item['section_type'],
-                   'count': item['count'],
-                   'parent_count': item['parent_count'],
-                   'child_count': item['child_count'],
-                   'library_thumb': library_thumb,
-                   'library_art': library_art,
-                   'plays': item['plays'],
-                   'duration': item['duration'],
-                   'last_accessed': item['last_accessed'],
-                   'history_row_id': item['history_row_id'],
-                   'last_played': item['last_played'],
-                   'rating_key': item['rating_key'],
-                   'media_type': item['media_type'],
-                   'thumb': thumb,
-                   'parent_title': item['parent_title'],
-                   'year': item['year'],
-                   'media_index': item['media_index'],
-                   'parent_media_index': item['parent_media_index'],
-                   'content_rating': item['content_rating'],
-                   'labels': item['labels'].split(';') if item['labels'] else (),
-                   'live': item['live'],
-                   'originally_available_at': item['originally_available_at'],
-                   'guid': item['guid'],
-                   'do_notify': item['do_notify'],
-                   'do_notify_created': item['do_notify_created'],
-                   'keep_history': item['keep_history'],
-                   'is_active': item['is_active']
-                   }
-
-            rows.append(row)
-
-        dict = {'recordsFiltered': query['filteredCount'],
-                'recordsTotal': query['totalCount'],
-                'data': session.mask_session_info(rows),
-                'draw': query['draw']
-                }
-
-        return dict
-
-    def get_datatables_media_info(self, section_id=None, section_type=None, rating_key=None, refresh=False, kwargs=None):
-        default_return = {'recordsFiltered': 0,
-                          'recordsTotal': 0,
-                          'draw': 0,
-                          'data': [],
-                          'filtered_file_size': 0,
-                          'total_file_size': 0,
-                          'last_refreshed': None}
-
-        if not session.allow_session_library(section_id):
-            return default_return
-
-        if section_id and not str(section_id).isdigit():
-            logger.warn("Tautulli Libraries :: Datatable media info called but invalid section_id provided.")
-            return default_return
-        elif rating_key and not str(rating_key).isdigit():
-            logger.warn("Tautulli Libraries :: Datatable media info called but invalid rating_key provided.")
-            return default_return
-        elif not section_id and not rating_key:
-            logger.warn("Tautulli Libraries :: Datatable media info called but no input provided.")
-            return default_return
-
-        # Get the library details
-        library_details = self.get_details(section_id=section_id)
-        if library_details['section_id'] == None:
-            logger.debug("Tautulli Libraries :: Library section_id %s not found." % section_id)
-            return default_return
-
-        if not section_type:
-            section_type = library_details['section_type']
-
-        # Get play counts from the database
-        monitor_db = database.MonitorDatabase()
-
-        if plexpy.CONFIG.GROUP_HISTORY_TABLES:
-            count_by = 'reference_id'
-        else:
-            count_by = 'id'
-
-        if section_type == 'show' or section_type == 'artist':
-            group_by = 'grandparent_rating_key'
-        elif section_type == 'season' or section_type == 'album':
-            group_by = 'parent_rating_key'
-        else:
-            group_by = 'rating_key'
-
-        try:
-            query = "SELECT MAX(started) AS last_played, COUNT(DISTINCT %s) AS play_count, " \
-                    "rating_key, parent_rating_key, grandparent_rating_key " \
-                    "FROM session_history " \
-                    "WHERE section_id = ? " \
-                    "GROUP BY %s " % (count_by, group_by)
-            result = monitor_db.select(query, args=[section_id])
-        except Exception as e:
-            logger.warn("Tautulli Libraries :: Unable to execute database query for get_datatables_media_info2: %s." % e)
-            return default_return
-
-        watched_list = {}
-        for item in result:
-            watched_list[str(item[group_by])] = {'last_played': item['last_played'],
-                                                 'play_count': item['play_count']}
-
-        # Import media info cache from json file
-        cache_time, rows, library_count = self._load_media_info_cache(section_id=section_id, rating_key=rating_key)
-
-        # If no cache was imported, get all library children items
-        cached_items = {d['rating_key']: d['file_size'] for d in rows} if not refresh else {}
-
-        if refresh or not rows:
-            pms_connect = pmsconnect.PmsConnect()
-
-            if rating_key:
-                library_children = pms_connect.get_library_children_details(rating_key=rating_key,
-                                                                            section_id=section_id,
-                                                                            section_type=section_type,
-                                                                            get_media_info=True)
-            elif section_id:
-                library_children = pms_connect.get_library_children_details(section_id=section_id,
-                                                                            section_type=section_type,
-                                                                            get_media_info=True)
-            if library_children:
-                library_count = library_children['library_count']
-                children_list = library_children['children_list']
-            else:
-                logger.warn("Tautulli Libraries :: Unable to get a list of library items.")
-                return default_return
-
-            new_rows = []
-            for item in children_list:
-                ## TODO: Check list of media info items, currently only grabs first item
-
-                cached_file_size = cached_items.get(item['rating_key'], None)
-                file_size = cached_file_size if cached_file_size else item.get('file_size', '')
-
-                row = {'section_id': library_details['section_id'],
-                       'section_type': library_details['section_type'],
-                       'added_at': item['added_at'],
-                       'media_type': item['media_type'],
-                       'rating_key': item['rating_key'],
-                       'parent_rating_key': item['parent_rating_key'],
-                       'grandparent_rating_key': item['grandparent_rating_key'],
-                       'title': item['title'],
-                       'sort_title': item['sort_title'] or item['title'],
-                       'year': item['year'],
-                       'media_index': item['media_index'],
-                       'parent_media_index': item['parent_media_index'],
-                       'thumb': item['thumb'],
-                       'container': item.get('container', ''),
-                       'bitrate': item.get('bitrate', ''),
-                       'video_codec': item.get('video_codec', ''),
-                       'video_resolution': item.get('video_resolution', ''),
-                       'video_framerate': item.get('video_framerate', ''),
-                       'audio_codec': item.get('audio_codec', ''),
-                       'audio_channels': item.get('audio_channels', ''),
-                       'file_size': file_size
-                       }
-                new_rows.append(row)
-
-            rows = new_rows
-            if not rows:
-                return default_return
-
-            # Cache the media info to a json file
-            self._save_media_info_cache(section_id=section_id, rating_key=rating_key, rows=rows)
-
-        # Update the last_played and play_count
-        for item in rows:
-            watched_item = watched_list.get(item['rating_key'], None)
-            if watched_item:
-                item['last_played'] = watched_item['last_played']
-                item['play_count'] = watched_item['play_count']
-            else:
-                item['last_played'] = None
-                item['play_count'] = None
-
-        results = []
-
-        # Get datatables JSON data
-        if kwargs.get('json_data'):
-            json_data = helpers.process_json_kwargs(json_kwargs=kwargs.get('json_data'))
-            #print json_data
-
-        # Search results
-        search_value = json_data['search']['value'].lower()
-        if search_value:
-            searchable_columns = [d['data'] for d in json_data['columns'] if d['searchable']] + ['title']
-            for row in rows:
-                for k,v in row.items():
-                    if k in searchable_columns and search_value in v.lower():
-                        results.append(row)
-                        break
-        else:
-            results = rows
-
-        filtered_count = len(results)
-
-        # Sort results
-        results = sorted(results, key=lambda k: k['sort_title'].lower())
-        sort_order = json_data['order']
-        for order in reversed(sort_order):
-            sort_key = json_data['columns'][int(order['column'])]['data']
-            reverse = True if order['dir'] == 'desc' else False
-            if rating_key and sort_key == 'sort_title':
-                results = sorted(results, key=lambda k: helpers.cast_to_int(k['media_index']), reverse=reverse)
-            elif sort_key in ('file_size', 'bitrate', 'added_at', 'last_played', 'play_count'):
-                results = sorted(results, key=lambda k: helpers.cast_to_int(k[sort_key]), reverse=reverse)
-            elif sort_key == 'video_resolution':
-                results = sorted(results, key=lambda k: helpers.cast_to_int(k[sort_key].replace('4k', '2160p').rstrip('p')), reverse=reverse)
-            else:
-                results = sorted(results, key=lambda k: k[sort_key].lower(), reverse=reverse)
-
-        total_file_size = sum([helpers.cast_to_int(d['file_size']) for d in results])
-
-        # Paginate results
-        results = results[json_data['start']:(json_data['start'] + json_data['length'])]
-
-        filtered_file_size = sum([helpers.cast_to_int(d['file_size']) for d in results])
-
-        output = {
-            'recordsFiltered': filtered_count,
-            'recordsTotal': int(library_count),
-            'data': results,
-            'draw': int(json_data['draw']),
-            'filtered_file_size': filtered_file_size,
-            'total_file_size': total_file_size,
-            'last_refreshed': cache_time
-        }
-
-        return output
-
-    def get_media_info_file_sizes(self, section_id=None, rating_key=None):
-        if not session.allow_session_library(section_id):
-            return False
-
-        if section_id and not str(section_id).isdigit():
-            logger.warn("Tautulli Libraries :: Datatable media info file size called but invalid section_id provided.")
-            return False
-        elif rating_key and not str(rating_key).isdigit():
-            logger.warn("Tautulli Libraries :: Datatable media info file size called but invalid rating_key provided.")
-            return False
-
-        # Get the library details
-        library_details = self.get_details(section_id=section_id)
-        if library_details['section_id'] == None:
-            logger.debug("Tautulli Libraries :: Library section_id %s not found." % section_id)
-            return False
-        if library_details['section_type'] == 'photo':
-            return False
-
-        # Import media info cache from json file
-        _, rows, _ = self._load_media_info_cache(section_id=section_id, rating_key=rating_key)
-
-        # Get the total file size for each item
-        if rating_key:
-            logger.debug("Tautulli Libraries :: Getting file sizes for rating_key %s." % rating_key)
-        elif section_id:
-            logger.debug("Tautulli Libraries :: Fetting file sizes for section_id %s." % section_id)
-
-        pms_connect = pmsconnect.PmsConnect()
-
-        for item in rows:
-            if item['rating_key'] and not item['file_size']:
-                file_size = 0
-
-                metadata = pms_connect.get_metadata_children_details(rating_key=item['rating_key'],
-                                                                     get_children=True,
-                                                                     media_type=item['media_type'],
-                                                                     section_id=section_id)
-
-                for child_metadata in metadata:
-                    ## TODO: Check list of media info items, currently only grabs first item
-                    media_info = media_part_info = {}
-                    if 'media_info' in child_metadata and len(child_metadata['media_info']) > 0:
-                        media_info = child_metadata['media_info'][0]
-                        if 'parts' in media_info and len (media_info['parts']) > 0:
-                            media_part_info = next((p for p in media_info['parts'] if p['selected']),
-                                                   media_info['parts'][0])
-
-                    file_size += helpers.cast_to_int(media_part_info.get('file_size', 0))
-
-                item['file_size'] = file_size
-
-        # Cache the media info to a json file
-        self._save_media_info_cache(section_id=section_id, rating_key=rating_key, rows=rows)
-
-        if rating_key:
-            logger.debug("Tautulli Libraries :: File sizes updated for rating_key %s." % rating_key)
-        elif section_id:
-            logger.debug("Tautulli Libraries :: File sizes updated for section_id %s." % section_id)
-
-        return True
-    
-    def _load_media_info_cache(self, section_id=None, rating_key=None):
-        cache_time = None
-        rows = []
-        library_count = 0
-
-        # Import media info cache from json file
-        if rating_key:
-            try:
-                inFilePath = os.path.join(plexpy.CONFIG.CACHE_DIR,'media_info_%s-%s.json' % (section_id, rating_key))
-                with open(inFilePath, 'r') as inFile:
-                    data = json.load(inFile)
-                    if isinstance(data, dict):
-                        cache_time = data['last_refreshed']
-                        rows = data['rows']
-                    else:
-                        rows = data
-                    library_count = len(rows)
-                logger.debug("Tautulli Libraries :: Loaded media info from cache for rating_key %s (%s items)." % (rating_key, library_count))
-            except IOError as e:
-                logger.debug("Tautulli Libraries :: No media info cache for rating_key %s." % rating_key)
-
-        elif section_id:
-            try:
-                inFilePath = os.path.join(plexpy.CONFIG.CACHE_DIR,'media_info_%s.json' % section_id)
-                with open(inFilePath, 'r') as inFile:
-                    data = json.load(inFile)
-                    if isinstance(data, dict):
-                        cache_time = data['last_refreshed']
-                        rows = data['rows']
-                    else:
-                        rows = data
-                    library_count = len(rows)
-                logger.debug("Tautulli Libraries :: Loaded media info from cache for section_id %s (%s items)." % (section_id, library_count))
-            except IOError as e:
-                logger.debug("Tautulli Libraries :: No media info cache for section_id %s." % section_id)
-
-        return cache_time, rows, library_count
-    
-    def _save_media_info_cache(self, section_id=None, rating_key=None, rows=None):
-        cache_time = helpers.timestamp()
-
-        if rows is None:
-            rows = []
-        
-        if rating_key:
-            try:
-                outFilePath = os.path.join(plexpy.CONFIG.CACHE_DIR,'media_info_%s-%s.json' % (section_id, rating_key))
-                with open(outFilePath, 'w') as outFile:
-                    json.dump({'last_refreshed': cache_time, 'rows': rows}, outFile)
-                logger.debug("Tautulli Libraries :: Saved media info cache for rating_key %s." % rating_key)
-            except IOError as e:
-                logger.debug("Tautulli Libraries :: Unable to create cache file for rating_key %s." % rating_key)
-
-        elif section_id:
-            try:
-                outFilePath = os.path.join(plexpy.CONFIG.CACHE_DIR,'media_info_%s.json' % section_id)
-                with open(outFilePath, 'w') as outFile:
-                    json.dump({'last_refreshed': cache_time, 'rows': rows}, outFile)
-                logger.debug("Tautulli Libraries :: Saved media info cache for section_id %s." % section_id)
-            except IOError as e:
-                logger.debug("Tautulli Libraries :: Unable to create cache file for section_id %s." % section_id)
-
-    def set_config(self, section_id=None, custom_thumb='', custom_art='',
-                   do_notify=1, keep_history=1, do_notify_created=1):
-        if section_id:
-            monitor_db = database.MonitorDatabase()
-
-            key_dict = {'section_id': section_id}
-            value_dict = {'custom_thumb_url': custom_thumb,
-                          'custom_art_url': custom_art,
-                          'do_notify': do_notify,
-                          'do_notify_created': do_notify_created,
-                          'keep_history': keep_history}
-            try:
-                monitor_db.upsert('library_sections', value_dict, key_dict)
-            except Exception as e:
-                logger.warn("Tautulli Libraries :: Unable to execute database query for set_config: %s." % e)
-
-    def get_details(self, section_id=None, server_id=None, include_last_accessed=False):
-        default_return = {'row_id': 0,
-                          'server_id': '',
-                          'section_id': 0,
-                          'section_name': 'Local',
-                          'section_type': '',
-                          'library_thumb': common.DEFAULT_COVER_THUMB,
-                          'library_art': '',
-                          'count': 0,
-                          'parent_count': 0,
-                          'child_count': 0,
-                          'is_active': 1,
-                          'do_notify': 0,
-                          'do_notify_created': 0,
-                          'keep_history': 1,
-                          'deleted_section': 0,
-                          'last_accessed': None,
-                          }
-
-        if not section_id:
-            return default_return
-
-        if server_id is None:
-            server_id = plexpy.CONFIG.PMS_IDENTIFIER
-
-        library_details = self.get_library_details(section_id=section_id, server_id=server_id,
-                                                   include_last_accessed=include_last_accessed)
-
-        if library_details:
-            return library_details
-
-        else:
-            logger.warn("Tautulli Libraries :: Unable to retrieve library %s from database. Requesting library list refresh."
-                        % section_id)
-            # Let's first refresh the libraries list to make sure the library isn't newly added and not in the db yet
-            refresh_libraries()
-
-            library_details = self.get_library_details(section_id=section_id, server_id=server_id,
-                                                       include_last_accessed=include_last_accessed)
-
-            if library_details:
-                return library_details
-
-            else:
-                logger.warn("Tautulli Users :: Unable to retrieve library %s from database. Returning 'Local' library."
-                            % section_id)
-                # If there is no library data we must return something
-                return default_return
-
-    def get_library_details(self, section_id=None, server_id=None, include_last_accessed=False):
-        if server_id is None:
-            server_id = plexpy.CONFIG.PMS_IDENTIFIER
-
-        last_accessed = 'NULL'
-        join = ''
-        if include_last_accessed:
-            last_accessed = "MAX(session_history.started)"
-            join = "LEFT OUTER JOIN session_history ON library_sections.section_id = session_history.section_id " \
-
-        monitor_db = database.MonitorDatabase()
-
-        try:
-            if str(section_id).isdigit():
-                where = "library_sections.section_id = ?"
-                args = [section_id]
-            else:
-                raise Exception('Missing section_id')
-
-            query = "SELECT library_sections.id AS row_id, server_id, library_sections.section_id, " \
-                    "section_name, section_type, " \
-                    "count, parent_count, child_count, " \
-                    "library_sections.thumb AS library_thumb, custom_thumb_url AS custom_thumb, " \
-                    "library_sections.art AS library_art, " \
-                    "custom_art_url AS custom_art, is_active, " \
-                    "do_notify, do_notify_created, keep_history, deleted_section, %s AS last_accessed " \
-                    "FROM library_sections %s " \
-                    "WHERE %s AND server_id = ? " % (last_accessed, join, where)
-            result = monitor_db.select(query, args=args + [server_id])
-        except Exception as e:
-            logger.warn("Tautulli Libraries :: Unable to execute database query for get_library_details: %s." % e)
-            result = []
-
-        library_details = {}
-        if result:
-            for item in result:
-                if item['custom_thumb'] and item['custom_thumb'] != item['library_thumb']:
-                    library_thumb = item['custom_thumb']
-                elif item['library_thumb']:
-                    library_thumb = item['library_thumb']
-                else:
-                    library_thumb = common.DEFAULT_COVER_THUMB
-
-                if item['custom_art'] and item['custom_art'] != item['library_art']:
-                    library_art = item['custom_art']
-                else:
-                    library_art = item['library_art']
-
-                library_details = {'row_id': item['row_id'],
-                                   'server_id': item['server_id'],
-                                   'section_id': item['section_id'],
-                                   'section_name': item['section_name'],
-                                   'section_type': item['section_type'],
-                                   'library_thumb': library_thumb,
-                                   'library_art': library_art,
-                                   'count': item['count'],
-                                   'parent_count': item['parent_count'],
-                                   'child_count': item['child_count'],
-                                   'is_active': item['is_active'],
-                                   'do_notify': item['do_notify'],
-                                   'do_notify_created': item['do_notify_created'],
-                                   'keep_history': item['keep_history'],
-                                   'deleted_section': item['deleted_section'],
-                                   'last_accessed': item['last_accessed']
-                                   }
-        return library_details
-
-    def get_watch_time_stats(self, section_id=None, grouping=None, query_days=None):
-        if not session.allow_session_library(section_id):
-            return []
-
-        if grouping is None:
-            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
-
-        if query_days and query_days is not None:
-            query_days = map(helpers.cast_to_int, str(query_days).split(','))
-        else:
-            query_days = [1, 7, 30, 0]
-
-        timestamp = helpers.timestamp()
-
-        monitor_db = database.MonitorDatabase()
-
-        library_watch_time_stats = []
-
-        group_by = 'session_history.reference_id' if grouping else 'session_history.id'
-
-        for days in query_days:
-            timestamp_query = timestamp - days * 24 * 60 * 60
-
-            try:
-                if days > 0:
-                    if str(section_id).isdigit():
-                        query = "SELECT (SUM(stopped - started) - " \
-                                "SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END)) AS total_time, " \
-                                "COUNT(DISTINCT %s) AS total_plays " \
-                                "FROM session_history " \
-                                "JOIN session_history_metadata ON session_history_metadata.id = session_history.id " \
-                                "WHERE stopped >= %s " \
-                                "AND section_id = ?" % (group_by, timestamp_query)
-                        result = monitor_db.select(query, args=[section_id])
-                    else:
-                        result = []
-                else:
-                    if str(section_id).isdigit():
-                        query = "SELECT (SUM(stopped - started) - " \
-                                "SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END)) AS total_time, " \
-                                "COUNT(DISTINCT %s) AS total_plays " \
-                                "FROM session_history " \
-                                "JOIN session_history_metadata ON session_history_metadata.id = session_history.id " \
-                                "WHERE section_id = ?" % group_by
-                        result = monitor_db.select(query, args=[section_id])
-                    else:
-                        result = []
-            except Exception as e:
-                logger.warn("Tautulli Libraries :: Unable to execute database query for get_watch_time_stats: %s." % e)
-                result = []
-
-            for item in result:
-                if item['total_time']:
-                    total_time = item['total_time']
-                    total_plays = item['total_plays']
-                else:
-                    total_time = 0
-                    total_plays = 0
-
-                row = {'query_days': days,
-                       'total_time': total_time,
-                       'total_plays': total_plays
-                       }
-
-                library_watch_time_stats.append(row)
-
-        return library_watch_time_stats
-
-    def get_user_stats(self, section_id=None, grouping=None):
-        if not session.allow_session_library(section_id):
-            return []
-
-        if grouping is None:
-            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
-
-        monitor_db = database.MonitorDatabase()
-
-        user_stats = []
-
-        group_by = 'session_history.reference_id' if grouping else 'session_history.id'
-
-        try:
-            if str(section_id).isdigit():
-                query = "SELECT (CASE WHEN users.friendly_name IS NULL OR TRIM(users.friendly_name) = '' " \
-                        "THEN users.username ELSE users.friendly_name END) AS friendly_name, " \
-                        "users.user_id, users.username, users.thumb, users.custom_avatar_url AS custom_thumb, " \
-                        "COUNT(DISTINCT %s) AS total_plays, (SUM(stopped - started) - " \
-                        "SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END)) AS total_time " \
-                        "FROM session_history " \
-                        "JOIN session_history_metadata ON session_history_metadata.id = session_history.id " \
-                        "JOIN users ON users.user_id = session_history.user_id " \
-                        "WHERE section_id = ? " \
-                        "GROUP BY users.user_id " \
-                        "ORDER BY total_plays DESC, total_time DESC" % group_by
-                result = monitor_db.select(query, args=[section_id])
-            else:
-                result = []
-        except Exception as e:
-            logger.warn("Tautulli Libraries :: Unable to execute database query for get_user_stats: %s." % e)
-            result = []
-
-        for item in result:
-            if item['custom_thumb'] and item['custom_thumb'] != item['thumb']:
-                user_thumb = item['custom_thumb']
-            elif item['thumb']:
-                user_thumb = item['thumb']
-            else:
-                user_thumb = common.DEFAULT_USER_THUMB
-
-            row = {'friendly_name': item['friendly_name'],
-                   'user_id': item['user_id'],
-                   'user_thumb': user_thumb,
-                   'username': item['username'],
-                   'total_plays': item['total_plays'],
-                   'total_time': item['total_time']
-                   }
-            user_stats.append(row)
-
-        return session.mask_session_info(user_stats, mask_metadata=False)
-
-    def get_recently_watched(self, section_id=None, limit='10'):
-        if not session.allow_session_library(section_id):
-            return []
-
-        monitor_db = database.MonitorDatabase()
-        recently_watched = []
-
-        if not limit.isdigit():
-            limit = '10'
-
-        try:
-            if str(section_id).isdigit():
-                query = "SELECT session_history.id, session_history.media_type, guid, " \
-                        "session_history.rating_key, session_history.parent_rating_key, session_history.grandparent_rating_key, " \
-                        "title, parent_title, grandparent_title, original_title, " \
-                        "thumb, parent_thumb, grandparent_thumb, media_index, parent_media_index, " \
-                        "year, originally_available_at, added_at, live, started, user, content_rating, labels, section_id " \
-                        "FROM session_history_metadata " \
-                        "JOIN session_history ON session_history_metadata.id = session_history.id " \
-                        "WHERE section_id = ? " \
-                        "GROUP BY session_history.rating_key " \
-                        "ORDER BY MAX(started) DESC LIMIT ?"
-                result = monitor_db.select(query, args=[section_id, limit])
-            else:
-                result = []
-        except Exception as e:
-            logger.warn("Tautulli Libraries :: Unable to execute database query for get_recently_watched: %s." % e)
-            result = []
-
-        for row in result:
-                if row['media_type'] == 'episode' and row['parent_thumb']:
-                    thumb = row['parent_thumb']
-                elif row['media_type'] == 'episode':
-                    thumb = row['grandparent_thumb']
-                else:
-                    thumb = row['thumb']
-
-                recent_output = {'row_id': row['id'],
-                                 'media_type': row['media_type'],
-                                 'rating_key': row['rating_key'],
-                                 'parent_rating_key': row['parent_rating_key'],
-                                 'grandparent_rating_key': row['grandparent_rating_key'],
-                                 'title': row['title'],
-                                 'parent_title': row['parent_title'],
-                                 'grandparent_title': row['grandparent_title'],
-                                 'original_title': row['original_title'],
-                                 'thumb': thumb,
-                                 'media_index': row['media_index'],
-                                 'parent_media_index': row['parent_media_index'],
-                                 'year': row['year'],
-                                 'originally_available_at': row['originally_available_at'],
-                                 'live': row['live'],
-                                 'guid': row['guid'],
-                                 'time': row['started'],
-                                 'user': row['user'],
-                                 'section_id': row['section_id'],
-                                 'content_rating': row['content_rating'],
-                                 'labels': row['labels'].split(';') if row['labels'] else (),
-                                 }
-                recently_watched.append(recent_output)
-
-        return session.mask_session_info(recently_watched)
-
-    def get_sections(self):
-        monitor_db = database.MonitorDatabase()
-
-        try:
-            query = "SELECT section_id, section_name, section_type, agent " \
-                    "FROM library_sections WHERE deleted_section = 0"
-            result = monitor_db.select(query=query)
-        except Exception as e:
-            logger.warn("Tautulli Libraries :: Unable to execute database query for get_sections: %s." % e)
-            return None
-
-        libraries = []
-        for item in result:
-            library = {'section_id': item['section_id'],
-                       'section_name': item['section_name'],
-                       'section_type': item['section_type'],
-                       'agent': item['agent']
-                       }
-            libraries.append(library)
-
-        return libraries
-
-    def delete(self, server_id=None, section_id=None, row_ids=None, purge_only=False):
-        monitor_db = database.MonitorDatabase()
-
-        if row_ids and row_ids is not None:
-            row_ids = list(map(helpers.cast_to_int, row_ids.split(',')))
-
-            # Get the section_ids corresponding to the row_ids
-            result = monitor_db.select("SELECT server_id, section_id FROM library_sections "
-                                       "WHERE id IN ({})".format(",".join(["?"] * len(row_ids))), row_ids)
-
-            success = []
-            for library in result:
-                success.append(self.delete(server_id=library['server_id'], section_id=library['section_id'],
-                                           purge_only=purge_only))
-            return all(success)
-
-        elif str(section_id).isdigit():
-            server_id = server_id or plexpy.CONFIG.PMS_IDENTIFIER
-            if server_id == plexpy.CONFIG.PMS_IDENTIFIER:
-                delete_success = database.delete_library_history(section_id=section_id)
-            else:
-                logger.warn("Tautulli Libraries :: Library history not deleted for library section_id %s "
-                            "because library server_id %s does not match Plex server identifier %s."
-                            % (section_id, server_id, plexpy.CONFIG.PMS_IDENTIFIER))
-                delete_success = True
-
-            if purge_only:
-                return delete_success
-            else:
-                logger.info("Tautulli Libraries :: Deleting library with server_id %s and section_id %s from database."
-                            % (server_id, section_id))
-                try:
-                    monitor_db.action("UPDATE library_sections "
-                                      "SET deleted_section = 1, keep_history = 0, do_notify = 0, do_notify_created = 0 "
-                                      "WHERE server_id = ? AND section_id = ?", [server_id, section_id])
-                    return delete_success
-                except Exception as e:
-                    logger.warn("Tautulli Libraries :: Unable to execute database query for delete: %s." % e)
-
-        else:
-            return False
-
-    def undelete(self, section_id=None, section_name=None):
-        monitor_db = database.MonitorDatabase()
-
-        try:
-            if section_id and section_id.isdigit():
-                query = "SELECT * FROM library_sections WHERE section_id = ?"
-                result = monitor_db.select(query=query, args=[section_id])
-                if result:
-                    logger.info("Tautulli Libraries :: Re-adding library with id %s to database." % section_id)
-                    monitor_db.action("UPDATE library_sections "
-                                      "SET deleted_section = 0, keep_history = 1, do_notify = 1, do_notify_created = 1 "
-                                      "WHERE section_id = ?",
-                                      [section_id])
-                    return True
-                else:
-                    return False
-
-            elif section_name:
-                query = "SELECT * FROM library_sections WHERE section_name = ?"
-                result = monitor_db.select(query=query, args=[section_name])
-                if result:
-                    logger.info("Tautulli Libraries :: Re-adding library with name %s to database." % section_name)
-                    monitor_db.action("UPDATE library_sections "
-                                      "SET deleted_section = 0, keep_history = 1, do_notify = 1, do_notify_created = 1 "
-                                      "WHERE section_name = ?",
-                                      [section_name])
-                    return True
-                else:
-                    return False
-
-        except Exception as e:
-            logger.warn("Tautulli Libraries :: Unable to execute database query for undelete: %s." % e)
-
-    def delete_media_info_cache(self, section_id=None):
-        import os
-
-        try:
-            if section_id.isdigit():
-                [os.remove(os.path.join(plexpy.CONFIG.CACHE_DIR, f)) for f in os.listdir(plexpy.CONFIG.CACHE_DIR)
-                 if f.startswith('media_info_%s' % section_id) and f.endswith('.json')]
-
-                logger.debug("Tautulli Libraries :: Deleted media info table cache for section_id %s." % section_id)
-                return 'Deleted media info table cache for library with id %s.' % section_id
-            else:
-                return 'Unable to delete media info table cache, section_id not valid.'
-        except Exception as e:
-            logger.warn("Tautulli Libraries :: Unable to delete media info table cache: %s." % e)
-
-    def delete_duplicate_libraries(self):
-        monitor_db = database.MonitorDatabase()
-
-        # Refresh the PMS_URL to make sure the server_id is updated
-        plextv.get_server_resources()
-
-        server_id = plexpy.CONFIG.PMS_IDENTIFIER
-
-        try:
-            logger.debug("Tautulli Libraries :: Deleting libraries where server_id does not match %s." % server_id)
-            monitor_db.action("DELETE FROM library_sections WHERE server_id != ?", [server_id])
-
-            return 'Deleted duplicate libraries from the database.'
-        except Exception as e:
-            logger.warn("Tautulli Libraries :: Unable to delete duplicate libraries: %s." % e)
diff --git a/plexpy/lock.py b/plexpy/lock.py
index 570803bc..cd10d33c 100644
--- a/plexpy/lock.py
+++ b/plexpy/lock.py
@@ -1,26 +1,11 @@
-# -*- coding: utf-8 -*-
+"""
+Locking-related classes
+"""
 
-# This file is part of Tautulli.
-#
-#  Tautulli is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  Tautulli 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
-
-import queue
+import plexpy.logger
 import time
 import threading
-
-import plexpy
-from plexpy import logger
+import Queue
 
 
 class TimedLock(object):
@@ -43,7 +28,7 @@ class TimedLock(object):
         self.lock = threading.Lock()
         self.last_used = 0
         self.minimum_delta = minimum_delta
-        self.queue = queue.Queue()
+        self.queue = Queue.Queue()
 
     def __enter__(self):
         """
@@ -54,14 +39,14 @@ class TimedLock(object):
         sleep_amount = self.minimum_delta - delta
         if sleep_amount >= 0:
             # zero sleeps give the cpu a chance to task-switch
-            logger.debug('Sleeping %s (interval)', sleep_amount)
+            plexpy.logger.debug('Sleeping %s (interval)', sleep_amount)
             time.sleep(sleep_amount)
         while not self.queue.empty():
             try:
                 seconds = self.queue.get(False)
-                logger.debug('Sleeping %s (queued)', seconds)
+                plexpy.logger.debug('Sleeping %s (queued)', seconds)
                 time.sleep(seconds)
-            except queue.Empty:
+            except Queue.Empty:
                 continue
             self.queue.task_done()
 
@@ -80,7 +65,7 @@ class TimedLock(object):
         """
         # We use a queue so that we don't have to synchronize
         # across threads and with or without locks
-        logger.info('Adding %s to queue', seconds)
+        plexpy.logger.info('Adding %s to queue', seconds)
         self.queue.put(seconds)
 
 
diff --git a/plexpy/log_reader.py b/plexpy/log_reader.py
index 63a55d71..b8b78329 100644
--- a/plexpy/log_reader.py
+++ b/plexpy/log_reader.py
@@ -1,58 +1,33 @@
-# -*- coding: utf-8 -*-
-
-#  This file is part of Tautulli.
+#  This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
-
-from io import open
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
+from plexpy import helpers, logger
+import re
 import os
-
 import plexpy
-from plexpy import helpers
-from plexpy import logger
 
+def get_log_tail(window=20, parsed=True):
 
-def list_plex_logs():
-    logs_dir = plexpy.CONFIG.PMS_LOGS_FOLDER
-
-    if not logs_dir or logs_dir and not os.path.exists(logs_dir):
+    if plexpy.CONFIG.PMS_LOGS_FOLDER:
+        log_file = os.path.join(plexpy.CONFIG.PMS_LOGS_FOLDER, 'Plex Media Server.log')
+    else:
         return []
 
-    log_files = []
-    for file in os.listdir(logs_dir):
-        if file.startswith('Plex Transcoder Statistics'):
-            # Plex Transcoder Statistics is an XML file
-            continue
-        if os.path.isfile(os.path.join(logs_dir, file)):
-            name, ext = os.path.splitext(file)
-            if ext == '.log' and not name[-1].isdigit():
-                log_files.append(name)
-
-    return log_files
-
-
-def get_log_tail(window=20, parsed=True, log_file=''):
-    if not plexpy.CONFIG.PMS_LOGS_FOLDER:
-        return []
-
-    log_file = (log_file or 'Plex Media Server') + '.log'
-    log_file = os.path.join(plexpy.CONFIG.PMS_LOGS_FOLDER, log_file)
-
     try:
-        logfile = open(log_file, 'r', encoding='utf-8')
-    except IOError as e:
+        logfile = open(log_file, "r")
+    except IOError, e:
         logger.error('Unable to open Plex Log file. %s' % e)
         return []
 
@@ -62,12 +37,11 @@ def get_log_tail(window=20, parsed=True, log_file=''):
         line_error = False
         clean_lines = []
         for i in log_lines:
-            if not i.strip():
-                continue
             try:
+                i = helpers.latinToAscii(i)
                 log_time = i.split(' [')[0]
-                log_level = i.split('] ', 1)[1].split(' - ', 1)[0]
-                log_msg = i.split('] ', 1)[1].split(' - ', 1)[1]
+                log_level = i.split('] ', 1)[1].split(' - ',1)[0]
+                log_msg = i.split('] ', 1)[1].split(' - ',1)[1]
                 full_line = [log_time, log_level, log_msg]
                 clean_lines.append(full_line)
             except:
@@ -76,7 +50,7 @@ def get_log_tail(window=20, parsed=True, log_file=''):
                 clean_lines.append(full_line)
 
         if line_error:
-            logger.error('Tautulli was unable to parse some lines of the Plex Media Server log.')
+            logger.error('PlexPy was unable to parse some lines of the Plex Media Server log.')
 
         return clean_lines
     else:
@@ -86,6 +60,7 @@ def get_log_tail(window=20, parsed=True, log_file=''):
 
         return raw_lines
 
+    return log_lines
 
 # http://stackoverflow.com/a/13790289/2405162
 def tail(f, lines=1, _buffer=4098):
diff --git a/plexpy/logger.py b/plexpy/logger.py
index b4f0f3f3..19ac0aee 100644
--- a/plexpy/logger.py
+++ b/plexpy/logger.py
@@ -1,285 +1,132 @@
-# -*- coding: utf-8 -*-
-
-#  This file is part of Tautulli.
+#  This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
+from plexpy import helpers
+
+from logutils.queue import QueueHandler, QueueListener
 from logging import handlers
 
-import cherrypy
-import logging
-import os
-import re
-import sys
+import multiprocessing
+import contextlib
+import plexpy
 import threading
 import traceback
-
-import plexpy
-from plexpy import helpers, users
-from plexpy.config import _BLACKLIST_KEYS, _WHITELIST_KEYS
-
+import logging
+import errno
+import sys
+import os
 
 # These settings are for file logging only
-FILENAME = "tautulli.log"
-FILENAME_API = "tautulli_api.log"
-FILENAME_PLEX_WEBSOCKET = "plex_websocket.log"
-MAX_SIZE = 5000000  # 5 MB
+FILENAME = "plexpy.log"
+MAX_SIZE = 1000000 # 1 MB
 MAX_FILES = 5
 
-_BLACKLIST_WORDS = set()
-_FILTER_USERNAMES = []
-
-# Tautulli logger
-logger = logging.getLogger("tautulli")
-# Tautulli API logger
-logger_api = logging.getLogger("tautulli_api")
-# Tautulli websocket logger
-logger_plex_websocket = logging.getLogger("plex_websocket")
+# PlexPy logger
+logger = logging.getLogger("plexpy")
 
 # Global queue for multiprocessing logging
 queue = None
 
-
-def blacklist_config(config):
-    blacklist = set()
-    blacklist_keys = ['HOOK', 'APIKEY', 'KEY', 'PASSWORD', 'TOKEN']
-
-    for key, value in config.items():
-        if isinstance(value, str) and len(value.strip()) > 5 and \
-            key.upper() not in _WHITELIST_KEYS and (key.upper() in blacklist_keys or
-                                                    any(bk in key.upper() for bk in _BLACKLIST_KEYS)):
-            blacklist.add(value.strip())
-
-    _BLACKLIST_WORDS.update(blacklist)
-
-
-def filter_usernames(new_users=None):
-    global _FILTER_USERNAMES
-
-    if new_users is None:
-        new_users = [user['username'] for user in users.Users().get_users(include_deleted=True)]
-
-    for username in new_users:
-        if username.lower() not in ('local', 'guest') and len(username) > 3 and username not in _FILTER_USERNAMES:
-            _FILTER_USERNAMES.append(username)
-
-    _FILTER_USERNAMES = sorted(_FILTER_USERNAMES, key=len, reverse=True)
-
-
-class LogLevelFilter(logging.Filter):
-    def __init__(self, max_level):
-        super(LogLevelFilter, self).__init__()
-
-        self.max_level = max_level
-
-    def filter(self, record):
-        return record.levelno <= self.max_level
-
-
-class NoThreadFilter(logging.Filter):
+class LogListHandler(logging.Handler):
     """
-    Log filter for the current thread
+    Log handler for Web UI.
     """
-    def __init__(self, threadName):
-        super(NoThreadFilter, self).__init__()
-        
-        self.threadName = threadName
 
-    def filter(self, record):
-        return not record.threadName == self.threadName
+    def emit(self, record):
+        message = self.format(record)
+        message = message.replace("\n", "<br />")
+
+        plexpy.LOG_LIST.insert(0, (helpers.now(), message, record.levelname, record.threadName))
 
 
-# Taken from Hellowlol/HTPC-Manager
-class BlacklistFilter(logging.Filter):
+@contextlib.contextmanager
+def listener():
     """
-    Log filter for blacklisted tokens and passwords
+    Wrapper that create a QueueListener, starts it and automatically stops it.
+    To be used in a with statement in the main process, for multiprocessing.
     """
-    def filter(self, record):
-        if not plexpy.CONFIG.LOG_BLACKLIST:
-            return True
 
-        for item in _BLACKLIST_WORDS:
-            try:
-                if item in record.msg:
-                    record.msg = record.msg.replace(item, 16 * '*')
+    global queue
 
-                args = []
-                for arg in record.args:
-                    try:
-                        arg_str = str(arg)
-                        if item in arg_str:
-                            arg_str = arg_str.replace(item, 16 * '*')
-                            arg = arg_str
-                    except:
-                        pass
-                    args.append(arg)
-                record.args = tuple(args)
-            except:
-                pass
+    # Initialize queue if not already done
+    if queue is None:
+        try:
+            queue = multiprocessing.Queue()
+        except OSError as e:
+            queue = False
 
-        return True
+            # Some machines don't have access to /dev/shm. See
+            # http://stackoverflow.com/questions/2009278 for more information.
+            if e.errno == errno.EACCES:
+                logger.warning('Multiprocess logging disabled, because '
+                               'current user cannot map shared memory. You won\'t see any' \
+                               'logging generated by the worker processed.')
 
-
-class UsernameFilter(logging.Filter):
-    """
-    Log filter for usernames
-    """
-    def filter(self, record):
-        if not plexpy.CONFIG.LOG_BLACKLIST_USERNAMES:
-            return True
-
-        if not plexpy._INITIALIZED:
-            return True
-
-        for username in _FILTER_USERNAMES:
-            try:
-                record.msg = self.replace(record.msg, username)
-
-                args = []
-                for arg in record.args:
-                    if isinstance(arg, str):
-                        arg = self.replace(arg, username)
-                    args.append(arg)
-                record.args = tuple(args)
-            except:
-                pass
-
-        return True
-
-    @staticmethod
-    def replace(text, match):
-        mask = match[:2] + 8 * '*' + match[-1]
-        return re.sub(re.escape(match), mask, text, flags=re.IGNORECASE)
-
-
-class RegexFilter(logging.Filter):
-    """
-    Base class for regex log filter
-    """
-    REGEX = re.compile(r'')
-
-    def filter(self, record):
-        if not plexpy.CONFIG.LOG_BLACKLIST:
-            return True
+    # Multiprocess logging may be disabled.
+    if not queue:
+        yield
+    else:
+        queue_listener = QueueListener(queue, *logger.handlers)
 
         try:
-            matches = self.REGEX.findall(record.msg)
-            for match in matches:
-                record.msg = self.replace(record.msg, match)
-
-            args = []
-            for arg in record.args:
-                try:
-                    arg_str = str(arg)
-                    matches = self.REGEX.findall(arg_str)
-                    if matches:
-                        for match in matches:
-                            arg_str = self.replace(arg_str, match)
-                        arg = arg_str
-                except:
-                    pass
-                args.append(arg)
-            record.args = tuple(args)
-        except:
-            pass
-
-        return True
-
-    def replace(self, text, match):
-        return text
+            queue_listener.start()
+            yield
+        finally:
+            queue_listener.stop()
 
 
-class PublicIPFilter(RegexFilter):
+def initMultiprocessing():
     """
-    Log filter for public IP addresses
+    Remove all handlers and add QueueHandler on top. This should only be called
+    inside a multiprocessing worker process, since it changes the logger
+    completely.
     """
-    REGEX = re.compile(
-        r'(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)[.]){3}'
-        r'(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)'
-        r'(?!\d*-[a-z0-9]{6})'
-    )
 
-    def replace(self, text, ip):
-        if helpers.is_public_ip(ip):
-            return text.replace(ip, '.'.join(['***'] * 4))
-        return text
+    # Multiprocess logging may be disabled.
+    if not queue:
+        return
 
+    # Remove all handlers and add the Queue handler as the only one.
+    for handler in logger.handlers[:]:
+        logger.removeHandler(handler)
 
-class PlexDirectIPFilter(RegexFilter):
-    """
-    Log filter for IP addresses in plex.direct URL
-    """
-    REGEX = re.compile(
-        r'(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)[-]){3}'
-        r'(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)'
-        r'(?!\d*-[a-z0-9]{6})'
-        r'(?=\.[a-z0-9]+\.plex\.direct)'
-    )
+    queue_handler = QueueHandler(queue)
+    queue_handler.setLevel(logging.DEBUG)
 
-    def replace(self, text, ip):
-        if helpers.is_public_ip(ip.replace('-', '.')):
-            return text.replace(ip, '-'.join(['***'] * 4))
-        return text
+    logger.addHandler(queue_handler)
 
-
-class EmailFilter(RegexFilter):
-    """
-    Log filter for email addresses
-    """
-    REGEX = re.compile(
-        r'([a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+)',
-        re.IGNORECASE
-    )
-
-    def replace(self, text, email):
-        email_parts = email.partition('@')
-        mask = email_parts[0][:2] + 8 * '*' + email_parts[0][-1] + email_parts[1] + 8 * '*'
-        return text.replace(email, mask)
-
-
-class PlexTokenFilter(RegexFilter):
-    """
-    Log filter for X-Plex-Token
-    """
-    REGEX = re.compile(
-        r'X-Plex-Token(?:=|%3D)([a-zA-Z0-9\-_]+)'
-    )
-
-    def replace(self, text, token):
-        return text.replace(token, 16 * '*')
+    # Change current thread name for log record
+    threading.current_thread().name = multiprocessing.current_process().name
 
 
 def initLogger(console=False, log_dir=False, verbose=False):
     """
-    Setup logging for Tautulli. It uses the logger instance with the name
-    'tautulli'. Three log handlers are added:
+    Setup logging for PlexPy. It uses the logger instance with the name
+    'plexpy'. Three log handlers are added:
 
-    * RotatingFileHandler: for the file tautulli.log
+    * RotatingFileHandler: for the file plexpy.log
     * LogListHandler: for Web UI
     * StreamHandler: for console (if console)
 
     Console logging is only enabled if console is set to True. This method can
-    be invoked multiple times, during different stages of Tautulli.
+    be invoked multiple times, during different stages of PlexPy.
     """
 
     # Close and remove old handlers. This is required to reinit the loggers
     # at runtime
-    log_handlers = logger.handlers[:] + \
-                   logger_api.handlers[:] + \
-                   logger_plex_websocket.handlers[:] + \
-                   cherrypy.log.error_log.handlers[:]
-    for handler in log_handlers:
+    for handler in logger.handlers[:]:
         # Just make sure it is cleaned up.
         if isinstance(handler, handlers.RotatingFileHandler):
             handler.close()
@@ -287,81 +134,36 @@ def initLogger(console=False, log_dir=False, verbose=False):
             handler.flush()
 
         logger.removeHandler(handler)
-        logger_api.removeHandler(handler)
-        logger_plex_websocket.removeHandler(handler)
-        cherrypy.log.error_log.removeHandler(handler)
 
     # Configure the logger to accept all messages
     logger.propagate = False
     logger.setLevel(logging.DEBUG if verbose else logging.INFO)
-    logger_api.propagate = False
-    logger_api.setLevel(logging.DEBUG if verbose else logging.INFO)
-    logger_plex_websocket.propagate = False
-    logger_plex_websocket.setLevel(logging.DEBUG if verbose else logging.INFO)
-    cherrypy.log.error_log.propagate = False
+
+    # Add list logger
+    loglist_handler = LogListHandler()
+    loglist_handler.setLevel(logging.DEBUG)
+
+    logger.addHandler(loglist_handler)
 
     # Setup file logger
     if log_dir:
-        file_formatter = logging.Formatter('%(asctime)s - %(levelname)-7s :: %(threadName)s : %(message)s', '%Y-%m-%d %H:%M:%S')
-
-        # Main Tautulli logger
         filename = os.path.join(log_dir, FILENAME)
-        file_handler = handlers.RotatingFileHandler(filename, maxBytes=MAX_SIZE, backupCount=MAX_FILES, encoding='utf-8')
+
+        file_formatter = logging.Formatter('%(asctime)s - %(levelname)-7s :: %(threadName)s : %(message)s', '%d-%b-%Y %H:%M:%S')
+        file_handler = handlers.RotatingFileHandler(filename, maxBytes=MAX_SIZE, backupCount=MAX_FILES)
         file_handler.setLevel(logging.DEBUG)
         file_handler.setFormatter(file_formatter)
 
         logger.addHandler(file_handler)
-        cherrypy.log.error_log.addHandler(file_handler)
-
-        # Tautulli API logger
-        filename = os.path.join(log_dir, FILENAME_API)
-        file_handler = handlers.RotatingFileHandler(filename, maxBytes=MAX_SIZE, backupCount=MAX_FILES, encoding='utf-8')
-        file_handler.setLevel(logging.DEBUG)
-        file_handler.setFormatter(file_formatter)
-
-        logger_api.addHandler(file_handler)
-
-        # Tautulli websocket logger
-        filename = os.path.join(log_dir, FILENAME_PLEX_WEBSOCKET)
-        file_handler = handlers.RotatingFileHandler(filename, maxBytes=MAX_SIZE, backupCount=MAX_FILES, encoding='utf-8')
-        file_handler.setLevel(logging.DEBUG)
-        file_handler.setFormatter(file_formatter)
-
-        logger_plex_websocket.addHandler(file_handler)
 
     # Setup console logger
     if console:
-        console_formatter = logging.Formatter('%(asctime)s - %(levelname)s :: %(threadName)s : %(message)s', '%Y-%m-%d %H:%M:%S')
+        console_formatter = logging.Formatter('%(asctime)s - %(levelname)s :: %(threadName)s : %(message)s', '%d-%b-%Y %H:%M:%S')
+        console_handler = logging.StreamHandler()
+        console_handler.setFormatter(console_formatter)
+        console_handler.setLevel(logging.DEBUG)
 
-        stdout_handler = logging.StreamHandler(sys.stdout)
-        stdout_handler.setFormatter(console_formatter)
-        stdout_handler.setLevel(logging.DEBUG)
-        stdout_handler.addFilter(LogLevelFilter(logging.INFO))
-
-        stderr_handler = logging.StreamHandler(sys.stderr)
-        stderr_handler.setFormatter(console_formatter)
-        stderr_handler.setLevel(logging.WARNING)
-
-        logger.addHandler(stdout_handler)
-        logger.addHandler(stderr_handler)
-        cherrypy.log.error_log.addHandler(stdout_handler)
-        cherrypy.log.error_log.addHandler(stderr_handler)
-
-    # Add filters to log handlers
-    # Only add filters after the config file has been initialized
-    # Nothing prior to initialization should contain sensitive information
-    if not plexpy.DEV and plexpy.CONFIG:
-        log_handlers = logger.handlers + \
-                       logger_api.handlers + \
-                       logger_plex_websocket.handlers + \
-                       cherrypy.log.error_log.handlers
-        for handler in log_handlers:
-            handler.addFilter(BlacklistFilter())
-            handler.addFilter(PublicIPFilter())
-            handler.addFilter(PlexDirectIPFilter())
-            handler.addFilter(EmailFilter())
-            handler.addFilter(UsernameFilter())
-            handler.addFilter(PlexTokenFilter())
+        logger.addHandler(console_handler)
 
     # Install exception hooks
     initHooks()
@@ -415,32 +217,10 @@ def initHooks(global_exceptions=True, thread_exceptions=True, pass_original=True
         # Monkey patch the run() by monkey patching the __init__ method
         threading.Thread.__init__ = new_init
 
-
-def shutdown():
-    logging.shutdown()
-
-
 # Expose logger methods
-# Main Tautulli logger
 info = logger.info
-warn = logger.warning
+warn = logger.warn
 error = logger.error
 debug = logger.debug
 warning = logger.warning
 exception = logger.exception
-
-# Tautulli API logger
-api_info = logger_api.info
-api_warn = logger_api.warning
-api_error = logger_api.error
-api_debug = logger_api.debug
-api_warning = logger_api.warning
-api_exception = logger_api.exception
-
-# Tautulli websocket logger
-websocket_info = logger_plex_websocket.info
-websocket_warn = logger_plex_websocket.warning
-websocket_error = logger_plex_websocket.error
-websocket_debug = logger_plex_websocket.debug
-websocket_warning = logger_plex_websocket.warning
-websocket_exception = logger_plex_websocket.exception
diff --git a/plexpy/macos.py b/plexpy/macos.py
deleted file mode 100644
index d2589fad..00000000
--- a/plexpy/macos.py
+++ /dev/null
@@ -1,199 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# This file is part of Tautulli.
-#
-#  Tautulli is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  Tautulli 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-import subprocess
-import sys
-import plistlib
-
-try:
-    import AppKit
-    import Foundation
-    HAS_PYOBJC = True
-except ImportError:
-    HAS_PYOBJC = False
-
-if HAS_PYOBJC:
-    import rumps
-
-import plexpy
-from plexpy import common
-from plexpy import logger
-from plexpy import versioncheck
-
-
-class MacOSSystemTray(object):
-    def __init__(self):
-        self.image_dir = os.path.join(plexpy.PROG_DIR, 'data/interfaces/', plexpy.CONFIG.INTERFACE, 'images')
-        self.icon = os.path.join(self.image_dir, 'logo-flat-white.ico')
-
-        if plexpy.UPDATE_AVAILABLE:
-            self.update_title = 'Check for Updates - Update Available!'
-        else:
-            self.update_title = 'Check for Updates'
-
-        self.menu = [
-            rumps.MenuItem('Open Tautulli', callback=self.tray_open),
-            None,
-            rumps.MenuItem('Start Tautulli at Login', callback=self.tray_startup),
-            rumps.MenuItem('Open Browser when Tautulli Starts', callback=self.tray_browser),
-            None,
-            rumps.MenuItem(self.update_title, callback=self.tray_check_update),
-            rumps.MenuItem('Restart', callback=self.tray_restart),
-            rumps.MenuItem('Quit', callback=self.tray_quit)
-        ]
-        if not plexpy.FROZEN:
-            self.menu.insert(6, rumps.MenuItem('Update', callback=self.tray_update))
-        self.menu[2].state = plexpy.CONFIG.LAUNCH_STARTUP
-        self.menu[3].state = plexpy.CONFIG.LAUNCH_BROWSER
-
-        self.tray_icon = rumps.App(common.PRODUCT, icon=self.icon, template=True,
-                                   menu=self.menu, quit_button=None)
-
-    def start(self):
-        logger.info("Launching MacOS menu bar icon.")
-        try:
-            self.tray_icon.run()
-        except Exception as e:
-            logger.error("Unable to launch menu bar icon: %s." % e)
-
-    def shutdown(self):
-        rumps.quit_application()
-
-    def update(self, **kwargs):
-        if 'icon' in kwargs:
-            self.tray_icon.icon = kwargs['icon']
-
-    def tray_open(self, tray_icon):
-        plexpy.launch_browser(plexpy.CONFIG.HTTP_HOST, plexpy.HTTP_PORT, plexpy.HTTP_ROOT)
-
-    def tray_startup(self, tray_icon):
-        plexpy.CONFIG.LAUNCH_STARTUP = not plexpy.CONFIG.LAUNCH_STARTUP
-        set_startup()
-
-    def tray_browser(self, tray_icon):
-        plexpy.CONFIG.LAUNCH_BROWSER = not plexpy.CONFIG.LAUNCH_BROWSER
-        set_startup()
-
-    def tray_check_update(self, tray_icon):
-        versioncheck.check_update()
-
-    def tray_update(self, tray_icon):
-        if plexpy.UPDATE_AVAILABLE:
-            plexpy.SIGNAL = 'update'
-        else:
-            self.update_title = 'Check for Updates - No Update Available'
-            self.menu[5].title = self.update_title
-
-    def tray_restart(self, tray_icon):
-        plexpy.SIGNAL = 'restart'
-
-    def tray_quit(self, tray_icon):
-        plexpy.SIGNAL = 'shutdown'
-
-    def change_tray_update_icon(self):
-        if plexpy.UPDATE_AVAILABLE:
-            self.update_title = 'Check for Updates - Update Available!'
-        else:
-            self.update_title = 'Check for Updates'
-        self.menu[5].title = self.update_title
-
-    def change_tray_icons(self):
-        self.tray_icon.menu['Start Tautulli at Login'].state = plexpy.CONFIG.LAUNCH_STARTUP
-        self.tray_icon.menu['Open Browser when Tautulli Starts'].state = plexpy.CONFIG.LAUNCH_BROWSER
-
-
-def set_startup():
-    if plexpy.MAC_SYS_TRAY_ICON:
-        plexpy.MAC_SYS_TRAY_ICON.change_tray_icons()
-
-    if plexpy.INSTALL_TYPE == 'macos':
-        if plexpy.CONFIG.LAUNCH_STARTUP:
-            try:
-                subprocess.Popen(['osascript',
-                                  '-e', 'tell application "System Events"',
-                                  '-e', 'get the name of every login item',
-                                  '-e', 'if not exists login item "Tautulli" then '
-                                        'make login item at end with properties '
-                                        '{path:"/Applications/Tautulli.app", hidden:false}',
-                                  '-e', 'end tell'])
-                logger.info("Added Tautulli to MacOS login items.")
-                return True
-            except OSError as e:
-                logger.error("Failed to add Tautulli to MacOS login items: %s", e)
-                return False
-
-        else:
-            try:
-                subprocess.Popen(['osascript',
-                                  '-e', 'tell application "System Events"',
-                                  '-e', 'get the name of every login item',
-                                  '-e', 'if exists login item "Tautulli" then '
-                                        'delete login item "Tautulli"',
-                                  '-e', 'end tell'])
-                logger.info("Removed Tautulli from MacOS login items.")
-                return True
-            except OSError as e:
-                logger.error("Failed to remove Tautulli from MacOS login items: %s", e)
-                return False
-
-    else:
-        launch_agents = os.path.join(os.path.expanduser('~'), 'Library/LaunchAgents')
-        plist_file = 'com.Tautulli.Tautulli.plist'
-        plist_file_path = os.path.join(launch_agents, plist_file)
-
-        exe = sys.executable
-        run_args = [arg for arg in plexpy.ARGS if arg != '--nolaunch']
-        if plexpy.FROZEN:
-            args = [exe] + run_args
-        else:
-            args = [exe, plexpy.FULL_PATH] + run_args
-
-        plist_dict = {
-            'Label': common.PRODUCT,
-            'ProgramArguments': args,
-            'RunAtLoad': True
-        }
-
-        if plexpy.CONFIG.LAUNCH_STARTUP:
-            if not os.path.exists(launch_agents):
-                try:
-                    os.makedirs(launch_agents)
-                except OSError:
-                    return False
-
-            with open(plist_file_path, 'wb') as f:
-                try:
-                    plistlib.dump(plist_dict, f)
-                except AttributeError:
-                    plistlib.writePlist(plist_dict, f)
-                except OSError as e:
-                    logger.error("Failed to create MacOS system startup plist file: %s", e)
-                    return False
-
-            logger.info("Added Tautulli to MacOS system startup launch agents.")
-            return True
-
-        else:
-            try:
-                if os.path.isfile(plist_file_path):
-                    os.remove(plist_file_path)
-                    logger.info("Removed Tautulli from MacOS system startup launch agents.")
-                return True
-            except OSError as e:
-                logger.error("Failed to delete MacOS system startup plist file: %s", e)
-                return False
diff --git a/plexpy/mobile_app.py b/plexpy/mobile_app.py
deleted file mode 100644
index 8ba075d5..00000000
--- a/plexpy/mobile_app.py
+++ /dev/null
@@ -1,221 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#  This file is part of Tautulli.
-#
-#  Tautulli is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  Tautulli 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
-
-import requests
-import threading
-
-from plexpy import database
-from plexpy import helpers
-from plexpy import logger
-
-
-_ONESIGNAL_APP_ID = '3b4b666a-d557-4b92-acdf-e2c8c4b95357'
-_ONESIGNAL_DISABLED = 'onesignal-disabled'
-
-TEMP_DEVICE_TOKENS = {}
-
-
-def set_temp_device_token(token=None, remove=False, add=False, success=False):
-    global TEMP_DEVICE_TOKENS
-
-    if token in TEMP_DEVICE_TOKENS and success:
-        if isinstance(TEMP_DEVICE_TOKENS[token], threading.Timer):
-            TEMP_DEVICE_TOKENS[token].cancel()
-        TEMP_DEVICE_TOKENS[token] = True
-
-    elif token in TEMP_DEVICE_TOKENS and remove:
-        if isinstance(TEMP_DEVICE_TOKENS[token], threading.Timer):
-            TEMP_DEVICE_TOKENS[token].cancel()
-        del TEMP_DEVICE_TOKENS[token]
-
-    elif token not in TEMP_DEVICE_TOKENS and add:
-        invalidate_time = 5 * 60  # 5 minutes
-        TEMP_DEVICE_TOKENS[token] = threading.Timer(invalidate_time, set_temp_device_token, args=[token, True])
-        TEMP_DEVICE_TOKENS[token].start()
-        logger._BLACKLIST_WORDS.add(token)
-
-
-def get_temp_device_token(token=None):
-    return TEMP_DEVICE_TOKENS.get(token)
-
-
-def get_mobile_devices(device_id=None, device_token=None):
-    where = where_id = where_token = ''
-    args = []
-
-    if device_id or device_token:
-        where = "WHERE "
-        if device_id:
-            where_id += "device_id = ?"
-            args.append(device_id)
-        if device_token:
-            where_token = "device_token = ?"
-            args.append(device_token)
-        where += " AND ".join([w for w in [where_id, where_token] if w])
-
-    db = database.MonitorDatabase()
-    result = db.select("SELECT * FROM mobile_devices %s" % where, args=args)
-
-    return result
-
-
-def get_mobile_device_by_token(device_token=None):
-    if not device_token:
-        return None
-
-    return get_mobile_devices(device_token=device_token)
-
-
-def add_mobile_device(device_id=None, device_name=None, device_token=None,
-                      platform=None, version=None, friendly_name=None, onesignal_id=None):
-    db = database.MonitorDatabase()
-
-    keys = {'device_id': device_id}
-    values = {'device_name': device_name,
-              'device_token': device_token,
-              'platform': platform,
-              'version': version,
-              'onesignal_id': onesignal_id}
-
-    if friendly_name:
-        values['friendly_name'] = friendly_name
-
-    try:
-        result = db.upsert(table_name='mobile_devices', key_dict=keys, value_dict=values)
-        blacklist_logger()
-    except Exception as e:
-        logger.warn("Tautulli MobileApp :: Failed to register mobile device in the database: %s." % e)
-        return
-
-    if result == 'insert':
-        logger.info("Tautulli MobileApp :: Registered mobile device '%s' in the database." % device_name)
-    else:
-        logger.info("Tautulli MobileApp :: Re-registered mobile device '%s' in the database." % device_name)
-
-    set_last_seen(device_token=device_token)
-    threading.Thread(target=set_official, args=[device_id, onesignal_id]).start()
-    return True
-
-
-def get_mobile_device_config(mobile_device_id=None):
-    if str(mobile_device_id).isdigit():
-        mobile_device_id = int(mobile_device_id)
-    else:
-        logger.error("Tautulli MobileApp :: Unable to retrieve mobile device config: invalid mobile_device_id %s." % mobile_device_id)
-        return None
-
-    db = database.MonitorDatabase()
-    result = db.select_single("SELECT * FROM mobile_devices WHERE id = ?",
-                              args=[mobile_device_id])
-
-    if result['onesignal_id'] == _ONESIGNAL_DISABLED:
-        result['onesignal_id'] = ''
-
-    return result
-
-
-def set_mobile_device_config(mobile_device_id=None, **kwargs):
-    if str(mobile_device_id).isdigit():
-        mobile_device_id = int(mobile_device_id)
-    else:
-        logger.error("Tautulli MobileApp :: Unable to set existing mobile device: invalid mobile_device_id %s." % mobile_device_id)
-        return False
-
-    keys = {'id': mobile_device_id}
-    values = {'friendly_name': kwargs.get('friendly_name', '')}
-
-    db = database.MonitorDatabase()
-    try:
-        db.upsert(table_name='mobile_devices', key_dict=keys, value_dict=values)
-        logger.info("Tautulli MobileApp :: Updated mobile device agent: mobile_device_id %s." % mobile_device_id)
-        blacklist_logger()
-        return True
-    except Exception as e:
-        logger.warn("Tautulli MobileApp :: Unable to update mobile device: %s." % e)
-        return False
-
-
-def delete_mobile_device(mobile_device_id=None, device_id=None):
-    db = database.MonitorDatabase()
-
-    if mobile_device_id:
-        logger.debug("Tautulli MobileApp :: Deleting mobile_device_id %s from the database." % mobile_device_id)
-        result = db.action("DELETE FROM mobile_devices WHERE id = ?", args=[mobile_device_id])
-        return True
-    elif device_id:
-        logger.debug("Tautulli MobileApp :: Deleting device_id %s from the database." % device_id)
-        result = db.action("DELETE FROM mobile_devices WHERE device_id = ?", args=[device_id])
-        return True
-    else:
-        return False
-
-
-def set_official(device_id, onesignal_id):
-    db = database.MonitorDatabase()
-    official = validate_onesignal_id(onesignal_id=onesignal_id)
-    platform = 'android' if official > 0 else None
-
-    try:
-        result = db.action("UPDATE mobile_devices "
-                           "SET official = ?, platform = coalesce(platform, ?) "
-                           "WHERE device_id = ?",
-                           args=[official, platform, device_id])
-    except Exception as e:
-        logger.warn("Tautulli MobileApp :: Failed to set official flag for device: %s." % e)
-        return
-
-
-def set_last_seen(device_token=None):
-    db = database.MonitorDatabase()
-    last_seen = helpers.timestamp()
-
-    try:
-        result = db.action("UPDATE mobile_devices SET last_seen = ? WHERE device_token = ?",
-                           args=[last_seen, device_token])
-    except Exception as e:
-        logger.warn("Tautulli MobileApp :: Failed to set last_seen time for device: %s." % e)
-        return
-
-
-def validate_onesignal_id(onesignal_id):
-    if onesignal_id is None:
-        return 0
-    elif onesignal_id == _ONESIGNAL_DISABLED:
-        return 2
-
-    headers = {'Content-Type': 'application/json'}
-
-    logger.info("Tautulli MobileApp :: Validating OneSignal ID")
-    try:
-        r = requests.get(f'https://api.onesignal.com/apps/{_ONESIGNAL_APP_ID}/subscriptions/{onesignal_id}/user/identity', headers=headers)
-        status_code = r.status_code
-        logger.info("Tautulli MobileApp :: OneSignal ID validation returned status code %s", status_code)
-        return int(status_code == 200)
-    except Exception as e:
-        logger.warn("Tautulli MobileApp :: Failed to validate OneSignal ID: %s." % e)
-        return -1
-
-
-def revalidate_onesignal_ids():
-    for device in get_mobile_devices():
-        set_official(device['device_id'], device['onesignal_id'])
-
-
-def blacklist_logger():
-    devices = get_mobile_devices()
-    for d in devices:
-        logger.blacklist_config(d)
diff --git a/plexpy/newsletter_handler.py b/plexpy/newsletter_handler.py
deleted file mode 100644
index 05cb52fa..00000000
--- a/plexpy/newsletter_handler.py
+++ /dev/null
@@ -1,229 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#  This file is part of Tautulli.
-#
-#  Tautulli is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  Tautulli 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
-
-from io import open
-import os
-import shlex
-
-from apscheduler.triggers.cron import CronTrigger
-import email.utils
-
-import plexpy
-from plexpy import database
-from plexpy import helpers
-from plexpy import logger
-from plexpy import newsletters
-
-
-NEWSLETTER_SCHED = None
-
-
-def add_newsletter_each(newsletter_id=None, notify_action=None, **kwargs):
-    if not notify_action:
-        logger.debug("Tautulli NewsletterHandler :: Notify called but no action received.")
-        return
-
-    data = {'newsletter': True,
-            'newsletter_id': newsletter_id,
-            'notify_action': notify_action}
-    data.update(kwargs)
-    plexpy.NOTIFY_QUEUE.put(data)
-
-
-def schedule_newsletters(newsletter_id=None):
-    newsletters_list = newsletters.get_newsletters(newsletter_id=newsletter_id)
-
-    for newsletter in newsletters_list:
-        newsletter_job_name = '{} (newsletter_id {})'.format(newsletter['agent_label'], newsletter['id'])
-
-        if newsletter['active']:
-            schedule_newsletter_job('newsletter-{}'.format(newsletter['id']), name=newsletter_job_name,
-                                    func=add_newsletter_each, args=[newsletter['id'], 'on_cron'], cron=newsletter['cron'])
-        else:
-            schedule_newsletter_job('newsletter-{}'.format(newsletter['id']), name=newsletter_job_name,
-                                    remove_job=True)
-
-
-def schedule_newsletter_job(newsletter_job_id, name='', func=None, remove_job=False, args=None, cron=None):
-    if cron:
-        values = shlex.split(cron)
-        # apscheduler day_of_week uses 0-6 = mon-sun
-        values[4] = str((int(values[4]) - 1) % 7) if values[4].isdigit() else values[4]
-
-    if NEWSLETTER_SCHED.get_job(newsletter_job_id):
-        if remove_job:
-            NEWSLETTER_SCHED.remove_job(newsletter_job_id)
-            logger.info("Tautulli NewsletterHandler :: Removed scheduled newsletter: %s" % name)
-        else:
-            try:
-                NEWSLETTER_SCHED.reschedule_job(
-                    newsletter_job_id, args=args, trigger=CronTrigger(
-                        minute=values[0], hour=values[1], day=values[2], month=values[3], day_of_week=values[4]
-                    )
-                )
-                logger.info("Tautulli NewsletterHandler :: Re-scheduled newsletter: %s" % name)
-            except ValueError as e:
-                logger.error("Tautulli NewsletterHandler :: Failed to re-schedule newsletter: %s" % e)
-    elif not remove_job:
-        try:
-            NEWSLETTER_SCHED.add_job(
-                func, args=args, id=newsletter_job_id, trigger=CronTrigger(
-                    minute=values[0], hour=values[1], day=values[2], month=values[3], day_of_week=values[4]
-                ),
-                misfire_grace_time=None
-            )
-            logger.info("Tautulli NewsletterHandler :: Scheduled newsletter: %s" % name)
-        except ValueError as e:
-            logger.error("Tautulli NewsletterHandler :: Failed to schedule newsletter: %s" % e)
-
-
-def notify(newsletter_id=None, notify_action=None, **kwargs):
-    logger.info("Tautulli NewsletterHandler :: Preparing newsletter for newsletter_id %s." % newsletter_id)
-
-    newsletter_config = newsletters.get_newsletter_config(newsletter_id=newsletter_id)
-
-    if not newsletter_config:
-        return
-
-    if notify_action in ('test', 'api'):
-        subject = kwargs.pop('subject', None) or newsletter_config['subject']
-        body = kwargs.pop('body', None) or newsletter_config['body']
-        message = kwargs.pop('message', None) or newsletter_config['message']
-    else:
-        subject = newsletter_config['subject']
-        body = newsletter_config['body']
-        message = newsletter_config['message']
-
-    email_msg_id = email.utils.make_msgid()
-    email_reply_msg_id = get_last_newsletter_email_msg_id(newsletter_id=newsletter_id, notify_action=notify_action)
-
-    newsletter_agent = newsletters.get_agent_class(newsletter_id=newsletter_id,
-                                                   newsletter_id_name=newsletter_config['id_name'],
-                                                   agent_id=newsletter_config['agent_id'],
-                                                   config=newsletter_config['config'],
-                                                   email_config=newsletter_config['email_config'],
-                                                   subject=subject,
-                                                   body=body,
-                                                   message=message,
-                                                   email_msg_id=email_msg_id,
-                                                   email_reply_msg_id=email_reply_msg_id
-                                                   )
-
-    # Set the newsletter state in the db
-    newsletter_log_id = set_notify_state(newsletter=newsletter_config,
-                                         notify_action=notify_action,
-                                         subject=newsletter_agent.subject_formatted,
-                                         body=newsletter_agent.body_formatted,
-                                         message=newsletter_agent.message_formatted,
-                                         filename=newsletter_agent.filename_formatted,
-                                         start_date=newsletter_agent.start_date.format('YYYY-MM-DD'),
-                                         end_date=newsletter_agent.end_date.format('YYYY-MM-DD'),
-                                         start_time=newsletter_agent.start_time,
-                                         end_time=newsletter_agent.end_time,
-                                         newsletter_uuid=newsletter_agent.uuid,
-                                         email_msg_id=email_msg_id)
-
-    # Send the notification
-    success = newsletter_agent.send()
-
-    if success:
-        set_notify_success(newsletter_log_id)
-        return True
-
-
-def set_notify_state(newsletter, notify_action, subject, body, message, filename,
-                     start_date, end_date, start_time, end_time, newsletter_uuid, email_msg_id):
-
-    if newsletter and notify_action:
-        db = database.MonitorDatabase()
-
-        keys = {'timestamp': helpers.timestamp(),
-                'uuid': newsletter_uuid}
-
-        values = {'newsletter_id': newsletter['id'],
-                  'agent_id': newsletter['agent_id'],
-                  'agent_name': newsletter['agent_name'],
-                  'notify_action': notify_action,
-                  'subject_text': subject,
-                  'body_text': body,
-                  'message_text': message,
-                  'start_date': start_date,
-                  'end_date': end_date,
-                  'start_time': start_time,
-                  'end_time': end_time,
-                  'email_msg_id': email_msg_id,
-                  'filename': filename}
-
-        db.upsert(table_name='newsletter_log', key_dict=keys, value_dict=values)
-        return db.last_insert_id()
-    else:
-        logger.error("Tautulli NewsletterHandler :: Unable to set notify state.")
-
-
-def set_notify_success(newsletter_log_id):
-    keys = {'id': newsletter_log_id}
-    values = {'success': 1}
-
-    db = database.MonitorDatabase()
-    db.upsert(table_name='newsletter_log', key_dict=keys, value_dict=values)
-
-
-def get_last_newsletter_email_msg_id(newsletter_id, notify_action):
-    db = database.MonitorDatabase()
-
-    result = db.select_single("SELECT email_msg_id FROM newsletter_log "
-                              "WHERE newsletter_id = ? AND notify_action = ? AND success = 1 "
-                              "ORDER BY timestamp DESC LIMIT 1", [newsletter_id, notify_action])
-
-    if result:
-        return result['email_msg_id']
-
-
-def get_newsletter(newsletter_uuid=None, newsletter_id_name=None):
-    db = database.MonitorDatabase()
-
-    if newsletter_uuid:
-        result = db.select_single("SELECT start_date, end_date, uuid, filename FROM newsletter_log "
-                                  "WHERE uuid = ?", [newsletter_uuid])
-    elif newsletter_id_name:
-        result = db.select_single("SELECT start_date, end_date, uuid, filename FROM newsletter_log "
-                                  "JOIN newsletters ON newsletters.id = newsletter_log.newsletter_id "
-                                  "WHERE id_name = ? AND notify_action != 'test' "
-                                  "ORDER BY timestamp DESC LIMIT 1", [newsletter_id_name])
-    else:
-        result = None
-
-    if result:
-        newsletter_uuid = result['uuid']
-        start_date = result['start_date']
-        end_date = result['end_date']
-        newsletter_file = result['filename'] or 'newsletter_%s-%s_%s.html' % (start_date.replace('-', ''),
-                                                                              end_date.replace('-', ''),
-                                                                              newsletter_uuid)
-
-        newsletter_folder = plexpy.CONFIG.NEWSLETTER_DIR or os.path.join(plexpy.DATA_DIR, 'newsletters')
-        newsletter_file_fp = os.path.join(newsletter_folder, newsletter_file)
-
-        if newsletter_file in os.listdir(newsletter_folder):
-            try:
-                with open(newsletter_file_fp, 'r', encoding='utf-8') as n_file:
-                    newsletter = n_file.read()
-                return newsletter
-            except OSError as e:
-                logger.error("Tautulli NewsletterHandler :: Failed to retrieve newsletter '%s': %s" % (newsletter_uuid, e))
-        else:
-            logger.warn("Tautulli NewsletterHandler :: Newsletter file '%s' is missing." % newsletter_file)
diff --git a/plexpy/newsletters.py b/plexpy/newsletters.py
deleted file mode 100644
index c44b505f..00000000
--- a/plexpy/newsletters.py
+++ /dev/null
@@ -1,980 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#  This file is part of Tautulli.
-#
-#  Tautulli is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  Tautulli 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
-
-from collections import OrderedDict
-import json
-from itertools import groupby
-import os
-import re
-
-import arrow
-from mako.lookup import TemplateLookup
-from mako import exceptions
-
-import plexpy
-from plexpy import common
-from plexpy import database
-from plexpy import helpers
-from plexpy import libraries
-from plexpy import logger
-from plexpy import newsletter_handler
-from plexpy import pmsconnect
-from plexpy.notifiers import send_notification, EMAIL
-
-
-AGENT_IDS = {
-    'recently_added': 0
-}
-
-
-def available_newsletter_agents():
-    agents = [
-        {
-            'label': 'Recently Added',
-            'name': 'recently_added',
-            'id': AGENT_IDS['recently_added']
-        }
-    ]
-
-    return agents
-
-
-def available_notification_actions():
-    actions = [{'label': 'Schedule',
-                'name': 'on_cron',
-                'description': 'Trigger a notification on a certain schedule.',
-                'subject': 'Tautulli Newsletter',
-                'body': 'Tautulli Newsletter',
-                'message': '',
-                'icon': 'fa-calendar',
-                'media_types': ('newsletter',)
-                }
-               ]
-
-    return actions
-
-
-def get_agent_class(newsletter_id=None, newsletter_id_name=None, agent_id=None, config=None, email_config=None,
-                    start_date=None, end_date=None, subject=None, body=None, message=None,
-                    email_msg_id=None, email_reply_msg_id=None):
-    if str(agent_id).isdigit():
-        agent_id = int(agent_id)
-
-        kwargs = {'newsletter_id': newsletter_id,
-                  'newsletter_id_name': newsletter_id_name,
-                  'config': config,
-                  'email_config': email_config,
-                  'start_date': start_date,
-                  'end_date': end_date,
-                  'subject': subject,
-                  'body': body,
-                  'message': message,
-                  'email_msg_id': email_msg_id,
-                  'email_reply_msg_id': email_reply_msg_id}
-
-        if agent_id == 0:
-            return RecentlyAdded(**kwargs)
-        else:
-            return Newsletter(**kwargs)
-    else:
-        return None
-
-
-def get_newsletter_agents():
-    return tuple(a['name'] for a in sorted(available_newsletter_agents(), key=lambda k: k['label']))
-
-
-def get_newsletters(newsletter_id=None):
-    where = where_id = ''
-    args = []
-
-    if newsletter_id:
-        where = "WHERE "
-        if newsletter_id:
-            where_id += "newsletters.id = ?"
-            args.append(newsletter_id)
-        where += " AND ".join([w for w in [where_id] if w])
-
-    db = database.MonitorDatabase()
-    result = db.select(
-        (
-            "SELECT newsletters.id, newsletters.agent_id, newsletters.agent_name, newsletters.agent_label, "
-            "newsletters.friendly_name, newsletters.cron, newsletters.active, "
-            "MAX(newsletter_log.timestamp) AS last_triggered, newsletter_log.success AS last_success "
-            "FROM newsletters "
-            "LEFT OUTER JOIN newsletter_log ON newsletters.id = newsletter_log.newsletter_id "
-            "%s "
-            "GROUP BY newsletters.id"
-        ) % where, args=args
-    )
-
-    return result
-
-
-def delete_newsletter(newsletter_id=None):
-    db = database.MonitorDatabase()
-
-    if str(newsletter_id).isdigit():
-        logger.debug("Tautulli Newsletters :: Deleting newsletter_id %s from the database."
-                     % newsletter_id)
-        result = db.action("DELETE FROM newsletters WHERE id = ?", args=[newsletter_id])
-        return True
-    else:
-        return False
-
-
-def get_newsletter_config(newsletter_id=None, mask_passwords=False):
-    if str(newsletter_id).isdigit():
-        newsletter_id = int(newsletter_id)
-    else:
-        logger.error("Tautulli Newsletters :: Unable to retrieve newsletter config: invalid newsletter_id %s."
-                     % newsletter_id)
-        return None
-
-    db = database.MonitorDatabase()
-    result = db.select_single("SELECT * FROM newsletters WHERE id = ?", args=[newsletter_id])
-
-    if not result:
-        return None
-
-    try:
-        config = json.loads(result.pop('newsletter_config', '{}'))
-        email_config = json.loads(result.pop('email_config', '{}'))
-        subject = result.pop('subject')
-        body = result.pop('body')
-        message = result.pop('message')
-        newsletter_agent = get_agent_class(newsletter_id=newsletter_id, newsletter_id_name=result['id_name'],
-                                           agent_id=result['agent_id'],
-                                           config=config, email_config=email_config,
-                                           subject=subject, body=body, message=message)
-    except Exception as e:
-        logger.error("Tautulli Newsletters :: Failed to get newsletter config options: %s." % e)
-        return
-
-    if mask_passwords:
-        newsletter_agent.email_config = helpers.mask_config_passwords(newsletter_agent.email_config)
-
-    result['subject'] = newsletter_agent.subject
-    result['body'] = newsletter_agent.body
-    result['message'] = newsletter_agent.message
-    result['config'] = newsletter_agent.config
-    result['email_config'] = newsletter_agent.email_config
-    result['config_options'] = newsletter_agent.return_config_options(mask_passwords=mask_passwords)
-    result['email_config_options'] = newsletter_agent.return_email_config_options(mask_passwords=mask_passwords)
-
-    return result
-
-
-def add_newsletter_config(agent_id=None, **kwargs):
-    if str(agent_id).isdigit():
-        agent_id = int(agent_id)
-    else:
-        logger.error("Tautulli Newsletters :: Unable to add new newsletter: invalid agent_id %s."
-                     % agent_id)
-        return False
-
-    agent = next((a for a in available_newsletter_agents() if a['id'] == agent_id), None)
-
-    if not agent:
-        logger.error("Tautulli Newsletters :: Unable to retrieve new newsletter agent: invalid agent_id %s."
-                     % agent_id)
-        return False
-
-    agent_class = get_agent_class(agent_id=agent['id'])
-
-    keys = {'id': None}
-    values = {'agent_id': agent['id'],
-              'agent_name': agent['name'],
-              'agent_label': agent['label'],
-              'id_name': '',
-              'friendly_name': '',
-              'newsletter_config': json.dumps(agent_class.config),
-              'email_config': json.dumps(agent_class.email_config),
-              'subject': agent_class.subject,
-              'body': agent_class.body,
-              'message': agent_class.message
-              }
-
-    db = database.MonitorDatabase()
-    try:
-        db.upsert(table_name='newsletters', key_dict=keys, value_dict=values)
-        newsletter_id = db.last_insert_id()
-        logger.info("Tautulli Newsletters :: Added new newsletter agent: %s (newsletter_id %s)."
-                    % (agent['label'], newsletter_id))
-        blacklist_logger()
-        return newsletter_id
-    except Exception as e:
-        logger.warn("Tautulli Newsletters :: Unable to add newsletter agent: %s." % e)
-        return False
-
-
-def set_newsletter_config(newsletter_id=None, agent_id=None, **kwargs):
-    if str(agent_id).isdigit():
-        agent_id = int(agent_id)
-    else:
-        logger.error("Tautulli Newsletters :: Unable to set existing newsletter: invalid agent_id %s."
-                     % agent_id)
-        return False
-
-    agent = next((a for a in available_newsletter_agents() if a['id'] == agent_id), None)
-
-    if not agent:
-        logger.error("Tautulli Newsletters :: Unable to retrieve existing newsletter agent: invalid agent_id %s."
-                     % agent_id)
-        return False
-
-    config_prefix = 'newsletter_config_'
-    email_config_prefix = 'newsletter_email_'
-
-    newsletter_config = {k[len(config_prefix):]: kwargs.pop(k)
-                         for k in list(kwargs.keys()) if k.startswith(config_prefix)}
-    email_config = {k[len(email_config_prefix):]: kwargs.pop(k)
-                    for k in list(kwargs.keys()) if k.startswith(email_config_prefix)}
-
-    for cfg, val in email_config.items():
-        # Check for a password config keys and a blank password from the HTML form
-        if 'password' in cfg and val == '    ':
-            # Get the previous password so we don't overwrite it with a blank value
-            old_newsletter_config = get_newsletter_config(newsletter_id=newsletter_id)
-            email_config[cfg] = old_newsletter_config['email_config'][cfg]
-
-    subject = kwargs.pop('subject')
-    body = kwargs.pop('body')
-    message = kwargs.pop('message')
-
-    agent_class = get_agent_class(agent_id=agent['id'],
-                                  config=newsletter_config, email_config=email_config,
-                                  subject=subject, body=body, message=message)
-
-    keys = {'id': newsletter_id}
-    values = {'agent_id': agent['id'],
-              'agent_name': agent['name'],
-              'agent_label': agent['label'],
-              'id_name': kwargs.get('id_name', ''),
-              'friendly_name': kwargs.get('friendly_name', ''),
-              'newsletter_config': json.dumps(agent_class.config),
-              'email_config': json.dumps(agent_class.email_config),
-              'subject': agent_class.subject,
-              'body': agent_class.body,
-              'message': agent_class.message,
-              'cron': kwargs.get('cron'),
-              'active': kwargs.get('active')
-              }
-
-    db = database.MonitorDatabase()
-    try:
-        db.upsert(table_name='newsletters', key_dict=keys, value_dict=values)
-        logger.info("Tautulli Newsletters :: Updated newsletter agent: %s (newsletter_id %s)."
-                    % (agent['label'], newsletter_id))
-        newsletter_handler.schedule_newsletters(newsletter_id=newsletter_id)
-        blacklist_logger()
-        return True
-    except Exception as e:
-        logger.warn("Tautulli Newsletters :: Unable to update newsletter agent: %s." % e)
-        return False
-
-
-def send_newsletter(newsletter_id=None, subject=None, body=None, message=None, newsletter_log_id=None, **kwargs):
-    newsletter_config = get_newsletter_config(newsletter_id=newsletter_id)
-    if newsletter_config:
-        agent = get_agent_class(agent_id=newsletter_config['agent_id'],
-                                config=newsletter_config['config'],
-                                email_config=newsletter_config['email_config'],
-                                subject=subject,
-                                body=body,
-                                message=message)
-        return agent.send()
-    else:
-        logger.debug("Tautulli Newsletters :: Notification requested but no newsletter_id received.")
-
-
-def blacklist_logger():
-    db = database.MonitorDatabase()
-    notifiers = db.select("SELECT newsletter_config, email_config FROM newsletters")
-
-    for n in notifiers:
-        config = json.loads(n['newsletter_config'] or '{}')
-        logger.blacklist_config(config)
-        email_config = json.loads(n['email_config'] or '{}')
-        logger.blacklist_config(email_config)
-
-
-def serve_template(template_name, **kwargs):
-    if plexpy.CONFIG.NEWSLETTER_CUSTOM_DIR:
-        logger.info("Tautulli Newsletters :: Using custom newsletter template directory.")
-        template_dir = plexpy.CONFIG.NEWSLETTER_CUSTOM_DIR
-    else:
-        interface_dir = os.path.join(str(plexpy.PROG_DIR), 'data/interfaces/')
-        template_dir = os.path.join(str(interface_dir), plexpy.CONFIG.NEWSLETTER_TEMPLATES)
-
-        if not plexpy.CONFIG.NEWSLETTER_INLINE_STYLES:
-            template_name = template_name.replace('.html', '.internal.html')
-
-    _hplookup = TemplateLookup(directories=[template_dir], default_filters=['unicode', 'h'])
-
-    try:
-        template = _hplookup.get_template(template_name)
-        return template.render(**kwargs), False
-    except:
-        return exceptions.html_error_template().render(), True
-
-
-def generate_newsletter_uuid():
-    uuid = ''
-    uuid_exists = 0
-    db = database.MonitorDatabase()
-
-    while not uuid or uuid_exists:
-        uuid = plexpy.generate_uuid()[:8]
-        result = db.select_single(
-            "SELECT EXISTS(SELECT uuid FROM newsletter_log WHERE uuid = ?) as uuid_exists", [uuid])
-        uuid_exists = result['uuid_exists']
-
-    return uuid
-
-
-class Newsletter(object):
-    NAME = ''
-    _DEFAULT_CONFIG = {'custom_cron': 0,
-                       'time_frame': 7,
-                       'time_frame_units': 'days',
-                       'formatted': 1,
-                       'threaded': 0,
-                       'notifier_id': 0,
-                       'filename': '',
-                       'save_only': 0}
-    _DEFAULT_EMAIL_CONFIG = EMAIL().return_default_config()
-    _DEFAULT_EMAIL_CONFIG['from_name'] = 'Tautulli Newsletter'
-    _DEFAULT_EMAIL_CONFIG['notifier_id'] = 0
-    _DEFAULT_SUBJECT = 'Tautulli Newsletter'
-    _DEFAULT_BODY = 'View the newsletter here: {newsletter_url}'
-    _DEFAULT_MESSAGE = ''
-    _DEFAULT_FILENAME = 'newsletter_{newsletter_uuid}.html'
-    _TEMPLATE = ''
-
-    def __init__(self, newsletter_id=None, newsletter_id_name=None, config=None, email_config=None,
-                 start_date=None, end_date=None, subject=None, body=None, message=None,
-                 email_msg_id=None, email_reply_msg_id=None):
-        self.config = self.set_config(config=config, default=self._DEFAULT_CONFIG)
-        self.email_config = self.set_config(config=email_config, default=self._DEFAULT_EMAIL_CONFIG)
-        self.uuid = generate_newsletter_uuid()
-
-        self.email_msg_id = email_msg_id
-        self.email_reply_msg_id = email_reply_msg_id
-
-        self.newsletter_id = newsletter_id
-        self.newsletter_id_name = newsletter_id_name or ''
-        self.start_date = None
-        self.end_date = None
-
-        if end_date:
-            try:
-                self.end_date = arrow.get(end_date, 'YYYY-MM-DD', tzinfo='local').ceil('day')
-            except ValueError:
-                pass
-
-        if self.end_date is None:
-            self.end_date = arrow.now()
-
-        if start_date:
-            try:
-                self.start_date = arrow.get(start_date, 'YYYY-MM-DD', tzinfo='local').floor('day')
-            except ValueError:
-                pass
-
-        if self.start_date is None:
-            if self.config['time_frame_units'] == 'months':
-                self.start_date = self.end_date.shift(months=-self.config['time_frame'])
-            elif self.config['time_frame_units'] == 'days':
-                self.start_date = self.end_date.shift(days=-self.config['time_frame'])
-            else:
-                self.start_date = self.end_date.shift(hours=-self.config['time_frame'])
-
-        self.end_time = self.end_date.timestamp()
-        self.start_time = self.start_date.timestamp()
-
-        self.parameters = self.build_params()
-        self.subject = subject or self._DEFAULT_SUBJECT
-        self.body = body or self._DEFAULT_BODY
-        self.message = message or self._DEFAULT_MESSAGE
-        self.filename = self.config['filename'] or self._DEFAULT_FILENAME
-
-        if not self.filename.endswith('.html'):
-            self.filename += '.html'
-
-        self.subject_formatted, self.body_formatted, self.message_formatted = self.build_text()
-        self.filename_formatted = self.build_filename()
-
-        self.data = {}
-        self.newsletter = None
-
-        self.is_preview = False
-        self.template_error = None
-
-    def set_config(self, config=None, default=None):
-        return self._validate_config(config=config, default=default)
-
-    def _validate_config(self, config=None, default=None):
-        if config is None:
-            return default
-
-        new_config = {}
-        for k, v in default.items():
-            if isinstance(v, int):
-                new_config[k] = helpers.cast_to_int(config.get(k, v))
-            elif isinstance(v, list):
-                c = config.get(k, v)
-                if not isinstance(c, list):
-                    new_config[k] = [c]
-                else:
-                    new_config[k] = c
-            else:
-                new_config[k] = config.get(k, v)
-
-        return new_config
-
-    def retrieve_data(self):
-        pass
-
-    def _has_data(self):
-        return False
-
-    def raw_data(self, preview=False):
-        if preview:
-            self.is_preview = True
-
-        self.retrieve_data()
-
-        # Convert CustomArrow to string
-        from plexpy.notification_handler import CustomArrow
-        parameters = {k: str(v) if isinstance(v, CustomArrow) else v for k, v in self.parameters.items()}
-
-        return {'title': self.NAME,
-                'parameters': parameters,
-                'data': self.data}
-
-    def generate_newsletter(self, preview=False):
-        if preview:
-            self.is_preview = True
-
-        self.retrieve_data()
-
-        logger.info("Tautulli Newsletters :: Generating newsletter%s." % (' preview' if self.is_preview else ''))
-
-        newsletter_rendered, self.template_error = serve_template(
-            template_name=self._TEMPLATE,
-            uuid=self.uuid,
-            subject=self.subject_formatted,
-            body=self.body_formatted,
-            message=self.message_formatted,
-            parameters=self.parameters,
-            data=self.data,
-            preview=self.is_preview
-        )
-
-        if self.template_error:
-            return newsletter_rendered
-
-        # Force Tautulli footer
-        if '<!-- FOOTER MESSAGE - DO NOT REMOVE -->' in newsletter_rendered:
-            newsletter_rendered = newsletter_rendered.replace(
-                '<!-- FOOTER MESSAGE - DO NOT REMOVE -->',
-                'Newsletter generated by <a href="https://tautulli.com" target="_blank" '
-                'style="text-decoration: underline;color: inherit;font-size: inherit;">Tautulli</a>.'
-            )
-
-        else:
-            msg = ('<div style="text-align: center;padding-top: 100px;padding-bottom: 100px;">'
-                   '<p style="font-family: \'Open Sans\', Helvetica, Arial, sans-serif;color: #282A2D;'
-                   'font-size: 18px;line-height: 30px;">'
-                   'The Tautulli newsletter footer was removed from the newsletter template.<br>'
-                   'Please leave the footer in place as it is unobtrusive and supports '
-                   '<a href="https://tautulli.com" target="_blank">Tautulli</a>.<br>Thank you.'
-                   '</p></div>')
-            newsletter_rendered = re.sub(r'(<body.*?>)', r'\1' + msg, newsletter_rendered)
-
-        return newsletter_rendered
-
-    def send(self):
-        self.newsletter = self.generate_newsletter()
-
-        if self.template_error:
-            logger.error("Tautulli Newsletters :: %s newsletter failed to render template. Newsletter not sent." % self.NAME)
-            return False
-
-        if not self._has_data():
-            logger.warn("Tautulli Newsletters :: %s newsletter has no data. Newsletter not sent." % self.NAME)
-            return False
-
-        self._save()
-
-        if self.config['save_only']:
-            return True
-
-        return self._send()
-
-    def _save(self):
-        newsletter_file = self.filename_formatted
-        newsletter_folder = plexpy.CONFIG.NEWSLETTER_DIR or os.path.join(plexpy.DATA_DIR, 'newsletters')
-        newsletter_file_fp = os.path.join(newsletter_folder, newsletter_file)
-
-        # In case the user has deleted it manually
-        if not os.path.exists(newsletter_folder):
-            os.makedirs(newsletter_folder)
-
-        try:
-            with open(newsletter_file_fp, 'wb') as n_file:
-                for line in self.newsletter.splitlines():
-                    if '<!-- IGNORE SAVE -->' not in line:
-                        n_file.write((line + '\r\n').encode('utf-8'))
-                        #n_file.write(line.strip())
-
-            logger.info("Tautulli Newsletters :: %s newsletter saved to '%s'" % (self.NAME, newsletter_file))
-        except OSError as e:
-            logger.error("Tautulli Newsletters :: Failed to save %s newsletter to '%s': %s"
-                         % (self.NAME, newsletter_file, e))
-
-    def _send(self):
-        if self.config['formatted']:
-            newsletter_stripped = ''.join(l.strip() for l in self.newsletter.splitlines())
-
-            plaintext = 'HTML email support is required to view the newsletter.\n'
-            if plexpy.CONFIG.NEWSLETTER_SELF_HOSTED and plexpy.CONFIG.HTTP_BASE_URL:
-                plaintext += self._DEFAULT_BODY.format(**self.parameters)
-
-            email_reply_msg_id = self.email_reply_msg_id if self.config['threaded'] else None
-
-            if self.email_config['notifier_id']:
-                return send_notification(
-                    notifier_id=self.email_config['notifier_id'],
-                    subject=self.subject_formatted,
-                    body=newsletter_stripped,
-                    plaintext=plaintext,
-                    msg_id=self.email_msg_id,
-                    reply_msg_id=email_reply_msg_id
-                )
-
-            else:
-                email = EMAIL(config=self.email_config)
-                return email.notify(
-                    subject=self.subject_formatted,
-                    body=newsletter_stripped,
-                    plaintext=plaintext,
-                    msg_id=self.email_msg_id,
-                    reply_msg_id=email_reply_msg_id
-                )
-        elif self.config['notifier_id']:
-            return send_notification(
-                    notifier_id=self.config['notifier_id'],
-                    subject=self.subject_formatted,
-                    body=self.body_formatted
-                )
-
-    def build_params(self):
-        parameters = self._build_params()
-
-        return parameters
-
-    def _build_params(self):
-        from plexpy.notification_handler import CustomArrow
-        
-        date_format = helpers.momentjs_to_arrow(plexpy.CONFIG.DATE_FORMAT)
-
-        if plexpy.CONFIG.NEWSLETTER_SELF_HOSTED and plexpy.CONFIG.HTTP_BASE_URL:
-            base_url = plexpy.CONFIG.HTTP_BASE_URL + plexpy.HTTP_ROOT + 'newsletter/'
-        else:
-            base_url = helpers.get_plexpy_url() + '/newsletter/'
-
-        parameters = {
-            'server_name': helpers.pms_name(),
-            'start_date': CustomArrow(self.start_date, date_format),
-            'end_date': CustomArrow(self.end_date, date_format),
-            'current_year': self.start_date.year,
-            'current_month': self.start_date.month,
-            'current_day': self.start_date.day,
-            'current_hour': self.start_date.hour,
-            'current_minute': self.start_date.minute,
-            'current_second': self.start_date.second,
-            'current_weekday': self.start_date.isocalendar()[2],
-            'current_week': self.start_date.isocalendar()[1],
-            'week_number': self.start_date.isocalendar()[1],
-            'newsletter_time_frame': self.config['time_frame'],
-            'newsletter_time_frame_units': self.config['time_frame_units'],
-            'newsletter_url': base_url + self.uuid,
-            'newsletter_static_url': base_url + 'id/' + self.newsletter_id_name,
-            'newsletter_uuid': self.uuid,
-            'newsletter_id': self.newsletter_id,
-            'newsletter_id_name': self.newsletter_id_name,
-            'newsletter_password': plexpy.CONFIG.NEWSLETTER_PASSWORD
-        }
-
-        return parameters
-
-    def build_text(self):
-        from plexpy.notification_handler import CustomFormatter
-        custom_formatter = CustomFormatter()
-
-        try:
-            subject = custom_formatter.format(str(self.subject), **self.parameters)
-        except LookupError as e:
-            logger.error("Tautulli Newsletter :: Unable to parse parameter %s in newsletter subject. Using fallback." % e)
-            subject = str(self._DEFAULT_SUBJECT).format(**self.parameters)
-        except Exception as e:
-            logger.error("Tautulli Newsletter :: Unable to parse custom newsletter subject: %s. Using fallback." % e)
-            subject = str(self._DEFAULT_SUBJECT).format(**self.parameters)
-
-        try:
-            body = custom_formatter.format(str(self.body), **self.parameters)
-        except LookupError as e:
-            logger.error("Tautulli Newsletter :: Unable to parse parameter %s in newsletter body. Using fallback." % e)
-            body = str(self._DEFAULT_BODY).format(**self.parameters)
-        except Exception as e:
-            logger.error("Tautulli Newsletter :: Unable to parse custom newsletter body: %s. Using fallback." % e)
-            body = str(self._DEFAULT_BODY).format(**self.parameters)
-
-        try:
-            message = custom_formatter.format(str(self.message), **self.parameters)
-        except LookupError as e:
-            logger.error("Tautulli Newsletter :: Unable to parse parameter %s in newsletter message. Using fallback." % e)
-            message = str(self._DEFAULT_MESSAGE).format(**self.parameters)
-        except Exception as e:
-            logger.error("Tautulli Newsletter :: Unable to parse custom newsletter message: %s. Using fallback." % e)
-            message = str(self._DEFAULT_MESSAGE).format(**self.parameters)
-
-        return subject, body, message
-
-    def build_filename(self):
-        from plexpy.notification_handler import CustomFormatter
-        custom_formatter = CustomFormatter()
-
-        try:
-            filename = custom_formatter.format(str(self.filename), **self.parameters)
-        except LookupError as e:
-            logger.error("Tautulli Newsletter :: Unable to parse parameter %s in newsletter filename. Using fallback." % e)
-            filename = str(self._DEFAULT_FILENAME).format(**self.parameters)
-        except Exception as e:
-            logger.error("Tautulli Newsletter :: Unable to parse custom newsletter subject: %s. Using fallback." % e)
-            filename = str(self._DEFAULT_FILENAME).format(**self.parameters)
-
-        return filename
-
-    def return_config_options(self, mask_passwords=False):
-        config_options = self._return_config_options()
-
-        # Mask password config options
-        if mask_passwords:
-            helpers.mask_config_passwords(config_options)
-
-        return config_options
-
-    def _return_config_options(self):
-        config_options = []
-        return config_options
-
-    def return_email_config_options(self, mask_passwords=False):
-        config_options = EMAIL(self.email_config).return_config_options(mask_passwords=mask_passwords)
-        for c in config_options:
-            c['name'] = 'newsletter_' + c['name']
-        return config_options
-
-
-class RecentlyAdded(Newsletter):
-    """
-    Recently Added Newsletter
-    """
-    NAME = 'Recently Added'
-    _DEFAULT_CONFIG = Newsletter._DEFAULT_CONFIG.copy()
-    _DEFAULT_CONFIG['incl_libraries'] = []
-    _DEFAULT_SUBJECT = 'Recently Added to {server_name}! ({end_date})'
-    _DEFAULT_BODY = 'View the newsletter here: {newsletter_url}'
-    _DEFAULT_MESSAGE = ''
-    _TEMPLATE = 'recently_added.html'
-
-    def _get_recently_added(self, media_type=None):
-        from plexpy.notification_handler import format_group_index
-
-        pms_connect = pmsconnect.PmsConnect()
-
-        recently_added = []
-        done = False
-        start = 0
-
-        while not done:
-            recent_items = pms_connect.get_recently_added_details(start=str(start), count='10', media_type=media_type)
-            filtered_items = [i for i in recent_items['recently_added']
-                              if self.start_time < helpers.cast_to_int(i['added_at'])]
-            if len(filtered_items) < 10:
-                done = True
-            else:
-                start += 10
-
-            recently_added.extend(filtered_items)
-
-        if media_type in ('movie', 'other_video'):
-            movie_list = []
-            for item in recently_added:
-                # Filter included libraries
-                if item['section_id'] not in self.config['incl_libraries']:
-                    continue
-
-                if self.start_time < helpers.cast_to_int(item['added_at']) < self.end_time:
-                    movie_list.append(item)
-
-            recently_added = movie_list
-
-        if media_type == 'show':
-            shows_list = []
-            show_rating_keys = []
-            for item in recently_added:
-                # Filter included libraries
-                if item['section_id'] not in self.config['incl_libraries']:
-                    continue
-
-                if item['media_type'] == 'show':
-                    show_rating_key = item['rating_key']
-                elif item['media_type'] == 'season':
-                    show_rating_key = item['parent_rating_key']
-                elif item['media_type'] == 'episode':
-                    show_rating_key = item['grandparent_rating_key']
-
-                if show_rating_key in show_rating_keys:
-                    continue
-
-                show_metadata = pms_connect.get_metadata_details(show_rating_key, media_info=False)
-                children = pms_connect.get_item_children(show_rating_key, media_type=media_type, get_grandchildren=True)
-                filtered_children = [i for i in children['children_list']
-                                     if self.start_time < helpers.cast_to_int(i['added_at']) < self.end_time]
-                filtered_children.sort(key=lambda x: helpers.cast_to_int(x['parent_media_index']))
-
-                if not filtered_children:
-                    continue
-
-                seasons = []
-                for (index, title), children in groupby(filtered_children,
-                                                        key=lambda x: (x['parent_media_index'], x['parent_title'])):
-                    episodes = list(children)
-                    num, num00 = format_group_index([helpers.cast_to_int(d['media_index']) for d in episodes])
-
-                    seasons.append({'media_index': index,
-                                    'title': title,
-                                    'episode_range': num00,
-                                    'episode_count': len(episodes),
-                                    'episode': episodes})
-
-                num, num00 = format_group_index([helpers.cast_to_int(d['media_index']) for d in seasons])
-
-                show_metadata['season_range'] = num00
-                show_metadata['season_count'] = len(seasons)
-                show_metadata['season'] = seasons
-
-                shows_list.append(show_metadata)
-                show_rating_keys.append(show_rating_key)
-
-            recently_added = shows_list
-
-        if media_type == 'artist':
-            artists_list = []
-            artist_rating_keys = []
-            for item in recently_added:
-                # Filter included libraries
-                if item['section_id'] not in self.config['incl_libraries']:
-                    continue
-
-                if item['media_type'] == 'artist':
-                    artist_rating_key = item['rating_key']
-                elif item['media_type'] == 'album':
-                    artist_rating_key = item['parent_rating_key']
-                elif item['media_type'] == 'track':
-                    artist_rating_key = item['grandparent_rating_key']
-
-                if artist_rating_key in artist_rating_keys:
-                    continue
-
-                artist_metadata = pms_connect.get_metadata_details(artist_rating_key, media_info=False)
-                children = pms_connect.get_item_children(artist_rating_key, media_type=media_type)
-                filtered_children = [i for i in children['children_list']
-                                     if self.start_time < helpers.cast_to_int(i['added_at']) < self.end_time]
-                filtered_children.sort(key=lambda x: x['added_at'])
-
-                if not filtered_children:
-                    continue
-
-                albums = []
-                for a in filtered_children:
-                    album_metadata = pms_connect.get_metadata_details(a['rating_key'], media_info=False)
-                    album_metadata['track_count'] = helpers.cast_to_int(album_metadata['children_count'])
-                    albums.append(album_metadata)
-
-                artist_metadata['album_count'] = len(albums)
-                artist_metadata['album'] = albums
-
-                artists_list.append(artist_metadata)
-                artist_rating_keys.append(artist_rating_key)
-
-            recently_added = artists_list
-
-        return recently_added
-
-    def retrieve_data(self):
-        from plexpy.notification_handler import get_img_info, set_hash_image_info
-
-        if not self.config['incl_libraries']:
-            logger.warn("Tautulli Newsletters :: Failed to retrieve %s newsletter data: no libraries selected." % self.NAME)
-
-        media_types = set()
-        for s in self._get_sections():
-            if str(s['section_id']) in self.config['incl_libraries']:
-                if s['section_type'] == 'movie' and s['agent'] == 'com.plexapp.agents.none':
-                    media_types.add('other_video')
-                else:
-                    media_types.add(s['section_type'])
-
-        recently_added = {}
-        for media_type in media_types:
-            if media_type not in recently_added:
-                recently_added[media_type] = self._get_recently_added(media_type)
-
-        movies = recently_added.get('movie', [])
-        shows = recently_added.get('show', [])
-        artists = recently_added.get('artist', [])
-        albums = [a for artist in artists for a in artist['album']]
-        other_video = recently_added.get('other_video', [])
-
-        if self.is_preview or helpers.get_img_service(include_self=True) == 'self-hosted':
-            for item in movies + shows + albums + other_video:
-                if item['media_type'] == 'album':
-                    height = 150
-                    fallback = 'cover'
-                else:
-                    height = 225
-                    fallback = 'poster'
-
-                item['thumb_hash'] = set_hash_image_info(
-                    img=item['thumb'], width=150, height=height, fallback=fallback)
-
-                if item['art']:
-                    item['art_hash'] = set_hash_image_info(
-                        img=item['art'], width=500, height=280,
-                        opacity=25, background='282828', blur=3, fallback='art')
-                else:
-                    item['art_hash'] = ''
-
-                item['thumb_url'] = ''
-                item['art_url'] = ''
-                item['poster_url'] = item['thumb_url']  # Keep for backwards compatibility
-
-        elif helpers.get_img_service():
-            # Upload posters and art to image hosting service
-            for item in movies + shows + albums + other_video:
-                if item['media_type'] == 'album':
-                    height = 150
-                    fallback = 'cover'
-                else:
-                    height = 225
-                    fallback = 'poster'
-
-                img_info = get_img_info(
-                    img=item['thumb'], rating_key=item['rating_key'], title=item['title'],
-                    width=150, height=height, fallback=fallback)
-
-                item['thumb_url'] = img_info.get('img_url') or common.ONLINE_POSTER_THUMB
-
-                img_info = get_img_info(
-                    img=item['art'], rating_key=item['rating_key'], title=item['title'],
-                    width=500, height=280, opacity=25, background='282828', blur=3, fallback='art')
-
-                item['art_url'] = img_info.get('img_url')
-
-                item['thumb_hash'] = ''
-                item['art_hash'] = ''
-                item['poster_url'] = item['thumb_url']  # Keep for backwards compatibility
-
-        else:
-            for item in movies + shows + albums + other_video:
-                item['thumb_hash'] = ''
-                item['art_hash'] = ''
-                item['thumb_url'] = ''
-                item['art_url'] = ''
-                item['poster_url'] = item['thumb_url']  # Keep for backwards compatibility
-
-        self.data['recently_added'] = recently_added
-
-        return self.data
-
-    def _has_data(self):
-        recently_added = self.data.get('recently_added')
-        if recently_added and (
-                recently_added.get('movie') or
-                recently_added.get('show') or
-                recently_added.get('artist') or
-                recently_added.get('other_video')):
-            return True
-
-        return False
-
-    def _get_sections(self):
-        return libraries.Libraries().get_sections()
-
-    def _get_sections_options(self):
-        sections = {}
-        for s in self._get_sections():
-            if s['section_type'] != 'photo':
-                if s['section_type'] == 'movie' and s['agent'] == 'com.plexapp.agents.none':
-                    library_type = 'other_video'
-                else:
-                    library_type = s['section_type']
-                group = sections.get(library_type, [])
-                group.append({'value': s['section_id'],
-                              'text': s['section_name']})
-                sections[library_type] = group
-
-        groups = OrderedDict([(k, v) for k, v in [
-            ('Movie Libraries', sections.get('movie')),
-            ('TV Show Libraries', sections.get('show')),
-            ('Music Libraries', sections.get('artist')),
-            ('Other Video Libraries', sections.get('other_video'))
-        ] if v is not None])
-
-        return groups
-
-    def build_params(self):
-        parameters = self._build_params()
-
-        newsletter_libraries = []
-        for s in self._get_sections():
-            if str(s['section_id']) in self.config['incl_libraries']:
-                newsletter_libraries.append(s['section_name'])
-
-        parameters['newsletter_libraries'] = ', '.join(sorted(newsletter_libraries))
-        parameters['pms_identifier'] = plexpy.CONFIG.PMS_IDENTIFIER
-        parameters['pms_web_url'] = plexpy.CONFIG.PMS_WEB_URL
-
-        return parameters
-
-    def _return_config_options(self):
-        config_options = [
-            {'label': 'Included Libraries',
-             'value': self.config['incl_libraries'],
-             'description': 'Select the libraries to include in the newsletter.',
-             'name': 'newsletter_config_incl_libraries',
-             'input_type': 'selectize',
-             'select_options': self._get_sections_options(),
-             'select_all': True
-             }
-        ]
-
-        return config_options
diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py
index 0e30d6e2..2f2637cc 100644
--- a/plexpy/notification_handler.py
+++ b/plexpy/notification_handler.py
@@ -1,2125 +1,501 @@
-# -*- coding: utf-8 -*-
-
-#  This file is part of Tautulli.
+#  This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
-import bleach
-from collections import Counter, defaultdict
-from functools import partial
-import hashlib
-from itertools import groupby
-import json
-from operator import itemgetter
-import os
-import re
-from string import Formatter
-import threading
-from typing import Optional
-
-import arrow
-import musicbrainzngs
+from plexpy import logger, config, notifiers, database, helpers
 
 import plexpy
-from plexpy import activity_processor
-from plexpy import common
-from plexpy import database
-from plexpy import datafactory
-from plexpy import logger
-from plexpy import helpers
-from plexpy import notifiers
-from plexpy import pmsconnect
-from plexpy import request
-from plexpy.newsletter_handler import notify as notify_newsletter
+import time
 
 
-def process_queue():
-    queue = plexpy.NOTIFY_QUEUE
-    while True:
-        params = queue.get()
-        
-        if params is None:
-            break
-        elif params:
-            try:
-                if 'newsletter' in params:
-                    notify_newsletter(**params)
-                elif 'notification' in params:
-                    notify(**params)
-                else:
-                    add_notifier_each(**params)
-            except Exception as e:
-                logger.exception("Tautulli NotificationHandler :: Notification thread exception: %s" % e)
+def notify(stream_data=None, notify_action=None):
+    from plexpy import users
+    
+    if stream_data and notify_action:
+        # Check if notifications enabled for user
+        user_data = users.Users()
+        user_details = user_data.get_user_friendly_name(user=stream_data['user'])
 
-        queue.task_done()
-
-    logger.info("Tautulli NotificationHandler :: Notification thread exiting...")
-
-
-def start_threads(num_threads=1):
-    logger.info("Tautulli NotificationHandler :: Starting background notification handler ({} threads).".format(num_threads))
-    for x in range(num_threads):
-        thread = threading.Thread(target=process_queue)
-        thread.daemon = True
-        thread.start()
-
-
-def add_notifier_each(notifier_id=None, notify_action=None, stream_data=None, timeline_data=None, manual_trigger=False, **kwargs):
-    if not notify_action:
-        logger.debug("Tautulli NotificationHandler :: Notify called but no action received.")
-        return
-
-    if notifier_id:
-        # Send to a specific notifier regardless if it is enabled
-        notifiers_enabled = notifiers.get_notifiers(notifier_id=notifier_id)
-    else:
-        # Check if any notification agents have notifications enabled for the action
-        notifiers_enabled = notifiers.get_notifiers(notify_action=notify_action)
-
-    if notifiers_enabled and not manual_trigger:
-        logger.debug("Tautulli NotificationHandler :: Notifiers enabled for notify_action '%s'." % notify_action)
-
-        # Check if notification conditions are satisfied
-        conditions = notify_conditions(notify_action=notify_action,
-                                       stream_data=stream_data,
-                                       timeline_data=timeline_data,
-                                       **kwargs)
-    else:
-        conditions = True
-
-    if notifiers_enabled and (manual_trigger or conditions):
-        if manual_trigger:
-            logger.debug("Tautulli NotificationHandler :: Notifiers enabled for notify_action '%s' (manual trigger)." % notify_action)
-
-        if stream_data or timeline_data:
-            # Build the notification parameters
-            parameters = build_media_notify_params(notify_action=notify_action,
-                                                   session=stream_data,
-                                                   timeline=timeline_data,
-                                                   manual_trigger=manual_trigger,
-                                                   **kwargs)
-        else:
-            # Build the notification parameters
-            parameters = build_server_notify_params(notify_action=notify_action,
-                                                    **kwargs)
-
-        if not parameters:
-            logger.error("Tautulli NotificationHandler :: Failed to build notification parameters.")
+        if not user_details['do_notify']:
             return
 
-        for notifier in notifiers_enabled:
-            # Check custom user conditions
-            if manual_trigger or notify_custom_conditions(notifier_id=notifier['id'], parameters=parameters):
-                # Add each notifier to the queue
-                data = {'notification': True,
-                        'notifier_id': notifier['id'],
-                        'notify_action': notify_action,
-                        'stream_data': stream_data,
-                        'timeline_data': timeline_data,
-                        'parameters': parameters}
-                data.update(kwargs)
-                plexpy.NOTIFY_QUEUE.put(data)
-            else:
-                logger.debug("Tautulli NotificationHandler :: Custom notification conditions not satisfied, skipping notifier_id %s." % notifier['id'])
+        if stream_data['media_type'] == 'movie' or stream_data['media_type'] == 'episode':
+            if plexpy.CONFIG.MOVIE_NOTIFY_ENABLE or plexpy.CONFIG.TV_NOTIFY_ENABLE:
 
-    # Add on_concurrent and on_newdevice to queue if action is on_play
-    if notify_action == 'on_play':
-        plexpy.NOTIFY_QUEUE.put({'stream_data': stream_data.copy(), 'notify_action': 'on_concurrent'})
-        plexpy.NOTIFY_QUEUE.put({'stream_data': stream_data.copy(), 'notify_action': 'on_newdevice'})
+                progress_percent = helpers.get_percent(stream_data['view_offset'], stream_data['duration'])
 
+                for agent in notifiers.available_notification_agents():
+                    if agent['on_play'] and notify_action == 'play':
+                        # Build and send notification
+                        notify_strings = build_notify_text(session=stream_data, state=notify_action)
+                        notifiers.send_notification(config_id=agent['id'],
+                                                    subject=notify_strings[0],
+                                                    body=notify_strings[1])
+                        # Set the notification state in the db
+                        set_notify_state(session=stream_data, state='play', agent_info=agent)
 
-def notify_conditions(notify_action=None, stream_data=None, timeline_data=None, **kwargs):
-    logger.debug("Tautulli NotificationHandler :: Checking global notification conditions.")
-    evaluated = False
+                    elif agent['on_stop'] and notify_action == 'stop' \
+                        and (plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < plexpy.CONFIG.NOTIFY_WATCHED_PERCENT):
+                        # Build and send notification
+                        notify_strings = build_notify_text(session=stream_data, state=notify_action)
+                        notifiers.send_notification(config_id=agent['id'],
+                                                    subject=notify_strings[0],
+                                                    body=notify_strings[1])
 
-    # Activity notifications
-    if stream_data:
-        # Check if notifications enabled for user and library
-        # user_data = users.Users()
-        # user_details = user_data.get_details(user_id=stream_data['user_id'])
-        #
-        # library_data = libraries.Libraries()
-        # library_details = library_data.get_details(section_id=stream_data['section_id'])
+                        set_notify_state(session=stream_data, state='stop', agent_info=agent)
 
-        # if not user_details['do_notify']:
-        #     logger.debug("Tautulli NotificationHandler :: Notifications for user '%s' are disabled." % user_details['username'])
-        #     return False
-        #
-        # elif not library_details['do_notify'] and notify_action not in ('on_concurrent', 'on_newdevice'):
-        #     logger.debug("Tautulli NotificationHandler :: Notifications for library '%s' are disabled." % library_details['section_name'])
-        #     return False
+                    elif agent['on_pause'] and notify_action == 'pause' \
+                        and (plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < 99):
+                        # Build and send notification
+                        notify_strings = build_notify_text(session=stream_data, state=notify_action)
+                        notifiers.send_notification(config_id=agent['id'],
+                                                    subject=notify_strings[0],
+                                                    body=notify_strings[1])
 
-        if notify_action == 'on_concurrent':
-            pms_connect = pmsconnect.PmsConnect()
-            result = pms_connect.get_current_activity()
+                        set_notify_state(session=stream_data, state='pause', agent_info=agent)
 
-            user_sessions = []
-            if result:
-                user_sessions = [s for s in result['sessions'] if s['user_id'] == stream_data['user_id']]
+                    elif agent['on_resume'] and notify_action == 'resume' \
+                        and (plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < 99):
+                        # Build and send notification
+                        notify_strings = build_notify_text(session=stream_data, state=notify_action)
+                        notifiers.send_notification(config_id=agent['id'],
+                                                    subject=notify_strings[0],
+                                                    body=notify_strings[1])
 
-            if plexpy.CONFIG.NOTIFY_CONCURRENT_BY_IP:
-                ip_addresses = set()
-                for s in user_sessions:
-                    if helpers.ip_type(s['ip_address']) == 'IPv6':
-                        ip_addresses.add(helpers.get_ipv6_network_address(s['ip_address']))
-                    elif helpers.ip_type(s['ip_address']) == 'IPv4':
-                        ip_addresses.add(s['ip_address'])
-                evaluated = len(ip_addresses) >= plexpy.CONFIG.NOTIFY_CONCURRENT_THRESHOLD
-            else:
-                evaluated = len(user_sessions) >= plexpy.CONFIG.NOTIFY_CONCURRENT_THRESHOLD
+                        set_notify_state(session=stream_data, state='resume', agent_info=agent)
 
-        elif notify_action == 'on_newdevice':
-            data_factory = datafactory.DataFactory()
-            user_devices = data_factory.get_user_devices(user_id=stream_data['user_id'],
-                                                         history_only=not plexpy.CONFIG.NOTIFY_NEW_DEVICE_INITIAL_ONLY)
-            evaluated = stream_data['machine_id'] not in user_devices
+                    elif agent['on_buffer'] and notify_action == 'buffer':
+                        # Build and send notification
+                        notify_strings = build_notify_text(session=stream_data, state=notify_action)
+                        notifiers.send_notification(config_id=agent['id'],
+                                                    subject=notify_strings[0],
+                                                    body=notify_strings[1])
 
-        elif stream_data['media_type'] in ('movie', 'episode', 'clip'):
-            progress_percent = helpers.get_percent(stream_data['view_offset'], stream_data['duration'])
+                        set_notify_state(session=stream_data, state='buffer', agent_info=agent)
 
-            if notify_action == 'on_stop':
-                evaluated = (plexpy.CONFIG.NOTIFY_CONSECUTIVE or
-                    (stream_data['media_type'] == 'movie' and progress_percent < plexpy.CONFIG.MOVIE_WATCHED_PERCENT) or 
-                    (stream_data['media_type'] == 'episode' and progress_percent < plexpy.CONFIG.TV_WATCHED_PERCENT))
+                    elif agent['on_watched'] and notify_action == 'watched':
+                        # Get the current states for notifications from our db
+                        notify_states = get_notify_state(session=stream_data)
 
-            elif notify_action == 'on_resume':
-                evaluated = plexpy.CONFIG.NOTIFY_CONSECUTIVE or progress_percent < 99
+                        # If there is nothing in the notify_log for our agent id but it is enabled we should notify
+                        if not any(d['agent_id'] == agent['id'] for d in notify_states):
+                            # Build and send notification
+                            notify_strings = build_notify_text(session=stream_data, state=notify_action)
+                            notifiers.send_notification(config_id=agent['id'],
+                                                        subject=notify_strings[0],
+                                                        body=notify_strings[1])
+                            # Set the notification state in the db
+                            set_notify_state(session=stream_data, state='watched', agent_info=agent)
 
-            # All other activity notify actions
-            else:
-                evaluated = True
+                        else:
+                            # Check in our notify log if the notification has already been sent
+                            for notify_state in notify_states:
+                                if not notify_state['on_watched'] and (notify_state['agent_id'] == agent['id']):
+                                    # Build and send notification
+                                    notify_strings = build_notify_text(session=stream_data, state=notify_action)
+                                    notifiers.send_notification(config_id=agent['id'],
+                                                                subject=notify_strings[0],
+                                                                body=notify_strings[1])
+                                    # Set the notification state in the db
+                                    set_notify_state(session=stream_data, state='watched', agent_info=agent)
 
         elif stream_data['media_type'] == 'track':
-            evaluated = True
+            if plexpy.CONFIG.MUSIC_NOTIFY_ENABLE:
 
+                for agent in notifiers.available_notification_agents():
+                    if agent['on_play'] and notify_action == 'play':
+                        # Build and send notification
+                        notify_strings = build_notify_text(session=stream_data, state=notify_action)
+                        notifiers.send_notification(config_id=agent['id'],
+                                                    subject=notify_strings[0],
+                                                    body=notify_strings[1])
+                        # Set the notification state in the db
+                        set_notify_state(session=stream_data, state='play', agent_info=agent)
+
+                    elif agent['on_stop'] and notify_action == 'stop':
+                        # Build and send notification
+                        notify_strings = build_notify_text(session=stream_data, state=notify_action)
+                        notifiers.send_notification(config_id=agent['id'],
+                                                    subject=notify_strings[0],
+                                                    body=notify_strings[1])
+                        # Set the notification state in the db
+                        set_notify_state(session=stream_data, state='stop', agent_info=agent)
+
+                    elif agent['on_pause'] and notify_action == 'pause':
+                        # Build and send notification
+                        notify_strings = build_notify_text(session=stream_data, state=notify_action)
+                        notifiers.send_notification(config_id=agent['id'],
+                                                    subject=notify_strings[0],
+                                                    body=notify_strings[1])
+                        # Set the notification state in the db
+                        set_notify_state(session=stream_data, state='pause', agent_info=agent)
+
+                    elif agent['on_resume'] and notify_action == 'resume':
+                        # Build and send notification
+                        notify_strings = build_notify_text(session=stream_data, state=notify_action)
+                        notifiers.send_notification(config_id=agent['id'],
+                                                    subject=notify_strings[0],
+                                                    body=notify_strings[1])
+                        # Set the notification state in the db
+                        set_notify_state(session=stream_data, state='resume', agent_info=agent)
+
+                    elif agent['on_buffer'] and notify_action == 'buffer':
+                        # Build and send notification
+                        notify_strings = build_notify_text(session=stream_data, state=notify_action)
+                        notifiers.send_notification(config_id=agent['id'],
+                                                    subject=notify_strings[0],
+                                                    body=notify_strings[1])
+                        # Set the notification state in the db
+                        set_notify_state(session=stream_data, state='buffer', agent_info=agent)
+
+        elif stream_data['media_type'] == 'clip':
+            pass
         else:
-            evaluated = False
-
-    # Recently Added notifications
-    elif timeline_data:
-
-        # Check if notifications enabled for library
-        # library_data = libraries.Libraries()
-        # library_details = library_data.get_details(section_id=timeline_data['section_id'])
-        #
-        # if not library_details['do_notify_created']:
-        #     # logger.debug("Tautulli NotificationHandler :: Notifications for library '%s' is disabled." % library_details['section_name'])
-        #     return False
-
-        evaluated = True
-
-    elif notify_action == 'on_pmsupdate':
-        evaluated = True
-        if not plexpy.CONFIG.NOTIFY_SERVER_UPDATE_REPEAT:
-            evaluated = not check_nofity_tag(notify_action=notify_action,
-                                             tag=kwargs['pms_download_info']['version'])
-
-    elif notify_action == 'on_plexpyupdate':
-        evaluated = True
-        if not plexpy.CONFIG.NOTIFY_PLEXPY_UPDATE_REPEAT:
-            evaluated = not check_nofity_tag(notify_action=notify_action,
-                                             tag=kwargs['plexpy_download_info']['tag_name'])
-
-    # Server notifications
+            logger.debug(u"PlexPy Notifier :: Notify called with unsupported media type.")
+            pass
     else:
-        evaluated = True
-
-    logger.debug("Tautulli NotificationHandler :: Global notification conditions evaluated to '{}'.".format(evaluated))
-    return evaluated
-
-
-def notify_custom_conditions(notifier_id=None, parameters=None):
-    notifier_config = notifiers.get_notifier_config(notifier_id=notifier_id)
-
-    custom_conditions_logic = notifier_config['custom_conditions_logic']
-    custom_conditions = notifier_config['custom_conditions']
-
-    if custom_conditions_logic or any(c for c in custom_conditions if c['value']):
-        logger.debug("Tautulli NotificationHandler :: Checking custom notification conditions for notifier_id %s."
-                     % notifier_id)
-
-        logic_groups = None
-        if custom_conditions_logic:
-            try:
-                # Parse and validate the custom conditions logic
-                logic_groups = helpers.parse_condition_logic_string(custom_conditions_logic, len(custom_conditions))
-            except ValueError as e:
-                logger.error("Tautulli NotificationHandler :: Unable to parse custom condition logic '%s': %s."
-                             % (custom_conditions_logic, e))
-                return False
-
-        evaluated_conditions = [None]  # Set condition {0} to None
-
-        for i, condition in enumerate(custom_conditions):
-            parameter = condition['parameter']
-            operator = condition['operator']
-            values = condition['value']
-            parameter_type = condition['type']
-            parameter_value = parameters.get(parameter, "")
-
-            # Set blank conditions to True (skip)
-            if not parameter or not operator or not values:
-                evaluated = True
-                evaluated_conditions.append(evaluated)
-                logger.debug("Tautulli NotificationHandler :: {%s} Blank condition > %s" % (i+1, evaluated))
-                continue
-
-            # Make sure the condition values is in a list
-            if not isinstance(values, list):
-                values = [values]
-
-            # Cast the condition values to the correct type
-            try:
-                if parameter_type == 'str':
-                    values = ['' if v == '~' else str(v).strip().lower() for v in values]
-
-                elif parameter_type == 'int':
-                    values = [helpers.cast_to_int(v) for v in values]
-
-                elif parameter_type == 'float':
-                    values = [helpers.cast_to_float(v) for v in values]
-
-                else:
-                    raise ValueError
-
-            except ValueError as e:
-                logger.error("Tautulli NotificationHandler :: {%s} Unable to cast condition '%s', values '%s', to type '%s'."
-                             % (i+1, parameter, values, parameter_type))
-                return False
-
-            # Cast the parameter value to the correct type
-            try:
-                if parameter_type == 'str':
-                    parameter_value = str(parameter_value).strip().lower()
-
-                elif parameter_type == 'int':
-                    parameter_value = helpers.cast_to_int(parameter_value)
-
-                elif parameter_type == 'float':
-                    parameter_value = helpers.cast_to_float(parameter_value)
-
-                else:
-                    raise ValueError
-
-            except ValueError as e:
-                logger.error("Tautulli NotificationHandler :: {%s} Unable to cast parameter '%s', value '%s', to type '%s'."
-                             % (i+1, parameter, parameter_value, parameter_type))
-                return False
-
-            # Check each condition
-            if operator == 'contains':
-                evaluated = any(c in parameter_value for c in values)
-
-            elif operator == 'does not contain':
-                evaluated = all(c not in parameter_value for c in values)
-
-            elif operator == 'is':
-                evaluated = any(parameter_value == c for c in values)
-
-            elif operator == 'is not':
-                evaluated = all(parameter_value != c for c in values)
-
-            elif operator == 'begins with':
-                evaluated = parameter_value.startswith(tuple(values))
-
-            elif operator == 'does not begin with':
-                evaluated = not parameter_value.startswith(tuple(values))
-
-            elif operator == 'ends with':
-                evaluated = parameter_value.endswith(tuple(values))
-
-            elif operator == 'does not end with':
-                evaluated = not parameter_value.endswith(tuple(values))
-
-            elif operator == 'is greater than':
-                evaluated = any(parameter_value > c for c in values)
-
-            elif operator == 'is less than':
-                evaluated = any(parameter_value < c for c in values)
-
-            else:
-                evaluated = None
-                logger.warn("Tautulli NotificationHandler :: {%s} Invalid condition operator '%s' > %s."
-                            % (i+1, operator, evaluated))
-
-            evaluated_conditions.append(evaluated)
-            logger.debug("Tautulli NotificationHandler :: {%s} %s | %s | %s > '%s' > %s"
-                         % (i+1, parameter, operator, ' or '.join(["'%s'" % v for v in values]), parameter_value, evaluated))
-
-        if logic_groups:
-            # Format and evaluate the logic string
-            try:
-                evaluated_logic = helpers.eval_logic_groups_to_bool(logic_groups, evaluated_conditions)
-                logger.debug("Tautulli NotificationHandler :: Condition logic: %s > %s"
-                             % (custom_conditions_logic, evaluated_logic))
-            except Exception as e:
-                logger.error("Tautulli NotificationHandler :: Unable to evaluate custom condition logic: %s." % e)
-                return False
-        else:
-            evaluated_logic = all(evaluated_conditions[1:])
-            logger.debug("Tautulli NotificationHandler :: Condition logic [blank]: %s > %s"
-                         % (' and '.join(['{%s}' % (i+1) for i in range(len(custom_conditions))]), evaluated_logic))
-
-        logger.debug("Tautulli NotificationHandler :: Custom conditions evaluated to '{}'. Conditions: {}.".format(
-            evaluated_logic, evaluated_conditions[1:]))
-
-        return evaluated_logic
-
-    return True
-
-
-def notify(notifier_id=None, notify_action=None, stream_data=None, timeline_data=None, parameters=None, **kwargs):
-    logger.info("Tautulli NotificationHandler :: Preparing notification for notifier_id %s." % notifier_id)
-
-    notifier_config = notifiers.get_notifier_config(notifier_id=notifier_id)
-
-    if not notifier_config:
-        return
-
-    if notify_action in ('test', 'api'):
-        subject = kwargs.pop('subject', 'Tautulli')
-        body = kwargs.pop('body', 'Test Notification')
-        script_args = helpers.split_args(kwargs.pop('script_args', []))
-
-    else:
-        # Get the subject and body strings
-        subject_string = notifier_config['notify_text'][notify_action]['subject']
-        body_string = notifier_config['notify_text'][notify_action]['body']
-
-        # Format the subject and body strings
-        subject, body, script_args = build_notify_text(subject=subject_string,
-                                                       body=body_string,
-                                                       notify_action=notify_action,
-                                                       parameters=parameters,
-                                                       agent_id=notifier_config['agent_id'],
-                                                       as_json=notifier_config['config'].get('as_json', False))
-
-    # Set the notification state in the db
-    notification_id = set_notify_state(session=stream_data or timeline_data,
-                                       notifier=notifier_config,
-                                       notify_action=notify_action,
-                                       subject=subject,
-                                       body=body,
-                                       script_args=script_args,
-                                       parameters=parameters)
-
-    # Send the notification
-    success = notifiers.send_notification(notifier_id=notifier_config['id'],
-                                          subject=subject,
-                                          body=body,
-                                          script_args=script_args,
-                                          notify_action=notify_action,
-                                          notification_id=notification_id,
-                                          parameters=parameters or {},
-                                          **kwargs)
-
-    if success:
-        set_notify_success(notification_id)
-        return notification_id
+        logger.debug(u"PlexPy Notifier :: Notify called but incomplete data received.")
 
 
 def get_notify_state(session):
     monitor_db = database.MonitorDatabase()
-    result = monitor_db.select("SELECT timestamp, notify_action, notifier_id "
-                               "FROM notify_log "
-                               "WHERE session_key = ? "
-                               "AND rating_key = ? "
-                               "AND user_id = ? "
-                               "ORDER BY id DESC",
-                               args=[session['session_key'], session['rating_key'], session['user_id']])
+    result = monitor_db.select('SELECT on_play, on_stop, on_pause, on_resume, on_buffer, on_watched, agent_id '
+                               'FROM notify_log '
+                               'WHERE session_key = ? '
+                               'AND rating_key = ? '
+                               'AND user = ? '
+                               'ORDER BY id DESC',
+                               args=[session['session_key'], session['rating_key'], session['user']])
     notify_states = []
     for item in result:
-        notify_state = {'timestamp': item['timestamp'],
-                        'notify_action': item['notify_action'],
-                        'notifier_id': item['notifier_id']}
+        notify_state = {'on_play': item[0],
+                        'on_stop': item[1],
+                        'on_pause': item[2],
+                        'on_resume': item[3],
+                        'on_buffer': item[4],
+                        'on_watched': item[5],
+                        'agent_id': item[6]}
         notify_states.append(notify_state)
 
     return notify_states
 
 
-def get_notify_state_enabled(session, notify_action, notified=True):
-    if notified:
-        timestamp_where = 'AND timestamp IS NOT NULL'
-    else:
-        timestamp_where = 'AND timestamp IS NULL'
+def set_notify_state(session, state, agent_info):
 
-    monitor_db = database.MonitorDatabase()
-    result = monitor_db.select("SELECT id AS notifier_id, timestamp "
-                               "FROM notifiers "
-                               "LEFT OUTER JOIN ("
-                               "SELECT timestamp, notifier_id "
-                               "FROM notify_log "
-                               "WHERE session_key = ? "
-                               "AND rating_key = ? "
-                               "AND user_id = ? "
-                               "AND notify_action = ?) AS t ON notifiers.id = t.notifier_id "
-                               "WHERE %s = 1 %s" % (notify_action, timestamp_where),
-                               args=[session['session_key'], session['rating_key'], session['user_id'], notify_action])
-
-    return result
-
-
-def set_notify_state(notifier, notify_action, subject='', body='', script_args='', session=None, parameters=None):
-
-    if notifier and notify_action:
+    if session and state and agent_info:
         monitor_db = database.MonitorDatabase()
 
-        session = session or {}
+        if state == 'play':
+            values = {'on_play': int(time.time())}
+        elif state == 'stop':
+            values = {'on_stop': int(time.time())}
+        elif state == 'pause':
+            values = {'on_pause': int(time.time())}
+        elif state == 'resume':
+            values = {'on_resume': int(time.time())}
+        elif state == 'buffer':
+            values = {'on_buffer': int(time.time())}
+        elif state == 'watched':
+            values = {'on_watched': int(time.time())}
+        else:
+            return
 
-        script_args = json.dumps(script_args) if script_args else None
-
-        keys = {'timestamp': helpers.timestamp(),
-                'session_key': session.get('session_key', None),
-                'rating_key': session.get('rating_key', None),
-                'user_id': session.get('user_id', None),
-                'notifier_id': notifier['id'],
-                'agent_id': notifier['agent_id'],
-                'notify_action': notify_action}
-
-        values = {'parent_rating_key': session.get('parent_rating_key', None),
-                  'grandparent_rating_key': session.get('grandparent_rating_key', None),
-                  'user': session.get('user', None),
-                  'agent_name': notifier['agent_name'],
-                  'subject_text': subject,
-                  'body_text': body,
-                  'script_args': script_args}
-
-        if notify_action == 'on_pmsupdate':
-            values['tag'] = parameters['update_version']
-        elif notify_action == 'on_plexpyupdate':
-            values['tag'] = parameters['tautulli_update_version']
+        keys = {'session_key': session['session_key'],
+                'rating_key': session['rating_key'],
+                'user_id': session['user_id'],
+                'user': session['user'],
+                'agent_id': agent_info['id'],
+                'agent_name': agent_info['name']}
 
         monitor_db.upsert(table_name='notify_log', key_dict=keys, value_dict=values)
-        return monitor_db.last_insert_id()
     else:
-        logger.error("Tautulli NotificationHandler :: Unable to set notify state.")
+        logger.error('PlexPy Notifier :: Unable to set notify state.')
 
 
-def set_notify_success(notification_id):
-    keys = {'id': notification_id}
-    values = {'success': 1}
+def build_notify_text(session, state):
+    from plexpy import pmsconnect, helpers
+    import re
 
-    monitor_db = database.MonitorDatabase()
-    monitor_db.upsert(table_name='notify_log', key_dict=keys, value_dict=values)
+    # Get the server name
+    pms_connect = pmsconnect.PmsConnect()
+    server_name = pms_connect.get_server_pref(pref='FriendlyName')
 
+    # Get metadata feed for item
+    metadata = pms_connect.get_metadata_details(rating_key=session['rating_key'])
 
-def check_nofity_tag(notify_action, tag):
-    monitor_db = database.MonitorDatabase()
-    result = monitor_db.select_single("SELECT * FROM notify_log "
-                                      "WHERE notify_action = ? AND tag = ?",
-                                      [notify_action, tag])
-    return bool(result)
-
-
-def build_media_notify_params(notify_action=None, session=None, timeline=None, manual_trigger=False, **kwargs):
-    # Get time formats
-    date_format = helpers.momentjs_to_arrow(plexpy.CONFIG.DATE_FORMAT)
-    time_format = helpers.momentjs_to_arrow(plexpy.CONFIG.TIME_FORMAT)
-    duration_format = helpers.momentjs_to_arrow(plexpy.CONFIG.TIME_FORMAT, duration=True)
-
-    # Get metadata for the item
-    if session:
-        rating_key = session['rating_key']
-    elif timeline:
-        rating_key = timeline['rating_key']
-
-    notify_params = defaultdict(str)
-    if session:
-        # Reload json from raw stream info
-        if session.get('raw_stream_info'):
-            raw_stream_info = json.loads(session['raw_stream_info'])
-            # Don't overwrite id, session_key, stopped, view_offset
-            raw_stream_info.pop('id', None)
-            raw_stream_info.pop('session_key', None)
-            raw_stream_info.pop('stopped', None)
-            raw_stream_info.pop('view_offset', None)
-            session.update(raw_stream_info)
-        notify_params.update(session)
-
-    if timeline:
-        notify_params.update(timeline)
-
-    ## TODO: Check list of media info items, currently only grabs first item
-    media_info = media_part_info = {}
-    if 'media_info' in notify_params and len(notify_params['media_info']) > 0:
-        media_info = notify_params['media_info'][0]
-        if 'parts' in media_info and len(media_info['parts']) > 0:
-            parts = media_info.pop('parts')
-            media_part_info = next((p for p in parts if p['selected']), parts[0])
-
-    if 'streams' in media_part_info:
-        streams = media_part_info.pop('streams')
-        video_streams = [s for s in streams if s['type'] == '1']
-        audio_streams = [s for s in streams if s['type'] == '2']
-        subtitle_streams = [s for s in streams if s['type'] == '3']
-
-        if video_streams:
-            video_stream = next((s for s in video_streams if s['selected']), video_streams[0])
-            media_part_info.update(video_stream)
-        if audio_streams:
-            audio_stream = next((s for s in audio_streams if s['selected']), audio_streams[0])
-            media_part_info.update(audio_stream)
-        if subtitle_streams:
-            subtitle_stream = next((s for s in subtitle_streams if s['selected']), subtitle_streams[0])
-            media_part_info.update(subtitle_stream)
-
-    notify_params.update(media_info)
-    notify_params.update(media_part_info)
-
-    metadata = pmsconnect.PmsConnect().get_metadata_details(rating_key=rating_key)
-
-    child_metadata = grandchild_metadata = []
-    for key in kwargs.pop('child_keys', []):
-        child = pmsconnect.PmsConnect().get_metadata_details(rating_key=key)
-        if child:
-            child_metadata.append(child)
-    for key in kwargs.pop('grandchild_keys', []):
-        grandchild = pmsconnect.PmsConnect().get_metadata_details(rating_key=key)
-        if grandchild:
-            grandchild_metadata.append(grandchild)
-
-    # Session values
-    session = session or {}
-
-    ap = activity_processor.ActivityProcessor()
-    sessions = ap.get_sessions()
-    user_sessions = ap.get_sessions(user_id=session.get('user_id'))
-
-    # Filter out the session_key from the database sessions for playback stopped events
-    # to prevent race condition between the database and notifications
-    if notify_action == 'on_stop':
-        sessions = [s for s in sessions if str(s['session_key']) != notify_params['session_key']]
-        user_sessions = [s for s in user_sessions if str(s['session_key']) != notify_params['session_key']]
-
-    stream_count = len(sessions)
-    user_stream_count = len(user_sessions)
-    lan_streams = sum(1 for s in sessions if s['location'] == 'lan')
-    wan_streams = stream_count - lan_streams
-
-    lan_bandwidth = sum(helpers.cast_to_int(s['bandwidth']) for s in sessions if s['location'] == 'lan')
-    wan_bandwidth = sum(helpers.cast_to_int(s['bandwidth']) for s in sessions if s['location'] != 'lan')
-    total_bandwidth = lan_bandwidth + wan_bandwidth
-
-    # Generate a combined transcode decision value
-    if session.get('stream_video_decision', '') == 'transcode' or session.get('stream_audio_decision', '') == 'transcode':
-        transcode_decision = 'Transcode'
-    elif session.get('stream_video_decision', '') == 'copy' or session.get('stream_audio_decision', '') == 'copy':
-        transcode_decision = 'Direct Stream'
+    if metadata:
+        item_metadata = metadata['metadata']
     else:
-        transcode_decision = 'Direct Play'
-    transcode_decision_count = Counter(s['transcode_decision'] for s in sessions)
-    user_transcode_decision_count = Counter(s['transcode_decision'] for s in user_sessions)
-
-    if notify_action != 'on_play':
-        stream_duration_sec = int(
-            (
-                helpers.timestamp()
-                - helpers.cast_to_int(session.get('started', 0))
-                - helpers.cast_to_int(session.get('paused_counter', 0))
-            )
-        )
-        stream_duration = helpers.seconds_to_minutes(stream_duration_sec)
-    else:
-        stream_duration_sec = 0
-        stream_duration = 0
-
-    progress_duration_sec = helpers.convert_milliseconds_to_seconds(session.get('view_offset', 0))
-    duration_sec = helpers.convert_milliseconds_to_seconds(notify_params['duration'])
-    remaining_duration_sec = duration_sec - progress_duration_sec
-
-    progress_duration = helpers.seconds_to_minutes(progress_duration_sec)
-    duration = helpers.seconds_to_minutes(duration_sec)
-    remaining_duration = duration - progress_duration
-
-    # Build Plex URL
-    if notify_params['media_type'] == 'track':
-        plex_web_rating_key = notify_params['parent_rating_key']
-    else:
-        plex_web_rating_key = notify_params['rating_key']
-
-    notify_params['plex_url'] = '{web_url}#!/server/{pms_identifier}/details?key=%2Flibrary%2Fmetadata%2F{rating_key}'.format(
-        web_url=plexpy.CONFIG.PMS_WEB_URL,
-        pms_identifier=plexpy.CONFIG.PMS_IDENTIFIER,
-        rating_key=plex_web_rating_key)
-
-    # Check external guids
-    if notify_params['media_type'] == 'episode':
-        guids = notify_params['grandparent_guids']
-    elif notify_params['media_type'] == 'season':
-        guids = notify_params['parent_guids']
-    else:
-        guids = notify_params['guids']
-
-    for guid in guids:
-        if 'imdb://' in guid:
-            notify_params['imdb_id'] = guid.split('imdb://')[1]
-        elif 'tmdb://' in guid:
-            notify_params['themoviedb_id'] = guid.split('tmdb://')[1]
-        elif 'tvdb://' in guid:
-            notify_params['thetvdb_id'] = guid.split('tvdb://')[1]
-        elif 'mbid://' in guid:
-            notify_params['musicbrainz_id'] = guid.split('mbid://')[1]
-
-    # Get media IDs from guid and build URLs
-    if 'plex://' in notify_params['guid']:
-        notify_params['plex_id'] = notify_params['guid'].split('plex://')[1].split('/')[1]
-
-    if 'imdb://' in notify_params['guid'] or notify_params['imdb_id']:
-        notify_params['imdb_id'] = notify_params['imdb_id'] or notify_params['guid'].split('imdb://')[1].split('?')[0]
-        notify_params['imdb_url'] = 'https://www.imdb.com/title/' + notify_params['imdb_id']
-        notify_params['trakt_url'] = 'https://trakt.tv/search/imdb/' + notify_params['imdb_id']
-
-    if 'thetvdb://' in notify_params['guid'] or notify_params['thetvdb_id']:
-        thetvdb_media_type = 'movie' if notify_params['media_type'] == 'movie' else 'series'
-        notify_params['thetvdb_id'] = notify_params['thetvdb_id'] or notify_params['guid'].split('thetvdb://')[1].split('/')[0].split('?')[0]
-        notify_params['thetvdb_url'] = f'https://thetvdb.com/dereferrer/{thetvdb_media_type}/{notify_params["thetvdb_id"]}'
-        notify_params['trakt_url'] = 'https://trakt.tv/search/tvdb/' + notify_params['thetvdb_id'] + '?id_type=show'
-
-    elif 'thetvdbdvdorder://' in notify_params['guid']:
-        notify_params['thetvdb_id'] = notify_params['guid'].split('thetvdbdvdorder://')[1].split('/')[0].split('?')[0]
-        notify_params['thetvdb_url'] = f'https://thetvdb.com/dereferrer/series/{notify_params["thetvdb_id"]}'
-        notify_params['trakt_url'] = 'https://trakt.tv/search/tvdb/' + notify_params['thetvdb_id'] + '?id_type=show'
-
-    if 'themoviedb://' in notify_params['guid'] or notify_params['themoviedb_id']:
-        if notify_params['media_type'] == 'movie':
-            notify_params['themoviedb_id'] = notify_params['themoviedb_id'] or notify_params['guid'].split('themoviedb://')[1].split('?')[0]
-            notify_params['themoviedb_url'] = 'https://www.themoviedb.org/movie/' + notify_params['themoviedb_id']
-            notify_params['trakt_url'] = 'https://trakt.tv/search/tmdb/' + notify_params['themoviedb_id'] + '?id_type=movie'
-
-        elif notify_params['media_type'] in ('show', 'season', 'episode'):
-            notify_params['themoviedb_id'] = notify_params['themoviedb_id'] or notify_params['guid'].split('themoviedb://')[1].split('/')[0].split('?')[0]
-            notify_params['themoviedb_url'] = 'https://www.themoviedb.org/tv/' + notify_params['themoviedb_id']
-            notify_params['trakt_url'] = 'https://trakt.tv/search/tmdb/' + notify_params['themoviedb_id'] + '?id_type=show'
-
-    if 'lastfm://' in notify_params['guid']:
-        notify_params['lastfm_id'] = '/'.join(notify_params['guid'].split('lastfm://')[1].split('?')[0].split('/')[:2])
-        notify_params['lastfm_url'] = 'https://www.last.fm/music/' + notify_params['lastfm_id']
-
-    if 'mbid://' in notify_params['guid'] or notify_params['musicbrainz_id']:
-        if notify_params['media_type'] == 'artist':
-            notify_params['musicbrainz_url'] = 'https://musicbrainz.org/artist/' + notify_params['musicbrainz_id']
-        elif notify_params['media_type'] == 'album':
-            notify_params['musicbrainz_url'] = 'https://musicbrainz.org/release/' + notify_params['musicbrainz_id']
-        else:
-            notify_params['musicbrainz_url'] = 'https://musicbrainz.org/track/' + notify_params['musicbrainz_id']
-
-    if 'hama://' in notify_params['guid']:
-        notify_params['anidb_id'] = notify_params['guid'].split('hama://')[1].split('/')[0].split('?')[0].split('-')[1]
-        notify_params['anidb_url'] = 'https://anidb.net/anime/' + notify_params['anidb_id']
-
-    # Get TheMovieDB info (for movies and tv only)
-    if plexpy.CONFIG.THEMOVIEDB_LOOKUP and notify_params['media_type'] in ('movie', 'show', 'season', 'episode'):
-        if notify_params.get('themoviedb_id'):
-            if notify_params['media_type'] == 'episode':
-                lookup_key = notify_params['grandparent_rating_key']
-            elif notify_params['media_type'] == 'season':
-                lookup_key = notify_params['parent_rating_key']
-            else:
-                lookup_key = rating_key
-
-            themoveidb_json = get_themoviedb_info(rating_key=lookup_key,
-                                                  media_type=notify_params['media_type'],
-                                                  themoviedb_id=notify_params['themoviedb_id'])
-
-            if themoveidb_json.get('imdb_id'):
-                notify_params['imdb_id'] = themoveidb_json['imdb_id']
-                notify_params['imdb_url'] = 'https://www.imdb.com/title/' + themoveidb_json['imdb_id']
-
-        elif notify_params.get('thetvdb_id') or notify_params.get('imdb_id') or notify_params.get('plex_id'):
-            if notify_params['media_type'] == 'episode':
-                lookup_key = notify_params['grandparent_rating_key']
-                lookup_title = notify_params['grandparent_title']
-                lookup_year = notify_params['year']
-                lookup_media_type = 'tv'
-            elif notify_params['media_type'] == 'season':
-                lookup_key = notify_params['parent_rating_key']
-                lookup_title = notify_params['parent_title']
-                lookup_year = notify_params['year']
-                lookup_media_type = 'tv'
-            else:
-                lookup_key = rating_key
-                lookup_title = notify_params['title']
-                lookup_year = notify_params['year']
-                lookup_media_type = 'tv' if notify_params['media_type'] == 'show' else 'movie'
-
-            themoviedb_info = lookup_themoviedb_by_id(rating_key=lookup_key,
-                                                      thetvdb_id=notify_params.get('thetvdb_id'),
-                                                      imdb_id=notify_params.get('imdb_id'),
-                                                      title=lookup_title,
-                                                      year=lookup_year,
-                                                      media_type=lookup_media_type)
-            themoviedb_info.pop('rating_key', None)
-            notify_params.update(themoviedb_info)
-
-            if themoviedb_info.get('imdb_id'):
-                notify_params['imdb_url'] = 'https://www.imdb.com/title/' + themoviedb_info['imdb_id']
-            if themoviedb_info.get('themoviedb_id'):
-                notify_params['trakt_url'] = 'https://trakt.tv/search/tmdb/{}?id_type={}'.format(
-                    notify_params['themoviedb_id'], 'show' if lookup_media_type == 'tv' else 'movie')
-
-    # Get TVmaze info (for tv shows only)
-    if plexpy.CONFIG.TVMAZE_LOOKUP and notify_params['media_type'] in ('show', 'season', 'episode'):
-        if notify_params.get('thetvdb_id') or notify_params.get('imdb_id') or notify_params.get('plex_id'):
-            if notify_params['media_type'] == 'episode':
-                lookup_key = notify_params['grandparent_rating_key']
-                lookup_title = notify_params['grandparent_title']
-            elif notify_params['media_type'] == 'season':
-                lookup_key = notify_params['parent_rating_key']
-                lookup_title = notify_params['parent_title']
-            else:
-                lookup_key = rating_key
-                lookup_title = notify_params['title']
-
-            tvmaze_info = lookup_tvmaze_by_id(rating_key=lookup_key,
-                                              thetvdb_id=notify_params.get('thetvdb_id'),
-                                              imdb_id=notify_params.get('imdb_id'),
-                                              title=lookup_title)
-            tvmaze_info.pop('rating_key', None)
-            notify_params.update(tvmaze_info)
-
-            if tvmaze_info.get('thetvdb_id'):
-                notify_params['thetvdb_url'] = f'https://thetvdb.com/dereferrer/series/{tvmaze_info["thetvdb_id"]}'
-                notify_params['trakt_url'] = 'https://trakt.tv/search/tvdb/{}' + str(notify_params['thetvdb_id']) + '?id_type=show'
-            if tvmaze_info.get('imdb_id'):
-                notify_params['imdb_url'] = 'https://www.imdb.com/title/' + tvmaze_info['imdb_id']
-                notify_params['trakt_url'] = 'https://trakt.tv/search/imdb/' + notify_params['imdb_id']
-
-    # Get MusicBrainz info (for music only)
-    if plexpy.CONFIG.MUSICBRAINZ_LOOKUP and notify_params['media_type'] in ('artist', 'album', 'track'):
-        artist = release = recording = tracks = tnum = None
-        if notify_params['media_type'] == 'artist':
-            musicbrainz_type = 'artist'
-            artist = notify_params['title']
-        elif notify_params['media_type'] == 'album':
-            musicbrainz_type = 'release'
-            artist = notify_params['parent_title']
-            release = notify_params['title']
-            tracks = notify_params['children_count']
-        else:
-            musicbrainz_type = 'recording'
-            artist = notify_params['original_title'] or notify_params['grandparent_title']
-            release = notify_params['parent_title']
-            recording = notify_params['title']
-            tracks = notify_params['children_count']
-            tnum = notify_params['media_index']
-
-        musicbrainz_info = lookup_musicbrainz_info(musicbrainz_type=musicbrainz_type, rating_key=rating_key,
-                                                   artist=artist, release=release, recording=recording, tracks=tracks,
-                                                   tnum=tnum)
-        musicbrainz_info.pop('rating_key', None)
-        notify_params.update(musicbrainz_info)
-
-    if notify_params['media_type'] in ('movie', 'show', 'artist'):
-        poster_thumb = notify_params['thumb']
-        poster_key = notify_params['rating_key']
-        poster_title = notify_params['title']
-        plex_slug = notify_params['slug']
-    elif notify_params['media_type'] in ('season', 'album'):
-        poster_thumb = notify_params['thumb'] or notify_params['parent_thumb']
-        poster_key = notify_params['rating_key']
-        poster_title = '%s - %s' % (notify_params['parent_title'],
-                                    notify_params['title'])
-        plex_slug = notify_params['parent_slug']
-    elif notify_params['media_type'] in ('episode', 'track'):
-        poster_thumb = notify_params['parent_thumb'] or notify_params['grandparent_thumb']
-        poster_key = notify_params['parent_rating_key']
-        poster_title = '%s - %s' % (notify_params['grandparent_title'],
-                                    notify_params['parent_title'])
-        plex_slug = notify_params['grandparent_slug']
-    elif notify_params['media_type'] == 'clip':
-        if notify_params['extra_type']:
-            poster_thumb = notify_params['art'].replace('/art', '/thumb') or notify_params['thumb']
-        else:
-            poster_thumb = notify_params['parent_thumb'] or notify_params['thumb']
-        poster_key = notify_params['rating_key']
-        poster_title = notify_params['title']
-        plex_slug = notify_params['slug']
-    else:
-        poster_thumb = ''
-        poster_key = ''
-        poster_title = ''
-        plex_slug = ''
-
-    if notify_params['media_type'] == 'movie':
-        plex_watch_url = f'https://watch.plex.tv/movie/{plex_slug}'
-    elif notify_params['media_type'] in ('show', 'season', 'episode'):
-        plex_watch_url = f'https://watch.plex.tv/show/{plex_slug}'
-    else:
-        plex_watch_url = ''
-
-    img_service = helpers.get_img_service(include_self=True)
-    fallback = 'poster-live' if notify_params['live'] else 'poster'
-    if img_service not in (None, 'self-hosted'):
-        img_info = get_img_info(img=poster_thumb, rating_key=poster_key, title=poster_title, fallback=fallback)
-        poster_info = {'poster_title': img_info['img_title'], 'poster_url': img_info['img_url']}
-        notify_params.update(poster_info)
-    elif img_service == 'self-hosted' and plexpy.CONFIG.HTTP_BASE_URL:
-        img_hash = set_hash_image_info(img=poster_thumb, fallback=fallback)
-        poster_info = {'poster_title': poster_title,
-                       'poster_url': plexpy.CONFIG.HTTP_BASE_URL + plexpy.HTTP_ROOT + 'image/' + img_hash}
-        notify_params.update(poster_info)
-
-    if ((manual_trigger or plexpy.CONFIG.NOTIFY_GROUP_RECENTLY_ADDED_GRANDPARENT)
-        and notify_params['media_type'] in ('show', 'artist')):
-        show_name = notify_params['title']
-        season_name = ''
-        episode_name = ''
-        artist_name = notify_params['title']
-        album_name = ''
-        track_name = ''
-
-        child_num = [helpers.cast_to_int(
-            d['media_index']) for d in child_metadata if d['parent_rating_key'] == rating_key]
-        num, num00 = format_group_index(child_num)
-        season_num, season_num00 = num, num00
-
-        episode_num, episode_num00 = '', ''
-        disc_num, disc_num00 = '', ''
-        track_num, track_num00 = '', ''
-
-        child_count = len(child_num)
-        grandchild_count = ''
-
-        show_year = notify_params['year']
-
-    elif ((manual_trigger or plexpy.CONFIG.NOTIFY_GROUP_RECENTLY_ADDED_PARENT)
-          and notify_params['media_type'] in ('season', 'album')):
-        show_name = notify_params['parent_title']
-        season_name = notify_params['title']
-        episode_name = ''
-        artist_name = notify_params['parent_title']
-        album_name = notify_params['title']
-        track_name = ''
-
-        season_num = str(notify_params['media_index']).zfill(1)
-        season_num00 = str(notify_params['media_index']).zfill(2)
-
-        grandchild_num = [helpers.cast_to_int(
-            d['media_index']) for d in child_metadata if d['parent_rating_key'] == rating_key]
-        num, num00 = format_group_index(grandchild_num)
-        episode_num, episode_num00 = num, num00
-        track_num, track_num00 = num, num00
-
-        disc_num, disc_num00 = '', ''
-
-        child_count = 1
-        grandchild_count = len(grandchild_num)
-
-        show_year = notify_params['parent_year']
-
-    else:
-        show_name = notify_params['grandparent_title']
-        season_name = notify_params['parent_title']
-        episode_name = notify_params['title']
-        artist_name = notify_params['grandparent_title']
-        album_name = notify_params['parent_title']
-        track_name = notify_params['title']
-        season_num = str(notify_params['parent_media_index']).zfill(1)
-        season_num00 = str(notify_params['parent_media_index']).zfill(2)
-        episode_num = str(notify_params['media_index']).zfill(1)
-        episode_num00 = str(notify_params['media_index']).zfill(2)
-        disc_num = str(notify_params['parent_media_index']).zfill(1)
-        disc_num00 = str(notify_params['parent_media_index']).zfill(2)
-        track_num = str(notify_params['media_index']).zfill(1)
-        track_num00 = str(notify_params['media_index']).zfill(2)
-        child_count = 1
-        grandchild_count = 1
-        show_year = notify_params['grandparent_year']
-
-    rating = notify_params['rating'] or notify_params['audience_rating']
-
-    critic_rating = ''
-    if notify_params['rating_image'].startswith('rottentomatoes://') \
-            and notify_params['rating']:
-        critic_rating = helpers.get_percent(notify_params['rating'], 10)
-
-    audience_rating = notify_params['audience_rating']
-    if notify_params['audience_rating_image'].startswith(('rottentomatoes://', 'themoviedb://')) \
-            and audience_rating:
-        audience_rating = helpers.get_percent(notify_params['audience_rating'], 10)
-
-    marker = kwargs.pop('marker', defaultdict(int))
-
-    now = arrow.now()
-    now_iso = now.isocalendar()
-
-    available_params = {
-        # Global parameters
-        'tautulli_version': common.RELEASE,
-        'tautulli_remote': plexpy.CONFIG.GIT_REMOTE,
-        'tautulli_branch': plexpy.CONFIG.GIT_BRANCH,
-        'tautulli_commit': plexpy.CURRENT_VERSION,
-        'server_name': helpers.pms_name(),
-        'server_ip': plexpy.CONFIG.PMS_IP,
-        'server_port': plexpy.CONFIG.PMS_PORT,
-        'server_url': plexpy.CONFIG.PMS_URL,
-        'server_machine_id': plexpy.CONFIG.PMS_IDENTIFIER,
-        'server_platform': plexpy.CONFIG.PMS_PLATFORM,
-        'server_version': plexpy.CONFIG.PMS_VERSION,
-        'action': notify_action.split('on_')[-1],
-        'current_year': now.year,
-        'current_month': now.month,
-        'current_day': now.day,
-        'current_hour': now.hour,
-        'current_minute': now.minute,
-        'current_second': now.second,
-        'current_weekday': now_iso[2],
-        'current_week': now_iso[1],
-        'week_number': now_iso[1],  # Keep for backwards compatibility
-        'datestamp': CustomArrow(now, date_format),
-        'timestamp': CustomArrow(now, time_format),
-        'unixtime': helpers.timestamp(),
-        'utctime': helpers.utc_now_iso(),
-        # Stream parameters
-        'streams': stream_count,
-        'lan_streams': lan_streams,
-        'wan_streams': wan_streams,
-        'direct_plays': transcode_decision_count['direct play'],
-        'direct_streams': transcode_decision_count['copy'],
-        'transcodes': transcode_decision_count['transcode'],
-        'total_bandwidth': total_bandwidth,
-        'lan_bandwidth': lan_bandwidth,
-        'wan_bandwidth': wan_bandwidth,
-        'user_streams': user_stream_count,
-        'user_direct_plays': user_transcode_decision_count['direct play'],
-        'user_direct_streams': user_transcode_decision_count['copy'],
-        'user_transcodes': user_transcode_decision_count['transcode'],
-        'user': notify_params['friendly_name'],
-        'username': notify_params['user'],
-        'user_email': notify_params['email'],
-        'user_thumb': notify_params['user_thumb'],
-        'device': notify_params['device'],
-        'platform': notify_params['platform'],
-        'platform_version': notify_params['platform_version'],
-        'product': notify_params['product'],
-        'product_version': notify_params['product_version'],
-        'player': notify_params['player'],
-        'ip_address': notify_params.get('ip_address', 'N/A'),
-        'started_datestamp': CustomArrow(arrow.get(notify_params['started']), date_format) if notify_params['started'] else '',
-        'started_timestamp': CustomArrow(arrow.get(notify_params['started']), time_format) if notify_params['started'] else '',
-        'started_unixtime': notify_params['started'],
-        'stopped_datestamp': CustomArrow(arrow.get(notify_params['stopped']), date_format) if notify_params['stopped'] else '',
-        'stopped_timestamp': CustomArrow(arrow.get(notify_params['stopped']), time_format) if notify_params['stopped'] else '',
-        'stopped_unixtime': notify_params['stopped'],
-        'stream_duration': stream_duration,
-        'stream_duration_sec': stream_duration_sec,
-        'stream_time': CustomArrow(arrow.get(stream_duration_sec), duration_format),
-        'remaining_duration': remaining_duration,
-        'remaining_duration_sec': remaining_duration_sec,
-        'remaining_time': CustomArrow(arrow.get(remaining_duration_sec), duration_format),
-        'progress_duration': progress_duration,
-        'progress_duration_sec': progress_duration_sec,
-        'progress_time': CustomArrow(arrow.get(progress_duration_sec), duration_format),
-        'progress_percent': helpers.get_percent(progress_duration_sec, duration_sec),
-        'view_offset': session.get('view_offset', 0),
-        'initial_stream': notify_params['initial_stream'],
-        'transcode_decision': transcode_decision,
-        'container_decision': notify_params['container_decision'],
-        'video_decision': notify_params['video_decision'],
-        'audio_decision': notify_params['audio_decision'],
-        'subtitle_decision': notify_params['subtitle_decision'],
-        'quality_profile': notify_params['quality_profile'],
-        'optimized_version': notify_params['optimized_version'],
-        'optimized_version_profile': notify_params['optimized_version_profile'],
-        'synced_version': notify_params['synced_version'],
-        'live': notify_params['live'],
-        'marker_start': marker['start_time_offset'],
-        'marker_end': marker['end_time_offset'],
-        'credits_marker_first': helpers.cast_to_int(marker['first']),
-        'credits_marker_final': helpers.cast_to_int(marker['final']),
-        'channel_call_sign': notify_params['channel_call_sign'],
-        'channel_id': notify_params['channel_id'],
-        'channel_identifier': notify_params['channel_identifier'],
-        'channel_title': notify_params['channel_title'],
-        'channel_thumb': notify_params['channel_thumb'],
-        'channel_vcn': notify_params['channel_vcn'],
-        'secure': 'unknown' if notify_params['secure'] is None else notify_params['secure'],
-        'relayed': notify_params['relayed'],
-        'stream_local': notify_params['local'],
-        'stream_location': notify_params['location'],
-        'stream_bandwidth': notify_params['bandwidth'],
-        'stream_container': notify_params['stream_container'],
-        'stream_bitrate': notify_params['stream_bitrate'],
-        'stream_aspect_ratio': notify_params['stream_aspect_ratio'],
-        'stream_video_codec': notify_params['stream_video_codec'],
-        'stream_video_codec_level': notify_params['stream_video_codec_level'],
-        'stream_video_bitrate': notify_params['stream_video_bitrate'],
-        'stream_video_bit_depth': notify_params['stream_video_bit_depth'],
-        'stream_video_chroma_subsampling': notify_params['stream_video_chroma_subsampling'],
-        'stream_video_color_primaries': notify_params['stream_video_color_primaries'],
-        'stream_video_color_range': notify_params['stream_video_color_range'],
-        'stream_video_color_space': notify_params['stream_video_color_space'],
-        'stream_video_color_trc': notify_params['stream_video_color_trc'],
-        'stream_video_dynamic_range': notify_params['stream_video_dynamic_range'],
-        'stream_video_dovi_present': notify_params['stream_video_dovi_present'],
-        'stream_video_dovi_level': notify_params['stream_video_dovi_level'],
-        'stream_video_dovi_profile': notify_params['stream_video_dovi_profile'],
-        'stream_video_framerate': notify_params['stream_video_framerate'],
-        'stream_video_full_resolution': notify_params['stream_video_full_resolution'],
-        'stream_video_ref_frames': notify_params['stream_video_ref_frames'],
-        'stream_video_resolution': notify_params['stream_video_resolution'],
-        'stream_video_scan_type': notify_params['stream_video_scan_type'],
-        'stream_video_height': notify_params['stream_video_height'],
-        'stream_video_width': notify_params['stream_video_width'],
-        'stream_video_language': notify_params['stream_video_language'],
-        'stream_video_language_code': notify_params['stream_video_language_code'],
-        'stream_audio_bitrate': notify_params['stream_audio_bitrate'],
-        'stream_audio_bitrate_mode': notify_params['stream_audio_bitrate_mode'],
-        'stream_audio_codec': notify_params['stream_audio_codec'],
-        'stream_audio_channels': notify_params['stream_audio_channels'],
-        'stream_audio_channel_layout': notify_params['stream_audio_channel_layout'],
-        'stream_audio_sample_rate': notify_params['stream_audio_sample_rate'],
-        'stream_audio_language': notify_params['stream_audio_language'],
-        'stream_audio_language_code': notify_params['stream_audio_language_code'],
-        'stream_audio_profile': notify_params['stream_audio_profile'],
-        'stream_subtitle_codec': notify_params['stream_subtitle_codec'],
-        'stream_subtitle_container': notify_params['stream_subtitle_container'],
-        'stream_subtitle_format': notify_params['stream_subtitle_format'],
-        'stream_subtitle_forced': notify_params['stream_subtitle_forced'],
-        'stream_subtitle_language': notify_params['stream_subtitle_language'],
-        'stream_subtitle_language_code': notify_params['stream_subtitle_language_code'],
-        'stream_subtitle_location': notify_params['stream_subtitle_location'],
-        'transcode_container': notify_params['transcode_container'],
-        'transcode_video_codec': notify_params['transcode_video_codec'],
-        'transcode_video_width': notify_params['transcode_width'],
-        'transcode_video_height': notify_params['transcode_height'],
-        'transcode_audio_codec': notify_params['transcode_audio_codec'],
-        'transcode_audio_channels': notify_params['transcode_audio_channels'],
-        'transcode_hw_requested': notify_params['transcode_hw_requested'],
-        'transcode_hw_decoding': notify_params['transcode_hw_decoding'],
-        'transcode_hw_decode_codec': notify_params['transcode_hw_decode'],
-        'transcode_hw_decode_title': notify_params['transcode_hw_decode_title'],
-        'transcode_hw_encoding': notify_params['transcode_hw_encoding'],
-        'transcode_hw_encode_codec': notify_params['transcode_hw_encode'],
-        'transcode_hw_encode_title': notify_params['transcode_hw_encode_title'],
-        'transcode_hw_full_pipeline': notify_params['transcode_hw_full_pipeline'],
-        'session_key': notify_params['session_key'],
-        'transcode_key': notify_params['transcode_key'],
-        'session_id': notify_params['session_id'],
-        'user_id': notify_params['user_id'],
-        'machine_id': notify_params['machine_id'],
-        # Source metadata parameters
-        'media_type': notify_params['media_type'],
-        'library_name': notify_params['library_name'],
-        'title': notify_params['full_title'],
-        'edition_title': notify_params['edition_title'],
-        'show_name': show_name,
-        'season_name': season_name,
-        'episode_name': episode_name,
-        'artist_name': artist_name,
-        'album_name': album_name,
-        'track_name': track_name,
-        'track_artist': notify_params['original_title'] or notify_params['grandparent_title'],
-        'season_num': season_num,
-        'season_num00': season_num00,
-        'episode_num': episode_num,
-        'episode_num00': episode_num00,
-        'disc_num': disc_num,
-        'disc_num00': disc_num00,
-        'track_num': track_num,
-        'track_num00': track_num00,
-        'season_count': child_count,
-        'episode_count': grandchild_count,
-        'album_count': child_count,
-        'track_count': grandchild_count,
-        'year': notify_params['year'],
-        'show_year': show_year,
-        'release_date': CustomArrow(arrow.get(notify_params['originally_available_at']), date_format)
-            if notify_params['originally_available_at'] else '',
-        'air_date': CustomArrow(arrow.get(notify_params['originally_available_at']), date_format)
-            if notify_params['originally_available_at'] else '',
-        'added_date': CustomArrow(arrow.get(int(notify_params['added_at'])), date_format)
-            if notify_params['added_at'] else '',
-        'updated_date': CustomArrow(arrow.get(int(notify_params['updated_at'])), date_format)
-            if notify_params['updated_at'] else '',
-        'last_viewed_date': CustomArrow(arrow.get(int(notify_params['last_viewed_at'])), date_format)
-            if notify_params['last_viewed_at'] else '',
-        'studio': notify_params['studio'],
-        'content_rating': notify_params['content_rating'],
-        'directors': ', '.join(notify_params['directors']),
-        'writers': ', '.join(notify_params['writers']),
-        'actors': ', '.join(notify_params['actors']),
-        'genres': ', '.join(notify_params['genres']),
-        'labels': ', '.join(notify_params['labels']),
-        'collections': ', '.join(notify_params['collections']),
-        'summary': notify_params['summary'],
-        'tagline': notify_params['tagline'],
-        'rating': rating,
-        'critic_rating':  critic_rating,
-        'audience_rating': audience_rating,
-        'user_rating': notify_params['user_rating'],
-        'duration': duration,
-        'duration_sec': duration_sec,
-        'duration_ms': notify_params['duration'],
-        'duration_time': CustomArrow(arrow.get(duration_sec), duration_format),
-        'poster_title': notify_params['poster_title'],
-        'poster_url': notify_params['poster_url'],
-        'plex_id': notify_params['plex_id'],
-        'plex_url': notify_params['plex_url'],
-        'plex_slug': plex_slug,
-        'plex_watch_url': plex_watch_url,
-        'imdb_id': notify_params['imdb_id'],
-        'imdb_url': notify_params['imdb_url'],
-        'thetvdb_id': notify_params['thetvdb_id'],
-        'thetvdb_url': notify_params['thetvdb_url'],
-        'themoviedb_id': notify_params['themoviedb_id'],
-        'themoviedb_url': notify_params['themoviedb_url'],
-        'tvmaze_id': notify_params['tvmaze_id'],
-        'tvmaze_url': notify_params['tvmaze_url'],
-        'musicbrainz_id': notify_params['musicbrainz_id'],
-        'musicbrainz_url': notify_params['musicbrainz_url'],
-        'anidb_id': notify_params['anidb_id'],
-        'anidb_url': notify_params['anidb_url'],
-        'lastfm_url': notify_params['lastfm_url'],
-        'trakt_url': notify_params['trakt_url'],
-        'container': notify_params['container'],
-        'bitrate': notify_params['bitrate'],
-        'aspect_ratio': notify_params['aspect_ratio'],
-        'video_codec': notify_params['video_codec'],
-        'video_codec_level': notify_params['video_codec_level'],
-        'video_bitrate': notify_params['video_bitrate'],
-        'video_bit_depth': notify_params['video_bit_depth'],
-        'video_chroma_subsampling': notify_params['video_chroma_subsampling'],
-        'video_color_primaries': notify_params['video_color_primaries'],
-        'video_color_range': notify_params['video_color_range'],
-        'video_color_space': notify_params['video_color_space'],
-        'video_color_trc': notify_params['video_color_trc'],
-        'video_dynamic_range': notify_params['video_dynamic_range'],
-        'video_dovi_present': notify_params['video_dovi_present'],
-        'video_dovi_level': notify_params['video_dovi_level'],
-        'video_dovi_profile': notify_params['video_dovi_profile'],
-        'video_framerate': notify_params['video_framerate'],
-        'video_full_resolution': notify_params['video_full_resolution'],
-        'video_ref_frames': notify_params['video_ref_frames'],
-        'video_resolution': notify_params['video_resolution'],
-        'video_scan_type': notify_params['video_scan_type'],
-        'video_height': notify_params['height'],
-        'video_width': notify_params['width'],
-        'video_language': notify_params['video_language'],
-        'video_language_code': notify_params['video_language_code'],
-        'audio_bitrate': notify_params['audio_bitrate'],
-        'audio_bitrate_mode': notify_params['audio_bitrate_mode'],
-        'audio_codec': notify_params['audio_codec'],
-        'audio_channels': notify_params['audio_channels'],
-        'audio_channel_layout': notify_params['audio_channel_layout'],
-        'audio_sample_rate': notify_params['audio_sample_rate'],
-        'audio_language': notify_params['audio_language'],
-        'audio_language_code': notify_params['audio_language_code'],
-        'audio_profile': notify_params['audio_profile'],
-        'subtitle_codec': notify_params['subtitle_codec'],
-        'subtitle_container': notify_params['subtitle_container'],
-        'subtitle_format': notify_params['subtitle_format'],
-        'subtitle_forced': notify_params['subtitle_forced'],
-        'subtitle_location': notify_params['subtitle_location'],
-        'subtitle_language': notify_params['subtitle_language'],
-        'subtitle_language_code': notify_params['subtitle_language_code'],
-        'file': notify_params['file'],
-        'filename': os.path.basename(notify_params['file'].replace('\\', os.sep)),
-        'file_size': helpers.human_file_size(notify_params['file_size']),
-        'file_size_bytes': notify_params['file_size'],
-        'indexes': notify_params['indexes'],
-        'guid': notify_params['guid'],
-        'section_id': notify_params['section_id'],
-        'rating_key': notify_params['rating_key'],
-        'parent_rating_key': notify_params['parent_rating_key'],
-        'grandparent_rating_key': notify_params['grandparent_rating_key'],
-        'art': notify_params['art'],
-        'thumb': notify_params['thumb'],
-        'parent_thumb': notify_params['parent_thumb'],
-        'grandparent_thumb': notify_params['grandparent_thumb'],
-        'poster_thumb': poster_thumb
-        }
-
-    notify_params.update(available_params)
-    return notify_params
-
-
-def build_server_notify_params(notify_action=None, **kwargs):
-    # Get time formats
-    date_format = plexpy.CONFIG.DATE_FORMAT.replace('Do','')
-    time_format = plexpy.CONFIG.TIME_FORMAT.replace('Do','')
-
-    update_channel = pmsconnect.PmsConnect().get_server_update_channel()
-
-    pms_download_info = defaultdict(str, kwargs.pop('pms_download_info', {}))
-    plexpy_download_info = defaultdict(str, kwargs.pop('plexpy_download_info', {}))
-    remote_access_info = defaultdict(str, kwargs.pop('remote_access_info', {}))
-
-    windows_exe = macos_pkg = ''
-    if plexpy_download_info:
-        release_assets = plexpy_download_info.get('assets', [])
-        for asset in release_assets:
-            if asset['content_type'] == 'application/vnd.microsoft.portable-executable':
-                windows_exe = asset['browser_download_url']
-            elif asset['content_type'] == 'application/vnd.apple.installer+xml':
-                macos_pkg = asset['browser_download_url']
-
-    now = arrow.now()
-    now_iso = now.isocalendar()
-
-    available_params = {
-        # Global parameters
-        'tautulli_version': common.RELEASE,
-        'tautulli_remote': plexpy.CONFIG.GIT_REMOTE,
-        'tautulli_branch': plexpy.CONFIG.GIT_BRANCH,
-        'tautulli_commit': plexpy.CURRENT_VERSION,
-        'server_name': helpers.pms_name(),
-        'server_ip': plexpy.CONFIG.PMS_IP,
-        'server_port': plexpy.CONFIG.PMS_PORT,
-        'server_url': plexpy.CONFIG.PMS_URL,
-        'server_platform': plexpy.CONFIG.PMS_PLATFORM,
-        'server_version': plexpy.CONFIG.PMS_VERSION,
-        'server_machine_id': plexpy.CONFIG.PMS_IDENTIFIER,
-        'action': notify_action.split('on_')[-1],
-        'current_year': now.year,
-        'current_month': now.month,
-        'current_day': now.day,
-        'current_hour': now.hour,
-        'current_minute': now.minute,
-        'current_second': now.second,
-        'current_weekday': now_iso[2],
-        'current_week': now_iso[1],
-        'week_number': now_iso[1],  # Keep for backwards compatibility
-        'datestamp': CustomArrow(now, date_format),
-        'timestamp': CustomArrow(now, time_format),
-        'unixtime': helpers.timestamp(),
-        'utctime': helpers.utc_now_iso(),
-        # Plex remote access parameters
-        'remote_access_mapping_state': remote_access_info['mapping_state'],
-        'remote_access_mapping_error': remote_access_info['mapping_error'],
-        'remote_access_public_address': remote_access_info['public_address'],
-        'remote_access_public_port': remote_access_info['public_port'],
-        'remote_access_private_address': remote_access_info['private_address'],
-        'remote_access_private_port': remote_access_info['private_port'],
-        'remote_access_reason': remote_access_info['reason'],
-        # Plex Media Server update parameters
-        'update_version': pms_download_info['version'],
-        'update_url': pms_download_info['download_url'],
-        'update_release_date': CustomArrow(arrow.get(pms_download_info['release_date']), date_format)
-            if pms_download_info['release_date'] else '',
-        'update_channel': 'Beta' if update_channel == 'beta' else 'Public',
-        'update_platform': pms_download_info['platform'],
-        'update_distro': pms_download_info['distro'],
-        'update_distro_build': pms_download_info['build'],
-        'update_requirements': pms_download_info['requirements'],
-        'update_extra_info': pms_download_info['extra_info'],
-        'update_changelog_added': pms_download_info['changelog_added'],
-        'update_changelog_fixed': pms_download_info['changelog_fixed'],
-        # Tautulli update parameters
-        'tautulli_update_version': plexpy_download_info['tag_name'],
-        'tautulli_update_release_url': plexpy_download_info['html_url'],
-        'tautulli_update_exe': windows_exe,
-        'tautulli_update_pkg': macos_pkg,
-        'tautulli_update_tar': plexpy_download_info['tarball_url'],
-        'tautulli_update_zip': plexpy_download_info['zipball_url'],
-        'tautulli_update_commit': kwargs.pop('plexpy_update_commit', ''),
-        'tautulli_update_behind': kwargs.pop('plexpy_update_behind', ''),
-        'tautulli_update_changelog': plexpy_download_info['body']
-        }
-
-    return available_params
-
-
-def build_notify_text(subject='', body='', notify_action=None, parameters=None, agent_id=None, test=False, as_json=False):
-    # Default subject and body text
-    if agent_id == 15:
-        default_subject = default_body = ''
-    else:
-        default_action = next((a for a in notifiers.available_notification_actions() if a['name'] == notify_action), {})
-        default_subject = default_action.get('subject', '')
-        default_body = default_action.get('body', '')
-
-    # Make sure subject and body text are strings
-    if not isinstance(subject, str):
-        logger.error("Tautulli NotificationHandler :: Invalid subject text. Using fallback.")
-        subject = default_subject
-    if not isinstance(body, str):
-        logger.error("Tautulli NotificationHandler :: Invalid body text. Using fallback.")
-        body = default_body
-
-    media_type = parameters.get('media_type')
-
-    all_tags = r'<movie>.*?</movie>|' \
-        '<show>.*?</show>|<season>.*?</season>|<episode>.*?</episode>|' \
-        '<artist>.*?</artist>|<album>.*?</album>|<track>.*?</track>'
+        logger.error(u"PlexPy Notifier :: Unable to retrieve metadata for rating_key %s" % str(session['rating_key']))
+        return []
 
     # Check for exclusion tags
-    if media_type == 'movie':
-        pattern = re.compile(all_tags.replace('<movie>.*?</movie>', '<movie>|</movie>'), re.IGNORECASE | re.DOTALL)
-    elif media_type == 'show':
-        pattern = re.compile(all_tags.replace('<show>.*?</show>', '<show>|</show>'), re.IGNORECASE | re.DOTALL)
-    elif media_type == 'season':
-        pattern = re.compile(all_tags.replace('<season>.*?</season>', '<season>|</season>'), re.IGNORECASE | re.DOTALL)
-    elif media_type == 'episode':
-        pattern = re.compile(all_tags.replace('<episode>.*?</episode>', '<episode>|</episode>'), re.IGNORECASE | re.DOTALL)
-    elif media_type == 'artist':
-        pattern = re.compile(all_tags.replace('<artist>.*?</artist>', '<artist>|</artist>'), re.IGNORECASE | re.DOTALL)
-    elif media_type == 'album':
-        pattern = re.compile(all_tags.replace('<album>.*?</album>', '<album>|</album>'), re.IGNORECASE | re.DOTALL)
-    elif media_type == 'track':
-        pattern = re.compile(all_tags.replace('<track>.*?</track>', '<track>|</track>'), re.IGNORECASE | re.DOTALL)
+    if session['media_type'] == 'episode':
+        # Regex pattern to remove the text in the tags we don't want
+        pattern = re.compile('<movie>[^>]+.</movie>|<music>[^>]+.</music>', re.IGNORECASE)
+    elif session['media_type'] == 'movie':
+        # Regex pattern to remove the text in the tags we don't want
+        pattern = re.compile('<tv>[^>]+.</tv>|<music>[^>]+.</music>', re.IGNORECASE)
+    elif session['media_type'] == 'track':
+        # Regex pattern to remove the text in the tags we don't want
+        pattern = re.compile('<tv>[^>]+.</tv>|<movie>[^>]+.</movie>', re.IGNORECASE)
     else:
-        pattern = re.compile(all_tags, re.IGNORECASE | re.DOTALL)
-
-    # Remove the unwanted tags and strip any unmatch tags too.
-    subject = strip_tag(re.sub(pattern, '', subject), agent_id).strip(' \t\n\r')
-    body = strip_tag(re.sub(pattern, '', body), agent_id).strip(' \t\n\r')
-    script_args = []
-
-    if test:
-        return subject, body
-
-    str_formatter = partial(str_format, parameters=parameters)
-
-    if agent_id == 15:
-        try:
-            script_args = [str_formatter(arg) for arg in helpers.split_args(subject)]
-        except LookupError as e:
-            logger.error("Tautulli NotificationHandler :: Unable to parse parameter %s in script argument. Using fallback." % e)
-            script_args = []
-        except Exception as e:
-            logger.exception("Tautulli NotificationHandler :: Unable to parse custom script arguments: %s. Using fallback." % e)
-            script_args = []
-
-    elif agent_id == 25 or as_json:
-        agent = 'MQTT' if agent_id == 23 else 'webhook'
-        if subject:
-            try:
-                subject = json.loads(subject)
-            except ValueError as e:
-                logger.error("Tautulli NotificationHandler :: Unable to parse custom %s json header data: %s. Using fallback." % (agent, e))
-                subject = ''
-        if subject:
-            try:
-                subject = json.dumps(helpers.traverse_map(subject, str_formatter))
-            except LookupError as e:
-                logger.error("Tautulli NotificationHandler :: Unable to parse parameter %s in %s header data. Using fallback." % (e, agent))
-                subject = ''
-            except Exception as e:
-                logger.exception("Tautulli NotificationHandler :: Unable to parse custom %s header data: %s. Using fallback." % (agent, e))
-                subject = ''
-
-        if body:
-            try:
-                body = json.loads(body)
-            except ValueError as e:
-                logger.error("Tautulli NotificationHandler :: Unable to parse custom webhook json body data: %s. Using fallback." % e)
-                body = ''
-        if body:
-            try:
-                body = json.dumps(helpers.traverse_map(body, str_formatter))
-            except LookupError as e:
-                logger.error("Tautulli NotificationHandler :: Unable to parse parameter %s in webhook body data. Using fallback." % e)
-                body = ''
-            except Exception as e:
-                logger.exception("Tautulli NotificationHandler :: Unable to parse custom webhook body data: %s. Using fallback." % e)
-                body = ''
+        pattern = None
 
+    if session['media_type'] == 'episode' or session['media_type'] == 'movie' or session['media_type'] == 'track' \
+            and pattern:
+        # Remove the unwanted tags and strip any unmatch tags too.
+        on_start_subject = strip_tag(re.sub(pattern, '', plexpy.CONFIG.NOTIFY_ON_START_SUBJECT_TEXT))
+        on_start_body = strip_tag(re.sub(pattern, '', plexpy.CONFIG.NOTIFY_ON_START_BODY_TEXT))
+        on_stop_subject = strip_tag(re.sub(pattern, '', plexpy.CONFIG.NOTIFY_ON_STOP_SUBJECT_TEXT))
+        on_stop_body = strip_tag(re.sub(pattern, '', plexpy.CONFIG.NOTIFY_ON_STOP_BODY_TEXT))
+        on_pause_subject = strip_tag(re.sub(pattern, '', plexpy.CONFIG.NOTIFY_ON_PAUSE_SUBJECT_TEXT))
+        on_pause_body = strip_tag(re.sub(pattern, '', plexpy.CONFIG.NOTIFY_ON_PAUSE_BODY_TEXT))
+        on_resume_subject = strip_tag(re.sub(pattern, '', plexpy.CONFIG.NOTIFY_ON_RESUME_SUBJECT_TEXT))
+        on_resume_body = strip_tag(re.sub(pattern, '', plexpy.CONFIG.NOTIFY_ON_RESUME_BODY_TEXT))
+        on_buffer_subject = strip_tag(re.sub(pattern, '', plexpy.CONFIG.NOTIFY_ON_BUFFER_SUBJECT_TEXT))
+        on_buffer_body = strip_tag(re.sub(pattern, '', plexpy.CONFIG.NOTIFY_ON_BUFFER_BODY_TEXT))
+        on_watched_subject = strip_tag(re.sub(pattern, '', plexpy.CONFIG.NOTIFY_ON_WATCHED_SUBJECT_TEXT))
+        on_watched_body = strip_tag(re.sub(pattern, '', plexpy.CONFIG.NOTIFY_ON_WATCHED_BODY_TEXT))
     else:
-        try:
-            subject = str_formatter(subject)
-        except LookupError as e:
-            logger.error("Tautulli NotificationHandler :: Unable to parse parameter %s in notification subject. Using fallback." % e)
-            subject = str(default_subject).format(**parameters)
-        except Exception as e:
-            logger.exception("Tautulli NotificationHandler :: Unable to parse custom notification subject: %s. Using fallback." % e)
-            subject = str(default_subject).format(**parameters)
-
-        try:
-            body = str_formatter(body)
-        except LookupError as e:
-            logger.error("Tautulli NotificationHandler :: Unable to parse parameter %s in notification body. Using fallback." % e)
-            body = str(default_body).format(**parameters)
-        except Exception as e:
-            logger.exception("Tautulli NotificationHandler :: Unable to parse custom notification body: %s. Using fallback." % e)
-            body = str(default_body).format(**parameters)
-
-    return subject, body, script_args
-
-
-def strip_tag(data, agent_id=None):
-    # Substitute temporary tokens for < and > in parameter prefix and suffix
-    data = re.sub(r'{.+?}', lambda m: m.group().replace('<', '%temp_lt_token%').replace('>', '%temp_gt_token%'), data)
-
-    if agent_id == 7:
-        # Allow tags b, i, u, a[href], font[color] for Pushover
-        whitelist = {'b': [],
-                     'i': [],
-                     'u': [],
-                     'a': ['href'],
-                     'font': ['color']}
-        data = bleach.clean(data, tags=whitelist.keys(), attributes=whitelist, strip=True)
-
-    elif agent_id == 13:
-        # Allow tags for Telegram
-        # https://core.telegram.org/bots/api#html-style
-        whitelist = {'b': [], 'strong': [],
-                     'i': [], 'em': [],
-                     'u': [], 'ins': [],
-                     's': [], 'strike': [], 'del': [],
-                     'span': ['class'], 'tg-spoiler': [],
-                     'a': ['href'],
-                     'tg-emoji': ['emoji-id'],
-                     'code': ['class'],
-                     'pre': [],
-                     'blockquote': ['expandable'],
-        }
-        data = bleach.clean(data, tags=whitelist.keys(), attributes=whitelist, strip=True)
-
-    elif agent_id in (10, 14, 20, 25):
-        # Don't remove tags for Email, Slack, Discord, and Webhook
-        pass
+        on_start_subject = plexpy.CONFIG.NOTIFY_ON_START_SUBJECT_TEXT
+        on_start_body = plexpy.CONFIG.NOTIFY_ON_START_BODY_TEXT
+        on_stop_subject = plexpy.CONFIG.NOTIFY_ON_STOP_SUBJECT_TEXT
+        on_stop_body = plexpy.CONFIG.NOTIFY_ON_STOP_BODY_TEXT
+        on_pause_subject = plexpy.CONFIG.NOTIFY_ON_PAUSE_SUBJECT_TEXT
+        on_pause_body = plexpy.CONFIG.NOTIFY_ON_PAUSE_BODY_TEXT
+        on_resume_subject = plexpy.CONFIG.NOTIFY_ON_RESUME_SUBJECT_TEXT
+        on_resume_body = plexpy.CONFIG.NOTIFY_ON_RESUME_BODY_TEXT
+        on_buffer_subject = plexpy.CONFIG.NOTIFY_ON_BUFFER_SUBJECT_TEXT
+        on_buffer_body = plexpy.CONFIG.NOTIFY_ON_BUFFER_BODY_TEXT
+        on_watched_subject = plexpy.CONFIG.NOTIFY_ON_WATCHED_SUBJECT_TEXT
+        on_watched_body = plexpy.CONFIG.NOTIFY_ON_WATCHED_BODY_TEXT
 
+    # Create a title
+    if session['media_type'] == 'episode':
+        full_title = '%s - %s' % (session['grandparent_title'],
+                                  session['title'])
+    elif session['media_type'] == 'track':
+        full_title = '%s - %s' % (session['grandparent_title'],
+                                  session['title'])
     else:
-        whitelist = {}
-        data = bleach.clean(data, tags=whitelist.keys(), attributes=whitelist, strip=True)
+        full_title = session['title']
 
-    # Resubstitute temporary tokens for < and > in parameter prefix and suffix
-    return data.replace('%temp_lt_token%', '<').replace('%temp_gt_token%', '>')
-
-
-def format_group_index(group_keys):
-    group_keys = sorted(group_keys)
-
-    num = []
-    num00 = []
-
-    for k, g in groupby(enumerate(group_keys), lambda i_x: i_x[0]-i_x[1]):
-        group = list(map(itemgetter(1), g))
-        g_min, g_max = min(group), max(group)
-
-        if g_min == g_max:
-            num.append('{0:01d}'.format(g_min))
-            num00.append('{0:02d}'.format(g_min))
+    # Generate a combined transcode decision value
+    if session['video_decision']:
+        if session['video_decision'] == 'transcode':
+            transcode_decision = 'Transcode'
+        elif session['video_decision'] == 'copy' or session['audio_decision'] == 'copy':
+            transcode_decision = 'Direct Stream'
         else:
-            num.append('{0:01d}-{1:01d}'.format(g_min, g_max))
-            num00.append('{0:02d}-{1:02d}'.format(g_min, g_max))
-
-    return ','.join(num) or '0', ','.join(num00) or '00'
-
-
-def get_img_info(img=None, rating_key=None, title='', width=1000, height=1500,
-                 opacity=100, background='000000', blur=0, fallback=None):
-    img_info = {'img_title': '', 'img_url': ''}
-
-    if not rating_key and not img:
-        return img_info
-
-    if rating_key and not img:
-        if fallback and fallback.startswith('art'):
-            img = '/library/metadata/{}/art'.format(rating_key)
-        else:
-            img = '/library/metadata/{}/thumb'.format(rating_key)
-
-    if img.startswith('/library/metadata'):
-        img_split = img.split('/')
-        img = '/'.join(img_split[:5])
-        img_rating_key = img_split[3]
-        if rating_key != img_rating_key:
-            rating_key = img_rating_key
-
-    service = helpers.get_img_service()
-
-    if service is None:
-        return img_info
-
-    elif service == 'cloudinary':
-        if fallback == 'cover':
-            w, h = 1000, 1000
-        elif fallback and fallback.startswith('art'):
-            w, h = 1920, 1080
-        else:
-            w, h = 1000, 1500
-
-        image_info = {'img': img,
-                      'rating_key': rating_key,
-                      'width': w,
-                      'height': h,
-                      'opacity': 100,
-                      'background': '000000',
-                      'blur': 0,
-                      'fallback': fallback}
-
+            transcode_decision = 'Direct Play'
     else:
-        image_info = {'img': img,
-                      'rating_key': rating_key,
-                      'width': width,
-                      'height': height,
-                      'opacity': opacity,
-                      'background': background,
-                      'blur': blur,
-                      'fallback': fallback}
-
-    # Try to retrieve poster info from the database
-    data_factory = datafactory.DataFactory()
-    database_img_info = data_factory.get_img_info(service=service, **image_info)
-
-    if database_img_info:
-        img_info = database_img_info[0]
-
-    elif not database_img_info and img:
-        pms_connect = pmsconnect.PmsConnect()
-        result = pms_connect.get_image(refresh=True, **image_info)
-
-        if result and result[0]:
-            img_url = delete_hash = ''
-
-            if service == 'imgur':
-                img_url, delete_hash = helpers.upload_to_imgur(img_data=result[0],
-                                                               img_title=title,
-                                                               rating_key=rating_key,
-                                                               fallback=fallback)
-            elif service == 'cloudinary':
-                img_url = helpers.upload_to_cloudinary(img_data=result[0],
-                                                       img_title=title,
-                                                       rating_key=rating_key,
-                                                       fallback=fallback)
-
-            if img_url:
-                img_hash = set_hash_image_info(**image_info)
-                data_factory.set_img_info(img_hash=img_hash,
-                                          img_title=title,
-                                          img_url=img_url,
-                                          delete_hash=delete_hash,
-                                          service=service)
-
-                img_info = {'img_title': title, 'img_url': img_url}
-
-    if img_info['img_url'] and service == 'cloudinary':
-        # Transform image using Cloudinary
-        image_info = {'rating_key': rating_key,
-                      'width': width,
-                      'height': height,
-                      'opacity': opacity,
-                      'background': background,
-                      'blur': blur,
-                      'fallback': fallback,
-                      'img_title': title}
-
-        transformed_url = helpers.cloudinary_transform(**image_info)
-        if transformed_url:
-            img_info['img_url'] = transformed_url
-
-    return img_info
-
-
-def set_hash_image_info(img=None, rating_key=None, width=750, height=1000,
-                        opacity=100, background='000000', blur=0, fallback=None,
-                        add_to_db=True):
-    if not rating_key and not img:
-        return fallback
-
-    if rating_key and not img:
-        if fallback and fallback.startswith('art'):
-            img = '/library/metadata/{}/art'.format(rating_key)
+        if session['audio_decision'] == 'transcode':
+            transcode_decision = 'Transcode'
         else:
-            img = '/library/metadata/{}/thumb'.format(rating_key)
+            transcode_decision = 'Direct Play'
 
-    if img.startswith('/library/metadata'):
-        img_split = img.split('/')
-        img = '/'.join(img_split[:5])
-        img_rating_key = img_split[3]
-        if rating_key != img_rating_key:
-            rating_key = img_rating_key
-
-    img_string = '{}.{}.{}.{}.{}.{}.{}.{}'.format(
-        plexpy.CONFIG.PMS_UUID, img, rating_key, width, height, opacity, background, blur, fallback)
-    img_hash = hashlib.sha256(img_string.encode('utf-8')).hexdigest()
-
-    if add_to_db:
-        keys = {'img_hash': img_hash}
-        values = {'img': img,
-                  'rating_key': rating_key,
-                  'width': width,
-                  'height': height,
-                  'opacity': opacity,
-                  'background': background,
-                  'blur': blur,
-                  'fallback': fallback}
-
-        db = database.MonitorDatabase()
-        db.upsert('image_hash_lookup', key_dict=keys, value_dict=values)
-
-    return img_hash
-
-
-def get_hash_image_info(img_hash=None):
-    db = database.MonitorDatabase()
-    query = "SELECT * FROM image_hash_lookup WHERE img_hash = ?"
-    result = db.select_single(query, args=[img_hash])
-    return result
-
-
-def lookup_tvmaze_by_id(rating_key=None, thetvdb_id=None, imdb_id=None, title=None):
-    db = database.MonitorDatabase()
-
-    try:
-        query = "SELECT imdb_id, tvmaze_id, tvmaze_url FROM tvmaze_lookup " \
-                "WHERE rating_key = ?"
-        tvmaze_info = db.select_single(query, args=[rating_key])
-    except Exception as e:
-        logger.warn("Tautulli NotificationHandler :: Unable to execute database query for lookup_tvmaze_by_tvdb_id: %s." % e)
-        return {}
-
-    if not tvmaze_info:
-        tvmaze_info = {}
-
-        if thetvdb_id:
-            logger.debug("Tautulli NotificationHandler :: Looking up TVmaze info for thetvdb_id '{}'.".format(thetvdb_id))
-        elif imdb_id:
-            logger.debug("Tautulli NotificationHandler :: Looking up TVmaze info for imdb_id '{}'.".format(imdb_id))
+    duration = helpers.convert_milliseconds_to_minutes(item_metadata['duration'])
+    view_offset = helpers.convert_milliseconds_to_minutes(session['view_offset'])
+    stream_duration = 0
+    if state != 'play':
+        if session['paused_counter']:
+            stream_duration = int((time.time() - helpers.cast_to_float(session['started']) -
+                                   helpers.cast_to_float(session['paused_counter'])) / 60)
         else:
-            logger.debug("Tautulli NotificationHandler :: Looking up TVmaze info for '{}'.".format(title))
+            stream_duration = int((time.time() - helpers.cast_to_float(session['started'])) / 60)
 
-        if thetvdb_id or imdb_id:
-            params = {'thetvdb': thetvdb_id} if thetvdb_id else {'imdb': imdb_id}
-            response, err_msg, req_msg = request.request_response2(
-                'http://api.tvmaze.com/lookup/shows', params=params)
-        elif title:
-            params = {'q': title}
-            response, err_msg, req_msg = request.request_response2(
-                'https://api.tvmaze.com/singlesearch/shows', params=params)
-        else:
-            return tvmaze_info
+    progress_percent = helpers.get_percent(view_offset, duration)
 
-        if response and not err_msg:
-            tvmaze_json = response.json()
-            thetvdb_id = tvmaze_json.get('externals', {}).get('thetvdb', '')
-            imdb_id = tvmaze_json.get('externals', {}).get('imdb', '')
-            tvmaze_id = tvmaze_json.get('id', '')
-            tvmaze_url = tvmaze_json.get('url', '')
+    available_params = {'server_name': server_name,
+                        'user': session['friendly_name'],
+                        'player': session['player'],
+                        'title': full_title,
+                        'show_name': item_metadata['grandparent_title'],
+                        'episode_name': item_metadata['title'],
+                        'platform': session['platform'],
+                        'media_type': session['media_type'],
+                        'transcode_decision': transcode_decision,
+                        'year': item_metadata['year'],
+                        'studio': item_metadata['studio'],
+                        'content_rating': item_metadata['content_rating'],
+                        'summary': item_metadata['summary'],
+                        'season_num': item_metadata['parent_index'],
+                        'season_num00': item_metadata['parent_index'].zfill(2),
+                        'episode_num': item_metadata['index'],
+                        'episode_num00': item_metadata['index'].zfill(2),
+                        'album_name': item_metadata['parent_title'],
+                        'rating': item_metadata['rating'],
+                        'duration': duration,
+                        'stream_duration': stream_duration,
+                        'progress': view_offset,
+                        'progress_percent': progress_percent
+                        }
 
-            keys = {'tvmaze_id': tvmaze_id}
-            tvmaze_info = {'rating_key': rating_key,
-                           'thetvdb_id': thetvdb_id,
-                           'imdb_id': imdb_id,
-                           'tvmaze_url': tvmaze_url,
-                           'tvmaze_json': json.dumps(tvmaze_json)}
-            db.upsert(table_name='tvmaze_lookup', key_dict=keys, value_dict=tvmaze_info)
+    # Default subject text
+    subject_text = 'PlexPy (%s)' % server_name
 
-            tvmaze_info.update(keys)
-            tvmaze_info.pop('tvmaze_json')
+    if state == 'play':
+        # Default body text
+        body_text = '%s (%s) is watching %s' % (session['friendly_name'],
+                                                session['player'],
+                                                full_title)
 
-        else:
-            if err_msg:
-                logger.error("Tautulli NotificationHandler :: {}".format(err_msg))
-
-            if req_msg:
-                logger.debug("Tautulli NotificationHandler :: Request response: {}".format(req_msg))
-
-    return tvmaze_info
-
-
-def lookup_themoviedb_by_id(rating_key=None, thetvdb_id=None, imdb_id=None, title=None, year=None, media_type=None):
-    db = database.MonitorDatabase()
-
-    try:
-        query = "SELECT thetvdb_id, imdb_id, themoviedb_id, themoviedb_url FROM themoviedb_lookup " \
-                "WHERE rating_key = ?"
-        themoviedb_info = db.select_single(query, args=[rating_key])
-    except Exception as e:
-        logger.warn("Tautulli NotificationHandler :: Unable to execute database query for lookup_themoviedb_by_imdb_id: %s." % e)
-        return {}
-
-    if not themoviedb_info:
-        themoviedb_info = {}
-
-        if thetvdb_id:
-            logger.debug("Tautulli NotificationHandler :: Looking up The Movie Database info for thetvdb_id '{}'.".format(thetvdb_id))
-        elif imdb_id:
-            logger.debug("Tautulli NotificationHandler :: Looking up The Movie Database info for imdb_id '{}'.".format(imdb_id))
-        else:
-            logger.debug("Tautulli NotificationHandler :: Looking up The Movie Database info for '{} ({})'.".format(title, year))
-
-        params = {'api_key': plexpy.CONFIG.THEMOVIEDB_APIKEY}
-
-        if thetvdb_id or imdb_id:
-            params['external_source'] = 'tvdb_id' if thetvdb_id else 'imdb_id'
-            response, err_msg, req_msg = request.request_response2(
-                'https://api.themoviedb.org/3/find/{}'.format(thetvdb_id or imdb_id), params=params)
-        elif title and year and media_type:
-            params['query'] = title
-            params['year'] = year
-            response, err_msg, req_msg = request.request_response2(
-                'https://api.themoviedb.org/3/search/{}'.format(media_type), params=params)
-        else:
-            return themoviedb_info
-
-        if response and not err_msg:
-            themoviedb_find_json = response.json()
-            if themoviedb_find_json.get('tv_results'):
-                themoviedb_id = themoviedb_find_json['tv_results'][0]['id']
-            elif themoviedb_find_json.get('movie_results'):
-                themoviedb_id = themoviedb_find_json['movie_results'][0]['id']
-            elif themoviedb_find_json.get('results'):
-                themoviedb_id = themoviedb_find_json['results'][0]['id']
-            else:
-                themoviedb_id = ''
-
-            if themoviedb_id:
-                themoviedb_url = 'https://www.themoviedb.org/{}/{}'.format(media_type, themoviedb_id)
-                themoviedb_json = get_themoviedb_info(rating_key=rating_key,
-                                                      media_type=media_type,
-                                                      themoviedb_id=themoviedb_id)
-
-                keys = {'themoviedb_id': themoviedb_id}
-                themoviedb_info = {'rating_key': rating_key,
-                                   'thetvdb_id': thetvdb_id,
-                                   'imdb_id': imdb_id or themoviedb_json.get('imdb_id'),
-                                   'themoviedb_url': themoviedb_url,
-                                   'themoviedb_json': json.dumps(themoviedb_json)
-                                   }
-
-                db.upsert(table_name='themoviedb_lookup', key_dict=keys, value_dict=themoviedb_info)
-
-                themoviedb_info.update(keys)
-                themoviedb_info.pop('themoviedb_json')
-
-        else:
-            if err_msg:
-                logger.error("Tautulli NotificationHandler :: {}".format(err_msg))
-
-            if req_msg:
-                logger.debug("Tautulli NotificationHandler :: Request response: {}".format(req_msg))
-
-    return themoviedb_info
-
-
-def get_themoviedb_info(rating_key=None, media_type=None, themoviedb_id=None):
-    if media_type in ('show', 'season', 'episode'):
-        media_type = 'tv'
-
-    db = database.MonitorDatabase()
-
-    try:
-        query = "SELECT themoviedb_json FROM themoviedb_lookup " \
-                "WHERE rating_key = ?"
-        result = db.select_single(query, args=[rating_key])
-    except Exception as e:
-        logger.warn("Tautulli NotificationHandler :: Unable to execute database query for get_themoviedb_info: %s." % e)
-        return {}
-
-    if result:
-        try:
-            return json.loads(result['themoviedb_json'])
-        except:
-            pass
-
-    themoviedb_json = {}
-
-    logger.debug("Tautulli NotificationHandler :: Looking up The Movie Database info for themoviedb_id '{}'.".format(themoviedb_id))
-
-    params = {'api_key': plexpy.CONFIG.THEMOVIEDB_APIKEY}
-    response, err_msg, req_msg = request.request_response2('https://api.themoviedb.org/3/{}/{}'.format(media_type, themoviedb_id), params=params)
-
-    if response and not err_msg:
-        themoviedb_json = response.json()
-        themoviedb_id = themoviedb_json['id']
-        themoviedb_url = 'https://www.themoviedb.org/{}/{}'.format(media_type, themoviedb_id)
-
-        keys = {'themoviedb_id': themoviedb_id}
-        themoviedb_info = {'rating_key': rating_key,
-                           'imdb_id': themoviedb_json.get('imdb_id'),
-                           'themoviedb_url': themoviedb_url,
-                           'themoviedb_json': json.dumps(themoviedb_json)
-                           }
-
-        db.upsert(table_name='themoviedb_lookup', key_dict=keys, value_dict=themoviedb_info)
-
-        themoviedb_info.update(keys)
-
-    else:
-        if err_msg:
-            logger.error("Tautulli NotificationHandler :: {}".format(err_msg))
-
-        if req_msg:
-            logger.debug("Tautulli NotificationHandler :: Request response: {}".format(req_msg))
-
-    return themoviedb_json
-
-
-def lookup_musicbrainz_info(musicbrainz_type=None, rating_key=None, artist=None, release=None, recording=None,
-                            tracks=None, tnum=None):
-    db = database.MonitorDatabase()
-
-    try:
-        query = "SELECT musicbrainz_id, musicbrainz_url, musicbrainz_type FROM musicbrainz_lookup " \
-                "WHERE rating_key = ?"
-        musicbrainz_info = db.select_single(query, args=[rating_key])
-    except Exception as e:
-        logger.warn("Tautulli NotificationHandler :: Unable to execute database query for lookup_musicbrainz: %s." % e)
-        return {}
-
-    if not musicbrainz_info:
-        musicbrainzngs.set_useragent(
-            common.PRODUCT,
-            common.RELEASE,
-            "https://tautulli.com",
-        )
-
-        if musicbrainz_type == 'artist':
-            logger.debug("Tautulli NotificationHandler :: Looking up MusicBrainz info for "
-                         "{} '{}'.".format(musicbrainz_type, artist))
-            result = musicbrainzngs.search_artists(artist=artist, strict=True, limit=1)
-            if result['artist-list']:
-                musicbrainz_info = result['artist-list'][0]
-
-        elif musicbrainz_type == 'release':
-            logger.debug("Tautulli NotificationHandler :: Looking up MusicBrainz info for "
-                         "{} '{} - {}'.".format(musicbrainz_type, artist, release))
-            result = musicbrainzngs.search_releases(artist=artist, release=release, tracks=tracks,
-                                                    strict=True, limit=1)
-            if result['release-list']:
-                musicbrainz_info = result['release-list'][0]
-
-        elif musicbrainz_type == 'recording':
-            logger.debug("Tautulli NotificationHandler :: Looking up MusicBrainz info for "
-                         "{} '{} - {} - {}'.".format(musicbrainz_type, artist, release, recording))
-            result = musicbrainzngs.search_recordings(artist=artist, release=release, recording=recording,
-                                                      tracks=tracks, tnum=tnum,
-                                                      strict=True, limit=1)
-            if result['recording-list']:
-                musicbrainz_info = result['recording-list'][0]
-
-        if musicbrainz_info:
-            musicbrainz_id = musicbrainz_info['id']
-            musicbrainz_url = 'https://musicbrainz.org/' + musicbrainz_type + '/' + musicbrainz_id
-
-            keys = {'musicbrainz_id': musicbrainz_id}
-            musicbrainz_info = {'rating_key': rating_key,
-                                'musicbrainz_url': musicbrainz_url,
-                                'musicbrainz_type': musicbrainz_type,
-                                'musicbrainz_json': json.dumps(musicbrainz_info)}
-            db.upsert(table_name='musicbrainz_lookup', key_dict=keys, value_dict=musicbrainz_info)
-
-            musicbrainz_info.update(keys)
-            musicbrainz_info.pop('musicbrainz_json')
-
-        else:
-            logger.warn("Tautulli NotificationHandler :: No match found on MusicBrainz.")
-
-    return musicbrainz_info
-
-
-def str_format(s, parameters):
-    custom_formatter = CustomFormatter()
-    if isinstance(s, str):
-        return custom_formatter.format(str(s), **parameters)
-    return s
-
-
-def str_eval(field_name, kwargs):
-    field_name = field_name.strip('`')
-    allowed_names = {
-        'bool': bool,
-        'divmod': helpers.helper_divmod,
-        'float': helpers.cast_to_float,
-        'int': helpers.cast_to_int,
-        'len': helpers.helper_len,
-        'round': helpers.helper_round,
-        'str': str
-    }
-    allowed_names.update(kwargs)
-    code = compile(field_name, '<string>', 'eval')
-    for name in code.co_names:
-        if name not in allowed_names:
-            raise NameError('Use of {name} not allowed'.format(name=name))
-    return eval(code, {'__builtins__': {}}, allowed_names)
-
-
-class CustomFormatter(Formatter):
-    def __init__(self, default='{{{0}}}'):
-        self.default = default
-        self.eval_regex = re.compile(r'`.*?`')
-        self.eval_replace_regex = re.compile(r'{.*(`.*?`).*}')
-        self.eval_replace = {
-            ':': '%%colon%%',
-            '!': '%%exclamation%%'
-        }
-
-    def convert_field(self, value, conversion):
-        if conversion is None:
-            return value
-        elif conversion == 's':
-            return str(value)
-        elif conversion == 'r':
-            return repr(value)
-        elif conversion == 'u':  # uppercase
-            return str(value).upper()
-        elif conversion == 'l':  # lowercase
-            return str(value).lower()
-        elif conversion == 'c':  # capitalize
-            return str(value).title()
-        else:
-            return value
-
-    def format_field(self, value, format_spec):
-        if format_spec.startswith('[') and format_spec.endswith(']'):
-            pattern = re.compile(r'\[(?P<start>-?\d*)(?P<slice>:?)(?P<end>-?\d*)\]')
-            match = re.match(pattern, format_spec)
-            if value and match:
-                groups = match.groupdict()
-                items = [x.strip() for x in str(value).split(',')]
-                start = groups['start'] or None
-                end = groups['end'] or None
-                if start is not None:
-                    start = helpers.cast_to_int(start)
-                if end is not None:
-                    end = helpers.cast_to_int(end)
-                if not groups['slice']:
-                    end = start + 1
-                value = ', '.join(items[slice(start, end)])
-            return value
-        else:
+        if on_start_subject and on_start_body:
             try:
-                return super(CustomFormatter, self).format_field(value, format_spec)
-            except ValueError:
-                return value
+                subject_text = unicode(on_start_subject).format(**available_params)
+            except LookupError, e:
+                logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e)
+            except:
+                logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.")
 
-    def get_value(self, key, args, kwargs):
-        if isinstance(key, str):
-            return kwargs.get(key, self.default.format(key))
+            try:
+                body_text = unicode(on_start_body).format(**available_params)
+            except LookupError, e:
+                logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e)
+            except:
+                logger.error(u"PlexPy Notifier :: Unable to parse custom notification body. Using fallback.")
+
+            return [subject_text, body_text]
         else:
-            return super(CustomFormatter, self).get_value(key, args, kwargs)
+            return [subject_text, body_text]
+    elif state == 'stop':
+        # Default body text
+        body_text = '%s (%s) has stopped %s' % (session['friendly_name'],
+                                                session['player'],
+                                                full_title)
 
-    def parse(self, format_string):
-        # Replace characters in eval expression
-        for match in re.findall(self.eval_replace_regex, format_string):
-            replaced = match
-            for k, v in self.eval_replace.items():
-                replaced = replaced.replace(k, v)
-            format_string = format_string.replace(match, replaced)
+        if on_stop_subject and on_stop_body:
+            try:
+                subject_text = unicode(on_stop_subject).format(**available_params)
+            except LookupError, e:
+                logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e)
+            except:
+                logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.")
 
-        parsed = super(CustomFormatter, self).parse(format_string)
+            try:
+                body_text = unicode(on_stop_body).format(**available_params)
+            except LookupError, e:
+                logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e)
+            except:
+                logger.error(u"PlexPy Notifier :: Unable to parse custom notification body. Using fallback.")
 
-        for literal_text, field_name, format_spec, conversion in parsed:
-            # Restore characters in eval expression
-            if field_name:
-                for k, v in self.eval_replace.items():
-                    field_name = field_name.replace(v, k)
+            return [subject_text, body_text]
+        else:
+            return [subject_text, body_text]
+    elif state == 'pause':
+        # Default body text
+        body_text = '%s (%s) has paused %s' % (session['friendly_name'],
+                                               session['player'],
+                                               full_title)
 
-            real_format_string = ''
-            if field_name:
-                real_format_string += field_name
-            if conversion:
-                real_format_string += '!' + conversion
-            if format_spec:
-                real_format_string += ':' + format_spec
+        if on_pause_subject and on_pause_body:
+            try:
+                subject_text = unicode(on_pause_subject).format(**available_params)
+            except LookupError, e:
+                logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e)
+            except:
+                logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.")
 
-            prefix = None
-            suffix = None
+            try:
+                body_text = unicode(on_pause_body).format(**available_params)
+            except LookupError, e:
+                logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e)
+            except:
+                logger.error(u"PlexPy Notifier :: Unable to parse custom notification body. Using fallback.")
 
-            matches = re.findall(self.eval_regex, real_format_string)
-            temp_format_string = re.sub(self.eval_regex, '{}', real_format_string)
+            return [subject_text, body_text]
+        else:
+            return [subject_text, body_text]
+    elif state == 'resume':
+        # Default body text
+        body_text = '%s (%s) has resumed %s' % (session['friendly_name'],
+                                                session['player'],
+                                                full_title)
 
-            prefix_split = temp_format_string.split('<')
-            if len(prefix_split) == 2:
-                prefix = prefix_split[0].replace('\\n', '\n')
-                temp_format_string = prefix_split[1]
+        if on_resume_subject and on_resume_body:
+            try:
+                subject_text = unicode(on_resume_subject).format(**available_params)
+            except LookupError, e:
+                logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e)
+            except:
+                logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.")
 
-            suffix_split = temp_format_string.split('>')
-            if len(suffix_split) == 2:
-                suffix = suffix_split[1].replace('\\n', '\n')
-                temp_format_string = suffix_split[0]
+            try:
+                body_text = unicode(on_resume_body).format(**available_params)
+            except LookupError, e:
+                logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e)
+            except:
+                logger.error(u"PlexPy Notifier :: Unable to parse custom notification body. Using fallback.")
 
-            if prefix or suffix:
-                real_format_string = '{' + temp_format_string.format(*matches) + '}'
-                _, field_name, format_spec, conversion, _, _ = next(self.parse(real_format_string))
+            return [subject_text, body_text]
+        else:
+            return [subject_text, body_text]
+    elif state == 'buffer':
+        # Default body text
+        body_text = '%s (%s) is buffering %s' % (session['friendly_name'],
+                                                 session['player'],
+                                                 full_title)
 
-            yield literal_text, field_name, format_spec, conversion, prefix, suffix
+        if on_buffer_subject and on_buffer_body:
+            try:
+                subject_text = unicode(on_buffer_subject).format(**available_params)
+            except LookupError, e:
+                logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e)
+            except:
+                logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.")
 
-    def _vformat(self, format_string, args, kwargs, used_args, recursion_depth,
-                 auto_arg_index=0):
-        if recursion_depth < 0:
-            raise ValueError('Max string recursion exceeded')
-        result = []
-        for literal_text, field_name, format_spec, conversion, prefix, suffix in self.parse(format_string):
-            # output the literal text
-            if literal_text:
-                result.append(literal_text)
+            try:
+                body_text = unicode(on_buffer_body).format(**available_params)
+            except LookupError, e:
+                logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e)
+            except:
+                logger.error(u"PlexPy Notifier :: Unable to parse custom notification body. Using fallback.")
 
-            # if there's a field, output it
-            if field_name is not None:
-                # this is some markup, find the object and do
-                #  the formatting
+            return [subject_text, body_text]
+        else:
+            return [subject_text, body_text]
+    elif state == 'watched':
+        # Default body text
+        body_text = '%s (%s) has watched %s' % (session['friendly_name'],
+                                                session['player'],
+                                                full_title)
 
-                # handle arg indexing when empty field_names are given.
-                if field_name == '':
-                    if auto_arg_index is False:
-                        raise ValueError('cannot switch from manual field '
-                                         'specification to automatic field '
-                                         'numbering')
-                    field_name = str(auto_arg_index)
-                    auto_arg_index += 1
-                elif field_name.isdigit():
-                    if auto_arg_index:
-                        raise ValueError('cannot switch from manual field '
-                                         'specification to automatic field '
-                                         'numbering')
-                    # disable auto arg incrementing, if it gets
-                    # used later on, then an exception will be raised
-                    auto_arg_index = False
+        if on_watched_subject and on_watched_body:
+            try:
+                subject_text = unicode(on_watched_subject).format(**available_params)
+            except LookupError, e:
+                logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification subject. Using fallback." % e)
+            except:
+                logger.error(u"PlexPy Notifier :: Unable to parse custom notification subject. Using fallback.")
 
-                if plexpy.CONFIG.NOTIFY_TEXT_EVAL and field_name.startswith('`') and field_name.endswith('`'):
-                    try:
-                        obj = str_eval(field_name, kwargs)
-                        used_args.add(field_name)
-                    except (SyntaxError, NameError, ValueError, TypeError) as e:
-                        logger.error("Tautulli NotificationHandler :: Failed to evaluate notification text %s: %s.",
-                                     field_name, e)
-                        obj = field_name
-                else:
-                    # given the field_name, find the object it references
-                    #  and the argument it came from
-                    obj, arg_used = self.get_field(field_name, args, kwargs)
-                    used_args.add(arg_used)
+            try:
+                body_text = unicode(on_watched_body).format(**available_params)
+            except LookupError, e:
+                logger.error(u"PlexPy Notifier :: Unable to parse field %s in notification body. Using fallback." % e)
+            except:
+                logger.error(u"PlexPy Notifier :: Unable to parse custom notification body. Using fallback.")
 
-                # do any conversion on the resulting object
-                obj = self.convert_field(obj, conversion)
-
-                # expand the format spec, if needed
-                format_spec, auto_arg_index = self._vformat(
-                    format_spec, args, kwargs,
-                    used_args, recursion_depth-1,
-                    auto_arg_index=auto_arg_index)
-
-                # format the object and append to the result
-                formatted_field = self.format_field(obj, format_spec)
-                if formatted_field:
-                    if prefix:
-                        result.append(prefix)
-                    result.append(formatted_field)
-                    if suffix:
-                        result.append(suffix)
-                # result.append(self.format_field(obj, format_spec))
-
-        return ''.join(result), auto_arg_index
+            return [subject_text, body_text]
+        else:
+            return [subject_text, body_text]
+    else:
+        return None
 
 
-class CustomArrow:
-    def __init__(self, arrow_value: arrow.arrow.Arrow, default_format: Optional[str] = None):
-        self.arrow_value = arrow_value
-        self.default_format = default_format
+def strip_tag(data):
+    import re
 
-    def __format__(self, formatstr: str) -> str:
-        if len(formatstr) > 0:
-            return self.arrow_value.format(formatstr)
-
-        if self.default_format is not None:
-            return self.__format__(self.default_format)
-    
-        return str(self.arrow_value)
-
-    def __str__(self) -> str:
-        return self.__format__('')
+    p = re.compile(r'<.*?>')
+    return p.sub('', data)
\ No newline at end of file
diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py
index 21002dd2..6f3e879b 100644
--- a/plexpy/notifiers.py
+++ b/plexpy/notifiers.py
@@ -1,1911 +1,339 @@
-# -*- coding: utf-8 -*-
-
-#  This file is part of Tautulli.
+#  This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
+
+from plexpy import logger, helpers, common, request
+from plexpy.helpers import checked, radio
+
+from xml.dom import minidom
+from httplib import HTTPSConnection
+from urlparse import parse_qsl
+from urllib import urlencode
+from pynma import pynma
 
 import base64
-from collections import defaultdict
-from email.mime.multipart import MIMEMultipart
-from email.mime.text import MIMEText
-import email.utils
-import json
-import os
-import re
-import smtplib
-import subprocess
-import sys
-import threading
-import time
-from urllib.parse import urlencode
-from urllib.parse import urlparse
-
-import bleach
-import paho.mqtt.client
-import paho.mqtt.publish
-import requests
-from requests.auth import HTTPBasicAuth
-
-try:
-    from cryptography.hazmat.primitives import hashes
-    from cryptography.hazmat.primitives.ciphers.aead import AESGCM
-    from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
-    _CRYPTOGRAPHY = True
-except ImportError:
-    _CRYPTOGRAPHY = False
-
-import gntp.notifier
-import facebook
-import twitter
-
+import cherrypy
+import urllib
+import urllib2
 import plexpy
-from plexpy import common
-from plexpy import database
-from plexpy import helpers
-from plexpy import logger
-from plexpy import mobile_app
-from plexpy import pmsconnect
-from plexpy import request
-from plexpy import users
+import os.path
+import subprocess
+import gntp.notifier
+import json
 
+import oauth2 as oauth
+import pythontwitter as twitter
 
-BROWSER_NOTIFIERS = {}
-
-AGENT_IDS = {'growl': 0,
-             'prowl': 1,
-             'xbmc': 2,
-             'plex': 3,
-             'pushbullet': 6,
-             'pushover': 7,
-             'osx': 8,
-             'boxcar': 9,
-             'email': 10,
-             'twitter': 11,
-             'ifttt': 12,
-             'telegram': 13,
-             'slack': 14,
-             'scripts': 15,
-             'facebook': 16,
-             'browser': 17,
-             'join': 18,
-             'discord': 20,
-             'remoteapp': 21,
-             'groupme': 22,
-             'mqtt': 23,
-             'zapier': 24,
-             'webhook': 25,
-             'plexmobileapp': 26,
-             'lunasea': 27,
-             'microsoftteams': 28,
-             'gotify': 29,
-             'ntfy': 30
-             }
-
-DEFAULT_CUSTOM_CONDITIONS = [{'parameter': '', 'operator': '', 'value': [], 'type': None}]
-CUSTOM_CONDITION_TYPE_OPERATORS = {
-    'float': ['is', 'is not', 'is greater than', 'is less than'],
-    'int': ['is', 'is not', 'is greater than', 'is less than'],
-    'str': ['contains', 'does not contain', 'is', 'is not', 'begins with', 'does not begin with', 'ends with', 'does not end with'],
-}
+from email.mime.text import MIMEText
+import smtplib
+import email.utils
 
+AGENT_IDS = {"Growl": 0,
+             "Prowl": 1,
+             "XBMC": 2,
+             "Plex": 3,
+             "NMA": 4,
+             "Pushalot": 5,
+             "Pushbullet": 6,
+             "Pushover": 7,
+             "OSX Notify": 8,
+             "Boxcar2": 9,
+             "Email": 10,
+             "Twitter": 11}
 
 def available_notification_agents():
-    agents = [{'label': 'Tautulli Remote App',
-               'name': 'remoteapp',
-               'id': AGENT_IDS['remoteapp'],
-               'class': TAUTULLIREMOTEAPP,
-               'action_types': ('all',)
+    agents = [{'name': 'Growl',
+               'id': AGENT_IDS['Growl'],
+               'config_prefix': 'growl',
+               'has_config': True,
+               'state': checked(plexpy.CONFIG.GROWL_ENABLED),
+               'on_play': plexpy.CONFIG.GROWL_ON_PLAY,
+               'on_stop': plexpy.CONFIG.GROWL_ON_STOP,
+               'on_pause': plexpy.CONFIG.GROWL_ON_PAUSE,
+               'on_resume': plexpy.CONFIG.GROWL_ON_RESUME,
+               'on_buffer': plexpy.CONFIG.GROWL_ON_BUFFER,
+               'on_watched': plexpy.CONFIG.GROWL_ON_WATCHED
                },
-              {'label': 'Boxcar',
-               'name': 'boxcar',
-               'id': AGENT_IDS['boxcar'],
-               'class': BOXCAR,
-               'action_types': ('all',)
+              {'name': 'Prowl',
+               'id': AGENT_IDS['Prowl'],
+               'config_prefix': 'prowl',
+               'has_config': True,
+               'state': checked(plexpy.CONFIG.PROWL_ENABLED),
+               'on_play': plexpy.CONFIG.PROWL_ON_PLAY,
+               'on_stop': plexpy.CONFIG.PROWL_ON_STOP,
+               'on_pause': plexpy.CONFIG.PROWL_ON_PAUSE,
+               'on_resume': plexpy.CONFIG.PROWL_ON_RESUME,
+               'on_buffer': plexpy.CONFIG.PROWL_ON_BUFFER,
+               'on_watched': plexpy.CONFIG.PROWL_ON_WATCHED
                },
-              {'label': 'Browser',
-               'name': 'browser',
-               'id': AGENT_IDS['browser'],
-               'class': BROWSER,
-               'action_types': ('all',)
+              {'name': 'XBMC',
+               'id': AGENT_IDS['XBMC'],
+               'config_prefix': 'xbmc',
+               'has_config': True,
+               'state': checked(plexpy.CONFIG.XBMC_ENABLED),
+               'on_play': plexpy.CONFIG.XBMC_ON_PLAY,
+               'on_stop': plexpy.CONFIG.XBMC_ON_STOP,
+               'on_pause': plexpy.CONFIG.XBMC_ON_PAUSE,
+               'on_resume': plexpy.CONFIG.XBMC_ON_RESUME,
+               'on_buffer': plexpy.CONFIG.XBMC_ON_BUFFER,
+               'on_watched': plexpy.CONFIG.XBMC_ON_WATCHED
                },
-              {'label': 'Discord',
-               'name': 'discord',
-               'id': AGENT_IDS['discord'],
-               'class': DISCORD,
-               'action_types': ('all',)
+              {'name': 'Plex',
+               'id': AGENT_IDS['Plex'],
+               'config_prefix': 'plex',
+               'has_config': True,
+               'state': checked(plexpy.CONFIG.PLEX_ENABLED),
+               'on_play': plexpy.CONFIG.PLEX_ON_PLAY,
+               'on_stop': plexpy.CONFIG.PLEX_ON_STOP,
+               'on_pause': plexpy.CONFIG.PLEX_ON_PAUSE,
+               'on_resume': plexpy.CONFIG.PLEX_ON_RESUME,
+               'on_buffer': plexpy.CONFIG.PLEX_ON_BUFFER,
+               'on_watched': plexpy.CONFIG.PLEX_ON_WATCHED
                },
-              {'label': 'Email',
-               'name': 'email',
-               'id': AGENT_IDS['email'],
-               'class': EMAIL,
-               'action_types': ('all',)
+              {'name': 'NotifyMyAndroid',
+               'id': AGENT_IDS['NMA'],
+               'config_prefix': 'nma',
+               'has_config': True,
+               'state': checked(plexpy.CONFIG.NMA_ENABLED),
+               'on_play': plexpy.CONFIG.NMA_ON_PLAY,
+               'on_stop': plexpy.CONFIG.NMA_ON_STOP,
+               'on_pause': plexpy.CONFIG.NMA_ON_PAUSE,
+               'on_resume': plexpy.CONFIG.NMA_ON_RESUME,
+               'on_buffer': plexpy.CONFIG.NMA_ON_BUFFER,
+               'on_watched': plexpy.CONFIG.NMA_ON_WATCHED
                },
-              {'label': 'Facebook',
-               'name': 'facebook',
-               'id': AGENT_IDS['facebook'],
-               'class': FACEBOOK,
-               'action_types': ('all',)
+              {'name': 'Pushalot',
+               'id': AGENT_IDS['Pushalot'],
+               'config_prefix': 'pushalot',
+               'has_config': True,
+               'state': checked(plexpy.CONFIG.PUSHALOT_ENABLED),
+               'on_play': plexpy.CONFIG.PUSHALOT_ON_PLAY,
+               'on_stop': plexpy.CONFIG.PUSHALOT_ON_STOP,
+               'on_pause': plexpy.CONFIG.PUSHALOT_ON_PAUSE,
+               'on_resume': plexpy.CONFIG.PUSHALOT_ON_RESUME,
+               'on_buffer': plexpy.CONFIG.PUSHALOT_ON_BUFFER,
+               'on_watched': plexpy.CONFIG.PUSHALOT_ON_WATCHED
                },
-              {'label': 'Gotify',
-               'name': 'gotify',
-               'id': AGENT_IDS['gotify'],
-               'class': GOTIFY,
-               'action_types': ('all',)
+              {'name': 'Pushbullet',
+               'id': AGENT_IDS['Pushbullet'],
+               'config_prefix': 'pushbullet',
+               'has_config': True,
+               'state': checked(plexpy.CONFIG.PUSHBULLET_ENABLED),
+               'on_play': plexpy.CONFIG.PUSHBULLET_ON_PLAY,
+               'on_stop': plexpy.CONFIG.PUSHBULLET_ON_STOP,
+               'on_pause': plexpy.CONFIG.PUSHBULLET_ON_PAUSE,
+               'on_resume': plexpy.CONFIG.PUSHBULLET_ON_RESUME,
+               'on_buffer': plexpy.CONFIG.PUSHBULLET_ON_BUFFER,
+               'on_watched': plexpy.CONFIG.PUSHBULLET_ON_WATCHED
                },
-              {'label': 'GroupMe',
-               'name': 'groupme',
-               'id': AGENT_IDS['groupme'],
-               'class': GROUPME,
-               'action_types': ('all',)
+              {'name': 'Pushover',
+               'id': AGENT_IDS['Pushover'],
+               'config_prefix': 'pushover',
+               'has_config': True,
+               'state': checked(plexpy.CONFIG.PUSHOVER_ENABLED),
+               'on_play': plexpy.CONFIG.PUSHOVER_ON_PLAY,
+               'on_stop': plexpy.CONFIG.PUSHOVER_ON_STOP,
+               'on_pause': plexpy.CONFIG.PUSHOVER_ON_PAUSE,
+               'on_resume': plexpy.CONFIG.PUSHOVER_ON_RESUME,
+               'on_buffer': plexpy.CONFIG.PUSHOVER_ON_BUFFER,
+               'on_watched': plexpy.CONFIG.PUSHOVER_ON_WATCHED
                },
-              {'label': 'Growl',
-               'name': 'growl',
-               'id': AGENT_IDS['growl'],
-               'class': GROWL,
-               'action_types': ('all',)
+              {'name': 'Boxcar2',
+               'id': AGENT_IDS['Boxcar2'],
+               'config_prefix': 'boxcar',
+               'has_config': True,
+               'state': checked(plexpy.CONFIG.BOXCAR_ENABLED),
+               'on_play': plexpy.CONFIG.BOXCAR_ON_PLAY,
+               'on_stop': plexpy.CONFIG.BOXCAR_ON_STOP,
+               'on_pause': plexpy.CONFIG.BOXCAR_ON_PAUSE,
+               'on_resume': plexpy.CONFIG.BOXCAR_ON_RESUME,
+               'on_buffer': plexpy.CONFIG.BOXCAR_ON_BUFFER,
+               'on_watched': plexpy.CONFIG.BOXCAR_ON_WATCHED
                },
-              {'label': 'IFTTT',
-               'name': 'ifttt',
-               'id': AGENT_IDS['ifttt'],
-               'class': IFTTT,
-               'action_types': ('all',)
+              {'name': 'E-mail',
+               'id': AGENT_IDS['Email'],
+               'config_prefix': 'email',
+               'has_config': True,
+               'state': checked(plexpy.CONFIG.EMAIL_ENABLED),
+               'on_play': plexpy.CONFIG.EMAIL_ON_PLAY,
+               'on_stop': plexpy.CONFIG.EMAIL_ON_STOP,
+               'on_pause': plexpy.CONFIG.EMAIL_ON_PAUSE,
+               'on_resume': plexpy.CONFIG.EMAIL_ON_RESUME,
+               'on_buffer': plexpy.CONFIG.EMAIL_ON_BUFFER,
+               'on_watched': plexpy.CONFIG.EMAIL_ON_WATCHED
                },
-              {'label': 'Join',
-               'name': 'join',
-               'id': AGENT_IDS['join'],
-               'class': JOIN,
-               'action_types': ('all',)
-               },
-              {'label': 'Kodi',
-               'name': 'xbmc',
-               'id': AGENT_IDS['xbmc'],
-               'class': XBMC,
-               'action_types': ('all',)
-               },
-              {'label': 'LunaSea',
-               'name': 'lunasea',
-               'id': AGENT_IDS['lunasea'],
-               'class': LUNASEA,
-               'action_types': ('all',)
-               },
-              {'label': 'Microsoft Teams',
-               'name': 'microsoftteams',
-               'id': AGENT_IDS['microsoftteams'],
-               'class': MICROSOFTTEAMS,
-               'action_types': ('all',)
-               },
-              {'label': 'MQTT',
-               'name': 'mqtt',
-               'id': AGENT_IDS['mqtt'],
-               'class': MQTT,
-               'action_types': ('all',)
-               },
-              {'label': 'ntfy',
-               'name': 'ntfy',
-               'id': AGENT_IDS['ntfy'],
-               'class': NTFY,
-               'action_types': ('all',)
-               },
-              {'label': 'Plex Home Theater',
-               'name': 'plex',
-               'id': AGENT_IDS['plex'],
-               'class': PLEX,
-               'action_types': ('all',)
-               },
-              {'label': 'Plex Android / iOS App',
-               'name': 'plexmobileapp',
-               'id': AGENT_IDS['plexmobileapp'],
-               'class': PLEXMOBILEAPP,
-               'action_types': ('on_play', 'on_created', 'on_newdevice')
-               },
-              {'label': 'Prowl',
-               'name': 'prowl',
-               'id': AGENT_IDS['prowl'],
-               'class': PROWL,
-               'action_types': ('all',)
-               },
-              {'label': 'Pushbullet',
-               'name': 'pushbullet',
-               'id': AGENT_IDS['pushbullet'],
-               'class': PUSHBULLET,
-               'action_types': ('all',)
-               },
-              {'label': 'Pushover',
-               'name': 'pushover',
-               'id': AGENT_IDS['pushover'],
-               'class': PUSHOVER,
-               'action_types': ('all',)
-               },
-              {'label': 'Script',
-               'name': 'scripts',
-               'id': AGENT_IDS['scripts'],
-               'class': SCRIPTS,
-               'action_types': ('all',)
-               },
-              {'label': 'Slack',
-               'name': 'slack',
-               'id': AGENT_IDS['slack'],
-               'class': SLACK,
-               'action_types': ('all',)
-               },
-              {'label': 'Telegram',
-               'name': 'telegram',
-               'id': AGENT_IDS['telegram'],
-               'class': TELEGRAM,
-               'action_types': ('all',)
-               },
-              {'label': 'Twitter',
-               'name': 'twitter',
-               'id': AGENT_IDS['twitter'],
-               'class': TWITTER,
-               'action_types': ('all',)
-               },
-              {'label': 'Webhook',
-               'name': 'webhook',
-               'id': AGENT_IDS['webhook'],
-               'class': WEBHOOK,
-               'action_types': ('all',)
-               },
-              {'label': 'Zapier',
-               'name': 'zapier',
-               'id': AGENT_IDS['zapier'],
-               'class': ZAPIER,
-               'action_types': ('all',)
+              {'name': 'Twitter',
+               'id': AGENT_IDS['Twitter'],
+               'config_prefix': 'twitter',
+               'has_config': True,
+               'state': checked(plexpy.CONFIG.TWITTER_ENABLED),
+               'on_play': plexpy.CONFIG.TWITTER_ON_PLAY,
+               'on_stop': plexpy.CONFIG.TWITTER_ON_STOP,
+               'on_pause': plexpy.CONFIG.TWITTER_ON_PAUSE,
+               'on_resume': plexpy.CONFIG.TWITTER_ON_RESUME,
+               'on_buffer': plexpy.CONFIG.TWITTER_ON_BUFFER,
+               'on_watched': plexpy.CONFIG.TWITTER_ON_WATCHED
                }
               ]
 
     # OSX Notifications should only be visible if it can be used
-    if OSX().validate():
-        agents.append({'label': 'macOS Notification Center',
-                       'name': 'osx',
-                       'id': AGENT_IDS['osx'],
-                       'class': OSX,
-                       'action_types': ('all',)
+    osx_notify = OSX_NOTIFY()
+    if osx_notify.validate():
+        agents.append({'name': 'OSX Notify',
+                       'id': AGENT_IDS['OSX Notify'],
+                       'config_prefix': 'osx_notify',
+                       'has_config': True,
+                       'state': checked(plexpy.CONFIG.OSX_NOTIFY_ENABLED),
+                       'on_play': plexpy.CONFIG.OSX_NOTIFY_ON_PLAY,
+                       'on_stop': plexpy.CONFIG.OSX_NOTIFY_ON_STOP,
+                       'on_pause': plexpy.CONFIG.OSX_NOTIFY_ON_PAUSE,
+                       'on_resume': plexpy.CONFIG.OSX_NOTIFY_ON_RESUME,
+                       'on_buffer': plexpy.CONFIG.OSX_NOTIFY_ON_BUFFER,
+                       'on_watched': plexpy.CONFIG.OSX_NOTIFY_ON_WATCHED
                        })
 
     return agents
 
+def get_notification_agent_config(config_id):
+    if config_id:
+        config_id = int(config_id)
 
-def available_notification_actions(agent_id=None):
-    actions = [{'label': 'Playback Start',
-                'name': 'on_play',
-                'description': 'Trigger a notification when a stream is started.',
-                'subject': 'Tautulli ({server_name})',
-                'body': '{user} ({player}) started playing {title}.',
-                'icon': 'fa-play',
-                'media_types': ('movie', 'episode', 'track')
-                },
-               {'label': 'Playback Stop',
-                'name': 'on_stop',
-                'description': 'Trigger a notification when a stream is stopped.',
-                'subject': 'Tautulli ({server_name})',
-                'body': '{user} ({player}) has stopped {title}.',
-                'icon': 'fa-stop',
-                'media_types': ('movie', 'episode', 'track')
-                },
-               {'label': 'Playback Pause',
-                'name': 'on_pause',
-                'description': 'Trigger a notification when a stream is paused.',
-                'subject': 'Tautulli ({server_name})',
-                'body': '{user} ({player}) has paused {title}.',
-                'icon': 'fa-pause',
-                'media_types': ('movie', 'episode', 'track')
-                },
-               {'label': 'Playback Resume',
-                'name': 'on_resume',
-                'description': 'Trigger a notification when a stream is resumed.',
-                'subject': 'Tautulli ({server_name})',
-                'body': '{user} ({player}) has resumed {title}.',
-                'icon': 'fa-play',
-                'media_types': ('movie', 'episode', 'track')
-                },
-               {'label': 'Playback Error',
-                'name': 'on_error',
-                'description': 'Trigger a notification when a stream encounters an error.',
-                'subject': 'Tautulli ({server_name})',
-                'body': '{user} ({player}) encountered an error trying to play {title}.',
-                'icon': 'fa-exclamation-triangle',
-                'media_types': ('movie', 'episode', 'track')
-                },
-               {'label': 'Transcode Decision Change',
-                'name': 'on_change',
-                'description': 'Trigger a notification when a stream changes transcode decision.',
-                'subject': 'Tautulli ({server_name})',
-                'body': '{user} ({player}) has changed transcode decision for {title}.',
-                'icon': 'fa-exchange-alt',
-                'media_types': ('movie', 'episode', 'track')
-                },
-               {'label': 'Intro Marker',
-                'name': 'on_intro',
-                'description': 'Trigger a notification when a video stream reaches any intro marker.',
-                'subject': 'Tautulli ({server_name})',
-                'body': '{user} ({player}) has reached an intro marker for {title}.',
-                'icon': 'fa-bookmark',
-                'media_types': ('episode',)
-                },
-               {'label': 'Commercial Marker',
-                'name': 'on_commercial',
-                'description': 'Trigger a notification when a video stream reaches any commercial marker.',
-                'subject': 'Tautulli ({server_name})',
-                'body': '{user} ({player}) has reached a commercial marker for {title}.',
-                'icon': 'fa-bookmark',
-                'media_types': ('movie', 'episode')
-                },
-               {'label': 'Credits Marker',
-                'name': 'on_credits',
-                'description': 'Trigger a notification when a video stream reaches any credits marker.',
-                'subject': 'Tautulli ({server_name})',
-                'body': '{user} ({player}) has reached a credits marker for {title}.',
-                'icon': 'fa-bookmark',
-                'media_types': ('movie', 'episode')
-                },
-               {'label': 'Watched',
-                'name': 'on_watched',
-                'description': 'Trigger a notification when a stream reaches the specified watched or listened threshold.',
-                'subject': 'Tautulli ({server_name})',
-                'body': '{user} ({player}) has watched {title}.',
-                'icon': 'fa-eye',
-                'media_types': ('movie', 'episode', 'track')
-                },
-               {'label': 'Buffer Warning',
-                'name': 'on_buffer',
-                'description': 'Trigger a notification when a stream exceeds the specified buffer threshold.',
-                'subject': 'Tautulli ({server_name})',
-                'body': '{user} ({player}) is buffering {title}.',
-                'icon': 'fa-spinner',
-                'media_types': ('movie', 'episode', 'track')
-                },
-               {'label': 'User Concurrent Streams',
-                'name': 'on_concurrent',
-                'description': 'Trigger a notification when a user exceeds the concurrent stream threshold.',
-                'subject': 'Tautulli ({server_name})',
-                'body': '{user} has {user_streams} concurrent streams.',
-                'icon': 'fa-arrow-circle-o-right',
-                'media_types': ('movie', 'episode', 'track')
-                },
-               {'label': 'User New Device',
-                'name': 'on_newdevice',
-                'description': 'Trigger a notification when a user streams from a new device.',
-                'subject': 'Tautulli ({server_name})',
-                'body': '{user} is streaming from a new device: {player}.',
-                'icon': 'fa-desktop',
-                'media_types': ('movie', 'episode', 'track')
-                },
-               {'label': 'Recently Added',
-                'name': 'on_created',
-                'description': 'Trigger a notification when a media item is added to the Plex Media Server.',
-                'subject': 'Tautulli ({server_name})',
-                'body': '{title} was recently added to Plex.',
-                'icon': 'fa-download',
-                'media_types': ('movie', 'show', 'season', 'episode', 'artist', 'album', 'track')
-                },
-               {'label': 'Plex Server Down',
-                'name': 'on_intdown',
-                'description': 'Trigger a notification when the Plex Media Server cannot be reached internally.',
-                'subject': 'Tautulli ({server_name})',
-                'body': 'The Plex Media Server is down.',
-                'icon': 'fa-server',
-                'media_types': ('server',)
-                },
-               {'label': 'Plex Server Back Up',
-                'name': 'on_intup',
-                'description': 'Trigger a notification when the Plex Media Server can be reached internally after being down.',
-                'subject': 'Tautulli ({server_name})',
-                'body': 'The Plex Media Server is back up.',
-                'icon': 'fa-server',
-                'media_types': ('server',)
-                },
-               {'label': 'Plex Remote Access Down',
-                'name': 'on_extdown',
-                'description': 'Trigger a notification when the Plex Media Server cannot be reached externally.',
-                'subject': 'Tautulli ({server_name})',
-                'body': 'The Plex Media Server remote access is down. ({remote_access_reason})',
-                'icon': 'fa-server',
-                'media_types': ('server',)
-                },
-               {'label': 'Plex Remote Access Back Up',
-                'name': 'on_extup',
-                'description': 'Trigger a notification when the Plex Media Server can be reached externally after being down.',
-                'subject': 'Tautulli ({server_name})',
-                'body': 'The Plex Media Server remote access is back up.',
-                'icon': 'fa-server',
-                'media_types': ('server',)
-                },
-               {'label': 'Plex Update Available',
-                'name': 'on_pmsupdate',
-                'description': 'Trigger a notification when an update for the Plex Media Server is available.',
-                'subject': 'Tautulli ({server_name})',
-                'body': 'An update is available for the Plex Media Server (version {update_version}).',
-                'icon': 'fa-refresh',
-                'media_types': ('server',)
-                },
-               {'label': 'Tautulli Update Available',
-                'name': 'on_plexpyupdate',
-                'description': 'Trigger a notification when an update for the Tautulli is available.',
-                'subject': 'Tautulli ({server_name})',
-                'body': 'An update is available for Tautulli (version {tautulli_update_version}).',
-                'icon': 'fa-refresh',
-                'media_types': ('server',)
-                },
-               {'label': 'Tautulli Database Corruption',
-                'name': 'on_plexpydbcorrupt',
-                'description': 'Trigger a notification if Tautulli database corruption is detected when backing up the database.',
-                'subject': 'Tautulli ({server_name})',
-                'body': 'Tautulli database corruption detected. Automatic cleanup of database backups is suspended.',
-                'icon': 'fa-database',
-                'media_types': ('server',)
-                }
-               ]
-
-    if str(agent_id).isdigit():
-        action_types = get_notify_agents(return_dict=True).get(int(agent_id), {}).get('action_types', [])
-        if 'all' not in action_types:
-            actions = [a for a in actions if a['name'] in action_types]
-
-    return actions
-
-
-def get_agent_class(agent_id=None, config=None):
-    if str(agent_id).isdigit():
-        agent = get_notify_agents(return_dict=True).get(int(agent_id), {}).get('class', Notifier)
-        return agent(config=config)
+        if config_id == 0:
+            growl = GROWL()
+            return growl.return_config_options()
+        elif config_id == 1:
+            prowl = PROWL()
+            return prowl.return_config_options()
+        elif config_id == 2:
+            xbmc = XBMC()
+            return xbmc.return_config_options()
+        elif config_id == 3:
+            plex = Plex()
+            return plex.return_config_options()
+        elif config_id == 4:
+            nma = NMA()
+            return nma.return_config_options()
+        elif config_id == 5:
+            pushalot = PUSHALOT()
+            return pushalot.return_config_options()
+        elif config_id == 6:
+            pushbullet = PUSHBULLET()
+            return pushbullet.return_config_options()
+        elif config_id == 7:
+            pushover = PUSHOVER()
+            return pushover.return_config_options()
+        elif config_id == 8:
+            osx_notify = OSX_NOTIFY()
+            return osx_notify.return_config_options()
+        elif config_id == 9:
+            boxcar = BOXCAR()
+            return boxcar.return_config_options()
+        elif config_id == 10:
+            email = Email()
+            return email.return_config_options()
+        elif config_id == 11:
+            tweet = TwitterNotifier()
+            return tweet.return_config_options()
+        else:
+            return []
     else:
-        return None
+        return []
 
+def send_notification(config_id, subject, body):
+    if config_id:
+        config_id = int(config_id)
 
-def get_notify_agents(return_dict=False):
-    if return_dict:
-        return {a['id']: a for a in available_notification_agents()}
-    return tuple(a['name'] for a in sorted(available_notification_agents(), key=lambda k: k['label']))
-
-
-def get_notify_actions(return_dict=False):
-    if return_dict:
-        return {a['name']: a for a in available_notification_actions()}
-    return tuple(a['name'] for a in available_notification_actions())
-
-
-def get_notifiers(notifier_id=None, notify_action=None):
-    notify_actions = get_notify_actions()
-
-    where = where_id = where_action = ''
-    args = []
-
-    if notifier_id or notify_action:
-        where = 'WHERE '
-        if notifier_id:
-            where_id += 'notifiers.id = ?'
-            args.append(notifier_id)
-        if notify_action and notify_action in notify_actions:
-            where_action = '%s = ?' % notify_action
-            args.append(1)
-        where += ' AND '.join([w for w in [where_id, where_action] if w])
-
-    db = database.MonitorDatabase()
-    result = db.select(
-        (
-            "SELECT notifiers.id, notifiers.agent_id, notifiers.agent_name, notifiers.agent_label, notifiers.friendly_name, %s, "
-            "MAX(notify_log.timestamp) AS last_triggered, notify_log.success AS last_success "
-            "FROM notifiers "
-            "LEFT OUTER JOIN notify_log ON notifiers.id = notify_log.notifier_id "
-            "%s "
-            "GROUP BY notifiers.id"
-        ) % (', '.join(notify_actions), where), args=args
-    )
-
-    for item in result:
-        item['active'] = int(any([item.pop(k) for k in list(item.keys()) if k in notify_actions]))
-
-    return result
-
-
-def delete_notifier(notifier_id=None):
-    db = database.MonitorDatabase()
-
-    if str(notifier_id).isdigit():
-        logger.debug("Tautulli Notifiers :: Deleting notifier_id %s from the database."
-                     % notifier_id)
-        result = db.action("DELETE FROM notifiers WHERE id = ?", args=[notifier_id])
-        return True
+        if config_id == 0:
+            growl = GROWL()
+            growl.notify(message=body, event=subject)
+        elif config_id == 1:
+            prowl = PROWL()
+            prowl.notify(message=body, event=subject)
+        elif config_id == 2:
+            xbmc = XBMC()
+            xbmc.notify(subject=subject, message=body)
+        elif config_id == 3:
+            plex = Plex()
+            plex.notify(subject=subject, message=body)
+        elif config_id == 4:
+            nma = NMA()
+            nma.notify(subject=subject, message=body)
+        elif config_id == 5:
+            pushalot = PUSHALOT()
+            pushalot.notify(message=body, event=subject)
+        elif config_id == 6:
+            pushbullet = PUSHBULLET()
+            pushbullet.notify(message=body, subject=subject)
+        elif config_id == 7:
+            pushover = PUSHOVER()
+            pushover.notify(message=body, event=subject)
+        elif config_id == 8:
+            osx_notify = OSX_NOTIFY()
+            osx_notify.notify(title=subject, text=body)
+        elif config_id == 9:
+            boxcar = BOXCAR()
+            boxcar.notify(title=subject, message=body)
+        elif config_id == 10:
+            email = Email()
+            email.notify(subject=subject, message=body)
+        elif config_id == 11:
+            tweet = TwitterNotifier()
+            tweet.notify(subject=subject, message=body)
+        else:
+            logger.debug(u"PlexPy Notifier :: Unknown agent id received.")
     else:
-        return False
+        logger.debug(u"PlexPy Notifier :: Notification requested but no agent id received.")
 
 
-def get_notifier_config(notifier_id=None, mask_passwords=False):
-    if str(notifier_id).isdigit():
-        notifier_id = int(notifier_id)
-    else:
-        logger.error("Tautulli Notifiers :: Unable to retrieve notifier config: invalid notifier_id %s."
-                     % notifier_id)
-        return None
-
-    db = database.MonitorDatabase()
-    result = db.select_single("SELECT * FROM notifiers WHERE id = ?", args=[notifier_id])
-
-    if not result:
-        return None
-
-    try:
-        config = json.loads(result.pop('notifier_config', '{}'))
-        notifier_agent = get_agent_class(agent_id=result['agent_id'], config=config)
-    except Exception as e:
-        logger.error("Tautulli Notifiers :: Failed to get notifier config options: %s." % e)
-        return
-
-    if mask_passwords:
-        notifier_agent.config = helpers.mask_config_passwords(notifier_agent.config)
-
-    notify_actions = get_notify_actions(return_dict=True)
-
-    notifier_actions = {}
-    notifier_text = {}
-    for k in list(result.keys()):
-        if k in notify_actions:
-            subject = result.pop(k + '_subject')
-            body = result.pop(k + '_body')
-
-            if subject is None:
-                subject = "" if result['agent_name'] in ('scripts', 'webhook') else notify_actions[k]['subject']
-            if body is None:
-                body = "" if result['agent_name'] in ('scripts', 'webhook') else notify_actions[k]['body']
-
-            notifier_actions[k] = helpers.cast_to_int(result.pop(k))
-            notifier_text[k] = {'subject': subject,
-                                'body': body}
-
-    try:
-        result['custom_conditions'] = json.loads(result['custom_conditions'])
-    except (ValueError, TypeError):
-        result['custom_conditions'] = DEFAULT_CUSTOM_CONDITIONS
-
-    if not result['custom_conditions_logic']:
-        result['custom_conditions_logic'] = ''
-
-    result['config'] = notifier_agent.config
-    result['config_options'] = notifier_agent.return_config_options(mask_passwords=mask_passwords)
-    result['actions'] = notifier_actions
-    result['notify_text'] = notifier_text
-
-    return result
-
-
-def add_notifier_config(agent_id=None, **kwargs):
-    if str(agent_id).isdigit():
-        agent_id = int(agent_id)
-    else:
-        logger.error("Tautulli Notifiers :: Unable to add new notifier: invalid agent_id %s."
-                     % agent_id)
-        return False
-
-    agent = get_notify_agents(return_dict=True).get(agent_id, None)
-
-    if not agent:
-        logger.error("Tautulli Notifiers :: Unable to retrieve new notification agent: invalid agent_id %s."
-                     % agent_id)
-        return False
-
-    agent_class = get_agent_class(agent_id=agent['id'])
-
-    keys = {'id': None}
-    values = {'agent_id': agent['id'],
-              'agent_name': agent['name'],
-              'agent_label': agent['label'],
-              'friendly_name': '',
-              'notifier_config': json.dumps(agent_class.config),
-              'custom_conditions': json.dumps(DEFAULT_CUSTOM_CONDITIONS),
-              'custom_conditions_logic': ''
-              }
-
-    if agent['name'] in ('scripts', 'webhook'):
-        for a in available_notification_actions():
-            values[a['name'] + '_subject'] = ''
-            values[a['name'] + '_body'] = ''
-    else:
-        for a in available_notification_actions():
-            values[a['name'] + '_subject'] = a['subject']
-            values[a['name'] + '_body'] = a['body']
-
-    db = database.MonitorDatabase()
-    try:
-        db.upsert(table_name='notifiers', key_dict=keys, value_dict=values)
-        notifier_id = db.last_insert_id()
-        logger.info("Tautulli Notifiers :: Added new notification agent: %s (notifier_id %s)."
-                    % (agent['label'], notifier_id))
-        blacklist_logger()
-        return notifier_id
-    except Exception as e:
-        logger.warn("Tautulli Notifiers :: Unable to add notification agent: %s." % e)
-        return False
-
-
-def set_notifier_config(notifier_id=None, agent_id=None, **kwargs):
-    if str(agent_id).isdigit():
-        agent_id = int(agent_id)
-    else:
-        logger.error("Tautulli Notifiers :: Unable to set existing notifier: invalid agent_id %s."
-                     % agent_id)
-        return False
-
-    agent = get_notify_agents(return_dict=True).get(agent_id, None)
-
-    if not agent:
-        logger.error("Tautulli Notifiers :: Unable to retrieve existing notification agent: invalid agent_id %s."
-                     % agent_id)
-        return False
-
-    notify_actions = get_notify_actions()
-    config_prefix = agent['name'] + '_'
-
-    actions = {k: helpers.cast_to_int(kwargs.pop(k))
-               for k in list(kwargs.keys()) if k in notify_actions}
-    subject_text = {k: kwargs.pop(k)
-                    for k in list(kwargs.keys()) if k.startswith(notify_actions) and k.endswith('_subject')}
-    body_text = {k: kwargs.pop(k)
-                 for k in list(kwargs.keys()) if k.startswith(notify_actions) and k.endswith('_body')}
-    notifier_config = {k[len(config_prefix):]: kwargs.pop(k)
-                       for k in list(kwargs.keys()) if k.startswith(config_prefix)}
-
-    for cfg, val in notifier_config.items():
-        # Check for a password config keys and a blank password from the HTML form
-        if 'password' in cfg and val == '    ':
-            # Get the previous password so we don't overwrite it with a blank value
-            old_notifier_config = get_notifier_config(notifier_id=notifier_id)
-            notifier_config[cfg] = old_notifier_config['config'][cfg]
-
-    agent_class = get_agent_class(agent_id=agent['id'], config=notifier_config)
-
-    custom_conditions = validate_conditions(kwargs.get('custom_conditions'))
-    if custom_conditions is False:
-        logger.error("Tautulli Notifiers :: Unable to update notification agent: Invalid custom conditions.")
-        return False
-
-    keys = {'id': notifier_id}
-    values = {'agent_id': agent['id'],
-              'agent_name': agent['name'],
-              'agent_label': agent['label'],
-              'friendly_name': kwargs.get('friendly_name', ''),
-              'notifier_config': json.dumps(agent_class.config),
-              'custom_conditions': json.dumps(custom_conditions or DEFAULT_CUSTOM_CONDITIONS),
-              'custom_conditions_logic': kwargs.get('custom_conditions_logic', ''),
-              }
-    values.update(actions)
-    values.update(subject_text)
-    values.update(body_text)
-
-    db = database.MonitorDatabase()
-    try:
-        db.upsert(table_name='notifiers', key_dict=keys, value_dict=values)
-        logger.info("Tautulli Notifiers :: Updated notification agent: %s (notifier_id %s)."
-                    % (agent['label'], notifier_id))
-        blacklist_logger()
-
-        if agent['name'] == 'browser':
-            check_browser_enabled()
-
-        return True
-    except Exception as e:
-        logger.warn("Tautulli Notifiers :: Unable to update notification agent: %s." % e)
-        return False
-
-
-def send_notification(notifier_id=None, subject='', body='', notify_action='', notification_id=None, **kwargs):
-    notifier_config = get_notifier_config(notifier_id=notifier_id)
-    if notifier_config:
-        agent = get_agent_class(agent_id=notifier_config['agent_id'],
-                                config=notifier_config['config'])
-        return agent.notify(subject=subject,
-                            body=body,
-                            action=notify_action.split('on_')[-1],
-                            notification_id=notification_id,
-                            **kwargs)
-    else:
-        logger.debug("Tautulli Notifiers :: Notification requested but no notifier_id received.")
-
-
-def validate_conditions(custom_conditions):
-    if custom_conditions is None:
-        return DEFAULT_CUSTOM_CONDITIONS
-
-    try:
-        conditions = json.loads(custom_conditions)
-    except ValueError:
-        logger.error("Tautulli Notifiers :: Unable to parse custom conditions json: %s" % custom_conditions)
-        return False
-
-    if not isinstance(conditions, list):
-        logger.error("Tautulli Notifiers :: Invalid custom conditions: %s. Conditions must be a list." % conditions)
-        return False
-
-    validated_conditions = []
-
-    for condition in conditions:
-        validated_condition = DEFAULT_CUSTOM_CONDITIONS[0].copy()
-
-        if not isinstance(condition, dict):
-            logger.error("Tautulli Notifiers :: Invalid custom condition: %s. Condition must be a dict." % condition)
-            return False
-
-        parameter = str(condition.get('parameter', '')).lower()
-        operator = str(condition.get('operator', '')).lower()
-        values = condition.get('value', [])
-
-        if parameter:
-            parameter_type = common.NOTIFICATION_PARAMETERS_TYPES.get(parameter)
-        
-            if not parameter_type:
-                logger.error("Tautulli Notifiers :: Invalid parameter '%s' in custom condition: %s" % (parameter, condition))
-                return False
-
-            validated_condition['parameter'] = parameter.lower()
-            validated_condition['type'] = parameter_type
-
-            if operator:
-                if operator not in CUSTOM_CONDITION_TYPE_OPERATORS.get(parameter_type, []):
-                    logger.error("Tautulli Notifiers :: Invalid operator '%s' for parameter '%s' in custom condition: %s" % (operator, parameter, condition))
-                    return False
-
-                validated_condition['operator'] = operator
-
-        if values:
-            if not isinstance(values, list):
-                values = [values]
-
-            for value in values:
-                if not isinstance(value, (str, int, float)):
-                    logger.error("Tautulli Notifiers :: Invalid value '%s' for parameter '%s' in custom condition: %s" % (value, parameter, condition))
-                    return False
-            
-            validated_condition['value'] = values
-
-        validated_conditions.append(validated_condition)
-
-    return validated_conditions
-
-
-def blacklist_logger():
-    db = database.MonitorDatabase()
-    notifiers = db.select('SELECT notifier_config FROM notifiers')
-
-    for n in notifiers:
-        config = json.loads(n['notifier_config'] or '{}')
-        logger.blacklist_config(config)
-
-
-class PrettyMetadata(object):
-    def __init__(self, parameters=None):
-        self.parameters = parameters or {}
-        self.media_type = self.parameters.get('media_type')
-
-    @staticmethod
-    def get_movie_providers():
-        return {'': '',
-                'plexweb': 'Plex Web',
-                'imdb': 'IMDB',
-                'themoviedb': 'The Movie Database',
-                'thetvdb': 'TheTVDB',
-                'trakt': 'Trakt.tv'
-                }
-
-    @staticmethod
-    def get_tv_providers():
-        return {'': '',
-                'plexweb': 'Plex Web',
-                'imdb': 'IMDB',
-                'themoviedb': 'The Movie Database',
-                'thetvdb': 'TheTVDB',
-                'tvmaze': 'TVmaze',
-                'trakt': 'Trakt.tv'
-                }
-
-    @staticmethod
-    def get_music_providers():
-        return {'': '',
-                'plexweb': 'Plex Web',
-                'lastfm': 'Last.fm',
-                'musicbrainz': 'MusicBrainz'
-                }
-
-    def get_poster_url(self):
-        poster_url = self.parameters.get('poster_url')
-        if not poster_url:
-            if self.media_type in ('artist', 'album', 'track'):
-                poster_url = common.ONLINE_COVER_THUMB
-            else:
-                poster_url = common.ONLINE_POSTER_THUMB
-        return poster_url
-
-    def get_provider_name(self, provider):
-        provider_name = ''
-        if provider == 'plexweb':
-            provider_name = 'Plex Web'
-        elif provider == 'imdb':
-            provider_name = 'IMDb'
-        elif provider == 'thetvdb':
-            provider_name = 'TheTVDB'
-        elif provider == 'themoviedb':
-            provider_name = 'The Movie Database'
-        elif provider == 'tvmaze':
-            provider_name = 'TVmaze'
-        elif provider == 'trakt':
-            provider_name = 'Trakt.tv'
-        elif provider == 'lastfm':
-            provider_name = 'Last.fm'
-        elif provider == 'musicbrainz':
-            provider_name = 'MusicBrainz'
-        # else:
-        #     if self.media_type == 'movie':
-        #         provider_name = 'IMDb'
-        #     elif self.media_type in ('show', 'season', 'episode'):
-        #         provider_name = 'TheTVDB'
-        #     elif self.media_type in ('artist', 'album', 'track'):
-        #         provider_name = 'Last.fm'
-        return provider_name
-
-    def get_provider_link(self, provider=None):
-        provider_link = ''
-        if provider == 'plexweb':
-            provider_link = self.get_plex_url()
-        elif provider:
-            provider_link = self.parameters.get(provider + '_url', '')
-        # else:
-        #     if self.media_type == 'movie':
-        #         provider_link = self.parameters.get('imdb_url', '')
-        #     elif self.media_type in ('show', 'season', 'episode'):
-        #         provider_link = self.parameters.get('thetvdb_url', '')
-        #     elif self.media_type in ('artist', 'album', 'track'):
-        #         provider_link = self.parameters.get('lastfm_url', '')
-        return provider_link
-
-    def get_caption(self, provider):
-        provider_name = self.get_provider_name(provider)
-        return 'View on ' + provider_name
-
-    def get_title(self, divider='-'):
-        title = ''
-        if self.media_type == 'movie':
-            title = '%s (%s)' % (self.parameters['title'], self.parameters['year'])
-        elif self.media_type == 'show':
-            title = '%s (%s)' % (self.parameters['show_name'], self.parameters['year'])
-        elif self.media_type == 'season':
-            title = '%s - %s' % (self.parameters['show_name'], self.parameters['season_name'])
-        elif self.media_type == 'episode':
-            season = helpers.short_season(self.parameters['season_name'])
-            title = '%s - %s (%s %s E%s)' % (self.parameters['show_name'],
-                                             self.parameters['episode_name'],
-                                             season,
-                                             divider,
-                                             self.parameters['episode_num'])
-        elif self.media_type == 'artist':
-            title = self.parameters['artist_name']
-        elif self.media_type == 'album':
-            title = '%s - %s' % (self.parameters['artist_name'], self.parameters['album_name'])
-        elif self.media_type == 'track':
-            title = '%s - %s' % (self.parameters['track_name'], self.parameters['track_artist'])
-        return title
-
-    def get_description(self):
-        if self.media_type == 'track':
-            description = self.parameters['album_name']
-        else:
-            description = self.parameters['summary']
-        return description
-
-    def get_plex_url(self):
-        return self.parameters['plex_url']
-
-    @staticmethod
-    def get_parameters():
-        parameters = {param['value']: param['name']
-                for category in common.NOTIFICATION_PARAMETERS for param in category['parameters']}
-        parameters[''] = ''
-        return parameters
-
-    def get_image(self):
-        result = pmsconnect.PmsConnect().get_image(img=self.parameters.get('poster_thumb', ''))
-        if result and result[0]:
-            poster_content = result[0]
-            poster_filename = 'poster_{}.png'.format(self.parameters['rating_key'])
-            return (poster_filename, poster_content, 'image/png')
-        
-        logger.error("Tautulli Notifiers :: Unable to retrieve image for notification.")
-
-
-class Notifier(object):
-    NAME = ''
-    _DEFAULT_CONFIG = {}
-
-    def __init__(self, config=None):
-        self.config = self.set_config(config=config, default=self._DEFAULT_CONFIG)
-
-    def set_config(self, config=None, default=None):
-        return self._validate_config(config=config, default=default)
-
-    def _validate_config(self, config=None, default=None):
-        if config is None:
-            return default
-
-        new_config = {}
-        for k, v in default.items():
-            if isinstance(v, int):
-                new_config[k] = helpers.cast_to_int(config.get(k, v))
-            elif isinstance(v, list):
-                c = config.get(k, v)
-                if not isinstance(c, list):
-                    new_config[k] = [c]
-                else:
-                    new_config[k] = c
-            else:
-                new_config[k] = config.get(k, v)
-
-        return new_config
-
-    def return_default_config(self):
-        return self._DEFAULT_CONFIG.copy()
-
-    def notify(self, subject='', body='', action='', **kwargs):
-        if self.NAME not in ('Script', 'Webhook'):
-            if not subject and self.config.get('incl_subject', True):
-                logger.error("Tautulli Notifiers :: %s notification subject cannot be blank." % self.NAME)
-                return
-            elif not body:
-                logger.error("Tautulli Notifiers :: %s notification body cannot be blank." % self.NAME)
-                return
-
-        return self.agent_notify(subject=subject, body=body, action=action, **kwargs)
-
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        pass
-
-    def make_request(self, url, method='POST', **kwargs):
-        logger.info("Tautulli Notifiers :: Sending {name} notification...".format(name=self.NAME))
-        response, err_msg, req_msg = request.request_response2(url, method, **kwargs)
-
-        if response and not err_msg:
-            logger.info("Tautulli Notifiers :: {name} notification sent.".format(name=self.NAME))
-            return True
-
-        else:
-            verify_msg = ""
-            if response is not None and 400 <= response.status_code < 500:
-                verify_msg = " Verify your notification agent settings are correct."
-
-            logger.error("Tautulli Notifiers :: {name} notification failed.{msg}".format(msg=verify_msg, name=self.NAME))
-
-            if err_msg:
-                logger.error("Tautulli Notifiers :: {}".format(err_msg))
-
-            if req_msg:
-                logger.debug("Tautulli Notifiers :: Request response: {}".format(req_msg))
-
-            return False
-
-    def return_config_options(self, mask_passwords=False):
-        config_options = self._return_config_options()
-
-        # Mask password config options
-        if mask_passwords:
-            helpers.mask_config_passwords(config_options)
-
-        return config_options
-
-    def _return_config_options(self):
-        config_options = []
-        return config_options
-
-
-class BOXCAR(Notifier):
-    """
-    Boxcar notifications
-    """
-    NAME = 'Boxcar'
-    _DEFAULT_CONFIG = {'token': '',
-                       'sound': ''
-                       }
-
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        data = {'user_credentials': self.config['token'],
-                'notification[title]': subject,
-                'notification[long_message]': body,
-                'notification[sound]': self.config['sound']
-                }
-
-        return self.make_request('https://new.boxcar.io/api/notifications', params=data)
-
-    def get_sounds(self):
-        sounds = {'': '',
-                  'beep-crisp': 'Beep (Crisp)',
-                  'beep-soft': 'Beep (Soft)',
-                  'bell-modern': 'Bell (Modern)',
-                  'bell-one-tone': 'Bell (One Tone)',
-                  'bell-simple': 'Bell (Simple)',
-                  'bell-triple': 'Bell (Triple)',
-                  'bird-1': 'Bird (1)',
-                  'bird-2': 'Bird (2)',
-                  'boing': 'Boing',
-                  'cash': 'Cash',
-                  'clanging': 'Clanging',
-                  'detonator-charge': 'Detonator Charge',
-                  'digital-alarm': 'Digital Alarm',
-                  'done': 'Done',
-                  'echo': 'Echo',
-                  'flourish': 'Flourish',
-                  'harp': 'Harp',
-                  'light': 'Light',
-                  'magic-chime':'Magic Chime',
-                  'magic-coin': 'Magic Coin',
-                  'no-sound': 'No Sound',
-                  'notifier-1': 'Notifier (1)',
-                  'notifier-2': 'Notifier (2)',
-                  'notifier-3': 'Notifier (3)',
-                  'orchestral-long': 'Orchestral (Long)',
-                  'orchestral-short': 'Orchestral (Short)',
-                  'score': 'Score',
-                  'success': 'Success',
-                  'up': 'Up'}
-
-        return sounds
-
-    def _return_config_options(self):
-        config_option = [{'label': 'Boxcar Access Token',
-                          'value': self.config['token'],
-                          'name': 'boxcar_token',
-                          'description': 'Your Boxcar access token.',
-                          'input_type': 'token'
-                          },
-                         {'label': 'Sound',
-                          'value': self.config['sound'],
-                          'name': 'boxcar_sound',
-                          'description': 'Set the notification sound. Leave blank for the default sound.',
-                          'input_type': 'select',
-                          'select_options': self.get_sounds()
-                          }
-                         ]
-
-        return config_option
-
-
-class BROWSER(Notifier):
-    """
-    Browser notifications
-    """
-    NAME = 'Browser'
-    _DEFAULT_CONFIG = {'auto_hide_delay': 5
-                       }
-
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        logger.info("Tautulli Notifiers :: {name} notification sent.".format(name=self.NAME))
-        return True
-
-    def _return_config_options(self):
-        config_option = [{'label': 'Note',
-                          'description': 'You may need to refresh the page after saving for changes to take effect.',
-                          'input_type': 'help'
-                          },
-                         {'label': 'Allow Notifications',
-                          'value': 'Allow Notifications',
-                          'name': 'browser_allow_browser',
-                          'description': 'Click to allow browser notifications. '
-                                         'You must click this button for each browser.',
-                          'input_type': 'button'
-                          },
-                         {'label': 'Auto Hide Delay',
-                          'value': self.config['auto_hide_delay'],
-                          'name': 'browser_auto_hide_delay',
-                          'description': 'Set the number of seconds for the notification to remain visible. '
-                                         'Set 0 to disable auto hiding. (Note: Some browsers have a maximum time limit.)',
-                          'input_type': 'number'
-                          }
-                         ]
-
-        return config_option
-
-
-class DISCORD(Notifier):
-    """
-    Discord Notifications
-    """
-    NAME = 'Discord'
-    _DEFAULT_CONFIG = {'hook': '',
-                       'username': '',
-                       'avatar_url': '',
-                       'color': '',
-                       'tts': 0,
-                       'incl_subject': 1,
-                       'incl_card': 0,
-                       'incl_description': 1,
-                       'incl_thumbnail': 0,
-                       'incl_pmslink': 0,
-                       'movie_provider': '',
-                       'tv_provider': '',
-                       'music_provider': ''
-                       }
-
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        if self.config['incl_subject']:
-            text = subject + '\r\n' + body
-        else:
-            text = body
-
-        data = {'content': text}
-        if self.config['username']:
-            data['username'] = self.config['username']
-        if self.config['avatar_url']:
-            data['avatar_url'] = self.config['avatar_url']
-        if self.config['tts']:
-            data['tts'] = True
-
-        files = {}
-
-        if self.config['incl_card'] and kwargs.get('parameters', {}).get('media_type'):
-            # Grab formatted metadata
-            pretty_metadata = PrettyMetadata(kwargs['parameters'])
-
-            image = pretty_metadata.get_image()
-            if image:
-                files = {'files[0]': image}
-
-            if pretty_metadata.media_type == 'movie':
-                provider = self.config['movie_provider']
-            elif pretty_metadata.media_type in ('show', 'season', 'episode'):
-                provider = self.config['tv_provider']
-            elif pretty_metadata.media_type in ('artist', 'album', 'track'):
-                provider = self.config['music_provider']
-            else:
-                provider = None
-
-            poster_url = pretty_metadata.get_poster_url()
-            provider_name = pretty_metadata.get_provider_name(provider)
-            provider_link = pretty_metadata.get_provider_link(provider)
-            title = pretty_metadata.get_title('\u00B7')
-            description = pretty_metadata.get_description()
-            plex_url = pretty_metadata.get_plex_url()
-
-            # Build Discord post attachment
-            attachment = {'title': title,
-                          'timestamp': pretty_metadata.parameters['utctime']
-                          }
-
-            if self.config['color']:
-                hex_match = re.match(r'^#([0-9a-fA-F]{3}){1,2}$', self.config['color'])
-                if hex_match:
-                    hex = hex_match.group(0).lstrip('#')
-                    hex = ''.join(h * 2 for h in hex) if len(hex) == 3 else hex
-                    attachment['color'] = helpers.hex_to_int(hex)
-
-            if self.config['incl_thumbnail']:
-                attachment['thumbnail'] = {'url': 'attachment://{}'.format(image[0]) if image else poster_url}
-            else:
-                attachment['image'] = {'url': 'attachment://{}'.format(image[0]) if image else poster_url}
-
-            if self.config['incl_description']:
-                attachment['description'] = description[:2045] + (description[2045:] and '...')
-
-            fields = []
-            if provider_link:
-                attachment['url'] = provider_link
-                fields.append({'name': 'View Details',
-                               'value': '[%s](%s)' % (provider_name, provider_link),
-                               'inline': True})
-            if self.config['incl_pmslink']:
-                fields.append({'name': 'View Details',
-                               'value': '[Plex Web](%s)' % plex_url,
-                               'inline': True})
-            if fields:
-                attachment['fields'] = fields
-
-            data['embeds'] = [attachment]
-
-        params = {'wait': True}
-
-        if files:
-            files['payload_json'] = (None, json.dumps(data), 'application/json')
-            return self.make_request(self.config['hook'], params=params, files=files)
-        else:
-            return self.make_request(self.config['hook'], params=params, json=data)
-
-    def _return_config_options(self):
-        config_option = [{'label': 'Discord Webhook URL',
-                          'value': self.config['hook'],
-                          'name': 'discord_hook',
-                          'description': 'Your Discord incoming webhook URL.',
-                          'input_type': 'token'
-                          },
-                         {'label': 'Discord Username',
-                          'value': self.config['username'],
-                          'name': 'discord_username',
-                          'description': 'The Discord username which will be used. Leave blank for webhook integration default.',
-                          'input_type': 'text'
-                          },
-                         {'label': 'Discord Avatar',
-                          'value': self.config['avatar_url'],
-                          'description': 'The image url for the avatar which will be used. Leave blank for webhook integration default.',
-                          'name': 'discord_avatar_url',
-                          'input_type': 'text'
-                          },
-                         {'label': 'Discord Color',
-                          'value': self.config['color'],
-                          'description': 'The hex color value (starting with \'#\') for the border along the left side of the message attachment.',
-                          'name': 'discord_color',
-                          'input_type': 'text'
-                          },
-                         {'label': 'TTS',
-                          'value': self.config['tts'],
-                          'name': 'discord_tts',
-                          'description': 'Send the notification using text-to-speech.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Subject Line',
-                          'value': self.config['incl_subject'],
-                          'name': 'discord_incl_subject',
-                          'description': 'Include the subject line with the notifications.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Rich Metadata Info',
-                          'value': self.config['incl_card'],
-                          'name': 'discord_incl_card',
-                          'description': 'Include an info card with a poster and metadata with the notifications.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Summary',
-                          'value': self.config['incl_description'],
-                          'name': 'discord_incl_description',
-                          'description': 'Include a summary for the media on the info card.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Link to Plex Web',
-                          'value': self.config['incl_pmslink'],
-                          'name': 'discord_incl_pmslink',
-                          'description': 'Include a second link to the media in Plex Web on the info card.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Use Poster Thumbnail',
-                          'value': self.config['incl_thumbnail'],
-                          'name': 'discord_incl_thumbnail',
-                          'description': 'Use a thumbnail instead of a full sized poster on the info card.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Movie Link Source',
-                          'value': self.config['movie_provider'],
-                          'name': 'discord_movie_provider',
-                          'description': 'Select the source for movie links on the info cards. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_movie_providers()
-                          },
-                         {'label': 'TV Show Link Source',
-                          'value': self.config['tv_provider'],
-                          'name': 'discord_tv_provider',
-                          'description': 'Select the source for tv show links on the info cards. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_tv_providers()
-                          },
-                         {'label': 'Music Link Source',
-                          'value': self.config['music_provider'],
-                          'name': 'discord_music_provider',
-                          'description': 'Select the source for music links on the info cards. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_music_providers()
-                          }
-                         ]
-
-        return config_option
-
-
-class EMAIL(Notifier):
-    """
-    Email notifications
-    """
-    NAME = 'Email'
-    _DEFAULT_CONFIG = {'from_name': 'Tautulli',
-                       'from': '',
-                       'to': [],
-                       'cc': [],
-                       'bcc': [],
-                       'smtp_server': '',
-                       'smtp_port': 465,
-                       'smtp_user': '',
-                       'smtp_password': '',
-                       'tls': 2,
-                       'html_support': 1
-                       }
-
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        if not self.config['smtp_server']:
-            logger.error("Tautulli Notifiers :: %s notification failed: %s",
-                         self.NAME, "Missing SMTP server")
-            return False
-
-        if self.config['html_support']:
-            plain = MIMEText(None, 'plain', 'utf-8')
-            plain.replace_header('Content-Transfer-Encoding', 'quoted-printable')
-            plain.set_payload(kwargs.get('plaintext', bleach.clean(body, strip=True)), 'utf-8')
-
-            html = MIMEText(body, 'html', 'utf-8')
-
-            msg = MIMEMultipart('alternative')
-            msg.attach(plain)
-            msg.attach(html)
-        else:
-            msg = MIMEText(None, 'plain', 'utf-8')
-            msg.replace_header('Content-Transfer-Encoding', 'quoted-printable')
-            msg.set_payload(body, 'utf-8')
-
-        msg_id = kwargs.get('msg_id', email.utils.make_msgid())
-        reply_msg_id = kwargs.get('reply_msg_id')
-
-        msg['Message-ID'] = msg_id
-        msg['Date'] = email.utils.formatdate(localtime=True)
-        msg['Subject'] = subject
-        msg['From'] = email.utils.formataddr((self.config['from_name'], self.config['from']))
-        msg['To'] = ','.join(self.config['to'])
-        msg['CC'] = ','.join(self.config['cc'])
-
-        if reply_msg_id:
-            msg["In-Reply-To"] = reply_msg_id
-            msg["References"] = reply_msg_id
-
-        recipients = self.config['to'] + self.config['cc'] + self.config['bcc']
-
-        mailserver = None
-        success = False
-
-        try:
-            if self.config['tls'] == 2:
-                mailserver = smtplib.SMTP_SSL(self.config['smtp_server'], self.config['smtp_port'])
-            else:
-                mailserver = smtplib.SMTP(self.config['smtp_server'], self.config['smtp_port'])
-
-            mailserver.ehlo()
-
-            if self.config['tls'] == 1:
-                mailserver.starttls()
-                mailserver.ehlo()
-
-            if self.config['smtp_user']:
-                mailserver.login(str(self.config['smtp_user']), str(self.config['smtp_password']))
-
-            mailserver.sendmail(self.config['from'], recipients, msg.as_string())
-            logger.info("Tautulli Notifiers :: {name} notification sent.".format(name=self.NAME))
-            success = True
-
-        except Exception as e:
-            logger.error("Tautulli Notifiers :: %s notification failed: %s", self.NAME, e)
-
-        finally:
-            if mailserver:
-                mailserver.quit()
-
-        return success
-
-    def get_user_emails(self):
-        emails = {u['email']: u['friendly_name'] for u in users.Users().get_users() if u['email']}
-
-        user_emails_to = {v: '' for v in self.config['to']}
-        user_emails_cc = {v: '' for v in self.config['cc']}
-        user_emails_bcc = {v: '' for v in self.config['bcc']}
-
-        user_emails_to.update(emails)
-        user_emails_cc.update(emails)
-        user_emails_bcc.update(emails)
-
-        user_emails_to = [{'value': k, 'text': v} for k, v in user_emails_to.items()]
-        user_emails_cc = [{'value': k, 'text': v} for k, v in user_emails_cc.items()]
-        user_emails_bcc = [{'value': k, 'text': v} for k, v in user_emails_bcc.items()]
-
-        return user_emails_to, user_emails_cc, user_emails_bcc
-
-    def _return_config_options(self):
-        user_emails_to, user_emails_cc, user_emails_bcc = self.get_user_emails()
-
-        config_option = [{'label': 'From Name',
-                          'value': self.config['from_name'],
-                          'name': 'email_from_name',
-                          'description': 'The name of the sender.',
-                          'input_type': 'text'
-                          },
-                         {'label': 'From',
-                          'value': self.config['from'],
-                          'name': 'email_from',
-                          'description': 'The email address of the sender.',
-                          'input_type': 'text'
-                          },
-                         {'label': 'To',
-                          'value': self.config['to'],
-                          'name': 'email_to',
-                          'description': 'The email address(es) of the recipients.',
-                          'input_type': 'selectize',
-                          'select_options': user_emails_to,
-                          'select_all': True
-                          },
-                         {'label': 'CC',
-                          'value': self.config['cc'],
-                          'name': 'email_cc',
-                          'description': 'The email address(es) to CC.',
-                          'input_type': 'selectize',
-                          'select_options': user_emails_cc,
-                          'select_all': True
-                          },
-                         {'label': 'BCC',
-                          'value': self.config['bcc'],
-                          'name': 'email_bcc',
-                          'description': 'The email address(es) to BCC.',
-                          'input_type': 'selectize',
-                          'select_options': user_emails_bcc,
-                          'select_all': True
-                          },
-                         {'label': 'SMTP Server',
-                          'value': self.config['smtp_server'],
-                          'name': 'email_smtp_server',
-                          'description': 'Host for the SMTP server.',
-                          'input_type': 'text'
-                          },
-                         {'label': 'SMTP Port',
-                          'value': self.config['smtp_port'],
-                          'name': 'email_smtp_port',
-                          'description': 'Port for the SMTP server.',
-                          'input_type': 'number'
-                          },
-                         {'label': 'SMTP Username',
-                          'value': self.config['smtp_user'],
-                          'name': 'email_smtp_user',
-                          'description': 'Username for the SMTP server.',
-                          'input_type': 'text'
-                          },
-                         {'label': 'SMTP Password',
-                          'value': self.config['smtp_password'],
-                          'name': 'email_smtp_password',
-                          'description': 'Password for the SMTP server.',
-                          'input_type': 'password'
-                          },
-                         {'label': 'Encryption',
-                          'value': self.config['tls'],
-                          'name': 'email_tls',
-                          'description': 'Send emails encrypted using SSL or TLS.',
-                          'input_type': 'select',
-                          'select_options': {0: 'None',
-                                             1: 'TLS/STARTTLS (Typically port 587)',
-                                             2: 'SSL/TLS (Typically port 465)'}
-                          },
-                         {'label': 'Enable HTML Support',
-                          'value': self.config['html_support'],
-                          'name': 'email_html_support',
-                          'description': 'Style your messages using HTML tags.',
-                          'input_type': 'checkbox'
-                          }
-                         ]
-
-        return config_option
-
-
-class FACEBOOK(Notifier):
-    """
-    Facebook notifications
-    """
-    NAME = 'Facebook'
-    _DEFAULT_CONFIG = {'redirect_uri': '',
-                       'access_token': '',
-                       'app_id': '',
-                       'app_secret': '',
-                       'group_id': '',
-                       'incl_subject': 1,
-                       'incl_card': 0,
-                       'movie_provider': '',
-                       'tv_provider': '',
-                       'music_provider': ''
-                       }
-
-    def _get_authorization(self, app_id='', app_secret='', redirect_uri=''):
-        # Temporarily store settings in the config so we can retrieve them in Facebook step 2.
-        # Assume the user won't be requesting authorization for multiple Facebook notifiers at the same time.
-        plexpy.CONFIG.FACEBOOK_APP_ID = app_id
-        plexpy.CONFIG.FACEBOOK_APP_SECRET = app_secret
-        plexpy.CONFIG.FACEBOOK_REDIRECT_URI = redirect_uri
-        plexpy.CONFIG.FACEBOOK_TOKEN = 'temp'
-
-        return facebook.auth_url(app_id=app_id,
-                                 canvas_url=redirect_uri,
-                                 perms=['publish_to_groups'])
-
-    def _get_credentials(self, code=''):
-        logger.info("Tautulli Notifiers :: Requesting access token from {name}.".format(name=self.NAME))
-
-        app_id = plexpy.CONFIG.FACEBOOK_APP_ID
-        app_secret = plexpy.CONFIG.FACEBOOK_APP_SECRET
-        redirect_uri = plexpy.CONFIG.FACEBOOK_REDIRECT_URI
-
-        try:
-            # Request user access token
-            api = facebook.GraphAPI(version='2.12')
-            response = api.get_access_token_from_code(code=code,
-                                                      redirect_uri=redirect_uri,
-                                                      app_id=app_id,
-                                                      app_secret=app_secret)
-            access_token = response['access_token']
-
-            # Request extended user access token
-            api = facebook.GraphAPI(access_token=access_token, version='2.12')
-            response = api.extend_access_token(app_id=app_id,
-                                               app_secret=app_secret)
-
-            plexpy.CONFIG.FACEBOOK_TOKEN = response['access_token']
-        except Exception as e:
-            logger.error("Tautulli Notifiers :: Error requesting {name} access token: {e}".format(name=self.NAME, e=e))
-            plexpy.CONFIG.FACEBOOK_TOKEN = ''
-
-        # Clear out temporary config values
-        plexpy.CONFIG.FACEBOOK_APP_ID = ''
-        plexpy.CONFIG.FACEBOOK_APP_SECRET = ''
-        plexpy.CONFIG.FACEBOOK_REDIRECT_URI = ''
-
-        return plexpy.CONFIG.FACEBOOK_TOKEN
-
-    def _post_facebook(self, **data):
-        if self.config['group_id']:
-            api = facebook.GraphAPI(access_token=self.config['access_token'], version='2.12')
-
-            try:
-                api.put_object(parent_object=self.config['group_id'], connection_name='feed', **data)
-                logger.info("Tautulli Notifiers :: {name} notification sent.".format(name=self.NAME))
-                return True
-            except Exception as e:
-                logger.error("Tautulli Notifiers :: Error sending {name} post: {e}".format(name=self.NAME, e=e))
-                return False
-
-        else:
-            logger.error("Tautulli Notifiers :: Error sending {name} post: No {name} Group ID provided.".format(name=self.NAME))
-            return False
-
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        if self.config['incl_subject']:
-            text = subject + '\r\n' + body
-        else:
-            text = body
-
-        data = {'message': text}
-
-        if self.config['incl_card'] and kwargs.get('parameters', {}).get('media_type'):
-            # Grab formatted metadata
-            pretty_metadata = PrettyMetadata(kwargs['parameters'])
-
-            if pretty_metadata.media_type == 'movie':
-                provider = self.config['movie_provider']
-            elif pretty_metadata.media_type in ('show', 'season', 'episode'):
-                provider = self.config['tv_provider']
-            elif pretty_metadata.media_type in ('artist', 'album', 'track'):
-                provider = self.config['music_provider']
-            else:
-                provider = None
-
-            data['link'] = pretty_metadata.get_provider_link(provider)
-
-        return self._post_facebook(**data)
-
-    def _return_config_options(self):
-        config_option = [{'label': 'OAuth Redirect URI',
-                          'value': self.config['redirect_uri'],
-                          'name': 'facebook_redirect_uri',
-                          'description': 'Fill in this address for the "Valid OAuth redirect URIs" '
-                                         'in your Facebook App.',
-                          'input_type': 'text'
-                          },
-                         {'label': 'Facebook App ID',
-                          'value': self.config['app_id'],
-                          'name': 'facebook_app_id',
-                          'description': 'Your Facebook app ID.',
-                          'input_type': 'token'
-                          },
-                         {'label': 'Facebook App Secret',
-                          'value': self.config['app_secret'],
-                          'name': 'facebook_app_secret',
-                          'description': 'Your Facebook app secret.',
-                          'input_type': 'token'
-                          },
-                         {'label': 'Request Authorization',
-                          'value': 'Request Authorization',
-                          'name': 'facebook_facebook_auth',
-                          'description': 'Request Facebook authorization. (Ensure you allow the browser pop-up).',
-                          'input_type': 'button'
-                          },
-                         {'label': 'Facebook Access Token',
-                          'value': self.config['access_token'],
-                          'name': 'facebook_access_token',
-                          'description': 'Your Facebook access token. '
-                                         'Automatically filled in after requesting authorization.',
-                          'input_type': 'token'
-                          },
-                         {'label': 'Facebook Group ID',
-                          'value': self.config['group_id'],
-                          'name': 'facebook_group_id',
-                          'description': 'Your Facebook Group ID.',
-                          'input_type': 'text'
-                          },
-                         {'label': 'Include Subject Line',
-                          'value': self.config['incl_subject'],
-                          'name': 'facebook_incl_subject',
-                          'description': 'Include the subject line with the notifications.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Rich Metadata Info',
-                          'value': self.config['incl_card'],
-                          'name': 'facebook_incl_card',
-                          'description': 'Include an info card with a poster and metadata with the notifications.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" '
-                                         'data-target="notify_upload_posters">Image Hosting</a> '
-                                         'must be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Movie Link Source',
-                          'value': self.config['movie_provider'],
-                          'name': 'facebook_movie_provider',
-                          'description': 'Select the source for movie links on the info cards. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_movie_providers()
-                          },
-                         {'label': 'TV Show Link Source',
-                          'value': self.config['tv_provider'],
-                          'name': 'facebook_tv_provider',
-                          'description': 'Select the source for tv show links on the info cards. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_tv_providers()
-                          },
-                         {'label': 'Music Link Source',
-                          'value': self.config['music_provider'],
-                          'name': 'facebook_music_provider',
-                          'description': 'Select the source for music links on the info cards. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_music_providers()
-                          }
-                         ]
-
-        return config_option
-
-
-class GOTIFY(Notifier):
-    """
-    Gotify notifications
-    """
-    NAME = 'Gotify'
-    _DEFAULT_CONFIG = {'host': '',
-                       'app_token': '',
-                       'priority': 0,
-                       'incl_subject': 1,
-                       'incl_poster': 0,
-                       'incl_url': 1,
-                       'movie_provider': '',
-                       'tv_provider': '',
-                       'music_provider': ''
-                       }
-
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        data = {
-            'extras': {
-                'client::display': {
-                    'contentType': 'text/markdown'
-                }
-            },
-            'message': body,
-            'priority': self.config['priority']
-        }
-
-        if self.config['incl_subject']:
-            data['title'] = subject
-
-        headers = {'X-Gotify-Key': self.config['app_token']}
-
-        if kwargs.get('parameters', {}).get('media_type'):
-            # Grab formatted metadata
-            pretty_metadata = PrettyMetadata(kwargs['parameters'])
-
-            if self.config['incl_url']:
-                if pretty_metadata.media_type == 'movie':
-                    provider = self.config['movie_provider']
-                elif pretty_metadata.media_type in ('show', 'season', 'episode'):
-                    provider = self.config['tv_provider']
-                elif pretty_metadata.media_type in ('artist', 'album', 'track'):
-                    provider = self.config['music_provider']
-                else:
-                    provider = None
-
-                provider_link = pretty_metadata.get_provider_link(provider)
-                data['extras']['client::notification'] = {'click': {'url': provider_link}}
-
-            if self.config['incl_poster']:
-                poster_url = pretty_metadata.get_poster_url()
-                data['message'] += '\n\n![]({})'.format(poster_url)
-
-        return self.make_request('{}/message'.format(self.config['host']), headers=headers, json=data)
-
-    def _return_config_options(self):
-        config_option = [{'label': 'Gotify Host Address',
-                          'value': self.config['host'],
-                          'name': 'gotify_host',
-                          'description': 'Host running Gotify (e.g. http://localhost:8080).',
-                          'input_type': 'text'
-                          },
-                         {'label': 'Gotify App Token',
-                          'value': self.config['app_token'],
-                          'name': 'gotify_app_token',
-                          'description': 'Your Gotify app token.',
-                          'input_type': 'token'
-                          },
-                         {'label': 'Priority',
-                          'value': self.config['priority'],
-                          'name': 'gotify_priority',
-                          'description': 'Set the notification priority.',
-                          'input_type': 'select',
-                          'select_options': {0: 0, 1: 1, 2: 2, 3: 3, 4: 4, 5: 5, 6: 6, 7: 7}
-                          },
-                         {'label': 'Include Subject Line',
-                          'value': self.config['incl_subject'],
-                          'name': 'gotify_incl_subject',
-                          'description': 'Include the subject line with the notifications.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Poster Image',
-                          'value': self.config['incl_poster'],
-                          'name': 'gotify_incl_poster',
-                          'description': 'Include a poster with the notifications.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Open URL on Notification Click (Android Only)',
-                          'value': self.config['incl_url'],
-                          'name': 'gotify_incl_url',
-                          'description': 'Open a URL instead of the Gotify app when clicking on the notifications.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Movie Link Source',
-                          'value': self.config['movie_provider'],
-                          'name': 'gotify_movie_provider',
-                          'description': 'Select the source for movie links in the notification. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_movie_providers()
-                          },
-                         {'label': 'TV Show Link Source',
-                          'value': self.config['tv_provider'],
-                          'name': 'gotify_tv_provider',
-                          'description': 'Select the source for tv show links in the notification. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_tv_providers()
-                          },
-                         {'label': 'Music Link Source',
-                          'value': self.config['music_provider'],
-                          'name': 'gotify_music_provider',
-                          'description': 'Select the source for music links in the notification. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_music_providers()
-                          }
-                         ]
-
-        return config_option
-
-
-class GROUPME(Notifier):
-    """
-    GroupMe notifications
-    """
-    NAME = 'GroupMe'
-    _DEFAULT_CONFIG = {'access_token': '',
-                       'bot_id': '',
-                       'incl_subject': 1,
-                       'incl_poster': 0
-                       }
-
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        data = {'bot_id': self.config['bot_id']}
-
-        if self.config['incl_subject']:
-            data['text'] = subject + '\r\n' + body
-        else:
-            data['text'] = body
-
-        if self.config['incl_poster'] and kwargs.get('parameters'):
-            pretty_metadata = PrettyMetadata(kwargs.get('parameters'))
-
-            image = pretty_metadata.get_image()
-            if image:
-                headers = {'X-Access-Token': self.config['access_token'],
-                           'Content-Type': 'image/png'}
-
-                r = requests.post('https://image.groupme.com/pictures', headers=headers, data=image[1])
-
-                if r.status_code == 200:
-                    logger.info("Tautulli Notifiers :: {name} poster sent.".format(name=self.NAME))
-                    r_content = r.json()
-                    data['attachments'] = [{'type': 'image',
-                                            'url': r_content['payload']['picture_url']}]
-                else:
-                    logger.error("Tautulli Notifiers :: {name} poster failed: "
-                                 "[{r.status_code}] {r.reason}".format(name=self.NAME, r=r))
-                    logger.debug("Tautulli Notifiers :: Request response: {}".format(request.server_message(r, True)))
-
-        return self.make_request('https://api.groupme.com/v3/bots/post', json=data)
-
-    def _return_config_options(self):
-        config_option = [{'label': 'GroupMe Access Token',
-                          'value': self.config['access_token'],
-                          'name': 'groupme_access_token',
-                          'description': 'Your GroupMe access token.',
-                          'input_type': 'token'
-                          },
-                         {'label': 'GroupMe Bot ID',
-                          'value': self.config['bot_id'],
-                          'name': 'groupme_bot_id',
-                          'description': 'Your GroupMe bot ID.',
-                          'input_type': 'token'
-                          },
-                         {'label': 'Include Subject Line',
-                          'value': self.config['incl_subject'],
-                          'name': 'groupme_incl_subject',
-                          'description': 'Include the subject line with the notifications.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Poster Image',
-                          'value': self.config['incl_poster'],
-                          'name': 'groupme_incl_poster',
-                          'description': 'Include a poster with the notifications.',
-                          'input_type': 'checkbox'
-                          }
-                         ]
-
-        return config_option
-
-
-class GROWL(Notifier):
+class GROWL(object):
     """
     Growl notifications, for OS X.
     """
-    NAME = 'Growl'
-    _DEFAULT_CONFIG = {'host': '',
-                       'password': ''
-                       }
 
-    def agent_notify(self, subject='', body='', action='', **kwargs):
+    def __init__(self):
+        self.enabled = plexpy.CONFIG.GROWL_ENABLED
+        self.host = plexpy.CONFIG.GROWL_HOST
+        self.password = plexpy.CONFIG.GROWL_PASSWORD
+        self.on_play = plexpy.CONFIG.GROWL_ON_PLAY
+        self.on_stop = plexpy.CONFIG.GROWL_ON_STOP
+        self.on_watched = plexpy.CONFIG.GROWL_ON_WATCHED
+
+    def conf(self, options):
+        return cherrypy.config['config'].get('Growl', options)
+
+    def notify(self, message, event):
+        if not message or not event:
+            return
+
         # Split host and port
-        if self.config['host'] == "":
+        if self.host == "":
             host, port = "localhost", 23053
-        if ":" in self.config['host']:
-            host, port = self.config['host'].split(':', 1)
+        if ":" in self.host:
+            host, port = self.host.split(':', 1)
             port = int(port)
         else:
-            host, port = self.config['host'], 23053
+            host, port = self.host, 23053
 
         # If password is empty, assume none
-        if self.config['password'] == "":
+        if self.password == "":
             password = None
         else:
-            password = self.config['password']
+            password = self.password
 
         # Register notification
         growl = gntp.notifier.GrowlNotifier(
-            applicationName='Tautulli',
+            applicationName='PlexPy',
             notifications=['New Event'],
             defaultNotifications=['New Event'],
             hostname=host,
@@ -1916,15 +344,18 @@ class GROWL(Notifier):
         try:
             growl.register()
         except gntp.notifier.errors.NetworkError:
-            logger.error("Tautulli Notifiers :: {name} notification failed: network error".format(name=self.NAME))
-            return False
+            logger.warning(u'Growl notification failed: network error')
+            return
         except gntp.notifier.errors.AuthError:
-            logger.error("Tautulli Notifiers :: {name} notification failed: authentication error".format(name=self.NAME))
-            return False
+            logger.warning(u'Growl notification failed: authentication error')
+            return
+
+        # Fix message
+        message = message.encode(plexpy.SYS_ENCODING, "replace")
 
         # Send it, including an image
         image_file = os.path.join(str(plexpy.PROG_DIR),
-            "data/interfaces/default/images/logo-circle.png")
+            "data/images/plexpylogo.png")
 
         with open(image_file, 'rb') as f:
             image = f.read()
@@ -1932,25 +363,36 @@ class GROWL(Notifier):
         try:
             growl.notify(
                 noteType='New Event',
-                title=subject,
-                description=body,
+                title=event,
+                description=message,
                 icon=image
             )
-            logger.info("Tautulli Notifiers :: {name} notification sent.".format(name=self.NAME))
-            return True
         except gntp.notifier.errors.NetworkError:
-            logger.error("Tautulli Notifiers :: {name} notification failed: network error".format(name=self.NAME))
-            return False
+            logger.warning(u'Growl notification failed: network error')
+            return
 
-    def _return_config_options(self):
+        logger.info(u"Growl notifications sent.")
+
+    def updateLibrary(self):
+        #For uniformity reasons not removed
+        return
+
+    def test(self, host, password):
+        self.enabled = True
+        self.host = host
+        self.password = password
+
+        self.notify('ZOMG Lazors Pewpewpew!', 'Test Message')
+
+    def return_config_options(self):
         config_option = [{'label': 'Growl Host',
-                          'value': self.config['host'],
+                          'value': self.host,
                           'name': 'growl_host',
-                          'description': 'Your Growl hostname or IP address.',
+                          'description': 'Your Growl hostname.',
                           'input_type': 'text'
                           },
                          {'label': 'Growl Password',
-                          'value': self.config['password'],
+                          'value': self.password,
                           'name': 'growl_password',
                           'description': 'Your Growl password.',
                           'input_type': 'password'
@@ -1959,836 +401,691 @@ class GROWL(Notifier):
 
         return config_option
 
-
-class IFTTT(Notifier):
+class PROWL(object):
     """
-    IFTTT notifications
+    Prowl notifications.
     """
-    NAME = 'IFTTT'
-    _DEFAULT_CONFIG = {'key': '',
-                       'event': 'tautulli',
-                       'value3': '',
-                       }
 
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        event = str(self.config['event']).format(action=action)
+    def __init__(self):
+        self.enabled = plexpy.CONFIG.PROWL_ENABLED
+        self.keys = plexpy.CONFIG.PROWL_KEYS
+        self.priority = plexpy.CONFIG.PROWL_PRIORITY
+        self.on_play = plexpy.CONFIG.PROWL_ON_PLAY
+        self.on_stop = plexpy.CONFIG.PROWL_ON_STOP
+        self.on_watched = plexpy.CONFIG.PROWL_ON_WATCHED
 
-        data = {'value1': subject,
-                'value2': body}
+    def conf(self, options):
+        return cherrypy.config['config'].get('Prowl', options)
 
-        if self.config['value3']:
-            pretty_metadata = PrettyMetadata(kwargs['parameters'])
-            data['value3'] = pretty_metadata.parameters.get(self.config['value3'], '')
+    def notify(self, message, event):
+        if not message or not event:
+            return
 
-        headers = {'Content-type': 'application/json'}
+        http_handler = HTTPSConnection("api.prowlapp.com")
 
-        return self.make_request('https://maker.ifttt.com/trigger/{}/with/key/{}'.format(event, self.config['key']),
-                                 headers=headers, json=data)
+        data = {'apikey': plexpy.CONFIG.PROWL_KEYS,
+                'application': 'PlexPy',
+                'event': event,
+                'description': message.encode("utf-8"),
+                'priority': plexpy.CONFIG.PROWL_PRIORITY}
 
-    def _return_config_options(self):
-        config_option = [{'label': 'IFTTT Webhook Key',
-                          'value': self.config['key'],
-                          'name': 'ifttt_key',
-                          'description': 'Your IFTTT webhook key. You can get a key from'
-                                         ' <a href="' + helpers.anon_url('https://ifttt.com/maker_webhooks') +
-                                         '" target="_blank" rel="noreferrer">here</a>.',
-                          'input_type': 'token'
-                          },
-                         {'label': 'IFTTT Event',
-                          'value': self.config['event'],
-                          'name': 'ifttt_event',
-                          'description': 'The IFTTT maker event to fire. You can include'
-                                         ' <span class="inline-pre">{action}</span>'
-                                         ' to be substituted with the action name.'
-                                         ' The notification subject and body will be sent'
-                                         ' as <span class="inline-pre">value1</span>'
-                                         ' and <span class="inline-pre">value2</span> respectively.',
+        http_handler.request("POST",
+                                "/publicapi/add",
+                                headers={'Content-type': "application/x-www-form-urlencoded"},
+                                body=urlencode(data))
+        response = http_handler.getresponse()
+        request_status = response.status
+
+        if request_status == 200:
+                logger.info(u"Prowl notifications sent.")
+                return True
+        elif request_status == 401:
+                logger.info(u"Prowl auth failed: %s" % response.reason)
+                return False
+        else:
+                logger.info(u"Prowl notification failed.")
+                return False
+
+    def updateLibrary(self):
+        #For uniformity reasons not removed
+        return
+
+    def test(self, keys, priority):
+        self.enabled = True
+        self.keys = keys
+        self.priority = priority
+
+        self.notify('ZOMG Lazors Pewpewpew!', 'Test Message')
+
+    def return_config_options(self):
+        config_option = [{'label': 'Prowl API Key',
+                          'value': self.keys,
+                          'name': 'prowl_keys',
+                          'description': 'Your Prowl API key.',
                           'input_type': 'text'
                           },
-                         {'label': 'Value 3',
-                          'value': self.config['value3'],
-                          'name': 'ifttt_value3',
-                          'description': 'Optional: Select a parameter to send as <span class="inline-pre">value3</span>.',
+                         {'label': 'Priority',
+                          'value': self.priority,
+                          'name': 'prowl_priority',
+                          'description': 'Set the priority.',
                           'input_type': 'select',
-                          'select_options': PrettyMetadata().get_parameters()
+                          'select_options': {-2: -2, -1: -1, 0: 0, 1: 1, 2: 2}
                           }
                          ]
 
         return config_option
 
-
-class JOIN(Notifier):
+class XBMC(object):
     """
-    Join notifications
+    XBMC notifications
     """
-    NAME = 'Join'
-    _DEFAULT_CONFIG = {'api_key': '',
-                       'device_names': [],
-                       'priority': 2,
-                       'incl_subject': 1,
-                       'incl_poster': 0,
-                       'movie_provider': '',
-                       'tv_provider': '',
-                       'music_provider': ''
-                       }
 
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        data = {'apikey': self.config['api_key'],
-                'deviceNames': ','.join(self.config['device_names']),
-                'text': body}
+    def __init__(self):
 
-        if self.config['incl_subject']:
-            data['title'] = subject
+        self.hosts = plexpy.CONFIG.XBMC_HOST
+        self.username = plexpy.CONFIG.XBMC_USERNAME
+        self.password = plexpy.CONFIG.XBMC_PASSWORD
+        self.on_play = plexpy.CONFIG.XBMC_ON_PLAY
+        self.on_stop = plexpy.CONFIG.XBMC_ON_STOP
+        self.on_watched = plexpy.CONFIG.XBMC_ON_WATCHED
 
-        if kwargs.get('parameters', {}).get('media_type'):
-            # Grab formatted metadata
-            pretty_metadata = PrettyMetadata(kwargs['parameters'])
+    def _sendhttp(self, host, command):
+        url_command = urllib.urlencode(command)
+        url = host + '/xbmcCmds/xbmcHttp/?' + url_command
 
-            poster_url = pretty_metadata.get_poster_url()
-            if poster_url and self.config['incl_poster']:
-                data['icon'] = poster_url
-
-            if pretty_metadata.media_type == 'movie':
-                provider = self.config['movie_provider']
-            elif pretty_metadata.media_type in ('show', 'season', 'episode'):
-                provider = self.config['tv_provider']
-            elif pretty_metadata.media_type in ('artist', 'album', 'track'):
-                provider = self.config['music_provider']
-            else:
-                provider = None
-
-            provider_link = pretty_metadata.get_provider_link(provider)
-            if provider_link:
-                data['url'] = provider_link
-
-        r = requests.post('https://joinjoaomgcd.appspot.com/_ah/api/messaging/v1/sendPush', params=data)
-
-        if r.status_code == 200:
-            response_data = r.json()
-            if response_data.get('success'):
-                logger.info("Tautulli Notifiers :: {name} notification sent.".format(name=self.NAME))
-                return True
-            else:
-                error_msg = response_data.get('errorMessage')
-                logger.error("Tautulli Notifiers :: {name} notification failed: {msg}".format(name=self.NAME, msg=error_msg))
-                return False
+        if self.password:
+            return request.request_content(url, auth=(self.username, self.password))
         else:
-            logger.error("Tautulli Notifiers :: {name} notification failed: [{r.status_code}] {r.reason}".format(name=self.NAME, r=r))
-            logger.debug("Tautulli Notifiers :: Request response: {}".format(request.server_message(r, True)))
-            return False
+            return request.request_content(url)
 
-    def get_devices(self):
-        devices = {d: d for d in self.config['device_names']}
-        devices.update({'': ''})
+    def _sendjson(self, host, method, params={}):
+        data = [{'id': 0, 'jsonrpc': '2.0', 'method': method, 'params': params}]
+        headers = {'Content-Type': 'application/json'}
+        url = host + '/jsonrpc'
 
-        if self.config['api_key']:
-            params = {'apikey': self.config['api_key']}
+        if self.password:
+            response = request.request_json(url, method="post", data=json.dumps(data), headers=headers, auth=(self.username, self.password))
+        else:
+            response = request.request_json(url, method="post", data=json.dumps(data), headers=headers)
 
+        if response:
+            return response[0]['result']
+
+    def notify(self, subject=None, message=None):
+
+        hosts = [x.strip() for x in self.hosts.split(',')]
+
+        header = subject
+        message = message
+        time = "3000" # in ms
+
+        for host in hosts:
+            logger.info('Sending notification command to XMBC @ ' + host)
             try:
-                r = requests.get('https://joinjoaomgcd.appspot.com/_ah/api/registration/v1/listDevices', params=params)
+                version = self._sendjson(host, 'Application.GetProperties', {'properties': ['version']})['version']['major']
 
-                if r.status_code == 200:
-                    response_data = r.json()
-                    if response_data.get('success'):
-                        response_devices = response_data.get('records', [])
-                        devices.update({d['deviceName']: d['deviceName'] for d in response_devices})
-                    else:
-                        error_msg = response_data.get('errorMessage')
-                        logger.error("Tautulli Notifiers :: Unable to retrieve {name} devices list: {msg}".format(name=self.NAME, msg=error_msg))
+                if version < 12: #Eden
+                    notification = header + "," + message + "," + time
+                    notifycommand = {'command': 'ExecBuiltIn', 'parameter': 'Notification(' + notification + ')'}
+                    request = self._sendhttp(host, notifycommand)
 
-                else:
-                    logger.error("Tautulli Notifiers :: Unable to retrieve {name} devices list: [{r.status_code}] {r.reason}".format(name=self.NAME, r=r))
-                    logger.debug("Tautulli Notifiers :: Request response: {}".format(request.server_message(r, True)))
+                else: #Frodo
+                    params = {'title': header, 'message': message, 'displaytime': int(time)}
+                    request = self._sendjson(host, 'GUI.ShowNotification', params)
 
-            except Exception as e:
-                logger.error("Tautulli Notifiers :: Unable to retrieve {name} devices list: {msg}".format(name=self.NAME, msg=e))
+                if not request:
+                    raise Exception
 
-        return devices
+            except Exception:
+                logger.error('Error sending notification request to XBMC')
 
-    def _return_config_options(self):
-        config_option = [{'label': 'Join API Key',
-                          'value': self.config['api_key'],
-                          'name': 'join_api_key',
-                          'description': 'Your Join API key. Required for group notifications.',
-                          'input_type': 'token',
-                          'refresh': True
+    def return_config_options(self):
+        config_option = [{'label': 'XBMC Host:Port',
+                          'value': self.hosts,
+                          'name': 'xbmc_host',
+                          'description': 'Host running XBMC (e.g. http://localhost:8080). Separate multiple hosts with commas.',
+                          'input_type': 'text'
                           },
-                         {'label': 'Device Name(s)',
-                          'value': self.config['device_names'],
-                          'name': 'join_device_names',
-                          'description': 'Select your Join device(s).',
-                          'input_type': 'select',
-                          'select_options': self.get_devices()
+                         {'label': 'XBMC Username',
+                          'value': self.username,
+                          'name': 'xbmc_username',
+                          'description': 'Your XBMC username.',
+                          'input_type': 'text'
+                          },
+                         {'label': 'XBMC Password',
+                          'value': self.password,
+                          'name': 'xbmc_password',
+                          'description': 'Your XMBC password.',
+                          'input_type': 'password'
+                          }
+                         ]
+
+        return config_option
+
+class Plex(object):
+    def __init__(self):
+
+        self.client_hosts = plexpy.CONFIG.PLEX_CLIENT_HOST
+        self.username = plexpy.CONFIG.PLEX_USERNAME
+        self.password = plexpy.CONFIG.PLEX_PASSWORD
+        self.on_play = plexpy.CONFIG.PLEX_ON_PLAY
+        self.on_stop = plexpy.CONFIG.PLEX_ON_STOP
+        self.on_watched = plexpy.CONFIG.PLEX_ON_WATCHED
+
+    def _sendhttp(self, host, command):
+
+        username = self.username
+        password = self.password
+
+        url_command = urllib.urlencode(command)
+
+        url = host + '/xbmcCmds/xbmcHttp/?' + url_command
+
+        req = urllib2.Request(url)
+
+        if password:
+            base64string = base64.encodestring('%s:%s' % (username, password)).replace('\n', '')
+            req.add_header("Authorization", "Basic %s" % base64string)
+
+        logger.info('Plex url: %s' % url)
+
+        try:
+            handle = urllib2.urlopen(req)
+        except Exception as e:
+            logger.warn('Error opening Plex url: %s' % e)
+            return
+
+        response = handle.read().decode(plexpy.SYS_ENCODING)
+
+        return response
+
+    def notify(self, subject=None, message=None):
+
+        hosts = [x.strip() for x in self.client_hosts.split(',')]
+
+        header = subject
+        message = message
+        time = "3000" # in ms
+
+        for host in hosts:
+            logger.info('Sending notification command to Plex Media Server @ ' + host)
+            try:
+                notification = header + "," + message + "," + time
+                notifycommand = {'command': 'ExecBuiltIn', 'parameter': 'Notification(' + notification + ')'}
+                request = self._sendhttp(host, notifycommand)
+
+                if not request:
+                    raise Exception
+
+            except:
+                logger.warn('Error sending notification request to Plex Media Server')
+
+    def return_config_options(self):
+        config_option = [{'label': 'Plex Client Host:Port',
+                          'value': self.client_hosts,
+                          'name': 'plex_client_host',
+                          'description': 'Host running Plex Client (eg. http://192.168.1.100:3000).',
+                          'input_type': 'text'
+                          },
+                         {'label': 'Plex Username',
+                          'value': self.username,
+                          'name': 'plex_username',
+                          'description': 'Username of your Plex client API (blank for none).',
+                          'input_type': 'text'
+                          },
+                         {'label': 'Plex Password',
+                          'value': self.password,
+                          'name': 'plex_password',
+                          'description': 'Password of your Plex client API (blank for none).',
+                          'input_type': 'password'
+                          }
+                         ]
+
+        return config_option
+
+class NMA(object):
+
+    def __init__(self):
+        self.api = plexpy.CONFIG.NMA_APIKEY
+        self.nma_priority = plexpy.CONFIG.NMA_PRIORITY
+        self.on_play = plexpy.CONFIG.NMA_ON_PLAY
+        self.on_stop = plexpy.CONFIG.NMA_ON_STOP
+        self.on_watched = plexpy.CONFIG.NMA_ON_WATCHED
+
+    def notify(self, subject=None, message=None):
+        if not subject or not message:
+            return
+
+        title = 'PlexPy'
+        api = plexpy.CONFIG.NMA_APIKEY
+        nma_priority = plexpy.CONFIG.NMA_PRIORITY
+
+        # logger.debug(u"NMA title: " + title)
+        # logger.debug(u"NMA API: " + api)
+        # logger.debug(u"NMA Priority: " + str(nma_priority))
+
+        event = subject
+
+        # logger.debug(u"NMA event: " + event)
+        # logger.debug(u"NMA message: " + message)
+
+        batch = False
+
+        p = pynma.PyNMA()
+        keys = api.split(',')
+        p.addkey(keys)
+
+        if len(keys) > 1:
+            batch = True
+
+        response = p.push(title, event, message, priority=nma_priority, batch_mode=batch)
+
+        if not response[api][u'code'] == u'200':
+            logger.error(u'Could not send notification to NotifyMyAndroid')
+            return False
+        else:
+            return True
+
+    def return_config_options(self):
+        config_option = [{'label': 'NotifyMyAndroid API Key',
+                          'value': plexpy.CONFIG.NMA_APIKEY,
+                          'name': 'nma_apikey',
+                          'description': 'Your NotifyMyAndroid API key. Separate multiple api keys with commas.',
+                          'input_type': 'text'
                           },
                          {'label': 'Priority',
-                          'value': self.config['priority'],
-                          'name': 'join_priority',
-                          'description': 'Set the notification priority.',
+                          'value': plexpy.CONFIG.NMA_PRIORITY,
+                          'name': 'nma_priority',
+                          'description': 'Set the priority.',
+                          'input_type': 'select',
+                          'select_options': {-2: -2, -1: -1, 0: 0, 1: 1, 2: 2}
+                          }
+                         ]
+
+        return config_option
+
+class PUSHBULLET(object):
+
+    def __init__(self):
+        self.apikey = plexpy.CONFIG.PUSHBULLET_APIKEY
+        self.deviceid = plexpy.CONFIG.PUSHBULLET_DEVICEID
+        self.channel_tag = plexpy.CONFIG.PUSHBULLET_CHANNEL_TAG
+        self.on_play = plexpy.CONFIG.PUSHBULLET_ON_PLAY
+        self.on_stop = plexpy.CONFIG.PUSHBULLET_ON_STOP
+        self.on_watched = plexpy.CONFIG.PUSHBULLET_ON_WATCHED
+
+    def conf(self, options):
+        return cherrypy.config['config'].get('PUSHBULLET', options)
+
+    def notify(self, message, subject):
+        if not message or not subject:
+            return
+
+        http_handler = HTTPSConnection("api.pushbullet.com")
+
+        data = {'type': "note",
+                'title': subject.encode("utf-8"),
+                'body': message.encode("utf-8")}
+
+        # Can only send to a device or channel, not both.
+        if self.deviceid:
+            data['device_iden'] = self.deviceid
+        elif self.channel_tag:
+            data['channel_tag'] = self.channel_tag
+
+        http_handler.request("POST",
+                                "/v2/pushes",
+                                headers={'Content-type': "application/json",
+                                         'Authorization': 'Basic %s' % base64.b64encode(plexpy.CONFIG.PUSHBULLET_APIKEY + ":")},
+                                body=json.dumps(data))
+        response = http_handler.getresponse()
+        request_status = response.status
+        # logger.debug(u"PushBullet response status: %r" % request_status)
+        # logger.debug(u"PushBullet response headers: %r" % response.getheaders())
+        # logger.debug(u"PushBullet response body: %r" % response.read())
+
+        if request_status == 200:
+                logger.info(u"PushBullet notifications sent.")
+                return True
+        elif request_status >= 400 and request_status < 500:
+                logger.info(u"PushBullet request failed: %s" % response.reason)
+                return False
+        else:
+                logger.info(u"PushBullet notification failed serverside.")
+                return False
+
+    def test(self, apikey, deviceid):
+
+        self.enabled = True
+        self.apikey = apikey
+        self.deviceid = deviceid
+
+        self.notify('Main Screen Activate', 'Test Message')
+
+    def return_config_options(self):
+        config_option = [{'label': 'Pushbullet API Key',
+                          'value': self.apikey,
+                          'name': 'pushbullet_apikey',
+                          'description': 'Your Pushbullet API key.',
+                          'input_type': 'text'
+                          },
+                         {'label': 'Device ID',
+                          'value': self.deviceid,
+                          'name': 'pushbullet_deviceid',
+                          'description': 'A device ID (optional). If set, will override channel tag.',
+                          'input_type': 'text'
+                          },
+                         {'label': 'Channel',
+                          'value': self.channel_tag,
+                          'name': 'pushbullet_channel_tag',
+                          'description': 'A channel tag (optional).',
+                          'input_type': 'text'
+                          }
+                         ]
+
+        return config_option
+
+class PUSHALOT(object):
+
+    def __init__(self):
+        self.api_key = plexpy.CONFIG.PUSHALOT_APIKEY
+        self.on_play = plexpy.CONFIG.PUSHALOT_ON_PLAY
+        self.on_stop = plexpy.CONFIG.PUSHALOT_ON_STOP
+        self.on_watched = plexpy.CONFIG.PUSHALOT_ON_WATCHED
+
+    def notify(self, message, event):
+        if not message or not event:
+            return
+
+        pushalot_authorizationtoken = plexpy.CONFIG.PUSHALOT_APIKEY
+
+        logger.debug(u"Pushalot event: " + event)
+        logger.debug(u"Pushalot message: " + message)
+        logger.debug(u"Pushalot api: " + pushalot_authorizationtoken)
+
+        http_handler = HTTPSConnection("pushalot.com")
+
+        data = {'AuthorizationToken': pushalot_authorizationtoken,
+                'Title': event.encode('utf-8'),
+                'Body': message.encode("utf-8")}
+
+        http_handler.request("POST",
+                                "/api/sendmessage",
+                                headers={'Content-type': "application/x-www-form-urlencoded"},
+                                body=urlencode(data))
+        response = http_handler.getresponse()
+        request_status = response.status
+
+        logger.debug(u"Pushalot response status: %r" % request_status)
+        logger.debug(u"Pushalot response headers: %r" % response.getheaders())
+        logger.debug(u"Pushalot response body: %r" % response.read())
+
+        if request_status == 200:
+                logger.info(u"Pushalot notifications sent.")
+                return True
+        elif request_status == 410:
+                logger.info(u"Pushalot auth failed: %s" % response.reason)
+                return False
+        else:
+                logger.info(u"Pushalot notification failed.")
+                return False
+
+    def return_config_options(self):
+        config_option = [{'label': 'Pushalot API Key',
+                          'value': plexpy.CONFIG.PUSHALOT_APIKEY,
+                          'name': 'pushalot_apikey',
+                          'description': 'Your Pushalot API key.',
+                          'input_type': 'text'
+                          }
+                         ]
+
+        return config_option
+
+class PUSHOVER(object):
+
+    def __init__(self):
+        self.enabled = plexpy.CONFIG.PUSHOVER_ENABLED
+        self.keys = plexpy.CONFIG.PUSHOVER_KEYS
+        self.priority = plexpy.CONFIG.PUSHOVER_PRIORITY
+        self.sound = plexpy.CONFIG.PUSHOVER_SOUND
+        self.on_play = plexpy.CONFIG.PUSHOVER_ON_PLAY
+        self.on_stop = plexpy.CONFIG.PUSHOVER_ON_STOP
+        self.on_watched = plexpy.CONFIG.PUSHOVER_ON_WATCHED
+
+        if plexpy.CONFIG.PUSHOVER_APITOKEN:
+            self.application_token = plexpy.CONFIG.PUSHOVER_APITOKEN
+        else:
+            self.application_token = "aVny3NZFwZaXC642c831b4wd7KUhQS"
+
+    def conf(self, options):
+        return cherrypy.config['config'].get('Pushover', options)
+
+    def notify(self, message, event):
+        if not message or not event:
+            return
+
+        http_handler = HTTPSConnection("api.pushover.net")
+
+        data = {'token': self.application_token,
+                'user': plexpy.CONFIG.PUSHOVER_KEYS,
+                'title': event,
+                'message': message.encode("utf-8"),
+                'sound': plexpy.CONFIG.PUSHOVER_SOUND,
+                'priority': plexpy.CONFIG.PUSHOVER_PRIORITY}
+
+        http_handler.request("POST",
+                             "/1/messages.json",
+                             headers={'Content-type': "application/x-www-form-urlencoded"},
+                             body=urlencode(data))
+        response = http_handler.getresponse()
+        request_status = response.status
+        # logger.debug(u"Pushover response status: %r" % request_status)
+        # logger.debug(u"Pushover response headers: %r" % response.getheaders())
+        # logger.debug(u"Pushover response body: %r" % response.read())
+
+        if request_status == 200:
+                logger.info(u"Pushover notifications sent.")
+                return True
+        elif request_status >= 400 and request_status < 500:
+                logger.info(u"Pushover request failed: %s" % response.reason)
+                return False
+        else:
+                logger.info(u"Pushover notification failed.")
+                return False
+
+    def updateLibrary(self):
+        #For uniformity reasons not removed
+        return
+
+    def test(self, keys, priority, sound):
+        self.enabled = True
+        self.keys = keys
+        self.priority = priority
+        self.sound = sound
+
+        self.notify('Main Screen Activate', 'Test Message')
+
+    def get_sounds(self):
+        http_handler = HTTPSConnection("api.pushover.net")
+        http_handler.request("GET", "/1/sounds.json?token=" + self.application_token)
+        response = http_handler.getresponse()
+        request_status = response.status
+        
+        if request_status == 200:
+            data = json.loads(response.read())
+            sounds = data.get('sounds', {})
+            sounds.update({'': ''})
+            return sounds
+        elif request_status >= 400 and request_status < 500:
+            logger.info(u"Unable to retrieve Pushover notification sounds list: %s" % response.reason)
+            return {'': ''}
+        else:
+            logger.info(u"Unable to retrieve Pushover notification sounds list.")
+            return {'': ''}
+
+    def return_config_options(self):
+        config_option = [{'label': 'Pushover User Key',
+                          'value': self.keys,
+                          'name': 'pushover_keys',
+                          'description': 'Your Pushover user key.',
+                          'input_type': 'text'
+                          },
+                         {'label': 'Priority',
+                          'value': self.priority,
+                          'name': 'pushover_priority',
+                          'description': 'Set the priority.',
                           'input_type': 'select',
                           'select_options': {-2: -2, -1: -1, 0: 0, 1: 1, 2: 2}
                           },
-                         {'label': 'Include Subject Line',
-                          'value': self.config['incl_subject'],
-                          'name': 'join_incl_subject',
-                          'description': 'Include the subject line with the notifications.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Poster Image',
-                          'value': self.config['incl_poster'],
-                          'name': 'join_incl_poster',
-                          'description': 'Include a poster with the notifications.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" '
-                                         'data-target="notify_upload_posters">Image Hosting</a> '
-                                         'must be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Movie Link Source',
-                          'value': self.config['movie_provider'],
-                          'name': 'join_movie_provider',
-                          'description': 'Select the source for movie links in the notification. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
+                         {'label': 'Sound',
+                          'value': self.sound,
+                          'name': 'pushover_sound',
+                          'description': 'Set the notification sound. Leave blank for the default sound.',
                           'input_type': 'select',
-                          'select_options': PrettyMetadata().get_movie_providers()
+                          'select_options': self.get_sounds()
                           },
-                         {'label': 'TV Show Link Source',
-                          'value': self.config['tv_provider'],
-                          'name': 'join_tv_provider',
-                          'description': 'Select the source for tv show links in the notification. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_tv_providers()
-                          },
-                         {'label': 'Music Link Source',
-                          'value': self.config['music_provider'],
-                          'name': 'join_music_provider',
-                          'description': 'Select the source for music links in the notification. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_music_providers()
-                          }
-                         ]
-
-        return config_option
-
-
-class LUNASEA(Notifier):
-    """
-    LunaSea Notifications
-    """
-    NAME = 'LunaSea'
-    _DEFAULT_CONFIG = {'hook': '',
-                       'profile': '',
-                       'incl_subject': 1
-                       }
-
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        if self.config['incl_subject']:
-            text = subject + '\r\n' + body
-        else:
-            text = body
-
-        if self.config['profile']:
-            auth = HTTPBasicAuth(self.config['profile'], '')
-        else:
-            auth = None
-
-        pretty_metadata = PrettyMetadata(kwargs['parameters'])
-
-        payload = {
-            'action': action,
-            'data': {
-                'message': text,
-                'user': pretty_metadata.parameters.get('user'),
-                'user_id': pretty_metadata.parameters.get('user_id'),
-                'player': pretty_metadata.parameters.get('player'),
-                'title': pretty_metadata.get_title(),
-                'poster_url': pretty_metadata.get_poster_url(),
-                'session_key': pretty_metadata.parameters.get('session_key'),
-                'session_id': pretty_metadata.parameters.get('session_id'),
-                'user_streams': pretty_metadata.parameters.get('user_streams'),
-                'remote_access_reason': pretty_metadata.parameters.get('remote_access_reason'),
-                'update_version': pretty_metadata.parameters.get('update_version'),
-                'tautulli_update_version': pretty_metadata.parameters.get('tautulli_update_version')
-            }
-        }
-
-        return self.make_request(self.config['hook'], json=payload, auth=auth)
-
-    def _return_config_options(self):
-        config_option = [{'label': 'LunaSea Webhook URL',
-                          'value': self.config['hook'],
-                          'name': 'lunasea_hook',
-                          'description': 'Your LunaSea device-based or user-based webhook URL.',
-                          'input_type': 'token'
-                          },
-                         {'label': 'LunaSea Profile',
-                          'value': self.config['profile'],
-                          'name': 'lunasea_profile',
-                          'description': 'Your LunaSea profile name. Leave blank for the default profile.',
+                         {'label': 'Pushover API Token',
+                          'value': plexpy.CONFIG.PUSHOVER_APITOKEN,
+                          'name': 'pushover_apitoken',
+                          'description': 'Your Pushover API token. Leave blank to use PlexPy default.',
                           'input_type': 'text'
-                          },
-                         {'label': 'Include Subject Line',
-                          'value': self.config['incl_subject'],
-                          'name': 'lunasea_incl_subject',
-                          'description': 'Include the subject line with the notifications.',
-                          'input_type': 'checkbox'
                           }
                          ]
 
         return config_option
 
+class TwitterNotifier(object):
 
-class MICROSOFTTEAMS(Notifier):
-    """
-    Microsoft Teams Notifications
-    """
-    NAME = 'Microsoft Teams'
-    _DEFAULT_CONFIG = {'hook': '',
-                       'incl_subject': 1,
-                       'incl_card': 0,
-                       'incl_description': 1,
-                       'incl_pmslink': 0,
-                       'poster_size': 2,
-                       'movie_provider': '',
-                       'tv_provider': '',
-                       'music_provider': ''
-                       }
+    REQUEST_TOKEN_URL = 'https://api.twitter.com/oauth/request_token'
+    ACCESS_TOKEN_URL = 'https://api.twitter.com/oauth/access_token'
+    AUTHORIZATION_URL = 'https://api.twitter.com/oauth/authorize'
+    SIGNIN_URL = 'https://api.twitter.com/oauth/authenticate'
 
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        data = {
-            'type': 'message'
-        }
-        attachment = {
-            'contentType': 'application/vnd.microsoft.card.adaptive'
-        }
-        content = {
-            '$schema': 'http://adaptivecards.io/schemas/adaptive-card.json',
-            'type': 'AdaptiveCard',
-            'version': '1.4',
-        }
+    def __init__(self):
+        self.consumer_key = "2LdJKXHDUwJtjYBsdwJisIOsh"
+        self.consumer_secret = "QWbUcZzAIiL4zbDCIhy2EdUkV8yEEav3qMdo5y3FugxCFelWrA"
 
-        card = []
-
-        if self.config['incl_subject']:
-            card.append({
-                'type': 'TextBlock',
-                'size': 'Large',
-                'weight': 'Bolder',
-                'text': subject
-            })
-        card.append({
-            'type': 'TextBlock',
-            'text': body,
-            'wrap': True
-        })
-
-        if self.config['incl_card'] and kwargs.get('parameters', {}).get('media_type'):
-            # Grab formatted metadata
-            pretty_metadata = PrettyMetadata(kwargs['parameters'])
-
-            if pretty_metadata.media_type == 'movie':
-                provider = self.config['movie_provider']
-            elif pretty_metadata.media_type in ('show', 'season', 'episode'):
-                provider = self.config['tv_provider']
-            elif pretty_metadata.media_type in ('artist', 'album', 'track'):
-                provider = self.config['music_provider']
-            else:
-                provider = None
-
-            poster_url = pretty_metadata.get_poster_url()
-            provider_name = pretty_metadata.get_provider_name(provider)
-            provider_link = pretty_metadata.get_provider_link(provider)
-            title = pretty_metadata.get_title('\u00B7')
-            description = pretty_metadata.get_description()
-            plex_url = pretty_metadata.get_plex_url()
-
-            columns = []
-
-            if poster_url and self.config['poster_size']:
-                columns.append({
-                    'type': 'Column',
-                    'width': 'auto',
-                    'items': [
-                        {
-                            'type': 'Image',
-                            'url': poster_url,
-                            'altText': title,
-                            'size': 'Large',
-                            'height': '{}px'.format(self.config['poster_size'] * 75)
-                        }
-                    ]
-                })
-            columns.append({
-                'type': 'Column',
-                'width': 'stretch',
-                'items': []
-            })
-
-            columns[-1]['items'].append({
-                'type': 'TextBlock',
-                'weight': 'Bolder',
-                'text': title,
-                'wrap': True
-            })
-            if self.config['incl_description']:
-                columns[-1]['items'].append({
-                    'type': 'TextBlock',
-                    'text': description,
-                    'size': 'Small',
-                    'spacing': 'Small',
-                    'wrap': True
-                })
-
-            card.append({
-                'type': 'ColumnSet',
-                'padding': 'Default',
-                'spacing': 'Large',
-                'columns': columns
-            })
-
-            actions = []
-
-            if provider_link:
-                actions.append({
-                    'type': 'Action.OpenUrl',
-                    'title': 'View on {}'.format(provider_name),
-                    'url': provider_link
-                })
-            if self.config['incl_pmslink']:
-                actions.append({
-                    'type': 'Action.OpenUrl',
-                    'title': 'View on Plex',
-                    'url': plex_url
-                })
-
-            if actions:
-                card.append({
-                    'type': 'ActionSet',
-                    'actions': actions
-                })
-
-        content['body'] = card
-        attachment['content'] = content
-        data['attachments'] = [attachment]
-
-        headers = {'Content-type': 'application/json'}
-
-        return self.make_request(self.config['hook'], headers=headers, json=data)
-
-    def _return_config_options(self):
-        config_option = [{'label': 'Teams Webhook URL',
-                          'value': self.config['hook'],
-                          'name': 'microsoftteams_hook',
-                          'description': 'Your Microsoft Teams incoming webhook URL.',
-                          'input_type': 'token'
-                          },
-                         {'label': 'Include Subject Line',
-                          'value': self.config['incl_subject'],
-                          'name': 'microsoftteams_incl_subject',
-                          'description': 'Include the subject line with the notifications.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Rich Metadata Info',
-                          'value': self.config['incl_card'],
-                          'name': 'microsoftteams_incl_card',
-                          'description': 'Include an info card with a poster and metadata with the notifications.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" '
-                                         'data-target="notify_upload_posters">Image Hosting</a> '
-                                         'must be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Summary',
-                          'value': self.config['incl_description'],
-                          'name': 'microsoftteams_incl_description',
-                          'description': 'Include a summary for the media on the info card.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Link to Plex Web',
-                          'value': self.config['incl_pmslink'],
-                          'name': 'microsoftteams_incl_pmslink',
-                          'description': 'Include a second link to the media in Plex Web on the info card.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Poster Size',
-                          'value': self.config['poster_size'],
-                          'name': 'microsoftteams_poster_size',
-                          'description': 'Select the size of the poster on the info card.',
-                          'input_type': 'select',
-                          'select_options': {
-                              0: 'None',
-                              1: 'Small',
-                              2: 'Medium',
-                              3: 'Large'}
-                          },
-                         {'label': 'Movie Link Source',
-                          'value': self.config['movie_provider'],
-                          'name': 'microsoftteams_movie_provider',
-                          'description': 'Select the source for movie links on the info cards. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_movie_providers()
-                          },
-                         {'label': 'TV Show Link Source',
-                          'value': self.config['tv_provider'],
-                          'name': 'microsoftteams_tv_provider',
-                          'description': 'Select the source for tv show links on the info cards. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_tv_providers()
-                          },
-                         {'label': 'Music Link Source',
-                          'value': self.config['music_provider'],
-                          'name': 'microsoftteams_music_provider',
-                          'description': 'Select the source for music links on the info cards. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_music_providers()
-                          }
-                         ]
-
-        return config_option
-
-
-class MQTT(Notifier):
-    """
-    MQTT notifications
-    """
-    NAME = 'MQTT'
-    _DEFAULT_CONFIG = {'broker': '',
-                       'port': 1883,
-                       'protocol': 'MQTTv311',
-                       'username': '',
-                       'password': '',
-                       'clientid': 'tautulli',
-                       'topic': '',
-                       'qos': 1,
-                       'retain': 0,
-                       'keep_alive': 60,
-                       'as_json': 0
-                       }
-
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        topic = self.config['topic']
-        if not topic:
-            logger.error("Tautulli Notifiers :: MQTT topic not specified.")
+    def notify(self, subject, message):
+        if not subject or not message:
             return
+        else:
+            self._send_tweet(subject + ': ' + message)
 
-        topic = topic.format(**kwargs.get('parameters', {}))
+    def test_notify(self):
+        return self._send_tweet("This is a test notification from PlexPy at " + helpers.now())
 
-        if self.config['as_json']:
-            subject = json.loads(subject)
-            body = json.loads(body)
+    def _get_authorization(self):
 
-        data = {'subject': subject,
-                'body': body,
-                'topic': topic}
+        oauth_consumer = oauth.Consumer(key=self.consumer_key, secret=self.consumer_secret)
+        oauth_client = oauth.Client(oauth_consumer)
 
-        auth = {}
-        if self.config['username']:
-            auth['username'] = self.config['username']
-        if self.config['password']:
-            auth['password'] = self.config['password']
+        logger.info('Requesting temp token from Twitter')
 
-        protocol = getattr(paho.mqtt.client, self.config['protocol'])
+        resp, content = oauth_client.request(self.REQUEST_TOKEN_URL, 'GET')
 
-        logger.info("Tautulli Notifiers :: Sending {name} notification...".format(name=self.NAME))
+        if resp['status'] != '200':
+            logger.info('Invalid respond from Twitter requesting temp token: %s' % resp['status'])
+        else:
+            request_token = dict(parse_qsl(content))
 
-        paho.mqtt.publish.single(
-            topic, payload=json.dumps(data), qos=self.config['qos'], retain=bool(self.config['retain']),
-            hostname=self.config['broker'], port=self.config['port'], client_id=self.config['clientid'],
-            keepalive=self.config['keep_alive'], auth=auth or None, protocol=protocol
-        )
+            plexpy.CONFIG.TWITTER_USERNAME = request_token['oauth_token']
+            plexpy.CONFIG.TWITTER_PASSWORD = request_token['oauth_token_secret']
 
-        logger.info("Tautulli Notifiers :: {name} notification sent.".format(name=self.NAME))
+            return self.AUTHORIZATION_URL + "?oauth_token=" + request_token['oauth_token']
+
+    def _get_credentials(self, key):
+        request_token = {}
+
+        request_token['oauth_token'] = plexpy.CONFIG.TWITTER_USERNAME
+        request_token['oauth_token_secret'] = plexpy.CONFIG.TWITTER_PASSWORD
+        request_token['oauth_callback_confirmed'] = 'true'
+
+        token = oauth.Token(request_token['oauth_token'], request_token['oauth_token_secret'])
+        token.set_verifier(key)
+
+        logger.info('Generating and signing request for an access token using key ' + key)
+
+        oauth_consumer = oauth.Consumer(key=self.consumer_key, secret=self.consumer_secret)
+        # logger.debug('oauth_consumer: ' + str(oauth_consumer))
+        oauth_client = oauth.Client(oauth_consumer, token)
+        logger.info('oauth_client: ' + str(oauth_client))
+        resp, content = oauth_client.request(self.ACCESS_TOKEN_URL, method='POST', body='oauth_verifier=%s' % key)
+        logger.info('resp, content: ' + str(resp) + ',' + str(content))
+
+        access_token = dict(parse_qsl(content))
+        logger.info('access_token: ' + str(access_token))
+
+        logger.info('resp[status] = ' + str(resp['status']))
+        if resp['status'] != '200':
+            logger.info('The request for a token with did not succeed: ' + str(resp['status']), logger.ERROR)
+            return False
+        else:
+            logger.info('Your Twitter Access Token key: %s' % access_token['oauth_token'])
+            logger.info('Access Token secret: %s' % access_token['oauth_token_secret'])
+            plexpy.CONFIG.TWITTER_USERNAME = access_token['oauth_token']
+            plexpy.CONFIG.TWITTER_PASSWORD = access_token['oauth_token_secret']
+            return True
+
+    def _send_tweet(self, message=None):
+        username = self.consumer_key
+        password = self.consumer_secret
+        access_token_key = plexpy.CONFIG.TWITTER_USERNAME
+        access_token_secret = plexpy.CONFIG.TWITTER_PASSWORD
+
+        logger.info(u"Sending tweet: " + message)
+
+        api = twitter.Api(username, password, access_token_key, access_token_secret)
+
+        try:
+            api.PostUpdate(message)
+        except Exception as e:
+            logger.info(u"Error Sending Tweet: %s" % e)
+            return False
 
         return True
 
-    def _return_config_options(self):
-        config_option = [{'label': 'Broker',
-                          'value': self.config['broker'],
-                          'name': 'mqtt_broker',
-                          'description': 'The hostname or IP address of the MQTT broker.',
-                          'input_type': 'text'
+    def return_config_options(self):
+        config_option = [{'label': 'Request Authorisation',
+                          'value': 'Request Authorisation',
+                          'name': 'twitterStep1',
+                          'description': 'Step 1: Click Request button above. (Ensure you allow the browser pop-up).',
+                          'input_type': 'button'
                           },
-                         {'label': 'Port',
-                          'value': self.config['port'],
-                          'name': 'mqtt_port',
-                          'description': 'The network port for connecting to the MQTT broker.',
-                          'input_type': 'number'
+                          {'label': 'Authorisation Key',
+                           'value': '',
+                           'name': 'twitter_key',
+                           'description': 'Step 2: Input the authorisation key you received from Step 1.',
+                           'input_type': 'text'
                           },
-                         {'label': 'Protocol',
-                          'value': self.config['protocol'],
-                          'name': 'mqtt_protocol',
-                          'description': 'The MQTT protocol version.',
-                          'input_type': 'select',
-                          'select_options': {'MQTTv31': '3.1',
-                                             'MQTTv311': '3.1.1',
-                                             'MQTTv5': '5.0'
-                                             }
+                          {'label': 'Verify Key',
+                           'value': 'Verify Key',
+                           'name': 'twitterStep2',
+                           'description': 'Step 3: Verify the key.',
+                           'input_type': 'button'
                           },
-                         {'label': 'Client ID',
-                          'value': self.config['clientid'],
-                          'name': 'mqtt_clientid',
-                          'description': 'The client ID for connecting to the MQTT broker.',
-                          'input_type': 'text'
+                          {'label': 'Test Twitter',
+                           'value': 'Test Twitter',
+                           'name': 'testTwitter',
+                           'description': 'Test if Twitter notifications are working. See logs for troubleshooting.',
+                           'input_type': 'button'
                           },
-                         {'label': 'Username',
-                          'value': self.config['username'],
-                          'name': 'mqtt_username',
-                          'description': 'The username to authenticate with the MQTT broker.',
-                          'input_type': 'text'
-                          },
-                         {'label': 'Password',
-                          'value': self.config['password'],
-                          'name': 'mqtt_password',
-                          'description': 'The password to authenticate with the MQTT broker.',
-                          'input_type': 'password'
-                          },
-                         {'label': 'Topic',
-                          'value': self.config['topic'],
-                          'name': 'mqtt_topic',
-                          'description': 'The topic to publish notifications to. You can include'
-                                         ' <a href="#notify-text-sub-modal" data-toggle="modal">notification parameters</a>'
-                                         ' to be substituted.',
-                          'input_type': 'text'
-                          },
-                         {'label': 'Quality of Service',
-                          'value': self.config['qos'],
-                          'name': 'mqtt_qos',
-                          'description': 'The quality of service level to use when publishing the notification.',
-                          'input_type': 'select',
-                          'select_options': {0: 0,
-                                             1: 1,
-                                             2: 2
-                                             }
-                          },
-                         {'label': 'Retain Message',
-                          'value': self.config['retain'],
-                          'name': 'mqtt_retain',
-                          'description': 'Set the message to be retained on the MQTT broker.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Keep-Alive',
-                          'value': self.config['keep_alive'],
-                          'name': 'mqtt_keep_alive',
-                          'description': 'Maximum period in seconds before timing out the connection with the broker.',
-                          'input_type': 'number'
-                          },
-                         {'label': 'Send Message as JSON',
-                          'value': self.config['as_json'],
-                          'name': 'mqtt_as_json',
-                          'description': 'Parse and send the subject and body as JSON instead of as a raw string.',
-                          'input_type': 'checkbox'
-                          },
-                         ]
-
-        return config_option
-
-
-class NTFY(Notifier):
-    """
-    ntfy notifications
-    """
-    NAME = 'ntfy'
-    _DEFAULT_CONFIG = {'host': '',
-                       'access_token': '',
-                       'topic': '',
-                       'priority': 'default',
-                       'incl_subject': 1,
-                       'incl_description': 1,
-                       'incl_poster': 0,
-                       'incl_url': 0,
-                       'incl_pmslink': 0,
-                       'movie_provider': '',
-                       'tv_provider': '',
-                       'music_provider': ''
-                       }
-
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        method = "POST"
-        url = f"{self.config['host']}/{self.config['topic']}"
-        params = {}
-        data = body.encode('utf-8')
-        headers = {
-            'Priority': self.config['priority'],
-            'Authorization': f'Bearer {self.config["access_token"]}',
-            'Icon': 'https://tautulli.com/images/favicon.ico'
-        }
-
-        # Add optional subject
-        if self.config['incl_subject']:
-            headers['Title'] = subject.encode('utf-8')
-
-        # Add optional parameters (dependent on notification type + metadata extraction)
-        if kwargs.get('parameters', {}).get('media_type'):
-            # Grab formatted metadata
-            pretty_metadata = PrettyMetadata(kwargs['parameters'])
-
-            # Add optional description
-            if self.config['incl_description']:
-                description = pretty_metadata.get_description()
-                if description:
-                    data += f"\n\n{description}".encode('utf-8')
-
-            # Add optional poster
-            if self.config['incl_poster']:
-                method = "PUT"  # Need to use PUT instead of POST to send attachments
-                image_file_name, image_content, image_file_type = pretty_metadata.get_image()
-
-                if image_file_name and image_content:
-                    # Image data will take up "data", message content needs to shift to the "message" query parameter
-                    params['message'] = data
-                    data = image_content
-                    headers['Filename'] = image_file_name
-                else:
-                    # Fallback to default Tautulli media type poster
-                    # Can keep message content in "data" payload and just add a header for the attachment
-                    poster_url = pretty_metadata.get_poster_url()
-                    headers['Attach'] = poster_url
-
-            # Add optional links (actions)
-            actions = []
-
-            if self.config['incl_url']:
-                if pretty_metadata.media_type == 'movie':
-                    provider = self.config['movie_provider']
-                elif pretty_metadata.media_type in ('show', 'season', 'episode'):
-                    provider = self.config['tv_provider']
-                elif pretty_metadata.media_type in ('artist', 'album', 'track'):
-                    provider = self.config['music_provider']
-                else:
-                    provider = None
-
-                provider_name = pretty_metadata.get_provider_name(provider)
-                provider_link = pretty_metadata.get_provider_link(provider)
-                if provider_link:
-                    actions.append(f"view, View on {provider_name}, {provider_link}, clear=true")
-
-            if self.config['incl_pmslink']:
-                plex_url = pretty_metadata.get_plex_url()
-                actions.append(f"view, View on Plex, {plex_url}, clear=true")
-
-            if actions:
-                headers['Actions'] = ';'.join(actions)
-
-        return self.make_request(url=url, method=method, headers=headers, params=params, data=data)
-
-    def _return_config_options(self):
-        config_option = [{'label': 'ntfy Host Address',
-                          'value': self.config['host'],
-                          'name': 'ntfy_host',
-                          'description': 'Host running ntfy (e.g. http://localhost:80).',
-                          'input_type': 'text'
-                          },
-                         {'label': 'ntfy Access Token',
-                          'value': self.config['access_token'],
-                          'name': 'ntfy_access_token',
-                          'description': 'Your ntfy access token.',
-                          'input_type': 'token'
-                          },
-                         {'label': 'ntfy Topic',
-                          'value': self.config['topic'],
-                          'name': 'ntfy_topic',
-                          'description': 'The topic to publish notifications to.',
-                          'input_type': 'text'
-                          },
-                         {'label': 'Priority',
-                          'value': self.config['priority'],
-                          'name': 'ntfy_priority',
-                          'description': 'Set the notification priority.',
-                          'input_type': 'select',
-                          'select_options': {
-                              'min': 1,
-                              'low': 2,
-                              'default': 3,
-                              'high': 4,
-                              'max': 5
-                          }
-                          },
-                         {'label': 'Include Subject Line',
-                          'value': self.config['incl_subject'],
-                          'name': 'ntfy_incl_subject',
-                          'description': 'Include a subject line in the notification.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Poster Image',
-                          'value': self.config['incl_poster'],
-                          'name': 'ntfy_incl_poster',
-                          'description': 'Include a poster of the media item in the notification.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Summary',
-                          'value': self.config['incl_description'],
-                          'name': 'ntfy_incl_description',
-                          'description': 'Include a summary of the media item in the notification.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Link to Metadata Provider',
-                          'value': self.config['incl_url'],
-                          'name': 'ntfy_incl_url',
-                          'description': 'Include a link to the media item on the metadata provider in the notification.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Link to Plex Web',
-                          'value': self.config['incl_pmslink'],
-                          'name': 'ntfy_incl_pmslink',
-                          'description': 'Include a link to the media item in Plex Web in the notification.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Movie Link Source',
-                          'value': self.config['movie_provider'],
-                          'name': 'ntfy_movie_provider',
-                          'description': 'Select the source for movie links in the notification. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_movie_providers()
-                          },
-                         {'label': 'TV Show Link Source',
-                          'value': self.config['tv_provider'],
-                          'name': 'ntfy_tv_provider',
-                          'description': 'Select the source for TV show links in the notification. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_tv_providers()
-                          },
-                         {'label': 'Music Link Source',
-                          'value': self.config['music_provider'],
-                          'name': 'ntfy_music_provider',
-                          'description': 'Select the source for music links in the notification. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_music_providers()
+                          {'input_type': 'nosave'
                           }
                          ]
 
         return config_option
 
+class OSX_NOTIFY(object):
 
-class OSX(Notifier):
-    """
-    macOS notifications
-    """
-    NAME = 'macOS'
-    _DEFAULT_CONFIG = {'notify_app': '/Applications/Tautulli'
-                       }
-
-    def __init__(self, config=None):
-        super(OSX, self).__init__(config=config)
-
+    def __init__(self):
+        self.on_play = plexpy.CONFIG.OSX_NOTIFY_ON_PLAY
+        self.on_stop = plexpy.CONFIG.OSX_NOTIFY_ON_STOP
+        self.on_watched = plexpy.CONFIG.OSX_NOTIFY_ON_WATCHED
         try:
             self.objc = __import__("objc")
             self.AppKit = __import__("AppKit")
         except:
-            # logger.error("Tautulli Notifiers :: Cannot load OSX Notifications agent.")
+            #logger.error(u"PlexPy Notifier :: Cannot load OSX Notifications agent.")
             pass
 
     def validate(self):
@@ -2799,28 +1096,21 @@ class OSX(Notifier):
         except:
             return False
 
-    def _swizzle(self, cls, SEL, func):
+    def swizzle(self, cls, SEL, func):
         old_IMP = cls.instanceMethodForSelector_(SEL)
 
         def wrapper(self, *args, **kwargs):
             return func(self, old_IMP, *args, **kwargs)
         new_IMP = self.objc.selector(wrapper, selector=old_IMP.selector,
-                                     signature=old_IMP.signature)
+            signature=old_IMP.signature)
         self.objc.classAddMethod(cls, SEL, new_IMP)
 
-    def _swizzled_bundleIdentifier(self, original, swizzled):
-        return 'ade.tautulli.osxnotify'
-
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-
-        subtitle = kwargs.get('subtitle', '')
-        sound = kwargs.get('sound', '')
-        image = kwargs.get('image', '')
+    def notify(self, title, subtitle=None, text=None, sound=True, image=None):
 
         try:
-            self._swizzle(self.objc.lookUpClass('NSBundle'),
+            self.swizzle(self.objc.lookUpClass('NSBundle'),
                 b'bundleIdentifier',
-                self._swizzled_bundleIdentifier)
+                self.swizzled_bundleIdentifier)
 
             NSUserNotification = self.objc.lookUpClass('NSUserNotification')
             NSUserNotificationCenter = self.objc.lookUpClass('NSUserNotificationCenter')
@@ -2832,1878 +1122,201 @@ class OSX(Notifier):
             pool = NSAutoreleasePool.alloc().init()
 
             notification = NSUserNotification.alloc().init()
-            notification.setTitle_(subject)
+            notification.setTitle_(title)
             if subtitle:
                 notification.setSubtitle_(subtitle)
-            if body:
-                notification.setInformativeText_(body)
+            if text:
+                notification.setInformativeText_(text)
             if sound:
                 notification.setSoundName_("NSUserNotificationDefaultSoundName")
             if image:
                 source_img = self.AppKit.NSImage.alloc().initByReferencingFile_(image)
                 notification.setContentImage_(source_img)
-                # notification.set_identityImage_(source_img)
+                #notification.set_identityImage_(source_img)
             notification.setHasActionButton_(False)
 
             notification_center = NSUserNotificationCenter.defaultUserNotificationCenter()
             notification_center.deliverNotification_(notification)
-            logger.info("Tautulli Notifiers :: {name} notification sent.".format(name=self.NAME))
+            logger.info(u"OSX Notify notifications sent.")
 
             del pool
             return True
 
         except Exception as e:
-            logger.error("Tautulli Notifiers :: {name} failed: {e}".format(name=self.NAME, e=e))
+            logger.warn('Error sending OS X Notification: %s' % e)
             return False
 
-    def _return_config_options(self):
+    def swizzled_bundleIdentifier(self, original, swizzled):
+        return 'ade.plexpy.osxnotify'
+
+    def return_config_options(self):
         config_option = [{'label': 'Register Notify App',
-                          'value': self.config['notify_app'],
+                          'value': plexpy.CONFIG.OSX_NOTIFY_APP,
                           'name': 'osx_notify_app',
-                          'description': 'Enter the path/application name to be registered with the Notification Center. '
-                                         'Default is <span class="inline-pre">/Applications/Tautulli</span>.',
-                          'input_type': 'text'
-                          },
-                         {'label': 'Register App',
-                          'value': 'Register App',
-                          'name': 'osx_notify_register',
-                          'description': 'Register Tautulli with the Notification Center.',
-                          'input_type': 'button'
-                          }
-                         ]
-
-        return config_option
-
-
-class PLEX(Notifier):
-    """
-    Plex Home Theater notifications
-    """
-    NAME = 'Plex Home Theater'
-    _DEFAULT_CONFIG = {'hosts': '',
-                       'username': '',
-                       'password': '',
-                       'display_time': 5,
-                       'image': ''
-                       }
-
-    def _sendhttp(self, host, command):
-        url_command = urlencode(command)
-        url = host + '/xbmcCmds/xbmcHttp/?' + url_command
-
-        if self.config['password']:
-            return request.request_content(url, auth=(self.config['username'], self.config['password']))
-        else:
-            return request.request_content(url)
-
-    def _sendjson(self, host, method, params=None):
-        params = params or {}
-        data = [{'id': 0, 'jsonrpc': '2.0', 'method': method, 'params': params}]
-        headers = {'Content-Type': 'application/json'}
-        url = host + '/jsonrpc'
-
-        if self.config['password']:
-            response = request.request_json(url, method="post", data=json.dumps(data), headers=headers,
-                                            auth=(self.config['username'], self.config['password']))
-        else:
-            response = request.request_json(url, method="post", data=json.dumps(data), headers=headers)
-
-        if response:
-            return response[0]['result']
-
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        hosts = [x.strip() for x in self.config['hosts'].split(',')]
-
-        if self.config['display_time'] > 0:
-            display_time = 1000 * self.config['display_time']  # in ms
-        else:
-            display_time = 5000
-
-        if self.config['image']:
-            image = self.config['image']
-        else:
-            image = os.path.join(plexpy.DATA_DIR, os.path.abspath("data/interfaces/default/images/logo-circle.png"))
-
-        for host in hosts:
-            logger.info("Tautulli Notifiers :: Sending notification command to {name} @ {host}".format(name=self.NAME, host=host))
-            try:
-                version = self._sendjson(host, 'Application.GetProperties', {'properties': ['version']})['version']['major']
-
-                if version < 12:  # Eden
-                    notification = subject + "," + body + "," + str(display_time)
-                    notifycommand = {'command': 'ExecBuiltIn', 'parameter': 'Notification(' + notification + ')'}
-                    request = self._sendhttp(host, notifycommand)
-
-                else:  # Frodo
-                    params = {'title': subject, 'message': body, 'displaytime': display_time, 'image': image}
-                    request = self._sendjson(host, 'GUI.ShowNotification', params)
-
-                if not request:
-                    raise Exception
-                else:
-                    logger.info("Tautulli Notifiers :: {name} notification sent.".format(name=self.NAME))
-
-            except Exception as e:
-                logger.error("Tautulli Notifiers :: {name} notification failed: {e}".format(name=self.NAME, e=e))
-                return False
-
-        return True
-
-    def _return_config_options(self):
-        config_option = [{'label': 'Plex Home Theater Host Address',
-                          'value': self.config['hosts'],
-                          'name': 'plex_hosts',
-                          'description': 'Host running Plex Home Theater (eg. http://localhost:3005). Separate multiple hosts with commas (,).',
-                          'input_type': 'text'
-                          },
-                         {'label': 'Plex Home Theater Username',
-                          'value': self.config['username'],
-                          'name': 'plex_username',
-                          'description': 'Username of your Plex Home Theater client API (blank for none).',
-                          'input_type': 'text'
-                          },
-                         {'label': 'Plex Home Theater Password',
-                          'value': self.config['password'],
-                          'name': 'plex_password',
-                          'description': 'Password of your Plex Home Theater client API (blank for none).',
-                          'input_type': 'password'
-                          },
-                         {'label': 'Notification Duration',
-                          'value': self.config['display_time'],
-                          'name': 'plex_display_time',
-                          'description': 'The duration (in seconds) for the notification to stay on screen.',
-                          'input_type': 'number'
-                          },
-                         {'label': 'Notification Icon',
-                          'value': self.config['image'],
-                          'name': 'plex_image',
-                          'description': 'Full path or URL to an image to display with the notification. Leave blank for the default.',
+                          'description': 'Enter the path/application name to be registered with the '
+                                         'Notification Center, default is /Applications/PlexPy.',
                           'input_type': 'text'
                           }
                          ]
 
         return config_option
 
+class BOXCAR(object):
 
-class PLEXMOBILEAPP(Notifier):
-    """
-    Plex Mobile App Notifications
-    """
-    NAME = 'Plex Android / iOS App'
-    NOTIFICATION_URL = 'https://notifications.plex.tv/api/v1/notifications'
-    _DEFAULT_CONFIG = {'user_ids': [],
-                       'tap_action': 'preplay',
-                       }
+    def __init__(self):
+        self.url = 'https://new.boxcar.io/api/notifications'
+        self.token = plexpy.CONFIG.BOXCAR_TOKEN
+        self.sound = plexpy.CONFIG.BOXCAR_SOUND
+        self.on_play = plexpy.CONFIG.BOXCAR_ON_PLAY
+        self.on_stop = plexpy.CONFIG.BOXCAR_ON_STOP
+        self.on_watched = plexpy.CONFIG.BOXCAR_ON_WATCHED
 
-    def __init__(self, config=None):
-        super(PLEXMOBILEAPP, self).__init__(config=config)
-
-        self.configurations = {
-            'created': {'group': 'media', 'identifier': 'tv.plex.notification.library.new'},
-            'play': {'group': 'media', 'identifier': 'tv.plex.notification.playback.started'},
-            'newdevice': {'group': 'admin', 'identifier': 'tv.plex.notification.device.new'}
-        }
-
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        if action not in self.configurations and not action.startswith('test'):
-            logger.error(u"Tautulli Notifiers :: Notification action %s not allowed for %s." % (action, self.NAME))
+    def notify(self, title, message):
+        if not title or not message:
             return
 
-        if action == 'test':
-            tests = []
-            for configuration in self.configurations:
-                tests.append(self.agent_notify(subject=subject, body=body, action='test_'+configuration))
-            return all(tests)
+        try:
+            data = urllib.urlencode({
+                'user_credentials': plexpy.CONFIG.BOXCAR_TOKEN,
+                'notification[title]': title.encode('utf-8'),
+                'notification[long_message]': message.encode('utf-8'),
+                'notification[sound]': plexpy.CONFIG.BOXCAR_SOUND
+                })
 
-        configuration_action = action.split('test_')[-1]
+            req = urllib2.Request(self.url)
+            handle = urllib2.urlopen(req, data)
+            handle.close()
+            return True
 
-        # No subject to always show up regardless of client selected filters
-        # icon can be info, warning, or error
-        # play = true to start playing when tapping the notification
-        # Send the minimal amount of data necessary through Plex servers
-        data = {
-            'group': self.configurations[configuration_action]['group'],
-            'identifier': self.configurations[configuration_action]['identifier'],
-            'to': self.config['user_ids'],
-            'data': {
-                'provider': {
-                    'identifier': plexpy.CONFIG.PMS_IDENTIFIER,
-                    'title': helpers.pms_name()
-                }
-            }
-        }
+        except urllib2.URLError as e:
+            logger.warn('Error sending Boxcar2 Notification: %s' % e)
+            return False
 
-        pretty_metadata = PrettyMetadata(kwargs.get('parameters'))
-
-        if action.startswith('test'):
-            data['data']['player'] = {
-                'title': 'Device',
-                'platform': 'Platform',
-                'machineIdentifier': 'Tautulli'
-            }
-            data['data']['user'] = {
-                'title': 'User',
-                'id': 0
-            }
-            data['metadata'] = {
-                'type': 'movie',
-                'title': subject,
-                'year': body
-            }
-
-        elif action in ('play', 'newdevice'):
-            data['data']['player'] = {
-                'title': pretty_metadata.parameters['player'],
-                'platform': pretty_metadata.parameters['platform'],
-                'machineIdentifier': pretty_metadata.parameters['machine_id']
-            }
-            data['data']['user'] = {
-                'title': pretty_metadata.parameters['user'],
-                'id': pretty_metadata.parameters['user_id'],
-                'thumb': pretty_metadata.parameters['user_thumb'],
-            }
-
-        elif action == 'created':
-            # No addition data required for recently added
-            pass
-
-        else:
-            logger.error(u"Tautulli Notifiers :: Notification action %s not supported for %s." % (action, self.NAME))
-            return
-
-        if data['group'] == 'media' and not action.startswith('test'):
-            media_type = pretty_metadata.media_type
-            uri_rating_key = None
-
-            if media_type == 'movie':
-                metadata = {
-                    'type': media_type,
-                    'title': pretty_metadata.parameters['title'],
-                    'year': pretty_metadata.parameters['year'],
-                    'thumb': pretty_metadata.parameters['thumb']
-                }
-            elif media_type == 'show':
-                metadata = {
-                    'type': media_type,
-                    'title': pretty_metadata.parameters['show_name'],
-                    'thumb': pretty_metadata.parameters['thumb']
-                }
-            elif media_type == 'season':
-                metadata = {
-                    'type': 'show',
-                    'title': pretty_metadata.parameters['show_name'],
-                    'thumb': pretty_metadata.parameters['thumb'],
-                }
-                data['data']['count'] = pretty_metadata.parameters['episode_count']
-            elif media_type == 'episode':
-                metadata = {
-                    'type': media_type,
-                    'title': pretty_metadata.parameters['episode_name'],
-                    'grandparentTitle': pretty_metadata.parameters['show_name'],
-                    'index': pretty_metadata.parameters['episode_num'],
-                    'parentIndex': pretty_metadata.parameters['season_num'],
-                    'grandparentThumb': pretty_metadata.parameters['grandparent_thumb']
-                }
-            elif media_type == 'artist':
-                metadata = {
-                    'type': media_type,
-                    'title': pretty_metadata.parameters['artist_name'],
-                    'thumb': pretty_metadata.parameters['thumb']
-                }
-            elif media_type == 'album':
-                metadata = {
-                    'type': media_type,
-                    'title': pretty_metadata.parameters['album_name'],
-                    'year': pretty_metadata.parameters['year'],
-                    'parentTitle': pretty_metadata.parameters['artist_name'],
-                    'thumb': pretty_metadata.parameters['thumb'],
-                }
-            elif media_type == 'track':
-                metadata = {
-                    'type': 'album',
-                    'title': pretty_metadata.parameters['album_name'],
-                    'year': pretty_metadata.parameters['year'],
-                    'parentTitle': pretty_metadata.parameters['artist_name'],
-                    'thumb': pretty_metadata.parameters['parent_thumb']
-                }
-                uri_rating_key = pretty_metadata.parameters['parent_rating_key']
-            else:
-                logger.error(u"Tautulli Notifiers :: Media type %s not supported for %s." % (media_type, self.NAME))
-                return
-
-            data['metadata'] = metadata
-            data['uri'] = 'server://{}/com.plexapp.plugins.library/library/metadata/{}'.format(
-                plexpy.CONFIG.PMS_IDENTIFIER, uri_rating_key or pretty_metadata.parameters['rating_key']
-            )
-            data['play'] = self.config['tap_action'] == 'play'
-
-        headers = {'X-Plex-Token': plexpy.CONFIG.PMS_TOKEN}
-
-        return self.make_request(self.NOTIFICATION_URL, headers=headers, json=data)
-
-    def get_users(self):
-        user_ids = {u['user_id']: u['friendly_name'] for u in users.Users().get_users() if u['user_id']}
-        return user_ids
-
-    def _return_config_options(self):
-        config_option = [{'label': 'Plex User(s)',
-                          'value': self.config['user_ids'],
-                          'name': 'plexmobileapp_user_ids',
-                          'description': 'Select which Plex User(s) to receive notifications.<br>'
-                                         'Note: The user(s) must have notifications enabled '
-                                         'for the matching Tautulli triggers in their Plex mobile app.',
-                          'input_type': 'select',
-                          'select_options': self.get_users()
-                          },
-                         {'label': 'Notification Tap Action',
-                          'value': self.config['tap_action'],
-                          'name': 'plexmobileapp_tap_action',
-                          'description': 'Set the action when tapping on the notification.',
-                          'input_type': 'select',
-                          'select_options': {'preplay': 'Go to media pre-play screen',
-                                             'play': 'Start playing the media'}
-                          },
-                         ]
-
-        return config_option
-
-
-class PROWL(Notifier):
-    """
-    Prowl notifications.
-    """
-    NAME = 'Prowl'
-    _DEFAULT_CONFIG = {'key': '',
-                       'priority': 0
-                       }
-
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        data = {'apikey': self.config['key'],
-                'application': 'Tautulli',
-                'event': subject,
-                'description': body,
-                'priority': self.config['priority']}
-
-        headers = {'Content-type': 'application/x-www-form-urlencoded'}
-
-        return self.make_request('https://api.prowlapp.com/publicapi/add', headers=headers, data=data)
-
-    def _return_config_options(self):
-        config_option = [{'label': 'Prowl API Key',
-                          'value': self.config['key'],
-                          'name': 'prowl_key',
-                          'description': 'Your Prowl API key.',
-                          'input_type': 'token'
-                          },
-                         {'label': 'Priority',
-                          'value': self.config['priority'],
-                          'name': 'prowl_priority',
-                          'description': 'Set the notification priority.',
-                          'input_type': 'select',
-                          'select_options': {-2: -2, -1: -1, 0: 0, 1: 1, 2: 2}
-                          }
-                         ]
-
-        return config_option
-
-
-class PUSHBULLET(Notifier):
-    """
-    Pushbullet notifications
-    """
-    NAME = 'Pushbullet'
-    _DEFAULT_CONFIG = {'api_key': '',
-                       'device_id': '',
-                       'channel_tag': '',
-                       'incl_subject': 1,
-                       'incl_poster': 0
-                       }
-
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        data = {'type': 'note',
-                'body': body}
-
-        headers = {'Content-type': 'application/json',
-                   'Access-Token': self.config['api_key']
-                   }
-
-        if self.config['incl_subject']:
-            data['title'] = subject
-
-        # Can only send to a device or channel, not both.
-        if self.config['device_id']:
-            data['device_iden'] = self.config['device_id']
-        elif self.config['channel_tag']:
-            data['channel_tag'] = self.config['channel_tag']
-
-        if self.config['incl_poster'] and kwargs.get('parameters', {}).get('media_type'):
-            # Grab formatted metadata
-            pretty_metadata = PrettyMetadata(kwargs['parameters'])
-
-            image = pretty_metadata.get_image()
-            if image:
-                file_json = {'file_name': image[0], 'file_type': image[2]}
-                files = {'file': image}
-
-                r = requests.post('https://api.pushbullet.com/v2/upload-request', headers=headers, json=file_json)
-
-                file_response = r.json()
-                upload_url = file_response.pop('upload_url')
-
-                r = requests.post(upload_url, files=files)
-
-                if r.status_code == 204:
-                    data['type'] = 'file'
-                    file_response.pop('data', None)
-                    data.update(file_response)
-                else:
-                    logger.error("Tautulli Notifiers :: Unable to upload image to {name}: "
-                                 "[{r.status_code}] {r.reason}".format(name=self.NAME, r=r))
-                    logger.debug("Tautulli Notifiers :: Request response: {}".format(request.server_message(r, True)))
-
-        return self.make_request('https://api.pushbullet.com/v2/pushes', headers=headers, json=data)
-
-    def get_devices(self):
-        devices = {'': ''}
-
-        if self.config['api_key']:
-            headers = {'Content-type': "application/json",
-                       'Access-Token': self.config['api_key']
-                       }
-            try:
-                r = requests.get('https://api.pushbullet.com/v2/devices', headers=headers)
-
-                if r.status_code == 200:
-                    response_data = r.json()
-                    pushbullet_devices = response_data.get('devices', [])
-                    devices.update({d['iden']: d['nickname'] for d in pushbullet_devices if d['active']})
-                else:
-                    logger.error("Tautulli Notifiers :: Unable to retrieve {name} devices list: "
-                                 "[{r.status_code}] {r.reason}".format(name=self.NAME, r=r))
-                    logger.debug("Tautulli Notifiers :: Request response: {}".format(request.server_message(r, True)))
-
-            except Exception as e:
-                logger.error("Tautulli Notifiers :: Unable to retrieve {name} devices list: {msg}".format(name=self.NAME, msg=e))
-
-        return devices
-
-    def _return_config_options(self):
-        config_option = [{'label': 'Pushbullet Access Token',
-                          'value': self.config['api_key'],
-                          'name': 'pushbullet_api_key',
-                          'description': 'Your Pushbullet access token.',
-                          'input_type': 'token',
-                          'refresh': True
-                          },
-                         {'label': 'Device',
-                          'value': self.config['device_id'],
-                          'name': 'pushbullet_device_id',
-                          'description': 'Set your Pushbullet device. If set, will override channel tag. '
-                                         'Leave blank to notify on all devices.',
-                          'input_type': 'select',
-                          'select_options': self.get_devices()
-                          },
-                         {'label': 'Channel',
-                          'value': self.config['channel_tag'],
-                          'name': 'pushbullet_channel_tag',
-                          'description': 'A channel tag (optional).',
+    def return_config_options(self):
+        config_option = [{'label': 'Boxcar Access Token',
+                          'value': plexpy.CONFIG.BOXCAR_TOKEN,
+                          'name': 'boxcar_token',
+                          'description': 'Your Boxcar access token.',
                           'input_type': 'text'
                           },
-                         {'label': 'Include Subject Line',
-                          'value': self.config['incl_subject'],
-                          'name': 'pushbullet_incl_subject',
-                          'description': 'Include the subject line with the notifications.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Poster Image',
-                          'value': self.config['incl_poster'],
-                          'name': 'pushbullet_incl_poster',
-                          'description': 'Include a poster with the notifications.',
-                          'input_type': 'checkbox'
-                          }
-                         ]
-
-        return config_option
-
-
-class PUSHOVER(Notifier):
-    """
-    Pushover notifications
-    """
-    NAME = 'Pushover'
-    _DEFAULT_CONFIG = {'api_token': '',
-                       'key': '',
-                       'html_support': 1,
-                       'sound': '',
-                       'priority': 0,
-                       'retry': 30,
-                       'expire': 3600,
-                       'incl_url': 1,
-                       'incl_subject': 1,
-                       'incl_poster': 0,
-                       'movie_provider': '',
-                       'tv_provider': '',
-                       'music_provider': ''
-                       }
-
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        data = {'token': self.config['api_token'],
-                'user': self.config['key'],
-                'message': body,
-                'sound': self.config['sound'],
-                'html': self.config['html_support'],
-                'priority': self.config['priority'],
-                'timestamp': helpers.timestamp()}
-
-        if self.config['incl_subject']:
-            data['title'] = subject
-
-        if self.config['priority'] == 2:
-            data['retry'] = max(30, self.config['retry'])
-            data['expire'] = max(30, self.config['expire'])
-
-        headers = {'Content-type': 'application/x-www-form-urlencoded'}
-
-        files = {}
-
-        if self.config['incl_url'] and kwargs.get('parameters', {}).get('media_type'):
-            # Grab formatted metadata
-            pretty_metadata = PrettyMetadata(kwargs['parameters'])
-
-            if pretty_metadata.media_type == 'movie':
-                provider = self.config['movie_provider']
-            elif pretty_metadata.media_type in ('show', 'season', 'episode'):
-                provider = self.config['tv_provider']
-            elif pretty_metadata.media_type in ('artist', 'album', 'track'):
-                provider = self.config['music_provider']
-            else:
-                provider = None
-
-            provider_link = pretty_metadata.get_provider_link(provider)
-            caption = pretty_metadata.get_caption(provider)
-
-            data['url'] = provider_link
-            data['url_title'] = caption
-
-        if self.config['incl_poster'] and kwargs.get('parameters', {}).get('media_type'):
-            # Grab formatted metadata
-            pretty_metadata = PrettyMetadata(kwargs['parameters'])
-
-            image = pretty_metadata.get_image()
-            if image:
-                if len(image[1]) <= 5242880:  # 5MB max attachment size
-                    files = {'attachment': image}
-                    headers = {}
-                else:
-                    logger.warn("Tautulli Notifiers :: Image size exceeds 5MB limit for {name}.".format(name=self.NAME))
-
-        return self.make_request('https://api.pushover.net/1/messages.json', headers=headers, data=data, files=files)
-
-    def get_sounds(self):
-        sounds = [
-            {'value': '', 'text': ''},
-            {'value': 'alien', 'text': 'Alien Alarm (long)'},
-            {'value': 'bike', 'text': 'Bike'},
-            {'value': 'bugle', 'text': 'Bugle'},
-            {'value': 'cashregister', 'text': 'Cash Register'},
-            {'value': 'classical', 'text': 'Classical'},
-            {'value': 'climb', 'text': 'Climb (long)'},
-            {'value': 'cosmic', 'text': 'Cosmic'},
-            {'value': 'echo', 'text': 'Pushover Echo (long)'},
-            {'value': 'falling', 'text': 'Falling'},
-            {'value': 'gamelan', 'text': 'Gamelan'},
-            {'value': 'incoming', 'text': 'Incoming'},
-            {'value': 'intermission', 'text': 'Intermission'},
-            {'value': 'magic', 'text': 'Magic'},
-            {'value': 'mechanical', 'text': 'Mechanical'},
-            {'value': 'none', 'text': 'None (silent)'},
-            {'value': 'persistent', 'text': 'Persistent (long)'},
-            {'value': 'pianobar', 'text': 'Piano Bar'},
-            {'value': 'pushover', 'text': 'Pushover (default)'},
-            {'value': 'siren', 'text': 'Siren'},
-            {'value': 'spacealarm', 'text': 'Space Alarm'},
-            {'value': 'tugboat', 'text': 'Tug Boat'},
-            {'value': 'updown', 'text': 'Up Down (long)'},
-            {'value': 'vibrate', 'text': 'Vibrate Only'},
-        ]
-        if self.config['sound'] not in [s['value'] for s in sounds]:
-            sounds.append({'value': self.config['sound'], 'text': self.config['sound']})
-
-        return sounds
-
-        # if self.config['api_token']:
-        #     params = {'token': self.config['api_token']}
-        #
-        #     r = requests.get('https://api.pushover.net/1/sounds.json', params=params)
-        #
-        #     if r.status_code == 200:
-        #         response_data = r.json()
-        #         sounds = response_data.get('sounds', {})
-        #         sounds.update({'': ''})
-        #         print sounds
-        #         return sounds
-        #     else:
-        #         logger.error("Tautulli Notifiers :: Unable to retrieve {name} sounds list: "
-        #                      "[{r.status_code}] {r.reason}".format(name=self.NAME, r=r))
-        #         logger.debug("Tautulli Notifiers :: Request response: {}".format(request.server_message(r, True)))
-        #         return {'': ''}
-        #
-        # else:
-        #     return {'': ''}
-
-    def _return_config_options(self):
-        config_option = [{'label': 'Pushover API Token',
-                          'value': self.config['api_token'],
-                          'name': 'pushover_api_token',
-                          'description': 'Your Pushover API token.',
-                          'input_type': 'token'
-                          },
-                         {'label': 'Pushover User or Group Key',
-                          'value': self.config['key'],
-                          'name': 'pushover_key',
-                          'description': 'Your Pushover user or group key.',
-                          'input_type': 'token'
-                          },
                          {'label': 'Sound',
-                          'value': self.config['sound'],
-                          'name': 'pushover_sound',
-                          'description': 'Select a notification sound or enter a custom sound name. Leave blank for the default sound.',
-                          'input_type': 'selectize',
-                          'select_options': self.get_sounds(),
-                          'select_all': False
-                          },
-                         {'label': 'Priority',
-                          'value': self.config['priority'],
-                          'name': 'pushover_priority',
-                          'description': 'Set the notification priority.',
+                          'value': self.sound,
+                          'name': 'boxcar_sound',
+                          'description': 'Set the notification sound. Leave blank for the default sound.',
                           'input_type': 'select',
-                          'select_options': {-2: -2, -1: -1, 0: 0, 1: 1, 2: 2}
-                          },
-                         {'label': 'Retry Interval',
-                          'value': self.config['retry'],
-                          'name': 'pushover_retry',
-                          'description': 'Set the interval in seconds to keep retrying the notification.<br>'
-                                         'Note: For priority 2 only. Minimum 30 seconds.',
-                          'input_type': 'number'
-                          },
-                         {'label': 'Expire Duration',
-                          'value': self.config['expire'],
-                          'name': 'pushover_expire',
-                          'description': 'Set the duration in seconds when the notification will stop retrying.<br>'
-                                         'Note: For priority 2 only. Minimum 30 seconds.',
-                          'input_type': 'number'
-                          },
-                         {'label': 'Enable HTML Support',
-                          'value': self.config['html_support'],
-                          'name': 'pushover_html_support',
-                          'description': 'Style your messages using these HTML tags: b, i, u, a[href], font[color]',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include supplementary URL',
-                          'value': self.config['incl_url'],
-                          'name': 'pushover_incl_url',
-                          'description': 'Include a supplementary URL with the notifications.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Subject Line',
-                          'value': self.config['incl_subject'],
-                          'name': 'pushover_incl_subject',
-                          'description': 'Include the subject line with the notifications.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Poster Image',
-                          'value': self.config['incl_poster'],
-                          'name': 'pushover_incl_poster',
-                          'description': 'Include a poster with the notifications.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Movie Link Source',
-                          'value': self.config['movie_provider'],
-                          'name': 'pushover_movie_provider',
-                          'description': 'Select the source for movie links in the notification. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_movie_providers()
-                          },
-                         {'label': 'TV Show Link Source',
-                          'value': self.config['tv_provider'],
-                          'name': 'pushover_tv_provider',
-                          'description': 'Select the source for tv show links in the notification. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_tv_providers()
-                          },
-                         {'label': 'Music Link Source',
-                          'value': self.config['music_provider'],
-                          'name': 'pushover_music_provider',
-                          'description': 'Select the source for music links in the notification. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_music_providers()
+                          'select_options': {'': '',
+                                             'beep-crisp': 'Beep (Crisp)',
+                                             'beep-soft': 'Beep (Soft)',
+                                             'bell-modern': 'Bell (Modern)',
+                                             'bell-one-tone': 'Bell (One Tone)',
+                                             'bell-simple': 'Bell (Simple)',
+                                             'bell-triple': 'Bell (Triple)',
+                                             'bird-1': 'Bird (1)',
+                                             'bird-2': 'Bird (2)',
+                                             'boing': 'Boing',
+                                             'cash': 'Cash',
+                                             'clanging': 'Clanging',
+                                             'detonator-charge': 'Detonator Charge',
+                                             'digital-alarm': 'Digital Alarm',
+                                             'done': 'Done',
+                                             'echo': 'Echo',
+                                             'flourish': 'Flourish',
+                                             'harp': 'Harp',
+                                             'light': 'Light',
+                                             'magic-chime':'Magic Chime',
+                                             'magic-coin': 'Magic Coin',
+                                             'no-sound': 'No Sound',
+                                             'notifier-1': 'Notifier (1)',
+                                             'notifier-2': 'Notifier (2)',
+                                             'notifier-3': 'Notifier (3)',
+                                             'orchestral-long': 'Orchestral (Long)',
+                                             'orchestral-short': 'Orchestral (Short)',
+                                             'score': 'Score',
+                                             'success': 'Success',
+                                             'up': 'Up'}
                           }
                          ]
 
         return config_option
 
+class Email(object):
 
-class SCRIPTS(Notifier):
-    """
-    Script notifications
-    """
-    NAME = 'Script'
-    _DEFAULT_CONFIG = {'script_folder': '',
-                       'script': '',
-                       'timeout': 30
-                       }
+    def __init__(self):
+        self.on_play = plexpy.CONFIG.EMAIL_ON_PLAY
+        self.on_stop = plexpy.CONFIG.EMAIL_ON_STOP
+        self.on_watched = plexpy.CONFIG.EMAIL_ON_WATCHED
 
-    def __init__(self, config=None):
-        super(SCRIPTS, self).__init__(config=config)
+    def notify(self, subject, message):
+        if not subject or not message:
+            return
 
-        self.script_exts = {
-            '.bat': '',
-            '.cmd': '',
-            '.php': 'php',
-            '.pl': 'perl',
-            '.ps1': 'powershell -executionPolicy bypass -file',
-            '.py': 'python' if plexpy.FROZEN else sys.executable,
-            '.pyw': 'pythonw',
-            '.rb': 'ruby',
-            '.sh': ''
-        }
-
-        self.pythonpath_override = 'nopythonpath'
-        self.pythonpath = True
-        self.prefix_overrides = {
-            'python': ['.py'],
-            'python2': ['.py'],
-            'python3': ['.py'],
-            'pythonw': ['.py', '.pyw']
-        }
-        self.script_killed = False
-
-    def list_scripts(self):
-        scriptdir = self.config['script_folder']
-        scripts = {'': ''}
-
-        if scriptdir and not os.path.exists(scriptdir):
-            return scripts
-
-        for root, dirs, files in os.walk(scriptdir):
-            for f in files:
-                name, ext = os.path.splitext(f)
-                if ext in self.script_exts:
-                    rfp = os.path.join(os.path.relpath(root, scriptdir), f)
-                    fp = os.path.join(root, f)
-                    scripts[fp] = rfp
-
-        return scripts
-
-    def run_script(self, script, user_id):
-        # Common environment variables
-        custom_env = {
-            'PLEX_URL': plexpy.CONFIG.PMS_URL,
-            'PLEX_TOKEN': plexpy.CONFIG.PMS_TOKEN,
-            'PLEX_USER_TOKEN': '',
-            'TAUTULLI_URL': helpers.get_plexpy_url(hostname='localhost'),
-            'TAUTULLI_PUBLIC_URL': plexpy.CONFIG.HTTP_BASE_URL + plexpy.HTTP_ROOT,
-            'TAUTULLI_APIKEY': plexpy.CONFIG.API_KEY,
-            'TAUTULLI_ENCODING': plexpy.SYS_ENCODING,
-            'TAUTULLI_PYTHON_VERSION': common.PYTHON_VERSION,
-            'PLEXAPI_LOG_PATH': os.path.join(plexpy.CONFIG.LOG_DIR, 'plexapi_script.log')
-            }
-
-        if user_id:
-            user_tokens = users.Users().get_tokens(user_id=user_id)
-            custom_env['PLEX_USER_TOKEN'] = str(user_tokens['server_token'])
-
-        if self.pythonpath and plexpy.INSTALL_TYPE not in ('windows', 'macos'):
-            custom_env['PYTHONPATH'] = os.pathsep.join([p for p in sys.path if p])
-
-        env = os.environ.copy()
-        env.update(custom_env)
+        message = MIMEText(message, 'plain', "utf-8")
+        message['Subject'] = subject
+        message['From'] = email.utils.formataddr(('PlexPy', plexpy.CONFIG.EMAIL_FROM))
+        message['To'] = plexpy.CONFIG.EMAIL_TO
 
         try:
-            process = subprocess.Popen(script,
-                                       stdin=subprocess.PIPE,
-                                       stdout=subprocess.PIPE,
-                                       stderr=subprocess.PIPE,
-                                       cwd=self.config['script_folder'],
-                                       env=env)
+            mailserver = smtplib.SMTP(plexpy.CONFIG.EMAIL_SMTP_SERVER, plexpy.CONFIG.EMAIL_SMTP_PORT)
 
-            if self.config['timeout'] > 0:
-                timer = threading.Timer(self.config['timeout'], self.kill_script, (process,))
-            else:
-                timer = None
+            if (plexpy.CONFIG.EMAIL_TLS):
+                mailserver.starttls()
 
-            try:
-                if timer:
-                    timer.start()
-                output, error = process.communicate()
-                status = process.returncode
-                logger.debug("Tautulli Notifiers :: Subprocess returned with status code %s." % status)
-            finally:
-                if timer:
-                    timer.cancel()
+            mailserver.ehlo()
 
-        except OSError as e:
-            logger.error("Tautulli Notifiers :: Failed to run script: %s" % e)
-            return False
+            if plexpy.CONFIG.EMAIL_SMTP_USER:
+                mailserver.login(plexpy.CONFIG.EMAIL_SMTP_USER, plexpy.CONFIG.EMAIL_SMTP_PASSWORD)
 
-        if error:
-            err = '\n  '.join(error.decode('utf-8').splitlines())
-            logger.error("Tautulli Notifiers :: Script error: \n  %s" % err)
-
-        if output:
-            out = '\n  '.join(output.decode('utf-8').splitlines())
-            logger.debug("Tautulli Notifiers :: Script returned: \n  %s" % out)
-
-        if not self.script_killed:
-            logger.info("Tautulli Notifiers :: Script notification sent.")
+            mailserver.sendmail(plexpy.CONFIG.EMAIL_FROM, plexpy.CONFIG.EMAIL_TO, message.as_string())
+            mailserver.quit()
             return True
 
-    def kill_script(self, process):
-        process.kill()
-        self.script_killed = True
-        logger.warn("Tautulli Notifiers :: Script exceeded timeout limit of %d seconds. "
-                    "Script killed." % self.config['timeout'])
-
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        """
-            Args:
-                  subject(string, optional): Subject text,
-                  body(string, optional): Body text,
-                  action(string): 'play'
-        """
-        if not self.config['script_folder']:
-            logger.error("Tautulli Notifiers :: No script folder specified.")
-            return
-
-        script = kwargs.get('script', self.config.get('script', ''))
-        script_args = helpers.split_args(kwargs.get('script_args', subject))
-        user_id = kwargs.get('parameters', {}).get('user_id')
-
-        logger.debug("Tautulli Notifiers :: Trying to run notify script: %s, arguments: %s, action: %s"
-                     % (script, script_args, action))
-
-        # Don't try to run the script if the action does not have one
-        if action and not script:
-            logger.debug("Tautulli Notifiers :: No script selected for action '%s', exiting..." % action)
-            return
-        elif not script:
-            logger.debug("Tautulli Notifiers :: No script selected, exiting...")
-            return
-        # Check for a valid script file
-        elif not os.path.isfile(script) or not script.endswith(tuple(self.script_exts)):
-            logger.error("Tautulli Notifiers :: Invalid script file '%s' specified, exiting..." % script)
-            return
-
-        name, ext = os.path.splitext(script)
-        prefix = self.script_exts.get(ext, '')
-
-        if prefix:
-            script = prefix.split() + [script]
-        else:
-            script = [script]
-
-        # Allow overrides for PYTHONPATH
-        if prefix and script_args:
-            if script_args[0] == self.pythonpath_override:
-                self.pythonpath = False
-                del script_args[0]
-
-        # Allow overrides for shitty systems
-        if prefix and script_args and script_args[0] in self.prefix_overrides:
-            if ext in self.prefix_overrides[script_args[0]]:
-                script[0] = script_args[0]
-                del script_args[0]
-            else:
-                logger.error("Tautulli Notifiers :: Invalid prefix override '%s' for '%s' script, exiting..."
-                             % (script_args[0], ext))
-                return
-
-        script.extend(script_args)
-
-        logger.debug("Tautulli Notifiers :: Full script is: %s" % script)
-        logger.debug("Tautulli Notifiers :: Executing script in a new thread.")
-        thread = threading.Thread(target=self.run_script, args=(script, user_id)).start()
-
-        return True
-
-    def _return_config_options(self):
-        config_option = [{'label': 'Supported File Types',
-                          'description': '<span class="inline-pre">' + \
-                              ', '.join(self.script_exts) + '</span>',
-                          'input_type': 'help'
-                          },
-                         {'label': 'Script Folder',
-                          'value': self.config['script_folder'],
-                          'name': 'scripts_script_folder',
-                          'description': 'Enter the full path to your script folder.',
-                          'input_type': 'text',
-                          'refresh': True
-                          },
-                         {'label': 'Script File',
-                          'value': self.config['script'],
-                          'name': 'scripts_script',
-                          'description': 'Select the script file to run.',
-                          'input_type': 'select',
-                          'select_options': self.list_scripts()
-                          },
-                         {'label': 'Script Timeout',
-                          'value': self.config['timeout'],
-                          'name': 'scripts_timeout',
-                          'description': 'The number of seconds to wait before killing the script. 0 to disable timeout.',
-                          'input_type': 'number'
-                          }
-                         ]
-
-        return config_option
-
-
-class SLACK(Notifier):
-    """
-    Slack Notifications
-    """
-    NAME = 'Slack'
-    _DEFAULT_CONFIG = {'hook': '',
-                       'channel': '',
-                       'username': '',
-                       'icon_emoji': '',
-                       'color': '',
-                       'incl_subject': 1,
-                       'incl_card': 0,
-                       'incl_description': 1,
-                       'incl_thumbnail': 0,
-                       'incl_pmslink': 0,
-                       'movie_provider': '',
-                       'tv_provider': '',
-                       'music_provider': ''
-                       }
-
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        if self.config['incl_subject']:
-            text = subject + '\n' + body
-        else:
-            text = body
-
-        data = {'text': text}
-        if self.config['channel'] and self.config['channel'].startswith('#'):
-            data['channel'] = self.config['channel']
-        if self.config['username']:
-            data['username'] = self.config['username']
-        if self.config['icon_emoji']:
-            if urlparse(self.config['icon_emoji']).scheme == '':
-                data['icon_emoji'] = self.config['icon_emoji']
-            else:
-                data['icon_url'] = self.config['icon_emoji']
-
-        if self.config['incl_card'] and kwargs.get('parameters', {}).get('media_type'):
-            # Grab formatted metadata
-            pretty_metadata = PrettyMetadata(kwargs['parameters'])
-
-            if pretty_metadata.media_type == 'movie':
-                provider = self.config['movie_provider']
-            elif pretty_metadata.media_type in ('show', 'season', 'episode'):
-                provider = self.config['tv_provider']
-            elif pretty_metadata.media_type in ('artist', 'album', 'track'):
-                provider = self.config['music_provider']
-            else:
-                provider = None
-
-            poster_url = pretty_metadata.get_poster_url()
-            provider_name = pretty_metadata.get_provider_name(provider)
-            provider_link = pretty_metadata.get_provider_link(provider)
-            title = pretty_metadata.get_title('\u00B7')
-            description = pretty_metadata.get_description()
-            plex_url = pretty_metadata.get_plex_url()
-
-            if provider_link:
-                text = f"*<{provider_link}|{title}>*"
-            else:
-                text = f"*{title}*"
-
-            if self.config['incl_description']:
-                text = f'{text}\n{description}'
-
-            # Max length of text is 3000 characters
-            text = (text[:2997] + (text[2997:] and '...'))
-
-            section = {
-                'type': 'section',
-                'text': {
-                   'type': 'mrkdwn',
-                    'text': text,
-                }
-            }
-            if self.config['incl_thumbnail']:
-                section['accessory'] = {
-                    'type': 'image',
-                    'image_url': poster_url,
-                    'alt_text': title,
-                }
-            blocks = [section]
-
-            fields = []
-            field_title = {
-                'type': 'mrkdwn',
-                'text': 'View Details',
-            }
-            if provider_link:
-                fields.append(field_title)
-                fields.append({
-                    'type': 'mrkdwn',
-                    'text': f'<{provider_link}|{provider_name}>',
-                })
-            if self.config['incl_pmslink']:
-                fields.append(field_title)
-                fields.append({
-                    'type': 'mrkdwn',
-                    'text': f'<{plex_url}|Plex Web>',
-                })
-            if fields:
-                if len(fields) <= 2:
-                    fields.append({
-                        'type': 'plain_text',
-                        'text': ' ',
-                    })
-                blocks.append({
-                    'type': 'section',
-                    'fields': fields[::2] + fields[1::2],
-                })
-
-            if not self.config['incl_thumbnail']:
-                blocks.append({
-                    'type': 'image',
-                    'image_url': poster_url,
-                    'alt_text': title,
-                })
-
-            attachment = {
-                'blocks': blocks,
-
-            }
-
-            if self.config['color'] and re.match(r'^#(?:[0-9a-fA-F]{3}){1,2}$', self.config['color']):
-                attachment['color'] = self.config['color']
-
-            data['attachments'] = [attachment]
-
-        headers = {'Content-type': 'application/json'}
-
-        return self.make_request(self.config['hook'], headers=headers, json=data)
-
-    def _return_config_options(self):
-        config_option = [{'label': 'Slack Webhook URL',
-                          'value': self.config['hook'],
-                          'name': 'slack_hook',
-                          'description': 'Your Slack incoming webhook URL.',
-                          'input_type': 'token'
-                          },
-                         {'label': 'Slack Channel',
-                          'value': self.config['channel'],
-                          'name': 'slack_channel',
-                          'description': 'The Slack channel name (starting with \'#\') which will be used. Leave blank for webhook integration default.',
-                          'input_type': 'text'
-                          },
-                         {'label': 'Slack Username',
-                          'value': self.config['username'],
-                          'name': 'slack_username',
-                          'description': 'The Slack username which will be used. Leave blank for webhook integration default.',
-                          'input_type': 'text'
-                          },
-                         {'label': 'Slack Icon',
-                          'value': self.config['icon_emoji'],
-                          'description': 'The Slack emoji or image url for the icon which will be used. Leave blank for webhook integration default.',
-                          'name': 'slack_icon_emoji',
-                          'input_type': 'text'
-                          },
-                         {'label': 'Slack Color',
-                          'value': self.config['color'],
-                          'description': 'The hex color value (starting with \'#\') for the border along the left side of the message attachment.',
-                          'name': 'slack_color',
-                          'input_type': 'text'
-                          },
-                         {'label': 'Include Subject Line',
-                          'value': self.config['incl_subject'],
-                          'name': 'slack_incl_subject',
-                          'description': 'Include the subject line with the notifications.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Rich Metadata Info',
-                          'value': self.config['incl_card'],
-                          'name': 'slack_incl_card',
-                          'description': 'Include an info card with a poster and metadata with the notifications.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" '
-                                         'data-target="notify_upload_posters">Image Hosting</a> '
-                                         'must be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Summary',
-                          'value': self.config['incl_description'],
-                          'name': 'slack_incl_description',
-                          'description': 'Include a summary for the media on the info card.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Link to Plex Web',
-                          'value': self.config['incl_pmslink'],
-                          'name': 'slack_incl_pmslink',
-                          'description': 'Include a second link to the media in Plex Web on the info card.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Use Poster Thumbnail',
-                          'value': self.config['incl_thumbnail'],
-                          'name': 'slack_incl_thumbnail',
-                          'description': 'Use a thumbnail instead of a full sized poster on the info card.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Movie Link Source',
-                          'value': self.config['movie_provider'],
-                          'name': 'slack_movie_provider',
-                          'description': 'Select the source for movie links on the info cards. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_movie_providers()
-                          },
-                         {'label': 'TV Show Link Source',
-                          'value': self.config['tv_provider'],
-                          'name': 'slack_tv_provider',
-                          'description': 'Select the source for tv show links on the info cards. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_tv_providers()
-                          },
-                         {'label': 'Music Link Source',
-                          'value': self.config['music_provider'],
-                          'name': 'slack_music_provider',
-                          'description': 'Select the source for music links on the info cards. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_music_providers()
-                          }
-                         ]
-
-        return config_option
-
-
-class TAUTULLIREMOTEAPP(Notifier):
-    """
-    Tautulli Remote app notifications
-    """
-    NAME = 'Tautulli Remote App'
-    _DEFAULT_CONFIG = {'device_id': '',
-                       'priority': 3,
-                       'notification_type': 0
-                       }
-
-    def agent_notify(self, subject='', body='', action='', notification_id=None, **kwargs):
-        # Check mobile device is still registered
-        device = mobile_app.get_mobile_devices(device_id=self.config['device_id'])
-        if not device:
-            logger.warn("Tautulli Notifiers :: Unable to send Tautulli Remote app notification: device not registered.")
-            return
-        else:
-            device = device[0]
-
-        pretty_metadata = PrettyMetadata(kwargs.get('parameters'))
-
-        plaintext_data = {'notification_id': notification_id,
-                          'subject': subject,
-                          'body': body,
-                          'action': action,
-                          'priority': self.config['priority'],
-                          'notification_type': self.config['notification_type'],
-                          'session_key': pretty_metadata.parameters.get('session_key', ''),
-                          'session_id': pretty_metadata.parameters.get('session_id', ''),
-                          'user_id': pretty_metadata.parameters.get('user_id', ''),
-                          'rating_key': pretty_metadata.parameters.get('rating_key', ''),
-                          'poster_thumb': pretty_metadata.parameters.get('poster_thumb', '')}
-
-        #logger.debug("Plaintext data: {}".format(plaintext_data))
-
-        if _CRYPTOGRAPHY:
-            # Key generation
-            salt = os.urandom(16)
-            passphrase = device['device_token']
-            key_length = 32  # AES256
-            iterations = 600000
-            kdf = PBKDF2HMAC(algorithm=hashes.SHA256(), length=key_length, salt=salt, iterations=iterations)
-            key = kdf.derive(passphrase.encode())
-
-            #logger.debug("Encryption key (base64): {}".format(base64.b64encode(key)))
-
-            # Encrypt using AES GCM
-            nonce = os.urandom(16)
-            cipher = AESGCM(key)
-            encrypted_data = cipher.encrypt(nonce, json.dumps(plaintext_data).encode('utf-8'), None)
-
-            #logger.debug("Encrypted data (base64): {}".format(base64.b64encode(encrypted_data)))
-            #logger.debug("GCM tag (base64): {}".format(base64.b64encode(gcm_tag)))
-            #logger.debug("Nonce (base64): {}".format(base64.b64encode(nonce)))
-            #logger.debug("Salt (base64): {}".format(base64.b64encode(salt)))
-
-            payload = {'app_id': mobile_app._ONESIGNAL_APP_ID,
-                       'include_subscription_ids': [device['onesignal_id']],
-                       'contents': {'en': 'Tautulli Notification'},
-                       'data': {'encrypted': True,
-                                'version': 2,
-                                'cipher_text': base64.b64encode(encrypted_data),
-                                'nonce': base64.b64encode(nonce),
-                                'salt': base64.b64encode(salt),
-                                'server_id': plexpy.CONFIG.PMS_UUID}
-                       }
-        else:
-            logger.warn("Tautulli Notifiers :: Cryptography library is missing. "
-                        "Tautulli Remote app notifications will be sent unencrypted. "
-                        "Install the library to encrypt the notifications.")
-
-            payload = {'app_id': mobile_app._ONESIGNAL_APP_ID,
-                       'include_subscription_ids': [device['onesignal_id']],
-                       'contents': {'en': 'Tautulli Notification'},
-                       'data': {'encrypted': False,
-                                'plain_text': plaintext_data,
-                                'server_id': plexpy.CONFIG.PMS_UUID}
-                       }
-
-        #logger.debug("OneSignal payload: {}".format(payload))
-
-        headers = {'Content-Type': 'application/json'}
-
-        return self.make_request('https://api.onesignal.com/notifications', headers=headers, json=payload)
-
-    def get_devices(self):
-        db = database.MonitorDatabase()
-
-        try:
-            query = "SELECT * FROM mobile_devices WHERE official = 1 " \
-                    "AND onesignal_id IS NOT NULL AND onesignal_id != ''"
-            return db.select(query=query)
-        except Exception as e:
-            logger.warn("Tautulli Notifiers :: Unable to retrieve Tautulli Remote app devices list: %s." % e)
-            return []
-
-    def _return_config_options(self):
-        config_option = []
-
-        if not _CRYPTOGRAPHY:
-            config_option.append({
-                'label': 'Warning',
-                'description': '<strong>The Cryptography library is missing. '
-                               'The content of your notifications will be sent unencrypted!</strong><br>'
-                               'Please install the library to encrypt the notification contents. '
-                               'Instructions can be found in the '
-                               '<a href="' + helpers.anon_url(
-                                 'https://github.com/%s/%s/wiki/Frequently-Asked-Questions#notifications-cryptography'
-                                 % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_REPO)) + '" target="_blank" rel="noreferrer">FAQ</a>.' ,
-                'input_type': 'help'
-            })
-        else:
-            config_option.append({
-                'label': 'Note',
-                'description': 'The Cryptography library was found. '
-                               'The content of your notifications will be sent encrypted!',
-                'input_type': 'help'
-            })
-
-        config_option[-1]['description'] += ('<br><br>Notifications are sent using '
-            '<a href="' + helpers.anon_url('https://onesignal.com') + '" target="_blank" rel="noreferrer">'
-            'OneSignal</a>. Some user data is collected and cannot be encrypted.<br>'
-            'Please read the <a href="' + helpers.anon_url(
-                'https://onesignal.com/privacy_policy') + '" target="_blank" rel="noreferrer">'
-            'OneSignal Privacy Policy</a> for more details.')
-
-        devices = self.get_devices()
-
-        if not devices:
-            config_option.append({
-                'label': 'Device',
-                'description': 'No mobile devices registered with OneSignal. '
-                               '<a data-tab-destination="remote_app" data-toggle="tab" data-dismiss="modal">'
-                               'Get the Tautulli Remote App</a> and register a device.<br>'
-                               'Note: Only devices registered with a valid OneSignal ID will appear in the list.',
-                'input_type': 'help'
-            })
-        else:
-            if len({d['platform'] for d in devices}) <= 1:
-                device_select = {d['device_id']: d['friendly_name'] or d['device_name'] for d in devices}
-            else:
-                device_select = defaultdict(list)
-                for d in devices:
-                    platform = 'iOS' if d['platform'] == 'ios' else d['platform'].capitalize()
-                    device_select[platform].append({
-                        'value': d['device_id'],
-                        'text': d['friendly_name'] or d['device_name']
-                    })
-
-            config_option.append({
-                'label': 'Device',
-                'value': self.config['device_id'],
-                'name': 'remoteapp_device_id',
-                'description': 'Select your mobile device or '
-                               '<a data-tab-destination="remote_app" data-toggle="tab" data-dismiss="modal">'
-                               'register a new device</a> with Tautulli.<br>'
-                               'Note: Only devices registered with a valid OneSignal ID will appear in the list.',
-                'input_type': 'select',
-                'select_options': device_select,
-                'refresh': True
-            })
-
-        platform = next((d['platform'] for d in devices if d['device_id'] == self.config['device_id']), None)
-
-        if platform == 'android':
-            config_option.append({
-                'label': 'Priority',
-                'value': self.config['priority'],
-                'name': 'remoteapp_priority',
-                'description': 'Set the notification priority.',
-                'input_type': 'select',
-                'select_options': {
-                    1: 'Minimum',
-                    2: 'Low',
-                    3: 'Normal',
-                    4: 'High'
-                }
-            })
-            config_option.append({
-                'label': 'Notification Image Type',
-                'value': self.config['notification_type'],
-                'name': 'remoteapp_notification_type',
-                'description': 'Set the notification image type.',
-                'input_type': 'select',
-                'select_options': {
-                    0: 'No notification image',
-                    1: 'Small image (Expandable text)',
-                    2: 'Large image (Non-expandable text)'
-                }
-            })
-        elif platform == 'ios':
-            config_option.append({
-                'label': 'Include Poster Image',
-                'value': self.config['notification_type'],
-                'name': 'remoteapp_notification_type',
-                'description': 'Include a poster with the notifications.',
-                'input_type': 'checkbox'
-            })
-
-        return config_option
-
-
-class TELEGRAM(Notifier):
-    """
-    Telegram notifications
-    """
-    NAME = 'Telegram'
-    _DEFAULT_CONFIG = {'bot_token': '',
-                       'chat_id': '',
-                       'disable_web_preview': 0,
-                       'silent_notification': 0,
-                       'html_support': 1,
-                       'incl_subject': 1,
-                       'incl_poster': 0
-                       }
-
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        chat_id, *message_thread_id = self.config['chat_id'].split('/')
-        data = {'chat_id': chat_id}
-        if message_thread_id:
-            data['message_thread_id'] = message_thread_id[0]
-
-        if self.config['incl_subject']:
-            text = subject + '\r\n' + body
-        else:
-            text = body
-
-        if self.config['html_support']:
-            data['parse_mode'] = 'HTML'
-
-        if self.config['incl_poster'] and kwargs.get('parameters'):
-            # Grab formatted metadata
-            pretty_metadata = PrettyMetadata(kwargs['parameters'])
-
-            image = pretty_metadata.get_image()
-            if image:
-                files = {'photo': image}
-
-                if len(text) > 1024:
-                    data['disable_notification'] = True
-                else:
-                    data['caption'] = text.encode('utf-8')
-                    if self.config['silent_notification']:
-                        data['disable_notification'] = True
-
-                self.make_request('https://api.telegram.org/bot{}/sendPhoto'.format(self.config['bot_token']),
-                                  data=data, files=files)
-
-                if 'caption' in data:
-                    return
-
-                data.pop('disable_notification', None)
-
-        data['text'] = (text[:4093] + (text[4093:] and '...')).encode('utf-8')
-
-        if self.config['disable_web_preview']:
-            data['disable_web_page_preview'] = True
-
-        if self.config['silent_notification']:
-            data['disable_notification'] = True
-
-        headers = {'Content-type': 'application/x-www-form-urlencoded'}
-
-        return self.make_request('https://api.telegram.org/bot{}/sendMessage'.format(self.config['bot_token']),
-                                 headers=headers, data=data)
-
-    def _return_config_options(self):
-        config_option = [{'label': 'Telegram Bot Token',
-                          'value': self.config['bot_token'],
-                          'name': 'telegram_bot_token',
-                          'description': 'Your Telegram bot token. '
-                                         'Contact <a href="' + helpers.anon_url('https://telegram.me/BotFather') +
-                                         '" target="_blank" rel="noreferrer">@BotFather</a>'
-                                         ' on Telegram to get one.',
-                          'input_type': 'token'
-                          },
-                         {'label': 'Telegram Chat ID, Group ID, or Channel ID/Username',
-                          'value': self.config['chat_id'],
-                          'name': 'telegram_chat_id',
-                          'description': 'Your Telegram Chat ID, Group ID, Channel ID or @channelusername. '
-                                         'Contact <a href="' + helpers.anon_url('https://telegram.me/myidbot') +
-                                         '" target="_blank" rel="noreferrer">@myidbot</a>'
-                                         ' on Telegram to get an ID. '
-                                         'For a group topic, append <span class="inline-pre">/topicID</span> to the group ID.',
-                          'input_type': 'text'
-                          },
-                         {'label': 'Include Subject Line',
-                          'value': self.config['incl_subject'],
-                          'name': 'telegram_incl_subject',
-                          'description': 'Include the subject line with the notifications.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Poster Image',
-                          'value': self.config['incl_poster'],
-                          'name': 'telegram_incl_poster',
-                          'description': 'Include a poster with the notifications.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Enable HTML Support',
-                          'value': self.config['html_support'],
-                          'name': 'telegram_html_support',
-                          'description': 'Enable to style your messages using these HTML tags:<br>'
-                                         'b, strong, i, em, u, ins, s, strike, del, span[class], '
-                                         'tg-spoiler, a[href], code[class], pre',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Disable Web Page Previews',
-                          'value': self.config['disable_web_preview'],
-                          'name': 'telegram_disable_web_preview',
-                          'description': 'Disables automatic link previews for links in the message',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Enable Silent Notifications',
-                          'value': self.config['silent_notification'],
-                          'name': 'telegram_silent_notification',
-                          'description': 'Send notifications silently without any alert sounds.',
-                          'input_type': 'checkbox'
-                          }
-                         ]
-
-        return config_option
-
-
-class TWITTER(Notifier):
-    """
-    Twitter notifications
-    """
-    NAME = 'Twitter'
-    REQUEST_TOKEN_URL = 'https://api.twitter.com/oauth/request_token'
-    ACCESS_TOKEN_URL = 'https://api.twitter.com/oauth/access_token'
-    AUTHORIZATION_URL = 'https://api.twitter.com/oauth/authorize'
-    SIGNIN_URL = 'https://api.twitter.com/oauth/authenticate'
-    _DEFAULT_CONFIG = {'access_token': '',
-                       'access_token_secret': '',
-                       'consumer_key': '',
-                       'consumer_secret': '',
-                       'incl_subject': 1,
-                       'incl_poster': 0
-                       }
-
-    def _send_tweet(self, message=None, attachment=None):
-        consumer_key = self.config['consumer_key']
-        consumer_secret = self.config['consumer_secret']
-        access_token = self.config['access_token']
-        access_token_secret = self.config['access_token_secret']
-
-        # logger.info("Tautulli Notifiers :: Sending tweet: " + message)
-
-        api = twitter.Api(consumer_key, consumer_secret, access_token, access_token_secret)
-
-        try:
-            api.PostUpdate(message, media=attachment)
-            logger.info("Tautulli Notifiers :: {name} notification sent.".format(name=self.NAME))
-            return True
-        except Exception as e:
-            logger.error("Tautulli Notifiers :: {name} notification failed: {e}".format(name=self.NAME, e=e))
+        except Exception, e:
+            logger.warn('Error sending Email: %s' % e)
             return False
 
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        poster_url = ''
-        if self.config['incl_poster'] and kwargs.get('parameters'):
-            parameters = kwargs['parameters']
-            poster_url = parameters.get('poster_url','')
-
-        # Hack to add media type to attachment
-        if poster_url and not helpers.get_img_service():
-            poster_url += '.png'
-
-        if self.config['incl_subject']:
-            return self._send_tweet(subject + '\r\n' + body, attachment=poster_url)
-        else:
-            return self._send_tweet(body, attachment=poster_url)
-
-    def _return_config_options(self):
-        config_option = [{'label': 'Twitter Consumer Key',
-                          'value': self.config['consumer_key'],
-                          'name': 'twitter_consumer_key',
-                          'description': 'Your Twitter consumer key.',
-                          'input_type': 'token'
-                          },
-                         {'label': 'Twitter Consumer Secret',
-                          'value': self.config['consumer_secret'],
-                          'name': 'twitter_consumer_secret',
-                          'description': 'Your Twitter consumer secret.',
-                          'input_type': 'token'
-                          },
-                         {'label': 'Twitter Access Token',
-                          'value': self.config['access_token'],
-                          'name': 'twitter_access_token',
-                          'description': 'Your Twitter access token.',
-                          'input_type': 'token'
-                          },
-                         {'label': 'Twitter Access Token Secret',
-                          'value': self.config['access_token_secret'],
-                          'name': 'twitter_access_token_secret',
-                          'description': 'Your Twitter access token secret.',
-                          'input_type': 'token'
-                          },
-                         {'label': 'Include Subject Line',
-                          'value': self.config['incl_subject'],
-                          'name': 'twitter_incl_subject',
-                          'description': 'Include the subject line with the notifications.',
-                          'input_type': 'checkbox'
-                          },
-                         {'label': 'Include Poster Image',
-                          'value': self.config['incl_poster'],
-                          'name': 'twitter_incl_poster',
-                          'description': 'Include a poster with the notifications.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" '
-                                         'data-target="notify_upload_posters">Image Hosting</a> '
-                                         'must be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'checkbox'
-                          }
-                         ]
-
-        return config_option
-
-
-class WEBHOOK(Notifier):
-    """
-    Webhook notifications
-    """
-    NAME = 'Webhook'
-    _DEFAULT_CONFIG = {'hook': '',
-                       'method': 'POST'
-                       }
-
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        subject = kwargs.get('headers', subject)
-        if subject:
-            try:
-                webhook_headers = json.loads(subject)
-            except ValueError as e:
-                logger.error("Tautulli Notifiers :: Invalid {name} json header data: {e}".format(name=self.NAME, e=e))
-                return False
-        else:
-            webhook_headers = None
-
-        if body:
-            try:
-                webhook_body = json.loads(body)
-            except ValueError as e:
-                logger.error("Tautulli Notifiers :: Invalid {name} json body data: {e}".format(name=self.NAME, e=e))
-                return False
-        else:
-            webhook_body = None
-
-        headers = {'Content-Type': 'application/json'}
-        if webhook_headers:
-            headers.update(webhook_headers)
-
-        if headers['Content-Type'] == 'application/json':
-            data = {'json': webhook_body}
-        else:
-            data = {'data': webhook_body}
-
-        return self.make_request(self.config['hook'], method=self.config['method'], headers=headers, **data)
-
-    def _return_config_options(self):
-        config_option = [{'label': 'Webhook URL',
-                          'value': self.config['hook'],
-                          'name': 'webhook_hook',
-                          'description': 'Your Webhook URL.',
-                          'input_type': 'token'
-                          },
-                         {'label': 'Webhook Method',
-                          'value': self.config['method'],
-                          'name': 'webhook_method',
-                          'description': 'The Webhook HTTP request method.',
-                          'input_type': 'select',
-                          'select_options': {'GET': 'GET',
-                                             'POST': 'POST',
-                                             'PUT': 'PUT',
-                                             'DELETE': 'DELETE',
-                                             'PATCH': 'PATCH'}
-                          }
-                         ]
-
-        return config_option
-
-
-class XBMC(Notifier):
-    """
-    Kodi notifications
-    """
-    NAME = 'Kodi'
-    _DEFAULT_CONFIG = {'hosts': '',
-                       'username': '',
-                       'password': '',
-                       'display_time': 5,
-                       'image': ''
-                       }
-
-    def _sendhttp(self, host, command):
-        url_command = urlencode(command)
-        url = host + '/xbmcCmds/xbmcHttp/?' + url_command
-
-        if self.config['password']:
-            return request.request_content(url, auth=(self.config['username'], self.config['password']))
-        else:
-            return request.request_content(url)
-
-    def _sendjson(self, host, method, params=None):
-        params = params or {}
-        data = [{'id': 0, 'jsonrpc': '2.0', 'method': method, 'params': params}]
-        headers = {'Content-Type': 'application/json'}
-        url = host + '/jsonrpc'
-
-        if self.config['password']:
-            response = request.request_json(url, method="post", data=json.dumps(data), headers=headers,
-                                            auth=(self.config['username'], self.config['password']))
-        else:
-            response = request.request_json(url, method="post", data=json.dumps(data), headers=headers)
-
-        if response:
-            return response[0]['result']
-
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        hosts = [x.strip() for x in self.config['hosts'].split(',')]
-
-        if self.config['display_time'] > 0:
-            display_time = 1000 * self.config['display_time']  # in ms
-        else:
-            display_time = 5000
-
-        if self.config['image']:
-            image = self.config['image']
-        else:
-            image = os.path.join(plexpy.DATA_DIR, os.path.abspath("data/interfaces/default/images/logo-circle.png"))
-
-        for host in hosts:
-            logger.info("Tautulli Notifiers :: Sending notification command to XMBC @ " + host)
-            try:
-                version = self._sendjson(host, 'Application.GetProperties', {'properties': ['version']})['version']['major']
-
-                if version < 12:  # Eden
-                    notification = subject + "," + body + "," + str(display_time)
-                    notifycommand = {'command': 'ExecBuiltIn', 'parameter': 'Notification(' + notification + ')'}
-                    request = self._sendhttp(host, notifycommand)
-
-                else:  # Frodo
-                    params = {'title': subject, 'message': body, 'displaytime': display_time, 'image': image}
-                    request = self._sendjson(host, 'GUI.ShowNotification', params)
-
-                if not request:
-                    raise Exception
-                else:
-                    logger.info("Tautulli Notifiers :: {name} notification sent.".format(name=self.NAME))
-
-            except Exception as e:
-                logger.error("Tautulli Notifiers :: {name} notification failed: {e}".format(name=self.NAME, e=e))
-                return False
-
-        return True
-
-    def _return_config_options(self):
-        config_option = [{'label': 'Kodi Host Address',
-                          'value': self.config['hosts'],
-                          'name': 'xbmc_hosts',
-                          'description': 'Host running Kodi (e.g. http://localhost:8080). Separate multiple hosts with commas (,).',
+    def return_config_options(self):
+        config_option = [{'label': 'From',
+                          'value': plexpy.CONFIG.EMAIL_FROM,
+                          'name': 'email_from',
+                          'description': 'Who should the sender be.',
                           'input_type': 'text'
                           },
-                         {'label': 'Kodi Username',
-                          'value': self.config['username'],
-                          'name': 'xbmc_username',
-                          'description': 'Username of your Kodi client API (blank for none).',
+                         {'label': 'To',
+                          'value': plexpy.CONFIG.EMAIL_TO,
+                          'name': 'email_to',
+                          'description': 'Who should the recipient be.',
                           'input_type': 'text'
                           },
-                         {'label': 'Kodi Password',
-                          'value': self.config['password'],
-                          'name': 'xbmc_password',
-                          'description': 'Password of your Kodi client API (blank for none).',
+                         {'label': 'SMTP Server',
+                          'value': plexpy.CONFIG.EMAIL_SMTP_SERVER,
+                          'name': 'email_smtp_server',
+                          'description': 'Host for the SMTP server.',
+                          'input_type': 'text'
+                          },
+                         {'label': 'SMTP Port',
+                          'value': plexpy.CONFIG.EMAIL_SMTP_PORT,
+                          'name': 'email_smtp_port',
+                          'description': 'Port for the SMTP server.',
+                          'input_type': 'number'
+                          },
+                         {'label': 'SMTP User',
+                          'value': plexpy.CONFIG.EMAIL_SMTP_USER,
+                          'name': 'email_smtp_user',
+                          'description': 'User for the SMTP server.',
+                          'input_type': 'text'
+                          },
+                         {'label': 'SMTP Password',
+                          'value': plexpy.CONFIG.EMAIL_SMTP_PASSWORD,
+                          'name': 'email_smtp_password',
+                          'description': 'Password for the SMTP server.',
                           'input_type': 'password'
                           },
-                         {'label': 'Notification Duration',
-                          'value': self.config['display_time'],
-                          'name': 'xbmc_display_time',
-                          'description': 'The duration (in seconds) for the notification to stay on screen.',
-                          'input_type': 'number'
-                          },
-                         {'label': 'Notification Icon',
-                          'value': self.config['image'],
-                          'name': 'xbmc_image',
-                          'description': 'Full path or URL to an image to display with the notification. Leave blank for the default.',
-                          'input_type': 'text'
+                         {'label': 'TLS',
+                          'value': plexpy.CONFIG.EMAIL_TLS,
+                          'name': 'email_tls',
+                          'description': 'Does the server use encryption.',
+                          'input_type': 'checkbox'
                           }
                          ]
 
-        return config_option
-
-
-class ZAPIER(Notifier):
-    """
-    Zapier notifications
-    """
-    NAME = 'Zapier'
-    _DEFAULT_CONFIG = {'hook': '',
-                       'movie_provider': '',
-                       'tv_provider': '',
-                       'music_provider': ''
-                       }
-
-    def _test_hook(self):
-        _test_data = {'subject': 'Subject',
-                      'body': 'Body',
-                      'action': 'Action',
-                      'poster_url': 'https://i.imgur.com',
-                      'provider_name': 'Provider Name',
-                      'provider_link': 'http://www.imdb.com',
-                      'plex_url': 'https://app.plex.tv/desktop'}
-
-        return self.agent_notify(_test_data=_test_data)
-
-    def agent_notify(self, subject='', body='', action='', **kwargs):
-        data = {'subject': subject,
-                'body': body,
-                'action': action}
-
-        if kwargs.get('parameters', {}).get('media_type'):
-            # Grab formatted metadata
-            pretty_metadata = PrettyMetadata(kwargs['parameters'])
-
-            if pretty_metadata.media_type == 'movie':
-                provider = self.config['movie_provider']
-            elif pretty_metadata.media_type in ('show', 'season', 'episode'):
-                provider = self.config['tv_provider']
-            elif pretty_metadata.media_type in ('artist', 'album', 'track'):
-                provider = self.config['music_provider']
-            else:
-                provider = None
-
-            poster_url = pretty_metadata.get_poster_url()
-            provider_name = pretty_metadata.get_provider_name(provider)
-            provider_link = pretty_metadata.get_provider_link(provider)
-            plex_url = pretty_metadata.get_plex_url()
-
-            data['poster_url'] = poster_url
-            data['provider_name'] = provider_name
-            data['provider_link'] = provider_link
-            data['plex_url'] = plex_url
-
-        if kwargs.get('_test_data'):
-            data.update(kwargs['_test_data'])
-
-        headers = {'Content-type': 'application/json'}
-
-        return self.make_request(self.config['hook'], headers=headers, json=data)
-
-    def _return_config_options(self):
-        config_option = [{'label': 'Zapier Webhook URL',
-                          'value': self.config['hook'],
-                          'name': 'zapier_hook',
-                          'description': 'Your Zapier webhook URL.',
-                          'input_type': 'token'
-                          },
-                         {'label': 'Test Zapier Webhook',
-                          'value': 'Send Test Data',
-                          'name': 'zapier_test_hook',
-                          'description': 'Click this button when prompted on then "Test Webhooks by Zapier" step.',
-                          'input_type': 'button'
-                          },
-                         {'label': 'Movie Link Source',
-                          'value': self.config['movie_provider'],
-                          'name': 'zapier_movie_provider',
-                          'description': 'Select the source for movie links in the notification. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_movie_providers()
-                          },
-                         {'label': 'TV Show Link Source',
-                          'value': self.config['tv_provider'],
-                          'name': 'zapier_tv_provider',
-                          'description': 'Select the source for tv show links in the notification. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_tv_providers()
-                          },
-                         {'label': 'Music Link Source',
-                          'value': self.config['music_provider'],
-                          'name': 'zapier_music_provider',
-                          'description': 'Select the source for music links in the notification. Leave blank to disable.<br>'
-                                         'Note: <a data-tab-destination="3rd_party_apis" data-dismiss="modal" >Metadata Lookups</a> '
-                                         'may need to be enabled under the 3rd Party APIs settings tab.',
-                          'input_type': 'select',
-                          'select_options': PrettyMetadata().get_music_providers()
-                          }
-                         ]
-
-        return config_option
-
-
-def check_browser_enabled():
-    global BROWSER_NOTIFIERS
-    BROWSER_NOTIFIERS = {}
-    for n in get_notifiers():
-        if n['agent_id'] == 17 and n['active']:
-            notifier_config = get_notifier_config(n['id'])
-            BROWSER_NOTIFIERS[n['id']] = notifier_config['config']['auto_hide_delay']
-
-
-def get_browser_notifications():
-    db = database.MonitorDatabase()
-    result = db.select("SELECT notifier_id, subject_text, body_text FROM notify_log "
-                       "WHERE agent_id = 17 AND timestamp >= ? ",
-                       args=[time.time() - 5])
-
-    notifications = []
-    for item in result:
-        notification = {'subject_text': item['subject_text'],
-                        'body_text': item['body_text'],
-                        'delay': BROWSER_NOTIFIERS.get(item['notifier_id'], 5)}
-        notifications.append(notification)
-
-    return {'notifications': notifications}
+        return config_option
\ No newline at end of file
diff --git a/plexpy/plex.py b/plexpy/plex.py
deleted file mode 100644
index 05a1bbb8..00000000
--- a/plexpy/plex.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# This file is part of Tautulli.
-#
-#  Tautulli is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  Tautulli 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
-
-import plexpy
-
-class DummyObject(object):
-    def __init__(self, *args, **kwargs):
-        pass
-
-    def __call__(self, *args, **kwargs):
-        return self
-
-    def __getattr__(self, attr):
-        return self
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        raise StopIteration
-
-
-PlexObject = DummyObject
-
-
-def initialize_plexapi():
-    from plexapi.server import PlexServer
-    global PlexObject
-    PlexObject = PlexServer
-
-
-class Plex(object):
-    def __init__(self, url=None, token=None):
-        url = url or plexpy.CONFIG.PMS_URL
-        token = token or plexpy.CONFIG.PMS_TOKEN
-        self.PlexServer = PlexObject(url, token)
-
-    def get_library(self, section_id):
-        return self.PlexServer.library.sectionByID(int(section_id))
-
-    def get_library_items(self, section_id):
-        return self.get_library(section_id).all()
-
-    def get_item(self, rating_key):
-        return self.PlexServer.fetchItem(rating_key)
diff --git a/plexpy/plexivity_import.py b/plexpy/plexivity_import.py
deleted file mode 100644
index 291abf19..00000000
--- a/plexpy/plexivity_import.py
+++ /dev/null
@@ -1,457 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# This file is part of Tautulli.
-#
-#  Tautulli is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  Tautulli 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
-
-import sqlite3
-from xml.dom import minidom
-
-import arrow
-
-from plexpy import activity_processor
-from plexpy import database
-from plexpy import helpers
-from plexpy import logger
-from plexpy import users
-
-
-def extract_plexivity_xml(xml=None):
-    output = {}
-    clean_xml = helpers.latinToAscii(xml)
-    try:
-        xml_parse = minidom.parseString(clean_xml)
-    except:
-        logger.warn("Tautulli Importer :: Error parsing XML for Plexivity database.")
-        return None
-
-    # I think Plexivity only tracked videos and not music?
-    xml_head = xml_parse.getElementsByTagName('Video')
-    if not xml_head:
-        logger.warn("Tautulli Importer :: Error parsing XML for Plexivity database.")
-        return None
-
-    for a in xml_head:
-        rating_key = helpers.get_xml_attr(a, 'ratingKey')
-        added_at = helpers.get_xml_attr(a, 'addedAt')
-        art = helpers.get_xml_attr(a, 'art')
-        duration = helpers.get_xml_attr(a, 'duration')
-        grandparent_rating_key = helpers.get_xml_attr(a, 'grandparentRatingKey')
-        grandparent_thumb = helpers.get_xml_attr(a, 'grandparentThumb')
-        grandparent_title = helpers.get_xml_attr(a, 'grandparentTitle')
-        original_title = helpers.get_xml_attr(a, 'originalTitle')
-        guid = helpers.get_xml_attr(a, 'guid')
-        section_id = helpers.get_xml_attr(a, 'librarySectionID')
-        media_index = helpers.get_xml_attr(a, 'index')
-        originally_available_at = helpers.get_xml_attr(a, 'originallyAvailableAt')
-        last_viewed_at = helpers.get_xml_attr(a, 'lastViewedAt')
-        parent_rating_key = helpers.get_xml_attr(a, 'parentRatingKey')
-        parent_media_index = helpers.get_xml_attr(a, 'parentIndex')
-        parent_thumb = helpers.get_xml_attr(a, 'parentThumb')
-        parent_title = helpers.get_xml_attr(a, 'parentTitle')
-        rating = helpers.get_xml_attr(a, 'rating')
-        thumb = helpers.get_xml_attr(a, 'thumb')
-        media_type = helpers.get_xml_attr(a, 'type')
-        updated_at = helpers.get_xml_attr(a, 'updatedAt')
-        view_offset = helpers.get_xml_attr(a, 'viewOffset')
-        year = helpers.get_xml_attr(a, 'year')
-        studio = helpers.get_xml_attr(a, 'studio')
-        title = helpers.get_xml_attr(a, 'title')
-        tagline = helpers.get_xml_attr(a, 'tagline')
-
-        directors = []
-        if a.getElementsByTagName('Director'):
-            director_elem = a.getElementsByTagName('Director')
-            for b in director_elem:
-                directors.append(helpers.get_xml_attr(b, 'tag'))
-
-        aspect_ratio = ''
-        audio_channels = None
-        audio_codec = ''
-        bitrate = None
-        container = ''
-        height = None
-        video_codec = ''
-        video_framerate = ''
-        video_resolution = ''
-        width = None
-
-        if a.getElementsByTagName('Media'):
-            media_elem = a.getElementsByTagName('Media')
-            for c in media_elem:
-                aspect_ratio = helpers.get_xml_attr(c, 'aspectRatio')
-                audio_channels = helpers.get_xml_attr(c, 'audioChannels')
-                audio_codec = helpers.get_xml_attr(c, 'audioCodec')
-                bitrate = helpers.get_xml_attr(c, 'bitrate')
-                container = helpers.get_xml_attr(c, 'container')
-                height = helpers.get_xml_attr(c, 'height')
-                video_codec = helpers.get_xml_attr(c, 'videoCodec')
-                video_framerate = helpers.get_xml_attr(c, 'videoFrameRate')
-                video_resolution = helpers.get_xml_attr(c, 'videoResolution')
-                width = helpers.get_xml_attr(c, 'width')
-
-        ip_address = ''
-        machine_id = ''
-        platform = ''
-        player = ''
-
-        if a.getElementsByTagName('Player'):
-            player_elem = a.getElementsByTagName('Player')
-            for d in player_elem:
-                ip_address = helpers.get_xml_attr(d, 'address').split('::ffff:')[-1]
-                machine_id = helpers.get_xml_attr(d, 'machineIdentifier')
-                platform = helpers.get_xml_attr(d, 'platform')
-                player = helpers.get_xml_attr(d, 'title')
-
-        transcode_audio_channels = None
-        transcode_audio_codec = ''
-        audio_decision = 'direct play'
-        transcode_container = ''
-        transcode_height = None
-        transcode_protocol = ''
-        transcode_video_codec = ''
-        video_decision = 'direct play'
-        transcode_width = None
-
-        if a.getElementsByTagName('TranscodeSession'):
-            transcode_elem = a.getElementsByTagName('TranscodeSession')
-            for e in transcode_elem:
-                transcode_audio_channels = helpers.get_xml_attr(e, 'audioChannels')
-                transcode_audio_codec = helpers.get_xml_attr(e, 'audioCodec')
-                audio_decision = helpers.get_xml_attr(e, 'audioDecision')
-                transcode_container = helpers.get_xml_attr(e, 'container')
-                transcode_height = helpers.get_xml_attr(e, 'height')
-                transcode_protocol = helpers.get_xml_attr(e, 'protocol')
-                transcode_video_codec = helpers.get_xml_attr(e, 'videoCodec')
-                video_decision = helpers.get_xml_attr(e, 'videoDecision')
-                transcode_width = helpers.get_xml_attr(e, 'width')
-
-        # Generate a combined transcode decision value
-        if video_decision == 'transcode' or audio_decision == 'transcode':
-            transcode_decision = 'transcode'
-        elif video_decision == 'copy' or audio_decision == 'copy':
-            transcode_decision = 'copy'
-        else:
-            transcode_decision = 'direct play'
-
-        user_id = None
-
-        if a.getElementsByTagName('User'):
-            user_elem = a.getElementsByTagName('User')
-            for f in user_elem:
-                user_id = helpers.get_xml_attr(f, 'id')
-
-        writers = []
-        if a.getElementsByTagName('Writer'):
-            writer_elem = a.getElementsByTagName('Writer')
-            for g in writer_elem:
-                writers.append(helpers.get_xml_attr(g, 'tag'))
-
-        actors = []
-        if a.getElementsByTagName('Role'):
-            actor_elem = a.getElementsByTagName('Role')
-            for h in actor_elem:
-                actors.append(helpers.get_xml_attr(h, 'tag'))
-
-        genres = []
-        if a.getElementsByTagName('Genre'):
-            genre_elem = a.getElementsByTagName('Genre')
-            for i in genre_elem:
-                genres.append(helpers.get_xml_attr(i, 'tag'))
-
-        labels = []
-        if a.getElementsByTagName('Lables'):
-            label_elem = a.getElementsByTagName('Lables')
-            for i in label_elem:
-                labels.append(helpers.get_xml_attr(i, 'tag'))
-
-        output = {'rating_key': rating_key,
-                  'added_at': added_at,
-                  'art': art,
-                  'duration': duration,
-                  'grandparent_rating_key': grandparent_rating_key,
-                  'grandparent_thumb': grandparent_thumb,
-                  'title': title,
-                  'parent_title': parent_title,
-                  'grandparent_title': grandparent_title,
-                  'original_title': original_title,
-                  'tagline': tagline,
-                  'guid': guid,
-                  'section_id': section_id,
-                  'media_index': media_index,
-                  'originally_available_at': originally_available_at,
-                  'last_viewed_at': last_viewed_at,
-                  'parent_rating_key': parent_rating_key,
-                  'parent_media_index': parent_media_index,
-                  'parent_thumb': parent_thumb,
-                  'rating': rating,
-                  'thumb': thumb,
-                  'media_type': media_type,
-                  'updated_at': updated_at,
-                  'view_offset': view_offset,
-                  'year': year,
-                  'directors': directors,
-                  'aspect_ratio': aspect_ratio,
-                  'audio_channels': audio_channels,
-                  'audio_codec': audio_codec,
-                  'bitrate': bitrate,
-                  'container': container,
-                  'height': height,
-                  'video_codec': video_codec,
-                  'video_framerate': video_framerate,
-                  'video_resolution': video_resolution,
-                  'width': width,
-                  'ip_address': ip_address,
-                  'machine_id': machine_id,
-                  'platform': platform,
-                  'player': player,
-                  'transcode_audio_channels': transcode_audio_channels,
-                  'transcode_audio_codec': transcode_audio_codec,
-                  'audio_decision': audio_decision,
-                  'transcode_container': transcode_container,
-                  'transcode_height': transcode_height,
-                  'transcode_protocol': transcode_protocol,
-                  'transcode_video_codec': transcode_video_codec,
-                  'video_decision': video_decision,
-                  'transcode_width': transcode_width,
-                  'transcode_decision': transcode_decision,
-                  'user_id': user_id,
-                  'writers': writers,
-                  'actors': actors,
-                  'genres': genres,
-                  'studio': studio,
-                  'labels': labels
-                  }
-
-    return output
-
-
-def validate_database(database_file=None, table_name=None):
-    try:
-        connection = sqlite3.connect(database_file, timeout=20)
-    except sqlite3.OperationalError:
-        logger.error("Tautulli Importer :: Invalid database specified.")
-        return 'Invalid database specified.'
-    except ValueError:
-        logger.error("Tautulli Importer :: Invalid database specified.")
-        return 'Invalid database specified.'
-    except:
-        logger.error("Tautulli Importer :: Uncaught exception.")
-        return 'Uncaught exception.'
-
-    try:
-        connection.execute('SELECT xml from %s' % table_name)
-        connection.close()
-    except sqlite3.OperationalError:
-        logger.error("Tautulli Importer :: Invalid database specified.")
-        return 'Invalid database specified.'
-    except:
-        logger.error("Tautulli Importer :: Uncaught exception.")
-        return 'Uncaught exception.'
-
-    return 'success'
-
-
-def import_from_plexivity(database_file=None, table_name=None, import_ignore_interval=0):
-
-    try:
-        connection = sqlite3.connect(database_file, timeout=20)
-        connection.row_factory = sqlite3.Row
-    except sqlite3.OperationalError:
-        logger.error("Tautulli Importer :: Invalid filename.")
-        return None
-    except ValueError:
-        logger.error("Tautulli Importer :: Invalid filename.")
-        return None
-
-    try:
-        connection.execute('SELECT xml from %s' % table_name)
-    except sqlite3.OperationalError:
-        logger.error("Tautulli Importer :: Database specified does not contain the required fields.")
-        return None
-
-    logger.debug("Tautulli Importer :: Plexivity data import in progress...")
-    database.set_is_importing(True)
-
-    ap = activity_processor.ActivityProcessor()
-    user_data = users.Users()
-
-    # Get the latest friends list so we can pull user id's
-    try:
-        users.refresh_users()
-    except:
-        logger.debug("Tautulli Importer :: Unable to refresh the users list. Aborting import.")
-        return None
-
-    query = "SELECT id AS id, " \
-            "time AS started, " \
-            "stopped, " \
-            "null AS user_id, " \
-            "user, " \
-            "ip_address, " \
-            "paused_counter, " \
-            "platform AS player, " \
-            "null AS platform, " \
-            "null as machine_id, " \
-            "null AS media_type, " \
-            "null AS view_offset, " \
-            "xml, " \
-            "rating as content_rating," \
-            "summary," \
-            "title AS full_title," \
-            "(case when orig_title_ep = 'n/a' then orig_title else " \
-            "orig_title_ep end) as title," \
-            "(case when orig_title_ep != 'n/a' then orig_title else " \
-            "null end) as grandparent_title " \
-            "FROM " + table_name + " ORDER BY id"
-
-    result = connection.execute(query)
-
-    for row in result:
-        # Extract the xml from the Plexivity db xml field.
-        extracted_xml = extract_plexivity_xml(row['xml'])
-
-        # If we get back None from our xml extractor skip over the record and log error.
-        if not extracted_xml:
-            logger.error("Tautulli Importer :: Skipping record with id %s due to malformed xml."
-                         % str(row['id']))
-            continue
-
-        # Skip line if we don't have a ratingKey to work with
-        #if not row['rating_key']:
-        #    logger.error("Tautulli Importer :: Skipping record due to null ratingKey.")
-        #    continue
-
-        # If the user_id no longer exists in the friends list, pull it from the xml.
-        if user_data.get_user_id(user=row['user']):
-            user_id = user_data.get_user_id(user=row['user'])
-        else:
-            user_id = extracted_xml['user_id']
-
-        session_history = {'started': arrow.get(row['started']).timestamp(),
-                           'stopped': arrow.get(row['stopped']).timestamp(),
-                           'rating_key': extracted_xml['rating_key'],
-                           'title': row['title'],
-                           'parent_title': extracted_xml['parent_title'],
-                           'grandparent_title': row['grandparent_title'],
-                           'original_title': extracted_xml['original_title'],
-                           'full_title': row['full_title'],
-                           'user_id': user_id,
-                           'user': row['user'],
-                           'ip_address': row['ip_address'] if row['ip_address'] else extracted_xml['ip_address'],
-                           'paused_counter': row['paused_counter'],
-                           'player': row['player'],
-                           'platform': extracted_xml['platform'],
-                           'machine_id': extracted_xml['machine_id'],
-                           'parent_rating_key': extracted_xml['parent_rating_key'],
-                           'grandparent_rating_key': extracted_xml['grandparent_rating_key'],
-                           'media_type': extracted_xml['media_type'],
-                           'view_offset': extracted_xml['view_offset'],
-                           'section_id': extracted_xml['section_id'],
-                           'video_decision': extracted_xml['video_decision'],
-                           'audio_decision': extracted_xml['audio_decision'],
-                           'transcode_decision': extracted_xml['transcode_decision'],
-                           'duration': extracted_xml['duration'],
-                           'width': extracted_xml['width'],
-                           'height': extracted_xml['height'],
-                           'container': extracted_xml['container'],
-                           'video_codec': extracted_xml['video_codec'],
-                           'audio_codec': extracted_xml['audio_codec'],
-                           'bitrate': extracted_xml['bitrate'],
-                           'video_resolution': extracted_xml['video_resolution'],
-                           'video_framerate': extracted_xml['video_framerate'],
-                           'aspect_ratio': extracted_xml['aspect_ratio'],
-                           'audio_channels': extracted_xml['audio_channels'],
-                           'transcode_protocol': extracted_xml['transcode_protocol'],
-                           'transcode_container': extracted_xml['transcode_container'],
-                           'transcode_video_codec': extracted_xml['transcode_video_codec'],
-                           'transcode_audio_codec': extracted_xml['transcode_audio_codec'],
-                           'transcode_audio_channels': extracted_xml['transcode_audio_channels'],
-                           'transcode_width': extracted_xml['transcode_width'],
-                           'transcode_height': extracted_xml['transcode_height']
-                           }
-
-        session_history_metadata = {'rating_key': extracted_xml['rating_key'],
-                                    'parent_rating_key': extracted_xml['parent_rating_key'],
-                                    'grandparent_rating_key': extracted_xml['grandparent_rating_key'],
-                                    'title': row['title'],
-                                    'parent_title': extracted_xml['parent_title'],
-                                    'grandparent_title': row['grandparent_title'],
-                                    'original_title': extracted_xml['original_title'],
-                                    'media_index': extracted_xml['media_index'],
-                                    'parent_media_index': extracted_xml['parent_media_index'],
-                                    'thumb': extracted_xml['thumb'],
-                                    'parent_thumb': extracted_xml['parent_thumb'],
-                                    'grandparent_thumb': extracted_xml['grandparent_thumb'],
-                                    'art': extracted_xml['art'],
-                                    'media_type': extracted_xml['media_type'],
-                                    'year': extracted_xml['year'],
-                                    'originally_available_at': extracted_xml['originally_available_at'],
-                                    'added_at': extracted_xml['added_at'],
-                                    'updated_at': extracted_xml['updated_at'],
-                                    'last_viewed_at': extracted_xml['last_viewed_at'],
-                                    'content_rating': row['content_rating'],
-                                    'summary': row['summary'],
-                                    'tagline': extracted_xml['tagline'],
-                                    'rating': extracted_xml['rating'],
-                                    'duration': extracted_xml['duration'],
-                                    'guid': extracted_xml['guid'],
-                                    'directors': extracted_xml['directors'],
-                                    'writers': extracted_xml['writers'],
-                                    'actors': extracted_xml['actors'],
-                                    'genres': extracted_xml['genres'],
-                                    'studio': extracted_xml['studio'],
-                                    'labels': extracted_xml['labels'],
-                                    'full_title': row['full_title'],
-                                    'width': extracted_xml['width'],
-                                    'height': extracted_xml['height'],
-                                    'container': extracted_xml['container'],
-                                    'video_codec': extracted_xml['video_codec'],
-                                    'audio_codec': extracted_xml['audio_codec'],
-                                    'bitrate': extracted_xml['bitrate'],
-                                    'video_resolution': extracted_xml['video_resolution'],
-                                    'video_framerate': extracted_xml['video_framerate'],
-                                    'aspect_ratio': extracted_xml['aspect_ratio'],
-                                    'audio_channels': extracted_xml['audio_channels']
-                                    }
-
-        # On older versions of PMS, "clip" items were still classified as "movie" and had bad ratingKey values
-        # Just make sure that the ratingKey is indeed an integer
-        if session_history_metadata['rating_key'].isdigit():
-            ap.write_session_history(session=session_history,
-                                     import_metadata=session_history_metadata,
-                                     is_import=True,
-                                     import_ignore_interval=import_ignore_interval)
-        else:
-            logger.debug("Tautulli Importer :: Item has bad rating_key: %s" % session_history_metadata['rating_key'])
-
-    import_users()
-
-    logger.debug("Tautulli Importer :: Plexivity data import complete.")
-    database.set_is_importing(False)
-
-
-def import_users():
-    logger.debug("Tautulli Importer :: Importing Plexivity Users...")
-    monitor_db = database.MonitorDatabase()
-
-    query = "INSERT OR IGNORE INTO users (user_id, username) " \
-            "SELECT user_id, user " \
-            "FROM session_history WHERE user_id != 1 GROUP BY user_id"
-
-    try:
-        monitor_db.action(query)
-        logger.debug("Tautulli Importer :: Users imported.")
-    except:
-        logger.debug("Tautulli Importer :: Failed to import users.")
diff --git a/plexpy/plextv.py b/plexpy/plextv.py
index eed9d50e..03372fdc 100644
--- a/plexpy/plextv.py
+++ b/plexpy/plextv.py
@@ -1,216 +1,166 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# This file is part of Tautulli.
+# This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
+from plexpy import logger, helpers, users, http_handler, database
+import xmltodict
 import json
-from urllib.parse import unquote
+from xml.dom import minidom
 
+import base64
 import plexpy
-from plexpy import common
-from plexpy import helpers
-from plexpy import http_handler
-from plexpy import logger
-from plexpy import users
-from plexpy import pmsconnect
-from plexpy import session
-from plexpy.plex import Plex
 
 
-def get_server_resources(return_presence=False, return_server=False, return_info=False, **kwargs):
-    if not return_presence and not return_info:
-        logger.info("Tautulli PlexTV :: Requesting resources for server...")
+def refresh_users():
+    logger.info("Requesting users list refresh...")
+    result = PlexTV().get_full_users_list()
+    monitor_db = database.MonitorDatabase()
 
-    server = {'pms_name': helpers.pms_name(),
-              'pms_version': plexpy.CONFIG.PMS_VERSION,
-              'pms_platform': plexpy.CONFIG.PMS_PLATFORM,
-              'pms_ip': plexpy.CONFIG.PMS_IP,
-              'pms_port': plexpy.CONFIG.PMS_PORT,
-              'pms_ssl': plexpy.CONFIG.PMS_SSL,
-              'pms_is_cloud': plexpy.CONFIG.PMS_IS_CLOUD,
-              'pms_url': plexpy.CONFIG.PMS_URL,
-              'pms_url_manual': plexpy.CONFIG.PMS_URL_MANUAL,
-              'pms_identifier': plexpy.CONFIG.PMS_IDENTIFIER,
-              'pms_plexpass': plexpy.CONFIG.PMS_PLEXPASS
-              }
+    if len(result) > 0:
+        for item in result:
+            control_value_dict = {"user_id": item['user_id']}
+            new_value_dict = {"username": item['username'],
+                              "thumb": item['thumb'],
+                              "email": item['email'],
+                              "is_home_user": item['is_home_user'],
+                              "is_allow_sync": item['is_allow_sync'],
+                              "is_restricted": item['is_restricted']
+                              }
 
-    if return_info:
-        return server
+            # Check if we've set a custom avatar if so don't overwrite it.
+            if item['user_id']:
+                avatar_urls = monitor_db.select('SELECT thumb, custom_avatar_url '
+                                                'FROM users WHERE user_id = ?',
+                                                [item['user_id']])
+                if avatar_urls:
+                    if not avatar_urls[0]['custom_avatar_url'] or \
+                            avatar_urls[0]['custom_avatar_url'] == avatar_urls[0]['thumb']:
+                        new_value_dict['custom_avatar_url'] = item['thumb']
+                else:
+                    new_value_dict['custom_avatar_url'] = item['thumb']
 
-    if kwargs:
-        server.update(kwargs)
-        for k in ['pms_ssl', 'pms_is_cloud', 'pms_url_manual']:
-            server[k] = int(server[k])
+            monitor_db.upsert('users', new_value_dict, control_value_dict)
 
-    if server['pms_url_manual'] and server['pms_ssl'] or server['pms_is_cloud']:
-        scheme = 'https'
+        logger.info("Users list refreshed.")
     else:
-        scheme = 'http'
+        logger.warn("Unable to refresh users list.")
 
-    fallback_url = '{scheme}://{hostname}:{port}'.format(scheme=scheme,
-                                                         hostname=server['pms_ip'],
-                                                         port=server['pms_port'])
 
-    plex_tv = PlexTV()
-    plex_tv.ping()
-    result = plex_tv.get_server_connections(pms_identifier=server['pms_identifier'],
-                                            pms_ip=server['pms_ip'],
-                                            pms_port=server['pms_port'],
-                                            include_https=server['pms_ssl'])
+def get_real_pms_url():
+    logger.info("Requesting URLs for server...")
 
-    if result:
-        connections = result.pop('connections', [])
-        server.update(result)
-        presence = server.pop('pms_presence', 0)
-    else:
-        connections = []
-        presence = 0
-
-    if return_presence:
-        return presence
-
-    plexpass = plex_tv.get_plexpass_status()
-    server['pms_plexpass'] = int(plexpass)
-
-    # Only need to retrieve PMS_URL if using SSL
-    if not server['pms_url_manual'] and server['pms_ssl']:
-        if connections:
-            # Get connection with matching address, otherwise return first connection
-            connection = next(
-                (c for c in connections if c['address'] == server['pms_ip'] and c['port'] == str(server['pms_port'])),
-                connections[0]
-            )
-            server['pms_url'] = connection['uri']
-            server['pms_is_remote'] = int(connection['local'] == '0')
-            logger.info("Tautulli PlexTV :: Server URL retrieved.")
-
-        # get_server_urls() failed or PMS_URL not found, fallback url doesn't use SSL
-        if not server['pms_url']:
-            server['pms_url'] = fallback_url
-            server['pms_is_remote'] = 0
-            logger.warn("Tautulli PlexTV :: Unable to retrieve server URLs. Using user-defined value without SSL.")
-
-    # Not using SSL
-    else:
-        server['pms_url'] = fallback_url
-        server['pms_is_remote'] = 0
-        logger.info("Tautulli PlexTV :: Using user-defined URL.")
-
-    if return_server:
-        return server
-
-    logger.info("Tautulli PlexTV :: Selected server: %s (%s) (%s - Version %s)",
-                server['pms_name'], server['pms_url'], server['pms_platform'], server['pms_version'])
-
-    plexpy.CONFIG.process_kwargs(server)
+    # Reset any current PMS_URL value
+    plexpy.CONFIG.__setattr__('PMS_URL', '')
     plexpy.CONFIG.write()
 
+    fallback_url = 'http://' + plexpy.CONFIG.PMS_IP + ':' + str(plexpy.CONFIG.PMS_PORT)
+
+    if plexpy.CONFIG.PMS_SSL:
+        result = PlexTV().get_server_urls(include_https=True)
+        process_urls = True
+    elif plexpy.CONFIG.PMS_IS_REMOTE:
+        result = PlexTV().get_server_urls(include_https=False)
+        process_urls = True
+    else:
+        process_urls = False
+
+    if process_urls:
+        if len(result) > 0:
+            for item in result:
+                if plexpy.CONFIG.PMS_IS_REMOTE and item['local'] == '0':
+                        plexpy.CONFIG.__setattr__('PMS_URL', item['uri'])
+                        plexpy.CONFIG.write()
+                        logger.info("Server URL retrieved.")
+                if not plexpy.CONFIG.PMS_IS_REMOTE and item['local'] == '1':
+                        plexpy.CONFIG.__setattr__('PMS_URL', item['uri'])
+                        plexpy.CONFIG.write()
+                        logger.info("Server URL retrieved.")
+        else:
+            plexpy.CONFIG.__setattr__('PMS_URL', fallback_url)
+            plexpy.CONFIG.write()
+            logger.warn("Unable to retrieve server URLs. Using user-defined value.")
+    else:
+        plexpy.CONFIG.__setattr__('PMS_URL', fallback_url)
+        plexpy.CONFIG.write()
+
 
 class PlexTV(object):
     """
     Plex.tv authentication
     """
 
-    def __init__(self, username=None, password=None, token=None, headers=None):
+    def __init__(self, username=None, password=None):
+        self.protocol = 'HTTPS'
         self.username = username
         self.password = password
-        self.token = token
-
-        self.urls = 'https://plex.tv'
-        self.timeout = plexpy.CONFIG.PMS_TIMEOUT
         self.ssl_verify = plexpy.CONFIG.VERIFY_SSL_CERT
 
-        if self.username is None and self.password is None:
-            if not self.token:
-                # Check if we should use the admin token, or the guest server token
-                if session.get_session_user_id():
-                    user_data = users.Users()
-                    user_tokens = user_data.get_tokens(user_id=session.get_session_user_id())
-                    self.token = user_tokens['server_token']
-                else:
-                    self.token = plexpy.CONFIG.PMS_TOKEN
+        self.request_handler = http_handler.HTTPHandler(host='plex.tv',
+                                                        port=443,
+                                                        token=plexpy.CONFIG.PMS_TOKEN,
+                                                        ssl_verify=self.ssl_verify)
 
-            if not self.token:
-                logger.error("Tautulli PlexTV :: PlexTV called, but no token provided.")
+    def get_plex_auth(self, output_format='raw'):
+        uri = '/users/sign_in.xml'
+        base64string = base64.encodestring('%s:%s' % (self.username, self.password)).replace('\n', '')
+        headers = {'Content-Type': 'application/xml; charset=utf-8',
+                   'Content-Length': '0',
+                   'X-Plex-Device-Name': 'PlexPy',
+                   'X-Plex-Product': 'PlexPy',
+                   'X-Plex-Version': 'v0.1 dev',
+                   'X-Plex-Client-Identifier': plexpy.CONFIG.PMS_UUID,
+                   'Authorization': 'Basic %s' % base64string + ":"
+                   }
 
-        self.request_handler = http_handler.HTTPHandler(urls=self.urls,
-                                                        token=self.token,
-                                                        timeout=self.timeout,
-                                                        ssl_verify=self.ssl_verify,
-                                                        headers=headers)
+        request = self.request_handler.make_request(uri=uri,
+                                                    proto=self.protocol,
+                                                    request_type='POST',
+                                                    headers=headers,
+                                                    output_format=output_format)
 
-    def get_server_token(self):
-        servers = self.get_plextv_resources(output_format='xml')
-        server_token = ''
-
-        try:
-            xml_head = servers.getElementsByTagName('Device')
-        except Exception as e:
-            logger.warn("Tautulli PlexTV :: Unable to parse XML for get_server_token: %s." % e)
-            return None
-
-        for a in xml_head:
-            if helpers.get_xml_attr(a, 'clientIdentifier') == plexpy.CONFIG.PMS_IDENTIFIER \
-                    and 'server' in helpers.get_xml_attr(a, 'provides'):
-                server_token = helpers.get_xml_attr(a, 'accessToken')
-                break
-
-        return server_token
-
-    def get_plextv_pin(self, pin='', output_format=''):
-        if pin:
-            uri = '/api/v2/pins/' + pin
-            request = self.request_handler.make_request(uri=uri,
-                                                        request_type='GET',
-                                                        output_format=output_format,
-                                                        no_token=True)
-        else:
-            uri = '/api/v2/pins?strong=true'
-            request = self.request_handler.make_request(uri=uri,
-                                                        request_type='POST',
-                                                        output_format=output_format,
-                                                        no_token=True)
         return request
 
-    def get_pin(self, pin=''):
-        plextv_response = self.get_plextv_pin(pin=pin,
-                                              output_format='xml')
+    def get_token(self):
+        plextv_response = self.get_plex_auth(output_format='xml')
 
         if plextv_response:
-            try:
-                xml_head = plextv_response.getElementsByTagName('pin')
-                if xml_head:
-                    pin = {'id': xml_head[0].getAttribute('id'),
-                           'code': xml_head[0].getAttribute('code'),
-                           'token': xml_head[0].getAttribute('authToken')
-                           }
-                    return pin
-                else:
-                    logger.warn("Tautulli PlexTV :: Could not get Plex authentication pin.")
-                    return None
+            xml_head = plextv_response.getElementsByTagName('user')
+            if not xml_head:
+                logger.warn("Error parsing XML for Plex.tv token")
+                return []
 
-            except Exception as e:
-                logger.warn("Tautulli PlexTV :: Unable to parse XML for get_pin: %s." % e)
-                return None
+            auth_token = xml_head[0].getAttribute('authenticationToken')
 
+            return auth_token
         else:
-            return None
+            return []
+
+    def get_plextv_user_data(self):
+        plextv_response = self.get_plex_auth(output_format='dict')
+
+        if plextv_response:
+            return plextv_response
+        else:
+            return []
 
     def get_plextv_friends(self, output_format=''):
         uri = '/api/users'
         request = self.request_handler.make_request(uri=uri,
+                                                    proto=self.protocol,
                                                     request_type='GET',
                                                     output_format=output_format)
 
@@ -219,14 +169,7 @@ class PlexTV(object):
     def get_plextv_user_details(self, output_format=''):
         uri = '/users/account'
         request = self.request_handler.make_request(uri=uri,
-                                                    request_type='GET',
-                                                    output_format=output_format)
-
-        return request
-
-    def get_plextv_devices_list(self, output_format=''):
-        uri = '/devices.xml'
-        request = self.request_handler.make_request(uri=uri,
+                                                    proto=self.protocol,
                                                     request_type='GET',
                                                     output_format=output_format)
 
@@ -235,720 +178,269 @@ class PlexTV(object):
     def get_plextv_server_list(self, output_format=''):
         uri = '/pms/servers.xml'
         request = self.request_handler.make_request(uri=uri,
-                                                    request_type='GET',
-                                                    output_format=output_format)
-
-        return request
-
-    def get_plextv_shared_servers(self, machine_id='', output_format=''):
-        uri = '/api/servers/%s/shared_servers' % machine_id
-        request = self.request_handler.make_request(uri=uri,
+                                                    proto=self.protocol,
                                                     request_type='GET',
                                                     output_format=output_format)
 
         return request
 
     def get_plextv_sync_lists(self, machine_id='', output_format=''):
-        uri = '/servers/%s/sync_lists' % machine_id
+        uri = '/servers/' + machine_id + '/sync_lists'
         request = self.request_handler.make_request(uri=uri,
+                                                    proto=self.protocol,
                                                     request_type='GET',
                                                     output_format=output_format)
 
         return request
 
-    def get_plextv_resources(self, include_https=False, return_response=False, output_format=''):
+    def get_plextv_resources(self, include_https=False, output_format=''):
         if include_https:
             uri = '/api/resources?includeHttps=1'
         else:
             uri = '/api/resources'
         request = self.request_handler.make_request(uri=uri,
-                                                    request_type='GET',
-                                                    return_response=return_response,
-                                                    output_format=output_format)
-
-        return request
-
-    def get_plextv_downloads(self, plexpass=False, output_format=''):
-        if plexpass:
-            uri = '/api/downloads/5.json?channel=plexpass'
-        else:
-            uri = '/api/downloads/1.json'
-        request = self.request_handler.make_request(uri=uri,
+                                                    proto=self.protocol,
                                                     request_type='GET',
                                                     output_format=output_format)
 
         return request
 
-    def delete_plextv_device(self, device_id='', output_format=''):
-        uri = '/devices/%s.xml' % device_id
-        request = self.request_handler.make_request(uri=uri,
-                                                    request_type='DELETE',
-                                                    output_format=output_format)
-
-        return request
-
-    def delete_plextv_device_sync_lists(self, client_id='', output_format=''):
-        uri = '/devices/%s/sync_items' % client_id
-        request = self.request_handler.make_request(uri=uri,
-                                                    request_type='GET',
-                                                    output_format=output_format)
-
-        return request
-
-    def delete_plextv_sync(self, client_id='', sync_id=''):
-        uri = '/devices/%s/sync_items/%s' % (client_id, sync_id)
-        request = self.request_handler.make_request(uri=uri,
-                                                    request_type='DELETE',
-                                                    return_response=True)
-
-        return request
-
-    def cloud_server_status(self, output_format=''):
-        uri = '/api/v2/cloud_server'
-        request = self.request_handler.make_request(uri=uri,
-                                                    request_type='GET',
-                                                    output_format=output_format)
-
-        return request
-
-    def get_public_ip(self, output_format=''):
-        uri = '/:/ip'
-        request = self.request_handler.make_request(uri=uri,
-                                                    request_type='GET',
-                                                    output_format=output_format)
-
-        return request
-
-    def get_plextv_geoip(self, ip_address='', output_format=''):
-        uri = '/api/v2/geoip?ip_address=%s' % ip_address
-        request = self.request_handler.make_request(uri=uri,
-                                                    request_type='GET',
-                                                    output_format=output_format)
-
-        return request
-
-    def ping_plextv(self, output_format=''):
-        uri = '/api/v2/ping'
-        request = self.request_handler.make_request(uri=uri,
-                                                    request_type='GET',
-                                                    output_format=output_format)
-        return request
-
     def get_full_users_list(self):
-        own_account = self.get_plextv_user_details(output_format='xml')
-        friends_list = self.get_plextv_friends(output_format='xml')
-        shared_servers = self.get_plextv_shared_servers(machine_id=plexpy.CONFIG.PMS_IDENTIFIER,
-                                                        output_format='xml')
-
+        friends_list = self.get_plextv_friends()
+        own_account = self.get_plextv_user_details()
         users_list = []
 
         try:
-            xml_head = own_account.getElementsByTagName('user')
-        except Exception as e:
-            logger.warn("Tautulli PlexTV :: Unable to parse own account XML for get_full_users_list: %s." % e)
+            xml_parse = minidom.parseString(own_account)
+        except Exception, e:
+            logger.warn("Error parsing XML for Plex account details: %s" % e)
+            return []
+        except:
+            logger.warn("Error parsing XML for Plex account details.")
             return []
 
-        for a in xml_head:
-            own_details = {"user_id": helpers.get_xml_attr(a, 'id'),
-                           "username": helpers.get_xml_attr(a, 'username'),
-                           "title": helpers.get_xml_attr(a, 'title'),
-                           "thumb": helpers.get_xml_attr(a, 'thumb'),
-                           "email": helpers.get_xml_attr(a, 'email'),
-                           "is_active": 1,
-                           "is_admin": 1,
-                           "is_home_user": helpers.get_xml_attr(a, 'home'),
-                           "is_allow_sync": 1,
-                           "is_restricted": helpers.get_xml_attr(a, 'restricted'),
-                           "filter_all": helpers.get_xml_attr(a, 'filterAll'),
-                           "filter_movies": helpers.get_xml_attr(a, 'filterMovies'),
-                           "filter_tv": helpers.get_xml_attr(a, 'filterTelevision'),
-                           "filter_music": helpers.get_xml_attr(a, 'filterMusic'),
-                           "filter_photos": helpers.get_xml_attr(a, 'filterPhotos'),
-                           "user_token": helpers.get_xml_attr(a, 'authToken'),
-                           "server_token": helpers.get_xml_attr(a, 'authToken'),
-                           "shared_libraries": None,
-                           }
+        xml_head = xml_parse.getElementsByTagName('user')
+        if not xml_head:
+            logger.warn("Error parsing XML for Plex account details.")
+        else:
+            for a in xml_head:
+                own_details = {"user_id": helpers.get_xml_attr(a, 'id'),
+                               "username": helpers.get_xml_attr(a, 'username'),
+                               "thumb": helpers.get_xml_attr(a, 'thumb'),
+                               "email": helpers.get_xml_attr(a, 'email'),
+                               "is_home_user": helpers.get_xml_attr(a, 'home'),
+                               "is_allow_sync": None,
+                               "is_restricted": helpers.get_xml_attr(a, 'restricted')
+                               }
 
-            users_list.append(own_details)
+                users_list.append(own_details)
 
         try:
-            xml_head = friends_list.getElementsByTagName('User')
-        except Exception as e:
-            logger.warn("Tautulli PlexTV :: Unable to parse friends list XML for get_full_users_list: %s." % e)
-            return []
+            xml_parse = minidom.parseString(friends_list)
+        except Exception, e:
+            logger.warn("Error parsing XML for Plex friends list: %s" % e)
+        except:
+            logger.warn("Error parsing XML for Plex friends list.")
 
-        for a in xml_head:
-            friend = {"user_id": helpers.get_xml_attr(a, 'id'),
-                      "username": helpers.get_xml_attr(a, 'username'),
-                      "title": helpers.get_xml_attr(a, 'title'),
-                      "thumb": helpers.get_xml_attr(a, 'thumb'),
-                      "email": helpers.get_xml_attr(a, 'email'),
-                      "is_active": 1,
-                      "is_admin": 0,
-                      "is_home_user": helpers.get_xml_attr(a, 'home'),
-                      "is_allow_sync": helpers.get_xml_attr(a, 'allowSync'),
-                      "is_restricted": helpers.get_xml_attr(a, 'restricted'),
-                      "filter_all": helpers.get_xml_attr(a, 'filterAll'),
-                      "filter_movies": helpers.get_xml_attr(a, 'filterMovies'),
-                      "filter_tv": helpers.get_xml_attr(a, 'filterTelevision'),
-                      "filter_music": helpers.get_xml_attr(a, 'filterMusic'),
-                      "filter_photos": helpers.get_xml_attr(a, 'filterPhotos')
-                      }
+        xml_head = xml_parse.getElementsByTagName('User')
+        if not xml_head:
+            logger.warn("Error parsing XML for Plex friends list.")
+        else:
+            for a in xml_head:
+                friend = {"user_id": helpers.get_xml_attr(a, 'id'),
+                          "username": helpers.get_xml_attr(a, 'title'),
+                          "thumb": helpers.get_xml_attr(a, 'thumb'),
+                          "email": helpers.get_xml_attr(a, 'email'),
+                          "is_home_user": helpers.get_xml_attr(a, 'home'),
+                          "is_allow_sync": helpers.get_xml_attr(a, 'allowSync'),
+                          "is_restricted": helpers.get_xml_attr(a, 'restricted')
+                          }
 
-            users_list.append(friend)
-
-        try:
-            xml_head = shared_servers.getElementsByTagName('SharedServer')
-        except Exception as e:
-            logger.warn("Tautulli PlexTV :: Unable to parse shared server list XML for get_full_users_list: %s." % e)
-            return []
-
-        user_map = {}
-        for a in xml_head:
-            user_id = helpers.get_xml_attr(a, 'userID')
-            server_token = helpers.get_xml_attr(a, 'accessToken')
-
-            sections = a.getElementsByTagName('Section')
-            shared_libraries = [helpers.get_xml_attr(s, 'key')
-                                for s in sections if helpers.get_xml_attr(s, 'shared') == '1']
-
-            user_map[user_id] = {'server_token': server_token,
-                                 'shared_libraries': shared_libraries}
-
-        for u in users_list:
-            d = user_map.get(u['user_id'], {})
-            u.update(d)
+                users_list.append(friend)
 
         return users_list
 
-    def get_synced_items(self, machine_id=None, client_id_filter=None, user_id_filter=None,
-                         rating_key_filter=None, sync_id_filter=None):
-
-        if not machine_id:
-            machine_id = plexpy.CONFIG.PMS_IDENTIFIER
-
-        if isinstance(rating_key_filter, list):
-            rating_key_filter = [str(k) for k in rating_key_filter]
-        elif rating_key_filter:
-            rating_key_filter = [str(rating_key_filter)]
-
-        if isinstance(user_id_filter, list):
-            user_id_filter = [str(k) for k in user_id_filter]
-        elif user_id_filter:
-            user_id_filter = [str(user_id_filter)]
-
-        sync_list = self.get_plextv_sync_lists(machine_id, output_format='xml')
+    def get_synced_items(self, machine_id=None, user_id=None):
+        sync_list = self.get_plextv_sync_lists(machine_id)
         user_data = users.Users()
 
         synced_items = []
 
         try:
-            xml_head = sync_list.getElementsByTagName('SyncList')
-        except Exception as e:
-            logger.warn("Tautulli PlexTV :: Unable to parse XML for get_synced_items: %s." % e)
-            return {}
+            xml_parse = minidom.parseString(sync_list)
+        except Exception, e:
+            logger.warn("Error parsing XML for Plex sync lists: %s" % e)
+            return []
+        except:
+            logger.warn("Error parsing XML for Plex sync lists.")
+            return []
 
-        for a in xml_head:
-            client_id = helpers.get_xml_attr(a, 'clientIdentifier')
+        xml_head = xml_parse.getElementsByTagName('SyncList')
 
-            # Filter by client_id
-            if client_id_filter and str(client_id_filter) != client_id:
-                continue
-
-            sync_list_id = helpers.get_xml_attr(a, 'id')
-            sync_device = a.getElementsByTagName('Device')
-
-            for device in sync_device:
-                device_user_id = helpers.get_xml_attr(device, 'userID')
-                try:
-                    device_username = user_data.get_details(user_id=device_user_id)['username']
-                    device_friendly_name = user_data.get_details(user_id=device_user_id)['friendly_name']
-                except:
-                    device_username = ''
-                    device_friendly_name = ''
-                device_name = helpers.get_xml_attr(device, 'name')
-                device_product = helpers.get_xml_attr(device, 'product')
-                device_product_version = helpers.get_xml_attr(device, 'productVersion')
-                device_platform = helpers.get_xml_attr(device, 'platform')
-                device_platform_version = helpers.get_xml_attr(device, 'platformVersion')
-                device_type = helpers.get_xml_attr(device, 'device')
-                device_model = helpers.get_xml_attr(device, 'model')
-                device_last_seen = helpers.get_xml_attr(device, 'lastSeenAt')
-
-            # Filter by user_id
-            if user_id_filter and device_user_id not in user_id_filter:
-                continue
-
-            for synced in a.getElementsByTagName('SyncItems'):
-                sync_item = synced.getElementsByTagName('SyncItem')
-                for item in sync_item:
-
-                    sync_media_type = None
-                    rating_key = None
-                    for location in item.getElementsByTagName('Location'):
-                        location_uri = unquote(helpers.get_xml_attr(location, 'uri'))
-
-                        if location_uri.startswith('library://'):
-                            if 'collection' in location_uri:
-                                sync_media_type = 'collection'
-                            clean_uri = location_uri.split('/')
-                            rating_key = next((j for i, j in zip(clean_uri[:-1], clean_uri[1:])
-                                              if i in ('metadata', 'collections')), None)
-
-                        elif location_uri.startswith('playlist://'):
-                            sync_media_type = 'playlist'
-                            tokens = users.Users().get_tokens(user_id=device_user_id)
-                            if tokens['server_token']:
-                                plex = Plex(token=tokens['server_token'])
-                                for playlist in plex.PlexServer.playlists():
-                                    if location_uri.endswith(playlist.guid):
-                                        rating_key = str(playlist.ratingKey)  # String for backwards consistency
-
-                    # Filter by rating_key
-                    if rating_key_filter and rating_key not in rating_key_filter:
-                        continue
-
-                    sync_id = helpers.get_xml_attr(item, 'id')
-
-                    # Filter by sync_id
-                    if sync_id_filter and str(sync_id_filter) != sync_id:
-                        continue
-
-                    sync_version = helpers.get_xml_attr(item, 'version')
-                    sync_root_title = helpers.get_xml_attr(item, 'rootTitle')
-                    sync_title = helpers.get_xml_attr(item, 'title')
-                    sync_metadata_type = helpers.get_xml_attr(item, 'metadataType')
-                    sync_content_type = helpers.get_xml_attr(item, 'contentType')
-
-                    for status in item.getElementsByTagName('Status'):
-                        status_failure_code = helpers.get_xml_attr(status, 'failureCode')
-                        status_failure = helpers.get_xml_attr(status, 'failure')
-                        status_state = helpers.get_xml_attr(status, 'state')
-                        status_item_count = helpers.get_xml_attr(status, 'itemsCount')
-                        status_item_complete_count = helpers.get_xml_attr(status, 'itemsCompleteCount')
-                        status_item_downloaded_count = helpers.get_xml_attr(status, 'itemsDownloadedCount')
-                        status_item_ready_count = helpers.get_xml_attr(status, 'itemsReadyCount')
-                        status_item_successful_count = helpers.get_xml_attr(status, 'itemsSuccessfulCount')
-                        status_total_size = helpers.get_xml_attr(status, 'totalSize')
-                        status_item_download_percent_complete = helpers.get_percent(
-                            status_item_downloaded_count, status_item_count)
-
-                    for settings in item.getElementsByTagName('MediaSettings'):
-                        settings_video_bitrate = helpers.get_xml_attr(settings, 'maxVideoBitrate')
-                        settings_video_quality = helpers.get_xml_attr(settings, 'videoQuality')
-                        settings_video_resolution = helpers.get_xml_attr(settings, 'videoResolution')
-                        settings_audio_boost = helpers.get_xml_attr(settings, 'audioBoost')
-                        settings_audio_bitrate = helpers.get_xml_attr(settings, 'musicBitrate')
-                        settings_photo_quality = helpers.get_xml_attr(settings, 'photoQuality')
-                        settings_photo_resolution = helpers.get_xml_attr(settings, 'photoResolution')
-
-                    sync_details = {"device_name": device_name,
-                                    "platform": device_platform,
-                                    "user_id": device_user_id,
-                                    "user": device_friendly_name,
-                                    "username": device_username,
-                                    "root_title": sync_root_title,
-                                    "sync_title": sync_title,
-                                    "metadata_type": sync_metadata_type,
-                                    "content_type": sync_content_type,
-                                    "rating_key": rating_key,
-                                    "state": status_state,
-                                    "item_count": status_item_count,
-                                    "item_complete_count": status_item_complete_count,
-                                    "item_downloaded_count": status_item_downloaded_count,
-                                    "item_downloaded_percent_complete": status_item_download_percent_complete,
-                                    "video_bitrate": settings_video_bitrate,
-                                    "audio_bitrate": settings_audio_bitrate,
-                                    "photo_quality": settings_photo_quality,
-                                    "video_quality": settings_video_quality,
-                                    "total_size": status_total_size,
-                                    "failure": status_failure,
-                                    "client_id": client_id,
-                                    "sync_id": sync_id,
-                                    "sync_media_type": sync_media_type
-                                    }
-
-                    synced_items.append(sync_details)
-
-        return session.filter_session_info(synced_items, filter_key='user_id')
-
-    def delete_sync(self, client_id, sync_id):
-        logger.info("Tautulli PlexTV :: Deleting sync item '%s'." % sync_id)
-        response = self.delete_plextv_sync(client_id=client_id, sync_id=sync_id)
-        return response.ok
-
-    def get_server_connections(self, pms_identifier='', pms_ip='', pms_port=32400, include_https=True):
-
-        if not pms_identifier:
-            logger.error("Tautulli PlexTV :: Unable to retrieve server connections: no pms_identifier provided.")
-            return {}
-
-        plextv_resources = self.get_plextv_resources(include_https=include_https,
-                                                     output_format='xml')
-        try:
-            xml_head = plextv_resources.getElementsByTagName('Device')
-        except Exception as e:
-            logger.warn("Tautulli PlexTV :: Unable to parse XML for get_server_urls: %s." % e)
-            return {}
-
-        # Function to get all connections for a device
-        def get_connections(device):
-            conn = []
-            connections = device.getElementsByTagName('Connection')
-
-            server = {'pms_identifier': helpers.get_xml_attr(device, 'clientIdentifier'),
-                      'pms_name': helpers.get_xml_attr(device, 'name'),
-                      'pms_version': helpers.get_xml_attr(device, 'productVersion'),
-                      'pms_platform': helpers.get_xml_attr(device, 'platform'),
-                      'pms_presence': helpers.get_xml_attr(device, 'presence'),
-                      'pms_is_cloud': 1 if helpers.get_xml_attr(device, 'platform') == 'Cloud' else 0
-                      }
-
-            for c in connections:
-                server_details = {'protocol': helpers.get_xml_attr(c, 'protocol'),
-                                  'address': helpers.get_xml_attr(c, 'address'),
-                                  'port': helpers.get_xml_attr(c, 'port'),
-                                  'uri': helpers.get_xml_attr(c, 'uri'),
-                                  'local': helpers.get_xml_attr(c, 'local')
-                                  }
-                conn.append(server_details)
-
-            server['connections'] = conn
-            return server
-
-        server = {}
-
-        # Try to match the device
-        for a in xml_head:
-            if helpers.get_xml_attr(a, 'clientIdentifier') == pms_identifier:
-                server = get_connections(a)
-                break
-
-        # Else no device match found
-        if not server:
-            # Try to match the PMS_IP and PMS_PORT
+        if not xml_head:
+            logger.warn("Error parsing XML for Plex sync lists.")
+        else:
             for a in xml_head:
-                if helpers.get_xml_attr(a, 'provides') == 'server':
-                    connections = a.getElementsByTagName('Connection')
+                client_id = helpers.get_xml_attr(a, 'id')
+                sync_device = a.getElementsByTagName('Device')
+                for device in sync_device:
+                    device_user_id = helpers.get_xml_attr(device, 'userID')
+                    try:
+                        device_username = user_data.get_user_details(user_id=device_user_id)['username']
+                        device_friendly_name = user_data.get_user_details(user_id=device_user_id)['friendly_name']
+                    except:
+                        device_username = ''
+                        device_friendly_name = ''
+                    device_name = helpers.get_xml_attr(device, 'name')
+                    device_product = helpers.get_xml_attr(device, 'product')
+                    device_product_version = helpers.get_xml_attr(device, 'productVersion')
+                    device_platform = helpers.get_xml_attr(device, 'platform')
+                    device_platform_version = helpers.get_xml_attr(device, 'platformVersion')
+                    device_type = helpers.get_xml_attr(device, 'device')
+                    device_model = helpers.get_xml_attr(device, 'model')
+                    device_last_seen = helpers.get_xml_attr(device, 'lastSeenAt')
 
-                    for connection in connections:
-                        if helpers.get_xml_attr(connection, 'address') == pms_ip and \
-                                helpers.get_xml_attr(connection, 'port') == str(pms_port):
-                            server = get_connections(a)
-                            break
+                # Filter by user_id
+                if user_id and user_id != device_user_id:
+                    continue
 
-                    if server.get('connections'):
-                        break
+                for synced in a.getElementsByTagName('SyncItems'):
+                    sync_item = synced.getElementsByTagName('SyncItem')
+                    for item in sync_item:
+                        sync_id = helpers.get_xml_attr(item, 'id')
+                        sync_version = helpers.get_xml_attr(item, 'version')
+                        sync_root_title = helpers.get_xml_attr(item, 'rootTitle')
+                        sync_title = helpers.get_xml_attr(item, 'title')
+                        sync_metadata_type = helpers.get_xml_attr(item, 'metadataType')
+                        sync_content_type = helpers.get_xml_attr(item, 'contentType')
 
-        return server
+                        for status in item.getElementsByTagName('Status'):
+                            status_failure_code = helpers.get_xml_attr(status, 'failureCode')
+                            status_failure = helpers.get_xml_attr(status, 'failure')
+                            status_state = helpers.get_xml_attr(status, 'state')
+                            status_item_count = helpers.get_xml_attr(status, 'itemsCount')
+                            status_item_complete_count = helpers.get_xml_attr(status, 'itemsCompleteCount')
+                            status_item_downloaded_count = helpers.get_xml_attr(status, 'itemsDownloadedCount')
+                            status_item_ready_count = helpers.get_xml_attr(status, 'itemsReadyCount')
+                            status_item_successful_count = helpers.get_xml_attr(status, 'itemsSuccessfulCount')
+                            status_total_size = helpers.get_xml_attr(status, 'totalSize')
+                            status_item_download_percent_complete = helpers.get_percent(
+                                status_item_downloaded_count, status_item_count)
 
-    def get_server_times(self):
-        servers = self.get_plextv_server_list(output_format='xml')
-        server_times = {}
+                        for settings in item.getElementsByTagName('MediaSettings'):
+                            settings_audio_boost = helpers.get_xml_attr(settings, 'audioBoost')
+                            settings_music_bitrate = helpers.get_xml_attr(settings, 'musicBitrate')
+                            settings_photo_quality = helpers.get_xml_attr(settings, 'photoQuality')
+                            settings_photo_resolution = helpers.get_xml_attr(settings, 'photoResolution')
+                            settings_video_quality = helpers.get_xml_attr(settings, 'videoQuality')
+                            settings_video_resolution = helpers.get_xml_attr(settings, 'videoResolution')
+
+                        if helpers.get_xml_attr(item.getElementsByTagName('Location')[0], 'uri').endswith('%2Fchildren'):
+                            clean_uri = helpers.get_xml_attr(item.getElementsByTagName('Location')[0], 'uri')[:-11]
+                        else:
+                            clean_uri = helpers.get_xml_attr(item.getElementsByTagName('Location')[0], 'uri')
+
+                        rating_key = clean_uri.rpartition('%2F')[-1]
+
+                        sync_details = {"device_name": device_name,
+                                        "platform": device_platform,
+                                        "username": device_username,
+                                        "friendly_name": device_friendly_name,
+                                        "user_id": device_user_id,
+                                        "root_title": sync_root_title,
+                                        "title": sync_title,
+                                        "metadata_type": sync_metadata_type,
+                                        "content_type": sync_content_type,
+                                        "rating_key": rating_key,
+                                        "state": status_state,
+                                        "item_count": status_item_count,
+                                        "item_complete_count": status_item_complete_count,
+                                        "item_downloaded_count": status_item_downloaded_count,
+                                        "item_downloaded_percent_complete": status_item_download_percent_complete,
+                                        "music_bitrate": settings_music_bitrate,
+                                        "photo_quality": settings_photo_quality,
+                                        "video_quality": settings_video_quality,
+                                        "total_size": status_total_size,
+                                        "failure": status_failure,
+                                        "sync_id": sync_id
+                                        }
+
+                        synced_items.append(sync_details)
+
+        return synced_items
+
+    def get_server_urls(self, include_https=True):
+
+        if plexpy.CONFIG.PMS_IDENTIFIER:
+            server_id = plexpy.CONFIG.PMS_IDENTIFIER
+        else:
+            logger.error('PlexPy PlexTV connector :: Unable to retrieve server identity.')
+            return []
+
+        plextv_resources = self.get_plextv_resources(include_https=include_https)
+        server_urls = []
 
         try:
-            xml_head = servers.getElementsByTagName('Server')
-        except Exception as e:
-            logger.warn("Tautulli PlexTV :: Unable to parse XML for get_server_times: %s." % e)
-            return {}
+            xml_parse = minidom.parseString(plextv_resources)
+        except Exception, e:
+            logger.warn("Error parsing XML for Plex resources: %s" % e)
+            return []
+        except:
+            logger.warn("Error parsing XML for Plex resources.")
+            return []
+
+        try:
+            xml_head = xml_parse.getElementsByTagName('Device')
+        except:
+            logger.warn("Error parsing XML for Plex resources.")
+            return []
 
         for a in xml_head:
-            if helpers.get_xml_attr(a, 'machineIdentifier') == plexpy.CONFIG.PMS_IDENTIFIER:
-                server_times = {"created_at": helpers.get_xml_attr(a, 'createdAt'),
-                                "updated_at": helpers.get_xml_attr(a, 'updatedAt'),
-                                "version": helpers.get_xml_attr(a, 'version')
-                                }
-                break
+            if helpers.get_xml_attr(a, 'clientIdentifier') == server_id:
+                connections = a.getElementsByTagName('Connection')
+                for connection in connections:
+                    server_details = {"protocol": helpers.get_xml_attr(connection, 'protocol'),
+                                      "address": helpers.get_xml_attr(connection, 'address'),
+                                      "port": helpers.get_xml_attr(connection, 'port'),
+                                      "uri": helpers.get_xml_attr(connection, 'uri'),
+                                      "local": helpers.get_xml_attr(connection, 'local')
+                                      }
 
-        return server_times
+                    server_urls.append(server_details)
 
-    def discover(self, include_cloud=True, all_servers=False):
+        return server_urls
+
+    def discover(self):
         """ Query plex for all servers online. Returns the ones you own in a selectize format """
-
-        # Try to discover localhost server
-        local_machine_identifier = None
-        request_handler = http_handler.HTTPHandler(urls='http://127.0.0.1:32400', timeout=1,
-                                                   ssl_verify=False, silent=True)
-        request = request_handler.make_request(uri='/identity', request_type='GET', output_format='xml')
-        if request:
-            xml_head = request.getElementsByTagName('MediaContainer')[0]
-            local_machine_identifier = xml_head.getAttribute('machineIdentifier')
-
-        local_server = {'httpsRequired': '0',
-                        'clientIdentifier': local_machine_identifier,
-                        'label': 'Local',
-                        'ip': '127.0.0.1',
-                        'port': '32400',
-                        'uri': 'http://127.0.0.1:32400',
-                        'local': '1',
-                        'value': '127.0.0.1:32400',
-                        'is_cloud': False
-                        }
-
-        servers = self.get_plextv_resources(include_https=True, output_format='xml')
+        result = self.get_plextv_resources(include_https=True, output_format='raw')
+        servers = xmltodict.parse(result, process_namespaces=True, attr_prefix='')
         clean_servers = []
 
         try:
-            xml_head = servers.getElementsByTagName('MediaContainer')
+            if servers:
+                # Fix if its only one "device"
+                if int(servers['MediaContainer']['size']) == 1:
+                    servers['MediaContainer']['Device'] = [servers['MediaContainer']['Device']]
+
+                for server in servers['MediaContainer']['Device']:
+                    # Only grab servers online and own
+                    if server.get('presence', None) == '1' and server.get('owned', None) == '1' and server.get('provides', None) == 'server':
+                        # If someone only has one connection..
+                        if isinstance(server['Connection'], dict):
+                            server['Connection'] = [server['Connection']]
+
+                        for s in server['Connection']:
+                            # to avoid circular ref
+                            d = {}
+                            d.update(s)
+                            d.update(server)
+                            d['label'] = d['name']
+                            d['value'] = d['address']
+                            del d['Connection']
+                            clean_servers.append(d)
+
         except Exception as e:
-            logger.warn("Tautulli PlexTV :: Failed to get servers from plex: %s." % e)
-            return []
+            logger.warn('Failed to get servers from plex %s' % e)
+            return clean_servers
 
-        for a in xml_head:
-            if a.getAttribute('size'):
-                if a.getAttribute('size') == '0':
-                    return []
-
-            if a.getElementsByTagName('Device'):
-                devices = a.getElementsByTagName('Device')
-
-                for d in devices:
-                    if helpers.get_xml_attr(d, 'presence') == '1' and \
-                            helpers.get_xml_attr(d, 'owned') == '1' and \
-                            helpers.get_xml_attr(d, 'provides') == 'server':
-
-                        is_cloud = (helpers.get_xml_attr(d, 'platform').lower() == 'cloud')
-                        if not include_cloud and is_cloud:
-                            continue
-
-                        connections = d.getElementsByTagName('Connection')
-
-                        for c in connections:
-                            if not all_servers:
-                                # If this is a remote server don't show any local IPs.
-                                if helpers.get_xml_attr(d, 'publicAddressMatches') == '0' and \
-                                        helpers.get_xml_attr(c, 'local') == '1':
-                                    continue
-
-                                # If this is a local server don't show any remote IPs.
-                                if helpers.get_xml_attr(d, 'publicAddressMatches') == '1' and \
-                                        helpers.get_xml_attr(c, 'local') == '0':
-                                    continue
-
-                            if helpers.get_xml_attr(d, 'clientIdentifier') == local_machine_identifier:
-                                local_server['httpsRequired'] = helpers.get_xml_attr(d, 'httpsRequired')
-                                local_server['label'] = helpers.get_xml_attr(d, 'name')
-                                clean_servers.append(local_server)
-                                local_machine_identifier = None
-
-                            server = {'httpsRequired': '1' if is_cloud else helpers.get_xml_attr(d, 'httpsRequired'),
-                                      'clientIdentifier': helpers.get_xml_attr(d, 'clientIdentifier'),
-                                      'label': helpers.get_xml_attr(d, 'name'),
-                                      'ip': helpers.get_xml_attr(c, 'address'),
-                                      'port': helpers.get_xml_attr(c, 'port'),
-                                      'uri': helpers.get_xml_attr(c, 'uri'),
-                                      'local': helpers.get_xml_attr(c, 'local'),
-                                      'value': helpers.get_xml_attr(c, 'address') + ':' + helpers.get_xml_attr(c, 'port'),
-                                      'is_cloud': is_cloud
-                                      }
-                            clean_servers.append(server)
-
-            if local_machine_identifier:
-                clean_servers.append(local_server)
-
-        clean_servers.sort(key=lambda s: (s['label'], -int(s['local']), s['ip']))
-
-        return clean_servers
-
-    def get_plex_downloads(self, update_channel):
-        plex_downloads = self.get_plextv_downloads(plexpass=(update_channel == 'beta'))
-
-        try:
-            return json.loads(plex_downloads)
-        except Exception as e:
-            logger.warn("Tautulli PlexTV :: Unable to load JSON for get_plex_updates: %s", e)
-            return {}
-
-    def get_plex_update(self):
-        logger.debug("Tautulli PlexTV :: Retrieving current server version.")
-
-        pms_connect = pmsconnect.PmsConnect()
-        pms_connect.set_server_version()
-
-        update_channel = pms_connect.get_server_update_channel()
-
-        logger.debug("Tautulli PlexTV :: Plex update channel is %s." % update_channel)
-        available_downloads = self.get_plex_downloads(update_channel=update_channel)
-
-        if not available_downloads:
-            return {}
-
-        # Get the updates for the platform
-        pms_platform = common.PMS_PLATFORM_NAME_OVERRIDES.get(plexpy.CONFIG.PMS_PLATFORM, plexpy.CONFIG.PMS_PLATFORM)
-        platform_downloads = available_downloads.get('computer').get(pms_platform) or \
-            available_downloads.get('nas').get(pms_platform)
-
-        if not platform_downloads:
-            logger.error("Tautulli PlexTV :: Unable to retrieve Plex updates: Could not match server platform: %s."
-                         % pms_platform)
-            return {}
-
-        v_old = helpers.cast_to_int("".join(v.zfill(4) for v in plexpy.CONFIG.PMS_VERSION.split('-')[0].split('.')[:4]))
-        v_new = helpers.cast_to_int("".join(v.zfill(4) for v in platform_downloads.get('version', '').split('-')[0].split('.')[:4]))
-
-        if not v_old:
-            logger.error("Tautulli PlexTV :: Unable to retrieve Plex updates: Invalid current server version: %s."
-                         % plexpy.CONFIG.PMS_VERSION)
-            return {}
-        if not v_new:
-            logger.error("Tautulli PlexTV :: Unable to retrieve Plex updates: Invalid new server version: %s."
-                         % platform_downloads.get('version'))
-            return {}
-
-        # Get proper download
-        releases = platform_downloads.get('releases', [{}])
-        release = next((r for r in releases if r['distro'] == plexpy.CONFIG.PMS_UPDATE_DISTRO and
-                        r['build'] == plexpy.CONFIG.PMS_UPDATE_DISTRO_BUILD), releases[0])
-
-        download_info = {'update_available': v_new > v_old,
-                         'platform': platform_downloads.get('name'),
-                         'release_date': platform_downloads.get('release_date'),
-                         'version': platform_downloads.get('version'),
-                         'requirements': platform_downloads.get('requirements'),
-                         'extra_info': platform_downloads.get('extra_info'),
-                         'changelog_added': platform_downloads.get('items_added'),
-                         'changelog_fixed': platform_downloads.get('items_fixed'),
-                         'label': release.get('label'),
-                         'distro': release.get('distro'),
-                         'distro_build': release.get('build'),
-                         'download_url': release.get('url'),
-                         }
-
-        return download_info
-
-    def get_plexpass_status(self):
-        account_data = self.get_plextv_user_details(output_format='xml')
-
-        try:
-            subscription = account_data.getElementsByTagName('subscription')
-        except Exception as e:
-            logger.warn("Tautulli PlexTV :: Unable to parse XML for get_plexpass_status: %s." % e)
-            return False
-
-        if subscription and helpers.get_xml_attr(subscription[0], 'active') == '1':
-            plexpy.CONFIG.__setattr__('PMS_PLEXPASS', 1)
-            plexpy.CONFIG.write()
-            return True
-        else:
-            logger.debug("Tautulli PlexTV :: Plex Pass subscription not found.")
-            plexpy.CONFIG.__setattr__('PMS_PLEXPASS', 0)
-            plexpy.CONFIG.write()
-            return False
-
-    def get_devices_list(self):
-        devices = self.get_plextv_devices_list(output_format='xml')
-
-        try:
-            xml_head = devices.getElementsByTagName('Device')
-        except Exception as e:
-            logger.warn("Tautulli PlexTV :: Unable to parse XML for get_devices_list: %s." % e)
-            return []
-
-        devices_list = []
-        for a in xml_head:
-            device = {"device_name": helpers.get_xml_attr(a, 'name'),
-                      "product": helpers.get_xml_attr(a, 'product'),
-                      "product_version": helpers.get_xml_attr(a, 'productVersion'),
-                      "platform": helpers.get_xml_attr(a, 'platform'),
-                      "platform_version": helpers.get_xml_attr(a, 'platformVersion'),
-                      "device": helpers.get_xml_attr(a, 'device'),
-                      "model": helpers.get_xml_attr(a, 'model'),
-                      "vendor": helpers.get_xml_attr(a, 'vendor'),
-                      "provides": helpers.get_xml_attr(a, 'provides'),
-                      "device_identifier": helpers.get_xml_attr(a, 'clientIdentifier'),
-                      "device_id": helpers.get_xml_attr(a, 'id'),
-                      "token": helpers.get_xml_attr(a, 'token')
-                      }
-            devices_list.append(device)
-
-        return devices_list
-
-    def get_cloud_server_status(self):
-        cloud_status = self.cloud_server_status(output_format='xml')
-
-        try:
-            status_info = cloud_status.getElementsByTagName('info')
-        except Exception as e:
-            logger.warn("Tautulli PlexTV :: Unable to parse XML for get_cloud_server_status: %s." % e)
-            return False
-
-        for info in status_info:
-            servers = info.getElementsByTagName('server')
-            for s in servers:
-                if helpers.get_xml_attr(s, 'address') == plexpy.CONFIG.PMS_IP:
-                    if helpers.get_xml_attr(info, 'running') == '1':
-                        return True
-                    else:
-                        return False
-
-    def get_plex_account_details(self):
-        account_data = self.get_plextv_user_details(output_format='xml')
-
-        try:
-            xml_head = account_data.getElementsByTagName('user')
-        except Exception as e:
-            logger.warn("Tautulli PlexTV :: Unable to parse XML for get_plex_account_details: %s." % e)
-            return None
-
-        for a in xml_head:
-            account_details = {"user_id": helpers.get_xml_attr(a, 'id'),
-                               "username": helpers.get_xml_attr(a, 'username'),
-                               "thumb": helpers.get_xml_attr(a, 'thumb'),
-                               "email": helpers.get_xml_attr(a, 'email'),
-                               "is_home_user": helpers.get_xml_attr(a, 'home'),
-                               "is_restricted": helpers.get_xml_attr(a, 'restricted'),
-                               "filter_all": helpers.get_xml_attr(a, 'filterAll'),
-                               "filter_movies": helpers.get_xml_attr(a, 'filterMovies'),
-                               "filter_tv": helpers.get_xml_attr(a, 'filterTelevision'),
-                               "filter_music": helpers.get_xml_attr(a, 'filterMusic'),
-                               "filter_photos": helpers.get_xml_attr(a, 'filterPhotos'),
-                               "user_token": helpers.get_xml_attr(a, 'authToken')
-                               }
-            return account_details
-
-    def get_geoip_lookup(self, ip_address=''):
-        if not ip_address or not helpers.is_valid_ip(ip_address):
-            return
-
-        geoip_data = self.get_plextv_geoip(ip_address=ip_address, output_format='xml')
-
-        try:
-            xml_head = geoip_data.getElementsByTagName('location')
-        except Exception as e:
-            logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_geoip_lookup: %s." % e)
-            return None
-
-        for a in xml_head:
-            coordinates = helpers.get_xml_attr(a, 'coordinates').split(',')
-            latitude = longitude = None
-            if len(coordinates) == 2:
-                latitude, longitude = [helpers.cast_to_float(c) for c in coordinates]
-
-            geo_info = {"city": helpers.get_xml_attr(a, 'city') or None,
-                        "code": helpers.get_xml_attr(a, 'code') or None,
-                        "continent": helpers.get_xml_attr(a, 'continent_code') or None,
-                        "country": helpers.get_xml_attr(a, 'country') or None,
-                        "latitude": latitude,
-                        "longitude": longitude,
-                        "postal_code": helpers.get_xml_attr(a, 'postal_code') or None,
-                        "region": helpers.get_xml_attr(a, 'subdivisions') or None,
-                        "timezone": helpers.get_xml_attr(a, 'time_zone') or None,
-                        "accuracy": None   # keep for backwards compatibility with GeoLite2
-                        }
-
-            return geo_info
-
-    def ping(self):
-        logger.info(u"Tautulli PlexTV :: Pinging Plex.tv to refresh token.")
-
-        pong = self.ping_plextv(output_format='xml')
-
-        try:
-            xml_head = pong.getElementsByTagName('pong')
-        except Exception as e:
-            logger.warn(u"Tautulli PlexTV :: Unable to parse XML for ping: %s." % e)
-            return None
-        
-        if xml_head:
-            return helpers.bool_true(xml_head[0].firstChild.nodeValue)
-        return False
+        return json.dumps(clean_servers, indent=4)
diff --git a/plexpy/plexwatch_import.py b/plexpy/plexwatch_import.py
index ac4ffdbe..7df5b355 100644
--- a/plexpy/plexwatch_import.py
+++ b/plexpy/plexwatch_import.py
@@ -1,29 +1,24 @@
-# -*- coding: utf-8 -*-
-
-# This file is part of Tautulli.
+# This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
 import sqlite3
+
+from plexpy import logger, helpers, activity_pinger, activity_processor, users, plextv
 from xml.dom import minidom
 
-from plexpy import activity_processor
-from plexpy import database
-from plexpy import helpers
-from plexpy import logger
-from plexpy import users
-
+import plexpy
 
 def extract_plexwatch_xml(xml=None):
     output = {}
@@ -31,12 +26,12 @@ def extract_plexwatch_xml(xml=None):
     try:
         xml_parse = minidom.parseString(clean_xml)
     except:
-        logger.warn("Tautulli Importer :: Error parsing XML for PlexWatch database.")
+        logger.warn("Error parsing XML for Plexwatch database.")
         return None
 
     xml_head = xml_parse.getElementsByTagName('opt')
     if not xml_head:
-        logger.warn("Tautulli Importer :: Error parsing XML for PlexWatch database.")
+        logger.warn("Error parsing XML for Plexwatch database.")
         return None
 
     for a in xml_head:
@@ -45,9 +40,7 @@ def extract_plexwatch_xml(xml=None):
         duration = helpers.get_xml_attr(a, 'duration')
         grandparent_thumb = helpers.get_xml_attr(a, 'grandparentThumb')
         grandparent_title = helpers.get_xml_attr(a, 'grandparentTitle')
-        original_title = helpers.get_xml_attr(a, 'originalTitle')
         guid = helpers.get_xml_attr(a, 'guid')
-        section_id = helpers.get_xml_attr(a, 'librarySectionID')
         media_index = helpers.get_xml_attr(a, 'index')
         originally_available_at = helpers.get_xml_attr(a, 'originallyAvailableAt')
         last_viewed_at = helpers.get_xml_attr(a, 'lastViewedAt')
@@ -102,7 +95,6 @@ def extract_plexwatch_xml(xml=None):
         if a.getElementsByTagName('Player'):
             player_elem = a.getElementsByTagName('Player')
             for d in player_elem:
-                ip_address = helpers.get_xml_attr(d, 'address')
                 machine_id = helpers.get_xml_attr(d, 'machineIdentifier')
                 platform = helpers.get_xml_attr(d, 'platform')
                 player = helpers.get_xml_attr(d, 'title')
@@ -130,14 +122,6 @@ def extract_plexwatch_xml(xml=None):
                 video_decision = helpers.get_xml_attr(e, 'videoDecision')
                 transcode_width = helpers.get_xml_attr(e, 'width')
 
-        # Generate a combined transcode decision value
-        if video_decision == 'transcode' or audio_decision == 'transcode':
-            transcode_decision = 'transcode'
-        elif video_decision == 'copy' or audio_decision == 'copy':
-            transcode_decision = 'copy'
-        else:
-            transcode_decision = 'direct play'
-
         user_id = None
 
         if a.getElementsByTagName('User'):
@@ -163,23 +147,15 @@ def extract_plexwatch_xml(xml=None):
             for i in genre_elem:
                 genres.append(helpers.get_xml_attr(i, 'tag'))
 
-        labels = []
-        if a.getElementsByTagName('Lables'):
-            label_elem = a.getElementsByTagName('Lables')
-            for i in label_elem:
-                labels.append(helpers.get_xml_attr(i, 'tag'))
-
         output = {'added_at': added_at,
                   'art': art,
                   'duration': duration,
                   'grandparent_thumb': grandparent_thumb,
-                  'title': title,
-                  'parent_title': parent_title,
                   'grandparent_title': grandparent_title,
-                  'original_title': original_title,
+                  'parent_title': parent_title,
+                  'title': title,
                   'tagline': tagline,
                   'guid': guid,
-                  'section_id': section_id,
                   'media_index': media_index,
                   'originally_available_at': originally_available_at,
                   'last_viewed_at': last_viewed_at,
@@ -202,7 +178,6 @@ def extract_plexwatch_xml(xml=None):
                   'video_framerate': video_framerate,
                   'video_resolution': video_resolution,
                   'width': width,
-                  'ip_address': ip_address,
                   'machine_id': machine_id,
                   'platform': platform,
                   'player': player,
@@ -215,98 +190,97 @@ def extract_plexwatch_xml(xml=None):
                   'transcode_video_codec': transcode_video_codec,
                   'video_decision': video_decision,
                   'transcode_width': transcode_width,
-                  'transcode_decision': transcode_decision,
                   'user_id': user_id,
                   'writers': writers,
                   'actors': actors,
                   'genres': genres,
-                  'studio': studio,
-                  'labels': labels
+                  'studio': studio
                   }
 
     return output
 
-
-def validate_database(database_file=None, table_name=None):
+def validate_database(database=None, table_name=None):
     try:
-        connection = sqlite3.connect(database_file, timeout=20)
+        connection = sqlite3.connect(database, timeout=20)
     except sqlite3.OperationalError:
-        logger.error("Tautulli Importer :: Invalid database specified.")
+        logger.error('PlexPy Importer :: Invalid database specified.')
         return 'Invalid database specified.'
     except ValueError:
-        logger.error("Tautulli Importer :: Invalid database specified.")
+        logger.error('PlexPy Importer :: Invalid database specified.')
         return 'Invalid database specified.'
     except:
-        logger.error("Tautulli Importer :: Uncaught exception.")
+        logger.error('PlexPy Importer :: Uncaught exception.')
         return 'Uncaught exception.'
 
     try:
         connection.execute('SELECT ratingKey from %s' % table_name)
         connection.close()
     except sqlite3.OperationalError:
-        logger.error("Tautulli Importer :: Invalid database specified.")
+        logger.error('PlexPy Importer :: Invalid database specified.')
         return 'Invalid database specified.'
     except:
-        logger.error("Tautulli Importer :: Uncaught exception.")
+        logger.error('PlexPy Importer :: Uncaught exception.')
         return 'Uncaught exception.'
 
     return 'success'
 
-
-def import_from_plexwatch(database_file=None, table_name=None, import_ignore_interval=0):
+def import_from_plexwatch(database=None, table_name=None, import_ignore_interval=0):
 
     try:
-        connection = sqlite3.connect(database_file, timeout=20)
+        connection = sqlite3.connect(database, timeout=20)
         connection.row_factory = sqlite3.Row
     except sqlite3.OperationalError:
-        logger.error("Tautulli Importer :: Invalid filename.")
+        logger.error('PlexPy Importer :: Invalid filename.')
         return None
     except ValueError:
-        logger.error("Tautulli Importer :: Invalid filename.")
+        logger.error('PlexPy Importer :: Invalid filename.')
         return None
 
     try:
         connection.execute('SELECT ratingKey from %s' % table_name)
     except sqlite3.OperationalError:
-        logger.error("Tautulli Importer :: Database specified does not contain the required fields.")
+        logger.error('PlexPy Importer :: Database specified does not contain the required fields.')
         return None
 
-    logger.debug("Tautulli Importer :: PlexWatch data import in progress...")
-    database.set_is_importing(True)
+    logger.debug(u"PlexPy Importer :: PlexWatch data import in progress...")
+
+    logger.debug(u"PlexPy Importer :: Disabling monitoring while import in progress.")
+    plexpy.schedule_job(activity_pinger.check_active_sessions, 'Check for active sessions',
+                        hours=0, minutes=0, seconds=0)
 
     ap = activity_processor.ActivityProcessor()
     user_data = users.Users()
 
     # Get the latest friends list so we can pull user id's
     try:
-        users.refresh_users()
+        plextv.refresh_users()
     except:
-        logger.debug("Tautulli Importer :: Unable to refresh the users list. Aborting import.")
+        logger.debug(u"PlexPy Importer :: Unable to refresh the users list. Aborting import.")
         return None
 
-    query = "SELECT time AS started, " \
-            "stopped, " \
-            "cast(ratingKey as text) AS rating_key, " \
-            "null AS user_id, " \
-            "user, " \
-            "ip_address, " \
-            "paused_counter, " \
-            "platform AS player, " \
-            "null AS platform, " \
-            "null as machine_id, " \
-            "parentRatingKey as parent_rating_key, " \
-            "grandparentRatingKey as grandparent_rating_key, " \
-            "null AS media_type, " \
-            "null AS view_offset, " \
-            "xml, " \
-            "rating as content_rating," \
-            "summary," \
-            "title AS full_title," \
-            "(case when orig_title_ep = '' then orig_title else " \
-            "orig_title_ep end) as title," \
-            "(case when orig_title_ep != '' then orig_title else " \
-            "null end) as grandparent_title " \
-            "FROM " + table_name + " ORDER BY id"
+    query = 'SELECT time AS started, ' \
+            'stopped, ' \
+            'cast(ratingKey as text) AS rating_key, ' \
+            'null AS user_id, ' \
+            'user, ' \
+            'ip_address, ' \
+            'paused_counter, ' \
+            'platform AS player, ' \
+            'null AS platform, ' \
+            'null as machine_id, ' \
+            'parentRatingKey as parent_rating_key, ' \
+            'grandparentRatingKey as grandparent_rating_key, ' \
+            'null AS media_type, ' \
+            'null AS view_offset, ' \
+            'xml, ' \
+            'rating as content_rating,' \
+            'summary,' \
+            'title AS full_title,' \
+            '(case when orig_title_ep = "" then orig_title else ' \
+            'orig_title_ep end) as title,' \
+            '(case when orig_title_ep != "" then orig_title else ' \
+            'null end) as grandparent_title ' \
+            'FROM ' + table_name + ' ORDER BY id'
 
     result = connection.execute(query)
 
@@ -316,15 +290,10 @@ def import_from_plexwatch(database_file=None, table_name=None, import_ignore_int
 
         # If we get back None from our xml extractor skip over the record and log error.
         if not extracted_xml:
-            logger.error("Tautulli Importer :: Skipping record with ratingKey %s due to malformed xml."
+            logger.error(u"PlexPy Importer :: Skipping line with ratingKey %s due to malformed xml."
                          % str(row['rating_key']))
             continue
 
-        # Skip line if we don't have a ratingKey to work with
-        if not row['rating_key']:
-            logger.error("Tautulli Importer :: Skipping record due to null ratingKey.")
-            continue
-
         # If the user_id no longer exists in the friends list, pull it from the xml.
         if user_data.get_user_id(user=row['user']):
             user_id = user_data.get_user_id(user=row['user'])
@@ -337,11 +306,9 @@ def import_from_plexwatch(database_file=None, table_name=None, import_ignore_int
                            'title': row['title'],
                            'parent_title': extracted_xml['parent_title'],
                            'grandparent_title': row['grandparent_title'],
-                           'original_title': extracted_xml['original_title'],
-                           'full_title': row['full_title'],
                            'user_id': user_id,
                            'user': row['user'],
-                           'ip_address': row['ip_address'] if row['ip_address'] else extracted_xml['ip_address'],
+                           'ip_address': row['ip_address'],
                            'paused_counter': row['paused_counter'],
                            'player': row['player'],
                            'platform': extracted_xml['platform'],
@@ -350,10 +317,8 @@ def import_from_plexwatch(database_file=None, table_name=None, import_ignore_int
                            'grandparent_rating_key': row['grandparent_rating_key'],
                            'media_type': extracted_xml['media_type'],
                            'view_offset': extracted_xml['view_offset'],
-                           'section_id': extracted_xml['section_id'],
                            'video_decision': extracted_xml['video_decision'],
                            'audio_decision': extracted_xml['audio_decision'],
-                           'transcode_decision': extracted_xml['transcode_decision'],
                            'duration': extracted_xml['duration'],
                            'width': extracted_xml['width'],
                            'height': extracted_xml['height'],
@@ -380,9 +345,8 @@ def import_from_plexwatch(database_file=None, table_name=None, import_ignore_int
                                     'title': row['title'],
                                     'parent_title': extracted_xml['parent_title'],
                                     'grandparent_title': row['grandparent_title'],
-                                    'original_title': extracted_xml['original_title'],
-                                    'media_index': extracted_xml['media_index'],
-                                    'parent_media_index': extracted_xml['parent_media_index'],
+                                    'index': extracted_xml['media_index'],
+                                    'parent_index': extracted_xml['parent_media_index'],
                                     'thumb': extracted_xml['thumb'],
                                     'parent_thumb': extracted_xml['parent_thumb'],
                                     'grandparent_thumb': extracted_xml['grandparent_thumb'],
@@ -399,24 +363,12 @@ def import_from_plexwatch(database_file=None, table_name=None, import_ignore_int
                                     'rating': extracted_xml['rating'],
                                     'duration': extracted_xml['duration'],
                                     'guid': extracted_xml['guid'],
-                                    'section_id': extracted_xml['section_id'],
                                     'directors': extracted_xml['directors'],
                                     'writers': extracted_xml['writers'],
                                     'actors': extracted_xml['actors'],
                                     'genres': extracted_xml['genres'],
                                     'studio': extracted_xml['studio'],
-                                    'labels': extracted_xml['labels'],
-                                    'full_title': row['full_title'],
-                                    'width': extracted_xml['width'],
-                                    'height': extracted_xml['height'],
-                                    'container': extracted_xml['container'],
-                                    'video_codec': extracted_xml['video_codec'],
-                                    'audio_codec': extracted_xml['audio_codec'],
-                                    'bitrate': extracted_xml['bitrate'],
-                                    'video_resolution': extracted_xml['video_resolution'],
-                                    'video_framerate': extracted_xml['video_framerate'],
-                                    'aspect_ratio': extracted_xml['aspect_ratio'],
-                                    'audio_channels': extracted_xml['audio_channels']
+                                    'full_title': row['full_title']
                                     }
 
         # On older versions of PMS, "clip" items were still classified as "movie" and had bad ratingKey values
@@ -427,24 +379,27 @@ def import_from_plexwatch(database_file=None, table_name=None, import_ignore_int
                                      is_import=True,
                                      import_ignore_interval=import_ignore_interval)
         else:
-            logger.debug("Tautulli Importer :: Item has bad rating_key: %s" % session_history_metadata['rating_key'])
+            logger.debug(u"PlexPy Importer :: Item has bad rating_key: %s" % session_history_metadata['rating_key'])
 
+    logger.debug(u"PlexPy Importer :: PlexWatch data import complete.")
     import_users()
 
-    logger.debug("Tautulli Importer :: PlexWatch data import complete.")
-    database.set_is_importing(False)
-
+    logger.debug(u"PlexPy Importer :: Re-enabling monitoring.")
+    plexpy.initialize_scheduler()
 
 def import_users():
-    logger.debug("Tautulli Importer :: Importing PlexWatch Users...")
+    from plexpy import database
+
+    logger.debug(u"PlexPy Importer :: Importing PlexWatch Users...")
     monitor_db = database.MonitorDatabase()
 
-    query = "INSERT OR IGNORE INTO users (user_id, username) " \
-            "SELECT user_id, user " \
-            "FROM session_history WHERE user_id != 1 GROUP BY user_id"
+    query = 'INSERT OR IGNORE INTO users (user_id, username) ' \
+            'SELECT user_id, user ' \
+            'FROM session_history WHERE user_id != 1 GROUP BY user_id'
 
     try:
         monitor_db.action(query)
-        logger.debug("Tautulli Importer :: Users imported.")
+        logger.debug(u"PlexPy Importer :: Users imported.")
     except:
-        logger.debug("Tautulli Importer :: Failed to import users.")
+        logger.debug(u"PlexPy Importer :: Failed to import users.")
+
diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py
index ac23ce82..bb2da415 100644
--- a/plexpy/pmsconnect.py
+++ b/plexpy/pmsconnect.py
@@ -1,56 +1,23 @@
-# -*- coding: utf-8 -*-
-
-# This file is part of Tautulli.
+# This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
-import json
-import os
-import time
-from urllib.parse import quote, quote_plus, urlencode
-from xml.dom.minidom import Node
+from plexpy import logger, helpers, users, http_handler
+from urlparse import urlparse
 
 import plexpy
-from plexpy import activity_processor
-from plexpy import common
-from plexpy import helpers
-from plexpy import http_handler
-from plexpy import libraries
-from plexpy import logger
-from plexpy import plextv
-from plexpy import session
-from plexpy import users
-
-
-def get_server_friendly_name():
-    logger.info("Tautulli Pmsconnect :: Requesting name from server...")
-    server_name = PmsConnect().get_server_pref(pref='FriendlyName')
-
-    # If friendly name is blank
-    if not server_name:
-        servers_info = PmsConnect().get_servers_info()
-        for server in servers_info:
-            if server['machine_identifier'] == plexpy.CONFIG.PMS_IDENTIFIER:
-                server_name = server['name']
-                break
-
-    if server_name and server_name != plexpy.CONFIG.PMS_NAME:
-        plexpy.CONFIG.__setattr__('PMS_NAME', server_name)
-        plexpy.CONFIG.write()
-        logger.info("Tautulli Pmsconnect :: Server name retrieved.")
-
-    return server_name
+import urllib2
 
 
 class PmsConnect(object):
@@ -58,518 +25,251 @@ class PmsConnect(object):
     Retrieve data from Plex Server
     """
 
-    def __init__(self, url=None, token=None):
-        self.url = url
-        self.token = token
+    def __init__(self):
+        if plexpy.CONFIG.PMS_URL:
+            url_parsed = urlparse(plexpy.CONFIG.PMS_URL)
+            hostname = url_parsed.hostname
+            port = url_parsed.port
+            self.protocol = url_parsed.scheme
+        else:
+            hostname = plexpy.CONFIG.PMS_IP
+            port = plexpy.CONFIG.PMS_PORT
+            self.protocol = 'http'
 
-        if not self.url and plexpy.CONFIG.PMS_URL:
-            self.url = plexpy.CONFIG.PMS_URL
-        elif not self.url:
-            self.url = 'http://{hostname}:{port}'.format(hostname=plexpy.CONFIG.PMS_IP,
-                                                         port=plexpy.CONFIG.PMS_PORT)
-        self.timeout = plexpy.CONFIG.PMS_TIMEOUT
+        self.request_handler = http_handler.HTTPHandler(host=hostname,
+                                                        port=port,
+                                                        token=plexpy.CONFIG.PMS_TOKEN)
 
-        if not self.token:
-            # Check if we should use the admin token, or the guest server token
-            if session.get_session_user_id():
-                user_data = users.Users()
-                user_tokens = user_data.get_tokens(user_id=session.get_session_user_id())
-                self.token = user_tokens['server_token']
-            else:
-                self.token = plexpy.CONFIG.PMS_TOKEN
+    """
+    Return current sessions.
 
-        self.ssl_verify = plexpy.CONFIG.VERIFY_SSL_CERT
-
-        self.request_handler = http_handler.HTTPHandler(urls=self.url,
-                                                        token=self.token,
-                                                        timeout=self.timeout,
-                                                        ssl_verify=self.ssl_verify)
+    Optional parameters:    output_format { dict, json }
 
+    Output: array
+    """
     def get_sessions(self, output_format=''):
-        """
-        Return current sessions.
-
-        Optional parameters:    output_format { dict, json }
-
-        Output: array
-        """
         uri = '/status/sessions'
         request = self.request_handler.make_request(uri=uri,
+                                                    proto=self.protocol,
                                                     request_type='GET',
                                                     output_format=output_format)
 
         return request
 
-    def get_sessions_terminate(self, session_id='', reason=''):
-        """
-        Return current sessions.
+    """
+    Return metadata for request item.
 
-        Optional parameters:    output_format { dict, json }
-
-        Output: array
-        """
-        uri = '/status/sessions/terminate?sessionId=%s&reason=%s' % (session_id, quote_plus(reason))
-        request = self.request_handler.make_request(uri=uri,
-                                                    request_type='GET',
-                                                    return_response=True)
-
-        return request
+    Parameters required:    rating_key { Plex ratingKey }
+    Optional parameters:    output_format { dict, json }
 
+    Output: array
+    """
     def get_metadata(self, rating_key='', output_format=''):
-        """
-        Return metadata for request item.
-
-        Parameters required:    rating_key { Plex ratingKey }
-        Optional parameters:    output_format { dict, json }
-
-        Output: array
-        """
-        uri = '/library/metadata/' + rating_key + '?includeMarkers=1'
+        uri = '/library/metadata/' + rating_key
         request = self.request_handler.make_request(uri=uri,
+                                                    proto=self.protocol,
                                                     request_type='GET',
                                                     output_format=output_format)
 
         return request
 
-    def get_epg_metadata(self, epg_key='', output_format=''):
-        """
-        Return epg metadata for request item.
+    """
+    Return metadata for children of the request item.
 
-        Parameters required:    epg_key { Plex key }
-        Optional parameters:    output_format { dict, json }
+    Parameters required:    rating_key { Plex ratingKey }
+    Optional parameters:    output_format { dict, json }
 
-        Output: array
-        """
-        uri = epg_key
-        request = self.request_handler.make_request(uri=uri,
-                                                    request_type='GET',
-                                                    output_format=output_format,
-                                                    raise_errors=False)
-
-        return request
-
-    def get_metadata_children(self, rating_key='', collection=False, output_format=''):
-        """
-        Return metadata for children of the request item.
-
-        Parameters required:    rating_key { Plex ratingKey }
-        Optional parameters:    output_format { dict, json }
-
-        Output: array
-        """
-        uri = '/library/{}/{}/children'.format(
-            'collections' if collection else 'metadata', rating_key
-        )
+    Output: array
+    """
+    def get_metadata_children(self, rating_key='', output_format=''):
+        uri = '/library/metadata/' + rating_key + '/children'
         request = self.request_handler.make_request(uri=uri,
+                                                    proto=self.protocol,
                                                     request_type='GET',
                                                     output_format=output_format)
 
         return request
 
-    def get_metadata_grandchildren(self, rating_key='', output_format=''):
-        """
-        Return metadata for graandchildren of the request item.
+    """
+    Return list of recently added items.
 
-        Parameters required:    rating_key { Plex ratingKey }
-        Optional parameters:    output_format { dict, json }
+    Parameters required:    count { number of results to return }
+    Optional parameters:    output_format { dict, json }
 
-        Output: array
-        """
-        uri = '/library/metadata/' + rating_key + '/grandchildren'
+    Output: array
+    """
+    def get_recently_added(self, count='0', output_format=''):
+        uri = '/library/recentlyAdded?X-Plex-Container-Start=0&X-Plex-Container-Size=' + count
         request = self.request_handler.make_request(uri=uri,
+                                                    proto=self.protocol,
                                                     request_type='GET',
                                                     output_format=output_format)
 
         return request
 
-    def get_playlist_items(self, rating_key='', output_format=''):
-        """
-        Return metadata for items of the requested playlist.
+    """
+    Return list of children in requested library item.
 
-        Parameters required:    rating_key { Plex ratingKey }
-        Optional parameters:    output_format { dict, json }
+    Parameters required:    rating_key { ratingKey of parent }
+    Optional parameters:    output_format { dict, json }
 
-        Output: array
-        """
-        uri = '/playlists/' + rating_key + '/items'
+    Output: array
+    """
+    def get_children_list(self, rating_key='', output_format=''):
+        uri = '/library/metadata/' + rating_key + '/children'
         request = self.request_handler.make_request(uri=uri,
+                                                    proto=self.protocol,
                                                     request_type='GET',
                                                     output_format=output_format)
-
+        
         return request
 
-    def get_recently_added(self, start='0', count='0', output_format=''):
-        """
-        Return list of recently added items.
+    """
+    Return list of local servers.
 
-        Parameters required:    count { number of results to return }
-        Optional parameters:    output_format { dict, json }
-
-        Output: array
-        """
-        uri = '/library/recentlyAdded?X-Plex-Container-Start=%s&X-Plex-Container-Size=%s' % (start, count)
-        request = self.request_handler.make_request(uri=uri,
-                                                    request_type='GET',
-                                                    output_format=output_format)
-
-        return request
-
-    def get_library_recently_added(self, section_id='', start='0', count='0', output_format=''):
-        """
-        Return list of recently added items.
-
-        Parameters required:    count { number of results to return }
-        Optional parameters:    output_format { dict, json }
-
-        Output: array
-        """
-        uri = '/library/sections/%s/recentlyAdded?X-Plex-Container-Start=%s&X-Plex-Container-Size=%s' % (section_id, start, count)
-        request = self.request_handler.make_request(uri=uri,
-                                                    request_type='GET',
-                                                    output_format=output_format)
-
-        return request
-
-    def get_children_list_related(self, rating_key='', output_format=''):
-        """
-        Return list of related children in requested collection item.
-
-        Parameters required:    rating_key { ratingKey of parent }
-        Optional parameters:    output_format { dict, json }
-
-        Output: array
-        """
-        uri = '/hubs/metadata/' + rating_key + '/related'
-        request = self.request_handler.make_request(uri=uri,
-                                                    request_type='GET',
-                                                    output_format=output_format)
-
-        return request
-
-    def get_childrens_list(self, rating_key='', output_format=''):
-        """
-        Return list of children in requested library item.
-
-        Parameters required:    rating_key { ratingKey of parent }
-        Optional parameters:    output_format { dict, json }
-
-        Output: array
-        """
-        uri = '/library/metadata/' + rating_key + '/allLeaves'
-        request = self.request_handler.make_request(uri=uri,
-                                                    request_type='GET',
-                                                    output_format=output_format)
-
-        return request
+    Optional parameters:    output_format { dict, json }
 
+    Output: array
+    """
     def get_server_list(self, output_format=''):
-        """
-        Return list of local servers.
-
-        Optional parameters:    output_format { dict, json }
-
-        Output: array
-        """
         uri = '/servers'
         request = self.request_handler.make_request(uri=uri,
+                                                    proto=self.protocol,
                                                     request_type='GET',
                                                     output_format=output_format)
 
         return request
 
+    """
+    Return the local servers preferences.
+
+    Optional parameters:    output_format { dict, json }
+
+    Output: array
+    """
     def get_server_prefs(self, output_format=''):
-        """
-        Return the local servers preferences.
-
-        Optional parameters:    output_format { dict, json }
-
-        Output: array
-        """
         uri = '/:/prefs'
         request = self.request_handler.make_request(uri=uri,
+                                                    proto=self.protocol,
                                                     request_type='GET',
                                                     output_format=output_format)
 
         return request
 
+    """
+    Return the local server identity.
+
+    Optional parameters:    output_format { dict, json }
+
+    Output: array
+    """
     def get_local_server_identity(self, output_format=''):
-        """
-        Return the local server identity.
-
-        Optional parameters:    output_format { dict, json }
-
-        Output: array
-        """
         uri = '/identity'
         request = self.request_handler.make_request(uri=uri,
+                                                    proto=self.protocol,
                                                     request_type='GET',
                                                     output_format=output_format)
 
         return request
 
+    """
+    Return list of libraries on server.
+
+    Optional parameters:    output_format { dict, json }
+
+    Output: array
+    """
     def get_libraries_list(self, output_format=''):
-        """
-        Return list of libraries on server.
-
-        Optional parameters:    output_format { dict, json }
-
-        Output: array
-        """
         uri = '/library/sections'
         request = self.request_handler.make_request(uri=uri,
+                                                    proto=self.protocol,
                                                     request_type='GET',
                                                     output_format=output_format)
 
         return request
 
-    def get_library_list(self, section_id='', list_type='all', start=0, count=0, sort_type='',
-                         label_key='', output_format=''):
-        """
-        Return list of items in library on server.
+    """
+    Return list of items in library on server.
 
-        Optional parameters:    output_format { dict, json }
+    Optional parameters:    output_format { dict, json }
 
-        Output: array
-        """
-        start = 'X-Plex-Container-Start=' + str(start)
-        count = 'X-Plex-Container-Size=' + str(count)
-        label_key = '&label=' + label_key if label_key else ''
-
-        uri = ('/library/sections/' + section_id + '/' + list_type + '?'
-               + start + '&' + count + sort_type + label_key)
+    Output: array
+    """
+    def get_library_list(self, section_key='', list_type='all', count='0', sort_type='', output_format=''):
+        uri = '/library/sections/' + section_key + '/' + list_type +'?X-Plex-Container-Start=0&X-Plex-Container-Size=' + count + sort_type
         request = self.request_handler.make_request(uri=uri,
+                                                    proto=self.protocol,
                                                     request_type='GET',
                                                     output_format=output_format)
 
         return request
 
-    def fetch_library_list(self, section_id='', list_type='all', count='', sort_type='',
-                           label_key='', output_format=''):
-        xml_head = []
+    """
+    Return sync item details.
 
-        start = 0
-        _count = int(count) if count else 100
+    Parameters required:    sync_id { unique sync id for item }
+    Optional parameters:    output_format { dict, json }
 
-        while True:
-            library_data = self.get_library_list(
-                section_id=str(section_id),
-                list_type=list_type,
-                start=start,
-                count=_count,
-                sort_type=sort_type,
-                label_key=label_key,
-                output_format=output_format
-            )
-
-            try:
-                _xml_head = library_data.getElementsByTagName('MediaContainer')
-                library_count = int(helpers.get_xml_attr(_xml_head[0], 'totalSize'))
-                xml_head.extend(_xml_head)
-            except Exception as e:
-                logger.warn("Tautulli Pmsconnect :: Unable to parse XML for fetch_library_list: %s." % e)
-                return xml_head
-
-            start += _count
-
-            if count or start >= library_count:
-                break
-
-        return xml_head
-
-    def get_library_labels(self, section_id='', output_format=''):
-        """
-        Return list of labels for a library on server.
-
-        Optional parameters:    output_format { dict, json }
-
-        Output: array
-        """
-        uri = '/library/sections/' + section_id + '/label'
-        request = self.request_handler.make_request(uri=uri,
-                                                    request_type='GET',
-                                                    output_format=output_format)
-
-        return request
-
-    def get_sync_item(self, sync_id='', output_format=''):
-        """
-        Return sync item details.
-
-        Parameters required:    sync_id { unique sync id for item }
-        Optional parameters:    output_format { dict, json }
-
-        Output: array
-        """
+    Output: array
+    """
+    def get_sync_item(self, sync_id=None, output_format=''):
         uri = '/sync/items/' + sync_id
         request = self.request_handler.make_request(uri=uri,
+                                                    proto=self.protocol,
                                                     request_type='GET',
                                                     output_format=output_format)
 
         return request
 
+    """
+    Return sync transcode queue.
+
+    Optional parameters:    output_format { dict, json }
+
+    Output: array
+    """
     def get_sync_transcode_queue(self, output_format=''):
-        """
-        Return sync transcode queue.
-
-        Optional parameters:    output_format { dict, json }
-
-        Output: array
-        """
         uri = '/sync/transcodeQueue'
         request = self.request_handler.make_request(uri=uri,
+                                                    proto=self.protocol,
                                                     request_type='GET',
                                                     output_format=output_format)
 
         return request
 
-    def get_search(self, query='', limit='', output_format=''):
-        """
-        Return search results.
+    """
+    Return search results.
 
-        Optional parameters:    output_format { dict, json }
+    Optional parameters:    output_format { dict, json }
 
-        Output: array
-        """
-        uri = '/hubs/search?query=' + quote(query.encode('utf8')) + '&limit=' + limit + '&includeCollections=1'
+    Output: array
+    """
+    def get_search(self, query='', track='', output_format=''):
+        uri = '/search?query=' + urllib2.quote(query.encode('utf8')) + track
         request = self.request_handler.make_request(uri=uri,
+                                                    proto=self.protocol,
                                                     request_type='GET',
                                                     output_format=output_format)
 
         return request
 
-    def get_account(self, output_format=''):
-        """
-        Return account details.
+    """
+    Return processed and validated list of recently added items.
 
-        Optional parameters:    output_format { dict, json }
+    Parameters required:    count { number of results to return }
 
-        Output: array
-        """
-        uri = '/myplex/account'
-        request = self.request_handler.make_request(uri=uri,
-                                                    request_type='GET',
-                                                    output_format=output_format)
-
-        return request
-
-    def put_refresh_reachability(self):
-        """
-        Refresh Plex remote access port mapping.
-
-        Optional parameters:    None
-
-        Output: None
-        """
-        uri = '/myplex/refreshReachability'
-        request = self.request_handler.make_request(uri=uri,
-                                                    request_type='PUT')
-
-        return request
-
-    def put_updater(self, output_format=''):
-        """
-        Refresh updater status.
-
-        Optional parameters:    output_format { dict, json }
-
-        Output: array
-        """
-        uri = '/updater/check?download=0'
-        request = self.request_handler.make_request(uri=uri,
-                                                    request_type='PUT',
-                                                    output_format=output_format)
-
-        return request
-
-    def get_updater(self, output_format=''):
-        """
-        Return updater status.
-
-        Optional parameters:    output_format { dict, json }
-
-        Output: array
-        """
-        uri = '/updater/status'
-        request = self.request_handler.make_request(uri=uri,
-                                                    request_type='GET',
-                                                    output_format=output_format)
-
-        return request
-
-    def get_hub_recently_added(self, start='0', count='0', media_type='', other_video=False, output_format=''):
-        """
-        Return Plex hub recently added.
-
-        Parameters required:    start { item number to start from }
-                                count { number of results to return }
-                                media_type { str }
-        Optional parameters:    output_format { dict, json }
-
-        Output: array
-        """
-        personal = '&personal=1' if other_video else ''
-        uri = '/hubs/home/recentlyAdded?X-Plex-Container-Start=%s&X-Plex-Container-Size=%s&type=%s%s' \
-              % (start, count, media_type, personal)
-        request = self.request_handler.make_request(uri=uri,
-                                                    request_type='GET',
-                                                    output_format=output_format)
-
-        return request
-
-    def get_dvrs(self, output_format=''):
-        """
-        Return Plex dvrs.
-
-        Parameters required:
-        Optional parameters:    output_format { dict, json }
-
-        Output: array
-        """
-        uri = '/livetv/dvrs'
-        request = self.request_handler.make_request(uri=uri,
-                                                    request_type='GET',
-                                                    output_format=output_format)
-
-        return request
-
-    def get_recently_added_details(self, start='0', count='0',  media_type='', section_id=''):
-        """
-        Return processed and validated list of recently added items.
-
-        Parameters required:    count { number of results to return }
-
-        Output: array
-        """
-        media_types = ('movie', 'show', 'artist', 'other_video')
-        recents_list = []
-
-        if media_type in media_types:
-            other_video = False
-            if media_type == 'movie':
-                media_type = '1'
-            elif media_type == 'show':
-                media_type = '2'
-            elif media_type == 'artist':
-                media_type = '8'
-            elif media_type == 'other_video':
-                media_type = '1'
-                other_video = True
-            recent = self.get_hub_recently_added(start, count, media_type, other_video, output_format='xml')
-        elif section_id:
-            recent = self.get_library_recently_added(section_id, start, count, output_format='xml')
-        else:
-            for media_type in media_types:
-                recents = self.get_recently_added_details(start, count, media_type)
-                recents_list += recents['recently_added']
-
-            output = {'recently_added': sorted(recents_list, key=lambda k: k['added_at'], reverse=True)[:int(count)]}
-            return output
+    Output: array
+    """
+    def get_recently_added_details(self, count='0'):
+        recent = self.get_recently_added(count, output_format='xml')
 
         try:
             xml_head = recent.getElementsByTagName('MediaContainer')
-        except Exception as e:
-            logger.warn("Tautulli Pmsconnect :: Unable to parse XML for get_recently_added: %s." % e)
-            return {'recently_added': []}
+        except:
+            logger.warn("Unable to parse XML for get_recently_added.")
+            return []
+
+        recents_list = []
 
         for a in xml_head:
             if a.getAttribute('size'):
@@ -577,1261 +277,336 @@ class PmsConnect(object):
                     output = {'recently_added': []}
                     return output
 
-            recents_main = []
             if a.getElementsByTagName('Directory'):
-                recents_main += a.getElementsByTagName('Directory')
+                recents_main = a.getElementsByTagName('Directory')
+                for item in recents_main:
+                    recent_type = helpers.get_xml_attr(item, 'type')
+                    recent_items = {'type': recent_type,
+                                    'rating_key': helpers.get_xml_attr(item, 'ratingKey'),
+                                    'title': helpers.get_xml_attr(item, 'title'),
+                                    'parent_title': helpers.get_xml_attr(item, 'parentTitle'),
+                                    'thumb': helpers.get_xml_attr(item, 'thumb'),
+                                    'added_at': helpers.get_xml_attr(item, 'addedAt')
+                                    }
+                    recents_list.append(recent_items)
+
             if a.getElementsByTagName('Video'):
-                recents_main += a.getElementsByTagName('Video')
+                recents_main = a.getElementsByTagName('Video')
+                for item in recents_main:
+                    recent_type = helpers.get_xml_attr(item, 'type')
 
-            for m in recents_main:
-                directors = []
-                writers = []
-                actors = []
-                genres = []
-                labels = []
-                collections = []
-                guids = []
-
-                if m.getElementsByTagName('Director'):
-                    for director in m.getElementsByTagName('Director'):
-                        directors.append(helpers.get_xml_attr(director, 'tag'))
-
-                if m.getElementsByTagName('Writer'):
-                    for writer in m.getElementsByTagName('Writer'):
-                        writers.append(helpers.get_xml_attr(writer, 'tag'))
-
-                if m.getElementsByTagName('Role'):
-                    for actor in m.getElementsByTagName('Role'):
-                        actors.append(helpers.get_xml_attr(actor, 'tag'))
-
-                if m.getElementsByTagName('Genre'):
-                    for genre in m.getElementsByTagName('Genre'):
-                        genres.append(helpers.get_xml_attr(genre, 'tag'))
-
-                if m.getElementsByTagName('Label'):
-                    for label in m.getElementsByTagName('Label'):
-                        labels.append(helpers.get_xml_attr(label, 'tag'))
-
-                if m.getElementsByTagName('Collection'):
-                    for collection in m.getElementsByTagName('Collection'):
-                        collections.append(helpers.get_xml_attr(collection, 'tag'))
-
-                if m.getElementsByTagName('Guid'):
-                    for guid in m.getElementsByTagName('Guid'):
-                        guids.append(helpers.get_xml_attr(guid, 'id'))
-
-                recent_item = {'media_type': helpers.get_xml_attr(m, 'type'),
-                               'section_id': helpers.get_xml_attr(m, 'librarySectionID'),
-                               'library_name': helpers.get_xml_attr(m, 'librarySectionTitle'),
-                               'rating_key': helpers.get_xml_attr(m, 'ratingKey'),
-                               'parent_rating_key': helpers.get_xml_attr(m, 'parentRatingKey'),
-                               'grandparent_rating_key': helpers.get_xml_attr(m, 'grandparentRatingKey'),
-                               'title': helpers.get_xml_attr(m, 'title'),
-                               'parent_title': helpers.get_xml_attr(m, 'parentTitle'),
-                               'grandparent_title': helpers.get_xml_attr(m, 'grandparentTitle'),
-                               'original_title': helpers.get_xml_attr(m, 'originalTitle'),
-                               'sort_title': helpers.get_xml_attr(m, 'titleSort'),
-                               'media_index': helpers.get_xml_attr(m, 'index'),
-                               'parent_media_index': helpers.get_xml_attr(m, 'parentIndex'),
-                               'studio': helpers.get_xml_attr(m, 'studio'),
-                               'content_rating': helpers.get_xml_attr(m, 'contentRating'),
-                               'summary': helpers.get_xml_attr(m, 'summary'),
-                               'tagline': helpers.get_xml_attr(m, 'tagline'),
-                               'rating': helpers.get_xml_attr(m, 'rating'),
-                               'rating_image': helpers.get_xml_attr(m, 'ratingImage'),
-                               'audience_rating': helpers.get_xml_attr(m, 'audienceRating'),
-                               'audience_rating_image': helpers.get_xml_attr(m, 'audienceRatingImage'),
-                               'user_rating': helpers.get_xml_attr(m, 'userRating'),
-                               'duration': helpers.get_xml_attr(m, 'duration'),
-                               'year': helpers.get_xml_attr(m, 'year'),
-                               'thumb': helpers.get_xml_attr(m, 'thumb'),
-                               'parent_thumb': helpers.get_xml_attr(m, 'parentThumb'),
-                               'grandparent_thumb': helpers.get_xml_attr(m, 'grandparentThumb'),
-                               'art': helpers.get_xml_attr(m, 'art'),
-                               'banner': helpers.get_xml_attr(m, 'banner'),
-                               'originally_available_at': helpers.get_xml_attr(m, 'originallyAvailableAt'),
-                               'added_at': helpers.get_xml_attr(m, 'addedAt'),
-                               'updated_at': helpers.get_xml_attr(m, 'updatedAt'),
-                               'last_viewed_at': helpers.get_xml_attr(m, 'lastViewedAt'),
-                               'guid': helpers.get_xml_attr(m, 'guid'),
-                               'directors': directors,
-                               'writers': writers,
-                               'actors': actors,
-                               'genres': genres,
-                               'labels': labels,
-                               'collections': collections,
-                               'guids': guids,
-                               'full_title': helpers.get_xml_attr(m, 'title'),
-                               'child_count': helpers.get_xml_attr(m, 'childCount')
-                               }
-
-                recents_list.append(recent_item)
+                    if recent_type == 'movie':
+                        recent_items = {'type': recent_type,
+                                        'rating_key': helpers.get_xml_attr(item, 'ratingKey'),
+                                        'title': helpers.get_xml_attr(item, 'title'),
+                                        'parent_title': helpers.get_xml_attr(item, 'parentTitle'),
+                                        'year': helpers.get_xml_attr(item, 'year'),
+                                        'thumb': helpers.get_xml_attr(item, 'thumb'),
+                                        'added_at': helpers.get_xml_attr(item, 'addedAt')
+                                        }
+                        recents_list.append(recent_items)
+                    else:
+                        pass
 
         output = {'recently_added': sorted(recents_list, key=lambda k: k['added_at'], reverse=True)}
-
         return output
 
-    def get_metadata_details(self, rating_key='', sync_id='', plex_guid='', epg_key='', section_id='',
-                             skip_cache=False, cache_key=None, return_cache=False, media_info=True):
-        """
-        Return processed and validated metadata list for requested item.
+    """
+    Return processed and validated metadata list for requested item.
 
-        Parameters required:    rating_key { Plex ratingKey }
+    Parameters required:    rating_key { Plex ratingKey }
 
-        Output: array
-        """
-        metadata = {}
-
-        if not skip_cache and cache_key:
-            in_file_folder = os.path.join(plexpy.CONFIG.CACHE_DIR, 'session_metadata')
-            in_file_path = os.path.join(in_file_folder, 'metadata-sessionKey-%s.json' % cache_key)
-
-            if not os.path.exists(in_file_folder):
-                os.mkdir(in_file_folder)
-
-            try:
-                with open(in_file_path, 'r') as inFile:
-                    metadata = json.load(inFile)
-            except (IOError, ValueError) as e:
-                pass
-
-            if metadata:
-                _cache_time = metadata.pop('_cache_time', 0)
-                # Return cached metadata if less than cache_seconds ago
-                if return_cache or helpers.timestamp() - _cache_time <= plexpy.CONFIG.METADATA_CACHE_SECONDS:
-                    return metadata
-
-        if rating_key:
-            metadata_xml = self.get_metadata(str(rating_key), output_format='xml')
-        elif sync_id:
-            metadata_xml = self.get_sync_item(str(sync_id), output_format='xml')
-        elif plex_guid.startswith(('plex://movie', 'plex://episode')):
-            rating_key = plex_guid.rsplit('/', 1)[-1]
-            plextv_metadata = PmsConnect(url='https://metadata.provider.plex.tv', token=plexpy.CONFIG.PMS_TOKEN)
-            metadata_xml = plextv_metadata.get_metadata(rating_key, output_format='xml')
-        elif epg_key:
-            metadata_xml = self.get_epg_metadata(epg_key, output_format='xml')
-        else:
-            return metadata
+    Output: array
+    """
+    def get_metadata_details(self, rating_key=''):
+        metadata = self.get_metadata(str(rating_key), output_format='xml')
 
         try:
-            xml_head = metadata_xml.getElementsByTagName('MediaContainer')
-        except Exception as e:
-            logger.warn("Tautulli Pmsconnect :: Unable to parse XML for get_metadata_details: %s." % e)
-            return {}
-
-        for a in xml_head:
-            if a.getAttribute('size'):
-                if a.getAttribute('size') == '0':
-                    return metadata
-
-            if a.getElementsByTagName('Directory'):
-                metadata_main_list = a.getElementsByTagName('Directory')
-            elif a.getElementsByTagName('Video'):
-                metadata_main_list = a.getElementsByTagName('Video')
-            elif a.getElementsByTagName('Track'):
-                metadata_main_list = a.getElementsByTagName('Track')
-            elif a.getElementsByTagName('Photo'):
-                metadata_main_list = a.getElementsByTagName('Photo')
-            elif a.getElementsByTagName('Playlist'):
-                metadata_main_list = a.getElementsByTagName('Playlist')
-            else:
-                logger.debug("Tautulli Pmsconnect :: Metadata failed")
-                return {}
-
-            if sync_id and len(metadata_main_list) > 1:
-                for metadata_main in metadata_main_list:
-                    if helpers.get_xml_attr(metadata_main, 'ratingKey') == rating_key:
-                        break
-            else:
-                metadata_main = metadata_main_list[0]
-
-            metadata_type = helpers.get_xml_attr(metadata_main, 'type')
-            if metadata_main.nodeName == 'Directory' and metadata_type == 'photo':
-                metadata_type = 'photo_album'
-
-            section_id = helpers.get_xml_attr(a, 'librarySectionID') or section_id
-            library_name = helpers.get_xml_attr(a, 'librarySectionTitle')
-
-            if not library_name and section_id:
-                library_data = libraries.Libraries().get_details(section_id)
-                library_name = library_data['section_name']
-
-        directors = []
-        writers = []
-        actors = []
-        genres = []
-        labels = []
-        collections = []
-        guids = []
-        markers = []
-
-        if metadata_main.getElementsByTagName('Director'):
-            for director in metadata_main.getElementsByTagName('Director'):
-                directors.append(helpers.get_xml_attr(director, 'tag'))
-
-        if metadata_main.getElementsByTagName('Writer'):
-            for writer in metadata_main.getElementsByTagName('Writer'):
-                writers.append(helpers.get_xml_attr(writer, 'tag'))
-
-        if metadata_main.getElementsByTagName('Role'):
-            for actor in metadata_main.getElementsByTagName('Role'):
-                actors.append(helpers.get_xml_attr(actor, 'tag'))
-
-        if metadata_main.getElementsByTagName('Genre'):
-            for genre in metadata_main.getElementsByTagName('Genre'):
-                genres.append(helpers.get_xml_attr(genre, 'tag'))
-
-        if metadata_main.getElementsByTagName('Label'):
-            for label in metadata_main.getElementsByTagName('Label'):
-                labels.append(helpers.get_xml_attr(label, 'tag'))
-
-        if metadata_main.getElementsByTagName('Collection'):
-            for collection in metadata_main.getElementsByTagName('Collection'):
-                collections.append(helpers.get_xml_attr(collection, 'tag'))
-
-        if metadata_main.getElementsByTagName('Guid'):
-            for guid in metadata_main.getElementsByTagName('Guid'):
-                guids.append(helpers.get_xml_attr(guid, 'id'))
-
-        if metadata_main.getElementsByTagName('Marker'):
-            first = None
-            for marker in metadata_main.getElementsByTagName('Marker'):
-                marker_type = helpers.get_xml_attr(marker, 'type')
-                if marker_type == 'credits':
-                    first = bool(first is None)
-                final = helpers.bool_true(helpers.get_xml_attr(marker, 'final'))
-                markers.append({
-                    'id': helpers.cast_to_int(helpers.get_xml_attr(marker, 'id')),
-                    'type': marker_type,
-                    'start_time_offset': helpers.cast_to_int(helpers.get_xml_attr(marker, 'startTimeOffset')),
-                    'end_time_offset': helpers.cast_to_int(helpers.get_xml_attr(marker, 'endTimeOffset')),
-                    'first': first if marker_type == 'credits' else None,
-                    'final': final if marker_type == 'credits' else None
-                })
-
-        if metadata_type == 'movie':
-            metadata = {'media_type': metadata_type,
-                        'section_id': section_id,
-                        'library_name': library_name,
-                        'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
-                        'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
-                        'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'),
-                        'title': helpers.get_xml_attr(metadata_main, 'title'),
-                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
-                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
-                        'original_title': helpers.get_xml_attr(metadata_main, 'originalTitle'),
-                        'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'),
-                        'edition_title': helpers.get_xml_attr(metadata_main, 'editionTitle'),
-                        'slug': helpers.get_xml_attr(metadata_main, 'slug'),
-                        'parent_slug': helpers.get_xml_attr(metadata_main, 'parentSlug'),
-                        'grandparent_slug': helpers.get_xml_attr(metadata_main, 'grandparentSlug'),
-                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
-                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
-                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
-                        'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
-                        'summary': helpers.get_xml_attr(metadata_main, 'summary'),
-                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
-                        'rating': helpers.get_xml_attr(metadata_main, 'rating'),
-                        'rating_image': helpers.get_xml_attr(metadata_main, 'ratingImage'),
-                        'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'),
-                        'audience_rating_image': helpers.get_xml_attr(metadata_main, 'audienceRatingImage'),
-                        'user_rating': helpers.get_xml_attr(metadata_main, 'userRating'),
-                        'duration': helpers.get_xml_attr(metadata_main, 'duration'),
-                        'year': helpers.get_xml_attr(metadata_main, 'year'),
-                        'parent_year': helpers.get_xml_attr(metadata_main, 'parentYear'),
-                        'grandparent_year': helpers.get_xml_attr(metadata_main, 'grandparentYear'),
-                        'thumb': helpers.get_xml_attr(metadata_main, 'thumb'),
-                        'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'),
-                        'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'),
-                        'art': helpers.get_xml_attr(metadata_main, 'art'),
-                        'banner': helpers.get_xml_attr(metadata_main, 'banner'),
-                        'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'),
-                        'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'),
-                        'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'),
-                        'last_viewed_at': helpers.get_xml_attr(metadata_main, 'lastViewedAt'),
-                        'guid': helpers.get_xml_attr(metadata_main, 'guid'),
-                        'parent_guid': helpers.get_xml_attr(metadata_main, 'parentGuid'),
-                        'grandparent_guid': helpers.get_xml_attr(metadata_main, 'grandparentGuid'),
-                        'directors': directors,
-                        'writers': writers,
-                        'actors': actors,
-                        'genres': genres,
-                        'labels': labels,
-                        'collections': collections,
-                        'guids': guids,
-                        'markers': markers,
-                        'parent_guids': [],
-                        'grandparent_guids': [],
-                        'full_title': helpers.get_xml_attr(metadata_main, 'title'),
-                        'children_count': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'leafCount')),
-                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1')
-                        }
-
-        elif metadata_type == 'show':
-            # Workaround for for duration sometimes reported in minutes for a show
-            duration = helpers.get_xml_attr(metadata_main, 'duration')
-            if duration.isdigit() and int(duration) < 1000:
-                duration = str(int(duration) * 60 * 1000)
-
-            metadata = {'media_type': metadata_type,
-                        'section_id': section_id,
-                        'library_name': library_name,
-                        'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
-                        'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
-                        'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'),
-                        'title': helpers.get_xml_attr(metadata_main, 'title'),
-                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
-                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
-                        'original_title': helpers.get_xml_attr(metadata_main, 'originalTitle'),
-                        'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'),
-                        'edition_title': helpers.get_xml_attr(metadata_main, 'editionTitle'),
-                        'slug': helpers.get_xml_attr(metadata_main, 'slug'),
-                        'parent_slug': helpers.get_xml_attr(metadata_main, 'parentSlug'),
-                        'grandparent_slug': helpers.get_xml_attr(metadata_main, 'grandparentSlug'),
-                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
-                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
-                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
-                        'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
-                        'summary': helpers.get_xml_attr(metadata_main, 'summary'),
-                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
-                        'rating': helpers.get_xml_attr(metadata_main, 'rating'),
-                        'rating_image': helpers.get_xml_attr(metadata_main, 'ratingImage'),
-                        'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'),
-                        'audience_rating_image': helpers.get_xml_attr(metadata_main, 'audienceRatingImage'),
-                        'user_rating': helpers.get_xml_attr(metadata_main, 'userRating'),
-                        'duration': duration,
-                        'year': helpers.get_xml_attr(metadata_main, 'year'),
-                        'parent_year': helpers.get_xml_attr(metadata_main, 'parentYear'),
-                        'grandparent_year': helpers.get_xml_attr(metadata_main, 'grandparentYear'),
-                        'thumb': helpers.get_xml_attr(metadata_main, 'thumb'),
-                        'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'),
-                        'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'),
-                        'art': helpers.get_xml_attr(metadata_main, 'art'),
-                        'banner': helpers.get_xml_attr(metadata_main, 'banner'),
-                        'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'),
-                        'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'),
-                        'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'),
-                        'last_viewed_at': helpers.get_xml_attr(metadata_main, 'lastViewedAt'),
-                        'guid': helpers.get_xml_attr(metadata_main, 'guid'),
-                        'parent_guid': helpers.get_xml_attr(metadata_main, 'parentGuid'),
-                        'grandparent_guid': helpers.get_xml_attr(metadata_main, 'grandparentGuid'),
-                        'directors': directors,
-                        'writers': writers,
-                        'actors': actors,
-                        'genres': genres,
-                        'labels': labels,
-                        'collections': collections,
-                        'guids': guids,
-                        'markers': markers,
-                        'parent_guids': [],
-                        'grandparent_guids': [],
-                        'full_title': helpers.get_xml_attr(metadata_main, 'title'),
-                        'children_count': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'leafCount')),
-                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1')
-                        }
-
-        elif metadata_type == 'season':
-            parent_rating_key = helpers.get_xml_attr(metadata_main, 'parentRatingKey')
-            parent_guid = helpers.get_xml_attr(metadata_main, 'parentGuid')
-            show_details = {}
-            if plex_guid and parent_guid:
-                show_details = self.get_metadata_details(plex_guid=parent_guid)
-            elif epg_key and parent_guid:
-                epg_key_root = epg_key.rsplit('/', maxsplit=1)[0]
-                show_details = self.get_metadata_details(epg_key=f"{epg_key_root}/{quote_plus(parent_guid)}")
-            elif not plex_guid and not epg_key and parent_rating_key:
-                show_details = self.get_metadata_details(parent_rating_key)
-
-            metadata = {'media_type': metadata_type,
-                        'section_id': section_id,
-                        'library_name': library_name,
-                        'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
-                        'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
-                        'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'),
-                        'title': helpers.get_xml_attr(metadata_main, 'title'),
-                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
-                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
-                        'original_title': helpers.get_xml_attr(metadata_main, 'originalTitle'),
-                        'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'),
-                        'edition_title': helpers.get_xml_attr(metadata_main, 'editionTitle'),
-                        'slug': helpers.get_xml_attr(metadata_main, 'slug'),
-                        'parent_slug': helpers.get_xml_attr(metadata_main, 'parentSlug'),
-                        'grandparent_slug': helpers.get_xml_attr(metadata_main, 'grandparentSlug'),
-                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
-                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
-                        'studio': show_details.get('studio', ''),
-                        'content_rating': show_details.get('content_rating', ''),
-                        'summary': helpers.get_xml_attr(metadata_main, 'summary') or show_details.get('summary', ''),
-                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
-                        'rating': helpers.get_xml_attr(metadata_main, 'rating'),
-                        'rating_image': helpers.get_xml_attr(metadata_main, 'ratingImage'),
-                        'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'),
-                        'audience_rating_image': helpers.get_xml_attr(metadata_main, 'audienceRatingImage'),
-                        'user_rating': helpers.get_xml_attr(metadata_main, 'userRating'),
-                        'duration': show_details.get('duration', ''),
-                        'year': helpers.get_xml_attr(metadata_main, 'year'),
-                        'parent_year': show_details.get('year', ''),
-                        'grandparent_year': helpers.get_xml_attr(metadata_main, 'grandparentYear'),
-                        'thumb': helpers.get_xml_attr(metadata_main, 'thumb'),
-                        'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb') or show_details.get('thumb'),
-                        'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'),
-                        'art': helpers.get_xml_attr(metadata_main, 'art'),
-                        'banner': show_details.get('banner', ''),
-                        'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'),
-                        'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'),
-                        'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'),
-                        'last_viewed_at': helpers.get_xml_attr(metadata_main, 'lastViewedAt'),
-                        'guid': helpers.get_xml_attr(metadata_main, 'guid'),
-                        'parent_guid': helpers.get_xml_attr(metadata_main, 'parentGuid'),
-                        'grandparent_guid': helpers.get_xml_attr(metadata_main, 'grandparentGuid'),
-                        'directors': show_details.get('directors', []),
-                        'writers': show_details.get('writers', []),
-                        'actors': show_details.get('actors', []),
-                        'genres': show_details.get('genres', []),
-                        'labels': show_details.get('labels', []),
-                        'collections': show_details.get('collections', []),
-                        'guids': guids,
-                        'markers': markers,
-                        'parent_guids': show_details.get('guids', []),
-                        'grandparent_guids': [],
-                        'full_title': '{} - {}'.format(helpers.get_xml_attr(metadata_main, 'parentTitle'),
-                                                       helpers.get_xml_attr(metadata_main, 'title')),
-                        'children_count': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'leafCount')),
-                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1')
-                        }
-
-        elif metadata_type == 'episode':
-            grandparent_rating_key = helpers.get_xml_attr(metadata_main, 'grandparentRatingKey')
-            grandparent_guid = helpers.get_xml_attr(metadata_main, 'grandparentGuid')
-            show_details = {}
-            if plex_guid and grandparent_guid:
-                show_details = self.get_metadata_details(plex_guid=grandparent_guid)
-            elif epg_key and grandparent_guid:
-                epg_key_root = epg_key.rsplit('/', maxsplit=1)[0]
-                show_details = self.get_metadata_details(epg_key=f"{epg_key_root}/{quote_plus(grandparent_guid)}")
-            elif not plex_guid and grandparent_rating_key:
-                show_details = self.get_metadata_details(grandparent_rating_key)
-
-            parent_rating_key = helpers.get_xml_attr(metadata_main, 'parentRatingKey')
-            parent_media_index = helpers.get_xml_attr(metadata_main, 'parentIndex')
-            parent_thumb = helpers.get_xml_attr(metadata_main, 'parentThumb')
-            season_details = self.get_metadata_details(parent_rating_key) if parent_rating_key else {}
-
-            if not plex_guid and not epg_key and not parent_rating_key:
-                # Try getting the parent_rating_key from the parent_thumb
-                if parent_thumb.startswith('/library/metadata/'):
-                    parent_rating_key = parent_thumb.split('/')[3]
-
-                # Try getting the parent_rating_key from the grandparent's children
-                if not parent_rating_key and grandparent_rating_key:
-                    children_list = self.get_item_children(grandparent_rating_key)
-                    parent_rating_key = next((c['rating_key'] for c in children_list['children_list']
-                                              if c['media_index'] == parent_media_index), '')
-
-            metadata = {'media_type': metadata_type,
-                        'section_id': section_id,
-                        'library_name': library_name,
-                        'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
-                        'parent_rating_key': parent_rating_key,
-                        'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'),
-                        'title': helpers.get_xml_attr(metadata_main, 'title'),
-                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
-                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
-                        'original_title': helpers.get_xml_attr(metadata_main, 'originalTitle'),
-                        'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'),
-                        'edition_title': helpers.get_xml_attr(metadata_main, 'editionTitle'),
-                        'slug': helpers.get_xml_attr(metadata_main, 'slug'),
-                        'parent_slug': helpers.get_xml_attr(metadata_main, 'parentSlug'),
-                        'grandparent_slug': helpers.get_xml_attr(metadata_main, 'grandparentSlug'),
-                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
-                        'parent_media_index': parent_media_index,
-                        'studio': show_details.get('studio', ''),
-                        'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
-                        'summary': helpers.get_xml_attr(metadata_main, 'summary'),
-                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
-                        'rating': helpers.get_xml_attr(metadata_main, 'rating'),
-                        'rating_image': helpers.get_xml_attr(metadata_main, 'ratingImage'),
-                        'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'),
-                        'audience_rating_image': helpers.get_xml_attr(metadata_main, 'audienceRatingImage'),
-                        'user_rating': helpers.get_xml_attr(metadata_main, 'userRating'),
-                        'duration': helpers.get_xml_attr(metadata_main, 'duration'),
-                        'year': helpers.get_xml_attr(metadata_main, 'year'),
-                        'parent_year': season_details.get('year', ''),
-                        'grandparent_year': show_details.get('year', ''),
-                        'thumb': helpers.get_xml_attr(metadata_main, 'thumb'),
-                        'parent_thumb': parent_thumb or show_details.get('thumb'),
-                        'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'),
-                        'art': helpers.get_xml_attr(metadata_main, 'art'),
-                        'banner': show_details.get('banner', ''),
-                        'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'),
-                        'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'),
-                        'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'),
-                        'last_viewed_at': helpers.get_xml_attr(metadata_main, 'lastViewedAt'),
-                        'guid': helpers.get_xml_attr(metadata_main, 'guid'),
-                        'parent_guid': helpers.get_xml_attr(metadata_main, 'parentGuid'),
-                        'grandparent_guid': helpers.get_xml_attr(metadata_main, 'grandparentGuid'),
-                        'directors': directors,
-                        'writers': writers,
-                        'actors': show_details.get('actors', []),
-                        'genres': show_details.get('genres', []),
-                        'labels': show_details.get('labels', []),
-                        'collections': show_details.get('collections', []),
-                        'guids': guids,
-                        'markers': markers,
-                        'parent_guids': season_details.get('guids', []),
-                        'grandparent_guids': show_details.get('guids', []),
-                        'full_title': '{} - {}'.format(helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
-                                                       helpers.get_xml_attr(metadata_main, 'title')),
-                        'children_count': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'leafCount')),
-                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1')
-                        }
-
-        elif metadata_type == 'artist':
-            metadata = {'media_type': metadata_type,
-                        'section_id': section_id,
-                        'library_name': library_name,
-                        'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
-                        'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
-                        'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'),
-                        'title': helpers.get_xml_attr(metadata_main, 'title'),
-                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
-                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
-                        'original_title': helpers.get_xml_attr(metadata_main, 'originalTitle'),
-                        'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'),
-                        'edition_title': helpers.get_xml_attr(metadata_main, 'editionTitle'),
-                        'slug': helpers.get_xml_attr(metadata_main, 'slug'),
-                        'parent_slug': helpers.get_xml_attr(metadata_main, 'parentSlug'),
-                        'grandparent_slug': helpers.get_xml_attr(metadata_main, 'grandparentSlug'),
-                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
-                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
-                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
-                        'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
-                        'summary': helpers.get_xml_attr(metadata_main, 'summary'),
-                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
-                        'rating': helpers.get_xml_attr(metadata_main, 'rating'),
-                        'rating_image': helpers.get_xml_attr(metadata_main, 'ratingImage'),
-                        'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'),
-                        'audience_rating_image': helpers.get_xml_attr(metadata_main, 'audienceRatingImage'),
-                        'user_rating': helpers.get_xml_attr(metadata_main, 'userRating'),
-                        'duration': helpers.get_xml_attr(metadata_main, 'duration'),
-                        'year': helpers.get_xml_attr(metadata_main, 'year'),
-                        'parent_year': helpers.get_xml_attr(metadata_main, 'parentYear'),
-                        'grandparent_year': helpers.get_xml_attr(metadata_main, 'grandparentYear'),
-                        'thumb': helpers.get_xml_attr(metadata_main, 'thumb'),
-                        'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'),
-                        'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'),
-                        'art': helpers.get_xml_attr(metadata_main, 'art'),
-                        'banner': helpers.get_xml_attr(metadata_main, 'banner'),
-                        'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'),
-                        'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'),
-                        'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'),
-                        'last_viewed_at': helpers.get_xml_attr(metadata_main, 'lastViewedAt'),
-                        'guid': helpers.get_xml_attr(metadata_main, 'guid'),
-                        'parent_guid': helpers.get_xml_attr(metadata_main, 'parentGuid'),
-                        'grandparent_guid': helpers.get_xml_attr(metadata_main, 'grandparentGuid'),
-                        'directors': directors,
-                        'writers': writers,
-                        'actors': actors,
-                        'genres': genres,
-                        'labels': labels,
-                        'collections': collections,
-                        'guids': guids,
-                        'markers': markers,
-                        'parent_guids': [],
-                        'grandparent_guids': [],
-                        'full_title': helpers.get_xml_attr(metadata_main, 'title'),
-                        'children_count': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'leafCount')),
-                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1')
-                        }
-
-        elif metadata_type == 'album':
-            parent_rating_key = helpers.get_xml_attr(metadata_main, 'parentRatingKey')
-            artist_details = self.get_metadata_details(parent_rating_key) if parent_rating_key else {}
-            metadata = {'media_type': metadata_type,
-                        'section_id': section_id,
-                        'library_name': library_name,
-                        'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
-                        'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
-                        'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'),
-                        'title': helpers.get_xml_attr(metadata_main, 'title'),
-                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
-                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
-                        'original_title': helpers.get_xml_attr(metadata_main, 'originalTitle'),
-                        'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'),
-                        'edition_title': helpers.get_xml_attr(metadata_main, 'editionTitle'),
-                        'slug': helpers.get_xml_attr(metadata_main, 'slug'),
-                        'parent_slug': helpers.get_xml_attr(metadata_main, 'parentSlug'),
-                        'grandparent_slug': helpers.get_xml_attr(metadata_main, 'grandparentSlug'),
-                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
-                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
-                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
-                        'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
-                        'summary': helpers.get_xml_attr(metadata_main, 'summary') or artist_details.get('summary', ''),
-                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
-                        'rating': helpers.get_xml_attr(metadata_main, 'rating'),
-                        'rating_image': helpers.get_xml_attr(metadata_main, 'ratingImage'),
-                        'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'),
-                        'audience_rating_image': helpers.get_xml_attr(metadata_main, 'audienceRatingImage'),
-                        'user_rating': helpers.get_xml_attr(metadata_main, 'userRating'),
-                        'duration': helpers.get_xml_attr(metadata_main, 'duration'),
-                        'year': helpers.get_xml_attr(metadata_main, 'year'),
-                        'parent_year': helpers.get_xml_attr(metadata_main, 'parentYear'),
-                        'grandparent_year': helpers.get_xml_attr(metadata_main, 'grandparentYear'),
-                        'thumb': helpers.get_xml_attr(metadata_main, 'thumb'),
-                        'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'),
-                        'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'),
-                        'art': helpers.get_xml_attr(metadata_main, 'art'),
-                        'banner': artist_details.get('banner', ''),
-                        'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'),
-                        'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'),
-                        'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'),
-                        'last_viewed_at': helpers.get_xml_attr(metadata_main, 'lastViewedAt'),
-                        'guid': helpers.get_xml_attr(metadata_main, 'guid'),
-                        'parent_guid': helpers.get_xml_attr(metadata_main, 'parentGuid'),
-                        'grandparent_guid': helpers.get_xml_attr(metadata_main, 'grandparentGuid'),
-                        'directors': directors,
-                        'writers': writers,
-                        'actors': actors,
-                        'genres': genres,
-                        'labels': labels,
-                        'collections': collections,
-                        'guids': guids,
-                        'markers': markers,
-                        'parent_guids': artist_details.get('guids', []),
-                        'grandparent_guids': [],
-                        'full_title': '{} - {}'.format(helpers.get_xml_attr(metadata_main, 'parentTitle'),
-                                                       helpers.get_xml_attr(metadata_main, 'title')),
-                        'children_count': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'leafCount')),
-                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1')
-                        }
-
-        elif metadata_type == 'track':
-            parent_rating_key = helpers.get_xml_attr(metadata_main, 'parentRatingKey')
-            album_details = self.get_metadata_details(parent_rating_key) if parent_rating_key else {}
-            track_artist = helpers.get_xml_attr(metadata_main, 'originalTitle') or \
-                           helpers.get_xml_attr(metadata_main, 'grandparentTitle')
-            metadata = {'media_type': metadata_type,
-                        'section_id': section_id,
-                        'library_name': library_name,
-                        'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
-                        'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
-                        'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'),
-                        'title': helpers.get_xml_attr(metadata_main, 'title'),
-                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
-                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
-                        'original_title': helpers.get_xml_attr(metadata_main, 'originalTitle'),
-                        'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'),
-                        'edition_title': helpers.get_xml_attr(metadata_main, 'editionTitle'),
-                        'slug': helpers.get_xml_attr(metadata_main, 'slug'),
-                        'parent_slug': helpers.get_xml_attr(metadata_main, 'parentSlug'),
-                        'grandparent_slug': helpers.get_xml_attr(metadata_main, 'grandparentSlug'),
-                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
-                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
-                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
-                        'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
-                        'summary': helpers.get_xml_attr(metadata_main, 'summary'),
-                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
-                        'rating': helpers.get_xml_attr(metadata_main, 'rating'),
-                        'rating_image': helpers.get_xml_attr(metadata_main, 'ratingImage'),
-                        'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'),
-                        'audience_rating_image': helpers.get_xml_attr(metadata_main, 'audienceRatingImage'),
-                        'user_rating': helpers.get_xml_attr(metadata_main, 'userRating'),
-                        'duration': helpers.get_xml_attr(metadata_main, 'duration'),
-                        'year': album_details.get('year', ''),
-                        'parent_year': helpers.get_xml_attr(metadata_main, 'parentYear'),
-                        'grandparent_year': helpers.get_xml_attr(metadata_main, 'grandparentYear'),
-                        'thumb': helpers.get_xml_attr(metadata_main, 'thumb'),
-                        'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'),
-                        'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'),
-                        'art': helpers.get_xml_attr(metadata_main, 'art'),
-                        'banner': album_details.get('banner', ''),
-                        'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'),
-                        'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'),
-                        'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'),
-                        'last_viewed_at': helpers.get_xml_attr(metadata_main, 'lastViewedAt'),
-                        'guid': helpers.get_xml_attr(metadata_main, 'guid'),
-                        'parent_guid': helpers.get_xml_attr(metadata_main, 'parentGuid'),
-                        'grandparent_guid': helpers.get_xml_attr(metadata_main, 'grandparentGuid'),
-                        'directors': directors,
-                        'writers': writers,
-                        'actors': actors,
-                        'genres': album_details.get('genres', []),
-                        'labels': album_details.get('labels', []),
-                        'collections': album_details.get('collections', []),
-                        'guids': guids,
-                        'markers': markers,
-                        'parent_guids': album_details.get('guids', []),
-                        'grandparent_guids': album_details.get('parent_guids', []),
-                        'full_title': '{} - {}'.format(helpers.get_xml_attr(metadata_main, 'title'),
-                                                       track_artist),
-                        'children_count': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'leafCount')),
-                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1')
-                        }
-
-        elif metadata_type == 'photo_album':
-            metadata = {'media_type': metadata_type,
-                        'section_id': section_id,
-                        'library_name': library_name,
-                        'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
-                        'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
-                        'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'),
-                        'title': helpers.get_xml_attr(metadata_main, 'title'),
-                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
-                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
-                        'original_title': helpers.get_xml_attr(metadata_main, 'originalTitle'),
-                        'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'),
-                        'edition_title': helpers.get_xml_attr(metadata_main, 'editionTitle'),
-                        'slug': helpers.get_xml_attr(metadata_main, 'slug'),
-                        'parent_slug': helpers.get_xml_attr(metadata_main, 'parentSlug'),
-                        'grandparent_slug': helpers.get_xml_attr(metadata_main, 'grandparentSlug'),
-                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
-                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
-                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
-                        'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
-                        'summary': helpers.get_xml_attr(metadata_main, 'summary'),
-                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
-                        'rating': helpers.get_xml_attr(metadata_main, 'rating'),
-                        'rating_image': helpers.get_xml_attr(metadata_main, 'ratingImage'),
-                        'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'),
-                        'audience_rating_image': helpers.get_xml_attr(metadata_main, 'audienceRatingImage'),
-                        'user_rating': helpers.get_xml_attr(metadata_main, 'userRating'),
-                        'duration': helpers.get_xml_attr(metadata_main, 'duration'),
-                        'year': helpers.get_xml_attr(metadata_main, 'year'),
-                        'parent_year': helpers.get_xml_attr(metadata_main, 'parentYear'),
-                        'grandparent_year': helpers.get_xml_attr(metadata_main, 'grandparentYear'),
-                        'thumb': helpers.get_xml_attr(metadata_main, 'thumb'),
-                        'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'),
-                        'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'),
-                        'art': helpers.get_xml_attr(metadata_main, 'art'),
-                        'banner': helpers.get_xml_attr(metadata_main, 'banner'),
-                        'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'),
-                        'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'),
-                        'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'),
-                        'last_viewed_at': helpers.get_xml_attr(metadata_main, 'lastViewedAt'),
-                        'guid': helpers.get_xml_attr(metadata_main, 'guid'),
-                        'parent_guid': helpers.get_xml_attr(metadata_main, 'parentGuid'),
-                        'grandparent_guid': helpers.get_xml_attr(metadata_main, 'grandparentGuid'),
-                        'directors': directors,
-                        'writers': writers,
-                        'actors': actors,
-                        'genres': genres,
-                        'labels': labels,
-                        'collections': collections,
-                        'guids': guids,
-                        'markers': markers,
-                        'parent_guids': [],
-                        'grandparent_guids': [],
-                        'full_title': helpers.get_xml_attr(metadata_main, 'title'),
-                        'children_count': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'leafCount')),
-                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1')
-                        }
-
-        elif metadata_type == 'photo':
-            parent_rating_key = helpers.get_xml_attr(metadata_main, 'parentRatingKey')
-            photo_album_details = self.get_metadata_details(parent_rating_key) if parent_rating_key else {}
-            metadata = {'media_type': metadata_type,
-                        'section_id': section_id,
-                        'library_name': library_name,
-                        'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
-                        'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
-                        'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'),
-                        'title': helpers.get_xml_attr(metadata_main, 'title'),
-                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
-                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
-                        'original_title': helpers.get_xml_attr(metadata_main, 'originalTitle'),
-                        'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'),
-                        'edition_title': helpers.get_xml_attr(metadata_main, 'editionTitle'),
-                        'slug': helpers.get_xml_attr(metadata_main, 'slug'),
-                        'parent_slug': helpers.get_xml_attr(metadata_main, 'parentSlug'),
-                        'grandparent_slug': helpers.get_xml_attr(metadata_main, 'grandparentSlug'),
-                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
-                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
-                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
-                        'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
-                        'summary': helpers.get_xml_attr(metadata_main, 'summary'),
-                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
-                        'rating': helpers.get_xml_attr(metadata_main, 'rating'),
-                        'rating_image': helpers.get_xml_attr(metadata_main, 'ratingImage'),
-                        'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'),
-                        'audience_rating_image': helpers.get_xml_attr(metadata_main, 'audienceRatingImage'),
-                        'user_rating': helpers.get_xml_attr(metadata_main, 'userRating'),
-                        'duration': helpers.get_xml_attr(metadata_main, 'duration'),
-                        'year': helpers.get_xml_attr(metadata_main, 'year'),
-                        'parent_year': helpers.get_xml_attr(metadata_main, 'parentYear'),
-                        'grandparent_year': helpers.get_xml_attr(metadata_main, 'grandparentYear'),
-                        'thumb': helpers.get_xml_attr(metadata_main, 'thumb'),
-                        'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'),
-                        'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'),
-                        'art': helpers.get_xml_attr(metadata_main, 'art'),
-                        'banner': photo_album_details.get('banner', ''),
-                        'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'),
-                        'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'),
-                        'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'),
-                        'last_viewed_at': helpers.get_xml_attr(metadata_main, 'lastViewedAt'),
-                        'guid': helpers.get_xml_attr(metadata_main, 'guid'),
-                        'parent_guid': helpers.get_xml_attr(metadata_main, 'parentGuid'),
-                        'grandparent_guid': helpers.get_xml_attr(metadata_main, 'grandparentGuid'),
-                        'directors': directors,
-                        'writers': writers,
-                        'actors': actors,
-                        'genres': photo_album_details.get('genres', []),
-                        'labels': photo_album_details.get('labels', []),
-                        'collections': photo_album_details.get('collections', []),
-                        'guids': [],
-                        'markers': markers,
-                        'parent_guids': photo_album_details.get('guids', []),
-                        'grandparent_guids': [],
-                        'full_title': '{} - {}'.format(helpers.get_xml_attr(metadata_main, 'parentTitle') or library_name,
-                                                       helpers.get_xml_attr(metadata_main, 'title')),
-                        'children_count': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'leafCount')),
-                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1')
-                        }
-
-        elif metadata_type == 'collection':
-            metadata = {'media_type': metadata_type,
-                        'sub_media_type': helpers.get_xml_attr(metadata_main, 'subtype'),
-                        'section_id': section_id,
-                        'library_name': library_name,
-                        'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
-                        'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
-                        'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'),
-                        'title': helpers.get_xml_attr(metadata_main, 'title'),
-                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
-                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
-                        'original_title': helpers.get_xml_attr(metadata_main, 'originalTitle'),
-                        'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'),
-                        'edition_title': helpers.get_xml_attr(metadata_main, 'editionTitle'),
-                        'slug': helpers.get_xml_attr(metadata_main, 'slug'),
-                        'parent_slug': helpers.get_xml_attr(metadata_main, 'parentSlug'),
-                        'grandparent_slug': helpers.get_xml_attr(metadata_main, 'grandparentSlug'),
-                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
-                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
-                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
-                        'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
-                        'summary': helpers.get_xml_attr(metadata_main, 'summary'),
-                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
-                        'rating': helpers.get_xml_attr(metadata_main, 'rating'),
-                        'rating_image': helpers.get_xml_attr(metadata_main, 'ratingImage'),
-                        'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'),
-                        'audience_rating_image': helpers.get_xml_attr(metadata_main, 'audienceRatingImage'),
-                        'user_rating': helpers.get_xml_attr(metadata_main, 'userRating'),
-                        'duration': helpers.get_xml_attr(metadata_main, 'duration'),
-                        'year': helpers.get_xml_attr(metadata_main, 'year'),
-                        'parent_year': helpers.get_xml_attr(metadata_main, 'parentYear'),
-                        'grandparent_year': helpers.get_xml_attr(metadata_main, 'grandparentYear'),
-                        'min_year': helpers.get_xml_attr(metadata_main, 'minYear'),
-                        'max_year': helpers.get_xml_attr(metadata_main, 'maxYear'),
-                        'thumb': helpers.get_xml_attr(metadata_main, 'thumb').split('?')[0],
-                        'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'),
-                        'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'),
-                        'art': helpers.get_xml_attr(metadata_main, 'art'),
-                        'banner': helpers.get_xml_attr(metadata_main, 'banner'),
-                        'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'),
-                        'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'),
-                        'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'),
-                        'last_viewed_at': helpers.get_xml_attr(metadata_main, 'lastViewedAt'),
-                        'guid': helpers.get_xml_attr(metadata_main, 'guid'),
-                        'parent_guid': helpers.get_xml_attr(metadata_main, 'parentGuid'),
-                        'grandparent_guid': helpers.get_xml_attr(metadata_main, 'grandparentGuid'),
-                        'child_count': helpers.get_xml_attr(metadata_main, 'childCount'),
-                        'directors': directors,
-                        'writers': writers,
-                        'actors': actors,
-                        'genres': genres,
-                        'labels': labels,
-                        'collections': collections,
-                        'guids': guids,
-                        'markers': markers,
-                        'parent_guids': [],
-                        'grandparent_guids': [],
-                        'full_title': helpers.get_xml_attr(metadata_main, 'title'),
-                        'children_count': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'childCount')),
-                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1'),
-                        'smart': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'smart'))
-                        }
-
-        elif metadata_type == 'playlist':
-            metadata = {'media_type': metadata_type,
-                        'section_id': section_id,
-                        'library_name': library_name,
-                        'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
-                        'guid': helpers.get_xml_attr(metadata_main, 'guid'),
-                        'title': helpers.get_xml_attr(metadata_main, 'title'),
-                        'summary': helpers.get_xml_attr(metadata_main, 'summary'),
-                        'duration': helpers.get_xml_attr(metadata_main, 'duration'),
-                        'composite': helpers.get_xml_attr(metadata_main, 'composite'),
-                        'thumb': helpers.get_xml_attr(metadata_main, 'composite'),
-                        'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'),
-                        'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'),
-                        'last_viewed_at': helpers.get_xml_attr(metadata_main, 'lastViewedAt'),
-                        'children_count': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'leafCount')),
-                        'smart': helpers.cast_to_int(helpers.get_xml_attr(metadata_main, 'smart')),
-                        'playlist_type': helpers.get_xml_attr(metadata_main, 'playlistType'),
-                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1')
-                        }
-
-        elif metadata_type == 'clip':
-            metadata = {'media_type': metadata_type,
-                        'section_id': section_id,
-                        'library_name': library_name,
-                        'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
-                        'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
-                        'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'),
-                        'title': helpers.get_xml_attr(metadata_main, 'title'),
-                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
-                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
-                        'original_title': helpers.get_xml_attr(metadata_main, 'originalTitle'),
-                        'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'),
-                        'edition_title': helpers.get_xml_attr(metadata_main, 'editionTitle'),
-                        'slug': helpers.get_xml_attr(metadata_main, 'slug'),
-                        'parent_slug': helpers.get_xml_attr(metadata_main, 'parentSlug'),
-                        'grandparent_slug': helpers.get_xml_attr(metadata_main, 'grandparentSlug'),
-                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
-                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
-                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
-                        'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
-                        'summary': helpers.get_xml_attr(metadata_main, 'summary'),
-                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
-                        'rating': helpers.get_xml_attr(metadata_main, 'rating'),
-                        'rating_image': helpers.get_xml_attr(metadata_main, 'ratingImage'),
-                        'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'),
-                        'audience_rating_image': helpers.get_xml_attr(metadata_main, 'audienceRatingImage'),
-                        'user_rating': helpers.get_xml_attr(metadata_main, 'userRating'),
-                        'duration': helpers.get_xml_attr(metadata_main, 'duration'),
-                        'year': helpers.get_xml_attr(metadata_main, 'year'),
-                        'parent_year': helpers.get_xml_attr(metadata_main, 'parentYear'),
-                        'thumb': helpers.get_xml_attr(metadata_main, 'thumb'),
-                        'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'),
-                        'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'),
-                        'art': helpers.get_xml_attr(metadata_main, 'art'),
-                        'banner': helpers.get_xml_attr(metadata_main, 'banner'),
-                        'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'),
-                        'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'),
-                        'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'),
-                        'last_viewed_at': helpers.get_xml_attr(metadata_main, 'lastViewedAt'),
-                        'guid': helpers.get_xml_attr(metadata_main, 'guid'),
-                        'parent_guid': helpers.get_xml_attr(metadata_main, 'parentGuid'),
-                        'grandparent_guid': helpers.get_xml_attr(metadata_main, 'grandparentGuid'),
-                        'directors': directors,
-                        'writers': writers,
-                        'actors': actors,
-                        'genres': genres,
-                        'labels': labels,
-                        'collections': collections,
-                        'guids': guids,
-                        'markers': markers,
-                        'parent_guids': [],
-                        'grandparent_guids': [],
-                        'full_title': helpers.get_xml_attr(metadata_main, 'title'),
-                        'extra_type': helpers.get_xml_attr(metadata_main, 'extraType'),
-                        'sub_type': helpers.get_xml_attr(metadata_main, 'subtype'),
-                        'live': int(helpers.get_xml_attr(metadata_main, 'live') == '1')
-                        }
-
-        else:
-            return metadata
-
-        # Get additional metadata EPG provider
-        epg_metadata = None
-        if not epg_key and metadata['live']:
-            metadata['section_id'] = common.LIVE_TV_SECTION_ID
-            metadata['library_name'] = common.LIVE_TV_SECTION_NAME
-
-            # Don't know the DVR key so need to try them all
-            for dvr in self.get_dvrs_list():
-                epg_metadata = self.get_metadata_details(epg_key=f"/{dvr['epg_identifier']}/metadata/{quote_plus(metadata['guid'])}", media_info=True)
-                if epg_metadata:
-                    metadata['epg_identifier'] = dvr['epg_identifier']
-                    keys_to_update = [
-                        'content_rating', 'summary', 'duration', 'guid',
-                        'grandparent_title', 'grandparent_thumb', 'grandparent_guid',
-                        'parent_title', 'parent_thumb', 'parent_guid'
-                    ]
-                    for key in keys_to_update:
-                        metadata[key] = epg_metadata[key]
-                    metadata['originally_available_at'] = helpers.timestamp_to_YMDHMS(epg_metadata['media_info'][0]['begins_at'], sep=True, ymd=True)
-                    break
-        # Get additional metadata from metadata.provider.plex.tv
-        elif not plex_guid and metadata['live']:
-            metadata['section_id'] = common.LIVE_TV_SECTION_ID
-            metadata['library_name'] = common.LIVE_TV_SECTION_NAME
-
-            plextv_metadata = self.get_metadata_details(plex_guid=metadata['guid'])
-            if plextv_metadata:
-                keys_to_update = ['summary', 'rating', 'thumb', 'grandparent_thumb', 'duration',
-                                  'guid', 'grandparent_guid', 'genres']
-                for key in keys_to_update:
-                    metadata[key] = plextv_metadata[key]
-                metadata['originally_available_at'] = helpers.iso_to_YMD(plextv_metadata['originally_available_at'])
-
-        if metadata and media_info:
-            medias = []
-            media_items = metadata_main.getElementsByTagName('Media')
-            for media in media_items:
-                video_full_resolution_scan_type = ''
-
-                parts = []
-                part_items = media.getElementsByTagName('Part')
-                for part in part_items:
-
-                    streams = []
-                    stream_items = part.getElementsByTagName('Stream')
-                    for stream in stream_items:
-                        if helpers.get_xml_attr(stream, 'streamType') == '1':
-                            video_scan_type = helpers.get_xml_attr(stream, 'scanType')
-                            video_full_resolution_scan_type = (video_full_resolution_scan_type or video_scan_type)
-
-                            streams.append({'id': helpers.get_xml_attr(stream, 'id'),
-                                            'type': helpers.get_xml_attr(stream, 'streamType'),
-                                            'video_codec': helpers.get_xml_attr(stream, 'codec'),
-                                            'video_codec_level': helpers.get_xml_attr(stream, 'level'),
-                                            'video_bitrate': helpers.get_xml_attr(stream, 'bitrate'),
-                                            'video_bit_depth': helpers.get_xml_attr(stream, 'bitDepth'),
-                                            'video_chroma_subsampling': helpers.get_xml_attr(stream, 'chromaSubsampling'),
-                                            'video_color_primaries': helpers.get_xml_attr(stream, 'colorPrimaries'),
-                                            'video_color_range': helpers.get_xml_attr(stream, 'colorRange'),
-                                            'video_color_space': helpers.get_xml_attr(stream, 'colorSpace'),
-                                            'video_color_trc': helpers.get_xml_attr(stream, 'colorTrc'),
-                                            'video_dynamic_range': self.get_dynamic_range(stream),
-                                            'video_dovi_bl_present': int(helpers.get_xml_attr(stream, 'DOVIBLPresent') == '1'),
-                                            'video_dovi_el_present': int(helpers.get_xml_attr(stream, 'DOVIELPresent') == '1'),
-                                            'video_dovi_level': helpers.cast_to_int(helpers.get_xml_attr(stream, 'DOVILevel')),
-                                            'video_dovi_present': int(helpers.get_xml_attr(stream, 'DOVIPresent') == '1'),
-                                            'video_dovi_profile': helpers.cast_to_int(helpers.get_xml_attr(stream, 'DOVIProfile')),
-                                            'video_dovi_rpu_present': int(helpers.get_xml_attr(stream, 'DOVIRPUPresent') == '1'),
-                                            'video_dovi_version': helpers.cast_to_float(helpers.get_xml_attr(stream, 'DOVIVersion')),
-                                            'video_frame_rate': helpers.get_xml_attr(stream, 'frameRate'),
-                                            'video_ref_frames': helpers.get_xml_attr(stream, 'refFrames'),
-                                            'video_height': helpers.get_xml_attr(stream, 'height'),
-                                            'video_width': helpers.get_xml_attr(stream, 'width'),
-                                            'video_language': helpers.get_xml_attr(stream, 'language'),
-                                            'video_language_code': helpers.get_xml_attr(stream, 'languageCode'),
-                                            'video_profile': helpers.get_xml_attr(stream, 'profile'),
-                                            'video_scan_type': helpers.get_xml_attr(stream, 'scanType'),
-                                            'selected': int(helpers.get_xml_attr(stream, 'selected') == '1')
-                                            })
-
-                        elif helpers.get_xml_attr(stream, 'streamType') == '2':
-                            streams.append({'id': helpers.get_xml_attr(stream, 'id'),
-                                            'type': helpers.get_xml_attr(stream, 'streamType'),
-                                            'audio_codec': helpers.get_xml_attr(stream, 'codec'),
-                                            'audio_bitrate': helpers.get_xml_attr(stream, 'bitrate'),
-                                            'audio_bitrate_mode': helpers.get_xml_attr(stream, 'bitrateMode'),
-                                            'audio_channels': helpers.get_xml_attr(stream, 'channels'),
-                                            'audio_channel_layout': helpers.get_xml_attr(stream, 'audioChannelLayout'),
-                                            'audio_sample_rate': helpers.get_xml_attr(stream, 'samplingRate'),
-                                            'audio_language': helpers.get_xml_attr(stream, 'language'),
-                                            'audio_language_code': helpers.get_xml_attr(stream, 'languageCode'),
-                                            'audio_profile': helpers.get_xml_attr(stream, 'profile'),
-                                            'selected': int(helpers.get_xml_attr(stream, 'selected') == '1')
-                                            })
-
-                        elif helpers.get_xml_attr(stream, 'streamType') == '3':
-                            streams.append({'id': helpers.get_xml_attr(stream, 'id'),
-                                            'type': helpers.get_xml_attr(stream, 'streamType'),
-                                            'subtitle_codec': helpers.get_xml_attr(stream, 'codec'),
-                                            'subtitle_container': helpers.get_xml_attr(stream, 'container'),
-                                            'subtitle_format': helpers.get_xml_attr(stream, 'format'),
-                                            'subtitle_forced': int(helpers.get_xml_attr(stream, 'forced') == '1'),
-                                            'subtitle_location': 'external' if helpers.get_xml_attr(stream, 'key') else 'embedded',
-                                            'subtitle_language': helpers.get_xml_attr(stream, 'language'),
-                                            'subtitle_language_code': helpers.get_xml_attr(stream, 'languageCode'),
-                                            'selected': int(helpers.get_xml_attr(stream, 'selected') == '1')
-                                            })
-
-                    parts.append({'id': helpers.get_xml_attr(part, 'id'),
-                                  'file': helpers.get_xml_attr(part, 'file'),
-                                  'file_size': helpers.get_xml_attr(part, 'size'),
-                                  'indexes': int(helpers.get_xml_attr(part, 'indexes') == 'sd'),
-                                  'streams': streams,
-                                  'selected': int(helpers.get_xml_attr(part, 'selected') == '1')
-                                  })
-
-                video_resolution = helpers.get_xml_attr(media, 'videoResolution').lower().rstrip('ip')
-                video_full_resolution = common.VIDEO_RESOLUTION_OVERRIDES.get(
-                    video_resolution, video_resolution + (video_full_resolution_scan_type[:1] or 'p')
-                )
-
-                audio_channels = helpers.get_xml_attr(media, 'audioChannels')
-
-                _media_info = {'id': helpers.get_xml_attr(media, 'id'),
-                              'container': helpers.get_xml_attr(media, 'container'),
-                              'bitrate': helpers.get_xml_attr(media, 'bitrate'),
-                              'height': helpers.get_xml_attr(media, 'height'),
-                              'width': helpers.get_xml_attr(media, 'width'),
-                              'aspect_ratio': helpers.get_xml_attr(media, 'aspectRatio'),
-                              'video_codec': helpers.get_xml_attr(media, 'videoCodec'),
-                              'video_resolution': video_resolution,
-                              'video_full_resolution': video_full_resolution,
-                              'video_framerate': helpers.get_xml_attr(media, 'videoFrameRate'),
-                              'video_profile': helpers.get_xml_attr(media, 'videoProfile'),
-                              'audio_codec': helpers.get_xml_attr(media, 'audioCodec'),
-                              'audio_channels': audio_channels,
-                              'audio_channel_layout': common.AUDIO_CHANNELS.get(audio_channels, audio_channels),
-                              'audio_profile': helpers.get_xml_attr(media, 'audioProfile'),
-                              'optimized_version': int(helpers.get_xml_attr(media, 'proxyType') == '42'),
-                              'channel_call_sign': helpers.get_xml_attr(media, 'channelCallSign'),
-                              'channel_id': helpers.get_xml_attr(media, 'channelID'),
-                              'channel_identifier': helpers.get_xml_attr(media, 'channelIdentifier'),
-                              'channel_title': helpers.get_xml_attr(media, 'channelTitle'),
-                              'channel_thumb': helpers.get_xml_attr(media, 'channelThumb'),
-                              'channel_vcn': helpers.get_xml_attr(media, 'channelVcn'),
-                              'protocol': helpers.get_xml_attr(media, 'protocol'),  # livetv
-                              'begins_at': helpers.cast_to_int(helpers.get_xml_attr(media, 'beginsAt')),  # livetv
-                              'ends_at': helpers.cast_to_int(helpers.get_xml_attr(media, 'endsAt')),  # livetv
-                              'parts': parts
-                              }
-
-                if epg_metadata:
-                    media_info_keys_to_update = [
-                        'channel_id', 'channel_title', 'channel_vcn'
-                    ]
-                    for key in media_info_keys_to_update:
-                        _media_info[key] = epg_metadata['media_info'][0][key]
-
-                medias.append(_media_info)
-
-            metadata['media_info'] = medias
-
-        if metadata:
-            if cache_key:
-                metadata['_cache_time'] = helpers.timestamp()
-
-                out_file_folder = os.path.join(plexpy.CONFIG.CACHE_DIR, 'session_metadata')
-                out_file_path = os.path.join(out_file_folder, 'metadata-sessionKey-%s.json' % cache_key)
-
-                if not os.path.exists(out_file_folder):
-                    os.mkdir(out_file_folder)
-
-                try:
-                    with open(out_file_path, 'w') as outFile:
-                        json.dump(metadata, outFile)
-                except (IOError, ValueError) as e:
-                    logger.error("Tautulli Pmsconnect :: Unable to create cache file for metadata (sessionKey %s): %s"
-                                 % (cache_key, e))
-
-            return metadata
-        else:
-            return metadata
-
-    def get_metadata_children_details(self, rating_key='', get_children=False, media_type=None, section_id=None):
-        """
-        Return processed and validated metadata list for all children of requested item.
-
-        Parameters required:    rating_key { Plex ratingKey }
-
-        Output: array
-        """
-        if media_type == 'artist':
-            sort_type = '&artist.id={}&type=9'.format(rating_key)
-            xml_head = self.fetch_library_list(
-                section_id=str(section_id),
-                sort_type=sort_type,
-                output_format='xml'
-            )
-        else:
-            metadata = self.get_metadata_children(str(rating_key), output_format='xml')
-
-            try:
-                xml_head = metadata.getElementsByTagName('MediaContainer')
-            except Exception as e:
-                logger.warn("Tautulli Pmsconnect :: Unable to parse XML for get_metadata_children: %s." % e)
-                return []
-
-        metadata_list = []
-
-        for a in xml_head:
-            if a.getAttribute('size'):
-                if a.getAttribute('size') == '0':
-                    return metadata_list
-
-            if a.getElementsByTagName('Video'):
-                metadata_main = a.getElementsByTagName('Video')
-                for item in metadata_main:
-                    child_rating_key = helpers.get_xml_attr(item, 'ratingKey')
-                    metadata = self.get_metadata_details(str(child_rating_key))
-                    if metadata:
-                        metadata_list.append(metadata)
-
-            elif a.getElementsByTagName('Track'):
-                metadata_main = a.getElementsByTagName('Track')
-                for item in metadata_main:
-                    child_rating_key = helpers.get_xml_attr(item, 'ratingKey')
-                    metadata = self.get_metadata_details(str(child_rating_key))
-                    if metadata:
-                        metadata_list.append(metadata)
-
-            elif get_children and a.getElementsByTagName('Directory'):
-                dir_main = a.getElementsByTagName('Directory')
-                metadata_main = [d for d in dir_main if helpers.get_xml_attr(d, 'ratingKey')]
-                for item in metadata_main:
-                    child_rating_key = helpers.get_xml_attr(item, 'ratingKey')
-                    metadata = self.get_metadata_children_details(str(child_rating_key), get_children)
-                    if metadata:
-                        metadata_list.extend(metadata)
-
-        return metadata_list
-
-    def get_library_metadata_details(self, section_id=''):
-        """
-        Return processed and validated metadata list for requested library.
-
-        Parameters required:    section_id { Plex library key }
-
-        Output: array
-        """
-        libraries_data = self.get_libraries_list(output_format='xml')
-
-        try:
-            xml_head = libraries_data.getElementsByTagName('MediaContainer')
-        except Exception as e:
-            logger.warn("Tautulli Pmsconnect :: Unable to parse XML for get_library_metadata_details: %s." % e)
+            xml_head = metadata.getElementsByTagName('MediaContainer')
+        except:
+            logger.warn("Unable to parse XML for get_metadata.")
             return []
 
         metadata_list = []
 
         for a in xml_head:
             if a.getAttribute('size'):
-                if a.getAttribute('size') == '0':
+                if a.getAttribute('size') != '1':
                     metadata_list = {'metadata': None}
                     return metadata_list
 
             if a.getElementsByTagName('Directory'):
-                result_data = a.getElementsByTagName('Directory')
-                for result in result_data:
-                    key = helpers.get_xml_attr(result, 'key')
-                    if key == section_id:
-                        metadata = {'media_type': 'library',
-                                    'section_id': helpers.get_xml_attr(result, 'key'),
-                                    'library': helpers.get_xml_attr(result, 'type'),
-                                    'title': helpers.get_xml_attr(result, 'title'),
-                                    'art': helpers.get_xml_attr(result, 'art'),
-                                    'thumb': helpers.get_xml_attr(result, 'thumb')
-                                    }
-                        if metadata['library'] == 'movie':
-                            metadata['section_type'] = 'movie'
-                        elif metadata['library'] == 'show':
-                            metadata['section_type'] = 'episode'
-                        elif metadata['library'] == 'artist':
-                            metadata['section_type'] = 'track'
+                metadata_main = a.getElementsByTagName('Directory')[0]
+                metadata_type = helpers.get_xml_attr(metadata_main, 'type')
+            elif a.getElementsByTagName('Video'):
+                metadata_main = a.getElementsByTagName('Video')[0]
+                metadata_type = helpers.get_xml_attr(metadata_main, 'type')
+            elif a.getElementsByTagName('Track'):
+                metadata_main = a.getElementsByTagName('Track')[0]
+                metadata_type = helpers.get_xml_attr(metadata_main, 'type')
+            else:
+                logger.debug(u"Metadata failed")
 
+        genres = []
+        actors = []
+        writers = []
+        directors = []
+
+        if metadata_main.getElementsByTagName('Genre'):
+            for genre in metadata_main.getElementsByTagName('Genre'):
+                genres.append(helpers.get_xml_attr(genre, 'tag'))
+
+        if metadata_main.getElementsByTagName('Role'):
+            for actor in metadata_main.getElementsByTagName('Role'):
+                actors.append(helpers.get_xml_attr(actor, 'tag'))
+
+        if metadata_main.getElementsByTagName('Writer'):
+            for writer in metadata_main.getElementsByTagName('Writer'):
+                writers.append(helpers.get_xml_attr(writer, 'tag'))
+
+        if metadata_main.getElementsByTagName('Director'):
+            for director in metadata_main.getElementsByTagName('Director'):
+                directors.append(helpers.get_xml_attr(director, 'tag'))
+
+        if metadata_type == 'show':
+            metadata = {'type': metadata_type,
+                        'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
+                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'parent_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
+                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
+                        'index': helpers.get_xml_attr(metadata_main, 'index'),
+                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
+                        'title': helpers.get_xml_attr(metadata_main, 'title'),
+                        'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
+                        'summary': helpers.get_xml_attr(metadata_main, 'summary'),
+                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
+                        'rating': helpers.get_xml_attr(metadata_main, 'rating'),
+                        'duration': helpers.get_xml_attr(metadata_main, 'duration'),
+                        'year': helpers.get_xml_attr(metadata_main, 'year'),
+                        'thumb': helpers.get_xml_attr(metadata_main, 'thumb'),
+                        'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'),
+                        'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'),
+                        'art': helpers.get_xml_attr(metadata_main, 'art'),
+                        'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'),
+                        'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'),
+                        'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'),
+                        'last_viewed_at': helpers.get_xml_attr(metadata_main, 'lastViewedAt'),
+                        'guid': helpers.get_xml_attr(metadata_main, 'guid'),
+                        'writers': writers,
+                        'directors': directors,
+                        'genres': genres,
+                        'actors': actors
+                        }
             metadata_list = {'metadata': metadata}
+        elif metadata_type == 'season':
+            parent_rating_key = helpers.get_xml_attr(metadata_main, 'parentRatingKey')
+            show_details = self.get_metadata_details(parent_rating_key)
+            metadata = {'type': metadata_type,
+                        'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
+                        'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
+                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'parent_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
+                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
+                        'index': helpers.get_xml_attr(metadata_main, 'index'),
+                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
+                        'title': helpers.get_xml_attr(metadata_main, 'title'),
+                        'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
+                        'summary': show_details['metadata']['summary'],
+                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
+                        'rating': helpers.get_xml_attr(metadata_main, 'rating'),
+                        'duration': show_details['metadata']['duration'],
+                        'year': helpers.get_xml_attr(metadata_main, 'year'),
+                        'thumb': helpers.get_xml_attr(metadata_main, 'thumb'),
+                        'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'),
+                        'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'),
+                        'art': helpers.get_xml_attr(metadata_main, 'art'),
+                        'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'),
+                        'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'),
+                        'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'),
+                        'last_viewed_at': helpers.get_xml_attr(metadata_main, 'lastViewedAt'),
+                        'guid': helpers.get_xml_attr(metadata_main, 'guid'),
+                        'genres': genres,
+                        'actors': actors,
+                        'writers': writers,
+                        'directors': directors
+                        }
+            metadata_list = {'metadata': metadata}
+        elif metadata_type == 'episode':
+            metadata = {'type': metadata_type,
+                        'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
+                        'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
+                        'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'),
+                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'parent_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
+                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
+                        'index': helpers.get_xml_attr(metadata_main, 'index'),
+                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
+                        'title': helpers.get_xml_attr(metadata_main, 'title'),
+                        'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
+                        'summary': helpers.get_xml_attr(metadata_main, 'summary'),
+                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
+                        'rating': helpers.get_xml_attr(metadata_main, 'rating'),
+                        'duration': helpers.get_xml_attr(metadata_main, 'duration'),
+                        'year': helpers.get_xml_attr(metadata_main, 'year'),
+                        'thumb': helpers.get_xml_attr(metadata_main, 'thumb'),
+                        'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'),
+                        'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'),
+                        'art': helpers.get_xml_attr(metadata_main, 'art'),
+                        'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'),
+                        'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'),
+                        'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'),
+                        'last_viewed_at': helpers.get_xml_attr(metadata_main, 'lastViewedAt'),
+                        'guid': helpers.get_xml_attr(metadata_main, 'guid'),
+                        'writers': writers,
+                        'directors': directors,
+                        'genres': genres,
+                        'actors': actors
+                        }
+            metadata_list = {'metadata': metadata}
+        elif metadata_type == 'movie':
+            metadata = {'type': metadata_type,
+                        'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
+                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'parent_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
+                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
+                        'index': helpers.get_xml_attr(metadata_main, 'index'),
+                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
+                        'title': helpers.get_xml_attr(metadata_main, 'title'),
+                        'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
+                        'summary': helpers.get_xml_attr(metadata_main, 'summary'),
+                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
+                        'rating': helpers.get_xml_attr(metadata_main, 'rating'),
+                        'duration': helpers.get_xml_attr(metadata_main, 'duration'),
+                        'year': helpers.get_xml_attr(metadata_main, 'year'),
+                        'thumb': helpers.get_xml_attr(metadata_main, 'thumb'),
+                        'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'),
+                        'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'),
+                        'art': helpers.get_xml_attr(metadata_main, 'art'),
+                        'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'),
+                        'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'),
+                        'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'),
+                        'last_viewed_at': helpers.get_xml_attr(metadata_main, 'lastViewedAt'),
+                        'guid': helpers.get_xml_attr(metadata_main, 'guid'),
+                        'genres': genres,
+                        'actors': actors,
+                        'writers': writers,
+                        'directors': directors
+                        }
+            metadata_list = {'metadata': metadata}
+        elif metadata_type == 'artist':
+            metadata = {'type': metadata_type,
+                        'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
+                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'parent_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
+                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
+                        'index': helpers.get_xml_attr(metadata_main, 'index'),
+                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
+                        'title': helpers.get_xml_attr(metadata_main, 'title'),
+                        'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
+                        'summary': helpers.get_xml_attr(metadata_main, 'summary'),
+                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
+                        'rating': helpers.get_xml_attr(metadata_main, 'rating'),
+                        'duration': helpers.get_xml_attr(metadata_main, 'duration'),
+                        'year': helpers.get_xml_attr(metadata_main, 'year'),
+                        'thumb': helpers.get_xml_attr(metadata_main, 'thumb'),
+                        'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'),
+                        'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'),
+                        'art': helpers.get_xml_attr(metadata_main, 'art'),
+                        'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'),
+                        'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'),
+                        'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'),
+                        'last_viewed_at': helpers.get_xml_attr(metadata_main, 'lastViewedAt'),
+                        'guid': helpers.get_xml_attr(metadata_main, 'guid'),
+                        'writers': writers,
+                        'directors': directors,
+                        'genres': genres,
+                        'actors': actors
+                        }
+            metadata_list = {'metadata': metadata}
+        elif metadata_type == 'album':
+            parent_rating_key = helpers.get_xml_attr(metadata_main, 'parentRatingKey')
+            artist_details = self.get_metadata_details(parent_rating_key)
+            metadata = {'type': metadata_type,
+                        'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
+                        'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
+                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'parent_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
+                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
+                        'index': helpers.get_xml_attr(metadata_main, 'index'),
+                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
+                        'title': helpers.get_xml_attr(metadata_main, 'title'),
+                        'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
+                        'summary': artist_details['metadata']['summary'],
+                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
+                        'rating': helpers.get_xml_attr(metadata_main, 'rating'),
+                        'duration': helpers.get_xml_attr(metadata_main, 'duration'),
+                        'year': helpers.get_xml_attr(metadata_main, 'year'),
+                        'thumb': helpers.get_xml_attr(metadata_main, 'thumb'),
+                        'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'),
+                        'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'),
+                        'art': helpers.get_xml_attr(metadata_main, 'art'),
+                        'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'),
+                        'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'),
+                        'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'),
+                        'last_viewed_at': helpers.get_xml_attr(metadata_main, 'lastViewedAt'),
+                        'guid': helpers.get_xml_attr(metadata_main, 'guid'),
+                        'genres': genres,
+                        'actors': actors,
+                        'writers': writers,
+                        'directors': directors
+                        }
+            metadata_list = {'metadata': metadata}
+        elif metadata_type == 'track':
+            parent_rating_key = helpers.get_xml_attr(metadata_main, 'parentRatingKey')
+            album_details = self.get_metadata_details(parent_rating_key)
+            metadata = {'type': metadata_type,
+                        'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
+                        'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
+                        'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'),
+                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'parent_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
+                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
+                        'index': helpers.get_xml_attr(metadata_main, 'index'),
+                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
+                        'title': helpers.get_xml_attr(metadata_main, 'title'),
+                        'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
+                        'summary': helpers.get_xml_attr(metadata_main, 'summary'),
+                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
+                        'rating': helpers.get_xml_attr(metadata_main, 'rating'),
+                        'duration': helpers.get_xml_attr(metadata_main, 'duration'),
+                        'year': album_details['metadata']['year'],
+                        'thumb': helpers.get_xml_attr(metadata_main, 'thumb'),
+                        'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'),
+                        'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'),
+                        'art': helpers.get_xml_attr(metadata_main, 'art'),
+                        'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'),
+                        'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'),
+                        'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'),
+                        'last_viewed_at': helpers.get_xml_attr(metadata_main, 'lastViewedAt'),
+                        'guid': helpers.get_xml_attr(metadata_main, 'guid'),
+                        'genres': genres,
+                        'actors': actors,
+                        'writers': writers,
+                        'directors': directors
+                        }
+            metadata_list = {'metadata': metadata}
+        else:
+            return None
 
         return metadata_list
 
-    def get_current_activity(self, skip_cache=False):
-        """
-        Return processed and validated session list.
+    """
+    Return processed and validated session list.
 
-        Output: array
-        """
+    Output: array
+    """
+    def get_current_activity(self):
         session_data = self.get_sessions(output_format='xml')
 
         try:
             xml_head = session_data.getElementsByTagName('MediaContainer')
-        except Exception as e:
-            logger.warn("Tautulli Pmsconnect :: Unable to parse XML for get_current_activity: %s." % e)
+        except:
+            logger.warn("Unable to parse XML for get_sessions.")
             return []
 
         session_list = []
@@ -1846,849 +621,529 @@ class PmsConnect(object):
 
             if a.getElementsByTagName('Track'):
                 session_data = a.getElementsByTagName('Track')
-                for session_ in session_data:
-                    # Filter out background theme music sessions
-                    if helpers.get_xml_attr(session_, 'guid').startswith('library://'):
-                        continue
-                    session_output = self.get_session_each(session_, skip_cache=skip_cache)
+                session_type = 'track'
+                for session in session_data:
+                    session_output = self.get_session_each(session_type, session)
                     session_list.append(session_output)
             if a.getElementsByTagName('Video'):
                 session_data = a.getElementsByTagName('Video')
-                for session_ in session_data:
-                    session_output = self.get_session_each(session_, skip_cache=skip_cache)
+                session_type = 'video'
+                for session in session_data:
+                    session_output = self.get_session_each(session_type, session)
                     session_list.append(session_output)
             if a.getElementsByTagName('Photo'):
                 session_data = a.getElementsByTagName('Photo')
-                for session_ in session_data:
-                    session_output = self.get_session_each(session_, skip_cache=skip_cache)
+                session_type = 'photo'
+                for session in session_data:
+                    session_output = self.get_session_each(session_type, session)
                     session_list.append(session_output)
 
-        session_list = sorted(session_list, key=lambda k: k['session_key'])
-
         output = {'stream_count': helpers.get_xml_attr(xml_head[0], 'size'),
-                  'sessions': session.mask_session_info(session_list)
+                  'sessions': session_list
                   }
 
         return output
 
-    def get_session_each(self, session=None, skip_cache=False):
-        """
-        Return selected data from current sessions.
-        This function processes and validates session data
+    """
+    Return selected data from current sessions.
+    This function processes and validates session data
 
-        Parameters required:    session { the session dictionary }
-        Output: dict
-        """
+    Parameters required:    stream_type { track or video }
+                            session { the session dictionary }
+    Output: dict
+    """
+    def get_session_each(self, stream_type='', session=None):
+        session_output = None
+        user_data = users.Users()
 
-        # Get the source media type
-        media_type = helpers.get_xml_attr(session, 'type')
-        rating_key = helpers.get_xml_attr(session, 'ratingKey')
-        session_key = helpers.get_xml_attr(session, 'sessionKey')
+        if stream_type == 'track':
+            media_info = session.getElementsByTagName('Media')[0]
+            audio_decision = 'direct play'
+            audio_channels = helpers.get_xml_attr(media_info, 'audioChannels')
+            audio_codec = helpers.get_xml_attr(media_info, 'audioCodec')
+            container = helpers.get_xml_attr(media_info, 'container')
+            bitrate = helpers.get_xml_attr(media_info, 'bitrate')
+            duration = helpers.get_xml_attr(media_info, 'duration')
+            progress = helpers.get_xml_attr(session, 'viewOffset')
 
-        # Get the user details
-        user_info = session.getElementsByTagName('User')[0]
-        user_id = helpers.get_xml_attr(user_info, 'id')
-        if user_id == '1':  # Admin user
-            user_details = users.Users().get_details(user=helpers.get_xml_attr(user_info, 'title'))
-        else:
-            user_details = users.Users().get_details(user_id=user_id)
-
-        # Get the player details
-        player_info = session.getElementsByTagName('Player')[0]
-
-        # Override platform names
-        platform = helpers.get_xml_attr(player_info, 'platform')
-        platform = common.PLATFORM_NAME_OVERRIDES.get(platform, platform)
-        if not platform and helpers.get_xml_attr(player_info, 'product') == 'DLNA':
-            platform = 'DLNA'
-
-        platform_name = next((v for k, v in common.PLATFORM_NAMES.items() if k in platform.lower()), 'default')
-
-        player_details = {'ip_address': helpers.get_xml_attr(player_info, 'address').split('::ffff:')[-1],
-                          'ip_address_public': helpers.get_xml_attr(player_info, 'remotePublicAddress').split('::ffff:')[-1],
-                          'device': helpers.get_xml_attr(player_info, 'device'),
-                          'platform': platform,
-                          'platform_name': platform_name,
-                          'platform_version': helpers.get_xml_attr(player_info, 'platformVersion'),
-                          'product': helpers.get_xml_attr(player_info, 'product'),
-                          'product_version': helpers.get_xml_attr(player_info, 'version'),
-                          'profile': helpers.get_xml_attr(player_info, 'profile'),
-                          'player': helpers.get_xml_attr(player_info, 'title') or helpers.get_xml_attr(player_info, 'product'),
-                          'machine_id': helpers.get_xml_attr(player_info, 'machineIdentifier'),
-                          'state': helpers.get_xml_attr(player_info, 'state'),
-                          'local': int(helpers.get_xml_attr(player_info, 'local') == '1'),
-                          'relayed': helpers.get_xml_attr(player_info, 'relayed', default_return=None),
-                          'secure': helpers.get_xml_attr(player_info, 'secure', default_return=None)
-                          }
-
-        # Get the session details
-        if session.getElementsByTagName('Session'):
-            session_info = session.getElementsByTagName('Session')[0]
-
-            session_details = {'session_id': helpers.get_xml_attr(session_info, 'id'),
-                               'bandwidth': helpers.get_xml_attr(session_info, 'bandwidth'),
-                               'location': helpers.get_xml_attr(session_info, 'location')
-                               }
-        else:
-            session_details = {'session_id': '',
-                               'bandwidth': '',
-                               'location': 'lan' if player_details['local'] else 'wan'
-                               }
-
-        # Check if using Plex Relay
-        if player_details['relayed'] is None:
-            player_details['relayed'] = int(session_details['location'] != 'lan' and
-                                            player_details['ip_address_public'] == '127.0.0.1')
-
-        else:
-            player_details['relayed'] = helpers.cast_to_int(player_details['relayed'])
-
-        # Check if secure connection
-        if player_details['secure'] is not None:
-            player_details['secure'] = int(player_details['secure'] == '1')
-
-        # Get the transcode details
-        if session.getElementsByTagName('TranscodeSession'):
-            transcode_session = True
-
-            transcode_info = session.getElementsByTagName('TranscodeSession')[0]
-
-            transcode_progress = helpers.get_xml_attr(transcode_info, 'progress')
-            transcode_speed = helpers.get_xml_attr(transcode_info, 'speed')
-            transcode_min_offset = helpers.get_xml_attr(transcode_info, 'minOffsetAvailable')
-            transcode_max_offset = helpers.get_xml_attr(transcode_info, 'maxOffsetAvailable')
-
-            transcode_details = {'transcode_key': helpers.get_xml_attr(transcode_info, 'key'),
-                                 'transcode_throttled': int(helpers.get_xml_attr(transcode_info, 'throttled') == '1'),
-                                 'transcode_progress': int(round(helpers.cast_to_float(transcode_progress), 0)),
-                                 'transcode_speed': str(round(helpers.cast_to_float(transcode_speed), 1)),
-                                 'transcode_audio_channels': helpers.get_xml_attr(transcode_info, 'audioChannels'),
-                                 'transcode_audio_codec': helpers.get_xml_attr(transcode_info, 'audioCodec'),
-                                 'transcode_video_codec': helpers.get_xml_attr(transcode_info, 'videoCodec'),
-                                 'transcode_width': helpers.get_xml_attr(transcode_info, 'width'),  # Blank but keep for backwards compatibility
-                                 'transcode_height': helpers.get_xml_attr(transcode_info, 'height'),  # Blank but keep backwards compatibility
-                                 'transcode_container': helpers.get_xml_attr(transcode_info, 'container'),
-                                 'transcode_protocol': helpers.get_xml_attr(transcode_info, 'protocol'),
-                                 'transcode_min_offset_available': int(round(helpers.cast_to_float(transcode_min_offset), 0)),
-                                 'transcode_max_offset_available': int(round(helpers.cast_to_float(transcode_max_offset), 0)),
-                                 'transcode_hw_requested': int(helpers.get_xml_attr(transcode_info, 'transcodeHwRequested') == '1'),
-                                 'transcode_hw_decode': helpers.get_xml_attr(transcode_info, 'transcodeHwDecoding'),
-                                 'transcode_hw_decode_title': helpers.get_xml_attr(transcode_info, 'transcodeHwDecodingTitle'),
-                                 'transcode_hw_encode': helpers.get_xml_attr(transcode_info, 'transcodeHwEncoding'),
-                                 'transcode_hw_encode_title': helpers.get_xml_attr(transcode_info, 'transcodeHwEncodingTitle'),
-                                 'transcode_hw_full_pipeline': int(helpers.get_xml_attr(transcode_info, 'transcodeHwFullPipeline') == '1'),
-                                 'audio_decision': helpers.get_xml_attr(transcode_info, 'audioDecision'),
-                                 'video_decision': helpers.get_xml_attr(transcode_info, 'videoDecision'),
-                                 'subtitle_decision': helpers.get_xml_attr(transcode_info, 'subtitleDecision'),
-                                 'throttled': '1' if helpers.get_xml_attr(transcode_info, 'throttled') == '1' else '0'  # Keep for backwards compatibility
-                                 }
-        else:
-            transcode_session = False
-
-            transcode_details = {'transcode_key': '',
-                                 'transcode_throttled': 0,
-                                 'transcode_progress': 0,
-                                 'transcode_speed': '',
-                                 'transcode_audio_channels': '',
-                                 'transcode_audio_codec': '',
-                                 'transcode_video_codec': '',
-                                 'transcode_width': '',
-                                 'transcode_height': '',
-                                 'transcode_container': '',
-                                 'transcode_protocol': '',
-                                 'transcode_min_offset_available': 0,
-                                 'transcode_max_offset_available': 0,
-                                 'transcode_hw_requested': 0,
-                                 'transcode_hw_decode': '',
-                                 'transcode_hw_decode_title': '',
-                                 'transcode_hw_encode': '',
-                                 'transcode_hw_encode_title': '',
-                                 'transcode_hw_full_pipeline': 0,
-                                 'audio_decision': 'direct play',
-                                 'video_decision': 'direct play',
-                                 'subtitle_decision': '',
-                                 'throttled': '0'  # Keep for backwards compatibility
-                                 }
-
-        # Check HW decoding/encoding
-        transcode_details['transcode_hw_decoding'] = int(transcode_details['transcode_hw_decode'].lower() in common.HW_DECODERS)
-        transcode_details['transcode_hw_encoding'] = int(transcode_details['transcode_hw_encode'].lower() in common.HW_ENCODERS)
-
-        media_info_all = session.getElementsByTagName('Media')
-        stream_media_info = next((m for m in media_info_all if helpers.get_xml_attr(m, 'selected') == '1'), media_info_all[0])
-        part_info_all = stream_media_info.getElementsByTagName('Part')
-        stream_media_parts_info = next((p for p in part_info_all if helpers.get_xml_attr(p, 'selected') == '1'), part_info_all[0])
-
-        # Get the stream details
-        video_stream_info = audio_stream_info = subtitle_stream_info = None
-        for stream in stream_media_parts_info.getElementsByTagName('Stream'):
-            if helpers.get_xml_attr(stream, 'streamType') == '1':
-                if video_stream_info is None or helpers.get_xml_attr(stream, 'selected') == '1':
-                    video_stream_info = stream
-
-            elif helpers.get_xml_attr(stream, 'streamType') == '2':
-                if audio_stream_info is None or helpers.get_xml_attr(stream, 'selected') == '1':
-                    audio_stream_info = stream
-
-            elif helpers.get_xml_attr(stream, 'streamType') == '3':
-                if subtitle_stream_info is None or helpers.get_xml_attr(stream, 'selected') == '1':
-                    subtitle_stream_info = stream
-
-        video_id = audio_id = subtitle_id = None
-        if video_stream_info:
-            video_id = helpers.get_xml_attr(video_stream_info, 'id')
-            video_details = {'stream_video_bitrate': helpers.get_xml_attr(video_stream_info, 'bitrate'),
-                             'stream_video_bit_depth': helpers.get_xml_attr(video_stream_info, 'bitDepth'),
-                             'stream_video_chroma_subsampling': helpers.get_xml_attr(video_stream_info, 'chromaSubsampling'),
-                             'stream_video_codec': helpers.get_xml_attr(video_stream_info, 'codec'),
-                             'stream_video_codec_level': helpers.get_xml_attr(video_stream_info, 'level'),
-                             'stream_video_color_primaries': helpers.get_xml_attr(video_stream_info, 'colorPrimaries'),
-                             'stream_video_color_range': helpers.get_xml_attr(video_stream_info, 'colorRange'),
-                             'stream_video_color_space': helpers.get_xml_attr(video_stream_info, 'colorSpace'),
-                             'stream_video_color_trc': helpers.get_xml_attr(video_stream_info, 'colorTrc'),
-                             'stream_video_dynamic_range': self.get_dynamic_range(video_stream_info),
-                             'stream_video_dovi_bl_present': int(helpers.get_xml_attr(video_stream_info, 'DOVIBLPresent') == '1'),
-                             'stream_video_dovi_el_present': int(helpers.get_xml_attr(video_stream_info, 'DOVIELPresent') == '1'),
-                             'stream_video_dovi_level': helpers.cast_to_int(helpers.get_xml_attr(video_stream_info, 'DOVILevel')),
-                             'stream_video_dovi_present': int(helpers.get_xml_attr(video_stream_info, 'DOVIPresent') == '1'),
-                             'stream_video_dovi_profile': helpers.cast_to_int(helpers.get_xml_attr(video_stream_info, 'DOVIProfile')),
-                             'stream_video_dovi_rpu_present': int(helpers.get_xml_attr(video_stream_info, 'DOVIRPUPresent') == '1'),
-                             'stream_video_dovi_version': helpers.cast_to_float(helpers.get_xml_attr(video_stream_info, 'DOVIVersion')),
-                             'stream_video_height': helpers.get_xml_attr(video_stream_info, 'height'),
-                             'stream_video_width': helpers.get_xml_attr(video_stream_info, 'width'),
-                             'stream_video_ref_frames': helpers.get_xml_attr(video_stream_info, 'refFrames'),
-                             'stream_video_language': helpers.get_xml_attr(video_stream_info, 'language'),
-                             'stream_video_language_code': helpers.get_xml_attr(video_stream_info, 'languageCode'),
-                             'stream_video_scan_type': helpers.get_xml_attr(video_stream_info, 'scanType'),
-                             'stream_video_decision': helpers.get_xml_attr(video_stream_info, 'decision') or 'direct play'
-                             }
-        else:
-            video_details = {'stream_video_bitrate': '',
-                             'stream_video_bit_depth': '',
-                             'stream_video_chroma_subsampling': '',
-                             'stream_video_codec': '',
-                             'stream_video_codec_level': '',
-                             'stream_video_color_primaries': '',
-                             'stream_video_color_range': '',
-                             'stream_video_color_space': '',
-                             'stream_video_color_trc': '',
-                             'stream_video_dynamic_range': '',
-                             'stream_video_height': '',
-                             'stream_video_width': '',
-                             'stream_video_ref_frames': '',
-                             'stream_video_language': '',
-                             'stream_video_language_code': '',
-                             'stream_video_scan_type': '',
-                             'stream_video_decision': ''
-                             }
-
-        if audio_stream_info:
-            audio_id = helpers.get_xml_attr(audio_stream_info, 'id')
-            stream_audio_channels = helpers.get_xml_attr(audio_stream_info, 'channels')
-            stream_audio_channel_layouts_ = helpers.get_xml_attr(audio_stream_info, 'audioChannelLayout')
-            audio_details = {'stream_audio_bitrate': helpers.get_xml_attr(audio_stream_info, 'bitrate'),
-                             'stream_audio_bitrate_mode': helpers.get_xml_attr(audio_stream_info, 'bitrateMode'),
-                             'stream_audio_channels': stream_audio_channels,
-                             'stream_audio_channel_layout': stream_audio_channel_layouts_ or common.AUDIO_CHANNELS.get(
-                                 stream_audio_channels, stream_audio_channels),
-                             'stream_audio_codec': helpers.get_xml_attr(audio_stream_info, 'codec'),
-                             'stream_audio_sample_rate': helpers.get_xml_attr(audio_stream_info, 'samplingRate'),
-                             'stream_audio_channel_layout_': stream_audio_channel_layouts_,
-                             'stream_audio_language': helpers.get_xml_attr(audio_stream_info, 'language'),
-                             'stream_audio_language_code': helpers.get_xml_attr(audio_stream_info, 'languageCode'),
-                             'stream_audio_profile': helpers.get_xml_attr(audio_stream_info, 'profile'),
-                             'stream_audio_decision': helpers.get_xml_attr(audio_stream_info, 'decision') or 'direct play'
-                             }
-        else:
-            audio_details = {'stream_audio_bitrate': '',
-                             'stream_audio_bitrate_mode': '',
-                             'stream_audio_channels': '',
-                             'stream_audio_channel_layout': '',
-                             'stream_audio_codec': '',
-                             'stream_audio_sample_rate': '',
-                             'stream_audio_channel_layout_': '',
-                             'stream_audio_language': '',
-                             'stream_audio_language_code': '',
-                             'stream_audio_profile': '',
-                             'stream_audio_decision': ''
-                             }
-
-        if subtitle_stream_info:
-            subtitle_id = helpers.get_xml_attr(subtitle_stream_info, 'id')
-            subtitle_selected = helpers.get_xml_attr(subtitle_stream_info, 'selected')
-            subtitle_details = {'stream_subtitle_codec': helpers.get_xml_attr(subtitle_stream_info, 'codec'),
-                                'stream_subtitle_container': helpers.get_xml_attr(subtitle_stream_info, 'container'),
-                                'stream_subtitle_format': helpers.get_xml_attr(subtitle_stream_info, 'format'),
-                                'stream_subtitle_forced': int(helpers.get_xml_attr(subtitle_stream_info, 'forced') == '1'),
-                                'stream_subtitle_location': helpers.get_xml_attr(subtitle_stream_info, 'location'),
-                                'stream_subtitle_language': helpers.get_xml_attr(subtitle_stream_info, 'language'),
-                                'stream_subtitle_language_code': helpers.get_xml_attr(subtitle_stream_info, 'languageCode'),
-                                'stream_subtitle_decision': helpers.get_xml_attr(subtitle_stream_info, 'decision') or transcode_details['subtitle_decision'],
-                                'stream_subtitle_transient': int(helpers.get_xml_attr(subtitle_stream_info, 'transient') == '1')
-                                }
-        else:
-            subtitle_selected = None
-            subtitle_details = {'stream_subtitle_codec': '',
-                                'stream_subtitle_container': '',
-                                'stream_subtitle_format': '',
-                                'stream_subtitle_forced': 0,
-                                'stream_subtitle_location': '',
-                                'stream_subtitle_language': '',
-                                'stream_subtitle_language_code': '',
-                                'stream_subtitle_decision': '',
-                                'stream_subtitle_transient': 0
-                                }
-
-        # Get the bif thumbnail
-        indexes = helpers.get_xml_attr(stream_media_parts_info, 'indexes')
-        view_offset = helpers.get_xml_attr(session, 'viewOffset')
-        if indexes == 'sd':
-            part_id = helpers.get_xml_attr(stream_media_parts_info, 'id')
-            bif_thumb = '/library/parts/{part_id}/indexes/sd/{view_offset}'.format(part_id=part_id, view_offset=view_offset)
-        else:
-            bif_thumb = ''
-
-        if helpers.cast_to_int(video_details['stream_video_width']) >= 3840:
-            stream_video_resolution = '4k'
-        else:
-            stream_video_resolution = helpers.get_xml_attr(stream_media_info, 'videoResolution').lower().rstrip('ip')
-
-        stream_details = {'stream_container': helpers.get_xml_attr(stream_media_info, 'container'),
-                          'stream_bitrate': helpers.get_xml_attr(stream_media_info, 'bitrate'),
-                          'stream_aspect_ratio': helpers.get_xml_attr(stream_media_info, 'aspectRatio'),
-                          'stream_video_framerate': helpers.get_xml_attr(stream_media_info, 'videoFrameRate'),
-                          'stream_video_resolution': stream_video_resolution,
-                          'stream_duration': helpers.get_xml_attr(stream_media_info, 'duration') or helpers.get_xml_attr(session, 'duration'),
-                          'stream_container_decision': helpers.get_xml_attr(stream_media_parts_info, 'decision').replace('directplay', 'direct play'),
-                          'optimized_version': int(helpers.get_xml_attr(stream_media_info, 'proxyType') == '42'),
-                          'optimized_version_title': helpers.get_xml_attr(stream_media_info, 'title'),
-                          'synced_version': 0,
-                          'live': int(helpers.get_xml_attr(session, 'live') == '1'),
-                          'live_uuid': helpers.get_xml_attr(stream_media_info, 'uuid'),
-                          'indexes': int(indexes == 'sd'),
-                          'bif_thumb': bif_thumb,
-                          'subtitles': 1 if subtitle_id and subtitle_selected else 0
-                          }
-
-        # Get the source media info
-        source_media_details = source_media_part_details = \
-            source_video_details = source_audio_details = source_subtitle_details = {}
-
-        if not helpers.get_xml_attr(session, 'ratingKey').isdigit():
-            channel_stream = 1
-
-            audio_channels = helpers.get_xml_attr(stream_media_info, 'audioChannels')
-            metadata_details = {'media_type': media_type,
-                                'section_id': helpers.get_xml_attr(session, 'librarySectionID'),
-                                'library_name': helpers.get_xml_attr(session, 'librarySectionTitle'),
-                                'rating_key': helpers.get_xml_attr(session, 'ratingKey'),
-                                'parent_rating_key': helpers.get_xml_attr(session, 'parentRatingKey'),
-                                'grandparent_rating_key': helpers.get_xml_attr(session, 'grandparentRatingKey'),
-                                'title': helpers.get_xml_attr(session, 'title'),
-                                'parent_title': helpers.get_xml_attr(session, 'parentTitle'),
-                                'grandparent_title': helpers.get_xml_attr(session, 'grandparentTitle'),
-                                'original_title': helpers.get_xml_attr(session, 'originalTitle'),
-                                'sort_title': helpers.get_xml_attr(session, 'titleSort'),
-                                'media_index': helpers.get_xml_attr(session, 'index'),
-                                'parent_media_index': helpers.get_xml_attr(session, 'parentIndex'),
-                                'studio': helpers.get_xml_attr(session, 'studio'),
-                                'content_rating': helpers.get_xml_attr(session, 'contentRating'),
-                                'summary': helpers.get_xml_attr(session, 'summary'),
-                                'tagline': helpers.get_xml_attr(session, 'tagline'),
-                                'rating': helpers.get_xml_attr(session, 'rating'),
-                                'rating_image': helpers.get_xml_attr(session, 'ratingImage'),
-                                'audience_rating': helpers.get_xml_attr(session, 'audienceRating'),
-                                'audience_rating_image': helpers.get_xml_attr(session, 'audienceRatingImage'),
-                                'user_rating': helpers.get_xml_attr(session, 'userRating'),
-                                'duration': helpers.get_xml_attr(session, 'duration'),
-                                'year': helpers.get_xml_attr(session, 'year'),
-                                'thumb': helpers.get_xml_attr(session, 'thumb'),
-                                'parent_thumb': helpers.get_xml_attr(session, 'parentThumb'),
-                                'grandparent_thumb': helpers.get_xml_attr(session, 'grandparentThumb'),
-                                'art': helpers.get_xml_attr(session, 'art'),
-                                'banner': helpers.get_xml_attr(session, 'banner'),
-                                'originally_available_at': helpers.get_xml_attr(session, 'originallyAvailableAt'),
-                                'added_at': helpers.get_xml_attr(session, 'addedAt'),
-                                'updated_at': helpers.get_xml_attr(session, 'updatedAt'),
-                                'last_viewed_at': helpers.get_xml_attr(session, 'lastViewedAt'),
-                                'guid': helpers.get_xml_attr(session, 'guid'),
-                                'directors': [],
-                                'writers': [],
-                                'actors': [],
-                                'genres': [],
-                                'labels': [],
-                                'full_title': helpers.get_xml_attr(session, 'title'),
-                                'container': helpers.get_xml_attr(stream_media_info, 'container') \
-                                             or helpers.get_xml_attr(stream_media_parts_info, 'container'),
-                                'bitrate': helpers.get_xml_attr(stream_media_info, 'bitrate'),
-                                'height': helpers.get_xml_attr(stream_media_info, 'height'),
-                                'width': helpers.get_xml_attr(stream_media_info, 'width'),
-                                'aspect_ratio': helpers.get_xml_attr(stream_media_info, 'aspectRatio'),
-                                'video_codec': helpers.get_xml_attr(stream_media_info, 'videoCodec'),
-                                'video_resolution': helpers.get_xml_attr(stream_media_info, 'videoResolution').lower(),
-                                'video_full_resolution': helpers.get_xml_attr(stream_media_info, 'videoResolution').lower(),
-                                'video_framerate': helpers.get_xml_attr(stream_media_info, 'videoFrameRate'),
-                                'video_profile': helpers.get_xml_attr(stream_media_info, 'videoProfile'),
-                                'audio_codec': helpers.get_xml_attr(stream_media_info, 'audioCodec'),
-                                'audio_channels': audio_channels,
-                                'audio_channel_layout': common.AUDIO_CHANNELS.get(audio_channels, audio_channels),
-                                'audio_profile': helpers.get_xml_attr(stream_media_info, 'audioProfile'),
-                                'channel_icon': helpers.get_xml_attr(session, 'sourceIcon'),
-                                'channel_title': helpers.get_xml_attr(session, 'sourceTitle'),
-                                'extra_type': helpers.get_xml_attr(session, 'extraType'),
-                                'sub_type': helpers.get_xml_attr(session, 'subtype')
-                                }
-        else:
-            channel_stream = 0
-
-            media_id = helpers.get_xml_attr(stream_media_info, 'id')
-            part_id = helpers.get_xml_attr(stream_media_parts_info, 'id')
-
-            metadata_details = self.get_metadata_details(rating_key=rating_key,
-                                                         skip_cache=skip_cache, cache_key=session_key)
-
-            # Get the media info, fallback to first item if match id is not found
-            source_medias = metadata_details.pop('media_info', [])
-            source_media_details = next((m for m in source_medias if m['id'] == media_id), next((m for m in source_medias), {}))
-            source_media_parts = source_media_details.pop('parts', [])
-            source_media_part_details = next((p for p in source_media_parts if p['id'] == part_id), next((p for p in source_media_parts), {}))
-            source_media_part_streams = source_media_part_details.pop('streams', [])
-
-            source_video_details = {'id': '',
-                                    'type': '',
-                                    'video_codec': '',
-                                    'video_codec_level': '',
-                                    'video_bitrate': '',
-                                    'video_bit_depth': '',
-                                    'video_chroma_subsampling': '',
-                                    'video_color_primaries': '',
-                                    'video_color_range': '',
-                                    'video_color_space': '',
-                                    'video_color_trc': '',
-                                    'video_dynamic_range': '',
-                                    'video_frame_rate': '',
-                                    'video_ref_frames': '',
-                                    'video_height': '',
-                                    'video_width': '',
-                                    'video_language': '',
-                                    'video_language_code': '',
-                                    'video_scan_type': '',
-                                    'video_profile': ''
-                                    }
-            source_audio_details = {'id': '',
-                                    'type': '',
-                                    'audio_codec': '',
-                                    'audio_bitrate': '',
-                                    'audio_bitrate_mode': '',
-                                    'audio_channels': '',
-                                    'audio_channel_layout': '',
-                                    'audio_sample_rate': '',
-                                    'audio_language': '',
-                                    'audio_language_code': '',
-                                    'audio_profile': ''
-                                    }
-            source_subtitle_details = {'id': '',
-                                       'type': '',
-                                       'subtitle_codec': '',
-                                       'subtitle_container': '',
-                                       'subtitle_format': '',
-                                       'subtitle_forced': 0,
-                                       'subtitle_location': '',
-                                       'subtitle_language': '',
-                                       'subtitle_language_code': ''
-                                       }
-            if video_id:
-                source_video_details = next((p for p in source_media_part_streams if p['id'] == video_id),
-                                            next((p for p in source_media_part_streams if p['type'] == '1'), source_video_details))
-            if audio_id:
-                source_audio_details = next((p for p in source_media_part_streams if p['id'] == audio_id),
-                                            next((p for p in source_media_part_streams if p['type'] == '2'), source_audio_details))
-            if subtitle_id:
-                source_subtitle_details = next((p for p in source_media_part_streams if p['id'] == subtitle_id),
-                                               next((p for p in source_media_part_streams if p['type'] == '3'), source_subtitle_details))
-
-        # Override the thumb for clips
-        if media_type == 'clip' and metadata_details.get('extra_type') and metadata_details['art']:
-            metadata_details['thumb'] = metadata_details['art'].replace('/art', '/thumb')
-
-        # Overrides for live sessions
-        if stream_details['live'] and transcode_session:
-            stream_details['stream_container_decision'] = 'transcode'
-            stream_details['stream_container'] = transcode_details['transcode_container']
-
-            video_details['stream_video_decision'] = transcode_details['video_decision']
-            video_details['stream_video_codec'] = transcode_details['transcode_video_codec']
-
-            audio_details['stream_audio_decision'] = transcode_details['audio_decision']
-            audio_details['stream_audio_codec'] = transcode_details['transcode_audio_codec']
-            audio_details['stream_audio_channels'] = transcode_details['transcode_audio_channels']
-            audio_details['stream_audio_channel_layout'] = common.AUDIO_CHANNELS.get(
-                transcode_details['transcode_audio_channels'], transcode_details['transcode_audio_channels'])
-
-        # Generate a combined transcode decision value
-        if video_details['stream_video_decision'] == 'transcode' or audio_details['stream_audio_decision'] == 'transcode':
-            transcode_decision = 'transcode'
-        elif video_details['stream_video_decision'] == 'copy' or audio_details['stream_audio_decision'] == 'copy':
-            transcode_decision = 'copy'
-        else:
-            transcode_decision = 'direct play'
-
-        stream_details['transcode_decision'] = transcode_decision
-        stream_details['container_decision'] = stream_details['stream_container_decision']
-
-        # Override * in audio codecs
-        if audio_details['stream_audio_codec'] == '*':
-            audio_details['stream_audio_codec'] = source_audio_details.get('audio_codec', '')
-        if transcode_details['transcode_audio_codec'] == '*':
-            transcode_details['transcode_audio_codec'] = source_audio_details.get('audio_codec', '')
-
-        # Override * in video codecs
-        if video_details['stream_video_codec'] == '*':
-            video_details['stream_video_codec'] = source_video_details.get('video_codec', '')
-        if transcode_details['transcode_video_codec'] == '*':
-            transcode_details['transcode_video_codec'] = source_video_details.get('video_codec', '')
-
-        if media_type in ('movie', 'episode', 'clip'):
-            # Set the full resolution by combining stream_video_resolution and stream_video_scan_type
-            stream_details['stream_video_full_resolution'] = common.VIDEO_RESOLUTION_OVERRIDES.get(
-                stream_details['stream_video_resolution'],
-                stream_details['stream_video_resolution'] + (video_details['stream_video_scan_type'][:1] or 'p'))
-
-        # Get the quality profile
-        if media_type in ('movie', 'episode', 'clip') and 'stream_bitrate' in stream_details:
-            if video_details['stream_video_decision'] == 'transcode':
-                synced_version_profile = ''
-
-                stream_bitrate = helpers.cast_to_int(stream_details['stream_bitrate'])
-                source_bitrate = helpers.cast_to_int(source_media_details.get('bitrate'))
-                try:
-                    quailtiy_bitrate = min(
-                        b for b in common.VIDEO_QUALITY_PROFILES if stream_bitrate <= b <= source_bitrate)
-                    quality_profile = common.VIDEO_QUALITY_PROFILES[quailtiy_bitrate]
-                except ValueError:
-                    quality_profile = 'Original'
+            if session.getElementsByTagName('TranscodeSession'):
+                transcode_session = session.getElementsByTagName('TranscodeSession')[0]
+                throttled = helpers.get_xml_attr(transcode_session, 'throttled')
+                transcode_progress = helpers.get_xml_attr(transcode_session, 'progress')
+                transcode_speed = helpers.get_xml_attr(transcode_session, 'speed')
+                audio_decision = helpers.get_xml_attr(transcode_session, 'audioDecision')
+                transcode_audio_channels = helpers.get_xml_attr(transcode_session, 'audioChannels')
+                transcode_audio_codec = helpers.get_xml_attr(transcode_session, 'audioCodec')
+                transcode_container = helpers.get_xml_attr(transcode_session, 'container')
+                transcode_protocol = helpers.get_xml_attr(transcode_session, 'protocol')
+                duration = helpers.get_xml_attr(transcode_session, 'duration')
             else:
-                synced_version_profile = ''
-                quality_profile = 'Original'
+                throttled = '0'
+                transcode_progress = '0'
+                transcode_speed = ''
+                transcode_audio_channels = ''
+                transcode_audio_codec = ''
+                transcode_container = ''
+                transcode_protocol = ''
 
-            if stream_details['optimized_version']:
-                source_bitrate = helpers.cast_to_int(source_media_details.get('bitrate'))
-                optimized_version_profile = '{} Mbps {}'.format(round(source_bitrate / 1000.0, 1),
-                                                                source_media_details.get('video_full_resolution'))
+            user_details = user_data.get_user_details(
+                user=helpers.get_xml_attr(session.getElementsByTagName('User')[0], 'title'))
+
+            if helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'machineIdentifier').endswith('_Track'):
+                machine_id = helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'machineIdentifier')[:-6]
             else:
-                optimized_version_profile = ''
+                machine_id = helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'machineIdentifier')
 
-        elif media_type == 'track' and 'stream_bitrate' in stream_details:
-            synced_version_profile = ''
+            session_output = {'session_key': helpers.get_xml_attr(session, 'sessionKey'),
+                              'media_index': helpers.get_xml_attr(session, 'index'),
+                              'parent_media_index': helpers.get_xml_attr(session, 'parentIndex'),
+                              'art': helpers.get_xml_attr(session, 'art'),
+                              'parent_thumb': helpers.get_xml_attr(session, 'parentThumb'),
+                              'grandparent_thumb': helpers.get_xml_attr(session, 'grandparentThumb'),
+                              'thumb': helpers.get_xml_attr(session, 'thumb'),
+                              'bif_thumb': '',
+                              'user': user_details['username'],
+                              'user_id': user_details['user_id'],
+                              'friendly_name': user_details['friendly_name'],
+                              'user_thumb': user_details['thumb'],
+                              'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
+                              'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
+                              'machine_id': machine_id,
+                              'state': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'state'),
+                              'grandparent_title': helpers.get_xml_attr(session, 'grandparentTitle'),
+                              'parent_title': helpers.get_xml_attr(session, 'parentTitle'),
+                              'title': helpers.get_xml_attr(session, 'title'),
+                              'rating_key': helpers.get_xml_attr(session, 'ratingKey'),
+                              'parent_rating_key': helpers.get_xml_attr(session, 'parentRatingKey'),
+                              'grandparent_rating_key': helpers.get_xml_attr(session, 'grandparentRatingKey'),
+                              'throttled': throttled,
+                              'transcode_progress': transcode_progress,
+                              'transcode_speed': str(round(helpers.cast_to_float(transcode_speed), 1)),
+                              'audio_decision': audio_decision,
+                              'audio_channels': audio_channels,
+                              'audio_codec': audio_codec,
+                              'video_decision': '',
+                              'video_codec': '',
+                              'height': '',
+                              'width': '',
+                              'container': container,
+                              'bitrate': bitrate,
+                              'video_resolution': '',
+                              'video_framerate': '',
+                              'aspect_ratio': '',
+                              'transcode_audio_channels': transcode_audio_channels,
+                              'transcode_audio_codec': transcode_audio_codec,
+                              'transcode_video_codec': '',
+                              'transcode_width': '',
+                              'transcode_height': '',
+                              'transcode_container': transcode_container,
+                              'transcode_protocol': transcode_protocol,
+                              'duration': duration,
+                              'view_offset': progress,
+                              'progress_percent': str(helpers.get_percent(progress, duration)),
+                              'media_type': 'track',
+                              'indexes': 0
+                              }
 
-            stream_bitrate = helpers.cast_to_int(stream_details['stream_bitrate'])
-            source_bitrate = helpers.cast_to_int(source_media_details.get('bitrate'))
-            try:
-                quailtiy_bitrate = min(b for b in common.AUDIO_QUALITY_PROFILES if stream_bitrate <= b <= source_bitrate)
-                quality_profile = common.AUDIO_QUALITY_PROFILES[quailtiy_bitrate]
-            except ValueError:
-                quality_profile = 'Original'
+        elif stream_type == 'video':
+            media_info = session.getElementsByTagName('Media')[0]
+            audio_decision = 'direct play'
+            audio_channels = helpers.get_xml_attr(media_info, 'audioChannels')
+            audio_codec = helpers.get_xml_attr(media_info, 'audioCodec')
+            video_decision = 'direct play'
+            video_codec = helpers.get_xml_attr(media_info, 'videoCodec')
+            container = helpers.get_xml_attr(media_info, 'container')
+            bitrate = helpers.get_xml_attr(media_info, 'bitrate')
+            video_resolution = helpers.get_xml_attr(media_info, 'videoResolution')
+            video_framerate = helpers.get_xml_attr(media_info, 'videoFrameRate')
+            aspect_ratio = helpers.get_xml_attr(media_info, 'aspectRatio')
+            width = helpers.get_xml_attr(media_info, 'width')
+            height = helpers.get_xml_attr(media_info, 'height')
+            duration = helpers.get_xml_attr(media_info, 'duration')
+            progress = helpers.get_xml_attr(session, 'viewOffset')
 
-            optimized_version_profile = ''
+            if session.getElementsByTagName('TranscodeSession'):
+                transcode_session = session.getElementsByTagName('TranscodeSession')[0]
+                throttled = helpers.get_xml_attr(transcode_session, 'throttled')
+                transcode_progress = helpers.get_xml_attr(transcode_session, 'progress')
+                transcode_speed = helpers.get_xml_attr(transcode_session, 'speed')
+                audio_decision = helpers.get_xml_attr(transcode_session, 'audioDecision')
+                transcode_audio_channels = helpers.get_xml_attr(transcode_session, 'audioChannels')
+                transcode_audio_codec = helpers.get_xml_attr(transcode_session, 'audioCodec')
+                video_decision = helpers.get_xml_attr(transcode_session, 'videoDecision')
+                transcode_video_codec = helpers.get_xml_attr(transcode_session, 'videoCodec')
+                transcode_width = helpers.get_xml_attr(transcode_session, 'width')
+                transcode_height = helpers.get_xml_attr(transcode_session, 'height')
+                transcode_container = helpers.get_xml_attr(transcode_session, 'container')
+                transcode_protocol = helpers.get_xml_attr(transcode_session, 'protocol')
+            else:
+                throttled = '0'
+                transcode_progress = '0'
+                transcode_speed = ''
+                transcode_audio_channels = ''
+                transcode_audio_codec = ''
+                transcode_video_codec = ''
+                transcode_width = ''
+                transcode_height = ''
+                transcode_container = ''
+                transcode_protocol = ''
 
-        elif media_type == 'photo':
-            quality_profile = 'Original'
-            synced_version_profile = ''
-            optimized_version_profile = ''
+            media_info = session.getElementsByTagName('Media')[0]
+            if media_info.getElementsByTagName('Part'):
+                indexes = helpers.get_xml_attr(media_info.getElementsByTagName('Part')[0], 'indexes')
+                part_id = helpers.get_xml_attr(media_info.getElementsByTagName('Part')[0], 'id')
+                if indexes == 'sd':
+                    bif_thumb = '/library/parts/' + part_id + '/indexes/sd/' + progress
+                else:
+                    bif_thumb = ''
+            else:
+                indexes = ''
+                bif_thumb = ''
+
+            if plexpy.CONFIG.PMS_USE_BIF and indexes == 'sd':
+                use_indexes = 1
+            else:
+                use_indexes = 0
+
+            user_details = user_data.get_user_details(
+                user=helpers.get_xml_attr(session.getElementsByTagName('User')[0], 'title'))
+
+            if helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'machineIdentifier').endswith('_Video'):
+                machine_id = helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'machineIdentifier')[:-6]
+            else:
+                machine_id = helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'machineIdentifier')
+
+            if helpers.get_xml_attr(session, 'type') == 'episode':
+                session_output = {'session_key': helpers.get_xml_attr(session, 'sessionKey'),
+                                  'media_index': helpers.get_xml_attr(session, 'index'),
+                                  'parent_media_index': helpers.get_xml_attr(session, 'parentIndex'),
+                                  'art': helpers.get_xml_attr(session, 'art'),
+                                  'parent_thumb': helpers.get_xml_attr(session, 'parentThumb'),
+                                  'grandparent_thumb': helpers.get_xml_attr(session, 'grandparentThumb'),
+                                  'thumb': helpers.get_xml_attr(session, 'thumb'),
+                                  'bif_thumb': bif_thumb,
+                                  'user': user_details['username'],
+                                  'user_id': user_details['user_id'],
+                                  'friendly_name': user_details['friendly_name'],
+                                  'user_thumb': user_details['thumb'],
+                                  'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
+                                  'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
+                                  'machine_id': machine_id,
+                                  'state': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'state'),
+                                  'grandparent_title': helpers.get_xml_attr(session, 'grandparentTitle'),
+                                  'parent_title': helpers.get_xml_attr(session, 'parentTitle'),
+                                  'title': helpers.get_xml_attr(session, 'title'),
+                                  'year': helpers.get_xml_attr(session, 'year'),
+                                  'rating_key': helpers.get_xml_attr(session, 'ratingKey'),
+                                  'parent_rating_key': helpers.get_xml_attr(session, 'parentRatingKey'),
+                                  'grandparent_rating_key': helpers.get_xml_attr(session, 'grandparentRatingKey'),
+                                  'throttled': throttled,
+                                  'transcode_progress': transcode_progress,
+                                  'transcode_speed': str(round(helpers.cast_to_float(transcode_speed), 1)),
+                                  'audio_decision': audio_decision,
+                                  'audio_channels': audio_channels,
+                                  'audio_codec': audio_codec,
+                                  'video_decision': video_decision,
+                                  'video_codec': video_codec,
+                                  'height': height,
+                                  'width': width,
+                                  'container': container,
+                                  'bitrate': bitrate,
+                                  'video_resolution': video_resolution,
+                                  'video_framerate': video_framerate,
+                                  'aspect_ratio': aspect_ratio,
+                                  'transcode_audio_channels': transcode_audio_channels,
+                                  'transcode_audio_codec': transcode_audio_codec,
+                                  'transcode_video_codec': transcode_video_codec,
+                                  'transcode_width': transcode_width,
+                                  'transcode_height': transcode_height,
+                                  'transcode_container': transcode_container,
+                                  'transcode_protocol': transcode_protocol,
+                                  'duration': duration,
+                                  'view_offset': progress,
+                                  'progress_percent': str(helpers.get_percent(progress, duration)),
+                                  'indexes': use_indexes
+                                  }
+                if helpers.get_xml_attr(session, 'ratingKey').isdigit():
+                    session_output['media_type'] = helpers.get_xml_attr(session, 'type')
+                else:
+                    session_output['media_type'] = 'clip'
+
+            elif helpers.get_xml_attr(session, 'type') == 'movie':
+                session_output = {'session_key': helpers.get_xml_attr(session, 'sessionKey'),
+                                  'media_index': helpers.get_xml_attr(session, 'index'),
+                                  'parent_media_index': helpers.get_xml_attr(session, 'parentIndex'),
+                                  'art': helpers.get_xml_attr(session, 'art'),
+                                  'thumb': helpers.get_xml_attr(session, 'thumb'),
+                                  'bif_thumb': bif_thumb,
+                                  'parent_thumb': helpers.get_xml_attr(session, 'parentThumb'),
+                                  'grandparent_thumb': helpers.get_xml_attr(session, 'grandparentThumb'),
+                                  'user': user_details['username'],
+                                  'user_id': user_details['user_id'],
+                                  'friendly_name': user_details['friendly_name'],
+                                  'user_thumb': user_details['thumb'],
+                                  'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
+                                  'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
+                                  'machine_id': machine_id,
+                                  'state': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'state'),
+                                  'grandparent_title': helpers.get_xml_attr(session, 'grandparentTitle'),
+                                  'parent_title': helpers.get_xml_attr(session, 'parentTitle'),
+                                  'title': helpers.get_xml_attr(session, 'title'),
+                                  'year': helpers.get_xml_attr(session, 'year'),
+                                  'rating_key': helpers.get_xml_attr(session, 'ratingKey'),
+                                  'parent_rating_key': helpers.get_xml_attr(session, 'parentRatingKey'),
+                                  'grandparent_rating_key': helpers.get_xml_attr(session, 'grandparentRatingKey'),
+                                  'throttled': throttled,
+                                  'transcode_progress': transcode_progress,
+                                  'transcode_speed': str(round(helpers.cast_to_float(transcode_speed), 1)),
+                                  'audio_decision': audio_decision,
+                                  'audio_channels': audio_channels,
+                                  'audio_codec': audio_codec,
+                                  'video_decision': video_decision,
+                                  'video_codec': video_codec,
+                                  'height': height,
+                                  'width': width,
+                                  'container': container,
+                                  'bitrate': bitrate,
+                                  'video_resolution': video_resolution,
+                                  'video_framerate': video_framerate,
+                                  'aspect_ratio': aspect_ratio,
+                                  'transcode_audio_channels': transcode_audio_channels,
+                                  'transcode_audio_codec': transcode_audio_codec,
+                                  'transcode_video_codec': transcode_video_codec,
+                                  'transcode_width': transcode_width,
+                                  'transcode_height': transcode_height,
+                                  'transcode_container': transcode_container,
+                                  'transcode_protocol': transcode_protocol,
+                                  'duration': duration,
+                                  'view_offset': progress,
+                                  'progress_percent': str(helpers.get_percent(progress, duration)),
+                                  'indexes': use_indexes
+                                  }
+                if helpers.get_xml_attr(session, 'ratingKey').isdigit():
+                    session_output['media_type'] = helpers.get_xml_attr(session, 'type')
+                else:
+                    session_output['media_type'] = 'clip'
+
+            elif helpers.get_xml_attr(session, 'type') == 'clip':
+                session_output = {'session_key': helpers.get_xml_attr(session, 'sessionKey'),
+                                  'media_index': helpers.get_xml_attr(session, 'index'),
+                                  'parent_media_index': helpers.get_xml_attr(session, 'parentIndex'),
+                                  'art': helpers.get_xml_attr(session, 'art'),
+                                  'thumb': helpers.get_xml_attr(session, 'thumb'),
+                                  'bif_thumb': bif_thumb,
+                                  'parent_thumb': helpers.get_xml_attr(session, 'parentThumb'),
+                                  'grandparent_thumb': helpers.get_xml_attr(session, 'grandparentThumb'),
+                                  'user': user_details['username'],
+                                  'user_id': user_details['user_id'],
+                                  'friendly_name': user_details['friendly_name'],
+                                  'user_thumb': user_details['thumb'],
+                                  'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
+                                  'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
+                                  'machine_id': machine_id,
+                                  'state': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'state'),
+                                  'grandparent_title': helpers.get_xml_attr(session, 'grandparentTitle'),
+                                  'parent_title': helpers.get_xml_attr(session, 'parentTitle'),
+                                  'title': helpers.get_xml_attr(session, 'title'),
+                                  'year': helpers.get_xml_attr(session, 'year'),
+                                  'rating_key': helpers.get_xml_attr(session, 'ratingKey'),
+                                  'parent_rating_key': helpers.get_xml_attr(session, 'parentRatingKey'),
+                                  'grandparent_rating_key': helpers.get_xml_attr(session, 'grandparentRatingKey'),
+                                  'throttled': throttled,
+                                  'transcode_progress': transcode_progress,
+                                  'transcode_speed': str(round(helpers.cast_to_float(transcode_speed), 1)),
+                                  'audio_decision': audio_decision,
+                                  'audio_channels': audio_channels,
+                                  'audio_codec': audio_codec,
+                                  'video_decision': video_decision,
+                                  'video_codec': video_codec,
+                                  'height': height,
+                                  'width': width,
+                                  'container': container,
+                                  'bitrate': bitrate,
+                                  'video_resolution': video_resolution,
+                                  'video_framerate': video_framerate,
+                                  'aspect_ratio': aspect_ratio,
+                                  'transcode_audio_channels': transcode_audio_channels,
+                                  'transcode_audio_codec': transcode_audio_codec,
+                                  'transcode_video_codec': transcode_video_codec,
+                                  'transcode_width': transcode_width,
+                                  'transcode_height': transcode_height,
+                                  'transcode_container': transcode_container,
+                                  'transcode_protocol': transcode_protocol,
+                                  'duration': duration,
+                                  'view_offset': progress,
+                                  'progress_percent': str(helpers.get_percent(progress, duration)),
+                                  'media_type': helpers.get_xml_attr(session, 'type'),
+                                  'indexes': 0
+                                  }
+
+        elif stream_type == 'photo':
+            media_info = session.getElementsByTagName('Media')[0]
+            video_decision = 'direct play'
+            container = helpers.get_xml_attr(media_info, 'container')
+            aspect_ratio = helpers.get_xml_attr(media_info, 'aspectRatio')
+            width = helpers.get_xml_attr(media_info, 'width')
+            height = helpers.get_xml_attr(media_info, 'height')
+
+            if session.getElementsByTagName('TranscodeSession'):
+                transcode_session = session.getElementsByTagName('TranscodeSession')[0]
+                throttled = helpers.get_xml_attr(transcode_session, 'throttled')
+                transcode_progress = helpers.get_xml_attr(transcode_session, 'progress')
+                transcode_speed = helpers.get_xml_attr(transcode_session, 'speed')
+                video_decision = helpers.get_xml_attr(transcode_session, 'videoDecision')
+                transcode_video_codec = helpers.get_xml_attr(transcode_session, 'videoCodec')
+                transcode_width = helpers.get_xml_attr(transcode_session, 'width')
+                transcode_height = helpers.get_xml_attr(transcode_session, 'height')
+                transcode_container = helpers.get_xml_attr(transcode_session, 'container')
+                transcode_protocol = helpers.get_xml_attr(transcode_session, 'protocol')
+            else:
+                throttled = '0'
+                transcode_progress = '0'
+                transcode_speed = ''
+                transcode_video_codec = ''
+                transcode_width = ''
+                transcode_height = ''
+                transcode_container = ''
+                transcode_protocol = ''
+
+            user_details = user_data.get_user_details(
+                user=helpers.get_xml_attr(session.getElementsByTagName('User')[0], 'title'))
+
+            if helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'machineIdentifier').endswith('_Photo'):
+                machine_id = helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'machineIdentifier')[:-6]
+            else:
+                machine_id = helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'machineIdentifier')
+
+            session_output = {'session_key': helpers.get_xml_attr(session, 'sessionKey'),
+                              'media_index': helpers.get_xml_attr(session, 'index'),
+                              'parent_media_index': helpers.get_xml_attr(session, 'parentIndex'),
+                              'art': helpers.get_xml_attr(session, 'art'),
+                              'parent_thumb': helpers.get_xml_attr(session, 'parentThumb'),
+                              'grandparent_thumb': helpers.get_xml_attr(session, 'grandparentThumb'),
+                              'thumb': helpers.get_xml_attr(session, 'thumb'),
+                              'bif_thumb': '',
+                              'user': user_details['username'],
+                              'user_id': user_details['user_id'],
+                              'friendly_name': user_details['friendly_name'],
+                              'user_thumb': user_details['thumb'],
+                              'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
+                              'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
+                              'machine_id': machine_id,
+                              'state': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'state'),
+                              'grandparent_title': helpers.get_xml_attr(session, 'grandparentTitle'),
+                              'parent_title': helpers.get_xml_attr(session, 'parentTitle'),
+                              'title': helpers.get_xml_attr(session, 'title'),
+                              'year': helpers.get_xml_attr(session, 'year'),
+                              'rating_key': helpers.get_xml_attr(session, 'ratingKey'),
+                              'parent_rating_key': helpers.get_xml_attr(session, 'parentRatingKey'),
+                              'grandparent_rating_key': helpers.get_xml_attr(session, 'grandparentRatingKey'),
+                              'throttled': throttled,
+                              'transcode_progress': transcode_progress,
+                              'transcode_speed': str(round(helpers.cast_to_float(transcode_speed), 1)),
+                              'audio_decision': '',
+                              'audio_channels': '',
+                              'audio_codec': '',
+                              'video_decision': video_decision,
+                              'video_codec': '',
+                              'height': height,
+                              'width': width,
+                              'container': container,
+                              'bitrate': '',
+                              'video_resolution': '',
+                              'video_framerate': '',
+                              'aspect_ratio': aspect_ratio,
+                              'transcode_audio_channels': '',
+                              'transcode_audio_codec': '',
+                              'transcode_video_codec': transcode_video_codec,
+                              'transcode_width': transcode_width,
+                              'transcode_height': transcode_height,
+                              'transcode_container': transcode_container,
+                              'transcode_protocol': transcode_protocol,
+                              'duration': '',
+                              'view_offset': '',
+                              'progress_percent': '100',
+                              'media_type': 'photo',
+                              'indexes': 0
+                              }
 
         else:
-            quality_profile = 'Unknown'
-            synced_version_profile = ''
-            optimized_version_profile = ''
+            logger.warn(u"No known stream types found in session list.")
 
-        # Entire session output (single dict for backwards compatibility)
-        session_output = {'session_key': session_key,
-                          'media_type': media_type,
-                          'view_offset': view_offset,
-                          'progress_percent': str(helpers.get_percent(view_offset, stream_details['stream_duration'])),
-                          'quality_profile': quality_profile,
-                          'synced_version_profile': synced_version_profile,
-                          'optimized_version_profile': optimized_version_profile,
-                          'user': user_details['username'],  # Keep for backwards compatibility
-                          'channel_stream': channel_stream
-                          }
-
-        session_output.update(metadata_details)
-        session_output.update(source_media_details)
-        session_output.update(source_media_part_details)
-        session_output.update(source_video_details)
-        session_output.update(source_audio_details)
-        session_output.update(source_subtitle_details)
-        session_output.update(user_details)
-        session_output.update(player_details)
-        session_output.update(session_details)
-        session_output.update(transcode_details)
-        session_output.update(stream_details)
-        session_output.update(video_details)
-        session_output.update(audio_details)
-        session_output.update(subtitle_details)
+        # Rename Mystery platform names
+        platform_names = {'Mystery 3': 'Playstation 3',
+                          'Mystery 4': 'Playstation 4',
+                          'Mystery 5': 'Xbox 360'}
+        session_output['platform'] = platform_names.get(session_output['platform'], 
+                                                        session_output['platform'])
 
         return session_output
 
-    def terminate_session(self, session_key='', session_id='', message=''):
-        """
-        Terminates a streaming session.
-        """
-        plex_tv = plextv.PlexTV()
-        if not plex_tv.get_plexpass_status():
-            msg = 'No Plex Pass subscription'
-            logger.warn("Tautulli Pmsconnect :: Failed to terminate session: %s." % msg)
-            return msg
+    """
+    Return processed and validated children list.
 
-        message = message.encode('utf-8') or 'The server owner has ended the stream.'
+    Output: array
+    """
+    def get_item_children(self, rating_key=''):
+        children_data = self.get_children_list(rating_key, output_format='xml')
 
-        ap = activity_processor.ActivityProcessor()
-
-        if session_key:
-            session = ap.get_session_by_key(session_key=session_key)
-            if session and not session_id:
-                session_id = session['session_id']
-
-        elif session_id:
-            session = ap.get_session_by_id(session_id=session_id)
-            if session and not session_key:
-                session_key = session['session_key']
-
-        else:
-            session = session_key = session_id = None
-
-        if not session:
-            msg = 'Invalid session_key (%s) or session_id (%s)' % (session_key, session_id)
-            logger.warn("Tautulli Pmsconnect :: Failed to terminate session: %s." % msg)
-            return msg
-
-        if session_id:
-            logger.info("Tautulli Pmsconnect :: Terminating session %s (session_id %s)." % (session_key, session_id))
-            response = self.get_sessions_terminate(session_id=session_id, reason=message)
-            return response.ok
-        else:
-            msg = 'Missing session_id'
-            logger.warn("Tautulli Pmsconnect :: Failed to terminate session: %s." % msg)
-            return msg
-
-    def get_item_children(self, rating_key='', media_type=None, get_grandchildren=False):
-        """
-        Return processed and validated children list.
-
-        Output: array
-        """
-        default_return = {'children_count': 0,
-                          'children_list': []
-                          }
-
-        xml_head = []
-
-        if media_type == 'playlist':
-            children_data = self.get_playlist_items(rating_key, output_format='xml')
-        elif media_type == 'collection':
-            children_data = self.get_metadata_children(rating_key, collection=True, output_format='xml')
-        elif get_grandchildren:
-            children_data = self.get_metadata_grandchildren(rating_key, output_format='xml')
-        elif media_type == 'artist':
-            artist_metadata = self.get_metadata_details(rating_key)
-            section_id = artist_metadata['section_id']
-            sort_type = '&artist.id={}&type=9'.format(rating_key)
-            xml_head = self.fetch_library_list(
-                section_id=str(section_id),
-                sort_type=sort_type,
-                output_format='xml'
-            )
-        else:
-            children_data = self.get_metadata_children(rating_key, output_format='xml')
-
-        if not xml_head:
-            try:
-                xml_head = children_data.getElementsByTagName('MediaContainer')
-            except Exception as e:
-                logger.warn("Tautulli Pmsconnect :: Unable to parse XML for get_item_children: %s." % e)
-                return default_return
+        try:
+            xml_head = children_data.getElementsByTagName('MediaContainer')
+        except:
+            logger.warn("Unable to parse XML for get_children_list.")
+            return []
 
         children_list = []
 
         for a in xml_head:
             if a.getAttribute('size'):
                 if a.getAttribute('size') == '0':
-                    logger.debug("Tautulli Pmsconnect :: No children data.")
-                    return default_return
+                    logger.debug(u"No children data.")
+                    children_list = {'children_count': '0',
+                                     'children_list': []
+                                     }
+                    return parent_list
 
             result_data = []
 
-            for x in a.childNodes:
-                if x.nodeType == Node.ELEMENT_NODE and x.tagName in ('Directory', 'Video', 'Track', 'Photo'):
-                    result_data.append(x)
+            if a.getElementsByTagName('Directory'):
+                result_data = a.getElementsByTagName('Directory')
+            if a.getElementsByTagName('Video'):
+                result_data = a.getElementsByTagName('Video')
+            if a.getElementsByTagName('Track'):
+                result_data = a.getElementsByTagName('Track')
 
             if result_data:
-                for m in result_data:
-                    directors = []
-                    writers = []
-                    actors = []
-                    genres = []
-                    labels = []
-                    collections = []
-
-                    if m.getElementsByTagName('Director'):
-                        for director in m.getElementsByTagName('Director'):
-                            directors.append(helpers.get_xml_attr(director, 'tag'))
-
-                    if m.getElementsByTagName('Writer'):
-                        for writer in m.getElementsByTagName('Writer'):
-                            writers.append(helpers.get_xml_attr(writer, 'tag'))
-
-                    if m.getElementsByTagName('Role'):
-                        for actor in m.getElementsByTagName('Role'):
-                            actors.append(helpers.get_xml_attr(actor, 'tag'))
-
-                    if m.getElementsByTagName('Genre'):
-                        for genre in m.getElementsByTagName('Genre'):
-                            genres.append(helpers.get_xml_attr(genre, 'tag'))
-
-                    if m.getElementsByTagName('Label'):
-                        for label in m.getElementsByTagName('Label'):
-                            labels.append(helpers.get_xml_attr(label, 'tag'))
-
-                    if m.getElementsByTagName('Collection'):
-                        for collection in m.getElementsByTagName('Collection'):
-                            collections.append(helpers.get_xml_attr(collection, 'tag'))
-
-                    media_type = helpers.get_xml_attr(m, 'type')
-                    if m.nodeName == 'Directory' and media_type == 'photo':
-                        media_type = 'photo_album'
-
-                    children_output = {'media_type': media_type,
-                                       'section_id': helpers.get_xml_attr(a, 'librarySectionID'),
-                                       'library_name': helpers.get_xml_attr(a, 'librarySectionTitle'),
-                                       'rating_key': helpers.get_xml_attr(m, 'ratingKey'),
-                                       'parent_rating_key': helpers.get_xml_attr(m, 'parentRatingKey'),
-                                       'grandparent_rating_key': helpers.get_xml_attr(m, 'grandparentRatingKey'),
-                                       'title': helpers.get_xml_attr(m, 'title'),
-                                       'parent_title': helpers.get_xml_attr(m, 'parentTitle'),
-                                       'grandparent_title': helpers.get_xml_attr(m, 'grandparentTitle'),
-                                       'original_title': helpers.get_xml_attr(m, 'originalTitle'),
-                                       'sort_title': helpers.get_xml_attr(m, 'titleSort'),
-                                       'media_index': helpers.get_xml_attr(m, 'index'),
-                                       'parent_media_index': helpers.get_xml_attr(m, 'parentIndex'),
-                                       'studio': helpers.get_xml_attr(m, 'studio'),
-                                       'content_rating': helpers.get_xml_attr(m, 'contentRating'),
-                                       'summary': helpers.get_xml_attr(m, 'summary'),
-                                       'tagline': helpers.get_xml_attr(m, 'tagline'),
-                                       'rating': helpers.get_xml_attr(m, 'rating'),
-                                       'rating_image': helpers.get_xml_attr(m, 'ratingImage'),
-                                       'audience_rating': helpers.get_xml_attr(m, 'audienceRating'),
-                                       'audience_rating_image': helpers.get_xml_attr(m, 'audienceRatingImage'),
-                                       'user_rating': helpers.get_xml_attr(m, 'userRating'),
-                                       'duration': helpers.get_xml_attr(m, 'duration'),
-                                       'year': helpers.get_xml_attr(m, 'year'),
-                                       'thumb': helpers.get_xml_attr(m, 'thumb'),
-                                       'parent_thumb': helpers.get_xml_attr(m, 'parentThumb'),
-                                       'grandparent_thumb': helpers.get_xml_attr(m, 'grandparentThumb'),
-                                       'art': helpers.get_xml_attr(m, 'art'),
-                                       'banner': helpers.get_xml_attr(m, 'banner'),
-                                       'originally_available_at': helpers.get_xml_attr(m, 'originallyAvailableAt'),
-                                       'added_at': helpers.get_xml_attr(m, 'addedAt'),
-                                       'updated_at': helpers.get_xml_attr(m, 'updatedAt'),
-                                       'last_viewed_at': helpers.get_xml_attr(m, 'lastViewedAt'),
-                                       'guid': helpers.get_xml_attr(m, 'guid'),
-                                       'directors': directors,
-                                       'writers': writers,
-                                       'actors': actors,
-                                       'genres': genres,
-                                       'labels': labels,
-                                       'collections': collections,
-                                       'full_title': helpers.get_xml_attr(m, 'title')
-                                       }
+                for result in result_data:
+                    children_output = {'rating_key': helpers.get_xml_attr(result, 'ratingKey'),
+                                       'index': helpers.get_xml_attr(result, 'index'),
+                                       'title': helpers.get_xml_attr(result, 'title'),
+                                       'thumb': helpers.get_xml_attr(result, 'thumb'),
+                                       'parent_thumb': helpers.get_xml_attr(a, 'thumb'),
+                                       'duration': helpers.get_xml_attr(result, 'duration')
+                                      }
                     children_list.append(children_output)
 
-        output = {'children_count': helpers.cast_to_int(helpers.get_xml_attr(xml_head[0], 'size')),
-                  'children_type': helpers.get_xml_attr(xml_head[0], 'viewGroup') or (children_list[0]['media_type'] if children_list else ''),
+        output = {'children_count': helpers.get_xml_attr(xml_head[0], 'size'),
+                  'children_type': helpers.get_xml_attr(xml_head[0], 'viewGroup'),
                   'title': helpers.get_xml_attr(xml_head[0], 'title2'),
                   'children_list': children_list
                   }
 
         return output
 
-    def get_item_children_related(self, rating_key=''):
-        """
-        Return processed and validated children list.
-
-        Output: array
-        """
-        children_data = self.get_children_list_related(rating_key, output_format='xml')
-
-        try:
-            xml_head = children_data.getElementsByTagName('MediaContainer')
-        except Exception as e:
-            logger.warn("Tautulli Pmsconnect :: Unable to parse XML for get_item_children_related: %s." % e)
-            return []
-
-        children_results_list = {'movie': [],
-                                 'show': [],
-                                 'season': [],
-                                 'episode': [],
-                                 'artist': [],
-                                 'album': [],
-                                 'track': [],
-                                 }
-
-        for a in xml_head:
-            section_id = helpers.get_xml_attr(a, 'librarySectionID')
-            hubs = a.getElementsByTagName('Hub')
-
-            for h in hubs:
-                size = helpers.get_xml_attr(h, 'size')
-                media_type = helpers.get_xml_attr(h, 'type')
-                title = helpers.get_xml_attr(h, 'title')
-                hub_identifier = helpers.get_xml_attr(h, 'hubIdentifier')
-
-                if size == '0' or not hub_identifier.startswith('collection.related') or \
-                        media_type not in children_results_list:
-                    continue
-
-                result_data = []
-
-                if h.getElementsByTagName('Video'):
-                    result_data = h.getElementsByTagName('Video')
-                if h.getElementsByTagName('Directory'):
-                    result_data = h.getElementsByTagName('Directory')
-                if h.getElementsByTagName('Track'):
-                    result_data = h.getElementsByTagName('Track')
-
-                for result in result_data:
-                    children_output = {'section_id': section_id,
-                                       'rating_key': helpers.get_xml_attr(result, 'ratingKey'),
-                                       'parent_rating_key': helpers.get_xml_attr(result, 'parentRatingKey'),
-                                       'media_index': helpers.get_xml_attr(result, 'index'),
-                                       'title': helpers.get_xml_attr(result, 'title'),
-                                       'parent_title': helpers.get_xml_attr(result, 'parentTitle'),
-                                       'year': helpers.get_xml_attr(result, 'year'),
-                                       'thumb': helpers.get_xml_attr(result, 'thumb'),
-                                       'parent_thumb': helpers.get_xml_attr(a, 'thumb'),
-                                       'duration': helpers.get_xml_attr(result, 'duration')
-                                      }
-                    children_results_list[media_type].append(children_output)
-
-            output = {'results_count': sum(len(v) for k, v in children_results_list.items()),
-                      'results_list': children_results_list,
-                      }
-
-            return output
+    """
+    Return the list of local servers.
 
+    Output: array
+    """
     def get_servers_info(self):
-        """
-        Return the list of local servers.
-
-        Output: array
-        """
         recent = self.get_server_list(output_format='xml')
 
         try:
             xml_head = recent.getElementsByTagName('Server')
-        except Exception as e:
-            logger.warn("Tautulli Pmsconnect :: Unable to parse XML for get_server_list: %s." % e)
+        except:
+            logger.warn("Unable to parse XML for get_server_list.")
             return []
 
         server_info = []
@@ -2704,19 +1159,19 @@ class PmsConnect(object):
 
         return server_info
 
-    def get_server_identity(self):
-        """
-        Return the local machine identity.
+    """
+    Return the local machine identity.
 
-        Output: dict
-        """
+    Output: dict
+    """
+    def get_server_identity(self):
         identity = self.get_local_server_identity(output_format='xml')
 
         try:
             xml_head = identity.getElementsByTagName('MediaContainer')
-        except Exception as e:
-            logger.warn("Tautulli Pmsconnect :: Unable to parse XML for get_local_server_identity: %s." % e)
-            return {}
+        except:
+            logger.warn("Unable to parse XML for get_local_server_identity.")
+            return []
 
         server_identity = {}
         for a in xml_head:
@@ -2726,21 +1181,21 @@ class PmsConnect(object):
 
         return server_identity
 
+    """
+    Return a specified server preference.
+
+    Parameters required:    pref { name of preference }
+
+    Output: string
+    """
     def get_server_pref(self, pref=None):
-        """
-        Return a specified server preference.
-
-        Parameters required:    pref { name of preference }
-
-        Output: string
-        """
         if pref:
             prefs = self.get_server_prefs(output_format='xml')
 
             try:
                 xml_head = prefs.getElementsByTagName('Setting')
-            except Exception as e:
-                logger.warn("Tautulli Pmsconnect :: Unable to parse XML for get_local_server_name: %s." % e)
+            except:
+                logger.warn("Unable to parse XML for get_local_server_name.")
                 return ''
 
             pref_value = 'None'
@@ -2751,21 +1206,21 @@ class PmsConnect(object):
 
             return pref_value
         else:
-            logger.debug("Tautulli Pmsconnect :: Server preferences queried but no parameter received.")
+            logger.debug(u"Server preferences queried but no parameter received.")
             return None
 
-    def get_server_children(self):
-        """
-        Return processed and validated server libraries list.
+    """
+    Return processed and validated server libraries list.
 
-        Output: array
-        """
+    Output: array
+    """
+    def get_server_children(self):
         libraries_data = self.get_libraries_list(output_format='xml')
 
         try:
             xml_head = libraries_data.getElementsByTagName('MediaContainer')
-        except Exception as e:
-            logger.warn("Tautulli Pmsconnect :: Unable to parse XML for get_libraries_list: %s." % e)
+        except:
+            logger.warn("Unable to parse XML for get_libraries_list.")
             return []
 
         libraries_list = []
@@ -2773,7 +1228,7 @@ class PmsConnect(object):
         for a in xml_head:
             if a.getAttribute('size'):
                 if a.getAttribute('size') == '0':
-                    logger.debug("Tautulli Pmsconnect :: No libraries data.")
+                    logger.debug(u"No libraries data.")
                     libraries_list = {'libraries_count': '0',
                                       'libraries_list': []
                                       }
@@ -2782,12 +1237,10 @@ class PmsConnect(object):
             if a.getElementsByTagName('Directory'):
                 result_data = a.getElementsByTagName('Directory')
                 for result in result_data:
-                    libraries_output = {'section_id': helpers.get_xml_attr(result, 'key'),
-                                        'section_type': helpers.get_xml_attr(result, 'type'),
-                                        'section_name': helpers.get_xml_attr(result, 'title'),
-                                        'agent': helpers.get_xml_attr(result, 'agent'),
-                                        'thumb': helpers.get_xml_attr(result, 'thumb'),
-                                        'art': helpers.get_xml_attr(result, 'art')
+                    libraries_output = {'key': helpers.get_xml_attr(result, 'key'),
+                                        'type': helpers.get_xml_attr(result, 'type'),
+                                        'title': helpers.get_xml_attr(result, 'title'),
+                                        'thumb': helpers.get_xml_attr(result, 'thumb')
                                         }
                     libraries_list.append(libraries_output)
 
@@ -2795,377 +1248,239 @@ class PmsConnect(object):
                   'title': helpers.get_xml_attr(xml_head[0], 'title1'),
                   'libraries_list': libraries_list
                   }
-
+        
         return output
 
-    def get_library_children_details(self, section_id='', section_type='', list_type='all', count='',
-                                     rating_key='', label_key='', get_media_info=False):
-        """
-        Return processed and validated server library items list.
+    """
+    Return processed and validated server library items list.
 
-        Parameters required:    section_type { movie, show, episode, artist }
-                                section_id { unique library key }
+    Parameters required:    library_type { movie, show, episode, artist }
+                            section_key { unique library key }
 
-        Output: array
-        """
+    Output: array
+    """
+    def get_library_children(self, library_type='', section_key='', list_type='all', sort_type = ''):
 
-        if section_type == 'movie':
+        # Currently only grab the library with 1 items so 'size' is not 0
+        count = '1'
+
+        if library_type == 'movie':
             sort_type = '&type=1'
-        elif section_type == 'show':
+        elif library_type == 'show':
             sort_type = '&type=2'
-        elif section_type == 'season':
-            sort_type = '&type=3'
-        elif section_type == 'episode':
+        elif library_type == 'episode':
             sort_type = '&type=4'
-        elif section_type == 'artist':
-            sort_type = '&type=8'
-        elif section_type == 'album':
-            sort_type = '&type=9'
-        elif section_type == 'track':
-            sort_type = '&type=10'
-        elif section_type == 'photo':
-            sort_type = ''
-        elif section_type == 'photo_album':
-            sort_type = '&type=14'
-        elif section_type == 'picture':
-            sort_type = '&type=13&clusterZoomLevel=1'
-        elif section_type == 'clip':
-            sort_type = '&type=12&clusterZoomLevel=1'
-        else:
-            sort_type = ''
+        elif library_type == 'album':
+            list_type = 'albums'
 
-        if str(rating_key).isdigit() and section_type != 'album':
-            library_data = self.get_metadata_children(str(rating_key), output_format='xml')
-
-            try:
-                xml_head = library_data.getElementsByTagName('MediaContainer')
-            except Exception as e:
-                logger.warn("Tautulli Pmsconnect :: Unable to parse XML for get_library_children_details: %s." % e)
-                return []
-
-        elif str(section_id).isdigit() or section_type == 'album':
-            if section_type == 'album' and rating_key:
-                sort_type += '&artist.id=' + str(rating_key)
-
-            xml_head = self.fetch_library_list(
-                section_id=str(section_id),
-                list_type=list_type,
-                count=count,
-                sort_type=sort_type,
-                label_key=label_key,
-                output_format='xml'
-            )
-
-        else:
-            logger.warn("Tautulli Pmsconnect :: get_library_children called by invalid section_id or rating_key provided.")
+        library_data = self.get_library_list(section_key, list_type, count, sort_type, output_format='xml')
+        
+        try:
+            xml_head = library_data.getElementsByTagName('MediaContainer')
+        except:
+            logger.warn("Unable to parse XML for get_library_children.")
             return []
 
-
-        library_count = '0'
-        children_list = []
+        library_list = []
 
         for a in xml_head:
             if a.getAttribute('size'):
                 if a.getAttribute('size') == '0':
-                    logger.debug("Tautulli Pmsconnect :: No library data.")
-                    children_list = {'library_count': '0',
-                                     'children_list': []
-                                     }
-                    return children_list
+                    logger.debug(u"No library data.")
+                    library_list = {'library_count': '0',
+                                    'library_list': []
+                                    }
+                    return library_list
 
-            if rating_key:
-                library_count = helpers.get_xml_attr(xml_head[0], 'size')
-            else:
-                library_count = helpers.get_xml_attr(xml_head[0], 'totalSize')
-
-            # Get show/season info from xml_head
-
-            item_main = []
             if a.getElementsByTagName('Directory'):
-                dir_main = a.getElementsByTagName('Directory')
-                item_main += [d for d in dir_main if helpers.get_xml_attr(d, 'ratingKey')]
-            if a.getElementsByTagName('Video'):
-                item_main += a.getElementsByTagName('Video')
-            if a.getElementsByTagName('Track'):
-                item_main += a.getElementsByTagName('Track')
-            if a.getElementsByTagName('Photo'):
-                item_main += a.getElementsByTagName('Photo')
-
-            for item in item_main:
-                media_type = helpers.get_xml_attr(item, 'type')
-                if item.nodeName == 'Directory' and media_type == 'photo':
-                    media_type = 'photo_album'
-
-                item_info = {'section_id': helpers.get_xml_attr(a, 'librarySectionID'),
-                             'media_type': media_type,
-                             'rating_key': helpers.get_xml_attr(item, 'ratingKey'),
-                             'parent_rating_key': helpers.get_xml_attr(item, 'parentRatingKey'),
-                             'grandparent_rating_key': helpers.get_xml_attr(item, 'grandparentRatingKey'),
-                             'title': helpers.get_xml_attr(item, 'title'),
-                             'parent_title': helpers.get_xml_attr(item, 'parentTitle'),
-                             'grandparent_title': helpers.get_xml_attr(item, 'grandparentTitle'),
-                             'original_title': helpers.get_xml_attr(item, 'originalTitle'),
-                             'sort_title': helpers.get_xml_attr(item, 'titleSort'),
-                             'media_index': helpers.get_xml_attr(item, 'index'),
-                             'parent_media_index': helpers.get_xml_attr(item, 'parentIndex'),
-                             'year': helpers.get_xml_attr(item, 'year'),
-                             'thumb': helpers.get_xml_attr(item, 'thumb'),
-                             'parent_thumb': helpers.get_xml_attr(item, 'thumb'),
-                             'grandparent_thumb': helpers.get_xml_attr(item, 'grandparentThumb'),
-                             'added_at': helpers.get_xml_attr(item, 'addedAt')
-                             }
-
-                if get_media_info:
-                    item_media = item.getElementsByTagName('Media')
-                    for media in item_media:
-                        media_info = {'container': helpers.get_xml_attr(media, 'container'),
-                                      'bitrate': helpers.get_xml_attr(media, 'bitrate'),
-                                      'video_codec': helpers.get_xml_attr(media, 'videoCodec'),
-                                      'video_resolution': helpers.get_xml_attr(media, 'videoResolution').lower(),
-                                      'video_framerate': helpers.get_xml_attr(media, 'videoFrameRate'),
-                                      'audio_codec': helpers.get_xml_attr(media, 'audioCodec'),
-                                      'audio_channels': helpers.get_xml_attr(media, 'audioChannels'),
-                                      'file': helpers.get_xml_attr(media.getElementsByTagName('Part')[0], 'file'),
-                                      'file_size': helpers.get_xml_attr(media.getElementsByTagName('Part')[0], 'size'),
+                result_data = a.getElementsByTagName('Directory')
+                for result in result_data:
+                    library_output = {'key': helpers.get_xml_attr(result, 'key'),
+                                      'type': helpers.get_xml_attr(result, 'type'),
+                                      'title': helpers.get_xml_attr(result, 'title'),
+                                      'thumb': helpers.get_xml_attr(result, 'thumb')
                                       }
-                        item_info.update(media_info)
+                    library_list.append(library_output)
 
-                children_list.append(item_info)
-
-        output = {'library_count': library_count,
-                  'children_list': children_list
+        output = {'library_count': helpers.get_xml_attr(xml_head[0], 'totalSize'),
+                  'count_type': helpers.get_xml_attr(xml_head[0], 'title2'),
+                  'library_list': library_list
                   }
 
         return output
 
-    def get_library_details(self):
-        """
-        Return processed and validated library statistics.
+    """
+    Return processed and validated library statistics.
 
-        Output: array
-        """
+    Output: array
+    """
+    def get_library_stats(self, library_cards=''):
         server_libraries = self.get_server_children()
 
         server_library_stats = []
 
-        if server_libraries and server_libraries['libraries_count'] != '0':
+        if server_libraries['libraries_count'] != '0':
             libraries_list = server_libraries['libraries_list']
 
             for library in libraries_list:
-                section_type = library['section_type']
-                section_id = library['section_id']
-                children_list = self.get_library_children_details(section_id=section_id, section_type=section_type, count='1')
+                library_type = library['type']
+                section_key = library['key']
+                if section_key in library_cards:
+                    library_list = self.get_library_children(library_type, section_key)
+                else:
+                    continue
 
-                if children_list:
-                    library_stats = {'section_id': section_id,
-                                     'section_name': library['section_name'],
-                                     'section_type': section_type,
-                                     'agent': library['agent'],
+                if library_list['library_count'] != '0':
+                    library_stats = {'title': library['title'],
                                      'thumb': library['thumb'],
-                                     'art': library['art'],
-                                     'count': children_list['library_count'],
-                                     'is_active': 1
+                                     'count': library_list['library_count'],
+                                     'count_type': library_list['count_type']
                                      }
 
-                    if section_type == 'show':
-                        parent_list = self.get_library_children_details(section_id=section_id, section_type='season', count='1')
-                        if parent_list:
-                            parent_stats = {'parent_count': parent_list['library_count']}
-                            library_stats.update(parent_stats)
+                    if library_type == 'show':
+                        episode_list = self.get_library_children(library_type='episode', section_key=section_key)
+                        episode_stats = {'episode_count': episode_list['library_count'],
+                                         'episode_count_type': 'All Episodes'
+                                         }
+                        library_stats.update(episode_stats)
 
-                        child_list = self.get_library_children_details(section_id=section_id, section_type='episode', count='1')
-                        if child_list:
-                            child_stats = {'child_count': child_list['library_count']}
-                            library_stats.update(child_stats)
+                    if library_type == 'artist':
+                        album_list = self.get_library_children(library_type='album', section_key=section_key)
+                        album_stats = {'album_count': album_list['library_count'],
+                                       'album_count_type': 'All Albums'
+                                       }
+                        library_stats.update(album_stats)
 
-                    if section_type == 'artist':
-                        parent_list = self.get_library_children_details(section_id=section_id, section_type='album', count='1')
-                        if parent_list:
-                            parent_stats = {'parent_count': parent_list['library_count']}
-                            library_stats.update(parent_stats)
-
-                        child_list = self.get_library_children_details(section_id=section_id, section_type='track', count='1')
-                        if child_list:
-                            child_stats = {'child_count': child_list['library_count']}
-                            library_stats.update(child_stats)
-
-                    if section_type == 'photo':
-                        parent_list = self.get_library_children_details(section_id=section_id, section_type='picture', count='1')
-                        if parent_list:
-                            parent_stats = {'parent_count': parent_list['library_count']}
-                            library_stats.update(parent_stats)
-
-                        child_list = self.get_library_children_details(section_id=section_id, section_type='clip', count='1')
-                        if child_list:
-                            child_stats = {'child_count': child_list['library_count']}
-                            library_stats.update(child_stats)
-
-                    server_library_stats.append(library_stats)
+                    server_library_stats.append({'type': library_type,
+                                                 'rows': library_stats})
 
         return server_library_stats
 
-    def get_library_label_details(self, section_id=''):
-        labels_data = self.get_library_labels(section_id=str(section_id), output_format='xml')
+    """
+    Return image data as array.
+    Array contains the image content type and image binary
 
-        try:
-            xml_head = labels_data.getElementsByTagName('MediaContainer')
-        except Exception as e:
-            logger.warn("Tautulli Pmsconnect :: Unable to parse XML for get_library_label_details: %s." % e)
+    Parameters required:    img { Plex image location }
+    Optional parameters:    width { the image width }
+                            height { the image height }
+    Output: array
+    """
+    def get_image(self, img=None, width=None, height=None):
+        if img:
+            if width.isdigit() and height.isdigit():
+                uri = '/photo/:/transcode?url=http://127.0.0.1:32400' + img + '&width=' + width + '&height=' + height
+            else:
+                uri = '/photo/:/transcode?url=http://127.0.0.1:32400' + img
+
+            request, content_type = self.request_handler.make_request(uri=uri,
+                                                                      proto=self.protocol,
+                                                                      request_type='GET',
+                                                                      return_type=True)
+
+            return [request, content_type]
+        else:
+            logger.error("Image proxy queries but no input received.")
             return None
 
-        labels_list = []
+    """
+    Return processed list of search results.
 
-        for a in xml_head:
-            if a.getAttribute('size'):
-                if a.getAttribute('size') == '0':
-                    logger.debug("Tautulli Pmsconnect :: No labels data.")
-                    return labels_list
-
-            if a.getElementsByTagName('Directory'):
-                labels_main = a.getElementsByTagName('Directory')
-                for item in labels_main:
-                    label = {'label_key': helpers.get_xml_attr(item, 'key'),
-                             'label_title': helpers.get_xml_attr(item, 'title')
-                             }
-                    labels_list.append(label)
-
-        return labels_list
-
-    def get_image(self, img=None, width=1000, height=1500, opacity=None, background=None, blur=None,
-                  img_format='png', clip=False, refresh=False, **kwargs):
-        """
-        Return image data as array.
-        Array contains the image content type and image binary
-
-        Parameters required:    img { Plex image location }
-        Optional parameters:    width { the image width }
-                                height { the image height }
-                                opacity { the image opacity 0-100 }
-                                background { the image background HEX }
-                                blur { the image blur 0-100 }
-        Output: array
-        """
-
-        width = width or 1000
-        height = height or 1500
-
-        if img:
-            web_img = img.startswith('http')
-            resource_img = img.startswith('/:/resources')
-
-            if 'collection' in img and 'composite' in img:
-                img = img.replace('composite', 'thumb')
-
-            if refresh and not web_img and not resource_img:
-                img_split = img.split('/')
-                if img_split[-1].isdigit():
-                    img = '/'.join(img_split[:-1])
-                img = '{}/{}'.format(img.rstrip('/'), helpers.timestamp())
-
-            if web_img:
-                params = {'url': '%s' % img}
-            elif clip:
-                params = {'url': '%s&%s' % (img, urlencode({'X-Plex-Token': self.token}))}
-            else:
-                params = {'url': 'http://127.0.0.1:32400%s?%s' % (img, urlencode({'X-Plex-Token': self.token}))}
-
-            params['width'] = width
-            params['height'] = height
-            params['format'] = img_format
-
-            if opacity:
-                params['opacity'] = opacity
-            if background:
-                params['background'] = background
-            if blur:
-                params['blur'] = blur
-
-            uri = '/photo/:/transcode?%s' % urlencode(params)
-            result = self.request_handler.make_request(uri=uri,
-                                                       request_type='GET',
-                                                       return_type=True)
-
-            if result is None:
-                return
-            else:
-                return result[0], result[1]
-
-        else:
-            logger.error("Tautulli Pmsconnect :: Image proxy queried but no input received.")
-
-    def get_search_results(self, query='', limit=''):
-        """
-        Return processed list of search results.
-
-        Output: array
-        """
-        search_results = self.get_search(query=query, limit=limit, output_format='xml')
+    Output: array
+    """
+    def get_search_results(self, query=''):
+        search_results = self.get_search(query=query, output_format='xml')
+        search_results_tracks = self.get_search(query=query, track='&type=10', output_format='xml')
 
+        xml_head = []
         try:
-            xml_head = search_results.getElementsByTagName('MediaContainer')
-        except Exception as e:
-            logger.warn("Tautulli Pmsconnect :: Unable to parse XML for get_search_result: %s." % e)
+            try:
+                xml_head += search_results.getElementsByTagName('MediaContainer')
+            except:
+                pass
+            try:
+                xml_head += search_results_tracks.getElementsByTagName('MediaContainer')
+            except:
+                pass
+        except:
+            logger.warn("Unable to parse XML for get_search_result_details.")
             return []
-
+        
+        search_results_count = 0
         search_results_list = {'movie': [],
                                'show': [],
                                'season': [],
                                'episode': [],
                                'artist': [],
                                'album': [],
-                               'track': [],
-                               'collection': []
+                               'track': []
                                }
 
+        totalSize = 0
         for a in xml_head:
-            hubs = a.getElementsByTagName('Hub')
+            if a.getAttribute('size'):
+                totalSize += int(a.getAttribute('size'))
+        if totalSize == 0:
+            logger.debug(u"No search results.")
+            search_results_list = {'results_count': search_results_count,
+                                    'results_list': []
+                                    }
+            return search_results_list
 
-            for h in hubs:
-                if helpers.get_xml_attr(h, 'size') == '0' or \
-                    helpers.get_xml_attr(h, 'type') not in search_results_list:
-                    continue
+        for a in xml_head:
+            if a.getElementsByTagName('Video'):
+                result_data = a.getElementsByTagName('Video')
+                for result in result_data:
+                    rating_key = helpers.get_xml_attr(result, 'ratingKey')
+                    metadata = self.get_metadata_details(rating_key=rating_key)
+                    if metadata['metadata']['type'] == 'movie':
+                        search_results_list['movie'].append(metadata['metadata'])
+                    elif metadata['metadata']['type'] == 'episode':
+                        search_results_list['episode'].append(metadata['metadata'])
+                    search_results_count += 1
 
-                if h.getElementsByTagName('Video'):
-                    result_data = h.getElementsByTagName('Video')
-                    for result in result_data:
-                        rating_key = helpers.get_xml_attr(result, 'ratingKey')
-                        metadata = self.get_metadata_details(rating_key=rating_key)
-                        search_results_list[metadata['media_type']].append(metadata)
+            if a.getElementsByTagName('Directory'):
+                result_data = a.getElementsByTagName('Directory')
+                for result in result_data:
+                    rating_key = helpers.get_xml_attr(result, 'ratingKey')
+                    metadata = self.get_metadata_details(rating_key=rating_key)
+                    if metadata['metadata']['type'] == 'show':
+                        search_results_list['show'].append(metadata['metadata'])
 
-                if h.getElementsByTagName('Directory'):
-                    result_data = h.getElementsByTagName('Directory')
-                    for result in result_data:
-                        rating_key = helpers.get_xml_attr(result, 'ratingKey')
-                        metadata = self.get_metadata_details(rating_key=rating_key)
-                        search_results_list[metadata['media_type']].append(metadata)
+                        show_seasons = self.get_item_children(rating_key=metadata['metadata']['rating_key'])
+                        if show_seasons['children_count'] != '0':
+                            for season in show_seasons['children_list']:
+                                if season['rating_key']:
+                                    rating_key = season['rating_key']
+                                    metadata = self.get_metadata_details(rating_key=rating_key)
+                                    search_results_list['season'].append(metadata['metadata'])
+                                    search_results_count += 1
 
-                        if metadata['media_type'] == 'show':
-                            show_seasons = self.get_item_children(rating_key=metadata['rating_key'])
-                            if show_seasons['children_count'] != 0:
-                                for season in show_seasons['children_list']:
-                                    if season['rating_key']:
-                                        metadata = self.get_metadata_details(rating_key=season['rating_key'])
-                                        search_results_list['season'].append(metadata)
+                    elif metadata['metadata']['type'] == 'artist':
+                        search_results_list['artist'].append(metadata['metadata'])
+                    elif metadata['metadata']['type'] == 'album':
+                        search_results_list['album'].append(metadata['metadata'])
+                    search_results_count += 1
 
-                if h.getElementsByTagName('Track'):
-                    result_data = h.getElementsByTagName('Track')
-                    for result in result_data:
-                        rating_key = helpers.get_xml_attr(result, 'ratingKey')
-                        metadata = self.get_metadata_details(rating_key=rating_key)
-                        search_results_list[metadata['media_type']].append(metadata)
+            if a.getElementsByTagName('Track'):
+                result_data = a.getElementsByTagName('Track')
+                for result in result_data:
+                    rating_key = helpers.get_xml_attr(result, 'ratingKey')
+                    metadata = self.get_metadata_details(rating_key=rating_key)
+                    search_results_list['track'].append(metadata['metadata'])
+                    search_results_count += 1
 
-        output = {'results_count': sum(len(s) for s in search_results_list.values()),
+        output = {'results_count': search_results_count,
                   'results_list': search_results_list
                   }
 
         return output
 
-    def get_rating_keys_list(self, rating_key='', media_type=''):
-        """
-        Return processed list of grandparent/parent/child rating keys.
+    """
+    Return processed list of grandparent/parent/child rating keys.
 
-        Output: array
-        """
+    Output: array
+    """
+    def get_rating_keys_list(self, rating_key='', media_type=''):
 
         if media_type == 'movie':
             key_list = {0: {'rating_key': int(rating_key)}}
@@ -3175,65 +1490,39 @@ class PmsConnect(object):
             match_type = 'title'
         else:
             match_type = 'index'
-
-        section_id = None
-        library_name = None
-
+        
         # get grandparent rating key
         if media_type == 'season' or media_type == 'album':
             try:
                 metadata = self.get_metadata_details(rating_key=rating_key)
-                title = metadata['parent_title']
-                rating_key = metadata['parent_rating_key']
-                section_id = metadata['section_id']
-                library_name = metadata['library_name']
-            except Exception as e:
-                logger.warn("Tautulli Pmsconnect :: Unable to get parent_rating_key for get_rating_keys_list: %s." % e)
+                rating_key = metadata['metadata']['parent_rating_key']
+            except:
+                logger.warn("Unable to get parent_rating_key for get_rating_keys_list.")
                 return {}
 
         elif media_type == 'episode' or media_type == 'track':
             try:
                 metadata = self.get_metadata_details(rating_key=rating_key)
-                title = metadata['grandparent_title']
-                rating_key = metadata['grandparent_rating_key']
-                section_id = metadata['section_id']
-                library_name = metadata['library_name']
-            except Exception as e:
-                logger.warn("Tautulli Pmsconnect :: Unable to get grandparent_rating_key for get_rating_keys_list: %s." % e)
+                rating_key = metadata['metadata']['grandparent_rating_key']
+            except:
+                logger.warn("Unable to get grandparent_rating_key for get_rating_keys_list.")
                 return {}
 
-        elif media_type == 'show' or media_type == 'artist':
-            try:
-                metadata = self.get_metadata_details(rating_key=rating_key)
-                title = metadata['title']
-                section_id = metadata['section_id']
-                library_name = metadata['library_name']
-            except Exception as e:
-                logger.warn("Tautulli Pmsconnect :: Unable to get grandparent_rating_key for get_rating_keys_list: %s." % e)
-                return {}
-
-
         # get parent_rating_keys
-        if media_type in ('artist', 'album', 'track'):
-            sort_type = '&artist.id={}&type=9'.format(rating_key)
-            xml_head = self.fetch_library_list(
-                section_id=str(section_id),
-                sort_type=sort_type,
-                output_format='xml'
-            )
-        else:
-            metadata = self.get_metadata_children(str(rating_key), output_format='xml')
+        metadata = self.get_metadata_children(str(rating_key), output_format='xml')
 
-            try:
-                xml_head = metadata.getElementsByTagName('MediaContainer')
-            except Exception as e:
-                logger.warn("Tautulli Pmsconnect :: Unable to parse XML for get_rating_keys_list: %s." % e)
-                return {}
+        try:
+            xml_head = metadata.getElementsByTagName('MediaContainer')
+        except:
+            logger.warn("Unable to parse XML for get_rating_keys_list.")
+            return {}
 
         for a in xml_head:
             if a.getAttribute('size'):
                 if a.getAttribute('size') == '0':
                     return {}
+            
+            title = helpers.get_xml_attr(a, 'title2')
 
             if a.getElementsByTagName('Directory'):
                 parents_metadata = a.getElementsByTagName('Directory')
@@ -3252,8 +1541,8 @@ class PmsConnect(object):
 
                     try:
                         xml_head = metadata.getElementsByTagName('MediaContainer')
-                    except Exception as e:
-                        logger.warn("Tautulli Pmsconnect :: Unable to parse XML for get_rating_keys_list: %s." % e)
+                    except:
+                        logger.warn("Unable to parse XML for get_rating_keys_list.")
                         return {}
 
                     for a in xml_head:
@@ -3275,174 +1564,19 @@ class PmsConnect(object):
                             child_title = helpers.get_xml_attr(item, 'title')
 
                             if child_rating_key:
-                                key = int(child_index) if child_index else child_title
+                                key = int(child_index)
                                 children.update({key: {'rating_key': int(child_rating_key)}})
-
-                    key = int(parent_index) if match_type == 'index' else str(parent_title).lower()
-                    parents.update({key:
-                                    {'rating_key': int(parent_rating_key),
-                                     'children': children}
-                                    })
-
-        key = 0 if match_type == 'index' else str(title).lower()
-        key_list = {key: {'rating_key': int(rating_key),
-                          'children': parents},
-                    'section_id': section_id,
-                    'library_name': library_name
+                    
+                    key = int(parent_index) if match_type == 'index' else parent_title
+                    parents.update({key: 
+                                {'rating_key': int(parent_rating_key),
+                                'children': children}
+                                })
+        
+        key = 0 if match_type == 'index' else title
+        key_list = {key:
+                    {'rating_key': int(rating_key),
+                     'children': parents}
                     }
 
-        return key_list
-
-    def get_server_response(self):
-        account_data = self.get_account(output_format='xml')
-
-        try:
-            xml_head = account_data.getElementsByTagName('MyPlex')
-        except Exception as e:
-            logger.warn("Tautulli Pmsconnect :: Unable to parse XML for get_server_response: %s." % e)
-            return None
-
-        server_response = {}
-
-        for a in xml_head:
-            server_response = {'mapping_state': helpers.get_xml_attr(a, 'mappingState'),
-                               'mapping_error': helpers.get_xml_attr(a, 'mappingError'),
-                               'sign_in_state': helpers.get_xml_attr(a, 'signInState'),
-                               'public_address': helpers.get_xml_attr(a, 'publicAddress'),
-                               'public_port': helpers.get_xml_attr(a, 'publicPort'),
-                               'private_address': helpers.get_xml_attr(a, 'privateAddress'),
-                               'private_port': helpers.get_xml_attr(a, 'privatePort')
-                               }
-
-            if server_response['mapping_state'] == 'unknown':
-                server_response['reason'] = 'Plex remote access port mapping unknown'
-            elif server_response['mapping_state'] not in ('mapped', 'waiting'):
-                server_response['reason'] = 'Plex remote access port not mapped'
-            elif server_response['mapping_error'] == 'unreachable':
-                server_response['reason'] = 'Plex remote access port mapped, ' \
-                                            'but the port is unreachable from Plex.tv'
-            elif server_response['mapping_error'] == 'publisherror':
-                server_response['reason'] = 'Plex remote access port mapped, ' \
-                                            'but failed to publish the port to Plex.tv'
-            else:
-                server_response['reason'] = ''
-
-        return server_response
-
-    def get_update_staus(self):
-        # Refresh the Plex updater status first
-        self.put_updater()
-        updater_status = self.get_updater(output_format='xml')
-
-        try:
-            xml_head = updater_status.getElementsByTagName('MediaContainer')
-        except Exception as e:
-            logger.warn("Tautulli Pmsconnect :: Unable to parse XML for get_update_staus: %s." % e)
-
-            # Catch the malformed XML on certain PMX version.
-            # XML parser helper returns empty list if there is an error parsing XML
-            if updater_status == []:
-                logger.warn("Plex API updater XML is broken on the current PMS version. Please update your PMS manually.")
-                logger.info("Tautulli is unable to check for Plex updates. Disabling check for Plex updates.")
-
-                # Disable check for Plex updates
-                plexpy.CONFIG.MONITOR_PMS_UPDATES = 0
-                plexpy.initialize_scheduler()
-                plexpy.CONFIG.write()
-
-            return {}
-
-        updater_info = {}
-        for a in xml_head:
-            if a.getElementsByTagName('Release'):
-                release = a.getElementsByTagName('Release')
-                for item in release:
-                    updater_info = {'can_install': helpers.get_xml_attr(a, 'canInstall'),
-                                    'download_url': helpers.get_xml_attr(a, 'downloadURL'),
-                                    'version': helpers.get_xml_attr(item, 'version'),
-                                    'state': helpers.get_xml_attr(item, 'state'),
-                                    'changelog': helpers.get_xml_attr(item, 'fixed')
-                                    }
-
-        return updater_info
-
-    def set_server_version(self):
-        identity = self.get_server_identity()
-        version = identity.get('version', plexpy.CONFIG.PMS_VERSION)
-
-        plexpy.CONFIG.__setattr__('PMS_VERSION', version)
-        plexpy.CONFIG.write()
-
-    def get_server_update_channel(self):
-        if plexpy.CONFIG.PMS_UPDATE_CHANNEL == 'plex':
-            update_channel_value = self.get_server_pref('ButlerUpdateChannel')
-
-            if update_channel_value == '8':
-                return 'beta'
-            else:
-                return 'public'
-
-        return plexpy.CONFIG.PMS_UPDATE_CHANNEL
-
-    @staticmethod
-    def get_dynamic_range(stream):
-        extended_display_title = helpers.get_xml_attr(stream, 'extendedDisplayTitle')
-        bit_depth = helpers.cast_to_int(helpers.get_xml_attr(stream, 'bitDepth'))
-        color_trc = helpers.get_xml_attr(stream, 'colorTrc')
-        DOVI_profile = helpers.get_xml_attr(stream, 'DOVIProfile')
-
-        HDR = helpers.is_hdr(bit_depth, color_trc)
-        DV = bool(DOVI_profile)
-
-        if not HDR and not DV:
-            return 'SDR'
-
-        video_dynamic_range = []
-
-        # HDR details got introduced with PMS version 1.25.6.5545
-        if helpers.version_to_tuple(plexpy.CONFIG.PMS_VERSION) >= helpers.version_to_tuple('1.25.6.5545'):
-            if 'Dolby Vision' in extended_display_title or 'DoVi' in extended_display_title:
-                video_dynamic_range.append('Dolby Vision')
-            if 'HLG' in extended_display_title:
-                video_dynamic_range.append('HLG')
-            if 'HDR10' in extended_display_title:
-                video_dynamic_range.append('HDR10')
-            elif 'HDR' in extended_display_title:
-                video_dynamic_range.append('HDR')
-        else:
-            if DV:
-                video_dynamic_range.append('Dolby Vision')
-            elif HDR:
-                # Exact HDR version needs PMS version 1.25.6.5545 or newer
-                video_dynamic_range.append('HDR')
-
-        if not video_dynamic_range:
-            return 'SDR'
-        return '/'.join(video_dynamic_range)
-
-    def get_dvrs_list(self):
-        dvrs_xml = self.get_dvrs(output_format='xml')
-
-        try:
-            xml_head = dvrs_xml.getElementsByTagName('MediaContainer')
-        except Exception as e:
-            logger.warn("Tautulli Pmsconnect :: Unable to parse XML for get_dvrs_list: %s." % e)
-
-        dvrs_output = []
-
-        for a in xml_head:
-            dvrs = a.getElementsByTagName('Dvr')
-            for dvr in dvrs:
-                dvr_info = {
-                    'key': helpers.get_xml_attr(dvr, 'key'),
-                    'uuid': helpers.get_xml_attr(dvr, 'uuid'),
-                    'language': helpers.get_xml_attr(dvr, 'language'),
-                    'lineup_title': helpers.get_xml_attr(dvr, 'lineupTitle'),
-                    'lineup': helpers.get_xml_attr(dvr, 'lineup'),
-                    'country': helpers.get_xml_attr(dvr, 'country'),
-                    'refreshedAt': helpers.get_xml_attr(dvr, 'refreshedAt'),
-                    'epg_identifier': helpers.get_xml_attr(dvr, 'epgIdentifier')
-                }
-                dvrs_output.append(dvr_info)
-
-        return dvrs_output
+        return key_list
\ No newline at end of file
diff --git a/plexpy/request.py b/plexpy/request.py
index 82c8cee0..c61b1f6a 100644
--- a/plexpy/request.py
+++ b/plexpy/request.py
@@ -1,35 +1,32 @@
-# -*- coding: utf-8 -*-
-
-#  This file is part of Tautulli.
+#  This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
-import collections
-from xml.dom import minidom
-
-from bs4 import BeautifulSoup
-import requests
-from requests.packages import urllib3
-
-import plexpy
-from plexpy import lock
 from plexpy import logger
 
+from xml.dom import minidom
+from bs4 import BeautifulSoup
+
+import requests
+import feedparser
+import plexpy
+import plexpy.lock
+import collections
 
 # Dictionary with last request times, for rate limiting.
 last_requests = collections.defaultdict(int)
-fake_lock = lock.FakeLock()
+fake_lock = plexpy.lock.FakeLock()
 
 
 def request_response(url, method="get", auto_raise=True,
@@ -53,8 +50,6 @@ def request_response(url, method="get", auto_raise=True,
     # Disable verification of SSL certificates if requested. Note: this could
     # pose a security issue!
     kwargs["verify"] = bool(plexpy.CONFIG.VERIFY_SSL_CERT)
-    if not kwargs['verify']:
-        urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
     # Map method to the request.XXX method. This is a simple hack, but it
     # allows requests to apply more magic per method. See lib/requests/api.py.
@@ -124,90 +119,6 @@ def request_response(url, method="get", auto_raise=True,
         logger.error("Request raised exception: %s", e)
 
 
-def request_response2(url, method="get", auto_raise=True,
-                      whitelist_status_code=None, lock=fake_lock, **kwargs):
-    """
-    Convenient wrapper for `requests.get', which will capture the exceptions
-    and log them. On success, the Response object is returned. In case of a
-    exception, None is returned.
-
-    Additionally, there is support for rate limiting. To use this feature,
-    supply a tuple of (lock, request_limit). The lock is used to make sure no
-    other request with the same lock is executed. The request limit is the
-    minimal time between two requests (and so 1/request_limit is the number of
-    requests per seconds).
-    """
-
-    # Convert whitelist_status_code to a list if needed
-    if whitelist_status_code and type(whitelist_status_code) != list:
-        whitelist_status_code = [whitelist_status_code]
-
-    # Disable verification of SSL certificates if requested. Note: this could
-    # pose a security issue!
-    kwargs['verify'] = bool(plexpy.CONFIG.VERIFY_SSL_CERT)
-    if not kwargs['verify']:
-        urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
-
-    # Map method to the request.XXX method. This is a simple hack, but it
-    # allows requests to apply more magic per method. See lib/requests/api.py.
-    request_method = getattr(requests, method.lower())
-
-    response = None
-    err_msg = http_err = req_msg = None
-
-    try:
-        with lock:
-            response = request_method(url, **kwargs)
-
-        # If status code != OK, then raise exception, except if the status code
-        # is white listed.
-        if whitelist_status_code and auto_raise:
-            if response.status_code not in whitelist_status_code:
-                try:
-                    response.raise_for_status()
-                except:
-                    raise
-        elif auto_raise:
-            response.raise_for_status()
-
-    except requests.exceptions.SSLError as e:
-        if kwargs["verify"]:
-            err_msg = "Unable to connect to remote host because of a SSL error."
-        else:
-            err_msg = "Unable to connect to remote host because of a SSL error, " \
-                "with certificate verification turned off: {}".format(e)
-
-    except requests.ConnectionError:
-        err_msg = "Unable to connect to remote host. Check if the remote host is up and running."
-
-    except requests.Timeout:
-        err_msg = "Request to the remote host timed out."
-
-    except requests.HTTPError as e:
-        if e.response is not None:
-            if e.response.status_code >= 500:
-                http_err = "[{e.response.status_code}] {e.response.reason} (remote server error).".format(e=e)
-
-            elif e.response.status_code >= 400:
-                http_err = "[{e.response.status_code}] {e.response.reason} (local client error).".format(e=e)
-
-            else:
-                http_err = "Unknown HTTP error."
-
-            err_msg = "Request raised a HTTP error: {}".format(http_err)
-
-            if plexpy.VERBOSE:
-                req_msg = server_message(e.response, return_msg=True)
-
-        else:
-            err_msg = "Request raised a HTTP error: Unknown response."
-
-    except requests.RequestException as e:
-        err_msg = "Request raised an exception: {}".format(e)
-
-    return response, err_msg, req_msg
-
-
 def request_soup(url, **kwargs):
     """
     Wrapper for `request_response', which will return a BeatifulSoup object if
@@ -272,7 +183,18 @@ def request_content(url, **kwargs):
         return response.content
 
 
-def server_message(response, return_msg=False):
+def request_feed(url, **kwargs):
+    """
+    Wrapper for `request_response', which will return a feed object.
+    """
+
+    response = request_response(url, **kwargs)
+
+    if response is not None:
+        return feedparser.parse(response.content)
+
+
+def server_message(response):
     """
     Extract server message from response and log in to logger with DEBUG level.
 
@@ -284,40 +206,32 @@ def server_message(response, return_msg=False):
     message = None
 
     # First attempt is to 'read' the response as HTML
-    if "text/html" in response.headers.get("content-type", ""):
+    if "text/html" in response.headers.get("content-type"):
         try:
             soup = BeautifulSoup(response.content, "html5lib")
         except Exception:
-            soup = None
+            pass
 
-        if soup:
-            # Find body and cleanup common tags to grab content, which probably
-            # contains the message.
-            message = soup.find("body")
-            elements = ("header", "script", "footer", "nav", "input", "textarea")
+        # Find body and cleanup common tags to grab content, which probably
+        # contains the message.
+        message = soup.find("body")
+        elements = ("header", "script", "footer", "nav", "input", "textarea")
 
-            for element in elements:
-                for tag in soup.find_all(element):
-                    tag.replaceWith("")
+        for element in elements:
 
-            message = message.text if message else soup.text
-            message = message.strip()
+            for tag in soup.find_all(element):
+                tag.replaceWith("")
+
+        message = message.text if message else soup.text
+        message = message.strip()
 
     # Second attempt is to just take the response
     if message is None:
         message = response.content.strip()
 
     if message:
-        try:
-            message = message.decode('utf-8', errors='replace')
-        except (UnicodeDecodeError, AttributeError):
-            pass
-
         # Truncate message if it is too long.
         if len(message) > 150:
             message = message[:150] + "..."
 
-        if return_msg:
-            return message
-
         logger.debug("Server responded with message: %s", message)
diff --git a/plexpy/session.py b/plexpy/session.py
deleted file mode 100644
index 368e5da7..00000000
--- a/plexpy/session.py
+++ /dev/null
@@ -1,303 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#  This file is part of Tautulli.
-#
-#  Tautulli is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  Tautulli 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
-
-import cherrypy
-
-import plexpy
-from plexpy import common
-from plexpy import users
-
-
-def get_session_info():
-    """
-    Returns the session info for the user session
-    """
-    _session = {'user_id': None,
-                'user': None,
-                'user_group': 'admin',
-                'exp': None}
-
-    if isinstance(cherrypy.request.login, dict):
-        return cherrypy.request.login
-
-    return _session
-
-def get_session_user():
-    """
-    Returns the user_id for the current logged in session
-    """
-    _session = get_session_info()
-    return _session['user'] if _session['user_group'] == 'guest' and _session['user'] else None
-
-def get_session_user_id():
-    """
-    Returns the user_id for the current logged in session
-    """
-    _session = get_session_info()
-    return str(_session['user_id']) if _session['user_group'] == 'guest' and _session['user_id'] else None
-
-
-def get_session_user_token():
-    """
-    Returns the user's server_token for the current logged in session
-    """
-    _session = get_session_info()
-
-    if _session['user_group'] == 'guest' and _session['user_id']:
-        session_user_tokens = users.Users().get_tokens(_session['user_id'])
-        user_token = session_user_tokens['server_token']
-    else:
-        user_token = plexpy.CONFIG.PMS_TOKEN
-
-    return user_token
-
-
-def get_session_shared_libraries():
-    """
-    Returns a tuple of section_id for the current logged in session
-    """
-    user_details = users.Users().get_details(user_id=get_session_user_id())
-    return tuple(str(s) for s in user_details['shared_libraries'])
-
-def get_session_library_filters():
-    """
-    Returns a dict of library filters for the current logged in session
-
-        {'content_rating': ('PG', 'R')
-         'labels': ('label1', label2')},
-
-    """
-    filters = users.Users().get_filters(user_id=get_session_user_id())
-    return filters
-
-def get_session_library_filters_type(filters, media_type=None):
-    """
-    Returns a dict of library filters for the current logged in session
-
-        {'content_rating': ('PG', 'R')
-         'labels': ('label1', label2')},
-
-    """
-    if media_type == 'movie':
-        filters = filters.get('filter_movies', ())
-    elif media_type == 'show' or media_type == 'season' or media_type == 'episode':
-        filters = filters.get('filter_tv', ())
-    elif media_type == 'artist' or media_type == 'album' or media_type == 'track':
-        filters = filters.get('filter_music', ())
-    elif media_type == 'photo' or media_type == 'photo_album' or media_type == 'picture' or media_type == 'clip':
-        filters = filters.get('filter_photos', ())
-    else:
-        filters = filters.get('filter_all', ())
-
-    content_rating = filters.get('content_rating', ())
-    labels = filters.get('labels', ())
-
-    return content_rating, tuple(f.lower() for f in labels)
-
-def allow_session_user(user_id):
-    """
-    Returns True or False if the user_id is allowed for the current logged in session
-    """
-    session_user_id = get_session_user_id()
-    if session_user_id and str(user_id) != session_user_id:
-        return False
-    return True
-
-def allow_session_library(section_id):
-    """
-    Returns True or False if the section_id is allowed for the current logged in session
-    """
-    session_library_ids = get_session_shared_libraries()
-    if session_library_ids and str(section_id) not in session_library_ids:
-        return False
-    return True
-
-def friendly_name_to_username(list_of_dicts):
-    """
-    Reverts the friendly name back to the username of the current logged in session
-    """
-    session_user = get_session_user()
-    session_user_id = get_session_user_id()
-    
-    if session_user_id:
-        for d in list_of_dicts:
-            if 'friendly_name' in d and d['friendly_name'] != session_user:
-                d['friendly_name'] = session_user
-
-    return list_of_dicts
-
-def filter_session_info(list_of_dicts, filter_key=None):
-    """
-    Filters a list of dictionary items to only return the info for the current logged in session
-    """
-    session_user_id = get_session_user_id()
-    
-    if not session_user_id:
-        return list_of_dicts
-
-    session_library_ids = get_session_shared_libraries()
-    session_library_filters = get_session_library_filters()
-
-    list_of_dicts = friendly_name_to_username(list_of_dicts)
-
-    if filter_key == 'user_id' and session_user_id:
-        return [d for d in list_of_dicts if str(d.get('user_id','')) == session_user_id]
-
-    elif filter_key == 'section_id' and session_library_ids:
-        new_list_of_dicts = []
-
-        for d in list_of_dicts:
-            if str(d.get('section_id','')) not in session_library_ids:
-                continue
-
-            if d.get('media_type'):
-                f_content_rating, f_labels = get_session_library_filters_type(session_library_filters,
-                                                                              media_type=d['media_type'])
-
-                d_content_rating = d.get('content_rating', '')
-                d_labels = tuple(f.lower() for f in d.get('labels', ()))
-
-                keep = False
-                if not f_content_rating and not f_labels:
-                    keep = True
-                elif not f_content_rating and f_labels:
-                    if set(d_labels).intersection(set(f_labels)):
-                        keep = True
-                elif f_content_rating and not f_labels:
-                    if d_content_rating in f_content_rating:
-                        keep = True
-                elif f_content_rating and f_labels:
-                    if d_content_rating in f_content_rating or set(d_labels).intersection(set(f_labels)):
-                        keep = True
-
-            if keep:
-                new_list_of_dicts.append(d)
-
-        return new_list_of_dicts
-
-    return list_of_dicts
-
-def mask_session_info(list_of_dicts, mask_metadata=True):
-    """
-    Masks user info in a list of dictionary items to only display info for the current logged in session
-    """
-    session_user_id = get_session_user_id()
-
-    if not session_user_id:
-        return list_of_dicts
-
-    session_user = get_session_user()
-    session_library_ids = get_session_shared_libraries()
-    session_library_filters = get_session_library_filters()
-
-    keys_to_mask = {
-        'user_id': '',
-        'user': 'Plex User',
-        'username': 'Plex User',
-        'email': '',
-        'friendly_name': 'Plex User',
-        'user_thumb': common.DEFAULT_USER_THUMB,
-        'ip_address': 'N/A',
-        'ip_address_public': 'N/A',
-        'machine_id': '',
-        'player': 'Player'
-    }
-
-    metadata_to_mask = {
-        'actors': [],
-        'art': common.DEFAULT_ART,
-        'bif_thumb': '',
-        'content_rating': '',
-        'directors': [],
-        'edition_title': '',
-        'file': '',
-        'full_title': 'Plex Media',
-        'genres': [],
-        'grandparent_guid': '',
-        'grandparent_guids': [],
-        'grandparent_rating_key': '',
-        'grandparent_thumb': common.DEFAULT_POSTER_THUMB,
-        'grandparent_title': 'Plex Media',
-        'grandparent_year': '',
-        'guid': '',
-        'guids': [],
-        'labels': [],
-        'library_name': '',
-        'media_index': '0',
-        'original_title': 'Plex Media',
-        'originally_available_at': '',
-        'parent_guid': '',
-        'parent_guids': [],
-        'parent_media_index': '0',
-        'parent_rating_key': '',
-        'parent_thumb': common.DEFAULT_POSTER_THUMB,
-        'parent_title': 'Plex Media',
-        'parent_year': '',
-        'rating_key': '',
-        'section_id': '',
-        'shared_libraries': [],
-        'sort_title': 'Plex Media',
-        'studio': '',
-        'summary': '',
-        'tagline': '',
-        'thumb': common.DEFAULT_POSTER_THUMB,
-        'title': 'Plex Media',
-        'writers': [],
-        'year': '',
-
-        'last_played': 'Plex Media',
-    }
-
-    list_of_dicts = friendly_name_to_username(list_of_dicts)
-
-    for d in list_of_dicts:
-        if session_user_id and not (str(d.get('user_id')) == session_user_id or d.get('user') == session_user):
-            for k, v in keys_to_mask.items():
-                if k in d: d[k] = keys_to_mask[k]
-
-        if not mask_metadata:
-            continue
-
-        if str(d.get('section_id','')) not in session_library_ids:
-            for k, v in metadata_to_mask.items():
-                if k in d: d[k] = metadata_to_mask[k]
-            continue
-
-        media_type = d.get('media_type')
-        if media_type:
-            f_content_rating, f_labels = get_session_library_filters_type(session_library_filters,
-                                                                      media_type=d['media_type'])
-
-            d_content_rating = d.get('content_rating', '')
-            d_labels = tuple(f.lower() for f in d.get('labels', ()))
-
-            if not f_content_rating and not f_labels:
-                continue
-            elif not f_content_rating and f_labels:
-                if set(d_labels).intersection(set(f_labels)):
-                    continue
-            elif f_content_rating and not f_labels:
-                if d_content_rating in f_content_rating:
-                    continue
-            elif f_content_rating and f_labels:
-                if d_content_rating in f_content_rating or set(d_labels).intersection(set(f_labels)):
-                    continue
-
-            for k, v in metadata_to_mask.items():
-                if k in d: d[k] = metadata_to_mask[k]
-
-    return list_of_dicts
\ No newline at end of file
diff --git a/plexpy/users.py b/plexpy/users.py
index a62e49fd..1983a290 100644
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -1,101 +1,19 @@
-# -*- coding: utf-8 -*-
-
-# This file is part of Tautulli.
+# This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
-from urllib.parse import parse_qsl
-
-import arrow
-import httpagentparser
-
-import plexpy
-from plexpy import common
-from plexpy import database
-from plexpy import datatables
-from plexpy import helpers
-from plexpy import libraries
-from plexpy import logger
-from plexpy import plextv
-from plexpy import session
-
-
-def refresh_users():
-    logger.info("Tautulli Users :: Requesting users list refresh...")
-    result = plextv.PlexTV().get_full_users_list()
-
-    server_id = plexpy.CONFIG.PMS_IDENTIFIER
-    if not server_id:
-        logger.error("Tautulli Users :: No PMS identifier, cannot refresh users. Verify server in settings.")
-        return
-
-    if result:
-        monitor_db = database.MonitorDatabase()
-
-        # Keep track of user_id to update is_active status
-        user_ids = [0]  # Local user always considered active
-        new_users = []
-
-        for item in result:
-            if item.get('shared_libraries'):
-                item['shared_libraries'] = ';'.join(item['shared_libraries'])
-                # Only append user if libraries are shared
-                user_ids.append(helpers.cast_to_int(item['user_id']))
-            elif item.get('server_token'):
-                libs = libraries.Libraries().get_sections()
-                item['shared_libraries'] = ';'.join([str(l['section_id']) for l in libs])
-                # Only append user if libraries are shared
-                user_ids.append(helpers.cast_to_int(item['user_id']))
-
-            keys_dict = {"user_id": item.pop('user_id')}
-
-            # Check if we've set a custom avatar if so don't overwrite it.
-            if keys_dict['user_id']:
-                avatar_urls = monitor_db.select("SELECT thumb, custom_avatar_url "
-                                                "FROM users WHERE user_id = ?",
-                                                [keys_dict['user_id']])
-                if avatar_urls:
-                    if not avatar_urls[0]['custom_avatar_url'] or \
-                            avatar_urls[0]['custom_avatar_url'] == avatar_urls[0]['thumb']:
-                        item['custom_avatar_url'] = item['thumb']
-                else:
-                    item['custom_avatar_url'] = item['thumb']
-
-            # Check if title is the same as the username
-            if item['title'] == item['username']:
-                item['title'] = None
-
-            # Check if username is blank (Managed Users)
-            if not item['username']:
-                item['username'] = item['title']
-
-            result = monitor_db.upsert('users', key_dict=keys_dict, value_dict=item)
-
-            if result == 'insert':
-                new_users.append(item['username'])
-
-        query = "UPDATE users SET is_active = 0 WHERE user_id NOT IN ({})".format(", ".join(["?"] * len(user_ids)))
-        monitor_db.action(query=query, args=user_ids)
-
-        # Add new users to logger username filter
-        logger.filter_usernames(new_users)
-
-        logger.info("Tautulli Users :: Users list refreshed.")
-        return True
-    else:
-        logger.warn("Tautulli Users :: Unable to refresh users list.")
-        return False
+from plexpy import logger, datatables, common, database, helpers
 
 
 class Users(object):
@@ -103,69 +21,34 @@ class Users(object):
     def __init__(self):
         pass
 
-    def get_datatables_list(self, kwargs=None, grouping=None):
-        default_return = {'recordsFiltered': 0,
-                          'recordsTotal': 0,
-                          'draw': 0,
-                          'data': []}
-
+    def get_user_list(self, kwargs=None):
         data_tables = datatables.DataTables()
 
-        custom_where = [['users.deleted_user', 0]]
-
-        if grouping is None:
-            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
-
-        if session.get_session_user_id():
-            custom_where.append(['users.user_id', session.get_session_user_id()])
-
-        if kwargs.get('user_id'):
-            custom_where.append(['users.user_id', kwargs.get('user_id')])
-
-        group_by = 'session_history.reference_id' if grouping else 'session_history.id'
-
-        columns = ["users.id AS row_id",
-                   "users.user_id",
-                   "users.username",
-                   "(CASE WHEN users.friendly_name IS NULL OR TRIM(users.friendly_name) = '' \
-                    THEN users.username ELSE users.friendly_name END) AS friendly_name",
-                   "users.title",
-                   "users.email",
-                   "users.thumb AS user_thumb",
-                   "users.custom_avatar_url AS custom_thumb",
-                   "COUNT(DISTINCT %s) AS plays" % group_by,
-                   "SUM(CASE WHEN session_history.stopped > 0 THEN (session_history.stopped - session_history.started) \
-                    ELSE 0 END) - SUM(CASE WHEN session_history.paused_counter IS NULL THEN 0 ELSE \
-                    session_history.paused_counter END) AS duration",
-                   "MAX(session_history.started) AS last_seen",
-                   "MAX(session_history.id) AS history_row_id",
-                   "session_history_metadata.full_title AS last_played",
-                   "session_history.ip_address",
-                   "session_history.platform",
-                   "session_history.player",
-                   "session_history.rating_key",
-                   "session_history_metadata.media_type",
-                   "session_history_metadata.thumb",
-                   "session_history_metadata.parent_thumb",
-                   "session_history_metadata.grandparent_thumb",
-                   "session_history_metadata.parent_title",
-                   "session_history_metadata.year",
-                   "session_history_metadata.media_index",
-                   "session_history_metadata.parent_media_index",
-                   "session_history_metadata.live",
-                   "session_history_metadata.added_at",
-                   "session_history_metadata.originally_available_at",
-                   "session_history_metadata.guid",
-                   "session_history_media_info.transcode_decision",
-                   "users.do_notify AS do_notify",
-                   "users.keep_history AS keep_history",
-                   "users.allow_guest AS allow_guest",
-                   "users.is_active AS is_active"
+        columns = ['session_history.id',
+                   'users.user_id as user_id',
+                   'users.custom_avatar_url as user_thumb',
+                   '(case when users.friendly_name is null then users.username else \
+                    users.friendly_name end) as friendly_name',
+                   'MAX(session_history.started) as last_seen',
+                   'session_history.ip_address as ip_address',
+                   'COUNT(session_history.id) as plays',
+                   'session_history.platform as platform',
+                   'session_history.player as player',
+                   'session_history_metadata.full_title as last_watched',
+                   'session_history_metadata.thumb',
+                   'session_history_metadata.parent_thumb',
+                   'session_history_metadata.grandparent_thumb',
+                   'session_history_metadata.media_type',
+                   'session_history.rating_key as rating_key',
+                   'session_history_media_info.video_decision',
+                   'users.username as user',
+                   'users.do_notify as do_notify',
+                   'users.keep_history as keep_history'
                    ]
         try:
             query = data_tables.ssp_query(table_name='users',
                                           columns=columns,
-                                          custom_where=custom_where,
+                                          custom_where=[],
                                           group_by=['users.user_id'],
                                           join_types=['LEFT OUTER JOIN',
                                                       'LEFT OUTER JOIN',
@@ -177,118 +60,94 @@ class Users(object):
                                                       ['session_history.id', 'session_history_metadata.id'],
                                                       ['session_history.id', 'session_history_media_info.id']],
                                           kwargs=kwargs)
-        except Exception as e:
-            logger.warn("Tautulli Users :: Unable to execute database query for get_list: %s." % e)
-            return default_return
+        except:
+            logger.warn("Unable to execute database query.")
+            return {'recordsFiltered': 0,
+                    'recordsTotal': 0,
+                    'draw': 0,
+                    'data': 'null',
+                    'error': 'Unable to execute database query.'}
 
         users = query['result']
 
         rows = []
         for item in users:
-            if item['media_type'] == 'episode' and item['parent_thumb']:
-                thumb = item['parent_thumb']
-            elif item['media_type'] == 'episode':
-                thumb = item['grandparent_thumb']
+            if item["media_type"] == 'episode' and item["parent_thumb"]:
+                thumb = item["parent_thumb"]
+            elif item["media_type"] == 'episode':
+                thumb = item["grandparent_thumb"]
             else:
-                thumb = item['thumb']
+                thumb = item["thumb"]
 
-            if item['custom_thumb'] and item['custom_thumb'] != item['user_thumb']:
-                user_thumb = item['custom_thumb']
-            elif item['user_thumb']:
-                user_thumb = item['user_thumb']
-            else:
+            if not item['user_thumb'] or item['user_thumb'] == '':
                 user_thumb = common.DEFAULT_USER_THUMB
+            else:
+                user_thumb = item['user_thumb']
 
             # Rename Mystery platform names
-            platform = common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform'])
+            platform_names = {'Mystery 3': 'Playstation 3',
+                              'Mystery 4': 'Playstation 4',
+                              'Mystery 5': 'Xbox 360'}
+            platform = platform_names.get(item["platform"], item["platform"])
 
-            row = {'row_id': item['row_id'],
-                   'user_id': item['user_id'],
-                   'username': item['username'],
-                   'friendly_name': item['friendly_name'],
-                   'title': item['title'],
-                   'email': item['email'],
-                   'user_thumb': user_thumb,
-                   'plays': item['plays'],
-                   'duration': item['duration'],
-                   'last_seen': item['last_seen'],
-                   'last_played': item['last_played'],
-                   'history_row_id': item['history_row_id'],
-                   'ip_address': item['ip_address'],
-                   'platform': platform,
-                   'player': item['player'],
-                   'rating_key': item['rating_key'],
-                   'media_type': item['media_type'],
-                   'thumb': thumb,
-                   'parent_title': item['parent_title'],
-                   'year': item['year'],
-                   'media_index': item['media_index'],
-                   'parent_media_index': item['parent_media_index'],
-                   'live': item['live'],
-                   'originally_available_at': item['originally_available_at'],
-                   'guid': item['guid'],
-                   'transcode_decision': item['transcode_decision'],
-                   'do_notify': item['do_notify'],
-                   'keep_history': item['keep_history'],
-                   'allow_guest': item['allow_guest'],
-                   'is_active': item['is_active']
+            row = {"id": item['id'],
+                   "plays": item['plays'],
+                   "last_seen": item['last_seen'],
+                   "friendly_name": item['friendly_name'],
+                   "ip_address": item['ip_address'],
+                   "platform": platform,
+                   "player": item['player'],
+                   "last_watched": item['last_watched'],
+                   "thumb": thumb,
+                   "media_type": item['media_type'],
+                   "rating_key": item['rating_key'],
+                   "video_decision": item['video_decision'],
+                   "user_thumb": user_thumb,
+                   "user": item["user"],
+                   "user_id": item['user_id'],
+                   "do_notify": helpers.checked(item['do_notify']),
+                   "keep_history": helpers.checked(item['keep_history'])
                    }
 
             rows.append(row)
 
         dict = {'recordsFiltered': query['filteredCount'],
                 'recordsTotal': query['totalCount'],
-                'data': session.friendly_name_to_username(rows),
+                'data': rows,
                 'draw': query['draw']
-                }
+        }
 
         return dict
 
-    def get_datatables_unique_ips(self, user_id=None, kwargs=None):
-        default_return = {'recordsFiltered': 0,
-                          'recordsTotal': 0,
-                          'draw': 0,
-                          'data': []}
-
-        if not session.allow_session_user(user_id):
-            return default_return
-
+    def get_user_unique_ips(self, kwargs=None, custom_where=None):
         data_tables = datatables.DataTables()
 
-        custom_where = ['users.user_id', user_id]
+        # Change custom_where column name due to ambiguous column name after JOIN
+        custom_where[0][0] = 'custom_user_id' if custom_where[0][0] == 'user_id' else custom_where[0][0]
 
-        columns = ["session_history.id AS history_row_id",
-                   "MIN(session_history.started) AS first_seen",
-                   "MAX(session_history.started) AS last_seen",
-                   "session_history.ip_address",
-                   "COUNT(session_history.id) AS play_count",
-                   "session_history.platform",
-                   "session_history.player",
-                   "session_history.rating_key",
-                   "session_history_metadata.full_title AS last_played",
-                   "session_history_metadata.thumb",
-                   "session_history_metadata.parent_thumb",
-                   "session_history_metadata.grandparent_thumb",
-                   "session_history_metadata.media_type",
-                   "session_history_metadata.parent_title",
-                   "session_history_metadata.year",
-                   "session_history_metadata.media_index",
-                   "session_history_metadata.parent_media_index",
-                   "session_history_metadata.live",
-                   "session_history_metadata.added_at",
-                   "session_history_metadata.originally_available_at",
-                   "session_history_metadata.guid",
-                   "session_history_media_info.transcode_decision",
-                   "session_history.user",
-                   "session_history.user_id as custom_user_id",
-                   "(CASE WHEN users.friendly_name IS NULL OR TRIM(users.friendly_name) = '' \
-                    THEN users.username ELSE users.friendly_name END) AS friendly_name"
+        columns = ['session_history.id',
+                   'session_history.started as last_seen',
+                   'session_history.ip_address as ip_address',
+                   'COUNT(session_history.id) as play_count',
+                   'session_history.platform as platform',
+                   'session_history.player as player',
+                   'session_history_metadata.full_title as last_watched',
+                   'session_history_metadata.thumb',
+                   'session_history_metadata.parent_thumb',
+                   'session_history_metadata.grandparent_thumb',
+                   'session_history_metadata.media_type',
+                   'session_history.rating_key as rating_key',
+                   'session_history_media_info.video_decision',
+                   'session_history.user as user',
+                   'session_history.user_id as custom_user_id',
+                   '(case when users.friendly_name is null then users.username else \
+                    users.friendly_name end) as friendly_name'
                    ]
 
         try:
             query = data_tables.ssp_query(table_name='session_history',
                                           columns=columns,
-                                          custom_where=[custom_where],
+                                          custom_where=custom_where,
                                           group_by=['ip_address'],
                                           join_types=['JOIN',
                                                       'JOIN',
@@ -300,9 +159,13 @@ class Users(object):
                                                       ['session_history.id', 'session_history_metadata.id'],
                                                       ['session_history.id', 'session_history_media_info.id']],
                                           kwargs=kwargs)
-        except Exception as e:
-            logger.warn("Tautulli Users :: Unable to execute database query for get_unique_ips: %s." % e)
-            return default_return
+        except:
+            logger.warn("Unable to execute database query.")
+            return {'recordsFiltered': 0,
+                    'recordsTotal': 0,
+                    'draw': 0,
+                    'data': 'null',
+                    'error': 'Unable to execute database query.'}
 
         results = query['result']
 
@@ -316,235 +179,320 @@ class Users(object):
                 thumb = item["thumb"]
 
             # Rename Mystery platform names
-            platform = common.PLATFORM_NAME_OVERRIDES.get(item["platform"], item["platform"])
+            platform_names = {'Mystery 3': 'Playstation 3',
+                              'Mystery 4': 'Playstation 4',
+                              'Mystery 5': 'Xbox 360'}
+            platform = platform_names.get(item["platform"], item["platform"])
 
-            row = {'history_row_id': item['history_row_id'],
-                   'last_seen': item['last_seen'],
-                   'first_seen': item['first_seen'],
-                   'ip_address': item['ip_address'],
-                   'play_count': item['play_count'],
-                   'platform': platform,
-                   'player': item['player'],
-                   'last_played': item['last_played'],
-                   'rating_key': item['rating_key'],
-                   'thumb': thumb,
-                   'media_type': item['media_type'],
-                   'parent_title': item['parent_title'],
-                   'year': item['year'],
-                   'media_index': item['media_index'],
-                   'parent_media_index': item['parent_media_index'],
-                   'live': item['live'],
-                   'originally_available_at': item['originally_available_at'],
-                   'guid': item['guid'],
-                   'transcode_decision': item['transcode_decision'],
-                   'friendly_name': item['friendly_name'],
-                   'user_id': item['custom_user_id']
+            row = {"id": item['id'],
+                   "last_seen": item['last_seen'],
+                   "ip_address": item['ip_address'],
+                   "play_count": item['play_count'],
+                   "platform": platform,
+                   "player": item['player'],
+                   "last_watched": item['last_watched'],
+                   "thumb": thumb,
+                   "media_type": item['media_type'],
+                   "rating_key": item['rating_key'],
+                   "video_decision": item['video_decision'],
+                   "friendly_name": item['friendly_name']
                    }
 
             rows.append(row)
 
         dict = {'recordsFiltered': query['filteredCount'],
                 'recordsTotal': query['totalCount'],
-                'data': session.friendly_name_to_username(rows),
+                'data': rows,
                 'draw': query['draw']
-                }
+        }
 
         return dict
 
-    def set_config(self, user_id=None, friendly_name='', custom_thumb='', do_notify=1, keep_history=1, allow_guest=1):
-        if str(user_id).isdigit():
-            monitor_db = database.MonitorDatabase()
-
-            user = monitor_db.select_single('SELECT username FROM users WHERE user_id = ?', [user_id])
-            if user.get('username') == friendly_name:
+    # TODO: The getter and setter for this needs to become a config getter/setter for more than just friendlyname
+    def set_user_friendly_name(self, user=None, user_id=None, friendly_name=None, do_notify=0, keep_history=1):
+        if user_id:
+            if friendly_name.strip() == '':
                 friendly_name = None
 
-            key_dict = {'user_id': user_id}
-            value_dict = {'friendly_name': friendly_name,
-                          'custom_avatar_url': custom_thumb,
-                          'do_notify': do_notify,
-                          'keep_history': keep_history,
-                          'allow_guest': allow_guest
-                          }
+            monitor_db = database.MonitorDatabase()
+
+            control_value_dict = {"user_id": user_id}
+            new_value_dict = {"friendly_name": friendly_name,
+                              "do_notify": do_notify,
+                              "keep_history": keep_history}
             try:
-                monitor_db.upsert('users', value_dict, key_dict)
-            except Exception as e:
-                logger.warn("Tautulli Users :: Unable to execute database query for set_config: %s." % e)
+                monitor_db.upsert('users', new_value_dict, control_value_dict)
+            except Exception, e:
+                logger.debug(u"Uncaught exception %s" % e)
+        if user:
+            if friendly_name.strip() == '':
+                friendly_name = None
 
-    def get_details(self, user_id=None, user=None, email=None, include_last_seen=False):
-        default_return = {'row_id': 0,
-                          'user_id': 0,
-                          'username': 'Local',
-                          'friendly_name': 'Local',
-                          'user_thumb': common.DEFAULT_USER_THUMB,
-                          'email': '',
-                          'is_active': 1,
-                          'is_admin': '',
-                          'is_home_user': 0,
-                          'is_allow_sync': 0,
-                          'is_restricted': 0,
-                          'do_notify': 0,
-                          'keep_history': 1,
-                          'allow_guest': 0,
-                          'deleted_user': 0,
-                          'shared_libraries': (),
-                          'last_seen': None
-                          }
+            monitor_db = database.MonitorDatabase()
 
-        if user_id in (None, '') and not user and not email:
-            return default_return
+            control_value_dict = {"username": user}
+            new_value_dict = {"friendly_name": friendly_name,
+                              "do_notify": do_notify,
+                              "keep_history": keep_history}
+            try:
+                monitor_db.upsert('users', new_value_dict, control_value_dict)
+            except Exception, e:
+                logger.debug(u"Uncaught exception %s" % e)
 
-        user_details = self.get_user_details(user_id=user_id, user=user, email=email,
-                                             include_last_seen=include_last_seen)
+    def set_user_profile_url(self, user=None, user_id=None, profile_url=None):
+        if user_id:
+            if profile_url.strip() == '':
+                profile_url = None
 
-        if user_details:
-            return user_details
+            monitor_db = database.MonitorDatabase()
 
-        else:
-            logger.warn("Tautulli Users :: Unable to retrieve user %s from database. Requesting user list refresh."
-                        % user_id if user_id else user)
-            # Let's first refresh the user list to make sure the user isn't newly added and not in the db yet
-            refresh_users()
+            control_value_dict = {"user_id": user_id}
+            new_value_dict = {"custom_avatar_url": profile_url}
+            try:
+                monitor_db.upsert('users', new_value_dict, control_value_dict)
+            except Exception, e:
+                logger.debug(u"Uncaught exception %s" % e)
+        if user:
+            if profile_url.strip() == '':
+                profile_url = None
 
-            user_details = self.get_user_details(user_id=user_id, user=user, email=email,
-                                                 include_last_seen=include_last_seen)
+            monitor_db = database.MonitorDatabase()
 
-            if user_details:
-                return user_details
+            control_value_dict = {"username": user}
+            new_value_dict = {"custom_avatar_url": profile_url}
+            try:
+                monitor_db.upsert('users', new_value_dict, control_value_dict)
+            except Exception, e:
+                logger.debug(u"Uncaught exception %s" % e)
 
+    def get_user_friendly_name(self, user=None, user_id=None):
+        if user_id:
+            monitor_db = database.MonitorDatabase()
+            query = 'select username, ' \
+                    '(CASE WHEN friendly_name IS NULL THEN username ELSE friendly_name END),' \
+                    'do_notify, keep_history, custom_avatar_url as thumb ' \
+                    'FROM users WHERE user_id = ?'
+            result = monitor_db.select(query, args=[user_id])
+            if result:
+                user_detail = {'user_id': user_id,
+                               'user': result[0][0],
+                               'friendly_name': result[0][1],
+                               'thumb': result[0][4],
+                               'do_notify': helpers.checked(result[0][2]),
+                               'keep_history': helpers.checked(result[0][3])
+                               }
+                return user_detail
+            else:
+                user_detail = {'user_id': user_id,
+                               'user': '',
+                               'friendly_name': '',
+                               'do_notify': '',
+                               'thumb': '',
+                               'keep_history': ''}
+                return user_detail
+        elif user:
+            monitor_db = database.MonitorDatabase()
+            query = 'select user_id, ' \
+                    '(CASE WHEN friendly_name IS NULL THEN username ELSE friendly_name END),' \
+                    'do_notify, keep_history, custom_avatar_url as thumb  ' \
+                    'FROM users WHERE username = ?'
+            result = monitor_db.select(query, args=[user])
+            if result:
+                user_detail = {'user_id': result[0][0],
+                               'user': user,
+                               'friendly_name': result[0][1],
+                               'thumb': result[0][4],
+                               'do_notify': helpers.checked(result[0][2]),
+                               'keep_history': helpers.checked(result[0][3])}
+                return user_detail
+            else:
+                user_detail = {'user_id': None,
+                               'user': user,
+                               'friendly_name': '',
+                               'do_notify': '',
+                               'thumb': '',
+                               'keep_history': ''}
+                return user_detail
+
+        return None
+
+    def get_user_id(self, user=None):
+        if user:
+            try:
+                monitor_db = database.MonitorDatabase()
+                query = 'select user_id FROM users WHERE username = ?'
+                result = monitor_db.select_single(query, args=[user])
+                if result:
+                    return result
+                else:
+                    return None
+            except:
+                return None
+
+        return None
+
+    def get_user_details(self, user=None, user_id=None):
+        from plexpy import plextv
+
+        monitor_db = database.MonitorDatabase()
+
+        if user:
+            query = 'SELECT user_id, username, friendly_name, email, ' \
+                    'custom_avatar_url as thumb, is_home_user, is_allow_sync, is_restricted, do_notify ' \
+                    'FROM users ' \
+                    'WHERE username = ? ' \
+                    'UNION ALL ' \
+                    'SELECT null, user, null, null, null, null, null, null, null ' \
+                    'FROM session_history ' \
+                    'WHERE user = ? ' \
+                    'GROUP BY user ' \
+                    'LIMIT 1'
+            result = monitor_db.select(query, args=[user, user])
+        elif user_id:
+            query = 'SELECT user_id, username, friendly_name, email, ' \
+                    'custom_avatar_url as thumb, is_home_user, is_allow_sync, is_restricted, do_notify ' \
+                    'FROM users ' \
+                    'WHERE user_id = ? ' \
+                    'UNION ALL ' \
+                    'SELECT user_id, user, null, null, null, null, null, null, null ' \
+                    'FROM session_history ' \
+                    'WHERE user_id = ? ' \
+                    'GROUP BY user ' \
+                    'LIMIT 1'
+            result = monitor_db.select(query, args=[user_id, user_id])
+        else:
+            result = None
+
+        if result:
+            user_details = {}
+            for item in result:
+                if not item['friendly_name']:
+                    friendly_name = item['username']
+                else:
+                    friendly_name = item['friendly_name']
+                if not item['thumb'] or item['thumb'] == '':
+                    user_thumb = common.DEFAULT_USER_THUMB
+                else:
+                    user_thumb = item['thumb']
+
+                user_details = {"user_id": item['user_id'],
+                                "username": item['username'],
+                                "friendly_name": friendly_name,
+                                "email": item['email'],
+                                "thumb": user_thumb,
+                                "is_home_user": item['is_home_user'],
+                                "is_allow_sync": item['is_allow_sync'],
+                                "is_restricted": item['is_restricted'],
+                                "do_notify": item['do_notify']
+                                }
+            return user_details
+        else:
+            logger.warn(u"PlexPy :: Unable to retrieve user from local database. Requesting user list refresh.")
+            # Let's first refresh the user list to make sure the user isn't newly added and not in the db yet
+            if user:
+                # Refresh users
+                plextv.refresh_users()
+                query = 'SELECT user_id, username, friendly_name, email, ' \
+                        'custom_avatar_url as thumb, is_home_user, is_allow_sync, is_restricted, do_notify ' \
+                        'FROM users ' \
+                        'WHERE username = ? ' \
+                        'UNION ALL ' \
+                        'SELECT null, user, null, null, null, null, null, null, null ' \
+                        'FROM session_history ' \
+                        'WHERE user = ? ' \
+                        'GROUP BY user ' \
+                        'LIMIT 1'
+                result = monitor_db.select(query, args=[user, user])
+            elif user_id:
+                # Refresh users
+                plextv.refresh_users()
+                query = 'SELECT user_id, username, friendly_name, email, ' \
+                        'custom_avatar_url as thumb, is_home_user, is_allow_sync, is_restricted, do_notify ' \
+                        'FROM users ' \
+                        'WHERE user_id = ? ' \
+                        'UNION ALL ' \
+                        'SELECT user_id, user, null, null, null, null, null, null, null ' \
+                        'FROM session_history ' \
+                        'WHERE user_id = ? ' \
+                        'GROUP BY user ' \
+                        'LIMIT 1'
+                result = monitor_db.select(query, args=[user_id, user_id])
+            else:
+                result = None
+
+            if result:
+                user_details = {}
+                for item in result:
+                    if not item['friendly_name']:
+                        friendly_name = item['username']
+                    else:
+                        friendly_name = item['friendly_name']
+                    if not item['thumb'] or item['thumb'] == '':
+                        user_thumb = common.DEFAULT_USER_THUMB
+                    else:
+                        user_thumb = item['thumb']
+
+                    user_details = {"user_id": item['user_id'],
+                                    "username": item['username'],
+                                    "friendly_name": friendly_name,
+                                    "email": item['email'],
+                                    "thumb": user_thumb,
+                                    "is_home_user": item['is_home_user'],
+                                    "is_allow_sync": item['is_allow_sync'],
+                                    "is_restricted": item['is_restricted'],
+                                    "do_notify": item['do_notify']
+                                    }
+                return user_details
             else:
-                logger.warn("Tautulli Users :: Unable to retrieve user %s from database. Returning 'Local' user."
-                            % user_id if user_id else user)
                 # If there is no user data we must return something
                 # Use "Local" user to retain compatibility with PlexWatch database value
-                return default_return
-
-    def get_user_details(self, user_id=None, user=None, email=None, include_last_seen=False):
-        last_seen = 'NULL'
-        join = ''
-        if include_last_seen:
-            last_seen = "MAX(session_history.started)"
-            join = "LEFT OUTER JOIN session_history ON users.user_id = session_history.user_id"
-
-        monitor_db = database.MonitorDatabase()
-
-        try:
-            if str(user_id).isdigit():
-                where = "users.user_id = ?"
-                args = [user_id]
-            elif user:
-                where = "users.username = ?"
-                args = [user]
-            elif email:
-                where = "users.email = ?"
-                args = [email]
-            else:
-                raise Exception("Missing user_id, username, or email")
-
-            query = "SELECT users.id AS row_id, users.user_id, username, friendly_name, " \
-                    "thumb AS user_thumb, custom_avatar_url AS custom_thumb, " \
-                    "email, is_active, is_admin, is_home_user, is_allow_sync, is_restricted, " \
-                    "do_notify, keep_history, deleted_user, " \
-                    "allow_guest, shared_libraries, %s AS last_seen " \
-                    "FROM users %s " \
-                    "WHERE %s COLLATE NOCASE" % (last_seen, join, where)
-            result = monitor_db.select(query, args=args)
-        except Exception as e:
-            logger.warn("Tautulli Users :: Unable to execute database query for get_user_details: %s." % e)
-            result = []
-
-        user_details = {}
-        if result:
-            for item in result:
-                if session.get_session_user_id():
-                    friendly_name = session.get_session_user()
-                elif item['friendly_name']:
-                    friendly_name = item['friendly_name']
-                else:
-                    friendly_name = item['username']
-
-                if item['custom_thumb'] and item['custom_thumb'] != item['user_thumb']:
-                    user_thumb = item['custom_thumb']
-                elif item['user_thumb']:
-                    user_thumb = item['user_thumb']
-                else:
-                    user_thumb = common.DEFAULT_USER_THUMB
-
-                shared_libraries = tuple(item['shared_libraries'].split(';')) if item['shared_libraries'] else ()
-
-                user_details = {'row_id': item['row_id'],
-                                'user_id': item['user_id'],
-                                'username': item['username'],
-                                'friendly_name': friendly_name,
-                                'user_thumb': user_thumb,
-                                'email': item['email'],
-                                'is_active': item['is_active'],
-                                'is_admin': item['is_admin'],
-                                'is_home_user': item['is_home_user'],
-                                'is_allow_sync': item['is_allow_sync'],
-                                'is_restricted': item['is_restricted'],
-                                'do_notify': item['do_notify'],
-                                'keep_history': item['keep_history'],
-                                'deleted_user': item['deleted_user'],
-                                'allow_guest': item['allow_guest'],
-                                'shared_libraries': shared_libraries,
-                                'last_seen': item['last_seen']
-                                }
-        return user_details
-
-    def get_watch_time_stats(self, user_id=None, grouping=None, query_days=None):
-        if not session.allow_session_user(user_id):
-            return []
-
-        if grouping is None:
-            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
-
-        if query_days and query_days is not None:
-            query_days = map(helpers.cast_to_int, str(query_days).split(','))
-        else:
-            query_days = [1, 7, 30, 0]
-
-        timestamp = helpers.timestamp()
+                return {"user_id": None,
+                        "username": 'Local',
+                        "friendly_name": 'Local',
+                        "email": '',
+                        "thumb": '',
+                        "is_home_user": 0,
+                        "is_allow_sync": 0,
+                        "is_restricted": 0,
+                        "do_notify": 0
+                        }
 
+    def get_user_watch_time_stats(self, user=None, user_id=None):
         monitor_db = database.MonitorDatabase()
 
+        time_queries = [1, 7, 30, 0]
         user_watch_time_stats = []
 
-        group_by = 'reference_id' if grouping else 'id'
-
-        for days in query_days:
-            timestamp_query = timestamp - days * 24 * 60 * 60
-
-            try:
-                if days > 0:
-                    if str(user_id).isdigit():
-                        query = "SELECT (SUM(stopped - started) - " \
-                                "   SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END)) AS total_time, " \
-                                "COUNT(DISTINCT %s) AS total_plays " \
-                                "FROM session_history " \
-                                "WHERE stopped >= %s " \
-                                "AND user_id = ? " % (group_by, timestamp_query)
-                        result = monitor_db.select(query, args=[user_id])
-                    else:
-                        result = []
-                else:
-                    if str(user_id).isdigit():
-                        query = "SELECT (SUM(stopped - started) - " \
-                                "   SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END)) AS total_time, " \
-                                "COUNT(DISTINCT %s) AS total_plays " \
-                                "FROM session_history " \
-                                "WHERE user_id = ? " % group_by
-                        result = monitor_db.select(query, args=[user_id])
-                    else:
-                        result = []
-            except Exception as e:
-                logger.warn("Tautulli Users :: Unable to execute database query for get_watch_time_stats: %s." % e)
-                result = []
+        for days in time_queries:
+            if days > 0:
+                if user_id:
+                    query = 'SELECT (SUM(stopped - started) - ' \
+                            'SUM(CASE WHEN paused_counter is null THEN 0 ELSE paused_counter END)) as total_time, ' \
+                            'COUNT(id) AS total_plays ' \
+                            'FROM session_history ' \
+                            'WHERE datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") ' \
+                            'AND user_id = ?' % days
+                    result = monitor_db.select(query, args=[user_id])
+                elif user:
+                    query = 'SELECT (SUM(stopped - started) - ' \
+                            'SUM(CASE WHEN paused_counter is null THEN 0 ELSE paused_counter END)) as total_time, ' \
+                            'COUNT(id) AS total_plays ' \
+                            'FROM session_history ' \
+                            'WHERE datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") ' \
+                            'AND user = ?' % days
+                    result = monitor_db.select(query, args=[user])
+            else:
+                query = 'SELECT (SUM(stopped - started) - ' \
+                        'SUM(CASE WHEN paused_counter is null THEN 0 ELSE paused_counter END)) as total_time, ' \
+                        'COUNT(id) AS total_plays ' \
+                        'FROM session_history ' \
+                        'WHERE user = ?'
+                result = monitor_db.select(query, args=[user])
 
             for item in result:
-                if item['total_time']:
-                    total_time = item['total_time']
-                    total_plays = item['total_plays']
+                if item[0]:
+                    total_time = item[0]
+                    total_plays = item[1]
                 else:
                     total_time = 0
                     total_plays = 0
@@ -558,466 +506,44 @@ class Users(object):
 
         return user_watch_time_stats
 
-    def get_player_stats(self, user_id=None, grouping=None):
-        if not session.allow_session_user(user_id):
-            return []
-
-        if grouping is None:
-            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
-
+    def get_user_player_stats(self, user=None, user_id=None):
         monitor_db = database.MonitorDatabase()
 
         player_stats = []
         result_id = 0
 
-        group_by = 'reference_id' if grouping else 'id'
-
         try:
-            if str(user_id).isdigit():
-                query = "SELECT player, COUNT(DISTINCT %s) as total_plays, (SUM(stopped - started) - " \
-                        "SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END)) AS total_time, " \
-                        "platform " \
-                        "FROM session_history " \
-                        "WHERE user_id = ? " \
-                        "GROUP BY player " \
-                        "ORDER BY total_plays DESC, total_time DESC" % group_by
+            if user_id:
+                query = 'SELECT player, COUNT(player) as player_count, platform ' \
+                        'FROM session_history ' \
+                        'WHERE user_id = ? ' \
+                        'GROUP BY player ' \
+                        'ORDER BY player_count DESC'
                 result = monitor_db.select(query, args=[user_id])
             else:
-                result = []
-        except Exception as e:
-            logger.warn("Tautulli Users :: Unable to execute database query for get_player_stats: %s." % e)
-            result = []
+                query = 'SELECT player, COUNT(player) as player_count, platform ' \
+                        'FROM session_history ' \
+                        'WHERE user = ? ' \
+                        'GROUP BY player ' \
+                        'ORDER BY player_count DESC'
+                result = monitor_db.select(query, args=[user])
+        except:
+            logger.warn("Unable to execute database query.")
+            return None
 
         for item in result:
             # Rename Mystery platform names
-            platform = common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform'])
-            platform_name = next((v for k, v in common.PLATFORM_NAMES.items() if k in platform.lower()), 'default')
+            platform_names = {'Mystery 3': 'Playstation 3',
+                              'Mystery 4': 'Playstation 4',
+                              'Mystery 5': 'Xbox 360'}
+            platform_type = platform_names.get(item[2], item[2])
 
-            row = {'player_name': item['player'],
-                   'platform': platform,
-                   'platform_name': platform_name,
-                   'total_plays': item['total_plays'],
-                   'total_time': item['total_time'],
+            row = {'player_name': item[0],
+                   'platform_type': platform_type,
+                   'total_plays': item[1],
                    'result_id': result_id
                    }
             player_stats.append(row)
             result_id += 1
 
-        return player_stats
-
-    def get_recently_watched(self, user_id=None, limit='10'):
-        if not session.allow_session_user(user_id):
-            return []
-
-        monitor_db = database.MonitorDatabase()
-        recently_watched = []
-
-        if not limit.isdigit():
-            limit = '10'
-
-        try:
-            if str(user_id).isdigit():
-                query = "SELECT session_history.id, session_history.media_type, guid, " \
-                        "session_history.rating_key, session_history.parent_rating_key, session_history.grandparent_rating_key, " \
-                        "title, parent_title, grandparent_title, original_title, " \
-                        "thumb, parent_thumb, grandparent_thumb, media_index, parent_media_index, " \
-                        "year, originally_available_at, added_at, live, started, user " \
-                        "FROM session_history_metadata " \
-                        "JOIN session_history ON session_history_metadata.id = session_history.id " \
-                        "WHERE user_id = ? " \
-                        "GROUP BY (CASE WHEN session_history.media_type = 'track' THEN session_history.parent_rating_key " \
-                        "   ELSE session_history.rating_key END) " \
-                        "ORDER BY MAX(started) DESC LIMIT ?"
-                result = monitor_db.select(query, args=[user_id, limit])
-            else:
-                result = []
-        except Exception as e:
-            logger.warn("Tautulli Users :: Unable to execute database query for get_recently_watched: %s." % e)
-            result = []
-
-        for row in result:
-            if row['media_type'] == 'episode' and row['parent_thumb']:
-                thumb = row['parent_thumb']
-            elif row['media_type'] == 'episode':
-                thumb = row['grandparent_thumb']
-            else:
-                thumb = row['thumb']
-
-            recent_output = {'row_id': row['id'],
-                             'media_type': row['media_type'],
-                             'rating_key': row['rating_key'],
-                             'parent_rating_key': row['parent_rating_key'],
-                             'grandparent_rating_key': row['grandparent_rating_key'],
-                             'title': row['title'],
-                             'parent_title': row['parent_title'],
-                             'grandparent_title': row['grandparent_title'],
-                             'original_title': row['original_title'],
-                             'thumb': thumb,
-                             'media_index': row['media_index'],
-                             'parent_media_index': row['parent_media_index'],
-                             'year': row['year'],
-                             'originally_available_at': row['originally_available_at'],
-                             'live': row['live'],
-                             'guid': row['guid'],
-                             'time': row['started'],
-                             'user': row['user']
-                             }
-            recently_watched.append(recent_output)
-
-        return recently_watched
-
-    def get_users(self, include_deleted=False):
-        monitor_db = database.MonitorDatabase()
-
-        where = '' if include_deleted else 'WHERE deleted_user = 0'
-
-        try:
-            query = "SELECT id AS row_id, user_id, username, friendly_name, thumb, custom_avatar_url, email, " \
-                    "is_active, is_admin, is_home_user, is_allow_sync, is_restricted, " \
-                    "do_notify, keep_history, allow_guest, shared_libraries, " \
-                    "filter_all, filter_movies, filter_tv, filter_music, filter_photos " \
-                    "FROM users %s" % where
-            result = monitor_db.select(query=query)
-        except Exception as e:
-            logger.warn("Tautulli Users :: Unable to execute database query for get_users: %s." % e)
-            return []
-
-        users = []
-        for item in result:
-            shared_libraries = tuple(item['shared_libraries'].split(';')) if item['shared_libraries'] else ()
-
-            user = {'row_id': item['row_id'],
-                    'user_id': item['user_id'],
-                    'username': item['username'],
-                    'friendly_name': item['friendly_name'] or item['username'],
-                    'thumb': item['custom_avatar_url'] or item['thumb'],
-                    'email': item['email'],
-                    'is_active': item['is_active'],
-                    'is_admin': item['is_admin'],
-                    'is_home_user': item['is_home_user'],
-                    'is_allow_sync': item['is_allow_sync'],
-                    'is_restricted': item['is_restricted'],
-                    'do_notify': item['do_notify'],
-                    'keep_history': item['keep_history'],
-                    'allow_guest': item['allow_guest'],
-                    'shared_libraries': shared_libraries,
-                    'filter_all': item['filter_all'],
-                    'filter_movies': item['filter_movies'],
-                    'filter_tv': item['filter_tv'],
-                    'filter_music': item['filter_music'],
-                    'filter_photos': item['filter_photos'],
-                    }
-            users.append(user)
-
-        return users
-
-    def delete(self, user_id=None, row_ids=None, purge_only=False):
-        monitor_db = database.MonitorDatabase()
-
-        if row_ids and row_ids is not None:
-            row_ids = list(map(helpers.cast_to_int, row_ids.split(',')))
-
-            # Get the user_ids corresponding to the row_ids
-            result = monitor_db.select("SELECT user_id FROM users "
-                                       "WHERE id IN ({})".format(",".join(["?"] * len(row_ids))), row_ids)
-
-            success = []
-            for user in result:
-                success.append(self.delete(user_id=user['user_id'],
-                                           purge_only=purge_only))
-            return all(success)
-
-        elif str(user_id).isdigit():
-            delete_success = database.delete_user_history(user_id=user_id)
-
-            if purge_only:
-                return delete_success
-            else:
-                logger.info("Tautulli Users :: Deleting user with user_id %s from database."
-                            % user_id)
-                try:
-                    monitor_db.action("UPDATE users "
-                                      "SET deleted_user = 1, keep_history = 0, do_notify = 0 "
-                                      "WHERE user_id = ?", [user_id])
-                    return delete_success
-                except Exception as e:
-                    logger.warn("Tautulli Users :: Unable to execute database query for delete: %s." % e)
-
-        else:
-            return False
-
-    def undelete(self, user_id=None, username=None):
-        monitor_db = database.MonitorDatabase()
-
-        try:
-            if user_id and str(user_id).isdigit():
-                query = "SELECT * FROM users WHERE user_id = ?"
-                result = monitor_db.select(query=query, args=[user_id])
-                if result:
-                    logger.info("Tautulli Users :: Re-adding user with id %s to database." % user_id)
-                    monitor_db.action("UPDATE users "
-                                      "SET deleted_user = 0, keep_history = 1, do_notify = 1 "
-                                      "WHERE user_id = ?", [user_id])
-                    return True
-                else:
-                    return False
-
-            elif username:
-                query = "SELECT * FROM users WHERE username = ?"
-                result = monitor_db.select(query=query, args=[username])
-                if result:
-                    logger.info("Tautulli Users :: Re-adding user with username %s to database." % username)
-                    monitor_db.action("UPDATE users "
-                                      "SET deleted_user = 0, keep_history = 1, do_notify = 1 "
-                                      "WHERE username = ?", [username])
-                    return True
-                else:
-                    return False
-
-        except Exception as e:
-            logger.warn("Tautulli Users :: Unable to execute database query for undelete: %s." % e)
-
-    # Keep method for PlexWatch/Plexivity import
-    def get_user_id(self, user=None):
-        if user:
-            try:
-                monitor_db = database.MonitorDatabase()
-                query = "SELECT user_id FROM users WHERE username = ?"
-                result = monitor_db.select_single(query, args=[user])
-                if result:
-                    return result['user_id']
-                else:
-                    return None
-            except:
-                return None
-
-        return None
-
-    def get_user_names(self, kwargs=None):
-        monitor_db = database.MonitorDatabase()
-
-        user_cond = ''
-        if session.get_session_user_id():
-            user_cond = "AND user_id = %s " % session.get_session_user_id()
-
-        try:
-            query = "SELECT user_id, " \
-                    "(CASE WHEN users.friendly_name IS NULL OR TRIM(users.friendly_name) = '' \
-                    THEN users.username ELSE users.friendly_name END) AS friendly_name " \
-                    "FROM users " \
-                    "WHERE deleted_user = 0 %s" % user_cond
-
-            result = monitor_db.select(query)
-        except Exception as e:
-            logger.warn("Tautulli Users :: Unable to execute database query for get_user_names: %s." % e)
-            return None
-
-        return session.friendly_name_to_username(result)
-
-    def get_tokens(self, user_id=None):
-        tokens = {
-            'allow_guest': 0,
-            'user_token': '',
-            'server_token': ''
-        }
-
-        if user_id:
-            try:
-                monitor_db = database.MonitorDatabase()
-                query = "SELECT allow_guest, user_token, server_token FROM users " \
-                        "WHERE user_id = ? AND deleted_user = 0"
-                result = monitor_db.select_single(query, args=[user_id])
-                if result:
-                    tokens = {'allow_guest': result['allow_guest'],
-                              'user_token': result['user_token'],
-                              'server_token': result['server_token']
-                              }
-                    return tokens
-                else:
-                    return tokens
-            except:
-                return tokens
-
-        return tokens
-
-    def get_filters(self, user_id=None):
-        if not user_id:
-            return {}
-
-        try:
-            monitor_db = database.MonitorDatabase()
-            query = "SELECT filter_all, filter_movies, filter_tv, filter_music, filter_photos FROM users " \
-                    "WHERE user_id = ?"
-            result = monitor_db.select_single(query, args=[user_id])
-        except Exception as e:
-            logger.warn("Tautulli Users :: Unable to execute database query for get_filters: %s." % e)
-            result = {}
-
-        filters_list = {}
-        for k, v in result.items():
-            filters = {}
-
-            for f in v.split('|'):
-                if 'contentRating=' in f or 'label=' in f:
-                    filters.update(dict(parse_qsl(f)))
-
-            filters['content_rating'] = tuple(f for f in filters.pop('contentRating', '').split(',') if f)
-            filters['labels'] = tuple(f for f in filters.pop('label', '').split(',') if f)
-
-            filters_list[k] = filters
-
-        return filters_list
-
-    def set_user_login(self, user_id=None, user=None, user_group=None, ip_address=None, host=None,
-                       user_agent=None, success=0, expiry=None, jwt_token=None):
-
-        if user_id is None or str(user_id).isdigit():
-            monitor_db = database.MonitorDatabase()
-
-            if expiry is not None:
-                expiry = helpers.datetime_to_iso(expiry)
-
-            keys = {'timestamp': helpers.timestamp(),
-                    'user_id': user_id}
-
-            values = {'user': user,
-                      'user_group': user_group,
-                      'ip_address': ip_address,
-                      'host': host,
-                      'user_agent': user_agent,
-                      'success': success,
-                      'expiry': expiry,
-                      'jwt_token': jwt_token}
-
-            try:
-                monitor_db.upsert(table_name='user_login', key_dict=keys, value_dict=values)
-            except Exception as e:
-                logger.warn("Tautulli Users :: Unable to execute database query for set_login_log: %s." % e)
-
-    def get_user_login(self, jwt_token):
-        monitor_db = database.MonitorDatabase()
-        result = monitor_db.select_single("SELECT * FROM user_login "
-                                          "WHERE jwt_token = ?",
-                                          [jwt_token])
-        return result
-
-    def clear_user_login_token(self, jwt_token=None, row_ids=None):
-        monitor_db = database.MonitorDatabase()
-
-        if jwt_token:
-            logger.debug("Tautulli Users :: Clearing user JWT token.")
-            try:
-                monitor_db.action("UPDATE user_login SET jwt_token = NULL "
-                                  "WHERE jwt_token = ?",
-                                  [jwt_token])
-            except Exception as e:
-                logger.error("Tautulli Users :: Unable to clear user JWT token: %s.", e)
-                return False
-
-        elif row_ids and row_ids is not None:
-            row_ids = list(map(helpers.cast_to_int, row_ids.split(',')))
-            logger.debug("Tautulli Users :: Clearing JWT tokens for row_ids %s.", row_ids)
-            try:
-                monitor_db.action("UPDATE user_login SET jwt_token = NULL "
-                                  "WHERE id in ({})".format(",".join(["?"] * len(row_ids))),
-                                  row_ids)
-            except Exception as e:
-                logger.error("Tautulli Users :: Unable to clear JWT tokens: %s.", e)
-                return False
-
-        return True
-
-    def get_datatables_user_login(self, user_id=None, jwt_token=None, kwargs=None):
-        default_return = {'recordsFiltered': 0,
-                          'recordsTotal': 0,
-                          'draw': 0,
-                          'data': []}
-
-        if not session.allow_session_user(user_id):
-            return default_return
-
-        data_tables = datatables.DataTables()
-
-        if session.get_session_user_id():
-            custom_where = [['user_login.user_id', session.get_session_user_id()]]
-        else:
-            custom_where = [['user_login.user_id', user_id]] if user_id else []
-
-        columns = ["user_login.id AS row_id",
-                   "user_login.timestamp",
-                   "user_login.user_id",
-                   "user_login.user",
-                   "user_login.user_group",
-                   "user_login.ip_address",
-                   "user_login.host",
-                   "user_login.user_agent",
-                   "user_login.success",
-                   "user_login.expiry",
-                   "user_login.jwt_token",
-                   "(CASE WHEN users.friendly_name IS NULL OR TRIM(users.friendly_name) = '' \
-                    THEN users.username ELSE users.friendly_name END) AS friendly_name"
-                   ]
-
-        try:
-            query = data_tables.ssp_query(table_name='user_login',
-                                          columns=columns,
-                                          custom_where=custom_where,
-                                          group_by=[],
-                                          join_types=['LEFT OUTER JOIN'],
-                                          join_tables=['users'],
-                                          join_evals=[['user_login.user_id', 'users.user_id']],
-                                          kwargs=kwargs)
-        except Exception as e:
-            logger.warn("Tautulli Users :: Unable to execute database query for get_datatables_user_login: %s." % e)
-            return default_return
-
-        results = query['result']
-
-        rows = []
-        for item in results:
-            (os, browser) = httpagentparser.simple_detect(item['user_agent'])
-
-            expiry = None
-            current = False
-            if item['jwt_token'] and item['expiry']:
-                _expiry = helpers.iso_to_datetime(item['expiry'])
-                if _expiry > arrow.now():
-                    expiry = _expiry.strftime('%Y-%m-%d %H:%M:%S')
-                current = (item['jwt_token'] == jwt_token)
-
-            row = {'row_id': item['row_id'],
-                   'timestamp': item['timestamp'],
-                   'user_id': item['user_id'],
-                   'user_group': item['user_group'],
-                   'ip_address': item['ip_address'],
-                   'host': item['host'],
-                   'user_agent': item['user_agent'],
-                   'os': os,
-                   'browser': browser,
-                   'success': item['success'],
-                   'expiry': expiry,
-                   'current': current,
-                   'friendly_name': item['friendly_name'] or item['user']
-                   }
-
-            rows.append(row)
-
-        dict = {'recordsFiltered': query['filteredCount'],
-                'recordsTotal': query['totalCount'],
-                'data': session.friendly_name_to_username(rows),
-                'draw': query['draw']
-                }
-
-        return dict
-
-    def delete_login_log(self):
-        monitor_db = database.MonitorDatabase()
-
-        try:
-            logger.info("Tautulli Users :: Clearing login logs from database.")
-            monitor_db.action('DELETE FROM user_login')
-            monitor_db.action('VACUUM')
-            return True
-        except Exception as e:
-            logger.warn("Tautulli Users :: Unable to execute database query for delete_login_log: %s." % e)
-            return False
\ No newline at end of file
+        return player_stats
\ No newline at end of file
diff --git a/plexpy/version.py b/plexpy/version.py
index 31e6b18d..40c9dce1 100644
--- a/plexpy/version.py
+++ b/plexpy/version.py
@@ -1,19 +1,2 @@
-# -*- coding: utf-8 -*-
-
-# This file is part of Tautulli.
-#
-#  Tautulli is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  Tautulli 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
-
-PLEXPY_BRANCH = "master"
-PLEXPY_RELEASE_VERSION = "v2.15.3"
\ No newline at end of file
+PLEXPY_VERSION = "master"
+PLEXPY_RELEASE_VERSION = "1.2.2"
diff --git a/plexpy/versioncheck.py b/plexpy/versioncheck.py
index 9f546594..1cbd577c 100644
--- a/plexpy/versioncheck.py
+++ b/plexpy/versioncheck.py
@@ -1,33 +1,26 @@
-# -*- coding: utf-8 -*-
-
-#  This file is part of Tautulli.
+#  This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
-import json
-import os
-import platform
 import re
-import shutil
-import subprocess
+import os
 import tarfile
-
+import platform
 import plexpy
-from plexpy import common
-from plexpy import helpers
-from plexpy import logger
-from plexpy import request
+import subprocess
+
+from plexpy import logger, version, request
 
 
 def runGit(args):
@@ -49,7 +42,7 @@ def runGit(args):
             logger.debug('Trying to execute: "' + cmd + '" with shell in ' + plexpy.PROG_DIR)
             p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=True, cwd=plexpy.PROG_DIR)
             output, err = p.communicate()
-            output = output.strip().decode()
+            output = output.strip()
 
             logger.debug('Git output: ' + output)
         except OSError:
@@ -65,134 +58,73 @@ def runGit(args):
         elif output:
             break
 
-    return output, err
+    return (output, err)
 
 
-def get_version():
+def getVersion():
 
-    if plexpy.FROZEN and common.PLATFORM == 'Windows':
-        plexpy.INSTALL_TYPE = 'windows'
-        current_version, current_branch = get_version_from_file()
-        return current_version, 'origin', current_branch
+    if version.PLEXPY_VERSION.startswith('win32build'):
+        plexpy.INSTALL_TYPE = 'win'
 
-    elif plexpy.FROZEN and common.PLATFORM == 'Darwin':
-        plexpy.INSTALL_TYPE = 'macos'
-        current_version, current_branch = get_version_from_file()
-        return current_version, 'origin', current_branch
+        # Don't have a way to update exe yet, but don't want to set VERSION to None
+        return 'Windows Install', 'master'
 
     elif os.path.isdir(os.path.join(plexpy.PROG_DIR, '.git')):
+
         plexpy.INSTALL_TYPE = 'git'
         output, err = runGit('rev-parse HEAD')
 
         if not output:
-            logger.error('Could not find latest installed version.')
+            logger.error('Couldn\'t find latest installed version.')
             cur_commit_hash = None
-        else:
-            cur_commit_hash = str(output)
 
-            if not re.match('^[a-z0-9]+$', cur_commit_hash):
-                logger.error('Output does not look like a hash, not using it.')
-                cur_commit_hash = None
+        cur_commit_hash = str(output)
+
+        if not re.match('^[a-z0-9]+$', cur_commit_hash):
+            logger.error('Output doesn\'t look like a hash, not using it')
+            cur_commit_hash = None
 
         if plexpy.CONFIG.DO_NOT_OVERRIDE_GIT_BRANCH and plexpy.CONFIG.GIT_BRANCH:
-            remote_name = None
             branch_name = plexpy.CONFIG.GIT_BRANCH
 
         else:
-            remote_branch, err = runGit('rev-parse --abbrev-ref --symbolic-full-name @{u}')
-            remote_branch = remote_branch.rsplit('/', 1) if remote_branch else []
-            if len(remote_branch) == 2:
-                remote_name, branch_name = remote_branch
-            else:
-                remote_name = branch_name = None
-
-            if not remote_name and plexpy.CONFIG.GIT_REMOTE:
-                logger.error('Could not retrieve remote name from git. Falling back to %s.' % plexpy.CONFIG.GIT_REMOTE)
-                remote_name = plexpy.CONFIG.GIT_REMOTE
-            if not remote_name:
-                logger.error('Could not retrieve remote name from git. Defaulting to origin.')
-                branch_name = 'origin'
+            branch_name, err = runGit('rev-parse --abbrev-ref HEAD')
+            branch_name = branch_name
 
             if not branch_name and plexpy.CONFIG.GIT_BRANCH:
-                logger.error('Could not retrieve branch name from git. Falling back to %s.' % plexpy.CONFIG.GIT_BRANCH)
+                logger.error('Could not retrieve branch name from git. Falling back to %s' % plexpy.CONFIG.GIT_BRANCH)
                 branch_name = plexpy.CONFIG.GIT_BRANCH
             if not branch_name:
-                logger.error('Could not retrieve branch name from git. Defaulting to master.')
+                logger.error('Could not retrieve branch name from git. Defaulting to master')
                 branch_name = 'master'
 
-        return cur_commit_hash, remote_name, branch_name
+        return cur_commit_hash, branch_name
 
     else:
-        if plexpy.DOCKER:
-            plexpy.INSTALL_TYPE = 'docker'
-        elif plexpy.SNAP:
-            plexpy.INSTALL_TYPE = 'snap'
-        else:
-            plexpy.INSTALL_TYPE = 'source'
 
-        current_version, current_branch = get_version_from_file()
-        return current_version, 'origin', current_branch
+        plexpy.INSTALL_TYPE = 'source'
 
+        version_file = os.path.join(plexpy.PROG_DIR, 'version.txt')
 
-def get_version_from_file():
-    version_file = os.path.join(plexpy.PROG_DIR, 'version.txt')
-    branch_file = os.path.join(plexpy.PROG_DIR, 'branch.txt')
+        if not os.path.isfile(version_file):
+            return None, 'master'
 
-    if os.path.isfile(version_file):
         with open(version_file, 'r') as f:
             current_version = f.read().strip(' \n\r')
-    else:
-        current_version = None
 
-    if os.path.isfile(branch_file):
-        with open(branch_file, 'r') as f:
-            current_branch = f.read().strip(' \n\r')
-    else:
-        current_branch = common.BRANCH
-
-    return current_version, current_branch
+        if current_version:
+            return current_version, plexpy.CONFIG.GIT_BRANCH
+        else:
+            return None, 'master'
 
 
-def check_update(scheduler=False, notify=False, use_cache=False):
-    check_github(scheduler=scheduler, notify=notify, use_cache=use_cache)
-
-    if not plexpy.CURRENT_VERSION:
-        plexpy.UPDATE_AVAILABLE = None
-    elif plexpy.COMMITS_BEHIND > 0 and \
-            (plexpy.common.BRANCH in ('master', 'beta') or plexpy.SNAP or plexpy.FROZEN) and \
-            plexpy.common.RELEASE != plexpy.LATEST_RELEASE:
-        plexpy.UPDATE_AVAILABLE = 'release'
-    elif plexpy.COMMITS_BEHIND > 0 and \
-            not plexpy.SNAP and not plexpy.FROZEN and \
-            plexpy.CURRENT_VERSION != plexpy.LATEST_VERSION:
-        plexpy.UPDATE_AVAILABLE = 'commit'
-    else:
-        plexpy.UPDATE_AVAILABLE = False
-
-    if plexpy.WIN_SYS_TRAY_ICON:
-        plexpy.WIN_SYS_TRAY_ICON.change_tray_update_icon()
-    elif plexpy.MAC_SYS_TRAY_ICON:
-        plexpy.MAC_SYS_TRAY_ICON.change_tray_update_icon()
-
-
-def check_github(scheduler=False, notify=False, use_cache=False):
+def checkGithub():
     plexpy.COMMITS_BEHIND = 0
 
-    if plexpy.CONFIG.GIT_TOKEN:
-        headers = {'Authorization': 'token {}'.format(plexpy.CONFIG.GIT_TOKEN)}
-    else:
-        headers = {}
-
-    version = github_cache('version', use_cache=use_cache)
-    if not version:
-        # Get the latest version available from github
-        logger.info('Retrieving latest version information from GitHub')
-        url = 'https://api.github.com/repos/%s/%s/commits/%s' % (plexpy.CONFIG.GIT_USER,
-                                                                 plexpy.CONFIG.GIT_REPO,
-                                                                 plexpy.CONFIG.GIT_BRANCH)
-        version = request.request_json(url, headers=headers, timeout=20,
-                                       validator=lambda x: type(x) == dict)
-        github_cache('version', github_data=version)
+    # Get the latest version available from github
+    logger.info('Retrieving latest version information from GitHub')
+    url = 'https://api.github.com/repos/%s/plexpy/commits/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_BRANCH)
+    version = request.request_json(url, timeout=20, validator=lambda x: type(x) == dict)
 
     if version is None:
         logger.warn('Could not get the latest version from GitHub. Are you running a local development version?')
@@ -203,125 +135,58 @@ def check_github(scheduler=False, notify=False, use_cache=False):
 
     # See how many commits behind we are
     if not plexpy.CURRENT_VERSION:
-        logger.info('You are running an unknown version of Tautulli. Run the updater to identify your version')
+        logger.info('You are running an unknown version of PlexPy. Run the updater to identify your version')
         return plexpy.LATEST_VERSION
 
     if plexpy.LATEST_VERSION == plexpy.CURRENT_VERSION:
-        logger.info('Tautulli is up to date')
+        logger.info('PlexPy is up to date')
         return plexpy.LATEST_VERSION
 
-    commits = github_cache('commits', use_cache=use_cache)
-    if not commits:
-        logger.info('Comparing currently installed version with latest GitHub version')
-        # Need to compare CURRENT << LATEST to get a list of commits
-        url = 'https://api.github.com/repos/%s/%s/compare/%s...%s' % (plexpy.CONFIG.GIT_USER,
-                                                                      plexpy.CONFIG.GIT_REPO,
-                                                                      plexpy.CURRENT_VERSION,
-                                                                      plexpy.LATEST_VERSION)
-        commits = request.request_json(url, headers=headers, timeout=20, whitelist_status_code=404,
-                                       validator=lambda x: type(x) == dict)
-        github_cache('commits', github_data=commits)
+    logger.info('Comparing currently installed version with latest GitHub version')
+    url = 'https://api.github.com/repos/%s/plexpy/compare/%s...%s' % (plexpy.CONFIG.GIT_USER, plexpy.LATEST_VERSION, plexpy.CURRENT_VERSION)
+    commits = request.request_json(url, timeout=20, whitelist_status_code=404, validator=lambda x: type(x) == dict)
 
     if commits is None:
         logger.warn('Could not get commits behind from GitHub.')
         return plexpy.LATEST_VERSION
 
     try:
-        ahead_by = int(commits['ahead_by'])
-        logger.debug("In total, %d commits behind", ahead_by)
-
-        # Do not count [skip ci] commits for Docker or Snap on the nightly branch
-        if (plexpy.DOCKER or plexpy.SNAP) and plexpy.CONFIG.GIT_BRANCH == 'nightly':
-            for commit in reversed(commits['commits']):
-                if '[skip ci]' not in commit['commit']['message']:
-                    plexpy.LATEST_VERSION = commit['sha']
-                    break
-                ahead_by -= 1
-            install = 'Docker container' if plexpy.DOCKER else 'Snap package'
-            logger.debug("%s %d commits behind", install, ahead_by)
-
-        plexpy.COMMITS_BEHIND = ahead_by
+        plexpy.COMMITS_BEHIND = int(commits['behind_by'])
+        logger.debug("In total, %d commits behind", plexpy.COMMITS_BEHIND)
     except KeyError:
         logger.info('Cannot compare versions. Are you running a local development version?')
         plexpy.COMMITS_BEHIND = 0
 
     if plexpy.COMMITS_BEHIND > 0:
         logger.info('New version is available. You are %s commits behind' % plexpy.COMMITS_BEHIND)
-
-        releases = github_cache('releases', use_cache=use_cache)
-        if not releases:
-            url = 'https://api.github.com/repos/%s/%s/releases' % (plexpy.CONFIG.GIT_USER,
-                                                                   plexpy.CONFIG.GIT_REPO)
-            releases = request.request_json(url, timeout=20, whitelist_status_code=404,
-                                            validator=lambda x: type(x) == list)
-            github_cache('releases', github_data=releases)
-
-        if releases is None:
-            logger.warn('Could not get releases from GitHub.')
-            return plexpy.LATEST_VERSION
-
-        if plexpy.CONFIG.GIT_BRANCH == 'master':
-            release = next((r for r in releases if not r['prerelease']), releases[0])
-        elif plexpy.CONFIG.GIT_BRANCH == 'beta':
-            release = next((r for r in releases if not r['tag_name'].endswith('-nightly')), releases[0])
-        elif plexpy.CONFIG.GIT_BRANCH == 'nightly':
-            release = next((r for r in releases), releases[0])
-        else:
-            release = releases[0]
-
-        plexpy.LATEST_RELEASE = release['tag_name']
-
-        if plexpy.CONFIG.GIT_BRANCH in ('master', 'beta') and release['target_commitish'] == plexpy.CURRENT_VERSION:
-            logger.info('Tautulli is up to date')
-            return plexpy.CURRENT_VERSION
-
-        if notify:
-            plexpy.NOTIFY_QUEUE.put({'notify_action': 'on_plexpyupdate',
-                                     'plexpy_download_info': release,
-                                     'plexpy_update_commit': plexpy.LATEST_VERSION,
-                                     'plexpy_update_behind': plexpy.COMMITS_BEHIND})
-
-        if scheduler and plexpy.CONFIG.PLEXPY_AUTO_UPDATE and \
-                not plexpy.DOCKER and not plexpy.SNAP and not plexpy.FROZEN:
-            logger.info('Running automatic update.')
-            plexpy.shutdown(restart=True, update=True)
-
     elif plexpy.COMMITS_BEHIND == 0:
-        logger.info('Tautulli is up to date')
+        logger.info('PlexPy is up to date')
 
     return plexpy.LATEST_VERSION
 
 
 def update():
-    if not plexpy.UPDATE_AVAILABLE:
-        return
-
-    if plexpy.INSTALL_TYPE in ('docker', 'snap', 'windows', 'macos'):
-        return
+    if plexpy.INSTALL_TYPE == 'win':
+        logger.info('Windows .exe updating not supported yet.')
 
     elif plexpy.INSTALL_TYPE == 'git':
-        output, err = runGit('pull --ff-only {} {}'.format(plexpy.CONFIG.GIT_REMOTE,
-                                                           plexpy.CONFIG.GIT_BRANCH))
+        output, err = runGit('pull origin ' + plexpy.CONFIG.GIT_BRANCH)
 
         if not output:
-            logger.error('Unable to download latest version')
-            return
+            logger.error('Couldn\'t download latest version')
 
         for line in output.split('\n'):
-            if 'Already up-to-date.' in line or 'Already up to date.' in line:
+
+            if 'Already up-to-date.' in line:
                 logger.info('No update available, not updating')
-                return
-            elif line.endswith(('Aborting', 'Aborting.')):
+                logger.info('Output: ' + str(output))
+            elif line.endswith('Aborting.'):
                 logger.error('Unable to update from git: ' + line)
-                return
+                logger.info('Output: ' + str(output))
 
-        clean_pyc()
-
-    elif plexpy.INSTALL_TYPE == 'source':
-        tar_download_url = 'https://github.com/{}/{}/tarball/{}'.format(plexpy.CONFIG.GIT_USER,
-                                                                        plexpy.CONFIG.GIT_REPO,
-                                                                        plexpy.CONFIG.GIT_BRANCH)
-        update_dir = os.path.join(plexpy.DATA_DIR, 'update')
+    else:
+        tar_download_url = 'https://github.com/%s/plexpy/tarball/%s' % (plexpy.CONFIG.GIT_USER, plexpy.CONFIG.GIT_BRANCH)
+        update_dir = os.path.join(plexpy.PROG_DIR, 'update')
         version_path = os.path.join(plexpy.PROG_DIR, 'version.txt')
 
         logger.info('Downloading update from: ' + tar_download_url)
@@ -332,7 +197,7 @@ def update():
             return
 
         download_name = plexpy.CONFIG.GIT_BRANCH + '-github'
-        tar_download_path = os.path.join(plexpy.DATA_DIR, download_name)
+        tar_download_path = os.path.join(plexpy.PROG_DIR, download_name)
 
         # Save tar to disk
         with open(tar_download_path, 'wb') as f:
@@ -377,180 +242,36 @@ def update():
             )
             return
 
-        clean_pyc()
+def read_changelog():
 
-
-def reset_git_install():
-    if plexpy.INSTALL_TYPE == 'git':
-        logger.info('Attempting to reset git install to "{}/{}/{}"'.format(plexpy.CONFIG.GIT_REMOTE,
-                                                                           plexpy.CONFIG.GIT_BRANCH,
-                                                                           common.RELEASE))
-
-        output, err = runGit('remote set-url {} https://github.com/{}/{}.git'.format(plexpy.CONFIG.GIT_REMOTE,
-                                                                                     plexpy.CONFIG.GIT_USER,
-                                                                                     plexpy.CONFIG.GIT_REPO))
-        output, err = runGit('fetch {}'.format(plexpy.CONFIG.GIT_REMOTE))
-        output, err = runGit('checkout {}'.format(plexpy.CONFIG.GIT_BRANCH))
-        output, err = runGit('branch -u {}/{}'.format(plexpy.CONFIG.GIT_REMOTE,
-                                                      plexpy.CONFIG.GIT_BRANCH))
-        output, err = runGit('reset --hard {}'.format(common.RELEASE))
-        _, _ = runGit('clean -fd')
-
-        if not output:
-            logger.error('Unable to reset Tautulli installation.')
-            return False
-
-        for line in output.split('\n'):
-            if 'Already up-to-date.' in line or 'Already up to date.' in line:
-                logger.info('Tautulli installation reset successfully.')
-                return True
-            elif line.endswith(('Aborting', 'Aborting.')):
-                logger.error('Unable to reset Tautulli installation: ' + line)
-                return False
-
-
-def checkout_git_branch():
-    if plexpy.INSTALL_TYPE == 'git':
-        logger.info('Attempting to checkout git branch "{}/{}"'.format(plexpy.CONFIG.GIT_REMOTE,
-                                                                       plexpy.CONFIG.GIT_BRANCH))
-
-        output, err = runGit('fetch {}'.format(plexpy.CONFIG.GIT_REMOTE))
-        output, err = runGit('checkout {}'.format(plexpy.CONFIG.GIT_BRANCH))
-
-        if not output:
-            logger.error('Unable to change git branch.')
-            return
-
-        for line in output.split('\n'):
-            if line.endswith(('Aborting', 'Aborting.')):
-                logger.error('Unable to checkout from git: ' + line)
-                return
-
-        output, err = runGit('pull {} {}'.format(plexpy.CONFIG.GIT_REMOTE,
-                                                 plexpy.CONFIG.GIT_BRANCH))
-
-
-def github_cache(cache, github_data=None, use_cache=True):
-    timestamp = helpers.timestamp()
-    cache_filepath = os.path.join(plexpy.CONFIG.CACHE_DIR, 'github_{}.json'.format(cache))
-
-    if github_data:
-        cache_data = {'github_data': github_data,
-                      '_cache_time': timestamp,
-                      '_release_version': common.RELEASE}
-        try:
-            with open(cache_filepath, 'w', encoding='utf-8') as cache_file:
-                json.dump(cache_data, cache_file)
-        except:
-            pass
-    else:
-        if not use_cache:
-            return
-        try:
-            with open(cache_filepath, 'r', encoding='utf-8') as cache_file:
-                cache_data = json.load(cache_file)
-            if (
-                timestamp - cache_data['_cache_time'] < plexpy.CONFIG.CHECK_GITHUB_CACHE_SECONDS and
-                cache_data['_release_version'] == common.RELEASE
-            ):
-                logger.debug('Using cached GitHub %s data', cache)
-                return cache_data['github_data']
-        except:
-            pass
-
-
-def read_changelog(latest_only=False, since_prev_release=False):
     changelog_file = os.path.join(plexpy.PROG_DIR, 'CHANGELOG.md')
 
-    if not os.path.isfile(changelog_file):
-        return '<h4>Missing changelog file</h4>'
-
     try:
-        output = ['']
-        prev_level = 0
+        logfile = open(changelog_file, "r")
+    except IOError, e:
+        logger.error('PlexPy Version Checker :: Unable to open changelog file. %s' % e)
+        return None
 
-        latest_version_found = False
+    if logfile:
+        output = ''
+        lines = logfile.readlines()
+        previous_line = ''
+        for line in lines:
+            if line[:2] == '# ':
+                output += '<h3>' + line[2:] + '</h3>'
+            elif line[:3] == '## ':
+                output += '<h4>' + line[3:] + '</h4>'
+            elif line[:2] == '* ' and previous_line.strip() == '':
+                output += '<ul><li>' + line[2:] + '</li>'
+            elif line[:2] == '* ':
+                output += '<li>' + line[2:] + '</li>'
+            elif line.strip() == '' and previous_line[:2] == '* ':
+                output += '</ul></br>'
+            else:
+                output += line + '</br>'
 
-        header_pattern = re.compile(r'(^#+)\s(.+)')
-        list_pattern = re.compile(r'(^[ \t]*\*\s)(.+)')
+            previous_line = line
 
-        beta_release = False
-        prev_release = str(plexpy.PREV_RELEASE)
-
-        with open(changelog_file, "r") as logfile:
-            for line in logfile:
-                line_header_match = re.search(header_pattern, line)
-                line_list_match = re.search(list_pattern, line)
-
-                if line_header_match:
-                    header_level = str(len(line_header_match.group(1)))
-                    header_text = line_header_match.group(2)
-
-                    if header_text.lower() == 'changelog':
-                        continue
-
-                    if latest_version_found:
-                        break
-                    elif latest_only:
-                        latest_version_found = True
-                    # Add a space to the end of the release to match tags
-                    elif since_prev_release:
-                        if prev_release.endswith('-beta') and not beta_release:
-                            if prev_release + ' ' in header_text:
-                                break
-                            elif prev_release.replace('-beta', '') + ' ' in header_text:
-                                beta_release = True
-                        elif prev_release.endswith('-beta') and beta_release:
-                            break
-                        elif prev_release + ' ' in header_text:
-                            break
-
-                    output[-1] += '<h' + header_level + '>' + header_text + '</h' + header_level + '>'
-
-                elif line_list_match:
-                    line_level = len(line_list_match.group(1)) // 2
-                    line_text = line_list_match.group(2)
-
-                    if line_level > prev_level:
-                        output[-1] += '<ul>' * (line_level - prev_level) + '<li>' + line_text + '</li>'
-                    elif line_level < prev_level:
-                        output[-1] += '</ul>' * (prev_level - line_level) + '<li>' + line_text + '</li>'
-                    else:
-                        output[-1] += '<li>' + line_text + '</li>'
-
-                    prev_level = line_level
-
-                elif line.strip() == '' and prev_level:
-                    output[-1] += '</ul>' * (prev_level)
-                    output.append('')
-                    prev_level = 0
-
-        if since_prev_release:
-            output.reverse()
-
-        return ''.join(output)
-
-    except IOError as e:
-        logger.error('Tautulli Version Checker :: Unable to open changelog file. %s' % e)
-        return '<h4>Unable to open changelog file</h4>'
-
-
-def clean_pyc():
-    logger.debug('Cleaning __pycache__ and .pyc files.')
-
-    for root, dirs, files in os.walk(plexpy.PROG_DIR):
-        for _dir in dirs:
-            if _dir.lower() == '__pycache__':
-                dirpath = os.path.join(root, _dir)
-                try:
-                    shutil.rmtree(dirpath)
-                except OSError as e:
-                    logger.error('Failed to remove directory %s: %s', dirpath, e)
-
-        for _file in files:
-            if _file.lower().endswith('.pyc'):
-                filepath = os.path.join(root, _file)
-                try:
-                    os.remove(filepath)
-                except OSError as e:
-                    logger.error('Failed to remove file %s: %s', filepath, e)
+        return output
+    else:
+        return '<h4>No changelog data</h4>'
\ No newline at end of file
diff --git a/plexpy/web_socket.py b/plexpy/web_socket.py
index 1737c02d..c9740b9b 100644
--- a/plexpy/web_socket.py
+++ b/plexpy/web_socket.py
@@ -1,241 +1,97 @@
-# -*- coding: utf-8 -*-
-
-# This file is part of Tautulli.
+# This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
 # Mostly borrowed from https://github.com/trakt/Plex-Trakt-Scrobbler
 
-import json
-import ssl
+from plexpy import logger, activity_pinger
+
 import threading
-import time
-
-import certifi
-import websocket
-
 import plexpy
-from plexpy import activity_handler
-from plexpy import activity_pinger
-from plexpy import activity_processor
-from plexpy import database
-from plexpy import logger
-
+import json
+import time
+import websocket
 
 name = 'websocket'
 opcode_data = (websocket.ABNF.OPCODE_TEXT, websocket.ABNF.OPCODE_BINARY)
-ws_shutdown = False
-pong_timer = None
-pong_count = 0
 
 
 def start_thread():
-    try:
-        # Check for any existing sessions on start up
-        activity_pinger.check_active_sessions(ws_request=True)
-    except Exception as e:
-        logger.error("Tautulli WebSocket :: Failed to check for active sessions: %s." % e)
-        logger.warn("Tautulli WebSocket :: Attempt to fix by flushing temporary sessions...")
-        database.delete_sessions()
-
+    # Check for any existing sessions on start up
+    activity_pinger.check_active_sessions(ws_request=True)
     # Start the websocket listener on it's own thread
-    thread = threading.Thread(target=run)
-    thread.daemon = True
-    thread.start()
-
-
-def on_connect():
-    if plexpy.PLEX_SERVER_UP is None:
-        plexpy.PLEX_SERVER_UP = True
-
-    if not plexpy.PLEX_SERVER_UP:
-        logger.info("Tautulli WebSocket :: The Plex Media Server is back up.")
-        plexpy.PLEX_SERVER_UP = True
-
-        if activity_handler.ACTIVITY_SCHED.get_job('on_intdown'):
-            logger.debug("Tautulli WebSocket :: Cancelling scheduled Plex server down callback.")
-            activity_handler.schedule_callback('on_intdown', remove_job=True)
-        else:
-            on_intup()
-
-    plexpy.initialize_scheduler()
-    if plexpy.CONFIG.WEBSOCKET_MONITOR_PING_PONG:
-        send_ping()
-
-
-def on_disconnect():
-    if plexpy.PLEX_SERVER_UP is None:
-        plexpy.PLEX_SERVER_UP = False
-
-    if plexpy.PLEX_SERVER_UP:
-        logger.info("Tautulli WebSocket :: Unable to get a response from the server, Plex server is down.")
-        plexpy.PLEX_SERVER_UP = False
-
-        logger.debug("Tautulli WebSocket :: Scheduling Plex server down callback in %d seconds.",
-                     plexpy.CONFIG.NOTIFY_SERVER_CONNECTION_THRESHOLD)
-        activity_handler.schedule_callback('on_intdown', func=on_intdown,
-                                           seconds=plexpy.CONFIG.NOTIFY_SERVER_CONNECTION_THRESHOLD)
-
-    activity_processor.ActivityProcessor().set_temp_stopped()
-    plexpy.initialize_scheduler()
-
-
-def on_intdown():
-    plexpy.NOTIFY_QUEUE.put({'notify_action': 'on_intdown'})
-
-
-def on_intup():
-    plexpy.NOTIFY_QUEUE.put({'notify_action': 'on_intup'})
-
-
-def reconnect():
-    close()
-    logger.info("Tautulli WebSocket :: Reconnecting websocket...")
-    start_thread()
-
-
-def shutdown():
-    global ws_shutdown
-    ws_shutdown = True
-    close()
-
-
-def close():
-    logger.info("Tautulli WebSocket :: Disconnecting websocket...")
-    plexpy.WEBSOCKET.close()
-    plexpy.WS_CONNECTED = False
-
-
-def send_ping():
-    if plexpy.WS_CONNECTED:
-        # logger.debug("Tautulli WebSocket :: Sending ping.")
-        plexpy.WEBSOCKET.ping("Hi?")
-
-        global pong_timer
-        pong_timer = threading.Timer(5.0, wait_pong)
-        pong_timer.daemon = True
-        pong_timer.start()
-
-
-def wait_pong():
-    global pong_count
-    pong_count += 1
-
-    logger.warn("Tautulli WebSocket :: Failed to receive pong from websocket, ping attempt %s." % str(pong_count))
-
-    if pong_count >= plexpy.CONFIG.WEBSOCKET_CONNECTION_ATTEMPTS:
-        pong_count = 0
-        close()
-
-
-def receive_pong():
-    # logger.debug("Tautulli WebSocket :: Received pong.")
-    global pong_timer
-    global pong_count
-    if pong_timer:
-        pong_timer = pong_timer.cancel()
-        pong_count = 0
+    threading.Thread(target=run).start()
 
 
 def run():
     from websocket import create_connection
 
-    if plexpy.CONFIG.PMS_SSL and plexpy.CONFIG.PMS_URL[:5] == 'https':
-        uri = plexpy.CONFIG.PMS_URL.replace('https://', 'wss://') + '/:/websockets/notifications'
-        secure = 'secure '
-        if plexpy.CONFIG.VERIFY_SSL_CERT:
-            sslopt = {'ca_certs': certifi.where()}
-        else:
-            sslopt = {'cert_reqs': ssl.CERT_NONE}
-    else:
-        uri = 'ws://%s:%s/:/websockets/notifications' % (
-            plexpy.CONFIG.PMS_IP,
-            plexpy.CONFIG.PMS_PORT
-        )
-        secure = ''
-        sslopt = None
+    uri = 'ws://%s:%s/:/websockets/notifications' % (
+        plexpy.CONFIG.PMS_IP,
+        plexpy.CONFIG.PMS_PORT
+    )
 
     # Set authentication token (if one is available)
     if plexpy.CONFIG.PMS_TOKEN:
-        header = {"X-Plex-Token": plexpy.CONFIG.PMS_TOKEN}
-    else:
-        header = None
+        uri += '?X-Plex-Token=' + plexpy.CONFIG.PMS_TOKEN
 
-    timeout = plexpy.CONFIG.PMS_TIMEOUT
-
-    global ws_shutdown
-    ws_shutdown = False
+    ws_connected = False
     reconnects = 0
 
-    # Try an open the websocket connection
-    logger.info("Tautulli WebSocket :: Opening %swebsocket." % secure)
-    try:
-        plexpy.WEBSOCKET = create_connection(uri, timeout=timeout, header=header, sslopt=sslopt)
-        logger.info("Tautulli WebSocket :: Ready")
-        plexpy.WS_CONNECTED = True
-    except (websocket.WebSocketException, IOError, Exception) as e:
-        logger.error("Tautulli WebSocket :: %s.", e)
-
-    if plexpy.WS_CONNECTED:
-        on_connect()
-
-    while plexpy.WS_CONNECTED:
+    # Try an open the websocket connection - if it fails after 15 retries fallback to polling
+    while not ws_connected and reconnects <= 15:
         try:
-            process(*receive(plexpy.WEBSOCKET))
+            logger.info(u'PlexPy WebSocket :: Opening websocket, connection attempt %s.' % str(reconnects + 1))
+            ws = create_connection(uri)
+            reconnects = 0
+            ws_connected = True
+            logger.info(u'PlexPy WebSocket :: Ready')
+        except IOError, e:
+            logger.error(u'PlexPy WebSocket :: %s.' % e)
+            reconnects += 1
+            time.sleep(5)
+
+    while ws_connected:
+        try:
+            process(*receive(ws))
 
             # successfully received data, reset reconnects counter
             reconnects = 0
-
         except websocket.WebSocketConnectionClosedException:
-            if ws_shutdown:
-                break
-
-            if reconnects == 0:
-                logger.warn("Tautulli WebSocket :: Connection has closed.")
-
-            if not plexpy.CONFIG.PMS_IS_CLOUD and reconnects < plexpy.CONFIG.WEBSOCKET_CONNECTION_ATTEMPTS:
+            if reconnects <= 15:
                 reconnects += 1
 
                 # Sleep 5 between connection attempts
                 if reconnects > 1:
-                    time.sleep(plexpy.CONFIG.WEBSOCKET_CONNECTION_TIMEOUT)
-
-                logger.warn("Tautulli WebSocket :: Reconnection attempt %s." % str(reconnects))
+                    time.sleep(5)
 
+                logger.warn(u'PlexPy WebSocket :: Connection has closed, reconnecting...')
                 try:
-                    plexpy.WEBSOCKET = create_connection(uri, timeout=timeout, header=header, sslopt=sslopt)
-                    logger.info("Tautulli WebSocket :: Ready")
-                    plexpy.WS_CONNECTED = True
-                except (websocket.WebSocketException, IOError, Exception) as e:
-                    logger.error("Tautulli WebSocket :: %s.", e)
+                    ws = create_connection(uri)
+                except IOError, e:
+                    logger.info(u'PlexPy WebSocket :: %s.' % e)
 
             else:
-                close()
+                ws_connected = False
                 break
 
-        except (websocket.WebSocketException, Exception) as e:
-            if ws_shutdown:
-                break
+    if not ws_connected:
+        logger.error(u'PlexPy WebSocket :: Connection unavailable, falling back to polling.')
+        plexpy.POLLING_FAILOVER = True
+        plexpy.initialize_scheduler()
 
-            logger.error("Tautulli WebSocket :: %s.", e)
-            close()
-            break
-
-    if not plexpy.WS_CONNECTED and not ws_shutdown:
-        on_disconnect()
-
-    logger.debug("Tautulli WebSocket :: Leaving thread.")
+    logger.debug(u'PlexPy WebSocket :: Leaving thread.')
 
 
 def receive(ws):
@@ -249,70 +105,38 @@ def receive(ws):
         ws.send_close()
         return frame.opcode, None
     elif frame.opcode == websocket.ABNF.OPCODE_PING:
-        # logger.debug("Tautulli WebSocket :: Received ping, sending pong.")
         ws.pong("Hi!")
-    elif frame.opcode == websocket.ABNF.OPCODE_PONG:
-        receive_pong()
 
     return None, None
 
 
 def process(opcode, data):
+    from plexpy import activity_handler
+
     if opcode not in opcode_data:
         return False
 
     try:
-        data = data.decode('utf-8')
-        logger.websocket_debug(data)
-        event = json.loads(data)
-    except Exception as e:
-        logger.warn("Tautulli WebSocket :: Error decoding message from websocket: %s" % e)
-        logger.websocket_error(data)
+        info = json.loads(data)
+    except Exception as ex:
+        logger.warn(u'PlexPy WebSocket :: Error decoding message from websocket: %s' % ex)
+        logger.debug(data)
         return False
 
-    event = event.get('NotificationContainer', event)
-    event_type = event.get('type')
+    type = info.get('type')
 
-    if not event_type:
+    if not type:
         return False
 
-    if event_type == 'playing':
-        event_data = event.get('PlaySessionStateNotification', event.get('_children', {}))
-
-        if not event_data:
-            logger.debug("Tautulli WebSocket :: Session event found but unable to get websocket data.")
+    if type == 'playing':
+        # logger.debug('%s.playing %s' % (name, info))
+        try:
+            time_line = info.get('_children')
+        except:
+            logger.debug(u"PlexPy WebSocket :: Session found but unable to get timeline data.")
             return False
 
-        try:
-            activity = activity_handler.ActivityHandler(timeline=event_data[0])
-            activity.process()
-        except Exception as e:
-            logger.exception("Tautulli WebSocket :: Failed to process session data: %s." % e)
-
-    if event_type == 'timeline':
-        event_data = event.get('TimelineEntry', event.get('_children', {}))
-
-        if not event_data:
-            logger.debug("Tautulli WebSocket :: Timeline event found but unable to get websocket data.")
-            return False
-
-        try:
-            activity = activity_handler.TimelineHandler(timeline=event_data[0])
-            activity.process()
-        except Exception as e:
-            logger.exception("Tautulli WebSocket :: Failed to process timeline data: %s." % e)
-
-    if event_type == 'reachability':
-        event_data = event.get('ReachabilityNotification', event.get('_children', {}))
-
-        if not event_data:
-            logger.debug("Tautulli WebSocket :: Reachability event found but unable to get websocket data.")
-            return False
-
-        try:
-            activity = activity_handler.ReachabilityHandler(data=event_data[0])
-            activity.process()
-        except Exception as e:
-            logger.exception("Tautulli WebSocket :: Failed to process reachability data: %s." % e)
+        activity = activity_handler.ActivityHandler(timeline=time_line[0])
+        activity.process()
 
     return True
diff --git a/plexpy/webauth.py b/plexpy/webauth.py
deleted file mode 100644
index 67658d15..00000000
--- a/plexpy/webauth.py
+++ /dev/null
@@ -1,428 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#  This file is part of Tautulli.
-#
-#  Tautulli is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  Tautulli 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
-
-
-# https://github.com/cherrypy/tools/blob/master/AuthenticationAndAccessRestrictions
-# Form based authentication for CherryPy. Requires the
-# Session tool to be loaded.
-
-from datetime import datetime, timedelta, timezone
-from urllib.parse import quote, unquote
-
-import cherrypy
-from hashing_passwords import check_hash
-import jwt
-
-import plexpy
-from plexpy import logger
-from plexpy.database import MonitorDatabase
-from plexpy.helpers import timestamp
-from plexpy.users import Users, refresh_users
-from plexpy.plextv import PlexTV
-
-# Monkey patch SameSite support into cookies.
-# https://stackoverflow.com/a/50813092
-try:
-    from http.cookies import Morsel
-except ImportError:
-    from Cookie import Morsel
-Morsel._reserved[str('samesite')] = str('SameSite')
-
-JWT_ALGORITHM = 'HS256'
-JWT_COOKIE_NAME = 'tautulli_token_'
-
-
-def plex_user_login(token=None, headers=None):
-    user_token = None
-    user_id = None
-
-    # Try to login to Plex.tv to check if the user has a valid account
-    if token:
-        plex_tv = PlexTV(token=token, headers=headers)
-        plex_user = plex_tv.get_plex_account_details()
-        if plex_user:
-            user_token = token
-            user_id = plex_user['user_id']
-    else:
-        return None
-
-    if user_token and user_id:
-        # Try to retrieve the user from the database.
-        # Also make sure guest access is enabled for the user and the user is not deleted.
-        user_data = Users()
-        user_details = user_data.get_details(user_id=user_id)
-        if user_id != str(user_details['user_id']):
-            # The user is not in the database.
-            return None
-        elif plexpy.CONFIG.HTTP_PLEX_ADMIN and user_details['is_admin']:
-            # Plex admin login
-            return user_details, 'admin'
-        elif not user_details['allow_guest'] or user_details['deleted_user']:
-            # Guest access is disabled or the user is deleted.
-            return None
-
-        # Stop here if guest access is not enabled
-        if not plexpy.CONFIG.ALLOW_GUEST_ACCESS:
-            return None
-
-        # The user is in the database, and guest access is enabled, so try to retrieve a server token.
-        # If a server token is returned, then the user is a valid friend of the server.
-        plex_tv = PlexTV(token=user_token, headers=headers)
-        server_token = plex_tv.get_server_token()
-        if server_token:
-
-            # Register the new user / update the access tokens.
-            monitor_db = MonitorDatabase()
-            try:
-                logger.debug("Tautulli WebAuth :: Registering token for user '%s' in the database."
-                             % user_details['username'])
-                result = monitor_db.action("UPDATE users SET server_token = ? WHERE user_id = ?",
-                                           [server_token, user_details['user_id']])
-
-                if result:
-                    # Refresh the users list to make sure we have all the correct permissions.
-                    refresh_users()
-                    # Successful login
-                    return user_details, 'guest'
-                else:
-                    logger.warn("Tautulli WebAuth :: Unable to register user '%s' in database."
-                                % user_details['username'])
-                    return None
-            except Exception as e:
-                logger.warn("Tautulli WebAuth :: Unable to register user '%s' in database: %s."
-                            % (user_details['username'], e))
-                return None
-        else:
-            logger.warn("Tautulli WebAuth :: Unable to retrieve Plex.tv server token for user '%s'."
-                        % user_details['username'])
-            return None
-
-    elif token:
-        logger.warn("Tautulli WebAuth :: Unable to retrieve Plex.tv user token for Plex OAuth.")
-        return None
-
-
-def check_credentials(username=None, password=None, token=None, admin_login='0', headers=None):
-    """Verifies credentials for username and password.
-    Returns True and the user group on success or False and no user group"""
-
-    if username and password:
-        if plexpy.CONFIG.HTTP_PASSWORD:
-            user_details = {'user_id': None, 'username': username}
-            if username == plexpy.CONFIG.HTTP_USERNAME and check_hash(password, plexpy.CONFIG.HTTP_PASSWORD):
-                return True, user_details, 'admin'
-
-    if plexpy.CONFIG.HTTP_PLEX_ADMIN or (not admin_login == '1' and plexpy.CONFIG.ALLOW_GUEST_ACCESS):
-        plex_login = plex_user_login(token=token, headers=headers)
-        if plex_login is not None:
-            return True, plex_login[0], plex_login[1]
-
-    return False, None, None
-
-
-def get_jwt_token():
-    jwt_cookie = str(JWT_COOKIE_NAME + plexpy.CONFIG.PMS_UUID)
-    jwt_token = cherrypy.request.cookie.get(jwt_cookie)
-
-    if jwt_token:
-        return jwt_token.value
-
-
-def check_jwt_token():
-    jwt_token = get_jwt_token()
-
-    if jwt_token:
-        try:
-            payload = jwt.decode(
-                jwt_token, plexpy.CONFIG.JWT_SECRET, leeway=timedelta(seconds=10), algorithms=[JWT_ALGORITHM]
-            )
-        except (jwt.DecodeError, jwt.ExpiredSignatureError):
-            return None
-
-        if not Users().get_user_login(jwt_token=jwt_token):
-            return None
-
-        return payload
-
-
-def check_auth(*args, **kwargs):
-    """A tool that looks in config for 'auth.require'. If found and it
-    is not None, a login is required and the entry is evaluated as a list of
-    conditions that the user must fulfill"""
-    conditions = cherrypy.request.config.get('auth.require', None)
-    if conditions is not None:
-        payload = check_jwt_token()
-
-        if payload:
-            cherrypy.request.login = payload
-
-            for condition in conditions:
-                # A condition is just a callable that returns true or false
-                if not condition():
-                    raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT)
-
-        else:
-            if cherrypy.request.headers.get('X-Requested-With') == 'XMLHttpRequest':
-                raise cherrypy.HTTPError(401)
-            
-            redirect_uri = cherrypy.request.path_info
-            if redirect_uri:
-                redirect_uri = '?redirect_uri=' + quote(redirect_uri)
-
-            raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT + "auth/logout" + redirect_uri)
-
-
-def requireAuth(*conditions):
-    """A decorator that appends conditions to the auth.require config
-    variable."""
-    def decorate(f):
-        if not hasattr(f, '_cp_config'):
-            f._cp_config = dict()
-        if 'auth.require' not in f._cp_config:
-            f._cp_config['auth.require'] = []
-        f._cp_config['auth.require'].extend(conditions)
-        return f
-    return decorate
-
-
-# Conditions are callables that return True
-# if the user fulfills the conditions they define, False otherwise
-#
-# They can access the current username as cherrypy.request.login
-#
-# Define those at will however suits the application.
-
-def member_of(user_group):
-    return lambda: cherrypy.request.login and cherrypy.request.login['user_group'] == user_group
-
-
-def name_is(user_name):
-    return lambda: cherrypy.request.login and cherrypy.request.login['user'] == user_name
-
-
-# These might be handy
-
-def any_of(*conditions):
-    """Returns True if any of the conditions match"""
-    def check():
-        for c in conditions:
-            if c():
-                return True
-        return False
-    return check
-
-
-# By default all conditions are required, but this might still be
-# needed if you want to use it inside of an any_of(...) condition
-def all_of(*conditions):
-    """Returns True if all of the conditions match"""
-    def check():
-        for c in conditions:
-            if not c():
-                return False
-        return True
-    return check
-
-
-def check_rate_limit(ip_address):
-    monitor_db = MonitorDatabase()
-    result = monitor_db.select("SELECT timestamp, success FROM user_login "
-                               "WHERE ip_address = ? "
-                               "AND timestamp >= ( "
-                               "SELECT CASE WHEN MAX(timestamp) IS NULL THEN 0 ELSE MAX(timestamp) END "
-                               "FROM user_login WHERE ip_address = ? AND success = 1) "
-                               "ORDER BY timestamp DESC",
-                               [ip_address, ip_address])
-
-    try:
-        last_timestamp = result[0]['timestamp']
-    except IndexError:
-        last_timestamp = 0
-
-    try:
-        last_success = max(login['timestamp'] for login in result if login['success'])
-    except ValueError:
-        last_success = 0
-
-    max_timestamp = max(last_success, last_timestamp - plexpy.CONFIG.HTTP_RATE_LIMIT_ATTEMPTS_INTERVAL)
-    attempts = [login for login in result if login['timestamp'] >= max_timestamp and not login['success']]
-
-    if len(attempts) >= plexpy.CONFIG.HTTP_RATE_LIMIT_ATTEMPTS:
-        return max(last_timestamp - (timestamp() - plexpy.CONFIG.HTTP_RATE_LIMIT_LOCKOUT_TIME), 0)
-
-
-# Controller to provide login and logout actions
-
-class AuthController(object):
-
-    def check_auth_enabled(self):
-        if not plexpy.CONFIG.HTTP_BASIC_AUTH and plexpy.CONFIG.HTTP_PASSWORD:
-            return
-        raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT)
-
-    def on_login(self, username=None, user_id=None, user_group=None, success=False, oauth=False,
-                 expiry=None, jwt_token=None):
-        """Called on successful login"""
-
-        # Save login to the database
-        ip_address = cherrypy.request.remote.ip
-        host = cherrypy.request.base
-        user_agent = cherrypy.request.headers.get('User-Agent')
-
-        Users().set_user_login(user_id=user_id,
-                               user=username,
-                               user_group=user_group,
-                               ip_address=ip_address,
-                               host=host,
-                               user_agent=user_agent,
-                               success=success,
-                               expiry=expiry,
-                               jwt_token=jwt_token)
-
-        if success:
-            use_oauth = 'Plex OAuth' if oauth else 'form'
-            logger.debug("Tautulli WebAuth :: %s user '%s' logged into Tautulli using %s login."
-                         % (user_group.capitalize(), username, use_oauth))
-
-    def on_logout(self, username, user_group, jwt_token=None):
-        """Called on logout"""
-        jwt_token = get_jwt_token()
-        if jwt_token:
-            Users().clear_user_login_token(jwt_token=jwt_token)
-
-        logger.debug("Tautulli WebAuth :: %s user '%s' logged out of Tautulli." % (user_group.capitalize(), username))
-
-    def get_loginform(self, redirect_uri=''):
-        from plexpy.webserve import serve_template
-        return serve_template(template_name="login.html", title="Login", redirect_uri=unquote(redirect_uri))
-
-    @cherrypy.expose
-    def index(self, *args, **kwargs):
-        raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT + "auth/login")
-
-    @cherrypy.expose
-    def login(self, redirect_uri='', *args, **kwargs):
-        self.check_auth_enabled()
-
-        return self.get_loginform(redirect_uri=redirect_uri)
-
-    @cherrypy.expose
-    def logout(self, redirect_uri='', *args, **kwargs):
-        self.check_auth_enabled()
-
-        payload = check_jwt_token()
-        if payload:
-            self.on_logout(username=payload['user'],
-                           user_group=payload['user_group'])
-
-        jwt_cookie = str(JWT_COOKIE_NAME + plexpy.CONFIG.PMS_UUID)
-        cherrypy.response.cookie[jwt_cookie] = ''
-        cherrypy.response.cookie[jwt_cookie]['max-age'] = 0
-        cherrypy.response.cookie[jwt_cookie]['path'] = plexpy.HTTP_ROOT.rstrip('/') or '/'
-
-        if plexpy.HTTP_ROOT != '/':
-            # Also expire the JWT on the root path
-            cherrypy.response.headers['Set-Cookie'] = jwt_cookie + '=""; max-age=0; path=/'
-
-        cherrypy.request.login = None
-
-        if redirect_uri:
-            redirect_uri = '?redirect_uri=' + redirect_uri
-
-        raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT + "auth/login" + redirect_uri)
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    def signin(self, username=None, password=None, token=None, remember_me='0', admin_login='0', *args, **kwargs):
-        if cherrypy.request.method != 'POST':
-            cherrypy.response.status = 405
-            return {'status': 'error', 'message': 'Sign in using POST.'}
-
-        ip_address = cherrypy.request.remote.ip
-        rate_limit = check_rate_limit(ip_address)
-
-        if rate_limit:
-            logger.debug("Tautulli WebAuth :: Too many incorrect login attempts from '%s'." % ip_address)
-            error_message = {'status': 'error', 'message': 'Too many login attempts.'}
-            cherrypy.response.status = 429
-            cherrypy.response.headers['Retry-After'] = rate_limit
-            return error_message
-
-        error_message = {'status': 'error', 'message': 'Invalid credentials.'}
-
-        valid_login, user_details, user_group = check_credentials(username=username,
-                                                                  password=password,
-                                                                  token=token,
-                                                                  admin_login=admin_login,
-                                                                  headers=kwargs)
-
-        if valid_login:
-            time_delta = timedelta(days=30) if remember_me == '1' else timedelta(minutes=60)
-            expiry = datetime.now(tz=timezone.utc) + time_delta
-
-            payload = {
-                'user_id': user_details['user_id'],
-                'user': user_details['username'],
-                'user_group': user_group,
-                'exp': expiry
-            }
-
-            jwt_token = jwt.encode(payload, plexpy.CONFIG.JWT_SECRET, algorithm=JWT_ALGORITHM)
-
-            self.on_login(username=user_details['username'],
-                          user_id=user_details['user_id'],
-                          user_group=user_group,
-                          success=True,
-                          oauth=bool(token),
-                          expiry=expiry,
-                          jwt_token=jwt_token)
-
-            jwt_cookie = str(JWT_COOKIE_NAME + plexpy.CONFIG.PMS_UUID)
-            cherrypy.response.cookie[jwt_cookie] = jwt_token
-            cherrypy.response.cookie[jwt_cookie]['max-age'] = int(time_delta.total_seconds())
-            cherrypy.response.cookie[jwt_cookie]['path'] = plexpy.HTTP_ROOT.rstrip('/') or '/'
-            cherrypy.response.cookie[jwt_cookie]['httponly'] = True
-            cherrypy.response.cookie[jwt_cookie]['samesite'] = 'lax'
-
-            cherrypy.request.login = payload
-            cherrypy.response.status = 200
-            return {'status': 'success', 'token': jwt_token, 'uuid': plexpy.CONFIG.PMS_UUID}
-
-        elif admin_login == '1' and username:
-            self.on_login(username=username)
-            logger.debug("Tautulli WebAuth :: Invalid admin login attempt from '%s'." % username)
-            cherrypy.response.status = 401
-            return error_message
-
-        elif username:
-            self.on_login(username=username)
-            logger.debug("Tautulli WebAuth :: Invalid user login attempt from '%s'." % username)
-            cherrypy.response.status = 401
-            return error_message
-
-        elif token:
-            self.on_login(username='Plex OAuth', oauth=True)
-            logger.debug("Tautulli WebAuth :: Invalid Plex OAuth login attempt.")
-            cherrypy.response.status = 401
-            return error_message
-
-    @cherrypy.expose
-    def redirect(self, redirect_uri='', *args, **kwargs):
-        root = plexpy.HTTP_ROOT.rstrip('/')
-        if redirect_uri.startswith(root):
-            redirect_uri = redirect_uri[len(root):]
-        raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT + redirect_uri.strip('/'))
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 4aa3bd67..7ba6c176 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -1,279 +1,113 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# This file is part of Tautulli.
+# This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
-import base64
-import csv
-from io import open, BytesIO
-import json
-import linecache
-import os
-import shutil
-import ssl as _ssl
-import sys
-import threading
-import zipfile
-from urllib.parse import urlencode
+from plexpy import logger, notifiers, plextv, pmsconnect, common, log_reader, datafactory, graphs, users
+from plexpy.helpers import checked, radio
 
-import cherrypy
-from cherrypy.lib.static import serve_file, serve_fileobj, serve_download
-from cherrypy._cperror import NotFound
-
-from hashing_passwords import make_hash
 from mako.lookup import TemplateLookup
-import mako.template
-import mako.exceptions
-
-import certifi
-import websocket
-
-if sys.version_info >= (3, 6):
-    import secrets
+from mako import exceptions
 
 import plexpy
-from plexpy import activity_pinger
-from plexpy import activity_processor
-from plexpy import common
-from plexpy import config
-from plexpy import database
-from plexpy import datafactory
-from plexpy import exporter
-from plexpy import graphs
-from plexpy import helpers
-from plexpy import http_handler
-from plexpy import libraries
-from plexpy import log_reader
-from plexpy import logger
-from plexpy import newsletter_handler
-from plexpy import newsletters
-from plexpy import mobile_app
-from plexpy import notification_handler
-from plexpy import notifiers
-from plexpy import plextv
-from plexpy import plexivity_import
-from plexpy import plexwatch_import
-from plexpy import pmsconnect
-from plexpy import users
-from plexpy import versioncheck
-from plexpy import web_socket
-from plexpy import webstart
-from plexpy.api2 import API2
-from plexpy.helpers import checked, addtoapi, get_ip, create_https_certificates, build_datatables_json, sanitize_out
-from plexpy.session import get_session_info, get_session_user_id, allow_session_user, allow_session_library
-from plexpy.webauth import AuthController, requireAuth, member_of, check_auth, get_jwt_token
-if common.PLATFORM == 'Windows':
-    from plexpy import windows
-elif common.PLATFORM == 'Darwin':
-    from plexpy import macos
+import threading
+import cherrypy
+import hashlib
+import random
+import json
+import os
+
+try:
+    # pylint:disable=E0611
+    # ignore this error because we are catching the ImportError
+    from collections import OrderedDict
+    # pylint:enable=E0611
+except ImportError:
+    # Python 2.6.x fallback, from libs
+    from ordereddict import OrderedDict
 
 
-TEMPLATE_LOOKUP = None
+def serve_template(templatename, **kwargs):
+    interface_dir = os.path.join(str(plexpy.PROG_DIR), 'data/interfaces/')
+    template_dir = os.path.join(str(interface_dir), plexpy.CONFIG.INTERFACE)
 
-
-def serve_template(template_name, **kwargs):
-    global TEMPLATE_LOOKUP
-    if TEMPLATE_LOOKUP is None:
-        interface_dir = os.path.join(str(plexpy.PROG_DIR), 'data/interfaces/')
-        template_dir = os.path.join(str(interface_dir), plexpy.CONFIG.INTERFACE)
-        TEMPLATE_LOOKUP = TemplateLookup(directories=[template_dir], default_filters=['unicode', 'h'],
-                            error_handler=mako_error_handler)
-
-    http_root = plexpy.HTTP_ROOT
-    server_name = helpers.pms_name()
-    cache_param = '?' + (plexpy.CURRENT_VERSION or common.RELEASE)
-
-    _session = get_session_info()
+    _hplookup = TemplateLookup(directories=[template_dir])
 
     try:
-        template = TEMPLATE_LOOKUP.get_template(template_name)
-        return template.render(http_root=http_root, server_name=server_name, cache_param=cache_param,
-                               _session=_session, **kwargs)
-    except Exception as e:
-        logger.exception("WebUI :: Mako template render error: %s" % e)
-        return mako.exceptions.html_error_template().render()
-
-
-def mako_error_handler(context, error):
-    """Decorate tracebacks when Mako errors happen.
-    Evil hack: walk the traceback frames, find compiled Mako templates,
-    stuff their (transformed) source into linecache.cache.
-    """
-    rich_tb = mako.exceptions.RichTraceback(error)
-    rich_iter = iter(rich_tb.traceback)
-    tb = sys.exc_info()[-1]
-    source = {}
-    annotated = set()
-    while tb is not None:
-        cur_rich = next(rich_iter)
-        f = tb.tb_frame
-        co = f.f_code
-        filename = co.co_filename
-        lineno = tb.tb_lineno
-        if filename.startswith('memory:'):
-            lines = source.get(filename)
-            if lines is None:
-                info = mako.template._get_module_info(filename)
-                lines = source[filename] = info.module_source.splitlines(True)
-                linecache.cache[filename] = (None, None, lines, filename)
-            if (filename, lineno) not in annotated:
-                annotated.add((filename, lineno))
-                extra = '    # {} line {} in {}:\n    # {}'.format(*cur_rich)
-                lines[lineno - 1] += extra
-        tb = tb.tb_next
-    # Don't return False -- that will lose the actual Mako frame.  Instead
-    # re-raise.
-    raise
-
-
-class BaseRedirect(object):
-    @cherrypy.expose
-    def index(self):
-        raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT)
-
-    @cherrypy.expose
-    def status(self, *args, **kwargs):
-        path = '/' + '/'.join(args) if args else ''
-        query = '?' + urlencode(kwargs) if kwargs else ''
-        raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT + 'status' + path + query)
+        template = _hplookup.get_template(templatename)
+        return template.render(**kwargs)
+    except:
+        return exceptions.html_error_template().render()
 
 
 class WebInterface(object):
 
-    auth = AuthController()
-
     def __init__(self):
         self.interface_dir = os.path.join(str(plexpy.PROG_DIR), 'data/')
 
     @cherrypy.expose
-    @requireAuth()
-    def index(self, **kwargs):
+    def index(self):
         if plexpy.CONFIG.FIRST_RUN_COMPLETE:
-            raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT + "home")
+            raise cherrypy.HTTPRedirect("home")
         else:
-            raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT + "welcome")
-
-
-    ##### Welcome #####
+            raise cherrypy.HTTPRedirect("welcome")
+
+    @cherrypy.expose
+    def home(self):
+        config = {
+            "home_stats_length": plexpy.CONFIG.HOME_STATS_LENGTH,
+            "home_stats_cards": plexpy.CONFIG.HOME_STATS_CARDS,
+            "home_library_cards": plexpy.CONFIG.HOME_LIBRARY_CARDS,
+            "pms_identifier": plexpy.CONFIG.PMS_IDENTIFIER
+        }
+        return serve_template(templatename="index.html", title="Home", config=config)
 
     @cherrypy.expose
-    @requireAuth(member_of("admin"))
     def welcome(self, **kwargs):
         config = {
+            "launch_browser": checked(plexpy.CONFIG.LAUNCH_BROWSER),
+            "refresh_users_on_startup": checked(plexpy.CONFIG.REFRESH_USERS_ON_STARTUP),
             "pms_identifier": plexpy.CONFIG.PMS_IDENTIFIER,
             "pms_ip": plexpy.CONFIG.PMS_IP,
+            "pms_is_remote": checked(plexpy.CONFIG.PMS_IS_REMOTE),
             "pms_port": plexpy.CONFIG.PMS_PORT,
-            "pms_ssl": plexpy.CONFIG.PMS_SSL,
-            "pms_is_cloud": plexpy.CONFIG.PMS_IS_CLOUD,
-            "pms_name": helpers.pms_name(),
-            "logging_ignore_interval": plexpy.CONFIG.LOGGING_IGNORE_INTERVAL
+            "pms_token": plexpy.CONFIG.PMS_TOKEN,
+            "pms_ssl": checked(plexpy.CONFIG.PMS_SSL),
+            "pms_uuid": plexpy.CONFIG.PMS_UUID,
+            "tv_notify_enable": checked(plexpy.CONFIG.TV_NOTIFY_ENABLE),
+            "movie_notify_enable": checked(plexpy.CONFIG.MOVIE_NOTIFY_ENABLE),
+            "music_notify_enable": checked(plexpy.CONFIG.MUSIC_NOTIFY_ENABLE),
+            "tv_notify_on_start": checked(plexpy.CONFIG.TV_NOTIFY_ON_START),
+            "movie_notify_on_start": checked(plexpy.CONFIG.MOVIE_NOTIFY_ON_START),
+            "music_notify_on_start": checked(plexpy.CONFIG.MUSIC_NOTIFY_ON_START),
+            "video_logging_enable": checked(plexpy.CONFIG.VIDEO_LOGGING_ENABLE),
+            "music_logging_enable": checked(plexpy.CONFIG.MUSIC_LOGGING_ENABLE),
+            "logging_ignore_interval": plexpy.CONFIG.LOGGING_IGNORE_INTERVAL,
+            "check_github": checked(plexpy.CONFIG.CHECK_GITHUB)
         }
 
         # The setup wizard just refreshes the page on submit so we must redirect to home if config set.
         if plexpy.CONFIG.FIRST_RUN_COMPLETE:
             plexpy.initialize_scheduler()
-            raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT + "home")
+            raise cherrypy.HTTPRedirect("home")
         else:
-            return serve_template(template_name="welcome.html", title="Welcome", config=config)
+            return serve_template(templatename="welcome.html", title="Welcome", config=config)
 
     @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def save_pms_token(self, token=None, client_id=None, **kwargs):
-        if token is not None:
-            plexpy.CONFIG.PMS_TOKEN = token
-        if client_id is not None:
-            plexpy.CONFIG.PMS_CLIENT_ID = client_id
-        plexpy.CONFIG.write()
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi("get_server_list")
-    def discover(self, include_cloud=True, all_servers=True, **kwargs):
-        """ Get all your servers that are published to Plex.tv.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    [{"clientIdentifier": "ds48g4r354a8v9byrrtr697g3g79w",
-                      "httpsRequired": "0",
-                      "ip": "xxx.xxx.xxx.xxx",
-                      "label": "Winterfell-Server",
-                      "local": "1",
-                      "port": "32400",
-                      "value": "xxx.xxx.xxx.xxx"
-                      },
-                     {...},
-                     {...}
-                     ]
-            ```
-        """
-        include_cloud = not (include_cloud == 'false')
-        all_servers = not (all_servers == 'false')
-
-        plex_tv = plextv.PlexTV()
-        servers_list = plex_tv.discover(include_cloud=include_cloud,
-                                        all_servers=all_servers)
-
-        if servers_list:
-            return servers_list
-
-
-    ##### Home #####
-
-    @cherrypy.expose
-    @requireAuth()
-    def home(self, **kwargs):
-        config = {
-            "home_sections": plexpy.CONFIG.HOME_SECTIONS,
-            "home_refresh_interval": plexpy.CONFIG.HOME_REFRESH_INTERVAL,
-            "pms_name": helpers.pms_name(),
-            "pms_is_cloud": plexpy.CONFIG.PMS_IS_CLOUD,
-            "update_show_changelog": plexpy.CONFIG.UPDATE_SHOW_CHANGELOG,
-            "first_run_complete": plexpy.CONFIG.FIRST_RUN_COMPLETE
-        }
-        return serve_template(template_name="index.html", title="Home", config=config)
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @addtoapi()
-    def get_date_formats(self, **kwargs):
-        """ Get the date and time formats used by Tautulli.
-
-             ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    {"date_format": "YYYY-MM-DD",
-                     "time_format": "HH:mm",
-                     }
-            ```
-        """
+    def get_date_formats(self):
         if plexpy.CONFIG.DATE_FORMAT:
             date_format = plexpy.CONFIG.DATE_FORMAT
         else:
@@ -286,1107 +120,142 @@ class WebInterface(object):
         formats = {'date_format': date_format,
                    'time_format': time_format}
 
-        return formats
+        cherrypy.response.headers['Content-type'] = 'application/json'
+        return json.dumps(formats)
 
     @cherrypy.expose
-    @requireAuth()
-    def get_current_activity(self, **kwargs):
-
-        pms_connect = pmsconnect.PmsConnect(token=plexpy.CONFIG.PMS_TOKEN)
-        result = pms_connect.get_current_activity()
-
-        if result:
-            return serve_template(template_name="current_activity.html", data=result)
-        else:
-            logger.warn("Unable to retrieve data for get_current_activity.")
-            return serve_template(template_name="current_activity.html", data=None)
-
-    @cherrypy.expose
-    @requireAuth()
-    def get_current_activity_instance(self, session_key=None, **kwargs):
-
-        pms_connect = pmsconnect.PmsConnect(token=plexpy.CONFIG.PMS_TOKEN)
-        result = pms_connect.get_current_activity()
-
-        if result:
-            session = next((s for s in result['sessions'] if s['session_key'] == session_key), None)
-            return serve_template(template_name="current_activity_instance.html", session=session)
-        else:
-            return serve_template(template_name="current_activity_instance.html", session=None)
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def terminate_session(self, session_key='', session_id='', message='', **kwargs):
-        """ Stop a streaming session.
-
-            ```
-            Required parameters:
-                session_key (int):          The session key of the session to terminate, OR
-                session_id (str):           The session id of the session to terminate
-
-            Optional parameters:
-                message (str):              A custom message to send to the client
-
-            Returns:
-                None
-            ```
-        """
-        pms_connect = pmsconnect.PmsConnect()
-        result = pms_connect.terminate_session(session_key=session_key, session_id=session_id, message=message)
-
-        if isinstance(result, str):
-            return {'result': 'error', 'message': 'Failed to terminate session: {}.'.format(result)}
-        elif result is True:
-            return {'result': 'success', 'message': 'Session terminated.'}
-        else:
-            return {'result': 'error', 'message': 'Failed to terminate session.'}
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def open_plex_xml(self, endpoint='', plextv=False, **kwargs):
-        if helpers.bool_true(plextv):
-            base_url = 'https://plex.tv'
-        else:
-            base_url = plexpy.CONFIG.PMS_URL_OVERRIDE or plexpy.CONFIG.PMS_URL
-
-        if '{machine_id}' in endpoint:
-            endpoint = endpoint.format(machine_id=plexpy.CONFIG.PMS_IDENTIFIER)
-
-        url = base_url + endpoint + ('?' + urlencode(kwargs) if kwargs else '')
-        return serve_template(template_name="xml_shortcut.html", title="Plex XML", url=url)
-
-    @cherrypy.expose
-    @requireAuth()
-    def home_stats(self, time_range=30, stats_type='plays', stats_count=10, **kwargs):
+    def home_stats(self, **kwargs):
         data_factory = datafactory.DataFactory()
+
+        time_range = plexpy.CONFIG.HOME_STATS_LENGTH
+        stats_type = plexpy.CONFIG.HOME_STATS_TYPE
+        stats_count = plexpy.CONFIG.HOME_STATS_COUNT
+        stats_cards = plexpy.CONFIG.HOME_STATS_CARDS.split(', ')
+        notify_watched_percent = plexpy.CONFIG.NOTIFY_WATCHED_PERCENT
+
         stats_data = data_factory.get_home_stats(time_range=time_range,
                                                  stats_type=stats_type,
-                                                 stats_count=stats_count)
+                                                 stats_count=stats_count,
+                                                 stats_cards=stats_cards,
+                                                 notify_watched_percent=notify_watched_percent)
 
-        return serve_template(template_name="home_stats.html", title="Stats", data=stats_data)
+        return serve_template(templatename="home_stats.html", title="Stats", data=stats_data)
 
     @cherrypy.expose
-    @requireAuth()
     def library_stats(self, **kwargs):
-        data_factory = datafactory.DataFactory()
+        pms_connect = pmsconnect.PmsConnect()
 
-        library_cards = plexpy.CONFIG.HOME_LIBRARY_CARDS
+        library_cards = plexpy.CONFIG.HOME_LIBRARY_CARDS.split(', ')
 
-        stats_data = data_factory.get_library_stats(library_cards=library_cards)
+        if library_cards == ['library_statistics_first']:
+            library_cards = ['library_statistics']
+            server_children = pms_connect.get_server_children()
+            server_libraries = server_children['libraries_list']
 
-        return serve_template(template_name="library_stats.html", title="Library Stats", data=stats_data)
+            for library in server_libraries:
+                library_cards.append(library['key'])
+
+            plexpy.CONFIG.HOME_LIBRARY_CARDS = ', '.join(library_cards)
+            plexpy.CONFIG.write()
+
+        stats_data = pms_connect.get_library_stats(library_cards=library_cards)
+
+        return serve_template(templatename="library_stats.html", title="Library Stats", data=stats_data)
 
     @cherrypy.expose
-    @requireAuth()
-    def get_recently_added(self, count='0', media_type='', **kwargs):
-
-        try:
-            pms_connect = pmsconnect.PmsConnect()
-            result = pms_connect.get_recently_added_details(count=count, media_type=media_type)
-        except IOError as e:
-            return serve_template(template_name="recently_added.html", data=None)
-
-        if result and 'recently_added' in result:
-            return serve_template(template_name="recently_added.html", data=result['recently_added'])
-        else:
-            logger.warn("Unable to retrieve data for get_recently_added.")
-            return serve_template(template_name="recently_added.html", data=None)
+    def history(self):
+        return serve_template(templatename="history.html", title="History")
 
     @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def regroup_history(self, **kwargs):
-        """ Regroup play history in the database."""
-
-        threading.Thread(target=activity_processor.regroup_history).start()
-
-        return {'result': 'success',
-                'message': 'Regrouping play history started. Check the logs to monitor any problems.'}
+    def users(self):
+        return serve_template(templatename="users.html", title="Users")
 
     @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def delete_temp_sessions(self, **kwargs):
-        """ Flush out all of the temporary sessions in the database."""
-
-        result = database.delete_sessions()
-
-        if result:
-            return {'result': 'success', 'message': 'Temporary sessions flushed.'}
-        else:
-            return {'result': 'error', 'message': 'Flush sessions failed.'}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def delete_recently_added(self, **kwargs):
-        """ Flush out all of the recently added items in the database."""
-
-        result = database.delete_recently_added()
-
-        if result:
-            return {'result': 'success', 'message': 'Recently added flushed.'}
-        else:
-            return {'result': 'error', 'message': 'Flush recently added failed.'}
-
-    ##### Libraries #####
-
-    @cherrypy.expose
-    @requireAuth()
-    def libraries(self, **kwargs):
-        return serve_template(template_name="libraries.html", title="Libraries")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @sanitize_out()
-    @addtoapi("get_libraries_table")
-    def get_library_list(self, grouping=None, **kwargs):
-        """ Get the data on the Tautulli libraries table.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                grouping (int):                 0 or 1
-                order_column (str):             "library_thumb", "section_name", "section_type", "count", "parent_count",
-                                                "child_count", "last_accessed", "last_played", "plays", "duration"
-                order_dir (str):                "desc" or "asc"
-                start (int):                    Row to start from, 0
-                length (int):                   Number of items to return, 25
-                search (str):                   A string to search for, "Movies"
-
-            Returns:
-                json:
-                    {"draw": 1,
-                     "recordsTotal": 10,
-                     "recordsFiltered": 10,
-                     "data":
-                        [{"child_count": 3745,
-                          "content_rating": "TV-MA",
-                          "count": 62,
-                          "do_notify": 1,
-                          "do_notify_created": 1,
-                          "duration": 1578037,
-                          "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en",
-                          "histroy_row_id": 1128,
-                          "is_active": 1,
-                          "keep_history": 1,
-                          "labels": [],
-                          "last_accessed": 1462693216,
-                          "last_played": "Game of Thrones - The Red Woman",
-                          "library_art": "/:/resources/show-fanart.jpg",
-                          "library_thumb": "/:/resources/show.png",
-                          "live": 0,
-                          "media_index": 1,
-                          "media_type": "episode",
-                          "originally_available_at": "2016-04-24",
-                          "parent_count": 240,
-                          "parent_media_index": 6,
-                          "parent_title": "",
-                          "plays": 772,
-                          "rating_key": 153037,
-                          "row_id": 1,
-                          "section_id": 2,
-                          "section_name": "TV Shows",
-                          "section_type": "Show",
-                          "server_id": "ds48g4r354a8v9byrrtr697g3g79w",
-                          "thumb": "/library/metadata/153036/thumb/1462175062",
-                          "year": 2016
-                          },
-                         {...},
-                         {...}
-                         ]
-                     }
-            ```
-        """
-        # Check if datatables json_data was received.
-        # If not, then build the minimal amount of json data for a query
-        if not kwargs.get('json_data'):
-            # TODO: Find some one way to automatically get the columns
-            dt_columns = [("library_thumb", False, False),
-                          ("section_name", True, True),
-                          ("section_type", True, True),
-                          ("count", True, True),
-                          ("parent_count", True, True),
-                          ("child_count", True, True),
-                          ("last_accessed", True, False),
-                          ("last_played", True, True),
-                          ("plays", True, False),
-                          ("duration", True, False)]
-            kwargs['json_data'] = build_datatables_json(kwargs, dt_columns, "section_name")
-
-        grouping = helpers.bool_true(grouping, return_none=True)
-
-        library_data = libraries.Libraries()
-        library_list = library_data.get_datatables_list(kwargs=kwargs, grouping=grouping)
-
-        return library_list
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @sanitize_out()
-    @addtoapi("get_library_names")
-    def get_library_sections(self, **kwargs):
-        """ Get a list of library sections and ids on the PMS.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    [{"section_id": 1, "section_name": "Movies", "section_type": "movie"},
-                     {"section_id": 7, "section_name": "Music", "section_type": "artist"},
-                     {"section_id": 2, "section_name": "TV Shows", "section_type": "show"},
-                     {...}
-                     ]
-            ```
-        """
-        library_data = libraries.Libraries()
-        result = library_data.get_sections()
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_library_sections.")
-            return result
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def refresh_libraries_list(self, **kwargs):
-        """ Manually refresh the libraries list. """
-        logger.info("Manual libraries list refresh requested.")
-        result = libraries.refresh_libraries()
-
-        if result:
-            return {'result': 'success', 'message': 'Libraries list refreshed.'}
-        else:
-            return {'result': 'error', 'message': 'Unable to refresh libraries list.'}
-
-    @cherrypy.expose
-    @requireAuth()
-    def library(self, section_id=None, **kwargs):
-        if not allow_session_library(section_id):
-            raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT)
+    def graphs(self):
 
         config = {
-            "get_file_sizes": plexpy.CONFIG.GET_FILE_SIZES,
-            "get_file_sizes_hold": plexpy.CONFIG.GET_FILE_SIZES_HOLD
+            "music_logging_enable": plexpy.CONFIG.MUSIC_LOGGING_ENABLE
         }
 
-        if section_id:
-            try:
-                library_data = libraries.Libraries()
-                library_details = library_data.get_details(section_id=section_id)
-            except:
-                logger.warn("Unable to retrieve library details for section_id %s " % section_id)
-                return serve_template(template_name="library.html", title="Library", data=None, config=config)
-        else:
-            logger.debug("Library page requested but no section_id received.")
-            return serve_template(template_name="library.html", title="Library", data=None, config=config)
-
-        return serve_template(template_name="library.html", title="Library", data=library_details, config=config)
+        return serve_template(templatename="graphs.html", title="Graphs", config=config)
 
     @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def edit_library_dialog(self, section_id=None, **kwargs):
-        if section_id:
-            library_data = libraries.Libraries()
-            result = library_data.get_details(section_id=section_id)
+    def sync(self):
+        return serve_template(templatename="sync.html", title="Synced Items")
+
+    @cherrypy.expose
+    def user(self, user=None, user_id=None):
+        user_data = users.Users()
+        if user_id:
+            try:
+                user_details = user_data.get_user_details(user_id=user_id)
+            except:
+                logger.warn("Unable to retrieve friendly name for user_id %s " % user_id)
+        elif user:
+            try:
+                user_details = user_data.get_user_details(user=user)
+            except:
+                logger.warn("Unable to retrieve friendly name for user %s " % user)
+        else:
+            logger.debug(u"User page requested but no parameters received.")
+            raise cherrypy.HTTPRedirect("home")
+
+        return serve_template(templatename="user.html", title="User", data=user_details)
+
+    @cherrypy.expose
+    def edit_user_dialog(self, user=None, user_id=None, **kwargs):
+        user_data = users.Users()
+        if user_id:
+            result = user_data.get_user_friendly_name(user_id=user_id)
+            status_message = ''
+        elif user:
+            result = user_data.get_user_friendly_name(user=user)
             status_message = ''
         else:
             result = None
-            status_message = 'An error occurred.'
+            status_message = 'An error occured.'
 
-        return serve_template(template_name="edit_library.html", title="Edit Library",
-                              data=result, server_id=plexpy.CONFIG.PMS_IDENTIFIER, status_message=status_message)
+        return serve_template(templatename="edit_user.html", title="Edit User", data=result, status_message=status_message)
 
     @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def edit_library(self, section_id=None, **kwargs):
-        """ Update a library section on Tautulli.
-
-            ```
-            Required parameters:
-                section_id (str):           The id of the Plex library section
-                custom_thumb (str):         The URL for the custom library thumbnail
-                custom_art (str):           The URL for the custom library background art
-                keep_history (int):         0 or 1
-
-            Optional parameters:
-                None
-
-            Returns:
-                None
-            ```
-        """
-        custom_thumb = kwargs.get('custom_thumb', '')
-        custom_art = kwargs.get('custom_art', '')
-        do_notify = kwargs.get('do_notify', 0)
-        do_notify_created = kwargs.get('do_notify_created', 0)
-        keep_history = kwargs.get('keep_history', 0)
-
-        if section_id:
-            try:
-                library_data = libraries.Libraries()
-                library_data.set_config(section_id=section_id,
-                                        custom_thumb=custom_thumb,
-                                        custom_art=custom_art,
-                                        do_notify=do_notify,
-                                        do_notify_created=do_notify_created,
-                                        keep_history=keep_history)
-
-                return "Successfully updated library."
-            except:
-                return "Failed to update library."
-
-    @cherrypy.expose
-    @requireAuth()
-    def library_watch_time_stats(self, section_id=None, **kwargs):
-        if not allow_session_library(section_id):
-            return serve_template(template_name="user_watch_time_stats.html", data=None, title="Watch Stats")
-
-        if section_id:
-            library_data = libraries.Libraries()
-            result = library_data.get_watch_time_stats(section_id=section_id)
+    def edit_user(self, user=None, user_id=None, friendly_name=None, **kwargs):
+        if 'do_notify' in kwargs:
+            do_notify = kwargs.get('do_notify')
         else:
-            result = None
-
-        if result:
-            return serve_template(template_name="user_watch_time_stats.html", data=result, title="Watch Stats")
+            do_notify = 0
+        if 'keep_history' in kwargs:
+            keep_history = kwargs.get('keep_history')
         else:
-            logger.warn("Unable to retrieve data for library_watch_time_stats.")
-            return serve_template(template_name="user_watch_time_stats.html", data=None, title="Watch Stats")
-
-    @cherrypy.expose
-    @requireAuth()
-    def library_user_stats(self, section_id=None, **kwargs):
-        if not allow_session_library(section_id):
-            return serve_template(template_name="library_user_stats.html", data=None, title="Player Stats")
-
-        if section_id:
-            library_data = libraries.Libraries()
-            result = library_data.get_user_stats(section_id=section_id)
+            keep_history = 0
+        if 'thumb' in kwargs:
+            custom_avatar = kwargs['thumb']
         else:
-            result = None
-
-        if result:
-            return serve_template(template_name="library_user_stats.html", data=result, title="Player Stats")
-        else:
-            logger.warn("Unable to retrieve data for library_user_stats.")
-            return serve_template(template_name="library_user_stats.html", data=None, title="Player Stats")
-
-    @cherrypy.expose
-    @requireAuth()
-    def library_recently_watched(self, section_id=None, limit='10', **kwargs):
-        if not allow_session_library(section_id):
-            return serve_template(template_name="user_recently_watched.html", data=None, title="Recently Watched")
-
-        if section_id:
-            library_data = libraries.Libraries()
-            result = library_data.get_recently_watched(section_id=section_id, limit=limit)
-        else:
-            result = None
-
-        if result:
-            return serve_template(template_name="user_recently_watched.html", data=result, title="Recently Watched")
-        else:
-            logger.warn("Unable to retrieve data for library_recently_watched.")
-            return serve_template(template_name="user_recently_watched.html", data=None, title="Recently Watched")
-
-    @cherrypy.expose
-    @requireAuth()
-    def library_recently_added(self, section_id=None, limit='10', **kwargs):
-        if not allow_session_library(section_id):
-            return serve_template(template_name="library_recently_added.html", data=None, title="Recently Added")
-
-        if section_id:
-            pms_connect = pmsconnect.PmsConnect()
-            result = pms_connect.get_recently_added_details(section_id=section_id, count=limit)
-        else:
-            result = None
-
-        if result and result['recently_added']:
-            return serve_template(template_name="library_recently_added.html", data=result['recently_added'], title="Recently Added")
-        else:
-            logger.warn("Unable to retrieve data for library_recently_added.")
-            return serve_template(template_name="library_recently_added.html", data=None, title="Recently Added")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_library_media_info(self, section_id=None, section_type=None, rating_key=None, refresh='', **kwargs):
-        """ Get the data on the Tautulli media info tables.
-
-            ```
-            Required parameters:
-                section_id (str):               The id of the Plex library section, OR
-                rating_key (str):               The grandparent or parent rating key
-
-            Optional parameters:
-                section_type (str):             "movie", "show", "artist", "photo"
-                order_column (str):             "added_at", "sort_title", "container", "bitrate", "video_codec",
-                                                "video_resolution", "video_framerate", "audio_codec", "audio_channels",
-                                                "file_size", "last_played", "play_count"
-                order_dir (str):                "desc" or "asc"
-                start (int):                    Row to start from, 0
-                length (int):                   Number of items to return, 25
-                search (str):                   A string to search for, "Thrones"
-                refresh (str):                  "true" to refresh the media info table
-
-            Returns:
-                json:
-                    {"draw": 1,
-                     "last_refreshed": 1678734670,
-                     "recordsTotal": 82,
-                     "recordsFiltered": 82,
-                     "filtered_file_size": 2616760056742,
-                     "total_file_size": 2616760056742,
-                     "data":
-                        [{"added_at": "1403553078",
-                          "audio_channels": "",
-                          "audio_codec": "",
-                          "bitrate": "",
-                          "container": "",
-                          "file_size": 253660175293,
-                          "grandparent_rating_key": "",
-                          "last_played": 1462380698,
-                          "media_index": "1",
-                          "media_type": "show",
-                          "parent_media_index": "",
-                          "parent_rating_key": "",
-                          "play_count": 15,
-                          "rating_key": "1219",
-                          "section_id": 2,
-                          "section_type": "show",
-                          "sort_title": "Game of Thrones",
-                          "thumb": "/library/metadata/1219/thumb/1436265995",
-                          "title": "Game of Thrones",
-                          "video_codec": "",
-                          "video_framerate": "",
-                          "video_resolution": "",
-                          "year": "2011"
-                          },
-                         {...},
-                         {...}
-                         ]
-                     }
-            ```
-        """
-        # Check if datatables json_data was received.
-        # If not, then build the minimal amount of json data for a query
-        if not kwargs.get('json_data'):
-            # Alias 'title' to 'sort_title'
-            if kwargs.get('order_column') == 'title':
-                kwargs['order_column'] = 'sort_title'
-
-            # TODO: Find some one way to automatically get the columns
-            dt_columns = [("added_at", True, False),
-                          ("sort_title", True, True),
-                          ("container", True, True),
-                          ("bitrate", True, True),
-                          ("video_codec", True, True),
-                          ("video_resolution", True, True),
-                          ("video_framerate", True, True),
-                          ("audio_codec", True, True),
-                          ("audio_channels", True, True),
-                          ("file_size", True, False),
-                          ("last_played", True, False),
-                          ("play_count", True, False)]
-            kwargs['json_data'] = build_datatables_json(kwargs, dt_columns, "sort_title")
-
-        if helpers.bool_true(refresh):
-            refresh = True
-        else:
-            refresh = False
-
-        library_data = libraries.Libraries()
-        result = library_data.get_datatables_media_info(section_id=section_id,
-                                                        section_type=section_type,
-                                                        rating_key=rating_key,
-                                                        refresh=refresh,
-                                                        kwargs=kwargs)
-
-        return result
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @addtoapi("get_collections_table")
-    def get_collections_list(self, section_id=None, **kwargs):
-        """ Get the data on the Tautulli collections tables.
-
-            ```
-            Required parameters:
-                section_id (str):               The id of the Plex library section
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    {"draw": 1,
-                     "recordsTotal": 5,
-                     "data":
-                        [...]
-                     }
-            ```
-        """
-        # Check if datatables json_data was received.
-        # If not, then build the minimal amount of json data for a query
-        if not kwargs.get('json_data'):
-            # TODO: Find some one way to automatically get the columns
-            dt_columns = [("titleSort", True, True),
-                          ("collectionMode", True, True),
-                          ("collectionSort", True, True),
-                          ("childCount", True, False)]
-            kwargs['json_data'] = build_datatables_json(kwargs, dt_columns, "titleSort")
-
-        result = libraries.get_collections_list(section_id=section_id, **kwargs)
-
-        return result
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @addtoapi("get_playlists_table")
-    def get_playlists_list(self, section_id=None, user_id=None, **kwargs):
-        """ Get the data on the Tautulli playlists tables.
-
-            ```
-            Required parameters:
-                section_id (str):               The section id of the Plex library, OR
-                user_id (str):                  The user id of the Plex user
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    {"draw": 1,
-                     "recordsTotal": 5,
-                     "data":
-                        [...]
-                     }
-            ```
-        """
-        # Check if datatables json_data was received.
-        # If not, then build the minimal amount of json data for a query
-        if not kwargs.get('json_data'):
-            # TODO: Find some one way to automatically get the columns
-            dt_columns = [("title", True, True),
-                          ("leafCount", True, True),
-                          ("duration", True, True)]
-            kwargs['json_data'] = build_datatables_json(kwargs, dt_columns, "title")
-
-        result = libraries.get_playlists_list(section_id=section_id,
-                                              user_id=user_id,
-                                              **kwargs)
-
-        return result
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def get_media_info_file_sizes(self, section_id=None, rating_key=None, **kwargs):
-        get_file_sizes_hold = plexpy.CONFIG.GET_FILE_SIZES_HOLD
-        section_ids = set(get_file_sizes_hold['section_ids'])
-        rating_keys = set(get_file_sizes_hold['rating_keys'])
-
-        section_id = helpers.cast_to_int(section_id)
-        rating_key = helpers.cast_to_int(rating_key)
-
-        if (section_id and section_id not in section_ids) or (rating_key and rating_key not in rating_keys):
-            if section_id:
-                section_ids.add(section_id)
-            elif rating_key:
-                rating_keys.add(rating_key)
-            plexpy.CONFIG.GET_FILE_SIZES_HOLD = {'section_ids': list(section_ids), 'rating_keys': list(rating_keys)}
-
-            library_data = libraries.Libraries()
-            result = library_data.get_media_info_file_sizes(section_id=section_id,
-                                                            rating_key=rating_key)
-
-            if section_id:
-                section_ids.remove(section_id)
-            elif rating_key:
-                rating_keys.remove(rating_key)
-            plexpy.CONFIG.GET_FILE_SIZES_HOLD = {'section_ids': list(section_ids), 'rating_keys': list(rating_keys)}
-        else:
-            result = False
-
-        return {'success': result}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_library(self, section_id=None, include_last_accessed=False, **kwargs):
-        """ Get a library's details.
-
-            ```
-            Required parameters:
-                section_id (str):               The id of the Plex library section
-
-            Optional parameters:
-                include_last_accessed (bool):   True to include the last_accessed value for the library.
-
-            Returns:
-                json:
-                    {"child_count": null,
-                     "count": 887,
-                     "deleted_section": 0,
-                     "do_notify": 1,
-                     "do_notify_created": 1,
-                     "is_active": 1,
-                     "keep_history": 1,
-                     "last_accessed": 1462693216,
-                     "library_art": "/:/resources/movie-fanart.jpg",
-                     "library_thumb": "/:/resources/movie.png",
-                     "parent_count": null,
-                     "row_id": 1,
-                     "section_id": 1,
-                     "section_name": "Movies",
-                     "section_type": "movie",
-                     "server_id": "ds48g4r354a8v9byrrtr697g3g79w"
-                     }
-            ```
-        """
-        include_last_accessed = helpers.bool_true(include_last_accessed)
-        if section_id:
-            library_data = libraries.Libraries()
-            library_details = library_data.get_details(section_id=section_id,
-                                                       include_last_accessed=include_last_accessed)
-            if library_details:
-                return library_details
-            else:
-                logger.warn("Unable to retrieve data for get_library.")
-                return library_details
-        else:
-            logger.warn("Library details requested but no section_id received.")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_library_watch_time_stats(self, section_id=None, grouping=None, query_days=None, **kwargs):
-        """ Get a library's watch time statistics.
-
-            ```
-            Required parameters:
-                section_id (str):       The id of the Plex library section
-
-            Optional parameters:
-                grouping (int):         0 or 1
-                query_days (str):       Comma separated days, e.g. "1,7,30,0"
-
-            Returns:
-                json:
-                    [{"query_days": 1,
-                      "total_plays": 0,
-                      "total_time": 0
-                      },
-                     {"query_days": 7,
-                      "total_plays": 3,
-                      "total_time": 15694
-                      },
-                     {"query_days": 30,
-                      "total_plays": 35,
-                      "total_time": 63054
-                      },
-                     {"query_days": 0,
-                      "total_plays": 508,
-                      "total_time": 1183080
-                      }
-                     ]
-            ```
-        """
-        grouping = helpers.bool_true(grouping, return_none=True)
-
-        if section_id:
-            library_data = libraries.Libraries()
-            result = library_data.get_watch_time_stats(section_id=section_id, grouping=grouping,
-                                                       query_days=query_days)
-            if result:
-                return result
-            else:
-                logger.warn("Unable to retrieve data for get_library_watch_time_stats.")
-                return result
-        else:
-            logger.warn("Library watch time stats requested but no section_id received.")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_library_user_stats(self, section_id=None, grouping=None, **kwargs):
-        """ Get a library's user statistics.
-
-            ```
-            Required parameters:
-                section_id (str):       The id of the Plex library section
-
-            Optional parameters:
-                grouping (int):         0 or 1
-
-            Returns:
-                json:
-                    [{"friendly_name": "Jon Snow",
-                      "total_plays": 170,
-                      "total_time": 349618,
-                      "user_id": 133788,
-                      "user_thumb": "https://plex.tv/users/k10w42309cynaopq/avatar",
-                      "username": "LordCommanderSnow"
-                      },
-                     {"friendly_name": "DanyKhaleesi69",
-                      "total_plays": 42,
-                      "total_time": 50185,
-                      "user_id": 8008135,
-                      "user_thumb": "https://plex.tv/users/568gwwoib5t98a3a/avatar",
-                      "username: "DanyKhaleesi69"
-                      },
-                     {...},
-                     {...}
-                     ]
-            ```
-        """
-        grouping = helpers.bool_true(grouping, return_none=True)
-
-        if section_id:
-            library_data = libraries.Libraries()
-            result = library_data.get_user_stats(section_id=section_id, grouping=grouping)
-            if result:
-                return result
-            else:
-                logger.warn("Unable to retrieve data for get_library_user_stats.")
-                return result
-        else:
-            logger.warn("Library user stats requested but no section_id received.")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def delete_all_library_history(self, server_id=None, section_id=None, row_ids=None, **kwargs):
-        """ Delete all Tautulli history for a specific library.
-
-            ```
-            Required parameters:
-                server_id (str):        The Plex server identifier of the library section
-                section_id (str):       The id of the Plex library section
-
-            Optional parameters:
-                row_ids (str):          Comma separated row ids to delete, e.g. "2,3,8"
-
-            Returns:
-                None
-            ```
-        """
-        if (server_id and section_id) or row_ids:
-            library_data = libraries.Libraries()
-            success = library_data.delete(server_id=server_id, section_id=section_id, row_ids=row_ids, purge_only=True)
-            if success:
-                return {'result': 'success', 'message': 'Deleted library history.'}
-            else:
-                return {'result': 'error', 'message': 'Failed to delete library(s) history.'}
-        else:
-            return {'result': 'error', 'message': 'No server id and section id or row ids received.'}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def delete_library(self, server_id=None, section_id=None, row_ids=None, **kwargs):
-        """ Delete a library section from Tautulli. Also erases all history for the library.
-
-            ```
-            Required parameters:
-                server_id (str):        The Plex server identifier of the library section
-                section_id (str):       The id of the Plex library section
-
-            Optional parameters:
-                row_ids (str):          Comma separated row ids to delete, e.g. "2,3,8"
-
-            Returns:
-                None
-            ```
-        """
-        if (server_id and section_id) or row_ids:
-            library_data = libraries.Libraries()
-            success = library_data.delete(server_id=server_id, section_id=section_id, row_ids=row_ids)
-            if success:
-                return {'result': 'success', 'message': 'Deleted library.'}
-            else:
-                return {'result': 'error', 'message': 'Failed to delete library(s).'}
-        else:
-            return {'result': 'error', 'message': 'No server id and section id or row ids received.'}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def undelete_library(self, section_id=None, section_name=None, **kwargs):
-        """ Restore a deleted library section to Tautulli.
-
-            ```
-            Required parameters:
-                section_id (str):       The id of the Plex library section
-                section_name (str):     The name of the Plex library section
-
-            Optional parameters:
-                None
-
-            Returns:
-                None
-            ```
-        """
-        library_data = libraries.Libraries()
-        result = library_data.undelete(section_id=section_id, section_name=section_name)
-        if result:
-            if section_id:
-                msg ='section_id %s' % section_id
-            elif section_name:
-                msg = 'section_name %s' % section_name
-            return {'result': 'success', 'message': 'Re-added library with %s.' % msg}
-        return {'result': 'error', 'message': 'Unable to re-add library. Invalid section_id or section_name.'}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def delete_media_info_cache(self, section_id, **kwargs):
-        """ Delete the media info table cache for a specific library.
-
-            ```
-            Required parameters:
-                section_id (str):       The id of the Plex library section
-
-            Optional parameters:
-                None
-
-            Returns:
-                None
-            ```
-        """
-        get_file_sizes_hold = plexpy.CONFIG.GET_FILE_SIZES_HOLD
-        section_ids = set(get_file_sizes_hold['section_ids'])
-
-        if section_id not in section_ids:
-            if section_id:
-                library_data = libraries.Libraries()
-                delete_row = library_data.delete_media_info_cache(section_id=section_id)
-
-                if delete_row:
-                    return {'message': delete_row}
-            else:
-                return {'message': 'no data received'}
-        else:
-            return {'message': 'Cannot delete media info cache while getting file sizes.'}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def delete_duplicate_libraries(self, **kwargs):
-        library_data = libraries.Libraries()
-
-        result = library_data.delete_duplicate_libraries()
-
-        if result:
-            return {'message': result}
-        else:
-            return {'message': 'Unable to delete duplicate libraries from the database.'}
-
-    ##### Users #####
-
-    @cherrypy.expose
-    @requireAuth()
-    def users(self, **kwargs):
-        return serve_template(template_name="users.html", title="Users")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @sanitize_out()
-    @addtoapi("get_users_table")
-    def get_user_list(self, grouping=None, **kwargs):
-        """ Get the data on Tautulli users table.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                grouping (int):                 0 or 1
-                order_column (str):             "user_thumb", "friendly_name", "last_seen", "ip_address", "platform",
-                                                "player", "last_played", "plays", "duration"
-                order_dir (str):                "desc" or "asc"
-                start (int):                    Row to start from, 0
-                length (int):                   Number of items to return, 25
-                search (str):                   A string to search for, "Jon Snow"
-
-            Returns:
-                json:
-                    {"draw": 1,
-                     "recordsTotal": 10,
-                     "recordsFiltered": 10,
-                     "data":
-                        [{"allow_guest": 1,
-                          "do_notify": 1,
-                          "duration": 2998290,
-                          "email": "Jon.Snow.1337@CastleBlack.com",
-                          "friendly_name": "Jon Snow",
-                          "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en",
-                          "history_row_id": 1121,
-                          "ip_address": "xxx.xxx.xxx.xxx",
-                          "is_active": 1,
-                          "keep_history": 1,
-                          "last_played": "Game of Thrones - The Red Woman",
-                          "last_seen": 1462591869,
-                          "live": 0,
-                          "media_index": 1,
-                          "media_type": "episode",
-                          "originally_available_at": "2016-04-24",
-                          "parent_media_index": 6,
-                          "parent_title": "",
-                          "platform": "Chrome",
-                          "player": "Plex Web (Chrome)",
-                          "plays": 487,
-                          "rating_key": 153037,
-                          "row_id": 1,
-                          "thumb": "/library/metadata/153036/thumb/1462175062",
-                          "title": "Jon Snow",
-                          "transcode_decision": "transcode",
-                          "user_id": 133788,
-                          "user_thumb": "https://plex.tv/users/568gwwoib5t98a3a/avatar",
-                          "username": "LordCommanderSnow",
-                          "year": 2016
-                          },
-                         {...},
-                         {...}
-                         ]
-                     }
-            ```
-        """
-        # Check if datatables json_data was received.
-        # If not, then build the minimal amount of json data for a query
-        if not kwargs.get('json_data'):
-            # TODO: Find some one way to automatically get the columns
-            dt_columns = [("user_thumb", False, False),
-                          ("friendly_name", True, True),
-                          ("username", True, True),
-                          ("title", True, True),
-                          ("email", True, True),
-                          ("last_seen", True, False),
-                          ("ip_address", True, True),
-                          ("platform", True, True),
-                          ("player", True, True),
-                          ("last_played", True, False),
-                          ("plays", True, False),
-                          ("duration", True, False)]
-            kwargs['json_data'] = build_datatables_json(kwargs, dt_columns, "friendly_name")
-
-        grouping = helpers.bool_true(grouping, return_none=True)
+            custom_avatar = ''
 
         user_data = users.Users()
-        user_list = user_data.get_datatables_list(kwargs=kwargs, grouping=grouping)
-
-        return user_list
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def refresh_users_list(self, **kwargs):
-        """ Manually refresh the users list. """
-        logger.info("Manual users list refresh requested.")
-        result = users.refresh_users()
-
-        if result:
-            return {'result': 'success', 'message': 'Users list refreshed.'}
-        else:
-            return {'result': 'error', 'message': 'Unable to refresh users list.'}
-
-    @cherrypy.expose
-    @requireAuth()
-    def user(self, user_id=None, **kwargs):
-        if not allow_session_user(user_id):
-            raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT)
-
         if user_id:
             try:
-                user_data = users.Users()
-                user_details = user_data.get_details(user_id=user_id)
+                user_data.set_user_friendly_name(user_id=user_id,
+                                                 friendly_name=friendly_name,
+                                                 do_notify=do_notify,
+                                                 keep_history=keep_history)
+                user_data.set_user_profile_url(user_id=user_id,
+                                               profile_url=custom_avatar)
+
+                status_message = "Successfully updated user."
+                return status_message
             except:
-                logger.warn("Unable to retrieve user details for user_id %s " % user_id)
-                return serve_template(template_name="user.html", title="User", data=None)
-        else:
-            logger.debug("User page requested but no user_id received.")
-            return serve_template(template_name="user.html", title="User", data=None)
-
-        return serve_template(template_name="user.html", title="User", data=user_details)
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def edit_user_dialog(self, user=None, user_id=None, **kwargs):
-        if user_id:
-            user_data = users.Users()
-            result = user_data.get_details(user_id=user_id)
-            status_message = ''
-        else:
-            result = None
-            status_message = 'An error occurred.'
-
-        return serve_template(template_name="edit_user.html", title="Edit User", data=result, status_message=status_message)
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def edit_user(self, user_id=None, **kwargs):
-        """ Update a user on Tautulli.
-
-            ```
-            Required parameters:
-                user_id (str):              The id of the Plex user
-                friendly_name(str):         The friendly name of the user
-                custom_thumb (str):         The URL for the custom user thumbnail
-                keep_history (int):         0 or 1
-                allow_guest (int):          0 or 1
-
-            Optional parameters:
-                None
-
-            Returns:
-                None
-            ```
-        """
-        friendly_name = kwargs.get('friendly_name', '')
-        custom_thumb = kwargs.get('custom_thumb', '')
-        do_notify = kwargs.get('do_notify', 0)
-        keep_history = kwargs.get('keep_history', 0)
-        allow_guest = kwargs.get('allow_guest', 0)
-
-        if user_id:
+                status_message = "Failed to update user."
+                return status_message
+        if user:
             try:
-                user_data = users.Users()
-                user_data.set_config(user_id=user_id,
-                                     friendly_name=friendly_name,
-                                     custom_thumb=custom_thumb,
-                                     do_notify=do_notify,
-                                     keep_history=keep_history,
-                                     allow_guest=allow_guest)
+                user_data.set_user_friendly_name(user=user,
+                                                 friendly_name=friendly_name,
+                                                 do_notify=do_notify,
+                                                 keep_history=keep_history)
+                user_data.set_user_profile_url(user=user,
+                                               profile_url=custom_avatar)
+
                 status_message = "Successfully updated user."
                 return status_message
             except:
@@ -1394,2386 +263,279 @@ class WebInterface(object):
                 return status_message
 
     @cherrypy.expose
-    @requireAuth()
-    def user_watch_time_stats(self, user=None, user_id=None, **kwargs):
-        if not allow_session_user(user_id):
-            return serve_template(template_name="user_watch_time_stats.html", data=None, title="Watch Stats")
-
-        if user_id or user:
-            user_data = users.Users()
-            result = user_data.get_watch_time_stats(user_id=user_id)
-        else:
-            result = None
-
-        if result:
-            return serve_template(template_name="user_watch_time_stats.html", data=result, title="Watch Stats")
-        else:
-            logger.warn("Unable to retrieve data for user_watch_time_stats.")
-            return serve_template(template_name="user_watch_time_stats.html", data=None, title="Watch Stats")
-
-    @cherrypy.expose
-    @requireAuth()
-    def user_player_stats(self, user=None, user_id=None, **kwargs):
-        if not allow_session_user(user_id):
-            return serve_template(template_name="user_player_stats.html", data=None, title="Player Stats")
-
-        if user_id or user:
-            user_data = users.Users()
-            result = user_data.get_player_stats(user_id=user_id)
-        else:
-            result = None
-
-        if result:
-            return serve_template(template_name="user_player_stats.html", data=result, title="Player Stats")
-        else:
-            logger.warn("Unable to retrieve data for user_player_stats.")
-            return serve_template(template_name="user_player_stats.html", data=None, title="Player Stats")
-
-    @cherrypy.expose
-    @requireAuth()
-    def get_user_recently_watched(self, user=None, user_id=None, limit='10', **kwargs):
-        if not allow_session_user(user_id):
-            return serve_template(template_name="user_recently_watched.html", data=None, title="Recently Watched")
-
-        if user_id or user:
-            user_data = users.Users()
-            result = user_data.get_recently_watched(user_id=user_id, limit=limit)
-        else:
-            result = None
-
-        if result:
-            return serve_template(template_name="user_recently_watched.html", data=result, title="Recently Watched")
-        else:
-            logger.warn("Unable to retrieve data for get_user_recently_watched.")
-            return serve_template(template_name="user_recently_watched.html", data=None, title="Recently Watched")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @sanitize_out()
-    @addtoapi()
-    def get_user_ips(self, user_id=None, **kwargs):
-        """ Get the data on Tautulli users IP table.
-
-            ```
-            Required parameters:
-                user_id (str):                  The id of the Plex user
-
-            Optional parameters:
-                order_column (str):             "last_seen", "first_seen", "ip_address", "platform",
-                                                "player", "last_played", "play_count"
-                order_dir (str):                "desc" or "asc"
-                start (int):                    Row to start from, 0
-                length (int):                   Number of items to return, 25
-                search (str):                   A string to search for, "xxx.xxx.xxx.xxx"
-
-            Returns:
-                json:
-                    {"draw": 1,
-                     "recordsTotal": 2344,
-                     "recordsFiltered": 10,
-                     "data":
-                        [{"friendly_name": "Jon Snow",
-                          "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en",
-                          "id": 1121,
-                          "ip_address": "xxx.xxx.xxx.xxx",
-                          "last_played": "Game of Thrones - The Red Woman",
-                          "last_seen": 1462591869,
-                          "first_seen": 1583968210,
-                          "live": 0,
-                          "media_index": 1,
-                          "media_type": "episode",
-                          "originally_available_at": "2016-04-24",
-                          "parent_media_index": 6,
-                          "parent_title": "",
-                          "platform": "Chrome",
-                          "play_count": 149,
-                          "player": "Plex Web (Chrome)",
-                          "rating_key": 153037,
-                          "thumb": "/library/metadata/153036/thumb/1462175062",
-                          "transcode_decision": "transcode",
-                          "user_id": 133788,
-                          "year": 2016
-                          },
-                         {...},
-                         {...}
-                         ]
-                     }
-            ```
-        """
-        # Check if datatables json_data was received.
-        # If not, then build the minimal amount of json data for a query
-        if not kwargs.get('json_data'):
-            # TODO: Find some one way to automatically get the columns
-            dt_columns = [("last_seen", True, False),
-                          ("first_seen", True, False),
-                          ("ip_address", True, True),
-                          ("platform", True, True),
-                          ("player", True, True),
-                          ("last_played", True, True),
-                          ("play_count", True, True)]
-            kwargs['json_data'] = build_datatables_json(kwargs, dt_columns, "last_seen")
-
-        user_data = users.Users()
-        history = user_data.get_datatables_unique_ips(user_id=user_id, kwargs=kwargs)
-
-        return history
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @sanitize_out()
-    @addtoapi()
-    def get_user_logins(self, user_id=None, **kwargs):
-        """ Get the data on Tautulli user login table.
-
-            ```
-            Required parameters:
-                user_id (str):                  The id of the Plex user
-
-            Optional parameters:
-                order_column (str):             "date", "time", "ip_address", "host", "os", "browser"
-                order_dir (str):                "desc" or "asc"
-                start (int):                    Row to start from, 0
-                length (int):                   Number of items to return, 25
-                search (str):                   A string to search for, "xxx.xxx.xxx.xxx"
-
-            Returns:
-                json:
-                    {"draw": 1,
-                     "recordsTotal": 2344,
-                     "recordsFiltered": 10,
-                     "data":
-                        [{"browser": "Safari 7.0.3",
-                          "current": false,
-                          "expiry": "2021-06-30 18:48:03",
-                          "friendly_name": "Jon Snow",
-                          "host": "http://plexpy.castleblack.com",
-                          "ip_address": "xxx.xxx.xxx.xxx",
-                          "os": "Mac OS X",
-                          "row_id": 1,
-                          "timestamp": 1462591869,
-                          "user": "LordCommanderSnow",
-                          "user_agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) AppleWebKit/537.75.14 (KHTML, like Gecko) Version/7.0.3 Safari/7046A194A",
-                          "user_group": "guest",
-                          "user_id": 133788
-                          },
-                         {...},
-                         {...}
-                         ]
-                     }
-            ```
-        """
-        # Check if datatables json_data was received.
-        # If not, then build the minimal amount of json data for a query
-        if not kwargs.get('json_data'):
-            # TODO: Find some one way to automatically get the columns
-            dt_columns = [("timestamp", True, False),
-                          ("ip_address", True, True),
-                          ("host", True, True),
-                          ("os", True, True),
-                          ("browser", True, True)]
-            kwargs['json_data'] = build_datatables_json(kwargs, dt_columns, "timestamp")
-
-        jwt_token = get_jwt_token()
-
-        user_data = users.Users()
-        history = user_data.get_datatables_user_login(user_id=user_id,
-                                                      jwt_token=jwt_token,
-                                                      kwargs=kwargs)
-
-        return history
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def logout_user_session(self, row_ids=None, **kwargs):
-        """ Logout Tautulli user sessions.
-
-            ```
-            Required parameters:
-                row_ids (str):          Comma separated row ids to sign out, e.g. "2,3,8"
-
-            Optional parameters:
-                None
-
-            Returns:
-                None
-            ```
-        """
-        user_data = users.Users()
-        result = user_data.clear_user_login_token(row_ids=row_ids)
-
-        if result:
-            return {'result': 'success', 'message': 'Users session logged out.'}
-        else:
-            return {'result': 'error', 'message': 'Unable to logout user session.'}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_user(self, user_id=None, include_last_seen=False, **kwargs):
-        """ Get a user's details.
-
-            ```
-            Required parameters:
-                user_id (str):              The id of the Plex user
-
-            Optional parameters:
-                include_last_seen (bool):   True to include the last_seen value for the user.
-
-            Returns:
-                json:
-                    {"allow_guest": 1,
-                     "deleted_user": 0,
-                     "do_notify": 1,
-                     "email": "Jon.Snow.1337@CastleBlack.com",
-                     "friendly_name": "Jon Snow",
-                     "is_active": 1,
-                     "is_admin": 0,
-                     "is_allow_sync": 1,
-                     "is_home_user": 1,
-                     "is_restricted": 0,
-                     "keep_history": 1,
-                     "last_seen": 1462591869,
-                     "row_id": 1,
-                     "shared_libraries": ["10", "1", "4", "5", "15", "20", "2"],
-                     "user_id": 133788,
-                     "user_thumb": "https://plex.tv/users/k10w42309cynaopq/avatar",
-                     "username": "LordCommanderSnow"
-                     }
-            ```
-        """
-        include_last_seen = helpers.bool_true(include_last_seen)
-        if user_id:
-            user_data = users.Users()
-            user_details = user_data.get_details(user_id=user_id,
-                                                 include_last_seen=include_last_seen)
-            if user_details:
-                return user_details
-            else:
-                logger.warn("Unable to retrieve data for get_user.")
-                return user_details
-        else:
-            logger.warn("User details requested but no user_id received.")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_user_watch_time_stats(self, user_id=None, grouping=None, query_days=None, **kwargs):
-        """ Get a user's watch time statistics.
-
-            ```
-            Required parameters:
-                user_id (str):          The id of the Plex user
-
-            Optional parameters:
-                grouping (int):         0 or 1
-                query_days (str):       Comma separated days, e.g. "1,7,30,0"
-
-            Returns:
-                json:
-                    [{"query_days": 1,
-                      "total_plays": 0,
-                      "total_time": 0
-                      },
-                     {"query_days": 7,
-                      "total_plays": 3,
-                      "total_time": 15694
-                      },
-                     {"query_days": 30,
-                      "total_plays": 35,
-                      "total_time": 63054
-                      },
-                     {"query_days": 0,
-                      "total_plays": 508,
-                      "total_time": 1183080
-                      }
-                     ]
-            ```
-        """
-        grouping = helpers.bool_true(grouping, return_none=True)
-
-        if user_id:
-            user_data = users.Users()
-            result = user_data.get_watch_time_stats(user_id=user_id, grouping=grouping, query_days=query_days)
-            if result:
-                return result
-            else:
-                logger.warn("Unable to retrieve data for get_user_watch_time_stats.")
-                return result
-        else:
-            logger.warn("User watch time stats requested but no user_id received.")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_user_player_stats(self, user_id=None, grouping=None, **kwargs):
-        """ Get a user's player statistics.
-
-            ```
-            Required parameters:
-                user_id (str):          The id of the Plex user
-
-            Optional parameters:
-                grouping (int):         0 or 1
-
-            Returns:
-                json:
-                    [{"platform": "Chrome",
-                      "platform_name": "chrome",
-                      "player_name": "Plex Web (Chrome)",
-                      "result_id": 1,
-                      "total_plays": 170,
-                      "total_time": 349618
-                      },
-                     {"platform": "Chromecast",
-                      "platform_name": "chromecast",
-                      "player_name": "Chromecast",
-                      "result_id": 2,
-                      "total_plays": 42,
-                      "total_time": 50185
-                      },
-                     {...},
-                     {...}
-                     ]
-            ```
-        """
-        grouping = helpers.bool_true(grouping, return_none=True)
-
-        if user_id:
-            user_data = users.Users()
-            result = user_data.get_player_stats(user_id=user_id, grouping=grouping)
-            if result:
-                return result
-            else:
-                logger.warn("Unable to retrieve data for get_user_player_stats.")
-                return result
-        else:
-            logger.warn("User watch time stats requested but no user_id received.")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def delete_all_user_history(self, user_id=None, row_ids=None, **kwargs):
-        """ Delete all Tautulli history for a specific user.
-
-            ```
-            Required parameters:
-                user_id (str):          The id of the Plex user
-
-            Optional parameters:
-                row_ids (str):          Comma separated row ids to delete, e.g. "2,3,8"
-
-            Returns:
-                None
-            ```
-        """
-        if user_id or row_ids:
-            user_data = users.Users()
-            success = user_data.delete(user_id=user_id, row_ids=row_ids, purge_only=True)
-            if success:
-                return {'result': 'success', 'message': 'Deleted user history.'}
-            else:
-                return {'result': 'error', 'message': 'Failed to delete user(s) history.'}
-        else:
-            return {'result': 'error', 'message': 'No user id or row ids received.'}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def delete_user(self, user_id=None, row_ids=None, **kwargs):
-        """ Delete a user from Tautulli. Also erases all history for the user.
-
-            ```
-            Required parameters:
-                user_id (str):          The id of the Plex user
-
-            Optional parameters:
-                row_ids (str):          Comma separated row ids to delete, e.g. "2,3,8"
-
-            Returns:
-                None
-            ```
-        """
-        if user_id or row_ids:
-            user_data = users.Users()
-            success = user_data.delete(user_id=user_id, row_ids=row_ids)
-            if success:
-                return {'result': 'success', 'message': 'Deleted user.'}
-            else:
-                return {'result': 'error', 'message': 'Failed to delete user(s).'}
-        else:
-            return {'result': 'error', 'message': 'No user id or row ids received.'}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def undelete_user(self, user_id=None, username=None, **kwargs):
-        """ Restore a deleted user to Tautulli.
-
-            ```
-            Required parameters:
-                user_id (str):          The id of the Plex user
-                username (str):         The username of the Plex user
-
-            Optional parameters:
-                None
-
-            Returns:
-                None
-            ```
-        """
-        user_data = users.Users()
-        result = user_data.undelete(user_id=user_id, username=username)
-        if result:
-            if user_id:
-                msg ='user_id %s' % user_id
-            elif username:
-                msg = 'username %s' % username
-            return {'result': 'success', 'message': 'Re-added user with %s.' % msg}
-        return {'result': 'error', 'message': 'Unable to re-add user. Invalid user_id or username.'}
-
-
-    ##### History #####
-
-    @cherrypy.expose
-    @requireAuth()
-    def history(self, **kwargs):
-        config = {
-            "database_is_importing": database.IS_IMPORTING,
-        }
-
-        return serve_template(template_name="history.html", title="History", config=config)
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @sanitize_out()
-    @addtoapi()
-    def get_history(self, user=None, user_id=None, grouping=None, include_activity=None, **kwargs):
-        """ Get the Tautulli history.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                grouping (int):                 0 or 1
-                include_activity (int):         0 or 1
-                user (str):                     "Jon Snow"
-                user_id (int):                  133788
-                rating_key (int):               4348
-                parent_rating_key (int):        544
-                grandparent_rating_key (int):   351
-                start_date (str):               History for the exact date, "YYYY-MM-DD"
-                before (str):                   History before and including the date, "YYYY-MM-DD"
-                after (str):                    History after and including the date, "YYYY-MM-DD"
-                section_id (int):               2
-                media_type (str):               "movie", "episode", "track", "live", "collection", "playlist"
-                transcode_decision (str):       "direct play", "copy", "transcode",
-                guid (str):                     Plex guid for an item, e.g. "com.plexapp.agents.thetvdb://121361/6/1"
-                order_column (str):             "date", "friendly_name", "ip_address", "platform", "player",
-                                                "full_title", "started", "paused_counter", "stopped", "duration"
-                order_dir (str):                "desc" or "asc"
-                start (int):                    Row to start from, 0
-                length (int):                   Number of items to return, 25
-                search (str):                   A string to search for, "Thrones"
-
-            Returns:
-                json:
-                    {"draw": 1,
-                     "recordsTotal": 1000,
-                     "recordsFiltered": 250,
-                     "total_duration": "42 days 5 hrs 18 mins",
-                     "filter_duration": "10 hrs 12 mins",
-                     "data":
-                        [{"date": 1462687607,
-                          "friendly_name": "Mother of Dragons",
-                          "full_title": "Game of Thrones - The Red Woman",
-                          "grandparent_rating_key": 351,
-                          "grandparent_title": "Game of Thrones",
-                          "original_title": "",
-                          "group_count": 1,
-                          "group_ids": "1124",
-                          "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en",
-                          "ip_address": "xxx.xxx.xxx.xxx",
-                          "live": 0,
-                          "location": "wan",
-                          "machine_id": "lmd93nkn12k29j2lnm",
-                          "media_index": 17,
-                          "media_type": "episode",
-                          "originally_available_at": "2016-04-24",
-                          "parent_media_index": 7,
-                          "parent_rating_key": 544,
-                          "parent_title": "",
-                          "paused_counter": 0,
-                          "percent_complete": 84,
-                          "platform": "Windows",
-                          "play_duration": 263,
-                          "product": "Plex for Windows",
-                          "player": "Castle-PC",
-                          "rating_key": 4348,
-                          "reference_id": 1123,
-                          "relayed": 0,
-                          "row_id": 1124,
-                          "secure": 1,
-                          "session_key": null,
-                          "started": 1462688107,
-                          "state": null,
-                          "stopped": 1462688370,
-                          "thumb": "/library/metadata/4348/thumb/1462414561",
-                          "title": "The Red Woman",
-                          "transcode_decision": "transcode",
-                          "user": "DanyKhaleesi69",
-                          "user_id": 8008135,
-                          "watched_status": 0,
-                          "year": 2016
-                          },
-                         {...},
-                         {...}
-                         ]
-                     }
-            ```
-        """
-        # Check if datatables json_data was received.
-        # If not, then build the minimal amount of json data for a query
-        if not kwargs.get('json_data'):
-            # TODO: Find some one way to automatically get the columns
-            dt_columns = [("date", True, False),
-                          ("friendly_name", True, True),
-                          ("ip_address", True, True),
-                          ("platform", True, True),
-                          ("product", True, True),
-                          ("player", True, True),
-                          ("full_title", True, True),
-                          ("started", True, False),
-                          ("paused_counter", True, False),
-                          ("stopped", True, False),
-                          ("duration", True, False),
-                          ("watched_status", False, False)]
-            kwargs['json_data'] = build_datatables_json(kwargs, dt_columns, "date")
-
-        grouping = helpers.bool_true(grouping, return_none=True)
-        include_activity = helpers.bool_true(include_activity, return_none=True)
-
-        custom_where = []
-        if user_id:
-            user_id = helpers.split_strip(user_id)
-            if user_id:
-                custom_where.append(['session_history.user_id', user_id])
-        elif user:
-            user = helpers.split_strip(user)
-            if user:
-                custom_where.append(['session_history.user', user])
-        if 'rating_key' in kwargs:
-            if kwargs.get('media_type') in ('collection', 'playlist') and kwargs.get('rating_key'):
-                pms_connect = pmsconnect.PmsConnect()
-                result = pms_connect.get_item_children(rating_key=kwargs.pop('rating_key'), media_type=kwargs.pop('media_type'))
-                rating_keys = [child['rating_key'] for child in result['children_list']]
-                custom_where.append(['session_history_metadata.rating_key IN OR', rating_keys])
-                custom_where.append(['session_history_metadata.parent_rating_key IN OR', rating_keys])
-                custom_where.append(['session_history_metadata.grandparent_rating_key IN OR', rating_keys])
-            else:
-                rating_key = helpers.split_strip(kwargs.pop('rating_key', ''))
-                if rating_key:
-                    custom_where.append(['session_history.rating_key', rating_key])
-        if 'parent_rating_key' in kwargs:
-            rating_key = helpers.split_strip(kwargs.pop('parent_rating_key', ''))
-            if rating_key:
-                custom_where.append(['session_history.parent_rating_key', rating_key])
-        if 'grandparent_rating_key' in kwargs:
-            rating_key = helpers.split_strip(kwargs.pop('grandparent_rating_key', ''))
-            if rating_key:
-                custom_where.append(['session_history.grandparent_rating_key', rating_key])
-        if 'start_date' in kwargs:
-            start_date = helpers.split_strip(kwargs.pop('start_date', ''))
-            if start_date:
-                custom_where.append(["strftime('%Y-%m-%d', datetime(started, 'unixepoch', 'localtime'))", start_date])
-        if 'before' in kwargs:
-            before = helpers.split_strip(kwargs.pop('before', ''))
-            if before:
-                custom_where.append(["strftime('%Y-%m-%d', datetime(started, 'unixepoch', 'localtime')) <", before])
-        if 'after' in kwargs:
-            after = helpers.split_strip(kwargs.pop('after', ''))
-            if after:
-                custom_where.append(["strftime('%Y-%m-%d', datetime(started, 'unixepoch', 'localtime')) >", after])
-        if 'reference_id' in kwargs:
-            reference_id = helpers.split_strip(kwargs.pop('reference_id', ''))
-            if reference_id:
-                custom_where.append(['session_history.reference_id', reference_id])
-        if 'section_id' in kwargs:
-            section_id = helpers.split_strip(kwargs.pop('section_id', ''))
-            if section_id:
-                custom_where.append(['session_history.section_id', section_id])
-        if 'media_type' in kwargs:
-            media_type = helpers.split_strip(kwargs.pop('media_type', ''))
-            if media_type and 'all' not in media_type:
-                custom_where.append(['media_type_live', media_type])
-        if 'transcode_decision' in kwargs:
-            transcode_decision = helpers.split_strip(kwargs.pop('transcode_decision', ''))
-            if transcode_decision and 'all' not in transcode_decision:
-                custom_where.append(['session_history_media_info.transcode_decision', transcode_decision])
-        if 'guid' in kwargs:
-            guid = helpers.split_strip(kwargs.pop('guid', '').split('?')[0])
-            if guid:
-                custom_where.append(['session_history_metadata.guid LIKE', [f"{g}%" for g in guid]])
+    def get_stream_data(self, row_id=None, user=None, **kwargs):
 
         data_factory = datafactory.DataFactory()
-        history = data_factory.get_datatables_history(kwargs=kwargs, custom_where=custom_where,
-                                                      grouping=grouping, include_activity=include_activity)
+        stream_data = data_factory.get_stream_details(row_id)
 
-        return history
+        return serve_template(templatename="stream_data.html", title="Stream Data", data=stream_data, user=user)
 
     @cherrypy.expose
-    @requireAuth()
-    def get_stream_data(self, row_id=None, session_key=None, user=None, **kwargs):
-
-        data_factory = datafactory.DataFactory()
-        stream_data = data_factory.get_stream_details(row_id, session_key)
-
-        return serve_template(template_name="stream_data.html", title="Stream Data", data=stream_data, user=user)
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @addtoapi('get_stream_data')
-    def get_stream_data_api(self, row_id=None, session_key=None, **kwargs):
-        """ Get the stream details from history or current stream.
-
-            ```
-            Required parameters:
-                row_id (int):       The row ID number for the history item, OR
-                session_key (int):  The session key of the current stream
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    {"aspect_ratio": "2.35",
-                     "audio_bitrate": 231,
-                     "audio_channels": 6,
-                     "audio_language": "English",
-                     "audio_language_code": "eng",
-                     "audio_codec": "aac",
-                     "audio_decision": "transcode",
-                     "bitrate": 2731,
-                     "container": "mp4",
-                     "current_session": "",
-                     "grandparent_title": "",
-                     "media_type": "movie",
-                     "optimized_version": "",
-                     "optimized_version_profile": "",
-                     "optimized_version_title": "",
-                     "original_title": "",
-                     "pre_tautulli": "",
-                     "quality_profile": "1.5 Mbps 480p",
-                     "stream_audio_bitrate": 203,
-                     "stream_audio_channels": 2,
-                     "stream_audio_language": "English",
-                     "stream_audio_language_code", "eng",
-                     "stream_audio_codec": "aac",
-                     "stream_audio_decision": "transcode",
-                     "stream_bitrate": 730,
-                     "stream_container": "mkv",
-                     "stream_container_decision": "transcode",
-                     "stream_subtitle_codec": "",
-                     "stream_subtitle_decision": "",
-                     "stream_video_bitrate": 527,
-                     "stream_video_codec": "h264",
-                     "stream_video_decision": "transcode",
-                     "stream_video_dynamic_range": "SDR",
-                     "stream_video_framerate": "24p",
-                     "stream_video_height": 306,
-                     "stream_video_resolution": "SD",
-                     "stream_video_width": 720,
-                     "subtitle_codec": "",
-                     "subtitles": "",
-                     "synced_version": "",
-                     "synced_version_profile": "",
-                     "title": "Frozen",
-                     "transcode_hw_decoding": "",
-                     "transcode_hw_encoding": "",
-                     "video_bitrate": 2500,
-                     "video_codec": "h264",
-                     "video_decision": "transcode",
-                     "video_dynamic_range": "SDR",
-                     "video_framerate": "24p",
-                     "video_height": 816,
-                     "video_resolution": "1080",
-                     "video_width": 1920
-                     }
-            ```
-        """
-        # For backwards compatibility
-        if 'id' in kwargs:
-            row_id = kwargs['id']
-
-        data_factory = datafactory.DataFactory()
-        stream_data = data_factory.get_stream_details(row_id, session_key)
-
-        return stream_data
-
-    @cherrypy.expose
-    @requireAuth()
     def get_ip_address_details(self, ip_address=None, **kwargs):
-        if not helpers.is_valid_ip(ip_address):
+        import socket
+
+        try:
+            socket.inet_aton(ip_address)
+        except socket.error:
             ip_address = None
 
-        public = helpers.is_public_ip(ip_address)
-
-        return serve_template(template_name="ip_address_modal.html", title="IP Address Details",
-                              data=ip_address, public=public, kwargs=kwargs)
+        return serve_template(templatename="ip_address_modal.html", title="IP Address Details", data=ip_address)
 
     @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi("delete_history")
-    def delete_history_rows(self, row_ids=None, **kwargs):
-        """ Delete history rows from Tautulli.
+    def get_user_list(self, **kwargs):
 
-            ```
-            Required parameters:
-                row_ids (str):          Comma separated row ids to delete, e.g. "65,110,2,3645"
-
-            Optional parameters:
-                None
-
-            Returns:
-                None
-            ```
-        """
-        data_factory = datafactory.DataFactory()
-
-        if row_ids:
-            success = database.delete_session_history_rows(row_ids=row_ids)
-
-            if success:
-                return {'result': 'success', 'message': 'Deleted history.'}
-            else:
-                return {'result': 'error', 'message': 'Failed to delete history.'}
-        else:
-            return {'result': 'error', 'message': 'No row ids received.'}
-
-
-    ##### Graphs #####
-
-    @cherrypy.expose
-    @requireAuth()
-    def graphs(self, **kwargs):
-        return serve_template(template_name="graphs.html", title="Graphs")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @sanitize_out()
-    @addtoapi()
-    def get_user_names(self, **kwargs):
-        """ Get a list of all user and user ids.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    [{"friendly_name": "Jon Snow", "user_id": 133788},
-                     {"friendly_name": "DanyKhaleesi69", "user_id": 8008135},
-                     {"friendly_name": "Tyrion Lannister", "user_id": 696969},
-                     {...},
-                    ]
-            ```
-        """
         user_data = users.Users()
-        user_names = user_data.get_user_names(kwargs=kwargs)
+        user_list = user_data.get_user_list(kwargs=kwargs)
 
-        return user_names
+        cherrypy.response.headers['Content-type'] = 'application/json'
+        return json.dumps(user_list)
 
     @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @addtoapi()
-    def get_plays_by_date(self, time_range='30', user_id=None, y_axis='plays', grouping=None, **kwargs):
-        """ Get graph data by date.
+    def checkGithub(self):
+        from plexpy import versioncheck
 
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                time_range (str):       The number of days of data to return
-                y_axis (str):           "plays" or "duration"
-                user_id (str):          Comma separated list of user id to filter the data
-                grouping (int):         0 or 1
-
-            Returns:
-                json:
-                    {"categories":
-                        ["YYYY-MM-DD", "YYYY-MM-DD", ...]
-                     "series":
-                        [{"name": "Movies", "data": [...]}
-                         {"name": "TV", "data": [...]},
-                         {"name": "Music", "data": [...]},
-                         {"name": "Live TV", "data": [...]}
-                         ]
-                     }
-            ```
-        """
-        grouping = helpers.bool_true(grouping, return_none=True)
-
-        graph = graphs.Graphs()
-        result = graph.get_total_plays_per_day(time_range=time_range,
-                                               y_axis=y_axis,
-                                               user_id=user_id,
-                                               grouping=grouping)
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_plays_by_date.")
-            return result
+        versioncheck.checkGithub()
+        raise cherrypy.HTTPRedirect("home")
 
     @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @addtoapi()
-    def get_plays_by_dayofweek(self, time_range='30', user_id=None, y_axis='plays', grouping=None, **kwargs):
-        """ Get graph data by day of the week.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                time_range (str):       The number of days of data to return
-                y_axis (str):           "plays" or "duration"
-                user_id (str):          Comma separated list of user id to filter the data
-                grouping (int):         0 or 1
-
-            Returns:
-                json:
-                    {"categories":
-                        ["Sunday", "Monday", "Tuesday", ..., "Saturday"]
-                     "series":
-                        [{"name": "Movies", "data": [...]}
-                         {"name": "TV", "data": [...]},
-                         {"name": "Music", "data": [...]},
-                         {"name": "Live TV", "data": [...]}
-                         ]
-                     }
-            ```
-        """
-        grouping = helpers.bool_true(grouping, return_none=True)
-
-        graph = graphs.Graphs()
-        result = graph.get_total_plays_per_dayofweek(time_range=time_range,
-                                                     y_axis=y_axis,
-                                                     user_id=user_id,
-                                                     grouping=grouping)
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_plays_by_dayofweek.")
-            return result
+    def logs(self):
+        return serve_template(templatename="logs.html", title="Log", lineList=plexpy.LOG_LIST)
 
     @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @addtoapi()
-    def get_plays_by_hourofday(self, time_range='30', user_id=None, y_axis='plays', grouping=None, **kwargs):
-        """ Get graph data by hour of the day.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                time_range (str):       The number of days of data to return
-                y_axis (str):           "plays" or "duration"
-                user_id (str):          Comma separated list of user id to filter the data
-                grouping (int):         0 or 1
-
-            Returns:
-                json:
-                    {"categories":
-                        ["00", "01", "02", ..., "23"]
-                     "series":
-                        [{"name": "Movies", "data": [...]}
-                         {"name": "TV", "data": [...]},
-                         {"name": "Music", "data": [...]},
-                         {"name": "Live TV", "data": [...]}
-                         ]
-                     }
-            ```
-        """
-        grouping = helpers.bool_true(grouping, return_none=True)
-
-        graph = graphs.Graphs()
-        result = graph.get_total_plays_per_hourofday(time_range=time_range,
-                                                     y_axis=y_axis,
-                                                     user_id=user_id,
-                                                     grouping=grouping)
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_plays_by_hourofday.")
-            return result
+    def clearLogs(self):
+        plexpy.LOG_LIST = []
+        logger.info("Web logs cleared")
+        raise cherrypy.HTTPRedirect("logs")
 
     @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @addtoapi()
-    def get_plays_per_month(self, time_range='12', y_axis='plays', user_id=None, grouping=None, **kwargs):
-        """ Get graph data by month.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                time_range (str):       The number of months of data to return
-                y_axis (str):           "plays" or "duration"
-                user_id (str):          Comma separated list of user id to filter the data
-                grouping (int):         0 or 1
-
-            Returns:
-                json:
-                    {"categories":
-                        ["Jan 2016", "Feb 2016", "Mar 2016", ...]
-                     "series":
-                        [{"name": "Movies", "data": [...]}
-                         {"name": "TV", "data": [...]},
-                         {"name": "Music", "data": [...]},
-                         {"name": "Live TV", "data": [...]}
-                         ]
-                     }
-            ```
-        """
-        grouping = helpers.bool_true(grouping, return_none=True)
-
-        graph = graphs.Graphs()
-        result = graph.get_total_plays_per_month(time_range=time_range,
-                                                 y_axis=y_axis,
-                                                 user_id=user_id,
-                                                 grouping=grouping)
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_plays_per_month.")
-            return result
+    def toggleVerbose(self):
+        plexpy.VERBOSE = not plexpy.VERBOSE
+        logger.initLogger(console=not plexpy.QUIET,
+                          log_dir=plexpy.CONFIG.LOG_DIR, verbose=plexpy.VERBOSE)
+        logger.info("Verbose toggled, set to %s", plexpy.VERBOSE)
+        logger.debug("If you read this message, debug logging is available")
+        raise cherrypy.HTTPRedirect("logs")
 
     @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @addtoapi()
-    def get_plays_by_top_10_platforms(self, time_range='30', y_axis='plays', user_id=None, grouping=None, **kwargs):
-        """ Get graph data by top 10 platforms.
+    def getLog(self, start=0, length=100, **kwargs):
+        start = int(start)
+        length = int(length)
+        search_value = ""
+        search_regex = ""
+        order_column = 0
+        order_dir = "desc"
 
-            ```
-            Required parameters:
-                None
+        if 'order[0][dir]' in kwargs:
+            order_dir = kwargs.get('order[0][dir]', "desc")
 
-            Optional parameters:
-                time_range (str):       The number of days of data to return
-                y_axis (str):           "plays" or "duration"
-                user_id (str):          Comma separated list of user id to filter the data
-                grouping (int):         0 or 1
+        if 'order[0][column]' in kwargs:
+            order_column = kwargs.get('order[0][column]', "0")
 
-            Returns:
-                json:
-                    {"categories":
-                        ["iOS", "Android", "Chrome", ...]
-                     "series":
-                        [{"name": "Movies", "data": [...]}
-                         {"name": "TV", "data": [...]},
-                         {"name": "Music", "data": [...]},
-                         {"name": "Live TV", "data": [...]}
-                         ]
-                     }
-            ```
-        """
-        grouping = helpers.bool_true(grouping, return_none=True)
+        if 'search[value]' in kwargs:
+            search_value = kwargs.get('search[value]', "")
 
-        graph = graphs.Graphs()
-        result = graph.get_total_plays_by_top_10_platforms(time_range=time_range,
-                                                           y_axis=y_axis,
-                                                           user_id=user_id,
-                                                           grouping=grouping)
+        if 'search[regex]' in kwargs:
+            search_regex = kwargs.get('search[regex]', "")
 
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_plays_by_top_10_platforms.")
-            return result
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @addtoapi()
-    def get_plays_by_top_10_users(self, time_range='30', y_axis='plays', user_id=None, grouping=None, **kwargs):
-        """ Get graph data by top 10 users.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                time_range (str):       The number of days of data to return
-                y_axis (str):           "plays" or "duration"
-                user_id (str):          Comma separated list of user id to filter the data
-                grouping (int):         0 or 1
-
-            Returns:
-                json:
-                    {"categories":
-                        ["Jon Snow", "DanyKhaleesi69", "A Girl", ...]
-                     "series":
-                        [{"name": "Movies", "data": [...]}
-                         {"name": "TV", "data": [...]},
-                         {"name": "Music", "data": [...]},
-                         {"name": "Live TV", "data": [...]}
-                         ]
-                     }
-            ```
-        """
-        grouping = helpers.bool_true(grouping, return_none=True)
-
-        graph = graphs.Graphs()
-        result = graph.get_total_plays_by_top_10_users(time_range=time_range,
-                                                       y_axis=y_axis,
-                                                       user_id=user_id,
-                                                       grouping=grouping)
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_plays_by_top_10_users.")
-            return result
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @addtoapi()
-    def get_plays_by_stream_type(self, time_range='30', y_axis='plays', user_id=None, grouping=None, **kwargs):
-        """ Get graph data by stream type by date.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                time_range (str):       The number of days of data to return
-                y_axis (str):           "plays" or "duration"
-                user_id (str):          Comma separated list of user id to filter the data
-                grouping (int):         0 or 1
-
-            Returns:
-                json:
-                    {"categories":
-                        ["YYYY-MM-DD", "YYYY-MM-DD", ...]
-                     "series":
-                        [{"name": "Direct Play", "data": [...]}
-                         {"name": "Direct Stream", "data": [...]},
-                         {"name": "Transcode", "data": [...]}
-                         ]
-                     }
-            ```
-        """
-        grouping = helpers.bool_true(grouping, return_none=True)
-
-        graph = graphs.Graphs()
-        result = graph.get_total_plays_per_stream_type(time_range=time_range,
-                                                       y_axis=y_axis,
-                                                       user_id=user_id,
-                                                       grouping=grouping)
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_plays_by_stream_type.")
-            return result
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @addtoapi()
-    def get_concurrent_streams_by_stream_type(self, time_range='30', user_id=None, **kwargs):
-        """ Get graph data for concurrent streams by stream type by date.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                time_range (str):       The number of days of data to return
-                user_id (str):          Comma separated list of user id to filter the data
-
-            Returns:
-                json:
-                    {"categories":
-                        ["YYYY-MM-DD", "YYYY-MM-DD", ...]
-                     "series":
-                        [{"name": "Direct Play", "data": [...]}
-                         {"name": "Direct Stream", "data": [...]},
-                         {"name": "Transcode", "data": [...]},
-                         {"name": "Max. Concurrent Streams", "data":  [...]}
-                         ]
-                     }
-            ```
-        """
-
-        graph = graphs.Graphs()
-        result = graph.get_total_concurrent_streams_per_stream_type(time_range=time_range, user_id=user_id)
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_concurrent_streams_by_stream_type.")
-            return result
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @addtoapi()
-    def get_plays_by_source_resolution(self, time_range='30', y_axis='plays', user_id=None, grouping=None, **kwargs):
-        """ Get graph data by source resolution.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                time_range (str):       The number of days of data to return
-                y_axis (str):           "plays" or "duration"
-                user_id (str):          Comma separated list of user id to filter the data
-                grouping (int):         0 or 1
-
-            Returns:
-                json:
-                    {"categories":
-                        ["720", "1080", "sd", ...]
-                     "series":
-                        [{"name": "Direct Play", "data": [...]}
-                         {"name": "Direct Stream", "data": [...]},
-                         {"name": "Transcode", "data": [...]}
-                         ]
-                     }
-            ```
-        """
-        grouping = helpers.bool_true(grouping, return_none=True)
-
-        graph = graphs.Graphs()
-        result = graph.get_total_plays_by_source_resolution(time_range=time_range,
-                                                            y_axis=y_axis,
-                                                            user_id=user_id,
-                                                            grouping=grouping)
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_plays_by_source_resolution.")
-            return result
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @addtoapi()
-    def get_plays_by_stream_resolution(self, time_range='30', y_axis='plays', user_id=None, grouping=None, **kwargs):
-        """ Get graph data by stream resolution.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                time_range (str):       The number of days of data to return
-                y_axis (str):           "plays" or "duration"
-                user_id (str):          Comma separated list of user id to filter the data
-                grouping (int):         0 or 1
-
-            Returns:
-                json:
-                    {"categories":
-                        ["720", "1080", "sd", ...]
-                     "series":
-                        [{"name": "Direct Play", "data": [...]}
-                         {"name": "Direct Stream", "data": [...]},
-                         {"name": "Transcode", "data": [...]}
-                         ]
-                     }
-            ```
-        """
-        grouping = helpers.bool_true(grouping, return_none=True)
-
-        graph = graphs.Graphs()
-        result = graph.get_total_plays_by_stream_resolution(time_range=time_range,
-                                                            y_axis=y_axis,
-                                                            user_id=user_id,
-                                                            grouping=grouping)
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_plays_by_stream_resolution.")
-            return result
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @addtoapi()
-    def get_stream_type_by_top_10_users(self, time_range='30', y_axis='plays', user_id=None, grouping=None, **kwargs):
-        """ Get graph data by stream type by top 10 users.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                time_range (str):       The number of days of data to return
-                y_axis (str):           "plays" or "duration"
-                user_id (str):          Comma separated list of user id to filter the data
-                grouping (int):         0 or 1
-
-            Returns:
-                json:
-                    {"categories":
-                        ["Jon Snow", "DanyKhaleesi69", "A Girl", ...]
-                     "series":
-                        [{"name": "Direct Play", "data": [...]}
-                         {"name": "Direct Stream", "data": [...]},
-                         {"name": "Transcode", "data": [...]}
-                        ]
-                     }
-            ```
-        """
-        grouping = helpers.bool_true(grouping, return_none=True)
-
-        graph = graphs.Graphs()
-        result = graph.get_stream_type_by_top_10_users(time_range=time_range,
-                                                       y_axis=y_axis,
-                                                       user_id=user_id,
-                                                       grouping=grouping)
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_stream_type_by_top_10_users.")
-            return result
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @addtoapi()
-    def get_stream_type_by_top_10_platforms(self, time_range='30', y_axis='plays', user_id=None, grouping=None, **kwargs):
-        """ Get graph data by stream type by top 10 platforms.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                time_range (str):       The number of days of data to return
-                y_axis (str):           "plays" or "duration"
-                user_id (str):          Comma separated list of user id to filter the data
-                grouping (int):         0 or 1
-
-            Returns:
-                json:
-                    {"categories":
-                        ["iOS", "Android", "Chrome", ...]
-                     "series":
-                        [{"name": "Direct Play", "data": [...]}
-                         {"name": "Direct Stream", "data": [...]},
-                         {"name": "Transcode", "data": [...]}
-                         ]
-                     }
-            ```
-        """
-        grouping = helpers.bool_true(grouping, return_none=True)
-
-        graph = graphs.Graphs()
-        result = graph.get_stream_type_by_top_10_platforms(time_range=time_range,
-                                                           y_axis=y_axis,
-                                                           user_id=user_id,
-                                                           grouping=grouping)
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_stream_type_by_top_10_platforms.")
-            return result
-
-    @cherrypy.expose
-    @requireAuth()
-    def history_table_modal(self, **kwargs):
-        if kwargs.get('user_id') and not allow_session_user(kwargs['user_id']):
-            return serve_template(template_name="history_table_modal.html", title="History Data", data=None)
-
-        return serve_template(template_name="history_table_modal.html", title="History Data", data=kwargs)
-
-
-    ##### Sync #####
-
-    @cherrypy.expose
-    @requireAuth()
-    def sync(self, **kwargs):
-        return serve_template(template_name="sync.html", title="Synced Items")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @sanitize_out()
-    @requireAuth()
-    def get_sync(self, machine_id=None, user_id=None, **kwargs):
-        if user_id == 'null':
-            user_id = None
-
-        if get_session_user_id():
-            user_id = get_session_user_id()
-
-        plex_tv = plextv.PlexTV(token=plexpy.CONFIG.PMS_TOKEN)
-        result = plex_tv.get_synced_items(machine_id=machine_id, user_id_filter=user_id)
-
-        if result:
-            output = {"data": result}
-        else:
-            logger.warn("Unable to retrieve data for get_sync.")
-            output = {"data": []}
-
-        return output
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi("delete_synced_item")
-    def delete_sync_rows(self, client_id=None, sync_id=None, **kwargs):
-        """ Delete a synced item from a device.
-
-            ```
-            Required parameters:
-                client_id (str):        The client ID of the device to delete from
-                sync_id (str):          The sync ID of the synced item
-
-            Optional parameters:
-                None
-
-            Returns:
-                None
-            ```
-        """
-        if client_id and sync_id:
-            plex_tv = plextv.PlexTV()
-            delete_row = plex_tv.delete_sync(client_id=client_id, sync_id=sync_id)
-            if delete_row:
-                return {'result': 'success', 'message': 'Synced item deleted successfully.'}
-            else:
-                return {'result': 'error', 'message': 'Failed to delete synced item.'}
-        else:
-            return {'result': 'error', 'message': 'Missing client ID and sync ID.'}
-
-
-    ##### Logs #####
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def logs(self, **kwargs):
-        plex_log_files = log_reader.list_plex_logs()
-        return serve_template(template_name="logs.html", title="Log", plex_log_files=plex_log_files)
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def get_log(self, logfile='', **kwargs):
-        json_data = helpers.process_json_kwargs(json_kwargs=kwargs.get('json_data'))
-        log_level = kwargs.get('log_level', "")
-
-        start = json_data['start']
-        length = json_data['length']
-        order_column = json_data['order'][0]['column']
-        order_dir = json_data['order'][0]['dir']
-        search_value = json_data['search']['value']
-        sortcolumn = 0
-
-        filt = []
         filtered = []
-        fa = filt.append
-
-        if logfile == "tautulli_api":
-            filename = logger.FILENAME_API
-        elif logfile == "plex_websocket":
-            filename = logger.FILENAME_PLEX_WEBSOCKET
+        if search_value == "":
+            filtered = plexpy.LOG_LIST[::]
         else:
-            filename = logger.FILENAME
-
-        with open(os.path.join(plexpy.CONFIG.LOG_DIR, filename), 'r', encoding='utf-8') as f:
-            for l in f.readlines():
-                try:
-                    temp_loglevel_and_time = l.split(' - ', 1)
-                    loglvl = temp_loglevel_and_time[1].split(' ::', 1)[0].strip()
-                    msg = helpers.sanitize(l.split(' : ', 1)[1].replace('\n', ''))
-                    fa([temp_loglevel_and_time[0], loglvl, msg])
-                except IndexError:
-                    # Add traceback message to previous msg.
-                    tl = (len(filt) - 1)
-                    n = len(l) - len(l.lstrip(' '))
-                    ll = '&nbsp;' * (2 * n) + helpers.sanitize(l[n:])
-                    filt[tl][2] += '<br>' + ll
-                    continue
-
-        log_levels = ['DEBUG', 'INFO', 'WARNING', 'ERROR']
-        if log_level in log_levels:
-            log_levels = log_levels[log_levels.index(log_level)::]
-            filtered = [row for row in filt if row[1] in log_levels]
-        else:
-            filtered = filt
-
-        if search_value:
-            filtered = [row for row in filtered for column in row if search_value.lower() in column.lower()]
+            filtered = [row for row in plexpy.LOG_LIST for column in row if search_value.lower() in column.lower()]
 
+        sortcolumn = 0
         if order_column == '1':
             sortcolumn = 2
         elif order_column == '2':
             sortcolumn = 1
-
-        filtered.sort(key=lambda x: x[sortcolumn])
-
-        if order_dir == 'desc':
-            filtered = filtered[::-1]
+        filtered.sort(key=lambda x: x[sortcolumn], reverse=order_dir == "desc")
 
         rows = filtered[start:(start + length)]
+        rows = [[row[0], row[2], row[1]] for row in rows]
 
         return json.dumps({
             'recordsFiltered': len(filtered),
-            'recordsTotal': len(filt),
+            'recordsTotal': len(plexpy.LOG_LIST),
             'data': rows,
         })
 
     @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_plex_log(self, logfile='', **kwargs):
-        """ Get the PMS logs.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                window (int):           The number of tail lines to return
-                logfile (int):          The name of the Plex log file,
-                                        e.g. "Plex Media Server", "Plex Media Scanner"
-
-            Returns:
-                json:
-                    [["May 08, 2016 09:35:37",
-                      "DEBUG",
-                      "Auth: Came in with a super-token, authorization succeeded."
-                      ],
-                     [...],
-                     [...]
-                     ]
-            ```
-        """
-        if kwargs.get('log_type'):
-            logfile = 'Plex Media ' + kwargs['log_type'].capitalize()
-
-        window = int(kwargs.get('window', plexpy.CONFIG.PMS_LOGS_LINE_CAP))
-
+    def get_plex_log(self, window=1000, **kwargs):
+        log_lines = []
         try:
-            return {'data': log_reader.get_log_tail(window=window, parsed=True, log_file=logfile)}
+            log_lines = {'data': log_reader.get_log_tail(window=window)}
         except:
-            logger.warn("Unable to retrieve Plex log file '%'." % logfile)
-            return []
+            logger.warn("Unable to retrieve Plex Logs.")
+
+        cherrypy.response.headers['Content-type'] = 'application/json'
+        return json.dumps(log_lines)
 
     @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @sanitize_out()
-    @addtoapi()
-    def get_notification_log(self, **kwargs):
-        """ Get the data on the Tautulli notification logs table.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                order_column (str):             "timestamp", "notifier_id", "agent_name", "notify_action",
-                                                "subject_text", "body_text",
-                order_dir (str):                "desc" or "asc"
-                start (int):                    Row to start from, 0
-                length (int):                   Number of items to return, 25
-                search (str):                   A string to search for, "Telegram"
-
-            Returns:
-                json:
-                    {"draw": 1,
-                     "recordsTotal": 1039,
-                     "recordsFiltered": 163,
-                     "data":
-                        [{"agent_id": 13,
-                          "agent_name": "telegram",
-                          "body_text": "DanyKhaleesi69 started playing The Red Woman.",
-                          "id": 1000,
-                          "notify_action": "on_play",
-                          "rating_key": 153037,
-                          "session_key": 147,
-                          "subject_text": "Tautulli (Winterfell-Server)",
-                          "success": 1,
-                          "timestamp": 1462253821,
-                          "user": "DanyKhaleesi69",
-                          "user_id": 8008135
-                          },
-                         {...},
-                         {...}
-                         ]
-                     }
-            ```
-        """
-        # Check if datatables json_data was received.
-        # If not, then build the minimal amount of json data for a query
-        if not kwargs.get('json_data'):
-            # TODO: Find some one way to automatically get the columns
-            dt_columns = [("timestamp", True, True),
-                          ("notifier_id", True, True),
-                          ("agent_name", True, True),
-                          ("notify_action", True, True),
-                          ("subject_text", True, True),
-                          ("body_text", True, True)]
-            kwargs['json_data'] = build_datatables_json(kwargs, dt_columns, "timestamp")
-
-        data_factory = datafactory.DataFactory()
-        notification_logs = data_factory.get_notification_log(kwargs=kwargs)
-
-        return notification_logs
+    def generateAPI(self):
+        apikey = hashlib.sha224(str(random.getrandbits(256))).hexdigest()[0:32]
+        logger.info("New API generated")
+        return apikey
 
     @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @sanitize_out()
-    @addtoapi()
-    def get_newsletter_log(self, **kwargs):
-        """ Get the data on the Tautulli newsletter logs table.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                order_column (str):             "timestamp", "newsletter_id", "agent_name", "notify_action",
-                                                "subject_text", "start_date", "end_date", "uuid"
-                order_dir (str):                "desc" or "asc"
-                start (int):                    Row to start from, 0
-                length (int):                   Number of items to return, 25
-                search (str):                   A string to search for, "Telegram"
-
-            Returns:
-                json:
-                    {"draw": 1,
-                     "recordsTotal": 1039,
-                     "recordsFiltered": 163,
-                     "data":
-                        [{"agent_id": 0,
-                          "agent_name": "recently_added",
-                          "end_date": "2018-03-18",
-                          "id": 7,
-                          "newsletter_id": 1,
-                          "notify_action": "on_cron",
-                          "start_date": "2018-03-05",
-                          "subject_text": "Recently Added to Plex (Winterfell-Server)! (2018-03-18)",
-                          "success": 1,
-                          "timestamp": 1462253821,
-                          "uuid": "7fe4g65i"
-                          },
-                         {...},
-                         {...}
-                         ]
-                     }
-            ```
-        """
-        # Check if datatables json_data was received.
-        # If not, then build the minimal amount of json data for a query
-        if not kwargs.get('json_data'):
-            # TODO: Find some one way to automatically get the columns
-            dt_columns = [("timestamp", True, True),
-                          ("newsletter_id", True, True),
-                          ("agent_name", True, True),
-                          ("notify_action", True, True),
-                          ("subject_text", True, True),
-                          ("body_text", True, True),
-                          ("start_date", True, True),
-                          ("end_date", True, True),
-                          ("uuid", True, True)]
-            kwargs['json_data'] = build_datatables_json(kwargs, dt_columns, "timestamp")
-
-        data_factory = datafactory.DataFactory()
-        newsletter_logs = data_factory.get_newsletter_log(kwargs=kwargs)
-
-        return newsletter_logs
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def delete_notification_log(self, **kwargs):
-        """ Delete the Tautulli notification logs.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                None
-
-            Returns:
-                None
-            ```
-        """
-        data_factory = datafactory.DataFactory()
-        result = data_factory.delete_notification_log()
-        res = 'success' if result else 'error'
-        msg = 'Cleared notification logs.' if result else 'Failed to clear notification logs.'
-
-        return {'result': res, 'message': msg}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def delete_newsletter_log(self, **kwargs):
-        """ Delete the Tautulli newsletter logs.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                None
-
-            Returns:
-                None
-            ```
-        """
-        data_factory = datafactory.DataFactory()
-        result = data_factory.delete_newsletter_log()
-        res = 'success' if result else 'error'
-        msg = 'Cleared newsletter logs.' if result else 'Failed to clear newsletter logs.'
-
-        return {'result': res, 'message': msg}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def delete_login_log(self, **kwargs):
-        """ Delete the Tautulli login logs.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                None
-
-            Returns:
-                None
-            ```
-        """
-        user_data = users.Users()
-        result = user_data.delete_login_log()
-        res = 'success' if result else 'error'
-        msg = 'Cleared login logs.' if result else 'Failed to clear login logs.'
-
-        return {'result': res, 'message': msg}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def delete_logs(self, logfile='', **kwargs):
-        if logfile == "tautulli_api":
-            filename = logger.FILENAME_API
-        elif logfile == "plex_websocket":
-            filename = logger.FILENAME_PLEX_WEBSOCKET
-        else:
-            filename = logger.FILENAME
-
-        try:
-            open(os.path.join(plexpy.CONFIG.LOG_DIR, filename), 'w').close()
-            result = 'success'
-            msg = 'Cleared the %s file.' % filename
-            logger.info(msg)
-        except Exception as e:
-            result = 'error'
-            msg = 'Failed to clear the %s file.' % filename
-            logger.exception('Failed to clear the %s file: %s.' % (filename, e))
-
-        return {'result': result, 'message': msg}
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def toggleVerbose(self, **kwargs):
-        plexpy.VERBOSE = not plexpy.VERBOSE
-
-        plexpy.CONFIG.VERBOSE_LOGS = plexpy.VERBOSE
-        plexpy.CONFIG.write()
-
-        logger.initLogger(console=not plexpy.QUIET, log_dir=plexpy.CONFIG.LOG_DIR, verbose=plexpy.VERBOSE)
-        logger.info("Verbose toggled, set to %s", plexpy.VERBOSE)
-        logger.debug("If you read this message, debug logging is available")
-        raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT + "logs")
-
-    @cherrypy.expose
-    @requireAuth()
-    def log_js_errors(self, page, message, file, line, **kwargs):
-        """ Logs javascript errors from the web interface. """
-        logger.error("WebUI :: /%s : %s. (%s:%s)" % (page.rpartition('/')[-1],
-                                                      message,
-                                                      file.rpartition('/')[-1].partition('?')[0],
-                                                      line))
-        return "js error logged."
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def logFile(self, logfile='', **kwargs):
-        if logfile == "tautulli_api":
-            filename = logger.FILENAME_API
-        elif logfile == "plex_websocket":
-            filename = logger.FILENAME_PLEX_WEBSOCKET
-        else:
-            filename = logger.FILENAME
-
-        try:
-            with open(os.path.join(plexpy.CONFIG.LOG_DIR, filename), 'r', encoding='utf-8') as f:
-                return '<pre>%s</pre>' % f.read()
-        except IOError as e:
-            return "Log file not found."
-
-
-    ##### Settings #####
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def settings(self, **kwargs):
-        settings_dict = {}
-
-        for setting in config.SETTINGS:
-            settings_dict[setting.lower()] = getattr(plexpy.CONFIG, setting)
-
-        for setting in config.CHECKED_SETTINGS:
-            settings_dict[setting.lower()] = checked(getattr(plexpy.CONFIG, setting))
+    def settings(self):
+        interface_dir = os.path.join(plexpy.PROG_DIR, 'data/interfaces/')
+        interface_list = [name for name in os.listdir(interface_dir) if
+                          os.path.isdir(os.path.join(interface_dir, name))]
 
         # Initialise blank passwords so we do not expose them in the html forms
         # but users are still able to clear them
         if plexpy.CONFIG.HTTP_PASSWORD != '':
-            settings_dict['http_password'] = '    '
+            http_password = '    '
         else:
-            settings_dict['http_password'] = ''
+            http_password = ''
 
-        for key in ('home_sections', 'home_stats_cards', 'home_library_cards'):
-            settings_dict[key] = json.dumps(settings_dict[key])
+        config = {
+            "http_host": plexpy.CONFIG.HTTP_HOST,
+            "http_username": plexpy.CONFIG.HTTP_USERNAME,
+            "http_port": plexpy.CONFIG.HTTP_PORT,
+            "http_password": http_password,
+            "launch_browser": checked(plexpy.CONFIG.LAUNCH_BROWSER),
+            "enable_https": checked(plexpy.CONFIG.ENABLE_HTTPS),
+            "https_cert": plexpy.CONFIG.HTTPS_CERT,
+            "https_key": plexpy.CONFIG.HTTPS_KEY,
+            "api_enabled": checked(plexpy.CONFIG.API_ENABLED),
+            "api_key": plexpy.CONFIG.API_KEY,
+            "update_db_interval": plexpy.CONFIG.UPDATE_DB_INTERVAL,
+            "freeze_db": checked(plexpy.CONFIG.FREEZE_DB),
+            "log_dir": plexpy.CONFIG.LOG_DIR,
+            "cache_dir": plexpy.CONFIG.CACHE_DIR,
+            "check_github": checked(plexpy.CONFIG.CHECK_GITHUB),
+            "interface_list": interface_list,
+            "cache_sizemb": plexpy.CONFIG.CACHE_SIZEMB,
+            "pms_identifier": plexpy.CONFIG.PMS_IDENTIFIER,
+            "pms_ip": plexpy.CONFIG.PMS_IP,
+            "pms_logs_folder": plexpy.CONFIG.PMS_LOGS_FOLDER,
+            "pms_port": plexpy.CONFIG.PMS_PORT,
+            "pms_token": plexpy.CONFIG.PMS_TOKEN,
+            "pms_ssl": checked(plexpy.CONFIG.PMS_SSL),
+            "pms_use_bif": checked(plexpy.CONFIG.PMS_USE_BIF),
+            "pms_uuid": plexpy.CONFIG.PMS_UUID,
+            "date_format": plexpy.CONFIG.DATE_FORMAT,
+            "time_format": plexpy.CONFIG.TIME_FORMAT,
+            "grouping_global_history": checked(plexpy.CONFIG.GROUPING_GLOBAL_HISTORY),
+            "grouping_user_history": checked(plexpy.CONFIG.GROUPING_USER_HISTORY),
+            "grouping_charts": checked(plexpy.CONFIG.GROUPING_CHARTS),
+            "tv_notify_enable": checked(plexpy.CONFIG.TV_NOTIFY_ENABLE),
+            "movie_notify_enable": checked(plexpy.CONFIG.MOVIE_NOTIFY_ENABLE),
+            "music_notify_enable": checked(plexpy.CONFIG.MUSIC_NOTIFY_ENABLE),
+            "tv_notify_on_start": checked(plexpy.CONFIG.TV_NOTIFY_ON_START),
+            "movie_notify_on_start": checked(plexpy.CONFIG.MOVIE_NOTIFY_ON_START),
+            "music_notify_on_start": checked(plexpy.CONFIG.MUSIC_NOTIFY_ON_START),
+            "tv_notify_on_stop": checked(plexpy.CONFIG.TV_NOTIFY_ON_STOP),
+            "movie_notify_on_stop": checked(plexpy.CONFIG.MOVIE_NOTIFY_ON_STOP),
+            "music_notify_on_stop": checked(plexpy.CONFIG.MUSIC_NOTIFY_ON_STOP),
+            "tv_notify_on_pause": checked(plexpy.CONFIG.TV_NOTIFY_ON_PAUSE),
+            "movie_notify_on_pause": checked(plexpy.CONFIG.MOVIE_NOTIFY_ON_PAUSE),
+            "music_notify_on_pause": checked(plexpy.CONFIG.MUSIC_NOTIFY_ON_PAUSE),
+            "monitoring_interval": plexpy.CONFIG.MONITORING_INTERVAL,
+            "monitoring_use_websocket": checked(plexpy.CONFIG.MONITORING_USE_WEBSOCKET),
+            "refresh_users_interval": plexpy.CONFIG.REFRESH_USERS_INTERVAL,
+            "refresh_users_on_startup": checked(plexpy.CONFIG.REFRESH_USERS_ON_STARTUP),
+            "ip_logging_enable": checked(plexpy.CONFIG.IP_LOGGING_ENABLE),
+            "video_logging_enable": checked(plexpy.CONFIG.VIDEO_LOGGING_ENABLE),
+            "music_logging_enable": checked(plexpy.CONFIG.MUSIC_LOGGING_ENABLE),
+            "logging_ignore_interval": plexpy.CONFIG.LOGGING_IGNORE_INTERVAL,
+            "pms_is_remote": checked(plexpy.CONFIG.PMS_IS_REMOTE),
+            "notify_consecutive": checked(plexpy.CONFIG.NOTIFY_CONSECUTIVE),
+            "notify_watched_percent": plexpy.CONFIG.NOTIFY_WATCHED_PERCENT,
+            "notify_on_start_subject_text": plexpy.CONFIG.NOTIFY_ON_START_SUBJECT_TEXT,
+            "notify_on_start_body_text": plexpy.CONFIG.NOTIFY_ON_START_BODY_TEXT,
+            "notify_on_stop_subject_text": plexpy.CONFIG.NOTIFY_ON_STOP_SUBJECT_TEXT,
+            "notify_on_stop_body_text": plexpy.CONFIG.NOTIFY_ON_STOP_BODY_TEXT,
+            "notify_on_pause_subject_text": plexpy.CONFIG.NOTIFY_ON_PAUSE_SUBJECT_TEXT,
+            "notify_on_pause_body_text": plexpy.CONFIG.NOTIFY_ON_PAUSE_BODY_TEXT,
+            "notify_on_resume_subject_text": plexpy.CONFIG.NOTIFY_ON_RESUME_SUBJECT_TEXT,
+            "notify_on_resume_body_text": plexpy.CONFIG.NOTIFY_ON_RESUME_BODY_TEXT,
+            "notify_on_buffer_subject_text": plexpy.CONFIG.NOTIFY_ON_BUFFER_SUBJECT_TEXT,
+            "notify_on_buffer_body_text": plexpy.CONFIG.NOTIFY_ON_BUFFER_BODY_TEXT,
+            "notify_on_watched_subject_text": plexpy.CONFIG.NOTIFY_ON_WATCHED_SUBJECT_TEXT,
+            "notify_on_watched_body_text": plexpy.CONFIG.NOTIFY_ON_WATCHED_BODY_TEXT,
+            "home_stats_length": plexpy.CONFIG.HOME_STATS_LENGTH,
+            "home_stats_type": checked(plexpy.CONFIG.HOME_STATS_TYPE),
+            "home_stats_count": plexpy.CONFIG.HOME_STATS_COUNT,
+            "home_stats_cards": plexpy.CONFIG.HOME_STATS_CARDS,
+            "home_library_cards": plexpy.CONFIG.HOME_LIBRARY_CARDS,
+            "buffer_threshold": plexpy.CONFIG.BUFFER_THRESHOLD,
+            "buffer_wait": plexpy.CONFIG.BUFFER_WAIT,
+            "group_history_tables": checked(plexpy.CONFIG.GROUP_HISTORY_TABLES)
+        }
 
-        return serve_template(template_name="settings.html", title="Settings", config=settings_dict)
+        return serve_template(templatename="settings.html", title="Settings", config=config)
 
     @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
     def configUpdate(self, **kwargs):
         # Handle the variable config options. Note - keys with False values aren't getting passed
 
-        # Check if we should refresh our data
-        first_run = False
-        startup_changed = False
-        server_changed = False
-        reschedule = False
-        https_changed = False
-        refresh_libraries = False
-        refresh_users = False
-
-        # First run from the setup wizard
-        if kwargs.pop('first_run', None):
-            first_run = True
-            server_changed = True
-
-        if not first_run:
-            for checked_config in config.CHECKED_SETTINGS:
-                checked_config = checked_config.lower()
-                if checked_config not in kwargs:
-                    # checked items should be zero or one. if they were not sent then the item was not checked
-                    kwargs[checked_config] = 0
-                else:
-                    kwargs[checked_config] = 1
+        checked_configs = [
+            "launch_browser", "enable_https", "api_enabled", "freeze_db", "check_github",
+            "grouping_global_history", "grouping_user_history", "grouping_charts", "pms_use_bif", "pms_ssl",
+            "tv_notify_enable", "movie_notify_enable", "music_notify_enable", "monitoring_use_websocket",
+            "tv_notify_on_start", "movie_notify_on_start", "music_notify_on_start",
+            "tv_notify_on_stop", "movie_notify_on_stop", "music_notify_on_stop",
+            "tv_notify_on_pause", "movie_notify_on_pause", "music_notify_on_pause", "refresh_users_on_startup",
+            "ip_logging_enable", "video_logging_enable", "music_logging_enable", "pms_is_remote", "home_stats_type",
+            "group_history_tables", "notify_consecutive"
+        ]
+        for checked_config in checked_configs:
+            if checked_config not in kwargs:
+                # checked items should be zero or one. if they were not sent then the item was not checked
+                kwargs[checked_config] = 0
 
         # If http password exists in config, do not overwrite when blank value received
-        if kwargs.get('http_password') == '    ':
-            del kwargs['http_password']
-        else:
-            if kwargs.get('http_password', '') != '':
-                kwargs['http_password'] = make_hash(kwargs['http_password'])
-            # Flag to refresh JWT uuid to log out clients
-            kwargs['jwt_update_secret'] = True and not first_run
+        if 'http_password' in kwargs:
+            if kwargs['http_password'] == '    ' and plexpy.CONFIG.HTTP_PASSWORD != '':
+                kwargs['http_password'] = plexpy.CONFIG.HTTP_PASSWORD
 
         for plain_config, use_config in [(x[4:], x) for x in kwargs if x.startswith('use_')]:
             # the use prefix is fairly nice in the html, but does not match the actual config
             kwargs[plain_config] = kwargs[use_config]
             del kwargs[use_config]
 
-        if kwargs.get('launch_startup') != plexpy.CONFIG.LAUNCH_STARTUP or \
-                kwargs.get('launch_browser') != plexpy.CONFIG.LAUNCH_BROWSER:
-            startup_changed = True
+        # Check if we should refresh our data
+        refresh_users = False
+        reschedule = False
 
-        # If we change any monitoring settings, make sure we reschedule tasks.
-        if kwargs.get('check_github') != plexpy.CONFIG.CHECK_GITHUB or \
-                kwargs.get('check_github_interval') != str(plexpy.CONFIG.CHECK_GITHUB_INTERVAL) or \
-                kwargs.get('refresh_libraries_interval') != str(plexpy.CONFIG.REFRESH_LIBRARIES_INTERVAL) or \
-                kwargs.get('refresh_users_interval') != str(plexpy.CONFIG.REFRESH_USERS_INTERVAL) or \
-                kwargs.get('pms_update_check_interval') != str(plexpy.CONFIG.PMS_UPDATE_CHECK_INTERVAL) or \
-                kwargs.get('monitor_pms_updates') != plexpy.CONFIG.MONITOR_PMS_UPDATES or \
-                kwargs.get('pms_url_manual') != plexpy.CONFIG.PMS_URL_MANUAL or \
-                kwargs.get('backup_interval') != str(plexpy.CONFIG.BACKUP_INTERVAL):
-            reschedule = True
+        if 'monitoring_interval' in kwargs and 'refresh_users_interval' in kwargs:
+            if (kwargs['monitoring_interval'] != str(plexpy.CONFIG.MONITORING_INTERVAL)) or \
+                    (kwargs['refresh_users_interval'] != str(plexpy.CONFIG.REFRESH_USERS_INTERVAL)):
+                reschedule = True
 
-        # If we change the SSL setting for PMS or PMS remote setting, make sure we grab the new url.
-        if kwargs.get('pms_ssl') != str(plexpy.CONFIG.PMS_SSL) or \
-                kwargs.get('pms_url_manual') != plexpy.CONFIG.PMS_URL_MANUAL:
-            server_changed = True
+        if 'pms_ip' in kwargs:
+            if kwargs['pms_ip'] != plexpy.CONFIG.PMS_IP:
+                refresh_users = True
 
-        # If we change the HTTPS setting, make sure we generate a new certificate.
-        if kwargs.get('enable_https') and kwargs.get('https_create_cert'):
-            if kwargs.get('https_domain') != plexpy.CONFIG.HTTPS_DOMAIN or \
-                    kwargs.get('https_ip') != plexpy.CONFIG.HTTPS_IP or \
-                    kwargs.get('https_cert') != plexpy.CONFIG.HTTPS_CERT or \
-                    kwargs.get('https_key') != plexpy.CONFIG.HTTPS_KEY:
-                https_changed = True
+        if 'home_stats_cards' in kwargs:
+            if kwargs['home_stats_cards'] != 'watch_statistics':
+                kwargs['home_stats_cards'] = ', '.join(kwargs['home_stats_cards'])
 
-        # Remove config with 'hsec-' prefix and change home_sections to list
-        if kwargs.get('home_sections'):
-            for k in list(kwargs.keys()):
-                if k.startswith('hsec-'):
-                    del kwargs[k]
-            kwargs['home_sections'] = kwargs['home_sections'].split(',')
-
-        # Remove config with 'hscard-' prefix and change home_stats_cards to list
-        if kwargs.get('home_stats_cards'):
-            for k in list(kwargs.keys()):
-                if k.startswith('hscard-'):
-                    del kwargs[k]
-            kwargs['home_stats_cards'] = kwargs['home_stats_cards'].split(',')
-
-        # Remove config with 'hlcard-' prefix and change home_library_cards to list
-        if kwargs.get('home_library_cards'):
-            for k in list(kwargs.keys()):
-                if k.startswith('hlcard-'):
-                    del kwargs[k]
-            kwargs['home_library_cards'] = kwargs['home_library_cards'].split(',')
-
-        # If we change the server, make sure we grab the new url and refresh libraries and users lists.
-        if kwargs.pop('server_changed', None) or server_changed:
-            server_changed = True
-            refresh_users = True
-            refresh_libraries = True
-
-        # If we change the authentication settings, make sure we refresh the users lists.
-        if kwargs.pop('auth_changed', None):
-            refresh_users = True
-
-        all_settings = config.SETTINGS + config.CHECKED_SETTINGS
-        kwargs = {k: v for k, v in kwargs.items() if k.upper() in all_settings}
-
-        if first_run:
-            kwargs['first_run_complete'] = 1
+        if 'home_library_cards' in kwargs:
+            if kwargs['home_library_cards'] != 'library_statistics':
+                kwargs['home_library_cards'] = ', '.join(kwargs['home_library_cards'])
 
         plexpy.CONFIG.process_kwargs(kwargs)
 
         # Write the config
         plexpy.CONFIG.write()
 
-        # Enable or disable system startup
-        if startup_changed:
-            if common.PLATFORM == 'Windows':
-                windows.set_startup()
-            elif common.PLATFORM == 'Darwin':
-                macos.set_startup()
-
-        # Get new server URLs for SSL communications and get new server friendly name
-        if server_changed:
-            plextv.get_server_resources()
-            if plexpy.WS_CONNECTED:
-                web_socket.reconnect()
-
-        # If first run, start websocket
-        if first_run:
-            webstart.restart()
-            activity_pinger.connect_server(log=True, startup=True)
+        # Get new server URLs for SSL communications.
+        plextv.get_real_pms_url()
 
         # Reconfigure scheduler if intervals changed
         if reschedule:
             plexpy.initialize_scheduler()
 
-        # Generate a new HTTPS certificate
-        if https_changed:
-            create_https_certificates(plexpy.CONFIG.HTTPS_CERT, plexpy.CONFIG.HTTPS_KEY)
-
-        # Refresh users table if our server IP changes.
-        if refresh_libraries:
-            threading.Thread(target=libraries.refresh_libraries).start()
-
         # Refresh users table if our server IP changes.
         if refresh_users:
-            threading.Thread(target=users.refresh_users).start()
+            threading.Thread(target=plextv.refresh_users).start()
 
-        return {'result': 'success', 'message': 'Settings saved.'}
+        raise cherrypy.HTTPRedirect("settings")
 
     @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def check_pms_token(self, **kwargs):
-        plex_tv = plextv.PlexTV()
-        response = plex_tv.get_plextv_resources(return_response=True)
-        if not response.ok:
-            cherrypy.response.status = 401
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def get_pms_downloads(self, update_channel, **kwargs):
-        plex_tv = plextv.PlexTV()
-        downloads = plex_tv.get_plex_downloads(update_channel=update_channel)
-        return downloads
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def get_server_resources(self, **kwargs):
-        return plextv.get_server_resources(return_server=True, **kwargs)
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def backup_config(self, **kwargs):
-        """ Creates a manual backup of the plexpy.db file """
-
-        result = config.make_backup()
-
-        if result:
-            return {'result': 'success', 'message': 'Config backup successful.'}
-        else:
-            return {'result': 'error', 'message': 'Config backup failed.'}
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def get_configuration_table(self, **kwargs):
-        return serve_template(template_name="configuration_table.html")
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def get_scheduler_table(self, **kwargs):
-        return serve_template(template_name="scheduler_table.html")
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def get_queue_modal(self, queue=None, **kwargs):
-        return serve_template(template_name="queue_modal.html", queue=queue)
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def get_server_update_params(self, **kwargs):
-        plex_tv = plextv.PlexTV()
-        plexpass = plex_tv.get_plexpass_status()
-
-        update_channel = pmsconnect.PmsConnect().get_server_update_channel()
-
-        return {'plexpass': plexpass,
-                'pms_platform': common.PMS_PLATFORM_NAME_OVERRIDES.get(
-                    plexpy.CONFIG.PMS_PLATFORM, plexpy.CONFIG.PMS_PLATFORM),
-                'pms_update_channel': plexpy.CONFIG.PMS_UPDATE_CHANNEL,
-                'pms_update_distro': plexpy.CONFIG.PMS_UPDATE_DISTRO,
-                'pms_update_distro_build': plexpy.CONFIG.PMS_UPDATE_DISTRO_BUILD}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def backup_db(self, **kwargs):
-        """ Creates a manual backup of the plexpy.db file """
-
-        result = database.make_backup()
-
-        if result:
-            return {'result': 'success', 'message': 'Database backup successful.'}
-        else:
-            return {'result': 'error', 'message': 'Database backup failed.'}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_notifiers(self, notify_action=None, **kwargs):
-        """ Get a list of configured notifiers.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                notify_action (str):        The notification action to filter out
-
-            Returns:
-                json:
-                    [{"id": 1,
-                      "agent_id": 13,
-                      "agent_name": "telegram",
-                      "agent_label": "Telegram",
-                      "friendly_name": "",
-                      "active": 1
-                      }
-                     ]
-            ```
-        """
-        result = notifiers.get_notifiers(notify_action=notify_action)
-        return result
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def get_notifiers_table(self, **kwargs):
-        result = notifiers.get_notifiers()
-        return serve_template(template_name="notifiers_table.html", notifiers_list=result)
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def delete_notifier(self, notifier_id=None, **kwargs):
-        """ Remove a notifier from the database.
-
-            ```
-            Required parameters:
-                notifier_id (int):        The notifier to delete
-
-            Optional parameters:
-                None
-
-            Returns:
-                None
-            ```
-        """
-        result = notifiers.delete_notifier(notifier_id=notifier_id)
-        if result:
-            return {'result': 'success', 'message': 'Notifier deleted successfully.'}
-        else:
-            return {'result': 'error', 'message': 'Failed to delete notifier.'}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_notifier_config(self, notifier_id=None, **kwargs):
-        """ Get the configuration for an existing notification agent.
-
-            ```
-            Required parameters:
-                notifier_id (int):        The notifier config to retrieve
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    {"id": 1,
-                     "agent_id": 13,
-                     "agent_name": "telegram",
-                     "agent_label": "Telegram",
-                     "friendly_name": "",
-                     "config": {"incl_poster": 0,
-                                "html_support": 1,
-                                "chat_id": "123456",
-                                "bot_token": "13456789:fio9040NNo04jLEp-4S",
-                                "incl_subject": 1,
-                                "disable_web_preview": 0
-                                },
-                     "config_options": [{...}, ...]
-                     "actions": {"on_play": 0,
-                                 "on_stop": 0,
-                                 ...
-                                 },
-                     "notify_text": {"on_play": {"subject": "...",
-                                                 "body": "..."
-                                                 }
-                                     "on_stop": {"subject": "...",
-                                                 "body": "..."
-                                                 }
-                                     ...
-                                     }
-                     }
-            ```
-        """
-        result = notifiers.get_notifier_config(notifier_id=notifier_id, mask_passwords=True)
-        return result
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def get_notifier_config_modal(self, notifier_id=None, **kwargs):
-        result = notifiers.get_notifier_config(notifier_id=notifier_id, mask_passwords=True)
-
-        parameters = [
-                {'name': param['name'], 'type': param['type'], 'value': param['value']}
-                for category in common.NOTIFICATION_PARAMETERS for param in category['parameters']
-            ]
-
-        return serve_template(template_name="notifier_config.html", notifier=result, parameters=parameters)
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def add_notifier_config(self, agent_id=None, **kwargs):
-        """ Add a new notification agent.
-
-            ```
-            Required parameters:
-                agent_id (int):           The notification agent to add
-
-            Optional parameters:
-                None
-
-            Returns:
-                None
-            ```
-        """
-        result = notifiers.add_notifier_config(agent_id=agent_id, **kwargs)
-
-        if result:
-            return {'result': 'success', 'message': 'Added notification agent.', 'notifier_id': result}
-        else:
-            return {'result': 'error', 'message': 'Failed to add notification agent.'}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def set_notifier_config(self, notifier_id=None, agent_id=None, **kwargs):
-        """ Configure an existing notification agent.
-
-            ```
-            Required parameters:
-                notifier_id (int):        The notifier config to update
-                agent_id (int):           The agent of the notifier
-
-            Optional parameters:
-                Pass all the config options for the agent with the agent prefix:
-                    e.g. For Telegram: telegram_bot_token
-                                       telegram_chat_id
-                                       telegram_disable_web_preview
-                                       telegram_html_support
-                                       telegram_incl_poster
-                                       telegram_incl_subject
-                Notify actions (int):  0 or 1,
-                    e.g. on_play, on_stop, etc.
-                Notify text (str):
-                    e.g. on_play_subject, on_play_body, etc.
-
-            Returns:
-                None
-            ```
-        """
-        result = notifiers.set_notifier_config(notifier_id=notifier_id, agent_id=agent_id, **kwargs)
-
-        if result:
-            return {'result': 'success', 'message': 'Saved notification agent.'}
-        else:
-            return {'result': 'error', 'message': 'Failed to save notification agent.'}
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def get_notify_text_preview(self, notify_action='', subject='', body='', agent_id=0, agent_name='', **kwargs):
-        if str(agent_id).isdigit():
-            agent_id = int(agent_id)
-
-        text = []
-        media_types = next((a['media_types'] for a in notifiers.available_notification_actions()
-                            if a['name'] == notify_action), ())
-
-        for media_type in media_types:
-            test_subject, test_body = notification_handler.build_notify_text(subject=subject,
-                                                                             body=body,
-                                                                             notify_action=notify_action,
-                                                                             parameters={'media_type': media_type},
-                                                                             agent_id=agent_id,
-                                                                             test=True)
-
-            text.append({'media_type': media_type, 'subject': test_subject, 'body': test_body})
-
-        return serve_template(template_name="notifier_text_preview.html", text=text, agent=agent_name)
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_notifier_parameters(self, **kwargs):
-        """ Get the list of available notification parameters.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    {
-                     }
-            ```
-        """
-        parameters = [{'name': param['name'],
-                       'type': param['type'],
-                       'value': param['value']
-                       }
-                      for category in common.NOTIFICATION_PARAMETERS
-                      for param in category['parameters']]
-
-        return parameters
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def send_notification(self, notifier_id=None, subject='Tautulli', body='Test notification', notify_action='', **kwargs):
-        """ Send a notification using Tautulli.
-
-            ```
-            Required parameters:
-                notifier_id (int):      The ID number of the notification agent
-                subject (str):          The subject of the message
-                body (str):             The body of the message
-
-            Optional parameters:
-                None
-
-            Returns:
-                None
-            ```
-        """
-        cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store"
-
-        test = 'test ' if notify_action == 'test' else ''
-
-        if notifier_id:
-            notifier = notifiers.get_notifier_config(notifier_id=notifier_id)
-
-            if notifier:
-                logger.debug("Sending %s%s notification." % (test, notifier['agent_label']))
-                notification_handler.add_notifier_each(notifier_id=notifier_id,
-                                                       notify_action=notify_action,
-                                                       subject=subject,
-                                                       body=body,
-                                                       manual_trigger=True,
-                                                       **kwargs)
-                return {'result': 'success', 'message': 'Notification queued.'}
-            else:
-                logger.debug("Unable to send %snotification, invalid notifier_id %s." % (test, notifier_id))
-                return {'result': 'error', 'message': 'Invalid notifier id %s.' % notifier_id}
-        else:
-            logger.debug("Unable to send %snotification, no notifier_id received." % test)
-            return {'result': 'error', 'message': 'No notifier id received.'}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def get_browser_notifications(self, **kwargs):
-        result = notifiers.get_browser_notifications()
-
-        if result:
-            notifications = result['notifications']
-            if notifications:
-                return notifications
-            else:
-                return None
-        else:
-            logger.warn('Unable to retrieve browser notifications.')
-            return None
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def facebook_auth(self, app_id='', app_secret='', redirect_uri='', **kwargs):
-        cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store"
-
-        facebook_notifier = notifiers.FACEBOOK()
-        url = facebook_notifier._get_authorization(app_id=app_id,
-                                                   app_secret=app_secret,
-                                                   redirect_uri=redirect_uri)
-
-        if url:
-            return {'result': 'success', 'msg': 'Confirm Authorization. Check pop-up blocker if no response.', 'url': url}
-        else:
-            return {'result': 'error', 'msg': 'Failed to retrieve authorization url.'}
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def facebook_redirect(self, code='', **kwargs):
-        cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store"
-
-        facebook = notifiers.FACEBOOK()
-        access_token = facebook._get_credentials(code)
-
-        if access_token:
-            return "Facebook authorization successful. Tautulli can send notification to Facebook. " \
-                "Your Facebook access token is:" \
-                "<pre>{0}</pre>You may close this page.".format(access_token)
-        else:
-            return "Failed to request authorization from Facebook. Check the Tautulli logs for details.<br />You may close this page."
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def facebook_retrieve_token(self, **kwargs):
-        if plexpy.CONFIG.FACEBOOK_TOKEN == 'temp':
-            return {'result': 'waiting'}
-        elif plexpy.CONFIG.FACEBOOK_TOKEN:
-            token = plexpy.CONFIG.FACEBOOK_TOKEN
-            plexpy.CONFIG.FACEBOOK_TOKEN = ''
-            return {'result': 'success', 'msg': 'Authorization successful.', 'access_token': token}
-        else:
-            return {'result': 'error', 'msg': 'Failed to request authorization.'}
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def osxnotifyregister(self, app, **kwargs):
-        cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store"
-        from osxnotify import registerapp as osxnotify
-
-        result, msg = osxnotify.registerapp(app)
-        if result:
-            osx_notify = notifiers.OSX()
-            osx_notify.notify(subject='Registered', body='Success :-)', subtitle=result)
-            # logger.info("Registered %s, to re-register a different app, delete this app first" % result)
-        else:
-            logger.warn(msg)
-        return msg
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def zapier_test_hook(self, zapier_hook='', **kwargs):
-        success = notifiers.ZAPIER(config={'hook': zapier_hook})._test_hook()
-        if success:
-            return {'result': 'success', 'msg': 'Test Zapier webhook sent.'}
-        else:
-            return {'result': 'error', 'msg': 'Failed to send test Zapier webhook.'}
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
     def set_notification_config(self, **kwargs):
 
         for plain_config, use_config in [(x[4:], x) for x in kwargs if x.startswith('use_')]:
@@ -3789,413 +551,671 @@ class WebInterface(object):
         cherrypy.response.status = 200
 
     @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def get_mobile_devices_table(self, **kwargs):
-        result = mobile_app.get_mobile_devices()
-        return serve_template(template_name="mobile_devices_table.html", devices_list=result)
+    def do_state_change(self, signal, title, timer):
+        message = title
+        quote = self.random_arnold_quotes()
+        plexpy.SIGNAL = signal
+
+        return serve_template(templatename="shutdown.html", title=title,
+                              message=message, timer=timer, quote=quote)
 
     @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def verify_mobile_device(self, device_token='', cancel=False, **kwargs):
-        if helpers.bool_true(cancel):
-            mobile_app.set_temp_device_token(device_token, remove=True)
-            return {'result': 'error', 'message': 'Device registration cancelled.'}
+    def get_history(self, user=None, user_id=None, grouping=0, **kwargs):
 
-        result = mobile_app.get_temp_device_token(device_token)
-        if result is True:
-            mobile_app.set_temp_device_token(device_token, remove=True)
-            return {'result': 'success', 'message': 'Device registered successfully.', 'data': result}
+        if grouping == 'false':
+            grouping = 0
         else:
-            return {'result': 'error', 'message': 'Device not registered.'}
+            grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
 
+        watched_percent = plexpy.CONFIG.NOTIFY_WATCHED_PERCENT
+
+        custom_where = []
+        if user_id:
+            custom_where = [['session_history.user_id', user_id]]
+        elif user:
+            custom_where = [['session_history.user', user]]
+        if 'rating_key' in kwargs:
+            rating_key = kwargs.get('rating_key', "")
+            custom_where = [['session_history.rating_key', rating_key]]
+        if 'parent_rating_key' in kwargs:
+            rating_key = kwargs.get('parent_rating_key', "")
+            custom_where = [['session_history.parent_rating_key', rating_key]]
+        if 'grandparent_rating_key' in kwargs:
+            rating_key = kwargs.get('grandparent_rating_key', "")
+            custom_where = [['session_history.grandparent_rating_key', rating_key]]
+        if 'start_date' in kwargs:
+            start_date = kwargs.get('start_date', "")
+            custom_where = [['strftime("%Y-%m-%d", datetime(date, "unixepoch", "localtime"))', start_date]]
+        if 'reference_id' in kwargs:
+            reference_id = kwargs.get('reference_id', "")
+            custom_where = [['session_history.reference_id', reference_id]]
+        if 'media_type' in kwargs:
+            media_type = kwargs.get('media_type', "")
+            custom_where = [['session_history_metadata.media_type', media_type]]
+
+        data_factory = datafactory.DataFactory()
+        history = data_factory.get_history(kwargs=kwargs, custom_where=custom_where, grouping=grouping, watched_percent=watched_percent)
+
+        cherrypy.response.headers['Content-type'] = 'application/json'
+        return json.dumps(history)
 
     @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def get_mobile_device_config_modal(self, mobile_device_id=None, **kwargs):
-        result = mobile_app.get_mobile_device_config(mobile_device_id=mobile_device_id)
+    def history_table_modal(self, start_date=None, **kwargs):
 
-        return serve_template(template_name="mobile_device_config.html", device=result)
+        return serve_template(templatename="history_table_modal.html", title="History Data", data=start_date)
 
     @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def set_mobile_device_config(self, mobile_device_id=None, **kwargs):
-        """ Configure an existing notification agent.
+    def shutdown(self):
+        return self.do_state_change('shutdown', 'Shutting Down', 15)
 
-            ```
-            Required parameters:
-                mobile_device_id (int):        The mobile device config to update
+    @cherrypy.expose
+    def restart(self):
+        return self.do_state_change('restart', 'Restarting', 30)
 
-            Optional parameters:
-                friendly_name (str):           A friendly name to identify the mobile device
+    @cherrypy.expose
+    def update(self):
+        return self.do_state_change('update', 'Updating', 120)
 
-            Returns:
-                None
-            ```
-        """
-        result = mobile_app.set_mobile_device_config(mobile_device_id=mobile_device_id, **kwargs)
+    @cherrypy.expose
+    def api(self, *args, **kwargs):
+        from plexpy.api import Api
+
+        a = Api()
+        a.checkParams(*args, **kwargs)
+
+        return a.fetchData()
+
+    @cherrypy.expose
+    def twitterStep1(self):
+        cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store"
+        tweet = notifiers.TwitterNotifier()
+        return tweet._get_authorization()
+
+    @cherrypy.expose
+    def twitterStep2(self, key):
+        cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store"
+        tweet = notifiers.TwitterNotifier()
+        result = tweet._get_credentials(key)
+        logger.info(u"result: " + str(result))
+        if result:
+            return "Key verification successful"
+        else:
+            return "Unable to verify key"
+
+    @cherrypy.expose
+    def testTwitter(self):
+        cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store"
+        tweet = notifiers.TwitterNotifier()
+        result = tweet.test_notify()
+        if result:
+            return "Tweet successful, check your twitter to make sure it worked"
+        else:
+            return "Error sending tweet"
+
+    @cherrypy.expose
+    def osxnotifyregister(self, app):
+        cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store"
+        from osxnotify import registerapp as osxnotify
+
+        result, msg = osxnotify.registerapp(app)
+        if result:
+            osx_notify = notifiers.OSX_NOTIFY()
+            osx_notify.notify('Registered', result, 'Success :-)')
+            logger.info('Registered %s, to re-register a different app, delete this app first' % result)
+        else:
+            logger.warn(msg)
+        return msg
+
+    @cherrypy.expose
+    def get_pms_token(self):
+
+        token = plextv.PlexTV()
+        result = token.get_token()
 
         if result:
-            return {'result': 'success', 'message': 'Saved mobile device.'}
+            return result
         else:
-            return {'result': 'error', 'message': 'Failed to save mobile device.'}
+            logger.warn('Unable to retrieve Plex.tv token.')
+            return False
 
     @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def delete_mobile_device(self, mobile_device_id=None, device_id=None, **kwargs):
-        """ Remove a mobile device from the database.
+    def get_pms_sessions_json(self, **kwargs):
 
-            ```
-            Required parameters:
-                mobile_device_id (int):        The mobile device database id to delete, OR
-                device_id (str):               The unique device identifier for the mobile device
+        pms_connect = pmsconnect.PmsConnect()
+        result = pms_connect.get_sessions('json')
 
-            Optional parameters:
-                None
-
-            Returns:
-                None
-            ```
-        """
-        result = mobile_app.delete_mobile_device(mobile_device_id=mobile_device_id,
-                                                 device_id=device_id)
         if result:
-            return {'result': 'success', 'message': 'Deleted mobile device.'}
-        else:
-            return {'result': 'error', 'message': 'Failed to delete device.'}
-
-    @cherrypy.config(**{'response.timeout': 3600})
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def import_database(self, app=None, database_file=None, database_path=None, method=None, backup=False,
-                        table_name=None, import_ignore_interval=0, **kwargs):
-        """ Import a Tautulli, PlexWatch, or Plexivity database into Tautulli.
-
-            ```
-            Required parameters:
-                app (str):                      "tautulli" or "plexwatch" or "plexivity"
-                database_file (file):           The database file to import (multipart/form-data)
-                or
-                database_path (str):            The full path to the database file to import
-                method (str):                   For Tautulli only, "merge" or "overwrite"
-                table_name (str):               For PlexWatch or Plexivity only, "processed" or "grouped"
-
-
-            Optional parameters:
-                backup (bool):                  For Tautulli only, true or false whether to backup
-                                                the current database before importing
-                import_ignore_interval (int):   For PlexWatch or Plexivity only, the minimum number
-                                                of seconds for a stream to import
-
-            Returns:
-                json:
-                    {"result": "success",
-                     "message": "Database import has started. Check the logs to monitor any problems."
-                     }
-            ```
-        """
-        if not app:
-            return {'result': 'error', 'message': 'No app specified for import'}
-
-        if database_path:
-            database_file_name = os.path.basename(database_path)
-            database_cache_path = os.path.join(plexpy.CONFIG.CACHE_DIR, database_file_name + '.import.db')
-            logger.info("Received database file '%s' for import. Saving to cache: %s",
-                        database_file_name, database_cache_path)
-            database_path = shutil.copyfile(database_path, database_cache_path)
-
-        elif database_file:
-            database_path = os.path.join(plexpy.CONFIG.CACHE_DIR, database_file.filename + '.import.db')
-            logger.info("Received database file '%s' for import. Saving to cache: %s",
-                        database_file.filename, database_path)
-            with open(database_path, 'wb') as f:
-                while True:
-                    data = database_file.file.read(8192)
-                    if not data:
-                        break
-                    f.write(data)
-
-        if not database_path:
-            return {'result': 'error', 'message': 'No database specified for import'}
-
-        if app.lower() == 'tautulli':
-            db_check_msg = database.validate_database(database=database_path)
-            if db_check_msg == 'success':
-                threading.Thread(target=database.import_tautulli_db,
-                                 kwargs={'database': database_path,
-                                         'method': method,
-                                         'backup': helpers.bool_true(backup)}).start()
-                return {'result': 'success',
-                        'message': 'Database import has started. Check the logs to monitor any problems.'}
-            else:
-                if database_file:
-                    helpers.delete_file(database_path)
-                return {'result': 'error', 'message': db_check_msg}
-
-        elif app.lower() == 'plexwatch':
-            db_check_msg = plexwatch_import.validate_database(database_file=database_path,
-                                                              table_name=table_name)
-            if db_check_msg == 'success':
-                threading.Thread(target=plexwatch_import.import_from_plexwatch,
-                                 kwargs={'database_file': database_path,
-                                         'table_name': table_name,
-                                         'import_ignore_interval': import_ignore_interval}).start()
-                return {'result': 'success',
-                        'message': 'Database import has started. Check the logs to monitor any problems.'}
-            else:
-                if database_file:
-                    helpers.delete_file(database_path)
-                return {'result': 'error', 'message': db_check_msg}
-
-        elif app.lower() == 'plexivity':
-            db_check_msg = plexivity_import.validate_database(database_file=database_path,
-                                                              table_name=table_name)
-            if db_check_msg == 'success':
-                threading.Thread(target=plexivity_import.import_from_plexivity,
-                                 kwargs={'database_file': database_path,
-                                         'table_name': table_name,
-                                         'import_ignore_interval': import_ignore_interval}).start()
-                return {'result': 'success',
-                        'message': 'Database import has started. Check the logs to monitor any problems.'}
-            else:
-                if database_file:
-                    helpers.delete_file(database_path)
-                return {'result': 'error', 'message': db_check_msg}
-
-        else:
-            return {'result': 'error', 'message': 'App not recognized for import'}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def import_config(self, config_file=None, config_path=None, backup=False, **kwargs):
-        """ Import a Tautulli config file.
-
-            ```
-            Required parameters:
-                config_file (file):             The config file to import (multipart/form-data)
-                or
-                config_path (str):              The full path to the config file to import
-
-
-            Optional parameters:
-                backup (bool):                  true or false whether to backup
-                                                the current config before importing
-
-            Returns:
-                json:
-                    {"result": "success",
-                     "message": "Config import has started. Check the logs to monitor any problems. "
-                                "Tautulli will restart automatically."
-                     }
-            ```
-        """
-        if database.IS_IMPORTING:
-            return {'result': 'error',
-                    'message': 'Database import is in progress. Please wait until it is finished to import a config.'}
-
-        if config_file:
-            config_path = os.path.join(plexpy.CONFIG.CACHE_DIR, config_file.filename + '.import.ini')
-            logger.info("Received config file '%s' for import. Saving to cache '%s'.",
-                        config_file.filename, config_path)
-            with open(config_path, 'wb') as f:
-                while True:
-                    data = config_file.file.read(8192)
-                    if not data:
-                        break
-                    f.write(data)
-
-        if not config_path:
-            return {'result': 'error', 'message': 'No config specified for import'}
-
-        config.set_import_thread(config=config_path, backup=helpers.bool_true(backup))
-
-        return {'result': 'success',
-                'message': 'Config import has started. Check the logs to monitor any problems. '
-                           'Tautulli will restart automatically.'}
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def import_database_tool(self, app=None, **kwargs):
-        if app == 'tautulli':
-            return serve_template(template_name="app_import.html", title="Import Tautulli Database", app="Tautulli")
-        elif app == 'plexwatch':
-            return serve_template(template_name="app_import.html", title="Import PlexWatch Database", app="PlexWatch")
-        elif app == 'plexivity':
-            return serve_template(template_name="app_import.html", title="Import Plexivity Database", app="Plexivity")
-
-        logger.warn("No app specified for import.")
-        return
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def import_config_tool(self, **kwargs):
-        return serve_template(template_name="config_import.html", title="Import Tautulli Configuration")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def browse_path(self, key=None, path=None, filter_ext=''):
-        if key:
-            path = base64.b64decode(key).decode('UTF-8')
-        if not path:
-            path = plexpy.DATA_DIR
-
-        data = helpers.browse_path(path=path, filter_ext=filter_ext)
-        if data:
-            return {'result': 'success', 'path': path, 'data': data}
-        else:
-            return {'result': 'error', 'message': 'Invalid path.'}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_server_id(self, hostname=None, port=None, identifier=None, ssl=0, manual=0,
-                      get_url=False, test_websocket=False, **kwargs):
-        """ Get the PMS server identifier.
-
-            ```
-            Required parameters:
-                hostname (str):     'localhost' or '192.160.0.10'
-                port (int):         32400
-
-            Optional parameters:
-                ssl (int):          0 or 1
-                remote (int):       0 or 1
-
-            Returns:
-                json:
-                    {'identifier': '08u2phnlkdshf890bhdlksghnljsahgleikjfg9t'}
-            ```
-        """
-        ssl = helpers.bool_true(ssl)
-
-        # Attempt to get the pms_identifier from plex.tv if the server is published
-        # Works for all PMS SSL settings
-        if not identifier and hostname and port:
-            plex_tv = plextv.PlexTV()
-            servers = plex_tv.discover()
-            ip_address = get_ip(hostname)
-
-            for server in servers:
-                if (server['ip'] == hostname or server['ip'] == ip_address) and server['port'] == port:
-                    identifier = server['clientIdentifier']
-                    break
-
-            # Fallback to checking /identity endpoint if the server is unpublished
-            # Cannot set SSL settings on the PMS if unpublished so 'http' is okay
-            if not identifier:
-                scheme = 'https' if ssl else 'http'
-                url = '{scheme}://{hostname}:{port}'.format(scheme=scheme, hostname=hostname, port=port)
-                uri = '/identity'
-
-                request_handler = http_handler.HTTPHandler(urls=url,
-                                                           ssl_verify=False)
-                request = request_handler.make_request(uri=uri,
-                                                       request_type='GET',
-                                                       output_format='xml')
-                if request:
-                    xml_head = request.getElementsByTagName('MediaContainer')[0]
-                    identifier = xml_head.getAttribute('machineIdentifier')
-
-        result = {'identifier': identifier}
-
-        if identifier:
-            if helpers.bool_true(get_url):
-                server = self.get_server_resources(pms_ip=hostname,
-                                                   pms_port=port,
-                                                   pms_ssl=ssl,
-                                                   pms_url_manual=manual,
-                                                   pms_identifier=identifier)
-                result['url'] = server['pms_url']
-                result['ws'] = None
-
-                if helpers.bool_true(test_websocket):
-                    # Quick test websocket connection
-                    ws_url = result['url'].replace('http', 'ws', 1) + '/:/websockets/notifications'
-                    header = ['X-Plex-Token: %s' % plexpy.CONFIG.PMS_TOKEN]
-                    # Enforce SSL as needed
-                    if ssl:
-                        secure = 'secure '
-                        if plexpy.CONFIG.VERIFY_SSL_CERT:
-                            sslopt = {'ca_certs': certifi.where()}
-                        else:
-                            sslopt = {'cert_reqs': _ssl.CERT_NONE}
-                    else:
-                        secure = ''
-                        sslopt = None
-
-                    logger.debug("Testing %swebsocket connection..." % secure)
-                    try:
-                        test_ws = websocket.create_connection(ws_url, header=header, sslopt=sslopt)
-                        test_ws.close()
-                        logger.debug("Websocket connection test successful.")
-                        result['ws'] = True
-                    except (websocket.WebSocketException, IOError, Exception) as e:
-                        logger.error("Websocket connection test failed: %s" % e)
-                        result['ws'] = False
-
+            cherrypy.response.headers['Content-type'] = 'application/json'
             return result
         else:
-            logger.warn('Unable to retrieve the PMS identifier.')
+            logger.warn('Unable to retrieve data.')
+            return False
+
+    @cherrypy.expose
+    def get_current_activity(self, **kwargs):
+
+        try:
+            pms_connect = pmsconnect.PmsConnect()
+            result = pms_connect.get_current_activity()
+        except:
+            return serve_template(templatename="current_activity.html", data=None)
+
+        if result:
+            return serve_template(templatename="current_activity.html", data=result)
+        else:
+            logger.warn('Unable to retrieve data.')
+            return serve_template(templatename="current_activity.html", data=None)
+
+    @cherrypy.expose
+    def get_current_activity_header(self, **kwargs):
+
+        try:
+            pms_connect = pmsconnect.PmsConnect()
+            result = pms_connect.get_current_activity()
+        except IOError, e:
+            return serve_template(templatename="current_activity_header.html", data=None)
+
+        if result:
+            return serve_template(templatename="current_activity_header.html", data=result['stream_count'])
+        else:
+            logger.warn('Unable to retrieve data.')
+            return serve_template(templatename="current_activity_header.html", data=None)
+
+    @cherrypy.expose
+    def get_recently_added(self, count='0', **kwargs):
+
+        try:
+            pms_connect = pmsconnect.PmsConnect()
+            result = pms_connect.get_recently_added_details(count)
+        except IOError, e:
+            return serve_template(templatename="recently_added.html", data=None)
+
+        if result:
+            return serve_template(templatename="recently_added.html", data=result['recently_added'])
+        else:
+            logger.warn('Unable to retrieve data.')
+            return serve_template(templatename="recently_added.html", data=None)
+
+    @cherrypy.expose
+    def pms_image_proxy(self, img='', width='0', height='0', fallback=None, **kwargs):
+        try:
+            pms_connect = pmsconnect.PmsConnect()
+            result = pms_connect.get_image(img, width, height)
+            cherrypy.response.headers['Content-type'] = result[1]
+            return result[0]
+        except:
+            logger.warn('Image proxy queried but errors occured.')
+            if fallback == 'poster':
+                logger.info('Trying fallback image...')
+                try:
+                    fallback_image = open(self.interface_dir + common.DEFAULT_POSTER_THUMB, 'rb')
+                    cherrypy.response.headers['Content-type'] = 'image/png'
+                    return fallback_image
+                except IOError, e:
+                    logger.error('Unable to read fallback image. %s' % e)
+            elif fallback == 'cover':
+                logger.info('Trying fallback image...')
+                try:
+                    fallback_image = open(self.interface_dir + common.DEFAULT_COVER_THUMB, 'rb')
+                    cherrypy.response.headers['Content-type'] = 'image/png'
+                    return fallback_image
+                except IOError, e:
+                    logger.error('Unable to read fallback image. %s' % e)
+
+            return None
+
+    @cherrypy.expose
+    def info(self, item_id=None, source=None, **kwargs):
+        metadata = None
+        query = None
+
+        config = {
+            "pms_identifier": plexpy.CONFIG.PMS_IDENTIFIER
+        }
+
+        if source == 'history':
+            data_factory = datafactory.DataFactory()
+            metadata = data_factory.get_metadata_details(row_id=item_id)
+        elif item_id == 'movie':
+            metadata = {'type': 'library', 'library': 'movie', 'media_type': 'movie', 'title': 'Movies'}
+        elif item_id == 'show':
+            metadata = {'type': 'library', 'library': 'show', 'media_type': 'episode', 'title': 'TV Shows'}
+        elif item_id == 'artist':
+            metadata = {'type': 'library', 'library': 'artist', 'media_type': 'track', 'title': 'Music'}
+        else:
+            pms_connect = pmsconnect.PmsConnect()
+            result = pms_connect.get_metadata_details(rating_key=item_id)
+            if result:
+                metadata = result['metadata']
+            else:
+                data_factory = datafactory.DataFactory()
+                query = data_factory.get_search_query(rating_key=item_id)
+
+        if metadata:
+            return serve_template(templatename="info.html", data=metadata, title="Info", config=config)
+        else:
+            logger.warn('Unable to retrieve data.')
+            return serve_template(templatename="info.html", data=None, query=query, title="Info")
+
+    @cherrypy.expose
+    def get_user_recently_watched(self, user=None, user_id=None, limit='10', **kwargs):
+
+        data_factory = datafactory.DataFactory()
+        result = data_factory.get_recently_watched(user_id=user_id, user=user, limit=limit)
+
+        if result:
+            return serve_template(templatename="user_recently_watched.html", data=result,
+                                  title="Recently Watched")
+        else:
+            logger.warn('Unable to retrieve data.')
+            return serve_template(templatename="user_recently_watched.html", data=None,
+                                  title="Recently Watched")
+
+    @cherrypy.expose
+    def get_user_watch_time_stats(self, user=None, user_id=None, **kwargs):
+
+        user_data = users.Users()
+        result = user_data.get_user_watch_time_stats(user_id=user_id, user=user)
+
+        if result:
+            return serve_template(templatename="user_watch_time_stats.html", data=result, title="Watch Stats")
+        else:
+            logger.warn('Unable to retrieve data.')
+            return serve_template(templatename="user_watch_time_stats.html", data=None, title="Watch Stats")
+
+    @cherrypy.expose
+    def get_user_player_stats(self, user=None, user_id=None, **kwargs):
+
+        user_data = users.Users()
+        result = user_data.get_user_player_stats(user_id=user_id, user=user)
+
+        if result:
+            return serve_template(templatename="user_player_stats.html", data=result,
+                                  title="Player Stats")
+        else:
+            logger.warn('Unable to retrieve data.')
+            return serve_template(templatename="user_player_stats.html", data=None, title="Player Stats")
+
+    @cherrypy.expose
+    def get_item_children(self, rating_key='', **kwargs):
+
+        pms_connect = pmsconnect.PmsConnect()
+        result = pms_connect.get_item_children(rating_key)
+
+        if result:
+            return serve_template(templatename="info_children_list.html", data=result, title="Children List")
+        else:
+            logger.warn('Unable to retrieve data.')
+            return serve_template(templatename="info_children_list.html", data=None, title="Children List")
+
+    @cherrypy.expose
+    def get_metadata_json(self, rating_key='', **kwargs):
+
+        pms_connect = pmsconnect.PmsConnect()
+        result = pms_connect.get_metadata(rating_key, 'json')
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
             return result
+        else:
+            logger.warn('Unable to retrieve data.')
 
     @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_server_info(self, **kwargs):
-        """ Get the PMS server information.
+    def get_metadata_xml(self, rating_key='', **kwargs):
 
-            ```
-            Required parameters:
-                None
+        pms_connect = pmsconnect.PmsConnect()
+        result = pms_connect.get_metadata(rating_key)
 
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    {"pms_identifier": "08u2phnlkdshf890bhdlksghnljsahgleikjfg9t",
-                     "pms_ip": "10.10.10.1",
-                     "pms_is_remote": 0,
-                     "pms_name": "Winterfell-Server",
-                     "pms_platform": "Windows",
-                     "pms_plexpass": 1,
-                     "pms_port": 32400,
-                     "pms_ssl": 0,
-                     "pms_url": "http://10.10.10.1:32400",
-                     "pms_url_manual": 0,
-                     "pms_version": "1.20.0.3133-fede5bdc7"
-                    }
-            ```
-        """
-        server = plextv.get_server_resources(return_info=True)
-        server.pop('pms_is_cloud', None)
-        return server
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/xml'
+            return result
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_recently_added_json(self, count='0', **kwargs):
+
+        pms_connect = pmsconnect.PmsConnect()
+        result = pms_connect.get_recently_added(count, 'json')
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return result
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_episode_list_json(self, rating_key='', **kwargs):
+
+        pms_connect = pmsconnect.PmsConnect()
+        result = pms_connect.get_episode_list(rating_key, 'json')
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return result
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_user_ips(self, user_id=None, user=None, **kwargs):
+
+        custom_where = []
+        if user_id:
+            custom_where = [['user_id', user_id]]
+        elif user:
+            custom_where = [['user', user]]
+
+        user_data = users.Users()
+        history = user_data.get_user_unique_ips(kwargs=kwargs,
+                                                custom_where=custom_where)
+
+        cherrypy.response.headers['Content-type'] = 'application/json'
+        return json.dumps(history)
+
+    @cherrypy.expose
+    def get_plays_by_date(self, time_range='30', y_axis='plays', **kwargs):
+
+        graph = graphs.Graphs()
+        result = graph.get_total_plays_per_day(time_range=time_range, y_axis=y_axis)
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps(result)
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_plays_by_dayofweek(self, time_range='30', y_axis='plays', **kwargs):
+
+        graph = graphs.Graphs()
+        result = graph.get_total_plays_per_dayofweek(time_range=time_range, y_axis=y_axis)
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps(result)
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_plays_by_hourofday(self, time_range='30', y_axis='plays', **kwargs):
+
+        graph = graphs.Graphs()
+        result = graph.get_total_plays_per_hourofday(time_range=time_range, y_axis=y_axis)
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps(result)
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_plays_per_month(self, y_axis='plays', **kwargs):
+
+        graph = graphs.Graphs()
+        result = graph.get_total_plays_per_month(y_axis=y_axis)
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps(result)
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_plays_by_top_10_platforms(self, time_range='30', y_axis='plays', **kwargs):
+
+        graph = graphs.Graphs()
+        result = graph.get_total_plays_by_top_10_platforms(time_range=time_range, y_axis=y_axis)
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps(result)
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_plays_by_top_10_users(self, time_range='30', y_axis='plays', **kwargs):
+
+        graph = graphs.Graphs()
+        result = graph.get_total_plays_by_top_10_users(time_range=time_range, y_axis=y_axis)
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps(result)
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_plays_by_stream_type(self, time_range='30', y_axis='plays', **kwargs):
+
+        graph = graphs.Graphs()
+        result = graph.get_total_plays_per_stream_type(time_range=time_range, y_axis=y_axis)
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps(result)
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_plays_by_source_resolution(self, time_range='30', y_axis='plays', **kwargs):
+
+        graph = graphs.Graphs()
+        result = graph.get_total_plays_by_source_resolution(time_range=time_range, y_axis=y_axis)
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps(result)
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_plays_by_stream_resolution(self, time_range='30', y_axis='plays', **kwargs):
+
+        graph = graphs.Graphs()
+        result = graph.get_total_plays_by_stream_resolution(time_range=time_range, y_axis=y_axis)
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps(result)
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_stream_type_by_top_10_users(self, time_range='30', y_axis='plays', **kwargs):
+
+        graph = graphs.Graphs()
+        result = graph.get_stream_type_by_top_10_users(time_range=time_range, y_axis=y_axis)
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps(result)
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_stream_type_by_top_10_platforms(self, time_range='30', y_axis='plays', **kwargs):
+
+        graph = graphs.Graphs()
+        result = graph.get_stream_type_by_top_10_platforms(time_range=time_range, y_axis=y_axis)
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps(result)
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_friends_list(self, **kwargs):
+
+        plex_tv = plextv.PlexTV()
+        result = plex_tv.get_plextv_friends('json')
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return result
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_user_details(self, **kwargs):
+
+        plex_tv = plextv.PlexTV()
+        result = plex_tv.get_plextv_user_details('json')
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return result
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_server_list(self, **kwargs):
+
+        plex_tv = plextv.PlexTV()
+        result = plex_tv.get_plextv_server_list('json')
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return result
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_sync_lists(self, machine_id='', **kwargs):
+
+        plex_tv = plextv.PlexTV()
+        result = plex_tv.get_plextv_sync_lists(machine_id=machine_id, output_format='json')
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return result
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_servers(self, **kwargs):
+
+        pms_connect = pmsconnect.PmsConnect()
+        result = pms_connect.get_server_list(output_format='json')
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return result
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_servers_info(self, **kwargs):
+
+        pms_connect = pmsconnect.PmsConnect()
+        result = pms_connect.get_servers_info()
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps(result)
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_server_prefs(self, **kwargs):
+
+        pms_connect = pmsconnect.PmsConnect()
+        result = pms_connect.get_server_prefs(output_format='json')
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return result
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_server_children(self, **kwargs):
+
+        pms_connect = pmsconnect.PmsConnect()
+        result = pms_connect.get_server_children()
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps(result)
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_activity(self, **kwargs):
+
+        pms_connect = pmsconnect.PmsConnect()
+        result = pms_connect.get_current_activity()
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps(result)
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_full_users_list(self, **kwargs):
+
+        plex_tv = plextv.PlexTV()
+        result = plex_tv.get_full_users_list()
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps(result)
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def refresh_users_list(self, **kwargs):
+        threading.Thread(target=plextv.refresh_users).start()
+        logger.info('Manual user list refresh requested.')
+
+    @cherrypy.expose
+    def get_sync(self, machine_id=None, user_id=None, **kwargs):
+
+        pms_connect = pmsconnect.PmsConnect()
+        server_id = pms_connect.get_server_identity()
+
+        plex_tv = plextv.PlexTV()
+        if not machine_id:
+            result = plex_tv.get_synced_items(machine_id=server_id['machine_identifier'], user_id=user_id)
+        else:
+            result = plex_tv.get_synced_items(machine_id=machine_id, user_id=user_id)
+
+        if result:
+            output = {"data": result}
+        else:
+            logger.warn('Unable to retrieve sync data for user.')
+            output = {"data": []}
+
+        cherrypy.response.headers['Content-type'] = 'application/json'
+        return json.dumps(output)
+
+    @cherrypy.expose
+    def get_sync_item(self, sync_id, **kwargs):
+
+        pms_connect = pmsconnect.PmsConnect()
+        result = pms_connect.get_sync_item(sync_id, output_format='json')
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return result
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_sync_transcode_queue(self, **kwargs):
+
+        pms_connect = pmsconnect.PmsConnect()
+        result = pms_connect.get_sync_transcode_queue(output_format='json')
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return result
+        else:
+            logger.warn('Unable to retrieve data.')
 
     @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    @addtoapi()
     def get_server_pref(self, pref=None, **kwargs):
-        """ Get a specified PMS server preference.
-
-            ```
-            Required parameters:
-                pref (str):         Name of preference
-
-            Returns:
-                string:             Value of preference
-            ```
-        """
 
         pms_connect = pmsconnect.PmsConnect()
         result = pms_connect.get_server_pref(pref=pref)
@@ -4203,2181 +1223,60 @@ class WebInterface(object):
         if result:
             return result
         else:
-            logger.warn("Unable to retrieve data for get_server_pref.")
-            return result
+            logger.warn('Unable to retrieve data.')
 
     @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def generate_api_key(self, device=None, **kwargs):
-        apikey = ''
-        while not apikey or apikey == plexpy.CONFIG.API_KEY or mobile_app.get_mobile_device_by_token(device_token=apikey):
-            if sys.version_info >= (3, 6):
-                apikey = secrets.token_urlsafe(24)
+    def get_plexwatch_export_data(self, database_path=None, table_name=None, import_ignore_interval=0, **kwargs):
+        from plexpy import plexwatch_import
+
+        db_check_msg = plexwatch_import.validate_database(database=database_path,
+                                                          table_name=table_name)
+        if db_check_msg == 'success':
+            threading.Thread(target=plexwatch_import.import_from_plexwatch,
+                             kwargs={'database': database_path,
+                                     'table_name': table_name,
+                                     'import_ignore_interval': import_ignore_interval}).start()
+            return 'Import has started. Check the PlexPy logs to monitor any problems.'
+        else:
+            return db_check_msg
+
+    @cherrypy.expose
+    def plexwatch_import(self, **kwargs):
+        return serve_template(templatename="plexwatch_import.html", title="Import PlexWatch Database")
+
+    @cherrypy.expose
+    def get_server_id(self, hostname=None, port=None, **kwargs):
+        from plexpy import http_handler
+
+        if hostname and port:
+            request_handler = http_handler.HTTPHandler(host=hostname,
+                                                       port=port,
+                                                       token=None)
+            uri = '/identity'
+            request = request_handler.make_request(uri=uri,
+                                                   proto='http',
+                                                   request_type='GET',
+                                                   output_format='',
+                                                   no_token=True)
+            if request:
+                cherrypy.response.headers['Content-type'] = 'application/xml'
+                return request
             else:
-                apikey = plexpy.generate_uuid()
-
-        logger.info("New API key generated.")
-        logger._BLACKLIST_WORDS.add(apikey)
-
-        if helpers.bool_true(device):
-            mobile_app.set_temp_device_token(apikey, add=True)
-
-        return apikey
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def update_check(self, **kwargs):
-        """ Check for Tautulli updates.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                None
-
-            Returns:
-                json
-                    {"result": "success",
-                     "update": true,
-                     "message": "An update for Tautulli is available."
-                    }
-            ```
-        """
-        versioncheck.check_update()
-
-        if plexpy.UPDATE_AVAILABLE is None:
-            update = {'result': 'error',
-                      'update': None,
-                      'message': 'You are running an unknown version of Tautulli.'
-                      }
-
-        elif plexpy.UPDATE_AVAILABLE == 'release':
-            update = {'result': 'success',
-                      'update': True,
-                      'release': True,
-                      'message': 'A new release (%s) of Tautulli is available.' % plexpy.LATEST_RELEASE,
-                      'current_release': plexpy.common.RELEASE,
-                      'latest_release': plexpy.LATEST_RELEASE,
-                      'release_url': helpers.anon_url(
-                          'https://github.com/%s/%s/releases/tag/%s'
-                          % (plexpy.CONFIG.GIT_USER,
-                             plexpy.CONFIG.GIT_REPO,
-                             plexpy.LATEST_RELEASE))
-                      }
-
-        elif plexpy.UPDATE_AVAILABLE == 'commit':
-            update = {'result': 'success',
-                      'update': True,
-                      'release': False,
-                      'message': 'A newer version of Tautulli is available.',
-                      'current_version': plexpy.CURRENT_VERSION,
-                      'latest_version': plexpy.LATEST_VERSION,
-                      'commits_behind': plexpy.COMMITS_BEHIND,
-                      'compare_url': helpers.anon_url(
-                          'https://github.com/%s/%s/compare/%s...%s'
-                          % (plexpy.CONFIG.GIT_USER,
-                             plexpy.CONFIG.GIT_REPO,
-                             plexpy.CURRENT_VERSION,
-                             plexpy.LATEST_VERSION))
-                      }
-
+                logger.warn('Unable to retrieve data.')
+                return None
         else:
-            update = {'result': 'success',
-                      'update': False,
-                      'message': 'Tautulli is up to date.'
-                      }
-
-        if plexpy.DOCKER or plexpy.SNAP or plexpy.FROZEN:
-            update['install_type'] = plexpy.INSTALL_TYPE
-
-        return update
-
-    def do_state_change(self, signal, title, timer, **kwargs):
-        message = title
-        quote = self.random_arnold_quotes()
-        if signal:
-            plexpy.SIGNAL = signal
-
-        if plexpy.CONFIG.HTTP_ROOT.strip('/'):
-            new_http_root = '/' + plexpy.CONFIG.HTTP_ROOT.strip('/') + '/'
-        else:
-            new_http_root = '/'
-
-        return serve_template(template_name="shutdown.html", signal=signal, title=title,
-                              new_http_root=new_http_root, message=message, timer=timer, quote=quote)
+            return None
 
     @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def shutdown(self, **kwargs):
-        return self.do_state_change('shutdown', 'Shutting Down', 15)
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def restart(self, **kwargs):
-        return self.do_state_change('restart', 'Restarting', 30)
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def update(self, **kwargs):
-        if plexpy.DOCKER or plexpy.SNAP:
-            raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT + "home")
-
-        # Show changelog after updating
-        plexpy.CONFIG.UPDATE_SHOW_CHANGELOG = 1
-        plexpy.CONFIG.write()
-        return self.do_state_change('update', 'Updating', 120)
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def checkout_git_branch(self, git_remote=None, git_branch=None, **kwargs):
-        if git_branch == plexpy.CONFIG.GIT_BRANCH:
-            logger.error("Already on the %s branch" % git_branch)
-            raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT + "home")
-
-        # Set the new git remote and branch
-        plexpy.CONFIG.GIT_REMOTE = git_remote
-        plexpy.CONFIG.GIT_BRANCH = git_branch
-        plexpy.CONFIG.write()
-        return self.do_state_change('checkout', 'Switching Git Branches', 120)
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def reset_git_install(self, **kwargs):
-        return self.do_state_change('reset', 'Resetting to {}'.format(common.RELEASE), 120)
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def restart_import_config(self, **kwargs):
-        if config.IMPORT_THREAD:
-            config.IMPORT_THREAD.start()
-        return self.do_state_change(None, 'Importing a Config', 15)
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def get_changelog(self, latest_only=False, since_prev_release=False, update_shown=False, **kwargs):
-        latest_only = helpers.bool_true(latest_only)
-        since_prev_release = helpers.bool_true(since_prev_release)
-
-        if since_prev_release and plexpy.PREV_RELEASE == common.RELEASE:
-            latest_only = True
-            since_prev_release = False
-
-        # Set update changelog shown status
-        if helpers.bool_true(update_shown):
-            plexpy.CONFIG.UPDATE_SHOW_CHANGELOG = 0
-            plexpy.CONFIG.write()
-
-        return versioncheck.read_changelog(latest_only=latest_only, since_prev_release=since_prev_release)
-
-    ##### Info #####
-
-    @cherrypy.expose
-    @requireAuth()
-    def info(self, rating_key=None, guid=None, source=None, section_id=None, user_id=None, **kwargs):
-        if rating_key and not str(rating_key).isdigit():
-            raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT)
-
-        metadata = None
-
-        config = {
-            "pms_identifier": plexpy.CONFIG.PMS_IDENTIFIER,
-            "pms_web_url": plexpy.CONFIG.PMS_WEB_URL
-        }
-
-        if user_id:
-            user_data = users.Users()
-            user_info = user_data.get_details(user_id=user_id)
-        else:
-            user_info = {}
-
-        # Try to get metadata from the Plex server first
-        if rating_key:
-            pms_connect = pmsconnect.PmsConnect()
-            metadata = pms_connect.get_metadata_details(rating_key=rating_key, section_id=section_id)
-
-        # If the item is not found on the Plex server, get the metadata from history
-        if not metadata and source == 'history':
-            data_factory = datafactory.DataFactory()
-            metadata = data_factory.get_metadata_details(rating_key=rating_key, guid=guid)
-
-        if metadata:
-            data_factory = datafactory.DataFactory()
-            poster_info = data_factory.get_poster_info(metadata=metadata)
-            metadata.update(poster_info)
-            lookup_info = data_factory.get_lookup_info(metadata=metadata)
-            metadata.update(lookup_info)
-
-        if metadata:
-            if metadata['section_id'] and not allow_session_library(metadata['section_id']):
-                raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT)
-
-            return serve_template(template_name="info.html", metadata=metadata, title="Info",
-                                  config=config, source=source, user_info=user_info)
-        else:
-            if get_session_user_id():
-                raise cherrypy.HTTPRedirect(plexpy.HTTP_ROOT)
-            else:
-                return self.update_metadata(rating_key)
-
-    @cherrypy.expose
-    @requireAuth()
-    def get_item_children(self, rating_key='', media_type=None, **kwargs):
-
-        pms_connect = pmsconnect.PmsConnect()
-        result = pms_connect.get_item_children(rating_key=rating_key, media_type=media_type)
-
-        if result:
-            return serve_template(template_name="info_children_list.html", data=result,
-                                  media_type=media_type, title="Children List")
-        else:
-            logger.warn("Unable to retrieve data for get_item_children.")
-            return serve_template(template_name="info_children_list.html", data=None, title="Children List")
-
-    @cherrypy.expose
-    @requireAuth()
-    def get_item_children_related(self, rating_key='', title='', **kwargs):
-
-        pms_connect = pmsconnect.PmsConnect()
-        result = pms_connect.get_item_children_related(rating_key=rating_key)
-
-        if result:
-            return serve_template(template_name="info_collection_list.html", data=result, title=title)
-        else:
-            return serve_template(template_name="info_collection_list.html", data=None, title=title)
-
-    @cherrypy.expose
-    @requireAuth()
-    def item_watch_time_stats(self, rating_key=None, guid=None, media_type=None, **kwargs):
-        if rating_key or guid:
-            item_data = datafactory.DataFactory()
-            result = item_data.get_watch_time_stats(rating_key=rating_key, guid=guid, media_type=media_type)
-        else:
-            result = None
-
-        if result:
-            return serve_template(template_name="user_watch_time_stats.html", data=result, title="Watch Stats")
-        else:
-            logger.warn("Unable to retrieve data for item_watch_time_stats.")
-            return serve_template(template_name="user_watch_time_stats.html", data=None, title="Watch Stats")
-
-    @cherrypy.expose
-    @requireAuth()
-    def item_user_stats(self, rating_key=None, guid=None, media_type=None, **kwargs):
-        if rating_key or guid:
-            item_data = datafactory.DataFactory()
-            result = item_data.get_user_stats(rating_key=rating_key, guid=guid, media_type=media_type)
-        else:
-            result = None
-
-        if result:
-            return serve_template(template_name="library_user_stats.html", data=result, title="Player Stats")
-        else:
-            logger.warn("Unable to retrieve data for item_user_stats.")
-            return serve_template(template_name="library_user_stats.html", data=None, title="Player Stats")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_item_watch_time_stats(self, rating_key=None, media_type=None, grouping=None, query_days=None, **kwargs):
-        """  Get the watch time stats for the media item.
-
-            ```
-            Required parameters:
-                rating_key (str):       Rating key of the item
-
-            Optional parameters:
-                media_type (str):       Media type of the item (only required for a collection)
-                grouping (int):         0 or 1
-                query_days (str):       Comma separated days, e.g. "1,7,30,0"
-
-            Returns:
-                json:
-                    [
-                        {
-                            "query_days": 1,
-                            "total_time": 0,
-                            "total_plays": 0
-                        },
-                        {
-                            "query_days": 7,
-                            "total_time": 0,
-                            "total_plays": 0
-                        },
-                        {
-                            "query_days": 30,
-                            "total_time": 0,
-                            "total_plays": 0
-                        },
-                        {
-                            "query_days": 0,
-                            "total_time": 57776,
-                            "total_plays": 13
-                        }
-                    ]
-            ```
-        """
-        grouping = helpers.bool_true(grouping, return_none=True)
-
-        if rating_key:
-            item_data = datafactory.DataFactory()
-            result = item_data.get_watch_time_stats(rating_key=rating_key,
-                                                    media_type=media_type,
-                                                    grouping=grouping,
-                                                    query_days=query_days)
-            if result:
-                return result
-            else:
-                logger.warn("Unable to retrieve data for get_item_watch_time_stats.")
-                return result
-        else:
-            logger.warn("Item watch time stats requested but no rating_key received.")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_item_user_stats(self, rating_key=None, media_type=None, grouping=None, **kwargs):
-        """  Get the user stats for the media item.
-
-            ```
-            Required parameters:
-                rating_key (str):       Rating key of the item
-
-            Optional parameters:
-                media_type (str):       Media type of the item (only required for a collection)
-                grouping (int):         0 or 1
-
-            Returns:
-                json:
-                    [
-                        {
-                            "friendly_name": "Jon Snow",
-                            "user_id": 1601089,
-                            "user_thumb": "",
-                            "username": "jsnow@thewinteriscoming.com",
-                            "total_plays": 6,
-                            "total_time": 28743
-                        },
-                        {
-                            "friendly_name": "DanyKhaleesi69",
-                            "user_id": 8008135,
-                            "user_thumb": "",
-                            "username": "DanyKhaleesi69",
-                            "total_plays": 5,
-                            "total_time": 18583
-                        }
-                    ]
-            ```
-        """
-        grouping = helpers.bool_true(grouping, return_none=True)
-
-        if rating_key:
-            item_data = datafactory.DataFactory()
-            result = item_data.get_user_stats(rating_key=rating_key,
-                                              media_type=media_type,
-                                              grouping=grouping)
-            if result:
-                return result
-            else:
-                logger.warn("Unable to retrieve data for get_item_user_stats.")
-                return result
-        else:
-            logger.warn("Item user stats requested but no rating_key received.")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi("get_children_metadata")
-    def get_children_metadata_details(self, rating_key='', media_type=None, **kwargs):
-        """ Get the metadata for the children of a media item.
-
-            ```
-            Required parameters:
-                rating_key (str):       Rating key of the item
-                media_type (str):       Media type of the item
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    {"children_count": 9,
-                     "children_type": "season",
-                     "title": "Game of Thrones",
-                     "children_list": [
-                         {...},
-                         {"actors": [],
-                          "added_at": "1403553078",
-                          "art": "/library/metadata/1219/art/1562110346",
-                          "audience_rating": "",
-                          "audience_rating_image": "",
-                          "banner": "",
-                          "collections": [],
-                          "content_rating": "",
-                          "directors": [],
-                          "duration": "",
-                          "full_title": "Season 1"
-                          "genres": [],
-                          "grandparent_rating_key": "",
-                          "grandparent_thumb": "",
-                          "grandparent_title": "",
-                          "guid": "com.plexapp.agents.thetvdb://121361/1?lang=en",
-                          "labels": [],
-                          "last_viewed_at": "1589992348",
-                          "library_name": "TV Shows",
-                          "media_index": "1",
-                          "media_type": "season",
-                          "original_title": "",
-                          "originally_available_at": "",
-                          "parent_media_index": "1",
-                          "parent_rating_key": "1219",
-                          "parent_thumb": "/library/metadata/1219/thumb/1562110346",
-                          "parent_title": "Game of Thrones",
-                          "rating": "",
-                          "rating_image": "",
-                          "rating_key": "1220",
-                          "section_id": "2",
-                          "sort_title": "",
-                          "studio": "",
-                          "summary": "",
-                          "tagline": "",
-                          "thumb": "/library/metadata/1220/thumb/1602176313",
-                          "title": "Season 1",
-                          "updated_at": "1602176313",
-                          "user_rating": "",
-                          "writers": [],
-                          "year": ""
-                          },
-                          {...},
-                          {...}
-                         ]
-                     }
-            ```
-        """
-        pms_connect = pmsconnect.PmsConnect()
-        metadata = pms_connect.get_item_children(rating_key=rating_key,
-                                                 media_type=media_type)
-
-        if metadata:
-            return metadata
-        else:
-            logger.warn("Unable to retrieve data for get_children_metadata_details.")
-            return metadata
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi('notify_recently_added')
-    def send_manual_on_created(self, notifier_id='', rating_key='', **kwargs):
-        """ Send a recently added notification using Tautulli.
-
-            ```
-            Required parameters:
-                rating_key (int):       The rating key for the media
-
-            Optional parameters:
-                notifier_id (int):      The ID number of the notification agent.
-                                        The notification will send to all enabled notification agents if notifier id is not provided.
-
-            Returns:
-                json
-                    {"result": "success",
-                     "message": "Notification queued."
-                    }
-            ```
-        """
-        if rating_key:
-            pms_connect = pmsconnect.PmsConnect()
-            metadata = pms_connect.get_metadata_details(rating_key=rating_key)
-            data = {'timeline_data': metadata, 'notify_action': 'on_created', 'manual_trigger': True}
-
-            if metadata['media_type'] not in ('movie', 'episode', 'track'):
-                children = pms_connect.get_item_children(rating_key=rating_key)
-                child_keys = [child['rating_key'] for child in children['children_list'] if child['rating_key']]
-                data['child_keys'] = child_keys
-
-            if notifier_id:
-                data['notifier_id'] = notifier_id
-
-            plexpy.NOTIFY_QUEUE.put(data)
-            return {'result': 'success', 'message': 'Notification queued.'}
-
-        else:
-            return {'result': 'error', 'message': 'Notification failed.'}
-
-    @cherrypy.expose
-    def pms_image_proxy(self, **kwargs):
-        """ See real_pms_image_proxy docs string"""
-
-        refresh = False
-        if kwargs.get('refresh') or 'no-cache' in cherrypy.request.headers.get('Cache-Control', ''):
-            refresh = False if get_session_user_id() else True
-
-        kwargs['refresh'] = refresh
-
-        return self.real_pms_image_proxy(**kwargs)
-
-    @addtoapi('pms_image_proxy')
-    def real_pms_image_proxy(self, img=None, rating_key=None, width=750, height=1000,
-                             opacity=100, background='000000', blur=0, img_format='png',
-                             fallback=None, refresh=False, clip=False, **kwargs):
-        """ Gets an image from the PMS and saves it to the image cache directory.
-
-            ```
-            Required parameters:
-                img (str):              /library/metadata/153037/thumb/1462175060
-                or
-                rating_key (str):       54321
-
-            Optional parameters:
-                width (str):            300
-                height (str):           450
-                opacity (str):          25
-                background (str):       Hex color, e.g. 282828
-                blur (str):             3
-                img_format (str):       png
-                fallback (str):         "poster", "cover", "art", "poster-live", "art-live", "art-live-full", "user"
-                refresh (bool):         True or False whether to refresh the image cache
-                return_hash (bool):     True or False to return the self-hosted image hash instead of the image
-
-            Returns:
-                None
-            ```
-        """
-        cherrypy.response.headers['Cache-Control'] = 'max-age=2592000'  # 30 days
-
-        if isinstance(img, str) and img.startswith('interfaces/default/images'):
-            fp = os.path.join(plexpy.PROG_DIR, 'data', img)
-            ext = img.rsplit(".", 1)[-1]
-            if ext == 'svg':
-                content_type = 'image/svg+xml'
-            else:
-                content_type = 'image/{}'.format(ext)
-            return serve_file(path=fp, content_type=content_type)
-
-        if not img and not rating_key:
-            if fallback in common.DEFAULT_IMAGES:
-                fbi = common.DEFAULT_IMAGES[fallback]
-                fp = os.path.join(plexpy.PROG_DIR, 'data', fbi)
-                return serve_file(path=fp, content_type='image/png')
-            logger.warn('No image input received.')
-            return
-
-        return_hash = helpers.bool_true(kwargs.get('return_hash'))
-
-        if rating_key and not img:
-            if fallback and fallback.startswith('art'):
-                img = '/library/metadata/{}/art'.format(rating_key)
-            else:
-                img = '/library/metadata/{}/thumb'.format(rating_key)
-
-        if img and not img.startswith('http'):
-            parts = 5
-            if img.startswith('/playlists'):
-                parts -= 1
-            rating_key_idx = parts - 2
-            parts += int('composite' in img)
-            img_split = img.split('/')
-            img = '/'.join(img_split[:parts])
-            img_rating_key = img_split[rating_key_idx]
-            if rating_key != img_rating_key:
-                rating_key = img_rating_key
-
-        img_hash = notification_handler.set_hash_image_info(
-            img=img, rating_key=rating_key, width=width, height=height,
-            opacity=opacity, background=background, blur=blur, fallback=fallback,
-            add_to_db=return_hash)
-
-        if return_hash:
-            return {'img_hash': img_hash}
-
-        fp = '{}.{}'.format(img_hash, img_format)  # we want to be able to preview the thumbs
-        c_dir = os.path.join(plexpy.CONFIG.CACHE_DIR, 'images')
-        ffp = os.path.join(c_dir, fp)
-
-        if not os.path.exists(c_dir):
-            os.mkdir(c_dir)
-
-        clip = helpers.bool_true(clip)
-
-        try:
-            if not plexpy.CONFIG.CACHE_IMAGES or refresh or 'indexes' in img:
-                raise NotFound
-
-            return serve_file(path=ffp, content_type='image/png')
-
-        except NotFound:
-            # the image does not exist, download it from pms
-            try:
-                pms_connect = pmsconnect.PmsConnect()
-                pms_connect.request_handler._silent = True
-                result = pms_connect.get_image(img=img,
-                                               width=width,
-                                               height=height,
-                                               opacity=opacity,
-                                               background=background,
-                                               blur=blur,
-                                               img_format=img_format,
-                                               clip=clip,
-                                               refresh=refresh)
-
-                if result and result[0]:
-                    cherrypy.response.headers['Content-type'] = result[1]
-                    if plexpy.CONFIG.CACHE_IMAGES and 'indexes' not in img:
-                        with open(ffp, 'wb') as f:
-                            f.write(result[0])
-
-                    return result[0]
-                else:
-                    raise Exception('PMS image request failed')
-
-            except Exception as e:
-                logger.warn("Failed to get image %s, falling back to %s." % (img, fallback))
-                cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store"
-                if fallback in common.DEFAULT_IMAGES:
-                    fbi = common.DEFAULT_IMAGES[fallback]
-                    fp = os.path.join(plexpy.PROG_DIR, 'data', fbi)
-                    return serve_file(path=fp, content_type='image/png')
-                elif fallback:
-                    return self.real_pms_image_proxy(
-                        img=fallback, rating_key=None, width=width, height=height,
-                        opacity=opacity, background=background, blur=blur, img_format=img_format,
-                        fallback=None, refresh=refresh, clip=clip, **kwargs)
-
-    @cherrypy.expose
-    def image(self, *args, **kwargs):
-        if args:
-            cherrypy.response.headers['Cache-Control'] = 'max-age=3600'  # 1 hour
-
-            if len(args) >= 2 and args[0] == 'images':
-                resource_dir = os.path.join(str(plexpy.PROG_DIR), 'data/interfaces/default/')
-                try:
-                    return serve_file(path=os.path.join(resource_dir, *args), content_type='image/png')
-                except NotFound:
-                    return
-
-            img_hash = args[0].split('.')[0]
-
-            if img_hash in common.DEFAULT_IMAGES:
-                fbi = common.DEFAULT_IMAGES[img_hash]
-                fp = os.path.join(plexpy.PROG_DIR, 'data', fbi)
-                return serve_file(path=fp, content_type='image/png')
-
-            img_info = notification_handler.get_hash_image_info(img_hash=img_hash)
-
-            if img_info:
-                kwargs.update(img_info)
-                return self.real_pms_image_proxy(refresh=True, **kwargs)
-
-        return
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def download_config(self, **kwargs):
-        """ Download the Tautulli configuration file. """
-        config_file = config.FILENAME
-        config_copy = os.path.join(plexpy.CONFIG.CACHE_DIR, config_file)
-
-        try:
-            plexpy.CONFIG.write()
-            shutil.copyfile(plexpy.CONFIG_FILE, config_copy)
-        except:
-            pass
-
-        try:
-            cfg = config.Config(config_copy)
-            for key in config._DO_NOT_DOWNLOAD_KEYS:
-                setattr(cfg, key, '')
-            cfg.write()
-        except:
-            cherrypy.response.status = 500
-            return 'Error downloading config. Check the logs.'
-
-        return serve_download(config_copy, name=config_file)
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def download_database(self, **kwargs):
-        """ Download the Tautulli database file. """
-        database_file = database.FILENAME
-        database_copy = os.path.join(plexpy.CONFIG.CACHE_DIR, database_file)
-
-        try:
-            db = database.MonitorDatabase()
-            db.connection.execute('begin immediate')
-            shutil.copyfile(plexpy.DB_FILE, database_copy)
-            db.connection.rollback()
-        except:
-            pass
-
-        # Remove tokens
-        db = database.MonitorDatabase(database_copy)
-        try:
-            db.action('UPDATE users SET user_token = NULL, server_token = NULL')
-        except:
-            logger.error('Failed to remove tokens from downloaded database.')
-            cherrypy.response.status = 500
-            return 'Error downloading database. Check the logs.'
-
-        return serve_download(database_copy, name=database_file)
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def download_log(self, logfile='', **kwargs):
-        """ Download the Tautulli log file.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                logfile (str):          The name of the Tautulli log file,
-                                        "tautulli", "tautulli_api", "plex_websocket"
-
-            Returns:
-                download
-            ```
-        """
-        if logfile == "tautulli_api":
-            filename = logger.FILENAME_API
-            log = logger.logger_api
-        elif logfile == "plex_websocket":
-            filename = logger.FILENAME_PLEX_WEBSOCKET
-            log = logger.logger_plex_websocket
-        else:
-            filename = logger.FILENAME
-            log = logger.logger
-
-        try:
-            log.flush()
-        except:
-            pass
-
-        return serve_download(os.path.join(plexpy.CONFIG.LOG_DIR, filename), name=filename)
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def download_plex_log(self, logfile='', **kwargs):
-        """ Download the Plex log file.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                logfile (int):          The name of the Plex log file,
-                                        e.g. "Plex Media Server", "Plex Media Scanner"
-
-            Returns:
-                download
-            ```
-        """
-        if not plexpy.CONFIG.PMS_LOGS_FOLDER:
-            return "Plex log folder not set in the settings."
-
-        if kwargs.get('log_type'):
-            logfile = 'Plex Media ' + kwargs['log_type'].capitalize()
-
-        log_file = (logfile or 'Plex Media Server') + '.log'
-        log_file_path = os.path.join(plexpy.CONFIG.PMS_LOGS_FOLDER, log_file)
-
-        if log_file and os.path.isfile(log_file_path):
-            log_file_name = os.path.basename(log_file_path)
-            return serve_download(log_file_path, name=log_file_name)
-        else:
-            return "Plex log file '%s' not found." % log_file
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def delete_image_cache(self, **kwargs):
-        """ Delete and recreate the image cache directory. """
-        return self.delete_cache(folder='images')
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def delete_cache(self, folder='', **kwargs):
-        """ Delete and recreate the cache directory. """
-        cache_dir = os.path.join(plexpy.CONFIG.CACHE_DIR, folder)
-        result = 'success'
-        msg = 'Cleared the %scache.' % (folder + ' ' if folder else '')
-        try:
-            shutil.rmtree(cache_dir, ignore_errors=True)
-        except OSError as e:
-            result = 'error'
-            msg = 'Failed to delete %s.' % cache_dir
-            logger.exception('Failed to delete %s: %s.' % (cache_dir, e))
-            return {'result': result, 'message': msg}
-
-        try:
-            os.makedirs(cache_dir)
-        except OSError as e:
-            result = 'error'
-            msg = 'Failed to make %s.' % cache_dir
-            logger.exception('Failed to create %s: %s.' % (cache_dir, e))
-            return {'result': result, 'message': msg}
-
-        logger.info(msg)
-        return {'result': result, 'message': msg}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def delete_hosted_images(self, rating_key='', service='', delete_all=False, **kwargs):
-        """ Delete the images uploaded to image hosting services.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                rating_key (int):       1234
-                                        (Note: Must be the movie, show, season, artist, or album rating key)
-                service (str):          'imgur' or 'cloudinary'
-                delete_all (bool):      'true' to delete all images form the service
-
-            Returns:
-                json:
-                    {"result": "success",
-                     "message": "Deleted hosted images from Imgur."}
-            ```
-        """
-
-        delete_all = helpers.bool_true(delete_all)
-
-        data_factory = datafactory.DataFactory()
-        result = data_factory.delete_img_info(rating_key=rating_key, service=service, delete_all=delete_all)
-
-        if result:
-            return {'result': 'success', 'message': 'Deleted hosted images from %s.' % result.capitalize()}
-        else:
-            return {'result': 'error', 'message': 'Failed to delete hosted images.'}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def delete_lookup_info(self, rating_key='', service='', delete_all=False, **kwargs):
-        """ Delete the 3rd party API lookup info.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                rating_key (int):       1234
-                                        (Note: Must be the movie, show, artist, album, or track rating key)
-                service (str):          'themoviedb' or 'tvmaze' or 'musicbrainz'
-                delete_all (bool):      'true' to delete all images form the service
-
-            Returns:
-                json:
-                    {"result": "success",
-                     "message": "Deleted lookup info."}
-            ```
-        """
-
-        data_factory = datafactory.DataFactory()
-        result = data_factory.delete_lookup_info(rating_key=rating_key, service=service, delete_all=delete_all)
-
-        if result:
-            return {'result': 'success', 'message': 'Deleted lookup info.'}
-        else:
-            return {'result': 'error', 'message': 'Failed to delete lookup info.'}
-
-
-    ##### Search #####
-
-    @cherrypy.expose
-    @requireAuth()
-    def search(self, query='', **kwargs):
-        return serve_template(template_name="search.html", title="Search", query=query)
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi('search')
-    def search_results(self, query='', limit='', **kwargs):
-        """ Get search results from the PMS.
-
-            ```
-            Required parameters:
-                query (str):        The query string to search for
-
-            Optional parameters:
-                limit (int):        The maximum number of items to return per media type
-
-            Returns:
-                json:
-                    {"results_count": 69,
-                     "results_list":
-                        {"movie":
-                            [{...},
-                             {...},
-                             ]
-                         },
-                        {"episode":
-                            [{...},
-                             {...},
-                             ]
-                         },
-                        {...}
-                     }
-            ```
-        """
-        pms_connect = pmsconnect.PmsConnect()
-        result = pms_connect.get_search_results(query=query, limit=limit)
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for search_results.")
-            return result
-
-    @cherrypy.expose
-    @requireAuth()
-    def get_search_results_children(self, query='', limit='', media_type=None, season_index=None, **kwargs):
-
-        pms_connect = pmsconnect.PmsConnect()
-        result = pms_connect.get_search_results(query=query, limit=limit)
-
-        if media_type:
-            result['results_list'] = {media_type: result['results_list'][media_type]}
-        if media_type == 'season' and season_index:
-            result['results_list']['season'] = [season for season in result['results_list']['season']
-                                                if season['media_index'] == season_index]
-
-        if result:
-            return serve_template(template_name="info_search_results_list.html", data=result, title="Search Result List")
-        else:
-            logger.warn("Unable to retrieve data for get_search_results_children.")
-            return serve_template(template_name="info_search_results_list.html", data=None, title="Search Result List")
-
-
-    ##### Update Metadata #####
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def update_metadata(self, rating_key=None, query=None, update=False, **kwargs):
-        query_string = query
-        update = helpers.bool_true(update)
-
-        data_factory = datafactory.DataFactory()
-        query = data_factory.get_search_query(rating_key=rating_key)
-        if query and query_string:
-            query['query_string'] = query_string
-
-        if query:
-            return serve_template(template_name="update_metadata.html", query=query, update=update, title="Info")
-        else:
-            logger.warn("Unable to retrieve data for update_metadata.")
-            return serve_template(template_name="update_metadata.html", query=query, update=update, title="Info")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def update_metadata_details(self, old_rating_key, new_rating_key, media_type, single_update=False, **kwargs):
-        """ Update the metadata in the Tautulli database by matching rating keys.
-            Also updates all parents or children of the media item if it is a show/season/episode
-            or artist/album/track.
-
-            ```
-            Required parameters:
-                old_rating_key (str):       12345
-                new_rating_key (str):       54321
-                media_type (str):           "movie", "show", "season", "episode", "artist", "album", "track"
-
-            Optional parameters:
-                None
-
-            Returns:
-                None
-            ```
-        """
-        single_update = helpers.bool_true(single_update)
-
-        if new_rating_key:
-            data_factory = datafactory.DataFactory()
-            pms_connect = pmsconnect.PmsConnect()
-
-            old_key_list = data_factory.get_rating_keys_list(rating_key=old_rating_key, media_type=media_type)
-            new_key_list = pms_connect.get_rating_keys_list(rating_key=new_rating_key, media_type=media_type)
-
-            result = data_factory.update_metadata(old_key_list=old_key_list,
-                                                  new_key_list=new_key_list,
-                                                  media_type=media_type,
-                                                  single_update=single_update)
-
-        if result:
-            return {'message': result}
-        else:
-            return {'message': 'no data received'}
-
-    # test code
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_new_rating_keys(self, rating_key='', media_type='', **kwargs):
-        """ Get a list of new rating keys for the PMS of all of the item's parent/children.
-
-            ```
-            Required parameters:
-                rating_key (str):       '12345'
-                media_type (str):       "movie", "show", "season", "episode", "artist", "album", "track"
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    {}
-            ```
-        """
-
-        pms_connect = pmsconnect.PmsConnect()
-        result = pms_connect.get_rating_keys_list(rating_key=rating_key, media_type=media_type)
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_new_rating_keys.")
-            return result
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_old_rating_keys(self, rating_key='', media_type='', **kwargs):
-        """ Get a list of old rating keys from the Tautulli database for all of the item's parent/children.
-
-            ```
-            Required parameters:
-                rating_key (str):       '12345'
-                media_type (str):       "movie", "show", "season", "episode", "artist", "album", "track"
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    {}
-            ```
-        """
-
-        data_factory = datafactory.DataFactory()
-        result = data_factory.get_rating_keys_list(rating_key=rating_key, media_type=media_type)
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_old_rating_keys.")
-            return result
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def get_pms_sessions_json(self, **kwargs):
-        """ Get all the current sessions. """
-        pms_connect = pmsconnect.PmsConnect()
-        result = pms_connect.get_sessions('json')
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_pms_sessions_json.")
-            return False
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi("get_metadata")
-    def get_metadata_details(self, rating_key='', sync_id='', **kwargs):
-        """ Get the metadata for a media item.
-
-            ```
-            Required parameters:
-                rating_key (str):       Rating key of the item, OR
-                sync_id (str):          Sync ID of a synced item
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    {"actors": [
-                        "Emilia Clarke",
-                        "Lena Headey",
-                        "Sophie Turner",
-                        "Kit Harington",
-                        "Peter Dinklage",
-                        "Nikolaj Coster-Waldau",
-                        "Maisie Williams",
-                        "Iain Glen",
-                        "John Bradley",
-                        "Alfie Allen"
-                     ],
-                     "added_at": "1461572396",
-                     "art": "/library/metadata/1219/art/1462175063",
-                     "audience_rating": "7.4",
-                     "audience_rating_image": "themoviedb://image.rating",
-                     "banner": "/library/metadata/1219/banner/1462175063",
-                     "collections": [],
-                     "content_rating": "TV-MA",
-                     "directors": [
-                        "Jeremy Podeswa"
-                     ],
-                     "duration": "2998290",
-                     "edition_title": "",
-                     "full_title": "Game of Thrones - The Red Woman",
-                     "genres": [
-                        "Action/Adventure",
-                        "Drama",
-                        "Fantasy",
-                        "Romance"
-                     ],
-                     "grandparent_guid": "plex://show/5d9c086c46115600200aa2fe",
-                     "grandparent_guids": [
-                         "imdb://tt0944947",
-                         "tmdb://1399",
-                         "tvdb://121361"
-                     ],
-                     "grandparent_rating_key": "1219",
-                     "grandparent_slug": "game-of-thrones",
-                     "grandparent_thumb": "/library/metadata/1219/thumb/1462175063",
-                     "grandparent_title": "Game of Thrones",
-                     "grandparent_year": "2011",
-                     "guid": "plex://episode/5d9c1276e9d5a1001f4ff2fa",
-                     "guids": [
-                         "imdb://tt3658014",
-                         "tmdb://1156503",
-                         "tvdb://5469015"
-                     ],
-                     "labels": [],
-                     "last_viewed_at": "1462165717",
-                     "library_name": "TV Shows",
-                     "live": 0,
-                     "markers": [
-                        {
-                             "id": 908,
-                             "type": "credits",
-                             "start_time_offset": 2923863,
-                             "end_time_offset": 2998197,
-                             "first": true,
-                             "final": true
-                        },
-                        {
-                             "id": 908,
-                             "type": "intro",
-                             "start_time_offset": 1622,
-                             "end_time_offset": 109135,
-                             "first": null,
-                             "final": null
-                        }
-                     ],
-                     "media_index": "1",
-                     "media_info": [
-                         {
-                             "aspect_ratio": "1.78",
-                             "audio_channel_layout": "5.1",
-                             "audio_channels": "6",
-                             "audio_codec": "ac3",
-                             "audio_profile": "",
-                             "bitrate": "10617",
-                             "channel_call_sign": "",
-                             "channel_id": "",
-                             "channel_identifier": "",
-                             "channel_title": "",
-                             "channel_thumb": "",
-                             "channel_vcn": "",
-                             "container": "mkv",
-                             "height": "1078",
-                             "id": "257925",
-                             "optimized_version": 0,
-                             "parts": [
-                                 {
-                                     "file": "/media/TV Shows/Game of Thrones/Season 06/Game of Thrones - S06E01 - The Red Woman.mkv",
-                                     "file_size": "3979115377",
-                                     "id": "274169",
-                                     "indexes": 1,
-                                     "streams": [
-                                         {
-                                             "id": "511663",
-                                             "type": "1",
-                                             "video_bit_depth": "8",
-                                             "video_bitrate": "10233",
-                                             "video_codec": "h264",
-                                             "video_codec_level": "41",
-                                             "video_color_primaries": "",
-                                             "video_color_range": "tv",
-                                             "video_color_space": "bt709",
-                                             "video_color_trc": "",
-                                             "video_dynamic_range": "SDR",
-                                             "video_dovi_bl_present": 0,
-                                             "video_dovi_el_present": 0,
-                                             "video_dovi_level": 0,
-                                             "video_dovi_present": 0,
-                                             "video_dovi_profile": 0,
-                                             "video_dovi_rpu_present": 0,
-                                             "video_dovi_version": 0,
-                                             "video_frame_rate": "23.976",
-                                             "video_height": "1078",
-                                             "video_language": "",
-                                             "video_language_code": "",
-                                             "video_profile": "high",
-                                             "video_ref_frames": "4",
-                                             "video_scan_type": "progressive",
-                                             "video_width": "1920",
-                                             "selected": 0
-                                         },
-                                         {
-                                             "audio_bitrate": "384",
-                                             "audio_bitrate_mode": "",
-                                             "audio_channel_layout": "5.1(side)",
-                                             "audio_channels": "6",
-                                             "audio_codec": "ac3",
-                                             "audio_language": "",
-                                             "audio_language_code": "",
-                                             "audio_profile": "",
-                                             "audio_sample_rate": "48000",
-                                             "id": "511664",
-                                             "type": "2",
-                                             "selected": 1
-                                         },
-                                         {
-                                             "id": "511953",
-                                             "subtitle_codec": "srt",
-                                             "subtitle_container": "",
-                                             "subtitle_forced": 0,
-                                             "subtitle_format": "srt",
-                                             "subtitle_language": "English",
-                                             "subtitle_language_code": "eng",
-                                             "subtitle_location": "external",
-                                             "type": "3",
-                                             "selected": 1
-                                         }
-                                     ]
-                                 }
-                             ],
-                             "video_codec": "h264",
-                             "video_framerate": "24p",
-                             "video_full_resolution": "1080p",
-                             "video_profile": "high",
-                             "video_resolution": "1080",
-                             "width": "1920"
-                         }
-                     ],
-                     "media_type": "episode",
-                     "original_title": "",
-                     "originally_available_at": "2016-04-24",
-                     "parent_guid": "plex://season/602e67e61d3358002c4120f7",
-                     "parent_guids": [
-                         "tvdb://651357"
-                     ],
-                     "parent_media_index": "6",
-                     "parent_rating_key": "153036",
-                     "parent_slug": "game-of-thrones",
-                     "parent_thumb": "/library/metadata/153036/thumb/1462175062",
-                     "parent_title": "Season 6",
-                     "parent_year": "2016",
-                     "rating": "",
-                     "rating_image": "",
-                     "rating_key": "153037",
-                     "section_id": "2",
-                     "slug": "game-of-thrones",
-                     "sort_title": "Red Woman",
-                     "studio": "Revolution Sun Studios",
-                     "summary": "The fate of Jon Snow is revealed. Daenerys meets a strong man. Cersei sees her daughter once again.",
-                     "tagline": "",
-                     "thumb": "/library/metadata/153037/thumb/1462175060",
-                     "title": "The Red Woman",
-                     "updated_at": "1462175060",
-                     "user_rating": "9.0",
-                     "writers": [
-                        "David Benioff",
-                        "D. B. Weiss"
-                     ],
-                     "year": "2016"
-                     }
-            ```
-        """
-        pms_connect = pmsconnect.PmsConnect()
-        metadata = pms_connect.get_metadata_details(rating_key=rating_key,
-                                                    sync_id=sync_id)
-
-        if metadata:
-            return metadata
-        else:
-            logger.warn("Unable to retrieve data for get_metadata_details.")
-            return metadata
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi("get_recently_added")
-    def get_recently_added_details(self, start='0', count='0', media_type='', section_id='', **kwargs):
-        """ Get all items that where recently added to plex.
-
-            ```
-            Required parameters:
-                count (str):        Number of items to return
-
-            Optional parameters:
-                start (str):        The item number to start at
-                media_type (str):   The media type: movie, show, artist
-                section_id (str):   The id of the Plex library section
-
-            Returns:
-                json:
-                    {"recently_added":
-                        [{"actors": [
-                             "Kit Harington",
-                             "Emilia Clarke",
-                             "Isaac Hempstead-Wright",
-                             "Maisie Williams",
-                             "Liam Cunningham",
-                          ],
-                          "added_at": "1461572396",
-                          "art": "/library/metadata/1219/art/1462175063",
-                          "audience_rating": "8",
-                          "audience_rating_image": "rottentomatoes://image.rating.upright",
-                          "banner": "/library/metadata/1219/banner/1462175063",
-                          "directors": [
-                             "Jeremy Podeswa"
-                          ],
-                          "duration": "2998290",
-                          "full_title": "Game of Thrones - The Red Woman",
-                          "genres": [
-                             "Adventure",
-                             "Drama",
-                             "Fantasy"
-                          ],
-                          "grandparent_rating_key": "1219",
-                          "grandparent_thumb": "/library/metadata/1219/thumb/1462175063",
-                          "grandparent_title": "Game of Thrones",
-                          "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en",
-                          "guids": [],
-                          "labels": [],
-                          "last_viewed_at": "1462165717",
-                          "library_name": "TV Shows",
-                          "media_index": "1",
-                          "media_type": "episode",
-                          "original_title": "",
-                          "originally_available_at": "2016-04-24",
-                          "parent_media_index": "6",
-                          "parent_rating_key": "153036",
-                          "parent_thumb": "/library/metadata/153036/thumb/1462175062",
-                          "parent_title": "",
-                          "rating": "7.8",
-                          "rating_image": "rottentomatoes://image.rating.ripe",
-                          "rating_key": "153037",
-                          "section_id": "2",
-                          "sort_title": "Red Woman",
-                          "studio": "HBO",
-                          "summary": "Jon Snow is dead. Daenerys meets a strong man. Cersei sees her daughter again.",
-                          "tagline": "",
-                          "thumb": "/library/metadata/153037/thumb/1462175060",
-                          "title": "The Red Woman",
-                          "user_rating": "9.0",
-                          "updated_at": "1462175060",
-                          "writers": [
-                             "David Benioff",
-                             "D. B. Weiss"
-                          ],
-                          "year": "2016"
-                          },
-                         {...},
-                         {...}
-                         ]
-                     }
-            ```
-        """
-        # For backwards compatibility
-        if 'type' in kwargs:
-            media_type = kwargs['type']
-
-        pms_connect = pmsconnect.PmsConnect()
-        result = pms_connect.get_recently_added_details(start=start, count=count, media_type=media_type, section_id=section_id)
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_recently_added_details.")
-            return result
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def get_friends_list(self, **kwargs):
-        """ Get the friends list of the server owner for Plex.tv. """
-
-        plex_tv = plextv.PlexTV()
-        result = plex_tv.get_plextv_friends('json')
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_friends_list.")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def get_user_details(self, **kwargs):
-        """ Get all details about a the server's owner from Plex.tv. """
-
-        plex_tv = plextv.PlexTV()
-        result = plex_tv.get_plextv_user_details('json')
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_user_details.")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def get_server_list(self, **kwargs):
-        """ Find all servers published on Plex.tv """
-
-        plex_tv = plextv.PlexTV()
-        result = plex_tv.get_plextv_server_list('json')
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_server_list.")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def get_sync_lists(self, machine_id='', **kwargs):
-        """ Get all items that are currently synced from the PMS. """
-        plex_tv = plextv.PlexTV()
-        result = plex_tv.get_plextv_sync_lists(machine_id=machine_id, output_format='json')
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_sync_lists.")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def get_servers(self, **kwargs):
-        pms_connect = pmsconnect.PmsConnect()
-        result = pms_connect.get_server_list(output_format='json')
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_servers.")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_servers_info(self, **kwargs):
-        """ Get info about the PMS.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    [{"port": "32400",
-                      "host": "10.0.0.97",
-                      "version": "0.9.15.2.1663-7efd046",
-                      "name": "Winterfell-Server",
-                      "machine_identifier": "ds48g4r354a8v9byrrtr697g3g79w"
-                      }
-                     ]
-            ```
-        """
-        pms_connect = pmsconnect.PmsConnect()
-        result = pms_connect.get_servers_info()
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_servers_info.")
-            return result
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_server_identity(self, **kwargs):
-        """ Get info about the local server.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    [{"machine_identifier": "ds48g4r354a8v9byrrtr697g3g79w",
-                      "version": "0.9.15.x.xxx-xxxxxxx"
-                      }
-                     ]
-            ```
-        """
-        pms_connect = pmsconnect.PmsConnect()
-        result = pms_connect.get_server_identity()
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_server_identity.")
-            return result
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_server_friendly_name(self, **kwargs):
-        """ Get the name of the PMS.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                None
-
-            Returns:
-                string:     "Winterfell-Server"
-            ```
-        """
-        result = pmsconnect.get_server_friendly_name()
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_server_friendly_name.")
-            return result
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @addtoapi()
-    def get_activity(self, session_key=None, session_id=None, **kwargs):
-        """ Get the current activity on the PMS.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                session_key (int):    Session key for the session info to return, OR
-                session_id (str):     Session ID for the session info to return
-
-            Returns:
-                json:
-                    {"lan_bandwidth": 25318,
-                     "sessions": [
-                         {
-                             "actors": [
-                                 "Kit Harington",
-                                 "Emilia Clarke",
-                                 "Isaac Hempstead-Wright",
-                                 "Maisie Williams",
-                                 "Liam Cunningham",
-                             ],
-                             "added_at": "1461572396",
-                             "allow_guest": 1,
-                             "art": "/library/metadata/1219/art/1503306930",
-                             "aspect_ratio": "1.78",
-                             "audience_rating": "",
-                             "audience_rating_image": "rottentomatoes://image.rating.upright",
-                             "audio_bitrate": "384",
-                             "audio_bitrate_mode": "",
-                             "audio_channel_layout": "5.1(side)",
-                             "audio_channels": "6",
-                             "audio_codec": "ac3",
-                             "audio_decision": "direct play",
-                             "audio_language": "",
-                             "audio_language_code": "",
-                             "audio_profile": "",
-                             "audio_sample_rate": "48000",
-                             "bandwidth": "25318",
-                             "banner": "/library/metadata/1219/banner/1503306930",
-                             "bif_thumb": "/library/parts/274169/indexes/sd/1000",
-                             "bitrate": "10617",
-                             "channel_call_sign": "",
-                             "channel_id": "",
-                             "channel_identifier": "",
-                             "channel_stream": 0,
-                             "channel_title": "",
-                             "channel_thumb": "",
-                             "channel_vcn": "",
-                             "children_count": "",
-                             "collections": [],
-                             "container": "mkv",
-                             "container_decision": "direct play",
-                             "content_rating": "TV-MA",
-                             "deleted_user": 0,
-                             "device": "Windows",
-                             "directors": [
-                                 "Jeremy Podeswa"
-                             ],
-                             "do_notify": 0,
-                             "duration": "2998272",
-                             "email": "Jon.Snow.1337@CastleBlack.com",
-                             "file": "/media/TV Shows/Game of Thrones/Season 06/Game of Thrones - S06E01 - The Red Woman.mkv",
-                             "file_size": "3979115377",
-                             "friendly_name": "Jon Snow",
-                             "full_title": "Game of Thrones - The Red Woman",
-                             "genres": [
-                                 "Adventure",
-                                 "Drama",
-                                 "Fantasy"
-                             ],
-                             "grandparent_guid": "com.plexapp.agents.thetvdb://121361?lang=en",
-                             "grandparent_rating_key": "1219",
-                             "grandparent_thumb": "/library/metadata/1219/thumb/1503306930",
-                             "grandparent_title": "Game of Thrones",
-                             "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en",
-                             "height": "1078",
-                             "id": "",
-                             "indexes": 1,
-                             "ip_address": "10.10.10.1",
-                             "ip_address_public": "64.123.23.111",
-                             "is_admin": 1,
-                             "is_allow_sync": 1,
-                             "is_home_user": 1,
-                             "is_restricted": 0,
-                             "keep_history": 1,
-                             "labels": [],
-                             "last_viewed_at": "1462165717",
-                             "library_name": "TV Shows",
-                             "live": 0,
-                             "live_uuid": "",
-                             "local": "1",
-                             "location": "lan",
-                             "machine_id": "lmd93nkn12k29j2lnm",
-                             "media_index": "1",
-                             "media_type": "episode",
-                             "optimized_version": 0,
-                             "optimized_version_profile": "",
-                             "optimized_version_title": "",
-                             "original_title": "",
-                             "originally_available_at": "2016-04-24",
-                             "parent_guid": "com.plexapp.agents.thetvdb://121361/6?lang=en",
-                             "parent_media_index": "6",
-                             "parent_rating_key": "153036",
-                             "parent_thumb": "/library/metadata/153036/thumb/1503889210",
-                             "parent_title": "Season 6",
-                             "platform": "Plex Media Player",
-                             "platform_name": "plex",
-                             "platform_version": "2.4.1.787-54a020cd",
-                             "player": "Castle-PC",
-                             "product": "Plex Media Player",
-                             "product_version": "3.35.2",
-                             "profile": "Konvergo",
-                             "progress_percent": "0",
-                             "quality_profile": "Original",
-                             "rating": "7.8",
-                             "rating_image": "rottentomatoes://image.rating.ripe",
-                             "rating_key": "153037",
-                             "relay": 0,
-                             "section_id": "2",
-                             "secure": 1,
-                             "session_id": "helf15l3rxgw01xxe0jf3l3d",
-                             "session_key": "27",
-                             "shared_libraries": [
-                                 "10",
-                                 "1",
-                                 "4",
-                                 "5",
-                                 "15",
-                                 "20",
-                                 "2"
-                             ],
-                             "sort_title": "Red Woman",
-                             "state": "playing",
-                             "stream_aspect_ratio": "1.78",
-                             "stream_audio_bitrate": "384",
-                             "stream_audio_bitrate_mode": "",
-                             "stream_audio_channel_layout": "5.1(side)",
-                             "stream_audio_channel_layout_": "5.1(side)",
-                             "stream_audio_channels": "6",
-                             "stream_audio_codec": "ac3",
-                             "stream_audio_decision": "direct play",
-                             "stream_audio_language": "",
-                             "stream_audio_language_code": "",
-                             "stream_audio_profile": "",
-                             "stream_audio_sample_rate": "48000",
-                             "stream_bitrate": "10617",
-                             "stream_container": "mkv",
-                             "stream_container_decision": "direct play",
-                             "stream_duration": "2998272",
-                             "stream_subtitle_codec": "",
-                             "stream_subtitle_container": "",
-                             "stream_subtitle_decision": "",
-                             "stream_subtitle_forced": 0,
-                             "stream_subtitle_format": "",
-                             "stream_subtitle_language": "",
-                             "stream_subtitle_language_code": "",
-                             "stream_subtitle_location": "",
-                             "stream_video_bit_depth": "8",
-                             "stream_video_bitrate": "10233",
-                             "stream_video_chroma_subsampling": "4:2:0",
-                             "stream_video_codec": "h264",
-                             "stream_video_codec_level": "41",
-                             "stream_video_color_primaries": "",
-                             "stream_video_color_range": "tv",
-                             "stream_video_color_space": "bt709",
-                             "stream_video_color_trc": "",
-                             "stream_video_decision": "direct play",
-                             "stream_video_dynamic_range": "SDR",
-                             "stream_video_framerate": "24p",
-                             "stream_video_full_resolution": "1080p",
-                             "stream_video_height": "1078",
-                             "stream_video_language": "",
-                             "stream_video_language_code": "",
-                             "stream_video_ref_frames": "4",
-                             "stream_video_resolution": "1080",
-                             "stream_video_scan_type": "progressive",
-                             "stream_video_width": "1920",
-                             "studio": "HBO",
-                             "subtitle_codec": "",
-                             "subtitle_container": "",
-                             "subtitle_decision": "",
-                             "subtitle_forced": 0,
-                             "subtitle_format": "",
-                             "subtitle_language": "",
-                             "subtitle_language_code": "",
-                             "subtitle_location": "",
-                             "subtitles": 0,
-                             "summary": "Jon Snow is dead. Daenerys meets a strong man. Cersei sees her daughter again.",
-                             "synced_version": 0,
-                             "synced_version_profile": "",
-                             "tagline": "",
-                             "throttled": "0",
-                             "thumb": "/library/metadata/153037/thumb/1503889207",
-                             "title": "The Red Woman",
-                             "transcode_audio_channels": "",
-                             "transcode_audio_codec": "",
-                             "transcode_container": "",
-                             "transcode_decision": "direct play",
-                             "transcode_height": "",
-                             "transcode_hw_decode": "",
-                             "transcode_hw_decode_title": "",
-                             "transcode_hw_decoding": 0,
-                             "transcode_hw_encode": "",
-                             "transcode_hw_encode_title": "",
-                             "transcode_hw_encoding": 0,
-                             "transcode_hw_full_pipeline": 0,
-                             "transcode_hw_requested": 0,
-                             "transcode_key": "",
-                             "transcode_max_offset_available": 0,
-                             "transcode_min_offset_available": 0,
-                             "transcode_progress": 0,
-                             "transcode_protocol": "",
-                             "transcode_speed": "",
-                             "transcode_throttled": 0,
-                             "transcode_video_codec": "",
-                             "transcode_width": "",
-                             "type": "",
-                             "updated_at": "1503889207",
-                             "user": "LordCommanderSnow",
-                             "user_id": 133788,
-                             "user_rating": "",
-                             "user_thumb": "https://plex.tv/users/k10w42309cynaopq/avatar",
-                             "username": "LordCommanderSnow",
-                             "video_bit_depth": "8",
-                             "video_bitrate": "10233",
-                             "video_chroma_subsampling": "4:2:0",
-                             "video_codec": "h264",
-                             "video_codec_level": "41",
-                             "video_color_primaries": "",
-                             "video_color_range": "tv",
-                             "video_color_space": "bt709",
-                             "video_color_trc": ",
-                             "video_decision": "direct play",
-                             "video_dynamic_range": "SDR",
-                             "video_frame_rate": "23.976",
-                             "video_framerate": "24p",
-                             "video_full_resolution": "1080p",
-                             "video_height": "1078",
-                             "video_language": "",
-                             "video_language_code": "",
-                             "video_profile": "high",
-                             "video_ref_frames": "4",
-                             "video_resolution": "1080",
-                             "video_scan_type": "progressive",
-                             "video_width": "1920",
-                             "view_offset": "1000",
-                             "width": "1920",
-                             "writers": [
-                                 "David Benioff",
-                                 "D. B. Weiss"
-                             ],
-                             "year": "2016"
-                         }
-                     ],
-                     "stream_count": "1",
-                     "stream_count_direct_play": 1,
-                     "stream_count_direct_stream": 0,
-                     "stream_count_transcode": 0,
-                     "total_bandwidth": 25318,
-                     "wan_bandwidth": 0
-                     }
-            ```
-        """
-        try:
-            pms_connect = pmsconnect.PmsConnect(token=plexpy.CONFIG.PMS_TOKEN)
-            result = pms_connect.get_current_activity()
-
-            if result:
-                if session_key:
-                    return next((s for s in result['sessions'] if s['session_key'] == session_key), {})
-                if session_id:
-                    return next((s for s in result['sessions'] if s['session_id'] == session_id), {})
-
-                counts = {'stream_count_direct_play': 0,
-                          'stream_count_direct_stream': 0,
-                          'stream_count_transcode': 0,
-                          'total_bandwidth': 0,
-                          'lan_bandwidth': 0,
-                          'wan_bandwidth': 0}
-
-                for s in result['sessions']:
-                    if s['transcode_decision'] == 'transcode':
-                        counts['stream_count_transcode'] += 1
-                    elif s['transcode_decision'] == 'copy':
-                        counts['stream_count_direct_stream'] += 1
-                    else:
-                        counts['stream_count_direct_play'] += 1
-
-                    counts['total_bandwidth'] += helpers.cast_to_int(s['bandwidth'])
-                    if s['location'] == 'lan':
-                        counts['lan_bandwidth'] += helpers.cast_to_int(s['bandwidth'])
-                    else:
-                        counts['wan_bandwidth'] += helpers.cast_to_int(s['bandwidth'])
-
-                result.update(counts)
-
-                return result
-            else:
-                logger.warn("Unable to retrieve data for get_activity.")
-                return {}
-        except Exception as e:
-            logger.exception("Unable to retrieve data for get_activity: %s" % e)
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi("get_libraries")
-    def get_full_libraries_list(self, **kwargs):
-        """ Get a list of all libraries on your server.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    [{"art": "/:/resources/show-fanart.jpg",
-                      "child_count": "3745",
-                      "count": "62",
-                      "is_active": 1,
-                      "parent_count": "240",
-                      "section_id": "2",
-                      "section_name": "TV Shows",
-                      "section_type": "show",
-                      "thumb": "/:/resources/show.png"
-                      },
-                     {...},
-                     {...}
-                     ]
-            ```
-        """
-        pms_connect = pmsconnect.PmsConnect()
-        result = pms_connect.get_library_details()
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_full_libraries_list.")
-            return result
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi("get_users")
-    def get_full_users_list(self, **kwargs):
-        """ Get a list of all users that have access to your server.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    [{"allow_guest": 1,
-                      "do_notify": 1,
-                      "email": "Jon.Snow.1337@CastleBlack.com",
-                      "filter_all": "",
-                      "filter_movies": "",
-                      "filter_music": "",
-                      "filter_photos": "",
-                      "filter_tv": "",
-                      "is_active": 1,
-                      "is_admin": 0,
-                      "is_allow_sync": 1,
-                      "is_home_user": 1,
-                      "is_restricted": 0,
-                      "keep_history": 1,
-                      "row_id": 1,
-                      "shared_libraries": ["1", "2", "3"],
-                      "thumb": "https://plex.tv/users/k10w42309cynaopq/avatar",
-                      "user_id": "133788",
-                      "username": "Jon Snow"
-                      },
-                     {...},
-                     {...}
-                     ]
-            ```
-        """
-        user_data = users.Users()
-        result = user_data.get_users()
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_full_users_list.")
-            return result
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @sanitize_out()
-    @addtoapi()
-    def get_synced_items(self, machine_id='', user_id='', **kwargs):
-        """ Get a list of synced items on the PMS.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                machine_id (str):       The PMS identifier
-                user_id (str):          The id of the Plex user
-
-            Returns:
-                json:
-                    [{"audio_bitrate": "192",
-                      "client_id": "95434se643fsf24f-com-plexapp-android",
-                      "content_type": "video",
-                      "device_name": "Tyrion's iPad",
-                      "failure": "",
-                      "item_complete_count": "1",
-                      "item_count": "1",
-                      "item_downloaded_count": "1",
-                      "item_downloaded_percent_complete": 100,
-                      "metadata_type": "movie",
-                      "photo_quality": "74",
-                      "platform": "iOS",
-                      "rating_key": "154092",
-                      "root_title": "Movies",
-                      "state": "complete",
-                      "sync_id": "11617019",
-                      "sync_media_type": null,
-                      "sync_title": "Deadpool",
-                      "total_size": "560718134",
-                      "user": "DrukenDwarfMan",
-                      "user_id": "696969",
-                      "username": "DrukenDwarfMan",
-                      "video_bitrate": "4000"
-                      "video_quality": "100"
-                      },
-                     {...},
-                     {...}
-                     ]
-            ```
-        """
-        plex_tv = plextv.PlexTV()
-        result = plex_tv.get_synced_items(machine_id=machine_id, user_id_filter=user_id)
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_synced_items.")
-            return result
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def get_sync_transcode_queue(self, **kwargs):
-        """ Return details for currently syncing items. """
-        pms_connect = pmsconnect.PmsConnect()
-        result = pms_connect.get_sync_transcode_queue(output_format='json')
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_sync_transcode_queue.")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_home_stats(self, grouping=None, time_range=30, stats_type='plays',
-                       stats_start=0, stats_count=10, stat_id='',
-                       section_id=None, user_id=None, before=None, after=None, **kwargs):
-        """ Get the homepage watch statistics.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                grouping (int):         0 or 1
-                time_range (int):       The time range to calculate statistics, 30
-                stats_type (str):       'plays' or 'duration'
-                stats_start (int)       The row number of the stat item to start at, 0
-                stats_count (int):      The number of stat items to return, 5
-                stat_id (str):          A single stat to return, 'top_movies', 'popular_movies',
-                                        'top_tv', 'popular_tv', 'top_music', 'popular_music', 'top_libraries',
-                                        'top_users', 'top_platforms', 'last_watched', 'most_concurrent'
-                section_id (int):       The id of the Plex library section
-                user_id (int):          The id of the Plex user
-                before (str):           Stats before and including the date, "YYYY-MM-DD"
-                after (str):            Stats after and including the date, "YYYY-MM-DD"
-
-            Returns:
-                json:
-                    [{"stat_id": "top_movies",
-                      "stat_type": "total_plays",
-                      "rows": [{...}]
-                      },
-                     {"stat_id": "popular_movies",
-                      "rows": [{...}]
-                      },
-                     {"stat_id": "top_tv",
-                      "stat_type": "total_plays",
-                      "rows":
-                        [{"content_rating": "TV-MA",
-                          "friendly_name": "",
-                          "grandparent_thumb": "/library/metadata/1219/thumb/1462175063",
-                          "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en",
-                          "labels": [],
-                          "last_play": 1462380698,
-                          "live": 0,
-                          "media_type": "episode",
-                          "platform": "",
-                          "rating_key": 1219,
-                          "row_id": 1116,
-                          "section_id": 2,
-                          "thumb": "",
-                          "title": "Game of Thrones",
-                          "total_duration": 213302,
-                          "total_plays": 69,
-                          "user": "",
-                          "users_watched": ""
-                          },
-                         {...},
-                         {...}
-                         ]
-                      },
-                     {"stat_id": "popular_tv",
-                      "rows": [{...}]
-                      },
-                     {"stat_id": "top_music",
-                      "stat_type": "total_plays",
-                      "rows": [{...}]
-                      },
-                     {"stat_id": "popular_music",
-                      "rows": [{...}]
-                      },
-                     {"stat_id": "last_watched",
-                      "rows": [{...}]
-                      },
-                     {"stat_id": "top_libraries",
-                      "stat_type": "total_plays",
-                      "rows": [{...}]
-                      },
-                     {"stat_id": "top_users",
-                      "stat_type": "total_plays",
-                      "rows": [{...}]
-                      },
-                     {"stat_id": "top_platforms",
-                      "stat_type": "total_plays",
-                      "rows": [{...}]
-                      },
-                     {"stat_id": "most_concurrent",
-                      "rows": [{...}]
-                      }
-                     ]
-            ```
-        """
-        # For backwards compatibility
-        if stats_type in (0, "0"):
-            stats_type = 'plays'
-        elif stats_type in (1, '1'):
-            stats_type = 'duration'
-
-        grouping = helpers.bool_true(grouping, return_none=True)
-
-        data_factory = datafactory.DataFactory()
-        result = data_factory.get_home_stats(grouping=grouping,
-                                             time_range=time_range,
-                                             stats_type=stats_type,
-                                             stats_start=stats_start,
-                                             stats_count=stats_count,
-                                             stat_id=stat_id,
-                                             section_id=section_id,
-                                             user_id=user_id,
-                                             before=before,
-                                             after=after)
-
-        if result:
-            return result
-        else:
-            logger.warn("Unable to retrieve data for get_home_stats.")
-            return result
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    @addtoapi("arnold")
     def random_arnold_quotes(self, **kwargs):
-        """ Get to the chopper! """
-        import random
+        from random import randint
         quote_list = ['To crush your enemies, see them driven before you, and to hear the lamentation of their women!',
                       'Your clothes, give them to me, now!',
                       'Do it!',
-                      'If it bleeds, we can kill it.',
+                      'If it bleeds, we can kill it',
                       'See you at the party Richter!',
-                      'Let off some steam, Bennett.',
-                      'I\'ll be back.',
+                      'Let off some steam, Bennett',
+                      'I\'ll be back',
                       'Get to the chopper!',
                       'Hasta La Vista, Baby!',
                       'It\'s not a tumor!',
@@ -6389,875 +1288,183 @@ class WebInterface(object):
                       'I need your clothes, your boots and your motorcycle.',
                       'No, it\'s not a tumor. It\'s not a tumor!',
                       'I LIED!',
-                      'Are you Sarah Connor?',
+                      'See you at the party, Richter!',
+                      'Are you Sarah Conner?',
                       'I\'m a cop you idiot!',
                       'Come with me if you want to live.',
-                      'Who is your daddy and what does he do?',
-                      'Oh, cookies! I can\'t wait to toss them.',
-                      'Make it quick because my horse is getting tired.',
-                      'What killed the dinosaurs? The Ice Age!',
-                      'That\'s for sleeping with my wife!',
-                      'Remember when I said I\'d kill you last... I lied!',
-                      'You want to be a farmer? Here\'s a couple of acres.',
-                      'Now, this is the plan. Get your ass to Mars.',
-                      'I just had a terrible thought... What if this is a dream?',
-                      'Well, listen to this one: Rubber baby buggy bumpers!',
-                      'Take your toy back to the carpet!',
-                      'My name is John Kimble... And I love my car.',
-                      'I eat Green Berets for breakfast.',
-                      'Put that cookie down! NOW!'
+                      'Who is your daddy and what does he do?'
                       ]
 
-        return random.choice(quote_list)
-
-    ### API ###
+        random_number = randint(0, len(quote_list) - 1)
+        return quote_list[int(random_number)]
 
     @cherrypy.expose
-    def api(self, *args, **kwargs):
-        if args and 'v2' in args[0]:
-            return API2()._api_run(**kwargs)
-        else:
-            cherrypy.response.headers['Content-Type'] = 'application/json;charset=UTF-8'
-            return json.dumps(API2()._api_responds(result_type='error',
-                                                   msg='Please use the /api/v2 endpoint.')).encode('utf-8')
+    def get_notification_agent_config(self, config_id, **kwargs):
+        config = notifiers.get_notification_agent_config(config_id=config_id)
+
+        checkboxes = {'email_tls': checked(plexpy.CONFIG.EMAIL_TLS)}
+
+        return serve_template(templatename="notification_config.html", title="Notification Configuration",
+                              config_id=config_id, data=config, checkboxes=checkboxes)
 
     @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_tautulli_info(self, **kwargs):
-        """ Get info about the Tautulli server.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    {"tautulli_install_type": "git",
-                     "tautulli_version": "v2.8.1",
-                     "tautulli_branch": "master",
-                     "tautulli_commit": "2410eb33805aaac4bd1c5dad0f71e4f15afaf742",
-                     "tautulli_platform": "Windows",
-                     "tautulli_platform_release": "10",
-                     "tautulli_platform_version": "10.0.19043",
-                     "tautulli_platform_linux_distro": "",
-                     "tautulli_platform_device_name": "Winterfell-Server",
-                     "tautulli_python_version": "3.10.0"
-                     }
-            ```
-        """
-        return plexpy.get_tautulli_info()
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_pms_update(self, **kwargs):
-        """ Check for updates to the Plex Media Server.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    {"update_available": true,
-                     "platform": "Windows",
-                     "release_date": "1473721409",
-                     "version": "1.1.4.2757-24ffd60",
-                     "requirements": "...",
-                     "extra_info": "...",
-                     "changelog_added": "...",
-                     "changelog_fixed": "...",
-                     "label": "Download",
-                     "distro": "english",
-                     "distro_build": "windows-i386",
-                     "download_url": "https://downloads.plex.tv/...",
-                     }
-            ```
-        """
-        plex_tv = plextv.PlexTV()
-        result = plex_tv.get_plex_update()
-        return result
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @addtoapi()
-    def get_geoip_lookup(self, ip_address='', **kwargs):
-        """ Get the geolocation info for an IP address.
-
-            ```
-            Required parameters:
-                ip_address
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    {"city": "Mountain View",
-                     "code": "US",
-                     "continent": "NA",
-                     "country": "United States",
-                     "latitude": 37.386,
-                     "longitude": -122.0838,
-                     "postal_code": "94035",
-                     "region": "California",
-                     "timezone": "America/Los_Angeles",
-                     "accuracy": null
-                     }
-            ```
-        """
-        message = ''
-        if not ip_address:
-            message = 'No IP address provided.'
-        elif not helpers.is_valid_ip(ip_address):
-            message = 'Invalid IP address provided: %s' % ip_address
-
-        if message:
-            return {'result': 'error', 'message': message}
-
-        plex_tv = plextv.PlexTV()
-        geo_info = plex_tv.get_geoip_lookup(ip_address)
-        if geo_info:
-            return {'result': 'success', 'data': geo_info}
-        return {'result': 'error', 'message': 'Failed to lookup GeoIP info for address: %s' % ip_address}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth()
-    @addtoapi()
-    def get_whois_lookup(self, ip_address='', **kwargs):
-        """ Get the connection info for an IP address.
-
-            ```
-            Required parameters:
-                ip_address
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    {"host": "google-public-dns-a.google.com",
-                     "nets": [{"description": "Google Inc.",
-                               "address": "1600 Amphitheatre Parkway",
-                               "city": "Mountain View",
-                               "state": "CA",
-                               "postal_code": "94043",
-                               "country": "United States",
-                               ...
-                               },
-                               {...}
-                              ]
-                json:
-                    {"host": "Not available",
-                     "nets": [],
-                     "error": "IPv4 address 127.0.0.1 is already defined as Loopback via RFC 1122, Section 3.2.1.3."
-                     }
-            ```
-        """
-        whois_info = helpers.whois_lookup(ip_address)
-        return whois_info
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def get_plexpy_url(self, **kwargs):
-        return helpers.get_plexpy_url()
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_newsletters(self, **kwargs):
-        """ Get a list of configured newsletters.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    [{"id": 1,
-                      "agent_id": 0,
-                      "agent_name": "recently_added",
-                      "agent_label": "Recently Added",
-                      "friendly_name": "",
-                      "cron": "0 0 * * 1",
-                      "active": 1
-                      }
-                     ]
-            ```
-        """
-        result = newsletters.get_newsletters()
-        return result
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def get_newsletters_table(self, **kwargs):
-        result = newsletters.get_newsletters()
-        return serve_template(template_name="newsletters_table.html", newsletters_list=result)
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def delete_newsletter(self, newsletter_id=None, **kwargs):
-        """ Remove a newsletter from the database.
-
-            ```
-            Required parameters:
-                newsletter_id (int):        The newsletter to delete
-
-            Optional parameters:
-                None
-
-            Returns:
-                None
-            ```
-        """
-        result = newsletters.delete_newsletter(newsletter_id=newsletter_id)
-        if result:
-            return {'result': 'success', 'message': 'Newsletter deleted successfully.'}
-        else:
-            return {'result': 'error', 'message': 'Failed to delete newsletter.'}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_newsletter_config(self, newsletter_id=None, **kwargs):
-        """ Get the configuration for an existing notification agent.
-
-            ```
-            Required parameters:
-                newsletter_id (int):        The newsletter config to retrieve
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    {"id": 1,
-                     "agent_id": 0,
-                     "agent_name": "recently_added",
-                     "agent_label": "Recently Added",
-                     "friendly_name": "",
-                     "id_name": "",
-                     "cron": "0 0 * * 1",
-                     "active": 1,
-                     "subject": "Recently Added to {server_name}! ({end_date})",
-                     "body": "View the newsletter here: {newsletter_url}",
-                     "message": "",
-                     "config": {"custom_cron": 0,
-                                "filename": "newsletter_{newsletter_uuid}.html",
-                                "formatted": 1,
-                                "incl_libraries": ["1", "2"],
-                                "notifier_id": 1,
-                                "save_only": 0,
-                                "time_frame": 7,
-                                "time_frame_units": "days"
-                                },
-                     "email_config": {...},
-                     "config_options": [{...}, ...],
-                     "email_config_options": [{...}, ...]
-                     }
-            ```
-        """
-        result = newsletters.get_newsletter_config(newsletter_id=newsletter_id, mask_passwords=True)
-        return result
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def get_newsletter_config_modal(self, newsletter_id=None, **kwargs):
-        result = newsletters.get_newsletter_config(newsletter_id=newsletter_id, mask_passwords=True)
-        return serve_template(template_name="newsletter_config.html", newsletter=result)
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def add_newsletter_config(self, agent_id=None, **kwargs):
-        """ Add a new notification agent.
-
-            ```
-            Required parameters:
-                agent_id (int):           The newsletter type to add
-
-            Optional parameters:
-                None
-
-            Returns:
-                None
-            ```
-        """
-        result = newsletters.add_newsletter_config(agent_id=agent_id, **kwargs)
-
-        if result:
-            return {'result': 'success', 'message': 'Added newsletter.', 'newsletter_id': result}
-        else:
-            return {'result': 'error', 'message': 'Failed to add newsletter.'}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def set_newsletter_config(self, newsletter_id=None, agent_id=None, **kwargs):
-        """ Configure an existing newsletter agent.
-
-            ```
-            Required parameters:
-                newsletter_id (int):    The newsletter config to update
-                agent_id (int):         The newsletter type of the newsletter
-
-            Optional parameters:
-                Pass all the config options for the agent with the 'newsletter_config_' and 'newsletter_email_' prefix.
-
-            Returns:
-                None
-            ```
-        """
-        result = newsletters.set_newsletter_config(newsletter_id=newsletter_id,
-                                                   agent_id=agent_id,
-                                                   **kwargs)
-
-        if result:
-            return {'result': 'success', 'message': 'Saved newsletter.'}
-        else:
-            return {'result': 'error', 'message': 'Failed to save newsletter.'}
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    def send_newsletter(self, newsletter_id=None, subject='', body='', message='', notify_action='', **kwargs):
-        """ Send a newsletter using Tautulli.
-
-            ```
-            Required parameters:
-                newsletter_id (int):      The ID number of the newsletter
-
-            Optional parameters:
-                None
-
-            Returns:
-                None
-            ```
-        """
-        cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store"
-
-        test = 'test ' if notify_action == 'test' else ''
-
-        if newsletter_id:
-            newsletter = newsletters.get_newsletter_config(newsletter_id=newsletter_id)
-
-            if newsletter:
-                logger.debug("Sending %s%s newsletter." % (test, newsletter['agent_label']))
-                newsletter_handler.add_newsletter_each(newsletter_id=newsletter_id,
-                                                       notify_action=notify_action,
-                                                       subject=subject,
-                                                       body=body,
-                                                       message=message,
-                                                        **kwargs)
-                return {'result': 'success', 'message': 'Newsletter queued.'}
-            else:
-                logger.debug("Unable to send %snewsletter, invalid newsletter_id %s." % (test, newsletter_id))
-                return {'result': 'error', 'message': 'Invalid newsletter id %s.' % newsletter_id}
-        else:
-            logger.debug("Unable to send %snotification, no newsletter_id received." % test)
-            return {'result': 'error', 'message': 'No newsletter id received.'}
-
-    @cherrypy.expose
-    def newsletter(self, *args, **kwargs):
-        request_uri = cherrypy.request.wsgi_environ['REQUEST_URI']
-        if plexpy.CONFIG.NEWSLETTER_AUTH == 2:
-            redirect_uri = request_uri.replace('/newsletter', '/newsletter_auth')
-            raise cherrypy.HTTPRedirect(redirect_uri)
-
-        elif plexpy.CONFIG.NEWSLETTER_AUTH == 1 and plexpy.CONFIG.NEWSLETTER_PASSWORD:
-            if len(args) >= 2 and args[0] == 'image':
-                return self.newsletter_auth(*args, **kwargs)
-            elif kwargs.pop('key', None) == plexpy.CONFIG.NEWSLETTER_PASSWORD:
-                return self.newsletter_auth(*args, **kwargs)
-            else:
-                return serve_template(template_name="newsletter_auth.html",
-                                      title="Newsletter Login",
-                                      uri=request_uri)
-
-        else:
-            return self.newsletter_auth(*args, **kwargs)
-
-    @cherrypy.expose
-    @requireAuth()
-    def newsletter_auth(self, *args, **kwargs):
-        if args:
-            # Keep this for backwards compatibility for images through /newsletter/image
-            if len(args) >= 2 and args[0] == 'image':
-                if args[1] == 'images':
-                    resource_dir = os.path.join(str(plexpy.PROG_DIR), 'data/interfaces/default/')
-                    try:
-                        return serve_file(path=os.path.join(resource_dir, *args[1:]), content_type='image/png')
-                    except NotFound:
-                        return
-
-                return self.image(args[1])
-
-            if len(args) >= 2 and args[0] == 'id':
-                newsletter_id_name = args[1]
-                newsletter_uuid = None
-            else:
-                newsletter_id_name = None
-                newsletter_uuid = args[0]
-
-            newsletter = newsletter_handler.get_newsletter(newsletter_uuid=newsletter_uuid,
-                                                           newsletter_id_name=newsletter_id_name)
-            return newsletter
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def newsletter_preview(self, **kwargs):
-        kwargs['preview'] = 'true'
-        return serve_template(template_name="newsletter_preview.html",
-                              title="Newsletter",
-                              kwargs=kwargs)
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def real_newsletter(self, newsletter_id=None, start_date=None, end_date=None,
-                        preview=False, raw=False, **kwargs):
-        if newsletter_id and newsletter_id != 'None':
-            newsletter = newsletters.get_newsletter_config(newsletter_id=newsletter_id)
-
-            if newsletter:
-                newsletter_agent = newsletters.get_agent_class(newsletter_id=newsletter_id,
-                                                               newsletter_id_name=newsletter['id_name'],
-                                                               agent_id=newsletter['agent_id'],
-                                                               config=newsletter['config'],
-                                                               start_date=start_date,
-                                                               end_date=end_date,
-                                                               subject=newsletter['subject'],
-                                                               body=newsletter['body'],
-                                                               message=newsletter['message'])
-                preview = helpers.bool_true(preview)
-                raw = helpers.bool_true(raw)
-
-                if raw:
-                    cherrypy.response.headers['Content-Type'] = 'application/json;charset=UTF-8'
-                    return json.dumps(newsletter_agent.raw_data(preview=preview)).encode('utf-8')
-
-                return newsletter_agent.generate_newsletter(preview=preview)
-
-            logger.error("Failed to retrieve newsletter: Invalid newsletter_id %s" % newsletter_id)
-            return "Failed to retrieve newsletter: invalid newsletter_id parameter"
-
-        logger.error("Failed to retrieve newsletter: Missing newsletter_id parameter.")
-        return "Failed to retrieve newsletter: missing newsletter_id parameter"
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def support(self, **kwargs):
-        return serve_template(template_name="support.html", title="Support")
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @addtoapi()
-    def status(self, *args, **kwargs):
-        """ Get the current status of Tautulli.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                check (str):        database
-
-            Returns:
-                json:
-                    {"result": "success",
-                     "message": "Ok",
-                     }
-            ```
-        """
-        cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store"
-        status = {'result': 'success', 'message': 'Ok'}
-
-        if args or kwargs:
-            if not cherrypy.request.path_info == '/api/v2' and plexpy.AUTH_ENABLED:
-                cherrypy.request.config['auth.require'] = []
-                check_auth()
-
-            if 'database' in (args[:1] or kwargs.get('check')):
-                result = database.integrity_check()
-                status.update(result)
-                if result['integrity_check'] == 'ok':
-                    status['message'] = 'Database ok'
+    def get_notification_agent_triggers(self, config_id, **kwargs):
+        if config_id.isdigit():
+            agents = notifiers.available_notification_agents()
+            for agent in agents:
+                if int(config_id) == agent['id']:
+                    this_agent = agent
+                    break
                 else:
-                    status['result'] = 'error'
-                    status['message'] = 'Database not ok'
-
-        return status
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @addtoapi()
-    def server_status(self, *args, **kwargs):
-        """ Get the current status of Tautulli's connection to the Plex server.
-
-            ```
-            Required parameters:
-                None
-
-            Optional parameters:
-                None
-
-            Returns:
-                json:
-                    {"result": "success",
-                     "connected": true,
-                     }
-            ```
-        """
-        cherrypy.response.headers['Cache-Control'] = "max-age=0,no-cache,no-store"
-        status = {'result': 'success', 'connected': plexpy.PLEX_SERVER_UP}
-
-        return status
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi("get_exports_table")
-    def get_export_list(self, section_id=None, user_id=None, rating_key=None, **kwargs):
-        """ Get the data on the Tautulli export tables.
-
-            ```
-            Required parameters:
-                section_id (str):               The id of the Plex library section, OR
-                user_id (str):                  The id of the Plex user, OR
-                rating_key (str):               The rating key of the exported item
-
-            Optional parameters:
-                order_column (str):             "added_at", "sort_title", "container", "bitrate", "video_codec",
-                                                "video_resolution", "video_framerate", "audio_codec", "audio_channels",
-                                                "file_size", "last_played", "play_count"
-                order_dir (str):                "desc" or "asc"
-                start (int):                    Row to start from, 0
-                length (int):                   Number of items to return, 25
-                search (str):                   A string to search for, "Thrones"
-
-            Returns:
-                json:
-                    {"draw": 1,
-                     "recordsTotal": 10,
-                     "recordsFiltered": 3,
-                     "data":
-                        [{"timestamp": 1602823644,
-                          "art_level": 0,
-                          "complete": 1,
-                          "custom_fields": "",
-                          "exists": true,
-                          "export_id": 42,
-                          "exported_items": 28,
-                          "file_format": "json",
-                          "file_size": 57793562,
-                          "filename": null,
-                          "individual_files": 1,
-                          "logo_level": 0,
-                          "media_info_level": 1,
-                          "media_type": "collection",
-                          "media_type_title": "Collection",
-                          "metadata_level": 1,
-                          "rating_key": null,
-                          "section_id": 1,
-                          "thumb_level": 2,
-                          "title": "Library - Movies - Collection [1]",
-                          "total_items": 28,
-                          "user_id": null
-                          },
-                         {...},
-                         {...}
-                         ]
-                     }
-            ```
-        """
-        # Check if datatables json_data was received.
-        # If not, then build the minimal amount of json data for a query
-        if not kwargs.get('json_data'):
-            # TODO: Find some one way to automatically get the columns
-            dt_columns = [("timestamp", True, False),
-                          ("media_type_title", True, True),
-                          ("rating_key", True, True),
-                          ("title", True, True),
-                          ("file_format", True, True),
-                          ("metadata_level", True, True),
-                          ("media_info_level", True, True),
-                          ("custom_fields", True, True),
-                          ("file_size", True, False),
-                          ("complete", True, False)]
-            kwargs['json_data'] = build_datatables_json(kwargs, dt_columns, "timestamp")
-
-        result = exporter.get_export_datatable(section_id=section_id,
-                                               user_id=user_id,
-                                               rating_key=rating_key,
-                                               kwargs=kwargs)
-
-        return result
-
-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def export_metadata_modal(self, section_id=None, user_id=None, rating_key=None,
-                              media_type=None, sub_media_type=None,
-                              export_type=None, **kwargs):
-        file_formats = exporter.Export.FILE_FORMATS
-
-        if media_type == 'photo_album':
-            media_type = 'photoalbum'
-
-        return serve_template(template_name="export_modal.html", title="Export Metadata",
-                              section_id=section_id, user_id=user_id, rating_key=rating_key,
-                              media_type=media_type, sub_media_type=sub_media_type,
-                              export_type=export_type, file_formats=file_formats)
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def get_export_fields(self, media_type=None, sub_media_type=None, **kwargs):
-        """ Get a list of available custom export fields.
-
-            ```
-            Required parameters:
-                media_type (str):          The media type of the fields to return
-
-            Optional parameters:
-                sub_media_type (str):      The child media type for
-                                           collections (movie, show, artist, album, photoalbum),
-                                           or playlists (video, audio, photo)
-
-            Returns:
-                json:
-                    {"metadata_fields":
-                        [{"field": "addedAt", "level": 1},
-                         ...
-                         ],
-                     "media_info_fields":
-                        [{"field": "media.aspectRatio", "level": 1},
-                         ...
-                         ]
-                    }
-            ```
-        """
-        custom_fields = exporter.get_custom_fields(media_type=media_type,
-                                                   sub_media_type=sub_media_type)
-
-        return custom_fields
-
-    @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def export_metadata(self, section_id=None, user_id=None, rating_key=None, file_format='csv',
-                        metadata_level=1, media_info_level=1,
-                        thumb_level=0, art_level=0, logo_level=0,
-                        custom_fields='', export_type='all', individual_files=False, **kwargs):
-        """ Export library or media metadata to a file
-
-            ```
-            Required parameters:
-                section_id (int):          The section id of the library items to export, OR
-                user_id (int):             The user id of the playlist items to export, OR
-                rating_key (int):          The rating key of the media item to export
-
-            Optional parameters:
-                file_format (str):         csv (default), json, xml, or m3u
-                metadata_level (int):      The level of metadata to export (default 1)
-                media_info_level (int):    The level of media info to export (default 1)
-                thumb_level (int):         The level of poster/cover images to export (default 0)
-                art_level (int):           The level of background artwork images to export (default 0)
-                logo_level (int):          The level of logo images to export (default 0)
-                custom_fields (str):       Comma separated list of custom fields to export
-                                           in addition to the export level selected
-                export_type (str):         'collection' or 'playlist' for library/user export,
-                                           otherwise default to all library items
-                individual_files (bool):   Export each item as an individual file for library/user export.
-
-            Returns:
-                json:
-                    {"export_id": 1}
-            ```
-        """
-        individual_files = helpers.bool_true(individual_files)
-        result = exporter.Export(section_id=section_id,
-                                 user_id=user_id,
-                                 rating_key=rating_key,
-                                 file_format=file_format,
-                                 metadata_level=metadata_level,
-                                 media_info_level=media_info_level,
-                                 thumb_level=thumb_level,
-                                 art_level=art_level,
-                                 logo_level=logo_level,
-                                 custom_fields=custom_fields,
-                                 export_type=export_type,
-                                 individual_files=individual_files).export()
-
-        if isinstance(result, int):
-            return {'result': 'success', 'message': 'Metadata export has started.', 'export_id': result}
+                    this_agent = None
         else:
-            return {'result': 'error', 'message': result}
+            return None
+
+        return serve_template(templatename="notification_triggers_modal.html", title="Notification Triggers",
+                              data=this_agent)
 
     @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def view_export(self, export_id=None, **kwargs):
-        """ Download an exported metadata file
+    def delete_history_rows(self, row_id, **kwargs):
+        data_factory = datafactory.DataFactory()
 
-            ```
-            Required parameters:
-                export_id (int):          The row id of the exported file to view
-
-            Optional parameters:
-                None
-
-            Returns:
-                download
-            ```
-        """
-        result = exporter.get_export(export_id=export_id)
-
-        if result and result['complete'] == 1 and result['exists'] and not result['individual_files']:
-            filepath = exporter.get_export_filepath(result['title'], result['timestamp'], result['filename'])
-
-            if result['file_format'] == 'csv':
-                with open(filepath, 'r', encoding='utf-8') as infile:
-                    reader = csv.DictReader(infile)
-                    table = '<table><tr><th>' + \
-                            '</th><th>'.join(reader.fieldnames) + \
-                            '</th></tr><tr>' + \
-                            '</tr><tr>'.join(
-                                '<td>' + '</td><td>'.join(row.values()) + '</td>' for row in reader) + \
-                            '</tr></table>'
-                    style = '<style>' \
-                            'body {margin: 0;}' \
-                            'table {border-collapse: collapse; overflow-y: auto; height: 100px;} ' \
-                            'th {position: sticky; top: 0; background: #ddd; box-shadow: inset 1px 1px #000, 0 1px #000;}' \
-                            'td {box-shadow: inset 1px -1px #000;}' \
-                            'th, td {padding: 3px; white-space: nowrap;}' \
-                            '</style>'
-                return '{style}<pre>{table}</pre>'.format(style=style, table=table)
-
-            elif result['file_format'] == 'json':
-                return serve_file(filepath, name=result['filename'], content_type='application/json;charset=UTF-8')
-
-            elif result['file_format'] == 'xml':
-                return serve_file(filepath, name=result['filename'], content_type='application/xml;charset=UTF-8')
-
-            elif result['file_format'] == 'm3u':
-                return serve_file(filepath, name=result['filename'], content_type='text/plain;charset=UTF-8')
+        if row_id:
+            delete_row = data_factory.delete_session_history_rows(row_id=row_id)
 
+            if delete_row:
+                cherrypy.response.headers['Content-type'] = 'application/json'
+                return json.dumps({'message': delete_row})
         else:
-            if result and result.get('complete') == 0:
-                msg = 'Export is still being processed.'
-            elif result and result.get('complete') == -1:
-                msg = 'Export failed to process.'
-            elif result and not result.get('exists'):
-                msg = 'Export file does not exist.'
-            else:
-                msg = 'Invalid export_id provided.'
-            cherrypy.response.headers['Content-Type'] = 'application/json;charset=UTF-8'
-            return json.dumps({'result': 'error', 'message': msg}).encode('utf-8')
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps({'message': 'no data received'})
 
     @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def download_export(self, export_id=None, **kwargs):
-        """ Download an exported metadata file
+    def delete_all_user_history(self, user_id, **kwargs):
+        data_factory = datafactory.DataFactory()
 
-            ```
-            Required parameters:
-                export_id (int):          The row id of the exported file to download
-
-            Optional parameters:
-                None
-
-            Returns:
-                download
-            ```
-        """
-        result = exporter.get_export(export_id=export_id)
-
-        if result and result['complete'] == 1 and result['exists']:
-            if result['thumb_level'] or result['art_level'] or result['logo_level'] or result['individual_files']:
-                directory = exporter.format_export_directory(result['title'], result['timestamp'])
-                dirpath = exporter.get_export_dirpath(directory)
-                zip_filename = '{}.zip'.format(directory)
-
-                buffer = BytesIO()
-                temp_zip = zipfile.ZipFile(buffer, 'w')
-                helpers.zipdir(dirpath, temp_zip)
-                temp_zip.close()
-
-                return serve_fileobj(buffer.getvalue(), content_type='application/zip',
-                                     disposition='attachment', name=zip_filename)
-
-            else:
-                filepath = exporter.get_export_filepath(result['title'], result['timestamp'], result['filename'])
-                return serve_download(filepath, name=result['filename'])
+        if user_id:
+            delete_row = data_factory.delete_all_user_history(user_id=user_id)
 
+            if delete_row:
+                cherrypy.response.headers['Content-type'] = 'application/json'
+                return json.dumps({'message': delete_row})
         else:
-            if result and result.get('complete') == 0:
-                msg = 'Export is still being processed.'
-            elif result and result.get('complete') == -1:
-                msg = 'Export failed to process.'
-            elif result and not result.get('exists'):
-                msg = 'Export file does not exist.'
-            else:
-                msg = 'Invalid export_id provided.'
-            cherrypy.response.headers['Content-Type'] = 'application/json;charset=UTF-8'
-            return json.dumps({'result': 'error', 'message': msg}).encode('utf-8')
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps({'message': 'no data received'})
 
     @cherrypy.expose
-    @cherrypy.tools.json_out()
-    @requireAuth(member_of("admin"))
-    @addtoapi()
-    def delete_export(self, export_id=None, delete_all=False, **kwargs):
-        """ Delete exports from Tautulli.
+    def search(self, search_query=''):
+        query = search_query.replace('"', '')
 
-            ```
-            Required parameters:
-                export_id (int):          The row id of the exported file to delete
+        return serve_template(templatename="search.html", title="Search", query=query)
 
-            Optional parameters:
-                delete_all (bool):        'true' to delete all exported files
+    @cherrypy.expose
+    def search_results(self, query, **kwargs):
 
-            Returns:
-                None
-            ```
-        """
-        if helpers.bool_true(delete_all):
-            result = exporter.delete_all_exports()
-            if result:
-                return {'result': 'success', 'message': 'All exports deleted successfully.'}
-            else:
-                return {'result': 'error', 'message': 'Failed to delete all exports.'}
+        pms_connect = pmsconnect.PmsConnect()
+        result = pms_connect.get_search_results(query)
 
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps(result)
         else:
-            result = exporter.delete_export(export_id=export_id)
-            if result:
-                return {'result': 'success', 'message': 'Export deleted successfully.'}
-            else:
-                return {'result': 'error', 'message': 'Failed to delete export.'}
-
+            logger.warn('Unable to retrieve data.')
 
     @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def exporter_docs(self, **kwargs):
-        return '<pre>' + exporter.build_export_docs() + '</pre>'
+    def get_search_results_children(self, query, media_type=None, season_index=None, **kwargs):
+
+        pms_connect = pmsconnect.PmsConnect()
+        result = pms_connect.get_search_results(query)
+
+        if media_type:
+            result['results_list'] = {media_type: result['results_list'][media_type]}
+        if media_type == 'season' and season_index:
+            for season in result['results_list']['season']:
+                if season['index'] == season_index:
+                    result['results_list']['season'] = [season]
+                    break
+
+        if result:
+            return serve_template(templatename="info_search_results_list.html", data=result, title="Search Result List")
+        else:
+            logger.warn('Unable to retrieve data.')
+            return serve_template(templatename="info_search_results_list.html", data=None, title="Search Result List")
+
+    @cherrypy.expose
+    def update_history_rating_key(self, old_rating_key, new_rating_key, media_type, **kwargs):
+        data_factory = datafactory.DataFactory()
+        pms_connect = pmsconnect.PmsConnect()
+
+        old_key_list = data_factory.get_rating_keys_list(rating_key=old_rating_key, media_type=media_type)
+        new_key_list = pms_connect.get_rating_keys_list(rating_key=new_rating_key, media_type=media_type)
+
+        update_db = data_factory.update_rating_key(old_key_list=old_key_list,
+                                                   new_key_list=new_key_list,
+                                                   media_type=media_type)
+
+        if update_db:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps({'message': update_db})
+        else:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps({'message': 'no data received'})
+
+    # test code
+    @cherrypy.expose
+    def get_new_rating_keys(self, rating_key='', media_type='', **kwargs):
+
+        pms_connect = pmsconnect.PmsConnect()
+        result = pms_connect.get_rating_keys_list(rating_key=rating_key, media_type=media_type)
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps(result)
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_old_rating_keys(self, rating_key='', media_type='', **kwargs):
+
+        data_factory = datafactory.DataFactory()
+        result = data_factory.get_rating_keys_list(rating_key=rating_key, media_type=media_type)
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps(result)
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def get_map_rating_keys(self, old_rating_key, new_rating_key, media_type, **kwargs):
+
+        data_factory = datafactory.DataFactory()
+        pms_connect = pmsconnect.PmsConnect()
+
+        if new_rating_key:
+            old_key_list = data_factory.get_rating_keys_list(rating_key=old_rating_key, media_type=media_type)
+            new_key_list = pms_connect.get_rating_keys_list(rating_key=new_rating_key, media_type=media_type)
+
+            result = data_factory.update_rating_key(old_key_list=old_key_list,
+                                                    new_key_list=new_key_list,
+                                                    media_type=media_type)
+
+        if result:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return json.dumps(result)
+        else:
+            logger.warn('Unable to retrieve data.')
+
+    @cherrypy.expose
+    def discover(self, token=''):
+        """
+        Returns the servers that you own as a
+        list of dicts (formatted for selectize)
+        """
+        # Need to set token so result dont return http 401
+        plexpy.CONFIG.__setattr__('PMS_TOKEN', token)
+        plexpy.CONFIG.write()
+
+        result = plextv.PlexTV()
+        servers = result.discover()
+        if servers:
+            cherrypy.response.headers['Content-type'] = 'application/json'
+            return servers
diff --git a/plexpy/webstart.py b/plexpy/webstart.py
index 323c7e8e..c9a41f09 100644
--- a/plexpy/webstart.py
+++ b/plexpy/webstart.py
@@ -1,322 +1,124 @@
-# -*- coding: utf-8 -*-
-
-#  This file is part of Tautulli.
+#  This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import ssl
 import sys
-
-import cheroot.errors
 import cherrypy
-import cherrypy_cors
-
 import plexpy
+
 from plexpy import logger
-from plexpy import webauth
+from plexpy.webserve import WebInterface
 from plexpy.helpers import create_https_certificates
-from plexpy.webserve import WebInterface, BaseRedirect
-
-
-def start():
-    logger.info("Tautulli WebStart :: Initializing Tautulli web server...")
-    web_config = {
-        'http_port': plexpy.HTTP_PORT,
-        'http_host': plexpy.CONFIG.HTTP_HOST,
-        'http_root': plexpy.CONFIG.HTTP_ROOT,
-        'http_environment': plexpy.CONFIG.HTTP_ENVIRONMENT,
-        'http_proxy': plexpy.CONFIG.HTTP_PROXY,
-        'enable_https': plexpy.CONFIG.ENABLE_HTTPS,
-        'https_cert': plexpy.CONFIG.HTTPS_CERT,
-        'https_cert_chain': plexpy.CONFIG.HTTPS_CERT_CHAIN,
-        'https_key': plexpy.CONFIG.HTTPS_KEY,
-        'https_min_tls_version': plexpy.CONFIG.HTTPS_MIN_TLS_VERSION,
-        'http_username': plexpy.CONFIG.HTTP_USERNAME,
-        'http_password': plexpy.CONFIG.HTTP_PASSWORD,
-        'http_basic_auth': plexpy.CONFIG.HTTP_BASIC_AUTH
-    }
-    initialize(web_config)
-
-
-def stop():
-    logger.info("Tautulli WebStart :: Stopping Tautulli web server...")
-    cherrypy.engine.exit()
-    cherrypy.server.httpserver = None
-
-
-def restart():
-    logger.info("Tautulli WebStart :: Restarting Tautulli web server...")
-    stop()
-    start()
 
 
 def initialize(options):
-    cherrypy_cors.install()
 
     # HTTPS stuff stolen from sickbeard
     enable_https = options['enable_https']
     https_cert = options['https_cert']
-    https_cert_chain = options['https_cert_chain']
     https_key = options['https_key']
 
     if enable_https:
-        # If either the HTTPS certificate or key do not exist, try to make self-signed ones.
-        if plexpy.CONFIG.HTTPS_CREATE_CERT and \
-                (not (https_cert and os.path.exists(https_cert)) or
-                 not (https_key and os.path.exists(https_key))):
+        # If either the HTTPS certificate or key do not exist, try to make
+        # self-signed ones.
+        if not (https_cert and os.path.exists(https_cert)) or not (https_key and os.path.exists(https_key)):
             if not create_https_certificates(https_cert, https_key):
-                logger.warn("Tautulli WebStart :: Unable to create certificate and key. Disabling HTTPS")
+                logger.warn("Unable to create certificate and key. Disabling " \
+                    "HTTPS")
                 enable_https = False
 
         if not (os.path.exists(https_cert) and os.path.exists(https_key)):
-            logger.warn("Tautulli WebStart :: Disabled HTTPS because of missing certificate and key.")
+            logger.warn("Disabled HTTPS because of missing certificate and " \
+                "key.")
             enable_https = False
 
     options_dict = {
         'server.socket_port': options['http_port'],
         'server.socket_host': options['http_host'],
-        'environment': options['http_environment'],
-        'server.thread_pool': plexpy.CONFIG.HTTP_THREAD_POOL,
-        'server.max_request_body_size': 1073741824,
-        'server.socket_timeout': 60,
+        'server.thread_pool': 10,
         'tools.encode.on': True,
         'tools.encode.encoding': 'utf-8',
         'tools.decode.on': True,
-        'cors.expose.on': True,
+        'log.screen': False,
+        'engine.autoreload.on': False,
     }
 
-    if plexpy.DEV:
-        options_dict['environment'] = "test_suite"
-        options_dict['engine.autoreload.on'] = True
-
     if enable_https:
-        context = ssl.create_default_context(
-            purpose=ssl.Purpose.CLIENT_AUTH,
-            cafile=https_cert_chain
-        )
-
-        min_tls_version = options['https_min_tls_version'].replace('.', '_')
-        context.minimum_version = getattr(ssl.TLSVersion, min_tls_version, ssl.TLSVersion.TLSv1_2)
-        logger.debug("Tautulli WebStart :: Minimum TLS version set to %s.", context.minimum_version.name)
-
-        context.load_cert_chain(https_cert, https_key)
-
-        options_dict['server.ssl_context'] = context
         options_dict['server.ssl_certificate'] = https_cert
-        options_dict['server.ssl_certificate_chain'] = https_cert_chain
         options_dict['server.ssl_private_key'] = https_key
         protocol = "https"
     else:
         protocol = "http"
 
-    if options['http_proxy']:
-        # Overwrite cherrypy.tools.proxy with our own proxy handler
-        cherrypy.tools.proxy = cherrypy.Tool('before_handler', proxy, priority=1)
-
-    if options['http_password']:
-        login_allowed = ["Tautulli admin (username is '%s')" % options['http_username']]
-        if plexpy.CONFIG.HTTP_PLEX_ADMIN:
-            login_allowed.append("Plex admin")
-
-        logger.info("Tautulli WebStart :: Web server authentication is enabled: %s.", ' and '.join(login_allowed))
-
-        if options['http_basic_auth']:
-            plexpy.AUTH_ENABLED = False
-            basic_auth_enabled = True
-        else:
-            plexpy.AUTH_ENABLED = True
-            basic_auth_enabled = False
-            cherrypy.tools.auth = cherrypy.Tool('before_handler', webauth.check_auth, priority=2)
-    else:
-        logger.warn("Tautulli WebStart :: Web server authentication is disabled!")
-
-        plexpy.AUTH_ENABLED = False
-        basic_auth_enabled = False
-
-    if options['http_root'].strip('/'):
-        plexpy.HTTP_ROOT = options['http_root'] = '/' + str(options['http_root'].strip('/')) + '/'
-    else:
-        plexpy.HTTP_ROOT = options['http_root'] = '/'
-
-    logger.info("Tautulli WebStart :: Thread Pool Size: %d.", plexpy.CONFIG.HTTP_THREAD_POOL)
+    logger.info("Starting PlexPy web server on %s://%s:%d/", protocol,
+        options['http_host'], options['http_port'])
     cherrypy.config.update(options_dict)
 
     conf = {
         '/': {
-            'engine.timeout_monitor.on': False,
             'tools.staticdir.root': os.path.join(plexpy.PROG_DIR, 'data'),
-            'tools.proxy.on': bool(options['http_proxy']),
-            'tools.gzip.on': True,
-            'tools.gzip.mime_types': ['text/html', 'text/plain', 'text/css',
-                                      'text/javascript', 'application/json',
-                                      'application/javascript'],
-            'tools.auth.on': plexpy.AUTH_ENABLED,
-            'tools.auth_basic.on': basic_auth_enabled,
-            'tools.auth_basic.realm': 'Tautulli web server',
-            'tools.auth_basic.checkpassword': cherrypy.lib.auth_basic.checkpassword_dict({
-                options['http_username']: options['http_password']})
-        },
-        '/api': {
-            'tools.auth_basic.on': False
-        },
-        '/status': {
-            'tools.auth_basic.on': False
-        },
-        '/newsletter': {
-            'tools.auth_basic.on': False
-        },
-        '/image': {
-            'tools.auth_basic.on': False
+            'tools.proxy.on': options['http_proxy']  # pay attention to X-Forwarded-Proto header
         },
         '/interfaces': {
             'tools.staticdir.on': True,
-            'tools.staticdir.dir': "interfaces",
-            'tools.caching.on': True,
-            'tools.caching.force': True,
-            'tools.caching.delay': 0,
-            'tools.expires.on': True,
-            'tools.expires.secs': 60 * 60 * 24 * 30,  # 30 days
-            'tools.sessions.on': False,
-            'tools.auth.on': False
+            'tools.staticdir.dir': "interfaces"
         },
         '/images': {
             'tools.staticdir.on': True,
-            'tools.staticdir.dir': "interfaces/default/images",
-            'tools.staticdir.content_types': {'svg': 'image/svg+xml'},
-            'tools.caching.on': True,
-            'tools.caching.force': True,
-            'tools.caching.delay': 0,
-            'tools.expires.on': True,
-            'tools.expires.secs': 60 * 60 * 24 * 30,  # 30 days
-            'tools.sessions.on': False,
-            'tools.auth.on': False
+            'tools.staticdir.dir': "images"
         },
         '/css': {
             'tools.staticdir.on': True,
-            'tools.staticdir.dir': "interfaces/default/css",
-            'tools.caching.on': True,
-            'tools.caching.force': True,
-            'tools.caching.delay': 0,
-            'tools.expires.on': True,
-            'tools.expires.secs': 60 * 60 * 24 * 30,  # 30 days
-            'tools.sessions.on': False,
-            'tools.auth.on': False
-        },
-        '/fonts': {
-            'tools.staticdir.on': True,
-            'tools.staticdir.dir': "interfaces/default/fonts",
-            'tools.caching.on': True,
-            'tools.caching.force': True,
-            'tools.caching.delay': 0,
-            'tools.expires.on': True,
-            'tools.expires.secs': 60 * 60 * 24 * 30,  # 30 days
-            'tools.sessions.on': False,
-            'tools.auth.on': False
+            'tools.staticdir.dir': "css"
         },
         '/js': {
             'tools.staticdir.on': True,
-            'tools.staticdir.dir': "interfaces/default/js",
-            'tools.caching.on': True,
-            'tools.caching.force': True,
-            'tools.caching.delay': 0,
-            'tools.expires.on': True,
-            'tools.expires.secs': 60 * 60 * 24 * 30,  # 30 days
-            'tools.sessions.on': False,
-            'tools.auth.on': False
-        },
-        '/cache': {
-            'tools.staticdir.on': True,
-            'tools.staticdir.dir': plexpy.CONFIG.CACHE_DIR,
-            'tools.caching.on': True,
-            'tools.caching.force': True,
-            'tools.caching.delay': 0,
-            'tools.expires.on': True,
-            'tools.expires.secs': 60 * 60 * 24 * 30,  # 30 days
-            'tools.sessions.on': False,
-            'tools.auth.on': False
-        },
-        '/pms_image_proxy': {
-           'tools.caching.on': True,
-           'tools.caching.force': True,
-           'tools.caching.delay': 0,
-           'tools.expires.on': True,
-           'tools.expires.secs': 60 * 60 * 24 * 30,  # 30 days
-           'tools.auth.on': False,
-           'tools.sessions.on': False
+            'tools.staticdir.dir': "js"
         },
         '/favicon.ico': {
             'tools.staticfile.on': True,
-            'tools.staticfile.filename': os.path.abspath(os.path.join(
-                plexpy.PROG_DIR, 'data/interfaces/default/images/favicon/favicon.ico')),
-            'tools.caching.on': True,
-            'tools.caching.force': True,
-            'tools.caching.delay': 0,
-            'tools.expires.on': True,
-            'tools.expires.secs': 60 * 60 * 24 * 30,  # 30 days
-            'tools.sessions.on': False,
-            'tools.auth.on': False
+            'tools.staticfile.filename': os.path.join(os.path.abspath(
+                os.curdir), "images" + os.sep + "favicon.ico")
+        },
+        '/cache': {
+            'tools.staticdir.on': True,
+            'tools.staticdir.dir': plexpy.CONFIG.CACHE_DIR
         }
     }
 
-    # Catch shutdown errors that can break cherrypy/cheroot
-    # See https://github.com/cherrypy/cheroot/issues/710
-    try:
-        cheroot.errors.acceptable_sock_shutdown_exceptions += (OSError,)
-    except AttributeError:
-        pass
+    if options['http_password']:
+        logger.info("Web server authentication is enabled, username is '%s'", options['http_username'])
 
-    cherrypy.tree.mount(WebInterface(), options['http_root'], config=conf)
-    if plexpy.HTTP_ROOT != '/':
-        cherrypy.tree.mount(BaseRedirect(), '/')
+        conf['/'].update({
+            'tools.auth_basic.on': True,
+            'tools.auth_basic.realm': 'PlexPy web server',
+            'tools.auth_basic.checkpassword': cherrypy.lib.auth_basic.checkpassword_dict({
+                options['http_username']: options['http_password']
+            })
+        })
+        conf['/api'] = {'tools.auth_basic.on': False}
+
+    # Prevent time-outs
+    cherrypy.engine.timeout_monitor.unsubscribe()
+    cherrypy.tree.mount(WebInterface(), str(options['http_root']), config=conf)
 
     try:
-        logger.info("Tautulli WebStart :: Starting Tautulli web server on %s://%s:%d%s", protocol,
-                    options['http_host'], options['http_port'], options['http_root'])
-        #cherrypy.process.servers.check_port(str(options['http_host']), options['http_port'])
-        if not plexpy.DEV:
-            cherrypy.server.start()
-        else:
-            cherrypy.engine.signals.subscribe()
-            cherrypy.engine.start()
-            cherrypy.engine.block()
-    except IOError as e:
-        logger.error("Tautulli WebStart :: Failed to start Tautulli: %s", e)
-        plexpy.alert_message('Failed to start Tautulli: %s' % e)
+        cherrypy.process.servers.check_port(str(options['http_host']), options['http_port'])
+        cherrypy.server.start()
+    except IOError:
+        sys.stderr.write('Failed to start on port: %i. Is something else running?\n' % (options['http_port']))
         sys.exit(1)
 
     cherrypy.server.wait()
-
-
-def proxy():
-    # logger.debug("REQUEST URI: %s, HEADER [X-Forwarded-Host]: %s, [X-Host]: %s, [Origin]: %s, [Host]: %s",
-    #              cherrypy.request.wsgi_environ['REQUEST_URI'],
-    #              cherrypy.request.headers.get('X-Forwarded-Host'),
-    #              cherrypy.request.headers.get('X-Host'),
-    #              cherrypy.request.headers.get('Origin'),
-    #              cherrypy.request.headers.get('Host'))
-
-    # Change cherrpy.tools.proxy.local header if X-Forwarded-Host header is not present
-    local = 'X-Forwarded-Host'
-    if not cherrypy.request.headers.get('X-Forwarded-Host'):
-        if cherrypy.request.headers.get('X-Host'):  # lighttpd
-            local = 'X-Host'
-        elif cherrypy.request.headers.get('Origin'):  # Squid
-            local = 'Origin'
-        elif cherrypy.request.headers.get('Host'):  # nginx
-            local = 'Host'
-        # logger.debug("cherrypy.tools.proxy.local set to [%s]", local)
-
-    # Call original cherrypy proxy tool with the new local
-    cherrypy.lib.cptools.proxy(local=local)
diff --git a/plexpy/windows.py b/plexpy/windows.py
deleted file mode 100644
index 857e8a0e..00000000
--- a/plexpy/windows.py
+++ /dev/null
@@ -1,201 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# This file is part of Tautulli.
-#
-#  Tautulli is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  Tautulli 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 Tautulli.  If not, see <http://www.gnu.org/licenses/>.
-
-import os
-import sys
-
-from infi.systray import SysTrayIcon
-
-try:
-    from shlex import quote as cmd_quote
-except ImportError:
-    from pipes import quote as cmd_quote
-
-try:
-    import winreg
-except ImportError:
-    import _winreg as winreg
-
-import plexpy
-from plexpy import common
-from plexpy import logger
-from plexpy import versioncheck
-
-
-class WindowsSystemTray(object):
-    def __init__(self):
-        self.image_dir = os.path.join(plexpy.PROG_DIR, 'data/interfaces/', plexpy.CONFIG.INTERFACE, 'images')
-        self.icon = os.path.join(self.image_dir, 'logo-circle.ico')
-
-        if plexpy.UPDATE_AVAILABLE:
-            self.hover_text = common.PRODUCT + ' - Update Available!'
-            self.update_title = 'Check for Updates - Update Available!'
-        else:
-            self.hover_text = common.PRODUCT
-            self.update_title = 'Check for Updates'
-
-        if plexpy.CONFIG.LAUNCH_STARTUP:
-            launch_start_icon = os.path.join(self.image_dir, 'check-solid.ico')
-        else:
-            launch_start_icon = None
-        if plexpy.CONFIG.LAUNCH_BROWSER:
-            launch_browser_icon = os.path.join(self.image_dir, 'check-solid.ico')
-        else:
-            launch_browser_icon = None
-
-        self.menu = [
-            ['Open Tautulli', None, self.tray_open, 'default'],
-            ['', None, 'separator', None],
-            ['Start Tautulli at Login', launch_start_icon, self.tray_startup, None],
-            ['Open Browser when Tautulli Starts', launch_browser_icon, self.tray_browser, None],
-            ['', None, 'separator', None],
-            [self.update_title, None, self.tray_check_update, None],
-            ['Restart', None, self.tray_restart, None]
-        ]
-        if not plexpy.FROZEN:
-            self.menu.insert(6, ['Update', None, self.tray_update, None])
-
-        self.tray_icon = SysTrayIcon(self.icon, self.hover_text, self.menu, on_quit=self.tray_quit)
-
-    def start(self):
-        logger.info("Launching Windows system tray icon.")
-        try:
-            self.tray_icon.start()
-        except Exception as e:
-            logger.error("Unable to launch system tray icon: %s." % e)
-
-    def shutdown(self):
-        self.tray_icon.shutdown()
-
-    def update(self, **kwargs):
-        self.tray_icon.update(**kwargs)
-
-    def tray_open(self, tray_icon):
-        plexpy.launch_browser(plexpy.CONFIG.HTTP_HOST, plexpy.HTTP_PORT, plexpy.HTTP_ROOT)
-
-    def tray_startup(self, tray_icon):
-        plexpy.CONFIG.LAUNCH_STARTUP = not plexpy.CONFIG.LAUNCH_STARTUP
-        set_startup()
-
-    def tray_browser(self, tray_icon):
-        plexpy.CONFIG.LAUNCH_BROWSER = not plexpy.CONFIG.LAUNCH_BROWSER
-        set_startup()
-
-    def tray_check_update(self, tray_icon):
-        versioncheck.check_update()
-
-    def tray_update(self, tray_icon):
-        if plexpy.UPDATE_AVAILABLE:
-            plexpy.SIGNAL = 'update'
-        else:
-            self.hover_text = common.PRODUCT + ' - No Update Available'
-            self.update_title = 'Check for Updates - No Update Available'
-            self.menu[5][0] = self.update_title
-            self.update(hover_text=self.hover_text, menu_options=self.menu)
-
-    def tray_restart(self, tray_icon):
-        plexpy.SIGNAL = 'restart'
-
-    def tray_quit(self, tray_icon):
-        plexpy.SIGNAL = 'shutdown'
-
-    def change_tray_update_icon(self):
-        if plexpy.UPDATE_AVAILABLE:
-            self.hover_text = common.PRODUCT + ' - Update Available!'
-            self.update_title = 'Check for Updates - Update Available!'
-        else:
-            self.hover_text = common.PRODUCT + ' - No Update Available'
-            self.update_title = 'Check for Updates'
-        self.menu[5][0] = self.update_title
-        self.update(hover_text=self.hover_text, menu_options=self.menu)
-
-    def change_tray_icons(self):
-        if plexpy.CONFIG.LAUNCH_STARTUP:
-            launch_start_icon = os.path.join(self.image_dir, 'check-solid.ico')
-        else:
-            launch_start_icon = None
-        if plexpy.CONFIG.LAUNCH_BROWSER:
-            launch_browser_icon = os.path.join(self.image_dir, 'check-solid.ico')
-        else:
-            launch_browser_icon = None
-        self.menu[2][1] = launch_start_icon
-        self.menu[3][1] = launch_browser_icon
-        self.update(menu_options=self.menu)
-
-
-def set_startup():
-    if plexpy.WIN_SYS_TRAY_ICON:
-        plexpy.WIN_SYS_TRAY_ICON.change_tray_icons()
-
-    startup_reg_path = "Software\\Microsoft\\Windows\\CurrentVersion\\Run"
-
-    exe = sys.executable
-    run_args = [arg for arg in plexpy.ARGS if arg != '--nolaunch']
-    if plexpy.FROZEN:
-        args = [exe] + run_args
-    else:
-        args = [exe, plexpy.FULL_PATH] + run_args
-
-    registry_key_name = common.PRODUCT
-
-    cmd = ' '.join(cmd_quote(arg) for arg in args).replace('python.exe', 'pythonw.exe').replace("'", '"')
-
-    if plexpy.CONFIG.LAUNCH_STARTUP:
-        # Rename old Tautulli registry key
-        try:
-            registry_key = winreg.OpenKey(winreg.HKEY_CURRENT_USER, startup_reg_path, 0, winreg.KEY_ALL_ACCESS)
-            winreg.QueryValueEx(registry_key, '{}_{}'.format(common.PRODUCT, plexpy.CONFIG.PMS_UUID))
-            reg_value_exists = True
-        except WindowsError:
-            reg_value_exists = False
-
-        if reg_value_exists:
-            try:
-                winreg.DeleteValue(registry_key, '{}_{}'.format(common.PRODUCT, plexpy.CONFIG.PMS_UUID))
-                winreg.CloseKey(registry_key)
-            except WindowsError:
-                pass
-
-        try:
-            winreg.CreateKey(winreg.HKEY_CURRENT_USER, startup_reg_path)
-            registry_key = winreg.OpenKey(winreg.HKEY_CURRENT_USER, startup_reg_path, 0, winreg.KEY_WRITE)
-            winreg.SetValueEx(registry_key, registry_key_name, 0, winreg.REG_SZ, cmd)
-            winreg.CloseKey(registry_key)
-            logger.info("Added Tautulli to Windows system startup registry key.")
-            return True
-        except WindowsError as e:
-            logger.error("Failed to create Windows system startup registry key: %s", e)
-            return False
-
-    else:
-        # Check if registry value exists
-        try:
-            registry_key = winreg.OpenKey(winreg.HKEY_CURRENT_USER, startup_reg_path, 0, winreg.KEY_ALL_ACCESS)
-            winreg.QueryValueEx(registry_key, registry_key_name)
-            reg_value_exists = True
-        except WindowsError:
-            reg_value_exists = False
-
-        if reg_value_exists:
-            try:
-                winreg.DeleteValue(registry_key, registry_key_name)
-                winreg.CloseKey(registry_key)
-                logger.info("Removed Tautulli from Windows system startup registry key.")
-                return True
-            except WindowsError as e:
-                logger.error("Failed to delete Windows system startup registry key: %s", e)
-                return False
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index bb47f167..00000000
--- a/requirements.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-apscheduler==3.10.1
-arrow==1.3.0
-beautifulsoup4==4.12.3
-bleach==6.2.0
-certifi==2025.04.26
-cheroot==10.0.1
-cherrypy==18.10.0
-cherrypy-cors==1.7.0
-cloudinary==1.41.0
-distro==1.9.0
-dnspython==2.7.0
-facebook-sdk==3.1.0
-future==1.0.0
-ga4mp==2.0.4
-gntp==1.0.3
-html5lib==1.1
-httpagentparser==1.9.5
-idna==3.10
-importlib-metadata==8.5.0
-importlib-resources==6.4.5
-git+https://github.com/Tautulli/ipwhois.git@master#egg=ipwhois
-IPy==1.01
-Mako==1.3.6
-MarkupSafe==3.0.2
-musicbrainzngs==0.7.1
-packaging==24.2
-paho-mqtt==2.1.0
-platformdirs==4.3.6
-plexapi==4.17.0
-portend==3.2.0
-profilehooks==1.13.0
-PyJWT==2.10.1
-pyparsing==3.2.0
-python-dateutil==2.9.0.post0
-python-twitter==3.5
-pytz==2024.2
-requests==2.32.3
-requests-oauthlib==2.0.0
-rumps==0.4.0; platform_system == "Darwin"
-simplejson==3.19.3
-six==1.16.0
-tempora==5.7.0
-tokenize-rt==6.1.0
-tzdata==2024.2
-tzlocal==5.0.1
-urllib3<2
-webencodings==0.5.1
-websocket-client==1.8.0
-xmltodict==0.14.2
-zipp==3.21.0
-
-# configobj==5.1.0
-# sgmllib3k==1.0.0
-# git+https://github.com/JonnyWong16/infi.systray.git@develop#egg=infi.systray
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
deleted file mode 100644
index 35c22479..00000000
--- a/snap/snapcraft.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-name: tautulli
-adopt-info: tautulli
-summary: A Python based monitoring and tracking tool for Plex Media Server.
-description: >
-  Tautulli is a 3rd party application that you can run alongside your Plex Media Server to monitor activity and track various statistics. 
-  Most importantly, these statistics include what has been watched, who watched it, when and where they watched it, and how it was watched. 
-  The only thing missing is "why they watched it", but who am I to question your 42 plays of Frozen. 
-  All statistics are presented in a nice and clean interface with many tables and graphs, which makes it easy to brag about your server to everyone else.
-
-base: core22
-confinement: strict
-
-architectures:
-  - build-on: amd64
-  - build-on: arm64
-  - build-on: armhf
-
-plugs:
-  shared-memory:
-    private: true
-
-parts:
-  tautulli:
-    plugin: dump
-    source: .
-    stage-packages:
-      - python3
-      - python3-openssl
-      - python3-cryptography
-      - python3-setuptools
-      - python3-pkg-resources
-    build-packages:
-      - git
-      - python3
-      - python3-openssl
-      - python3-cryptography
-      - python3-setuptools
-      - python3-pkg-resources
-    override-pull: |
-      craftctl default
-      git config --global --add safe.directory /data/parts/tautulli/src
-      TAG_FULL=$(git describe --tag)
-      TAG=$(echo $TAG_FULL | grep -oP '(v\d+\.\d+\.\d+(?>-beta)?)')
-      BRANCH=$(git rev-parse --abbrev-ref HEAD)
-      COMMIT=$(git rev-parse HEAD)
-      if [ "$TAG" = "$TAG_FULL" ]; then
-        VERSION=$TAG
-      else
-        VERSION=$(echo $COMMIT | head -c 7)
-      fi
-      if [ ! "$VERSION" = "$TAG" ] || [ ! "$VERSION" = "${VERSION%-beta}" ]; then
-        GRADE=devel
-      else
-        GRADE=stable
-      fi
-      if [ "$VERSION" = "$TAG" ] && [ ! "$VERSION" = "${VERSION%-beta}" ]; then
-        BRANCH=beta
-      elif [ "$VERSION" = "$TAG" ]; then
-        BRANCH=master
-      fi
-      echo $BRANCH > branch.txt
-      echo $COMMIT > version.txt
-      craftctl set version="$VERSION"
-      craftctl set grade="$GRADE"
-    override-prime: |
-      craftctl default
-      mkdir -p usr/bin
-      ln -s /usr/bin/python3 usr/bin/python3
-
-apps:
-  tautulli:
-    command: usr/bin/python3 $SNAP/Tautulli.py --datadir $SNAP_USER_COMMON/Tautulli --config $SNAP_USER_COMMON/Tautulli/config.ini --quiet --nolaunch
-    daemon: simple
-    restart-condition: on-abnormal
-    restart-delay: 5s
-    plugs:
-      - home
-      - network
-      - network-bind
-      - removable-media
-    environment:
-      PYTHONPATH: $SNAP/usr/lib/python3/dist-packages:$PYTHONPATH
-      TAUTULLI_SNAP: "True"
diff --git a/start.bat b/start.bat
deleted file mode 100755
index db5c7196..00000000
--- a/start.bat
+++ /dev/null
@@ -1 +0,0 @@
-Start pythonw Tautulli.py
\ No newline at end of file
diff --git a/start.sh b/start.sh
deleted file mode 100755
index 8896ac87..00000000
--- a/start.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-if [[ "$TAUTULLI_DOCKER" == "True" ]]; then
-    PUID=${PUID:-1000}
-    PGID=${PGID:-1000}
-
-    groupmod -o -g "$PGID" tautulli
-    usermod -o -u "$PUID" tautulli
-
-    find /config \! \( -uid $(id -u tautulli) -gid $(id -g tautulli) \) -print0 | xargs -0r chown tautulli:tautulli
-
-    echo "Running Tautulli using user tautulli (uid=$(id -u tautulli)) and group tautulli (gid=$(id -g tautulli))"
-    exec gosu tautulli "$@"
-else
-    python_versions=("python3.11" "python3.10" "python3.9" "python3" "python")
-    for cmd in "${python_versions[@]}"; do
-        if command -v "$cmd" >/dev/null; then
-            echo "Starting Tautulli with $cmd."
-            if [[ "$(uname -s)" == "Darwin" ]]; then
-                $cmd Tautulli.py &> /dev/null &
-            else
-                $cmd Tautulli.py --quiet --daemon
-            fi
-            exit
-        fi
-    done
-    echo "Unable to start Tautulli. No Python interpreter was found in the following options:" "${python_versions[@]}"
-fi